diff --git a/Config.in b/Config.in
index 2ff2862a2..ffe1147f4 100644
--- a/Config.in
+++ b/Config.in
@@ -170,9 +170,16 @@ choice
 		depends !USE_EGLIBC
 		help
 		  This will install binaries stripped using sstrip
-
 endchoice
 
+config BUILD_PATENTED
+	default y
+	bool "Compile with support for patented functionality"
+	help
+	  When this option is disabled, software which provides patented functionality will not be built.
+	  In case software provides optional support for patented functionality,
+	  this optional support will get disabled for this package.
+
 config STRIP_ARGS
 	string
 	prompt "Strip arguments"
diff --git a/feeds.conf.default b/feeds.conf.default
index 5759575a6..924bc7108 100644
--- a/feeds.conf.default
+++ b/feeds.conf.default
@@ -1,6 +1,6 @@
 src-svn packages svn://svn.openwrt.org/openwrt/packages
-#src-svn xwrt http://x-wrt.googlecode.com/svn/trunk/package
-#src-svn luci http://svn.luci.subsignal.org/luci/branches/luci-0.9/contrib/package
+#src-svn xwrt http://x-wrt.googlecode.com/svn/branches/backfire_10.03/package
+#src-svn luci http://svn.luci.subsignal.org/luci/tags/0.9.0/contrib/package
 src-svn phone svn://svn.openwrt.org/openwrt/feeds/phone
 src-svn efl svn://svn.openwrt.org/openwrt/feeds/efl
 src-svn desktop svn://svn.openwrt.org/openwrt/feeds/desktop
diff --git a/include/depends.mk b/include/depends.mk
index 4c31eb398..65e9b25d5 100644
--- a/include/depends.mk
+++ b/include/depends.mk
@@ -11,7 +11,7 @@
 #	3: tempfile for file listings
 #	4: find options
 
-DEP_FINDPARAMS := -x "*.svn*" -x ".*" -x "*.svn*" -x "*:*" -x "*\!*" -x "* *" -x "*\\\#*" -x "*/.*_check"
+DEP_FINDPARAMS := -x "*/.svn*" -x ".*" -x "*:*" -x "*\!*" -x "* *" -x "*\\\#*" -x "*/.*_check"
 
 find_md5=find $(1) -type f $(patsubst -x,-and -not -path,$(DEP_FINDPARAMS) $(2)) | md5s
 
diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index 4d1ae891f..84d3f2274 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -134,7 +134,7 @@ $(eval $(call RequireCommand,svn, \
 ))
 
 define Require/gnu-find
-	$(FIND) $(TMP_DIR) -lname foo
+	$(FIND) --version 2>/dev/null
 endef
 
 $(eval $(call Require,gnu-find, \
diff --git a/include/toplevel.mk b/include/toplevel.mk
index fa0bc2587..83b73527d 100644
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -6,7 +6,7 @@
 # See /LICENSE for more information.
 #
 
-RELEASE:=Kamikaze
+RELEASE:=Backfire
 SHELL:=/usr/bin/env bash
 PREP_MK= OPENWRT_BUILD= QUIET=0
 
diff --git a/package/ar7-atm/Config.in b/package/ar7-atm/Config.in
index 395755c59..479b7ad07 100644
--- a/package/ar7-atm/Config.in
+++ b/package/ar7-atm/Config.in
@@ -1,6 +1,8 @@
+menu "Configuration"
+	depends on (PACKAGE_kmod-sangam-atm-annex-a || PACKAGE_kmod-sangam-atm-annex-b)
+
 choice
 	prompt "Firmware version"
-	depends on (PACKAGE_kmod-sangam-atm-annex-a || PACKAGE_kmod-sangam-atm-annex-b)
 	default AR7_ATM_FW_VERSION_704
 	help
 		This option allows you to switch between firmware/driver versions which
@@ -16,3 +18,5 @@ config AR7_ATM_FW_VERSION_703
 	bool "D7.03.01.00"
 
 endchoice
+
+endmenu
diff --git a/package/ar7-atm/Makefile b/package/ar7-atm/Makefile
index e5cef0791..fc8b57712 100644
--- a/package/ar7-atm/Makefile
+++ b/package/ar7-atm/Makefile
@@ -42,6 +42,7 @@ define KernelPackage/sangam-atm/Default
   TITLE:=AR7 ADSL driver
   FILES:=$(PKG_BUILD_DIR)/tiatm.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,tiatm)
+  MENU:=1
 endef
 
 define KernelPackage/sangam-atm/config
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 72e1802bc..c4717a78c 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=42
+PKG_RELEASE:=43
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 
@@ -22,10 +22,7 @@ ifneq ($(DUMP),1)
     TARGET:=$(TARGET)-$(PROFILE)
   endif
   LIBGCC_VERSION:=$(GCC_VERSION)
-  ifeq ($(ARCH),x86_64)
-    LIB_SUFFIX:=64
-  endif
-  ifneq ($(findstring mips64,$(ARCH)),)
+  ifneq ($(findstring $(ARCH) , mips64 x86_64 ),)
     LIB_SUFFIX:=64
   endif
 else
@@ -328,11 +325,6 @@ define Build/Compile
 	$(call Build/Compile/Default)
 endef
 
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/lib
-	ln -sf $(TOOLCHAIN_DIR)/usr/lib$(LIB_SUFFIX)/libstdc++.{la,a,so*} $(1)/usr/lib/
-endef
-
 define Package/base-files/install
 	$(CP) ./files/* $(1)/
 	if [ -d $(GENERIC_PLATFORM_DIR)/base-files/. ]; then \
@@ -400,17 +392,17 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
 
   define Package/libgcc/install
 	$(INSTALL_DIR) $(1)/lib
-	$(CP) $(TOOLCHAIN_DIR)/lib$(LIB_SUFFIX)/libgcc_s.so.* $(1)/lib/
+	$(CP) $(TOOLCHAIN_DIR)/lib/libgcc_s.so.* $(1)/lib/
   endef
 
   define Package/libssp/install
 	$(INSTALL_DIR) $(1)/lib
-	$(CP) $(TOOLCHAIN_DIR)/lib$(LIB_SUFFIX)/libssp.so.* $(1)/lib/
+	$(CP) $(TOOLCHAIN_DIR)/lib/libssp.so.* $(1)/lib/
   endef
 
   define Package/libstdcpp/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(TOOLCHAIN_DIR)/usr/lib$(LIB_SUFFIX)/libstdc++.so.* $(1)/usr/lib/
+	$(CP) $(TOOLCHAIN_DIR)/usr/lib/libstdc++.so.* $(1)/usr/lib/
   endef
 
   use_libutil=$(if $(CONFIG_USE_GLIBC)$(CONFIG_EGLIBC_OPTION_EGLIBC_UTMP),libutil)
@@ -433,7 +425,15 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
 
   define Package/uClibc/install
 	$(INSTALL_DIR) $(1)/lib
-	for file in ld$(LIB_SUFFIX)-uClibc libc libcrypt libdl libm libnsl libresolv libuClibc libutil; do \
+	$(CP) \
+		$(TOOLCHAIN_DIR)/lib/ld*-uClibc.so.* \
+		$(TOOLCHAIN_DIR)/lib/ld*-uClibc-$(LIBC_SO_VERSION).so \
+		$(1)/lib/
+	$(CP) \
+		$(TOOLCHAIN_DIR)/lib/libc.so.* \
+		$(TOOLCHAIN_DIR)/lib/libuClibc-$(LIBC_SO_VERSION).so \
+		$(1)/lib/
+	for file in libcrypt libdl libm libnsl libresolv libutil; do \
 		$(CP) $(TOOLCHAIN_DIR)/lib/$$$$file.so.* $(1)/lib/; \
 		$(CP) $(TOOLCHAIN_DIR)/lib/$$$$file-$(LIBC_SO_VERSION).so $(1)/lib/; \
 	done
diff --git a/package/base-files/files/etc/banner b/package/base-files/files/etc/banner
index b8fe7eba5..7b32caf63 100644
--- a/package/base-files/files/etc/banner
+++ b/package/base-files/files/etc/banner
@@ -3,8 +3,8 @@
  |   -   ||  _  |  -__|     ||  |  |  ||   _||   _|
  |_______||   __|_____|__|__||________||__|  |____|
           |__| W I R E L E S S   F R E E D O M
- KAMIKAZE (bleeding edge, $R) ------------------
-  * 10 oz Vodka       Shake well with ice and strain
-  * 10 oz Triple sec  mixture into 10 shot glasses.
-  * 10 oz lime juice  Salute!
+ Backfire (10.03, $R) --------------------------
+  * 1/3 shot Kahlua    In a shot glass, layer Kahlua 
+  * 1/3 shot Bailey's  on the bottom, then Bailey's, 
+  * 1/3 shot Vodka     then Vodka.
  ---------------------------------------------------
diff --git a/package/base-files/files/etc/openwrt_release b/package/base-files/files/etc/openwrt_release
new file mode 100644
index 000000000..fc74a4eab
--- /dev/null
+++ b/package/base-files/files/etc/openwrt_release
@@ -0,0 +1,4 @@
+DISTRIB_ID="OpenWrt"
+DISTRIB_RELEASE="10.03"
+DISTRIB_CODENAME="backfire"
+DISTRIB_DESCRIPTION="OpenWrt Backfire 10.03"
diff --git a/package/base-files/files/etc/openwrt_version b/package/base-files/files/etc/openwrt_version
new file mode 100644
index 000000000..6de207cda
--- /dev/null
+++ b/package/base-files/files/etc/openwrt_version
@@ -0,0 +1 @@
+10.03
diff --git a/package/block-extroot/Makefile b/package/block-extroot/Makefile
index d24cbd134..eaf01dad5 100644
--- a/package/block-extroot/Makefile
+++ b/package/block-extroot/Makefile
@@ -26,7 +26,7 @@ endef
 define Package/block-extroot
   $(call Package/block-extroot/Default)
   MENU:=1
-  DEPENDS:=+block-mount @PACKAGE_kmod-ide-core||PACKAGE_kmod-ata-core||PACKAGE_kmod-usb-storage||PACKAGE_kmod-mmc||PACKAGE_kmod-broadcom-sdhc
+  DEPENDS:=+block-mount @PACKAGE_kmod-ide-core||PACKAGE_kmod-usb-storage||PACKAGE_kmod-mmc||PACKAGE_kmod-broadcom-sdhc
 endef
 
 define Package/block-extroot/config
diff --git a/package/block-mount/Makefile b/package/block-mount/Makefile
index 38fe49101..a55ea0246 100644
--- a/package/block-mount/Makefile
+++ b/package/block-mount/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=block-mount
 PKG_VERSION:=0.1.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -40,6 +40,10 @@ endef
 define Build/Compile
 endef
 
+define Package/block-mount/conffiles
+/etc/config/fstab
+endef
+
 define Package/block-mount/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/fstab.init $(1)/etc/init.d/fstab
diff --git a/package/broadcom-diag/src/diag.c b/package/broadcom-diag/src/diag.c
index 0871a02a7..38f51cb65 100644
--- a/package/broadcom-diag/src/diag.c
+++ b/package/broadcom-diag/src/diag.c
@@ -377,7 +377,7 @@ static struct platform_t __initdata platforms[] = {
 		},
 		.leds		= {
 			{ .name = "power",	.gpio = 1 << 0, .polarity = REVERSE },
-			{ .name = "usb",	.gpio = 1 << 2, .polarity = NORMAL },
+			{ .name = "usb",	.gpio = 1 << 2, .polarity = REVERSE },
 		},
 	},
 	[WL300G] = {
diff --git a/package/busybox/target-config.in b/package/busybox/Config.in
similarity index 86%
rename from package/busybox/target-config.in
rename to package/busybox/Config.in
index b06556134..1002a5a0d 100644
--- a/package/busybox/target-config.in
+++ b/package/busybox/Config.in
@@ -1,3 +1,6 @@
+menu "Configuration"
+	depends on PACKAGE_busybox
+
 config BUSYBOX_CONFIG_FEATURE_DEVFS
 	bool
 	default y if LINUX_2_4
@@ -31,3 +34,6 @@ config BUSYBOX_CONFIG_HUSH
 	default y if NOMMU
 	default n if !NOMMU
 
+source "package/busybox/config/Config.in"
+
+endmenu
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 214b7f3c9..e6934a6eb 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=busybox
-PKG_VERSION:=1.16.1
+PKG_VERSION:=1.15.3
 PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.busybox.net/downloads \
 		http://distfiles.gentoo.org/distfiles/
-PKG_MD5SUM:=319486ec65078d07fde26eb620fecde7
+PKG_MD5SUM:=6059ac9456de6fb18dc8ee4cd0ec9240
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -30,7 +30,6 @@ init-$(CONFIG_BUSYBOX_CONFIG_TELNETD) += telnet
 define Package/busybox
   SECTION:=base
   CATEGORY:=Base system
-  MAINTAINER:=Nicolas Thill <nico@openwrt.org>
   TITLE:=Core utilities for embedded Linux
   URL:=http://busybox.net/
   MENU:=1
@@ -42,11 +41,7 @@ define Package/busybox/description
 endef
 
 define Package/busybox/config
-	menu "Configuration"
-		depends on PACKAGE_busybox
-		source "$(SOURCE)/target-config.in"
-		source "$(SOURCE)/config/Config.in"
-	endmenu
+	source "$(SOURCE)/Config.in"
 endef
 
 define Build/Configure
diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in
index a4fbc0ce6..fb08ca9b2 100644
--- a/package/busybox/config/util-linux/Config.in
+++ b/package/busybox/config/util-linux/Config.in
@@ -213,12 +213,6 @@ config BUSYBOX_CONFIG_FSCK_MINIX
 	  check for and attempt to repair any corruption that occurs to a minix
 	  filesystem.
 
-config BUSYBOX_CONFIG_MKFS_EXT2
-	bool "mkfs_ext2"
-	default n
-	help
-	  Utility to create EXT2 filesystems.
-
 config BUSYBOX_CONFIG_MKFS_MINIX
 	bool "mkfs_minix"
 	default n
@@ -239,12 +233,6 @@ config BUSYBOX_CONFIG_FEATURE_MINIX2
 	  this. If you enabled 'mkfs_minix' then you almost certainly want to
 	  be using the version 2 filesystem support.
 
-config BUSYBOX_CONFIG_MKFS_REISER
-	bool "mkfs_reiser"
-	default n
-	help
-	  Utility to create ReiserFS filesystems.
-
 config BUSYBOX_CONFIG_MKFS_VFAT
 	bool "mkfs_vfat"
 	default n
@@ -348,24 +336,6 @@ config BUSYBOX_CONFIG_LOSETUP
 	  file or block device, and to query the status of a loop device. This
 	  version does not currently support enabling data encryption.
 
-config BUSYBOX_CONFIG_LSPCI
-	bool "lspci"
-	default n
-	help
-	  lspci is a utility for displaying information about PCI buses in the
-	  system and devices connected to them.
-
-	  This version uses sysfs (/sys/bus/pci/devices) only.
-
-config BUSYBOX_CONFIG_LSUSB
-	bool "lsusb"
-	default n
-	help
-	  lsusb is a utility for displaying information about USB buses in the
-	  system and devices connected to them.
-
-	  This version uses sysfs (/sys/bus/usb/devices) only.
-
 config BUSYBOX_CONFIG_MDEV
 	bool "mdev"
 	default n
@@ -475,13 +445,6 @@ config BUSYBOX_CONFIG_FEATURE_VOLUMEID_EXT
 	help
 	  TODO
 
-config BUSYBOX_CONFIG_FEATURE_VOLUMEID_BTRFS
-	bool "btrfs filesystem"
-	default y
-	depends on BUSYBOX_CONFIG_VOLUMEID
-	help
-	  TODO
-
 config BUSYBOX_CONFIG_FEATURE_VOLUMEID_REISERFS
 	bool "Reiser filesystem"
 	default y
@@ -726,7 +689,6 @@ config BUSYBOX_CONFIG_FEATURE_MOUNT_LABEL
 	help
 	  This allows for specifying a device by label or uuid, rather than by
 	  name. This feature utilizes the same functionality as blkid/findfs.
-	  This also enables label or uuid support for swapon.
 
 config BUSYBOX_CONFIG_FEATURE_MOUNT_NFS
 	bool "Support mounting NFS file systems"
diff --git a/package/compcache/Config.in b/package/compcache/Config.in
index 9904237ed..11a94d434 100644
--- a/package/compcache/Config.in
+++ b/package/compcache/Config.in
@@ -1,15 +1,14 @@
-# compcache configuration
+menu "Configuration"
+	depends on PACKAGE_kmod-compcache
 
 config COMPCACHE_ENABLE
 	bool "enabled on boot"
 	default n
-	depends on PACKAGE_kmod-compcache
 	help
 	  Enables compressed ram swap devices.
 
 config COMPCACHE_RAM_REPORTED
 	string "swap space reported to kernel in kb"
-	depends on PACKAGE_kmod-compcache
 	default "2048"
 	help
 	  This is the amount of memory that will be reported 
@@ -21,10 +20,10 @@ config COMPCACHE_RAM_REPORTED
 
 config COMPCACHE_BACKUP_DEV
 	string "Backup device for compcache"
-	depends on PACKAGE_kmod-compcache
 	default ""
 	help
 	  Compcache will use this as a backup device for swap.
 	  Example:
 	         /dev/sda5
 
+endmenu
diff --git a/package/compcache/Makefile b/package/compcache/Makefile
index 2fec28952..13a9056db 100644
--- a/package/compcache/Makefile
+++ b/package/compcache/Makefile
@@ -26,6 +26,7 @@ define KernelPackage/compcache
   VERSION:=$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)+$(PKG_RELEASE)
   FILES:=$(PKG_BUILD_DIR)/ramzswap.$(LINUX_KMOD_SUFFIX) \
 	 $(PKG_BUILD_DIR)/sub-projects/compression/lzo-kmod/lzo1x.$(LINUX_KMOD_SUFFIX)
+  MENU:=1
 endef
 
 
diff --git a/package/cyassl/patches/120-makefile_destdir.patch b/package/cyassl/patches/120-makefile_destdir.patch
index d7ad1da67..29b0d0a05 100644
--- a/package/cyassl/patches/120-makefile_destdir.patch
+++ b/package/cyassl/patches/120-makefile_destdir.patch
@@ -1,6 +1,6 @@
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -8,14 +8,11 @@ basic:
+@@ -8,14 +8,11 @@ basic:
  
  openssl-links:
  	cd lib; ln -s ../src/.libs/libcyassl.a libcrypto.a; \
diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index 895a5c295..77b8f82a6 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmasq
 PKG_VERSION:=2.52
-PKG_RELEASE:=2
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index 4cd941cfd..15f856d4e 100644
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -296,9 +296,17 @@ dhcp_domain_add() {
 	local raddr="${4:+$4.$3.$2.$1.in-addr.arpa}"
 
 	for name in $names; do
-		append args "-A /$name${DOMAIN:+.$DOMAIN}/$ip"
-		[ -n "$raddr" ] && \
-			append args "--ptr-record=$raddr,$name${DOMAIN:+.$DOMAIN}"
+		local fqdn="$name"
+
+		[ "${fqdn%.*}" == "$fqdn" ] && \
+			fqdn="$fqdn${DOMAIN:+.$DOMAIN}"
+
+		append args "-A /$fqdn/$ip"
+		
+		[ -n "$raddr" ] && {
+			append args "--ptr-record=$raddr,$fqdn"
+			raddr=""
+		}
 	done
 }
 
diff --git a/package/fuse/patches/100-cross_compile.patch b/package/fuse/patches/100-cross_compile.patch
deleted file mode 100644
index e69de29bb..000000000
diff --git a/package/fuse/patches/102-no_depmod.patch b/package/fuse/patches/102-no_depmod.patch
deleted file mode 100644
index e69de29bb..000000000
diff --git a/package/fuse/patches/200-disable_compat.patch b/package/fuse/patches/200-disable_compat.patch
deleted file mode 100644
index e69de29bb..000000000
diff --git a/package/hostapd/patches/370-basic_rates.patch b/package/hostapd/patches/370-basic_rates.patch
new file mode 100644
index 000000000..ef4691bbd
--- /dev/null
+++ b/package/hostapd/patches/370-basic_rates.patch
@@ -0,0 +1,70 @@
+--- a/src/ap/hostapd.c
++++ b/src/ap/hostapd.c
+@@ -707,6 +707,16 @@ int hostapd_setup_interface_complete(str
+ 		}
+ 	}
+ 
++	if (iface->current_mode) {
++		if (hostapd_prepare_rates(hapd, iface->current_mode)) {
++			wpa_printf(MSG_ERROR, "Failed to prepare rates table.");
++			hostapd_logger(hapd, NULL, HOSTAPD_MODULE_IEEE80211,
++					   HOSTAPD_LEVEL_WARNING,
++					   "Failed to prepare rates table.");
++			return -1;
++		}
++	}
++
+ 	if (hapd->iconf->rts_threshold > -1 &&
+ 	    hostapd_set_rts(hapd, hapd->iconf->rts_threshold)) {
+ 		wpa_printf(MSG_ERROR, "Could not set RTS threshold for "
+--- a/src/ap/hw_features.c
++++ b/src/ap/hw_features.c
+@@ -101,8 +101,8 @@ int hostapd_get_hw_features(struct hosta
+ }
+ 
+ 
+-static int hostapd_prepare_rates(struct hostapd_data *hapd,
+-				 struct hostapd_hw_modes *mode)
++int hostapd_prepare_rates(struct hostapd_data *hapd,
++			  struct hostapd_hw_modes *mode)
+ {
+ 	int i, num_basic_rates = 0;
+ 	int basic_rates_a[] = { 60, 120, 240, -1 };
+@@ -668,14 +668,6 @@ int hostapd_select_hw_mode(struct hostap
+ 		return -1;
+ 	}
+ 
+-	if (hostapd_prepare_rates(iface->bss[0], iface->current_mode)) {
+-		wpa_printf(MSG_ERROR, "Failed to prepare rates table.");
+-		hostapd_logger(iface->bss[0], NULL, HOSTAPD_MODULE_IEEE80211,
+-					   HOSTAPD_LEVEL_WARNING,
+-					   "Failed to prepare rates table.");
+-		return -1;
+-	}
+-
+ 	return 0;
+ }
+ 
+--- a/src/ap/hw_features.h
++++ b/src/ap/hw_features.h
+@@ -25,6 +25,8 @@ const char * hostapd_hw_mode_txt(int mod
+ int hostapd_hw_get_freq(struct hostapd_data *hapd, int chan);
+ int hostapd_hw_get_channel(struct hostapd_data *hapd, int freq);
+ int hostapd_check_ht_capab(struct hostapd_iface *iface);
++int hostapd_prepare_rates(struct hostapd_data *hapd,
++			  struct hostapd_hw_modes *mode);
+ #else /* NEED_AP_MLME */
+ static inline void
+ hostapd_free_hw_features(struct hostapd_hw_modes *hw_features,
+@@ -56,6 +58,11 @@ static inline int hostapd_check_ht_capab
+ {
+ 	return 0;
+ }
++static inline int hostapd_prepare_rates(struct hostapd_data *hapd,
++					struct hostapd_hw_modes *mode)
++{
++	return 0;
++}
+ 
+ #endif /* NEED_AP_MLME */
+ 
diff --git a/package/ifx-tapi/Config.in b/package/ifx-tapi/Config.in
index 56defb3dd..e360883fd 100644
--- a/package/ifx-tapi/Config.in
+++ b/package/ifx-tapi/Config.in
@@ -1,3 +1,6 @@
+menu "Configuration"
+	depends on PACKAGE_kmod-ifx-tapi
+
 config VOICE_CPE_TAPI_FAX
 	bool "fax relay and modem support"
 	default n
@@ -69,3 +72,5 @@ config VOICE_CPE_TAPI_TRACES
 	help
 		enable driver traces with different trace levels to be
 		configured dynamically from the application or during insmod
+
+endmenu
diff --git a/package/ifx-tapi/Makefile b/package/ifx-tapi/Makefile
index fe91ad015..e4638186e 100644
--- a/package/ifx-tapi/Makefile
+++ b/package/ifx-tapi/Makefile
@@ -26,6 +26,7 @@ define KernelPackage/ifx-tapi
   DEPENDS:=+kmod-ifxos @BROKEN
   FILES:=$(PKG_BUILD_DIR)/src/drv_tapi.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,20,drv_tapi)
+  MENU:=1
 endef
 
 define KernelPackage/ifx-tapi/description
@@ -33,9 +34,7 @@ define KernelPackage/ifx-tapi/description
 endef
 
 define KernelPackage/ifx-tapi/config
-	if PACKAGE_kmod-ifx-tapi
-		source "$(SOURCE)/Config.in"
-	endif
+	source "$(SOURCE)/Config.in"
 endef
 
 CONFIGURE_ARGS += \
diff --git a/package/ifx-tapidemo/Config.in b/package/ifx-tapidemo/Config.in
index 32594ba9c..42ec5fa1c 100644
--- a/package/ifx-tapidemo/Config.in
+++ b/package/ifx-tapidemo/Config.in
@@ -1,3 +1,5 @@
+menu "Configuration"
+	depends on PACKAGE_ifx-tapidemo
 choice
 	prompt "board selection"
 	default VOICE_CPE_TAPIDEMO_BOARD_EASY50712_V3  if TARGET_ifxmips_platform_danube
@@ -34,3 +36,4 @@ config  VOICE_CPE_TAPIDEMO_FAX_T.38_FW
 	help
 		enable T.38 fax relay demo.
 
+endmenu
diff --git a/package/ifx-tapidemo/Makefile b/package/ifx-tapidemo/Makefile
index 217d4641a..b294d9d3a 100644
--- a/package/ifx-tapidemo/Makefile
+++ b/package/ifx-tapidemo/Makefile
@@ -26,6 +26,7 @@ define Package/ifx-tapidemo
   URL:=http://www.lantiq.com/
   MAINTAINER:=Lantiq
   DEPENDS:=+kmod-ifx-tapi +kmod-ifx-vmmc @BROKEN
+  MENU:=1
 endef
 
 define Package/ifx-tapidemo/description
@@ -33,9 +34,7 @@ define Package/ifx-tapidemo/description
 endef
 
 define Package/ifx-tapidemo/config
-	if PACKAGE_ifx-tapidemo
-		source "$(SOURCE)/Config.in"
-	endif
+	source "$(SOURCE)/Config.in"
 endef
 
 CONFIGURE_ARGS += \
diff --git a/package/ifx-vmmc/Config.in b/package/ifx-vmmc/Config.in
index bd3c032d3..2a7894e7f 100644
--- a/package/ifx-vmmc/Config.in
+++ b/package/ifx-vmmc/Config.in
@@ -1,3 +1,5 @@
+menu "Configuration"
+	depends on PACKAGE_kmod-ifx-vmmc
 choice
 	prompt "device selection"
 	default VOICE_CPE_VMMC_WITH_DEVICE_DANUBE_extract
@@ -47,3 +49,5 @@ config VOICE_CPE_VMMC_MPS_HISTORY_SIZE
 		MPS history buffer (default=128 words, maximum=512 words, 0=disable)
 		To opimize the memory footprint in RAM, you might want to set the
 		buffer size to 0.
+
+endmenu
diff --git a/package/ifx-vmmc/Makefile b/package/ifx-vmmc/Makefile
index 945d5ba7e..0fa3649e9 100644
--- a/package/ifx-vmmc/Makefile
+++ b/package/ifx-vmmc/Makefile
@@ -26,6 +26,7 @@ define KernelPackage/ifx-vmmc
   DEPENDS:=+kmod-ifx-tapi @BROKEN
   FILES:=$(PKG_BUILD_DIR)/src/drv_vmmc.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,25,drv_vmmc)
+  MENU:=1
 endef
 
 define KernelPackage/ifx-vmmc/description
@@ -33,9 +34,7 @@ define KernelPackage/ifx-vmmc/description
 endef
 
 define KernelPackage/ifx-vmmc/config
-	if PACKAGE_kmod-ifx-vmmc
-		source "$(SOURCE)/Config.in"
-	endif
+	source "$(SOURCE)/Config.in"
 endef
 
 CONFIGURE_ARGS += \
diff --git a/package/ifxmips-dsl-api/Config.in b/package/ifxmips-dsl-api/Config.in
index 56177d168..72942e6ff 100644
--- a/package/ifxmips-dsl-api/Config.in
+++ b/package/ifxmips-dsl-api/Config.in
@@ -1,6 +1,8 @@
+menu "Configuration"
+	depends on PACKAGE_kmod-ifxmips-dsl-api
+
 choice
 	prompt "Firmware"
-	depends on PACKAGE_kmod-ifxmips-dsl-api
 	default IFXMIPS_ANNEX_B
 	help
 	  This option controls which firmware is loaded
@@ -20,12 +22,12 @@ endchoice
 config IFXMIPS_DSL_FIRMWARE
 	bool "ifxmips-dsl firmware extractor"
 	default y
-	depends on PACKAGE_kmod-ifxmips-dsl-api
 	help
 	  Say Y, if you need ifxmips-dsl to auto extract the firmware for you from the a800 firmware image
 
 config IFXMIPS_DSL_DEBUG
 	bool "ifxmips-dsl debugging"
-	depends on PACKAGE_kmod-ifxmips-dsl-api
 	help
 	  Say Y, if you need ifxmips-dsl to display debug messages.
+
+endmenu
diff --git a/package/ifxmips-dsl-api/Makefile b/package/ifxmips-dsl-api/Makefile
index c0e1cea08..a5cd221a5 100644
--- a/package/ifxmips-dsl-api/Makefile
+++ b/package/ifxmips-dsl-api/Makefile
@@ -39,6 +39,7 @@ define KernelPackage/ifxmips-dsl-api
 	$(PKG_BUILD_DIR)/src/drv_dsl_cpe_api.$(LINUX_KMOD_SUFFIX) \
 	$(PKG_BUILD_DIR)/src/mei/ifxmips_atm.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,ifxmips_mei drv_dsl_cpe_api ifxmips_atm)
+  MENU:=1
 endef
 
 define KernelPackage/ifxmips-dsl-api/description
diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk
index 53e218d26..0c0c91244 100644
--- a/package/kernel/modules/netsupport.mk
+++ b/package/kernel/modules/netsupport.mk
@@ -193,6 +193,11 @@ endef
 $(eval $(call KernelPackage,ipip))
 
 
+IPSEC-m:= \
+	key/af_key \
+	xfrm/xfrm_ipcomp \
+	xfrm/xfrm_user \
+
 define KernelPackage/ipsec
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IPsec related modules (IPv4 and IPv6)
@@ -201,22 +206,30 @@ define KernelPackage/ipsec
 	CONFIG_NET_KEY \
 	CONFIG_XFRM_USER \
 	CONFIG_XFRM_IPCOMP
-  FILES:= \
-	$(LINUX_DIR)/net/key/af_key.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/net/xfrm/xfrm_user.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/net/xfrm/xfrm_ipcomp.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(foreach mod,$(IPSEC-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  AUTOLOAD:=$(call AutoLoad,30,$(notdir $(IPSEC-m)))
 endef
 
 define KernelPackage/ipsec/description
  Kernel modules for IPsec support in both IPv4 and IPv6.
  Includes:
  - af_key
+ - xfrm_ipcomp
  - xfrm_user
 endef
 
 $(eval $(call KernelPackage,ipsec))
 
 
+IPSEC4-m:= \
+	ipv4/ah4 \
+	ipv4/esp4 \
+	ipv4/xfrm4_mode_beet \
+	ipv4/xfrm4_mode_transport \
+	ipv4/xfrm4_mode_tunnel \
+	ipv4/xfrm4_tunnel \
+	ipv4/ipcomp \
+
 define KernelPackage/ipsec4
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IPsec related modules (IPv4)
@@ -229,9 +242,8 @@ define KernelPackage/ipsec4
 	CONFIG_INET_XFRM_MODE_TRANSPORT \
 	CONFIG_INET_XFRM_MODE_TUNNEL \
 	CONFIG_INET_XFRM_TUNNEL
-  FILES:= $(foreach mod,ah4 esp4 ipcomp xfrm4_mode_beet xfrm4_mode_transport xfrm4_mode_tunnel xfrm4_tunnel , \
-	$(LINUX_DIR)/net/ipv4/$(mod).$(LINUX_KMOD_SUFFIX) \
-  )
+  FILES:=$(foreach mod,$(IPSEC4-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  AUTOLOAD:=$(call AutoLoad,32,$(notdir $(IPSEC4-m)))
 endef
 
 define KernelPackage/ipsec4/description
@@ -249,6 +261,15 @@ endef
 $(eval $(call KernelPackage,ipsec4))
 
 
+IPSEC6-m:= \
+	ipv6/ah6 \
+	ipv6/esp6 \
+	ipv6/xfrm6_mode_beet \
+	ipv6/xfrm6_mode_transport \
+	ipv6/xfrm6_mode_tunnel \
+	ipv6/xfrm6_tunnel \
+	ipv6/ipcomp6 \
+
 define KernelPackage/ipsec6
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IPsec related modules (IPv6)
@@ -261,9 +282,8 @@ define KernelPackage/ipsec6
 	CONFIG_INET6_XFRM_MODE_TRANSPORT \
 	CONFIG_INET6_XFRM_MODE_TUNNEL \
 	CONFIG_INET6_XFRM_TUNNEL
-  FILES:= $(foreach mod,ah6 esp6 ipcomp6 xfrm6_mode_beet xfrm6_mode_transport xfrm6_mode_tunnel xfrm6_tunnel, \
-	$(LINUX_DIR)/net/ipv6/$(mod).$(LINUX_KMOD_SUFFIX) \
-  )
+  FILES:=$(foreach mod,$(IPSEC6-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  AUTOLOAD:=$(call AutoLoad,32,$(notdir $(IPSEC6-m)))
 endef
 
 define KernelPackage/ipsec6/description
@@ -289,9 +309,7 @@ define KernelPackage/iptunnel4
   KCONFIG:= \
 	CONFIG_NET_IPIP \
 	CONFIG_INET_TUNNEL
-  FILES:= $(foreach mod,tunnel4, \
-	$(LINUX_DIR)/net/ipv4/$(mod).$(LINUX_KMOD_SUFFIX) \
-  )
+  FILES:=$(LINUX_DIR)/net/ipv4/tunnel4.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,31,tunnel4)
 endef
 
@@ -308,9 +326,7 @@ define KernelPackage/iptunnel6
   DEPENDS:= @LINUX_2_6 +kmod-ipv6
   KCONFIG:= \
 	CONFIG_INET6_TUNNEL
-  FILES:= $(foreach mod,tunnel6, \
-	$(LINUX_DIR)/net/ipv6/$(mod).$(LINUX_KMOD_SUFFIX) \
-  )
+  FILES:=$(LINUX_DIR)/net/ipv6/tunnel6.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,31,tunnel6)
 endef
 
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index a000656bf..97ce3d3b7 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -261,7 +261,8 @@ $(eval $(call KernelPackage,ssb))
 define KernelPackage/bluetooth
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Bluetooth support
-  DEPENDS:=@USB_SUPPORT +kmod-usb-core +!TARGET_x86:kmod-hid
+  DEPENDS:=@USB_SUPPORT +kmod-crc16 +kmod-usb-core +!TARGET_x86:kmod-hid \
+	+(TARGET_x86||TARGET_s3c24xx||TARGET_brcm47xx||TARGET_ar71xx):kmod-rfkill
   KCONFIG:= \
 	CONFIG_BLUEZ \
 	CONFIG_BLUEZ_L2CAP \
@@ -798,7 +799,7 @@ $(eval $(call KernelPackage,mmc-atmelmci,1))
 define KernelPackage/cs5535-gpio
   SUBMENU:=$(OTHER_MENU)
   TITLE:=AMD CS5535/CS5536 GPIO driver
-  DEPENDS:=@TARGET_x86||@TARGET_olpc
+  DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_CS5535_GPIO
   FILES:=$(LINUX_DIR)/drivers/char/cs5535_gpio.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,cs5535_gpio)
@@ -851,7 +852,7 @@ $(eval $(call KernelPackage,textsearch))
 define KernelPackage/rfkill
   SUBMENU:=$(OTHER_MENU)
   TITLE:=RF switch subsystem support
-  DEPENDS:=@TARGET_x86||TARGET_olpc||TARGET_s3c24xx||TARGET_brcm47xx||TARGET_ar71xx
+  DEPENDS:=@TARGET_x86||TARGET_s3c24xx||TARGET_brcm47xx||TARGET_ar71xx
   KCONFIG:= \
     CONFIG_RFKILL \
     CONFIG_RFKILL_INPUT=y \
diff --git a/package/kernel/modules/sound.mk b/package/kernel/modules/sound.mk
index 46bc6853a..a3d148634 100644
--- a/package/kernel/modules/sound.mk
+++ b/package/kernel/modules/sound.mk
@@ -10,7 +10,7 @@ SOUND_MENU:=Sound Support
 define KernelPackage/sound-core
   SUBMENU:=$(SOUND_MENU)
   TITLE:=Sound support
-  DEPENDS:=@AUDIO_SUPPORT
+  DEPENDS:=@AUDIO_SUPPORT +!TARGET_x86:kmod-input-core
   KCONFIG:= \
 	CONFIG_SOUND \
 	CONFIG_SND \
diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index c962e340e..3af58441b 100644
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -158,6 +158,24 @@ endef
 $(eval $(call KernelPackage,usb-octeon))
 
 
+define KernelPackage/usb-isp116x-hcd
+$(call KernelPackage/usb/Depends,@TARGET_ppc40x)
+  TITLE:=Support for the ISP116x USB Host Controller
+  KCONFIG:= \
+	CONFIG_USB_ISP116X_HCD \
+	CONFIG_USB_ISP116X_HCD_OF=y \
+	CONFIG_USB_ISP116X_HCD_PLATFORM=n
+  FILES:=$(LINUX_DIR)/drivers/usb/host/isp116x-hcd.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50,isp116x-hcd)
+endef
+
+define KernelPackage/usb-isp116x-hcd/description
+  Kernel support for the ISP116X USB Host Controller
+endef
+
+$(eval $(call KernelPackage,usb-isp116x-hcd))
+
+
 define KernelPackage/usb2
 $(call KernelPackage/usb/Depends,)
   TITLE:=Support for USB2 controllers
@@ -451,6 +469,24 @@ endef
 $(eval $(call KernelPackage,usb-serial-visor))
 
 
+define KernelPackage/usb-serial-cypress-m8
+$(call KernelPackage/usb-serial/Depends,)
+  TITLE:=Support for CypressM8 USB-Serial
+  KCONFIG:=CONFIG_USB_SERIAL_CYPRESS_M8
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/cypress_m8.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,65,cypress_m8)
+endef
+
+define KernelPackage/usb-serial-cypress-m8/description
+ Kernel support for devices with Cypress M8 USB to Serial chip
+ (for example, the Delorme Earthmate LT-20 GPS)
+ Supported microcontrollers in the CY4601 family are:
+       CY7C63741 CY7C63742 CY7C63743 CY7C64013
+endef
+
+$(eval $(call KernelPackage,usb-serial-cypress-m8))
+
+
 define KernelPackage/usb-serial-keyspan
 $(call KernelPackage/usb-serial/Depends,)
   TITLE:=Support for Keyspan USB-to-Serial devices
@@ -764,7 +800,7 @@ $(eval $(call KernelPackage,usb-net-cdc-ether))
 define KernelPackage/usb-net-rndis
 $(call KernelPackage/usb-net/Depends,@LINUX_2_6 +kmod-usb-net-cdc-ether)
   TITLE:=Support for RNDIS connections
-  KCONFIG:=CONFIG_USB_NET_RNDIS_HOST 
+  KCONFIG:=CONFIG_USB_NET_RNDIS_HOST
   FILES:= $(LINUX_DIR)/drivers/$(USBNET_DIR)/rndis_host.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,62,rndis_host)
 endef
diff --git a/package/kexec-tools/kexec-config.in b/package/kexec-tools/Config.in
similarity index 84%
rename from package/kexec-tools/kexec-config.in
rename to package/kexec-tools/Config.in
index 25fed1b7c..60c819d79 100644
--- a/package/kexec-tools/kexec-config.in
+++ b/package/kexec-tools/Config.in
@@ -1,7 +1,9 @@
+menu "Configuration"
+	depends on PACKAGE_kexec-tools
 
 config KEXEC_TOOLS_TARGET_NAME
 	string
-	prompt "Target name for kexec kernel" if PACKAGE_kexec-tools
+	prompt "Target name for kexec kernel"
 	default EXTRA_TARGET_ARCH_NAME	if powerpc64
 	default ARCH
 	help
@@ -12,8 +14,8 @@ config KEXEC_TOOLS_TARGET_NAME
 config KEXEC_TOOLS_kdump
 	bool
 	prompt "kdump support"
-	depends on PACKAGE_kexec-tools
 	default n
 	help
 	  Include the kdump utility.
 
+endmenu
diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile
index d350bb2c8..978bb6fd5 100644
--- a/package/kexec-tools/Makefile
+++ b/package/kexec-tools/Makefile
@@ -34,7 +34,7 @@ define Package/kexec-tools/description
 endef
 
 define Package/kexec-tools/config
-	source "$(SOURCE)/kexec-config.in"
+	source "$(SOURCE)/Config.in"
 endef
 
 KEXEC_TARGET_NAME:=$(call qstrip,$(CONFIG_KEXEC_TOOLS_TARGET_NAME))-linux-$(TARGET_SUFFIX)
diff --git a/package/libpcap/Config.in b/package/libpcap/Config.in
index 1b9463e6a..ef32c1bc0 100644
--- a/package/libpcap/Config.in
+++ b/package/libpcap/Config.in
@@ -1,12 +1,15 @@
+menu "Configuration"
+	depends PACKAGE_libpcap
+
 config PCAP_HAS_USB
 	bool "Include USB support"
-	depends PACKAGE_libpcap
 	depends PACKAGE_kmod-usb-core
 	default n
 
 config PCAP_HAS_BT
 	bool "Include bluetooth support"
-	depends PACKAGE_libpcap
 	depends PACKAGE_kmod-bluetooth
 	depends BROKEN
 	default n
+
+endmenu
diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile
index fcc9987c0..a885f90c7 100644
--- a/package/libpcap/Makefile
+++ b/package/libpcap/Makefile
@@ -25,6 +25,7 @@ define Package/libpcap
   CATEGORY:=Libraries
   TITLE:=Low-level packet capture library
   URL:=http://www.tcpdump.org/
+  MENU:=1
 endef
 
 define Package/libpcap/description
@@ -33,7 +34,7 @@ capture.
 endef
 
 define Package/libpcap/config
-source "$(SOURCE)/Config.in"
+	source "$(SOURCE)/Config.in"
 endef
 
 TARGET_CFLAGS += \
diff --git a/package/mac80211/Config.in b/package/mac80211/Config.in
deleted file mode 100644
index 5994ba71e..000000000
--- a/package/mac80211/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-# mac80211 configuration
-
-config PACKAGE_MAC80211_DEBUGFS
-	bool "Export mac80211 internals in DebugFS"
-	depends on PACKAGE_kmod-mac80211
-	default y
-	---help---
-	  Select this to see extensive information about
-	  the internal state of mac80211 in debugfs.
-
-	  Say N unless you know you need this.
diff --git a/package/mac80211/Config.in.ath9k b/package/mac80211/Config.in.ath9k
deleted file mode 100644
index 70a36c97c..000000000
--- a/package/mac80211/Config.in.ath9k
+++ /dev/null
@@ -1,16 +0,0 @@
-# mac80211 configuration
-
-config PACKAGE_ATH9K_DEBUG
-	bool "ath9k debugging"
-	depends PACKAGE_kmod-ath9k && KERNEL_DEBUG_FS
-	---help---
-	  Say Y, if you need ath9k to display debug messages.
-	  Pass the debug mask as a module parameter:
-
-	  modprobe ath9k debug=0x00002000
-
-	  Look in ath9k/core.h for possible debug masks
-
-config PACKAGE_ATH9K_USE_MINSTREL
-	bool "use the new minstrel_ht rate control for ath9k"
-	depends PACKAGE_kmod-ath9k
diff --git a/package/mac80211/Config.in.b43 b/package/mac80211/Config.in.b43
deleted file mode 100644
index e1f4d37d7..000000000
--- a/package/mac80211/Config.in.b43
+++ /dev/null
@@ -1,79 +0,0 @@
-# B43 configuration
-
-choice
-	prompt "b43 firmware version"
-	depends on PACKAGE_kmod-b43
-	default B43_EXPERIMENTAL
-	help
-	  This option allows you to select the version of the b43 firmware.
-
-config B43_STABLE
-	bool "4.150.10.5 (stable)"
-	help
-	  Stable firmware for BCM43xx devices.
-
-	  If unsure, select this.
-
-config B43_EXPERIMENTAL
-	bool "4.178.10.4 (experimental)"
-	help
-	  Experimental firmware for BCM43xx devices.
-
-	  This firmware is not tested as much as the "stable" firmware.
-
-	  If unsure, select the "stable" firmware.
-
-config B43_OPENFIRMWARE
-	bool "Open FirmWare for WiFi networks"
-	help
-	  Opensource firmware for BCM43xx devices.
-
-	  Do _not_ select this, unless you know what you are doing.
-	  The Opensource firmware is not suitable for embedded devices, yet.
-	  It does not support QoS, which is bad for AccessPoints.
-	  It does not support hardware crypto acceleration, which is a showstopper
-	  for embedded devices with low CPU resources.
-
-	  If unsure, select the "stable" firmware.
-
-endchoice
-
-config B43_FW_SQUASH
-	bool "Remove unnecessary firmware files"
-	depends on PACKAGE_kmod-b43 && !B43_OPENFIRMWARE
-	default y
-	help
-	  This options allows you to remove unnecessary b43 firmware files
-	  from the final rootfs image. This can reduce the rootfs size by
-	  up to 200k.
-
-	  If unsure, say Y.
-
-config B43_FW_SQUASH_COREREVS
-	string "Core revisions to include"
-	depends on PACKAGE_kmod-b43 && B43_FW_SQUASH
-	default "5,6,7,8,9,10,13,14,15"
-	help
-	  This is a comma seperated list of core revision numbers.
-	  Example (keep files for rev5 only):
-	         5
-	  Example (keep files for rev5 and rev11):
-	         5,11
-
-config B43_FW_SQUASH_PHYTYPES
-	string "PHY types to include"
-	depends on PACKAGE_kmod-b43 && B43_FW_SQUASH
-	default "G,LP"
-	help
-	  This is a comma seperated list of PHY types:
-	  A         => A-PHY
-	  AG        => Dual A-PHY G-PHY
-	  G         => G-PHY
-	  LP        => LP-PHY
-	  N         => N-PHY
-
-	  Example (keep files for G-PHY only):
-	         G
-	  Example (keep files for G-PHY and N-PHY):
-	         G,N
-
diff --git a/package/mac80211/Config.in.b43legacy b/package/mac80211/Config.in.b43legacy
deleted file mode 100644
index 2e2f06e5a..000000000
--- a/package/mac80211/Config.in.b43legacy
+++ /dev/null
@@ -1,24 +0,0 @@
-# B43 configuration
-
-config B43LEGACY_FW_SQUASH
-	bool "Remove unnecessary firmware files"
-	depends on PACKAGE_kmod-b43legacy
-	default y
-	help
-	  This options allows you to remove unnecessary b43legacy firmware files
-	  from the final rootfs image. This can reduce the rootfs size by
-	  up to 50k.
-
-	  If unsure, say Y.
-
-config B43LEGACY_FW_SQUASH_COREREVS
-	string "Core revisions to include"
-	depends on PACKAGE_kmod-b43legacy && B43LEGACY_FW_SQUASH
-	default "1,2,3,4"
-	help
-	  This is a comma seperated list of core revision numbers.
-	  Example (keep files for rev4 only):
-	         4
-	  Example (keep files for rev2 and rev4):
-	         2,4
-
diff --git a/package/mac80211/Config.in.rt2x00 b/package/mac80211/Config.in.rt2x00
deleted file mode 100644
index f9855145b..000000000
--- a/package/mac80211/Config.in.rt2x00
+++ /dev/null
@@ -1,15 +0,0 @@
-# rt2x00 configuration
-
-config PACKAGE_RT2X00_LIB_DEBUGFS
-	bool "Enable rt2x00 debugfs support"
-	depends PACKAGE_kmod-rt2x00-lib && PACKAGE_MAC80211_DEBUGFS
-	---help---
-	  Enable creation of debugfs files for the rt2x00 drivers.
-	  These debugfs files support both reading and writing of the
-	  most important register types of the rt2x00 hardware.
-
-config PACKAGE_RT2X00_DEBUG
-	bool "Enable rt2x00 debug output"
-	depends PACKAGE_kmod-rt2x00-lib
-	---help---
-	  Enable debugging output for all rt2x00 modules
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index 29b855629..2ea39c89a 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -66,10 +66,23 @@ define KernelPackage/mac80211
   DEPENDS+= +kmod-crypto-core +kmod-crypto-arc4 +kmod-crypto-aes +kmod-cfg80211
   FILES:= $(PKG_BUILD_DIR)/net/mac80211/mac80211.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,21,mac80211)
+  MENU:=1
 endef
 
 define KernelPackage/mac80211/config
-	source "$(SOURCE)/Config.in"
+	menu "Configuration"
+		depends on PACKAGE_kmod-mac80211
+
+	config PACKAGE_MAC80211_DEBUGFS
+		bool "Export mac80211 internals in DebugFS"
+		default y
+		help
+		  Select this to see extensive information about
+		  the internal state of mac80211 in debugfs.
+
+		  Say N unless you know you need this.
+
+	endmenu
 endef
 
 define KernelPackage/mac80211/description
@@ -186,10 +199,27 @@ $(call KernelPackage/rt2x00/Default)
   TITLE+= (LIB)
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2x00lib.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,25,rt2x00lib)
+  MENU:=1
 endef
 
 define KernelPackage/rt2x00-lib/config
-	source "$(SOURCE)/Config.in.rt2x00"
+	menu "Configuration"
+		depends PACKAGE_kmod-rt2x00-lib
+
+	config PACKAGE_RT2X00_LIB_DEBUGFS
+		bool "Enable rt2x00 debugfs support"
+		depends PACKAGE_MAC80211_DEBUGFS
+		help
+		  Enable creation of debugfs files for the rt2x00 drivers.
+		  These debugfs files support both reading and writing of the
+		  most important register types of the rt2x00 hardware.
+
+	config PACKAGE_RT2X00_DEBUG
+		bool "Enable rt2x00 debug output"
+		help
+		  Enable debugging output for all rt2x00 modules
+
+	endmenu
 endef
 
 define KernelPackage/rt2x00-pci
@@ -321,24 +351,27 @@ define KernelPackage/zd1211rw
 endef
 
 define KernelPackage/ath/config
+	menu "Configuration"
+		depends on PACKAGE_kmod-ath
 
-config ATH_USER_REGD
-	bool "Force Atheros drivers to respect the user's regdomain settings"
-	depends on PACKAGE_kmod-ath
-	help
-		Atheros' idea of regulatory handling is that the EEPROM of the card defines
-		the regulatory limits and the user is only allowed to restrict the settings
-		even further, even if the country allows frequencies or power levels that
-		are forbidden by the EEPROM settings.
-		Select this option if you want the driver to respect the user's decision about
-		regulatory settings.
+	config ATH_USER_REGD
+		bool "Force Atheros drivers to respect the user's regdomain settings"
+		help
+		  Atheros' idea of regulatory handling is that the EEPROM of the card defines
+		  the regulatory limits and the user is only allowed to restrict the settings
+		  even further, even if the country allows frequencies or power levels that
+		  are forbidden by the EEPROM settings.
 
-config PACKAGE_ATH_DEBUG
-	bool "Atheros wireless debugging"
-	depends on PACKAGE_kmod-ath
-	help
-		Say Y, if you want to debug atheros wireless drivers.
-		Right now only ath9k makes use of this.
+		  Select this option if you want the driver to respect the user's decision about
+		  regulatory settings.
+
+	config PACKAGE_ATH_DEBUG
+		bool "Atheros wireless debugging"
+		help
+		  Say Y, if you want to debug atheros wireless drivers.
+		  Right now only ath9k makes use of this.
+
+	endmenu
 endef
 
 define KernelPackage/ath
@@ -347,6 +380,7 @@ define KernelPackage/ath
   DEPENDS+= @PCI_SUPPORT +kmod-mac80211
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,26,ath)
+  MENU:=1
 endef
 
 define KernelPackage/ath/description
@@ -377,6 +411,7 @@ define KernelPackage/ath9k
 	$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k_hw.$(LINUX_KMOD_SUFFIX) \
 	$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,27,ath9k_hw ath9k_common ath9k)
+  MENU:=1
 endef
 
 define KernelPackage/ath9k/description
@@ -385,7 +420,13 @@ Atheros IEEE 802.11n AR5008 and AR9001 family of chipsets.
 endef
 
 define KernelPackage/ath9k/config
-	source "$(SOURCE)/Config.in.ath9k"
+	menu "Configuration"
+		depends PACKAGE_kmod-ath9k
+
+	config PACKAGE_ATH9K_USE_MINSTREL
+		bool "use the new minstrel_ht rate control for ath9k"
+
+	endmenu
 endef
 
 USB8388FW_NAME:=usb8388
@@ -579,10 +620,93 @@ $(call KernelPackage/b43-common)
   TITLE:=Broadcom 43xx wireless support
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/b43/b43.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,b43)
+  MENU:=1
 endef
 
 define KernelPackage/b43/config
-	source "$(SOURCE)/Config.in.b43"
+	menu "Configuration"
+		depends on PACKAGE_kmod-b43
+
+	choice
+		prompt "b43 firmware version"
+		default B43_EXPERIMENTAL
+		help
+		  This option allows you to select the version of the b43 firmware.
+
+	config B43_STABLE
+		bool "4.150.10.5 (stable)"
+		help
+		  Stable firmware for BCM43xx devices.
+
+		  If unsure, select this.
+
+	config B43_EXPERIMENTAL
+		bool "4.178.10.4 (experimental)"
+		help
+		  Experimental firmware for BCM43xx devices.
+
+		  This firmware is not tested as much as the "stable" firmware.
+
+		  If unsure, select the "stable" firmware.
+
+	config B43_OPENFIRMWARE
+		bool "Open FirmWare for WiFi networks"
+		help
+		  Opensource firmware for BCM43xx devices.
+
+		  Do _not_ select this, unless you know what you are doing.
+		  The Opensource firmware is not suitable for embedded devices, yet.
+		  It does not support QoS, which is bad for AccessPoints.
+		  It does not support hardware crypto acceleration, which is a showstopper
+		  for embedded devices with low CPU resources.
+
+		  If unsure, select the "stable" firmware.
+
+	endchoice
+
+	config B43_FW_SQUASH
+		bool "Remove unnecessary firmware files"
+		depends on !B43_OPENFIRMWARE
+		default y
+		help
+		  This options allows you to remove unnecessary b43 firmware files
+		  from the final rootfs image. This can reduce the rootfs size by
+		  up to 200k.
+
+		  If unsure, say Y.
+
+	config B43_FW_SQUASH_COREREVS
+		string "Core revisions to include"
+		depends on B43_FW_SQUASH
+		default "5,6,7,8,9,10,13,14,15"
+		help
+		  This is a comma seperated list of core revision numbers.
+
+		  Example (keep files for rev5 only):
+		    5
+
+		  Example (keep files for rev5 and rev11):
+		    5,11
+
+	config B43_FW_SQUASH_PHYTYPES
+		string "PHY types to include"
+		depends on B43_FW_SQUASH
+		default "G,LP"
+		help
+		  This is a comma seperated list of PHY types:
+		    A  => A-PHY
+		    AG => Dual A-PHY G-PHY
+		    G  => G-PHY
+		    LP => LP-PHY
+		    N  => N-PHY
+
+		  Example (keep files for G-PHY only):
+		    G
+
+		  Example (keep files for G-PHY and N-PHY):
+		    G,N
+
+	endmenu
 endef
 
 define KernelPackage/b43/description
@@ -594,10 +718,37 @@ $(call KernelPackage/b43-common)
   TITLE:=Broadcom 43xx-legacy wireless support
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/b43legacy/b43legacy.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,b43legacy)
+  MENU:=1
 endef
 
 define KernelPackage/b43legacy/config
-	source "$(SOURCE)/Config.in.b43legacy"
+	menu "Configuration"
+		depends on PACKAGE_kmod-b43legacy
+
+	config B43LEGACY_FW_SQUASH
+		bool "Remove unnecessary firmware files"
+		default y
+		help
+		  This options allows you to remove unnecessary b43legacy firmware files
+		  from the final rootfs image. This can reduce the rootfs size by
+		  up to 50k.
+
+		  If unsure, say Y.
+
+	config B43LEGACY_FW_SQUASH_COREREVS
+		string "Core revisions to include"
+		depends on B43LEGACY_FW_SQUASH
+		default "1,2,3,4"
+		help
+		  This is a comma seperated list of core revision numbers.
+
+		  Example (keep files for rev4 only):
+		    4
+
+		  Example (keep files for rev2 and rev4):
+		    2,4
+
+	endmenu
 endef
 
 define KernelPackage/b43legacy/description
diff --git a/package/mac80211/patches/550-ath9k_bb_fix.patch b/package/mac80211/patches/550-ath9k_bb_fix.patch
index 0cfb6cf65..e97bcacad 100644
--- a/package/mac80211/patches/550-ath9k_bb_fix.patch
+++ b/package/mac80211/patches/550-ath9k_bb_fix.patch
@@ -15,8 +15,8 @@
 +	do {
 +		reg = REG_READ(ah, AR_OBS_BUS_1);
 +
-+		if ((reg & 0x7E7FFFEF) != 0x00702400)
-+			return true;
++		if ((reg & 0x7E7FFFEF) == 0x00702400)
++			continue;
 +
 +		switch (reg & 0x7E000B00) {
 +		case 0x1E000000:
diff --git a/package/madwifi/Config.in b/package/madwifi/Config.in
index 7f1e36d04..7b72eb854 100644
--- a/package/madwifi/Config.in
+++ b/package/madwifi/Config.in
@@ -1,13 +1,13 @@
-# MadWifi configuration
+menu "Configuration"
+	depends on PACKAGE_kmod-madwifi
 
 config MADWIFI_DEBUG
 	bool "Enable compilation of debugging features"
-	depends on DEVEL && PACKAGE_kmod-madwifi
+	depends on DEVEL
 	default n
 
 config MADWIFI_COMPRESSION
 	bool "Enable Atheros Super A/G Compression"
-	depends on PACKAGE_kmod-madwifi
 	depends !TARGET_ar71xx
 	default n
 	help
@@ -15,7 +15,6 @@ config MADWIFI_COMPRESSION
 
 config MADWIFI_SINGLE_MODULE
 	bool "Combine driver and net80211 into a single module"
-	depends on PACKAGE_kmod-madwifi
 	default y
 	help
 	  This option combines all driver and stack related code (except for HAL)
@@ -24,7 +23,6 @@ config MADWIFI_SINGLE_MODULE
 
 choice
 	prompt "Rate control algorithm selection"
-	depends on PACKAGE_kmod-madwifi
 	default MADWIFI_RCA_MINSTREL
 	help
 	  This option controls how MadWifi chooses its bitrate.
@@ -53,3 +51,5 @@ config MADWIFI_RCA_SAMPLERATE
 	  average transmission time.
 
 endchoice
+
+endmenu
diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile
index 4c8415a6b..4f01f008f 100644
--- a/package/madwifi/Makefile
+++ b/package/madwifi/Makefile
@@ -165,6 +165,7 @@ define KernelPackage/madwifi
   DEPENDS:=+wireless-tools @LINUX_2_6 @PCI_SUPPORT @(!(TARGET_avr32||TARGET_cobalt||TARGET_ep93xx||TARGET_etrax||TARGET_octeon||TARGET_pxcab||TARGET_sibyte)||BROKEN)
   FILES:=$(MADWIFI_FILES)
   AUTOLOAD:=$(call AutoLoad,50,$(MADWIFI_AUTOLOAD))
+  MENU:=1
 endef
 
 define KernelPackage/madwifi/description
diff --git a/package/mmc_over_gpio/Makefile b/package/mmc_over_gpio/Makefile
index 4c6fdb5a9..5a3ab1d60 100644
--- a/package/mmc_over_gpio/Makefile
+++ b/package/mmc_over_gpio/Makefile
@@ -21,28 +21,30 @@ define KernelPackage/mmc-over-gpio
   TITLE:=MMC/SD card over GPIO support
   FILES:=$(LINUX_DIR)/drivers/mmc/host/gpiommc.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,93,gpiommc)
+  MENU:=1
 endef
 
 define Package/kmod-mmc-over-gpio/config
-config KMOD_MMC_OVER_GPIO_DI_PIN
-	int "GPIO DI PIN"
-	depends PACKAGE_kmod-mmc-over-gpio
-	default 1
+	menu "Configuration"
+		depends PACKAGE_kmod-mmc-over-gpio
 
-config KMOD_MMC_OVER_GPIO_DO_PIN
-	int "GPIO DO PIN"
-	depends PACKAGE_kmod-mmc-over-gpio
-	default 3
+	config KMOD_MMC_OVER_GPIO_DI_PIN
+		int "GPIO DI (Data-In) pin"
+		default 1
 
-config KMOD_MMC_OVER_GPIO_CLK_PIN
-	int "GPIO CLK PIN"
-	depends PACKAGE_kmod-mmc-over-gpio
-	default 4
+	config KMOD_MMC_OVER_GPIO_DO_PIN
+		int "GPIO DO (Data-Out) pin"
+		default 3
 
-config KMOD_MMC_OVER_GPIO_CS_PIN
-	int "GPIO CS PIN"
-	depends PACKAGE_kmod-mmc-over-gpio
-	default 7
+	config KMOD_MMC_OVER_GPIO_CLK_PIN
+		int "GPIO CLK (Clock) pin"
+		default 4
+
+	config KMOD_MMC_OVER_GPIO_CS_PIN
+		int "GPIO CS (Chip-Select) pin"
+		default 7
+
+	endmenu
 endef
 
 define KernelPackage/mmc-over-gpio/description
diff --git a/package/nvram/Makefile b/package/nvram/Makefile
index 6ac11a9be..f064b5fe3 100644
--- a/package/nvram/Makefile
+++ b/package/nvram/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nvram
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
diff --git a/package/nvram/src/cli.c b/package/nvram/src/cli.c
index 953910cd6..44d4b88fd 100644
--- a/package/nvram/src/cli.c
+++ b/package/nvram/src/cli.c
@@ -165,20 +165,32 @@ int main( int argc, const char *argv[] )
 				stat = do_info(nvram);
 				done++;
 			}
-			else if( !strcmp(argv[i], "get") && ++i < argc )
+			else if( !strcmp(argv[i], "get") || !strcmp(argv[i], "unset") || !strcmp(argv[i], "set") )
 			{
-				stat = do_get(nvram, argv[i]);
-				done++;
-			}
-			else if( !strcmp(argv[i], "unset") && ++i < argc )
-			{
-				stat = do_unset(nvram, argv[i]);
-				done++;
-			}
-			else if( !strcmp(argv[i], "set") && ++i < argc )
-			{
-				stat = do_set(nvram, argv[i]);
-				done++;
+				if( (i+1) < argc )
+				{
+					switch(argv[i++][0])
+					{
+						case 'g':
+							stat = do_get(nvram, argv[i]);
+							break;
+
+						case 'u':
+							stat = do_unset(nvram, argv[i]);
+							break;
+
+						case 's':
+							stat = do_set(nvram, argv[i]);
+							break;
+					}
+					done++;
+				}
+				else
+				{
+					fprintf(stderr, "Command '%s' requires an argument!\n", argv[i]);
+					done = 0;
+					break;
+				}
 			}
 			else if( !strcmp(argv[i], "commit") )
 			{
diff --git a/package/openssl/Config.in b/package/openssl/Config.in
index 96cba4916..1d310bdb5 100644
--- a/package/openssl/Config.in
+++ b/package/openssl/Config.in
@@ -1,9 +1,8 @@
-# OpenSSL configuration
-
-if PACKAGE_libopenssl
+menu "Configuration"
+	depends on PACKAGE_libopenssl
 
 config OPENSSL_ENGINE
 	bool
 	prompt "Crypto acceleration support"
 
-endif
+endmenu
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 9f80a98f3..bdeb897e6 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -46,6 +46,7 @@ $(call Package/openssl/Default)
   CATEGORY:=Libraries
   DEPENDS:=+zlib
   TITLE+= (libraries)
+  MENU:=1
 endef
 
 define Package/libopenssl/description
diff --git a/package/opkg/files/opkg.conf b/package/opkg/files/opkg.conf
index 0e85936ba..d99c80df8 100644
--- a/package/opkg/files/opkg.conf
+++ b/package/opkg/files/opkg.conf
@@ -1,4 +1,4 @@
-src/gz snapshots http://downloads.openwrt.org/snapshots/trunk/$S/packages
+src/gz packages http://downloads.openwrt.org/backfire/10.03/$S/packages
 dest root /
 dest ram /tmp
 lists_dir ext /var/opkg-lists
diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 62f584fa8..c6440025b 100644
--- a/package/ppp/files/ppp.sh
+++ b/package/ppp/files/ppp.sh
@@ -65,40 +65,80 @@ start_pppd() {
 	# /dev/ppp fast enough to be used here
 	[ -e /dev/ppp ] || mknod /dev/ppp c 108 0
 
+	local device
 	config_get device "$cfg" device
+
+	local unit
 	config_get unit "$cfg" unit
+
+	local username
 	config_get username "$cfg" username
+
+	local password
 	config_get password "$cfg" password
+
+	local keepalive
 	config_get keepalive "$cfg" keepalive
 
+	local connect
 	config_get connect "$cfg" connect
+
+	local disconnect
 	config_get disconnect "$cfg" disconnect
+
+	local pppd_options
 	config_get pppd_options "$cfg" pppd_options
+
+	local defaultroute
 	config_get_bool defaultroute "$cfg" defaultroute 1
 	[ "$defaultroute" -eq 1 ] && defaultroute="defaultroute replacedefaultroute" || defaultroute=""
 
-	interval="${keepalive##*[, ]}"
+	local interval="${keepalive##*[, ]}"
 	[ "$interval" != "$keepalive" ] || interval=5
 
-	config_get_bool peerdns "$cfg" peerdns 1
-	[ "$peerdns" -eq 1 ] && peerdns="usepeerdns" || {
+	local dns
+	config_get dns "$config" dns
+
+	local has_dns=0
+	local peer_default=1
+	[ -n "$dns" ] && {
+		has_dns=1
+		peer_default=0
+	}
+
+	local peerdns
+	config_get_bool peerdns "$cfg" peerdns $peer_default
+
+	echo -n "" > /tmp/resolv.conf.auto
+
+	[ "$peerdns" -eq 1 ] && {
+		peerdns="usepeerdns"
+	} || {
 		peerdns=""
-		config_get dns "$config" dns
 		for dns in $dns; do
-			grep -q "$dns" /tmp/resolv.conf.auto 2>/dev/null || \
-				echo "nameserver $dns" >> /tmp/resolv.conf.auto
+			echo "nameserver $dns" >> /tmp/resolv.conf.auto
 		done
 	}
 
-	config_get demand "$cfg" demand
-	[ -n "$demand" ] && echo "nameserver 1.1.1.1" > /tmp/resolv.conf.auto
+	local demand
+	config_get_bool demand "$cfg" demand 0
 
+	local demandargs
+	[ "$demand" -eq 1 ] && {
+		demandargs="precompiled-active-filter /etc/ppp/filter demand idle"
+		[ "$has_dns" -eq 0 ] && \
+			echo "nameserver 1.1.1.1" > /tmp/resolv.conf.auto
+	} || {
+		demandargs="persist"
+	}
+
+	local ipv6
 	config_get_bool ipv6 "$cfg" ipv6 0
 	[ "$ipv6" -eq 1 ] && ipv6="+ipv6" || ipv6=""
 
 	/usr/sbin/pppd "$@" \
 		${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive%%[, ]*}} \
-		${demand:+precompiled-active-filter /etc/ppp/filter demand idle }${demand:-persist} \
+		$demandargs \
 		$peerdns \
 		$defaultroute \
 		${username:+user "$username" password "$password"} \
@@ -117,9 +157,12 @@ setup_interface_ppp() {
 	local iface="$1"
 	local config="$2"
 
+	local device
 	config_get device "$config" device
 
+	local mtu
 	config_get mtu "$config" mtu
+
 	mtu=${mtu:-1492}
 	start_pppd "$config" \
 		mtu $mtu mru $mtu \
diff --git a/package/swconfig/Makefile b/package/swconfig/Makefile
index ef9dbefbe..5880e9828 100644
--- a/package/swconfig/Makefile
+++ b/package/swconfig/Makefile
@@ -16,7 +16,7 @@ include $(INCLUDE_DIR)/kernel.mk
 define Package/swconfig
   SECTION:=base
   CATEGORY:=Base system
-  DEPENDS:=@LINUX_2_6 +libuci +libnl-tiny
+  DEPENDS:=@LINUX_2_6 @!TARGET_brcm47xx +libuci +libnl-tiny
   TITLE:=Switch configuration utility
 endef
 
diff --git a/package/swconfig/src/cli.c b/package/swconfig/src/cli.c
index 76593ba14..eea88d812 100644
--- a/package/swconfig/src/cli.c
+++ b/package/swconfig/src/cli.c
@@ -74,7 +74,7 @@ print_attrs(const struct switch_attr *attr)
 static void
 list_attributes(struct switch_dev *dev)
 {
-	printf("Switch %d: %s(%s), ports: %d, vlans: %d\n", dev->id, dev->dev_name, dev->name, dev->ports, dev->vlans);
+	printf("Switch %d: %s(%s), ports: %d (cpu @ %d), vlans: %d\n", dev->id, dev->dev_name, dev->name, dev->ports, dev->cpu_port, dev->vlans);
 	printf("     --switch\n");
 	print_attrs(dev->ops);
 	printf("     --vlan\n");
diff --git a/package/swconfig/src/swlib.c b/package/swconfig/src/swlib.c
index 04b3bef49..59456a33d 100644
--- a/package/swconfig/src/swlib.c
+++ b/package/swconfig/src/swlib.c
@@ -581,11 +581,13 @@ add_switch(struct nl_msg *msg, void *arg)
 	if (tb[SWITCH_ATTR_ID])
 		dev->id = nla_get_u32(tb[SWITCH_ATTR_ID]);
 	if (tb[SWITCH_ATTR_NAME])
-		dev->name = strdup(nla_get_string(tb[SWITCH_ATTR_DEV_NAME]));
+		dev->name = strdup(nla_get_string(tb[SWITCH_ATTR_NAME]));
 	if (tb[SWITCH_ATTR_PORTS])
 		dev->ports = nla_get_u32(tb[SWITCH_ATTR_PORTS]);
 	if (tb[SWITCH_ATTR_VLANS])
 		dev->vlans = nla_get_u32(tb[SWITCH_ATTR_VLANS]);
+	if (tb[SWITCH_ATTR_CPU_PORT])
+		dev->cpu_port = nla_get_u32(tb[SWITCH_ATTR_CPU_PORT]);
 
 	if (!sa->head) {
 		sa->head = dev;
diff --git a/package/swconfig/src/swlib.h b/package/swconfig/src/swlib.h
index b3c6769de..2c2fccd39 100644
--- a/package/swconfig/src/swlib.h
+++ b/package/swconfig/src/swlib.h
@@ -118,6 +118,7 @@ struct switch_dev {
 	const char *dev_name;
 	int ports;
 	int vlans;
+	int cpu_port;
 	struct switch_attr *ops;
 	struct switch_attr *port_ops;
 	struct switch_attr *vlan_ops;
diff --git a/package/uboot-ifxmips/Config.in b/package/uboot-ifxmips/Config.in
index 4562fc8ef..afd192087 100644
--- a/package/uboot-ifxmips/Config.in
+++ b/package/uboot-ifxmips/Config.in
@@ -1,5 +1,9 @@
+menu "Configuration"
+	depends on PACKAGE_uboot-ifxmips
+
 config IFXMIPS_UBOOT_A800
 	bool "add ARV452 Switch bringup hack"
-	depends on PACKAGE_uboot-ifxmips
 	help
 	  Say Y, if you have a arv452 board (wav-281, A800, ..)
+
+endmenu
diff --git a/package/uboot-ifxmips/Makefile b/package/uboot-ifxmips/Makefile
index 6b78c3d0a..736e322c3 100644
--- a/package/uboot-ifxmips/Makefile
+++ b/package/uboot-ifxmips/Makefile
@@ -26,6 +26,7 @@ define Package/uboot-ifxmips
   DEPENDS:=@TARGET_ifxmips @BROKEN
   TITLE:=U-Boot for Infineon MIPS boards
   URL:=http://www.denx.de/wiki/U-Boot
+  MENU:=1
 endef
 
 define Build/Prepare
diff --git a/package/uboot-lantiq/Config.in b/package/uboot-lantiq/Config.in
index e2c156d88..578b08864 100644
--- a/package/uboot-lantiq/Config.in
+++ b/package/uboot-lantiq/Config.in
@@ -1,7 +1,9 @@
+menu "Configuration"
+	depends on PACKAGE_uboot-lantiq
+
 config UBOOT_TARGET
 	string "target"
 	default "easy50712_DDR166M"
-	depends on PACKAGE_uboot-lantiq
 	help
 	  The configuration reflects the settings for a dedicated board hardware.
 	  Select for Danube evaluation board easy50712_DDR166M .
@@ -9,7 +11,6 @@ config UBOOT_TARGET
 
 config UBOOT_RAMBOOT
 	bool "Enable RAM boot image"
-	depends on PACKAGE_uboot-lantiq
 	help
 	  Using the UART boot mode of the ROM code this image could be loaded to the RAM.
 	  While executing the image in the RAM the functionality of the uboot image can be 
@@ -30,6 +31,7 @@ config UBOOT_RAMBOOT_DDR_CONFIG
 
 config UBOOT_A800
 	bool "add ARV452 Switch bringup hack"
-	depends on PACKAGE_uboot-lantiq
 	help
 	  Say Y, if you have a arv452 board (wav-281, A800, ..)
+
+endmenu
diff --git a/package/uboot-lantiq/Makefile b/package/uboot-lantiq/Makefile
index 186490875..8b69fe950 100644
--- a/package/uboot-lantiq/Makefile
+++ b/package/uboot-lantiq/Makefile
@@ -31,6 +31,7 @@ define Package/uboot-lantiq
   DEPENDS:=@TARGET_ifxmips
   TITLE:=U-Boot for Lantiq reference boards
   URL:=http://www.denx.de/wiki/U-Boot
+  MENU:=1
 endef
 
 define Build/Prepare
diff --git a/package/uboot-lantiq/files/include/configs/ifx-common.h b/package/uboot-lantiq/files/include/configs/ifx-common.h
index 88569ada9..e4e8067d7 100644
--- a/package/uboot-lantiq/files/include/configs/ifx-common.h
+++ b/package/uboot-lantiq/files/include/configs/ifx-common.h
@@ -48,7 +48,7 @@
 		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"	\
 		":${hostname}:${netdev}:off\0"				\
 	"addmisc=setenv bootargs ${bootargs} init=/etc/preinit "	\
-		"console=ttyS1,115200 ethaddr=${ethaddr} ${mtdparts}"		\
+		"console=ttyS1,115200 ethaddr=${ethaddr} "		\
 		"${mtdparts}\0"						\
 	"flash_flash=run flashargs addip addmisc;"			\
 		"bootm ${kernel_addr}\0"				\
@@ -113,7 +113,7 @@
 #ifndef CONFIG_SYS_PROMPT
 #define CONFIG_SYS_PROMPT		"=> "		/* Monitor Command Prompt */
 #endif
-#define CONFIG_SYS_CBSIZE		256		/* Console I/O Buffer Size */
+#define CONFIG_SYS_CBSIZE		512		/* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)  /* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS		16		/* max number of command args */
 
diff --git a/package/uboot-lantiq/patches/300-httpd.patch b/package/uboot-lantiq/patches/300-httpd.patch
index d244e2d42..8c4c1ffb6 100644
--- a/package/uboot-lantiq/patches/300-httpd.patch
+++ b/package/uboot-lantiq/patches/300-httpd.patch
@@ -12,7 +12,7 @@
 +
 +U_BOOT_CMD(
 +	httpd,	1,	1,	do_httpd,
-+	"httpd\t- start webserver\n", "\n"
++	"httpd\t- start webserver", ""
 +);
 +#endif
 +
diff --git a/package/udev/udev-config.in b/package/udev/Config.in
similarity index 96%
rename from package/udev/udev-config.in
rename to package/udev/Config.in
index c10bb9cc4..9144c40ed 100644
--- a/package/udev/udev-config.in
+++ b/package/udev/Config.in
@@ -1,11 +1,10 @@
 # udev package config
 
-menu "udev configuration"
-depends on PACKAGE_udev
+menu "Configuration"
+	depends on PACKAGE_udev
 
 config UDEV_DISABLE_LOGGING
 	bool "Disable udev logging to syslog"
-	depends on PACKAGE_udev
 	default n
 	help
 	 Disable logging of udev messages to the syslog.  If
@@ -13,7 +12,6 @@ config UDEV_DISABLE_LOGGING
 
 config UDEV_ENABLE_DEBUG
 	bool "Enable debug build of the udev package"
-	depends on PACKAGE_udev
 	default n
 	help
 	 Compile in udev debug messages.  If unsure, choose
diff --git a/package/udev/Makefile b/package/udev/Makefile
index f14fb3b8a..26bfe8bba 100644
--- a/package/udev/Makefile
+++ b/package/udev/Makefile
@@ -26,6 +26,7 @@ define Package/udev
   TITLE:=Dynamic device management subsystem
   URL:=http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
   MAINTAINER:=Geoff Levand <geoffrey.levand@am.sony.com>
+  MENU:=1
 endef
 
 define Package/udev/description
@@ -34,7 +35,7 @@ define Package/udev/description
 endef
 
 define Package/udev/config
-	source "$(SOURCE)/udev-config.in"
+	source "$(SOURCE)/Config.in"
 endef
 
 udev-args-$(CONFIG_UDEV_DISABLE_LOGGING) += --disable-logging
diff --git a/package/uhttpd/Makefile b/package/uhttpd/Makefile
index 6b4db3e15..0dcc6a900 100644
--- a/package/uhttpd/Makefile
+++ b/package/uhttpd/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uhttpd
-PKG_RELEASE:=7
+PKG_RELEASE:=9
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
diff --git a/package/uhttpd/files/uhttpd.config b/package/uhttpd/files/uhttpd.config
index 79b018cf8..acdd62ea4 100644
--- a/package/uhttpd/files/uhttpd.config
+++ b/package/uhttpd/files/uhttpd.config
@@ -29,10 +29,16 @@ config uhttpd main
 
 	# CGI/Lua timeout, if the called script does not
 	# write data within the given amount of seconds,
-	# the server will temrinate the request with
+	# the server will terminate the request with
 	# 504 Gateway Timeout response.
 	option script_timeout	60
 
+	# Network timeout, if the current connection is
+	# blocked for the specified amount of seconds,
+	# the server will terminate the associated
+	# request process.
+	option network_timeout	30
+
 	# Basic auth realm, defaults to local hostname
 #	option realm	OpenWrt
 
diff --git a/package/uhttpd/files/uhttpd.init b/package/uhttpd/files/uhttpd.init
index 4b747a0da..14f8fc4c4 100755
--- a/package/uhttpd/files/uhttpd.init
+++ b/package/uhttpd/files/uhttpd.init
@@ -58,6 +58,7 @@ start_instance()
 	append_arg "$cfg" lua_prefix "-l"
 	append_arg "$cfg" lua_handler "-L"
 	append_arg "$cfg" script_timeout "-t"
+	append_arg "$cfg" network_timeout "-T"
 
 	config_get http "$cfg" listen_http
 	for listen in $http; do
diff --git a/package/uhttpd/src/uhttpd-cgi.c b/package/uhttpd/src/uhttpd-cgi.c
index 1a6c6ad4f..855a72f56 100644
--- a/package/uhttpd/src/uhttpd-cgi.c
+++ b/package/uhttpd/src/uhttpd-cgi.c
@@ -68,7 +68,7 @@ static struct http_response * uh_cgi_header_parse(char *buf, int len, int *off)
 				if( (pos < len) && (buf[pos] == '\n') )
 					pos++;
 
-				if( pos < len )
+				if( pos <= len )
 				{
 					if( (hdrcount + 1) < array_size(res.headers) )
 					{
diff --git a/package/uhttpd/src/uhttpd-file.c b/package/uhttpd/src/uhttpd-file.c
index 2a06f8520..81f66a34b 100644
--- a/package/uhttpd/src/uhttpd-file.c
+++ b/package/uhttpd/src/uhttpd-file.c
@@ -29,23 +29,21 @@
 static const char * uh_file_mime_lookup(const char *path)
 {
 	struct mimetype *m = &uh_mime_types[0];
-	char *p, *pd, *ps;
+	char *e;
 
-	ps = strrchr(path, '/');
-	pd = strrchr(path, '.');
-
-	/* use either slash or dot as separator, whatever comes last */
-	p = (ps && pd && (ps > pd)) ? ps : pd;
-
-	if( (p != NULL) && (*(++p) != 0) )
+	while( m->extn )
 	{
-		while( m->extn )
+		e = &path[strlen(path)-1];
+
+		while( e >= path )
 		{
-			if( ! strcasecmp(p, m->extn) )
+			if( (*e == '.') && !strcasecmp(&e[1], m->extn) )
 				return m->mime;
 
-			m++;
+			e--;
 		}
+
+		m++;
 	}
 
 	return "application/octet-stream";
diff --git a/package/uhttpd/src/uhttpd-mimetypes.h b/package/uhttpd/src/uhttpd-mimetypes.h
index 1c93f3113..032d3d0c2 100644
--- a/package/uhttpd/src/uhttpd-mimetypes.h
+++ b/package/uhttpd/src/uhttpd-mimetypes.h
@@ -20,58 +20,61 @@
 
 static struct mimetype uh_mime_types[] = {
 
-	{ "txt",    "text/plain" },
-	{ "log",    "text/plain" },
-	{ "js",     "text/javascript" },
-	{ "css",    "text/css" },
-	{ "htm",    "text/html" },
-	{ "html",   "text/html" },
-	{ "diff",   "text/x-patch" },
-	{ "patch",  "text/x-patch" },
-	{ "c",      "text/x-csrc" },
-	{ "h",      "text/x-chdr" },
-	{ "o",      "text/x-object" },
-	{ "ko",     "text/x-object" },
+	{ "txt",     "text/plain" },
+	{ "log",     "text/plain" },
+	{ "js",      "text/javascript" },
+	{ "css",     "text/css" },
+	{ "htm",     "text/html" },
+	{ "html",    "text/html" },
+	{ "diff",    "text/x-patch" },
+	{ "patch",   "text/x-patch" },
+	{ "c",       "text/x-csrc" },
+	{ "h",       "text/x-chdr" },
+	{ "o",       "text/x-object" },
+	{ "ko",      "text/x-object" },
 
-	{ "bmp",    "image/bmp" },
-	{ "gif",    "image/gif" },
-	{ "png",    "image/png" },
-	{ "jpg",    "image/jpeg" },
-	{ "jpeg",   "image/jpeg" },
-	{ "svg",    "image/svg+xml" },
+	{ "bmp",     "image/bmp" },
+	{ "gif",     "image/gif" },
+	{ "png",     "image/png" },
+	{ "jpg",     "image/jpeg" },
+	{ "jpeg",    "image/jpeg" },
+	{ "svg",     "image/svg+xml" },
 
-	{ "zip",    "application/zip" },
-	{ "pdf",    "application/pdf" },
-	{ "xml",    "application/xml" },
-	{ "xsl",    "application/xml" },
-	{ "doc",    "application/msword" },
-	{ "ppt",    "application/vnd.ms-powerpoint" },
-	{ "xls",    "application/vnd.ms-excel" },
-	{ "odt",    "application/vnd.oasis.opendocument.text" },
-	{ "odp",    "application/vnd.oasis.opendocument.presentation" },
-	{ "pl",     "application/x-perl" },
-	{ "sh",     "application/x-shellscript" },
-	{ "php",    "application/x-php" },
-	{ "deb",    "application/x-deb" },
-	{ "iso",    "application/x-cd-image" },
-	{ "tgz",    "application/x-compressed-tar" },
-	{ "gz",     "application/x-gzip" },
-	{ "bz2",    "application/x-bzip" },
-	{ "tar",    "application/x-tar" },
-	{ "rar",    "application/x-rar-compressed" },
+	{ "zip",     "application/zip" },
+	{ "pdf",     "application/pdf" },
+	{ "xml",     "application/xml" },
+	{ "xsl",     "application/xml" },
+	{ "doc",     "application/msword" },
+	{ "ppt",     "application/vnd.ms-powerpoint" },
+	{ "xls",     "application/vnd.ms-excel" },
+	{ "odt",     "application/vnd.oasis.opendocument.text" },
+	{ "odp",     "application/vnd.oasis.opendocument.presentation" },
+	{ "pl",      "application/x-perl" },
+	{ "sh",      "application/x-shellscript" },
+	{ "php",     "application/x-php" },
+	{ "deb",     "application/x-deb" },
+	{ "iso",     "application/x-cd-image" },
+	{ "tar.gz",  "application/x-compressed-tar" },
+	{ "tgz",     "application/x-compressed-tar" },
+	{ "gz",      "application/x-gzip" },
+	{ "tar.bz2", "application/x-bzip-compressed-tar" },
+	{ "tbz",     "application/x-bzip-compressed-tar" },
+	{ "bz2",     "application/x-bzip" },
+	{ "tar",     "application/x-tar" },
+	{ "rar",     "application/x-rar-compressed" },
 
-	{ "mp3",    "audio/mpeg" },
-	{ "ogg",    "audio/x-vorbis+ogg" },
-	{ "wav",    "audio/x-wav" },
+	{ "mp3",     "audio/mpeg" },
+	{ "ogg",     "audio/x-vorbis+ogg" },
+	{ "wav",     "audio/x-wav" },
 
-	{ "mpg",    "video/mpeg" },
-	{ "mpeg",   "video/mpeg" },
-	{ "avi",    "video/x-msvideo" },
+	{ "mpg",     "video/mpeg" },
+	{ "mpeg",    "video/mpeg" },
+	{ "avi",     "video/x-msvideo" },
 
-	{ "README", "text/plain" },
-	{ "log",    "text/plain" },
-	{ "cfg",    "text/plain" },
-	{ "conf",   "text/plain" },
+	{ "README",  "text/plain" },
+	{ "log",     "text/plain" },
+	{ "cfg",     "text/plain" },
+	{ "conf",    "text/plain" },
 
 	{ NULL, NULL }
 };
diff --git a/package/uhttpd/src/uhttpd-utils.c b/package/uhttpd/src/uhttpd-utils.c
index 55b2c410e..caa6b12bc 100644
--- a/package/uhttpd/src/uhttpd-utils.c
+++ b/package/uhttpd/src/uhttpd-utils.c
@@ -116,8 +116,8 @@ int uh_tcp_send(struct client *cl, const char *buf, int len)
 	FD_ZERO(&writer);
 	FD_SET(cl->socket, &writer);
 
-	timeout.tv_sec = 0;
-	timeout.tv_usec = 500000;
+	timeout.tv_sec = cl->server->conf->network_timeout;
+	timeout.tv_usec = 0;
 
 	if( select(cl->socket + 1, NULL, &writer, NULL, &timeout) > 0 )
 	{
@@ -376,6 +376,79 @@ int uh_b64decode(char *buf, int blen, const unsigned char *src, int slen)
 	return len;
 }
 
+static char * canonpath(const char *path, char *path_resolved)
+{
+	char path_copy[PATH_MAX];
+	char *path_cpy = path_copy;
+	char *path_res = path_resolved;
+
+	struct stat s;
+
+
+	/* relative -> absolute */
+	if( *path != '/' )
+	{
+		getcwd(path_copy, PATH_MAX);
+		strncat(path_copy, "/", PATH_MAX - strlen(path_copy));
+		strncat(path_copy, path, PATH_MAX - strlen(path_copy));
+	}
+	else
+	{
+		strncpy(path_copy, path, PATH_MAX);
+	}
+
+	/* normalize */
+	while( (*path_cpy != '\0') && (path_cpy < (path_copy + PATH_MAX - 2)) )
+	{
+		if( *path_cpy == '/' )
+		{
+			/* skip repeating / */
+			if( path_cpy[1] == '/' )
+			{
+				path_cpy++;
+				continue;
+			}
+
+			/* /./ or /../ */
+			else if( path_cpy[1] == '.' )
+			{
+				/* skip /./ */
+				if( (path_cpy[2] == '/') || (path_cpy[2] == '\0') )
+				{
+					path_cpy += 2;
+					continue;
+				}
+
+				/* collapse /x/../ */
+				else if( (path_cpy[2] == '.') &&
+				         ((path_cpy[3] == '/') || (path_cpy[3] == '\0'))
+				) {
+					while( (path_res > path_resolved) && (*--path_res != '/') )
+						;
+
+					path_cpy += 3;
+					continue;
+				}
+			}
+		}
+
+		*path_res++ = *path_cpy++;
+	}
+
+	/* remove trailing slash if not root / */
+	if( (path_res > (path_resolved+1)) && (path_res[-1] == '/') )
+		path_res--;
+	else if( path_res == path_resolved )
+		*path_res++ = '/';
+
+	*path_res = '\0';
+
+	/* test access */
+	if( !stat(path_resolved, &s) && (s.st_mode & S_IROTH) )
+		return path_resolved;
+
+	return NULL;
+}
 
 struct path_info * uh_path_lookup(struct client *cl, const char *url)
 {
@@ -387,6 +460,7 @@ struct path_info * uh_path_lookup(struct client *cl, const char *url)
 	char *docroot = cl->server->conf->docroot;
 	char *pathptr = NULL;
 
+	int no_sym = cl->server->conf->no_symlinks;
 	int i = 0;
 	struct stat s;
 
@@ -432,8 +506,9 @@ struct path_info * uh_path_lookup(struct client *cl, const char *url)
 			memset(path_info, 0, sizeof(path_info));
 			memcpy(path_info, buffer, min(i + 1, sizeof(path_info) - 1));
 
-			if( realpath(path_info, path_phys) )
-			{
+			if( no_sym ? realpath(path_info, path_phys)
+			           : canonpath(path_info, path_phys)
+			) {
 				memset(path_info, 0, sizeof(path_info));
 				memcpy(path_info, &buffer[i],
 					min(strlen(buffer) - i, sizeof(path_info) - 1));
@@ -547,10 +622,14 @@ struct auth_realm * uh_auth_add(char *path, char *user, char *pass)
 				min(strlen(pass), sizeof(new->pass) - 1));
 		}
 
-		uh_realm_count++;
+		if( new->pass[0] )
+		{
+			uh_realm_count++;
+			return new;
+		}
 	}
 
-	return new;
+	return NULL;
 }
 
 int uh_auth_check(
diff --git a/package/uhttpd/src/uhttpd.c b/package/uhttpd/src/uhttpd.c
index da3779413..152e0b452 100644
--- a/package/uhttpd/src/uhttpd.c
+++ b/package/uhttpd/src/uhttpd.c
@@ -71,8 +71,8 @@ static void uh_config_parse(const char *path)
 				if( !uh_auth_add(line, user, pass) )
 				{
 					fprintf(stderr,
-						"Can not manage more than %i basic auth realms, "
-						"will skip the rest\n", UH_LIMIT_AUTHREALMS
+						"Notice: No password set for user %s, ignoring "
+						"authentication on %s\n", user, line
 					);
 
 					break;
@@ -416,8 +416,11 @@ int main (int argc, char **argv)
 	/* maximum file descriptor number */
 	int new_fd, cur_fd, max_fd = 0;
 
+#ifdef HAVE_TLS
 	int tls = 0;
 	int keys = 0;
+#endif
+
 	int bound = 0;
 	int nofork = 0;
 
@@ -426,9 +429,10 @@ int main (int argc, char **argv)
 	char bind[128];
 	char *port = NULL;
 
-	/* library handles */
-	void *tls_lib;
-	void *lua_lib;
+#if defined(HAVE_TLS) || defined(HAVE_LUA)
+	/* library handle */
+	void *lib;
+#endif
 
 	/* clear the master and temp sets */
 	FD_ZERO(&used_fds);
@@ -466,7 +470,7 @@ int main (int argc, char **argv)
 
 #ifdef HAVE_TLS
 	/* load TLS plugin */
-	if( ! (tls_lib = dlopen("uhttpd_tls.so", RTLD_LAZY | RTLD_GLOBAL)) )
+	if( ! (lib = dlopen("uhttpd_tls.so", RTLD_LAZY | RTLD_GLOBAL)) )
 	{
 		fprintf(stderr,
 			"Notice: Unable to load TLS plugin - disabling SSL support! "
@@ -476,14 +480,14 @@ int main (int argc, char **argv)
 	else
 	{
 		/* resolve functions */
-		if( !(conf.tls_init   = dlsym(tls_lib, "uh_tls_ctx_init"))      ||
-		    !(conf.tls_cert   = dlsym(tls_lib, "uh_tls_ctx_cert"))      ||
-		    !(conf.tls_key    = dlsym(tls_lib, "uh_tls_ctx_key"))       ||
-		    !(conf.tls_free   = dlsym(tls_lib, "uh_tls_ctx_free"))      ||
-			!(conf.tls_accept = dlsym(tls_lib, "uh_tls_client_accept")) ||
-			!(conf.tls_close  = dlsym(tls_lib, "uh_tls_client_close"))  ||
-			!(conf.tls_recv   = dlsym(tls_lib, "uh_tls_client_recv"))   ||
-			!(conf.tls_send   = dlsym(tls_lib, "uh_tls_client_send"))
+		if( !(conf.tls_init   = dlsym(lib, "uh_tls_ctx_init"))      ||
+		    !(conf.tls_cert   = dlsym(lib, "uh_tls_ctx_cert"))      ||
+		    !(conf.tls_key    = dlsym(lib, "uh_tls_ctx_key"))       ||
+		    !(conf.tls_free   = dlsym(lib, "uh_tls_ctx_free"))      ||
+			!(conf.tls_accept = dlsym(lib, "uh_tls_client_accept")) ||
+			!(conf.tls_close  = dlsym(lib, "uh_tls_client_close"))  ||
+			!(conf.tls_recv   = dlsym(lib, "uh_tls_client_recv"))   ||
+			!(conf.tls_send   = dlsym(lib, "uh_tls_client_send"))
 		) {
 			fprintf(stderr,
 				"Error: Failed to lookup required symbols "
@@ -501,7 +505,7 @@ int main (int argc, char **argv)
 	}
 #endif
 
-	while( (opt = getopt(argc, argv, "fC:K:p:s:h:c:l:L:d:r:m:x:t:")) > 0 )
+	while( (opt = getopt(argc, argv, "fSC:K:p:s:h:c:l:L:d:r:m:x:t:T:")) > 0 )
 	{
 		switch(opt)
 		{
@@ -592,6 +596,11 @@ int main (int argc, char **argv)
 				}
 				break;
 
+			/* don't follow symlinks */
+			case 'S':
+				conf.no_symlinks = 1;
+				break;
+
 #ifdef HAVE_CGI
 			/* cgi prefix */
 			case 'x':
@@ -618,6 +627,11 @@ int main (int argc, char **argv)
 				break;
 #endif
 
+			/* network timeout */
+			case 'T':
+				conf.network_timeout = atoi(optarg);
+				break;
+
 			/* no fork */
 			case 'f':
 				nofork = 1;
@@ -663,6 +677,7 @@ int main (int argc, char **argv)
 					"	-K file         ASN.1 server private key file\n"
 #endif
 					"	-h directory    Specify the document root, default is '.'\n"
+					"	-S              Do not follow symbolic links outside of the docroot\n"
 #ifdef HAVE_LUA
 					"	-l string       URL prefix for Lua handler, default is '/lua'\n"
 					"	-L file         Lua handler script, omit to disable Lua\n"
@@ -673,6 +688,7 @@ int main (int argc, char **argv)
 #if defined(HAVE_CGI) || defined(HAVE_LUA)
 					"	-t seconds      CGI and Lua script timeout in seconds, default is 60\n"
 #endif
+					"	-T seconds      Network timeout in seconds, default is 30\n"
 					"	-d string       URL decode given string\n"
 					"	-r string       Specify basic auth realm\n"
 					"	-m string       MD5 crypt given string\n"
@@ -712,6 +728,10 @@ int main (int argc, char **argv)
 	/* config file */
 	uh_config_parse(conf.file);
 
+	/* default network timeout */
+	if( conf.network_timeout <= 0 )
+		conf.network_timeout = 30;
+
 #if defined(HAVE_CGI) || defined(HAVE_LUA)
 	/* default script timeout */
 	if( conf.script_timeout <= 0 )
@@ -726,7 +746,7 @@ int main (int argc, char **argv)
 
 #ifdef HAVE_LUA
 	/* load Lua plugin */
-	if( ! (lua_lib = dlopen("uhttpd_lua.so", RTLD_LAZY | RTLD_GLOBAL)) )
+	if( ! (lib = dlopen("uhttpd_lua.so", RTLD_LAZY | RTLD_GLOBAL)) )
 	{
 		fprintf(stderr,
 			"Notice: Unable to load Lua plugin - disabling Lua support! "
@@ -736,9 +756,9 @@ int main (int argc, char **argv)
 	else
 	{
 		/* resolve functions */
-		if( !(conf.lua_init    = dlsym(lua_lib, "uh_lua_init"))    ||
-		    !(conf.lua_close   = dlsym(lua_lib, "uh_lua_close"))   ||
-		    !(conf.lua_request = dlsym(lua_lib, "uh_lua_request"))
+		if( !(conf.lua_init    = dlsym(lib, "uh_lua_init"))    ||
+		    !(conf.lua_close   = dlsym(lib, "uh_lua_close"))   ||
+		    !(conf.lua_request = dlsym(lib, "uh_lua_request"))
 		) {
 			fprintf(stderr,
 				"Error: Failed to lookup required symbols "
diff --git a/package/uhttpd/src/uhttpd.h b/package/uhttpd/src/uhttpd.h
index 0e9f1ee88..32e397007 100644
--- a/package/uhttpd/src/uhttpd.h
+++ b/package/uhttpd/src/uhttpd.h
@@ -32,7 +32,7 @@
 #include <linux/limits.h>
 #include <netdb.h>
 #include <ctype.h>
-
+#include <errno.h>
 #include <dlfcn.h>
 
 
@@ -64,6 +64,8 @@ struct config {
 	char docroot[PATH_MAX];
 	char *realm;
 	char *file;
+	int no_symlinks;
+	int network_timeout;
 #ifdef HAVE_CGI
 	char *cgi_prefix;
 #endif
diff --git a/package/vsc73x5-ucode/Makefile b/package/vsc73x5-ucode/Makefile
index d48af0026..3a0712110 100644
--- a/package/vsc73x5-ucode/Makefile
+++ b/package/vsc73x5-ucode/Makefile
@@ -10,15 +10,12 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=vsc73x5-ucode
 PKG_RELEASE:=1
 
-PKG_SOURCE_URL:=http://www.tp-link.com/GPL
+PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
 
-PKG_SOURCE:=WirelessNRouer_AP.tar.gz
+PKG_SOURCE:=vsc73x5-ucode.tar.bz2
 PKG_BUILD_DIR:=$(BUILD_DIR)/vsc73x5-ucode
 
-PKG_MD5SUM:=7dd6069a5f0e44cc9965fc7b43eb3046
-
-UCODE_SRC_DIR:=u-boot/board/ar7100/common
-UCODE_BUILD_DIR:=$(PKG_BUILD_DIR)/$(UCODE_SRC_DIR)
+PKG_MD5SUM:=b32e3debcd118f263c79199a7b5afa68
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -32,7 +29,7 @@ endef
 
 define Package/vsc73x5/install
 	$(INSTALL_DIR) $(1)/lib/firmware
-	$(INSTALL_DATA) $(UCODE_BUILD_DIR)/$(2) $(1)/lib/firmware/$(3)
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(2) $(1)/lib/firmware/$(3)
 endef
 
 define Package/vsc7385-ucode-ap83
@@ -87,13 +84,8 @@ define Package/vsc7395-ucode-pb44/install
   $(call Package/vsc73x5/install,$(1),g5e_Plus1_2_29a_unmanaged_Atheros_v3.bin,vsc7395_ucode_pb44.bin)
 endef
 
-define Build/Prepare
-	tar -xzf "$(DL_DIR)/$(PKG_SOURCE)" ap-9x-gpl/ap93-u-boot.tar.bz2 -O | tar -C "$(PKG_BUILD_DIR)" -xj $(UCODE_SRC_DIR)
-	cp files/Makefile $(UCODE_BUILD_DIR)
-endef
-
 define Build/Compile
-	$(MAKE) -C $(UCODE_BUILD_DIR) $(TARGET_CONFIGURE_OPTS) all
+
 endef
 
 $(eval $(call BuildPackage,vsc7385-ucode-ap83))
diff --git a/scripts/timestamp.pl b/scripts/timestamp.pl
index 3bf057151..e24d8149d 100755
--- a/scripts/timestamp.pl
+++ b/scripts/timestamp.pl
@@ -14,7 +14,7 @@ sub get_ts($$) {
 	my $ts = 0;
 	my $fn = "";
 	$path .= "/" if( -d $path);
-	open FIND, "find $path -type f -and -not -path \\*.svn\\* -and -not -path \\*CVS\\* $options 2>/dev/null |";
+	open FIND, "find $path -type f -and -not -path \\*/.svn\\* -and -not -path \\*CVS\\* $options 2>/dev/null |";
 	while (<FIND>) {
 		chomp;
 		my $file = $_;
diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index e0b64ead4..42fb7bb69 100644
--- a/target/imagebuilder/Makefile
+++ b/target/imagebuilder/Makefile
@@ -23,9 +23,10 @@ all: compile
 $(BIN_DIR)/$(IB_NAME).tar.bz2: clean
 	rm -rf $(PKG_BUILD_DIR)
 	mkdir -p $(IB_KDIR) $(PKG_BUILD_DIR)/staging_dir/host $(PKG_BUILD_DIR)/target
+	-cp $(TOPDIR)/.config $(PKG_BUILD_DIR)/.config
 	$(CP) \
 		$(INCLUDE_DIR) $(SCRIPT_DIR) \
-		$(TOPDIR)/rules.mk $(TOPDIR)/.config \
+		$(TOPDIR)/rules.mk \
 		./files/Makefile \
 		$(TMP_DIR)/.targetinfo \
 		$(TMP_DIR)/.packageinfo \
diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile
index 49fd6db94..b72e3f172 100644
--- a/target/imagebuilder/files/Makefile
+++ b/target/imagebuilder/files/Makefile
@@ -62,8 +62,8 @@ IPKG:= \
 define Profile
   $(eval $(call Profile/Default))
   $(eval $(call Profile/$(1)))
-  ifeq ($(PROFILE),)
-    PROFILE:=$(1)
+  ifeq ($(USER_PROFILE),)
+    USER_PROFILE:=$(1)
   endif
   $(1)_NAME:=$(NAME)
   $(1)_PACKAGES:=$(PACKAGES)
@@ -73,7 +73,7 @@ endef
 
 include $(INCLUDE_DIR)/target.mk
 
-info: FORCE
+_call_info: FORCE
 	echo 'Current Target: "$(BOARD)$(if $(SUBTARGET), ($(BOARDNAME)))"'
 	echo 'Default Packages: $(DEFAULT_PACKAGES)'
 	echo 'Available Profiles:'
@@ -84,19 +84,19 @@ $(TOPDIR)/tmp/ipkg.conf: FORCE
 	@echo 'dest root /' > $@
 	@echo 'src packages file:$(PACKAGE_DIR)' >> $@
 
-BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $(PACKAGES) $($(PROFILE)_PACKAGES) kernel)
+BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $(USER_PACKAGES) $($(USER_PROFILE)_PACKAGES) kernel)
 # "-pkgname" in the package list means remove "pkgname" from the package list
 BUILD_PACKAGES:=$(filter-out $(filter -%,$(BUILD_PACKAGES)) $(patsubst -%,%,$(filter -%,$(BUILD_PACKAGES))),$(BUILD_PACKAGES))
 
-image:
-	echo 'Building images for $(BOARD)$(if $($(PROFILE)_NAME), - $($(PROFILE)_NAME))'
+_call_image:
+	echo 'Building images for $(BOARD)$(if $($(USER_PROFILE)_NAME), - $($(USER_PROFILE)_NAME))'
 	echo 'Packages: $(BUILD_PACKAGES)'
 	echo
 	rm -rf $(TARGET_DIR)
 	mkdir -p $(TARGET_DIR) $(BIN_DIR) $(TMP_DIR)
 	$(MAKE) package_index
 	$(MAKE) package_install
-ifneq ($(FILES),)
+ifneq ($(USER_FILES),)
 	$(MAKE) copy_files
 endif
 	$(MAKE) package_postinst
@@ -118,7 +118,7 @@ package_install: FORCE
 copy_files: FORCE
 	@echo
 	@echo Copying extra files
-	$(CP) $(FILES)/* $(TARGET_DIR)/
+	$(CP) $(USER_FILES)/* $(TARGET_DIR)/
 
 package_postinst: FORCE
 	@echo
@@ -140,5 +140,15 @@ clean:
 	rm -rf tmp $(TARGET_DIR) $(BIN_DIR)
 
 
+info:
+	(unset PROFILE FILES PACKAGES MAKEFLAGS; $(MAKE) -s _call_info)
+
+image:
+	(unset PROFILE FILES PACKAGES MAKEFLAGS; \
+	$(MAKE) _call_image \
+		$(if $(PROFILE),USER_PROFILE="$(PROFILE)") \
+		$(if $(FILES),USER_FILES="$(FILES)") \
+		$(if $(PACKAGES),USER_PACKAGES="$(PACKAGES)"))
+
 .SILENT: help info image
 
diff --git a/target/linux/adm5120/image/Makefile b/target/linux/adm5120/image/Makefile
index cb9af208a..f628456ab 100644
--- a/target/linux/adm5120/image/Makefile
+++ b/target/linux/adm5120/image/Makefile
@@ -11,6 +11,10 @@ LOADER_MAKE := $(NO_TRACE_MAKE) -C lzma-loader KDIR=$(KDIR)
 JFFS2BLOCK := $(KDIR)/jffs2.block
 JFFS2MARK := $(KDIR)/jffs2.mark
 
+define imgname
+$(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(patsubst jffs2-%,jffs2,$(1))
+endef
+
 define Build/Clean
 	$(LOADER_MAKE) clean
 endef
diff --git a/target/linux/amazon/Makefile b/target/linux/amazon/Makefile
deleted file mode 100644
index aae39a00e..000000000
--- a/target/linux/amazon/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-ARCH:=mips
-BOARD:=amazon
-BOARDNAME:=Infineon Amazon
-FEATURES:=squashfs jffs2 broken
-LINUX_VERSION:=2.6.30.10
-
-include $(INCLUDE_DIR)/target.mk
-
-define Target/Description
-	Build firmware images for Infineon Amazon boards
-endef
-
-$(eval $(call BuildTarget))
diff --git a/target/linux/amazon/base-files/etc/config/network b/target/linux/amazon/base-files/etc/config/network
deleted file mode 100644
index 72e39f88a..000000000
--- a/target/linux/amazon/base-files/etc/config/network
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (C) 2006 OpenWrt.org
-
-config interface loopback
-	option ifname	lo
-	option proto	static
-	option ipaddr	127.0.0.1
-	option netmask	255.0.0.0
-
-config interface lan
-	option ifname	eth1
-	option type 	bridge
-	option proto	static
-	option ipaddr	192.168.1.1
-	option netmask	255.255.255.0
diff --git a/target/linux/amazon/config-2.6.30 b/target/linux/amazon/config-2.6.30
deleted file mode 100644
index 45f2e6366..000000000
--- a/target/linux/amazon/config-2.6.30
+++ /dev/null
@@ -1,152 +0,0 @@
-CONFIG_32BIT=y
-# CONFIG_64BIT is not set
-CONFIG_ADM6996_SUPPORT=y
-CONFIG_AMAZON_ASC_UART=y
-CONFIG_AMAZON_MTD=y
-CONFIG_AMAZON_NET_SW=y
-CONFIG_AMAZON_PCI=y
-CONFIG_AMAZON_WDT=y
-CONFIG_AMAZON=y
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_ARCH_SUPPORTS_OPROFILE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-# CONFIG_BCM47XX is not set
-# CONFIG_BINARY_PRINTF is not set
-CONFIG_BITREVERSE=y
-# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
-# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
-CONFIG_CEVT_R4K_LIB=y
-CONFIG_CEVT_R4K=y
-CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,jffs2 init=/bin/sh"
-CONFIG_CPU_BIG_ENDIAN=y
-# CONFIG_CPU_CAVIUM_OCTEON is not set
-CONFIG_CPU_HAS_LLSC=y
-CONFIG_CPU_HAS_PREFETCH=y
-CONFIG_CPU_HAS_SYNC=y
-# CONFIG_CPU_LITTLE_ENDIAN is not set
-# CONFIG_CPU_LOONGSON2 is not set
-# CONFIG_CPU_MIPS32_R1 is not set
-CONFIG_CPU_MIPS32_R2=y
-CONFIG_CPU_MIPS32=y
-# CONFIG_CPU_MIPS64_R1 is not set
-# CONFIG_CPU_MIPS64_R2 is not set
-CONFIG_CPU_MIPSR2=y
-# CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R10000 is not set
-# CONFIG_CPU_R3000 is not set
-# CONFIG_CPU_R4300 is not set
-# CONFIG_CPU_R4X00 is not set
-# CONFIG_CPU_R5000 is not set
-# CONFIG_CPU_R5432 is not set
-# CONFIG_CPU_R5500 is not set
-# CONFIG_CPU_R6000 is not set
-# CONFIG_CPU_R8000 is not set
-# CONFIG_CPU_RM7000 is not set
-# CONFIG_CPU_RM9000 is not set
-# CONFIG_CPU_SB1 is not set
-CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_HIGHMEM=y
-# CONFIG_CPU_TX39XX is not set
-# CONFIG_CPU_TX49XX is not set
-# CONFIG_CPU_VR41XX is not set
-CONFIG_CSRC_R4K_LIB=y
-CONFIG_CSRC_R4K=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DEVPORT=y
-# CONFIG_DM9000 is not set
-CONFIG_DMA_NEED_PCI_MAP_STATE=y
-CONFIG_DMA_NONCOHERENT=y
-CONFIG_EARLY_PRINTK=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-CONFIG_HARDWARE_WATCHPOINTS=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
-CONFIG_HAVE_IDE=y
-CONFIG_HAVE_MLOCK=y
-CONFIG_HAVE_OPROFILE=y
-CONFIG_HAVE_STD_PC_SERIAL_PORT=y
-CONFIG_HW_HAS_PCI=y
-CONFIG_HW_RANDOM=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_IRQ_CPU=y
-CONFIG_KALLSYMS=y
-# CONFIG_LEMOTE_FULONG is not set
-# CONFIG_MACH_ALCHEMY is not set
-# CONFIG_MACH_DECSTATION is not set
-# CONFIG_MACH_JAZZ is not set
-# CONFIG_MACH_TX39XX is not set
-# CONFIG_MACH_TX49XX is not set
-# CONFIG_MACH_VR41XX is not set
-# CONFIG_MIKROTIK_RB532 is not set
-# CONFIG_MIPS_COBALT is not set
-CONFIG_MIPS_L1_CACHE_SHIFT=5
-# CONFIG_MIPS_MACHINE is not set
-# CONFIG_MIPS_MALTA is not set
-CONFIG_MIPS_MT_DISABLED=y
-# CONFIG_MIPS_MT_SMP is not set
-# CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_SIM is not set
-CONFIG_MIPS=y
-CONFIG_MTD_AMAZON_BUS_WIDTH_16=y
-# CONFIG_MTD_AMAZON_BUS_WIDTH_32 is not set
-# CONFIG_MTD_AMAZON_BUS_WIDTH_8 is not set
-# CONFIG_MTD_AMAZON_FLASH_SIZE_16 is not set
-# CONFIG_MTD_AMAZON_FLASH_SIZE_2 is not set
-CONFIG_MTD_AMAZON_FLASH_SIZE_4=y
-# CONFIG_MTD_AMAZON_FLASH_SIZE_8 is not set
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-# CONFIG_MTD_CFI_GEOMETRY is not set
-# CONFIG_MTD_CFI_INTELEXT is not set
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-3
-CONFIG_MTD_REDBOOT_PARTS=y
-# CONFIG_NET_PCI is not set
-# CONFIG_NO_IOPORT is not set
-# CONFIG_NXP_STB220 is not set
-# CONFIG_NXP_STB225 is not set
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
-# CONFIG_PMC_MSP is not set
-# CONFIG_PMC_YOSEMITE is not set
-# CONFIG_PNX8550_JBS is not set
-# CONFIG_PNX8550_STB810 is not set
-# CONFIG_PROBE_INITRD_HEADER is not set
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-# CONFIG_SCSI_DMA is not set
-# CONFIG_SERIAL_8250 is not set
-# CONFIG_SGI_IP22 is not set
-# CONFIG_SGI_IP27 is not set
-# CONFIG_SGI_IP28 is not set
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_SWARM is not set
-# CONFIG_SLOW_WORK is not set
-CONFIG_SWAP_IO_SPACE=y
-CONFIG_SYS_HAS_CPU_MIPS32_R1=y
-CONFIG_SYS_HAS_CPU_MIPS32_R2=y
-CONFIG_SYS_HAS_EARLY_PRINTK=y
-CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_TRAD_SIGNALS=y
-CONFIG_USB_SUPPORT=y
-CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/amazon/config-2.6.32 b/target/linux/amazon/config-2.6.32
deleted file mode 100644
index 9239dabc2..000000000
--- a/target/linux/amazon/config-2.6.32
+++ /dev/null
@@ -1,155 +0,0 @@
-CONFIG_32BIT=y
-# CONFIG_64BIT is not set
-CONFIG_ADM6996_SUPPORT=y
-# CONFIG_ALCHEMY_GPIO_INDIRECT is not set
-CONFIG_AMAZON_ASC_UART=y
-CONFIG_AMAZON_MTD=y
-CONFIG_AMAZON_NET_SW=y
-CONFIG_AMAZON_PCI=y
-CONFIG_AMAZON_WDT=y
-CONFIG_AMAZON=y
-# CONFIG_AR7 is not set
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_ARCH_SUPPORTS_OPROFILE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-# CONFIG_BCM47XX is not set
-# CONFIG_BCM63XX is not set
-CONFIG_BITREVERSE=y
-# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
-# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
-CONFIG_CEVT_R4K_LIB=y
-CONFIG_CEVT_R4K=y
-CONFIG_CFG80211_DEFAULT_PS_VALUE=0
-CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,jffs2 init=/bin/sh"
-CONFIG_CPU_BIG_ENDIAN=y
-# CONFIG_CPU_CAVIUM_OCTEON is not set
-CONFIG_CPU_HAS_PREFETCH=y
-CONFIG_CPU_HAS_SYNC=y
-# CONFIG_CPU_LITTLE_ENDIAN is not set
-# CONFIG_CPU_LOONGSON2E is not set
-# CONFIG_CPU_MIPS32_R1 is not set
-CONFIG_CPU_MIPS32_R2=y
-CONFIG_CPU_MIPS32=y
-# CONFIG_CPU_MIPS64_R1 is not set
-# CONFIG_CPU_MIPS64_R2 is not set
-CONFIG_CPU_MIPSR2=y
-# CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R10000 is not set
-# CONFIG_CPU_R3000 is not set
-# CONFIG_CPU_R4300 is not set
-# CONFIG_CPU_R4X00 is not set
-# CONFIG_CPU_R5000 is not set
-# CONFIG_CPU_R5432 is not set
-# CONFIG_CPU_R5500 is not set
-# CONFIG_CPU_R6000 is not set
-# CONFIG_CPU_R8000 is not set
-# CONFIG_CPU_RM7000 is not set
-# CONFIG_CPU_RM9000 is not set
-# CONFIG_CPU_SB1 is not set
-CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_HIGHMEM=y
-# CONFIG_CPU_TX39XX is not set
-# CONFIG_CPU_TX49XX is not set
-# CONFIG_CPU_VR41XX is not set
-CONFIG_CSRC_R4K_LIB=y
-CONFIG_CSRC_R4K=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DEVPORT=y
-# CONFIG_DM9000 is not set
-CONFIG_DMA_NEED_PCI_MAP_STATE=y
-CONFIG_DMA_NONCOHERENT=y
-CONFIG_EARLY_PRINTK=y
-# CONFIG_FSNOTIFY is not set
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-CONFIG_HARDWARE_WATCHPOINTS=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAVE_ARCH_KGDB=y
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_HAVE_IDE=y
-CONFIG_HAVE_OPROFILE=y
-CONFIG_HAVE_STD_PC_SERIAL_PORT=y
-CONFIG_HW_HAS_PCI=y
-CONFIG_HW_RANDOM=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_IRQ_CPU=y
-CONFIG_KALLSYMS=y
-# CONFIG_MACH_ALCHEMY is not set
-# CONFIG_MACH_DECSTATION is not set
-# CONFIG_MACH_JAZZ is not set
-# CONFIG_MACH_LOONGSON is not set
-# CONFIG_MACH_TX39XX is not set
-# CONFIG_MACH_TX49XX is not set
-# CONFIG_MACH_VR41XX is not set
-# CONFIG_MIKROTIK_RB532 is not set
-# CONFIG_MIPS_COBALT is not set
-CONFIG_MIPS_L1_CACHE_SHIFT=5
-# CONFIG_MIPS_MACHINE is not set
-# CONFIG_MIPS_MALTA is not set
-CONFIG_MIPS_MT_DISABLED=y
-# CONFIG_MIPS_MT_SMP is not set
-# CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_SIM is not set
-CONFIG_MIPS=y
-CONFIG_MTD_AMAZON_BUS_WIDTH_16=y
-# CONFIG_MTD_AMAZON_BUS_WIDTH_32 is not set
-# CONFIG_MTD_AMAZON_BUS_WIDTH_8 is not set
-# CONFIG_MTD_AMAZON_FLASH_SIZE_16 is not set
-# CONFIG_MTD_AMAZON_FLASH_SIZE_2 is not set
-CONFIG_MTD_AMAZON_FLASH_SIZE_4=y
-# CONFIG_MTD_AMAZON_FLASH_SIZE_8 is not set
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-# CONFIG_MTD_CFI_GEOMETRY is not set
-# CONFIG_MTD_CFI_INTELEXT is not set
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-3
-CONFIG_MTD_REDBOOT_PARTS=y
-# CONFIG_NET_PCI is not set
-# CONFIG_NO_IOPORT is not set
-# CONFIG_NXP_STB220 is not set
-# CONFIG_NXP_STB225 is not set
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
-# CONFIG_PMC_MSP is not set
-# CONFIG_PMC_YOSEMITE is not set
-# CONFIG_PNX8550_JBS is not set
-# CONFIG_PNX8550_STB810 is not set
-# CONFIG_PROBE_INITRD_HEADER is not set
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-# CONFIG_SCSI_DMA is not set
-# CONFIG_SERIAL_8250 is not set
-# CONFIG_SGI_IP22 is not set
-# CONFIG_SGI_IP27 is not set
-# CONFIG_SGI_IP28 is not set
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_SWARM is not set
-CONFIG_SWAP_IO_SPACE=y
-CONFIG_SYS_HAS_CPU_MIPS32_R1=y
-CONFIG_SYS_HAS_CPU_MIPS32_R2=y
-CONFIG_SYS_HAS_EARLY_PRINTK=y
-CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
-CONFIG_TRAD_SIGNALS=y
-# CONFIG_TREE_PREEMPT_RCU is not set
-CONFIG_TREE_RCU=y
-CONFIG_USB_SUPPORT=y
-CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/amazon/files/arch/mips/amazon/Kconfig b/target/linux/amazon/files/arch/mips/amazon/Kconfig
deleted file mode 100644
index 63055fc2a..000000000
--- a/target/linux/amazon/files/arch/mips/amazon/Kconfig
+++ /dev/null
@@ -1,67 +0,0 @@
-# copyright 2007 john crispin <blogic@openwrt.org>
-
-menu "Amazon built-in"
-
-config AMAZON_ASC_UART
-	bool "Amazon asc uart"
-	select SERIAL_CORE
-	select SERIAL_CORE_CONSOLE
-	default y
-
-config AMAZON_PCI
-	bool "Amazon PCI support"
-	default y
-	select HW_HAS_PCI
-	select PCI
-
-config AMAZON_NET_SW
-	bool "Amazon network"
-	default y
-
-config AMAZON_WDT
-	bool "Amazon watchdog timer"
-	default y
-
-config AMAZON_MTD
-	bool "Amazon MTD map"
-	default y
-
-config ADM6996_SUPPORT
-	bool "Amazon ADM6996 Switch driver"
-	default y
-
-choice 
-	prompt "Flash Size"
-	depends on AMAZON_MTD
-
-config MTD_AMAZON_FLASH_SIZE_2
-	bool "2MB"
-
-config MTD_AMAZON_FLASH_SIZE_4
-	bool "4MB"
-
-config MTD_AMAZON_FLASH_SIZE_8
-	bool "8MB"
-
-config MTD_AMAZON_FLASH_SIZE_16
-	bool "16MB"
-
-endchoice
-
-choice 
-	prompt "Bus Width"
-	depends on AMAZON_MTD
-
-config MTD_AMAZON_BUS_WIDTH_8
-	bool "8-bit"
-
-config MTD_AMAZON_BUS_WIDTH_16
-	bool "16-bit"
-
-config MTD_AMAZON_BUS_WIDTH_32
-	bool "32-bit"
-
-endchoice
-
-
-endmenu
diff --git a/target/linux/amazon/files/arch/mips/amazon/Makefile b/target/linux/amazon/files/arch/mips/amazon/Makefile
deleted file mode 100644
index 47761a277..000000000
--- a/target/linux/amazon/files/arch/mips/amazon/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-#  Copyright 2007 openwrt.org
-#       John Crispin <blogic@openwrt.org>
-#
-# Makefile for Infineon Amazon
-#
-obj-y := dma-core.o interrupt.o prom.o setup.o board.o
-obj-$(CONFIG_PCI) += pci.o
-
diff --git a/target/linux/amazon/files/arch/mips/amazon/board.c b/target/linux/amazon/files/arch/mips/amazon/board.c
deleted file mode 100644
index 330cec608..000000000
--- a/target/linux/amazon/files/arch/mips/amazon/board.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- *   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.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- *
- *   Copyright (C) 2009 Hauke Mehrtens <hauke@hauke-m.de>
- */
-
-
-#include <linux/platform_device.h>
-#include <asm/amazon/irq.h>
-
-#define AMAZON_FLASH_START 0x13000000
-#define AMAZON_FLASH_MAX 0x1000000
-
-static struct platform_device amazon_mii = {
-	.id = 0,
-	.name = "amazon_mii0",
-//	.dev = {
-//		.platform_data = amazon_ethaddr,
-//	}
-};
-
-static struct platform_device amazon_wdt = {
-	.id = 0,
-	.name = "amazon_wdt",
-};
-
-static struct platform_device amazon_asc = {
-	.id = 0,
-	.name = "amazon_asc",
-};
-
-static struct resource amazon_mtd_resource = {
-	.start  = AMAZON_FLASH_START,
-	.end    = AMAZON_FLASH_START + AMAZON_FLASH_MAX - 1,
-	.flags  = IORESOURCE_MEM,
-};
-
-static struct platform_device amazon_mtd = {
-	.id = 0,
-	.name = "amazon_mtd",
-	.num_resources  = 1,
-	.resource   = &amazon_mtd_resource,
-};
-
-
-struct platform_device *amazon_devs[] = {
-	&amazon_mii, &amazon_mtd, &amazon_wdt, &amazon_asc
-};
-
-
-int __init amazon_init_devices(void)
-{
-	printk(KERN_INFO "");
-	return platform_add_devices(amazon_devs, 4);
-}
-
-arch_initcall(amazon_init_devices);
diff --git a/target/linux/amazon/files/arch/mips/amazon/dma-core.c b/target/linux/amazon/files/arch/mips/amazon/dma-core.c
deleted file mode 100644
index 6362895f8..000000000
--- a/target/linux/amazon/files/arch/mips/amazon/dma-core.c
+++ /dev/null
@@ -1,1455 +0,0 @@
-/*
- *   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.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-//-----------------------------------------------------------------------
-/*
- * Description:
- *	Driver for Infineon Amazon DMA
- */
-//-----------------------------------------------------------------------
-/* Author:	Wu Qi Ming[Qi-Ming.Wu@infineon.com]
- * Created:	7-April-2004
- */
-//-----------------------------------------------------------------------
-/* History
- * Last changed on: 4-May-2004
- * Last changed by: <peng.liu@infineon.com>
- * Reason: debug
- */
-//----------------------------------------------------------------------- 
-/* Last changed on: 03-Dec-2004
- * Last changed by: peng.liu@infineon.com
- * Reason: recover from TPE bug 
- */
-
-//000004:fchang 2005/6/2 Modified by Linpeng as described below
-//----------------------------------------------------------------------- 
-/* Last changed on: 28-Jan-2004
- * Last changed by: peng.liu@infineon.com
- * Reason: 
- * - handle "out of memory" bug
- */
-//000003:tc.chen 2005/06/16 fix memory leak when Tx buffer full (heaving traffic).
-//507261:tc.chen 2005/07/26 re-organize code address map to improve performance.
-
-#if defined(CONFIG_MODVERSIONS) && !defined(MODVERSIONS)
-#define MODVERSIONS
-#endif
-
-#if defined(MODVERSIONS) && !defined(__GENKSYMS__)
-#include <linux/modversions.h>
-#endif
-
-#ifndef EXPORT_SYMTAB
-#define EXPORT_SYMTAB			/* need this one 'cause we export symbols */
-#endif
-
-#undef DMA_NO_POLLING
-
-/* no TX interrupt handling */
-#define NO_TX_INT
-/* need for DMA workaround */
-#undef AMAZON_DMA_TPE_AAL5_RECOVERY
-
-#ifdef AMAZON_DMA_TPE_AAL5_RECOVERY
-#define MAX_SYNC_FAILS 1000000	// 000004:fchang
-unsigned int dma_sync_fails = 0;
-unsigned int total_dma_tpe_reset = 0;
-int (*tpe_reset) (void);
-int (*tpe_start) (void);
-int (*tpe_inject) (void);
-#endif							// AMAZON_DMA_TPE_AAL5_RECOVERY
-
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/string.h>
-#include <linux/timer.h>
-#include <linux/fs.h>
-#include <linux/errno.h>
-#include <linux/proc_fs.h>
-#include <linux/stat.h>
-#include <linux/mm.h>
-#include <linux/tty.h>
-#include <linux/selection.h>
-#include <linux/kmod.h>
-#include <linux/vmalloc.h>
-#include <linux/interrupt.h>
-#include <linux/delay.h>
-#include <asm/uaccess.h>
-#include <linux/errno.h>
-#include <asm/io.h>
-
-#include <asm/amazon/amazon.h>
-#include <asm/amazon/irq.h>
-#include <asm/amazon/amazon_dma.h>
-#include "dma-core.h"
-
-#define AMAZON_DMA_EMSG(fmt, args...) printk( KERN_ERR  "%s: " fmt,__FUNCTION__, ## args)
-
-static irqreturn_t dma_interrupt(int irq, void *dev_id);
-extern void mask_and_ack_amazon_irq(unsigned int irq_nr);
-
-/***************************************** global data *******************************************/
-u64 *g_desc_list;
-dev_list *g_current_dev = NULL;
-dev_list *g_head_dev = NULL;
-dev_list *g_tail_dev = NULL;
-channel_info g_log_chan[CHAN_TOTAL_NUM + 1];
-struct proc_dir_entry *g_amazon_dma_dir;
-static u8 rx_chan_list_len = 0;
-static u8 tx_chan_list_len = 0;
-static int rx_chan_list[RX_CHAN_NUM + 1];
-static int tx_chan_list[TX_CHAN_NUM + 1];
-static u32 comb_isr_mask[CHAN_TOTAL_NUM];
-
-static inline int is_rx_chan(int chan_no)
-/*judge if this is an rx channel*/
-{
-	int result = 0;
-	if (chan_no < RX_CHAN_NUM)
-		result = 1;
-	return result;
-}
-
-/* Ugly, Channel ON register is badly mapped to channel no. */
-static u8 ch_on_mapping[CHAN_TOTAL_NUM] =
-	{ 0, 1, 2, 3, 6, 7, 10, 4, 5, 8, 9, 11 };
-
-/* Brief: 	check wether the chan_no is legal
- * Parameter:  	chan_no: logical channel number
- * Return: 	0 if is not valid
- *		1 if is valid
- */
-static inline int is_valid_dma_ch(int chan_no)
-{
-	return ((chan_no >= 0) && (chan_no < CHAN_TOTAL_NUM));
-}
-
-/* Brief:	check whether a channel is open through Channel ON register
- * Parameter:  chan_no: logical channel number
- * Return: 	1 channel is open
- *		0 not yet
- *		EINVAL: invalid parameter
- */
-static inline int is_channel_open(int chan_no)
-{
-	return (AMAZON_DMA_REG32(AMAZON_DMA_CH_ON) &
-			(1 << ch_on_mapping[chan_no]));
-}
-
-/* Brief: add a list entry
- * Description: 
- * 	always add to the tail and no redundancy allowed. (i.e. entries are unique)
- *	0	: entry deleted
- *	<0	: not deleted (due to not unique)
- */
-static inline int _add_list_entry(int *list, int size_of_list, int entry)
-{
-	int i;
-	for (i = 0; i < size_of_list; i++) {
-		if (list[i] == entry)
-			break;
-		if (list[i] < 0) {
-			list[i] = entry;
-			return 0;
-		}
-	}
-	return -1;
-}
-
-/* Brief: delete a list entry
- * Description:
- *	find the entry and remove it. shift all entries behind it one step forward if necessary\
- * Return:
- *	0	: entry deleted
- *	<0	: not deleted (due to not found?)
- */
-static inline int _delete_list_entry(int *list, int size_of_list,
-									 int entry)
-{
-	int i, j;
-	for (i = 0; i < size_of_list; i++) {
-		if (list[i] == entry) {
-			for (j = i; j < size_of_list; j++) {
-				list[j] = list[j + 1];
-				if (list[j + 1] < 0) {
-					break;
-				}
-			}
-			return 0;
-		}
-	}
-	return -1;
-}
-
-/* Brief:	enable a channel through Channel ON register
- * Parameter:  chan_no: logical channel number
- * Description:	
- * 	Please don't open a channel without a valid descriptor (hardware pitfall)
- */
-static inline void open_channel(int chan_no)
-{
-	AMAZON_DMA_REG32(AMAZON_DMA_CH_ON) |= (1 << ch_on_mapping[chan_no]);
-	if (is_rx_chan(chan_no)) {
-		if (_add_list_entry(rx_chan_list, RX_CHAN_NUM, chan_no) == 0) {
-			rx_chan_list_len++;
-		} else {
-			AMAZON_DMA_DMSG("cannot add chan %d to open list\n", chan_no);
-		}
-	} else {
-		if (_add_list_entry(tx_chan_list, TX_CHAN_NUM, chan_no) == 0) {
-			tx_chan_list_len++;
-		} else {
-			AMAZON_DMA_DMSG("cannot add chan %d to open list\n", chan_no);
-		}
-	}
-}
-
-/* Brief:	disable a channel through Channel ON register
- * Parameter:  chan_no: logical channel number
- */
-
-static inline void close_channel(int chan_no)
-{
-	AMAZON_DMA_REG32(AMAZON_DMA_CH_ON) &= ~(1 << ch_on_mapping[chan_no]);
-	if (is_rx_chan(chan_no)) {
-		if (_delete_list_entry(rx_chan_list, RX_CHAN_NUM, chan_no) == 0) {
-			rx_chan_list_len--;
-		} else {
-			AMAZON_DMA_DMSG("cannot remove chan %d from open list \n",
-							chan_no);
-		}
-	} else {
-		if (_delete_list_entry(tx_chan_list, TX_CHAN_NUM, chan_no) == 0) {
-			tx_chan_list_len--;
-		} else {
-			AMAZON_DMA_DMSG("cannot remove chan %d from open list \n",
-							chan_no);
-		}
-	}
-}
-
-/* Brief: clear RX interrupt
- */
-inline void rx_chan_clear_isr(int chan_no)
-{
-#ifdef DMA_NO_POLLING
-	AMAZON_DMA_REG32(AMAZON_DMA_CH0_ISR + chan_no * AMAZON_DMA_CH_STEP) =
-		(AMAZON_DMA_REG32
-		 (AMAZON_DMA_CH0_ISR +
-		  chan_no *
-		  AMAZON_DMA_CH_STEP) & (DMA_ISR_CPT | DMA_ISR_EOP | DMA_ISR_CMDCPT
-								 | DMA_ISR_DURR));
-#else
-	AMAZON_DMA_REG32(AMAZON_DMA_CH0_ISR + chan_no * AMAZON_DMA_CH_STEP) =
-		(AMAZON_DMA_REG32
-		 (AMAZON_DMA_CH0_ISR +
-		  chan_no *
-		  AMAZON_DMA_CH_STEP) & (DMA_ISR_CPT | DMA_ISR_EOP |
-								 DMA_ISR_CMDCPT));
-#endif
-}
-
-
-/* Brief:	hacking function, this will reset all descriptors back to DMA
- */
-static void dma_reset_all_descriptors(int chan_no)
-{
-	volatile struct rx_desc *rx_desc_p = NULL;
-	int i;
-	rx_desc_p =
-		(struct rx_desc *) g_desc_list +
-		g_log_chan[chan_no].offset_from_base;
-	for (i = 0; i < g_log_chan[chan_no].desc_len; i++) {
-		rx_desc_p->status.word &=
-			(~(DMA_DESC_SOP_SET | DMA_DESC_EOP_SET | DMA_DESC_CPT_SET));
-		rx_desc_p->status.word |=
-			(DMA_DESC_OWN_DMA | g_log_chan[chan_no].packet_size);
-		rx_desc_p++;
-	}
-}
-
-#ifdef AMAZON_DMA_TPE_AAL5_RECOVERY
-/* Brief:	Reset DMA descriptors 
- */
-static void amazon_dma_reset_tpe_rx(int chan_no)
-{
-	struct tx_desc *tx_desc_p = NULL;
-	int j, i = 0;
-
-	// wait until all TX channels stop transmitting
-	for (j = 9; j <= 10; j++) {
-		tx_desc_p =
-			(struct tx_desc *) g_desc_list +
-			g_log_chan[j].offset_from_base;
-		for (i = 0; i < g_log_chan[j].desc_len; i++) {
-			while ((tx_desc_p->status.field.OWN != CPU_OWN)) {
-				AMAZON_DMA_DMSG("DMA TX in progress\n");	// 000004:fchang
-				udelay(100);
-			}
-			tx_desc_p++;
-		}
-	}
-
-	if (tpe_reset) {
-		total_dma_tpe_reset++;
-		AMAZON_DMA_DMSG
-			("\n===============resetting TPE========================== \n");
-		if ((*tpe_reset) ()) {
-			panic("cannot reset TPE engien\n");	// 000004:fchang
-		}
-	} else {
-		panic("no tpe_reset function\n");	// 000004:fchang
-		return;
-	}
-	dma_reset_all_descriptors(chan_no);
-	rx_chan_clear_isr(chan_no);
-	mb();
-
-	// send EoP
-	if (tpe_inject) {
-		if ((*tpe_inject) ()) {
-			panic("cannot inject a cell\n");	// 000004:fchang
-		}
-	} else {
-		AMAZON_DMA_EMSG("no tpe_inject function\n");
-		return;
-	}
-	mb();
-	while (1) {
-		if (AMAZON_DMA_REG32
-			(AMAZON_DMA_CH0_ISR +
-			 chan_no * AMAZON_DMA_CH_STEP) & (DMA_ISR_CPT)) {
-			rx_chan_clear_isr(chan_no);
-			mb();
-			dma_reset_all_descriptors(chan_no);
-			if (g_log_chan[chan_no].current_desc ==
-				(g_log_chan[chan_no].desc_len - 1)) {
-				g_log_chan[chan_no].current_desc = 0;
-			} else {
-				g_log_chan[chan_no].current_desc++;
-			}
-			break;
-		}
-		mdelay(1);
-	}
-	mb();
-#if 0
-	AMAZON_DMA_REG32(AMAZON_DMA_CH_ON) &= ~(1 << ch_on_mapping[chan_no]);
-	while (AMAZON_DMA_REG32(AMAZON_DMA_CH_ON) &
-		   (1 << ch_on_mapping[chan_no])) {
-		printk("TPE channel still on\n");
-		mdelay(1);
-	}
-
-	// AMAZON_DMA_REG32(AMAZON_DMA_CH_RST) = (1<<chan_no);
-	mb();
-	AMAZON_DMA_REG32(AMAZON_DMA_CH0_MSK + chan_no * AMAZON_DMA_CH_STEP) =
-		0x32;
-	mb();
-	rx_chan_clear_isr(chan_no);
-	dma_reset_all_descriptors(chan_no);
-	mb();
-	AMAZON_DMA_REG32(AMAZON_DMA_CH_ON) |= (1 << ch_on_mapping[chan_no]);
-	// g_log_chan[chan_no].current_desc=0;
-	mb();
-	mdelay(1);
-#endif
-	if (tpe_start) {
-		(*tpe_start) ();
-	} else {
-		AMAZON_DMA_EMSG("cannot restart TPE engien\n");
-	}
-}
-#endif							// AMAZON_DMA_TPE_AAL5_RECOVERY
-
-
-/* Brief:	RX channel interrupt handler 
- * Parameter:	RX channel no
- * Description: the interrupt handler for each RX channel
- *		1. check descriptor, clear ISR if no incoming packet
- *		2. inform upper layer to receive packet (and update descriptors)
- */
-inline void rx_chan_intr_handler(int chan_no)
-{
-	volatile struct rx_desc *rx_desc_p = NULL;
-
-	/* fetch the current descriptor */
-	rx_desc_p =
-		(struct rx_desc *) g_desc_list +
-		g_log_chan[chan_no].offset_from_base +
-		g_log_chan[chan_no].current_desc;
-
-	g_log_chan[chan_no].dma_dev->current_rx_chan =
-		chan_no - g_log_chan[chan_no].dma_dev->logic_rx_chan_base;
-
-	// workaround for DMA pitfall: complete bit set happends before the
-	// other two bits (own,eop) are ready
-	if ((rx_desc_p->status.field.EoP != 1)
-		|| (rx_desc_p->status.field.OWN != CPU_OWN)
-		|| (rx_desc_p->status.field.data_length ==
-			g_log_chan[chan_no].packet_size)) {
-#ifdef AMAZON_DMA_TPE_AAL5_RECOVERY
-		if (chan_no == 4 || chan_no == 5) {
-			dma_sync_fails++;
-			if (dma_sync_fails > MAX_SYNC_FAILS) {
-				// detect bug
-				rx_desc_p0 =
-					(struct rx_desc *) g_desc_list +
-					g_log_chan[chan_no].offset_from_base;
-				rx_desc_p1 =
-					(struct rx_desc *) g_desc_list +
-					g_log_chan[chan_no].offset_from_base + 1;
-				if ((rx_desc_p0->status.field.OWN == CPU_OWN
-					 && rx_desc_p0->status.field.EoP != 1)
-					&& (rx_desc_p1->status.field.OWN == CPU_OWN
-						&& rx_desc_p1->status.field.EoP != 1)) {
-					amazon_dma_reset_tpe_rx(chan_no);
-					dma_sync_fails = 0;
-					return;
-				}
-				dma_sync_fails = 0;
-				AMAZON_DMA_DMSG("too many times ch:%d\n", chan_no);	// 000004:fchang
-				return;
-			}
-			udelay(10);			// 000004:fchang
-		}
-#endif							// //AMAZON_DMA_TPE_AAL5_RECOVERY
-		return;
-	}
-
-	/* inform the upper layer to receive the packet */
-	g_log_chan[chan_no].intr_handler(g_log_chan[chan_no].dma_dev, RCV_INT);
-	/* check the next descriptor, if still contains the incoming packet,
-	   then do not clear the interrupt status */
-	rx_desc_p =
-		(struct rx_desc *) g_desc_list +
-		g_log_chan[chan_no].offset_from_base +
-		g_log_chan[chan_no].current_desc;
-	if (!
-		((rx_desc_p->status.field.OWN == CPU_OWN)
-		 && (rx_desc_p->status.field.C == 1))) {
-		rx_chan_clear_isr(chan_no);
-	}
-}
-
-
-/* Brief:	TX channel interrupt handler 
- * Parameter:	TX channel no
- * Description: the interrupt handler for each TX channel
- * 1. check all the descripters,if any of them had transmitted a packet, then free buffer
- * because we cannot garantee the which one has already transmitted out, we have to go through all the descriptors here
- * 2. clear the interrupt status bit
- */
-inline void tx_chan_intr_handler(int chan_no)
-{
-	struct tx_desc *tx_desc_p = NULL;
-	int i = 0;
-
-	tx_desc_p =
-		(struct tx_desc *) g_desc_list +
-		g_log_chan[chan_no].offset_from_base;
-
-	for (i = 0; i < g_log_chan[chan_no].desc_len; i++) {
-		if ((tx_desc_p->status.field.OWN == CPU_OWN)
-			&& (tx_desc_p->status.field.C == 1)) {
-			/* if already transmitted, then free the buffer */
-			g_log_chan[chan_no].
-				buffer_free((u8 *) __va(tx_desc_p->Data_Pointer),
-							g_log_chan[chan_no].opt[i]);
-			tx_desc_p->status.field.C = 0;
-			/* inform the upper layer about the completion of the
-			   transmitted packet, the upper layer may want to free the
-			   packet */
-			g_log_chan[chan_no].intr_handler(g_log_chan[chan_no].dma_dev,
-											 TRANSMIT_CPT_INT);
-		}
-		tx_desc_p++;
-	}
-
-	/* after all these operations, clear the interrupt status bit */
-	AMAZON_DMA_REG32(AMAZON_DMA_CH0_ISR + chan_no * AMAZON_DMA_CH_STEP) =
-		(AMAZON_DMA_REG32
-		 (AMAZON_DMA_CH0_ISR +
-		  chan_no *
-		  AMAZON_DMA_CH_STEP) & (DMA_ISR_CPT | DMA_ISR_EOP |
-								 DMA_ISR_CMDCPT));
-}
-
-/*	Brief:	DMA interrupt handler
- */
-static irqreturn_t dma_interrupt(int irq, void *dev_id)
-{
-	int i = 0;
-	int chan_no;
-	u32 isr = 0;
-#ifdef NO_TX_INT				// 000004:fchang
-	static int cnt = 0;			// 000004:fchang
-#endif							// 000004:fchang
-	while ((isr =
-			AMAZON_DMA_REG32(AMAZON_DMA_COMB_ISR)) & (COMB_ISR_RX_MASK |
-													  COMB_ISR_TX_MASK)) {
-		if (isr & COMB_ISR_RX_MASK) {
-			// RX Channels: start WFQ algorithm
-			chan_no = CHAN_TOTAL_NUM;
-			for (i = 0; i < RX_CHAN_NUM; i++) {
-				if ((isr & (comb_isr_mask[i]))
-					&& (g_log_chan[i].weight > 0)) {
-					if (g_log_chan[chan_no].weight < g_log_chan[i].weight) {
-						chan_no = i;
-					}
-				}
-			}
-			if (chan_no < CHAN_TOTAL_NUM) {
-				rx_chan_intr_handler(chan_no);
-			} else {
-				for (i = 0; i < RX_CHAN_NUM; i++) {
-					g_log_chan[i].weight = g_log_chan[i].default_weight;
-				}
-			}
-		}
-#ifdef NO_TX_INT
-		cnt++;
-		if (cnt == 10) {
-			cnt = 0;
-			for (i = 0; i < tx_chan_list_len; i++) {
-				if (AMAZON_DMA_REG32
-					(AMAZON_DMA_CH0_ISR +
-					 tx_chan_list[i] *
-					 AMAZON_DMA_CH_STEP) & (DMA_ISR_CPT | DMA_ISR_EOP)) {
-					tx_chan_intr_handler(tx_chan_list[i]);
-				}
-			}
-		}
-#else
-		if (isr & COMB_ISR_TX_MASK) {
-			// TX channels: RR
-			for (i = 0; i < tx_chan_list_len; i++) {
-				if (isr & (comb_isr_mask[tx_chan_list[i]])) {
-					tx_chan_intr_handler(tx_chan_list[i]);
-				}
-			}
-		}
-#endif
-	}							// while 
-	return IRQ_HANDLED;
-}
-
-
-/*	Brief:	read a packet from DMA RX channel
- *	Parameter:
- *	Return:	packet length
- *	Description:
- *		This is called back in a context of DMA interrupt
- *		1. prepare new descriptor
- *		2. read data
- *		3. update WFQ weight
- */
-//507261:tc.chen int dma_device_read(struct dma_device_info* dma_dev, u8** dataptr, void** opt)
-int asmlinkage dma_device_read(struct dma_device_info *dma_dev,
-							   u8 ** dataptr, void **opt)
-{
-	u8 *buf;
-	int len;
-	int chan_no = 0;
-	int byte_offset = 0;
-
-	struct rx_desc *rx_desc_p;
-	void *p = NULL;
-	int current_desc;
-
-	chan_no = dma_dev->logic_rx_chan_base + dma_dev->current_rx_chan;
-	current_desc = g_log_chan[chan_no].current_desc;
-	rx_desc_p =
-		(struct rx_desc *) (g_desc_list +
-							g_log_chan[chan_no].offset_from_base +
-							current_desc);
-	buf = (u8 *) __va(rx_desc_p->Data_Pointer);	/* extract the virtual
-												   address of the data
-												   pointer */
-	len = rx_desc_p->status.field.data_length;	/* extract the data length */
-#ifndef	CONFIG_MIPS_UNCACHED
-	dma_cache_inv((unsigned long) buf, len);
-#endif							// CONFIG_MIPS_UNCACHED
-	*(u32 *) dataptr = (u32) buf;
-	if (opt) {
-		*(int *) opt = (int) g_log_chan[chan_no].opt[current_desc];	/* read 
-																	   out 
-																	   the 
-																	   opt 
-																	   information */
-	}
-
-	buf =
-		(u8 *) g_log_chan[chan_no].buffer_alloc(g_log_chan[chan_no].
-												packet_size, &byte_offset,
-												&p);
-	// should check null!!!!
-	if (buf == NULL || p == NULL) {
-		*(u32 *) dataptr = 0;
-		*(int *) opt = 0;
-		len = 0;
-	} else {
-		g_log_chan[chan_no].opt[current_desc] = p;
-		/* reduce the weight for WFQ algorithm */
-		g_log_chan[chan_no].weight -= len;
-		rx_desc_p->Data_Pointer = (u32) CPHYSADDR((u32) buf);
-	}
-	if (current_desc == g_log_chan[chan_no].desc_len - 1) {
-		current_desc = 0;
-	} else {
-		current_desc++;
-	}
-	g_log_chan[chan_no].current_desc = current_desc;
-
-	rx_desc_p->status.word = DMA_DESC_OWN_DMA
-		| (byte_offset << DMA_DESC_BYTEOFF_SHIFT)
-		| g_log_chan[chan_no].packet_size;
-	return len;
-}
-
-/*	Brief:	write a packet through DMA RX channel to peripheral
- *	Parameter:
- *	Return:	packet length
- *	Description:
- *
- */
-u64 dma_tx_drop = 0;
-//507261:tc.chen int dma_device_write(struct dma_device_info* dma_dev, u8* dataptr, int len,void* opt)
-int asmlinkage dma_device_write(struct dma_device_info *dma_dev,
-								u8 * dataptr, int len, void *opt)
-{
-	int chan_no = 0;
-	struct tx_desc *tx_desc_p;
-
-	int byte_offset = 0;
-	int current_desc;
-	static int cnt = 0;			// 000004:fchang
-
-	unsigned long flag;
-	local_irq_save(flag);
-
-	chan_no = dma_dev->logic_tx_chan_base + dma_dev->current_tx_chan;
-	current_desc = g_log_chan[chan_no].current_desc;
-	tx_desc_p =
-		(struct tx_desc *) (g_desc_list +
-							g_log_chan[chan_no].offset_from_base +
-							current_desc);
-	// 000003:tc.chen if(tx_desc_p->status.field.OWN==DMA_OWN){
-	if (tx_desc_p->status.field.OWN == DMA_OWN || tx_desc_p->status.field.C == 1) {	// 000003:tc.chen
-		AMAZON_DMA_DMSG("no TX desc for CPU, drop packet\n");
-		dma_tx_drop++;
-		g_log_chan[chan_no].intr_handler(dma_dev, TX_BUF_FULL_INT);
-		local_irq_restore(flag);
-		return 0;
-	}
-	g_log_chan[chan_no].opt[current_desc] = opt;
-
-	/* byte offset----to adjust the starting address of the data buffer,
-	   should be multiple of the burst length. */
-	byte_offset =
-		((u32) CPHYSADDR((u32) dataptr)) % (g_log_chan[chan_no].burst_len *
-											4);
-#ifndef	CONFIG_MIPS_UNCACHED
-	dma_cache_wback((unsigned long) dataptr, len);
-	wmb();
-#endif							// CONFIG_MIPS_UNCACHED
-
-	tx_desc_p->Data_Pointer = (u32) CPHYSADDR((u32) dataptr) - byte_offset;
-	wmb();
-	tx_desc_p->status.word = DMA_DESC_OWN_DMA
-		| DMA_DESC_SOP_SET
-		| DMA_DESC_EOP_SET | (byte_offset << DMA_DESC_BYTEOFF_SHIFT)
-		| len;
-	wmb();
-	if (is_channel_open(chan_no) == 0) {
-		// turn on if necessary
-		open_channel(chan_no);
-	}
-#ifdef DMA_NO_POLLING
-	if ((AMAZON_DMA_REG32
-		 (AMAZON_DMA_CH0_ISR +
-		  chan_no * AMAZON_DMA_CH_STEP) & (DMA_ISR_DURR | DMA_ISR_CPT)) ==
-		(DMA_ISR_DURR)) {
-		// clear DURR if (CPT is AND set and DURR is set)
-		AMAZON_DMA_REG32(AMAZON_DMA_CH0_ISR +
-						 chan_no * AMAZON_DMA_CH_STEP) = DMA_ISR_DURR;
-	}
-#endif
-
-	if (current_desc == (g_log_chan[chan_no].desc_len - 1)) {
-		current_desc = 0;
-	} else {
-		current_desc++;
-	}
-
-
-	g_log_chan[chan_no].current_desc = current_desc;
-	tx_desc_p =
-		(struct tx_desc *) (g_desc_list +
-							g_log_chan[chan_no].offset_from_base +
-							current_desc);
-	// 000003:tc.chen if(tx_desc_p->status.field.OWN==DMA_OWN){
-	if (tx_desc_p->status.field.OWN == DMA_OWN || tx_desc_p->status.field.C == 1) {	// 000003:tc.chen
-		g_log_chan[chan_no].intr_handler(dma_dev, TX_BUF_FULL_INT);
-	}
-#ifdef NO_TX_INT
-//000004:fchang Start
-	cnt++;
-	if (cnt == 5) {
-		cnt = 0;
-		tx_chan_intr_handler(chan_no);
-	}
-//000004:fchang End
-#endif
-	local_irq_restore(flag);	// 000004:fchang
-	return len;
-}
-
-
-
-int desc_list_proc_read(char *buf, char **start, off_t offset,
-						int count, int *eof, void *data)
-{
-	int i;
-	u32 *p = (u32 *) g_desc_list;
-	int len = 0;
-	len += sprintf(buf + len, "descriptor list:\n");
-	for (i = 0; i < 120; i++) {
-		len += sprintf(buf + len, "%d\n", i);
-		len += sprintf(buf + len, "%08x\n", *(p + i * 2 + 1));
-		len += sprintf(buf + len, "%08x\n", *(p + i * 2));
-
-	}
-
-	return len;
-
-}
-
-int channel_weight_proc_read(char *buf, char **start, off_t offset,
-							 int count, int *eof, void *data)
-{
-
-	// int i=0;
-	int len = 0;
-	len += sprintf(buf + len, "Qos dma channel weight list\n");
-	len +=
-		sprintf(buf + len,
-				"channel_num default_weight current_weight device Tx/Rx\n");
-	len +=
-		sprintf(buf + len,
-				"     0      %08x        %08x      Switch   Rx0\n",
-				g_log_chan[0].default_weight, g_log_chan[0].weight);
-	len +=
-		sprintf(buf + len,
-				"     1      %08x        %08x      Switch   Rx1\n",
-				g_log_chan[1].default_weight, g_log_chan[1].weight);
-	len +=
-		sprintf(buf + len,
-				"     2      %08x        %08x      Switch   Rx2\n",
-				g_log_chan[2].default_weight, g_log_chan[2].weight);
-	len +=
-		sprintf(buf + len,
-				"     3      %08x        %08x      Switch   Rx3\n",
-				g_log_chan[3].default_weight, g_log_chan[3].weight);
-	len +=
-		sprintf(buf + len,
-				"     4      %08x        %08x      Switch   Tx0\n",
-				g_log_chan[4].default_weight, g_log_chan[4].weight);
-	len +=
-		sprintf(buf + len,
-				"     5      %08x        %08x      Switch   Tx1\n",
-				g_log_chan[5].default_weight, g_log_chan[5].weight);
-	/* 
-	   len+=sprintf(buf+len," 6 %08x %08x TPE
-	   Rx0\n",g_log_chan[6].default_weight, g_log_chan[6].weight);
-	   len+=sprintf(buf+len," 7 %08x %08x TPE
-	   Rx0\n",g_log_chan[7].default_weight, g_log_chan[7].weight);
-	   len+=sprintf(buf+len," 8 %08x %08x TPE
-	   Tx0\n",g_log_chan[8].default_weight, g_log_chan[8].weight);
-	   len+=sprintf(buf+len," 9 %08x %08x TPE
-	   Rx0\n",g_log_chan[9].default_weight, g_log_chan[9].weight);
-	   len+=sprintf(buf+len," 10 %08x %08x DPLUS
-	   Rx0\n",g_log_chan[10].default_weight, g_log_chan[10].weight);
-	   len+=sprintf(buf+len," 11 %08x %08x DPLUS
-	   Rx0\n",g_log_chan[11].default_weight, g_log_chan[11].weight); */
-	return len;
-}
-
-int dma_register_proc_read(char *buf, char **start, off_t offset,
-						   int count, int *eof, void *data)
-{
-	dev_list *temp_dev;
-	int len = 0;;
-
-	len += sprintf(buf + len, "amazon dma driver\n");
-	len += sprintf(buf + len, "version 1.0\n");
-	len += sprintf(buf + len, "devices registered:\n");
-	for (temp_dev = g_head_dev; temp_dev; temp_dev = temp_dev->next) {
-		len += sprintf(buf + len, "%s ", temp_dev->dev->device_name);
-	}
-	len += sprintf(buf + len, "\n");
-	len += sprintf(buf + len, "CH_ON=%08x\n", AMAZON_DMA_REG32(AMAZON_DMA_CH_ON));
-	len += sprintf(buf + len, "CH_RST=%08x\n", AMAZON_DMA_REG32(AMAZON_DMA_CH_RST));
-	len += sprintf(buf + len, "CH0_ISR=%08x\n",	AMAZON_DMA_REG32(AMAZON_DMA_CH0_ISR));
-	len += sprintf(buf + len, "CH1_ISR=%08x\n",	AMAZON_DMA_REG32(AMAZON_DMA_CH1_ISR));
-	len += sprintf(buf + len, "CH2_ISR=%08x\n",	AMAZON_DMA_REG32(AMAZON_DMA_CH2_ISR));
-	len += sprintf(buf + len, "CH3_ISR=%08x\n",	AMAZON_DMA_REG32(AMAZON_DMA_CH3_ISR));
-	len += sprintf(buf + len, "CH4_ISR=%08x\n",	AMAZON_DMA_REG32(AMAZON_DMA_CH4_ISR));
-	len += sprintf(buf + len, "CH5_ISR=%08x\n",	AMAZON_DMA_REG32(AMAZON_DMA_CH5_ISR));
-	len += sprintf(buf + len, "CH6_ISR=%08x\n",	AMAZON_DMA_REG32(AMAZON_DMA_CH6_ISR));
-	len += sprintf(buf + len, "CH7_ISR=%08x\n", AMAZON_DMA_REG32(AMAZON_DMA_CH7_ISR));
-	len +=		sprintf(buf + len, "CH8_ISR=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH8_ISR));
-	len +=
-		sprintf(buf + len, "CH9_ISR=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH9_ISR));
-	len +=
-		sprintf(buf + len, "CH10_ISR=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH10_ISR));
-	len +=
-		sprintf(buf + len, "CH11_ISR=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH11_ISR));
-	len +=
-		sprintf(buf + len, "LCH0_MSK=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH0_MSK));
-	len +=
-		sprintf(buf + len, "LCH1_MSK=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH1_MSK));
-	len +=
-		sprintf(buf + len, "LCH2_MSK=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH2_MSK));
-	len +=
-		sprintf(buf + len, "LCH3_MSK=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH3_MSK));
-	len +=
-		sprintf(buf + len, "LCH4_MSK=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH4_MSK));
-	len +=
-		sprintf(buf + len, "LCH5_MSK=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH5_MSK));
-	len +=
-		sprintf(buf + len, "LCH6_MSK=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH6_MSK));
-	len +=
-		sprintf(buf + len, "LCH7_MSK=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH7_MSK));
-	len +=
-		sprintf(buf + len, "LCH8_MSK=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH8_MSK));
-	len +=
-		sprintf(buf + len, "LCH9_MSK=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH9_MSK));
-	len +=
-		sprintf(buf + len, "LCH10_MSK=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH10_MSK));
-	len +=
-		sprintf(buf + len, "LCH11_MSK=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH11_MSK));
-	len +=
-		sprintf(buf + len, "Desc_BA=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_Desc_BA));
-	len +=
-		sprintf(buf + len, "LCH0_DES_LEN=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH0_DES_LEN));
-	len +=
-		sprintf(buf + len, "LCH1_DES_LEN=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH1_DES_LEN));
-	len +=
-		sprintf(buf + len, "LCH2_DES_LEN=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH2_DES_LEN));
-	len +=
-		sprintf(buf + len, "LCH3_DES_LEN=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH3_DES_LEN));
-	len +=
-		sprintf(buf + len, "LCH4_DES_LEN=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH4_DES_LEN));
-	len +=
-		sprintf(buf + len, "LCH5_DES_LEN=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH5_DES_LEN));
-	len +=
-		sprintf(buf + len, "LCH6_DES_LEN=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH6_DES_LEN));
-	len +=
-		sprintf(buf + len, "LCH7_DES_LEN=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH7_DES_LEN));
-	len +=
-		sprintf(buf + len, "LCH8_DES_LEN=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH8_DES_LEN));
-	len +=
-		sprintf(buf + len, "LCH9_DES_LEN=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH9_DES_LEN));
-	len +=
-		sprintf(buf + len, "LCH10_DES_LEN=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH10_DES_LEN));
-	len +=
-		sprintf(buf + len, "LCH11_DES_LEN=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH11_DES_LEN));
-	len +=
-		sprintf(buf + len, "LCH1_DES_OFST=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH1_DES_OFST));
-	len +=
-		sprintf(buf + len, "LCH2_DES_OFST=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH2_DES_OFST));
-	len +=
-		sprintf(buf + len, "LCH3_DES_OFST=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH3_DES_OFST));
-	len +=
-		sprintf(buf + len, "LCH4_DES_OFST=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH4_DES_OFST));
-	len +=
-		sprintf(buf + len, "LCH5_DES_OFST=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH5_DES_OFST));
-	len +=
-		sprintf(buf + len, "LCH6_DES_OFST=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH6_DES_OFST));
-	len +=
-		sprintf(buf + len, "LCH7_DES_OFST=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH7_DES_OFST));
-	len +=
-		sprintf(buf + len, "LCH8_DES_OFST=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH8_DES_OFST));
-	len +=
-		sprintf(buf + len, "LCH9_DES_OFST=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH9_DES_OFST));
-	len +=
-		sprintf(buf + len, "LCH10_DES_OFST=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH10_DES_OFST));
-	len +=
-		sprintf(buf + len, "LCH11_DES_OFST=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH11_DES_OFST));
-	len +=
-		sprintf(buf + len, "AMAZON_DMA_SW_BL=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_SW_BL));
-	len +=
-		sprintf(buf + len, "AMAZON_DMA_TPE_BL=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_TPE_BL));
-	len +=
-		sprintf(buf + len, "DPlus2FPI_BL=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_DPlus2FPI_BL));
-	len +=
-		sprintf(buf + len, "GRX_BUF_LEN=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_GRX_BUF_LEN));
-	len +=
-		sprintf(buf + len, "DMA_ECON_REG=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_DMA_ECON_REG));
-	len +=
-		sprintf(buf + len, "POLLING_REG=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_POLLING_REG));
-	len +=
-		sprintf(buf + len, "CH_WGT=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_CH_WGT));
-	len +=
-		sprintf(buf + len, "TX_WGT=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_TX_WGT));
-	len +=
-		sprintf(buf + len, "DPlus2FPI_CLASS=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_DPLus2FPI_CLASS));
-	len +=
-		sprintf(buf + len, "COMB_ISR=%08x\n",
-				AMAZON_DMA_REG32(AMAZON_DMA_COMB_ISR));
-#ifdef AMAZON_DMA_TPE_AAL5_RECOVERY
-	len += sprintf(buf + len, "TPE fails:%u\n", total_dma_tpe_reset);	// 000004:fchang
-#endif
-	return len;
-}
-
-/*	Brief:	initialize DMA registers
- *	Description:
- */
-static void dma_chip_init(void)
-{
-	int i;
-	for (i = 0; i < CHAN_TOTAL_NUM; i++) {
-		AMAZON_DMA_REG32(AMAZON_DMA_CH1_DES_OFST +
-						 i * AMAZON_DMA_CH_STEP) = DEFAULT_OFFSET;
-	}
-#ifdef DMA_NO_POLLING
-	AMAZON_DMA_REG32(AMAZON_DMA_POLLING_REG) = 0;
-#else
-	// enable poll mode and set polling counter
-	AMAZON_DMA_REG32(AMAZON_DMA_POLLING_REG) = DMA_POLLING_CNT | DMA_POLLING_ENABLE;
-#endif
-	// to enable DMA drop
-	AMAZON_DMA_REG32(AMAZON_DMA_GRX_BUF_LEN) = 0x10000;
-}
-
-int insert_dev_list(dev_list * dev)
-{
-	dev_list *temp_dev;
-	if (g_head_dev == NULL) {
-		g_head_dev = dev;
-		g_tail_dev = dev;
-		dev->prev = NULL;
-		dev->next = NULL;
-	} else {
-		for (temp_dev = g_head_dev; temp_dev; temp_dev = temp_dev->next) {
-			if (temp_dev->weight < dev->weight) {
-				if (temp_dev->prev)
-					temp_dev->prev->next = dev;
-
-				dev->prev = temp_dev->prev;
-				dev->next = temp_dev;
-				temp_dev->prev = dev;
-				if (temp_dev == g_head_dev)
-					g_head_dev = dev;
-				break;
-			}
-		}
-
-		if (!temp_dev) {
-			g_tail_dev->next = dev;
-			dev->prev = g_tail_dev;
-			dev->next = NULL;
-			g_tail_dev = dev;
-		}
-
-	}
-
-	return 1;
-}
-
-u8 *common_buffer_alloc(int len, int *byte_offset, void **opt)
-{
-	u8 *buffer = (u8 *) kmalloc(len * sizeof(u8), GFP_KERNEL);
-	*byte_offset = 0;
-	return buffer;
-
-}
-
-int common_buffer_free(u8 * dataptr, void *opt)
-{
-	if (dataptr)
-		kfree(dataptr);
-	return 0;
-}
-
-
-int register_dev(struct dma_device_info *dma_dev)
-{
-	int i, j, temp;
-	int burst_reg = 0;
-	u8 *buffer;
-	void *p = NULL;
-	int byte_offset = 0;
-
-	struct rx_desc *rx_desc_p;
-	struct tx_desc *tx_desc_p;
-	if (strcmp(dma_dev->device_name, "switch1") == 0) {
-		AMAZON_DMA_REG32(AMAZON_DMA_CH_RST) = SWITCH1_RST_MASK;	// resest
-																// channel 
-																// 1st 
-		AMAZON_DMA_REG32(AMAZON_DMA_DMA_ECON_REG) |= 0x3;	// endian
-															// conversion
-															// for Switch
-		burst_reg = AMAZON_DMA_SW_BL;
-		dma_dev->logic_rx_chan_base = switch_rx_chan_base;
-		dma_dev->logic_tx_chan_base = switch_tx_chan_base;
-	}
-
-	else if (strcmp(dma_dev->device_name, "switch2") == 0) {
-		AMAZON_DMA_REG32(AMAZON_DMA_CH_RST) = SWITCH2_RST_MASK;	// resest
-																// channel 
-																// 1st
-		AMAZON_DMA_REG32(AMAZON_DMA_DMA_ECON_REG) |= 0x3;	// endian
-															// conversion
-															// for Switch
-		burst_reg = AMAZON_DMA_SW_BL;
-		dma_dev->logic_rx_chan_base = switch2_rx_chan_base;
-		dma_dev->logic_tx_chan_base = switch2_tx_chan_base;
-
-	} else if (strcmp(dma_dev->device_name, "TPE") == 0) {
-		AMAZON_DMA_REG32(AMAZON_DMA_CH_RST) = TPE_RST_MASK;	// resest
-															// channel 1st 
-															// 
-		burst_reg = AMAZON_DMA_TPE_BL;
-		dma_dev->logic_rx_chan_base = TPE_rx_chan_base;
-		dma_dev->logic_tx_chan_base = TPE_tx_chan_base;
-	}
-
-	else if (strcmp(dma_dev->device_name, "DPlus") == 0) {
-		AMAZON_DMA_REG32(AMAZON_DMA_CH_RST) = DPlus2FPI_RST_MASK;	// resest 
-																	// channel 
-																	// 1st
-		dma_dev->logic_rx_chan_base = DPLus2FPI_rx_chan_base;
-		dma_dev->logic_tx_chan_base = DPLus2FPI_tx_chan_base;
-
-	}
-
-	i = 0;
-	for (temp = dma_dev->tx_burst_len; temp > 2; temp /= 2) {
-		i += 1;
-	}
-
-
-	AMAZON_DMA_REG32(burst_reg) = i << 1;
-	i = 0;
-	for (temp = dma_dev->rx_burst_len; temp > 2; temp /= 2) {
-		i += 1;
-	}
-	AMAZON_DMA_REG32(burst_reg) += i;
-
-	for (i = 0; i < dma_dev->num_rx_chan; i++) {
-
-		temp = dma_dev->logic_rx_chan_base + i;
-		g_log_chan[temp].dma_dev = dma_dev;
-		g_log_chan[temp].weight = dma_dev->rx_chan[i].weight;
-		g_log_chan[temp].default_weight = dma_dev->rx_chan[i].weight;
-		g_log_chan[temp].current_desc = 0;
-		g_log_chan[temp].desc_ofst = DEFAULT_OFFSET;
-		g_log_chan[temp].desc_len = dma_dev->rx_chan[i].desc_num;
-		g_log_chan[temp].offset_from_base = temp * DEFAULT_OFFSET;
-		g_log_chan[temp].packet_size = dma_dev->rx_chan[i].packet_size;
-
-		AMAZON_DMA_REG32(AMAZON_DMA_CH0_DES_LEN + temp * AMAZON_DMA_CH_STEP) = dma_dev->rx_chan[i].desc_num;
-		// enable interrupt mask
-		if (temp == 4 || temp == 5) {
-			AMAZON_DMA_REG32(AMAZON_DMA_CH0_MSK + temp * AMAZON_DMA_CH_STEP) = 0x32;
-		} else {
-			AMAZON_DMA_REG32(AMAZON_DMA_CH0_MSK + temp * AMAZON_DMA_CH_STEP) = 0x36;
-		}
-		strcpy(g_log_chan[temp].device_name, dma_dev->device_name);
-		g_log_chan[temp].burst_len = dma_dev->rx_burst_len;
-		g_log_chan[temp].control = dma_dev->rx_chan[i].control;
-
-
-		/* specify the buffer allocation and free method */
-		if (dma_dev->buffer_alloc)
-			g_log_chan[temp].buffer_alloc = dma_dev->buffer_alloc;
-		else
-			g_log_chan[temp].buffer_alloc = common_buffer_alloc;
-
-		if (dma_dev->buffer_free)
-			g_log_chan[temp].buffer_free = dma_dev->buffer_free;
-		else
-			g_log_chan[temp].buffer_free = common_buffer_free;
-
-		if (dma_dev->intr_handler)
-			g_log_chan[temp].intr_handler = dma_dev->intr_handler;
-		else
-			g_log_chan[temp].intr_handler = NULL;
-
-		for (j = 0; j < g_log_chan[temp].desc_len; j++) {
-			rx_desc_p = (struct rx_desc *) (g_desc_list + g_log_chan[temp].offset_from_base + j);
-			rx_desc_p->status.word = 0;
-			rx_desc_p->status.field.data_length = g_log_chan[temp].packet_size;
-			buffer = (u8 *) g_log_chan[temp].buffer_alloc(g_log_chan[temp].packet_size, &byte_offset, &p);
-			rx_desc_p->Data_Pointer = (u32) CPHYSADDR((u32) buffer);
-			rx_desc_p->status.field.byte_offset = byte_offset;
-			/* fix me, should check if the addresss comply with the burst
-			   lenght requirment */
-			g_log_chan[temp].opt[j] = p;
-			rx_desc_p->status.field.OWN = DMA_OWN;
-
-		}
-		/* open or close the channel */
-		if (g_log_chan[temp].control)
-			open_channel(temp);
-		else
-			close_channel(temp);
-	}
-
-	for (i = 0; i < dma_dev->num_tx_chan; i++) {
-		temp = dma_dev->logic_tx_chan_base + i;
-		g_log_chan[temp].dma_dev = dma_dev;
-		g_log_chan[temp].weight = dma_dev->tx_chan[i].weight;
-		g_log_chan[temp].default_weight = dma_dev->tx_chan[i].weight;
-		g_log_chan[temp].current_desc = 0;
-		g_log_chan[temp].desc_ofst = DEFAULT_OFFSET;
-		g_log_chan[temp].desc_len = dma_dev->tx_chan[i].desc_num;
-		g_log_chan[temp].offset_from_base = temp * DEFAULT_OFFSET;
-		g_log_chan[temp].packet_size = dma_dev->tx_chan[i].packet_size;
-
-		AMAZON_DMA_REG32(AMAZON_DMA_CH0_DES_LEN + temp * AMAZON_DMA_CH_STEP) = dma_dev->tx_chan[i].desc_num;
-		// enable interrupt mask
-#ifdef NO_TX_INT
-		AMAZON_DMA_REG32(AMAZON_DMA_CH0_MSK + temp * AMAZON_DMA_CH_STEP) = 0x3e;
-#else
-		AMAZON_DMA_REG32(AMAZON_DMA_CH0_MSK + temp * AMAZON_DMA_CH_STEP) = 0x36;
-#endif
-
-		strcpy(g_log_chan[temp].device_name, dma_dev->device_name);
-		g_log_chan[temp].burst_len = dma_dev->tx_burst_len;
-		g_log_chan[temp].control = dma_dev->tx_chan[i].control;
-
-		if (dma_dev->buffer_alloc)
-			g_log_chan[temp].buffer_alloc = dma_dev->buffer_alloc;
-		else
-			g_log_chan[temp].buffer_alloc = common_buffer_alloc;
-
-		if (dma_dev->buffer_free)
-			g_log_chan[temp].buffer_free = dma_dev->buffer_free;
-		else
-			g_log_chan[temp].buffer_free = common_buffer_free;
-
-		if (dma_dev->intr_handler)
-			g_log_chan[temp].intr_handler = dma_dev->intr_handler;
-		else
-			g_log_chan[temp].intr_handler = NULL;
-
-		for (j = 0; j < g_log_chan[temp].desc_len; j++) {
-
-			tx_desc_p =
-				(struct tx_desc *) (g_desc_list +
-									g_log_chan[temp].offset_from_base + j);
-			tx_desc_p->status.word = 0;
-			tx_desc_p->status.field.data_length =
-				g_log_chan[temp].packet_size;
-			tx_desc_p->status.field.OWN = CPU_OWN;
-
-		}
-		/* workaround DMA pitfall, we never turn on channel if we don't
-		   have proper descriptors */
-		if (!g_log_chan[temp].control) {
-			close_channel(temp);
-		}
-
-	}
-
-	return 0;
-}
-
-int dma_device_register(struct dma_device_info *dma_dev)
-{
-	dev_list *temp_dev;
-	temp_dev = (dev_list *) kmalloc(sizeof(dev_list), GFP_KERNEL);
-	temp_dev->dev = dma_dev;
-	temp_dev->weight = dma_dev->weight;
-	insert_dev_list(temp_dev);
-	/* check whether this is a known device */
-	if ((strcmp(dma_dev->device_name, "switch1") == 0)
-		|| (strcmp(dma_dev->device_name, "TPE") == 0)
-		|| (strcmp(dma_dev->device_name, "switch2") == 0)
-		|| (strcmp(dma_dev->device_name, "DPlus") == 0)) {
-		register_dev(dma_dev);
-	}
-
-	return 0;
-}
-
-
-int unregister_dev(struct dma_device_info *dma_dev)
-{
-	int i, j, temp;
-	u8 *buffer;
-	struct rx_desc *rx_desc_p;
-
-	for (i = 0; i < dma_dev->num_rx_chan; i++) {
-		temp = dma_dev->logic_rx_chan_base + i;
-		close_channel(temp);
-		for (j = 0; j < g_log_chan[temp].desc_len; j++) {
-			rx_desc_p =
-				(struct rx_desc *) (g_desc_list +
-									g_log_chan[temp].offset_from_base + j);
-			buffer = (u8 *) __va(rx_desc_p->Data_Pointer);
-			g_log_chan[temp].buffer_free(buffer, g_log_chan[temp].opt[j]);
-		}
-	}
-	for (i = 0; i < dma_dev->num_tx_chan; i++) {
-		temp = dma_dev->logic_tx_chan_base + i;
-		close_channel(temp);
-	}
-	return 0;
-}
-
-int dma_device_unregister(struct dma_device_info *dev)
-{
-	dev_list *temp_dev;
-	for (temp_dev = g_head_dev; temp_dev; temp_dev = temp_dev->next) {
-		if (strcmp(dev->device_name, temp_dev->dev->device_name) == 0) {
-			if ((strcmp(dev->device_name, "switch1") == 0)
-				|| (strcmp(dev->device_name, "TPE") == 0)
-				|| (strcmp(dev->device_name, "switch2") == 0)
-				|| (strcmp(dev->device_name, "DPlus") == 0))
-				unregister_dev(dev);
-			if (temp_dev == g_head_dev) {
-				g_head_dev = temp_dev->next;
-				kfree(temp_dev);
-			} else {
-				if (temp_dev == g_tail_dev)
-					g_tail_dev = temp_dev->prev;
-				if (temp_dev->prev)
-					temp_dev->prev->next = temp_dev->next;
-				if (temp_dev->next)
-					temp_dev->next->prev = temp_dev->prev;
-				kfree(temp_dev);
-			}
-			break;
-		}
-
-	}
-	return 0;
-}
-
-void dma_device_update_rx(struct dma_device_info *dma_dev)
-{
-	int i, temp;
-	for (i = 0; i < dma_dev->num_rx_chan; i++) {
-		temp = dma_dev->logic_rx_chan_base + i;
-		g_log_chan[temp].control = dma_dev->rx_chan[i].control;
-
-		if (g_log_chan[temp].control)
-			open_channel(temp);
-		else
-			close_channel(temp);
-	}
-
-}
-
-void dma_device_update_tx(struct dma_device_info *dma_dev)
-{
-	int i, temp;
-	for (i = 0; i < dma_dev->num_tx_chan; i++) {
-		temp = dma_dev->logic_tx_chan_base + i;
-		g_log_chan[temp].control = dma_dev->tx_chan[i].control;
-		if (g_log_chan[temp].control) {
-			/* we turn on channel when send out the very first packet */
-			// open_channel(temp);
-		} else
-			close_channel(temp);
-	}
-}
-
-int dma_device_update(struct dma_device_info *dma_dev)
-{
-	dma_device_update_rx(dma_dev);
-	dma_device_update_tx(dma_dev);
-	return 0;
-}
-
-static int dma_open(struct inode *inode, struct file *file)
-{
-	return 0;
-}
-
-static int dma_release(struct inode *inode, struct file *file)
-{
-	/* release the resources */
-	return 0;
-}
-
-static int dma_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
-{
-	int value = 0;
-	int result = 0;
-	int chan_no = 0;
-
-	switch (cmd) {
-	case 0:					/* get register value */
-		break;
-	case 1:					/* return channel weight */
-		chan_no = *((int *) arg);
-		*((int *) arg + 1) = g_log_chan[chan_no].default_weight;
-		break;
-	case 2:					/* set channel weight */
-		chan_no = *((int *) arg);
-		value = *((int *) arg + 1);
-		printk("new weight=%08x\n", value);
-		g_log_chan[chan_no].default_weight = value;
-		break;
-	default:
-		break;
-	}
-	return result;
-}
-
-
-static struct file_operations dma_fops = {
-  owner:THIS_MODULE,
-  open:dma_open,
-  release:dma_release,
-  ioctl:dma_ioctl,
-};
-
-static int dma_init(void)
-{
-	int result = 0;
-	int i;
-	printk("initialising dma core\n");
-	result = register_chrdev(DMA_MAJOR, "dma-core", &dma_fops);
-	if (result) {
-		AMAZON_DMA_EMSG("cannot register device dma-core!\n");
-		return result;
-	}
-	result = request_irq(AMAZON_DMA_INT, dma_interrupt, IRQF_DISABLED, "dma-core", (void *) &dma_interrupt);
-	if (result) {
-		AMAZON_DMA_EMSG("error, cannot get dma_irq!\n");
-		free_irq(AMAZON_DMA_INT, (void *) &dma_interrupt);
-		return -EFAULT;
-	}
-
-	g_desc_list = (u64 *) KSEG1ADDR(__get_free_page(GFP_DMA));
-
-	if (g_desc_list == NULL) {
-		AMAZON_DMA_EMSG("no memory for desriptor\n");
-		return -ENOMEM;
-	}
-	memset(g_desc_list, 0, PAGE_SIZE);
-	AMAZON_DMA_REG32(AMAZON_DMA_Desc_BA) = (u32) CPHYSADDR((u32) g_desc_list);
-	g_amazon_dma_dir = proc_mkdir("amazon_dma", NULL);
-	create_proc_read_entry("dma_register", 0, g_amazon_dma_dir, dma_register_proc_read, NULL);
-	create_proc_read_entry("g_desc_list", 0, g_amazon_dma_dir, desc_list_proc_read, NULL);
-	create_proc_read_entry("channel_weight", 0, g_amazon_dma_dir, channel_weight_proc_read, NULL);
-
-	dma_chip_init();
-	for (i = 0; i < (RX_CHAN_NUM + 1); i++) {
-		rx_chan_list[i] = -1;
-	}
-	for (i = 0; i < (TX_CHAN_NUM + 1); i++) {
-		tx_chan_list[i] = -1;
-	}
-
-	for (i = 0; i < CHAN_TOTAL_NUM; i++) {
-		comb_isr_mask[i] = 0x80000000 >> (i);
-	}
-
-	g_log_chan[CHAN_TOTAL_NUM].weight = 0;
-	printk("initialising dma core ... done\n");
-
-	return 0;
-}
-
-arch_initcall(dma_init);
-
-
-void dma_cleanup(void)
-{
-	dev_list *temp_dev;
-
-	unregister_chrdev(DMA_MAJOR, "dma-core");
-	for (temp_dev = g_head_dev; temp_dev; temp_dev = temp_dev->next) {
-		kfree(temp_dev);
-	}
-	free_page(KSEG0ADDR((unsigned long) g_desc_list));
-	remove_proc_entry("channel_weight", g_amazon_dma_dir);
-	remove_proc_entry("dma_list", g_amazon_dma_dir);
-	remove_proc_entry("dma_register", g_amazon_dma_dir);
-	remove_proc_entry("amazon_dma", NULL);
-	/* release the resources */
-	free_irq(AMAZON_DMA_INT, (void *) &dma_interrupt);
-}
-
-EXPORT_SYMBOL(dma_device_register);
-EXPORT_SYMBOL(dma_device_unregister);
-EXPORT_SYMBOL(dma_device_read);
-EXPORT_SYMBOL(dma_device_write);
-EXPORT_SYMBOL(dma_device_update);
-EXPORT_SYMBOL(dma_device_update_rx);
-
-MODULE_LICENSE("GPL");
diff --git a/target/linux/amazon/files/arch/mips/amazon/dma-core.h b/target/linux/amazon/files/arch/mips/amazon/dma-core.h
deleted file mode 100644
index cb3d456c9..000000000
--- a/target/linux/amazon/files/arch/mips/amazon/dma-core.h
+++ /dev/null
@@ -1,69 +0,0 @@
-#ifndef DMA_CORE_H 
-#define DMA_CORE_H 
-
-#define AMAZON_DMA_REG32(reg_num)  *((volatile u32*)(reg_num))
-#define AMAZON_DMA_CH_STEP            4
-
-#define COMB_ISR_RX_MASK 0xfe000000
-#define COMB_ISR_TX_MASK 0x01f00000
-
-
-#define DMA_OWN   1
-#define CPU_OWN   0   
-#define DMA_MAJOR 250
-
-//Descriptors
-#define DMA_DESC_OWN_CPU		0x0
-#define DMA_DESC_OWN_DMA		0x80000000
-#define DMA_DESC_CPT_SET		0x40000000
-#define DMA_DESC_SOP_SET		0x20000000
-#define DMA_DESC_EOP_SET		0x10000000
-
-#define switch_rx_chan_base 0
-#define switch_tx_chan_base 7
-#define switch2_rx_chan_base 2
-#define switch2_tx_chan_base 8
-#define TPE_rx_chan_base    4
-#define TPE_tx_chan_base    9
-#define DPLus2FPI_rx_chan_base  6
-#define DPLus2FPI_tx_chan_base  11 
-
-#define RX_CHAN_NUM 7
-#define TX_CHAN_NUM 5
-#define CHAN_TOTAL_NUM       (RX_CHAN_NUM+TX_CHAN_NUM)
-#define DEFAULT_OFFSET 20
-#define DESCRIPTOR_SIZE 8
-
-typedef struct dev_list{
-   struct dma_device_info* dev;
-   int weight;
-   struct dev_list* prev;
-   struct dev_list* next;
-}dev_list; 
-
-typedef struct channel_info{
-   char device_name[16];
-   int occupied;
-   enum attr_t attr;  
-   int current_desc;
-   int weight;
-   int default_weight;
-   int desc_num;
-   int burst_len;
-   int desc_len;
-   int desc_ofst;
-   int packet_size;
-   int offset_from_base;
-   int control;
-   void* opt[DEFAULT_OFFSET];
-   u8* (*buffer_alloc)(int len,int* offset, void** opt);
-   int (*buffer_free)(u8* dataptr,void* opt);
-   int (*intr_handler)(struct dma_device_info* info,int status);
-
-   struct dma_device_info* dma_dev;
-}channel_info;
-
-
-
-#endif
-
diff --git a/target/linux/amazon/files/arch/mips/amazon/interrupt.c b/target/linux/amazon/files/arch/mips/amazon/interrupt.c
deleted file mode 100644
index e264ca759..000000000
--- a/target/linux/amazon/files/arch/mips/amazon/interrupt.c
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- *  Gary Jennejohn (C) 2003 <gj@denx.de>
- *  Copyright (C) 2007 Felix Fietkau <nbd@openwrt.org>
- *  Copyright (C) 2007 John Crispin <blogic@openwrt.org>
- *
- *  This program is free software; you can distribute it and/or modify it
- *  under the terms of the GNU General Public License (Version 2) as
- *  published by the Free Software Foundation.
- *
- *  This program is distributed in the hope it will be useful, but WITHOUT
- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- *  for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Routines for generic manipulation of the interrupts found on the 
- * AMAZON boards.
- */
-
-#include <linux/init.h>
-#include <linux/sched.h>
-#include <linux/slab.h>
-#include <linux/interrupt.h>
-#include <linux/kernel_stat.h>
-#include <linux/module.h>
-
-#include <asm/amazon/amazon.h>
-#include <asm/amazon/irq.h>
-#include <asm/bootinfo.h>
-#include <asm/irq_cpu.h>
-#include <asm/irq.h>
-#include <asm/time.h>
-
-static void amazon_disable_irq(unsigned int irq_nr)
-{
-	int i;
-	u32 amazon_ier = AMAZON_ICU_IM0_IER;
-
-	if (irq_nr <= INT_NUM_IM0_IRL11 && irq_nr >= INT_NUM_IM0_IRL0)
-		amazon_writel(amazon_readl(amazon_ier) & (~(AMAZON_DMA_H_MASK)), amazon_ier);
-	else {
-		irq_nr -= INT_NUM_IRQ0;
-		for (i = 0; i <= 4; i++)
-		{
-			if (irq_nr <= 31) 
-	        	amazon_writel(amazon_readl(amazon_ier) & ~(1 << irq_nr ), amazon_ier);
-			amazon_ier += 0x10;
-			irq_nr -= 32;
-		}
-	}	
-}
-
-static void amazon_mask_and_ack_irq(unsigned int irq_nr)
-{
-	int i;
-	u32 amazon_ier = AMAZON_ICU_IM0_IER;
-	u32 amazon_isr = AMAZON_ICU_IM0_ISR;
-
-	if (irq_nr <= INT_NUM_IM0_IRL11 && irq_nr >= INT_NUM_IM0_IRL0){
-		amazon_writel(amazon_readl(amazon_ier) & (~(AMAZON_DMA_H_MASK)), amazon_ier);
-		amazon_writel(AMAZON_DMA_H_MASK, amazon_isr); 
-	} else {
-		irq_nr -= INT_NUM_IRQ0;
-		for (i = 0; i <= 4; i++)
-		{
-			if (irq_nr <= 31){ 
-	        	amazon_writel(amazon_readl(amazon_ier) & ~(1 << irq_nr ), amazon_ier);
-				amazon_writel((1 << irq_nr ), amazon_isr);
-			}
-			amazon_ier += 0x10;
-			amazon_isr += 0x10;
-			irq_nr -= 32;
-		}
-	}
-}
-
-static void amazon_enable_irq(unsigned int irq_nr)
-{
-	int i;
-	u32 amazon_ier = AMAZON_ICU_IM0_IER;
-
-	if (irq_nr <= INT_NUM_IM0_IRL11 && irq_nr >= INT_NUM_IM0_IRL0)
-		amazon_writel(amazon_readl(amazon_ier) | AMAZON_DMA_H_MASK, amazon_ier);
-	else {
-		irq_nr -= INT_NUM_IRQ0;
-		for (i = 0; i <= 4; i++)
-		{
-			if (irq_nr <= 31)
-				amazon_writel(amazon_readl(amazon_ier) | (1 << irq_nr ), amazon_ier);
-			amazon_ier += 0x10;
-			irq_nr -= 32;
-		}
-	}
-}
-
-static unsigned int amazon_startup_irq(unsigned int irq)
-{
-	amazon_enable_irq(irq);
-	return 0;
-}
-
-static void amazon_end_irq(unsigned int irq)
-{
-	if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS))) {
-		amazon_enable_irq(irq);
-	}
-}
-
-static struct irq_chip amazon_irq_type = {
-	.name = "AMAZON",
-	.startup = amazon_startup_irq,
-	.enable = amazon_enable_irq,
-	.disable = amazon_disable_irq,
-	.unmask = amazon_enable_irq,
-	.ack = amazon_mask_and_ack_irq,
-	.mask = amazon_disable_irq,
-	.mask_ack = amazon_mask_and_ack_irq,
-	.end = amazon_end_irq
-};
-
-/* Cascaded interrupts from IM0-4 */
-static inline void amazon_hw_irqdispatch(u8 line)
-{
-	u32 irq;
-
-	irq = (amazon_readl(AMAZON_ICU_IM_VEC) >> (line * 5)) & AMAZON_ICU_IM0_VEC_MASK;
-	if (line == 0 && irq <= 11 && irq >= 0) {
-		//DMA fixed to IM0_IRL0
-		irq = 0;
-	}
-	do_IRQ(irq + INT_NUM_IRQ0 + (line * 32));
-}
-
-asmlinkage void plat_irq_dispatch(void)
-{
-	unsigned int pending = read_c0_status() & read_c0_cause() & ST0_IM;
-	if (pending & CAUSEF_IP7){
-		do_IRQ(MIPS_CPU_TIMER_IRQ);
-		goto out;
-	} else {
-		unsigned int i;
-		for (i = 0; i <= 4; i++)
-		{
-			if(pending & (CAUSEF_IP2 << i)){
-				amazon_hw_irqdispatch(i);
-				goto out;
-			}
-		}
-	}
-	printk("Spurious IRQ: CAUSE=0x%08x\n", read_c0_status());
-out:
-	return;
-}
-
-static struct irqaction cascade = {
-	.handler	= no_action,
-	.flags  	= IRQF_DISABLED,
-	.name   	= "cascade",
-};
-
-void __init arch_init_irq(void)
-{
-	int i;
-
-	/* mask all interrupt sources */
-	for(i = 0; i <= 4; i++){
-		amazon_writel(0, AMAZON_ICU_IM0_IER + (i * 0x10));
-	}
-
-	mips_cpu_irq_init();
-
-	/* set up irq cascade */
-	for (i = 2; i <= 6; i++) {
-		setup_irq(i, &cascade);
-	}
-
-	for (i = INT_NUM_IRQ0; i <= INT_NUM_IM4_IRL31; i++)
-		set_irq_chip_and_handler(i, &amazon_irq_type,
-			handle_level_irq);
-
-	set_c0_status(IE_IRQ0 | IE_IRQ1 | IE_IRQ2 | IE_IRQ3 | IE_IRQ4 | IE_IRQ5);
-}
-
-void __cpuinit arch_fixup_c0_irqs(void)
-{
-	/* FIXME: check for CPUID and only do fix for specific chips/versions */
-	cp0_compare_irq = CP0_LEGACY_COMPARE_IRQ;
-	cp0_perfcount_irq = CP0_LEGACY_PERFCNT_IRQ;
-}
diff --git a/target/linux/amazon/files/arch/mips/amazon/pci.c b/target/linux/amazon/files/arch/mips/amazon/pci.c
deleted file mode 100644
index 1b2afb9d4..000000000
--- a/target/linux/amazon/files/arch/mips/amazon/pci.c
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- *  Carsten Langgaard, carstenl@mips.com
- *  Copyright (C) 1999, 2000 MIPS Technologies, Inc.  All rights reserved.
- *  Copyright (C) 2007 Felix Fietkau <nbd@openwrt.org>
- *
- *  This program is free software; you can distribute it and/or modify it
- *  under the terms of the GNU General Public License (Version 2) as
- *  published by the Free Software Foundation.
- *
- *  This program is distributed in the hope it will be useful, but WITHOUT
- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- *  for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
- */
-
-/* FIXME: convert nasty volatile register derefs to readl/writel calls */
-
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <asm/io.h>
-#include <asm/paccess.h>
-#include <asm/amazon/irq.h>
-#include <asm/amazon/amazon.h>
-
-#define AMAZON_PCI_REG32( addr )		  (*(volatile u32 *)(addr))
-#ifndef AMAZON_PCI_MEM_BASE
-#define AMAZON_PCI_MEM_BASE    0xb2000000
-#endif
-#define AMAZON_PCI_MEM_SIZE    0x00400000
-#define AMAZON_PCI_IO_BASE     0xb2400000
-#define AMAZON_PCI_IO_SIZE     0x00200000
-
-#define AMAZON_PCI_CFG_BUSNUM_SHF 16
-#define AMAZON_PCI_CFG_DEVNUM_SHF 11
-#define AMAZON_PCI_CFG_FUNNUM_SHF 8
-
-#define PCI_ACCESS_READ  0
-#define PCI_ACCESS_WRITE 1
-
-static struct resource pci_io_resource = {
-	.name = "io pci IO space",
-#if 1
-	.start = AMAZON_PCI_IO_BASE,
-	.end = AMAZON_PCI_IO_BASE + AMAZON_PCI_IO_SIZE - 1,
-#else
-	.start = 0,
-	.end = 0x00002000 - 1,
-#endif
-	.flags = IORESOURCE_IO
-};
-
-static struct resource pci_mem_resource = {
-	.name = "ext pci memory space",
-	.start = AMAZON_PCI_MEM_BASE,
-	.end = AMAZON_PCI_MEM_BASE + AMAZON_PCI_MEM_SIZE - 1,
-	.flags = IORESOURCE_MEM
-};
-
-static int amazon_pci_config_access(unsigned char access_type,
-	struct pci_bus *bus, unsigned int devfn, unsigned int where, u32 *data)
-{
-	unsigned long flags;
-	u32 pci_addr;
-	u32 val;
-	int ret;
-
-	/* Amazon support slot from 0 to 15 */
-	/* devfn 0 & 0x20 is itself */
-	if ((bus->number != 0) || (devfn > 0x7f) || (devfn == 0) || (devfn == 0x20))
-		return 1;
-
-	local_irq_save(flags);
-
-	pci_addr = AMAZON_PCI_CFG_BASE |
-		bus->number << AMAZON_PCI_CFG_BUSNUM_SHF |
-		devfn << AMAZON_PCI_CFG_FUNNUM_SHF |
-		(where & ~0x3);
-
-	if (access_type == PCI_ACCESS_WRITE)
-	{
-#ifdef CONFIG_SWAP_IO_SPACE
-		val = swab32(*data);
-#endif
-		ret = put_dbe(val, (u32 *)pci_addr);
-	} else {
-		ret = get_dbe(val, (u32 *)pci_addr);
-#ifdef CONFIG_SWAP_IO_SPACE
-		*data = swab32(val);
-#else
-		*data = val;
-#endif
-	}
-
-	amazon_writel(amazon_readl(PCI_MODE) & (~(1<<PCI_MODE_cfgok_bit)), PCI_MODE);
-	amazon_writel(amazon_readl(STATUS_COMMAND_ADDR), STATUS_COMMAND_ADDR);
-	amazon_writel(amazon_readl(PCI_MODE) | (~(1<<PCI_MODE_cfgok_bit)), PCI_MODE);
-	mb();
-	local_irq_restore(flags);
-
-	if (((*data) == 0xffffffff) && (access_type == PCI_ACCESS_READ))
-		return 1;
-
-	return ret; 
-}
-
-
-static int amazon_pci_read(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 *val)
-{
-	u32 data = 0;
-
-	if (amazon_pci_config_access(PCI_ACCESS_READ, bus, devfn, where, &data))
-		return PCIBIOS_DEVICE_NOT_FOUND;
-
-	if (size == 1)
-		*val = (data >> ((where & 3) << 3)) & 0xff;
-	else if (size == 2)
-		*val = (data >> ((where & 3) << 3)) & 0xffff;
-	else
-		*val = data;
-
-	return PCIBIOS_SUCCESSFUL;
-}
-
-
-static int amazon_pci_write(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 val)
-{
-	u32 data = 0;
-
-	if (size == 4)
-	{
-		data = val;
-	} else {
-		if (amazon_pci_config_access(PCI_ACCESS_READ, bus, devfn, where, &data))
-			return PCIBIOS_DEVICE_NOT_FOUND;
-
-		if (size == 1)
-			data = (data & ~(0xff << ((where & 3) << 3))) |
-				(val << ((where & 3) << 3));
-		else if (size == 2)
-			data = (data & ~(0xffff << ((where & 3) << 3))) |
-				(val << ((where & 3) << 3));
-	}
-
-	if (amazon_pci_config_access(PCI_ACCESS_WRITE, bus, devfn, where, &data))
-		return PCIBIOS_DEVICE_NOT_FOUND;
-
-	return PCIBIOS_SUCCESSFUL;
-}
-
-static struct pci_ops amazon_pci_ops = {
-	amazon_pci_read,
-	amazon_pci_write
-};
-
-static struct pci_controller amazon_pci_controller = {
-	.pci_ops = &amazon_pci_ops,
-	.mem_resource = &pci_mem_resource,
-	.mem_offset	= 0x00000000UL,
-	.io_resource = &pci_io_resource,
-	.io_offset	= 0x00000000UL,
-};
-
-int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
-{
-	switch (slot) {
-		case 13:
-			/* IDSEL = AD29 --> USB Host Controller */
-			return INT_NUM_IM2_IRL15;
-		case 14:
-			/* IDSEL = AD30 --> mini PCI connector */
-			return INT_NUM_IM2_IRL14;
-		default:
-			printk("Warning: no IRQ found for PCI device in slot %d, pin %d\n", slot, pin);
-			return 0;
-	}
-}
-
-int pcibios_plat_dev_init(struct pci_dev *dev)
-{
-	switch(dev->irq) {
-		case INT_NUM_IM2_IRL15:
-			/* 
-			 * IDSEL = AD29 --> USB Host Controller
-			 * PCI_INTA/B/C--GPIO Port0.2--EXIN3
-			 * IN/ALT0:1 ALT1:0
-			 * PULL UP
-			 */
-			(*AMAZON_GPIO_P0_DIR) = (*AMAZON_GPIO_P0_DIR) & 0xfffffffb;
-			(*AMAZON_GPIO_P0_ALTSEL0) = (*AMAZON_GPIO_P0_ALTSEL0)| 4;
-			(*AMAZON_GPIO_P0_ALTSEL1) = (*AMAZON_GPIO_P0_ALTSEL1)& 0xfffffffb;
-			(*AMAZON_GPIO_P0_PUDSEL) =  (*AMAZON_GPIO_P0_PUDSEL) | 4;
-			(*AMAZON_GPIO_P0_PUDEN) = (*AMAZON_GPIO_P0_PUDEN) | 4;
-			//External Interrupt Node
-			(*AMAZON_ICU_EXTINTCR) = (*AMAZON_ICU_EXTINTCR)|0x6000; /* Low Level triggered */
-			(*AMAZON_ICU_IRNEN) = (*AMAZON_ICU_IRNEN)|0x8;
-			pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
-			break;
-		case INT_NUM_IM2_IRL14:
-			/* 
-			 * IDSEL = AD30 --> mini PCI connector 
-			 * PCI_INTA--GPIO Port0.1--EXIN2
-			 * IN/ALT0:1 ALT1:0
-			 * PULL UP
-			 */
-			(*AMAZON_GPIO_P0_DIR) = (*AMAZON_GPIO_P0_DIR) & 0xfffffffd;
-			(*AMAZON_GPIO_P0_ALTSEL0) = (*AMAZON_GPIO_P0_ALTSEL0)| 2;
-			(*AMAZON_GPIO_P0_ALTSEL1) = (*AMAZON_GPIO_P0_ALTSEL1)& 0xfffffffd;
-			(*AMAZON_GPIO_P0_PUDSEL) =  (*AMAZON_GPIO_P0_PUDSEL) | 2;
-			(*AMAZON_GPIO_P0_PUDEN) = (*AMAZON_GPIO_P0_PUDEN) | 2;
-			//External Interrupt Node
-			(*AMAZON_ICU_EXTINTCR) = (*AMAZON_ICU_EXTINTCR)|0x600;
-			(*AMAZON_ICU_IRNEN) = (*AMAZON_ICU_IRNEN)|0x4;
-			pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
-			break;
-		default:
-			return 1;
-	}
-	return 0;
-}
-
-int __init amazon_pci_init(void)
-{
-	u32 temp_buffer;
-
-#ifdef CONFIG_SWAP_IO_SPACE
-	AMAZON_PCI_REG32(IRM) = AMAZON_PCI_REG32(IRM) | (1<<27) | (1<<28);
-	wmb();
-#endif
-
-	AMAZON_PCI_REG32(CLOCK_CONTROL) = AMAZON_PCI_REG32(CLOCK_CONTROL) | (1<<ARB_CTRL_bit);
-	amazon_writel(amazon_readl(PCI_MODE) & (~(1<<PCI_MODE_cfgok_bit)), PCI_MODE);
-
-	AMAZON_PCI_REG32(STATUS_COMMAND_ADDR) = AMAZON_PCI_REG32(STATUS_COMMAND_ADDR) | (1<<BUS_MASTER_ENABLE_BIT) |(1<<MEM_SPACE_ENABLE_BIT);
-
-	temp_buffer = AMAZON_PCI_REG32(PCI_ARB_CTRL_STATUS_ADDR);
-	temp_buffer = temp_buffer | (1<< INTERNAL_ARB_ENABLE_BIT);
-	temp_buffer = temp_buffer & ~(3<< PCI_MASTER0_REQ_MASK_2BITS);
-	temp_buffer = temp_buffer & ~(3<< PCI_MASTER0_GNT_MASK_2BITS);
-
-	/* flash */
-	temp_buffer = temp_buffer & ~(3<< PCI_MASTER1_REQ_MASK_2BITS);
-	temp_buffer = temp_buffer & ~(3<< PCI_MASTER1_GNT_MASK_2BITS);
-
-	/* external master */
-	temp_buffer = temp_buffer & ~(3<< PCI_MASTER2_REQ_MASK_2BITS);
-	temp_buffer = temp_buffer & ~(3<< PCI_MASTER2_GNT_MASK_2BITS);
-
-	AMAZON_PCI_REG32(PCI_ARB_CTRL_STATUS_ADDR) = temp_buffer;
-	wmb();
-
-	AMAZON_PCI_REG32(FPI_ADDRESS_MAP_0) = 0xb2000000;
-	AMAZON_PCI_REG32(FPI_ADDRESS_MAP_1) = 0xb2100000;
-	AMAZON_PCI_REG32(FPI_ADDRESS_MAP_2) = 0xb2200000;
-	AMAZON_PCI_REG32(FPI_ADDRESS_MAP_3) = 0xb2300000;
-	AMAZON_PCI_REG32(FPI_ADDRESS_MAP_4) = 0xb2400000;
-	AMAZON_PCI_REG32(FPI_ADDRESS_MAP_5) = 0xb2500000;
-	AMAZON_PCI_REG32(FPI_ADDRESS_MAP_6) = 0xb2600000;
-	AMAZON_PCI_REG32(FPI_ADDRESS_MAP_7) = 0xb2700000;
-
-	AMAZON_PCI_REG32(BAR11_MASK) = 0x0c000008;
-	AMAZON_PCI_REG32(PCI_ADDRESS_MAP_11) = 0x0;
-	AMAZON_PCI_REG32(BAR1_ADDR) = 0x0;
-	amazon_writel(amazon_readl(PCI_MODE) | (~(1<<PCI_MODE_cfgok_bit)), PCI_MODE);
-	//use 8 dw burse length
-	AMAZON_PCI_REG32(FPI_BURST_LENGTH) = 0x303;
-
-	amazon_pci_controller.io_map_base = (unsigned long)ioremap(AMAZON_PCI_IO_BASE, AMAZON_PCI_IO_SIZE - 1);
-	register_pci_controller(&amazon_pci_controller);
-	return 0;
-}
-arch_initcall(amazon_pci_init);
diff --git a/target/linux/amazon/files/arch/mips/amazon/prom.c b/target/linux/amazon/files/arch/mips/amazon/prom.c
deleted file mode 100644
index 3095fd50b..000000000
--- a/target/linux/amazon/files/arch/mips/amazon/prom.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *   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.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- *
- *   Copyright 2007 John Crispin <blogic@openwrt.org> 
- */
-
-#include <linux/init.h>
-#include <linux/string.h>
-#include <linux/ctype.h>
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/bootmem.h>
-#include <linux/ioport.h>
-#include <asm/bootinfo.h>
-#include <asm/amazon/amazon.h>
-#include <asm/amazon/irq.h>
-#include <asm/amazon/model.h>
-#include <asm/cpu.h>
-
-void prom_putchar(char c)
-{
-	/* Wait for FIFO to empty */
-	while ((amazon_readl(AMAZON_ASC_FSTAT) >> 8) != 0x00) ;
-	/* Crude cr/nl handling is better than none */
-	if(c == '\n')
-		amazon_writel('\r', AMAZON_ASC_TBUF);
-	amazon_writel(c, AMAZON_ASC_TBUF);
-}
-
-void __init prom_init(void)
-{
-	char **envp = (char **) fw_arg2;
-
-	int memsize = 16; /* assume 16M as default */
-
-	envp = (char **)KSEG1ADDR((unsigned long)envp);
-	while (*envp) {
-		char *e = (char *)KSEG1ADDR(*envp);
-
-		if (!strncmp(e, "memsize=", 8)) {
-			e += 8;
-			memsize = simple_strtoul(e, NULL, 10);
-		}
-		envp++;
-	}
-	memsize *= 1024 * 1024;
-
-	strcpy(&(arcs_cmdline[0]), "console=ttyS0,115200 rootfstype=squashfs,jffs2");
-	
-	add_memory_region(0x00000000, memsize, BOOT_MEM_RAM);
-}
-
-void prom_free_prom_memory(void)
-{
-}
-
-const char *get_system_type(void)
-{
-	return BOARD_SYSTEM_TYPE;
-}
diff --git a/target/linux/amazon/files/arch/mips/amazon/setup.c b/target/linux/amazon/files/arch/mips/amazon/setup.c
deleted file mode 100644
index ff1a109d4..000000000
--- a/target/linux/amazon/files/arch/mips/amazon/setup.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- *	 Copyright (C) 2004 Peng Liu <peng.liu@infineon.com>
- *	 Copyright (C) 2007 John Crispin <blogic@openwrt.org>
- *	 Copyright (C) 2007 Felix Fietkau <nbd@openwrt.org>
- *	 
- *   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.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- *
- */
-
-#include <linux/init.h>
-#include <linux/sched.h>
-#include <linux/module.h>
-#include <linux/interrupt.h>
-#include <linux/delay.h>
-
-#include <asm/reboot.h>
-#include <asm/system.h>
-#include <asm/time.h>
-#include <asm/cpu.h>
-#include <asm/bootinfo.h>
-#include <asm/irq.h>
-#include <asm/mipsregs.h>
-#include <asm/amazon/amazon.h>
-#include <asm/amazon/irq.h>
-#include <asm/amazon/model.h>
-
-static unsigned int r4k_offset;
-static unsigned int r4k_cur;
-
-/* required in arch/mips/kernel/kspd.c */
-unsigned long cpu_khz;
-
-static void amazon_reboot_setup(void);
-
-/* the CPU clock rate - lifted from u-boot */
-unsigned int amazon_get_cpu_hz(void)
-{
-	/*-----------------------------------*/
-	/**CGU CPU Clock Reduction Register***/ 
-	/*-----------------------------------*/
-	switch(amazon_readl(AMAZON_CGU_CPUCRD) & 0x3){
-		case 0:
-			/*divider ration 1/1, 235 MHz clock */
-			return 235000000;
-		case 1:
-			/*divider ration 2/3, 235 MHz clock, clock not accurate, here */
-			return 150000000;
-		case 2:
-			/*divider ration 1/2, 235 MHz clock */
-			return 117500000;
-		default:
-			/*divider ration 1/4, 235 MHz clock */
-			return 58750000;
-	}
-}
-
-/* the FPI clock rate - lifted from u-boot */
-unsigned int amazon_get_fpi_hz(void)
-{
-	unsigned int  clkCPU;
-	clkCPU = amazon_get_cpu_hz();
-
-	/*-------------------------------------*/
-	/***CGU Clock Divider Select Register***/
-	/*-------------------------------------*/
-	switch (amazon_readl(AMAZON_CGU_DIV) & 0x3)
-	{
-		case 1:
-			return clkCPU >> 1;
-		case 2:
-			return clkCPU >> 2;
-		default:
-			return clkCPU;
-		/* '11' is reserved */
-	}
-}
-EXPORT_SYMBOL(amazon_get_fpi_hz);
-
-/* this doesn't really belong here, but it's a convenient location */
-unsigned int amazon_get_cpu_ver(void)
-{
-	static unsigned int cpu_ver = 0;
-	if (cpu_ver == 0)
-		cpu_ver = amazon_readl(AMAZON_MCD_CHIPID) & 0xFFFFF000;
-	return cpu_ver;
-}
-
-static inline u32 amazon_get_counter_resolution(void)
-{
-	u32 res;
-	__asm__ __volatile__(
-		".set   push\n"
-		".set   mips32r2\n"
-		".set   noreorder\n"
-		"rdhwr  %0, $3\n"
-		"ehb\n"
-		".set pop\n"
-		: "=&r" (res)
-		: /* no input */
-		: "memory");
-	instruction_hazard();
-	return res;
-}
-
-void __init plat_time_init(void)
-{
-	mips_hpt_frequency = amazon_get_cpu_hz() / amazon_get_counter_resolution();
-	r4k_offset = mips_hpt_frequency / HZ;
-	printk("mips_hpt_frequency:%d\n", mips_hpt_frequency);
-	printk("r4k_offset: %08x(%d)\n", r4k_offset, r4k_offset);
-
-	r4k_cur = (read_c0_count() + r4k_offset);
-	write_c0_compare(r4k_cur);
-
-	/* enable the timer in the PMU */
-	amazon_writel(amazon_readl(AMAZON_PMU_PWDCR)| AMAZON_PMU_PWDCR_GPT|AMAZON_PMU_PWDCR_FPI, AMAZON_PMU_PWDCR);
-	
-	/* setup the GPTU for timer tick  f_fpi == f_gptu*/
-	amazon_writel(0x0100, AMAZON_GPTU_CLC);
-	amazon_writel(0xffff, AMAZON_GPTU_CAPREL);
-	amazon_writel(0x80C0, AMAZON_GPTU_T6CON);
-}
-
-void __init plat_mem_setup(void)
-{	
-	u32 chipid = 0;
-	u32 part_no = 0;
-	
-	chipid = amazon_readl(AMAZON_MCD_CHIPID);
-	part_no = AMAZON_MCD_CHIPID_PART_NUMBER_GET(chipid);
-	
-	if(part_no == AMAZON_CHIPID_YANGTSE){
-		printk("Yangtse Version\n");	
-	} else if (part_no == AMAZON_CHIPID_STANDARD) {
-		printk(SYSTEM_MODEL_NAME "\n");
-	} else {
-		printk("unknown version %8x\n",part_no);
-	}
-	
-	amazon_reboot_setup();
-
-	//stop reset TPE and DFE
-	amazon_writel(0, AMAZON_RST_REQ);
-	//clock
-	amazon_writel(0x3fff, AMAZON_PMU_PWDCR);
-	//reenable trace capability
-	part_no = readl(AMAZON_BCU_ECON);
-
-	ioport_resource.start = IOPORT_RESOURCE_START;
-	ioport_resource.end = IOPORT_RESOURCE_END;
-	iomem_resource.start = IOMEM_RESOURCE_START;
-	iomem_resource.end = IOMEM_RESOURCE_END;
-}
-
-static void amazon_machine_restart(char *command)
-{
-    local_irq_disable();
-    amazon_writel(AMAZON_RST_ALL, AMAZON_RST_REQ);
-    for (;;) ;
-}
-
-static void amazon_machine_halt(void)
-{
-    printk(KERN_NOTICE "System halted.\n");
-    local_irq_disable();
-    for (;;) ;
-}
-
-static void amazon_machine_power_off(void)
-{
-	printk(KERN_NOTICE "Please turn off the power now.\n");
-    local_irq_disable();
-    for (;;) ;
-}
-
-static void amazon_reboot_setup(void)
-{
-	_machine_restart = amazon_machine_restart;
-	_machine_halt = amazon_machine_halt;
-	pm_power_off = amazon_machine_power_off;
-}
diff --git a/target/linux/amazon/files/arch/mips/include/asm/mach-amazon/irq.h b/target/linux/amazon/files/arch/mips/include/asm/mach-amazon/irq.h
deleted file mode 100644
index e72b7d5c1..000000000
--- a/target/linux/amazon/files/arch/mips/include/asm/mach-amazon/irq.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __AMAZON_IRQ_H
-#define __AMAZON_IRQ_H
-
-#define NR_IRQS      256
-#include_next <irq.h>
-
-#endif
diff --git a/target/linux/amazon/files/arch/mips/include/asm/mach-amazon/mangle-port.h b/target/linux/amazon/files/arch/mips/include/asm/mach-amazon/mangle-port.h
deleted file mode 100644
index af8c3e939..000000000
--- a/target/linux/amazon/files/arch/mips/include/asm/mach-amazon/mangle-port.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2003, 2004 Ralf Baechle
- */
-#ifndef __ASM_MACH_AMAZON_MANGLE_PORT_H
-#define __ASM_MACH_AMAZON_MANGLE_PORT_H
-
-#define __swizzle_addr_b(port)	(port)
-#define __swizzle_addr_w(port)	((port) ^ 2)
-#define __swizzle_addr_l(port)	(port)
-#define __swizzle_addr_q(port)	(port)
-
-/*
- * Sane hardware offers swapping of PCI/ISA I/O space accesses in hardware;
- * less sane hardware forces software to fiddle with this...
- *
- * Regardless, if the host bus endianness mismatches that of PCI/ISA, then
- * you can't have the numerical value of data and byte addresses within
- * multibyte quantities both preserved at the same time.  Hence two
- * variations of functions: non-prefixed ones that preserve the value
- * and prefixed ones that preserve byte addresses.  The latters are
- * typically used for moving raw data between a peripheral and memory (cf.
- * string I/O functions), hence the "__mem_" prefix.
- */
-#if defined(CONFIG_SWAP_IO_SPACE)
-
-# define ioswabb(a, x)		(x)
-# define __mem_ioswabb(a, x)	(x)
-# define ioswabw(a, x)		le16_to_cpu(x)
-# define __mem_ioswabw(a, x)	(x)
-# define ioswabl(a, x)		le32_to_cpu(x)
-# define __mem_ioswabl(a, x)	(x)
-# define ioswabq(a, x)		le64_to_cpu(x)
-# define __mem_ioswabq(a, x)	(x)
-
-#else
-
-# define ioswabb(a, x)		(x)
-# define __mem_ioswabb(a, x)	(x)
-# define ioswabw(a, x)		(x)
-# define __mem_ioswabw(a, x)	cpu_to_le16(x)
-# define ioswabl(a, x)		(x)
-# define __mem_ioswabl(a, x)	cpu_to_le32(x)
-# define ioswabq(a, x)		(x)
-# define __mem_ioswabq(a, x)	cpu_to_le32(x)
-
-#endif
-
-#endif /* __ASM_MACH_AMAZON_MANGLE_PORT_H */
diff --git a/target/linux/amazon/files/arch/mips/include/asm/mach-amazon/war.h b/target/linux/amazon/files/arch/mips/include/asm/mach-amazon/war.h
deleted file mode 100644
index da42ee5a2..000000000
--- a/target/linux/amazon/files/arch/mips/include/asm/mach-amazon/war.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- */
-#ifndef __ASM_MIPS_MACH_AMAZON_WAR_H
-#define __ASM_MIPS_MACH_AMAZON_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR     0
-#define R4600_V1_HIT_CACHEOP_WAR        0
-#define R4600_V2_HIT_CACHEOP_WAR        0
-#define R5432_CP0_INTERRUPT_WAR         0
-#define BCM1250_M3_WAR                  0
-#define SIBYTE_1956_WAR                 0
-#define MIPS4K_ICACHE_REFILL_WAR        0
-#define MIPS_CACHE_SYNC_WAR             0
-#define TX49XX_ICACHE_INDEX_INV_WAR     0
-#define RM9000_CDEX_SMP_WAR             0
-#define ICACHE_REFILLS_WORKAROUND_WAR   0
-#define R10000_LLSC_WAR                 0
-#define MIPS34K_MISSED_ITLB_WAR         0
-
-#endif
diff --git a/target/linux/amazon/files/drivers/atm/amazon_tpe.c b/target/linux/amazon/files/drivers/atm/amazon_tpe.c
deleted file mode 100644
index b50749440..000000000
--- a/target/linux/amazon/files/drivers/atm/amazon_tpe.c
+++ /dev/null
@@ -1,3074 +0,0 @@
-/*
- *   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.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-//-----------------------------------------------------------------------
-/*
- * Description:
- *	Driver for Infineon Amazon TPE
- */
-//-----------------------------------------------------------------------
-/* Author:	peng.liu@infineon.com
- * Created:	12-April-2004
- */
-//-----------------------------------------------------------------------
-/* History
- * Last changed on: 13 Oct. 2004
- * Last changed by: peng.liu@infineon.com
- * Last changed on: 28 Jan. 2004
- * Last changed by: peng.liu@infineon.com
- * Last changed Reason:
- *	- AAL5R may send more bytes than expected in MFL (so far, confirmed as 64 bytes)
- */
-// 507261:tc.chen 2005/07/26 re-organize code address map to improve performance.
-// 507281:tc.chen 2005/07/28 fix f4 segment isssue
-/* 511045:linmars 2005/11/04 from Liu.Peng: change NRT_VBR bandwidth calculation based on scr instead of pcr */
- 
-#ifndef __KERNEL__
-#define __KERNEL__
-#endif 
-#ifndef EXPORT_SYMTAB
-#define EXPORT_SYMTAB
-#endif
-
-/*TPE level loopback, bypass AWARE DFE */
-#undef TPE_LOOPBACK
-
-/* enable debug options */			
-#undef AMAZON_ATM_DEBUG
-
-/* enable rx error packet analysis */
-#undef AMAZON_ATM_DEBUG_RX
-
-/* test AAL5 Interrupt */
-#undef  AMAZON_TPE_TEST_AAL5_INT
-
-/* dump packet */
-#undef AMAZON_TPE_DUMP
-
-/* read ARC register*/
-/* this register is located in side DFE module*/
-#undef AMAZON_TPE_READ_ARC
-
-/* software controlled reassembly */
-#undef AMAZON_TPE_SCR
-
-/* recovery from AAL5 bug */
-#undef AMAZON_TPE_AAL5_RECOVERY
-
-#if defined(AMAZON_TPE_READ_ARC) || defined(AMAZON_TPE_AAL5_RECOVERY)
-#define ALPHAEUS_BASE_ADDR	0x31c00
-#define A_CFG_ADDR		(ALPHAEUS_BASE_ADDR+0x04)
-#define AR_CB0_STATUS_ADDR		(ALPHAEUS_BASE_ADDR+0x2c)
-#define AR_CB1_STATUS_ADDR		(ALPHAEUS_BASE_ADDR+0x30)
-#define AT_CELL0_ADDR		(ALPHAEUS_BASE_ADDR+0x90)
-#define AR_CELL0_ADDR		(ALPHAEUS_BASE_ADDR+0x1a0)
-#define AR_CD_CNT0_ADDR		(ALPHAEUS_BASE_ADDR+0x1c8)
-#endif
-
-#include <linux/module.h>
-#include <linux/config.h>
-#include <linux/init.h>
-#include <linux/kernel.h> 
-#include <linux/slab.h>  
-#include <linux/fs.h> 
-#include <linux/types.h>
-#include <linux/errno.h>  
-#include <linux/time.h>
-#include <linux/atm.h>
-#include <linux/atmdev.h>
-#include <linux/netdevice.h>
-#include <asm/byteorder.h>
-#include <asm/io.h>
-#include <asm/uaccess.h>
-#include <asm/system.h>
-#include <asm/atomic.h>
-#include <asm/bitops.h>
-#include <asm/system.h>
-
-#include <asm/amazon/amazon.h>
-#include <asm/amazon/irq.h>
-
-#include <linux/in.h>
-#include <linux/netdevice.h> 
-#include <linux/etherdevice.h> 
-#include <linux/ip.h>
-#include <linux/tcp.h> 
-#include <linux/skbuff.h>
-#include <linux/in6.h>
-#include <linux/delay.h>
-#include <asm/amazon/atm_defines.h>
-#include <asm/amazon/amazon_dma.h>
-#include <asm/amazon/amazon_tpe.h>
-
-#if defined(AMAZON_TPE_READ_ARC) || defined(AMAZON_TPE_AAL5_RECOVERY)
-#include <asm/amazon/amazon_mei.h>
-#include <asm/amazon/amazon_mei_app.h>
-#endif
-
-#define AMAZON_TPE_EMSG(fmt, args...) printk( KERN_ERR  "%s: " fmt,__FUNCTION__, ## args)
-
-/***************************************** External Functions *******************************************/
-extern unsigned int amazon_get_fpi_hz(void);
-extern void mask_and_ack_amazon_irq(unsigned int irq_nr);
-extern void amz_push_oam(unsigned char *);
-
-//amazon_mei.c
-#if defined(AMAZON_TPE_READ_ARC) || defined(AMAZON_TPE_AAL5_RECOVERY)
-extern MEI_ERROR meiDebugRead(u32 srcaddr, u32 *databuff, u32 databuffsize);
-extern MEI_ERROR meiDebugWrite(u32 destaddr, u32 *databuff, u32 databuffsize);
-#endif
-
-/***************************************** Internal Functions *******************************************/
-int amazon_atm_read_procmem(char *buf, char **start, off_t offset,int count, int *eof, void *data);
-/***************************************** Global Data *******************************************/
-amazon_atm_dev_t g_atm_dev;		//device data
-static struct tq_struct swex_start_task;	//BH task
-static struct tq_struct swex_complete_task;	//BH task
-#ifdef AMAZON_TPE_SCR
-static struct tq_struct a5r_task; 		//BH task
-#endif
-static struct dma_device_info 	g_dma_dev;	//for DMA
-static struct atm_dev * amazon_atm_devs[AMAZON_ATM_PORT_NUM];
-static struct oam_last_activity g_oam_time_stamp[AMAZON_ATM_MAX_VCC_NUM];
-static u8 g_oam_cell[AMAZON_AAL0_SDU+4];	//for OAM cells
-#ifdef AMAZON_CHECK_LINK
-static int adsl_link_status;			//ADSL link status, 0:down, 1:up
-#endif //AMAZON_CHECK_LINK
-/***************************************** Module Parameters *************************************/
-// Parameter Definition for module
-static int port_enable0 = 1;				// Variable for parameter port_enable0
-static int port_enable1 = 0;				// Variable for parameter port_enable1
-static int port_max_conn0 = 15;				// Variable for parameter port_max_conn0
-static int port_max_conn1 = 0;				// Variable for parameter port_max_conn1
-static int port_cell_rate_up0 = 7500;			// Variable for parameter port_cell_rate_up0
-static int port_cell_rate_up1 = 7500;			// Variable for parameter port_cell_rate_up1
-
-
-static int qsb_tau = 1;					// Variable for parameter qsb_tau
-static int qsb_srvm = 0xf;				// Variable for parameter qsb_srvm
-static int qsb_tstep = 4 ;				// Variable for parameter qsb_tstep
-
-static int cbm_nrt = 3900;				// Variable for parameter cbm_nrt
-static int cbm_clp0 =3500;				// Variable for parameter cbm_clp0
-static int cbm_clp1 =3200;				// Variable for parameter cbm_clp1
-static int cbm_free_cell_no = AMAZON_ATM_FREE_CELLS;	// Variable for parameter cbm_free_cell_no
-
-static int a5_fill_pattern = 0x7e;			// Variable for parameter a5_fill_pattern '~'
-static int a5s_mtu = 0x700;				// mtu for tx
-static int a5r_mtu = 0x700;				// mtu for rx
-
-static int oam_q_threshold = 	64;			// oam queue threshold, minium value 64
-static int rx_q_threshold = 	1000;			// rx queue threshold, minium value 64
-static int tx_q_threshold = 	800;			// tx queue threshold, minium value 64
-
-MODULE_PARM(port_max_conn0, "i");
-MODULE_PARM_DESC(port_max_conn0, "Maximum atm connection for port #0");
-MODULE_PARM(port_max_conn1, "i");
-MODULE_PARM_DESC(port_max_conn1, "Maximum atm connection for port #1");
-MODULE_PARM(port_enable0, "i");
-MODULE_PARM_DESC(port_enable0, "0 -> port disabled, 1->port enabled");
-MODULE_PARM(port_enable1, "i");
-MODULE_PARM_DESC(port_enable1, "0 -> port disabled, 1->port enabled");
-MODULE_PARM(port_cell_rate_up0, "i");
-MODULE_PARM_DESC(port_cell_rate_up0, "ATM port upstream rate in cells/s");
-MODULE_PARM(port_cell_rate_up1, "i");
-MODULE_PARM_DESC(port_cell_rate_up1, "ATM port upstream rate in cells/s");
-
-MODULE_PARM(qsb_tau,"i");
-MODULE_PARM_DESC(qsb_tau, "Cell delay variation. value must be > 0");
-MODULE_PARM(qsb_srvm, "i");
-MODULE_PARM_DESC(qsb_srvm, "Maximum burst size");
-MODULE_PARM(qsb_tstep, "i");
-MODULE_PARM_DESC(qsb_tstep, "n*32 cycles per sbs cycles n=1,2,4");
-
-MODULE_PARM(cbm_nrt, "i");
-MODULE_PARM_DESC(cbm_nrt, "Non real time threshold for cell buffer");
-MODULE_PARM(cbm_clp0, "i");
-MODULE_PARM_DESC(cbm_clp0, "Threshold for cells with cell loss priority 0");
-MODULE_PARM(cbm_clp1, "i");
-MODULE_PARM_DESC(cbm_clp1, "Threshold for cells with cell loss priority 1");
-MODULE_PARM(cbm_free_cell_no, "i");
-MODULE_PARM_DESC(cbm_free_cell_no, "Number of cells in the cell buffer manager");
-
-MODULE_PARM(a5_fill_pattern, "i");
-MODULE_PARM_DESC(a5_fill_pattern, "filling pattern (PAD) for aal5 frames");
-MODULE_PARM(a5s_mtu, "i");
-MODULE_PARM_DESC(a5s_mtu, "max. SDU for upstream");
-MODULE_PARM(a5r_mtu, "i");
-MODULE_PARM_DESC(a5r_mtu, "max. SDU for downstream");                                                                               
-
-MODULE_PARM(oam_q_threshold, "i");
-MODULE_PARM_DESC(oam_q_threshold, "oam queue threshold");
-
-MODULE_PARM(rx_q_threshold, "i");
-MODULE_PARM_DESC(rx_q_threshold, "downstream/rx queue threshold");
-
-MODULE_PARM(tx_q_threshold, "i");
-MODULE_PARM_DESC(tx_q_threshold, "upstream/tx queue threshold");
-
-/***************************************** local functions *************************************/
-/* Brief: valid QID
- * Return: 1 if valid
- * 	   0 if not
- */
-static inline int valid_qid(int qid)
-{
-	return ( (qid>0) && (qid<AMAZON_ATM_MAX_QUEUE_NUM));
-}
-
-/*
- * Brief: align to 16 bytes boundary 
- * Parameter:
- *	skb
- * Description:
- *	use skb_reserve to adjust the data pointer
- *	don't change head pointer
- *	pls allocate extrac 16 bytes before call this function
- */
-static void inline alloc_align_16(struct sk_buff * skb)
-{
-	if ( ( ((u32) (skb->data)) & 15) != 0){
-		AMAZON_TPE_DMSG("need to adjust the alignment manually\n");
-		skb_reserve(skb, 16 - (((u32) (skb->data)) & 15) );
-	}
-
-}
-
-/*
- * Brief: initialize the device according to the module paramters
- * Return: not NULL	-	ok
- *	   NULL		-	fails
- * Description: arrange load parameters and call the hardware initialization routines
- */
-static void atm_init_parameters(amazon_atm_dev_t *dev)
-{
-	//port setting
-	dev->ports[0].enable = port_enable0;
-	dev->ports[0].max_conn = port_max_conn0;
-	dev->ports[0].tx_max_cr = port_cell_rate_up0;
-	if (port_enable1){
-		dev->ports[1].enable = port_enable1;
-		dev->ports[1].max_conn = port_max_conn1;
-		dev->ports[1].tx_max_cr = port_cell_rate_up1;
-	}
-
-	//aal5
-	dev->aal5.padding_byte = a5_fill_pattern;
-	dev->aal5.tx_max_sdu = a5s_mtu;
-	dev->aal5.rx_max_sdu = a5r_mtu;
-
-	//cbm
-	dev->cbm.nrt_thr = cbm_nrt;
-	dev->cbm.clp0_thr = cbm_clp0;
-	dev->cbm.clp1_thr = cbm_clp1;
-	dev->cbm.free_cell_cnt = cbm_free_cell_no;
-
-	//qsb
-	dev->qsb.tau = qsb_tau;
-	dev->qsb.tstepc =qsb_tstep;
-	dev->qsb.sbl = qsb_srvm;
-	
-	//allocate on the fly
-	dev->cbm.mem_addr = NULL;
-	dev->cbm.qd_addr = NULL;
-}
-
-
-/*	Brief: 		Find QID for VCC
- *	Parameters:	vcc	- VCC data structure
- *  	Return Value:	-EINVAL		- VCC not found
- *			qid		- QID for this VCC
- *	Description:
- *	This function returns the QID of a given VCC
- */
-static int amazon_atm_get_queue(struct atm_vcc* vcc)
-{
-	int	i;
-	for (i=0;i<AMAZON_ATM_MAX_QUEUE_NUM;i++) {
-		if (g_atm_dev.queues[i].vcc == vcc) return i;
-	}
-	return -EINVAL;
-}
-
-
-/*
- *	Brief: 		Find QID for VPI/VCI
- *	Parameters:	vpi	- VPI to found
- *			vci	- VCI to found
- *
- *  	Return Value:	-EINVAL		- VPI/VCI not found
- *			qid		- QID for this VPI/VCI
- *
- *	Description:
- *	This function returns the QID for a given VPI/VCI. itf doesn't matter
- */
-static int amazon_atm_find_vpivci(u8 vpi, u16 vci)
-{
-	int	i;
-	struct atm_vcc * vcc;
-	for (i=0;i<AMAZON_ATM_MAX_QUEUE_NUM;i++) {
-		if ( (vcc = g_atm_dev.queues[i].vcc)!= NULL) {
-			if ((vcc->vpi == vpi) && (vcc->vci == vci)) return i;
-		}
-	}
-	return -EINVAL;
-}
-
-/*	Brief: 		Find QID for VPI
- *	Parameters:	vpi	- VPI to found
- *  	Return Value:	-EINVAL		- VPI not found
- *			qid		- QID for this VPI
- *
- *	Description:
- *	This function returns the QID for a given VPI. itf and VCI don't matter
- */
-static int amazon_atm_find_vpi(u8 vpi)
-{
-	int	i;
-	for (i=0;i<AMAZON_ATM_MAX_QUEUE_NUM;i++) {
-		if ( g_atm_dev.queues[i].vcc!= NULL) {
-			if (g_atm_dev.queues[i].vcc->vpi == vpi) return i;
-		}
-	}
-	return -EINVAL;
-}
-
-/*
- *	Brief: 		Clears QID entries for VCC
- *
- *	Parameters:	vcc	- VCC to found
- *
- *	Description:
- *	This function searches for the given VCC and sets it to NULL if found.
- */
-static inline void amazon_atm_clear_vcc(int i)
-{
-	g_atm_dev.queues[i].vcc = NULL;
-	g_atm_dev.queues[i].free = 1;
-}
-
-
-/*
- * Brief:	dump skb data
- */
-static inline void dump_skb(u32 len, char * data)
-{
-#ifdef AMAZON_TPE_DUMP
-	int i;
-	for(i=0;i<len;i++){	
-		printk("%2.2x ",(u8)(data[i]));
-		if (i % 16 == 15)
-			printk("\n");
-	}
-	printk("\n");
-#endif
-}
-
-/*
- * Brief:	dump queue descriptor
- */
-static inline void dump_qd(int qid)
-{
-#ifdef AMAZON_TPE_DUMP
-	u8 * qd_addr;
-	if (valid_qid(qid) != 1) return;
-	qd_addr = (u8 *) KSEG1ADDR((unsigned long)g_atm_dev.cbm.qd_addr);
-	AMAZON_TPE_EMSG("qid: %u [%8x][%8x][%8x][%8x]\n", qid
-		,readl(qd_addr+qid*CBM_QD_SIZE+0x0)
-		,readl(qd_addr+qid*CBM_QD_SIZE+0x4)
-		,readl(qd_addr+qid*CBM_QD_SIZE+0x8)
-		,readl(qd_addr+qid*CBM_QD_SIZE+0xc));
-#endif
-}
-
-/*
- * Brief:	release TX skbuff
- */
-static inline void amazon_atm_free_tx_skb_vcc(struct atm_vcc *vcc, struct sk_buff *skb)
-{
-	if ( vcc->pop != NULL) {
-		vcc->pop(vcc, skb);
-	 } else {
-	 	dev_kfree_skb_any(skb);
-        }
-}
-/*
- * Brief:	release TX skbuff
- */
-static inline void amazon_atm_free_tx_skb(struct sk_buff *skb)
-{
-	struct atm_vcc* vcc = ATM_SKB(skb)->vcc;
-	if (vcc!=NULL){
-		amazon_atm_free_tx_skb_vcc(vcc,skb);
-	} else {
-		dev_kfree_skb_any(skb);//fchang:Added
-	}
-}
-
-/* Brief:	divide by 64 and round up
- */
-static inline u32 divide_by_64_round_up(int input)
-{
-	u32 tmp1;
-	tmp1 = (u32) input;
-        tmp1 = (tmp1%64)?(tmp1/64 + 1): (tmp1/64);
-        if (tmp1 == 0) tmp1 = 1;
-	return tmp1;
-}
-
-/*
- * Brief:	statistics
- */
-#ifdef AMAZON_ATM_DEBUG
-static inline void queue_statics(int qid, qs_t idx)
-{
-	if (valid_qid(qid)){
-		g_atm_dev.queues[qid].qs[idx]++;
-	}
-}
-#else	//not AMAZON_ATM_DEBUG
-static inline void queue_statics(int qid, qs_t idx){}
-#endif	//AMAZON_ATM_DEBUG		
-
-
-/*	Brief:	set dma tx full, i.e. there is no available descriptors
- */
-static void inline atm_dma_full(void)
-{
-	AMAZON_TPE_DMSG("ch0 is full\n");
-	atomic_set(&g_atm_dev.dma_tx_free_0,0);
-}
-
-/*
- *	Brief	set dma tx free (at least one descript is available)
- */
-inline static void atm_dma_free(void)
-{
-	AMAZON_TPE_DMSG("ch0 is free\n");
-	atomic_set(&g_atm_dev.dma_tx_free_0,1);
-}
-
-
-/*	Brief:		return the status of DMA TX descriptors
- *	Parameters:	TX channel  (DMA_TX_CH0, TX_CH1)
- *	Return:
- *		1:	there are availabel TX descriptors
- *		0:	no available
- *	Description:
- *
- */
-inline int dma_may_send(int ch)
-{
-	if (atomic_read(&g_atm_dev.dma_tx_free_0)){
-		return 1;
-	}
-	return 0;
-}
-
-/******************************* global functions *********************************/ 
-/*
- *	Brief: 		SWIE Cell Extraction Start Routine
- *			and task routine for swex_complete_task
- *	Parameters:	irq_stat	- interrupt status
- *
- *	Description:
- *	This is the routine for extracting cell. It will schedule itself if the hardware is busy.
- *	This routine runs in interrupt context
- */
-void amazon_atm_swex(void * irq_stat)
-{
-	u32 ex_stat=0;
-	u32 addr;
-	// Read extraction status register
-	ex_stat = readl(CBM_HWEXSTAT0_ADDR);
-
-	// Check if extraction/insertion is in progress 
-	if ( (ex_stat & CBM_EXSTAT_SCB) || (ex_stat & CBM_EXSTAT_FB) || (test_and_set_bit(SWIE_LOCK, &(g_atm_dev.swie.lock))!=0)) {
-		AMAZON_TPE_DMSG(" extraction in progress. Will wait\n");
-		swex_start_task.data = irq_stat;
-		queue_task(&swex_start_task, &tq_immediate);
-		mark_bh(IMMEDIATE_BH);
-	}else {
-		// Extract QID
-		g_atm_dev.swie.qid = (((u32)irq_stat) >> 24);
-		AMAZON_TPE_DMSG("extracting from qid=%u\n",g_atm_dev.swie.qid);
-		//read status word
-		addr = KSEG1ADDR((unsigned long)g_atm_dev.cbm.qd_addr);
-		addr = readl((addr + g_atm_dev.swie.qid * 0x10 + 4) & 0xFFFFFFC0);
-		addr = KSEG1ADDR(addr);
-		g_atm_dev.swie.sw = readl(addr+52)&SWIE_ADDITION_DATA_MASK;
-		AMAZON_TPE_DMSG("cell addition word: %8x \n", g_atm_dev.swie.sw);
-		
-		// Start extraction
-		AMAZON_WRITE_REGISTER_L(g_atm_dev.swie.qid | SWIE_CBM_PID_SUBADDR, CBM_HWEXPAR0_ADDR);
-		AMAZON_WRITE_REGISTER_L(SWIE_CBM_SCE0, CBM_HWEXCMD_ADDR);
-	}
-}
-#ifdef AMAZON_TPE_SCR
-u32 g_a5r_wait=0;
-/*
- *	Brief: 		AAL5 Packet Extraction Routine	and task routine for a5r_task
- *	Parameters:	irq_stat	- interrupt status
- *
- *	Description:
- *	This is the routine for extracting frame. It will schedule itself if the hardware is busy.
- *	This routine runs in interrupt context
- */
-void amazon_atm_a5r(void* qid)
-{
-	volatile u32 ex_stat=0;
-	u32 addr;
-	u32 a5r_wait=0;
-
-	ex_stat = readl(CBM_HWEXSTAT0_ADDR);
-#if 0
-	// Check if extraction/insertion is in progress 
-	if ( (ex_stat & CBM_EXSTAT_SCB) || (ex_stat & CBM_EXSTAT_FB) ) {
-		AMAZON_TPE_DMSG(" extraction in progress. Will wait\n");
-		a5r_task.data = qid;
-		queue_task(&a5r_task, &tq_immediate);
-		mark_bh(IMMEDIATE_BH);
-	}else {
-		AMAZON_TPE_DMSG("extracting from qid=%u\n",(u8)qid);
-		// Start extraction
-		AMAZON_WRITE_REGISTER_L(((u8)qid) | CBM_HWEXPAR_PN_A5, CBM_HWEXPAR0_ADDR);
-		AMAZON_WRITE_REGISTER_L(CBM_HWEXCMD_FE0, CBM_HWEXCMD_ADDR);
-	}
-#else
-	//while ( (ex_stat & CBM_EXSTAT_SCB) || (ex_stat & CBM_EXSTAT_FB) ) {
-	while ( ex_stat != 0x80){
-		a5r_wait++;
-		ex_stat = readl(CBM_HWEXSTAT0_ADDR);
-#if	0
-		if (a5r_wait >= 0xffffff){
-			a5r_wait=0;
-			printk(".");
-		}
-#endif
-	}
-	if (a5r_wait > g_a5r_wait){
-		g_a5r_wait = a5r_wait;
-	}
-	AMAZON_WRITE_REGISTER_L(((u8)qid) | CBM_HWEXPAR_PN_A5, CBM_HWEXPAR0_ADDR);
-	AMAZON_WRITE_REGISTER_L(CBM_HWEXCMD_FE0, CBM_HWEXCMD_ADDR);
-#endif
-}
-
-#endif //AMAZON_TPE_SCR
-
-/*	Brief:	Handle F4/F5 OAM cell
- *	Return:
- *		0	ok
- *		<0	fails
- */
-static int inline amazon_handle_oam_cell(void *data, u8 vpi, u16 vci,u32 status)
-{
-	struct atm_vcc*		vcc=NULL;
-	int qid;
-	if (!status&SWIE_EOAM_MASK){
-		AMAZON_TPE_EMSG("unknown cell received, discarded\n");
-		goto amazon_handle_oam_cell_err_exit;
-	}else if (status&SWIE_ECRC10ERROR_MASK){
-		AMAZON_TPE_EMSG("CRC-10 Error Status:%8x, discarded\n", status);
-		goto amazon_handle_oam_cell_err_exit;
-	}else{
-		if(status & (SWIE_EVCI3_MASK |SWIE_EVCI4_MASK)){
-			//F4 level (VPI) OAM, Assume duplex
-			qid = amazon_atm_find_vpi(vpi)+CBM_RX_OFFSET;
-		}else if (status & (SWIE_EPTI4_MASK|SWIE_EPTI5_MASK)){
-			//F5 level (VCI) OAM, Assume duplex
-			qid = amazon_atm_find_vpivci(vpi,vci)+CBM_RX_OFFSET;			
-		}else{
-			qid = -1;
-			AMAZON_TPE_EMSG("non-F4/F5 OAM cells?, discarded\n");
-			goto amazon_handle_oam_cell_err_exit;
-		}
-	}
-	if (valid_qid(qid) && ((vcc = g_atm_dev.queues[qid].vcc)!=NULL)){
-		//TODO, should we do this for ALL OAM types? (Actually only User and CC)
-		g_atm_dev.queues[qid].access_time=xtime;
-		if (vcc->push_oam){
-			(*vcc->push_oam)(vcc,data);
-		}else{
-			amz_push_oam(data);
-		}
-	}else{
-		AMAZON_TPE_EMSG("no VCC yet\n");
-		goto amazon_handle_oam_cell_err_exit;
-	}
-	return 0;
-amazon_handle_oam_cell_err_exit:	
-	dump_skb(AMAZON_AAL0_SDU,(char *)data);	
-	return -1;
-}
-
-/*	Brief:	SWIE Cell Extraction Finish Routine 
- *		and task routine for swex_complete_task
- *	Description:
- *	1.Allocate a buffer of type struct sk_buff
- *	2.Copy the data from the temporary memory to this buffer
- *	3.Push the data to upper layer
- * 	4.Update the statistical data if necessary
- *	5.Release the temporary data
-
- */
-void amazon_atm_swex_push(void * data)
-{
-	struct atm_vcc*		vcc=NULL;
-	struct sk_buff*		skb=NULL;
-	struct amazon_atm_cell_header * cell_header;
-	u32 status;
-	int qid;
-	if (!data){
-		AMAZON_TPE_EMSG("data is NULL\n");
-		return;
-	}
-	qid = ((u8*)data)[AMAZON_AAL0_SDU];
-	status = ((u32*)data)[ATM_AAL0_SDU/4];
-	cell_header = (struct amazon_atm_cell_header *) data;
-	if (valid_qid(qid) != 1){
-		AMAZON_TPE_EMSG("error qid: %u\n",qid);
-		AMAZON_TPE_EMSG("unknown cells recieved\n");
-	}else if (qid == AMAZON_ATM_OAM_Q_ID){
-		//OAM or RM or OTHER cell
-		//Find real connection
-		
-#ifdef IKOS_MINI_BOOT	
-		//for OAM loop back test
-		dump_skb(56,(char *)data);
-		//kfree(data);	using g_oam_cell
-		return;
-#endif //IKOS_MINI_BOOT				
-#ifdef TPE_LOOPBACK					
-		amz_push_oam(data);
-		return;
-#endif//TPE_LOOPBACK
-		int ret = 0;
-		ret = amazon_handle_oam_cell(data,cell_header->bit.vpi,cell_header->bit.vci,status);
-		if (ret == 0)
-					return;
-				}else{
-		//should be normal AAL0 cells
-		// Get VCC
-		vcc = g_atm_dev.queues[qid].vcc;
-		if (vcc != NULL) {
-			AMAZON_TPE_DMSG("push to upper layer\n");
-			skb = dev_alloc_skb(AMAZON_AAL0_SDU);
-			if (skb != NULL) {
-				//skb->dev=vcc->dev;
-				memcpy(skb_put(skb, AMAZON_AAL0_SDU), data, AMAZON_AAL0_SDU);
-				skb->stamp = xtime;
-				ATM_SKB(skb)->vcc = vcc;
-				(*g_atm_dev.queues[qid].push)(vcc,skb,0);
-			}else{
-				AMAZON_TPE_EMSG(" No memory left for incoming AAL0 cell! Cell discarded!\n");
-				//inform the upper layer
-				(*g_atm_dev.queues[qid].push)(vcc,skb,-ENOMEM);
-				atomic_inc(&vcc->stats->rx_drop);
-			}
-		}else{
-			AMAZON_TPE_EMSG("invalid qid %u\n",qid);
-		}
-	}
-	//kfree(data);	using g_oam_cell
-}
-
-/*
- *	Brief: 		Interrupt handler for software cell extraction (done)
- *	Parameters:	irq	- CPPN for this interrupt
- *			data	- Device ID for this interrupt
- *			regs	- Register file
- *
- *	Description:
- *	When a software extraction is finished this interrupt is issued.
- *	It reads the cell data and sends it to the ATM stack.
- */
-void amazon_atm_swex_isr(int irq, void *data, struct pt_regs *regs)
-{
-	u32 * cell = NULL;
-	int i;
-	//ATM_AAL0 SDU + QID
-	AMAZON_TPE_DMSG("SWIE extraction done\n");
-	cell = (u32 *) g_oam_cell;
-	if (cell != NULL){
-		//convert to host byte order from big endian
-		for(i=0;i<ATM_AAL0_SDU;i+=4){
-			cell[i/4]=readl(SWIE_ECELL_ADDR+i);	
-		}
-		cell[ATM_AAL0_SDU/4]= g_atm_dev.swie.sw;
-		((u8*)cell)[AMAZON_AAL0_SDU] = g_atm_dev.swie.qid;
-#ifdef IKOS_MINI_BOOT
-	for(i=0;i<ATM_AAL0_SDU;i+=4){
-		AMAZON_TPE_DMSG("[%2x][%2x][%2x][%2x]\n",
-			((char*)cell)[i],
-			((char*)cell)[i+1],
-			((char*)cell)[i+2],
-			((char*)cell)[i+3]
-			);
-	}
-	AMAZON_TPE_DMSG("qid: %u\n", ((u8*)cell)[AMAZON_AAL0_SDU]);
-	amazon_atm_swex_push((void *) cell);
-#else //not IKOS_MINI_BOOT
-	swex_complete_task.data = cell;
-	queue_task(&swex_complete_task,&tq_immediate);
-	mark_bh(IMMEDIATE_BH);
-#endif //not IKOS_MINI_BOOT
-	}else{
-		AMAZON_TPE_EMSG("no memory for receiving AAL0 cell\n");
-	}
-	
-	/* release the lock and check */
-	if (test_and_clear_bit(SWIE_LOCK,&(g_atm_dev.swie.lock)) == 0){
-		AMAZON_TPE_EMSG("swie lock is already released\n");
-	}
-	wake_up(&g_atm_dev.swie.sleep);
-}
-/*	Brief: 		Interrupt handler for software cell insertion
- *
- *	Parameters:	irq	- CPPN for this interrupt
- *			data	- Device ID for this interrupt
- *			regs	- Register file
- *
- *	Description:
- *	When a software insertion is finished this interrupt is issued.
- *	The only purpose is to release the semaphore and read the status register.
- */
-void amazon_atm_swin_isr(int irq, void *data, struct pt_regs *regs)
-{
-	AMAZON_TPE_DMSG("SWIE insertion done\n");
-	/* release the lock and check */
-	if (test_and_clear_bit(SWIE_LOCK,&(g_atm_dev.swie.lock)) == 0){
-		AMAZON_TPE_EMSG("swie lock is already released");
-	}
-	// Release semaphore
-	up(&g_atm_dev.swie.in_sem);
-
-}
-/*	Brief: 		Interrupt handler for software cell insertion & extraction
- *	Parameters:	irq	- CPPN for this interrupt
- *			data	- Device ID for this interrupt
- *			regs	- Register file
- *	Description:
- *	When a software insertion or extractionis finished this interrupt is issued.
- */
-void amazon_atm_swie_isr(int irq, void *data, struct pt_regs *regs)
-{
-	u32	status=0;
-	// Read status register
-	status = readl(SWIE_ISTAT_ADDR);
-	AMAZON_TPE_DMSG("insertion status: %8x\n", status);
-	if (status & SWIE_ISTAT_DONE){
-		//clear interrupt in peripheral and ICU
-		AMAZON_WRITE_REGISTER_L(SRC_TOS_MIPS | SRC_CLRR|SRC_SRE_ENABLE | AMAZON_SWIE_INT, SWIE_ISRC_ADDR);
-		mask_and_ack_amazon_irq(AMAZON_SWIE_INT);
-		
-		amazon_atm_swin_isr(irq,data,regs);
-	}
-	status = readl(SWIE_ESTAT_ADDR);
-	AMAZON_TPE_DMSG("extraction status: %8x\n", status);
-	if (status & SWIE_ESTAT_DONE){
-		//clear interrupt
-		AMAZON_WRITE_REGISTER_L(SRC_TOS_MIPS | SRC_CLRR|SRC_SRE_ENABLE | AMAZON_SWIE_INT, SWIE_ESRC_ADDR);
-		mask_and_ack_amazon_irq(AMAZON_SWIE_INT);
-		
-		amazon_atm_swex_isr(irq,data,regs);
-	}
-	//clear interrupt in ICU
-}
- 
-/*
- *	Brief: 		Insert ATM cell into CBM
- *	Parameters:	queue	- Target queue
- *			cell	- Pointer to cell data
- *  	Return Value:	EBUSY		- CBM is busy
- *			0		- OK, cell inserted
- *	Description:
- *	This function inserts a cell into the CBM using the software insertion
- *	method. The format of the cell should be
- *	Little Endian (address starting from 0)
- *		H3, H2, H1, H0, P3, P2, P1, P0, P7, P6, P5, P4, ..., P47, P46, P45, P44
- *	Big Endian (address starting from 0)
- *		H0, H1, H2, H3, P0, P1, P2, P3, P4, P5, P6, P7, ..., P44, P45, P46, P47
- *	This function does not free memory!!!
- */
-int amazon_atm_swin(u8 queue, void* cell)
-{
-	u32	status=0;
-	int i;
-	// Read status register
-	status = readl(SWIE_ISTAT_ADDR);
-	AMAZON_TPE_DMSG(" SWIE status=0x%08x\n",status);
-
-	AMAZON_TPE_DMSG(" Inserting cell qid=%u\n",queue);
-	
-#ifdef AMAZON_CHECK_LINK
-	if (adsl_link_status == 0){
-		return -EFAULT;	
-	}
-#endif //AMAZON_CHECK_LINK
-
-	// Get semaphore (if possible)
-	if (down_interruptible(&g_atm_dev.swie.in_sem)) {
-		return -ERESTARTSYS;
-	}
-	/* try to set lock */
-	wait_event_interruptible(g_atm_dev.swie.sleep,(test_and_set_bit(SWIE_LOCK,&(g_atm_dev.swie.lock)) == 0));
-	if (signal_pending(current)){
-		return -ERESTARTSYS; 
-	}
-
-	// Store cell in CBM memory
-	for(i=0;i<ATM_AAL0_SDU;i+=4){
-		AMAZON_WRITE_REGISTER_L(((u32*)cell)[i/4],SWIE_ICELL_ADDR+i);
-	}
-	//Store queue id
-	AMAZON_WRITE_REGISTER_L((u32) queue,SWIE_IQID_ADDR);
-
-	//Start SWIE
-	AMAZON_WRITE_REGISTER_L(SWIE_ICMD_START,SWIE_ICMD_ADDR);
-	
-	return 0;
-}
-
-#ifdef AMAZON_ATM_DEBUG
-/*
- *	Brief: 		Interrupt handler for HTU
- *
- *	Parameters:	irq	- CPPN for this interrupt
- *			data	- Device ID for this interrupt
- *			regs	- Register file
- *
- */
-void amazon_atm_htu_isr(int irq, void *data, struct pt_regs *regs)
-{
-	u32	irq_stat=0;
-
-	// Read interrupt status register
-	irq_stat = readl(HTU_ISR0_ADDR);
-	AMAZON_TPE_DMSG("HTU status: %8x\n",irq_stat);
-	//Clear interrupt in CBM and ICU
-	AMAZON_WRITE_REGISTER_L(SRC_CLRR|SRC_TOS_MIPS | SRC_SRE_ENABLE | AMAZON_HTU_INT, HTU_SRC0_ADDR);
-	mask_and_ack_amazon_irq(AMAZON_HTU_INT);	
-	// Check if Any Cell Arrived
-	if (irq_stat & (HTU_ISR_NE | HTU_ISR_PNE) ) {
-		AMAZON_TPE_EMSG("INFNOENTRY %8x\n", readl(HTU_INFNOENTRY_ADDR));		
-	}else if (irq_stat & (HTU_ISR_TORD|HTU_ISR_PT)){
-		AMAZON_TPE_EMSG("Time Out %8x\n", readl(HTU_INFTIMEOUT_ADDR));
-	}else if (irq_stat & HTU_ISR_IT){
-		AMAZON_TPE_EMSG("Interrupt Test\n");
-	}else if (irq_stat & HTU_ISR_OTOC){
-		AMAZON_TPE_EMSG("Overflow of Time Out Counter\n");
-	}else if (irq_stat & HTU_ISR_ONEC){
-		AMAZON_TPE_EMSG("Overflow of No Entry Counter\n");
-	}else{
-		AMAZON_TPE_EMSG("unknown HTU interrupt occurs %8x\n", irq_stat);
-	}
-
-}
-#endif //AMAZON_ATM_DEBUG
-
-#ifdef AMAZON_TPE_TEST_AAL5_INT
-/*
- *	Brief: 		Interrupt handler for AAL5
- *
- *	Parameters:	irq	- CPPN for this interrupt
- *			data	- Device ID for this interrupt
- *			regs	- Register file
- *
- */
-void amazon_atm_aal5_isr(int irq, void *data, struct pt_regs *regs)
-{
-	volatile u32 irq_stat=0;
-
-	// Read interrupt status register
-	irq_stat = readl(AAL5_SISR0_ADDR);
-	if (irq_stat){
-		AMAZON_TPE_EMSG("A5S status: %8x\n",irq_stat);
-		//Clear interrupt in CBM and ICU
-		AMAZON_WRITE_REGISTER_L(SRC_CLRR|SRC_TOS_MIPS | SRC_SRE_ENABLE | AMAZON_AAL5_INT, AAL5_SSRC0_ADDR);
-		mask_and_ack_amazon_irq(AMAZON_AAL5_INT);	
-	}
-	irq_stat = readl(AAL5_RISR0_ADDR);
-	if (irq_stat){
-		AMAZON_TPE_EMSG("A5R status: %8x\n",irq_stat);
-		//Clear interrupt in CBM and ICU
-		AMAZON_WRITE_REGISTER_L(SRC_CLRR|SRC_TOS_MIPS | SRC_SRE_ENABLE | AMAZON_AAL5_INT, AAL5_RSRC0_ADDR);
-		mask_and_ack_amazon_irq(AMAZON_AAL5_INT);	
-	}
-}
-#endif //AMAZON_TPE_TEST_AAL5_INT
-
-/*
- *	Brief: 		Interrupt handler for CBM
- *
- *	Parameters:	irq	- CPPN for this interrupt
- *			data	- Device ID for this interrupt
- *			regs	- Register file
- *
- *	Description:
- *	This is the MIPS interrupt handler for the CBM. It processes incoming cells
- *	for SWIE queues.
- */
-void amazon_atm_cbm_isr(int irq, void *data, struct pt_regs *regs)
-{
-	u32	irq_stat=0;
-	u8 qid=0;
-
-	// Read interrupt status register
-	while ( (irq_stat = readl(CBM_INTINF0_ADDR))){
-		AMAZON_TPE_DMSG("CBM INT status: %8x\n",irq_stat);
-		//Clear interrupt in CBM and ICU
-		AMAZON_WRITE_REGISTER_L(SRC_CLRR|SRC_TOS_MIPS | SRC_SRE_ENABLE | AMAZON_CBM_INT, CBM_SRC0_ADDR);
-		qid = (u8) ((irq_stat & CBM_INTINF0_QID_MASK)>>CBM_INTINF0_QID_SHIFT);
-#ifdef AMAZON_TPE_SCR	
-		if (irq_stat & CBM_INTINF0_EF){
-			amazon_atm_a5r((void*)qid);
-		}
-#endif
-		// Check if Any Cell Arrived
-		if (irq_stat & CBM_INTINF0_ACA) {
-			amazon_atm_swex((void *)irq_stat);		
-		}
-		//TX AAL5 PDU discard
-		if (irq_stat & CBM_INTINF0_OPF){
- 			if ( (qid) < CBM_RX_OFFSET ){
- 				g_atm_dev.mib_counter.tx_drop++;
-			}
-			queue_statics(qid, QS_HW_DROP);
-		}
-		if (irq_stat & (CBM_INTINF0_ERR|CBM_INTINF0_Q0E|CBM_INTINF0_Q0I|CBM_INTINF0_RDE)){
-			AMAZON_TPE_EMSG("CBM INT status: %8x\n",irq_stat);
-			if (irq_stat & CBM_INTINF0_ERR){
-				AMAZON_TPE_EMSG("CBM Error: FPI Bus Error\n");
-			}
-			if (irq_stat & CBM_INTINF0_Q0E){
-				AMAZON_TPE_EMSG("CBM Error: Queue 0 Extract\n");
-			}
-			if (irq_stat & CBM_INTINF0_Q0I){
-				AMAZON_TPE_EMSG("CBM Error: Queue 0 Extract\n");
-			}
-			if (irq_stat & CBM_INTINF0_RDE){
-				AMAZON_TPE_EMSG("CBM Error: Read Empty Queue %u\n",qid);
-				dump_qd(qid);
-			}
-		}		
-	}
-	mask_and_ack_amazon_irq(AMAZON_CBM_INT);
-}
-
-/*	Brief:	check the status word after AAL SDU after reassembly
- */
-static inline void check_aal5_error(u8 stw0, u8 stw1, int qid)
-{
-	if (stw0 & AAL5_STW0_MFL){
-		AMAZON_TPE_DMSG("Maximum Frame Length\n");
-		g_atm_dev.queues[qid].aal5VccOverSizedSDUs++;
-	} 
-	if (stw0 & AAL5_STW0_CRC){
-		AMAZON_TPE_DMSG("CRC\n");
-		g_atm_dev.queues[qid].aal5VccCrcErrors++;
-	}
-#ifdef AMAZON_ATM_DEBUG_RX
-	AMAZON_TPE_EMSG("qid:%u stw0:%8x stw1:%8x\n",qid,stw0,stw1);
-#endif
-}
-
-/* Brief: 	Process DMA rx data
- * Parameters:
- 	dma_dev:	pointer to the dma_device_info, provided by us when register the dma device
- * Return: 	no
- * Description: DMA interrupt handerl with OoS support. It is called when there is some data in rx direction.
- *
- */
-//507261:tc.chen void atm_process_dma_rx(struct dma_device_info* dma_dev)
-void __system atm_process_dma_rx(struct dma_device_info* dma_dev)
-{
-        u8 * head=NULL;
-        u32 length=0;
-        u8 stw0=0;
-        u8 stw1=0;
-
-	struct sk_buff * skb=NULL;
-	struct atm_vcc * vcc=NULL;
-	int qid=0;
-#ifdef AMAZON_ATM_DEBUG_RX
-	static int dma_rx_dump=0;
-	static u32 seq=0;
-	
-	seq++;
-	if (dma_rx_dump>0){
-		printk("\n=========================[%u]=========================\n",seq);
-	}
-#endif	
-	length=dma_device_read(dma_dev,&head,(void**)&skb);
-	AMAZON_TPE_DMSG("receive %8p[%u] from DMA\n", head,length);
-	if (head == NULL||length<=0) {
-		AMAZON_TPE_DMSG("dma_read null \n");
-		goto error_exit;
-	}
-
-	if (length > (g_atm_dev.aal5.rx_max_sdu+64)){
-		AMAZON_TPE_EMSG("received packet too large (%u)\n",length);
-		goto error_exit;
-	}
-	//check AAL5R trail for error and qid
-	//last byte is qid
-	length--;
-	qid = (int) head[length];
-	AMAZON_TPE_DMSG("head[%u] qid %u\n",length, qid);
-	//STW0 is always 4 bytes before qid
-	length -= 4;
-	stw0 = head[length]&0xff;
-	AMAZON_TPE_DMSG("head[%u] stw0 %8x\n",length, stw0);
-	//position of STW1 depends on the BE bits
-	length = length-4 + (stw0&AAL5_STW0_BE);
-	stw1 = head[length]&0xff;
-	AMAZON_TPE_DMSG("head[%u] stw1 %8x\n",length, stw1);	
-	if ( (stw0 & AAL5_STW0_MASK) || (stw1 & AAL5_STW1_MASK) ){
-		//AAL5 Error
-		check_aal5_error(stw0, stw1,qid);		
-		goto error_exit;
-	}
-	//make data pointers consistent
-	//UU + CPI
-	length -= 2;
-	AMAZON_TPE_DMSG("packet length %u\n", length);
-
-	//error: cannot restore the qid
-	if (valid_qid(qid) != 1){
-		AMAZON_TPE_EMSG("received frame in invalid qid %u!\n", qid);
-		goto error_exit;
-	}
-	vcc = g_atm_dev.queues[qid].vcc;
-	if (vcc == NULL){
-		AMAZON_TPE_EMSG("received frame in invalid vcc, qid=%u!\n",qid);
-		goto error_exit;
-	}
-	if (skb == NULL){
-		AMAZON_TPE_EMSG("cannot restore skb pointer!\n");
-		goto error_exit;
-	}
-	skb_put(skb,length);
-	skb->stamp = xtime;
-	g_atm_dev.queues[qid].access_time=xtime;
-	if ((*g_atm_dev.queues[qid].push)(vcc,skb,0)){
-		g_atm_dev.mib_counter.rx_drop++;
-		queue_statics(qid, QS_SW_DROP);					
-	}else{
-		g_atm_dev.mib_counter.rx++;
-		adsl_led_flash();//joelin adsl led
-		queue_statics(qid, QS_PKT);
-		AMAZON_TPE_DMSG("push successful!\n");
-	}
-#ifdef AMAZON_ATM_DEBUG_RX
-	if (dma_rx_dump>0){
-		printk("\nOK packet [dump=%u] length=%u\n",dma_rx_dump,length);
-		dump_skb(length+7, head);
-	}
-	if (dma_rx_dump >0) dma_rx_dump--;
-#endif	
-	return ;
-error_exit:
-#ifdef AMAZON_ATM_DEBUG_RX
-	if ( (head!=NULL) && (length >0)){
-		AMAZON_TPE_EMSG("length=%u\n",length);
-		dump_skb(length+5, head);
-	}	
-	dma_rx_dump++;
-#endif	
-	g_atm_dev.mib_counter.rx_err++;
-	queue_statics(qid, QS_ERR);
-	/*
-	if (vcc){
-		(*g_atm_dev.queues[qid].push)(vcc,skb,1);	
-	}
-	*/
-	if (skb != NULL) {
-		dev_kfree_skb_any(skb);
-	}
-	return;
-}
-
-/*Brief:	ISR for DMA pseudo interrupt
- *Parameter:
- 	dma_dev:	pointer to the dma_device_info, provided by us when register the dma device
- 	intr_status:	
- 		RCV_INT:		rx data available
- 		TX_BUF_FULL_INT:	tx descriptor run out of
- 		TRANSMIT_CPT_INT:	tx descriptor available again
- *Return:
- 	0 for success???
- */
-//507261:tc.chen int amazon_atm_dma_handler(struct dma_device_info* dma_dev, int intr_status)
-int __system amazon_atm_dma_handler(struct dma_device_info* dma_dev, int intr_status)
-{
-	AMAZON_TPE_DMSG("status:%u\n",intr_status);
-	switch (intr_status) {
-		case RCV_INT:
-			atm_process_dma_rx(dma_dev);
-			break;
-		case TX_BUF_FULL_INT:
-			//TX full: no descriptors
-			atm_dma_full();
-			break;
-		case TRANSMIT_CPT_INT:
-			//TX free: at least one descriptor
-			atm_dma_free();
-			break;
-		default:
-			AMAZON_TPE_EMSG("unknown status!\n");
-	}
-	return 0;
-}
-
-/*Brief:	free buffer for DMA tx
- *Parameter:
- 	dataptr:	pointers to data buffer
- 	opt:		optional parameter, used to convey struct skb pointer, passwd in dma_device_write
- *Return:
- 	0 for success???
- *Description:
- 	called by DMA module to release data buffer after DMA tx transaction
- *Error:
- 	cannot restore skb pointer
- */
-int amazon_atm_free_tx(u8*dataptr, void* opt)
-{
-	struct sk_buff *skb;
-	if (opt){
-		AMAZON_TPE_DMSG("free skb%8p\n",opt);
-		skb = (struct sk_buff *)opt;
-		amazon_atm_free_tx_skb(skb);
-	}else{
-		AMAZON_TPE_EMSG("BUG: cannot restore skb pointer!\n");
-	}
-	return 0;
-}
-
-/*Brief:	allocate buffer & do alignment
- */
-inline struct sk_buff * amazon_atm_alloc_buffer(int len)
-{
-	struct sk_buff *skb;
-	skb = dev_alloc_skb(len+16);
-	if (skb){
-		//alignment requriements (4x32 bits (16 bytes) boundary)
-		alloc_align_16(skb);
-	}
-	return skb;
-}
-
-/*Brief:	allocate buffer for DMA rx
- *Parameter:
- 	len: length
- 	opt: optional data to convey the skb pointer, which will be returned to me in interrupt handler,
- *Return:
- 	pointer to buffer, NULL means error?
- *Description:
- 	must make sure byte alignment
- */
- 	
-u8* amazon_atm_alloc_rx(int len, int* offset, void **opt)
-{
-	struct sk_buff *skb;
-	*offset = 0;
-	skb = amazon_atm_alloc_buffer(len);
-	if (skb){
-		AMAZON_TPE_DMSG("alloc skb->data:%8p len:%u\n",skb->data,len);
-		*(struct sk_buff**)opt = skb;
-	}else{
-		AMAZON_TPE_DMSG("no memory for receiving atm frame!\n");
-		return NULL;
-	}
-	return skb->data;
-}
-
-
-
-
-/* Brief:	Allocate kernel memory for sending a datagram.
- * Parameters
- *	vcc	virtual connection
- *	size	data buffer size
- * Return:
- *	NULL	fail
- *	sk_buff	a pointer to a sk_buff
- * Description:
- *  This function can allocate our own additional memory for AAL5S inbound
- * header (8bytes). We have to replace the protocol default one (alloc_tx in /net/atm/common.c) 
- * when we open the device.
- * byte alignment is done is DMA driver.
- */
-struct sk_buff *amazon_atm_alloc_tx(struct atm_vcc *vcc,unsigned int size)
-{
-	struct sk_buff *skb;
-
-	if (!dma_may_send(DMA_TX_CH0)){
-		AMAZON_TPE_EMSG("no DMA descriptor available!\n");
-		return NULL;
-	}
-	//AAL5 inbound header space + alignment extra buffer
-	size+=8+AAL5S_INBOUND_HEADER;
-
-        if (atomic_read(&vcc->tx_inuse) && !atm_may_send(vcc,size)) {
-                AMAZON_TPE_EMSG("Sorry tx_inuse = %u, size = %u, sndbuf = %u\n",
-                    atomic_read(&vcc->tx_inuse),size,vcc->sk->sndbuf);
-                return NULL;
-        }
-
-        skb = amazon_atm_alloc_buffer(size);
-	if (skb == NULL){
-		AMAZON_TPE_EMSG("no memory\n");
-		return NULL;
-	}
-	AMAZON_TPE_DMSG("dev_alloc_skb(%u) = %x\n", skb->len, (u32)skb);
-        AMAZON_TPE_DMSG("tx_inuse %u += %u\n",atomic_read(&vcc->tx_inuse),skb->truesize);
-        atomic_add(skb->truesize+ATM_PDU_OVHD,&vcc->tx_inuse);
-
-	//reserve for AAL5 inbound header
-	skb_reserve(skb,AAL5S_INBOUND_HEADER);
-        return skb;
-}
-
-
-/* Brief:	change per queue QSB setting according to vcc qos parameters
- * Paramters:
- *	vcc:	atm_vcc pointer 
- *	qid:	CBM queue id (1~15)
- * Return:
-  */
-static inline void set_qsb(struct atm_vcc *vcc, struct atm_qos *qos, int qid)
-{
-	qsb_qptl_t	qptl;
-	qsb_qvpt_t	qvpt;
-	u32 tmp=0;
-	unsigned int qsb_clk;
-	
-	qsb_clk = amazon_get_fpi_hz()>>1;
-        
-	AMAZON_TPE_EMSG("Class=%u MAX_PCR=%u PCR=%u MIN_PCR=%u SCR=%u MBS=%u CDV=%u\n"
-		,qos->txtp.traffic_class
-		,qos->txtp.max_pcr
-		,qos->txtp.pcr
-		,qos->txtp.min_pcr
-		,qos->txtp.scr
-		,qos->txtp.mbs
-		,qos->txtp.cdv
-		);
-	
-	// PCR limiter
-	if (qos->txtp.max_pcr == 0){	
-		qptl.bit.tprs = 0;                  /* 0 disables the PCR limiter */
-	}else {
-		// peak cell rate will be slightly lower than requested	(maximum rate / pcr)= (qsbclock/2^3 * timestep/4)/pcr
-		tmp = (( (qsb_clk * g_atm_dev.qsb.tstepc)>>5)/ qos->txtp.max_pcr ) + 1;
-		// check if an overfow occured
-		if (tmp > QSB_TP_TS_MAX) {
-			AMAZON_TPE_EMSG("max_pcr is too small, max_pcr:%u tprs:%u\n",qos->txtp.max_pcr, tmp);
-		  	qptl.bit.tprs = QSB_TP_TS_MAX;
-		}else{
-			qptl.bit.tprs = tmp;
-		}
-	}
-	//WFQ
-	if (qos->txtp.traffic_class == ATM_CBR  || qos->txtp.traffic_class ==ATM_VBR_RT){
-		// real time queue gets weighted fair queueing bypass
-		qptl.bit.twfq  = 0;
-	}else if (qos->txtp.traffic_class ==ATM_VBR_NRT ||qos->txtp.traffic_class ==ATM_UBR_PLUS ){
-		// wfq calculation here are based on virtual cell rates, to reduce granularity for large rates
-		// wfq factor is maximum cell rate / garenteed cell rate.
-		//qptl.bit.twfq = g_atm_dev.qsb.min_cr * QSB_WFQ_NONUBR_MAX / qos->txtp.min_pcr;
-		if (qos->txtp.min_pcr == 0) {
-			AMAZON_TPE_EMSG("<warning> MIN_PCR should not be zero\n");
-			qptl.bit.twfq = QSB_WFQ_NONUBR_MAX;
-		}else{
-			tmp = QSB_GCR_MIN * QSB_WFQ_NONUBR_MAX / qos->txtp.min_pcr;		
-			if (tmp == 0 ){
-				qptl.bit.twfq = 1;
-			}else if (tmp > QSB_WFQ_NONUBR_MAX){
-				AMAZON_TPE_EMSG("min_pcr is too small, min_pcr:%u twfq:%u\n",qos->txtp.min_pcr, tmp);
-				qptl.bit.twfq = QSB_WFQ_NONUBR_MAX;
-			}else{
-				qptl.bit.twfq = tmp;	
-			}
-		}
-	}else if (qos->txtp.traffic_class == ATM_UBR){
-		// ubr bypass, twfq set to maximum value
-		qptl.bit.twfq = QSB_WFQ_UBR_BYPASS;
-	}else{
-		//tx is diabled, treated as UBR
-		AMAZON_TPE_EMSG("<warning> unsupported traffic class %u \n", qos->txtp.traffic_class);
-		qos->txtp.traffic_class = ATM_UBR;
-		qptl.bit.twfq = QSB_WFQ_UBR_BYPASS;
-	}
-	
-	//SCR Leaky Bucket Shaper VBR.0/VBR.1
-	if (qos->txtp.traffic_class ==ATM_VBR_RT || qos->txtp.traffic_class ==ATM_VBR_NRT){
-		if (qos->txtp.scr == 0){
-			//SCR == 0 disable the shaper
-			qvpt.bit.ts = 0;
-			qvpt.bit.taus = 0;
-		}else{
-			//CLP
-			if (vcc->atm_options&ATM_ATMOPT_CLP){
-				//CLP1
-				qptl.bit.vbr = 1;
-			}else{
-				//CLP0
-				qptl.bit.vbr = 0;
-			}
-			//TS and TauS
-			tmp = (( (qsb_clk * g_atm_dev.qsb.tstepc)>>5)/ qos->txtp.scr ) + 1;
-			if (tmp > QSB_TP_TS_MAX) {
-				AMAZON_TPE_EMSG("scr is too small, scr:%u ts:%u\n",qos->txtp.scr, tmp);
-				qvpt.bit.ts = QSB_TP_TS_MAX;
-			}else{
-				qvpt.bit.ts = tmp;
-			}
-			tmp = (qos->txtp.mbs - 1)*(qvpt.bit.ts - qptl.bit.tprs)/64;
-			if (tmp > QSB_TAUS_MAX){
-				AMAZON_TPE_EMSG("mbs is too large, mbr:%u taus:%u\n",qos->txtp.mbs, tmp);
-				qvpt.bit.taus = QSB_TAUS_MAX;
-			}else if (tmp == 0){
-				qvpt.bit.taus = 1;
-			}else{
-				qvpt.bit.taus = tmp;
-			}
-		}
-	}else{
-		qvpt.w0 = 0;
-	}
-	//write the QSB Queue Parameter Table (QPT)
-	AMAZON_WRITE_REGISTER_L(QSB_QPT_SET_MASK,QSB_RTM_ADDR);
-	AMAZON_WRITE_REGISTER_L(qptl.w0, QSB_RTD_ADDR);
-	AMAZON_WRITE_REGISTER_L((QSB_TABLESEL_QPT<<QSB_TABLESEL_SHIFT)
-		| QSB_RAMAC_REG_LOW
-		| QSB_WRITE
-		| qid
-		,QSB_RAMAC_ADDR);
-	//write the QSB Queue VBR Parameter Table (QVPT)
-	AMAZON_WRITE_REGISTER_L(QSB_QVPT_SET_MASK,QSB_RTM_ADDR);
-	AMAZON_WRITE_REGISTER_L(qvpt.w0, QSB_RTD_ADDR);
-	AMAZON_WRITE_REGISTER_L((QSB_TABLESEL_QVPT<<QSB_TABLESEL_SHIFT)
-		| QSB_RAMAC_REG_LOW
-		| QSB_WRITE
-		| qid
-		,QSB_RAMAC_ADDR);	
-	AMAZON_TPE_EMSG("tprs:%u twfq:%u ts:%u taus:%u\n",qptl.bit.tprs,qptl.bit.twfq,qvpt.bit.ts,qvpt.bit.taus);
-}
-
-/* 
- * Brief:	create/change CBM queue descriptor
- * Parameter:	
- *	vcc:	atm_vcc pointer 
- *	qid:	CBM queue id (1~15)
- */
-static inline void set_qd(struct atm_vcc *vcc, u32 qid)
-{
-	u32 tx_config=0,rx_config=0;
-	u32 itf = (u32) vcc->itf;
-	u32 dma_qos=0;
-	u8 * qd_addr=NULL;
-		
-	tx_config|=CBM_QD_W3_WM_EN|CBM_QD_W3_CLPt;
-	//RT: check if the connection is a real time connection
-	if (vcc->qos.txtp.traffic_class == ATM_CBR || vcc->qos.txtp.traffic_class == ATM_VBR_RT){
-		tx_config|= CBM_QD_W3_RT;
-	}else{
-		tx_config|= CBM_QD_W3_AAL5; //don't set the AAL5 flag if it is a RT service
-	}
-	rx_config = tx_config;
-	
-	if(vcc->qos.aal == ATM_AAL5){	
-		//QoS: DMA QoS according to the traffic class
-		switch (vcc->qos.txtp.traffic_class){
-			case ATM_CBR: dma_qos = CBR_DMA_QOS;break;
-			case ATM_VBR_RT: dma_qos = VBR_RT_DMA_QOS;break;
-			case ATM_VBR_NRT: dma_qos = VBR_NRT_DMA_QOS;break;
-			case ATM_UBR_PLUS: dma_qos = UBR_PLUS_DMA_QOS;break;
-			case ATM_UBR: dma_qos = UBR_DMA_QOS;break;
-		}
-	
-		//TX: upstream, AAL5(EPD or PPD), NOINT, SBid
-		tx_config |= CBM_QD_W3_DIR_UP|CBM_QD_W3_INT_NOINT|(itf&CBM_QD_W3_SBID_MASK);
-		//RX: DMA QoS, downstream, no interrupt, AAL5(EPD, PPD), NO INT, HCR
-#ifdef AMAZON_TPE_SCR
-		rx_config |= dma_qos|CBM_QD_W3_DIR_DOWN|CBM_QD_W3_INT_EOF;
-#else		
-		rx_config |= dma_qos|CBM_QD_W3_DIR_DOWN|CBM_QD_W3_INT_NOINT|CBM_QD_W3_HCR;
-#endif		
-	}else {
-		//should be AAL0	
-		//upstream, NOINT, SBid
-		tx_config |= CBM_QD_W3_DIR_UP|CBM_QD_W3_INT_NOINT|(itf&CBM_QD_W3_SBID_MASK);
-		//RX: downstream, ACA interrupt, 
-		rx_config |= CBM_QD_W3_DIR_DOWN|CBM_QD_W3_INT_ACA;
-	}
-
-	//Threshold: maximum threshold for tx/rx queue, which is adjustable in steps of 64 cells
-	tx_config |=	( (divide_by_64_round_up(tx_q_threshold)&0xffff)<<CBM_QD_W3_THRESHOLD_SHIFT) & CBM_QD_W3_THRESHOLD_MASK;
-	rx_config |=	( (divide_by_64_round_up(rx_q_threshold)&0xffff)<<CBM_QD_W3_THRESHOLD_SHIFT) & CBM_QD_W3_THRESHOLD_MASK;
-	
-	qd_addr = (u8*) KSEG1ADDR((unsigned long)g_atm_dev.cbm.qd_addr);
-	//TX
-	AMAZON_WRITE_REGISTER_L(tx_config, (qd_addr+qid*CBM_QD_SIZE + 0xc));
-	AMAZON_WRITE_REGISTER_L(0, (qd_addr+qid*CBM_QD_SIZE + 0x8));
-	//RX
-	AMAZON_WRITE_REGISTER_L(rx_config, (qd_addr+(qid+CBM_RX_OFFSET)*CBM_QD_SIZE + 0xc));
-	AMAZON_WRITE_REGISTER_L(0, (qd_addr+(qid+CBM_RX_OFFSET)*CBM_QD_SIZE + 0x8));
-}
-/*
- * Brief:	add HTU table entry
- * Parameter:	
- *	vpi.vci:
- *	qid:	CBM queue id (DEST is qid + CBM_RX_OFFSET)
- *	idx:	entry id (starting from zero to 14)
- * Return:
- *	0:	sucessful
- *	EIO:	HTU table entry cannot be written
- */
-
-inline int set_htu_entry(u8 vpi, u16 vci, u8 qid, u8 idx)
-{
-	int i = 0;
-	u32 tmp1=0;
-	while ((tmp1 = readl(HTU_RAMSTAT_ADDR))!=0 && i < 1024) i++;
-	if (i > 1024)
-	{
-		AMAZON_TPE_EMSG("timeout\n");
-		return -EIO;
-	}
-	// write address register,
-	AMAZON_WRITE_REGISTER_L(idx, HTU_RAMADDR_ADDR);
-	// configure transmit queue
-	tmp1 = vpi<<24|vci<<8;
-	tmp1|= 	HTU_RAMDAT1_VCON	// valid connection the entry is not validated here !!!!!!!!!!!!!!!!
-		|HTU_RAMDAT1_VCI3	// vci3 -> oam queue
-		|HTU_RAMDAT1_VCI4	// vci4 -> oam queue
-		|HTU_RAMDAT1_VCI6	// vci6 -> rm queue
-		|HTU_RAMDAT1_PTI4	// pti4 -> oam queue
-		|HTU_RAMDAT1_PTI5;	// pti5 -> oam queue
-
-	// ramdat 1 (in params & oam handling)
-	AMAZON_WRITE_REGISTER_L( tmp1, HTU_RAMDAT1_ADDR);
-	// ramdat 2 (out params & oam handling)
-	tmp1 = ((qid+CBM_RX_OFFSET)&HTU_RAMDAT2_QID_MASK)
-		|HTU_RAMDAT2_PTI6
-		|HTU_RAMDAT2_PTI7
-		|HTU_RAMDAT2_F4U
-		|HTU_RAMDAT2_F5U
-		;
-	AMAZON_WRITE_REGISTER_L( tmp1, HTU_RAMDAT2_ADDR);
-	wmb();
-	// write HTU entry
-	AMAZON_WRITE_REGISTER_L(HTU_RAMCMD_WR, HTU_RAMCMD_ADDR);
-	return 0;
-}
-/*
- * Brief:	add HTU table entry
- * Parameter:	
- *	vcc:	atm_vcc pointer
- *	qid:	CBM queue id
- * Return:
- *	0:	sucessful
- *	EIO:	HTU table entry cannot be written
- */
-inline static int set_htu(struct atm_vcc *vcc, u32 qid)
-{
-	return set_htu_entry(vcc->vpi, vcc->vci, qid, (qid - CBM_DEFAULT_Q_OFFSET));
-}
-
-/* 
- * Brief:	allocate a queue
- * Return:	
- *		<=0	no available queues
- *		>0	qid
- */
-static int atm_allocate_q(short itf)
-{
-	int i;
-	u32 tmp1=0;
-	int qid=0;
-	amazon_atm_port_t * dev;
-	dev = &g_atm_dev.ports[itf];
-	//find start queue id for this interface
-	for (i=0; i< itf; i++)
-	{
-		qid+= g_atm_dev.ports[i].max_conn;
-	}
-	// apply default queue offset ( oam, free cell queue, others, rm )
-	qid += CBM_DEFAULT_Q_OFFSET;
-	tmp1 = qid;
-	// search for a free queue
-	while (	(qid<tmp1+dev->max_conn)
-		&& ( g_atm_dev.queues[qid].free != 1)) {
-		qid++;;
-	}
-	// if none was found, send failure message and return
-	if ( tmp1+dev->max_conn == qid)
-	{
-		return -EFAULT;
-	}
-	return qid;
-	
-}
-/* Brief:	open a aal5 or aal0 connection
- */
-static int atm_open(struct atm_vcc *vcc, push_back_t push)
-{
-	int err=0;
-	int qid=0;
-	amazon_atm_port_t * port = & g_atm_dev.ports[vcc->itf];
-	unsigned long flags;
-	/***************** check bandwidth ******************/
-	/* 511045:linmars change ATM_VBR_NRT to use scr instead of pcr */
-	if ((vcc->qos.txtp.traffic_class==ATM_CBR&&vcc->qos.txtp.max_pcr>port->tx_rem_cr)
-	||(vcc->qos.txtp.traffic_class==ATM_VBR_RT&&vcc->qos.txtp.max_pcr>port->tx_rem_cr)
-	||(vcc->qos.txtp.traffic_class==ATM_VBR_NRT&&vcc->qos.txtp.scr>port->tx_rem_cr) 
-	||(vcc->qos.txtp.traffic_class==ATM_UBR_PLUS&&vcc->qos.txtp.min_pcr>port->tx_rem_cr)
-	) {
-                AMAZON_TPE_EMSG("not enough bandwidth left (%u) cells per seconds \n",port->tx_rem_cr);
-                return -EINVAL;
-	}
-	if ( (qid = amazon_atm_find_vpivci(vcc->vpi, vcc->vci)) >0 ){
-		AMAZON_TPE_EMSG("vpi:%u vci:%u is alreay open on queue:%u\n", vcc->vpi, vcc->vci, qid);
-		return -EADDRINUSE;
-	}
-
-	/***************** allocate entry queueID for this port *****************/
-	if ( (qid=atm_allocate_q(vcc->itf)) <= 0){
-		AMAZON_TPE_EMSG("port: %u max:%u qid: %u\n", vcc->itf, port->max_conn, qid);
-		AMAZON_TPE_EMSG("no availabel connections for this port:%u\n",vcc->itf);
-		return -EINVAL;
-	}
-	/**************QSB parameters and CBM descriptors*************/
-	set_qsb(vcc, &vcc->qos, qid);
-	set_qd(vcc, qid);
-	mb();
-	err=set_htu(vcc,qid);
-	if (err){
-		AMAZON_TPE_EMSG("set htu entry fails %u\n",err);
-		return err;
-	}
-	/************set internal mapping*************/
-	local_irq_save(flags);
-	g_atm_dev.queues[qid].free = 0;
-	g_atm_dev.queues[qid].vcc = vcc;
-	g_atm_dev.queues[qid].push = push;
-	g_atm_dev.queues[qid+CBM_RX_OFFSET].free = 0;
-	g_atm_dev.queues[qid+CBM_RX_OFFSET].vcc = vcc;
-	g_atm_dev.queues[qid+CBM_RX_OFFSET].push = push;
-	/******************reserve bandwidth**********************/
-	if (vcc->qos.txtp.traffic_class == ATM_CBR){
-		//CBR, real time connection, reserve PCR
-		port->tx_cur_cr += vcc->qos.txtp.max_pcr;
-		port->tx_rem_cr -= vcc->qos.txtp.max_pcr;
-	}else if (vcc->qos.txtp.traffic_class == ATM_VBR_RT){
-		//VBR_RT, real time connection, reserve PCR
-		port->tx_cur_cr += vcc->qos.txtp.max_pcr;
-		port->tx_rem_cr -= vcc->qos.txtp.max_pcr;
-	}else if (vcc->qos.txtp.traffic_class == ATM_VBR_NRT){
-		//VBR_NRT, reserve SCR
-		port->tx_cur_cr += vcc->qos.txtp.pcr;
-		port->tx_rem_cr -= vcc->qos.txtp.pcr;
-	}else if (vcc->qos.txtp.traffic_class == ATM_UBR_PLUS){
-		//UBR_PLUS, reserve MCR
-		port->tx_cur_cr += vcc->qos.txtp.min_pcr;
-		port->tx_rem_cr -= vcc->qos.txtp.min_pcr;
-	}
-	local_irq_restore(flags);
-	return err;
-}
-/* Brief: 	Open ATM connection
- * Parameters: 	atm_vcc	- Pointer to VCC data structure
- *		vpi	- VPI value for new connection
- *		vci	- VCI value for new connection
- *
- * Return: 	0 	- sucessful
- * 		-ENOMEM	- No memory available
- *		-EINVAL	- No bandwidth/queue/ or unsupported AAL type
- * Description:
- *	This function opens an ATM connection on a specific device/interface
- *
- */
-int	amazon_atm_open(struct atm_vcc *vcc,push_back_t push)
-{
-	int err=0;
-
-	AMAZON_TPE_DMSG("vpi %u vci %u  itf %u aal %u\n"
-		,vcc->vpi
-		,vcc->vci
-		,vcc->itf
-		,vcc->qos.aal
-		);
-		
-	AMAZON_TPE_DMSG("tx cl %u bw %u mtu %u\n"
-		,vcc->qos.txtp.traffic_class
-		,vcc->qos.txtp.max_pcr
-		,vcc->qos.txtp.max_sdu
-		);
-	AMAZON_TPE_DMSG("rx cl %u bw %u mtu %u\n"
-		,vcc->qos.rxtp.traffic_class
-		,vcc->qos.rxtp.max_pcr
-		,vcc->qos.rxtp.max_sdu
-		);
-	if (vcc->qos.aal == ATM_AAL5 || vcc->qos.aal == ATM_AAL0){
-		err = atm_open(vcc,push);
-	}else{
-		AMAZON_TPE_EMSG("unsupported aal type %u\n", vcc->qos.aal);
-		err = -EPROTONOSUPPORT;
-	};
-	if (err == 0 ){
-		//replace the default memory allocation function with our own
-		vcc->alloc_tx = amazon_atm_alloc_tx;
-		set_bit(ATM_VF_READY,&vcc->flags);
-	}
-	return err;
-}
-
-/* Brief: 	Send ATM OAM cell
- * Parameters: 	atm_vcc	- Pointer to VCC data structure
- *		skb	- Pointer to sk_buff structure, that contains the data
- * Return: 	0 		- sucessful
- * 		-ENOMEM		- No memory available
- *		-EINVAL		- Not supported
- * Description:
- * This function sends a cell over and ATM connection
- * We always release the skb
- * TODO: flags handling (ATM_OF_IMMED, ATM_OF_INRATE)
- */
-int	amazon_atm_send_oam(struct atm_vcc *vcc, void * cell, int flags)
-{
-	int err=0;
-	int qid=0;
-	struct amazon_atm_cell_header * cell_header;
-	// Get cell header
-	cell_header = (struct amazon_atm_cell_header*) cell;
-	if ((cell_header->bit.pti == ATM_PTI_SEGF5) || (cell_header->bit.pti == ATM_PTI_E2EF5)) {
-		qid = amazon_atm_find_vpivci( cell_header->bit.vpi, cell_header->bit.vci);
-	}else if (cell_header->bit.vci == 0x3 || cell_header->bit.vci == 0x4) {
-		//507281:tc.chen qid = amazon_atm_find_vpi((int) cell_header->bit.vpi);
-		// 507281:tc.chen start
-		u8 f4_vpi;
-		f4_vpi = cell_header->bit.vpi;
-		qid = amazon_atm_find_vpi(f4_vpi );
-		// 507281:tc.chen end
-	}else{
-		//non-OAM cells, always invalid
-		qid = -EINVAL;
-	}
-	if (qid == -EINVAL) {
-		err =  -EINVAL;
-		AMAZON_TPE_EMSG("not valid AAL0 packet\n");
-	}else{
-		//send the cell using swie
-#ifdef TPE_LOOPBACK
-		err = amazon_atm_swin(AMAZON_ATM_OAM_Q_ID, cell);
-#else		
-		err = amazon_atm_swin(qid, cell);
-#endif
-	}
-	//kfree(cell);
-	return err;
-}
-
-/* Brief: 	Send AAL5 frame through DMA
- * Parameters: 	vpi	- virtual path id 
- *		vci	- virtual circuit id
- *		clp	- cell loss priority
- *		qid	- CBM queue to be sent to
- *		skb	- packet to be sent
- * Return: 	0 		- sucessful
- * 		-ENOMEM		- No memory available
- *		-EINVAL		- Not supported
- * Description:
- * This function sends a AAL5 frame over and ATM connection
- * 	1. make sure that the data is aligned to 4x32-bit boundary
- *	2. provide the inbound data (CPCS-UU and CPI, not used here)
- *	3. set CLPn
- *	4. send the frame by DMA
- *	5. release the buffer ???
- ** use our own allocation alloc_tx
- ** we make sure the alignment and additional memory
- *** we always release the skb
-
- */
-int amazon_atm_dma_tx(u8 vpi, u16 vci, u8 clp, u8 qid, struct sk_buff *skb) 
-{
-     	int err=0,need_pop=1;
-	u32 * data=NULL;
-	int nwrite=0;
-	struct sk_buff *skb_tmp;
-	u32 len=skb->len;	
-
-	//AAL5S inbound header 8 bytes
-	if (skb->len > g_atm_dev.aal5.tx_max_sdu - AAL5S_INBOUND_HEADER) {
-		AMAZON_TPE_DMSG("tx_max_sdu:%u\n",g_atm_dev.aal5.tx_max_sdu); 
-		AMAZON_TPE_DMSG("skb too large [%u]!\n",skb->len);
-		err = -EMSGSIZE;
-		goto atm_dma_tx_error_exit;
-	}
-	
-	//Check the byte alignment requirement and header space
-	if ( ( ((u32)(skb->data)%16) !=AAL5S_INBOUND_HEADER)|| (skb_headroom(skb)<AAL5S_INBOUND_HEADER)){
-		//not aligned or no space for header, fall back to memcpy
-		skb_tmp = dev_alloc_skb(skb->len+16);
-		if (skb_tmp==NULL){
-			err = - ENOMEM;			
-			goto atm_dma_tx_error_exit;	
-		}
-		alloc_align_16(skb_tmp);
-		g_atm_dev.aal5.cnt_cpy++;
-		skb_reserve(skb_tmp,AAL5S_INBOUND_HEADER);
-		memcpy(skb_put(skb_tmp,skb->len), skb->data, skb->len);
-		amazon_atm_free_tx_skb(skb);
-		need_pop=0;
-		skb = skb_tmp;
-	}
-	//Provide AAL5S inbound header
-	data = (u32 *)skb_push(skb,8);
-	data[0] = __be32_to_cpu(vpi<<20|vci<<4|clp);
-	data[1] = __be32_to_cpu(g_atm_dev.aal5.padding_byte<<8|qid);
-	
-	len = skb->len;
-
-	//send through DMA
-	AMAZON_TPE_DMSG("AAL5S header 0 %8x\n", data[0]);
-	AMAZON_TPE_DMSG("AAL5S header 0 %8x\n", data[1]);
-	AMAZON_TPE_DMSG("about to call dma_write len: %u\n", len);
-	nwrite=dma_device_write( &g_dma_dev,skb->data,len,skb);
-	if (nwrite != len) {
-		//DMA descriptors full
-//		AMAZON_TPE_EMSG("AAL5 packet drop due to DMA nwrite:%u skb->len:%u\n", nwrite,len);
-		AMAZON_TPE_DMSG("AAL5 packet drop due to DMA nwrite:%u skb->len:%u\n", nwrite,len);
-		err = -EAGAIN;
-		goto atm_dma_tx_drop_exit;
-	}
-	AMAZON_TPE_DMSG("just finish call dma_write\n");
-	//release in the "dma done" call-back
-	return 0;
-atm_dma_tx_error_exit:
-	g_atm_dev.mib_counter.tx_err++;	
-	queue_statics(qid, QS_ERR);
-	goto atm_dma_tx_exit;
-	
-atm_dma_tx_drop_exit:
-	g_atm_dev.mib_counter.tx_drop++;
-	queue_statics(qid, QS_SW_DROP);
-atm_dma_tx_exit:
-	if (need_pop){
-		amazon_atm_free_tx_skb(skb);
-	}else{
-		dev_kfree_skb_any(skb);
-	}
-	return err;
-}
-
-/* Brief: 	Send AAL0/AAL5 packet
- * Parameters: 	atm_vcc	- Pointer to VCC data structure
- *		skb	- Pointer to sk_buff structure, that contains the data
- * Return: 	0 		- sucessful
- * 		-ENOMEM		- No memory available
- *		-EINVAL		- Not supported
- * Description:
- *	See amazon_atm_dma_tx
- */
-int	amazon_atm_send(struct atm_vcc *vcc,struct sk_buff *skb)
-{
-	int qid=0;
-	u8 clp=0;
-        int err=0;
-	u32 wm=0;
-
-	if (vcc == NULL || skb == NULL){
-		AMAZON_TPE_EMSG("invalid parameter\n");
-		return -EINVAL;
-	}
-	ATM_SKB(skb)->vcc = vcc;
-	qid = amazon_atm_get_queue(vcc);
-	if (valid_qid(qid) != 1) {
-		AMAZON_TPE_EMSG("invalid vcc!\n");
-		err = -EINVAL;
-		goto atm_send_err_exit;
-	}
-	
-	//Send AAL0 using SWIN
-	if (vcc->qos.aal == ATM_AAL0){
-#ifdef  TPE_LOOPBACK
-		err=amazon_atm_swin((qid+CBM_RX_OFFSET), skb->data);	
-#else
-		err=amazon_atm_swin(qid, skb->data);
-#endif
-		if (err){
-			goto atm_send_err_exit;
-		}	
-		goto atm_send_exit;
-	}
-	
-	//Should be AAl5
-	//MIB counter
-	g_atm_dev.mib_counter.tx++;
-	adsl_led_flash();//joelin adsl led
-	queue_statics(qid, QS_PKT);
-
-#ifdef AMAZON_CHECK_LINK
-	//check adsl link 
-	if (adsl_link_status == 0){
-		//link down
-		AMAZON_TPE_DMSG("ADSL link down, discarded!\n");
-		err=-EFAULT;
-		goto atm_send_drop_exit;
-	}
-#endif
-	clp = (vcc->atm_options&ATM_ATMOPT_CLP)?1:0;
-	//check watermark first
-	wm = readl(CBM_WMSTAT0_ADDR);
-	if (  (wm & (1<<qid))
-	    ||( (vcc->qos.txtp.traffic_class != ATM_CBR
-	         &&vcc->qos.txtp.traffic_class != ATM_VBR_RT) 
-		&(wm & (CBM_WM_NRT_MASK | (clp&CBM_WM_CLP1_MASK)) ))){
-		//wm hit: discard
-		AMAZON_TPE_DMSG("watermark hit, discarded!\n");
-		err=-EFAULT;
-		goto atm_send_drop_exit;
-	}
-#ifdef  TPE_LOOPBACK
-	return amazon_atm_dma_tx(vcc->vpi, vcc->vci,clp, (qid+CBM_RX_OFFSET),skb);
-#else	
-	return amazon_atm_dma_tx(vcc->vpi, vcc->vci,clp, qid,skb);
-#endif
-
-atm_send_exit:	
-	amazon_atm_free_tx_skb_vcc(vcc,skb);	
-	return 0;
-	
-atm_send_drop_exit:
-	g_atm_dev.mib_counter.tx_drop++;
-	queue_statics(qid,QS_SW_DROP);
-atm_send_err_exit:	
-	amazon_atm_free_tx_skb_vcc(vcc,skb);
-	return err;
-}
-
-/* Brief:	Return ATM port related MIB
- * Parameter:	interface number
- 	 atm_cell_ifEntry_t
- */
-int amazon_atm_cell_mib(atm_cell_ifEntry_t* to,u32 itf)
-{
-	g_atm_dev.mib_counter.htu_unp += readl(HTU_MIBCIUP);
-	to->ifInUnknownProtos = g_atm_dev.mib_counter.htu_unp;
-#ifdef AMAZON_TPE_READ_ARC
-	u32 reg_val=0;
-	meiDebugRead((AR_CELL0_ADDR+itf*4),&reg_val,1);
-	g_atm_dev.mib_counter.rx_cells += reg_val;
-	reg_val=0;
-	meiDebugWrite((AR_CELL0_ADDR+itf*4),&reg_val,1);
-	to->ifHCInOctets_h = (g_atm_dev.mib_counter.rx_cells * 53)>>32;
-	to->ifHCInOctets_l = (g_atm_dev.mib_counter.rx_cells * 53) & 0xffff;
-	
-	meiDebugRead((AT_CELL0_ADDR+itf*4),&reg_val,1);
-	g_atm_dev.mib_counter.tx_cells += reg_val;
-	reg_val=0;
-	meiDebugWrite((AT_CELL0_ADDR+itf*4),&reg_val,1);
-	to->ifHCOutOctets_h = (g_atm_dev.mib_counter.tx_cells * 53)>>32;
-	to->ifHCOutOctets_l = (g_atm_dev.mib_counter.rx_cells * 53) & 0xffff;
-	
-	meiDebugRead((AR_CD_CNT0_ADDR+itf*4),&reg_val,1);
-	g_atm_dev.mib_counter.rx_err_cells += reg_val;
-	reg_val=0;
-	meiDebugWrite((AR_CD_CNT0_ADDR+itf*4),&reg_val,1);
-	to->ifInErrors = g_atm_dev.mib_counter.rx_err_cells;
-	
-	to->ifOutErrors = 0;
-#else
-	to->ifHCInOctets_h = 0;
-	to->ifHCInOctets_l = 0;
-	to->ifHCOutOctets_h = 0;
-	to->ifHCOutOctets_l = 0;
-	to->ifInErrors = 0;
-	to->ifOutErrors = 0;
-#endif
-	return 0;
-}
-
-/* Brief:	Return ATM AAL5 related MIB
- * Parameter:
- 	 atm_aal5_ifEntry_t
- */
-int amazon_atm_aal5_mib(atm_aal5_ifEntry_t* to)
-{
-	u32 reg_l,reg_h;
-	//AAL5R	received Octets from ATM
-	reg_l = readl(AAL5_RIOL_ADDR);
-	reg_h = readl(AAL5_RIOM_ADDR);
-	g_atm_dev.mib_counter.rx_cnt_h +=reg_h;
-	if (reg_l + g_atm_dev.mib_counter.rx_cnt_l < reg_l){
-		g_atm_dev.mib_counter.rx_cnt_h++;
-	}
-	
-	g_atm_dev.mib_counter.rx_cnt_l+= reg_l;
-	//AAL5S	sent Octets to ATM
-	reg_l = readl(AAL5_SOOL_ADDR);
-	reg_h = readl(AAL5_SOOM_ADDR);
-	g_atm_dev.mib_counter.tx_cnt_h +=reg_h;
-	if (reg_l + g_atm_dev.mib_counter.tx_cnt_l < reg_l){
-		g_atm_dev.mib_counter.tx_cnt_h++;
-	}
-	g_atm_dev.mib_counter.tx_cnt_l+= reg_l;
-
-
-	g_atm_dev.mib_counter.tx_ppd += readl(CBM_AAL5ODIS_ADDR);
-	g_atm_dev.mib_counter.rx_drop += readl(CBM_AAL5IDIS_ADDR);
-	
-	//store 
-	to->ifHCInOctets_h = g_atm_dev.mib_counter.rx_cnt_h;
-	to->ifHCInOctets_l = g_atm_dev.mib_counter.rx_cnt_l;
-	to->ifHCOutOctets_h = g_atm_dev.mib_counter.tx_cnt_h;
-	to->ifHCOutOctets_l = g_atm_dev.mib_counter.tx_cnt_l;
-	to->ifOutDiscards = g_atm_dev.mib_counter.tx_drop;
-	to->ifInDiscards = g_atm_dev.mib_counter.rx_drop;
-
-	//Software provided counters
-	//packets passed to higher layer
-	to->ifInUcastPkts = g_atm_dev.mib_counter.rx;
-	//packets passed from higher layer
-	to->ifOutUcastPkts = g_atm_dev.mib_counter.tx;
-	//number of wrong downstream packets
-	to->ifInErrors = g_atm_dev.mib_counter.rx_err;
-	//number of wrong upstream packets
-	to->ifOutErros = g_atm_dev.mib_counter.tx_err;
-
-	return 0;
-}
-/* Brief:	Return ATM AAL5 VCC related MIB from internale use
- * Parameter:
- *	qid
- *	atm_aal5_vcc_t
- */
-static int __amazon_atm_vcc_mib(int qid, atm_aal5_vcc_t* to)
-{
-	//aal5VccCrcErrors
-	to->aal5VccCrcErrors = g_atm_dev.queues[qid].aal5VccCrcErrors;
-	to->aal5VccOverSizedSDUs =g_atm_dev.queues[qid].aal5VccOverSizedSDUs;
-	to->aal5VccSarTimeOuts = 0; //not supported yet
-	return 0;
-}
-/* Brief:	Return ATM AAL5 VCC related MIB from vpi/vci
- * Parameter:	atm_vcc
- * 	 atm_aal5_vcc_t
- */
-int amazon_atm_vcc_mib_x(int vpi, int vci,atm_aal5_vcc_t* to)
-{
-	int qid=0;
-	int err=0;
-	qid =  amazon_atm_find_vpivci(vpi, vci);
-	if (qid >0 ){
-		err = __amazon_atm_vcc_mib(qid,to);
-	}else{
-		return -EINVAL;
-	}
-	return err;
-}
-
-
-/* Brief:	Return ATM AAL5 VCC related MIB
- * Parameter:	atm_vcc
- *	 atm_aal5_vcc_t
- */
-int amazon_atm_vcc_mib(struct atm_vcc *vcc,atm_aal5_vcc_t* to)
-{
-	int qid=0;
-	int err=0;
-	qid =  amazon_atm_get_queue(vcc);
-	if (qid >0 ){
-		err = __amazon_atm_vcc_mib(qid,to);
-	}else{
-		return -EINVAL;
-	}
-	return err;
-}
-
-/* Brief: 	Close ATM connection
- * Parameters: 	atm_vcc	- Pointer to VCC data structure
- * Return: 	no
- * Description:
- * This function closes the given ATM connection
- */
-void	amazon_atm_close(struct atm_vcc *vcc){
-	int i;
-	int qid=0;
-	u32 tmp1;
-	u8 * qd_addr;
-	unsigned long flags;
-	if (vcc == NULL){
-		AMAZON_TPE_EMSG("invalid parameter. vcc is null\n");
-		return;
-	}
-	u32 itf = (u32) vcc->itf;
-	//release bandwidth
-	if (vcc->qos.txtp.traffic_class == ATM_CBR){
-		g_atm_dev.ports[itf].tx_rem_cr += vcc->qos.txtp.max_pcr;
-		g_atm_dev.ports[itf].tx_cur_cr -= vcc->qos.txtp.max_pcr;
-	}else if (vcc->qos.txtp.traffic_class == ATM_VBR_RT){
-		g_atm_dev.ports[itf].tx_rem_cr += vcc->qos.txtp.max_pcr;
-		g_atm_dev.ports[itf].tx_cur_cr -= vcc->qos.txtp.max_pcr;
-	}else if (vcc->qos.txtp.traffic_class == ATM_VBR_NRT){
-		g_atm_dev.ports[itf].tx_rem_cr += vcc->qos.txtp.pcr;
-		g_atm_dev.ports[itf].tx_cur_cr -= vcc->qos.txtp.pcr;
-	}else if (vcc->qos.txtp.traffic_class == ATM_UBR_PLUS){
-		g_atm_dev.ports[itf].tx_rem_cr += vcc->qos.txtp.min_pcr;
-		g_atm_dev.ports[itf].tx_cur_cr -= vcc->qos.txtp.min_pcr;
-	}
-
-	qid = amazon_atm_get_queue(vcc);
-	if (qid == -EINVAL){
-		AMAZON_TPE_EMSG("unknown vcc %u.%u.%u\n", vcc->itf, vcc->vpi, vcc->vci);
-		return;
-	}
-	local_irq_save(flags);
-	//Disable HTU entry
-	i=0;
-	while ((tmp1 = readl(HTU_RAMSTAT_ADDR))!=0 && i < HTU_RAM_ACCESS_MAX) i++;
- 	if (i == HTU_RAM_ACCESS_MAX){
-		AMAZON_TPE_EMSG("HTU RAM ACCESS out of time\n");
-	}
-
-	// write address register
-	AMAZON_WRITE_REGISTER_L(qid - CBM_DEFAULT_Q_OFFSET, HTU_RAMADDR_ADDR);
-	// invalidate the connection
-	AMAZON_WRITE_REGISTER_L(0, HTU_RAMDAT1_ADDR);
-	// write command
-	AMAZON_WRITE_REGISTER_L(HTU_RAMCMD_WR,HTU_RAMCMD_ADDR);
-	
-	qd_addr = (u8 *) KSEG1ADDR((unsigned long)g_atm_dev.cbm.qd_addr);
-#ifdef AMAZON_ATM_DEBUG
-	tmp1 = readl(qd_addr+qid*CBM_QD_SIZE+0x8) & 0xffff;
-	AMAZON_TPE_DMSG("TX queue has %u cells \n", tmp1);
-	tmp1 = readl( qd_addr+(qid+CBM_RX_OFFSET)*CBM_QD_SIZE+0x08)&0xffff;
-	AMAZON_TPE_DMSG("RX queue has %u cells \n", tmp1);
-#endif	
-	// set threshold of txqueue to 0
-	tmp1 = readl(qd_addr+qid*CBM_QD_SIZE+0x0c);
-	tmp1&= (~ CBM_QD_W3_THRESHOLD_MASK);
-	AMAZON_WRITE_REGISTER_L(tmp1, (qd_addr+qid*CBM_QD_SIZE+0x0c));
-	// set threshold of rxqueue to 0
-	tmp1 = readl( qd_addr+(qid+CBM_RX_OFFSET)*CBM_QD_SIZE+0x0c);
-	tmp1&= (~ CBM_QD_W3_THRESHOLD_MASK);
-	AMAZON_WRITE_REGISTER_L(tmp1,(qd_addr+(qid+CBM_RX_OFFSET)*CBM_QD_SIZE+0x0c));
-
-	//clear internal mapping
-	amazon_atm_clear_vcc(qid);
-	amazon_atm_clear_vcc(qid+CBM_RX_OFFSET);
-
-	local_irq_restore(flags);
-}
-
-
-/* Brief:	initialize internal data structure
- */
-static void atm_constructor(amazon_atm_dev_t * dev)
-{
-	int i;
-	memset(dev,0,sizeof(amazon_atm_dev_t));
-	atm_init_parameters(dev);
-	//internal: queue "free" flag
-	for(i=1;i<AMAZON_ATM_MAX_QUEUE_NUM;i++) {
-		//dev->queues[i].vcc=NULL;
-		dev->queues[i].free = 1;
-	}
-	for(i=0;i<AMAZON_ATM_PORT_NUM;i++){
-		dev->ports[i].tx_rem_cr = dev->ports[i].tx_max_cr;
-	}
-	//MIB
-	atomic_set(&dev->dma_tx_free_0,1); //initially there should be free descriptors
-}
-
-/* Brief:	return round up base-2 logarithm
- */
-static inline int get_log_2(u32 value)
-{
-	int i=0,j=1;
-	while (i<11){
-		if (j>=value) break;
-		j=j<<1;
-		i++;
-	}
-	AMAZON_TPE_DMSG("round up base-2 logarithm of %u is %u\n", value, i);
-	return i;
-}
-
-/* Brief:	TPE hardware initialization
- * Parameter:	specifiy the configurations of the hardware
- */
-static inline int atm_init_hard(amazon_atm_dev_t * dev)
-{
-	int i;
-	u32 tmp1, tmp2, tmp3;
-	u8 * mem_addr=NULL;
-	u8 * qd_addr=NULL;
-	//PMU power on the module 1st
-	*(AMAZON_PMU_PWDCR) = 	(*AMAZON_PMU_PWDCR) | (AMAZON_PMU_PWDCR_TPE);
-	//Reset the module
-	*(AMAZON_RST_REQ) = (* AMAZON_RST_REQ) | (AMAZON_RST_REQ_TPE);
-	mb();
-	mdelay(100);
-	*(AMAZON_RST_REQ) = (* AMAZON_RST_REQ) & (~(AMAZON_RST_REQ_TPE));
-	mb();
-	
-	unsigned long qsb_clk = amazon_get_fpi_hz()>>1;
-	/*********allocate & arrange memory for CBM *********/
-	if (dev->cbm.mem_addr == NULL){
-		dev->cbm.allocated = 1;
-		mem_addr = (u8 *)__get_free_pages(GFP_KERNEL, get_log_2(((CBM_CELL_SIZE * dev->cbm.free_cell_cnt) >>PAGE_SHIFT) + 1));
-		if (mem_addr != NULL){ 
-			dev->cbm.mem_addr = mem_addr;
-		} else	{
-			goto init_no_mem;
-		}
-	}
-	if (dev->cbm.qd_addr == NULL){
-#ifdef CONFIG_USE_VENUS
-		//to work around a bug, bit15 of QDOFF address should be 1,Aug4, 2004
-		//thus, we allocate 64k memory		
-		qd_addr = (u8 *)__get_free_pages(GFP_KERNEL, 4);
-		if (qd_addr != NULL) {
-			dev->cbm.qd_addr_free = (u8*) (((unsigned long) qd_addr));
-			dev->cbm.qd_addr = (u8*) (((unsigned long) qd_addr) | 0x8000);
-		}else{
-			goto init_no_mem;
-		}
-#else	//CONFIG_USE_VENUS
-		qd_addr = (u8 *)kmalloc( CBM_QD_SIZE * AMAZON_ATM_MAX_QUEUE_NUM, GFP_KERNEL);
-		if (qd_addr != NULL) {
-			dev->cbm.qd_addr = qd_addr;
-		}else {
-			goto init_no_mem;
-		}
-#endif //CONFIG_USE_VENUS			
-	}
-//#ifndef CONFIG_MIPS_UNCACHED
-	mem_addr = (u8 *)KSEG1ADDR((unsigned long)dev->cbm.mem_addr);
-	qd_addr = (u8 *)KSEG1ADDR((unsigned long)dev->cbm.qd_addr);
-//#endif
-	//CBM reset cell queue memory, 64 bytes / cell
-	memset_io(mem_addr, 0, CBM_CELL_SIZE * dev->cbm.free_cell_cnt);
-	//make a link list, last 4 bytes is pointer
-	for(i=1;i<dev->cbm.free_cell_cnt;i++){
-		AMAZON_WRITE_REGISTER_L(CPHYSADDR((mem_addr + CBM_CELL_SIZE * i)),(mem_addr + CBM_CELL_SIZE * (i-1) + 0x3c));
-	}
-	//reset queue descriptor
-	memset_io(qd_addr, 0, CBM_QD_SIZE * AMAZON_ATM_MAX_QUEUE_NUM);
-	//init word 0-2 of q0 (free cell list)
-	//address of last cell
-	AMAZON_WRITE_REGISTER_L(CPHYSADDR((mem_addr + CBM_CELL_SIZE * (dev->cbm.free_cell_cnt-1))), qd_addr);
-	//address of first cell
-	AMAZON_WRITE_REGISTER_L(CPHYSADDR((mem_addr)), (qd_addr + 4));
-	//no. of free cells
-	AMAZON_WRITE_REGISTER_L(dev->cbm.free_cell_cnt,(qd_addr + 8));
-	//init q descriptor for OAM receiving
-	AMAZON_WRITE_REGISTER_L((CBM_QD_W3_INT_ACA | (divide_by_64_round_up(oam_q_threshold)&0xff)<< CBM_QD_W3_THRESHOLD_SHIFT), (qd_addr + AMAZON_ATM_OAM_Q_ID * CBM_QD_SIZE + 0x0c));
-//	AMAZON_WRITE_REGISTER_L((CBM_QD_W3_INT_ACA | (u32)oam_q_threshold<< CBM_QD_W3_THRESHOLD_SHIFT), (qd_addr + AMAZON_ATM_OAM_Q_ID * CBM_QD_SIZE + 0x0c));
-	//config CBM
-	//set offset address and threshold
-	AMAZON_WRITE_REGISTER_L(CPHYSADDR(qd_addr), CBM_QDOFF_ADDR);
-	AMAZON_WRITE_REGISTER_L(((dev->cbm.nrt_thr&CBM_THR_MASK)|CBM_WM_3_1), CBM_NRTTHR_ADDR);
-	AMAZON_WRITE_REGISTER_L(((dev->cbm.clp0_thr&CBM_THR_MASK)|CBM_WM_3_1), CBM_CLP0THR_ADDR);
-	AMAZON_WRITE_REGISTER_L(((dev->cbm.clp1_thr&CBM_THR_MASK)|CBM_WM_3_1), CBM_CLP1THR_ADDR);
-	//config interrupts
-	AMAZON_WRITE_REGISTER_L( CBM_IMR_MASK & (~(CBM_IMR_ACA|CBM_IMR_Q0E|CBM_IMR_Q0I|CBM_IMR_RDE|CBM_IMR_OPF|CBM_IMR_ERR             	
-#ifdef AMAZON_ATM_DEBUG	
-						|CBM_IMR_DISC|CBM_IMR_QFD|CBM_IMR_NFCA|CBM_IMR_CLP1TR|CBM_IMR_CLP0TR|CBM_IMR_NRTTR|CBM_IMR_QTR
-#endif	
-#ifdef AMAZON_TPE_SCR
-						|CBM_IMR_EF 
-#endif
-							)), CBM_IMR0_ADDR);
-	AMAZON_WRITE_REGISTER_L(SRC_CLRR|SRC_TOS_MIPS | SRC_SRE_ENABLE | AMAZON_CBM_INT, CBM_SRC0_ADDR);
-	
-	//HTU
-	//RAM entry for number of possible connections per interface
-	tmp1 = dev->ports[0].max_conn?dev->ports[0].max_conn-1:0;
-	AMAZON_WRITE_REGISTER_L(tmp1, HTU_RX0_ADDR);
-	for(i=1;i<AMAZON_ATM_PORT_NUM;i++){
-		tmp1+=dev->ports[i].max_conn;
-		AMAZON_WRITE_REGISTER_L(tmp1, HTU_RX0_ADDR + 4 * i);
-	}
-	dev->cbm.max_q_off = tmp1+1;
-	//Queue ID for OAM/RM/Other cells
-	AMAZON_WRITE_REGISTER_L (AMAZON_ATM_OAM_Q_ID, HTU_DESTOAM_ADDR);
-	AMAZON_WRITE_REGISTER_L( AMAZON_ATM_RM_Q_ID, HTU_DESTRM_ADDR);
-	AMAZON_WRITE_REGISTER_L( AMAZON_ATM_OTHER_Q_ID, HTU_DESTOTHER_ADDR);
-	//Timeout
-	AMAZON_WRITE_REGISTER_L((u32) HTUTIMEOUT, HTU_TIMEOUT_ADDR);
-#ifdef AMAZON_ATM_DEBUG
-        AMAZON_WRITE_REGISTER_L((u32) HTU_ISR_MASK 
-				&(~(HTU_ISR_NE|HTU_ISR_TORD|HTU_ISR_OTOC|HTU_ISR_ONEC|HTU_ISR_PNE|HTU_ISR_PT)), HTU_IMR0_ADDR);
-	AMAZON_WRITE_REGISTER_L(SRC_CLRR|SRC_TOS_MIPS|SRC_SRE_ENABLE|AMAZON_HTU_INT,HTU_SRC0_ADDR);
-#endif
-	//QSB
-	//global setting, TstepC, SBL, Tau
-	//Tau
-	AMAZON_WRITE_REGISTER_L(dev->qsb.tau, QSB_TAU_ADDR);
-	//SBL
-	AMAZON_WRITE_REGISTER_L(dev->qsb.sbl, QSB_SBL_ADDR);
-	//tstep
-	AMAZON_WRITE_REGISTER_L(dev->qsb.tstepc>>1, QSB_CONFIG_ADDR);
-
-	//port settting
-	for(i=0;i<AMAZON_ATM_PORT_NUM;i++){
-		if ( (dev->ports[i].enable) && (dev->ports[i].tx_max_cr!=0) ){
-			tmp1 = ((qsb_clk * dev->qsb.tstepc) >>1) / dev->ports[i].tx_max_cr;
-			tmp2 = tmp1 / 64;	//integer value of Tsb
-			tmp3 = tmp1%64 + 1; 	//fractional part of Tsb
-			//carry over to integer part (?)
-			if (tmp3 == 64) {
-				tmp3 = 0;
-				tmp2++;
-			}
-			if (tmp2 == 0){
-				tmp2 = 1;
-				tmp3 = 1;
-			}
-			//1. set mask 2. write value to data transfer register 3. start the transfer
-			//SCT(FracRate)
-			AMAZON_WRITE_REGISTER_L(QSB_SET_SCT_MASK, QSB_RTM_ADDR);
-			AMAZON_WRITE_REGISTER_L(tmp3,QSB_RTD_ADDR);
-			AMAZON_WRITE_REGISTER_L(((QSB_TABLESEL_SCT<<QSB_TABLESEL_SHIFT)|QSB_RAMAC_REG_LOW|QSB_WRITE|i),QSB_RAMAC_ADDR);
-			//SPT(SBV + PN + IntRage)
-			AMAZON_WRITE_REGISTER_L(QSB_SET_SPT_MASK, QSB_RTM_ADDR);
-			AMAZON_WRITE_REGISTER_L(QSB_SPT_SBVALID|tmp2|(i<<16),QSB_RTD_ADDR);
-			AMAZON_WRITE_REGISTER_L(((QSB_TABLESEL_SPT<<QSB_TABLESEL_SHIFT)|QSB_RAMAC_REG_LOW|QSB_WRITE|i),QSB_RAMAC_ADDR);
-
-
-		}
-	}
-	
-	//SWIE: Setup Service Request Control Registers to enable interrupts
-	AMAZON_WRITE_REGISTER_L(SRC_CLRR|SRC_TOS_MIPS | SRC_SRE_ENABLE | AMAZON_SWIE_INT, SWIE_ISRC_ADDR);
-	AMAZON_WRITE_REGISTER_L(SRC_CLRR|SRC_TOS_MIPS | SRC_SRE_ENABLE | AMAZON_SWIE_INT, SWIE_ESRC_ADDR);
-
-	wmb();
-#ifdef AMAZON_TPE_TEST_AAL5_INT
-	AMAZON_WRITE_REGISTER_L(AAL5R_ISR_FE,AAL5_RIMR0_ADDR);
-	AMAZON_WRITE_REGISTER_L(0, AAL5_SIMR0_ADDR);
-	AMAZON_WRITE_REGISTER_L(SRC_CLRR|SRC_TOS_MIPS | SRC_SRE_ENABLE | AMAZON_AAL5_INT,AAL5_SSRC0_ADDR);
-	AMAZON_WRITE_REGISTER_L(SRC_CLRR|SRC_TOS_MIPS | SRC_SRE_ENABLE | AMAZON_AAL5_INT,AAL5_RSRC0_ADDR);
-#endif //AMAZON_TPE_TEST_AAL5_INT
-
-	AMAZON_WRITE_REGISTER_L(dev->aal5.tx_max_sdu,AAL5_SMFL_ADDR);	
- 	AMAZON_WRITE_REGISTER_L(dev->aal5.rx_max_sdu,AAL5_RMFL_ADDR);
-	AMAZON_WRITE_REGISTER_L(AAL5_SCMD_MODE_POLL // enable polling mode
- 					|AAL5_SCMD_SS
- 					|AAL5_SCMD_AR
-					,AAL5_SCMD_ADDR);
-	//start CBM
- 	AMAZON_WRITE_REGISTER_L(CBM_CFG_START,CBM_CFG_ADDR);
- 	wmb();
-	return 0;
-init_no_mem:
-	if (mem_addr != NULL) free_pages((unsigned long)mem_addr,get_log_2(((CBM_CELL_SIZE * dev->cbm.free_cell_cnt) >>PAGE_SHIFT) + 1));
-	
-#ifdef CONFIG_USE_VENUS	
-	//to work around a bug, bit15 of QDOFF address should be 1
-	if (qd_addr != NULL) free_pages((unsigned long)qd_addr,4);
-#else //CONFIG_USE_VENUS
-	if (qd_addr != NULL) kfree(qd_addr);	
-#endif //CONFIG_USE_VENUS	
-	return -ENOMEM;
-}
-
-/*	
- *	Brief:	Create entry in /proc for status information
- */
-void atm_create_proc(void)
-{
-	create_proc_read_entry("amazon_atm", 0,NULL, amazon_atm_read_procmem,(void*)PROC_ATM);
-        create_proc_read_entry("amazon_atm_mib", 0,NULL, amazon_atm_read_procmem,(void*)PROC_MIB);
-        create_proc_read_entry("amazon_atm_vcc", 0,NULL, amazon_atm_read_procmem,(void*)PROC_VCC);
-#if 0	
-	create_proc_read_entry("amazon_atm_aal5", 0,NULL, amazon_atm_read_procmem,(void*)PROC_AAL5);
-        create_proc_read_entry("amazon_atm_cbm", 0,NULL, amazon_atm_read_procmem,(void*)PROC_CBM);
-        create_proc_read_entry("amazon_atm_htu", 0,NULL, amazon_atm_read_procmem,(void*)PROC_HTU);
-        create_proc_read_entry("amazon_atm_qsb", 0,NULL, amazon_atm_read_procmem,(void*)PROC_QSB);
-        create_proc_read_entry("amazon_atm_swie", 0,NULL, amazon_atm_read_procmem,(void*)PROC_SWIE);
-#endif
-}
-
-/*
- *	Brief:	Delete entry in /proc for status information
- */
-void atm_delete_proc(void)
-{
-	remove_proc_entry("amazon_atm", NULL);
-        remove_proc_entry("amazon_atm_mib", NULL);
-        remove_proc_entry("amazon_atm_vcc", NULL);
-#if 0	
-	remove_proc_entry("amazon_atm_aal5", NULL);
-        remove_proc_entry("amazon_atm_cbm", NULL);
-        remove_proc_entry("amazon_atm_htu", NULL);
-        remove_proc_entry("amazon_atm_qsb", NULL);
-        remove_proc_entry("amazon_atm_swie", NULL);
-#endif	
-}
-/* Brief: 	Initialize ATM module
- * Parameters: 	no
- * Return: 	&g_atm_dev - sucessful
- *		NULL	- fails: 
- *			1. invalid parameter
- * 			2. No memory available
- * Description:
- *  This function configure the TPE components according to the input info,
- *	-CBM
- *	-HTU
- *	-QSB
- *	-AAL5
- *
- */
-amazon_atm_dev_t * amazon_atm_create(void)
-{
-	int i;
-	AMAZON_TPE_DMSG("atm_init\n");
-	/************initialize global data structure****************/
-	atm_constructor(&g_atm_dev);
-	/***********allocate kernel resources****************/
-	//bottom halfs for SWEX
-	swex_start_task.routine = amazon_atm_swex;
-	swex_start_task.data = NULL;
-	swex_complete_task.routine = amazon_atm_swex_push;
-	swex_complete_task.data = NULL;
-#ifdef AMAZON_TPE_SCR
-	a5r_task.routine = amazon_atm_a5r;
-	a5r_task.data = NULL;
-#endif	//AMAZON_TPE_SCR
-	//SWIN semaphore
-	sema_init(&(g_atm_dev.swie.in_sem), 1);
-	//SWIE lock
-	clear_bit(SWIE_LOCK, &(g_atm_dev.swie.lock));
-	//SWIE wait queue
-	init_waitqueue_head(&(g_atm_dev.swie.sleep));
-	atm_create_proc();
-		
-	//register DMA
-	memset(&g_dma_dev,0,sizeof(struct dma_device_info));
-	strcpy(g_dma_dev.device_name,"TPE");
-	g_dma_dev.weight=1; 
-	g_dma_dev.num_tx_chan=2;
-     	g_dma_dev.num_rx_chan=2; 
-     	g_dma_dev.ack=1;
-     	g_dma_dev.tx_burst_len=4;
-     	g_dma_dev.rx_burst_len=4;
-     	//DMA TX
-
-	for(i=0;i<1;i++){
-		g_dma_dev.tx_chan[i].weight=QOS_DEFAULT_WGT;
-       		g_dma_dev.tx_chan[i].desc_num=10;
-       		g_dma_dev.tx_chan[i].packet_size=g_atm_dev.aal5.tx_max_sdu + AAL5S_INBOUND_HEADER;
-       		g_dma_dev.tx_chan[i].control=1;
-     	}
-	//DMA RX
-     	for(i=0;i<2;i++){
-       		g_dma_dev.rx_chan[i].weight=QOS_DEFAULT_WGT;
-		/* BingTao's suggestion, change from 5->10 will prevent packet loss in NO_TX_INT mode */
-		g_dma_dev.rx_chan[i].desc_num=10;
-		g_dma_dev.rx_chan[i].packet_size=(g_atm_dev.aal5.rx_max_sdu + AAL5R_TRAILER_LEN+0x10f)&(~0xf);
-		g_dma_dev.rx_chan[i].control=1;
-     	}
-	g_dma_dev.intr_handler=amazon_atm_dma_handler;
-    	g_dma_dev.buffer_alloc=amazon_atm_alloc_rx;
-     	g_dma_dev.buffer_free=amazon_atm_free_tx;
-     	dma_device_register(&g_dma_dev);
-/***********intialize the atm hardware ****************/
-	if ( atm_init_hard(&g_atm_dev) != 0){
-		return NULL;
-	}
-	//start CBM
-	AMAZON_WRITE_REGISTER_L(CBM_CFG_START,CBM_CFG_ADDR);
-	wmb();
-
-	//Start HTU
-	AMAZON_WRITE_REGISTER_L(HTU_CFG_START ,HTU_CFG_ADDR);
-	wmb();
-
-
-	// Register interrupts for insertion and extraction
-	request_irq(AMAZON_SWIE_INT, amazon_atm_swie_isr, IRQF_DISABLED, "tpe_swie", NULL);
-	request_irq(AMAZON_CBM_INT, amazon_atm_cbm_isr, IRQF_DISABLED, "tpe_cbm", NULL);
-#ifdef AMAZON_ATM_DEBUG
-	request_irq(AMAZON_HTU_INT , amazon_atm_htu_isr, IRQF_DISABLED, "tpe_htu", NULL);
-#endif
-#ifdef AMAZON_TPE_TEST_AAL5_INT	
-	request_irq(AMAZON_AAL5_INT, amazon_atm_aal5_isr, IRQF_DISABLED, "tpe_aal5", NULL);
-#endif
-	return &g_atm_dev;
-}
-
-/* Brief: 	clean up atm
- * Parameters: 	no
- * Return: 	no
- * Description:
- *  Disable the device.
- */
-void	amazon_atm_cleanup(void){
-	int i;
-	clear_bit(SWIE_LOCK, &(g_atm_dev.swie.lock));
-	wake_up(&g_atm_dev.swie.sleep);
-	up(&g_atm_dev.swie.in_sem);
-	// diable SWIE interrupts
-	AMAZON_WRITE_REGISTER_L(0, SWIE_ISRC_ADDR);
-	AMAZON_WRITE_REGISTER_L(0, SWIE_ESRC_ADDR);
-	wmb();
-
-	// Disable schedulers ( including interrupts )-----------------------
-	for (i = 0; i < AMAZON_ATM_PORT_NUM; i++);
-	{
-		AMAZON_WRITE_REGISTER_L(QSB_SET_SPT_SBVALID_MASK, QSB_RTM_ADDR);
-		AMAZON_WRITE_REGISTER_L( 0 ,QSB_RTD_ADDR);
-		AMAZON_WRITE_REGISTER_L( (QSB_TABLESEL_SPT<<QSB_TABLESEL_SHIFT)
-						| QSB_RAMAC_REG_LOW
-						| QSB_WRITE
-						| i,
-						QSB_RAMAC_ADDR);
-	}
-	// disable QSB_Interrupts
-	AMAZON_WRITE_REGISTER_L( 0, QSB_IMR_ADDR);
-	AMAZON_WRITE_REGISTER_L( 0, QSB_SRC_ADDR);
-	// disable CBM interrupts
-	AMAZON_WRITE_REGISTER_L( 0	, CBM_IMR0_ADDR);
-	AMAZON_WRITE_REGISTER_L( 0 , CBM_SRC0_ADDR);
-	// set CBM start bit to 0
-	AMAZON_WRITE_REGISTER_L(0,CBM_CFG_ADDR);
-	// request hardware extraction of queue 0, wich should force the CBM
-	// to recognize that the start bit is not set
-	AMAZON_WRITE_REGISTER_L(CBM_HWEXPAR_PN_A5, CBM_HWEXPAR0_ADDR);
-	// write frame extraction command into the hw extract command register
-	AMAZON_WRITE_REGISTER_L(CBM_HWEXCMD_FE0, CBM_HWEXCMD_ADDR);
-	// disable htu
- 	// disable all HTU interrupts
-	AMAZON_WRITE_REGISTER_L(0  ,HTU_IMR0_ADDR);
-	AMAZON_WRITE_REGISTER_L(0  ,HTU_SRC0_ADDR);
-	
-	if (g_atm_dev.cbm.allocated){
-		free_pages((unsigned long)g_atm_dev.cbm.mem_addr, get_log_2(((CBM_CELL_SIZE * g_atm_dev.cbm.free_cell_cnt) >>PAGE_SHIFT)+1));
-#ifdef CONFIG_USE_VENUS
-		//to work around a bug, bit15 of QDOFF address should be 1
-		free_pages((unsigned long)g_atm_dev.cbm.qd_addr_free,4);
-#else //CONFIG_USE_VENUS
-		kfree(g_atm_dev.cbm.qd_addr);
-#endif //CONFIG_USE_VENUS						
-	}
-	atm_delete_proc();
-	// free interrupts for insertion and extraction
-	dma_device_unregister(&g_dma_dev);
-	free_irq(AMAZON_SWIE_INT, NULL);
-	free_irq(AMAZON_CBM_INT, NULL);
-#ifdef AMAZON_ATM_DEBUG
-	free_irq(AMAZON_HTU_INT, NULL);
-#endif
-#ifdef AMAZON_TPE_TEST_AAL5_INT
-	free_irq(AMAZON_AAL5_INT, NULL);
-#endif
-
-}
-
-/************************ ATM network interface ***********************************************/
-/*	Brief:		getsockopt
- */
-int amazon_atm_getsockopt(struct atm_vcc *vcc, int level, int optname, char *optval, int optlen)
-{
-	int err=0;
-	atm_aal5_vcc_t mib_vcc;
-	AMAZON_TPE_DMSG("1\n");
-	switch (optname){
-		case	SO_AMAZON_ATM_MIB_VCC:
-			AMAZON_TPE_DMSG("2\n");
-			err = amazon_atm_vcc_mib(vcc, &mib_vcc);
-			AMAZON_TPE_DMSG("%u\n",mib_vcc.aal5VccCrcErrors);
-                        err = copy_to_user((void *)optval,&mib_vcc, sizeof(mib_vcc));
-                        AMAZON_TPE_DMSG("err %u\n",err);
-                        break;
-                default:
-                	return -EFAULT;
-	}
-	return err;
-}
-
-/*	Brief:		IOCTL
- */
-
-int amazon_atm_ioctl(struct atm_dev *dev,unsigned int cmd,void *arg)
-{
-	int     err=0;
-	//MIB
-	atm_cell_ifEntry_t mib_cell;
-	atm_aal5_ifEntry_t mib_aal5;
-	atm_aal5_vcc_x_t mib_vcc;
-	if (_IOC_TYPE(cmd) != AMAZON_ATM_IOC_MAGIC) return -ENOTTY;
-	if (_IOC_NR(cmd) > AMAZON_ATM_IOC_MAXNR) return -ENOTTY;
-
-	if (_IOC_DIR(cmd) & _IOC_READ)
-		err = !access_ok(VERIFY_WRITE, (void *)arg, _IOC_SIZE(cmd));
-	else if (_IOC_DIR(cmd) & _IOC_WRITE)
-		err =  !access_ok(VERIFY_READ, (void *)arg, _IOC_SIZE(cmd));
-	if (err) {
-		AMAZON_TPE_EMSG("acess verification fails \n");
-		return -EFAULT;
-	}
-	switch(cmd) {
-		case AMAZON_ATM_MIB_CELL:
-			err = amazon_atm_cell_mib(&mib_cell,(u32)arg);
-			if (err==0){
-				err = __copy_to_user((void *)arg,&mib_cell,sizeof(mib_cell));
-			}else{
-				AMAZON_TPE_EMSG("cannot get MIB ATM_CELL\n");
-			}
-			break;
-		case AMAZON_ATM_MIB_AAL5:
-			err = amazon_atm_aal5_mib(&mib_aal5);
-			if (err==0){
-				err=__copy_to_user(arg, &mib_aal5, sizeof(mib_aal5));
-			}else{
-				AMAZON_TPE_EMSG("cannot get MIB ATM_AAL5\n");
-			}
-			break;
-		case AMAZON_ATM_MIB_VCC:
-			err=__copy_from_user(&mib_vcc,arg, sizeof(mib_vcc));
-			AMAZON_TPE_DMSG("return of copy_from_user %x\n",err);
-			err = amazon_atm_vcc_mib_x(mib_vcc.vpi, mib_vcc.vci, &(mib_vcc.mib_vcc));
-			if (err==0){
-				err=__copy_to_user(arg, &mib_vcc, sizeof(mib_vcc));	
-			}else{
-				AMAZON_TPE_EMSG("cannot get MIB ATM_VCC\n");
-			}
-				
-    		default:
-    			return -ENOTTY;
-	}
-	return err;
-}
-/*	Brief:	return a link list of OAM related time stamp info
- *	Parameter:	none
- *	Return:	
- 		a link list of "struct oam_last_activity" data
- *	Description:
- 		Each time, a F4/F5 cell or AAL5 packet is received, the time stamp is updated.
-		Through this call, u get a list of this time stamp for all active connection.
-		Please note that u have read-only access.
- */
-const struct oam_last_activity* get_oam_time_stamp()
-{
-	int i,j;
-	for(i=CBM_DEFAULT_Q_OFFSET+CBM_RX_OFFSET,j=0;i<CBM_RX_OFFSET+CBM_DEFAULT_Q_OFFSET+AMAZON_ATM_MAX_VCC_NUM;i++){
-		if (g_atm_dev.queues[i].free != 1 && g_atm_dev.queues[i].vcc != NULL){
-			//active connection
-			if (j !=0 ){
-				g_oam_time_stamp[j-1].next = &g_oam_time_stamp[j];
-			}
-			g_oam_time_stamp[j].vpi = g_atm_dev.queues[i].vcc->vpi;
-			g_oam_time_stamp[j].vci = g_atm_dev.queues[i].vcc->vci;
-			g_oam_time_stamp[j].stamp = g_atm_dev.queues[i].access_time;
-			g_oam_time_stamp[j].next = NULL;
-			j++;
-		}
-	}
-	if (j==0) {
-		return NULL;
-	}else{
-		return g_oam_time_stamp;
-	}
-}
-
-
-/*	Brief:	call back routine for rx
- *	Parameter:
- *		vcc atm_vcc pointer
- *		skb	data if no error
- 		err	error flag, 0: no error, 1:error
- *	Return:	
- *		0	
- *		<>0	cannot push up
- *	Description:
- *		release the packet if cannot push up
- */
-static	int amazon_atm_net_push(struct atm_vcc *vcc,struct sk_buff *skb, int err)
-{
-	if (err){
-		if (vcc && vcc->stats) {
-			atomic_inc(&vcc->stats->rx_err);
-		}
-	}else{	
-		ATM_SKB(skb)->vcc = vcc;
-	
-		if (!atm_charge(vcc, skb->truesize)){
-			//no space this vcc
-			AMAZON_TPE_EMSG("no space for this vcc\n");
-			dev_kfree_skb_any(skb);
-			return -ENOMEM;
-		}
-		atomic_inc(&vcc->stats->rx);
-		AMAZON_TPE_DMSG("push to vcc\n");
-		vcc->push(vcc,skb);
-	}
-	return 0;
-}
-int	amazon_atm_net_send_oam(struct atm_vcc*vcc, void *cell, int flags)
-{
-	return amazon_atm_send_oam(vcc,cell,flags);
-}
-
-int	amazon_atm_net_send(struct atm_vcc *vcc,struct sk_buff *skb)
-{
-	int err=0;
-	if (vcc->qos.aal == ATM_AAL0 || vcc->qos.aal == ATM_AAL5) {
-		err=amazon_atm_send(vcc,skb);
-	}else{
-		//not supported
-		err =  -EPROTONOSUPPORT;
-	}
-	if (err){
-		atomic_inc(&vcc->stats->tx_err);
-	}else{
-		atomic_inc(&vcc->stats->tx);
-	}
-	AMAZON_TPE_DMSG("sent, tx_inuse:%u\n", atomic_read(&vcc->tx_inuse));
-	return err;
-}
-
-int	amazon_atm_net_open(struct atm_vcc *vcc,short vpi, int vci)
-{
-	vcc->itf = (int)  vcc->dev->dev_data;
-	vcc->vpi = vpi;
-	vcc->vci = vci;
-	return(amazon_atm_open(vcc,amazon_atm_net_push));
-}
-
-static int amazon_atm_change_qos(struct atm_vcc *vcc, struct atm_qos *qos, int flgs)
-{
-	int qid;
-	
-	if (vcc == NULL || qos == NULL){
-		AMAZON_TPE_EMSG("invalid parameters\n");
-		return -EINVAL;
-	}
-	qid = amazon_atm_get_queue(vcc);
-	if (valid_qid(qid) != 1) {
-		AMAZON_TPE_EMSG("no vcc connection opened\n");
-		return -EINVAL;
-	}
-	set_qsb(vcc,qos,qid);
-	return 0;
-}
-
-static struct atmdev_ops amazon_atm_ops = {
-   open:	amazon_atm_net_open,
-   close:	amazon_atm_close,
-   ioctl:	amazon_atm_ioctl,
-   send:	amazon_atm_net_send,
-   send_oam:	amazon_atm_net_send_oam,
-//   getsockopt:	amazon_atm_getsockopt,
-   change_qos:	amazon_atm_change_qos,
-//   proc_read:	amazon_atm_proc_read,
-   owner:	THIS_MODULE,
-};				// ATM device callback functions
-
-/*
- * brief "/proc" function
- */
-int amazon_atm_read_procmem(char *buf, char **start, off_t offset,int count, int *eof, void *data)
-{
-	int buf_off=0;	/* for buf */
-	int i=0,j=0;
-	int type= (u32)data;//which module
-	atm_aal5_ifEntry_t mib_aal5;
-	atm_cell_ifEntry_t mib_cell;
-	atm_aal5_vcc_t mib_vcc;
-    	switch(type){
-		case PROC_MIB:
-			//MIB counter
-			amazon_atm_aal5_mib(&mib_aal5);
-			//TX:
-			buf_off+=sprintf(buf+buf_off,"\n============= AAL5 Upstream =========\n");
-			buf_off+=sprintf(buf+buf_off,"received %u (pkts) from upper layer\n", mib_aal5.ifOutUcastPkts);
-			buf_off+=sprintf(buf+buf_off,"errors: %u (pkts)\n",mib_aal5.ifOutErros);
-			buf_off+=sprintf(buf+buf_off,"discards: %u (ptks)\n", mib_aal5.ifOutDiscards);
-			buf_off+=sprintf(buf+buf_off,"transmitted: %x-%x (bytes) \n",
-					mib_aal5.ifHCOutOctets_h, mib_aal5.ifHCOutOctets_l);
-			//RX:
-			buf_off+=sprintf(buf+buf_off,"\n============= AAL5 Downstream =========\n");
-			buf_off+=sprintf(buf+buf_off,"received %x-%x (bytes)\n",
-					mib_aal5.ifHCInOctets_h,mib_aal5.ifHCInOctets_l);
-			buf_off+=sprintf(buf+buf_off,"discards: %u (ptks)\n",mib_aal5.ifInDiscards);
-			buf_off+=sprintf(buf+buf_off,"errors: %u (ptks)\n",mib_aal5.ifInErrors);
-			buf_off+=sprintf(buf+buf_off,"passed %u (ptks) to upper layer\n",mib_aal5.ifInUcastPkts);
-			
-			//Cell level
-			buf_off+=sprintf(buf+buf_off,"\n============= ATM Cell =========\n");
-			amazon_atm_cell_mib(&mib_cell,0);
-#ifdef AMAZON_TPE_READ_ARC			
-			buf_off+=sprintf(buf+buf_off,"Port 0: downstream received: %x-%x (bytes)\n",mib_cell.ifHCInOctets_h,mib_cell.ifHCInOctets_l);
-			buf_off+=sprintf(buf+buf_off,"Port 0: upstream transmitted: %x-%x (bytes)\n",mib_cell.ifHCOutOctets_h,mib_cell.ifHCOutOctets_l);
-			buf_off+=sprintf(buf+buf_off,"Port 0: downstream errors: %u (cells)\n",mib_cell.ifInErrors);
-			amazon_atm_cell_mib(&mib_cell,1);
-			buf_off+=sprintf(buf+buf_off,"Port 1: downstream received: %x-%x (bytes)\n",mib_cell.ifHCInOctets_h,mib_cell.ifHCInOctets_l);
-			buf_off+=sprintf(buf+buf_off,"Port 1: upstream transmitted: %x-%x (bytes)\n",mib_cell.ifHCOutOctets_h,mib_cell.ifHCOutOctets_l);
-			buf_off+=sprintf(buf+buf_off,"Port 1: downstream errors: %u (cells)\n",mib_cell.ifInErrors);
-#endif
-			buf_off+=sprintf(buf+buf_off,"HTU discards: %u (cells)\n",mib_cell.ifInUnknownProtos);
-			
-			buf_off+=sprintf(buf+buf_off,"\n====== Specials =====\n");
-			buf_off+=sprintf(buf+buf_off,"AAL5S PPD: %u (cells)\n",g_atm_dev.mib_counter.tx_ppd);
-#ifdef AMAZON_TPE_SCR
-			buf_off+=sprintf(buf+buf_off,"Reassembly wait: %u \n",g_a5r_wait);
-#endif
-			break;
-		case PROC_ATM:
-			//Interface (Port)
-			buf_off+=sprintf(buf+buf_off,"[Interfaces]\n");
-			for(i=0;i<AMAZON_ATM_PORT_NUM;i++){
-				if (g_atm_dev.ports[i].enable==0){
-					buf_off+=sprintf(buf+buf_off,"\tport[%u] not in use\n",i);
-				}else{
-					buf_off+=sprintf(buf+buf_off,"\tport[%u]\n\t\tmax_conn=%u\n"
-									,i
-									,g_atm_dev.ports[i].max_conn
-									);
-					buf_off+=sprintf(buf+buf_off,"\t\ttx_max=%u\n\t\trem=%u\n\t\tcur=%u\n"
-									,g_atm_dev.ports[i].tx_max_cr
-									,g_atm_dev.ports[i].tx_rem_cr
-									,g_atm_dev.ports[i].tx_cur_cr
-									);
-				}
-
-			}
-			//Units Info
-			//AAL5
-			buf_off+=sprintf(buf+buf_off,"[AAL5]\n\tpad=%c(%x)\n\trx_mtu=%u\n\ttx_mtu=%u\n"
-    					,g_atm_dev.aal5.padding_byte
-    					,g_atm_dev.aal5.padding_byte
-    					,g_atm_dev.aal5.rx_max_sdu
-    					,g_atm_dev.aal5.tx_max_sdu
-    					);
-			//CBM
-			buf_off+=sprintf(buf+buf_off,
-				"[CBM]\n\tnrt_thr=%u\n\tclp0_thr=%u\n\tclp1_thr=%u\n\ttx_q_threshold=%u\n\trx_q_threshold=%u\n\toam_q_threshold=%u\n\tfree_cell_cnt=%u\n"
-    					,g_atm_dev.cbm.nrt_thr
-    					,g_atm_dev.cbm.clp0_thr
-    					,g_atm_dev.cbm.clp1_thr
-					,tx_q_threshold
-					,rx_q_threshold
-					,oam_q_threshold
-    					,g_atm_dev.cbm.free_cell_cnt
-    					);
-			//QSB
-			buf_off+=sprintf(buf+buf_off,"[QSB]\n\ttau=%u\n\ttstepc=%u\n\tsbl=%u\n"
-    					,g_atm_dev.qsb.tau
-    					,g_atm_dev.qsb.tstepc
-    					,g_atm_dev.qsb.sbl
-    					);
-			buf_off+=sprintf(buf+buf_off,"[Debugging]\n\taal5_need_copy=%u\n",g_atm_dev.aal5.cnt_cpy);
-			break;
-		case PROC_VCC:
-			for(i=CBM_DEFAULT_Q_OFFSET,j=0;i<g_atm_dev.cbm.max_q_off+CBM_DEFAULT_Q_OFFSET;i++){
-				if (g_atm_dev.queues[i].free!=1){
-					buf_off+=sprintf(buf+buf_off,"vcc[%u]\n\tvpi=%u vci=%u itf=%u qid=%u access_time=%u.%u\n"
-									,j++
-									,g_atm_dev.queues[i].vcc->vpi
-									,g_atm_dev.queues[i].vcc->vci
-									,g_atm_dev.queues[i].vcc->itf
-									,i
-									,(u32)g_atm_dev.queues[i+CBM_RX_OFFSET].access_time.tv_sec
-									,(u32)g_atm_dev.queues[i+CBM_RX_OFFSET].access_time.tv_usec
-									);
-					buf_off+=sprintf(buf+buf_off,"\tqos_tx class=%u max_pcr=%u pcr=%u min_pcr=%u scr=%u mbs=%u cdv=%u\n"
-									,g_atm_dev.queues[i].vcc->qos.txtp.traffic_class
-									,g_atm_dev.queues[i].vcc->qos.txtp.max_pcr
-									,g_atm_dev.queues[i].vcc->qos.txtp.pcr
-									,g_atm_dev.queues[i].vcc->qos.txtp.min_pcr
-									,g_atm_dev.queues[i].vcc->qos.txtp.scr
-									,g_atm_dev.queues[i].vcc->qos.txtp.mbs
-									,g_atm_dev.queues[i].vcc->qos.txtp.cdv
-									);
-					buf_off+=sprintf(buf+buf_off,"\tqos_rx class=%u max_pcr=%u pcr=%u min_pcr=%u scr=%u mbs=%u cdv=%u\n"
-									,g_atm_dev.queues[i].vcc->qos.rxtp.traffic_class
-									,g_atm_dev.queues[i].vcc->qos.rxtp.max_pcr
-									,g_atm_dev.queues[i].vcc->qos.rxtp.pcr
-									,g_atm_dev.queues[i].vcc->qos.rxtp.min_pcr
-									,g_atm_dev.queues[i].vcc->qos.rxtp.scr
-									,g_atm_dev.queues[i].vcc->qos.rxtp.mbs
-									,g_atm_dev.queues[i].vcc->qos.rxtp.cdv
-									);
-					__amazon_atm_vcc_mib((i+CBM_RX_OFFSET),&mib_vcc);
-					buf_off+=sprintf(buf+buf_off,"\tCRC error=%u\n", mib_vcc.aal5VccCrcErrors);
-					buf_off+=sprintf(buf+buf_off,"\toversized packet=%u\n", mib_vcc.aal5VccOverSizedSDUs);
-#ifdef 	AMAZON_ATM_DEBUG
-					if ( valid_qid(i+CBM_RX_OFFSET)){
-					buf_off+=sprintf(buf+buf_off,"\tdownstream statics\n" );
-					buf_off+=sprintf(buf+buf_off,"\t\tpackets=%u\n",g_atm_dev.queues[i+CBM_RX_OFFSET].qs[QS_PKT]);
-					buf_off+=sprintf(buf+buf_off,"\t\terr_packets=%u\n",g_atm_dev.queues[i+CBM_RX_OFFSET].qs[QS_ERR] );
-					buf_off+=sprintf(buf+buf_off,"\t\tsw_dropped=%u\n",g_atm_dev.queues[i+CBM_RX_OFFSET].qs[QS_SW_DROP] );
-					}
-
-					buf_off+=sprintf(buf+buf_off,"\tupstream statics\n" );
-					buf_off+=sprintf(buf+buf_off,"\t\tpackets=%u\n",g_atm_dev.queues[i].qs[QS_PKT]);
-					buf_off+=sprintf(buf+buf_off,"\t\terr_packets=%u\n",g_atm_dev.queues[i].qs[QS_ERR] );
-					buf_off+=sprintf(buf+buf_off,"\t\thw_dropped=%u\n",g_atm_dev.queues[i].qs[QS_HW_DROP] );
-					buf_off+=sprintf(buf+buf_off,"\t\tsw_dropped=%u\n",g_atm_dev.queues[i].qs[QS_SW_DROP] );
-
-#endif					
-	
-				}
-
-			}
-			break;
-		default:
-			break;
-    	}
-	if(buf_off>0)	*eof = 1;
-	return buf_off;
-}
-
-#ifdef AMAZON_TPE_AAL5_RECOVERY
-extern int (*tpe_reset)(void);
-extern int (*tpe_start)(void);
-extern int (*tpe_inject)(void);
-/*	Brief:		Reset TPE hardware
- *	Description
- *		This is a wordaround for AAL5 bug. It tries to reset TPE.
- *	 take care of software
- *	 setup all previous connection
- */
-int amazon_tpe_reset(void)
-{
-	struct atm_vcc * vcc;	
-	int err=0;
-	int i;
-	u8 * qd_addr;
-	u32 reg_l, reg_h;
-	unsigned int a_cfg_value=0;
-	unsigned int a_cfg_old_value=0;
-	atm_aal5_ifEntry_t mib_aal5;
-	atm_cell_ifEntry_t mib_cell;
-	
-	//make sure all cells transmitting out first
-	//Segmentation done
-	amazon_atm_aal5_mib(&mib_aal5);
-	reg_l = g_atm_dev.mib_counter.tx_cnt_l;
-	reg_h = g_atm_dev.mib_counter.tx_cnt_h;
-	while(1){
-		mdelay(10);
-		amazon_atm_aal5_mib(&mib_aal5);
-		if( (reg_l == g_atm_dev.mib_counter.tx_cnt_l) && (reg_h == g_atm_dev.mib_counter.tx_cnt_h) ){
-			break;
-		}
-		AMAZON_TPE_DMSG("AAL5 Segmentation still in progress!\n");
-		reg_l = g_atm_dev.mib_counter.tx_cnt_l;
-		reg_h = g_atm_dev.mib_counter.tx_cnt_h;
-	}
-	//QSB done
-	qd_addr = (u8 *) KSEG1ADDR((unsigned long)g_atm_dev.cbm.qd_addr);
-	for (i=1;i<15;i++){
-		while ( (err=readl(qd_addr+i*CBM_QD_SIZE+0x8)&0xffff) !=0  ){
-			mdelay(20);
-			AMAZON_TPE_DMSG("queue %u not empty (%u)\n",i,err);
-		}
-	}
-	//insurance for interfaces between Aware and CARB
-	mdelay(100);
-	amazon_atm_cell_mib(&mib_cell,0);
-	amazon_atm_cell_mib(&mib_cell,1);
-	amazon_atm_aal5_mib(&mib_aal5);
-	
-	mb();
-	while ( (AMAZON_READ_REGISTER_L(AR_CELLRDY_BC0) != 0 ) || (AMAZON_READ_REGISTER_L(AR_CELLRDY_BC0) != 0 )  ){
-		AMAZON_TPE_EMSG("\nwaiting for AWARE");
-		AMAZON_TPE_EMSG(" BC0 %u ", AMAZON_READ_REGISTER_L(AR_CELLRDY_BC0));
-		AMAZON_TPE_EMSG(" BC1 %u ", AMAZON_READ_REGISTER_L(AR_CELLRDY_BC1));
-		AMAZON_TPE_EMSG("\n");
-		mdelay(1);
-	}
-	// disable AAI module
-	meiDebugRead(A_CFG_ADDR,&a_cfg_value,1);	
-	a_cfg_old_value=a_cfg_value;
-	a_cfg_value &= (~(0x2800));
-	meiDebugWrite(A_CFG_ADDR,&a_cfg_value,1);	
-	//clear buffer
-	a_cfg_value = 0x1;
-	meiDebugWrite(AR_CB0_STATUS_ADDR,&a_cfg_value,1);	
-	meiDebugWrite(AR_CB1_STATUS_ADDR,&a_cfg_value,1);	
-
-	if ( atm_init_hard(&g_atm_dev) != 0){
-		return -EIO;
-	}
-	sema_init(&(g_atm_dev.swie.in_sem), 1);
-	//SWIE lock
-	clear_bit(SWIE_LOCK, &(g_atm_dev.swie.lock));
-	//SWIE wait queue
-	init_waitqueue_head(&(g_atm_dev.swie.sleep));
-	
-	for (i=CBM_DEFAULT_Q_OFFSET;i<AMAZON_ATM_MAX_QUEUE_NUM/2;i++) {
-		vcc = g_atm_dev.queues[i].vcc;
-		if (vcc != NULL){
-			set_qsb(vcc, &vcc->qos, i);
-			set_qd(vcc, i);
-			mb();
-			err=set_htu(vcc,i);
-			if (err){
-				AMAZON_TPE_EMSG("set htu entry fails %u\n",err);
-			}
-		}
-	}
-	meiDebugWrite(A_CFG_ADDR,&a_cfg_old_value,1);	
-#if 0
-	//reset DFE
-	*(AMAZON_RST_REQ) = (* AMAZON_RST_REQ) | (AMAZON_RST_REQ_DFE);
-	mb();
-	*(AMAZON_RST_REQ) = (* AMAZON_RST_REQ) &  (~AMAZON_RST_REQ_DFE);
-	mb();
-#endif
-	
-	return 0;
-}
-
-/* Brief:	Send a ATM EoP packet to save DMA channel
- */
-int amazon_tpe_inject_debug_cell(void)
-{
-	//Send a ATM cell to save DMA channel
-	u8 qid;
-	unsigned char atm_cell[48];
-	qid = 0x11;
-	AMAZON_TPE_DMSG("qid = %d\n",qid);
-	memset(atm_cell,0,48);
-	atm_cell[3] = 0x2;
-	if ( amazon_atm_swin(qid,atm_cell)) {
-		AMAZON_TPE_EMSG("cannot insert EoP cell\n");
-		return -1;
-	}
-	return 0;
-}
-
-/* Brief:	start HTU (TPE)
- */
-
-int amazon_tpe_start(void)
-{
-	AMAZON_WRITE_REGISTER_L(HTU_CFG_START ,HTU_CFG_ADDR);
-	wmb();
-	return 0;
-}
-#endif //AMAZON_TPE_AAL5_RECOVERY
-
-#ifdef AMAZON_CHECK_LINK
-extern int (*adsl_link_notify)(int);
-/*	Brief:	notify link status of ADSL link
- *	Parameters:	0	link down
- *			1	link up
- *	Returns:	0 	OK
- *	Details:	called by MEI driver 
- *	should update status and inform upper layer
- */
-int amazon_tpe_link_notify(int status)
-{
-	adsl_link_status = status;
-	AMAZON_TPE_DMSG("link status %s\n",(status==1)?"Up":"Down");
-	if (status == 0){
-		//wait until no cells in upstream queues
-		set_current_state(TASK_INTERRUPTIBLE);
-		schedule_timeout(2*HZ);
-	}
-	return 0;
-}
-#endif //ifdef AMAZON_CHECK_LINK
-
-/*
- *	Brief: 		Initialize ATM module
- *
- *  	Return Value:	ENOMEM		- No memory available
- *			EBUSY		- Cannot register atm device
- *			ERESTARTSYS 	- Process interrupted by other signal
- *			0		- OK, module initialized
- *
- *	Description:
- *	This function registers an atm device for all UTOPIA devices.
- *	It also allocates memory for the private device data structures
- */
-int __init amazon_atm_net_init(void)
-{
-	int i;
-	int err=0;
-	amazon_atm_dev_t *dev = NULL;
-	
-	if ((dev=amazon_atm_create()) != NULL){
-		for(i=0;i<AMAZON_ATM_PORT_NUM;i++){
-			if (!dev->ports[i].enable){
-				amazon_atm_devs[i] = NULL;
-				continue;
-			}
-			amazon_atm_devs[i] =atm_dev_register("amazon_atm",&amazon_atm_ops,-1,0UL);
-			if (amazon_atm_devs[i] == NULL){
-				AMAZON_TPE_EMSG("atm_dev_register fails\n");
-				err = -EIO;
-				goto amazon_atm_net_init_exit;
-			}else{
-				AMAZON_TPE_DMSG("registering device %u\n",i);
-				amazon_atm_devs[i]->ci_range.vpi_bits = 8;
-				amazon_atm_devs[i]->ci_range.vci_bits = 16;
-				amazon_atm_devs[i]->link_rate = dev->ports[i].tx_max_cr;
-				amazon_atm_devs[i]->dev_data = (void *) i;
-			}
-		}
-			
-	}else{
-		err = -ENOMEM;
-		AMAZON_TPE_EMSG("cannot init atm device\n");
-		goto amazon_atm_net_init_exit;
-	}
-#ifdef AMAZON_TPE_AAL5_RECOVERY	
-	tpe_reset = & amazon_tpe_reset;
-	tpe_start = & amazon_tpe_start;
-	tpe_inject = & amazon_tpe_inject_debug_cell;
-#endif //AMAZON_TPE_AAL5_RECOVERY
-#ifdef AMAZON_CHECK_LINK
-	adsl_link_notify=amazon_tpe_link_notify;
-#endif //AMAZON_CHECK_LINK
-amazon_atm_net_init_exit:
-	return err;
-}
-
-void __exit amazon_atm_net_cleanup(void)
-{
-	int i;
-	amazon_atm_cleanup();
-	for(i=0;i<AMAZON_ATM_PORT_NUM;i++){
-		if (amazon_atm_devs[i] != NULL){
-			AMAZON_TPE_DMSG("unregister dev %u\n",i);
-			atm_dev_deregister(amazon_atm_devs[i]);
-		}
-	}
-	return;
-}
-EXPORT_SYMBOL(get_oam_time_stamp);
-
-MODULE_LICENSE ("GPL"); 
-MODULE_AUTHOR("Infineon IFAP DC COM peng.liu@infineon.com");
-MODULE_DESCRIPTION("AMAZON ATM driver");
-
-module_init(amazon_atm_net_init);
-module_exit(amazon_atm_net_cleanup);
- 
-
-
-
-
diff --git a/target/linux/amazon/files/drivers/char/amazon_mei.c b/target/linux/amazon/files/drivers/char/amazon_mei.c
deleted file mode 100644
index 7efe52ed6..000000000
--- a/target/linux/amazon/files/drivers/char/amazon_mei.c
+++ /dev/null
@@ -1,7918 +0,0 @@
-/* ============================================================================
- * Copyright (C) 2004 -Infineon Technologies AG.
- *
- * All rights reserved.
- * ============================================================================
- *
- *============================================================================
- * Licensed under GNU GPL v2
- * ============================================================================
- */
-
- 
-/* ===========================================================================
- *
- * File Name:   amazon_mei.c
- * Author :     Ou Ke
- *
- * ===========================================================================
- *
- * Project: Amazon
- *
- * ===========================================================================
- * Contents:This file implements the MEI driver for Amazon ADSL/ADSL2+
- *  controller.
- *  
- * ===========================================================================
- * References: 
- *
- */
-
-
-/* ===========================================================================
- * Revision History:
- * 		12/1/2005 : Ritesh Banerjee
- * 			- Create a kernel thread kmibpoll to poll for periodic RFC 2662
- * 			and RFC 3440 counters. Removes the need for user space 
- * 			adsl_mibpoll_daemon and saves atleast 30KB of RAM.
- *
- * $Log$
- * ===========================================================================
- */
-
-/*
- * ===========================================================================
- *                           INCLUDE FILES
- * ===========================================================================
- */
-//000002:fchang 2005/6/2 joelin 04/27/2005 for pcm clock
-//000003:fchang 2005/6/2 Henry added for Amazon-E support
-//165001:henryhsu 2005/9/6 Modify for adsl firmware version 1.2.1.2.0.1 DATA_LED can't flash.
-// 509221:tc.chen 2005/09/22 Reset DFE added when MEI_TO_ARC_CS_DONE not cleared by ARC
-// 603221:tc.chen 2006/03/21 added APIs to support the WEB related parameters for ADSL Statistics
-
-#ifndef EXPORT_SYMTAB
-#define EXPORT_SYMTAB
-#endif
-#define AMAZON_MEI_MIB_RFC3440
-
-#include <linux/config.h>
-#include <linux/kernel.h>
-#include <linux/module.h>               
-#include <linux/version.h>
-#include <linux/types.h>
-#include <linux/fs.h>
-#include <linux/mm.h>
-#include <linux/errno.h>
-#include <linux/interrupt.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <asm/irq.h>
-#include <asm/segment.h>
-#include <asm/semaphore.h>
-#include <linux/init.h>                                  
-#include <linux/ioport.h>
-#include <asm/uaccess.h>                       
-#include <linux/proc_fs.h>
-#include <asm/io.h>
-#include <linux/vmalloc.h>
-#include <linux/delay.h>
-#include <linux/poll.h>
-#include <linux/list.h>
-#include <linux/time.h>
-
-#include <asm/amazon/amazon.h>
-#include <asm/irq.h>
-#include <asm/amazon/irq.h>
-#include <asm/amazon/amazon_mei.h>
-#include <asm/amazon/amazon_mei_app.h>
-#include <asm/amazon/amazon_mei_ioctl.h>
-#include <asm/amazon/amazon_mei_app_ioctl.h>
-
-#define SET_BIT(reg, mask)                  reg |= (mask)
-#define CLEAR_BIT(reg, mask)                reg &= (~mask)
-#define CLEAR_BITS(reg, mask)               CLEAR_BIT(reg, mask)
-#define SET_BITS(reg, mask)                 SET_BIT(reg, mask)
-#define SET_BITFIELD(reg, mask, off, val)   {reg &= (~mask); reg |= (val << off);}
-
-extern void mask_and_ack_amazon_irq(unsigned int irq_nr);
-
-#ifdef AMAZON_CHECK_LINK
-//amazon_tpe.c
-extern int (*adsl_link_notify)(int);
-#endif //AMAZON_CHECK_LINK
-
-// for ARC memory access
-#define WHILE_DELAY 20000
-#define AMAZON_DMA_DEBUG_MUTEX
-
-
-//TODO
-#undef DFE_LOOPBACK
-#define ARC_READY_ACK
-
-static amazon_mei_mib * current_intvl;
-static struct list_head interval_list;
-static amazon_mei_mib * mei_mib;
-
-static int reboot_firsttime=1;//000002:fchang
-
-	//PCM
-#define PCM_CHANNEL_NUM		2	//1 rx, 1 tx
-static pcm_data_struct	pcm_data[PCM_CHANNEL_NUM]__attribute__ ((aligned(4)));	//0=tx0, 1=rx0, 2=tx1, 3=rx1
-static u32 pcm_start_addr;
-//#define PCM_HRT_TIME_HZ		4000	//?us
-#define PCM_ACCESS_DEBUG
-static int irqtimes=0;
-#undef DATA_LED_ON_MODE
-#define ADSL_LED_SUPPORT	//joelin for adsl led
-#ifdef ADSL_LED_SUPPORT
-static int firmware_support_led=0; //joelin version check 	for adsl led	
-static int stop_led_module=0;	//wakeup and clean led module
-static int led_support_check=0;	//1.1.2.7.1.1
-#endif //ADSL_LED_SUPPORT
-#define IFX_DYING_GASP
-#ifdef IFX_DYING_GASP
-static wait_queue_head_t wait_queue_dying_gasp;	//dying gasp
-//struct tq_struct dying_gasp_task; 		//dying gasp
-static wait_queue_head_t wait_queue_uas_poll;	//joelin 04/16/2005
-static u16 unavailable_seconds=0;		//joelin 04/16/2005
-static meidebug lop_debugwr;				//dying gasp
-#endif //IFX_DYING_GASP
-static int dbg_int=0;
-//#define DEBUG_ACCESS_DELAY	for(dbg_int=0;dbg_int<100;dbg_int++){;}
-#define DEBUG_ACCESS_DELAY
-static u8 sampledata[512];
-static int firsttime[PCM_CHANNEL_NUM]={0,1};
-static int num_cmp[PCM_CHANNEL_NUM]={0,0};
-static int pcm_start_loc[PCM_CHANNEL_NUM]={0,0}; 
-
-	// for clearEoC 
-//#define MEI_CLREOC_BUFF_SIZE	512	//double the receive fifo size, bytes
-//static u8 clreoc[MEI_CLREOC_BUFF_SIZE]__attribute__ ((aligned(4)));	//buffer to hold clearEoC data in bytes
-#undef AMAZON_CLEAR_EOC
-#ifdef AMAZON_CLEAR_EOC
-extern void ifx_push_eoc(struct sk_buff * pkt);
-#endif
-static int meiResetArc(void); 
-#define IFX_POP_EOC_DONE	0
-#define IFX_POP_EOC_FAIL	-1
-static struct list_head clreoc_list;
-static amazon_clreoc_pkt * clreoc_pkt;
-#define CLREOC_BUFF_SIZE	12	//number of clreoc commands being buffered
-//static int clreoc_wr=0;
-//static int clreoc_rd=0;		//used to control clreoc circular buffer 
-static wait_queue_head_t wait_queue_clreoc;
-#ifdef ADSL_LED_SUPPORT
-static wait_queue_head_t wait_queue_led;	//adsl led
-static wait_queue_head_t wait_queue_led_polling;// adsl led
-struct tq_struct led_task; 			// adsl led
-static DECLARE_TASK_QUEUE(tq_ifx_led);		// task
-int adsl_led_flash_task(void *ptr);		// adsl led
-#endif	//ADSL_LED_SUPPORT
-static void * clreoc_command_pkt=NULL;
-static int clreoc_max_tx_len=0;
-
-// 603221:tc.chen start
-#define ME_HDLC_IDLE 0
-#define ME_HDLC_INVALID_MSG 1
-#define ME_HDLC_MSG_QUEUED 2
-#define ME_HDLC_MSG_SENT 3
-#define ME_HDLC_RESP_RCVD 4
-#define ME_HDLC_RESP_TIMEOUT 5
-#define ME_HDLC_RX_BUF_OVERFLOW 6
-#define ME_HDLC_UNRESOLVED 1
-#define ME_HDLC_RESOLVED 2
-// 603221:tc.chen end
-
-#ifdef LOCK_RETRY
-static int reboot_lock=0;
-#endif
-
-static mib_previous_read mib_pread={0,0,0,0,0,0,0,0,0,0,0,0};
-static mib_flags_pretime mib_pflagtime;// initialized when module loaded
-
-	static u32 ATUC_PERF_LOFS=0;
-	static u32 ATUC_PERF_LOSS=0;
-	static u32 ATUC_PERF_ESS=0;
-	static u32 ATUC_PERF_INITS=0;
-	static u32 ATUR_PERF_LOFS=0;
-	static u32 ATUR_PERF_LOSS=0;
-	static u32 ATUR_PERF_LPR=0;
-	static u32 ATUR_PERF_ESS=0;
-	static u32 ATUR_CHAN_RECV_BLK=0;
-	static u32 ATUR_CHAN_TX_BLK=0;
-	static u32 ATUR_CHAN_CORR_BLK=0;
-	static u32 ATUR_CHAN_UNCORR_BLK=0;
-	//RFC-3440
-	static u32 ATUC_PERF_STAT_FASTR=0;
-	static u32 ATUC_PERF_STAT_FAILED_FASTR=0;
-	static u32 ATUC_PERF_STAT_SESL=0;
-	static u32 ATUC_PERF_STAT_UASL=0;
-	static u32 ATUR_PERF_STAT_SESL=0;
-	static u32 ATUR_PERF_STAT_UASL=0;
-
-	static adslChanPrevTxRate PrevTxRate={0,0};
-	static adslPhysCurrStatus CurrStatus={0,0};
-	static ChanType chantype={0,0};
-	static adslLineAlarmConfProfileEntry AlarmConfProfile={"No Name\0",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1};
-// 603221:tc.chen start
-	static adslFarEndPerfStats FarendStatsData;
-	struct timeval FarendData_acquire_time={0};
-	static u32 adsl_mode,adsl_mode_extend; // adsl mode : adsl/ 2/ 2+
-	static adslInitStats AdslInitStatsData;
-//603221:tc.chen end
-static u32 loop_diagnostics_mode=0;
-static wait_queue_head_t wait_queue_loop_diagnostic;
-#ifdef AMAZON_MEI_MIB_RFC3440
-	static adslLineAlarmConfProfileExtEntry AlarmConfProfileExt={"No Name\0",0,0,0,0,0,0};
-#endif
-
-static int showtime=0;
-static int loop_diagnostics_completed=0;
-//////////////////////////////////////////////////////////////////////////////////
-static int phy_mei_net_init(struct net_device * dev);
-static int interleave_mei_net_init(struct net_device * dev);
-static int fast_mei_net_init(struct net_device * dev);
-static struct net_device_stats * phy_mei_net_get_stats(struct net_device * dev);
-static struct net_device_stats * interleave_mei_net_get_stats(struct net_device * dev);
-static struct net_device_stats * fast_mei_net_get_stats(struct net_device * dev);
-
-typedef struct mei_priv{
-        struct net_device_stats stats;
-}mei_priv;
-
-static struct net_device phy_mei_net = { init: phy_mei_net_init, name: "MEI_PHY"};
-static struct net_device interleave_mei_net = { init: interleave_mei_net_init, name: "MEI_INTL"};
-static struct net_device fast_mei_net = { init: fast_mei_net_init, name: "MEI_FAST"};
-///////////////////////////////////////////////////////////////////////////////////
-
-static int major=AMAZON_MEI_MAJOR;
-
-static struct semaphore mei_sema;
-
-// Mei to ARC CMV count, reply count, ARC Indicator count
-static int indicator_count=0;
-static int cmv_count=0;
-static int reply_count=0;
-static u16 Recent_indicator[MSG_LENGTH];
-
-// Used in interrupt handler as flags
-static int arcmsgav=0;
-static int cmv_reply=0;
-static int cmv_waiting=0;
-
-#define PROC_ITEMS 8
-
-long mei_debug_mode = 0; //509221:tc.chen for adsl firmware debug
-
-//  to wait for arc cmv reply, sleep on wait_queue_arcmsgav;
-static wait_queue_head_t wait_queue_arcmsgav;
-static wait_queue_head_t wait_queue_codeswap;
-static wait_queue_head_t wait_queue_mibdaemon;
-static wait_queue_head_t wait_queue_reboot;
-static u32 * image_buffer=NULL;        	// holding adsl firmware image
-static u16 RxMessage[MSG_LENGTH]__attribute__ ((aligned(4)));
-static u16 TxMessage[MSG_LENGTH]__attribute__ ((aligned(4)));                                                                                                               
-static u32 * mei_arc_swap_buff=NULL;   	//  holding swap pages
-static ARC_IMG_HDR * img_hdr;
-static int reboot_flag;
-
-#ifdef DFE_LOOPBACK
-#include "arc_pm.h"
-#endif
-
-
-/////////////////               net device                              ///////////////////////////////////////////////////
-static int phy_mei_net_init(struct net_device * dev)
-{
-        //ether_setup(dev);
-        dev->get_stats = phy_mei_net_get_stats;
-        dev->ip_ptr = NULL;
-	dev->type = 94;
-	
-//	dev->mtu=12345;
-	dev->flags=IFF_UP;
-	
-        dev->priv = kmalloc(sizeof(struct mei_priv), GFP_KERNEL);
-        if(dev->priv == NULL)
-                return -ENOMEM;
-        memset(dev->priv, 0, sizeof(struct mei_priv));
-        return 0;
-}
-
-static int interleave_mei_net_init(struct net_device * dev)
-{
-        //ether_setup(dev);
-        dev->get_stats = interleave_mei_net_get_stats;
-        dev->ip_ptr = NULL;
-	dev->type = 124;
-	dev->flags=IFF_UP;
-        dev->priv = kmalloc(sizeof(struct mei_priv), GFP_KERNEL);
-        if(dev->priv == NULL)
-                return -ENOMEM;
-        memset(dev->priv, 0, sizeof(struct mei_priv));
-        return 0;
-}
-
-static int fast_mei_net_init(struct net_device * dev)
-{
-        //ether_setup(dev);
-        dev->get_stats = fast_mei_net_get_stats;
-        dev->ip_ptr = NULL;
-	dev->type = 125;
-	dev->flags=IFF_UP;
-        dev->priv = kmalloc(sizeof(struct mei_priv), GFP_KERNEL);
-        if(dev->priv == NULL)
-                return -ENOMEM;
-        memset(dev->priv, 0, sizeof(struct mei_priv));
-        return 0;
-}
-
-static struct net_device_stats * phy_mei_net_get_stats(struct net_device * dev)
-{
-        struct mei_priv * priv;
-        priv = (struct mei_priv *)dev->priv;
-	// update statistics
-	(priv->stats).rx_packets = ATUR_CHAN_RECV_BLK;
-	(priv->stats).tx_packets = ATUR_CHAN_TX_BLK;
-	(priv->stats).rx_errors = ATUR_CHAN_CORR_BLK + ATUR_CHAN_UNCORR_BLK;
-	(priv->stats).rx_dropped = ATUR_CHAN_UNCORR_BLK;
-	
-        return &(priv->stats);
-}
-
-static struct net_device_stats * interleave_mei_net_get_stats(struct net_device * dev)
-{
-        struct mei_priv * priv;
-        priv = (struct mei_priv *)dev->priv;
-	// update statistics
-	(priv->stats).rx_packets = ATUR_CHAN_RECV_BLK;
-	(priv->stats).tx_packets = ATUR_CHAN_TX_BLK;
-	(priv->stats).rx_errors = ATUR_CHAN_CORR_BLK + ATUR_CHAN_UNCORR_BLK;
-	(priv->stats).rx_dropped = ATUR_CHAN_UNCORR_BLK;
-	
-        return &(priv->stats);
-}
-
-static struct net_device_stats * fast_mei_net_get_stats(struct net_device * dev)
-{
-        struct mei_priv * priv;
-        priv = (struct mei_priv *)dev->priv;
-	// update statistics
-	(priv->stats).rx_packets = ATUR_CHAN_RECV_BLK;
-	(priv->stats).tx_packets = ATUR_CHAN_TX_BLK;
-	(priv->stats).rx_errors = ATUR_CHAN_CORR_BLK + ATUR_CHAN_UNCORR_BLK;
-	(priv->stats).rx_dropped = ATUR_CHAN_UNCORR_BLK;
-	
-        return &(priv->stats);
-}
-/////////////////               mei access Rd/Wr methods       ///////////////////////////////////////////////////
-void meiLongwordWrite(u32 ul_address, u32 ul_data)
-{
-	*((volatile u32 *)ul_address) = ul_data;
-	asm("SYNC");
-	return;
-} //	end of "meiLongwordWrite(..."
-
-void meiLongwordRead(u32 ul_address, u32 *pul_data)
-{
-	*pul_data = *((volatile u32 *)ul_address);
-	asm("SYNC");
-	return;
-} //	end of "meiLongwordRead(..."
-
-MEI_ERROR meiDMAWrite(u32 destaddr, u32 *databuff, u32 databuffsize)
-{
-	u32 *p = databuff;
-	u32 temp;
-	u32 flags;
-
-	if( destaddr & 3)
-		return MEI_FAILURE;
-
-#ifdef AMAZON_DMA_DEBUG_MUTEX
-	save_flags(flags);
-	cli();
-#endif
-		
-
-	//	Set the write transfer address
-	meiLongwordWrite(MEI_XFR_ADDR, destaddr);
-
-	//	Write the data pushed across DMA
-	while (databuffsize--)
-	{
-		temp = *p;
-		if(databuff==(u32 *)TxMessage)	// swap half word
-			temp = ((temp & 0xffff)<<16) + ((temp & 0xffff0000)>>16);
-		meiLongwordWrite(MEI_DATA_XFR, temp);
-		p++;
-	} // 	end of "while(..."
-
-#ifdef AMAZON_DMA_DEBUG_MUTEX
-	restore_flags(flags);	
-#endif
-	
-	return MEI_SUCCESS;
-
-} //	end of "meiDMAWrite(..."
-
-MEI_ERROR meiDMAWrite_16(u32 destaddr, u32 *databuff, u32 databuffsize)
-{
-	u32 *p = databuff;
-	u32 temp;
-	u32 flags;
-
-	if( destaddr & 3)
-		return MEI_FAILURE;
-		
-#ifdef AMAZON_DMA_DEBUG_MUTEX
-	save_flags(flags);
-	cli();
-#endif
-		
-
-	//	Set the write transfer address
-	meiLongwordWrite(MEI_XFR_ADDR, destaddr);
-
-	//	Write the data pushed across DMA
-	while (databuffsize--)
-	{
-		temp = *p;
-		temp = ((temp & 0xffff)<<16) + ((temp & 0xffff0000)>>16);//swap half word
-		meiLongwordWrite(MEI_DATA_XFR, temp);
-		p++;
-	} // 	end of "while(..."
-	
-#ifdef AMAZON_DMA_DEBUG_MUTEX
-	restore_flags(flags);
-#endif
-
-	return MEI_SUCCESS;
-
-} //	end of "meiDMAWrite_16(..."
-
-MEI_ERROR meiDMAWrite_8(u32 destaddr, u32 *databuff, u32 databuffsize)
-{
-	u32 *p = databuff;
-	u32 temp;
-	u32 flags;
-
-	if( destaddr & 3)
-		return MEI_FAILURE;
-		
-#ifdef AMAZON_DMA_DEBUG_MUTEX
-	save_flags(flags);
-	cli();
-#endif
-		
-
-	//	Set the write transfer address
-	meiLongwordWrite(MEI_XFR_ADDR, destaddr);
-
-	//	Write the data pushed across DMA
-	while (databuffsize--)
-	{
-		temp = *p;
-		temp = ((temp & 0xff)<<24) + ((temp & 0xff00)<<8)+ ((temp & 0xff0000)>>8)+ ((temp & 0xff000000)>>24);//swap byte
-		meiLongwordWrite(MEI_DATA_XFR, temp);
-		p++;
-	} // 	end of "while(..."
-	
-#ifdef AMAZON_DMA_DEBUG_MUTEX
-	restore_flags(flags);
-#endif
-
-	return MEI_SUCCESS;
-
-} //	end of "meiDMAWrite_8(..."
-
-MEI_ERROR meiDMARead(u32 srcaddr, u32 *databuff, u32 databuffsize)
-{
-	u32 *p = databuff;
-	u32 temp;
-	u32 flags;
-	
-	if( srcaddr & 3)
-		return MEI_FAILURE;
-
-#ifdef AMAZON_DMA_DEBUG_MUTEX
-	save_flags(flags);
-	cli();
-#endif
-	
-
-	//	Set the read transfer address
-	meiLongwordWrite(MEI_XFR_ADDR, srcaddr);
-
-	//	Read the data popped across DMA
-	while (databuffsize--)
-	{
-		meiLongwordRead(MEI_DATA_XFR, &temp);
-		if(databuff==(u32 *)RxMessage)	// swap half word
-			temp = ((temp & 0xffff)<<16) + ((temp & 0xffff0000)>>16);
-		*p=temp;
-		p++;
-	} // 	end of "while(..."
-
-#ifdef AMAZON_DMA_DEBUG_MUTEX
-	restore_flags(flags);
-#endif
-
-	return MEI_SUCCESS;
-
-} //	end of "meiDMARead(..."
-
-MEI_ERROR meiDMARead_16(u32 srcaddr, u32 *databuff, u32 databuffsize)
-{
-	u32 *p = databuff;
-	u32 temp;
-	u32 flags;
-	
-	if( srcaddr & 3)
-		return MEI_FAILURE;
-		
-#ifdef AMAZON_DMA_DEBUG_MUTEX
-	save_flags(flags);
-	cli();
-#endif
-		
-
-	//	Set the read transfer address
-	meiLongwordWrite(MEI_XFR_ADDR, srcaddr);
-
-	//	Read the data popped across DMA
-	while (databuffsize--)
-	{
-		meiLongwordRead(MEI_DATA_XFR, &temp);
-		temp = ((temp & 0xffff)<<16) + ((temp & 0xffff0000)>>16);
-		*p=temp;
-		p++;
-	} // 	end of "while(..."
-	
-#ifdef AMAZON_DMA_DEBUG_MUTEX
-	restore_flags(flags);
-#endif
-
-	return MEI_SUCCESS;
-
-} //	end of "meiDMARead_16(..."
-
-MEI_ERROR meiDMARead_8(u32 srcaddr, u32 *databuff, u32 databuffsize)
-{
-	u32 *p = databuff;
-	u32 temp;
-	u32 flags;
-	
-	if( srcaddr & 3)
-		return MEI_FAILURE;
-		
-#ifdef AMAZON_DMA_DEBUG_MUTEX
-	save_flags(flags);
-	cli();
-#endif
-		
-
-	//	Set the read transfer address
-	meiLongwordWrite(MEI_XFR_ADDR, srcaddr);
-
-	//	Read the data popped across DMA
-	while (databuffsize--)
-	{
-		meiLongwordRead(MEI_DATA_XFR, &temp);
-		temp = ((temp & 0xff)<<24) + ((temp & 0xff00)<<8)+ ((temp & 0xff0000)>>8)+ ((temp & 0xff000000)>>24);//swap byte
-		*p=temp;
-		p++;
-	} // 	end of "while(..."
-	
-#ifdef AMAZON_DMA_DEBUG_MUTEX
-	restore_flags(flags);
-#endif
-
-	return MEI_SUCCESS;
-
-} //	end of "meiDMARead_8(..."
-
-void meiPollForDbgDone(void)
-{
-	u32	query = 0;
-	int 	i=0;
-	while (i<WHILE_DELAY)
-	{
-		meiLongwordRead(ARC_TO_MEI_INT, &query);
-		query &= (ARC_TO_MEI_DBG_DONE);
-		if(query)
-			break;
-		i++;
-		if(i==WHILE_DELAY){
-#ifdef AMAZON_MEI_DEBUG_ON
-			printk("\n\n PollforDbg fail");
-#endif
-		}
-			DEBUG_ACCESS_DELAY;
-	} 
-   	meiLongwordWrite(ARC_TO_MEI_INT,  ARC_TO_MEI_DBG_DONE);  // to clear this interrupt
-} //	end of "meiPollForDbgDone(..."
-
-MEI_ERROR meiDebugWrite_8(u32 destaddr, u32 *databuff, u32 databuffsize)
-{
-	u32 i;
-	u32 temp = 0x0;
-	u32 address = 0x0;
-	u32 *buffer = 0x0;
-	u32 flags;
-	
-#ifdef AMAZON_DMA_DEBUG_MUTEX
-	save_flags(flags);
-	cli();
-#endif
-	
-
-	//	Open the debug port before DMP memory write
-	meiLongwordRead(MEI_CONTROL, &temp);
-		DEBUG_ACCESS_DELAY;	
-	temp |= (HOST_MSTR);
-	meiLongwordWrite(MEI_CONTROL, temp);
-		DEBUG_ACCESS_DELAY;
-	meiLongwordWrite(MEI_DEBUG_DEC, MEI_DEBUG_DEC_DMP1_MASK);
-		DEBUG_ACCESS_DELAY;
-
-	//	For the requested length, write the address and write the data
-	address = destaddr;
-	buffer = databuff;
-	for (i=0; i < databuffsize; i++)
-	{
-		meiLongwordWrite(MEI_DEBUG_WAD, address);
-			DEBUG_ACCESS_DELAY;
-		temp=*buffer;
-		temp = ((temp & 0xff)<<24) + ((temp & 0xff00)<<8)+ ((temp & 0xff0000)>>8)+ ((temp & 0xff000000)>>24);//swap byte
-		meiLongwordWrite(MEI_DEBUG_DATA, temp);
-			DEBUG_ACCESS_DELAY;
-		meiPollForDbgDone();
-		address += 4;
-		buffer++;
-	} //	end of "for(..."
-
-	//	Close the debug port after DMP memory write
-	meiLongwordRead(MEI_CONTROL, &temp);
-		DEBUG_ACCESS_DELAY;
-	temp &= ~(HOST_MSTR);
-	meiLongwordWrite(MEI_CONTROL, temp);
-		DEBUG_ACCESS_DELAY;
-		
-#ifdef AMAZON_DMA_DEBUG_MUTEX
-	restore_flags(flags);
-#endif
-
-	//	Return
-	return MEI_SUCCESS;
-
-} //	end of "meiDebugWrite_8(..."
-
-MEI_ERROR meiDebugRead_8(u32 srcaddr, u32 *databuff, u32 databuffsize)
-{
-	u32 i;
-	u32 temp = 0x0;
-	u32 address = 0x0;
-	u32 *buffer = 0x0;
-	u32 flags;
-	
-#ifdef AMAZON_DMA_DEBUG_MUTEX
-	save_flags(flags);
-	cli();
-#endif
-	
-
-	//	Open the debug port before DMP memory read
-	meiLongwordRead(MEI_CONTROL, &temp);
-		DEBUG_ACCESS_DELAY;
-	temp |= (HOST_MSTR);
-	meiLongwordWrite(MEI_CONTROL, temp);
-		DEBUG_ACCESS_DELAY;
-	meiLongwordWrite(MEI_DEBUG_DEC, MEI_DEBUG_DEC_DMP2_MASK);
-		DEBUG_ACCESS_DELAY;
-
-	//	For the requested length, write the address and read the data
-	address = srcaddr;
-	buffer = databuff;
-	for (i=0; i<databuffsize; i++)
-	{
-		meiLongwordWrite(MEI_DEBUG_RAD, address);
-			DEBUG_ACCESS_DELAY;
-		meiPollForDbgDone();
-		meiLongwordRead(MEI_DEBUG_DATA, &temp);
-			DEBUG_ACCESS_DELAY;
-		temp = ((temp & 0xff)<<24) + ((temp & 0xff00)<<8)+ ((temp & 0xff0000)>>8)+ ((temp & 0xff000000)>>24);//swap byte
-		*buffer=temp;
-		address += 4;
-		buffer++;
-	} //	end of "for(..."
-
-	//	Close the debug port after DMP memory read
-	meiLongwordRead(MEI_CONTROL, &temp);
-		DEBUG_ACCESS_DELAY;
-	temp &= ~(HOST_MSTR);
-	meiLongwordWrite(MEI_CONTROL, temp);
-		DEBUG_ACCESS_DELAY;
-		
-#ifdef AMAZON_DMA_DEBUG_MUTEX
-	restore_flags(flags);
-#endif
-
-	//	Return
-	return MEI_SUCCESS;
-
-} //	end of "meiDebugRead_8(..."
-
-MEI_ERROR meiDebugWrite_16(u32 destaddr, u32 *databuff, u32 databuffsize)
-{
-	u32 i;
-	u32 temp = 0x0;
-	u32 address = 0x0;
-	u32 *buffer = 0x0;
-	u32 flags;
-	
-#ifdef AMAZON_DMA_DEBUG_MUTEX
-	save_flags(flags);
-	cli();
-#endif
-	
-
-	//	Open the debug port before DMP memory write
-	meiLongwordRead(MEI_CONTROL, &temp);
-		DEBUG_ACCESS_DELAY;
-	temp |= (HOST_MSTR);
-	meiLongwordWrite(MEI_CONTROL, temp);
-		DEBUG_ACCESS_DELAY;
-	meiLongwordWrite(MEI_DEBUG_DEC, MEI_DEBUG_DEC_DMP1_MASK);
-		DEBUG_ACCESS_DELAY;
-
-	//	For the requested length, write the address and write the data
-	address = destaddr;
-	buffer = databuff;
-	for (i=0; i < databuffsize; i++)
-	{
-		meiLongwordWrite(MEI_DEBUG_WAD, address);
-			DEBUG_ACCESS_DELAY;
-		temp=*buffer;
-		temp = ((temp & 0xffff)<<16) + ((temp & 0xffff0000)>>16);//swap half word
-		meiLongwordWrite(MEI_DEBUG_DATA, temp);
-			DEBUG_ACCESS_DELAY;
-		meiPollForDbgDone();
-		address += 4;
-		buffer++;
-	} //	end of "for(..."
-
-	//	Close the debug port after DMP memory write
-	meiLongwordRead(MEI_CONTROL, &temp);
-		DEBUG_ACCESS_DELAY;
-	temp &= ~(HOST_MSTR);
-	meiLongwordWrite(MEI_CONTROL, temp);
-		DEBUG_ACCESS_DELAY;
-		
-#ifdef AMAZON_DMA_DEBUG_MUTEX
-	restore_flags(flags);
-#endif
-
-	//	Return
-	return MEI_SUCCESS;
-
-} //	end of "meiDebugWrite_16(..."
-
-MEI_ERROR meiDebugRead_16(u32 srcaddr, u32 *databuff, u32 databuffsize)
-{
-	u32 i;
-	u32 temp = 0x0;
-	u32 address = 0x0;
-	u32 *buffer = 0x0;
-	u32 flags;
-	
-#ifdef AMAZON_DMA_DEBUG_MUTEX
-	save_flags(flags);
-	cli();
-#endif
-	
-
-	//	Open the debug port before DMP memory read
-	meiLongwordRead(MEI_CONTROL, &temp);
-		DEBUG_ACCESS_DELAY;
-	temp |= (HOST_MSTR);
-	meiLongwordWrite(MEI_CONTROL, temp);
-		DEBUG_ACCESS_DELAY;
-	meiLongwordWrite(MEI_DEBUG_DEC, MEI_DEBUG_DEC_DMP2_MASK);
-		DEBUG_ACCESS_DELAY;
-
-	//	For the requested length, write the address and read the data
-	address = srcaddr;
-	buffer = databuff;
-	for (i=0; i<databuffsize; i++)
-	{
-		meiLongwordWrite(MEI_DEBUG_RAD, address);
-			DEBUG_ACCESS_DELAY;
-		meiPollForDbgDone();
-		meiLongwordRead(MEI_DEBUG_DATA, &temp);
-			DEBUG_ACCESS_DELAY;
-		temp = ((temp & 0xffff)<<16) + ((temp & 0xffff0000)>>16);//swap half word
-		*buffer=temp;
-		address += 4;
-		buffer++;
-	} //	end of "for(..."
-
-	//	Close the debug port after DMP memory read
-	meiLongwordRead(MEI_CONTROL, &temp);
-		DEBUG_ACCESS_DELAY;
-	temp &= ~(HOST_MSTR);
-	meiLongwordWrite(MEI_CONTROL, temp);
-		DEBUG_ACCESS_DELAY;
-		
-#ifdef AMAZON_DMA_DEBUG_MUTEX
-	restore_flags(flags);
-#endif
-
-	//	Return
-	return MEI_SUCCESS;
-
-} //	end of "meiDebugRead_16(..."
-
-MEI_ERROR meiDebugWrite(u32 destaddr, u32 *databuff, u32 databuffsize)
-{
-	u32 i;
-	u32 temp = 0x0;
-	u32 address = 0x0;
-	u32 *buffer = 0x0;
-	u32 flags;
-	
-#ifdef AMAZON_DMA_DEBUG_MUTEX
-	save_flags(flags);
-	cli();
-#endif
-	
-
-	//	Open the debug port before DMP memory write
-	meiLongwordRead(MEI_CONTROL, &temp);
-		DEBUG_ACCESS_DELAY;
-	temp |= (HOST_MSTR);
-	meiLongwordWrite(MEI_CONTROL, temp);
-		DEBUG_ACCESS_DELAY;
-	meiLongwordWrite(MEI_DEBUG_DEC, MEI_DEBUG_DEC_DMP1_MASK);
-		DEBUG_ACCESS_DELAY;
-
-	//	For the requested length, write the address and write the data
-	address = destaddr;
-	buffer = databuff;
-	for (i=0; i < databuffsize; i++)
-	{
-		meiLongwordWrite(MEI_DEBUG_WAD, address);
-			DEBUG_ACCESS_DELAY;
-		temp=*buffer;
-		meiLongwordWrite(MEI_DEBUG_DATA, temp);
-			DEBUG_ACCESS_DELAY;
-		meiPollForDbgDone();
-		address += 4;
-		buffer++;
-	} //	end of "for(..."
-
-	//	Close the debug port after DMP memory write
-	meiLongwordRead(MEI_CONTROL, &temp);
-		DEBUG_ACCESS_DELAY;
-	temp &= ~(HOST_MSTR);
-	meiLongwordWrite(MEI_CONTROL, temp);
-		DEBUG_ACCESS_DELAY;
-
-#ifdef AMAZON_DMA_DEBUG_MUTEX
-	restore_flags(flags);
-#endif
-
-	//	Return
-	return MEI_SUCCESS;
-
-} //	end of "meiDebugWrite(..."
-
-MEI_ERROR meiDebugRead(u32 srcaddr, u32 *databuff, u32 databuffsize)
-{
-	u32 i;
-	u32 temp = 0x0;
-	u32 address = 0x0;
-	u32 *buffer = 0x0;
-	u32 flags;
-	
-#ifdef AMAZON_DMA_DEBUG_MUTEX
-	save_flags(flags);
-	cli();
-#endif
-	
-
-	//	Open the debug port before DMP memory read
-	meiLongwordRead(MEI_CONTROL, &temp);
-		DEBUG_ACCESS_DELAY;
-	temp |= (HOST_MSTR);
-	meiLongwordWrite(MEI_CONTROL, temp);
-		DEBUG_ACCESS_DELAY;
-	meiLongwordWrite(MEI_DEBUG_DEC, MEI_DEBUG_DEC_DMP2_MASK);
-		DEBUG_ACCESS_DELAY;
-
-	//	For the requested length, write the address and read the data
-	address = srcaddr;
-	buffer = databuff;
-	for (i=0; i<databuffsize; i++)
-	{
-		meiLongwordWrite(MEI_DEBUG_RAD, address);
-			DEBUG_ACCESS_DELAY;
-		meiPollForDbgDone();
-		meiLongwordRead(MEI_DEBUG_DATA, &temp);
-			DEBUG_ACCESS_DELAY;
-		*buffer=temp;
-		address += 4;
-		buffer++;
-	} //	end of "for(..."
-
-	//	Close the debug port after DMP memory read
-	meiLongwordRead(MEI_CONTROL, &temp);
-		DEBUG_ACCESS_DELAY;
-	temp &= ~(HOST_MSTR);
-	meiLongwordWrite(MEI_CONTROL, temp);
-		DEBUG_ACCESS_DELAY;
-		
-#ifdef AMAZON_DMA_DEBUG_MUTEX
-	restore_flags(flags);
-#endif
-
-	//	Return
-	return MEI_SUCCESS;
-
-} //	end of "meiDebugRead(..."
-EXPORT_SYMBOL(meiDebugRead);
-
-void meiMailboxInterruptsDisable(void)
-{
-	meiLongwordWrite(ARC_TO_MEI_INT_MASK, 0x0);
-} //	end of "meiMailboxInterruptsDisable(..."
-
-void meiMailboxInterruptsEnable(void)
-{
-	meiLongwordWrite(ARC_TO_MEI_INT_MASK, MSGAV_EN); 
-} //	end of "meiMailboxInterruptsEnable(..."
-
-MEI_ERROR meiMailboxWrite(u16 *msgsrcbuffer, u16 msgsize)
-{
-	int i;
-	u32 arc_mailbox_status = 0x0;
-	u32 temp=0;
-	MEI_ERROR meiMailboxError = MEI_SUCCESS;
-
-	//	Check arc if mailbox write can be initiated
-/*	meiLongwordRead(MEI_TO_ARC_INT, &arc_mailbox_status);
-	if ((arc_mailbox_status & MEI_TO_ARC_MSGAV))
-	{
-		return MEI_MAILBOX_FULL;
-	}
-*/
-	//	Write to mailbox
-	meiMailboxError = meiDMAWrite(MEI_TO_ARC_MAILBOX, (u32*)msgsrcbuffer, msgsize/2);
-	meiMailboxError = meiDMAWrite(MEI_TO_ARC_MAILBOXR, (u32 *)(&temp), 1); 
-
-	//	Notify arc that mailbox write completed
-	cmv_waiting=1;
-	meiLongwordWrite(MEI_TO_ARC_INT, MEI_TO_ARC_MSGAV);
-	
-	i=0;
-        while(i<WHILE_DELAY){ // wait for ARC to clear the bit
-		meiLongwordRead(MEI_TO_ARC_INT, &arc_mailbox_status);
-		if((arc_mailbox_status & MEI_TO_ARC_MSGAV) != MEI_TO_ARC_MSGAV)
-			break;
-		i++;
-		if(i==WHILE_DELAY){
-#ifdef AMAZON_MEI_DEBUG_ON
-			printk("\n\n MEI_TO_ARC_MSGAV not cleared by ARC");
-#endif
-			meiMailboxError = MEI_FAILURE;
-#if 0			
-			for(i=0;i<msgsize;i++)
-				printk("\n %8x", (*(msgsrcbuffer+i)));
-#endif
-		}	
-	}      
-		
-	//	Return
-	return meiMailboxError;
-
-} //	end of "meiMailboxWrite(..."
-
-MEI_ERROR meiMailboxRead(u16 *msgdestbuffer, u16 msgsize)
-{
-	//u32 arc_mailbox_status = 0x0;
-	//u32 *mei_arc_msgbuff = 0x0;
-	MEI_ERROR meiMailboxError = MEI_SUCCESS;
-
-            /*
-            //	Check arc if mailbox read can be initiated
-	meiLongwordRead(ARC_TO_MEI_INT, &arc_mailbox_status);
-	if ((arc_mailbox_status & ARC_TO_MEI_MSGAV) == 0)
-	{
-		return MEI_MAILBOX_EMPTY;
-	} //	end of "if(..."
-            */
-            
-	//	Read from mailbox
-	meiMailboxError = meiDMARead(ARC_TO_MEI_MAILBOX, (u32*)msgdestbuffer, msgsize/2);
-
-	//	Notify arc that mailbox read completed
-	meiLongwordWrite(ARC_TO_MEI_INT, ARC_TO_MEI_MSGAV);
-
-	//	Return
-	return meiMailboxError;
-
-} //	end of "meiMailboxRead(..."
-
-MEI_ERROR meiHaltArc(void)
-{
-	u32 arc_control_mode = 0x0;
-	u32 arc_debug_addr = 0x5;
-	u32 arc_debug_data = 0x0;
-
-	//	Switch arc control from JTAG mode to MEI mode- write '1' to bit0
-	meiLongwordRead(MEI_CONTROL, &arc_control_mode);
-	arc_control_mode |= (HOST_MSTR);
-	meiLongwordWrite(MEI_CONTROL, arc_control_mode);
-
-	//	Write arc aux reg access mask (0x0) into debug addr decode reg
-	meiLongwordWrite(MEI_DEBUG_DEC, MEI_DEBUG_DEC_AUX_MASK);
-
-	//	Write arc debug reg addr (0x5) into debug read addr reg
-	meiLongwordWrite(MEI_DEBUG_RAD, arc_debug_addr);
-	meiPollForDbgDone();
-
-	//	Read debug data reg and save content
-	meiLongwordRead(MEI_DEBUG_DATA, &arc_debug_data);
-
-	//	Write arc debug reg addr (0x5) into debug write addr reg
-	meiLongwordWrite(MEI_DEBUG_WAD, arc_debug_addr);
-
-	//	Write debug data reg with content ORd with 0x2 (halt bit set)
-	arc_debug_data |= (BIT1);
-	meiLongwordWrite(MEI_DEBUG_DATA, arc_debug_data);
-       	meiPollForDbgDone();
-
-	//	Switch arc control from MEI mode to JTAG mode- write '0' to bit0
-	meiLongwordRead(MEI_CONTROL, &arc_control_mode);
-	arc_control_mode &= ~(HOST_MSTR);
-	meiLongwordWrite(MEI_CONTROL, arc_control_mode);
-
-	//	Return
-	return MEI_SUCCESS;
-
-} //	end of "meiHalt(..."
-
-MEI_ERROR meiDownloadBootCode(void)
-{
-	u32 arc_control_mode;
-	u32 boot_loop;
-	u32 page_size;
-	u32 dest_addr;
-
-	u32 arc_debug_addr = 0x31F00;
-	u32 arc_debug_data = 0x10;
-	u32 temp;
-//	int i;
-
-	//MEI_ERROR meiDMAError = MEI_SUCCESS;
-
-	//	Disable mask for arc codeswap interrupts
-	meiMailboxInterruptsDisable();
-
-	//	Switch arc control from JTAG mode to MEI mode- write '1' to bit0
-	meiLongwordRead(MEI_CONTROL, &arc_control_mode);
-	arc_control_mode |= (HOST_MSTR);
-	meiLongwordWrite(MEI_CONTROL, arc_control_mode);
-
-	//	Write (0x10) to CRI_CCR0(0x31F00) to enable ac_clk signal	
-	meiLongwordWrite(MEI_DEBUG_DEC, MEI_DEBUG_DEC_DMP1_MASK);
-	meiLongwordWrite(MEI_DEBUG_RAD, arc_debug_addr);
-	meiPollForDbgDone();
-	meiLongwordRead(MEI_DEBUG_DATA, &temp);
-	temp |=arc_debug_data;
-	
-	meiLongwordWrite(MEI_DEBUG_WAD, arc_debug_addr);
-	meiLongwordWrite(MEI_DEBUG_DATA, temp);
-        meiPollForDbgDone();
-            //meiLongwordWrite(MEI_DEBUG_DEC, MEI_DEBUG_DEC_AUX_MASK);
-
-	//	Switch arc control from MEI mode to JTAG mode- write '0' to bit0
-	meiLongwordRead(MEI_CONTROL, &arc_control_mode);
-	arc_control_mode &= ~(HOST_MSTR);
-	meiLongwordWrite(MEI_CONTROL, arc_control_mode);
-	
-#ifdef 	AMAZON_MEI_DEBUG_ON   //to test ac_clk setting correctness
-	meiLongwordRead(MEI_CONTROL, &arc_control_mode);
-	arc_control_mode |= (HOST_MSTR);
-	meiLongwordWrite(MEI_CONTROL, arc_control_mode);
-	
-	meiLongwordWrite(MEI_DEBUG_DEC, MEI_DEBUG_DEC_DMP1_MASK);
-	meiLongwordWrite(MEI_DEBUG_RAD, arc_debug_addr);
-	meiPollForDbgDone();
-	meiLongwordRead(MEI_DEBUG_DATA, &arc_debug_data);
-
-	meiLongwordRead(MEI_CONTROL, &arc_control_mode);
-	arc_control_mode &= ~(HOST_MSTR);
-	meiLongwordWrite(MEI_CONTROL, arc_control_mode);
-	
-//	printk("\n\n ac_clk is %8x\n", arc_debug_data);
-#endif
-
-	/*
-	**	DMA the boot code page(s)
-	*/
-#ifdef AMAZON_MEI_DEBUG_ON
-//	printk("\n\n start download pages");
-#endif
-	for( boot_loop = 0; boot_loop < img_hdr->count; boot_loop++)
-	{
-		if( img_hdr->page[boot_loop].p_size & BOOT_FLAG)
-		{
-			page_size = meiGetPage( boot_loop, GET_PROG, MAXSWAPSIZE, mei_arc_swap_buff, &dest_addr);
-			if( page_size > 0)
-			{
-				meiDMAWrite(dest_addr, mei_arc_swap_buff, page_size);
-			}
-		}
-		if( img_hdr->page[boot_loop].d_size & BOOT_FLAG)
-		{
-			page_size = meiGetPage( boot_loop, GET_DATA, MAXSWAPSIZE, mei_arc_swap_buff, &dest_addr);
-			if( page_size > 0)
-			{
-				meiDMAWrite( dest_addr, mei_arc_swap_buff, page_size);
-			}
-		}
-	}
-#ifdef AMAZON_MEI_DEBUG_ON
-//	printk("\n\n pages downloaded");
-#endif
-	return MEI_SUCCESS;
-
-} //	end of "meiDownloadBootCode(..."
-
-MEI_ERROR meiRunArc(void)
-{
-	u32 arc_control_mode = 0x0;
-	u32 arc_debug_addr = 0x0;
-	u32 arc_debug_data = 0x0;
-
-	//	Switch arc control from JTAG mode to MEI mode- write '1' to bit0
-	meiLongwordRead(MEI_CONTROL, &arc_control_mode);
-	arc_control_mode |= (HOST_MSTR);
-	meiLongwordWrite(MEI_CONTROL, arc_control_mode);
-
-	//	Write arc aux reg access mask (0x0) into debug addr decode reg
-	meiLongwordWrite(MEI_DEBUG_DEC, MEI_DEBUG_DEC_AUX_MASK);
-
-	//	Write arc status aux reg addr (0x0) into debug read addr reg
-	meiLongwordWrite(MEI_DEBUG_RAD, arc_debug_addr);
-	meiPollForDbgDone();
-
-	//	Read debug data reg and save content
-	meiLongwordRead(MEI_DEBUG_DATA, &arc_debug_data);
-
-	//	Write arc status aux reg addr (0x0) into debug write addr reg
-	meiLongwordWrite(MEI_DEBUG_WAD, arc_debug_addr);
-
-	//	Write debug data reg with content ANDd with 0xFDFFFFFF (halt bit cleared)
-	arc_debug_data &= ~(BIT25);
-	meiLongwordWrite(MEI_DEBUG_DATA, arc_debug_data);
-        meiPollForDbgDone();
-
-	//	Switch arc control from MEI mode to JTAG mode- write '0' to bit0
-	meiLongwordRead(MEI_CONTROL, &arc_control_mode);
-	arc_control_mode &= ~(HOST_MSTR);
-	meiLongwordWrite(MEI_CONTROL, arc_control_mode);
-
-	//	Enable mask for arc codeswap interrupts
-	meiMailboxInterruptsEnable();
-
-	//	Return
-	return MEI_SUCCESS;
-
-} //	end of "meiActivate(..."
-
-int meiGetPage( u32 Page, u32 data, u32 MaxSize, u32 *Buffer, u32 *Dest)
-{
-	u32	size;
-	u32	i;
-	u32	*p;
-
-	if( Page > img_hdr->count)
-		return -2;
-
-	/*
-	**	Get program or data size, depending on "data" flag
-	*/
-	size = (data == GET_DATA) ? img_hdr->page[ Page].d_size : img_hdr->page[ Page].p_size;
-
-	size &= BOOT_FLAG_MASK; 	//	Clear boot bit!
-	if( size > MaxSize)
-		return -1;
-
-	if( size == 0)
-		return 0;
-	/*
-	**	Get program or data offset, depending on "data" flag
-	*/
-	i = data ? img_hdr->page[ Page].d_offset : img_hdr->page[ Page].p_offset;
-
-	/*
-	**	Copy data/program to buffer
-	*/
-
-	i /= 4;	//	Adjust offset for byte-to-UINT for array operation
-
-	p = (u32 *)img_hdr + i;
-	for(i = 0; i < size; i++)
-		Buffer[i] = *p++;
-	/*
-	**	Pass back data/program destination address
-	*/
-	*Dest = data ? img_hdr->page[Page].d_dest : img_hdr->page[Page].p_dest;
-
-	return size;
-}
-
-MEI_ERROR meiCMV(u16 * request, int reply)            // write cmv to arc, if reply needed, wait for reply
-{
-        MEI_ERROR meierror;
-        wait_queue_t wait;
-        
-        cmv_reply=reply;
-        
-        meierror = meiMailboxWrite(request, MSG_LENGTH);
-	
-        if(meierror != MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-                printk("\n\n MailboxWrite Fail.");
-#endif
-                return meierror;
-        }
-        else{
-                cmv_count++;
-	}
-
-        if(cmv_reply == NO_REPLY)
-                return MEI_SUCCESS;
-
-        init_waitqueue_entry(&wait, current);
-        add_wait_queue(&wait_queue_arcmsgav, &wait);
-        set_current_state(TASK_INTERRUPTIBLE);
-//	cmv_waiting=1;
-	
-        if(arcmsgav==1){
-                set_current_state(TASK_RUNNING);
-                remove_wait_queue(&wait_queue_arcmsgav, &wait);
-        }
-        else{
-                schedule_timeout(CMV_TIMEOUT);
-                remove_wait_queue(&wait_queue_arcmsgav, &wait);
-        }
-	if(arcmsgav==0){//CMV_timeout
-		cmv_waiting=0;
-		arcmsgav=0;
-#ifdef AMAZON_MEI_DEBUG_ON
-		printk("\nmeiCMV: MEI_MAILBOX_TIMEOUT\n");
-#endif
-		return MEI_MAILBOX_TIMEOUT; 	
-	}
-	else{
-        	arcmsgav=0;
-       	 	reply_count++;
-        	return MEI_SUCCESS;
-	}
-}
-
-//TODO, for loopback test
-#ifdef DFE_LOOPBACK
-#define mte_reg_base                    (0x4800*4+0x20000)
- 
-/* Iridia Registers Address Constants */
-#define MTE_Reg(r)                              (int)(mte_reg_base + (r*4))
- 
-#define IT_AMODE                                MTE_Reg(0x0004)
-
-
-#define OMBOX_BASE 0x15F80
-#define IMBOX_BASE 0x15FC0
-
-#define TIMER_DELAY   (1024)
-#define BC0_BYTES     (32)
-#define BC1_BYTES     (30)
-#define NUM_MB        (12)
-#define TIMEOUT_VALUE 2000
-
-void BFMWait (u32 cycle) {
-  u32 i;
-  for (i = 0 ; i< cycle ; i++); 
-}
-
-void WriteRegLong(u32 addr, u32 data){
-  //printk("[%8x] <= %8x \n\n", addr, data);
-  *((volatile u32 *)(addr)) =  data; 
-}
-
-u32 ReadRegLong (u32 addr) {
-  u32	rd_val;
-  
-  rd_val = *((volatile u32 *)(addr));
-  //printk("[%8x] => %8x \n\n", addr, rd_val);
-  return rd_val;
-
-}
-
-/* This routine writes the mailbox with the data in an input array */
-void WriteMbox(u32 *mboxarray,u32 size) {
-  u32 i;
-  
-  WriteRegLong(MEI_XFR_ADDR,IMBOX_BASE);
-  for (i=0;i<size;i++) {
-    WriteRegLong(MEI_DATA_XFR,*(mboxarray+i));
-  }
-}
-
-/* This routine reads the output mailbox and places the results into an array */
-void ReadMbox(u32 *mboxarray,u32 size) {
-  u32 i;
-  
-  WriteRegLong(MEI_XFR_ADDR,OMBOX_BASE);
-  for (i=0;i<size;i++) {
-    mboxarray[i] = ReadRegLong(MEI_DATA_XFR);
-  }
-}
-
-void MEIWriteARCValue(u32 address, u32 value)
-{
-  u32 i,check = 0;
-  /* Write address register */
-  *((volatile u32 *)MEI_DEBUG_WAD) =  address;
-
-  /* Write data register */
-  *((volatile u32 *)MEI_DEBUG_DATA) =  value;
-
-  /* wait until complete - timeout at 40*/
-  for (i=0;i<40;i++) {
-    check = *((volatile u32 *)ARC_TO_MEI_INT);
-    if ((check & 0x20)) break;
-    //printk("MEIWriteARCValue: check:%8x\n\n", check);
-    }
-
-  /* clear the flag */
-  *((volatile u32 *)ARC_TO_MEI_INT)  = 0x20;
-
-}
-
-
-void post_mei_init(void)
-{
-u32 mailbox[NUM_MB];
-
-  mailbox[0] = TIMER_DELAY;
- 
-  /* set bytes per bearer channel */
-  mailbox[1] = BC0_BYTES;
-  mailbox[2] = BC1_BYTES;
-  WriteMbox(mailbox, 3);
-
-  WriteRegLong(AAI_ACCESS, 0x00000001);
-
-  /* enable ADSL block clock, ac_clk */
-  WriteRegLong(MEI_CONTROL, 0x01);
-  WriteRegLong(MEI_DEBUG_DEC, 0x00000001); // select ld/st space
-  MEIWriteARCValue(0x31F00,   0x00000010); // write CRI_CCR0 to enable ac_clk
-
-  /* set the MTE to register start */
-  MEIWriteARCValue(IT_AMODE, 0xF);
-  BFMWait(10); 
-}
-
-
-int wait_sync(void)
-{
-u32 mailbox[NUM_MB];
-  /* wait for ATM sync to be achieved on both BC0 and BC1 */
-  u32 timeout=0;
-  ReadMbox(mailbox, 1);
-  u32 readval = mailbox[0];
-  while( ((readval & 0xFFFFFFFF) == 0) && (timeout < TIMEOUT_VALUE) ) {
-    BFMWait(1);
-    //printk("wait_sync\n\n");
-    ReadMbox(mailbox, 1);
-    readval = mailbox[0];
-    timeout++;
-  }
-  if(timeout == TIMEOUT_VALUE)return 0;
-  else return 1;
-}
-#endif //DFE_LOOPBACK
-//end of TODO, for loopback test
-
-MEI_ERROR meiForceRebootAdslModem(void)
-{
-#if 0
-//#ifdef	ARC_READY_ACK
-		if(down_interruptible(&mei_sema))	//disable CMV access until ARC ready
-		{
-                	return -ERESTARTSYS;
-		}
-#endif
-	if(reboot_firsttime==1){//000002:fchang Start
-		// reset ARC
-		*((volatile u32 *)0xB0100910) = 0x80;	//reset DFE
-		asm("SYNC");
-		*((volatile u32 *)0xB0100910) = 0x0;
-		asm("SYNC");
-		if((*((volatile u32 *)0xB0100910))!=0x0)
-#ifdef AMAZON_MEI_DEBUG_ON
-			printk("\n reset DFE fail");
-#endif
-		
-		// reset ARC
-		meiLongwordWrite(MEI_CONTROL, SOFT_RESET);
-		asm("SYNC");
-		meiLongwordWrite(MEI_CONTROL, 0);
-		asm("SYNC");	
-
-	}	//000002:fchang End		
-#ifdef DFE_LOOPBACK
-                img_hdr=(ARC_IMG_HDR *)lp_image;
-#else
-		img_hdr=(ARC_IMG_HDR *)image_buffer;
-#endif		
-//		printk("\n\n enter haltarc");
-                meiHaltArc();
-//		printk("\n\n haltarc done");
-//000002:fchang Start
-	if(reboot_firsttime==0){
-		printk("\n\n new reboot");
-		meiResetArc();
-		meiResetCore();
-	}
-	if(reboot_firsttime==1)
-                meiDownloadBootCode();
-	else
-		mei_ioctl((struct inode *)NULL, (struct file *)NULL, AMAZON_MEI_DOWNLOAD, (unsigned long)NULL);
-
-//000002:fchang End
-#ifdef AMAZON_MEI_DEBUG_ON
-//		printk("\n\n Download Done");
-#endif
-
-#ifdef	DFE_LOOPBACK
-		post_mei_init();
-#endif		
-
-//		sema_init(&mei_sema, 1);
-		//up(&mei_sema);
-
-//		enable_irq(AMAZON_MEI_INT);
-					
-		meiRunArc();
-//000002:fchang Start		
-	if(reboot_firsttime==0){
-		meiEnalbeMailboxInt();
-	}		
-//000002:fchang End
-		
-#ifdef AMAZON_MEI_DEBUG_ON
-//		printk("\n\n ARC Running");
-#endif
-		
-#ifdef 	AMAZON_MEI_DEBUG_ON   //to test ac_clk setting correctness
-	{
-	u32 arc_control_mode;
-	u32 arc_debug_addr = 0x31F00;
-	u32 arc_debug_data = 0x10;
-	meiLongwordRead(MEI_CONTROL, &arc_control_mode);
-	arc_control_mode |= (HOST_MSTR);
-	meiLongwordWrite(MEI_CONTROL, arc_control_mode);
-	
-	meiLongwordWrite(MEI_DEBUG_DEC, MEI_DEBUG_DEC_DMP1_MASK);
-	meiLongwordWrite(MEI_DEBUG_RAD, arc_debug_addr);
-	meiPollForDbgDone();
-	meiLongwordRead(MEI_DEBUG_DATA, &arc_debug_data);
-
-	meiLongwordRead(MEI_CONTROL, &arc_control_mode);
-	arc_control_mode &= ~(HOST_MSTR);
-	meiLongwordWrite(MEI_CONTROL, arc_control_mode);
-	
-//	printk("\n\n ac_clk is %8x\n", arc_debug_data);
-	}
-#endif		
-			
-		
-#ifdef DFE_LOOPBACK
-		if (wait_sync() == 0){
-			printk("ARC fails to run: time out\n\n");
-		}else{
-//			printk("ARC is ready\n\n");
-		}
-#endif		
-		if(reboot_firsttime==1)	//000002:fchang
-			reboot_firsttime=0;	//000002:fchang
-		
-                return MEI_SUCCESS;
-}
-
-////////////////////            procfs debug            ////////////////////////////////////////////////////////
-#define MEI_DIRNAME     "mei"
-static struct proc_dir_entry *meidir;
-
-static ssize_t proc_write(struct file *, const char *, size_t, loff_t *);
-static ssize_t proc_read(struct file *, char *, size_t, loff_t *);
-
-static struct file_operations proc_operations = {
-	read:	proc_read,
-	write:	proc_write,
-};
-
-typedef struct reg_entry {
-	int * flag;
-	char name[30];          // big enough to hold names
-	char description[100];      // big enough to hold description
-	unsigned short low_ino;
-} reg_entry_t;
-
-static reg_entry_t regs[PROC_ITEMS];       // total items to be monitored by /proc/mei
-
-#define NUM_OF_REG_ENTRY	(sizeof(regs)/sizeof(reg_entry_t))
-
-static int proc_read(struct file * file, char * buf, size_t nbytes, loff_t *ppos)
-{
-        int i_ino = (file->f_dentry->d_inode)->i_ino;
-	char outputbuf[64];
-	int count=0;
-	int i;
-	u32 version=0;
-	reg_entry_t* current_reg=NULL;
-	
-	for (i=0;i<NUM_OF_REG_ENTRY;i++) {
-		if (regs[i].low_ino==i_ino) {
-			current_reg = &regs[i];
-			break;
-		}
-	}
-	if (current_reg==NULL)
-		return -EINVAL;
-	
-	if (current_reg->flag == (int *) 8){
-	///proc/mei/version
-	//format:
-	//Firmware version: major.minor.sub_version.int_version.rel_state.spl_appl
-	//Firmware Date Time Code: date/month min:hour
-		if (*ppos>0) /* Assume reading completed in previous read*/
-			return 0;               // indicates end of file
-		if(down_interruptible(&mei_sema))
-                	return -ERESTARTSYS;
-		
-		//if (indicator_count != 1){
-		if (indicator_count < 1){
-			up(&mei_sema);
-			return -EAGAIN;
-		}
-		//major:bits 0-7 
-		//minor:bits 8-15
-		makeCMV(H2D_CMV_READ, INFO, 54, 0, 1, NULL);
-		if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#if 0
-#ifdef AMAZON_MEI_DEBUG_ON
-			printk("\n\n WINHOST CMV fail");
-#endif	
-#endif
-			up(&mei_sema);
-			return -EIO;
-		}
-		version = RxMessage[4];
-		count = sprintf(outputbuf, "%d.%d.",(version)&0xff,(version>>8)&0xff);
-		
-		//sub_version:bits 4-7
-		//int_version:bits 0-3
-		//spl_appl:bits 8-13
-		//rel_state:bits 14-15
-		makeCMV(H2D_CMV_READ, INFO, 54, 1, 1, NULL);
-		if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#if 0
-#ifdef AMAZON_MEI_DEBUG_ON
-			printk("\n\n WINHOST CMV fail");	
-#endif
-#endif
-			up(&mei_sema);
-			return -EFAULT;
-		}
-		version =RxMessage[4];
-		count += sprintf(outputbuf+count, "%d.%d.%d.%d",
-				(version>>4)&0xf, 
-				version&0xf,
-				(version>>14)&0x3, 
-				(version>>8)&0x3f);	
-#ifdef ADSL_LED_SUPPORT				
-// version check -start	for adsl led			
-		if ((((version>>4)&0xf)==2)&&((version&0xf)>=3)&&((version&0xf)<7)) firmware_support_led=1;
-		else if ((((version>>4)&0xf)==2)&&((version&0xf)>=7)) firmware_support_led=2;
-		else if (((version>>4)&0xf)>2) firmware_support_led=2;
-
-//165001:henryhsu:20050906:Modify for adsl firmware version 1.2.1.2.0.1 DATA_LED can't flash.
-	//else firmware_support_led=0;
-	else firmware_support_led=2;
-//165001		
-
-
-// version check -end	
-#endif	
-		//Date:bits 0-7
-		//Month:bits 8-15
-		makeCMV(H2D_CMV_READ, INFO, 55, 0, 1, NULL);
-		if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#if 0
-#ifdef AMAZON_MEI_DEBUG_ON
-			printk("\n\n WINHOST CMV fail");
-#endif	
-#endif
-			up(&mei_sema);
-			return -EIO;
-		}
-		version = RxMessage[4];
-		
-		//Hour:bits 0-7
-		//Minute:bits 8-15
-		makeCMV(H2D_CMV_READ, INFO, 55, 1, 1, NULL);
-		if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#if 0
-#ifdef AMAZON_MEI_DEBUG_ON
-			printk("\n\n WINHOST CMV fail");
-#endif	
-#endif
-			up(&mei_sema);
-			return -EFAULT;
-		}
-		version += (RxMessage[4]<<16);
-		count += sprintf(outputbuf+count, " %d/%d %d:%d\n"
-				,version&0xff
-				,(version>>8)&0xff
-				,(version>>25)&0xff
-				,(version>>16)&0xff);
-				
-		up(&mei_sema);	
-		
-		*ppos+=count;
-	}else if(current_reg->flag != (int *)Recent_indicator){
-        	if (*ppos>0) /* Assume reading completed in previous read*/
-			return 0;               // indicates end of file
-		count = sprintf(outputbuf, "0x%08X\n\n", *(current_reg->flag));
-	        *ppos+=count;
-	        if (count>nbytes)  /* Assume output can be read at one time */
-			return -EINVAL;
-        }else{
-        	if((int)(*ppos)/((int)7)==16)
-                	return 0;  // indicate end of the message
-        	count = sprintf(outputbuf, "0x%04X\n\n", *(((u16 *)(current_reg->flag))+ (int)(*ppos)/((int)7)));
-                *ppos+=count;
-	}
-	if (copy_to_user(buf, outputbuf, count))
-		return -EFAULT;
-	return count;
-}
-
-static ssize_t proc_write(struct file * file, const char * buffer, size_t count, loff_t *ppos)
-{
-	int i_ino = (file->f_dentry->d_inode)->i_ino;
-	reg_entry_t* current_reg=NULL;
-	int i;
-	unsigned long newRegValue;
-	char *endp;
-
-	for (i=0;i<NUM_OF_REG_ENTRY;i++) {
-		if (regs[i].low_ino==i_ino) {
-			current_reg = &regs[i];
-			break;
-		}
-	}
-	if ((current_reg==NULL) || (current_reg->flag == (int *)Recent_indicator))
-		return -EINVAL;
-
-	newRegValue = simple_strtoul(buffer,&endp,0);
-	*(current_reg->flag)=(int)newRegValue;
-	return (count+endp-buffer);
-}
-////////////////makeCMV(Opcode, Group, Address, Index, Size, Data), CMV in u16 TxMessage[MSG_LENGTH]///////////////////////////
-void makeCMV(u8 opcode, u8 group, u16 address, u16 index, int size, u16 * data)
-{
-	memset(TxMessage, 0, MSG_LENGTH*2);
-	TxMessage[0]= (opcode<<4) + (size&0xf);
-	TxMessage[1]= (((index==0)?0:1)<<7) + (group&0x7f);
-	TxMessage[2]= address;
-	TxMessage[3]= index;
-	if(opcode == H2D_CMV_WRITE)
-		memcpy(TxMessage+4, data, size*2);
-	return;
-}
-
-////////////////makeCMV(Opcode, Group, Address, Index, Size, Data), CMV in u16 TxMessage[MSG_LENGTH]///////////////////////////
-void makeCMV_local(u8 opcode, u8 group, u16 address, u16 index, int size, u16 * data,u16 *CMVMSG)
-{
-	memset(CMVMSG, 0, MSG_LENGTH*2);
-	CMVMSG[0]= (opcode<<4) + (size&0xf);
-	CMVMSG[1]= (((index==0)?0:1)<<7) + (group&0x7f);
-	CMVMSG[2]= address;
-	CMVMSG[3]= index;
-	if(opcode == H2D_CMV_WRITE)
-		memcpy(CMVMSG+4, data, size*2);
-	return;
-}
-
-////////////////                Driver Structure                /////////////////////////////////////////////////////////////////////////////
-static ssize_t mei_write(struct file *, const char *, size_t, loff_t *);
-static int mei_ioctl(struct inode *, struct file *, unsigned int, unsigned long);
-
-static struct file_operations mei_operations = {
-        write:         	mei_write,
-        ioctl:         	mei_ioctl,
-};
-
-
-static ssize_t mei_write(struct file * filp, const char * buf, size_t size, loff_t * loff)
-{
-//	printk("\n\n mei_write entered");
-//      image_buffer = (u32 *)kmalloc(size, GFP_KERNEL);
-	image_buffer = (u32 *)vmalloc(size);
-//	printk("\n\n image_buffer kmalloc done");
-	if(image_buffer == NULL){
-#ifdef AMAZON_MEI_DEBUG_ON
-//		printk("\n\n kmalloc for firmware image fail");
-		printk("\n\n vmalloc for firmware image fail");
-#endif
-		return -1;
-	}
-	copy_from_user((char *)image_buffer, buf, size);
-//	printk("\n\n copy_from_user done");
-        return size;
-}
-
-	////////// ISR GPTU Timer 6 for high resolution timer /////////////
-void amazon_timer6_interrupt_MEI(int irq, void *dev_id, struct pt_regs *regs)
-{
-	int i,j;
-	u32 temp;
-	u16 temp16;
-	u16 rdindex, wrindex;
-	u16 num_rd=0;	//num of byte can be read
-	u16 bytes_to_wr=0;
-	
-//	printk("\n\nenter timer\n\n");
-	irqtimes++;
-//	printk("\n%d\n",irqtimes);
-
-
-/*
-#ifdef	PCM_ACCESS_DEBUG
-		meiDebugRead_8(0x30f20, &temp, 1);
-#else
-		meiDMARead_8(0x30f20, &temp, 1);
-#endif		
-	if((temp&0x4000)!=0){
-		printk("\nER_ERR");
-#ifdef	PCM_ACCESS_DEBUG
-		meiDebugWrite_8(0x30f20, &temp, 1);
-#else
-		meiDMAWrite_8(0x30f20, &temp, 1);
-#endif
-#ifdef	PCM_ACCESS_DEBUG
-		meiDebugRead_8(0x30f20, &temp, 1);
-#else
-		meiDMARead_8(0x30f20, &temp, 1);
-#endif
-		if((temp&0x4000)!=0)
-			printk("\nER_ERR not cleared");
-	}
-*/	
-	
-	for(i=PCM_CHANNEL_NUM-1;i>=0;i--){// start from last channel, which is rx  
-#ifdef	PCM_ACCESS_DEBUG
-		meiDebugRead_16(pcm_start_addr+i*16+12, &temp, 1);
-#else
-		meiDMARead_16(pcm_start_addr+i*16+12, &temp, 1);
-#endif
-		wrindex = (u16)((temp & 0xffff0000)>>16);
-//		printk(" %d",wrindex);
-#ifdef	PCM_ACCESS_DEBUG
-		meiDebugRead_16(pcm_start_addr+i*16+8, &temp, 1);
-#else
-		meiDMARead_16(pcm_start_addr+i*16+8, &temp, 1);
-#endif
-		rdindex = (u16)(temp & 0xffff);
-//		printk(" %d",rdindex);
-		if(rdindex<=wrindex)
-			num_rd=((wrindex-rdindex)/4)*4;	//read multiply of 4 bytes
-		else
-			num_rd=((pcm_data[i].len-(rdindex-wrindex))/4)*4;	//read multiply of 4 bytes
-		
-		if(i%2!=0){//rx channel
-			pcm_data[i].point=0;
-			for(j=0;j<num_rd/4;j++){
-				if(pcm_data[i].finish!=1){
-					if((rdindex+j*4)>=pcm_data[i].len)
-						temp16=(rdindex+j*4) - pcm_data[i].len;
-					else
-						temp16=rdindex+j*4;
-#ifdef	PCM_ACCESS_DEBUG
-					meiDebugRead_8((((u32)(pcm_data[i].LSW))+(((u32)(pcm_data[i].MSW))<<16))+temp16, (u32*)(pcm_data[i].buff+pcm_data[i].point), 1);
-#else
-					meiDMARead_8((((u32)(pcm_data[i].LSW))+(((u32)(pcm_data[i].MSW))<<16))+temp16, (u32*)(pcm_data[i].buff+pcm_data[i].point), 1);
-#endif
-				//	printk(" %8x", *((u32*)(pcm_data[i].buff+pcm_data[i].point))); 	
-				/*	if(pcm_data[i].point==0){
-						if(pcm_data[i].buff[0]==0xA5){// start of loopback data
-							pcm_data[i].point+=4;	
-							printk("\nstart receive data");
-						}	
-					} 
-					else*/
-						pcm_data[i].point+=4;
-				/*	if(pcm_data[i].point==PCM_BUFF_SIZE){	//finish rx
-						pcm_data[i].finish=1;
-						printk("\nchannel[%d] finished", i);
-					}	*/
-				}
-			}
-			if(firsttime[i]==1){
-				for(j=0;j<num_rd;j++){
-					if(pcm_data[i].buff[j]==0x1){
-						num_cmp[i]=num_rd-j;
-						firsttime[i]=0;
-						break;
-					}
-				}
-				if(memcmp(sampledata+1, pcm_data[i].buff+j, num_cmp[i])!=0)
-					printk("\n\ndata wrong,1st\n\n");
-				else
-					pcm_start_loc[i] = num_cmp[i]+1;
-			}
-			else{
-				if(memcmp(sampledata+pcm_start_loc[i], pcm_data[i].buff, num_rd)!=0)
-					printk("\n\ndata wrong\n\n");
-				else{
-					pcm_start_loc[i]+=num_rd;
-					if(pcm_start_loc[i]>=256)
-						pcm_start_loc[i]=pcm_start_loc[i]-256;
-				}
-			}
-			
-			rdindex +=num_rd;
-			if(rdindex>=pcm_data[i].len)
-				rdindex=rdindex-pcm_data[i].len;
-#ifdef	PCM_ACCESS_DEBUG
-			meiDebugRead_16(pcm_start_addr+i*16+8, &temp, 1);
-#else
-			meiDMARead_16(pcm_start_addr+i*16+8, &temp, 1);
-#endif
-			temp= (temp & 0xffff0000) + rdindex;
-#ifdef	PCM_ACCESS_DEBUG
-			meiDebugWrite_16(pcm_start_addr+i*16+8, &temp, 1); // update rdindex 
-#else
-			meiDMAWrite_16(pcm_start_addr+i*16+8, &temp, 1); // update rdindex
-#endif
-			
-			bytes_to_wr = num_rd;
-			
-	//		if(bytes_to_wr>0){
-		//		printk(" %d", num_rd);
-		//		printk(" %d", rdindex);
-//				printk("\n\nrdindex = %d", rdindex);	
-			//}
-		}
-		else{	//tx channel
-	//		if((bytes_to_wr + num_rd) < pcm_data[i].len){
-				for(j=0;j<bytes_to_wr/4;j++){
-					if(pcm_data[i].finish!=1){
-						if((wrindex+j*4)>=pcm_data[i].len)
-							temp16=(wrindex+j*4) - pcm_data[i].len;
-						else
-							temp16=wrindex + j*4;
-/*							
-#ifdef	PCM_ACCESS_DEBUG
-						meiDebugWrite_8((((u32)(pcm_data[i].LSW))+(((u32)(pcm_data[i].MSW))<<16))+temp16,(u32*)(pcm_data[i+1].buff+j*4), 1);
-#else
-						meiDMAWrite_8((((u32)(pcm_data[i].LSW))+(((u32)(pcm_data[i].MSW))<<16))+temp16,(u32*)(pcm_data[i+1].buff+j*4), 1);
-#endif*/
-							
-#ifdef	PCM_ACCESS_DEBUG
-						meiDebugWrite_8((((u32)(pcm_data[i].LSW))+(((u32)(pcm_data[i].MSW))<<16))+temp16,(u32*)(pcm_data[i].buff+pcm_data[i].point), 1);
-				//		meiDebugWrite_8((((u32)(pcm_data[i].LSW))+(((u32)(pcm_data[i].MSW))<<16))+temp16,(u32*)(pcm_data[i].buff), 1);
-#else
-						meiDMAWrite_8((((u32)(pcm_data[i].LSW))+(((u32)(pcm_data[i].MSW))<<16))+temp16,(u32*)(pcm_data[i].buff+pcm_data[i].point), 1);
-#endif		
-						pcm_data[i].point+=4;
-						if(pcm_data[i].point==PCM_BUFF_SIZE){
-					//		pcm_data[i].finish=1; 
-					//		printk("\nchannel[%d] finished", i);
-							pcm_data[i].point=0;
-						}	
-					}
-				}
-				wrindex+=bytes_to_wr;
-				if(wrindex>=pcm_data[i].len)
-					wrindex=wrindex-pcm_data[i].len;
-#ifdef	PCM_ACCESS_DEBUG
-				meiDebugRead_16(pcm_start_addr+i*16+12, &temp, 1);
-#else
-				meiDMARead_16(pcm_start_addr+i*16+12, &temp, 1);
-#endif
-				temp=(temp&0xffff) + (wrindex<<16);
-#ifdef	PCM_ACCESS_DEBUG
-				meiDebugWrite_16(pcm_start_addr+i*16+12, &temp, 1); // update wrindex
-#else
-				meiDMAWrite_16(pcm_start_addr+i*16+12, &temp, 1); // update wrindex
-#endif
-			
-				//if(bytes_to_wr>0){
-			//		printk(" %d", bytes_to_wr);
-			//		printk(" %d", wrindex);
-//					printk("\n\nwrindex = %d", wrindex);	
-				//}
-		//	}
-		}
-	}
-	return;
-}
-//000002:fchang Start
-static int meiResetArc(void)
-{
-	u32 auxreg0;
-	u32 auxreg5;
-	int flshcnt=0;
-	int flshcnt1=0;
-	int flshcnt2=0;
-	
-	meiLongwordWrite(MEI_CONTROL, 1);
-	meiLongwordWrite(MEI_DEBUG_DEC, 3);	
-	meiLongwordWrite(MEI_DEBUG_WAD, 0x3c);
-	meiLongwordWrite(MEI_DEBUG_DATA, 0x10);
-	meiPollForDbgDone();
-	meiLongwordWrite(MEI_DEBUG_DEC, 0x0);
-	meiLongwordWrite(MEI_DEBUG_WAD, 0x2);
-	meiLongwordWrite(MEI_DEBUG_DATA, 0x0);
-	meiPollForDbgDone();
-	meiLongwordWrite(MEI_DEBUG_WAD, 0x3);
-	meiLongwordWrite(MEI_DEBUG_DATA, 0x0);
-	meiPollForDbgDone();
-	meiLongwordWrite(MEI_DEBUG_DEC, 0x0);
-	meiLongwordWrite(MEI_DEBUG_RAD, 0x0);
-	meiPollForDbgDone();
-	meiLongwordRead(MEI_DEBUG_DATA, &auxreg0);
-	auxreg0 = auxreg0 & 0x03ffffff;
-	meiLongwordWrite(MEI_DEBUG_WAD, 0x0);
-	meiLongwordWrite(MEI_DEBUG_DATA, auxreg0);
-	meiPollForDbgDone();
-	meiLongwordWrite(MEI_DEBUG_WAD, 0x10a);
-	meiLongwordWrite(MEI_DEBUG_DATA, 0x0);
-	meiPollForDbgDone();
-	meiLongwordWrite(MEI_DEBUG_DEC, 0x2);
-	meiLongwordWrite(MEI_DEBUG_WAD, 0xfffc);
-	meiLongwordWrite(MEI_DEBUG_DATA, 0x1fffffff);
-	meiPollForDbgDone();
-	while(flshcnt<3){
-		meiLongwordWrite(MEI_DEBUG_DEC, 0x0);
-		meiLongwordWrite(MEI_DEBUG_RAD, 0x0);
-		meiPollForDbgDone();
-		meiLongwordRead(MEI_DEBUG_DATA, &auxreg0);
-		auxreg0 = auxreg0 & 0xff000000;
-		auxreg0 = auxreg0 | 0x3fff;
-		meiLongwordWrite(MEI_DEBUG_WAD, 0x0);
-		meiLongwordWrite(MEI_DEBUG_DATA, auxreg0);
-		meiPollForDbgDone();
-		
-		meiLongwordWrite(MEI_DEBUG_DEC, 0x0);
-		meiLongwordWrite(MEI_DEBUG_RAD, 0x5);
-		meiPollForDbgDone();
-		meiLongwordRead(MEI_DEBUG_DATA, &auxreg5);
-		auxreg5 = auxreg5 | 0x801;
-		meiLongwordWrite(MEI_DEBUG_WAD, 0x5);
-		meiLongwordWrite(MEI_DEBUG_DATA, auxreg5);
-		meiPollForDbgDone();
-		meiLongwordWrite(MEI_DEBUG_RAD, 0x0);
-		meiPollForDbgDone();
-		meiLongwordRead(MEI_DEBUG_DATA, &auxreg0);
-		auxreg0 = auxreg0 & 0x00ffffff;
-		if(auxreg0 == 0x4000)
-			flshcnt = flshcnt+1;
-		else{
-			if(flshcnt == 0)
-				flshcnt1 = flshcnt1 +1;
-			else
-				flshcnt2 = flshcnt2 +1;
-		}	
-	}
-	
-	return 1;
-}
-
-static int meiResetCore(void)
-{
-	meiLongwordWrite(MEI_CONTROL, 0x1);
-	meiLongwordWrite(MEI_DEBUG_DEC, 0x2);
-	meiLongwordWrite(MEI_DEBUG_WAD, 0x31f10);
-	meiLongwordWrite(MEI_DEBUG_DATA, 0xf);
-	meiPollForDbgDone();
-	meiLongwordWrite(MEI_DEBUG_WAD, 0x31f10);
-	meiLongwordWrite(MEI_DEBUG_DATA, 0x0);
-	meiPollForDbgDone();
-	meiLongwordWrite(MEI_DEBUG_WAD, 0x31f00);
-	meiLongwordWrite(MEI_DEBUG_DATA, 0x55);
-	meiPollForDbgDone();
-	return 1;
-}
-
-static int meiEnalbeMailboxInt(void)
-{
-	u32 arc2meiintmsk;
-	meiLongwordRead(ARC_TO_MEI_INT_MASK, &arc2meiintmsk);
-	arc2meiintmsk = arc2meiintmsk | 0x1;
-	meiLongwordWrite(ARC_TO_MEI_INT_MASK, arc2meiintmsk);
-	meiLongwordWrite(MEI_CONTROL, 0x0);
-	return 1;
-}
-
-
-
-//000002:fchang End
-
-static int mei_ioctl(struct inode * ino, struct file * fil, unsigned int command, unsigned long lon)
-{
-        int i,k;
-	u32 boot_loop;
-	u32 page_size;
-	u32 dest_addr;
-	u32 j;
-	u32 temp;
-	u32 temp2;
-	u16 trapsflag=0;
-	amazon_clreoc_pkt * current_clreoc;
-	struct timeval time_now;
-	struct timeval time_fini;
-	struct list_head * ptr;
-	amazon_mei_mib * mib_ptr;
-//	u16 buff[MSG_LENGTH]__attribute__ ((aligned(4)));
-	structpts pts;
-        int meierr=MEI_SUCCESS;
-	u16 data[12];  //used in makeCMV, to pass in payload when CMV set, ignored when CMV read.
-	meireg regrdwr;
-	meidebug debugrdwr;
-	amazon_mei_mib * temp_intvl;
-	struct sk_buff * eoc_skb;
-// 603221:tc.chen start
-	u16 hdlc_cmd[2];
-	u16 hdlc_rx_buffer[32];
-	int hdlc_rx_len=0;
-// 603221:tc.chen end
-	
-	int from_kernel = 0;//joelin
-	if (ino == (struct inode *)0) from_kernel = 1;//joelin
-	
-//	printk("\n switch.command = %i\n", command);
-        switch(command){
-		case GET_ADSL_LINE_CODE:
-			pts.adslLineTableEntry_pt = (adslLineTableEntry *)kmalloc(sizeof(adslLineTableEntry), GFP_KERNEL);
-			copy_from_user((char *)pts.adslLineTableEntry_pt, (char *)lon, sizeof(adslLineTableEntry));
-			if(IS_FLAG_SET((&(pts.adslLineTableEntry_pt->flags)), LINE_CODE_FLAG)){
-				pts.adslLineTableEntry_pt->adslLineCode = 2;
-			}
-			copy_to_user((char *)lon, (char *)pts.adslLineTableEntry_pt, sizeof(adslLineTableEntry));
-			kfree(pts.adslLineTableEntry_pt);
-			break;
-#ifdef AMAZON_MEI_MIB_RFC3440
-		case GET_ADSL_ATUC_LINE_EXT:
-			if(down_interruptible(&mei_sema))
-                		return -ERESTARTSYS;
-			pts.adslLineExtTableEntry_pt = (adslLineExtTableEntry *)kmalloc(sizeof(adslLineExtTableEntry), GFP_KERNEL);
-			copy_from_user((char *)pts.adslLineExtTableEntry_pt, (char *)lon, sizeof(adslLineExtTableEntry));
-			if(IS_FLAG_SET((&(pts.adslLineExtTableEntry_pt->flags)), ATUC_LINE_TRANS_CAP_FLAG)){
-				ATUC_LINE_TRANS_CAP_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 3 Address 67 Index 0");
-#endif
-					CLR_FLAG((&(pts.adslLineExtTableEntry_pt->flags)), ATUC_LINE_TRANS_CAP_FLAG);	
-				}	
-				else{
-					memcpy((&(pts.adslLineExtTableEntry_pt->adslLineTransAtucCap)), RxMessage+4, ((RxMessage[0]&0xf)*2));
-				}
-			}
-			if(IS_FLAG_SET((&(pts.adslLineExtTableEntry_pt->flags)), ATUC_LINE_TRANS_CONFIG_FLAG)){
-				ATUC_LINE_TRANS_CONFIG_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 3 Address 67 Index 0");
-#endif
-					CLR_FLAG((&(pts.adslLineExtTableEntry_pt->flags)), ATUC_LINE_TRANS_CONFIG_FLAG);	
-				}	
-				else{
-					memcpy((&(pts.adslLineExtTableEntry_pt->adslLineTransAtucConfig)), RxMessage+4, ((RxMessage[0]&0xf)*2));
-				}
-			}
-			if(IS_FLAG_SET((&(pts.adslLineExtTableEntry_pt->flags)), ATUC_LINE_TRANS_ACTUAL_FLAG)){
-				ATUC_LINE_TRANS_ACTUAL_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 2 Address 1 Index 0");
-#endif
-					CLR_FLAG((&(pts.adslLineExtTableEntry_pt->flags)), ATUC_LINE_TRANS_ACTUAL_FLAG);	
-				}	
-				else{
-					memcpy((&(pts.adslLineExtTableEntry_pt->adslLineTransAtucActual)), RxMessage+4, ((RxMessage[0]&0xf)*2));
-				}
-			}
-			if(IS_FLAG_SET((&(pts.adslLineExtTableEntry_pt->flags)), LINE_GLITE_POWER_STATE_FLAG)){    // not supported currently
-/*
-				LINE_GLITE_POWER_STATE_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 2 Address 0 Index 0");
-#endif
-					CLR_FLAG((&(pts.adslLineExtTableEntry_pt->flags)), LINE_GLITE_POWER_STATE_FLAG);	
-				}	
-				else{
-					memcpy((&(pts.adslLineExtTableEntry_pt->adslLineGlitePowerState)), RxMessage+4, ((RxMessage[0]&0xf)*2));
-				}
-*/
-				CLR_FLAG((&(pts.adslLineExtTableEntry_pt->flags)), LINE_GLITE_POWER_STATE_FLAG);
-			}
-			copy_to_user((char *)lon, (char *)pts.adslLineExtTableEntry_pt, sizeof(adslLineExtTableEntry));
-			kfree(pts.adslLineTableEntry_pt);
-			up(&mei_sema);
-			break;
-#endif
-
-#ifdef AMAZON_MEI_MIB_RFC3440
-		case SET_ADSL_ATUC_LINE_EXT:
-			if(down_interruptible(&mei_sema))
-                		return -ERESTARTSYS;
-			pts.adslLineExtTableEntry_pt = (adslLineExtTableEntry *)kmalloc(sizeof(adslLineExtTableEntry), GFP_KERNEL);
-			copy_from_user((char *)pts.adslLineExtTableEntry_pt, (char *)lon, sizeof(adslLineExtTableEntry));
-			
-			//only adslLineTransAtucConfig can be set.
-			CLR_FLAG((&(pts.adslLineExtTableEntry_pt->flags)), ATUC_LINE_TRANS_CAP_FLAG);
-			if(IS_FLAG_SET((&(pts.adslLineExtTableEntry_pt->flags)), ATUC_LINE_TRANS_CONFIG_FLAG)){
-				memcpy(data,(&(pts.adslLineExtTableEntry_pt->adslLineTransAtucConfig)), 2); 
-				ATUC_LINE_TRANS_CONFIG_FLAG_MAKECMV_WR;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 3 Address 67 Index 0");
-#endif
-					CLR_FLAG((&(pts.adslLineExtTableEntry_pt->flags)), ATUC_LINE_TRANS_CONFIG_FLAG);	
-				}	
-			}
-			CLR_FLAG((&(pts.adslLineExtTableEntry_pt->flags)), ATUC_LINE_TRANS_ACTUAL_FLAG);
-			CLR_FLAG((&(pts.adslLineExtTableEntry_pt->flags)), LINE_GLITE_POWER_STATE_FLAG);
-	
-			copy_to_user((char *)lon, (char *)pts.adslLineExtTableEntry_pt, sizeof(adslLineExtTableEntry));
-			kfree(pts.adslLineTableEntry_pt);
-			up(&mei_sema);
-			break;
-#endif
-
-		case GET_ADSL_ATUC_PHY:
-			if(down_interruptible(&mei_sema))
-                		return -ERESTARTSYS;
-			
-			pts.adslAtucPhysEntry_pt = (adslAtucPhysEntry *)kmalloc(sizeof(adslAtucPhysEntry), GFP_KERNEL);
-			copy_from_user((char *)pts.adslAtucPhysEntry_pt, (char *)lon, sizeof(adslAtucPhysEntry));
-			if(IS_FLAG_SET((&(pts.adslAtucPhysEntry_pt->flags)), ATUC_PHY_SER_NUM_FLAG)){
-				ATUC_PHY_SER_NUM_FLAG_MAKECMV1;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 3 Address 57 Index 0");
-#endif
-					CLR_FLAG((&(pts.adslAtucPhysEntry_pt->flags)), ATUC_PHY_SER_NUM_FLAG);	
-				}
-				else{
-					memcpy(pts.adslAtucPhysEntry_pt->serial_no, RxMessage+4, ((RxMessage[0]&0xf)*2));
-				}
-				ATUC_PHY_SER_NUM_FLAG_MAKECMV2;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 3 Address 57 Index 12");
-#endif
-					CLR_FLAG((&(pts.adslAtucPhysEntry_pt->flags)), ATUC_PHY_SER_NUM_FLAG);	
-				}
-				else{
-					memcpy((pts.adslAtucPhysEntry_pt->serial_no+24), RxMessage+4, ((RxMessage[0]&0xf)*2));
-				} 
-			}
-			if(IS_FLAG_SET((&(pts.adslAtucPhysEntry_pt->flags)), ATUC_PHY_VENDOR_ID_FLAG)){
-				ATUC_PHY_VENDOR_ID_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 3 Address 64 Index 0");
-#endif
-					CLR_FLAG((&(pts.adslAtucPhysEntry_pt->flags)), ATUC_PHY_VENDOR_ID_FLAG);	
-				}	
-				else{
-					memcpy(pts.adslAtucPhysEntry_pt->vendor_id.vendor_id, RxMessage+4, ((RxMessage[0]&0xf)*2));
-				}
-			}
-			if(IS_FLAG_SET((&(pts.adslAtucPhysEntry_pt->flags)), ATUC_PHY_VER_NUM_FLAG)){
-				ATUC_PHY_VER_NUM_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 3 Address 58 Index 0");
-#endif
-					CLR_FLAG((&(pts.adslAtucPhysEntry_pt->flags)), ATUC_PHY_VER_NUM_FLAG);	
-				}	
-				else{
-					memcpy(pts.adslAtucPhysEntry_pt->version_no, RxMessage+4, ((RxMessage[0]&0xf)*2));
-				}
-			}
-			if(IS_FLAG_SET((&(pts.adslAtucPhysEntry_pt->flags)), ATUC_CURR_STAT_FLAG)){
-				pts.adslAtucPhysEntry_pt->status = CurrStatus.adslAtucCurrStatus;
-			}		
-			if(IS_FLAG_SET((&(pts.adslAtucPhysEntry_pt->flags)), ATUC_CURR_OUT_PWR_FLAG)){
-				ATUC_CURR_OUT_PWR_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 3 Address 68 Index 5");
-#endif
-					CLR_FLAG((&(pts.adslAtucPhysEntry_pt->flags)), ATUC_CURR_OUT_PWR_FLAG);	
-				}	
-				else{
-					memcpy((&(pts.adslAtucPhysEntry_pt->outputPwr)), RxMessage+4, ((RxMessage[0]&0xf)*2));
-				}
-			}
-			if(IS_FLAG_SET((&(pts.adslAtucPhysEntry_pt->flags)), ATUC_CURR_ATTR_FLAG)){
-				ATUC_CURR_ATTR_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 3 Address 69 Index 0");
-#endif
-					CLR_FLAG((&(pts.adslAtucPhysEntry_pt->flags)), ATUC_CURR_ATTR_FLAG);	
-				}	
-				else{
-					memcpy((&(pts.adslAtucPhysEntry_pt->attainableRate)), RxMessage+4, ((RxMessage[0]&0xf)*2));
-				}
-			}
-			copy_to_user((char *)lon, (char *)pts.adslAtucPhysEntry_pt, sizeof(adslAtucPhysEntry));
-			kfree(pts.adslAtucPhysEntry_pt);
-			
-			up(&mei_sema);
-			break;
-		case GET_ADSL_ATUR_PHY:
-			if(down_interruptible(&mei_sema))
-                		return -ERESTARTSYS;
-			
-			pts.adslAturPhysEntry_pt = (adslAturPhysEntry *)kmalloc(sizeof(adslAturPhysEntry), GFP_KERNEL);
-			copy_from_user((char *)pts.adslAturPhysEntry_pt, (char *)lon, sizeof(adslAturPhysEntry));
-			if(IS_FLAG_SET((&(pts.adslAturPhysEntry_pt->flags)), ATUR_PHY_SER_NUM_FLAG)){
-				ATUR_PHY_SER_NUM_FLAG_MAKECMV1;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 3 Address 62 Index 0");
-#endif
-					CLR_FLAG((&(pts.adslAturPhysEntry_pt->flags)), ATUR_PHY_SER_NUM_FLAG);	
-				}
-				else{
-					memcpy(pts.adslAturPhysEntry_pt->serial_no, RxMessage+4, ((RxMessage[0]&0xf)*2));
-				}
-				ATUR_PHY_SER_NUM_FLAG_MAKECMV2;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 3 Address 62 Index 12");
-#endif
-					CLR_FLAG((&(pts.adslAturPhysEntry_pt->flags)), ATUR_PHY_SER_NUM_FLAG);	
-				}
-				else{
-					memcpy((pts.adslAturPhysEntry_pt->serial_no+24), RxMessage+4, ((RxMessage[0]&0xf)*2));
-				} 
-			}
-			if(IS_FLAG_SET((&(pts.adslAturPhysEntry_pt->flags)), ATUR_PHY_VENDOR_ID_FLAG)){
-				ATUR_PHY_VENDOR_ID_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 3 Address 65 Index 0");
-#endif
-					CLR_FLAG((&(pts.adslAturPhysEntry_pt->flags)), ATUR_PHY_VENDOR_ID_FLAG);	
-				}	
-				else{
-					memcpy(pts.adslAturPhysEntry_pt->vendor_id.vendor_id, RxMessage+4, ((RxMessage[0]&0xf)*2));
-				}
-			}
-			if(IS_FLAG_SET((&(pts.adslAturPhysEntry_pt->flags)), ATUR_PHY_VER_NUM_FLAG)){
-				ATUR_PHY_VER_NUM_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 3 Address 61 Index 0");
-#endif
-					CLR_FLAG((&(pts.adslAturPhysEntry_pt->flags)), ATUR_PHY_VER_NUM_FLAG);	
-				}	
-				else{
-					memcpy(pts.adslAturPhysEntry_pt->version_no, RxMessage+4, ((RxMessage[0]&0xf)*2));
-				}
-			}
-			if(IS_FLAG_SET((&(pts.adslAturPhysEntry_pt->flags)), ATUR_SNRMGN_FLAG)){
-				ATUR_SNRMGN_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 3 Address 68 Index 4");
-#endif
-					CLR_FLAG((&(pts.adslAturPhysEntry_pt->flags)), ATUR_SNRMGN_FLAG);	
-				}	
-				else{
-					memcpy((&(pts.adslAturPhysEntry_pt->SnrMgn)), RxMessage+4, ((RxMessage[0]&0xf)*2));
-				}
-			}
-			if(IS_FLAG_SET((&(pts.adslAturPhysEntry_pt->flags)), ATUR_ATTN_FLAG)){
-				ATUR_ATTN_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 3 Address 68 Index 2");
-#endif
-					CLR_FLAG((&(pts.adslAturPhysEntry_pt->flags)), ATUR_ATTN_FLAG);	
-				}	
-				else{
-					memcpy((&(pts.adslAturPhysEntry_pt->Attn)), RxMessage+4, ((RxMessage[0]&0xf)*2));
-				}
-			}
-			if(IS_FLAG_SET((&(pts.adslAturPhysEntry_pt->flags)), ATUR_CURR_STAT_FLAG)){
-				pts.adslAturPhysEntry_pt->status = CurrStatus.adslAturCurrStatus;
-			}
-			if(IS_FLAG_SET((&(pts.adslAturPhysEntry_pt->flags)), ATUR_CURR_OUT_PWR_FLAG)){
-				ATUR_CURR_OUT_PWR_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 3 Address 69 Index 5");
-#endif
-					CLR_FLAG((&(pts.adslAturPhysEntry_pt->flags)), ATUR_CURR_OUT_PWR_FLAG);	
-				}	
-				else{
-					memcpy((&(pts.adslAturPhysEntry_pt->outputPwr)), RxMessage+4, ((RxMessage[0]&0xf)*2));
-				}
-			}
-			if(IS_FLAG_SET((&(pts.adslAturPhysEntry_pt->flags)), ATUR_CURR_ATTR_FLAG)){
-				ATUR_CURR_ATTR_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 3 Address 68 Index 0");
-#endif
-					CLR_FLAG((&(pts.adslAturPhysEntry_pt->flags)), ATUR_CURR_ATTR_FLAG);	
-				}	
-				else{
-					memcpy((&(pts.adslAturPhysEntry_pt->attainableRate)), RxMessage+4, ((RxMessage[0]&0xf)*2));
-				}
-			}
-			copy_to_user((char *)lon, (char *)pts.adslAturPhysEntry_pt, sizeof(adslAturPhysEntry));
-			kfree(pts.adslAturPhysEntry_pt);
-			
-			up(&mei_sema);
-			break;
-		case GET_ADSL_ATUC_CHAN_INFO:
-			if(down_interruptible(&mei_sema))
-                		return -ERESTARTSYS;
-			
-			pts.adslAtucChanInfo_pt = (adslAtucChanInfo *)kmalloc(sizeof(adslAtucChanInfo), GFP_KERNEL);
-			copy_from_user((char *)pts.adslAtucChanInfo_pt, (char *)lon, sizeof(adslAtucChanInfo));
-			if(IS_FLAG_SET((&(pts.adslAtucChanInfo_pt->flags)), ATUC_CHAN_INTLV_DELAY_FLAG)){
-				if((chantype.interleave!=1) || (chantype.fast==1)){
-					CLR_FLAG((&(pts.adslAtucChanInfo_pt->flags)), ATUC_CHAN_INTLV_DELAY_FLAG);
-				}
-				else{
-					ATUC_CHAN_INTLV_DELAY_FLAG_MAKECMV;
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group 6 Address 3 Index 1");
-#endif
-						CLR_FLAG((&(pts.adslAtucChanInfo_pt->flags)), ATUC_CHAN_INTLV_DELAY_FLAG);	
-					}	
-					else{
-						memcpy((&(pts.adslAtucChanInfo_pt->interleaveDelay)), RxMessage+4, ((RxMessage[0]&0xf)*2));
-					}
-				}
-			}
-			if(IS_FLAG_SET((&(pts.adslAtucChanInfo_pt->flags)), ATUC_CHAN_CURR_TX_RATE_FLAG)){
-				ATUC_CHAN_CURR_TX_RATE_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 6 Address 1 Index 0");
-#endif
-					CLR_FLAG((&(pts.adslAtucChanInfo_pt->flags)), ATUC_CHAN_CURR_TX_RATE_FLAG);	
-				}	
-				else{
-					pts.adslAtucChanInfo_pt->currTxRate = (u32)(RxMessage[4]) + (((u32)(RxMessage[5]))<<16);
-				}
-			}
-			if(IS_FLAG_SET((&(pts.adslAtucChanInfo_pt->flags)), ATUC_CHAN_PREV_TX_RATE_FLAG)){
-				pts.adslAtucChanInfo_pt->prevTxRate = PrevTxRate.adslAtucChanPrevTxRate;
-			}
-			copy_to_user((char *)lon, (char *)pts.adslAtucChanInfo_pt, sizeof(adslAtucChanInfo));
-			kfree(pts.adslAtucChanInfo_pt);
-			
-			up(&mei_sema);
-			break;
-		case GET_ADSL_ATUR_CHAN_INFO:
-			if(down_interruptible(&mei_sema))
-                		return -ERESTARTSYS;
-			
-			pts.adslAturChanInfo_pt = (adslAturChanInfo *)kmalloc(sizeof(adslAturChanInfo), GFP_KERNEL);
-			copy_from_user((char *)pts.adslAturChanInfo_pt, (char *)lon, sizeof(adslAturChanInfo));
-			if(IS_FLAG_SET((&(pts.adslAturChanInfo_pt->flags)), ATUR_CHAN_INTLV_DELAY_FLAG)){
-				if((chantype.interleave!=1) || (chantype.fast==1)){
-					CLR_FLAG((&(pts.adslAturChanInfo_pt->flags)), ATUR_CHAN_INTLV_DELAY_FLAG);
-				}
-				else{
-					ATUR_CHAN_INTLV_DELAY_FLAG_MAKECMV;
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group 6 Address 2 Index 1");
-#endif
-						CLR_FLAG((&(pts.adslAturChanInfo_pt->flags)), ATUR_CHAN_INTLV_DELAY_FLAG);	
-					}	
-					else{
-						memcpy((&(pts.adslAturChanInfo_pt->interleaveDelay)), RxMessage+4, ((RxMessage[0]&0xf)*2));
-					}
-				}
-			}
-			if(IS_FLAG_SET((&(pts.adslAturChanInfo_pt->flags)), ATUR_CHAN_CURR_TX_RATE_FLAG)){
-				ATUR_CHAN_CURR_TX_RATE_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 6 Address 0 Index 0");
-#endif
-					CLR_FLAG((&(pts.adslAturChanInfo_pt->flags)), ATUR_CHAN_CURR_TX_RATE_FLAG);	
-				}	
-				else{
-					pts.adslAturChanInfo_pt->currTxRate = (u32)(RxMessage[4]) + (((u32)(RxMessage[5]))<<16);
-				}
-			}
-			if(IS_FLAG_SET((&(pts.adslAturChanInfo_pt->flags)), ATUR_CHAN_PREV_TX_RATE_FLAG)){
-				pts.adslAturChanInfo_pt->prevTxRate = PrevTxRate.adslAturChanPrevTxRate;
-			}
-			if(IS_FLAG_SET((&(pts.adslAturChanInfo_pt->flags)), ATUR_CHAN_CRC_BLK_LEN_FLAG)){
-				// ? no CMV to update this 
-				CLR_FLAG((&(pts.adslAturChanInfo_pt->flags)), ATUR_CHAN_CRC_BLK_LEN_FLAG);
-			}
-			copy_to_user((char *)lon, (char *)pts.adslAturChanInfo_pt, sizeof(adslAturChanInfo));
-			kfree(pts.adslAturChanInfo_pt);
-			
-			up(&mei_sema);
-			break;
-		case GET_ADSL_ATUC_PERF_DATA:
-			pts.atucPerfDataEntry_pt = (atucPerfDataEntry *)kmalloc(sizeof(atucPerfDataEntry), GFP_KERNEL);
-			copy_from_user((char *)pts.atucPerfDataEntry_pt, (char *)lon, sizeof(atucPerfDataEntry));
-			if(IS_FLAG_SET((&(pts.atucPerfDataEntry_pt->flags)), ATUC_PERF_LOFS_FLAG)){
-				pts.atucPerfDataEntry_pt->adslAtucPerfLofs=ATUC_PERF_LOFS;
-			}
-			if(IS_FLAG_SET((&(pts.atucPerfDataEntry_pt->flags)), ATUC_PERF_LOSS_FLAG)){
-				pts.atucPerfDataEntry_pt->adslAtucPerfLoss=ATUC_PERF_LOSS;
-			}
-			if(IS_FLAG_SET((&(pts.atucPerfDataEntry_pt->flags)), ATUC_PERF_ESS_FLAG)){
-				pts.atucPerfDataEntry_pt->adslAtucPerfESs=ATUC_PERF_ESS;
-			}
-			if(IS_FLAG_SET((&(pts.atucPerfDataEntry_pt->flags)), ATUC_PERF_INITS_FLAG)){
-				pts.atucPerfDataEntry_pt->adslAtucPerfInits=ATUC_PERF_INITS;
-			}
-			if(IS_FLAG_SET((&(pts.atucPerfDataEntry_pt->flags)), ATUC_PERF_VALID_INTVLS_FLAG)){
-				i=0;
-				for(ptr=(current_intvl->list).prev; ptr!=&interval_list; ptr=ptr->prev){
-					i++;
-					if(i==96)
-						break;
-				}
-				pts.atucPerfDataEntry_pt->adslAtucPerfValidIntervals=i;
-			}
-			if(IS_FLAG_SET((&(pts.atucPerfDataEntry_pt->flags)), ATUC_PERF_INVALID_INTVLS_FLAG)){
-				pts.atucPerfDataEntry_pt->adslAtucPerfInvalidIntervals=0;
-			}
-			if(IS_FLAG_SET((&(pts.atucPerfDataEntry_pt->flags)), ATUC_PERF_CURR_15MIN_TIME_ELAPSED_FLAG)){
-				do_gettimeofday(&time_now);
-				pts.atucPerfDataEntry_pt->adslAtucPerfCurr15MinTimeElapsed=time_now.tv_sec - (current_intvl->start_time).tv_sec;
-			}
-			if(IS_FLAG_SET((&(pts.atucPerfDataEntry_pt->flags)), ATUC_PERF_CURR_15MIN_LOFS_FLAG)){
-				pts.atucPerfDataEntry_pt->adslAtucPerfCurr15MinLofs=current_intvl->AtucPerfLof;
-			}
-			if(IS_FLAG_SET((&(pts.atucPerfDataEntry_pt->flags)), ATUC_PERF_CURR_15MIN_LOSS_FLAG)){
-				pts.atucPerfDataEntry_pt->adslAtucPerfCurr15MinLoss=current_intvl->AtucPerfLos;
-			}
-			if(IS_FLAG_SET((&(pts.atucPerfDataEntry_pt->flags)), ATUC_PERF_CURR_15MIN_ESS_FLAG)){
-				pts.atucPerfDataEntry_pt->adslAtucPerfCurr15MinESs=current_intvl->AtucPerfEs;
-			}
-			if(IS_FLAG_SET((&(pts.atucPerfDataEntry_pt->flags)), ATUC_PERF_CURR_15MIN_INIT_FLAG)){
-				pts.atucPerfDataEntry_pt->adslAtucPerfCurr15MinInits=current_intvl->AtucPerfInit;
-			}
-			if(IS_FLAG_SET((&(pts.atucPerfDataEntry_pt->flags)), ATUC_PERF_CURR_1DAY_TIME_ELAPSED_FLAG)){
-				i=0;		
-				for(ptr=(current_intvl->list).prev; ptr!=&interval_list; ptr=ptr->prev){
-					i+=900;	
-				}
-				do_gettimeofday(&time_now);
-				i+=time_now.tv_sec - (current_intvl->start_time).tv_sec;
-				if(i>=86400)
-					pts.atucPerfDataEntry_pt->adslAtucPerfCurr1DayTimeElapsed=i-86400;
-				else
-					pts.atucPerfDataEntry_pt->adslAtucPerfCurr1DayTimeElapsed=i;		
-			}
-			if(IS_FLAG_SET((&(pts.atucPerfDataEntry_pt->flags)), ATUC_PERF_CURR_1DAY_LOFS_FLAG)){		
-				i=0;
-				j=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					mib_ptr = list_entry(ptr, amazon_mei_mib, list);
-					j+=mib_ptr->AtucPerfLof;
-					i++;	
-					if(i==96)
-						j=0;
-				}
-				j+=current_intvl->AtucPerfLof;
-				pts.atucPerfDataEntry_pt->adslAtucPerfCurr1DayLofs=j;
-			}
-			if(IS_FLAG_SET((&(pts.atucPerfDataEntry_pt->flags)), ATUC_PERF_CURR_1DAY_LOSS_FLAG)){		
-				i=0;
-				j=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					mib_ptr = list_entry(ptr, amazon_mei_mib, list);
-					j+=mib_ptr->AtucPerfLos;
-					i++;	
-					if(i==96)
-						j=0;
-				}
-				j+=current_intvl->AtucPerfLos;
-				pts.atucPerfDataEntry_pt->adslAtucPerfCurr1DayLoss=j;
-			}
-			if(IS_FLAG_SET((&(pts.atucPerfDataEntry_pt->flags)), ATUC_PERF_CURR_1DAY_ESS_FLAG)){		
-				i=0;
-				j=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					mib_ptr = list_entry(ptr, amazon_mei_mib, list);
-					j+=mib_ptr->AtucPerfEs;
-					i++;	
-					if(i==96)
-						j=0;
-				}
-				j+=current_intvl->AtucPerfEs;
-				pts.atucPerfDataEntry_pt->adslAtucPerfCurr1DayESs=j;
-			}
-			if(IS_FLAG_SET((&(pts.atucPerfDataEntry_pt->flags)), ATUC_PERF_CURR_1DAY_INIT_FLAG)){		
-				i=0;
-				j=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					mib_ptr = list_entry(ptr, amazon_mei_mib, list);
-					j+=mib_ptr->AtucPerfInit;
-					i++;	
-					if(i==96)
-						j=0;
-				}
-				j+=current_intvl->AtucPerfInit;
-				pts.atucPerfDataEntry_pt->adslAtucPerfCurr1DayInits=j;
-			}
-			if(IS_FLAG_SET((&(pts.atucPerfDataEntry_pt->flags)), ATUC_PERF_PREV_1DAY_MON_SEC_FLAG)){		
-				i=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					i++;		
-				}
-				if(i>=96)
-					pts.atucPerfDataEntry_pt->adslAtucPerfPrev1DayMoniSecs=86400;
-				else
-					pts.atucPerfDataEntry_pt->adslAtucPerfPrev1DayMoniSecs=0;
-			}
-			if(IS_FLAG_SET((&(pts.atucPerfDataEntry_pt->flags)), ATUC_PERF_PREV_1DAY_LOFS_FLAG)){
-				i=0;
-				j=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					mib_ptr = list_entry(ptr, amazon_mei_mib, list);
-					j+=mib_ptr->AtucPerfLof;
-					i++;
-					if(i==96)
-						break;
-				}	
-				if(i==96)
-					pts.atucPerfDataEntry_pt->adslAtucPerfPrev1DayLofs=j;
-				else
-					pts.atucPerfDataEntry_pt->adslAtucPerfPrev1DayLofs=0;
-			}
-			if(IS_FLAG_SET((&(pts.atucPerfDataEntry_pt->flags)), ATUC_PERF_PREV_1DAY_LOSS_FLAG)){
-				i=0;
-				j=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					mib_ptr = list_entry(ptr, amazon_mei_mib, list);
-					j+=mib_ptr->AtucPerfLos;
-					i++;
-					if(i==96)
-						break;
-				}	
-				if(i==96)
-					pts.atucPerfDataEntry_pt->adslAtucPerfPrev1DayLoss=j;
-				else
-					pts.atucPerfDataEntry_pt->adslAtucPerfPrev1DayLoss=0;
-			}
-			if(IS_FLAG_SET((&(pts.atucPerfDataEntry_pt->flags)), ATUC_PERF_PREV_1DAY_ESS_FLAG)){
-				i=0;
-				j=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					mib_ptr = list_entry(ptr, amazon_mei_mib, list);
-					j+=mib_ptr->AtucPerfEs;
-					i++;
-					if(i==96)
-						break;
-				}	
-				if(i==96)
-					pts.atucPerfDataEntry_pt->adslAtucPerfPrev1DayESs=j;
-				else
-					pts.atucPerfDataEntry_pt->adslAtucPerfPrev1DayESs=0;
-			}
-			if(IS_FLAG_SET((&(pts.atucPerfDataEntry_pt->flags)), ATUC_PERF_PREV_1DAY_INITS_FLAG)){
-				i=0;
-				j=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					mib_ptr = list_entry(ptr, amazon_mei_mib, list);
-					j+=mib_ptr->AtucPerfInit;
-					i++;
-					if(i==96)
-						break;
-				}	
-				if(i==96)
-					pts.atucPerfDataEntry_pt->adslAtucPerfPrev1DayInits=j;
-				else
-					pts.atucPerfDataEntry_pt->adslAtucPerfPrev1DayInits=0;
-			}
-			
-			copy_to_user((char *)lon, (char *)pts.atucPerfDataEntry_pt, sizeof(atucPerfDataEntry));
-			kfree(pts.atucPerfDataEntry_pt);
-			break;
-#ifdef AMAZON_MEI_MIB_RFC3440
-		case GET_ADSL_ATUC_PERF_DATA_EXT:	//??? CMV mapping not available
-			pts.atucPerfDataExtEntry_pt = (atucPerfDataExtEntry *)kmalloc(sizeof(atucPerfDataExtEntry), GFP_KERNEL);
-			copy_from_user((char *)pts.atucPerfDataExtEntry_pt, (char *)lon, sizeof(atucPerfDataExtEntry));
-			if(IS_FLAG_SET((&(pts.atucPerfDataExtEntry_pt->flags)), ATUC_PERF_STAT_FASTR_FLAG)){
-				pts.atucPerfDataExtEntry_pt->adslAtucPerfStatFastR=ATUC_PERF_STAT_FASTR;
-			}	
-			if(IS_FLAG_SET((&(pts.atucPerfDataExtEntry_pt->flags)), ATUC_PERF_STAT_FAILED_FASTR_FLAG)){
-				pts.atucPerfDataExtEntry_pt->adslAtucPerfStatFailedFastR=ATUC_PERF_STAT_FAILED_FASTR;
-			}
-			if(IS_FLAG_SET((&(pts.atucPerfDataExtEntry_pt->flags)), ATUC_PERF_STAT_SESL_FLAG)){
-				pts.atucPerfDataExtEntry_pt->adslAtucPerfStatSesL=ATUC_PERF_STAT_SESL;
-			}
-			if(IS_FLAG_SET((&(pts.atucPerfDataExtEntry_pt->flags)), ATUC_PERF_STAT_UASL_FLAG)){
-				pts.atucPerfDataExtEntry_pt->adslAtucPerfStatUasL=ATUC_PERF_STAT_UASL;
-			}	
-			if(IS_FLAG_SET((&(pts.atucPerfDataExtEntry_pt->flags)), ATUC_PERF_CURR_15MIN_FASTR_FLAG)){
-				pts.atucPerfDataExtEntry_pt->adslAtucPerfCurr15MinFastR=current_intvl->AtucPerfStatFastR;
-			}	
-			if(IS_FLAG_SET((&(pts.atucPerfDataExtEntry_pt->flags)), ATUC_PERF_CURR_15MIN_FAILED_FASTR_FLAG)){
-				pts.atucPerfDataExtEntry_pt->adslAtucPerfCurr15MinFailedFastR=current_intvl->AtucPerfStatFailedFastR;
-			}
-			if(IS_FLAG_SET((&(pts.atucPerfDataExtEntry_pt->flags)), ATUC_PERF_CURR_15MIN_SESL_FLAG)){
-				pts.atucPerfDataExtEntry_pt->adslAtucPerfCurr15MinSesL=current_intvl->AtucPerfStatSesL;
-			}
-			if(IS_FLAG_SET((&(pts.atucPerfDataExtEntry_pt->flags)), ATUC_PERF_CURR_15MIN_UASL_FLAG)){
-				pts.atucPerfDataExtEntry_pt->adslAtucPerfCurr15MinUasL=current_intvl->AtucPerfStatUasL;
-			}
-			if(IS_FLAG_SET((&(pts.atucPerfDataExtEntry_pt->flags)), ATUC_PERF_CURR_1DAY_FASTR_FLAG)){
-				i=0;
-				j=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					mib_ptr = list_entry(ptr, amazon_mei_mib, list);
-					j+=mib_ptr->AtucPerfStatFastR;
-					i++;	
-					if(i==96)
-						j=0;
-				}
-				j+=current_intvl->AtucPerfStatFastR;
-				pts.atucPerfDataExtEntry_pt->adslAtucPerfCurr1DayFastR=j;
-			}	
-			if(IS_FLAG_SET((&(pts.atucPerfDataExtEntry_pt->flags)), ATUC_PERF_CURR_1DAY_FAILED_FASTR_FLAG)){
-				i=0;
-				j=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					mib_ptr = list_entry(ptr, amazon_mei_mib, list);
-					j+=mib_ptr->AtucPerfStatFailedFastR;
-					i++;	
-					if(i==96)
-						j=0;
-				}
-				j+=current_intvl->AtucPerfStatFailedFastR;
-				pts.atucPerfDataExtEntry_pt->adslAtucPerfCurr1DayFailedFastR=j;
-			}
-			if(IS_FLAG_SET((&(pts.atucPerfDataExtEntry_pt->flags)), ATUC_PERF_CURR_1DAY_SESL_FLAG)){
-				i=0;
-				j=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					mib_ptr = list_entry(ptr, amazon_mei_mib, list);
-					j+=mib_ptr->AtucPerfStatSesL;
-					i++;	
-					if(i==96)
-						j=0;
-				}
-				j+=current_intvl->AtucPerfStatSesL;
-				pts.atucPerfDataExtEntry_pt->adslAtucPerfCurr1DaySesL=j;
-			}
-			if(IS_FLAG_SET((&(pts.atucPerfDataExtEntry_pt->flags)), ATUC_PERF_CURR_1DAY_UASL_FLAG)){
-				i=0;
-				j=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					mib_ptr = list_entry(ptr, amazon_mei_mib, list);
-					j+=mib_ptr->AtucPerfStatUasL;
-					i++;	
-					if(i==96)
-						j=0;
-				}
-				j+=current_intvl->AtucPerfStatUasL;
-				pts.atucPerfDataExtEntry_pt->adslAtucPerfCurr1DayUasL=j;
-			}
-			if(IS_FLAG_SET((&(pts.atucPerfDataExtEntry_pt->flags)), ATUC_PERF_PREV_1DAY_FASTR_FLAG)){
-				i=0;
-				j=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					mib_ptr = list_entry(ptr, amazon_mei_mib, list);
-					j+=mib_ptr->AtucPerfStatFastR;
-					i++;
-					if(i==96)
-						break;
-				}	
-				if(i==96)
-					pts.atucPerfDataExtEntry_pt->adslAtucPerfPrev1DayFastR=j;
-				else
-					pts.atucPerfDataExtEntry_pt->adslAtucPerfPrev1DayFastR=0;
-			}	
-			if(IS_FLAG_SET((&(pts.atucPerfDataExtEntry_pt->flags)), ATUC_PERF_PREV_1DAY_FAILED_FASTR_FLAG)){
-				i=0;
-				j=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					mib_ptr = list_entry(ptr, amazon_mei_mib, list);
-					j+=mib_ptr->AtucPerfStatFailedFastR;
-					i++;
-					if(i==96)
-						break;
-				}	
-				if(i==96)
-					pts.atucPerfDataExtEntry_pt->adslAtucPerfPrev1DayFailedFastR=j;
-				else
-					pts.atucPerfDataExtEntry_pt->adslAtucPerfPrev1DayFailedFastR=0;
-			}
-			if(IS_FLAG_SET((&(pts.atucPerfDataExtEntry_pt->flags)), ATUC_PERF_PREV_1DAY_SESL_FLAG)){
-				i=0;
-				j=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					mib_ptr = list_entry(ptr, amazon_mei_mib, list);
-					j+=mib_ptr->AtucPerfStatSesL;
-					i++;
-					if(i==96)
-						break;
-				}	
-				if(i==96)
-					pts.atucPerfDataExtEntry_pt->adslAtucPerfPrev1DaySesL=j;
-				else
-					pts.atucPerfDataExtEntry_pt->adslAtucPerfPrev1DaySesL=0;
-			}
-			if(IS_FLAG_SET((&(pts.atucPerfDataExtEntry_pt->flags)), ATUC_PERF_PREV_1DAY_UASL_FLAG)){
-				i=0;
-				j=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					mib_ptr = list_entry(ptr, amazon_mei_mib, list);
-					j+=mib_ptr->AtucPerfStatUasL;
-					i++;
-					if(i==96)
-						break;
-				}	
-				if(i==96)
-					pts.atucPerfDataExtEntry_pt->adslAtucPerfPrev1DayUasL=j;
-				else
-					pts.atucPerfDataExtEntry_pt->adslAtucPerfPrev1DayUasL=0;
-			}
-			copy_to_user((char *)lon, (char *)pts.atucPerfDataExtEntry_pt, sizeof(atucPerfDataExtEntry));
-			kfree(pts.atucPerfDataExtEntry_pt);
-			break;
-#endif
-		case GET_ADSL_ATUR_PERF_DATA:
-			pts.aturPerfDataEntry_pt = (aturPerfDataEntry *)kmalloc(sizeof(aturPerfDataEntry), GFP_KERNEL);
-			copy_from_user((char *)pts.aturPerfDataEntry_pt, (char *)lon, sizeof(aturPerfDataEntry));
-			if(IS_FLAG_SET((&(pts.aturPerfDataEntry_pt->flags)), ATUR_PERF_LOFS_FLAG)){
-				pts.aturPerfDataEntry_pt->adslAturPerfLofs=ATUR_PERF_LOFS;
-			}
-			if(IS_FLAG_SET((&(pts.aturPerfDataEntry_pt->flags)), ATUR_PERF_LOSS_FLAG)){
-				pts.aturPerfDataEntry_pt->adslAturPerfLoss=ATUR_PERF_LOSS;
-			}
-			if(IS_FLAG_SET((&(pts.aturPerfDataEntry_pt->flags)), ATUR_PERF_LPR_FLAG)){
-				pts.aturPerfDataEntry_pt->adslAturPerfLprs=ATUR_PERF_LPR;
-			}
-			if(IS_FLAG_SET((&(pts.aturPerfDataEntry_pt->flags)), ATUR_PERF_ESS_FLAG)){
-				pts.aturPerfDataEntry_pt->adslAturPerfESs=ATUR_PERF_ESS;
-			}
-			if(IS_FLAG_SET((&(pts.aturPerfDataEntry_pt->flags)), ATUR_PERF_VALID_INTVLS_FLAG)){
-				i=0;
-				for(ptr=(current_intvl->list).prev; ptr!=&interval_list; ptr=ptr->prev){
-					i++;
-					if(i==96)
-						break;
-				}
-				pts.aturPerfDataEntry_pt->adslAturPerfValidIntervals=i;
-			}
-			if(IS_FLAG_SET((&(pts.aturPerfDataEntry_pt->flags)), ATUR_PERF_INVALID_INTVLS_FLAG)){
-				pts.aturPerfDataEntry_pt->adslAturPerfInvalidIntervals=0;
-			}
-			if(IS_FLAG_SET((&(pts.aturPerfDataEntry_pt->flags)), ATUR_PERF_CURR_15MIN_TIME_ELAPSED_FLAG)){
-				do_gettimeofday(&time_now);
-				pts.aturPerfDataEntry_pt->adslAturPerfCurr15MinTimeElapsed=time_now.tv_sec - (current_intvl->start_time).tv_sec;
-			}
-			if(IS_FLAG_SET((&(pts.aturPerfDataEntry_pt->flags)), ATUR_PERF_CURR_15MIN_LOFS_FLAG)){
-				pts.aturPerfDataEntry_pt->adslAturPerfCurr15MinLofs=current_intvl->AturPerfLof;
-			}
-			if(IS_FLAG_SET((&(pts.aturPerfDataEntry_pt->flags)), ATUR_PERF_CURR_15MIN_LOSS_FLAG)){
-				pts.aturPerfDataEntry_pt->adslAturPerfCurr15MinLoss=current_intvl->AturPerfLos;
-			}
-			if(IS_FLAG_SET((&(pts.aturPerfDataEntry_pt->flags)), ATUR_PERF_CURR_15MIN_LPR_FLAG)){
-				pts.aturPerfDataEntry_pt->adslAturPerfCurr15MinLprs=current_intvl->AturPerfLpr;
-			}
-			if(IS_FLAG_SET((&(pts.aturPerfDataEntry_pt->flags)), ATUR_PERF_CURR_15MIN_ESS_FLAG)){
-				pts.aturPerfDataEntry_pt->adslAturPerfCurr15MinESs=current_intvl->AturPerfEs;
-			}
-			if(IS_FLAG_SET((&(pts.aturPerfDataEntry_pt->flags)), ATUR_PERF_CURR_1DAY_TIME_ELAPSED_FLAG)){
-				i=0;		
-				for(ptr=(current_intvl->list).prev; ptr!=&interval_list; ptr=ptr->prev){
-					i+=900;	
-				}
-				do_gettimeofday(&time_now);
-				i+=time_now.tv_sec - (current_intvl->start_time).tv_sec;
-				if(i>=86400)
-					pts.aturPerfDataEntry_pt->adslAturPerfCurr1DayTimeElapsed=i-86400;
-				else
-					pts.aturPerfDataEntry_pt->adslAturPerfCurr1DayTimeElapsed=i;		
-			}
-			if(IS_FLAG_SET((&(pts.aturPerfDataEntry_pt->flags)), ATUR_PERF_CURR_1DAY_LOFS_FLAG)){		
-				i=0;
-				j=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					mib_ptr = list_entry(ptr, amazon_mei_mib, list);
-					j+=mib_ptr->AturPerfLof;
-					i++;	
-					if(i==96)
-						j=0;
-				}
-				j+=current_intvl->AturPerfLof;
-				pts.aturPerfDataEntry_pt->adslAturPerfCurr1DayLofs=j;
-			}
-			if(IS_FLAG_SET((&(pts.aturPerfDataEntry_pt->flags)), ATUR_PERF_CURR_1DAY_LOSS_FLAG)){		
-				i=0;
-				j=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					mib_ptr = list_entry(ptr, amazon_mei_mib, list);
-					j+=mib_ptr->AturPerfLos;
-					i++;	
-					if(i==96)
-						j=0;
-				}
-				j+=current_intvl->AturPerfLos;
-				pts.aturPerfDataEntry_pt->adslAturPerfCurr1DayLoss=j;
-			}
-			if(IS_FLAG_SET((&(pts.aturPerfDataEntry_pt->flags)), ATUR_PERF_CURR_1DAY_LPR_FLAG)){		
-				i=0;
-				j=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					mib_ptr = list_entry(ptr, amazon_mei_mib, list);
-					j+=mib_ptr->AturPerfLpr;
-					i++;	
-					if(i==96)
-						j=0;
-				}
-				j+=current_intvl->AturPerfLpr;
-				pts.aturPerfDataEntry_pt->adslAturPerfCurr1DayLprs=j;
-			}
-			if(IS_FLAG_SET((&(pts.aturPerfDataEntry_pt->flags)), ATUR_PERF_CURR_1DAY_ESS_FLAG)){		
-				i=0;
-				j=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					mib_ptr = list_entry(ptr, amazon_mei_mib, list);
-					j+=mib_ptr->AturPerfEs;
-					i++;	
-					if(i==96)
-						j=0;
-				}
-				j+=current_intvl->AturPerfEs;
-				pts.aturPerfDataEntry_pt->adslAturPerfCurr1DayESs=j;
-			}
-			if(IS_FLAG_SET((&(pts.aturPerfDataEntry_pt->flags)), ATUR_PERF_PREV_1DAY_MON_SEC_FLAG)){		
-				i=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					i++;		
-				}
-				if(i>=96)
-					pts.aturPerfDataEntry_pt->adslAturPerfPrev1DayMoniSecs=86400;
-				else
-					pts.aturPerfDataEntry_pt->adslAturPerfPrev1DayMoniSecs=0;
-			}
-			if(IS_FLAG_SET((&(pts.aturPerfDataEntry_pt->flags)), ATUR_PERF_PREV_1DAY_LOFS_FLAG)){
-				i=0;
-				j=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					mib_ptr = list_entry(ptr, amazon_mei_mib, list);
-					j+=mib_ptr->AturPerfLof;
-					i++;
-					if(i==96)
-						break;
-				}	
-				if(i==96)
-					pts.aturPerfDataEntry_pt->adslAturPerfPrev1DayLofs=j;
-				else
-					pts.aturPerfDataEntry_pt->adslAturPerfPrev1DayLofs=0;
-			}
-			if(IS_FLAG_SET((&(pts.aturPerfDataEntry_pt->flags)), ATUR_PERF_PREV_1DAY_LOSS_FLAG)){
-				i=0;
-				j=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					mib_ptr = list_entry(ptr, amazon_mei_mib, list);
-					j+=mib_ptr->AturPerfLos;
-					i++;
-					if(i==96)
-						break;
-				}	
-				if(i==96)
-					pts.aturPerfDataEntry_pt->adslAturPerfPrev1DayLoss=j;
-				else
-					pts.aturPerfDataEntry_pt->adslAturPerfPrev1DayLoss=0;
-			}
-			if(IS_FLAG_SET((&(pts.aturPerfDataEntry_pt->flags)), ATUR_PERF_PREV_1DAY_LPR_FLAG)){
-				i=0;
-				j=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					mib_ptr = list_entry(ptr, amazon_mei_mib, list);
-					j+=mib_ptr->AturPerfLpr;
-					i++;
-					if(i==96)
-						break;
-				}	
-				if(i==96)
-					pts.aturPerfDataEntry_pt->adslAturPerfPrev1DayLprs=j;
-				else
-					pts.aturPerfDataEntry_pt->adslAturPerfPrev1DayLprs=0;
-			}
-			if(IS_FLAG_SET((&(pts.aturPerfDataEntry_pt->flags)), ATUR_PERF_PREV_1DAY_ESS_FLAG)){
-				i=0;
-				j=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					mib_ptr = list_entry(ptr, amazon_mei_mib, list);
-					j+=mib_ptr->AturPerfEs;
-					i++;
-					if(i==96)
-						break;
-				}	
-				if(i==96)
-					pts.aturPerfDataEntry_pt->adslAturPerfPrev1DayESs=j;
-				else
-					pts.aturPerfDataEntry_pt->adslAturPerfPrev1DayESs=0;
-			}		
-			
-			copy_to_user((char *)lon, (char *)pts.aturPerfDataEntry_pt, sizeof(aturPerfDataEntry));
-			kfree(pts.aturPerfDataEntry_pt);
-			break;
-#ifdef AMAZON_MEI_MIB_RFC3440
-		case GET_ADSL_ATUR_PERF_DATA_EXT:
-			pts.aturPerfDataExtEntry_pt = (aturPerfDataExtEntry *)kmalloc(sizeof(aturPerfDataExtEntry), GFP_KERNEL);
-			copy_from_user((char *)pts.aturPerfDataExtEntry_pt, (char *)lon, sizeof(aturPerfDataExtEntry));
-			if(IS_FLAG_SET((&(pts.aturPerfDataExtEntry_pt->flags)), ATUR_PERF_STAT_SESL_FLAG)){
-				pts.aturPerfDataExtEntry_pt->adslAturPerfStatSesL=ATUR_PERF_STAT_SESL;
-			}	
-			if(IS_FLAG_SET((&(pts.aturPerfDataExtEntry_pt->flags)), ATUR_PERF_STAT_UASL_FLAG)){
-				pts.aturPerfDataExtEntry_pt->adslAturPerfStatUasL=ATUR_PERF_STAT_UASL;
-			}
-			if(IS_FLAG_SET((&(pts.aturPerfDataExtEntry_pt->flags)), ATUR_PERF_CURR_15MIN_SESL_FLAG)){
-				pts.aturPerfDataExtEntry_pt->adslAturPerfCurr15MinSesL=current_intvl->AturPerfStatSesL;
-			}	
-			if(IS_FLAG_SET((&(pts.aturPerfDataExtEntry_pt->flags)), ATUR_PERF_CURR_15MIN_UASL_FLAG)){
-				pts.aturPerfDataExtEntry_pt->adslAturPerfCurr15MinUasL=current_intvl->AturPerfStatUasL;
-			}
-			if(IS_FLAG_SET((&(pts.aturPerfDataExtEntry_pt->flags)), ATUR_PERF_CURR_1DAY_SESL_FLAG)){
-				i=0;
-				j=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					mib_ptr = list_entry(ptr, amazon_mei_mib, list);
-					j+=mib_ptr->AturPerfStatSesL;
-					i++;	
-					if(i==96)
-						j=0;
-				}
-				j+=current_intvl->AturPerfStatSesL;
-				pts.aturPerfDataExtEntry_pt->adslAturPerfCurr1DaySesL=j;	
-			}	
-			if(IS_FLAG_SET((&(pts.aturPerfDataExtEntry_pt->flags)), ATUR_PERF_CURR_1DAY_UASL_FLAG)){
-				i=0;
-				j=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					mib_ptr = list_entry(ptr, amazon_mei_mib, list);
-					j+=mib_ptr->AturPerfStatUasL;
-					i++;	
-					if(i==96)
-						j=0;
-				}
-				j+=current_intvl->AturPerfStatUasL;
-				pts.aturPerfDataExtEntry_pt->adslAturPerfCurr1DayUasL=j;
-			}
-			if(IS_FLAG_SET((&(pts.aturPerfDataExtEntry_pt->flags)), ATUR_PERF_PREV_1DAY_SESL_FLAG)){
-				i=0;
-				j=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					mib_ptr = list_entry(ptr, amazon_mei_mib, list);
-					j+=mib_ptr->AturPerfStatSesL;
-					i++;
-					if(i==96)
-						break;
-				}	
-				if(i==96)
-					pts.aturPerfDataExtEntry_pt->adslAturPerfPrev1DaySesL=j;
-				else
-					pts.aturPerfDataExtEntry_pt->adslAturPerfPrev1DaySesL=0;	
-			}	
-			if(IS_FLAG_SET((&(pts.aturPerfDataExtEntry_pt->flags)), ATUR_PERF_PREV_1DAY_UASL_FLAG)){
-				i=0;
-				j=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					mib_ptr = list_entry(ptr, amazon_mei_mib, list);
-					j+=mib_ptr->AturPerfStatUasL;
-					i++;
-					if(i==96)
-						break;
-				}	
-				if(i==96)
-					pts.aturPerfDataExtEntry_pt->adslAturPerfPrev1DayUasL=j;
-				else
-					pts.aturPerfDataExtEntry_pt->adslAturPerfPrev1DayUasL=0;
-			}
-			copy_to_user((char *)lon, (char *)pts.aturPerfDataExtEntry_pt, sizeof(aturPerfDataExtEntry));
-			kfree(pts.aturPerfDataExtEntry_pt);
-			break;
-#endif
-		case GET_ADSL_ATUC_INTVL_INFO:
-			pts.adslAtucIntvlInfo_pt = (adslAtucIntvlInfo *)kmalloc(sizeof(adslAtucIntvlInfo), GFP_KERNEL);
-			copy_from_user((char *)pts.adslAtucIntvlInfo_pt, (char *)lon, sizeof(adslAtucIntvlInfo));
-			
-			if(pts.adslAtucIntvlInfo_pt->IntervalNumber <1){
-				pts.adslAtucIntvlInfo_pt->intervalLOF = ATUC_PERF_LOFS;
-				pts.adslAtucIntvlInfo_pt->intervalLOS = ATUC_PERF_LOSS;
-				pts.adslAtucIntvlInfo_pt->intervalES = ATUC_PERF_ESS;
-				pts.adslAtucIntvlInfo_pt->intervalInits = ATUC_PERF_INITS;
-				pts.adslAtucIntvlInfo_pt->intervalValidData = 1;	
-			}
-			else{
-				i=0;
-				for(ptr=(current_intvl->list).prev; ptr!=&interval_list; ptr=ptr->prev){
-					i++;
-					if(i==pts.adslAtucIntvlInfo_pt->IntervalNumber){
-						temp_intvl = list_entry(ptr, amazon_mei_mib, list);
-						pts.adslAtucIntvlInfo_pt->intervalLOF = temp_intvl->AtucPerfLof;
-						pts.adslAtucIntvlInfo_pt->intervalLOS = temp_intvl->AtucPerfLos;
-						pts.adslAtucIntvlInfo_pt->intervalES = temp_intvl->AtucPerfEs;
-						pts.adslAtucIntvlInfo_pt->intervalInits = temp_intvl->AtucPerfInit;
-						pts.adslAtucIntvlInfo_pt->intervalValidData = 1;
-						break;
-					}		
-				}
-				if(ptr==&interval_list){
-					pts.adslAtucIntvlInfo_pt->intervalValidData = 0;
-					pts.adslAtucIntvlInfo_pt->flags = 0;
-					pts.adslAtucIntvlInfo_pt->intervalLOF = 0;
-					pts.adslAtucIntvlInfo_pt->intervalLOS = 0;
-					pts.adslAtucIntvlInfo_pt->intervalES = 0;
-					pts.adslAtucIntvlInfo_pt->intervalInits = 0;	
-				}
-			}
-									
-			copy_to_user((char *)lon, (char *)pts.adslAtucIntvlInfo_pt, sizeof(adslAtucIntvlInfo));
-			kfree(pts.adslAtucIntvlInfo_pt);
-			break;
-#ifdef AMAZON_MEI_MIB_RFC3440
-		case GET_ADSL_ATUC_INTVL_EXT_INFO:
-			pts.adslAtucInvtlExtInfo_pt = (adslAtucInvtlExtInfo *)kmalloc(sizeof(adslAtucInvtlExtInfo), GFP_KERNEL);
-			copy_from_user((char *)pts.adslAtucInvtlExtInfo_pt, (char *)lon, sizeof(adslAtucInvtlExtInfo));
-			if(pts.adslAtucInvtlExtInfo_pt->IntervalNumber <1){
-				pts.adslAtucInvtlExtInfo_pt->adslAtucIntervalFastR = ATUC_PERF_STAT_FASTR;
-				pts.adslAtucInvtlExtInfo_pt->adslAtucIntervalFailedFastR = ATUC_PERF_STAT_FAILED_FASTR;
-				pts.adslAtucInvtlExtInfo_pt->adslAtucIntervalSesL = ATUC_PERF_STAT_SESL;
-				pts.adslAtucInvtlExtInfo_pt->adslAtucIntervalUasL = ATUC_PERF_STAT_UASL;
-//				pts.adslAtucInvtlExtInfo_pt->intervalValidData = 1;	
-			}
-			else{
-				i=0;
-				for(ptr=(current_intvl->list).prev; ptr!=&interval_list; ptr=ptr->prev){
-					i++;
-					if(i==pts.adslAtucInvtlExtInfo_pt->IntervalNumber){
-						temp_intvl = list_entry(ptr, amazon_mei_mib, list);
-						pts.adslAtucInvtlExtInfo_pt->adslAtucIntervalFastR = temp_intvl->AtucPerfStatFastR;
-						pts.adslAtucInvtlExtInfo_pt->adslAtucIntervalFailedFastR = temp_intvl->AtucPerfStatFailedFastR;
-						pts.adslAtucInvtlExtInfo_pt->adslAtucIntervalSesL = temp_intvl->AtucPerfStatSesL;
-						pts.adslAtucInvtlExtInfo_pt->adslAtucIntervalUasL = temp_intvl->AtucPerfStatUasL;
-//						pts.adslAtucInvtlExtInfo_pt->intervalValidData = 1;
-						break;
-					}		
-				} 
-				if(ptr==&interval_list){
-//					pts.adslAtucInvtlExtInfo_pt->intervalValidData = 0;
-					pts.adslAtucInvtlExtInfo_pt->flags = 0;	
-					pts.adslAtucInvtlExtInfo_pt->adslAtucIntervalFastR = 0;
-					pts.adslAtucInvtlExtInfo_pt->adslAtucIntervalFailedFastR = 0;
-					pts.adslAtucInvtlExtInfo_pt->adslAtucIntervalSesL = 0;
-					pts.adslAtucInvtlExtInfo_pt->adslAtucIntervalUasL = 0;
-				}
-			}
-			copy_to_user((char *)lon, (char *)pts.adslAtucInvtlExtInfo_pt, sizeof(adslAtucInvtlExtInfo));
-			kfree(pts.adslAtucInvtlExtInfo_pt);
-			break;
-#endif
-		case GET_ADSL_ATUR_INTVL_INFO:
-			pts.adslAturIntvlInfo_pt = (adslAturIntvlInfo *)kmalloc(sizeof(adslAturIntvlInfo), GFP_KERNEL);
-			copy_from_user((char *)pts.adslAturIntvlInfo_pt, (char *)lon, sizeof(adslAturIntvlInfo));
-			
-			if(pts.adslAturIntvlInfo_pt->IntervalNumber <1){
-				pts.adslAturIntvlInfo_pt->intervalLOF = ATUR_PERF_LOFS;
-				pts.adslAturIntvlInfo_pt->intervalLOS = ATUR_PERF_LOSS;
-				pts.adslAturIntvlInfo_pt->intervalES = ATUR_PERF_ESS;
-				pts.adslAturIntvlInfo_pt->intervalLPR = ATUR_PERF_LPR;
-				pts.adslAturIntvlInfo_pt->intervalValidData = 1;	
-			}
-			else{
-				i=0;
-				for(ptr=(current_intvl->list).prev; ptr!=&interval_list; ptr=ptr->prev){
-					i++;
-					if(i==pts.adslAturIntvlInfo_pt->IntervalNumber){
-						temp_intvl = list_entry(ptr, amazon_mei_mib, list);
-						pts.adslAturIntvlInfo_pt->intervalLOF = temp_intvl->AturPerfLof;
-						pts.adslAturIntvlInfo_pt->intervalLOS = temp_intvl->AturPerfLos;
-						pts.adslAturIntvlInfo_pt->intervalES = temp_intvl->AturPerfEs;
-						pts.adslAturIntvlInfo_pt->intervalLPR = temp_intvl->AturPerfLpr;
-						pts.adslAturIntvlInfo_pt->intervalValidData = 1;
-						break;
-					}		
-				}
-				if(ptr==&interval_list){
-					pts.adslAturIntvlInfo_pt->intervalValidData = 0;
-					pts.adslAturIntvlInfo_pt->flags = 0;
-					pts.adslAturIntvlInfo_pt->intervalLOF = 0;
-					pts.adslAturIntvlInfo_pt->intervalLOS = 0;
-					pts.adslAturIntvlInfo_pt->intervalES = 0;
-					pts.adslAturIntvlInfo_pt->intervalLPR = 0;	
-				}
-			}
-			
-			copy_to_user((char *)lon, (char *)pts.adslAturIntvlInfo_pt, sizeof(adslAturIntvlInfo));
-			kfree(pts.adslAturIntvlInfo_pt);
-			break;
-#ifdef AMAZON_MEI_MIB_RFC3440
-		case GET_ADSL_ATUR_INTVL_EXT_INFO:
-			pts.adslAturInvtlExtInfo_pt = (adslAturInvtlExtInfo *)kmalloc(sizeof(adslAturInvtlExtInfo), GFP_KERNEL);
-			copy_from_user((char *)pts.adslAturInvtlExtInfo_pt, (char *)lon, sizeof(adslAturInvtlExtInfo));
-			
-			if(pts.adslAturInvtlExtInfo_pt->IntervalNumber <1){
-				pts.adslAturInvtlExtInfo_pt->adslAturIntervalSesL = ATUR_PERF_STAT_SESL;
-				pts.adslAturInvtlExtInfo_pt->adslAturIntervalUasL = ATUR_PERF_STAT_UASL;
-//				pts.adslAturInvtlExtInfo_pt->intervalValidData = 1;
-			}
-			else{
-				i=0;
-				for(ptr=(current_intvl->list).prev; ptr!=&interval_list; ptr=ptr->prev){
-					i++;
-					if(i==pts.adslAturInvtlExtInfo_pt->IntervalNumber){
-						temp_intvl = list_entry(ptr, amazon_mei_mib, list);
-						pts.adslAturInvtlExtInfo_pt->adslAturIntervalSesL = temp_intvl->AturPerfStatSesL;
-						pts.adslAturInvtlExtInfo_pt->adslAturIntervalUasL = temp_intvl->AturPerfStatUasL;
-//						pts.adslAturInvtlExtInfo_pt->intervalValidData = 1;
-						break; 
-					}		
-				}
-				if(ptr==&interval_list){
-//					pts.adslAturInvtlExtInfo_pt->intervalValidData = 0;
-					pts.adslAturInvtlExtInfo_pt->flags = 0;	
-					pts.adslAturInvtlExtInfo_pt->adslAturIntervalSesL = 0;
-					pts.adslAturInvtlExtInfo_pt->adslAturIntervalUasL = 0; 
-				}
-			}
-			
-			copy_to_user((char *)lon, (char *)pts.adslAturInvtlExtInfo_pt, sizeof(adslAturInvtlExtInfo));
-			kfree(pts.adslAturInvtlExtInfo_pt);
-			break;
-#endif
-		case GET_ADSL_ATUC_CHAN_PERF_DATA:
-			pts.atucChannelPerfDataEntry_pt = (atucChannelPerfDataEntry *)kmalloc(sizeof(atucChannelPerfDataEntry), GFP_KERNEL);
-			copy_from_user((char *)pts.atucChannelPerfDataEntry_pt, (char *)lon, sizeof(atucChannelPerfDataEntry));
-	
-			pts.atucChannelPerfDataEntry_pt->flags = 0;
-			
-			copy_to_user((char *)lon, (char *)pts.atucChannelPerfDataEntry_pt, sizeof(atucChannelPerfDataEntry));
-			kfree(pts.atucChannelPerfDataEntry_pt);
-			break;
-		case GET_ADSL_ATUR_CHAN_PERF_DATA:
-			pts.aturChannelPerfDataEntry_pt = (aturChannelPerfDataEntry *)kmalloc(sizeof(aturChannelPerfDataEntry), GFP_KERNEL);
-			copy_from_user((char *)pts.aturChannelPerfDataEntry_pt, (char *)lon, sizeof(aturChannelPerfDataEntry));
-			if(IS_FLAG_SET((&(pts.aturChannelPerfDataEntry_pt->flags)), ATUR_CHAN_RECV_BLK_FLAG)){
-				pts.aturChannelPerfDataEntry_pt->adslAturChanReceivedBlks=ATUR_CHAN_RECV_BLK;
-			}
-			if(IS_FLAG_SET((&(pts.aturChannelPerfDataEntry_pt->flags)), ATUR_CHAN_TX_BLK_FLAG)){
-				pts.aturChannelPerfDataEntry_pt->adslAturChanTransmittedBlks=ATUR_CHAN_TX_BLK;
-			}
-			if(IS_FLAG_SET((&(pts.aturChannelPerfDataEntry_pt->flags)), ATUR_CHAN_CORR_BLK_FLAG)){
-				pts.aturChannelPerfDataEntry_pt->adslAturChanCorrectedBlks=ATUR_CHAN_CORR_BLK;
-			}
-			if(IS_FLAG_SET((&(pts.aturChannelPerfDataEntry_pt->flags)), ATUR_CHAN_UNCORR_BLK_FLAG)){
-				pts.aturChannelPerfDataEntry_pt->adslAturChanUncorrectBlks=ATUR_CHAN_UNCORR_BLK;
-			}
-			if(IS_FLAG_SET((&(pts.aturChannelPerfDataEntry_pt->flags)), ATUR_CHAN_PERF_VALID_INTVL_FLAG)){
-				i=0;
-				for(ptr=(current_intvl->list).prev; ptr!=&interval_list; ptr=ptr->prev){
-					i++;
-					if(i==96)
-						break;
-				}
-				pts.aturChannelPerfDataEntry_pt->adslAturChanPerfValidIntervals=i;
-			}
-			if(IS_FLAG_SET((&(pts.aturChannelPerfDataEntry_pt->flags)), ATUR_CHAN_PERF_INVALID_INTVL_FLAG)){
-				pts.aturChannelPerfDataEntry_pt->adslAturChanPerfInvalidIntervals=0;
-			}
- 			if(IS_FLAG_SET((&(pts.aturChannelPerfDataEntry_pt->flags)), ATUR_CHAN_PERF_CURR_15MIN_TIME_ELAPSED_FLAG)){
-				do_gettimeofday(&time_now);
-				pts.aturChannelPerfDataEntry_pt->adslAturChanPerfCurr15MinTimeElapsed=time_now.tv_sec - (current_intvl->start_time).tv_sec;
-			}
-			if(IS_FLAG_SET((&(pts.aturChannelPerfDataEntry_pt->flags)), ATUR_CHAN_PERF_CURR_15MIN_RECV_BLK_FLAG)){
-				pts.aturChannelPerfDataEntry_pt->adslAturChanPerfCurr15MinReceivedBlks=current_intvl->AturChanPerfRxBlk;
-			}
-			if(IS_FLAG_SET((&(pts.aturChannelPerfDataEntry_pt->flags)), ATUR_CHAN_PERF_CURR_15MIN_TX_BLK_FLAG)){
-				pts.aturChannelPerfDataEntry_pt->adslAturChanPerfCurr15MinTransmittedBlks=current_intvl->AturChanPerfTxBlk;
-			}
-			if(IS_FLAG_SET((&(pts.aturChannelPerfDataEntry_pt->flags)), ATUR_CHAN_PERF_CURR_15MIN_CORR_BLK_FLAG)){
-				pts.aturChannelPerfDataEntry_pt->adslAturChanPerfCurr15MinCorrectedBlks=current_intvl->AturChanPerfCorrBlk;
-			}
-			if(IS_FLAG_SET((&(pts.aturChannelPerfDataEntry_pt->flags)), ATUR_CHAN_PERF_CURR_15MIN_UNCORR_BLK_FLAG)){
-				pts.aturChannelPerfDataEntry_pt->adslAturChanPerfCurr15MinUncorrectBlks=current_intvl->AturChanPerfUncorrBlk;
-			}
-			if(IS_FLAG_SET((&(pts.aturChannelPerfDataEntry_pt->flags)), ATUR_CHAN_PERF_CURR_1DAY_TIME_ELAPSED_FLAG)){
-				i=0;		
-				for(ptr=(current_intvl->list).prev; ptr!=&interval_list; ptr=ptr->prev){
-					i+=900;	
-				}
-				do_gettimeofday(&time_now);
-				i+=time_now.tv_sec - (current_intvl->start_time).tv_sec;
-				if(i>=86400)
-					pts.aturChannelPerfDataEntry_pt->adslAturChanPerfCurr1DayTimeElapsed=i-86400;
-				else
-					pts.aturChannelPerfDataEntry_pt->adslAturChanPerfCurr1DayTimeElapsed=i;		
-			}
-			if(IS_FLAG_SET((&(pts.aturChannelPerfDataEntry_pt->flags)), ATUR_CHAN_PERF_CURR_1DAY_RECV_BLK_FLAG)){		
-				i=0;
-				j=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					mib_ptr = list_entry(ptr, amazon_mei_mib, list);
-					j+=mib_ptr->AturChanPerfRxBlk;
-					i++;	
-					if(i==96)
-						j=0;
-				}
-				j+=current_intvl->AturChanPerfRxBlk;
-				pts.aturChannelPerfDataEntry_pt->adslAturChanPerfCurr1DayReceivedBlks=j;
-			}
-			if(IS_FLAG_SET((&(pts.aturChannelPerfDataEntry_pt->flags)), ATUR_CHAN_PERF_CURR_1DAY_TX_BLK_FLAG)){		
-				i=0;
-				j=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					mib_ptr = list_entry(ptr, amazon_mei_mib, list);
-					j+=mib_ptr->AturChanPerfTxBlk;
-					i++;	
-					if(i==96)
-						j=0;
-				}
-				j+=current_intvl->AturChanPerfTxBlk;
-				pts.aturChannelPerfDataEntry_pt->adslAturChanPerfCurr1DayTransmittedBlks=j;
-			}
-			if(IS_FLAG_SET((&(pts.aturChannelPerfDataEntry_pt->flags)), ATUR_CHAN_PERF_CURR_1DAY_CORR_BLK_FLAG)){		
-				i=0;
-				j=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					mib_ptr = list_entry(ptr, amazon_mei_mib, list);
-					j+=mib_ptr->AturChanPerfCorrBlk;
-					i++;	
-					if(i==96)
-						j=0;
-				}
-				j+=current_intvl->AturChanPerfCorrBlk;
-				pts.aturChannelPerfDataEntry_pt->adslAturChanPerfCurr1DayCorrectedBlks=j;
-			}
-			if(IS_FLAG_SET((&(pts.aturChannelPerfDataEntry_pt->flags)), ATUR_CHAN_PERF_CURR_1DAY_UNCORR_BLK_FLAG)){		
-				i=0;
-				j=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					mib_ptr = list_entry(ptr, amazon_mei_mib, list);
-					j+=mib_ptr->AturChanPerfUncorrBlk;
-					i++;	
-					if(i==96)
-						j=0;
-				}
-				j+=current_intvl->AturChanPerfUncorrBlk;
-				pts.aturChannelPerfDataEntry_pt->adslAturChanPerfCurr1DayUncorrectBlks=j;
-			}
-			if(IS_FLAG_SET((&(pts.aturChannelPerfDataEntry_pt->flags)), ATUR_CHAN_PERF_PREV_1DAY_MONI_SEC_FLAG)){		
-				i=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					i++;		
-				}
-				if(i>=96)
-					pts.aturChannelPerfDataEntry_pt->adslAturChanPerfPrev1DayMoniSecs=86400;
-				else
-					pts.aturChannelPerfDataEntry_pt->adslAturChanPerfPrev1DayMoniSecs=0;
-			}
-			if(IS_FLAG_SET((&(pts.aturChannelPerfDataEntry_pt->flags)), ATUR_CHAN_PERF_PREV_1DAY_RECV_BLK_FLAG)){
-				i=0;
-				j=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					mib_ptr = list_entry(ptr, amazon_mei_mib, list);
-					j+=mib_ptr->AturChanPerfRxBlk;
-					i++;
-					if(i==96)
-						break;
-				}	
-				if(i==96)
-					pts.aturChannelPerfDataEntry_pt->adslAturChanPerfPrev1DayReceivedBlks=j;
-				else
-					pts.aturChannelPerfDataEntry_pt->adslAturChanPerfPrev1DayReceivedBlks=0;
-			}
-			if(IS_FLAG_SET((&(pts.aturChannelPerfDataEntry_pt->flags)), ATUR_CHAN_PERF_PREV_1DAY_TRANS_BLK_FLAG)){
-				i=0;
-				j=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					mib_ptr = list_entry(ptr, amazon_mei_mib, list);
-					j+=mib_ptr->AturChanPerfTxBlk;
-					i++;
-					if(i==96)
-						break;
-				}	
-				if(i==96)
-					pts.aturChannelPerfDataEntry_pt->adslAturChanPerfPrev1DayTransmittedBlks=j;
-				else
-					pts.aturChannelPerfDataEntry_pt->adslAturChanPerfPrev1DayTransmittedBlks=0;
-			}
-			if(IS_FLAG_SET((&(pts.aturChannelPerfDataEntry_pt->flags)), ATUR_CHAN_PERF_PREV_1DAY_CORR_BLK_FLAG)){
-				i=0;
-				j=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					mib_ptr = list_entry(ptr, amazon_mei_mib, list);
-					j+=mib_ptr->AturChanPerfCorrBlk;
-					i++;
-					if(i==96)
-						break;
-				}	
-				if(i==96)
-					pts.aturChannelPerfDataEntry_pt->adslAturChanPerfPrev1DayCorrectedBlks=j;
-				else
-					pts.aturChannelPerfDataEntry_pt->adslAturChanPerfPrev1DayCorrectedBlks=0;
-			}
-			if(IS_FLAG_SET((&(pts.aturChannelPerfDataEntry_pt->flags)), ATUR_CHAN_PERF_PREV_1DAY_UNCORR_BLK_FLAG)){
-				i=0;
-				j=0;
-				for(ptr=interval_list.next; ptr!=&(current_intvl->list); ptr=ptr->next){
-					mib_ptr = list_entry(ptr, amazon_mei_mib, list);
-					j+=mib_ptr->AturChanPerfUncorrBlk;
-					i++;
-					if(i==96)
-						break;
-				}	
-				if(i==96)
-					pts.aturChannelPerfDataEntry_pt->adslAturChanPerfPrev1DayUncorrectBlks=j;
-				else
-					pts.aturChannelPerfDataEntry_pt->adslAturChanPerfPrev1DayUncorrectBlks=0;
-			}
-			
-			copy_to_user((char *)lon, (char *)pts.aturChannelPerfDataEntry_pt, sizeof(aturChannelPerfDataEntry));
-			kfree(pts.aturChannelPerfDataEntry_pt);
-			break;
-		case GET_ADSL_ATUC_CHAN_INTVL_INFO:
-			pts.adslAtucChanIntvlInfo_pt = (adslAtucChanIntvlInfo *)kmalloc(sizeof(adslAtucChanIntvlInfo), GFP_KERNEL);
-			copy_from_user((char *)pts.adslAtucChanIntvlInfo_pt, (char *)lon, sizeof(adslAtucChanIntvlInfo));
-				
-				pts.adslAtucChanIntvlInfo_pt->flags = 0;
-				
-			copy_to_user((char *)lon, (char *)pts.adslAtucChanIntvlInfo_pt, sizeof(adslAtucChanIntvlInfo));
-			kfree(pts.adslAtucChanIntvlInfo_pt);
-			break;
-		case GET_ADSL_ATUR_CHAN_INTVL_INFO:
-			pts.adslAturChanIntvlInfo_pt = (adslAturChanIntvlInfo *)kmalloc(sizeof(adslAturChanIntvlInfo), GFP_KERNEL);
-			copy_from_user((char *)pts.adslAturChanIntvlInfo_pt, (char *)lon, sizeof(adslAturChanIntvlInfo));
-			
-			if(pts.adslAturChanIntvlInfo_pt->IntervalNumber <1){
-				pts.adslAturChanIntvlInfo_pt->chanIntervalRecvdBlks = ATUR_CHAN_RECV_BLK;
-				pts.adslAturChanIntvlInfo_pt->chanIntervalXmitBlks = ATUR_CHAN_TX_BLK;
-				pts.adslAturChanIntvlInfo_pt->chanIntervalCorrectedBlks = ATUR_CHAN_CORR_BLK;
-				pts.adslAturChanIntvlInfo_pt->chanIntervalUncorrectBlks = ATUR_CHAN_UNCORR_BLK;
-				pts.adslAturChanIntvlInfo_pt->intervalValidData = 1;
-			}
-			else{
-				i=0;
-				for(ptr=(current_intvl->list).prev; ptr!=&interval_list; ptr=ptr->prev){
-					i++;
-					if(i==pts.adslAturChanIntvlInfo_pt->IntervalNumber){
-						temp_intvl = list_entry(ptr, amazon_mei_mib, list);
-						pts.adslAturChanIntvlInfo_pt->chanIntervalRecvdBlks = temp_intvl->AturChanPerfRxBlk;
-						pts.adslAturChanIntvlInfo_pt->chanIntervalXmitBlks = temp_intvl->AturChanPerfTxBlk;
-						pts.adslAturChanIntvlInfo_pt->chanIntervalCorrectedBlks = temp_intvl->AturChanPerfCorrBlk;
-						pts.adslAturChanIntvlInfo_pt->chanIntervalUncorrectBlks = temp_intvl->AturChanPerfUncorrBlk;
-						pts.adslAturChanIntvlInfo_pt->intervalValidData = 1;
-						break;
-					}		
-				}
-				if(ptr==&interval_list){
-					pts.adslAturChanIntvlInfo_pt->intervalValidData = 0;
-					pts.adslAturChanIntvlInfo_pt->flags = 0;	
-				}
-			}
-			
-			copy_to_user((char *)lon, (char *)pts.adslAturChanIntvlInfo_pt, sizeof(adslAturChanIntvlInfo));
-			kfree(pts.adslAturChanIntvlInfo_pt);
-			break;
-		case GET_ADSL_ALRM_CONF_PROF:
-			pts.adslLineAlarmConfProfileEntry_pt = (adslLineAlarmConfProfileEntry *)kmalloc(sizeof(adslLineAlarmConfProfileEntry), GFP_KERNEL);
-			copy_from_user((char *)pts.adslLineAlarmConfProfileEntry_pt, (char *)lon, sizeof(adslLineAlarmConfProfileEntry));
-			
-			strncpy(pts.adslLineAlarmConfProfileEntry_pt->adslLineAlarmConfProfileName, AlarmConfProfile.adslLineAlarmConfProfileName, 32); 
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileEntry_pt->flags)), ATUC_THRESH_15MIN_LOFS_FLAG)){
-				pts.adslLineAlarmConfProfileEntry_pt->adslAtucThresh15MinLofs=AlarmConfProfile.adslAtucThresh15MinLofs;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileEntry_pt->flags)), ATUC_THRESH_15MIN_LOSS_FLAG)){
-				pts.adslLineAlarmConfProfileEntry_pt->adslAtucThresh15MinLoss=AlarmConfProfile.adslAtucThresh15MinLoss;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileEntry_pt->flags)), ATUC_THRESH_15MIN_ESS_FLAG)){
-				pts.adslLineAlarmConfProfileEntry_pt->adslAtucThresh15MinESs=AlarmConfProfile.adslAtucThresh15MinESs;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileEntry_pt->flags)), ATUC_THRESH_FAST_RATEUP_FLAG)){
-				pts.adslLineAlarmConfProfileEntry_pt->adslAtucThreshFastRateUp=AlarmConfProfile.adslAtucThreshFastRateUp;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileEntry_pt->flags)), ATUC_THRESH_INTERLEAVE_RATEUP_FLAG)){
-				pts.adslLineAlarmConfProfileEntry_pt->adslAtucThreshInterleaveRateUp=AlarmConfProfile.adslAtucThreshInterleaveRateUp;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileEntry_pt->flags)), ATUC_THRESH_FAST_RATEDOWN_FLAG)){
-				pts.adslLineAlarmConfProfileEntry_pt->adslAtucThreshFastRateDown=AlarmConfProfile.adslAtucThreshFastRateDown;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileEntry_pt->flags)), ATUC_THRESH_INTERLEAVE_RATEDOWN_FLAG)){
-				pts.adslLineAlarmConfProfileEntry_pt->adslAtucThreshInterleaveRateDown=AlarmConfProfile.adslAtucThreshInterleaveRateDown;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileEntry_pt->flags)), ATUC_INIT_FAILURE_TRAP_ENABLE_FLAG)){
-				pts.adslLineAlarmConfProfileEntry_pt->adslAtucInitFailureTrapEnable=AlarmConfProfile.adslAtucInitFailureTrapEnable;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileEntry_pt->flags)), ATUR_THRESH_15MIN_LOFS_FLAG)){
-				pts.adslLineAlarmConfProfileEntry_pt->adslAturThresh15MinLofs=AlarmConfProfile.adslAturThresh15MinLofs;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileEntry_pt->flags)), ATUR_THRESH_15MIN_LOSS_FLAG)){
-				pts.adslLineAlarmConfProfileEntry_pt->adslAturThresh15MinLoss=AlarmConfProfile.adslAturThresh15MinLoss;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileEntry_pt->flags)), ATUR_THRESH_15MIN_LPRS_FLAG)){
-				pts.adslLineAlarmConfProfileEntry_pt->adslAturThresh15MinLprs=AlarmConfProfile.adslAturThresh15MinLprs;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileEntry_pt->flags)), ATUR_THRESH_15MIN_ESS_FLAG)){
-				pts.adslLineAlarmConfProfileEntry_pt->adslAturThresh15MinESs=AlarmConfProfile.adslAturThresh15MinESs;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileEntry_pt->flags)), ATUR_THRESH_FAST_RATEUP_FLAG)){
-				pts.adslLineAlarmConfProfileEntry_pt->adslAturThreshFastRateUp=AlarmConfProfile.adslAturThreshFastRateUp;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileEntry_pt->flags)), ATUR_THRESH_INTERLEAVE_RATEUP_FLAG)){
-				pts.adslLineAlarmConfProfileEntry_pt->adslAturThreshInterleaveRateUp=AlarmConfProfile.adslAturThreshInterleaveRateUp;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileEntry_pt->flags)), ATUR_THRESH_FAST_RATEDOWN_FLAG)){
-				pts.adslLineAlarmConfProfileEntry_pt->adslAturThreshFastRateDown=AlarmConfProfile.adslAturThreshFastRateDown;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileEntry_pt->flags)), ATUR_THRESH_INTERLEAVE_RATEDOWN_FLAG)){
-				pts.adslLineAlarmConfProfileEntry_pt->adslAturThreshInterleaveRateDown=AlarmConfProfile.adslAturThreshInterleaveRateDown;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileEntry_pt->flags)), LINE_ALARM_CONF_PROFILE_ROWSTATUS_FLAG)){
-				pts.adslLineAlarmConfProfileEntry_pt->adslLineAlarmConfProfileRowStatus=AlarmConfProfile.adslLineAlarmConfProfileRowStatus;
-			}
-			copy_to_user((char *)lon, (char *)pts.adslLineAlarmConfProfileEntry_pt, sizeof(adslLineAlarmConfProfileEntry));
-			kfree(pts.adslLineAlarmConfProfileEntry_pt);
-			break;
-#ifdef AMAZON_MEI_MIB_RFC3440
-		case GET_ADSL_ALRM_CONF_PROF_EXT:
-			pts.adslLineAlarmConfProfileExtEntry_pt = (adslLineAlarmConfProfileExtEntry *)kmalloc(sizeof(adslLineAlarmConfProfileExtEntry), GFP_KERNEL);
-			copy_from_user((char *)pts.adslLineAlarmConfProfileExtEntry_pt, (char *)lon, sizeof(adslLineAlarmConfProfileExtEntry));
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileExtEntry_pt->flags)), ATUC_THRESH_15MIN_FAILED_FASTR_FLAG)){
-				pts.adslLineAlarmConfProfileExtEntry_pt->adslAtucThreshold15MinFailedFastR=AlarmConfProfileExt.adslAtucThreshold15MinFailedFastR;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileExtEntry_pt->flags)), ATUC_THRESH_15MIN_SESL_FLAG)){
-				pts.adslLineAlarmConfProfileExtEntry_pt->adslAtucThreshold15MinSesL=AlarmConfProfileExt.adslAtucThreshold15MinSesL;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileExtEntry_pt->flags)), ATUC_THRESH_15MIN_UASL_FLAG)){
-				pts.adslLineAlarmConfProfileExtEntry_pt->adslAtucThreshold15MinUasL=AlarmConfProfileExt.adslAtucThreshold15MinUasL;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileExtEntry_pt->flags)), ATUR_THRESH_15MIN_SESL_FLAG)){
-				pts.adslLineAlarmConfProfileExtEntry_pt->adslAturThreshold15MinSesL=AlarmConfProfileExt.adslAturThreshold15MinSesL;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileExtEntry_pt->flags)), ATUR_THRESH_15MIN_UASL_FLAG)){
-				pts.adslLineAlarmConfProfileExtEntry_pt->adslAturThreshold15MinUasL=AlarmConfProfileExt.adslAturThreshold15MinUasL;
-			}
-			copy_to_user((char *)lon, (char *)pts.adslLineAlarmConfProfileExtEntry_pt, sizeof(adslLineAlarmConfProfileExtEntry));
-			kfree(pts.adslLineAlarmConfProfileExtEntry_pt);
-			break;
-#endif
-		case SET_ADSL_ALRM_CONF_PROF:
-			pts.adslLineAlarmConfProfileEntry_pt = (adslLineAlarmConfProfileEntry *)kmalloc(sizeof(adslLineAlarmConfProfileEntry), GFP_KERNEL);
-			copy_from_user((char *)pts.adslLineAlarmConfProfileEntry_pt, (char *)lon, sizeof(adslLineAlarmConfProfileEntry));
-
-			strncpy(AlarmConfProfile.adslLineAlarmConfProfileName, pts.adslLineAlarmConfProfileEntry_pt->adslLineAlarmConfProfileName, 32);
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileEntry_pt->flags)), ATUC_THRESH_15MIN_LOFS_FLAG)){
-				AlarmConfProfile.adslAtucThresh15MinLofs=pts.adslLineAlarmConfProfileEntry_pt->adslAtucThresh15MinLofs;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileEntry_pt->flags)), ATUC_THRESH_15MIN_LOSS_FLAG)){
-				AlarmConfProfile.adslAtucThresh15MinLoss=pts.adslLineAlarmConfProfileEntry_pt->adslAtucThresh15MinLoss;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileEntry_pt->flags)), ATUC_THRESH_15MIN_ESS_FLAG)){
-				AlarmConfProfile.adslAtucThresh15MinESs=pts.adslLineAlarmConfProfileEntry_pt->adslAtucThresh15MinESs;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileEntry_pt->flags)), ATUC_THRESH_FAST_RATEUP_FLAG)){
-				AlarmConfProfile.adslAtucThreshFastRateUp=pts.adslLineAlarmConfProfileEntry_pt->adslAtucThreshFastRateUp;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileEntry_pt->flags)), ATUC_THRESH_INTERLEAVE_RATEUP_FLAG)){
-				AlarmConfProfile.adslAtucThreshInterleaveRateUp=pts.adslLineAlarmConfProfileEntry_pt->adslAtucThreshInterleaveRateUp;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileEntry_pt->flags)), ATUC_THRESH_FAST_RATEDOWN_FLAG)){
-				AlarmConfProfile.adslAtucThreshFastRateDown=pts.adslLineAlarmConfProfileEntry_pt->adslAtucThreshFastRateDown;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileEntry_pt->flags)), ATUC_THRESH_INTERLEAVE_RATEDOWN_FLAG)){
-				AlarmConfProfile.adslAtucThreshInterleaveRateDown=pts.adslLineAlarmConfProfileEntry_pt->adslAtucThreshInterleaveRateDown;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileEntry_pt->flags)), ATUC_INIT_FAILURE_TRAP_ENABLE_FLAG)){
-				AlarmConfProfile.adslAtucInitFailureTrapEnable=pts.adslLineAlarmConfProfileEntry_pt->adslAtucInitFailureTrapEnable;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileEntry_pt->flags)), ATUR_THRESH_15MIN_LOFS_FLAG)){
-				AlarmConfProfile.adslAturThresh15MinLofs=pts.adslLineAlarmConfProfileEntry_pt->adslAturThresh15MinLofs;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileEntry_pt->flags)), ATUR_THRESH_15MIN_LOSS_FLAG)){
-				AlarmConfProfile.adslAturThresh15MinLoss=pts.adslLineAlarmConfProfileEntry_pt->adslAturThresh15MinLoss;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileEntry_pt->flags)), ATUR_THRESH_15MIN_LPRS_FLAG)){
-				AlarmConfProfile.adslAturThresh15MinLprs=pts.adslLineAlarmConfProfileEntry_pt->adslAturThresh15MinLprs;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileEntry_pt->flags)), ATUR_THRESH_15MIN_ESS_FLAG)){
-				AlarmConfProfile.adslAturThresh15MinESs=pts.adslLineAlarmConfProfileEntry_pt->adslAturThresh15MinESs;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileEntry_pt->flags)), ATUR_THRESH_FAST_RATEUP_FLAG)){
-				AlarmConfProfile.adslAturThreshFastRateUp=pts.adslLineAlarmConfProfileEntry_pt->adslAturThreshFastRateUp;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileEntry_pt->flags)), ATUR_THRESH_INTERLEAVE_RATEUP_FLAG)){
-				AlarmConfProfile.adslAturThreshInterleaveRateUp=pts.adslLineAlarmConfProfileEntry_pt->adslAturThreshInterleaveRateUp;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileEntry_pt->flags)), ATUR_THRESH_FAST_RATEDOWN_FLAG)){
-				AlarmConfProfile.adslAturThreshFastRateDown=pts.adslLineAlarmConfProfileEntry_pt->adslAturThreshFastRateDown;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileEntry_pt->flags)), ATUR_THRESH_INTERLEAVE_RATEDOWN_FLAG)){
-				AlarmConfProfile.adslAturThreshInterleaveRateDown=pts.adslLineAlarmConfProfileEntry_pt->adslAturThreshInterleaveRateDown;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileEntry_pt->flags)), LINE_ALARM_CONF_PROFILE_ROWSTATUS_FLAG)){
-				AlarmConfProfile.adslLineAlarmConfProfileRowStatus=pts.adslLineAlarmConfProfileEntry_pt->adslLineAlarmConfProfileRowStatus;
-			}
-			copy_to_user((char *)lon, (char *)pts.adslLineAlarmConfProfileEntry_pt, sizeof(adslLineAlarmConfProfileEntry));
-			kfree(pts.adslLineAlarmConfProfileEntry_pt);
-			break;
-			
-#ifdef AMAZON_MEI_MIB_RFC3440
-		case SET_ADSL_ALRM_CONF_PROF_EXT:
-			pts.adslLineAlarmConfProfileExtEntry_pt = (adslLineAlarmConfProfileExtEntry *)kmalloc(sizeof(adslLineAlarmConfProfileExtEntry), GFP_KERNEL);
-			copy_from_user((char *)pts.adslLineAlarmConfProfileExtEntry_pt, (char *)lon, sizeof(adslLineAlarmConfProfileExtEntry));
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileExtEntry_pt->flags)), ATUC_THRESH_15MIN_FAILED_FASTR_FLAG)){
-				AlarmConfProfileExt.adslAtucThreshold15MinFailedFastR=pts.adslLineAlarmConfProfileExtEntry_pt->adslAtucThreshold15MinFailedFastR;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileExtEntry_pt->flags)), ATUC_THRESH_15MIN_SESL_FLAG)){
-				AlarmConfProfileExt.adslAtucThreshold15MinSesL=pts.adslLineAlarmConfProfileExtEntry_pt->adslAtucThreshold15MinSesL;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileExtEntry_pt->flags)), ATUC_THRESH_15MIN_UASL_FLAG)){
-				AlarmConfProfileExt.adslAtucThreshold15MinUasL=pts.adslLineAlarmConfProfileExtEntry_pt->adslAtucThreshold15MinUasL;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileExtEntry_pt->flags)), ATUR_THRESH_15MIN_SESL_FLAG)){
-				AlarmConfProfileExt.adslAturThreshold15MinSesL=pts.adslLineAlarmConfProfileExtEntry_pt->adslAturThreshold15MinSesL;
-			}
-			if(IS_FLAG_SET((&(pts.adslLineAlarmConfProfileExtEntry_pt->flags)), ATUR_THRESH_15MIN_UASL_FLAG)){
-				AlarmConfProfileExt.adslAturThreshold15MinUasL=pts.adslLineAlarmConfProfileExtEntry_pt->adslAturThreshold15MinUasL;
-			}
-			copy_to_user((char *)lon, (char *)pts.adslLineAlarmConfProfileExtEntry_pt, sizeof(adslLineAlarmConfProfileExtEntry));
-			kfree(pts.adslLineAlarmConfProfileExtEntry_pt);
-			break;
-#endif
-
-		case ADSL_ATUR_TRAPS:
-			if(down_interruptible(&mei_sema))
-                		return -ERESTARTSYS;
-			
-			trapsflag=0;
-			if(AlarmConfProfile.adslAtucThresh15MinLofs!=0 && current_intvl->AtucPerfLof>=AlarmConfProfile.adslAtucThresh15MinLofs)
-				trapsflag|=ATUC_PERF_LOFS_THRESH_FLAG;
-			if(AlarmConfProfile.adslAtucThresh15MinLoss!=0 && current_intvl->AtucPerfLos>=AlarmConfProfile.adslAtucThresh15MinLoss)
-				trapsflag|=ATUC_PERF_LOSS_THRESH_FLAG;
-			if(AlarmConfProfile.adslAtucThresh15MinESs!=0 && current_intvl->AtucPerfEs>=AlarmConfProfile.adslAtucThresh15MinESs)
-				trapsflag|=ATUC_PERF_ESS_THRESH_FLAG;
-			if(chantype.fast==1){
-				if(AlarmConfProfile.adslAtucThreshFastRateUp!=0 || AlarmConfProfile.adslAtucThreshFastRateDown!=0){
-					ATUC_CHAN_CURR_TX_RATE_FLAG_MAKECMV;
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group 6 Address 1 Index 0");
-#endif			
-					}
-					else{
-						temp = (u32)(RxMessage[4]) + (((u32)(RxMessage[5]))<<16); 
-						if((AlarmConfProfile.adslAtucThreshFastRateUp!=0) && (temp>=PrevTxRate.adslAtucChanPrevTxRate+AlarmConfProfile.adslAtucThreshFastRateUp)){
-							trapsflag|=ATUC_RATE_CHANGE_FLAG;
-							PrevTxRate.adslAtucChanPrevTxRate = temp;						
-						}
-						if((AlarmConfProfile.adslAtucThreshFastRateDown!=0) && (temp<=PrevTxRate.adslAtucChanPrevTxRate-AlarmConfProfile.adslAtucThreshFastRateDown)){
-							trapsflag|=ATUC_RATE_CHANGE_FLAG;
-							PrevTxRate.adslAtucChanPrevTxRate = temp;						
-						}
-					}
-				}
-			}	
-			if(chantype.interleave==1){
-				if(AlarmConfProfile.adslAtucThreshInterleaveRateUp!=0 || AlarmConfProfile.adslAtucThreshInterleaveRateDown!=0){
-					ATUC_CHAN_CURR_TX_RATE_FLAG_MAKECMV;
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group 6 Address 1 Index 0");
-#endif			
-					}
-					else{
-						temp = (u32)(RxMessage[4]) + (((u32)(RxMessage[5]))<<16); 
-						if((AlarmConfProfile.adslAtucThreshInterleaveRateUp!=0) && (temp>=PrevTxRate.adslAtucChanPrevTxRate+AlarmConfProfile.adslAtucThreshInterleaveRateUp)){
-							trapsflag|=ATUC_RATE_CHANGE_FLAG;
-							PrevTxRate.adslAtucChanPrevTxRate = temp;						
-						}
-						if((AlarmConfProfile.adslAtucThreshInterleaveRateDown!=0) && (temp<=PrevTxRate.adslAtucChanPrevTxRate-AlarmConfProfile.adslAtucThreshInterleaveRateDown)){
-							trapsflag|=ATUC_RATE_CHANGE_FLAG;
-							PrevTxRate.adslAtucChanPrevTxRate = temp;						
-						}
-					}
-				}
-			}	
-			if(AlarmConfProfile.adslAturThresh15MinLofs!=0 && current_intvl->AturPerfLof>=AlarmConfProfile.adslAturThresh15MinLofs)
-				trapsflag|=ATUR_PERF_LOFS_THRESH_FLAG;
-			if(AlarmConfProfile.adslAturThresh15MinLoss!=0 && current_intvl->AturPerfLos>=AlarmConfProfile.adslAturThresh15MinLoss)
-				trapsflag|=ATUR_PERF_LOSS_THRESH_FLAG;
-			if(AlarmConfProfile.adslAturThresh15MinLprs!=0 && current_intvl->AturPerfLpr>=AlarmConfProfile.adslAturThresh15MinLprs)
-				trapsflag|=ATUR_PERF_LPRS_THRESH_FLAG;
-			if(AlarmConfProfile.adslAturThresh15MinESs!=0 && current_intvl->AturPerfEs>=AlarmConfProfile.adslAturThresh15MinESs)
-				trapsflag|=ATUR_PERF_ESS_THRESH_FLAG;	
-			if(chantype.fast==1){
-				if(AlarmConfProfile.adslAturThreshFastRateUp!=0 || AlarmConfProfile.adslAturThreshFastRateDown!=0){
-					ATUR_CHAN_CURR_TX_RATE_FLAG_MAKECMV;
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group 6 Address 0 Index 0");
-#endif			
-					}
-					else{
-						temp = (u32)(RxMessage[4]) + (((u32)(RxMessage[5]))<<16); 
-						if((AlarmConfProfile.adslAturThreshFastRateUp!=0) && (temp>=PrevTxRate.adslAturChanPrevTxRate+AlarmConfProfile.adslAturThreshFastRateUp)){
-							trapsflag|=ATUR_RATE_CHANGE_FLAG;
-							PrevTxRate.adslAturChanPrevTxRate = temp;						
-						}
-						if((AlarmConfProfile.adslAturThreshFastRateDown!=0) && (temp<=PrevTxRate.adslAturChanPrevTxRate-AlarmConfProfile.adslAturThreshFastRateDown)){
-							trapsflag|=ATUR_RATE_CHANGE_FLAG;
-							PrevTxRate.adslAturChanPrevTxRate = temp;						
-						}
-					}
-				}
-			}	
-			if(chantype.interleave==1){
-				if(AlarmConfProfile.adslAturThreshInterleaveRateUp!=0 || AlarmConfProfile.adslAturThreshInterleaveRateDown!=0){
-					ATUR_CHAN_CURR_TX_RATE_FLAG_MAKECMV;
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group 6 Address 0 Index 0");
-#endif			
-					}
-					else{
-						temp = (u32)(RxMessage[4]) + (((u32)(RxMessage[5]))<<16);
-						if((AlarmConfProfile.adslAturThreshInterleaveRateUp!=0) && (temp>=PrevTxRate.adslAturChanPrevTxRate+AlarmConfProfile.adslAturThreshInterleaveRateUp)){
-							trapsflag|=ATUR_RATE_CHANGE_FLAG;
-							PrevTxRate.adslAturChanPrevTxRate = temp;						
-						}
-						if((AlarmConfProfile.adslAturThreshInterleaveRateDown!=0) && (temp<=PrevTxRate.adslAturChanPrevTxRate-AlarmConfProfile.adslAturThreshInterleaveRateDown)){
-							trapsflag|=ATUR_RATE_CHANGE_FLAG;
-							PrevTxRate.adslAturChanPrevTxRate = temp;						
-						}
-					}
-				}
-			}	
-			copy_to_user((char *)lon, (char *)(&trapsflag), 2);
-			
-			up(&mei_sema);	
-			break;
-			
-#ifdef AMAZON_MEI_MIB_RFC3440
-		case ADSL_ATUR_EXT_TRAPS:
-			trapsflag=0;
-			if(AlarmConfProfileExt.adslAtucThreshold15MinFailedFastR!=0 && current_intvl->AtucPerfStatFailedFastR>=AlarmConfProfileExt.adslAtucThreshold15MinFailedFastR)
-				trapsflag|=ATUC_15MIN_FAILED_FASTR_TRAP_FLAG;
-			if(AlarmConfProfileExt.adslAtucThreshold15MinSesL!=0 && current_intvl->AtucPerfStatSesL>=AlarmConfProfileExt.adslAtucThreshold15MinSesL)
-				trapsflag|=ATUC_15MIN_SESL_TRAP_FLAG;
-			if(AlarmConfProfileExt.adslAtucThreshold15MinUasL!=0 && current_intvl->AtucPerfStatUasL>=AlarmConfProfileExt.adslAtucThreshold15MinUasL)
-				trapsflag|=ATUC_15MIN_UASL_TRAP_FLAG;
-			if(AlarmConfProfileExt.adslAturThreshold15MinSesL!=0 && current_intvl->AturPerfStatSesL>=AlarmConfProfileExt.adslAturThreshold15MinSesL)
-				trapsflag|=ATUR_15MIN_SESL_TRAP_FLAG;
-			if(AlarmConfProfileExt.adslAturThreshold15MinUasL!=0 && current_intvl->AturPerfStatUasL>=AlarmConfProfileExt.adslAturThreshold15MinUasL)
-				trapsflag|=ATUR_15MIN_UASL_TRAP_FLAG;
-			copy_to_user((char *)lon, (char *)(&trapsflag), 2);
-			break;
-#endif
-
-// 603221:tc.chen start
-		case GET_ADSL_LINE_STATUS:
-			if(down_interruptible(&mei_sema))
-                		return -ERESTARTSYS;
-			
-			pts.adslLineStatusInfo_pt = (adslLineStatusInfo *)kmalloc(sizeof(adslLineStatusInfo), GFP_KERNEL);
-			copy_from_user((char *)pts.adslLineStatusInfo_pt, (char *)lon, sizeof(adslLineStatusInfo));
-			
-			if(IS_FLAG_SET((&(pts.adslLineStatusInfo_pt->flags)), LINE_STAT_MODEM_STATUS_FLAG)){
-				LINE_STAT_MODEM_STATUS_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group STAT Address 0 Index 0");
-#endif
-					pts.adslLineStatusInfo_pt->adslModemStatus = 0;	
-				}
-				else{
-					pts.adslLineStatusInfo_pt->adslModemStatus = RxMessage[4];
-				}
-			}
-			
-			if(IS_FLAG_SET((&(pts.adslLineStatusInfo_pt->flags)), LINE_STAT_MODE_SEL_FLAG)){
-				LINE_STAT_MODE_SEL_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group STAT Address 1 Index 0");
-#endif
-					pts.adslLineStatusInfo_pt->adslModeSelected = 0;	
-				}
-				else{
-					pts.adslLineStatusInfo_pt->adslModeSelected = RxMessage[4];
-				}
-			}
-			
-			if(IS_FLAG_SET((&(pts.adslLineStatusInfo_pt->flags)), LINE_STAT_TRELLCOD_ENABLE_FLAG)){
-				LINE_STAT_TRELLCOD_ENABLE_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group OPTN Address 2 Index 0");
-#endif
-					pts.adslLineStatusInfo_pt->adslTrellisCodeEnable = 0;	
-				}
-				else{
-					
-					pts.adslLineStatusInfo_pt->adslTrellisCodeEnable = (RxMessage[4]>>13)&0x1==0x1?0:1;
-				}
-			}
-			
-			if(IS_FLAG_SET((&(pts.adslLineStatusInfo_pt->flags)), LINE_STAT_LATENCY_FLAG)){
-				LINE_STAT_LATENCY_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group STAT Address 12 Index 0");
-#endif
-					pts.adslLineStatusInfo_pt->adslLatency = 0;	
-				}
-				else{
-					pts.adslLineStatusInfo_pt->adslLatency = RxMessage[4];
-				}
-			}
-			
-			copy_to_user((char *)lon, (char *)pts.adslLineStatusInfo_pt, sizeof(adslLineStatusInfo));
-			kfree(pts.adslLineStatusInfo_pt);
-			
-			up(&mei_sema);
-			break;
-
-
-		case GET_ADSL_LINE_RATE:
-			if (showtime!=1)
-				return -ERESTARTSYS;
-			if(down_interruptible(&mei_sema))
-                		return -ERESTARTSYS;
-			
-			pts.adslLineRateInfo_pt = (adslLineRateInfo *)kmalloc(sizeof(adslLineRateInfo), GFP_KERNEL);
-			copy_from_user((char *)pts.adslLineRateInfo_pt, (char *)lon, sizeof(adslLineRateInfo));
-			
-			if(IS_FLAG_SET((&(pts.adslLineRateInfo_pt->flags)), LINE_RATE_DATA_RATEDS_FLAG)){
-				if (adsl_mode <=8 && adsl_mode_extend==0) // adsl mode
-				{
-					if (chantype.interleave)
-						LINE_RATE_DATA_RATEDS_FLAG_ADSL1_LP0_MAKECMV;
-					else
-						LINE_RATE_DATA_RATEDS_FLAG_ADSL1_LP1_MAKECMV;
-						
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group RATE Address 1 Index 0");
-#endif
-						pts.adslLineRateInfo_pt->adslDataRateds = 0;	
-					}
-					else{
-						pts.adslLineRateInfo_pt->adslDataRateds = (u32)(RxMessage[4]) + (((u32)(RxMessage[5]))<<16);
-					}		
-				}else  // adsl 2/2+
-				{
-					unsigned long Mp,Lp,Tp,Rp,Kp,Bpn,DataRate,DataRate_remain;
-					Mp=Lp=Tp=Rp=Kp=Bpn=DataRate=DataRate_remain=0;
-					//// up stream data rate
-					  
-					    if (chantype.interleave)
-					    {
-					    	    LINE_RATE_DATA_RATEUS_FLAG_ADSL2_LP_LP0_MAKECMV;
-					    	    if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-							printk("\n\nCMV fail, Group CNFG Address 25 Index 0");
-#endif
-							Lp = 0;	
-						    }else
-				                    	Lp=RxMessage[4];
-				   
-				                    LINE_RATE_DATA_RATEUS_FLAG_ADSL2_RP_LP0_MAKECMV;
-					    	    if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-							printk("\n\nCMV fail, Group CNFG Address 23 Index 0");
-#endif
-							Rp = 0;	
-						    }else
-				                    	Rp=RxMessage[4];
-				
-				                    LINE_RATE_DATA_RATEUS_FLAG_ADSL2_MP_LP0_MAKECMV;
-					    	    if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-							printk("\n\nCMV fail, Group CNFG Address 24 Index 0");
-#endif
-							Mp = 0;	
-						    }else
-				                    	Mp=RxMessage[4];
-				
-				                    LINE_RATE_DATA_RATEUS_FLAG_ADSL2_TP_LP0_MAKECMV;
-					    	    if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-							printk("\n\nCMV fail, Group CNFG Address 26 Index 0");
-#endif
-							Tp = 0;	
-						    }else
-				                    	Tp=RxMessage[4];
-				
-				                    LINE_RATE_DATA_RATEUS_FLAG_ADSL2_KP_LP0_MAKECMV;
-					    	    if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-							printk("\n\nCMV fail, Group CNFG Address 28 Index 0");
-#endif
-							Kp = 0;	
-						    }else
-						    {
-				                    	Kp=RxMessage[4]+ RxMessage[5]+1;
-				                    	Bpn=RxMessage[4]+ RxMessage[5];
-				                    }
-			                    }else
-			                    {
-			                    	    LINE_RATE_DATA_RATEUS_FLAG_ADSL2_LP_LP1_MAKECMV;
-					    	    if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-							printk("\n\nCMV fail, Group CNFG Address 25 Index 1");
-#endif
-							Lp = 0;	
-						    }else
-				                    	Lp=RxMessage[4];
-				   
-				                    LINE_RATE_DATA_RATEUS_FLAG_ADSL2_RP_LP1_MAKECMV;
-					    	    if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-							printk("\n\nCMV fail, Group CNFG Address 23 Index 1");
-#endif
-							Rp = 0;	
-						    }else
-				                    	Rp=RxMessage[4];
-				
-				                    LINE_RATE_DATA_RATEUS_FLAG_ADSL2_MP_LP1_MAKECMV;
-					    	    if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-							printk("\n\nCMV fail, Group CNFG Address 24 Index 1");
-#endif
-							Mp = 0;	
-						    }else
-				                    	Mp=RxMessage[4];
-				
-				                    LINE_RATE_DATA_RATEUS_FLAG_ADSL2_TP_LP1_MAKECMV;
-					    	    if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-							printk("\n\nCMV fail, Group CNFG Address 26 Index 1");
-#endif
-							Tp = 0;	
-						    }else
-				                    	Tp=RxMessage[4];
-				
-				                    LINE_RATE_DATA_RATEUS_FLAG_ADSL2_KP_LP1_MAKECMV;
-					    	    if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-							printk("\n\nCMV fail, Group CNFG Address 28 Index 2");
-#endif
-							Kp = 0;	
-						    }else
-						    {
-				                    	Kp=RxMessage[4]+ RxMessage[5]+1;
-				                    	Bpn=RxMessage[4]+ RxMessage[5];
-				                    }
-			                    }
-  					    DataRate=((Tp*(Bpn+1)-1)*Mp*Lp*4)/(Tp*(Kp*Mp+Rp));
-			                    //DataRate_remain=((((Tp*(Bpn+1)-1)*Mp*Lp*4)%(Tp*(Kp*Mp+Rp)))*1000)/(Tp*(Kp*Mp+Rp));
-			                    //pts.adslLineRateInfo_pt->adslDataRateds = DataRate * 1000 + DataRate_remain;
-			                    pts.adslLineRateInfo_pt->adslDataRateds = DataRate;
-				}		
-			}
-			
-			if(IS_FLAG_SET((&(pts.adslLineRateInfo_pt->flags)), LINE_RATE_DATA_RATEUS_FLAG)){
-				if (adsl_mode <=8 && adsl_mode_extend==0) // adsl mode
-				{
-					if (chantype.interleave)
-						LINE_RATE_DATA_RATEUS_FLAG_ADSL1_LP0_MAKECMV;
-					else
-						LINE_RATE_DATA_RATEUS_FLAG_ADSL1_LP1_MAKECMV;
-						
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-	#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group RATE Address 0 Index 0");
-	#endif
-						pts.adslLineRateInfo_pt->adslDataRateus = 0;	
-					}
-					else{
-						pts.adslLineRateInfo_pt->adslDataRateus = (u32)(RxMessage[4]) + (((u32)(RxMessage[5]))<<16);
-					}		
-				}else  // adsl 2/2+
-				{
-					unsigned long Mp,Lp,Tp,Rp,Kp,Bpn,DataRate,DataRate_remain;
-					Mp=Lp=Tp=Rp=Kp=Bpn=DataRate=DataRate_remain=0;
-					//// down stream data rate
-					   
-			 		    if (chantype.interleave)
-					    {
-					    	    LINE_RATE_DATA_RATEDS_FLAG_ADSL2_LP_LP0_MAKECMV;
-					    	    if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-							printk("\n\nCMV fail, Group CNFG Address 14 Index 0");
-#endif
-							Lp = 0;	
-						    }else
-				                    	Lp=RxMessage[4];
-				   
-				                    LINE_RATE_DATA_RATEDS_FLAG_ADSL2_RP_LP0_MAKECMV;
-					    	    if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-							printk("\n\nCMV fail, Group CNFG Address 12 Index 0");
-#endif
-							Rp = 0;	
-						    }else
-				                    	Rp=RxMessage[4];
-				
-				                    LINE_RATE_DATA_RATEDS_FLAG_ADSL2_MP_LP0_MAKECMV;
-					    	    if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-							printk("\n\nCMV fail, Group CNFG Address 13 Index 0");
-#endif
-							Mp = 0;	
-						    }else
-				                    	Mp=RxMessage[4];
-				
-				                    LINE_RATE_DATA_RATEDS_FLAG_ADSL2_TP_LP0_MAKECMV;
-					    	    if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-							printk("\n\nCMV fail, Group CNFG Address 15 Index 0");
-#endif
-							Tp = 0;	
-						    }else
-				                    	Tp=RxMessage[4];
-				
-				                    LINE_RATE_DATA_RATEDS_FLAG_ADSL2_KP_LP0_MAKECMV;
-					    	    if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-							printk("\n\nCMV fail, Group CNFG Address 17 Index 0");
-#endif
-							Kp = 0;	
-						    }else
-						    {
-				                    	Kp=RxMessage[4]+ RxMessage[5]+1;
-				                    	Bpn=RxMessage[4]+ RxMessage[5];
-				                    }
-			                    }else
-			                    {
-			                    	    LINE_RATE_DATA_RATEDS_FLAG_ADSL2_LP_LP1_MAKECMV;
-					    	    if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-							printk("\n\nCMV fail, Group CNFG Address 14 Index 1");
-#endif
-							Lp = 0;	
-						    }else
-				                    	Lp=RxMessage[4];
-				   
-				                    LINE_RATE_DATA_RATEDS_FLAG_ADSL2_RP_LP1_MAKECMV;
-					    	    if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-							printk("\n\nCMV fail, Group CNFG Address 12 Index 1");
-#endif
-							Rp = 0;	
-						    }else
-				                    	Rp=RxMessage[4];
-				
-				                    LINE_RATE_DATA_RATEDS_FLAG_ADSL2_MP_LP1_MAKECMV;
-					    	    if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-							printk("\n\nCMV fail, Group CNFG Address 13 Index 1");
-#endif
-							Mp = 0;	
-						    }else
-				                    	Mp=RxMessage[4];
-				
-				                    LINE_RATE_DATA_RATEDS_FLAG_ADSL2_TP_LP1_MAKECMV;
-					    	    if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-							printk("\n\nCMV fail, Group CNFG Address 15 Index 1");
-#endif
-							Tp = 0;	
-						    }else
-				                    	Tp=RxMessage[4];
-				
-				                    LINE_RATE_DATA_RATEDS_FLAG_ADSL2_KP_LP1_MAKECMV;
-					    	    if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-							printk("\n\nCMV fail, Group CNFG Address 17 Index 2");
-#endif
-							Kp = 0;	
-						    }else
-						    {
-				                    	Kp=RxMessage[4]+ RxMessage[5]+1;
-				                    	Bpn=RxMessage[4]+ RxMessage[5];
-				                    }
-			                    }
-			                    DataRate=((Tp*(Bpn+1)-1)*Mp*Lp*4)/(Tp*(Kp*Mp+Rp));
-			                    //DataRate_remain=((((Tp*(Bpn+1)-1)*Mp*Lp*4)%(Tp*(Kp*Mp+Rp)))*1000)/(Tp*(Kp*Mp+Rp));
-			                    //pts.adslLineRateInfo_pt->adslDataRateus = DataRate * 1000 + DataRate_remain;
-			                    pts.adslLineRateInfo_pt->adslDataRateus = DataRate;
-				}		
-			}
-			
-			if(IS_FLAG_SET((&(pts.adslLineRateInfo_pt->flags)), LINE_RATE_ATTNDRDS_FLAG)){
-				LINE_RATE_ATTNDRDS_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group INFO Address 68 Index 4");
-#endif
-					pts.adslLineRateInfo_pt->adslATTNDRds = 0;	
-				}
-				else{
-					pts.adslLineRateInfo_pt->adslATTNDRds = (u32)(RxMessage[4]) + (((u32)(RxMessage[5]))<<16);
-				}
-			}
-			
-			if(IS_FLAG_SET((&(pts.adslLineRateInfo_pt->flags)), LINE_RATE_ATTNDRUS_FLAG)){
-				if (adsl_mode <=8 && adsl_mode_extend==0) // adsl mode
-				{
-					LINE_RATE_ATTNDRUS_FLAG_MAKECMV;
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-	#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group INFO Address 69 Index 4");
-	#endif
-						pts.adslLineRateInfo_pt->adslATTNDRus = 0;	
-					}
-					else{
-						pts.adslLineRateInfo_pt->adslATTNDRus = (u32)(RxMessage[4]) + (((u32)(RxMessage[5]))<<16);
-					}
-				}else
-				{
-					hdlc_cmd[0]=0x0181;
-					hdlc_cmd[1]=0x24;
-					up(&mei_sema);
-					if (ifx_me_hdlc_send((unsigned char *)&hdlc_cmd[0],4)!= -EBUSY)
-					{
-						set_current_state(TASK_INTERRUPTIBLE);
-						schedule_timeout(1);		
-						hdlc_rx_len=0;			
-						hdlc_rx_len = ifx_mei_hdlc_read(&hdlc_rx_buffer,32*2);
-						if (hdlc_rx_len <=0)
-						{
-	                				meierr = -ERESTARTSYS;
-	                				goto GET_ADSL_LINE_RATE_END;
-	                			}
-						pts.adslLineRateInfo_pt->adslATTNDRus = (u32)le16_to_cpu(hdlc_rx_buffer[1])<<16 | (u32)le16_to_cpu(hdlc_rx_buffer[2]);
-					}
-					if(down_interruptible(&mei_sema))
-					{
-                				meierr = -ERESTARTSYS;
-                				goto GET_ADSL_LINE_RATE_END;
-                			}
-				}
-			}	
-			copy_to_user((char *)lon, (char *)pts.adslLineRateInfo_pt, sizeof(adslLineRateInfo));
-			up(&mei_sema);
-			
-GET_ADSL_LINE_RATE_END:						
-			kfree(pts.adslLineRateInfo_pt);
-			break;
-
-		case GET_ADSL_LINE_INFO:
-			if (showtime!=1)
-				return -ERESTARTSYS;
-			if(down_interruptible(&mei_sema))
-                		return -ERESTARTSYS;
-			
-			pts.adslLineInfo_pt = (adslLineInfo *)kmalloc(sizeof(adslLineInfo), GFP_KERNEL);
-			copy_from_user((char *)pts.adslLineInfo_pt, (char *)lon, sizeof(adslLineInfo));
-			
-			if(IS_FLAG_SET((&(pts.adslLineInfo_pt->flags)), LINE_INFO_INTLV_DEPTHDS_FLAG)){
-				if (chantype.interleave)
-					LINE_INFO_INTLV_DEPTHDS_FLAG_LP0_MAKECMV;
-				else
-					LINE_INFO_INTLV_DEPTHDS_FLAG_LP1_MAKECMV;
-					
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group CNFG Address 27 Index 0");
-#endif
-					pts.adslLineInfo_pt->adslInterleaveDepthds = 0;	
-				}
-				else{
-					pts.adslLineInfo_pt->adslInterleaveDepthds = RxMessage[4];
-				}				
-			}
-			
-			if(IS_FLAG_SET((&(pts.adslLineInfo_pt->flags)), LINE_INFO_INTLV_DEPTHUS_FLAG)){
-				if (chantype.interleave)
-					LINE_INFO_INTLV_DEPTHUS_FLAG_LP0_MAKECMV;
-				else
-					LINE_INFO_INTLV_DEPTHUS_FLAG_LP1_MAKECMV;
-					
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group CNFG Address 16 Index 0");
-#endif
-					pts.adslLineInfo_pt->adslInterleaveDepthus = 0;	
-				}
-				else{
-					pts.adslLineInfo_pt->adslInterleaveDepthus = RxMessage[4];
-				}				
-			}
-			
-			if(IS_FLAG_SET((&(pts.adslLineInfo_pt->flags)), LINE_INFO_LATNDS_FLAG)){
-				LINE_INFO_LATNDS_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group INFO Address 68 Index 1");
-#endif
-					pts.adslLineInfo_pt->adslLATNds = 0;	
-				}
-				else{
-					pts.adslLineInfo_pt->adslLATNds = RxMessage[4];
-				}
-			}
-			
-			if(IS_FLAG_SET((&(pts.adslLineInfo_pt->flags)), LINE_INFO_LATNUS_FLAG)){
-				if (adsl_mode <=8 && adsl_mode_extend==0) // adsl mode
-				{
-					LINE_INFO_LATNUS_FLAG_MAKECMV;
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group INFO Address 69 Index 1");
-#endif
-						pts.adslLineInfo_pt->adslLATNus = 0;	
-					}
-					else{
-						pts.adslLineInfo_pt->adslLATNus = RxMessage[4];
-					}
-				}else
-				{
-					hdlc_cmd[0]=0x0181;
-					hdlc_cmd[1]=0x21;
-					up(&mei_sema);
-					if (ifx_me_hdlc_send((unsigned char *)&hdlc_cmd[0],4)!= -EBUSY)
-					{
-						set_current_state(TASK_INTERRUPTIBLE);
-						schedule_timeout(1);		
-						hdlc_rx_len=0;			
-						hdlc_rx_len = ifx_mei_hdlc_read(&hdlc_rx_buffer,32*2);
-						if (hdlc_rx_len <=0)
-						{
-	                				meierr = -ERESTARTSYS;
-	                				goto GET_ADSL_LINE_INFO_END;
-	                			}
-						pts.adslLineInfo_pt->adslLATNus = le16_to_cpu(hdlc_rx_buffer[1]);
-					}
-					if(down_interruptible(&mei_sema))
-					{
-                				meierr = -ERESTARTSYS;
-                				goto GET_ADSL_LINE_INFO_END;
-                			}
-				}
-			}
-			
-			if(IS_FLAG_SET((&(pts.adslLineInfo_pt->flags)), LINE_INFO_SATNDS_FLAG)){
-				LINE_INFO_SATNDS_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group INFO Address 68 Index 2");
-#endif
-					pts.adslLineInfo_pt->adslSATNds = 0;	
-				}
-				else{
-					pts.adslLineInfo_pt->adslSATNds = RxMessage[4];
-				}
-			}
-			
-			if(IS_FLAG_SET((&(pts.adslLineInfo_pt->flags)), LINE_INFO_SATNUS_FLAG)){
-				if (adsl_mode <=8 && adsl_mode_extend==0) // adsl mode
-				{
-					LINE_INFO_SATNUS_FLAG_MAKECMV;
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group INFO Address 69 Index 2");
-#endif
-						pts.adslLineInfo_pt->adslSATNus = 0;	
-					}
-					else{
-						pts.adslLineInfo_pt->adslSATNus = RxMessage[4];
-					}
-				}else
-				{
-					hdlc_cmd[0]=0x0181;
-					hdlc_cmd[1]=0x22;
-					up(&mei_sema);
-					if (ifx_me_hdlc_send((unsigned char *)&hdlc_cmd[0],4)!= -EBUSY)
-					{
-						set_current_state(TASK_INTERRUPTIBLE);
-						schedule_timeout(1);		
-						hdlc_rx_len=0;			
-						hdlc_rx_len = ifx_mei_hdlc_read(&hdlc_rx_buffer,32*2);
-						if (hdlc_rx_len <=0)
-						{
-	                				meierr = -ERESTARTSYS;
-	                				goto GET_ADSL_LINE_INFO_END;
-	                			}
-						pts.adslLineInfo_pt->adslSATNus = le16_to_cpu(hdlc_rx_buffer[1]);
-					}
-					if(down_interruptible(&mei_sema))
-                			{
-                				meierr = -ERESTARTSYS;
-                				goto GET_ADSL_LINE_INFO_END;
-                			}
-				}
-			}
-			
-			if(IS_FLAG_SET((&(pts.adslLineInfo_pt->flags)), LINE_INFO_SNRMNDS_FLAG)){
-				if (adsl_mode <=8 && adsl_mode_extend==0) // adsl mode
-				{
-					LINE_INFO_SNRMNDS_FLAG_ADSL1_MAKECMV;
-				}
-				else if ((adsl_mode == 0x4000) || (adsl_mode == 0x8000) || adsl_mode_extend > 0)
-				{
-					LINE_INFO_SNRMNDS_FLAG_ADSL2PLUS_MAKECMV;
-				}
-				else
-				{
-					LINE_INFO_SNRMNDS_FLAG_ADSL2_MAKECMV;
-				}
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group INFO Address 68 Index 3");
-#endif
-					pts.adslLineInfo_pt->adslSNRMds = 0;	
-				}
-				else{
-					if (adsl_mode>8 || adsl_mode_extend>0)
-					{
-						int SNRMds,SNRMds_remain;
-						SNRMds=RxMessage[4]; 	
-						SNRMds_remain=((SNRMds&0xff)*1000)/256;
-						SNRMds=(SNRMds>>8)&0xff;
-						if ((SNRMds_remain%100)>=50) SNRMds_remain=(SNRMds_remain/100)+1;
-						else  SNRMds_remain=(SNRMds_remain/100);
-						pts.adslLineInfo_pt->adslSNRMds = SNRMds*10 + SNRMds_remain;
-					}else
-					{
-						pts.adslLineInfo_pt->adslSNRMds = RxMessage[4];
-					}
-				}
-			}
-			
-			if(IS_FLAG_SET((&(pts.adslLineInfo_pt->flags)), LINE_INFO_SNRMNUS_FLAG)){
-				if (adsl_mode <=8 && adsl_mode_extend == 0)
-				{
-					LINE_INFO_SNRMNUS_FLAG_MAKECMV;
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group INFO Address 69 Index 3");
-#endif
-						pts.adslLineInfo_pt->adslSNRMus = 0;	
-					}
-					else{
-						pts.adslLineInfo_pt->adslSNRMus = RxMessage[4];
-					}
-				}else
-				{
-					hdlc_cmd[0]=0x0181;
-					hdlc_cmd[1]=0x23;
-					up(&mei_sema);
-					if (ifx_me_hdlc_send((unsigned char *)&hdlc_cmd[0],4)!= -EBUSY)
-					{
-						set_current_state(TASK_INTERRUPTIBLE);
-						schedule_timeout(1);		
-						hdlc_rx_len=0;			
-						hdlc_rx_len = ifx_mei_hdlc_read(&hdlc_rx_buffer,32*2);
-						if (hdlc_rx_len <=0)
-						{
-	                				meierr = -ERESTARTSYS;
-	                				goto GET_ADSL_LINE_INFO_END;
-	                			}
-						pts.adslLineInfo_pt->adslSNRMus = le16_to_cpu(hdlc_rx_buffer[1]);
-					}
-					if(down_interruptible(&mei_sema))
-                			{
-                				meierr = -ERESTARTSYS;
-                				goto GET_ADSL_LINE_INFO_END;
-                			}
-				}
-			}
-			
-			if(IS_FLAG_SET((&(pts.adslLineInfo_pt->flags)), LINE_INFO_ACATPDS_FLAG)){
-				if (adsl_mode <=8 && adsl_mode_extend == 0)
-				{
-					LINE_INFO_ACATPDS_FLAG_MAKECMV;
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-	#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group INFO Address 68 Index 6");
-	#endif
-						pts.adslLineInfo_pt->adslACATPds = 0;	
-					}
-					else{
-						pts.adslLineInfo_pt->adslACATPds = RxMessage[4];
-					}
-				}else
-				{
-					hdlc_cmd[0]=0x0181;
-					hdlc_cmd[1]=0x25;
-					up(&mei_sema);
-					if (ifx_me_hdlc_send((unsigned char *)&hdlc_cmd[0],4)!= -EBUSY)
-					{
-						set_current_state(TASK_INTERRUPTIBLE);
-						schedule_timeout(1);		
-						hdlc_rx_len=0;			
-						hdlc_rx_len = ifx_mei_hdlc_read(&hdlc_rx_buffer,32*2);
-						if (hdlc_rx_len <=0)
-						{
-	                				meierr = -ERESTARTSYS;
-	                				goto GET_ADSL_LINE_INFO_END;
-	                			}
-						pts.adslLineInfo_pt->adslACATPds = le16_to_cpu(hdlc_rx_buffer[1]);
-					}
-					if(down_interruptible(&mei_sema))
-					{
-                				meierr = -ERESTARTSYS;
-                				goto GET_ADSL_LINE_INFO_END;
-                			}
-				}
-			}
-			
-			if(IS_FLAG_SET((&(pts.adslLineInfo_pt->flags)), LINE_INFO_ACATPUS_FLAG)){
-				if (adsl_mode <=8 && adsl_mode_extend == 0)
-				{
-					LINE_INFO_ACATPUS_FLAG_MAKECMV;
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group INFO Address 69 Index 6");
-#endif
-						pts.adslLineInfo_pt->adslACATPus = 0;	
-					}
-					else{
-						pts.adslLineInfo_pt->adslACATPus = RxMessage[4];
-					}
-				}else
-				{
-					hdlc_cmd[0]=0x0181;
-					hdlc_cmd[1]=0x26;
-					up(&mei_sema);
-					if (ifx_me_hdlc_send((unsigned char *)&hdlc_cmd[0],4)!= -EBUSY)
-					{
-						set_current_state(TASK_INTERRUPTIBLE);
-						schedule_timeout(1);		
-						hdlc_rx_len=0;			
-						hdlc_rx_len = ifx_mei_hdlc_read(&hdlc_rx_buffer,32*2);
-						if (hdlc_rx_len <=0)
-						{
-	                				meierr = -ERESTARTSYS;
-	                				goto GET_ADSL_LINE_INFO_END;
-	                			}
-						pts.adslLineInfo_pt->adslACATPus = le16_to_cpu(hdlc_rx_buffer[1]);
-					}
-					if(down_interruptible(&mei_sema))
-					{
-                				meierr = -ERESTARTSYS;
-                				goto GET_ADSL_LINE_INFO_END;
-                			}
-				}
-			}
-			
-			copy_to_user((char *)lon, (char *)pts.adslLineInfo_pt, sizeof(adslLineInfo));
-			up(&mei_sema);
-
-GET_ADSL_LINE_INFO_END:			
-			kfree(pts.adslLineInfo_pt);
-			break;
-
-		case GET_ADSL_NEAREND_STATS:
-			if (showtime!=1)
-				return -ERESTARTSYS;
-			if(down_interruptible(&mei_sema))
-                		return -ERESTARTSYS;
-			
-			pts.adslNearEndPerfStats_pt = (adslNearEndPerfStats *)kmalloc(sizeof(adslNearEndPerfStats), GFP_KERNEL);
-			copy_from_user((char *)pts.adslNearEndPerfStats_pt, (char *)lon, sizeof(adslNearEndPerfStats));
-			
-			if(IS_FLAG_SET((&(pts.adslNearEndPerfStats_pt->flags)), NEAREND_PERF_SUPERFRAME_FLAG)){
-				NEAREND_PERF_SUPERFRAME_FLAG_LSW_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group PLAM Address 20 Index 0");
-#endif
-					pts.adslNearEndPerfStats_pt->adslSuperFrames = 0;	
-				}
-				else{
-					pts.adslNearEndPerfStats_pt->adslSuperFrames = (u32)(RxMessage[4]);
-				}
-				NEAREND_PERF_SUPERFRAME_FLAG_MSW_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group PLAM Address 21 Index 0");
-#endif
-					pts.adslNearEndPerfStats_pt->adslSuperFrames = 0;	
-				}
-				else{
-					pts.adslNearEndPerfStats_pt->adslSuperFrames += (((u32)(RxMessage[4]))<<16);
-				}
-			}
-			
-			if(IS_FLAG_SET((&(pts.adslNearEndPerfStats_pt->flags)), NEAREND_PERF_LOS_FLAG) || 
-			   IS_FLAG_SET((&(pts.adslNearEndPerfStats_pt->flags)), NEAREND_PERF_LOF_FLAG) ||
-			   IS_FLAG_SET((&(pts.adslNearEndPerfStats_pt->flags)), NEAREND_PERF_LPR_FLAG) ||
-			   IS_FLAG_SET((&(pts.adslNearEndPerfStats_pt->flags)), NEAREND_PERF_NCD_FLAG) ||
-			   IS_FLAG_SET((&(pts.adslNearEndPerfStats_pt->flags)), NEAREND_PERF_LCD_FLAG) ){
-				NEAREND_PERF_LOS_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group PLAM Address 0 Index 0");
-#endif					
-					RxMessage[4] = 0;
-				}
-				if(IS_FLAG_SET((&(pts.adslNearEndPerfStats_pt->flags)), NEAREND_PERF_LOS_FLAG)){
-					if( (RxMessage[4]&0x1) == 0x1)
-						pts.adslNearEndPerfStats_pt->adslneLOS = 1;
-					else
-						pts.adslNearEndPerfStats_pt->adslneLOS = 0;
-				}
-				
-				if(IS_FLAG_SET((&(pts.adslNearEndPerfStats_pt->flags)), NEAREND_PERF_LOF_FLAG)){
-					if( (RxMessage[4]&0x2) == 0x2)
-						pts.adslNearEndPerfStats_pt->adslneLOF = 1;
-					else
-						pts.adslNearEndPerfStats_pt->adslneLOF = 0;
-				}
-				
-				if(IS_FLAG_SET((&(pts.adslNearEndPerfStats_pt->flags)), NEAREND_PERF_LPR_FLAG)){
-					if( (RxMessage[4]&0x4) == 0x4)
-						pts.adslNearEndPerfStats_pt->adslneLPR = 1;
-					else
-						pts.adslNearEndPerfStats_pt->adslneLPR = 0;
-				}
-				
-				if(IS_FLAG_SET((&(pts.adslNearEndPerfStats_pt->flags)), NEAREND_PERF_NCD_FLAG)){
-					pts.adslNearEndPerfStats_pt->adslneNCD = (RxMessage[4]>>4)&0x3;
-				}
-				
-				if(IS_FLAG_SET((&(pts.adslNearEndPerfStats_pt->flags)), NEAREND_PERF_LCD_FLAG)){
-					pts.adslNearEndPerfStats_pt->adslneLCD = (RxMessage[4]>>6)&0x3;
-				}
-			}
-						
-			if(IS_FLAG_SET((&(pts.adslNearEndPerfStats_pt->flags)), NEAREND_PERF_CRC_FLAG)){
-				if (chantype.interleave)
-					NEAREND_PERF_CRC_FLAG_LP0_MAKECMV;
-				else
-					NEAREND_PERF_CRC_FLAG_LP1_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group PLAM Address 2 Index 0");
-#endif
-					pts.adslNearEndPerfStats_pt->adslneCRC = 0;	
-				}
-				else{
-					pts.adslNearEndPerfStats_pt->adslneCRC = (u32)(RxMessage[4]) + (((u32)(RxMessage[5]))<<16);
-				}
-			}
-			
-			if(IS_FLAG_SET((&(pts.adslNearEndPerfStats_pt->flags)), NEAREND_PERF_RSCORR_FLAG)){
-				if (chantype.interleave)
-					NEAREND_PERF_RSCORR_FLAG_LP0_MAKECMV;
-				else
-					NEAREND_PERF_RSCORR_FLAG_LP1_MAKECMV;
-					
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group PLAM Address 3 Index 0");
-#endif
-					pts.adslNearEndPerfStats_pt->adslneRSCorr = 0;	
-				}
-				else{
-					pts.adslNearEndPerfStats_pt->adslneRSCorr = RxMessage[4];
-				}
-			}
-			
-			if(IS_FLAG_SET((&(pts.adslNearEndPerfStats_pt->flags)), NEAREND_PERF_FECS_FLAG)){
-				NEAREND_PERF_FECS_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group PLAM Address 6 Index 0");
-#endif
-					pts.adslNearEndPerfStats_pt->adslneFECS = 0;	
-				}
-				else{
-					pts.adslNearEndPerfStats_pt->adslneFECS = RxMessage[4];
-				}
-			}
-			
-			if(IS_FLAG_SET((&(pts.adslNearEndPerfStats_pt->flags)), NEAREND_PERF_ES_FLAG)){
-				NEAREND_PERF_ES_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group PLAM Address 7 Index 0");
-#endif
-					pts.adslNearEndPerfStats_pt->adslneES = 0;	
-				}
-				else{
-					pts.adslNearEndPerfStats_pt->adslneES = RxMessage[4];
-				}
-			}
-			
-			if(IS_FLAG_SET((&(pts.adslNearEndPerfStats_pt->flags)), NEAREND_PERF_SES_FLAG)){
-				NEAREND_PERF_SES_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group PLAM Address 8 Index 0");
-#endif
-					pts.adslNearEndPerfStats_pt->adslneSES = 0;	
-				}
-				else{
-					pts.adslNearEndPerfStats_pt->adslneSES = RxMessage[4];
-				}
-			}
-			
-			if(IS_FLAG_SET((&(pts.adslNearEndPerfStats_pt->flags)), NEAREND_PERF_LOSS_FLAG)){
-				NEAREND_PERF_LOSS_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group PLAM Address 9 Index 0");
-#endif
-					pts.adslNearEndPerfStats_pt->adslneLOSS = 0;	
-				}
-				else{
-					pts.adslNearEndPerfStats_pt->adslneLOSS = RxMessage[4];
-				}
-			}
-			
-			if(IS_FLAG_SET((&(pts.adslNearEndPerfStats_pt->flags)), NEAREND_PERF_UAS_FLAG)){
-				NEAREND_PERF_UAS_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group PLAM Address 10 Index 0");
-#endif
-					pts.adslNearEndPerfStats_pt->adslneUAS = 0;	
-				}
-				else{
-					pts.adslNearEndPerfStats_pt->adslneUAS = RxMessage[4];
-				}
-			}
-			
-			if(IS_FLAG_SET((&(pts.adslNearEndPerfStats_pt->flags)), NEAREND_PERF_HECERR_FLAG)){
-				if (chantype.bearchannel0)
-				{
-					NEAREND_PERF_HECERR_FLAG_BC0_MAKECMV;
-				}else if (chantype.bearchannel1)
-				{
-					NEAREND_PERF_HECERR_FLAG_BC1_MAKECMV;
-				}
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group PLAM Address 11 Index 0");
-#endif
-					pts.adslNearEndPerfStats_pt->adslneHECErrors = 0;	
-				}
-				else{
-					pts.adslNearEndPerfStats_pt->adslneHECErrors = (u32)(RxMessage[4]) + (((u32)(RxMessage[5]))<<16);
-				}
-			}
-			
-			copy_to_user((char *)lon, (char *)pts.adslNearEndPerfStats_pt, sizeof(adslNearEndPerfStats));
-			kfree(pts.adslNearEndPerfStats_pt);
-			
-			up(&mei_sema);
-			break;
-
-		case GET_ADSL_FAREND_STATS:
-
-                	if (showtime!=1)
-                		return -ERESTARTSYS;
-			
-			if (adsl_mode>8 || adsl_mode_extend > 0)
-			{
-				do_gettimeofday(&time_now);
-				if( FarendData_acquire_time.tv_sec==0 || time_now.tv_sec - FarendData_acquire_time.tv_sec>=1)
-				{								
-					hdlc_cmd[0]=0x105;
-					
-					if (ifx_me_hdlc_send((unsigned char *)&hdlc_cmd[0],2)!= -EBUSY)
-					{
-						set_current_state(TASK_INTERRUPTIBLE);
-						schedule_timeout(1);		
-						hdlc_rx_len=0;			
-						hdlc_rx_len = ifx_mei_hdlc_read(&hdlc_rx_buffer,32*2);
-						if (hdlc_rx_len <=0)
-						{
-							return -ERESTARTSYS;
-						}
-						FarendStatsData.adslfeRSCorr = ((u32)le16_to_cpu(hdlc_rx_buffer[1]) << 16) + (u32)le16_to_cpu(hdlc_rx_buffer[2]);
-						FarendStatsData.adslfeCRC = ((u32)le16_to_cpu(hdlc_rx_buffer[3]) << 16) + (u32)le16_to_cpu(hdlc_rx_buffer[4]);
-						FarendStatsData.adslfeFECS = ((u32)le16_to_cpu(hdlc_rx_buffer[5]) << 16) + (u32)le16_to_cpu(hdlc_rx_buffer[6]);
-						FarendStatsData.adslfeES = ((u32)le16_to_cpu(hdlc_rx_buffer[7]) << 16) + (u32)le16_to_cpu(hdlc_rx_buffer[8]);
-						FarendStatsData.adslfeSES = ((u32)le16_to_cpu(hdlc_rx_buffer[9]) << 16) + (u32)le16_to_cpu(hdlc_rx_buffer[10]);
-						FarendStatsData.adslfeLOSS = ((u32)le16_to_cpu(hdlc_rx_buffer[11]) << 16) + (u32)le16_to_cpu(hdlc_rx_buffer[12]);
-						FarendStatsData.adslfeUAS = ((u32)le16_to_cpu(hdlc_rx_buffer[13]) << 16) + (u32)le16_to_cpu(hdlc_rx_buffer[14]);
-						do_gettimeofday(&FarendData_acquire_time);
-					}
-					
-				}
-			}
-			
-			if(down_interruptible(&mei_sema))
-                		return -ERESTARTSYS;
-                	pts.adslFarEndPerfStats_pt = (adslFarEndPerfStats *)kmalloc(sizeof(adslFarEndPerfStats), GFP_KERNEL);
-			copy_from_user((char *)pts.adslFarEndPerfStats_pt, (char *)lon, sizeof(adslFarEndPerfStats));
-			if(IS_FLAG_SET((&(pts.adslFarEndPerfStats_pt->flags)), FAREND_PERF_LOS_FLAG) || 
-			   IS_FLAG_SET((&(pts.adslFarEndPerfStats_pt->flags)), FAREND_PERF_LOF_FLAG) ||
-			   IS_FLAG_SET((&(pts.adslFarEndPerfStats_pt->flags)), FAREND_PERF_LPR_FLAG) ||
-			   IS_FLAG_SET((&(pts.adslFarEndPerfStats_pt->flags)), FAREND_PERF_NCD_FLAG) ||
-			   IS_FLAG_SET((&(pts.adslFarEndPerfStats_pt->flags)), FAREND_PERF_LCD_FLAG) ){
-				FAREND_PERF_LOS_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group PLAM Address 1 Index 0");
-#endif					
-					RxMessage[4] = 0;
-				}
-				if(IS_FLAG_SET((&(pts.adslFarEndPerfStats_pt->flags)), FAREND_PERF_LOS_FLAG)){
-					if((RxMessage[4]&0x1) == 0x1)
-						pts.adslFarEndPerfStats_pt->adslfeLOS = 1;
-					else
-						pts.adslFarEndPerfStats_pt->adslfeLOS = 0;
-				}
-				
-				if(IS_FLAG_SET((&(pts.adslFarEndPerfStats_pt->flags)), FAREND_PERF_LOF_FLAG)){
-					if((RxMessage[4]&0x2) == 0x2)
-						pts.adslFarEndPerfStats_pt->adslfeLOF = 1;
-					else
-						pts.adslFarEndPerfStats_pt->adslfeLOF = 0;
-				}
-				
-				if(IS_FLAG_SET((&(pts.adslFarEndPerfStats_pt->flags)), FAREND_PERF_LPR_FLAG)){
-					if((RxMessage[4]&0x4) == 0x4)
-						pts.adslFarEndPerfStats_pt->adslfeLPR = 1;
-					else
-						pts.adslFarEndPerfStats_pt->adslfeLPR = 0;
-				}
-				
-				if(IS_FLAG_SET((&(pts.adslFarEndPerfStats_pt->flags)), FAREND_PERF_NCD_FLAG)){
-					pts.adslFarEndPerfStats_pt->adslfeNCD = (RxMessage[4]>>4)&0x3;
-				}
-				
-				if(IS_FLAG_SET((&(pts.adslFarEndPerfStats_pt->flags)), FAREND_PERF_LCD_FLAG)){
-					pts.adslFarEndPerfStats_pt->adslfeLCD = (RxMessage[4]>>6)&0x3;
-				}
-			}
-						
-			if(IS_FLAG_SET((&(pts.adslFarEndPerfStats_pt->flags)), FAREND_PERF_CRC_FLAG)){
-				if (adsl_mode<=8 && adsl_mode_extend == 0)
-				{
-					if (chantype.interleave)
-					{
-						FAREND_PERF_CRC_FLAG_LP0_MAKECMV;
-					}
-					else
-					{
-						FAREND_PERF_CRC_FLAG_LP1_MAKECMV;
-					}
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group PLAM Address 24 Index 0");
-#endif
-						pts.adslFarEndPerfStats_pt->adslfeCRC = 0;	
-					}
-					else{
-						pts.adslFarEndPerfStats_pt->adslfeCRC = RxMessage[4];					
-					}
-				}else
-				{
-					pts.adslFarEndPerfStats_pt->adslfeCRC = FarendStatsData.adslfeCRC;
-				}
-			}
-			
-			if(IS_FLAG_SET((&(pts.adslFarEndPerfStats_pt->flags)), FAREND_PERF_RSCORR_FLAG)){
-				if (adsl_mode<=8 && adsl_mode_extend == 0)
-				{
-					if (chantype.interleave)
-						FAREND_PERF_RSCORR_FLAG_LP0_MAKECMV;
-					else
-						FAREND_PERF_RSCORR_FLAG_LP1_MAKECMV;
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group PLAM Address 28 Index 0");
-#endif
-						pts.adslFarEndPerfStats_pt->adslfeRSCorr = 0;	
-					}
-					else{
-						pts.adslFarEndPerfStats_pt->adslfeRSCorr = RxMessage[4];
-						
-					}
-				}
-				else
-				{
-					pts.adslFarEndPerfStats_pt->adslfeRSCorr = FarendStatsData.adslfeRSCorr;
-				}
-			}
-			
-			if(IS_FLAG_SET((&(pts.adslFarEndPerfStats_pt->flags)), FAREND_PERF_FECS_FLAG)){
-				if (adsl_mode<=8 && adsl_mode_extend == 0)
-				{
-					FAREND_PERF_FECS_FLAG_MAKECMV;
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group PLAM Address 32 Index 0");
-#endif
-						pts.adslFarEndPerfStats_pt->adslfeFECS = 0;	
-					}
-					else{
-						pts.adslFarEndPerfStats_pt->adslfeFECS = RxMessage[4];						
-					}
-				}else {
-					pts.adslFarEndPerfStats_pt->adslfeFECS = FarendStatsData.adslfeFECS;
-				}
-			}
-			
-			if(IS_FLAG_SET((&(pts.adslFarEndPerfStats_pt->flags)), FAREND_PERF_ES_FLAG)){
-				if (adsl_mode<=8 && adsl_mode_extend == 0)
-				{
-					FAREND_PERF_ES_FLAG_MAKECMV;
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group PLAM Address 33 Index 0");
-#endif
-						pts.adslFarEndPerfStats_pt->adslfeES = 0;	
-					}
-					else{
-						pts.adslFarEndPerfStats_pt->adslfeES = RxMessage[4];						
-					}
-				}else
-				{
-					pts.adslFarEndPerfStats_pt->adslfeES = FarendStatsData.adslfeES;
-				}
-			}
-			
-			if(IS_FLAG_SET((&(pts.adslFarEndPerfStats_pt->flags)), FAREND_PERF_SES_FLAG)){
-				if (adsl_mode<=8 && adsl_mode_extend == 0)
-				{
-					FAREND_PERF_SES_FLAG_MAKECMV;
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group PLAM Address 34 Index 0");
-#endif
-						pts.adslFarEndPerfStats_pt->adslfeSES = 0;	
-					}
-					else{
-						pts.adslFarEndPerfStats_pt->adslfeSES = RxMessage[4];
-						
-					}
-				}else
-				{
-					pts.adslFarEndPerfStats_pt->adslfeSES = FarendStatsData.adslfeSES;
-				}
-			}
-			
-			if(IS_FLAG_SET((&(pts.adslFarEndPerfStats_pt->flags)), FAREND_PERF_LOSS_FLAG)){
-				if (adsl_mode<=8 && adsl_mode_extend == 0)
-				{
-					FAREND_PERF_LOSS_FLAG_MAKECMV;
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group PLAM Address 35 Index 0");
-#endif
-						pts.adslFarEndPerfStats_pt->adslfeLOSS = 0;	
-					}
-					else{
-						pts.adslFarEndPerfStats_pt->adslfeLOSS = RxMessage[4];
-						
-					}
-				}else
-				{
-					pts.adslFarEndPerfStats_pt->adslfeLOSS = FarendStatsData.adslfeLOSS;
-				}
-			}
-			
-			if(IS_FLAG_SET((&(pts.adslFarEndPerfStats_pt->flags)), FAREND_PERF_UAS_FLAG)){
-				if (adsl_mode<=8 && adsl_mode_extend == 0)
-				{
-					FAREND_PERF_UAS_FLAG_MAKECMV;
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group PLAM Address 36 Index 0");
-#endif
-						pts.adslFarEndPerfStats_pt->adslfeUAS = 0;	
-					}
-					else{
-						pts.adslFarEndPerfStats_pt->adslfeUAS = RxMessage[4];
-						
-					}
-				}else
-				{
-					pts.adslFarEndPerfStats_pt->adslfeUAS = FarendStatsData.adslfeUAS;
-				}
-			}
-			
-			if(IS_FLAG_SET((&(pts.adslFarEndPerfStats_pt->flags)), FAREND_PERF_HECERR_FLAG)){
-				if (chantype.bearchannel0)
-				{
-					FAREND_PERF_HECERR_FLAG_BC0_MAKECMV;
-				}else if (chantype.bearchannel1)
-				{
-					FAREND_PERF_HECERR_FLAG_BC1_MAKECMV;
-				}
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group PLAM Address 37 Index 0");
-#endif
-					pts.adslFarEndPerfStats_pt->adslfeHECErrors = 0;	
-				}
-				else{
-					pts.adslFarEndPerfStats_pt->adslfeHECErrors = (u32)(RxMessage[4]) + (((u32)(RxMessage[5]))<<16);
-				}
-			}
-			
-			copy_to_user((char *)lon, (char *)pts.adslFarEndPerfStats_pt, sizeof(adslFarEndPerfStats));		
-			kfree(pts.adslFarEndPerfStats_pt);
-			
-			up(&mei_sema);
-			
-			break;
-// 603221:tc.chen end
-		case GET_ADSL_LOOP_DIAGNOSTICS_MODE:
-			//lon = loop_diagnostics_mode;
-			copy_to_user((char *)lon, (char *)&loop_diagnostics_mode, sizeof(int));	
-			break;
-//>> SHC
-		case IS_ADSL_LOOP_DIAGNOSTICS_MODE_COMPLETE:
-			copy_to_user((char *)lon, (char *)&loop_diagnostics_completed, sizeof(int));	
-			break;
-			
-//<< end SHC
-		case LOOP_DIAGNOSTIC_MODE_COMPLETE:
-			loop_diagnostics_completed = 1;
-			// read adsl mode
-			makeCMV(H2D_CMV_READ, STAT, 1, 0, 1, data); 
-			if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-				printk("\n\nCMV fail, Group STAT Address 1 Index 0");
-#endif
-			}
-			adsl_mode = RxMessage[4];
-
-			makeCMV(H2D_CMV_READ, STAT, 17, 0, 1, data); 
-			if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-				printk("\n\nCMV fail, Group STAT Address 1 Index 0");
-#endif
-			}
-			adsl_mode_extend = RxMessage[4];
-			wake_up_interruptible(&wait_queue_loop_diagnostic);	
-			break;
-		case SET_ADSL_LOOP_DIAGNOSTICS_MODE:
-			if (lon != loop_diagnostics_mode)
-			{
-				loop_diagnostics_completed = 0;
-				loop_diagnostics_mode = lon;
-
-				mei_ioctl((struct inode *)0,NULL, AMAZON_MEI_REBOOT, NULL);
-				
-			}
-			break;
-		case GET_ADSL_ATUR_SUBCARRIER_STATS:
-			if (loop_diagnostics_completed == 0)
-			{
-				interruptible_sleep_on_timeout(&wait_queue_loop_diagnostic,300*HZ);
-				if (loop_diagnostics_completed==0)
-				{
-					return -ERESTARTSYS;
-				}
-			}
-			if(down_interruptible(&mei_sema))
-                		return -ERESTARTSYS;
-                		
-                	pts.adslATURSubcarrierInfo_pt = (adslATURSubcarrierInfo *)kmalloc(sizeof(adslATURSubcarrierInfo), GFP_KERNEL);
-			copy_from_user((char *)pts.adslATURSubcarrierInfo_pt, (char *)lon, sizeof(adslATURSubcarrierInfo));
-			
-			if(IS_FLAG_SET((&(pts.adslATURSubcarrierInfo_pt->flags)),  FAREND_HLINSC)){
-				FAREND_HLINSC_MAKECMV(H2D_CMV_READ);
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group PLAM Address 35 Index 0");
-#endif
-					pts.adslATURSubcarrierInfo_pt->HLINSCds = 0;	
-				}
-				else{
-					pts.adslATURSubcarrierInfo_pt->HLINSCds = RxMessage[4];
-					
-				}
-			}
-			if(IS_FLAG_SET((&(pts.adslATURSubcarrierInfo_pt->flags)),  FAREND_HLINPS)){
-				int index=0,size=12;
-				//printk("FAREND_HLINPS\n");
-				for (index=0;index<1024;index+=size)
-				{
-					if (index+size>=1024)
-						size = 1024-index;
-					FAREND_HLINPS_MAKECMV(H2D_CMV_READ,index,size);
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group PLAM Address 35 Index 0");
-#endif
-					}
-					else{
-						memcpy(&pts.adslATURSubcarrierInfo_pt->HLINpsds[index],&RxMessage[4],size*2);
-#if 0
-						int msg_idx;
-						for(msg_idx=0;msg_idx<size;msg_idx++)
-							printk("index:%d ,cmv_result: %04X\n",index+msg_idx,RxMessage[4+msg_idx]);
-#endif
-					}
-				}
-			}
-			
-			if(IS_FLAG_SET((&(pts.adslATURSubcarrierInfo_pt->flags)),  FAREND_HLOGMT)){
-				FAREND_HLOGMT_MAKECMV(H2D_CMV_READ);
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group PLAM Address 35 Index 0");
-#endif
-					pts.adslATURSubcarrierInfo_pt->HLOGMTds = 0;	
-				}
-				else{
-					pts.adslATURSubcarrierInfo_pt->HLOGMTds = RxMessage[4];
-					
-				}
-			}
-			
-			/////////////////////////////////////////////////////////////////////////
-			if(IS_FLAG_SET((&(pts.adslATURSubcarrierInfo_pt->flags)),  FAREND_HLOGPS)){
-				//printk("FAREND_HLOGPS\n");
-				int index=0,size=12;
-				for (index=0;index<256;index+=size)
-				{
-					if (index+size>=256)
-						size = 256-index;
-
-					FAREND_HLOGPS_MAKECMV(H2D_CMV_READ,index,size);
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group PLAM Address 35 Index 0");
-#endif
-					}
-					else{
-						if (adsl_mode < 0x4000 && adsl_mode_extend==0)//adsl2 mode
-						{
-							memcpy(&pts.adslATURSubcarrierInfo_pt->HLOGpsds[index],&RxMessage[4],size*2);
-						}else
-						{
-							int msg_idx=0;
-							for (msg_idx=0;msg_idx<size;msg_idx++)
-							{
-								pts.adslATURSubcarrierInfo_pt->HLOGpsds[(index+msg_idx)*2+1] = RxMessage[4+msg_idx];
-								//printk("index:%d ,cmv_result: %04X\n",index+msg_idx,RxMessage[4+msg_idx]);
-							}
-						}	
-					}
-				}
-				if (adsl_mode >= 0x4000 || adsl_mode_extend >0)//adsl2+ mode
-				{
-					pts.adslATURSubcarrierInfo_pt->HLOGpsds[0] = pts.adslATURSubcarrierInfo_pt->HLOGpsds[1];
-					for (index=1;index<256;index++)
-					{
-						pts.adslATURSubcarrierInfo_pt->HLOGpsds[index*2]   = (pts.adslATURSubcarrierInfo_pt->HLOGpsds[(index)*2-1] +  pts.adslATURSubcarrierInfo_pt->HLOGpsds[(index)*2+1] +1) >>1;
-					}
-				}
-			}
-			if(IS_FLAG_SET((&(pts.adslATURSubcarrierInfo_pt->flags)),  FAREND_QLNMT)){
-				FAREND_QLNMT_MAKECMV(H2D_CMV_READ);
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group PLAM Address 35 Index 0");
-#endif
-					pts.adslATURSubcarrierInfo_pt->QLNMTds = 0;	
-				}
-				else{
-					pts.adslATURSubcarrierInfo_pt->QLNMTds = RxMessage[4];					
-				}
-			}
-			
-			/////////////////////////////////////////////////////////////////////////
-			if(IS_FLAG_SET((&(pts.adslATURSubcarrierInfo_pt->flags)),  FAREND_QLNPS)){
-				int index=0,size=12;
-				//printk("FAREND_QLNPS\n");
-				for (index=0;index<128;index+=size)
-				{
-					if (index+size>=128)
-						size = 128-index;
-					FAREND_QLNPS_MAKECMV(H2D_CMV_READ,index,size);
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group PLAM Address 35 Index 0");
-#endif
-					}
-					else{
-						int msg_idx=0;
-						for (msg_idx=0;msg_idx<size;msg_idx++)
-						{
-							//memcpy(&pts.adslATURSubcarrierInfo_pt->QLNpsds[index],&RxMessage[4],size*2);
-							if (adsl_mode < 0x4000 && adsl_mode_extend==0)//adsl2 mode
-							{
-								pts.adslATURSubcarrierInfo_pt->QLNpsds[(index+msg_idx)*2] = (u16)(RxMessage[4+msg_idx]&0xFF);
-								pts.adslATURSubcarrierInfo_pt->QLNpsds[(index+msg_idx)*2+1] = (u16)((RxMessage[4+msg_idx]>>8)&0xFF);
-							}else
-							{
-								pts.adslATURSubcarrierInfo_pt->QLNpsds[(index+msg_idx)*4+1] = (u16)(RxMessage[4+msg_idx]&0xFF);
-								pts.adslATURSubcarrierInfo_pt->QLNpsds[(index+msg_idx)*4+3] = (u16)((RxMessage[4+msg_idx]>>8)&0xFF);
-								//printk("index:%d ,cmv_result: %04X\n",index+msg_idx,RxMessage[4+msg_idx]);
-							}
-						}
-
-						
-					}
-				}
-				if (adsl_mode >= 0x4000 || adsl_mode_extend >0)//adsl2+ mode
-				{
-					pts.adslATURSubcarrierInfo_pt->QLNpsds[0] = pts.adslATURSubcarrierInfo_pt->QLNpsds[1];
-					for (index=1;index<256;index++)
-					{
-						pts.adslATURSubcarrierInfo_pt->QLNpsds[index*2]   = (pts.adslATURSubcarrierInfo_pt->QLNpsds[(index)*2-1] +  pts.adslATURSubcarrierInfo_pt->QLNpsds[(index)*2+1]) >>1;
-					}
-				}
-			}
-			if(IS_FLAG_SET((&(pts.adslATURSubcarrierInfo_pt->flags)),  FAREND_SNRMT)){
-				FAREND_SNRMT_MAKECMV(H2D_CMV_READ);
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group PLAM Address 35 Index 0");
-#endif
-					pts.adslATURSubcarrierInfo_pt->SNRMTds = 0;	
-				}
-				else{
-					pts.adslATURSubcarrierInfo_pt->SNRMTds = RxMessage[4];					
-				}
-			}
-			if(IS_FLAG_SET((&(pts.adslATURSubcarrierInfo_pt->flags)),  FAREND_SNRPS)){
-				int index=0,size=12;
-				//printk("FAREND_SNRPS\n");
-				for (index=0;index<512;index+=size)
-				{
-					if (index+size>=512)
-						size = 512-index;
-					FAREND_SNRPS_MAKECMV(H2D_CMV_READ,index,size);
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group PLAM Address 35 Index 0");
-#endif
-					}
-					else{
-						//memcpy(&pts.adslATURSubcarrierInfo_pt->SNRpsds[index],&RxMessage[4],size*2);
-						int msg_idx=0;
-						for (msg_idx=0;msg_idx<size;msg_idx++)
-						{
-							pts.adslATURSubcarrierInfo_pt->SNRpsds[index+msg_idx] = (u16)(RxMessage[4+msg_idx]&0xFF);
-							//printk("index:%d ,cmv_result: %04X\n",index+msg_idx,RxMessage[4+msg_idx]);
-						}
-						
-					}
-				}
-			}
-			if(IS_FLAG_SET((&(pts.adslATURSubcarrierInfo_pt->flags)),  FAREND_BITPS)){
-				int index=0,size=12;
-				//printk("FAREND_BITPS\n");
-				for (index=0;index<256;index+=size)
-				{
-					if (index+size>=256)
-						size = 256-index;
-					FAREND_BITPS_MAKECMV(H2D_CMV_READ,index,size);
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group PLAM Address 35 Index 0");
-#endif
-					}
-					else{
-						int msg_idx=0;
-						for (msg_idx=0;msg_idx<size;msg_idx++)
-						{
-							pts.adslATURSubcarrierInfo_pt->BITpsds[(index+msg_idx)*2] = (u16)(RxMessage[4+msg_idx]&0xFF);
-							pts.adslATURSubcarrierInfo_pt->BITpsds[(index+msg_idx)*2+1] = (u16)((RxMessage[4+msg_idx]>>8)&0xFF);
-							//printk("index:%d ,cmv_result: %04X, %d\n",index+msg_idx,RxMessage[4+msg_idx],RxMessage[4+msg_idx]);
-							
-						}
-						
-					}
-				}
-			}
-			if(IS_FLAG_SET((&(pts.adslATURSubcarrierInfo_pt->flags)),  FAREND_GAINPS)){
-				int index=0,size=12;
-				//printk("FAREND_GAINPS\n");
-				for (index=0;index<512;index+=size)
-				{
-					FAREND_GAINPS_MAKECMV(H2D_CMV_READ,index,size);
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group PLAM Address 35 Index 0");
-#endif
-					}
-					else{
-					/*
-						int msg_idx=0;
-						for (msg_idx=0;msg_idx<size;msg_idx++)
-						{
-							pts.adslATURSubcarrierInfo_pt->GAINpsds[(index+msg_idx)*2] = RxMessage[4+msg_idx]&0xFF;
-							pts.adslATURSubcarrierInfo_pt->GAINpsds[(index+msg_idx)*2+1] = (RxMessage[4+msg_idx]>>8)&0xFF;
-							
-						}
-						*/
-						memcpy(&pts.adslATURSubcarrierInfo_pt->GAINpsds[index],&RxMessage[4],size*2);	
-#if 0
-						int msg_idx=0;
-						for (msg_idx=0;msg_idx<size;msg_idx++)
-						{
-							printk("index:%d ,cmv_result: %04X\n",index+msg_idx,RxMessage[4+msg_idx]);
-							
-						}
-#endif
-					}
-				}
-			}				
-			copy_to_user((char *)lon, (char *)pts.adslATURSubcarrierInfo_pt, sizeof(adslATURSubcarrierInfo));		
-			kfree(pts.adslATURSubcarrierInfo_pt);
-			
-			up(&mei_sema);
-			break;
-		case GET_ADSL_ATUC_SUBCARRIER_STATS:
-			if (loop_diagnostics_completed == 0)
-			{
-				interruptible_sleep_on_timeout(&wait_queue_loop_diagnostic,300*HZ);
-				if (loop_diagnostics_completed==0)
-				{
-					return -ERESTARTSYS;
-				}
-			}
-			if(down_interruptible(&mei_sema))
-                		return -ERESTARTSYS;
-                	pts.adslATUCSubcarrierInfo_pt = (adslATUCSubcarrierInfo *)kmalloc(sizeof(adslATUCSubcarrierInfo), GFP_KERNEL);
-			copy_from_user((char *)pts.adslATUCSubcarrierInfo_pt, (char *)lon, sizeof(adslATUCSubcarrierInfo));
-			
-			
-			if(IS_FLAG_SET((&(pts.adslATUCSubcarrierInfo_pt->flags)),  NEAREND_HLINSC)){
-				NEAREND_HLINSC_MAKECMV(H2D_CMV_READ);
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group INFO Address 71 Index 2");
-#endif
-					pts.adslATUCSubcarrierInfo_pt->HLINSCus = 0;	
-				}
-				else{
-					pts.adslATUCSubcarrierInfo_pt->HLINSCus = RxMessage[4];
-					
-				}
-			}
-			if(IS_FLAG_SET((&(pts.adslATUCSubcarrierInfo_pt->flags)),  NEAREND_HLINPS)){
-				int index=0,size=12;
-				//printk("NEAREND_HLINPS\n");
-				for (index=0;index<128;index+=size)
-				{
-					if (index+size>=128)
-						size = 128-index;
-					NEAREND_HLINPS_MAKECMV(H2D_CMV_READ,index,size);
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group INFO Address 73 Index 0");
-#endif
-					}
-					else{
-						memcpy(&pts.adslATUCSubcarrierInfo_pt->HLINpsus[index],&RxMessage[4],size*2);
-#if 0
-						int msg_idx;
-						for (msg_idx=0;msg_idx<size;msg_idx++)
-						{
-							printk("index:%d ,cmv_result: %04X\n",index+msg_idx,RxMessage[4+msg_idx]);
-						}
-#endif
-					}
-				}
-			}
-			
-			if(IS_FLAG_SET((&(pts.adslATUCSubcarrierInfo_pt->flags)),  NEAREND_HLOGMT)){
-				NEAREND_HLOGMT_MAKECMV(H2D_CMV_READ);
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group INFO Address 80 Index 0");
-#endif
-					pts.adslATUCSubcarrierInfo_pt->HLOGMTus = 0;	
-				}
-				else{
-					pts.adslATUCSubcarrierInfo_pt->HLOGMTus = RxMessage[4];
-					
-				}
-			}
-			
-			/////////////////////////////////////////////////////////////////////////
-			if(IS_FLAG_SET((&(pts.adslATUCSubcarrierInfo_pt->flags)),  NEAREND_HLOGPS)){
-				int index=0,size=12;
-				//printk("NEAREND_HLOGPS\n");
-				for (index=0;index<64;index+=size)
-				{
-					if (index+size>=64)
-						size = 64-index;
-					NEAREND_HLOGPS_MAKECMV(H2D_CMV_READ,index,size);
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group INFO Address 75 Index 0");
-#endif
-					}
-					else{						
-#if 0
-						if (adsl_mode <0x4000)//adsl /adsl2 mode
-						{
-#endif
-						memcpy(&pts.adslATUCSubcarrierInfo_pt->HLOGpsus[index],&RxMessage[4],size*2);
-#if 0
-						}else
-						{
-							int msg_idx=0;
-							for (msg_idx=0;msg_idx<size;msg_idx++)
-							{
-								//pts.adslATUCSubcarrierInfo_pt->HLOGpsus[(index+msg_idx)*2+1] = RxMessage[4+msg_idx];
-								pts.adslATUCSubcarrierInfo_pt->HLOGpsus[(index+msg_idx)] = RxMessage[4+msg_idx];
-							}
-						}						
-#endif
-					}
-				}
-#if 0
-				if (adsl_mode >= 0x4000)//adsl2 mode
-				{
-					pts.adslATUCSubcarrierInfo_pt->HLOGpsus[0] = pts.adslATUCSubcarrierInfo_pt->HLOGpsus[1];
-					for (index=1;index<64;index++)
-					{
-						pts.adslATUCSubcarrierInfo_pt->HLOGpsus[index*2]   = (pts.adslATUCSubcarrierInfo_pt->HLOGpsus[(index)*2-1] +  pts.adslATUCSubcarrierInfo_pt->HLOGpsus[(index)*2+1]) >>1;
-					}
-				}
-#endif
-			}
-			if(IS_FLAG_SET((&(pts.adslATUCSubcarrierInfo_pt->flags)),  NEAREND_QLNMT)){
-				NEAREND_QLNMT_MAKECMV(H2D_CMV_READ);
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group INFO Address 80 Index 1");
-#endif
-					pts.adslATUCSubcarrierInfo_pt->QLNMTus = 0;	
-				}
-				else{
-					pts.adslATUCSubcarrierInfo_pt->QLNMTus = RxMessage[4];					
-				}
-			}
-			
-			/////////////////////////////////////////////////////////////////////////
-			if(IS_FLAG_SET((&(pts.adslATUCSubcarrierInfo_pt->flags)),  NEAREND_QLNPS)){
-				int index=0,size=12;
-				//printk("NEAREND_QLNPS\n");
-				for (index=0;index<32;index+=size)
-				{
-					if (index+size>=32)
-						size = 32-index;
-					NEAREND_QLNPS_MAKECMV(H2D_CMV_READ,index,size);
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group INFO Address 77 Index 0");
-#endif
-					}
-					else{
-						int msg_idx=0;
-						for (msg_idx=0;msg_idx<size;msg_idx++)
-						{
-
-#if 0
-							//memcpy(&pts.adslATUCSubcarrierInfo_pt->QLNpsds[index],&RxMessage[4],size*2);
-							if (adsl_mode == 0x200 || adsl_mode == 0x800 || adsl_mode ==0x2000  || adsl_mode ==0x4000 || (adsl_mode == 0 && (adsl_mode_extend == 0x4 || adsl_mode_extend == 0x2))//ADSL 2 Annex B(0x200)/J(0x800)/M(0x2000) //ADSL 2+ B,J,M
-							if (adsl_mode < 0x4000 && adsl_mode_extend==0)//adsl2 mode
-							{
-								pts.adslATUCSubcarrierInfo_pt->QLNpsus[(index+msg_idx)*4+1] = (u16)(RxMessage[4+msg_idx]&0xFF);
-								pts.adslATUCSubcarrierInfo_pt->QLNpsus[(index+msg_idx)*4+3] = (u16)((RxMessage[4+msg_idx]>>8)&0xFF);
-							}else
-#endif
-							{
-								pts.adslATUCSubcarrierInfo_pt->QLNpsus[(index+msg_idx)*2] = (u16)(RxMessage[4+msg_idx]&0xFF);
-								pts.adslATUCSubcarrierInfo_pt->QLNpsus[(index+msg_idx)*2+1] = (u16)((RxMessage[4+msg_idx]>>8)&0xFF);
-							//printk("index:%d ,cmv_result: %04X\n",index+msg_idx,RxMessage[4+msg_idx]);
-							}
-						}
-
-						
-					}
-				}
-#if 0
-				//if (adsl_mode <0x4000)//Annex I/J/L/M
-				if (adsl_mode == 0x200 || adsl_mode == 0x800 || adsl_mode ==0x2000  || adsl_mode ==0x4000 || (adsl_mode == 0 && (adsl_mode_extend == 0x4 || adsl_mode_extend == 0x2))//ADSL 2 Annex B(0x200)/J(0x800)/M(0x2000) //ADSL 2+ B,J,M
-				{
-					pts.adslATUCSubcarrierInfo_pt->QLNpsus[0] = pts.adslATUCSubcarrierInfo_pt->QLNpsus[1];
-					for (index=1;index<64;index++)
-					{
-						pts.adslATUCSubcarrierInfo_pt->QLNpsus[index*2]   = (pts.adslATUCSubcarrierInfo_pt->QLNpsus[(index)*2-1] +  pts.adslATUCSubcarrierInfo_pt->QLNpsus[(index)*2+1]) >>1;
-					}
-				}
-#endif
-			}
-			if(IS_FLAG_SET((&(pts.adslATUCSubcarrierInfo_pt->flags)),  NEAREND_SNRMT)){
-				NEAREND_SNRMT_MAKECMV(H2D_CMV_READ);
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group INFO Address 80 Index 2");
-#endif
-					pts.adslATUCSubcarrierInfo_pt->SNRMTus = 0;	
-				}
-				else{
-					pts.adslATUCSubcarrierInfo_pt->SNRMTus = RxMessage[4];					
-				}
-			}
-			if(IS_FLAG_SET((&(pts.adslATUCSubcarrierInfo_pt->flags)),  NEAREND_SNRPS)){
-				int index=0,size=12;
-				//printk("NEAREND_SNRPS\n");
-				for (index=0;index<64;index+=size)
-				{
-					if (index+size>=64)
-						size = 64-index;
-					NEAREND_SNRPS_MAKECMV(H2D_CMV_READ,index,size);
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group INFO Address 78 Index 0");
-#endif
-					}
-					else{
-						//memcpy(&pts.adslATUCSubcarrierInfo_pt->SNRpsus[index],&RxMessage[4],size*2);
-						int msg_idx=0;
-						for (msg_idx=0;msg_idx<size;msg_idx++)
-						{
-							pts.adslATUCSubcarrierInfo_pt->SNRpsus[index+msg_idx] = (u16)(RxMessage[4+msg_idx]&0xFF);
-							//printk("index:%d ,cmv_result: %04X\n",index+msg_idx,RxMessage[4+msg_idx]);
-						}
-						
-					}
-				}
-			}
-			if(IS_FLAG_SET((&(pts.adslATUCSubcarrierInfo_pt->flags)),  NEAREND_BITPS)){
-				int index=0,size=12;
-				//printk("NEAREND_BITPS\n");
-				for (index=0;index<32;index+=size)
-				{
-					if (index+size>=32)
-						size = 32-index;
-					NEAREND_BITPS_MAKECMV(H2D_CMV_READ,index,size);
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group INFO Address 22 Index 0");
-#endif
-					}
-					else{
-						int msg_idx=0;
-						for (msg_idx=0;msg_idx<size;msg_idx++)
-						{
-							pts.adslATUCSubcarrierInfo_pt->BITpsus[(index+msg_idx)*2] = (u16)(RxMessage[4+msg_idx]&0xFF);
-							pts.adslATUCSubcarrierInfo_pt->BITpsus[(index+msg_idx)*2+1] = (u16)((RxMessage[4+msg_idx]>>8)&0xFF);
-							//printk("index:%d ,cmv_result: %04X\n",index+msg_idx,RxMessage[4+msg_idx]);
-						}
-						
-					}
-				}
-			}
-			if(IS_FLAG_SET((&(pts.adslATUCSubcarrierInfo_pt->flags)),  NEAREND_GAINPS)){
-				int index=0,size=12;
-				//printk("NEAREND_GAINPS\n");
-				for (index=0;index<64;index+=size)
-				{
-					if (index+size>=64)
-						size = 64-index;
-					NEAREND_GAINPS_MAKECMV(H2D_CMV_READ,index,size);
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group INFO Address 24 Index 0");
-#endif
-					}
-					else{
-					/*
-						int msg_idx=0;
-						for (msg_idx=0;msg_idx<size;msg_idx++)
-						{
-							pts.adslATUCSubcarrierInfo_pt->GAINpsds[(index+msg_idx)*2] = RxMessage[4+msg_idx]&0xFF;
-							pts.adslATUCSubcarrierInfo_pt->GAINpsds[(index+msg_idx)*2+1] = (RxMessage[4+msg_idx]>>8)&0xFF;
-							
-						}
-						*/
-						memcpy(&pts.adslATUCSubcarrierInfo_pt->GAINpsus[index],&RxMessage[4],size*2);	
-#if 0
-						int msg_idx;
-						for (msg_idx=0;msg_idx<size;msg_idx++)
-						{
-							printk("index:%d ,cmv_result: %04X\n",index+msg_idx,RxMessage[4+msg_idx]);
-						}
-#endif
-					}
-				}
-			}				
-			copy_to_user((char *)lon, (char *)pts.adslATUCSubcarrierInfo_pt, sizeof(adslATUCSubcarrierInfo));		
-			kfree(pts.adslATUCSubcarrierInfo_pt);			
-			up(&mei_sema);
-			break;
-		case GET_ADSL_LINE_INIT_STATS:			
-			copy_to_user((char *)lon, (char *)&AdslInitStatsData, sizeof(AdslInitStatsData));		
-			break;
-		
-		case GET_ADSL_POWER_SPECTRAL_DENSITY:		
-			if(down_interruptible(&mei_sema))
-                		return -ERESTARTSYS;
-			i=0;
-			pts.adslPowerSpectralDensity_pt = (adslPowerSpectralDensity *)kmalloc(sizeof(adslPowerSpectralDensity), GFP_KERNEL);
-			memset((char *)pts.adslPowerSpectralDensity_pt, 0, sizeof(adslPowerSpectralDensity));	
-
-			//US
-			NOMPSD_US_MAKECMV;
-			if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-				printk("\n\nCMV fail, Group PLAM Address 35 Index 0");
-#endif
-				i=-1;
-			}
-			else{
-				j=RxMessage[4];
-			}
-			PCB_US_MAKECMV;
-			if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-				printk("\n\nCMV fail, Group PLAM Address 35 Index 0");
-#endif
-				i=-1;
-			}
-			else{
-				temp=RxMessage[4];
-			}
-			RMSGI_US_MAKECMV;
-			if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-				printk("\n\nCMV fail, Group PLAM Address 35 Index 0");
-#endif
-				i=-1;
-			}
-			else{
-				k=(int16_t)RxMessage[4];
-			}
-			if (i==0)
-			{
-				pts.adslPowerSpectralDensity_pt->ACTPSDus = ((int )(j*256 - temp*10*256 + k*10)) /256;
-			}
-			// DS
-			i=0;
-			j=temp=temp2=0;
-			NOMPSD_DS_MAKECMV;
-			if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-				printk("\n\nCMV fail, Group PLAM Address 35 Index 0");
-#endif
-				i=-1;
-			}
-			else{
-				j=RxMessage[4];
-			}
-			PCB_DS_MAKECMV;
-			if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-				printk("\n\nCMV fail, Group PLAM Address 35 Index 0");
-#endif
-				i=-1;
-			}
-			else{
-				temp=RxMessage[4];
-			}
-			RMSGI_DS_MAKECMV;
-			if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-				printk("\n\nCMV fail, Group PLAM Address 35 Index 0");
-#endif
-				i=-1;
-			}
-			else{
-				//temp2=RxMessage[4];
-				k=(int16_t)RxMessage[4];
-			}
-			if (i==0)
-			{
-				pts.adslPowerSpectralDensity_pt->ACTPSDds = ((int )(j*256 - temp*10*256 + k*10)) /256;
-			}
-			copy_to_user((char *)lon, (char *)pts.adslPowerSpectralDensity_pt, sizeof(adslPowerSpectralDensity));	
-			kfree(pts.adslPowerSpectralDensity_pt);		
-			up(&mei_sema);
-			break;
-                case AMAZON_MEI_START:
-			showtime=0;
-			loop_diagnostics_completed = 0;
-#ifdef	ARC_READY_ACK
-#ifdef LOCK_RETRY
-			i=0;
-lock_retry:
-			if(down_trylock(&mei_sema)!=0)
-			{
-				reboot_lock = 1;
-				printk("lock fail\n");
-				i++;
-				if (i <=5)
-				{
-	        			set_current_state(TASK_INTERRUPTIBLE);
-	                		schedule_timeout(10);
-					goto lock_retry;
-				}else
-				{
-					printk("Force to Reboot ADSL!\n");
-					up(&mei_sema);
-	        			set_current_state(TASK_INTERRUPTIBLE);
-	                		schedule_timeout(1000);
-	        			sema_init(&mei_sema, 1);  // semaphore initialization, mutex
-				}
-			}else
-			{
-				reboot_lock = 1;
-			}
-#else
-			if(down_interruptible(&mei_sema))	//disable CMV access until ARC ready
-			{
-	                	return -ERESTARTSYS;
-			}
-#endif
-#endif
-                	//CLEAR_BIT((*((volatile u32 *)0xB0100B40)), 0x40); //Warning LED GPIO ON
-			if(chantype.interleave==1){
-				kfree(interleave_mei_net.priv);
-				unregister_netdev(&interleave_mei_net);
-			}
-			else if(chantype.fast==1){
-				kfree(fast_mei_net.priv);
-				unregister_netdev(&fast_mei_net);
-			}		
-			chantype.interleave=0;
-			chantype.fast=0;
-			meiMailboxInterruptsDisable(); //disable all MEI interrupts
-			if(mei_arc_swap_buff == NULL){
-			mei_arc_swap_buff = (u32 *)kmalloc(MAXSWAPSIZE*4, GFP_KERNEL);
-			if(mei_arc_swap_buff==NULL){
-#ifdef AMAZON_MEI_DEBUG_ON
-				printk("\n\n malloc fail for codeswap buff");
-#endif
-				meierr=MEI_FAILURE;
-			}
-			}
-                        if(meiForceRebootAdslModem() != MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-                                printk("\n\n meiForceRebootAdslModem()  error...");
-#endif
-                                meierr=MEI_FAILURE;
-                        }     
-			interruptible_sleep_on(&wait_queue_codeswap);
-			// reset is called
-                        break;
-		case AMAZON_MEI_MIB_DAEMON:
-#ifdef IFX_SMALL_FOOTPRINT /* [ */
-			return -1;
-#else /* ][ !IFX_SMALL_FOOTPRINT */
-			i=0;
-			while(1){
-				if(i<MIB_INTERVAL)
-					interruptible_sleep_on_timeout(&wait_queue_mibdaemon, ((MIB_INTERVAL-i)/(1000/HZ)));
-				i=0;
-				if(showtime==1){
-//					printk("\n\n update mib");
-					
-					do_gettimeofday(&time_now);
-					if(time_now.tv_sec - current_intvl->start_time.tv_sec>=900){
-						if(current_intvl->list.next!=&interval_list){
-							current_intvl = list_entry(current_intvl->list.next, amazon_mei_mib, list);
-							do_gettimeofday(&(current_intvl->start_time));
-						}
-						else{
-							mib_ptr = list_entry(interval_list.next, amazon_mei_mib, list);
-							list_del(interval_list.next);
-							memset(mib_ptr, 0, sizeof(amazon_mei_mib));
-							list_add_tail(&(mib_ptr->list), &interval_list);
-							if(current_intvl->list.next==&interval_list)
-#ifdef AMAZON_MEI_DEBUG_ON
-								printk("\n\nlink list error");
-#endif
-							current_intvl = list_entry(current_intvl->list.next, amazon_mei_mib, list);
-							do_gettimeofday(&(current_intvl->start_time));
-						}	
-					}
-					
-					if(down_interruptible(&mei_sema))
-                				return -ERESTARTSYS;
-/*						
-					ATUC_PERF_LO_FLAG_MAKECMV;
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group 7 Address 0 Index 0");
-#endif
-					}
-					else{
-						if(RxMessage[4]&PLAM_LOS_FailureBit){
-							current_intvl->AtucPerfLos++;
-							ATUC_PERF_LOSS++;
-							CurrStatus.adslAtucCurrStatus = 2;
-						}
-						if(RxMessage[4]&PLAM_LOF_FailureBit){
-							current_intvl->AtucPerfLof++;
-							ATUC_PERF_LOFS++;
-							CurrStatus.adslAtucCurrStatus = 1;
-						}
-						if(!(RxMessage[4]&(PLAM_LOS_FailureBit|PLAM_LOF_FailureBit)))
-							CurrStatus.adslAtucCurrStatus = 0;
-					}
-*/
-					ATUC_PERF_ESS_FLAG_MAKECMV;
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group 7 Address 7 Index 0");
-#endif
-					}
-					else{
-						temp = RxMessage[4]-mib_pread.ATUC_PERF_ESS;
-						if(temp>=0){
-							current_intvl->AtucPerfEs+=temp;
-							ATUC_PERF_ESS+=temp;
-							mib_pread.ATUC_PERF_ESS = RxMessage[4];
-						}
-						else{
-							current_intvl->AtucPerfEs+=0xffff-mib_pread.ATUC_PERF_ESS+RxMessage[4];
-							ATUC_PERF_ESS+=0xffff-mib_pread.ATUC_PERF_ESS+RxMessage[4];
-							mib_pread.ATUC_PERF_ESS = RxMessage[4];		
-						}
-					}
-/*		
-					ATUR_PERF_LO_FLAG_MAKECMV;
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group 7 Address 1 Index 0");
-#endif
-					}
-					else{
-						if(RxMessage[4]&PLAM_LOS_FailureBit){
-							current_intvl->AturPerfLos++;
-							ATUR_PERF_LOSS++;
-							CurrStatus.adslAturCurrStatus = 2;
-						}
-						if(RxMessage[4]&PLAM_LOF_FailureBit){
-							current_intvl->AturPerfLof++;
-							ATUR_PERF_LOFS++;
-							CurrStatus.adslAturCurrStatus = 1;
-						}
-						if(RxMessage[4]&PLAM_LPR_FailureBit){
-							current_intvl->AturPerfLpr++;
-							ATUR_PERF_LPR++;
-							CurrStatus.adslAturCurrStatus = 3;
-						}
-						if(!(RxMessage[4]&(PLAM_LOS_FailureBit|PLAM_LOF_FailureBit|PLAM_LPR_FailureBit)))
-							CurrStatus.adslAturCurrStatus = 0;	
-					}
-*/
-					ATUR_PERF_ESS_FLAG_MAKECMV;
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group 7 Address 33 Index 0");
-#endif
-					}
-					else{
-						temp = RxMessage[4]-mib_pread.ATUR_PERF_ESS;
-						if(temp>=0){
-							current_intvl->AturPerfEs+=temp;
-							ATUR_PERF_ESS+=temp;
-							mib_pread.ATUR_PERF_ESS = RxMessage[4];
-						}
-						else{
-							current_intvl->AturPerfEs+=0xffff-mib_pread.ATUR_PERF_ESS+RxMessage[4];
-							ATUR_PERF_ESS+=	0xffff-mib_pread.ATUR_PERF_ESS+RxMessage[4];
-							mib_pread.ATUR_PERF_ESS=RxMessage[4];
-						}
-					}
-					// to update rx/tx blocks
-					ATUR_CHAN_RECV_BLK_FLAG_MAKECMV_LSW;
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group 7 Address 20 Index 0");
-#endif
-					}
-					else{
-						temp = RxMessage[4];	
-					}
-					ATUR_CHAN_RECV_BLK_FLAG_MAKECMV_MSW;
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group 7 Address 21 Index 0");
-#endif
-					}
-					else{
-						temp2 = RxMessage[4];	
-					}
-					if((temp + (temp2<<16) - mib_pread.ATUR_CHAN_RECV_BLK)>=0){
-						current_intvl->AturChanPerfRxBlk+=temp + (temp2<<16) - mib_pread.ATUR_CHAN_RECV_BLK;
-						ATUR_CHAN_RECV_BLK+=temp + (temp2<<16) - mib_pread.ATUR_CHAN_RECV_BLK;
-						mib_pread.ATUR_CHAN_RECV_BLK = temp + (temp2<<16);
-						}	
-					else{
-						current_intvl->AturChanPerfRxBlk+=0xffffffff - mib_pread.ATUR_CHAN_RECV_BLK +(temp + (temp2<<16));
-						ATUR_CHAN_RECV_BLK+=0xffffffff - mib_pread.ATUR_CHAN_RECV_BLK +(temp + (temp2<<16));
-						mib_pread.ATUR_CHAN_RECV_BLK = temp + (temp2<<16);
-					}
-					current_intvl->AturChanPerfTxBlk = current_intvl->AturChanPerfRxBlk;
-					ATUR_CHAN_TX_BLK = ATUR_CHAN_RECV_BLK;
-/*					
-					ATUR_CHAN_TX_BLK_FLAG_MAKECMV_LSW;
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS)
-						printk("\n\nCMV fail, Group 7 Address 20 Index 0");
-					else{
-						if(RxMessage[4]){
-							current_intvl->AturChanPerfTxBlk+=RxMessage[4];
-							ATUR_CHAN_TX_BLK+=RxMessage[4];
-						}	
-					}
-					ATUR_CHAN_TX_BLK_FLAG_MAKECMV_MSW;
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS)
-						printk("\n\nCMV fail, Group 7 Address 21 Index 0");
-					else{
-						if(RxMessage[4]){
-							current_intvl->AturChanPerfTxBlk+=(int)((RxMessage[4])<<16);
-							ATUR_CHAN_TX_BLK+=(int)((RxMessage[4])<<16);
-						}	
-					}
-*/					
-					if(chantype.interleave == 1){
-						ATUR_CHAN_CORR_BLK_FLAG_MAKECMV_INTL;
-						if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-							printk("\n\nCMV fail, Group 7 Address 3 Index 0");
-#endif
-						}
-						else{
-							temp = RxMessage[4] - mib_pread.ATUR_CHAN_CORR_BLK_INTL;
-							if(temp>=0){
-								current_intvl->AturChanPerfCorrBlk+=temp;
-								ATUR_CHAN_CORR_BLK+=temp;
-								mib_pread.ATUR_CHAN_CORR_BLK_INTL = RxMessage[4];
-							}	
-							else{
-								current_intvl->AturChanPerfCorrBlk+=0xffff - mib_pread.ATUR_CHAN_CORR_BLK_INTL +RxMessage[4];
-								ATUR_CHAN_CORR_BLK+=0xffff - mib_pread.ATUR_CHAN_CORR_BLK_INTL +RxMessage[4];
-								mib_pread.ATUR_CHAN_CORR_BLK_INTL = RxMessage[4];	
-							}	
-						}	
-					}
-					else if(chantype.fast == 1){
-						ATUR_CHAN_CORR_BLK_FLAG_MAKECMV_FAST;
-						if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-							printk("\n\nCMV fail, Group 7 Address 3 Index 1");
-#endif
-						}
-						else{
-							temp = RxMessage[4] - mib_pread.ATUR_CHAN_CORR_BLK_FAST;
-							if(temp>=0){
-								current_intvl->AturChanPerfCorrBlk+=temp;
-								ATUR_CHAN_CORR_BLK+=temp;
-								mib_pread.ATUR_CHAN_CORR_BLK_FAST = RxMessage[4];
-							}	
-							else{
-								current_intvl->AturChanPerfCorrBlk+=0xffff - mib_pread.ATUR_CHAN_CORR_BLK_FAST + RxMessage[4];
-								ATUR_CHAN_CORR_BLK+=0xffff - mib_pread.ATUR_CHAN_CORR_BLK_FAST + RxMessage[4];
-								mib_pread.ATUR_CHAN_CORR_BLK_FAST = RxMessage[4];
-							}	
-						}		
-					}
-					
-					if(chantype.interleave == 1){
-						ATUR_CHAN_UNCORR_BLK_FLAG_MAKECMV_INTL;
-						if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-							printk("\n\nCMV fail, Group 7 Address 2 Index 0");
-#endif
-						}
-						else{
-							temp = RxMessage[4] - mib_pread.ATUR_CHAN_UNCORR_BLK_INTL;
-							if(temp>=0){
-								current_intvl->AturChanPerfUncorrBlk+=temp;
-								ATUR_CHAN_UNCORR_BLK+=temp;
-								mib_pread.ATUR_CHAN_UNCORR_BLK_INTL = RxMessage[4];
-							}
-							else{
-								current_intvl->AturChanPerfUncorrBlk+=0xffff - mib_pread.ATUR_CHAN_UNCORR_BLK_INTL + RxMessage[4];
-								ATUR_CHAN_UNCORR_BLK+=0xffff - mib_pread.ATUR_CHAN_UNCORR_BLK_INTL + RxMessage[4];
-								mib_pread.ATUR_CHAN_UNCORR_BLK_INTL = RxMessage[4];
-							}
-						}		
-					}
-					else if(chantype.fast == 1){
-						ATUR_CHAN_UNCORR_BLK_FLAG_MAKECMV_FAST;
-						if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-							printk("\n\nCMV fail, Group 7 Address 2 Index 1");
-#endif
-						}
-						else{
-							temp = RxMessage[4] - mib_pread.ATUR_CHAN_UNCORR_BLK_FAST;
-							if(temp>=0){
-								current_intvl->AturChanPerfUncorrBlk+=temp;
-								ATUR_CHAN_UNCORR_BLK+=temp;
-								mib_pread.ATUR_CHAN_UNCORR_BLK_FAST = RxMessage[4];
-							}
-							else{
-								current_intvl->AturChanPerfUncorrBlk+=0xffff - mib_pread.ATUR_CHAN_UNCORR_BLK_FAST + RxMessage[4];
-								ATUR_CHAN_UNCORR_BLK+=0xffff - mib_pread.ATUR_CHAN_UNCORR_BLK_FAST + RxMessage[4];
-								mib_pread.ATUR_CHAN_UNCORR_BLK_FAST = RxMessage[4];
-							}
-						}		
-					}
-					
-					//RFC-3440
-
-#ifdef AMAZON_MEI_MIB_RFC3440
-					ATUC_PERF_STAT_FASTR_FLAG_MAKECMV; //???
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group 0 Address 0 Index 0");
-#endif
-					}
-					else{
-						temp = RxMessage[4] - mib_pread.ATUC_PERF_STAT_FASTR;
-						if(temp>=0){
-							current_intvl->AtucPerfStatFastR+=temp;
-							ATUC_PERF_STAT_FASTR+=temp;
-							mib_pread.ATUC_PERF_STAT_FASTR = RxMessage[4];
-						}
-						else{
-							current_intvl->AtucPerfStatFastR+=0xffff - mib_pread.ATUC_PERF_STAT_FASTR + RxMessage[4];
-							ATUC_PERF_STAT_FASTR+=0xffff - mib_pread.ATUC_PERF_STAT_FASTR + RxMessage[4];
-							mib_pread.ATUC_PERF_STAT_FASTR = RxMessage[4];
-						}
-					}
-					ATUC_PERF_STAT_FAILED_FASTR_FLAG_MAKECMV; //???
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group 0 Address 0 Index 0");
-#endif
-					}
-					else{
-						temp = RxMessage[4] - mib_pread.ATUC_PERF_STAT_FAILED_FASTR;
-						if(temp>=0){
-							current_intvl->AtucPerfStatFailedFastR+=temp;
-							ATUC_PERF_STAT_FAILED_FASTR+=temp;
-							mib_pread.ATUC_PERF_STAT_FAILED_FASTR = RxMessage[4];
-						}
-						else{
-							current_intvl->AtucPerfStatFailedFastR+=0xffff - mib_pread.ATUC_PERF_STAT_FAILED_FASTR + RxMessage[4];
-							ATUC_PERF_STAT_FAILED_FASTR+=0xffff - mib_pread.ATUC_PERF_STAT_FAILED_FASTR + RxMessage[4];
-							mib_pread.ATUC_PERF_STAT_FAILED_FASTR = RxMessage[4];
-						}
-					}
-					ATUC_PERF_STAT_SESL_FLAG_MAKECMV;
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group 7 Address 8 Index 0");
-#endif
-					}
-					else{
-						temp = RxMessage[4] - mib_pread.ATUC_PERF_STAT_SESL;
-						if(temp>=0){
-							current_intvl->AtucPerfStatSesL+=temp;
-							ATUC_PERF_STAT_SESL+=temp;
-							mib_pread.ATUC_PERF_STAT_SESL = RxMessage[4];
-						}
-						else{
-							current_intvl->AtucPerfStatSesL+=0xffff - mib_pread.ATUC_PERF_STAT_SESL + RxMessage[4];
-							ATUC_PERF_STAT_SESL+=0xffff - mib_pread.ATUC_PERF_STAT_SESL + RxMessage[4];
-							mib_pread.ATUC_PERF_STAT_SESL = RxMessage[4];
-						}
-					}
-					ATUC_PERF_STAT_UASL_FLAG_MAKECMV;
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group 7 Address 10 Index 0");
-#endif
-					}
-					else{
-						temp = RxMessage[4] - mib_pread.ATUC_PERF_STAT_UASL;
-						if(temp>=0){
-							current_intvl->AtucPerfStatUasL+=temp;
-							ATUC_PERF_STAT_UASL+=temp;
-							mib_pread.ATUC_PERF_STAT_UASL = RxMessage[4];
-						}
-						else{
-							current_intvl->AtucPerfStatUasL+=0xffff - mib_pread.ATUC_PERF_STAT_UASL + RxMessage[4];
-							ATUC_PERF_STAT_UASL+=0xffff - mib_pread.ATUC_PERF_STAT_UASL + RxMessage[4];
-							mib_pread.ATUC_PERF_STAT_UASL = RxMessage[4];
-						}
-					}
-					ATUR_PERF_STAT_SESL_FLAG_MAKECMV;
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group 7 Address 34 Index 0");
-#endif
-					}
-					else{
-						temp = RxMessage[4] - mib_pread.ATUR_PERF_STAT_SESL;
-						if(temp>=0){
-							current_intvl->AtucPerfStatUasL+=temp;
-							ATUC_PERF_STAT_UASL+=temp;
-							mib_pread.ATUR_PERF_STAT_SESL = RxMessage[4];
-						}
-						else{
-							current_intvl->AtucPerfStatUasL+=0xffff - mib_pread.ATUR_PERF_STAT_SESL + RxMessage[4];
-							ATUC_PERF_STAT_UASL+=0xffff - mib_pread.ATUR_PERF_STAT_SESL + RxMessage[4];
-							mib_pread.ATUR_PERF_STAT_SESL = RxMessage[4];
-						}
-					}
-					
-#endif
-					up(&mei_sema);
-					
-					do_gettimeofday(&time_fini);
-					i = ((int)((time_fini.tv_sec-time_now.tv_sec)*1000)) + ((int)((time_fini.tv_usec-time_now.tv_usec)/1000))  ; //msec 
-				}//showtime==1
-			}	 
-			break;
-#endif /* ] !IFX_SMALL_FOOTPRINT */
-		case AMAZON_MEI_RESET:			
-		case AMAZON_MEI_REBOOT:
-		case AMAZON_MEI_SHOWTIME:
-/*			if(mei_arc_swap_buff !=NULL){
-				kfree(mei_arc_swap_buff);
-				mei_arc_swap_buff=NULL;
-			}	
-			if(image_buffer !=NULL){
-//				kfree(image_buffer);
-				vfree(image_buffer);
-				image_buffer =NULL;
-			}
-*/
-			if(clreoc_command_pkt !=NULL){
-				kfree(clreoc_command_pkt);
-				clreoc_command_pkt =NULL;
-			}
-			for(i=0;i<CLREOC_BUFF_SIZE;i++)
-				clreoc_pkt[i].len=0;	//flush all remaining clreoc commands in buffer
-/*
-			memset(mei_mib, 0, (sizeof(amazon_mei_mib)*INTERVAL_NUM));
-			INIT_LIST_HEAD(&interval_list);
-			for(i=0;i<INTERVAL_NUM;i++)
-				list_add_tail(&(mei_mib[i].list), &interval_list); 
-			current_intvl = list_entry(interval_list.next, amazon_mei_mib, list);
-			do_gettimeofday(&(current_intvl->start_time));
-			ATUC_PERF_LOFS=0;
-			ATUC_PERF_LOSS=0;
-			ATUC_PERF_ESS=0;
-	 		ATUC_PERF_INITS=0;
- 			ATUR_PERF_LOFS=0;
-	 		ATUR_PERF_LOSS=0;
-	 		ATUR_PERF_LPR=0;
-	 		ATUR_PERF_ESS=0;
-	 		ATUR_CHAN_RECV_BLK=0;
-	 		ATUR_CHAN_TX_BLK=0;
-	 		ATUR_CHAN_CORR_BLK=0;
-	 		ATUR_CHAN_UNCORR_BLK=0;
-			memset((((u8 *)&AlarmConfProfile)+32), 0, 16*4);
-			AlarmConfProfile.adslLineAlarmConfProfileRowStatus=1;
-*/
-			PrevTxRate.adslAtucChanPrevTxRate=0;
-			PrevTxRate.adslAturChanPrevTxRate=0;
-			CurrStatus.adslAtucCurrStatus=0;
-			CurrStatus.adslAturCurrStatus=0;
-			
-			if((command==AMAZON_MEI_RESET) || (command==AMAZON_MEI_REBOOT)){
-#ifdef	AMAZON_CHECK_LINK
-				if (adsl_link_notify){
-					(*adsl_link_notify)(0);
-				}
-#endif
-				showtime=0;
-				//CLEAR_BIT((*((volatile u32 *)0xB0100B40)), 0x40); //Warning LED GPIO ON
-				// disconnect net_dev
-				if(chantype.interleave==1){
-					kfree(interleave_mei_net.priv);
-					unregister_netdev(&interleave_mei_net);
-//        				if(unregister_netdev(&interleave_mei_net)!=0)
-//						printk("\n unregister interleave fail");
-				}
-				else if(chantype.fast==1){
-					kfree(fast_mei_net.priv);
-					unregister_netdev(&fast_mei_net);
-//       				if(unregister_netdev(&fast_mei_net)!=0)
-//						printk("\n unregister fast fail");
-				}
-				chantype.interleave=0;
-				chantype.fast=0;
-// 603221:tc.chen start
-				chantype.bearchannel0 = 0;
-				chantype.bearchannel1 = 0;
-				adsl_mode = 0;
-// 603221:tc.chen end
-				
-				while(1){
-					
-					makeCMV(H2D_CMV_READ, STAT, 0, 0, 1, NULL); //maximum allowed tx message length, in bytes
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-						//printk("AdslInitStatsData.FullInitializationCount++\n");
-						AdslInitStatsData.FullInitializationCount++;
-						//printk("AdslInitStatsData.FailedFullInitializationCount++\n");
-						AdslInitStatsData.FailedFullInitializationCount++;
-						//printk("AdslInitStatsData.LINIT_Errors++\n");
-						AdslInitStatsData.LINIT_Errors++;
-					}else
-					{
-						//printk("RxMessage=%X\n",RxMessage[4]);
-						if ( RxMessage[4]!=0x1)
-						{
-							//printk("AdslInitStatsData.FullInitializationCount++\n");
-							AdslInitStatsData.FullInitializationCount++;	
-							if ( RxMessage[4] != 0x7)
-							{
-								//printk("AdslInitStatsData.LINIT_Errors++\n");
-								AdslInitStatsData.LINIT_Errors++;
-								//printk("AdslInitStatsData.FailedFullInitializationCount++\n");
-								AdslInitStatsData.FailedFullInitializationCount++;
-								
-							}			
-						}
-					}
-
-					reboot_flag=0;
-					wake_up_interruptible(&wait_queue_codeswap); //wake up codeswap daemon				
-
-					interruptible_sleep_on_timeout(&wait_queue_reboot, 1*HZ);  // sleep until arc ready
-#ifdef	ARC_READY_ACK
-					if(reboot_flag!=0)
-						break;
-					else
-					{
-						up(&mei_sema);
-						printk("\n reboot retry");
-					}
-#else
-					break;
-#endif
-				}
-			}
-			else{ //AMAZON_MEI_SHOWTIME 
-				if(down_interruptible(&mei_sema))
-                			return -ERESTARTSYS;
-				
-				// clreoc stuff
-				makeCMV(H2D_CMV_READ, INFO, 83, 0, 1, data); //maximum allowed tx message length, in bytes
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 3 Address 83 Index 0");
-#endif
-				}
-				else{
-					clreoc_max_tx_len = (int)RxMessage[4];
-					clreoc_command_pkt = kmalloc((clreoc_max_tx_len*CLREOC_BUFF_SIZE), GFP_KERNEL);
-					if(clreoc_command_pkt == NULL){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("kmalloc error for clreoc_command_pkt\n\n");
-#endif
-						up(&mei_sema);
-						return -1;
-					}
-					for(i=0;i<CLREOC_BUFF_SIZE;i++){
-						clreoc_pkt[i].command = (u8 *)(((u8 *)clreoc_command_pkt) + (clreoc_max_tx_len*i));
-						clreoc_pkt[i].len=0;
-					}	
-				}
-				
-				// decide what channel, then register	
-				makeCMV(H2D_CMV_READ, STAT, 12, 0, 1, data); 
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 2 Address 12 Index 0");
-#endif
-				}
-				else{
-					if((RxMessage[4]&0x1)==1){	
-						if(register_netdev(&interleave_mei_net)!=0){
-#ifdef AMAZON_MEI_DEBUG_ON
-                					printk("\n\n Register interleave Device Failed.");
-#endif
-        					}
-						else{
-							chantype.interleave = 1;
-							chantype.fast= 0;
-#ifdef AMAZON_MEI_DEBUG_ON
-							printk("\n channel is interleave");
-#endif
-						}	
-					}
-					else if((RxMessage[4]&0x2)==2){	
-						if(register_netdev(&fast_mei_net)!=0){
-#ifdef AMAZON_MEI_DEBUG_ON
-                					printk("\n\n Register fast Device Failed.");
-#endif
-        					}
-						else{
-							chantype.fast = 1;
-							chantype.interleave = 0;
-#ifdef AMAZON_MEI_DEBUG_ON
-							printk("\n channel is fast");
-#endif
-						}
-					}
-					else{
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\nunknown channel type, 0x%8x", RxMessage[4]);
-#endif
-					}	
-// 603221:tc.chen start	
-					if ( (RxMessage[4]&0x100) == 0x100)
-					{
-						chantype.bearchannel0 = 1;
-					}else 	if ( (RxMessage[4]&0x100) == 0x200)
-					{
-						chantype.bearchannel1 = 1;
-					}
-// 603221:tc.chen end
-				}
-// 603221:tc.chen start			
-				// read adsl mode
-				makeCMV(H2D_CMV_READ, STAT, 1, 0, 1, data); 
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group STAT Address 1 Index 0");
-#endif
-				}
-				adsl_mode = RxMessage[4];
-// 603221:tc.chen end
-				makeCMV(H2D_CMV_READ, STAT, 17, 0, 1, data); 
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group STAT Address 1 Index 0");
-#endif
-				}
-				adsl_mode_extend = RxMessage[4];
-				
-				// update previous channel tx rate
-				ATUC_CHAN_CURR_TX_RATE_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 6 Address 1 Index 0");
-#endif
-					PrevTxRate.adslAtucChanPrevTxRate = 0;	
-				}
-				else{
-					PrevTxRate.adslAtucChanPrevTxRate = (u32)(RxMessage[4]) + (((u32)(RxMessage[5]))<<16);
-				}
-				ATUR_CHAN_CURR_TX_RATE_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 6 Address 0 Index 0");
-#endif
-					PrevTxRate.adslAturChanPrevTxRate = 0;	
-				}
-				else{
-					PrevTxRate.adslAturChanPrevTxRate = (u32)(RxMessage[4]) + (((u32)(RxMessage[5]))<<16);
-				}
-				
-//				up(&mei_sema);
-				
-//				showtime=1;
-				//SET_BIT((*((volatile u32 *)0xB0100B40)), 0x40); //Warning LED GPIO OFF
-//dying gasp -start	
-#ifdef IFX_DYING_GASP			
-				lop_debugwr.buffer[0]=0xffffffff;		//dying gasp
-				lop_debugwr.iCount=1;				//dying gasp
-				makeCMV(H2D_CMV_READ, INFO, 66, 4, 1, NULL);
-				//mei_ioctl((struct inode *)0,NULL, AMAZON_MEI_CMV_WINHOST, &RxMessage);	
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 3 Address 66 Index 4");
-				}
-#endif
-				lop_debugwr.iAddress=(u32)RxMessage[4];
-				makeCMV(H2D_CMV_READ, INFO, 66, 5, 1, NULL);
-				//mei_ioctl((struct inode *)0,NULL, AMAZON_MEI_CMV_WINHOST, &RxMessage);			
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 3 Address 66 Index 5");
-				}
-#endif
-				lop_debugwr.iAddress+=((u32)RxMessage[4])<<16;
-				
-//dying gasp -end				
-#endif	// IFX_DYING_GASP			
-
-//joelin 04/16/2005-start
-				makeCMV(H2D_CMV_WRITE, PLAM, 10, 0, 1, &unavailable_seconds);
-				//mei_ioctl((struct inode *)0,NULL, AMAZON_MEI_CMV_WINHOST, &RxMessage);			
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 7 Address 10 Index 0");
-				
-#endif
-				}
-				
-
-//joelin 04/16/2005-end		
-				showtime=1;
-				up(&mei_sema);
-#ifdef	AMAZON_CHECK_LINK
-				if (adsl_link_notify){
-					(*adsl_link_notify)(1);
-				}
-#endif
-				
-				
-			}
-			break;
-/*
-                case AMAZON_MEI_REPLY:
-                        copy_from_user((char *)buff, (char *)lon, MSG_LENGTH * 2);
-                        if(meiCMV(buff, YES_REPLY) != MEI_SUCCESS){
-                                printk("\n\n meiCMV no reply back");
-                                meierr=MEI_FAILURE;
-                        }
-                        else
-                                copy_to_user((char *)lon, (char *)RxMessage, MSG_LENGTH * 2);
-                        break;
-                case AMAZON_MEI_NOREPLY:
-                        copy_from_user((char *)buff, (char *)lon, MSG_LENGTH * 2);
-                        if(meiCMV(buff, NO_REPLY) != MEI_SUCCESS){
-                                printk("\n\n meiCMV Host to DSP failed");
-                                meierr=MEI_FAILURE;
-                        }  
-                        break;
-*/
-		
-		case AMAZON_MEI_HALT:
-			meiHaltArc();
-			break;
-		case AMAZON_MEI_CMV_WINHOST:
-			if(down_interruptible(&mei_sema))
-                		return -ERESTARTSYS;
-
-			if (!from_kernel )	
-				copy_from_user((char *)TxMessage, (char *)lon, MSG_LENGTH*2);//joelin
-			else
-				memcpy(TxMessage,(char *)lon,MSG_LENGTH*2);
-				
-#if 0			
-//			if((TxMessage[0]&0xff0)==0x0a0){
-				for(i=0;i<16;i++){
-					printk("\nTxMessage[%i]=%8x", i, TxMessage[i]);
-				}
-//			}			
-#endif			
-			
-			if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-//				printk("\n\n WINHOST CMV fail ");
-                                printk("\n\nWINHOST CMV fail :TxMessage:%X %X %X %X, RxMessage:%X %X %X %X %X\n",TxMessage[0],TxMessage[1],TxMessage[2],TxMessage[3],RxMessage[0],RxMessage[1],RxMessage[2],RxMessage[3],RxMessage[4]);
-#endif
-				meierr = MEI_FAILURE;	
-			}
-			else 
-			{
-				if (!from_kernel )	//joelin
-				copy_to_user((char *)lon, (char *)RxMessage, MSG_LENGTH*2);
-				else
-					memcpy((char *)lon,(char *)RxMessage,MSG_LENGTH*2);
-			}
-				
-			up(&mei_sema);	
-			break;
-#ifdef AMAZON_MEI_CMV_EXTRA
-		case AMAZON_MEI_CMV_READ:
-			copy_from_user((char *)(&regrdwr), (char *)lon, sizeof(meireg));
-			meiLongwordRead(regrdwr.iAddress, &(regrdwr.iData));
-			{
-//				printk("\n\n iAddress = %8x",regrdwr.iAddress);
-			}
-			copy_to_user((char *)lon, (char *)(&regrdwr), sizeof(meireg));
-			{
-//				printk("\n\n iData readback = %8x", regrdwr.iData);
-			}
-			break;
-#endif
-
-#ifdef AMAZON_MEI_CMV_EXTRA
-		case AMAZON_MEI_CMV_WRITE:
-			copy_from_user((char *)(&regrdwr), (char *)lon, sizeof(meireg));
-			{
-//				printk("\n\n iAddress = %8x",regrdwr.iAddress);
-//				printk("\n\n iData = %8x",regrdwr.iData);
-			}
-			meiLongwordWrite(regrdwr.iAddress, regrdwr.iData);
-			break;
-#endif
-
-#ifdef AMAZON_MEI_CMV_EXTRA
-		case AMAZON_MEI_REMOTE:
-			copy_from_user((char *)(&i), (char *)lon, sizeof(int));
-			if(i==0){
-				meiMailboxInterruptsEnable();
-					
-				up(&mei_sema);
-			}
-			else if(i==1){
-				meiMailboxInterruptsDisable();
-				if(down_interruptible(&mei_sema))
-                			return -ERESTARTSYS;
-			}
-			else{
-#ifdef AMAZON_MEI_DEBUG_ON
-				printk("\n\n AMAZON_MEI_REMOTE argument error");
-#endif
-				meierr=MEI_FAILURE;
-			}		
-			break;
-#endif
-
-#ifdef AMAZON_MEI_CMV_EXTRA
-		case AMAZON_MEI_READDEBUG:
-		case AMAZON_MEI_WRITEDEBUG:
-			if(down_interruptible(&mei_sema))
-                		return -ERESTARTSYS;
-#ifdef IFX_DYING_GASP			
-	if (!from_kernel) copy_from_user((char *)(&debugrdwr), (char *)lon, sizeof(debugrdwr));//dying gasp
-				else memcpy((char *)(&debugrdwr), (char *)lon,  sizeof(debugrdwr));
-#else //IFX_DYING_GASP	
-			copy_from_user((char *)(&debugrdwr), (char *)lon, sizeof(debugrdwr));
-
-#endif //IFX_DYING_GASP							
-#if 0
-			printk("\nIN iAddress: %8x, iCount:%8x\n", debugrdwr.iAddress, debugrdwr.iCount);
-#endif
-			
-			if(command==AMAZON_MEI_READDEBUG)
-				meiDebugRead(debugrdwr.iAddress, debugrdwr.buffer, debugrdwr.iCount);
-			else
-				meiDebugWrite(debugrdwr.iAddress, debugrdwr.buffer, debugrdwr.iCount);	
-				
-#ifdef IFX_DYING_GASP				
-			if (!from_kernel) copy_to_user((char *)lon, (char*)(&debugrdwr), sizeof(debugrdwr));//dying gasp
-#else //IFX_DYING_GASP	
-			copy_to_user((char *)lon, (char*)(&debugrdwr), sizeof(debugrdwr));
-#endif //IFX_DYING_GASP	
-			up(&mei_sema);
-			
-#if 0
-			printk("\nOUT iAddress: %8x, iCount:%8x\n", debugrdwr.iAddress, debugrdwr.iCount);
-			for(i=0;i<debugrdwr.iCount;i++)
-				printk("\n %8x",debugrdwr.buffer[i]);
-#endif
-			break;
-#endif
-
-		case AMAZON_MEI_LOP:	
-		//GPIO31 :dying gasp event indication
-		//	(1) logic high: dying gasp event is false (default)
-		//	(2) logic low: dying gasp event is true
-#ifdef IFX_DYING_GASP
-			break;
-#else					
-			CLEAR_BIT((*((volatile u32 *)0xB0100B48)), 0x8000);
-			CLEAR_BIT((*((volatile u32 *)0xB0100B4C)), 0x8000);
-			CLEAR_BIT((*((volatile u32 *)0xB0100B50)), 0x8000);
-			SET_BIT((*((volatile u32 *)0xB0100B54)), 0x8000);
-			asm("SYNC");
-			if(((*((volatile u32 *)0xB0100B44))&0x8000)==0x0)
-				meierr=MEI_FAILURE; //return - to indicate loss of power
-			break;
-#endif //#ifdef IFX_DYING_GASP			
-			
-					//for PCM
-		case AMAZON_MEI_PCM_SETUP:
-			//gpio
-			
-			*AMAZON_GPIO_P0_DIR |=1<<15;
-    			*AMAZON_GPIO_P0_ALTSEL0 |=1<<15;
-    			*AMAZON_GPIO_P0_ALTSEL1 &=~(1<<15);
-    			*AMAZON_GPIO_P0_OD |=1<<15;
-                                                                                
-    			/*GPIO 16 TDM_DI*/
-    			*AMAZON_GPIO_P1_DIR &=~1;
-    			*AMAZON_GPIO_P1_ALTSEL0 |=1;
-    			*AMAZON_GPIO_P1_ALTSEL1 &=~1;
-                                                                                
-    			/*GPIO 17 TDM_DCL */
-    			*AMAZON_GPIO_P1_DIR|=0x02;
-    			*AMAZON_GPIO_P1_ALTSEL0|=0x02;
-    			*AMAZON_GPIO_P1_ALTSEL1 &=(u32)~0x02;
-    			*AMAZON_GPIO_P1_OD|=0x02;
-                                                                                
-    			/*GPIO 18 TDM FSC*/
-    			*AMAZON_GPIO_P1_DIR|=0x04;
-    			*AMAZON_GPIO_P1_ALTSEL0|=0x04;
-    			*AMAZON_GPIO_P1_ALTSEL1 &=(u32)~0x04;
-    			*AMAZON_GPIO_P1_OD|=0x04;
-			
-			for(i=0;i<2;i++){
-				for(j=0;j<256;j++)
-					sampledata[i*256+j]=j;
-			}
-			
-			pcm_start_addr = lon;
-			
-			printk("\n\n pcm_start_addr is %8x", lon);
-			
-			for(i=0;i<PCM_CHANNEL_NUM;i++){
-#ifdef	PCM_ACCESS_DEBUG
-				meiDebugRead_16((pcm_start_addr+i*16), (u32*)(pcm_data+i), 4);
-#else
-				meiDMARead_16((pcm_start_addr+i*16), (u32*)(pcm_data+i), 4);
-#endif
-				if((pcm_data[i].S!=8)||(pcm_data[i].len<1)||(pcm_data[i].rdindex!=0)||(pcm_data[i].wrindex!=0)||(pcm_data[i].flow!=0))
-					printk("\n\n pcm_data fill in wrongly\n\n");
-				printk("\npcm_data %d",i);
-				printk("\n S = %d", pcm_data[i].S);
-				printk("\n LSW = %4x", pcm_data[i].LSW);
-				printk("\n MSW = %4x", pcm_data[i].MSW);
-				printk("\n len = %d", pcm_data[i].len);
-				printk("\n rdindex = %d", pcm_data[i].rdindex);
-				printk("\n wrindex = %d", pcm_data[i].wrindex);	
-				printk("\n flow = %d", pcm_data[i].flow);				
-				pcm_data[i].finish=0;	
-				if(i%2==0){//tx channel
-					for(j=0;j<PCM_BUFF_SIZE/256;j++){
-						for(k=0;k<256;k++){
-							pcm_data[i].buff[j*256+k]=k;
-						/*	if(k%2==0)
-								pcm_data[i].buff[j*256+k]=0xaa;
-							else
-								pcm_data[i].buff[j*256+k]=0x55;*/
-						}
-					}
-#ifdef	PCM_ACCESS_DEBUG
-					meiDebugWrite_8((((u32)(pcm_data[i].LSW))+(((u32)(pcm_data[i].MSW))<<16)), (u32*)(pcm_data[i].buff),((pcm_data[i].len/4)/2));//fill half first
-//					meiDebugWrite_8((((u32)(pcm_data[i].LSW))+(((u32)(pcm_data[i].MSW))<<16)), (u32*)(pcm_data[i].buff),2);//fill half first
-#else
-					meiDMAWrite_8((((u32)(pcm_data[i].LSW))+(((u32)(pcm_data[i].MSW))<<16)), (u32*)(pcm_data[i].buff),((pcm_data[i].len/4)/2));//fill half first
-//					meiDMAWrite_8((((u32)(pcm_data[i].LSW))+(((u32)(pcm_data[i].MSW))<<16)), (u32*)(pcm_data[i].buff),2);//fill half first
-#endif
-					pcm_data[i].point=(pcm_data[i].len)/2;
-//					pcm_data[i].point=8;
-#ifdef	PCM_ACCESS_DEBUG
-					meiDebugRead_16(pcm_start_addr+i*16+12, &temp, 1);
-#else
-					meiDMARead_16(pcm_start_addr+i*16+12, &temp, 1);
-#endif
-					temp = (temp &0xffff) + (((u32)(pcm_data[i].point))<<16);
-#ifdef	PCM_ACCESS_DEBUG
-					meiDebugWrite_16(pcm_start_addr+i*16+12,&temp, 1);//update wrindex
-#else
-					meiDMAWrite_16(pcm_start_addr+i*16+12,&temp, 1);//update wrindex
-#endif
-				}
-				else{// rx channel
-					pcm_data[i].point=0;
-				}
-			}
-			break;
-		case AMAZON_MEI_PCM_START_TIMER:
-				/* GPTU timer 6 */
-			/* enable the timer in the PMU */
-        		*(AMAZON_PMU_PWDCR) = (*(AMAZON_PMU_PWDCR))| AMAZON_PMU_PWDCR_GPT|AMAZON_PMU_PWDCR_FPI;
-			/* setup the GPTU for timer tick  f_fpi == f_gptu*/
-			*(AMAZON_GPTU_CLC) = 0x100;
-			//reload value = fpi/(HZ * P), timer mode, Prescaler = 4 ( T6I = 000, T6BPS2 = 0)
-			*(AMAZON_GPTU_CAPREL) = (int)(117500000/(lon*4));	
-			*(AMAZON_GPTU_T6CON) = 0x80C0;
-			
-			if (request_irq(AMAZON_TIMER6_INT, amazon_timer6_interrupt_MEI,0, "hrt", NULL)!=0){
-#ifdef AMAZON_MEI_DEBUG_ON
-                		printk("\n\n unable to register irq for hrt!!!");
-#endif
-                		return -1;
-        		}
-			enable_irq(AMAZON_TIMER6_INT);
-			break;
-		case AMAZON_MEI_PCM_STOP_TIMER:
-			disable_irq(AMAZON_TIMER6_INT);
-			free_irq(AMAZON_TIMER6_INT, NULL);
-			break;
-		case AMAZON_MEI_PCM_CHECK:
-			for(i=0;i<PCM_CHANNEL_NUM;i++){
-				if(pcm_data[i].finish!=1)
-					return 0;	
-			}
-			for(i=0;i<PCM_CHANNEL_NUM/2;i++){
-				j=0;
-				while(1){
-					if((pcm_data[i*2+1].buff[j]==0x0) && (pcm_data[i*2+1].buff[j+1]==0x1)&& (pcm_data[i*2+1].buff[j+2]==0x2))
-						break;
-					else
-						j++;
-				}
-				printk("\n j=%d", j);
-				temp=0;
-				for(k=0;k<((PCM_BUFF_SIZE-j)/4);k++){
-					if(memcmp(pcm_data[i*2].buff+k*4, pcm_data[i*2+1].buff+j+k*4, 4)!=0){
-						temp++;
-						printk("\n\n%2x %2x %2x %2x %2x %2x %2x %2x\n\n", *((u8*)(pcm_data[i*2].buff+k*4)), *((u8*)(pcm_data[i*2].buff+k*4+1)),*((u8*)(pcm_data[i*2].buff+k*4+2)),*((u8*)(pcm_data[i*2].buff+k*4+3)),*((u8*)(pcm_data[i*2+1].buff+j+k*4)),*((u8*)(pcm_data[i*2+1].buff+j+k*4+1)),*((u8*)(pcm_data[i*2+1].buff+j+k*4+2)),*((u8*)(pcm_data[i*2+1].buff+j+k*4+3)));
-						break;
-					}
-				}
-				if(temp!=0)
-					printk("\n\n Channel pair %d not match: err32 %d\n\n", i, temp);
-				else
-					printk("\n\n Channel pair %d match\n\n", i);
-			}
-			for(i=0;i<PCM_CHANNEL_NUM;i++){
-				if(i%2==1){//rx channel
-#ifdef	PCM_ACCESS_DEBUG
-					meiDebugRead_16(pcm_start_addr+i*16+12, &temp, 1);
-#else
-					meiDMARead_16(pcm_start_addr+i*16+12, &temp, 1);
-#endif
-					printk("\n\nRx channel %d: Overflow Bytes %d", i, (temp&0xffff));	
-				}
-				else{//tx channel
-#ifdef	PCM_ACCESS_DEBUG
-					meiDebugRead_16(pcm_start_addr+i*16, &temp, 1);
-#else
-					meiDMARead_16(pcm_start_addr+i*16, &temp, 1);
-#endif
-					printk("\n\nElectra Err: %d",(temp&0xffff));		
-				}
-			}
-			//check electra overflow
-			
-			meierr=1;
-			break;
-		case AMAZON_MEI_PCM_GETDATA:
-			copy_to_user(lon, pcm_data[1].buff, PCM_BUFF_SIZE);
-			break;
-		case AMAZON_MEI_PCM_GPIO:
-			//gpio
-			
-			*AMAZON_GPIO_P0_DIR |=1<<15;
-    			*AMAZON_GPIO_P0_ALTSEL0 |=1<<15;
-    			*AMAZON_GPIO_P0_ALTSEL1 &=~(1<<15);
-    			*AMAZON_GPIO_P0_OD |=1<<15;
-                                                                                
-    			/*GPIO 16 TDM_DI*/
-    			*AMAZON_GPIO_P1_DIR &=~1;
-    			*AMAZON_GPIO_P1_ALTSEL0 |=1;
-    			*AMAZON_GPIO_P1_ALTSEL1 &=~1;
-                                                                                
-    			/*GPIO 17 TDM_DCL */
-    			*AMAZON_GPIO_P1_DIR|=0x02;
-    			*AMAZON_GPIO_P1_ALTSEL0|=0x02;
-    			*AMAZON_GPIO_P1_ALTSEL1 &=(u32)~0x02;
-    			*AMAZON_GPIO_P1_OD|=0x02;
-                                                                                
-    			/*GPIO 18 TDM FSC*/
-    			*AMAZON_GPIO_P1_DIR|=0x04;
-    			*AMAZON_GPIO_P1_ALTSEL0|=0x04;
-    			*AMAZON_GPIO_P1_ALTSEL1 &=(u32)~0x04;
-    			*AMAZON_GPIO_P1_OD|=0x04;	
-			break;
-			
-			
-			
-				//for clearEoC
-#ifdef AMAZON_CLEAR_EOC
-		case AMAZON_MEI_GET_EOC_LEN:
-			while(1){
-				current_clreoc = list_entry(clreoc_list.next, amazon_clreoc_pkt, list);
-				if((current_clreoc->len)>0){
-					copy_to_user((char *)lon, (char*)(&(current_clreoc->len)), 4);
-					break;	
-				}
-				else//wait for eoc data from higher layer
-					interruptible_sleep_on(&wait_queue_clreoc);	
-			}
-			break;
-		case AMAZON_MEI_GET_EOC_DATA:
-			current_clreoc = list_entry(clreoc_list.next, amazon_clreoc_pkt, list);
-			if((current_clreoc->len)>0){
-				copy_to_user((char*)lon, (char*)(current_clreoc->command), current_clreoc->len);
-				meierr=1;
-				list_del(clreoc_list.next);	//remove and add to end of list
-				current_clreoc->len = 0;
-				list_add_tail(&(current_clreoc->list), &clreoc_list);
-			}
-			else
-				meierr=-1;
-			break;
-		case AMAZON_MEI_EOC_SEND:
-			copy_from_user((char *)(&debugrdwr), (char *)lon, sizeof(debugrdwr));
-			eoc_skb = dev_alloc_skb(debugrdwr.iCount*4);
-			if(eoc_skb==NULL){
-				printk("\n\nskb alloc fail");
-				break;
-			}
-			
-			eoc_skb->len=debugrdwr.iCount*4;
-			memcpy(skb_put(eoc_skb, debugrdwr.iCount*4), (char *)debugrdwr.buffer, debugrdwr.iCount*4);
-			
-			ifx_push_eoc(eoc_skb);	//pass data to higher layer
-			break;
-#endif //#ifdef AMAZON_CLEAR_EOC
-		case AMAZON_MIB_LO_ATUC:
-			do_gettimeofday(&time_now);
-			if(lon&0x1){
-				if((time_now.tv_sec-(mib_pflagtime.ATUC_PERF_LOSS_PTIME).tv_sec)>2){
-					current_intvl->AtucPerfLos++;
-					ATUC_PERF_LOSS++;
-					CurrStatus.adslAtucCurrStatus = 2;
-				}
-				(mib_pflagtime.ATUC_PERF_LOSS_PTIME).tv_sec = time_now.tv_sec;
-			}
-			if(lon&0x2){
-				if((time_now.tv_sec-(mib_pflagtime.ATUC_PERF_LOFS_PTIME).tv_sec)>2){
-					current_intvl->AtucPerfLof++;
-					ATUC_PERF_LOFS++;
-					CurrStatus.adslAtucCurrStatus = 1;
-				}
-				(mib_pflagtime.ATUC_PERF_LOFS_PTIME).tv_sec = time_now.tv_sec;
-			}
-			if(!(lon&0x3))
-				CurrStatus.adslAtucCurrStatus = 0;
-			break;
-		case AMAZON_MIB_LO_ATUR:
-			do_gettimeofday(&time_now);
-			if(lon&0x1){
-				if((time_now.tv_sec-(mib_pflagtime.ATUR_PERF_LOSS_PTIME).tv_sec)>2){
-					current_intvl->AturPerfLos++;
-					ATUR_PERF_LOSS++;
-					CurrStatus.adslAturCurrStatus = 2;
-			}
-				(mib_pflagtime.ATUR_PERF_LOSS_PTIME).tv_sec = time_now.tv_sec;
-			}
-			if(lon&0x2){
-				if((time_now.tv_sec-(mib_pflagtime.ATUR_PERF_LOFS_PTIME).tv_sec)>2){
-					current_intvl->AturPerfLof++;
-					ATUR_PERF_LOFS++;
-					CurrStatus.adslAturCurrStatus = 1;
-				}
-				(mib_pflagtime.ATUR_PERF_LOFS_PTIME).tv_sec = time_now.tv_sec;
-			}
-			if(lon&0x4){
-				if((time_now.tv_sec-(mib_pflagtime.ATUR_PERF_LPR_PTIME).tv_sec)>2){
-					current_intvl->AturPerfLpr++;
-					ATUR_PERF_LPR++;
-					CurrStatus.adslAturCurrStatus = 3;
-				}
-				(mib_pflagtime.ATUR_PERF_LPR_PTIME).tv_sec = time_now.tv_sec;
-			}
-			if(!(lon&0x7))
-				CurrStatus.adslAturCurrStatus = 0;
-			break;
-		case AMAZON_MEI_DOWNLOAD:
-			// DMA the boot code page(s)
-#ifdef AMAZON_MEI_DEBUG_ON
-			printk("\n\n start download pages");
-#endif
-			for( boot_loop = 0; boot_loop < img_hdr->count; boot_loop++){
-				if( img_hdr->page[boot_loop].p_size & BOOT_FLAG){
-					page_size = meiGetPage( boot_loop, GET_PROG, MAXSWAPSIZE, mei_arc_swap_buff, &dest_addr);
-					if( page_size > 0){
-						meiDMAWrite(dest_addr, mei_arc_swap_buff, page_size);
-					}
-				}
-				if( img_hdr->page[boot_loop].d_size & BOOT_FLAG){
-					page_size = meiGetPage( boot_loop, GET_DATA, MAXSWAPSIZE, mei_arc_swap_buff, &dest_addr);
-					if( page_size > 0){
-						meiDMAWrite( dest_addr, mei_arc_swap_buff, page_size);
-					}
-				}
-			}
-#ifdef AMAZON_MEI_DEBUG_ON
-			printk("\n\n pages downloaded");
-#endif
-			break;
-		//509221:tc.chen start
-                case AMAZON_MEI_DEBUG_MODE:
-                        mei_debug_mode = lon;
-			break;
-		//509221:tc.chen end
-        }
-        return meierr;
-}
-
-
-//////////////////////          Interrupt handler               /////////////////////////////////////////////////////
-static void mei_interrupt_arcmsgav(int,void *,struct pt_regs *);
-static void mei_interrupt_arcmsgav(int int1, void * void0, struct pt_regs * regs)
-{
-        u32 scratch;
-        u32 fetchpage;
-        u32 size;
-        u32 dest_addr;
-	u32 temp;
-	int i;
-        
-        meiDebugRead(ARC_MEI_MAILBOXR, &scratch, 1);
-        if(scratch & OMB_CODESWAP_MESSAGE_MSG_TYPE_MASK)
-        {
-		if(showtime==1){
-#ifdef AMAZON_MEI_DEBUG_ON
-			printk("\n\n Code Swap Request After ShowTime !!!");
-#endif
-		}
-		else{
-#ifdef AMAZON_MEI_DEBUG_ON
-//			printk("\n\n Code Swap Request");
-#endif
-			fetchpage = scratch & ~OMB_CODESWAP_MESSAGE_MSG_TYPE_MASK;
-			size = meiGetPage( fetchpage, GET_PROG, MAXSWAPSIZE, mei_arc_swap_buff, &dest_addr);
-			if( size > 0)
-			{
-#ifdef AMAZON_MEI_DEBUG_ON
-//				printk("  : prom page num %d",fetchpage);
-#endif
-				meiDMAWrite( dest_addr, mei_arc_swap_buff, size);
-			}
-
-                	size = meiGetPage( fetchpage, GET_DATA, MAXSWAPSIZE, mei_arc_swap_buff, &dest_addr);
-			if( size > 0)
-			{
-#ifdef AMAZON_MEI_DEBUG_ON
-//				printk("  : data page num %d",fetchpage);
-#endif
-				meiDMAWrite( dest_addr, mei_arc_swap_buff, size);
-			}
-		}
-                        //	Notify arc that mailbox read complete
- 		meiLongwordWrite(ARC_TO_MEI_INT, ARC_TO_MEI_MSGAV);
-
-		//	Tell ARC Codeswap is done
-		meiLongwordWrite(MEI_TO_ARC_INT, MEI_TO_ARC_CS_DONE);
-		asm("SYNC");
-		i=0;
-		while(i<WHILE_DELAY){
-			meiLongwordRead(MEI_TO_ARC_INT, &temp);
-			if((temp & MEI_TO_ARC_CS_DONE) ==0){
-#ifdef AMAZON_MEI_DEBUG_ON
-//				printk("\n\n Code Swap Done");
-#endif
-				break;
-			}
-			i++;
-			if(i==WHILE_DELAY){
-#ifdef AMAZON_MEI_DEBUG_ON
-				printk("\n\n MEI_TO_ARC_CS_DONE not cleared by ARC");
-				//509221:tc.chen start
-				if (!mei_debug_mode)
-				{
-					//printk("Reset Arc!\n");
-					//printk("AdslInitStatsData.FullInitializationCount++\n");
-					AdslInitStatsData.FullInitializationCount++;	
-					if (!showtime)
-					{
-						//printk("AdslInitStatsData.FailedFullInitializationCount++\n");
-						AdslInitStatsData.FailedFullInitializationCount++;
-						//printk("AdslInitStatsData.LINIT_Errors++\n");
-						AdslInitStatsData.LINIT_Errors++;
-					}
-
-					wake_up_interruptible(&wait_queue_codeswap);	// wait up ioctl reboot
-				}
-				//509221:tc.chen end
-#endif
-			}
-		}
-        }
-        else{    // normal message
-//			printk("\n\n interrupt");	
-                        meiMailboxRead(RxMessage, MSG_LENGTH);
-                        if(cmv_waiting==1){            
-                                arcmsgav=1;
-                                cmv_waiting=0;
-                                wake_up_interruptible(&wait_queue_arcmsgav);                  
-                        }
-                        else{
-                                indicator_count++;
-                                memcpy((char *)Recent_indicator, (char *)RxMessage,  MSG_LENGTH *2);
-#ifdef	ARC_READY_ACK
-				if(((RxMessage[0]&0xff0)>>4)==D2H_AUTONOMOUS_MODEM_READY_MSG){	//check ARC ready message
-					
-#ifdef LOCK_RETRY
-					if (reboot_lock)
-					{
-					    reboot_lock = 0;
-					    up(&mei_sema);	// allow cmv access
-					}
-#else
-				        up(&mei_sema);	// allow cmv access
-#endif
-					reboot_flag=1;
-//#ifdef ADSL_LED_SUPPORT					
-#if 0
-					led_support_check=1;//adsl led for 1.1.2.7.1.1
-					adsl_led_flash();//adsl led for 1.1.2.7.1.1
-#endif
-					wake_up_interruptible(&wait_queue_reboot);	// wait up ioctl reboot
-				}
-#endif
-      			}                  
-        }
-//	meiLongwordWrite(ARC_TO_MEI_INT, ARC_TO_MEI_MSGAV);
-	mask_and_ack_amazon_irq(AMAZON_MEI_INT);
-        return;
-}
-
-// 603221:tc.chen start
-////////////////////////hdlc ////////////////
-
-// get hdlc status
-static unsigned int ifx_me_hdlc_status(void)
-{
-	u16 CMVMSG[MSG_LENGTH]; 
-	int ret;
-
-	if (showtime!=1)
-		return -ENETRESET;
-	
-	makeCMV_local(H2D_CMV_READ, STAT, 14, 0, 1, NULL,CMVMSG);	//Get HDLC status 
-	ret = mei_ioctl((struct inode *)0,NULL, AMAZON_MEI_CMV_WINHOST, CMVMSG);
-	if (ret != 0)
-	{
-		return -EIO;
-	}
-	return CMVMSG[4]&0x0F;
-}
-
-int ifx_me_is_resloved(int status)
-{
-	u16 CMVMSG[MSG_LENGTH];
-	int ret;
-	
-	if (status == ME_HDLC_MSG_QUEUED || status == ME_HDLC_MSG_SENT)
-		return ME_HDLC_UNRESOLVED;
-	if (status == ME_HDLC_IDLE)
-	{
-		makeCMV_local(H2D_CMV_READ, CNTL, 2, 0, 1, NULL,CMVMSG);	//Get ME-HDLC Control
-		ret = mei_ioctl((struct inode *)0,NULL, AMAZON_MEI_CMV_WINHOST, CMVMSG);
-		if (ret != 0)
-		{
-			return IFX_POP_EOC_FAIL;
-		}
-		if (CMVMSG[4]&(1<<0))
-		{
-			return ME_HDLC_UNRESOLVED;
-		}
-		
-	}
-	return ME_HDLC_RESOLVED;
-}
-
-int _ifx_me_hdlc_send(unsigned char *hdlc_pkt,int len,int max_length)
-{
-	int ret;
-	u16 CMVMSG[MSG_LENGTH];
-	u16 data=0;
-	u16 pkt_len=len;
-	if (pkt_len > max_length)
-	{
-		printk("Exceed maximum eoc message length\n");
-		return -ENOBUFS;
-	}
-	//while(pkt_len > 0)
-	{		
-		makeCMV_local(H2D_CMV_WRITE, INFO, 81, 0, (pkt_len+1)/2,(u16 *)hdlc_pkt,CMVMSG);	//Write clear eoc message to ARC
-		ret = mei_ioctl((struct inode *)0,NULL, AMAZON_MEI_CMV_WINHOST, CMVMSG);
-		if (ret != 0)
-		{
-			return -EIO;
-		}
-		
-		makeCMV_local(H2D_CMV_WRITE, INFO, 83, 2, 1,&pkt_len,CMVMSG);	//Update tx message length
-		ret = mei_ioctl((struct inode *)0,NULL, AMAZON_MEI_CMV_WINHOST, CMVMSG);
-		if (ret != 0)
-		{
-			return -EIO;
-		}
-		
-		data = (1<<0);
-		makeCMV_local(H2D_CMV_WRITE, CNTL, 2, 0, 1,&data,CMVMSG);	//Start to send
-		ret = mei_ioctl((struct inode *)0,NULL, AMAZON_MEI_CMV_WINHOST, CMVMSG);
-		if (ret != 0)
-		{
-			return -EIO;
-		}
-		return 0;
-	}
-}
-
-static int ifx_me_hdlc_send(unsigned char *hdlc_pkt,int hdlc_pkt_len)
-{
-	int hdlc_status=0;
-	u16 CMVMSG[MSG_LENGTH];
-	int max_hdlc_tx_length=0,ret=0,retry=0;
-	
-	while(retry<10)
-	{
-		hdlc_status = ifx_me_hdlc_status();
-		if (ifx_me_is_resloved(hdlc_status)==ME_HDLC_RESOLVED) // arc ready to send HDLC message
-		{
-			makeCMV_local(H2D_CMV_READ, INFO, 83, 0, 1, NULL,CMVMSG);	//Get Maximum Allowed HDLC Tx Message Length
-			ret = mei_ioctl((struct inode *)0,NULL, AMAZON_MEI_CMV_WINHOST, CMVMSG);
-			if (ret != 0)
-			{
-				return -EIO;
-			}
-			max_hdlc_tx_length = CMVMSG[4];
-			ret = _ifx_me_hdlc_send(hdlc_pkt,hdlc_pkt_len,max_hdlc_tx_length);
-			return ret;
-		}
-		set_current_state(TASK_INTERRUPTIBLE);
-		schedule_timeout(10);
-	}
-	return -EBUSY;
-}
-
-int ifx_mei_hdlc_read(char *hdlc_pkt,int max_hdlc_pkt_len)
-{
-	u16 CMVMSG[MSG_LENGTH]; 
-	int msg_read_len,ret=0,pkt_len=0,retry = 0;
-		
-	while(retry<10)
-	{
-		ret = ifx_me_hdlc_status();
-		if (ret == ME_HDLC_RESP_RCVD)
-		{
-			int current_size=0;
-			makeCMV_local(H2D_CMV_READ, INFO, 83, 3, 1, NULL,CMVMSG);	//Get EoC packet length
-			ret = mei_ioctl((struct inode *)0,NULL, AMAZON_MEI_CMV_WINHOST, CMVMSG);
-			if (ret != 0)
-			{
-				return -EIO;
-			}
-	
-			pkt_len = CMVMSG[4];
-			if (pkt_len > max_hdlc_pkt_len)
-			{
-				ret = -ENOMEM;
-				goto error;
-			}
-			while( current_size < pkt_len)
-			{
-				if (pkt_len - current_size >(MSG_LENGTH*2-8))
-					msg_read_len = (MSG_LENGTH*2-8);
-				else
-					msg_read_len = pkt_len - (current_size);
-				makeCMV_local(H2D_CMV_READ, INFO, 82, 0 + (current_size/2), (msg_read_len+1)/2, NULL,CMVMSG);	//Get hdlc packet
-				ret = mei_ioctl((struct inode *)0,NULL, AMAZON_MEI_CMV_WINHOST, CMVMSG);
-				if (ret != 0)
-				{
-					goto error;
-				}
-				memcpy(hdlc_pkt+current_size,&CMVMSG[4],msg_read_len);
-				current_size +=msg_read_len;
-			}
-			ret = current_size;
-			break;
-		}else
-		{
-			ret = -ENODATA;
-		}
-		
-		retry++;
-		set_current_state(TASK_INTERRUPTIBLE);
-		schedule_timeout(10);
-		
-	}
-	return ret;
-error:
-	
-	return ret;
-}
-
-////////////////////////hdlc ////////////////
-// 603221:tc.chen end
-
-/////////////////////// clearEoC, int ifx_pop_eoc(sk_buff * pkt)  //////////
-int ifx_pop_eoc(struct sk_buff * pkt);
-int ifx_pop_eoc(struct sk_buff * pkt)
-{
-	amazon_clreoc_pkt * current;
-	if(showtime!=1){
-		dev_kfree_skb(pkt);
-		return IFX_POP_EOC_FAIL;
-	}
-	if((pkt->len)>clreoc_max_tx_len){
-		dev_kfree_skb(pkt);
-		return IFX_POP_EOC_FAIL;
-	}
-	current = list_entry(clreoc_list.next, amazon_clreoc_pkt, list);
-	while(1){
-		if(current->len==0){
-			memcpy(current->command, pkt->data, pkt->len);
-			current->len=pkt->len;
-			break;
-		}
-		else{
-			if((current->list).next==&clreoc_list){
-				dev_kfree_skb(pkt);
-				return IFX_POP_EOC_FAIL;	//buffer full
-			}
-			current = list_entry((current->list).next,amazon_clreoc_pkt, list);
-		}
-	}	
-	wake_up_interruptible(&wait_queue_clreoc);
-	
-	dev_kfree_skb(pkt);
-	return IFX_POP_EOC_DONE;
-}	
-/*  this is used in circular fifo mode */
-/*
-int ifx_pop_eoc(sk_buff * pkt);
-int ifx_pop_eoc(sk_buff * pkt)
-{
-	int buff_space,i;
-	if(showtime!=1)
-		return IFX_POP_EOC_FAIL;
-	
-	if(clreoc_wr>=clreoc_rd)
-		buff_space = (MEI_CLREOC_BUFF_SIZE-1)-(clreoc_wr - clreoc_rd);
-	else
-		buff_space = clreoc_rd - clreoc_wr - 1;
-	if((pkt->len)>buff_space)
-		return IFX_POP_EOC_FAIL;
-					
-	if((clreoc_wr+pkt->len)>MEI_CLREOC_BUFF_SIZE){
-		memcpy((clreoc+clreoc_wr), pkt->data, ((clreoc_wr+pkt->len)-MEI_CLREOC_BUFF_SIZE+1));
-		memcpy(clreoc, (pkt->data)+((clreoc_wr+pkt->len)-MEI_CLREOC_BUFF_SIZE+1), (pkt->len)-((clreoc_wr+pkt->len)-MEI_CLREOC_BUFF_SIZE+1)); 
-		clreoc_wr=(clreoc_wr+pkt->len)-MEI_CLREOC_BUFF_SIZE;
-	}	
-	else{
-		memcpy((clreoc+clreoc_wr), pkt->data, pkt->len);
-		if((clreoc_wr+pkt->len)=MEI_CLREOC_BUFF_SIZE)
-			clreoc_wr=0;
-		else
-			clreoc_wr+=pkt->len;
-	}
-	wake_up_interruptible(&wait_queue_clreoc);
-	return IFX_POP_EOC_DONE; 			
-}
-*/
-
-
-////////////////////////////////////////////////////////////////////////////
-//int amazon_mei_init_module (void);
-//void amazon_mei_cleanup_module (void);
-//int __init init_module (void);
-//void __exit cleanup_module (void);
-
-int __init amazon_mei_init_module(void)
-//int __init init_module(void)
-{
-        struct proc_dir_entry *entry;
-        int i;
-	
-//dying gasp-start	
-#ifdef IFX_DYING_GASP
-
-//000003:fchang Start
-#ifdef CONFIG_CPU_AMAZON_E
-		//GPIO31 :dying gasp event indication
-		//	(1) logic high: dying gasp event is false (default)
-		//	(2) logic low: dying gasp event is true
-			CLEAR_BIT((*((volatile u32 *)0xB0100B18)), 0x4);
-			CLEAR_BIT((*((volatile u32 *)0xB0100B1c)), 0x4);
-			CLEAR_BIT((*((volatile u32 *)0xB0100B20)), 0x4);
-			SET_BIT((*((volatile u32 *)0xB0100B24)), 0x4);
-			asm("SYNC");			
-#else //000003:fchang End
-
-		//GPIO31 :dying gasp event indication
-		//	(1) logic high: dying gasp event is false (default)
-		//	(2) logic low: dying gasp event is true
-			CLEAR_BIT((*((volatile u32 *)0xB0100B48)), 0x8000);
-			CLEAR_BIT((*((volatile u32 *)0xB0100B4C)), 0x8000);
-			CLEAR_BIT((*((volatile u32 *)0xB0100B50)), 0x8000);
-			SET_BIT((*((volatile u32 *)0xB0100B54)), 0x8000);
-#if 0			
-//warning-led-start	
-//GPIO 22		
-			SET_BIT ((*((volatile u32 *)0xB0100B48)), 0x40);
-			CLEAR_BIT((*((volatile u32 *)0xB0100B4C)), 0x40);
-			CLEAR_BIT((*((volatile u32 *)0xB0100B50)), 0x40);
-			SET_BIT((*((volatile u32 *)0xB0100B54)), 0x40);			
-			CLEAR_BIT((*((volatile u32 *)0xB0100B40)), 0x40); //GPIO ON
-			printk("LED ON ON ON ON ON ON.....");
-//warning-led-end			
-#endif
-			asm("SYNC");	
-#endif //000003:fchang
-
-#endif //IFX_DYING_GASP	
-//dying gasp -end        
-        
-	
-        reg_entry_t regs_temp[PROC_ITEMS] =                                     // Items being debugged
-        {
-        /*	{       flag,          name,          description } */
-	{ &arcmsgav, "arcmsgav", "arc to mei message ", 0 },
-            { &cmv_reply, "cmv_reply", "cmv needs reply", 0},
-            { &cmv_waiting, "cmv_waiting", "waiting for cmv reply from arc", 0},
-            { &indicator_count, "indicator_count", "ARC to MEI indicator count", 0},
-            { &cmv_count, "cmv_count", "MEI to ARC CMVs", 0},
-            { &reply_count, "reply_count", "ARC to MEI Reply", 0},
-            { (int *)Recent_indicator, "Recent_indicator", "most recent indicator", 0},
-	    { (int *)8, "version", "version of firmware", 0},
-        };
-        memcpy((char *)regs, (char *)regs_temp, sizeof(regs_temp));
-
-
-        //sema_init(&mei_sema, 0);  // semaphore initialization, mutex
-        sema_init(&mei_sema, 1);  // semaphore initialization, mutex
-	
-        init_waitqueue_head(&wait_queue_arcmsgav);         	// for ARCMSGAV
-	init_waitqueue_head(&wait_queue_codeswap);		// for codeswap daemon
-	init_waitqueue_head(&wait_queue_mibdaemon);		// for mib daemon
-	init_waitqueue_head(&wait_queue_reboot);		// for ioctl reboot 
-	init_waitqueue_head(&wait_queue_clreoc);		// for clreoc_wr function
-	init_waitqueue_head(&wait_queue_loop_diagnostic);		// for loop diagnostic function
-#ifdef ADSL_LED_SUPPORT	
-	init_waitqueue_head(&wait_queue_led);			// adsl led for led function
-	init_waitqueue_head(&wait_queue_led_polling);		// adsl led for led function
-	led_task.routine = adsl_led_flash_task;			// adsl led for led function
-	led_poll_init();					// adsl led for led function
-#endif	//ADSL_LED_SUPPORT
-#ifdef IFX_DYING_GASP	
-	init_waitqueue_head(&wait_queue_dying_gasp);		// IFX_DYING_GASP
-	lop_poll_init();					// IFX_DYING_GASP 
-#endif	//IFX_DYING_GASP
- 
-	init_waitqueue_head(&wait_queue_uas_poll);//joelin 04/16/2005
-	unavailable_seconds_poll_init();//joelin 04/16/2005
-	memset(&mib_pflagtime, 0, (sizeof(mib_flags_pretime)));
-	
-	// initialize link list for intervals
-	mei_mib = (amazon_mei_mib *)kmalloc((sizeof(amazon_mei_mib)*INTERVAL_NUM), GFP_KERNEL);
-	if(mei_mib == NULL){
-#ifdef AMAZON_MEI_DEBUG_ON
-		printk("kmalloc error for amazon_mei_mib\n\n");
-#endif
-		return -1;
-	}
-	memset(mei_mib, 0, (sizeof(amazon_mei_mib)*INTERVAL_NUM));
-	INIT_LIST_HEAD(&interval_list);
-	for(i=0;i<INTERVAL_NUM;i++)
-		list_add_tail(&(mei_mib[i].list), &interval_list); 
-	current_intvl = list_entry(interval_list.next, amazon_mei_mib, list);
-	do_gettimeofday(&(current_intvl->start_time)); 
-	// initialize clreoc list
-	clreoc_pkt = (amazon_clreoc_pkt *)kmalloc((sizeof(amazon_clreoc_pkt)*CLREOC_BUFF_SIZE), GFP_KERNEL);
-	if(clreoc_pkt == NULL){
-#ifdef AMAZON_MEI_DEBUG_ON
-		printk("kmalloc error for clreoc_pkt\n\n");
-#endif
-		return -1;
-	}
-	memset(clreoc_pkt, 0, (sizeof(amazon_clreoc_pkt)*CLREOC_BUFF_SIZE));
-	INIT_LIST_HEAD(&clreoc_list);
-	for(i=0;i<CLREOC_BUFF_SIZE;i++)
-		list_add_tail(&(clreoc_pkt[i].list), &clreoc_list);
-		
-        memset(&AdslInitStatsData, 0, sizeof(AdslInitStatsData));
-        if (register_chrdev(major, "amazon_mei", &mei_operations)!=0) {
-#ifdef AMAZON_MEI_DEBUG_ON
-                printk("\n\n unable to register major for amazon_mei!!!");
-#endif
-                return -1;
-        }
-        if (request_irq(AMAZON_MEI_INT, mei_interrupt_arcmsgav,0, "amazon_mei_arcmsgav", NULL)!=0){
-#ifdef AMAZON_MEI_DEBUG_ON
-                printk("\n\n unable to register irq for amazon_mei!!!");
-#endif
-                return -1;
-        }
-//        disable_irq(AMAZON_MEI_INT);
-	enable_irq(AMAZON_MEI_INT);
-        // procfs
-        meidir=proc_mkdir(MEI_DIRNAME, &proc_root);
-        if ( meidir == NULL) {
-#ifdef AMAZON_MEI_DEBUG_ON
-		printk(KERN_ERR ": can't create /proc/" MEI_DIRNAME "\n\n");
-#endif
-		return(-ENOMEM);
-        }
-
-        for(i=0;i<NUM_OF_REG_ENTRY;i++) {
-		entry = create_proc_entry(regs[i].name,
-				S_IWUSR |S_IRUSR | S_IRGRP | S_IROTH,
-				meidir);
-		if(entry) {
-			regs[i].low_ino = entry->low_ino;
-			entry->proc_fops = &proc_operations;
-		} else {
-#ifdef AMAZON_MEI_DEBUG_ON
-			printk( KERN_ERR 
-				": can't create /proc/" MEI_DIRNAME
-				"/%s\n\n", regs[i].name);
-#endif
-			return(-ENOMEM);
-		}
-        }
-        ///////////////////////////////// register net device ////////////////////////////
-        if(register_netdev(&phy_mei_net)!=0){
-#ifdef AMAZON_MEI_DEBUG_ON
-                printk("\n\n Register phy Device Failed.");
-#endif
-                return -1;
-        }
-/*
-	if(register_netdev(&interleave_mei_net)!=0){
-                printk("\n\n Register interleave Device Failed.");
-                return -1;
-        }
-	if(register_netdev(&fast_mei_net)!=0){
-                printk("\n\n Register fast Device Failed.");
-                return -1;
-        }
-*/
-#ifdef DFE_LOOPBACK
-	mei_arc_swap_buff = (u32 *)kmalloc(MAXSWAPSIZE*4, GFP_KERNEL);
-	if (mei_arc_swap_buff){
-#ifdef	ARC_READY_ACK
-		if(down_interruptible(&mei_sema))	//disable CMV access until ARC ready
-		{
-                	return -ERESTARTSYS;
-		}
-#ifdef LOCK_RETRY
-		reboot_lock = 1;
-#endif
-#endif
-		meiForceRebootAdslModem();
-		kfree(mei_arc_swap_buff);
-	}else{
-#ifdef AMAZON_MEI_DEBUG_ON
-		printk("cannot load image: no memory\n\n");
-#endif
-	}
-#endif
-#ifdef IFX_SMALL_FOOTPRINT
-	mib_poll_init();
-#endif
-        return 0;
-}
-
-void __exit amazon_mei_cleanup_module(void)
-//void __exit cleanup_module(void)
-{
-        int i;
-#ifdef ADSL_LED_SUPPORT        
-        stop_led_module=1;			//wake up and clean led module 
-        led_support_check=0;//joelin , clear task
-        showtime=0;//joelin,clear task
-        //CLEAR_BIT((*((volatile u32 *)0xB0100B40)), 0x40); //Warning LED GPIO ON
-        firmware_support_led=0;//joelin ,clear task
-        wake_up_interruptible(&wait_queue_led); //wake up and clean led module 
-        wake_up_interruptible(&wait_queue_led_polling); //wake up and clean led module         
-#endif        
-        for(i=0;i<NUM_OF_REG_ENTRY;i++)
-		remove_proc_entry(regs[i].name, meidir);
-        remove_proc_entry(MEI_DIRNAME, &proc_root);
-	
-        disable_irq(AMAZON_MEI_INT);
-        free_irq(AMAZON_MEI_INT, NULL);
-        unregister_chrdev(major, "amazon_mei");
-
-        kfree(mei_mib);
-	kfree(clreoc_pkt);
-	
-	kfree(phy_mei_net.priv);
-        unregister_netdev(&phy_mei_net);
-	
-        return;
-}
-#ifdef IFX_SMALL_FOOTPRINT
-
-
-int adsl_mib_poll(void *unused)
-{
-	struct task_struct *tsk = current;
-	int i=0;
-	struct timeval time_now;
-	struct timeval time_fini;
-	u32 temp,temp2;
-
-	amazon_mei_mib * mib_ptr;
-//	u16 buff[MSG_LENGTH]__attribute__ ((aligned(4)));
-	u16 * data=NULL;  //used in makeCMV, to pass in payload when CMV set, ignored when CMV read.
-
-	daemonize();
-	strcpy(tsk->comm, "kmibpoll");
-	sigfillset(&tsk->blocked);
-
-	printk("Inside mib poll loop ...\n");
-	i=0;
-	while(1){
-		if(i<MIB_INTERVAL)
-			interruptible_sleep_on_timeout(&wait_queue_mibdaemon, ((MIB_INTERVAL-i)/(1000/HZ)));
-		i=0;
-		if(showtime==1){
-//			printk("\n\n update mib");
-					
-			do_gettimeofday(&time_now);
-			if(time_now.tv_sec - current_intvl->start_time.tv_sec>=900){
-				if(current_intvl->list.next!=&interval_list){
-					current_intvl = list_entry(current_intvl->list.next, amazon_mei_mib, list);
-					do_gettimeofday(&(current_intvl->start_time));
-				}
-				else{
-					mib_ptr = list_entry(interval_list.next, amazon_mei_mib, list);
-					list_del(interval_list.next);
-					memset(mib_ptr, 0, sizeof(amazon_mei_mib));
-					list_add_tail(&(mib_ptr->list), &interval_list);
-					if(current_intvl->list.next==&interval_list)
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nlink list error");
-#endif
-					current_intvl = list_entry(current_intvl->list.next, amazon_mei_mib, list);
-					do_gettimeofday(&(current_intvl->start_time));
-				}	
-			}
-					
-			if(down_interruptible(&mei_sema))
-      				return -ERESTARTSYS;
-/*						
-			ATUC_PERF_LO_FLAG_MAKECMV;
-			if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-				printk("\n\nCMV fail, Group 7 Address 0 Index 0");
-#endif
-			}
-			else{
-				if(RxMessage[4]&PLAM_LOS_FailureBit){
-					current_intvl->AtucPerfLos++;
-					ATUC_PERF_LOSS++;
-					CurrStatus.adslAtucCurrStatus = 2;
-				}
-				if(RxMessage[4]&PLAM_LOF_FailureBit){
-					current_intvl->AtucPerfLof++;
-					ATUC_PERF_LOFS++;
-					CurrStatus.adslAtucCurrStatus = 1;
-				}
-				if(!(RxMessage[4]&(PLAM_LOS_FailureBit|PLAM_LOF_FailureBit)))
-					CurrStatus.adslAtucCurrStatus = 0;
-				}
-*/
-				
-				if(showtime!=1)
-					goto mib_poll_end;
-				ATUC_PERF_ESS_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 7 Address 7 Index 0");
-#endif
-				}
-				else{
-						temp = RxMessage[4]-mib_pread.ATUC_PERF_ESS;
-						if(temp>=0){
-							current_intvl->AtucPerfEs+=temp;
-							ATUC_PERF_ESS+=temp;
-							mib_pread.ATUC_PERF_ESS = RxMessage[4];
-						}
-						else{
-							current_intvl->AtucPerfEs+=0xffff-mib_pread.ATUC_PERF_ESS+RxMessage[4];
-							ATUC_PERF_ESS+=0xffff-mib_pread.ATUC_PERF_ESS+RxMessage[4];
-							mib_pread.ATUC_PERF_ESS = RxMessage[4];		
-					}
-				}
-/*		
-				ATUR_PERF_LO_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 7 Address 1 Index 0");
-#endif
-				}
-				else{
-					if(RxMessage[4]&PLAM_LOS_FailureBit){
-						current_intvl->AturPerfLos++;
-						ATUR_PERF_LOSS++;
-						CurrStatus.adslAturCurrStatus = 2;
-					}
-					if(RxMessage[4]&PLAM_LOF_FailureBit){
-						current_intvl->AturPerfLof++;
-						ATUR_PERF_LOFS++;
-						CurrStatus.adslAturCurrStatus = 1;
-					}
-					if(RxMessage[4]&PLAM_LPR_FailureBit){
-						current_intvl->AturPerfLpr++;
-						ATUR_PERF_LPR++;
-						CurrStatus.adslAturCurrStatus = 3;
-					}
-					if(!(RxMessage[4]&(PLAM_LOS_FailureBit|PLAM_LOF_FailureBit|PLAM_LPR_FailureBit)))
-						CurrStatus.adslAturCurrStatus = 0;	
-				}
-*/
-				if(showtime!=1)
-					goto mib_poll_end;
-				ATUR_PERF_ESS_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 7 Address 33 Index 0");
-#endif
-				}
-				else{
-						temp = RxMessage[4]-mib_pread.ATUR_PERF_ESS;
-						if(temp>=0){
-							current_intvl->AturPerfEs+=temp;
-							ATUR_PERF_ESS+=temp;
-							mib_pread.ATUR_PERF_ESS = RxMessage[4];
-						}
-						else{
-							current_intvl->AturPerfEs+=0xffff-mib_pread.ATUR_PERF_ESS+RxMessage[4];
-							ATUR_PERF_ESS+=	0xffff-mib_pread.ATUR_PERF_ESS+RxMessage[4];
-							mib_pread.ATUR_PERF_ESS=RxMessage[4];
-					}
-				}
-				if(showtime!=1)
-					goto mib_poll_end;
-				// to update rx/tx blocks
-				ATUR_CHAN_RECV_BLK_FLAG_MAKECMV_LSW;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 7 Address 20 Index 0");
-#endif
-				}
-				else{
-						temp = RxMessage[4];	
-				}
-				if(showtime!=1)
-					goto mib_poll_end;
-				ATUR_CHAN_RECV_BLK_FLAG_MAKECMV_MSW;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 7 Address 21 Index 0");
-#endif
-				}
-				else{
-						temp2 = RxMessage[4];	
-					}	
-					if((temp + (temp2<<16) - mib_pread.ATUR_CHAN_RECV_BLK)>=0){
-						current_intvl->AturChanPerfRxBlk+=temp + (temp2<<16) - mib_pread.ATUR_CHAN_RECV_BLK;
-						ATUR_CHAN_RECV_BLK+=temp + (temp2<<16) - mib_pread.ATUR_CHAN_RECV_BLK;
-						mib_pread.ATUR_CHAN_RECV_BLK = temp + (temp2<<16);
-					}
-					else{
-						current_intvl->AturChanPerfRxBlk+=0xffffffff - mib_pread.ATUR_CHAN_RECV_BLK +(temp + (temp2<<16));
-						ATUR_CHAN_RECV_BLK+=0xffffffff - mib_pread.ATUR_CHAN_RECV_BLK +(temp + (temp2<<16));
-						mib_pread.ATUR_CHAN_RECV_BLK = temp + (temp2<<16);
-				}
-				current_intvl->AturChanPerfTxBlk = current_intvl->AturChanPerfRxBlk;
-				ATUR_CHAN_TX_BLK = ATUR_CHAN_RECV_BLK;
-/*					
-				ATUR_CHAN_TX_BLK_FLAG_MAKECMV_LSW;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS)
-					printk("\n\nCMV fail, Group 7 Address 20 Index 0");
-				else{
-					if(RxMessage[4]){
-						current_intvl->AturChanPerfTxBlk+=RxMessage[4];
-						ATUR_CHAN_TX_BLK+=RxMessage[4];
-					}	
-				}
-				ATUR_CHAN_TX_BLK_FLAG_MAKECMV_MSW;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS)
-					printk("\n\nCMV fail, Group 7 Address 21 Index 0");
-				else{
-					if(RxMessage[4]){
-						current_intvl->AturChanPerfTxBlk+=(int)((RxMessage[4])<<16);
-						ATUR_CHAN_TX_BLK+=(int)((RxMessage[4])<<16);
-					}	
-				}
-*/					
-				if(chantype.interleave == 1){
-				if(showtime!=1)
-					goto mib_poll_end;
-					ATUR_CHAN_CORR_BLK_FLAG_MAKECMV_INTL;
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group 7 Address 3 Index 0");
-#endif
-					}
-					else{
-							temp = RxMessage[4] - mib_pread.ATUR_CHAN_CORR_BLK_INTL;
-							if(temp>=0){
-								current_intvl->AturChanPerfCorrBlk+=temp;
-								ATUR_CHAN_CORR_BLK+=temp;
-								mib_pread.ATUR_CHAN_CORR_BLK_INTL = RxMessage[4];
-							}	
-							else{
-								current_intvl->AturChanPerfCorrBlk+=0xffff - mib_pread.ATUR_CHAN_CORR_BLK_INTL +RxMessage[4];
-								ATUR_CHAN_CORR_BLK+=0xffff - mib_pread.ATUR_CHAN_CORR_BLK_INTL +RxMessage[4];
-								mib_pread.ATUR_CHAN_CORR_BLK_INTL = RxMessage[4];	
-						}	
-					}	
-				}
-				else if(chantype.fast == 1){
-				if(showtime!=1)
-					goto mib_poll_end;
-					ATUR_CHAN_CORR_BLK_FLAG_MAKECMV_FAST;
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group 7 Address 3 Index 1");
-#endif
-					}
-					else{
-							temp = RxMessage[4] - mib_pread.ATUR_CHAN_CORR_BLK_FAST;
-							if(temp>=0){
-								current_intvl->AturChanPerfCorrBlk+=temp;
-								ATUR_CHAN_CORR_BLK+=temp;
-								mib_pread.ATUR_CHAN_CORR_BLK_FAST = RxMessage[4];
-							}	
-							else{
-								current_intvl->AturChanPerfCorrBlk+=0xffff - mib_pread.ATUR_CHAN_CORR_BLK_FAST + RxMessage[4];
-								ATUR_CHAN_CORR_BLK+=0xffff - mib_pread.ATUR_CHAN_CORR_BLK_FAST + RxMessage[4];
-								mib_pread.ATUR_CHAN_CORR_BLK_FAST = RxMessage[4];
-						}	
-					}		
-				}
-				
-				if(chantype.interleave == 1){
-				if(showtime!=1)
-					goto mib_poll_end;
-					ATUR_CHAN_UNCORR_BLK_FLAG_MAKECMV_INTL;
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group 7 Address 2 Index 0");
-#endif
-					}
-					else{
-							temp = RxMessage[4] - mib_pread.ATUR_CHAN_UNCORR_BLK_INTL;
-							if(temp>=0){
-								current_intvl->AturChanPerfUncorrBlk+=temp;
-								ATUR_CHAN_UNCORR_BLK+=temp;
-								mib_pread.ATUR_CHAN_UNCORR_BLK_INTL = RxMessage[4];
-							}
-							else{
-								current_intvl->AturChanPerfUncorrBlk+=0xffff - mib_pread.ATUR_CHAN_UNCORR_BLK_INTL + RxMessage[4];
-								ATUR_CHAN_UNCORR_BLK+=0xffff - mib_pread.ATUR_CHAN_UNCORR_BLK_INTL + RxMessage[4];
-								mib_pread.ATUR_CHAN_UNCORR_BLK_INTL = RxMessage[4];
-						}
-					}		
-				}
-				else if(chantype.fast == 1){
-				if(showtime!=1)
-					goto mib_poll_end;
-					ATUR_CHAN_UNCORR_BLK_FLAG_MAKECMV_FAST;
-					if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-						printk("\n\nCMV fail, Group 7 Address 2 Index 1");
-#endif
-					}
-					else{
-							temp = RxMessage[4] - mib_pread.ATUR_CHAN_UNCORR_BLK_FAST;
-							if(temp>=0){
-								current_intvl->AturChanPerfUncorrBlk+=temp;
-								ATUR_CHAN_UNCORR_BLK+=temp;
-								mib_pread.ATUR_CHAN_UNCORR_BLK_FAST = RxMessage[4];
-							}
-							else{
-								current_intvl->AturChanPerfUncorrBlk+=0xffff - mib_pread.ATUR_CHAN_UNCORR_BLK_FAST + RxMessage[4];
-								ATUR_CHAN_UNCORR_BLK+=0xffff - mib_pread.ATUR_CHAN_UNCORR_BLK_FAST + RxMessage[4];
-								mib_pread.ATUR_CHAN_UNCORR_BLK_FAST = RxMessage[4];
-						}
-					}		
-				}
-					
-				//RFC-3440
-
-#ifdef AMAZON_MEI_MIB_RFC3440
-				if(showtime!=1)
-					goto mib_poll_end;
-				ATUC_PERF_STAT_FASTR_FLAG_MAKECMV; //???
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 0 Address 0 Index 0");
-#endif
-				}
-				else{
-						temp = RxMessage[4] - mib_pread.ATUC_PERF_STAT_FASTR;
-						if(temp>=0){
-							current_intvl->AtucPerfStatFastR+=temp;
-							ATUC_PERF_STAT_FASTR+=temp;
-							mib_pread.ATUC_PERF_STAT_FASTR = RxMessage[4];
-						}
-						else{
-							current_intvl->AtucPerfStatFastR+=0xffff - mib_pread.ATUC_PERF_STAT_FASTR + RxMessage[4];
-							ATUC_PERF_STAT_FASTR+=0xffff - mib_pread.ATUC_PERF_STAT_FASTR + RxMessage[4];
-							mib_pread.ATUC_PERF_STAT_FASTR = RxMessage[4];
-					}
-				}
-				if(showtime!=1)
-					goto mib_poll_end;
-				ATUC_PERF_STAT_FAILED_FASTR_FLAG_MAKECMV; //???
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 0 Address 0 Index 0");
-#endif
-				}
-				else{
-						temp = RxMessage[4] - mib_pread.ATUC_PERF_STAT_FAILED_FASTR;
-						if(temp>=0){
-							current_intvl->AtucPerfStatFailedFastR+=temp;
-							ATUC_PERF_STAT_FAILED_FASTR+=temp;
-							mib_pread.ATUC_PERF_STAT_FAILED_FASTR = RxMessage[4];
-						}
-						else{
-							current_intvl->AtucPerfStatFailedFastR+=0xffff - mib_pread.ATUC_PERF_STAT_FAILED_FASTR + RxMessage[4];
-							ATUC_PERF_STAT_FAILED_FASTR+=0xffff - mib_pread.ATUC_PERF_STAT_FAILED_FASTR + RxMessage[4];
-							mib_pread.ATUC_PERF_STAT_FAILED_FASTR = RxMessage[4];
-					}
-				}
-				if(showtime!=1)
-					goto mib_poll_end;
-				ATUC_PERF_STAT_SESL_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 7 Address 8 Index 0");
-#endif
-				}
-				else{
-						temp = RxMessage[4] - mib_pread.ATUC_PERF_STAT_SESL;
-						if(temp>=0){
-							current_intvl->AtucPerfStatSesL+=temp;
-							ATUC_PERF_STAT_SESL+=temp;
-							mib_pread.ATUC_PERF_STAT_SESL = RxMessage[4];
-						}
-						else{
-							current_intvl->AtucPerfStatSesL+=0xffff - mib_pread.ATUC_PERF_STAT_SESL + RxMessage[4];
-							ATUC_PERF_STAT_SESL+=0xffff - mib_pread.ATUC_PERF_STAT_SESL + RxMessage[4];
-							mib_pread.ATUC_PERF_STAT_SESL = RxMessage[4];
-					}
-				}
-				if(showtime!=1)
-					goto mib_poll_end;
-				ATUC_PERF_STAT_UASL_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 7 Address 10 Index 0");
-#endif
-				}
-				else{
-						temp = RxMessage[4] - mib_pread.ATUC_PERF_STAT_UASL;
-						if(temp>=0){
-							current_intvl->AtucPerfStatUasL+=temp;
-							ATUC_PERF_STAT_UASL+=temp;
-							mib_pread.ATUC_PERF_STAT_UASL = RxMessage[4];
-						}
-						else{
-							current_intvl->AtucPerfStatUasL+=0xffff - mib_pread.ATUC_PERF_STAT_UASL + RxMessage[4];
-							ATUC_PERF_STAT_UASL+=0xffff - mib_pread.ATUC_PERF_STAT_UASL + RxMessage[4];
-							mib_pread.ATUC_PERF_STAT_UASL = RxMessage[4];
-					}
-				}
-				if(showtime!=1)
-					goto mib_poll_end;
-				ATUR_PERF_STAT_SESL_FLAG_MAKECMV;
-				if(meiCMV(TxMessage, YES_REPLY)!=MEI_SUCCESS){
-#ifdef AMAZON_MEI_DEBUG_ON
-					printk("\n\nCMV fail, Group 7 Address 34 Index 0");
-#endif
-				}
-				else{
-						temp = RxMessage[4] - mib_pread.ATUR_PERF_STAT_SESL;
-						if(temp>=0){
-							current_intvl->AtucPerfStatUasL+=temp;
-							ATUC_PERF_STAT_UASL+=temp;
-							mib_pread.ATUR_PERF_STAT_SESL = RxMessage[4];
-						}
-						else{
-							current_intvl->AtucPerfStatUasL+=0xffff - mib_pread.ATUR_PERF_STAT_SESL + RxMessage[4];
-							ATUC_PERF_STAT_UASL+=0xffff - mib_pread.ATUR_PERF_STAT_SESL + RxMessage[4];
-							mib_pread.ATUR_PERF_STAT_SESL = RxMessage[4];
-					}
-				}
-					
-#endif
-mib_poll_end:
-				up(&mei_sema);
-				
-				do_gettimeofday(&time_fini);
-				i = ((int)((time_fini.tv_sec-time_now.tv_sec)*1000)) + ((int)((time_fini.tv_usec-time_now.tv_usec)/1000))  ; //msec 
-			}//showtime==1
-		}	 
-	
-}
-int mib_poll_init(void)
-{
-	printk("Starting mib_poll...\n");
-
-	kernel_thread(adsl_mib_poll, NULL, CLONE_FS | CLONE_FILES | CLONE_SIGNAL);
-	return 0;
-}
-#endif //IFX_SMALL_FOOTPRINT
-//EXPORT_NO_SYMBOLS;
-
-#ifdef ADSL_LED_SUPPORT
-// adsl led -start
-int led_status_on=0,led_need_to_flash=0;
-int led_current_flashing=0;
-unsigned long led_delay=0;
-static int led_poll(void *unused)
-{
-	stop_led_module=0;	//begin polling ...
-	while(!stop_led_module){
-		if ((!led_status_on)&&(!led_need_to_flash)) interruptible_sleep_on_timeout (&wait_queue_led_polling,1000); //10 seconds timeout for waiting wakeup
-//			else printk("direct running task, no waiting");
-		run_task_queue(&tq_ifx_led);//joelin task
-//	printk("led and LOP polling...\n");
-		}
-	return 0;	
-}	
-static int led_poll_init(void)
-{
-//	printk("Starting adsl led polling...\n");
-
-//warning-led-start
-//	CLEAR_BIT((*((volatile u32 *)0xB0100B40)), 0x40); //Warning LED GPIO ON
-//warning-led-end
-
-	kernel_thread(led_poll, NULL, CLONE_FS | CLONE_FILES | CLONE_SIGNAL);
-	return 0;
-}
-
-int adsl_led_flash(void)
-{	
-	int i;
-	if (!firmware_support_led)	return 0;	//joelin version check 
-
-	if (led_status_on == 0 && led_need_to_flash == 0)
-	{
-		queue_task(&led_task, &tq_ifx_led);//joelin task
-		wake_up_interruptible(&wait_queue_led_polling); //wake up and clean led module 
-//		printk("queue Task 1...\n");	//joelin  test	
-	}
-	led_need_to_flash=1;//asking to flash led
-
-	return 0;
-}
-
-int adsl_led_flash_task(void *ptr)
-{
-
-	u16	one=1;
-	u16	zero=0;
-	u16	data=0x0600;
-	int kernel_use=1;
-	u16 CMVMSG[MSG_LENGTH];                                                                           
-//adsl-led-start for >v1.1.2.7.1.1
-//	printk("Task Running...\n");	//joelin  test
-	if ((firmware_support_led==2)&&(led_support_check))
-	{
-	led_support_check=0;
-	data=0x0600;
-	makeCMV_local(H2D_CMV_WRITE, INFO, 91, 0, 1, &data,CMVMSG);	//configure GPIO9 GPIO10 as outputs
-	mei_ioctl((struct inode *)0,NULL, AMAZON_MEI_CMV_WINHOST, CMVMSG);
-
-	makeCMV_local(H2D_CMV_WRITE, INFO, 91, 2, 1, &data,CMVMSG);	//enable writing to bit 9 and bit10
-	mei_ioctl((struct inode *)0,NULL, AMAZON_MEI_CMV_WINHOST, CMVMSG);
-	
-	data=0x0a01;
-	makeCMV_local(H2D_CMV_WRITE, INFO, 91, 4, 1, &data,CMVMSG);	//use GPIO10 for TR68 .Enable and don't invert.
-	mei_ioctl((struct inode *)0,NULL, AMAZON_MEI_CMV_WINHOST, CMVMSG);	
-	
-#ifdef DATA_LED_ON_MODE	
-	data=0x0903;//tecom //use GPIO9 for TR68 data led .turn on.
-#else
-	data=0x0900;
-#endif	
-	makeCMV_local(H2D_CMV_WRITE, INFO, 91, 5, 1, &data,CMVMSG);	//use GPIO9 for TR68 data led .turn off.
-	mei_ioctl((struct inode *)0,NULL, AMAZON_MEI_CMV_WINHOST, CMVMSG);		
-	
-	}
-	if (!showtime) {led_need_to_flash=0; return 0;} 
-//adsl-led-end for >v1.1.2.7.1.1
-
-	if (led_status_on == 0 || led_need_to_flash == 1)
-	{
-
-		if (led_current_flashing==0)
-		{
-			if (firmware_support_led==1){//>1.1.2.3.1.1
-			makeCMV_local(H2D_CMV_WRITE, INFO, 91, 0, 1, &one,CMVMSG);	//flash
-			mei_ioctl((struct inode *)0,NULL, AMAZON_MEI_CMV_WINHOST, &CMVMSG);	
-		}
-			else if (firmware_support_led==2){//>1.1.2.7.1.1
-				data=0x0901;//flash
-				makeCMV_local(H2D_CMV_WRITE, INFO, 91, 5, 1, &data,CMVMSG);	//use GPIO9 for TR68 data led .flash.
-				mei_ioctl((struct inode *)0,NULL, AMAZON_MEI_CMV_WINHOST, &CMVMSG);			
-				
-			}//(firmware_support_led==2)
-			led_current_flashing = 1;//turn on led
-		}
-		led_status_on=1;
-
-		do{//do nothing , waiting untill no data traffic 
-			led_need_to_flash=0;
-			interruptible_sleep_on_timeout(&wait_queue_led, 25); //the time for LED Off , if no data traffic			 
-		}while(led_need_to_flash==1);
-		
-	}else if (led_status_on == 1 && led_need_to_flash==0)
-	{
-		if (led_current_flashing==1)
-		{//turn off led
-			if (firmware_support_led==1){//>1.1.2.3.1.1
-			makeCMV_local(H2D_CMV_WRITE, INFO, 91, 0, 1, &zero,CMVMSG);//off	
-			mei_ioctl((struct inode *)0,NULL, AMAZON_MEI_CMV_WINHOST, &CMVMSG);
-			}	//>1.1.2.3.1.1		
-			else if (firmware_support_led==2){//>1.1.2.7.1.1
-#ifdef DATA_LED_ON_MODE					
-				data=0x0903;//tecom //use GPIO9 for TR68 data led .turn on.
-#else
-				data=0x0900;//off
-#endif				
-				makeCMV_local(H2D_CMV_WRITE, INFO, 91, 5, 1, &data,CMVMSG);	//use GPIO9 for TR68 data led .off.
-			mei_ioctl((struct inode *)0,NULL, AMAZON_MEI_CMV_WINHOST, &CMVMSG);
-				
-			}//(firmware_support_led==2)
-			led_status_on=0;
-			led_current_flashing = 0;
-		}
-		}
-	
-	if (led_status_on == 1 || led_need_to_flash)
-	{//led flash job on going or led need to flash 
-		queue_task(&led_task, &tq_ifx_led);	//joelin task	
-//		printk("queue Task 2...\n");	//joelin  test	
-	}
-	return 0;
-}
-//joelin adsl led-end
-#else 
-int adsl_led_flash(void)
-{
-	return 0;
-}
-#endif //ADSL_LED_SUPPORT
-#ifdef IFX_DYING_GASP
-static int lop_poll(void *unused)
-{
-	
-	while(1)
-	{
-	interruptible_sleep_on_timeout(&wait_queue_dying_gasp, 1); 
-#ifdef CONFIG_CPU_AMAZON_E //000003:fchang
-        if(showtime&&((*((volatile u32 *)0xB0100B14))&0x4)==0x0)	{//000003:fchang
-#else //000003:fchang
-	if(showtime&&((*((volatile u32 *)0xB0100B44))&0x8000)==0x0)	{
-#endif //CONFIG_CPU_AMAZON_E
-		mei_ioctl((struct inode *)0,NULL, AMAZON_MEI_WRITEDEBUG, &lop_debugwr);
-		printk("send dying gasp..\n");}
-		
-	}
-	return 0;	
-	}
-static int lop_poll_init(void)
-{
-//	printk("Starting LOP polling...\n");
-	kernel_thread(lop_poll, NULL, CLONE_FS | CLONE_FILES | CLONE_SIGNAL);
-	return 0;
-}
-
-#endif //IFX_DYING_GASP
-
-//joelin 04/16/2005-satrt
-static int unavailable_seconds_poll(void *unused)
-{
-	while(1){
-		interruptible_sleep_on_timeout (&wait_queue_uas_poll,100); //1 second timeout for waiting wakeup
-   		if (!showtime) unavailable_seconds++;
-	}
-	return 0;	
-}	
-static int unavailable_seconds_poll_init(void)
-{
-  
-	kernel_thread(unavailable_seconds_poll, NULL, CLONE_FS | CLONE_FILES | CLONE_SIGNAL);
-	return 0;
-}
-
-
-//joelin 04/16/2005-end
-EXPORT_SYMBOL(meiDebugWrite);
-EXPORT_SYMBOL(ifx_pop_eoc);
-
-MODULE_LICENSE("GPL");
-
-module_init(amazon_mei_init_module);
-module_exit(amazon_mei_cleanup_module);
-
diff --git a/target/linux/amazon/files/drivers/char/ifx_ssc.c b/target/linux/amazon/files/drivers/char/ifx_ssc.c
deleted file mode 100644
index ea01659a9..000000000
--- a/target/linux/amazon/files/drivers/char/ifx_ssc.c
+++ /dev/null
@@ -1,2121 +0,0 @@
-/**************************************************
- *
- * drivers/ifx/serial/ifx_ssc.c
- *
- * Driver for IFX_SSC serial ports
- *
- * Copyright (C) 2004 Infineon Technologies AG
- * Author Michael Schoenenborn (IFX COM TI BT)
- *
- */
-#define IFX_SSC_DRV_VERSION "0.2.1"
-/*
- **************************************************
- *
- * This driver was originally based on the INCA-IP driver, but due to 
- * fundamental conceptual drawbacks there has been changed a lot.
- *
- * Based on INCA-IP driver Copyright (c) 2003 Gary Jennejohn <gj@denx.de>
- * Based on the VxWorks drivers Copyright (c) 2002, Infineon Technologies.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
-
-// ### TO DO: general issues:
-//	      - power management
-//	      - interrupt handling (direct/indirect)
-//	      - pin/mux-handling (just overall concept due to project dependency)
-//	      - multiple instances capability
-//	      - slave functionality
-
-/*
- * Include section 
- */
-#ifndef EXPORT_SYMTAB
-#define EXPORT_SYMTAB
-#endif
-
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/errno.h>
-#include <linux/signal.h>
-#include <linux/sched.h>
-#include <linux/timer.h>
-#include <linux/interrupt.h>
-#include <linux/major.h>
-#include <linux/string.h>
-#include <linux/fs.h>
-#include <linux/proc_fs.h>
-#include <linux/fcntl.h>
-#include <linux/ptrace.h>
-#include <linux/mm.h>
-#include <linux/ioport.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/spinlock.h>
-#include <linux/slab.h>
-//#include <linux/poll.h>
-
-#include <asm/system.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/uaccess.h>
-#include <asm/bitops.h>
-
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/version.h>
-
-#include <asm/amazon/amazon.h>
-#include <asm/amazon/irq.h>
-#include <asm/amazon/ifx_ssc_defines.h>
-#include <asm/amazon/ifx_ssc.h>
-
-#ifdef SSC_FRAME_INT_ENABLE
-#undef SSC_FRAME_INT_ENABLE
-#endif
-
-#define not_yet
-
-#define SPI_VINETIC
-
-/*
- * Deal with CONFIG_MODVERSIONS
- */
-#if CONFIG_MODVERSIONS==1
-# include <linux/modversions.h>
-#endif
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Michael Schoenenborn");
-MODULE_DESCRIPTION("IFX SSC driver");
-MODULE_SUPPORTED_DEVICE("ifx_ssc");
-MODULE_PARM(maj, "i");
-MODULE_PARM_DESC(maj, "Major device number");
-
-/* allow the user to set the major device number */
-static int maj = 0;
-
-
-/*
- * This is the per-channel data structure containing pointers, flags
- * and variables for the port. This driver supports a maximum of PORT_CNT.
- * isp is allocated in ifx_ssc_init() based on the chip version.
- */
-static struct ifx_ssc_port *isp;
-
-/* prototypes for fops */
-static ssize_t ifx_ssc_read(struct file *, char *, size_t, loff_t *);
-static ssize_t ifx_ssc_write(struct file *, const char *, size_t, loff_t *);
-//static unsigned int ifx_ssc_poll(struct file *, struct poll_table_struct *);
-int ifx_ssc_ioctl(struct inode *, struct file *, unsigned int, unsigned long);
-int ifx_ssc_open(struct inode *, struct file *);
-int ifx_ssc_close(struct inode *, struct file *);
-
-/* other forward declarations */
-static unsigned int ifx_ssc_get_kernel_clk(struct ifx_ssc_port *info);
-static void ifx_ssc_rx_int(int, void *, struct pt_regs *);
-static void ifx_ssc_tx_int(int, void *, struct pt_regs *);
-static void ifx_ssc_err_int(int, void *, struct pt_regs *);
-#ifdef SSC_FRAME_INT_ENABLE
-static void ifx_ssc_frm_int(int, void *, struct pt_regs *);
-#endif
-static void tx_int(struct ifx_ssc_port *);
-static int ifx_ssc1_read_proc(char *, char **, off_t, int, int *, void *);
-static void ifx_gpio_init(void);
-/************************************************************************
- *  Function declaration
- ************************************************************************/
-//interrupt.c
-extern unsigned int amazon_get_fpi_hz(void);
-extern void disable_amazon_irq(unsigned int irq_nr);
-extern void enable_amazon_irq(unsigned int irq_nr);
-extern void mask_and_ack_amazon_irq(unsigned int irq_nr);
-
-
-/*****************************************************************/
-typedef struct {
-	int (*request)(unsigned int irq, 
-		       void (*handler)(int, void *, struct pt_regs *), 
-		       unsigned long irqflags,
-		       const char * devname, 
-		       void *dev_id);
-	void (*free)(unsigned int irq, void *dev_id);
-	void (*enable)(unsigned int irq);
-	void (*disable)(unsigned int irq);
-        void (*clear)(unsigned int irq);
-} ifx_int_wrapper_t;
-
-static ifx_int_wrapper_t ifx_int_wrapper = {
-	request:	request_irq,	// IM action: enable int
-	free:		free_irq,	// IM action: disable int
-	enable:		enable_amazon_irq,
-	disable:	disable_amazon_irq,
-        clear:          mask_and_ack_amazon_irq,
-	//end:		
-};
-
-/* Fops-struct */
-static struct file_operations ifx_ssc_fops = {
-        owner:		THIS_MODULE,
-	read:		ifx_ssc_read,    /* read */
-	write:		ifx_ssc_write,   /* write */
-//        poll:		ifx_ssc_poll,    /* poll */
-        ioctl:		ifx_ssc_ioctl,   /* ioctl */
-        open:		ifx_ssc_open,    /* open */
-        release:	ifx_ssc_close,   /* release */
-};
-
-
-static inline unsigned int ifx_ssc_get_kernel_clk(struct ifx_ssc_port *info)
-{ // ATTENTION: This function assumes that the CLC register is set with the 
-  // appropriate value for RMC.
-	unsigned int rmc;
-
-	rmc = (READ_PERIPHERAL_REGISTER(info->mapbase + IFX_SSC_CLC) & 
-	       IFX_CLC_RUN_DIVIDER_MASK) >> IFX_CLC_RUN_DIVIDER_OFFSET;
-	if (rmc == 0){
-		printk("ifx_ssc_get_kernel_clk rmc==0 \n");
-		return (0);
-	}
-	return (amazon_get_fpi_hz() / rmc);
-}
-
-#ifndef not_yet
-#ifdef IFX_SSC_INT_USE_BH
-/*
- * This routine is used by the interrupt handler to schedule
- * processing in the software interrupt portion of the driver
- * (also known as the "bottom half").  This can be called any
- * number of times for any channel without harm.
- */
-static inline void
-ifx_ssc_sched_event(struct ifx_ssc_port *info, int event)
-{
-    info->event |= 1 << event; /* remember what kind of event and who */
-    queue_task(&info->tqueue, &tq_cyclades); /* it belongs to */
-    mark_bh(CYCLADES_BH);                       /* then trigger event */
-} /* ifx_ssc_sched_event */
-
-
-/*
- * This routine is used to handle the "bottom half" processing for the
- * serial driver, known also the "software interrupt" processing.
- * This processing is done at the kernel interrupt level, after the
- * cy#/_interrupt() has returned, BUT WITH INTERRUPTS TURNED ON.  This
- * is where time-consuming activities which can not be done in the
- * interrupt driver proper are done; the interrupt driver schedules
- * them using ifx_ssc_sched_event(), and they get done here.
- *
- * This is done through one level of indirection--the task queue.
- * When a hardware interrupt service routine wants service by the
- * driver's bottom half, it enqueues the appropriate tq_struct (one
- * per port) to the tq_cyclades work queue and sets a request flag
- * via mark_bh for processing that queue.  When the time is right,
- * do_ifx_ssc_bh is called (because of the mark_bh) and it requests
- * that the work queue be processed.
- *
- * Although this may seem unwieldy, it gives the system a way to
- * pass an argument (in this case the pointer to the ifx_ssc_port
- * structure) to the bottom half of the driver.  Previous kernels
- * had to poll every port to see if that port needed servicing.
- */
-static void
-do_ifx_ssc_bh(void)
-{
-    run_task_queue(&tq_cyclades);
-} /* do_ifx_ssc_bh */
-
-static void
-do_softint(void *private_)
-{
-  struct ifx_ssc_port *info = (struct ifx_ssc_port *) private_;
-
-    if (test_and_clear_bit(Cy_EVENT_HANGUP, &info->event)) {
-        wake_up_interruptible(&info->open_wait);
-        info->flags &= ~(ASYNC_NORMAL_ACTIVE|
-                             ASYNC_CALLOUT_ACTIVE);
-    }
-    if (test_and_clear_bit(Cy_EVENT_OPEN_WAKEUP, &info->event)) {
-        wake_up_interruptible(&info->open_wait);
-    }
-    if (test_and_clear_bit(Cy_EVENT_DELTA_WAKEUP, &info->event)) {
-	wake_up_interruptible(&info->delta_msr_wait);
-    }
-    if (test_and_clear_bit(Cy_EVENT_WRITE_WAKEUP, &info->event)) {
-        wake_up_interruptible(&tty->write_wait);
-    }
-#ifdef Z_WAKE
-    if (test_and_clear_bit(Cy_EVENT_SHUTDOWN_WAKEUP, &info->event)) {
-        wake_up_interruptible(&info->shutdown_wait);
-    }
-#endif
-} /* do_softint */
-#endif /* IFX_SSC_INT_USE_BH */
-#endif // not_yet
-
-inline static void
-rx_int(struct ifx_ssc_port *info)
-{
-	int		fifo_fill_lev, bytes_in_buf, i;
-	unsigned long	tmp_val;
-	unsigned long	*tmp_ptr;
-	unsigned int	rx_valid_cnt;
-	/* number of words waiting in the RX FIFO */
-	fifo_fill_lev = (READ_PERIPHERAL_REGISTER(info->mapbase + 
-                                                  IFX_SSC_FSTAT) & 
-                         IFX_SSC_FSTAT_RECEIVED_WORDS_MASK) >>
-                         IFX_SSC_FSTAT_RECEIVED_WORDS_OFFSET;
-        // Note: There are always 32 bits in a fifo-entry except for the last 
-        // word of a contigous transfer block and except for not in rx-only 
-        // mode and CON.ENBV set. But for this case it should be a convention 
-        // in software which helps:
-        // In tx or rx/tx mode all transfers from the buffer to the FIFO are 
-        // 32-bit wide, except for the last three bytes, which could be a 
-        // combination of 16- and 8-bit access.
-        // => The whole block is received as 32-bit words as a contigous stream, 
-        // even if there was a gap in tx which has the fifo run out of data! 
-        // Just the last fifo entry *may* be partially filled (0, 1, 2 or 3 bytes)!
-
-	/* free space in the RX buffer */
-	bytes_in_buf = info->rxbuf_end - info->rxbuf_ptr;
-        // transfer with 32 bits per entry
-	while ((bytes_in_buf >= 4) && (fifo_fill_lev > 0)) {
-		tmp_ptr = (unsigned long *)info->rxbuf_ptr;
-                *tmp_ptr = READ_PERIPHERAL_REGISTER(info->mapbase + IFX_SSC_RB);
-                info->rxbuf_ptr += 4;
-                info->stats.rxBytes += 4;
-                fifo_fill_lev --;
-                bytes_in_buf -= 4;
-	} // while ((bytes_in_buf >= 4) && (fifo_fill_lev > 0))
-        // now do the rest as mentioned in STATE.RXBV
-        while ((bytes_in_buf > 0) && (fifo_fill_lev > 0)) {
-                rx_valid_cnt = (READ_PERIPHERAL_REGISTER(info->mapbase + IFX_SSC_STATE) & 
-                                IFX_SSC_STATE_RX_BYTE_VALID_MASK) >> 
-                        IFX_SSC_STATE_RX_BYTE_VALID_OFFSET;
-		if (rx_valid_cnt == 0) break;
-                if (rx_valid_cnt > bytes_in_buf) {
-                        // ### TO DO: warning message: not block aligned data, other data 
-                        //                             in this entry will be lost
-                        rx_valid_cnt = bytes_in_buf;
-                }
-                tmp_val = READ_PERIPHERAL_REGISTER(info->mapbase + IFX_SSC_RB);
-		
-                for (i=0; i<rx_valid_cnt; i++) {		
-			*info->rxbuf_ptr = (tmp_val >> ( 8 * (rx_valid_cnt - i-1))) & 0xff;
-/*			
-                        *info->rxbuf_ptr = tmp_val & 0xff;
-                        tmp_val >>= 8;
-*/			
-			bytes_in_buf--;
-
-			
-			info->rxbuf_ptr++;
-                }
-                info->stats.rxBytes += rx_valid_cnt;
-        }  // while ((bytes_in_buf > 0) && (fifo_fill_lev > 0))
-
-        // check if transfer is complete
-        if (info->rxbuf_ptr >= info->rxbuf_end) {
-                ifx_int_wrapper.disable(info->rxirq);
-                /* wakeup any processes waiting in read() */
-                wake_up_interruptible(&info->rwait);
-                /* and in poll() */
-                //wake_up_interruptible(&info->pwait);
-        } else if ((info->opts.modeRxTx == IFX_SSC_MODE_RX) && 
-		   (READ_PERIPHERAL_REGISTER(info->mapbase + IFX_SSC_RXCNT) == 0)) {
-		// if buffer not filled completely and rx request done initiate new transfer
-/*
-		if  (info->rxbuf_end - info->rxbuf_ptr < 65536)
-*/
-		if  (info->rxbuf_end - info->rxbuf_ptr < IFX_SSC_RXREQ_BLOCK_SIZE)
-                        WRITE_PERIPHERAL_REGISTER((info->rxbuf_end - info->rxbuf_ptr) << 
-						  IFX_SSC_RXREQ_RXCOUNT_OFFSET, 
-                                                  info->mapbase + IFX_SSC_RXREQ);
-                else 
-			WRITE_PERIPHERAL_REGISTER(IFX_SSC_RXREQ_BLOCK_SIZE << IFX_SSC_RXREQ_RXCOUNT_OFFSET, 
-                                                  info->mapbase + IFX_SSC_RXREQ);
-	}
-} // rx_int
-
-inline static void
-tx_int(struct ifx_ssc_port *info)
-{
-	
-	int fifo_space, fill, i;
-	fifo_space = ((READ_PERIPHERAL_REGISTER(info->mapbase + IFX_SSC_ID) & 
-                       IFX_SSC_PERID_TXFS_MASK) >> IFX_SSC_PERID_TXFS_OFFSET) - 
-                ((READ_PERIPHERAL_REGISTER(info->mapbase + IFX_SSC_FSTAT) & 
-                  IFX_SSC_FSTAT_TRANSMIT_WORDS_MASK) >> 
-                 IFX_SSC_FSTAT_TRANSMIT_WORDS_OFFSET);
-
-	if (fifo_space == 0)
-		return;
-
-	fill = info->txbuf_end - info->txbuf_ptr;
-
-	if (fill > fifo_space * 4)
-		fill = fifo_space * 4;
-
-	for (i = 0; i < fill / 4; i++) {
-                // at first 32 bit access
-		WRITE_PERIPHERAL_REGISTER(*(UINT32 *)info->txbuf_ptr, info->mapbase + IFX_SSC_TB);
-                info->txbuf_ptr += 4;
-	}
-
-        fifo_space -= fill / 4;
-	info->stats.txBytes += fill & ~0x3;
-        fill &= 0x3;
-        if ((fifo_space > 0) & (fill > 1)) {
-                // trailing 16 bit access
-                WRITE_PERIPHERAL_REGISTER_16(*(UINT16 *)info->txbuf_ptr, info->mapbase + IFX_SSC_TB);
-                info->txbuf_ptr += 2;
-                info->stats.txBytes += 2;
-                fifo_space --;
-/* added by bingtao */
-		fill -=2;
-	}
-        if ((fifo_space > 0) & (fill > 0)) {
-                // trailing 8 bit access
-                WRITE_PERIPHERAL_REGISTER_8(*(UINT8 *)info->txbuf_ptr, info->mapbase + IFX_SSC_TB);
-                info->txbuf_ptr ++;
-                info->stats.txBytes ++;
-/*
-                fifo_space --;
-*/
-	}
-
-        // check if transmission complete
-        if (info->txbuf_ptr >= info->txbuf_end) {
-                ifx_int_wrapper.disable(info->txirq);
-                kfree(info->txbuf);
-                info->txbuf = NULL;
-                /* wake up any process waiting in poll() */
-                //wake_up_interruptible(&info->pwait);
-        }	
-
-} // tx_int
-
-static void
-ifx_ssc_rx_int(int irq, void *dev_id, struct pt_regs *regs)
-{
-	struct ifx_ssc_port *info = (struct ifx_ssc_port *)dev_id;
-	//WRITE_PERIPHERAL_REGISTER(IFX_SSC_R_BIT, info->mapbase + IFX_SSC_IRN_CR);
-        rx_int(info);
-}
-
-static void
-ifx_ssc_tx_int(int irq, void *dev_id, struct pt_regs *regs)
-{
-	struct ifx_ssc_port *info = (struct ifx_ssc_port *)dev_id;
-	//WRITE_PERIPHERAL_REGISTER(IFX_SSC_T_BIT, info->mapbase + IFX_SSC_IRN_CR);
-        tx_int(info);
-}
-
-static void
-ifx_ssc_err_int(int irq, void *dev_id, struct pt_regs *regs)
-{
-	struct ifx_ssc_port *info = (struct ifx_ssc_port *)dev_id;
-	unsigned int state;
-	unsigned int write_back = 0;
-	unsigned long flags;
-
-
-	local_irq_save(flags);
-	state = READ_PERIPHERAL_REGISTER(info->mapbase + IFX_SSC_STATE); 
-
-	if ((state & IFX_SSC_STATE_RX_UFL) != 0) {
-		info->stats.rxUnErr++;
-		write_back |= IFX_SSC_WHBSTATE_CLR_RX_UFL_ERROR;
-	}
-	if ((state & IFX_SSC_STATE_RX_OFL) != 0) {
-		info->stats.rxOvErr++;
-		write_back |= IFX_SSC_WHBSTATE_CLR_RX_OFL_ERROR;
-	}
-	if ((state & IFX_SSC_STATE_TX_OFL) != 0) {
-		info->stats.txOvErr++;
-		write_back |= IFX_SSC_WHBSTATE_CLR_TX_OFL_ERROR;
-	}
-	if ((state & IFX_SSC_STATE_TX_UFL) != 0) {
-		info->stats.txUnErr++;
-		write_back |= IFX_SSC_WHBSTATE_CLR_TX_UFL_ERROR;
-	}
-//	if ((state & IFX_SSC_STATE_ABORT_ERR) != 0) {
-//		info->stats.abortErr++;
-//		write_back |= IFX_SSC_WHBSTATE_CLR_ABORT_ERROR;
-//	}
-	if ((state & IFX_SSC_STATE_MODE_ERR) != 0) {
-		info->stats.modeErr++;
-		write_back |= IFX_SSC_WHBSTATE_CLR_MODE_ERROR;
-	}
-
-	if (write_back)
-		WRITE_PERIPHERAL_REGISTER(write_back, 
-					  info->mapbase + IFX_SSC_WHBSTATE);
-
-	local_irq_restore(flags);
-}
-
-#ifdef SSC_FRAME_INT_ENABLE
-static void
-ifx_ssc_frm_int(int irq, void *dev_id, struct pt_regs *regs)
-{
-	// ### TO DO: wake up framing wait-queue in conjunction with batch execution
-}
-#endif
-
-static void
-ifx_ssc_abort(struct ifx_ssc_port *info)
-{
-	unsigned long flags;
-	bool enabled;
-
-        local_irq_save(flags);
-
-	// disable all int's
-	ifx_int_wrapper.disable(info->rxirq);
-	ifx_int_wrapper.disable(info->txirq);
-	ifx_int_wrapper.disable(info->errirq);
-/*
-	ifx_int_wrapper.disable(info->frmirq);
-*/
-        local_irq_restore(flags);
-
-	// disable SSC (also aborts a receive request!)
-	// ### TO DO: Perhaps it's better to abort after the receiption of a 
-	// complete word. The disable cuts the transmission immediatly and 
-	// releases the chip selects. This could result in unpredictable 
-	// behavior of connected external devices!
-	enabled = (READ_PERIPHERAL_REGISTER(info->mapbase + IFX_SSC_STATE) 
-		   & IFX_SSC_STATE_IS_ENABLED) != 0;
-	WRITE_PERIPHERAL_REGISTER(IFX_SSC_WHBSTATE_CLR_ENABLE, 
-				  info->mapbase + IFX_SSC_WHBSTATE);
-
-
-	// flush fifos
-        WRITE_PERIPHERAL_REGISTER(IFX_SSC_XFCON_FIFO_FLUSH, 
-                                  info->mapbase + IFX_SSC_TXFCON);
-        WRITE_PERIPHERAL_REGISTER(IFX_SSC_XFCON_FIFO_FLUSH, 
-                                  info->mapbase + IFX_SSC_RXFCON);
-
-	// free txbuf
-	if (info->txbuf != NULL) {
-		kfree(info->txbuf);
-		info->txbuf = NULL;
-	}
-
-	// wakeup read process
-	if (info->rxbuf != NULL)
-		wake_up_interruptible(&info->rwait);
-
-	// clear pending int's 
-	ifx_int_wrapper.clear(info->rxirq);
-	ifx_int_wrapper.clear(info->txirq);
-	ifx_int_wrapper.clear(info->errirq);
-/*
-	ifx_int_wrapper.clear(info->frmirq);
-*/
-
-	// clear error flags
-	WRITE_PERIPHERAL_REGISTER(IFX_SSC_WHBSTATE_CLR_ALL_ERROR,
-				  info->mapbase + IFX_SSC_WHBSTATE);
-
-	//printk("IFX SSC%d: Transmission aborted\n", info->port_nr);
-	// enable SSC
-	if (enabled)
-		WRITE_PERIPHERAL_REGISTER(IFX_SSC_WHBSTATE_SET_ENABLE, 
-					  info->mapbase + IFX_SSC_WHBSTATE);
-
-} // ifx_ssc_abort
-
-
-/*
- * This routine is called whenever a port is opened.  It enforces
- * exclusive opening of a port and enables interrupts, etc.
- */
-int
-ifx_ssc_open(struct inode *inode, struct file * filp)
-{
-	struct ifx_ssc_port  *info;
-	int line;
-	int from_kernel = 0;
-
-	if ((inode == (struct inode *)0) || (inode == (struct inode *)1)) {
-		from_kernel = 1;
-		line = (int)inode;
-	}
-	else {
-		line = MINOR(filp->f_dentry->d_inode->i_rdev);
-		filp->f_op = &ifx_ssc_fops;
-	}
-
-	/* don't open more minor devices than we can support */
-	if (line < 0 || line >= PORT_CNT)
-		return -ENXIO;
-
-	info = &isp[line];
-
-	/* exclusive open */
-	if (info->port_is_open != 0)
-		return -EBUSY;
-	info->port_is_open++;
-
-	ifx_int_wrapper.disable(info->rxirq);
-	ifx_int_wrapper.disable(info->txirq);
-	ifx_int_wrapper.disable(info->errirq);
-/*
-	ifx_int_wrapper.disable(info->frmirq);
-*/
-
-	/* Flush and enable TX/RX FIFO */
-	WRITE_PERIPHERAL_REGISTER((IFX_SSC_DEF_TXFIFO_FL << 
-                                   IFX_SSC_XFCON_ITL_OFFSET) | 
-				  IFX_SSC_XFCON_FIFO_FLUSH   |
-                                  IFX_SSC_XFCON_FIFO_ENABLE, 
-                                  info->mapbase + IFX_SSC_TXFCON);
-        WRITE_PERIPHERAL_REGISTER((IFX_SSC_DEF_RXFIFO_FL << 
-                                   IFX_SSC_XFCON_ITL_OFFSET) |
-				  IFX_SSC_XFCON_FIFO_FLUSH   | 
-                                  IFX_SSC_XFCON_FIFO_ENABLE, 
-                                  info->mapbase + IFX_SSC_RXFCON);
-
-
-	/* logically flush the software FIFOs */
-	info->rxbuf_ptr = 0;
-	info->txbuf_ptr = 0;
-
-	/* clear all error bits */
-	WRITE_PERIPHERAL_REGISTER(IFX_SSC_WHBSTATE_CLR_ALL_ERROR,
-				  info->mapbase + IFX_SSC_WHBSTATE);
-
-	// clear pending interrupts
-	ifx_int_wrapper.clear(info->rxirq);
-	ifx_int_wrapper.clear(info->txirq);
-	ifx_int_wrapper.clear(info->errirq);
-/*
-	ifx_int_wrapper.clear(info->frmirq);
-*/
-
-	// enable SSC
-	WRITE_PERIPHERAL_REGISTER(IFX_SSC_WHBSTATE_SET_ENABLE, 
-				  info->mapbase + IFX_SSC_WHBSTATE);
-
-	MOD_INC_USE_COUNT;
-
-	return 0;
-} /* ifx_ssc_open */
-EXPORT_SYMBOL(ifx_ssc_open);
-
-/*
- * This routine is called when a particular device is closed.
- */
-int
-ifx_ssc_close(struct inode *inode, struct file *filp)
-{
-	struct ifx_ssc_port *info;
-        int idx;
-
-	if ((inode == (struct inode *)0) || (inode == (struct inode *)1))
-		idx = (int)inode;
-	else
-		idx = MINOR(filp->f_dentry->d_inode->i_rdev);
-
-	if (idx < 0 || idx >= PORT_CNT)
-		return -ENXIO;
-
-	info = &isp[idx];
-        if (!info)
-                return -ENXIO;
-
-	// disable SSC
-	WRITE_PERIPHERAL_REGISTER(IFX_SSC_WHBSTATE_CLR_ENABLE, 
-				  info->mapbase + IFX_SSC_WHBSTATE);
-
-	// call abort function to disable int's, flush fifos...
-	ifx_ssc_abort(info);
-
-	info->port_is_open --;
-	MOD_DEC_USE_COUNT;
-
-	return 0;
-} /* ifx_ssc_close */
-EXPORT_SYMBOL(ifx_ssc_close);
-
-/* added by bingtao */
-/* helper routine to handle reads from the kernel or user-space */
-/* info->rxbuf : never kfree and contains valid data */
-/* should be points to NULL after copying data !!! */
-static ssize_t
-ifx_ssc_read_helper_poll(struct ifx_ssc_port *info, char *buf, size_t len,
-                    int from_kernel)
-{
-        ssize_t         ret_val;
-	unsigned long   flags;
-
-        if (info->opts.modeRxTx == IFX_SSC_MODE_TX) 
-                return -EFAULT;
-        local_irq_save(flags);
-        info->rxbuf_ptr = info->rxbuf;
-        info->rxbuf_end = info->rxbuf + len;
-        local_irq_restore(flags);
-/* Vinetic driver always works in IFX_SSC_MODE_RXTX */ 
-/* TXRX in poll mode */
-	while (info->rxbuf_ptr < info->rxbuf_end){
-/* This is the key point, if you don't check this condition 
-   kfree (NULL) will happen 
-   because tx only need write into FIFO, it's much fast than rx
-   So when rx still waiting , tx already finish and release buf	
-*/	
-		if (info->txbuf_ptr < info->txbuf_end) {
-			tx_int(info);
-		}
-		
-		rx_int(info);
-        };
-
-        ret_val = info->rxbuf_ptr - info->rxbuf; 
-	return (ret_val);
-} // ifx_ssc_read_helper_poll
-
-/* helper routine to handle reads from the kernel or user-space */
-/* info->rx_buf : never kfree and contains valid data */
-/* should be points to NULL after copying data !!! */
-static ssize_t
-ifx_ssc_read_helper(struct ifx_ssc_port *info, char *buf, size_t len,
-                    int from_kernel)
-{
-        ssize_t         ret_val;
-	unsigned long   flags;
-        DECLARE_WAITQUEUE(wait, current);
-
-        if (info->opts.modeRxTx == IFX_SSC_MODE_TX) 
-                return -EFAULT;
-        local_irq_save(flags);
-        info->rxbuf_ptr = info->rxbuf;
-        info->rxbuf_end = info->rxbuf + len;
-        if (info->opts.modeRxTx == IFX_SSC_MODE_RXTX) {
-                if ((info->txbuf == NULL) ||
-                    (info->txbuf != info->txbuf_ptr) ||
-                    (info->txbuf_end != len + info->txbuf)) {
-                        local_irq_restore(flags);
-                        printk("IFX SSC - %s: write must be called before calling "
-                               "read in combined RX/TX!\n", __FUNCTION__);
-                        return -EFAULT;
-                }
-		local_irq_restore(flags);
-		/* should enable tx, right?*/
-		tx_int(info);
-		if (info->txbuf_ptr < info->txbuf_end){
-			ifx_int_wrapper.enable(info->txirq);
-		}
-                
-		ifx_int_wrapper.enable(info->rxirq);
-        } else { // rx mode
-		local_irq_restore(flags);
-                if (READ_PERIPHERAL_REGISTER(info->mapbase + IFX_SSC_RXCNT) &
-                    IFX_SSC_RXCNT_TODO_MASK)
-                        return -EBUSY;
-		ifx_int_wrapper.enable(info->rxirq);
-		// rx request limited to ' bytes
-/*
-                if (len < 65536)
-*/
-                if (len < IFX_SSC_RXREQ_BLOCK_SIZE)
-                        WRITE_PERIPHERAL_REGISTER(len << IFX_SSC_RXREQ_RXCOUNT_OFFSET, 
-                                                  info->mapbase + IFX_SSC_RXREQ);
-                else 
-			WRITE_PERIPHERAL_REGISTER(IFX_SSC_RXREQ_BLOCK_SIZE << IFX_SSC_RXREQ_RXCOUNT_OFFSET, 
-                                                  info->mapbase + IFX_SSC_RXREQ);
-        }
-
-        __add_wait_queue(&info->rwait, &wait);
-        set_current_state(TASK_INTERRUPTIBLE);
-        // wakeup done in rx_int
- 
-        do {
-		local_irq_save(flags);
-                if (info->rxbuf_ptr >= info->rxbuf_end)
-                        break;
-		local_irq_restore(flags);
-
-//                if (filp->f_flags & O_NONBLOCK)
-//                {
-//                        N = -EAGAIN;
-//                        goto out;
-//                }
-                if (signal_pending(current)) {
-                        ret_val = -ERESTARTSYS;
-                        goto out;
-                }
-                schedule();
-        } while (1);
-
-        ret_val = info->rxbuf_ptr - info->rxbuf; // should be equal to len
-	local_irq_restore(flags);
-
-  out:
-        current->state = TASK_RUNNING;
-        __remove_wait_queue(&info->rwait, &wait);
-	return (ret_val);
-} // ifx_ssc_read_helper
-
-
-#if 0
-/* helper routine to handle reads from the kernel or user-space */
-/* appropriate in interrupt context */
-static ssize_t
-ifx_ssc_read_helper(struct ifx_ssc_port *info, char *buf, size_t len,
-                    int from_kernel)
-{
-        ssize_t         ret_val;
-	unsigned long   flags;
-       	DECLARE_WAITQUEUE(wait, current);
-	
-        if (info->opts.modeRxTx == IFX_SSC_MODE_TX) 
-                return -EFAULT;
-        local_irq_save(flags);
-        info->rxbuf_ptr = info->rxbuf;
-        info->rxbuf_end = info->rxbuf + len;
-        if (info->opts.modeRxTx == IFX_SSC_MODE_RXTX) {
-                if ((info->txbuf == NULL) ||
-                    (info->txbuf != info->txbuf_ptr) ||
-                    (info->txbuf_end != len + info->txbuf)) {
-                        local_irq_restore(flags);
-                        printk("IFX SSC - %s: write must be called before calling "
-                               "read in combined RX/TX!\n", __FUNCTION__);
-                        return -EFAULT;
-                }
-		local_irq_restore(flags);
-		/* should enable tx, right?*/
-		tx_int(info);
-		if (!in_irq()){
-			if (info->txbuf_ptr < info->txbuf_end){
-				ifx_int_wrapper.enable(info->txirq);
-			}
-			ifx_int_wrapper.enable(info->rxirq);
-		}
-        } else { // rx mode
-		local_irq_restore(flags);
-                if (READ_PERIPHERAL_REGISTER(info->mapbase + IFX_SSC_RXCNT) &
-                    IFX_SSC_RXCNT_TODO_MASK)
-                        return -EBUSY;
-		if (!in_irq()){
-			ifx_int_wrapper.enable(info->rxirq);
-		}
-
-                if (len < IFX_SSC_RXREQ_BLOCK_SIZE)
-                        WRITE_PERIPHERAL_REGISTER(len << IFX_SSC_RXREQ_RXCOUNT_OFFSET, 
-                                                  info->mapbase + IFX_SSC_RXREQ);
-                else 
-			WRITE_PERIPHERAL_REGISTER(IFX_SSC_RXREQ_BLOCK_SIZE << IFX_SSC_RXREQ_RXCOUNT_OFFSET, 
-                                                  info->mapbase + IFX_SSC_RXREQ);
-        }
-	if (in_irq()){
-		do {
-			rx_int(info);
-			if (info->opts.modeRxTx == IFX_SSC_MODE_RXTX) {
-				tx_int(info);
-			}
-			
-                	if (info->rxbuf_ptr >= info->rxbuf_end)
-                        	break;
-        	} while (1);
-		ret_val = info->rxbuf_ptr - info->rxbuf;
-	}else{
-        	__add_wait_queue(&info->rwait, &wait);
-        	set_current_state(TASK_INTERRUPTIBLE);
-        	// wakeup done in rx_int
- 	
-        	do {
-			local_irq_save(flags);
-                	if (info->rxbuf_ptr >= info->rxbuf_end)
-                        	break;
-			local_irq_restore(flags);
-
-                	if (signal_pending(current)) {
-                        	ret_val = -ERESTARTSYS;
-                        	goto out;
-                	}
-                	schedule();
-        	} while (1);
-
-        	ret_val = info->rxbuf_ptr - info->rxbuf; // should be equal to len
-		local_irq_restore(flags);
-
-  out:
-        	current->state = TASK_RUNNING;
-        	__remove_wait_queue(&info->rwait, &wait);
-	}
-	return (ret_val);
-} // ifx_ssc_read_helper
-#endif
-
-/* helper routine to handle writes to the kernel or user-space */
-/* info->txbuf has two cases:
- *	1) return value < 0 (-EFAULT), not touched at all
- *	2) kfree and points to NULL in interrupt routine (but maybe later )
- */
-static ssize_t
-ifx_ssc_write_helper(struct ifx_ssc_port *info, const char *buf,
-		size_t len, int from_kernel)
-{
-        // check if in tx or tx/rx mode
-        if (info->opts.modeRxTx == IFX_SSC_MODE_RX)
-                return -EFAULT;
-
-        info->txbuf_ptr = info->txbuf;
-        info->txbuf_end = len + info->txbuf;
-	/* start the transmission (not in rx/tx, see read helper) */
-        if (info->opts.modeRxTx == IFX_SSC_MODE_TX) {
-		tx_int(info);
-		if (info->txbuf_ptr < info->txbuf_end){
-			ifx_int_wrapper.enable(info->txirq);
-		}
-        }
-	//local_irq_restore(flags);
-        return len;
-}
-
-/*
- * kernel interfaces for read and write.
- * The caller must set port to: n for SSC<m> with n=m-1 (e.g. n=0 for SSC1)
- */
-ssize_t
-ifx_ssc_kread(int port, char *kbuf, size_t len)
-{
-	struct ifx_ssc_port *info;
-        ssize_t ret_val;
-
-	if (port < 0 || port >= PORT_CNT)
-		return -ENXIO;
-
-        if (len == 0)
-                return 0;
-
-	info = &isp[port];
-
-        // check if reception in progress
-        if (info->rxbuf != NULL){
-		printk("SSC device busy\n");
-                return -EBUSY;
-	}
-
-	info->rxbuf = kbuf;
-        if (info->rxbuf == NULL){
-		printk("SSC device error\n");
-                return -EINVAL;
-	}
-
-/* changed by bingtao */
-	/* change by TaiCheng */
-	//if (!in_irq()){
-	if (0){
-		ret_val = ifx_ssc_read_helper(info, kbuf, len, 1);
-	}else{
-		ret_val = ifx_ssc_read_helper_poll(info, kbuf, len, 1);
-	};		
-	info->rxbuf = NULL;
-
-        // ### TO DO: perhaps warn if ret_val != len
-	ifx_int_wrapper.disable(info->rxirq);
-
-        return (ret_val);
-} // ifx_ssc_kread
-EXPORT_SYMBOL(ifx_ssc_kread);
-
-ssize_t
-ifx_ssc_kwrite(int port, const char *kbuf, size_t len)
-{
-	struct ifx_ssc_port *info;
-	ssize_t ret_val;
-
-	if (port < 0 || port >= PORT_CNT)
-		return -ENXIO;
-
-        if (len == 0)
-                return 0;
-
-	info = &isp[port];
-
-        // check if transmission in progress
-        if (info->txbuf != NULL)
-                return -EBUSY;
-        info->txbuf = (char *)kbuf;
-
-	ret_val = ifx_ssc_write_helper(info, info->txbuf, len, 1);
-	if (ret_val < 0){
-		info->txbuf = NULL;
-	}
-	return ret_val;
-}
-EXPORT_SYMBOL(ifx_ssc_kwrite);
-
-
-/* 
- * user interfaces to read and write
- */
-static ssize_t
-ifx_ssc_read(struct file *filp, char *ubuf, size_t len, loff_t *off)
-{
-        ssize_t ret_val;
-        int idx;
-	struct ifx_ssc_port *info;
-
-/*
-        if (len == 0)
-                return (0);
-*/
-        idx = MINOR(filp->f_dentry->d_inode->i_rdev);
-	info = &isp[idx];
-
-        // check if reception in progress
-        if (info->rxbuf != NULL)
-                return -EBUSY;
-
-	info->rxbuf = kmalloc(len+ 3, GFP_KERNEL);
-        if (info->rxbuf == NULL)
-                return -ENOMEM;
-
-	ret_val = ifx_ssc_read_helper(info, info->rxbuf, len, 0);
-	// ### TO DO: perhaps warn if ret_val != len
-        if (copy_to_user((void*)ubuf, info->rxbuf, ret_val) != 0)
-                ret_val = -EFAULT;
-
-	ifx_int_wrapper.disable(info->rxirq);
-
-        kfree(info->rxbuf);
-	info->rxbuf = NULL;
-        return (ret_val);
-} // ifx_ssc_read
-
-/*
- * As many bytes as we have free space for are copied from the user
- * into txbuf and the actual byte count is returned. The transmission is
- * always kicked off by calling the appropriate TX routine.
- */
-static ssize_t
-ifx_ssc_write(struct file *filp, const char *ubuf, size_t len, loff_t *off)
-{
-        int idx;
-	struct ifx_ssc_port *info;
-	int ret_val;
-
-        if (len == 0)
-                return (0);
-
-        idx = MINOR(filp->f_dentry->d_inode->i_rdev);
-	info = &isp[idx];
-
-        // check if transmission in progress
-        if (info->txbuf != NULL)
-                return -EBUSY;
-
-	info->txbuf = kmalloc(len+ 3, GFP_KERNEL);
-        if (info->txbuf == NULL)
-                return -ENOMEM;
-
-	ret_val = copy_from_user(info->txbuf, ubuf, len);
-	if (ret_val == 0)
-		ret_val = ifx_ssc_write_helper(info, info->txbuf, len, 0);
-	else
-		ret_val = -EFAULT;
-	if (ret_val < 0) {
-                kfree(info->txbuf); // otherwise will be done in ISR
-		info->txbuf = NULL;
-	}
-	return (ret_val);
-} /* ifx_ssc_write */
-
-
-/*
- * ------------------------------------------------------------
- * ifx_ssc_ioctl() and friends
- * ------------------------------------------------------------
- */
-
-/*-----------------------------------------------------------------------------
- FUNC-NAME  : ifx_ssc_frm_status_get
- LONG-NAME  : framing status get
- PURPOSE    : Get the actual status of the framing.
-
- PARAMETER  : *info	pointer to the port-specific structure ifx_ssc_port.
-
- RESULT     : pointer to a structure ifx_ssc_frm_status which holds busy and 
-	      count values.
-
- REMARKS    : Returns a register value independent of framing is enabled or 
-	      not! Changes structure inside of info, so the return value isn't 
-	      needed at all, but could be used for simple access.
------------------------------------------------------------------------------*/
-static struct ifx_ssc_frm_status *
-ifx_ssc_frm_status_get(struct ifx_ssc_port *info)
-{
-	unsigned long tmp;
-	
-	tmp = READ_PERIPHERAL_REGISTER(info->mapbase + IFX_SSC_SFSTAT);
-	info->frm_status.DataBusy = (tmp & IFX_SSC_SFSTAT_IN_DATA) > 0;
-	info->frm_status.PauseBusy = (tmp & IFX_SSC_SFSTAT_IN_PAUSE) > 0;
-	info->frm_status.DataCount = (tmp & IFX_SSC_SFSTAT_DATA_COUNT_MASK) 
-		>> IFX_SSC_SFSTAT_DATA_COUNT_OFFSET;
-	info->frm_status.PauseCount = (tmp & IFX_SSC_SFSTAT_PAUSE_COUNT_MASK) 
-		>> IFX_SSC_SFSTAT_PAUSE_COUNT_OFFSET;
-	tmp = READ_PERIPHERAL_REGISTER(info->mapbase + IFX_SSC_SFCON);
-	info->frm_status.EnIntAfterData = 
-		(tmp & IFX_SSC_SFCON_FIR_ENABLE_BEFORE_PAUSE) > 0;
-	info->frm_status.EnIntAfterPause = 
-		(tmp & IFX_SSC_SFCON_FIR_ENABLE_AFTER_PAUSE) > 0;
-	return (&info->frm_status);
-} // ifx_ssc_frm_status_get
-
-
-/*-----------------------------------------------------------------------------
- FUNC-NAME  : ifx_ssc_frm_control_get
- LONG-NAME  : framing control get
- PURPOSE    : Get the actual control values of the framing.
-
- PARAMETER  : *info	pointer to the port-specific structure ifx_ssc_port.
-
- RESULT     : pointer to a structure ifx_ssc_frm_opts which holds control bits  
-	      and count reload values.
-
- REMARKS    : Changes structure inside of info, so the return value isn't 
-	      needed at all, but could be used for simple access.
------------------------------------------------------------------------------*/
-static struct ifx_ssc_frm_opts *
-ifx_ssc_frm_control_get(struct ifx_ssc_port *info)
-{
-	unsigned long tmp;
-	
-	tmp = READ_PERIPHERAL_REGISTER(info->mapbase + IFX_SSC_SFCON);
-	info->frm_opts.FrameEnable = (tmp & IFX_SSC_SFCON_SF_ENABLE) > 0;
-	info->frm_opts.DataLength = (tmp & IFX_SSC_SFCON_DATA_LENGTH_MASK) 
-		>> IFX_SSC_SFCON_DATA_LENGTH_OFFSET;
-	info->frm_opts.PauseLength = (tmp & IFX_SSC_SFCON_PAUSE_LENGTH_MASK) 
-		>> IFX_SSC_SFCON_PAUSE_LENGTH_OFFSET;
-	info->frm_opts.IdleData = (tmp & IFX_SSC_SFCON_PAUSE_DATA_MASK) 
-		>> IFX_SSC_SFCON_PAUSE_DATA_OFFSET;
-	info->frm_opts.IdleClock = (tmp & IFX_SSC_SFCON_PAUSE_CLOCK_MASK) 
-		>> IFX_SSC_SFCON_PAUSE_CLOCK_OFFSET;
-	info->frm_opts.StopAfterPause = 
-		(tmp & IFX_SSC_SFCON_STOP_AFTER_PAUSE) > 0;
-	return (&info->frm_opts);
-} // ifx_ssc_frm_control_get
-
-
-/*-----------------------------------------------------------------------------
- FUNC-NAME  : ifx_ssc_frm_control_set
- LONG-NAME  : framing control set
- PURPOSE    : Set the actual control values of the framing.
-
- PARAMETER  : *info	pointer to the port-specific structure ifx_ssc_port.
-
- RESULT     : pointer to a structure ifx_ssc_frm_opts which holds control bits  
-	      and count reload values.
-
- REMARKS    : 
------------------------------------------------------------------------------*/
-static int
-ifx_ssc_frm_control_set(struct ifx_ssc_port *info)
-{
-	unsigned long tmp;
-
-	// check parameters
-	if ((info->frm_opts.DataLength > IFX_SSC_SFCON_DATA_LENGTH_MAX) || 
-	    (info->frm_opts.DataLength < 1) ||
-	    (info->frm_opts.PauseLength > IFX_SSC_SFCON_PAUSE_LENGTH_MAX) || 
-	    (info->frm_opts.PauseLength < 1) ||
-	    ((info->frm_opts.IdleData & ~(IFX_SSC_SFCON_PAUSE_DATA_MASK >> 
-					  IFX_SSC_SFCON_PAUSE_DATA_OFFSET)) != 0 ) || 
-	    ((info->frm_opts.IdleClock & ~(IFX_SSC_SFCON_PAUSE_CLOCK_MASK >> 
-					   IFX_SSC_SFCON_PAUSE_CLOCK_OFFSET)) != 0 ))
-		return -EINVAL;
-
-	// read interrupt bits (they're not changed here)
-	tmp = READ_PERIPHERAL_REGISTER(info->mapbase + IFX_SSC_SFCON) &
-		(IFX_SSC_SFCON_FIR_ENABLE_BEFORE_PAUSE | 
-		 IFX_SSC_SFCON_FIR_ENABLE_AFTER_PAUSE);
-
-	// set all values with respect to it's bit position (for data and pause 
-	// length set N-1)
-	tmp = (info->frm_opts.DataLength - 1) << IFX_SSC_SFCON_DATA_LENGTH_OFFSET;
-	tmp |= (info->frm_opts.PauseLength - 1) << IFX_SSC_SFCON_PAUSE_LENGTH_OFFSET;
-	tmp |= info->frm_opts.IdleData << IFX_SSC_SFCON_PAUSE_DATA_OFFSET;
-	tmp |= info->frm_opts.IdleClock << IFX_SSC_SFCON_PAUSE_CLOCK_OFFSET;
-	tmp |= info->frm_opts.FrameEnable * IFX_SSC_SFCON_SF_ENABLE;
-	tmp |= info->frm_opts.StopAfterPause * IFX_SSC_SFCON_STOP_AFTER_PAUSE;
-
-	WRITE_PERIPHERAL_REGISTER(tmp, info->mapbase + IFX_SSC_SFCON);
-
-	return 0;
-} // ifx_ssc_frm_control_set
-
-
-/*-----------------------------------------------------------------------------
- FUNC-NAME  : ifx_ssc_rxtx_mode_set
- LONG-NAME  : rxtx mode set
- PURPOSE    : Set the transmission mode.
-
- PARAMETER  : *info	pointer to the port-specific structure ifx_ssc_port.
-
- RESULT     : Returns error code
-
- REMARKS    : Assumes that SSC not used (SSC disabled, device not opened yet 
-	      or just closed) 
------------------------------------------------------------------------------*/
-static int
-ifx_ssc_rxtx_mode_set(struct ifx_ssc_port *info, unsigned int val)
-{
-	unsigned long tmp;
-
-	// check parameters
-	if (!(info) || (val & ~(IFX_SSC_MODE_MASK)))
-		return -EINVAL;
-	/*check BUSY and RXCNT*/	
-	if (  READ_PERIPHERAL_REGISTER(info->mapbase + IFX_SSC_STATE) & IFX_SSC_STATE_BUSY
-	    ||READ_PERIPHERAL_REGISTER(info->mapbase + IFX_SSC_RXCNT) & IFX_SSC_RXCNT_TODO_MASK)
-		return -EBUSY;
-	// modify 
-	tmp = (READ_PERIPHERAL_REGISTER(info->mapbase + IFX_SSC_CON) &
-		~(IFX_SSC_CON_RX_OFF | IFX_SSC_CON_TX_OFF)) | (val);
-	WRITE_PERIPHERAL_REGISTER(tmp, info->mapbase + IFX_SSC_CON);
-	info->opts.modeRxTx = val;
-/*	
-	printk(KERN_DEBUG "IFX SSC%d: Setting mode to %s%s\n", 
-	       info->port_nr,
-	       ((val & IFX_SSC_CON_RX_OFF) == 0) ? "rx ":"", 
-	       ((val & IFX_SSC_CON_TX_OFF) == 0) ? "tx":"");
-*/
-	return 0;
-} // ifx_ssc_rxtx_mode_set
-
-void ifx_gpio_init(void) 
-{
-	u32	temp;
-/* set gpio pin p0.10(SPI_DIN) p0.11(SPI_DOUT) p0.12(SPI_CLK) p0.13(SPI_CS2) direction */
-	temp = *(AMAZON_GPIO_P0_DIR) ;
-      	temp &= 0xFFFFFBFF;
-      	temp |= 0x3800;
-	*(AMAZON_GPIO_P0_DIR) = temp;
-/* set port 0 alternate select register 0 */
-	temp = *(AMAZON_GPIO_P0_ALTSEL0) ;
-	temp &= 0xFFFFC3FF;
-	temp |= 0x00001c00;
-	*(AMAZON_GPIO_P0_ALTSEL0) = temp;
-
-/* set port 0 alternate select register 1 */
- 	temp = *(AMAZON_GPIO_P0_ALTSEL1) ;
-	temp &= 0xFFFFC3FF;
-	temp |= 0x00002000;
-	*(AMAZON_GPIO_P0_ALTSEL1) = temp;
-
-/* set port 0 open drain mode register */
-	temp = *(AMAZON_GPIO_P0_OD);
-	temp |= 0x00003800;	/* set output pin normal mode */
-	*(AMAZON_GPIO_P0_OD)= temp;
-}
-
-/*
- * This routine intializes the SSC appropriately depending
- * on slave/master and full-/half-duplex mode.
- * It assumes that the SSC is disabled and the fifo's and buffers 
- * are flushes later on.
- */
-static int
-ifx_ssc_sethwopts(struct ifx_ssc_port *info)
-{
-	unsigned long flags, bits;
-	struct ifx_ssc_hwopts *opts = &info->opts;
-
-	/* sanity checks */
-	if ((opts->dataWidth < IFX_SSC_MIN_DATA_WIDTH) ||
-	    (opts->dataWidth > IFX_SSC_MAX_DATA_WIDTH)) {
-		printk("%s: sanity check failed\n", __FUNCTION__);
-	    	return -EINVAL;
-	}
-        bits = (opts->dataWidth - 1) << IFX_SSC_CON_DATA_WIDTH_OFFSET;
-	bits |= IFX_SSC_CON_ENABLE_BYTE_VALID;
-//	if (opts->abortErrDetect)
-//		bits |= IFX_SSC_CON_ABORT_ERR_CHECK;
-	if (opts->rxOvErrDetect)
-		bits |= IFX_SSC_CON_RX_OFL_CHECK;
-	if (opts->rxUndErrDetect)
-		bits |= IFX_SSC_CON_RX_UFL_CHECK;
-	if (opts->txOvErrDetect)
-		bits |= IFX_SSC_CON_TX_OFL_CHECK;
-	if (opts->txUndErrDetect)
-		bits |= IFX_SSC_CON_TX_UFL_CHECK;
-	if (opts->loopBack)
-		bits |= IFX_SSC_CON_LOOPBACK_MODE;
-	if (opts->echoMode)
-		bits |= IFX_SSC_CON_ECHO_MODE_ON;
-	if (opts->headingControl)
-		bits |= IFX_SSC_CON_MSB_FIRST;
-	if (opts->clockPhase)
-		bits |= IFX_SSC_CON_LATCH_THEN_SHIFT;
-	if (opts->clockPolarity)
-		bits |= IFX_SSC_CON_CLOCK_FALL;
-	switch (opts->modeRxTx) {
-	case IFX_SSC_MODE_TX:
-		bits |= IFX_SSC_CON_RX_OFF;
-		break;
-	case IFX_SSC_MODE_RX:
-		bits |= IFX_SSC_CON_TX_OFF;
-		break;
-	} // switch (opts->modeRxT)
-	local_irq_save(flags);
-        WRITE_PERIPHERAL_REGISTER(bits, info->mapbase + IFX_SSC_CON);
-        WRITE_PERIPHERAL_REGISTER((info->opts.gpoCs << IFX_SSC_GPOCON_ISCSB0_POS) | 
-				  (info->opts.gpoInv << IFX_SSC_GPOCON_INVOUT0_POS), 
-				  info->mapbase + IFX_SSC_GPOCON);
-	//master mode
-	if (opts->masterSelect){
-		WRITE_PERIPHERAL_REGISTER(IFX_SSC_WHBSTATE_SET_MASTER_SELECT,info->mapbase + IFX_SSC_WHBSTATE);
-	}else{
-		WRITE_PERIPHERAL_REGISTER(IFX_SSC_WHBSTATE_CLR_MASTER_SELECT,info->mapbase + IFX_SSC_WHBSTATE);
-	}
-	// init serial framing
-        WRITE_PERIPHERAL_REGISTER(0, info->mapbase + IFX_SSC_SFCON);
-	/* set up the port pins */
-        //check for general requirements to switch (external) pad/pin characteristics
-	ifx_gpio_init();
-	local_irq_restore(flags);
-
-	return 0;
-} // ifx_ssc_sethwopts
-
-static int
-ifx_ssc_set_baud(struct ifx_ssc_port *info, unsigned int baud)
-{
-	unsigned int ifx_ssc_clock;
-	unsigned int br;
-	unsigned long flags;
-	bool enabled;
-
-	ifx_ssc_clock = ifx_ssc_get_kernel_clk(info);
-	if (ifx_ssc_clock ==0)
-		return -EINVAL;
-
-	local_irq_save(flags);
-	/* have to disable the SSC to set the baudrate */
-	enabled = (READ_PERIPHERAL_REGISTER(info->mapbase + IFX_SSC_STATE) 
-		   & IFX_SSC_STATE_IS_ENABLED) != 0;
-	WRITE_PERIPHERAL_REGISTER(IFX_SSC_WHBSTATE_CLR_ENABLE, 
-				  info->mapbase + IFX_SSC_WHBSTATE);
-
-	// compute divider
-	br = ((ifx_ssc_clock >> 1)/baud) - 1;
-	asm("SYNC"); 
-	if (br > 0xffff || 
-	    ((br == 0) && 
-	     ((READ_PERIPHERAL_REGISTER(info->mapbase + IFX_SSC_STATE) & 
-	       IFX_SSC_STATE_IS_MASTER) == 0))){
-		local_irq_restore(flags);
-		printk("%s: illegal baudrate %u\n", __FUNCTION__, baud);
-		return -EINVAL;
-	}
-	WRITE_PERIPHERAL_REGISTER(br, info->mapbase + IFX_SSC_BR);
-	if (enabled)
-		WRITE_PERIPHERAL_REGISTER(IFX_SSC_WHBSTATE_SET_ENABLE, 
-					  info->mapbase + IFX_SSC_WHBSTATE);
-
-	local_irq_restore(flags);
-	return 0;
-} // ifx_ssc_set_baud
-
-static int
-ifx_ssc_hwinit(struct ifx_ssc_port *info)
-{
-	unsigned long flags;
-	bool enabled;
-
-	/* have to disable the SSC */
-	enabled = (READ_PERIPHERAL_REGISTER(info->mapbase + IFX_SSC_STATE) 
-		   & IFX_SSC_STATE_IS_ENABLED) != 0;
-	WRITE_PERIPHERAL_REGISTER(IFX_SSC_WHBSTATE_CLR_ENABLE, 
-				  info->mapbase + IFX_SSC_WHBSTATE);
-
-	if (ifx_ssc_sethwopts(info) < 0)
-	{
-		printk("%s: setting the hardware options failed\n",
-                       __FUNCTION__);
-		return -EINVAL;
-	}
-
-	if (ifx_ssc_set_baud(info, info->baud) < 0) {
-		printk("%s: setting the baud rate failed\n", __FUNCTION__);
-		return -EINVAL;
-	}
-        local_irq_save(flags);
-        /* TX FIFO */
-        WRITE_PERIPHERAL_REGISTER((IFX_SSC_DEF_TXFIFO_FL << 
-                                   IFX_SSC_XFCON_ITL_OFFSET) | 
-                                  IFX_SSC_XFCON_FIFO_ENABLE, 
-                                  info->mapbase + IFX_SSC_TXFCON);
-        /* RX FIFO */
-        WRITE_PERIPHERAL_REGISTER((IFX_SSC_DEF_RXFIFO_FL << 
-                                   IFX_SSC_XFCON_ITL_OFFSET) | 
-                                  IFX_SSC_XFCON_FIFO_ENABLE, 
-                                  info->mapbase + IFX_SSC_RXFCON);
-        local_irq_restore(flags);
-	if (enabled)
-		WRITE_PERIPHERAL_REGISTER(IFX_SSC_WHBSTATE_SET_ENABLE, 
-					  info->mapbase + IFX_SSC_WHBSTATE);
-	return 0;
-} // ifx_ssc_hwinit
-
-/*-----------------------------------------------------------------------------
- FUNC-NAME  : ifx_ssc_batch_exec
- LONG-NAME  : 
- PURPOSE    : 
-
- PARAMETER  : *info	pointer to the port-specific structure ifx_ssc_port.
-
- RESULT     : Returns error code
-
- REMARKS    : 
------------------------------------------------------------------------------*/
-static int
-ifx_ssc_batch_exec(struct ifx_ssc_port *info, struct ifx_ssc_batch_list *batch_anchor)
-{
-	// ### TO DO: implement user space batch execution
-	// first, copy the whole linked list from user to kernel space
-	// save some hardware options
-	// execute list
-	// restore hardware options if selected
-	return -EFAULT;
-} // ifx_ssc_batch_exec
-
-
-/*
- * This routine allows the driver to implement device-
- * specific ioctl's.  If the ioctl number passed in cmd is
- * not recognized by the driver, it should return ENOIOCTLCMD.
- */
-int
-ifx_ssc_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
-              unsigned long data)
-{
-	struct ifx_ssc_port *info;
-	int line, ret_val = 0;
-	unsigned long flags;
-	unsigned long tmp;
-	int from_kernel = 0;
-
-	if ((inode == (struct inode *)0) || (inode == (struct inode *)1))
-	{
-		from_kernel = 1;
-		line = (int)inode;
-	}
-	else
-		line = MINOR(filp->f_dentry->d_inode->i_rdev);
-
-	/* don't use more minor devices than we can support */
-	if (line < 0 || line >= PORT_CNT)
-		return -ENXIO;
-
-	info = &isp[line];
-
-	switch (cmd) {
-	case IFX_SSC_STATS_READ:
-		/* data must be a pointer to a struct ifx_ssc_statistics */
-		if (from_kernel)
-			memcpy((void *)data, (void *)&info->stats,
-			       sizeof(struct ifx_ssc_statistics));
-		else
-			if (copy_to_user((void *)data,
-					 (void *)&info->stats,
-					 sizeof(struct ifx_ssc_statistics)))
-				ret_val = -EFAULT;
-		break;
-	case IFX_SSC_STATS_RESET:
-		/* just resets the statistics counters */
-		memset((void *)&info->stats, 0, sizeof(struct ifx_ssc_statistics));
-		break;
-        case IFX_SSC_BAUD_SET:
-                /* if the buffers are not empty then the port is */
-                /* busy and we shouldn't change things on-the-fly! */
-                if (!info->txbuf || !info->rxbuf || 
-		    (READ_PERIPHERAL_REGISTER(info->mapbase + IFX_SSC_STATE) 
-		     & IFX_SSC_STATE_BUSY)) {
-                        ret_val = -EBUSY;
-                        break;
-                }
-                /* misuse flags */
-                if (from_kernel)
-                        flags = *((unsigned long *)data);
-                else
-                        if (copy_from_user((void *)&flags,
-                                           (void *)data, sizeof(flags)))
-                        {
-                                ret_val = -EFAULT;
-                                break;
-                        }
-                if (flags == 0)
-                {
-                        ret_val = -EINVAL;
-                        break;
-                }
-                if (ifx_ssc_set_baud(info, flags) < 0)
-                {
-                        ret_val = -EINVAL;
-                        break;
-                }
-                info->baud = flags;
-                break;
-        case IFX_SSC_BAUD_GET:
-                if (from_kernel)
-                        *((unsigned int *)data) = info->baud;
-                else
-                        if (copy_to_user((void *)data,
-                                         (void *)&info->baud,
-                                         sizeof(unsigned long)))
-                                ret_val = -EFAULT;
-                break;
-	case IFX_SSC_RXTX_MODE_SET:
-                if (from_kernel)
-                        tmp = *((unsigned long *)data);
-                else
-                        if (copy_from_user((void *)&tmp,
-                                           (void *)data, sizeof(tmp))) {
-                                ret_val = -EFAULT;
-                                break;
-                        }
-		ret_val = ifx_ssc_rxtx_mode_set(info, tmp);
-		break;
-	case IFX_SSC_RXTX_MODE_GET:
-		tmp = READ_PERIPHERAL_REGISTER(info->mapbase + IFX_SSC_CON) &
-			(~(IFX_SSC_CON_RX_OFF | IFX_SSC_CON_TX_OFF));
-                if (from_kernel)
-                        *((unsigned int *)data) = tmp;
-                else
-                        if (copy_to_user((void *)data,
-                                         (void *)&tmp,
-                                         sizeof(tmp)))
-                                ret_val = -EFAULT;
-		break;
-
-	case IFX_SSC_ABORT:
-		ifx_ssc_abort(info);
-		break;
-
-	case IFX_SSC_GPO_OUT_SET:
-                if (from_kernel)
-                        tmp = *((unsigned long *)data);
-                else
-                        if (copy_from_user((void *)&tmp,
-                                           (void *)data, sizeof(tmp))) {
-                                ret_val = -EFAULT;
-                                break;
-                        }
-		if (tmp > IFX_SSC_MAX_GPO_OUT)
-			ret_val = -EINVAL;
-		else
-			WRITE_PERIPHERAL_REGISTER
-				(1<<(tmp + IFX_SSC_WHBGPOSTAT_SETOUT0_POS), 
-				 info->mapbase + IFX_SSC_WHBGPOSTAT);
-		break;
-	case IFX_SSC_GPO_OUT_CLR:
-                if (from_kernel)
-                        tmp = *((unsigned long *)data);
-                else
-                        if (copy_from_user((void *)&tmp,
-                                           (void *)data, sizeof(tmp))) {
-                                ret_val = -EFAULT;
-                                break;
-                        }
-		if (tmp > IFX_SSC_MAX_GPO_OUT)
-			ret_val = -EINVAL;
-		else {
-			WRITE_PERIPHERAL_REGISTER
-				(1<<(tmp + IFX_SSC_WHBGPOSTAT_CLROUT0_POS), 
-				 info->mapbase + IFX_SSC_WHBGPOSTAT);
-		}
-		break;
-	case IFX_SSC_GPO_OUT_GET:
-		tmp = READ_PERIPHERAL_REGISTER
-			(info->mapbase + IFX_SSC_GPOSTAT);
-                if (from_kernel)
-                        *((unsigned int *)data) = tmp;
-                else
-                        if (copy_to_user((void *)data,
-                                         (void *)&tmp,
-                                         sizeof(tmp)))
-                                ret_val = -EFAULT;
-		break;
-	case IFX_SSC_FRM_STATUS_GET:
-		ifx_ssc_frm_status_get(info);
-		if (from_kernel)
-			memcpy((void *)data, (void *)&info->frm_status,
-			       sizeof(struct ifx_ssc_frm_status));
-		else
-			if (copy_to_user((void *)data,
-					 (void *)&info->frm_status,
-					 sizeof(struct ifx_ssc_frm_status)))
-				ret_val = -EFAULT;
-		break;
-	case IFX_SSC_FRM_CONTROL_GET:
-		ifx_ssc_frm_control_get(info);
-		if (from_kernel)
-			memcpy((void *)data, (void *)&info->frm_opts,
-			       sizeof(struct ifx_ssc_frm_opts));
-		else
-			if (copy_to_user((void *)data,
-					 (void *)&info->frm_opts,
-					 sizeof(struct ifx_ssc_frm_opts)))
-				ret_val = -EFAULT;
-		break;
-	case IFX_SSC_FRM_CONTROL_SET:
-		if (from_kernel)
-			memcpy((void *)&info->frm_opts, (void *)data, 
-			       sizeof(struct ifx_ssc_frm_opts));
-		else
-			if (copy_to_user((void *)&info->frm_opts,
-					 (void *)data,
-					 sizeof(struct ifx_ssc_frm_opts))){
-				ret_val = -EFAULT;
-				break;
-			}
-		ret_val = ifx_ssc_frm_control_set(info);
-		break;
-        case IFX_SSC_HWOPTS_SET:
-		/* data must be a pointer to a struct ifx_ssc_hwopts */
-                /* if the buffers are not empty then the port is */
-                /* busy and we shouldn't change things on-the-fly! */
-                if (!info->txbuf || !info->rxbuf || 
-		    (READ_PERIPHERAL_REGISTER(info->mapbase + IFX_SSC_STATE) 
-		     & IFX_SSC_STATE_BUSY)) {
-                        ret_val = -EBUSY;
-                        break;
-                }
-                if (from_kernel)
-                        memcpy((void *)&info->opts, (void *)data,
-                               sizeof(struct ifx_ssc_hwopts));
-                else
-                        if (copy_from_user((void *)&info->opts,
-                                           (void *)data,
-                                           sizeof(struct ifx_ssc_hwopts)))
-                        {
-                                ret_val = -EFAULT;
-                                break;
-                        }
-                if (ifx_ssc_hwinit(info) < 0)
-                {
-                        ret_val = -EIO;
-                }
-                break;
-        case IFX_SSC_HWOPTS_GET:
-		/* data must be a pointer to a struct ifx_ssc_hwopts */
-                if (from_kernel)
-                        memcpy((void *)data, (void *)&info->opts,
-                               sizeof(struct ifx_ssc_hwopts));
-                else
-                        if (copy_to_user((void *)data,
-                                         (void *)&info->opts,
-                                         sizeof(struct ifx_ssc_hwopts)))
-                                ret_val = -EFAULT;
-                break;
-        default:
-                ret_val = -ENOIOCTLCMD;
-	}
-
-	return ret_val;
-} /* ifx_ssc_ioctl */
-EXPORT_SYMBOL(ifx_ssc_ioctl);
-
-///* the poll routine */
-//static unsigned int
-//ifx_ssc_poll(struct file *filp, struct poll_table_struct *pts)
-//{
-//        int unit = MINOR(filp->f_dentry->d_inode->i_rdev);
-//	struct ifx_ssc_port *info;
-//        unsigned int mask = 0; 
-//	int spc;
-//
-//	info = &isp[unit];
-//
-//        /* add event to the wait queues */
-//        /* DO NOT FORGET TO DO A WAKEUP ON THESE !!!! */
-//        poll_wait(filp, &info->pwait, pts);
-//
-//	/* are there bytes in the RX SW-FIFO? */
-//        if (info->rxrp != info->rxwp)
-//                mask |= POLLIN | POLLRDNORM;
-//
-//	/* free space in the TX SW-FIFO */
-//	spc = info->txrp - info->txwp - 1;
-//	if (spc < 0)
-//		spc += TX_BUFSIZE;
-//#ifdef IFX_SSC_USEDMA
-//	/* writing always works, except in the DMA case when all descriptors */
-//	/* are used up */
-//	if (unit == 1 && info->dma_freecnt == 0)
-//		spc = 0;
-//#endif
-//	if (spc > 0)
-//		mask |= POLLOUT | POLLWRNORM;
-//
-//        return (mask);
-//}
-
-static int
-ifx_ssc1_read_proc(char *page, char **start, off_t offset, int count, int *eof, void *data)
-{
-	int off = 0;
-	unsigned long flags;
-
-	/* don't want any interrupts here */
-	save_flags(flags);
-	cli();
-
-
-	/* print statistics */
-	off += sprintf(page+off, "Statistics for Infineon Synchronous Serial Controller SSC1\n");
-	off += sprintf(page+off, "RX overflow errors %d\n", isp[0].stats.rxOvErr);
-	off += sprintf(page+off, "RX underflow errors %d\n", isp[0].stats.rxUnErr);
-	off += sprintf(page+off, "TX overflow errors %d\n", isp[0].stats.txOvErr);
-	off += sprintf(page+off, "TX underflow errors %d\n", isp[0].stats.txUnErr);
-	off += sprintf(page+off, "Abort errors %d\n", isp[0].stats.abortErr);
-	off += sprintf(page+off, "Mode errors %d\n", isp[0].stats.modeErr);
-	off += sprintf(page+off, "RX Bytes %d\n", isp[0].stats.rxBytes);
-	off += sprintf(page+off, "TX Bytes %d\n", isp[0].stats.txBytes);
-
-	restore_flags (flags); /* XXXXX */
-	*eof = 1;
-	return (off);
-}
-
-
-/*
- * This routine prints out the appropriate serial driver version number
- */
-static inline void
-show_version(void)
-{
-#if 0
-    printk("Infineon Technologies Synchronous Serial Controller (SSC) driver\n"
-           "  version %s - built %s %s\n", IFX_SSC_DRV_VERSION, __DATE__, __TIME__);
-#endif	 
-} /* show_version */
-
-
-/*
- * Due to the fact that a port can be dynamically switched between slave
- * and master mode using an IOCTL the hardware is not initialized here,
- * but in ifx_ssc_hwinit() as a result of an IOCTL.
- */
-int __init
-ifx_ssc_init(void)
-{
-	struct ifx_ssc_port  *info;
-	int i, nbytes;
-	unsigned long flags;
-	int ret_val;
-
-	// ### TO DO: dynamic port count evaluation due to pin multiplexing
-
-	ret_val = -ENOMEM;
-	nbytes = PORT_CNT * sizeof(struct ifx_ssc_port);
-	isp = (struct ifx_ssc_port *)kmalloc(nbytes, GFP_KERNEL);
-	if (isp == NULL)
-	{
-		printk("%s: no memory for isp\n", __FUNCTION__);
-		return (ret_val);
-	}
-	memset(isp, 0, nbytes);
-
-	show_version();
-
-	/* register the device */
-	ret_val = -ENXIO;
-/*
-	i = maj;
-*/
-	if ((i = register_chrdev(maj, "ssc", &ifx_ssc_fops)) < 0)
-	{
-		printk("Unable to register major %d for the Infineon SSC\n", maj);
-		if (maj == 0){
-			goto errout;
-		}
-		else{
-			maj = 0;
-			if ((i = register_chrdev(maj, "ssc", &ifx_ssc_fops)) < 0)
-			{
-				printk("Unable to register major %d for the Infineon SSC\n", maj);
-				goto errout;
-			}
-		}
-	}
-	if (maj == 0) maj = i;
-	//printk("registered major %d for Infineon SSC\n", maj);
-
-	/* set default values in ifx_ssc_port */
-	for (i = 0; i < PORT_CNT; i++) {
-		info = &isp[i];
-                info->port_nr = i;
-		/* default values for the HwOpts */
-		info->opts.AbortErrDetect = IFX_SSC_DEF_ABRT_ERR_DETECT;
-		info->opts.rxOvErrDetect = IFX_SSC_DEF_RO_ERR_DETECT;
-		info->opts.rxUndErrDetect = IFX_SSC_DEF_RU_ERR_DETECT;
-		info->opts.txOvErrDetect = IFX_SSC_DEF_TO_ERR_DETECT;
-		info->opts.txUndErrDetect = IFX_SSC_DEF_TU_ERR_DETECT;
-		info->opts.loopBack = IFX_SSC_DEF_LOOP_BACK;
-		info->opts.echoMode = IFX_SSC_DEF_ECHO_MODE;
-		info->opts.idleValue = IFX_SSC_DEF_IDLE_DATA;
-		info->opts.clockPolarity = IFX_SSC_DEF_CLOCK_POLARITY;
-		info->opts.clockPhase = IFX_SSC_DEF_CLOCK_PHASE;
-		info->opts.headingControl = IFX_SSC_DEF_HEADING_CONTROL;
-		info->opts.dataWidth = IFX_SSC_DEF_DATA_WIDTH;
-		info->opts.modeRxTx = IFX_SSC_DEF_MODE_RXTX;
-		info->opts.gpoCs = IFX_SSC_DEF_GPO_CS;
-		info->opts.gpoInv = IFX_SSC_DEF_GPO_INV;
-		info->opts.masterSelect = IFX_SSC_DEF_MASTERSLAVE;
-		info->baud = IFX_SSC_DEF_BAUDRATE;
-		info->rxbuf = NULL;
-		info->txbuf = NULL;
-		/* values specific to SSC1 */
-		if (i == 0) {
-			info->mapbase = AMAZON_SSC_BASE_ADD_0;
-			// ### TO DO: power management
-
-			// setting interrupt vectors
-			info->txirq = IFX_SSC_TIR;
-			info->rxirq = IFX_SSC_RIR;
-			info->errirq = IFX_SSC_EIR;
-/*
-			info->frmirq = IFX_SSC_FIR;
-*/
-		}
-		/* activate SSC */
-		/* CLC.DISS = 0 */
-		WRITE_PERIPHERAL_REGISTER(IFX_SSC_DEF_RMC << IFX_CLC_RUN_DIVIDER_OFFSET, info->mapbase + IFX_SSC_CLC);
-
-// ### TO DO: multiple instances
-
-		init_waitqueue_head(&info->rwait);
-		//init_waitqueue_head(&info->pwait);
-
-		local_irq_save(flags);
-
-		// init serial framing register
-		WRITE_PERIPHERAL_REGISTER(IFX_SSC_DEF_SFCON, info->mapbase + IFX_SSC_SFCON);
-
-		/* try to get the interrupts */
-		// ### TO DO: interrupt handling with multiple instances
-		ret_val = ifx_int_wrapper.request(info->txirq, ifx_ssc_tx_int, 
-						  0, "ifx_ssc_tx", info);
-		if (ret_val){
-			printk("%s: unable to get irq %d\n", __FUNCTION__,
-					info->txirq);
-			local_irq_restore(flags);
-			goto errout;
-		}
-		ret_val = ifx_int_wrapper.request(info->rxirq, ifx_ssc_rx_int, 
-						  0, "ifx_ssc_rx", info);
-		if (ret_val){
-			printk("%s: unable to get irq %d\n", __FUNCTION__,
-					info->rxirq);
-			local_irq_restore(flags);
-			goto irqerr;
-		}
-		ret_val = ifx_int_wrapper.request(info->errirq, ifx_ssc_err_int, 
-						  0, "ifx_ssc_err", info);
-		if (ret_val){
-			printk("%s: unable to get irq %d\n", __FUNCTION__,
-					info->errirq);
-			local_irq_restore(flags);
-			goto irqerr;
-		}
-/*
-		ret_val = ifx_int_wrapper.request(info->frmirq, ifx_ssc_frm_int, 
-						  0, "ifx_ssc_frm", info);
-		if (ret_val){
-			printk("%s: unable to get irq %d\n", __FUNCTION__,
-					info->frmirq);
-			local_irq_restore(flags);
-			goto irqerr;
-		}
-
-*/
-		WRITE_PERIPHERAL_REGISTER(IFX_SSC_DEF_IRNEN, info->mapbase + IFX_SSC_IRN_EN);
-
-		local_irq_restore(flags);
-	} // for (i = 0; i < PORT_CNT; i++)
-
-	/* init the SSCs with default values */
-	for (i = 0; i < PORT_CNT; i++)
-	{
-		info = &isp[i];
-		if (ifx_ssc_hwinit(info) < 0)
-		{
-			printk("%s: hardware init failed for port %d\n",
-				__FUNCTION__, i);
-			goto irqerr;
-		}
-	}
-
-	/* register /proc read handler */
-	// ### TO DO: multiple instances
-	/* for SSC1, which is always present */
-	create_proc_read_entry("driver/ssc1", 0, NULL, ifx_ssc1_read_proc, NULL);
-	return 0;
-
-irqerr:
-	// ### TO DO: multiple instances
-	ifx_int_wrapper.free(isp[0].txirq,&isp[0]);
-	ifx_int_wrapper.free(isp[0].rxirq,&isp[0]);
-	ifx_int_wrapper.free(isp[0].errirq,&isp[0]);
-/*
-	ifx_int_wrapper.free(isp[0].frmirq, &isp[0]);
-*/
-errout:
-	/* free up any allocated memory in the error case */
-	kfree(isp);
-	return (ret_val);
-} /* ifx_ssc_init */
-
-
-void
-ifx_ssc_cleanup_module(void)
-{
-	int i;
-
-	/* free up any allocated memory */
-	for (i = 0; i < PORT_CNT; i++)
-	{
-		/* disable the SSC */
-		WRITE_PERIPHERAL_REGISTER(IFX_SSC_WHBSTATE_CLR_ENABLE,isp[i].mapbase + IFX_SSC_WHBSTATE);
-		/* free the interrupts */
-		ifx_int_wrapper.free(isp[i].txirq, &isp[i]);
-		ifx_int_wrapper.free(isp[i].rxirq, &isp[i]);
-		ifx_int_wrapper.free(isp[i].errirq, &isp[i]);
-/*
-		ifx_int_wrapper.free(isp[i].frmirq, &isp[i]);
-
-		if (isp[i].rxbuf != NULL)
-			kfree(isp[i].rxbuf);
-		if (isp[i].txbuf != NULL)
-			kfree(isp[i].txbuf);
-*/
-	}
-	kfree(isp);
-	/* unregister the device */
-	if (unregister_chrdev(maj, "ssc"))
-	{
-		printk("Unable to unregister major %d for the SSC\n", maj);
-	}
-	/* delete /proc read handler */
-	remove_proc_entry("driver/ssc1", NULL);
-	remove_proc_entry("driver/ssc2", NULL);
-} /* ifx_ssc_cleanup_module */
-
-module_exit(ifx_ssc_cleanup_module);
-
-/* Module entry-points */
-module_init(ifx_ssc_init);
-
-#ifndef MODULE
-static int __init
-ifx_ssc_set_maj(char *str)
-{
-	maj = simple_strtol(str, NULL, 0);
-	return 1;
-}
-__setup("ssc_maj=", ifx_ssc_set_maj);
-#endif /* !MODULE */
-
-#define AMAZON_SSC_EMSG(fmt,arg...) printk("%s: "fmt,__FUNCTION__, ##arg)
-/* Brief:	chip select enable
- */
-inline int amazon_ssc_cs_low(u32 pin)
-{
-	int ret=0;
-	if ((ret=ifx_ssc_ioctl((struct inode *)0, NULL,IFX_SSC_GPO_OUT_CLR, (unsigned long)&pin))){
-		AMAZON_SSC_EMSG("clear CS %d fails\n",pin);
-	}
-	wmb();
-	return ret;
-}
-EXPORT_SYMBOL(amazon_ssc_cs_low);
-/* Brief:	chip select disable
- */
-inline int amazon_ssc_cs_high(u32 pin)
-{
-	int ret=0;
-	if ((ret=ifx_ssc_ioctl((struct inode *)0, NULL,IFX_SSC_GPO_OUT_SET, (unsigned long)&pin))){
-		AMAZON_SSC_EMSG("set CS %d fails\n", pin);
-	}
-	wmb();
-	return ret;
-}
-EXPORT_SYMBOL(amazon_ssc_cs_high);
-/* Brief:	one SSC session
- * Parameter:	
- *	tx_buf
- *	tx_len
- *	rx_buf
- *	rx_len
- *	session_mode: IFX_SSC_MODE_RXTX or IFX_SSC_MODE_TX
- * Return:	>=0 number of bytes received (if rx_buf != 0) or transmitted
- *		<0 error code
- * Description:
- *	0. copy data to internal buffer 
- *	1. Write command
- *	2a. If SSC_SESSION_MODE_TXONLY, read tx_len data
- *	2b. If not Read back (tx_len + rx_len) data
- *	3. copy internal buffer to rx buf if necessary
- */
-static int ssc_session(char * tx_buf, u32 tx_len, char * rx_buf, u32 rx_len)
-{
-	int ret=0;
-
-	char * ssc_tx_buf=NULL;
-	char * ssc_rx_buf=NULL;
-
-//	volatile char ssc_tx_buf[128]={0};
-//	volatile char ssc_rx_buf[128]={0};
-
-	int eff_size=0;
-	u8 mode=0;
-	
-	if (tx_buf == NULL && tx_len ==0 && rx_buf == NULL && rx_len == 0){
-		AMAZON_SSC_EMSG("invalid parameters\n");
-		ret=-EINVAL;
-		goto ssc_session_exit;
-	}else if (tx_buf == NULL || tx_len == 0){
-		if (rx_buf != NULL && rx_len != 0){
-			mode = IFX_SSC_MODE_RX;
-		}else{
-			AMAZON_SSC_EMSG("invalid parameters\n");
-			ret=-EINVAL;
-			goto ssc_session_exit;
-		}
-	}else if (rx_buf == NULL || rx_len ==0){
-		if (tx_buf != NULL && tx_len != 0){
-			mode = IFX_SSC_MODE_TX;
-		}else{
-			AMAZON_SSC_EMSG("invalid parameters\n");
-			ret=-EINVAL;
-			goto ssc_session_exit;
-		}
-	}else{
-		mode = IFX_SSC_MODE_RXTX;
-	}
-	
-	if (mode == IFX_SSC_MODE_RXTX){
-		eff_size = tx_len + rx_len;
-	}else if (mode == IFX_SSC_MODE_RX){
-		eff_size = rx_len;
-	}else{
-		eff_size = tx_len;
-	}
-
-	//4 bytes alignment,  required by driver
-	/* change by TaiCheng */
-	//if (in_irq()){
-	if (1){
-		ssc_tx_buf = (char*) kmalloc(sizeof(char) *  ((eff_size + 3) & (~3)), GFP_ATOMIC);
-		ssc_rx_buf = (char*) kmalloc(sizeof(char) *  ((eff_size + 3) & (~3)), GFP_ATOMIC);
-	}else{
-		ssc_tx_buf = (char*) kmalloc(sizeof(char) *  ((eff_size + 3) & (~3)), GFP_KERNEL);
-		ssc_rx_buf = (char*) kmalloc(sizeof(char) *  ((eff_size + 3) & (~3)), GFP_KERNEL);
-	}
-	if (ssc_tx_buf == NULL || ssc_rx_buf == NULL){
-		AMAZON_SSC_EMSG("no memory for size of %d\n", eff_size);
-		ret = -ENOMEM;
-		goto ssc_session_exit;
-	}
-	memset((void*)ssc_tx_buf, 0, eff_size);
-	memset((void*)ssc_rx_buf, 0, eff_size);
-
-	if (tx_len>0){
-		memcpy(ssc_tx_buf, tx_buf, tx_len);
-	}
-	
-	ret=ifx_ssc_kwrite(0, ssc_tx_buf, eff_size);
-
-	if (ret > 0) {
-		ssc_tx_buf = NULL; //should be freed by ifx_ssc_kwrite
-	}
-		
-	if (  ret != eff_size ){
-		AMAZON_SSC_EMSG("ifx_ssc_write return %d\n",ret); 
-		goto ssc_session_exit;
-	}
-	ret=ifx_ssc_kread(0, ssc_rx_buf,eff_size);
-	if (  ret != eff_size ){
-		AMAZON_SSC_EMSG("ifx_ssc_read return %d\n",ret); 
-		goto ssc_session_exit;
-	}
-	
-	memcpy(rx_buf, ssc_rx_buf+tx_len, rx_len);
-	
-	if (mode == IFX_SSC_MODE_TX) {
-		ret = tx_len;
-	}else{
-		ret = rx_len;
-	}
-ssc_session_exit:
-
-	if (ssc_tx_buf != NULL) kfree(ssc_tx_buf);
-	if (ssc_rx_buf != NULL) kfree(ssc_rx_buf);
-
-	if (ret<0) {
-		printk("ssc session fails\n");
-	}
-	return ret;
-}
-/* Brief:	TX-RX session
- * Parameter:	
- *	tx_buf
- *	tx_len
- *	rx_buf
- *	rx_len
- * Return:	>=0 number of bytes received
- *		<0 error code
- * Description: 
- *	1. TX session
- *	2. RX session
- */
-int amazon_ssc_txrx(char * tx_buf, u32 tx_len, char * rx_buf, u32 rx_len)
-{
-	return ssc_session(tx_buf,tx_len,rx_buf,rx_len);
-}
-EXPORT_SYMBOL(amazon_ssc_txrx);
-/* Brief:	TX only session
- * Parameter:
- *	tx_buf
- *	tx_len
- * Return:	>=0 number of bytes transmitted
- *		<0 error code
- */
-int amazon_ssc_tx(char * tx_buf, u32 tx_len)
-{
-	return ssc_session(tx_buf,tx_len,NULL,0);
-}
-EXPORT_SYMBOL(amazon_ssc_tx);
-/* Brief:	RX only session
- * Parameter:
- *	rx_buf
- *	rx_len
- * Return:	>=0 number of bytes received
- *		<0 error code
- */
-int amazon_ssc_rx(char * rx_buf, u32 rx_len)
-{
-	return ssc_session(NULL,0,rx_buf,rx_len);
-}
-EXPORT_SYMBOL(amazon_ssc_rx);
-
diff --git a/target/linux/amazon/files/drivers/mtd/maps/amazon.c b/target/linux/amazon/files/drivers/mtd/maps/amazon.c
deleted file mode 100644
index 55bfe3237..000000000
--- a/target/linux/amazon/files/drivers/mtd/maps/amazon.c
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Handle mapping of the flash memory access routines
- * on Amazon  based devices.
- *
- * Copyright(C) 2004 peng.liu@infineon.com
- *
- * This code is GPLed
- *
- */
-// 000005:fchang 2005/6/2 Modified by Bingtao to double check if the EBU is enabled/disabled
-// 506231:tc.chen 2005/06/23 increase firmware partition size form 192KB to 256KB
-// 050701:linmars 2005/07/01 fix flash size wrong alignment after increase firmware partition
-// 165001:henryhsu 2005/8/18 Remove the support for Intel flash because of 2.1 not enough rootfs partition size
-// 165001:henryhsu 2005/9/7 Rolback to support INtel flash
-// 509071:tc.chen 2005/09/07 Reduced flash writing time
-// 511046:linmars 2005/11/04 change bootloader size from 128 into 64
-// 511241:linmars 2005/11/24 merge TaiChen's IRM patch 
-
-// copyright 2005 infineon
-
-// copyright 2007 john crispin <blogic@openwrt.org>
-// copyright 2007 felix fietkau <nbd@openwrt.org>
-// copyright 2009 hauke mehrtens <hauke@hauke-m.de>
-
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <asm/io.h>
-
-#include <linux/init.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/map.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/cfi.h>
-#include <linux/mutex.h>
-#include <linux/platform_device.h>
-#include <asm/amazon/amazon.h>
-
-#define AMAZON_PCI_ARB_CTL_ALT 0xb100205c
-#define AMAZON_MTD_REG32( addr )          (*(volatile u32 *)(addr))
-
-
-static struct map_info amazon_map = {
-	.name = "AMAZON_FLASH",
-	.bankwidth = 2,
-};
-
-static map_word amazon_read16(struct map_info * map, unsigned long ofs)
-{
-	map_word temp;
-	ofs ^= 2;
-	temp.x[0] = *((__u16 *) (map->virt + ofs));
-	return temp;
-}
-
-static void amazon_write16(struct map_info *map, map_word d, unsigned long adr)
-{
-	adr ^= 2;
-	*((__u16 *) (map->virt + adr)) = d.x[0];
-}
-
-void amazon_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len)
-{
-	u8 *p;
-	u8 *to_8;
-	from = (unsigned long) (from + map->virt);
-	p = (u8 *) from;
-	to_8 = (u8 *) to;
-	while(len--){
-		*to_8++ = *p++;
-	}
-}
-
-void amazon_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len)
-{
-	u8 *p =  (u8*) from;
-	u8 *to_8;
-	to += (unsigned long) map->virt;
-	to_8 = (u8*)to;
-	while(len--){
-		*p++ = *to_8++;
-	}
-}
-
-#define UBOOT_SIZE		0x40000
-
-static struct mtd_partition	amazon_partitions[3] = {
-	 {
-		  name:"U-Boot",		/* U-Boot firmware */
-		  offset:0x00000000,
-		  size:UBOOT_SIZE ,		/* 128k */
-	  },
-	 {
-		  name:"kernel",		/* firmware */
-		  offset:UBOOT_SIZE,
-		  size:0x00100000,		/* 192K */
-	  },
-	 {
-		  name:"rootfs",		/* default partition */
-		  offset:0x00200000,
-		  size:0x00200000,
-	  },
-};
-
-unsigned long uImage_size = 0x10000d;
-
-int find_uImage_size(unsigned long start_offset)
-{
-	unsigned long magic;
-	unsigned long temp;
-	amazon_copy_from(&amazon_map, &magic, start_offset, 4);
-	if (!(ntohl(magic) == 0x27051956)) {
-		printk(KERN_INFO "amazon_mtd: invalid magic (0x%08X) of kernel at 0x%08lx \n", ntohl(magic), start_offset);
-		return 0;
-	}
-	amazon_copy_from(&amazon_map, &temp, start_offset + 12, 4);
-	printk(KERN_INFO "amazon_mtd: kernel size is %ld \n", temp + 0x40);
-	return temp + 0x40;
-}
-
-static int __init amazon_mtd_probe(struct platform_device *dev)
-{
-	unsigned long uimage_size;
-	struct mtd_info *mymtd = NULL;
-	struct mtd_partition *parts = NULL;
-
-	*AMAZON_EBU_BUSCON0 = 0x1d7ff;
-	
-	amazon_map.read = amazon_read16;
-	amazon_map.write = amazon_write16;
-	amazon_map.copy_from = amazon_copy_from;
-	amazon_map.copy_to = amazon_copy_to;
-
-	amazon_map.phys = dev->resource->start;
-	amazon_map.size = dev->resource->end - amazon_map.phys + 1;
-	amazon_map.virt = ioremap_nocache(amazon_map.phys, amazon_map.size);
-	
-	if (!amazon_map.virt) {
-		printk(KERN_WARNING "amazon_mtd: Failed to ioremap!\n");
-		return -EIO;
-	}
-	
-	mymtd = (struct mtd_info *) do_map_probe("cfi_probe", &amazon_map);
-	if (!mymtd) {
-		iounmap(amazon_map.virt);
-		printk(KERN_WARNING "amazon_mtd: probing failed\n");
-		return -ENXIO;
-	}
-
-	mymtd->owner = THIS_MODULE;
-	parts = &amazon_partitions[0];
-
-	/* Some Samsung devices are containing a 16 MB flash chip with a bigger U-Boot partition. */
-	if(mymtd->size == 0x01000000 && mymtd->erasesize == 0x00020000) {
-		printk(KERN_INFO "amazon_mtd: Found big flash chip!\n");
-		amazon_partitions[0].size = 0x60000;
-		amazon_partitions[1].offset = 0x60000;
-		uimage_size = find_uImage_size(amazon_partitions[1].offset);
-		amazon_partitions[1].size = uimage_size;
-		amazon_partitions[2].offset = 0x60000 + uimage_size;
-		amazon_partitions[2].size = mymtd->size - amazon_partitions[2].offset - mymtd->erasesize;
-	} else {
-		printk(KERN_INFO "amazon_mtd: Found small flash chip!\n");
-		uimage_size = find_uImage_size(amazon_partitions[1].offset);
-		amazon_partitions[1].size = uimage_size;
-		amazon_partitions[2].offset = UBOOT_SIZE + uimage_size;
-		amazon_partitions[2].size = mymtd->size - amazon_partitions[2].offset - (2 * mymtd->erasesize);
-	}
-
-	add_mtd_partitions(mymtd, parts, 3);
-
-	printk(KERN_INFO "amazon_mtd: added %s flash with %dMB\n",
-		amazon_map.name, ((int)mymtd->size) >> 20);
-	return 0;
-}
-
-static struct platform_driver amazon_mtd_driver = {
-	.probe = amazon_mtd_probe,
-	.driver = {
-		.name = "amazon_mtd",
-		.owner = THIS_MODULE,
-	},
-};
-
-static int __init amazon_mtd_init(void)
-{
-	int ret = platform_driver_register(&amazon_mtd_driver);
-	if (ret)
-		printk(KERN_WARNING "amazon_mtd: error registering platfom driver!\n");
-	return ret;
-}
-
-static void __exit amazon_mtd_cleanup(void)
-{
-	platform_driver_unregister(&amazon_mtd_driver);
-}
-
-module_init(amazon_mtd_init);
-module_exit(amazon_mtd_cleanup);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("john crispin blogic@openwrt.org");
-MODULE_DESCRIPTION("MTD map driver for AMAZON boards");
-
diff --git a/target/linux/amazon/files/drivers/net/admmod.c b/target/linux/amazon/files/drivers/net/admmod.c
deleted file mode 100644
index 70ba1496a..000000000
--- a/target/linux/amazon/files/drivers/net/admmod.c
+++ /dev/null
@@ -1,1484 +0,0 @@
-/******************************************************************************
-     Copyright (c) 2004, Infineon Technologies.  All rights reserved.
-
-                               No Warranty
-   Because the program is licensed free of charge, there is no warranty for
-   the program, to the extent permitted by applicable law.  Except when
-   otherwise stated in writing the copyright holders and/or other parties
-   provide the program "as is" without warranty of any kind, either
-   expressed or implied, including, but not limited to, the implied
-   warranties of merchantability and fitness for a particular purpose. The
-   entire risk as to the quality and performance of the program is with
-   you.  should the program prove defective, you assume the cost of all
-   necessary servicing, repair or correction.
-
-   In no event unless required by applicable law or agreed to in writing
-   will any copyright holder, or any other party who may modify and/or
-   redistribute the program as permitted above, be liable to you for
-   damages, including any general, special, incidental or consequential
-   damages arising out of the use or inability to use the program
-   (including but not limited to loss of data or data being rendered
-   inaccurate or losses sustained by you or third parties or a failure of
-   the program to operate with any other programs), even if such holder or
-   other party has been advised of the possibility of such damages.
- ******************************************************************************
-   Module      : admmod.c
-   Date        : 2004-09-01
-   Description : JoeLin
-   Remarks:
-
-   Revision:
-	MarsLin, add to support VLAN
-
- *****************************************************************************/
-//000001.joelin 2005/06/02 add"ADM6996_MDC_MDIO_MODE" define, 
-//		if define ADM6996_MDC_MDIO_MODE==> ADM6996LC and ADM6996I will be in MDIO/MDC(SMI)(16 bit) mode,
-//		amazon should contrl ADM6996 by MDC/MDIO pin
-//  		if undef ADM6996_MDC_MDIO_MODE==> ADM6996  will be in EEProm(32 bit) mode,
-//		amazon should contrl ADM6996 by GPIO15,16,17,18  pin
-/* 507281:linmars 2005/07/28 support MDIO/EEPROM config mode */
-/* 509201:linmars remove driver testing codes */
-
-#include <linux/module.h>
-#include <linux/string.h>
-#include <linux/proc_fs.h>
-#include <linux/delay.h>
-#include <asm/uaccess.h>
-#include <linux/init.h>
-#include <linux/ioctl.h>
-#include <asm/atomic.h>
-#include <asm-mips/amazon/amazon.h>
-#include <asm-mips/amazon/adm6996.h>
-//#include <linux/amazon/adm6996.h>
-
-
-unsigned int ifx_sw_conf[ADM_SW_MAX_PORT_NUM+1] = \
-	{ADM_SW_PORT0_CONF, ADM_SW_PORT1_CONF, ADM_SW_PORT2_CONF, \
-	ADM_SW_PORT3_CONF, ADM_SW_PORT4_CONF, ADM_SW_PORT5_CONF};
-unsigned int ifx_sw_bits[8] = \
-	{0x1, 0x3, 0x7, 0xf, 0x1f, 0x3f, 0x7f, 0xff};
-unsigned int ifx_sw_vlan_port[6] = {0, 2, 4, 6, 7, 8};
-//050613:fchang 
-/* 507281:linmars start */
-#ifdef CONFIG_SWITCH_ADM6996_MDIO
-#define ADM6996_MDC_MDIO_MODE 1 //000001.joelin
-#else
-#undef ADM6996_MDC_MDIO_MODE
-#endif
-/* 507281:linmars end */
-#define adm6996i 0
-#define adm6996lc 1
-#define adm6996l  2
-unsigned int adm6996_mode=adm6996i;
-/*
-  initialize GPIO pins.
-  output mode, low
-*/
-void ifx_gpio_init(void)
-{
- //GPIO16,17,18 direction:output
- //GPIO16,17,18 output 0
- 
-    AMAZON_SW_REG(AMAZON_GPIO_P1_DIR) |= (GPIO_MDIO|GPIO_MDCS|GPIO_MDC);
-    AMAZON_SW_REG(AMAZON_GPIO_P1_OUT) =AMAZON_SW_REG(AMAZON_GPIO_P1_IN)& ~(GPIO_MDIO|GPIO_MDCS|GPIO_MDC);
-
-}
-
-/* read one bit from mdio port */
-int ifx_sw_mdio_readbit(void)
-{
-    //int val;
-
-    //val = (AMAZON_SW_REG(GPIO_conf0_REG) & GPIO0_INPUT_MASK) >> 8;
-    //return val;
-    //GPIO16
-    return AMAZON_SW_REG(AMAZON_GPIO_P1_IN)&1;
-}
-
-/*
-  MDIO mode selection
-  1 -> output
-  0 -> input
-
-  switch input/output mode of GPIO 0
-*/
-void ifx_mdio_mode(int mode)
-{
-//    AMAZON_SW_REG(GPIO_conf0_REG) = mode ? GPIO_ENABLEBITS :
-//                             ((GPIO_ENABLEBITS | MDIO_INPUT) & ~MDIO_OUTPUT_EN);
-    mode?(AMAZON_SW_REG(AMAZON_GPIO_P1_DIR)|=GPIO_MDIO):
-         (AMAZON_SW_REG(AMAZON_GPIO_P1_DIR)&=~GPIO_MDIO);
-    /*int r=AMAZON_SW_REG(AMAZON_GPIO_P1_DIR);
-    mode?(r|=GPIO_MDIO):(r&=~GPIO_MDIO);
-    AMAZON_SW_REG(AMAZON_GPIO_P1_DIR)=r;*/
-}
-
-void ifx_mdc_hi(void)
-{
-    //GPIO_SET_HI(GPIO_MDC);
-    //AMAZON_SW_REG(AMAZON_GPIO_P1_OUT)|=GPIO_MDC;
-    /*int r=AMAZON_SW_REG(AMAZON_GPIO_P1_OUT);
-    r|=GPIO_MDC;
-    AMAZON_SW_REG(AMAZON_GPIO_P1_OUT)=r;*/
-
-    AMAZON_SW_REG(AMAZON_GPIO_P1_OUT)=AMAZON_SW_REG(AMAZON_GPIO_P1_IN)|GPIO_MDC;
-}
-
-void ifx_mdio_hi(void)
-{
-    //GPIO_SET_HI(GPIO_MDIO);
-    //AMAZON_SW_REG(AMAZON_GPIO_P1_OUT)|=GPIO_MDIO;
-    /*int r=AMAZON_SW_REG(AMAZON_GPIO_P1_OUT);
-    r|=GPIO_MDIO;
-    AMAZON_SW_REG(AMAZON_GPIO_P1_OUT)=r;*/
-
-    AMAZON_SW_REG(AMAZON_GPIO_P1_OUT)=AMAZON_SW_REG(AMAZON_GPIO_P1_IN)|GPIO_MDIO;
-}
-
-void ifx_mdcs_hi(void)
-{
-    //GPIO_SET_HI(GPIO_MDCS);
-    //AMAZON_SW_REG(AMAZON_GPIO_P1_OUT)|=GPIO_MDCS;
-    /*int r=AMAZON_SW_REG(AMAZON_GPIO_P1_OUT);
-    r|=GPIO_MDCS;
-    AMAZON_SW_REG(AMAZON_GPIO_P1_OUT)=r;*/
-
-    AMAZON_SW_REG(AMAZON_GPIO_P1_OUT)=AMAZON_SW_REG(AMAZON_GPIO_P1_IN)|GPIO_MDCS;
-}
-
-void ifx_mdc_lo(void)
-{
-    //GPIO_SET_LOW(GPIO_MDC);
-    //AMAZON_SW_REG(AMAZON_GPIO_P1_OUT)&=~GPIO_MDC;
-    /*int r=AMAZON_SW_REG(AMAZON_GPIO_P1_OUT);
-    r&=~GPIO_MDC;
-    AMAZON_SW_REG(AMAZON_GPIO_P1_OUT)=r;*/
-
-    AMAZON_SW_REG(AMAZON_GPIO_P1_OUT)=AMAZON_SW_REG(AMAZON_GPIO_P1_IN)&(~GPIO_MDC);
-}
-
-void ifx_mdio_lo(void)
-{
-    //GPIO_SET_LOW(GPIO_MDIO);
-    //AMAZON_SW_REG(AMAZON_GPIO_P1_OUT)&=~GPIO_MDIO;
-    /*int r=AMAZON_SW_REG(AMAZON_GPIO_P1_OUT);
-    r&=~GPIO_MDIO;
-    AMAZON_SW_REG(AMAZON_GPIO_P1_OUT)=r;*/
-
-    AMAZON_SW_REG(AMAZON_GPIO_P1_OUT)=AMAZON_SW_REG(AMAZON_GPIO_P1_IN)&(~GPIO_MDIO);
-}
-
-void ifx_mdcs_lo(void)
-{
-    //GPIO_SET_LOW(GPIO_MDCS);
-    //AMAZON_SW_REG(AMAZON_GPIO_P1_OUT)&=~GPIO_MDCS;
-    /*int r=AMAZON_SW_REG(AMAZON_GPIO_P1_OUT);
-    r&=~GPIO_MDCS;
-    AMAZON_SW_REG(AMAZON_GPIO_P1_OUT)=r;*/
-    
-    AMAZON_SW_REG(AMAZON_GPIO_P1_OUT)=AMAZON_SW_REG(AMAZON_GPIO_P1_IN)&(~GPIO_MDCS);
-}
-
-/*
-  mdc pulse
-  0 -> 1 -> 0
-*/
-static void ifx_sw_mdc_pulse(void)
-{
-    ifx_mdc_lo();
-    udelay(ADM_SW_MDC_DOWN_DELAY);
-    ifx_mdc_hi();
-    udelay(ADM_SW_MDC_UP_DELAY);
-    ifx_mdc_lo();
-}
-
-/*
-  mdc toggle
-  1 -> 0
-*/
-static void ifx_sw_mdc_toggle(void)
-{
-    ifx_mdc_hi();
-    udelay(ADM_SW_MDC_UP_DELAY);
-    ifx_mdc_lo();
-    udelay(ADM_SW_MDC_DOWN_DELAY);
-}
-
-/*
-  enable eeprom write
-  For ATC 93C66 type EEPROM; accessing ADM6996 internal EEPROM type registers
-*/
-static void ifx_sw_eeprom_write_enable(void)
-{
-    unsigned int op;
-
-    ifx_mdcs_lo();
-    ifx_mdc_lo();
-    ifx_mdio_hi();
-    udelay(ADM_SW_CS_DELAY);
-    /* enable chip select */
-    ifx_mdcs_hi();
-    udelay(ADM_SW_CS_DELAY);
-    /* start bit */
-    ifx_mdio_hi();
-    ifx_sw_mdc_pulse();
-
-    /* eeprom write enable */
-    op = ADM_SW_BIT_MASK_4;
-    while (op)
-    {
-        if (op & ADM_SW_EEPROM_WRITE_ENABLE)
-            ifx_mdio_hi();
-        else
-            ifx_mdio_lo();
-
-        ifx_sw_mdc_pulse();
-        op >>= 1;
-    }
-
-    op = ADM_SW_BIT_MASK_1 << (EEPROM_TYPE - 3);
-    while (op)
-    {
-        ifx_mdio_lo();
-        ifx_sw_mdc_pulse();
-        op >>= 1;
-    }
-    /* disable chip select */
-    ifx_mdcs_lo();
-    udelay(ADM_SW_CS_DELAY);
-    ifx_sw_mdc_pulse();
-}
-
-/*
-  disable eeprom write
-*/
-static void ifx_sw_eeprom_write_disable(void)
-{
-    unsigned int op;
-
-    ifx_mdcs_lo();
-    ifx_mdc_lo();
-    ifx_mdio_hi();
-    udelay(ADM_SW_CS_DELAY);
-    /* enable chip select */
-    ifx_mdcs_hi();
-    udelay(ADM_SW_CS_DELAY);
-
-    /* start bit */
-    ifx_mdio_hi();
-    ifx_sw_mdc_pulse();
-    /* eeprom write disable */
-    op = ADM_SW_BIT_MASK_4;
-    while (op)
-    {
-        if (op & ADM_SW_EEPROM_WRITE_DISABLE)
-            ifx_mdio_hi();
-        else
-            ifx_mdio_lo();
-
-        ifx_sw_mdc_pulse();
-        op >>= 1;
-    }
-
-    op = ADM_SW_BIT_MASK_1 << (EEPROM_TYPE - 3);
-    while (op)
-    {
-        ifx_mdio_lo();
-
-        ifx_sw_mdc_pulse();
-        op >>= 1;
-    }
-    /* disable chip select */
-    ifx_mdcs_lo();
-    udelay(ADM_SW_CS_DELAY);
-    ifx_sw_mdc_pulse();
-}
-
-/*
-  read registers from ADM6996
-  serial registers start at 0x200 (addr bit 9 = 1b)
-  EEPROM registers -> 16bits; Serial registers -> 32bits
-*/
-#ifdef ADM6996_MDC_MDIO_MODE //smi mode//000001.joelin
-static int ifx_sw_read_adm6996i_smi(unsigned int addr, unsigned int *dat)
-{
-   addr=(addr<<16)&0x3ff0000;
-   AMAZON_SW_REG(AMAZON_SW_MDIO_ACC) =(0xC0000000|addr);
-   while ((AMAZON_SW_REG(AMAZON_SW_MDIO_ACC))&0x80000000){};
-   *dat=((AMAZON_SW_REG(AMAZON_SW_MDIO_ACC))&0x0FFFF);
-    return 0;
-}
-#endif
-
-static int ifx_sw_read_adm6996i(unsigned int addr, unsigned int *dat)
-{
-    unsigned int op;
-
-    ifx_gpio_init();
-
-    ifx_mdcs_hi();
-    udelay(ADM_SW_CS_DELAY);
-
-    ifx_mdcs_lo();
-    ifx_mdc_lo();
-    ifx_mdio_lo();
-
-    udelay(ADM_SW_CS_DELAY);
-
-    /* preamble, 32 bit 1 */
-    ifx_mdio_hi();
-    op = ADM_SW_BIT_MASK_32;
-    while (op)
-    {
-        ifx_sw_mdc_pulse();
-        op >>= 1;
-    }
-
-    /* command start (01b) */
-    op = ADM_SW_BIT_MASK_2;
-    while (op)
-    {
-        if (op & ADM_SW_SMI_START)
-            ifx_mdio_hi();
-        else
-            ifx_mdio_lo();
-
-        ifx_sw_mdc_pulse();
-        op >>= 1;
-    }
-
-    /* read command (10b) */
-    op = ADM_SW_BIT_MASK_2;
-    while (op)
-    {
-        if (op & ADM_SW_SMI_READ)
-            ifx_mdio_hi();
-        else
-            ifx_mdio_lo();
-
-        ifx_sw_mdc_pulse();
-        op >>= 1;
-    }
-
-    /* send address A9 ~ A0 */
-    op = ADM_SW_BIT_MASK_10;
-    while (op)
-    {
-        if (op & addr)
-            ifx_mdio_hi();
-        else
-            ifx_mdio_lo();
-
-        ifx_sw_mdc_pulse();
-        op >>= 1;
-    }
-
-    /* turnaround bits */
-    op = ADM_SW_BIT_MASK_2;
-    ifx_mdio_hi();
-    while (op)
-    {
-        ifx_sw_mdc_pulse();
-        op >>= 1;
-    }
-
-    udelay(ADM_SW_MDC_DOWN_DELAY);
-
-    /* set MDIO pin to input mode */
-    ifx_mdio_mode(ADM_SW_MDIO_INPUT);
-
-    /* start read data */
-    *dat = 0;
-//adm6996i    op = ADM_SW_BIT_MASK_32;
-    op = ADM_SW_BIT_MASK_16;//adm6996i
-    while (op)
-    {
-        *dat <<= 1;
-        if (ifx_sw_mdio_readbit()) *dat |= 1;
-        ifx_sw_mdc_toggle();
-
-        op >>= 1;
-    }
-
-    /* set MDIO to output mode */
-    ifx_mdio_mode(ADM_SW_MDIO_OUTPUT);
-
-    /* dummy clock */
-    op = ADM_SW_BIT_MASK_4;
-    ifx_mdio_lo();
-    while(op)
-    {
-        ifx_sw_mdc_pulse();
-        op >>= 1;
-    }
-
-    ifx_mdc_lo();
-    ifx_mdio_lo();
-    ifx_mdcs_hi();
-
-    /* EEPROM registers */
-//adm6996i    if (!(addr & 0x200))
-//adm6996i    {
-//adm6996i        if (addr % 2)
-//adm6996i            *dat >>= 16;
-//adm6996i        else
-//adm6996i        *dat &= 0xffff;
-//adm6996i    }
-
-    return 0;
-}
-//adm6996
-static int ifx_sw_read_adm6996l(unsigned int addr, unsigned int *dat)
-{
-    unsigned int op;
-
-    ifx_gpio_init();
-
-    ifx_mdcs_hi();
-    udelay(ADM_SW_CS_DELAY);
-
-    ifx_mdcs_lo();
-    ifx_mdc_lo();
-    ifx_mdio_lo();
-
-    udelay(ADM_SW_CS_DELAY);
-
-    /* preamble, 32 bit 1 */
-    ifx_mdio_hi();
-    op = ADM_SW_BIT_MASK_32;
-    while (op)
-    {
-        ifx_sw_mdc_pulse();
-        op >>= 1;
-    }
-
-    /* command start (01b) */
-    op = ADM_SW_BIT_MASK_2;
-    while (op)
-    {
-        if (op & ADM_SW_SMI_START)
-            ifx_mdio_hi();
-        else
-            ifx_mdio_lo();
-
-        ifx_sw_mdc_pulse();
-        op >>= 1;
-    }
-
-    /* read command (10b) */
-    op = ADM_SW_BIT_MASK_2;
-    while (op)
-    {
-        if (op & ADM_SW_SMI_READ)
-            ifx_mdio_hi();
-        else
-            ifx_mdio_lo();
-
-        ifx_sw_mdc_pulse();
-        op >>= 1;
-    }
-
-    /* send address A9 ~ A0 */
-    op = ADM_SW_BIT_MASK_10;
-    while (op)
-    {
-        if (op & addr)
-            ifx_mdio_hi();
-        else
-            ifx_mdio_lo();
-
-        ifx_sw_mdc_pulse();
-        op >>= 1;
-    }
-
-    /* turnaround bits */
-    op = ADM_SW_BIT_MASK_2;
-    ifx_mdio_hi();
-    while (op)
-    {
-        ifx_sw_mdc_pulse();
-        op >>= 1;
-    }
-
-    udelay(ADM_SW_MDC_DOWN_DELAY);
-
-    /* set MDIO pin to input mode */
-    ifx_mdio_mode(ADM_SW_MDIO_INPUT);
-
-    /* start read data */
-    *dat = 0;
-    op = ADM_SW_BIT_MASK_32;
-    while (op)
-    {
-        *dat <<= 1;
-        if (ifx_sw_mdio_readbit()) *dat |= 1;
-        ifx_sw_mdc_toggle();
-
-        op >>= 1;
-    }
-
-    /* set MDIO to output mode */
-    ifx_mdio_mode(ADM_SW_MDIO_OUTPUT);
-
-    /* dummy clock */
-    op = ADM_SW_BIT_MASK_4;
-    ifx_mdio_lo();
-    while(op)
-    {
-        ifx_sw_mdc_pulse();
-        op >>= 1;
-    }
-
-    ifx_mdc_lo();
-    ifx_mdio_lo();
-    ifx_mdcs_hi();
-
-    /* EEPROM registers */
-    if (!(addr & 0x200))
-    {
-        if (addr % 2)
-            *dat >>= 16;
-        else
-        *dat &= 0xffff;
-    }
-
-    return 0;
-}
-
-static int ifx_sw_read(unsigned int addr, unsigned int *dat)
-{
-#ifdef ADM6996_MDC_MDIO_MODE //smi mode ////000001.joelin
-	ifx_sw_read_adm6996i_smi(addr,dat);
-#else	
-	if (adm6996_mode==adm6996i) ifx_sw_read_adm6996i(addr,dat);
-		else ifx_sw_read_adm6996l(addr,dat);
-#endif		
-	return 0;
-	
-}
-
-/*
-  write register to ADM6996 eeprom registers
-*/
-//for adm6996i -start
-#ifdef ADM6996_MDC_MDIO_MODE //smi mode //000001.joelin
-static int ifx_sw_write_adm6996i_smi(unsigned int addr, unsigned int dat)
-{
- 
-   AMAZON_SW_REG(AMAZON_SW_MDIO_ACC) = ((addr<<16)&0x3ff0000)|dat|0x80000000;
-   while ((AMAZON_SW_REG(AMAZON_SW_MDIO_ACC))&0x80000000){};
-  
-    return 0;
- 
-}
-#endif //ADM6996_MDC_MDIO_MODE //000001.joelin
-
-static int ifx_sw_write_adm6996i(unsigned int addr, unsigned int dat)
-{
-    unsigned int op;
-
-    ifx_gpio_init();
-
-    ifx_mdcs_hi();
-    udelay(ADM_SW_CS_DELAY);
-
-    ifx_mdcs_lo();
-    ifx_mdc_lo();
-    ifx_mdio_lo();
-
-    udelay(ADM_SW_CS_DELAY);
-
-    /* preamble, 32 bit 1 */
-    ifx_mdio_hi();
-    op = ADM_SW_BIT_MASK_32;
-    while (op)
-    {
-        ifx_sw_mdc_pulse();
-        op >>= 1;
-    }
-
-    /* command start (01b) */
-    op = ADM_SW_BIT_MASK_2;
-    while (op)
-    {
-        if (op & ADM_SW_SMI_START)
-            ifx_mdio_hi();
-        else
-            ifx_mdio_lo();
-
-        ifx_sw_mdc_pulse();
-        op >>= 1;
-    }
-
-    /* write command (01b) */
-    op = ADM_SW_BIT_MASK_2;
-    while (op)
-    {
-        if (op & ADM_SW_SMI_WRITE)
-            ifx_mdio_hi();
-        else
-            ifx_mdio_lo();
-
-        ifx_sw_mdc_pulse();
-        op >>= 1;
-    }
-
-    /* send address A9 ~ A0 */
-    op = ADM_SW_BIT_MASK_10;
-    while (op)
-    {
-        if (op & addr)
-            ifx_mdio_hi();
-        else
-            ifx_mdio_lo();
-
-        ifx_sw_mdc_pulse();
-        op >>= 1;
-    }
-
-    /* turnaround bits */
-    op = ADM_SW_BIT_MASK_2;
-    ifx_mdio_hi();
-    while (op)
-    {
-        ifx_sw_mdc_pulse();
-        op >>= 1;
-    }
-
-    udelay(ADM_SW_MDC_DOWN_DELAY);
-
-    /* set MDIO pin to output mode */
-    ifx_mdio_mode(ADM_SW_MDIO_OUTPUT);
-
-  
-    /* start write data */
-    op = ADM_SW_BIT_MASK_16;
-    while (op)
-    {
-        if (op & dat)
-            ifx_mdio_hi();
-        else
-            ifx_mdio_lo();
-
-        ifx_sw_mdc_toggle();
-        op >>= 1;
-    }
-
- //   /* set MDIO to output mode */
- //   ifx_mdio_mode(ADM_SW_MDIO_OUTPUT);
-
-    /* dummy clock */
-    op = ADM_SW_BIT_MASK_4;
-    ifx_mdio_lo();
-    while(op)
-    {
-        ifx_sw_mdc_pulse();
-        op >>= 1;
-    }
-
-    ifx_mdc_lo();
-    ifx_mdio_lo();
-    ifx_mdcs_hi();
-
-    /* EEPROM registers */
-//adm6996i    if (!(addr & 0x200))
-//adm6996i    {
-//adm6996i        if (addr % 2)
-//adm6996i            *dat >>= 16;
-//adm6996i        else
-//adm6996i        *dat &= 0xffff;
-//adm6996i    }
-
-    return 0;
-}
-//for adm6996i-end
-static int ifx_sw_write_adm6996l(unsigned int addr, unsigned int dat)
-{
-    unsigned int op;
-
-    ifx_gpio_init();
-
-    /* enable write */
-    ifx_sw_eeprom_write_enable();
-
-    /* chip select */
-    ifx_mdcs_hi();
-    udelay(ADM_SW_CS_DELAY);
-
-    /* issue write command */
-    /* start bit */
-    ifx_mdio_hi();
-    ifx_sw_mdc_pulse();
-
-    /* EEPROM write command */
-    op = ADM_SW_BIT_MASK_2;
-    while (op)
-    {
-        if (op & ADM_SW_EEPROM_WRITE)
-            ifx_mdio_hi();
-        else
-            ifx_mdio_lo();
-
-        ifx_sw_mdc_pulse();
-        op >>= 1;
-    }
-
-    /* send address A7 ~ A0 */
-    op = ADM_SW_BIT_MASK_1 << (EEPROM_TYPE - 1);
-
-    while (op)
-    {
-        if (op & addr)
-            ifx_mdio_hi();
-        else
-            ifx_mdio_lo();
-
-        ifx_sw_mdc_toggle();
-        op >>= 1;
-    }
-
-    /* start write data */
-    op = ADM_SW_BIT_MASK_16;
-    while (op)
-    {
-        if (op & dat)
-            ifx_mdio_hi();
-        else
-            ifx_mdio_lo();
-
-        ifx_sw_mdc_toggle();
-        op >>= 1;
-    }
-
-    /* disable cs & wait 1 clock */
-    ifx_mdcs_lo();
-    udelay(ADM_SW_CS_DELAY);
-    ifx_sw_mdc_toggle();
-
-    ifx_sw_eeprom_write_disable();
-
-    return 0;
-}
-
-static int ifx_sw_write(unsigned int addr, unsigned int dat)
-{
-#ifdef ADM6996_MDC_MDIO_MODE //smi mode ////000001.joelin
-	ifx_sw_write_adm6996i_smi(addr,dat);
-#else	//000001.joelin
-	if (adm6996_mode==adm6996i) ifx_sw_write_adm6996i(addr,dat);
-		else ifx_sw_write_adm6996l(addr,dat);
-#endif	//000001.joelin
-	return 0;
-}
-
-/*
-  do switch PHY reset
-*/
-int ifx_sw_reset(void)
-{
-    /* reset PHY */
-    ifx_sw_write(ADM_SW_PHY_RESET, 0);
-
-    return 0;
-}
-
-/* 509201:linmars start */
-#if 0
-/*
-  check port status
-*/
-int ifx_check_port_status(int port)
-{
-    unsigned int val;
-
-    if ((port < 0) || (port > ADM_SW_MAX_PORT_NUM))
-    {
-        ifx_printf(("error on port number (%d)!!\n", port));
-        return -1;
-    }
-
-    ifx_sw_read(ifx_sw_conf[port], &val);
-    if (ifx_sw_conf[port]%2) val >>= 16;
-    /* only 16bits are effective */
-    val &= 0xFFFF;
-
-    ifx_printf(("Port %d status (%.8x): \n", port, val));
-
-    if (val & ADM_SW_PORT_FLOWCTL)
-        ifx_printf(("\t802.3x flow control supported!\n"));
-    else
-        ifx_printf(("\t802.3x flow control not supported!\n"));
-
-    if (val & ADM_SW_PORT_AN)
-        ifx_printf(("\tAuto negotiation ON!\n"));
-    else
-        ifx_printf(("\tAuto negotiation OFF!\n"));
-
-    if (val & ADM_SW_PORT_100M)
-        ifx_printf(("\tLink at 100M!\n"));
-    else
-        ifx_printf(("\tLink at 10M!\n"));
-
-    if (val & ADM_SW_PORT_FULL)
-        ifx_printf(("\tFull duplex!\n"));
-    else
-        ifx_printf(("\tHalf duplex!\n"));
-
-    if (val & ADM_SW_PORT_DISABLE)
-        ifx_printf(("\tPort disabled!\n"));
-    else
-        ifx_printf(("\tPort enabled!\n"));
-
-    if (val & ADM_SW_PORT_TOS)
-        ifx_printf(("\tTOS enabled!\n"));
-    else
-        ifx_printf(("\tTOS disabled!\n"));
-
-    if (val & ADM_SW_PORT_PPRI)
-        ifx_printf(("\tPort priority first!\n"));
-    else
-        ifx_printf(("\tVLAN or TOS priority first!\n"));
-
-    if (val & ADM_SW_PORT_MDIX)
-        ifx_printf(("\tAuto MDIX!\n"));
-    else
-        ifx_printf(("\tNo auto MDIX\n"));
-
-    ifx_printf(("\tPVID: %d\n", \
-  	    ((val >> ADM_SW_PORT_PVID_SHIFT)&ifx_sw_bits[ADM_SW_PORT_PVID_BITS])));
-
-    return 0;
-}
-/*
-  initialize a VLAN
-  clear all VLAN bits
-*/
-int ifx_sw_vlan_init(int vlanid)
-{
-    ifx_sw_write(ADM_SW_VLAN0_CONF + vlanid, 0);
-
-    return 0;
-}
-
-/*
-  add a port to certain vlan
-*/
-int ifx_sw_vlan_add(int port, int vlanid)
-{
-    int reg = 0;
-
-    if ((port < 0) || (port > ADM_SW_MAX_PORT_NUM) || (vlanid < 0) ||
-        (vlanid > ADM_SW_MAX_VLAN_NUM))
-    {
-        ifx_printf(("Port number or VLAN number ERROR!!\n"));
-        return -1;
-    }
-    ifx_sw_read(ADM_SW_VLAN0_CONF + vlanid, &reg);
-    reg |= (1 << ifx_sw_vlan_port[port]);
-    ifx_sw_write(ADM_SW_VLAN0_CONF + vlanid, reg);
-
-    return 0;
-}
-
-/*
-  delete a given port from certain vlan
-*/
-int ifx_sw_vlan_del(int port, int vlanid)
-{
-    unsigned int reg = 0;
-
-    if ((port < 0) || (port > ADM_SW_MAX_PORT_NUM) || (vlanid < 0) || (vlanid > ADM_SW_MAX_VLAN_NUM))
-    {
-        ifx_printf(("Port number or VLAN number ERROR!!\n"));
-        return -1;
-    }
-    ifx_sw_read(ADM_SW_VLAN0_CONF + vlanid, &reg);
-    reg &= ~(1 << ifx_sw_vlan_port[port]);
-    ifx_sw_write(ADM_SW_VLAN0_CONF + vlanid, reg);
-
-    return 0;
-}
-
-/*
-  default VLAN setting
-
-  port 0~3 as untag port and PVID = 1
-  VLAN1: port 0~3 and port 5 (MII)
-*/
-static int ifx_sw_init(void)
-{
-    ifx_printf(("Setting default ADM6996 registers... \n"));
-
-    /* MAC clone, 802.1q based VLAN */
-    ifx_sw_write(ADM_SW_VLAN_MODE, 0xff30);
-    /* auto MDIX, PVID=1, untag */
-    ifx_sw_write(ADM_SW_PORT0_CONF, 0x840f);
-    ifx_sw_write(ADM_SW_PORT1_CONF, 0x840f);
-    ifx_sw_write(ADM_SW_PORT2_CONF, 0x840f);
-    ifx_sw_write(ADM_SW_PORT3_CONF, 0x840f);
-    /* auto MDIX, PVID=2, untag */
-    ifx_sw_write(ADM_SW_PORT5_CONF, 0x880f);
-    /* port 0~3 & 5 as VLAN1 */
-    ifx_sw_write(ADM_SW_VLAN0_CONF+1, 0x0155);
-
-    return 0;
-}
-#endif
-/* 509201:linmars end */
-
-int adm_open(struct inode *node, struct file *filp)
-{
-    return 0;
-}
-
-ssize_t adm_read(struct file *filep, char *buf, size_t count, loff_t *ppos)
-{
-    return count;
-}
-
-ssize_t adm_write(struct file *filep, const char *buf, size_t count, loff_t *ppos)
-{
-    return count;
-}
-
-/* close */
-int adm_release(struct inode *inode, struct file *filp)
-{
-    return 0;
-}
-
-/* IOCTL function */
-int adm_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long args)
-{
-    PREGRW uREGRW;
-    unsigned int rtval;
-    unsigned int val;		//6996i
-    unsigned int control[6] ;	//6996i
-    unsigned int status[6] ;	//6996i
-    
-    PMACENTRY mMACENTRY;//adm6996i
-    PPROTOCOLFILTER uPROTOCOLFILTER ;///adm6996i
-
-    if (_IOC_TYPE(cmd) != ADM_MAGIC)
-    {
-        printk("adm_ioctl: IOC_TYPE(%x) != ADM_MAGIC(%x)! \n", _IOC_TYPE(cmd), ADM_MAGIC);
-        return (-EINVAL);
-    }
-
-    if(_IOC_NR(cmd) >= KEY_IOCTL_MAX_KEY)
-    {
-        printk(KERN_WARNING "adm_ioctl: IOC_NR(%x) invalid! \n", _IOC_NR(cmd));
-        return (-EINVAL);
-    }
-
-    switch (cmd)
-    {
-        case ADM_IOCTL_REGRW:
-        {
-            uREGRW = (PREGRW)kmalloc(sizeof(REGRW), GFP_KERNEL);
-            rtval = copy_from_user(uREGRW, (PREGRW)args, sizeof(REGRW));
-            if (rtval != 0)
-            {
-                printk("ADM_IOCTL_REGRW: copy from user FAILED!! \n");
-                return (-EFAULT);
-            }
-
-            switch(uREGRW->mode)
-            {
-                case REG_READ:
-                    uREGRW->value = 0x12345678;//inl(uREGRW->addr);
-                    copy_to_user((PREGRW)args, uREGRW, sizeof(REGRW));
-                    break;
-                case REG_WRITE:
-                    //outl(uREGRW->value, uREGRW->addr);
-                    break;
-
-                default:
-                    printk("No such Register Read/Write function!! \n");
-                    return (-EFAULT);
-            }
-            kfree(uREGRW);
-            break;
-        }
-
-        case ADM_SW_IOCTL_REGRW:
-        {
-            unsigned int val = 0xff;
-
-            uREGRW = (PREGRW)kmalloc(sizeof(REGRW), GFP_KERNEL);
-            rtval = copy_from_user(uREGRW, (PREGRW)args, sizeof(REGRW));
-            if (rtval != 0)
-            {
-                printk("ADM_IOCTL_REGRW: copy from user FAILED!! \n");
-                return (-EFAULT);
-            }
-
-            switch(uREGRW->mode)
-            {
-                case REG_READ:
-                    ifx_sw_read(uREGRW->addr, &val);
-                    uREGRW->value = val;
-                    copy_to_user((PREGRW)args, uREGRW, sizeof(REGRW));
-                    break;
-
-                case REG_WRITE:
-                    ifx_sw_write(uREGRW->addr, uREGRW->value);
-                    break;
-                default:
-                    printk("No such Register Read/Write function!! \n");
-                    return (-EFAULT);
-            }
-            kfree(uREGRW);
-            break;
-        }
-/* 509201:linmars start */
-#if 0
-        case ADM_SW_IOCTL_PORTSTS:
-            for (rtval = 0; rtval < ADM_SW_MAX_PORT_NUM+1; rtval++)
-                ifx_check_port_status(rtval);
-            break;
-        case ADM_SW_IOCTL_INIT:
-            ifx_sw_init();
-            break;
-#endif
-/* 509201:linmars end */
-//adm6996i
-        case ADM_SW_IOCTL_MACENTRY_ADD:
-        case ADM_SW_IOCTL_MACENTRY_DEL:
-        case ADM_SW_IOCTL_MACENTRY_GET_INIT:
-        case ADM_SW_IOCTL_MACENTRY_GET_MORE:
-                
-
-           mMACENTRY = (PMACENTRY)kmalloc(sizeof(MACENTRY), GFP_KERNEL);
-            rtval = copy_from_user(mMACENTRY, (PMACENTRY)args, sizeof(MACENTRY));
-            if (rtval != 0)
-            {
-                printk("ADM_SW_IOCTL_MACENTRY: copy from user FAILED!! \n");
-                return (-EFAULT);
-            }
-           control[0]=(mMACENTRY->mac_addr[1]<<8)+mMACENTRY->mac_addr[0]     ; 
-           control[1]=(mMACENTRY->mac_addr[3]<<8)+mMACENTRY->mac_addr[2]      ;         
-           control[2]=(mMACENTRY->mac_addr[5]<<8)+mMACENTRY->mac_addr[4]     ;
-           control[3]=(mMACENTRY->fid&0xf)+((mMACENTRY->portmap&0x3f)<<4);
-           if (((mMACENTRY->info_type)&0x01)) control[4]=(mMACENTRY->ctrl.info_ctrl)+0x1000; //static ,info control
-           	else	control[4]=((mMACENTRY->ctrl.age_timer)&0xff);//not static ,agetimer
-         	if (cmd==ADM_SW_IOCTL_MACENTRY_GET_INIT) { 	
-	           //initial  the pointer to the first address	
-			           val=0x8000;//busy ,status5[15]
-			           while(val&0x8000){		//check busy ?
-			 	          ifx_sw_read(0x125, &val);
-			        	}    
-			           control[5]=0x030;//initial the first address	
-			           ifx_sw_write(0x11f,control[5]);
-			        	       	
-			           	
-			           val=0x8000;//busy ,status5[15]
-			           while(val&0x8000){		//check busy ?
-			 	          ifx_sw_read(0x125, &val);
-			        	}           	
-	           	
-	           }	//if (cmd==ADM_SW_IOCTL_MACENTRY_GET_INIT)								
-           if (cmd==ADM_SW_IOCTL_MACENTRY_ADD) control[5]=0x07;//create a new address
-           	else if (cmd==ADM_SW_IOCTL_MACENTRY_DEL) control[5]=0x01f;//erased an existed address
-           	else if ((cmd==ADM_SW_IOCTL_MACENTRY_GET_INIT)||(cmd==ADM_SW_IOCTL_MACENTRY_GET_MORE)) 
-           		control[5]=0x02c;//search by the mac address field
-           
-           val=0x8000;//busy ,status5[15]
-           while(val&0x8000){		//check busy ?
- 	          ifx_sw_read(0x125, &val);
-        	}
-        	ifx_sw_write(0x11a,control[0]);	
-        	ifx_sw_write(0x11b,control[1]);	
-        	ifx_sw_write(0x11c,control[2]);	
-        	ifx_sw_write(0x11d,control[3]);	
-        	ifx_sw_write(0x11e,control[4]);	
-        	ifx_sw_write(0x11f,control[5]);	
-           val=0x8000;//busy ,status5[15]
-           while(val&0x8000){		//check busy ?
- 	          ifx_sw_read(0x125, &val);
-        	}	
-           val=((val&0x7000)>>12);//result ,status5[14:12]
-           mMACENTRY->result=val;
-   
-           if (!val) {
-        		printk(" Command OK!! \n");
-        		if ((cmd==ADM_SW_IOCTL_MACENTRY_GET_INIT)||(cmd==ADM_SW_IOCTL_MACENTRY_GET_MORE)) {
-			           	ifx_sw_read(0x120,&(status[0]));	
-			        	ifx_sw_read(0x121,&(status[1]));	
-			        	ifx_sw_read(0x122,&(status[2]));	
-			        	ifx_sw_read(0x123,&(status[3]));	
-			        	ifx_sw_read(0x124,&(status[4]));	
-			        	ifx_sw_read(0x125,&(status[5]));	
-		
-		           		
-		        		mMACENTRY->mac_addr[0]=(status[0]&0x00ff)	;
-		        		mMACENTRY->mac_addr[1]=(status[0]&0xff00)>>8    ;
-		        		mMACENTRY->mac_addr[2]=(status[1]&0x00ff)    ;
-		        		mMACENTRY->mac_addr[3]=(status[1]&0xff00)>>8 ;
-		        		mMACENTRY->mac_addr[4]=(status[2]&0x00ff)    ;
-		        		mMACENTRY->mac_addr[5]=(status[2]&0xff00)>>8 ;
-		        		mMACENTRY->fid=(status[3]&0xf);
-		        		mMACENTRY->portmap=((status[3]>>4)&0x3f);
-		        		if (status[5]&0x2) {//static info_ctrl //status5[1]????
-		        			mMACENTRY->ctrl.info_ctrl=(status[4]&0x00ff);
-		  				mMACENTRY->info_type=1;
-		        				}
-		        		else {//not static age_timer
-		        			mMACENTRY->ctrl.age_timer=(status[4]&0x00ff);
-		  				mMACENTRY->info_type=0;
-		        				}
-//status5[13]????					mMACENTRY->occupy=(status[5]&0x02)>>1;//status5[1]
-					mMACENTRY->occupy=(status[5]&0x02000)>>13;//status5[13] ???
-					mMACENTRY->bad=(status[5]&0x04)>>2;//status5[2]
-				}//if ((cmd==ADM_SW_IOCTL_MACENTRY_GET_INIT)||(cmd==ADM_SW_IOCTL_MACENTRY_GET_MORE)) 
-			
-        	}
-           else if (val==0x001)  
-                printk(" All Entry Used!! \n");
-            else if (val==0x002) 
-                printk("  Entry Not Found!! \n");
-            else if (val==0x003) 
-                printk(" Try Next Entry!! \n");
-            else if (val==0x005)  
-                printk(" Command Error!! \n");   
-            else   
-                printk(" UnKnown Error!! \n");
-                
-            copy_to_user((PMACENTRY)args, mMACENTRY,sizeof(MACENTRY));    
-                
- 	    break;  
- 
-        case ADM_SW_IOCTL_FILTER_ADD:
-        case ADM_SW_IOCTL_FILTER_DEL:
-        case ADM_SW_IOCTL_FILTER_GET:
-
-            uPROTOCOLFILTER = (PPROTOCOLFILTER)kmalloc(sizeof(PROTOCOLFILTER), GFP_KERNEL);
-            rtval = copy_from_user(uPROTOCOLFILTER, (PPROTOCOLFILTER)args, sizeof(PROTOCOLFILTER));
-            if (rtval != 0)
-            {
-                printk("ADM_SW_IOCTL_FILTER_ADD: copy from user FAILED!! \n");
-                return (-EFAULT);
-            }
-            
-        	if(cmd==ADM_SW_IOCTL_FILTER_DEL) {	//delete filter
-			uPROTOCOLFILTER->ip_p=00;	//delet filter
-			uPROTOCOLFILTER->action=00;	//delete filter
-		}					//delete filter
-
-            ifx_sw_read(((uPROTOCOLFILTER->protocol_filter_num/2)+0x68), &val);//rx68~rx6b,protocol filter0~7	
-
-            	if (((uPROTOCOLFILTER->protocol_filter_num)%2)==00){	
-            		if(cmd==ADM_SW_IOCTL_FILTER_GET) uPROTOCOLFILTER->ip_p= val&0x00ff;//get filter ip_p
-            			else val=(val&0xff00)|(uPROTOCOLFILTER->ip_p);//set filter ip_p
-        	}
-        	else {
-        		if(cmd==ADM_SW_IOCTL_FILTER_GET) uPROTOCOLFILTER->ip_p= (val>>8);//get filter ip_p
-        			else val=(val&0x00ff)|((uPROTOCOLFILTER->ip_p)<<8);//set filter ip_p
-        	}	
-            if(cmd!=ADM_SW_IOCTL_FILTER_GET) ifx_sw_write(((uPROTOCOLFILTER->protocol_filter_num/2)+0x68), val);//write rx68~rx6b,protocol filter0~7	
-            		
-            ifx_sw_read(0x95, &val);	//protocol filter action
-            if(cmd==ADM_SW_IOCTL_FILTER_GET) {
-            		uPROTOCOLFILTER->action= ((val>>(uPROTOCOLFILTER->protocol_filter_num*2))&0x3);//get filter action
-            		copy_to_user((PPROTOCOLFILTER)args, uPROTOCOLFILTER, sizeof(PROTOCOLFILTER));
-            	
-            	}
-            	else {
-            		val=(val&(~(0x03<<(uPROTOCOLFILTER->protocol_filter_num*2))))|(((uPROTOCOLFILTER->action)&0x03)<<(uPROTOCOLFILTER->protocol_filter_num*2));
-  //          		printk("%d----\n",val);
-            		ifx_sw_write(0x95, val);	//write protocol filter action		
-            	}
-            	
-            break;
-//adm6996i  
-
-        /* others */
-        default:
-            return -EFAULT;
-    }
-    /* end of switch */
-    return 0;
-}
-
-/* Santosh: handle IGMP protocol filter ADD/DEL/GET */
-int adm_process_protocol_filter_request (unsigned int cmd, PPROTOCOLFILTER uPROTOCOLFILTER)
-{
-    unsigned int val;		//6996i
-
-	if(cmd==ADM_SW_IOCTL_FILTER_DEL) {	//delete filter
-	uPROTOCOLFILTER->ip_p=00;	//delet filter
-	uPROTOCOLFILTER->action=00;	//delete filter
-	}					//delete filter
-
-    ifx_sw_read(((uPROTOCOLFILTER->protocol_filter_num/2)+0x68), &val);//rx68~rx6b,protocol filter0~7	
-
-    if (((uPROTOCOLFILTER->protocol_filter_num)%2)==00){	
-    	if(cmd==ADM_SW_IOCTL_FILTER_GET) uPROTOCOLFILTER->ip_p= val&0x00ff;//get filter ip_p
-        else val=(val&0xff00)|(uPROTOCOLFILTER->ip_p);//set filter ip_p
-    }
-    else {
-    	if(cmd==ADM_SW_IOCTL_FILTER_GET) uPROTOCOLFILTER->ip_p= (val>>8);//get filter ip_p
-    	else val=(val&0x00ff)|((uPROTOCOLFILTER->ip_p)<<8);//set filter ip_p
-    }	
-    if(cmd!=ADM_SW_IOCTL_FILTER_GET) ifx_sw_write(((uPROTOCOLFILTER->protocol_filter_num/2)+0x68), val);//write rx68~rx6b,protocol filter0~7	
-            		
-    	ifx_sw_read(0x95, &val);	//protocol filter action
-    if(cmd==ADM_SW_IOCTL_FILTER_GET) {
-       	uPROTOCOLFILTER->action= ((val>>(uPROTOCOLFILTER->protocol_filter_num*2))&0x3);//get filter action
-    }
-    else {
-    	val=(val&(~(0x03<<(uPROTOCOLFILTER->protocol_filter_num*2))))|(((uPROTOCOLFILTER->action)&0x03)<<(uPROTOCOLFILTER->protocol_filter_num*2));
-        ifx_sw_write(0x95, val);	//write protocol filter action		
-    }
-            	
-	return 0;
-}
-
-
-/* Santosh: function for MAC ENTRY ADD/DEL/GET */
-
-int adm_process_mac_table_request (unsigned int cmd, PMACENTRY mMACENTRY)
-{
-    unsigned int rtval;
-    unsigned int val;		//6996i
-    unsigned int control[6] ;	//6996i
-    unsigned int status[6] ;	//6996i
-
-	// printk ("adm_process_mac_table_request: enter\n");	
-
-    control[0]=(mMACENTRY->mac_addr[1]<<8)+mMACENTRY->mac_addr[0]     ; 
-    control[1]=(mMACENTRY->mac_addr[3]<<8)+mMACENTRY->mac_addr[2]      ;         
-    control[2]=(mMACENTRY->mac_addr[5]<<8)+mMACENTRY->mac_addr[4]     ;
-    control[3]=(mMACENTRY->fid&0xf)+((mMACENTRY->portmap&0x3f)<<4);
-
-    if (((mMACENTRY->info_type)&0x01)) control[4]=(mMACENTRY->ctrl.info_ctrl)+0x1000; //static ,info control
-   		else	control[4]=((mMACENTRY->ctrl.age_timer)&0xff);//not static ,agetimer
-        	if (cmd==ADM_SW_IOCTL_MACENTRY_GET_INIT) { 	
-	          //initial  the pointer to the first address	
-	           val=0x8000;//busy ,status5[15]
-	           while(val&0x8000){		//check busy ?
-	           ifx_sw_read(0x125, &val);
-	       	}    
-	        control[5]=0x030;//initial the first address	
-	        ifx_sw_write(0x11f,control[5]);
-			        	       	
-			           	
-			           val=0x8000;//busy ,status5[15]
-			           while(val&0x8000){		//check busy ?
-			 	          ifx_sw_read(0x125, &val);
-			        	}           	
-	           	
-	           }	//if (cmd==ADM_SW_IOCTL_MACENTRY_GET_INIT)								
-           if (cmd==ADM_SW_IOCTL_MACENTRY_ADD) control[5]=0x07;//create a new address
-           	else if (cmd==ADM_SW_IOCTL_MACENTRY_DEL) control[5]=0x01f;//erased an existed address
-           	else if ((cmd==ADM_SW_IOCTL_MACENTRY_GET_INIT)||(cmd==ADM_SW_IOCTL_MACENTRY_GET_MORE)) 
-           		control[5]=0x02c;//search by the mac address field
-           
-           val=0x8000;//busy ,status5[15]
-           while(val&0x8000){		//check busy ?
- 	          ifx_sw_read(0x125, &val);
-        	}
-        	ifx_sw_write(0x11a,control[0]);	
-        	ifx_sw_write(0x11b,control[1]);	
-        	ifx_sw_write(0x11c,control[2]);	
-        	ifx_sw_write(0x11d,control[3]);	
-        	ifx_sw_write(0x11e,control[4]);	
-        	ifx_sw_write(0x11f,control[5]);	
-           val=0x8000;//busy ,status5[15]
-           while(val&0x8000){		//check busy ?
- 	          ifx_sw_read(0x125, &val);
-        	}	
-           val=((val&0x7000)>>12);//result ,status5[14:12]
-           mMACENTRY->result=val;
-   
-           if (!val) {
-        		printk(" Command OK!! \n");
-        		if ((cmd==ADM_SW_IOCTL_MACENTRY_GET_INIT)||(cmd==ADM_SW_IOCTL_MACENTRY_GET_MORE)) {
-			           	ifx_sw_read(0x120,&(status[0]));	
-			        	ifx_sw_read(0x121,&(status[1]));	
-			        	ifx_sw_read(0x122,&(status[2]));	
-			        	ifx_sw_read(0x123,&(status[3]));	
-			        	ifx_sw_read(0x124,&(status[4]));	
-			        	ifx_sw_read(0x125,&(status[5]));	
-		
-		           		
-		        		mMACENTRY->mac_addr[0]=(status[0]&0x00ff)	;
-		        		mMACENTRY->mac_addr[1]=(status[0]&0xff00)>>8    ;
-		        		mMACENTRY->mac_addr[2]=(status[1]&0x00ff)    ;
-		        		mMACENTRY->mac_addr[3]=(status[1]&0xff00)>>8 ;
-		        		mMACENTRY->mac_addr[4]=(status[2]&0x00ff)    ;
-		        		mMACENTRY->mac_addr[5]=(status[2]&0xff00)>>8 ;
-		        		mMACENTRY->fid=(status[3]&0xf);
-		        		mMACENTRY->portmap=((status[3]>>4)&0x3f);
-		        		if (status[5]&0x2) {//static info_ctrl //status5[1]????
-		        			mMACENTRY->ctrl.info_ctrl=(status[4]&0x00ff);
-		  				mMACENTRY->info_type=1;
-		        				}
-		        		else {//not static age_timer
-		        			mMACENTRY->ctrl.age_timer=(status[4]&0x00ff);
-		  				mMACENTRY->info_type=0;
-		        				}
-//status5[13]????					mMACENTRY->occupy=(status[5]&0x02)>>1;//status5[1]
-					mMACENTRY->occupy=(status[5]&0x02000)>>13;//status5[13] ???
-					mMACENTRY->bad=(status[5]&0x04)>>2;//status5[2]
-				}//if ((cmd==ADM_SW_IOCTL_MACENTRY_GET_INIT)||(cmd==ADM_SW_IOCTL_MACENTRY_GET_MORE)) 
-			
-        	}
-           else if (val==0x001)  
-                printk(" All Entry Used!! \n");
-            else if (val==0x002) 
-                printk("  Entry Not Found!! \n");
-            else if (val==0x003) 
-                printk(" Try Next Entry!! \n");
-            else if (val==0x005)  
-                printk(" Command Error!! \n");   
-            else   
-                printk(" UnKnown Error!! \n");
-
-	// printk ("adm_process_mac_table_request: Exit\n");	
-	return 0;
-}
-
-/* Santosh: End of function for MAC ENTRY ADD/DEL*/
-struct file_operations adm_ops =
-{
-    read: adm_read,
-    write: adm_write,
-    open: adm_open,
-    release: adm_release,
-    ioctl: adm_ioctl
-};
-
-int adm_proc(char *buf, char **start, off_t offset, int count, int *eof, void *data)
-{
-    int len = 0;
-
-    len += sprintf(buf+len, " ************ Registers ************ \n");
-    *eof = 1;
-    return len;
-}
-
-int __init init_adm6996_module(void)
-{
-    unsigned int val = 000;
-    unsigned int val1 = 000;
-
-    printk("Loading ADM6996 driver... \n");
-
-    /* if running on adm5120 */
-    /* set GPIO 0~2 as adm6996 control pins */
-    //outl(0x003f3f00, 0x12000028);
-    /* enable switch port 5 (MII) as RMII mode (5120MAC <-> 6996MAC) */
-    //outl(0x18a, 0x12000030);
-    /* group adm5120 port 1 ~ 5 as VLAN0, port 5 & 6(CPU) as VLAN1 */
-    //outl(0x417e, 0x12000040);
-    /* end adm5120 fixup */
-#ifdef ADM6996_MDC_MDIO_MODE //smi mode //000001.joelin
-    register_chrdev(69, "adm6996", &adm_ops);
-    AMAZON_SW_REG(AMAZON_SW_MDIO_CFG) = 0x27be;
-    AMAZON_SW_REG(AMAZON_SW_EPHY) = 0xfc;
-    adm6996_mode=adm6996i;
-    ifx_sw_read(0xa0, &val);
-    ifx_sw_read(0xa1, &val1);
-    val=((val1&0x0f)<<16)|val;
-    printk ("\nADM6996 SMI Mode-");
-    printk ("Chip ID:%5x \n ", val);
-#else    //000001.joelin
- 
-    AMAZON_SW_REG(AMAZON_SW_MDIO_CFG) = 0x2c50;
-    AMAZON_SW_REG(AMAZON_SW_EPHY) = 0xff;
-
-    AMAZON_SW_REG(AMAZON_GPIO_P1_ALTSEL0) &= ~(GPIO_MDIO|GPIO_MDCS|GPIO_MDC);
-    AMAZON_SW_REG(AMAZON_GPIO_P1_ALTSEL1) &= ~(GPIO_MDIO|GPIO_MDCS|GPIO_MDC);
-    AMAZON_SW_REG(AMAZON_GPIO_P1_OD) |= (GPIO_MDIO|GPIO_MDCS|GPIO_MDC);
-  
-    ifx_gpio_init();
-    register_chrdev(69, "adm6996", &adm_ops);
-    mdelay(100);
-
-    /* create proc entries */
-    //  create_proc_read_entry("admide", 0, NULL, admide_proc, NULL);
-
-//joelin adm6996i support start
-    adm6996_mode=adm6996i;
-    ifx_sw_read(0xa0, &val);
-    adm6996_mode=adm6996l;
-    ifx_sw_read(0x200, &val1);
-//  printk ("\n %0x \n",val1);
-    if ((val&0xfff0)==0x1020) {
-        printk ("\n ADM6996I .. \n");
-        adm6996_mode=adm6996i;	
-    }
-    else if ((val1&0xffffff00)==0x71000) {//71010 or 71020
-        printk ("\n ADM6996LC .. \n");
-        adm6996_mode=adm6996lc;	
-    }
-    else  {
-        printk ("\n ADM6996L .. \n");
-        adm6996_mode=adm6996l;	
-    }
-#endif //ADM6996_MDC_MDIO_MODE //smi mode //000001.joelin	
-
-    if ((adm6996_mode==adm6996lc)||(adm6996_mode==adm6996i)){
-#if 0	/* removed by MarsLin */
-        ifx_sw_write(0x29,0xc000);
-        ifx_sw_write(0x30,0x0985);
-#else
-        ifx_sw_read(0xa0, &val);
-        if (val == 0x1021) // for both 6996LC and 6996I, only AB version need the patch
-            ifx_sw_write(0x29, 0x9000);
-        ifx_sw_write(0x30,0x0985);
-#endif
-    }
-//joelin adm6996i support end
-    return 0;
-}
-
-void __exit cleanup_adm6996_module(void)
-{
-    printk("Free ADM device driver... \n");
-
-    unregister_chrdev(69, "adm6996");
-
-    /* remove proc entries */
-    //  remove_proc_entry("admide", NULL);
-}
-
-/* MarsLin, add start */
-#if defined(CONFIG_IFX_NFEXT_AMAZON_SWITCH_PHYPORT) || defined(CONFIG_IFX_NFEXT_AMAZON_SWITCH_PHYPORT_MODULE)
-    #define SET_BIT(reg, mask)		reg |= (mask)
-    #define CLEAR_BIT(reg, mask)	reg &= (~mask)
-    static int ifx_hw_reset(void)
-    {
-        CLEAR_BIT((*AMAZON_GPIO_P0_ALTSEL0),0x2000);
-        CLEAR_BIT((*AMAZON_GPIO_P0_ALTSEL1),0x2000);
-        SET_BIT((*AMAZON_GPIO_P0_OD),0x2000);
-        SET_BIT((*AMAZON_GPIO_P0_DIR), 0x2000);
-	CLEAR_BIT((*AMAZON_GPIO_P0_OUT), 0x2000);
-	mdelay(500);
-	SET_BIT((*AMAZON_GPIO_P0_OUT), 0x2000);
-        cleanup_adm6996_module();
-        return init_adm6996_module();
-    }
-    int (*adm6996_hw_reset)(void) = ifx_hw_reset;
-    EXPORT_SYMBOL(adm6996_hw_reset);
-    EXPORT_SYMBOL(adm6996_mode);
-    int (*adm6996_sw_read)(unsigned int addr, unsigned int *data) = ifx_sw_read;
-    EXPORT_SYMBOL(adm6996_sw_read);
-    int (*adm6996_sw_write)(unsigned int addr, unsigned int data) = ifx_sw_write;
-    EXPORT_SYMBOL(adm6996_sw_write);
-#endif
-/* MarsLin, add end */
-
-/* Santosh: for IGMP proxy/snooping, Begin */
-EXPORT_SYMBOL (adm_process_mac_table_request);
-EXPORT_SYMBOL (adm_process_protocol_filter_request);
-/* Santosh: for IGMP proxy/snooping, End */
-	
-MODULE_DESCRIPTION("ADMtek 6996 Driver");
-MODULE_AUTHOR("Joe Lin <joe.lin@infineon.com>");
-MODULE_LICENSE("GPL");
-
-module_init(init_adm6996_module);
-module_exit(cleanup_adm6996_module);
-
diff --git a/target/linux/amazon/files/drivers/net/amazon_sw.c b/target/linux/amazon/files/drivers/net/amazon_sw.c
deleted file mode 100644
index 54a70622e..000000000
--- a/target/linux/amazon/files/drivers/net/amazon_sw.c
+++ /dev/null
@@ -1,899 +0,0 @@
-/*
- *   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.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-//-----------------------------------------------------------------------
-/*
- * Description:
- *	Driver for Infineon Amazon 3 port switch
- */
-//-----------------------------------------------------------------------
-/* Author:	Wu Qi Ming[Qi-Ming.Wu@infineon.com]
- * Created:	7-April-2004
- */
-//-----------------------------------------------------------------------
-/* History
- * Changed on: Jun 28, 2004
- * Changed by: peng.liu@infineon.com
- * Reason:	add hardware flow control (HFC) (CONFIG_NET_HW_FLOWCONTROL)
- *
- * Changed on: Apr 6, 2005
- * Changed by: mars.lin@infineon.com
- * Reason    : supoort port identification
- */
-
-
-// copyright 2004-2005 infineon.com
-
-// copyright 2007 john crispin <blogic@openwrt.org>
-// copyright 2007 felix fietkau <nbd@openwrt.org>
-// copyright 2009 hauke mehrtens <hauke@hauke-m.de>
-
-
-// TODO
-// 		port vlan code from bcrm target... the tawainese code was scrapped due to crappyness
-// 		check all the mmi reg settings and possibly document them better
-// 		verify the ethtool code
-//		remove the while(1) stuff
-// 		further clean up and rework ... but it works for now
-//		check the mode[]=bridge stuff
-//		verify that the ethaddr can be set from u-boot
-
-
-#ifndef __KERNEL__
-#define __KERNEL__
-#endif
-
-
-#if defined(CONFIG_MODVERSIONS) && !defined(MODVERSIONS)
-#define MODVERSIONS
-#endif
-
-#if defined(MODVERSIONS) && !defined(__GENKSYMS__)
-#include <linux/modversions.h>
-#endif
-
-#include <linux/module.h>
-#include <linux/string.h>
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/errno.h>
-#include <linux/types.h>
-#include <linux/interrupt.h>
-#include <linux/mii.h>
-#include <asm/uaccess.h>
-#include <linux/in.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/ip.h>
-#include <linux/tcp.h>
-#include <linux/skbuff.h>
-#include <linux/in6.h>
-#include <linux/proc_fs.h>
-#include <linux/mm.h>
-#include <linux/ethtool.h>
-#include <asm/checksum.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-
-#include <asm/amazon/amazon.h>
-#include <asm/amazon/amazon_dma.h>
-#include <asm/amazon/amazon_sw.h>
-
-// how many mii ports are there ?
-#define AMAZON_SW_INT_NO 2
-
-#define ETHERNET_PACKET_DMA_BUFFER_SIZE 1536
-
-/***************************************** Module Parameters *************************************/
-char mode[] = "bridge";
-module_param_array(mode, charp, NULL, 0);
-
-static int timeout = 1 * HZ;
-module_param(timeout, int, 0);
-
-int switch_init(struct net_device *dev);
-void switch_tx_timeout(struct net_device *dev);
-
-static struct net_device *switch_devs[2];
-
-int add_mac_table_entry(u64 entry_value)
-{
-	int i;
-	u32 data1, data2;
-
-	AMAZON_SW_REG32(AMAZON_SW_ARL_CTL) = ~7;
-
-	for (i = 0; i < 32; i++) {
-		AMAZON_SW_REG32(AMAZON_SW_CPU_ACTL) = 0x80000000 | 0x20 | i;
-		while (AMAZON_SW_REG32(AMAZON_SW_CPU_ACTL) & (0x80000000)) {};
-		data1 = AMAZON_SW_REG32(AMAZON_SW_DATA1);
-		data2 = AMAZON_SW_REG32(AMAZON_SW_DATA2);
-		if ((data1 & (0x00700000)) != 0x00700000)
-			continue;
-		AMAZON_SW_REG32(AMAZON_SW_DATA1) = (u32) (entry_value >> 32);
-		AMAZON_SW_REG32(AMAZON_SW_DATA2) = (u32) entry_value & 0xffffffff;
-		AMAZON_SW_REG32(AMAZON_SW_CPU_ACTL) = 0xc0000020 | i;
-		while (AMAZON_SW_REG32(AMAZON_SW_CPU_ACTL) & (0x80000000)) {};
-		break;
-	}
-	AMAZON_SW_REG32(AMAZON_SW_ARL_CTL) |= 7;
-	if (i >= 32)
-		return -1;
-	return OK;
-}
-
-u64 read_mac_table_entry(int index)
-{
-	u32 data1, data2;
-	u64 value;
-	AMAZON_SW_REG32(AMAZON_SW_CPU_ACTL) = 0x80000000 | 0x20 | index;
-	while (AMAZON_SW_REG32(AMAZON_SW_CPU_ACTL) & (0x80000000)) {};
-	data1 = AMAZON_SW_REG32(AMAZON_SW_DATA1) & 0xffffff;
-	data2 = AMAZON_SW_REG32(AMAZON_SW_DATA2);
-	value = (u64) data1 << 32 | (u64) data2;
-	return value;
-}
-
-int write_mac_table_entry(int index, u64 value)
-{
-	u32 data1, data2;
-	data1 = (u32) (value >> 32);
-	data2 = (u32) value & 0xffffffff;
-	AMAZON_SW_REG32(AMAZON_SW_DATA1) = data1;
-	AMAZON_SW_REG32(AMAZON_SW_DATA2) = data2;
-	AMAZON_SW_REG32(AMAZON_SW_CPU_ACTL) = 0xc0000020 | index;
-	while (AMAZON_SW_REG32(AMAZON_SW_CPU_ACTL) & (0x80000000)) {};
-	return OK;
-}
-
-u32 get_mdio_reg(int phy_addr, int reg_num)
-{
-	u32 value;
-	AMAZON_SW_REG32(AMAZON_SW_MDIO_ACC) = (3 << 30) | ((phy_addr & 0x1f) << 21) | ((reg_num & 0x1f) << 16);
-	while (AMAZON_SW_REG32(AMAZON_SW_MDIO_ACC) & (1 << 31)) {};
-	value = AMAZON_SW_REG32(AMAZON_SW_MDIO_ACC) & 0xffff;
-	return value;
-}
-
-int set_mdio_reg(int phy_addr, int reg_num, u32 value)
-{
-	AMAZON_SW_REG32(AMAZON_SW_MDIO_ACC) = (2 << 30) | ((phy_addr & 0x1f) << 21) | ((reg_num & 0x1f) << 16) | (value & 0xffff);
-	while (AMAZON_SW_REG32(AMAZON_SW_MDIO_ACC) & (1 << 31)) {};
-	return OK;
-}
-
-int auto_negotiate(int phy_addr)
-{
-	u32 value = 0;
-	value = get_mdio_reg(phy_addr, MDIO_BASE_CONTROL_REG);
-	set_mdio_reg(phy_addr, MDIO_BASE_CONTROL_REG, (value | RESTART_AUTO_NEGOTIATION | AUTO_NEGOTIATION_ENABLE | PHY_RESET));
-	return OK;
-}
-
-/*
-     In this version of switch driver, we split the dma channels for the switch.
-     2 for port0 and 2 for port1. So that we can do internal bridging if necessary.
-     In switch mode, packets coming in from port0 or port1 is able to do Destination 
-     address lookup. Packets coming from port0 with destination address of port1 should 
-     not go to pmac again. The switch hardware should be able to do the switch in the hard 
-     ware level. Packets coming from the pmac should not do the DA look up in that the
-     desination is already known for the kernel. It only needs to go to the correct NIC to 
-     find its way out.
-  */
-int amazon_sw_chip_init(void)
-{
-	u32 tmp1;
-	int i = 0;
-
-	/* Aging tick select: 5mins */
-	tmp1 = 0xa0;
-	if (strcmp(mode, "bridge") == 0) {
-		// bridge mode, set militarised mode to 1, no learning!
-		tmp1 |= 0xC00;
-	} else {
-		// enable learning for P0 and P1,
-		tmp1 |= 3;
-	}
-
-	/* unknown broadcast/multicast/unicast to all ports */
-	AMAZON_SW_REG32(AMAZON_SW_UN_DEST) = 0x1ff;
-
-	AMAZON_SW_REG32(AMAZON_SW_ARL_CTL) = tmp1;
-
-	/* OCS:1 set OCS bit, split the two NIC in rx direction EDL:1 (enable DA lookup) */
-#if defined(CONFIG_IFX_NFEXT_AMAZON_SWITCH_PHYPORT) || defined(CONFIG_IFX_NFEXT_AMAZON_SWITCH_PHYPORT_MODULE)
-	AMAZON_SW_REG32(AMAZON_SW_P2_PCTL) = 0x700;
-#else
-	AMAZON_SW_REG32(AMAZON_SW_P2_PCTL) = 0x401;
-#endif
-
-	/* EPC: 1 split the two NIC in tx direction CRC is generated */
-	AMAZON_SW_REG32(AMAZON_SW_P2_CTL) = 0x6;
-
-	// for bi-directional 
-	AMAZON_SW_REG32(AMAZON_SW_P0_WM) = 0x14141412;
-	AMAZON_SW_REG32(AMAZON_SW_P1_WM) = 0x14141412;
-	AMAZON_SW_REG32(AMAZON_SW_P2_WM) = 0x28282826;
-	AMAZON_SW_REG32(AMAZON_SW_GBL_WM) = 0x0;
-
-	AMAZON_SW_REG32(AMAZON_CGU_PLL0SR) = (AMAZON_SW_REG32(AMAZON_CGU_PLL0SR)) | 0x58000000;
-	// clock for PHY
-	AMAZON_SW_REG32(AMAZON_CGU_IFCCR) =	(AMAZON_SW_REG32(AMAZON_CGU_IFCCR)) | 0x80000004;
-	// enable power for PHY
-	AMAZON_SW_REG32(AMAZON_PMU_PWDCR) = (AMAZON_SW_REG32(AMAZON_PMU_PWDCR)) | AMAZON_PMU_PWDCR_EPHY;
-	// set reverse MII, enable MDIO statemachine
-	AMAZON_SW_REG32(AMAZON_SW_MDIO_CFG) = 0x800027bf;
-	while (1)
-		if (((AMAZON_SW_REG32(AMAZON_SW_MDIO_CFG)) & 0x80000000) == 0)
-			break;
-	AMAZON_SW_REG32(AMAZON_SW_EPHY) = 0xff;
-
-	// auto negotiation
-	AMAZON_SW_REG32(AMAZON_SW_MDIO_ACC) = 0x83e08000;
-	auto_negotiate(0x1f);
-
-	/* enable all ports */
-	AMAZON_SW_REG32(AMAZON_SW_PS_CTL) = 0x7;
-	for (i = 0; i < 32; i++)
-		write_mac_table_entry(i, 1 << 50);
-	return 0;
-}
-
-static unsigned char my_ethaddr[MAX_ADDR_LEN];
-/* need to get the ether addr from u-boot */
-static int __init ethaddr_setup(char *line)
-{
-	char *ep;
-	int i;
-
-	memset(my_ethaddr, 0, MAX_ADDR_LEN);
-	for (i = 0; i < 6; i++) {
-		my_ethaddr[i] = line ? simple_strtoul(line, &ep, 16) : 0;
-		if (line)
-			line = (*ep) ? ep + 1 : ep;
-	}
-	printk(KERN_INFO "amazon_mii0: mac address %2x-%2x-%2x-%2x-%2x-%2x \n", my_ethaddr[0], my_ethaddr[1], my_ethaddr[2], my_ethaddr[3], my_ethaddr[4], my_ethaddr[5]);
-	return 0;
-}
-
-__setup("ethaddr=", ethaddr_setup);
-
-static void open_rx_dma(struct net_device *dev)
-{
-	struct switch_priv *priv = (struct switch_priv *) netdev_priv(dev);
-	struct dma_device_info *dma_dev = priv->dma_device;
-	int i;
-
-	for (i = 0; i < dma_dev->num_rx_chan; i++)
-		dma_dev->rx_chan[i].control = 1;
-	dma_device_update_rx(dma_dev);
-}
-
-#ifdef CONFIG_NET_HW_FLOWCONTROL
-static void close_rx_dma(struct net_device *dev)
-{
-	struct switch_priv *priv = (struct switch_priv *) netdev_priv(dev);
-	struct dma_device_info *dma_dev = priv->dma_device;
-	int i;
-
-	for (i = 0; i < dma_dev->num_rx_chan; i++)
-		dma_dev->rx_chan[i].control = 0;
-	dma_device_update_rx(dma_dev);
-}
-
-void amazon_xon(struct net_device *dev)
-{
-	unsigned long flag;
-	local_irq_save(flag);
-	open_rx_dma(dev);
-	local_irq_restore(flag);
-}
-#endif
-
-int switch_open(struct net_device *dev)
-{
-	struct switch_priv *priv = (struct switch_priv *) netdev_priv(dev);
-	if (!strcmp(dev->name, "eth1")) {
-		priv->mdio_phy_addr = PHY0_ADDR;
-	}
-	open_rx_dma(dev);			
-
-#ifdef CONFIG_NET_HW_FLOWCONTROL
-	if ((priv->fc_bit = netdev_register_fc(dev, amazon_xon)) == 0) {
-		printk(KERN_WARNING "amazon_mii0: Hardware Flow Control register fails\n");
-	}
-#endif
-
-	netif_start_queue(dev);
-	return OK;
-}
-
-int switch_release(struct net_device *dev)
-{
-	int i;
-	struct switch_priv *priv = (struct switch_priv *) netdev_priv(dev);
-	struct dma_device_info *dma_dev = priv->dma_device;
-
-	for (i = 0; i < dma_dev->num_tx_chan; i++)
-		dma_dev->tx_chan[i].control = 0;
-	for (i = 0; i < dma_dev->num_rx_chan; i++)
-		dma_dev->rx_chan[i].control = 0;
-
-	dma_device_update(dma_dev);
-
-#ifdef CONFIG_NET_HW_FLOWCONTROL
-	if (priv->fc_bit) {
-		netdev_unregister_fc(priv->fc_bit);
-	}
-#endif
-	netif_stop_queue(dev);
-
-	return OK;
-}
-
-
-void switch_rx(struct net_device *dev, int len, struct sk_buff *skb)
-{
-	struct switch_priv *priv = (struct switch_priv *) netdev_priv(dev);
-#ifdef CONFIG_NET_HW_FLOWCONTROL
-	int mit_sel = 0;
-#endif
-	skb->dev = dev;
-	skb->protocol = eth_type_trans(skb, dev);
-
-#ifdef CONFIG_NET_HW_FLOWCONTROL
-	mit_sel = netif_rx(skb);
-	switch (mit_sel) {
-	case NET_RX_SUCCESS:
-	case NET_RX_CN_LOW:
-	case NET_RX_CN_MOD:
-		break;
-	case NET_RX_CN_HIGH:
-		break;
-	case NET_RX_DROP:
-		if ((priv->fc_bit)
-			&& (!test_and_set_bit(priv->fc_bit, &netdev_fc_xoff))) {
-			close_rx_dma(dev);
-		}
-		break;
-	}
-#else
-	netif_rx(skb);
-#endif
-	priv->stats.rx_packets++;
-	priv->stats.rx_bytes += len;
-	return;
-}
-
-int asmlinkage switch_hw_tx(char *buf, int len, struct net_device *dev)
-{
-	struct switch_priv *priv = netdev_priv(dev);
-	struct dma_device_info *dma_dev = priv->dma_device;
-
-	dma_dev->current_tx_chan = 0;
-	return dma_device_write(dma_dev, buf, len, priv->skb);
-}
-
-int asmlinkage switch_tx(struct sk_buff *skb, struct net_device *dev)
-{
-	int len;
-	char *data;
-	struct switch_priv *priv = (struct switch_priv *) netdev_priv(dev);
-
-	len = skb->len < ETH_ZLEN ? ETH_ZLEN : skb->len;
-	data = skb->data;
-	priv->skb = skb;
-	dev->trans_start = jiffies;
-
-	if (switch_hw_tx(data, len, dev) != len) {
-		dev_kfree_skb_any(skb);
-		return OK;
-	}
-
-	priv->stats.tx_packets++;
-	priv->stats.tx_bytes += len;
-	return OK;
-}
-
-void switch_tx_timeout(struct net_device *dev)
-{
-	struct switch_priv *priv = (struct switch_priv *) netdev_priv(dev);
-	priv->stats.tx_errors++;
-	netif_wake_queue(dev);
-	return;
-}
-
-void negotiate(struct net_device *dev)
-{
-	struct switch_priv *priv = (struct switch_priv *) netdev_priv(dev);
-	unsigned short data = get_mdio_reg(priv->mdio_phy_addr, MDIO_ADVERTISMENT_REG);
-
-	data &= ~(MDIO_ADVERT_100_HD | MDIO_ADVERT_100_FD | MDIO_ADVERT_10_FD | MDIO_ADVERT_10_HD);
-
-	switch (priv->current_speed_selection) {
-	case 10:
-		if (priv->current_duplex == full)
-			data |= MDIO_ADVERT_10_FD;
-		else if (priv->current_duplex == half)
-			data |= MDIO_ADVERT_10_HD;
-		else
-			data |= MDIO_ADVERT_10_HD | MDIO_ADVERT_10_FD;
-		break;
-
-	case 100:
-		if (priv->current_duplex == full)
-			data |= MDIO_ADVERT_100_FD;
-		else if (priv->current_duplex == half)
-			data |= MDIO_ADVERT_100_HD;
-		else
-			data |= MDIO_ADVERT_100_HD | MDIO_ADVERT_100_FD;
-		break;
-
-	case 0:					/* Auto */
-		if (priv->current_duplex == full)
-			data |= MDIO_ADVERT_100_FD | MDIO_ADVERT_10_FD;
-		else if (priv->current_duplex == half)
-			data |= MDIO_ADVERT_100_HD | MDIO_ADVERT_10_HD;
-		else
-			data |=	MDIO_ADVERT_100_HD | MDIO_ADVERT_100_FD | MDIO_ADVERT_10_FD	| MDIO_ADVERT_10_HD;
-		break;
-
-	default:					/* assume autoneg speed and duplex */
-		data |= MDIO_ADVERT_100_HD | MDIO_ADVERT_100_FD | MDIO_ADVERT_10_FD | MDIO_ADVERT_10_HD;
-	}
-
-	set_mdio_reg(priv->mdio_phy_addr, MDIO_ADVERTISMENT_REG, data);
-
-	/* Renegotiate with link partner */
-
-	data = get_mdio_reg(priv->mdio_phy_addr, MDIO_BASE_CONTROL_REG);
-	data |= MDIO_BC_NEGOTIATE;
-
-	set_mdio_reg(priv->mdio_phy_addr, MDIO_BASE_CONTROL_REG, data);
-
-}
-
-
-void set_duplex(struct net_device *dev, enum duplex new_duplex)
-{
-	struct switch_priv *priv = (struct switch_priv *) netdev_priv(dev);
-	if (new_duplex != priv->current_duplex) {
-		priv->current_duplex = new_duplex;
-		negotiate(dev);
-	}
-}
-
-void set_speed(struct net_device *dev, unsigned long speed)
-{
-	struct switch_priv *priv = (struct switch_priv *) netdev_priv(dev);
-	priv->current_speed_selection = speed;
-	negotiate(dev);
-}
-
-static int switch_ethtool_ioctl(struct net_device *dev, struct ifreq *ifr)
-{
-	struct switch_priv *priv = (struct switch_priv *) netdev_priv(dev);
-	struct ethtool_cmd ecmd;
-
-	if (copy_from_user(&ecmd, ifr->ifr_data, sizeof(ecmd)))
-		return -EFAULT;
-
-	switch (ecmd.cmd) {
-	case ETHTOOL_GSET:
-		memset((void *) &ecmd, 0, sizeof(ecmd));
-		ecmd.supported = SUPPORTED_Autoneg | SUPPORTED_TP | SUPPORTED_MII |	SUPPORTED_10baseT_Half | SUPPORTED_10baseT_Full |
-						SUPPORTED_100baseT_Half | SUPPORTED_100baseT_Full;
-		ecmd.port = PORT_TP;
-		ecmd.transceiver = XCVR_EXTERNAL;
-		ecmd.phy_address = priv->mdio_phy_addr;
-
-		ecmd.speed = priv->current_speed;
-
-		ecmd.duplex = priv->full_duplex ? DUPLEX_FULL : DUPLEX_HALF;
-
-		ecmd.advertising = ADVERTISED_TP;
-		if (priv->current_duplex == autoneg && priv->current_speed_selection == 0)
-			ecmd.advertising |= ADVERTISED_Autoneg;
-		else {
-			ecmd.advertising |=	ADVERTISED_10baseT_Half | ADVERTISED_10baseT_Full |
-				ADVERTISED_100baseT_Half | ADVERTISED_100baseT_Full;
-			if (priv->current_speed_selection == 10)
-				ecmd.advertising &=	~(ADVERTISED_100baseT_Half | ADVERTISED_100baseT_Full);
-			else if (priv->current_speed_selection == 100)
-				ecmd.advertising &=	~(ADVERTISED_10baseT_Half | ADVERTISED_10baseT_Full);
-			if (priv->current_duplex == half)
-				ecmd.advertising &=	~(ADVERTISED_10baseT_Full | ADVERTISED_100baseT_Full);
-			else if (priv->current_duplex == full)
-				ecmd.advertising &=	~(ADVERTISED_10baseT_Half | ADVERTISED_100baseT_Half);
-		}
-		ecmd.autoneg = AUTONEG_ENABLE;
-		if (copy_to_user(ifr->ifr_data, &ecmd, sizeof(ecmd)))
-			return -EFAULT;
-		break;
-
-	case ETHTOOL_SSET:
-		if (!capable(CAP_NET_ADMIN)) {
-			return -EPERM;
-		}
-		if (ecmd.autoneg == AUTONEG_ENABLE) {
-			set_duplex(dev, autoneg);
-			set_speed(dev, 0);
-		} else {
-			set_duplex(dev, ecmd.duplex == DUPLEX_HALF ? half : full);
-			set_speed(dev, ecmd.speed == SPEED_10 ? 10 : 100);
-		}
-		break;
-
-	case ETHTOOL_GDRVINFO:
-		{
-			struct ethtool_drvinfo info;
-			memset((void *) &info, 0, sizeof(info));
-			strncpy(info.driver, "AMAZONE", sizeof(info.driver) - 1);
-			strncpy(info.fw_version, "N/A", sizeof(info.fw_version) - 1);
-			strncpy(info.bus_info, "N/A", sizeof(info.bus_info) - 1);
-			info.regdump_len = 0;
-			info.eedump_len = 0;
-			info.testinfo_len = 0;
-			if (copy_to_user(ifr->ifr_data, &info, sizeof(info)))
-				return -EFAULT;
-		}
-		break;
-	case ETHTOOL_NWAY_RST:
-		if (priv->current_duplex == autoneg	&& priv->current_speed_selection == 0)
-			negotiate(dev);
-		break;
-	default:
-		return -EOPNOTSUPP;
-		break;
-	}
-	return 0;
-}
-
-
-
-int mac_table_tools_ioctl(struct net_device *dev, struct mac_table_req *req)
-{
-	int cmd;
-	int i;
-	cmd = req->cmd;
-	switch (cmd) {
-	case RESET_MAC_TABLE:
-		for (i = 0; i < 32; i++) {
-			write_mac_table_entry(i, 0);
-		}
-		break;
-	case READ_MAC_ENTRY:
-		req->entry_value = read_mac_table_entry(req->index);
-		break;
-	case WRITE_MAC_ENTRY:
-		write_mac_table_entry(req->index, req->entry_value);
-		break;
-	case ADD_MAC_ENTRY:
-		add_mac_table_entry(req->entry_value);
-		break;
-	default:
-		return -EINVAL;
-	}
-
-	return 0;
-}
-
-
-/*
-    the ioctl for the switch driver is developed in the conventional way
-    the control type falls into some basic categories, among them, the 
-    SIOCETHTOOL is the traditional eth interface. VLAN_TOOLS and  
-    MAC_TABLE_TOOLS are designed specifically for amazon chip. User 
-    should be aware of the data structures used in these interfaces. 
-*/
-int switch_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
-{
-	struct data_req *switch_data_req = (struct data_req *) ifr->ifr_data;
-	struct mac_table_req *switch_mac_table_req;
-	switch (cmd) {
-	case SIOCETHTOOL:
-		switch_ethtool_ioctl(dev, ifr);
-		break;
-	case SIOCGMIIPHY:			/* Get PHY address */
-		break;
-	case SIOCGMIIREG:			/* Read MII register */
-		break;
-	case SIOCSMIIREG:			/* Write MII register */
-		break;
-	case SET_ETH_SPEED_10:		/* 10 Mbps */
-		break;
-	case SET_ETH_SPEED_100:	/* 100 Mbps */
-		break;
-	case SET_ETH_SPEED_AUTO:	/* Auto negotiate speed */
-		break;
-	case SET_ETH_DUPLEX_HALF:	/* Half duplex. */
-		break;
-	case SET_ETH_DUPLEX_FULL:	/* Full duplex. */
-		break;
-	case SET_ETH_DUPLEX_AUTO:	/* Autonegotiate duplex */
-		break;
-	case SET_ETH_REG:
-		AMAZON_SW_REG32(switch_data_req->index) = switch_data_req->value;
-		break;
-	case MAC_TABLE_TOOLS:
-		switch_mac_table_req = (struct mac_table_req *) ifr->ifr_data;
-		mac_table_tools_ioctl(dev, switch_mac_table_req);
-		break;
-	default:
-		return -EINVAL;
-	}
-
-	return 0;
-}
-
-struct net_device_stats *switch_stats(struct net_device *dev)
-{
-	struct switch_priv *priv = (struct switch_priv *) netdev_priv(dev);
-	return &priv->stats;
-}
-
-int switch_change_mtu(struct net_device *dev, int new_mtu)
-{
-	if (new_mtu >= 1516)
-		new_mtu = 1516;
-	dev->mtu = new_mtu;
-	return 0;
-}
-
-int switch_hw_receive(struct net_device *dev, struct dma_device_info *dma_dev)
-{
-	u8 *buf = NULL;
-	int len = 0;
-	struct sk_buff *skb = NULL;
-
-	len = dma_device_read(dma_dev, &buf, (void **) &skb);
-
-	if (len >= 0x600) {
-		printk(KERN_WARNING "amazon_mii0: packet too large %d\n", len);
-		goto switch_hw_receive_err_exit;
-	}
-
-	/* remove CRC */
-	len -= 4;
-	if (skb == NULL) {
-		printk(KERN_WARNING "amazon_mii0: cannot restore pointer\n");
-		goto switch_hw_receive_err_exit;
-	}
-	if (len > (skb->end - skb->tail)) {
-		printk(KERN_WARNING "amazon_mii0: BUG, len:%d end:%p tail:%p\n", (len + 4), skb->end, skb->tail);
-		goto switch_hw_receive_err_exit;
-	}
-	skb_put(skb, len);
-	skb->dev = dev;
-	switch_rx(dev, len, skb);
-	return OK;
-  
-  switch_hw_receive_err_exit:
-	if (skb)
-		dev_kfree_skb_any(skb);
-	return -EIO;
-}
-
-int dma_intr_handler(struct dma_device_info *dma_dev, int status)
-{
-	struct net_device *dev;
-
-	dev = dma_dev->priv;
-	switch (status) {
-	case RCV_INT:
-		switch_hw_receive(dev, dma_dev);
-		break;
-	case TX_BUF_FULL_INT:
-		netif_stop_queue(dev);
-		break;
-	case TRANSMIT_CPT_INT:
-		netif_wake_queue(dev);
-		break;
-	}
-	return OK;
-}
-
-/* reserve 2 bytes in front of data pointer*/
-u8 *dma_buffer_alloc(int len, int *byte_offset, void **opt)
-{
-	u8 *buffer = NULL;
-	struct sk_buff *skb = NULL;
-	skb = dev_alloc_skb(ETHERNET_PACKET_DMA_BUFFER_SIZE);
-	if (skb == NULL) {
-		return NULL;
-	}
-	buffer = (u8 *) (skb->data);
-	skb_reserve(skb, 2);
-	*(int *) opt = (int) skb;
-	*byte_offset = 2;
-	return buffer;
-}
-
-int dma_buffer_free(u8 * dataptr, void *opt)
-{
-	struct sk_buff *skb = NULL;
-	if (opt == NULL) {
-		kfree(dataptr);
-	} else {
-		skb = (struct sk_buff *) opt;
-		dev_kfree_skb_any(skb);
-	}
-	return OK;
-}
-
-int init_dma_device(_dma_device_info * dma_dev, struct net_device *dev)
-{
-	int i;
-	int num_tx_chan, num_rx_chan;
-	if (strcmp(dma_dev->device_name, "switch1") == 0) {
-		num_tx_chan = 1;
-		num_rx_chan = 2;
-	} else {
-		num_tx_chan = 1;
-		num_rx_chan = 2;
-	}
-	dma_dev->priv = dev;
-
-	dma_dev->weight = 1;
-	dma_dev->num_tx_chan = num_tx_chan;
-	dma_dev->num_rx_chan = num_rx_chan;
-	dma_dev->ack = 1;
-	dma_dev->tx_burst_len = 4;
-	dma_dev->rx_burst_len = 4;
-	for (i = 0; i < dma_dev->num_tx_chan; i++) {
-		dma_dev->tx_chan[i].weight = QOS_DEFAULT_WGT;
-		dma_dev->tx_chan[i].desc_num = 10;
-		dma_dev->tx_chan[i].packet_size = 0;
-		dma_dev->tx_chan[i].control = 0;
-	}
-	for (i = 0; i < num_rx_chan; i++) {
-		dma_dev->rx_chan[i].weight = QOS_DEFAULT_WGT;
-		dma_dev->rx_chan[i].desc_num = 10;
-		dma_dev->rx_chan[i].packet_size = ETHERNET_PACKET_DMA_BUFFER_SIZE;
-		dma_dev->rx_chan[i].control = 0;
-	}
-	dma_dev->intr_handler = dma_intr_handler;
-	dma_dev->buffer_alloc = dma_buffer_alloc;
-	dma_dev->buffer_free = dma_buffer_free;
-	return 0;
-}
-
-int switch_set_mac_address(struct net_device *dev, void *p)
-{
-	struct sockaddr *addr = p;
-	memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
-	return OK;
-}
-
-static const struct net_device_ops amazon_mii_ops = {
-	.ndo_init		= switch_init,
-	.ndo_open		= switch_open,
-	.ndo_stop		= switch_release,
-	.ndo_start_xmit		= switch_tx,
-	.ndo_do_ioctl		= switch_ioctl,
-	.ndo_get_stats		= switch_stats,
-	.ndo_change_mtu		= switch_change_mtu,
-	.ndo_set_mac_address		= switch_set_mac_address,
-	.ndo_tx_timeout		= switch_tx_timeout,
-};
-
-int switch_init(struct net_device *dev)
-{
-	u64 retval = 0;
-	int i;
-	int result;
-	struct switch_priv *priv;
-	ether_setup(dev);			/* assign some of the fields */
-	printk(KERN_INFO "amazon_mii0: %s up using ", dev->name);
-	dev->watchdog_timeo = timeout;
-
-	priv = netdev_priv(dev);
-	priv->dma_device = (struct dma_device_info *) kmalloc(sizeof(struct dma_device_info), GFP_KERNEL);
-	if (priv->num == 0) {
-		sprintf(priv->dma_device->device_name, "switch1");
-	} else if (priv->num == 1) {
-		sprintf(priv->dma_device->device_name, "switch2");
-	}
-	printk("\"%s\"\n", priv->dma_device->device_name);
-	init_dma_device(priv->dma_device, dev);
-	result = dma_device_register(priv->dma_device);
-
-	/* read the mac address from the mac table and put them into the mac table. */
-	for (i = 0; i < 6; i++) {
-		retval += my_ethaddr[i];
-	}
-	/* ethaddr not set in u-boot ? */
-	if (retval == 0) {
-		dev->dev_addr[0] = 0x00;
-		dev->dev_addr[1] = 0x20;
-		dev->dev_addr[2] = 0xda;
-		dev->dev_addr[3] = 0x86;
-		dev->dev_addr[4] = 0x23;
-		dev->dev_addr[5] = 0x74 + (unsigned char) priv->num;
-	} else {
-		for (i = 0; i < 6; i++) {
-			dev->dev_addr[i] = my_ethaddr[i];
-		}
-		dev->dev_addr[5] += +(unsigned char) priv->num;
-	}
-	return OK;
-}
-
-static int amazon_mii_probe(struct platform_device *dev)
-{
-	int i = 0, result, device_present = 0;
-	struct switch_priv *priv;
-
-	for (i = 0; i < AMAZON_SW_INT_NO; i++) {
-		switch_devs[i] = alloc_etherdev(sizeof(struct switch_priv));
-		switch_devs[i]->netdev_ops = &amazon_mii_ops;
-		strcpy(switch_devs[i]->name, "eth%d");
-		priv = (struct switch_priv *) netdev_priv(switch_devs[i]);
-		priv->num = i;
-		if ((result = register_netdev(switch_devs[i])))
-			printk(KERN_WARNING "amazon_mii0: error %i registering device \"%s\"\n", result, switch_devs[i]->name);
-		else
-			device_present++;
-	}
-	amazon_sw_chip_init();
-	return device_present ? 0 : -ENODEV;
-}
-
-static int amazon_mii_remove(struct platform_device *dev)
-{
-	int i;
-	struct switch_priv *priv;
-	for (i = 0; i < AMAZON_SW_INT_NO; i++) {
-		priv = netdev_priv(switch_devs[i]);
-		if (priv->dma_device) {
-			dma_device_unregister(priv->dma_device);
-			kfree(priv->dma_device);
-		}
-		kfree(netdev_priv(switch_devs[i]));
-		unregister_netdev(switch_devs[i]);
-	}
-	return 0;
-}
-
-static struct platform_driver amazon_mii_driver = {
-	.probe = amazon_mii_probe,
-	.remove = amazon_mii_remove,
-	.driver = {
-		.name = "amazon_mii0",
-		.owner = THIS_MODULE,
-	},
-};
-
-static int __init amazon_mii_init(void)
-{
-	int ret = platform_driver_register(&amazon_mii_driver);
-	if (ret)
-		printk(KERN_WARNING "amazon_mii0: Error registering platfom driver!\n");
-	return ret;
-}
-
-static void __exit amazon_mii_cleanup(void)
-{
-	platform_driver_unregister(&amazon_mii_driver);
-}
-
-module_init(amazon_mii_init);
-module_exit(amazon_mii_cleanup);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Wu Qi Ming");
-MODULE_DESCRIPTION("ethernet driver for AMAZON boards");
-
diff --git a/target/linux/amazon/files/drivers/serial/amazon_asc.c b/target/linux/amazon/files/drivers/serial/amazon_asc.c
deleted file mode 100644
index 449208616..000000000
--- a/target/linux/amazon/files/drivers/serial/amazon_asc.c
+++ /dev/null
@@ -1,711 +0,0 @@
-/*
- *  Driver for AMAZONASC serial ports
- *
- *  Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
- *  Based on drivers/serial/serial_s3c2400.c
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * Copyright (C) 2004 Infineon IFAP DC COM CPE
- * Copyright (C) 2007 Felix Fietkau <nbd@openwrt.org>
- * Copyright (C) 2007 John Crispin <blogic@openwrt.org>
- */
-
-#include <linux/module.h>
-#include <linux/errno.h>
-#include <linux/signal.h>
-#include <linux/sched.h>
-#include <linux/interrupt.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <linux/major.h>
-#include <linux/string.h>
-#include <linux/fcntl.h>
-#include <linux/ptrace.h>
-#include <linux/ioport.h>
-#include <linux/mm.h>
-#include <linux/slab.h>
-#include <linux/init.h>
-#include <linux/circ_buf.h>
-#include <linux/serial.h>
-#include <linux/serial_core.h>
-#include <linux/console.h>
-#include <linux/sysrq.h>
-#include <linux/irq.h>
-#include <linux/platform_device.h>
-
-#include <asm/system.h>
-#include <asm/io.h>
-#include <asm/uaccess.h>
-#include <asm/bitops.h>
-#include <asm/amazon/amazon.h>
-#include <asm/amazon/irq.h>
-#include <asm/amazon/serial.h>
-
-#define PORT_AMAZONASC  111
-
-#include <linux/serial_core.h>
-
-#define UART_NR		1
-
-#define UART_DUMMY_UER_RX 1
-
-#define SERIAL_AMAZONASC_MAJOR	TTY_MAJOR
-#define CALLOUT_AMAZONASC_MAJOR	TTYAUX_MAJOR
-#define SERIAL_AMAZONASC_MINOR	64
-#define SERIAL_AMAZONASC_NR	UART_NR
-
-static void amazonasc_tx_chars(struct uart_port *port);
-static struct uart_port amazonasc_ports[UART_NR];
-static struct uart_driver amazonasc_reg;
-static unsigned int uartclk = 0;
-
-static void amazonasc_stop_tx(struct uart_port *port)
-{
-	/* fifo underrun shuts up after firing once */
-	return;
-}
-
-static void amazonasc_start_tx(struct uart_port *port)
-{
-	unsigned long flags;
-
-	local_irq_save(flags);
-	amazonasc_tx_chars(port);
-	local_irq_restore(flags);
-
-	return;
-}
-
-static void amazonasc_stop_rx(struct uart_port *port)
-{
-	/* clear the RX enable bit */
-	amazon_writel(ASCWHBCON_CLRREN, AMAZON_ASC_WHBCON);
-}
-
-static void amazonasc_enable_ms(struct uart_port *port)
-{
-	/* no modem signals */
-	return;
-}
-
-#include <linux/version.h>
-
-static void
-amazonasc_rx_chars(struct uart_port *port)
-{
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 31))
-	struct tty_struct *tty = port->state->port.tty;
-#else
-	struct tty_struct *tty = port->info->port.tty;
-#endif
-	unsigned int ch = 0, rsr = 0, fifocnt;
-
-	fifocnt = amazon_readl(AMAZON_ASC_FSTAT) & ASCFSTAT_RXFFLMASK;
-	while (fifocnt--)
-	{
-		u8 flag = TTY_NORMAL;
-		ch = amazon_readl(AMAZON_ASC_RBUF);
-		rsr = (amazon_readl(AMAZON_ASC_CON) & ASCCON_ANY) | UART_DUMMY_UER_RX;
-		tty_flip_buffer_push(tty);
-		port->icount.rx++;
-
-		/*
-		 * Note that the error handling code is
-		 * out of the main execution path
-		 */
-		if (rsr & ASCCON_ANY) {
-			if (rsr & ASCCON_PE) {
-				port->icount.parity++;
-				amazon_writel_masked(AMAZON_ASC_WHBCON, ASCWHBCON_CLRPE, ASCWHBCON_CLRPE);
-			} else if (rsr & ASCCON_FE) {
-				port->icount.frame++;
-				amazon_writel_masked(AMAZON_ASC_WHBCON, ASCWHBCON_CLRFE, ASCWHBCON_CLRFE);
-			}
-			if (rsr & ASCCON_OE) {
-				port->icount.overrun++;
-				amazon_writel_masked(AMAZON_ASC_WHBCON, ASCWHBCON_CLROE, ASCWHBCON_CLROE);
-			}
-
-			rsr &= port->read_status_mask;
-
-			if (rsr & ASCCON_PE)
-				flag = TTY_PARITY;
-			else if (rsr & ASCCON_FE)
-				flag = TTY_FRAME;
-		}
-
-		if ((rsr & port->ignore_status_mask) == 0)
-			tty_insert_flip_char(tty, ch, flag);
-
-		if (rsr & ASCCON_OE)
-			/*
-			 * Overrun is special, since it's reported
-			 * immediately, and doesn't affect the current
-			 * character
-			 */
-			tty_insert_flip_char(tty, 0, TTY_OVERRUN);
-	}
-	if (ch != 0)
-		tty_flip_buffer_push(tty);
-
-	return;
-}
-
-
-static void amazonasc_tx_chars(struct uart_port *port)
-{
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 31))
-	struct circ_buf *xmit = &port->state->xmit;
-#else
-	struct circ_buf *xmit = &port->info->xmit;
-#endif
-
-	if (uart_tx_stopped(port)) {
-		amazonasc_stop_tx(port);
-		return;
-	}
-	
-	while (((amazon_readl(AMAZON_ASC_FSTAT) & ASCFSTAT_TXFFLMASK)
-			>> ASCFSTAT_TXFFLOFF) != AMAZONASC_TXFIFO_FULL)
-	{
-		if (port->x_char) {
-			amazon_writel(port->x_char, AMAZON_ASC_TBUF);
-			port->icount.tx++;
-			port->x_char = 0;
-			continue;
-		}
-
-		if (uart_circ_empty(xmit))
-			break;
-
-		amazon_writel(xmit->buf[xmit->tail], AMAZON_ASC_TBUF);
-		xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
-		port->icount.tx++;
-	}
-
-	if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
-		uart_write_wakeup(port);
-}
-
-static irqreturn_t amazonasc_tx_int(int irq, void *port)
-{
-	amazon_writel(ASC_IRNCR_TIR, AMAZON_ASC_IRNCR1);
-	amazonasc_start_tx(port);
-
-	/* clear any pending interrupts */
-	amazon_writel_masked(AMAZON_ASC_WHBCON, 
-			(ASCWHBCON_CLRPE | ASCWHBCON_CLRFE | ASCWHBCON_CLROE), 
-			(ASCWHBCON_CLRPE | ASCWHBCON_CLRFE | ASCWHBCON_CLROE));
-
-	return IRQ_HANDLED;
-}
-
-static irqreturn_t amazonasc_er_int(int irq, void *port)
-{
-	/* clear any pending interrupts */
-	amazon_writel_masked(AMAZON_ASC_WHBCON, 
-			(ASCWHBCON_CLRPE | ASCWHBCON_CLRFE | ASCWHBCON_CLROE), 
-			(ASCWHBCON_CLRPE | ASCWHBCON_CLRFE | ASCWHBCON_CLROE));
-	
-	return IRQ_HANDLED;
-}
-
-static irqreturn_t amazonasc_rx_int(int irq, void *port)
-{
-	amazon_writel(ASC_IRNCR_RIR, AMAZON_ASC_IRNCR1);
-	amazonasc_rx_chars((struct uart_port *) port);
-	return IRQ_HANDLED;
-}
-
-static u_int amazonasc_tx_empty(struct uart_port *port)
-{
-	int status;
-
-	/*
-	 * FSTAT tells exactly how many bytes are in the FIFO.
-	 * The question is whether we really need to wait for all
-	 * 16 bytes to be transmitted before reporting that the
-	 * transmitter is empty.
-	 */
-	status = amazon_readl(AMAZON_ASC_FSTAT) & ASCFSTAT_TXFFLMASK;
-	return status ? 0 : TIOCSER_TEMT;
-}
-
-static u_int amazonasc_get_mctrl(struct uart_port *port)
-{
-	/* no modem control signals - the readme says to pretend all are set */
-	return TIOCM_CTS|TIOCM_CAR|TIOCM_DSR;
-}
-
-static void amazonasc_set_mctrl(struct uart_port *port, u_int mctrl)
-{
-	/* no modem control - just return */
-	return;
-}
-
-static void amazonasc_break_ctl(struct uart_port *port, int break_state)
-{
-	/* no way to send a break */
-	return;
-}
-
-static int amazonasc_startup(struct uart_port *port)
-{
-	unsigned int con = 0;
-	unsigned long flags;
-	int retval;
-
-	/* this assumes: CON.BRS = CON.FDE = 0 */
-	if (uartclk == 0)
-		uartclk = amazon_get_fpi_hz();
-
-	amazonasc_ports[0].uartclk = uartclk;
-
-	local_irq_save(flags);
-
-	/* this setup was probably already done in u-boot */
-	/* ASC and GPIO Port 1 bits 3 and 4 share the same pins
-	 * P1.3 (RX) in, Alternate 10
-	 * P1.4 (TX) in, Alternate 10
-	 */
-	 amazon_writel_masked(AMAZON_GPIO_P1_DIR, 0x18, 0x10); 	//P1.4 output, P1.3 input
-	 amazon_writel_masked(AMAZON_GPIO_P1_ALTSEL0, 0x18, 0x18); 		//ALTSETL0 11
-	 amazon_writel_masked(AMAZON_GPIO_P1_ALTSEL1, 0x18, 0);	 	//ALTSETL1 00
-	 amazon_writel_masked(AMAZON_GPIO_P1_OD, 0x18, 0x10);
-	
-	/* set up the CLC */
-	amazon_writel_masked(AMAZON_ASC_CLC, AMAZON_ASC_CLC_DISS, 0);
-	amazon_writel_masked(AMAZON_ASC_CLC, ASCCLC_RMCMASK, 1 << ASCCLC_RMCOFFSET);
-	
-	/* asynchronous mode */
-	con = ASCCON_M_8ASYNC | ASCCON_FEN | ASCCON_OEN | ASCCON_PEN;
-	
-	/* choose the line - there's only one */
-	amazon_writel(0, AMAZON_ASC_PISEL);
-	amazon_writel(((AMAZONASC_TXFIFO_FL << ASCTXFCON_TXFITLOFF) & ASCTXFCON_TXFITLMASK) | ASCTXFCON_TXFEN | ASCTXFCON_TXFFLU, 
-		AMAZON_ASC_TXFCON);
-	amazon_writel(((AMAZONASC_RXFIFO_FL << ASCRXFCON_RXFITLOFF) & ASCRXFCON_RXFITLMASK) | ASCRXFCON_RXFEN | ASCRXFCON_RXFFLU, 
-		AMAZON_ASC_RXFCON);
-	wmb();
-	
-	amazon_writel_masked(AMAZON_ASC_CON, con, con);
-
-	retval = request_irq(AMAZONASC_RIR, amazonasc_rx_int, 0, "asc_rx", port);
-	if (retval){
-		printk("failed to request amazonasc_rx_int\n");
-		return retval;
-	}
-	retval = request_irq(AMAZONASC_TIR, amazonasc_tx_int, 0, "asc_tx", port);
-	if (retval){
-		printk("failed to request amazonasc_tx_int\n");
-		goto err1;
-	}
-
-	retval = request_irq(AMAZONASC_EIR, amazonasc_er_int, 0, "asc_er", port);
-	if (retval){
-		printk("failed to request amazonasc_er_int\n");
-		goto err2;
-	}
-	
-	local_irq_restore(flags);
-	return 0;
-
-err2:
-	free_irq(AMAZONASC_TIR, port);
-	
-err1:
-	free_irq(AMAZONASC_RIR, port);
-	local_irq_restore(flags);
-	return retval;
-}
-
-static void amazonasc_shutdown(struct uart_port *port)
-{
-	free_irq(AMAZONASC_RIR, port);
-	free_irq(AMAZONASC_TIR, port);
-	free_irq(AMAZONASC_EIR, port);
-	/*
-	 * disable the baudrate generator to disable the ASC
-	 */
-	amazon_writel(0, AMAZON_ASC_CON);
-
-	/* flush and then disable the fifos */
-	amazon_writel_masked(AMAZON_ASC_RXFCON, ASCRXFCON_RXFFLU, ASCRXFCON_RXFFLU);
-	amazon_writel_masked(AMAZON_ASC_RXFCON, ASCRXFCON_RXFEN, 0);
-	amazon_writel_masked(AMAZON_ASC_TXFCON, ASCTXFCON_TXFFLU, ASCTXFCON_TXFFLU);
-	amazon_writel_masked(AMAZON_ASC_TXFCON, ASCTXFCON_TXFEN, 0);
-}
-
-static void amazonasc_set_termios(struct uart_port *port, struct ktermios *new, struct ktermios *old)
-{
-	unsigned int cflag;
-	unsigned int iflag;
-	unsigned int baud, quot;
-	unsigned int con = 0;
-	unsigned long flags;
-
-	cflag = new->c_cflag;
-	iflag = new->c_iflag;
-
-	/* byte size and parity */
-	switch (cflag & CSIZE) {
-	/* 7 bits are always with parity */
-	case CS7: con = ASCCON_M_7ASYNCPAR; break;
-	/* the ASC only suports 7 and 8 bits */
-	case CS5:
-	case CS6:
-	default:
-		if (cflag & PARENB)
-			con = ASCCON_M_8ASYNCPAR;
-		else
-			con = ASCCON_M_8ASYNC;
-		break;
-	}
-	if (cflag & CSTOPB)
-		con |= ASCCON_STP;
-	if (cflag & PARENB) {
-		if (!(cflag & PARODD))
-			con &= ~ASCCON_ODD;
-		else
-			con |= ASCCON_ODD;
-	}
-
-	port->read_status_mask = ASCCON_OE;
-	if (iflag & INPCK)
-		port->read_status_mask |= ASCCON_FE | ASCCON_PE;
-	
-	port->ignore_status_mask = 0;
-	if (iflag & IGNPAR)
-		port->ignore_status_mask |= ASCCON_FE | ASCCON_PE;
-	
-	if (iflag & IGNBRK) {
-		/*
-		 * If we're ignoring parity and break indicators,
-		 * ignore overruns too (for real raw support).
-		 */
-		if (iflag & IGNPAR)
-			port->ignore_status_mask |= ASCCON_OE;
-	}
-
-	/*
-	 * Ignore all characters if CREAD is not set.
-	 */
-	if ((cflag & CREAD) == 0)
-		port->ignore_status_mask |= UART_DUMMY_UER_RX;
-
-	/* set error signals  - framing, parity  and overrun */
-	con |= ASCCON_FEN;
-	con |= ASCCON_OEN;
-	con |= ASCCON_PEN;
-	/* enable the receiver */
-	con |= ASCCON_REN;
-
-	/* block the IRQs */
-	local_irq_save(flags);
-
-	/* set up CON */
-	amazon_writel(con, AMAZON_ASC_CON);
-
-	/* Set baud rate - take a divider of 2 into account */
-    baud = uart_get_baud_rate(port, new, old, 0, port->uartclk/16);
-	quot = uart_get_divisor(port, baud);
-	quot = quot/2 - 1;
-
-	/* the next 3 probably already happened when we set CON above */
-	/* disable the baudrate generator */
-	amazon_writel_masked(AMAZON_ASC_CON, ASCCON_R, 0);
-	/* make sure the fractional divider is off */
-	amazon_writel_masked(AMAZON_ASC_CON, ASCCON_FDE, 0);
-	/* set up to use divisor of 2 */
-	amazon_writel_masked(AMAZON_ASC_CON, ASCCON_BRS, 0);
-	/* now we can write the new baudrate into the register */
-	amazon_writel(quot, AMAZON_ASC_BTR);
-	/* turn the baudrate generator back on */
-	amazon_writel_masked(AMAZON_ASC_CON, ASCCON_R, ASCCON_R);
-
-	local_irq_restore(flags);
-}
-
-static const char *amazonasc_type(struct uart_port *port)
-{
-	return port->type == PORT_AMAZONASC ? "AMAZONASC" : NULL;
-}
-
-/*
- * Release the memory region(s) being used by 'port'
- */
-static void amazonasc_release_port(struct uart_port *port)
-{
-	return;
-}
-
-/*
- * Request the memory region(s) being used by 'port'
- */
-static int amazonasc_request_port(struct uart_port *port)
-{
-	return 0;
-}
-
-/*
- * Configure/autoconfigure the port.
- */
-static void amazonasc_config_port(struct uart_port *port, int flags)
-{
-	if (flags & UART_CONFIG_TYPE) {
-		port->type = PORT_AMAZONASC;
-		amazonasc_request_port(port);
-	}
-}
-
-/*
- * verify the new serial_struct (for TIOCSSERIAL).
- */
-static int amazonasc_verify_port(struct uart_port *port, struct serial_struct *ser)
-{
-	int ret = 0;
-	if (ser->type != PORT_UNKNOWN && ser->type != PORT_AMAZONASC)
-		ret = -EINVAL;
-	if (ser->irq < 0 || ser->irq >= NR_IRQS)
-		ret = -EINVAL;
-	if (ser->baud_base < 9600)
-		ret = -EINVAL;
-	return ret;
-}
-
-static struct uart_ops amazonasc_pops = {
-	.tx_empty =		amazonasc_tx_empty,
-	.set_mctrl =	amazonasc_set_mctrl,
-	.get_mctrl =	amazonasc_get_mctrl,
-	.stop_tx =		amazonasc_stop_tx,
-	.start_tx =		amazonasc_start_tx,
-	.stop_rx =		amazonasc_stop_rx,
-	.enable_ms =	amazonasc_enable_ms,
-	.break_ctl =	amazonasc_break_ctl,
-	.startup =		amazonasc_startup,
-	.shutdown =		amazonasc_shutdown,
-	.set_termios =	amazonasc_set_termios,
-	.type =			amazonasc_type,
-	.release_port =	amazonasc_release_port,
-	.request_port =	amazonasc_request_port,
-	.config_port =	amazonasc_config_port,
-	.verify_port =	amazonasc_verify_port,
-};
-
-static struct uart_port amazonasc_ports[UART_NR] = {
-	{
-		membase:	(void *)AMAZON_ASC,
-		mapbase:	AMAZON_ASC,
-		iotype:		SERIAL_IO_MEM,
-		irq:		AMAZONASC_RIR, /* RIR */
-		uartclk:	0, /* filled in dynamically */
-		fifosize:	16,
-		unused:		{ AMAZONASC_TIR, AMAZONASC_EIR}, /* xmit/error/xmit-buffer-empty IRQ */
-		type:		PORT_AMAZONASC,
-		ops:		&amazonasc_pops,
-		flags:		ASYNC_BOOT_AUTOCONF,
-	},
-};
-
-static void amazonasc_console_write(struct console *co, const char *s, u_int count)
-{
-	int i, fifocnt;
-	unsigned long flags;
-	local_irq_save(flags);
-	for (i = 0; i < count;)
-	{
-		/* wait until the FIFO is not full */
-		do
-		{
-			fifocnt = (amazon_readl(AMAZON_ASC_FSTAT) & ASCFSTAT_TXFFLMASK)
-					>> ASCFSTAT_TXFFLOFF;
-		} while (fifocnt == AMAZONASC_TXFIFO_FULL);
-		if (s[i] == '\0')
-		{
-			break;
-		}
-		if (s[i] == '\n')
-		{
-			amazon_writel('\r', AMAZON_ASC_TBUF);
-			do
-			{
-				fifocnt = (amazon_readl(AMAZON_ASC_FSTAT) &
-				ASCFSTAT_TXFFLMASK) >> ASCFSTAT_TXFFLOFF;
-			} while (fifocnt == AMAZONASC_TXFIFO_FULL);
-		}
-		amazon_writel(s[i], AMAZON_ASC_TBUF);
-		i++;
-	} 
-
-	local_irq_restore(flags);
-}
-
-static void __init
-amazonasc_console_get_options(struct uart_port *port, int *baud, int *parity, int *bits)
-{
-	u_int lcr_h;
-
-	lcr_h = amazon_readl(AMAZON_ASC_CON);
-	/* do this only if the ASC is turned on */
-	if (lcr_h & ASCCON_R) {
-		u_int quot, div, fdiv, frac;
-
-		*parity = 'n';
-		if ((lcr_h & ASCCON_MODEMASK) == ASCCON_M_7ASYNCPAR ||
-		            (lcr_h & ASCCON_MODEMASK) == ASCCON_M_8ASYNCPAR) {
-			if (lcr_h & ASCCON_ODD)
-				*parity = 'o';
-			else
-				*parity = 'e';
-		}
-
-		if ((lcr_h & ASCCON_MODEMASK) == ASCCON_M_7ASYNCPAR)
-			*bits = 7;
-		else
-			*bits = 8;
-
-		quot = amazon_readl(AMAZON_ASC_BTR) + 1;
-		
-		/* this gets hairy if the fractional divider is used */
-		if (lcr_h & ASCCON_FDE)
-		{
-			div = 1;
-			fdiv = amazon_readl(AMAZON_ASC_FDV);
-			if (fdiv == 0)
-				fdiv = 512;
-			frac = 512;
-		}
-		else
-		{
-			div = lcr_h & ASCCON_BRS ? 3 : 2;
-			fdiv = frac = 1;
-		}
-		/*
-		 * This doesn't work exactly because we use integer
-		 * math to calculate baud which results in rounding
-		 * errors when we try to go from quot -> baud !!
-		 * Try to make this work for both the fractional divider
-		 * and the simple divider. Also try to avoid rounding
-		 * errors using integer math.
-		 */
-		
-		*baud = frac * (port->uartclk / (div * 512 * 16 * quot));
-		if (*baud > 1100 && *baud < 2400)
-			*baud = 1200;
-		if (*baud > 2300 && *baud < 4800)
-			*baud = 2400;
-		if (*baud > 4700 && *baud < 9600)
-			*baud = 4800;
-		if (*baud > 9500 && *baud < 19200)
-			*baud = 9600;
-		if (*baud > 19000 && *baud < 38400)
-			*baud = 19200;
-		if (*baud > 38400 && *baud < 57600)
-			*baud = 38400;
-		if (*baud > 57600 && *baud < 115200)
-			*baud = 57600;
-		if (*baud > 115200 && *baud < 230400)
-			*baud = 115200;
-	}
-}
-
-static int __init amazonasc_console_setup(struct console *co, char *options)
-{
-	struct uart_port *port;
-	int baud = 115200;
-	int bits = 8;
-	int parity = 'n';
-	int flow = 'n';
-
-	/* this assumes: CON.BRS = CON.FDE = 0 */
-	if (uartclk == 0)
-		uartclk = amazon_get_fpi_hz();
-	co->index = 0;	
-	port = &amazonasc_ports[0];
-	amazonasc_ports[0].uartclk = uartclk;
-	amazonasc_ports[0].type = PORT_AMAZONASC;
-
-	if (options){
-		uart_parse_options(options, &baud, &parity, &bits, &flow);
-	}
-
-	return uart_set_options(port, co, baud, parity, bits, flow);
-}
-
-static struct uart_driver amazonasc_reg;
-static struct console amazonasc_console = {
-	name:		"ttyS",
-	write:		amazonasc_console_write,
-	device:		uart_console_device,
-	setup:		amazonasc_console_setup,
-	flags:		CON_PRINTBUFFER,
-	index:		-1,
-	data:		&amazonasc_reg,
-};
-
-static struct uart_driver amazonasc_reg = {
-	.owner =			THIS_MODULE,
-	.driver_name = 		"serial",
-	.dev_name =			"ttyS",
-	.major =			TTY_MAJOR,
-	.minor =			64,
-	.nr =				UART_NR,
-	.cons =				&amazonasc_console,
-};
-
-static int __init amazon_asc_probe(struct platform_device *dev)
-{
-	unsigned char res;
-	uart_register_driver(&amazonasc_reg);
-	res = uart_add_one_port(&amazonasc_reg, &amazonasc_ports[0]);
-	return res;
-}
-
-static int amazon_asc_remove(struct platform_device *dev)
-{
-	uart_unregister_driver(&amazonasc_reg);
-	return 0;
-}
-
-static struct platform_driver amazon_asc_driver = {
-	.probe = amazon_asc_probe,
-	.remove = amazon_asc_remove,
-	.driver = {
-		.name = "amazon_asc",
-		.owner = THIS_MODULE,
-	},
-};
-
-static int __init amazon_asc_init(void)
-{
-	int ret = platform_driver_register(&amazon_asc_driver);
-	if (ret)
-		printk(KERN_WARNING "amazon_asc: error registering platfom driver!\n");
-	return ret;
-}
-
-static void __exit amazon_asc_cleanup(void)
-{
-	platform_driver_unregister(&amazon_asc_driver);
-}
-
-module_init(amazon_asc_init);
-module_exit(amazon_asc_cleanup);
-
-MODULE_AUTHOR("Gary Jennejohn, Felix Fietkau, John Crispin");
-MODULE_DESCRIPTION("MIPS AMAZONASC serial port driver");
-MODULE_LICENSE("GPL");
-
diff --git a/target/linux/amazon/files/drivers/watchdog/amazon_wdt.c b/target/linux/amazon/files/drivers/watchdog/amazon_wdt.c
deleted file mode 100644
index fcf1649d8..000000000
--- a/target/linux/amazon/files/drivers/watchdog/amazon_wdt.c
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
- * Copyright 2004 Wu Qi Ming <gokimi@msn.com>
- * Copyright (C) 2007 John Crispin <blogic@openwrt.org>
- */
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/string.h>
-#include <linux/timer.h>
-#include <linux/fs.h>
-#include <linux/errno.h>
-#include <linux/proc_fs.h>
-#include <linux/stat.h>
-#include <linux/tty.h>
-#include <linux/selection.h>
-#include <linux/kmod.h>
-#include <linux/vmalloc.h>
-#include <linux/kdev_t.h>
-#include <linux/ioctl.h>
-#include <asm/uaccess.h>
-#include <asm/system.h>
-#include <linux/platform_device.h>
-#include <asm/amazon/amazon.h>
-#include <asm/amazon/amazon_wdt.h>
-
-#define DRV_NAME "AMAZON WDT:"
-
-#undef AMAZON_WDT_DEBUG 
-
-static int amazon_wdt_isopen = 0;
-
-#ifdef AMAZON_WDT_DEBUG
-static struct proc_dir_entry* amazon_wdt_dir;
-#endif
-
-int wdt_enable(int timeout)
-{
-  	u32 hard_psw, ffpi;
-  	int reload_value, divider = 1;
-  
-	ffpi = amazon_get_fpi_hz();
-
-	reload_value = 65536 - timeout * ffpi / 256;
-  	
-	if (reload_value < 0) {
-		divider = 0;
-		reload_value = 65536 - timeout * ffpi / 16384;
-  	}
-
-	if (reload_value < 0){
-		printk(KERN_INFO DRV_NAME "timeout too large %d\n", timeout);
-		return -EINVAL;
-	}
-	
-	printk(KERN_INFO DRV_NAME "timeout:%d reload_value: %8x\n", timeout, reload_value);
-  	
-	hard_psw = (amazon_readl(AMAZON_WDT_CON0) & 0xffffff01) +
-				(amazon_readl(AMAZON_WDT_CON1) & 0xc) + 0xf0;  
-  	amazon_writel(hard_psw, AMAZON_WDT_CON0);
-  	wmb();
-	
-	amazon_writel((hard_psw & 0xff00) + (reload_value << 16) + 0xf2, AMAZON_WDT_CON0);
-  	wmb();
-
-  	amazon_writel(divider << 2, AMAZON_WDT_CON1);  
-	wmb();
-	
-  	hard_psw = (amazon_readl(AMAZON_WDT_CON0) & 0xffffff01) +
-				(amazon_readl(AMAZON_WDT_CON1) & 0xc) + 0xf0;
-  	amazon_writel(hard_psw, AMAZON_WDT_CON0);
-	wmb();
-  	
-	amazon_writel_masked(AMAZON_WDT_CON0, 0xff, 0xf3);
-	wmb();
-	return 0;
-}
-
-void wdt_disable(void)
-{
-	u32 hard_psw = 0;
-
-	hard_psw = (amazon_readl(AMAZON_WDT_CON0) & 0xffffff01) + 
-			(amazon_readl(AMAZON_WDT_CON1) & 0xc) + 0xf0;  
-	amazon_writel(hard_psw, AMAZON_WDT_CON0);
-	wmb();
-
-	amazon_writel_masked(AMAZON_WDT_CON0, 0xff, 0xf2);
-	wmb();
-
-	amazon_writel_masked(AMAZON_WDT_CON1, 0x8, 0x8);  
-	wmb();
-
-	hard_psw=(amazon_readl(AMAZON_WDT_CON0) & 0xffffff01) +
-			(amazon_readl(AMAZON_WDT_CON1) & 0xc) + 0xf0;  
-	amazon_writel(hard_psw, AMAZON_WDT_CON0);
-	wmb();
-
-	amazon_writel_masked(AMAZON_WDT_CON0, 0xff, 0xf3);
-	wmb();
-
-   	return;
-}
-
-static int wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
-{
-	int result=0;
-	static int timeout=-1;
-
-	switch(cmd){
-		case AMAZON_WDT_IOC_START:
-			printk(KERN_INFO DRV_NAME "enable watch dog timer!\n");
-			if (copy_from_user((void*)&timeout, (void*)arg, sizeof (int))) {
-				printk(KERN_INFO DRV_NAME "invalid argument\n");
-				result=-EINVAL;
-			} else if ((result = wdt_enable(timeout)) < 0) {
-				timeout = -1;
-			}
-			break;
-		
-		case AMAZON_WDT_IOC_STOP:
-			printk(KERN_INFO DRV_NAME "disable watch dog timer\n");
-			timeout = -1;
-			wdt_disable();
-			break;
-		
-		case AMAZON_WDT_IOC_PING:
-			if (timeout < 0) {
-				result = -EIO;
-			} else {
-				result = wdt_enable(timeout); 
-			}		
-			break;
-		
-		default:
-			result=-EINVAL;
-			break;
-	}
-	return result;
-}
-
-static ssize_t wdt_read(struct file *file, char *buf, size_t count, loff_t *offset)
-{
-	return 0;
-}
-
-static ssize_t wdt_write(struct file *file, const char *buf, size_t count, loff_t *offset)
-{	
-	return count;
-}
-
-static int wdt_open(struct inode *inode, struct file *file)
-{
-	if (amazon_wdt_isopen == 1)
-		return -EBUSY;
-
-	amazon_wdt_isopen = 1;
-	printk(KERN_INFO DRV_NAME "opened\n");	
-	return 0;
-}
-
-static int wdt_release(struct inode *inode, struct file *file)
-{
-	amazon_wdt_isopen = 0;
-	printk(KERN_INFO DRV_NAME "closed\n");	
-	return 0;
-}
-
-#ifdef AMAZON_WDT_DEBUG
-int wdt_register_proc_read(char *buf, char **start, off_t offset,
-                         int count, int *eof, void *data)
-{
-   	int len=0;
-   	len+=sprintf(buf+len,"NMISR:    0x%08x\n",AMAZON_WDT_REG32(AMAZON_WDT_NMISR));
-   	len+=sprintf(buf+len,"RST_REQ:  0x%08x\n",AMAZON_WDT_REG32(AMAZON_RST_REQ));
-   	len+=sprintf(buf+len,"RST_SR:   0x%08x\n",AMAZON_WDT_REG32(AMAZON_RST_SR));
-   	len+=sprintf(buf+len,"WDT_CON0: 0x%08x\n",AMAZON_WDT_REG32(AMAZON_WDT_CON0));
-   	len+=sprintf(buf+len,"WDT_CON1: 0x%08x\n",AMAZON_WDT_REG32(AMAZON_WDT_CON1));
-   	len+=sprintf(buf+len,"WDT_SR:   0x%08x\n",AMAZON_WDT_REG32(AMAZON_WDT_SR));
-   	*eof = 1;
-   	return len;
-}
-#endif
-
-static struct file_operations wdt_fops = {
-	read:		wdt_read,
-	write:		wdt_write,
-	ioctl:		wdt_ioctl,
-	open:		wdt_open,
-	release:	wdt_release,	
-};
-
-static int __init amazon_wdt_probe(struct platform_device *dev)
-{
-	int result = result = register_chrdev(0, "watchdog", &wdt_fops);
-   	
-	if (result < 0) {
-        printk(KERN_INFO DRV_NAME "cannot register device\n");
-       	return result;
-   	}
-
-#ifdef AMAZON_WDT_DEBUG
-	amazon_wdt_dir=proc_mkdir("amazon_wdt",NULL);
-   	create_proc_read_entry("wdt_register", 0, amazon_wdt_dir,
-                          	wdt_register_proc_read, NULL);  
-#endif
-
-	amazon_wdt_isopen=0;
-	printk(KERN_INFO DRV_NAME "driver loaded but inactive\n");
-	return 0;
-}
-
-static int amazon_wdt_remove(struct platform_device *dev)
-{
-	unregister_chrdev(0, "watchdog");
-#ifdef AMAZON_WDT_DEBUG
-	remove_proc_entry("wdt_register", amazon_wdt_dir);
-	remove_proc_entry("amazon_wdt", NULL);
-#endif
-	printk(KERN_INFO DRV_NAME "unregistered\n");
-	return 0;
-}
-
-static struct platform_driver amazon_wdt_driver = {
-	.probe = amazon_wdt_probe,
-	.remove = amazon_wdt_remove,
-	.driver = {
-		.name = "amazon_wdt",
-		.owner = THIS_MODULE,
-	},
-};
-
-static int __init amazon_wdt_init(void)
-{
-	int ret = platform_driver_register(&amazon_wdt_driver);
-	if (ret)
-		printk(KERN_WARNING "amazon_wdt: error registering platfom driver!\n");
-	return ret;
-}
-
-static void __exit amazon_wdt_exit(void)
-{
-	platform_driver_unregister(&amazon_wdt_driver);
-}
-
-module_init(amazon_wdt_init);
-module_exit(amazon_wdt_exit);
-
-MODULE_LICENSE ("GPL");
-MODULE_AUTHOR("Infineon / John Crispin <blogic@openwrt.org>");
-MODULE_DESCRIPTION("AMAZON WDT driver");
-
diff --git a/target/linux/amazon/files/include/asm-mips/amazon/adm6996.h b/target/linux/amazon/files/include/asm-mips/amazon/adm6996.h
deleted file mode 100644
index 77cf4b131..000000000
--- a/target/linux/amazon/files/include/asm-mips/amazon/adm6996.h
+++ /dev/null
@@ -1,232 +0,0 @@
-/******************************************************************************
-     Copyright (c) 2004, Infineon Technologies.  All rights reserved.
-
-                               No Warranty
-   Because the program is licensed free of charge, there is no warranty for
-   the program, to the extent permitted by applicable law.  Except when
-   otherwise stated in writing the copyright holders and/or other parties
-   provide the program "as is" without warranty of any kind, either
-   expressed or implied, including, but not limited to, the implied
-   warranties of merchantability and fitness for a particular purpose. The
-   entire risk as to the quality and performance of the program is with
-   you.  should the program prove defective, you assume the cost of all
-   necessary servicing, repair or correction.
-
-   In no event unless required by applicable law or agreed to in writing
-   will any copyright holder, or any other party who may modify and/or
-   redistribute the program as permitted above, be liable to you for
-   damages, including any general, special, incidental or consequential
-   damages arising out of the use or inability to use the program
-   (including but not limited to loss of data or data being rendered
-   inaccurate or losses sustained by you or third parties or a failure of
-   the program to operate with any other programs), even if such holder or
-   other party has been advised of the possibility of such damages.
- ******************************************************************************
-   Module      : ifx_swdrv.h
-   Date        : 2004-09-01
-   Description : JoeLin
-   Remarks:
-
- *****************************************************************************/
-
-#ifndef _ADM_6996_MODULE_H_
-#define _ADM_6996_MODULE_H_
-
-#include <asm/amazon/amazon.h>
-
-#define ifx_printf(x)       printk x
-
-/* command codes */
-#define ADM_SW_SMI_READ     0x02
-#define ADM_SW_SMI_WRITE    0x01
-#define ADM_SW_SMI_START    0x01
-
-#define ADM_SW_EEPROM_WRITE     0x01
-#define ADM_SW_EEPROM_WRITE_ENABLE  0x03
-#define ADM_SW_EEPROM_WRITE_DISABLE 0x00
-#define EEPROM_TYPE     8   /* for 93C66 */
-
-/* bit masks */
-#define ADM_SW_BIT_MASK_1   0x00000001
-#define ADM_SW_BIT_MASK_2   0x00000002
-#define ADM_SW_BIT_MASK_4   0x00000008
-#define ADM_SW_BIT_MASK_10  0x00000200
-#define ADM_SW_BIT_MASK_16  0x00008000
-#define ADM_SW_BIT_MASK_32  0x80000000
-
-/* delay timers */
-#define ADM_SW_MDC_DOWN_DELAY   5
-#define ADM_SW_MDC_UP_DELAY 5
-#define ADM_SW_CS_DELAY     5
-
-/* MDIO modes */
-#define ADM_SW_MDIO_OUTPUT  1
-#define ADM_SW_MDIO_INPUT   0
-
-#define ADM_SW_MAX_PORT_NUM 5
-#define ADM_SW_MAX_VLAN_NUM 15
-
-/* registers */
-#define ADM_SW_PORT0_CONF   0x1
-#define ADM_SW_PORT1_CONF   0x3
-#define ADM_SW_PORT2_CONF   0x5
-#define ADM_SW_PORT3_CONF   0x7
-#define ADM_SW_PORT4_CONF   0x8
-#define ADM_SW_PORT5_CONF   0x9
-#define ADM_SW_VLAN_MODE    0x11
-#define ADM_SW_MAC_LOCK     0x12
-#define ADM_SW_VLAN0_CONF   0x13
-#define ADM_SW_PORT0_PVID   0x28
-#define ADM_SW_PORT1_PVID   0x29
-#define ADM_SW_PORT2_PVID   0x2a
-#define ADM_SW_PORT34_PVID  0x2b
-#define ADM_SW_PORT5_PVID   0x2c
-#define ADM_SW_PHY_RESET    0x2f
-#define ADM_SW_MISC_CONF    0x30
-#define ADM_SW_BNDWDH_CTL0  0x31
-#define ADM_SW_BNDWDH_CTL1  0x32
-#define ADM_SW_BNDWDH_CTL_ENA   0x33
-
-/* port modes */
-#define ADM_SW_PORT_FLOWCTL 0x1 /* 802.3x flow control */
-#define ADM_SW_PORT_AN      0x2 /* auto negotiation */
-#define ADM_SW_PORT_100M    0x4 /* 100M */
-#define ADM_SW_PORT_FULL    0x8 /* full duplex */
-#define ADM_SW_PORT_TAG     0x10    /* output tag on */
-#define ADM_SW_PORT_DISABLE 0x20    /* disable port */
-#define ADM_SW_PORT_TOS     0x40    /* TOS first */
-#define ADM_SW_PORT_PPRI    0x80    /* port based priority first */
-#define ADM_SW_PORT_MDIX    0x8000  /* auto MDIX on */
-#define ADM_SW_PORT_PVID_SHIFT  10
-#define ADM_SW_PORT_PVID_BITS   4
-
-/* VLAN */
-#define ADM_SW_VLAN_PORT0   0x1
-#define ADM_SW_VLAN_PORT1   0x2
-#define ADM_SW_VLAN_PORT2   0x10
-#define ADM_SW_VLAN_PORT3   0x40
-#define ADM_SW_VLAN_PORT4   0x80
-#define ADM_SW_VLAN_PORT5   0x100
-
-
-/* GPIO 012 enabled, output mode */
-#define GPIO_ENABLEBITS 0x000700f8
-
-/*
-  define AMAZON GPIO port to ADM6996 EEPROM interface
-  MDIO ->   EEDI        GPIO 16, AMAZON GPIO P1.0, bi-direction
-  MDC ->    EESK        GPIO 17, AMAZON GPIO P1.1, output only
-  MDCS ->   EECS        GPIO 18, AMAZON GPIO P1.2, output only
-            EEDO        GPIO 15, AMAZON GPIO P0.15, do not need this one! */
-
-#define GPIO_MDIO   1		//P1.0
-#define GPIO_MDC    2		//P1.1
-#define GPIO_MDCS   4		//P1.2
-
-//joelin #define GPIO_MDIO   0
-//joelin #define GPIO_MDC    5   /* PORT 0 GPIO5 */
-//joelin #define GPIO_MDCS   6   /* PORT 0 GPIO6 */
-
-
-#define MDIO_INPUT  0x00000001
-#define MDIO_OUTPUT_EN  0x00010000
-
-
-/* type definitions */
-typedef unsigned char U8;
-typedef unsigned short U16;
-typedef unsigned int U32;
-
-typedef struct _REGRW_
-{
-  unsigned int addr;
-  unsigned int value;
-  unsigned int mode;
-}REGRW, *PREGRW;
-
-//joelin adm6996i
-typedef struct _MACENTRY_
-{
-	unsigned char mac_addr[6];
-	unsigned long fid:4;
-            unsigned long portmap:6;
-	union  {
-		unsigned long age_timer:9;
-		unsigned long info_ctrl:9;
-	} ctrl;
-	unsigned long occupy:1;
-	unsigned long info_type:1;
-	unsigned long bad:1;
-	unsigned long result:3;//000:command ok ,001:all entry used,010:Entry Not found  ,011:try next entry ,101:command error
-	
- }MACENTRY, *PMACENTRY;
-typedef struct _PROTOCOLFILTER_
-{
-	int protocol_filter_num;//[0~7]
-	int ip_p; //Value Compared with Protocol in IP Heade[7:0]
-	char action:2;//Action for protocol Filter .
-//00 = Protocol Portmap is Default Output Ports.
-//01 = Protocol Portmap is 6'b0.
-//10 = Protocol Portmap is the CPU port if the incoming port 
-//is not the CPU port. But if the incoming port is the CPU port, then Type Portmap contains Default Output Ports, excluding the CPU port.
- }PROTOCOLFILTER, *PPROTOCOLFILTER;
-
-//joelin adm6996i
-
-/* Santosh: for IGMP proxy/snooping */
-
-//050614:fchang int adm_process_mac_table_request (unsigned int cmd, struct _MACENTRY_ *mac);
-//050614:fchang int adm_process_protocol_filter_request (unsigned int cmd, struct _PROTOCOLFILTER_ *filter);
-
-
-/* IOCTL keys */
-#define KEY_IOCTL_ADM_REGRW     	0x01
-#define KEY_IOCTL_ADM_SW_REGRW      	0x02
-#define KEY_IOCTL_ADM_SW_PORTSTS    	0x03
-#define KEY_IOCTL_ADM_SW_INIT       	0x04
-//for adm6996i-start
-#define	KEY_IOCTL_ADM_SW_IOCTL_MACENTRY_ADD		0x05
-#define	KEY_IOCTL_ADM_SW_IOCTL_MACENTRY_DEL		0x06
-#define	KEY_IOCTL_ADM_SW_IOCTL_MACENTRY_GET_INIT	0x07
-#define	KEY_IOCTL_ADM_SW_IOCTL_MACENTRY_GET_MORE	0x08
-#define	KEY_IOCTL_ADM_SW_IOCTL_FILTER_ADD		0x09
-#define	KEY_IOCTL_ADM_SW_IOCTL_FILTER_DEL		0x0a
-#define	KEY_IOCTL_ADM_SW_IOCTL_FILTER_GET		0x0b
- 
-//adm6996i #define KEY_IOCTL_MAX_KEY       0x05
-#define KEY_IOCTL_MAX_KEY       0x0c
-//for adm6996i-end
-/* IOCTL MAGIC */
-#define ADM_MAGIC  ('a'|'d'|'m'|'t'|'e'|'k')
-
-/* IOCTL parameters */
-#define ADM_IOCTL_REGRW         _IOWR(ADM_MAGIC, KEY_IOCTL_ADM_REGRW, REGRW)
-#define ADM_SW_IOCTL_REGRW      _IOWR(ADM_MAGIC, KEY_IOCTL_ADM_SW_REGRW, REGRW)
-#define ADM_SW_IOCTL_PORTSTS    _IOWR(ADM_MAGIC, KEY_IOCTL_ADM_SW_PORTSTS, NULL)
-#define ADM_SW_IOCTL_INIT       _IOWR(ADM_MAGIC, KEY_IOCTL_ADM_SW_INIT, NULL)
-
-
-//6996i-stat
-#define ADM_SW_IOCTL_MACENTRY_ADD	    _IOWR(ADM_MAGIC, KEY_IOCTL_ADM_SW_IOCTL_MACENTRY_ADD,MACENTRY)
-#define ADM_SW_IOCTL_MACENTRY_DEL	    _IOWR(ADM_MAGIC, KEY_IOCTL_ADM_SW_IOCTL_MACENTRY_DEL,MACENTRY)
-#define ADM_SW_IOCTL_MACENTRY_GET_INIT      _IOWR(ADM_MAGIC, KEY_IOCTL_ADM_SW_IOCTL_MACENTRY_GET_INIT,MACENTRY)
-#define ADM_SW_IOCTL_MACENTRY_GET_MORE      _IOWR(ADM_MAGIC, KEY_IOCTL_ADM_SW_IOCTL_MACENTRY_GET_MORE,MACENTRY)
-#define ADM_SW_IOCTL_FILTER_ADD	    	    _IOWR(ADM_MAGIC, KEY_IOCTL_ADM_SW_IOCTL_FILTER_ADD,PROTOCOLFILTER)	
-#define ADM_SW_IOCTL_FILTER_DEL	            _IOWR(ADM_MAGIC, KEY_IOCTL_ADM_SW_IOCTL_FILTER_DEL,PROTOCOLFILTER)
-#define ADM_SW_IOCTL_FILTER_GET	            _IOWR(ADM_MAGIC, KEY_IOCTL_ADM_SW_IOCTL_FILTER_GET,PROTOCOLFILTER)	
- 
-//6996i-end
-
-
-#define REG_READ    0x0
-#define REG_WRITE   0x1
-
-/* undefine symbol */
-#define AMAZON_SW_REG(reg)  *((volatile U32*)(reg))
-//#define GPIO0_INPUT_MASK    0
-//#define GPIO_conf0_REG      0x12345678
-//#define GPIO_SET_HI
-//#define GPIO_SET_LOW
-
-#endif
-/* _ADM_6996_MODULE_H_ */
diff --git a/target/linux/amazon/files/include/asm-mips/amazon/amazon.h b/target/linux/amazon/files/include/asm-mips/amazon/amazon.h
deleted file mode 100644
index 28af7f59d..000000000
--- a/target/linux/amazon/files/include/asm-mips/amazon/amazon.h
+++ /dev/null
@@ -1,1447 +0,0 @@
-#ifndef AMAZON_H
-#define AMAZON_H
-/******************************************************************************
-       Copyright (c) 2002, Infineon Technologies.  All rights reserved.
-
-                               No Warranty
-   Because the program is licensed free of charge, there is no warranty for 
-   the program, to the extent permitted by applicable law.  Except when     
-   otherwise stated in writing the copyright holders and/or other parties   
-   provide the program "as is" without warranty of any kind, either         
-   expressed or implied, including, but not limited to, the implied         
-   warranties of merchantability and fitness for a particular purpose. The  
-   entire risk as to the quality and performance of the program is with     
-   you.  should the program prove defective, you assume the cost of all     
-   necessary servicing, repair or correction.                               
-                                                                            
-   In no event unless required by applicable law or agreed to in writing    
-   will any copyright holder, or any other party who may modify and/or      
-   redistribute the program as permitted above, be liable to you for        
-   damages, including any general, special, incidental or consequential     
-   damages arising out of the use or inability to use the program           
-   (including but not limited to loss of data or data being rendered        
-   inaccurate or losses sustained by you or third parties or a failure of   
-   the program to operate with any other programs), even if such holder or  
-   other party has been advised of the possibility of such damages. 
-******************************************************************************/
-
-#define amazon_readl(a)					__raw_readl(((u32*)(a)))
-#define amazon_writel(a,b)				__raw_writel(a, ((u32*)(b)))
-#define amazon_writel_masked(a,b,c)		__raw_writel((__raw_readl(((u32*)(a))) & ~b) | (c & b), ((u32*)(a)))
-
-unsigned int amazon_get_fpi_hz(void);
-
-#define IOPORT_RESOURCE_START		0x10000000
-#define IOPORT_RESOURCE_END		0xffffffff
-#define IOMEM_RESOURCE_START		0x10000000
-#define IOMEM_RESOURCE_END		0xffffffff
-
-/* check ADSL link status */
-#define AMAZON_CHECK_LINK
-         
-/***********************************************************************/
-/*  Module      :  WDT register address and bits                       */
-/***********************************************************************/
-         
-#define AMAZON_WDT                          (KSEG1+0x10100900)
-/***********************************************************************/   
-    
-/***Reset Request Register***/ 
-#define AMAZON_RST_REQ                      ((volatile u32*)(AMAZON_WDT+ 0x0010))
-#define AMAZON_RST_REQ_PLL                            	(1 << 31)
-#define AMAZON_RST_REQ_PCI_CORE                       	(1 << 13) 
-#define AMAZON_RST_REQ_TPE                            	(1 << 12)
-#define AMAZON_RST_REQ_AFE                            	(1 << 11)
-#define AMAZON_RST_REQ_DMA                            	(1 << 9)
-#define AMAZON_RST_REQ_SWITCH                         	(1 << 8)
-#define AMAZON_RST_REQ_DFE                         	(1 << 7)
-#define AMAZON_RST_REQ_PHY                            	(1 << 5)
-#define AMAZON_RST_REQ_PCI                            	(1 << 4)
-#define AMAZON_RST_REQ_FPI                            	(1 << 2)
-#define AMAZON_RST_REQ_CPU                         	(1 << 1)
-#define AMAZON_RST_REQ_HRST                           	(1 << 0)
-#define AMAZON_RST_ALL				(AMAZON_RST_REQ_PLL	\
-						|AMAZON_RST_REQ_PCI_CORE \
-						|AMAZON_RST_REQ_TPE	\
-						|AMAZON_RST_REQ_AFE	\
-						|AMAZON_RST_REQ_DMA	\
-						|AMAZON_RST_REQ_SWITCH	\
-						|AMAZON_RST_REQ_DFE	\
-						|AMAZON_RST_REQ_PHY	\
-						|AMAZON_RST_REQ_PCI	\
-						|AMAZON_RST_REQ_FPI	\
-						|AMAZON_RST_REQ_CPU	\
-						|AMAZON_RST_REQ_HRST)
-      
-/***Reset Status Register Power On***/ 
-#define AMAZON_RST_SR                       ((volatile u32*)(AMAZON_WDT+ 0x0014))
-
-/***Watchdog Timer Control Register 0***/ 
-#define AMAZON_WDT_CON0                    ((volatile u32*)(AMAZON_WDT+ 0x0020))
-      
-/***Watchdog Timer Control Register 1***/ 
-#define AMAZON_WDT_CON1                    ((volatile u32*)(AMAZON_WDT+ 0x0024))
-#define AMAZON_WDT_CON1_WDTDR                          (1 << 3)
-#define AMAZON_WDT_CON1_WDTIR                          (1 << 2)
-      
-/***Watchdog Timer Status Register***/ 
-#define AMAZON_WDT_SR                       ((volatile u32*)(AMAZON_WDT+ 0x0028))
-#define AMAZON_WDT_SR_WDTTIM(value)             (((( 1 << 16) - 1) & (value)) << 16)
-#define AMAZON_WDT_SR_WDTPR                          (1 << 5)
-#define AMAZON_WDT_SR_WDTTO                          (1 << 4)
-#define AMAZON_WDT_SR_WDTDS                          (1 << 3)
-#define AMAZON_WDT_SR_WDTIS                          (1 << 2)
-#define AMAZON_WDT_SR_WDTOE                          (1 << 1)
-#define AMAZON_WDT_SR_WDTAE                          (1 << 0)		
-
-/***NMI Status Register***/ 
-#define AMAZON_WDT_NMISR                        	((volatile u32*)(AMAZON_WDT+ 0x002C))
-#define AMAZON_WDT_NMISR_NMIWDT                        (1 << 2)
-#define AMAZON_WDT_NMISR_NMIPLL                        (1 << 1)
-#define AMAZON_WDT_NMISR_NMIEXT                        (1 << 0)
-      
-#define AMAZON_WDT_RST_MON				((volatile u32*)(AMAZON_WDT+ 0x0030))
-
-/***********************************************************************/
-/*  Module      :  MCD register address and bits                       */
-/***********************************************************************/
-#define AMAZON_MCD                          		(KSEG1+0x1F106000)
-
-/***Manufacturer Identification Register***/ 
-#define AMAZON_MCD_MANID                        	((volatile u32*)(AMAZON_MCD+ 0x0024))
-#define AMAZON_MCD_MANID_MANUF(value)              	(((( 1 << 11) - 1) & (value)) << 5)
-
-/***Chip Identification Register***/ 
-#define AMAZON_MCD_CHIPID                       	((volatile u32*)(AMAZON_MCD+ 0x0028))
-#define AMAZON_MCD_CHIPID_VERSION_GET(value)             (((value) >> 28) & ((1 << 4) - 1))
-#define AMAZON_MCD_CHIPID_VERSION_SET(value)             (((( 1 << 4) - 1) & (value)) << 28)
-#define AMAZON_MCD_CHIPID_PART_NUMBER_GET(value)         (((value) >> 12) & ((1 << 16) - 1))
-#define AMAZON_MCD_CHIPID_PART_NUMBER_SET(value)         (((( 1 << 16) - 1) & (value)) << 12)
-#define AMAZON_MCD_CHIPID_MANID_GET(value)               (((value) >> 1) & ((1 << 11) - 1))
-#define AMAZON_MCD_CHIPID_MANID_SET(value)               (((( 1 << 11) - 1) & (value)) << 1)
-
-#define AMAZON_CHIPID_STANDARD				0x00EB
-#define AMAZON_CHIPID_YANGTSE				0x00ED
-
-/***Redesign Tracing Identification Register***/ 
-#define AMAZON_MCD_RTID                         	((volatile u32*)(AMAZON_MCD+ 0x002C))
-#define AMAZON_MCD_RTID_LC                              (1 << 15)
-#define AMAZON_MCD_RTID_RIX(value)                	(((( 1 << 3) - 1) & (value)) << 0)
-
-	          
-/***********************************************************************/
-/*  Module      :  CGU register address and bits                       */
-/***********************************************************************/
-         
-#define AMAZON_CGU                          (KSEG1+0x1F103000)
-/***********************************************************************/   
-
-/***CGU Clock Divider Select Register***/
-#define AMAZON_CGU_DIV							(AMAZON_CGU + 0x0000)			
-/***CGU PLL0 Status Register***/ 
-#define AMAZON_CGU_PLL0SR						(AMAZON_CGU + 0x0004)
-/***CGU PLL1 Status Register***/ 
-#define AMAZON_CGU_PLL1SR						(AMAZON_CGU + 0x0008)
-/***CGU Interface Clock Control Register***/ 
-#define AMAZON_CGU_IFCCR						(AMAZON_CGU + 0x000c)
-/***CGU Oscillator Control Register***/ 
-#define AMAZON_CGU_OSCCR						(AMAZON_CGU + 0x0010)
-/***CGU Memory Clock Delay Register***/ 
-#define AMAZON_CGU_MCDEL						(AMAZON_CGU + 0x0014)
-/***CGU CPU Clock Reduction Register***/ 
-#define AMAZON_CGU_CPUCRD						(AMAZON_CGU + 0x0018)
-/***CGU Test Register**/
-#define AMAZON_CGU_TST							(AMAZON_CGU + 0x003c)
-
-/***********************************************************************/
-/*  Module      :  PMU register address and bits                       */
-/***********************************************************************/
-         
-#define AMAZON_PMU								AMAZON_CGU
-/***********************************************************************/   
-
-      
-/***PMU Power Down Control Register***/ 
-#define AMAZON_PMU_PWDCR                       ((volatile u32*)(AMAZON_PMU+ 0x001c))
-#define AMAZON_PMU_PWDCR_TPE                            (1 << 13)
-#define AMAZON_PMU_PWDCR_PLL                            (1 << 12)
-#define AMAZON_PMU_PWDCR_XTAL                           (1 << 11)
-#define AMAZON_PMU_PWDCR_EBU                            (1 << 10)
-#define AMAZON_PMU_PWDCR_DFE                            (1 << 9)
-#define AMAZON_PMU_PWDCR_SPI                            (1 << 8)
-#define AMAZON_PMU_PWDCR_UART                           (1 << 7)
-#define AMAZON_PMU_PWDCR_GPT                            (1 << 6)
-#define AMAZON_PMU_PWDCR_DMA                            (1 << 5)
-#define AMAZON_PMU_PWDCR_PCI                            (1 << 4)
-#define AMAZON_PMU_PWDCR_SW                             (1 << 3)
-#define AMAZON_PMU_PWDCR_IOR                      	(1 << 2)
-#define AMAZON_PMU_PWDCR_FPI                         	(1 << 1)
-#define AMAZON_PMU_PWDCR_EPHY                 		(1 << 0)
-      
-/***PMU Status Register***/ 
-#define AMAZON_PMU_SR	                      ((volatile u32*)(AMAZON_PMU+ 0x0020))
-#define AMAZON_PMU_SR_TPE                            	(1 << 13)
-#define AMAZON_PMU_SR_PLL                            	(1 << 12)
-#define AMAZON_PMU_SR_XTAL                           	(1 << 11)
-#define AMAZON_PMU_SR_EBU                            	(1 << 10)
-#define AMAZON_PMU_SR_DFE                            	(1 << 9)
-#define AMAZON_PMU_SR_SPI                            	(1 << 8)
-#define AMAZON_PMU_SR_UART                           	(1 << 7)
-#define AMAZON_PMU_SR_GPT                            	(1 << 6)
-#define AMAZON_PMU_SR_DMA                            	(1 << 5)
-#define AMAZON_PMU_SR_PCI                            	(1 << 4)
-#define AMAZON_PMU_SR_SW                             	(1 << 3)
-#define AMAZON_PMU_SR_IOR                      		(1 << 2)
-#define AMAZON_PMU_SR_FPI                         	(1 << 1)
-#define AMAZON_PMU_SR_EPHY                 		(1 << 0)
-         
-/***********************************************************************/
-/*  Module      :  BCU register address and bits                       */
-/***********************************************************************/
-         
-#define AMAZON_BCU                          (KSEG1+0x10100000)
-/***********************************************************************/   
-
-      
-/***BCU Control Register (0010H)***/ 
-#define AMAZON_BCU_CON                      ((volatile u32*)(AMAZON_BCU+ 0x0010))
-#define AMAZON_BCU_CON_SPC(value)                (((( 1 << 8) - 1) & (value)) << 24)
-#define AMAZON_BCU_CON_SPE                              (1 << 19)
-#define AMAZON_BCU_CON_PSE                              (1 << 18)
-#define AMAZON_BCU_CON_DBG                              (1 << 16)
-#define AMAZON_BCU_CON_TOUT(value)               (((( 1 << 16) - 1) & (value)) << 0)
-      
-/***BCU Error Control Capture Register (0020H)***/ 
-#define AMAZON_BCU_ECON                    ((volatile u32*)(AMAZON_BCU+ 0x0020))
-#define AMAZON_BCU_ECON_TAG(value)                (((( 1 << 4) - 1) & (value)) << 24)
-#define AMAZON_BCU_ECON_RDN                              (1 << 23)
-#define AMAZON_BCU_ECON_WRN                              (1 << 22)
-#define AMAZON_BCU_ECON_SVM                              (1 << 21)
-#define AMAZON_BCU_ECON_ACK(value)                (((( 1 << 2) - 1) & (value)) << 19)
-#define AMAZON_BCU_ECON_ABT                              (1 << 18)
-#define AMAZON_BCU_ECON_RDY                              (1 << 17)
-#define AMAZON_BCU_ECON_TOUT                            (1 << 16)
-#define AMAZON_BCU_ECON_ERRCNT(value)             (((( 1 << 16) - 1) & (value)) << 0)
-#define AMAZON_BCU_ECON_OPC(value)                (((( 1 << 4) - 1) & (value)) << 28)
-      
-/***BCU Error Address Capture Register (0024 H)***/ 
-#define AMAZON_BCU_EADD                    ((volatile u32*)(AMAZON_BCU+ 0x0024))
-#define AMAZON_BCU_EADD_FPIADR
-      
-/***BCU Error Data Capture Register (0028H)***/ 
-#define AMAZON_BCU_EDAT                    ((volatile u32*)(AMAZON_BCU+ 0x0028))
-#define AMAZON_BCU_EDAT_FPIDAT		
-         
-/***********************************************************************/
-/*  Module      :  Switch register address and bits                    */
-/***********************************************************************/
-         
-#define AMAZON_SWITCH                       (KSEG1+0x10106000)
-/***********************************************************************/   
-#define AMAZON_SW_UN_DEST                 	AMAZON_SWITCH+0x00 /*Unknown destination register*/
-#define AMAZON_SW_VLAN_CTRL              	AMAZON_SWITCH+0x04 /*VLAN control register*/
-#define AMAZON_SW_PS_CTL                  	AMAZON_SWITCH+0x08 /*port status control register*/
-#define AMAZON_SW_COS_CTL                 	AMAZON_SWITCH+0x0c /*Cos control register*/
-#define	AMAZON_SW_VLAN_COS                	AMAZON_SWITCH+0x10 /*VLAN priority cos mapping register*/
-#define AMAZON_SW_DSCP_COS3               	AMAZON_SWITCH+0x14 /*DSCP cos mapping register3*/
-#define AMAZON_SW_DSCP_COS2               	AMAZON_SWITCH+0x18 /*DSCP cos mapping register2*/
-#define AMAZON_SW_DSCP_COS1               	AMAZON_SWITCH+0x1c /*DSCP cos mapping register1*/
-#define AMAZON_SW_DSCP_COS0               	AMAZON_SWITCH+0x20 /*DSCP cos mapping register*/
-#define AMAZON_SW_ARL_CTL                 	AMAZON_SWITCH+0x24 /*ARL control register*/
-#define AMAZON_SW_PKT_LEN                 	AMAZON_SWITCH+0x28 /*packet length register*/
-#define AMAZON_SW_CPU_ACTL                	AMAZON_SWITCH+0x2c /*CPU control register1*/
-#define AMAZON_SW_DATA1                   	AMAZON_SWITCH+0x30 /*CPU access control register1*/
-#define AMAZON_SW_DATA2                   	AMAZON_SWITCH+0x34 /*CPU access control register2*/
-#define AMAZON_SW_P2_PCTL                 	AMAZON_SWITCH+0x38 /*Port2 control register*/
-#define AMAZON_SW_P0_TX_CTL               	AMAZON_SWITCH+0x3c /*port0 TX control register*/
-#define AMAZON_SW_P1_TX_CTL               	AMAZON_SWITCH+0x40 /*port 1 TX control register*/
-#define AMAZON_SW_P0_WM                   	AMAZON_SWITCH+0x44 /*port 0 watermark control register*/
-#define AMAZON_SW_P1_WM                   	AMAZON_SWITCH+0x48 /*port 1 watermark control register*/
-#define AMAZON_SW_P2_WM                   	AMAZON_SWITCH+0x4c /*port 2 watermark control register*/
-#define AMAZON_SW_GBL_WM                  	AMAZON_SWITCH+0x50 /*Global watermark register*/
-#define AMAZON_SW_PM_CTL                  	AMAZON_SWITCH+0x54 /*PM control register*/
-#define AMAZON_SW_P2_CTL                  	AMAZON_SWITCH+0x58 /*PMAC control register*/
-#define AMAZON_SW_P2_TX_IPG               	AMAZON_SWITCH+0x5c /*port2 TX IPG control register*/
-#define AMAZON_SW_P2_RX_IPG               	AMAZON_SWITCH+0x60 /*prot2 RX IPG control register*/
-#define AMAZON_SW_MDIO_ACC                	AMAZON_SWITCH+0x64 /*MDIO access register*/
-#define AMAZON_SW_EPHY                    	AMAZON_SWITCH+0x68 /*Ethernet PHY register*/
-#define AMAZON_SW_MDIO_CFG                	AMAZON_SWITCH+0x6c /*MDIO configuration register*/
-#define AMAZON_SW_P0_RCV_DROP_CNT         	AMAZON_SWITCH+0x70 /*port0 receive drop counter */
-#define AMAZON_SW_P0_RCV_FRAME_ERR_CNT    	AMAZON_SWITCH+0x74 /*port0 receive frame error conter*/
-#define AMAZON_SW_P0_TX_COLL_CNT          	AMAZON_SWITCH+0x78 /*port0 transmit collision counter*/ 
-#define AMAZON_SW_P0_TX_DROP_CNT          	AMAZON_SWITCH+0x7c /*port1 transmit drop counter*/
-#define AMAZON_SW_P1_RCV_DROP_CNT         	AMAZON_SWITCH+0x80 /*port1 receive drop counter*/
-#define AMAZON_SW_P1_RCV_FRAME_ERR_CNT   	AMAZON_SWITCH+0x84 /*port1 receive error counter*/
-#define AMAZON_SW_P1_TX_COLL_CNT          	AMAZON_SWITCH+0x88 /*port1 transmit collision counter*/
-#define AMAZON_SW_P1_TX_DROP_CNT          	AMAZON_SWITCH+0x8c /*port1 transmit drop counter*/
-
-
-         
-/***********************************************************************/
-/*  Module      :  SSC register address and bits                      */
-/***********************************************************************/
-#define AMAZON_SSC_BASE_ADD_0      		(KSEG1+0x10100800)         
-
-/*165001:henryhsu:20050603:Source add by Bing Tao*/
-
-/*configuration/Status Registers in Bus Clock Domain*/
-#define AMAZON_SSC_CLC                          ((volatile u32*)(AMAZON_SSC_BASE_ADD_0+0x0000))
-#define AMAZON_SSC_ID                           ((volatile u32*)(AMAZON_SSC_BASE_ADD_0+0x0008))
-#define AMAZON_SSC_CON                          ((volatile u32*)(AMAZON_SSC_BASE_ADD_0+0x0010))
-#define AMAZON_SSC_STATE			((volatile u32*)(AMAZON_SSC_BASE_ADD_0+0x0014))
-#define AMAZON_SSC_WHBSTATE			((volatile u32*)(AMAZON_SSC_BASE_ADD_0+0x0018))
-#define AMAZON_SSC_TB				((volatile u32*)(AMAZON_SSC_BASE_ADD_0+0x0020))
-#define AMAZON_SSC_RB				((volatile u32*)(AMAZON_SSC_BASE_ADD_0+0x0024))
-#define AMAZON_SSC_FSTAT			((volatile u32*)(AMAZON_SSC_BASE_ADD_0+0x0038))	
-
-/*Configuration/Status Registers in Kernel Clock Domain*/
-#define AMAZON_SSC_PISEL			((volatile u32*)(AMAZON_SSC_BASE_ADD_0+0x0004))
-#define AMAZON_SSC_RXFCON			((volatile u32*)(AMAZON_SSC_BASE_ADD_0+0x0030))
-#define AMAZON_SSC_TXFCON			((volatile u32*)(AMAZON_SSC_BASE_ADD_0+0x0034))
-#define AMAZON_SSC_BR				((volatile u32*)(AMAZON_SSC_BASE_ADD_0+0x0040))
-#define AMAZON_SSC_BRSTAT			((volatile u32*)(AMAZON_SSC_BASE_ADD_0+0x0044))
-#define AMAZON_SSC_SFCON			((volatile u32*)(AMAZON_SSC_BASE_ADD_0+0x0060))
-#define AMAZON_SSC_SFSTAT			((volatile u32*)(AMAZON_SSC_BASE_ADD_0+0x0064))
-#define AMAZON_SSC_GPOCON			((volatile u32*)(AMAZON_SSC_BASE_ADD_0+0x0070))
-#define AMAZON_SSC_GPOSTAT			((volatile u32*)(AMAZON_SSC_BASE_ADD_0+0x0074))
-#define AMAZON_SSC_WHBGPOSTAT			((volatile u32*)(AMAZON_SSC_BASE_ADD_0+0x0078))
-#define AMAZON_SSC_RXREQ			((volatile u32*)(AMAZON_SSC_BASE_ADD_0+0x0080))
-#define AMAZON_SSC_RXCNT			((volatile u32*)(AMAZON_SSC_BASE_ADD_0+0x0084))
-
-/*DMA Registers in Bus Clock Domain*/
-#define AMAZON_SSC_DMA_CON			((volatile u32*)(AMAZON_SSC_BASE_ADD_0+0x00ec))
-
-/*interrupt Node Registers in Bus Clock Domain*/
-#define AMAZON_SSC_IRNEN			((volatile u32*)(AMAZON_SSC_BASE_ADD_0+0x00F4))
-#define AMAZON_SSC_IRNICR			((volatile u32*)(AMAZON_SSC_BASE_ADD_0+0x00FC))
-#define AMAZON_SSC_IRNCR			((volatile u32*)(AMAZON_SSC_BASE_ADD_0+0x00F8))
-
-/*165001*/
-
-/***********************************************************************/   
-
-      
-         
-/***********************************************************************/
-/*  Module      :  EBU register address and bits                       */
-/***********************************************************************/
-         
-#define AMAZON_EBU                          (KSEG1+0x10105300)
-/***********************************************************************/   
-
-      
-/***EBU Clock Control Register***/ 
-#define AMAZON_EBU_CLC                      ((volatile u32*)(AMAZON_EBU+ 0x0000))
-#define AMAZON_EBU_CLC_DISS                            (1 << 1)
-#define AMAZON_EBU_CLC_DISR                            (1 << 0)
-      
-/***EBU Global Control Register***/ 
-#define AMAZON_EBU_CON                      ((volatile u32*)(AMAZON_EBU+ 0x0010))
-#define AMAZON_EBU_CON_DTACS(value)              (((( 1 << 3) - 1) & (value)) << 20)
-#define AMAZON_EBU_CON_DTARW(value)              (((( 1 << 3) - 1) & (value)) << 16)
-#define AMAZON_EBU_CON_TOUTC(value)              (((( 1 << 8) - 1) & (value)) << 8)
-#define AMAZON_EBU_CON_ARBMODE(value)            (((( 1 << 2) - 1) & (value)) << 6)
-#define AMAZON_EBU_CON_ARBSYNC                      (1 << 5)
-#define AMAZON_EBU_CON_1                              (1 << 3)
-      
-/***EBU Address Select Register 0***/ 
-#define AMAZON_EBU_ADDSEL0                  ((volatile u32*)(AMAZON_EBU+ 0x0020))
-#define AMAZON_EBU_ADDSEL0_BASE(value)               (((( 1 << 20) - 1) & (value)) << 12)
-#define AMAZON_EBU_ADDSEL0_MASK(value)               (((( 1 << 4) - 1) & (value)) << 4)
-#define AMAZON_EBU_ADDSEL0_MIRRORE                      (1 << 1)
-#define AMAZON_EBU_ADDSEL0_REGEN                          (1 << 0)
-      
-/***EBU Address Select Register 1***/ 
-#define AMAZON_EBU_ADDSEL1                  ((volatile u32*)(AMAZON_EBU+ 0x0024))
-#define AMAZON_EBU_ADDSEL1_BASE(value)               (((( 1 << 20) - 1) & (value)) << 12)
-#define AMAZON_EBU_ADDSEL1_MASK(value)               (((( 1 << 4) - 1) & (value)) << 4)
-#define AMAZON_EBU_ADDSEL1_MIRRORE                      (1 << 1)
-#define AMAZON_EBU_ADDSEL1_REGEN                          (1 << 0)
-      
-/***EBU Address Select Register 2***/ 
-#define AMAZON_EBU_ADDSEL2                  ((volatile u32*)(AMAZON_EBU+ 0x0028))
-#define AMAZON_EBU_ADDSEL2_BASE(value)               (((( 1 << 20) - 1) & (value)) << 12)
-#define AMAZON_EBU_ADDSEL2_MASK(value)               (((( 1 << 4) - 1) & (value)) << 4)
-#define AMAZON_EBU_ADDSEL2_MIRRORE                      (1 << 1)
-#define AMAZON_EBU_ADDSEL2_REGEN                          (1 << 0)
-      
-/***EBU Bus Configuration Register 0***/ 
-#define AMAZON_EBU_BUSCON0                  ((volatile u32*)(AMAZON_EBU+ 0x0060))
-#define AMAZON_EBU_BUSCON0_WRDIS                          (1 << 31)
-#define AMAZON_EBU_BUSCON0_ALEC(value)               (((( 1 << 2) - 1) & (value)) << 29)
-#define AMAZON_EBU_BUSCON0_BCGEN(value)              (((( 1 << 2) - 1) & (value)) << 27)
-#define AMAZON_EBU_BUSCON0_AGEN(value)               (((( 1 << 2) - 1) & (value)) << 24)
-#define AMAZON_EBU_BUSCON0_CMULTR(value)             (((( 1 << 2) - 1) & (value)) << 22)
-#define AMAZON_EBU_BUSCON0_WAIT(value)               (((( 1 << 2) - 1) & (value)) << 20)
-#define AMAZON_EBU_BUSCON0_WAITINV                      (1 << 19)
-#define AMAZON_EBU_BUSCON0_SETUP                          (1 << 18)
-#define AMAZON_EBU_BUSCON0_PORTW(value)              (((( 1 << 2) - 1) & (value)) << 16)
-#define AMAZON_EBU_BUSCON0_WAITRDC(value)            (((( 1 << 7) - 1) & (value)) << 9)
-#define AMAZON_EBU_BUSCON0_WAITWRC(value)            (((( 1 << 3) - 1) & (value)) << 6)
-#define AMAZON_EBU_BUSCON0_HOLDC(value)              (((( 1 << 2) - 1) & (value)) << 4)
-#define AMAZON_EBU_BUSCON0_RECOVC(value)             (((( 1 << 2) - 1) & (value)) << 2)
-#define AMAZON_EBU_BUSCON0_CMULT(value)              (((( 1 << 2) - 1) & (value)) << 0)
-      
-/***EBU Bus Configuration Register 1***/ 
-#define AMAZON_EBU_BUSCON1                  ((volatile u32*)(AMAZON_EBU+ 0x0064))
-#define AMAZON_EBU_BUSCON1_WRDIS                          (1 << 31)
-#define AMAZON_EBU_BUSCON1_ALEC(value)               (((( 1 << 2) - 1) & (value)) << 29)
-#define AMAZON_EBU_BUSCON1_BCGEN(value)              (((( 1 << 2) - 1) & (value)) << 27)
-#define AMAZON_EBU_BUSCON1_AGEN(value)               (((( 1 << 2) - 1) & (value)) << 24)
-#define AMAZON_EBU_BUSCON1_CMULTR(value)             (((( 1 << 2) - 1) & (value)) << 22)
-#define AMAZON_EBU_BUSCON1_WAIT(value)               (((( 1 << 2) - 1) & (value)) << 20)
-#define AMAZON_EBU_BUSCON1_WAITINV                      (1 << 19)
-#define AMAZON_EBU_BUSCON1_SETUP                          (1 << 18)
-#define AMAZON_EBU_BUSCON1_PORTW(value)              (((( 1 << 2) - 1) & (value)) << 16)
-#define AMAZON_EBU_BUSCON1_WAITRDC(value)            (((( 1 << 7) - 1) & (value)) << 9)
-#define AMAZON_EBU_BUSCON1_WAITWRC(value)            (((( 1 << 3) - 1) & (value)) << 6)
-#define AMAZON_EBU_BUSCON1_HOLDC(value)              (((( 1 << 2) - 1) & (value)) << 4)
-#define AMAZON_EBU_BUSCON1_RECOVC(value)             (((( 1 << 2) - 1) & (value)) << 2)
-#define AMAZON_EBU_BUSCON1_CMULT(value)              (((( 1 << 2) - 1) & (value)) << 0)
-      
-/***EBU Bus Configuration Register 2***/ 
-#define AMAZON_EBU_BUSCON2                  ((volatile u32*)(AMAZON_EBU+ 0x0068))
-#define AMAZON_EBU_BUSCON2_WRDIS                          (1 << 31)
-#define AMAZON_EBU_BUSCON2_ALEC(value)               (((( 1 << 2) - 1) & (value)) << 29)
-#define AMAZON_EBU_BUSCON2_BCGEN(value)              (((( 1 << 2) - 1) & (value)) << 27)
-#define AMAZON_EBU_BUSCON2_AGEN(value)               (((( 1 << 2) - 1) & (value)) << 24)
-#define AMAZON_EBU_BUSCON2_CMULTR(value)             (((( 1 << 2) - 1) & (value)) << 22)
-#define AMAZON_EBU_BUSCON2_WAIT(value)               (((( 1 << 2) - 1) & (value)) << 20)
-#define AMAZON_EBU_BUSCON2_WAITINV                      (1 << 19)
-#define AMAZON_EBU_BUSCON2_SETUP                          (1 << 18)
-#define AMAZON_EBU_BUSCON2_PORTW(value)              (((( 1 << 2) - 1) & (value)) << 16)
-#define AMAZON_EBU_BUSCON2_WAITRDC(value)            (((( 1 << 7) - 1) & (value)) << 9)
-#define AMAZON_EBU_BUSCON2_WAITWRC(value)            (((( 1 << 3) - 1) & (value)) << 6)
-#define AMAZON_EBU_BUSCON2_HOLDC(value)              (((( 1 << 2) - 1) & (value)) << 4)
-#define AMAZON_EBU_BUSCON2_RECOVC(value)             (((( 1 << 2) - 1) & (value)) << 2)
-#define AMAZON_EBU_BUSCON2_CMULT(value)              (((( 1 << 2) - 1) & (value)) << 0)		
-         
-/***********************************************************************/
-/*  Module      :  SDRAM register address and bits                     */
-/***********************************************************************/
-         
-#define AMAZON_SDRAM                        (KSEG1+0x1F800000)
-/***********************************************************************/   
-
-      
-/***MC Access Error Cause Register***/ 
-#define AMAZON_SDRAM_MC_ERRCAUSE                  ((volatile u32*)(AMAZON_SDRAM+ 0x0010))
-#define AMAZON_SDRAM_MC_ERRCAUSE_ERR                              (1 << 31)
-#define AMAZON_SDRAM_MC_ERRCAUSE_PORT(value)               (((( 1 << 4) - 1) & (value)) << 16)
-#define AMAZON_SDRAM_MC_ERRCAUSE_CAUSE(value)              (((( 1 << 2) - 1) & (value)) << 0)
-#define AMAZON_SDRAM_MC_ERRCAUSE_Res(value)                (((( 1 << NaN) - 1) & (value)) << NaN)
-      
-/***MC Access Error Address Register***/ 
-#define AMAZON_SDRAM_MC_ERRADDR                   ((volatile u32*)(AMAZON_SDRAM+ 0x0020))
-#define AMAZON_SDRAM_MC_ERRADDR_ADDR
-      
-/***MC I/O General Purpose Register***/ 
-#define AMAZON_SDRAM_MC_IOGP                      ((volatile u32*)(AMAZON_SDRAM+ 0x0100))
-#define AMAZON_SDRAM_MC_IOGP_GPR6(value)               (((( 1 << 4) - 1) & (value)) << 28)
-#define AMAZON_SDRAM_MC_IOGP_GPR5(value)               (((( 1 << 4) - 1) & (value)) << 24)
-#define AMAZON_SDRAM_MC_IOGP_GPR4(value)               (((( 1 << 4) - 1) & (value)) << 20)
-#define AMAZON_SDRAM_MC_IOGP_GPR3(value)               (((( 1 << 4) - 1) & (value)) << 16)
-#define AMAZON_SDRAM_MC_IOGP_GPR2(value)               (((( 1 << 4) - 1) & (value)) << 12)
-#define AMAZON_SDRAM_MC_IOGP_CPS                              (1 << 11)
-#define AMAZON_SDRAM_MC_IOGP_CLKDELAY(value)          (((( 1 << 3) - 1) & (value)) << 8)
-#define AMAZON_SDRAM_MC_IOGP_CLKRAT(value)             (((( 1 << 4) - 1) & (value)) << 4)
-#define AMAZON_SDRAM_MC_IOGP_RDDEL(value)              (((( 1 << 4) - 1) & (value)) << 0)
-      
-/***MC Self Refresh Register***/ 
-#define AMAZON_SDRAM_MC_SELFRFSH                  ((volatile u32*)(AMAZON_SDRAM+ 0x01A0))
-#define AMAZON_SDRAM_MC_SELFRFSH_PWDS                            (1 << 1)
-#define AMAZON_SDRAM_MC_SELFRFSH_PWD                              (1 << 0)
-#define AMAZON_SDRAM_MC_SELFRFSH_Res(value)                (((( 1 << 30) - 1) & (value)) << 2)
-      
-/***MC Enable Register***/ 
-#define AMAZON_SDRAM_MC_CTRLENA                   ((volatile u32*)(AMAZON_SDRAM+ 0x0110))
-#define AMAZON_SDRAM_MC_CTRLENA_ENA                              (1 << 0)
-#define AMAZON_SDRAM_MC_CTRLENA_Res(value)                (((( 1 << 31) - 1) & (value)) << 1)
-      
-/***MC Mode Register Setup Code***/ 
-#define AMAZON_SDRAM_MC_MRSCODE                   ((volatile u32*)(AMAZON_SDRAM+ 0x0120))
-#define AMAZON_SDRAM_MC_MRSCODE_UMC(value)                (((( 1 << 5) - 1) & (value)) << 7)
-#define AMAZON_SDRAM_MC_MRSCODE_CL(value)                (((( 1 << 3) - 1) & (value)) << 4)
-#define AMAZON_SDRAM_MC_MRSCODE_WT                              (1 << 3)
-#define AMAZON_SDRAM_MC_MRSCODE_BL(value)                (((( 1 << 3) - 1) & (value)) << 0)
-      
-/***MC Configuration Data-word Width Register***/ 
-#define AMAZON_SDRAM_MC_CFGDW                    ((volatile u32*)(AMAZON_SDRAM+ 0x0130))
-#define AMAZON_SDRAM_MC_CFGDW_DW(value)                (((( 1 << 4) - 1) & (value)) << 0)
-#define AMAZON_SDRAM_MC_CFGDW_Res(value)                (((( 1 << 28) - 1) & (value)) << 4)
-      
-/***MC Configuration Physical Bank 0 Register***/ 
-#define AMAZON_SDRAM_MC_CFGPB0                    ((volatile u32*)(AMAZON_SDRAM+ 0x140))
-#define AMAZON_SDRAM_MC_CFGPB0_MCSEN0(value)             (((( 1 << 4) - 1) & (value)) << 12)
-#define AMAZON_SDRAM_MC_CFGPB0_BANKN0(value)             (((( 1 << 4) - 1) & (value)) << 8)
-#define AMAZON_SDRAM_MC_CFGPB0_ROWW0(value)              (((( 1 << 4) - 1) & (value)) << 4)
-#define AMAZON_SDRAM_MC_CFGPB0_COLW0(value)              (((( 1 << 4) - 1) & (value)) << 0)
-#define AMAZON_SDRAM_MC_CFGPB0_Res(value)                (((( 1 << 16) - 1) & (value)) << 16)
-      
-/***MC Latency Register***/ 
-#define AMAZON_SDRAM_MC_LATENCY                   ((volatile u32*)(AMAZON_SDRAM+ 0x0180))
-#define AMAZON_SDRAM_MC_LATENCY_TRP(value)                (((( 1 << 4) - 1) & (value)) << 16)
-#define AMAZON_SDRAM_MC_LATENCY_TRAS(value)               (((( 1 << 4) - 1) & (value)) << 12)
-#define AMAZON_SDRAM_MC_LATENCY_TRCD(value)               (((( 1 << 4) - 1) & (value)) << 8)
-#define AMAZON_SDRAM_MC_LATENCY_TDPL(value)               (((( 1 << 4) - 1) & (value)) << 4)
-#define AMAZON_SDRAM_MC_LATENCY_TDAL(value)               (((( 1 << 4) - 1) & (value)) << 0)
-#define AMAZON_SDRAM_MC_LATENCY_Res(value)                (((( 1 << 12) - 1) & (value)) << 20)
-      
-/***MC Refresh Cycle Time Register***/ 
-#define AMAZON_SDRAM_MC_TREFRESH                  ((volatile u32*)(AMAZON_SDRAM+ 0x0190))
-#define AMAZON_SDRAM_MC_TREFRESH_TREF(value)               (((( 1 << 13) - 1) & (value)) << 0)
-#define AMAZON_SDRAM_MC_TREFRESH_Res(value)                (((( 1 << 19) - 1) & (value)) << 13)		
-         
-/***********************************************************************/
-/*  Module      :  GPTU register address and bits                      */
-/***********************************************************************/
-         
-#define AMAZON_GPTU                         (KSEG1+0x10100A00)
-/***********************************************************************/   
-
-      
-/***GPT Clock Control Register***/ 
-#define AMAZON_GPTU_CLC                      ((volatile u32*)(AMAZON_GPTU+ 0x0000))
-#define AMAZON_GPTU_CLC_RMC(value)                (((( 1 << 8) - 1) & (value)) << 8)
-#define AMAZON_GPTU_CLC_DISS                            (1 << 1)
-#define AMAZON_GPTU_CLC_DISR                            (1 << 0)
-      
-/***GPT Timer 3 Control Register***/ 
-#define AMAZON_GPTU_T3CON                    ((volatile u32*)(AMAZON_GPTU+ 0x0014))
-#define AMAZON_GPTU_T3CON_T3RDIR                        (1 << 15)
-#define AMAZON_GPTU_T3CON_T3CHDIR                      (1 << 14)
-#define AMAZON_GPTU_T3CON_T3EDGE                        (1 << 13)
-#define AMAZON_GPTU_T3CON_BPS1(value)               (((( 1 << 2) - 1) & (value)) << 11)
-#define AMAZON_GPTU_T3CON_T3OTL                          (1 << 10)
-#define AMAZON_GPTU_T3CON_T3UD                            (1 << 7)
-#define AMAZON_GPTU_T3CON_T3R                              (1 << 6)
-#define AMAZON_GPTU_T3CON_T3M(value)                (((( 1 << 3) - 1) & (value)) << 3)
-#define AMAZON_GPTU_T3CON_T3I(value)                (((( 1 << 3) - 1) & (value)) << 0)
-      
-/***GPT Write Hardware Modified Timer 3 Control Register 
-If set and clear bit are written concurrently with 1, the associated bit is not changed.***/
-#define AMAZON_GPTU_WHBT3CON                 ((volatile u32*)(AMAZON_GPTU+ 0x004C))
-#define AMAZON_GPTU_WHBT3CON_SETT3CHDIR                (1 << 15)
-#define AMAZON_GPTU_WHBT3CON_CLRT3CHDIR                (1 << 14)
-#define AMAZON_GPTU_WHBT3CON_SETT3EDGE                  (1 << 13)
-#define AMAZON_GPTU_WHBT3CON_CLRT3EDGE                  (1 << 12)
-#define AMAZON_GPTU_WHBT3CON_SETT3OTL                  (1 << 11)
-#define AMAZON_GPTU_WHBT3CON_CLRT3OTL                  (1 << 10)
-      
-/***GPT Timer 2 Control Register***/ 
-#define AMAZON_GPTU_T2CON                    ((volatile u32*)(AMAZON_GPTU+ 0x0010))
-#define AMAZON_GPTU_T2CON_TxRDIR                        (1 << 15)
-#define AMAZON_GPTU_T2CON_TxCHDIR                      (1 << 14)
-#define AMAZON_GPTU_T2CON_TxEDGE                        (1 << 13)
-#define AMAZON_GPTU_T2CON_TxIRDIS                      (1 << 12)
-#define AMAZON_GPTU_T2CON_TxRC                            (1 << 9)
-#define AMAZON_GPTU_T2CON_TxUD                            (1 << 7)
-#define AMAZON_GPTU_T2CON_TxR                              (1 << 6)
-#define AMAZON_GPTU_T2CON_TxM(value)                (((( 1 << 3) - 1) & (value)) << 3)
-#define AMAZON_GPTU_T2CON_TxI(value)                (((( 1 << 3) - 1) & (value)) << 0)
-      
-/***GPT Timer 4 Control Register***/ 
-#define AMAZON_GPTU_T4CON                    ((volatile u32*)(AMAZON_GPTU+ 0x0018))
-#define AMAZON_GPTU_T4CON_TxRDIR                        (1 << 15)
-#define AMAZON_GPTU_T4CON_TxCHDIR                      (1 << 14)
-#define AMAZON_GPTU_T4CON_TxEDGE                        (1 << 13)
-#define AMAZON_GPTU_T4CON_TxIRDIS                      (1 << 12)
-#define AMAZON_GPTU_T4CON_TxRC                            (1 << 9)
-#define AMAZON_GPTU_T4CON_TxUD                            (1 << 7)
-#define AMAZON_GPTU_T4CON_TxR                              (1 << 6)
-#define AMAZON_GPTU_T4CON_TxM(value)                (((( 1 << 3) - 1) & (value)) << 3)
-#define AMAZON_GPTU_T4CON_TxI(value)                (((( 1 << 3) - 1) & (value)) << 0)
-      
-/***GPT Write HW Modified Timer 2 Control Register If set
- and clear bit are written concurrently with 1, the associated bit is not changed.***/
-#define AMAZON_GPTU_WHBT2CON                 ((volatile u32*)(AMAZON_GPTU+ 0x0048))
-#define AMAZON_GPTU_WHBT2CON_SETTxCHDIR                (1 << 15)
-#define AMAZON_GPTU_WHBT2CON_CLRTxCHDIR                (1 << 14)
-#define AMAZON_GPTU_WHBT2CON_SETTxEDGE                  (1 << 13)
-#define AMAZON_GPTU_WHBT2CON_CLRTxEDGE                  (1 << 12)
-      
-/***GPT Write HW Modified Timer 4 Control Register If set
- and clear bit are written concurrently with 1, the associated bit is not changed.***/
-#define AMAZON_GPTU_WHBT4CON                 ((volatile u32*)(AMAZON_GPTU+ 0x0050))
-#define AMAZON_GPTU_WHBT4CON_SETTxCHDIR                (1 << 15)
-#define AMAZON_GPTU_WHBT4CON_CLRTxCHDIR                (1 << 14)
-#define AMAZON_GPTU_WHBT4CON_SETTxEDGE                  (1 << 13)
-#define AMAZON_GPTU_WHBT4CON_CLRTxEDGE                  (1 << 12)
-      
-/***GPT Capture Reload Register***/ 
-#define AMAZON_GPTU_CAPREL                   ((volatile u32*)(AMAZON_GPTU+ 0x0030))
-#define AMAZON_GPTU_CAPREL_CAPREL(value)             (((( 1 << 16) - 1) & (value)) << 0)
-      
-/***GPT Timer 2 Register***/ 
-#define AMAZON_GPTU_T2                       ((volatile u32*)(AMAZON_GPTU+ 0x0034))
-#define AMAZON_GPTU_T2_TVAL(value)               (((( 1 << 16) - 1) & (value)) << 0)
-      
-/***GPT Timer 3 Register***/ 
-#define AMAZON_GPTU_T3                       ((volatile u32*)(AMAZON_GPTU+ 0x0038))
-#define AMAZON_GPTU_T3_TVAL(value)               (((( 1 << 16) - 1) & (value)) << 0)
-      
-/***GPT Timer 4 Register***/ 
-#define AMAZON_GPTU_T4                       ((volatile u32*)(AMAZON_GPTU+ 0x003C))
-#define AMAZON_GPTU_T4_TVAL(value)               (((( 1 << 16) - 1) & (value)) << 0)
-      
-/***GPT Timer 5 Register***/ 
-#define AMAZON_GPTU_T5                       ((volatile u32*)(AMAZON_GPTU+ 0x0040))
-#define AMAZON_GPTU_T5_TVAL(value)               (((( 1 << 16) - 1) & (value)) << 0)
-      
-/***GPT Timer 6 Register***/ 
-#define AMAZON_GPTU_T6                       ((volatile u32*)(AMAZON_GPTU+ 0x0044))
-#define AMAZON_GPTU_T6_TVAL(value)               (((( 1 << 16) - 1) & (value)) << 0)
-      
-/***GPT Timer 6 Control Register***/ 
-#define AMAZON_GPTU_T6CON                    ((volatile u32*)(AMAZON_GPTU+ 0x0020))
-#define AMAZON_GPTU_T6CON_T6SR                            (1 << 15)
-#define AMAZON_GPTU_T6CON_T6CLR                          (1 << 14)
-#define AMAZON_GPTU_T6CON_BPS2(value)               (((( 1 << 2) - 1) & (value)) << 11)
-#define AMAZON_GPTU_T6CON_T6OTL                          (1 << 10)
-#define AMAZON_GPTU_T6CON_T6UD                            (1 << 7)
-#define AMAZON_GPTU_T6CON_T6R                              (1 << 6)
-#define AMAZON_GPTU_T6CON_T6M(value)                (((( 1 << 3) - 1) & (value)) << 3)
-#define AMAZON_GPTU_T6CON_T6I(value)                (((( 1 << 3) - 1) & (value)) << 0)
-      
-/***GPT Write HW Modified Timer 6 Control Register If set
- and clear bit are written concurrently with 1, the associated bit is not changed.***/
-#define AMAZON_GPTU_WHBT6CON                 ((volatile u32*)(AMAZON_GPTU+ 0x0054))
-#define AMAZON_GPTU_WHBT6CON_SETT6OTL                  (1 << 11)
-#define AMAZON_GPTU_WHBT6CON_CLRT6OTL                  (1 << 10)
-      
-/***GPT Timer 5 Control Register***/ 
-#define AMAZON_GPTU_T5CON                    ((volatile u32*)(AMAZON_GPTU+ 0x001C))
-#define AMAZON_GPTU_T5CON_T5SC                            (1 << 15)
-#define AMAZON_GPTU_T5CON_T5CLR                          (1 << 14)
-#define AMAZON_GPTU_T5CON_CI(value)                (((( 1 << 2) - 1) & (value)) << 12)
-#define AMAZON_GPTU_T5CON_T5CC                            (1 << 11)
-#define AMAZON_GPTU_T5CON_CT3                              (1 << 10)
-#define AMAZON_GPTU_T5CON_T5RC                            (1 << 9)
-#define AMAZON_GPTU_T5CON_T5UDE                          (1 << 8)
-#define AMAZON_GPTU_T5CON_T5UD                            (1 << 7)
-#define AMAZON_GPTU_T5CON_T5R                              (1 << 6)
-#define AMAZON_GPTU_T5CON_T5M(value)                (((( 1 << 3) - 1) & (value)) << 3)
-#define AMAZON_GPTU_T5CON_T5I(value)                (((( 1 << 3) - 1) & (value)) << 0)		
-         
-
-/***********************************************************************/
-/*  Module      :  ASC register address and bits                       */
-/***********************************************************************/
-         
-#define AMAZON_ASC                          (KSEG1+0x10100400)
-/***********************************************************************/   
-
-      
-/***ASC Port Input Select Register***/ 
-#define AMAZON_ASC_PISEL					(AMAZON_ASC+ 0x0004)
-#define AMAZON_ASC_PISEL_RIS				(1 << 0)
-      
-/***ASC Control Register***/ 
-#define AMAZON_ASC_CON						(AMAZON_ASC+ 0x0010)
-#define AMAZON_ASC_CON_R					(1 << 15)
-#define AMAZON_ASC_CON_LB					(1 << 14)
-#define AMAZON_ASC_CON_BRS					(1 << 13)
-#define AMAZON_ASC_CON_ODD					(1 << 12)
-#define AMAZON_ASC_CON_FDE					(1 << 11)
-#define AMAZON_ASC_CON_OE					(1 << 10)
-#define AMAZON_ASC_CON_FE					(1 << 9)
-#define AMAZON_ASC_CON_PE					(1 << 8)
-#define AMAZON_ASC_CON_OEN					(1 << 7)
-#define AMAZON_ASC_CON_FEN					(1 << 6)
-#define AMAZON_ASC_CON_PENRXDI				(1 << 5)
-#define AMAZON_ASC_CON_REN					(1 << 4)
-#define AMAZON_ASC_CON_STP					(1 << 3)
-#define AMAZON_ASC_CON_M(value)				(((( 1 << 3) - 1) & (value)) << 0)
- 
-/***ASC Write Hardware Modified Control Register***/ 
-#define AMAZON_ASC_WHBCON					(AMAZON_ASC+ 0x0050)
-#define AMAZON_ASC_WHBCON_SETOE				(1 << 13)
-#define AMAZON_ASC_WHBCON_SETFE				(1 << 12)
-#define AMAZON_ASC_WHBCON_SETPE				(1 << 11)
-#define AMAZON_ASC_WHBCON_CLROE				(1 << 10)
-#define AMAZON_ASC_WHBCON_CLRFE				(1 << 9)
-#define AMAZON_ASC_WHBCON_CLRPE				(1 << 8)
-#define AMAZON_ASC_WHBCON_SETREN			(1 << 5)
-#define AMAZON_ASC_WHBCON_CLRREN			(1 << 4)
-      
-/***ASC Baudrate Timer/Reload Register***/ 
-#define AMAZON_ASC_BTR						(AMAZON_ASC+ 0x0014)
-#define AMAZON_ASC_BTR_BR_VALUE(value)		(((( 1 << 13) - 1) & (value)) << 0)
-      
-/***ASC Fractional Divider Register***/ 
-#define AMAZON_ASC_FDV						(AMAZON_ASC+ 0x0018)
-#define AMAZON_ASC_FDV_FD_VALUE(value)		(((( 1 << 9) - 1) & (value)) << 0)
-      
-/***ASC IrDA Pulse Mode/Width Register***/ 
-#define AMAZON_ASC_PMW						(AMAZON_ASC+ 0x001C)
-#define AMAZON_ASC_PMW_IRPW					(1 << 8)
-#define AMAZON_ASC_PMW_PW_VALUE(value)		(((( 1 << 8) - 1) & (value)) << 0)
-      
-/***ASC Transmit Buffer Register***/ 
-#define AMAZON_ASC_TBUF						(AMAZON_ASC+ 0x0020)
-#define AMAZON_ASC_TBUF_TD_VALUE(value)		(((( 1 << 9) - 1) & (value)) << 0)
-      
-/***ASC Receive Buffer Register***/ 
-#define AMAZON_ASC_RBUF						(AMAZON_ASC+ 0x0024)
-#define AMAZON_ASC_RBUF_RD_VALUE(value)		(((( 1 << 9) - 1) & (value)) << 0)
-      
-/***ASC Autobaud Control Register***/ 
-#define AMAZON_ASC_ABCON					(AMAZON_ASC+ 0x0030)
-#define AMAZON_ASC_ABCON_RXINV				(1 << 11)
-#define AMAZON_ASC_ABCON_TXINV				(1 << 10)
-#define AMAZON_ASC_ABCON_ABEM(value)		(((( 1 << 2) - 1) & (value)) << 8)
-#define AMAZON_ASC_ABCON_FCDETEN			(1 << 4)
-#define AMAZON_ASC_ABCON_ABDETEN			(1 << 3)
-#define AMAZON_ASC_ABCON_ABSTEN				(1 << 2)
-#define AMAZON_ASC_ABCON_AUREN				(1 << 1)
-#define AMAZON_ASC_ABCON_ABEN				(1 << 0)
-      
-/***Receive FIFO Control Register***/ 
-#define AMAZON_ASC_RXFCON					(AMAZON_ASC+ 0x0040)
-#define AMAZON_ASC_RXFCON_RXFITL(value)		(((( 1 << 6) - 1) & (value)) << 8)
-#define AMAZON_ASC_RXFCON_RXTMEN			(1 << 2)
-#define AMAZON_ASC_RXFCON_RXFFLU			(1 << 1)
-#define AMAZON_ASC_RXFCON_RXFEN				(1 << 0)
-      
-/***Transmit FIFO Control Register***/ 
-#define AMAZON_ASC_TXFCON					(AMAZON_ASC+ 0x0044)
-#define AMAZON_ASC_TXFCON_TXFITL(value)		(((( 1 << 6) - 1) & (value)) << 8)
-#define AMAZON_ASC_TXFCON_TXTMEN			(1 << 2)
-#define AMAZON_ASC_TXFCON_TXFFLU			(1 << 1)
-#define AMAZON_ASC_TXFCON_TXFEN				(1 << 0)
-      
-/***FIFO Status Register***/ 
-#define AMAZON_ASC_FSTAT					(AMAZON_ASC+ 0x0048)
-#define AMAZON_ASC_FSTAT_TXFFL(value)		(((( 1 << 6) - 1) & (value)) << 8)
-#define AMAZON_ASC_FSTAT_RXFFL(value)		(((( 1 << 6) - 1) & (value)) << 0)
-      
-/***ASC Write HW Modified Autobaud Control Register***/ 
-#define AMAZON_ASC_WHBABCON					(AMAZON_ASC+ 0x0054)
-#define AMAZON_ASC_WHBABCON_SETABEN			(1 << 1)
-#define AMAZON_ASC_WHBABCON_CLRABEN			(1 << 0)
-      
-/***ASC Autobaud Status Register***/ 
-#define AMAZON_ASC_ABSTAT					(AMAZON_ASC+ 0x0034)
-#define AMAZON_ASC_ABSTAT_DETWAIT			(1 << 4)
-#define AMAZON_ASC_ABSTAT_SCCDET			(1 << 3)
-#define AMAZON_ASC_ABSTAT_SCSDET			(1 << 2)
-#define AMAZON_ASC_ABSTAT_FCCDET			(1 << 1)
-#define AMAZON_ASC_ABSTAT_FCSDET			(1 << 0)
-      
-/***ASC Write HW Modified Autobaud Status Register***/ 
-#define AMAZON_ASC_WHBABSTAT				(AMAZON_ASC+ 0x0058)
-#define AMAZON_ASC_WHBABSTAT_SETDETWAIT		(1 << 9)
-#define AMAZON_ASC_WHBABSTAT_CLRDETWAIT		(1 << 8)
-#define AMAZON_ASC_WHBABSTAT_SETSCCDET		(1 << 7)
-#define AMAZON_ASC_WHBABSTAT_CLRSCCDET		(1 << 6)
-#define AMAZON_ASC_WHBABSTAT_SETSCSDET		(1 << 5)
-#define AMAZON_ASC_WHBABSTAT_CLRSCSDET		(1 << 4)
-#define AMAZON_ASC_WHBABSTAT_SETFCCDET		(1 << 3)
-#define AMAZON_ASC_WHBABSTAT_CLRFCCDET		(1 << 2)
-#define AMAZON_ASC_WHBABSTAT_SETFCSDET		(1 << 1)
-#define AMAZON_ASC_WHBABSTAT_CLRFCSDET		(1 << 0)
-      
-/***ASC Clock Control Register***/ 
-#define AMAZON_ASC_CLC						(AMAZON_ASC+ 0x0000)
-#define AMAZON_ASC_CLC_RMC(value)			(((( 1 << 8) - 1) & (value)) << 8)
-#define AMAZON_ASC_CLC_DISS					(1 << 1)
-#define AMAZON_ASC_CLC_DISR					(1 << 0)		
-
-/***ASC IRNCR0 **/
-#define AMAZON_ASC_IRNCR0					(AMAZON_ASC+ 0x00FC)
-/***ASC IRNCR1 **/
-#define AMAZON_ASC_IRNCR1					(AMAZON_ASC+ 0x00F8)
-#define ASC_IRNCR_TIR	0x1
-#define ASC_IRNCR_RIR	0x2
-#define ASC_IRNCR_EIR	0x4
-/***********************************************************************/
-/*  Module      :  DMA register address and bits                       */
-/***********************************************************************/
-         
-#define AMAZON_DMA				(KSEG1+0x10103000)
-/***********************************************************************/   
-#define AMAZON_DMA_CH_ON        	AMAZON_DMA+0x28
-#define AMAZON_DMA_CH_RST      		AMAZON_DMA+0x2c
-#define AMAZON_DMA_CH0_ISR      	AMAZON_DMA+0x30
-#define AMAZON_DMA_CH1_ISR      	AMAZON_DMA+0x34
-#define AMAZON_DMA_CH2_ISR      	AMAZON_DMA+0x38
-#define AMAZON_DMA_CH3_ISR     		AMAZON_DMA+0x3c
-#define AMAZON_DMA_CH4_ISR      	AMAZON_DMA+0x40
-#define AMAZON_DMA_CH5_ISR      	AMAZON_DMA+0x44
-#define AMAZON_DMA_CH6_ISR      	AMAZON_DMA+0x48
-#define AMAZON_DMA_CH7_ISR      	AMAZON_DMA+0x4c
-#define AMAZON_DMA_CH8_ISR      	AMAZON_DMA+0x50
-#define AMAZON_DMA_CH9_ISR      	AMAZON_DMA+0x54
-#define AMAZON_DMA_CH10_ISR     	AMAZON_DMA+0x58
-#define AMAZON_DMA_CH11_ISR     	AMAZON_DMA+0x5c
-#define AMAZON_DMA_CH0_MSK      	AMAZON_DMA+0x60
-#define AMAZON_DMA_CH1_MSK      	AMAZON_DMA+0x64
-#define AMAZON_DMA_CH2_MSK     		AMAZON_DMA+0x68
-#define AMAZON_DMA_CH3_MSK      	AMAZON_DMA+0x6c
-#define AMAZON_DMA_CH4_MSK      	AMAZON_DMA+0x70
-#define AMAZON_DMA_CH5_MSK      	AMAZON_DMA+0x74
-#define AMAZON_DMA_CH6_MSK      	AMAZON_DMA+0x78
-#define AMAZON_DMA_CH7_MSK      	AMAZON_DMA+0x7c
-#define AMAZON_DMA_CH8_MSK      	AMAZON_DMA+0x80
-#define AMAZON_DMA_CH9_MSK      	AMAZON_DMA+0x84
-#define AMAZON_DMA_CH10_MSK     	AMAZON_DMA+0x88
-#define AMAZON_DMA_CH11_MSK     	AMAZON_DMA+0x8c
-#define AMAZON_DMA_Desc_BA      	AMAZON_DMA+0x90
-#define AMAZON_DMA_CH0_DES_LEN  	AMAZON_DMA+0x94
-#define AMAZON_DMA_CH1_DES_LEN  	AMAZON_DMA+0x98
-#define AMAZON_DMA_CH2_DES_LEN  	AMAZON_DMA+0x9c
-#define AMAZON_DMA_CH3_DES_LEN  	AMAZON_DMA+0xa0
-#define AMAZON_DMA_CH4_DES_LEN  	AMAZON_DMA+0xa4
-#define AMAZON_DMA_CH5_DES_LEN  	AMAZON_DMA+0xa8
-#define AMAZON_DMA_CH6_DES_LEN  	AMAZON_DMA+0xac
-#define AMAZON_DMA_CH7_DES_LEN  	AMAZON_DMA+0xb0
-#define AMAZON_DMA_CH8_DES_LEN  	AMAZON_DMA+0xb4
-#define AMAZON_DMA_CH9_DES_LEN  	AMAZON_DMA+0xb8
-#define AMAZON_DMA_CH10_DES_LEN 	AMAZON_DMA+0xbc
-#define AMAZON_DMA_CH11_DES_LEN 	AMAZON_DMA+0xc0
-#define AMAZON_DMA_CH1_DES_OFST 	AMAZON_DMA+0xc4
-#define AMAZON_DMA_CH2_DES_OFST 	AMAZON_DMA+0xc8
-#define AMAZON_DMA_CH3_DES_OFST 	AMAZON_DMA+0xcc
-#define AMAZON_DMA_CH4_DES_OFST 	AMAZON_DMA+0xd0
-#define AMAZON_DMA_CH5_DES_OFST 	AMAZON_DMA+0xd4
-#define AMAZON_DMA_CH6_DES_OFST 	AMAZON_DMA+0xd8
-#define AMAZON_DMA_CH7_DES_OFST 	AMAZON_DMA+0xdc
-#define AMAZON_DMA_CH8_DES_OFST 	AMAZON_DMA+0xe0
-#define AMAZON_DMA_CH9_DES_OFST 	AMAZON_DMA+0xe4
-#define AMAZON_DMA_CH10_DES_OFST 	AMAZON_DMA+0xe8
-#define AMAZON_DMA_CH11_DES_OFST 	AMAZON_DMA+0xec
-#define AMAZON_DMA_SW_BL          	AMAZON_DMA+0xf0
-#define AMAZON_DMA_TPE_BL         	AMAZON_DMA+0xf4
-#define AMAZON_DMA_DPlus2FPI_BL   	AMAZON_DMA+0xf8
-#define AMAZON_DMA_GRX_BUF_LEN    	AMAZON_DMA+0xfc
-#define AMAZON_DMA_DMA_ECON_REG   	AMAZON_DMA+0x100
-#define AMAZON_DMA_POLLING_REG     	AMAZON_DMA+0x104
-#define AMAZON_DMA_CH_WGT         	AMAZON_DMA+0x108
-#define AMAZON_DMA_TX_WGT         	AMAZON_DMA+0x10c
-#define AMAZON_DMA_DPLus2FPI_CLASS 	AMAZON_DMA+0x110
-#define AMAZON_DMA_COMB_ISR        	AMAZON_DMA+0x114
-
-//channel reset
-#define SWITCH1_RST_MASK	0x83	/* Switch1 channel mask */
-#define SWITCH2_RST_MASK	0x10C	/* Switch1 channel mask */
-#define TPE_RST_MASK		0x630	/* TPE channel mask */
-#define DPlus2FPI_RST_MASK	0x840	/*  DPlusFPI channel mask */
-
-//ISR
-#define DMA_ISR_RDERR			0x20
-#define DMA_ISR_CMDCPT			0x10
-#define DMA_ISR_CPT			0x8
-#define DMA_ISR_DURR			0x4
-#define DMA_ISR_EOP			0x2
-#define DMA_DESC_BYTEOFF_SHIFT		23
-
-#define DMA_POLLING_ENABLE		0x80000000
-#define DMA_POLLING_CNT			0x50	/*minimum 0x10, max 0xfff0*/
-
-/***********************************************************************/
-/*  Module      :  Debug register address and bits                     */
-/***********************************************************************/
-         
-#define AMAZON_DEBUG                        (KSEG1+0x1F106000)
-/***********************************************************************/   
-
-      
-/***MCD Break System Control Register***/ 
-#define AMAZON_DEBUG_MCD_BSCR                   	((volatile u32*)(AMAZON_DEBUG+ 0x0000))
-
-/***PMC Performance Counter Control Register0***/
-#define AMAZON_DEBUG_PMC_PCCR0                          ((volatile u32*)(AMAZON_DEBUG+ 0x0010))
-
-/***PMC Performance Counter Control Register1***/
-#define AMAZON_DEBUG_PMC_PCCR1                          ((volatile u32*)(AMAZON_DEBUG+ 0x0014))
-
-/***PMC Performance Counter Register0***/
-#define AMAZON_DEBUG_PMC_PCR0                          	((volatile u32*)(AMAZON_DEBUG+ 0x0018))
-
-/*165001:henryhsu:20050603:Source modified by Bing Tao*/
-
-/***PMC Performance Counter Register1***/
-//#define AMAZON_DEBUG_PMC_PCR1                          ((volatile u32*)(AMAZON_DEBUG+ 0x0020))
-#define AMAZON_DEBUG_PMC_PCR1                            ((volatile u32*)(AMAZON_DEBUG+ 0x001c))
-
-/*165001*/
-
-
-
-/***MCD Suspend Mode Control Register***/
-#define AMAZON_DEBUG_MCD_SMCR                           ((volatile u32*)(AMAZON_DEBUG+ 0x0024))
-
-/***********************************************************************/
-/*  Module      :  GPIO register address and bits                     */
-/***********************************************************************/
-         
-#define AMAZON_GPIO                        (KSEG1+0x10100B00)
-/***********************************************************************/   
-
-      
-/***Port 0 Data Output Register (0010H)***/ 
-#define AMAZON_GPIO_P0_OUT                       ((volatile u32*)(AMAZON_GPIO+ 0x0010))                      
-      
-/***Port 1 Data Output Register (0040H)***/ 
-#define AMAZON_GPIO_P1_OUT                       ((volatile u32*)(AMAZON_GPIO+ 0x0040))                      
-      
-/***Port 0 Data Input Register (0014H)***/ 
-#define AMAZON_GPIO_P0_IN                        ((volatile u32*)(AMAZON_GPIO+ 0x0014))                      
-      
-/***Port 1 Data Input Register (0044H)***/ 
-#define AMAZON_GPIO_P1_IN                        ((volatile u32*)(AMAZON_GPIO+ 0x0044))
-                            
-/***Port 0 Direction Register (0018H)***/ 
-#define AMAZON_GPIO_P0_DIR                       ((volatile u32*)(AMAZON_GPIO+ 0x0018))
-      
-/***Port 1 Direction Register (0048H)***/ 
-#define AMAZON_GPIO_P1_DIR                       ((volatile u32*)(AMAZON_GPIO+ 0x0048))
-      
-/***Port 0 Alternate Function Select Register 0 (001C H) ***/
-#define AMAZON_GPIO_P0_ALTSEL0                    ((volatile u32*)(AMAZON_GPIO+ 0x001C))                      
-      
-/***Port 1 Alternate Function Select Register 0 (004C H) ***/
-#define AMAZON_GPIO_P1_ALTSEL0                    ((volatile u32*)(AMAZON_GPIO+ 0x004C))
-                      
-/***Port 0 Alternate Function Select Register 1 (0020 H) ***/
-#define AMAZON_GPIO_P0_ALTSEL1                    ((volatile u32*)(AMAZON_GPIO+ 0x0020))
-      
-/***Port 1 Alternate Function Select Register 0 (0050 H) ***/
-#define AMAZON_GPIO_P1_ALTSEL1                    ((volatile u32*)(AMAZON_GPIO+ 0x0050))
-      
-/***Port 0 Open Drain Control Register (0024H)***/ 
-#define AMAZON_GPIO_P0_OD                        ((volatile u32*)(AMAZON_GPIO+ 0x0024))                      
-      
-/***Port 1 Open Drain Control Register (0054H)***/ 
-#define AMAZON_GPIO_P1_OD                        ((volatile u32*)(AMAZON_GPIO+ 0x0054))
-                      
-/***Port 0 Input Schmitt-Trigger Off Register (0028 H) ***/
-#define AMAZON_GPIO_P0_STOFF                    ((volatile u32*)(AMAZON_GPIO+ 0x0028))
-      
-/***Port 1 Input Schmitt-Trigger Off Register (0058 H) ***/
-#define AMAZON_GPIO_P1_STOFF                    ((volatile u32*)(AMAZON_GPIO+ 0x0058))
-                      
-/***Port 0 Pull Up/Pull Down Select Register (002C H)***/ 
-#define AMAZON_GPIO_P0_PUDSEL                    ((volatile u32*)(AMAZON_GPIO+ 0x002C))
-                      
-/***Port 1 Pull Up/Pull Down Select Register (005C H)***/ 
-#define AMAZON_GPIO_P1_PUDSEL                    ((volatile u32*)(AMAZON_GPIO+ 0x005C))
-                      
-/***Port 0 Pull Up Device Enable Register (0030 H)***/ 
-#define AMAZON_GPIO_P0_PUDEN                    ((volatile u32*)(AMAZON_GPIO+ 0x0030))
-                      
-/***Port 1 Pull Up Device Enable Register (0060 H)***/ 
-#define AMAZON_GPIO_P1_PUDEN                    ((volatile u32*)(AMAZON_GPIO+ 0x0060))
-                                            		                  
-/***********************************************************************/
-/*  Module      :  BIU register address and bits                       */
-/***********************************************************************/
-         
-#define AMAZON_BIU                          (KSEG1+0x1FA80000)
-/***********************************************************************/   
-
-      
-/***BIU Identification Register***/ 
-#define AMAZON_BIU_ID                       ((volatile u32*)(AMAZON_BIU+ 0x0000))
-#define AMAZON_BIU_ID_ARCH                            (1 << 16)
-#define AMAZON_BIU_ID_ID(value)                (((( 1 << 8) - 1) & (value)) << 8)
-#define AMAZON_BIU_ID_REV(value)                (((( 1 << 8) - 1) & (value)) << 0)
-      
-/***BIU Access Error Cause Register***/ 
-#define AMAZON_BIU_ERRCAUSE                 ((volatile u32*)(AMAZON_BIU+ 0x0100))
-#define AMAZON_BIU_ERRCAUSE_ERR                              (1 << 31)
-#define AMAZON_BIU_ERRCAUSE_PORT(value)               (((( 1 << 4) - 1) & (value)) << 16)
-#define AMAZON_BIU_ERRCAUSE_CAUSE(value)              (((( 1 << 2) - 1) & (value)) << 0)
-      
-/***BIU Access Error Address Register***/ 
-#define AMAZON_BIU_ERRADDR                  ((volatile u32*)(AMAZON_BIU+ 0x0108))
-#define AMAZON_BIU_ERRADDR_ADDR		
-         
-/***********************************************************************/
-/*  Module      :  ICU register address and bits                       */
-/***********************************************************************/
-         
-#define AMAZON_ICU								(KSEG1+0x1F101000)
-/***********************************************************************/   
-
-/***IM0 Interrupt Status Register***/ 
-#define AMAZON_ICU_IM0_ISR						(AMAZON_ICU + 0x0010)
-#define AMAZON_ICU_IM1_ISR						(AMAZON_ICU + 0x0020)
-#define AMAZON_ICU_IM2_ISR						(AMAZON_ICU + 0x0030)
-#define AMAZON_ICU_IM3_ISR						(AMAZON_ICU + 0x0040)
-#define AMAZON_ICU_IM4_ISR						(AMAZON_ICU + 0x0050)
-	                
-/***IM0 Interrupt Enable Register***/ 
-#define AMAZON_ICU_IM0_IER						(AMAZON_ICU + 0x0014)
-#define AMAZON_ICU_IM1_IER						(AMAZON_ICU + 0x0024)
-#define AMAZON_ICU_IM2_IER						(AMAZON_ICU + 0x0034)
-#define AMAZON_ICU_IM3_IER						(AMAZON_ICU + 0x0044)
-#define AMAZON_ICU_IM4_IER						(AMAZON_ICU + 0x0054)
-
-/***IM0 Interrupt Output Status Register***/ 
-#define AMAZON_ICU_IM0_IOSR						(AMAZON_ICU + 0x0018)
-#define AMAZON_ICU_IM1_IOSR						(AMAZON_ICU + 0x0028)
-#define AMAZON_ICU_IM2_IOSR						(AMAZON_ICU + 0x0038)
-#define AMAZON_ICU_IM3_IOSR						(AMAZON_ICU + 0x0048)
-#define AMAZON_ICU_IM4_IOSR						(AMAZON_ICU + 0x0058)
-
-/***IM0 Interrupt Request Set Register***/ 
-#define AMAZON_ICU_IM0_IRSR						(AMAZON_ICU + 0x001c)
-#define AMAZON_ICU_IM1_IRSR						(AMAZON_ICU + 0x002c)
-#define AMAZON_ICU_IM2_IRSR						(AMAZON_ICU + 0x003c)
-#define AMAZON_ICU_IM3_IRSR						(AMAZON_ICU + 0x004c)
-#define AMAZON_ICU_IM4_IRSR						(AMAZON_ICU + 0x005c)
-
-/***Interrupt Vector Value Register***/
-#define AMAZON_ICU_IM_VEC						(AMAZON_ICU + 0x0060)
-
-/***Interrupt Vector Value Mask***/
-#define AMAZON_ICU_IM0_VEC_MASK					0x0000001f
-#define AMAZON_ICU_IM1_VEC_MASK					0x000003e0
-#define AMAZON_ICU_IM2_VEC_MASK					0x00007c00
-#define AMAZON_ICU_IM3_VEC_MASK					0x000f8000
-#define AMAZON_ICU_IM4_VEC_MASK					0x01f00000
-
-/***DMA Interrupt Mask Value***/
-#define AMAZON_DMA_H_MASK						0x00000fff
-                                                                                       
-/***External Interrupt Control Register***/
-#define AMAZON_ICU_EXTINTCR						((volatile u32*)(AMAZON_ICU + 0x0000))
-#define AMAZON_ICU_IRNICR						((volatile u32*)(AMAZON_ICU + 0x0004))  
-#define AMAZON_ICU_IRNCR						((volatile u32*)(AMAZON_ICU + 0x0008))  
-#define AMAZON_ICU_IRNEN						((volatile u32*)(AMAZON_ICU + 0x000c))
-
-/***********************************************************************/
-/*  Module      :   PCI/Card-BUS/PC-Card register address and bits     */
-/***********************************************************************/
-         
-#define AMAZON_PCI				(KSEG1+0x10105400)
-#define AMAZON_PCI_CFG_BASE      		(KSEG1+0x11000000)
-#define AMAZON_PCI_MEM_BASE      		(KSEG1+0x12000000)
-
-#define CLOCK_CONTROL           		AMAZON_PCI + 0x00000000
-#define ARB_CTRL_bit        			1
-#define IDENTIFICATION         			AMAZON_PCI + 0x00000004
-#define SOFTRESET               		AMAZON_PCI + 0x00000010
-#define PCI_FPI_ERROR_ADDRESS   		AMAZON_PCI + 0x00000014
-#define FPI_PCI_ERROR_ADDRESS   		AMAZON_PCI + 0x00000018
-#define FPI_ERROR_TAG           		AMAZON_PCI + 0x0000001c
-#define IRR                     		AMAZON_PCI + 0x00000020
-#define IRA_IR                  		AMAZON_PCI + 0x00000024
-#define IRM                     		AMAZON_PCI + 0x00000028
-#define DMA_COMPLETE_BIT      			0
-#define PCI_POWER_CHANGE_BIT  			16
-#define PCI_MASTER0_BROKEN_INT_BIT   		24
-#define PCI_MASTER1_BROKEN_INT_BIT   		25
-#define PCI_MASTER2_BROKEN_INT_BIT   		26
-#define EOI                     		AMAZON_PCI + 0x0000002c
-#define PCI_MODE                		AMAZON_PCI + 0x00000030
-#define PCI_MODE_cfgok_bit      		24
-#define DEVICE_VENDOR_ID        		AMAZON_PCI + 0x00000034
-#define SUBSYSTEM_VENDOR_ID     		AMAZON_PCI + 0x00000038
-#define POWER_MANAGEMENT        		AMAZON_PCI + 0x0000003c
-#define CLASS_CODE1             		AMAZON_PCI + 0x00000040
-#define BAR11_MASK              		AMAZON_PCI + 0x00000044
-#define BAR12_MASK              		AMAZON_PCI + 0x00000048
-#define BAR13_MASK              		AMAZON_PCI + 0x0000004c
-#define BAR14_MASK              		AMAZON_PCI + 0x00000050
-#define BAR15_MASK              		AMAZON_PCI + 0x00000054
-#define BAR16_MASK              		AMAZON_PCI + 0x00000058
-#define CARDBUS_CIS_POINTER1    		AMAZON_PCI + 0x0000005c
-#define SUBSYSTEM_ID1          			AMAZON_PCI + 0x00000060
-#define PCI_ADDRESS_MAP_11      		AMAZON_PCI + 0x00000064
-#define PCI_ADDRESS_MAP_12      		AMAZON_PCI + 0x00000068
-#define PCI_ADDRESS_MAP_13      		AMAZON_PCI + 0x0000006c
-#define PCI_ADDRESS_MAP_14      		AMAZON_PCI + 0x00000070
-#define PCI_ADDRESS_MAP_15      		AMAZON_PCI + 0x00000074
-#define PCI_ADDRESS_MAP_16      		AMAZON_PCI + 0x00000078
-#define FPI_SEGMENT_ENABLE     			AMAZON_PCI + 0x0000007c
-#define CLASS_CODE2             		AMAZON_PCI + 0x00000080
-#define BAR21_MASK              		AMAZON_PCI + 0x00000084
-#define BAR22_MASK              		AMAZON_PCI + 0x00000088
-#define BAR23_MASK              		AMAZON_PCI + 0x0000008c
-#define BAR24_MASK              		AMAZON_PCI + 0x00000090
-#define BAR25_MASK              		AMAZON_PCI + 0x00000094
-#define BAR26_MASK              		AMAZON_PCI + 0x00000098
-#define CARDBUS_CIS_POINTER2    		AMAZON_PCI + 0x0000009c
-#define SUBSYSTEM_ID2           		AMAZON_PCI + 0x000000a0
-#define PCI_ADDRESS_MAP_21      		AMAZON_PCI + 0x000000a4
-#define PCI_ADDRESS_MAP_22      		AMAZON_PCI + 0x000000a8
-#define PCI_ADDRESS_MAP_23      		AMAZON_PCI + 0x000000ac
-#define PCI_ADDRESS_MAP_24      		AMAZON_PCI + 0x000000b0
-#define PCI_ADDRESS_MAP_25      		AMAZON_PCI + 0x000000b4
-#define PCI_ADDRESS_MAP_26      		AMAZON_PCI + 0x000000b8
-#define FPI_ADDRESS_MASK11LOW   		AMAZON_PCI + 0x000000bc
-#define FPI_ADDRESS_MAP_0       		AMAZON_PCI + 0x000000c0
-#define FPI_ADDRESS_MAP_1       		AMAZON_PCI + 0x000000c4
-#define FPI_ADDRESS_MAP_2       		AMAZON_PCI + 0x000000c8
-#define FPI_ADDRESS_MAP_3       		AMAZON_PCI + 0x000000cc
-#define FPI_ADDRESS_MAP_4       		AMAZON_PCI + 0x000000d0
-#define FPI_ADDRESS_MAP_5       		AMAZON_PCI + 0x000000d4
-#define FPI_ADDRESS_MAP_6       		AMAZON_PCI + 0x000000d8
-#define FPI_ADDRESS_MAP_7       		AMAZON_PCI + 0x000000dc
-#define FPI_ADDRESS_MAP_11LOW   		AMAZON_PCI + 0x000000e0
-#define FPI_ADDRESS_MAP_11HIGH  		AMAZON_PCI + 0x000000e4
-#define FPI_BURST_LENGTH        		AMAZON_PCI + 0x000000e8
-#define SET_PCI_SERR            		AMAZON_PCI + 0x000000ec
-#define DMA_FPI_START_ADDR      		AMAZON_PCI + 0x000000f0
-#define DMA_PCI_START_ADDR      		AMAZON_PCI + 0x000000f4
-#define DMA_TRANSFER_COUNT      		AMAZON_PCI + 0x000000f8
-#define DMA_CONTROL_STATUS      		AMAZON_PCI + 0x000000fc
-
-#define EXT_PCI1_CONFIG_SPACE_BASE_ADDR    	AMAZON_PCI_CFG_BASE + 0x0800
-#define EXT_PCI2_CONFIG_SPACE_BASE_ADDR    	AMAZON_PCI_CFG_BASE + 0x1000
-#define EXT_PCI3_CONFIG_SPACE_BASE_ADDR    	AMAZON_PCI_CFG_BASE + 0x1800
-#define EXT_PCI4_CONFIG_SPACE_BASE_ADDR    	AMAZON_PCI_CFG_BASE + 0x2000
-#define EXT_PCI5_CONFIG_SPACE_BASE_ADDR   	AMAZON_PCI_CFG_BASE + 0x2800
-#define EXT_PCI6_CONFIG_SPACE_BASE_ADDR    	AMAZON_PCI_CFG_BASE + 0x3000
-#define EXT_PCI7_CONFIG_SPACE_BASE_ADDR    	AMAZON_PCI_CFG_BASE + 0x3800
-#define EXT_PCI8_CONFIG_SPACE_BASE_ADDR    	AMAZON_PCI_CFG_BASE + 0x4000
-#define EXT_PCI9_CONFIG_SPACE_BASE_ADDR    	AMAZON_PCI_CFG_BASE + 0x4800
-#define EXT_PCI10_CONFIG_SPACE_BASE_ADDR   	AMAZON_PCI_CFG_BASE + 0x5000
-#define EXT_PCI11_CONFIG_SPACE_BASE_ADDR   	AMAZON_PCI_CFG_BASE + 0x5800
-#define EXT_PCI12_CONFIG_SPACE_BASE_ADDR   	AMAZON_PCI_CFG_BASE + 0x6000
-#define EXT_PCI13_CONFIG_SPACE_BASE_ADDR   	AMAZON_PCI_CFG_BASE + 0x6800
-#define EXT_PCI14_CONFIG_SPACE_BASE_ADDR   	AMAZON_PCI_CFG_BASE + 0x7000
-#define EXT_PCI15_CONFIG_SPACE_BASE_ADDR   	AMAZON_PCI_CFG_BASE + 0x7800
-#define EXT_CARDBUS_CONFIG_SPACE_BASE_ADDR  	AMAZON_PCI_CFG_BASE + 0XF000
-#define EXT_PCI_BAR1_ADDR                  	0x10
-#define EXT_PCI_BAR2_ADDR                  	0x14
-#define EXT_PCI_BAR3_ADDR                  	0x18
-#define EXT_PCI_BAR4_ADDR                  	0x1C
-#define EXT_PCI_BAR5_ADDR                  	0x20
-#define EXT_PCI_BAR6_ADDR                  	0x24
-                                                                                                             
-#define DEVICE_ID_VECDOR_ID_ADDR    		AMAZON_PCI_CFG_BASE + 0x0
-#define STATUS_COMMAND_ADDR         		AMAZON_PCI_CFG_BASE + 0x4
-#define BUS_MASTER_ENABLE_BIT       		2
-#define MEM_SPACE_ENABLE_BIT       		1
-#define CLASS_CODE_REVISION_ADDR    		AMAZON_PCI_CFG_BASE + 0x8
-#define BIST_HEADER_TYPE_LATENCY_CAHCE_ADDR 	AMAZON_PCI_CFG_BASE + 0xC
-#define BAR1_ADDR                   		AMAZON_PCI_CFG_BASE + 0x10
-#define BAR2_ADDR                   		AMAZON_PCI_CFG_BASE + 0x14
-#define BAR3_ADDR                   		AMAZON_PCI_CFG_BASE + 0x18
-#define BAR4_ADDR                   		AMAZON_PCI_CFG_BASE + 0x1C
-#define BAR3_ADDR                   		AMAZON_PCI_CFG_BASE + 0x18
-#define BAR4_ADDR                   		AMAZON_PCI_CFG_BASE + 0x1C
-#define BAR5_ADDR                   		AMAZON_PCI_CFG_BASE + 0x20
-#define BAR6_ADDR                   		AMAZON_PCI_CFG_BASE + 0x24
-#define CARDBUS_CIS_POINTER_ADDR    		AMAZON_PCI_CFG_BASE + 0x28
-#define SUBSYSTEM_ID_VENDOR_ID_ADDR 		AMAZON_PCI_CFG_BASE + 0x2C
-#define EXPANSION_ROM_BASE_ADDR     		AMAZON_PCI_CFG_BASE + 0x30
-#define CAPABILITIES_POINTER_ADDR   		AMAZON_PCI_CFG_BASE + 0x34
-#define RESERVED_0x38               		AMAZON_PCI_CFG_BASE + 0x38
-#define MAX_LAT_MIN_GNT_INT_PIN_LINE_ADDR 	AMAZON_PCI_CFG_BASE + 0x3C
-#define POWER_MNGT_NEXT_POINTER_CAP_ID_ADDR  	AMAZON_PCI_CFG_BASE + 0x40
-#define POWER_MANAGEMENT_CTRL_STATUS_ADDR  	AMAZON_PCI_CFG_BASE + 0x44
-#define RESERVED_0x48               		AMAZON_PCI_CFG_BASE + 0x48
-#define RESERVED_0x4C               		AMAZON_PCI_CFG_BASE + 0x4C
-#define ERROR_ADDR_PCI_FPI_ADDR     		AMAZON_PCI_CFG_BASE + 0x50
-#define ERROR_ADdR_FPI_PCI_ADDR     		AMAZON_PCI_CFG_BASE + 0x54
-#define ERROR_TAG_FPI_PCI_ADDR      		AMAZON_PCI_CFG_BASE + 0x58
-#define PCI_ARB_CTRL_STATUS_ADDR    		AMAZON_PCI_CFG_BASE + 0x5C
-#define INTERNAL_ARB_ENABLE_BIT         	0
-#define ARB_SCHEME_BIT                  	1
-#define PCI_MASTER0_PRIOR_2BITS         	2
-#define PCI_MASTER1_PRIOR_2BITS         	4
-#define PCI_MASTER2_PRIOR_2BITS         	6
-#define PCI_MASTER0_REQ_MASK_2BITS      	8
-#define PCI_MASTER1_REQ_MASK_2BITS      	10
-#define PCI_MASTER2_REQ_MASK_2BITS      	12
-#define PCI_MASTER0_GNT_MASK_2BITS      	14
-#define PCI_MASTER1_GNT_MASK_2BITS      	16
-#define PCI_MASTER2_GNT_MASK_2BITS      	18
-#define FPI_PCI_INT_STATUS_ADDR     		AMAZON_PCI_CFG_BASE + 0x60
-#define FPI_PCI_INT_ACK_ADDR        		AMAZON_PCI_CFG_BASE + 0x64
-#define FPI_PCI_INT_MASK_ADDR       		AMAZON_PCI_CFG_BASE + 0x68
-#define CARDBUS_CTRL_STATUS_ADDR    		AMAZON_PCI_CFG_BASE + 0x6C
-#define CARDBUS_CFRAME_ENABLE           	0
-                                                                                                             
-#define CLOCK_CONTROL_default                	0x00000000
-#define CLOCK_CONTROL_mask                   	0x00000003
-                                                                                                             
-#define IDENTIFICATION_default               	0x0011C002
-#define IDENTIFICATION_mask                  	0x00000000
-                                                                                                             
-#define SOFTRESET_default                    	0x00000000
-// SOFTRESET bit 0 is writable but will be reset to 0 after software reset is over
-#define SOFTRESET_mask                       	0x00000000
-                                                                                                             
-#define PCI_FPI_ERROR_ADDRESS_default        	0xFFFFFFFF
-#define PCI_FPI_ERROR_ADDRESS_mask           	0x00000000
-                                                                                                             
-#define FPI_PCI_ERROR_ADDRESS_default        	0xFFFFFFFF
-#define FPI_PCI_ERROR_ADDRESS_mask           	0x00000000
-                                                                                                             
-#define FPI_ERROR_TAG_default                	0x0000000F
-#define FPI_ERROR_TAG_mask                   	0x00000000
-                                                                                                             
-#define IRR_default                          	0x00000000
-#define IRR_mask                             	0x07013b2F
-                                                                                                             
-#define IRA_IR_default                       	0x00000000
-#define IRA_IR_mask                          	0x07013b2F
-                                                                                                             
-#define IRM_default                          	0x00000000
-#define IRM_mask                             	0xFFFFFFFF
-                                                                                                             
-#define EOI_default                          	0x00000000
-#define EOI_mask                             	0x00000000
-                                                                                                             
-#define PCI_MODE_default                     	0x01000103
-#define PCI_MODE_mask                        	0x1107070F
-                                                                                                             
-#define DEVICE_VENDOR_ID_default             	0x000C15D1
-#define DEVICE_VENDOR_ID_mask                	0xFFFFFFFF
-                                                                                                             
-#define SUBSYSTEM_VENDOR_ID_default          	0x000015D1
-#define SUBSYSTEM_VENDOR_ID_mask             	0x0000FFFF
-                                                                                                             
-#define POWER_MANAGEMENT_default             	0x0000001B
-#define POWER_MANAGEMENT_mask                	0x0000001F
-                                                                                                             
-#define CLASS_CODE1_default                  	0x00028000
-#define CLASS_CODE1_mask                     	0x00FFFFFF
-                                                                                                             
-#define BAR11_MASK_default                   	0x0FF00008
-#define BAR11_MASK_mask                      	0x8FF00008
-                                                                                                             
-#define BAR12_MASK_default                   	0x80001800
-#define BAR12_MASK_mask                      	0x80001F08
-                                                                                                             
-#define BAR13_MASK_default                   	0x8FF00008
-#define BAR13_MASK_mask                      	0x8FF00008
-                                                                                                             
-#define BAR14_MASK_default                   	0x8F000000
-#define BAR14_MASK_mask                      	0x8FFFFF08
-                                                                                                             
-#define BAR15_MASK_default                   	0x80000000
-#define BAR15_MASK_mask                      	0x8FFFFF08
-                                                                                                             
-#define BAR16_MASK_default                   	0x80000001
-// bit 0 and bit 3 is mutually exclusive
-#define BAR16_MASK_mask                      	0x8FFFFFF9
-                                                                                                             
-#define CARDBUS_CIS_POINTER1_default         	0x00000000
-#define CARDBUS_CIS_POINTER1_mask            	0x03FFFFFF
-                                                                                                             
-#define SUBSYSTEM_ID1_default                	0x0000000C
-#define SUBSYSTEM_ID1_mask                   	0x0000FFFF
-                                                                                                             
-#define PCI_ADDRESS_MAP_11_default           	0x18000000
-#define PCI_ADDRESS_MAP_11_mask              	0x7FFFFFF1
-                                                                                                             
-#define PCI_ADDRESS_MAP_12_default           	0x18100000
-#define PCI_ADDRESS_MAP_12_mask              	0x7FFFFF01
-                                                                                                             
-#define PCI_ADDRESS_MAP_13_default           	0x18200000
-#define PCI_ADDRESS_MAP_13_mask              	0x7FF00001
-                                                                                                             
-#define PCI_ADDRESS_MAP_14_default           	0x70000000
-#define PCI_ADDRESS_MAP_14_mask              	0x7FFFFF01
-                                             	                                                                
-#define PCI_ADDRESS_MAP_15_default           	0x00000001
-#define PCI_ADDRESS_MAP_15_mask              	0x7FFFFF01
-                                                                                                             
-#define PCI_ADDRESS_MAP_16_default           	0x60000000
-#define PCI_ADDRESS_MAP_16_mask              	0x7FF00001
-                                                                                                             
-#define FPI_SEGMENT_ENABLE_default           	0x000003FF
-#define FPI_SEGMENT_ENABLE_mask              	0x000003FF
-                                                                                                             
-#define CLASS_CODE2_default                  	0x00FF0000
-#define CLASS_CODE2_mask                     	0x00FFFFFF
-                                                                                                             
-#define BAR21_MASK_default                   	0x80000008
-#define BAR21_MASK_mask                      	0x8FFFFFF8
-                                                                                                             
-#define BAR22_MASK_default                   	0x80000008
-#define BAR22_MASK_mask                      	0x80001F08
-                                                                                                             
-#define BAR23_MASK_default                   	0x80000008
-#define BAR23_MASK_mask                      	0x8FF00008
-                                                                                                             
-#define BAR24_MASK_default                   	0x8FE00000
-#define BAR24_MASK_mask                      	0x8FFFFF08
-                                                                                                             
-#define BAR25_MASK_default                   	0x8FFFF000
-#define BAR25_MASK_mask                      	0x8FFFFF08
-                                                                                                             
-#define BAR26_MASK_default                   	0x8FFFFFE1
-#define BAR26_MASK_mask                      	0x8FFFFFF1
-                                                                                                             
-#define CARDBUS_CIS_POINTER2_default         	0x00000000
-#define CARDBUS_CIS_POINTER2_mask            	0x03FFFFFF
-
-#define SUBSYSTEM_ID2_default                	0x0000000C
-#define SUBSYSTEM_ID2_mask                   	0x0000FFFF
-                                                                                                             
-#define PCI_ADDRESS_MAP_21_default           	0x3FE00000
-#define PCI_ADDRESS_MAP_21_mask              	0x7FFFFFF1
-                                                                                                             
-#define PCI_ADDRESS_MAP_22_default           	0x68000000
-#define PCI_ADDRESS_MAP_22_mask             	0x7FFFFF01
-                                                                                                             
-#define PCI_ADDRESS_MAP_23_default           	0x20000000
-#define PCI_ADDRESS_MAP_23_mask              	0x7FF00001
-                                                                                                             
-#define PCI_ADDRESS_MAP_24_default           	0x70000001
-#define PCI_ADDRESS_MAP_24_mask              	0x7FFFFF01
-                                                                                                             
-#define PCI_ADDRESS_MAP_25_default           	0x78000001
-#define PCI_ADDRESS_MAP_25_mask              	0x7FFFFF01
-                                                                                                             
-#define PCI_ADDRESS_MAP_26_default           	0x20000000
-#define PCI_ADDRESS_MAP_26_mask              	0x7FF00001
-                                                                                                             
-#define FPI_ADDRESS_MASK11LOW_default        	0x00000000
-#define FPI_ADDRESS_MASK11LOW_mask           	0x00070000
-                                                                                                             
-#define FPI_ADDRESS_MAP_0_default            	0x00000000
-#define FPI_ADDRESS_MAP_0_mask               	0xFFF00000
-                                                                                                             
-#define FPI_ADDRESS_MAP_1_default            	0x10000000
-#define FPI_ADDRESS_MAP_1_mask               	0xFFF00000
-                                                                                                             
-#define FPI_ADDRESS_MAP_2_default            	0x20000000
-#define FPI_ADDRESS_MAP_2_mask               	0xFFF00000
-
-#define FPI_ADDRESS_MAP_3_default            	0x30000000
-#define FPI_ADDRESS_MAP_3_mask               	0xFFF00000
-                                                                                                             
-#define FPI_ADDRESS_MAP_4_default            	0x40000000
-#define FPI_ADDRESS_MAP_4_mask               	0xFFF00000
-                                                                                                             
-#define FPI_ADDRESS_MAP_5_default            	0x50000000
-#define FPI_ADDRESS_MAP_5_mask               	0xFFF00000
-                                                                                                             
-#define FPI_ADDRESS_MAP_6_default            	0x60000000
-#define FPI_ADDRESS_MAP_6_mask               	0xFFF00000
-                                                                                                             
-#define FPI_ADDRESS_MAP_7_default            	0x70000000
-#define FPI_ADDRESS_MAP_7_mask               	0xFFF00000
-                                                                                                             
-#define FPI_ADDRESS_MAP_11LOW_default        	0xB0000000
-#define FPI_ADDRESS_MAP_11LOW_mask           	0xFFFF0000
-                                                                                                             
-#define FPI_ADDRESS_MAP_11HIGH_default       	0xB8000000
-#define FPI_ADDRESS_MAP_11HIGH_mask          	0xFFF80000
-                                                                                                             
-#define FPI_BURST_LENGTH_default             	0x00000000
-#define FPI_BURST_LENGTH_mask                	0x00000303
-                                                                                                             
-#define SET_PCI_SERR_default                 	0x00000000
-#define SET_PCI_SERR_mask                    	0x00000000
-                                                                                                             
-#define DMA_FPI_START_ADDRESS_default        	0x00000000
-#define DMA_FPI_START_ADDRESS_mask           	0xFFFFFFFF
-                                                                                                             
-#define DMA_PCI_START_ADDRESS_default        	0x00000000
-#define DMA_PCI_START_ADDRESS_mask           	0xFFFFFFFF
-                                                                                                             
-#define DMA_TRANSFER_COUNT_default           	0x00000000
-#define DMA_TRANSFER_COUNT_mask              	0x0000FFFF
-
-#define DMA_CONTROL_STATUS_default           	0x00000000
-#define DMA_CONTROL_STATUS_mask              	0x00000000   // bit 0,1 is writable
-
-/***********************************************************************/	
-#undef IKOS_MINI_BOOT		//don't run a full booting
-#ifdef CONFIG_USE_IKOS	
-#define CONFIG_USE_VENUS		//Faster, 10M CPU and 192k baudrate
-#ifdef CONFIG_USE_VENUS
-#define IKOS_CPU_SPEED		10000000										   
-#else
-#define IKOS_CPU_SPEED		180000	//IKOS is slow										   
-#endif 
-#endif //CONFIG_USE_IKOS
-
-/* 165001:henryhsu:20050603:Source Modify form Bing Tao */
-
-#if defined(CONFIG_NET_WIRELESS_SPURS) || defined(CONFIG_NET_WIRELESS_SPURS_MODULE)
-#define EBU_PCI_SOFTWARE_ARBITOR
-#endif
-
-#define  AMAZON_B11
-#ifdef AMAZON_B11
-#define SWITCH_BUF_FPI_ADDR		(0x10110000)
-#define SWITCH_BUF_ADDR			(KSEG1+SWITCH_BUF_FPI_ADDR)
-#define SWITCH_BUF_SIZE			(0x2800)
-#define AMAZON_B11_CBM_QD_ADDR		(SWITCH_BUF_ADDR+0x0)
-#define AMAZON_B11_BOND_CELL_ADDR	(SWITCH_BUF_ADDR+0x000)
-#endif
-#define  AMAZON_REFERENCE_BOARD
-//for AMAZON ATM bonding application
-#ifdef AMAZON_REFERENCE_BOARD
-#define  GPIO_DETECT_LOW
-#else
-#undef  GPIO_DETECT_LOW
-#endif
-
-/* 165001 */
-
-#undef AMAZON_IKOS_DEBUG_MSG
-#undef AMAZON_INT_DEBUG_MSG
-#undef AMAZON_ATM_DEBUG_MSG
-#undef AMAZON_DMA_DEBUG_MSG
-#undef AMAZON_SW_DEBUG_MSG
-#undef AMAZON_WDT_DEBUG_MSG
-#undef AMAZON_MTD_DEBUG_MSG
-#undef AMAZON_SSC_DEBUG_MSG
-#undef AMAZON_MEI_DEBUG_MSG
-
-#ifdef AMAZON_IKOS_DEBUG_MSG
-#define AMAZON_IKOS_DMSG(fmt,args...) printk("%s:" fmt, __FUNCTION__, ##args)
-#else
-#define AMAZON_IKOS_DMSG(fmt,args...)
-#endif
-
-#ifdef AMAZON_WDT_DEBUG_MSG 
-#define AMAZON_WDT_DMSG(fmt, args...) printk( "%s: " fmt, __FUNCTION__ , ##args)
-#else 
-#define AMAZON_WDT_DMSG(fm,args...)
-#endif
-
-#ifdef AMAZON_SSC_DEBUG_MSG 
-#define AMAZON_SSC_DMSG(fmt, args...) printk( "%s: " fmt, __FUNCTION__ , ##args)
-#else 
-#define AMAZON_SSC_DMSG(fm,args...)
-#endif
-
-#ifdef AMAZON_DMA_DEBUG_MSG 
-#define AMAZON_DMA_DMSG(fmt, args...) printk( "%s: " fmt, __FUNCTION__ , ##args)
-#else 
-#define AMAZON_DMA_DMSG(fm,args...)
-#endif
-
-#ifdef AMAZON_ATM_DEBUG_MSG
-#define AMAZON_TPE_DMSG(fmt, args...) printk( "%s: " fmt, __FUNCTION__ , ##args)
-#else //not AMAZON_ATM_DEBUG
-#define	AMAZON_TPE_DMSG(fmt, args...)
-#endif //AMAZON_ATM_DEBUG
-
-#ifdef AMAZON_SW_DEBUG_MSG
-#define AMAZON_SW_DMSG(fmt,args...) printk("%s: " fmt, __FUNCTION__ , ##args)
-#else
-#define AMAZON_SW_DMSG(fmt,args...)
-#endif	
-
-#ifdef AMAZON_MTD_DEBUG_MSG
-#define AMAZON_MTD_DMSG(fmt,args...) printk("%s: " fmt, __FUNCTION__ , ##args)
-#else
-#define AMAZON_MTD_DMSG(fmt,args...)
-#endif	
-
-#ifdef AMAZON_INT_DEBUG_MSG
-#define AMAZON_INT_DMSG(x...) printk(x)
-#else
-#define AMAZON_INT_DMSG(x...)
-#endif 
-
-#ifdef AMAZON_MEI_DEBUG_MSG
-#define AMAZON_MEI_DMSG(fmt,args...) printk("%s:" fmt, __FUNCTION__, ##args)
-#else
-#define AMAZON_MEI_DMSG(fmt,args...)
-#endif
-
-#endif //AMAZON_H 
diff --git a/target/linux/amazon/files/include/asm-mips/amazon/amazon_dma.h b/target/linux/amazon/files/include/asm-mips/amazon/amazon_dma.h
deleted file mode 100644
index 63ab5924e..000000000
--- a/target/linux/amazon/files/include/asm-mips/amazon/amazon_dma.h
+++ /dev/null
@@ -1,148 +0,0 @@
-#ifndef AMAZON_DMA_H
-#define AMAZON_DMA_H
-
-#define RCV_INT          1
-#define TX_BUF_FULL_INT  2
-#define TRANSMIT_CPT_INT 4
-
-#define QOS_DEFAULT_WGT 0x7fffffffUL;
-
-
-enum attr_t{
-   TX=0,
-   RX=1,
-   RESERVED=2,
-   DEFAULT=3,
-   
-};
-
-#ifdef CONFIG_CPU_LITTLE_ENDIAN
-typedef struct rx_desc{
-   u32 data_length:16;
-   volatile u32 reserved:7;
-   volatile u32 byte_offset:2; 
-   volatile u32 Burst_length_offset:3;
-   volatile u32 EoP:1;
-   volatile u32 Res:1;
-   volatile u32 C:1;
-   volatile u32 OWN:1;
-   volatile u32 Data_Pointer;
-   /*fix me:should be 28 bits here, 32 bits just for host simulatiuon purpose*/ 
-}_rx_desc; 
-
-
-typedef struct tx_desc{
-   volatile u32 data_length:16;
-   volatile u32 reserved1:7;
-   volatile u32 byte_offset:5;   
-   volatile u32 EoP:1;
-   volatile u32 SoP:1;
-   volatile u32 C:1;
-   volatile u32 OWN:1;
-   volatile u32 Data_Pointer;//fix me:should be 28 bits here
-}_tx_desc;
-#else //BIG
-typedef struct rx_desc{
-	union
-	{
-		struct
-		{
-			volatile u32 OWN                 	:1;
-			volatile u32 C	                 	:1;
-			volatile u32 SoP                 	:1;
-			volatile u32 EoP	         	:1;
-			volatile u32 Burst_length_offset	:3;
-			volatile u32 byte_offset	 	:2; 
-			volatile u32 reserve             	:7;
-			volatile u32 data_length             	:16;
-		}field;
-
-		volatile u32 word;
-	}status;
-	
-	volatile u32 Data_Pointer;
-}_rx_desc; 
-
-
-typedef struct tx_desc{
-	union
-	{
-		struct
-		{
-			volatile u32 OWN                 :1;
-			volatile u32 C	                 :1;
-			volatile u32 SoP                 :1;
-			volatile u32 EoP	         :1;
-			volatile u32 byte_offset	 :5; 
-			volatile u32 reserved            :7;
-			volatile u32 data_length         :16;
-		}field;
-
-		volatile u32 word;
-	}status;
-	
-	volatile u32 Data_Pointer;
-}_tx_desc;
-
-#endif //ENDIAN
-
-struct dma_channel_info{
-  /*filled by driver, optional*/  
-    enum attr_t attr;/*TX or RX*/
-    int weight;
-    int desc_num;
-    int packet_size;
-    int control;/*on or off*/ 
-   
-    int desc_base;
-    int status;
-};
-
-typedef struct dma_channel_info _dma_channel_info;
-
-struct dma_device_info{
-   /*variables*/ 
-   /*filled by driver, compulsary*/
-    char device_name[15];
-    enum attr_t attr;/*default or else*/
-    int tx_burst_len;
-    int rx_burst_len;   
- 
-    int logic_rx_chan_base;
-    int logic_tx_chan_base;
-    u8 on_ch_bit;
-   /*filled by driver, optional*/
-    int  weight;
-    int  current_tx_chan;
-    int  current_rx_chan;
-    int  num_tx_chan;
-    int  num_rx_chan; 
-    struct dma_channel_info tx_chan[2];
-    struct dma_channel_info rx_chan[4]; 
-    
-    /*functions, optional*/
-    u8* (*buffer_alloc)(int len,int* offset, void** opt);
-    int (*buffer_free)(u8* dataptr, void* opt);
-    int (*intr_handler)(struct dma_device_info* info, int status);
-    /*set by device, clear by dma*/
-    int ack;
-    void * priv;		/* used by peripheral driver only */
-};
-typedef struct dma_device_info _dma_device_info;
-
-int dma_device_register(struct dma_device_info* info);
-
-int dma_device_unregister(struct dma_device_info* info);
-
-int dma_device_read(struct dma_device_info* info, u8** dataptr, void** opt);
-
-int dma_device_write(struct dma_device_info* info, u8* dataptr, int len, void* opt);
-
-int dma_device_update(struct dma_device_info* info);
-
-void dma_device_update_rx(struct dma_device_info* dma_dev);
-
-void dma_device_update_tx(struct dma_device_info* dma_dev);
-
-void register_handler_sim(int (*handler)(int));
-#endif /* AMAZON_DMA_H */
diff --git a/target/linux/amazon/files/include/asm-mips/amazon/amazon_mei.h b/target/linux/amazon/files/include/asm-mips/amazon/amazon_mei.h
deleted file mode 100644
index 6ac8ab310..000000000
--- a/target/linux/amazon/files/include/asm-mips/amazon/amazon_mei.h
+++ /dev/null
@@ -1,220 +0,0 @@
-#ifndef		_AMAZON_MEI_H
-#define        	_AMAZON_MEI_H
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#include "amazon_mei_app.h"
-
-#define AMAZON_MEI_DEBUG_ON
-#define AMAZON_MEI_CMV_EXTRA
-
-#define AMAZON_MEI_MAJOR	106
-
-/*
-**	Define where in ME Processor's memory map the Stratify chip lives
-*/
-#define MEI_SPACE_ACCESS	0xB0100C00
-
-#define MAXSWAPSIZE      	8 * 1024	//8k *(32bits)
-//#define AMAZON_ADSL_IMAGESIZE  16*1024    	// 16k * (32bits)
-
-
-//	Mailboxes
-#define MSG_LENGTH		16     	// x16 bits
-#define YES_REPLY      	 	1
-#define NO_REPLY         	0
-
-#define CMV_TIMEOUT		100	//jiffies
-#define MIB_INTERVAL		10000 	//msec
-
-/***  Bit definitions ***/
-
-#define FALSE	0
-#define TRUE	1
-#define BIT0	1<<0
-#define BIT1	1<<1
-#define BIT2	1<<2
-#define BIT3	1<<3
-#define BIT4	1<<4
-#define BIT5	1<<5
-#define BIT6	1<<6
-#define BIT7	1<<7
-#define BIT8	1<<8
-#define BIT9	1<<9
-#define BIT10 	1<<10
-#define BIT11	1<<11
-#define BIT12	1<<12
-#define BIT13	1<<13
-#define BIT14	1<<14
-#define BIT15	1<<15
-#define BIT16 	1<<16
-#define BIT17	1<<17
-#define BIT18	1<<18
-#define BIT19	1<<19
-#define BIT20	1<<20
-#define BIT21	1<<21
-#define BIT22	1<<22
-#define BIT23	1<<23
-#define BIT24	1<<24
-#define BIT25	1<<25
-#define BIT26	1<<26
-#define BIT27	1<<27
-#define BIT28	1<<28
-#define BIT29	1<<29
-#define BIT30	1<<30
-#define BIT31	1<<31
-
-
-/***	Register address offsets, relative to MEI_SPACE_ADDRESS ***/
-#define MEI_DATA_XFR				(0x0000 + MEI_SPACE_ACCESS)
-#define	MEI_VERSION				(0x0200 + MEI_SPACE_ACCESS)	
-#define	ARC_GP_STAT				(0x0204 + MEI_SPACE_ACCESS)	
-#define	MEI_XFR_ADDR				(0x020C + MEI_SPACE_ACCESS)	
-#define	MEI_TO_ARC_INT				(0x021C + MEI_SPACE_ACCESS)
-#define	ARC_TO_MEI_INT				(0x0220 + MEI_SPACE_ACCESS)	
-#define	ARC_TO_MEI_INT_MASK			(0x0224 + MEI_SPACE_ACCESS)	
-#define	MEI_DEBUG_WAD				(0x0228 + MEI_SPACE_ACCESS)	
-#define MEI_DEBUG_RAD				(0x022C + MEI_SPACE_ACCESS)	
-#define	MEI_DEBUG_DATA				(0x0230 + MEI_SPACE_ACCESS)	
-#define	MEI_DEBUG_DEC				(0x0234 + MEI_SPACE_ACCESS)	
-#define	MEI_CONTROL				(0x0238 + MEI_SPACE_ACCESS)	
-#define	AT_CELLRDY_BC0				(0x023C + MEI_SPACE_ACCESS)
-#define	AT_CELLRDY_BC1				(0x0240 + MEI_SPACE_ACCESS)	
-#define	AR_CELLRDY_BC0				(0x0244 + MEI_SPACE_ACCESS)	
-#define	AR_CELLRDY_BC1				(0x0248 + MEI_SPACE_ACCESS)	
-#define	AAI_ACCESS				(0x024C + MEI_SPACE_ACCESS)	
-#define	AAITXCB0				(0x0300 + MEI_SPACE_ACCESS)	
-#define	AAITXCB1				(0x0304 + MEI_SPACE_ACCESS)	
-#define	AAIRXCB0				(0x0308 + MEI_SPACE_ACCESS)	
-#define	AAIRXCB1				(0x030C + MEI_SPACE_ACCESS)	
-
-
-//	MEI_TO_ARC_INTERRUPT Register definitions
-#define	MEI_TO_ARC_INT1			BIT3
-#define	MEI_TO_ARC_INT0			BIT2
-#define MEI_TO_ARC_CS_DONE		BIT1
-#define	MEI_TO_ARC_MSGAV		BIT0
-
-//	ARC_TO_MEI_INTERRUPT Register definitions
-#define	ARC_TO_MEI_INT1			BIT8
-#define	ARC_TO_MEI_INT0			BIT7
-#define	ARC_TO_MEI_CS_REQ		BIT6
-#define	ARC_TO_MEI_DBG_DONE		BIT5
-#define	ARC_TO_MEI_MSGACK		BIT4
-#define	ARC_TO_MEI_NO_ACCESS		BIT3
-#define	ARC_TO_MEI_CHECK_AAITX		BIT2
-#define	ARC_TO_MEI_CHECK_AAIRX		BIT1
-#define	ARC_TO_MEI_MSGAV		BIT0
-
-//	ARC_TO_MEI_INTERRUPT_MASK Register definitions
-#define	GP_INT1_EN			BIT8
-#define	GP_INT0_EN			BIT7
-#define	CS_REQ_EN			BIT6
-#define	DBG_DONE_EN			BIT5
-#define	MSGACK_EN			BIT4
-#define	NO_ACC_EN			BIT3
-#define	AAITX_EN			BIT2
-#define	AAIRX_EN			BIT1
-#define	MSGAV_EN			BIT0
-
-//	MEI_CONTROL Register definitions
-#define	INT_LEVEL			BIT2
-#define	SOFT_RESET			BIT1
-#define	HOST_MSTR			BIT0
-
-//	MEI_DEBUG_DECODE Register definitions
-#define MEI_DEBUG_DEC_MASK		(0x3)
-#define MEI_DEBUG_DEC_AUX_MASK		(0x0)
-#define MEI_DEBUG_DEC_DMP1_MASK		(0x1)
-#define MEI_DEBUG_DEC_DMP2_MASK		(0x2)
-#define MEI_DEBUG_DEC_CORE_MASK         (0x3)
-
-
-//	ARC_TO_MEI_MAILBOX[11] is a special location used to indicate
-//	page swap requests.
-#define	MEI_TO_ARC_MAILBOX		(0x15FC0)
-#define MEI_TO_ARC_MAILBOXR		(0x15FEC)			
-#define	ARC_TO_MEI_MAILBOX		(0x15F90)	
-#define ARC_MEI_MAILBOXR		(0x15FBC)
-
-// Codeswap request messages are indicated by setting BIT31 
-#define OMB_CODESWAP_MESSAGE_MSG_TYPE_MASK	(0x80000000)
-
-/*
-**	Swap page header
-*/
-//	Page must be loaded at boot time if size field has BIT31 set
-#define BOOT_FLAG	(BIT31)
-#define BOOT_FLAG_MASK	~BOOT_FLAG
-
-//	Swap page header describes size in 32-bit words, load location, and image offset
-//	for program and/or data segments
-typedef struct _arc_swp_page_hdr
-{
-	u32		p_offset;	//	Offset bytes of progseg from beginning of image
-	u32		p_dest;		//	Destination addr of progseg on processor
-	u32		p_size;		//	Size in 32-bitwords of program segment
-	u32		d_offset;	//	Offset bytes of dataseg from beginning of image
-	u32		d_dest;		//	Destination addr of dataseg on processor
-	u32		d_size;		//	Size in 32-bitwords of data segment
-}ARC_SWP_PAGE_HDR;
-
-
-/*
-**	Swap image header
-*/
-#define GET_PROG	0	//	Flag used for program mem segment
-#define GET_DATA	1	//	Flag used for data mem segment
-
-//	Image header contains size of image, checksum for image, and count of
-//	page headers. Following that are 'count' page headers followed by
-//	the code and/or data segments to be loaded
-typedef struct _arc_img_hdr
-{
-	u32			size;		// 	Size of binary image in bytes
-	u32			checksum;	//	Checksum for image
-	u32			count;		//	Count of swp pages in image
-	ARC_SWP_PAGE_HDR 	page[1];	//	Should be "count" pages - '1' to make compiler happy
-}ARC_IMG_HDR;
-
-
-
-/*
-**	Native size for the Stratiphy interface is 32-bits. All reads and writes
-**	MUST be aligned on 32-bit boundaries. Trickery must be invoked to read word and/or
-**	byte data. Read routines are provided. Write routines are probably a bad idea, as the
-**	Arc has unrestrained, unseen access to the same memory, so a read-modify-write cycle
-**	could very well have unintended results.
-*/
-MEI_ERROR meiCMV(u16 *, int);                         // first arg is CMV to ARC, second to indicate whether need reply
-
-void meiLongwordWrite(u32 ul_address, u32 ul_data);
-void meiLongwordRead(u32 ul_address, u32 *pul_data);
-
-
-MEI_ERROR meiDMAWrite(u32 destaddr, u32 *databuff, u32 databuffsize);
-MEI_ERROR meiDebugWrite(u32 destaddr, u32 *databuff, u32 databuffsize);
-
-MEI_ERROR meiDMARead(u32 srcaddr, u32 *databuff, u32 databuffsize);
-MEI_ERROR meiDebugRead(u32 srcaddr, u32 *databuff, u32 databuffsize);
-
-void meiPollForDbgDone(void);
-
-void meiMailboxInterruptsDisable(void);
-void meiMailboxInterruptsEnable(void);
-
-MEI_ERROR meiMailboxWrite(u16 *msgsrcbuffer, u16 msgsize);
-MEI_ERROR meiMailboxRead(u16 *msgdestbuffer, u16 msgsize);
-
-int meiGetPage( u32 Page, u32 data, u32 MaxSize, u32 *Buffer, u32 *Dest);
-
-MEI_ERROR meiHaltArc(void);
-MEI_ERROR meiRunArc(void);
-
-MEI_ERROR meiDownloadBootCode(void);
-
-MEI_ERROR meiForceRebootAdslModem(void);
-
-void makeCMV(u8 opcode, u8 group, u16 address, u16 index, int size, u16 * data);
-
-#endif
-
diff --git a/target/linux/amazon/files/include/asm-mips/amazon/amazon_mei_app.h b/target/linux/amazon/files/include/asm-mips/amazon/amazon_mei_app.h
deleted file mode 100644
index 89700d9d7..000000000
--- a/target/linux/amazon/files/include/asm-mips/amazon/amazon_mei_app.h
+++ /dev/null
@@ -1,54 +0,0 @@
-//509221:tc.chen 2005/09/22 Reset DFE added when MEI_TO_ARC_CS_DONE not cleared by ARC and Added AMAZON_MEI_DEBUG_MODE ioctl 
-
-#ifndef       	_AMAZON_MEI_APP_H
-#define        	_AMAZON_MEI_APP_H
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-                //  ioctl control
-#define AMAZON_MEI_START 	                       	300
-#define AMAZON_MEI_REPLY                           	301
-#define AMAZON_MEI_NOREPLY                      	302
-
-#define AMAZON_MEI_RESET				303
-#define AMAZON_MEI_REBOOT				304
-#define AMAZON_MEI_HALT					305
-#define AMAZON_MEI_CMV_WINHOST				306
-#define AMAZON_MEI_CMV_READ				307
-#define AMAZON_MEI_CMV_WRITE				308
-#define AMAZON_MEI_MIB_DAEMON				309
-#define AMAZON_MEI_SHOWTIME				310
-#define AMAZON_MEI_REMOTE				311
-#define AMAZON_MEI_READDEBUG				312
-#define AMAZON_MEI_WRITEDEBUG				313
-#define AMAZON_MEI_LOP					314
-
-#define AMAZON_MEI_PCM_SETUP				315
-#define AMAZON_MEI_PCM_START_TIMER			316
-#define AMAZON_MEI_PCM_STOP_TIMER			317
-#define AMAZON_MEI_PCM_CHECK				318
-#define AMAZON_MEI_GET_EOC_LEN				319
-#define AMAZON_MEI_GET_EOC_DATA				320
-#define AMAZON_MEI_PCM_GETDATA				321
-#define AMAZON_MEI_PCM_GPIO				322
-#define AMAZON_MEI_EOC_SEND				323
-//MIB
-#define AMAZON_MIB_LO_ATUC				324
-#define AMAZON_MIB_LO_ATUR				325
-#define AMAZON_MEI_DOWNLOAD				326
-
-#define AMAZON_MEI_DEBUG_MODE				327 //509221:tc.chen
-#define LOOP_DIAGNOSTIC_MODE_COMPLETE			328
-
-
-/***	Enums    ***/
-typedef enum mei_error
-{
-	MEI_SUCCESS = 0,
-	MEI_FAILURE = -1,
-	MEI_MAILBOX_FULL = -2,
-	MEI_MAILBOX_EMPTY = -3,
-        MEI_MAILBOX_TIMEOUT = -4,
-}MEI_ERROR;
-
-#endif
diff --git a/target/linux/amazon/files/include/asm-mips/amazon/amazon_mei_app_ioctl.h b/target/linux/amazon/files/include/asm-mips/amazon/amazon_mei_app_ioctl.h
deleted file mode 100644
index d98f60b17..000000000
--- a/target/linux/amazon/files/include/asm-mips/amazon/amazon_mei_app_ioctl.h
+++ /dev/null
@@ -1,1169 +0,0 @@
-// 603221:tc.chen 2006/03/21 added APIs to support the WEB related parameters for ADSL Statistics
-
-#ifndef __AMAZON_MEI_APP_IOCTL_H
-#define __AMAZON_MEI_APP_IOCTL_H
-
-#ifdef __KERNEL__
-#include "amazon_mei_ioctl.h"
-#endif
-
-/* Interface Name */
-//#define INTERFACE_NAME <define the interface>
-
-/* adslLineTable constants */
-#define GET_ADSL_LINE_CODE		1
-
-/* adslAtucPhysTable constants */
-#define GET_ADSL_ATUC_PHY		4
-
-/* adslAturPhysTable constants */
-#define GET_ADSL_ATUR_PHY		10
-
-/* adslAtucChanTable constants */
-#define GET_ADSL_ATUC_CHAN_INFO 	15
-
-/* adslAturChanTable constants */
-#define GET_ADSL_ATUR_CHAN_INFO		18
-
-/* adslAtucPerfDataTable constants */
-#define GET_ADSL_ATUC_PERF_DATA		21
-
-/* adslAturPerfDataTable constants */
-#define GET_ADSL_ATUR_PERF_DATA		40
-
-/* adslAtucIntervalTable constants */
-#define GET_ADSL_ATUC_INTVL_INFO	60
-
-/* adslAturIntervalTable constants */
-#define GET_ADSL_ATUR_INTVL_INFO	65
-
-/* adslAtucChanPerfDataTable constants */
-#define GET_ADSL_ATUC_CHAN_PERF_DATA	70
-
-/* adslAturChanPerfDataTable constants */
-#define GET_ADSL_ATUR_CHAN_PERF_DATA	90
-
-/* adslAtucChanIntervalTable constants */
-#define GET_ADSL_ATUC_CHAN_INTVL_INFO	110
-
-/* adslAturChanIntervalTable constants */
-#define GET_ADSL_ATUR_CHAN_INTVL_INFO	115
-
-/* adslLineAlarmConfProfileTable constants */
-#define GET_ADSL_ALRM_CONF_PROF		120
-#define SET_ADSL_ALRM_CONF_PROF		121
-
-/* adslAturTrap constants */
-#define ADSL_ATUR_TRAPS			135
-
-//////////////////  RFC-3440 //////////////
-
-#ifdef AMAZON_MEI_MIB_RFC3440
-/* adslLineExtTable */
-#define GET_ADSL_ATUC_LINE_EXT		201
-#define SET_ADSL_ATUC_LINE_EXT		203
-
-/* adslAtucPerfDateExtTable */
-#define GET_ADSL_ATUC_PERF_DATA_EXT	205
-
-/* adslAtucIntervalExtTable */
-#define GET_ADSL_ATUC_INTVL_EXT_INFO	221
-
-/* adslAturPerfDataExtTable */
-#define GET_ADSL_ATUR_PERF_DATA_EXT	225
-
-/* adslAturIntervalExtTable */
-#define GET_ADSL_ATUR_INTVL_EXT_INFO	233
-
-/* adslAlarmConfProfileExtTable */
-#define GET_ADSL_ALRM_CONF_PROF_EXT	235
-#define SET_ADSL_ALRM_CONF_PROF_EXT	236
-
-/* adslAturExtTrap */
-#define ADSL_ATUR_EXT_TRAPS		240
-
-#endif
-
-// 603221:tc.chen start
-/* The following constants are added to support the WEB related ADSL Statistics */
-
-/* adslLineStatus constants */
-#define GET_ADSL_LINE_STATUS	245
-
-/* adslLineRate constants */
-#define GET_ADSL_LINE_RATE		250
-
-/* adslLineInformation constants */
-#define GET_ADSL_LINE_INFO		255
-
-/* adslNearEndPerformanceStats constants */
-#define GET_ADSL_NEAREND_STATS	270
-
-/* adslFarEndPerformanceStats constants */
-#define GET_ADSL_FAREND_STATS	290
-
-// 603221:tc.chen end
-
-/* Loop diagnostics mode of the ADSL line related constants */
-#define GET_ADSL_LOOP_DIAGNOSTICS_MODE 	295
-#define SET_ADSL_LOOP_DIAGNOSTICS_MODE 	296
-#define IS_ADSL_LOOP_DIAGNOSTICS_MODE_COMPLETE	299
-
-/* Sub-carrier related parameters */
-#define GET_ADSL_ATUC_SUBCARRIER_STATS		297
-#define GET_ADSL_ATUR_SUBCARRIER_STATS		298
-#define GET_ADSL_LINE_INIT_STATS		150
-#define GET_ADSL_POWER_SPECTRAL_DENSITY		151
-
-
-///////////////////////////////////////////////////////////
-// makeCMV(Opcode, Group, Address, Index, Size, Data)
-
-/* adslLineCode Flags */
-#define LINE_CODE_FLAG			0x1	/* BIT 0th position */
-
-/* adslAtucPhysTable Flags */
-#define ATUC_PHY_SER_NUM_FLAG		0x1	/* BIT 0th position */
-#define ATUC_PHY_SER_NUM_FLAG_MAKECMV1	makeCMV(H2D_CMV_READ, INFO, 57, 0, 12, data) 
-#define ATUC_PHY_SER_NUM_FLAG_MAKECMV2	makeCMV(H2D_CMV_READ, INFO, 57, 12, 4, data) 
-
-#define ATUC_PHY_VENDOR_ID_FLAG		0x2	/* BIT 1 */
-#define ATUC_PHY_VENDOR_ID_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, INFO, 64, 0, 4, data)
-
-#define ATUC_PHY_VER_NUM_FLAG		0x4	/* BIT 2 */
-#define ATUC_PHY_VER_NUM_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, INFO, 58, 0, 8, data)
-
-#define ATUC_CURR_STAT_FLAG		0x8	/* BIT 3 */
-
-#define ATUC_CURR_OUT_PWR_FLAG		0x10	/* BIT 4 */
-#define ATUC_CURR_OUT_PWR_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, INFO, 68, 5, 1, data)
-
-#define ATUC_CURR_ATTR_FLAG		0x20	/* BIT 5 */
-#define ATUC_CURR_ATTR_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, INFO, 69, 0, 2, data)
-
-
-/* adslAturPhysTable	Flags */
-#define ATUR_PHY_SER_NUM_FLAG		0x1	/* BIT 0th position */
-#define ATUR_PHY_SER_NUM_FLAG_MAKECMV1	makeCMV(H2D_CMV_READ, INFO, 62, 0, 12, data)
-#define ATUR_PHY_SER_NUM_FLAG_MAKECMV2	makeCMV(H2D_CMV_READ, INFO, 62, 12, 4, data)
-
-#define ATUR_PHY_VENDOR_ID_FLAG		0x2	/* BIT 1 */
-#define ATUR_PHY_VENDOR_ID_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, INFO, 65, 0, 4, data)
-
-#define ATUR_PHY_VER_NUM_FLAG		0x4	/* BIT 2 */
-#define ATUR_PHY_VER_NUM_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, INFO, 61, 0, 8, data)
-
-#define ATUR_SNRMGN_FLAG		0x8
-#define ATUR_SNRMGN_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, INFO, 68, 4, 1, data)
-
-#define ATUR_ATTN_FLAG			0x10
-#define ATUR_ATTN_FLAG_MAKECMV		makeCMV(H2D_CMV_READ, INFO, 68, 2, 1, data)
-
-#define ATUR_CURR_STAT_FLAG		0x20	/* BIT 3 */
-
-#define ATUR_CURR_OUT_PWR_FLAG		0x40	/* BIT 4 */
-#define ATUR_CURR_OUT_PWR_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, INFO, 69, 5, 1, data)
-
-#define ATUR_CURR_ATTR_FLAG		0x80	/* BIT 5 */
-#define ATUR_CURR_ATTR_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, INFO, 68, 0, 2, data)
-
-/* adslAtucChanTable Flags */
-#define ATUC_CHAN_INTLV_DELAY_FLAG	0x1	/* BIT 0th position */
-#define ATUC_CHAN_INTLV_DELAY_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, RATE, 3, 1, 1, data)
-
-#define ATUC_CHAN_CURR_TX_RATE_FLAG	0x2	/* BIT 1 */
-#define ATUC_CHAN_CURR_TX_RATE_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, RATE, 1, 0, 2, data)
-
-#define ATUC_CHAN_PREV_TX_RATE_FLAG	0x4	/* BIT 2 */
-
-/* adslAturChanTable Flags */
-#define ATUR_CHAN_INTLV_DELAY_FLAG	0x1	/* BIT 0th position */
-#define ATUR_CHAN_INTLV_DELAY_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, RATE, 2, 1, 1, data)
-
-#define ATUR_CHAN_CURR_TX_RATE_FLAG	0x2	/* BIT 1 */
-#define ATUR_CHAN_CURR_TX_RATE_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, RATE, 0, 0, 2, data)
-
-#define ATUR_CHAN_PREV_TX_RATE_FLAG	0x4	/* BIT 2 */
-
-#define ATUR_CHAN_CRC_BLK_LEN_FLAG	0x8	/* BIT 3 */
-
-/* adslAtucPerfDataTable Flags */
-#define ATUC_PERF_LOFS_FLAG		0x1	/* BIT 0th position */
-#define ATUC_PERF_LOSS_FLAG		0x2	/* BIT 1 */
-#define ATUC_PERF_LO_FLAG_MAKECMV		makeCMV(H2D_CMV_READ, PLAM, 0, 0, 1, data)
-#define ATUC_PERF_ESS_FLAG		0x4	/* BIT 2 */
-#define ATUC_PERF_ESS_FLAG_MAKECMV		makeCMV(H2D_CMV_READ, PLAM, 7, 0, 1, data) 
-#define ATUC_PERF_INITS_FLAG	0x8	/* BIT 3 */
-#define ATUC_PERF_VALID_INTVLS_FLAG	0x10 /* BIT 4 */
-#define ATUC_PERF_INVALID_INTVLS_FLAG	0x20 /* BIT 5 */
-#define ATUC_PERF_CURR_15MIN_TIME_ELAPSED_FLAG	0x40 /* BIT 6 */
-#define ATUC_PERF_CURR_15MIN_LOFS_FLAG	 	0x80 	 /* BIT 7 */
-#define ATUC_PERF_CURR_15MIN_LOSS_FLAG		0x100 /* BIT 8 */
-#define ATUC_PERF_CURR_15MIN_ESS_FLAG		0x200	/* BIT 9 */
-#define ATUC_PERF_CURR_15MIN_INIT_FLAG		0x400 /* BIT 10 */
-#define ATUC_PERF_CURR_1DAY_TIME_ELAPSED_FLAG 0x800 /* BIT 11 */
-#define ATUC_PERF_CURR_1DAY_LOFS_FLAG		0x1000 /* BIT 12 */
-#define ATUC_PERF_CURR_1DAY_LOSS_FLAG		0x2000 /* BIT 13 */
-#define ATUC_PERF_CURR_1DAY_ESS_FLAG		0x4000 /* BIT 14 */
-#define ATUC_PERF_CURR_1DAY_INIT_FLAG		0x8000 /* BIT 15 */
-#define ATUC_PERF_PREV_1DAY_MON_SEC_FLAG	0x10000 /* BIT 16 */
-#define ATUC_PERF_PREV_1DAY_LOFS_FLAG		0x20000 /* BIT 17 */
-#define ATUC_PERF_PREV_1DAY_LOSS_FLAG		0x40000 /* BIT 18 */
-#define ATUC_PERF_PREV_1DAY_ESS_FLAG		0x80000 /* BIT 19 */
-#define ATUC_PERF_PREV_1DAY_INITS_FLAG		0x100000 /* BIT 20 */
-
-/* adslAturPerfDataTable Flags */
-#define ATUR_PERF_LOFS_FLAG		0x1	/* BIT 0th position */
-#define ATUR_PERF_LOSS_FLAG		0x2	/* BIT 1 */
-#define ATUR_PERF_LPR_FLAG		0x4	/* BIT 2 */
-#define ATUR_PERF_LO_FLAG_MAKECMV		makeCMV(H2D_CMV_READ, PLAM, 1, 0, 1, data)
-#define ATUR_PERF_ESS_FLAG		0x8	/* BIT 3 */
-#define ATUR_PERF_ESS_FLAG_MAKECMV		makeCMV(H2D_CMV_READ, PLAM, 33, 0, 1, data)
-#define ATUR_PERF_VALID_INTVLS_FLAG	0x10 /* BIT 4 */
-#define ATUR_PERF_INVALID_INTVLS_FLAG	0x20 /* BIT 5 */
-#define ATUR_PERF_CURR_15MIN_TIME_ELAPSED_FLAG	0x40 /* BIT 6 */
-#define ATUR_PERF_CURR_15MIN_LOFS_FLAG	 	0x80 	 /* BIT 7 */
-#define ATUR_PERF_CURR_15MIN_LOSS_FLAG		0x100 /* BIT 8 */
-#define ATUR_PERF_CURR_15MIN_LPR_FLAG		0x200 /* BIT 9 */
-#define ATUR_PERF_CURR_15MIN_ESS_FLAG		0x400	/* BIT 10 */
-#define ATUR_PERF_CURR_1DAY_TIME_ELAPSED_FLAG 	0x800 /* BIT 11 */
-#define ATUR_PERF_CURR_1DAY_LOFS_FLAG		0x1000 /* BIT 12 */
-#define ATUR_PERF_CURR_1DAY_LOSS_FLAG		0x2000 /* BIT 13 */
-#define ATUR_PERF_CURR_1DAY_LPR_FLAG		0x4000 /* BIT 14 */
-#define ATUR_PERF_CURR_1DAY_ESS_FLAG		0x8000 /* BIT 15 */
-#define ATUR_PERF_PREV_1DAY_MON_SEC_FLAG	0x10000 /* BIT 16 */
-#define ATUR_PERF_PREV_1DAY_LOFS_FLAG		0x20000 /* BIT 17 */
-#define ATUR_PERF_PREV_1DAY_LOSS_FLAG		0x40000 /* BIT 18 */
-#define ATUR_PERF_PREV_1DAY_LPR_FLAG		0x80000 /* BIT 19 */
-#define ATUR_PERF_PREV_1DAY_ESS_FLAG		0x100000 /* BIT 20 */
-
-/* adslAtucIntervalTable Flags */
-#define ATUC_INTVL_LOF_FLAG		0x1	/* BIT 0th position */
-#define ATUC_INTVL_LOS_FLAG		0x2 	/* BIT 1 */
-#define ATUC_INTVL_ESS_FLAG		0x4	/* BIT 2 */
-#define ATUC_INTVL_INIT_FLAG		0x8   /* BIT 3 */
-#define ATUC_INTVL_VALID_DATA_FLAG 	0x10 /* BIT 4 */
-
-/* adslAturIntervalTable Flags */
-#define ATUR_INTVL_LOF_FLAG		0x1	/* BIT 0th position */
-#define ATUR_INTVL_LOS_FLAG		0x2 	/* BIT 1 */
-#define ATUR_INTVL_LPR_FLAG		0x4 	/* BIT 2 */
-#define ATUR_INTVL_ESS_FLAG		0x8	/* BIT 3 */
-#define ATUR_INTVL_VALID_DATA_FLAG 	0x10 /* BIT 4 */
-
-/* adslAtucChanPerfDataTable Flags */
-#define ATUC_CHAN_RECV_BLK_FLAG	0x01	/* BIT 0th position */
-#define ATUC_CHAN_TX_BLK_FLAG	0x02	/* BIT 1 */
-#define ATUC_CHAN_CORR_BLK_FLAG	0x04	/* BIT 2 */
-#define ATUC_CHAN_UNCORR_BLK_FLAG 0x08	/* BIT 3 */
-#define ATUC_CHAN_PERF_VALID_INTVL_FLAG 0x10 /* BIT 4 */
-#define ATUC_CHAN_PERF_INVALID_INTVL_FLAG 0x20 /* BIT 5 */
-#define ATUC_CHAN_PERF_CURR_15MIN_TIME_ELAPSED_FLAG 0x40 /* BIT 6 */
-#define ATUC_CHAN_PERF_CURR_15MIN_RECV_BLK_FLAG	0x80 /* BIT 7 */
-#define ATUC_CHAN_PERF_CURR_15MIN_TX_BLK_FLAG 0x100 /* BIT 8 */
-#define ATUC_CHAN_PERF_CURR_15MIN_CORR_BLK_FLAG 0x200 /* BIT 9 */
-#define ATUC_CHAN_PERF_CURR_15MIN_UNCORR_BLK_FLAG 0x400 /* BIT 10 */
-#define ATUC_CHAN_PERF_CURR_1DAY_TIME_ELAPSED_FLAG 0x800 /* BIT 11*/
-#define ATUC_CHAN_PERF_CURR_1DAY_RECV_BLK_FLAG 0x1000 /* BIT 12 */
-#define ATUC_CHAN_PERF_CURR_1DAY_TX_BLK_FLAG 0x2000 /* BIT 13 */
-#define ATUC_CHAN_PERF_CURR_1DAY_CORR_BLK_FLAG 0x4000 /* BIT 14 */
-#define ATUC_CHAN_PERF_CURR_1DAY_UNCORR_BLK_FLAG 0x8000 /* BIT 15 */
-#define ATUC_CHAN_PERF_PREV_1DAY_MONI_SEC_FLAG 0x10000 /* BIT 16 */
-#define ATUC_CHAN_PERF_PREV_1DAY_RECV_BLK_FLAG 0x20000 /* BIT 17 */
-#define ATUC_CHAN_PERF_PREV_1DAY_TX_BLK_FLAG 0x40000 /* BIT 18 */
-#define ATUC_CHAN_PERF_PREV_1DAY_CORR_BLK_FLAG 0x80000 /* BIT 19 */
-#define ATUC_CHAN_PERF_PREV_1DAY_UNCORR_BLK_FLAG 0x100000 /* BIT 20 */
-
-
-/* adslAturChanPerfDataTable Flags */
-#define ATUR_CHAN_RECV_BLK_FLAG   0x01 	/* BIT 0th position */ 
-#define ATUR_CHAN_RECV_BLK_FLAG_MAKECMV_LSW		makeCMV(H2D_CMV_READ, PLAM, 20, 0, 1, data)
-#define ATUR_CHAN_RECV_BLK_FLAG_MAKECMV_MSW		makeCMV(H2D_CMV_READ, PLAM, 21, 0, 1, data)
-#define ATUR_CHAN_TX_BLK_FLAG     0x02 	/* BIT 1 */
-#define ATUR_CHAN_TX_BLK_FLAG_MAKECMV_LSW		makeCMV(H2D_CMV_READ, PLAM, 20, 0, 1, data)
-#define ATUR_CHAN_TX_BLK_FLAG_MAKECMV_MSW		makeCMV(H2D_CMV_READ, PLAM, 21, 0, 1, data)
-#define ATUR_CHAN_CORR_BLK_FLAG   0x04 	/* BIT 2 */
-#define ATUR_CHAN_CORR_BLK_FLAG_MAKECMV_INTL		makeCMV(H2D_CMV_READ, PLAM, 3, 0, 1, data)
-#define ATUR_CHAN_CORR_BLK_FLAG_MAKECMV_FAST		makeCMV(H2D_CMV_READ, PLAM, 3, 1, 1, data)
-#define ATUR_CHAN_UNCORR_BLK_FLAG 0x08		/* BIT 3 */
-#define ATUR_CHAN_UNCORR_BLK_FLAG_MAKECMV_INTL		makeCMV(H2D_CMV_READ, PLAM, 2, 0, 1, data)
-#define ATUR_CHAN_UNCORR_BLK_FLAG_MAKECMV_FAST		makeCMV(H2D_CMV_READ, PLAM, 2, 1, 1, data)
-#define ATUR_CHAN_PERF_VALID_INTVL_FLAG   0x10 	/* BIT 4 */
-#define ATUR_CHAN_PERF_INVALID_INTVL_FLAG 0x20 	/* BIT 5 */
-#define ATUR_CHAN_PERF_CURR_15MIN_TIME_ELAPSED_FLAG 0x40 /* BIT 6 */
-#define ATUR_CHAN_PERF_CURR_15MIN_RECV_BLK_FLAG    0x80   /* BIT 7 */
-#define ATUR_CHAN_PERF_CURR_15MIN_TX_BLK_FLAG      0x100 /* BIT 8 */
-#define ATUR_CHAN_PERF_CURR_15MIN_CORR_BLK_FLAG    0x200 /* BIT 9 */
-#define ATUR_CHAN_PERF_CURR_15MIN_UNCORR_BLK_FLAG  0x400 /* BIT 10 */
-#define ATUR_CHAN_PERF_CURR_1DAY_TIME_ELAPSED_FLAG 0x800 /* BIT 11 */
-#define ATUR_CHAN_PERF_CURR_1DAY_RECV_BLK_FLAG     0x1000 /* BIT 12 */
-#define ATUR_CHAN_PERF_CURR_1DAY_TX_BLK_FLAG       0x2000 /* BIT 13 */
-#define ATUR_CHAN_PERF_CURR_1DAY_CORR_BLK_FLAG     0x4000 /* BIT 14 */
-#define ATUR_CHAN_PERF_CURR_1DAY_UNCORR_BLK_FLAG   0x8000 /* BIT 15 */
-#define ATUR_CHAN_PERF_PREV_1DAY_MONI_SEC_FLAG     0x10000 /* BIT 16 */
-#define ATUR_CHAN_PERF_PREV_1DAY_RECV_BLK_FLAG     0x20000 /* BIT 17 */
-#define ATUR_CHAN_PERF_PREV_1DAY_TRANS_BLK_FLAG    0x40000 /* BIT 18 */
-#define ATUR_CHAN_PERF_PREV_1DAY_CORR_BLK_FLAG     0x80000 /* BIT 19 */
-#define ATUR_CHAN_PERF_PREV_1DAY_UNCORR_BLK_FLAG   0x100000 /* BIT 20 */
-
-/* adslAtucChanIntervalTable Flags */
-#define ATUC_CHAN_INTVL_NUM_FLAG   	     	0x1 	/* BIT 0th position */
-#define ATUC_CHAN_INTVL_RECV_BLK_FLAG  		0x2 	/* BIT 1 */
-#define ATUC_CHAN_INTVL_TX_BLK_FLAG  		0x4	/* BIT 2 */
-#define ATUC_CHAN_INTVL_CORR_BLK_FLAG   	0x8 	/* BIT 3 */
-#define ATUC_CHAN_INTVL_UNCORR_BLK_FLAG   	0x10 	/* BIT 4 */
-#define ATUC_CHAN_INTVL_VALID_DATA_FLAG 	0x20 	/* BIT 5 */
-
-/* adslAturChanIntervalTable Flags */
-#define ATUR_CHAN_INTVL_NUM_FLAG   	     	0x1 	/* BIT 0th Position */
-#define ATUR_CHAN_INTVL_RECV_BLK_FLAG  		0x2 	/* BIT 1 */
-#define ATUR_CHAN_INTVL_TX_BLK_FLAG  		0x4	/* BIT 2 */
-#define ATUR_CHAN_INTVL_CORR_BLK_FLAG   	0x8 	/* BIT 3 */
-#define ATUR_CHAN_INTVL_UNCORR_BLK_FLAG   	0x10 	/* BIT 4 */
-#define ATUR_CHAN_INTVL_VALID_DATA_FLAG 	0x20 	/* BIT 5 */
-
-/* adslLineAlarmConfProfileTable Flags */
-#define ATUC_THRESH_15MIN_LOFS_FLAG   		0x01   /* BIT 0th position */
-#define ATUC_THRESH_15MIN_LOSS_FLAG   		0x02   /* BIT 1 */
-#define ATUC_THRESH_15MIN_ESS_FLAG      	0x04   /* BIT 2 */
-#define ATUC_THRESH_FAST_RATEUP_FLAG     	0x08   /* BIT 3 */
-#define ATUC_THRESH_INTERLEAVE_RATEUP_FLAG	0x10   /* BIT 4 */
-#define ATUC_THRESH_FAST_RATEDOWN_FLAG		0x20	 /* BIT 5 */
-#define ATUC_THRESH_INTERLEAVE_RATEDOWN_FLAG   	0x40	/* BIT 6 */
-#define ATUC_INIT_FAILURE_TRAP_ENABLE_FLAG	0x80 	/* BIT 7 */
-#define ATUR_THRESH_15MIN_LOFS_FLAG   		0x100  	/* BIT 8 */
-#define ATUR_THRESH_15MIN_LOSS_FLAG   		0x200  	/* BIT 9 */
-#define ATUR_THRESH_15MIN_LPRS_FLAG    		0x400  	/* BIT 10 */
-#define ATUR_THRESH_15MIN_ESS_FLAG      	0x800   	/* BIT 11 */
-#define ATUR_THRESH_FAST_RATEUP_FLAG     	0x1000  	/* BIT 12 */
-#define ATUR_THRESH_INTERLEAVE_RATEUP_FLAG	0x2000  	/* BIT 13 */
-#define ATUR_THRESH_FAST_RATEDOWN_FLAG     	0x4000 	/* BIT 14 */
-#define ATUR_THRESH_INTERLEAVE_RATEDOWN_FLAG	0x8000   	/* BIT 15 */
-#define LINE_ALARM_CONF_PROFILE_ROWSTATUS_FLAG  0x10000   	/* BIT 16 */
-
-
-/* adslAturTraps Flags */
-#define ATUC_PERF_LOFS_THRESH_FLAG   	     	0x1 	/* BIT 0th position */
-#define ATUC_PERF_LOSS_THRESH_FLAG  	 	0x2 	/* BIT 1 */
-#define ATUC_PERF_ESS_THRESH_FLAG  	 	0x4 	/* BIT 2 */
-#define ATUC_RATE_CHANGE_FLAG	  	 	0x8 	/* BIT 3 */
-#define ATUR_PERF_LOFS_THRESH_FLAG   	     	0x10 	/* BIT 4 */
-#define ATUR_PERF_LOSS_THRESH_FLAG  	 	0x20 	/* BIT 5 */
-#define ATUR_PERF_LPRS_THRESH_FLAG  	 	0x40 	/* BIT 6 */
-#define ATUR_PERF_ESS_THRESH_FLAG  	 	0x80 	/* BIT 7 */
-#define ATUR_RATE_CHANGE_FLAG	  	 	0x100	/* BIT 8 */
-
-//RFC- 3440 FLAG DEFINITIONS
-
-#ifdef AMAZON_MEI_MIB_RFC3440
-/* adslLineExtTable flags */
-#define ATUC_LINE_TRANS_CAP_FLAG	 	0x1		/* BIT 0th position */
-#define ATUC_LINE_TRANS_CAP_FLAG_MAKECMV	makeCMV(H2D_CMV_READ,INFO, 67, 0, 1, data)
-#define ATUC_LINE_TRANS_CONFIG_FLAG	 	0x2		/* BIT 1 */
-#define ATUC_LINE_TRANS_CONFIG_FLAG_MAKECMV	makeCMV(H2D_CMV_READ,INFO, 67, 0, 1, data)
-#define ATUC_LINE_TRANS_CONFIG_FLAG_MAKECMV_WR	makeCMV(H2D_CMV_WRITE,INFO, 67, 0, 1, data)
-#define ATUC_LINE_TRANS_ACTUAL_FLAG	 	0x4		/* BIT 2 */
-#define ATUC_LINE_TRANS_ACTUAL_FLAG_MAKECMV	makeCMV(H2D_CMV_READ,STAT, 1, 0, 1, data)
-#define LINE_GLITE_POWER_STATE_FLAG 	 	0x8		/* BIT 3 */
-#define LINE_GLITE_POWER_STATE_FLAG_MAKECMV	makeCMV(H2D_CMV_READ,STAT, 0, 0, 1, data) 
-
-/* adslAtucPerfDataExtTable flags */
-#define ATUC_PERF_STAT_FASTR_FLAG	   0x1 /* BIT 0th position */
-#define ATUC_PERF_STAT_FASTR_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, STAT, 0, 0, 1, data)
-#define ATUC_PERF_STAT_FAILED_FASTR_FLAG 0x2 /* BIT 1 */
-#define ATUC_PERF_STAT_FAILED_FASTR_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, STAT, 0, 0, 1, data)
-#define ATUC_PERF_STAT_SESL_FLAG 	   0X4	/* BIT 2 */
-#define ATUC_PERF_STAT_SESL_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, PLAM, 8, 0, 1, data)
-#define ATUC_PERF_STAT_UASL_FLAG		   0X8	/* BIT 3 */
-#define ATUC_PERF_STAT_UASL_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, PLAM, 10, 0, 1, data)
-#define ATUC_PERF_CURR_15MIN_FASTR_FLAG	   0X10	/* BIT 4 */
-#define ATUC_PERF_CURR_15MIN_FAILED_FASTR_FLAG 0X20	/* BIT 5 */
-#define ATUC_PERF_CURR_15MIN_SESL_FLAG	         0X40	/* BIT 6 */
-#define ATUC_PERF_CURR_15MIN_UASL_FLAG		    0X80	/* BIT 7 */
-#define ATUC_PERF_CURR_1DAY_FASTR_FLAG		    0X100	/* BIT 8 */
-#define ATUC_PERF_CURR_1DAY_FAILED_FASTR_FLAG	0X200	/* BIT 9 */
-#define ATUC_PERF_CURR_1DAY_SESL_FLAG			0X400	/* BIT 10 */
-#define ATUC_PERF_CURR_1DAY_UASL_FLAG			0X800	/* BIT 11 */
-#define ATUC_PERF_PREV_1DAY_FASTR_FLAG		     0X1000 /* BIT 12 */
-#define ATUC_PERF_PREV_1DAY_FAILED_FASTR_FLAG	0X2000 /* BIT 13 */
-#define ATUC_PERF_PREV_1DAY_SESL_FLAG			0X4000 /* BIT 14 */
-#define ATUC_PERF_PREV_1DAY_UASL_FLAG			0X8000 /* BIT 15 */
-
-/* adslAturPerfDataExtTable */
-#define ATUR_PERF_STAT_SESL_FLAG		0X1 /* BIT 0th position */
-#define ATUR_PERF_STAT_SESL_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, PLAM, 34, 0, 1, data)	
-#define ATUR_PERF_STAT_UASL_FLAG		0X2 /* BIT 1 */
-#define ATUR_PERF_STAT_UASL_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, PLAM, 36, 0, 1, data)
-#define ATUR_PERF_CURR_15MIN_SESL_FLAG		0X4 /* BIT 2 */
-#define ATUR_PERF_CURR_15MIN_UASL_FLAG		0X8 /* BIT 3 */
-#define ATUR_PERF_CURR_1DAY_SESL_FLAG		0X10 /* BIT 4 */
-#define ATUR_PERF_CURR_1DAY_UASL_FLAG		0X20 /* BIT 5 */
-#define ATUR_PERF_PREV_1DAY_SESL_FLAG		0X40 /* BIT 6 */
-#define ATUR_PERF_PREV_1DAY_UASL_FLAG		0X80 /* BIT 7 */
-
-/* adslAutcIntervalExtTable flags */
-#define ATUC_INTERVAL_FASTR_FLAG		0x1 /* Bit 0 */ 	
-#define ATUC_INTERVAL_FAILED_FASTR_FLAG		0x2 /* Bit 1 */ 	
-#define ATUC_INTERVAL_SESL_FLAG			0x4 /* Bit 2 */ 	
-#define ATUC_INTERVAL_UASL_FLAG			0x8 /* Bit 3 */ 	
-
-/* adslAturIntervalExtTable */
-#define ATUR_INTERVAL_SESL_FLAG		0X1 /* BIT 0th position */
-#define ATUR_INTERVAL_UASL_FLAG		0X2 /* BIT 1 */
-
-/* adslAlarmConfProfileExtTable */
-#define ATUC_THRESH_15MIN_FAILED_FASTR_FLAG 0X1/* BIT 0th position */
-#define ATUC_THRESH_15MIN_SESL_FLAG		 0X2 /* BIT 1 */
-#define ATUC_THRESH_15MIN_UASL_FLAG		 0X4 /* BIT 2 */
-#define ATUR_THRESH_15MIN_SESL_FLAG		 0X8 /* BIT 3 */
-#define ATUR_THRESH_15MIN_UASL_FLAG		 0X10 /* BIT 4 */
-
-/* adslAturExtTraps */
-#define ATUC_15MIN_FAILED_FASTR_TRAP_FLAG 	0X1 /* BIT 0th position */
-#define ATUC_15MIN_SESL_TRAP_FLAG		 0X2 /* BIT 1 */
-#define ATUC_15MIN_UASL_TRAP_FLAG		 0X4 /* BIT 2 */
-#define ATUR_15MIN_SESL_TRAP_FLAG		 0X8 /* BIT 3 */
-#define ATUR_15MIN_UASL_TRAP_FLAG		 0X10 /* BIT 4 */
-
-// 603221:tc.chen start 	
-/* adslLineStatus Flags */
-#define LINE_STAT_MODEM_STATUS_FLAG   	 0x1 /* BIT 0th position */
-#define LINE_STAT_MODEM_STATUS_FLAG_MAKECMV makeCMV(H2D_CMV_READ, STAT, 0, 0, 1, data)
-#define LINE_STAT_MODE_SEL_FLAG  	 0x2 /* BIT 1 */
-#define LINE_STAT_MODE_SEL_FLAG_MAKECMV makeCMV(H2D_CMV_READ, STAT, 1, 0, 1, data)
-#define LINE_STAT_TRELLCOD_ENABLE_FLAG 0x4 /* BIT 2 */
-#define LINE_STAT_TRELLCOD_ENABLE_FLAG_MAKECMV makeCMV(H2D_CMV_READ, OPTN, 2, 0, 1, data)
-#define LINE_STAT_LATENCY_FLAG	  	 0x8 /* BIT 3 */
-#define LINE_STAT_LATENCY_FLAG_MAKECMV makeCMV(H2D_CMV_READ, STAT, 12, 0, 1, data)
-
-/* adslLineRate Flags */
-#define LINE_RATE_DATA_RATEDS_FLAG   	0x1 /* BIT 0th position */
-#define LINE_RATE_DATA_RATEDS_FLAG_ADSL1_LP0_MAKECMV makeCMV(H2D_CMV_READ, RATE, 1, 0, 2, data)
-#define LINE_RATE_DATA_RATEDS_FLAG_ADSL1_LP1_MAKECMV makeCMV(H2D_CMV_READ, RATE, 1, 2, 2, data)
-
-
-#define LINE_RATE_DATA_RATEDS_FLAG_ADSL2_RP_LP0_MAKECMV makeCMV(H2D_CMV_READ, CNFG, 12, 0, 1, data)
-#define LINE_RATE_DATA_RATEDS_FLAG_ADSL2_MP_LP0_MAKECMV makeCMV(H2D_CMV_READ, CNFG, 13, 0, 1, data)
-#define LINE_RATE_DATA_RATEDS_FLAG_ADSL2_LP_LP0_MAKECMV makeCMV(H2D_CMV_READ, CNFG, 14, 0, 1, data)
-#define LINE_RATE_DATA_RATEDS_FLAG_ADSL2_TP_LP0_MAKECMV makeCMV(H2D_CMV_READ, CNFG, 15, 0, 1, data)
-#define LINE_RATE_DATA_RATEDS_FLAG_ADSL2_KP_LP0_MAKECMV makeCMV(H2D_CMV_READ, CNFG, 17, 0, 2, data)
-
-#define LINE_RATE_DATA_RATEDS_FLAG_ADSL2_RP_LP1_MAKECMV makeCMV(H2D_CMV_READ, CNFG, 12, 1, 1, data)
-#define LINE_RATE_DATA_RATEDS_FLAG_ADSL2_MP_LP1_MAKECMV makeCMV(H2D_CMV_READ, CNFG, 13, 1, 1, data)
-#define LINE_RATE_DATA_RATEDS_FLAG_ADSL2_LP_LP1_MAKECMV makeCMV(H2D_CMV_READ, CNFG, 14, 1, 1, data)
-#define LINE_RATE_DATA_RATEDS_FLAG_ADSL2_TP_LP1_MAKECMV makeCMV(H2D_CMV_READ, CNFG, 15, 1, 1, data)
-#define LINE_RATE_DATA_RATEDS_FLAG_ADSL2_KP_LP1_MAKECMV makeCMV(H2D_CMV_READ, CNFG, 17, 2, 2, data)
-
-#define LINE_RATE_DATA_RATEUS_FLAG  	0x2 /* BIT 1 */
-#define LINE_RATE_DATA_RATEUS_FLAG_ADSL1_LP0_MAKECMV makeCMV(H2D_CMV_READ, RATE, 0, 0, 2, data)
-#define LINE_RATE_DATA_RATEUS_FLAG_ADSL1_LP1_MAKECMV makeCMV(H2D_CMV_READ, RATE, 0, 2, 2, data)
-
-
-#define LINE_RATE_DATA_RATEUS_FLAG_ADSL2_RP_LP0_MAKECMV makeCMV(H2D_CMV_READ, CNFG, 23, 0, 1, data)
-#define LINE_RATE_DATA_RATEUS_FLAG_ADSL2_MP_LP0_MAKECMV makeCMV(H2D_CMV_READ, CNFG, 24, 0, 1, data)
-#define LINE_RATE_DATA_RATEUS_FLAG_ADSL2_LP_LP0_MAKECMV makeCMV(H2D_CMV_READ, CNFG, 25, 0, 1, data)
-#define LINE_RATE_DATA_RATEUS_FLAG_ADSL2_TP_LP0_MAKECMV makeCMV(H2D_CMV_READ, CNFG, 26, 0, 1, data)
-#define LINE_RATE_DATA_RATEUS_FLAG_ADSL2_KP_LP0_MAKECMV makeCMV(H2D_CMV_READ, CNFG, 28, 0, 2, data)
-
-#define LINE_RATE_DATA_RATEUS_FLAG_ADSL2_RP_LP1_MAKECMV makeCMV(H2D_CMV_READ, CNFG, 23, 1, 1, data)
-#define LINE_RATE_DATA_RATEUS_FLAG_ADSL2_MP_LP1_MAKECMV makeCMV(H2D_CMV_READ, CNFG, 24, 1, 1, data)
-#define LINE_RATE_DATA_RATEUS_FLAG_ADSL2_LP_LP1_MAKECMV makeCMV(H2D_CMV_READ, CNFG, 25, 1, 1, data)
-#define LINE_RATE_DATA_RATEUS_FLAG_ADSL2_TP_LP1_MAKECMV makeCMV(H2D_CMV_READ, CNFG, 26, 1, 1, data)
-#define LINE_RATE_DATA_RATEUS_FLAG_ADSL2_KP_LP1_MAKECMV makeCMV(H2D_CMV_READ, CNFG, 28, 2, 2, data)
-
-#define LINE_RATE_ATTNDRDS_FLAG  	0x4 /* BIT 2 */
-#define LINE_RATE_ATTNDRDS_FLAG_MAKECMV makeCMV(H2D_CMV_READ, INFO, 68, 4, 2, data)
-
-#define LINE_RATE_ATTNDRUS_FLAG	  	0x8 /* BIT 3 */
-#define LINE_RATE_ATTNDRUS_FLAG_MAKECMV makeCMV(H2D_CMV_READ, INFO, 69, 4, 2, data)
-
-/* adslLineInformation Flags */
-#define LINE_INFO_INTLV_DEPTHDS_FLAG	0x1 /* BIT 0th position */
-#define LINE_INFO_INTLV_DEPTHDS_FLAG_LP0_MAKECMV	makeCMV(H2D_CMV_READ, CNFG, 27, 0, 1, data)
-#define LINE_INFO_INTLV_DEPTHDS_FLAG_LP1_MAKECMV	makeCMV(H2D_CMV_READ, CNFG, 27, 1, 1, data)
-#define LINE_INFO_INTLV_DEPTHUS_FLAG	0x2 /* BIT 1 */
-#define LINE_INFO_INTLV_DEPTHUS_FLAG_LP0_MAKECMV	makeCMV(H2D_CMV_READ, CNFG, 16, 0, 1, data)
-#define LINE_INFO_INTLV_DEPTHUS_FLAG_LP1_MAKECMV	makeCMV(H2D_CMV_READ, CNFG, 16, 1, 1, data)
-#define LINE_INFO_LATNDS_FLAG		0x4 /* BIT 2 */
-#define LINE_INFO_LATNDS_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, INFO, 68, 1, 1, data)
-#define LINE_INFO_LATNUS_FLAG	  	0x8 /* BIT 3 */
-#define LINE_INFO_LATNUS_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, INFO, 69, 1, 1, data)
-#define LINE_INFO_SATNDS_FLAG   	 	0x10 /* BIT 4 */
-#define LINE_INFO_SATNDS_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, INFO, 68, 2, 1, data)
-#define LINE_INFO_SATNUS_FLAG  	 	0x20 /* BIT 5 */
-#define LINE_INFO_SATNUS_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, INFO, 69, 2, 1, data)
-#define LINE_INFO_SNRMNDS_FLAG  	 	0x40 /* BIT 6 */
-#define LINE_INFO_SNRMNDS_FLAG_ADSL1_MAKECMV	makeCMV(H2D_CMV_READ, INFO, 68, 3, 1, data)
-#define LINE_INFO_SNRMNDS_FLAG_ADSL2_MAKECMV	makeCMV(H2D_CMV_READ, RATE, 3, 0, 1, data)
-#define LINE_INFO_SNRMNDS_FLAG_ADSL2PLUS_MAKECMV	makeCMV(H2D_CMV_READ, PLAM, 46, 0, 1, data)
-#define LINE_INFO_SNRMNUS_FLAG  	 	0x80 /* BIT 7 */
-#define LINE_INFO_SNRMNUS_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, INFO, 69, 3, 1, data)
-#define LINE_INFO_ACATPDS_FLAG	  	0x100 /* BIT 8 */
-#define LINE_INFO_ACATPDS_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, INFO, 68, 6, 1, data)
-#define LINE_INFO_ACATPUS_FLAG	  	0x200 /* BIT 9 */
-#define LINE_INFO_ACATPUS_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, INFO, 69, 6, 1, data)
-
-/* adslNearEndPerformanceStats Flags */
-#define NEAREND_PERF_SUPERFRAME_FLAG_LSW_MAKECMV	makeCMV(H2D_CMV_READ, PLAM, 20, 0, 1, data)
-#define NEAREND_PERF_SUPERFRAME_FLAG_MSW_MAKECMV	makeCMV(H2D_CMV_READ, PLAM, 21, 0, 1, data)
-#define NEAREND_PERF_SUPERFRAME_FLAG	0x1 /* BIT 0th position */
-#define NEAREND_PERF_LOS_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, PLAM, 0, 0, 1, data)
-#define NEAREND_PERF_LOS_FLAG		0x2 /* BIT 1 */
-#define NEAREND_PERF_LOF_FLAG		0x4 /* BIT 2 */
-#define NEAREND_PERF_LPR_FLAG		0x8 /* BIT 3 */
-#define NEAREND_PERF_NCD_FLAG		0x10 /* BIT 4 */
-#define NEAREND_PERF_LCD_FLAG		0x20 /* BIT 5 */
-#define NEAREND_PERF_CRC_FLAG		0x40 /* BIT 6 */
-#define NEAREND_PERF_CRC_FLAG_LP0_MAKECMV	makeCMV(H2D_CMV_READ, PLAM, 2, 0, 1, data)
-#define NEAREND_PERF_CRC_FLAG_LP1_MAKECMV	makeCMV(H2D_CMV_READ, PLAM, 2, 1, 1, data)
-#define NEAREND_PERF_RSCORR_FLAG_LP0_MAKECMV	makeCMV(H2D_CMV_READ, PLAM, 3, 0, 1, data)
-#define NEAREND_PERF_RSCORR_FLAG_LP1_MAKECMV	makeCMV(H2D_CMV_READ, PLAM, 3, 1, 1, data)
-#define NEAREND_PERF_RSCORR_FLAG	0x80 /* BIT 7 */
-#define NEAREND_PERF_FECS_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, PLAM, 6, 0, 1, data)
-#define NEAREND_PERF_FECS_FLAG		0x100 /* BIT 8 */
-#define NEAREND_PERF_ES_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, PLAM, 7, 0, 1, data)
-#define NEAREND_PERF_ES_FLAG		0x200 /* BIT 9 */
-#define NEAREND_PERF_SES_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, PLAM, 8, 0, 1, data)
-#define NEAREND_PERF_SES_FLAG		0x400 /* BIT 10 */
-#define NEAREND_PERF_LOSS_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, PLAM, 9, 0, 1, data)
-#define NEAREND_PERF_LOSS_FLAG		0x800 /* BIT 11 */
-#define NEAREND_PERF_UAS_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, PLAM, 10, 0, 1, data)
-#define NEAREND_PERF_UAS_FLAG		0x1000 /* BIT 12 */
-#define NEAREND_PERF_HECERR_FLAG_BC0_MAKECMV	makeCMV(H2D_CMV_READ, PLAM, 11, 0, 2, data)
-#define NEAREND_PERF_HECERR_FLAG_BC1_MAKECMV	makeCMV(H2D_CMV_READ, PLAM, 11, 2, 2, data)
-#define NEAREND_PERF_HECERR_FLAG		0x2000 /* BIT 13 */
-
-/* adslFarEndPerformanceStats Flags */
-#define FAREND_PERF_LOS_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, PLAM, 1, 0, 1, data)
-#define FAREND_PERF_LOS_FLAG	0x1 /* BIT 0th position */
-#define FAREND_PERF_LOF_FLAG	0x2 /* BIT 1 */
-#define FAREND_PERF_LPR_FLAG	0x4 /* BIT 2 */
-#define FAREND_PERF_NCD_FLAG	0x8 /* BIT 3 */
-#define FAREND_PERF_LCD_FLAG	0x10 /* BIT 4 */
-#define FAREND_PERF_CRC_FLAG_LP0_MAKECMV	makeCMV(H2D_CMV_READ, PLAM, 24, 0, 1, data)
-#define FAREND_PERF_CRC_FLAG_LP1_MAKECMV	makeCMV(H2D_CMV_READ, PLAM, 24, 1, 1, data)
-#define FAREND_PERF_CRC_FLAG	0x20 /* BIT 5 */
-#define FAREND_PERF_RSCORR_FLAG_LP0_MAKECMV	makeCMV(H2D_CMV_READ, PLAM, 28, 0, 1, data)
-#define FAREND_PERF_RSCORR_FLAG_LP1_MAKECMV	makeCMV(H2D_CMV_READ, PLAM, 28, 1, 1, data)
-#define FAREND_PERF_RSCORR_FLAG	0x40 /* BIT 6 */
-#define FAREND_PERF_FECS_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, PLAM, 32, 0, 1, data)
-#define FAREND_PERF_FECS_FLAG	0x80 /* BIT 7 */
-#define FAREND_PERF_ES_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, PLAM, 33, 0, 1, data)
-#define FAREND_PERF_ES_FLAG	0x100 /* BIT 8 */
-#define FAREND_PERF_SES_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, PLAM, 34, 0, 1, data)
-#define FAREND_PERF_SES_FLAG	0x200 /* BIT 9 */
-#define FAREND_PERF_LOSS_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, PLAM, 35, 0, 1, data)
-#define FAREND_PERF_LOSS_FLAG	0x400 /* BIT 10 */
-#define FAREND_PERF_UAS_FLAG_MAKECMV	makeCMV(H2D_CMV_READ, PLAM, 36, 0, 1, data)
-#define FAREND_PERF_UAS_FLAG	0x800 /* BIT 11 */
-#define FAREND_PERF_HECERR_FLAG_BC0_MAKECMV	makeCMV(H2D_CMV_READ, PLAM, 37, 0, 2, data)
-#define FAREND_PERF_HECERR_FLAG_BC1_MAKECMV	makeCMV(H2D_CMV_READ, PLAM, 37, 2, 2, data)
-#define FAREND_PERF_HECERR_FLAG	0x1000 /* BIT 12 */
-// 603221:tc.chen end
-/* TR-69 related additional parameters - defines */
-/* Defines for  struct adslATURSubcarrierInfo */
-#define	NEAREND_HLINSC	0x1
-#define NEAREND_HLINSC_MAKECMV(mode)		makeCMV(mode, INFO, 71, 2, 1, data)
-#define	NEAREND_HLINPS	0x2
-#define NEAREND_HLINPS_MAKECMV(mode,idx,size)	makeCMV(mode, INFO, 73, idx, size, data)
-#define	NEAREND_HLOGMT	0x4
-#define NEAREND_HLOGMT_MAKECMV(mode)		makeCMV(mode, INFO, 80, 0, 1, data)
-#define NEAREND_HLOGPS	0x8
-#define NEAREND_HLOGPS_MAKECMV(mode,idx,size)	makeCMV(mode, INFO, 75, idx, size, data)
-#define NEAREND_QLNMT	0x10
-#define NEAREND_QLNMT_MAKECMV(mode)		makeCMV(mode, INFO, 80, 1, 1, data)
-#define	NEAREND_QLNPS	0x20
-#define NEAREND_QLNPS_MAKECMV(mode,idx,size)	makeCMV(mode, INFO, 77, idx, size, data)
-#define	NEAREND_SNRMT	0x40
-#define NEAREND_SNRMT_MAKECMV(mode)		makeCMV(mode, INFO, 80, 2, 1, data)
-#define	NEAREND_SNRPS	0x80
-#define NEAREND_SNRPS_MAKECMV(mode,idx,size)	makeCMV(mode, INFO, 78, idx, size, data)
-#define	NEAREND_BITPS	0x100
-#define NEAREND_BITPS_MAKECMV(mode,idx,size)	makeCMV(mode, INFO, 22, idx, size, data)
-#define	NEAREND_GAINPS	0x200
-#define NEAREND_GAINPS_MAKECMV(mode,idx,size)	makeCMV(mode, INFO, 24, idx, size, data)
-
-/* Defines for  struct adslATUCSubcarrierInfo */
-#define	 FAREND_HLINSC	0x1
-#define  FAREND_HLINSC_MAKECMV(mode)		makeCMV(mode, INFO, 70, 0, 1, data)
-#define	 FAREND_HLINPS	0x2
-#define  FAREND_HLINPS_MAKECMV(mode,idx,size)	makeCMV(mode, INFO, 72, idx, size, data)
-#define	 FAREND_HLOGMT	0x4
-#define  FAREND_HLOGMT_MAKECMV(mode)		makeCMV(mode, INFO, 79, 0, 1, data)
-#define  FAREND_HLOGPS	0x8
-#define  FAREND_HLOGPS_MAKECMV(mode,idx,size)	makeCMV(mode, INFO, 74, idx, size, data)
-#define  FAREND_QLNMT	0x10
-#define  FAREND_QLNMT_MAKECMV(mode)		makeCMV(mode, INFO, 79, 1, 1, data)
-#define	 FAREND_QLNPS	0x20
-#define  FAREND_QLNPS_MAKECMV(mode,idx,size)	makeCMV(mode, INFO, 76, idx, size, data)
-#define	 FAREND_SNRMT	0x40
-#define  FAREND_SNRMT_MAKECMV(mode)		makeCMV(mode, INFO, 79, 2, 1, data)
-#define	 FAREND_SNRPS	0x80
-#define  FAREND_SNRPS_MAKECMV(mode,idx,size)	makeCMV(mode, INFO, 10, idx, size, data)
-#define	 FAREND_BITPS	0x100
-#define  FAREND_BITPS_MAKECMV(mode,idx,size)	makeCMV(mode, INFO, 23, idx, size, data)
-#define	 FAREND_GAINPS	0x200
-#define  FAREND_GAINPS_MAKECMV(mode,idx,size)	makeCMV(mode, INFO, 25, idx, size, data)
-
-
-// GET_ADSL_POWER_SPECTRAL_DENSITY
-#define NOMPSD_US_MAKECMV	makeCMV(H2D_CMV_READ, INFO, 102, 0, 1, data)
-#define NOMPSD_DS_MAKECMV	makeCMV(H2D_CMV_READ, INFO, 102, 1, 1, data)
-#define PCB_US_MAKECMV		makeCMV(H2D_CMV_READ, INFO, 102, 6, 1, data)
-#define PCB_DS_MAKECMV		makeCMV(H2D_CMV_READ, INFO, 102, 7, 1, data)
-#define	RMSGI_US_MAKECMV	makeCMV(H2D_CMV_READ, INFO, 102, 10, 1, data)
-#define	RMSGI_DS_MAKECMV	makeCMV(H2D_CMV_READ, INFO, 102, 11, 1, data)
-
-
-#endif
-/////////////////////////////////////////////////Macro Definitions ? FLAG Setting & Testing
-
-#define SET_FLAG(flags, flag_val)   ((*flags) = ((*flags) | flag_val))
-//	-- This macro sets the flags with the flag_val. Here flags is passed as a pointer
-
-#define IS_FLAG_SET(flags, test_flag)	(((*flags) & (test_flag)) == (test_flag)? test_flag:0)
-// 	-- This macro verifies whether test_flag has been set in flags. Here flags is passed as a pointer
-
-
-#define CLR_FLAG(flags, flag_bit)	((*flags) = (*flags) & (~flag_bit))
-//	-- This macro resets the specified flag_bit in the flags. Here flags is passed as a pointer
-
-
-////////////////////////////////////////////////DATA STRUCTURES ORGANIZATION
-	
-//Here are the data structures used for accessing mib parameters. The ioctl call includes the third parameter as a void pointer. This parameter has to be type-casted in the driver code to the corresponding structure depending upon the command type. For Ex: consider the ioctl used to get the adslLineCode type, ioctl(fd,GET_ADSL_LINE_CODE,void *struct_adslLineTableEntry). In the driver code we check on the type of the command, i.e GET_ADSL_LINE_CODE and type-cast the void pointer to struct adslLineTableEntry type.
-	//
-#define u32 unsigned int
-#define u16 unsigned short
-#define s16 short
-#define u8 unsigned char
-
-
-typedef u32 AdslPerfTimeElapsed;
-typedef u32 AdslPerfPrevDayCount;
-typedef u32 PerfCurrentCount;
-typedef u32 PerfIntervalCount;
-typedef u32 AdslPerfCurrDayCount;
-
-
-//ioctl(int fd, GET_ADSL_LINE_CODE, void *struct_adslLineTableEntry)
-
-typedef struct adslLineTableEntry {
-	int ifIndex;
-	int adslLineCode;
-	u8 flags;
-} adslLineTableEntry;
-
-#ifdef AMAZON_MEI_MIB_RFC3440
-typedef struct adslLineExtTableEntry {
-	int ifIndex;
-	u16 adslLineTransAtucCap;
-	u16 adslLineTransAtucConfig;
-	u16 adslLineTransAtucActual;
-	int adslLineGlitePowerState;
-	u32 flags;
-}adslLineExtTableEntry;
-#endif
-//ioctl(int fd, GET_ADSL_ATUC_PHY, void  *struct_adslAtucPhysEntry)
-
-typedef struct adslVendorId {
-	u16	country_code;
-	u_char	provider_id[4];  /* Ascii characters */
-	u_char	revision_info[2];
-}adslVendorId;
-
-
-typedef struct adslAtucPhysEntry {
-	int ifIndex;
-	char serial_no[32];
-	union {
-		char vendor_id[16];
-		adslVendorId vendor_info;
-	} vendor_id;
-
-	char version_no[16];
-	u32 status;
-	int outputPwr;
-	u32 attainableRate;
-	u8 flags;
-} adslAtucPhysEntry;
-
-
-//ioctl(int fd, GET_ADSL_ATUR_PHY, void  *struct_adslAturPhysEntry)
-
-typedef struct adslAturPhysEntry {
-	int ifIndex;
-	char serial_no[32];
-	union {
-	char vendor_id[16];
-		adslVendorId vendor_info;
-	} vendor_id;
-	char version_no[16];
-	int SnrMgn;
-	u32 Attn;
-	u32 status;
-	int outputPwr;
-	u32 attainableRate;
-	u8 flags;
-} adslAturPhysEntry;
-
-
-//ioctl(int fd, GET_ADSL_ATUC_CHAN_INFO, void *struct_adslAtucChanInfo)
-
-typedef struct adslAtucChanInfo {
-	int ifIndex;
- 	u32 interleaveDelay;
-	u32 currTxRate;
-	u32 prevTxRate;
-	u8 flags;
-} adslAtucChanInfo;
-
-
-//ioctl(int fd, GET_ADSL_ATUR_CHAN_INFO, void *struct_adslAturChanInfo)
-
-typedef struct adslAturChanInfo {
-	int ifIndex;
- 	u32 interleaveDelay;
- 	u32 currTxRate;
- 	u32 prevTxRate;
- 	u32 crcBlkLen;
- 	u8 flags;
-} adslAturChanInfo;
-
-
-//ioctl(int fd, GET_ADSL_ATUC_PERF_DATA,  void *struct_atucPerfDataEntry)
-
-typedef struct atucPerfDataEntry
-{
-   int			ifIndex;
-   u32 			adslAtucPerfLofs;             
-   u32 			adslAtucPerfLoss;             
-   u32 			adslAtucPerfESs;                 
-   u32 			adslAtucPerfInits;
-   int         		adslAtucPerfValidIntervals;
-   int         		adslAtucPerfInvalidIntervals;
-   AdslPerfTimeElapsed 	adslAtucPerfCurr15MinTimeElapsed;
-   PerfCurrentCount 	adslAtucPerfCurr15MinLofs;
-   PerfCurrentCount 	adslAtucPerfCurr15MinLoss;
-   PerfCurrentCount 	adslAtucPerfCurr15MinESs;
-   PerfCurrentCount 	adslAtucPerfCurr15MinInits;
-   AdslPerfTimeElapsed 	adslAtucPerfCurr1DayTimeElapsed;
-   AdslPerfCurrDayCount adslAtucPerfCurr1DayLofs;
-   AdslPerfCurrDayCount adslAtucPerfCurr1DayLoss;
-   AdslPerfCurrDayCount adslAtucPerfCurr1DayESs;
-   AdslPerfCurrDayCount adslAtucPerfCurr1DayInits;
-   int         		adslAtucPerfPrev1DayMoniSecs;
-   AdslPerfPrevDayCount adslAtucPerfPrev1DayLofs;
-   AdslPerfPrevDayCount adslAtucPerfPrev1DayLoss;
-   AdslPerfPrevDayCount adslAtucPerfPrev1DayESs;
-   AdslPerfPrevDayCount adslAtucPerfPrev1DayInits;
-   u32			flags;
-} atucPerfDataEntry;
-
-#ifdef AMAZON_MEI_MIB_RFC3440
-typedef struct atucPerfDataExtEntry
- {
-  int ifIndex;
-  u32 adslAtucPerfStatFastR;
-  u32 adslAtucPerfStatFailedFastR;
-  u32 adslAtucPerfStatSesL;
-  u32 adslAtucPerfStatUasL;
-  u32 adslAtucPerfCurr15MinFastR;
-  u32 adslAtucPerfCurr15MinFailedFastR;
-  u32 adslAtucPerfCurr15MinSesL;
-  u32 adslAtucPerfCurr15MinUasL;
-  u32 adslAtucPerfCurr1DayFastR;
-  u32 adslAtucPerfCurr1DayFailedFastR;
-  u32 adslAtucPerfCurr1DaySesL;
-  u32 adslAtucPerfCurr1DayUasL;
-  u32 adslAtucPerfPrev1DayFastR;
-  u32 adslAtucPerfPrev1DayFailedFastR;
-  u32 adslAtucPerfPrev1DaySesL;
-  u32 adslAtucPerfPrev1DayUasL;
-  u32	flags;
-} atucPerfDataExtEntry; 
-
-#endif
-//ioctl(int fd, GET_ADSL_ATUR_PERF_DATA, void *struct_aturPerfDataEntry)
-
-typedef struct aturPerfDataEntry
-{
-   int			ifIndex;
-   u32 			adslAturPerfLofs;             
-   u32 			adslAturPerfLoss;             
-   u32 			adslAturPerfLprs;                 
-   u32 			adslAturPerfESs;
-   int         		adslAturPerfValidIntervals;
-   int         		adslAturPerfInvalidIntervals;
-   AdslPerfTimeElapsed 	adslAturPerfCurr15MinTimeElapsed;
-   PerfCurrentCount 	adslAturPerfCurr15MinLofs;
-   PerfCurrentCount 	adslAturPerfCurr15MinLoss;
-   PerfCurrentCount 	adslAturPerfCurr15MinLprs;
-   PerfCurrentCount 	adslAturPerfCurr15MinESs;
-   AdslPerfTimeElapsed 	adslAturPerfCurr1DayTimeElapsed;
-   AdslPerfCurrDayCount adslAturPerfCurr1DayLofs;
-   AdslPerfCurrDayCount adslAturPerfCurr1DayLoss;
-   AdslPerfCurrDayCount adslAturPerfCurr1DayLprs;
-   AdslPerfCurrDayCount adslAturPerfCurr1DayESs;
-   int         		adslAturPerfPrev1DayMoniSecs;
-   AdslPerfPrevDayCount adslAturPerfPrev1DayLofs;
-   AdslPerfPrevDayCount adslAturPerfPrev1DayLoss;
-   AdslPerfPrevDayCount adslAturPerfPrev1DayLprs;
-   AdslPerfPrevDayCount adslAturPerfPrev1DayESs;
-   u32			flags;
-} aturPerfDataEntry;
-
-#ifdef AMAZON_MEI_MIB_RFC3440
-typedef struct aturPerfDataExtEntry
- {
-  int ifIndex;
-  u32 adslAturPerfStatSesL;
-  u32 adslAturPerfStatUasL;
-  u32 adslAturPerfCurr15MinSesL;
-  u32 adslAturPerfCurr15MinUasL;
-  u32 adslAturPerfCurr1DaySesL;
-  u32 adslAturPerfCurr1DayUasL;
-  u32 adslAturPerfPrev1DaySesL;
-  u32 adslAturPerfPrev1DayUasL;
-  u32	flags;
-} aturPerfDataExtEntry;
-#endif
-//ioctl(int fd, GET_ADSL_ATUC_INTVL_INFO, void *struct_adslAtucInvtInfo)
-
-typedef struct adslAtucIntvlInfo {
-	int ifIndex;
-        int IntervalNumber;
- 	PerfIntervalCount intervalLOF;
- 	PerfIntervalCount intervalLOS;
-  	PerfIntervalCount intervalES;
- 	PerfIntervalCount intervalInits; 
-	int intervalValidData;
- 	u8 flags;
-} adslAtucIntvlInfo;
-
-#ifdef AMAZON_MEI_MIB_RFC3440
-typedef struct adslAtucInvtlExtInfo
- {
-  int ifIndex;
-  int IntervalNumber;
-  u32 adslAtucIntervalFastR;
-  u32 adslAtucIntervalFailedFastR;
-  u32 adslAtucIntervalSesL;
-  u32 adslAtucIntervalUasL;
-  u32	flags;
-} adslAtucInvtlExtInfo;
-#endif
-//ioctl(int fd, GET_ADSL_ATUR_INTVL_INFO, void *struct_adslAturInvtlInfo)
-
-typedef struct adslAturIntvlInfo {
-	int ifIndex;
-        int IntervalNumber;
- 	PerfIntervalCount intervalLOF;
- 	PerfIntervalCount intervalLOS;
- 	PerfIntervalCount intervalLPR;
-  	PerfIntervalCount intervalES;
- 	int intervalValidData;
- 	u8 flags;
-} adslAturIntvlInfo;
-
-#ifdef AMAZON_MEI_MIB_RFC3440
-typedef struct adslAturInvtlExtInfo
- {
-  int ifIndex;
-  int IntervalNumber;
-  u32 adslAturIntervalSesL;
-  u32 adslAturIntervalUasL;
-  u32	flags;
-} adslAturInvtlExtInfo;
-#endif
-//ioctl(int fd, GET_ADSL_ATUC_CHAN_PERF_DATA,  void *struct_atucChannelPerfDataEntry)
-
-typedef struct atucChannelPerfDataEntry
-{
-   int			ifIndex;
-   u32 			adslAtucChanReceivedBlks;             
-   u32 			adslAtucChanTransmittedBlks;             
-   u32 			adslAtucChanCorrectedBlks;                 
-   u32 			adslAtucChanUncorrectBlks;
-   int         		adslAtucChanPerfValidIntervals;
-   int         		adslAtucChanPerfInvalidIntervals;
-   AdslPerfTimeElapsed 	adslAtucChanPerfCurr15MinTimeElapsed;
-   PerfCurrentCount 	adslAtucChanPerfCurr15MinReceivedBlks;
-   PerfCurrentCount 	adslAtucChanPerfCurr15MinTransmittedBlks;
-   PerfCurrentCount 	adslAtucChanPerfCurr15MinCorrectedBlks;
-   PerfCurrentCount 	adslAtucChanPerfCurr15MinUncorrectBlks;
-   AdslPerfTimeElapsed  adslAtucChanPerfCurr1DayTimeElapsed;
-   AdslPerfCurrDayCount adslAtucChanPerfCurr1DayReceivedBlks;
-   AdslPerfCurrDayCount adslAtucChanPerfCurr1DayTransmittedBlks;
-   AdslPerfCurrDayCount adslAtucChanPerfCurr1DayCorrectedBlks;
-   AdslPerfCurrDayCount adslAtucChanPerfCurr1DayUncorrectBlks;
-   int                  adslAtucChanPerfPrev1DayMoniSecs;
-   AdslPerfPrevDayCount adslAtucChanPerfPrev1DayReceivedBlks;
-   AdslPerfPrevDayCount adslAtucChanPerfPrev1DayTransmittedBlks;
-   AdslPerfPrevDayCount adslAtucChanPerfPrev1DayCorrectedBlks;
-   AdslPerfPrevDayCount adslAtucChanPerfPrev1DayUncorrectBlks;
-   u32			flags;
-}atucChannelPerfDataEntry;
-
-
-//ioctl(int fd, GET_ADSL_ATUR_CHAN_PERF_DATA,  void *struct_aturChannelPerfDataEntry)
-
-typedef struct aturChannelPerfDataEntry
-{
-   int			ifIndex;
-   u32 			adslAturChanReceivedBlks;             
-   u32 			adslAturChanTransmittedBlks;             
-   u32 			adslAturChanCorrectedBlks;                 
-   u32 			adslAturChanUncorrectBlks;
-   int         		adslAturChanPerfValidIntervals;
-   int         		adslAturChanPerfInvalidIntervals;
-   AdslPerfTimeElapsed 	adslAturChanPerfCurr15MinTimeElapsed;
-   PerfCurrentCount 	adslAturChanPerfCurr15MinReceivedBlks;
-   PerfCurrentCount 	adslAturChanPerfCurr15MinTransmittedBlks;
-   PerfCurrentCount 	adslAturChanPerfCurr15MinCorrectedBlks;
-   PerfCurrentCount 	adslAturChanPerfCurr15MinUncorrectBlks;
-   AdslPerfTimeElapsed  adslAturChanPerfCurr1DayTimeElapsed;
-   AdslPerfCurrDayCount adslAturChanPerfCurr1DayReceivedBlks;
-   AdslPerfCurrDayCount adslAturChanPerfCurr1DayTransmittedBlks;
-   AdslPerfCurrDayCount adslAturChanPerfCurr1DayCorrectedBlks;
-   AdslPerfCurrDayCount adslAturChanPerfCurr1DayUncorrectBlks;
-   int                  adslAturChanPerfPrev1DayMoniSecs;
-   AdslPerfPrevDayCount adslAturChanPerfPrev1DayReceivedBlks;
-   AdslPerfPrevDayCount adslAturChanPerfPrev1DayTransmittedBlks;
-   AdslPerfPrevDayCount adslAturChanPerfPrev1DayCorrectedBlks;
-   AdslPerfPrevDayCount adslAturChanPerfPrev1DayUncorrectBlks;
-   u32			flags;
-} aturChannelPerfDataEntry;
-
-
-//ioctl(int fd, GET_ADSL_ATUC_CHAN_INTVL_INFO, void *struct_adslAtucChanIntvlInfo)
-
-typedef struct adslAtucChanIntvlInfo {
-	int ifIndex;
-        int IntervalNumber;
- 	PerfIntervalCount chanIntervalRecvdBlks;
- 	PerfIntervalCount chanIntervalXmitBlks;
-  	PerfIntervalCount chanIntervalCorrectedBlks;
- 	PerfIntervalCount chanIntervalUncorrectBlks;
- 	int intervalValidData;
- 	u8 flags;
-} adslAtucChanIntvlInfo;
-
-
-//ioctl(int fd, GET_ADSL_ATUR_CHAN_INTVL_INFO, void *struct_adslAturChanIntvlInfo)
-
-typedef struct adslAturChanIntvlInfo {
-	int ifIndex;
-        int IntervalNumber;
- 	PerfIntervalCount chanIntervalRecvdBlks;
- 	PerfIntervalCount chanIntervalXmitBlks;
-  	PerfIntervalCount chanIntervalCorrectedBlks;
- 	PerfIntervalCount chanIntervalUncorrectBlks;
- 	int intervalValidData;
-	u8 flags;
-} adslAturChanIntvlInfo;
-
-
-//ioctl(int fd, GET_ADSL_ALRM_CONF_PROF,  void *struct_adslLineAlarmConfProfileEntry)
-//ioctl(int fd, SET_ADSL_ALRM_CONF_PROF,  void *struct_adslLineAlarmConfProfileEntry)
-
-typedef struct  adslLineAlarmConfProfileEntry
- {
-  unsigned char adslLineAlarmConfProfileName[32];
-    int 	adslAtucThresh15MinLofs;
-    int 	adslAtucThresh15MinLoss;
-    int 	adslAtucThresh15MinESs;
-    u32 	adslAtucThreshFastRateUp;
-    u32 	adslAtucThreshInterleaveRateUp;
-    u32 	adslAtucThreshFastRateDown;
-    u32 	adslAtucThreshInterleaveRateDown;
-    int 	adslAtucInitFailureTrapEnable;
-    int 	adslAturThresh15MinLofs;
-    int 	adslAturThresh15MinLoss;
-    int 	adslAturThresh15MinLprs;
-    int 	adslAturThresh15MinESs;
-    u32 	adslAturThreshFastRateUp;
-    u32 	adslAturThreshInterleaveRateUp;
-    u32 	adslAturThreshFastRateDown;
-    u32 	adslAturThreshInterleaveRateDown;
-    int 	adslLineAlarmConfProfileRowStatus;
-    u32	flags;
-} adslLineAlarmConfProfileEntry;
-
-#ifdef AMAZON_MEI_MIB_RFC3440
-typedef struct adslLineAlarmConfProfileExtEntry
- {
-  u8  adslLineAlarmConfProfileExtName[32];
-  u32 adslAtucThreshold15MinFailedFastR;
-  u32 adslAtucThreshold15MinSesL;
-  u32 adslAtucThreshold15MinUasL;
-  u32 adslAturThreshold15MinSesL;
-  u32 adslAturThreshold15MinUasL;
-  u32	flags;
-} adslLineAlarmConfProfileExtEntry;
-#endif
-//TRAPS
-
-// 603221:tc.chen start
-/* The following Data Sturctures are added to support the WEB related parameters for ADSL Statistics */
-typedef struct  adslLineStatus
- {
-    int 	adslModemStatus;
-    u32 	adslModeSelected;
-    int 	adslAtucThresh15MinESs;
-    int 	adslTrellisCodeEnable;
-    int 	adslLatency;
-    u8 flags;
- } adslLineStatusInfo;
-
-typedef struct  adslLineRate
- {
-    u32 	adslDataRateds;
-    u32 	adslDataRateus;
-    u32 	adslATTNDRds;	
-    u32 	adslATTNDRus;	
-    u8		flags;
- } adslLineRateInfo;
-
-typedef struct  adslLineInfo
- {
-    u32 	adslInterleaveDepthds;
-    u32 	adslInterleaveDepthus;
-    u32 	adslLATNds;
-    u32 	adslLATNus;
-    u32 	adslSATNds;
-    u32 	adslSATNus;
-    int	 	adslSNRMds;
-    int	 	adslSNRMus;
-    int	 	adslACATPds;
-    int		adslACATPus;
-    u32	flags;
- } adslLineInfo;
-
-typedef struct  adslNearEndPerfStats
- {
-    u32 	adslSuperFrames; 
-    u32 	adslneLOS;
-    u32 	adslneLOF;
-    u32 	adslneLPR;
-    u32 	adslneNCD;
-    u32 	adslneLCD;
-    u32 	adslneCRC;
-    u32		adslneRSCorr;
-    u32		adslneFECS;
-    u32		adslneES;
-    u32		adslneSES;
-    u32		adslneLOSS;
-    u32		adslneUAS;
-    u32		adslneHECErrors;
-    u32		flags;
- } adslNearEndPerfStats;
-
-typedef struct  adslFarEndPerfStats
- {
-    u32 	adslfeLOS;
-    u32 	adslfeLOF;
-    u32 	adslfeLPR;
-    u32 	adslfeNCD;
-    u32 	adslfeLCD;
-    u32 	adslfeCRC;
-    u32		adslfeRSCorr;
-    u32		adslfeFECS;
-    u32		adslfeES;
-    u32		adslfeSES;
-    u32		adslfeLOSS;
-    u32		adslfeUAS;
-    u32		adslfeHECErrors;
-    u32		flags;
- } adslFarEndPerfStats;
-// 603221:tc.chen end
-
-/* The number of tones (and hence indexes) is dependent on the ADSL mode - G.992.1, G.992.2, G.992.3, * G.992.4 and G.992.5 */
-typedef struct adslATURSubcarrierInfo {
-	int 	ifindex;
-	u16	HLINSCds;
-	u16	HLINpsds[1024];/* Even index = real part; Odd Index
-				    = imaginary part for each tone */
-	u16	HLOGMTds;
-	u16	HLOGpsds[512];
-	u16	QLNMTds;
-	u16	QLNpsds[512];
-	u16	SNRMTds;
-	u16	SNRpsds[512];  
-	u16	BITpsds[512];
-	u16	GAINpsds[512];
-	u16	flags;
-}adslATURSubcarrierInfo;
-
-typedef struct adslATUCSubcarrierInfo {
-	int 	ifindex;
-	u16	HLINSCus;
-	u16	HLINpsus[128];/* Even index = real part; Odd Index
-				    = imaginary part for each tone */
-	u16	HLOGMTus;
-	u16	HLOGpsus[64];
-	u16	QLNMTus;
-	u16	QLNpsus[64]; 
-	u16	SNRMTus;
-	u16 	SNRpsus[64];  
-	u16	BITpsus[64];
-	u16	GAINpsus[64];
-	u16	flags;
-}adslATUCSubcarrierInfo;
-
-#ifndef u_int16
-#define u_int16 u16
-#endif
-
-typedef struct adslInitStats {
-	u_int16	FullInitializationCount;
-	u_int16 FailedFullInitializationCount;
-	u_int16 LINIT_Errors;
-	u_int16	Init_Timeouts;
-}adslInitStats;
-
-typedef struct adslPowerSpectralDensity {
-	int	ACTPSDds;
-	int 	ACTPSDus;
-}adslPowerSpectralDensity;
-
-
-//ioctl(int fd, ADSL_ATUR_TRAPS, void  *uint16_flags)
-typedef union structpts {
-	adslLineTableEntry * adslLineTableEntry_pt;
-	adslAtucPhysEntry * adslAtucPhysEntry_pt;
-	adslAturPhysEntry * adslAturPhysEntry_pt;
-	adslAtucChanInfo * adslAtucChanInfo_pt;
-	adslAturChanInfo * adslAturChanInfo_pt;
-	atucPerfDataEntry * atucPerfDataEntry_pt;
-	aturPerfDataEntry * aturPerfDataEntry_pt;
-	adslAtucIntvlInfo * adslAtucIntvlInfo_pt;
-	adslAturIntvlInfo * adslAturIntvlInfo_pt;
-	atucChannelPerfDataEntry * atucChannelPerfDataEntry_pt;
-	aturChannelPerfDataEntry * aturChannelPerfDataEntry_pt;
-	adslAtucChanIntvlInfo * adslAtucChanIntvlInfo_pt;
-	adslAturChanIntvlInfo * adslAturChanIntvlInfo_pt;
-	adslLineAlarmConfProfileEntry * adslLineAlarmConfProfileEntry_pt;
-	// RFC 3440
-	
-    #ifdef AMAZON_MEI_MIB_RFC3440
-	adslLineExtTableEntry * adslLineExtTableEntry_pt;
-	atucPerfDataExtEntry * atucPerfDataExtEntry_pt;
-	adslAtucInvtlExtInfo * adslAtucInvtlExtInfo_pt;
-	aturPerfDataExtEntry * aturPerfDataExtEntry_pt;
-	adslAturInvtlExtInfo * adslAturInvtlExtInfo_pt;
-	adslLineAlarmConfProfileExtEntry * adslLineAlarmConfProfileExtEntry_pt;
-    #endif 
-// 603221:tc.chen start
-    	adslLineStatusInfo	* adslLineStatusInfo_pt;
-    	adslLineRateInfo	* adslLineRateInfo_pt;
-    	adslLineInfo		* adslLineInfo_pt;
-    	adslNearEndPerfStats	* adslNearEndPerfStats_pt;
-    	adslFarEndPerfStats	* adslFarEndPerfStats_pt;
-// 603221:tc.chen end
-	adslATUCSubcarrierInfo  * adslATUCSubcarrierInfo_pt;
-	adslATURSubcarrierInfo  * adslATURSubcarrierInfo_pt;
-	adslPowerSpectralDensity * adslPowerSpectralDensity_pt;
-}structpts;
-
-#endif /* ] __AMAZON_MEI_APP_IOCTL_H */
diff --git a/target/linux/amazon/files/include/asm-mips/amazon/amazon_mei_ioctl.h b/target/linux/amazon/files/include/asm-mips/amazon/amazon_mei_ioctl.h
deleted file mode 100644
index 02a150eac..000000000
--- a/target/linux/amazon/files/include/asm-mips/amazon/amazon_mei_ioctl.h
+++ /dev/null
@@ -1,757 +0,0 @@
-//509221:tc.chen 2005/09/22 Reset DFE added when MEI_TO_ARC_CS_DONE not cleared by ARC and Added AMAZON_MEI_DEBUG_MODE ioctl 
-#ifndef         _AMAZON_MEI_IOCTL_H
-#define        	_AMAZON_MEI_IOCTL_H
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-#define PCM_BUFF_SIZE		1024 //bytes
-//  interrupt numbers
-
-#ifndef		_AMAZON_ADSL_APP
-
-typedef struct pcm_data_struct{
-	u16 S;
-	u16 temp;
-	u16 LSW;
-	u16 MSW;
-	u16 len;
-	u16 rdindex;
-	u16 wrindex;
-	u16 flow;
-	
-	int finish;
-	u8 buff[PCM_BUFF_SIZE];	
-	int point;
-}pcm_data_struct;
-
-typedef struct amazon_clreoc_pkt{
-	struct list_head list;
-	u8 * command;		//point to clreoc command data
-	int len;		//command length
-}amazon_clreoc_pkt;
-
-// Number of intervals
-#define INTERVAL_NUM					192 //two days
-typedef struct amazon_mei_mib{
-	struct list_head list;
-	struct timeval start_time;	//start of current interval
-	
-	int AtucPerfLof;
-	int AtucPerfLos;
-	int AtucPerfEs;
-	int AtucPerfInit;
-	
-	int AturPerfLof;
-	int AturPerfLos;
-	int AturPerfLpr;
-	int AturPerfEs;
-	
-	int AturChanPerfRxBlk;
-	int AturChanPerfTxBlk;
-	int AturChanPerfCorrBlk;
-	int AturChanPerfUncorrBlk;
-	
-	//RFC-3440
-	int AtucPerfStatFastR;
-	int AtucPerfStatFailedFastR;
-	int AtucPerfStatSesL;
-	int AtucPerfStatUasL;
-	int AturPerfStatSesL;
-	int AturPerfStatUasL;
-}amazon_mei_mib;
-
-typedef struct adslChanPrevTxRate{
-	u32 adslAtucChanPrevTxRate;
-	u32 adslAturChanPrevTxRate;
-}adslChanPrevTxRate;
-
-typedef struct adslPhysCurrStatus{
-	u32 adslAtucCurrStatus;
-	u32 adslAturCurrStatus;
-}adslPhysCurrStatus;
-
-typedef struct ChanType{
-	int interleave;
-	int fast;
-// 603221:tc.chen start
-	int bearchannel0;
-	int bearchannel1;
-// 603221:tc.chen end
-}ChanType;
-
-typedef struct mib_previous_read{
-	u16 ATUC_PERF_ESS;
-	u16 ATUR_PERF_ESS;
-	u32 ATUR_CHAN_RECV_BLK;
-	u16 ATUR_CHAN_CORR_BLK_INTL;
-	u16 ATUR_CHAN_CORR_BLK_FAST;
-	u16 ATUR_CHAN_UNCORR_BLK_INTL;
-	u16 ATUR_CHAN_UNCORR_BLK_FAST;
-	u16 ATUC_PERF_STAT_FASTR;
-	u16 ATUC_PERF_STAT_FAILED_FASTR;
-	u16 ATUC_PERF_STAT_SESL;
-	u16 ATUC_PERF_STAT_UASL;
-	u16 ATUR_PERF_STAT_SESL;
-}mib_previous_read;
-
-typedef struct mib_flags_pretime{
-	struct timeval ATUC_PERF_LOSS_PTIME;
-	struct timeval ATUC_PERF_LOFS_PTIME;
-	struct timeval ATUR_PERF_LOSS_PTIME;
-	struct timeval ATUR_PERF_LOFS_PTIME;
-	struct timeval ATUR_PERF_LPR_PTIME;
-}mib_flags_pretime;
-
-                //  cmv message structures
-#define	MP_PAYLOAD_SIZE         			12
-typedef	struct mpmessage{
-	u16	iFunction;
-	u16	iGroup;
-	u16	iAddress;
-	u16	iIndex;
-	u16	iPayload[MP_PAYLOAD_SIZE];
-}MPMessage;
-#endif
-
-
-typedef struct meireg{
-	u32 iAddress;
-	u32 iData;
-}meireg;
-
-#define MEIDEBUG_BUFFER_SIZES 50
-typedef struct meidebug{
-	u32 iAddress;
-	u32 iCount;
-	u32 buffer[MEIDEBUG_BUFFER_SIZES];
-}meidebug;
-
-//==============================================================================
-// Group definitions                                                              
-//==============================================================================
-#define OPTN                    5
-#define CNFG                    8
-#define CNTL                    1
-#define STAT                    2
-#define RATE                    6
-#define PLAM                    7
-#define INFO                    3
-#define TEST			4
-//==============================================================================
-// Opcode definitions
-//==============================================================================
-#define H2D_CMV_READ                            0x00
-#define H2D_CMV_WRITE                           0x04
-#define H2D_CMV_INDICATE_REPLY                  0x10
-#define H2D_ERROR_OPCODE_UNKNOWN          	0x20
-#define H2D_ERROR_CMV_UNKNOWN                	0x30
-
-#define D2H_CMV_READ_REPLY                     	0x01
-#define D2H_CMV_WRITE_REPLY                     0x05
-#define D2H_CMV_INDICATE                        0x11
-#define D2H_ERROR_OPCODE_UNKNOWN                0x21
-#define D2H_ERROR_CMV_UNKNOWN                   0x31
-#define D2H_ERROR_CMV_READ_NOT_AVAILABLE        0x41
-#define D2H_ERROR_CMV_WRITE_ONLY                0x51
-#define D2H_ERROR_CMV_READ_ONLY                 0x61
-
-#define H2D_DEBUG_READ_DM                       0x02
-#define H2D_DEBUG_READ_PM                       0x06
-#define H2D_DEBUG_WRITE_DM                      0x0a
-#define H2D_DEBUG_WRITE_PM                      0x0e
-
-#define D2H_DEBUG_READ_DM_REPLY         	0x03
-#define D2H_DEBUG_READ_FM_REPLY         	0x07
-#define D2H_DEBUG_WRITE_DM_REPLY        	0x0b
-#define D2H_DEBUG_WRITE_FM_REPLY        	0x0f
-#define D2H_ERROR_ADDR_UNKNOWN          	0x33
-
-#define D2H_AUTONOMOUS_MODEM_READY_MSG		0xf1
-//==============================================================================
-// INFO register address field definitions
-//==============================================================================
-
-#define INFO_TxState					0
-#define INFO_RxState					1
-#define INFO_TxNextState				2
-#define INFO_RxNextState				3
-#define INFO_TxStateJumpFrom			        4
-#define INFO_RxStateJumpFrom			        5
-
-#define INFO_ReverbSnrBuf				8
-#define INFO_ReverbEchoSnrBuf			        9
-#define INFO_MedleySnrBuf				10
-#define INFO_RxShowtimeSnrBuf		              	11
-#define INFO_DECdelay					12
-#define INFO_DECExponent				13
-#define INFO_DECTaps					14
-#define INFO_AECdelay					15
-#define INFO_AECExponent				16
-#define INFO_AECTaps					17
-#define INFO_TDQExponent				18
-#define INFO_TDQTaps					19
-#define INFO_FDQExponent				20
-#define INFO_FDQTaps					21
-#define INFO_USBat					22
-#define INFO_DSBat					23
-#define INFO_USFineGains				24
-#define INFO_DSFineGains				25
-#define INFO_BitloadFirstChannel		        26
-#define INFO_BitloadLastChannel		                27
-#define INFO_PollEOCData				28		// CO specific
-#define INFO_CSNRMargin					29		// CO specific
-#define INFO_RCMsgs1					30
-#define INFO_RMsgs1					31
-#define INFO_RMsgRA					32
-#define INFO_RCMsgRA					33
-#define INFO_RMsg2					34
-#define INFO_RCMsg2					35
-#define INFO_BitLoadOK				        36
-#define INFO_RCRates1					37
-#define INFO_RRates1Tab					38
-#define INFO_RMsgs1Tab					39
-#define INFO_RMsgRATab					40
-#define INFO_RRatesRA					41
-#define INFO_RCRatesRA					42
-#define INFO_RRates2					43
-#define INFO_RCRates2					44
-#define INFO_PackedRMsg2				45
-#define INFO_RxBitSwapFlag			        46
-#define INFO_TxBitSwapFlag			        47
-#define INFO_ShowtimeSNRUpdateCount	                48
-#define INFO_ShowtimeFDQUpdateCount	                49
-#define INFO_ShowtimeDECUpdateCount	                50
-#define INFO_CopyRxBuffer				51
-#define INFO_RxToneBuf				        52
-#define INFO_TxToneBuf                                  53
-#define INFO_Version					54
-#define INFO_TimeStamp                                  55
-#define INFO_feVendorID					56
-#define INFO_feSerialNum				57
-#define INFO_feVersionNum				58
-#define INFO_BulkMemory					59	//Points to start of bulk memory
-#define INFO_neVendorID                                 60
-#define INFO_neVersionNum				61
-#define INFO_neSerialNum				62
-
-//==============================================================================
-// RATE register address field definitions
-//==============================================================================
-
-
-#define RATE_UsRate					0
-#define RATE_DsRate					1
-
-
-//==============================================================================
-// PLAM (Physical Layer Management) register address field definitions
-//	(See G997.1 for reference)
-//==============================================================================
-
-
-	//					///
-	// Failure Flags	///
-	//					///
-
-#define PLAM_NearEndFailureFlags		0
-#define PLAM_FarEndFailureFlags			1
-
-	//									///
-	// Near End Failure Flags Bit Definitions	///
-	//									///
-
-// ADSL Failures ///
-#define PLAM_LOS_FailureBit				0x0001
-#define PLAM_LOF_FailureBit				0x0002
-#define PLAM_LPR_FailureBit				0x0004
-#define PLAM_RFI_FailureBit				0x0008
-
-// ATM Failures ///
-#define PLAM_NCD_LP0_FailureBit				0x0010
-#define PLAM_NCD_LP1_FailureBit				0x0020
-#define PLAM_LCD_LP0_FailureBit				0x0040
-#define PLAM_LCD_LP1_FailureBit				0x0080
-
-#define PLAM_NCD_BC0_FailureBit				0x0100
-#define PLAM_NCD_BC1_FailureBit				0x0200
-#define PLAM_LCD_BC0_FailureBit				0x0400
-#define PLAM_LCD_BC1_FailureBit				0x0800
-	//						///
-	// Performance Counts	///
-	//						///
-
-#define PLAM_NearEndCrcCnt				2
-#define PLAM_CorrectedRSErrors			        3
-
-#define PLAM_NearEndECSCnt				6
-#define PLAM_NearEndESCnt		                7
-#define PLAM_NearEndSESCnt				8
-#define PLAM_NearEndLOSSCnt				9
-#define PLAM_NearEndUASLCnt				10
-
-#define PLAM_NearEndHECErrCnt				11
-
-#define PLAM_NearEndHECTotCnt				16
-#define PLAM_NearEndCellTotCnt			        18
-#define PLAM_NearEndSfCntLSW				20
-#define PLAM_NearEndSfCntMSW				21
-
-#define PLAM_FarEndFebeCnt				24
-
-#define PLAM_FarEndFecCnt				28
-
-#define PLAM_FarEndFECSCnt				32
-#define PLAM_FarEndESCnt				33
-#define PLAM_FarEndSESCnt				34
-#define PLAM_FarEndLOSSCnt				35
-#define PLAM_FarEndUASLCnt				36
-
-#define PLAM_FarEndHECErrCnt				37
-
-#define PLAM_FarEndHECTotCnt				41
-
-#define PLAM_FarEndCellTotCnt				43
-
-#define PLAM_LineAttn					45
-#define PLAM_SNRMargin					46
-
-
-//==============================================================================
-// CNTL register address and bit field definitions
-//==============================================================================
-
-
-#define CNTL_ModemControl				0
-
-#define CNTL_ModemReset					0x0
-#define CNTL_ModemStart					0x2
-
-
-//==============================================================================
-// STAT register address and bit field definitions
-//==============================================================================
-
-#define STAT_MacroState					0
-#define STAT_Mode					1
-#define STAT_DMTFramingMode				2
-#define STAT_SleepState					3
-#define STAT_Misc					4
-#define STAT_FailureState				5
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- // STAT_OLRStatus provides status of OLR
- //16-bit STAT_OLRStatus_DS
- //  [1:0] 	:	OLR status 00=IDLE,  01=OLR_IN_PROGRESS, 10=OLR_Completed, 11=OLR_Aborted
- //  [3:2]:		Reserved
- //  [5:4]:		OLR_Type (1:bitswap; 2: DRR; 3: SRA)
- //  [7:6]:		Reserved
- //  [10:8]:		>0=Request. 0=not.   For DS, # of request transmissions/retransmissions (3 bits).
- //  [11]:		1=Receive Response, 0=not
- //  [15:12]:	Reserved
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- ///
-#define STAT_OLRStatus_DS				6
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- // STAT_OLRStatus provides status of OLR
- // 16-bit STAT_OLRStatus_US CMV
- //  [1:0] 	:	OLR status 00=IDLE,  01=OLR_IN_PROGRESS, 10=OLR_Completed, 11=OLR_Aborted
- //  [3:2]:		Reserved
- //  [5:4]:		OLR_Type (1:bitswap; 2: DRR; 3: SRA)
- //  [7:6]:		Reserved
- //  [8]:		1=Request Received. 0=not.
- //  [10:9]:     Reserved
- //  [11]:		1=Response Sent, 0=not
- //  [15:12]:	Reserved
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-///
-#define STAT_OLRStatus_US				7
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- // STAT_PMStatus provides status of PM
- // 16-bit STAT_PMStatus CMV
- //  [1:0] 	:	PM Status 00=IDLE,  01=PM_IN_PROGRESS, 10=PM_Completed, 11=PM_Aborted
- //  [2] : 		0=ATU_R initiated PM; 1 = ATU_C initiated PM
- //  [3]:		Reserved
- //  [5:4]:		PM_Type (1:Simple Request; 2: L2 request; 3: L2 trim)
- //  [7:6]:		Reserved
- //  [10:8]:		>0=Request. 0=not.   # of request transmissions/retransmissions (3 bits).
- //  [11]:		1=Response, 0=not
- //  [15:12]:	Reserved
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- ///
-#define STAT_PMStatus					8
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- // 16-bit STAT_OLRError_DS, STAT_OLRError_US, STAT_PMError
- // [3:0]:          OLR/PM response reason code
- // [7:4]:	       OLR/PM Internal error code
- // [15:8]:         OLR/PM Reserved for future
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- ///
-#define STAT_OLRError_DS				9
-#define STAT_OLRError_US				10
-#define STAT_PMError					11
-
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// STAT_MacroState
-// MacroState reflects the high level state of the modem
-
-#define STAT_InitState				0x0000
-#define STAT_ReadyState		            	0x0001
-#define STAT_FailState				0x0002
-#define STAT_IdleState				0x0003
-#define STAT_QuietState				0x0004
-#define STAT_GhsState				0x0005
-#define STAT_FullInitState			0x0006
-#define STAT_ShowTimeState			0x0007
-#define STAT_FastRetrainState			0x0008
-#define STAT_LoopDiagMode   			0x0009
-#define STAT_ShortInit          		0x000A     // Bis short initialization ///
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// STAT_Mode
-// ConfigurationMode indicates the mode of the current ADSL Link. In general, a modem may use
-// G.Hs or some other mechanism to negotiate the specific mode of operation.
-// The OPTN_modeControl CMV is used to select a set of desired modes.
-// The STAT_Mode CMV indicates which mode was actually selected.
-
-#define STAT_ConfigMode_T1413			0x0001
-#define STAT_ConfigMode_G992_2_AB		0x0002
-#define STAT_ConfigMode_G992_1_A		0x0004
-#define STAT_ConfigMode_G992_1_B		0x0008
-#define STAT_ConfigMode_G992_1_C		0x0010
-#define STAT_ConfigMode_G992_2_C		0x0020
-
-#define STAT_ConfigMode_G992_3_A		0x0100
-#define STAT_ConfigMode_G992_3_B		0x0200
-#define STAT_ConfigMode_G992_3_I		0x0400
-#define STAT_ConfigMode_G992_3_J		0x0800
-#define STAT_ConfigMode_G992_3_L		0x1000
-
-#define STAT_ConfigMode_G992_4_A		0x2000
-#define STAT_ConfigMode_G992_4_I		0x4000
-
-#define STAT_ConfigMode_G992_5			0x8000
-
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// STAT_DMTFramingMode
-// FramingMode indicates the DMT framing mde negotiated during initialization. The framing mode
-// status is not applicable in BIS mode and its value is undefined
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#define STAT_FramingModeMask			0x0003
-
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// STAT_Misc
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#define STAT_OverlappedSpectrum		0x0008
-#define STAT_TCM			0x0010
-#define STAT_TDQ_at_1104	        0x0020
-#define STAT_T1413_Signal_Detected	0x0040
-#define STAT_AnnexL_US_Mask1_PSD    	0x1000  //indicate we actually selected G992.3 AnnexL US PSD mask1
-#define STAT_AnnexL_US_Mask2_PSD   	0x2000  //indicate we actually selected G992.3 AnnexL US PSD mask2
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// STAT_FailureState
-// when the MacroSTate indicates the fail state, FailureState provides a failure code
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-#define E_CODE_NO_ERROR								0
-#define E_CODE_BAT_TX								1		// TX BAT table is incorrect */
-#define E_CODE_BAT_RX								2		//  RX BAT table is incorrect */
-#define E_CODE_PROFILE								3		//  profile is not selected in fast retrain */
-#define E_CODE_TX_AOC_FIFO_OVERFLOW						4
-#define E_CODE_TRUNCATE_FR							5		//Fast Retrain truncated due to no stored profiles*/
-#define E_CODE_BITLOAD								6		//  bit loading fails */
-#define E_CODE_ST_ERROR								7		//  showtime CRC error */
-#define E_CODE_RESERVED								8       //  using parameters reserved by the ITU-T */
-#define E_CODE_C_TONES								9		//  detected C_TONES */
-#define E_CODE_CODESWAP_ERR							10      //  codeswap not finished in time */
-#define E_CODE_FIFO_OVERFLOW							11      // we have run out of fifo space */
-#define E_CODE_C_BG_DECODE_ERR							12      // error in decoding C-BG message */
-#define E_CODE_C_RATES2_DECODE_ERR						13      // error in decoding C-MSGS2 and C-RATES2 */
-#define E_CODE_RCMedleyRx_C_SEGUE2_Failure					14		//  Timeout after RCMedleyRx waiting for C_SEGUE2 */
-#define E_CODE_RReverbRATx_C_SEGUE2_Failure					15		//  Timeout after RReverbRATx waiting for C_SEGUE2 */
-#define E_CODE_RReverb3Tx_C_SEGUE1_Failure					16		//  Timeout after RReverb3Tx waiting for C_SEGUE1 */
-#define E_CODE_RCCRC2Rx_C_RATES1_DECOD_ERR					17		//  Received CRC not equal to computed CRC */
-#define E_CODE_RCCRC1Rx_C_RATES1_DECOD_ERR					18		//  Received CRC not equal to computed CRC */
-#define E_CODE_RReverb5Tx_C_SEGUE2_Failure					19		//  Timeout after RReverb5Tx waiting for C_SEGUE2 */
-#define E_CODE_RReverb6Tx_C_SEGUE3_Failure					20		//  Timeout after RReverb6Tx waiting for C_SEGUE3 */
-#define E_CODE_RSegue5Tx_C_SEGUE3_Failure					21		//  Timeout after RSegue5Tx waiting for C_SEGUE3 */
-#define E_CODE_RCReverb5Rx_C_SEGUE_Failure					22		//  Timeout after RCReverb5Rx waiting for C_SEGUE */
-#define E_CODE_RCReverbRARx_C_SEGUE2_Failure					23		//  Timeout after RCReverbRARx waiting for C_SEGUE2 */
-#define E_CODE_RCCRC4Rx_CMSGS2_DECOD_ERR					24		//  Received CRC not equal to computed CRC */
-#define E_CODE_RCCRC5Rx_C_BG_DECOD_ERR						25		//  Received CRC not equal to computed CRC */
-#define E_CODE_RCCRC3Rx_DECOD_ERR						26		//  Received CRC not equal to computed CRC */
-#define E_CODE_RCPilot3_DEC_PATH_DEL_TIMEOUT					27		//  DEC Path Delay timeout */
-#define E_CODE_RCPilot3_DEC_TRAINING_TIMEOUT					28		//  DEC Training timeout */
-#define E_CODE_RCReverb3Rx_C_SEGUE1_Failure					29		//  Timeout after RCReverb3Rx waiting for C_SEGUE1 */
-#define E_CODE_RCReverb2Rx_SignalEnd_Failure					30		//  Timeout waiting for the end of RCReverb2Rx signal */
-#define E_CODE_RQuiet2_SignalEnd_Failure					31		//  Timeout waiting for the end of RQuiet2 signal */
-#define E_CODE_RCReverbFR1Rx_Failure						32		//  Timeout waiting for the end of RCReverbFR1Rx signal */
-#define E_CODE_RCPilotFR1Rx_SignalEnd_Failure					33		//  Timeout waiting for the end of RCPilotFR1Rx signal */
-#define E_CODE_RCReverbFR2Rx_C_Segue_Failure					34		//  Timeout after RCReverbFR2Rx waiting for C_SEGUE */
-#define E_CODE_RCReverbFR5Rx_SignalEnd_TIMEOUT					35		//  Timeout waiting for the end of RCReverbFR5Rx signal */
-#define E_CODE_RCReverbFR6Rx_C_SEGUE_Failure					36		//  Timeout after RCReverbFR6Rx waiting for C_SEGUE */
-#define E_CODE_RCReverbFR8Rx_C_SEGUE_FR4_Failure				37		//  Timeout after RCReverbFR8Rx waiting for C_SEGUE_FR4 */
-#define E_CODE_RCReverbFR8Rx_No_PROFILE						38		//  Timeout since no profile was selected */
-#define E_CODE_RCReverbFR8Rx_SignalEnd_TIMEOUT					39		//  Timeout waiting for the end of RCReverbFR8Rx signal */
-#define E_CODE_RCCRCFR1_DECOD_ERR						40		//  Received CRC not equal to computed CRC */
-#define E_CODE_RCRecovRx_SingnalEnd_TIMEOUT					41		//  Timeout waiting for the end of RCRecovRx signal */
-#define E_CODE_RSegueFR5Tx_TX_Not_Ready_TIMEOUT					42		//  Timeout after RSegueFR5Tx waiting for C_SEGUE2 */
-#define E_CODE_RRecovTx_SignalEnd_TIMEOUT					43		//  Timeout waiting for the end of RRecovTx signal */
-#define E_CODE_RCMedleyFRRx_C_SEGUE2_Failure					44		//  Timeout after RCMedleyFRRx waiting for C_SEGUE2 */
-#define E_CODE_CONFIGURATION_PARAMETERS_ERROR					45		// one of the configuration parameters do not meet the standard */
-#define E_CODE_BAD_MEM_ACCESS							46
-#define E_CODE_BAD_INSTRUCTION_ACCESS						47
-#define E_CODE_TX_EOC_FIFO_OVERFLOW						48
-#define E_CODE_RX_EOC_FIFO_OVERFLOW						49
-#define E_CODE_GHS_CD_FLAG_TIME_OUT						50      // Timeout when transmitting Flag in handshake cleardown */
-
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//STAT_OLRStatus:
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#define STAT_OLRPM_IDLE                                 0x0000
-#define STAT_OLRPM_IN_PROGRESS                          0x0001
-#define STAT_OLRPM_COMPLETE                             0x0002
-#define STAT_OLRPM_ABORTED                              0x0003
-#define STAT_OLRPM_RESPONSE				0x0800
-
-#define STAT_OLR_BITSWAP                                0x0010
-#define STAT_OLR_DRR					0x0020
-#define STAT_OLR_SRA					0x0030
-
-//STAT_PMStatus_US:
-#define STAT_PM_CO_REQ                                  0x0004
-#define STAT_PM_SIMPLE_REQ                              0x0010
-#define STAT_PM_L2_REQ					0x0020
-#define STAT_PM_L2_TRIM_REQ				0x0030
-
-// STAT_OLRError_DS, STAT_OLRError_US
-//4 bit response reason code:
-#define RESP_BUSY					0x01
-#define RESP_INVALID_PARAMETERS		            	0x02
-#define RESP_NOT_ENABLED				0x03
-#define RESP_NOT_SUPPORTED			        0x04
-
-//4 bit internal error code (common for OLR and PM)
-#define REQ_INVALID_BiGi				0x10
-#define REQ_INVALID_Lp					0x20
-#define REQ_INVALID_Bpn					0x30
-#define REQ_INVALID_FRAMING_CONSTRAINT			0x40
-#define REQ_NOT_IN_L0_STATE				0x50
-#define REQ_NOT_IN_L2_STATE				0x60
-#define REQ_INVALID_PCB					0x70
-#define REQ_VIOLATES_MARGIN				0x80
-
-//STAT_PMError
-//4 bit response reason code:
-#define RESP_STATE_NOT_DESIRED                          0x03
-#define RESP_INFEASIBLE_PARAMETERS                      0x04
-
-
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// OPTN register address and bit field definitions
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#define OPTN_ModeControl				0
-#define OPTN_DMTLnkCtl                          	1
-// Reserved						2
-#define OPTN_GhsControl					3
-// Reserved						4
-#define OPTN_PwrManControl			        5
-#define OPTN_AnnexControl				6
-#define OPTN_ModeControl1				7
-// Reserved						8
-#define OPTN_StateMachineCtrl			        9
-// Reserved						10
-// Reserved						11
-#define OPTN_BisLinkControl				12
-#define OPTN_ATMAddrConfig			        13
-#define OPTN_ATMNumCellConfig				14
-
-// Mode control defines the allowable operating modes of an ADSL link. In general, a modem may ///
-// use G.Hs or some other mechanism to negotiate the specific mode of operation. ///
-// The OPTN_ModeControl CMV is used to select a set of desired modes ///
-// The STAT_ModeControl CMV indicates which mode was actually selected ///
-
-// OPTN_ModeControl
-#define OPTN_ConfigMode_T1413			0x0001
-#define OPTN_ConfigMode_G992_2_AB		0x0002
-#define OPTN_ConfigMode_G992_1_A		0x0004
-#define OPTN_ConfigMode_G992_1_B		0x0008
-#define OPTN_ConfigMode_G992_1_C		0x0010
-#define OPTN_ConfigMode_G992_2_C		0x0020
-
-#define OPTN_ConfigMode_G992_3_A		0x0100
-#define OPTN_ConfigMode_G992_3_B		0x0200
-#define OPTN_ConfigMode_G992_3_I		0x0400
-#define OPTN_ConfigMode_G992_3_J		0x0800
-#define OPTN_ConfigMode_G992_3_L		0x1000
-
-#define OPTN_ConfigMode_G992_4_A		0x2000
-#define OPTN_ConfigMode_G992_4_I		0x4000
-
-#define OPTN_ConfigMode_G992_5			0x8000
-
-// OPTN_PwrManControl
-#define OPTN_PwrManWakeUpGhs			0x1
-#define OPTN_PwrManWakeUpFR			0x2
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// OPTN_DMT Link Control
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-#define OPTN_DMT_DualLatency_Dis                0x200
-#define OPTN_DMT_S_Dis                          0x100
-#define OPTN_DMT_FRAMINGMODE                 	0x1
-#define OPTN_DMT_FRAMINGMODE_MASK     		0x7
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// OPTN_BIS Link Control
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-#define OPTN_BisLinkContrl_LineProbeDis         0x1
-#define OPTN_BisLinkContrl_DSBlackBitsEn        0x2
-#define OPTN_BisLinkContrl_DiagnosticModeEn     0x4
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// OPTN_GhsControl
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// for OPTN_GhsControl, we will assign 16bit word as follows
-// bit 0~3: set the control over which start(initial) message CPE will send:
-//
-//		BIT: 2  1  0
-//			 0  0  1  CLR
-//			 0  1  0  MR
-//			 0  1  1  MS
-//			 1  0  0  MP
-//
-//  // bit 4~6: set the control over which message will be sent when we get at lease one CL/CLR exchange
-//        BIT: 5  4
-//		     0  1  MS
-//			 1  0  MR
-//			 1  1  MP
-//
-//  // bit 15: RT initiated G.hs sample sessions one through eight.  Session one is default.
-//        BIT: 15
-//			  1  means session one
-//
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#define OPTN_GHS_ST_GHS					0x8000
-#define OPTN_GHS_INIT_MASK		            	0x000F
-#define OPTN_GHS_RESP_MASK				0x00F0
-
-#define OPTN_RTInitTxMsg_CLR		           	0x0001
-#define OPTN_RTInitTxMsg_MR		           	0x0002
-#define OPTN_RTInitTxMsg_MS		            	0x0003
-#define OPTN_RTInitTxMsg_MP		            	0x0004
-
-#define OPTN_RTRespTxMsg_MS				0x0010
-#define OPTN_RTRespTxMsg_MR				0x0020
-#define OPTN_RTRespTxMsg_MP				0x0030
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// 	OPTN_AnnexControl
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-// G.992.3 Annex A/L1/L2 US PSD Mask preferred
-
-#define OPTN_G992_3_AnnexA_PreferredModeMask		0x3000
-#define OPTN_G992_3_AnnexA_PreferredModeA		0x0000         // default AnnexA PSD mask ///
-#define OPTN_G992_3_AnnexA_PreferredModeL1	        0x1000		   // AnnexL wide spectrum upstream PSD mask ///
-#define OPTN_G992_3_AnnexA_PreferredModeL2	        0x2000		   // AnnexL narrow spectrum upstream PSD mask ///
-
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//OPTN_ATMAddrConfig
-// Bits 4:0		are Utopia address for BC1
-// Bits 9:5		are Utopia address for BC0
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#define OPTN_UTPADDR_BC1				0x001F
-#define OPTN_UTPADDR_BC0				0x03E0
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//OPTN_ATMNumCellConfig
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#define OPTN_BC1_NUM_CELL_PAGES				0x000F // Bits 0:3 ///
-#define OPTN_BC0_NUM_CELL_PAGES				0x00F0 // Bits 4:7 ///
-
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// CNFG register address field ///
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////
-// these cmvs are used by bis handshake ///
-///////////////////////////////////////////
-
-// Each of the CNFG_TPS entries points to a structure of type (TPS_TC_BearerChannel_t)
-#define CNFG_TPS_TC_DS0					0
-#define CNFG_TPS_TC_DS1					1
-#define CNFG_TPS_TC_US0					2
-#define CNFG_TPS_TC_US1					3
-
-#define CNFG_HDLC_Overhead_Requirements	                4
-
-// Each of the CNFG_PMS entries points to a structure of type (PMS_TC_LatencyPath_t)
-#define CNFG_PMS_TC_DS0					5
-#define CNFG_PMS_TC_DS1					6
-#define CNFG_PMS_TC_US0					7
-#define CNFG_PMS_TC_US1					8
-
-// CNFG_PMD_PARAMETERS points to a structure of type (PMD_params_t)
-#define CNFG_PMD_PARAMETERS				9
-
-////////////////////////////////////////////////////////////
-// these cmvs are used by bis training and showtime code ///
-////////////////////////////////////////////////////////////
-
-////////////////
-// Tx Config ///
-////////////////
-#define CNFG_tx_Cnfg_Nbc				10
-#define CNFG_tx_Cnfg_Nlp				11
-#define CNFG_tx_Cnfg_Rp					12
-#define CNFG_tx_Cnfg_Mp					13
-#define CNFG_tx_Cnfg_Lp					14
-#define CNFG_tx_Cnfg_Tp					15
-#define CNFG_tx_Cnfg_Dp					16
-#define CNFG_tx_Cnfg_Bpn				17
-#define CNFG_tx_Cnfg_FramingMode		        18
-#define CNFG_tx_Cnfg_MSGLp			        19
-#define CNFG_tx_Cnfg_MSGc				20
-
-
-////////////////
-// Rx Config ///
-////////////////
-#define CNFG_rx_Cnfg_Nbc				21
-#define CNFG_rx_Cnfg_Nlp				22
-#define CNFG_rx_Cnfg_Rp					23
-#define CNFG_rx_Cnfg_Mp					24
-#define CNFG_rx_Cnfg_Lp					25
-#define CNFG_rx_Cnfg_Tp					26
-#define CNFG_rx_Cnfg_Dp					27
-#define CNFG_rx_Cnfg_Bpn				28
-#define CNFG_rx_Cnfg_FramingMode	                29
-#define CNFG_rx_Cnfg_MSGLp		                30
-#define CNFG_rx_Cnfg_MSGc				31
-
-#define CNFG_tx_Cnfg_BCnToLPp				32
-#define CNFG_rx_Cnfg_BCnToLPp				33
-
-
-
-#endif
-
diff --git a/target/linux/amazon/files/include/asm-mips/amazon/amazon_sw.h b/target/linux/amazon/files/include/asm-mips/amazon/amazon_sw.h
deleted file mode 100644
index 13273813a..000000000
--- a/target/linux/amazon/files/include/asm-mips/amazon/amazon_sw.h
+++ /dev/null
@@ -1,177 +0,0 @@
-#ifndef AMAZON_SW_H
-#define AMAZON_SW_H
-#define SET_ETH_SPEED_AUTO   SIOCDEVPRIVATE
-#define SET_ETH_SPEED_10     SIOCDEVPRIVATE+1
-#define SET_ETH_SPEED_100    SIOCDEVPRIVATE+2
-#define SET_ETH_DUPLEX_AUTO  SIOCDEVPRIVATE+3
-#define SET_ETH_DUPLEX_HALF  SIOCDEVPRIVATE+4
-#define SET_ETH_DUPLEX_FULL  SIOCDEVPRIVATE+5
-#define SET_ETH_REG          SIOCDEVPRIVATE+6          
-#define VLAN_TOOLS           SIOCDEVPRIVATE+7
-#define MAC_TABLE_TOOLS      SIOCDEVPRIVATE+8 
-
-
-/*===mac table commands==*/
-#define RESET_MAC_TABLE     0
-#define READ_MAC_ENTRY    1
-#define WRITE_MAC_ENTRY   2
-#define ADD_MAC_ENTRY     3
-
-/*====vlan commands===*/
-
-#define CHANGE_VLAN_CTRL     0
-#define READ_VLAN_ENTRY      1
-#define UPDATE_VLAN_ENTRY    2
-#define CLEAR_VLAN_ENTRY     3
-#define RESET_VLAN_TABLE     4
-#define ADD_VLAN_ENTRY       5
-
-/* 
-** MDIO constants.
-*/
-
-#define MDIO_BASE_STATUS_REG                0x1
-#define MDIO_BASE_CONTROL_REG               0x0
-#define MDIO_PHY_ID_HIGH_REG                0x2
-#define MDIO_PHY_ID_LOW_REG                 0x3
-#define MDIO_BC_NEGOTIATE                0x0200
-#define MDIO_BC_FULL_DUPLEX_MASK         0x0100
-#define MDIO_BC_AUTO_NEG_MASK            0x1000
-#define MDIO_BC_SPEED_SELECT_MASK        0x2000
-#define MDIO_STATUS_100_FD               0x4000
-#define MDIO_STATUS_100_HD               0x2000
-#define MDIO_STATUS_10_FD                0x1000
-#define MDIO_STATUS_10_HD                0x0800
-#define MDIO_STATUS_SPEED_DUPLEX_MASK	 0x7800
-#define MDIO_ADVERTISMENT_REG               0x4
-#define MDIO_ADVERT_100_FD                0x100
-#define MDIO_ADVERT_100_HD                0x080
-#define MDIO_ADVERT_10_FD                 0x040
-#define MDIO_ADVERT_10_HD                 0x020
-#define MDIO_LINK_UP_MASK                   0x4
-#define MDIO_START                          0x1
-#define MDIO_READ                           0x2
-#define MDIO_WRITE                          0x1
-#define MDIO_PREAMBLE              0xfffffffful
-
-#define PHY_RESET                        0x8000 
-#define AUTO_NEGOTIATION_ENABLE          0X1000
-#define AUTO_NEGOTIATION_COMPLETE          0x20
-#define RESTART_AUTO_NEGOTIATION          0X200
-
-
-#define PHY0_ADDR    0
-#define PHY1_ADDR    1
-#define P1M          0
-
-#define AMAZON_SW_REG32(reg_num) *((volatile u32*)(reg_num))
-
-#define OK 0;
-
-#ifdef CONFIG_CPU_LITTLE_ENDIAN
-typedef struct mac_table_entry{
-   u64 mac_address:48;
-   u64 p0:1;
-   u64 p1:1;
-   u64 p2:1;
-   u64 cr:1;
-   u64 ma_st:3;
-   u64 res:9;
-}_mac_table_entry;
-
-typedef struct IFX_Switch_VLanTableEntry{
-    u32 vlan_id:12;
-    u32 mp0:1;
-    u32 mp1:1;
-    u32 mp2:1;
-    u32 v:1;
-    u32 res:16;
-}_IFX_Switch_VLanTableEntry;
-
-typedef struct mac_table_req{
-    int cmd;
-    int index;
-    u32 data;
-    u64 entry_value;
-}_mac_table_req;
-
-#else //not CONFIG_CPU_LITTLE_ENDIAN
-typedef struct mac_table_entry{
-   u64 mac_address:48;
-   u64 p0:1;
-   u64 p1:1;
-   u64 p2:1;
-   u64 cr:1;
-   u64 ma_st:3;
-   u64 res:9;
-}_mac_table_entry;
-
-typedef struct IFX_Switch_VLanTableEntry{
-    u32 vlan_id:12;
-    u32 mp0:1;
-    u32 mp1:1;
-    u32 mp2:1;
-    u32 v:1;
-    u32 res:16;
-}_IFX_Switch_VLanTableEntry;
-
-
-typedef struct mac_table_req{
-    int cmd;
-    int index;
-    u32 data;
-    u64 entry_value;
-}_mac_table_req;
-
-#endif //CONFIG_CPU_LITTLE_ENDIAN
-
-
-
-typedef struct vlan_req{
-    int cmd;
-    int index;
-    u32 data;
-    u32 entry_value;
-}_vlan_req;
-
-typedef struct data_req{
-    int index;
-    u32 value;
-}_data_req;
-
-enum duplex
-{
-   half,
-   full,
-   autoneg
-};
-
-struct switch_priv {
-    struct net_device_stats stats;
-    int rx_packetlen;
-    u8 *rx_packetdata;
-    int rx_status;
-    int tx_packetlen;
-#ifdef CONFIG_NET_HW_FLOWCONTROL    
-    int fc_bit;
-#endif //CONFIG_NET_HW_FLOWCONTROL    
-    u8 *tx_packetdata;
-    int tx_status;
-    struct dma_device_info *dma_device;
-    struct sk_buff *skb;
-    spinlock_t lock;
-    int mdio_phy_addr;
-    int current_speed;
-    int current_speed_selection;
-    int rx_queue_len;
-    int full_duplex;
-    enum duplex current_duplex;
-    int num;
-};
-
-#endif //AMAZON_SW_H
-
-
-
-
-
diff --git a/target/linux/amazon/files/include/asm-mips/amazon/amazon_tpe.h b/target/linux/amazon/files/include/asm-mips/amazon/amazon_tpe.h
deleted file mode 100644
index a64e6f9f8..000000000
--- a/target/linux/amazon/files/include/asm-mips/amazon/amazon_tpe.h
+++ /dev/null
@@ -1,258 +0,0 @@
-#ifndef AMAZON_TPE_H
-#define AMAZON_TPE_H
-#include <linux/atm.h>
-#include <linux/atmdev.h>
-#include <linux/netdevice.h>
-#include <linux/ioctl.h>
-
-#ifdef CONFIG_IFX_ATM_MIB
-/* For ATM-MIB lists */
-#include <linux/list.h>
-#endif
-#include <asm/amazon/atm_mib.h>
-
-/* CBM Queue arranagement
- * Q0: free cells pool
- * Q1~ Q15: upstream queues
- * Q16: QAM downstream
- * Q17~Q31: downstream queues
- */
-#define	AMAZON_ATM_MAX_QUEUE_NUM	32
-#define	AMAZON_ATM_PORT_NUM		2
-#define	AMAZON_ATM_FREE_CELLS		4000
-#define	AMAZON_ATM_MAX_VCC_NUM		(AMAZON_ATM_MAX_QUEUE_NUM/2 - 1)
-#define AMAZON_AAL0_SDU 		(ATM_AAL0_SDU+4)				//one more word for status
-#define CBM_RX_OFFSET			16						//offset from the same q for tx
-#define	AMAZON_ATM_OAM_Q_ID           	16
-#define	AMAZON_ATM_RM_Q_ID            	16
-#define	AMAZON_ATM_OTHER_Q_ID         	16
-#define	CBM_DEFAULT_Q_OFFSET          	1
-#define	HTUTIMEOUT                    	0xffff//timeoutofhtutocbm
-#define	QSB_WFQ_NONUBR_MAX            	0x3f00
-#define	QSB_WFQ_UBR_BYPASS            	0x3fff
-#define	QSB_TP_TS_MAX			65472
-#define	QSB_TAUS_MAX			64512
-#define QSB_GCR_MIN			18
-#define HTU_RAM_ACCESS_MAX		1024//maxium time for HTU RAM access
-
-#define SWIE_LOCK		1
-#define	PROC_ATM		1
-#define	PROC_MIB		2
-#define PROC_VCC		3
-#define PROC_AAL5               4
-#define PROC_CBM                5
-#define PROC_HTU                6
-#define PROC_QSB                7
-#define PROC_SWIE               8
-
-/***************** internal data structure ********************/
-typedef int (*push_back_t)(struct atm_vcc *vcc,struct sk_buff *skb,int err) ;
-/* Device private data */
-typedef struct{
-	u8	padding_byte;
-	u32	tx_max_sdu;
-	u32	rx_max_sdu;
-	u32	cnt_cpy;		//no. of packets that need a copy due to alignment
-}amazon_aal5_dev_t;
-
-typedef struct{
-	u32	max_q_off;		//maxium queues used in real scenario
-	u32	nrt_thr;
-	u32	clp0_thr;
-	u32	clp1_thr;
-	u32	free_cell_cnt;
-#ifdef CONFIG_USE_VENUS	
-	u8 *	qd_addr_free;	//to work around a bug, bit15 of QDOFF address should be 1
-#endif
-	u8 *	qd_addr;
-	u8 *	mem_addr;
-	u8	allocated;
-}amazon_cbm_dev_t;
-
-typedef struct{
-
-}amazon_htu_dev_t;
-
-typedef struct{
-	u32	tau;			//cell delay variation due to concurrency(?)
-	u32	tstepc;			//time step, all legal values are 1,2,4
-	u32	sbl;			//scheduler burse length (for PHY)
-}amazon_qsb_dev_t;
-
-typedef struct{
-	u32	qid;			//QID of the current extraction queue
-	struct semaphore in_sem;	// Software-Insertion semaphore
-	volatile long	lock;		//lock that avoids race contions between SWIN and SWEX
-	wait_queue_head_t sleep;	//wait queue for SWIE and SWEX
-	u32 sw;			//status word
-}amazon_swie_dev_t;
-
-//AAL5 MIB Counter
-typedef struct{
-	u32	tx,rx;			//number AAL5 CPCS PDU from/to higher-layer
-	u32	tx_err,rx_err;  	//ifInErrors and ifOutErros
-	u32	tx_drop,rx_drop;	//discarded received packets due to mm shortage
-	u32	htu_unp;		//number of unknown received cells
-	u32 	rx_cnt_h;		//number of octets received, high 32 bits
-	u32 	rx_cnt_l;		//number of octets received, low 32 bits
-	u32 	tx_cnt_h;		//number of octets transmitted, high 32 bits
-	u32 	tx_cnt_l;		//number of octets transmitted, low 32 bits
-	u32	tx_ppd;			//number of cells for AAL5 upstream PPD discards
-	u64	rx_cells;		//number of cells for downstream
-	u64	tx_cells;		//number of cells for upstream
-	u32	rx_err_cells;		//number of cells dropped due to uncorrectable HEC errors
-}amazon_mib_counter_t;
-
-
-
-typedef enum {QS_PKT,QS_LEN,QS_ERR,QS_HW_DROP,QS_SW_DROP,QS_MAX} qs_t;
-//queue statics no. of packet received / sent
-//queue statics no. of bytes received / sent
-//queue statics no. of packets with error
-//queue statics no. of packets dropped by hw
-//queue statics no. of packets dropped by sw
-
-typedef struct{
-	push_back_t push;		//call back function
-	struct atm_vcc * vcc;		//opened vcc
-	struct timeval access_time;	//time when last F4/F5 user cells arrive
-	int	free;			//whether this queue is occupied, 0: occupied, 1: free
-	u32	aal5VccCrcErrors;	//MIB counter
-	u32	aal5VccOverSizedSDUs;	//MIB counter
-
-#if defined(AMAZON_ATM_DEBUG) || defined (CONFIG_IFX_ATM_MIB)
-	u32	qs[QS_MAX];
-#endif	
-}amazon_atm_queue_t;
-
-
-typedef struct{
-	int	enable;		//enable / disable
-	u32	max_conn;	//maximum number of connections per port
-	u32	tx_max_cr;	//Remaining cellrate for this device for tx direction
-	u32	tx_rem_cr;	//Remaining cellrate for this device for tx direction
-	u32	tx_cur_cr;	//Current cellrate for this device for tx direction
-}amazon_atm_port_t;
-
-typedef struct{
-	amazon_aal5_dev_t	aal5;
-	amazon_cbm_dev_t	cbm;
-	amazon_htu_dev_t	htu;
-	amazon_qsb_dev_t	qsb;
-	amazon_swie_dev_t	swie;
-	amazon_mib_counter_t	mib_counter;
-	amazon_atm_queue_t	queues[AMAZON_ATM_MAX_QUEUE_NUM];
-	amazon_atm_port_t	ports[AMAZON_ATM_PORT_NUM];
-	atomic_t		dma_tx_free_0;//TX_CH0 has availabe descriptors
-} amazon_atm_dev_t;
-
-struct oam_last_activity{
-	u8			vpi;	//vpi for this connection	
-	u16			vci;	//vci for t his connection
-	struct timeval		stamp;	//time when last F4/F5 user cells arrive
-	struct oam_last_activity * next;//for link list purpose
-};
-
-typedef union{
-#ifdef CONFIG_CPU_LITTLE_ENDIAN
-	struct{
-		u32	tprs		:16;
-		u32	twfq		:14;
-		u32	vbr		:1;
-		u32 	reserved	:1;
-	}bit;
-	u32 w0;
-#else
-	struct{
-		u32 	reserved	:1;
-		u32	vbr		:1;
-		u32	twfq		:14;
-		u32	tprs		:16;
-	}bit;
-	u32 w0;
-#endif
-
-}qsb_qptl_t;
-
-typedef union{
-#ifdef CONFIG_CPU_LITTLE_ENDIAN
-	struct{
-		u32	ts		:16;
-		u32	taus		:16;
-	}bit;
-	u32 w0;
-#else
-	struct{
-		u32	taus		:16;
-		u32	ts		:16;
-	}bit;
-	u32 w0;
-#endif
-}qsb_qvpt_t;
-
-
-
-struct amazon_atm_cell_header {
-#ifdef CONFIG_CPU_LITTLE_ENDIAN
-	struct{
-		u32 clp 	:1;	// Cell Loss Priority
-		u32 pti		:3;	// Payload Type Identifier
-		u32 vci 	:16;	// Virtual Channel Identifier
-		u32 vpi		:8;	// Vitual Path Identifier
-		u32 gfc 	:4;	// Generic Flow Control
-		}bit;
-#else
-	struct{
-		u32 gfc 	:4;	// Generic Flow Control
-		u32 vpi		:8;	// Vitual Path Identifier
-		u32 vci 	:16;	// Virtual Channel Identifier
-		u32 pti		:3;	// Payload Type Identifier
-		u32 clp 	:1;	// Cell Loss Priority
-		}bit;
-#endif
-};
-
-
-/************************ Function Declarations **************************/
-amazon_atm_dev_t * 	amazon_atm_create(void);
-int	amazon_atm_open(struct atm_vcc *vcc,push_back_t);
-int	amazon_atm_send(struct atm_vcc *vcc,struct sk_buff *skb);
-int	amazon_atm_send_oam(struct atm_vcc *vcc,void *cell, int flags);
-void	amazon_atm_close(struct atm_vcc *vcc);
-void	amazon_atm_cleanup(void);
-const struct oam_last_activity* get_oam_time_stamp(void);
-
-//mib-related
-int amazon_atm_cell_mib(atm_cell_ifEntry_t * to,u32 itf);
-int amazon_atm_aal5_mib(atm_aal5_ifEntry_t * to);
-int amazon_atm_vcc_mib(struct atm_vcc *vcc,atm_aal5_vcc_t * to);
-int amazon_atm_vcc_mib_x(int vpi, int vci,atm_aal5_vcc_t* to);
-
-#define	AMAZON_WRITE_REGISTER_L(data,addr)	do{ *((volatile u32*)(addr)) = (u32)(data); wmb();} while (0)
-#define AMAZON_READ_REGISTER_L(addr) 	(*((volatile u32*)(addr)))
-/******************************* ioctl stuff****************************************/
-#define NUM(dev)    (MINOR(dev) & 0xf)
-/*
- * Ioctl definitions
- */
-/* Use 'o' as magic number */
-#define AMAZON_ATM_IOC_MAGIC  'o'
-/* MIB_CELL: get atm cell level mib counter
- * MIB_AAL5: get aal5 mib counter
- * MIB_VCC: get vcc mib counter
- */
-typedef struct{
-	int vpi;
-	int vci;
-	atm_aal5_vcc_t mib_vcc;
-}atm_aal5_vcc_x_t;
-#define AMAZON_ATM_MIB_CELL		_IOWR(AMAZON_ATM_IOC_MAGIC,  0, atm_cell_ifEntry_t)
-#define AMAZON_ATM_MIB_AAL5		_IOWR(AMAZON_ATM_IOC_MAGIC,  1, atm_aal5_ifEntry_t)
-#define AMAZON_ATM_MIB_VCC		_IOWR(AMAZON_ATM_IOC_MAGIC,  2, atm_aal5_vcc_x_t)
-#define AMAZON_ATM_IOC_MAXNR 	3
-
-//sockopt
-#define	SO_AMAZON_ATM_MIB_VCC		__SO_ENCODE(SOL_ATM,5,atm_aal5_vcc_t)
-
-#endif // AMAZON_TPE_H
-
diff --git a/target/linux/amazon/files/include/asm-mips/amazon/amazon_wdt.h b/target/linux/amazon/files/include/asm-mips/amazon/amazon_wdt.h
deleted file mode 100644
index 775dabccf..000000000
--- a/target/linux/amazon/files/include/asm-mips/amazon/amazon_wdt.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef AMAZON_WDT_H
-#define AMAZON_WDT_H
-#ifdef __KERNEL__
-typedef struct wdt_dev{
-      char name[16];
-      int major;
-      int minor;
-      
-      int full;
-      char buff[10];
-}wdt_dev;
-#define AMAZON_WDT_REG32(addr) (*((volatile u32*)(addr))) 
-#endif //__KERNEL__
-
-//AMAZON_WDT_IOC_START: start the WDT timer (must provide a initial timeout value)
-//AMAZON_WDT_IOC_STOP: stop the WDT
-//AMAZON_WDT_IOC_PING: reload the timer to initial value (must happend after a AMAZON_WDT_IOC_START)
-#define AMAZON_WDT_IOC_MAGIC	0xc0
-#define AMAZON_WDT_IOC_START	_IOW( AMAZON_WDT_IOC_MAGIC,0, int)
-#define AMAZON_WDT_IOC_STOP	_IO( AMAZON_WDT_IOC_MAGIC,1)
-#define AMAZON_WDT_IOC_PING	_IO( AMAZON_WDT_IOC_MAGIC,2)
-
-#endif //AMAZON_WDT_H
diff --git a/target/linux/amazon/files/include/asm-mips/amazon/atm_defines.h b/target/linux/amazon/files/include/asm-mips/amazon/atm_defines.h
deleted file mode 100644
index 8adda2005..000000000
--- a/target/linux/amazon/files/include/asm-mips/amazon/atm_defines.h
+++ /dev/null
@@ -1,540 +0,0 @@
-#ifndef ATM_DEFINES_H
-#define	ATM_DEFINES_H
-                	
-//Registers Base Address
-#define IO_BASE_ADDR				0xA0000000
-#define	AAL5_BASE_ADDRESS               	0x10104400+IO_BASE_ADDR
-#define	CBM_BASE_ADDRESS              		0x10104000+IO_BASE_ADDR
-#define	HTU_BASE_ADDRESS              		0x10105100+IO_BASE_ADDR
-#define	QSB_BASE_ADDRESS              		0x10105000+IO_BASE_ADDR
-#define	SWIE_BASE_ADDRESS             		0x10105200+IO_BASE_ADDR
-
-//AAL5 Registers
-#define	AAL5_SISR0_ADDR                 	AAL5_BASE_ADDRESS+0x20
-#define	AAL5_SIMR0_ADDR                 	AAL5_BASE_ADDRESS+0x24
-#define	AAL5_SISR1_ADDR                 	AAL5_BASE_ADDRESS+0x28
-#define	AAL5_SIMR1_ADDR                 	AAL5_BASE_ADDRESS+0x2C
-#define	AAL5_SMFL_ADDR                  	AAL5_BASE_ADDRESS+0x30
-#define	AAL5_SATMHD_ADDR                	AAL5_BASE_ADDRESS+0x34
-#define	AAL5_SCON_ADDR                  	AAL5_BASE_ADDRESS+0x38
-#define	AAL5_SCMD_ADDR                  	AAL5_BASE_ADDRESS+0x3C
-#define	AAL5_RISR0_ADDR                 	AAL5_BASE_ADDRESS+0x40
-#define	AAL5_RIMR0_ADDR                 	AAL5_BASE_ADDRESS+0x44
-#define	AAL5_RISR1_ADDR                 	AAL5_BASE_ADDRESS+0x48
-#define	AAL5_RIMR1_ADDR                 	AAL5_BASE_ADDRESS+0x4C
-#define	AAL5_RMFL_ADDR                  	AAL5_BASE_ADDRESS+0x50
-#define	AAL5_RINTINF0_ADDR              	AAL5_BASE_ADDRESS+0x54
-#define	AAL5_RINTINF1_ADDR              	AAL5_BASE_ADDRESS+0x58
-#define	AAL5_RES5C_ADDR                 	AAL5_BASE_ADDRESS+0x5C
-#define AAL5_RIOL_ADDR				AAL5_BASE_ADDRESS+0x60
-#define	AAL5_RIOM_ADDR                 		AAL5_BASE_ADDRESS+0x64
-#define	AAL5_SOOL_ADDR                 		AAL5_BASE_ADDRESS+0x68
-#define	AAL5_SOOM_ADDR                 		AAL5_BASE_ADDRESS+0x6C
-#define	AAL5_RES70_ADDR                 	AAL5_BASE_ADDRESS+0x70
-#define	AAL5_RES74_ADDR                 	AAL5_BASE_ADDRESS+0x74
-#define	AAL5_RES78_ADDR                 	AAL5_BASE_ADDRESS+0x78
-#define	AAL5_RES7C_ADDR                 	AAL5_BASE_ADDRESS+0x7C
-#define	AAL5_RES80_ADDR                 	AAL5_BASE_ADDRESS+0x80
-#define	AAL5_RES84_ADDR                 	AAL5_BASE_ADDRESS+0x84
-#define	AAL5_RES88_ADDR                 	AAL5_BASE_ADDRESS+0x88
-#define	AAL5_RES8C_ADDR                 	AAL5_BASE_ADDRESS+0x8C
-#define	AAL5_RES90_ADDR                 	AAL5_BASE_ADDRESS+0x90
-#define	AAL5_RES94_ADDR                 	AAL5_BASE_ADDRESS+0x94
-#define	AAL5_RES98_ADDR                 	AAL5_BASE_ADDRESS+0x98
-#define	AAL5_RES9C_ADDR                 	AAL5_BASE_ADDRESS+0x9C
-#define	AAL5_RESA0_ADDR                 	AAL5_BASE_ADDRESS+0xA0
-#define	AAL5_RESA4_ADDR                 	AAL5_BASE_ADDRESS+0xA4
-#define	AAL5_RESA8_ADDR                 	AAL5_BASE_ADDRESS+0xA8
-#define	AAL5_RESAC_ADDR                 	AAL5_BASE_ADDRESS+0xAC
-#define	AAL5_RESB0_ADDR                 	AAL5_BASE_ADDRESS+0xB0
-#define	AAL5_RESB4_ADDR                 	AAL5_BASE_ADDRESS+0xB4
-#define	AAL5_RESB8_ADDR                 	AAL5_BASE_ADDRESS+0xB8
-#define	AAL5_RESBC_ADDR                 	AAL5_BASE_ADDRESS+0xBC
-#define	AAL5_RESC0_ADDR                 	AAL5_BASE_ADDRESS+0xC0
-#define	AAL5_RESC4_ADDR                 	AAL5_BASE_ADDRESS+0xC4
-#define	AAL5_RESC8_ADDR                 	AAL5_BASE_ADDRESS+0xC8
-#define	AAL5_RESCC_ADDR                 	AAL5_BASE_ADDRESS+0xCC
-#define	AAL5_RESD0_ADDR                 	AAL5_BASE_ADDRESS+0xD0
-#define	AAL5_RESD4_ADDR                 	AAL5_BASE_ADDRESS+0xD4
-#define	AAL5_RESD8_ADDR                 	AAL5_BASE_ADDRESS+0xD8
-#define	AAL5_RESDC_ADDR                 	AAL5_BASE_ADDRESS+0xDC
-#define	AAL5_RESE0_ADDR                 	AAL5_BASE_ADDRESS+0xE0
-#define	AAL5_RESE4_ADDR                 	AAL5_BASE_ADDRESS+0xE4
-#define	AAL5_RESE8_ADDR                 	AAL5_BASE_ADDRESS+0xE8
-#define	AAL5_RESEC_ADDR                 	AAL5_BASE_ADDRESS+0xEC
-#define	AAL5_SSRC0_ADDR                 	AAL5_BASE_ADDRESS+0xF0
-#define	AAL5_SSRC1_ADDR                 	AAL5_BASE_ADDRESS+0xF4
-#define	AAL5_RSRC0_ADDR                 	AAL5_BASE_ADDRESS+0xF8
-#define	AAL5_RSRC1_ADDR                 	AAL5_BASE_ADDRESS+0xFC
-
-#define	AAL5S_ISR_QID_MASK              	0xFF000000
-#define	AAL5S_ISR_SAB                   	0x00000100
-#define	AAL5S_ISR_SE                    	0x00000080
-#define	AAL5S_ISR_MFLE                  	0x00000040
-#define	AAL5S_ISR_SBE0                  	0x00000020
-#define	AAL5S_ISR_SEG0                  	0x00000010
-#define	AAL5S_ISR_TAB                   	0x00000004
-
-#define	AAL5_SIMR_MASK                  	0x000001c7
-#define	AAL5_SIMR_SAB                   	0x00000100
-#define	AAL5_SIMR_SE                    	0x00000080
-#define	AAL5_SIMR_MFLE                  	0x00000040
-#define	AAL5_SIMR_TAB                   	0x00000004
-#define	AAL5_SIMR_SBE0                  	0x00000002
-#define	AAL5_SIMR_SEG0                  	0x00000001
-
-#define	AAL5_SCMD_SEQCOUNT_MASK         	0x0000ff00
-#define	AAL5_SCMD_MODE_POLL             	0x00000008
-#define	AAL5_SCMD_MODE_COUNT            	0x00000000
-#define	AAL5_SCMD_AS                    	0x00000004
-#define	AAL5_SCMD_SS                    	0x00000002
-#define	AAL5_SCMD_AR                    	0x00000001
-
-#define	AAL5R_ISR_CID_MASK              	0xFF000000//ConnectionID
-#define	AAL5R_ISR_DBC_MASK              	0x00FF0000//DiscardedByteCounter
-#define	AAL5R_ISR_END                   	0x00002000//End
-#define	AAL5R_ISR_ICID                  	0x00001000//InvalidConnectionID
-#define	AAL5R_ISR_CLP                   	0x00000800//CellLossPriority
-#define	AAL5R_ISR_CGST                  	0x00000400//Congestion
-#define	AAL5R_ISR_UUE                   	0x00000200//CPCSUUError
-#define	AAL5R_ISR_CPIE                  	0x00000100//CPIError
-#define	AAL5R_ISR_FE                    	0x00000080//FrameEnd
-#define	AAL5R_ISR_MFLE                  	0x00000040//MaximumFrameLengthExceeded
-#define	AAL5R_ISR_DBCE                  	0x00000020//DiscardedByteCounterExceeded
-#define	AAL5R_ISR_CRC                   	0x00000010//CRCError
-#define	AAL5R_ISR_ILEN                  	0x00000008//InvalidLength
-#define	AAL5R_ISR_RAB                   	0x00000004//ReceiveAbort
-
-#define	AAL5_RIMR1_MASK                 	0x00003ffc
-#define	AAL5_RIMR1_END                  	0x00002000//End
-#define	AAL5_RIMR1_ICID                 	0x00001000//InvalidConnectionID
-#define	AAL5_RIMR1_CLP                  	0x00000800//CellLossPriority
-#define	AAL5_RIMR1_CGST                 	0x00000400//Congestion
-#define	AAL5_RIMR1_UUE                  	0x00000200//CPCSUUError
-#define	AAL5_RIMR1_CPIE                 	0x00000100//CPIError
-#define	AAL5_RIMR1_FE                   	0x00000080//FrameEnd
-#define	AAL5_RIMR1_MFLE                 	0x00000040//MaximumFrameLengthExceeded
-#define	AAL5_RIMR1_DBCE                 	0x00000020//DiscardedByteCounterExceeded
-#define	AAL5_RIMR1_CRC                  	0x00000010//CRCError
-#define	AAL5_RIMR1_ILEN                 	0x00000008//InvalidLength
-#define	AAL5_RIMR1_RAB                  	0x00000004//ReceiveAbort
-
-//AAL5 Reassambly Errors
-#define AAL5_STW1_MASK				0x33//Error mask
-#define AAL5_STW0_MASK				0x5c//Error mask
-#define AAL5_STW0_BE				0x3//padding bytes mask
-#define	AAL5_STW1_CBM				0x20//Transfer from CBM to A5R abnormally ended
-#define	AAL5_STW1_CH				0x10//Invalid Channel number error
-#define	AAL5_STW1_CLP				0x8//CLP value of cells in packet is 1
-#define	AAL5_STW1_CG				0x4//Cell in packet expired congestion
-#define	AAL5_STW1_UU				0x2//CPCS-UU value error
-#define	AAL5_STW1_CPI				0x1//CPI value error
-#define	AAL5_STW0_FE				0x80//Frame end
-#define	AAL5_STW0_MFL				0x40//Maximum frame length error
-#define	AAL5_STW0_CRC				0x10//CRC error
-#define	AAL5_STW0_IL				0x8//Invalid length
-#define	AAL5_STW0_RA				0x4//Received abort
-
-
-
-//CBM Registers
-#define	CBM_NRTTHR_ADDR               	CBM_BASE_ADDRESS+0x10//NonRealTimeThreshold
-#define	CBM_CLP0THR_ADDR              	CBM_BASE_ADDRESS+0x14//CLP0Threshold
-#define	CBM_CLP1THR_ADDR              	CBM_BASE_ADDRESS+0x18//CLP1Threshold
-#define	CBM_QDOFF_ADDR                	CBM_BASE_ADDRESS+0x1C//QueueDescriptorOffset
-#define	CBM_CFG_ADDR                  	CBM_BASE_ADDRESS+0x20//Configuration
-#define	CBM_HWEXPAR0_ADDR             	CBM_BASE_ADDRESS+0x24//HWExtractParameter0
-#define	CBM_RES28_ADDR                	CBM_BASE_ADDRESS+0x28
-#define	CBM_WMSTAT0_ADDR               	CBM_BASE_ADDRESS+0x2C
-#define	CBM_HWEXCMD_ADDR              	CBM_BASE_ADDRESS+0x30//HWExtractCommand0
-#define	CBM_RES34_ADDR                	CBM_BASE_ADDRESS+0x34
-#define	CBM_HWEXSTAT0_ADDR            	CBM_BASE_ADDRESS+0x38//HWExtractStatus0
-#define	CBM_RES3C_ADDR                	CBM_BASE_ADDRESS+0x3C
-#define	CBM_RES40_ADDR                	CBM_BASE_ADDRESS+0x40
-#define	CBM_CNT_ADDR                  	CBM_BASE_ADDRESS+0x44//CellCount
-#define	CBM_RES48_ADDR                	CBM_BASE_ADDRESS+0x48
-#define	CBM_LFR_ADDR                  	CBM_BASE_ADDRESS+0x4C//PointertolastCellinfreeCellQueue
-#define	CBM_FFR_ADDR                  	CBM_BASE_ADDRESS+0x50//PointertofirstCellinfreeCellQueue
-#define	CBM_RES54_ADDR                	CBM_BASE_ADDRESS+0x54
-#define	CBM_RES58_ADDR                	CBM_BASE_ADDRESS+0x58
-#define	CBM_RES5C_ADDR                	CBM_BASE_ADDRESS+0x5C
-#define	CBM_RES60_ADDR                	CBM_BASE_ADDRESS+0x60
-#define	CBM_RES64_ADDR                	CBM_BASE_ADDRESS+0x64
-#define	CBM_RES68_ADDR                	CBM_BASE_ADDRESS+0x68
-#define	CBM_RES6C_ADDR                	CBM_BASE_ADDRESS+0x6C
-#define	CBM_RES70_ADDR                	CBM_BASE_ADDRESS+0x70
-#define	CBM_RES74_ADDR                	CBM_BASE_ADDRESS+0x74
-#define	CBM_RES78_ADDR                	CBM_BASE_ADDRESS+0x78
-#define	CBM_RES7C_ADDR                	CBM_BASE_ADDRESS+0x7C
-#define	CBM_RES80_ADDR                	CBM_BASE_ADDRESS+0x80
-#define	CBM_RES84_ADDR                	CBM_BASE_ADDRESS+0x84
-#define	CBM_RES88_ADDR                	CBM_BASE_ADDRESS+0x88
-#define	CBM_RES8C_ADDR                	CBM_BASE_ADDRESS+0x8C
-#define	CBM_RES90_ADDR                	CBM_BASE_ADDRESS+0x90
-#define	CBM_RES94_ADDR                	CBM_BASE_ADDRESS+0x94
-#define	CBM_RES98_ADDR                	CBM_BASE_ADDRESS+0x98
-#define	CBM_RES9C_ADDR                	CBM_BASE_ADDRESS+0x9C
-#define	CBM_RESA0_ADDR                	CBM_BASE_ADDRESS+0xA0
-#define	CBM_RESA4_ADDR                	CBM_BASE_ADDRESS+0xA4
-#define	CBM_RESA8_ADDR                	CBM_BASE_ADDRESS+0xA8
-#define	CBM_RESAC_ADDR                	CBM_BASE_ADDRESS+0xAC
-#define	CBM_RESB0_ADDR                	CBM_BASE_ADDRESS+0xB0
-#define	CBM_RESB4_ADDR                	CBM_BASE_ADDRESS+0xB4
-#define	CBM_RESB8_ADDR                	CBM_BASE_ADDRESS+0xB8
-#define	CBM_RESBC_ADDR                	CBM_BASE_ADDRESS+0xBC
-#define	CBM_INTINF0_ADDR              	CBM_BASE_ADDRESS+0xC0//InterruptInfo0
-#define	CBM_INTCMD_ADDR               	CBM_BASE_ADDRESS+0xC4//InterruptCommand0
-#define	CBM_IMR0_ADDR                 	CBM_BASE_ADDRESS+0xC8//InterruptMask
-#define	CBM_SRC0_ADDR                 	CBM_BASE_ADDRESS+0xCC//ServiceRequestControl
-#define	CBM_RESD0_ADDR                	CBM_BASE_ADDRESS+0xD0
-#define	CBM_RESD4_ADDR                	CBM_BASE_ADDRESS+0xD4
-#define	CBM_RESD8_ADDR                	CBM_BASE_ADDRESS+0xD8
-#define	CBM_RESDC_ADDR                	CBM_BASE_ADDRESS+0xDC
-#define	CBM_RESE0_ADDR                	CBM_BASE_ADDRESS+0xE0
-#define	CBM_AAL5IDIS_ADDR             	CBM_BASE_ADDRESS+0xE4//MIB-No.EPDdiscardedpacketsupstream
-#define	CBM_AAL5ODIS_ADDR             	CBM_BASE_ADDRESS+0xE8//MIB-No.PPDdiscardedpacketsupstream
-#define	CBM_RESEC_ADDR                	CBM_BASE_ADDRESS+0xEC
-#define	CBM_RESF0_ADDR                	CBM_BASE_ADDRESS+0xF0
-#define	CBM_RESF4_ADDR                	CBM_BASE_ADDRESS+0xF4
-#define	CBM_RESF8_ADDR                	CBM_BASE_ADDRESS+0xF8
-#define	CBM_RESFC_ADDR                	CBM_BASE_ADDRESS+0xFC
-
-//CBMCFG
-#define	CBM_CFG_INTLCK0EN             	0x00000008
-#define	CBM_CFG_INT0HLT               	0x00000004
-#define	CBM_CFG_START                 	0x00000001
-
-#define	CBM_HWEXPAR_PN_A5             	0x00002000
-#define	CBM_HWEXPAR_PN_CM             	0x00000000
-#define	CBM_HWEXPAR_SUBADD_PORTMASK   	0x00000070
-#define	CBM_HWEXPAR_SUBADD_ADU        	0x00000000
-#define	CBM_HWEXPAR_SUBADD_AAL2       	0x00000080
-#define	CBM_HWEXPAR_SUBADD_SWIE       	0x00000100
-
-#define	CBM_HWEXCMD_SFE2              	0x00000100
-#define	CBM_HWEXCMD_FE2               	0x00000080
-#define	CBM_HWEXCMD_SCE2              	0x00000040
-#define	CBM_HWEXCMD_SFE1              	0x00000020
-#define	CBM_HWEXCMD_FE1               	0x00000010
-#define	CBM_HWEXCMD_SCE1              	0x00000008
-#define	CBM_HWEXCMD_SFE0              	0x00000004
-#define	CBM_HWEXCMD_FE0               	0x00000002
-#define	CBM_HWEXCMD_SCE0              	0x00000001
-
-#define	CBM_INTINF0_QID_MASK          	0xFF000000
-#define	CBM_INTINF0_ORIGIN_MASK       	0x00F00000
-#define	CBM_INTINF0_EF                	0x00004000
-#define	CBM_INTINF0_ACA               	0x00002000
-#define	CBM_INTINF0_ERR               	0x00001000
-#define	CBM_INTINF0_DISC              	0x00000800
-#define	CBM_INTINF0_QSBV              	0x00000400
-#define	CBM_INTINF0_Q0E               	0x00000200
-#define	CBM_INTINF0_Q0I               	0x00000100
-#define	CBM_INTINF0_RDE               	0x00000080
-#define	CBM_INTINF0_OPF               	0x00000040
-#define	CBM_INTINF0_NFCA              	0x00000020
-#define	CBM_INTINF0_CLP1TR            	0x00000010
-#define	CBM_INTINF0_CLP0TR            	0x00000008
-#define	CBM_INTINF0_NRTTR             	0x00000004
-#define	CBM_INTINF0_QFD               	0x00000002
-#define	CBM_INTINF0_QTR               	0x00000001
-#define CBM_INTINF0_QID_SHIFT		24
-//CBM QD Word 3
-#define	CBM_QD_W3_QOS_0	        	0x00000000
-#define	CBM_QD_W3_QOS_1	        	0x40000000
-#define	CBM_QD_W3_QOS_2	        	0x80000000
-#define	CBM_QD_W3_QOS_3	        	0xc0000000
-
-#define	CBM_QD_W3_DIR_UP              	0x20000000
-#define	CBM_QD_W3_DIR_DOWN             	0x00000000
-
-#define	CBM_QD_W3_CLPt             	0x10000000
-#define	CBM_QD_W3_RT                  	0x08000000
-#define	CBM_QD_W3_AAL5                	0x04000000
-
-#define	CBM_QD_W3_INT_NOINT           	0x00000000
-#define	CBM_QD_W3_INT_ACA              	0x01000000
-#define	CBM_QD_W3_INT_EOF             	0x02000000
-#define	CBM_QD_W3_INT_BOTH           	0x03000000
-
-#define	CBM_QD_W3_THRESHOLD_MASK      	0x00ff0000
-#define CBM_QD_W3_WM_EN			0x00000010
-#define	CBM_QD_W3_HCR             	0x00000008
-#define	CBM_QD_W3_SBID_MASK           	0x00000001
-
-#define	CBM_QD_W3_THRESHOLD_SHIFT     	16
-
-//WATER MARK STATUS
-#define	CBM_WM_NRT_MASK           	0x00040000
-#define	CBM_WM_CLP0_MASK           	0x00020000
-#define	CBM_WM_CLP1_MASK           	0x00010000
-
-//CBMNRTTHR, CBMCLP0THR, CBMCLP0THR
-#define CBM_NRT_WM_NONE			0x00000000//no water mark
-#define CBM_WM_3_1			0x00010000//3/4 to set, 1/4 to release
-#define CBM_WM_3_2			0x00020000//3/4 to set, 2/4 to release
-#define CBM_WM_2_1			0x00030000//2/4 to set, 1/4 to release
-#define CBM_THR_MASK			0x0000FFFF
-
-#define	CBM_IMR_MASK                  	0x0000fbff
-#define	CBM_IMR_reserved             	0xFFFF0400
-#define	CBM_IMR_RFULL                  	0x00008000//EndofFrame
-#define	CBM_IMR_EF                    	0x00004000//EndofFrame
-#define	CBM_IMR_ACA                   	0x00002000//AnyCellArrived
-#define	CBM_IMR_ERR             	0x00001000//FPI Error
-#define	CBM_IMR_DISC                  	0x00000800//Discard
-#define	CBM_IMR_reserved1              	0x00000400//reserved
-#define	CBM_IMR_Q0E                   	0x00000200//Queue0Extract
-#define	CBM_IMR_Q0I                   	0x00000100//Queue0Insert
-#define	CBM_IMR_RDE                   	0x00000080//ReadEmptyQueue
-#define	CBM_IMR_OPF                   	0x00000040//OncePerFrame
-#define	CBM_IMR_NFCA                  	0x00000020//NoFreeCellAvailable
-#define	CBM_IMR_CLP1TR                	0x00000010//CLP1ThresholdReached
-#define	CBM_IMR_CLP0TR                	0x00000008//CLP0ThresholdReached
-#define	CBM_IMR_NRTTR                 	0x00000004//NonRealTimeThresholdReached
-#define	CBM_IMR_QFD                   	0x00000002//QueueFrameDiscard
-#define	CBM_IMR_QTR                   	0x00000001//QueueThresholdReached
-
-#define	CBM_EXSTAT_FB                 	0x00000010
-#define	CBM_EXSTAT_SCB                	0x00000008
-#define	CBM_EXSTAT_Q0                 	0x00000004
-#define	CBM_EXSTAT_RDE                	0x00000002
-#define	CBM_EXSTAT_QV                 	0x00000001
-
-//HTU Registers
-#define	HTU_RX0_ADDR                  	HTU_BASE_ADDRESS+0x10
-#define	HTU_RX1_ADDR                  	HTU_BASE_ADDRESS+0x14
-#define	HTU_RES18_ADDR                 	HTU_BASE_ADDRESS+0x18
-#define	HTU_RES1C_ADDR                 	HTU_BASE_ADDRESS+0x1C
-#define	HTU_RES20_ADDR                 	HTU_BASE_ADDRESS+0x20
-#define	HTU_RES24_ADDR                 	HTU_BASE_ADDRESS+0x24
-#define	HTU_RES28_ADDR                 	HTU_BASE_ADDRESS+0x28
-#define	HTU_RES2C_ADDR                	HTU_BASE_ADDRESS+0x2C
-#define	HTU_PCF0PAT_ADDR              	HTU_BASE_ADDRESS+0x30
-#define	HTU_PCF1PAT_ADDR              	HTU_BASE_ADDRESS+0x34
-#define	HTU_RES38_ADDR                	HTU_BASE_ADDRESS+0x38
-#define	HTU_RES3C_ADDR                	HTU_BASE_ADDRESS+0x3C
-#define	HTU_RES40_ADDR                	HTU_BASE_ADDRESS+0x40
-#define	HTU_RES44_ADDR                	HTU_BASE_ADDRESS+0x44
-#define	HTU_RES48_ADDR                	HTU_BASE_ADDRESS+0x48
-#define	HTU_RES4C_ADDR                	HTU_BASE_ADDRESS+0x4C
-#define	HTU_PCF0MASK_ADDR             	HTU_BASE_ADDRESS+0x50
-#define	HTU_PCF1MASK_ADDR             	HTU_BASE_ADDRESS+0x54
-#define	HTU_RES58_ADDR                	HTU_BASE_ADDRESS+0x58
-#define	HTU_RES5C_ADDR                	HTU_BASE_ADDRESS+0x5C
-#define	HTU_RES60_ADDR                	HTU_BASE_ADDRESS+0x60
-#define	HTU_RES64_ADDR                	HTU_BASE_ADDRESS+0x64
-#define	HTU_RES68_ADDR                	HTU_BASE_ADDRESS+0x68
-#define	HTU_RES6C_ADDR                	HTU_BASE_ADDRESS+0x6C
-#define	HTU_TIMEOUT_ADDR              	HTU_BASE_ADDRESS+0x70
-#define	HTU_DESTOAM_ADDR              	HTU_BASE_ADDRESS+0x74
-#define	HTU_DESTRM_ADDR               	HTU_BASE_ADDRESS+0x78
-#define	HTU_DESTOTHER_ADDR            	HTU_BASE_ADDRESS+0x7C
-#define	HTU_CFG_ADDR                  	HTU_BASE_ADDRESS+0x80
-#define	HTU_RES84_ADDR                	HTU_BASE_ADDRESS+0x84
-#define	HTU_RES88_ADDR                	HTU_BASE_ADDRESS+0x88
-#define	HTU_RES8C_ADDR                	HTU_BASE_ADDRESS+0x8C
-#define	HTU_INFNOENTRY_ADDR           	HTU_BASE_ADDRESS+0x90
-#define	HTU_INFTIMEOUT_ADDR           	HTU_BASE_ADDRESS+0x94
-#define	HTU_RES98_STAT                 	HTU_BASE_ADDRESS+0x98
-#define	HTU_RES9C_ADDR                	HTU_BASE_ADDRESS+0x9C
-#define	HTU_MIBCIUP	           	HTU_BASE_ADDRESS+0xA0//MIB Counter In Unknown Protoc Register
-#define	HTU_CNTTIMEOUT_ADDR           	HTU_BASE_ADDRESS+0xA4
-#define	HTU_RESA8_ADDR                	HTU_BASE_ADDRESS+0xA8
-#define	HTU_RESAC_ADDR                	HTU_BASE_ADDRESS+0xAC
-#define	HTU_RAMADDR_ADDR              	HTU_BASE_ADDRESS+0xB0
-#define	HTU_RAMCMD_ADDR               	HTU_BASE_ADDRESS+0xB4
-#define	HTU_RAMSTAT_ADDR              	HTU_BASE_ADDRESS+0xB8
-#define	HTU_RESBC_ADDR                	HTU_BASE_ADDRESS+0xBC
-#define	HTU_RAMDAT1_ADDR              	HTU_BASE_ADDRESS+0xC0
-#define	HTU_RAMDAT2_ADDR              	HTU_BASE_ADDRESS+0xC4
-#define	HTU_RESCC_ADDR                	HTU_BASE_ADDRESS+0xCC
-#define	HTU_RESD0_ADDR                	HTU_BASE_ADDRESS+0xD0
-#define	HTU_RESD4_ADDR                	HTU_BASE_ADDRESS+0xD4
-#define	HTU_RESD8_ADDR                	HTU_BASE_ADDRESS+0xD8
-#define	HTU_RESDC_ADDR                	HTU_BASE_ADDRESS+0xDC
-#define	HTU_RESE0_ADDR                	HTU_BASE_ADDRESS+0xE0
-#define	HTU_RESE4_ADDR                	HTU_BASE_ADDRESS+0xE4
-#define	HTU_IMR0_ADDR                 	HTU_BASE_ADDRESS+0xE8
-#define	HTU_RESEC_ADDR                 	HTU_BASE_ADDRESS+0xEC
-#define	HTU_ISR0_ADDR                 	HTU_BASE_ADDRESS+0xF0
-#define	HTU_RESF4_ADDR                 	HTU_BASE_ADDRESS+0xF4
-#define	HTU_SRC0_ADDR                 	HTU_BASE_ADDRESS+0xF8
-#define	HTU_RESFC_ADDR                 	HTU_BASE_ADDRESS+0xFC
-
-//HTU_CFG
-#define	HTU_CFG_START                 	0x00000001
-
-#define	HTU_RAMCMD_RMW                	0x00000004
-#define	HTU_RAMCMD_RD                 	0x00000002
-#define	HTU_RAMCMD_WR                 	0x00000001
-
-#define	HTU_RAMDAT1_VCON              	0x00000080//validconnection
-#define	HTU_RAMDAT1_VCT               	0x00000040//vcivalueistransparent
-#define	HTU_RAMDAT1_QIDS              	0x00000020//qid selects a cell in cbm
-#define	HTU_RAMDAT1_VCI3              	0x00000010//vci3->oamqueue
-#define	HTU_RAMDAT1_VCI4              	0x00000008//vci4->oamqueue
-#define	HTU_RAMDAT1_VCI6              	0x00000004//vci6->rmqueue
-#define	HTU_RAMDAT1_PTI4              	0x00000002//pti4->oamqueue
-#define	HTU_RAMDAT1_PTI5              	0x00000001//pti5->oamqueue
-
-#define	HTU_RAMDAT2_PTI6              	0x00000800
-#define	HTU_RAMDAT2_PTI7              	0x00000400
-#define	HTU_RAMDAT2_F4U               	0x00000200
-#define	HTU_RAMDAT2_F5U               	0x00000100
-#define HTU_RAMDAT2_QID_MASK		0x000000ff
-
-#define	HTU_ISR_NE                    	0x00000001
-#define	HTU_ISR_TORD                  	0x00000002
-#define	HTU_ISR_IT                    	0x00000008
-#define	HTU_ISR_OTOC                  	0x00000010
-#define	HTU_ISR_ONEC                  	0x00000020
-#define	HTU_ISR_PNE                  	0x00000040
-#define	HTU_ISR_PT                  	0x00000080
-#define	HTU_ISR_MASK                  	0x000000ff
-
-
-//QSB Registers
-#define	QSB_BIP0_ADDR                 	QSB_BASE_ADDRESS+0x00
-#define	QSB_BIP1_ADDR                 	QSB_BASE_ADDRESS+0x04
-#define	QSB_BIP2_ADDR                 	QSB_BASE_ADDRESS+0x08
-#define	QSB_BIP3_ADDR                 	QSB_BASE_ADDRESS+0x0C
-#define	QSB_RSVP_ADDR                 	QSB_BASE_ADDRESS+0x10
-#define	QSB_TNOW_ADDR                 	QSB_BASE_ADDRESS+0x14
-#define	QSB_TNOWCYC_ADDR              	QSB_BASE_ADDRESS+0x18
-#define	QSB_TAU_ADDR                  	QSB_BASE_ADDRESS+0x1C
-#define	QSB_L1BRS_ADDR                	QSB_BASE_ADDRESS+0x20
-#define	QSB_SBL_ADDR                  	QSB_BASE_ADDRESS+0x24
-#define	QSB_CONFIG_ADDR               	QSB_BASE_ADDRESS+0x28
-#define	QSB_RTM_ADDR             	QSB_BASE_ADDRESS+0x2C
-#define	QSB_RTD_ADDR             	QSB_BASE_ADDRESS+0x30
-#define	QSB_RAMAC_ADDR                	QSB_BASE_ADDRESS+0x34
-#define	QSB_ISR_ADDR                  	QSB_BASE_ADDRESS+0x38
-#define	QSB_IMR_ADDR                  	QSB_BASE_ADDRESS+0x3C
-#define	QSB_SRC_ADDR                  	QSB_BASE_ADDRESS+0x40
-
-#define	QSB_TABLESEL_QVPT              	8
-#define	QSB_TABLESEL_QPT              	1
-#define	QSB_TABLESEL_SCT              	2
-#define	QSB_TABLESEL_SPT              	3
-#define	QSB_TABLESEL_CALENDARWFQ      	4/*notusedbyFW*/
-#define	QSB_TABLESEL_L2WFQ            	5/*notusedbyFW*/
-#define	QSB_TABLESEL_CALENDARRS       	6/*notusedbyFW*/
-#define	QSB_TABLESEL_L2BITMAPRS       	7/*notusedbyFW*/
-#define	QSB_TABLESEL_SHIFT            	24
-#define	QSB_TWFQ_MASK                 	0x3FFF0000
-#define	QSB_TPRS_MASK                 	0x0000FFFF
-#define	QSB_SBID_MASK                 	0xF
-#define	QSB_TWFQ_SHIFT                	16
-#define	QSB_SCDRATE_MASK              	0x00007FFF
-#define	QSB_SBVALID_MASK              	0x80000000
-
-#define	QSB_ISR_WFQLE                 	0x00000001
-#define	QSB_ISR_WFQBE                 	0x00000002
-#define	QSB_ISR_RSLE                  	0x00000004
-#define	QSB_ISR_RSBE                  	0x00000008
-#define	QSB_ISR_MUXOV                 	0x00000010
-#define	QSB_ISR_CDVOV                 	0x00000020
-#define	QSB_ISR_PARAMI                	0x00000040
-#define	QSB_ISR_SLOSS                 	0x00000080
-#define	QSB_ISR_IIPS                  	0x00000100
-
-#define	QSB_IMR_WFQLE                 	0x00000001
-#define	QSB_IMR_WFQBE                 	0x00000002
-#define	QSB_IMR_RSLE                  	0x00000004
-#define	QSB_IMR_RSBE                  	0x00000008
-#define	QSB_IMR_MUXOV                 	0x00000010
-#define	QSB_IMR_CDVOV                 	0x00000020
-#define	QSB_IMR_PARAMI                	0x00000040
-#define	QSB_IMR_SLOSS                 	0x00000080
-#define	QSB_IMR_IIPS                  	0x00000100
-
-#define	QSB_READ                      	0x0
-#define	QSB_WRITE                     	0x80000000
-#define	QSB_READ_ALL                  	0xFFFFFFFF
-
-#if 1 //some bug with QSB access mask
-#define	QSB_QPT_SET_MASK              	0x0
-#define QSB_QVPT_SET_MASK		0x0
-#define	QSB_SET_SCT_MASK              	0x0
-#define	QSB_SET_SPT_MASK              	0x0
-#define	QSB_SET_SPT_SBVALID_MASK      	0x7FFFFFFF
-#else //some bug with QSB access mask
-#define	QSB_QPT_SET_MASK              	0x80000000
-#define QSB_QVPT_SET_MASK		0x0
-#define	QSB_SET_SCT_MASK              	0xFFFFFFE0
-#define	QSB_SET_SPT_MASK              	0x7FF8C000
-#define	QSB_SET_SPT_SBVALID_MASK      	0x7FFFFFFF
-#endif //some bug with QSB access mask
-
-#define	QSB_SPT_SBVALID               	0x80000000
-
-#define	QSB_RAMAC_REG_LOW             	0x0
-#define	QSB_RAMAC_REG_HIGH            	0x00010000
-
-#define	SRC_SRE_ENABLE                	0x1000
-#define SRC_CLRR			0x4000	//request clear bit
-
-
-
-//SWIE Registers
-#define	SWIE_IQID_ADDR                	SWIE_BASE_ADDRESS+0x0c//SWIEInsertQueueDescriptor
-#define	SWIE_ICMD_ADDR                	SWIE_BASE_ADDRESS+0x10//SWIEInsertCommand
-#define	SWIE_ISTAT_ADDR               	SWIE_BASE_ADDRESS+0x14//SWIEInsertStatus
-#define	SWIE_ESTAT_ADDR               	SWIE_BASE_ADDRESS+0x18//SWIEExtractStatus
-#define	SWIE_ISRC_ADDR                	SWIE_BASE_ADDRESS+0x74//SWIEInsertServiceRequestControl
-#define	SWIE_ESRC_ADDR                	SWIE_BASE_ADDRESS+0x78//SWIEExtractServiceRequestControl
-#define	SWIE_ICELL_ADDR               	SWIE_BASE_ADDRESS+0x80//SWIEInsertCell(0x80-0xb4)
-#define	SWIE_ECELL_ADDR               	SWIE_BASE_ADDRESS+0xc0//SWIEExtractCell(0xc0-0xf4)
-
-#define SWIE_ISTAT_DONE			0x1
-#define SWIE_ESTAT_DONE			0x1
-#define	SWIE_ICMD_START               	0x00000001//Startcommandforinsertion
-#define	SWIE_CBM_SCE0                 	CBM_HWEXCMD_SCE0//CBMcommandforSingle-Cell-Extract
-#define	SWIE_CBM_PID_SUBADDR          	0x00001000//CBMPortIDandSubAddressforUTOPIA
-
-//Extracted cell format
-//52bytes AAL0 PDU + "Input cell additional data"(14bits)
-#define SWIE_ADDITION_DATA_MASK		0x7fff
-#define SWIE_EPORT_MASK			0x7000//Source ID (000 AUB0, 001 AUB1)
-#define SWIE_EF4USER_MASK		0x800
-#define SWIE_EF5USER_MASK		0x400
-#define SWIE_EOAM_MASK			0x200
-#define SWIE_EAUU_MASK			0x100
-#define SWIE_EVCI3_MASK			0x80
-#define SWIE_EVCI4_MASK			0x40
-#define SWIE_EVCI6_MASK			0x20
-#define SWIE_EPTI4_MASK			0x10
-#define SWIE_EPTI5_MASK			0x8
-#define SWIE_EPTI6_MASK			0x4
-#define SWIE_EPTI7_MASK			0x2
-#define SWIE_ECRC10ERROR_MASK		0x1
-
-#define CBM_CELL_SIZE			0x40
-#define CBM_QD_SIZE			0x10
-#define	AAL5R_TRAILER_LEN		12
-#define AAL5S_INBOUND_HEADER		8
-
-//constants
-//TODO: to be finalized by system guys
-//DMA QOS defined by ATM QoS Service type
-#define DMA_RX_CH0			0
-#define DMA_RX_CH1			1
-#define DMA_TX_CH0			0
-#define DMA_TX_CH1			1
-#define CBR_DMA_QOS			CBM_QD_W3_QOS_0
-#define VBR_RT_DMA_QOS			CBM_QD_W3_QOS_0
-#define VBR_NRT_DMA_QOS			CBM_QD_W3_QOS_0
-#define UBR_PLUS_DMA_QOS		CBM_QD_W3_QOS_0
-#define UBR_DMA_QOS			CBM_QD_W3_QOS_0
-
-#define	SRC_TOS_MIPS                  	0
-#define	AAL5R_SRPN                      0x00000006//a5rneedshigherprioritythanDR
-#define	AAL5S_SRPN                      0x00000005
-#define	CBM_MIPS_SRPN                 	0x00000004
-#define	QSB_SRPN                      	0x00000023
-#define	HTU_SRPN1                     	0x00000022
-#define	HTU_SRPN0                     	0x00000021
-
-#endif //ATM_DEFINES_H
-
diff --git a/target/linux/amazon/files/include/asm-mips/amazon/atm_mib.h b/target/linux/amazon/files/include/asm-mips/amazon/atm_mib.h
deleted file mode 100644
index f86334258..000000000
--- a/target/linux/amazon/files/include/asm-mips/amazon/atm_mib.h
+++ /dev/null
@@ -1,142 +0,0 @@
-#ifndef AMAZON_ATM_MIB_H
-#define AMAZON_ATM_MIB_H
-
-#ifdef CONFIG_IFX_ATM_MIB
-#include <asm/types.h>
-#ifdef __KERNEL__
-#include <linux/list.h>
-#endif
-#endif /* CONFIG_IFX_ATM_MIB */
-
-#ifndef __KERNEL__
-#include <atmMIB/local_list.h>
-typedef unsigned int __u32;
-#endif
-
-typedef struct{
-	__u32	ifHCInOctets_h;
-	__u32	ifHCInOctets_l;
-	__u32	ifHCOutOctets_h;
-	__u32	ifHCOutOctets_l;
-	__u32	ifInErrors;
-	__u32	ifInUnknownProtos;
-	__u32	ifOutErrors;
-}atm_cell_ifEntry_t;
-
-typedef struct{
-	__u32	ifHCInOctets_h;
-	__u32	ifHCInOctets_l;
-	__u32	ifHCOutOctets_h;
-	__u32	ifHCOutOctets_l;
-	__u32	ifInUcastPkts;
-	__u32	ifOutUcastPkts;
-	__u32	ifInErrors;
-	__u32	ifInDiscards;
-	__u32	ifOutErros;
-	__u32	ifOutDiscards;
-}atm_aal5_ifEntry_t;
-
-typedef struct{
-	__u32	aal5VccCrcErrors;
-	__u32	aal5VccSarTimeOuts;//no timer support yet
-	__u32	aal5VccOverSizedSDUs;
-}atm_aal5_vcc_t;
-
-#if defined(CONFIG_IFX_ATM_MIB) || defined(IFX_CONFIG_SNMP_ATM_MIB)
-/* ATM-MIB data structures */
-typedef struct atmIfConfEntry {
-	int ifIndex;
-    int atmInterfaceMaxVpcs;
-    int atmInterfaceMaxVccs;
-    int atmInterfaceConfVpcs;
-    int atmInterfaceConfVccs;
-    int atmInterfaceMaxActiveVpiBits;
-    int atmInterfaceMaxActiveVciBits;
-    int atmInterfaceIlmiVpi;
-    int atmInterfaceIlmiVci;
-    int atmInterfaceAddressType;
-    char atmInterfaceAdminAddress[40];
-    unsigned long atmInterfaceMyNeighborIpAddress;
-    char atmInterfaceMyNeighborIfName[20];
-    int atmInterfaceCurrentMaxVpiBits;
-    int atmInterfaceCurrentMaxVciBits;
-    char atmInterfaceSubscrAddress[40];
-    int flags;
-}atmIfConfEntry;
-
-typedef struct atmTrafficDescParamEntry {
-	/* Following three parameters are used to update VCC QoS values */
-	int ifIndex;
-	short atmVclvpi;
-	int atmVclvci;
-
-	unsigned int atmTrafficParamIndex;
-	unsigned char   traffic_class;  
-	int     max_pcr;
-	/* Subramani: Added min_pcr */
-	int 	min_pcr;
-	int     cdv;
-	int     scr;
-	int     mbs;
-	int atmTrafficRowStatus;
-	int atmTrafficFrameDiscard;
-	struct list_head vpivci_head;
-	struct list_head list;
-}atmTrafficDescParamEntry;
-
-
-typedef struct  atmVclEntry {
- 	int ifIndex;
- 	short atmVclvpi;
- 	int atmVclvci;
- 	char vpivci[20];
- 	int  atmVclAdminStatus;
- 	int atmVclOperStatus;
-	unsigned long atmVclLastChange;
- 	struct atmTrafficDescParamEntry *atmVclRxTrafficPtr;
- 	struct atmTrafficDescParamEntry *atmVclTxTrafficPtr;
- 	unsigned char atmVccAalType;
- 	unsigned int atmVccAal5TxSduSize;
- 	unsigned int atmVccAal5RxSduSize;
- 	int atmVccAal5Encap;
- 	int atmVclRowStatus;
- 	int atmVclCastType;
- 	int atmVclConnKind;
- 	struct list_head list;
- 	int flags;
-}atmVclEntry;
-
-
-typedef union union_atmptrs {
-	struct atmIfConfEntry *atmIfConfEntry_ptr;
-	struct atmTrafficDescParamEntry *atmTrafficDescParamEntry_ptr;
-	struct atmVclEntry *atmVclEntry_ptr;
-}union_atmptrs;
-
-/* ATM Character device major number */
-#define ATM_MEI_MAJOR	107
-
-/* Protocol Constants */
-#define IFX_PROTO_RAW               0
-#define IFX_PROTO_BR2684            1
-#define IFX_PROTO_PPPOATM           2
-#define IFX_PROTO_CLIP              3
-
-/* IOCTL Command Set for ATM-MIB */
-#define GET_ATM_IF_CONF_DATA  0x0AB0
-#define SET_ATM_IF_CONF_DATA  0x0AB1
-
-#define SET_ATM_QOS_DATA      0x0BC0
-
-#define GET_ATM_VCL_DATA      0x0CD0
-#define SET_ATM_VCL_DATA      0x0CD1
-
-#define FIND_VCC_IN_KERNEL	  0x0DE0
-
-/* User defined flags for VCL Table */
-#define ATMVCCAAL5CPCSTRANSMITSDUSIZE	9  
-#define ATMVCCAAL5CPCSRECEIVESDUSIZE	10 
-
-#endif /* CONFIG_IFX_ATM_MIB || IFX_CONFIG_SNMP_ATM_MIB */
-
-#endif //AMAZON_ATM_MIB_H
diff --git a/target/linux/amazon/files/include/asm-mips/amazon/ifx_peripheral_definitions.h b/target/linux/amazon/files/include/asm-mips/amazon/ifx_peripheral_definitions.h
deleted file mode 100644
index 65f14e405..000000000
--- a/target/linux/amazon/files/include/asm-mips/amazon/ifx_peripheral_definitions.h
+++ /dev/null
@@ -1,96 +0,0 @@
-//*************************************************************************
-//* Summary of definitions which are used in each peripheral              *
-//*************************************************************************
-
-#ifndef peripheral_definitions_h
-#define peripheral_definitions_h
-
-typedef unsigned char		UINT8;
-typedef signed char		INT8;
-typedef unsigned short		UINT16;
-typedef signed short		INT16;
-typedef unsigned int		UINT32;
-typedef signed int		INT32;
-typedef unsigned long long	UINT64;
-typedef signed long long	INT64;
-
-#define REG8( addr )		  (*(volatile UINT8 *) (addr))
-#define REG16( addr )		  (*(volatile UINT16 *)(addr))
-#define REG32( addr )		  (*(volatile UINT32 *)(addr))
-#define REG64( addr )		  (*(volatile UINT64 *)(addr))
-
-/* define routine to set FPI access in Supervisor Mode */
-#define IFX_SUPERVISOR_ON()                         REG32(FB0_CFG) = 0x01
-/* Supervisor mode ends, following functions will be done in User mode */
-#define IFX_SUPERVISOR_OFF()                        REG32(FB0_CFG) = 0x00
-/* Supervisor mode ends, following functions will be done in User mode */
-#define IFX_SUPERVISOR_MODE()                       REG32(FB0_CFG)
-/* Supervisor mode ends, following functions will be done in User mode */
-#define IFX_SUPERVISOR_SET(svm)                     REG32(FB0_CFG) = svm
-/* enable all Interrupts in IIU */
-//#define IFX_ENABLE_IRQ(irq_mask, im_base)           REG32(im_base | IIU_MASK) = irq_mask
-///* get all high priority interrupt bits in IIU */
-//#define IFX_GET_IRQ_MASKED(im_base)                 REG32(im_base | IIU_IRMASKED)
-///* signal ends of interrupt to IIU */
-//#define IFX_CLEAR_DIRECT_IRQ(irq_bit, im_base)      REG32(im_base | IIU_IR) = irq_bit
-///* force IIU interrupt register */
-//#define IFX_FORCE_IIU_REGISTER(data, im_base)       REG32(im_base | IIU_IRDEBUG) = data
-///* get all bits of interrupt register */
-//#define IFX_GET_IRQ_UNMASKED(im_base)               REG32(im_base | IIU_IR)
-/* insert a NOP instruction */
-#define NOP                                     _nop()
-/* CPU goes to power down mode until interrupt occurs */
-#define IFX_CPU_SLEEP                               _sleep()
-/* enable all interrupts to CPU */
-#define IFX_CPU_ENABLE_ALL_INTERRUPT                sys_enable_int()
-/* get all low priority interrupt bits in peripheral */
-#define IFX_GET_LOW_PRIO_IRQ(int_reg)               REG32(int_reg)
-/* clear low priority interrupt bit in peripheral */
-#define IFX_CLEAR_LOW_PRIO_IRQ(irq_bit, int_reg)    REG32(int_reg) = irq_bit
-/* write FPI bus */
-#define WRITE_FPI_BYTE(data, addr)              REG8(addr) = data
-#define WRITE_FPI_16BIT(data, addr)             REG16(addr) = data
-#define WRITE_FPI_32BIT(data, addr)             REG32(addr) = data
-/* read FPI bus */
-#define READ_FPI_BYTE(addr)                     REG8(addr)
-#define READ_FPI_16BIT(addr)                    REG16(addr)
-#define READ_FPI_32BIT(addr)                    REG32(addr)
-/* write peripheral register */
-#define WRITE_PERIPHERAL_REGISTER(data, addr)   REG32(addr) = data 
-
-#ifdef	CONFIG_CPU_LITTLE_ENDIAN
-#define WRITE_PERIPHERAL_REGISTER_16(data, addr) REG16(addr) = data
-#define WRITE_PERIPHERAL_REGISTER_8(data, addr) REG8(addr) = data
-#else //not CONFIG_CPU_LITTLE_ENDIAN
-#define WRITE_PERIPHERAL_REGISTER_16(data, addr) REG16(addr+2) = data
-#define WRITE_PERIPHERAL_REGISTER_8(data, addr) REG8(addr+3) = data
-#endif //CONFIG_CPU_LITTLE_ENDIAN
-
-/* read peripheral register */
-#define READ_PERIPHERAL_REGISTER(addr)          REG32(addr)
-
-/* read/modify(or)/write peripheral register */
-#define RMW_OR_PERIPHERAL_REGISTER(data, addr)	REG32(addr) = REG32(addr) | data
-/* read/modify(and)/write peripheral register */
-#define RMW_AND_PERIPHERAL_REGISTER(data, addr)	REG32(addr) = REG32(addr) & (UINT32)data
-
-/* CPU-independent mnemonic constants */
-/* CLC register bits */
-#define IFX_CLC_ENABLE                0x00000000
-#define IFX_CLC_DISABLE               0x00000001
-#define IFX_CLC_DISABLE_STATUS        0x00000002
-#define IFX_CLC_SUSPEND_ENABLE        0x00000004
-#define IFX_CLC_CLOCK_OFF_DISABLE     0x00000008
-#define IFX_CLC_OVERWRITE_SPEN_FSOE   0x00000010
-#define IFX_CLC_FAST_CLOCK_SWITCH_OFF 0x00000020
-#define IFX_CLC_RUN_DIVIDER_MASK      0x0000FF00
-#define IFX_CLC_RUN_DIVIDER_OFFSET    8
-#define IFX_CLC_SLEEP_DIVIDER_MASK    0x00FF0000
-#define IFX_CLC_SLEEP_DIVIDER_OFFSET  16
-#define IFX_CLC_SPECIFIC_DIVIDER_MASK 0x00FF0000
-#define IFX_CLC_SPECIFIC_DIVIDER_OFFSET 24
-
-/* number of cycles to wait for interrupt service routine to be called */
-#define WAIT_CYCLES   50
-
-#endif /* PERIPHERAL_DEFINITIONS_H not yet defined */
diff --git a/target/linux/amazon/files/include/asm-mips/amazon/ifx_ssc.h b/target/linux/amazon/files/include/asm-mips/amazon/ifx_ssc.h
deleted file mode 100644
index e5d73ad4e..000000000
--- a/target/linux/amazon/files/include/asm-mips/amazon/ifx_ssc.h
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- * ifx_ssc.h defines some data sructures used in ifx_ssc.c
- *
- * Copyright (C) 2004 Michael Schoenenborn (IFX COM TI BT)
- *
- *
- */
-
-#ifndef __IFX_SSC_H
-#define __IFX_SSC_H
-#ifdef __KERNEL__
-#include <asm/amazon/ifx_ssc_defines.h>
-#endif  //__KERNEL__
-
-#define PORT_CNT		1	// assume default value
-
-/* symbolic constants to be used in SSC routines */
-
-// ### TO DO: bad performance
-#define IFX_SSC_TXFIFO_ITL	1
-#define IFX_SSC_RXFIFO_ITL	1
-
-
-
-struct ifx_ssc_statistics{
-	unsigned int  abortErr;   /* abort error */       
-	unsigned int  modeErr;    /* master/slave mode error */       
-	unsigned int  txOvErr;    /* TX Overflow error */         
-	unsigned int  txUnErr;    /* TX Underrun error */         
-	unsigned int  rxOvErr;    /* RX Overflow error */         
-	unsigned int  rxUnErr;    /* RX Underrun error */
-	unsigned int  rxBytes;
-	unsigned int  txBytes;
-};
-
-
-struct ifx_ssc_hwopts {
-	unsigned int  AbortErrDetect :1;   /* Abort Error detection (in slave mode) */
-	unsigned int  rxOvErrDetect  :1;   /* Receive Overflow Error detection */
-	unsigned int  rxUndErrDetect :1;   /* Receive Underflow Error detection */
-	unsigned int  txOvErrDetect  :1;   /* Transmit Overflow Error detection */
-	unsigned int  txUndErrDetect :1;   /* Transmit Underflow Error detection */
-	unsigned int  echoMode       :1;   /* Echo mode */
-	unsigned int  loopBack       :1;   /* Loopback mode */
-	unsigned int  idleValue	     :1;   /* Idle value */
-	unsigned int  clockPolarity  :1;   /* Idle clock is high or low */
-	unsigned int  clockPhase     :1;   /* Tx on trailing or leading edge*/
-	unsigned int  headingControl :1;   /* LSB first or MSB first */
-	unsigned int  dataWidth      :6;   /* from 2 up to 32 bits */
-	unsigned int  masterSelect   :1;   /* Master or Slave mode */
-	unsigned int  modeRxTx       :2;   /* rx/tx mode */
-	unsigned int  gpoCs	     :8;   /* choose outputs to use for chip select */
-	unsigned int  gpoInv         :8;   /* invert GPO outputs */
-};
-
-
-struct ifx_ssc_frm_opts {
-	bool		FrameEnable;	// SFCON.SFEN
-	unsigned int	DataLength;	// SFCON.DLEN
-	unsigned int	PauseLength;	// SFCON.PLEN
-	unsigned int	IdleData;	// SFCON.IDAT
-	unsigned int	IdleClock;	// SFCON.ICLK
-	bool		StopAfterPause;	// SFCON.STOP
-};
-
-struct ifx_ssc_frm_status {
-	bool		DataBusy;	// SFSTAT.DBSY
-	bool		PauseBusy;	// SFSTAT.PBSY
-	unsigned int	DataCount;	// SFSTAT.DCNT
-	unsigned int	PauseCount;	// SFSTAT.PCNT
-	bool		EnIntAfterData;	// SFCON.IBEN
-	bool		EnIntAfterPause;// SFCON.IAEN
-};
-
-typedef struct {
-	char	*buf;
-	size_t	len;
-} ifx_ssc_buf_item_t;
-
-
-// data structures for batch execution
-typedef union {
-	struct {
-		bool		save_options;
-	} init;
-	ifx_ssc_buf_item_t	read;
-	ifx_ssc_buf_item_t	write;
-	ifx_ssc_buf_item_t	rd_wr;
-	unsigned int	set_baudrate;
-	struct ifx_ssc_frm_opts set_frm;
-	unsigned int	set_gpo;
-	struct ifx_ssc_hwopts set_hwopts;
-}ifx_ssc_batch_cmd_param;
-
-struct ifx_ssc_batch_list {
-	unsigned int			cmd;
-	ifx_ssc_batch_cmd_param		cmd_param;
-	struct ifx_ssc_batch_list	*next;
-};
-
-#ifdef __KERNEL__
-#define IFX_SSC_IS_MASTER(p) ((p)->opts.masterSelect == SSC_MASTER_MODE)
-
-
-struct ifx_ssc_port{
-	unsigned long		mapbase;
-	struct ifx_ssc_hwopts   opts;
-	struct ifx_ssc_statistics stats;
-	struct ifx_ssc_frm_status frm_status;
-	struct ifx_ssc_frm_opts frm_opts;
-	/* wait queue for ifx_ssc_read() */
-	wait_queue_head_t	rwait, pwait;
-        int			port_nr;
-	char			port_is_open; /* exclusive open  - boolean */
-//	int no_of_bits; /* number of _valid_ bits */
-//	int elem_size; /* shift for element (no of bytes)*/
-	/* buffer and pointers to the read/write position */
-	char                    *rxbuf; /* buffer for RX */
-        char                    *rxbuf_end; /* buffer end pointer for RX */
-	volatile char           *rxbuf_ptr; /* buffer write pointer for RX */
-	char                    *txbuf; /* buffer for TX */
-        char                    *txbuf_end; /* buffer end pointer for TX */
-	volatile char           *txbuf_ptr; /* buffer read pointer for TX */
-	unsigned int            baud;
-	/* each channel has its own interrupts */
-	/* (transmit/receive/error/frame) */
-	unsigned int txirq, rxirq, errirq, frmirq;
-};
-/* default values for SSC configuration */
-// values of CON
-#define IFX_SSC_DEF_IDLE_DATA       1  /* enable */
-#define IFX_SSC_DEF_BYTE_VALID_CTL  1  /* enable */
-#define IFX_SSC_DEF_DATA_WIDTH      32 /* bits */
-#define IFX_SSC_DEF_ABRT_ERR_DETECT 0  /* disable */
-#define IFX_SSC_DEF_RO_ERR_DETECT   1  /* enable */
-#define IFX_SSC_DEF_RU_ERR_DETECT   0  /* disable */
-#define IFX_SSC_DEF_TO_ERR_DETECT   0  /* disable */
-#define IFX_SSC_DEF_TU_ERR_DETECT   0  /* disable */
-#define IFX_SSC_DEF_LOOP_BACK       0  /* disable */
-#define IFX_SSC_DEF_ECHO_MODE       0  /* disable */
-#define IFX_SSC_DEF_CLOCK_POLARITY  0  /* low */
-#define IFX_SSC_DEF_CLOCK_PHASE     1  /* 0: shift on leading edge, latch on trailling edge, 1, otherwise */
-#define IFX_SSC_DEF_HEADING_CONTROL IFX_SSC_MSB_FIRST
-#define IFX_SSC_DEF_MODE_RXTX	    IFX_SSC_MODE_RXTX
-// other values
-#define IFX_SSC_DEF_MASTERSLAVE	    IFX_SSC_MASTER_MODE /* master */
-#define IFX_SSC_DEF_BAUDRATE	    1000000
-#define IFX_SSC_DEF_RMC	    	    0x10
-
-#define IFX_SSC_DEF_TXFIFO_FL       8
-#define IFX_SSC_DEF_RXFIFO_FL       1
-
-#if 1 //TODO
-#define IFX_SSC_DEF_GPO_CS	    2	/* no chip select */
-#define IFX_SSC_DEF_GPO_INV	    0	/* no chip select */
-#else
-#error "what is ur Chip Select???"
-#endif
-#define IFX_SSC_DEF_SFCON	    0	/* no serial framing */
-#if 0
-#define IFX_SSC_DEF_IRNEN	    IFX_SSC_T_BIT | /* enable all int's */\
-				    IFX_SSC_R_BIT | IFX_SSC_E_BIT | IFX_SSC_F_BIT
-#endif
-#define IFX_SSC_DEF_IRNEN	    IFX_SSC_T_BIT | /* enable all int's */\
-				    IFX_SSC_R_BIT | IFX_SSC_E_BIT
-#endif /* __KERNEL__ */
-
-// batch execution commands
-#define IFX_SSC_BATCH_CMD_INIT		1
-#define IFX_SSC_BATCH_CMD_READ		2
-#define IFX_SSC_BATCH_CMD_WRITE		3
-#define IFX_SSC_BATCH_CMD_RD_WR		4
-#define IFX_SSC_BATCH_CMD_SET_BAUDRATE	5
-#define IFX_SSC_BATCH_CMD_SET_HWOPTS	6
-#define IFX_SSC_BATCH_CMD_SET_FRM	7
-#define IFX_SSC_BATCH_CMD_SET_GPO	8
-#define IFX_SSC_BATCH_CMD_FIFO_FLUSH	9
-//#define IFX_SSC_BATCH_CMD_	
-//#define IFX_SSC_BATCH_CMD_	
-#define IFX_SSC_BATCH_CMD_END_EXEC	0
- 
-/* Macros to configure SSC hardware */
-/* headingControl: */
-#define IFX_SSC_LSB_FIRST            0
-#define IFX_SSC_MSB_FIRST            1
-/* dataWidth: */
-#define IFX_SSC_MIN_DATA_WIDTH       2
-#define IFX_SSC_MAX_DATA_WIDTH       32
-/* master/slave mode select */
-#define IFX_SSC_MASTER_MODE          1
-#define IFX_SSC_SLAVE_MODE           0
-/* rx/tx mode */
-// ### TO DO: !!! ATTENTION! Hardware dependency => move to ifx_ssc_defines.h
-#define IFX_SSC_MODE_RXTX	     0
-#define IFX_SSC_MODE_RX		     1
-#define IFX_SSC_MODE_TX		     2
-#define IFX_SSC_MODE_OFF	     3
-#define IFX_SSC_MODE_MASK	     IFX_SSC_MODE_RX | IFX_SSC_MODE_TX
-
-/* GPO values */
-#define IFX_SSC_MAX_GPO_OUT	     7
-
-#define IFX_SSC_RXREQ_BLOCK_SIZE     32768
-
-/***********************/
-/* defines for ioctl's */
-/***********************/
-#define IFX_SSC_IOCTL_MAGIC     'S'
-/* read out the statistics */
-#define IFX_SSC_STATS_READ _IOR(IFX_SSC_IOCTL_MAGIC, 1, struct ifx_ssc_statistics)
-/* clear the statistics */
-#define IFX_SSC_STATS_RESET _IO(IFX_SSC_IOCTL_MAGIC, 2)
-/* set the baudrate */
-#define IFX_SSC_BAUD_SET _IOW(IFX_SSC_IOCTL_MAGIC, 3, unsigned int)
-/* get the current baudrate */
-#define IFX_SSC_BAUD_GET _IOR(IFX_SSC_IOCTL_MAGIC, 4, unsigned int)
-/* set hardware options */
-#define IFX_SSC_HWOPTS_SET _IOW(IFX_SSC_IOCTL_MAGIC, 5, struct ifx_ssc_hwopts)
-/* get the current hardware options */
-#define IFX_SSC_HWOPTS_GET _IOR(IFX_SSC_IOCTL_MAGIC, 6, struct ifx_ssc_hwopts)
-/* set transmission mode */
-#define IFX_SSC_RXTX_MODE_SET _IOW(IFX_SSC_IOCTL_MAGIC, 7, unsigned int)
-/* get the current transmission mode */
-#define IFX_SSC_RXTX_MODE_GET _IOR(IFX_SSC_IOCTL_MAGIC, 8, unsigned int)
-/* abort transmission */
-#define IFX_SSC_ABORT _IO(IFX_SSC_IOCTL_MAGIC, 9)
-#define IFX_SSC_FIFO_FLUSH _IO(IFX_SSC_IOCTL_MAGIC, 9)
-
-/* set general purpose outputs */
-#define IFX_SSC_GPO_OUT_SET _IOW(IFX_SSC_IOCTL_MAGIC, 32, unsigned int)
-/* clear general purpose outputs */
-#define IFX_SSC_GPO_OUT_CLR _IOW(IFX_SSC_IOCTL_MAGIC, 33, unsigned int)
-/* get general purpose outputs */
-#define IFX_SSC_GPO_OUT_GET _IOR(IFX_SSC_IOCTL_MAGIC, 34, unsigned int)
-
-/*** serial framing ***/
-/* get status of serial framing */
-#define IFX_SSC_FRM_STATUS_GET _IOR(IFX_SSC_IOCTL_MAGIC, 48, struct ifx_ssc_frm_status)
-/* get counter reload values and control bits */
-#define IFX_SSC_FRM_CONTROL_GET _IOR(IFX_SSC_IOCTL_MAGIC, 49, struct ifx_ssc_frm_opts)
-/* set counter reload values and control bits */
-#define IFX_SSC_FRM_CONTROL_SET _IOW(IFX_SSC_IOCTL_MAGIC, 50, struct ifx_ssc_frm_opts)
-
-
-/*** batch execution ***/
-/* do batch execution */
-#define IFX_SSC_BATCH_EXEC _IOW(IFX_SSC_IOCTL_MAGIC, 64, struct ifx_ssc_batch_list)
-
-
-#ifdef __KERNEL__
-// routines from ifx_ssc.c
-// ### TO DO
-/* kernel interface for read and write */
-ssize_t ifx_ssc_kread(int, char *, size_t);
-ssize_t ifx_ssc_kwrite(int, const char *, size_t);
-
-#ifdef CONFIG_IFX_VP_KERNEL_TEST
-void ifx_ssc_tc(void);
-#endif // CONFIG_IFX_VP_KERNEL_TEST
-
-#endif //__KERNEL__
-#endif // __IFX_SSC_H
-
diff --git a/target/linux/amazon/files/include/asm-mips/amazon/ifx_ssc_defines.h b/target/linux/amazon/files/include/asm-mips/amazon/ifx_ssc_defines.h
deleted file mode 100644
index 46157dcbd..000000000
--- a/target/linux/amazon/files/include/asm-mips/amazon/ifx_ssc_defines.h
+++ /dev/null
@@ -1,552 +0,0 @@
-#ifndef IFX_SSC_DEFINES_H
-#define IFX_SSC_DEFINES_H
-
-#include "ifx_peripheral_definitions.h"
-
-/* maximum SSC FIFO size */
-#define IFX_SSC_MAX_FIFO_SIZE 32
-
-/* register map of SSC  */
-
-/* address of the Clock Control Register of the SSC */
-#define IFX_SSC_CLC                 0x00000000
-/* IFX_SSC_CLC register is significant in bits 23 downto 8 and in bits 5, 3, 2, 0  
-   bit 1 is hardware modified*/
-#define IFX_SSC_CLC_readmask  0x00FFFFEF
-#define IFX_SSC_CLC_writemask 0x00FFFF3D
-#define IFX_SSC_CLC_hwmask    0x00000002
-#define IFX_SSC_CLC_dontcare (IFX_SSC_CLC_readmask & IFX_SSC_CLC_writemask & ~IFX_SSC_CLC_hwmask)
-
-/* address of Port Input Select Register of the SSC */
-#define IFX_SSC_PISEL 0x00000004
-/* IFX_SSC_PISEL register is significant in lowest three bits only */
-#define IFX_SSC_PISEL_readmask  0x00000007
-#define IFX_SSC_PISEL_writemask 0x00000007
-#define IFX_SSC_PISEL_hwmask    0x00000000
-#define IFX_SSC_PISEL_dontcare (IFX_SSC_PISEL_readmask & IFX_SSC_PISEL_writemask & ~IFX_SSC_PISEL_hwmask)
-
-/* address of Identification Register of the SSC */
-#define IFX_SSC_ID 0x00000008
-/* IFX_SSC_ID register is significant in no bit */
-#define IFX_SSC_ID_readmask  0x0000FF3F
-#define IFX_SSC_ID_writemask 0x00000000
-#define IFX_SSC_ID_hwmask    0x00000000
-#define IFX_SSC_ID_dontcare (IFX_SSC_ID_readmask & IFX_SSC_ID_writemask & ~IFX_SSC_ID_hwmask)
-
-/* address of the Control Register of the SSC */
-#define IFX_SSC_CON            0x00000010
-/* IFX_SSC_CON register is significant in bits 23:22, 20:16 and 12:0 */
-#define IFX_SSC_CON_readmask  0x01DF1FFF
-#define IFX_SSC_CON_writemask 0x01DF1FFF
-#define IFX_SSC_CON_hwmask    0x00000000
-#define IFX_SSC_CON_dontcare (IFX_SSC_CON_readmask & IFX_SSC_CON_writemask & ~IFX_SSC_CON_hwmask)
-
-
-/* address of the Status Register of the SSC */
-#define IFX_SSC_STATE          0x00000014
-/* IFX_SSC_STATE register is readable in bits 30:28, 26:24, 20:16, 12:7 and 2:0
-   all bits except 1:0 are hardware modified */
-#define IFX_SSC_STATE_readmask  0x771F3F87
-#define IFX_SSC_STATE_writemask 0x00000000
-#define IFX_SSC_STATE_hwmask    0x771F3F84
-#define IFX_SSC_STATE_dontcare (IFX_SSC_STATE_readmask & IFX_SSC_STATE_writemask & ~IFX_SSC_STATE_hwmask)
-
-/* address of the Write Hardware Modified Control Register Bits of the SSC */
-#define IFX_SSC_WHBSTATE            0x00000018
-/* IFX_SSC_WHBSTATE register is write only */
-#define IFX_SSC_WHBSTATE_readmask  0x00000000
-#define IFX_SSC_WHBSTATE_writemask 0x0000FFFF
-#define IFX_SSC_WHBSTATE_hwmask    0x00000000
-#define IFX_SSC_WHBSTATE_dontcare (IFX_SSC_WHBSTATE_readmask & IFX_SSC_WHBSTATE_writemask & ~IFX_SSC_WHBSTATE_hwmask)
-
-/* address of the Baudrate Timer Reload Register of the SSC */
-#define IFX_SSC_BR              0x00000040
-/* IFX_SSC_BR register is significant in  bit 15 downto 0*/
-#define IFX_SSC_BR_readmask  0x0000FFFF
-#define IFX_SSC_BR_writemask 0x0000FFFF
-#define IFX_SSC_BR_hwmask    0x00000000
-#define IFX_SSC_BR_dontcare (IFX_SSC_BR_readmask & IFX_SSC_BR_writemask & ~IFX_SSC_BR_hwmask)
-
-/* address of the Baudrate Timer Status Register of the SSC */
-#define IFX_SSC_BRSTAT              0x00000044
-/* IFX_SSC_BRSTAT register is significant in  bit 15 downto 0*/
-#define IFX_SSC_BRSTAT_readmask  0x0000FFFF
-#define IFX_SSC_BRSTAT_writemask 0x00000000
-#define IFX_SSC_BRSTAT_hwmask    0x0000FFFF
-#define IFX_SSC_BRSTAT_dontcare (IFX_SSC_BRSTAT_readmask & IFX_SSC_BRSTAT_writemask & ~IFX_SSC_BRSTAT_hwmask)
-
-/* address of the Transmitter Buffer Register of the SSC */
-#define IFX_SSC_TB              0x00000020
-/* IFX_SSC_TB register is significant in  bit 31 downto 0*/
-#define IFX_SSC_TB_readmask  0xFFFFFFFF
-#define IFX_SSC_TB_writemask 0xFFFFFFFF
-#define IFX_SSC_TB_hwmask    0x00000000
-#define IFX_SSC_TB_dontcare (IFX_SSC_TB_readmask & IFX_SSC_TB_writemask & ~IFX_SSC_TB_hwmask)
-
-/* address of the Reciver Buffer Register of the SSC */
-#define IFX_SSC_RB              0x00000024
-/* IFX_SSC_RB register is significant in no bits*/
-#define IFX_SSC_RB_readmask  0xFFFFFFFF
-#define IFX_SSC_RB_writemask 0x00000000
-#define IFX_SSC_RB_hwmask    0xFFFFFFFF
-#define IFX_SSC_RB_dontcare (IFX_SSC_RB_readmask & IFX_SSC_RB_writemask & ~IFX_SSC_RB_hwmask)
-
-/* address of the Receive FIFO Control Register of the SSC */
-#define IFX_SSC_RXFCON              0x00000030
-/* IFX_SSC_RXFCON register is significant in bit 13 downto 8 and bit 1 downto 0 */
-#define IFX_SSC_RXFCON_readmask  0x00003F03
-#define IFX_SSC_RXFCON_writemask 0x00003F03
-#define IFX_SSC_RXFCON_hwmask    0x00000000
-#define IFX_SSC_RXFCON_dontcare (IFX_SSC_RXFCON_readmask & IFX_SSC_RXFCON_writemask & ~IFX_SSC_RXFCON_hwmask)
-
-/* address of the Transmit FIFO Control Register of the SSC */
-#define IFX_SSC_TXFCON              0x00000034
-/* IFX_SSC_TXFCON register is significant in bit 13 downto 8 and bit 1 downto 0 */
-#define IFX_SSC_TXFCON_readmask  0x00003F03
-#define IFX_SSC_TXFCON_writemask 0x00003F03
-#define IFX_SSC_TXFCON_hwmask    0x00000000
-#define IFX_SSC_TXFCON_dontcare (IFX_SSC_TXFCON_readmask & IFX_SSC_TXFCON_writemask & ~IFX_SSC_TXFCON_hwmask)
-
-/* address of the FIFO Status Register of the SSC */
-#define IFX_SSC_FSTAT               0x00000038
-/* IFX_SSC_FSTAT register is significant in no bit*/
-#define IFX_SSC_FSTAT_readmask  0x00003F3F
-#define IFX_SSC_FSTAT_writemask 0x00000000
-#define IFX_SSC_FSTAT_hwmask    0x00003F3F
-#define IFX_SSC_FSTAT_dontcare (IFX_SSC_FSTAT_readmask & IFX_SSC_FSTAT_writemask & ~IFX_SSC_FSTAT_hwmask)
-
-/* address of the Data Frame Control register of the SSC */
-#define IFX_SSC_SFCON               0x00000060
-#define IFX_SSC_SFCON_readmask  0xFFDFFFFD
-#define IFX_SSC_SFCON_writemask 0xFFDFFFFD
-#define IFX_SSC_SFCON_hwmask    0x00000000
-#define IFX_SSC_SFCON_dontcare (IFX_SSC_SFCON_readmask & IFX_SSC_SFCON_writemask & ~IFX_SSC_SFCON_hwmask)
-
-/* address of the Data Frame Status register of the SSC */
-#define IFX_SSC_SFSTAT               0x00000064
-#define IFX_SSC_SFSTAT_readmask  0xFFC0FFF3
-#define IFX_SSC_SFSTAT_writemask 0x00000000
-#define IFX_SSC_SFSTAT_hwmask    0xFFC0FFF3
-#define IFX_SSC_SFSTAT_dontcare (IFX_SSC_SFSTAT_readmask & IFX_SSC_SFSTAT_writemask & ~IFX_SSC_SFSTAT_hwmask)
-
-/* address of the General Purpose Output Control register of the SSC */
-#define IFX_SSC_GPOCON               0x00000070
-#define IFX_SSC_GPOCON_readmask  0x0000FFFF
-#define IFX_SSC_GPOCON_writemask 0x0000FFFF
-#define IFX_SSC_GPOCON_hwmask    0x00000000
-#define IFX_SSC_GPOCON_dontcare (IFX_SSC_GPOCON_readmask & IFX_SSC_GPOCON_writemask & ~IFX_SSC_GPOCON_hwmask)
-
-/* address of the General Purpose Output Status register of the SSC */
-#define IFX_SSC_GPOSTAT               0x00000074
-#define IFX_SSC_GPOSTAT_readmask  0x000000FF
-#define IFX_SSC_GPOSTAT_writemask 0x00000000
-#define IFX_SSC_GPOSTAT_hwmask    0x00000000
-#define IFX_SSC_GPOSTAT_dontcare (IFX_SSC_GPOSTAT_readmask & IFX_SSC_GPOSTAT_writemask & ~IFX_SSC_GPOSTAT_hwmask)
-
-/* address of the Force GPO Status register of the SSC */
-#define IFX_SSC_WHBGPOSTAT               0x00000078
-#define IFX_SSC_WHBGPOSTAT_readmask  0x00000000
-#define IFX_SSC_WHBGPOSTAT_writemask 0x0000FFFF
-#define IFX_SSC_WHBGPOSTAT_hwmask    0x00000000
-#define IFX_SSC_WHBGPOSTAT_dontcare (IFX_SSC_WHBGPOSTAT_readmask & IFX_SSC_WHBGPOSTAT_writemask & ~IFX_SSC_WHBGPOSTAT_hwmask)
-
-/* address of the Receive Request Register of the SSC */
-#define IFX_SSC_RXREQ               0x00000080
-#define IFX_SSC_RXREQ_readmask  0x0000FFFF
-#define IFX_SSC_RXREQ_writemask 0x0000FFFF
-#define IFX_SSC_RXREQ_hwmask    0x00000000
-#define IFX_SSC_RXREQ_dontcare (IFX_SSC_RXREQ_readmask & IFX_SSC_RXREQ_writemask & ~IFX_SSC_RXREQ_hwmask)
-
-/* address of the Receive Count Register of the SSC */
-#define IFX_SSC_RXCNT               0x00000084
-#define IFX_SSC_RXCNT_readmask  0x0000FFFF
-#define IFX_SSC_RXCNT_writemask 0x00000000
-#define IFX_SSC_RXCNT_hwmask    0x0000FFFF
-#define IFX_SSC_RXCNT_dontcare (IFX_SSC_RXCNT_readmask & IFX_SSC_RXCNT_writemask & ~IFX_SSC_RXCNT_hwmask)
-
-/* address of the DMA Configuration Register of the SSC */
-#define IFX_SSC_DMACON               0x000000EC
-#define IFX_SSC_DMACON_readmask  0x0000FFFF
-#define IFX_SSC_DMACON_writemask 0x00000000
-#define IFX_SSC_DMACON_hwmask    0x0000FFFF
-#define IFX_SSC_DMACON_dontcare (IFX_SSC_DMACON_readmask & IFX_SSC_DMACON_writemask & ~IFX_SSC_DMACON_hwmask)
-
-//------------------------------------------------------
-// interrupt register for enabling interrupts, mask register of irq_reg
-#define IFX_SSC_IRN_EN 0xF4
-// read/write
-#define IFX_SSC_IRN_EN_readmask  0x0000000F
-#define IFX_SSC_IRN_EN_writemask 0x0000000F
-#define IFX_SSC_IRN_EN_hwmask    0x00000000
-#define IFX_SSC_IRN_EN_dontcare  (IFX_SSC_IRN_EN_readmask & IFX_SSC_IRN_EN_writemask & ~IFX_SSC_IRN_EN_hwmask)
-
-// interrupt register for accessing interrupts
-#define IFX_SSC_IRN_CR                0xF8
-// read/write
-#define IFX_SSC_IRN_CR_readmask  0x0000000F
-#define IFX_SSC_IRN_CR_writemask 0x0000000F
-#define IFX_SSC_IRN_CR_hwmask    0x0000000F
-#define IFX_SSC_IRN_CR_dontcare  (IFX_SSC_IRN_CR_readmask & IFX_SSC_IRN_CR_writemask & ~IFX_SSC_IRN_CR_hwmask)
-
-// interrupt register for stimulating interrupts
-#define IFX_SSC_IRN_ICR                  0xFC
-// read/write
-#define IFX_SSC_IRN_ICR_readmask  0x0000000F
-#define IFX_SSC_IRN_ICR_writemask 0x0000000F
-#define IFX_SSC_IRN_ICR_hwmask    0x00000000
-#define IFX_SSC_IRN_ICR_dontcare  (IFX_SSC_IRN_ICR_readmask & IFX_SSC_IRN_ICR_writemask & ~IFX_SSC_IRN_ICR_hwmask)
-
-//---------------------------------------------------------------------
-// Number of IRQs and bitposition of IRQ
-#define IFX_SSC_NUM_IRQ           4
-#define IFX_SSC_T_BIT       0x00000001
-#define IFX_SSC_R_BIT       0x00000002
-#define IFX_SSC_E_BIT       0x00000004
-#define IFX_SSC_F_BIT       0x00000008
-
-/* bit masks for SSC registers */
-
-/* ID register */
-#define IFX_SSC_PERID_REV_MASK      0x0000001F
-#define IFX_SSC_PERID_CFG_MASK      0x00000020
-#define IFX_SSC_PERID_ID_MASK       0x0000FF00
-#define IFX_SSC_PERID_REV_OFFSET    0
-#define IFX_SSC_PERID_CFG_OFFSET    5
-#define IFX_SSC_PERID_ID_OFFSET     8
-#define IFX_SSC_PERID_ID            0x45
-#define IFX_SSC_PERID_DMA_ON        0x00000020
-#define IFX_SSC_PERID_RXFS_MASK     0x003F0000
-#define IFX_SSC_PERID_RXFS_OFFSET   16
-#define IFX_SSC_PERID_TXFS_MASK     0x3F000000
-#define IFX_SSC_PERID_TXFS_OFFSET   24
-
-/* PISEL register */
-#define IFX_SSC_PISEL_MASTER_IN_A       0x0000
-#define IFX_SSC_PISEL_MASTER_IN_B       0x0001
-#define IFX_SSC_PISEL_SLAVE_IN_A        0x0000
-#define IFX_SSC_PISEL_SLAVE_IN_B        0x0002
-#define IFX_SSC_PISEL_CLOCK_IN_A        0x0000
-#define IFX_SSC_PISEL_CLOCK_IN_B        0x0004
-
-
-/* IFX_SSC_CON register */
-#define IFX_SSC_CON_ECHO_MODE_ON       0x01000000
-#define IFX_SSC_CON_ECHO_MODE_OFF      0x00000000
-#define IFX_SSC_CON_IDLE_HIGH          0x00800000
-#define IFX_SSC_CON_IDLE_LOW           0x00000000
-#define IFX_SSC_CON_ENABLE_BYTE_VALID  0x00400000
-#define IFX_SSC_CON_DISABLE_BYTE_VALID 0x00000000
-#define IFX_SSC_CON_DATA_WIDTH_OFFSET  16
-#define IFX_SSC_CON_DATA_WIDTH_MASK    0x001F0000
-#define IFX_SSC_ENCODE_DATA_WIDTH(width) (((width - 1) << IFX_SSC_CON_DATA_WIDTH_OFFSET) & IFX_SSC_CON_DATA_WIDTH_MASK)
-
-#define IFX_SSC_CON_RESET_ON_BAUDERR   0x00002000
-#define IFX_SSC_CON_GO_ON_ON_BAUDERR   0x00000000
-
-#define IFX_SSC_CON_RX_UFL_CHECK       0x00001000
-#define IFX_SSC_CON_RX_UFL_IGNORE      0x00000000
-#define IFX_SSC_CON_TX_UFL_CHECK       0x00000800
-#define IFX_SSC_CON_TX_UFL_IGNORE      0x00000000
-#define IFX_SSC_CON_ABORT_ERR_CHECK    0x00000400
-#define IFX_SSC_CON_ABORT_ERR_IGNORE   0x00000000
-#define IFX_SSC_CON_RX_OFL_CHECK       0x00000200
-#define IFX_SSC_CON_RX_OFL_IGNORE      0x00000000
-#define IFX_SSC_CON_TX_OFL_CHECK       0x00000100
-#define IFX_SSC_CON_TX_OFL_IGNORE      0x00000000
-#define IFX_SSC_CON_ALL_ERR_CHECK      0x00001F00
-#define IFX_SSC_CON_ALL_ERR_IGNORE     0x00000000
-
-#define IFX_SSC_CON_LOOPBACK_MODE      0x00000080
-#define IFX_SSC_CON_NO_LOOPBACK        0x00000000
-#define IFX_SSC_CON_HALF_DUPLEX        0x00000080
-#define IFX_SSC_CON_FULL_DUPLEX        0x00000000
-#define IFX_SSC_CON_CLOCK_FALL         0x00000040
-#define IFX_SSC_CON_CLOCK_RISE         0x00000000
-#define IFX_SSC_CON_SHIFT_THEN_LATCH   0x00000000
-#define IFX_SSC_CON_LATCH_THEN_SHIFT   0x00000020
-#define IFX_SSC_CON_MSB_FIRST          0x00000010
-#define IFX_SSC_CON_LSB_FIRST          0x00000000
-#define IFX_SSC_CON_ENABLE_CSB         0x00000008
-#define IFX_SSC_CON_DISABLE_CSB        0x00000000
-#define IFX_SSC_CON_INVERT_CSB         0x00000004
-#define IFX_SSC_CON_TRUE_CSB           0x00000000
-#define IFX_SSC_CON_RX_OFF             0x00000002
-#define IFX_SSC_CON_RX_ON              0x00000000
-#define IFX_SSC_CON_TX_OFF             0x00000001
-#define IFX_SSC_CON_TX_ON              0x00000000
-
-
-/* IFX_SSC_STATE register */
-#define IFX_SSC_STATE_RX_BYTE_VALID_OFFSET 28
-#define IFX_SSC_STATE_RX_BYTE_VALID_MASK   0x70000000
-#define IFX_SSC_DECODE_RX_BYTE_VALID(con_state) ((con_state & IFX_SSC_STATE_RX_BYTE_VALID_MASK) >> IFX_SSC_STATE_RX_BYTE_VALID_OFFSET)
-#define IFX_SSC_STATE_TX_BYTE_VALID_OFFSET 24
-#define IFX_SSC_STATE_TX_BYTE_VALID_MASK   0x07000000
-#define IFX_SSC_DECODE_TX_BYTE_VALID(con_state) ((con_state & IFX_SSC_STATE_TX_BYTE_VALID_MASK) >> IFX_SSC_STATE_TX_BYTE_VALID_OFFSET)
-#define IFX_SSC_STATE_BIT_COUNT_OFFSET     16
-#define IFX_SSC_STATE_BIT_COUNT_MASK       0x001F0000
-#define IFX_SSC_DECODE_DATA_WIDTH(con_state) (((con_state & IFX_SSC_STATE_BIT_COUNT_MASK) >> IFX_SSC_STATE_BIT_COUNT_OFFSET) + 1)
-#define IFX_SSC_STATE_BUSY                 0x00002000
-#define IFX_SSC_STATE_RX_UFL               0x00001000
-#define IFX_SSC_STATE_TX_UFL               0x00000800
-#define IFX_SSC_STATE_ABORT_ERR            0x00000400
-#define IFX_SSC_STATE_RX_OFL               0x00000200
-#define IFX_SSC_STATE_TX_OFL               0x00000100
-#define IFX_SSC_STATE_MODE_ERR             0x00000080
-#define IFX_SSC_STATE_SLAVE_IS_SELECTED    0x00000004
-#define IFX_SSC_STATE_IS_MASTER            0x00000002
-#define IFX_SSC_STATE_IS_ENABLED           0x00000001
-			      
-/* WHBSTATE register */
-#define IFX_SSC_WHBSTATE_DISABLE_SSC        0x0001
-#define IFX_SSC_WHBSTATE_CONFIGURATION_MODE 0x0001
-#define IFX_SSC_WHBSTATE_CLR_ENABLE         0x0001
-
-#define IFX_SSC_WHBSTATE_ENABLE_SSC         0x0002
-#define IFX_SSC_WHBSTATE_RUN_MODE           0x0002
-#define IFX_SSC_WHBSTATE_SET_ENABLE         0x0002
-
-#define IFX_SSC_WHBSTATE_SLAVE_MODE         0x0004
-#define IFX_SSC_WHBSTATE_CLR_MASTER_SELECT  0x0004
-
-#define IFX_SSC_WHBSTATE_MASTER_MODE        0x0008
-#define IFX_SSC_WHBSTATE_SET_MASTER_SELECT  0x0008
-
-#define IFX_SSC_WHBSTATE_CLR_RX_UFL_ERROR   0x0010
-#define IFX_SSC_WHBSTATE_SET_RX_UFL_ERROR   0x0020
-
-#define IFX_SSC_WHBSTATE_CLR_MODE_ERROR     0x0040
-#define IFX_SSC_WHBSTATE_SET_MODE_ERROR     0x0080
-
-#define IFX_SSC_WHBSTATE_CLR_TX_OFL_ERROR   0x0100
-#define IFX_SSC_WHBSTATE_CLR_RX_OFL_ERROR   0x0200
-#define IFX_SSC_WHBSTATE_CLR_ABORT_ERROR    0x0400
-#define IFX_SSC_WHBSTATE_CLR_TX_UFL_ERROR   0x0800
-#define IFX_SSC_WHBSTATE_SET_TX_OFL_ERROR   0x1000
-#define IFX_SSC_WHBSTATE_SET_RX_OFL_ERROR   0x2000
-#define IFX_SSC_WHBSTATE_SET_ABORT_ERROR    0x4000
-#define IFX_SSC_WHBSTATE_SET_TX_UFL_ERROR   0x8000
-#define IFX_SSC_WHBSTATE_CLR_ALL_ERROR      0x0F50
-#define IFX_SSC_WHBSTATE_SET_ALL_ERROR      0xF0A0
-
-/* BR register */
-#define IFX_SSC_BR_BAUDRATE_OFFSET      0
-#define IFX_SSC_BR_BAUDRATE_MASK        0xFFFF
-
-/* BR_STAT register */
-#define IFX_SSC_BRSTAT_BAUDTIMER_OFFSET      0
-#define IFX_SSC_BRSTAT_BAUDTIMER_MASK        0xFFFF
-
-/* TB register */
-#define IFX_SSC_TB_DATA_OFFSET      0
-#define IFX_SSC_TB_DATA_MASK        0xFFFFFFFF
-
-/* RB register */
-#define IFX_SSC_RB_DATA_OFFSET      0
-#define IFX_SSC_RB_DATA_MASK        0xFFFFFFFF
-
-
-/* RXFCON and TXFCON registers */
-#define IFX_SSC_XFCON_FIFO_DISABLE      0x0000
-#define IFX_SSC_XFCON_FIFO_ENABLE       0x0001
-#define IFX_SSC_XFCON_FIFO_FLUSH        0x0002
-#define IFX_SSC_XFCON_ITL_MASK          0x00003F00
-#define IFX_SSC_XFCON_ITL_OFFSET        8
-
-/* FSTAT register */
-#define IFX_SSC_FSTAT_RECEIVED_WORDS_OFFSET  0
-#define IFX_SSC_FSTAT_RECEIVED_WORDS_MASK    0x003F
-#define IFX_SSC_FSTAT_TRANSMIT_WORDS_OFFSET  8
-#define IFX_SSC_FSTAT_TRANSMIT_WORDS_MASK    0x3F00
-
-/* GPOCON register */
-#define IFX_SSC_GPOCON_INVOUT0_POS      0
-#define IFX_SSC_GPOCON_INV_OUT0         0x00000001
-#define IFX_SSC_GPOCON_TRUE_OUT0        0x00000000
-#define IFX_SSC_GPOCON_INVOUT1_POS      1
-#define IFX_SSC_GPOCON_INV_OUT1         0x00000002
-#define IFX_SSC_GPOCON_TRUE_OUT1        0x00000000
-#define IFX_SSC_GPOCON_INVOUT2_POS      2
-#define IFX_SSC_GPOCON_INV_OUT2         0x00000003
-#define IFX_SSC_GPOCON_TRUE_OUT2        0x00000000
-#define IFX_SSC_GPOCON_INVOUT3_POS      3
-#define IFX_SSC_GPOCON_INV_OUT3         0x00000008
-#define IFX_SSC_GPOCON_TRUE_OUT3        0x00000000
-#define IFX_SSC_GPOCON_INVOUT4_POS      4
-#define IFX_SSC_GPOCON_INV_OUT4         0x00000010
-#define IFX_SSC_GPOCON_TRUE_OUT4        0x00000000
-#define IFX_SSC_GPOCON_INVOUT5_POS      5
-#define IFX_SSC_GPOCON_INV_OUT5         0x00000020
-#define IFX_SSC_GPOCON_TRUE_OUT5        0x00000000
-#define IFX_SSC_GPOCON_INVOUT6_POS      6
-#define IFX_SSC_GPOCON_INV_OUT6         0x00000040
-#define IFX_SSC_GPOCON_TRUE_OUT6        0x00000000
-#define IFX_SSC_GPOCON_INVOUT7_POS      7
-#define IFX_SSC_GPOCON_INV_OUT7         0x00000080
-#define IFX_SSC_GPOCON_TRUE_OUT7        0x00000000
-#define IFX_SSC_GPOCON_INV_OUT_ALL      0x000000FF
-#define IFX_SSC_GPOCON_TRUE_OUT_ALL     0x00000000
-
-#define IFX_SSC_GPOCON_ISCSB0_POS       8
-#define IFX_SSC_GPOCON_IS_CSB0          0x00000100
-#define IFX_SSC_GPOCON_IS_GPO0          0x00000000
-#define IFX_SSC_GPOCON_ISCSB1_POS       9
-#define IFX_SSC_GPOCON_IS_CSB1          0x00000200
-#define IFX_SSC_GPOCON_IS_GPO1          0x00000000
-#define IFX_SSC_GPOCON_ISCSB2_POS       10
-#define IFX_SSC_GPOCON_IS_CSB2          0x00000400
-#define IFX_SSC_GPOCON_IS_GPO2          0x00000000
-#define IFX_SSC_GPOCON_ISCSB3_POS       11
-#define IFX_SSC_GPOCON_IS_CSB3          0x00000800
-#define IFX_SSC_GPOCON_IS_GPO3          0x00000000
-#define IFX_SSC_GPOCON_ISCSB4_POS       12
-#define IFX_SSC_GPOCON_IS_CSB4          0x00001000
-#define IFX_SSC_GPOCON_IS_GPO4          0x00000000
-#define IFX_SSC_GPOCON_ISCSB5_POS       13
-#define IFX_SSC_GPOCON_IS_CSB5          0x00002000
-#define IFX_SSC_GPOCON_IS_GPO5          0x00000000
-#define IFX_SSC_GPOCON_ISCSB6_POS       14
-#define IFX_SSC_GPOCON_IS_CSB6          0x00004000
-#define IFX_SSC_GPOCON_IS_GPO6          0x00000000
-#define IFX_SSC_GPOCON_ISCSB7_POS       15
-#define IFX_SSC_GPOCON_IS_CSB7          0x00008000
-#define IFX_SSC_GPOCON_IS_GPO7          0x00000000
-#define IFX_SSC_GPOCON_IS_CSB_ALL       0x0000FF00
-#define IFX_SSC_GPOCON_IS_GPO_ALL       0x00000000
-
-/* GPOSTAT register */
-#define IFX_SSC_GPOSTAT_OUT0            0x00000001
-#define IFX_SSC_GPOSTAT_OUT1            0x00000002
-#define IFX_SSC_GPOSTAT_OUT2            0x00000004
-#define IFX_SSC_GPOSTAT_OUT3            0x00000008
-#define IFX_SSC_GPOSTAT_OUT4            0x00000010
-#define IFX_SSC_GPOSTAT_OUT5            0x00000020
-#define IFX_SSC_GPOSTAT_OUT6            0x00000040
-#define IFX_SSC_GPOSTAT_OUT7            0x00000080
-#define IFX_SSC_GPOSTAT_OUT_ALL         0x000000FF
-
-/* WHBGPOSTAT register */
-#define IFX_SSC_WHBGPOSTAT_CLROUT0_POS  0
-#define IFX_SSC_WHBGPOSTAT_CLR_OUT0     0x00000001
-#define IFX_SSC_WHBGPOSTAT_CLROUT1_POS  1
-#define IFX_SSC_WHBGPOSTAT_CLR_OUT1     0x00000002
-#define IFX_SSC_WHBGPOSTAT_CLROUT2_POS  2
-#define IFX_SSC_WHBGPOSTAT_CLR_OUT2     0x00000004
-#define IFX_SSC_WHBGPOSTAT_CLROUT3_POS  3
-#define IFX_SSC_WHBGPOSTAT_CLR_OUT3     0x00000008
-#define IFX_SSC_WHBGPOSTAT_CLROUT4_POS  4
-#define IFX_SSC_WHBGPOSTAT_CLR_OUT4     0x00000010
-#define IFX_SSC_WHBGPOSTAT_CLROUT5_POS  5
-#define IFX_SSC_WHBGPOSTAT_CLR_OUT5     0x00000020
-#define IFX_SSC_WHBGPOSTAT_CLROUT6_POS  6
-#define IFX_SSC_WHBGPOSTAT_CLR_OUT6     0x00000040
-#define IFX_SSC_WHBGPOSTAT_CLROUT7_POS  7
-#define IFX_SSC_WHBGPOSTAT_CLR_OUT7     0x00000080
-#define IFX_SSC_WHBGPOSTAT_CLR_OUT_ALL  0x000000FF
-
-#define IFX_SSC_WHBGPOSTAT_OUT0_POS  0
-#define IFX_SSC_WHBGPOSTAT_OUT1_POS  1
-#define IFX_SSC_WHBGPOSTAT_OUT2_POS  2
-#define IFX_SSC_WHBGPOSTAT_OUT3_POS  3
-#define IFX_SSC_WHBGPOSTAT_OUT4_POS  4
-#define IFX_SSC_WHBGPOSTAT_OUT5_POS  5
-#define IFX_SSC_WHBGPOSTAT_OUT6_POS  6
-#define IFX_SSC_WHBGPOSTAT_OUT7_POS  7
-
-
-#define IFX_SSC_WHBGPOSTAT_SETOUT0_POS  8
-#define IFX_SSC_WHBGPOSTAT_SET_OUT0     0x00000100
-#define IFX_SSC_WHBGPOSTAT_SETOUT1_POS  9
-#define IFX_SSC_WHBGPOSTAT_SET_OUT1     0x00000200
-#define IFX_SSC_WHBGPOSTAT_SETOUT2_POS  10
-#define IFX_SSC_WHBGPOSTAT_SET_OUT2     0x00000400
-#define IFX_SSC_WHBGPOSTAT_SETOUT3_POS  11
-#define IFX_SSC_WHBGPOSTAT_SET_OUT3     0x00000800
-#define IFX_SSC_WHBGPOSTAT_SETOUT4_POS  12
-#define IFX_SSC_WHBGPOSTAT_SET_OUT4     0x00001000
-#define IFX_SSC_WHBGPOSTAT_SETOUT5_POS  13
-#define IFX_SSC_WHBGPOSTAT_SET_OUT5     0x00002000
-#define IFX_SSC_WHBGPOSTAT_SETOUT6_POS  14
-#define IFX_SSC_WHBGPOSTAT_SET_OUT6     0x00004000
-#define IFX_SSC_WHBGPOSTAT_SETOUT7_POS  15
-#define IFX_SSC_WHBGPOSTAT_SET_OUT7     0x00008000
-#define IFX_SSC_WHBGPOSTAT_SET_OUT_ALL  0x0000FF00
-
-/* SFCON register */
-#define IFX_SSC_SFCON_SF_ENABLE                0x00000001
-#define IFX_SSC_SFCON_SF_DISABLE               0x00000000
-#define IFX_SSC_SFCON_FIR_ENABLE_BEFORE_PAUSE  0x00000004
-#define IFX_SSC_SFCON_FIR_DISABLE_BEFORE_PAUSE 0x00000000
-#define IFX_SSC_SFCON_FIR_ENABLE_AFTER_PAUSE   0x00000008
-#define IFX_SSC_SFCON_FIR_DISABLE_AFTER_PAUSE  0x00000000
-#define IFX_SSC_SFCON_DATA_LENGTH_MASK         0x0000FFF0
-#define IFX_SSC_SFCON_DATA_LENGTH_OFFSET       4
-#define IFX_SSC_SFCON_PAUSE_DATA_MASK          0x00030000
-#define IFX_SSC_SFCON_PAUSE_DATA_OFFSET        16
-#define IFX_SSC_SFCON_PAUSE_DATA_0             0x00000000
-#define IFX_SSC_SFCON_PAUSE_DATA_1             0x00010000
-#define IFX_SSC_SFCON_PAUSE_DATA_IDLE          0x00020000
-#define IFX_SSC_SFCON_PAUSE_CLOCK_MASK         0x000C0000
-#define IFX_SSC_SFCON_PAUSE_CLOCK_OFFSET       18
-#define IFX_SSC_SFCON_PAUSE_CLOCK_0            0x00000000
-#define IFX_SSC_SFCON_PAUSE_CLOCK_1            0x00040000
-#define IFX_SSC_SFCON_PAUSE_CLOCK_IDLE         0x00080000
-#define IFX_SSC_SFCON_PAUSE_CLOCK_RUN          0x000C0000
-#define IFX_SSC_SFCON_STOP_AFTER_PAUSE         0x00100000
-#define IFX_SSC_SFCON_CONTINUE_AFTER_PAUSE     0x00000000
-#define IFX_SSC_SFCON_PAUSE_LENGTH_MASK        0xFFC00000
-#define IFX_SSC_SFCON_PAUSE_LENGTH_OFFSET      22
-#define IFX_SSC_SFCON_DATA_LENGTH_MAX	       4096
-#define IFX_SSC_SFCON_PAUSE_LENGTH_MAX	       1024
-
-#define IFX_SSC_SFCON_EXTRACT_DATA_LENGTH(sfcon)  ((sfcon & IFX_SSC_SFCON_DATA_LENGTH_MASK) >> IFX_SSC_SFCON_DATA_LENGTH_OFFSET)
-#define IFX_SSC_SFCON_EXTRACT_PAUSE_LENGTH(sfcon) ((sfcon & IFX_SSC_SFCON_PAUSE_LENGTH_MASK) >> IFX_SSC_SFCON_PAUSE_LENGTH_OFFSET)
-#define IFX_SSC_SFCON_SET_DATA_LENGTH(value)      ((value << IFX_SSC_SFCON_DATA_LENGTH_OFFSET) & IFX_SSC_SFCON_DATA_LENGTH_MASK)
-#define IFX_SSC_SFCON_SET_PAUSE_LENGTH(value)      ((value << IFX_SSC_SFCON_PAUSE_LENGTH_OFFSET) & IFX_SSC_SFCON_PAUSE_LENGTH_MASK)
-
-/* SFSTAT register */
-#define IFX_SSC_SFSTAT_IN_DATA            0x00000001
-#define IFX_SSC_SFSTAT_IN_PAUSE           0x00000002
-#define IFX_SSC_SFSTAT_DATA_COUNT_MASK    0x0000FFF0
-#define IFX_SSC_SFSTAT_DATA_COUNT_OFFSET  4
-#define IFX_SSC_SFSTAT_PAUSE_COUNT_MASK   0xFFF00000
-#define IFX_SSC_SFSTAT_PAUSE_COUNT_OFFSET 20
-
-#define IFX_SSC_SFSTAT_EXTRACT_DATA_COUNT(sfstat) ((sfstat & IFX_SSC_SFSTAT_DATA_COUNT_MASK) >> IFX_SSC_SFSTAT_DATA_COUNT_OFFSET)
-#define IFX_SSC_SFSTAT_EXTRACT_PAUSE_COUNT(sfstat) ((sfstat & IFX_SSC_SFSTAT_PAUSE_COUNT_MASK) >> IFX_SSC_SFSTAT_PAUSE_COUNT_OFFSET)
-
-/* RXREQ register */
-#define IFX_SSC_RXREQ_RXCOUNT_MASK       0x0000FFFF
-#define IFX_SSC_RXREQ_RXCOUNT_OFFSET     0
-
-/* RXCNT register */
-#define IFX_SSC_RXCNT_TODO_MASK       0x0000FFFF
-#define IFX_SSC_RXCNT_TODO_OFFSET     0
-
-/* DMACON register */
-#define IFX_SSC_DMACON_RXON           0x00000001
-#define IFX_SSC_DMACON_RXOFF          0x00000000
-#define IFX_SSC_DMACON_TXON           0x00000002
-#define IFX_SSC_DMACON_TXOFF          0x00000000
-#define IFX_SSC_DMACON_DMAON          0x00000003
-#define IFX_SSC_DMACON_DMAOFF         0x00000000
-#define IFX_SSC_DMACON_CLASS_MASK     0x0000000C
-#define IFX_SSC_DMACON_CLASS_OFFSET   2
-
-/* register access macros */ 
-#define ifx_ssc_fstat_received_words(status)    (status & 0x003F)
-#define ifx_ssc_fstat_words_to_transmit(status) ((status & 0x3F00) >> 8)
-
-#define ifx_ssc_change_status(data, addr)  WRITE_PERIPHERAL_REGISTER(data, (PHYS_OFFSET + addr + IFX_SSC_WHBSTATE))
-#define ifx_ssc_set_config(data, addr)     WRITE_PERIPHERAL_REGISTER(data, (PHYS_OFFSET + addr + IFX_SSC_CON))
-#define ifx_ssc_get_config(addr)           READ_PERIPHERAL_REGISTER((PHYS_OFFSET + addr + IFX_SSC_CON))
-#define ifx_ssc_get_status(addr)           READ_PERIPHERAL_REGISTER((PHYS_OFFSET + addr + IFX_SSC_STATE))
-#define ifx_ssc_receive(addr)              READ_PERIPHERAL_REGISTER((PHYS_OFFSET + addr + IFX_SSC_RB))
-#define ifx_ssc_transmit(data, addr)       WRITE_PERIPHERAL_REGISTER(data, (PHYS_OFFSET + addr + IFX_SSC_TB))
-#define ifx_ssc_fifo_status(addr)          READ_PERIPHERAL_REGISTER((PHYS_OFFSET + addr + IFX_SSC_FSTAT))
-#define ifx_ssc_set_baudrate(data, addr)   WRITE_PERIPHERAL_REGISTER(data, (PHYS_OFFSET + addr + IFX_SSC_BR))
-
-#define ifx_ssc_extract_rx_fifo_size(id)   ((id & IFX_SSC_PERID_RXFS_MASK) >> IFX_SSC_PERID_RXFS_OFFSET)
-#define ifx_ssc_extract_tx_fifo_size(id)   ((id & IFX_SSC_PERID_TXFS_MASK) >> IFX_SSC_PERID_TXFS_OFFSET)
-
-#endif
diff --git a/target/linux/amazon/files/include/asm-mips/amazon/irq.h b/target/linux/amazon/files/include/asm-mips/amazon/irq.h
deleted file mode 100644
index c575dd64b..000000000
--- a/target/linux/amazon/files/include/asm-mips/amazon/irq.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/* irq.h - AMAZON interrupts */
-
-#ifndef __AMAZON_IRQ
-#define __AMAZON_IRQ
-
-/************************************************************************
- *  Interrupt information
-*************************************************************************/
-
-/* these vectors are to handle the interrupts from the internal AMAZON
-   interrupt controller. THe INT_NUM values are really just indices into
-   an array and are set up so that we can use the INT_NUM as a shift
-   to calculate a mask value. */
-#define INT_NUM_IRQ0	      	8
-#define INT_NUM_IM0_IRL0   	(INT_NUM_IRQ0 + 0) 
-#define INT_NUM_IM0_IRL1   	(INT_NUM_IRQ0 + 1) 
-#define INT_NUM_IM0_IRL2   	(INT_NUM_IRQ0 + 2) 
-#define INT_NUM_IM0_IRL3   	(INT_NUM_IRQ0 + 3) 
-#define INT_NUM_IM0_IRL4   	(INT_NUM_IRQ0 + 4) 
-#define INT_NUM_IM0_IRL5   	(INT_NUM_IRQ0 + 5) 
-#define INT_NUM_IM0_IRL6  	(INT_NUM_IRQ0 + 6) 
-#define INT_NUM_IM0_IRL7   	(INT_NUM_IRQ0 + 7) 
-#define INT_NUM_IM0_IRL8   	(INT_NUM_IRQ0 + 8) 
-#define INT_NUM_IM0_IRL9   	(INT_NUM_IRQ0 + 9) 
-#define INT_NUM_IM0_IRL10	(INT_NUM_IRQ0 + 10) 
-#define INT_NUM_IM0_IRL11	(INT_NUM_IRQ0 + 11) 
-#define INT_NUM_IM0_IRL12	(INT_NUM_IRQ0 + 12) 
-#define INT_NUM_IM0_IRL13	(INT_NUM_IRQ0 + 13) 
-#define INT_NUM_IM0_IRL14	(INT_NUM_IRQ0 + 14) 
-#define INT_NUM_IM0_IRL15	(INT_NUM_IRQ0 + 15) 
-#define INT_NUM_IM0_IRL16	(INT_NUM_IRQ0 + 16) 
-#define INT_NUM_IM0_IRL17	(INT_NUM_IRQ0 + 17) 
-#define INT_NUM_IM0_IRL18	(INT_NUM_IRQ0 + 18) 
-#define INT_NUM_IM0_IRL19	(INT_NUM_IRQ0 + 19) 
-#define INT_NUM_IM0_IRL20	(INT_NUM_IRQ0 + 20) 
-#define INT_NUM_IM0_IRL21	(INT_NUM_IRQ0 + 21) 
-#define INT_NUM_IM0_IRL22	(INT_NUM_IRQ0 + 22) 
-#define INT_NUM_IM0_IRL23  	(INT_NUM_IRQ0 + 23) 
-#define INT_NUM_IM0_IRL24	(INT_NUM_IRQ0 + 24) 
-#define INT_NUM_IM0_IRL25	(INT_NUM_IRQ0 + 25) 
-#define INT_NUM_IM0_IRL26	(INT_NUM_IRQ0 + 26) 
-#define INT_NUM_IM0_IRL27	(INT_NUM_IRQ0 + 27) 
-#define INT_NUM_IM0_IRL28	(INT_NUM_IRQ0 + 28) 
-#define INT_NUM_IM0_IRL29	(INT_NUM_IRQ0 + 29) 
-#define INT_NUM_IM0_IRL30	(INT_NUM_IRQ0 + 30) 
-#define INT_NUM_IM0_IRL31	(INT_NUM_IRQ0 + 31) 
-
-#define INT_NUM_IM1_IRL0   	(INT_NUM_IRQ0 + 32) 
-#define INT_NUM_IM1_IRL1   	(INT_NUM_IM1_IRL0 + 1) 
-#define INT_NUM_IM1_IRL2   	(INT_NUM_IM1_IRL0 + 2) 
-#define INT_NUM_IM1_IRL3   	(INT_NUM_IM1_IRL0 + 3) 
-#define INT_NUM_IM1_IRL4   	(INT_NUM_IM1_IRL0 + 4) 
-#define INT_NUM_IM1_IRL5   	(INT_NUM_IM1_IRL0 + 5) 
-#define INT_NUM_IM1_IRL6   	(INT_NUM_IM1_IRL0 + 6) 
-#define INT_NUM_IM1_IRL7   	(INT_NUM_IM1_IRL0 + 7) 
-#define INT_NUM_IM1_IRL8   	(INT_NUM_IM1_IRL0 + 8) 
-#define INT_NUM_IM1_IRL9   	(INT_NUM_IM1_IRL0 + 9) 
-#define INT_NUM_IM1_IRL10	(INT_NUM_IM1_IRL0 + 10) 
-#define INT_NUM_IM1_IRL11	(INT_NUM_IM1_IRL0 + 11) 
-#define INT_NUM_IM1_IRL12	(INT_NUM_IM1_IRL0 + 12) 
-#define INT_NUM_IM1_IRL13	(INT_NUM_IM1_IRL0 + 13) 
-#define INT_NUM_IM1_IRL14	(INT_NUM_IM1_IRL0 + 14) 
-#define INT_NUM_IM1_IRL15	(INT_NUM_IM1_IRL0 + 15) 
-#define INT_NUM_IM1_IRL16       (INT_NUM_IM1_IRL0 + 16) 
-#define INT_NUM_IM1_IRL17	(INT_NUM_IM1_IRL0 + 17) 
-#define INT_NUM_IM1_IRL18	(INT_NUM_IM1_IRL0 + 18) 
-#define INT_NUM_IM1_IRL19	(INT_NUM_IM1_IRL0 + 19) 
-#define INT_NUM_IM1_IRL20	(INT_NUM_IM1_IRL0 + 20) 
-#define INT_NUM_IM1_IRL21	(INT_NUM_IM1_IRL0 + 21) 
-#define INT_NUM_IM1_IRL22	(INT_NUM_IM1_IRL0 + 22) 
-#define INT_NUM_IM1_IRL23	(INT_NUM_IM1_IRL0 + 23) 
-#define INT_NUM_IM1_IRL24	(INT_NUM_IM1_IRL0 + 24) 
-#define INT_NUM_IM1_IRL25	(INT_NUM_IM1_IRL0 + 25) 
-#define INT_NUM_IM1_IRL26	(INT_NUM_IM1_IRL0 + 26) 
-#define INT_NUM_IM1_IRL27	(INT_NUM_IM1_IRL0 + 27) 
-#define INT_NUM_IM1_IRL28	(INT_NUM_IM1_IRL0 + 28) 
-#define INT_NUM_IM1_IRL29	(INT_NUM_IM1_IRL0 + 29) 
-#define INT_NUM_IM1_IRL30	(INT_NUM_IM1_IRL0 + 30) 
-#define INT_NUM_IM1_IRL31	(INT_NUM_IM1_IRL0 + 31) 
-
-#define INT_NUM_IM2_IRL0   	(INT_NUM_IRQ0 + 64) 
-#define INT_NUM_IM2_IRL1   	(INT_NUM_IM2_IRL0 + 1) 
-#define INT_NUM_IM2_IRL2   	(INT_NUM_IM2_IRL0 + 2) 
-#define INT_NUM_IM2_IRL3   	(INT_NUM_IM2_IRL0 + 3) 
-#define INT_NUM_IM2_IRL4   	(INT_NUM_IM2_IRL0 + 4) 
-#define INT_NUM_IM2_IRL5   	(INT_NUM_IM2_IRL0 + 5) 
-#define INT_NUM_IM2_IRL6   	(INT_NUM_IM2_IRL0 + 6) 
-#define INT_NUM_IM2_IRL7   	(INT_NUM_IM2_IRL0 + 7) 
-#define INT_NUM_IM2_IRL8   	(INT_NUM_IM2_IRL0 + 8) 
-#define INT_NUM_IM2_IRL9   	(INT_NUM_IM2_IRL0 + 9) 
-#define INT_NUM_IM2_IRL10	(INT_NUM_IM2_IRL0 + 10) 
-#define INT_NUM_IM2_IRL11	(INT_NUM_IM2_IRL0 + 11) 
-#define INT_NUM_IM2_IRL12	(INT_NUM_IM2_IRL0 + 12) 
-#define INT_NUM_IM2_IRL13	(INT_NUM_IM2_IRL0 + 13) 
-#define INT_NUM_IM2_IRL14	(INT_NUM_IM2_IRL0 + 14) 
-#define INT_NUM_IM2_IRL15	(INT_NUM_IM2_IRL0 + 15) 
-#define INT_NUM_IM2_IRL16	(INT_NUM_IM2_IRL0 + 16) 
-#define INT_NUM_IM2_IRL17	(INT_NUM_IM2_IRL0 + 17) 
-#define INT_NUM_IM2_IRL18	(INT_NUM_IM2_IRL0 + 18) 
-#define INT_NUM_IM2_IRL19	(INT_NUM_IM2_IRL0 + 19) 
-#define INT_NUM_IM2_IRL20	(INT_NUM_IM2_IRL0 + 20) 
-#define INT_NUM_IM2_IRL21	(INT_NUM_IM2_IRL0 + 21) 
-#define INT_NUM_IM2_IRL22	(INT_NUM_IM2_IRL0 + 22) 
-#define INT_NUM_IM2_IRL23	(INT_NUM_IM2_IRL0 + 23) 
-#define INT_NUM_IM2_IRL24	(INT_NUM_IM2_IRL0 + 24) 
-#define INT_NUM_IM2_IRL25	(INT_NUM_IM2_IRL0 + 25) 
-#define INT_NUM_IM2_IRL26	(INT_NUM_IM2_IRL0 + 26) 
-#define INT_NUM_IM2_IRL27	(INT_NUM_IM2_IRL0 + 27) 
-#define INT_NUM_IM2_IRL28	(INT_NUM_IM2_IRL0 + 28) 
-#define INT_NUM_IM2_IRL29	(INT_NUM_IM2_IRL0 + 29) 
-#define INT_NUM_IM2_IRL30	(INT_NUM_IM2_IRL0 + 30) 
-#define INT_NUM_IM2_IRL31	(INT_NUM_IM2_IRL0 + 31) 
-
-#define INT_NUM_IM3_IRL0   	(INT_NUM_IRQ0 + 96) 
-#define INT_NUM_IM3_IRL1   	(INT_NUM_IM3_IRL0 + 1) 
-#define INT_NUM_IM3_IRL2   	(INT_NUM_IM3_IRL0 + 2) 
-#define INT_NUM_IM3_IRL3   	(INT_NUM_IM3_IRL0 + 3) 
-#define INT_NUM_IM3_IRL4   	(INT_NUM_IM3_IRL0 + 4) 
-#define INT_NUM_IM3_IRL5   	(INT_NUM_IM3_IRL0 + 5) 
-#define INT_NUM_IM3_IRL6   	(INT_NUM_IM3_IRL0 + 6) 
-#define INT_NUM_IM3_IRL7   	(INT_NUM_IM3_IRL0 + 7) 
-#define INT_NUM_IM3_IRL8   	(INT_NUM_IM3_IRL0 + 8) 
-#define INT_NUM_IM3_IRL9   	(INT_NUM_IM3_IRL0 + 9) 
-#define INT_NUM_IM3_IRL10	(INT_NUM_IM3_IRL0 + 10) 
-#define INT_NUM_IM3_IRL11	(INT_NUM_IM3_IRL0 + 11) 
-#define INT_NUM_IM3_IRL12	(INT_NUM_IM3_IRL0 + 12) 
-#define INT_NUM_IM3_IRL13	(INT_NUM_IM3_IRL0 + 13) 
-#define INT_NUM_IM3_IRL14	(INT_NUM_IM3_IRL0 + 14) 
-#define INT_NUM_IM3_IRL15	(INT_NUM_IM3_IRL0 + 15) 
-#define INT_NUM_IM3_IRL16	(INT_NUM_IM3_IRL0 + 16) 
-#define INT_NUM_IM3_IRL17	(INT_NUM_IM3_IRL0 + 17) 
-#define INT_NUM_IM3_IRL18	(INT_NUM_IM3_IRL0 + 18) 
-#define INT_NUM_IM3_IRL19	(INT_NUM_IM3_IRL0 + 19) 
-#define INT_NUM_IM3_IRL20	(INT_NUM_IM3_IRL0 + 20) 
-#define INT_NUM_IM3_IRL21	(INT_NUM_IM3_IRL0 + 21) 
-#define INT_NUM_IM3_IRL22	(INT_NUM_IM3_IRL0 + 22) 
-#define INT_NUM_IM3_IRL23	(INT_NUM_IM3_IRL0 + 23) 
-#define INT_NUM_IM3_IRL24	(INT_NUM_IM3_IRL0 + 24) 
-#define INT_NUM_IM3_IRL25	(INT_NUM_IM3_IRL0 + 25) 
-#define INT_NUM_IM3_IRL26	(INT_NUM_IM3_IRL0 + 26) 
-#define INT_NUM_IM3_IRL27	(INT_NUM_IM3_IRL0 + 27) 
-#define INT_NUM_IM3_IRL28	(INT_NUM_IM3_IRL0 + 28) 
-#define INT_NUM_IM3_IRL29	(INT_NUM_IM3_IRL0 + 29) 
-#define INT_NUM_IM3_IRL30	(INT_NUM_IM3_IRL0 + 30) 
-#define INT_NUM_IM3_IRL31	(INT_NUM_IM3_IRL0 + 31) 
-
-#define INT_NUM_IM4_IRL0   	(INT_NUM_IRQ0 + 128) 
-#define INT_NUM_IM4_IRL1   	(INT_NUM_IM4_IRL0 + 1) 
-#define INT_NUM_IM4_IRL2   	(INT_NUM_IM4_IRL0 + 2) 
-#define INT_NUM_IM4_IRL3   	(INT_NUM_IM4_IRL0 + 3) 
-#define INT_NUM_IM4_IRL4   	(INT_NUM_IM4_IRL0 + 4) 
-#define INT_NUM_IM4_IRL5   	(INT_NUM_IM4_IRL0 + 5) 
-#define INT_NUM_IM4_IRL6   	(INT_NUM_IM4_IRL0 + 6) 
-#define INT_NUM_IM4_IRL7   	(INT_NUM_IM4_IRL0 + 7) 
-#define INT_NUM_IM4_IRL8   	(INT_NUM_IM4_IRL0 + 8) 
-#define INT_NUM_IM4_IRL9   	(INT_NUM_IM4_IRL0 + 9) 
-#define INT_NUM_IM4_IRL10	(INT_NUM_IM4_IRL0 + 10) 
-#define INT_NUM_IM4_IRL11	(INT_NUM_IM4_IRL0 + 11) 
-#define INT_NUM_IM4_IRL12	(INT_NUM_IM4_IRL0 + 12) 
-#define INT_NUM_IM4_IRL13	(INT_NUM_IM4_IRL0 + 13) 
-#define INT_NUM_IM4_IRL14	(INT_NUM_IM4_IRL0 + 14) 
-#define INT_NUM_IM4_IRL15	(INT_NUM_IM4_IRL0 + 15) 
-#define INT_NUM_IM4_IRL16	(INT_NUM_IM4_IRL0 + 16) 
-#define INT_NUM_IM4_IRL17	(INT_NUM_IM4_IRL0 + 17) 
-#define INT_NUM_IM4_IRL18	(INT_NUM_IM4_IRL0 + 18) 
-#define INT_NUM_IM4_IRL19	(INT_NUM_IM4_IRL0 + 19) 
-#define INT_NUM_IM4_IRL20	(INT_NUM_IM4_IRL0 + 20) 
-#define INT_NUM_IM4_IRL21	(INT_NUM_IM4_IRL0 + 21) 
-#define INT_NUM_IM4_IRL22	(INT_NUM_IM4_IRL0 + 22) 
-#define INT_NUM_IM4_IRL23	(INT_NUM_IM4_IRL0 + 23) 
-#define INT_NUM_IM4_IRL24	(INT_NUM_IM4_IRL0 + 24) 
-#define INT_NUM_IM4_IRL25	(INT_NUM_IM4_IRL0 + 25) 
-#define INT_NUM_IM4_IRL26	(INT_NUM_IM4_IRL0 + 26) 
-#define INT_NUM_IM4_IRL27	(INT_NUM_IM4_IRL0 + 27) 
-#define INT_NUM_IM4_IRL28	(INT_NUM_IM4_IRL0 + 28) 
-#define INT_NUM_IM4_IRL29	(INT_NUM_IM4_IRL0 + 29) 
-#define INT_NUM_IM4_IRL30	(INT_NUM_IM4_IRL0 + 30) 
-#define INT_NUM_IM4_IRL31	(INT_NUM_IM4_IRL0 + 31) 
-
-/****** Interrupt Assigments ***********/
-#define AMAZON_DMA_INT		INT_NUM_IM0_IRL0
-#define IFX_SSC_TIR		INT_NUM_IM0_IRL29
-#define IFX_SSC_RIR		INT_NUM_IM0_IRL30
-#define IFX_SSC_EIR		INT_NUM_IM0_IRL31
-
-#define	AMAZON_MEI_INT          INT_NUM_IM2_IRL8
-
-#define AMAZONASC_TIR 		INT_NUM_IM4_IRL15/* TX interrupt */
-#define AMAZONASC_RIR 		INT_NUM_IM4_IRL16/* RX interrupt */
-#define AMAZONASC_EIR 		INT_NUM_IM4_IRL17/* ERROR interrupt */
-
-#define AMAZON_TIMER6_INT	INT_NUM_IM1_IRL23
-
-#define	AMAZON_SWIE_INT         INT_NUM_IM3_IRL8
-#define	AMAZON_CBM_INT          INT_NUM_IM3_IRL9
-#define	AMAZON_AAL5_INT         INT_NUM_IM3_IRL10
-#define	AMAZON_HTU_INT          INT_NUM_IM3_IRL11
-#define	AMAZON_QSB_INT          INT_NUM_IM3_IRL12
-#define MIPS_CPU_TIMER_IRQ	7
-#endif	/* __AMAZON_IRQ */
diff --git a/target/linux/amazon/files/include/asm-mips/amazon/model.h b/target/linux/amazon/files/include/asm-mips/amazon/model.h
deleted file mode 100644
index 4e43ab5f1..000000000
--- a/target/linux/amazon/files/include/asm-mips/amazon/model.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef AMAZON_MODEL_H
-#define AMAZON_MODEL_H
-/******************************************************************************
-       Copyright (c) 2002, Infineon Technologies.  All rights reserved.
-
-                               No Warranty
-   Because the program is licensed free of charge, there is no warranty for
-   the program, to the extent permitted by applicable law.  Except when
-   otherwise stated in writing the copyright holders and/or other parties
-   provide the program "as is" without warranty of any kind, either
-   expressed or implied, including, but not limited to, the implied
-   warranties of merchantability and fitness for a particular purpose. The
-   entire risk as to the quality and performance of the program is with
-   you.  should the program prove defective, you assume the cost of all
-   necessary servicing, repair or correction.
-
-   In no event unless required by applicable law or agreed to in writing
-   will any copyright holder, or any other party who may modify and/or
-   redistribute the program as permitted above, be liable to you for
-   damages, including any general, special, incidental or consequential
-   damages arising out of the use or inability to use the program
-   (including but not limited to loss of data or data being rendered
-   inaccurate or losses sustained by you or third parties or a failure of
-   the program to operate with any other programs), even if such holder or
-   other party has been advised of the possibility of such damages.
-******************************************************************************/
-#define BOARD_SYSTEM_TYPE		"AMAZON"
-#define SYSTEM_MODEL_NAME		"Amazon Gateway Package 3.2 Version"
-#endif
diff --git a/target/linux/amazon/files/include/asm-mips/amazon/port.h b/target/linux/amazon/files/include/asm-mips/amazon/port.h
deleted file mode 100644
index 21825794c..000000000
--- a/target/linux/amazon/files/include/asm-mips/amazon/port.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * ########################################################################
- *
- *  This program is free software; you can distribute it and/or modify it
- *  under the terms of the GNU General Public License (Version 2) as
- *  published by the Free Software Foundation.
- *
- *  This program is distributed in the hope it will be useful, but WITHOUT
- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- *  for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * ########################################################################
- *
- * port.h
- *
- * Global Amazon port driver header file
- *
- */
-
-/* Modification history */
-/* 21Jun2004	btxu	Generate from Inca_IP project */
- 
-
-#ifndef PORT_H
-#define PORT_H
-
-struct amazon_port_ioctl_parm {
-	int port;
-	int pin;
-	int value;
-};
-#define AMAZON_PORT_IOC_MAGIC	0xbf
-#define AMAZON_PORT_IOCOD	_IOW( AMAZON_PORT_IOC_MAGIC,0,struct amazon_port_ioctl_parm)
-#define AMAZON_PORT_IOCPUDSEL	_IOW( AMAZON_PORT_IOC_MAGIC,1,struct amazon_port_ioctl_parm)
-#define AMAZON_PORT_IOCPUDEN	_IOW( AMAZON_PORT_IOC_MAGIC,2,struct amazon_port_ioctl_parm)
-#define AMAZON_PORT_IOCSTOFF	_IOW( AMAZON_PORT_IOC_MAGIC,3,struct amazon_port_ioctl_parm)
-#define AMAZON_PORT_IOCDIR	_IOW( AMAZON_PORT_IOC_MAGIC,4,struct amazon_port_ioctl_parm)
-#define AMAZON_PORT_IOCOUTPUT	_IOW( AMAZON_PORT_IOC_MAGIC,5,struct amazon_port_ioctl_parm)
-#define AMAZON_PORT_IOCINPUT	_IOWR(AMAZON_PORT_IOC_MAGIC,6,struct amazon_port_ioctl_parm)
-#define AMAZON_PORT_IOCALTSEL0  _IOW( AMAZON_PORT_IOC_MAGIC,7,struct amazon_port_ioctl_parm)
-#define AMAZON_PORT_IOCALTSEL1  _IOW( AMAZON_PORT_IOC_MAGIC,8,struct amazon_port_ioctl_parm)
-
-int amazon_port_reserve_pin(int port, int pin, int module_id);
-int amazon_port_free_pin(int port, int pin, int module_id);
-int amazon_port_set_open_drain(int port, int pin, int module_id);
-int amazon_port_clear_open_drain(int port, int pin, int module_id);
-int amazon_port_set_pudsel(int port, int pin, int module_id);
-int amazon_port_clear_pudsel(int port, int pin, int module_id);
-int amazon_port_set_puden(int port, int pin, int module_id);
-int amazon_port_clear_puden(int port, int pin, int module_id);
-int amazon_port_set_stoff(int port, int pin, int module_id);
-int amazon_port_clear_stoff(int port, int pin, int module_id);
-int amazon_port_set_dir_out(int port, int pin, int module_id);
-int amazon_port_set_dir_in(int port, int pin, int module_id);
-int amazon_port_set_output(int port, int pin, int module_id);
-int amazon_port_clear_output(int port, int pin, int module_id);
-int amazon_port_get_input(int port, int pin, int module_id);
-
-int amazon_port_set_altsel0(int port, int pin, int module_id);
-int amazon_port_clear_altsel0(int port, int pin, int module_id);
-int amazon_port_set_altsel1(int port, int pin, int module_id);
-int amazon_port_clear_altsel1(int port, int pin, int module_id);
-
-
-#endif /* PORT_H */
-
-
diff --git a/target/linux/amazon/files/include/asm-mips/amazon/serial.h b/target/linux/amazon/files/include/asm-mips/amazon/serial.h
deleted file mode 100644
index 3ff3efc28..000000000
--- a/target/linux/amazon/files/include/asm-mips/amazon/serial.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/* incaAscSio.h - (AMAZON) ASC UART tty driver header */
-
-#ifndef __AMAZON_ASC_H
-#define __AMAZON_ASC_H
-
-/* channel operating modes */
-#define	ASCOPT_CSIZE	0x00000003
-#define	ASCOPT_CS7	0x00000001
-#define	ASCOPT_CS8	0x00000002
-#define	ASCOPT_PARENB	0x00000004
-#define	ASCOPT_STOPB	0x00000008
-#define	ASCOPT_PARODD	0x00000010
-#define	ASCOPT_CREAD	0x00000020
-
-#define ASC_OPTIONS		(ASCOPT_CREAD | ASCOPT_CS8)
-
-/* ASC input select (0 or 1) */
-#define CONSOLE_TTY	0
-
-/* use fractional divider for baudrate settings */
-#define AMAZONASC_USE_FDV
-
-#ifdef AMAZONASC_USE_FDV
-   #define AMAZONASC_FDV_LOW_BAUDRATE        71
-#ifdef CONFIG_USE_IKOS
-   #define AMAZONASC_FDV_HIGH_BAUDRATE       443      
-#else
-   #define AMAZONASC_FDV_HIGH_BAUDRATE       498      
-#endif //CONFIG_USE_IKOS
-#endif /*AMAZONASC_USE_FDV*/
-
-
-#define AMAZONASC_TXFIFO_FL       1
-#define AMAZONASC_RXFIFO_FL       1
-#define AMAZONASC_TXFIFO_FULL     16
-
-/* interrupt lines masks for the ASC device interrupts*/
-/* change these macroses if it's necessary */
-#define AMAZONASC_IRQ_LINE_ALL        0x000F0000  /* all IRQs */
-
-#define AMAZONASC_IRQ_LINE_TIR            0x00010000      /* TIR - Tx */
-#define AMAZONASC_IRQ_LINE_RIR            0x00020000      /* RIR - Rx */
-#define AMAZONASC_IRQ_LINE_EIR            0x00040000      /* EIR - Err */
-#define AMAZONASC_IRQ_LINE_TBIR           0x00080000      /* TBIR - Tx Buf*/
-
-/* CLC register's bits and bitfields */
-#define ASCCLC_DISR        0x00000001
-#define ASCCLC_DISS        0x00000002
-#define ASCCLC_RMCMASK     0x0000FF00
-#define ASCCLC_RMCOFFSET   8
-
-/* CON register's bits and bitfields */
-#define ASCCON_MODEMASK 0x0007
-    #define ASCCON_M_8SYNC          0x0
-    #define ASCCON_M_8ASYNC         0x1
-    #define ASCCON_M_8IRDAASYNC     0x2
-    #define ASCCON_M_7ASYNCPAR      0x3
-    #define ASCCON_M_9ASYNC         0x4
-    #define ASCCON_M_8WAKEUPASYNC   0x5
-    #define ASCCON_M_8ASYNCPAR      0x7
-#define ASCCON_STP      0x0008
-#define ASCCON_REN      0x0010
-#define ASCCON_PEN      0x0020
-#define ASCCON_FEN      0x0040
-#define ASCCON_OEN      0x0080
-#define ASCCON_PE       0x0100
-#define ASCCON_FE       0x0200
-#define ASCCON_OE       0x0400
-#define ASCCON_FDE      0x0800
-#define ASCCON_ODD      0x1000
-#define ASCCON_BRS      0x2000
-#define ASCCON_LB       0x4000
-#define ASCCON_R        0x8000
-#define ASCCON_ANY	(ASCCON_PE|ASCCON_FE|ASCCON_OE)
-
-/* WHBCON register's bits and bitfields */
-#define ASCWHBCON_CLRREN    0x0010
-#define ASCWHBCON_SETREN    0x0020
-#define ASCWHBCON_CLRPE     0x0100
-#define ASCWHBCON_CLRFE     0x0200
-#define ASCWHBCON_CLROE     0x0400
-#define ASCWHBCON_SETPE     0x0800
-#define ASCWHBCON_SETFE     0x1000
-#define ASCWHBCON_SETOE     0x2000
-
-/* ABCON register's bits and bitfields */
-#define ASCABCON_ABEN       0x0001
-#define ASCABCON_AUREN      0x0002
-#define ASCABCON_ABSTEN     0x0004
-#define ASCABCON_ABDETEN    0x0008
-#define ASCABCON_FCDETEN    0x0010
-#define ASCABCON_EMMASK     0x0300
-    #define ASCABCON_EMOFF          8
-        #define ASCABCON_EM_DISAB       0x0
-        #define ASCABCON_EM_DURAB       0x1
-        #define ASCABCON_EM_ALWAYS      0x2
-#define ASCABCON_TXINV      0x0400
-#define ASCABCON_RXINV      0x0800
-
-/* FDV register mask, offset and bitfields*/
-#define ASCFDV_VALUE_MASK     0x000001FF
-
-/* WHBABCON register's bits and bitfields */
-#define ASCWHBABCON_SETABEN     0x0001
-#define ASCWHBABCON_CLRABEN     0x0002
-
-/* ABSTAT register's bits and bitfields */
-#define ASCABSTAT_FCSDET    0x0001
-#define ASCABSTAT_FCCDET    0x0002
-#define ASCABSTAT_SCSDET    0x0004
-#define ASCABSTAT_SCCDET    0x0008
-#define ASCABSTAT_DETWAIT   0x0010
-
-/* WHBABSTAT register's bits and bitfields */
-#define ASCWHBABSTAT_CLRFCSDET  0x0001
-#define ASCWHBABSTAT_SETFCSDET  0x0002
-#define ASCWHBABSTAT_CLRFCCDET  0x0004
-#define ASCWHBABSTAT_SETFCCDET  0x0008
-#define ASCWHBABSTAT_CLRSCSDET  0x0010
-#define ASCWHBABSTAT_SETSCSDET  0x0020
-#define ASCWHBABSTAT_SETSCCDET  0x0040
-#define ASCWHBABSTAT_CLRSCCDET  0x0080
-#define ASCWHBABSTAT_CLRDETWAIT 0x0100
-#define ASCWHBABSTAT_SETDETWAIT 0x0200
-
-/* TXFCON register's bits and bitfields */
-#define ASCTXFCON_TXFEN         0x0001
-#define ASCTXFCON_TXFFLU        0x0002
-#define ASCTXFCON_TXTMEN        0x0004
-#define ASCTXFCON_TXFITLMASK    0x3F00
-#define ASCTXFCON_TXFITLOFF     8
-
-/* RXFCON register's bits and bitfields */
-#define ASCRXFCON_RXFEN         0x0001
-#define ASCRXFCON_RXFFLU        0x0002
-#define ASCRXFCON_RXTMEN        0x0004
-#define ASCRXFCON_RXFITLMASK    0x3F00
-#define ASCRXFCON_RXFITLOFF     8
-
-/* FSTAT register's bits and bitfields */
-#define ASCFSTAT_RXFFLMASK      0x003F
-#define ASCFSTAT_TXFFLMASK      0x3F00
-#define ASCFSTAT_TXFFLOFF       8
-
-#endif /* __AMAZON_ASC_H */
-
diff --git a/target/linux/amazon/patches-2.6.30/000-mips-bad-intctl.patch b/target/linux/amazon/patches-2.6.30/000-mips-bad-intctl.patch
deleted file mode 100644
index 5de5064dc..000000000
--- a/target/linux/amazon/patches-2.6.30/000-mips-bad-intctl.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/arch/mips/kernel/traps.c
-+++ b/arch/mips/kernel/traps.c
-@@ -1542,7 +1542,16 @@ void __cpuinit per_cpu_trap_init(void)
- 	 */
- 	if (cpu_has_mips_r2) {
- 		cp0_compare_irq = (read_c0_intctl() >> 29) & 7;
-+		if (!cp0_compare_irq)
-+			cp0_compare_irq = CP0_LEGACY_COMPARE_IRQ;
-+
- 		cp0_perfcount_irq = (read_c0_intctl() >> 26) & 7;
-+		if (!cp0_perfcount_irq)
-+			cp0_perfcount_irq = CP0_LEGACY_PERFCNT_IRQ;
-+
-+		if (arch_fixup_c0_irqs)
-+			arch_fixup_c0_irqs();
-+
- 		if (cp0_perfcount_irq == cp0_compare_irq)
- 			cp0_perfcount_irq = -1;
- 	} else {
---- a/arch/mips/include/asm/irq.h
-+++ b/arch/mips/include/asm/irq.h
-@@ -157,8 +157,10 @@ extern void free_irqno(unsigned int irq)
-  * IE7.  Since R2 their number has to be read from the c0_intctl register.
-  */
- #define CP0_LEGACY_COMPARE_IRQ 7
-+#define CP0_LEGACY_PERFCNT_IRQ 7
- 
- extern int cp0_compare_irq;
- extern int cp0_perfcount_irq;
-+extern void __weak arch_fixup_c0_irqs(void);
- 
- #endif /* _ASM_IRQ_H */
diff --git a/target/linux/amazon/patches-2.6.30/010-mips_clocksource_init_war.patch b/target/linux/amazon/patches-2.6.30/010-mips_clocksource_init_war.patch
deleted file mode 100644
index ac44c308f..000000000
--- a/target/linux/amazon/patches-2.6.30/010-mips_clocksource_init_war.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/arch/mips/kernel/cevt-r4k.c
-+++ b/arch/mips/kernel/cevt-r4k.c
-@@ -21,6 +21,22 @@
- 
- #ifndef CONFIG_MIPS_MT_SMTC
- 
-+/*
-+ * Compare interrupt can be routed and latched outside the core,
-+ * so a single execution hazard barrier may not be enough to give
-+ * it time to clear as seen in the Cause register.  4 time the
-+ * pipeline depth seems reasonably conservative, and empirically
-+ * works better in configurations with high CPU/bus clock ratios.
-+ */
-+
-+#define compare_change_hazard() \
-+	do { \
-+		irq_disable_hazard(); \
-+		irq_disable_hazard(); \
-+		irq_disable_hazard(); \
-+		irq_disable_hazard(); \
-+	} while (0)
-+
- static int mips_next_event(unsigned long delta,
-                            struct clock_event_device *evt)
- {
-@@ -30,6 +46,7 @@ static int mips_next_event(unsigned long
- 	cnt = read_c0_count();
- 	cnt += delta;
- 	write_c0_compare(cnt);
-+	compare_change_hazard();
- 	res = ((int)(read_c0_count() - cnt) > 0) ? -ETIME : 0;
- 	return res;
- }
diff --git a/target/linux/amazon/patches-2.6.30/017-wdt-driver.patch b/target/linux/amazon/patches-2.6.30/017-wdt-driver.patch
deleted file mode 100644
index bee390bbb..000000000
--- a/target/linux/amazon/patches-2.6.30/017-wdt-driver.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/drivers/watchdog/Makefile
-+++ b/drivers/watchdog/Makefile
-@@ -105,6 +105,7 @@ obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o
- obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
- obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
- obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
-+obj-$(CONFIG_AMAZON_WDT) += amazon_wdt.o
- 
- # PARISC Architecture
- 
diff --git a/target/linux/amazon/patches-2.6.30/100-board.patch b/target/linux/amazon/patches-2.6.30/100-board.patch
deleted file mode 100644
index 66d5fd62d..000000000
--- a/target/linux/amazon/patches-2.6.30/100-board.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -60,6 +60,22 @@ config BCM47XX
- 	help
- 	 Support for BCM47XX based boards
- 
-+config AMAZON
-+	bool "Amazon support (EXPERIMENTAL)"
-+	depends on EXPERIMENTAL
-+	select DMA_NONCOHERENT
-+	select IRQ_CPU
-+	select CEVT_R4K
-+	select CSRC_R4K
-+	select SYS_HAS_CPU_MIPS32_R1
-+	select SYS_HAS_CPU_MIPS32_R2
-+	select HAVE_STD_PC_SERIAL_PORT
-+	select SYS_SUPPORTS_BIG_ENDIAN
-+	select SYS_SUPPORTS_32BIT_KERNEL
-+	select SYS_HAS_EARLY_PRINTK
-+	select HW_HAS_PCI
-+	select SWAP_IO_SPACE
-+
- config MIPS_COBALT
- 	bool "Cobalt Server"
- 	select CEVT_R4K
-@@ -633,6 +649,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
- 
- endchoice
- 
-+source "arch/mips/amazon/Kconfig"
- source "arch/mips/alchemy/Kconfig"
- source "arch/mips/basler/excite/Kconfig"
- source "arch/mips/jazz/Kconfig"
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -283,6 +283,13 @@ libs-$(CONFIG_MIPS_XXS1500)	+= arch/mips
- load-$(CONFIG_MIPS_XXS1500)	+= 0xffffffff80100000
- 
- #
-+# Infineon AMAZON
-+#
-+core-$(CONFIG_AMAZON)		+= arch/mips/amazon/
-+cflags-$(CONFIG_AMAZON)	+= -I$(srctree)/arch/mips/include/asm/mach-amazon
-+load-$(CONFIG_AMAZON)		+= 0xffffffff80002000
-+
-+#
- # Cobalt Server
- #
- core-$(CONFIG_MIPS_COBALT)	+= arch/mips/cobalt/
diff --git a/target/linux/amazon/patches-2.6.30/130-mtd_drivers.patch b/target/linux/amazon/patches-2.6.30/130-mtd_drivers.patch
deleted file mode 100644
index aaf3a8d8a..000000000
--- a/target/linux/amazon/patches-2.6.30/130-mtd_drivers.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/drivers/mtd/maps/Makefile
-+++ b/drivers/mtd/maps/Makefile
-@@ -62,3 +62,4 @@ obj-$(CONFIG_MTD_INTEL_VR_NOR)	+= intel_
- obj-$(CONFIG_MTD_BFIN_ASYNC)	+= bfin-async-flash.o
- obj-$(CONFIG_MTD_RBTX4939)	+= rbtx4939-flash.o
- obj-$(CONFIG_MTD_VMU)		+= vmu-flash.o
-+obj-$(CONFIG_AMAZON_MTD)	+= amazon.o
diff --git a/target/linux/amazon/patches-2.6.30/140-net_drivers.patch b/target/linux/amazon/patches-2.6.30/140-net_drivers.patch
deleted file mode 100644
index 5c677fd2e..000000000
--- a/target/linux/amazon/patches-2.6.30/140-net_drivers.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/drivers/net/Makefile
-+++ b/drivers/net/Makefile
-@@ -272,3 +272,6 @@ obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
- obj-$(CONFIG_SFC) += sfc/
- 
- obj-$(CONFIG_WIMAX) += wimax/
-+
-+obj-$(CONFIG_AMAZON_NET_SW) += amazon_sw.o
-+obj-$(CONFIG_ADM6996_SUPPORT) += admmod.o
diff --git a/target/linux/amazon/patches-2.6.30/150-serial_driver.patch b/target/linux/amazon/patches-2.6.30/150-serial_driver.patch
deleted file mode 100644
index 8b7741c93..000000000
--- a/target/linux/amazon/patches-2.6.30/150-serial_driver.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/drivers/serial/Makefile
-+++ b/drivers/serial/Makefile
-@@ -3,6 +3,7 @@
- #
- 
- obj-$(CONFIG_SERIAL_CORE) += serial_core.o
-+obj-$(CONFIG_AMAZON_ASC_UART) += amazon_asc.o
- obj-$(CONFIG_SERIAL_21285) += 21285.o
- 
- # These Sparc drivers have to appear before others such as 8250
diff --git a/target/linux/amazon/patches-2.6.30/160-cfi-swap.patch b/target/linux/amazon/patches-2.6.30/160-cfi-swap.patch
deleted file mode 100644
index 4809fccd8..000000000
--- a/target/linux/amazon/patches-2.6.30/160-cfi-swap.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -1090,6 +1090,9 @@ static int __xipram do_write_oneword(str
- 	int retry_cnt = 0;
- 
- 	adr += chip->start;
-+#ifdef CONFIG_AMAZON
-+	adr ^= 2;
-+#endif
- 
- 	spin_lock(chip->mutex);
- 	ret = get_chip(map, chip, adr, FL_WRITING);
-@@ -1372,7 +1375,11 @@ static int __xipram do_write_buffer(stru
- 	z = 0;
- 	while(z < words * map_bankwidth(map)) {
- 		datum = map_word_load(map, buf);
-+#ifdef CONFIG_AMAZON
-+		map_write(map, datum, (adr + z) ^ 0x2);
-+#else
- 		map_write(map, datum, adr + z);
-+#endif
- 
- 		z += map_bankwidth(map);
- 		buf += map_bankwidth(map);
-@@ -1617,6 +1624,9 @@ static int __xipram do_erase_oneblock(st
- 	int ret = 0;
- 
- 	adr += chip->start;
-+#ifdef CONFIG_AMAZON
-+	adr ^= 2;
-+#endif
- 
- 	spin_lock(chip->mutex);
- 	ret = get_chip(map, chip, adr, FL_ERASING);
-@@ -1745,6 +1755,10 @@ static int do_atmel_lock(struct map_info
- 	struct cfi_private *cfi = map->fldrv_priv;
- 	int ret;
- 
-+#ifdef CONFIG_AMAZON
-+	adr ^= 2;
-+#endif
-+
- 	spin_lock(chip->mutex);
- 	ret = get_chip(map, chip, adr + chip->start, FL_LOCKING);
- 	if (ret)
-@@ -1781,6 +1795,10 @@ static int do_atmel_unlock(struct map_in
- 	struct cfi_private *cfi = map->fldrv_priv;
- 	int ret;
- 
-+#ifdef CONFIG_AMAZON
-+	adr ^= 2;
-+#endif
-+
- 	spin_lock(chip->mutex);
- 	ret = get_chip(map, chip, adr + chip->start, FL_UNLOCKING);
- 	if (ret)
diff --git a/target/linux/amazon/patches-2.6.32/000-mips-bad-intctl.patch b/target/linux/amazon/patches-2.6.32/000-mips-bad-intctl.patch
deleted file mode 100644
index ad3fe9fb3..000000000
--- a/target/linux/amazon/patches-2.6.32/000-mips-bad-intctl.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/arch/mips/kernel/traps.c
-+++ b/arch/mips/kernel/traps.c
-@@ -1537,7 +1537,16 @@ void __cpuinit per_cpu_trap_init(void)
- 	 */
- 	if (cpu_has_mips_r2) {
- 		cp0_compare_irq = (read_c0_intctl() >> 29) & 7;
-+		if (!cp0_compare_irq)
-+			cp0_compare_irq = CP0_LEGACY_COMPARE_IRQ;
-+
- 		cp0_perfcount_irq = (read_c0_intctl() >> 26) & 7;
-+		if (!cp0_perfcount_irq)
-+			cp0_perfcount_irq = CP0_LEGACY_PERFCNT_IRQ;
-+
-+		if (arch_fixup_c0_irqs)
-+			arch_fixup_c0_irqs();
-+
- 		if (cp0_perfcount_irq == cp0_compare_irq)
- 			cp0_perfcount_irq = -1;
- 	} else {
---- a/arch/mips/include/asm/irq.h
-+++ b/arch/mips/include/asm/irq.h
-@@ -158,8 +158,10 @@ extern void free_irqno(unsigned int irq)
-  * IE7.  Since R2 their number has to be read from the c0_intctl register.
-  */
- #define CP0_LEGACY_COMPARE_IRQ 7
-+#define CP0_LEGACY_PERFCNT_IRQ 7
- 
- extern int cp0_compare_irq;
- extern int cp0_perfcount_irq;
-+extern void __weak arch_fixup_c0_irqs(void);
- 
- #endif /* _ASM_IRQ_H */
diff --git a/target/linux/amazon/patches-2.6.32/010-mips_clocksource_init_war.patch b/target/linux/amazon/patches-2.6.32/010-mips_clocksource_init_war.patch
deleted file mode 100644
index 81eabc6dc..000000000
--- a/target/linux/amazon/patches-2.6.32/010-mips_clocksource_init_war.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/arch/mips/kernel/cevt-r4k.c
-+++ b/arch/mips/kernel/cevt-r4k.c
-@@ -22,6 +22,22 @@
- 
- #ifndef CONFIG_MIPS_MT_SMTC
- 
-+/*
-+ * Compare interrupt can be routed and latched outside the core,
-+ * so a single execution hazard barrier may not be enough to give
-+ * it time to clear as seen in the Cause register.  4 time the
-+ * pipeline depth seems reasonably conservative, and empirically
-+ * works better in configurations with high CPU/bus clock ratios.
-+ */
-+
-+#define compare_change_hazard() \
-+	do { \
-+		irq_disable_hazard(); \
-+		irq_disable_hazard(); \
-+		irq_disable_hazard(); \
-+		irq_disable_hazard(); \
-+	} while (0)
-+
- static int mips_next_event(unsigned long delta,
-                            struct clock_event_device *evt)
- {
-@@ -31,6 +47,7 @@ static int mips_next_event(unsigned long
- 	cnt = read_c0_count();
- 	cnt += delta;
- 	write_c0_compare(cnt);
-+	compare_change_hazard();
- 	res = ((int)(read_c0_count() - cnt) > 0) ? -ETIME : 0;
- 	return res;
- }
diff --git a/target/linux/amazon/patches-2.6.32/017-wdt-driver.patch b/target/linux/amazon/patches-2.6.32/017-wdt-driver.patch
deleted file mode 100644
index 433abd51e..000000000
--- a/target/linux/amazon/patches-2.6.32/017-wdt-driver.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/drivers/watchdog/Makefile
-+++ b/drivers/watchdog/Makefile
-@@ -113,6 +113,7 @@ obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o
- obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
- obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
- obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
-+obj-$(CONFIG_AMAZON_WDT) += amazon_wdt.o
- 
- # PARISC Architecture
- 
diff --git a/target/linux/amazon/patches-2.6.32/100-board.patch b/target/linux/amazon/patches-2.6.32/100-board.patch
deleted file mode 100644
index d1d9c471a..000000000
--- a/target/linux/amazon/patches-2.6.32/100-board.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -96,6 +96,22 @@ config BCM63XX
- 	help
- 	 Support for BCM63XX based boards
- 
-+config AMAZON
-+	bool "Amazon support (EXPERIMENTAL)"
-+	depends on EXPERIMENTAL
-+	select DMA_NONCOHERENT
-+	select IRQ_CPU
-+	select CEVT_R4K
-+	select CSRC_R4K
-+	select SYS_HAS_CPU_MIPS32_R1
-+	select SYS_HAS_CPU_MIPS32_R2
-+	select HAVE_STD_PC_SERIAL_PORT
-+	select SYS_SUPPORTS_BIG_ENDIAN
-+	select SYS_SUPPORTS_32BIT_KERNEL
-+	select SYS_HAS_EARLY_PRINTK
-+	select HW_HAS_PCI
-+	select SWAP_IO_SPACE
-+
- config MIPS_COBALT
- 	bool "Cobalt Server"
- 	select CEVT_R4K
-@@ -673,6 +689,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
- 
- endchoice
- 
-+source "arch/mips/amazon/Kconfig"
- source "arch/mips/alchemy/Kconfig"
- source "arch/mips/basler/excite/Kconfig"
- source "arch/mips/bcm63xx/Kconfig"
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -296,6 +296,13 @@ cflags-$(CONFIG_SOC_AU1X00)	+= -I$(srctr
- 
- 
- #
-+# Infineon AMAZON
-+#
-+core-$(CONFIG_AMAZON)		+= arch/mips/amazon/
-+cflags-$(CONFIG_AMAZON)	+= -I$(srctree)/arch/mips/include/asm/mach-amazon
-+load-$(CONFIG_AMAZON)		+= 0xffffffff80002000
-+
-+#
- # Cobalt Server
- #
- core-$(CONFIG_MIPS_COBALT)	+= arch/mips/cobalt/
diff --git a/target/linux/amazon/patches-2.6.32/130-mtd_drivers.patch b/target/linux/amazon/patches-2.6.32/130-mtd_drivers.patch
deleted file mode 100644
index fafd99670..000000000
--- a/target/linux/amazon/patches-2.6.32/130-mtd_drivers.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/drivers/mtd/maps/Makefile
-+++ b/drivers/mtd/maps/Makefile
-@@ -61,3 +61,4 @@ obj-$(CONFIG_MTD_BFIN_ASYNC)	+= bfin-asy
- obj-$(CONFIG_MTD_RBTX4939)	+= rbtx4939-flash.o
- obj-$(CONFIG_MTD_VMU)		+= vmu-flash.o
- obj-$(CONFIG_MTD_GPIO_ADDR)	+= gpio-addr-flash.o
-+obj-$(CONFIG_AMAZON_MTD)	+= amazon.o
diff --git a/target/linux/amazon/patches-2.6.32/140-net_drivers.patch b/target/linux/amazon/patches-2.6.32/140-net_drivers.patch
deleted file mode 100644
index e64908c76..000000000
--- a/target/linux/amazon/patches-2.6.32/140-net_drivers.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/drivers/net/Makefile
-+++ b/drivers/net/Makefile
-@@ -286,3 +286,6 @@ obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
- obj-$(CONFIG_SFC) += sfc/
- 
- obj-$(CONFIG_WIMAX) += wimax/
-+
-+obj-$(CONFIG_AMAZON_NET_SW) += amazon_sw.o
-+obj-$(CONFIG_ADM6996_SUPPORT) += admmod.o
diff --git a/target/linux/amazon/patches-2.6.32/150-serial_driver.patch b/target/linux/amazon/patches-2.6.32/150-serial_driver.patch
deleted file mode 100644
index 8b7741c93..000000000
--- a/target/linux/amazon/patches-2.6.32/150-serial_driver.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/drivers/serial/Makefile
-+++ b/drivers/serial/Makefile
-@@ -3,6 +3,7 @@
- #
- 
- obj-$(CONFIG_SERIAL_CORE) += serial_core.o
-+obj-$(CONFIG_AMAZON_ASC_UART) += amazon_asc.o
- obj-$(CONFIG_SERIAL_21285) += 21285.o
- 
- # These Sparc drivers have to appear before others such as 8250
diff --git a/target/linux/amazon/patches-2.6.32/160-cfi-swap.patch b/target/linux/amazon/patches-2.6.32/160-cfi-swap.patch
deleted file mode 100644
index bb89f6110..000000000
--- a/target/linux/amazon/patches-2.6.32/160-cfi-swap.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -1079,6 +1079,9 @@ static int __xipram do_write_oneword(str
- 	int retry_cnt = 0;
- 
- 	adr += chip->start;
-+#ifdef CONFIG_AMAZON
-+	adr ^= 2;
-+#endif
- 
- 	spin_lock(chip->mutex);
- 	ret = get_chip(map, chip, adr, FL_WRITING);
-@@ -1361,7 +1364,11 @@ static int __xipram do_write_buffer(stru
- 	z = 0;
- 	while(z < words * map_bankwidth(map)) {
- 		datum = map_word_load(map, buf);
-+#ifdef CONFIG_AMAZON
-+		map_write(map, datum, (adr + z) ^ 0x2);
-+#else
- 		map_write(map, datum, adr + z);
-+#endif
- 
- 		z += map_bankwidth(map);
- 		buf += map_bankwidth(map);
-@@ -1606,6 +1613,9 @@ static int __xipram do_erase_oneblock(st
- 	int ret = 0;
- 
- 	adr += chip->start;
-+#ifdef CONFIG_AMAZON
-+	adr ^= 2;
-+#endif
- 
- 	spin_lock(chip->mutex);
- 	ret = get_chip(map, chip, adr, FL_ERASING);
-@@ -1734,6 +1744,10 @@ static int do_atmel_lock(struct map_info
- 	struct cfi_private *cfi = map->fldrv_priv;
- 	int ret;
- 
-+#ifdef CONFIG_AMAZON
-+	adr ^= 2;
-+#endif
-+
- 	spin_lock(chip->mutex);
- 	ret = get_chip(map, chip, adr + chip->start, FL_LOCKING);
- 	if (ret)
-@@ -1770,6 +1784,10 @@ static int do_atmel_unlock(struct map_in
- 	struct cfi_private *cfi = map->fldrv_priv;
- 	int ret;
- 
-+#ifdef CONFIG_AMAZON
-+	adr ^= 2;
-+#endif
-+
- 	spin_lock(chip->mutex);
- 	ret = get_chip(map, chip, adr + chip->start, FL_UNLOCKING);
- 	if (ret)
diff --git a/target/linux/ar71xx/config-2.6.33 b/target/linux/ar71xx/config-2.6.33
deleted file mode 100644
index e147b0149..000000000
--- a/target/linux/ar71xx/config-2.6.33
+++ /dev/null
@@ -1,292 +0,0 @@
-CONFIG_32BIT=y
-# CONFIG_64BIT is not set
-CONFIG_AG71XX=y
-CONFIG_AG71XX_AR8216_SUPPORT=y
-# CONFIG_AG71XX_DEBUG is not set
-# CONFIG_AG71XX_DEBUG_FS is not set
-# CONFIG_ALCHEMY_GPIO_INDIRECT is not set
-# CONFIG_AR7 is not set
-CONFIG_AR71XX_DEV_AP91_ETH=y
-CONFIG_AR71XX_DEV_AP91_PCI=y
-CONFIG_AR71XX_DEV_AP94_PCI=y
-CONFIG_AR71XX_DEV_AR913X_WMAC=y
-CONFIG_AR71XX_DEV_DSA=y
-CONFIG_AR71XX_DEV_GPIO_BUTTONS=y
-CONFIG_AR71XX_DEV_LEDS_GPIO=y
-CONFIG_AR71XX_DEV_M25P80=y
-CONFIG_AR71XX_DEV_PB42_PCI=y
-CONFIG_AR71XX_DEV_PB9X_PCI=y
-CONFIG_AR71XX_DEV_USB=y
-CONFIG_AR71XX_MACH_AP81=y
-CONFIG_AR71XX_MACH_AP83=y
-CONFIG_AR71XX_MACH_AW_NR580=y
-CONFIG_AR71XX_MACH_DIR_600_A1=y
-CONFIG_AR71XX_MACH_DIR_615_C1=y
-CONFIG_AR71XX_MACH_DIR_825_B1=y
-CONFIG_AR71XX_MACH_MZK_W04NU=y
-CONFIG_AR71XX_MACH_MZK_W300NH=y
-CONFIG_AR71XX_MACH_PB42=y
-CONFIG_AR71XX_MACH_PB44=y
-CONFIG_AR71XX_MACH_PB92=y
-CONFIG_AR71XX_MACH_RB4XX=y
-CONFIG_AR71XX_MACH_RB750=y
-CONFIG_AR71XX_MACH_TEW_632BRP=y
-CONFIG_AR71XX_MACH_TL_WR1043ND=y
-CONFIG_AR71XX_MACH_TL_WR741ND=y
-CONFIG_AR71XX_MACH_TL_WR841N_V1=y
-CONFIG_AR71XX_MACH_TL_WR941ND=y
-CONFIG_AR71XX_MACH_UBNT=y
-CONFIG_AR71XX_MACH_WNDR3700=y
-CONFIG_AR71XX_MACH_WNR2000=y
-CONFIG_AR71XX_MACH_WP543=y
-CONFIG_AR71XX_MACH_WRT160NL=y
-CONFIG_AR71XX_MACH_WRT400N=y
-CONFIG_AR71XX_MACH_WZR_HP_G300NH=y
-CONFIG_AR71XX_NVRAM=y
-CONFIG_AR71XX_WDT=y
-CONFIG_AR8216_PHY=y
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-CONFIG_ARCH_REQUIRE_GPIOLIB=y
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_ARCH_SUPPORTS_OPROFILE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ATHEROS_AR71XX=y
-# CONFIG_BCM47XX is not set
-# CONFIG_BCM63XX is not set
-CONFIG_BITREVERSE=y
-# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
-# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CEVT_R4K=y
-CONFIG_CEVT_R4K_LIB=y
-CONFIG_CMDLINE="rootfstype=squashfs,yaffs,jffs2 noinitrd console=ttyS0,115200"
-CONFIG_CMDLINE_BOOL=y
-# CONFIG_CMDLINE_OVERRIDE is not set
-CONFIG_CPU_BIG_ENDIAN=y
-# CONFIG_CPU_CAVIUM_OCTEON is not set
-CONFIG_CPU_HAS_PREFETCH=y
-CONFIG_CPU_HAS_SYNC=y
-# CONFIG_CPU_LITTLE_ENDIAN is not set
-# CONFIG_CPU_LOONGSON2E is not set
-# CONFIG_CPU_LOONGSON2F is not set
-CONFIG_CPU_MIPS32=y
-# CONFIG_CPU_MIPS32_R1 is not set
-CONFIG_CPU_MIPS32_R2=y
-# CONFIG_CPU_MIPS64_R1 is not set
-# CONFIG_CPU_MIPS64_R2 is not set
-CONFIG_CPU_MIPSR2=y
-# CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R10000 is not set
-# CONFIG_CPU_R3000 is not set
-# CONFIG_CPU_R4300 is not set
-# CONFIG_CPU_R4X00 is not set
-# CONFIG_CPU_R5000 is not set
-# CONFIG_CPU_R5432 is not set
-# CONFIG_CPU_R5500 is not set
-# CONFIG_CPU_R6000 is not set
-# CONFIG_CPU_R8000 is not set
-# CONFIG_CPU_RM7000 is not set
-# CONFIG_CPU_RM9000 is not set
-# CONFIG_CPU_SB1 is not set
-CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_HIGHMEM=y
-# CONFIG_CPU_TX39XX is not set
-# CONFIG_CPU_TX49XX is not set
-# CONFIG_CPU_VR41XX is not set
-CONFIG_CSRC_R4K=y
-CONFIG_CSRC_R4K_LIB=y
-CONFIG_DECOMPRESS_LZMA=y
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_SMACK is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
-CONFIG_DEVPORT=y
-# CONFIG_DM9000 is not set
-CONFIG_DMA_NEED_PCI_MAP_STATE=y
-CONFIG_DMA_NONCOHERENT=y
-CONFIG_EARLY_PRINTK=y
-# CONFIG_FSNOTIFY is not set
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-CONFIG_GPIOLIB=y
-CONFIG_GPIO_NXP_74HC153=y
-CONFIG_GPIO_PCF857X=y
-CONFIG_GPIO_SYSFS=y
-CONFIG_HARDWARE_WATCHPOINTS=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAVE_ARCH_KGDB=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_HAVE_IDE=y
-CONFIG_HAVE_OPROFILE=y
-CONFIG_HW_HAS_PCI=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=y
-CONFIG_I2C_ALGOBIT=y
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_GPIO=y
-CONFIG_ICPLUS_PHY=y
-CONFIG_IMAGE_CMDLINE_HACK=y
-# CONFIG_INITRAMFS_COMPRESSION_LZO is not set
-CONFIG_INITRAMFS_ROOT_GID=0
-CONFIG_INITRAMFS_ROOT_UID=0
-CONFIG_INITRAMFS_SOURCE="../../root"
-# CONFIG_INLINE_READ_LOCK is not set
-# CONFIG_INLINE_READ_LOCK_BH is not set
-# CONFIG_INLINE_READ_LOCK_IRQ is not set
-# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_READ_TRYLOCK is not set
-CONFIG_INLINE_READ_UNLOCK=y
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_SPIN_LOCK is not set
-# CONFIG_INLINE_SPIN_LOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_SPIN_TRYLOCK is not set
-# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
-CONFIG_INLINE_SPIN_UNLOCK=y
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_WRITE_LOCK is not set
-# CONFIG_INLINE_WRITE_LOCK_BH is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_WRITE_TRYLOCK is not set
-CONFIG_INLINE_WRITE_UNLOCK=y
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-CONFIG_IRQ_CPU=y
-# CONFIG_LEDS_GPIO is not set
-# CONFIG_LEDS_RB750 is not set
-# CONFIG_LEDS_WNDR3700_USB is not set
-CONFIG_LOONGSON_UART_BASE=y
-# CONFIG_M25PXX_USE_FAST_READ is not set
-# CONFIG_MACH_ALCHEMY is not set
-# CONFIG_MACH_DECSTATION is not set
-# CONFIG_MACH_JAZZ is not set
-# CONFIG_MACH_LOONGSON is not set
-# CONFIG_MACH_TX39XX is not set
-# CONFIG_MACH_TX49XX is not set
-# CONFIG_MACH_VR41XX is not set
-CONFIG_MICREL_PHY=y
-# CONFIG_MIKROTIK_RB532 is not set
-CONFIG_MIPS=y
-# CONFIG_MIPS_COBALT is not set
-CONFIG_MIPS_L1_CACHE_SHIFT=5
-CONFIG_MIPS_MACHINE=y
-# CONFIG_MIPS_MALTA is not set
-CONFIG_MIPS_MT_DISABLED=y
-# CONFIG_MIPS_MT_SMP is not set
-# CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_SIM is not set
-CONFIG_MTD_AR91XX_FLASH=y
-# CONFIG_MTD_CFI_INTELEXT is not set
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_JEDECPROBE=y
-CONFIG_MTD_M25P80=y
-CONFIG_MTD_MYLOADER_PARTS=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_RB4XX=y
-CONFIG_MTD_NAND_RB750=y
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2
-CONFIG_MTD_REDBOOT_PARTS=y
-CONFIG_MTD_WRT160NL_PARTS=y
-# CONFIG_MUTEX_SPIN_ON_OWNER is not set
-CONFIG_MYLOADER=y
-CONFIG_NET_DSA=y
-CONFIG_NET_DSA_AR7240=y
-CONFIG_NET_DSA_MV88E6060=y
-CONFIG_NET_DSA_MV88E6063=y
-# CONFIG_NET_DSA_MV88E6123_61_65 is not set
-# CONFIG_NET_DSA_MV88E6131 is not set
-# CONFIG_NET_DSA_MV88E6XXX is not set
-# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
-# CONFIG_NET_DSA_TAG_DSA is not set
-# CONFIG_NET_DSA_TAG_EDSA is not set
-CONFIG_NET_DSA_TAG_QINQ=y
-CONFIG_NET_DSA_TAG_TRAILER=y
-# CONFIG_NO_IOPORT is not set
-# CONFIG_NXP_STB220 is not set
-# CONFIG_NXP_STB225 is not set
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PCI=y
-CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PHYLIB=y
-# CONFIG_PMC_MSP is not set
-# CONFIG_PMC_YOSEMITE is not set
-# CONFIG_PNX8550_JBS is not set
-# CONFIG_PNX8550_STB810 is not set
-# CONFIG_POWERTV is not set
-CONFIG_RTL8306_PHY=y
-CONFIG_RTL8366RB_PHY=y
-CONFIG_RTL8366S_PHY=y
-CONFIG_RTL8366_SMI=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-# CONFIG_SCSI_DMA is not set
-# CONFIG_SERIAL_8250_EXTENDED is not set
-CONFIG_SERIAL_8250_NR_UARTS=1
-CONFIG_SERIAL_8250_RUNTIME_UARTS=1
-# CONFIG_SGI_IP22 is not set
-# CONFIG_SGI_IP27 is not set
-# CONFIG_SGI_IP28 is not set
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_SWARM is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-CONFIG_SPI=y
-CONFIG_SPI_AP83=y
-CONFIG_SPI_AR71XX=y
-CONFIG_SPI_BITBANG=y
-CONFIG_SPI_GPIO=y
-CONFIG_SPI_MASTER=y
-CONFIG_SPI_PB44=y
-# CONFIG_SPI_SPIDEV is not set
-# CONFIG_SPI_VSC7385 is not set
-CONFIG_SWCONFIG=y
-CONFIG_SYS_HAS_CPU_MIPS32_R1=y
-CONFIG_SYS_HAS_CPU_MIPS32_R2=y
-CONFIG_SYS_HAS_EARLY_PRINTK=y
-CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
-# CONFIG_TC35815 is not set
-# CONFIG_TINY_RCU is not set
-CONFIG_TRAD_SIGNALS=y
-# CONFIG_TREE_PREEMPT_RCU is not set
-CONFIG_TREE_RCU=y
-CONFIG_USB_SUPPORT=y
-CONFIG_YAFFS_9BYTE_TAGS=y
-CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED=y
-CONFIG_YAFFS_AUTO_YAFFS2=y
-# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
-# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
-CONFIG_YAFFS_FS=y
-CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
-CONFIG_YAFFS_YAFFS1=y
-CONFIG_YAFFS_YAFFS2=y
-CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/ar71xx/config-2.6.34 b/target/linux/ar71xx/config-2.6.34
deleted file mode 100644
index 549b7a8c7..000000000
--- a/target/linux/ar71xx/config-2.6.34
+++ /dev/null
@@ -1,317 +0,0 @@
-CONFIG_32BIT=y
-# CONFIG_64BIT is not set
-CONFIG_AG71XX=y
-CONFIG_AG71XX_AR8216_SUPPORT=y
-# CONFIG_AG71XX_DEBUG is not set
-# CONFIG_ALCHEMY_GPIO_INDIRECT is not set
-# CONFIG_AR7 is not set
-CONFIG_AR71XX_DEV_AP91_ETH=y
-CONFIG_AR71XX_DEV_AP91_PCI=y
-CONFIG_AR71XX_DEV_AP94_PCI=y
-CONFIG_AR71XX_DEV_AR913X_WMAC=y
-CONFIG_AR71XX_DEV_DSA=y
-CONFIG_AR71XX_DEV_GPIO_BUTTONS=y
-CONFIG_AR71XX_DEV_LEDS_GPIO=y
-CONFIG_AR71XX_DEV_M25P80=y
-CONFIG_AR71XX_DEV_PB42_PCI=y
-CONFIG_AR71XX_DEV_PB9X_PCI=y
-CONFIG_AR71XX_DEV_USB=y
-CONFIG_AR71XX_MACH_AP81=y
-CONFIG_AR71XX_MACH_AP83=y
-CONFIG_AR71XX_MACH_AW_NR580=y
-CONFIG_AR71XX_MACH_DIR_600_A1=y
-CONFIG_AR71XX_MACH_DIR_615_C1=y
-CONFIG_AR71XX_MACH_DIR_825_B1=y
-CONFIG_AR71XX_MACH_MZK_W04NU=y
-CONFIG_AR71XX_MACH_MZK_W300NH=y
-CONFIG_AR71XX_MACH_PB42=y
-CONFIG_AR71XX_MACH_PB44=y
-CONFIG_AR71XX_MACH_PB92=y
-CONFIG_AR71XX_MACH_RB4XX=y
-CONFIG_AR71XX_MACH_RB750=y
-CONFIG_AR71XX_MACH_TEW_632BRP=y
-CONFIG_AR71XX_MACH_TL_WR1043ND=y
-CONFIG_AR71XX_MACH_TL_WR741ND=y
-CONFIG_AR71XX_MACH_TL_WR841N_V1=y
-CONFIG_AR71XX_MACH_TL_WR941ND=y
-CONFIG_AR71XX_MACH_UBNT=y
-CONFIG_AR71XX_MACH_WNDR3700=y
-CONFIG_AR71XX_MACH_WNR2000=y
-CONFIG_AR71XX_MACH_WP543=y
-CONFIG_AR71XX_MACH_WRT160NL=y
-CONFIG_AR71XX_MACH_WRT400N=y
-CONFIG_AR71XX_MACH_WZR_HP_G300NH=y
-CONFIG_AR71XX_NVRAM=y
-CONFIG_AR71XX_WDT=y
-CONFIG_AR8216_PHY=y
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-CONFIG_ARCH_REQUIRE_GPIOLIB=y
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_ARCH_SUPPORTS_OPROFILE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ATHEROS_AR71XX=y
-# CONFIG_BCM47XX is not set
-# CONFIG_BCM63XX is not set
-CONFIG_BITREVERSE=y
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
-# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CEVT_R4K=y
-CONFIG_CEVT_R4K_LIB=y
-CONFIG_CMDLINE="rootfstype=squashfs,yaffs,jffs2 noinitrd console=ttyS0,115200"
-CONFIG_CMDLINE_BOOL=y
-# CONFIG_CMDLINE_OVERRIDE is not set
-CONFIG_CPU_BIG_ENDIAN=y
-# CONFIG_CPU_CAVIUM_OCTEON is not set
-CONFIG_CPU_HAS_PREFETCH=y
-CONFIG_CPU_HAS_SYNC=y
-# CONFIG_CPU_LITTLE_ENDIAN is not set
-# CONFIG_CPU_LOONGSON2E is not set
-# CONFIG_CPU_LOONGSON2F is not set
-CONFIG_CPU_MIPS32=y
-# CONFIG_CPU_MIPS32_R1 is not set
-CONFIG_CPU_MIPS32_R2=y
-# CONFIG_CPU_MIPS64_R1 is not set
-# CONFIG_CPU_MIPS64_R2 is not set
-CONFIG_CPU_MIPSR2=y
-# CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R10000 is not set
-# CONFIG_CPU_R3000 is not set
-# CONFIG_CPU_R4300 is not set
-# CONFIG_CPU_R4X00 is not set
-# CONFIG_CPU_R5000 is not set
-# CONFIG_CPU_R5432 is not set
-# CONFIG_CPU_R5500 is not set
-# CONFIG_CPU_R6000 is not set
-# CONFIG_CPU_R8000 is not set
-# CONFIG_CPU_RM7000 is not set
-# CONFIG_CPU_RM9000 is not set
-# CONFIG_CPU_SB1 is not set
-CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_HIGHMEM=y
-# CONFIG_CPU_TX39XX is not set
-# CONFIG_CPU_TX49XX is not set
-# CONFIG_CPU_VR41XX is not set
-# CONFIG_CRYSTALHD is not set
-CONFIG_CSRC_R4K=y
-CONFIG_CSRC_R4K_LIB=y
-# CONFIG_DEBUG_FS is not set
-CONFIG_DECOMPRESS_LZMA=y
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_SMACK is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
-CONFIG_DEVPORT=y
-# CONFIG_DM9000 is not set
-CONFIG_DMA_NEED_PCI_MAP_STATE=y
-CONFIG_DMA_NONCOHERENT=y
-# CONFIG_DT3155 is not set
-CONFIG_EARLY_PRINTK=y
-# CONFIG_FSNOTIFY is not set
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-CONFIG_GPIOLIB=y
-# CONFIG_GPIO_IT8761E is not set
-# CONFIG_GPIO_MAX7300 is not set
-CONFIG_GPIO_NXP_74HC153=y
-CONFIG_GPIO_PCF857X=y
-# CONFIG_GPIO_SCH is not set
-CONFIG_GPIO_SYSFS=y
-# CONFIG_HAMRADIO is not set
-CONFIG_HARDWARE_WATCHPOINTS=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAVE_ARCH_KGDB=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_HAVE_IDE=y
-CONFIG_HAVE_OPROFILE=y
-# CONFIG_HTC_I2CPLD is not set
-CONFIG_HW_HAS_PCI=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=y
-CONFIG_I2C_ALGOBIT=y
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_GPIO=y
-# CONFIG_I2C_SMBUS is not set
-# CONFIG_I2C_XILINX is not set
-CONFIG_ICPLUS_PHY=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_IMAGE_CMDLINE_HACK=y
-# CONFIG_INITRAMFS_COMPRESSION_LZO is not set
-CONFIG_INITRAMFS_ROOT_GID=0
-CONFIG_INITRAMFS_ROOT_UID=0
-CONFIG_INITRAMFS_SOURCE="../../root"
-# CONFIG_INLINE_READ_LOCK is not set
-# CONFIG_INLINE_READ_LOCK_BH is not set
-# CONFIG_INLINE_READ_LOCK_IRQ is not set
-# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_READ_TRYLOCK is not set
-CONFIG_INLINE_READ_UNLOCK=y
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_SPIN_LOCK is not set
-# CONFIG_INLINE_SPIN_LOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_SPIN_TRYLOCK is not set
-# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
-CONFIG_INLINE_SPIN_UNLOCK=y
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_WRITE_LOCK is not set
-# CONFIG_INLINE_WRITE_LOCK_BH is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_WRITE_TRYLOCK is not set
-CONFIG_INLINE_WRITE_UNLOCK=y
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-CONFIG_IRQ_CPU=y
-# CONFIG_KSZ884X_PCI is not set
-# CONFIG_LEDS_GPIO is not set
-# CONFIG_LEDS_RB750 is not set
-# CONFIG_LEDS_WNDR3700_USB is not set
-CONFIG_LLC=m
-# CONFIG_LOGFS is not set
-CONFIG_LOONGSON_UART_BASE=y
-# CONFIG_LPC_SCH is not set
-# CONFIG_M25PXX_USE_FAST_READ is not set
-# CONFIG_MACH_ALCHEMY is not set
-# CONFIG_MACH_DECSTATION is not set
-# CONFIG_MACH_JAZZ is not set
-# CONFIG_MACH_LOONGSON is not set
-# CONFIG_MACH_TX39XX is not set
-# CONFIG_MACH_TX49XX is not set
-# CONFIG_MACH_VR41XX is not set
-# CONFIG_MAX63XX_WATCHDOG is not set
-# CONFIG_MFD_88PM860X is not set
-# CONFIG_MFD_MAX8925 is not set
-# CONFIG_MFD_TIMBERDALE is not set
-# CONFIG_MFD_WM8994 is not set
-CONFIG_MICREL_PHY=y
-# CONFIG_MIKROTIK_RB532 is not set
-CONFIG_MIPS=y
-# CONFIG_MIPS_COBALT is not set
-CONFIG_MIPS_L1_CACHE_SHIFT=5
-CONFIG_MIPS_MACHINE=y
-# CONFIG_MIPS_MALTA is not set
-CONFIG_MIPS_MT_DISABLED=y
-# CONFIG_MIPS_MT_SMP is not set
-# CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_SIM is not set
-CONFIG_MTD_AR91XX_FLASH=y
-# CONFIG_MTD_CFI_INTELEXT is not set
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_JEDECPROBE=y
-CONFIG_MTD_M25P80=y
-CONFIG_MTD_MYLOADER_PARTS=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_RB4XX=y
-CONFIG_MTD_NAND_RB750=y
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2
-CONFIG_MTD_REDBOOT_PARTS=y
-CONFIG_MTD_WRT160NL_PARTS=y
-# CONFIG_MUTEX_SPIN_ON_OWNER is not set
-CONFIG_MYLOADER=y
-CONFIG_NET_DSA=y
-CONFIG_NET_DSA_AR7240=y
-CONFIG_NET_DSA_MV88E6060=y
-CONFIG_NET_DSA_MV88E6063=y
-# CONFIG_NET_DSA_MV88E6123_61_65 is not set
-# CONFIG_NET_DSA_MV88E6131 is not set
-# CONFIG_NET_DSA_MV88E6XXX is not set
-# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
-# CONFIG_NET_DSA_TAG_DSA is not set
-# CONFIG_NET_DSA_TAG_EDSA is not set
-CONFIG_NET_DSA_TAG_QINQ=y
-CONFIG_NET_DSA_TAG_TRAILER=y
-CONFIG_NO_HZ=y
-# CONFIG_NO_IOPORT is not set
-# CONFIG_NXP_STB220 is not set
-# CONFIG_NXP_STB225 is not set
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PHYLIB=y
-# CONFIG_PMC_MSP is not set
-# CONFIG_PMC_YOSEMITE is not set
-# CONFIG_PNX8550_JBS is not set
-# CONFIG_PNX8550_STB810 is not set
-# CONFIG_POWERTV is not set
-CONFIG_RTL8306_PHY=y
-CONFIG_RTL8366RB_PHY=y
-CONFIG_RTL8366S_PHY=y
-CONFIG_RTL8366_SMI=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-# CONFIG_SCSI_DMA is not set
-# CONFIG_SERIAL_8250_EXTENDED is not set
-CONFIG_SERIAL_8250_NR_UARTS=1
-CONFIG_SERIAL_8250_RUNTIME_UARTS=1
-# CONFIG_SERIAL_TIMBERDALE is not set
-# CONFIG_SGI_IP22 is not set
-# CONFIG_SGI_IP27 is not set
-# CONFIG_SGI_IP28 is not set
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_SWARM is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-CONFIG_SPI=y
-CONFIG_SPI_AP83=y
-CONFIG_SPI_AR71XX=y
-CONFIG_SPI_BITBANG=y
-CONFIG_SPI_GPIO=y
-CONFIG_SPI_MASTER=y
-CONFIG_SPI_PB44=y
-# CONFIG_SPI_SPIDEV is not set
-# CONFIG_SPI_VSC7385 is not set
-CONFIG_STP=m
-# CONFIG_SWAP is not set
-CONFIG_SWCONFIG=y
-CONFIG_SYS_HAS_CPU_MIPS32_R1=y
-CONFIG_SYS_HAS_CPU_MIPS32_R2=y
-CONFIG_SYS_HAS_EARLY_PRINTK=y
-CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
-# CONFIG_TC35815 is not set
-CONFIG_TRAD_SIGNALS=y
-# CONFIG_TREE_PREEMPT_RCU is not set
-CONFIG_USB_SUPPORT=y
-CONFIG_VLAN_8021Q=m
-CONFIG_YAFFS_9BYTE_TAGS=y
-CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED=y
-CONFIG_YAFFS_AUTO_YAFFS2=y
-# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
-# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
-CONFIG_YAFFS_FS=y
-CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
-CONFIG_YAFFS_YAFFS1=y
-CONFIG_YAFFS_YAFFS2=y
-CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/irq.c b/target/linux/ar71xx/files/arch/mips/ar71xx/irq.c
index eecdd9f71..4e1da167d 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/irq.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/irq.c
@@ -21,6 +21,8 @@
 
 #include <asm/mach-ar71xx/ar71xx.h>
 
+static int ip2_flush_reg;
+
 static void ar71xx_gpio_irq_dispatch(void)
 {
 	void __iomem *base = ar71xx_gpio_base;
@@ -239,8 +241,17 @@ asmlinkage void plat_irq_dispatch(void)
 	if (pending & STATUSF_IP7)
 		do_IRQ(AR71XX_CPU_IRQ_TIMER);
 
-	else if (pending & STATUSF_IP2)
+	else if (pending & STATUSF_IP2) {
+		/*
+		 * This IRQ is meant for a PCI device. Drivers for PCI devices
+		 * typically allocate coherent DMA memory for the descriptor
+		 * ring, however the DMA controller may still have some
+		 * unsynchronized data in the FIFO.
+		 * Issue a flush here to ensure that the driver sees the update.
+		 */
+		ar71xx_ddr_flush(ip2_flush_reg);
 		do_IRQ(AR71XX_CPU_IRQ_IP2);
+	}
 
 	else if (pending & STATUSF_IP4)
 		do_IRQ(AR71XX_CPU_IRQ_GE0);
@@ -260,6 +271,20 @@ asmlinkage void plat_irq_dispatch(void)
 
 void __init arch_init_irq(void)
 {
+	switch(ar71xx_soc) {
+	case AR71XX_SOC_AR7240:
+	case AR71XX_SOC_AR7241:
+	case AR71XX_SOC_AR7242:
+		ip2_flush_reg = AR724X_DDR_REG_FLUSH_PCIE;
+		break;
+	case AR71XX_SOC_AR9130:
+	case AR71XX_SOC_AR9132:
+		ip2_flush_reg = AR91XX_DDR_REG_FLUSH_WMAC;
+		break;
+	default:
+		ip2_flush_reg = AR71XX_DDR_REG_FLUSH_PCI;
+		break;
+	}
 	mips_cpu_irq_init();
 
 	ar71xx_misc_irq_init();
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c
index bc8438f73..63fbeb855 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c
@@ -61,7 +61,7 @@ static struct mtd_partition mzk_w04nu_partitions[] = {
 	} , {
 		.name		= "firmware",
 		.offset		= 0x050000,
-		.size		= 0x770000,
+		.size		= 0x790000,
 	}
 };
 #endif /* CONFIG_MTD_PARTITIONS */
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w300nh.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w300nh.c
index dfe7d0d6f..f5862ebbd 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w300nh.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w300nh.c
@@ -51,11 +51,7 @@ static struct mtd_partition mzk_w300nh_partitions[] = {
 	} , {
 		.name		= "rootfs",
 		.offset		= 0x1b0000,
-		.size		= 0x610000,
-	} , {
-		.name		= "config",
-		.offset		= 0x7c0000,
-		.size		= 0x020000,
+		.size		= 0x630000,
 	} , {
 		.name		= "art",
 		.offset		= 0x7e0000,
@@ -64,7 +60,7 @@ static struct mtd_partition mzk_w300nh_partitions[] = {
 	} , {
 		.name		= "firmware",
 		.offset		= 0x050000,
-		.size		= 0x770000,
+		.size		= 0x790000,
 	}
 };
 #endif /* CONFIG_MTD_PARTITIONS */
diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index 1eafa09bd..f8ecb42c0 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -81,27 +81,40 @@ define Image/Build/WRT400N
 			-d $(KDIR)/vmlinux-$(2).bin.lzma $(KDIR)/vmlinux-$(2).uImage; \
 		( \
 			dd if=$(KDIR)/vmlinux-$(2).uImage bs=1280k conv=sync; \
-			dd if=$(KDIR)/root.$(1) bs=6336k conv=sync; \
-			echo -n $(4); \
-		) > $(call imgname,$(1),$(2)).bin; \
-		wrt400n $(KDIR)/vmlinux-$(2).uImage $(KDIR)/root.$(1) $(call imgname,$(1),$(2)).webui; \
+			dd if=$(KDIR)/root.$(1) \
+		) > $(call imgname,$(1),$(2))-sysupgrade.bin; \
+		wrt400n $(KDIR)/vmlinux-$(2).uImage $(KDIR)/root.$(1) $(call imgname,$(1),$(2))-factory.bin; \
 	fi; fi
 endef
 
 dir825b1_mtdlayout=mtdparts=spi0.0:256k(uboot)ro,64k(config)ro,1024k(kernel),5184k(rootfs),64k(caldata)ro,1600k(unknown)ro,6208k@0x50000(firmware)
 define Image/Build/DIR825B1
 	$(call PatchKernelLzma,$(2),$(3) $(dir825b1_mtdlayout))
-	$(call MkImageLzma,$(KDIR)/vmlinux-$(2).bin.lzma,$(call imgname,$(1),$(2)).bin)
-	if [ `stat -c%s "$(call imgname,$(1),$(2)).bin"` -gt 1048576 ]; then \
+	if [ `stat -c%s "$(KDIR)/vmlinux-$(2).bin.lzma"` -gt 1048576 ]; then \
 	        echo "Warning: $(KDIR)/vmlinux-$(2).bin.lzma is too big"; \
-		rm -f $(call imgname,$(1),$(2)).bin; \
 	else if [ `stat -c%s $(KDIR)/root.$(1)` -gt 5308416 ]; then \
 	        echo "Warning: $(KDIR)/root.$(1) is too big"; \
-		rm -f $(call imgname,$(1),$(2)).bin; \
 	else \
-		dd if=$(KDIR)/root.$(1) of=$(call imgname,$(1),$(2)).bin bs=1k seek=1024; \
-		cp $(call imgname,$(1),$(2)).bin $(call imgname,$(1),$(2))-backup-loader.bin; \
-		echo -n "01AP94-AR7161-RT-080619-00" >> $(call imgname,$(1),$(2))-backup-loader.bin; \
+		mkimage -A mips -O linux -T kernel -a 0x80060000 -C lzma -e \
+			0x80060000 \
+			-n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
+			-d $(KDIR)/vmlinux-$(2).bin.lzma $(KDIR)/vmlinux-$(2).uImage; \
+		( \
+			dd if=$(KDIR)/vmlinux-$(2).uImage bs=1024k conv=sync; \
+			dd if=$(KDIR)/root.$(1) \
+		) > $(call imgname,$(1),$(2))-sysupgrade.bin; \
+		( \
+			dd if=$(call imgname,$(1),$(2))-sysupgrade.bin; \
+			echo -n "01AP94-AR7161-RT-080619-00"; \
+		) > $(call imgname,$(1),$(2))-backup-loader.bin; \
+		if [ `stat -c%s $(call imgname,$(1),$(2))-sysupgrade.bin` -gt 4194304 ]; then \
+			echo "Warning: $(call imgname,$(1),$(2))-sysupgrade.bin is too big"; \
+		else \
+			( \
+				dd if=$(call imgname,$(1),$(2))-sysupgrade.bin bs=4096k conv=sync; \
+				echo -n "00AP94-AR7161-RT-080619-00"; \
+			) > $(call imgname,$(1),$(2))-factory.bin; \
+		fi; \
 	fi; fi
 endef
 
@@ -127,7 +140,7 @@ define Image/Build/WZRHPG300NH
 	fi; fi
 endef
 
-cameo_mtdlayout=mtdparts=spi0.0:128k(u-boot)ro,64k(config)ro,896k(kernel),2880k(rootfs),64k(art)ro,3776k@0x30000(firmware)
+cameo_mtdlayout=mtdparts=spi0.0:128k(u-boot)ro,64k(config)ro,896k(kernel),2944k(rootfs),64k(art)ro,3840k@0x30000(firmware)
 define Image/Build/Cameo
 	$(call PatchKernelLzma,$(2),$(3) $(cameo_mtdlayout))
 	if [ `stat -c%s "$(KDIR)/vmlinux-$(2).bin.lzma"` -gt 917504 ]; then \
@@ -198,27 +211,6 @@ define Image/Build/AP83
 	fi; fi
 endef
 
-define Image/Build/PB92
-	$(call PatchKernelGzip,$(2),$(3))
-	if [ `stat -c%s $(KDIR)/root.$(1)` -gt 2818048 ]; then \
-		echo "Warning: $(KDIR)/root.$(1) is too big"; \
-	else \
-		mkimage -A mips -O linux -T kernel -a 0x80060000 -C gzip -e \
-			0x80060000 \
-			-n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
-			-d $(KDIR)/vmlinux-$(2).bin.gz \
-			$(KDIR)/vmlinux-$(2).uImage; \
-		dd if=$(KDIR)/vmlinux-$(2).uImage \
-			of=$(call imgname,kernel,$(2)).bin bs=64k conv=sync; \
-		dd if=$(KDIR)/root.$(1) \
-			of=$(call imgname,$(1),$(2)-rootfs).bin bs=128k conv=sync; \
-		( \
-			dd if=$(KDIR)/vmlinux-$(2).uImage bs=896k conv=sync; \
-			dd if=$(KDIR)/root.$(1); \
-		) > $(call imgname,$(1),$(2))-sysupgrade.bin; \
-	fi
-endef
-
 define Image/Build/PB4X
 	$(call PatchKernelLzma,$(2),$(3))
 	dd if=$(KDIR)/vmlinux-$(2).bin.lzma \
@@ -281,13 +273,13 @@ define Image/Build/Planex
 			-d $(KDIR)/vmlinux-$(2).bin.gz $(KDIR)/vmlinux-$(2).uImage; \
 		( \
 			dd if=$(KDIR)/vmlinux-$(2).uImage bs=1408k conv=sync; \
-			dd if=$(KDIR)/root.$(1) bs=6208k conv=sync; \
-		) > $(call imgname,$(1),$(2)).bin; \
+			dd if=$(KDIR)/root.$(1); \
+		) > $(call imgname,$(1),$(2))-sysupgrade.bin; \
 		$(STAGING_DIR_HOST)/bin/mkplanexfw \
 			-B $(2) \
 			-v 2.00.00 \
-			-i $(call imgname,$(1),$(2)).bin \
-			-o $(call imgname,$(1),$(2)).webui; \
+			-i $(call imgname,$(1),$(2))-sysupgrade.bin \
+			-o $(call imgname,$(1),$(2))-factory.bin; \
 	fi; fi
 endef
 
@@ -320,7 +312,10 @@ define Image/Build/CyberTAN
 		-x 32 -a 0x10000 -x -32 -f $(KDIR)/root.$(1)
 	-$(STAGING_DIR_HOST)/bin/addpattern -B $(2) -v v$(4) \
 		-i $(KDIR)/image.tmp \
-		-o $(call imgname,$(1),$(2)).bin
+		-o $(call imgname,$(1),$(2))-sysupgrade.bin
+	-$(STAGING_DIR_HOST)/bin/addpattern -B $(2) -v v$(4) -g \
+		-i $(KDIR)/image.tmp \
+		-o $(call imgname,$(1),$(2))-factory.bin
 	rm $(KDIR)/image.tmp
 endef
 
@@ -419,10 +414,6 @@ define Image/Build/Profile/PB44
 	$(call Image/Build/Template/$(fs_64k)/$(1),PB4X,pb44,board=PB44)
 endef
 
-define Image/Build/Profile/PB92
-	$(call Image/Build/Template/$(fs_64k)/$(1),PB92,pb92,board=PB92)
-endef
-
 define Image/Build/Profile/WP543
 	$(call Image/Build/Template/$(fs_64k)/$(1),MyLoader,wp543,0x200000,2M)
 	$(call Image/Build/Template/$(fs_64k)/$(1),MyLoader,wp543,0x400000,4M)
@@ -515,6 +506,10 @@ define Image/Build/Profile/TLWR941NDV2
 	$(call Image/Build/Template/$(fs_squash)/$(1),TPLINK,tl-wr941nd-v2,board=TL-WR941ND,TL-WR941NDv2)
 endef
 
+define Image/Build/Profile/TLWR941NDV3
+	$(call Image/Build/Template/$(fs_squash)/$(1),TPLINK,tl-wr941nd-v3,board=TL-WR941ND,TL-WR941NDv2)
+endef
+
 define Image/Build/Profile/TLWR941NDV4
 	$(call Image/Build/Template/$(fs_4k)/$(1),TPLINK,tl-wr941nd-v4,board=TL-WR741ND,TL-WR941NDv4)
 endef
@@ -555,7 +550,6 @@ define Image/Build/Profile/Default
 	$(call Image/Build/Profile/MZKW300NH,$(1))
 	$(call Image/Build/Profile/PB42,$(1))
 	$(call Image/Build/Profile/PB44,$(1))
-	$(call Image/Build/Profile/PB92,$(1))
 	$(call Image/Build/Profile/TEW632BRP,$(1))
 	$(call Image/Build/Profile/TEW652BRP,$(1))
 	$(call Image/Build/Profile/TLWR741NDV1,$(1))
@@ -563,6 +557,7 @@ define Image/Build/Profile/Default
 	$(call Image/Build/Profile/TLWR841NDV3,$(1))
 	$(call Image/Build/Profile/TLWR841NDV5,$(1))
 	$(call Image/Build/Profile/TLWR941NDV2,$(1))
+	$(call Image/Build/Profile/TLWR941NDV3,$(1))
 	$(call Image/Build/Profile/TLWR941NDV4,$(1))
 	$(call Image/Build/Profile/TLWR1043NDV1,$(1))
 	$(call Image/Build/Profile/UBNT,$(1))
diff --git a/target/linux/ar71xx/patches-2.6.33/001-ar71xx_core.patch b/target/linux/ar71xx/patches-2.6.33/001-ar71xx_core.patch
deleted file mode 100644
index 5073652dd..000000000
--- a/target/linux/ar71xx/patches-2.6.33/001-ar71xx_core.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -166,6 +166,13 @@ ifeq (,$(findstring march=octeon, $(cfla
- cflags-$(CONFIG_CPU_CAVIUM_OCTEON) += -Wa,-march=octeon
- endif
- 
-+#
-+# Atheros AR71xx
-+#
-+core-$(CONFIG_ATHEROS_AR71XX)	+= arch/mips/ar71xx/
-+cflags-$(CONFIG_ATHEROS_AR71XX)	+= -I$(srctree)/arch/mips/include/asm/mach-ar71xx
-+load-$(CONFIG_ATHEROS_AR71XX)	+= 0xffffffff80060000
-+
- cflags-$(CONFIG_CPU_R4000_WORKAROUNDS)	+= $(call cc-option,-mfix-r4000,)
- cflags-$(CONFIG_CPU_R4400_WORKAROUNDS)	+= $(call cc-option,-mfix-r4400,)
- cflags-$(CONFIG_CPU_DADDI_WORKAROUNDS)	+= $(call cc-option,-mno-daddi,)
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -48,6 +48,23 @@ config AR7
- 	  Support for the Texas Instruments AR7 System-on-a-Chip
- 	  family: TNETD7100, 7200 and 7300.
- 
-+config ATHEROS_AR71XX
-+	bool "Atheros AR71xx based boards"
-+	select CEVT_R4K
-+	select CSRC_R4K
-+	select DMA_NONCOHERENT
-+	select HW_HAS_PCI
-+	select IRQ_CPU
-+	select ARCH_REQUIRE_GPIOLIB
-+	select SYS_HAS_CPU_MIPS32_R1
-+	select SYS_HAS_CPU_MIPS32_R2
-+	select SYS_SUPPORTS_32BIT_KERNEL
-+	select SYS_SUPPORTS_BIG_ENDIAN
-+	select SYS_HAS_EARLY_PRINTK
-+	select MIPS_MACHINE
-+	help
-+	  Support for Atheros AR71xx based boards.
-+
- config BCM47XX
- 	bool "BCM47XX based boards"
- 	select CEVT_R4K
-@@ -682,6 +699,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
- endchoice
- 
- source "arch/mips/alchemy/Kconfig"
-+source "arch/mips/ar71xx/Kconfig"
- source "arch/mips/bcm63xx/Kconfig"
- source "arch/mips/jazz/Kconfig"
- source "arch/mips/lasat/Kconfig"
diff --git a/target/linux/ar71xx/patches-2.6.33/002-ar71xx_pci.patch b/target/linux/ar71xx/patches-2.6.33/002-ar71xx_pci.patch
deleted file mode 100644
index 3facce9d7..000000000
--- a/target/linux/ar71xx/patches-2.6.33/002-ar71xx_pci.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/arch/mips/pci/Makefile
-+++ b/arch/mips/pci/Makefile
-@@ -18,6 +18,7 @@ obj-$(CONFIG_PCI_TX4927)	+= ops-tx4927.o
- obj-$(CONFIG_BCM47XX)		+= pci-bcm47xx.o
- obj-$(CONFIG_BCM63XX)		+= pci-bcm63xx.o fixup-bcm63xx.o \
- 					ops-bcm63xx.o
-+obj-$(CONFIG_ATHEROS_AR71XX)	+= pci-ar71xx.o pci-ar724x.o
- 
- #
- # These are still pretty much in the old state, watch, go blind.
diff --git a/target/linux/ar71xx/patches-2.6.33/003-ar71xx_usb_host.patch b/target/linux/ar71xx/patches-2.6.33/003-ar71xx_usb_host.patch
deleted file mode 100644
index 238a79c9b..000000000
--- a/target/linux/ar71xx/patches-2.6.33/003-ar71xx_usb_host.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/drivers/usb/host/Kconfig
-+++ b/drivers/usb/host/Kconfig
-@@ -109,6 +109,13 @@ config XPS_USB_HCD_XILINX
- 		support both high speed and full speed devices, or high speed
- 		devices only.
- 
-+config USB_EHCI_AR71XX
-+	bool "USB EHCI support for AR71xx"
-+	depends on USB_EHCI_HCD && ATHEROS_AR71XX
-+	default y
-+	help
-+	  Support for Atheros AR71xx built-in EHCI controller
-+
- config USB_EHCI_FSL
- 	bool "Support for Freescale on-chip EHCI USB controller"
- 	depends on USB_EHCI_HCD && FSL_SOC
-@@ -207,6 +214,13 @@ config USB_OHCI_HCD
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called ohci-hcd.
- 
-+config USB_OHCI_AR71XX
-+	bool "USB OHCI support for Atheros AR71xx"
-+	depends on USB_OHCI_HCD && ATHEROS_AR71XX
-+	default y
-+	help
-+	  Support for Atheros AR71xx built-in OHCI controller
-+
- config USB_OHCI_HCD_PPC_SOC
- 	bool "OHCI support for on-chip PPC USB controller"
- 	depends on USB_OHCI_HCD && (STB03xxx || PPC_MPC52xx)
---- a/drivers/usb/host/ehci-hcd.c
-+++ b/drivers/usb/host/ehci-hcd.c
-@@ -1158,6 +1158,11 @@ MODULE_LICENSE ("GPL");
- #define	PLATFORM_DRIVER		ehci_atmel_driver
- #endif
- 
-+#ifdef CONFIG_USB_EHCI_AR71XX
-+#include "ehci-ar71xx.c"
-+#define PLATFORM_DRIVER		ehci_ar71xx_driver
-+#endif
-+
- #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
-     !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER)
- #error "missing bus glue for ehci-hcd"
---- a/drivers/usb/host/ohci-hcd.c
-+++ b/drivers/usb/host/ohci-hcd.c
-@@ -1085,6 +1085,11 @@ MODULE_LICENSE ("GPL");
- #define TMIO_OHCI_DRIVER	ohci_hcd_tmio_driver
- #endif
- 
-+#ifdef CONFIG_USB_OHCI_AR71XX
-+#include "ohci-ar71xx.c"
-+#define PLATFORM_DRIVER		ohci_hcd_ar71xx_driver
-+#endif
-+
- #if	!defined(PCI_DRIVER) &&		\
- 	!defined(PLATFORM_DRIVER) &&	\
- 	!defined(OF_PLATFORM_DRIVER) &&	\
diff --git a/target/linux/ar71xx/patches-2.6.33/004-ar71xx_spi_controller.patch b/target/linux/ar71xx/patches-2.6.33/004-ar71xx_spi_controller.patch
deleted file mode 100644
index 9c196e077..000000000
--- a/target/linux/ar71xx/patches-2.6.33/004-ar71xx_spi_controller.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/drivers/spi/Kconfig
-+++ b/drivers/spi/Kconfig
-@@ -53,6 +53,13 @@ if SPI_MASTER
- 
- comment "SPI Master Controller Drivers"
- 
-+config SPI_AR71XX
-+	tristate "Atheros AR71xx SPI Controller"
-+	depends on SPI_MASTER && ATHEROS_AR71XX
-+	select SPI_BITBANG
-+	help
-+	  This is the SPI contoller driver for Atheros AR71xx.
-+
- config SPI_ATMEL
- 	tristate "Atmel SPI Controller"
- 	depends on (ARCH_AT91 || AVR32)
---- a/drivers/spi/Makefile
-+++ b/drivers/spi/Makefile
-@@ -11,6 +11,7 @@ endif
- obj-$(CONFIG_SPI_MASTER)		+= spi.o
- 
- # SPI master controller drivers (bus)
-+obj-$(CONFIG_SPI_AR71XX)		+= ar71xx_spi.o
- obj-$(CONFIG_SPI_ATMEL)			+= atmel_spi.o
- obj-$(CONFIG_SPI_BFIN)			+= spi_bfin5xx.o
- obj-$(CONFIG_SPI_BITBANG)		+= spi_bitbang.o
diff --git a/target/linux/ar71xx/patches-2.6.33/005-ar71xx_mac_driver.patch b/target/linux/ar71xx/patches-2.6.33/005-ar71xx_mac_driver.patch
deleted file mode 100644
index 3721a9b86..000000000
--- a/target/linux/ar71xx/patches-2.6.33/005-ar71xx_mac_driver.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/drivers/net/Kconfig
-+++ b/drivers/net/Kconfig
-@@ -2128,6 +2128,8 @@ config ACENIC_OMIT_TIGON_I
- 
- 	  The safe and default value for this is N.
- 
-+source drivers/net/ag71xx/Kconfig
-+
- config DL2K
- 	tristate "DL2000/TC902x-based Gigabit Ethernet support"
- 	depends on PCI
---- a/drivers/net/Makefile
-+++ b/drivers/net/Makefile
-@@ -106,6 +106,7 @@ obj-$(CONFIG_STMMAC_ETH) += stmmac/
- # end link order section
- #
- 
-+obj-$(CONFIG_AG71XX) += ag71xx/
- obj-$(CONFIG_SUNDANCE) += sundance.o
- obj-$(CONFIG_HAMACHI) += hamachi.o
- obj-$(CONFIG_NET) += Space.o loopback.o
diff --git a/target/linux/ar71xx/patches-2.6.33/006-ar71xx_wdt_driver.patch b/target/linux/ar71xx/patches-2.6.33/006-ar71xx_wdt_driver.patch
deleted file mode 100644
index d71a11b86..000000000
--- a/target/linux/ar71xx/patches-2.6.33/006-ar71xx_wdt_driver.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/drivers/watchdog/Kconfig
-+++ b/drivers/watchdog/Kconfig
-@@ -840,6 +840,13 @@ config TXX9_WDT
- 	help
- 	  Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs.
- 
-+config AR71XX_WDT
-+	tristate "Atheros AR71xx Watchdog Timer"
-+	depends on ATHEROS_AR71XX
-+	help
-+	  Hardware driver for the built-in watchdog timer on the Atheros
-+	  AR71xx SoCs.
-+
- # PARISC Architecture
- 
- # POWERPC Architecture
---- a/drivers/watchdog/Makefile
-+++ b/drivers/watchdog/Makefile
-@@ -112,6 +112,7 @@ obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt
- obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
- obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
- obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
-+obj-$(CONFIG_AR71XX_WDT) += ar71xx_wdt.o
- 
- # PARISC Architecture
- 
diff --git a/target/linux/ar71xx/patches-2.6.33/007-ar91xx_flash_driver.patch b/target/linux/ar71xx/patches-2.6.33/007-ar91xx_flash_driver.patch
deleted file mode 100644
index 127db55b6..000000000
--- a/target/linux/ar71xx/patches-2.6.33/007-ar91xx_flash_driver.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/drivers/mtd/maps/Kconfig
-+++ b/drivers/mtd/maps/Kconfig
-@@ -257,6 +257,13 @@ config MTD_ALCHEMY
- 	help
- 	  Flash memory access on AMD Alchemy Pb/Db/RDK Reference Boards
- 
-+config MTD_AR91XX_FLASH
-+	tristate "Atheros AR91xx parallel flash support"
-+	depends on ATHEROS_AR71XX
-+	select MTD_COMPLEX_MAPPINGS
-+	help
-+	  Parallel flash driver for the Atheros AR91xx based boards.
-+
- config MTD_DILNETPC
- 	tristate "CFI Flash device mapped on DIL/Net PC"
- 	depends on X86 && MTD_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT && BROKEN
---- a/drivers/mtd/maps/Makefile
-+++ b/drivers/mtd/maps/Makefile
-@@ -41,6 +41,7 @@ obj-$(CONFIG_MTD_DBOX2)		+= dbox2-flash.
- obj-$(CONFIG_MTD_SOLUTIONENGINE)+= solutionengine.o
- obj-$(CONFIG_MTD_PCI)		+= pci.o
- obj-$(CONFIG_MTD_ALCHEMY)       += alchemy-flash.o
-+obj-$(CONFIG_MTD_AR91XX_FLASH)	+= ar91xx_flash.o
- obj-$(CONFIG_MTD_AUTCPU12)	+= autcpu12-nvram.o
- obj-$(CONFIG_MTD_EDB7312)	+= edb7312.o
- obj-$(CONFIG_MTD_IMPA7)		+= impa7.o
diff --git a/target/linux/ar71xx/patches-2.6.33/101-ksz8041_phy_driver.patch b/target/linux/ar71xx/patches-2.6.33/101-ksz8041_phy_driver.patch
deleted file mode 100644
index 503604610..000000000
--- a/target/linux/ar71xx/patches-2.6.33/101-ksz8041_phy_driver.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -114,6 +114,11 @@ config RTL8306_PHY
- 	tristate "Driver for Realtek RTL8306S switches"
- 	select SWCONFIG
- 
-+config MICREL_PHY
-+	tristate "Drivers for Micrel/Kendin PHYs"
-+	---help---
-+	  Currently has a driver for the KSZ8041
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -24,6 +24,7 @@ obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi
- obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o
- obj-$(CONFIG_RTL8366RB_PHY)	+= rtl8366rb.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
-+obj-$(CONFIG_MICREL)		+= micrel.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
- obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
- obj-$(CONFIG_MDIO_GPIO)		+= mdio-gpio.o
diff --git a/target/linux/ar71xx/patches-2.6.33/102-mtd_m25p80_add_myloader_parser.patch b/target/linux/ar71xx/patches-2.6.33/102-mtd_m25p80_add_myloader_parser.patch
deleted file mode 100644
index 45f743e06..000000000
--- a/target/linux/ar71xx/patches-2.6.33/102-mtd_m25p80_add_myloader_parser.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -922,6 +922,16 @@ static int __devinit m25p_probe(struct s
- 					part_probes, &parts, 0);
- 		}
- 
-+#ifdef CONFIG_MTD_MYLOADER_PARTS
-+		if (nr_parts <= 0) {
-+			static const char *part_probes[]
-+					= { "MyLoader", NULL, };
-+
-+			nr_parts = parse_mtd_partitions(&flash->mtd,
-+					part_probes, &parts, 0);
-+		}
-+#endif
-+
- 		if (nr_parts <= 0 && data && data->parts) {
- 			parts = data->parts;
- 			nr_parts = data->nr_parts;
diff --git a/target/linux/ar71xx/patches-2.6.33/104-mtd_m25p80_add_redboot_parser.patch b/target/linux/ar71xx/patches-2.6.33/104-mtd_m25p80_add_redboot_parser.patch
deleted file mode 100644
index 43fe987df..000000000
--- a/target/linux/ar71xx/patches-2.6.33/104-mtd_m25p80_add_redboot_parser.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -932,6 +932,15 @@ static int __devinit m25p_probe(struct s
- 		}
- #endif
- 
-+#ifdef CONFIG_MTD_REDBOOT_PARTS
-+		if (nr_parts <= 0) {
-+			static const char *part_probes[]
-+					= { "RedBoot", NULL, };
-+
-+			nr_parts = parse_mtd_partitions(&flash->mtd,
-+					part_probes, &parts, 0);
-+		}
-+#endif
- 		if (nr_parts <= 0 && data && data->parts) {
- 			parts = data->parts;
- 			nr_parts = data->nr_parts;
diff --git a/target/linux/ar71xx/patches-2.6.33/107-mtd-SST39VF6401B-support.patch b/target/linux/ar71xx/patches-2.6.33/107-mtd-SST39VF6401B-support.patch
deleted file mode 100644
index 2fdfcb7cd..000000000
--- a/target/linux/ar71xx/patches-2.6.33/107-mtd-SST39VF6401B-support.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/drivers/mtd/chips/jedec_probe.c
-+++ b/drivers/mtd/chips/jedec_probe.c
-@@ -166,6 +166,7 @@
- #define SST39LF160	0x2782
- #define SST39VF1601	0x234b
- #define SST39VF3201	0x235b
-+#define SST39VF6401B	0x236d
- #define SST39LF512	0x00D4
- #define SST39LF010	0x00D5
- #define SST39LF020	0x00D6
-@@ -1556,6 +1557,18 @@ static const struct amd_flash_info jedec
- 			ERASEINFO(0x10000,64),
- 		}
- 	}, {
-+		.mfr_id         = MANUFACTURER_SST,
-+		.dev_id         = SST39VF6401B,
-+		.name           = "SST 39VF6401B",
-+		.devtypes       = CFI_DEVICETYPE_X16,
-+		.uaddr          = MTD_UADDR_0xAAAA_0x5555,
-+		.dev_size       = SIZE_8MiB,
-+		.cmd_set        = P_ID_AMD_STD,
-+		.nr_regions     = 1,
-+		.regions        = {
-+			ERASEINFO(0x10000,128)
-+		}
-+	}, {
- 		.mfr_id		= MANUFACTURER_ST,
- 		.dev_id		= M29F800AB,
- 		.name		= "ST M29F800AB",
diff --git a/target/linux/ar71xx/patches-2.6.33/108-mtd_fix_cfi_cmdset_0002_status_check.patch b/target/linux/ar71xx/patches-2.6.33/108-mtd_fix_cfi_cmdset_0002_status_check.patch
deleted file mode 100644
index e0676cae9..000000000
--- a/target/linux/ar71xx/patches-2.6.33/108-mtd_fix_cfi_cmdset_0002_status_check.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- a/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -1130,8 +1130,8 @@ static int __xipram do_write_oneword(str
- 			break;
- 		}
- 
--		if (chip_ready(map, adr))
--			break;
-+		if (chip_good(map, adr, datum))
-+			goto enable_xip;
- 
- 		/* Latency issues. Drop the lock, wait a while and retry */
- 		UDELAY(map, chip, adr, 1);
-@@ -1147,6 +1147,8 @@ static int __xipram do_write_oneword(str
- 
- 		ret = -EIO;
- 	}
-+
-+ enable_xip:
- 	xip_enable(map, chip, adr);
-  op_done:
- 	chip->state = FL_READY;
-@@ -1493,7 +1495,6 @@ static int cfi_amdstd_write_buffers(stru
- 	return 0;
- }
- 
--
- /*
-  * Handle devices with one erase region, that only implement
-  * the chip erase command.
-@@ -1557,8 +1558,8 @@ static int __xipram do_erase_chip(struct
- 			chip->erase_suspended = 0;
- 		}
- 
--		if (chip_ready(map, adr))
--			break;
-+		if (chip_good(map, adr, map_word_ff(map)))
-+			goto op_done;
- 
- 		if (time_after(jiffies, timeo)) {
- 			printk(KERN_WARNING "MTD %s(): software timeout\n",
-@@ -1578,6 +1579,7 @@ static int __xipram do_erase_chip(struct
- 		ret = -EIO;
- 	}
- 
-+ op_done:
- 	chip->state = FL_READY;
- 	xip_enable(map, chip, adr);
- 	put_chip(map, chip, adr);
-@@ -1645,9 +1647,9 @@ static int __xipram do_erase_oneblock(st
- 			chip->erase_suspended = 0;
- 		}
- 
--		if (chip_ready(map, adr)) {
-+		if (chip_good(map, adr, map_word_ff(map))) {
- 			xip_enable(map, chip, adr);
--			break;
-+			goto op_done;
- 		}
- 
- 		if (time_after(jiffies, timeo)) {
-@@ -1669,6 +1671,7 @@ static int __xipram do_erase_oneblock(st
- 		ret = -EIO;
- 	}
- 
-+ op_done:
- 	chip->state = FL_READY;
- 	put_chip(map, chip, adr);
- 	spin_unlock(chip->mutex);
diff --git a/target/linux/ar71xx/patches-2.6.33/109-mtd-wrt160nl-trx-parser.patch b/target/linux/ar71xx/patches-2.6.33/109-mtd-wrt160nl-trx-parser.patch
deleted file mode 100644
index 037795b33..000000000
--- a/target/linux/ar71xx/patches-2.6.33/109-mtd-wrt160nl-trx-parser.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -941,6 +941,16 @@ static int __devinit m25p_probe(struct s
- 					part_probes, &parts, 0);
- 		}
- #endif
-+
-+#ifdef CONFIG_MTD_WRT160NL_PARTS
-+		if (nr_parts <= 0) {
-+			static const char *part_probes[]
-+					= { "wrt160nl", NULL, };
-+
-+			nr_parts = parse_mtd_partitions(&flash->mtd,
-+					part_probes, &parts, 0);
-+		}
-+#endif
- 		if (nr_parts <= 0 && data && data->parts) {
- 			parts = data->parts;
- 			nr_parts = data->nr_parts;
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -181,6 +181,12 @@ config MTD_AR7_PARTS
- 	---help---
- 	  TI AR7 partitioning support
- 
-+config MTD_WRT160NL_PARTS
-+	tristate "Linksys WRT160NL partitioning support"
-+	depends on MTD_PARTITIONS && AR71XX_MACH_WRT160NL
-+	---help---
-+	   Linksys WRT160NL partitioning support
-+
- config MTD_MYLOADER_PARTS
- 	tristate "MyLoader partition parsing"
- 	depends on MTD_PARTITIONS && (ADM5120 || ATHEROS_AR231X || ATHEROS_AR71XX)
---- a/drivers/mtd/Makefile
-+++ b/drivers/mtd/Makefile
-@@ -12,6 +12,7 @@ obj-$(CONFIG_MTD_REDBOOT_PARTS) += redbo
- obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
- obj-$(CONFIG_MTD_AFS_PARTS)	+= afs.o
- obj-$(CONFIG_MTD_AR7_PARTS)	+= ar7part.o
-+obj-$(CONFIG_MTD_WRT160NL_PARTS) += wrt160nl_part.o
- obj-$(CONFIG_MTD_OF_PARTS)      += ofpart.o
- obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
- 
diff --git a/target/linux/ar71xx/patches-2.6.33/110-usb-ehci-add-war-for-synopsys-hc-bug.patch b/target/linux/ar71xx/patches-2.6.33/110-usb-ehci-add-war-for-synopsys-hc-bug.patch
deleted file mode 100644
index 076c39ea2..000000000
--- a/target/linux/ar71xx/patches-2.6.33/110-usb-ehci-add-war-for-synopsys-hc-bug.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/drivers/usb/host/ehci-q.c
-+++ b/drivers/usb/host/ehci-q.c
-@@ -1194,6 +1194,9 @@ static void end_unlink_async (struct ehc
- 		ehci->reclaim = NULL;
- 		start_unlink_async (ehci, next);
- 	}
-+
-+	if (ehci->has_synopsys_hc_bug)
-+		writel((u32)ehci->async->qh_dma, &ehci->regs->async_next);
- }
- 
- /* makes sure the async qh will become idle */
---- a/drivers/usb/host/ehci.h
-+++ b/drivers/usb/host/ehci.h
-@@ -129,6 +129,7 @@ struct ehci_hcd {			/* one per controlle
- 	unsigned		has_amcc_usb23:1;
- 	unsigned		need_io_watchdog:1;
- 	unsigned		broken_periodic:1;
-+	unsigned		has_synopsys_hc_bug:1; /* Synopsys HC */
- 
- 	/* required for usb32 quirk */
- 	#define OHCI_CTRL_HCFS          (3 << 6)
diff --git a/target/linux/ar71xx/patches-2.6.33/111-mtd-cfi_cmdset_0002-force-word-write.patch b/target/linux/ar71xx/patches-2.6.33/111-mtd-cfi_cmdset_0002-force-word-write.patch
deleted file mode 100644
index 3215a7d9d..000000000
--- a/target/linux/ar71xx/patches-2.6.33/111-mtd-cfi_cmdset_0002-force-word-write.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- a/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -39,7 +39,7 @@
- #include <linux/mtd/xip.h>
- 
- #define AMD_BOOTLOC_BUG
--#define FORCE_WORD_WRITE 0
-+#define FORCE_WORD_WRITE 1
- 
- #define MAX_WORD_RETRIES 3
- 
-@@ -55,7 +55,9 @@
- 
- static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
- static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
-+#if !FORCE_WORD_WRITE
- static int cfi_amdstd_write_buffers(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
-+#endif
- static int cfi_amdstd_erase_chip(struct mtd_info *, struct erase_info *);
- static int cfi_amdstd_erase_varsize(struct mtd_info *, struct erase_info *);
- static void cfi_amdstd_sync (struct mtd_info *);
-@@ -190,6 +192,7 @@ static void fixup_amd_bootblock(struct m
- }
- #endif
- 
-+#if !FORCE_WORD_WRITE
- static void fixup_use_write_buffers(struct mtd_info *mtd, void *param)
- {
- 	struct map_info *map = mtd->priv;
-@@ -199,6 +202,7 @@ static void fixup_use_write_buffers(stru
- 		mtd->write = cfi_amdstd_write_buffers;
- 	}
- }
-+#endif /* !FORCE_WORD_WRITE */
- 
- /* Atmel chips don't use the same PRI format as AMD chips */
- static void fixup_convert_atmel_pri(struct mtd_info *mtd, void *param)
-@@ -1304,6 +1308,7 @@ static int cfi_amdstd_write_words(struct
- /*
-  * FIXME: interleaved mode not tested, and probably not supported!
-  */
-+#if !FORCE_WORD_WRITE
- static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
- 				    unsigned long adr, const u_char *buf,
- 				    int len)
-@@ -1415,7 +1420,6 @@ static int __xipram do_write_buffer(stru
- 	return ret;
- }
- 
--
- static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len,
- 				    size_t *retlen, const u_char *buf)
- {
-@@ -1494,6 +1498,7 @@ static int cfi_amdstd_write_buffers(stru
- 
- 	return 0;
- }
-+#endif /* !FORCE_WORD_WRITE */
- 
- /*
-  * Handle devices with one erase region, that only implement
diff --git a/target/linux/ar71xx/patches-2.6.33/120-dsa-trailer-tag-validation-fix.patch b/target/linux/ar71xx/patches-2.6.33/120-dsa-trailer-tag-validation-fix.patch
deleted file mode 100644
index b58aeedc3..000000000
--- a/target/linux/ar71xx/patches-2.6.33/120-dsa-trailer-tag-validation-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/net/dsa/tag_trailer.c
-+++ b/net/dsa/tag_trailer.c
-@@ -86,7 +86,7 @@ static int trailer_rcv(struct sk_buff *s
- 
- 	trailer = skb_tail_pointer(skb) - 4;
- 	if (trailer[0] != 0x80 || (trailer[1] & 0xf8) != 0x00 ||
--	    (trailer[3] & 0xef) != 0x00 || trailer[3] != 0x00)
-+	    (trailer[2] & 0xef) != 0x00 || (trailer[3] & 0xfe) != 0x00)
- 		goto out_drop;
- 
- 	source_port = trailer[1] & 7;
diff --git a/target/linux/ar71xx/patches-2.6.33/121-dsa-add-88e6063-driver.patch b/target/linux/ar71xx/patches-2.6.33/121-dsa-add-88e6063-driver.patch
deleted file mode 100644
index 1a11a69c6..000000000
--- a/target/linux/ar71xx/patches-2.6.33/121-dsa-add-88e6063-driver.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/net/dsa/Kconfig
-+++ b/net/dsa/Kconfig
-@@ -36,6 +36,13 @@ config NET_DSA_MV88E6060
- 	  This enables support for the Marvell 88E6060 ethernet switch
- 	  chip.
- 
-+config NET_DSA_MV88E6063
-+	bool "Marvell 88E6063 ethernet switch chip support"
-+	select NET_DSA_TAG_TRAILER
-+	---help---
-+	  This enables support for the Marvell 88E6063 ethernet switch
-+	  chip
-+
- config NET_DSA_MV88E6XXX_NEED_PPU
- 	bool
- 	default n
---- a/net/dsa/Makefile
-+++ b/net/dsa/Makefile
-@@ -6,6 +6,7 @@ obj-$(CONFIG_NET_DSA_TAG_TRAILER) += tag
- # switch drivers
- obj-$(CONFIG_NET_DSA_MV88E6XXX) += mv88e6xxx.o
- obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o
-+obj-$(CONFIG_NET_DSA_MV88E6063) += mv88e6063.o
- obj-$(CONFIG_NET_DSA_MV88E6123_61_65) += mv88e6123_61_65.o
- obj-$(CONFIG_NET_DSA_MV88E6131) += mv88e6131.o
- 
diff --git a/target/linux/ar71xx/patches-2.6.33/122-dsa-add-qinq-tagging-format.patch b/target/linux/ar71xx/patches-2.6.33/122-dsa-add-qinq-tagging-format.patch
deleted file mode 100644
index dc03fd6eb..000000000
--- a/target/linux/ar71xx/patches-2.6.33/122-dsa-add-qinq-tagging-format.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- a/include/linux/if_ether.h
-+++ b/include/linux/if_ether.h
-@@ -81,6 +81,7 @@
- #define ETH_P_1588	0x88F7		/* IEEE 1588 Timesync */
- #define ETH_P_FCOE	0x8906		/* Fibre Channel over Ethernet  */
- #define ETH_P_FIP	0x8914		/* FCoE Initialization Protocol */
-+#define ETH_P_QINQ	0x9100		/* QinQ VLAN Stacking Protocol */
- #define ETH_P_EDSA	0xDADA		/* Ethertype DSA [ NOT AN OFFICIALLY REGISTERED ID ] */
- 
- /*
---- a/net/dsa/dsa_priv.h
-+++ b/net/dsa/dsa_priv.h
-@@ -174,6 +174,9 @@ netdev_tx_t dsa_xmit(struct sk_buff *skb
- /* tag_edsa.c */
- netdev_tx_t edsa_xmit(struct sk_buff *skb, struct net_device *dev);
- 
-+/* tag_qinq.c */
-+netdev_tx_t qinq_xmit(struct sk_buff *skb, struct net_device *dev);
-+
- /* tag_trailer.c */
- netdev_tx_t trailer_xmit(struct sk_buff *skb, struct net_device *dev);
- 
---- a/net/dsa/Kconfig
-+++ b/net/dsa/Kconfig
-@@ -23,6 +23,10 @@ config NET_DSA_TAG_TRAILER
- 	bool
- 	default n
- 
-+config NET_DSA_TAG_QINQ
-+	bool
-+	default y
-+
- 
- # switch drivers
- config NET_DSA_MV88E6XXX
---- a/net/dsa/Makefile
-+++ b/net/dsa/Makefile
-@@ -1,6 +1,7 @@
- # tagging formats
- obj-$(CONFIG_NET_DSA_TAG_DSA) += tag_dsa.o
- obj-$(CONFIG_NET_DSA_TAG_EDSA) += tag_edsa.o
-+obj-$(CONFIG_NET_DSA_TAG_QINQ) += tag_qinq.o
- obj-$(CONFIG_NET_DSA_TAG_TRAILER) += tag_trailer.o
- 
- # switch drivers
---- a/net/dsa/slave.c
-+++ b/net/dsa/slave.c
-@@ -321,6 +321,19 @@ static const struct net_device_ops edsa_
- 	.ndo_do_ioctl		= dsa_slave_ioctl,
- };
- #endif
-+#ifdef CONFIG_NET_DSA_TAG_QINQ
-+static const struct net_device_ops qinq_netdev_ops = {
-+	.ndo_init		= dsa_slave_init,
-+	.ndo_open	 	= dsa_slave_open,
-+	.ndo_stop		= dsa_slave_close,
-+	.ndo_start_xmit		= qinq_xmit,
-+	.ndo_change_rx_flags	= dsa_slave_change_rx_flags,
-+	.ndo_set_rx_mode	= dsa_slave_set_rx_mode,
-+	.ndo_set_multicast_list = dsa_slave_set_rx_mode,
-+	.ndo_set_mac_address	= dsa_slave_set_mac_address,
-+	.ndo_do_ioctl		= dsa_slave_ioctl,
-+};
-+#endif
- #ifdef CONFIG_NET_DSA_TAG_TRAILER
- static const struct net_device_ops trailer_netdev_ops = {
- 	.ndo_init		= dsa_slave_init,
-@@ -366,6 +379,11 @@ dsa_slave_create(struct dsa_switch *ds, 
- 		slave_dev->netdev_ops = &edsa_netdev_ops;
- 		break;
- #endif
-+#ifdef CONFIG_NET_DSA_TAG_QINQ
-+	case htons(ETH_P_QINQ):
-+		slave_dev->netdev_ops = &qinq_netdev_ops;
-+		break;
-+#endif
- #ifdef CONFIG_NET_DSA_TAG_TRAILER
- 	case htons(ETH_P_TRAILER):
- 		slave_dev->netdev_ops = &trailer_netdev_ops;
diff --git a/target/linux/ar71xx/patches-2.6.33/123-dsa-add-ar7240-built-in-switch-support.patch b/target/linux/ar71xx/patches-2.6.33/123-dsa-add-ar7240-built-in-switch-support.patch
deleted file mode 100644
index 50e6e5de2..000000000
--- a/target/linux/ar71xx/patches-2.6.33/123-dsa-add-ar7240-built-in-switch-support.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/net/dsa/Kconfig
-+++ b/net/dsa/Kconfig
-@@ -29,6 +29,15 @@ config NET_DSA_TAG_QINQ
- 
- 
- # switch drivers
-+config NET_DSA_AR7240
-+	bool "Atheros AR7240 built-in ethernet switch support"
-+	depends on ATHEROS_AR71XX
-+	default n
-+	select NET_DSA_TAG_QINQ
-+	---help---
-+	  This enables support for the built-in ethernet switch of the
-+	  Atheros AR7240 SoC.
-+
- config NET_DSA_MV88E6XXX
- 	bool
- 	default n
---- a/net/dsa/Makefile
-+++ b/net/dsa/Makefile
-@@ -5,6 +5,7 @@ obj-$(CONFIG_NET_DSA_TAG_QINQ) += tag_qi
- obj-$(CONFIG_NET_DSA_TAG_TRAILER) += tag_trailer.o
- 
- # switch drivers
-+obj-$(CONFIG_NET_DSA_AR7240) += ar7240.o
- obj-$(CONFIG_NET_DSA_MV88E6XXX) += mv88e6xxx.o
- obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o
- obj-$(CONFIG_NET_DSA_MV88E6063) += mv88e6063.o
diff --git a/target/linux/ar71xx/patches-2.6.33/140-redboot_partition_scan.patch b/target/linux/ar71xx/patches-2.6.33/140-redboot_partition_scan.patch
deleted file mode 100644
index 289d4eb99..000000000
--- a/target/linux/ar71xx/patches-2.6.33/140-redboot_partition_scan.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/drivers/mtd/redboot.c
-+++ b/drivers/mtd/redboot.c
-@@ -60,31 +60,32 @@ static int parse_redboot_partitions(stru
- 	static char nullstring[] = "unallocated";
- #endif
- 
-+	buf = vmalloc(master->erasesize);
-+	if (!buf)
-+		return -ENOMEM;
-+
-+ restart:
- 	if ( directory < 0 ) {
- 		offset = master->size + directory * master->erasesize;
--		while (master->block_isbad && 
-+		while (master->block_isbad &&
- 		       master->block_isbad(master, offset)) {
- 			if (!offset) {
- 			nogood:
- 				printk(KERN_NOTICE "Failed to find a non-bad block to check for RedBoot partition table\n");
-+				vfree(buf);
- 				return -EIO;
- 			}
- 			offset -= master->erasesize;
- 		}
- 	} else {
- 		offset = directory * master->erasesize;
--		while (master->block_isbad && 
-+		while (master->block_isbad &&
- 		       master->block_isbad(master, offset)) {
- 			offset += master->erasesize;
- 			if (offset == master->size)
- 				goto nogood;
- 		}
- 	}
--	buf = vmalloc(master->erasesize);
--
--	if (!buf)
--		return -ENOMEM;
--
- 	printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n",
- 	       master->name, offset);
- 
-@@ -156,6 +157,11 @@ static int parse_redboot_partitions(stru
- 	}
- 	if (i == numslots) {
- 		/* Didn't find it */
-+		if (offset + master->erasesize < master->size) {
-+			/* not at the end of the flash yet, maybe next block :) */
-+			directory++;
-+			goto restart;
-+		}
- 		printk(KERN_NOTICE "No RedBoot partition table detected in %s\n",
- 		       master->name);
- 		ret = 0;
diff --git a/target/linux/ar71xx/patches-2.6.33/200-rb4xx_nand_driver.patch b/target/linux/ar71xx/patches-2.6.33/200-rb4xx_nand_driver.patch
deleted file mode 100644
index 1e64e0a36..000000000
--- a/target/linux/ar71xx/patches-2.6.33/200-rb4xx_nand_driver.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/drivers/mtd/nand/Kconfig
-+++ b/drivers/mtd/nand/Kconfig
-@@ -488,4 +488,8 @@ config MTD_NAND_W90P910
- 	  This enables the driver for the NAND Flash on evaluation board based
- 	  on w90p910.
- 
-+config MTD_NAND_RB4XX
-+	tristate "NAND flash driver for RouterBoard 4xx series"
-+	depends on MTD_NAND && AR71XX_MACH_RB4XX
-+
- endif # MTD_NAND
---- a/drivers/mtd/nand/Makefile
-+++ b/drivers/mtd/nand/Makefile
-@@ -30,6 +30,7 @@ obj-$(CONFIG_MTD_NAND_CM_X270)		+= cmx27
- obj-$(CONFIG_MTD_NAND_PXA3xx)		+= pxa3xx_nand.o
- obj-$(CONFIG_MTD_NAND_TMIO)		+= tmio_nand.o
- obj-$(CONFIG_MTD_NAND_PLATFORM)		+= plat_nand.o
-+obj-$(CONFIG_MTD_NAND_RB4XX)		+= rb4xx_nand.o
- obj-$(CONFIG_MTD_ALAUDA)		+= alauda.o
- obj-$(CONFIG_MTD_NAND_PASEMI)		+= pasemi_nand.o
- obj-$(CONFIG_MTD_NAND_ORION)		+= orion_nand.o
diff --git a/target/linux/ar71xx/patches-2.6.33/201-ap83_spi_controller.patch b/target/linux/ar71xx/patches-2.6.33/201-ap83_spi_controller.patch
deleted file mode 100644
index a8e889a7b..000000000
--- a/target/linux/ar71xx/patches-2.6.33/201-ap83_spi_controller.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/drivers/spi/Makefile
-+++ b/drivers/spi/Makefile
-@@ -11,6 +11,7 @@ endif
- obj-$(CONFIG_SPI_MASTER)		+= spi.o
- 
- # SPI master controller drivers (bus)
-+obj-$(CONFIG_SPI_AP83)			+= ap83_spi.o
- obj-$(CONFIG_SPI_AR71XX)		+= ar71xx_spi.o
- obj-$(CONFIG_SPI_ATMEL)			+= atmel_spi.o
- obj-$(CONFIG_SPI_BFIN)			+= spi_bfin5xx.o
---- a/drivers/spi/Kconfig
-+++ b/drivers/spi/Kconfig
-@@ -53,6 +53,14 @@ if SPI_MASTER
- 
- comment "SPI Master Controller Drivers"
- 
-+config SPI_AP83
-+	tristate "Atheros AP83 specific SPI Controller"
-+	depends on SPI_MASTER && AR71XX_MACH_AP83
-+	select SPI_BITBANG
-+	help
-+	  This is a specific SPI controller driver for the Atheros AP83
-+	  reference board.
-+
- config SPI_AR71XX
- 	tristate "Atheros AR71xx SPI Controller"
- 	depends on SPI_MASTER && ATHEROS_AR71XX
diff --git a/target/linux/ar71xx/patches-2.6.33/202-spi_vsc7385_driver.patch b/target/linux/ar71xx/patches-2.6.33/202-spi_vsc7385_driver.patch
deleted file mode 100644
index 487785a94..000000000
--- a/target/linux/ar71xx/patches-2.6.33/202-spi_vsc7385_driver.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/drivers/spi/Kconfig
-+++ b/drivers/spi/Kconfig
-@@ -365,6 +365,11 @@ config SPI_TLE62X0
- 	  sysfs interface, with each line presented as a kind of GPIO
- 	  exposing both switch control and diagnostic feedback.
- 
-+config SPI_VSC7385
-+	tristate "Vitesse VSC7385 ethernet switch driver"
-+	help
-+	  SPI driver for the Vitesse VSC7385 ethernet switch.
-+
- #
- # Add new SPI protocol masters in alphabetical order above this line
- #
---- a/drivers/spi/Makefile
-+++ b/drivers/spi/Makefile
-@@ -54,6 +54,7 @@ spi_s3c24xx_hw-$(CONFIG_SPI_S3C24XX_FIQ)
- 
- # SPI protocol drivers (device/link on bus)
- obj-$(CONFIG_SPI_SPIDEV)	+= spidev.o
-+obj-$(CONFIG_SPI_VSC7385)	+= spi_vsc7385.o
- obj-$(CONFIG_SPI_TLE62X0)	+= tle62x0.o
- # 	... add above this line ...
- 
diff --git a/target/linux/ar71xx/patches-2.6.33/203-pb44_spi_controller.patch b/target/linux/ar71xx/patches-2.6.33/203-pb44_spi_controller.patch
deleted file mode 100644
index 2a6edeb18..000000000
--- a/target/linux/ar71xx/patches-2.6.33/203-pb44_spi_controller.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/drivers/spi/Kconfig
-+++ b/drivers/spi/Kconfig
-@@ -68,6 +68,14 @@ config SPI_AR71XX
- 	help
- 	  This is the SPI contoller driver for Atheros AR71xx.
- 
-+config SPI_PB44
-+	tristate "Atheros PB44 board specific SPI controller"
-+	depends on SPI_MASTER && AR71XX_MACH_PB44
-+	select SPI_BITBANG
-+	help
-+	  This is a specific SPI controller driver for the Atheros PB44
-+	  reference board.
-+
- config SPI_ATMEL
- 	tristate "Atmel SPI Controller"
- 	depends on (ARCH_AT91 || AVR32)
---- a/drivers/spi/Makefile
-+++ b/drivers/spi/Makefile
-@@ -24,6 +24,7 @@ obj-$(CONFIG_SPI_GPIO)			+= spi_gpio.o
- obj-$(CONFIG_SPI_GPIO_OLD)		+= spi_gpio_old.o
- obj-$(CONFIG_SPI_IMX)			+= spi_imx.o
- obj-$(CONFIG_SPI_LM70_LLP)		+= spi_lm70llp.o
-+obj-$(CONFIG_SPI_PB44)			+= pb44_spi.o
- obj-$(CONFIG_SPI_PXA2XX)		+= pxa2xx_spi.o
- obj-$(CONFIG_SPI_OMAP_UWIRE)		+= omap_uwire.o
- obj-$(CONFIG_SPI_OMAP24XX)		+= omap2_mcspi.o
diff --git a/target/linux/ar71xx/patches-2.6.33/205-wndr3700-usb-led-driver.patch b/target/linux/ar71xx/patches-2.6.33/205-wndr3700-usb-led-driver.patch
deleted file mode 100644
index d2fbc9c76..000000000
--- a/target/linux/ar71xx/patches-2.6.33/205-wndr3700-usb-led-driver.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -269,6 +269,13 @@ config LEDS_ADP5520
- 	  To compile this driver as a module, choose M here: the module will
- 	  be called leds-adp5520.
- 
-+config LEDS_WNDR3700_USB
-+	tristate "NETGEAR WNDR3700 USB LED driver"
-+	depends on LEDS_CLASS && AR71XX_MACH_WNDR3700
-+	help
-+	  This option enables support for the USB LED found on the
-+	  NETGEAR WNDR3700 board.
-+
- comment "LED Triggers"
- 
- config LEDS_TRIGGERS
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -29,6 +29,7 @@ obj-$(CONFIG_LEDS_DA903X)		+= leds-da903
- obj-$(CONFIG_LEDS_WM831X_STATUS)	+= leds-wm831x-status.o
- obj-$(CONFIG_LEDS_WM8350)		+= leds-wm8350.o
- obj-$(CONFIG_LEDS_PWM)			+= leds-pwm.o
-+obj-${CONFIG_LEDS_WNDR3700_USB}		+= leds-wndr3700-usb.o
- obj-$(CONFIG_LEDS_REGULATOR)		+= leds-regulator.o
- obj-$(CONFIG_LEDS_INTEL_SS4200)		+= leds-ss4200.o
- obj-$(CONFIG_LEDS_LT3593)		+= leds-lt3593.o
diff --git a/target/linux/ar71xx/patches-2.6.33/206-nxp-74hc153-gpio-chip-driver.patch b/target/linux/ar71xx/patches-2.6.33/206-nxp-74hc153-gpio-chip-driver.patch
deleted file mode 100644
index 575f7bbd8..000000000
--- a/target/linux/ar71xx/patches-2.6.33/206-nxp-74hc153-gpio-chip-driver.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/drivers/gpio/Kconfig
-+++ b/drivers/gpio/Kconfig
-@@ -255,4 +255,12 @@ config GPIO_UCB1400
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called ucb1400_gpio.
- 
-+comment "Other GPIO expanders"
-+
-+config GPIO_NXP_74HC153
-+	tristate "NXP 74HC153 Dual 4-input multiplexer"
-+	help
-+	  Platform driver for NXP 74HC153 Dual 4-input Multiplexer. This
-+	  provides a GPIO interface supporting inputs.
-+
- endif
---- a/drivers/gpio/Makefile
-+++ b/drivers/gpio/Makefile
-@@ -11,6 +11,7 @@ obj-$(CONFIG_GPIO_MAX7301)	+= max7301.o
- obj-$(CONFIG_GPIO_MAX732X)	+= max732x.o
- obj-$(CONFIG_GPIO_MC33880)	+= mc33880.o
- obj-$(CONFIG_GPIO_MCP23S08)	+= mcp23s08.o
-+obj-$(CONFIG_GPIO_NXP_74HC153)	+= nxp_74hc153.o
- obj-$(CONFIG_GPIO_PCA953X)	+= pca953x.o
- obj-$(CONFIG_GPIO_PCF857X)	+= pcf857x.o
- obj-$(CONFIG_GPIO_PL061)	+= pl061.o
diff --git a/target/linux/ar71xx/patches-2.6.33/207-rb750-led-driver.patch b/target/linux/ar71xx/patches-2.6.33/207-rb750-led-driver.patch
deleted file mode 100644
index 500604fe2..000000000
--- a/target/linux/ar71xx/patches-2.6.33/207-rb750-led-driver.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -276,6 +276,10 @@ config LEDS_WNDR3700_USB
- 	  This option enables support for the USB LED found on the
- 	  NETGEAR WNDR3700 board.
- 
-+config LEDS_RB750
-+	tristate "LED driver for the Mikrotik RouterBOARD 750"
-+	depends on LEDS_CLASS && AR71XX_MACH_RB750
-+
- comment "LED Triggers"
- 
- config LEDS_TRIGGERS
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -34,6 +34,7 @@ obj-$(CONFIG_LEDS_REGULATOR)		+= leds-re
- obj-$(CONFIG_LEDS_INTEL_SS4200)		+= leds-ss4200.o
- obj-$(CONFIG_LEDS_LT3593)		+= leds-lt3593.o
- obj-$(CONFIG_LEDS_ADP5520)		+= leds-adp5520.o
-+obj-$(CONFIG_LEDS_RB750)		+= leds-rb750.o
- 
- # LED SPI Drivers
- obj-$(CONFIG_LEDS_DAC124S085)		+= leds-dac124s085.o
diff --git a/target/linux/ar71xx/patches-2.6.33/208-rb750-nand-driver.patch b/target/linux/ar71xx/patches-2.6.33/208-rb750-nand-driver.patch
deleted file mode 100644
index 3766a1cd8..000000000
--- a/target/linux/ar71xx/patches-2.6.33/208-rb750-nand-driver.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/drivers/mtd/nand/Kconfig
-+++ b/drivers/mtd/nand/Kconfig
-@@ -492,4 +492,8 @@ config MTD_NAND_RB4XX
- 	tristate "NAND flash driver for RouterBoard 4xx series"
- 	depends on MTD_NAND && AR71XX_MACH_RB4XX
- 
-+config MTD_NAND_RB750
-+	tristate "NAND flash driver for the RouterBoard 750"
-+	depends on MTD_NAND && AR71XX_MACH_RB750
-+
- endif # MTD_NAND
---- a/drivers/mtd/nand/Makefile
-+++ b/drivers/mtd/nand/Makefile
-@@ -31,6 +31,7 @@ obj-$(CONFIG_MTD_NAND_PXA3xx)		+= pxa3xx
- obj-$(CONFIG_MTD_NAND_TMIO)		+= tmio_nand.o
- obj-$(CONFIG_MTD_NAND_PLATFORM)		+= plat_nand.o
- obj-$(CONFIG_MTD_NAND_RB4XX)		+= rb4xx_nand.o
-+obj-$(CONFIG_MTD_NAND_RB750)		+= rb750_nand.o
- obj-$(CONFIG_MTD_ALAUDA)		+= alauda.o
- obj-$(CONFIG_MTD_NAND_PASEMI)		+= pasemi_nand.o
- obj-$(CONFIG_MTD_NAND_ORION)		+= orion_nand.o
diff --git a/target/linux/ar71xx/patches-2.6.33/300-mips_fw_myloader.patch b/target/linux/ar71xx/patches-2.6.33/300-mips_fw_myloader.patch
deleted file mode 100644
index 48d0de83a..000000000
--- a/target/linux/ar71xx/patches-2.6.33/300-mips_fw_myloader.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -190,6 +190,7 @@ endif
- #
- libs-$(CONFIG_ARC)		+= arch/mips/fw/arc/
- libs-$(CONFIG_CFE)		+= arch/mips/fw/cfe/
-+libs-$(CONFIG_MYLOADER)		+= arch/mips/fw/myloader/
- libs-$(CONFIG_SNIPROM)		+= arch/mips/fw/sni/
- libs-y				+= arch/mips/fw/lib/
- 
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -877,6 +877,9 @@ config MIPS_NILE4
- config MIPS_DISABLE_OBSOLETE_IDE
- 	bool
- 
-+config MYLOADER
-+	bool
-+
- config SYNC_R4K
- 	bool
- 
diff --git a/target/linux/ar71xx/patches-2.6.33/400-mips-multi-machine-update.patch b/target/linux/ar71xx/patches-2.6.33/400-mips-multi-machine-update.patch
deleted file mode 100644
index d63587901..000000000
--- a/target/linux/ar71xx/patches-2.6.33/400-mips-multi-machine-update.patch
+++ /dev/null
@@ -1,134 +0,0 @@
---- a/arch/mips/kernel/mips_machine.c
-+++ b/arch/mips/kernel/mips_machine.c
-@@ -7,12 +7,13 @@
-  *
-  */
- #include <linux/mm.h>
-+#include <linux/string.h>
- 
- #include <asm/mips_machine.h>
--#include <asm/bootinfo.h>
- 
- static struct list_head mips_machines __initdata =
- 		LIST_HEAD_INIT(mips_machines);
-+static char *mips_machid __initdata;
- 
- char *mips_machine_name = "Unknown";
- 
-@@ -55,20 +56,65 @@ void __init mips_machine_set_name(char *
- 	}
- }
- 
--void __init mips_machine_setup(unsigned long machtype)
-+void __init mips_machine_setup(void)
- {
- 	struct mips_machine *mach;
- 
--	mach = mips_machine_find(machtype);
-+	mach = mips_machine_find(mips_machtype);
- 	if (!mach) {
--		printk(KERN_ALERT "MIPS: no machine registered for "
--			"machtype %lu\n", machtype);
-+		printk(KERN_WARNING "MIPS: no machine registered for "
-+			"machtype %lu\n", mips_machtype);
- 		return;
- 	}
- 
- 	mips_machine_set_name(mach->mach_name);
--	printk(KERN_INFO "MIPS: machine is %s\n", mips_machine_name);
-+	printk(KERN_NOTICE "MIPS: machine is %s\n", mips_machine_name);
- 
- 	if (mach->mach_setup)
- 		mach->mach_setup();
- }
-+
-+int __init mips_machtype_setup(char *id)
-+{
-+	if (mips_machid == NULL)
-+		mips_machid = id;
-+
-+	return 1;
-+}
-+
-+__setup("machtype=", mips_machtype_setup);
-+
-+static int __init mips_machtype_init(void)
-+{
-+	struct list_head *this;
-+	struct mips_machine *mach;
-+
-+	if (mips_machid == NULL)
-+		return 0;
-+
-+	list_for_each(this, &mips_machines) {
-+		mach = list_entry(this, struct mips_machine, list);
-+		if (mach->mach_id == NULL)
-+			continue;
-+
-+		if (strcmp(mach->mach_id, mips_machid) == 0) {
-+			mips_machtype = mach->mach_type;
-+			return 0;
-+		}
-+	}
-+
-+	printk(KERN_WARNING
-+	       "MIPS: no machine found for id: '%s', registered machines:\n",
-+	       mips_machid);
-+	printk(KERN_WARNING "%32s %s\n", "id", "name");
-+
-+	list_for_each(this, &mips_machines) {
-+		mach = list_entry(this, struct mips_machine, list);
-+		printk(KERN_WARNING "%32s %s\n",
-+		       mach->mach_id ? mach->mach_id : "", mach->mach_name);
-+	}
-+
-+	return 0;
-+}
-+
-+core_initcall(mips_machtype_init);
---- a/arch/mips/include/asm/mips_machine.h
-+++ b/arch/mips/include/asm/mips_machine.h
-@@ -13,25 +13,33 @@
- #include <linux/init.h>
- #include <linux/list.h>
- 
-+#include <asm/bootinfo.h>
-+
- struct mips_machine {
- 	unsigned long		mach_type;
--	void			(*mach_setup)(void);
-+	char			*mach_id;
- 	char			*mach_name;
-+	void			(*mach_setup)(void);
- 	struct list_head	list;
- };
- 
- void mips_machine_register(struct mips_machine *) __init;
--void mips_machine_setup(unsigned long machtype) __init;
-+void mips_machine_setup(void) __init;
-+int  mips_machtype_setup(char *id) __init;
- void mips_machine_set_name(char *name) __init;
- 
- extern char *mips_machine_name;
- 
--#define MIPS_MACHINE(_type, _name, _setup) 			\
--static char machine_name_##_type[] __initdata = _name;		\
-+#define MIPS_MACHINE(_type, _id, _name, _setup) 		\
-+static const char machine_name_##_type[] __initconst		\
-+			__aligned(1) = _name;			\
-+static const char machine_id_##_type[] __initconst		\
-+			__aligned(1) = _id;			\
- static struct mips_machine machine_##_type __initdata =		\
- {								\
- 	.mach_type	= _type,				\
--	.mach_name	= machine_name_##_type,			\
-+	.mach_id	= (char *) machine_id_##_type,		\
-+	.mach_name	= (char *) machine_name_##_type,	\
- 	.mach_setup	= _setup,				\
- };								\
- 								\
-@@ -44,4 +52,3 @@ static int __init register_machine_##_ty
- pure_initcall(register_machine_##_type)
- 
- #endif /* __ASM_MIPS_MACHINE_H */
--
diff --git a/target/linux/ar71xx/patches-2.6.33/901-get_c0_compare_irq_function.patch b/target/linux/ar71xx/patches-2.6.33/901-get_c0_compare_irq_function.patch
deleted file mode 100644
index 596e6697e..000000000
--- a/target/linux/ar71xx/patches-2.6.33/901-get_c0_compare_irq_function.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/arch/mips/kernel/traps.c
-+++ b/arch/mips/kernel/traps.c
-@@ -50,6 +50,7 @@
- #include <asm/types.h>
- #include <asm/stacktrace.h>
- #include <asm/irq.h>
-+#include <asm/time.h>
- 
- extern void check_wait(void);
- extern asmlinkage void r4k_wait(void);
-@@ -1496,6 +1497,8 @@ void __cpuinit per_cpu_trap_init(void)
- 	if (cpu_has_mips_r2) {
- 		cp0_compare_irq_shift = CAUSEB_TI - CAUSEB_IP;
- 		cp0_compare_irq = (read_c0_intctl() >> INTCTLB_IPTI) & 7;
-+		if (get_c0_compare_irq)
-+			cp0_compare_irq = get_c0_compare_irq();
- 		cp0_perfcount_irq = (read_c0_intctl() >> INTCTLB_IPPCI) & 7;
- 		if (cp0_perfcount_irq == cp0_compare_irq)
- 			cp0_perfcount_irq = -1;
---- a/arch/mips/include/asm/time.h
-+++ b/arch/mips/include/asm/time.h
-@@ -52,6 +52,7 @@ extern int (*perf_irq)(void);
-  */
- #ifdef CONFIG_CEVT_R4K_LIB
- extern unsigned int __weak get_c0_compare_int(void);
-+extern unsigned int __weak get_c0_compare_irq(void);
- extern int r4k_clockevent_init(void);
- #endif
- 
diff --git a/target/linux/ar71xx/patches-2.6.34/001-ar71xx_core.patch b/target/linux/ar71xx/patches-2.6.34/001-ar71xx_core.patch
deleted file mode 100644
index 5073652dd..000000000
--- a/target/linux/ar71xx/patches-2.6.34/001-ar71xx_core.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -166,6 +166,13 @@ ifeq (,$(findstring march=octeon, $(cfla
- cflags-$(CONFIG_CPU_CAVIUM_OCTEON) += -Wa,-march=octeon
- endif
- 
-+#
-+# Atheros AR71xx
-+#
-+core-$(CONFIG_ATHEROS_AR71XX)	+= arch/mips/ar71xx/
-+cflags-$(CONFIG_ATHEROS_AR71XX)	+= -I$(srctree)/arch/mips/include/asm/mach-ar71xx
-+load-$(CONFIG_ATHEROS_AR71XX)	+= 0xffffffff80060000
-+
- cflags-$(CONFIG_CPU_R4000_WORKAROUNDS)	+= $(call cc-option,-mfix-r4000,)
- cflags-$(CONFIG_CPU_R4400_WORKAROUNDS)	+= $(call cc-option,-mfix-r4400,)
- cflags-$(CONFIG_CPU_DADDI_WORKAROUNDS)	+= $(call cc-option,-mno-daddi,)
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -48,6 +48,23 @@ config AR7
- 	  Support for the Texas Instruments AR7 System-on-a-Chip
- 	  family: TNETD7100, 7200 and 7300.
- 
-+config ATHEROS_AR71XX
-+	bool "Atheros AR71xx based boards"
-+	select CEVT_R4K
-+	select CSRC_R4K
-+	select DMA_NONCOHERENT
-+	select HW_HAS_PCI
-+	select IRQ_CPU
-+	select ARCH_REQUIRE_GPIOLIB
-+	select SYS_HAS_CPU_MIPS32_R1
-+	select SYS_HAS_CPU_MIPS32_R2
-+	select SYS_SUPPORTS_32BIT_KERNEL
-+	select SYS_SUPPORTS_BIG_ENDIAN
-+	select SYS_HAS_EARLY_PRINTK
-+	select MIPS_MACHINE
-+	help
-+	  Support for Atheros AR71xx based boards.
-+
- config BCM47XX
- 	bool "BCM47XX based boards"
- 	select CEVT_R4K
-@@ -682,6 +699,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
- endchoice
- 
- source "arch/mips/alchemy/Kconfig"
-+source "arch/mips/ar71xx/Kconfig"
- source "arch/mips/bcm63xx/Kconfig"
- source "arch/mips/jazz/Kconfig"
- source "arch/mips/lasat/Kconfig"
diff --git a/target/linux/ar71xx/patches-2.6.34/002-ar71xx_pci.patch b/target/linux/ar71xx/patches-2.6.34/002-ar71xx_pci.patch
deleted file mode 100644
index 3facce9d7..000000000
--- a/target/linux/ar71xx/patches-2.6.34/002-ar71xx_pci.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/arch/mips/pci/Makefile
-+++ b/arch/mips/pci/Makefile
-@@ -18,6 +18,7 @@ obj-$(CONFIG_PCI_TX4927)	+= ops-tx4927.o
- obj-$(CONFIG_BCM47XX)		+= pci-bcm47xx.o
- obj-$(CONFIG_BCM63XX)		+= pci-bcm63xx.o fixup-bcm63xx.o \
- 					ops-bcm63xx.o
-+obj-$(CONFIG_ATHEROS_AR71XX)	+= pci-ar71xx.o pci-ar724x.o
- 
- #
- # These are still pretty much in the old state, watch, go blind.
diff --git a/target/linux/ar71xx/patches-2.6.34/003-ar71xx_usb_host.patch b/target/linux/ar71xx/patches-2.6.34/003-ar71xx_usb_host.patch
deleted file mode 100644
index 238a79c9b..000000000
--- a/target/linux/ar71xx/patches-2.6.34/003-ar71xx_usb_host.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/drivers/usb/host/Kconfig
-+++ b/drivers/usb/host/Kconfig
-@@ -109,6 +109,13 @@ config XPS_USB_HCD_XILINX
- 		support both high speed and full speed devices, or high speed
- 		devices only.
- 
-+config USB_EHCI_AR71XX
-+	bool "USB EHCI support for AR71xx"
-+	depends on USB_EHCI_HCD && ATHEROS_AR71XX
-+	default y
-+	help
-+	  Support for Atheros AR71xx built-in EHCI controller
-+
- config USB_EHCI_FSL
- 	bool "Support for Freescale on-chip EHCI USB controller"
- 	depends on USB_EHCI_HCD && FSL_SOC
-@@ -207,6 +214,13 @@ config USB_OHCI_HCD
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called ohci-hcd.
- 
-+config USB_OHCI_AR71XX
-+	bool "USB OHCI support for Atheros AR71xx"
-+	depends on USB_OHCI_HCD && ATHEROS_AR71XX
-+	default y
-+	help
-+	  Support for Atheros AR71xx built-in OHCI controller
-+
- config USB_OHCI_HCD_PPC_SOC
- 	bool "OHCI support for on-chip PPC USB controller"
- 	depends on USB_OHCI_HCD && (STB03xxx || PPC_MPC52xx)
---- a/drivers/usb/host/ehci-hcd.c
-+++ b/drivers/usb/host/ehci-hcd.c
-@@ -1158,6 +1158,11 @@ MODULE_LICENSE ("GPL");
- #define	PLATFORM_DRIVER		ehci_atmel_driver
- #endif
- 
-+#ifdef CONFIG_USB_EHCI_AR71XX
-+#include "ehci-ar71xx.c"
-+#define PLATFORM_DRIVER		ehci_ar71xx_driver
-+#endif
-+
- #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
-     !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER)
- #error "missing bus glue for ehci-hcd"
---- a/drivers/usb/host/ohci-hcd.c
-+++ b/drivers/usb/host/ohci-hcd.c
-@@ -1085,6 +1085,11 @@ MODULE_LICENSE ("GPL");
- #define TMIO_OHCI_DRIVER	ohci_hcd_tmio_driver
- #endif
- 
-+#ifdef CONFIG_USB_OHCI_AR71XX
-+#include "ohci-ar71xx.c"
-+#define PLATFORM_DRIVER		ohci_hcd_ar71xx_driver
-+#endif
-+
- #if	!defined(PCI_DRIVER) &&		\
- 	!defined(PLATFORM_DRIVER) &&	\
- 	!defined(OF_PLATFORM_DRIVER) &&	\
diff --git a/target/linux/ar71xx/patches-2.6.34/004-ar71xx_spi_controller.patch b/target/linux/ar71xx/patches-2.6.34/004-ar71xx_spi_controller.patch
deleted file mode 100644
index 9c196e077..000000000
--- a/target/linux/ar71xx/patches-2.6.34/004-ar71xx_spi_controller.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/drivers/spi/Kconfig
-+++ b/drivers/spi/Kconfig
-@@ -53,6 +53,13 @@ if SPI_MASTER
- 
- comment "SPI Master Controller Drivers"
- 
-+config SPI_AR71XX
-+	tristate "Atheros AR71xx SPI Controller"
-+	depends on SPI_MASTER && ATHEROS_AR71XX
-+	select SPI_BITBANG
-+	help
-+	  This is the SPI contoller driver for Atheros AR71xx.
-+
- config SPI_ATMEL
- 	tristate "Atmel SPI Controller"
- 	depends on (ARCH_AT91 || AVR32)
---- a/drivers/spi/Makefile
-+++ b/drivers/spi/Makefile
-@@ -11,6 +11,7 @@ endif
- obj-$(CONFIG_SPI_MASTER)		+= spi.o
- 
- # SPI master controller drivers (bus)
-+obj-$(CONFIG_SPI_AR71XX)		+= ar71xx_spi.o
- obj-$(CONFIG_SPI_ATMEL)			+= atmel_spi.o
- obj-$(CONFIG_SPI_BFIN)			+= spi_bfin5xx.o
- obj-$(CONFIG_SPI_BITBANG)		+= spi_bitbang.o
diff --git a/target/linux/ar71xx/patches-2.6.34/005-ar71xx_mac_driver.patch b/target/linux/ar71xx/patches-2.6.34/005-ar71xx_mac_driver.patch
deleted file mode 100644
index 3721a9b86..000000000
--- a/target/linux/ar71xx/patches-2.6.34/005-ar71xx_mac_driver.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/drivers/net/Kconfig
-+++ b/drivers/net/Kconfig
-@@ -2128,6 +2128,8 @@ config ACENIC_OMIT_TIGON_I
- 
- 	  The safe and default value for this is N.
- 
-+source drivers/net/ag71xx/Kconfig
-+
- config DL2K
- 	tristate "DL2000/TC902x-based Gigabit Ethernet support"
- 	depends on PCI
---- a/drivers/net/Makefile
-+++ b/drivers/net/Makefile
-@@ -106,6 +106,7 @@ obj-$(CONFIG_STMMAC_ETH) += stmmac/
- # end link order section
- #
- 
-+obj-$(CONFIG_AG71XX) += ag71xx/
- obj-$(CONFIG_SUNDANCE) += sundance.o
- obj-$(CONFIG_HAMACHI) += hamachi.o
- obj-$(CONFIG_NET) += Space.o loopback.o
diff --git a/target/linux/ar71xx/patches-2.6.34/006-ar71xx_wdt_driver.patch b/target/linux/ar71xx/patches-2.6.34/006-ar71xx_wdt_driver.patch
deleted file mode 100644
index d71a11b86..000000000
--- a/target/linux/ar71xx/patches-2.6.34/006-ar71xx_wdt_driver.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/drivers/watchdog/Kconfig
-+++ b/drivers/watchdog/Kconfig
-@@ -840,6 +840,13 @@ config TXX9_WDT
- 	help
- 	  Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs.
- 
-+config AR71XX_WDT
-+	tristate "Atheros AR71xx Watchdog Timer"
-+	depends on ATHEROS_AR71XX
-+	help
-+	  Hardware driver for the built-in watchdog timer on the Atheros
-+	  AR71xx SoCs.
-+
- # PARISC Architecture
- 
- # POWERPC Architecture
---- a/drivers/watchdog/Makefile
-+++ b/drivers/watchdog/Makefile
-@@ -112,6 +112,7 @@ obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt
- obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
- obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
- obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
-+obj-$(CONFIG_AR71XX_WDT) += ar71xx_wdt.o
- 
- # PARISC Architecture
- 
diff --git a/target/linux/ar71xx/patches-2.6.34/007-ar91xx_flash_driver.patch b/target/linux/ar71xx/patches-2.6.34/007-ar91xx_flash_driver.patch
deleted file mode 100644
index 5dbdd293c..000000000
--- a/target/linux/ar71xx/patches-2.6.34/007-ar91xx_flash_driver.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/drivers/mtd/maps/Kconfig
-+++ b/drivers/mtd/maps/Kconfig
-@@ -257,6 +257,13 @@ config MTD_ALCHEMY
- 	help
- 	  Flash memory access on AMD Alchemy Pb/Db/RDK Reference Boards
- 
-+config MTD_AR91XX_FLASH
-+	tristate "Atheros AR91xx parallel flash support"
-+	depends on ATHEROS_AR71XX
-+	select MTD_COMPLEX_MAPPINGS
-+	help
-+	  Parallel flash driver for the Atheros AR91xx based boards.
-+
- config MTD_DILNETPC
- 	tristate "CFI Flash device mapped on DIL/Net PC"
- 	depends on X86 && MTD_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT && BROKEN
---- a/drivers/mtd/maps/Makefile
-+++ b/drivers/mtd/maps/Makefile
-@@ -40,6 +40,7 @@
- obj-$(CONFIG_MTD_DBOX2)		+= dbox2-flash.o
- obj-$(CONFIG_MTD_SOLUTIONENGINE)+= solutionengine.o
- obj-$(CONFIG_MTD_PCI)		+= pci.o
-+obj-$(CONFIG_MTD_AR91XX_FLASH)	+= ar91xx_flash.o
- obj-$(CONFIG_MTD_AUTCPU12)	+= autcpu12-nvram.o
- obj-$(CONFIG_MTD_EDB7312)	+= edb7312.o
- obj-$(CONFIG_MTD_IMPA7)		+= impa7.o
diff --git a/target/linux/ar71xx/patches-2.6.34/101-ksz8041_phy_driver.patch b/target/linux/ar71xx/patches-2.6.34/101-ksz8041_phy_driver.patch
deleted file mode 100644
index 503604610..000000000
--- a/target/linux/ar71xx/patches-2.6.34/101-ksz8041_phy_driver.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -114,6 +114,11 @@ config RTL8306_PHY
- 	tristate "Driver for Realtek RTL8306S switches"
- 	select SWCONFIG
- 
-+config MICREL_PHY
-+	tristate "Drivers for Micrel/Kendin PHYs"
-+	---help---
-+	  Currently has a driver for the KSZ8041
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -24,6 +24,7 @@ obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi
- obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o
- obj-$(CONFIG_RTL8366RB_PHY)	+= rtl8366rb.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
-+obj-$(CONFIG_MICREL)		+= micrel.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
- obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
- obj-$(CONFIG_MDIO_GPIO)		+= mdio-gpio.o
diff --git a/target/linux/ar71xx/patches-2.6.34/102-mtd_m25p80_add_myloader_parser.patch b/target/linux/ar71xx/patches-2.6.34/102-mtd_m25p80_add_myloader_parser.patch
deleted file mode 100644
index 45f743e06..000000000
--- a/target/linux/ar71xx/patches-2.6.34/102-mtd_m25p80_add_myloader_parser.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -922,6 +922,16 @@ static int __devinit m25p_probe(struct s
- 					part_probes, &parts, 0);
- 		}
- 
-+#ifdef CONFIG_MTD_MYLOADER_PARTS
-+		if (nr_parts <= 0) {
-+			static const char *part_probes[]
-+					= { "MyLoader", NULL, };
-+
-+			nr_parts = parse_mtd_partitions(&flash->mtd,
-+					part_probes, &parts, 0);
-+		}
-+#endif
-+
- 		if (nr_parts <= 0 && data && data->parts) {
- 			parts = data->parts;
- 			nr_parts = data->nr_parts;
diff --git a/target/linux/ar71xx/patches-2.6.34/104-mtd_m25p80_add_redboot_parser.patch b/target/linux/ar71xx/patches-2.6.34/104-mtd_m25p80_add_redboot_parser.patch
deleted file mode 100644
index 43fe987df..000000000
--- a/target/linux/ar71xx/patches-2.6.34/104-mtd_m25p80_add_redboot_parser.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -932,6 +932,15 @@ static int __devinit m25p_probe(struct s
- 		}
- #endif
- 
-+#ifdef CONFIG_MTD_REDBOOT_PARTS
-+		if (nr_parts <= 0) {
-+			static const char *part_probes[]
-+					= { "RedBoot", NULL, };
-+
-+			nr_parts = parse_mtd_partitions(&flash->mtd,
-+					part_probes, &parts, 0);
-+		}
-+#endif
- 		if (nr_parts <= 0 && data && data->parts) {
- 			parts = data->parts;
- 			nr_parts = data->nr_parts;
diff --git a/target/linux/ar71xx/patches-2.6.34/107-mtd-SST39VF6401B-support.patch b/target/linux/ar71xx/patches-2.6.34/107-mtd-SST39VF6401B-support.patch
deleted file mode 100644
index 2fdfcb7cd..000000000
--- a/target/linux/ar71xx/patches-2.6.34/107-mtd-SST39VF6401B-support.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/drivers/mtd/chips/jedec_probe.c
-+++ b/drivers/mtd/chips/jedec_probe.c
-@@ -166,6 +166,7 @@
- #define SST39LF160	0x2782
- #define SST39VF1601	0x234b
- #define SST39VF3201	0x235b
-+#define SST39VF6401B	0x236d
- #define SST39LF512	0x00D4
- #define SST39LF010	0x00D5
- #define SST39LF020	0x00D6
-@@ -1556,6 +1557,18 @@ static const struct amd_flash_info jedec
- 			ERASEINFO(0x10000,64),
- 		}
- 	}, {
-+		.mfr_id         = MANUFACTURER_SST,
-+		.dev_id         = SST39VF6401B,
-+		.name           = "SST 39VF6401B",
-+		.devtypes       = CFI_DEVICETYPE_X16,
-+		.uaddr          = MTD_UADDR_0xAAAA_0x5555,
-+		.dev_size       = SIZE_8MiB,
-+		.cmd_set        = P_ID_AMD_STD,
-+		.nr_regions     = 1,
-+		.regions        = {
-+			ERASEINFO(0x10000,128)
-+		}
-+	}, {
- 		.mfr_id		= MANUFACTURER_ST,
- 		.dev_id		= M29F800AB,
- 		.name		= "ST M29F800AB",
diff --git a/target/linux/ar71xx/patches-2.6.34/108-mtd_fix_cfi_cmdset_0002_status_check.patch b/target/linux/ar71xx/patches-2.6.34/108-mtd_fix_cfi_cmdset_0002_status_check.patch
deleted file mode 100644
index e0676cae9..000000000
--- a/target/linux/ar71xx/patches-2.6.34/108-mtd_fix_cfi_cmdset_0002_status_check.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- a/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -1130,8 +1130,8 @@ static int __xipram do_write_oneword(str
- 			break;
- 		}
- 
--		if (chip_ready(map, adr))
--			break;
-+		if (chip_good(map, adr, datum))
-+			goto enable_xip;
- 
- 		/* Latency issues. Drop the lock, wait a while and retry */
- 		UDELAY(map, chip, adr, 1);
-@@ -1147,6 +1147,8 @@ static int __xipram do_write_oneword(str
- 
- 		ret = -EIO;
- 	}
-+
-+ enable_xip:
- 	xip_enable(map, chip, adr);
-  op_done:
- 	chip->state = FL_READY;
-@@ -1493,7 +1495,6 @@ static int cfi_amdstd_write_buffers(stru
- 	return 0;
- }
- 
--
- /*
-  * Handle devices with one erase region, that only implement
-  * the chip erase command.
-@@ -1557,8 +1558,8 @@ static int __xipram do_erase_chip(struct
- 			chip->erase_suspended = 0;
- 		}
- 
--		if (chip_ready(map, adr))
--			break;
-+		if (chip_good(map, adr, map_word_ff(map)))
-+			goto op_done;
- 
- 		if (time_after(jiffies, timeo)) {
- 			printk(KERN_WARNING "MTD %s(): software timeout\n",
-@@ -1578,6 +1579,7 @@ static int __xipram do_erase_chip(struct
- 		ret = -EIO;
- 	}
- 
-+ op_done:
- 	chip->state = FL_READY;
- 	xip_enable(map, chip, adr);
- 	put_chip(map, chip, adr);
-@@ -1645,9 +1647,9 @@ static int __xipram do_erase_oneblock(st
- 			chip->erase_suspended = 0;
- 		}
- 
--		if (chip_ready(map, adr)) {
-+		if (chip_good(map, adr, map_word_ff(map))) {
- 			xip_enable(map, chip, adr);
--			break;
-+			goto op_done;
- 		}
- 
- 		if (time_after(jiffies, timeo)) {
-@@ -1669,6 +1671,7 @@ static int __xipram do_erase_oneblock(st
- 		ret = -EIO;
- 	}
- 
-+ op_done:
- 	chip->state = FL_READY;
- 	put_chip(map, chip, adr);
- 	spin_unlock(chip->mutex);
diff --git a/target/linux/ar71xx/patches-2.6.34/109-mtd-wrt160nl-trx-parser.patch b/target/linux/ar71xx/patches-2.6.34/109-mtd-wrt160nl-trx-parser.patch
deleted file mode 100644
index 037795b33..000000000
--- a/target/linux/ar71xx/patches-2.6.34/109-mtd-wrt160nl-trx-parser.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -941,6 +941,16 @@ static int __devinit m25p_probe(struct s
- 					part_probes, &parts, 0);
- 		}
- #endif
-+
-+#ifdef CONFIG_MTD_WRT160NL_PARTS
-+		if (nr_parts <= 0) {
-+			static const char *part_probes[]
-+					= { "wrt160nl", NULL, };
-+
-+			nr_parts = parse_mtd_partitions(&flash->mtd,
-+					part_probes, &parts, 0);
-+		}
-+#endif
- 		if (nr_parts <= 0 && data && data->parts) {
- 			parts = data->parts;
- 			nr_parts = data->nr_parts;
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -181,6 +181,12 @@ config MTD_AR7_PARTS
- 	---help---
- 	  TI AR7 partitioning support
- 
-+config MTD_WRT160NL_PARTS
-+	tristate "Linksys WRT160NL partitioning support"
-+	depends on MTD_PARTITIONS && AR71XX_MACH_WRT160NL
-+	---help---
-+	   Linksys WRT160NL partitioning support
-+
- config MTD_MYLOADER_PARTS
- 	tristate "MyLoader partition parsing"
- 	depends on MTD_PARTITIONS && (ADM5120 || ATHEROS_AR231X || ATHEROS_AR71XX)
---- a/drivers/mtd/Makefile
-+++ b/drivers/mtd/Makefile
-@@ -12,6 +12,7 @@ obj-$(CONFIG_MTD_REDBOOT_PARTS) += redbo
- obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
- obj-$(CONFIG_MTD_AFS_PARTS)	+= afs.o
- obj-$(CONFIG_MTD_AR7_PARTS)	+= ar7part.o
-+obj-$(CONFIG_MTD_WRT160NL_PARTS) += wrt160nl_part.o
- obj-$(CONFIG_MTD_OF_PARTS)      += ofpart.o
- obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
- 
diff --git a/target/linux/ar71xx/patches-2.6.34/110-usb-ehci-add-war-for-synopsys-hc-bug.patch b/target/linux/ar71xx/patches-2.6.34/110-usb-ehci-add-war-for-synopsys-hc-bug.patch
deleted file mode 100644
index 076c39ea2..000000000
--- a/target/linux/ar71xx/patches-2.6.34/110-usb-ehci-add-war-for-synopsys-hc-bug.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/drivers/usb/host/ehci-q.c
-+++ b/drivers/usb/host/ehci-q.c
-@@ -1194,6 +1194,9 @@ static void end_unlink_async (struct ehc
- 		ehci->reclaim = NULL;
- 		start_unlink_async (ehci, next);
- 	}
-+
-+	if (ehci->has_synopsys_hc_bug)
-+		writel((u32)ehci->async->qh_dma, &ehci->regs->async_next);
- }
- 
- /* makes sure the async qh will become idle */
---- a/drivers/usb/host/ehci.h
-+++ b/drivers/usb/host/ehci.h
-@@ -129,6 +129,7 @@ struct ehci_hcd {			/* one per controlle
- 	unsigned		has_amcc_usb23:1;
- 	unsigned		need_io_watchdog:1;
- 	unsigned		broken_periodic:1;
-+	unsigned		has_synopsys_hc_bug:1; /* Synopsys HC */
- 
- 	/* required for usb32 quirk */
- 	#define OHCI_CTRL_HCFS          (3 << 6)
diff --git a/target/linux/ar71xx/patches-2.6.34/111-mtd-cfi_cmdset_0002-force-word-write.patch b/target/linux/ar71xx/patches-2.6.34/111-mtd-cfi_cmdset_0002-force-word-write.patch
deleted file mode 100644
index 3215a7d9d..000000000
--- a/target/linux/ar71xx/patches-2.6.34/111-mtd-cfi_cmdset_0002-force-word-write.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- a/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -39,7 +39,7 @@
- #include <linux/mtd/xip.h>
- 
- #define AMD_BOOTLOC_BUG
--#define FORCE_WORD_WRITE 0
-+#define FORCE_WORD_WRITE 1
- 
- #define MAX_WORD_RETRIES 3
- 
-@@ -55,7 +55,9 @@
- 
- static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
- static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
-+#if !FORCE_WORD_WRITE
- static int cfi_amdstd_write_buffers(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
-+#endif
- static int cfi_amdstd_erase_chip(struct mtd_info *, struct erase_info *);
- static int cfi_amdstd_erase_varsize(struct mtd_info *, struct erase_info *);
- static void cfi_amdstd_sync (struct mtd_info *);
-@@ -190,6 +192,7 @@ static void fixup_amd_bootblock(struct m
- }
- #endif
- 
-+#if !FORCE_WORD_WRITE
- static void fixup_use_write_buffers(struct mtd_info *mtd, void *param)
- {
- 	struct map_info *map = mtd->priv;
-@@ -199,6 +202,7 @@ static void fixup_use_write_buffers(stru
- 		mtd->write = cfi_amdstd_write_buffers;
- 	}
- }
-+#endif /* !FORCE_WORD_WRITE */
- 
- /* Atmel chips don't use the same PRI format as AMD chips */
- static void fixup_convert_atmel_pri(struct mtd_info *mtd, void *param)
-@@ -1304,6 +1308,7 @@ static int cfi_amdstd_write_words(struct
- /*
-  * FIXME: interleaved mode not tested, and probably not supported!
-  */
-+#if !FORCE_WORD_WRITE
- static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
- 				    unsigned long adr, const u_char *buf,
- 				    int len)
-@@ -1415,7 +1420,6 @@ static int __xipram do_write_buffer(stru
- 	return ret;
- }
- 
--
- static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len,
- 				    size_t *retlen, const u_char *buf)
- {
-@@ -1494,6 +1498,7 @@ static int cfi_amdstd_write_buffers(stru
- 
- 	return 0;
- }
-+#endif /* !FORCE_WORD_WRITE */
- 
- /*
-  * Handle devices with one erase region, that only implement
diff --git a/target/linux/ar71xx/patches-2.6.34/120-dsa-trailer-tag-validation-fix.patch b/target/linux/ar71xx/patches-2.6.34/120-dsa-trailer-tag-validation-fix.patch
deleted file mode 100644
index b58aeedc3..000000000
--- a/target/linux/ar71xx/patches-2.6.34/120-dsa-trailer-tag-validation-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/net/dsa/tag_trailer.c
-+++ b/net/dsa/tag_trailer.c
-@@ -86,7 +86,7 @@ static int trailer_rcv(struct sk_buff *s
- 
- 	trailer = skb_tail_pointer(skb) - 4;
- 	if (trailer[0] != 0x80 || (trailer[1] & 0xf8) != 0x00 ||
--	    (trailer[3] & 0xef) != 0x00 || trailer[3] != 0x00)
-+	    (trailer[2] & 0xef) != 0x00 || (trailer[3] & 0xfe) != 0x00)
- 		goto out_drop;
- 
- 	source_port = trailer[1] & 7;
diff --git a/target/linux/ar71xx/patches-2.6.34/121-dsa-add-88e6063-driver.patch b/target/linux/ar71xx/patches-2.6.34/121-dsa-add-88e6063-driver.patch
deleted file mode 100644
index 1a11a69c6..000000000
--- a/target/linux/ar71xx/patches-2.6.34/121-dsa-add-88e6063-driver.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/net/dsa/Kconfig
-+++ b/net/dsa/Kconfig
-@@ -36,6 +36,13 @@ config NET_DSA_MV88E6060
- 	  This enables support for the Marvell 88E6060 ethernet switch
- 	  chip.
- 
-+config NET_DSA_MV88E6063
-+	bool "Marvell 88E6063 ethernet switch chip support"
-+	select NET_DSA_TAG_TRAILER
-+	---help---
-+	  This enables support for the Marvell 88E6063 ethernet switch
-+	  chip
-+
- config NET_DSA_MV88E6XXX_NEED_PPU
- 	bool
- 	default n
---- a/net/dsa/Makefile
-+++ b/net/dsa/Makefile
-@@ -6,6 +6,7 @@ obj-$(CONFIG_NET_DSA_TAG_TRAILER) += tag
- # switch drivers
- obj-$(CONFIG_NET_DSA_MV88E6XXX) += mv88e6xxx.o
- obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o
-+obj-$(CONFIG_NET_DSA_MV88E6063) += mv88e6063.o
- obj-$(CONFIG_NET_DSA_MV88E6123_61_65) += mv88e6123_61_65.o
- obj-$(CONFIG_NET_DSA_MV88E6131) += mv88e6131.o
- 
diff --git a/target/linux/ar71xx/patches-2.6.34/122-dsa-add-qinq-tagging-format.patch b/target/linux/ar71xx/patches-2.6.34/122-dsa-add-qinq-tagging-format.patch
deleted file mode 100644
index dc03fd6eb..000000000
--- a/target/linux/ar71xx/patches-2.6.34/122-dsa-add-qinq-tagging-format.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- a/include/linux/if_ether.h
-+++ b/include/linux/if_ether.h
-@@ -81,6 +81,7 @@
- #define ETH_P_1588	0x88F7		/* IEEE 1588 Timesync */
- #define ETH_P_FCOE	0x8906		/* Fibre Channel over Ethernet  */
- #define ETH_P_FIP	0x8914		/* FCoE Initialization Protocol */
-+#define ETH_P_QINQ	0x9100		/* QinQ VLAN Stacking Protocol */
- #define ETH_P_EDSA	0xDADA		/* Ethertype DSA [ NOT AN OFFICIALLY REGISTERED ID ] */
- 
- /*
---- a/net/dsa/dsa_priv.h
-+++ b/net/dsa/dsa_priv.h
-@@ -174,6 +174,9 @@ netdev_tx_t dsa_xmit(struct sk_buff *skb
- /* tag_edsa.c */
- netdev_tx_t edsa_xmit(struct sk_buff *skb, struct net_device *dev);
- 
-+/* tag_qinq.c */
-+netdev_tx_t qinq_xmit(struct sk_buff *skb, struct net_device *dev);
-+
- /* tag_trailer.c */
- netdev_tx_t trailer_xmit(struct sk_buff *skb, struct net_device *dev);
- 
---- a/net/dsa/Kconfig
-+++ b/net/dsa/Kconfig
-@@ -23,6 +23,10 @@ config NET_DSA_TAG_TRAILER
- 	bool
- 	default n
- 
-+config NET_DSA_TAG_QINQ
-+	bool
-+	default y
-+
- 
- # switch drivers
- config NET_DSA_MV88E6XXX
---- a/net/dsa/Makefile
-+++ b/net/dsa/Makefile
-@@ -1,6 +1,7 @@
- # tagging formats
- obj-$(CONFIG_NET_DSA_TAG_DSA) += tag_dsa.o
- obj-$(CONFIG_NET_DSA_TAG_EDSA) += tag_edsa.o
-+obj-$(CONFIG_NET_DSA_TAG_QINQ) += tag_qinq.o
- obj-$(CONFIG_NET_DSA_TAG_TRAILER) += tag_trailer.o
- 
- # switch drivers
---- a/net/dsa/slave.c
-+++ b/net/dsa/slave.c
-@@ -321,6 +321,19 @@ static const struct net_device_ops edsa_
- 	.ndo_do_ioctl		= dsa_slave_ioctl,
- };
- #endif
-+#ifdef CONFIG_NET_DSA_TAG_QINQ
-+static const struct net_device_ops qinq_netdev_ops = {
-+	.ndo_init		= dsa_slave_init,
-+	.ndo_open	 	= dsa_slave_open,
-+	.ndo_stop		= dsa_slave_close,
-+	.ndo_start_xmit		= qinq_xmit,
-+	.ndo_change_rx_flags	= dsa_slave_change_rx_flags,
-+	.ndo_set_rx_mode	= dsa_slave_set_rx_mode,
-+	.ndo_set_multicast_list = dsa_slave_set_rx_mode,
-+	.ndo_set_mac_address	= dsa_slave_set_mac_address,
-+	.ndo_do_ioctl		= dsa_slave_ioctl,
-+};
-+#endif
- #ifdef CONFIG_NET_DSA_TAG_TRAILER
- static const struct net_device_ops trailer_netdev_ops = {
- 	.ndo_init		= dsa_slave_init,
-@@ -366,6 +379,11 @@ dsa_slave_create(struct dsa_switch *ds, 
- 		slave_dev->netdev_ops = &edsa_netdev_ops;
- 		break;
- #endif
-+#ifdef CONFIG_NET_DSA_TAG_QINQ
-+	case htons(ETH_P_QINQ):
-+		slave_dev->netdev_ops = &qinq_netdev_ops;
-+		break;
-+#endif
- #ifdef CONFIG_NET_DSA_TAG_TRAILER
- 	case htons(ETH_P_TRAILER):
- 		slave_dev->netdev_ops = &trailer_netdev_ops;
diff --git a/target/linux/ar71xx/patches-2.6.34/123-dsa-add-ar7240-built-in-switch-support.patch b/target/linux/ar71xx/patches-2.6.34/123-dsa-add-ar7240-built-in-switch-support.patch
deleted file mode 100644
index 50e6e5de2..000000000
--- a/target/linux/ar71xx/patches-2.6.34/123-dsa-add-ar7240-built-in-switch-support.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/net/dsa/Kconfig
-+++ b/net/dsa/Kconfig
-@@ -29,6 +29,15 @@ config NET_DSA_TAG_QINQ
- 
- 
- # switch drivers
-+config NET_DSA_AR7240
-+	bool "Atheros AR7240 built-in ethernet switch support"
-+	depends on ATHEROS_AR71XX
-+	default n
-+	select NET_DSA_TAG_QINQ
-+	---help---
-+	  This enables support for the built-in ethernet switch of the
-+	  Atheros AR7240 SoC.
-+
- config NET_DSA_MV88E6XXX
- 	bool
- 	default n
---- a/net/dsa/Makefile
-+++ b/net/dsa/Makefile
-@@ -5,6 +5,7 @@ obj-$(CONFIG_NET_DSA_TAG_QINQ) += tag_qi
- obj-$(CONFIG_NET_DSA_TAG_TRAILER) += tag_trailer.o
- 
- # switch drivers
-+obj-$(CONFIG_NET_DSA_AR7240) += ar7240.o
- obj-$(CONFIG_NET_DSA_MV88E6XXX) += mv88e6xxx.o
- obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o
- obj-$(CONFIG_NET_DSA_MV88E6063) += mv88e6063.o
diff --git a/target/linux/ar71xx/patches-2.6.34/140-redboot_partition_scan.patch b/target/linux/ar71xx/patches-2.6.34/140-redboot_partition_scan.patch
deleted file mode 100644
index 289d4eb99..000000000
--- a/target/linux/ar71xx/patches-2.6.34/140-redboot_partition_scan.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/drivers/mtd/redboot.c
-+++ b/drivers/mtd/redboot.c
-@@ -60,31 +60,32 @@ static int parse_redboot_partitions(stru
- 	static char nullstring[] = "unallocated";
- #endif
- 
-+	buf = vmalloc(master->erasesize);
-+	if (!buf)
-+		return -ENOMEM;
-+
-+ restart:
- 	if ( directory < 0 ) {
- 		offset = master->size + directory * master->erasesize;
--		while (master->block_isbad && 
-+		while (master->block_isbad &&
- 		       master->block_isbad(master, offset)) {
- 			if (!offset) {
- 			nogood:
- 				printk(KERN_NOTICE "Failed to find a non-bad block to check for RedBoot partition table\n");
-+				vfree(buf);
- 				return -EIO;
- 			}
- 			offset -= master->erasesize;
- 		}
- 	} else {
- 		offset = directory * master->erasesize;
--		while (master->block_isbad && 
-+		while (master->block_isbad &&
- 		       master->block_isbad(master, offset)) {
- 			offset += master->erasesize;
- 			if (offset == master->size)
- 				goto nogood;
- 		}
- 	}
--	buf = vmalloc(master->erasesize);
--
--	if (!buf)
--		return -ENOMEM;
--
- 	printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n",
- 	       master->name, offset);
- 
-@@ -156,6 +157,11 @@ static int parse_redboot_partitions(stru
- 	}
- 	if (i == numslots) {
- 		/* Didn't find it */
-+		if (offset + master->erasesize < master->size) {
-+			/* not at the end of the flash yet, maybe next block :) */
-+			directory++;
-+			goto restart;
-+		}
- 		printk(KERN_NOTICE "No RedBoot partition table detected in %s\n",
- 		       master->name);
- 		ret = 0;
diff --git a/target/linux/ar71xx/patches-2.6.34/200-rb4xx_nand_driver.patch b/target/linux/ar71xx/patches-2.6.34/200-rb4xx_nand_driver.patch
deleted file mode 100644
index 1e64e0a36..000000000
--- a/target/linux/ar71xx/patches-2.6.34/200-rb4xx_nand_driver.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/drivers/mtd/nand/Kconfig
-+++ b/drivers/mtd/nand/Kconfig
-@@ -488,4 +488,8 @@ config MTD_NAND_W90P910
- 	  This enables the driver for the NAND Flash on evaluation board based
- 	  on w90p910.
- 
-+config MTD_NAND_RB4XX
-+	tristate "NAND flash driver for RouterBoard 4xx series"
-+	depends on MTD_NAND && AR71XX_MACH_RB4XX
-+
- endif # MTD_NAND
---- a/drivers/mtd/nand/Makefile
-+++ b/drivers/mtd/nand/Makefile
-@@ -30,6 +30,7 @@ obj-$(CONFIG_MTD_NAND_CM_X270)		+= cmx27
- obj-$(CONFIG_MTD_NAND_PXA3xx)		+= pxa3xx_nand.o
- obj-$(CONFIG_MTD_NAND_TMIO)		+= tmio_nand.o
- obj-$(CONFIG_MTD_NAND_PLATFORM)		+= plat_nand.o
-+obj-$(CONFIG_MTD_NAND_RB4XX)		+= rb4xx_nand.o
- obj-$(CONFIG_MTD_ALAUDA)		+= alauda.o
- obj-$(CONFIG_MTD_NAND_PASEMI)		+= pasemi_nand.o
- obj-$(CONFIG_MTD_NAND_ORION)		+= orion_nand.o
diff --git a/target/linux/ar71xx/patches-2.6.34/201-ap83_spi_controller.patch b/target/linux/ar71xx/patches-2.6.34/201-ap83_spi_controller.patch
deleted file mode 100644
index a8e889a7b..000000000
--- a/target/linux/ar71xx/patches-2.6.34/201-ap83_spi_controller.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/drivers/spi/Makefile
-+++ b/drivers/spi/Makefile
-@@ -11,6 +11,7 @@ endif
- obj-$(CONFIG_SPI_MASTER)		+= spi.o
- 
- # SPI master controller drivers (bus)
-+obj-$(CONFIG_SPI_AP83)			+= ap83_spi.o
- obj-$(CONFIG_SPI_AR71XX)		+= ar71xx_spi.o
- obj-$(CONFIG_SPI_ATMEL)			+= atmel_spi.o
- obj-$(CONFIG_SPI_BFIN)			+= spi_bfin5xx.o
---- a/drivers/spi/Kconfig
-+++ b/drivers/spi/Kconfig
-@@ -53,6 +53,14 @@ if SPI_MASTER
- 
- comment "SPI Master Controller Drivers"
- 
-+config SPI_AP83
-+	tristate "Atheros AP83 specific SPI Controller"
-+	depends on SPI_MASTER && AR71XX_MACH_AP83
-+	select SPI_BITBANG
-+	help
-+	  This is a specific SPI controller driver for the Atheros AP83
-+	  reference board.
-+
- config SPI_AR71XX
- 	tristate "Atheros AR71xx SPI Controller"
- 	depends on SPI_MASTER && ATHEROS_AR71XX
diff --git a/target/linux/ar71xx/patches-2.6.34/202-spi_vsc7385_driver.patch b/target/linux/ar71xx/patches-2.6.34/202-spi_vsc7385_driver.patch
deleted file mode 100644
index 487785a94..000000000
--- a/target/linux/ar71xx/patches-2.6.34/202-spi_vsc7385_driver.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/drivers/spi/Kconfig
-+++ b/drivers/spi/Kconfig
-@@ -365,6 +365,11 @@ config SPI_TLE62X0
- 	  sysfs interface, with each line presented as a kind of GPIO
- 	  exposing both switch control and diagnostic feedback.
- 
-+config SPI_VSC7385
-+	tristate "Vitesse VSC7385 ethernet switch driver"
-+	help
-+	  SPI driver for the Vitesse VSC7385 ethernet switch.
-+
- #
- # Add new SPI protocol masters in alphabetical order above this line
- #
---- a/drivers/spi/Makefile
-+++ b/drivers/spi/Makefile
-@@ -54,6 +54,7 @@ spi_s3c24xx_hw-$(CONFIG_SPI_S3C24XX_FIQ)
- 
- # SPI protocol drivers (device/link on bus)
- obj-$(CONFIG_SPI_SPIDEV)	+= spidev.o
-+obj-$(CONFIG_SPI_VSC7385)	+= spi_vsc7385.o
- obj-$(CONFIG_SPI_TLE62X0)	+= tle62x0.o
- # 	... add above this line ...
- 
diff --git a/target/linux/ar71xx/patches-2.6.34/203-pb44_spi_controller.patch b/target/linux/ar71xx/patches-2.6.34/203-pb44_spi_controller.patch
deleted file mode 100644
index 2a6edeb18..000000000
--- a/target/linux/ar71xx/patches-2.6.34/203-pb44_spi_controller.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/drivers/spi/Kconfig
-+++ b/drivers/spi/Kconfig
-@@ -68,6 +68,14 @@ config SPI_AR71XX
- 	help
- 	  This is the SPI contoller driver for Atheros AR71xx.
- 
-+config SPI_PB44
-+	tristate "Atheros PB44 board specific SPI controller"
-+	depends on SPI_MASTER && AR71XX_MACH_PB44
-+	select SPI_BITBANG
-+	help
-+	  This is a specific SPI controller driver for the Atheros PB44
-+	  reference board.
-+
- config SPI_ATMEL
- 	tristate "Atmel SPI Controller"
- 	depends on (ARCH_AT91 || AVR32)
---- a/drivers/spi/Makefile
-+++ b/drivers/spi/Makefile
-@@ -24,6 +24,7 @@ obj-$(CONFIG_SPI_GPIO)			+= spi_gpio.o
- obj-$(CONFIG_SPI_GPIO_OLD)		+= spi_gpio_old.o
- obj-$(CONFIG_SPI_IMX)			+= spi_imx.o
- obj-$(CONFIG_SPI_LM70_LLP)		+= spi_lm70llp.o
-+obj-$(CONFIG_SPI_PB44)			+= pb44_spi.o
- obj-$(CONFIG_SPI_PXA2XX)		+= pxa2xx_spi.o
- obj-$(CONFIG_SPI_OMAP_UWIRE)		+= omap_uwire.o
- obj-$(CONFIG_SPI_OMAP24XX)		+= omap2_mcspi.o
diff --git a/target/linux/ar71xx/patches-2.6.34/205-wndr3700-usb-led-driver.patch b/target/linux/ar71xx/patches-2.6.34/205-wndr3700-usb-led-driver.patch
deleted file mode 100644
index d2fbc9c76..000000000
--- a/target/linux/ar71xx/patches-2.6.34/205-wndr3700-usb-led-driver.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -269,6 +269,13 @@ config LEDS_ADP5520
- 	  To compile this driver as a module, choose M here: the module will
- 	  be called leds-adp5520.
- 
-+config LEDS_WNDR3700_USB
-+	tristate "NETGEAR WNDR3700 USB LED driver"
-+	depends on LEDS_CLASS && AR71XX_MACH_WNDR3700
-+	help
-+	  This option enables support for the USB LED found on the
-+	  NETGEAR WNDR3700 board.
-+
- comment "LED Triggers"
- 
- config LEDS_TRIGGERS
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -29,6 +29,7 @@ obj-$(CONFIG_LEDS_DA903X)		+= leds-da903
- obj-$(CONFIG_LEDS_WM831X_STATUS)	+= leds-wm831x-status.o
- obj-$(CONFIG_LEDS_WM8350)		+= leds-wm8350.o
- obj-$(CONFIG_LEDS_PWM)			+= leds-pwm.o
-+obj-${CONFIG_LEDS_WNDR3700_USB}		+= leds-wndr3700-usb.o
- obj-$(CONFIG_LEDS_REGULATOR)		+= leds-regulator.o
- obj-$(CONFIG_LEDS_INTEL_SS4200)		+= leds-ss4200.o
- obj-$(CONFIG_LEDS_LT3593)		+= leds-lt3593.o
diff --git a/target/linux/ar71xx/patches-2.6.34/206-nxp-74hc153-gpio-chip-driver.patch b/target/linux/ar71xx/patches-2.6.34/206-nxp-74hc153-gpio-chip-driver.patch
deleted file mode 100644
index 575f7bbd8..000000000
--- a/target/linux/ar71xx/patches-2.6.34/206-nxp-74hc153-gpio-chip-driver.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/drivers/gpio/Kconfig
-+++ b/drivers/gpio/Kconfig
-@@ -255,4 +255,12 @@ config GPIO_UCB1400
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called ucb1400_gpio.
- 
-+comment "Other GPIO expanders"
-+
-+config GPIO_NXP_74HC153
-+	tristate "NXP 74HC153 Dual 4-input multiplexer"
-+	help
-+	  Platform driver for NXP 74HC153 Dual 4-input Multiplexer. This
-+	  provides a GPIO interface supporting inputs.
-+
- endif
---- a/drivers/gpio/Makefile
-+++ b/drivers/gpio/Makefile
-@@ -11,6 +11,7 @@ obj-$(CONFIG_GPIO_MAX7301)	+= max7301.o
- obj-$(CONFIG_GPIO_MAX732X)	+= max732x.o
- obj-$(CONFIG_GPIO_MC33880)	+= mc33880.o
- obj-$(CONFIG_GPIO_MCP23S08)	+= mcp23s08.o
-+obj-$(CONFIG_GPIO_NXP_74HC153)	+= nxp_74hc153.o
- obj-$(CONFIG_GPIO_PCA953X)	+= pca953x.o
- obj-$(CONFIG_GPIO_PCF857X)	+= pcf857x.o
- obj-$(CONFIG_GPIO_PL061)	+= pl061.o
diff --git a/target/linux/ar71xx/patches-2.6.34/207-rb750-led-driver.patch b/target/linux/ar71xx/patches-2.6.34/207-rb750-led-driver.patch
deleted file mode 100644
index 500604fe2..000000000
--- a/target/linux/ar71xx/patches-2.6.34/207-rb750-led-driver.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -276,6 +276,10 @@ config LEDS_WNDR3700_USB
- 	  This option enables support for the USB LED found on the
- 	  NETGEAR WNDR3700 board.
- 
-+config LEDS_RB750
-+	tristate "LED driver for the Mikrotik RouterBOARD 750"
-+	depends on LEDS_CLASS && AR71XX_MACH_RB750
-+
- comment "LED Triggers"
- 
- config LEDS_TRIGGERS
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -34,6 +34,7 @@ obj-$(CONFIG_LEDS_REGULATOR)		+= leds-re
- obj-$(CONFIG_LEDS_INTEL_SS4200)		+= leds-ss4200.o
- obj-$(CONFIG_LEDS_LT3593)		+= leds-lt3593.o
- obj-$(CONFIG_LEDS_ADP5520)		+= leds-adp5520.o
-+obj-$(CONFIG_LEDS_RB750)		+= leds-rb750.o
- 
- # LED SPI Drivers
- obj-$(CONFIG_LEDS_DAC124S085)		+= leds-dac124s085.o
diff --git a/target/linux/ar71xx/patches-2.6.34/208-rb750-nand-driver.patch b/target/linux/ar71xx/patches-2.6.34/208-rb750-nand-driver.patch
deleted file mode 100644
index 3766a1cd8..000000000
--- a/target/linux/ar71xx/patches-2.6.34/208-rb750-nand-driver.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/drivers/mtd/nand/Kconfig
-+++ b/drivers/mtd/nand/Kconfig
-@@ -492,4 +492,8 @@ config MTD_NAND_RB4XX
- 	tristate "NAND flash driver for RouterBoard 4xx series"
- 	depends on MTD_NAND && AR71XX_MACH_RB4XX
- 
-+config MTD_NAND_RB750
-+	tristate "NAND flash driver for the RouterBoard 750"
-+	depends on MTD_NAND && AR71XX_MACH_RB750
-+
- endif # MTD_NAND
---- a/drivers/mtd/nand/Makefile
-+++ b/drivers/mtd/nand/Makefile
-@@ -31,6 +31,7 @@ obj-$(CONFIG_MTD_NAND_PXA3xx)		+= pxa3xx
- obj-$(CONFIG_MTD_NAND_TMIO)		+= tmio_nand.o
- obj-$(CONFIG_MTD_NAND_PLATFORM)		+= plat_nand.o
- obj-$(CONFIG_MTD_NAND_RB4XX)		+= rb4xx_nand.o
-+obj-$(CONFIG_MTD_NAND_RB750)		+= rb750_nand.o
- obj-$(CONFIG_MTD_ALAUDA)		+= alauda.o
- obj-$(CONFIG_MTD_NAND_PASEMI)		+= pasemi_nand.o
- obj-$(CONFIG_MTD_NAND_ORION)		+= orion_nand.o
diff --git a/target/linux/ar71xx/patches-2.6.34/300-mips_fw_myloader.patch b/target/linux/ar71xx/patches-2.6.34/300-mips_fw_myloader.patch
deleted file mode 100644
index 0d8f132dd..000000000
--- a/target/linux/ar71xx/patches-2.6.34/300-mips_fw_myloader.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -188,6 +188,7 @@ endif
- #
- libs-$(CONFIG_ARC)		+= arch/mips/fw/arc/
- libs-$(CONFIG_CFE)		+= arch/mips/fw/cfe/
-+libs-$(CONFIG_MYLOADER)		+= arch/mips/fw/myloader/
- libs-$(CONFIG_SNIPROM)		+= arch/mips/fw/sni/
- libs-y				+= arch/mips/fw/lib/
- 
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -877,6 +877,9 @@ config MIPS_NILE4
- config MIPS_DISABLE_OBSOLETE_IDE
- 	bool
- 
-+config MYLOADER
-+	bool
-+
- config SYNC_R4K
- 	bool
- 
diff --git a/target/linux/ar71xx/patches-2.6.34/400-mips-multi-machine-update.patch b/target/linux/ar71xx/patches-2.6.34/400-mips-multi-machine-update.patch
deleted file mode 100644
index d63587901..000000000
--- a/target/linux/ar71xx/patches-2.6.34/400-mips-multi-machine-update.patch
+++ /dev/null
@@ -1,134 +0,0 @@
---- a/arch/mips/kernel/mips_machine.c
-+++ b/arch/mips/kernel/mips_machine.c
-@@ -7,12 +7,13 @@
-  *
-  */
- #include <linux/mm.h>
-+#include <linux/string.h>
- 
- #include <asm/mips_machine.h>
--#include <asm/bootinfo.h>
- 
- static struct list_head mips_machines __initdata =
- 		LIST_HEAD_INIT(mips_machines);
-+static char *mips_machid __initdata;
- 
- char *mips_machine_name = "Unknown";
- 
-@@ -55,20 +56,65 @@ void __init mips_machine_set_name(char *
- 	}
- }
- 
--void __init mips_machine_setup(unsigned long machtype)
-+void __init mips_machine_setup(void)
- {
- 	struct mips_machine *mach;
- 
--	mach = mips_machine_find(machtype);
-+	mach = mips_machine_find(mips_machtype);
- 	if (!mach) {
--		printk(KERN_ALERT "MIPS: no machine registered for "
--			"machtype %lu\n", machtype);
-+		printk(KERN_WARNING "MIPS: no machine registered for "
-+			"machtype %lu\n", mips_machtype);
- 		return;
- 	}
- 
- 	mips_machine_set_name(mach->mach_name);
--	printk(KERN_INFO "MIPS: machine is %s\n", mips_machine_name);
-+	printk(KERN_NOTICE "MIPS: machine is %s\n", mips_machine_name);
- 
- 	if (mach->mach_setup)
- 		mach->mach_setup();
- }
-+
-+int __init mips_machtype_setup(char *id)
-+{
-+	if (mips_machid == NULL)
-+		mips_machid = id;
-+
-+	return 1;
-+}
-+
-+__setup("machtype=", mips_machtype_setup);
-+
-+static int __init mips_machtype_init(void)
-+{
-+	struct list_head *this;
-+	struct mips_machine *mach;
-+
-+	if (mips_machid == NULL)
-+		return 0;
-+
-+	list_for_each(this, &mips_machines) {
-+		mach = list_entry(this, struct mips_machine, list);
-+		if (mach->mach_id == NULL)
-+			continue;
-+
-+		if (strcmp(mach->mach_id, mips_machid) == 0) {
-+			mips_machtype = mach->mach_type;
-+			return 0;
-+		}
-+	}
-+
-+	printk(KERN_WARNING
-+	       "MIPS: no machine found for id: '%s', registered machines:\n",
-+	       mips_machid);
-+	printk(KERN_WARNING "%32s %s\n", "id", "name");
-+
-+	list_for_each(this, &mips_machines) {
-+		mach = list_entry(this, struct mips_machine, list);
-+		printk(KERN_WARNING "%32s %s\n",
-+		       mach->mach_id ? mach->mach_id : "", mach->mach_name);
-+	}
-+
-+	return 0;
-+}
-+
-+core_initcall(mips_machtype_init);
---- a/arch/mips/include/asm/mips_machine.h
-+++ b/arch/mips/include/asm/mips_machine.h
-@@ -13,25 +13,33 @@
- #include <linux/init.h>
- #include <linux/list.h>
- 
-+#include <asm/bootinfo.h>
-+
- struct mips_machine {
- 	unsigned long		mach_type;
--	void			(*mach_setup)(void);
-+	char			*mach_id;
- 	char			*mach_name;
-+	void			(*mach_setup)(void);
- 	struct list_head	list;
- };
- 
- void mips_machine_register(struct mips_machine *) __init;
--void mips_machine_setup(unsigned long machtype) __init;
-+void mips_machine_setup(void) __init;
-+int  mips_machtype_setup(char *id) __init;
- void mips_machine_set_name(char *name) __init;
- 
- extern char *mips_machine_name;
- 
--#define MIPS_MACHINE(_type, _name, _setup) 			\
--static char machine_name_##_type[] __initdata = _name;		\
-+#define MIPS_MACHINE(_type, _id, _name, _setup) 		\
-+static const char machine_name_##_type[] __initconst		\
-+			__aligned(1) = _name;			\
-+static const char machine_id_##_type[] __initconst		\
-+			__aligned(1) = _id;			\
- static struct mips_machine machine_##_type __initdata =		\
- {								\
- 	.mach_type	= _type,				\
--	.mach_name	= machine_name_##_type,			\
-+	.mach_id	= (char *) machine_id_##_type,		\
-+	.mach_name	= (char *) machine_name_##_type,	\
- 	.mach_setup	= _setup,				\
- };								\
- 								\
-@@ -44,4 +52,3 @@ static int __init register_machine_##_ty
- pure_initcall(register_machine_##_type)
- 
- #endif /* __ASM_MIPS_MACHINE_H */
--
diff --git a/target/linux/ar71xx/patches-2.6.34/901-get_c0_compare_irq_function.patch b/target/linux/ar71xx/patches-2.6.34/901-get_c0_compare_irq_function.patch
deleted file mode 100644
index c10f4efb1..000000000
--- a/target/linux/ar71xx/patches-2.6.34/901-get_c0_compare_irq_function.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/arch/mips/kernel/traps.c
-+++ b/arch/mips/kernel/traps.c
-@@ -51,6 +51,7 @@
- #include <asm/stacktrace.h>
- #include <asm/irq.h>
- #include <asm/uasm.h>
-+#include <asm/time.h>
- 
- extern void check_wait(void);
- extern asmlinkage void r4k_wait(void);
-@@ -1501,6 +1502,8 @@
- 	if (cpu_has_mips_r2) {
- 		cp0_compare_irq_shift = CAUSEB_TI - CAUSEB_IP;
- 		cp0_compare_irq = (read_c0_intctl() >> INTCTLB_IPTI) & 7;
-+		if (get_c0_compare_irq)
-+			cp0_compare_irq = get_c0_compare_irq();
- 		cp0_perfcount_irq = (read_c0_intctl() >> INTCTLB_IPPCI) & 7;
- 		if (cp0_perfcount_irq == cp0_compare_irq)
- 			cp0_perfcount_irq = -1;
---- a/arch/mips/include/asm/time.h
-+++ b/arch/mips/include/asm/time.h
-@@ -52,6 +52,7 @@ extern int (*perf_irq)(void);
-  */
- #ifdef CONFIG_CEVT_R4K_LIB
- extern unsigned int __weak get_c0_compare_int(void);
-+extern unsigned int __weak get_c0_compare_irq(void);
- extern int r4k_clockevent_init(void);
- #endif
- 
diff --git a/target/linux/ar71xx/profiles/00-default.mk b/target/linux/ar71xx/profiles/00-default.mk
index d4044a6f4..aa46f22c5 100644
--- a/target/linux/ar71xx/profiles/00-default.mk
+++ b/target/linux/ar71xx/profiles/00-default.mk
@@ -6,8 +6,8 @@
 #
 
 define Profile/Default
-	NAME:=Default Profile (no WiFi)
-	PACKAGES:=
+	NAME:=Default Profile (all drivers)
+	PACKAGES:=kmod-ath9k kmod-madwifi kmod-usb-core kmod-usb-ohci kmod-usb2 swconfig vsc7385-ucode-ap83 vsc7385-ucode-pb44 vsc7395-ucode-ap83 vsc7395-ucode-pb44 wpad-mini
 endef
 
 define Profile/Default/Description
diff --git a/target/linux/ar71xx/profiles/01-minimal.mk b/target/linux/ar71xx/profiles/01-minimal.mk
new file mode 100644
index 000000000..3651c88ab
--- /dev/null
+++ b/target/linux/ar71xx/profiles/01-minimal.mk
@@ -0,0 +1,16 @@
+#
+# Copyright (C) 2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/DefaultNoWifi
+	NAME:=Default Profile (no WiFi)
+	PACKAGES:=
+endef
+
+define Profile/DefaultNoWifi/Description
+	Default package set compatible with most boards.
+endef
+$(eval $(call Profile,DefaultNoWifi))
diff --git a/target/linux/ar71xx/profiles/01-madwifi.mk b/target/linux/ar71xx/profiles/02-madwifi.mk
similarity index 100%
rename from target/linux/ar71xx/profiles/01-madwifi.mk
rename to target/linux/ar71xx/profiles/02-madwifi.mk
diff --git a/target/linux/ar71xx/profiles/tp-link.mk b/target/linux/ar71xx/profiles/tp-link.mk
index ffb3b9e06..7efb1a376 100644
--- a/target/linux/ar71xx/profiles/tp-link.mk
+++ b/target/linux/ar71xx/profiles/tp-link.mk
@@ -60,6 +60,17 @@ endef
 
 $(eval $(call Profile,TLWR941NDV2))
 
+define Profile/TLWR941NDV3
+	NAME:=TP-LINK TL-WR941ND v3
+	PACKAGES:=kmod-ath9k wpad-mini
+endef
+
+define Profile/TLWR941NDV3/Description
+	Package set optimized for the TP-LINK TL-WR941ND v3.
+endef
+
+$(eval $(call Profile,TLWR941NDV3))
+
 define Profile/TLWR941NDV4
 	NAME:=TP-LINK TL-WR941ND v4
 	PACKAGES:=kmod-ath9k wpad-mini
diff --git a/target/linux/at91/Makefile b/target/linux/at91/Makefile
deleted file mode 100644
index 70a608262..000000000
--- a/target/linux/at91/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-ARCH:=arm
-BOARD:=at91
-BOARDNAME:=Atmel AT91
-FEATURES:=squashfs usb broken
-
-LINUX_VERSION:=2.6.25.20
-
-include $(INCLUDE_DIR)/target.mk
-
-KERNELNAME:="uImage"
-
-define Target/Description
-  Build fimware images for Figment Design Labs VersaLink board.
-endef
-
-$(eval $(call BuildTarget))
diff --git a/target/linux/at91/base-files/etc/inittab b/target/linux/at91/base-files/etc/inittab
deleted file mode 100644
index a627ce5ff..000000000
--- a/target/linux/at91/base-files/etc/inittab
+++ /dev/null
@@ -1,6 +0,0 @@
-::sysinit:/etc/init.d/rcS S boot
-::shutdown:/etc/init.d/rcS K stop
-tts/0::askfirst:/bin/ash --login
-ttyS0::askfirst:/bin/ash --login
-
-ttyS2::respawn:/sbin/getty -L ttyS2 115200 vt100
diff --git a/target/linux/at91/base-files/etc/ipkg.conf b/target/linux/at91/base-files/etc/ipkg.conf
deleted file mode 100644
index 10c4f67c6..000000000
--- a/target/linux/at91/base-files/etc/ipkg.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-src snapshots http://vlink.guthrie.homedns.org/vlink3
-dest root /
-dest ram /tmp
diff --git a/target/linux/at91/config-2.6.25 b/target/linux/at91/config-2.6.25
deleted file mode 100644
index 593dd42a4..000000000
--- a/target/linux/at91/config-2.6.25
+++ /dev/null
@@ -1,212 +0,0 @@
-# CONFIG_AEABI is not set
-CONFIG_ALIGNMENT_TRAP=y
-# CONFIG_ARCH_AT91CAP9 is not set
-# CONFIG_ARCH_AT91RM9200DK is not set
-CONFIG_ARCH_AT91RM9200=y
-# CONFIG_ARCH_AT91SAM9260 is not set
-# CONFIG_ARCH_AT91SAM9261 is not set
-# CONFIG_ARCH_AT91SAM9263 is not set
-# CONFIG_ARCH_AT91SAM9RL is not set
-# CONFIG_ARCH_AT91X40 is not set
-CONFIG_ARCH_AT91=y
-# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_ARCH_SUPPORTS_AOUT=y
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARM_AT91_ETHER=y
-CONFIG_ARM_THUMB=y
-CONFIG_ARM=y
-# CONFIG_ARPD is not set
-# CONFIG_ARTHUR is not set
-CONFIG_AT91_EARLY_DBGU=y
-# CONFIG_AT91_EARLY_USART0 is not set
-# CONFIG_AT91_EARLY_USART1 is not set
-# CONFIG_AT91_EARLY_USART2 is not set
-# CONFIG_AT91_EARLY_USART3 is not set
-# CONFIG_AT91_EARLY_USART4 is not set
-# CONFIG_AT91_EARLY_USART5 is not set
-CONFIG_AT91_PMC_UNIT=y
-# CONFIG_AT91_PROGRAMMABLE_CLOCKS is not set
-# CONFIG_AT91_SPIDEV is not set
-CONFIG_AT91_SPI=y
-CONFIG_AT91_TIMER_HZ=128
-CONFIG_AT91_VLIO=y
-# CONFIG_ATMEL_PWM is not set
-# CONFIG_ATMEL_SSC is not set
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BITREVERSE=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_RAM=y
-# CONFIG_BLK_DEV_XIP is not set
-# CONFIG_BONDING is not set
-CONFIG_BOUNCE=y
-# CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_CLASSIC_RCU=y
-CONFIG_CPU_32v4T=y
-CONFIG_CPU_32=y
-CONFIG_CPU_ABRT_EV4T=y
-CONFIG_CPU_ARM920T=y
-CONFIG_CPU_CACHE_V4WT=y
-CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_COPY_V4WB=y
-CONFIG_CPU_CP15_MMU=y
-CONFIG_CPU_CP15=y
-# CONFIG_CPU_DCACHE_DISABLE is not set
-# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
-# CONFIG_CPU_ICACHE_DISABLE is not set
-CONFIG_CPU_TLB_V4WBI=y
-# CONFIG_DATAFLASH_ALWAYS_ADD_DEVICE is not set
-CONFIG_DAVICOM_PHY=y
-# CONFIG_DEBUG_USER is not set
-# CONFIG_DM9000 is not set
-CONFIG_DUMMY_CONSOLE=y
-# CONFIG_E1000E_ENABLED is not set
-# CONFIG_FPE_FASTFPE is not set
-# CONFIG_FPE_NWFPE_XP is not set
-CONFIG_FPE_NWFPE=y
-CONFIG_FRAME_POINTER=y
-CONFIG_FS_POSIX_ACL=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-# CONFIG_HAVE_IDE is not set
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_OPROFILE=y
-CONFIG_HW_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_HZ=128
-# CONFIG_IEEE80211_CRYPT_CCMP is not set
-# CONFIG_IEEE80211_CRYPT_TKIP is not set
-# CONFIG_IEEE80211_SOFTMAC is not set
-# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INPUT=y
-CONFIG_LEDS_CPU=y
-CONFIG_LEDS=y
-CONFIG_LEGACY_PTY_COUNT=32
-CONFIG_LEGACY_PTYS=y
-# CONFIG_LLC2 is not set
-# CONFIG_LZO_COMPRESS is not set
-# CONFIG_LZO_DECOMPRESS is not set
-# CONFIG_MACH_AT91RM9200EK is not set
-# CONFIG_MACH_ATEB9200 is not set
-# CONFIG_MACH_CARMEVA is not set
-# CONFIG_MACH_CHUB is not set
-# CONFIG_MACH_CSB337 is not set
-# CONFIG_MACH_CSB637 is not set
-# CONFIG_MACH_ECBAT91 is not set
-# CONFIG_MACH_HOMEMATIC is not set
-# CONFIG_MACH_KAFA is not set
-# CONFIG_MACH_KB9200 is not set
-# CONFIG_MACH_ONEARM is not set
-# CONFIG_MACH_PICOTUX2XX is not set
-# CONFIG_MACH_SWEDATMS is not set
-# CONFIG_MACH_TT9200 is not set
-CONFIG_MACH_VLINK=y
-CONFIG_MTD_AT91_DATAFLASH=y
-CONFIG_MTD_AT91_PARTS=y
-# CONFIG_MTD_CFI is not set
-CONFIG_MTD_CMDLINE_PARTS=y
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-# CONFIG_MTD_ROOTFS_ROOT_DEV is not set
-# CONFIG_MTD_ROOTFS_SPLIT is not set
-# CONFIG_NET_IPGRE_BROADCAST is not set
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NF_CONNTRACK_AMANDA is not set
-# CONFIG_NF_CONNTRACK_PPTP is not set
-# CONFIG_NF_CONNTRACK_RTSP is not set
-# CONFIG_NF_CONNTRACK_TFTP is not set
-# CONFIG_NF_NAT_AMANDA is not set
-# CONFIG_NF_NAT_PPTP is not set
-# CONFIG_NF_NAT_RTSP is not set
-# CONFIG_NF_NAT_TFTP is not set
-# CONFIG_NO_IOPORT is not set
-# CONFIG_OUTER_CACHE is not set
-# CONFIG_PCI_SYSCALL is not set
-CONFIG_PHYLIB=y
-# CONFIG_SCSI_WAIT_SCAN is not set
-# CONFIG_SDIO_UART is not set
-# CONFIG_SERIAL_8250 is not set
-CONFIG_SERIAL_ATMEL_CONSOLE=y
-CONFIG_SERIAL_ATMEL_PDC=y
-# CONFIG_SERIAL_ATMEL_TTYAT is not set
-CONFIG_SERIAL_ATMEL=y
-# CONFIG_SERIO_LIBPS2 is not set
-CONFIG_SERIO_RAW=y
-CONFIG_SERIO_SERPORT=y
-CONFIG_SERIO=y
-CONFIG_SLABINFO=y
-# CONFIG_SMC91X is not set
-# CONFIG_SPI_AT91 is not set
-# CONFIG_SPI_ATMEL is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4096
-CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-CONFIG_UID16=y
-# CONFIG_USB_ARCH_HAS_EHCI is not set
-# CONFIG_USB is not set
-CONFIG_USB_LIBUSUAL=y
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-# CONFIG_USB_OHCI_HCD is not set
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_SERIAL_CYBERJACK is not set
-# CONFIG_USB_SERIAL_EDGEPORT is not set
-# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
-# CONFIG_USB_SERIAL_EMPEG is not set
-# CONFIG_USB_SERIAL_FUNSOFT is not set
-# CONFIG_USB_SERIAL_GARMIN is not set
-# CONFIG_USB_SERIAL_HP4X is not set
-# CONFIG_USB_SERIAL_IPAQ is not set
-# CONFIG_USB_SERIAL_IPW is not set
-# CONFIG_USB_SERIAL_IR is not set
-# CONFIG_USB_SERIAL_IUU is not set
-# CONFIG_USB_SERIAL_KEYSPAN is not set
-# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
-# CONFIG_USB_SERIAL_KLSI is not set
-# CONFIG_USB_SERIAL_KOBIL_SCT is not set
-# CONFIG_USB_SERIAL_MCT_U232 is not set
-# CONFIG_USB_SERIAL_MOS7720 is not set
-# CONFIG_USB_SERIAL_MOS7840 is not set
-# CONFIG_USB_SERIAL_NAVMAN is not set
-# CONFIG_USB_SERIAL_OMNINET is not set
-# CONFIG_USB_SERIAL_OPTION is not set
-# CONFIG_USB_SERIAL_OTI6858 is not set
-# CONFIG_USB_SERIAL_SAFE_PADDED is not set
-# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
-# CONFIG_USB_SERIAL_TI is not set
-# CONFIG_USB_SERIAL_VISOR is not set
-# CONFIG_USB_SERIAL_XIRCOM is not set
-# CONFIG_USB_SPEEDTOUCH is not set
-# CONFIG_USB_STORAGE_ALAUDA is not set
-# CONFIG_USB_STORAGE_DATAFAB is not set
-# CONFIG_USB_STORAGE_DPCM is not set
-# CONFIG_USB_STORAGE_FREECOM is not set
-# CONFIG_USB_STORAGE_JUMPSHOT is not set
-# CONFIG_USB_STORAGE_KARMA is not set
-# CONFIG_USB_STORAGE_SDDR09 is not set
-# CONFIG_USB_STORAGE_SDDR55 is not set
-# CONFIG_USB_STORAGE_USBAT is not set
-CONFIG_USB_SUPPORT=y
-# CONFIG_USB_UEAGLEATM is not set
-CONFIG_VECTORS_BASE=0xffff0000
-# CONFIG_VGA_CONSOLE is not set
-# CONFIG_VGASTATE is not set
-# CONFIG_VIDEO_DEV is not set
-CONFIG_VT_CONSOLE=y
-# CONFIG_VT_HW_CONSOLE_BINDING is not set
-CONFIG_VT=y
-# CONFIG_W1 is not set
-# CONFIG_WATCHDOG is not set
-# CONFIG_WLAN_80211 is not set
-# CONFIG_XIP_KERNEL is not set
-CONFIG_ZBOOT_ROM_BSS=0
-CONFIG_ZBOOT_ROM_TEXT=0
diff --git a/target/linux/at91/files/drivers/mtd/at91part.c b/target/linux/at91/files/drivers/mtd/at91part.c
deleted file mode 100644
index d9c55ed32..000000000
--- a/target/linux/at91/files/drivers/mtd/at91part.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * 
- * Copyright (C) 2007 OpenWrt.org
- * 
- * 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.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Atmel AT91 flash partition table. (Modified by Hamish Guthrie).
- * Based on ar7 map by Felix Fietkau.
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/slab.h>
-
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/bootmem.h>
-#include <linux/squashfs_fs.h>
-
-static struct mtd_partition at91_parts[6];
-
-static int create_mtd_partitions(struct mtd_info *master, 
-				 struct mtd_partition **pparts, 
-				 unsigned long origin)
-{
-	unsigned int offset, len;
-	unsigned int pre_size = 0x42000, root_max = 0x362400;
-	unsigned char buf[512];
-	struct squashfs_super_block *sb = (struct squashfs_super_block *) buf;
-
-	printk("Parsing AT91 partition map...\n");
-
-	at91_parts[0].name = "loaders";
-	at91_parts[0].offset = 0;
-	at91_parts[0].size = 0x21000;
-	at91_parts[0].mask_flags = MTD_WRITEABLE;
-
-	at91_parts[1].name = "ubparams";
-	at91_parts[1].offset = 0x21000;
-	at91_parts[1].size = 0x8400;
-	at91_parts[1].mask_flags = 0;
-
-	at91_parts[2].name = "kernel";
-	at91_parts[2].offset = pre_size;
-	at91_parts[2].size = 0;
-	at91_parts[2].mask_flags = 0;
-
-	at91_parts[3].name = "rootfs";
-	at91_parts[3].offset = 0;
-	at91_parts[3].size = 0;
-	at91_parts[3].mask_flags = 0;
-
-	for(offset = pre_size; offset < root_max; offset += master->erasesize) {
-
-		memset(&buf, 0xe5, sizeof(buf));
-
-		if (master->read(master, offset, sizeof(buf), &len, buf) || len != sizeof(buf))
-			break;
-
-		if (*((__u32 *) buf) == SQUASHFS_MAGIC) {
-			printk(KERN_INFO "%s: Filesystem type: squashfs, size=0x%x\n",
-							master->name, (u32) sb->bytes_used);
-
-			at91_parts[3].size = sb->bytes_used;
-			at91_parts[3].offset = offset;
-			len = at91_parts[3].offset + at91_parts[3].size;
-			len = ((len / (master->erasesize * 8)) + 1) * master->erasesize * 8;
-			at91_parts[3].size = len - at91_parts[3].offset;
-			at91_parts[2].size = offset - at91_parts[2].offset;
-			break;
-			}
-		}
-
-	if (at91_parts[3].size == 0) {
-		printk(KERN_NOTICE "%s: Couldn't find root filesystem\n", master->name);
-		return -1;
-		}
-
-	at91_parts[4].name = "rootfs_data";
-	at91_parts[4].offset = root_max;
-	at91_parts[4].size = master->size - root_max;
-	at91_parts[4].mask_flags = 0;
-
-	at91_parts[5].name = "complete";
-	at91_parts[5].offset = 0;
-	at91_parts[5].size = master->size;
-	at91_parts[5].mask_flags = 0;
-
-	*pparts = at91_parts;
-	return 6;
-}
-
-static struct mtd_part_parser at91_parser = {
-	.owner = THIS_MODULE,
-	.parse_fn = create_mtd_partitions,
-	.name = "at91part",
-};
-
-static int __init at91_parser_init(void)
-{
-	return register_mtd_parser(&at91_parser);
-}
-
-module_init(at91_parser_init);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Felix Fietkau, Eugene Konev, Hamish Guthrie");
-MODULE_DESCRIPTION("MTD partitioning for Atmel at91");
diff --git a/target/linux/at91/image/Config.in b/target/linux/at91/image/Config.in
deleted file mode 100644
index b5a06f6bb..000000000
--- a/target/linux/at91/image/Config.in
+++ /dev/null
@@ -1,35 +0,0 @@
-config AT91_DFBOOT
-	bool "Build dataflashboot loader"
-	depends TARGET_at91
-	default y
-
-config AT91_UBOOT
-	bool "Build U-Boot bootloader"
-	depends TARGET_at91
-	default y
-
-config UBOOT_TARGET
-	string "U-Boot target board"
-	depends TARGET_at91
-	depends AT91_UBOOT
-	default "vlink"
-	help
-	  For all supported boards there are ready-to-use default
-		configurations available; just type "<board_name>".
-
-config UBOOT_IPADDR
-	string "IP Address for U-Boot"
-	depends TARGET_at91
-	depends AT91_UBOOT
-	default "192.168.0.178"
-	help
-	  IP address of device to be used in U-Boot
-
-config UBOOT_SERVERIP
-	string "IP Address of TFTP server"
-	depends TARGET_at91
-	depends AT91_UBOOT
-	default "192.168.0.232"
-	help
-	  IP address of TFTP server for U-Boot
-
diff --git a/target/linux/at91/image/Makefile b/target/linux/at91/image/Makefile
deleted file mode 100644
index 2ec0eb998..000000000
--- a/target/linux/at91/image/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# 
-# Copyright (C) 2006-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/image.mk
-
-define Build/Clean
-	$(MAKE) -C dfboot clean
-	$(MAKE) -C u-boot clean
-endef
-
-define Build/Compile
-	$(MAKE) -C dfboot compile
-	$(MAKE) -C u-boot compile
-	$(KDIR)/u-boot-1.1.4/tools/ubparams
-	cp params $(KDIR)
-endef
-
-define Image/Prepare
-  cp $(LINUX_DIR)/arch/arm/boot/uImage $(KDIR)/uImage
-	cp $(KDIR)/dfboot/dfboot.bin $(KDIR)/dfboot.bin
-	cp $(KDIR)/dfboot/dfbptest.bin $(KDIR)/dfbptest.bin
-	cp $(KDIR)/u-boot-1.1.4/u-boot.bin $(KDIR)/u-boot.bin
-	dd if=$(KDIR)/u-boot.bin of=$(KDIR)/u-boot.block bs=100k count=1 conv=sync
-	cat $(KDIR)/u-boot.block $(KDIR)/params > $(KDIR)/u-boot.full
-endef
-
-define Image/BuildKernel
-	cp $(KDIR)/uImage $(BIN_DIR)/$(IMG_PREFIX)-uImage
-endef
-
-define Image/Build
-	dd if=$(KDIR)/uImage of=$(KDIR)/uImage.block bs=8448 conv=sync
-	dd if=$(KDIR)/root.squashfs of=$(KDIR)/root.block bs=8448 conv=sync
-	cat $(KDIR)/uImage.block $(KDIR)/root.block > $(KDIR)/knlroot.bin
-	$(STAGING_DIR_HOST)/bin/trx -o $(BIN_DIR)/$(IMG_PREFIX).trx -f $(KDIR)/dfboot.bin -f$(KDIR)/u-boot.full -f$(KDIR)/knlroot.bin
-	cp $(KDIR)/dfbptest.bin $(BIN_DIR)
-	$(call Image/Build/$(1),$(1))
-endef
-
-$(eval $(call BuildImage))
diff --git a/target/linux/at91/image/dfboot/Makefile b/target/linux/at91/image/dfboot/Makefile
deleted file mode 100644
index 91a603de4..000000000
--- a/target/linux/at91/image/dfboot/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=dfboot
-PKG_VERSION:=0.1
-PKG_RELEASE:=1
-
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-	$(CP) ./src/* $(PKG_BUILD_DIR)/
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		LDFLAGS="$(LIBGCC_S)"
-endef
-
-define Build/InstallDev
-	dd if=$(PKG_BUILD_DIR)/binary/dfboot.bin of=$(PKG_BUILD_DIR)/binary/dfboot.block bs=32k count=1 conv=sync
-endef
-
-$(eval $(call Build/DefaultTargets))
diff --git a/target/linux/at91/image/dfboot/src/Makefile b/target/linux/at91/image/dfboot/src/Makefile
deleted file mode 100644
index ff92e0d49..000000000
--- a/target/linux/at91/image/dfboot/src/Makefile
+++ /dev/null
@@ -1,94 +0,0 @@
-# Makefile for DataFlashBoot.bin
-# Must use toolchain with H/W FLoating Point
-
-BASENAME=dfboot
-BINNAME=$(BASENAME).bin
-OUTNAME=$(BASENAME).out
-LSSNAME=$(BASENAME).lss
-MAPNAME=$(BASENAME).map
-
-BASENAME2=dfbptest
-BINNAME2=$(BASENAME2).bin
-OUTNAME2=$(BASENAME2).out
-LSSNAME2=$(BASENAME2).lss
-MAPNAME2=$(BASENAME2).map
-
-INCPATH=include
-
-CFLAGS_LOCAL=-Os -Wall -I$(INCPATH)
-BUILD=$(CC) $(CFLAGS) $(CFLAGS_LOCAL)
-
-LDFLAGS+=-T elf32-littlearm.lds -Ttext 0
-LINK=$(LD) $(LDFLAGS)
-
-OBJS=objs/cstartup_ram.o objs/at45.o objs/com.o objs/dataflash.o\
-	objs/div0.o objs/init.o objs/main.o objs/asm_isr.o objs/asm_mci_isr.o\
-	objs/mci_device.o objs/jump.o objs/_udivsi3.o objs/_umodsi3.o
-
-OBJS2=objs/cstartup_ram.o objs/at45.o objs/com.o objs/dataflash.o\
-	objs/div0.o objs/init.o objs/ptmain.o objs/asm_isr.o objs/asm_mci_isr.o\
-	objs/mci_device.o objs/jump.o objs/_udivsi3.o objs/_umodsi3.o
-
-I=config.h com.h dataflash.h embedded_services.h main.h stdio.h include/AT91RM9200.h include/lib_AT91RM9200.h 
-
-all:clean $(BASENAME) $(BASENAME2)
-
-$(BASENAME): $(OBJS)
-	$(LINK) -n -o $(OUTNAME) $(OBJS)
-	$(OBJCOPY) $(OUTNAME) -O binary $(BINNAME)
-	$(OBJDUMP) -h -s $(OUTNAME) > $(LSSNAME)
-	$(NM) -n $(OUTNAME) | grep -v '\( [aUw] \)\|\(__crc_\)\|\( \$[adt]\)' > $(MAPNAME)
-	cp $(BINNAME) binary
-	
-$(BASENAME2): $(OBJS2)
-	$(LINK) -n -o $(OUTNAME2) $(OBJS2)
-	$(OBJCOPY) $(OUTNAME2) -O binary $(BINNAME2)
-	$(OBJDUMP) -h -s $(OUTNAME2) > $(LSSNAME2)
-	$(NM) -n $(OUTNAME2) | grep -v '\( [aUw] \)\|\(__crc_\)\|\( \$[adt]\)' > $(MAPNAME2)
-	cp $(BINNAME2) binary
-	
-# C objects here
-objs/at45.o: at45.c	$(I)
-	$(BUILD) -c -o objs/at45.o		at45.c
-objs/com.o: com.c	$(I)
-	$(BUILD) -c -o objs/com.o		com.c
-objs/dataflash.o: dataflash.c	$(I)
-	$(BUILD) -c -o objs/dataflash.o		dataflash.c
-objs/mci_device.o: mci_device.c	$(I)
-	$(BUILD) -c -o objs/mci_device.o		mci_device.c
-objs/div0.o: div0.c	$(I)
-	$(BUILD) -c -o objs/div0.o		div0.c
-objs/init.o: init.c	$(I)
-	$(BUILD) -c -o objs/init.o		init.c
-objs/main.o: main.c	$(I)
-	$(BUILD) -c -o objs/main.o		main.c
-objs/ptmain.o: main.c	$(I)
-	$(BUILD) -c -D PRODTEST -o objs/ptmain.o		main.c
-
-# ASM objects here
-objs/asm_isr.o: asm_isr.S
-	$(BUILD) -c -o objs/asm_isr.o		asm_isr.S
-objs/asm_mci_isr.o: asm_mci_isr.S
-	$(BUILD) -c -o objs/asm_mci_isr.o		asm_mci_isr.S
-objs/cstartup_ram.o: cstartup_ram.S
-	$(BUILD) -c -o objs/cstartup_ram.o	cstartup_ram.S
-objs/jump.o: jump.S
-	$(BUILD) -c -o objs/jump.o		jump.S
-objs/_udivsi3.o: _udivsi3.S
-	$(BUILD) -c -o objs/_udivsi3.o		_udivsi3.S
-objs/_umodsi3.o: _umodsi3.S
-	$(BUILD) -c -o objs/_umodsi3.o 		_umodsi3.S
-
-install:	$(BINNAME) $(BINNAME2)
-	cp $(BINNAME) binary
-	cp $(BINNAME2) binary
-
-clean:
-	rm -f *~
-	rm -f objs/*
-	rm -f *.out
-	rm -f *.bin
-	rm -f *.lss
-	rm -f *.map
-	rm -f .unpacked
-	mkdir -p objs
diff --git a/target/linux/at91/image/dfboot/src/_udivsi3.S b/target/linux/at91/image/dfboot/src/_udivsi3.S
deleted file mode 100644
index 2cdcd48b4..000000000
--- a/target/linux/at91/image/dfboot/src/_udivsi3.S
+++ /dev/null
@@ -1,77 +0,0 @@
-/* # 1 "libgcc1.S" */
-@ libgcc1 routines for ARM cpu.
-@ Division routines, written by Richard Earnshaw, (rearnsha@armltd.co.uk)
-dividend	.req	r0
-divisor		.req	r1
-result		.req	r2
-curbit		.req	r3
-/* ip		.req	r12	*/
-/* sp		.req	r13	*/
-/* lr		.req	r14	*/
-/* pc		.req	r15	*/
-	.text
-	.globl	 __udivsi3
-	.type  __udivsi3       ,function
-	.align	0
- __udivsi3      :
-	cmp	divisor, #0
-	beq	Ldiv0
-	mov	curbit, #1
-	mov	result, #0
-	cmp	dividend, divisor
-	bcc	Lgot_result
-Loop1:
-	@ Unless the divisor is very big, shift it up in multiples of
-	@ four bits, since this is the amount of unwinding in the main
-	@ division loop.  Continue shifting until the divisor is
-	@ larger than the dividend.
-	cmp	divisor, #0x10000000
-	cmpcc	divisor, dividend
-	movcc	divisor, divisor, lsl #4
-	movcc	curbit, curbit, lsl #4
-	bcc	Loop1
-Lbignum:
-	@ For very big divisors, we must shift it a bit at a time, or
-	@ we will be in danger of overflowing.
-	cmp	divisor, #0x80000000
-	cmpcc	divisor, dividend
-	movcc	divisor, divisor, lsl #1
-	movcc	curbit, curbit, lsl #1
-	bcc	Lbignum
-Loop3:
-	@ Test for possible subtractions, and note which bits
-	@ are done in the result.  On the final pass, this may subtract
-	@ too much from the dividend, but the result will be ok, since the
-	@ "bit" will have been shifted out at the bottom.
-	cmp	dividend, divisor
-	subcs	dividend, dividend, divisor
-	orrcs	result, result, curbit
-	cmp	dividend, divisor, lsr #1
-	subcs	dividend, dividend, divisor, lsr #1
-	orrcs	result, result, curbit, lsr #1
-	cmp	dividend, divisor, lsr #2
-	subcs	dividend, dividend, divisor, lsr #2
-	orrcs	result, result, curbit, lsr #2
-	cmp	dividend, divisor, lsr #3
-	subcs	dividend, dividend, divisor, lsr #3
-	orrcs	result, result, curbit, lsr #3
-	cmp	dividend, #0			@ Early termination?
-	movnes	curbit, curbit, lsr #4		@ No, any more bits to do?
-	movne	divisor, divisor, lsr #4
-	bne	Loop3
-Lgot_result:
-	mov	r0, result
-	mov 	pc, lr
-Ldiv0:
-	str	lr, [sp, #-4]!
-	bl	 __div0       (PLT)
-	mov	r0, #0			@ about as wrong as it could be
-	ldmia	sp!, {pc}
-	.size  __udivsi3       , . -  __udivsi3
-/* # 235 "libgcc1.S" */
-/* # 320 "libgcc1.S" */
-/* # 421 "libgcc1.S" */
-/* # 433 "libgcc1.S" */
-/* # 456 "libgcc1.S" */
-/* # 500 "libgcc1.S" */
-/* # 580 "libgcc1.S" */
diff --git a/target/linux/at91/image/dfboot/src/_umodsi3.S b/target/linux/at91/image/dfboot/src/_umodsi3.S
deleted file mode 100644
index e4aebe84c..000000000
--- a/target/linux/at91/image/dfboot/src/_umodsi3.S
+++ /dev/null
@@ -1,88 +0,0 @@
-/* # 1 "libgcc1.S" */
-@ libgcc1 routines for ARM cpu.
-@ Division routines, written by Richard Earnshaw, (rearnsha@armltd.co.uk)
-/* # 145 "libgcc1.S" */
-dividend	.req	r0
-divisor		.req	r1
-overdone	.req	r2
-curbit		.req	r3
-/* ip		.req	r12	*/
-/* sp		.req	r13	*/
-/* lr		.req	r14	*/
-/* pc		.req	r15	*/
-	.text
-	.globl	 __umodsi3
-	.type  __umodsi3       ,function
-	.align 0
- __umodsi3      :
-	cmp	divisor, #0
-	beq	Ldiv0
-	mov	curbit, #1
-	cmp	dividend, divisor
-	movcc  	pc, lr
-Loop1:
-	@ Unless the divisor is very big, shift it up in multiples of
-	@ four bits, since this is the amount of unwinding in the main
-	@ division loop.  Continue shifting until the divisor is
-	@ larger than the dividend.
-	cmp	divisor, #0x10000000
-	cmpcc	divisor, dividend
-	movcc	divisor, divisor, lsl #4
-	movcc	curbit, curbit, lsl #4
-	bcc	Loop1
-Lbignum:
-	@ For very big divisors, we must shift it a bit at a time, or
-	@ we will be in danger of overflowing.
-	cmp	divisor, #0x80000000
-	cmpcc	divisor, dividend
-	movcc	divisor, divisor, lsl #1
-	movcc	curbit, curbit, lsl #1
-	bcc	Lbignum
-Loop3:
-	@ Test for possible subtractions.  On the final pass, this may
-	@ subtract too much from the dividend, so keep track of which
-	@ subtractions are done, we can fix them up afterwards...
-	mov	overdone, #0
-	cmp	dividend, divisor
-	subcs	dividend, dividend, divisor
-	cmp	dividend, divisor, lsr #1
-	subcs	dividend, dividend, divisor, lsr #1
-	orrcs	overdone, overdone, curbit, ror #1
-	cmp	dividend, divisor, lsr #2
-	subcs	dividend, dividend, divisor, lsr #2
-	orrcs	overdone, overdone, curbit, ror #2
-	cmp	dividend, divisor, lsr #3
-	subcs	dividend, dividend, divisor, lsr #3
-	orrcs	overdone, overdone, curbit, ror #3
-	mov	ip, curbit
-	cmp	dividend, #0			@ Early termination?
-	movnes	curbit, curbit, lsr #4		@ No, any more bits to do?
-	movne	divisor, divisor, lsr #4
-	bne	Loop3
-	@ Any subtractions that we should not have done will be recorded in
-	@ the top three bits of "overdone".  Exactly which were not needed
-	@ are governed by the position of the bit, stored in ip.
-	@ If we terminated early, because dividend became zero,
-	@ then none of the below will match, since the bit in ip will not be
-	@ in the bottom nibble.
-	ands	overdone, overdone, #0xe0000000
-	moveq  	pc, lr				@ No fixups needed
-	tst	overdone, ip, ror #3
-	addne	dividend, dividend, divisor, lsr #3
-	tst	overdone, ip, ror #2
-	addne	dividend, dividend, divisor, lsr #2
-	tst	overdone, ip, ror #1
-	addne	dividend, dividend, divisor, lsr #1
-	mov 	pc, lr
-Ldiv0:
-	str	lr, [sp, #-4]!
-	bl	 __div0       (PLT)
-	mov	r0, #0			@ about as wrong as it could be
-	ldmia	sp!, {pc}
-	.size  __umodsi3       , . -  __umodsi3
-/* # 320 "libgcc1.S" */
-/* # 421 "libgcc1.S" */
-/* # 433 "libgcc1.S" */
-/* # 456 "libgcc1.S" */
-/* # 500 "libgcc1.S" */
-/* # 580 "libgcc1.S" */
diff --git a/target/linux/at91/image/dfboot/src/asm_isr.S b/target/linux/at91/image/dfboot/src/asm_isr.S
deleted file mode 100644
index 8d1d52e19..000000000
--- a/target/linux/at91/image/dfboot/src/asm_isr.S
+++ /dev/null
@@ -1,75 +0,0 @@
-#include "AT91RM9200_inc.h"
-
-#define ARM_MODE_USER           0x10
-#define ARM_MODE_FIQ            0x11
-#define ARM_MODE_IRQ            0x12
-#define ARM_MODE_SVC            0x13
-#define ARM_MODE_ABORT          0x17
-#define ARM_MODE_UNDEF          0x1B
-#define ARM_MODE_SYS            0x1F
-
-#define I_BIT                   0x80
-#define F_BIT                   0x40
-#define T_BIT                   0x20
-
-
-/* -----------------------------------------------------------------------------
-   AT91F_ASM_SPI_Handler
-   ---------------------
-      Handler called by the AIC
-        
-      Save context
-        Call C handler
-    Restore context
-   ----------------------------------------------------------------------------- */
-		
-.global AT91F_ST_ASM_HANDLER
-
-AT91F_ST_ASM_HANDLER:
-/*  Adjust and save LR_irq in IRQ stack */
- 	sub         r14, r14, #4
-	stmfd       sp!, {r14}
-
-/*  Write in the IVR to support Protect Mode
-  No effect in Normal Mode
-  De-assert the NIRQ and clear the source in Protect Mode */
-	ldr         r14, =AT91C_BASE_AIC
-	str         r14, [r14, #AIC_IVR]
-
-/*  Save SPSR and r0 in IRQ stack */
-	mrs         r14, SPSR
-	stmfd       sp!, {r0, r14}
-
-/*  Enable Interrupt and Switch in SYS Mode */
-	mrs         r0, CPSR
-	bic         r0, r0, #I_BIT
-	orr         r0, r0, #ARM_MODE_SYS
-	msr         CPSR_c, r0
- 
-/* Save scratch/used registers and LR in User Stack */
-	stmfd       sp!, { r1-r3, r12, r14}
-
-	ldr     r1, =AT91F_ST_HANDLER
-	mov     r14, pc
-	bx      r1
-
-/*  Restore scratch/used registers and LR from User Stack */
-	ldmia       sp!, { r1-r3, r12, r14}
-
-/*  Disable Interrupt and switch back in IRQ mode */
-	mrs         r0, CPSR
-	bic         r0, r0, #ARM_MODE_SYS
-	orr         r0, r0, #I_BIT | ARM_MODE_IRQ
-	msr         CPSR_c, r0
-
-/*  Mark the End of Interrupt on the AIC */
-	ldr         r0, =AT91C_BASE_AIC
-	str         r0, [r0, #AIC_EOICR]
-
-/*  Restore SPSR_irq and r0 from IRQ stack */
-	ldmia       sp!, {r0, r14}
-	msr         SPSR_cxsf, r14
-
-/*  Restore adjusted  LR_irq from IRQ stack directly in the PC */
-	ldmia       sp!, {pc}^
-
diff --git a/target/linux/at91/image/dfboot/src/asm_mci_isr.S b/target/linux/at91/image/dfboot/src/asm_mci_isr.S
deleted file mode 100644
index 0f66fc0d6..000000000
--- a/target/linux/at91/image/dfboot/src/asm_mci_isr.S
+++ /dev/null
@@ -1,75 +0,0 @@
-#include <AT91RM9200_inc.h>
-
-#define ARM_MODE_USER           0x10
-#define ARM_MODE_FIQ            0x11
-#define ARM_MODE_IRQ            0x12
-#define ARM_MODE_SVC            0x13
-#define ARM_MODE_ABORT          0x17
-#define ARM_MODE_UNDEF          0x1B
-#define ARM_MODE_SYS            0x1F
-
-#define I_BIT                   0x80
-#define F_BIT                   0x40
-#define T_BIT                   0x20
-
-
-/* -----------------------------------------------------------------------------
-   AT91F_ASM_MCI_Handler
-   ---------------------
-      Handler called by the AIC
-        
-      Save context
-        Call C handler
-    Restore context
-   ----------------------------------------------------------------------------- */
-		
-.global AT91F_ASM_MCI_Handler  
-
-AT91F_ASM_MCI_Handler:
-/*  Adjust and save LR_irq in IRQ stack */
- 	sub         r14, r14, #4
-	stmfd       sp!, {r14}
-
-/*  Write in the IVR to support Protect Mode
-  No effect in Normal Mode
-  De-assert the NIRQ and clear the source in Protect Mode */
-	ldr         r14, =AT91C_BASE_AIC
-	str         r14, [r14, #AIC_IVR]
-
-/*  Save SPSR and r0 in IRQ stack */
-	mrs         r14, SPSR
-	stmfd       sp!, {r0, r14}
-
-/*  Enable Interrupt and Switch in SYS Mode */
-	mrs         r0, CPSR
-	bic         r0, r0, #I_BIT
-	orr         r0, r0, #ARM_MODE_SYS
-	msr         CPSR_c, r0
- 
-/* Save scratch/used registers and LR in User Stack */
-	stmfd       sp!, { r1-r3, r12, r14}
-
-	ldr     r1, =AT91F_MCI_Handler
-	mov     r14, pc
-	bx      r1
-
-/*  Restore scratch/used registers and LR from User Stack */
-	ldmia       sp!, { r1-r3, r12, r14}
-
-/*  Disable Interrupt and switch back in IRQ mode */
-	mrs         r0, CPSR
-	bic         r0, r0, #ARM_MODE_SYS
-	orr         r0, r0, #I_BIT | ARM_MODE_IRQ
-	msr         CPSR_c, r0
-
-/*  Mark the End of Interrupt on the AIC */
-	ldr         r0, =AT91C_BASE_AIC
-	str         r0, [r0, #AIC_EOICR]
-
-/*  Restore SPSR_irq and r0 from IRQ stack */
-	ldmia       sp!, {r0, r14}
-	msr         SPSR_cxsf, r14
-
-/*  Restore adjusted  LR_irq from IRQ stack directly in the PC */
-	ldmia       sp!, {pc}^
-
diff --git a/target/linux/at91/image/dfboot/src/at45.c b/target/linux/at91/image/dfboot/src/at45.c
deleted file mode 100644
index 8830d7e9b..000000000
--- a/target/linux/at91/image/dfboot/src/at45.c
+++ /dev/null
@@ -1,595 +0,0 @@
-/*----------------------------------------------------------------------------
- *      ATMEL Microcontroller Software Support  -  ROUSSET  -
- *----------------------------------------------------------------------------
- * The software is delivered "AS IS" without warranty or condition of any
- * kind, either express, implied or statutory. This includes without
- * limitation any warranty or condition with respect to merchantability or
- * fitness for any particular purpose, or against the infringements of
- * intellectual property rights of others.
- *----------------------------------------------------------------------------
- * File Name           : at45c.h
- * Object              : 
- *
- * 1.0  10/12/03 HIi    : Creation.
- * 1.01 03/05/04 HIi    : Bug Fix in AT91F_DataFlashWaitReady() Function.
- *----------------------------------------------------------------------------
- */
-#include "config.h"
-#include "stdio.h"
-#include "AT91RM9200.h"
-#include "lib_AT91RM9200.h"
-#include "dataflash.h"
-#include "main.h"
-
-
-/*----------------------------------------------------------------------------*/
-/* \fn    AT91F_SpiInit                                                       */
-/* \brief SPI Low level Init                                                  */
-/*----------------------------------------------------------------------------*/
-void AT91F_SpiInit(void) {
-	/* Configure PIOs */
-	AT91C_BASE_PIOA->PIO_ASR = AT91C_PA3_NPCS0 | AT91C_PA4_NPCS1 | 
-	                           AT91C_PA1_MOSI | AT91C_PA5_NPCS2 |
-	                           AT91C_PA6_NPCS3 | AT91C_PA0_MISO |
-	                           AT91C_PA2_SPCK;
-	AT91C_BASE_PIOA->PIO_PDR = AT91C_PA3_NPCS0 | AT91C_PA4_NPCS1 |
-	                           AT91C_PA1_MOSI | AT91C_PA5_NPCS2 |
-	                           AT91C_PA6_NPCS3 | AT91C_PA0_MISO |
-	                           AT91C_PA2_SPCK;
-	/* Enable CLock */
-	AT91C_BASE_PMC->PMC_PCER = 1 << AT91C_ID_SPI;
-
-	/* Reset the SPI */
-	AT91C_BASE_SPI->SPI_CR = AT91C_SPI_SWRST;
-
-	/* Configure SPI in Master Mode with No CS selected !!! */
-	AT91C_BASE_SPI->SPI_MR = AT91C_SPI_MSTR | AT91C_SPI_MODFDIS | AT91C_SPI_PCS;
-
-	/* Configure CS0 and CS3 */
-	*(AT91C_SPI_CSR + 0) = AT91C_SPI_CPOL | (AT91C_SPI_DLYBS & DATAFLASH_TCSS) |
-	                       (AT91C_SPI_DLYBCT & DATAFLASH_TCHS) |
-	                       ((AT91C_MASTER_CLOCK / (2*AT91C_SPI_CLK)) << 8);
-	*(AT91C_SPI_CSR + 3) = AT91C_SPI_CPOL | (AT91C_SPI_DLYBS & DATAFLASH_TCSS) |
-	                       (AT91C_SPI_DLYBCT & DATAFLASH_TCHS) |
-	                       ((AT91C_MASTER_CLOCK / (2*AT91C_SPI_CLK)) << 8);
-}
-
-
-/*----------------------------------------------------------------------------*/
-/* \fn    AT91F_SpiEnable                                                     */
-/* \brief Enable SPI chip select                                              */
-/*----------------------------------------------------------------------------*/
-static void AT91F_SpiEnable(int cs) {
-	switch(cs) {
-	case 0:	/* Configure SPI CS0 for Serial DataFlash AT45DBxx */
-		AT91C_BASE_SPI->SPI_MR &= 0xFFF0FFFF;
-		AT91C_BASE_SPI->SPI_MR |= ((AT91C_SPI_PCS0_SERIAL_DATAFLASH << 16) & AT91C_SPI_PCS);
-		break;
-	case 3:	/* Configure SPI CS3 for Serial DataFlash Card */
-		/* Set up PIO SDC_TYPE to switch on DataFlash Card and not MMC/SDCard */
-		AT91C_BASE_PIOB->PIO_PER = AT91C_PIO_PB7;	/* Set in PIO mode */
-		AT91C_BASE_PIOB->PIO_OER = AT91C_PIO_PB7;	/* Configure in output */
-		/* Clear Output */
-		AT91C_BASE_PIOB->PIO_CODR = AT91C_PIO_PB7;
-		/* Configure PCS */
-		AT91C_BASE_SPI->SPI_MR &= 0xFFF0FFFF;
-		AT91C_BASE_SPI->SPI_MR |= ((AT91C_SPI_PCS3_DATAFLASH_CARD<<16) & AT91C_SPI_PCS);
-		break;
-	}
-
-	/* SPI_Enable */
-	AT91C_BASE_SPI->SPI_CR = AT91C_SPI_SPIEN;
-}
-
-/*----------------------------------------------------------------------------*/
-/* \fn    AT91F_SpiWrite                                                      */
-/* \brief Set the PDC registers for a transfert                               */
-/*----------------------------------------------------------------------------*/
-static unsigned int AT91F_SpiWrite(AT91PS_DataflashDesc pDesc)
-{
-   	unsigned int timeout;
-	
-   	AT91C_BASE_SPI->SPI_PTCR = AT91C_PDC_TXTDIS + AT91C_PDC_RXTDIS;
-
-   	/* Initialize the Transmit and Receive Pointer */
-    	AT91C_BASE_SPI->SPI_RPR = (unsigned int)pDesc->rx_cmd_pt ;
-    	AT91C_BASE_SPI->SPI_TPR = (unsigned int)pDesc->tx_cmd_pt ;
-
-    	/* Intialize the Transmit and Receive Counters */
-    	AT91C_BASE_SPI->SPI_RCR = pDesc->rx_cmd_size;
-    	AT91C_BASE_SPI->SPI_TCR = pDesc->tx_cmd_size;
-
-	if ( pDesc->tx_data_size != 0 ) {
-	   	/* Initialize the Next Transmit and Next Receive Pointer */
-	   	AT91C_BASE_SPI->SPI_RNPR = (unsigned int)pDesc->rx_data_pt ;
-		AT91C_BASE_SPI->SPI_TNPR = (unsigned int)pDesc->tx_data_pt ;
-
-		/* Intialize the Next Transmit and Next Receive Counters */
-		AT91C_BASE_SPI->SPI_RNCR = pDesc->rx_data_size ;
-	 	AT91C_BASE_SPI->SPI_TNCR = pDesc->tx_data_size ;
-   	}
-
-	/* ARM simple, non interrupt dependent timer */
-	timeout = 0;
-
-	AT91C_BASE_SPI->SPI_PTCR = AT91C_PDC_TXTEN + AT91C_PDC_RXTEN;
-	while(!(AT91C_BASE_SPI->SPI_SR & AT91C_SPI_RXBUFF));
-
-   	AT91C_BASE_SPI->SPI_PTCR = AT91C_PDC_TXTDIS + AT91C_PDC_RXTDIS;
-
-	if (timeout >= AT91C_DATAFLASH_TIMEOUT){
-		return AT91C_DATAFLASH_ERROR;
-	}
-
-	return AT91C_DATAFLASH_OK;
-}
-
-
-/*----------------------------------------------------------------------*/
-/* \fn    AT91F_DataFlashSendCommand					*/
-/* \brief Generic function to send a command to the dataflash		*/
-/*----------------------------------------------------------------------*/
-static AT91S_DataFlashStatus AT91F_DataFlashSendCommand(
-	AT91PS_DataFlash pDataFlash,
-	unsigned char OpCode,
-	unsigned int CmdSize,
-	unsigned int DataflashAddress)
-{
-	unsigned int adr;
-
-	/* process the address to obtain page address and byte address */
-	adr = ((DataflashAddress / (pDataFlash->pDevice->pages_size)) 
-	        << pDataFlash->pDevice->page_offset) +
-	        (DataflashAddress % (pDataFlash->pDevice->pages_size));
-
-	/* fill the  command  buffer */
-	pDataFlash->pDataFlashDesc->command[0] = OpCode;
-	if (pDataFlash->pDevice->pages_number >= 16384)
-	{
-		pDataFlash->pDataFlashDesc->command[1] = (unsigned char)((adr & 0x0F000000) >> 24);
-		pDataFlash->pDataFlashDesc->command[2] = (unsigned char)((adr & 0x00FF0000) >> 16);
-		pDataFlash->pDataFlashDesc->command[3] = (unsigned char)((adr & 0x0000FF00) >> 8);
-		pDataFlash->pDataFlashDesc->command[4] = (unsigned char)(adr & 0x000000FF);
-	}
-	else
-	{	
-		pDataFlash->pDataFlashDesc->command[1] = (unsigned char)((adr & 0x00FF0000) >> 16);
-		pDataFlash->pDataFlashDesc->command[2] = (unsigned char)((adr & 0x0000FF00) >> 8);
-		pDataFlash->pDataFlashDesc->command[3] = (unsigned char)(adr & 0x000000FF) ;
-		pDataFlash->pDataFlashDesc->command[4] = 0;
-	}
-	pDataFlash->pDataFlashDesc->command[5] = 0;
-	pDataFlash->pDataFlashDesc->command[6] = 0;
-	pDataFlash->pDataFlashDesc->command[7] = 0;
-
-	/* Initialize the SpiData structure for the spi write fuction */
-	pDataFlash->pDataFlashDesc->tx_cmd_pt   =  pDataFlash->pDataFlashDesc->command ;
-	pDataFlash->pDataFlashDesc->tx_cmd_size =  CmdSize ;
-	pDataFlash->pDataFlashDesc->rx_cmd_pt   =  pDataFlash->pDataFlashDesc->command ;
-	pDataFlash->pDataFlashDesc->rx_cmd_size =  CmdSize ;
-
-	return AT91F_SpiWrite(pDataFlash->pDataFlashDesc);			
-}
-
-
-/*----------------------------------------------------------------------*/
-/* \fn    AT91F_DataFlashGetStatus					*/
-/* \brief Read the status register of the dataflash			*/
-/*----------------------------------------------------------------------*/
-static AT91S_DataFlashStatus AT91F_DataFlashGetStatus(AT91PS_DataflashDesc pDesc)
-{
-	AT91S_DataFlashStatus status;
-
-	/* first send the read status command (D7H) */
-	pDesc->command[0] = DB_STATUS;
-	pDesc->command[1] = 0;
-
-	pDesc->DataFlash_state = GET_STATUS;
-    	pDesc->tx_data_size    = 0 ; /* Transmit the command and receive response */
-    	pDesc->tx_cmd_pt       = pDesc->command ;
-    	pDesc->rx_cmd_pt       = pDesc->command ;
-    	pDesc->rx_cmd_size     = 2 ;
-    	pDesc->tx_cmd_size     = 2 ;
-    	status = AT91F_SpiWrite (pDesc);
-
-	pDesc->DataFlash_state = *( (unsigned char *) (pDesc->rx_cmd_pt) +1);
-	return status;
-}
-
-/*-----------------------------------------------------------------------------
- * Function Name       : AT91F_DataFlashWaitReady
- * Object              : wait for dataflash ready (bit7 of the status register == 1)
- * Input Parameters    : DataFlash Service and timeout
- * Return value        : DataFlash status "ready or not"
- *-----------------------------------------------------------------------------
- */
-static AT91S_DataFlashStatus AT91F_DataFlashWaitReady(
-	AT91PS_DataflashDesc pDataFlashDesc,
-	unsigned int timeout)
-{
-	pDataFlashDesc->DataFlash_state = IDLE;
-        do {
-                AT91F_DataFlashGetStatus(pDataFlashDesc);
-                timeout--;
-        }
-        while(((pDataFlashDesc->DataFlash_state & 0x80) != 0x80) && (timeout > 0));
-
-        if((pDataFlashDesc->DataFlash_state & 0x80) != 0x80)
-                return AT91C_DATAFLASH_ERROR;
-
-        return AT91C_DATAFLASH_OK;
-}
-
-
-/*------------------------------------------------------------------------------*/
-/* Function Name       : AT91F_DataFlashContinuousRead                          */
-/* Object              : Continuous stream Read                                 */
-/* Input Parameters    : DataFlash Service                                      */
-/*                     : <src> = dataflash address                              */
-/*                     : <*dataBuffer> = data buffer pointer                    */
-/*                     : <sizeToRead> = data buffer size                        */
-/* Return value        : State of the dataflash                                 */
-/*------------------------------------------------------------------------------*/
-static AT91S_DataFlashStatus AT91F_DataFlashContinuousRead(
- 	AT91PS_DataFlash pDataFlash,
-	int src,
-	unsigned char *dataBuffer,
-	int sizeToRead )
-{
-	AT91S_DataFlashStatus status;
-	/* Test the size to read in the device */
-	if ( (src + sizeToRead) > (pDataFlash->pDevice->pages_size * (pDataFlash->pDevice->pages_number)))
-		return AT91C_DATAFLASH_MEMORY_OVERFLOW;
-
-	pDataFlash->pDataFlashDesc->rx_data_pt = dataBuffer;
-	pDataFlash->pDataFlashDesc->rx_data_size = sizeToRead;
-	pDataFlash->pDataFlashDesc->tx_data_pt = dataBuffer;
-	pDataFlash->pDataFlashDesc->tx_data_size = sizeToRead;
-	
-	status = AT91F_DataFlashSendCommand(pDataFlash, DB_CONTINUOUS_ARRAY_READ, 8, src);
-	/* Send the command to the dataflash */
-	return(status);
-}
-
-
-
-/*------------------------------------------------------------------------------*/
-/* Function Name       : AT91F_MainMemoryToBufferTransfer                       */
-/* Object              : Read a page in the SRAM Buffer 1 or 2                  */
-/* Input Parameters    : DataFlash Service                                      */
-/*                     : Page concerned                                         */
-/*                     :                                                        */
-/* Return value        : State of the dataflash                                 */
-/*------------------------------------------------------------------------------*/
-static AT91S_DataFlashStatus AT91F_MainMemoryToBufferTransfer(
-	AT91PS_DataFlash pDataFlash,
-	unsigned char BufferCommand,
-	unsigned int page)
-{
-	int cmdsize;
-	/* Test if the buffer command is legal */
-	if ((BufferCommand != DB_PAGE_2_BUF1_TRF) && (BufferCommand != DB_PAGE_2_BUF2_TRF))
-		return AT91C_DATAFLASH_BAD_COMMAND;
-
-	/* no data to transmit or receive */
-    	pDataFlash->pDataFlashDesc->tx_data_size = 0;
-	cmdsize = 4;
-	if (pDataFlash->pDevice->pages_number >= 16384)
-		cmdsize = 5;
-	return(AT91F_DataFlashSendCommand(pDataFlash, BufferCommand, cmdsize,
-	                                  page*pDataFlash->pDevice->pages_size));
-}
-
-
-
-/*----------------------------------------------------------------------------- */
-/* Function Name       : AT91F_DataFlashWriteBuffer                             */
-/* Object              : Write data to the internal sram buffer 1 or 2          */
-/* Input Parameters    : DataFlash Service                                      */
-/*                     : <BufferCommand> = command to write buffer1 or buffer2  */
-/*                     : <*dataBuffer> = data buffer to write                   */
-/*                     : <bufferAddress> = address in the internal buffer       */
-/*                     : <SizeToWrite> = data buffer size                       */
-/* Return value        : State of the dataflash                                 */
-/*------------------------------------------------------------------------------*/
-static AT91S_DataFlashStatus AT91F_DataFlashWriteBuffer(
-	AT91PS_DataFlash pDataFlash,
-	unsigned char BufferCommand,
-	unsigned char *dataBuffer,
-	unsigned int bufferAddress,
-	int SizeToWrite )
-{
-	int cmdsize;
-	/* Test if the buffer command is legal */
-	if ((BufferCommand != DB_BUF1_WRITE) && (BufferCommand != DB_BUF2_WRITE))
-		return AT91C_DATAFLASH_BAD_COMMAND;
-
-	/* buffer address must be lower than page size */
-	if (bufferAddress > pDataFlash->pDevice->pages_size)
-		return AT91C_DATAFLASH_BAD_ADDRESS;
-
-    	/* Send first Write Command */
-	pDataFlash->pDataFlashDesc->command[0] = BufferCommand;
-	pDataFlash->pDataFlashDesc->command[1] = 0;
-	if (pDataFlash->pDevice->pages_number >= 16384)
-	{
-	   	pDataFlash->pDataFlashDesc->command[2] = 0;
-	   	pDataFlash->pDataFlashDesc->command[3] = (unsigned char)(((unsigned int)(bufferAddress &  pDataFlash->pDevice->byte_mask)) >> 8) ;
-	   	pDataFlash->pDataFlashDesc->command[4] = (unsigned char)((unsigned int)bufferAddress  & 0x00FF) ;
-		cmdsize = 5;
-	}
-	else
-	{
-	   	pDataFlash->pDataFlashDesc->command[2] = (unsigned char)(((unsigned int)(bufferAddress &  pDataFlash->pDevice->byte_mask)) >> 8) ;
-	   	pDataFlash->pDataFlashDesc->command[3] = (unsigned char)((unsigned int)bufferAddress  & 0x00FF) ;
-	   	pDataFlash->pDataFlashDesc->command[4] = 0;
-		cmdsize = 4;
-	}
-		
-	pDataFlash->pDataFlashDesc->tx_cmd_pt 	 = pDataFlash->pDataFlashDesc->command ;
-	pDataFlash->pDataFlashDesc->tx_cmd_size  = cmdsize ;
-	pDataFlash->pDataFlashDesc->rx_cmd_pt 	 = pDataFlash->pDataFlashDesc->command ;
-	pDataFlash->pDataFlashDesc->rx_cmd_size  = cmdsize ;
-
-	pDataFlash->pDataFlashDesc->rx_data_pt 	 = dataBuffer ;
-	pDataFlash->pDataFlashDesc->tx_data_pt 	 = dataBuffer ;
-	pDataFlash->pDataFlashDesc->rx_data_size = SizeToWrite ;
-	pDataFlash->pDataFlashDesc->tx_data_size = SizeToWrite ;
-
-	return AT91F_SpiWrite(pDataFlash->pDataFlashDesc);
-}
-
-
-/*------------------------------------------------------------------------------*/
-/* Function Name       : AT91F_PageErase                                        */             
-/* Object              : Read a page in the SRAM Buffer 1 or 2                  */
-/* Input Parameters    : DataFlash Service                                      */
-/*                     : Page concerned                                         */
-/*                     :                                                        */
-/* Return value        : State of the dataflash                                 */
-/*------------------------------------------------------------------------------*/
-static AT91S_DataFlashStatus AT91F_PageErase(
-	AT91PS_DataFlash pDataFlash,
-	unsigned int page)
-{
-	int cmdsize;
-	/* Test if the buffer command is legal */	
-	/* no data to transmit or receive */
-    	pDataFlash->pDataFlashDesc->tx_data_size = 0;
-	
-	cmdsize = 4;
-	if (pDataFlash->pDevice->pages_number >= 16384)
-		cmdsize = 5;
-	return(AT91F_DataFlashSendCommand(pDataFlash, DB_PAGE_ERASE, cmdsize,
-	                                  page*pDataFlash->pDevice->pages_size));
-}
-
-
-/*------------------------------------------------------------------------------*/
-/* Function Name       : AT91F_WriteBufferToMain                                */
-/* Object              : Write buffer to the main memory                        */
-/* Input Parameters    : DataFlash Service                                      */
-/*                     : <BufferCommand> = command to send to buf1 or buf2      */
-/*                     : <dest> = main memory address                           */
-/* Return value        : State of the dataflash                                 */
-/*------------------------------------------------------------------------------*/
-static AT91S_DataFlashStatus AT91F_WriteBufferToMain (
-	AT91PS_DataFlash pDataFlash,
-	unsigned char BufferCommand,
-	unsigned int dest )
-{
-	int cmdsize;
-	/* Test if the buffer command is correct */
-	if ((BufferCommand != DB_BUF1_PAGE_PGM) &&
-	    (BufferCommand != DB_BUF1_PAGE_ERASE_PGM) &&
-	    (BufferCommand != DB_BUF2_PAGE_PGM) &&
-	    (BufferCommand != DB_BUF2_PAGE_ERASE_PGM) )
-		return AT91C_DATAFLASH_BAD_COMMAND;
-
-	/* no data to transmit or receive */
-	pDataFlash->pDataFlashDesc->tx_data_size = 0;
-
-	cmdsize = 4;
-	if (pDataFlash->pDevice->pages_number >= 16384)
-		cmdsize = 5;
-	/* Send the command to the dataflash */
-	return(AT91F_DataFlashSendCommand (pDataFlash, BufferCommand, cmdsize, dest));
-}
-
-
-/*------------------------------------------------------------------------------*/
-/* Function Name       : AT91F_PartialPageWrite                                 */
-/* Object              : Erase partially a page                                 */
-/* Input Parameters    : <page> = page number                                   */
-/*                     : <AdrInpage> = adr to begin the fading                  */
-/*                     : <length> = Number of bytes to erase                    */
-/*------------------------------------------------------------------------------*/
-static AT91S_DataFlashStatus AT91F_PartialPageWrite (
-	AT91PS_DataFlash pDataFlash,
-	unsigned char *src,
-	unsigned int dest,
-	unsigned int size)
-{
-	unsigned int page;
-	unsigned int AdrInPage;
-
-	page = dest / (pDataFlash->pDevice->pages_size);
-	AdrInPage = dest % (pDataFlash->pDevice->pages_size);
-
-	/* Read the contents of the page in the Sram Buffer */
-	AT91F_MainMemoryToBufferTransfer(pDataFlash, DB_PAGE_2_BUF1_TRF, page);
-	AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91C_DATAFLASH_TIMEOUT);
-	
-	/*Update the SRAM buffer */
-	AT91F_DataFlashWriteBuffer(pDataFlash, DB_BUF1_WRITE, src, AdrInPage, size);
-	AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91C_DATAFLASH_TIMEOUT);
-	
-	/* Erase page if a 128 Mbits device */
-	if (pDataFlash->pDevice->pages_number >= 16384)
-	{
-		AT91F_PageErase(pDataFlash, page);
-		AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91C_DATAFLASH_TIMEOUT);
-	}
-
-	/* Rewrite the modified Sram Buffer in the main memory */
-	return(AT91F_WriteBufferToMain(pDataFlash, DB_BUF1_PAGE_ERASE_PGM,
-	                               (page*pDataFlash->pDevice->pages_size)));
-}
-
-
-/*------------------------------------------------------------------------------*/
-/* Function Name       : AT91F_DataFlashWrite                                   */
-/* Object              :                                                        */
-/* Input Parameters    : <*src> = Source buffer                                 */
-/*                     : <dest> = dataflash adress                              */
-/*                     : <size> = data buffer size                              */
-/*------------------------------------------------------------------------------*/
-AT91S_DataFlashStatus AT91F_DataFlashWrite(
-	AT91PS_DataFlash pDataFlash,
-	unsigned char *src,
-	int dest,
-	int size )
-{
-	unsigned int length;
-	unsigned int page;
-	unsigned int status;
-
-	AT91F_SpiEnable(pDataFlash->pDevice->cs);
-
-	if ( (dest + size) > (pDataFlash->pDevice->pages_size * (pDataFlash->pDevice->pages_number)))
-		return AT91C_DATAFLASH_MEMORY_OVERFLOW;
-
-    	/* If destination does not fit a page start address */
-	if ((dest % ((unsigned int)(pDataFlash->pDevice->pages_size)))  != 0 ) {
-		length = pDataFlash->pDevice->pages_size - (dest % ((unsigned int)(pDataFlash->pDevice->pages_size)));
-
-		if (size < length)
-			length = size;
-
-		if(!AT91F_PartialPageWrite(pDataFlash,src, dest, length))
-			return AT91C_DATAFLASH_ERROR;
-
-		AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91C_DATAFLASH_TIMEOUT);
-
-		/* Update size, source and destination pointers */
-        	size -= length;
-        	dest += length;
-        	src += length;
-	}
-
-	while (( size - pDataFlash->pDevice->pages_size ) >= 0 ) 
-	{
-		/* program dataflash page */		
-		page = (unsigned int)dest / (pDataFlash->pDevice->pages_size);
-
-		status = AT91F_DataFlashWriteBuffer(pDataFlash, DB_BUF1_WRITE, src,
-		                                    0, pDataFlash->pDevice->pages_size);
-		AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91C_DATAFLASH_TIMEOUT);
-	
-		status = AT91F_PageErase(pDataFlash, page);
-		AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91C_DATAFLASH_TIMEOUT);
-		if (!status)
-			return AT91C_DATAFLASH_ERROR;
-		
-		status = AT91F_WriteBufferToMain (pDataFlash, DB_BUF1_PAGE_PGM, dest);
-		if(!status)
-			return AT91C_DATAFLASH_ERROR;
-
-		AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91C_DATAFLASH_TIMEOUT);
-	
-		/* Update size, source and destination pointers */
-	   	size -= pDataFlash->pDevice->pages_size ;
-	   	dest += pDataFlash->pDevice->pages_size ;
-	   	src  += pDataFlash->pDevice->pages_size ;
-	}
-
-	/* If still some bytes to read */
-	if ( size > 0 ) {
-		/* program dataflash page */
-		if(!AT91F_PartialPageWrite(pDataFlash, src, dest, size) )
-			return AT91C_DATAFLASH_ERROR;
-		AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91C_DATAFLASH_TIMEOUT);
-	}
-	return AT91C_DATAFLASH_OK;
-}
-
-
-/*------------------------------------------------------------------------------*/
-/* Function Name       : AT91F_DataFlashRead                                    */
-/* Object              : Read a block in dataflash                              */
-/* Input Parameters    :                                                        */
-/* Return value        :                                                        */
-/*------------------------------------------------------------------------------*/
-int AT91F_DataFlashRead(
-	AT91PS_DataFlash pDataFlash,
-	unsigned long addr,
-	unsigned long size,
-	char *buffer)
-{
-	unsigned long SizeToRead;
-
-	AT91F_SpiEnable(pDataFlash->pDevice->cs);
-
-	if(AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91C_DATAFLASH_TIMEOUT) != AT91C_DATAFLASH_OK)
-		return -1;
-
-	while (size)
-	{
-		SizeToRead = (size < 0x8000)? size:0x8000;
-
-		if (AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91C_DATAFLASH_TIMEOUT)
-		    != AT91C_DATAFLASH_OK)
-			return -1;
-
-		if (AT91F_DataFlashContinuousRead (pDataFlash, addr, (unsigned char *)buffer,
-		                                   SizeToRead) != AT91C_DATAFLASH_OK)
-			return -1;
-
-		size -= SizeToRead;
-		addr += SizeToRead;
-		buffer += SizeToRead;
-	}
-
-   	return AT91C_DATAFLASH_OK;
-}
-
-
-/*------------------------------------------------------------------------------*/
-/* Function Name       : AT91F_DataflashProbe                                   */
-/* Object              :                                                        */
-/* Input Parameters    :                                                        */
-/* Return value	       : Dataflash status register                              */
-/*------------------------------------------------------------------------------*/
-int AT91F_DataflashProbe(int cs, AT91PS_DataflashDesc pDesc)
-{
-	AT91F_SpiEnable(cs);
-   	AT91F_DataFlashGetStatus(pDesc);
-   	return ((pDesc->command[1] == 0xFF)? 0: (pDesc->command[1] & 0x3C));
-}
-
-/*------------------------------------------------------------------------------*/
-/* Function Name       : AT91F_DataFlashErase                                   */
-/* Object              :                                                        */
-/* Input Parameters    : <*pDataFlash> = Device info                            */
-/*------------------------------------------------------------------------------*/
-AT91S_DataFlashStatus AT91F_DataFlashErase(AT91PS_DataFlash pDataFlash)
-{
-	unsigned int page;
-	unsigned int status;
-
-	AT91F_SpiEnable(pDataFlash->pDevice->cs);
- 
- 	for(page=0; page < pDataFlash->pDevice->pages_number; page++)
-	    {
-		/* Erase dataflash page */
-		if ((page & 0x00FF) == 0)
-			printf("\rERA %d/%d", page, pDataFlash->pDevice->pages_number);
-		status = AT91F_PageErase(pDataFlash, page);
-		AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91C_DATAFLASH_TIMEOUT);
-		if (!status)
-			return AT91C_DATAFLASH_ERROR;
-   	}
-
-	return AT91C_DATAFLASH_OK;
-}
-
diff --git a/target/linux/at91/image/dfboot/src/com.c b/target/linux/at91/image/dfboot/src/com.c
deleted file mode 100644
index aacfb5555..000000000
--- a/target/linux/at91/image/dfboot/src/com.c
+++ /dev/null
@@ -1,368 +0,0 @@
-/*----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support  -  ROUSSET  -
- *----------------------------------------------------------------------------
- * The software is delivered "AS IS" without warranty or condition of any
- * kind, either express, implied or statutory. This includes without
- * limitation any warranty or condition with respect to merchantability or
- * fitness for any particular purpose, or against the infringements of
- * intellectual property rights of others.
- *----------------------------------------------------------------------------
- * File Name           : com.c
- * Object              : 
- * Creation            : HIi   03/27/2003
- *
- *----------------------------------------------------------------------------
- */
-#include "AT91RM9200.h"
-#include "lib_AT91RM9200.h"
-#include "config.h"
-#include "com.h"
-#include "stdio.h"
-
-static char erase_seq[] = "\b \b";		/* erase sequence	*/
-
-#define MAX_UARTS 1
-
-//unsigned int usa[2] = {(unsigned int)AT91C_BASE_DBGU, (unsigned int)AT91C_ALTERNATE_USART};
-unsigned int usa[1] = {(unsigned int)AT91C_BASE_DBGU};
-unsigned int us;
-int port_detected;
-
-void at91_init_uarts(void)
-{
-	int i;
-
-	port_detected = 0;
-	AT91F_DBGU_CfgPIO();
-	AT91F_US0_CfgPIO();
-	AT91F_US0_CfgPMC();
-
-	for(i=0; i<MAX_UARTS; i++) {
-		us = usa[i];
-		AT91F_US_ResetRx((AT91PS_USART)us);
-		AT91F_US_ResetTx((AT91PS_USART)us);
-
-		// Configure DBGU
-		AT91F_US_Configure(
-			(AT91PS_USART)us, // DBGU base address
-			AT91C_MASTER_CLOCK,            // 60 MHz
-			AT91C_US_ASYNC_MODE,           // mode Register to be programmed
-			115200,                        // baudrate to be programmed
-			0                              // timeguard to be programmed
-			);
-
-		// Enable Transmitter
-		AT91F_US_EnableTx((AT91PS_USART)us);
-		// Enable Receiver
-		AT91F_US_EnableRx((AT91PS_USART)us);
-	}
-	us = usa[0];
-}
-
-int at91_serial_putc(int ch)
-{
-	if (ch == '\n')
-		at91_serial_putc('\r');
-	while (!AT91F_US_TxReady((AT91PS_USART)us));
-	AT91F_US_PutChar((AT91PS_USART)us, (char)ch);
-	return ch;
-}
-
-/* This getc is modified to be able work on more than one port. On certain
- * boards (i.e. Figment Designs VersaLink), the debug port is not available
- * once the unit is in it's enclosure, so, if one needs to get into dfboot
- * for any reason it is impossible. With this getc, it scans between the debug
- * port and another port and once it receives a character, it sets that port
- * as the debug port. */
-int at91_serial_getc()
-{
-	while(1) {
-#if 0
-		if (!port_detected) {
-			if (us == usa[0]) {
-				us = usa[1];
-			}
-			else {
-				us = usa[0];
-			}
-		}
-#endif
-		if(AT91F_US_RxReady((AT91PS_USART)us)) {
-#if 0
-			port_detected = 1;
-#endif
-			return((int)AT91F_US_GetChar((AT91PS_USART)us));
-		}
-	}
-}
-
-/*-----------------------------------------------------------------------------
- * Function Name       : AT91F_ReadLine()
- * Object              : 
- * Input Parameters    : 
- * Return value		: 
- *-----------------------------------------------------------------------------
- */
-int AT91F_ReadLine (const char *const prompt, char *console_buffer)
-{
-	char *p = console_buffer;
-	int	n = 0;					/* buffer index		*/
-	int	plen = strlen (prompt);	/* prompt length	*/
-	int	col;					/* output column cnt	*/
-	char	c;
-
-	/* print prompt */
-	if (prompt)
-		printf(prompt);
-	col = plen;
-
-	for (;;) {
-		c = getc();
-
-		switch (c) {
-			case '\r':				/* Enter		*/
-			case '\n':
-				*p = '\0';
-				puts ("\n");
-				return (p - console_buffer);
-
-			case 0x03:				/* ^C - break	*/
-				console_buffer[0] = '\0';	/* discard input */
-				return (-1);
-
-			case 0x08:				/* ^H  - backspace	*/
-			case 0x7F:				/* DEL - backspace	*/
-				if (n) {
-					--p;
-					printf(erase_seq);
-					col--;
-					n--;
-					}
-				continue;
-
-			default:
-			/*
-			 * Must be a normal character then
-			 */
-			if (n < (AT91C_CB_SIZE -2)) 
-			{
-				++col;		/* echo input		*/
-				putc(c);
-				*p++ = c;
-				++n;
-			} 
-			else 
-			{			/* Buffer full		*/
-				putc('\a');
-			}
-		}
-	}
-}
-
-
-/*-----------------------------------------------------------------------------
- * Function Name       : AT91F_WaitKeyPressed()
- * Object              : 
- * Input Parameters    : 
- * Return value		: 
- *-----------------------------------------------------------------------------
- */
-void AT91F_WaitKeyPressed(void)
-{
-	int c;
-    	puts("KEY");
-		c = getc();
-	putc('\n');
-}
-
-int puts(const char *str)
-{
-  while(*str != 0) {
-		at91_serial_putc(*str);
-		str++;
-		}
-	return 1;
-}
-
-int putc(int c)
-{
-  return at91_serial_putc(c);
-}
-
-int putchar(c)
-{
-	return putc(c);
-}
-
-int getc()
-{
-  return at91_serial_getc();
-}
-
-int strlen(const char *str)
-{
-  int len = 0;
-
-  if(str == (char *)0)
-    return 0;
-
-  while(*str++ != 0)
-    len++;
-
-  return len;
-}
-
-#define ZEROPAD 1               /* pad with zero */
-#define SIGN    2               /* unsigned/signed long */
-#define LEFT    4              /* left justified */
-#define LARGE   8              /* use 'ABCDEF' instead of 'abcdef' */
-
-#define do_div(n,base) ({ \
-        int __res; \
-        __res = ((unsigned) n) % (unsigned) base; \
-        n = ((unsigned) n) / (unsigned) base; \
-        __res; \
-})
-
-static int number(int num, int base, int size,
-                  int precision, int type)
-{
-  char c, sign, tmp[66];
-  const char *digits="0123456789ABCDEF";
-  int i;
-
-  if (type & LEFT)
-    type &= ~ZEROPAD;
-  if (base < 2 || base > 16)
-    return 0;
-  c = (type & ZEROPAD) ? '0' : ' ';
-  sign = 0;
-
-  if(type & SIGN && num < 0)
-    {
-      sign = '-';
-      num = -num;
-      size--;
-    }
-  
-  i = 0;
-  if(num == 0)
-    tmp[i++] = digits[0];
-  else while(num != 0)
-    tmp[i++] = digits[do_div(num, base)];
-
-  if(i > precision)
-    precision = i;
-  size -= precision;
-  
-  if(!(type&(ZEROPAD+LEFT)))
-    while(size-->0)
-      putc(' ');
-  
-  if(sign)
-    putc(sign);
-
-  if (!(type & LEFT))
-    while (size-- > 0)
-      putc(c);
-
-  while (i < precision--)
-    putc('0');
-  
-  while (i-- > 0)
-    putc(tmp[i]);
-
-  while (size-- > 0)
-    putc(' ');;
-
-  return 1;
-}
-
-int hvfprintf(const char *fmt, va_list va)
-{
-  char *s;
-
-	do {
-		if(*fmt == '%')	{
-			bool done = false;
-
-			int type = 0;
-			int precision = 0;
-
-			do {
-				fmt++;
-				switch(*fmt) {
-				case '0' :
-					if(!precision)
-						type |= ZEROPAD;
-				case '1' :
-				case '2' :
-				case '3' :
-				case '4' :
-				case '5' :
-				case '6' :
-				case '7' :
-				case '8' :
-				case '9' :
-					precision = precision * 10 + (*fmt - '0');
-					break;
-				case '.' :
-					break;
-				case 's' :
-					s = va_arg(va, char *);
-					if(!s)
-						puts("<NULL>");
-					else
-						puts(s);
-					done = true;
-					break;
-				case 'c' :
-					putc(va_arg(va, int));
-					done = true;
-					break;
-				case 'd' :
-					number(va_arg(va, int), 10, 0, precision, type);
-					done = true;
-					break;
-				case 'x' :
-				case 'X' :
-					number(va_arg(va, int), 16, 0, precision, type);
-					done = true;
-					break;
-				case '%' :
-					putc(*fmt);
-					done = true;
-				default: 
-					putc('%');
-					putc(*fmt);
-					done = true;
-					break;
-				} 
-			} while(!done);
-		} else if(*fmt == '\\') {
-			fmt++;
-			if(*fmt == 'r') {
-				putc('\r');
-			} else if(*fmt == 'n') { 
-				putc('\n');
-			}
-        	} else {
-         		putc(*fmt);
-        	}
-		fmt++;
-	} while(*fmt != 0);
-  
-  return 0;
-}
-
-int printf(const char *fmt, ...)
-{
-  va_list ap;
-  int i;
-
-  va_start(ap, fmt);
-  i = hvfprintf(fmt, ap);
-  va_end(ap);
-
-  return i;
-}
diff --git a/target/linux/at91/image/dfboot/src/com.h b/target/linux/at91/image/dfboot/src/com.h
deleted file mode 100644
index 7af09e4d6..000000000
--- a/target/linux/at91/image/dfboot/src/com.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*----------------------------------------------------------------------------
- *      ATMEL Microcontroller Software Support  -  ROUSSET  -
- *----------------------------------------------------------------------------
- * The software is delivered "AS IS" without warranty or condition of any
- * kind, either express, implied or statutory. This includes without
- * limitation any warranty or condition with respect to merchantability or
- * fitness for any particular purpose, or against the infringements of
- * intellectual property rights of others.
- *----------------------------------------------------------------------------
- * File Name           : com.h
- * Object              : 
- *
- * 1.0 27/03/03 HIi    : Creation
- *----------------------------------------------------------------------------
- */
-#ifndef com_h
-#define com_h
-
-#define AT91C_CB_SIZE 20 /* size of the console buffer */
-
-/* Escape sequences */
-#define ESC \033
-
-extern int AT91F_ReadLine (const char *const prompt, char *console_buffer);
-extern void AT91F_WaitKeyPressed(void);
-
-#endif
-
diff --git a/target/linux/at91/image/dfboot/src/config.h b/target/linux/at91/image/dfboot/src/config.h
deleted file mode 100644
index 3be8d499a..000000000
--- a/target/linux/at91/image/dfboot/src/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-
-#ifndef _CONFIG_H
-#define _CONFIG_H
-
-//#define	PAGESZ_1056			1
-#undef PAGESZ_1056
-#define	SPI_LOW_SPEED			1
-#define AT91C_DELAY_TO_BOOT 		1500
-
-#define	CRC_RETRIES			0x100
-
-#define AT91C_MASTER_CLOCK              59904000
-#define AT91C_BAUD_RATE                 115200
-
-#define AT91C_ALTERNATE_USART	AT91C_BASE_US0
-
-#endif
diff --git a/target/linux/at91/image/dfboot/src/cstartup_ram.S b/target/linux/at91/image/dfboot/src/cstartup_ram.S
deleted file mode 100644
index 223900098..000000000
--- a/target/linux/at91/image/dfboot/src/cstartup_ram.S
+++ /dev/null
@@ -1,144 +0,0 @@
-#include "AT91RM9200_inc.h"
-		
-/*---------------------------
-ARM Core Mode and Status Bits
----------------------------*/
-.section start
-	.text
-			
-#define ARM_MODE_USER   0x10
-#define ARM_MODE_FIQ    0x11
-#define ARM_MODE_IRQ    0x12
-#define ARM_MODE_SVC    0x13
-#define ARM_MODE_ABORT  0x17
-#define ARM_MODE_UNDEF  0x1B
-#define ARM_MODE_SYS    0x1F
-
-#define I_BIT           0x80
-#define F_BIT           0x40
-#define T_BIT           0x20
-
-/*----------------------------------------------------------------------------
- Area Definition
-----------------
- Must be defined as function to put first in the code as it must be mapped
- at offset 0 of the flash EBI_CSR0, ie. at address 0 before remap.
-_---------------------------------------------------------------------------*/
-
-  .align  4
-	.globl _start
-_start:
-
-/*----------------------------------------------------------------------------
- Exception vectors ( before Remap )
-------------------------------------
- These vectors are read at address 0.
- They absolutely requires to be in relative addresssing mode in order to
- guarantee a valid jump. For the moment, all are just looping (what may be
- dangerous in a final system). If an exception occurs before remap, this
- would result in an infinite loop.
-----------------------------------------------------------------------------*/
-                b           reset			       	/* reset */
-                b           undefvec        	/* Undefined Instruction */
-                b           swivec          	/* Software Interrupt */
-                b           pabtvec         	/* Prefetch Abort */
-                b           dabtvec         	/* Data Abort */
-                b           rsvdvec         	/* reserved */
-                b           aicvec				    /* IRQ : read the AIC */
-                b           fiqvec          	/* FIQ */
-
-undefvec:
-swivec:
-pabtvec:
-dabtvec:
-rsvdvec:
-aicvec:
-fiqvec:
-	b	undefvec
-
-reset:
-
-#define MEMEND 0x00004000
-
-/* ----------------------------
- Setup the stack for each mode
----------------------------- */
-
-#define IRQ_STACK_SIZE  0x10
-#define FIQ_STACK_SIZE  0x04
-#define ABT_STACK_SIZE  0x04
-#define UND_STACK_SIZE  0x04
-#define SVC_STACK_SIZE  0x10
-#define USER_STACK_SIZE 0x400
-	
-                ldr     r0,= MEMEND
-
-/*- Set up Supervisor Mode and set Supervisor Mode Stack*/
-                msr     CPSR_c, #ARM_MODE_SVC | I_BIT | F_BIT
-                mov     r13, r0                     /* Init stack Undef*/
-                sub     r0, r0, #SVC_STACK_SIZE
-
-/*- Set up Interrupt Mode and set IRQ Mode Stack*/
-                msr     CPSR_c, #ARM_MODE_IRQ | I_BIT | F_BIT
-                mov     r13, r0                     /* Init stack IRQ*/
-                sub     r0, r0, #IRQ_STACK_SIZE
-
-/*- Set up Fast Interrupt Mode and set FIQ Mode Stack*/
-                msr     CPSR_c, #ARM_MODE_FIQ | I_BIT | F_BIT
-                mov     r13, r0                     /* Init stack FIQ*/
-                sub     r0, r0, #FIQ_STACK_SIZE
-
-/*- Set up Abort Mode and set Abort Mode Stack*/
-                msr     CPSR_c, #ARM_MODE_ABORT | I_BIT | F_BIT
-                mov     r13, r0                     /* Init stack Abort*/
-                sub     r0, r0, #ABT_STACK_SIZE
-
-/*- Set up Undefined Instruction Mode and set Undef Mode Stack*/
-                msr     CPSR_c, #ARM_MODE_UNDEF | I_BIT | F_BIT
-                mov     r13, r0                     /* Init stack Undef*/
-                sub     r0, r0, #UND_STACK_SIZE
-
-/*- Set up user Mode and set System Mode Stack*/
-                msr     CPSR_c, #ARM_MODE_SYS | I_BIT | F_BIT
-                bic     r0, r0, #3                  /* Insure word alignement */
-               	mov     sp, r0                      /* Init stack System */
-
-
-		ldr       r0, = AT91F_LowLevelInit
-		mov       lr, pc
-		bx        r0
-
-/*----------------------------------------
- Read/modify/write CP15 control register
-----------------------------------------*/
-		mrc     p15, 0, r0, c1, c0,0  /* read cp15 control registre (cp15 r1) in r0 */
-		ldr     r3,= 0xC0000080      /* Reset bit :Little Endian end fast bus mode */
-		ldr     r4,= 0xC0001000      /* Set bit :Asynchronous clock mode, Not Fast Bus, I-Cache enable */
-		bic     r0, r0, r3
-		orr     r0, r0, r4
-		mcr     p15, 0, r0, c1, c0,0 /* write r0 in cp15 control registre (cp15 r1) */
-
-/* Enable interrupts */
-		msr     CPSR_c, #ARM_MODE_SYS | F_BIT
-
-/*------------------------------------------------------------------------------
-- Branch on C code Main function (with interworking)
-----------------------------------------------------
-- Branch must be performed by an interworking call as either an ARM or Thumb
-- _start function must be supported. This makes the code not position-
-- independent. A Branch with link would generate errors
-----------------------------------------------------------------------------*/
-	
-/*- Branch to _start by interworking*/
-		ldr     r4, = main
-	        mov     lr, pc
-	        bx      r4
-	
-/*-----------------------------------------------------------------------------
-- Loop for ever
----------------
-- End of application. Normally, never occur.
-- Could jump on Software Reset ( B 0x0 ).
-------------------------------------------------------------------------------*/
-End:
-	        b       End
diff --git a/target/linux/at91/image/dfboot/src/dataflash.c b/target/linux/at91/image/dfboot/src/dataflash.c
deleted file mode 100644
index 5e54460b7..000000000
--- a/target/linux/at91/image/dfboot/src/dataflash.c
+++ /dev/null
@@ -1,208 +0,0 @@
-/*----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support  -  ROUSSET  -
- *----------------------------------------------------------------------------
- * The software is delivered "AS IS" without warranty or condition of any
- * kind, either express, implied or statutory. This includes without
- * limitation any warranty or condition with respect to merchantability or
- * fitness for any particular purpose, or against the infringements of
- * intellectual property rights of others.
- *----------------------------------------------------------------------------
- * File Name           : dataflash.c
- * Object              : High level functions for the dataflash
- * Creation            : HIi   10/10/2003
- *----------------------------------------------------------------------------
- */
-#include "config.h"
-#include "stdio.h"
-#include "dataflash.h"
-
-
-AT91S_DATAFLASH_INFO dataflash_info[CFG_MAX_DATAFLASH_BANKS];
-static AT91S_DataFlash DataFlashInst;
-
-int cs[][CFG_MAX_DATAFLASH_BANKS] = {
-	{CFG_DATAFLASH_LOGIC_ADDR_CS0, 0},	/* Logical adress, CS */
-	{CFG_DATAFLASH_LOGIC_ADDR_CS3, 3}
-};
-
-int AT91F_DataflashInit(void)
-{
-	int i;
-	int dfcode;
-	int Nb_device = 0;
-		
-	AT91F_SpiInit();
-
-	for (i = 0; i < CFG_MAX_DATAFLASH_BANKS; i++) {
-		dataflash_info[i].id = 0;
-		dataflash_info[i].Device.pages_number = 0;
-		dfcode = AT91F_DataflashProbe (cs[i][1], &dataflash_info[i].Desc);
-
-		switch (dfcode) {
-		case AT45DB161:
-			dataflash_info[i].Device.pages_number = 4096;
-			dataflash_info[i].Device.pages_size = 528;
-			dataflash_info[i].Device.page_offset = 10;
-			dataflash_info[i].Device.byte_mask = 0x300;
-			dataflash_info[i].Device.cs = cs[i][1];
-			dataflash_info[i].Desc.DataFlash_state = IDLE;
-			dataflash_info[i].logical_address = cs[i][0];
-			dataflash_info[i].id = dfcode;
-			Nb_device++;
-			break;
-
-		case AT45DB321:
-			dataflash_info[i].Device.pages_number = 8192;
-			dataflash_info[i].Device.pages_size = 528;
-			dataflash_info[i].Device.page_offset = 10;
-			dataflash_info[i].Device.byte_mask = 0x300;
-			dataflash_info[i].Device.cs = cs[i][1];
-			dataflash_info[i].Desc.DataFlash_state = IDLE;
-			dataflash_info[i].logical_address = cs[i][0];
-			dataflash_info[i].id = dfcode;
-			Nb_device++;
-			break;
-
-		case AT45DB642:
-			dataflash_info[i].Device.pages_number = 8192;
-			dataflash_info[i].Device.pages_size = 1056;
-			dataflash_info[i].Device.page_offset = 11;
-			dataflash_info[i].Device.byte_mask = 0x700;
-			dataflash_info[i].Device.cs = cs[i][1];
-			dataflash_info[i].Desc.DataFlash_state = IDLE;
-			dataflash_info[i].logical_address = cs[i][0];
-			dataflash_info[i].id = dfcode;
-			Nb_device++;
-			break;
-		case AT45DB128:
-			dataflash_info[i].Device.pages_number = 16384;
-			dataflash_info[i].Device.pages_size = 1056;
-			dataflash_info[i].Device.page_offset = 11;
-			dataflash_info[i].Device.byte_mask = 0x700;
-			dataflash_info[i].Device.cs = cs[i][1];
-			dataflash_info[i].Desc.DataFlash_state = IDLE;
-			dataflash_info[i].logical_address = cs[i][0];
-			dataflash_info[i].id = dfcode;
-			Nb_device++;
-			break;
-		default:
-			break;
-		}
-	}			
-	return (Nb_device);
-}
-
-
-void AT91F_DataflashPrintInfo(void)
-{
-	int i;
-	for (i = 0; i < CFG_MAX_DATAFLASH_BANKS; i++) {
-		if (dataflash_info[i].id != 0) {
-			printf ("DF:AT45DB");
-			switch (dataflash_info[i].id) {
-			case AT45DB161:
-				printf ("161");
-				break;
-
-			case AT45DB321:
-				printf ("321");
-				break;
-
-			case AT45DB642:
-				printf ("642");
-				break;
-			case AT45DB128:				
-				printf ("128");
-				break;
-			}
-
-			printf ("\n# PG: %6d\n"
-				"PG SZ: %6d\n"
-				"SZ=%8d bytes\n"
-				"ADDR: %08X\n",
-				(unsigned int) dataflash_info[i].Device.pages_number,
-				(unsigned int) dataflash_info[i].Device.pages_size,
-				(unsigned int) dataflash_info[i].Device.pages_number *
-				dataflash_info[i].Device.pages_size,
-				(unsigned int) dataflash_info[i].logical_address);
-		}
-	}
-}
-
-
-/*------------------------------------------------------------------------------*/
-/* Function Name       : AT91F_DataflashSelect                                  */
-/* Object              : Select the correct device                              */
-/*------------------------------------------------------------------------------*/
-static AT91PS_DataFlash AT91F_DataflashSelect(AT91PS_DataFlash pFlash,
-                                              unsigned int *addr)
-{
-	char addr_valid = 0;
-	int i;
-
-	for (i = 0; i < CFG_MAX_DATAFLASH_BANKS; i++)
-		if ((*addr & 0xFF000000) == dataflash_info[i].logical_address) {
-			addr_valid = 1;
-			break;
-		}
-	if (!addr_valid) {
-		pFlash = (AT91PS_DataFlash) 0;
-		return pFlash;
-	}
-	pFlash->pDataFlashDesc = &(dataflash_info[i].Desc);
-	pFlash->pDevice = &(dataflash_info[i].Device);
-	*addr -= dataflash_info[i].logical_address;
-	return (pFlash);
-}
-
-
-/*------------------------------------------------------------------------------*/
-/* Function Name       : read_dataflash                                         */
-/* Object              : dataflash memory read                                  */
-/*------------------------------------------------------------------------------*/
-int read_dataflash(unsigned long addr, unsigned long size, char *result)
-{
-	unsigned int AddrToRead = addr;
-	AT91PS_DataFlash pFlash = &DataFlashInst;
-
-	pFlash = AT91F_DataflashSelect (pFlash, &AddrToRead);
-	if (pFlash == 0)
-		return -1;
-
-	return (AT91F_DataFlashRead(pFlash, AddrToRead, size, result));
-}
-
-
-/*-----------------------------------------------------------------------------*/
-/* Function Name       : write_dataflash                                       */
-/* Object              : write a block in dataflash                            */
-/*-----------------------------------------------------------------------------*/
-int write_dataflash(unsigned long addr_dest, unsigned int addr_src,
-                    unsigned int size)
-{
-	unsigned int AddrToWrite = addr_dest;
-	AT91PS_DataFlash pFlash = &DataFlashInst;
-
-	pFlash = AT91F_DataflashSelect(pFlash, &AddrToWrite);
-	if (AddrToWrite == -1)
-		return -1;
-
-	return AT91F_DataFlashWrite(pFlash, (unsigned char *) addr_src, AddrToWrite, size);
-}
-
-/*-----------------------------------------------------------------------------*/
-/* Function Name       : erase_dataflash                                       */
-/* Object              : Erase entire dataflash                                */
-/*-----------------------------------------------------------------------------*/
-int erase_dataflash(unsigned long addr_dest)
-{
-	unsigned int AddrToWrite = addr_dest;
-	AT91PS_DataFlash pFlash = &DataFlashInst;
-
-	pFlash = AT91F_DataflashSelect (pFlash, &AddrToWrite);
-	if (AddrToWrite == -1)
-		return -1;
-
-	return AT91F_DataFlashErase(pFlash);
-}
-
diff --git a/target/linux/at91/image/dfboot/src/dataflash.h b/target/linux/at91/image/dfboot/src/dataflash.h
deleted file mode 100644
index 8fab63fa9..000000000
--- a/target/linux/at91/image/dfboot/src/dataflash.h
+++ /dev/null
@@ -1,181 +0,0 @@
-//*---------------------------------------------------------------------------
-//*         ATMEL Microcontroller Software Support  -  ROUSSET  -
-//*---------------------------------------------------------------------------
-//* The software is delivered "AS IS" without warranty or condition of any
-//* kind, either express, implied or statutory. This includes without
-//* limitation any warranty or condition with respect to merchantability or
-//* fitness for any particular purpose, or against the infringements of
-//* intellectual property rights of others.
-//*---------------------------------------------------------------------------
-//* File Name           : AT91_SpiDataFlash.h
-//* Object              : Data Flash Atmel Description File
-//* Translator          :
-//*
-//* 1.0 03/04/01 HI	: Creation
-//*
-//*---------------------------------------------------------------------------
-
-#ifndef _DataFlash_h
-#define _DataFlash_h
-
-/* Max value = 15Mhz to be compliant with the Continuous array read function */
-#ifdef	SPI_LOW_SPEED
-#define AT91C_SPI_CLK 14976000/4
-#else
-#define AT91C_SPI_CLK 14976000 
-#endif
-
-/* AC characteristics */
-/* DLYBS = tCSS= 250ns min and DLYBCT = tCSH = 250ns */
-
-#define DATAFLASH_TCSS (0xf << 16)	/* 250ns 15/60000000 */
-#define DATAFLASH_TCHS (0x1 << 24)	/* 250ns 32*1/60000000 */
-
-
-#define AT91C_SPI_PCS0_SERIAL_DATAFLASH		0xE     /* Chip Select 0 : NPCS0 %1110 */
-#define AT91C_SPI_PCS3_DATAFLASH_CARD		0x7     /* Chip Select 3 : NPCS3 %0111 */
-
-#define CFG_MAX_DATAFLASH_BANKS 	    2
-#define CFG_DATAFLASH_LOGIC_ADDR_CS0	0xC0000000
-#define CFG_DATAFLASH_LOGIC_ADDR_CS3	0xD0000000
-
-typedef struct {
-	unsigned long base;		/* logical base address for a bank */
-	unsigned long size;		/* total bank size */
-	unsigned long page_count;
-	unsigned long page_size;
-	unsigned long id;		/* device id */
-} dataflash_info_t;
-
-typedef unsigned int AT91S_DataFlashStatus;
-
-/*----------------------------------------------------------------------*/
-/* DataFlash Structures							*/
-/*----------------------------------------------------------------------*/
-
-/*---------------------------------------------*/
-/* DataFlash Descriptor Structure Definition   */
-/*---------------------------------------------*/
-typedef struct _AT91S_DataflashDesc {
-	unsigned char *tx_cmd_pt;
-	unsigned int tx_cmd_size;
-	unsigned char *rx_cmd_pt;
-	unsigned int rx_cmd_size;
-	unsigned char *tx_data_pt;
-	unsigned int tx_data_size;
-	unsigned char *rx_data_pt;
-	unsigned int rx_data_size;
-	volatile unsigned char DataFlash_state;
-	unsigned char command[8];
-} AT91S_DataflashDesc, *AT91PS_DataflashDesc;
-
-/*---------------------------------------------*/
-/* DataFlash device definition structure       */
-/*---------------------------------------------*/
-typedef struct _AT91S_Dataflash {
-	int pages_number;			/* dataflash page number */
-	int pages_size;				/* dataflash page size */
-	int page_offset;			/* page offset in command */
-	int byte_mask;				/* byte mask in command */
-	int cs;
-} AT91S_DataflashFeatures, *AT91PS_DataflashFeatures;
-
-
-/*---------------------------------------------*/
-/* DataFlash Structure Definition	       */
-/*---------------------------------------------*/
-typedef struct _AT91S_DataFlash {
-	AT91PS_DataflashDesc pDataFlashDesc;	/* dataflash descriptor */
-	AT91PS_DataflashFeatures pDevice;	/* Pointer on a dataflash features array */
-} AT91S_DataFlash, *AT91PS_DataFlash;
-
-
-typedef struct _AT91S_DATAFLASH_INFO {
-
-	AT91S_DataflashDesc 	Desc;
-	AT91S_DataflashFeatures Device; /* Pointer on a dataflash features array */
-	unsigned long 			logical_address;
-	unsigned int 			id;			/* device id */
-} AT91S_DATAFLASH_INFO, *AT91PS_DATAFLASH_INFO;
-
-
-/*-------------------------------------------------------------------------------------------------*/
-
-#define AT45DB161		0x2c
-#define AT45DB321		0x34
-#define AT45DB642		0x3c
-#define AT45DB128		0x10
-
-#define AT91C_DATAFLASH_TIMEOUT			20000	/* For AT91F_DataFlashWaitReady */
-
-/* DataFlash return value */
-#define AT91C_DATAFLASH_BUSY			0x00
-#define AT91C_DATAFLASH_OK			0x01
-#define AT91C_DATAFLASH_ERROR			0x02
-#define AT91C_DATAFLASH_MEMORY_OVERFLOW		0x03
-#define AT91C_DATAFLASH_BAD_COMMAND		0x04
-#define AT91C_DATAFLASH_BAD_ADDRESS		0x05
-
-
-/* Driver State */
-#define IDLE		0x0
-#define BUSY		0x1
-#define ERROR		0x2
-
-/* DataFlash Driver State */
-#define GET_STATUS	0x0F
-
-/*-------------------------------------------------------------------------------------------------*/
-/* Command Definition										   */
-/*-------------------------------------------------------------------------------------------------*/
-
-/* READ COMMANDS */
-#define DB_CONTINUOUS_ARRAY_READ	0xE8	/* Continuous array read */
-#define DB_BURST_ARRAY_READ		0xE8	/* Burst array read */
-#define DB_PAGE_READ			0xD2	/* Main memory page read */
-#define DB_BUF1_READ			0xD4	/* Buffer 1 read */
-#define DB_BUF2_READ			0xD6	/* Buffer 2 read */
-#define DB_STATUS			0xD7	/* Status Register */
-
-/* PROGRAM and ERASE COMMANDS */
-#define DB_BUF1_WRITE			0x84	/* Buffer 1 write */
-#define DB_BUF2_WRITE			0x87	/* Buffer 2 write */
-#define DB_BUF1_PAGE_ERASE_PGM		0x83	/* Buffer 1 to main memory page program with built-In erase */
-#define DB_BUF1_PAGE_ERASE_FASTPGM	0x93	/* Buffer 1 to main memory page program with built-In erase, Fast program */
-#define DB_BUF2_PAGE_ERASE_PGM		0x86	/* Buffer 2 to main memory page program with built-In erase */
-#define DB_BUF2_PAGE_ERASE_FASTPGM	0x96	/* Buffer 1 to main memory page program with built-In erase, Fast program */
-#define DB_BUF1_PAGE_PGM		0x88	/* Buffer 1 to main memory page program without built-In erase */
-#define DB_BUF1_PAGE_FASTPGM		0x98	/* Buffer 1 to main memory page program without built-In erase, Fast program */
-#define DB_BUF2_PAGE_PGM		0x89	/* Buffer 2 to main memory page program without built-In erase */
-#define DB_BUF2_PAGE_FASTPGM		0x99	/* Buffer 1 to main memory page program without built-In erase, Fast program */
-#define DB_PAGE_ERASE			0x81	/* Page Erase */
-#define DB_BLOCK_ERASE			0x50	/* Block Erase */
-#define DB_PAGE_PGM_BUF1		0x82	/* Main memory page through buffer 1 */
-#define DB_PAGE_FASTPGM_BUF1		0x92	/* Main memory page through buffer 1, Fast program */
-#define DB_PAGE_PGM_BUF2		0x85	/* Main memory page through buffer 2 */
-#define DB_PAGE_FastPGM_BUF2		0x95	/* Main memory page through buffer 2, Fast program */
-
-/* ADDITIONAL COMMANDS */
-#define DB_PAGE_2_BUF1_TRF		0x53	/* Main memory page to buffer 1 transfert */
-#define DB_PAGE_2_BUF2_TRF		0x55	/* Main memory page to buffer 2 transfert */
-#define DB_PAGE_2_BUF1_CMP		0x60	/* Main memory page to buffer 1 compare */
-#define DB_PAGE_2_BUF2_CMP		0x61	/* Main memory page to buffer 2 compare */
-#define DB_AUTO_PAGE_PGM_BUF1		0x58	/* Auto page rewrite throught buffer 1 */
-#define DB_AUTO_PAGE_PGM_BUF2		0x59	/* Auto page rewrite throught buffer 2 */
-
-/*-------------------------------------------------------------------------------------------------*/
-
-extern AT91S_DATAFLASH_INFO dataflash_info[CFG_MAX_DATAFLASH_BANKS];
-
-extern void AT91F_SpiInit(void);
-extern int AT91F_DataflashProbe(int i, AT91PS_DataflashDesc pDesc);
-extern int AT91F_DataFlashRead(AT91PS_DataFlash, unsigned long , unsigned long, char *);
-extern AT91S_DataFlashStatus AT91F_DataFlashWrite(AT91PS_DataFlash ,unsigned char *, int, int);
-extern AT91S_DataFlashStatus AT91F_DataFlashErase(AT91PS_DataFlash pDataFlash);
-extern int AT91F_DataflashInit(void);
-extern void AT91F_DataflashPrintInfo(void);
-extern int read_dataflash(unsigned long addr, unsigned long size, char *result);
-extern int write_dataflash(unsigned long addr_dest, unsigned int addr_src, unsigned int size);
-extern int erase_dataflash(unsigned long addr_dest);
-
-#endif
diff --git a/target/linux/at91/image/dfboot/src/div0.c b/target/linux/at91/image/dfboot/src/div0.c
deleted file mode 100644
index d6fd90ec3..000000000
--- a/target/linux/at91/image/dfboot/src/div0.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * (C) Copyright 2002
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-/* Replacement (=dummy) for GNU/Linux division-by zero handler */
-void __div0 (void)
-{
-	while(-1);
-}
diff --git a/target/linux/at91/image/dfboot/src/elf32-littlearm.lds b/target/linux/at91/image/dfboot/src/elf32-littlearm.lds
deleted file mode 100644
index 4d4efb6ad..000000000
--- a/target/linux/at91/image/dfboot/src/elf32-littlearm.lds
+++ /dev/null
@@ -1,19 +0,0 @@
-OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
-OUTPUT_ARCH(arm)
-ENTRY(_start)
-SECTIONS
-{
-        . = 0x00000000;
-
-        . = ALIGN(4);
-        .text : { *(.text) }
-
-        . = ALIGN(4);
-        .rodata : { *(.rodata) }
-
-        . = ALIGN(4);
-        .data : { *(.data) }
-
-        . = ALIGN(4);
-        .bss : { *(.bss) }
-}
\ No newline at end of file
diff --git a/target/linux/at91/image/dfboot/src/embedded_services.h b/target/linux/at91/image/dfboot/src/embedded_services.h
deleted file mode 100644
index 956b9edf0..000000000
--- a/target/linux/at91/image/dfboot/src/embedded_services.h
+++ /dev/null
@@ -1,500 +0,0 @@
-//*----------------------------------------------------------------------------
-//*      ATMEL Microcontroller Software Support  -  ROUSSET  -
-//*----------------------------------------------------------------------------
-//* The software is delivered "AS IS" without warranty or condition of any
-//* kind, either express, implied or statutory. This includes without
-//* limitation any warranty or condition with respect to merchantability or
-//* fitness for any particular purpose, or against the infringements of
-//* intellectual property rights of others.
-//*----------------------------------------------------------------------------
-//* File Name           : embedded_sevices.h
-//* Object              : Header File with all the embedded software services definitions
-//*
-//* 1.0 24 Jan 2003 FB  : Creation
-//*----------------------------------------------------------------------------
-#ifndef embedded_sevices_h
-#define embedded_sevices_h
-
-#include "AT91RM9200.h"
-
-#define AT91C_BASE_ROM	(char *)0x00100000
-
-/* Return values */
-#define AT91C_BUFFER_SUCCESS		   0
-#define AT91C_BUFFER_ERROR_SHIFT      16
-#define AT91C_BUFFER_ERROR            (0x0F << AT91C_BUFFER_ERROR_SHIFT)
-
-#define AT91C_BUFFER_OVERFLOW         (0x01 << AT91C_BUFFER_ERROR_SHIFT)
-#define AT91C_BUFFER_UNDERRUN         (0x02 << AT91C_BUFFER_ERROR_SHIFT)
-
-typedef unsigned int AT91S_BufferStatus;
-
-struct _AT91S_Pipe;
-
-// This structure is a virtual object of a buffer
-typedef struct _AT91S_Buffer
-{
-	struct _AT91S_Pipe *pPipe;
-	void *pChild;
-
-	// Functions invoked by the pipe
-	AT91S_BufferStatus (*SetRdBuffer)     (struct _AT91S_Buffer *pSBuffer, char *pBuffer, unsigned int Size);
-	AT91S_BufferStatus (*SetWrBuffer)     (struct _AT91S_Buffer *pSBuffer, char const *pBuffer, unsigned int Size);
-	AT91S_BufferStatus (*RstRdBuffer)     (struct _AT91S_Buffer *pSBuffer);
-	AT91S_BufferStatus (*RstWrBuffer)     (struct _AT91S_Buffer *pSBuffer);
-	char (*MsgWritten)      (struct _AT91S_Buffer *pSBuffer, char const *pBuffer);
-	char (*MsgRead)         (struct _AT91S_Buffer *pSBuffer, char const *pBuffer);
-	// Functions invoked by the peripheral
-	AT91S_BufferStatus (*GetWrBuffer)     (struct _AT91S_Buffer *pSBuffer, char const **pData, unsigned int *pSize);
-	AT91S_BufferStatus (*GetRdBuffer)     (struct _AT91S_Buffer *pSBuffer, char **pData, unsigned int *pSize);
-	AT91S_BufferStatus (*EmptyWrBuffer)   (struct _AT91S_Buffer *pSBuffer, unsigned int size);
-	AT91S_BufferStatus (*FillRdBuffer)    (struct _AT91S_Buffer *pSBuffer, unsigned int size);
-	char (*IsWrEmpty)      (struct _AT91S_Buffer *pSBuffer);
-	char (*IsRdFull)       (struct _AT91S_Buffer *pSBuffer);
-} AT91S_Buffer, *AT91PS_Buffer;
-
-// ===========================================================================================
-// SimpleBuffer definition
-//
-// This structure is pointed by pRealBuffer field in the SBuffer
-// It contains usefull information for a real implementation of
-// a SBuffer object.
-// The application just create an instance of SSBUffer and SBuffer,
-// call OpenSimpleBuffer, and continue using SBuffer instance
-
-typedef struct _AT91S_SBuffer
-{
-	AT91S_Buffer parent;
-	char         *pRdBuffer;
-	char const   *pWrBuffer;
-	unsigned int szRdBuffer;
-	unsigned int szWrBuffer;
-	unsigned int stRdBuffer;
-	unsigned int stWrBuffer;
-} AT91S_SBuffer, *AT91PS_SBuffer;
-
-typedef AT91PS_Buffer (*AT91PF_OpenSBuffer) (AT91PS_SBuffer);
-
-// This function is called by the application
-extern AT91PS_Buffer AT91F_OpenSBuffer(AT91PS_SBuffer pBuffer);
-
-// Functions invoked by the pipe
-extern AT91S_BufferStatus AT91F_SbSetRdBuffer  (AT91PS_Buffer pBuffer, char *pData, unsigned int Size);
-extern AT91S_BufferStatus AT91F_SbSetWrBuffer  (AT91PS_Buffer pBuffer, char const *pData, unsigned int Size);
-extern AT91S_BufferStatus AT91F_SbRstRdBuffer  (AT91PS_Buffer pBuffer);
-extern AT91S_BufferStatus AT91F_SbRstWrBuffer  (AT91PS_Buffer pBuffer);
-extern char AT91F_SbMsgWritten   (AT91PS_Buffer pBuffer, char const *pMsg);
-extern char AT91F_SbMsgRead      (AT91PS_Buffer pBuffer, char const *pMsg);
-// Functions invoked by the peripheral
-extern AT91S_BufferStatus AT91F_SbGetWrBuffer  (AT91PS_Buffer pBuffer, char const **pData, unsigned int *pSize);
-extern AT91S_BufferStatus AT91F_SbGetRdBuffer  (AT91PS_Buffer pBuffer, char **pData, unsigned int *pSize);
-extern AT91S_BufferStatus AT91F_SbEmptyWrBuffer(AT91PS_Buffer pBuffer, unsigned int size);
-extern AT91S_BufferStatus AT91F_SbFillRdBuffer (AT91PS_Buffer pBuffer, unsigned int size);
-extern char AT91F_SbIsWrEmpty   (AT91PS_Buffer pBuffer);
-extern char AT91F_SbIsRdFull    (AT91PS_Buffer pBuffer);
-
-#ifdef DBG_DRV_BUFFER
-extern char const *AT91F_SbGetError(AT91S_BufferStatus errorNumber);
-#endif
-
-
-#define AT91C_OPEN_CTRLTEMPO_SUCCESS	0
-#define AT91C_ERROR_OPEN_CTRLTEMPO		1
-#define AT91C_START_OK					2
-#define AT91C_STOP_OK					3
-#define AT91C_TIMEOUT_REACHED			4
-
-typedef enum _AT91E_SvcTempo {
-	AT91E_SVCTEMPO_DIS,
-	AT91E_SVCTEMPO_EN
-} AT91E_SvcTempo;
-
-typedef unsigned int AT91S_TempoStatus;
-
-// AT91S_SvcTempo
-typedef struct _AT91S_SvcTempo
-{
-
-	// Methods:
-	AT91S_TempoStatus (*Start)  (
-		struct _AT91S_SvcTempo *pSvc,
-		unsigned int timeout,
-		unsigned int reload,
-		void (*callback) (AT91S_TempoStatus, void *),
-		void *pData);
-	AT91S_TempoStatus (*Stop)   (struct _AT91S_SvcTempo *pSvc);
-
-	struct _AT91S_SvcTempo *pPreviousTempo;
-	struct _AT91S_SvcTempo *pNextTempo;
-
-	// Data
-	unsigned int TickTempo;	//* timeout value
-	unsigned int ReloadTempo;//* Reload value for periodic execution
-	void (*TempoCallback)(AT91S_TempoStatus, void *);
-	void *pPrivateData;
-	AT91E_SvcTempo flag;
-} AT91S_SvcTempo, *AT91PS_SvcTempo;
-
-
-// AT91S_CtrlTempo
-typedef struct _AT91S_CtlTempo
-{
-	// Members:
-
-	// Start and stop for Timer	hardware
-	AT91S_TempoStatus (*CtlTempoStart)  (void *pTimer);
-	AT91S_TempoStatus (*CtlTempoStop)   (void *pTimer);
-
-	// Start and stop for Tempo service
-	AT91S_TempoStatus (*SvcTempoStart)  (
-		struct _AT91S_SvcTempo *pSvc,
-		unsigned int timeout,
-		unsigned int reload,
-		void (*callback) (AT91S_TempoStatus, void *),
-		void *pData);
-	AT91S_TempoStatus (*SvcTempoStop)   (struct _AT91S_SvcTempo *pSvc);
-	AT91S_TempoStatus (*CtlTempoSetTime)(struct _AT91S_CtlTempo *pCtrl, unsigned int NewTime);
-	AT91S_TempoStatus (*CtlTempoGetTime)(struct _AT91S_CtlTempo *pCtrl);
-	AT91S_TempoStatus (*CtlTempoIsStart)(struct _AT91S_CtlTempo *pCtrl);
-	AT91S_TempoStatus (*CtlTempoCreate) (
-								struct _AT91S_CtlTempo *pCtrl,
-								struct _AT91S_SvcTempo *pTempo);
-	AT91S_TempoStatus (*CtlTempoRemove) (
-								struct _AT91S_CtlTempo *pCtrl,
-								struct _AT91S_SvcTempo *pTempo);
-	AT91S_TempoStatus (*CtlTempoTick)   (struct _AT91S_CtlTempo *pCtrl);
-
-	// Data:
-
-	void *pPrivateData;     // Pointer to devived class
-	void const *pTimer;			// hardware
-	AT91PS_SvcTempo pFirstTempo;
-	AT91PS_SvcTempo pNewTempo;
-} AT91S_CtlTempo, *AT91PS_CtlTempo;
-typedef AT91S_TempoStatus (*AT91PF_OpenCtlTempo)   ( AT91PS_CtlTempo, void const *);
-
-// This function is called by the application.
-extern AT91S_TempoStatus AT91F_OpenCtlTempo( AT91PS_CtlTempo pCtrlTempo, void const *pTempoTimer );
-
-extern AT91S_TempoStatus AT91F_STStart   (void *);
-extern AT91S_TempoStatus AT91F_STStop    (void *);
-extern AT91S_TempoStatus AT91F_STSetTime (AT91PS_CtlTempo, unsigned int);
-extern AT91S_TempoStatus AT91F_STGetTime (AT91PS_CtlTempo);
-extern AT91S_TempoStatus AT91F_STIsStart (AT91PS_CtlTempo);
-extern AT91S_TempoStatus AT91F_CtlTempoCreate (AT91PS_CtlTempo, AT91PS_SvcTempo);
-extern AT91S_TempoStatus AT91F_CtlTempoRemove (AT91PS_CtlTempo, AT91PS_SvcTempo);
-extern AT91S_TempoStatus AT91F_CtlTempoTick   (AT91PS_CtlTempo);
-extern AT91S_TempoStatus AT91F_SvcTempoStart (
-		AT91PS_SvcTempo pSvc,
-		unsigned int timeout,
-		unsigned int reload,
-		void (*callback) (AT91S_TempoStatus, void *),
-		void *pData);
-extern AT91S_TempoStatus AT91F_SvcTempoStop (AT91PS_SvcTempo);
-
-
-// Following types are defined in another header files
-struct _AT91S_Buffer;
-
-// Constants:
-#define AT91C_COMMSVC_SUCCESS     0
-#define AT91C_COMMSVC_ERROR_SHIFT 8
-#define AT91C_COMMSVC_ERROR       (0x0f << AT91C_COMMSVC_ERROR_SHIFT)
-
-typedef unsigned int AT91S_SvcCommStatus;
-
-// AT91S_Service definition
-// This structure is an abstraction of a communication peripheral
-typedef struct _AT91S_Service
-{
-	// Methods:
-	AT91S_SvcCommStatus (*Reset)  (struct _AT91S_Service *pService);
-	AT91S_SvcCommStatus (*StartTx)(struct _AT91S_Service *pService);
-	AT91S_SvcCommStatus (*StartRx)(struct _AT91S_Service *pService);
-	AT91S_SvcCommStatus (*StopTx) (struct _AT91S_Service *pService);
-	AT91S_SvcCommStatus (*StopRx) (struct _AT91S_Service *pService);
-	char                (*TxReady)(struct _AT91S_Service *pService);
-	char                (*RxReady)(struct _AT91S_Service *pService);
-	// Data:
-	struct _AT91S_Buffer *pBuffer; // Link to a buffer object
-	void *pChild;
-} AT91S_SvcComm, *AT91PS_SvcComm;
-
-// Constants:
-#define AT91C_XMODEM_SOH         0x01         /* Start of Heading for 128 bytes */
-#define AT91C_XMODEM_STX         0x02         /* Start of heading for 1024 bytes */
-#define AT91C_XMODEM_EOT         0x04         /* End of transmission */
-#define AT91C_XMODEM_ACK         0x06         /* Acknowledge */
-#define AT91C_XMODEM_NAK         0x15         /* Negative Acknowledge */
-#define AT91C_XMODEM_CRCCHR      'C'
-
-#define AT91C_XMODEM_PACKET_SIZE 2                 // packet + packetCRC
-#define AT91C_XMODEM_CRC_SIZE    2                 // crcLSB + crcMSB
-#define AT91C_XMODEM_DATA_SIZE_SOH    128          // data 128 corresponding to SOH header
-#define AT91C_XMODEM_DATA_SIZE_STX    1024         // data 1024 corresponding to STX header
-
-//* Following structure is used by SPipe to refer to the USB device peripheral endpoint
-typedef struct _AT91PS_SvcXmodem {
-
-	// Public Methods:
-	AT91S_SvcCommStatus (*Handler) (struct _AT91PS_SvcXmodem *, unsigned int);
-	AT91S_SvcCommStatus (*StartTx) (struct _AT91PS_SvcXmodem *, unsigned int);
-	AT91S_SvcCommStatus (*StopTx)  (struct _AT91PS_SvcXmodem *, unsigned int);
-
-	// Private Methods:
-	AT91S_SvcCommStatus (*ReadHandler)  (struct _AT91PS_SvcXmodem *, unsigned int csr);
-	AT91S_SvcCommStatus (*WriteHandler) (struct _AT91PS_SvcXmodem *, unsigned int csr);
-	unsigned short      (*GetCrc)       (char *ptr, unsigned int count);
-	char                (*CheckHeader)  (unsigned char currentPacket, char *packet);
-	char                (*CheckData)    (struct _AT91PS_SvcXmodem *);
-
-	AT91S_SvcComm  parent;      // Base class
-	AT91PS_USART  pUsart;
-
-	AT91S_SvcTempo tempo; // Link to a AT91S_Tempo object
-
-	char          *pData;
-	unsigned int  dataSize;        // = XMODEM_DATA_STX or XMODEM_DATA_SOH
-	char          packetDesc[AT91C_XMODEM_PACKET_SIZE];
-	unsigned char packetId;         // Current packet
-	char          packetStatus;
-	char          isPacketDesc;
-	char          eot;            // end of transmition
-} AT91S_SvcXmodem, *AT91PS_SvcXmodem;
-
-typedef AT91PS_SvcComm      (*AT91PF_OpenSvcXmodem) ( AT91PS_SvcXmodem, AT91PS_USART, AT91PS_CtlTempo);
-
-// This function is called by the application.
-extern AT91PS_SvcComm AT91F_OpenSvcXmodem( AT91PS_SvcXmodem, AT91PS_USART, AT91PS_CtlTempo);
-
-extern unsigned short AT91F_SvcXmodemGetCrc     (char *ptr, unsigned int count);
-extern char           AT91F_SvcXmodemCheckHeader(unsigned char currentPacket, char *packet);
-extern char           AT91F_SvcXmodemCheckData  (AT91PS_SvcXmodem pSvcXmodem);
-extern AT91S_SvcCommStatus AT91F_SvcXmodemReadHandler(AT91PS_SvcXmodem pSvcXmodem, unsigned int csr);
-extern AT91S_SvcCommStatus AT91F_SvcXmodemWriteHandler(AT91PS_SvcXmodem pSvcXmodem, unsigned int csr);
-extern AT91S_SvcCommStatus AT91F_SvcXmodemStartTx(AT91PS_SvcComm pSvcComm);
-extern AT91S_SvcCommStatus AT91F_SvcXmodemStopTx(AT91PS_SvcComm pSvcComm);
-extern AT91S_SvcCommStatus AT91F_SvcXmodemStartRx(AT91PS_SvcComm pSvcComm);
-extern AT91S_SvcCommStatus AT91F_SvcXmodemStopRx(AT91PS_SvcComm pSvcComm);
-extern char AT91F_SvcXmodemTxReady(AT91PS_SvcComm pService);
-extern char AT91F_SvcXmodemRxReady(AT91PS_SvcComm pSvcComm);
-
-
-// Constants:
-#define AT91C_PIPE_SUCCESS	      0
-#define AT91C_PIPE_ERROR_SHIFT    8
-#define AT91C_PIPE_ERROR          (0x0F << AT91C_PIPE_ERROR_SHIFT)
-
-#define AT91C_PIPE_OPEN_FAILED    (1 << AT91C_PIPE_ERROR_SHIFT)
-#define AT91C_PIPE_WRITE_FAILED   (2 << AT91C_PIPE_ERROR_SHIFT)
-#define AT91C_PIPE_WRITE_ABORTED  (3 << AT91C_PIPE_ERROR_SHIFT)
-#define AT91C_PIPE_READ_FAILED    (4 << AT91C_PIPE_ERROR_SHIFT)
-#define AT91C_PIPE_READ_ABORTED   (5 << AT91C_PIPE_ERROR_SHIFT)
-#define AT91C_PIPE_ABORT_FAILED   (6 << AT91C_PIPE_ERROR_SHIFT)
-#define AT91C_PIPE_RESET_FAILED   (7 << AT91C_PIPE_ERROR_SHIFT)
-
-/* _AT91S_Pipe stucture */
-typedef unsigned int AT91S_PipeStatus;
-
-typedef struct _AT91S_Pipe
-{
-	// A pipe is linked with a peripheral and a buffer
-	AT91PS_SvcComm pSvcComm;
-	AT91PS_Buffer  pBuffer;
-
-	// Callback functions with their arguments
-	void (*WriteCallback) (AT91S_PipeStatus, void *);
-	void (*ReadCallback)  (AT91S_PipeStatus, void *);
-	void *pPrivateReadData;
-	void *pPrivateWriteData;
-
-	// Pipe methods
-	AT91S_PipeStatus (*Write) (
-		struct _AT91S_Pipe   *pPipe,
-		char const *         pData,
-		unsigned int         size,
-		void                 (*callback) (AT91S_PipeStatus, void *),
-		void                 *privateData);
-	AT91S_PipeStatus (*Read) (
-		struct _AT91S_Pipe  *pPipe,
-		char                *pData,
-		unsigned int        size,
-		void                (*callback) (AT91S_PipeStatus, void *),
-		void                *privateData);
-	AT91S_PipeStatus (*AbortWrite) (
-		struct _AT91S_Pipe  *pPipe);
-	AT91S_PipeStatus (*AbortRead) (
-		struct _AT91S_Pipe *pPipe);
-	AT91S_PipeStatus (*Reset) (
-		struct _AT91S_Pipe *pPipe);
-	char (*IsWritten) (
-		struct _AT91S_Pipe *pPipe,
-		char const *pVoid);
-	char (*IsReceived) (
-		struct _AT91S_Pipe *pPipe,
-		char const *pVoid);
-} AT91S_Pipe, *AT91PS_Pipe;
-
-// types used in AT91S_Pipe
-typedef AT91PS_Pipe (*AT91PF_OpenPipe)   (AT91PS_Pipe, AT91PS_SvcComm, AT91PS_Buffer);
-typedef void (*AT91PF_PipeWriteCallBack) (AT91S_PipeStatus, void *);
-typedef void (*AT91PF_PipeReadCallBack)  (AT91S_PipeStatus, void *);
-typedef AT91S_PipeStatus (*AT91PF_PipeWrite) (AT91PS_Pipe, char const *, unsigned int, void (*) (AT91S_PipeStatus, void *),	void *);
-typedef AT91S_PipeStatus (*AT91PF_PipeRead)  (AT91PS_Pipe, char const *, unsigned int, void (*) (AT91S_PipeStatus, void *),	void *);
-typedef AT91S_PipeStatus (*AT91PF_PipeAbortWrite) (AT91PS_Pipe);
-typedef AT91S_PipeStatus (*AT91PF_PipeAbortRead)  (AT91PS_Pipe);
-typedef AT91S_PipeStatus (*AT91PF_PipeReset)      (AT91PS_Pipe);
-typedef char (*AT91PF_PipeIsWritten)              (AT91PS_Pipe, char const *);
-typedef char (*AT91PF_PipeIsReceived)             (AT91PS_Pipe, char const *);
-
-// This function is called by the application
-extern AT91PS_Pipe AT91F_OpenPipe(
-	AT91PS_Pipe    pPipe,
-	AT91PS_SvcComm pSvcComm,
-	AT91PS_Buffer  pBuffer);
-
-// Following functions are called through AT91S_Pipe pointers
-
-extern AT91S_PipeStatus AT91F_PipeWrite(
-	AT91PS_Pipe pPipe,
-	char const *pVoid,
-	unsigned int size,
-	AT91PF_PipeWriteCallBack callback,
-	void *privateData);
-extern AT91S_PipeStatus AT91F_PipeRead(
-	AT91PS_Pipe pPipe,
-	char *pVoid,
-	unsigned int Size,
-	AT91PF_PipeReadCallBack callback,
-	void *privateData);
-extern AT91S_PipeStatus AT91F_PipeAbortWrite(AT91PS_Pipe pPipe);
-extern AT91S_PipeStatus AT91F_PipeAbortRead(AT91PS_Pipe pPipe);
-extern AT91S_PipeStatus AT91F_PipeReset(AT91PS_Pipe pPipe);
-extern char AT91F_PipeMsgWritten(AT91PS_Pipe pPipe, char const *pVoid);
-extern char AT91F_PipeMsgReceived(AT91PS_Pipe pPipe, char const *pVoid);
-
-#ifdef DBG_DRV_PIPE
-// This function parse the error number and return a string
-// describing the error message
-extern char const *AT91F_PipeGetError(AT91S_PipeStatus msgId);
-#endif
-
-extern const unsigned char bit_rev[256];
-
-extern void CalculateCrc32(const unsigned char *,unsigned int, unsigned int *);
-extern void CalculateCrc16(const unsigned char *, unsigned int , unsigned short *); 
-extern void CalculateCrcHdlc(const unsigned char *, unsigned int, unsigned short *);
-extern void CalculateCrc16ccitt(const unsigned char *, unsigned int , unsigned short *);
-
-typedef const unsigned char* AT91PS_SVC_CRC_BIT_REV ;
-
-typedef void  (*AT91PF_SVC_CRC32)   (const unsigned char *, unsigned int, unsigned int *);
-typedef void  (*AT91PF_SVC_CRC16)   (const unsigned char *, unsigned int, unsigned short *);
-typedef void  (*AT91PF_SVC_CRCHDLC) (const unsigned char *, unsigned int, unsigned short *);
-typedef	void  (*AT91PF_SVC_CRCCCITT)(const unsigned char *, unsigned int , unsigned short *);
-
-
-typedef short (*AT91PF_Sinus) (int angle);
-typedef const short * AT91PS_SINE_TAB;
-
-extern short AT91F_Sinus(int angle);
-extern const short AT91C_SINUS180_TAB[256];
-
-
-typedef void (TypeAICHandler) (void) ;
-
-
-// ROM BOOT Structure Element Definition (liv v2)
-typedef struct _AT91S_MEMCDesc
-{
-    AT91PS_MC		memc_base ;		/* Peripheral base */
-    unsigned char	periph_id ;		/* MC Peripheral Identifier */
-} AT91S_MEMCDesc, *AT91PS_MEMCDesc ;
-
-typedef struct _AT91S_Pio2Desc
-{
-   AT91PS_PIO      pio_base ;       /* Base Address */
-   unsigned char   periph_id ;      /* Peripheral Identifier */
-   unsigned char   pio_number ;     /* Total Pin Number */
-} AT91S_Pio2Desc, *AT91PS_Pio2Desc ;
-
-typedef struct _AT91S_SPIDesc
-{
-    AT91PS_SPI         		spi_base ;
-    const AT91PS_PIO        pio_base ;
-    unsigned char           periph_id ;
-    unsigned char           pin_spck ;
-    unsigned char           pin_miso ;
-    unsigned char           pin_mosi ;
-    unsigned char           pin_npcs[4] ;
-} AT91S_SPIDesc, *AT91PS_SPIDesc ;
-
-typedef struct _AT91S_USART2Desc
-{
-    AT91PS_USART           	usart_base ;   	/* Peripheral base */
-    const AT91PS_PIO   		pio_base ;     	/* IO controller descriptor */
-    unsigned int            pin_rxd ;       /* RXD pin number in the PIO */
-    unsigned int            pin_txd ;       /* TXD pin number in the PIO */
-    unsigned int            pin_sck ;       /* SCK pin number in the PIO */
-    unsigned int            pin_rts ;       /* RTS pin number in the PIO */
-    unsigned int            pin_cts ;       /* CTS pin number in the PIO */
-    unsigned int            pin_dtr ;       /* DTR pin number in the PIO */
-    unsigned int            pin_ri ;        /* RI pin number in the PIO */
-    unsigned int            pin_dsr ;       /* DSR pin number in the PIO */
-    unsigned int            pin_dcd ;       /* DCD pin number in the PIO */
-    unsigned int            periph_id ;     /* USART Peripheral Identifier */
-} AT91S_USART2Desc, *AT91PS_USART2Desc ;
-
-typedef struct _AT91S_TWIDesc
-{
-    AT91PS_TWI 				TWI_base ;
-    const AT91PS_PIO        pio_base ;
-    unsigned int			pin_sck ;
-    unsigned int			pin_sda ;
-    unsigned int 			periph_id;
-}AT91S_TWIDesc, *AT91PS_TWIDesc;
-
-typedef struct _AT91S_STDesc
-{
-    AT91PS_ST  		st_base ;          	/* Peripheral base address */
-    TypeAICHandler  *AsmSTHandler ;     /* Assembly interrupt handler */
-    unsigned char   PeriphId ;          /* Peripheral Identifier */
-} AT91S_STDesc, *AT91PS_STDesc;
-
-typedef struct _AT91S_RomBoot {
-	const unsigned int     version;
-	// Peripheral descriptors
-	const AT91S_MEMCDesc   MEMC_DESC;
-	const AT91S_STDesc     SYSTIMER_DESC;
-	const AT91S_Pio2Desc   PIOA_DESC;
-	const AT91S_Pio2Desc   PIOB_DESC;
-	const AT91S_USART2Desc DBGU_DESC;
-	const AT91S_USART2Desc USART0_DESC;
-	const AT91S_USART2Desc USART1_DESC;
-	const AT91S_USART2Desc USART2_DESC;
-	const AT91S_USART2Desc USART3_DESC;
-	const AT91S_TWIDesc    TWI_DESC;
-	const AT91S_SPIDesc    SPI_DESC;
-
-	// Objects entry
-	const AT91PF_OpenPipe      		OpenPipe;
-	const AT91PF_OpenSBuffer   		OpenSBuffer;
-	const unsigned int				reserved1;
-	const AT91PF_OpenSvcXmodem 		OpenSvcXmodem;
-	const AT91PF_OpenCtlTempo  		OpenCtlTempo;
-	const unsigned int				reserved2;
-	const unsigned int				reserved3;
-	const unsigned int				reserved4;
-	const AT91PF_SVC_CRC16			CRC16;
-	const AT91PF_SVC_CRCCCITT		CRCCCITT;
-	const AT91PF_SVC_CRCHDLC		CRCHDLC;
-	const AT91PF_SVC_CRC32			CRC32;
-	const AT91PS_SVC_CRC_BIT_REV	Bit_Reverse_Array;
-	const AT91PS_SINE_TAB			SineTab; 
-	const AT91PF_Sinus              Sine;
-} AT91S_RomBoot, *AT91PS_RomBoot;
-
-#define AT91C_ROM_BOOT_ADDRESS ((const AT91S_RomBoot *) ( *((unsigned int *) (AT91C_BASE_ROM + 0x20))) )
-
-#endif
-
diff --git a/target/linux/at91/image/dfboot/src/include/AT91C_MCI_Device.h b/target/linux/at91/image/dfboot/src/include/AT91C_MCI_Device.h
deleted file mode 100644
index 43d583523..000000000
--- a/target/linux/at91/image/dfboot/src/include/AT91C_MCI_Device.h
+++ /dev/null
@@ -1,379 +0,0 @@
-//*---------------------------------------------------------------------------
-//*         ATMEL Microcontroller Software Support  -  ROUSSET  -
-//*---------------------------------------------------------------------------
-//* The software is delivered "AS IS" without warranty or condition of any
-//* kind, either express, implied or statutory. This includes without
-//* limitation any warranty or condition with respect to merchantability or
-//* fitness for any particular purpose, or against the infringements of
-//* intellectual property rights of others.
-//*---------------------------------------------------------------------------
-//* File Name           : AT91C_MCI_Device.h
-//* Object              : Data Flash Atmel Description File
-//* Translator          :
-//*
-//* 1.0 26/11/02 FB		: Creation
-//*---------------------------------------------------------------------------
-
-#ifndef AT91C_MCI_Device_h
-#define AT91C_MCI_Device_h
-
-#include "AT91RM9200.h"
-#include "lib_AT91RM9200.h"
-
-typedef unsigned int AT91S_MCIDeviceStatus;
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#define AT91C_CARD_REMOVED			0
-#define AT91C_MMC_CARD_INSERTED		1
-#define AT91C_SD_CARD_INSERTED		2
-
-#define AT91C_NO_ARGUMENT			0x0
-
-#define AT91C_FIRST_RCA				0xCAFE
-#define AT91C_MAX_MCI_CARDS			10
-
-#define AT91C_BUS_WIDTH_1BIT		0x00
-#define AT91C_BUS_WIDTH_4BITS		0x02
-
-/* Driver State */
-#define AT91C_MCI_IDLE       		0x0
-#define AT91C_MCI_TIMEOUT_ERROR		0x1
-#define AT91C_MCI_RX_SINGLE_BLOCK	0x2
-#define AT91C_MCI_RX_MULTIPLE_BLOCK	0x3
-#define AT91C_MCI_RX_STREAM			0x4
-#define AT91C_MCI_TX_SINGLE_BLOCK	0x5
-#define AT91C_MCI_TX_MULTIPLE_BLOCK	0x6
-#define AT91C_MCI_TX_STREAM 		0x7
-
-/* TimeOut */
-#define AT91C_TIMEOUT_CMDRDY		30
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-// MMC & SDCard Structures 
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/*-----------------------------------------------*/
-/* SDCard Device Descriptor Structure Definition */
-/*-----------------------------------------------*/
-typedef struct	_AT91S_MciDeviceDesc
-{
-    volatile unsigned char	state;
-	unsigned char			SDCard_bus_width;
-
-} AT91S_MciDeviceDesc, *AT91PS_MciDeviceDesc;
-
-/*---------------------------------------------*/
-/* MMC & SDCard Structure Device Features	   */
-/*---------------------------------------------*/
-typedef struct	_AT91S_MciDeviceFeatures
-{
-    unsigned char	Card_Inserted;				// (0=AT91C_CARD_REMOVED) (1=AT91C_MMC_CARD_INSERTED) (2=AT91C_SD_CARD_INSERTED)
-    unsigned int 	Relative_Card_Address;		// RCA
-	unsigned int 	Max_Read_DataBlock_Length;	// 2^(READ_BL_LEN) in CSD 
-	unsigned int 	Max_Write_DataBlock_Length;	// 2^(WRITE_BL_LEN) in CSD
-	unsigned char	Read_Partial;				// READ_BL_PARTIAL
-	unsigned char	Write_Partial;				// WRITE_BL_PARTIAL
-	unsigned char	Erase_Block_Enable;			// ERASE_BLK_EN
-	unsigned char	Read_Block_Misalignment;	// READ_BLK_MISALIGN
-	unsigned char	Write_Block_Misalignment;	// WRITE_BLK_MISALIGN
-	unsigned char	Sector_Size;				// SECTOR_SIZE
-	unsigned int	Memory_Capacity;			// Size in bits of the device
-	
-}	AT91S_MciDeviceFeatures, *AT91PS_MciDeviceFeatures ;
-
-/*---------------------------------------------*/
-/* MCI Device Structure Definition 			   */
-/*---------------------------------------------*/
-typedef struct _AT91S_MciDevice
-{
-	AT91PS_MciDeviceDesc		 	pMCI_DeviceDesc;	// MCI device descriptor
-	AT91PS_MciDeviceFeatures		pMCI_DeviceFeatures;// Pointer on a MCI device features array  
-}AT91S_MciDevice, *AT91PS_MciDevice;
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-// MCI_CMD Register Value 
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-#define AT91C_POWER_ON_INIT						(0	| AT91C_MCI_TRCMD_NO 	| AT91C_MCI_SPCMD_INIT | AT91C_MCI_OPDCMD)
-
-/////////////////////////////////////////////////////////////////	
-// Class 0 & 1 commands: Basic commands and Read Stream commands
-/////////////////////////////////////////////////////////////////
-
-#define AT91C_GO_IDLE_STATE_CMD					(0 	| AT91C_MCI_TRCMD_NO 	| AT91C_MCI_SPCMD_NONE )
-#define AT91C_MMC_GO_IDLE_STATE_CMD				(0 	| AT91C_MCI_TRCMD_NO 	| AT91C_MCI_SPCMD_NONE  | AT91C_MCI_OPDCMD)
-#define AT91C_MMC_SEND_OP_COND_CMD				(1	| AT91C_MCI_TRCMD_NO 	| AT91C_MCI_SPCMD_NONE	| AT91C_MCI_RSPTYP_48 | AT91C_MCI_OPDCMD)
-#define AT91C_ALL_SEND_CID_CMD					(2	| AT91C_MCI_TRCMD_NO 	| AT91C_MCI_SPCMD_NONE	| AT91C_MCI_RSPTYP_136 )
-#define AT91C_MMC_ALL_SEND_CID_CMD				(2	| AT91C_MCI_TRCMD_NO 	| AT91C_MCI_SPCMD_NONE	| AT91C_MCI_RSPTYP_136 | AT91C_MCI_OPDCMD)
-#define AT91C_SET_RELATIVE_ADDR_CMD				(3	| AT91C_MCI_TRCMD_NO 	| AT91C_MCI_SPCMD_NONE	| AT91C_MCI_RSPTYP_48		| AT91C_MCI_MAXLAT )
-#define AT91C_MMC_SET_RELATIVE_ADDR_CMD			(3	| AT91C_MCI_TRCMD_NO 	| AT91C_MCI_SPCMD_NONE	| AT91C_MCI_RSPTYP_48		| AT91C_MCI_MAXLAT | AT91C_MCI_OPDCMD)
-
-#define AT91C_SET_DSR_CMD						(4	| AT91C_MCI_TRCMD_NO 	| AT91C_MCI_SPCMD_NONE	| AT91C_MCI_RSPTYP_NO		| AT91C_MCI_MAXLAT )	// no tested
-
-#define AT91C_SEL_DESEL_CARD_CMD				(7	| AT91C_MCI_TRCMD_NO 	| AT91C_MCI_SPCMD_NONE	| AT91C_MCI_RSPTYP_48  		| AT91C_MCI_MAXLAT )
-#define AT91C_SEND_CSD_CMD						(9	| AT91C_MCI_TRCMD_NO 	| AT91C_MCI_SPCMD_NONE	| AT91C_MCI_RSPTYP_136 		| AT91C_MCI_MAXLAT )
-#define AT91C_SEND_CID_CMD						(10	| AT91C_MCI_TRCMD_NO 	| AT91C_MCI_SPCMD_NONE	| AT91C_MCI_RSPTYP_136 		| AT91C_MCI_MAXLAT )
-#define AT91C_MMC_READ_DAT_UNTIL_STOP_CMD		(11	| AT91C_MCI_TRTYP_STREAM| AT91C_MCI_SPCMD_NONE	| AT91C_MCI_RSPTYP_48	| AT91C_MCI_TRDIR	| AT91C_MCI_TRCMD_START | AT91C_MCI_MAXLAT )
-
-#define AT91C_STOP_TRANSMISSION_CMD				(12	| AT91C_MCI_TRCMD_STOP 	| AT91C_MCI_SPCMD_NONE	| AT91C_MCI_RSPTYP_48 		| AT91C_MCI_MAXLAT )
-#define AT91C_STOP_TRANSMISSION_SYNC_CMD		(12	| AT91C_MCI_TRCMD_STOP 	| AT91C_MCI_SPCMD_SYNC	| AT91C_MCI_RSPTYP_48 		| AT91C_MCI_MAXLAT )
-#define AT91C_SEND_STATUS_CMD					(13	| AT91C_MCI_TRCMD_NO 	| AT91C_MCI_SPCMD_NONE	| AT91C_MCI_RSPTYP_48 		| AT91C_MCI_MAXLAT )
-#define AT91C_GO_INACTIVE_STATE_CMD				(15	| AT91C_MCI_RSPTYP_NO )
-
-//*------------------------------------------------
-//* Class 2 commands: Block oriented Read commands
-//*------------------------------------------------
-
-#define AT91C_SET_BLOCKLEN_CMD					(16 | AT91C_MCI_TRCMD_NO 	| AT91C_MCI_SPCMD_NONE	| AT91C_MCI_RSPTYP_48		| AT91C_MCI_MAXLAT )
-#define AT91C_READ_SINGLE_BLOCK_CMD				(17 | AT91C_MCI_SPCMD_NONE	| AT91C_MCI_RSPTYP_48 	| AT91C_MCI_TRCMD_START	| AT91C_MCI_TRTYP_BLOCK	| AT91C_MCI_TRDIR	| AT91C_MCI_MAXLAT)
-#define AT91C_READ_MULTIPLE_BLOCK_CMD			(18 | AT91C_MCI_SPCMD_NONE	| AT91C_MCI_RSPTYP_48 	| AT91C_MCI_TRCMD_START	| AT91C_MCI_TRTYP_MULTIPLE	| AT91C_MCI_TRDIR	| AT91C_MCI_MAXLAT)
-
-//*--------------------------------------------
-//* Class 3 commands: Sequential write commands
-//*--------------------------------------------
-
-#define AT91C_MMC_WRITE_DAT_UNTIL_STOP_CMD		(20 | AT91C_MCI_TRTYP_STREAM| AT91C_MCI_SPCMD_NONE	| AT91C_MCI_RSPTYP_48 & ~(AT91C_MCI_TRDIR) | AT91C_MCI_TRCMD_START | AT91C_MCI_MAXLAT )	// MMC
-
-//*------------------------------------------------
-//* Class 4 commands: Block oriented write commands
-//*------------------------------------------------
-	
-#define AT91C_WRITE_BLOCK_CMD					(24 | AT91C_MCI_SPCMD_NONE	| AT91C_MCI_RSPTYP_48	| AT91C_MCI_TRCMD_START	| (AT91C_MCI_TRTYP_BLOCK 	&  ~(AT91C_MCI_TRDIR))	| AT91C_MCI_MAXLAT)
-#define AT91C_WRITE_MULTIPLE_BLOCK_CMD			(25 | AT91C_MCI_SPCMD_NONE	| AT91C_MCI_RSPTYP_48	| AT91C_MCI_TRCMD_START	| (AT91C_MCI_TRTYP_MULTIPLE	&  ~(AT91C_MCI_TRDIR)) 	| AT91C_MCI_MAXLAT)
-#define AT91C_PROGRAM_CSD_CMD					(27 | AT91C_MCI_RSPTYP_48 )
-
-
-//*----------------------------------------
-//* Class 6 commands: Group Write protect
-//*----------------------------------------
-
-#define AT91C_SET_WRITE_PROT_CMD				(28	| AT91C_MCI_RSPTYP_48 )
-#define AT91C_CLR_WRITE_PROT_CMD				(29	| AT91C_MCI_RSPTYP_48 )
-#define AT91C_SEND_WRITE_PROT_CMD				(30	| AT91C_MCI_RSPTYP_48 )
-
-
-//*----------------------------------------
-//* Class 5 commands: Erase commands
-//*----------------------------------------
-
-#define AT91C_TAG_SECTOR_START_CMD				(32 | AT91C_MCI_SPCMD_NONE	| AT91C_MCI_RSPTYP_48	| AT91C_MCI_TRCMD_NO	| AT91C_MCI_MAXLAT)
-#define AT91C_TAG_SECTOR_END_CMD  				(33 | AT91C_MCI_SPCMD_NONE	| AT91C_MCI_RSPTYP_48	| AT91C_MCI_TRCMD_NO	| AT91C_MCI_MAXLAT)
-#define AT91C_MMC_UNTAG_SECTOR_CMD				(34 | AT91C_MCI_RSPTYP_48 )
-#define AT91C_MMC_TAG_ERASE_GROUP_START_CMD		(35 | AT91C_MCI_RSPTYP_48 )
-#define AT91C_MMC_TAG_ERASE_GROUP_END_CMD		(36 | AT91C_MCI_RSPTYP_48 )
-#define AT91C_MMC_UNTAG_ERASE_GROUP_CMD			(37 | AT91C_MCI_RSPTYP_48 )
-#define AT91C_ERASE_CMD							(38 | AT91C_MCI_SPCMD_NONE	| AT91C_MCI_RSPTYP_48	| AT91C_MCI_TRCMD_NO	| AT91C_MCI_MAXLAT )
-
-//*----------------------------------------
-//* Class 7 commands: Lock commands
-//*----------------------------------------
-
-#define AT91C_LOCK_UNLOCK						(42 | AT91C_MCI_SPCMD_NONE	| AT91C_MCI_RSPTYP_48	| AT91C_MCI_TRCMD_NO	| AT91C_MCI_MAXLAT)	// no tested
-
-//*-----------------------------------------------
-// Class 8 commands: Application specific commands
-//*-----------------------------------------------
-
-#define AT91C_APP_CMD							(55 | AT91C_MCI_SPCMD_NONE	| AT91C_MCI_RSPTYP_48	| AT91C_MCI_TRCMD_NO | AT91C_MCI_MAXLAT)
-#define AT91C_GEN_CMD							(56 | AT91C_MCI_SPCMD_NONE	| AT91C_MCI_RSPTYP_48	| AT91C_MCI_TRCMD_NO | AT91C_MCI_MAXLAT)	// no tested
-
-#define AT91C_SDCARD_SET_BUS_WIDTH_CMD			(6 	| AT91C_MCI_SPCMD_NONE	| AT91C_MCI_RSPTYP_48	| AT91C_MCI_TRCMD_NO	| AT91C_MCI_MAXLAT)
-#define AT91C_SDCARD_STATUS_CMD					(13 | AT91C_MCI_SPCMD_NONE	| AT91C_MCI_RSPTYP_48	| AT91C_MCI_TRCMD_NO	| AT91C_MCI_MAXLAT)
-#define AT91C_SDCARD_SEND_NUM_WR_BLOCKS_CMD		(22 | AT91C_MCI_SPCMD_NONE	| AT91C_MCI_RSPTYP_48	| AT91C_MCI_TRCMD_NO	| AT91C_MCI_MAXLAT)
-#define AT91C_SDCARD_SET_WR_BLK_ERASE_COUNT_CMD	(23 | AT91C_MCI_SPCMD_NONE	| AT91C_MCI_RSPTYP_48	| AT91C_MCI_TRCMD_NO	| AT91C_MCI_MAXLAT)
-#define AT91C_SDCARD_APP_OP_COND_CMD			(41 | AT91C_MCI_SPCMD_NONE	| AT91C_MCI_RSPTYP_48	| AT91C_MCI_TRCMD_NO )
-#define AT91C_SDCARD_SET_CLR_CARD_DETECT_CMD	(42 | AT91C_MCI_SPCMD_NONE	| AT91C_MCI_RSPTYP_48	| AT91C_MCI_TRCMD_NO	| AT91C_MCI_MAXLAT)
-#define AT91C_SDCARD_SEND_SCR_CMD				(51 | AT91C_MCI_SPCMD_NONE	| AT91C_MCI_RSPTYP_48	| AT91C_MCI_TRCMD_NO	| AT91C_MCI_MAXLAT)
-
-#define AT91C_SDCARD_APP_ALL_CMD				(AT91C_SDCARD_SET_BUS_WIDTH_CMD +\
-												AT91C_SDCARD_STATUS_CMD +\
-												AT91C_SDCARD_SEND_NUM_WR_BLOCKS_CMD +\
-												AT91C_SDCARD_SET_WR_BLK_ERASE_COUNT_CMD +\
-												AT91C_SDCARD_APP_OP_COND_CMD +\
-												AT91C_SDCARD_SET_CLR_CARD_DETECT_CMD +\
-												AT91C_SDCARD_SEND_SCR_CMD)
-
-//*----------------------------------------
-//* Class 9 commands: IO Mode commands
-//*----------------------------------------
-
-#define AT91C_MMC_FAST_IO_CMD					(39 | AT91C_MCI_SPCMD_NONE | AT91C_MCI_RSPTYP_48 | AT91C_MCI_MAXLAT)
-#define AT91C_MMC_GO_IRQ_STATE_CMD				(40 | AT91C_MCI_SPCMD_NONE | AT91C_MCI_RSPTYP_48 | AT91C_MCI_TRCMD_NO	| AT91C_MCI_MAXLAT)
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-// Functions returnals
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-#define AT91C_CMD_SEND_OK					0		// Command ok
-#define AT91C_CMD_SEND_ERROR				-1		// Command failed
-#define AT91C_INIT_OK						2		// Init Successfull
-#define AT91C_INIT_ERROR					3		// Init Failed
-#define AT91C_READ_OK						4		// Read Successfull
-#define AT91C_READ_ERROR					5		// Read Failed
-#define AT91C_WRITE_OK						6		// Write Successfull
-#define AT91C_WRITE_ERROR					7		// Write Failed
-#define AT91C_ERASE_OK						8		// Erase Successfull
-#define AT91C_ERASE_ERROR					9		// Erase Failed
-#define AT91C_CARD_SELECTED_OK				10		// Card Selection Successfull
-#define AT91C_CARD_SELECTED_ERROR			11		// Card Selection Failed
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-// MCI_SR Errors
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-#define 	AT91C_MCI_SR_ERROR		(AT91C_MCI_UNRE |\
-									 AT91C_MCI_OVRE |\
-									 AT91C_MCI_DTOE |\
-									 AT91C_MCI_DCRCE |\
-									 AT91C_MCI_RTOE |\
-									 AT91C_MCI_RENDE |\
-									 AT91C_MCI_RCRCE |\
-									 AT91C_MCI_RDIRE |\
-									 AT91C_MCI_RINDE)
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// OCR Register
-////////////////////////////////////////////////////////////////////////////////////////////////////
-#define AT91C_VDD_16_17					(1 << 4)
-#define AT91C_VDD_17_18					(1 << 5)
-#define AT91C_VDD_18_19					(1 << 6)
-#define AT91C_VDD_19_20					(1 << 7)
-#define AT91C_VDD_20_21					(1 << 8)
-#define AT91C_VDD_21_22					(1 << 9)
-#define AT91C_VDD_22_23					(1 << 10)
-#define AT91C_VDD_23_24					(1 << 11)
-#define AT91C_VDD_24_25					(1 << 12)
-#define AT91C_VDD_25_26					(1 << 13)
-#define AT91C_VDD_26_27					(1 << 14)
-#define AT91C_VDD_27_28					(1 << 15)
-#define AT91C_VDD_28_29					(1 << 16)
-#define AT91C_VDD_29_30					(1 << 17)
-#define AT91C_VDD_30_31					(1 << 18)
-#define AT91C_VDD_31_32					(1 << 19)
-#define AT91C_VDD_32_33					(1 << 20)
-#define AT91C_VDD_33_34					(1 << 21)
-#define AT91C_VDD_34_35					(1 << 22)
-#define AT91C_VDD_35_36					(1 << 23)
-#define AT91C_CARD_POWER_UP_BUSY		(1 << 31)
-
-#define AT91C_MMC_HOST_VOLTAGE_RANGE	(AT91C_VDD_27_28 +\
-										AT91C_VDD_28_29 +\
-										AT91C_VDD_29_30 +\
-										AT91C_VDD_30_31 +\
-										AT91C_VDD_31_32 +\
-										AT91C_VDD_32_33)
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// CURRENT_STATE & READY_FOR_DATA in SDCard Status Register definition (response type R1)
-////////////////////////////////////////////////////////////////////////////////////////////////////
-#define AT91C_SR_READY_FOR_DATA				(1 << 8)	// corresponds to buffer empty signalling on the bus
-#define AT91C_SR_IDLE						(0 << 9)
-#define AT91C_SR_READY						(1 << 9)
-#define AT91C_SR_IDENT						(2 << 9)
-#define AT91C_SR_STBY						(3 << 9)
-#define AT91C_SR_TRAN						(4 << 9)
-#define AT91C_SR_DATA						(5 << 9)
-#define AT91C_SR_RCV						(6 << 9)
-#define AT91C_SR_PRG						(7 << 9)
-#define AT91C_SR_DIS						(8 << 9)
-
-#define AT91C_SR_CARD_SELECTED				(AT91C_SR_READY_FOR_DATA + AT91C_SR_TRAN)
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-// MMC CSD register header File					
-// AT91C_CSD_xxx_S	for shift value
-// AT91C_CSD_xxx_M	for mask  value
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-// First Response INT <=> CSD[3] : bits 0 to 31
-#define	AT91C_CSD_BIT0_S			0		// [0:0]			
-#define	AT91C_CSD_BIT0_M			0x01				
-#define	AT91C_CSD_CRC_S				1		// [7:1]
-#define	AT91C_CSD_CRC_M				0x7F
-#define	AT91C_CSD_MMC_ECC_S			8		// [9:8]		reserved for MMC compatibility
-#define	AT91C_CSD_MMC_ECC_M			0x03
-#define	AT91C_CSD_FILE_FMT_S		10		// [11:10]
-#define	AT91C_CSD_FILE_FMT_M		0x03
-#define	AT91C_CSD_TMP_WP_S			12		// [12:12]
-#define	AT91C_CSD_TMP_WP_M			0x01
-#define	AT91C_CSD_PERM_WP_S 		13		// [13:13]
-#define	AT91C_CSD_PERM_WP_M 		0x01
-#define	AT91C_CSD_COPY_S	 		14		// [14:14]
-#define	AT91C_CSD_COPY_M 			0x01
-#define	AT91C_CSD_FILE_FMT_GRP_S	15		// [15:15]
-#define	AT91C_CSD_FILE_FMT_GRP_M	0x01
-//	reserved						16		// [20:16]
-//	reserved						0x1F
-#define	AT91C_CSD_WBLOCK_P_S 		21		// [21:21]
-#define	AT91C_CSD_WBLOCK_P_M 		0x01
-#define	AT91C_CSD_WBLEN_S 			22		// [25:22]
-#define	AT91C_CSD_WBLEN_M 			0x0F
-#define	AT91C_CSD_R2W_F_S 			26		// [28:26]
-#define	AT91C_CSD_R2W_F_M 			0x07
-#define	AT91C_CSD_MMC_DEF_ECC_S		29		// [30:29]		reserved for MMC compatibility
-#define	AT91C_CSD_MMC_DEF_ECC_M		0x03
-#define	AT91C_CSD_WP_GRP_EN_S		31		// [31:31]
-#define	AT91C_CSD_WP_GRP_EN_M 		0x01
-
-// Seconde Response INT <=> CSD[2] : bits 32 to 63
-#define	AT91C_CSD_v21_WP_GRP_SIZE_S	0		// [38:32]				
-#define	AT91C_CSD_v21_WP_GRP_SIZE_M	0x7F				
-#define	AT91C_CSD_v21_SECT_SIZE_S	7		// [45:39]
-#define	AT91C_CSD_v21_SECT_SIZE_M	0x7F
-#define	AT91C_CSD_v21_ER_BLEN_EN_S	14		// [46:46]
-#define	AT91C_CSD_v21_ER_BLEN_EN_M	0x01
-
-#define	AT91C_CSD_v22_WP_GRP_SIZE_S	0		// [36:32]				
-#define	AT91C_CSD_v22_WP_GRP_SIZE_M	0x1F				
-#define	AT91C_CSD_v22_ER_GRP_SIZE_S	5		// [41:37]
-#define	AT91C_CSD_v22_ER_GRP_SIZE_M	0x1F
-#define	AT91C_CSD_v22_SECT_SIZE_S	10		// [46:42]
-#define	AT91C_CSD_v22_SECT_SIZE_M	0x1F
-
-#define	AT91C_CSD_C_SIZE_M_S		15		// [49:47]
-#define	AT91C_CSD_C_SIZE_M_M		0x07
-#define	AT91C_CSD_VDD_WMAX_S 		18		// [52:50]
-#define	AT91C_CSD_VDD_WMAX_M 		0x07
-#define	AT91C_CSD_VDD_WMIN_S	 	21		// [55:53]
-#define	AT91C_CSD_VDD_WMIN_M 		0x07
-#define	AT91C_CSD_RCUR_MAX_S 		24		// [58:56]
-#define	AT91C_CSD_RCUR_MAX_M 		0x07
-#define	AT91C_CSD_RCUR_MIN_S 		27		// [61:59]
-#define	AT91C_CSD_RCUR_MIN_M 		0x07
-#define	AT91C_CSD_CSIZE_L_S 		30		// [63:62] <=> 2 LSB of CSIZE
-#define	AT91C_CSD_CSIZE_L_M 		0x03
-
-// Third Response INT <=> CSD[1] : bits 64 to 95
-#define	AT91C_CSD_CSIZE_H_S 		0		// [73:64]	<=> 10 MSB of CSIZE
-#define	AT91C_CSD_CSIZE_H_M 		0x03FF
-// reserved							10		// [75:74]
-// reserved							0x03		
-#define	AT91C_CSD_DSR_I_S 			12		// [76:76]
-#define	AT91C_CSD_DSR_I_M 			0x01
-#define	AT91C_CSD_RD_B_MIS_S 		13		// [77:77]
-#define	AT91C_CSD_RD_B_MIS_M 		0x01
-#define	AT91C_CSD_WR_B_MIS_S 		14		// [78:78]
-#define	AT91C_CSD_WR_B_MIS_M 		0x01
-#define	AT91C_CSD_RD_B_PAR_S 		15		// [79:79]
-#define	AT91C_CSD_RD_B_PAR_M 		0x01
-#define	AT91C_CSD_RD_B_LEN_S 		16		// [83:80]
-#define	AT91C_CSD_RD_B_LEN_M 		0x0F
-#define	AT91C_CSD_CCC_S	 			20		// [95:84]
-#define	AT91C_CSD_CCC_M 			0x0FFF
-
-// Fourth Response INT <=> CSD[0] : bits 96 to 127
-#define	AT91C_CSD_TRANS_SPEED_S 	0		// [103:96]
-#define	AT91C_CSD_TRANS_SPEED_M 	0xFF
-#define	AT91C_CSD_NSAC_S 			8		// [111:104]
-#define	AT91C_CSD_NSAC_M 			0xFF
-#define	AT91C_CSD_TAAC_S 			16		// [119:112]
-#define	AT91C_CSD_TAAC_M 			0xFF
-//	reserved						24		// [121:120]
-//	reserved						0x03
-#define	AT91C_CSD_MMC_SPEC_VERS_S	26		// [125:122]	reserved for MMC compatibility
-#define	AT91C_CSD_MMC_SPEC_VERS_M	0x0F
-#define	AT91C_CSD_STRUCT_S			30		// [127:126]
-#define	AT91C_CSD_STRUCT_M 			0x03
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#endif
-
diff --git a/target/linux/at91/image/dfboot/src/include/AT91RM9200.h b/target/linux/at91/image/dfboot/src/include/AT91RM9200.h
deleted file mode 100644
index 0cd153b42..000000000
--- a/target/linux/at91/image/dfboot/src/include/AT91RM9200.h
+++ /dev/null
@@ -1,2745 +0,0 @@
-// ----------------------------------------------------------------------------
-//          ATMEL Microcontroller Software Support  -  ROUSSET  -
-// ----------------------------------------------------------------------------
-//  The software is delivered "AS IS" without warranty or condition of any
-//  kind, either express, implied or statutory. This includes without
-//  limitation any warranty or condition with respect to merchantability or
-//  fitness for any particular purpose, or against the infringements of
-//  intellectual property rights of others.
-// ----------------------------------------------------------------------------
-// File Name           : AT91RM9200.h
-// Object              : AT91RM9200 definitions
-// Generated           : AT91 SW Application Group  11/19/2003 (17:20:50)
-// 
-// CVS Reference       : /AT91RM9200.pl/1.16/Fri Feb 07 10:29:51 2003//
-// CVS Reference       : /SYS_AT91RM9200.pl/1.2/Fri Jan 17 12:44:37 2003//
-// CVS Reference       : /MC_1760A.pl/1.1/Fri Aug 23 14:38:22 2002//
-// CVS Reference       : /AIC_1796B.pl/1.1.1.1/Fri Jun 28 09:36:47 2002//
-// CVS Reference       : /PMC_2636A.pl/1.1.1.1/Fri Jun 28 09:36:48 2002//
-// CVS Reference       : /ST_1763B.pl/1.1/Fri Aug 23 14:41:42 2002//
-// CVS Reference       : /RTC_1245D.pl/1.2/Fri Jan 31 12:19:06 2003//
-// CVS Reference       : /PIO_1725D.pl/1.1.1.1/Fri Jun 28 09:36:47 2002//
-// CVS Reference       : /DBGU_1754A.pl/1.4/Fri Jan 31 12:18:24 2003//
-// CVS Reference       : /UDP_1765B.pl/1.3/Fri Aug 02 14:45:38 2002//
-// CVS Reference       : /MCI_1764A.pl/1.2/Thu Nov 14 17:48:24 2002//
-// CVS Reference       : /US_1739C.pl/1.2/Fri Jul 12 07:49:25 2002//
-// CVS Reference       : /SPI_AT91RMxxxx.pl/1.3/Tue Nov 26 10:20:29 2002//
-// CVS Reference       : /SSC_1762A.pl/1.2/Fri Nov 08 13:26:39 2002//
-// CVS Reference       : /TC_1753B.pl/1.2/Fri Jan 31 12:19:55 2003//
-// CVS Reference       : /TWI_1761B.pl/1.4/Fri Feb 07 10:30:07 2003//
-// CVS Reference       : /PDC_1734B.pl/1.2/Thu Nov 21 16:38:23 2002//
-// CVS Reference       : /UHP_xxxxA.pl/1.1/Mon Jul 22 12:21:58 2002//
-// CVS Reference       : /EMAC_1794A.pl/1.4/Fri Jan 17 12:11:54 2003//
-// CVS Reference       : /EBI_1759B.pl/1.10/Fri Jan 17 12:44:29 2003//
-// CVS Reference       : /SMC_1783A.pl/1.3/Thu Oct 31 14:38:17 2002//
-// CVS Reference       : /SDRC_1758B.pl/1.2/Thu Oct 03 13:04:41 2002//
-// CVS Reference       : /BFC_1757B.pl/1.3/Thu Oct 31 14:38:00 2002//
-// ----------------------------------------------------------------------------
-
-#ifndef AT91RM9200_H
-#define AT91RM9200_H
-
-typedef volatile unsigned int AT91_REG;// Hardware register definition
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR System Peripherals
-// *****************************************************************************
-typedef struct _AT91S_SYS {
-	AT91_REG	 AIC_SMR[32]; 	// Source Mode Register
-	AT91_REG	 AIC_SVR[32]; 	// Source Vector Register
-	AT91_REG	 AIC_IVR; 	// IRQ Vector Register
-	AT91_REG	 AIC_FVR; 	// FIQ Vector Register
-	AT91_REG	 AIC_ISR; 	// Interrupt Status Register
-	AT91_REG	 AIC_IPR; 	// Interrupt Pending Register
-	AT91_REG	 AIC_IMR; 	// Interrupt Mask Register
-	AT91_REG	 AIC_CISR; 	// Core Interrupt Status Register
-	AT91_REG	 Reserved0[2]; 	// 
-	AT91_REG	 AIC_IECR; 	// Interrupt Enable Command Register
-	AT91_REG	 AIC_IDCR; 	// Interrupt Disable Command Register
-	AT91_REG	 AIC_ICCR; 	// Interrupt Clear Command Register
-	AT91_REG	 AIC_ISCR; 	// Interrupt Set Command Register
-	AT91_REG	 AIC_EOICR; 	// End of Interrupt Command Register
-	AT91_REG	 AIC_SPU; 	// Spurious Vector Register
-	AT91_REG	 AIC_DCR; 	// Debug Control Register (Protect)
-	AT91_REG	 Reserved1[1]; 	// 
-	AT91_REG	 AIC_FFER; 	// Fast Forcing Enable Register
-	AT91_REG	 AIC_FFDR; 	// Fast Forcing Disable Register
-	AT91_REG	 AIC_FFSR; 	// Fast Forcing Status Register
-	AT91_REG	 Reserved2[45]; 	// 
-	AT91_REG	 DBGU_CR; 	// Control Register
-	AT91_REG	 DBGU_MR; 	// Mode Register
-	AT91_REG	 DBGU_IER; 	// Interrupt Enable Register
-	AT91_REG	 DBGU_IDR; 	// Interrupt Disable Register
-	AT91_REG	 DBGU_IMR; 	// Interrupt Mask Register
-	AT91_REG	 DBGU_CSR; 	// Channel Status Register
-	AT91_REG	 DBGU_RHR; 	// Receiver Holding Register
-	AT91_REG	 DBGU_THR; 	// Transmitter Holding Register
-	AT91_REG	 DBGU_BRGR; 	// Baud Rate Generator Register
-	AT91_REG	 Reserved3[7]; 	// 
-	AT91_REG	 DBGU_C1R; 	// Chip ID1 Register
-	AT91_REG	 DBGU_C2R; 	// Chip ID2 Register
-	AT91_REG	 DBGU_FNTR; 	// Force NTRST Register
-	AT91_REG	 Reserved4[45]; 	// 
-	AT91_REG	 DBGU_RPR; 	// Receive Pointer Register
-	AT91_REG	 DBGU_RCR; 	// Receive Counter Register
-	AT91_REG	 DBGU_TPR; 	// Transmit Pointer Register
-	AT91_REG	 DBGU_TCR; 	// Transmit Counter Register
-	AT91_REG	 DBGU_RNPR; 	// Receive Next Pointer Register
-	AT91_REG	 DBGU_RNCR; 	// Receive Next Counter Register
-	AT91_REG	 DBGU_TNPR; 	// Transmit Next Pointer Register
-	AT91_REG	 DBGU_TNCR; 	// Transmit Next Counter Register
-	AT91_REG	 DBGU_PTCR; 	// PDC Transfer Control Register
-	AT91_REG	 DBGU_PTSR; 	// PDC Transfer Status Register
-	AT91_REG	 Reserved5[54]; 	// 
-	AT91_REG	 PIOA_PER; 	// PIO Enable Register
-	AT91_REG	 PIOA_PDR; 	// PIO Disable Register
-	AT91_REG	 PIOA_PSR; 	// PIO Status Register
-	AT91_REG	 Reserved6[1]; 	// 
-	AT91_REG	 PIOA_OER; 	// Output Enable Register
-	AT91_REG	 PIOA_ODR; 	// Output Disable Registerr
-	AT91_REG	 PIOA_OSR; 	// Output Status Register
-	AT91_REG	 Reserved7[1]; 	// 
-	AT91_REG	 PIOA_IFER; 	// Input Filter Enable Register
-	AT91_REG	 PIOA_IFDR; 	// Input Filter Disable Register
-	AT91_REG	 PIOA_IFSR; 	// Input Filter Status Register
-	AT91_REG	 Reserved8[1]; 	// 
-	AT91_REG	 PIOA_SODR; 	// Set Output Data Register
-	AT91_REG	 PIOA_CODR; 	// Clear Output Data Register
-	AT91_REG	 PIOA_ODSR; 	// Output Data Status Register
-	AT91_REG	 PIOA_PDSR; 	// Pin Data Status Register
-	AT91_REG	 PIOA_IER; 	// Interrupt Enable Register
-	AT91_REG	 PIOA_IDR; 	// Interrupt Disable Register
-	AT91_REG	 PIOA_IMR; 	// Interrupt Mask Register
-	AT91_REG	 PIOA_ISR; 	// Interrupt Status Register
-	AT91_REG	 PIOA_MDER; 	// Multi-driver Enable Register
-	AT91_REG	 PIOA_MDDR; 	// Multi-driver Disable Register
-	AT91_REG	 PIOA_MDSR; 	// Multi-driver Status Register
-	AT91_REG	 Reserved9[1]; 	// 
-	AT91_REG	 PIOA_PPUDR; 	// Pull-up Disable Register
-	AT91_REG	 PIOA_PPUER; 	// Pull-up Enable Register
-	AT91_REG	 PIOA_PPUSR; 	// Pad Pull-up Status Register
-	AT91_REG	 Reserved10[1]; 	// 
-	AT91_REG	 PIOA_ASR; 	// Select A Register
-	AT91_REG	 PIOA_BSR; 	// Select B Register
-	AT91_REG	 PIOA_ABSR; 	// AB Select Status Register
-	AT91_REG	 Reserved11[9]; 	// 
-	AT91_REG	 PIOA_OWER; 	// Output Write Enable Register
-	AT91_REG	 PIOA_OWDR; 	// Output Write Disable Register
-	AT91_REG	 PIOA_OWSR; 	// Output Write Status Register
-	AT91_REG	 Reserved12[85]; 	// 
-	AT91_REG	 PIOB_PER; 	// PIO Enable Register
-	AT91_REG	 PIOB_PDR; 	// PIO Disable Register
-	AT91_REG	 PIOB_PSR; 	// PIO Status Register
-	AT91_REG	 Reserved13[1]; 	// 
-	AT91_REG	 PIOB_OER; 	// Output Enable Register
-	AT91_REG	 PIOB_ODR; 	// Output Disable Registerr
-	AT91_REG	 PIOB_OSR; 	// Output Status Register
-	AT91_REG	 Reserved14[1]; 	// 
-	AT91_REG	 PIOB_IFER; 	// Input Filter Enable Register
-	AT91_REG	 PIOB_IFDR; 	// Input Filter Disable Register
-	AT91_REG	 PIOB_IFSR; 	// Input Filter Status Register
-	AT91_REG	 Reserved15[1]; 	// 
-	AT91_REG	 PIOB_SODR; 	// Set Output Data Register
-	AT91_REG	 PIOB_CODR; 	// Clear Output Data Register
-	AT91_REG	 PIOB_ODSR; 	// Output Data Status Register
-	AT91_REG	 PIOB_PDSR; 	// Pin Data Status Register
-	AT91_REG	 PIOB_IER; 	// Interrupt Enable Register
-	AT91_REG	 PIOB_IDR; 	// Interrupt Disable Register
-	AT91_REG	 PIOB_IMR; 	// Interrupt Mask Register
-	AT91_REG	 PIOB_ISR; 	// Interrupt Status Register
-	AT91_REG	 PIOB_MDER; 	// Multi-driver Enable Register
-	AT91_REG	 PIOB_MDDR; 	// Multi-driver Disable Register
-	AT91_REG	 PIOB_MDSR; 	// Multi-driver Status Register
-	AT91_REG	 Reserved16[1]; 	// 
-	AT91_REG	 PIOB_PPUDR; 	// Pull-up Disable Register
-	AT91_REG	 PIOB_PPUER; 	// Pull-up Enable Register
-	AT91_REG	 PIOB_PPUSR; 	// Pad Pull-up Status Register
-	AT91_REG	 Reserved17[1]; 	// 
-	AT91_REG	 PIOB_ASR; 	// Select A Register
-	AT91_REG	 PIOB_BSR; 	// Select B Register
-	AT91_REG	 PIOB_ABSR; 	// AB Select Status Register
-	AT91_REG	 Reserved18[9]; 	// 
-	AT91_REG	 PIOB_OWER; 	// Output Write Enable Register
-	AT91_REG	 PIOB_OWDR; 	// Output Write Disable Register
-	AT91_REG	 PIOB_OWSR; 	// Output Write Status Register
-	AT91_REG	 Reserved19[85]; 	// 
-	AT91_REG	 PIOC_PER; 	// PIO Enable Register
-	AT91_REG	 PIOC_PDR; 	// PIO Disable Register
-	AT91_REG	 PIOC_PSR; 	// PIO Status Register
-	AT91_REG	 Reserved20[1]; 	// 
-	AT91_REG	 PIOC_OER; 	// Output Enable Register
-	AT91_REG	 PIOC_ODR; 	// Output Disable Registerr
-	AT91_REG	 PIOC_OSR; 	// Output Status Register
-	AT91_REG	 Reserved21[1]; 	// 
-	AT91_REG	 PIOC_IFER; 	// Input Filter Enable Register
-	AT91_REG	 PIOC_IFDR; 	// Input Filter Disable Register
-	AT91_REG	 PIOC_IFSR; 	// Input Filter Status Register
-	AT91_REG	 Reserved22[1]; 	// 
-	AT91_REG	 PIOC_SODR; 	// Set Output Data Register
-	AT91_REG	 PIOC_CODR; 	// Clear Output Data Register
-	AT91_REG	 PIOC_ODSR; 	// Output Data Status Register
-	AT91_REG	 PIOC_PDSR; 	// Pin Data Status Register
-	AT91_REG	 PIOC_IER; 	// Interrupt Enable Register
-	AT91_REG	 PIOC_IDR; 	// Interrupt Disable Register
-	AT91_REG	 PIOC_IMR; 	// Interrupt Mask Register
-	AT91_REG	 PIOC_ISR; 	// Interrupt Status Register
-	AT91_REG	 PIOC_MDER; 	// Multi-driver Enable Register
-	AT91_REG	 PIOC_MDDR; 	// Multi-driver Disable Register
-	AT91_REG	 PIOC_MDSR; 	// Multi-driver Status Register
-	AT91_REG	 Reserved23[1]; 	// 
-	AT91_REG	 PIOC_PPUDR; 	// Pull-up Disable Register
-	AT91_REG	 PIOC_PPUER; 	// Pull-up Enable Register
-	AT91_REG	 PIOC_PPUSR; 	// Pad Pull-up Status Register
-	AT91_REG	 Reserved24[1]; 	// 
-	AT91_REG	 PIOC_ASR; 	// Select A Register
-	AT91_REG	 PIOC_BSR; 	// Select B Register
-	AT91_REG	 PIOC_ABSR; 	// AB Select Status Register
-	AT91_REG	 Reserved25[9]; 	// 
-	AT91_REG	 PIOC_OWER; 	// Output Write Enable Register
-	AT91_REG	 PIOC_OWDR; 	// Output Write Disable Register
-	AT91_REG	 PIOC_OWSR; 	// Output Write Status Register
-	AT91_REG	 Reserved26[85]; 	// 
-	AT91_REG	 PIOD_PER; 	// PIO Enable Register
-	AT91_REG	 PIOD_PDR; 	// PIO Disable Register
-	AT91_REG	 PIOD_PSR; 	// PIO Status Register
-	AT91_REG	 Reserved27[1]; 	// 
-	AT91_REG	 PIOD_OER; 	// Output Enable Register
-	AT91_REG	 PIOD_ODR; 	// Output Disable Registerr
-	AT91_REG	 PIOD_OSR; 	// Output Status Register
-	AT91_REG	 Reserved28[1]; 	// 
-	AT91_REG	 PIOD_IFER; 	// Input Filter Enable Register
-	AT91_REG	 PIOD_IFDR; 	// Input Filter Disable Register
-	AT91_REG	 PIOD_IFSR; 	// Input Filter Status Register
-	AT91_REG	 Reserved29[1]; 	// 
-	AT91_REG	 PIOD_SODR; 	// Set Output Data Register
-	AT91_REG	 PIOD_CODR; 	// Clear Output Data Register
-	AT91_REG	 PIOD_ODSR; 	// Output Data Status Register
-	AT91_REG	 PIOD_PDSR; 	// Pin Data Status Register
-	AT91_REG	 PIOD_IER; 	// Interrupt Enable Register
-	AT91_REG	 PIOD_IDR; 	// Interrupt Disable Register
-	AT91_REG	 PIOD_IMR; 	// Interrupt Mask Register
-	AT91_REG	 PIOD_ISR; 	// Interrupt Status Register
-	AT91_REG	 PIOD_MDER; 	// Multi-driver Enable Register
-	AT91_REG	 PIOD_MDDR; 	// Multi-driver Disable Register
-	AT91_REG	 PIOD_MDSR; 	// Multi-driver Status Register
-	AT91_REG	 Reserved30[1]; 	// 
-	AT91_REG	 PIOD_PPUDR; 	// Pull-up Disable Register
-	AT91_REG	 PIOD_PPUER; 	// Pull-up Enable Register
-	AT91_REG	 PIOD_PPUSR; 	// Pad Pull-up Status Register
-	AT91_REG	 Reserved31[1]; 	// 
-	AT91_REG	 PIOD_ASR; 	// Select A Register
-	AT91_REG	 PIOD_BSR; 	// Select B Register
-	AT91_REG	 PIOD_ABSR; 	// AB Select Status Register
-	AT91_REG	 Reserved32[9]; 	// 
-	AT91_REG	 PIOD_OWER; 	// Output Write Enable Register
-	AT91_REG	 PIOD_OWDR; 	// Output Write Disable Register
-	AT91_REG	 PIOD_OWSR; 	// Output Write Status Register
-	AT91_REG	 Reserved33[85]; 	// 
-	AT91_REG	 PMC_SCER; 	// System Clock Enable Register
-	AT91_REG	 PMC_SCDR; 	// System Clock Disable Register
-	AT91_REG	 PMC_SCSR; 	// System Clock Status Register
-	AT91_REG	 Reserved34[1]; 	// 
-	AT91_REG	 PMC_PCER; 	// Peripheral Clock Enable Register
-	AT91_REG	 PMC_PCDR; 	// Peripheral Clock Disable Register
-	AT91_REG	 PMC_PCSR; 	// Peripheral Clock Status Register
-	AT91_REG	 Reserved35[1]; 	// 
-	AT91_REG	 CKGR_MOR; 	// Main Oscillator Register
-	AT91_REG	 CKGR_MCFR; 	// Main Clock  Frequency Register
-	AT91_REG	 CKGR_PLLAR; 	// PLL A Register
-	AT91_REG	 CKGR_PLLBR; 	// PLL B Register
-	AT91_REG	 PMC_MCKR; 	// Master Clock Register
-	AT91_REG	 Reserved36[3]; 	// 
-	AT91_REG	 PMC_PCKR[8]; 	// Programmable Clock Register
-	AT91_REG	 PMC_IER; 	// Interrupt Enable Register
-	AT91_REG	 PMC_IDR; 	// Interrupt Disable Register
-	AT91_REG	 PMC_SR; 	// Status Register
-	AT91_REG	 PMC_IMR; 	// Interrupt Mask Register
-	AT91_REG	 Reserved37[36]; 	// 
-	AT91_REG	 ST_CR; 	// Control Register
-	AT91_REG	 ST_PIMR; 	// Period Interval Mode Register
-	AT91_REG	 ST_WDMR; 	// Watchdog Mode Register
-	AT91_REG	 ST_RTMR; 	// Real-time Mode Register
-	AT91_REG	 ST_SR; 	// Status Register
-	AT91_REG	 ST_IER; 	// Interrupt Enable Register
-	AT91_REG	 ST_IDR; 	// Interrupt Disable Register
-	AT91_REG	 ST_IMR; 	// Interrupt Mask Register
-	AT91_REG	 ST_RTAR; 	// Real-time Alarm Register
-	AT91_REG	 ST_CRTR; 	// Current Real-time Register
-	AT91_REG	 Reserved38[54]; 	// 
-	AT91_REG	 RTC_CR; 	// Control Register
-	AT91_REG	 RTC_MR; 	// Mode Register
-	AT91_REG	 RTC_TIMR; 	// Time Register
-	AT91_REG	 RTC_CALR; 	// Calendar Register
-	AT91_REG	 RTC_TIMALR; 	// Time Alarm Register
-	AT91_REG	 RTC_CALALR; 	// Calendar Alarm Register
-	AT91_REG	 RTC_SR; 	// Status Register
-	AT91_REG	 RTC_SCCR; 	// Status Clear Command Register
-	AT91_REG	 RTC_IER; 	// Interrupt Enable Register
-	AT91_REG	 RTC_IDR; 	// Interrupt Disable Register
-	AT91_REG	 RTC_IMR; 	// Interrupt Mask Register
-	AT91_REG	 RTC_VER; 	// Valid Entry Register
-	AT91_REG	 Reserved39[52]; 	// 
-	AT91_REG	 MC_RCR; 	// MC Remap Control Register
-	AT91_REG	 MC_ASR; 	// MC Abort Status Register
-	AT91_REG	 MC_AASR; 	// MC Abort Address Status Register
-	AT91_REG	 Reserved40[1]; 	// 
-	AT91_REG	 MC_PUIA[16]; 	// MC Protection Unit Area
-	AT91_REG	 MC_PUP; 	// MC Protection Unit Peripherals
-	AT91_REG	 MC_PUER; 	// MC Protection Unit Enable Register
-	AT91_REG	 Reserved41[2]; 	// 
-	AT91_REG	 EBI_CSA; 	// Chip Select Assignment Register
-	AT91_REG	 EBI_CFGR; 	// Configuration Register
-	AT91_REG	 Reserved42[2]; 	// 
-	AT91_REG	 EBI_SMC2_CSR[8]; 	// SMC2 Chip Select Register
-	AT91_REG	 EBI_SDRC_MR; 	// SDRAM Controller Mode Register
-	AT91_REG	 EBI_SDRC_TR; 	// SDRAM Controller Refresh Timer Register
-	AT91_REG	 EBI_SDRC_CR; 	// SDRAM Controller Configuration Register
-	AT91_REG	 EBI_SDRC_SRR; 	// SDRAM Controller Self Refresh Register
-	AT91_REG	 EBI_SDRC_LPR; 	// SDRAM Controller Low Power Register
-	AT91_REG	 EBI_SDRC_IER; 	// SDRAM Controller Interrupt Enable Register
-	AT91_REG	 EBI_SDRC_IDR; 	// SDRAM Controller Interrupt Disable Register
-	AT91_REG	 EBI_SDRC_IMR; 	// SDRAM Controller Interrupt Mask Register
-	AT91_REG	 EBI_SDRC_ISR; 	// SDRAM Controller Interrupt Mask Register
-	AT91_REG	 Reserved43[3]; 	// 
-	AT91_REG	 EBI_BFC_MR; 	// BFC Mode Register
-} AT91S_SYS, *AT91PS_SYS;
-
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR Memory Controller Interface
-// *****************************************************************************
-typedef struct _AT91S_MC {
-	AT91_REG	 MC_RCR; 	// MC Remap Control Register
-	AT91_REG	 MC_ASR; 	// MC Abort Status Register
-	AT91_REG	 MC_AASR; 	// MC Abort Address Status Register
-	AT91_REG	 Reserved0[1]; 	// 
-	AT91_REG	 MC_PUIA[16]; 	// MC Protection Unit Area
-	AT91_REG	 MC_PUP; 	// MC Protection Unit Peripherals
-	AT91_REG	 MC_PUER; 	// MC Protection Unit Enable Register
-} AT91S_MC, *AT91PS_MC;
-
-// -------- MC_RCR : (MC Offset: 0x0) MC Remap Control Register -------- 
-#define AT91C_MC_RCB          ((unsigned int) 0x1 <<  0) // (MC) Remap Command Bit
-// -------- MC_ASR : (MC Offset: 0x4) MC Abort Status Register -------- 
-#define AT91C_MC_UNDADD       ((unsigned int) 0x1 <<  0) // (MC) Undefined Addess Abort Status
-#define AT91C_MC_MISADD       ((unsigned int) 0x1 <<  1) // (MC) Misaligned Addess Abort Status
-#define AT91C_MC_MPU          ((unsigned int) 0x1 <<  2) // (MC) Memory protection Unit Abort Status
-#define AT91C_MC_ABTSZ        ((unsigned int) 0x3 <<  8) // (MC) Abort Size Status
-#define 	AT91C_MC_ABTSZ_BYTE                 ((unsigned int) 0x0 <<  8) // (MC) Byte
-#define 	AT91C_MC_ABTSZ_HWORD                ((unsigned int) 0x1 <<  8) // (MC) Half-word
-#define 	AT91C_MC_ABTSZ_WORD                 ((unsigned int) 0x2 <<  8) // (MC) Word
-#define AT91C_MC_ABTTYP       ((unsigned int) 0x3 << 10) // (MC) Abort Type Status
-#define 	AT91C_MC_ABTTYP_DATAR                ((unsigned int) 0x0 << 10) // (MC) Data Read
-#define 	AT91C_MC_ABTTYP_DATAW                ((unsigned int) 0x1 << 10) // (MC) Data Write
-#define 	AT91C_MC_ABTTYP_FETCH                ((unsigned int) 0x2 << 10) // (MC) Code Fetch
-#define AT91C_MC_MST0         ((unsigned int) 0x1 << 16) // (MC) Master 0 Abort Source
-#define AT91C_MC_MST1         ((unsigned int) 0x1 << 17) // (MC) Master 1 Abort Source
-#define AT91C_MC_SVMST0       ((unsigned int) 0x1 << 24) // (MC) Saved Master 0 Abort Source
-#define AT91C_MC_SVMST1       ((unsigned int) 0x1 << 25) // (MC) Saved Master 1 Abort Source
-// -------- MC_PUIA : (MC Offset: 0x10) MC Protection Unit Area -------- 
-#define AT91C_MC_PROT         ((unsigned int) 0x3 <<  0) // (MC) Protection
-#define 	AT91C_MC_PROT_PNAUNA               ((unsigned int) 0x0) // (MC) Privilege: No Access, User: No Access
-#define 	AT91C_MC_PROT_PRWUNA               ((unsigned int) 0x1) // (MC) Privilege: Read/Write, User: No Access
-#define 	AT91C_MC_PROT_PRWURO               ((unsigned int) 0x2) // (MC) Privilege: Read/Write, User: Read Only
-#define 	AT91C_MC_PROT_PRWURW               ((unsigned int) 0x3) // (MC) Privilege: Read/Write, User: Read/Write
-#define AT91C_MC_SIZE         ((unsigned int) 0xF <<  4) // (MC) Internal Area Size
-#define 	AT91C_MC_SIZE_1KB                  ((unsigned int) 0x0 <<  4) // (MC) Area size 1KByte
-#define 	AT91C_MC_SIZE_2KB                  ((unsigned int) 0x1 <<  4) // (MC) Area size 2KByte
-#define 	AT91C_MC_SIZE_4KB                  ((unsigned int) 0x2 <<  4) // (MC) Area size 4KByte
-#define 	AT91C_MC_SIZE_8KB                  ((unsigned int) 0x3 <<  4) // (MC) Area size 8KByte
-#define 	AT91C_MC_SIZE_16KB                 ((unsigned int) 0x4 <<  4) // (MC) Area size 16KByte
-#define 	AT91C_MC_SIZE_32KB                 ((unsigned int) 0x5 <<  4) // (MC) Area size 32KByte
-#define 	AT91C_MC_SIZE_64KB                 ((unsigned int) 0x6 <<  4) // (MC) Area size 64KByte
-#define 	AT91C_MC_SIZE_128KB                ((unsigned int) 0x7 <<  4) // (MC) Area size 128KByte
-#define 	AT91C_MC_SIZE_256KB                ((unsigned int) 0x8 <<  4) // (MC) Area size 256KByte
-#define 	AT91C_MC_SIZE_512KB                ((unsigned int) 0x9 <<  4) // (MC) Area size 512KByte
-#define 	AT91C_MC_SIZE_1MB                  ((unsigned int) 0xA <<  4) // (MC) Area size 1MByte
-#define 	AT91C_MC_SIZE_2MB                  ((unsigned int) 0xB <<  4) // (MC) Area size 2MByte
-#define 	AT91C_MC_SIZE_4MB                  ((unsigned int) 0xC <<  4) // (MC) Area size 4MByte
-#define 	AT91C_MC_SIZE_8MB                  ((unsigned int) 0xD <<  4) // (MC) Area size 8MByte
-#define 	AT91C_MC_SIZE_16MB                 ((unsigned int) 0xE <<  4) // (MC) Area size 16MByte
-#define 	AT91C_MC_SIZE_64MB                 ((unsigned int) 0xF <<  4) // (MC) Area size 64MByte
-#define AT91C_MC_BA           ((unsigned int) 0x3FFFF << 10) // (MC) Internal Area Base Address
-// -------- MC_PUP : (MC Offset: 0x50) MC Protection Unit Peripheral -------- 
-// -------- MC_PUER : (MC Offset: 0x54) MC Protection Unit Area -------- 
-#define AT91C_MC_PUEB         ((unsigned int) 0x1 <<  0) // (MC) Protection Unit enable Bit
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR Real-time Clock Alarm and Parallel Load Interface
-// *****************************************************************************
-typedef struct _AT91S_RTC {
-	AT91_REG	 RTC_CR; 	// Control Register
-	AT91_REG	 RTC_MR; 	// Mode Register
-	AT91_REG	 RTC_TIMR; 	// Time Register
-	AT91_REG	 RTC_CALR; 	// Calendar Register
-	AT91_REG	 RTC_TIMALR; 	// Time Alarm Register
-	AT91_REG	 RTC_CALALR; 	// Calendar Alarm Register
-	AT91_REG	 RTC_SR; 	// Status Register
-	AT91_REG	 RTC_SCCR; 	// Status Clear Command Register
-	AT91_REG	 RTC_IER; 	// Interrupt Enable Register
-	AT91_REG	 RTC_IDR; 	// Interrupt Disable Register
-	AT91_REG	 RTC_IMR; 	// Interrupt Mask Register
-	AT91_REG	 RTC_VER; 	// Valid Entry Register
-} AT91S_RTC, *AT91PS_RTC;
-
-// -------- RTC_CR : (RTC Offset: 0x0) RTC Control Register -------- 
-#define AT91C_RTC_UPDTIM      ((unsigned int) 0x1 <<  0) // (RTC) Update Request Time Register
-#define AT91C_RTC_UPDCAL      ((unsigned int) 0x1 <<  1) // (RTC) Update Request Calendar Register
-#define AT91C_RTC_TIMEVSEL    ((unsigned int) 0x3 <<  8) // (RTC) Time Event Selection
-#define 	AT91C_RTC_TIMEVSEL_MINUTE               ((unsigned int) 0x0 <<  8) // (RTC) Minute change.
-#define 	AT91C_RTC_TIMEVSEL_HOUR                 ((unsigned int) 0x1 <<  8) // (RTC) Hour change.
-#define 	AT91C_RTC_TIMEVSEL_DAY24                ((unsigned int) 0x2 <<  8) // (RTC) Every day at midnight.
-#define 	AT91C_RTC_TIMEVSEL_DAY12                ((unsigned int) 0x3 <<  8) // (RTC) Every day at noon.
-#define AT91C_RTC_CALEVSEL    ((unsigned int) 0x3 << 16) // (RTC) Calendar Event Selection
-#define 	AT91C_RTC_CALEVSEL_WEEK                 ((unsigned int) 0x0 << 16) // (RTC) Week change (every Monday at time 00:00:00).
-#define 	AT91C_RTC_CALEVSEL_MONTH                ((unsigned int) 0x1 << 16) // (RTC) Month change (every 01 of each month at time 00:00:00).
-#define 	AT91C_RTC_CALEVSEL_YEAR                 ((unsigned int) 0x2 << 16) // (RTC) Year change (every January 1 at time 00:00:00).
-// -------- RTC_MR : (RTC Offset: 0x4) RTC Mode Register -------- 
-#define AT91C_RTC_HRMOD       ((unsigned int) 0x1 <<  0) // (RTC) 12-24 hour Mode
-// -------- RTC_TIMR : (RTC Offset: 0x8) RTC Time Register -------- 
-#define AT91C_RTC_SEC         ((unsigned int) 0x7F <<  0) // (RTC) Current Second
-#define AT91C_RTC_MIN         ((unsigned int) 0x7F <<  8) // (RTC) Current Minute
-#define AT91C_RTC_HOUR        ((unsigned int) 0x1F << 16) // (RTC) Current Hour
-#define AT91C_RTC_AMPM        ((unsigned int) 0x1 << 22) // (RTC) Ante Meridiem, Post Meridiem Indicator
-// -------- RTC_CALR : (RTC Offset: 0xc) RTC Calendar Register -------- 
-#define AT91C_RTC_CENT        ((unsigned int) 0x3F <<  0) // (RTC) Current Century
-#define AT91C_RTC_YEAR        ((unsigned int) 0xFF <<  8) // (RTC) Current Year
-#define AT91C_RTC_MONTH       ((unsigned int) 0x1F << 16) // (RTC) Current Month
-#define AT91C_RTC_DAY         ((unsigned int) 0x7 << 21) // (RTC) Current Day
-#define AT91C_RTC_DATE        ((unsigned int) 0x3F << 24) // (RTC) Current Date
-// -------- RTC_TIMALR : (RTC Offset: 0x10) RTC Time Alarm Register -------- 
-#define AT91C_RTC_SECEN       ((unsigned int) 0x1 <<  7) // (RTC) Second Alarm Enable
-#define AT91C_RTC_MINEN       ((unsigned int) 0x1 << 15) // (RTC) Minute Alarm
-#define AT91C_RTC_HOUREN      ((unsigned int) 0x1 << 23) // (RTC) Current Hour
-// -------- RTC_CALALR : (RTC Offset: 0x14) RTC Calendar Alarm Register -------- 
-#define AT91C_RTC_MONTHEN     ((unsigned int) 0x1 << 23) // (RTC) Month Alarm Enable
-#define AT91C_RTC_DATEEN      ((unsigned int) 0x1 << 31) // (RTC) Date Alarm Enable
-// -------- RTC_SR : (RTC Offset: 0x18) RTC Status Register -------- 
-#define AT91C_RTC_ACKUPD      ((unsigned int) 0x1 <<  0) // (RTC) Acknowledge for Update
-#define AT91C_RTC_ALARM       ((unsigned int) 0x1 <<  1) // (RTC) Alarm Flag
-#define AT91C_RTC_SECEV       ((unsigned int) 0x1 <<  2) // (RTC) Second Event
-#define AT91C_RTC_TIMEV       ((unsigned int) 0x1 <<  3) // (RTC) Time Event
-#define AT91C_RTC_CALEV       ((unsigned int) 0x1 <<  4) // (RTC) Calendar event
-// -------- RTC_SCCR : (RTC Offset: 0x1c) RTC Status Clear Command Register -------- 
-// -------- RTC_IER : (RTC Offset: 0x20) RTC Interrupt Enable Register -------- 
-// -------- RTC_IDR : (RTC Offset: 0x24) RTC Interrupt Disable Register -------- 
-// -------- RTC_IMR : (RTC Offset: 0x28) RTC Interrupt Mask Register -------- 
-// -------- RTC_VER : (RTC Offset: 0x2c) RTC Valid Entry Register -------- 
-#define AT91C_RTC_NVTIM       ((unsigned int) 0x1 <<  0) // (RTC) Non valid Time
-#define AT91C_RTC_NVCAL       ((unsigned int) 0x1 <<  1) // (RTC) Non valid Calendar
-#define AT91C_RTC_NVTIMALR    ((unsigned int) 0x1 <<  2) // (RTC) Non valid time Alarm
-#define AT91C_RTC_NVCALALR    ((unsigned int) 0x1 <<  3) // (RTC) Nonvalid Calendar Alarm
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR System Timer Interface
-// *****************************************************************************
-typedef struct _AT91S_ST {
-	AT91_REG	 ST_CR; 	// Control Register
-	AT91_REG	 ST_PIMR; 	// Period Interval Mode Register
-	AT91_REG	 ST_WDMR; 	// Watchdog Mode Register
-	AT91_REG	 ST_RTMR; 	// Real-time Mode Register
-	AT91_REG	 ST_SR; 	// Status Register
-	AT91_REG	 ST_IER; 	// Interrupt Enable Register
-	AT91_REG	 ST_IDR; 	// Interrupt Disable Register
-	AT91_REG	 ST_IMR; 	// Interrupt Mask Register
-	AT91_REG	 ST_RTAR; 	// Real-time Alarm Register
-	AT91_REG	 ST_CRTR; 	// Current Real-time Register
-} AT91S_ST, *AT91PS_ST;
-
-// -------- ST_CR : (ST Offset: 0x0) System Timer Control Register -------- 
-#define AT91C_ST_WDRST        ((unsigned int) 0x1 <<  0) // (ST) Watchdog Timer Restart
-// -------- ST_PIMR : (ST Offset: 0x4) System Timer Period Interval Mode Register -------- 
-#define AT91C_ST_PIV          ((unsigned int) 0xFFFF <<  0) // (ST) Watchdog Timer Restart
-// -------- ST_WDMR : (ST Offset: 0x8) System Timer Watchdog Mode Register -------- 
-#define AT91C_ST_WDV          ((unsigned int) 0xFFFF <<  0) // (ST) Watchdog Timer Restart
-#define AT91C_ST_RSTEN        ((unsigned int) 0x1 << 16) // (ST) Reset Enable
-#define AT91C_ST_EXTEN        ((unsigned int) 0x1 << 17) // (ST) External Signal Assertion Enable
-// -------- ST_RTMR : (ST Offset: 0xc) System Timer Real-time Mode Register -------- 
-#define AT91C_ST_RTPRES       ((unsigned int) 0xFFFF <<  0) // (ST) Real-time Timer Prescaler Value
-// -------- ST_SR : (ST Offset: 0x10) System Timer Status Register -------- 
-#define AT91C_ST_PITS         ((unsigned int) 0x1 <<  0) // (ST) Period Interval Timer Interrupt
-#define AT91C_ST_WDOVF        ((unsigned int) 0x1 <<  1) // (ST) Watchdog Overflow
-#define AT91C_ST_RTTINC       ((unsigned int) 0x1 <<  2) // (ST) Real-time Timer Increment
-#define AT91C_ST_ALMS         ((unsigned int) 0x1 <<  3) // (ST) Alarm Status
-// -------- ST_IER : (ST Offset: 0x14) System Timer Interrupt Enable Register -------- 
-// -------- ST_IDR : (ST Offset: 0x18) System Timer Interrupt Disable Register -------- 
-// -------- ST_IMR : (ST Offset: 0x1c) System Timer Interrupt Mask Register -------- 
-// -------- ST_RTAR : (ST Offset: 0x20) System Timer Real-time Alarm Register -------- 
-#define AT91C_ST_ALMV         ((unsigned int) 0xFFFFF <<  0) // (ST) Alarm Value Value
-// -------- ST_CRTR : (ST Offset: 0x24) System Timer Current Real-time Register -------- 
-#define AT91C_ST_CRTV         ((unsigned int) 0xFFFFF <<  0) // (ST) Current Real-time Value
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR Power Management Controler
-// *****************************************************************************
-typedef struct _AT91S_PMC {
-	AT91_REG	 PMC_SCER; 	// System Clock Enable Register
-	AT91_REG	 PMC_SCDR; 	// System Clock Disable Register
-	AT91_REG	 PMC_SCSR; 	// System Clock Status Register
-	AT91_REG	 Reserved0[1]; 	// 
-	AT91_REG	 PMC_PCER; 	// Peripheral Clock Enable Register
-	AT91_REG	 PMC_PCDR; 	// Peripheral Clock Disable Register
-	AT91_REG	 PMC_PCSR; 	// Peripheral Clock Status Register
-	AT91_REG	 Reserved1[5]; 	// 
-	AT91_REG	 PMC_MCKR; 	// Master Clock Register
-	AT91_REG	 Reserved2[3]; 	// 
-	AT91_REG	 PMC_PCKR[8]; 	// Programmable Clock Register
-	AT91_REG	 PMC_IER; 	// Interrupt Enable Register
-	AT91_REG	 PMC_IDR; 	// Interrupt Disable Register
-	AT91_REG	 PMC_SR; 	// Status Register
-	AT91_REG	 PMC_IMR; 	// Interrupt Mask Register
-} AT91S_PMC, *AT91PS_PMC;
-
-// -------- PMC_SCER : (PMC Offset: 0x0) System Clock Enable Register -------- 
-#define AT91C_PMC_PCK         ((unsigned int) 0x1 <<  0) // (PMC) Processor Clock
-#define AT91C_PMC_UDP         ((unsigned int) 0x1 <<  1) // (PMC) USB Device Port Clock
-#define AT91C_PMC_MCKUDP      ((unsigned int) 0x1 <<  2) // (PMC) USB Device Port Master Clock Automatic Disable on Suspend
-#define AT91C_PMC_UHP         ((unsigned int) 0x1 <<  4) // (PMC) USB Host Port Clock
-#define AT91C_PMC_PCK0        ((unsigned int) 0x1 <<  8) // (PMC) Programmable Clock Output
-#define AT91C_PMC_PCK1        ((unsigned int) 0x1 <<  9) // (PMC) Programmable Clock Output
-#define AT91C_PMC_PCK2        ((unsigned int) 0x1 << 10) // (PMC) Programmable Clock Output
-#define AT91C_PMC_PCK3        ((unsigned int) 0x1 << 11) // (PMC) Programmable Clock Output
-#define AT91C_PMC_PCK4        ((unsigned int) 0x1 << 12) // (PMC) Programmable Clock Output
-#define AT91C_PMC_PCK5        ((unsigned int) 0x1 << 13) // (PMC) Programmable Clock Output
-#define AT91C_PMC_PCK6        ((unsigned int) 0x1 << 14) // (PMC) Programmable Clock Output
-#define AT91C_PMC_PCK7        ((unsigned int) 0x1 << 15) // (PMC) Programmable Clock Output
-// -------- PMC_SCDR : (PMC Offset: 0x4) System Clock Disable Register -------- 
-// -------- PMC_SCSR : (PMC Offset: 0x8) System Clock Status Register -------- 
-// -------- PMC_MCKR : (PMC Offset: 0x30) Master Clock Register -------- 
-#define AT91C_PMC_CSS         ((unsigned int) 0x3 <<  0) // (PMC) Programmable Clock Selection
-#define 	AT91C_PMC_CSS_SLOW_CLK             ((unsigned int) 0x0) // (PMC) Slow Clock is selected
-#define 	AT91C_PMC_CSS_MAIN_CLK             ((unsigned int) 0x1) // (PMC) Main Clock is selected
-#define 	AT91C_PMC_CSS_PLLA_CLK             ((unsigned int) 0x2) // (PMC) Clock from PLL A is selected
-#define 	AT91C_PMC_CSS_PLLB_CLK             ((unsigned int) 0x3) // (PMC) Clock from PLL B is selected
-#define AT91C_PMC_PRES        ((unsigned int) 0x7 <<  2) // (PMC) Programmable Clock Prescaler
-#define 	AT91C_PMC_PRES_CLK                  ((unsigned int) 0x0 <<  2) // (PMC) Selected clock
-#define 	AT91C_PMC_PRES_CLK_2                ((unsigned int) 0x1 <<  2) // (PMC) Selected clock divided by 2
-#define 	AT91C_PMC_PRES_CLK_4                ((unsigned int) 0x2 <<  2) // (PMC) Selected clock divided by 4
-#define 	AT91C_PMC_PRES_CLK_8                ((unsigned int) 0x3 <<  2) // (PMC) Selected clock divided by 8
-#define 	AT91C_PMC_PRES_CLK_16               ((unsigned int) 0x4 <<  2) // (PMC) Selected clock divided by 16
-#define 	AT91C_PMC_PRES_CLK_32               ((unsigned int) 0x5 <<  2) // (PMC) Selected clock divided by 32
-#define 	AT91C_PMC_PRES_CLK_64               ((unsigned int) 0x6 <<  2) // (PMC) Selected clock divided by 64
-#define AT91C_PMC_MDIV        ((unsigned int) 0x3 <<  8) // (PMC) Master Clock Division
-#define 	AT91C_PMC_MDIV_1                    ((unsigned int) 0x0 <<  8) // (PMC) The master clock and the processor clock are the same
-#define 	AT91C_PMC_MDIV_2                    ((unsigned int) 0x1 <<  8) // (PMC) The processor clock is twice as fast as the master clock
-#define 	AT91C_PMC_MDIV_3                    ((unsigned int) 0x2 <<  8) // (PMC) The processor clock is three times faster than the master clock
-#define 	AT91C_PMC_MDIV_4                    ((unsigned int) 0x3 <<  8) // (PMC) The processor clock is four times faster than the master clock
-// -------- PMC_PCKR : (PMC Offset: 0x40) Programmable Clock Register -------- 
-// -------- PMC_IER : (PMC Offset: 0x60) PMC Interrupt Enable Register -------- 
-#define AT91C_PMC_MOSCS       ((unsigned int) 0x1 <<  0) // (PMC) MOSC Status/Enable/Disable/Mask
-#define AT91C_PMC_LOCKA       ((unsigned int) 0x1 <<  1) // (PMC) PLL A Status/Enable/Disable/Mask
-#define AT91C_PMC_LOCKB       ((unsigned int) 0x1 <<  2) // (PMC) PLL B Status/Enable/Disable/Mask
-#define AT91C_PMC_MCKRDY      ((unsigned int) 0x1 <<  3) // (PMC) MCK_RDY Status/Enable/Disable/Mask
-#define AT91C_PMC_PCK0RDY     ((unsigned int) 0x1 <<  8) // (PMC) PCK0_RDY Status/Enable/Disable/Mask
-#define AT91C_PMC_PCK1RDY     ((unsigned int) 0x1 <<  9) // (PMC) PCK1_RDY Status/Enable/Disable/Mask
-#define AT91C_PMC_PCK2RDY     ((unsigned int) 0x1 << 10) // (PMC) PCK2_RDY Status/Enable/Disable/Mask
-#define AT91C_PMC_PCK3RDY     ((unsigned int) 0x1 << 11) // (PMC) PCK3_RDY Status/Enable/Disable/Mask
-#define AT91C_PMC_PCK4RDY     ((unsigned int) 0x1 << 12) // (PMC) PCK4_RDY Status/Enable/Disable/Mask
-#define AT91C_PMC_PCK5RDY     ((unsigned int) 0x1 << 13) // (PMC) PCK5_RDY Status/Enable/Disable/Mask
-#define AT91C_PMC_PCK6RDY     ((unsigned int) 0x1 << 14) // (PMC) PCK6_RDY Status/Enable/Disable/Mask
-#define AT91C_PMC_PCK7RDY     ((unsigned int) 0x1 << 15) // (PMC) PCK7_RDY Status/Enable/Disable/Mask
-// -------- PMC_IDR : (PMC Offset: 0x64) PMC Interrupt Disable Register -------- 
-// -------- PMC_SR : (PMC Offset: 0x68) PMC Status Register -------- 
-// -------- PMC_IMR : (PMC Offset: 0x6c) PMC Interrupt Mask Register -------- 
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR Clock Generator Controler
-// *****************************************************************************
-typedef struct _AT91S_CKGR {
-	AT91_REG	 CKGR_MOR; 	// Main Oscillator Register
-	AT91_REG	 CKGR_MCFR; 	// Main Clock  Frequency Register
-	AT91_REG	 CKGR_PLLAR; 	// PLL A Register
-	AT91_REG	 CKGR_PLLBR; 	// PLL B Register
-} AT91S_CKGR, *AT91PS_CKGR;
-
-// -------- CKGR_MOR : (CKGR Offset: 0x0) Main Oscillator Register -------- 
-#define AT91C_CKGR_MOSCEN     ((unsigned int) 0x1 <<  0) // (CKGR) Main Oscillator Enable
-#define AT91C_CKGR_OSCTEST    ((unsigned int) 0x1 <<  1) // (CKGR) Oscillator Test
-#define AT91C_CKGR_OSCOUNT    ((unsigned int) 0xFF <<  8) // (CKGR) Main Oscillator Start-up Time
-// -------- CKGR_MCFR : (CKGR Offset: 0x4) Main Clock Frequency Register -------- 
-#define AT91C_CKGR_MAINF      ((unsigned int) 0xFFFF <<  0) // (CKGR) Main Clock Frequency
-#define AT91C_CKGR_MAINRDY    ((unsigned int) 0x1 << 16) // (CKGR) Main Clock Ready
-// -------- CKGR_PLLAR : (CKGR Offset: 0x8) PLL A Register -------- 
-#define AT91C_CKGR_DIVA       ((unsigned int) 0xFF <<  0) // (CKGR) Divider Selected
-#define 	AT91C_CKGR_DIVA_0                    ((unsigned int) 0x0) // (CKGR) Divider output is 0
-#define 	AT91C_CKGR_DIVA_BYPASS               ((unsigned int) 0x1) // (CKGR) Divider is bypassed
-#define AT91C_CKGR_PLLACOUNT  ((unsigned int) 0x3F <<  8) // (CKGR) PLL A Counter
-#define AT91C_CKGR_OUTA       ((unsigned int) 0x3 << 14) // (CKGR) PLL A Output Frequency Range
-#define 	AT91C_CKGR_OUTA_0                    ((unsigned int) 0x0 << 14) // (CKGR) Please refer to the PLLA datasheet
-#define 	AT91C_CKGR_OUTA_1                    ((unsigned int) 0x1 << 14) // (CKGR) Please refer to the PLLA datasheet
-#define 	AT91C_CKGR_OUTA_2                    ((unsigned int) 0x2 << 14) // (CKGR) Please refer to the PLLA datasheet
-#define 	AT91C_CKGR_OUTA_3                    ((unsigned int) 0x3 << 14) // (CKGR) Please refer to the PLLA datasheet
-#define AT91C_CKGR_MULA       ((unsigned int) 0x7FF << 16) // (CKGR) PLL A Multiplier
-#define AT91C_CKGR_SRCA       ((unsigned int) 0x1 << 29) // (CKGR) PLL A Source
-// -------- CKGR_PLLBR : (CKGR Offset: 0xc) PLL B Register -------- 
-#define AT91C_CKGR_DIVB       ((unsigned int) 0xFF <<  0) // (CKGR) Divider Selected
-#define 	AT91C_CKGR_DIVB_0                    ((unsigned int) 0x0) // (CKGR) Divider output is 0
-#define 	AT91C_CKGR_DIVB_BYPASS               ((unsigned int) 0x1) // (CKGR) Divider is bypassed
-#define AT91C_CKGR_PLLBCOUNT  ((unsigned int) 0x3F <<  8) // (CKGR) PLL B Counter
-#define AT91C_CKGR_OUTB       ((unsigned int) 0x3 << 14) // (CKGR) PLL B Output Frequency Range
-#define 	AT91C_CKGR_OUTB_0                    ((unsigned int) 0x0 << 14) // (CKGR) Please refer to the PLLB datasheet
-#define 	AT91C_CKGR_OUTB_1                    ((unsigned int) 0x1 << 14) // (CKGR) Please refer to the PLLB datasheet
-#define 	AT91C_CKGR_OUTB_2                    ((unsigned int) 0x2 << 14) // (CKGR) Please refer to the PLLB datasheet
-#define 	AT91C_CKGR_OUTB_3                    ((unsigned int) 0x3 << 14) // (CKGR) Please refer to the PLLB datasheet
-#define AT91C_CKGR_MULB       ((unsigned int) 0x7FF << 16) // (CKGR) PLL B Multiplier
-#define AT91C_CKGR_USB_96M    ((unsigned int) 0x1 << 28) // (CKGR) Divider for USB Ports
-#define AT91C_CKGR_USB_PLL    ((unsigned int) 0x1 << 29) // (CKGR) PLL Use
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR Parallel Input Output Controler
-// *****************************************************************************
-typedef struct _AT91S_PIO {
-	AT91_REG	 PIO_PER; 	// PIO Enable Register
-	AT91_REG	 PIO_PDR; 	// PIO Disable Register
-	AT91_REG	 PIO_PSR; 	// PIO Status Register
-	AT91_REG	 Reserved0[1]; 	// 
-	AT91_REG	 PIO_OER; 	// Output Enable Register
-	AT91_REG	 PIO_ODR; 	// Output Disable Registerr
-	AT91_REG	 PIO_OSR; 	// Output Status Register
-	AT91_REG	 Reserved1[1]; 	// 
-	AT91_REG	 PIO_IFER; 	// Input Filter Enable Register
-	AT91_REG	 PIO_IFDR; 	// Input Filter Disable Register
-	AT91_REG	 PIO_IFSR; 	// Input Filter Status Register
-	AT91_REG	 Reserved2[1]; 	// 
-	AT91_REG	 PIO_SODR; 	// Set Output Data Register
-	AT91_REG	 PIO_CODR; 	// Clear Output Data Register
-	AT91_REG	 PIO_ODSR; 	// Output Data Status Register
-	AT91_REG	 PIO_PDSR; 	// Pin Data Status Register
-	AT91_REG	 PIO_IER; 	// Interrupt Enable Register
-	AT91_REG	 PIO_IDR; 	// Interrupt Disable Register
-	AT91_REG	 PIO_IMR; 	// Interrupt Mask Register
-	AT91_REG	 PIO_ISR; 	// Interrupt Status Register
-	AT91_REG	 PIO_MDER; 	// Multi-driver Enable Register
-	AT91_REG	 PIO_MDDR; 	// Multi-driver Disable Register
-	AT91_REG	 PIO_MDSR; 	// Multi-driver Status Register
-	AT91_REG	 Reserved3[1]; 	// 
-	AT91_REG	 PIO_PPUDR; 	// Pull-up Disable Register
-	AT91_REG	 PIO_PPUER; 	// Pull-up Enable Register
-	AT91_REG	 PIO_PPUSR; 	// Pad Pull-up Status Register
-	AT91_REG	 Reserved4[1]; 	// 
-	AT91_REG	 PIO_ASR; 	// Select A Register
-	AT91_REG	 PIO_BSR; 	// Select B Register
-	AT91_REG	 PIO_ABSR; 	// AB Select Status Register
-	AT91_REG	 Reserved5[9]; 	// 
-	AT91_REG	 PIO_OWER; 	// Output Write Enable Register
-	AT91_REG	 PIO_OWDR; 	// Output Write Disable Register
-	AT91_REG	 PIO_OWSR; 	// Output Write Status Register
-} AT91S_PIO, *AT91PS_PIO;
-
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR Debug Unit
-// *****************************************************************************
-typedef struct _AT91S_DBGU {
-	AT91_REG	 DBGU_CR; 	// Control Register
-	AT91_REG	 DBGU_MR; 	// Mode Register
-	AT91_REG	 DBGU_IER; 	// Interrupt Enable Register
-	AT91_REG	 DBGU_IDR; 	// Interrupt Disable Register
-	AT91_REG	 DBGU_IMR; 	// Interrupt Mask Register
-	AT91_REG	 DBGU_CSR; 	// Channel Status Register
-	AT91_REG	 DBGU_RHR; 	// Receiver Holding Register
-	AT91_REG	 DBGU_THR; 	// Transmitter Holding Register
-	AT91_REG	 DBGU_BRGR; 	// Baud Rate Generator Register
-	AT91_REG	 Reserved0[7]; 	// 
-	AT91_REG	 DBGU_C1R; 	// Chip ID1 Register
-	AT91_REG	 DBGU_C2R; 	// Chip ID2 Register
-	AT91_REG	 DBGU_FNTR; 	// Force NTRST Register
-	AT91_REG	 Reserved1[45]; 	// 
-	AT91_REG	 DBGU_RPR; 	// Receive Pointer Register
-	AT91_REG	 DBGU_RCR; 	// Receive Counter Register
-	AT91_REG	 DBGU_TPR; 	// Transmit Pointer Register
-	AT91_REG	 DBGU_TCR; 	// Transmit Counter Register
-	AT91_REG	 DBGU_RNPR; 	// Receive Next Pointer Register
-	AT91_REG	 DBGU_RNCR; 	// Receive Next Counter Register
-	AT91_REG	 DBGU_TNPR; 	// Transmit Next Pointer Register
-	AT91_REG	 DBGU_TNCR; 	// Transmit Next Counter Register
-	AT91_REG	 DBGU_PTCR; 	// PDC Transfer Control Register
-	AT91_REG	 DBGU_PTSR; 	// PDC Transfer Status Register
-} AT91S_DBGU, *AT91PS_DBGU;
-
-// -------- DBGU_CR : (DBGU Offset: 0x0) Debug Unit Control Register -------- 
-#define AT91C_US_RSTRX        ((unsigned int) 0x1 <<  2) // (DBGU) Reset Receiver
-#define AT91C_US_RSTTX        ((unsigned int) 0x1 <<  3) // (DBGU) Reset Transmitter
-#define AT91C_US_RXEN         ((unsigned int) 0x1 <<  4) // (DBGU) Receiver Enable
-#define AT91C_US_RXDIS        ((unsigned int) 0x1 <<  5) // (DBGU) Receiver Disable
-#define AT91C_US_TXEN         ((unsigned int) 0x1 <<  6) // (DBGU) Transmitter Enable
-#define AT91C_US_TXDIS        ((unsigned int) 0x1 <<  7) // (DBGU) Transmitter Disable
-// -------- DBGU_MR : (DBGU Offset: 0x4) Debug Unit Mode Register -------- 
-#define AT91C_US_PAR          ((unsigned int) 0x7 <<  9) // (DBGU) Parity type
-#define 	AT91C_US_PAR_EVEN                 ((unsigned int) 0x0 <<  9) // (DBGU) Even Parity
-#define 	AT91C_US_PAR_ODD                  ((unsigned int) 0x1 <<  9) // (DBGU) Odd Parity
-#define 	AT91C_US_PAR_SPACE                ((unsigned int) 0x2 <<  9) // (DBGU) Parity forced to 0 (Space)
-#define 	AT91C_US_PAR_MARK                 ((unsigned int) 0x3 <<  9) // (DBGU) Parity forced to 1 (Mark)
-#define 	AT91C_US_PAR_NONE                 ((unsigned int) 0x4 <<  9) // (DBGU) No Parity
-#define 	AT91C_US_PAR_MULTI_DROP           ((unsigned int) 0x6 <<  9) // (DBGU) Multi-drop mode
-#define AT91C_US_CHMODE       ((unsigned int) 0x3 << 14) // (DBGU) Channel Mode
-#define 	AT91C_US_CHMODE_NORMAL               ((unsigned int) 0x0 << 14) // (DBGU) Normal Mode: The USART channel operates as an RX/TX USART.
-#define 	AT91C_US_CHMODE_AUTO                 ((unsigned int) 0x1 << 14) // (DBGU) Automatic Echo: Receiver Data Input is connected to the TXD pin.
-#define 	AT91C_US_CHMODE_LOCAL                ((unsigned int) 0x2 << 14) // (DBGU) Local Loopback: Transmitter Output Signal is connected to Receiver Input Signal.
-#define 	AT91C_US_CHMODE_REMOTE               ((unsigned int) 0x3 << 14) // (DBGU) Remote Loopback: RXD pin is internally connected to TXD pin.
-// -------- DBGU_IER : (DBGU Offset: 0x8) Debug Unit Interrupt Enable Register -------- 
-#define AT91C_US_RXRDY        ((unsigned int) 0x1 <<  0) // (DBGU) RXRDY Interrupt
-#define AT91C_US_TXRDY        ((unsigned int) 0x1 <<  1) // (DBGU) TXRDY Interrupt
-#define AT91C_US_ENDRX        ((unsigned int) 0x1 <<  3) // (DBGU) End of Receive Transfer Interrupt
-#define AT91C_US_ENDTX        ((unsigned int) 0x1 <<  4) // (DBGU) End of Transmit Interrupt
-#define AT91C_US_OVRE         ((unsigned int) 0x1 <<  5) // (DBGU) Overrun Interrupt
-#define AT91C_US_FRAME        ((unsigned int) 0x1 <<  6) // (DBGU) Framing Error Interrupt
-#define AT91C_US_PARE         ((unsigned int) 0x1 <<  7) // (DBGU) Parity Error Interrupt
-#define AT91C_US_TXEMPTY      ((unsigned int) 0x1 <<  9) // (DBGU) TXEMPTY Interrupt
-#define AT91C_US_TXBUFE       ((unsigned int) 0x1 << 11) // (DBGU) TXBUFE Interrupt
-#define AT91C_US_RXBUFF       ((unsigned int) 0x1 << 12) // (DBGU) RXBUFF Interrupt
-#define AT91C_US_COMM_TX      ((unsigned int) 0x1 << 30) // (DBGU) COMM_TX Interrupt
-#define AT91C_US_COMM_RX      ((unsigned int) 0x1 << 31) // (DBGU) COMM_RX Interrupt
-// -------- DBGU_IDR : (DBGU Offset: 0xc) Debug Unit Interrupt Disable Register -------- 
-// -------- DBGU_IMR : (DBGU Offset: 0x10) Debug Unit Interrupt Mask Register -------- 
-// -------- DBGU_CSR : (DBGU Offset: 0x14) Debug Unit Channel Status Register -------- 
-// -------- DBGU_FNTR : (DBGU Offset: 0x48) Debug Unit FORCE_NTRST Register -------- 
-#define AT91C_US_FORCE_NTRST  ((unsigned int) 0x1 <<  0) // (DBGU) Force NTRST in JTAG
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR Peripheral Data Controller
-// *****************************************************************************
-typedef struct _AT91S_PDC {
-	AT91_REG	 PDC_RPR; 	// Receive Pointer Register
-	AT91_REG	 PDC_RCR; 	// Receive Counter Register
-	AT91_REG	 PDC_TPR; 	// Transmit Pointer Register
-	AT91_REG	 PDC_TCR; 	// Transmit Counter Register
-	AT91_REG	 PDC_RNPR; 	// Receive Next Pointer Register
-	AT91_REG	 PDC_RNCR; 	// Receive Next Counter Register
-	AT91_REG	 PDC_TNPR; 	// Transmit Next Pointer Register
-	AT91_REG	 PDC_TNCR; 	// Transmit Next Counter Register
-	AT91_REG	 PDC_PTCR; 	// PDC Transfer Control Register
-	AT91_REG	 PDC_PTSR; 	// PDC Transfer Status Register
-} AT91S_PDC, *AT91PS_PDC;
-
-// -------- PDC_PTCR : (PDC Offset: 0x20) PDC Transfer Control Register -------- 
-#define AT91C_PDC_RXTEN       ((unsigned int) 0x1 <<  0) // (PDC) Receiver Transfer Enable
-#define AT91C_PDC_RXTDIS      ((unsigned int) 0x1 <<  1) // (PDC) Receiver Transfer Disable
-#define AT91C_PDC_TXTEN       ((unsigned int) 0x1 <<  8) // (PDC) Transmitter Transfer Enable
-#define AT91C_PDC_TXTDIS      ((unsigned int) 0x1 <<  9) // (PDC) Transmitter Transfer Disable
-// -------- PDC_PTSR : (PDC Offset: 0x24) PDC Transfer Status Register -------- 
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR Advanced Interrupt Controller
-// *****************************************************************************
-typedef struct _AT91S_AIC {
-	AT91_REG	 AIC_SMR[32]; 	// Source Mode Register
-	AT91_REG	 AIC_SVR[32]; 	// Source Vector Register
-	AT91_REG	 AIC_IVR; 	// IRQ Vector Register
-	AT91_REG	 AIC_FVR; 	// FIQ Vector Register
-	AT91_REG	 AIC_ISR; 	// Interrupt Status Register
-	AT91_REG	 AIC_IPR; 	// Interrupt Pending Register
-	AT91_REG	 AIC_IMR; 	// Interrupt Mask Register
-	AT91_REG	 AIC_CISR; 	// Core Interrupt Status Register
-	AT91_REG	 Reserved0[2]; 	// 
-	AT91_REG	 AIC_IECR; 	// Interrupt Enable Command Register
-	AT91_REG	 AIC_IDCR; 	// Interrupt Disable Command Register
-	AT91_REG	 AIC_ICCR; 	// Interrupt Clear Command Register
-	AT91_REG	 AIC_ISCR; 	// Interrupt Set Command Register
-	AT91_REG	 AIC_EOICR; 	// End of Interrupt Command Register
-	AT91_REG	 AIC_SPU; 	// Spurious Vector Register
-	AT91_REG	 AIC_DCR; 	// Debug Control Register (Protect)
-	AT91_REG	 Reserved1[1]; 	// 
-	AT91_REG	 AIC_FFER; 	// Fast Forcing Enable Register
-	AT91_REG	 AIC_FFDR; 	// Fast Forcing Disable Register
-	AT91_REG	 AIC_FFSR; 	// Fast Forcing Status Register
-} AT91S_AIC, *AT91PS_AIC;
-
-// -------- AIC_SMR : (AIC Offset: 0x0) Control Register -------- 
-#define AT91C_AIC_PRIOR       ((unsigned int) 0x7 <<  0) // (AIC) Priority Level
-#define 	AT91C_AIC_PRIOR_LOWEST               ((unsigned int) 0x0) // (AIC) Lowest priority level
-#define 	AT91C_AIC_PRIOR_HIGHEST              ((unsigned int) 0x7) // (AIC) Highest priority level
-#define AT91C_AIC_SRCTYPE     ((unsigned int) 0x3 <<  5) // (AIC) Interrupt Source Type
-#define 	AT91C_AIC_SRCTYPE_INT_LEVEL_SENSITIVE  ((unsigned int) 0x0 <<  5) // (AIC) Internal Sources Code Label Level Sensitive
-#define 	AT91C_AIC_SRCTYPE_INT_EDGE_TRIGGERED   ((unsigned int) 0x1 <<  5) // (AIC) Internal Sources Code Label Edge triggered
-#define 	AT91C_AIC_SRCTYPE_EXT_HIGH_LEVEL       ((unsigned int) 0x2 <<  5) // (AIC) External Sources Code Label High-level Sensitive
-#define 	AT91C_AIC_SRCTYPE_EXT_POSITIVE_EDGE    ((unsigned int) 0x3 <<  5) // (AIC) External Sources Code Label Positive Edge triggered
-// -------- AIC_CISR : (AIC Offset: 0x114) AIC Core Interrupt Status Register -------- 
-#define AT91C_AIC_NFIQ        ((unsigned int) 0x1 <<  0) // (AIC) NFIQ Status
-#define AT91C_AIC_NIRQ        ((unsigned int) 0x1 <<  1) // (AIC) NIRQ Status
-// -------- AIC_DCR : (AIC Offset: 0x138) AIC Debug Control Register (Protect) -------- 
-#define AT91C_AIC_DCR_PROT    ((unsigned int) 0x1 <<  0) // (AIC) Protection Mode
-#define AT91C_AIC_DCR_GMSK    ((unsigned int) 0x1 <<  1) // (AIC) General Mask
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR Serial Parallel Interface
-// *****************************************************************************
-typedef struct _AT91S_SPI {
-	AT91_REG	 SPI_CR; 	// Control Register
-	AT91_REG	 SPI_MR; 	// Mode Register
-	AT91_REG	 SPI_RDR; 	// Receive Data Register
-	AT91_REG	 SPI_TDR; 	// Transmit Data Register
-	AT91_REG	 SPI_SR; 	// Status Register
-	AT91_REG	 SPI_IER; 	// Interrupt Enable Register
-	AT91_REG	 SPI_IDR; 	// Interrupt Disable Register
-	AT91_REG	 SPI_IMR; 	// Interrupt Mask Register
-	AT91_REG	 Reserved0[4]; 	// 
-	AT91_REG	 SPI_CSR[4]; 	// Chip Select Register
-	AT91_REG	 Reserved1[48]; 	// 
-	AT91_REG	 SPI_RPR; 	// Receive Pointer Register
-	AT91_REG	 SPI_RCR; 	// Receive Counter Register
-	AT91_REG	 SPI_TPR; 	// Transmit Pointer Register
-	AT91_REG	 SPI_TCR; 	// Transmit Counter Register
-	AT91_REG	 SPI_RNPR; 	// Receive Next Pointer Register
-	AT91_REG	 SPI_RNCR; 	// Receive Next Counter Register
-	AT91_REG	 SPI_TNPR; 	// Transmit Next Pointer Register
-	AT91_REG	 SPI_TNCR; 	// Transmit Next Counter Register
-	AT91_REG	 SPI_PTCR; 	// PDC Transfer Control Register
-	AT91_REG	 SPI_PTSR; 	// PDC Transfer Status Register
-} AT91S_SPI, *AT91PS_SPI;
-
-// -------- SPI_CR : (SPI Offset: 0x0) SPI Control Register -------- 
-#define AT91C_SPI_SPIEN       ((unsigned int) 0x1 <<  0) // (SPI) SPI Enable
-#define AT91C_SPI_SPIDIS      ((unsigned int) 0x1 <<  1) // (SPI) SPI Disable
-#define AT91C_SPI_SWRST       ((unsigned int) 0x1 <<  7) // (SPI) SPI Software reset
-// -------- SPI_MR : (SPI Offset: 0x4) SPI Mode Register -------- 
-#define AT91C_SPI_MSTR        ((unsigned int) 0x1 <<  0) // (SPI) Master/Slave Mode
-#define AT91C_SPI_PS          ((unsigned int) 0x1 <<  1) // (SPI) Peripheral Select
-#define 	AT91C_SPI_PS_FIXED                ((unsigned int) 0x0 <<  1) // (SPI) Fixed Peripheral Select
-#define 	AT91C_SPI_PS_VARIABLE             ((unsigned int) 0x1 <<  1) // (SPI) Variable Peripheral Select
-#define AT91C_SPI_PCSDEC      ((unsigned int) 0x1 <<  2) // (SPI) Chip Select Decode
-#define AT91C_SPI_DIV32       ((unsigned int) 0x1 <<  3) // (SPI) Clock Selection
-#define AT91C_SPI_MODFDIS     ((unsigned int) 0x1 <<  4) // (SPI) Mode Fault Detection
-#define AT91C_SPI_LLB         ((unsigned int) 0x1 <<  7) // (SPI) Clock Selection
-#define AT91C_SPI_PCS         ((unsigned int) 0xF << 16) // (SPI) Peripheral Chip Select
-#define AT91C_SPI_DLYBCS      ((unsigned int) 0xFF << 24) // (SPI) Delay Between Chip Selects
-// -------- SPI_RDR : (SPI Offset: 0x8) Receive Data Register -------- 
-#define AT91C_SPI_RD          ((unsigned int) 0xFFFF <<  0) // (SPI) Receive Data
-#define AT91C_SPI_RPCS        ((unsigned int) 0xF << 16) // (SPI) Peripheral Chip Select Status
-// -------- SPI_TDR : (SPI Offset: 0xc) Transmit Data Register -------- 
-#define AT91C_SPI_TD          ((unsigned int) 0xFFFF <<  0) // (SPI) Transmit Data
-#define AT91C_SPI_TPCS        ((unsigned int) 0xF << 16) // (SPI) Peripheral Chip Select Status
-// -------- SPI_SR : (SPI Offset: 0x10) Status Register -------- 
-#define AT91C_SPI_RDRF        ((unsigned int) 0x1 <<  0) // (SPI) Receive Data Register Full
-#define AT91C_SPI_TDRE        ((unsigned int) 0x1 <<  1) // (SPI) Transmit Data Register Empty
-#define AT91C_SPI_MODF        ((unsigned int) 0x1 <<  2) // (SPI) Mode Fault Error
-#define AT91C_SPI_OVRES       ((unsigned int) 0x1 <<  3) // (SPI) Overrun Error Status
-#define AT91C_SPI_SPENDRX     ((unsigned int) 0x1 <<  4) // (SPI) End of Receiver Transfer
-#define AT91C_SPI_SPENDTX     ((unsigned int) 0x1 <<  5) // (SPI) End of Receiver Transfer
-#define AT91C_SPI_RXBUFF      ((unsigned int) 0x1 <<  6) // (SPI) RXBUFF Interrupt
-#define AT91C_SPI_TXBUFE      ((unsigned int) 0x1 <<  7) // (SPI) TXBUFE Interrupt
-#define AT91C_SPI_SPIENS      ((unsigned int) 0x1 << 16) // (SPI) Enable Status
-// -------- SPI_IER : (SPI Offset: 0x14) Interrupt Enable Register -------- 
-// -------- SPI_IDR : (SPI Offset: 0x18) Interrupt Disable Register -------- 
-// -------- SPI_IMR : (SPI Offset: 0x1c) Interrupt Mask Register -------- 
-// -------- SPI_CSR : (SPI Offset: 0x30) Chip Select Register -------- 
-#define AT91C_SPI_CPOL        ((unsigned int) 0x1 <<  0) // (SPI) Clock Polarity
-#define AT91C_SPI_NCPHA       ((unsigned int) 0x1 <<  1) // (SPI) Clock Phase
-#define AT91C_SPI_BITS        ((unsigned int) 0xF <<  4) // (SPI) Bits Per Transfer
-#define 	AT91C_SPI_BITS_8                    ((unsigned int) 0x0 <<  4) // (SPI) 8 Bits Per transfer
-#define 	AT91C_SPI_BITS_9                    ((unsigned int) 0x1 <<  4) // (SPI) 9 Bits Per transfer
-#define 	AT91C_SPI_BITS_10                   ((unsigned int) 0x2 <<  4) // (SPI) 10 Bits Per transfer
-#define 	AT91C_SPI_BITS_11                   ((unsigned int) 0x3 <<  4) // (SPI) 11 Bits Per transfer
-#define 	AT91C_SPI_BITS_12                   ((unsigned int) 0x4 <<  4) // (SPI) 12 Bits Per transfer
-#define 	AT91C_SPI_BITS_13                   ((unsigned int) 0x5 <<  4) // (SPI) 13 Bits Per transfer
-#define 	AT91C_SPI_BITS_14                   ((unsigned int) 0x6 <<  4) // (SPI) 14 Bits Per transfer
-#define 	AT91C_SPI_BITS_15                   ((unsigned int) 0x7 <<  4) // (SPI) 15 Bits Per transfer
-#define 	AT91C_SPI_BITS_16                   ((unsigned int) 0x8 <<  4) // (SPI) 16 Bits Per transfer
-#define AT91C_SPI_SCBR        ((unsigned int) 0xFF <<  8) // (SPI) Serial Clock Baud Rate
-#define AT91C_SPI_DLYBS       ((unsigned int) 0xFF << 16) // (SPI) Serial Clock Baud Rate
-#define AT91C_SPI_DLYBCT      ((unsigned int) 0xFF << 24) // (SPI) Delay Between Consecutive Transfers
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR Synchronous Serial Controller Interface
-// *****************************************************************************
-typedef struct _AT91S_SSC {
-	AT91_REG	 SSC_CR; 	// Control Register
-	AT91_REG	 SSC_CMR; 	// Clock Mode Register
-	AT91_REG	 Reserved0[2]; 	// 
-	AT91_REG	 SSC_RCMR; 	// Receive Clock ModeRegister
-	AT91_REG	 SSC_RFMR; 	// Receive Frame Mode Register
-	AT91_REG	 SSC_TCMR; 	// Transmit Clock Mode Register
-	AT91_REG	 SSC_TFMR; 	// Transmit Frame Mode Register
-	AT91_REG	 SSC_RHR; 	// Receive Holding Register
-	AT91_REG	 SSC_THR; 	// Transmit Holding Register
-	AT91_REG	 Reserved1[2]; 	// 
-	AT91_REG	 SSC_RSHR; 	// Receive Sync Holding Register
-	AT91_REG	 SSC_TSHR; 	// Transmit Sync Holding Register
-	AT91_REG	 SSC_RC0R; 	// Receive Compare 0 Register
-	AT91_REG	 SSC_RC1R; 	// Receive Compare 1 Register
-	AT91_REG	 SSC_SR; 	// Status Register
-	AT91_REG	 SSC_IER; 	// Interrupt Enable Register
-	AT91_REG	 SSC_IDR; 	// Interrupt Disable Register
-	AT91_REG	 SSC_IMR; 	// Interrupt Mask Register
-	AT91_REG	 Reserved2[44]; 	// 
-	AT91_REG	 SSC_RPR; 	// Receive Pointer Register
-	AT91_REG	 SSC_RCR; 	// Receive Counter Register
-	AT91_REG	 SSC_TPR; 	// Transmit Pointer Register
-	AT91_REG	 SSC_TCR; 	// Transmit Counter Register
-	AT91_REG	 SSC_RNPR; 	// Receive Next Pointer Register
-	AT91_REG	 SSC_RNCR; 	// Receive Next Counter Register
-	AT91_REG	 SSC_TNPR; 	// Transmit Next Pointer Register
-	AT91_REG	 SSC_TNCR; 	// Transmit Next Counter Register
-	AT91_REG	 SSC_PTCR; 	// PDC Transfer Control Register
-	AT91_REG	 SSC_PTSR; 	// PDC Transfer Status Register
-} AT91S_SSC, *AT91PS_SSC;
-
-// -------- SSC_CR : (SSC Offset: 0x0) SSC Control Register -------- 
-#define AT91C_SSC_RXEN        ((unsigned int) 0x1 <<  0) // (SSC) Receive Enable
-#define AT91C_SSC_RXDIS       ((unsigned int) 0x1 <<  1) // (SSC) Receive Disable
-#define AT91C_SSC_TXEN        ((unsigned int) 0x1 <<  8) // (SSC) Transmit Enable
-#define AT91C_SSC_TXDIS       ((unsigned int) 0x1 <<  9) // (SSC) Transmit Disable
-#define AT91C_SSC_SWRST       ((unsigned int) 0x1 << 15) // (SSC) Software Reset
-// -------- SSC_RCMR : (SSC Offset: 0x10) SSC Receive Clock Mode Register -------- 
-#define AT91C_SSC_CKS         ((unsigned int) 0x3 <<  0) // (SSC) Receive/Transmit Clock Selection
-#define 	AT91C_SSC_CKS_DIV                  ((unsigned int) 0x0) // (SSC) Divided Clock
-#define 	AT91C_SSC_CKS_TK                   ((unsigned int) 0x1) // (SSC) TK Clock signal
-#define 	AT91C_SSC_CKS_RK                   ((unsigned int) 0x2) // (SSC) RK pin
-#define AT91C_SSC_CKO         ((unsigned int) 0x7 <<  2) // (SSC) Receive/Transmit Clock Output Mode Selection
-#define 	AT91C_SSC_CKO_NONE                 ((unsigned int) 0x0 <<  2) // (SSC) Receive/Transmit Clock Output Mode: None RK pin: Input-only
-#define 	AT91C_SSC_CKO_CONTINOUS            ((unsigned int) 0x1 <<  2) // (SSC) Continuous Receive/Transmit Clock RK pin: Output
-#define 	AT91C_SSC_CKO_DATA_TX              ((unsigned int) 0x2 <<  2) // (SSC) Receive/Transmit Clock only during data transfers RK pin: Output
-#define AT91C_SSC_CKI         ((unsigned int) 0x1 <<  5) // (SSC) Receive/Transmit Clock Inversion
-#define AT91C_SSC_CKG         ((unsigned int) 0x3 <<  6) // (SSC) Receive/Transmit Clock Gating Selection
-#define 	AT91C_SSC_CKG_NONE                 ((unsigned int) 0x0 <<  6) // (SSC) Receive/Transmit Clock Gating: None, continuous clock
-#define 	AT91C_SSC_CKG_LOW                  ((unsigned int) 0x1 <<  6) // (SSC) Receive/Transmit Clock enabled only if RF Low
-#define 	AT91C_SSC_CKG_HIGH                 ((unsigned int) 0x2 <<  6) // (SSC) Receive/Transmit Clock enabled only if RF High
-#define AT91C_SSC_START       ((unsigned int) 0xF <<  8) // (SSC) Receive/Transmit Start Selection
-#define 	AT91C_SSC_START_CONTINOUS            ((unsigned int) 0x0 <<  8) // (SSC) Continuous, as soon as the receiver is enabled, and immediately after the end of transfer of the previous data.
-#define 	AT91C_SSC_START_TX                   ((unsigned int) 0x1 <<  8) // (SSC) Transmit/Receive start
-#define 	AT91C_SSC_START_LOW_RF               ((unsigned int) 0x2 <<  8) // (SSC) Detection of a low level on RF input
-#define 	AT91C_SSC_START_HIGH_RF              ((unsigned int) 0x3 <<  8) // (SSC) Detection of a high level on RF input
-#define 	AT91C_SSC_START_FALL_RF              ((unsigned int) 0x4 <<  8) // (SSC) Detection of a falling edge on RF input
-#define 	AT91C_SSC_START_RISE_RF              ((unsigned int) 0x5 <<  8) // (SSC) Detection of a rising edge on RF input
-#define 	AT91C_SSC_START_LEVEL_RF             ((unsigned int) 0x6 <<  8) // (SSC) Detection of any level change on RF input
-#define 	AT91C_SSC_START_EDGE_RF              ((unsigned int) 0x7 <<  8) // (SSC) Detection of any edge on RF input
-#define 	AT91C_SSC_START_0                    ((unsigned int) 0x8 <<  8) // (SSC) Compare 0
-#define AT91C_SSC_STOP        ((unsigned int) 0x1 << 12) // (SSC) Receive Stop Selection
-#define AT91C_SSC_STTOUT      ((unsigned int) 0x1 << 15) // (SSC) Receive/Transmit Start Output Selection
-#define AT91C_SSC_STTDLY      ((unsigned int) 0xFF << 16) // (SSC) Receive/Transmit Start Delay
-#define AT91C_SSC_PERIOD      ((unsigned int) 0xFF << 24) // (SSC) Receive/Transmit Period Divider Selection
-// -------- SSC_RFMR : (SSC Offset: 0x14) SSC Receive Frame Mode Register -------- 
-#define AT91C_SSC_DATLEN      ((unsigned int) 0x1F <<  0) // (SSC) Data Length
-#define AT91C_SSC_LOOP        ((unsigned int) 0x1 <<  5) // (SSC) Loop Mode
-#define AT91C_SSC_MSBF        ((unsigned int) 0x1 <<  7) // (SSC) Most Significant Bit First
-#define AT91C_SSC_DATNB       ((unsigned int) 0xF <<  8) // (SSC) Data Number per Frame
-#define AT91C_SSC_FSLEN       ((unsigned int) 0xF << 16) // (SSC) Receive/Transmit Frame Sync length
-#define AT91C_SSC_FSOS        ((unsigned int) 0x7 << 20) // (SSC) Receive/Transmit Frame Sync Output Selection
-#define 	AT91C_SSC_FSOS_NONE                 ((unsigned int) 0x0 << 20) // (SSC) Selected Receive/Transmit Frame Sync Signal: None RK pin Input-only
-#define 	AT91C_SSC_FSOS_NEGATIVE             ((unsigned int) 0x1 << 20) // (SSC) Selected Receive/Transmit Frame Sync Signal: Negative Pulse
-#define 	AT91C_SSC_FSOS_POSITIVE             ((unsigned int) 0x2 << 20) // (SSC) Selected Receive/Transmit Frame Sync Signal: Positive Pulse
-#define 	AT91C_SSC_FSOS_LOW                  ((unsigned int) 0x3 << 20) // (SSC) Selected Receive/Transmit Frame Sync Signal: Driver Low during data transfer
-#define 	AT91C_SSC_FSOS_HIGH                 ((unsigned int) 0x4 << 20) // (SSC) Selected Receive/Transmit Frame Sync Signal: Driver High during data transfer
-#define 	AT91C_SSC_FSOS_TOGGLE               ((unsigned int) 0x5 << 20) // (SSC) Selected Receive/Transmit Frame Sync Signal: Toggling at each start of data transfer
-#define AT91C_SSC_FSEDGE      ((unsigned int) 0x1 << 24) // (SSC) Frame Sync Edge Detection
-// -------- SSC_TCMR : (SSC Offset: 0x18) SSC Transmit Clock Mode Register -------- 
-// -------- SSC_TFMR : (SSC Offset: 0x1c) SSC Transmit Frame Mode Register -------- 
-#define AT91C_SSC_DATDEF      ((unsigned int) 0x1 <<  5) // (SSC) Data Default Value
-#define AT91C_SSC_FSDEN       ((unsigned int) 0x1 << 23) // (SSC) Frame Sync Data Enable
-// -------- SSC_SR : (SSC Offset: 0x40) SSC Status Register -------- 
-#define AT91C_SSC_TXRDY       ((unsigned int) 0x1 <<  0) // (SSC) Transmit Ready
-#define AT91C_SSC_TXEMPTY     ((unsigned int) 0x1 <<  1) // (SSC) Transmit Empty
-#define AT91C_SSC_ENDTX       ((unsigned int) 0x1 <<  2) // (SSC) End Of Transmission
-#define AT91C_SSC_TXBUFE      ((unsigned int) 0x1 <<  3) // (SSC) Transmit Buffer Empty
-#define AT91C_SSC_RXRDY       ((unsigned int) 0x1 <<  4) // (SSC) Receive Ready
-#define AT91C_SSC_OVRUN       ((unsigned int) 0x1 <<  5) // (SSC) Receive Overrun
-#define AT91C_SSC_ENDRX       ((unsigned int) 0x1 <<  6) // (SSC) End of Reception
-#define AT91C_SSC_RXBUFF      ((unsigned int) 0x1 <<  7) // (SSC) Receive Buffer Full
-#define AT91C_SSC_CP0         ((unsigned int) 0x1 <<  8) // (SSC) Compare 0
-#define AT91C_SSC_CP1         ((unsigned int) 0x1 <<  9) // (SSC) Compare 1
-#define AT91C_SSC_TXSYN       ((unsigned int) 0x1 << 10) // (SSC) Transmit Sync
-#define AT91C_SSC_RXSYN       ((unsigned int) 0x1 << 11) // (SSC) Receive Sync
-#define AT91C_SSC_TXENA       ((unsigned int) 0x1 << 16) // (SSC) Transmit Enable
-#define AT91C_SSC_RXENA       ((unsigned int) 0x1 << 17) // (SSC) Receive Enable
-// -------- SSC_IER : (SSC Offset: 0x44) SSC Interrupt Enable Register -------- 
-// -------- SSC_IDR : (SSC Offset: 0x48) SSC Interrupt Disable Register -------- 
-// -------- SSC_IMR : (SSC Offset: 0x4c) SSC Interrupt Mask Register -------- 
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR Usart
-// *****************************************************************************
-typedef struct _AT91S_USART {
-	AT91_REG	 US_CR; 	// Control Register
-	AT91_REG	 US_MR; 	// Mode Register
-	AT91_REG	 US_IER; 	// Interrupt Enable Register
-	AT91_REG	 US_IDR; 	// Interrupt Disable Register
-	AT91_REG	 US_IMR; 	// Interrupt Mask Register
-	AT91_REG	 US_CSR; 	// Channel Status Register
-	AT91_REG	 US_RHR; 	// Receiver Holding Register
-	AT91_REG	 US_THR; 	// Transmitter Holding Register
-	AT91_REG	 US_BRGR; 	// Baud Rate Generator Register
-	AT91_REG	 US_RTOR; 	// Receiver Time-out Register
-	AT91_REG	 US_TTGR; 	// Transmitter Time-guard Register
-	AT91_REG	 Reserved0[5]; 	// 
-	AT91_REG	 US_FIDI; 	// FI_DI_Ratio Register
-	AT91_REG	 US_NER; 	// Nb Errors Register
-	AT91_REG	 US_XXR; 	// XON_XOFF Register
-	AT91_REG	 US_IF; 	// IRDA_FILTER Register
-	AT91_REG	 Reserved1[44]; 	// 
-	AT91_REG	 US_RPR; 	// Receive Pointer Register
-	AT91_REG	 US_RCR; 	// Receive Counter Register
-	AT91_REG	 US_TPR; 	// Transmit Pointer Register
-	AT91_REG	 US_TCR; 	// Transmit Counter Register
-	AT91_REG	 US_RNPR; 	// Receive Next Pointer Register
-	AT91_REG	 US_RNCR; 	// Receive Next Counter Register
-	AT91_REG	 US_TNPR; 	// Transmit Next Pointer Register
-	AT91_REG	 US_TNCR; 	// Transmit Next Counter Register
-	AT91_REG	 US_PTCR; 	// PDC Transfer Control Register
-	AT91_REG	 US_PTSR; 	// PDC Transfer Status Register
-} AT91S_USART, *AT91PS_USART;
-
-// -------- US_CR : (USART Offset: 0x0) Debug Unit Control Register -------- 
-#define AT91C_US_RSTSTA       ((unsigned int) 0x1 <<  8) // (USART) Reset Status Bits
-#define AT91C_US_STTBRK       ((unsigned int) 0x1 <<  9) // (USART) Start Break
-#define AT91C_US_STPBRK       ((unsigned int) 0x1 << 10) // (USART) Stop Break
-#define AT91C_US_STTTO        ((unsigned int) 0x1 << 11) // (USART) Start Time-out
-#define AT91C_US_SENDA        ((unsigned int) 0x1 << 12) // (USART) Send Address
-#define AT91C_US_RSTIT        ((unsigned int) 0x1 << 13) // (USART) Reset Iterations
-#define AT91C_US_RSTNACK      ((unsigned int) 0x1 << 14) // (USART) Reset Non Acknowledge
-#define AT91C_US_RETTO        ((unsigned int) 0x1 << 15) // (USART) Rearm Time-out
-#define AT91C_US_DTREN        ((unsigned int) 0x1 << 16) // (USART) Data Terminal ready Enable
-#define AT91C_US_DTRDIS       ((unsigned int) 0x1 << 17) // (USART) Data Terminal ready Disable
-#define AT91C_US_RTSEN        ((unsigned int) 0x1 << 18) // (USART) Request to Send enable
-#define AT91C_US_RTSDIS       ((unsigned int) 0x1 << 19) // (USART) Request to Send Disable
-// -------- US_MR : (USART Offset: 0x4) Debug Unit Mode Register -------- 
-#define AT91C_US_USMODE       ((unsigned int) 0xF <<  0) // (USART) Usart mode
-#define 	AT91C_US_USMODE_NORMAL               ((unsigned int) 0x0) // (USART) Normal
-#define 	AT91C_US_USMODE_RS485                ((unsigned int) 0x1) // (USART) RS485
-#define 	AT91C_US_USMODE_HWHSH                ((unsigned int) 0x2) // (USART) Hardware Handshaking
-#define 	AT91C_US_USMODE_MODEM                ((unsigned int) 0x3) // (USART) Modem
-#define 	AT91C_US_USMODE_ISO7816_0            ((unsigned int) 0x4) // (USART) ISO7816 protocol: T = 0
-#define 	AT91C_US_USMODE_ISO7816_1            ((unsigned int) 0x6) // (USART) ISO7816 protocol: T = 1
-#define 	AT91C_US_USMODE_IRDA                 ((unsigned int) 0x8) // (USART) IrDA
-#define 	AT91C_US_USMODE_SWHSH                ((unsigned int) 0xC) // (USART) Software Handshaking
-#define AT91C_US_CLKS         ((unsigned int) 0x3 <<  4) // (USART) Clock Selection (Baud Rate generator Input Clock
-#define 	AT91C_US_CLKS_CLOCK                ((unsigned int) 0x0 <<  4) // (USART) Clock
-#define 	AT91C_US_CLKS_FDIV1                ((unsigned int) 0x1 <<  4) // (USART) fdiv1
-#define 	AT91C_US_CLKS_SLOW                 ((unsigned int) 0x2 <<  4) // (USART) slow_clock (ARM)
-#define 	AT91C_US_CLKS_EXT                  ((unsigned int) 0x3 <<  4) // (USART) External (SCK)
-#define AT91C_US_CHRL         ((unsigned int) 0x3 <<  6) // (USART) Clock Selection (Baud Rate generator Input Clock
-#define 	AT91C_US_CHRL_5_BITS               ((unsigned int) 0x0 <<  6) // (USART) Character Length: 5 bits
-#define 	AT91C_US_CHRL_6_BITS               ((unsigned int) 0x1 <<  6) // (USART) Character Length: 6 bits
-#define 	AT91C_US_CHRL_7_BITS               ((unsigned int) 0x2 <<  6) // (USART) Character Length: 7 bits
-#define 	AT91C_US_CHRL_8_BITS               ((unsigned int) 0x3 <<  6) // (USART) Character Length: 8 bits
-#define AT91C_US_SYNC         ((unsigned int) 0x1 <<  8) // (USART) Synchronous Mode Select
-#define AT91C_US_NBSTOP       ((unsigned int) 0x3 << 12) // (USART) Number of Stop bits
-#define 	AT91C_US_NBSTOP_1_BIT                ((unsigned int) 0x0 << 12) // (USART) 1 stop bit
-#define 	AT91C_US_NBSTOP_15_BIT               ((unsigned int) 0x1 << 12) // (USART) Asynchronous (SYNC=0) 2 stop bits Synchronous (SYNC=1) 2 stop bits
-#define 	AT91C_US_NBSTOP_2_BIT                ((unsigned int) 0x2 << 12) // (USART) 2 stop bits
-#define AT91C_US_MSBF         ((unsigned int) 0x1 << 16) // (USART) Bit Order
-#define AT91C_US_MODE9        ((unsigned int) 0x1 << 17) // (USART) 9-bit Character length
-#define AT91C_US_CKLO         ((unsigned int) 0x1 << 18) // (USART) Clock Output Select
-#define AT91C_US_OVER         ((unsigned int) 0x1 << 19) // (USART) Over Sampling Mode
-#define AT91C_US_INACK        ((unsigned int) 0x1 << 20) // (USART) Inhibit Non Acknowledge
-#define AT91C_US_DSNACK       ((unsigned int) 0x1 << 21) // (USART) Disable Successive NACK
-#define AT91C_US_MAX_ITER     ((unsigned int) 0x1 << 24) // (USART) Number of Repetitions
-#define AT91C_US_FILTER       ((unsigned int) 0x1 << 28) // (USART) Receive Line Filter
-// -------- US_IER : (USART Offset: 0x8) Debug Unit Interrupt Enable Register -------- 
-#define AT91C_US_RXBRK        ((unsigned int) 0x1 <<  2) // (USART) Break Received/End of Break
-#define AT91C_US_TIMEOUT      ((unsigned int) 0x1 <<  8) // (USART) Receiver Time-out
-#define AT91C_US_ITERATION    ((unsigned int) 0x1 << 10) // (USART) Max number of Repetitions Reached
-#define AT91C_US_NACK         ((unsigned int) 0x1 << 13) // (USART) Non Acknowledge
-#define AT91C_US_RIIC         ((unsigned int) 0x1 << 16) // (USART) Ring INdicator Input Change Flag
-#define AT91C_US_DSRIC        ((unsigned int) 0x1 << 17) // (USART) Data Set Ready Input Change Flag
-#define AT91C_US_DCDIC        ((unsigned int) 0x1 << 18) // (USART) Data Carrier Flag
-#define AT91C_US_CTSIC        ((unsigned int) 0x1 << 19) // (USART) Clear To Send Input Change Flag
-// -------- US_IDR : (USART Offset: 0xc) Debug Unit Interrupt Disable Register -------- 
-// -------- US_IMR : (USART Offset: 0x10) Debug Unit Interrupt Mask Register -------- 
-// -------- US_CSR : (USART Offset: 0x14) Debug Unit Channel Status Register -------- 
-#define AT91C_US_RI           ((unsigned int) 0x1 << 20) // (USART) Image of RI Input
-#define AT91C_US_DSR          ((unsigned int) 0x1 << 21) // (USART) Image of DSR Input
-#define AT91C_US_DCD          ((unsigned int) 0x1 << 22) // (USART) Image of DCD Input
-#define AT91C_US_CTS          ((unsigned int) 0x1 << 23) // (USART) Image of CTS Input
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR Two-wire Interface
-// *****************************************************************************
-typedef struct _AT91S_TWI {
-	AT91_REG	 TWI_CR; 	// Control Register
-	AT91_REG	 TWI_MMR; 	// Master Mode Register
-	AT91_REG	 TWI_SMR; 	// Slave Mode Register
-	AT91_REG	 TWI_IADR; 	// Internal Address Register
-	AT91_REG	 TWI_CWGR; 	// Clock Waveform Generator Register
-	AT91_REG	 Reserved0[3]; 	// 
-	AT91_REG	 TWI_SR; 	// Status Register
-	AT91_REG	 TWI_IER; 	// Interrupt Enable Register
-	AT91_REG	 TWI_IDR; 	// Interrupt Disable Register
-	AT91_REG	 TWI_IMR; 	// Interrupt Mask Register
-	AT91_REG	 TWI_RHR; 	// Receive Holding Register
-	AT91_REG	 TWI_THR; 	// Transmit Holding Register
-} AT91S_TWI, *AT91PS_TWI;
-
-// -------- TWI_CR : (TWI Offset: 0x0) TWI Control Register -------- 
-#define AT91C_TWI_START       ((unsigned int) 0x1 <<  0) // (TWI) Send a START Condition
-#define AT91C_TWI_STOP        ((unsigned int) 0x1 <<  1) // (TWI) Send a STOP Condition
-#define AT91C_TWI_MSEN        ((unsigned int) 0x1 <<  2) // (TWI) TWI Master Transfer Enabled
-#define AT91C_TWI_MSDIS       ((unsigned int) 0x1 <<  3) // (TWI) TWI Master Transfer Disabled
-#define AT91C_TWI_SVEN        ((unsigned int) 0x1 <<  4) // (TWI) TWI Slave Transfer Enabled
-#define AT91C_TWI_SVDIS       ((unsigned int) 0x1 <<  5) // (TWI) TWI Slave Transfer Disabled
-#define AT91C_TWI_SWRST       ((unsigned int) 0x1 <<  7) // (TWI) Software Reset
-// -------- TWI_MMR : (TWI Offset: 0x4) TWI Master Mode Register -------- 
-#define AT91C_TWI_IADRSZ      ((unsigned int) 0x3 <<  8) // (TWI) Internal Device Address Size
-#define 	AT91C_TWI_IADRSZ_NO                   ((unsigned int) 0x0 <<  8) // (TWI) No internal device address
-#define 	AT91C_TWI_IADRSZ_1_BYTE               ((unsigned int) 0x1 <<  8) // (TWI) One-byte internal device address
-#define 	AT91C_TWI_IADRSZ_2_BYTE               ((unsigned int) 0x2 <<  8) // (TWI) Two-byte internal device address
-#define 	AT91C_TWI_IADRSZ_3_BYTE               ((unsigned int) 0x3 <<  8) // (TWI) Three-byte internal device address
-#define AT91C_TWI_MREAD       ((unsigned int) 0x1 << 12) // (TWI) Master Read Direction
-#define AT91C_TWI_DADR        ((unsigned int) 0x7F << 16) // (TWI) Device Address
-// -------- TWI_SMR : (TWI Offset: 0x8) TWI Slave Mode Register -------- 
-#define AT91C_TWI_SADR        ((unsigned int) 0x7F << 16) // (TWI) Slave Device Address
-// -------- TWI_CWGR : (TWI Offset: 0x10) TWI Clock Waveform Generator Register -------- 
-#define AT91C_TWI_CLDIV       ((unsigned int) 0xFF <<  0) // (TWI) Clock Low Divider
-#define AT91C_TWI_CHDIV       ((unsigned int) 0xFF <<  8) // (TWI) Clock High Divider
-#define AT91C_TWI_CKDIV       ((unsigned int) 0x7 << 16) // (TWI) Clock Divider
-// -------- TWI_SR : (TWI Offset: 0x20) TWI Status Register -------- 
-#define AT91C_TWI_TXCOMP      ((unsigned int) 0x1 <<  0) // (TWI) Transmission Completed
-#define AT91C_TWI_RXRDY       ((unsigned int) 0x1 <<  1) // (TWI) Receive holding register ReaDY
-#define AT91C_TWI_TXRDY       ((unsigned int) 0x1 <<  2) // (TWI) Transmit holding register ReaDY
-#define AT91C_TWI_SVREAD      ((unsigned int) 0x1 <<  3) // (TWI) Slave Read
-#define AT91C_TWI_SVACC       ((unsigned int) 0x1 <<  4) // (TWI) Slave Access
-#define AT91C_TWI_GCACC       ((unsigned int) 0x1 <<  5) // (TWI) General Call Access
-#define AT91C_TWI_OVRE        ((unsigned int) 0x1 <<  6) // (TWI) Overrun Error
-#define AT91C_TWI_UNRE        ((unsigned int) 0x1 <<  7) // (TWI) Underrun Error
-#define AT91C_TWI_NACK        ((unsigned int) 0x1 <<  8) // (TWI) Not Acknowledged
-#define AT91C_TWI_ARBLST      ((unsigned int) 0x1 <<  9) // (TWI) Arbitration Lost
-// -------- TWI_IER : (TWI Offset: 0x24) TWI Interrupt Enable Register -------- 
-// -------- TWI_IDR : (TWI Offset: 0x28) TWI Interrupt Disable Register -------- 
-// -------- TWI_IMR : (TWI Offset: 0x2c) TWI Interrupt Mask Register -------- 
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR Multimedia Card Interface
-// *****************************************************************************
-typedef struct _AT91S_MCI {
-	AT91_REG	 MCI_CR; 	// MCI Control Register
-	AT91_REG	 MCI_MR; 	// MCI Mode Register
-	AT91_REG	 MCI_DTOR; 	// MCI Data Timeout Register
-	AT91_REG	 MCI_SDCR; 	// MCI SD Card Register
-	AT91_REG	 MCI_ARGR; 	// MCI Argument Register
-	AT91_REG	 MCI_CMDR; 	// MCI Command Register
-	AT91_REG	 Reserved0[2]; 	// 
-	AT91_REG	 MCI_RSPR[4]; 	// MCI Response Register
-	AT91_REG	 MCI_RDR; 	// MCI Receive Data Register
-	AT91_REG	 MCI_TDR; 	// MCI Transmit Data Register
-	AT91_REG	 Reserved1[2]; 	// 
-	AT91_REG	 MCI_SR; 	// MCI Status Register
-	AT91_REG	 MCI_IER; 	// MCI Interrupt Enable Register
-	AT91_REG	 MCI_IDR; 	// MCI Interrupt Disable Register
-	AT91_REG	 MCI_IMR; 	// MCI Interrupt Mask Register
-	AT91_REG	 Reserved2[44]; 	// 
-	AT91_REG	 MCI_RPR; 	// Receive Pointer Register
-	AT91_REG	 MCI_RCR; 	// Receive Counter Register
-	AT91_REG	 MCI_TPR; 	// Transmit Pointer Register
-	AT91_REG	 MCI_TCR; 	// Transmit Counter Register
-	AT91_REG	 MCI_RNPR; 	// Receive Next Pointer Register
-	AT91_REG	 MCI_RNCR; 	// Receive Next Counter Register
-	AT91_REG	 MCI_TNPR; 	// Transmit Next Pointer Register
-	AT91_REG	 MCI_TNCR; 	// Transmit Next Counter Register
-	AT91_REG	 MCI_PTCR; 	// PDC Transfer Control Register
-	AT91_REG	 MCI_PTSR; 	// PDC Transfer Status Register
-} AT91S_MCI, *AT91PS_MCI;
-
-// -------- MCI_CR : (MCI Offset: 0x0) MCI Control Register -------- 
-#define AT91C_MCI_MCIEN       ((unsigned int) 0x1 <<  0) // (MCI) Multimedia Interface Enable
-#define AT91C_MCI_MCIDIS      ((unsigned int) 0x1 <<  1) // (MCI) Multimedia Interface Disable
-#define AT91C_MCI_PWSEN       ((unsigned int) 0x1 <<  2) // (MCI) Power Save Mode Enable
-#define AT91C_MCI_PWSDIS      ((unsigned int) 0x1 <<  3) // (MCI) Power Save Mode Disable
-// -------- MCI_MR : (MCI Offset: 0x4) MCI Mode Register -------- 
-#define AT91C_MCI_CLKDIV      ((unsigned int) 0x1 <<  0) // (MCI) Clock Divider
-#define AT91C_MCI_PWSDIV      ((unsigned int) 0x1 <<  8) // (MCI) Power Saving Divider
-#define AT91C_MCI_PDCPADV     ((unsigned int) 0x1 << 14) // (MCI) PDC Padding Value
-#define AT91C_MCI_PDCMODE     ((unsigned int) 0x1 << 15) // (MCI) PDC Oriented Mode
-#define AT91C_MCI_BLKLEN      ((unsigned int) 0x1 << 18) // (MCI) Data Block Length
-// -------- MCI_DTOR : (MCI Offset: 0x8) MCI Data Timeout Register -------- 
-#define AT91C_MCI_DTOCYC      ((unsigned int) 0x1 <<  0) // (MCI) Data Timeout Cycle Number
-#define AT91C_MCI_DTOMUL      ((unsigned int) 0x7 <<  4) // (MCI) Data Timeout Multiplier
-#define 	AT91C_MCI_DTOMUL_1                    ((unsigned int) 0x0 <<  4) // (MCI) DTOCYC x 1
-#define 	AT91C_MCI_DTOMUL_16                   ((unsigned int) 0x1 <<  4) // (MCI) DTOCYC x 16
-#define 	AT91C_MCI_DTOMUL_128                  ((unsigned int) 0x2 <<  4) // (MCI) DTOCYC x 128
-#define 	AT91C_MCI_DTOMUL_256                  ((unsigned int) 0x3 <<  4) // (MCI) DTOCYC x 256
-#define 	AT91C_MCI_DTOMUL_1024                 ((unsigned int) 0x4 <<  4) // (MCI) DTOCYC x 1024
-#define 	AT91C_MCI_DTOMUL_4096                 ((unsigned int) 0x5 <<  4) // (MCI) DTOCYC x 4096
-#define 	AT91C_MCI_DTOMUL_65536                ((unsigned int) 0x6 <<  4) // (MCI) DTOCYC x 65536
-#define 	AT91C_MCI_DTOMUL_1048576              ((unsigned int) 0x7 <<  4) // (MCI) DTOCYC x 1048576
-// -------- MCI_SDCR : (MCI Offset: 0xc) MCI SD Card Register -------- 
-#define AT91C_MCI_SCDSEL      ((unsigned int) 0x1 <<  0) // (MCI) SD Card Selector
-#define AT91C_MCI_SCDBUS      ((unsigned int) 0x1 <<  7) // (MCI) SD Card Bus Width
-// -------- MCI_CMDR : (MCI Offset: 0x14) MCI Command Register -------- 
-#define AT91C_MCI_CMDNB       ((unsigned int) 0x1F <<  0) // (MCI) Command Number
-#define AT91C_MCI_RSPTYP      ((unsigned int) 0x3 <<  6) // (MCI) Response Type
-#define 	AT91C_MCI_RSPTYP_NO                   ((unsigned int) 0x0 <<  6) // (MCI) No response
-#define 	AT91C_MCI_RSPTYP_48                   ((unsigned int) 0x1 <<  6) // (MCI) 48-bit response
-#define 	AT91C_MCI_RSPTYP_136                  ((unsigned int) 0x2 <<  6) // (MCI) 136-bit response
-#define AT91C_MCI_SPCMD       ((unsigned int) 0x7 <<  8) // (MCI) Special CMD
-#define 	AT91C_MCI_SPCMD_NONE                 ((unsigned int) 0x0 <<  8) // (MCI) Not a special CMD
-#define 	AT91C_MCI_SPCMD_INIT                 ((unsigned int) 0x1 <<  8) // (MCI) Initialization CMD
-#define 	AT91C_MCI_SPCMD_SYNC                 ((unsigned int) 0x2 <<  8) // (MCI) Synchronized CMD
-#define 	AT91C_MCI_SPCMD_IT_CMD               ((unsigned int) 0x4 <<  8) // (MCI) Interrupt command
-#define 	AT91C_MCI_SPCMD_IT_REP               ((unsigned int) 0x5 <<  8) // (MCI) Interrupt response
-#define AT91C_MCI_OPDCMD      ((unsigned int) 0x1 << 11) // (MCI) Open Drain Command
-#define AT91C_MCI_MAXLAT      ((unsigned int) 0x1 << 12) // (MCI) Maximum Latency for Command to respond
-#define AT91C_MCI_TRCMD       ((unsigned int) 0x3 << 16) // (MCI) Transfer CMD
-#define 	AT91C_MCI_TRCMD_NO                   ((unsigned int) 0x0 << 16) // (MCI) No transfer
-#define 	AT91C_MCI_TRCMD_START                ((unsigned int) 0x1 << 16) // (MCI) Start transfer
-#define 	AT91C_MCI_TRCMD_STOP                 ((unsigned int) 0x2 << 16) // (MCI) Stop transfer
-#define AT91C_MCI_TRDIR       ((unsigned int) 0x1 << 18) // (MCI) Transfer Direction
-#define AT91C_MCI_TRTYP       ((unsigned int) 0x3 << 19) // (MCI) Transfer Type
-#define 	AT91C_MCI_TRTYP_BLOCK                ((unsigned int) 0x0 << 19) // (MCI) Block Transfer type
-#define 	AT91C_MCI_TRTYP_MULTIPLE             ((unsigned int) 0x1 << 19) // (MCI) Multiple Block transfer type
-#define 	AT91C_MCI_TRTYP_STREAM               ((unsigned int) 0x2 << 19) // (MCI) Stream transfer type
-// -------- MCI_SR : (MCI Offset: 0x40) MCI Status Register -------- 
-#define AT91C_MCI_CMDRDY      ((unsigned int) 0x1 <<  0) // (MCI) Command Ready flag
-#define AT91C_MCI_RXRDY       ((unsigned int) 0x1 <<  1) // (MCI) RX Ready flag
-#define AT91C_MCI_TXRDY       ((unsigned int) 0x1 <<  2) // (MCI) TX Ready flag
-#define AT91C_MCI_BLKE        ((unsigned int) 0x1 <<  3) // (MCI) Data Block Transfer Ended flag
-#define AT91C_MCI_DTIP        ((unsigned int) 0x1 <<  4) // (MCI) Data Transfer in Progress flag
-#define AT91C_MCI_NOTBUSY     ((unsigned int) 0x1 <<  5) // (MCI) Data Line Not Busy flag
-#define AT91C_MCI_ENDRX       ((unsigned int) 0x1 <<  6) // (MCI) End of RX Buffer flag
-#define AT91C_MCI_ENDTX       ((unsigned int) 0x1 <<  7) // (MCI) End of TX Buffer flag
-#define AT91C_MCI_RXBUFF      ((unsigned int) 0x1 << 14) // (MCI) RX Buffer Full flag
-#define AT91C_MCI_TXBUFE      ((unsigned int) 0x1 << 15) // (MCI) TX Buffer Empty flag
-#define AT91C_MCI_RINDE       ((unsigned int) 0x1 << 16) // (MCI) Response Index Error flag
-#define AT91C_MCI_RDIRE       ((unsigned int) 0x1 << 17) // (MCI) Response Direction Error flag
-#define AT91C_MCI_RCRCE       ((unsigned int) 0x1 << 18) // (MCI) Response CRC Error flag
-#define AT91C_MCI_RENDE       ((unsigned int) 0x1 << 19) // (MCI) Response End Bit Error flag
-#define AT91C_MCI_RTOE        ((unsigned int) 0x1 << 20) // (MCI) Response Time-out Error flag
-#define AT91C_MCI_DCRCE       ((unsigned int) 0x1 << 21) // (MCI) data CRC Error flag
-#define AT91C_MCI_DTOE        ((unsigned int) 0x1 << 22) // (MCI) Data timeout Error flag
-#define AT91C_MCI_OVRE        ((unsigned int) 0x1 << 30) // (MCI) Overrun flag
-#define AT91C_MCI_UNRE        ((unsigned int) 0x1 << 31) // (MCI) Underrun flag
-// -------- MCI_IER : (MCI Offset: 0x44) MCI Interrupt Enable Register -------- 
-// -------- MCI_IDR : (MCI Offset: 0x48) MCI Interrupt Disable Register -------- 
-// -------- MCI_IMR : (MCI Offset: 0x4c) MCI Interrupt Mask Register -------- 
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR USB Device Interface
-// *****************************************************************************
-typedef struct _AT91S_UDP {
-	AT91_REG	 UDP_NUM; 	// Frame Number Register
-	AT91_REG	 UDP_GLBSTATE; 	// Global State Register
-	AT91_REG	 UDP_FADDR; 	// Function Address Register
-	AT91_REG	 Reserved0[1]; 	// 
-	AT91_REG	 UDP_IER; 	// Interrupt Enable Register
-	AT91_REG	 UDP_IDR; 	// Interrupt Disable Register
-	AT91_REG	 UDP_IMR; 	// Interrupt Mask Register
-	AT91_REG	 UDP_ISR; 	// Interrupt Status Register
-	AT91_REG	 UDP_ICR; 	// Interrupt Clear Register
-	AT91_REG	 Reserved1[1]; 	// 
-	AT91_REG	 UDP_RSTEP; 	// Reset Endpoint Register
-	AT91_REG	 Reserved2[1]; 	// 
-	AT91_REG	 UDP_CSR[8]; 	// Endpoint Control and Status Register
-	AT91_REG	 UDP_FDR[8]; 	// Endpoint FIFO Data Register
-} AT91S_UDP, *AT91PS_UDP;
-
-// -------- UDP_FRM_NUM : (UDP Offset: 0x0) USB Frame Number Register -------- 
-#define AT91C_UDP_FRM_NUM     ((unsigned int) 0x7FF <<  0) // (UDP) Frame Number as Defined in the Packet Field Formats
-#define AT91C_UDP_FRM_ERR     ((unsigned int) 0x1 << 16) // (UDP) Frame Error
-#define AT91C_UDP_FRM_OK      ((unsigned int) 0x1 << 17) // (UDP) Frame OK
-// -------- UDP_GLB_STATE : (UDP Offset: 0x4) USB Global State Register -------- 
-#define AT91C_UDP_FADDEN      ((unsigned int) 0x1 <<  0) // (UDP) Function Address Enable
-#define AT91C_UDP_CONFG       ((unsigned int) 0x1 <<  1) // (UDP) Configured
-#define AT91C_UDP_RMWUPE      ((unsigned int) 0x1 <<  2) // (UDP) Remote Wake Up Enable
-#define AT91C_UDP_RSMINPR     ((unsigned int) 0x1 <<  3) // (UDP) A Resume Has Been Sent to the Host
-// -------- UDP_FADDR : (UDP Offset: 0x8) USB Function Address Register -------- 
-#define AT91C_UDP_FADD        ((unsigned int) 0xFF <<  0) // (UDP) Function Address Value
-#define AT91C_UDP_FEN         ((unsigned int) 0x1 <<  8) // (UDP) Function Enable
-// -------- UDP_IER : (UDP Offset: 0x10) USB Interrupt Enable Register -------- 
-#define AT91C_UDP_EPINT0      ((unsigned int) 0x1 <<  0) // (UDP) Endpoint 0 Interrupt
-#define AT91C_UDP_EPINT1      ((unsigned int) 0x1 <<  1) // (UDP) Endpoint 0 Interrupt
-#define AT91C_UDP_EPINT2      ((unsigned int) 0x1 <<  2) // (UDP) Endpoint 2 Interrupt
-#define AT91C_UDP_EPINT3      ((unsigned int) 0x1 <<  3) // (UDP) Endpoint 3 Interrupt
-#define AT91C_UDP_EPINT4      ((unsigned int) 0x1 <<  4) // (UDP) Endpoint 4 Interrupt
-#define AT91C_UDP_EPINT5      ((unsigned int) 0x1 <<  5) // (UDP) Endpoint 5 Interrupt
-#define AT91C_UDP_EPINT6      ((unsigned int) 0x1 <<  6) // (UDP) Endpoint 6 Interrupt
-#define AT91C_UDP_EPINT7      ((unsigned int) 0x1 <<  7) // (UDP) Endpoint 7 Interrupt
-#define AT91C_UDP_RXSUSP      ((unsigned int) 0x1 <<  8) // (UDP) USB Suspend Interrupt
-#define AT91C_UDP_RXRSM       ((unsigned int) 0x1 <<  9) // (UDP) USB Resume Interrupt
-#define AT91C_UDP_EXTRSM      ((unsigned int) 0x1 << 10) // (UDP) USB External Resume Interrupt
-#define AT91C_UDP_SOFINT      ((unsigned int) 0x1 << 11) // (UDP) USB Start Of frame Interrupt
-#define AT91C_UDP_WAKEUP      ((unsigned int) 0x1 << 13) // (UDP) USB Resume Interrupt
-// -------- UDP_IDR : (UDP Offset: 0x14) USB Interrupt Disable Register -------- 
-// -------- UDP_IMR : (UDP Offset: 0x18) USB Interrupt Mask Register -------- 
-// -------- UDP_ISR : (UDP Offset: 0x1c) USB Interrupt Status Register -------- 
-#define AT91C_UDP_ENDBUSRES   ((unsigned int) 0x1 << 12) // (UDP) USB End Of Bus Reset Interrupt
-// -------- UDP_ICR : (UDP Offset: 0x20) USB Interrupt Clear Register -------- 
-// -------- UDP_RST_EP : (UDP Offset: 0x28) USB Reset Endpoint Register -------- 
-#define AT91C_UDP_EP0         ((unsigned int) 0x1 <<  0) // (UDP) Reset Endpoint 0
-#define AT91C_UDP_EP1         ((unsigned int) 0x1 <<  1) // (UDP) Reset Endpoint 1
-#define AT91C_UDP_EP2         ((unsigned int) 0x1 <<  2) // (UDP) Reset Endpoint 2
-#define AT91C_UDP_EP3         ((unsigned int) 0x1 <<  3) // (UDP) Reset Endpoint 3
-#define AT91C_UDP_EP4         ((unsigned int) 0x1 <<  4) // (UDP) Reset Endpoint 4
-#define AT91C_UDP_EP5         ((unsigned int) 0x1 <<  5) // (UDP) Reset Endpoint 5
-#define AT91C_UDP_EP6         ((unsigned int) 0x1 <<  6) // (UDP) Reset Endpoint 6
-#define AT91C_UDP_EP7         ((unsigned int) 0x1 <<  7) // (UDP) Reset Endpoint 7
-// -------- UDP_CSR : (UDP Offset: 0x30) USB Endpoint Control and Status Register -------- 
-#define AT91C_UDP_TXCOMP      ((unsigned int) 0x1 <<  0) // (UDP) Generates an IN packet with data previously written in the DPR
-#define AT91C_UDP_RX_DATA_BK0 ((unsigned int) 0x1 <<  1) // (UDP) Receive Data Bank 0
-#define AT91C_UDP_RXSETUP     ((unsigned int) 0x1 <<  2) // (UDP) Sends STALL to the Host (Control endpoints)
-#define AT91C_UDP_ISOERROR    ((unsigned int) 0x1 <<  3) // (UDP) Isochronous error (Isochronous endpoints)
-#define AT91C_UDP_TXPKTRDY    ((unsigned int) 0x1 <<  4) // (UDP) Transmit Packet Ready
-#define AT91C_UDP_FORCESTALL  ((unsigned int) 0x1 <<  5) // (UDP) Force Stall (used by Control, Bulk and Isochronous endpoints).
-#define AT91C_UDP_RX_DATA_BK1 ((unsigned int) 0x1 <<  6) // (UDP) Receive Data Bank 1 (only used by endpoints with ping-pong attributes).
-#define AT91C_UDP_DIR         ((unsigned int) 0x1 <<  7) // (UDP) Transfer Direction
-#define AT91C_UDP_EPTYPE      ((unsigned int) 0x7 <<  8) // (UDP) Endpoint type
-#define 	AT91C_UDP_EPTYPE_CTRL                 ((unsigned int) 0x0 <<  8) // (UDP) Control
-#define 	AT91C_UDP_EPTYPE_ISO_OUT              ((unsigned int) 0x1 <<  8) // (UDP) Isochronous OUT
-#define 	AT91C_UDP_EPTYPE_BULK_OUT             ((unsigned int) 0x2 <<  8) // (UDP) Bulk OUT
-#define 	AT91C_UDP_EPTYPE_INT_OUT              ((unsigned int) 0x3 <<  8) // (UDP) Interrupt OUT
-#define 	AT91C_UDP_EPTYPE_ISO_IN               ((unsigned int) 0x5 <<  8) // (UDP) Isochronous IN
-#define 	AT91C_UDP_EPTYPE_BULK_IN              ((unsigned int) 0x6 <<  8) // (UDP) Bulk IN
-#define 	AT91C_UDP_EPTYPE_INT_IN               ((unsigned int) 0x7 <<  8) // (UDP) Interrupt IN
-#define AT91C_UDP_DTGLE       ((unsigned int) 0x1 << 11) // (UDP) Data Toggle
-#define AT91C_UDP_EPEDS       ((unsigned int) 0x1 << 15) // (UDP) Endpoint Enable Disable
-#define AT91C_UDP_RXBYTECNT   ((unsigned int) 0x7FF << 16) // (UDP) Number Of Bytes Available in the FIFO
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR Timer Counter Channel Interface
-// *****************************************************************************
-typedef struct _AT91S_TC {
-	AT91_REG	 TC_CCR; 	// Channel Control Register
-	AT91_REG	 TC_CMR; 	// Channel Mode Register
-	AT91_REG	 Reserved0[2]; 	// 
-	AT91_REG	 TC_CV; 	// Counter Value
-	AT91_REG	 TC_RA; 	// Register A
-	AT91_REG	 TC_RB; 	// Register B
-	AT91_REG	 TC_RC; 	// Register C
-	AT91_REG	 TC_SR; 	// Status Register
-	AT91_REG	 TC_IER; 	// Interrupt Enable Register
-	AT91_REG	 TC_IDR; 	// Interrupt Disable Register
-	AT91_REG	 TC_IMR; 	// Interrupt Mask Register
-} AT91S_TC, *AT91PS_TC;
-
-// -------- TC_CCR : (TC Offset: 0x0) TC Channel Control Register -------- 
-#define AT91C_TC_CLKEN        ((unsigned int) 0x1 <<  0) // (TC) Counter Clock Enable Command
-#define AT91C_TC_CLKDIS       ((unsigned int) 0x1 <<  1) // (TC) Counter Clock Disable Command
-#define AT91C_TC_SWTRG        ((unsigned int) 0x1 <<  2) // (TC) Software Trigger Command
-// -------- TC_CMR : (TC Offset: 0x4) TC Channel Mode Register: Capture Mode / Waveform Mode -------- 
-#define AT91C_TC_CPCSTOP      ((unsigned int) 0x1 <<  6) // (TC) Counter Clock Stopped with RC Compare
-#define AT91C_TC_CPCDIS       ((unsigned int) 0x1 <<  7) // (TC) Counter Clock Disable with RC Compare
-#define AT91C_TC_EEVTEDG      ((unsigned int) 0x3 <<  8) // (TC) External Event Edge Selection
-#define 	AT91C_TC_EEVTEDG_NONE                 ((unsigned int) 0x0 <<  8) // (TC) Edge: None
-#define 	AT91C_TC_EEVTEDG_RISING               ((unsigned int) 0x1 <<  8) // (TC) Edge: rising edge
-#define 	AT91C_TC_EEVTEDG_FALLING              ((unsigned int) 0x2 <<  8) // (TC) Edge: falling edge
-#define 	AT91C_TC_EEVTEDG_BOTH                 ((unsigned int) 0x3 <<  8) // (TC) Edge: each edge
-#define AT91C_TC_EEVT         ((unsigned int) 0x3 << 10) // (TC) External Event  Selection
-#define 	AT91C_TC_EEVT_NONE                 ((unsigned int) 0x0 << 10) // (TC) Signal selected as external event: TIOB TIOB direction: input
-#define 	AT91C_TC_EEVT_RISING               ((unsigned int) 0x1 << 10) // (TC) Signal selected as external event: XC0 TIOB direction: output
-#define 	AT91C_TC_EEVT_FALLING              ((unsigned int) 0x2 << 10) // (TC) Signal selected as external event: XC1 TIOB direction: output
-#define 	AT91C_TC_EEVT_BOTH                 ((unsigned int) 0x3 << 10) // (TC) Signal selected as external event: XC2 TIOB direction: output
-#define AT91C_TC_ENETRG       ((unsigned int) 0x1 << 12) // (TC) External Event Trigger enable
-#define AT91C_TC_WAVESEL      ((unsigned int) 0x3 << 13) // (TC) Waveform  Selection
-#define 	AT91C_TC_WAVESEL_UP                   ((unsigned int) 0x0 << 13) // (TC) UP mode without atomatic trigger on RC Compare
-#define 	AT91C_TC_WAVESEL_UPDOWN               ((unsigned int) 0x1 << 13) // (TC) UPDOWN mode without automatic trigger on RC Compare
-#define 	AT91C_TC_WAVESEL_UP_AUTO              ((unsigned int) 0x2 << 13) // (TC) UP mode with automatic trigger on RC Compare
-#define 	AT91C_TC_WAVESEL_UPDOWN_AUTO          ((unsigned int) 0x3 << 13) // (TC) UPDOWN mode with automatic trigger on RC Compare
-#define AT91C_TC_CPCTRG       ((unsigned int) 0x1 << 14) // (TC) RC Compare Trigger Enable
-#define AT91C_TC_WAVE         ((unsigned int) 0x1 << 15) // (TC) 
-#define AT91C_TC_ACPA         ((unsigned int) 0x3 << 16) // (TC) RA Compare Effect on TIOA
-#define 	AT91C_TC_ACPA_NONE                 ((unsigned int) 0x0 << 16) // (TC) Effect: none
-#define 	AT91C_TC_ACPA_SET                  ((unsigned int) 0x1 << 16) // (TC) Effect: set
-#define 	AT91C_TC_ACPA_CLEAR                ((unsigned int) 0x2 << 16) // (TC) Effect: clear
-#define 	AT91C_TC_ACPA_TOGGLE               ((unsigned int) 0x3 << 16) // (TC) Effect: toggle
-#define AT91C_TC_ACPC         ((unsigned int) 0x3 << 18) // (TC) RC Compare Effect on TIOA
-#define 	AT91C_TC_ACPC_NONE                 ((unsigned int) 0x0 << 18) // (TC) Effect: none
-#define 	AT91C_TC_ACPC_SET                  ((unsigned int) 0x1 << 18) // (TC) Effect: set
-#define 	AT91C_TC_ACPC_CLEAR                ((unsigned int) 0x2 << 18) // (TC) Effect: clear
-#define 	AT91C_TC_ACPC_TOGGLE               ((unsigned int) 0x3 << 18) // (TC) Effect: toggle
-#define AT91C_TC_AEEVT        ((unsigned int) 0x3 << 20) // (TC) External Event Effect on TIOA
-#define 	AT91C_TC_AEEVT_NONE                 ((unsigned int) 0x0 << 20) // (TC) Effect: none
-#define 	AT91C_TC_AEEVT_SET                  ((unsigned int) 0x1 << 20) // (TC) Effect: set
-#define 	AT91C_TC_AEEVT_CLEAR                ((unsigned int) 0x2 << 20) // (TC) Effect: clear
-#define 	AT91C_TC_AEEVT_TOGGLE               ((unsigned int) 0x3 << 20) // (TC) Effect: toggle
-#define AT91C_TC_ASWTRG       ((unsigned int) 0x3 << 22) // (TC) Software Trigger Effect on TIOA
-#define 	AT91C_TC_ASWTRG_NONE                 ((unsigned int) 0x0 << 22) // (TC) Effect: none
-#define 	AT91C_TC_ASWTRG_SET                  ((unsigned int) 0x1 << 22) // (TC) Effect: set
-#define 	AT91C_TC_ASWTRG_CLEAR                ((unsigned int) 0x2 << 22) // (TC) Effect: clear
-#define 	AT91C_TC_ASWTRG_TOGGLE               ((unsigned int) 0x3 << 22) // (TC) Effect: toggle
-#define AT91C_TC_BCPB         ((unsigned int) 0x3 << 24) // (TC) RB Compare Effect on TIOB
-#define 	AT91C_TC_BCPB_NONE                 ((unsigned int) 0x0 << 24) // (TC) Effect: none
-#define 	AT91C_TC_BCPB_SET                  ((unsigned int) 0x1 << 24) // (TC) Effect: set
-#define 	AT91C_TC_BCPB_CLEAR                ((unsigned int) 0x2 << 24) // (TC) Effect: clear
-#define 	AT91C_TC_BCPB_TOGGLE               ((unsigned int) 0x3 << 24) // (TC) Effect: toggle
-#define AT91C_TC_BCPC         ((unsigned int) 0x3 << 26) // (TC) RC Compare Effect on TIOB
-#define 	AT91C_TC_BCPC_NONE                 ((unsigned int) 0x0 << 26) // (TC) Effect: none
-#define 	AT91C_TC_BCPC_SET                  ((unsigned int) 0x1 << 26) // (TC) Effect: set
-#define 	AT91C_TC_BCPC_CLEAR                ((unsigned int) 0x2 << 26) // (TC) Effect: clear
-#define 	AT91C_TC_BCPC_TOGGLE               ((unsigned int) 0x3 << 26) // (TC) Effect: toggle
-#define AT91C_TC_BEEVT        ((unsigned int) 0x3 << 28) // (TC) External Event Effect on TIOB
-#define 	AT91C_TC_BEEVT_NONE                 ((unsigned int) 0x0 << 28) // (TC) Effect: none
-#define 	AT91C_TC_BEEVT_SET                  ((unsigned int) 0x1 << 28) // (TC) Effect: set
-#define 	AT91C_TC_BEEVT_CLEAR                ((unsigned int) 0x2 << 28) // (TC) Effect: clear
-#define 	AT91C_TC_BEEVT_TOGGLE               ((unsigned int) 0x3 << 28) // (TC) Effect: toggle
-#define AT91C_TC_BSWTRG       ((unsigned int) 0x3 << 30) // (TC) Software Trigger Effect on TIOB
-#define 	AT91C_TC_BSWTRG_NONE                 ((unsigned int) 0x0 << 30) // (TC) Effect: none
-#define 	AT91C_TC_BSWTRG_SET                  ((unsigned int) 0x1 << 30) // (TC) Effect: set
-#define 	AT91C_TC_BSWTRG_CLEAR                ((unsigned int) 0x2 << 30) // (TC) Effect: clear
-#define 	AT91C_TC_BSWTRG_TOGGLE               ((unsigned int) 0x3 << 30) // (TC) Effect: toggle
-// -------- TC_SR : (TC Offset: 0x20) TC Channel Status Register -------- 
-#define AT91C_TC_COVFS        ((unsigned int) 0x1 <<  0) // (TC) Counter Overflow
-#define AT91C_TC_LOVRS        ((unsigned int) 0x1 <<  1) // (TC) Load Overrun
-#define AT91C_TC_CPAS         ((unsigned int) 0x1 <<  2) // (TC) RA Compare
-#define AT91C_TC_CPBS         ((unsigned int) 0x1 <<  3) // (TC) RB Compare
-#define AT91C_TC_CPCS         ((unsigned int) 0x1 <<  4) // (TC) RC Compare
-#define AT91C_TC_LDRAS        ((unsigned int) 0x1 <<  5) // (TC) RA Loading
-#define AT91C_TC_LDRBS        ((unsigned int) 0x1 <<  6) // (TC) RB Loading
-#define AT91C_TC_ETRCS        ((unsigned int) 0x1 <<  7) // (TC) External Trigger
-#define AT91C_TC_ETRGS        ((unsigned int) 0x1 << 16) // (TC) Clock Enabling
-#define AT91C_TC_MTIOA        ((unsigned int) 0x1 << 17) // (TC) TIOA Mirror
-#define AT91C_TC_MTIOB        ((unsigned int) 0x1 << 18) // (TC) TIOA Mirror
-// -------- TC_IER : (TC Offset: 0x24) TC Channel Interrupt Enable Register -------- 
-// -------- TC_IDR : (TC Offset: 0x28) TC Channel Interrupt Disable Register -------- 
-// -------- TC_IMR : (TC Offset: 0x2c) TC Channel Interrupt Mask Register -------- 
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR Timer Counter Interface
-// *****************************************************************************
-typedef struct _AT91S_TCB {
-	AT91S_TC	 TCB_TC0; 	// TC Channel 0
-	AT91_REG	 Reserved0[4]; 	// 
-	AT91S_TC	 TCB_TC1; 	// TC Channel 1
-	AT91_REG	 Reserved1[4]; 	// 
-	AT91S_TC	 TCB_TC2; 	// TC Channel 2
-	AT91_REG	 Reserved2[4]; 	// 
-	AT91_REG	 TCB_BCR; 	// TC Block Control Register
-	AT91_REG	 TCB_BMR; 	// TC Block Mode Register
-} AT91S_TCB, *AT91PS_TCB;
-
-// -------- TCB_BCR : (TCB Offset: 0xc0) TC Block Control Register -------- 
-#define AT91C_TCB_SYNC        ((unsigned int) 0x1 <<  0) // (TCB) Synchro Command
-// -------- TCB_BMR : (TCB Offset: 0xc4) TC Block Mode Register -------- 
-#define AT91C_TCB_TC0XC0S     ((unsigned int) 0x1 <<  0) // (TCB) External Clock Signal 0 Selection
-#define 	AT91C_TCB_TC0XC0S_TCLK0                ((unsigned int) 0x0) // (TCB) TCLK0 connected to XC0
-#define 	AT91C_TCB_TC0XC0S_NONE                 ((unsigned int) 0x1) // (TCB) None signal connected to XC0
-#define 	AT91C_TCB_TC0XC0S_TIOA1                ((unsigned int) 0x2) // (TCB) TIOA1 connected to XC0
-#define 	AT91C_TCB_TC0XC0S_TIOA2                ((unsigned int) 0x3) // (TCB) TIOA2 connected to XC0
-#define AT91C_TCB_TC1XC1S     ((unsigned int) 0x1 <<  2) // (TCB) External Clock Signal 1 Selection
-#define 	AT91C_TCB_TC1XC1S_TCLK1                ((unsigned int) 0x0 <<  2) // (TCB) TCLK1 connected to XC1
-#define 	AT91C_TCB_TC1XC1S_NONE                 ((unsigned int) 0x1 <<  2) // (TCB) None signal connected to XC1
-#define 	AT91C_TCB_TC1XC1S_TIOA0                ((unsigned int) 0x2 <<  2) // (TCB) TIOA0 connected to XC1
-#define 	AT91C_TCB_TC1XC1S_TIOA2                ((unsigned int) 0x3 <<  2) // (TCB) TIOA2 connected to XC1
-#define AT91C_TCB_TC2XC2S     ((unsigned int) 0x1 <<  4) // (TCB) External Clock Signal 2 Selection
-#define 	AT91C_TCB_TC2XC2S_TCLK2                ((unsigned int) 0x0 <<  4) // (TCB) TCLK2 connected to XC2
-#define 	AT91C_TCB_TC2XC2S_NONE                 ((unsigned int) 0x1 <<  4) // (TCB) None signal connected to XC2
-#define 	AT91C_TCB_TC2XC2S_TIOA0                ((unsigned int) 0x2 <<  4) // (TCB) TIOA0 connected to XC2
-#define 	AT91C_TCB_TC2XC2S_TIOA2                ((unsigned int) 0x3 <<  4) // (TCB) TIOA2 connected to XC2
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR USB Host Interface
-// *****************************************************************************
-typedef struct _AT91S_UHP {
-	AT91_REG	 UHP_HcRevision; 	// Revision
-	AT91_REG	 UHP_HcControl; 	// Operating modes for the Host Controller
-	AT91_REG	 UHP_HcCommandStatus; 	// Command & status Register
-	AT91_REG	 UHP_HcInterruptStatus; 	// Interrupt Status Register
-	AT91_REG	 UHP_HcInterruptEnable; 	// Interrupt Enable Register
-	AT91_REG	 UHP_HcInterruptDisable; 	// Interrupt Disable Register
-	AT91_REG	 UHP_HcHCCA; 	// Pointer to the Host Controller Communication Area
-	AT91_REG	 UHP_HcPeriodCurrentED; 	// Current Isochronous or Interrupt Endpoint Descriptor
-	AT91_REG	 UHP_HcControlHeadED; 	// First Endpoint Descriptor of the Control list
-	AT91_REG	 UHP_HcControlCurrentED; 	// Endpoint Control and Status Register
-	AT91_REG	 UHP_HcBulkHeadED; 	// First endpoint register of the Bulk list
-	AT91_REG	 UHP_HcBulkCurrentED; 	// Current endpoint of the Bulk list
-	AT91_REG	 UHP_HcBulkDoneHead; 	// Last completed transfer descriptor
-	AT91_REG	 UHP_HcFmInterval; 	// Bit time between 2 consecutive SOFs
-	AT91_REG	 UHP_HcFmRemaining; 	// Bit time remaining in the current Frame
-	AT91_REG	 UHP_HcFmNumber; 	// Frame number
-	AT91_REG	 UHP_HcPeriodicStart; 	// Periodic Start
-	AT91_REG	 UHP_HcLSThreshold; 	// LS Threshold
-	AT91_REG	 UHP_HcRhDescriptorA; 	// Root Hub characteristics A
-	AT91_REG	 UHP_HcRhDescriptorB; 	// Root Hub characteristics B
-	AT91_REG	 UHP_HcRhStatus; 	// Root Hub Status register
-	AT91_REG	 UHP_HcRhPortStatus[2]; 	// Root Hub Port Status Register
-} AT91S_UHP, *AT91PS_UHP;
-
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR Ethernet MAC
-// *****************************************************************************
-typedef struct _AT91S_EMAC {
-	AT91_REG	 EMAC_CTL; 	// Network Control Register
-	AT91_REG	 EMAC_CFG; 	// Network Configuration Register
-	AT91_REG	 EMAC_SR; 	// Network Status Register
-	AT91_REG	 EMAC_TAR; 	// Transmit Address Register
-	AT91_REG	 EMAC_TCR; 	// Transmit Control Register
-	AT91_REG	 EMAC_TSR; 	// Transmit Status Register
-	AT91_REG	 EMAC_RBQP; 	// Receive Buffer Queue Pointer
-	AT91_REG	 Reserved0[1]; 	// 
-	AT91_REG	 EMAC_RSR; 	// Receive Status Register
-	AT91_REG	 EMAC_ISR; 	// Interrupt Status Register
-	AT91_REG	 EMAC_IER; 	// Interrupt Enable Register
-	AT91_REG	 EMAC_IDR; 	// Interrupt Disable Register
-	AT91_REG	 EMAC_IMR; 	// Interrupt Mask Register
-	AT91_REG	 EMAC_MAN; 	// PHY Maintenance Register
-	AT91_REG	 Reserved1[2]; 	// 
-	AT91_REG	 EMAC_FRA; 	// Frames Transmitted OK Register
-	AT91_REG	 EMAC_SCOL; 	// Single Collision Frame Register
-	AT91_REG	 EMAC_MCOL; 	// Multiple Collision Frame Register
-	AT91_REG	 EMAC_OK; 	// Frames Received OK Register
-	AT91_REG	 EMAC_SEQE; 	// Frame Check Sequence Error Register
-	AT91_REG	 EMAC_ALE; 	// Alignment Error Register
-	AT91_REG	 EMAC_DTE; 	// Deferred Transmission Frame Register
-	AT91_REG	 EMAC_LCOL; 	// Late Collision Register
-	AT91_REG	 EMAC_ECOL; 	// Excessive Collision Register
-	AT91_REG	 EMAC_CSE; 	// Carrier Sense Error Register
-	AT91_REG	 EMAC_TUE; 	// Transmit Underrun Error Register
-	AT91_REG	 EMAC_CDE; 	// Code Error Register
-	AT91_REG	 EMAC_ELR; 	// Excessive Length Error Register
-	AT91_REG	 EMAC_RJB; 	// Receive Jabber Register
-	AT91_REG	 EMAC_USF; 	// Undersize Frame Register
-	AT91_REG	 EMAC_SQEE; 	// SQE Test Error Register
-	AT91_REG	 EMAC_DRFC; 	// Discarded RX Frame Register
-	AT91_REG	 Reserved2[3]; 	// 
-	AT91_REG	 EMAC_HSH; 	// Hash Address High[63:32]
-	AT91_REG	 EMAC_HSL; 	// Hash Address Low[31:0]
-	AT91_REG	 EMAC_SA1L; 	// Specific Address 1 Low, First 4 bytes
-	AT91_REG	 EMAC_SA1H; 	// Specific Address 1 High, Last 2 bytes
-	AT91_REG	 EMAC_SA2L; 	// Specific Address 2 Low, First 4 bytes
-	AT91_REG	 EMAC_SA2H; 	// Specific Address 2 High, Last 2 bytes
-	AT91_REG	 EMAC_SA3L; 	// Specific Address 3 Low, First 4 bytes
-	AT91_REG	 EMAC_SA3H; 	// Specific Address 3 High, Last 2 bytes
-	AT91_REG	 EMAC_SA4L; 	// Specific Address 4 Low, First 4 bytes
-	AT91_REG	 EMAC_SA4H; 	// Specific Address 4 High, Last 2 bytesr
-} AT91S_EMAC, *AT91PS_EMAC;
-
-// -------- EMAC_CTL : (EMAC Offset: 0x0)  -------- 
-#define AT91C_EMAC_LB         ((unsigned int) 0x1 <<  0) // (EMAC) Loopback. Optional. When set, loopback signal is at high level.
-#define AT91C_EMAC_LBL        ((unsigned int) 0x1 <<  1) // (EMAC) Loopback local. 
-#define AT91C_EMAC_RE         ((unsigned int) 0x1 <<  2) // (EMAC) Receive enable. 
-#define AT91C_EMAC_TE         ((unsigned int) 0x1 <<  3) // (EMAC) Transmit enable. 
-#define AT91C_EMAC_MPE        ((unsigned int) 0x1 <<  4) // (EMAC) Management port enable. 
-#define AT91C_EMAC_CSR        ((unsigned int) 0x1 <<  5) // (EMAC) Clear statistics registers. 
-#define AT91C_EMAC_ISR        ((unsigned int) 0x1 <<  6) // (EMAC) Increment statistics registers. 
-#define AT91C_EMAC_WES        ((unsigned int) 0x1 <<  7) // (EMAC) Write enable for statistics registers. 
-#define AT91C_EMAC_BP         ((unsigned int) 0x1 <<  8) // (EMAC) Back pressure. 
-// -------- EMAC_CFG : (EMAC Offset: 0x4) Network Configuration Register -------- 
-#define AT91C_EMAC_SPD        ((unsigned int) 0x1 <<  0) // (EMAC) Speed. 
-#define AT91C_EMAC_FD         ((unsigned int) 0x1 <<  1) // (EMAC) Full duplex. 
-#define AT91C_EMAC_BR         ((unsigned int) 0x1 <<  2) // (EMAC) Bit rate. 
-#define AT91C_EMAC_CAF        ((unsigned int) 0x1 <<  4) // (EMAC) Copy all frames. 
-#define AT91C_EMAC_NBC        ((unsigned int) 0x1 <<  5) // (EMAC) No broadcast. 
-#define AT91C_EMAC_MTI        ((unsigned int) 0x1 <<  6) // (EMAC) Multicast hash enable
-#define AT91C_EMAC_UNI        ((unsigned int) 0x1 <<  7) // (EMAC) Unicast hash enable. 
-#define AT91C_EMAC_BIG        ((unsigned int) 0x1 <<  8) // (EMAC) Receive 1522 bytes. 
-#define AT91C_EMAC_EAE        ((unsigned int) 0x1 <<  9) // (EMAC) External address match enable. 
-#define AT91C_EMAC_CLK        ((unsigned int) 0x3 << 10) // (EMAC) 
-#define 	AT91C_EMAC_CLK_HCLK_8               ((unsigned int) 0x0 << 10) // (EMAC) HCLK divided by 8
-#define 	AT91C_EMAC_CLK_HCLK_16              ((unsigned int) 0x1 << 10) // (EMAC) HCLK divided by 16
-#define 	AT91C_EMAC_CLK_HCLK_32              ((unsigned int) 0x2 << 10) // (EMAC) HCLK divided by 32
-#define 	AT91C_EMAC_CLK_HCLK_64              ((unsigned int) 0x3 << 10) // (EMAC) HCLK divided by 64
-#define AT91C_EMAC_RTY        ((unsigned int) 0x1 << 12) // (EMAC) 
-#define AT91C_EMAC_RMII       ((unsigned int) 0x1 << 13) // (EMAC) 
-// -------- EMAC_SR : (EMAC Offset: 0x8) Network Status Register -------- 
-#define AT91C_EMAC_MDIO       ((unsigned int) 0x1 <<  1) // (EMAC) 
-#define AT91C_EMAC_IDLE       ((unsigned int) 0x1 <<  2) // (EMAC) 
-// -------- EMAC_TCR : (EMAC Offset: 0x10) Transmit Control Register -------- 
-#define AT91C_EMAC_LEN        ((unsigned int) 0x7FF <<  0) // (EMAC) 
-#define AT91C_EMAC_NCRC       ((unsigned int) 0x1 << 15) // (EMAC) 
-// -------- EMAC_TSR : (EMAC Offset: 0x14) Transmit Control Register -------- 
-#define AT91C_EMAC_OVR        ((unsigned int) 0x1 <<  0) // (EMAC) 
-#define AT91C_EMAC_COL        ((unsigned int) 0x1 <<  1) // (EMAC) 
-#define AT91C_EMAC_RLE        ((unsigned int) 0x1 <<  2) // (EMAC) 
-#define AT91C_EMAC_TXIDLE     ((unsigned int) 0x1 <<  3) // (EMAC) 
-#define AT91C_EMAC_BNQ        ((unsigned int) 0x1 <<  4) // (EMAC) 
-#define AT91C_EMAC_COMP       ((unsigned int) 0x1 <<  5) // (EMAC) 
-#define AT91C_EMAC_UND        ((unsigned int) 0x1 <<  6) // (EMAC) 
-// -------- EMAC_RSR : (EMAC Offset: 0x20) Receive Status Register -------- 
-#define AT91C_EMAC_BNA        ((unsigned int) 0x1 <<  0) // (EMAC) 
-#define AT91C_EMAC_REC        ((unsigned int) 0x1 <<  1) // (EMAC) 
-// -------- EMAC_ISR : (EMAC Offset: 0x24) Interrupt Status Register -------- 
-#define AT91C_EMAC_DONE       ((unsigned int) 0x1 <<  0) // (EMAC) 
-#define AT91C_EMAC_RCOM       ((unsigned int) 0x1 <<  1) // (EMAC) 
-#define AT91C_EMAC_RBNA       ((unsigned int) 0x1 <<  2) // (EMAC) 
-#define AT91C_EMAC_TOVR       ((unsigned int) 0x1 <<  3) // (EMAC) 
-#define AT91C_EMAC_TUND       ((unsigned int) 0x1 <<  4) // (EMAC) 
-#define AT91C_EMAC_RTRY       ((unsigned int) 0x1 <<  5) // (EMAC) 
-#define AT91C_EMAC_TBRE       ((unsigned int) 0x1 <<  6) // (EMAC) 
-#define AT91C_EMAC_TCOM       ((unsigned int) 0x1 <<  7) // (EMAC) 
-#define AT91C_EMAC_TIDLE      ((unsigned int) 0x1 <<  8) // (EMAC) 
-#define AT91C_EMAC_LINK       ((unsigned int) 0x1 <<  9) // (EMAC) 
-#define AT91C_EMAC_ROVR       ((unsigned int) 0x1 << 10) // (EMAC) 
-#define AT91C_EMAC_HRESP      ((unsigned int) 0x1 << 11) // (EMAC) 
-// -------- EMAC_IER : (EMAC Offset: 0x28) Interrupt Enable Register -------- 
-// -------- EMAC_IDR : (EMAC Offset: 0x2c) Interrupt Disable Register -------- 
-// -------- EMAC_IMR : (EMAC Offset: 0x30) Interrupt Mask Register -------- 
-// -------- EMAC_MAN : (EMAC Offset: 0x34) PHY Maintenance Register -------- 
-#define AT91C_EMAC_DATA       ((unsigned int) 0xFFFF <<  0) // (EMAC) 
-#define AT91C_EMAC_CODE       ((unsigned int) 0x3 << 16) // (EMAC) 
-#define AT91C_EMAC_REGA       ((unsigned int) 0x1F << 18) // (EMAC) 
-#define AT91C_EMAC_PHYA       ((unsigned int) 0x1F << 23) // (EMAC) 
-#define AT91C_EMAC_RW         ((unsigned int) 0x3 << 28) // (EMAC) 
-#define AT91C_EMAC_HIGH       ((unsigned int) 0x1 << 30) // (EMAC) 
-#define AT91C_EMAC_LOW        ((unsigned int) 0x1 << 31) // (EMAC) 
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR External Bus Interface
-// *****************************************************************************
-typedef struct _AT91S_EBI {
-	AT91_REG	 EBI_CSA; 	// Chip Select Assignment Register
-	AT91_REG	 EBI_CFGR; 	// Configuration Register
-} AT91S_EBI, *AT91PS_EBI;
-
-// -------- EBI_CSA : (EBI Offset: 0x0) Chip Select Assignment Register -------- 
-#define AT91C_EBI_CS0A        ((unsigned int) 0x1 <<  0) // (EBI) Chip Select 0 Assignment
-#define 	AT91C_EBI_CS0A_SMC                  ((unsigned int) 0x0) // (EBI) Chip Select 0 is assigned to the Static Memory Controller.
-#define 	AT91C_EBI_CS0A_BFC                  ((unsigned int) 0x1) // (EBI) Chip Select 0 is assigned to the Burst Flash Controller.
-#define AT91C_EBI_CS1A        ((unsigned int) 0x1 <<  1) // (EBI) Chip Select 1 Assignment
-#define 	AT91C_EBI_CS1A_SMC                  ((unsigned int) 0x0 <<  1) // (EBI) Chip Select 1 is assigned to the Static Memory Controller.
-#define 	AT91C_EBI_CS1A_SDRAMC               ((unsigned int) 0x1 <<  1) // (EBI) Chip Select 1 is assigned to the SDRAM Controller.
-#define AT91C_EBI_CS3A        ((unsigned int) 0x1 <<  3) // (EBI) Chip Select 3 Assignment
-#define 	AT91C_EBI_CS3A_SMC                  ((unsigned int) 0x0 <<  3) // (EBI) Chip Select 3 is only assigned to the Static Memory Controller and NCS3 behaves as defined by the SMC2.
-#define 	AT91C_EBI_CS3A_SMC_SmartMedia       ((unsigned int) 0x1 <<  3) // (EBI) Chip Select 3 is assigned to the Static Memory Controller and the SmartMedia Logic is activated.
-#define AT91C_EBI_CS4A        ((unsigned int) 0x1 <<  4) // (EBI) Chip Select 4 Assignment
-#define 	AT91C_EBI_CS4A_SMC                  ((unsigned int) 0x0 <<  4) // (EBI) Chip Select 4 is assigned to the Static Memory Controller and NCS4,NCS5 and NCS6 behave as defined by the SMC2.
-#define 	AT91C_EBI_CS4A_SMC_CompactFlash     ((unsigned int) 0x1 <<  4) // (EBI) Chip Select 4 is assigned to the Static Memory Controller and the CompactFlash Logic is activated.
-// -------- EBI_CFGR : (EBI Offset: 0x4) Configuration Register -------- 
-#define AT91C_EBI_DBPUC       ((unsigned int) 0x1 <<  0) // (EBI) Data Bus Pull-Up Configuration
-#define AT91C_EBI_EBSEN       ((unsigned int) 0x1 <<  1) // (EBI) Bus Sharing Enable
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR Static Memory Controller 2 Interface
-// *****************************************************************************
-typedef struct _AT91S_SMC2 {
-	AT91_REG	 SMC2_CSR[8]; 	// SMC2 Chip Select Register
-} AT91S_SMC2, *AT91PS_SMC2;
-
-// -------- SMC2_CSR : (SMC2 Offset: 0x0) SMC2 Chip Select Register -------- 
-#define AT91C_SMC2_NWS        ((unsigned int) 0x7F <<  0) // (SMC2) Number of Wait States
-#define AT91C_SMC2_WSEN       ((unsigned int) 0x1 <<  7) // (SMC2) Wait State Enable
-#define AT91C_SMC2_TDF        ((unsigned int) 0xF <<  8) // (SMC2) Data Float Time
-#define AT91C_SMC2_BAT        ((unsigned int) 0x1 << 12) // (SMC2) Byte Access Type
-#define AT91C_SMC2_DBW        ((unsigned int) 0x1 << 13) // (SMC2) Data Bus Width
-#define 	AT91C_SMC2_DBW_16                   ((unsigned int) 0x1 << 13) // (SMC2) 16-bit.
-#define 	AT91C_SMC2_DBW_8                    ((unsigned int) 0x2 << 13) // (SMC2) 8-bit.
-#define AT91C_SMC2_DRP        ((unsigned int) 0x1 << 15) // (SMC2) Data Read Protocol
-#define AT91C_SMC2_ACSS       ((unsigned int) 0x3 << 16) // (SMC2) Address to Chip Select Setup
-#define 	AT91C_SMC2_ACSS_STANDARD             ((unsigned int) 0x0 << 16) // (SMC2) Standard, asserted at the beginning of the access and deasserted at the end.
-#define 	AT91C_SMC2_ACSS_1_CYCLE              ((unsigned int) 0x1 << 16) // (SMC2) One cycle less at the beginning and the end of the access.
-#define 	AT91C_SMC2_ACSS_2_CYCLES             ((unsigned int) 0x2 << 16) // (SMC2) Two cycles less at the beginning and the end of the access.
-#define 	AT91C_SMC2_ACSS_3_CYCLES             ((unsigned int) 0x3 << 16) // (SMC2) Three cycles less at the beginning and the end of the access.
-#define AT91C_SMC2_RWSETUP    ((unsigned int) 0x7 << 24) // (SMC2) Read and Write Signal Setup Time
-#define AT91C_SMC2_RWHOLD     ((unsigned int) 0x7 << 29) // (SMC2) Read and Write Signal Hold Time
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR SDRAM Controller Interface
-// *****************************************************************************
-typedef struct _AT91S_SDRC {
-	AT91_REG	 SDRC_MR; 	// SDRAM Controller Mode Register
-	AT91_REG	 SDRC_TR; 	// SDRAM Controller Refresh Timer Register
-	AT91_REG	 SDRC_CR; 	// SDRAM Controller Configuration Register
-	AT91_REG	 SDRC_SRR; 	// SDRAM Controller Self Refresh Register
-	AT91_REG	 SDRC_LPR; 	// SDRAM Controller Low Power Register
-	AT91_REG	 SDRC_IER; 	// SDRAM Controller Interrupt Enable Register
-	AT91_REG	 SDRC_IDR; 	// SDRAM Controller Interrupt Disable Register
-	AT91_REG	 SDRC_IMR; 	// SDRAM Controller Interrupt Mask Register
-	AT91_REG	 SDRC_ISR; 	// SDRAM Controller Interrupt Mask Register
-} AT91S_SDRC, *AT91PS_SDRC;
-
-// -------- SDRC_MR : (SDRC Offset: 0x0) SDRAM Controller Mode Register -------- 
-#define AT91C_SDRC_MODE       ((unsigned int) 0xF <<  0) // (SDRC) Mode
-#define 	AT91C_SDRC_MODE_NORMAL_CMD           ((unsigned int) 0x0) // (SDRC) Normal Mode
-#define 	AT91C_SDRC_MODE_NOP_CMD              ((unsigned int) 0x1) // (SDRC) NOP Command
-#define 	AT91C_SDRC_MODE_PRCGALL_CMD          ((unsigned int) 0x2) // (SDRC) All Banks Precharge Command
-#define 	AT91C_SDRC_MODE_LMR_CMD              ((unsigned int) 0x3) // (SDRC) Load Mode Register Command
-#define 	AT91C_SDRC_MODE_RFSH_CMD             ((unsigned int) 0x4) // (SDRC) Refresh Command
-#define AT91C_SDRC_DBW        ((unsigned int) 0x1 <<  4) // (SDRC) Data Bus Width
-#define 	AT91C_SDRC_DBW_32_BITS              ((unsigned int) 0x0 <<  4) // (SDRC) 32 Bits datas bus
-#define 	AT91C_SDRC_DBW_16_BITS              ((unsigned int) 0x1 <<  4) // (SDRC) 16 Bits datas bus
-// -------- SDRC_TR : (SDRC Offset: 0x4) SDRC Refresh Timer Register -------- 
-#define AT91C_SDRC_COUNT      ((unsigned int) 0xFFF <<  0) // (SDRC) Refresh Counter
-// -------- SDRC_CR : (SDRC Offset: 0x8) SDRAM Configuration Register -------- 
-#define AT91C_SDRC_NC         ((unsigned int) 0x3 <<  0) // (SDRC) Number of Column Bits
-#define 	AT91C_SDRC_NC_8                    ((unsigned int) 0x0) // (SDRC) 8 Bits
-#define 	AT91C_SDRC_NC_9                    ((unsigned int) 0x1) // (SDRC) 9 Bits
-#define 	AT91C_SDRC_NC_10                   ((unsigned int) 0x2) // (SDRC) 10 Bits
-#define 	AT91C_SDRC_NC_11                   ((unsigned int) 0x3) // (SDRC) 11 Bits
-#define AT91C_SDRC_NR         ((unsigned int) 0x3 <<  2) // (SDRC) Number of Row Bits
-#define 	AT91C_SDRC_NR_11                   ((unsigned int) 0x0 <<  2) // (SDRC) 11 Bits
-#define 	AT91C_SDRC_NR_12                   ((unsigned int) 0x1 <<  2) // (SDRC) 12 Bits
-#define 	AT91C_SDRC_NR_13                   ((unsigned int) 0x2 <<  2) // (SDRC) 13 Bits
-#define AT91C_SDRC_NB         ((unsigned int) 0x1 <<  4) // (SDRC) Number of Banks
-#define 	AT91C_SDRC_NB_2_BANKS              ((unsigned int) 0x0 <<  4) // (SDRC) 2 banks
-#define 	AT91C_SDRC_NB_4_BANKS              ((unsigned int) 0x1 <<  4) // (SDRC) 4 banks
-#define AT91C_SDRC_CAS        ((unsigned int) 0x3 <<  5) // (SDRC) CAS Latency
-#define 	AT91C_SDRC_CAS_2                    ((unsigned int) 0x2 <<  5) // (SDRC) 2 cycles
-#define AT91C_SDRC_TWR        ((unsigned int) 0xF <<  7) // (SDRC) Number of Write Recovery Time Cycles
-#define AT91C_SDRC_TRC        ((unsigned int) 0xF << 11) // (SDRC) Number of RAS Cycle Time Cycles
-#define AT91C_SDRC_TRP        ((unsigned int) 0xF << 15) // (SDRC) Number of RAS Precharge Time Cycles
-#define AT91C_SDRC_TRCD       ((unsigned int) 0xF << 19) // (SDRC) Number of RAS to CAS Delay Cycles
-#define AT91C_SDRC_TRAS       ((unsigned int) 0xF << 23) // (SDRC) Number of RAS Active Time Cycles
-#define AT91C_SDRC_TXSR       ((unsigned int) 0xF << 27) // (SDRC) Number of Command Recovery Time Cycles
-// -------- SDRC_SRR : (SDRC Offset: 0xc) SDRAM Controller Self-refresh Register -------- 
-#define AT91C_SDRC_SRCB       ((unsigned int) 0x1 <<  0) // (SDRC) Self-refresh Command Bit
-// -------- SDRC_LPR : (SDRC Offset: 0x10) SDRAM Controller Low-power Register -------- 
-#define AT91C_SDRC_LPCB       ((unsigned int) 0x1 <<  0) // (SDRC) Low-power Command Bit
-// -------- SDRC_IER : (SDRC Offset: 0x14) SDRAM Controller Interrupt Enable Register -------- 
-#define AT91C_SDRC_RES        ((unsigned int) 0x1 <<  0) // (SDRC) Refresh Error Status
-// -------- SDRC_IDR : (SDRC Offset: 0x18) SDRAM Controller Interrupt Disable Register -------- 
-// -------- SDRC_IMR : (SDRC Offset: 0x1c) SDRAM Controller Interrupt Mask Register -------- 
-// -------- SDRC_ISR : (SDRC Offset: 0x20) SDRAM Controller Interrupt Status Register -------- 
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR Burst Flash Controller Interface
-// *****************************************************************************
-typedef struct _AT91S_BFC {
-	AT91_REG	 BFC_MR; 	// BFC Mode Register
-} AT91S_BFC, *AT91PS_BFC;
-
-// -------- BFC_MR : (BFC Offset: 0x0) BFC Mode Register -------- 
-#define AT91C_BFC_BFCOM       ((unsigned int) 0x3 <<  0) // (BFC) Burst Flash Controller Operating Mode
-#define 	AT91C_BFC_BFCOM_DISABLED             ((unsigned int) 0x0) // (BFC) NPCS0 is driven by the SMC or remains high.
-#define 	AT91C_BFC_BFCOM_ASYNC                ((unsigned int) 0x1) // (BFC) Asynchronous
-#define 	AT91C_BFC_BFCOM_BURST_READ           ((unsigned int) 0x2) // (BFC) Burst Read
-#define AT91C_BFC_BFCC        ((unsigned int) 0x3 <<  2) // (BFC) Burst Flash Controller Operating Mode
-#define 	AT91C_BFC_BFCC_MCK                  ((unsigned int) 0x1 <<  2) // (BFC) Master Clock.
-#define 	AT91C_BFC_BFCC_MCK_DIV_2            ((unsigned int) 0x2 <<  2) // (BFC) Master Clock divided by 2.
-#define 	AT91C_BFC_BFCC_MCK_DIV_4            ((unsigned int) 0x3 <<  2) // (BFC) Master Clock divided by 4.
-#define AT91C_BFC_AVL         ((unsigned int) 0xF <<  4) // (BFC) Address Valid Latency
-#define AT91C_BFC_PAGES       ((unsigned int) 0x7 <<  8) // (BFC) Page Size
-#define 	AT91C_BFC_PAGES_NO_PAGE              ((unsigned int) 0x0 <<  8) // (BFC) No page handling.
-#define 	AT91C_BFC_PAGES_16                   ((unsigned int) 0x1 <<  8) // (BFC) 16 bytes page size.
-#define 	AT91C_BFC_PAGES_32                   ((unsigned int) 0x2 <<  8) // (BFC) 32 bytes page size.
-#define 	AT91C_BFC_PAGES_64                   ((unsigned int) 0x3 <<  8) // (BFC) 64 bytes page size.
-#define 	AT91C_BFC_PAGES_128                  ((unsigned int) 0x4 <<  8) // (BFC) 128 bytes page size.
-#define 	AT91C_BFC_PAGES_256                  ((unsigned int) 0x5 <<  8) // (BFC) 256 bytes page size.
-#define 	AT91C_BFC_PAGES_512                  ((unsigned int) 0x6 <<  8) // (BFC) 512 bytes page size.
-#define 	AT91C_BFC_PAGES_1024                 ((unsigned int) 0x7 <<  8) // (BFC) 1024 bytes page size.
-#define AT91C_BFC_OEL         ((unsigned int) 0x3 << 12) // (BFC) Output Enable Latency
-#define AT91C_BFC_BAAEN       ((unsigned int) 0x1 << 16) // (BFC) Burst Address Advance Enable
-#define AT91C_BFC_BFOEH       ((unsigned int) 0x1 << 17) // (BFC) Burst Flash Output Enable Handling
-#define AT91C_BFC_MUXEN       ((unsigned int) 0x1 << 18) // (BFC) Multiplexed Bus Enable
-#define AT91C_BFC_RDYEN       ((unsigned int) 0x1 << 19) // (BFC) Ready Enable Mode
-
-// *****************************************************************************
-//               REGISTER ADDRESS DEFINITION FOR AT91RM9200
-// *****************************************************************************
-// ========== Register definition for SYS peripheral ========== 
-// ========== Register definition for MC peripheral ========== 
-#define AT91C_MC_PUER   ((AT91_REG *) 	0xFFFFFF54) // (MC) MC Protection Unit Enable Register
-#define AT91C_MC_ASR    ((AT91_REG *) 	0xFFFFFF04) // (MC) MC Abort Status Register
-#define AT91C_MC_PUP    ((AT91_REG *) 	0xFFFFFF50) // (MC) MC Protection Unit Peripherals
-#define AT91C_MC_PUIA   ((AT91_REG *) 	0xFFFFFF10) // (MC) MC Protection Unit Area
-#define AT91C_MC_AASR   ((AT91_REG *) 	0xFFFFFF08) // (MC) MC Abort Address Status Register
-#define AT91C_MC_RCR    ((AT91_REG *) 	0xFFFFFF00) // (MC) MC Remap Control Register
-// ========== Register definition for RTC peripheral ========== 
-#define AT91C_RTC_IMR   ((AT91_REG *) 	0xFFFFFE28) // (RTC) Interrupt Mask Register
-#define AT91C_RTC_IER   ((AT91_REG *) 	0xFFFFFE20) // (RTC) Interrupt Enable Register
-#define AT91C_RTC_SR    ((AT91_REG *) 	0xFFFFFE18) // (RTC) Status Register
-#define AT91C_RTC_TIMALR ((AT91_REG *) 	0xFFFFFE10) // (RTC) Time Alarm Register
-#define AT91C_RTC_TIMR  ((AT91_REG *) 	0xFFFFFE08) // (RTC) Time Register
-#define AT91C_RTC_CR    ((AT91_REG *) 	0xFFFFFE00) // (RTC) Control Register
-#define AT91C_RTC_VER   ((AT91_REG *) 	0xFFFFFE2C) // (RTC) Valid Entry Register
-#define AT91C_RTC_IDR   ((AT91_REG *) 	0xFFFFFE24) // (RTC) Interrupt Disable Register
-#define AT91C_RTC_SCCR  ((AT91_REG *) 	0xFFFFFE1C) // (RTC) Status Clear Command Register
-#define AT91C_RTC_CALALR ((AT91_REG *) 	0xFFFFFE14) // (RTC) Calendar Alarm Register
-#define AT91C_RTC_CALR  ((AT91_REG *) 	0xFFFFFE0C) // (RTC) Calendar Register
-#define AT91C_RTC_MR    ((AT91_REG *) 	0xFFFFFE04) // (RTC) Mode Register
-// ========== Register definition for ST peripheral ========== 
-#define AT91C_ST_CRTR   ((AT91_REG *) 	0xFFFFFD24) // (ST) Current Real-time Register
-#define AT91C_ST_IMR    ((AT91_REG *) 	0xFFFFFD1C) // (ST) Interrupt Mask Register
-#define AT91C_ST_IER    ((AT91_REG *) 	0xFFFFFD14) // (ST) Interrupt Enable Register
-#define AT91C_ST_RTMR   ((AT91_REG *) 	0xFFFFFD0C) // (ST) Real-time Mode Register
-#define AT91C_ST_PIMR   ((AT91_REG *) 	0xFFFFFD04) // (ST) Period Interval Mode Register
-#define AT91C_ST_RTAR   ((AT91_REG *) 	0xFFFFFD20) // (ST) Real-time Alarm Register
-#define AT91C_ST_IDR    ((AT91_REG *) 	0xFFFFFD18) // (ST) Interrupt Disable Register
-#define AT91C_ST_SR     ((AT91_REG *) 	0xFFFFFD10) // (ST) Status Register
-#define AT91C_ST_WDMR   ((AT91_REG *) 	0xFFFFFD08) // (ST) Watchdog Mode Register
-#define AT91C_ST_CR     ((AT91_REG *) 	0xFFFFFD00) // (ST) Control Register
-// ========== Register definition for PMC peripheral ========== 
-#define AT91C_PMC_SCSR  ((AT91_REG *) 	0xFFFFFC08) // (PMC) System Clock Status Register
-#define AT91C_PMC_SCER  ((AT91_REG *) 	0xFFFFFC00) // (PMC) System Clock Enable Register
-#define AT91C_PMC_IMR   ((AT91_REG *) 	0xFFFFFC6C) // (PMC) Interrupt Mask Register
-#define AT91C_PMC_IDR   ((AT91_REG *) 	0xFFFFFC64) // (PMC) Interrupt Disable Register
-#define AT91C_PMC_PCDR  ((AT91_REG *) 	0xFFFFFC14) // (PMC) Peripheral Clock Disable Register
-#define AT91C_PMC_SCDR  ((AT91_REG *) 	0xFFFFFC04) // (PMC) System Clock Disable Register
-#define AT91C_PMC_SR    ((AT91_REG *) 	0xFFFFFC68) // (PMC) Status Register
-#define AT91C_PMC_IER   ((AT91_REG *) 	0xFFFFFC60) // (PMC) Interrupt Enable Register
-#define AT91C_PMC_MCKR  ((AT91_REG *) 	0xFFFFFC30) // (PMC) Master Clock Register
-#define AT91C_PMC_PCER  ((AT91_REG *) 	0xFFFFFC10) // (PMC) Peripheral Clock Enable Register
-#define AT91C_PMC_PCSR  ((AT91_REG *) 	0xFFFFFC18) // (PMC) Peripheral Clock Status Register
-#define AT91C_PMC_PCKR  ((AT91_REG *) 	0xFFFFFC40) // (PMC) Programmable Clock Register
-// ========== Register definition for CKGR peripheral ========== 
-#define AT91C_CKGR_PLLBR ((AT91_REG *) 	0xFFFFFC2C) // (CKGR) PLL B Register
-#define AT91C_CKGR_MCFR ((AT91_REG *) 	0xFFFFFC24) // (CKGR) Main Clock  Frequency Register
-#define AT91C_CKGR_PLLAR ((AT91_REG *) 	0xFFFFFC28) // (CKGR) PLL A Register
-#define AT91C_CKGR_MOR  ((AT91_REG *) 	0xFFFFFC20) // (CKGR) Main Oscillator Register
-// ========== Register definition for PIOD peripheral ========== 
-#define AT91C_PIOD_PDSR ((AT91_REG *) 	0xFFFFFA3C) // (PIOD) Pin Data Status Register
-#define AT91C_PIOD_CODR ((AT91_REG *) 	0xFFFFFA34) // (PIOD) Clear Output Data Register
-#define AT91C_PIOD_OWER ((AT91_REG *) 	0xFFFFFAA0) // (PIOD) Output Write Enable Register
-#define AT91C_PIOD_MDER ((AT91_REG *) 	0xFFFFFA50) // (PIOD) Multi-driver Enable Register
-#define AT91C_PIOD_IMR  ((AT91_REG *) 	0xFFFFFA48) // (PIOD) Interrupt Mask Register
-#define AT91C_PIOD_IER  ((AT91_REG *) 	0xFFFFFA40) // (PIOD) Interrupt Enable Register
-#define AT91C_PIOD_ODSR ((AT91_REG *) 	0xFFFFFA38) // (PIOD) Output Data Status Register
-#define AT91C_PIOD_SODR ((AT91_REG *) 	0xFFFFFA30) // (PIOD) Set Output Data Register
-#define AT91C_PIOD_PER  ((AT91_REG *) 	0xFFFFFA00) // (PIOD) PIO Enable Register
-#define AT91C_PIOD_OWDR ((AT91_REG *) 	0xFFFFFAA4) // (PIOD) Output Write Disable Register
-#define AT91C_PIOD_PPUER ((AT91_REG *) 	0xFFFFFA64) // (PIOD) Pull-up Enable Register
-#define AT91C_PIOD_MDDR ((AT91_REG *) 	0xFFFFFA54) // (PIOD) Multi-driver Disable Register
-#define AT91C_PIOD_ISR  ((AT91_REG *) 	0xFFFFFA4C) // (PIOD) Interrupt Status Register
-#define AT91C_PIOD_IDR  ((AT91_REG *) 	0xFFFFFA44) // (PIOD) Interrupt Disable Register
-#define AT91C_PIOD_PDR  ((AT91_REG *) 	0xFFFFFA04) // (PIOD) PIO Disable Register
-#define AT91C_PIOD_ODR  ((AT91_REG *) 	0xFFFFFA14) // (PIOD) Output Disable Registerr
-#define AT91C_PIOD_OWSR ((AT91_REG *) 	0xFFFFFAA8) // (PIOD) Output Write Status Register
-#define AT91C_PIOD_ABSR ((AT91_REG *) 	0xFFFFFA78) // (PIOD) AB Select Status Register
-#define AT91C_PIOD_ASR  ((AT91_REG *) 	0xFFFFFA70) // (PIOD) Select A Register
-#define AT91C_PIOD_PPUSR ((AT91_REG *) 	0xFFFFFA68) // (PIOD) Pad Pull-up Status Register
-#define AT91C_PIOD_PPUDR ((AT91_REG *) 	0xFFFFFA60) // (PIOD) Pull-up Disable Register
-#define AT91C_PIOD_MDSR ((AT91_REG *) 	0xFFFFFA58) // (PIOD) Multi-driver Status Register
-#define AT91C_PIOD_PSR  ((AT91_REG *) 	0xFFFFFA08) // (PIOD) PIO Status Register
-#define AT91C_PIOD_OER  ((AT91_REG *) 	0xFFFFFA10) // (PIOD) Output Enable Register
-#define AT91C_PIOD_OSR  ((AT91_REG *) 	0xFFFFFA18) // (PIOD) Output Status Register
-#define AT91C_PIOD_IFER ((AT91_REG *) 	0xFFFFFA20) // (PIOD) Input Filter Enable Register
-#define AT91C_PIOD_BSR  ((AT91_REG *) 	0xFFFFFA74) // (PIOD) Select B Register
-#define AT91C_PIOD_IFDR ((AT91_REG *) 	0xFFFFFA24) // (PIOD) Input Filter Disable Register
-#define AT91C_PIOD_IFSR ((AT91_REG *) 	0xFFFFFA28) // (PIOD) Input Filter Status Register
-// ========== Register definition for PIOC peripheral ========== 
-#define AT91C_PIOC_IFDR ((AT91_REG *) 	0xFFFFF824) // (PIOC) Input Filter Disable Register
-#define AT91C_PIOC_ODR  ((AT91_REG *) 	0xFFFFF814) // (PIOC) Output Disable Registerr
-#define AT91C_PIOC_ABSR ((AT91_REG *) 	0xFFFFF878) // (PIOC) AB Select Status Register
-#define AT91C_PIOC_SODR ((AT91_REG *) 	0xFFFFF830) // (PIOC) Set Output Data Register
-#define AT91C_PIOC_IFSR ((AT91_REG *) 	0xFFFFF828) // (PIOC) Input Filter Status Register
-#define AT91C_PIOC_CODR ((AT91_REG *) 	0xFFFFF834) // (PIOC) Clear Output Data Register
-#define AT91C_PIOC_ODSR ((AT91_REG *) 	0xFFFFF838) // (PIOC) Output Data Status Register
-#define AT91C_PIOC_IER  ((AT91_REG *) 	0xFFFFF840) // (PIOC) Interrupt Enable Register
-#define AT91C_PIOC_IMR  ((AT91_REG *) 	0xFFFFF848) // (PIOC) Interrupt Mask Register
-#define AT91C_PIOC_OWDR ((AT91_REG *) 	0xFFFFF8A4) // (PIOC) Output Write Disable Register
-#define AT91C_PIOC_MDDR ((AT91_REG *) 	0xFFFFF854) // (PIOC) Multi-driver Disable Register
-#define AT91C_PIOC_PDSR ((AT91_REG *) 	0xFFFFF83C) // (PIOC) Pin Data Status Register
-#define AT91C_PIOC_IDR  ((AT91_REG *) 	0xFFFFF844) // (PIOC) Interrupt Disable Register
-#define AT91C_PIOC_ISR  ((AT91_REG *) 	0xFFFFF84C) // (PIOC) Interrupt Status Register
-#define AT91C_PIOC_PDR  ((AT91_REG *) 	0xFFFFF804) // (PIOC) PIO Disable Register
-#define AT91C_PIOC_OWSR ((AT91_REG *) 	0xFFFFF8A8) // (PIOC) Output Write Status Register
-#define AT91C_PIOC_OWER ((AT91_REG *) 	0xFFFFF8A0) // (PIOC) Output Write Enable Register
-#define AT91C_PIOC_ASR  ((AT91_REG *) 	0xFFFFF870) // (PIOC) Select A Register
-#define AT91C_PIOC_PPUSR ((AT91_REG *) 	0xFFFFF868) // (PIOC) Pad Pull-up Status Register
-#define AT91C_PIOC_PPUDR ((AT91_REG *) 	0xFFFFF860) // (PIOC) Pull-up Disable Register
-#define AT91C_PIOC_MDSR ((AT91_REG *) 	0xFFFFF858) // (PIOC) Multi-driver Status Register
-#define AT91C_PIOC_MDER ((AT91_REG *) 	0xFFFFF850) // (PIOC) Multi-driver Enable Register
-#define AT91C_PIOC_IFER ((AT91_REG *) 	0xFFFFF820) // (PIOC) Input Filter Enable Register
-#define AT91C_PIOC_OSR  ((AT91_REG *) 	0xFFFFF818) // (PIOC) Output Status Register
-#define AT91C_PIOC_OER  ((AT91_REG *) 	0xFFFFF810) // (PIOC) Output Enable Register
-#define AT91C_PIOC_PSR  ((AT91_REG *) 	0xFFFFF808) // (PIOC) PIO Status Register
-#define AT91C_PIOC_PER  ((AT91_REG *) 	0xFFFFF800) // (PIOC) PIO Enable Register
-#define AT91C_PIOC_BSR  ((AT91_REG *) 	0xFFFFF874) // (PIOC) Select B Register
-#define AT91C_PIOC_PPUER ((AT91_REG *) 	0xFFFFF864) // (PIOC) Pull-up Enable Register
-// ========== Register definition for PIOB peripheral ========== 
-#define AT91C_PIOB_OWSR ((AT91_REG *) 	0xFFFFF6A8) // (PIOB) Output Write Status Register
-#define AT91C_PIOB_PPUSR ((AT91_REG *) 	0xFFFFF668) // (PIOB) Pad Pull-up Status Register
-#define AT91C_PIOB_PPUDR ((AT91_REG *) 	0xFFFFF660) // (PIOB) Pull-up Disable Register
-#define AT91C_PIOB_MDSR ((AT91_REG *) 	0xFFFFF658) // (PIOB) Multi-driver Status Register
-#define AT91C_PIOB_MDER ((AT91_REG *) 	0xFFFFF650) // (PIOB) Multi-driver Enable Register
-#define AT91C_PIOB_IMR  ((AT91_REG *) 	0xFFFFF648) // (PIOB) Interrupt Mask Register
-#define AT91C_PIOB_OSR  ((AT91_REG *) 	0xFFFFF618) // (PIOB) Output Status Register
-#define AT91C_PIOB_OER  ((AT91_REG *) 	0xFFFFF610) // (PIOB) Output Enable Register
-#define AT91C_PIOB_PSR  ((AT91_REG *) 	0xFFFFF608) // (PIOB) PIO Status Register
-#define AT91C_PIOB_PER  ((AT91_REG *) 	0xFFFFF600) // (PIOB) PIO Enable Register
-#define AT91C_PIOB_BSR  ((AT91_REG *) 	0xFFFFF674) // (PIOB) Select B Register
-#define AT91C_PIOB_PPUER ((AT91_REG *) 	0xFFFFF664) // (PIOB) Pull-up Enable Register
-#define AT91C_PIOB_IFDR ((AT91_REG *) 	0xFFFFF624) // (PIOB) Input Filter Disable Register
-#define AT91C_PIOB_ODR  ((AT91_REG *) 	0xFFFFF614) // (PIOB) Output Disable Registerr
-#define AT91C_PIOB_ABSR ((AT91_REG *) 	0xFFFFF678) // (PIOB) AB Select Status Register
-#define AT91C_PIOB_ASR  ((AT91_REG *) 	0xFFFFF670) // (PIOB) Select A Register
-#define AT91C_PIOB_IFER ((AT91_REG *) 	0xFFFFF620) // (PIOB) Input Filter Enable Register
-#define AT91C_PIOB_IFSR ((AT91_REG *) 	0xFFFFF628) // (PIOB) Input Filter Status Register
-#define AT91C_PIOB_SODR ((AT91_REG *) 	0xFFFFF630) // (PIOB) Set Output Data Register
-#define AT91C_PIOB_ODSR ((AT91_REG *) 	0xFFFFF638) // (PIOB) Output Data Status Register
-#define AT91C_PIOB_CODR ((AT91_REG *) 	0xFFFFF634) // (PIOB) Clear Output Data Register
-#define AT91C_PIOB_PDSR ((AT91_REG *) 	0xFFFFF63C) // (PIOB) Pin Data Status Register
-#define AT91C_PIOB_OWER ((AT91_REG *) 	0xFFFFF6A0) // (PIOB) Output Write Enable Register
-#define AT91C_PIOB_IER  ((AT91_REG *) 	0xFFFFF640) // (PIOB) Interrupt Enable Register
-#define AT91C_PIOB_OWDR ((AT91_REG *) 	0xFFFFF6A4) // (PIOB) Output Write Disable Register
-#define AT91C_PIOB_MDDR ((AT91_REG *) 	0xFFFFF654) // (PIOB) Multi-driver Disable Register
-#define AT91C_PIOB_ISR  ((AT91_REG *) 	0xFFFFF64C) // (PIOB) Interrupt Status Register
-#define AT91C_PIOB_IDR  ((AT91_REG *) 	0xFFFFF644) // (PIOB) Interrupt Disable Register
-#define AT91C_PIOB_PDR  ((AT91_REG *) 	0xFFFFF604) // (PIOB) PIO Disable Register
-// ========== Register definition for PIOA peripheral ========== 
-#define AT91C_PIOA_IMR  ((AT91_REG *) 	0xFFFFF448) // (PIOA) Interrupt Mask Register
-#define AT91C_PIOA_IER  ((AT91_REG *) 	0xFFFFF440) // (PIOA) Interrupt Enable Register
-#define AT91C_PIOA_OWDR ((AT91_REG *) 	0xFFFFF4A4) // (PIOA) Output Write Disable Register
-#define AT91C_PIOA_ISR  ((AT91_REG *) 	0xFFFFF44C) // (PIOA) Interrupt Status Register
-#define AT91C_PIOA_PPUDR ((AT91_REG *) 	0xFFFFF460) // (PIOA) Pull-up Disable Register
-#define AT91C_PIOA_MDSR ((AT91_REG *) 	0xFFFFF458) // (PIOA) Multi-driver Status Register
-#define AT91C_PIOA_MDER ((AT91_REG *) 	0xFFFFF450) // (PIOA) Multi-driver Enable Register
-#define AT91C_PIOA_PER  ((AT91_REG *) 	0xFFFFF400) // (PIOA) PIO Enable Register
-#define AT91C_PIOA_PSR  ((AT91_REG *) 	0xFFFFF408) // (PIOA) PIO Status Register
-#define AT91C_PIOA_OER  ((AT91_REG *) 	0xFFFFF410) // (PIOA) Output Enable Register
-#define AT91C_PIOA_BSR  ((AT91_REG *) 	0xFFFFF474) // (PIOA) Select B Register
-#define AT91C_PIOA_PPUER ((AT91_REG *) 	0xFFFFF464) // (PIOA) Pull-up Enable Register
-#define AT91C_PIOA_MDDR ((AT91_REG *) 	0xFFFFF454) // (PIOA) Multi-driver Disable Register
-#define AT91C_PIOA_PDR  ((AT91_REG *) 	0xFFFFF404) // (PIOA) PIO Disable Register
-#define AT91C_PIOA_ODR  ((AT91_REG *) 	0xFFFFF414) // (PIOA) Output Disable Registerr
-#define AT91C_PIOA_IFDR ((AT91_REG *) 	0xFFFFF424) // (PIOA) Input Filter Disable Register
-#define AT91C_PIOA_ABSR ((AT91_REG *) 	0xFFFFF478) // (PIOA) AB Select Status Register
-#define AT91C_PIOA_ASR  ((AT91_REG *) 	0xFFFFF470) // (PIOA) Select A Register
-#define AT91C_PIOA_PPUSR ((AT91_REG *) 	0xFFFFF468) // (PIOA) Pad Pull-up Status Register
-#define AT91C_PIOA_ODSR ((AT91_REG *) 	0xFFFFF438) // (PIOA) Output Data Status Register
-#define AT91C_PIOA_SODR ((AT91_REG *) 	0xFFFFF430) // (PIOA) Set Output Data Register
-#define AT91C_PIOA_IFSR ((AT91_REG *) 	0xFFFFF428) // (PIOA) Input Filter Status Register
-#define AT91C_PIOA_IFER ((AT91_REG *) 	0xFFFFF420) // (PIOA) Input Filter Enable Register
-#define AT91C_PIOA_OSR  ((AT91_REG *) 	0xFFFFF418) // (PIOA) Output Status Register
-#define AT91C_PIOA_IDR  ((AT91_REG *) 	0xFFFFF444) // (PIOA) Interrupt Disable Register
-#define AT91C_PIOA_PDSR ((AT91_REG *) 	0xFFFFF43C) // (PIOA) Pin Data Status Register
-#define AT91C_PIOA_CODR ((AT91_REG *) 	0xFFFFF434) // (PIOA) Clear Output Data Register
-#define AT91C_PIOA_OWSR ((AT91_REG *) 	0xFFFFF4A8) // (PIOA) Output Write Status Register
-#define AT91C_PIOA_OWER ((AT91_REG *) 	0xFFFFF4A0) // (PIOA) Output Write Enable Register
-// ========== Register definition for DBGU peripheral ========== 
-#define AT91C_DBGU_C2R  ((AT91_REG *) 	0xFFFFF244) // (DBGU) Chip ID2 Register
-#define AT91C_DBGU_THR  ((AT91_REG *) 	0xFFFFF21C) // (DBGU) Transmitter Holding Register
-#define AT91C_DBGU_CSR  ((AT91_REG *) 	0xFFFFF214) // (DBGU) Channel Status Register
-#define AT91C_DBGU_IDR  ((AT91_REG *) 	0xFFFFF20C) // (DBGU) Interrupt Disable Register
-#define AT91C_DBGU_MR   ((AT91_REG *) 	0xFFFFF204) // (DBGU) Mode Register
-#define AT91C_DBGU_FNTR ((AT91_REG *) 	0xFFFFF248) // (DBGU) Force NTRST Register
-#define AT91C_DBGU_C1R  ((AT91_REG *) 	0xFFFFF240) // (DBGU) Chip ID1 Register
-#define AT91C_DBGU_BRGR ((AT91_REG *) 	0xFFFFF220) // (DBGU) Baud Rate Generator Register
-#define AT91C_DBGU_RHR  ((AT91_REG *) 	0xFFFFF218) // (DBGU) Receiver Holding Register
-#define AT91C_DBGU_IMR  ((AT91_REG *) 	0xFFFFF210) // (DBGU) Interrupt Mask Register
-#define AT91C_DBGU_IER  ((AT91_REG *) 	0xFFFFF208) // (DBGU) Interrupt Enable Register
-#define AT91C_DBGU_CR   ((AT91_REG *) 	0xFFFFF200) // (DBGU) Control Register
-// ========== Register definition for PDC_DBGU peripheral ========== 
-#define AT91C_DBGU_TNCR ((AT91_REG *) 	0xFFFFF31C) // (PDC_DBGU) Transmit Next Counter Register
-#define AT91C_DBGU_RNCR ((AT91_REG *) 	0xFFFFF314) // (PDC_DBGU) Receive Next Counter Register
-#define AT91C_DBGU_PTCR ((AT91_REG *) 	0xFFFFF320) // (PDC_DBGU) PDC Transfer Control Register
-#define AT91C_DBGU_PTSR ((AT91_REG *) 	0xFFFFF324) // (PDC_DBGU) PDC Transfer Status Register
-#define AT91C_DBGU_RCR  ((AT91_REG *) 	0xFFFFF304) // (PDC_DBGU) Receive Counter Register
-#define AT91C_DBGU_TCR  ((AT91_REG *) 	0xFFFFF30C) // (PDC_DBGU) Transmit Counter Register
-#define AT91C_DBGU_RPR  ((AT91_REG *) 	0xFFFFF300) // (PDC_DBGU) Receive Pointer Register
-#define AT91C_DBGU_TPR  ((AT91_REG *) 	0xFFFFF308) // (PDC_DBGU) Transmit Pointer Register
-#define AT91C_DBGU_RNPR ((AT91_REG *) 	0xFFFFF310) // (PDC_DBGU) Receive Next Pointer Register
-#define AT91C_DBGU_TNPR ((AT91_REG *) 	0xFFFFF318) // (PDC_DBGU) Transmit Next Pointer Register
-// ========== Register definition for AIC peripheral ========== 
-#define AT91C_AIC_ICCR  ((AT91_REG *) 	0xFFFFF128) // (AIC) Interrupt Clear Command Register
-#define AT91C_AIC_IECR  ((AT91_REG *) 	0xFFFFF120) // (AIC) Interrupt Enable Command Register
-#define AT91C_AIC_SMR   ((AT91_REG *) 	0xFFFFF000) // (AIC) Source Mode Register
-#define AT91C_AIC_ISCR  ((AT91_REG *) 	0xFFFFF12C) // (AIC) Interrupt Set Command Register
-#define AT91C_AIC_EOICR ((AT91_REG *) 	0xFFFFF130) // (AIC) End of Interrupt Command Register
-#define AT91C_AIC_DCR   ((AT91_REG *) 	0xFFFFF138) // (AIC) Debug Control Register (Protect)
-#define AT91C_AIC_FFER  ((AT91_REG *) 	0xFFFFF140) // (AIC) Fast Forcing Enable Register
-#define AT91C_AIC_SVR   ((AT91_REG *) 	0xFFFFF080) // (AIC) Source Vector Register
-#define AT91C_AIC_SPU   ((AT91_REG *) 	0xFFFFF134) // (AIC) Spurious Vector Register
-#define AT91C_AIC_FFDR  ((AT91_REG *) 	0xFFFFF144) // (AIC) Fast Forcing Disable Register
-#define AT91C_AIC_FVR   ((AT91_REG *) 	0xFFFFF104) // (AIC) FIQ Vector Register
-#define AT91C_AIC_FFSR  ((AT91_REG *) 	0xFFFFF148) // (AIC) Fast Forcing Status Register
-#define AT91C_AIC_IMR   ((AT91_REG *) 	0xFFFFF110) // (AIC) Interrupt Mask Register
-#define AT91C_AIC_ISR   ((AT91_REG *) 	0xFFFFF108) // (AIC) Interrupt Status Register
-#define AT91C_AIC_IVR   ((AT91_REG *) 	0xFFFFF100) // (AIC) IRQ Vector Register
-#define AT91C_AIC_IDCR  ((AT91_REG *) 	0xFFFFF124) // (AIC) Interrupt Disable Command Register
-#define AT91C_AIC_CISR  ((AT91_REG *) 	0xFFFFF114) // (AIC) Core Interrupt Status Register
-#define AT91C_AIC_IPR   ((AT91_REG *) 	0xFFFFF10C) // (AIC) Interrupt Pending Register
-// ========== Register definition for PDC_SPI peripheral ========== 
-#define AT91C_SPI_PTCR  ((AT91_REG *) 	0xFFFE0120) // (PDC_SPI) PDC Transfer Control Register
-#define AT91C_SPI_TNPR  ((AT91_REG *) 	0xFFFE0118) // (PDC_SPI) Transmit Next Pointer Register
-#define AT91C_SPI_RNPR  ((AT91_REG *) 	0xFFFE0110) // (PDC_SPI) Receive Next Pointer Register
-#define AT91C_SPI_TPR   ((AT91_REG *) 	0xFFFE0108) // (PDC_SPI) Transmit Pointer Register
-#define AT91C_SPI_RPR   ((AT91_REG *) 	0xFFFE0100) // (PDC_SPI) Receive Pointer Register
-#define AT91C_SPI_PTSR  ((AT91_REG *) 	0xFFFE0124) // (PDC_SPI) PDC Transfer Status Register
-#define AT91C_SPI_TNCR  ((AT91_REG *) 	0xFFFE011C) // (PDC_SPI) Transmit Next Counter Register
-#define AT91C_SPI_RNCR  ((AT91_REG *) 	0xFFFE0114) // (PDC_SPI) Receive Next Counter Register
-#define AT91C_SPI_TCR   ((AT91_REG *) 	0xFFFE010C) // (PDC_SPI) Transmit Counter Register
-#define AT91C_SPI_RCR   ((AT91_REG *) 	0xFFFE0104) // (PDC_SPI) Receive Counter Register
-// ========== Register definition for SPI peripheral ========== 
-#define AT91C_SPI_CSR   ((AT91_REG *) 	0xFFFE0030) // (SPI) Chip Select Register
-#define AT91C_SPI_IDR   ((AT91_REG *) 	0xFFFE0018) // (SPI) Interrupt Disable Register
-#define AT91C_SPI_SR    ((AT91_REG *) 	0xFFFE0010) // (SPI) Status Register
-#define AT91C_SPI_RDR   ((AT91_REG *) 	0xFFFE0008) // (SPI) Receive Data Register
-#define AT91C_SPI_CR    ((AT91_REG *) 	0xFFFE0000) // (SPI) Control Register
-#define AT91C_SPI_IMR   ((AT91_REG *) 	0xFFFE001C) // (SPI) Interrupt Mask Register
-#define AT91C_SPI_IER   ((AT91_REG *) 	0xFFFE0014) // (SPI) Interrupt Enable Register
-#define AT91C_SPI_TDR   ((AT91_REG *) 	0xFFFE000C) // (SPI) Transmit Data Register
-#define AT91C_SPI_MR    ((AT91_REG *) 	0xFFFE0004) // (SPI) Mode Register
-// ========== Register definition for PDC_SSC2 peripheral ========== 
-#define AT91C_SSC2_PTCR ((AT91_REG *) 	0xFFFD8120) // (PDC_SSC2) PDC Transfer Control Register
-#define AT91C_SSC2_TNPR ((AT91_REG *) 	0xFFFD8118) // (PDC_SSC2) Transmit Next Pointer Register
-#define AT91C_SSC2_RNPR ((AT91_REG *) 	0xFFFD8110) // (PDC_SSC2) Receive Next Pointer Register
-#define AT91C_SSC2_TPR  ((AT91_REG *) 	0xFFFD8108) // (PDC_SSC2) Transmit Pointer Register
-#define AT91C_SSC2_RPR  ((AT91_REG *) 	0xFFFD8100) // (PDC_SSC2) Receive Pointer Register
-#define AT91C_SSC2_PTSR ((AT91_REG *) 	0xFFFD8124) // (PDC_SSC2) PDC Transfer Status Register
-#define AT91C_SSC2_TNCR ((AT91_REG *) 	0xFFFD811C) // (PDC_SSC2) Transmit Next Counter Register
-#define AT91C_SSC2_RNCR ((AT91_REG *) 	0xFFFD8114) // (PDC_SSC2) Receive Next Counter Register
-#define AT91C_SSC2_TCR  ((AT91_REG *) 	0xFFFD810C) // (PDC_SSC2) Transmit Counter Register
-#define AT91C_SSC2_RCR  ((AT91_REG *) 	0xFFFD8104) // (PDC_SSC2) Receive Counter Register
-// ========== Register definition for SSC2 peripheral ========== 
-#define AT91C_SSC2_IMR  ((AT91_REG *) 	0xFFFD804C) // (SSC2) Interrupt Mask Register
-#define AT91C_SSC2_IER  ((AT91_REG *) 	0xFFFD8044) // (SSC2) Interrupt Enable Register
-#define AT91C_SSC2_RC1R ((AT91_REG *) 	0xFFFD803C) // (SSC2) Receive Compare 1 Register
-#define AT91C_SSC2_TSHR ((AT91_REG *) 	0xFFFD8034) // (SSC2) Transmit Sync Holding Register
-#define AT91C_SSC2_CMR  ((AT91_REG *) 	0xFFFD8004) // (SSC2) Clock Mode Register
-#define AT91C_SSC2_IDR  ((AT91_REG *) 	0xFFFD8048) // (SSC2) Interrupt Disable Register
-#define AT91C_SSC2_TCMR ((AT91_REG *) 	0xFFFD8018) // (SSC2) Transmit Clock Mode Register
-#define AT91C_SSC2_RCMR ((AT91_REG *) 	0xFFFD8010) // (SSC2) Receive Clock ModeRegister
-#define AT91C_SSC2_CR   ((AT91_REG *) 	0xFFFD8000) // (SSC2) Control Register
-#define AT91C_SSC2_RFMR ((AT91_REG *) 	0xFFFD8014) // (SSC2) Receive Frame Mode Register
-#define AT91C_SSC2_TFMR ((AT91_REG *) 	0xFFFD801C) // (SSC2) Transmit Frame Mode Register
-#define AT91C_SSC2_THR  ((AT91_REG *) 	0xFFFD8024) // (SSC2) Transmit Holding Register
-#define AT91C_SSC2_SR   ((AT91_REG *) 	0xFFFD8040) // (SSC2) Status Register
-#define AT91C_SSC2_RC0R ((AT91_REG *) 	0xFFFD8038) // (SSC2) Receive Compare 0 Register
-#define AT91C_SSC2_RSHR ((AT91_REG *) 	0xFFFD8030) // (SSC2) Receive Sync Holding Register
-#define AT91C_SSC2_RHR  ((AT91_REG *) 	0xFFFD8020) // (SSC2) Receive Holding Register
-// ========== Register definition for PDC_SSC1 peripheral ========== 
-#define AT91C_SSC1_PTCR ((AT91_REG *) 	0xFFFD4120) // (PDC_SSC1) PDC Transfer Control Register
-#define AT91C_SSC1_TNPR ((AT91_REG *) 	0xFFFD4118) // (PDC_SSC1) Transmit Next Pointer Register
-#define AT91C_SSC1_RNPR ((AT91_REG *) 	0xFFFD4110) // (PDC_SSC1) Receive Next Pointer Register
-#define AT91C_SSC1_TPR  ((AT91_REG *) 	0xFFFD4108) // (PDC_SSC1) Transmit Pointer Register
-#define AT91C_SSC1_RPR  ((AT91_REG *) 	0xFFFD4100) // (PDC_SSC1) Receive Pointer Register
-#define AT91C_SSC1_PTSR ((AT91_REG *) 	0xFFFD4124) // (PDC_SSC1) PDC Transfer Status Register
-#define AT91C_SSC1_TNCR ((AT91_REG *) 	0xFFFD411C) // (PDC_SSC1) Transmit Next Counter Register
-#define AT91C_SSC1_RNCR ((AT91_REG *) 	0xFFFD4114) // (PDC_SSC1) Receive Next Counter Register
-#define AT91C_SSC1_TCR  ((AT91_REG *) 	0xFFFD410C) // (PDC_SSC1) Transmit Counter Register
-#define AT91C_SSC1_RCR  ((AT91_REG *) 	0xFFFD4104) // (PDC_SSC1) Receive Counter Register
-// ========== Register definition for SSC1 peripheral ========== 
-#define AT91C_SSC1_RFMR ((AT91_REG *) 	0xFFFD4014) // (SSC1) Receive Frame Mode Register
-#define AT91C_SSC1_CMR  ((AT91_REG *) 	0xFFFD4004) // (SSC1) Clock Mode Register
-#define AT91C_SSC1_IDR  ((AT91_REG *) 	0xFFFD4048) // (SSC1) Interrupt Disable Register
-#define AT91C_SSC1_SR   ((AT91_REG *) 	0xFFFD4040) // (SSC1) Status Register
-#define AT91C_SSC1_RC0R ((AT91_REG *) 	0xFFFD4038) // (SSC1) Receive Compare 0 Register
-#define AT91C_SSC1_RSHR ((AT91_REG *) 	0xFFFD4030) // (SSC1) Receive Sync Holding Register
-#define AT91C_SSC1_RHR  ((AT91_REG *) 	0xFFFD4020) // (SSC1) Receive Holding Register
-#define AT91C_SSC1_TCMR ((AT91_REG *) 	0xFFFD4018) // (SSC1) Transmit Clock Mode Register
-#define AT91C_SSC1_RCMR ((AT91_REG *) 	0xFFFD4010) // (SSC1) Receive Clock ModeRegister
-#define AT91C_SSC1_CR   ((AT91_REG *) 	0xFFFD4000) // (SSC1) Control Register
-#define AT91C_SSC1_IMR  ((AT91_REG *) 	0xFFFD404C) // (SSC1) Interrupt Mask Register
-#define AT91C_SSC1_IER  ((AT91_REG *) 	0xFFFD4044) // (SSC1) Interrupt Enable Register
-#define AT91C_SSC1_RC1R ((AT91_REG *) 	0xFFFD403C) // (SSC1) Receive Compare 1 Register
-#define AT91C_SSC1_TSHR ((AT91_REG *) 	0xFFFD4034) // (SSC1) Transmit Sync Holding Register
-#define AT91C_SSC1_THR  ((AT91_REG *) 	0xFFFD4024) // (SSC1) Transmit Holding Register
-#define AT91C_SSC1_TFMR ((AT91_REG *) 	0xFFFD401C) // (SSC1) Transmit Frame Mode Register
-// ========== Register definition for PDC_SSC0 peripheral ========== 
-#define AT91C_SSC0_PTCR ((AT91_REG *) 	0xFFFD0120) // (PDC_SSC0) PDC Transfer Control Register
-#define AT91C_SSC0_TNPR ((AT91_REG *) 	0xFFFD0118) // (PDC_SSC0) Transmit Next Pointer Register
-#define AT91C_SSC0_RNPR ((AT91_REG *) 	0xFFFD0110) // (PDC_SSC0) Receive Next Pointer Register
-#define AT91C_SSC0_TPR  ((AT91_REG *) 	0xFFFD0108) // (PDC_SSC0) Transmit Pointer Register
-#define AT91C_SSC0_RPR  ((AT91_REG *) 	0xFFFD0100) // (PDC_SSC0) Receive Pointer Register
-#define AT91C_SSC0_PTSR ((AT91_REG *) 	0xFFFD0124) // (PDC_SSC0) PDC Transfer Status Register
-#define AT91C_SSC0_TNCR ((AT91_REG *) 	0xFFFD011C) // (PDC_SSC0) Transmit Next Counter Register
-#define AT91C_SSC0_RNCR ((AT91_REG *) 	0xFFFD0114) // (PDC_SSC0) Receive Next Counter Register
-#define AT91C_SSC0_TCR  ((AT91_REG *) 	0xFFFD010C) // (PDC_SSC0) Transmit Counter Register
-#define AT91C_SSC0_RCR  ((AT91_REG *) 	0xFFFD0104) // (PDC_SSC0) Receive Counter Register
-// ========== Register definition for SSC0 peripheral ========== 
-#define AT91C_SSC0_IMR  ((AT91_REG *) 	0xFFFD004C) // (SSC0) Interrupt Mask Register
-#define AT91C_SSC0_IER  ((AT91_REG *) 	0xFFFD0044) // (SSC0) Interrupt Enable Register
-#define AT91C_SSC0_RC1R ((AT91_REG *) 	0xFFFD003C) // (SSC0) Receive Compare 1 Register
-#define AT91C_SSC0_TSHR ((AT91_REG *) 	0xFFFD0034) // (SSC0) Transmit Sync Holding Register
-#define AT91C_SSC0_THR  ((AT91_REG *) 	0xFFFD0024) // (SSC0) Transmit Holding Register
-#define AT91C_SSC0_TFMR ((AT91_REG *) 	0xFFFD001C) // (SSC0) Transmit Frame Mode Register
-#define AT91C_SSC0_RFMR ((AT91_REG *) 	0xFFFD0014) // (SSC0) Receive Frame Mode Register
-#define AT91C_SSC0_CMR  ((AT91_REG *) 	0xFFFD0004) // (SSC0) Clock Mode Register
-#define AT91C_SSC0_IDR  ((AT91_REG *) 	0xFFFD0048) // (SSC0) Interrupt Disable Register
-#define AT91C_SSC0_SR   ((AT91_REG *) 	0xFFFD0040) // (SSC0) Status Register
-#define AT91C_SSC0_RC0R ((AT91_REG *) 	0xFFFD0038) // (SSC0) Receive Compare 0 Register
-#define AT91C_SSC0_RSHR ((AT91_REG *) 	0xFFFD0030) // (SSC0) Receive Sync Holding Register
-#define AT91C_SSC0_RHR  ((AT91_REG *) 	0xFFFD0020) // (SSC0) Receive Holding Register
-#define AT91C_SSC0_TCMR ((AT91_REG *) 	0xFFFD0018) // (SSC0) Transmit Clock Mode Register
-#define AT91C_SSC0_RCMR ((AT91_REG *) 	0xFFFD0010) // (SSC0) Receive Clock ModeRegister
-#define AT91C_SSC0_CR   ((AT91_REG *) 	0xFFFD0000) // (SSC0) Control Register
-// ========== Register definition for PDC_US3 peripheral ========== 
-#define AT91C_US3_PTSR  ((AT91_REG *) 	0xFFFCC124) // (PDC_US3) PDC Transfer Status Register
-#define AT91C_US3_TNCR  ((AT91_REG *) 	0xFFFCC11C) // (PDC_US3) Transmit Next Counter Register
-#define AT91C_US3_RNCR  ((AT91_REG *) 	0xFFFCC114) // (PDC_US3) Receive Next Counter Register
-#define AT91C_US3_TCR   ((AT91_REG *) 	0xFFFCC10C) // (PDC_US3) Transmit Counter Register
-#define AT91C_US3_RCR   ((AT91_REG *) 	0xFFFCC104) // (PDC_US3) Receive Counter Register
-#define AT91C_US3_PTCR  ((AT91_REG *) 	0xFFFCC120) // (PDC_US3) PDC Transfer Control Register
-#define AT91C_US3_TNPR  ((AT91_REG *) 	0xFFFCC118) // (PDC_US3) Transmit Next Pointer Register
-#define AT91C_US3_RNPR  ((AT91_REG *) 	0xFFFCC110) // (PDC_US3) Receive Next Pointer Register
-#define AT91C_US3_TPR   ((AT91_REG *) 	0xFFFCC108) // (PDC_US3) Transmit Pointer Register
-#define AT91C_US3_RPR   ((AT91_REG *) 	0xFFFCC100) // (PDC_US3) Receive Pointer Register
-// ========== Register definition for US3 peripheral ========== 
-#define AT91C_US3_IF    ((AT91_REG *) 	0xFFFCC04C) // (US3) IRDA_FILTER Register
-#define AT91C_US3_NER   ((AT91_REG *) 	0xFFFCC044) // (US3) Nb Errors Register
-#define AT91C_US3_RTOR  ((AT91_REG *) 	0xFFFCC024) // (US3) Receiver Time-out Register
-#define AT91C_US3_THR   ((AT91_REG *) 	0xFFFCC01C) // (US3) Transmitter Holding Register
-#define AT91C_US3_CSR   ((AT91_REG *) 	0xFFFCC014) // (US3) Channel Status Register
-#define AT91C_US3_IDR   ((AT91_REG *) 	0xFFFCC00C) // (US3) Interrupt Disable Register
-#define AT91C_US3_MR    ((AT91_REG *) 	0xFFFCC004) // (US3) Mode Register
-#define AT91C_US3_XXR   ((AT91_REG *) 	0xFFFCC048) // (US3) XON_XOFF Register
-#define AT91C_US3_FIDI  ((AT91_REG *) 	0xFFFCC040) // (US3) FI_DI_Ratio Register
-#define AT91C_US3_TTGR  ((AT91_REG *) 	0xFFFCC028) // (US3) Transmitter Time-guard Register
-#define AT91C_US3_BRGR  ((AT91_REG *) 	0xFFFCC020) // (US3) Baud Rate Generator Register
-#define AT91C_US3_RHR   ((AT91_REG *) 	0xFFFCC018) // (US3) Receiver Holding Register
-#define AT91C_US3_IMR   ((AT91_REG *) 	0xFFFCC010) // (US3) Interrupt Mask Register
-#define AT91C_US3_IER   ((AT91_REG *) 	0xFFFCC008) // (US3) Interrupt Enable Register
-#define AT91C_US3_CR    ((AT91_REG *) 	0xFFFCC000) // (US3) Control Register
-// ========== Register definition for PDC_US2 peripheral ========== 
-#define AT91C_US2_PTSR  ((AT91_REG *) 	0xFFFC8124) // (PDC_US2) PDC Transfer Status Register
-#define AT91C_US2_TNCR  ((AT91_REG *) 	0xFFFC811C) // (PDC_US2) Transmit Next Counter Register
-#define AT91C_US2_RNCR  ((AT91_REG *) 	0xFFFC8114) // (PDC_US2) Receive Next Counter Register
-#define AT91C_US2_TCR   ((AT91_REG *) 	0xFFFC810C) // (PDC_US2) Transmit Counter Register
-#define AT91C_US2_PTCR  ((AT91_REG *) 	0xFFFC8120) // (PDC_US2) PDC Transfer Control Register
-#define AT91C_US2_RCR   ((AT91_REG *) 	0xFFFC8104) // (PDC_US2) Receive Counter Register
-#define AT91C_US2_TNPR  ((AT91_REG *) 	0xFFFC8118) // (PDC_US2) Transmit Next Pointer Register
-#define AT91C_US2_RPR   ((AT91_REG *) 	0xFFFC8100) // (PDC_US2) Receive Pointer Register
-#define AT91C_US2_TPR   ((AT91_REG *) 	0xFFFC8108) // (PDC_US2) Transmit Pointer Register
-#define AT91C_US2_RNPR  ((AT91_REG *) 	0xFFFC8110) // (PDC_US2) Receive Next Pointer Register
-// ========== Register definition for US2 peripheral ========== 
-#define AT91C_US2_XXR   ((AT91_REG *) 	0xFFFC8048) // (US2) XON_XOFF Register
-#define AT91C_US2_FIDI  ((AT91_REG *) 	0xFFFC8040) // (US2) FI_DI_Ratio Register
-#define AT91C_US2_TTGR  ((AT91_REG *) 	0xFFFC8028) // (US2) Transmitter Time-guard Register
-#define AT91C_US2_BRGR  ((AT91_REG *) 	0xFFFC8020) // (US2) Baud Rate Generator Register
-#define AT91C_US2_RHR   ((AT91_REG *) 	0xFFFC8018) // (US2) Receiver Holding Register
-#define AT91C_US2_IMR   ((AT91_REG *) 	0xFFFC8010) // (US2) Interrupt Mask Register
-#define AT91C_US2_IER   ((AT91_REG *) 	0xFFFC8008) // (US2) Interrupt Enable Register
-#define AT91C_US2_CR    ((AT91_REG *) 	0xFFFC8000) // (US2) Control Register
-#define AT91C_US2_IF    ((AT91_REG *) 	0xFFFC804C) // (US2) IRDA_FILTER Register
-#define AT91C_US2_NER   ((AT91_REG *) 	0xFFFC8044) // (US2) Nb Errors Register
-#define AT91C_US2_RTOR  ((AT91_REG *) 	0xFFFC8024) // (US2) Receiver Time-out Register
-#define AT91C_US2_THR   ((AT91_REG *) 	0xFFFC801C) // (US2) Transmitter Holding Register
-#define AT91C_US2_CSR   ((AT91_REG *) 	0xFFFC8014) // (US2) Channel Status Register
-#define AT91C_US2_IDR   ((AT91_REG *) 	0xFFFC800C) // (US2) Interrupt Disable Register
-#define AT91C_US2_MR    ((AT91_REG *) 	0xFFFC8004) // (US2) Mode Register
-// ========== Register definition for PDC_US1 peripheral ========== 
-#define AT91C_US1_PTSR  ((AT91_REG *) 	0xFFFC4124) // (PDC_US1) PDC Transfer Status Register
-#define AT91C_US1_TNCR  ((AT91_REG *) 	0xFFFC411C) // (PDC_US1) Transmit Next Counter Register
-#define AT91C_US1_RNCR  ((AT91_REG *) 	0xFFFC4114) // (PDC_US1) Receive Next Counter Register
-#define AT91C_US1_TCR   ((AT91_REG *) 	0xFFFC410C) // (PDC_US1) Transmit Counter Register
-#define AT91C_US1_RCR   ((AT91_REG *) 	0xFFFC4104) // (PDC_US1) Receive Counter Register
-#define AT91C_US1_PTCR  ((AT91_REG *) 	0xFFFC4120) // (PDC_US1) PDC Transfer Control Register
-#define AT91C_US1_TNPR  ((AT91_REG *) 	0xFFFC4118) // (PDC_US1) Transmit Next Pointer Register
-#define AT91C_US1_RNPR  ((AT91_REG *) 	0xFFFC4110) // (PDC_US1) Receive Next Pointer Register
-#define AT91C_US1_TPR   ((AT91_REG *) 	0xFFFC4108) // (PDC_US1) Transmit Pointer Register
-#define AT91C_US1_RPR   ((AT91_REG *) 	0xFFFC4100) // (PDC_US1) Receive Pointer Register
-// ========== Register definition for US1 peripheral ========== 
-#define AT91C_US1_XXR   ((AT91_REG *) 	0xFFFC4048) // (US1) XON_XOFF Register
-#define AT91C_US1_RHR   ((AT91_REG *) 	0xFFFC4018) // (US1) Receiver Holding Register
-#define AT91C_US1_IMR   ((AT91_REG *) 	0xFFFC4010) // (US1) Interrupt Mask Register
-#define AT91C_US1_IER   ((AT91_REG *) 	0xFFFC4008) // (US1) Interrupt Enable Register
-#define AT91C_US1_CR    ((AT91_REG *) 	0xFFFC4000) // (US1) Control Register
-#define AT91C_US1_RTOR  ((AT91_REG *) 	0xFFFC4024) // (US1) Receiver Time-out Register
-#define AT91C_US1_THR   ((AT91_REG *) 	0xFFFC401C) // (US1) Transmitter Holding Register
-#define AT91C_US1_CSR   ((AT91_REG *) 	0xFFFC4014) // (US1) Channel Status Register
-#define AT91C_US1_IDR   ((AT91_REG *) 	0xFFFC400C) // (US1) Interrupt Disable Register
-#define AT91C_US1_FIDI  ((AT91_REG *) 	0xFFFC4040) // (US1) FI_DI_Ratio Register
-#define AT91C_US1_BRGR  ((AT91_REG *) 	0xFFFC4020) // (US1) Baud Rate Generator Register
-#define AT91C_US1_TTGR  ((AT91_REG *) 	0xFFFC4028) // (US1) Transmitter Time-guard Register
-#define AT91C_US1_IF    ((AT91_REG *) 	0xFFFC404C) // (US1) IRDA_FILTER Register
-#define AT91C_US1_NER   ((AT91_REG *) 	0xFFFC4044) // (US1) Nb Errors Register
-#define AT91C_US1_MR    ((AT91_REG *) 	0xFFFC4004) // (US1) Mode Register
-// ========== Register definition for PDC_US0 peripheral ========== 
-#define AT91C_US0_PTCR  ((AT91_REG *) 	0xFFFC0120) // (PDC_US0) PDC Transfer Control Register
-#define AT91C_US0_TNPR  ((AT91_REG *) 	0xFFFC0118) // (PDC_US0) Transmit Next Pointer Register
-#define AT91C_US0_RNPR  ((AT91_REG *) 	0xFFFC0110) // (PDC_US0) Receive Next Pointer Register
-#define AT91C_US0_TPR   ((AT91_REG *) 	0xFFFC0108) // (PDC_US0) Transmit Pointer Register
-#define AT91C_US0_RPR   ((AT91_REG *) 	0xFFFC0100) // (PDC_US0) Receive Pointer Register
-#define AT91C_US0_PTSR  ((AT91_REG *) 	0xFFFC0124) // (PDC_US0) PDC Transfer Status Register
-#define AT91C_US0_TNCR  ((AT91_REG *) 	0xFFFC011C) // (PDC_US0) Transmit Next Counter Register
-#define AT91C_US0_RNCR  ((AT91_REG *) 	0xFFFC0114) // (PDC_US0) Receive Next Counter Register
-#define AT91C_US0_TCR   ((AT91_REG *) 	0xFFFC010C) // (PDC_US0) Transmit Counter Register
-#define AT91C_US0_RCR   ((AT91_REG *) 	0xFFFC0104) // (PDC_US0) Receive Counter Register
-// ========== Register definition for US0 peripheral ========== 
-#define AT91C_US0_TTGR  ((AT91_REG *) 	0xFFFC0028) // (US0) Transmitter Time-guard Register
-#define AT91C_US0_BRGR  ((AT91_REG *) 	0xFFFC0020) // (US0) Baud Rate Generator Register
-#define AT91C_US0_RHR   ((AT91_REG *) 	0xFFFC0018) // (US0) Receiver Holding Register
-#define AT91C_US0_IMR   ((AT91_REG *) 	0xFFFC0010) // (US0) Interrupt Mask Register
-#define AT91C_US0_NER   ((AT91_REG *) 	0xFFFC0044) // (US0) Nb Errors Register
-#define AT91C_US0_RTOR  ((AT91_REG *) 	0xFFFC0024) // (US0) Receiver Time-out Register
-#define AT91C_US0_XXR   ((AT91_REG *) 	0xFFFC0048) // (US0) XON_XOFF Register
-#define AT91C_US0_FIDI  ((AT91_REG *) 	0xFFFC0040) // (US0) FI_DI_Ratio Register
-#define AT91C_US0_CR    ((AT91_REG *) 	0xFFFC0000) // (US0) Control Register
-#define AT91C_US0_IER   ((AT91_REG *) 	0xFFFC0008) // (US0) Interrupt Enable Register
-#define AT91C_US0_IF    ((AT91_REG *) 	0xFFFC004C) // (US0) IRDA_FILTER Register
-#define AT91C_US0_MR    ((AT91_REG *) 	0xFFFC0004) // (US0) Mode Register
-#define AT91C_US0_IDR   ((AT91_REG *) 	0xFFFC000C) // (US0) Interrupt Disable Register
-#define AT91C_US0_CSR   ((AT91_REG *) 	0xFFFC0014) // (US0) Channel Status Register
-#define AT91C_US0_THR   ((AT91_REG *) 	0xFFFC001C) // (US0) Transmitter Holding Register
-// ========== Register definition for TWI peripheral ========== 
-#define AT91C_TWI_RHR   ((AT91_REG *) 	0xFFFB8030) // (TWI) Receive Holding Register
-#define AT91C_TWI_IDR   ((AT91_REG *) 	0xFFFB8028) // (TWI) Interrupt Disable Register
-#define AT91C_TWI_SR    ((AT91_REG *) 	0xFFFB8020) // (TWI) Status Register
-#define AT91C_TWI_CWGR  ((AT91_REG *) 	0xFFFB8010) // (TWI) Clock Waveform Generator Register
-#define AT91C_TWI_SMR   ((AT91_REG *) 	0xFFFB8008) // (TWI) Slave Mode Register
-#define AT91C_TWI_CR    ((AT91_REG *) 	0xFFFB8000) // (TWI) Control Register
-#define AT91C_TWI_THR   ((AT91_REG *) 	0xFFFB8034) // (TWI) Transmit Holding Register
-#define AT91C_TWI_IMR   ((AT91_REG *) 	0xFFFB802C) // (TWI) Interrupt Mask Register
-#define AT91C_TWI_IER   ((AT91_REG *) 	0xFFFB8024) // (TWI) Interrupt Enable Register
-#define AT91C_TWI_IADR  ((AT91_REG *) 	0xFFFB800C) // (TWI) Internal Address Register
-#define AT91C_TWI_MMR   ((AT91_REG *) 	0xFFFB8004) // (TWI) Master Mode Register
-// ========== Register definition for PDC_MCI peripheral ========== 
-#define AT91C_MCI_PTCR  ((AT91_REG *) 	0xFFFB4120) // (PDC_MCI) PDC Transfer Control Register
-#define AT91C_MCI_TNPR  ((AT91_REG *) 	0xFFFB4118) // (PDC_MCI) Transmit Next Pointer Register
-#define AT91C_MCI_RNPR  ((AT91_REG *) 	0xFFFB4110) // (PDC_MCI) Receive Next Pointer Register
-#define AT91C_MCI_TPR   ((AT91_REG *) 	0xFFFB4108) // (PDC_MCI) Transmit Pointer Register
-#define AT91C_MCI_RPR   ((AT91_REG *) 	0xFFFB4100) // (PDC_MCI) Receive Pointer Register
-#define AT91C_MCI_PTSR  ((AT91_REG *) 	0xFFFB4124) // (PDC_MCI) PDC Transfer Status Register
-#define AT91C_MCI_TNCR  ((AT91_REG *) 	0xFFFB411C) // (PDC_MCI) Transmit Next Counter Register
-#define AT91C_MCI_RNCR  ((AT91_REG *) 	0xFFFB4114) // (PDC_MCI) Receive Next Counter Register
-#define AT91C_MCI_TCR   ((AT91_REG *) 	0xFFFB410C) // (PDC_MCI) Transmit Counter Register
-#define AT91C_MCI_RCR   ((AT91_REG *) 	0xFFFB4104) // (PDC_MCI) Receive Counter Register
-// ========== Register definition for MCI peripheral ========== 
-#define AT91C_MCI_IDR   ((AT91_REG *) 	0xFFFB4048) // (MCI) MCI Interrupt Disable Register
-#define AT91C_MCI_SR    ((AT91_REG *) 	0xFFFB4040) // (MCI) MCI Status Register
-#define AT91C_MCI_RDR   ((AT91_REG *) 	0xFFFB4030) // (MCI) MCI Receive Data Register
-#define AT91C_MCI_RSPR  ((AT91_REG *) 	0xFFFB4020) // (MCI) MCI Response Register
-#define AT91C_MCI_ARGR  ((AT91_REG *) 	0xFFFB4010) // (MCI) MCI Argument Register
-#define AT91C_MCI_DTOR  ((AT91_REG *) 	0xFFFB4008) // (MCI) MCI Data Timeout Register
-#define AT91C_MCI_CR    ((AT91_REG *) 	0xFFFB4000) // (MCI) MCI Control Register
-#define AT91C_MCI_IMR   ((AT91_REG *) 	0xFFFB404C) // (MCI) MCI Interrupt Mask Register
-#define AT91C_MCI_IER   ((AT91_REG *) 	0xFFFB4044) // (MCI) MCI Interrupt Enable Register
-#define AT91C_MCI_TDR   ((AT91_REG *) 	0xFFFB4034) // (MCI) MCI Transmit Data Register
-#define AT91C_MCI_CMDR  ((AT91_REG *) 	0xFFFB4014) // (MCI) MCI Command Register
-#define AT91C_MCI_SDCR  ((AT91_REG *) 	0xFFFB400C) // (MCI) MCI SD Card Register
-#define AT91C_MCI_MR    ((AT91_REG *) 	0xFFFB4004) // (MCI) MCI Mode Register
-// ========== Register definition for UDP peripheral ========== 
-#define AT91C_UDP_ISR   ((AT91_REG *) 	0xFFFB001C) // (UDP) Interrupt Status Register
-#define AT91C_UDP_IDR   ((AT91_REG *) 	0xFFFB0014) // (UDP) Interrupt Disable Register
-#define AT91C_UDP_GLBSTATE ((AT91_REG *) 	0xFFFB0004) // (UDP) Global State Register
-#define AT91C_UDP_FDR   ((AT91_REG *) 	0xFFFB0050) // (UDP) Endpoint FIFO Data Register
-#define AT91C_UDP_CSR   ((AT91_REG *) 	0xFFFB0030) // (UDP) Endpoint Control and Status Register
-#define AT91C_UDP_RSTEP ((AT91_REG *) 	0xFFFB0028) // (UDP) Reset Endpoint Register
-#define AT91C_UDP_ICR   ((AT91_REG *) 	0xFFFB0020) // (UDP) Interrupt Clear Register
-#define AT91C_UDP_IMR   ((AT91_REG *) 	0xFFFB0018) // (UDP) Interrupt Mask Register
-#define AT91C_UDP_IER   ((AT91_REG *) 	0xFFFB0010) // (UDP) Interrupt Enable Register
-#define AT91C_UDP_FADDR ((AT91_REG *) 	0xFFFB0008) // (UDP) Function Address Register
-#define AT91C_UDP_NUM   ((AT91_REG *) 	0xFFFB0000) // (UDP) Frame Number Register
-// ========== Register definition for TC5 peripheral ========== 
-#define AT91C_TC5_CMR   ((AT91_REG *) 	0xFFFA4084) // (TC5) Channel Mode Register
-#define AT91C_TC5_IDR   ((AT91_REG *) 	0xFFFA40A8) // (TC5) Interrupt Disable Register
-#define AT91C_TC5_SR    ((AT91_REG *) 	0xFFFA40A0) // (TC5) Status Register
-#define AT91C_TC5_RB    ((AT91_REG *) 	0xFFFA4098) // (TC5) Register B
-#define AT91C_TC5_CV    ((AT91_REG *) 	0xFFFA4090) // (TC5) Counter Value
-#define AT91C_TC5_CCR   ((AT91_REG *) 	0xFFFA4080) // (TC5) Channel Control Register
-#define AT91C_TC5_IMR   ((AT91_REG *) 	0xFFFA40AC) // (TC5) Interrupt Mask Register
-#define AT91C_TC5_IER   ((AT91_REG *) 	0xFFFA40A4) // (TC5) Interrupt Enable Register
-#define AT91C_TC5_RC    ((AT91_REG *) 	0xFFFA409C) // (TC5) Register C
-#define AT91C_TC5_RA    ((AT91_REG *) 	0xFFFA4094) // (TC5) Register A
-// ========== Register definition for TC4 peripheral ========== 
-#define AT91C_TC4_IMR   ((AT91_REG *) 	0xFFFA406C) // (TC4) Interrupt Mask Register
-#define AT91C_TC4_IER   ((AT91_REG *) 	0xFFFA4064) // (TC4) Interrupt Enable Register
-#define AT91C_TC4_RC    ((AT91_REG *) 	0xFFFA405C) // (TC4) Register C
-#define AT91C_TC4_RA    ((AT91_REG *) 	0xFFFA4054) // (TC4) Register A
-#define AT91C_TC4_CMR   ((AT91_REG *) 	0xFFFA4044) // (TC4) Channel Mode Register
-#define AT91C_TC4_IDR   ((AT91_REG *) 	0xFFFA4068) // (TC4) Interrupt Disable Register
-#define AT91C_TC4_SR    ((AT91_REG *) 	0xFFFA4060) // (TC4) Status Register
-#define AT91C_TC4_RB    ((AT91_REG *) 	0xFFFA4058) // (TC4) Register B
-#define AT91C_TC4_CV    ((AT91_REG *) 	0xFFFA4050) // (TC4) Counter Value
-#define AT91C_TC4_CCR   ((AT91_REG *) 	0xFFFA4040) // (TC4) Channel Control Register
-// ========== Register definition for TC3 peripheral ========== 
-#define AT91C_TC3_IMR   ((AT91_REG *) 	0xFFFA402C) // (TC3) Interrupt Mask Register
-#define AT91C_TC3_CV    ((AT91_REG *) 	0xFFFA4010) // (TC3) Counter Value
-#define AT91C_TC3_CCR   ((AT91_REG *) 	0xFFFA4000) // (TC3) Channel Control Register
-#define AT91C_TC3_IER   ((AT91_REG *) 	0xFFFA4024) // (TC3) Interrupt Enable Register
-#define AT91C_TC3_CMR   ((AT91_REG *) 	0xFFFA4004) // (TC3) Channel Mode Register
-#define AT91C_TC3_RA    ((AT91_REG *) 	0xFFFA4014) // (TC3) Register A
-#define AT91C_TC3_RC    ((AT91_REG *) 	0xFFFA401C) // (TC3) Register C
-#define AT91C_TC3_IDR   ((AT91_REG *) 	0xFFFA4028) // (TC3) Interrupt Disable Register
-#define AT91C_TC3_RB    ((AT91_REG *) 	0xFFFA4018) // (TC3) Register B
-#define AT91C_TC3_SR    ((AT91_REG *) 	0xFFFA4020) // (TC3) Status Register
-// ========== Register definition for TCB1 peripheral ========== 
-#define AT91C_TCB1_BCR  ((AT91_REG *) 	0xFFFA4140) // (TCB1) TC Block Control Register
-#define AT91C_TCB1_BMR  ((AT91_REG *) 	0xFFFA4144) // (TCB1) TC Block Mode Register
-// ========== Register definition for TC2 peripheral ========== 
-#define AT91C_TC2_IMR   ((AT91_REG *) 	0xFFFA00AC) // (TC2) Interrupt Mask Register
-#define AT91C_TC2_IER   ((AT91_REG *) 	0xFFFA00A4) // (TC2) Interrupt Enable Register
-#define AT91C_TC2_RC    ((AT91_REG *) 	0xFFFA009C) // (TC2) Register C
-#define AT91C_TC2_RA    ((AT91_REG *) 	0xFFFA0094) // (TC2) Register A
-#define AT91C_TC2_CMR   ((AT91_REG *) 	0xFFFA0084) // (TC2) Channel Mode Register
-#define AT91C_TC2_IDR   ((AT91_REG *) 	0xFFFA00A8) // (TC2) Interrupt Disable Register
-#define AT91C_TC2_SR    ((AT91_REG *) 	0xFFFA00A0) // (TC2) Status Register
-#define AT91C_TC2_RB    ((AT91_REG *) 	0xFFFA0098) // (TC2) Register B
-#define AT91C_TC2_CV    ((AT91_REG *) 	0xFFFA0090) // (TC2) Counter Value
-#define AT91C_TC2_CCR   ((AT91_REG *) 	0xFFFA0080) // (TC2) Channel Control Register
-// ========== Register definition for TC1 peripheral ========== 
-#define AT91C_TC1_IMR   ((AT91_REG *) 	0xFFFA006C) // (TC1) Interrupt Mask Register
-#define AT91C_TC1_IER   ((AT91_REG *) 	0xFFFA0064) // (TC1) Interrupt Enable Register
-#define AT91C_TC1_RC    ((AT91_REG *) 	0xFFFA005C) // (TC1) Register C
-#define AT91C_TC1_RA    ((AT91_REG *) 	0xFFFA0054) // (TC1) Register A
-#define AT91C_TC1_CMR   ((AT91_REG *) 	0xFFFA0044) // (TC1) Channel Mode Register
-#define AT91C_TC1_IDR   ((AT91_REG *) 	0xFFFA0068) // (TC1) Interrupt Disable Register
-#define AT91C_TC1_SR    ((AT91_REG *) 	0xFFFA0060) // (TC1) Status Register
-#define AT91C_TC1_RB    ((AT91_REG *) 	0xFFFA0058) // (TC1) Register B
-#define AT91C_TC1_CV    ((AT91_REG *) 	0xFFFA0050) // (TC1) Counter Value
-#define AT91C_TC1_CCR   ((AT91_REG *) 	0xFFFA0040) // (TC1) Channel Control Register
-// ========== Register definition for TC0 peripheral ========== 
-#define AT91C_TC0_IMR   ((AT91_REG *) 	0xFFFA002C) // (TC0) Interrupt Mask Register
-#define AT91C_TC0_IER   ((AT91_REG *) 	0xFFFA0024) // (TC0) Interrupt Enable Register
-#define AT91C_TC0_RC    ((AT91_REG *) 	0xFFFA001C) // (TC0) Register C
-#define AT91C_TC0_RA    ((AT91_REG *) 	0xFFFA0014) // (TC0) Register A
-#define AT91C_TC0_CMR   ((AT91_REG *) 	0xFFFA0004) // (TC0) Channel Mode Register
-#define AT91C_TC0_IDR   ((AT91_REG *) 	0xFFFA0028) // (TC0) Interrupt Disable Register
-#define AT91C_TC0_SR    ((AT91_REG *) 	0xFFFA0020) // (TC0) Status Register
-#define AT91C_TC0_RB    ((AT91_REG *) 	0xFFFA0018) // (TC0) Register B
-#define AT91C_TC0_CV    ((AT91_REG *) 	0xFFFA0010) // (TC0) Counter Value
-#define AT91C_TC0_CCR   ((AT91_REG *) 	0xFFFA0000) // (TC0) Channel Control Register
-// ========== Register definition for TCB0 peripheral ========== 
-#define AT91C_TCB0_BMR  ((AT91_REG *) 	0xFFFA00C4) // (TCB0) TC Block Mode Register
-#define AT91C_TCB0_BCR  ((AT91_REG *) 	0xFFFA00C0) // (TCB0) TC Block Control Register
-// ========== Register definition for UHP peripheral ========== 
-#define AT91C_UHP_HcRhDescriptorA ((AT91_REG *) 	0x00300048) // (UHP) Root Hub characteristics A
-#define AT91C_UHP_HcRhPortStatus ((AT91_REG *) 	0x00300054) // (UHP) Root Hub Port Status Register
-#define AT91C_UHP_HcRhDescriptorB ((AT91_REG *) 	0x0030004C) // (UHP) Root Hub characteristics B
-#define AT91C_UHP_HcControl ((AT91_REG *) 	0x00300004) // (UHP) Operating modes for the Host Controller
-#define AT91C_UHP_HcInterruptStatus ((AT91_REG *) 	0x0030000C) // (UHP) Interrupt Status Register
-#define AT91C_UHP_HcRhStatus ((AT91_REG *) 	0x00300050) // (UHP) Root Hub Status register
-#define AT91C_UHP_HcRevision ((AT91_REG *) 	0x00300000) // (UHP) Revision
-#define AT91C_UHP_HcCommandStatus ((AT91_REG *) 	0x00300008) // (UHP) Command & status Register
-#define AT91C_UHP_HcInterruptEnable ((AT91_REG *) 	0x00300010) // (UHP) Interrupt Enable Register
-#define AT91C_UHP_HcHCCA ((AT91_REG *) 	0x00300018) // (UHP) Pointer to the Host Controller Communication Area
-#define AT91C_UHP_HcControlHeadED ((AT91_REG *) 	0x00300020) // (UHP) First Endpoint Descriptor of the Control list
-#define AT91C_UHP_HcInterruptDisable ((AT91_REG *) 	0x00300014) // (UHP) Interrupt Disable Register
-#define AT91C_UHP_HcPeriodCurrentED ((AT91_REG *) 	0x0030001C) // (UHP) Current Isochronous or Interrupt Endpoint Descriptor
-#define AT91C_UHP_HcControlCurrentED ((AT91_REG *) 	0x00300024) // (UHP) Endpoint Control and Status Register
-#define AT91C_UHP_HcBulkCurrentED ((AT91_REG *) 	0x0030002C) // (UHP) Current endpoint of the Bulk list
-#define AT91C_UHP_HcFmInterval ((AT91_REG *) 	0x00300034) // (UHP) Bit time between 2 consecutive SOFs
-#define AT91C_UHP_HcBulkHeadED ((AT91_REG *) 	0x00300028) // (UHP) First endpoint register of the Bulk list
-#define AT91C_UHP_HcBulkDoneHead ((AT91_REG *) 	0x00300030) // (UHP) Last completed transfer descriptor
-#define AT91C_UHP_HcFmRemaining ((AT91_REG *) 	0x00300038) // (UHP) Bit time remaining in the current Frame
-#define AT91C_UHP_HcPeriodicStart ((AT91_REG *) 	0x00300040) // (UHP) Periodic Start
-#define AT91C_UHP_HcLSThreshold ((AT91_REG *) 	0x00300044) // (UHP) LS Threshold
-#define AT91C_UHP_HcFmNumber ((AT91_REG *) 	0x0030003C) // (UHP) Frame number
-// ========== Register definition for EMAC peripheral ========== 
-#define AT91C_EMAC_RSR  ((AT91_REG *) 	0xFFFBC020) // (EMAC) Receive Status Register
-#define AT91C_EMAC_MAN  ((AT91_REG *) 	0xFFFBC034) // (EMAC) PHY Maintenance Register
-#define AT91C_EMAC_HSH  ((AT91_REG *) 	0xFFFBC090) // (EMAC) Hash Address High[63:32]
-#define AT91C_EMAC_MCOL ((AT91_REG *) 	0xFFFBC048) // (EMAC) Multiple Collision Frame Register
-#define AT91C_EMAC_IER  ((AT91_REG *) 	0xFFFBC028) // (EMAC) Interrupt Enable Register
-#define AT91C_EMAC_SA2H ((AT91_REG *) 	0xFFFBC0A4) // (EMAC) Specific Address 2 High, Last 2 bytes
-#define AT91C_EMAC_HSL  ((AT91_REG *) 	0xFFFBC094) // (EMAC) Hash Address Low[31:0]
-#define AT91C_EMAC_LCOL ((AT91_REG *) 	0xFFFBC05C) // (EMAC) Late Collision Register
-#define AT91C_EMAC_OK   ((AT91_REG *) 	0xFFFBC04C) // (EMAC) Frames Received OK Register
-#define AT91C_EMAC_CFG  ((AT91_REG *) 	0xFFFBC004) // (EMAC) Network Configuration Register
-#define AT91C_EMAC_SA3L ((AT91_REG *) 	0xFFFBC0A8) // (EMAC) Specific Address 3 Low, First 4 bytes
-#define AT91C_EMAC_SEQE ((AT91_REG *) 	0xFFFBC050) // (EMAC) Frame Check Sequence Error Register
-#define AT91C_EMAC_ECOL ((AT91_REG *) 	0xFFFBC060) // (EMAC) Excessive Collision Register
-#define AT91C_EMAC_ELR  ((AT91_REG *) 	0xFFFBC070) // (EMAC) Excessive Length Error Register
-#define AT91C_EMAC_SR   ((AT91_REG *) 	0xFFFBC008) // (EMAC) Network Status Register
-#define AT91C_EMAC_RBQP ((AT91_REG *) 	0xFFFBC018) // (EMAC) Receive Buffer Queue Pointer
-#define AT91C_EMAC_CSE  ((AT91_REG *) 	0xFFFBC064) // (EMAC) Carrier Sense Error Register
-#define AT91C_EMAC_RJB  ((AT91_REG *) 	0xFFFBC074) // (EMAC) Receive Jabber Register
-#define AT91C_EMAC_USF  ((AT91_REG *) 	0xFFFBC078) // (EMAC) Undersize Frame Register
-#define AT91C_EMAC_IDR  ((AT91_REG *) 	0xFFFBC02C) // (EMAC) Interrupt Disable Register
-#define AT91C_EMAC_SA1L ((AT91_REG *) 	0xFFFBC098) // (EMAC) Specific Address 1 Low, First 4 bytes
-#define AT91C_EMAC_IMR  ((AT91_REG *) 	0xFFFBC030) // (EMAC) Interrupt Mask Register
-#define AT91C_EMAC_FRA  ((AT91_REG *) 	0xFFFBC040) // (EMAC) Frames Transmitted OK Register
-#define AT91C_EMAC_SA3H ((AT91_REG *) 	0xFFFBC0AC) // (EMAC) Specific Address 3 High, Last 2 bytes
-#define AT91C_EMAC_SA1H ((AT91_REG *) 	0xFFFBC09C) // (EMAC) Specific Address 1 High, Last 2 bytes
-#define AT91C_EMAC_SCOL ((AT91_REG *) 	0xFFFBC044) // (EMAC) Single Collision Frame Register
-#define AT91C_EMAC_ALE  ((AT91_REG *) 	0xFFFBC054) // (EMAC) Alignment Error Register
-#define AT91C_EMAC_TAR  ((AT91_REG *) 	0xFFFBC00C) // (EMAC) Transmit Address Register
-#define AT91C_EMAC_SA4L ((AT91_REG *) 	0xFFFBC0B0) // (EMAC) Specific Address 4 Low, First 4 bytes
-#define AT91C_EMAC_SA2L ((AT91_REG *) 	0xFFFBC0A0) // (EMAC) Specific Address 2 Low, First 4 bytes
-#define AT91C_EMAC_TUE  ((AT91_REG *) 	0xFFFBC068) // (EMAC) Transmit Underrun Error Register
-#define AT91C_EMAC_DTE  ((AT91_REG *) 	0xFFFBC058) // (EMAC) Deferred Transmission Frame Register
-#define AT91C_EMAC_TCR  ((AT91_REG *) 	0xFFFBC010) // (EMAC) Transmit Control Register
-#define AT91C_EMAC_CTL  ((AT91_REG *) 	0xFFFBC000) // (EMAC) Network Control Register
-#define AT91C_EMAC_SA4H ((AT91_REG *) 	0xFFFBC0B4) // (EMAC) Specific Address 4 High, Last 2 bytesr
-#define AT91C_EMAC_CDE  ((AT91_REG *) 	0xFFFBC06C) // (EMAC) Code Error Register
-#define AT91C_EMAC_SQEE ((AT91_REG *) 	0xFFFBC07C) // (EMAC) SQE Test Error Register
-#define AT91C_EMAC_TSR  ((AT91_REG *) 	0xFFFBC014) // (EMAC) Transmit Status Register
-#define AT91C_EMAC_DRFC ((AT91_REG *) 	0xFFFBC080) // (EMAC) Discarded RX Frame Register
-// ========== Register definition for EBI peripheral ========== 
-#define AT91C_EBI_CFGR  ((AT91_REG *) 	0xFFFFFF64) // (EBI) Configuration Register
-#define AT91C_EBI_CSA   ((AT91_REG *) 	0xFFFFFF60) // (EBI) Chip Select Assignment Register
-// ========== Register definition for SMC2 peripheral ========== 
-#define AT91C_SMC2_CSR  ((AT91_REG *) 	0xFFFFFF70) // (SMC2) SMC2 Chip Select Register
-// ========== Register definition for SDRC peripheral ========== 
-#define AT91C_SDRC_IMR  ((AT91_REG *) 	0xFFFFFFAC) // (SDRC) SDRAM Controller Interrupt Mask Register
-#define AT91C_SDRC_IER  ((AT91_REG *) 	0xFFFFFFA4) // (SDRC) SDRAM Controller Interrupt Enable Register
-#define AT91C_SDRC_SRR  ((AT91_REG *) 	0xFFFFFF9C) // (SDRC) SDRAM Controller Self Refresh Register
-#define AT91C_SDRC_TR   ((AT91_REG *) 	0xFFFFFF94) // (SDRC) SDRAM Controller Refresh Timer Register
-#define AT91C_SDRC_ISR  ((AT91_REG *) 	0xFFFFFFB0) // (SDRC) SDRAM Controller Interrupt Mask Register
-#define AT91C_SDRC_IDR  ((AT91_REG *) 	0xFFFFFFA8) // (SDRC) SDRAM Controller Interrupt Disable Register
-#define AT91C_SDRC_LPR  ((AT91_REG *) 	0xFFFFFFA0) // (SDRC) SDRAM Controller Low Power Register
-#define AT91C_SDRC_CR   ((AT91_REG *) 	0xFFFFFF98) // (SDRC) SDRAM Controller Configuration Register
-#define AT91C_SDRC_MR   ((AT91_REG *) 	0xFFFFFF90) // (SDRC) SDRAM Controller Mode Register
-// ========== Register definition for BFC peripheral ========== 
-#define AT91C_BFC_MR    ((AT91_REG *) 	0xFFFFFFC0) // (BFC) BFC Mode Register
-
-// *****************************************************************************
-//               PIO DEFINITIONS FOR AT91RM9200
-// *****************************************************************************
-#define AT91C_PIO_PA0        ((unsigned int) 1 <<  0) // Pin Controlled by PA0
-#define AT91C_PA0_MISO     ((unsigned int) AT91C_PIO_PA0) //  SPI Master In Slave
-#define AT91C_PA0_PCK3     ((unsigned int) AT91C_PIO_PA0) //  PMC Programmable Clock Output 3
-#define AT91C_PIO_PA1        ((unsigned int) 1 <<  1) // Pin Controlled by PA1
-#define AT91C_PA1_MOSI     ((unsigned int) AT91C_PIO_PA1) //  SPI Master Out Slave
-#define AT91C_PA1_PCK0     ((unsigned int) AT91C_PIO_PA1) //  PMC Programmable Clock Output 0
-#define AT91C_PIO_PA10       ((unsigned int) 1 << 10) // Pin Controlled by PA10
-#define AT91C_PA10_ETX1     ((unsigned int) AT91C_PIO_PA10) //  Ethernet MAC Transmit Data 1
-#define AT91C_PA10_MCDB1    ((unsigned int) AT91C_PIO_PA10) //  Multimedia Card B Data 1
-#define AT91C_PIO_PA11       ((unsigned int) 1 << 11) // Pin Controlled by PA11
-#define AT91C_PA11_ECRS_ECRSDV ((unsigned int) AT91C_PIO_PA11) //  Ethernet MAC Carrier Sense/Carrier Sense and Data Valid
-#define AT91C_PA11_MCDB2    ((unsigned int) AT91C_PIO_PA11) //  Multimedia Card B Data 2
-#define AT91C_PIO_PA12       ((unsigned int) 1 << 12) // Pin Controlled by PA12
-#define AT91C_PA12_ERX0     ((unsigned int) AT91C_PIO_PA12) //  Ethernet MAC Receive Data 0
-#define AT91C_PA12_MCDB3    ((unsigned int) AT91C_PIO_PA12) //  Multimedia Card B Data 3
-#define AT91C_PIO_PA13       ((unsigned int) 1 << 13) // Pin Controlled by PA13
-#define AT91C_PA13_ERX1     ((unsigned int) AT91C_PIO_PA13) //  Ethernet MAC Receive Data 1
-#define AT91C_PA13_TCLK0    ((unsigned int) AT91C_PIO_PA13) //  Timer Counter 0 external clock input
-#define AT91C_PIO_PA14       ((unsigned int) 1 << 14) // Pin Controlled by PA14
-#define AT91C_PA14_ERXER    ((unsigned int) AT91C_PIO_PA14) //  Ethernet MAC Receive Error
-#define AT91C_PA14_TCLK1    ((unsigned int) AT91C_PIO_PA14) //  Timer Counter 1 external clock input
-#define AT91C_PIO_PA15       ((unsigned int) 1 << 15) // Pin Controlled by PA15
-#define AT91C_PA15_EMDC     ((unsigned int) AT91C_PIO_PA15) //  Ethernet MAC Management Data Clock
-#define AT91C_PA15_TCLK2    ((unsigned int) AT91C_PIO_PA15) //  Timer Counter 2 external clock input
-#define AT91C_PIO_PA16       ((unsigned int) 1 << 16) // Pin Controlled by PA16
-#define AT91C_PA16_EMDIO    ((unsigned int) AT91C_PIO_PA16) //  Ethernet MAC Management Data Input/Output
-#define AT91C_PA16_IRQ6     ((unsigned int) AT91C_PIO_PA16) //  AIC Interrupt input 6
-#define AT91C_PIO_PA17       ((unsigned int) 1 << 17) // Pin Controlled by PA17
-#define AT91C_PA17_TXD0     ((unsigned int) AT91C_PIO_PA17) //  USART 0 Transmit Data
-#define AT91C_PA17_TIOA0    ((unsigned int) AT91C_PIO_PA17) //  Timer Counter 0 Multipurpose Timer I/O Pin A
-#define AT91C_PIO_PA18       ((unsigned int) 1 << 18) // Pin Controlled by PA18
-#define AT91C_PA18_RXD0     ((unsigned int) AT91C_PIO_PA18) //  USART 0 Receive Data
-#define AT91C_PA18_TIOB0    ((unsigned int) AT91C_PIO_PA18) //  Timer Counter 0 Multipurpose Timer I/O Pin B
-#define AT91C_PIO_PA19       ((unsigned int) 1 << 19) // Pin Controlled by PA19
-#define AT91C_PA19_SCK0     ((unsigned int) AT91C_PIO_PA19) //  USART 0 Serial Clock
-#define AT91C_PA19_TIOA1    ((unsigned int) AT91C_PIO_PA19) //  Timer Counter 1 Multipurpose Timer I/O Pin A
-#define AT91C_PIO_PA2        ((unsigned int) 1 <<  2) // Pin Controlled by PA2
-#define AT91C_PA2_SPCK     ((unsigned int) AT91C_PIO_PA2) //  SPI Serial Clock
-#define AT91C_PA2_IRQ4     ((unsigned int) AT91C_PIO_PA2) //  AIC Interrupt Input 4
-#define AT91C_PIO_PA20       ((unsigned int) 1 << 20) // Pin Controlled by PA20
-#define AT91C_PA20_CTS0     ((unsigned int) AT91C_PIO_PA20) //  USART 0 Clear To Send
-#define AT91C_PA20_TIOB1    ((unsigned int) AT91C_PIO_PA20) //  Timer Counter 1 Multipurpose Timer I/O Pin B
-#define AT91C_PIO_PA21       ((unsigned int) 1 << 21) // Pin Controlled by PA21
-#define AT91C_PA21_RTS0     ((unsigned int) AT91C_PIO_PA21) //  Usart 0 Ready To Send
-#define AT91C_PA21_TIOA2    ((unsigned int) AT91C_PIO_PA21) //  Timer Counter 2 Multipurpose Timer I/O Pin A
-#define AT91C_PIO_PA22       ((unsigned int) 1 << 22) // Pin Controlled by PA22
-#define AT91C_PA22_RXD2     ((unsigned int) AT91C_PIO_PA22) //  USART 2 Receive Data
-#define AT91C_PA22_TIOB2    ((unsigned int) AT91C_PIO_PA22) //  Timer Counter 2 Multipurpose Timer I/O Pin B
-#define AT91C_PIO_PA23       ((unsigned int) 1 << 23) // Pin Controlled by PA23
-#define AT91C_PA23_TXD2     ((unsigned int) AT91C_PIO_PA23) //  USART 2 Transmit Data
-#define AT91C_PA23_IRQ3     ((unsigned int) AT91C_PIO_PA23) //  Interrupt input 3
-#define AT91C_PIO_PA24       ((unsigned int) 1 << 24) // Pin Controlled by PA24
-#define AT91C_PA24_SCK2     ((unsigned int) AT91C_PIO_PA24) //  USART2 Serial Clock
-#define AT91C_PA24_PCK1     ((unsigned int) AT91C_PIO_PA24) //  PMC Programmable Clock Output 1
-#define AT91C_PIO_PA25       ((unsigned int) 1 << 25) // Pin Controlled by PA25
-#define AT91C_PA25_TWD      ((unsigned int) AT91C_PIO_PA25) //  TWI Two-wire Serial Data
-#define AT91C_PA25_IRQ2     ((unsigned int) AT91C_PIO_PA25) //  Interrupt input 2
-#define AT91C_PIO_PA26       ((unsigned int) 1 << 26) // Pin Controlled by PA26
-#define AT91C_PA26_TWCK     ((unsigned int) AT91C_PIO_PA26) //  TWI Two-wire Serial Clock
-#define AT91C_PA26_IRQ1     ((unsigned int) AT91C_PIO_PA26) //  Interrupt input 1
-#define AT91C_PIO_PA27       ((unsigned int) 1 << 27) // Pin Controlled by PA27
-#define AT91C_PA27_MCCK     ((unsigned int) AT91C_PIO_PA27) //  Multimedia Card Clock
-#define AT91C_PA27_TCLK3    ((unsigned int) AT91C_PIO_PA27) //  Timer Counter 3 External Clock Input
-#define AT91C_PIO_PA28       ((unsigned int) 1 << 28) // Pin Controlled by PA28
-#define AT91C_PA28_MCCDA    ((unsigned int) AT91C_PIO_PA28) //  Multimedia Card A Command
-#define AT91C_PA28_TCLK4    ((unsigned int) AT91C_PIO_PA28) //  Timer Counter 4 external Clock Input
-#define AT91C_PIO_PA29       ((unsigned int) 1 << 29) // Pin Controlled by PA29
-#define AT91C_PA29_MCDA0    ((unsigned int) AT91C_PIO_PA29) //  Multimedia Card A Data 0
-#define AT91C_PA29_TCLK5    ((unsigned int) AT91C_PIO_PA29) //  Timer Counter 5 external clock input
-#define AT91C_PIO_PA3        ((unsigned int) 1 <<  3) // Pin Controlled by PA3
-#define AT91C_PA3_NPCS0    ((unsigned int) AT91C_PIO_PA3) //  SPI Peripheral Chip Select 0
-#define AT91C_PA3_IRQ5     ((unsigned int) AT91C_PIO_PA3) //  AIC Interrupt Input 5
-#define AT91C_PIO_PA30       ((unsigned int) 1 << 30) // Pin Controlled by PA30
-#define AT91C_PA30_DRXD     ((unsigned int) AT91C_PIO_PA30) //  DBGU Debug Receive Data
-#define AT91C_PA30_CTS2     ((unsigned int) AT91C_PIO_PA30) //  Usart 2 Clear To Send
-#define AT91C_PIO_PA31       ((unsigned int) 1 << 31) // Pin Controlled by PA31
-#define AT91C_PA31_DTXD     ((unsigned int) AT91C_PIO_PA31) //  DBGU Debug Transmit Data
-#define AT91C_PA31_RTS2     ((unsigned int) AT91C_PIO_PA31) //  USART 2 Ready To Send
-#define AT91C_PIO_PA4        ((unsigned int) 1 <<  4) // Pin Controlled by PA4
-#define AT91C_PA4_NPCS1    ((unsigned int) AT91C_PIO_PA4) //  SPI Peripheral Chip Select 1
-#define AT91C_PA4_PCK1     ((unsigned int) AT91C_PIO_PA4) //  PMC Programmable Clock Output 1
-#define AT91C_PIO_PA5        ((unsigned int) 1 <<  5) // Pin Controlled by PA5
-#define AT91C_PA5_NPCS2    ((unsigned int) AT91C_PIO_PA5) //  SPI Peripheral Chip Select 2
-#define AT91C_PA5_TXD3     ((unsigned int) AT91C_PIO_PA5) //  USART 3 Transmit Data
-#define AT91C_PIO_PA6        ((unsigned int) 1 <<  6) // Pin Controlled by PA6
-#define AT91C_PA6_NPCS3    ((unsigned int) AT91C_PIO_PA6) //  SPI Peripheral Chip Select 3
-#define AT91C_PA6_RXD3     ((unsigned int) AT91C_PIO_PA6) //  USART 3 Receive Data
-#define AT91C_PIO_PA7        ((unsigned int) 1 <<  7) // Pin Controlled by PA7
-#define AT91C_PA7_ETXCK_EREFCK ((unsigned int) AT91C_PIO_PA7) //  Ethernet MAC Transmit Clock/Reference Clock
-#define AT91C_PA7_PCK2     ((unsigned int) AT91C_PIO_PA7) //  PMC Programmable Clock 2
-#define AT91C_PIO_PA8        ((unsigned int) 1 <<  8) // Pin Controlled by PA8
-#define AT91C_PA8_ETXEN    ((unsigned int) AT91C_PIO_PA8) //  Ethernet MAC Transmit Enable
-#define AT91C_PA8_MCCDB    ((unsigned int) AT91C_PIO_PA8) //  Multimedia Card B Command
-#define AT91C_PIO_PA9        ((unsigned int) 1 <<  9) // Pin Controlled by PA9
-#define AT91C_PA9_ETX0     ((unsigned int) AT91C_PIO_PA9) //  Ethernet MAC Transmit Data 0
-#define AT91C_PA9_MCDB0    ((unsigned int) AT91C_PIO_PA9) //  Multimedia Card B Data 0
-#define AT91C_PIO_PB0        ((unsigned int) 1 <<  0) // Pin Controlled by PB0
-#define AT91C_PB0_TF0      ((unsigned int) AT91C_PIO_PB0) //  SSC Transmit Frame Sync 0
-#define AT91C_PB0_TIOB3    ((unsigned int) AT91C_PIO_PB0) //  Timer Counter 3 Multipurpose Timer I/O Pin B
-#define AT91C_PIO_PB1        ((unsigned int) 1 <<  1) // Pin Controlled by PB1
-#define AT91C_PB1_TK0      ((unsigned int) AT91C_PIO_PB1) //  SSC Transmit Clock 0
-#define AT91C_PB1_CTS3     ((unsigned int) AT91C_PIO_PB1) //  USART 3 Clear To Send
-#define AT91C_PIO_PB10       ((unsigned int) 1 << 10) // Pin Controlled by PB10
-#define AT91C_PB10_RK1      ((unsigned int) AT91C_PIO_PB10) //  SSC Receive Clock 1
-#define AT91C_PB10_TIOA5    ((unsigned int) AT91C_PIO_PB10) //  Timer Counter 5 Multipurpose Timer I/O Pin A
-#define AT91C_PIO_PB11       ((unsigned int) 1 << 11) // Pin Controlled by PB11
-#define AT91C_PB11_RF1      ((unsigned int) AT91C_PIO_PB11) //  SSC Receive Frame Sync 1
-#define AT91C_PB11_TIOB5    ((unsigned int) AT91C_PIO_PB11) //  Timer Counter 5 Multipurpose Timer I/O Pin B
-#define AT91C_PIO_PB12       ((unsigned int) 1 << 12) // Pin Controlled by PB12
-#define AT91C_PB12_TF2      ((unsigned int) AT91C_PIO_PB12) //  SSC Transmit Frame Sync 2
-#define AT91C_PB12_ETX2     ((unsigned int) AT91C_PIO_PB12) //  Ethernet MAC Transmit Data 2
-#define AT91C_PIO_PB13       ((unsigned int) 1 << 13) // Pin Controlled by PB13
-#define AT91C_PB13_TK2      ((unsigned int) AT91C_PIO_PB13) //  SSC Transmit Clock 2
-#define AT91C_PB13_ETX3     ((unsigned int) AT91C_PIO_PB13) //  Ethernet MAC Transmit Data 3
-#define AT91C_PIO_PB14       ((unsigned int) 1 << 14) // Pin Controlled by PB14
-#define AT91C_PB14_TD2      ((unsigned int) AT91C_PIO_PB14) //  SSC Transmit Data 2
-#define AT91C_PB14_ETXER    ((unsigned int) AT91C_PIO_PB14) //  Ethernet MAC Transmikt Coding Error
-#define AT91C_PIO_PB15       ((unsigned int) 1 << 15) // Pin Controlled by PB15
-#define AT91C_PB15_RD2      ((unsigned int) AT91C_PIO_PB15) //  SSC Receive Data 2
-#define AT91C_PB15_ERX2     ((unsigned int) AT91C_PIO_PB15) //  Ethernet MAC Receive Data 2
-#define AT91C_PIO_PB16       ((unsigned int) 1 << 16) // Pin Controlled by PB16
-#define AT91C_PB16_RK2      ((unsigned int) AT91C_PIO_PB16) //  SSC Receive Clock 2
-#define AT91C_PB16_ERX3     ((unsigned int) AT91C_PIO_PB16) //  Ethernet MAC Receive Data 3
-#define AT91C_PIO_PB17       ((unsigned int) 1 << 17) // Pin Controlled by PB17
-#define AT91C_PB17_RF2      ((unsigned int) AT91C_PIO_PB17) //  SSC Receive Frame Sync 2
-#define AT91C_PB17_ERXDV    ((unsigned int) AT91C_PIO_PB17) //  Ethernet MAC Receive Data Valid
-#define AT91C_PIO_PB18       ((unsigned int) 1 << 18) // Pin Controlled by PB18
-#define AT91C_PB18_RI1      ((unsigned int) AT91C_PIO_PB18) //  USART 1 Ring Indicator
-#define AT91C_PB18_ECOL     ((unsigned int) AT91C_PIO_PB18) //  Ethernet MAC Collision Detected
-#define AT91C_PIO_PB19       ((unsigned int) 1 << 19) // Pin Controlled by PB19
-#define AT91C_PB19_DTR1     ((unsigned int) AT91C_PIO_PB19) //  USART 1 Data Terminal ready
-#define AT91C_PB19_ERXCK    ((unsigned int) AT91C_PIO_PB19) //  Ethernet MAC Receive Clock
-#define AT91C_PIO_PB2        ((unsigned int) 1 <<  2) // Pin Controlled by PB2
-#define AT91C_PB2_TD0      ((unsigned int) AT91C_PIO_PB2) //  SSC Transmit data
-#define AT91C_PB2_SCK3     ((unsigned int) AT91C_PIO_PB2) //  USART 3 Serial Clock
-#define AT91C_PIO_PB20       ((unsigned int) 1 << 20) // Pin Controlled by PB20
-#define AT91C_PB20_TXD1     ((unsigned int) AT91C_PIO_PB20) //  USART 1 Transmit Data
-#define AT91C_PIO_PB21       ((unsigned int) 1 << 21) // Pin Controlled by PB21
-#define AT91C_PB21_RXD1     ((unsigned int) AT91C_PIO_PB21) //  USART 1 Receive Data
-#define AT91C_PIO_PB22       ((unsigned int) 1 << 22) // Pin Controlled by PB22
-#define AT91C_PB22_SCK1     ((unsigned int) AT91C_PIO_PB22) //  USART1 Serial Clock
-#define AT91C_PIO_PB23       ((unsigned int) 1 << 23) // Pin Controlled by PB23
-#define AT91C_PB23_DCD1     ((unsigned int) AT91C_PIO_PB23) //  USART 1 Data Carrier Detect
-#define AT91C_PIO_PB24       ((unsigned int) 1 << 24) // Pin Controlled by PB24
-#define AT91C_PB24_CTS1     ((unsigned int) AT91C_PIO_PB24) //  USART 1 Clear To Send
-#define AT91C_PIO_PB25       ((unsigned int) 1 << 25) // Pin Controlled by PB25
-#define AT91C_PB25_DSR1     ((unsigned int) AT91C_PIO_PB25) //  USART 1 Data Set ready
-#define AT91C_PB25_EF100    ((unsigned int) AT91C_PIO_PB25) //  Ethernet MAC Force 100 Mbits/sec
-#define AT91C_PIO_PB26       ((unsigned int) 1 << 26) // Pin Controlled by PB26
-#define AT91C_PB26_RTS1     ((unsigned int) AT91C_PIO_PB26) //  Usart 0 Ready To Send
-#define AT91C_PIO_PB27       ((unsigned int) 1 << 27) // Pin Controlled by PB27
-#define AT91C_PB27_PCK0     ((unsigned int) AT91C_PIO_PB27) //  PMC Programmable Clock Output 0
-#define AT91C_PIO_PB28       ((unsigned int) 1 << 28) // Pin Controlled by PB28
-#define AT91C_PB28_FIQ      ((unsigned int) AT91C_PIO_PB28) //  AIC Fast Interrupt Input
-#define AT91C_PIO_PB29       ((unsigned int) 1 << 29) // Pin Controlled by PB29
-#define AT91C_PB29_IRQ0     ((unsigned int) AT91C_PIO_PB29) //  Interrupt input 0
-#define AT91C_PIO_PB3        ((unsigned int) 1 <<  3) // Pin Controlled by PB3
-#define AT91C_PB3_RD0      ((unsigned int) AT91C_PIO_PB3) //  SSC Receive Data
-#define AT91C_PB3_MCDA1    ((unsigned int) AT91C_PIO_PB3) //  Multimedia Card A Data 1
-#define AT91C_PIO_PB4        ((unsigned int) 1 <<  4) // Pin Controlled by PB4
-#define AT91C_PB4_RK0      ((unsigned int) AT91C_PIO_PB4) //  SSC Receive Clock
-#define AT91C_PB4_MCDA2    ((unsigned int) AT91C_PIO_PB4) //  Multimedia Card A Data 2
-#define AT91C_PIO_PB5        ((unsigned int) 1 <<  5) // Pin Controlled by PB5
-#define AT91C_PB5_RF0      ((unsigned int) AT91C_PIO_PB5) //  SSC Receive Frame Sync 0
-#define AT91C_PB5_MCDA3    ((unsigned int) AT91C_PIO_PB5) //  Multimedia Card A Data 3
-#define AT91C_PIO_PB6        ((unsigned int) 1 <<  6) // Pin Controlled by PB6
-#define AT91C_PB6_TF1      ((unsigned int) AT91C_PIO_PB6) //  SSC Transmit Frame Sync 1
-#define AT91C_PB6_TIOA3    ((unsigned int) AT91C_PIO_PB6) //  Timer Counter 4 Multipurpose Timer I/O Pin A
-#define AT91C_PIO_PB7        ((unsigned int) 1 <<  7) // Pin Controlled by PB7
-#define AT91C_PB7_TK1      ((unsigned int) AT91C_PIO_PB7) //  SSC Transmit Clock 1
-#define AT91C_PB7_TIOB3    ((unsigned int) AT91C_PIO_PB7) //  Timer Counter 3 Multipurpose Timer I/O Pin B
-#define AT91C_PIO_PB8        ((unsigned int) 1 <<  8) // Pin Controlled by PB8
-#define AT91C_PB8_TD1      ((unsigned int) AT91C_PIO_PB8) //  SSC Transmit Data 1
-#define AT91C_PB8_TIOA4    ((unsigned int) AT91C_PIO_PB8) //  Timer Counter 4 Multipurpose Timer I/O Pin A
-#define AT91C_PIO_PB9        ((unsigned int) 1 <<  9) // Pin Controlled by PB9
-#define AT91C_PB9_RD1      ((unsigned int) AT91C_PIO_PB9) //  SSC Receive Data 1
-#define AT91C_PB9_TIOB4    ((unsigned int) AT91C_PIO_PB9) //  Timer Counter 4 Multipurpose Timer I/O Pin B
-#define AT91C_PIO_PC0        ((unsigned int) 1 <<  0) // Pin Controlled by PC0
-#define AT91C_PC0_BFCK     ((unsigned int) AT91C_PIO_PC0) //  Burst Flash Clock
-#define AT91C_PIO_PC1        ((unsigned int) 1 <<  1) // Pin Controlled by PC1
-#define AT91C_PC1_BFRDY_SMOE ((unsigned int) AT91C_PIO_PC1) //  Burst Flash Ready
-#define AT91C_PIO_PC10       ((unsigned int) 1 << 10) // Pin Controlled by PC10
-#define AT91C_PC10_NCS4_CFCS ((unsigned int) AT91C_PIO_PC10) //  Compact Flash Chip Select
-#define AT91C_PIO_PC11       ((unsigned int) 1 << 11) // Pin Controlled by PC11
-#define AT91C_PC11_NCS5_CFCE1 ((unsigned int) AT91C_PIO_PC11) //  Chip Select 5 / Compact Flash Chip Enable 1
-#define AT91C_PIO_PC12       ((unsigned int) 1 << 12) // Pin Controlled by PC12
-#define AT91C_PC12_NCS6_CFCE2 ((unsigned int) AT91C_PIO_PC12) //  Chip Select 6 / Compact Flash Chip Enable 2
-#define AT91C_PIO_PC13       ((unsigned int) 1 << 13) // Pin Controlled by PC13
-#define AT91C_PC13_NCS7     ((unsigned int) AT91C_PIO_PC13) //  Chip Select 7
-#define AT91C_PIO_PC14       ((unsigned int) 1 << 14) // Pin Controlled by PC14
-#define AT91C_PIO_PC15       ((unsigned int) 1 << 15) // Pin Controlled by PC15
-#define AT91C_PIO_PC16       ((unsigned int) 1 << 16) // Pin Controlled by PC16
-#define AT91C_PC16_D16      ((unsigned int) AT91C_PIO_PC16) //  Data Bus [16]
-#define AT91C_PIO_PC17       ((unsigned int) 1 << 17) // Pin Controlled by PC17
-#define AT91C_PC17_D17      ((unsigned int) AT91C_PIO_PC17) //  Data Bus [17]
-#define AT91C_PIO_PC18       ((unsigned int) 1 << 18) // Pin Controlled by PC18
-#define AT91C_PC18_D18      ((unsigned int) AT91C_PIO_PC18) //  Data Bus [18]
-#define AT91C_PIO_PC19       ((unsigned int) 1 << 19) // Pin Controlled by PC19
-#define AT91C_PC19_D19      ((unsigned int) AT91C_PIO_PC19) //  Data Bus [19]
-#define AT91C_PIO_PC2        ((unsigned int) 1 <<  2) // Pin Controlled by PC2
-#define AT91C_PC2_BFAVD    ((unsigned int) AT91C_PIO_PC2) //  Burst Flash Address Valid
-#define AT91C_PIO_PC20       ((unsigned int) 1 << 20) // Pin Controlled by PC20
-#define AT91C_PC20_D20      ((unsigned int) AT91C_PIO_PC20) //  Data Bus [20]
-#define AT91C_PIO_PC21       ((unsigned int) 1 << 21) // Pin Controlled by PC21
-#define AT91C_PC21_D21      ((unsigned int) AT91C_PIO_PC21) //  Data Bus [21]
-#define AT91C_PIO_PC22       ((unsigned int) 1 << 22) // Pin Controlled by PC22
-#define AT91C_PC22_D22      ((unsigned int) AT91C_PIO_PC22) //  Data Bus [22]
-#define AT91C_PIO_PC23       ((unsigned int) 1 << 23) // Pin Controlled by PC23
-#define AT91C_PC23_D23      ((unsigned int) AT91C_PIO_PC23) //  Data Bus [23]
-#define AT91C_PIO_PC24       ((unsigned int) 1 << 24) // Pin Controlled by PC24
-#define AT91C_PC24_D24      ((unsigned int) AT91C_PIO_PC24) //  Data Bus [24]
-#define AT91C_PIO_PC25       ((unsigned int) 1 << 25) // Pin Controlled by PC25
-#define AT91C_PC25_D25      ((unsigned int) AT91C_PIO_PC25) //  Data Bus [25]
-#define AT91C_PIO_PC26       ((unsigned int) 1 << 26) // Pin Controlled by PC26
-#define AT91C_PC26_D26      ((unsigned int) AT91C_PIO_PC26) //  Data Bus [26]
-#define AT91C_PIO_PC27       ((unsigned int) 1 << 27) // Pin Controlled by PC27
-#define AT91C_PC27_D27      ((unsigned int) AT91C_PIO_PC27) //  Data Bus [27]
-#define AT91C_PIO_PC28       ((unsigned int) 1 << 28) // Pin Controlled by PC28
-#define AT91C_PC28_D28      ((unsigned int) AT91C_PIO_PC28) //  Data Bus [28]
-#define AT91C_PIO_PC29       ((unsigned int) 1 << 29) // Pin Controlled by PC29
-#define AT91C_PC29_D29      ((unsigned int) AT91C_PIO_PC29) //  Data Bus [29]
-#define AT91C_PIO_PC3        ((unsigned int) 1 <<  3) // Pin Controlled by PC3
-#define AT91C_PC3_BFBAA_SMWE ((unsigned int) AT91C_PIO_PC3) //  Burst Flash Address Advance / SmartMedia Write Enable
-#define AT91C_PIO_PC30       ((unsigned int) 1 << 30) // Pin Controlled by PC30
-#define AT91C_PC30_D30      ((unsigned int) AT91C_PIO_PC30) //  Data Bus [30]
-#define AT91C_PIO_PC31       ((unsigned int) 1 << 31) // Pin Controlled by PC31
-#define AT91C_PC31_D31      ((unsigned int) AT91C_PIO_PC31) //  Data Bus [31]
-#define AT91C_PIO_PC4        ((unsigned int) 1 <<  4) // Pin Controlled by PC4
-#define AT91C_PC4_BFOE     ((unsigned int) AT91C_PIO_PC4) //  Burst Flash Output Enable
-#define AT91C_PIO_PC5        ((unsigned int) 1 <<  5) // Pin Controlled by PC5
-#define AT91C_PC5_BFWE     ((unsigned int) AT91C_PIO_PC5) //  Burst Flash Write Enable
-#define AT91C_PIO_PC6        ((unsigned int) 1 <<  6) // Pin Controlled by PC6
-#define AT91C_PC6_NWAIT    ((unsigned int) AT91C_PIO_PC6) //  NWAIT
-#define AT91C_PIO_PC7        ((unsigned int) 1 <<  7) // Pin Controlled by PC7
-#define AT91C_PC7_A23      ((unsigned int) AT91C_PIO_PC7) //  Address Bus[23]
-#define AT91C_PIO_PC8        ((unsigned int) 1 <<  8) // Pin Controlled by PC8
-#define AT91C_PC8_A24      ((unsigned int) AT91C_PIO_PC8) //  Address Bus[24]
-#define AT91C_PIO_PC9        ((unsigned int) 1 <<  9) // Pin Controlled by PC9
-#define AT91C_PC9_A25_CFRNW ((unsigned int) AT91C_PIO_PC9) //  Address Bus[25] /  Compact Flash Read Not Write
-#define AT91C_PIO_PD0        ((unsigned int) 1 <<  0) // Pin Controlled by PD0
-#define AT91C_PD0_ETX0     ((unsigned int) AT91C_PIO_PD0) //  Ethernet MAC Transmit Data 0
-#define AT91C_PIO_PD1        ((unsigned int) 1 <<  1) // Pin Controlled by PD1
-#define AT91C_PD1_ETX1     ((unsigned int) AT91C_PIO_PD1) //  Ethernet MAC Transmit Data 1
-#define AT91C_PIO_PD10       ((unsigned int) 1 << 10) // Pin Controlled by PD10
-#define AT91C_PD10_PCK3     ((unsigned int) AT91C_PIO_PD10) //  PMC Programmable Clock Output 3
-#define AT91C_PD10_TPS1     ((unsigned int) AT91C_PIO_PD10) //  ETM ARM9 pipeline status 1
-#define AT91C_PIO_PD11       ((unsigned int) 1 << 11) // Pin Controlled by PD11
-#define AT91C_PD11_         ((unsigned int) AT91C_PIO_PD11) //  
-#define AT91C_PD11_TPS2     ((unsigned int) AT91C_PIO_PD11) //  ETM ARM9 pipeline status 2
-#define AT91C_PIO_PD12       ((unsigned int) 1 << 12) // Pin Controlled by PD12
-#define AT91C_PD12_         ((unsigned int) AT91C_PIO_PD12) //  
-#define AT91C_PD12_TPK0     ((unsigned int) AT91C_PIO_PD12) //  ETM Trace Packet 0
-#define AT91C_PIO_PD13       ((unsigned int) 1 << 13) // Pin Controlled by PD13
-#define AT91C_PD13_         ((unsigned int) AT91C_PIO_PD13) //  
-#define AT91C_PD13_TPK1     ((unsigned int) AT91C_PIO_PD13) //  ETM Trace Packet 1
-#define AT91C_PIO_PD14       ((unsigned int) 1 << 14) // Pin Controlled by PD14
-#define AT91C_PD14_         ((unsigned int) AT91C_PIO_PD14) //  
-#define AT91C_PD14_TPK2     ((unsigned int) AT91C_PIO_PD14) //  ETM Trace Packet 2
-#define AT91C_PIO_PD15       ((unsigned int) 1 << 15) // Pin Controlled by PD15
-#define AT91C_PD15_TD0      ((unsigned int) AT91C_PIO_PD15) //  SSC Transmit data
-#define AT91C_PD15_TPK3     ((unsigned int) AT91C_PIO_PD15) //  ETM Trace Packet 3
-#define AT91C_PIO_PD16       ((unsigned int) 1 << 16) // Pin Controlled by PD16
-#define AT91C_PD16_TD1      ((unsigned int) AT91C_PIO_PD16) //  SSC Transmit Data 1
-#define AT91C_PD16_TPK4     ((unsigned int) AT91C_PIO_PD16) //  ETM Trace Packet 4
-#define AT91C_PIO_PD17       ((unsigned int) 1 << 17) // Pin Controlled by PD17
-#define AT91C_PD17_TD2      ((unsigned int) AT91C_PIO_PD17) //  SSC Transmit Data 2
-#define AT91C_PD17_TPK5     ((unsigned int) AT91C_PIO_PD17) //  ETM Trace Packet 5
-#define AT91C_PIO_PD18       ((unsigned int) 1 << 18) // Pin Controlled by PD18
-#define AT91C_PD18_NPCS1    ((unsigned int) AT91C_PIO_PD18) //  SPI Peripheral Chip Select 1
-#define AT91C_PD18_TPK6     ((unsigned int) AT91C_PIO_PD18) //  ETM Trace Packet 6
-#define AT91C_PIO_PD19       ((unsigned int) 1 << 19) // Pin Controlled by PD19
-#define AT91C_PD19_NPCS2    ((unsigned int) AT91C_PIO_PD19) //  SPI Peripheral Chip Select 2
-#define AT91C_PD19_TPK7     ((unsigned int) AT91C_PIO_PD19) //  ETM Trace Packet 7
-#define AT91C_PIO_PD2        ((unsigned int) 1 <<  2) // Pin Controlled by PD2
-#define AT91C_PD2_ETX2     ((unsigned int) AT91C_PIO_PD2) //  Ethernet MAC Transmit Data 2
-#define AT91C_PIO_PD20       ((unsigned int) 1 << 20) // Pin Controlled by PD20
-#define AT91C_PD20_NPCS3    ((unsigned int) AT91C_PIO_PD20) //  SPI Peripheral Chip Select 3
-#define AT91C_PD20_TPK8     ((unsigned int) AT91C_PIO_PD20) //  ETM Trace Packet 8
-#define AT91C_PIO_PD21       ((unsigned int) 1 << 21) // Pin Controlled by PD21
-#define AT91C_PD21_RTS0     ((unsigned int) AT91C_PIO_PD21) //  Usart 0 Ready To Send
-#define AT91C_PD21_TPK9     ((unsigned int) AT91C_PIO_PD21) //  ETM Trace Packet 9
-#define AT91C_PIO_PD22       ((unsigned int) 1 << 22) // Pin Controlled by PD22
-#define AT91C_PD22_RTS1     ((unsigned int) AT91C_PIO_PD22) //  Usart 0 Ready To Send
-#define AT91C_PD22_TPK10    ((unsigned int) AT91C_PIO_PD22) //  ETM Trace Packet 10
-#define AT91C_PIO_PD23       ((unsigned int) 1 << 23) // Pin Controlled by PD23
-#define AT91C_PD23_RTS2     ((unsigned int) AT91C_PIO_PD23) //  USART 2 Ready To Send
-#define AT91C_PD23_TPK11    ((unsigned int) AT91C_PIO_PD23) //  ETM Trace Packet 11
-#define AT91C_PIO_PD24       ((unsigned int) 1 << 24) // Pin Controlled by PD24
-#define AT91C_PD24_RTS3     ((unsigned int) AT91C_PIO_PD24) //  USART 3 Ready To Send
-#define AT91C_PD24_TPK12    ((unsigned int) AT91C_PIO_PD24) //  ETM Trace Packet 12
-#define AT91C_PIO_PD25       ((unsigned int) 1 << 25) // Pin Controlled by PD25
-#define AT91C_PD25_DTR1     ((unsigned int) AT91C_PIO_PD25) //  USART 1 Data Terminal ready
-#define AT91C_PD25_TPK13    ((unsigned int) AT91C_PIO_PD25) //  ETM Trace Packet 13
-#define AT91C_PIO_PD26       ((unsigned int) 1 << 26) // Pin Controlled by PD26
-#define AT91C_PD26_TPK14    ((unsigned int) AT91C_PIO_PD26) //  ETM Trace Packet 14
-#define AT91C_PIO_PD27       ((unsigned int) 1 << 27) // Pin Controlled by PD27
-#define AT91C_PD27_TPK15    ((unsigned int) AT91C_PIO_PD27) //  ETM Trace Packet 15
-#define AT91C_PIO_PD3        ((unsigned int) 1 <<  3) // Pin Controlled by PD3
-#define AT91C_PD3_ETX3     ((unsigned int) AT91C_PIO_PD3) //  Ethernet MAC Transmit Data 3
-#define AT91C_PIO_PD4        ((unsigned int) 1 <<  4) // Pin Controlled by PD4
-#define AT91C_PD4_ETXEN    ((unsigned int) AT91C_PIO_PD4) //  Ethernet MAC Transmit Enable
-#define AT91C_PIO_PD5        ((unsigned int) 1 <<  5) // Pin Controlled by PD5
-#define AT91C_PD5_ETXER    ((unsigned int) AT91C_PIO_PD5) //  Ethernet MAC Transmikt Coding Error
-#define AT91C_PIO_PD6        ((unsigned int) 1 <<  6) // Pin Controlled by PD6
-#define AT91C_PD6_DTXD     ((unsigned int) AT91C_PIO_PD6) //  DBGU Debug Transmit Data
-#define AT91C_PIO_PD7        ((unsigned int) 1 <<  7) // Pin Controlled by PD7
-#define AT91C_PD7_PCK0     ((unsigned int) AT91C_PIO_PD7) //  PMC Programmable Clock Output 0
-#define AT91C_PD7_TSYNC    ((unsigned int) AT91C_PIO_PD7) //  ETM Synchronization signal
-#define AT91C_PIO_PD8        ((unsigned int) 1 <<  8) // Pin Controlled by PD8
-#define AT91C_PD8_PCK1     ((unsigned int) AT91C_PIO_PD8) //  PMC Programmable Clock Output 1
-#define AT91C_PD8_TCLK     ((unsigned int) AT91C_PIO_PD8) //  ETM Trace Clock signal
-#define AT91C_PIO_PD9        ((unsigned int) 1 <<  9) // Pin Controlled by PD9
-#define AT91C_PD9_PCK2     ((unsigned int) AT91C_PIO_PD9) //  PMC Programmable Clock 2
-#define AT91C_PD9_TPS0     ((unsigned int) AT91C_PIO_PD9) //  ETM ARM9 pipeline status 0
-
-// *****************************************************************************
-//               PERIPHERAL ID DEFINITIONS FOR AT91RM9200
-// *****************************************************************************
-#define AT91C_ID_FIQ    ((unsigned int)  0) // Advanced Interrupt Controller (FIQ)
-#define AT91C_ID_SYS    ((unsigned int)  1) // System Peripheral
-#define AT91C_ID_PIOA   ((unsigned int)  2) // Parallel IO Controller A 
-#define AT91C_ID_PIOB   ((unsigned int)  3) // Parallel IO Controller B
-#define AT91C_ID_PIOC   ((unsigned int)  4) // Parallel IO Controller C
-#define AT91C_ID_PIOD   ((unsigned int)  5) // Parallel IO Controller D
-#define AT91C_ID_US0    ((unsigned int)  6) // USART 0
-#define AT91C_ID_US1    ((unsigned int)  7) // USART 1
-#define AT91C_ID_US2    ((unsigned int)  8) // USART 2
-#define AT91C_ID_US3    ((unsigned int)  9) // USART 3
-#define AT91C_ID_MCI    ((unsigned int) 10) // Multimedia Card Interface
-#define AT91C_ID_UDP    ((unsigned int) 11) // USB Device Port
-#define AT91C_ID_TWI    ((unsigned int) 12) // Two-Wire Interface
-#define AT91C_ID_SPI    ((unsigned int) 13) // Serial Peripheral Interface
-#define AT91C_ID_SSC0   ((unsigned int) 14) // Serial Synchronous Controller 0
-#define AT91C_ID_SSC1   ((unsigned int) 15) // Serial Synchronous Controller 1
-#define AT91C_ID_SSC2   ((unsigned int) 16) // Serial Synchronous Controller 2
-#define AT91C_ID_TC0    ((unsigned int) 17) // Timer Counter 0
-#define AT91C_ID_TC1    ((unsigned int) 18) // Timer Counter 1
-#define AT91C_ID_TC2    ((unsigned int) 19) // Timer Counter 2
-#define AT91C_ID_TC3    ((unsigned int) 20) // Timer Counter 3
-#define AT91C_ID_TC4    ((unsigned int) 21) // Timer Counter 4
-#define AT91C_ID_TC5    ((unsigned int) 22) // Timer Counter 5
-#define AT91C_ID_UHP    ((unsigned int) 23) // USB Host port
-#define AT91C_ID_EMAC   ((unsigned int) 24) // Ethernet MAC
-#define AT91C_ID_IRQ0   ((unsigned int) 25) // Advanced Interrupt Controller (IRQ0)
-#define AT91C_ID_IRQ1   ((unsigned int) 26) // Advanced Interrupt Controller (IRQ1)
-#define AT91C_ID_IRQ2   ((unsigned int) 27) // Advanced Interrupt Controller (IRQ2)
-#define AT91C_ID_IRQ3   ((unsigned int) 28) // Advanced Interrupt Controller (IRQ3)
-#define AT91C_ID_IRQ4   ((unsigned int) 29) // Advanced Interrupt Controller (IRQ4)
-#define AT91C_ID_IRQ5   ((unsigned int) 30) // Advanced Interrupt Controller (IRQ5)
-#define AT91C_ID_IRQ6   ((unsigned int) 31) // Advanced Interrupt Controller (IRQ6)
-
-// *****************************************************************************
-//               BASE ADDRESS DEFINITIONS FOR AT91RM9200
-// *****************************************************************************
-#define AT91C_BASE_SYS       ((AT91PS_SYS) 	0xFFFFF000) // (SYS) Base Address
-#define AT91C_BASE_MC        ((AT91PS_MC) 	0xFFFFFF00) // (MC) Base Address
-#define AT91C_BASE_RTC       ((AT91PS_RTC) 	0xFFFFFE00) // (RTC) Base Address
-#define AT91C_BASE_ST        ((AT91PS_ST) 	0xFFFFFD00) // (ST) Base Address
-#define AT91C_BASE_PMC       ((AT91PS_PMC) 	0xFFFFFC00) // (PMC) Base Address
-#define AT91C_BASE_CKGR      ((AT91PS_CKGR) 	0xFFFFFC20) // (CKGR) Base Address
-#define AT91C_BASE_PIOD      ((AT91PS_PIO) 	0xFFFFFA00) // (PIOD) Base Address
-#define AT91C_BASE_PIOC      ((AT91PS_PIO) 	0xFFFFF800) // (PIOC) Base Address
-#define AT91C_BASE_PIOB      ((AT91PS_PIO) 	0xFFFFF600) // (PIOB) Base Address
-#define AT91C_BASE_PIOA      ((AT91PS_PIO) 	0xFFFFF400) // (PIOA) Base Address
-#define AT91C_BASE_DBGU      ((AT91PS_DBGU) 	0xFFFFF200) // (DBGU) Base Address
-#define AT91C_BASE_PDC_DBGU  ((AT91PS_PDC) 	0xFFFFF300) // (PDC_DBGU) Base Address
-#define AT91C_BASE_AIC       ((AT91PS_AIC) 	0xFFFFF000) // (AIC) Base Address
-#define AT91C_BASE_PDC_SPI   ((AT91PS_PDC) 	0xFFFE0100) // (PDC_SPI) Base Address
-#define AT91C_BASE_SPI       ((AT91PS_SPI) 	0xFFFE0000) // (SPI) Base Address
-#define AT91C_BASE_PDC_SSC2  ((AT91PS_PDC) 	0xFFFD8100) // (PDC_SSC2) Base Address
-#define AT91C_BASE_SSC2      ((AT91PS_SSC) 	0xFFFD8000) // (SSC2) Base Address
-#define AT91C_BASE_PDC_SSC1  ((AT91PS_PDC) 	0xFFFD4100) // (PDC_SSC1) Base Address
-#define AT91C_BASE_SSC1      ((AT91PS_SSC) 	0xFFFD4000) // (SSC1) Base Address
-#define AT91C_BASE_PDC_SSC0  ((AT91PS_PDC) 	0xFFFD0100) // (PDC_SSC0) Base Address
-#define AT91C_BASE_SSC0      ((AT91PS_SSC) 	0xFFFD0000) // (SSC0) Base Address
-#define AT91C_BASE_PDC_US3   ((AT91PS_PDC) 	0xFFFCC100) // (PDC_US3) Base Address
-#define AT91C_BASE_US3       ((AT91PS_USART) 	0xFFFCC000) // (US3) Base Address
-#define AT91C_BASE_PDC_US2   ((AT91PS_PDC) 	0xFFFC8100) // (PDC_US2) Base Address
-#define AT91C_BASE_US2       ((AT91PS_USART) 	0xFFFC8000) // (US2) Base Address
-#define AT91C_BASE_PDC_US1   ((AT91PS_PDC) 	0xFFFC4100) // (PDC_US1) Base Address
-#define AT91C_BASE_US1       ((AT91PS_USART) 	0xFFFC4000) // (US1) Base Address
-#define AT91C_BASE_PDC_US0   ((AT91PS_PDC) 	0xFFFC0100) // (PDC_US0) Base Address
-#define AT91C_BASE_US0       ((AT91PS_USART) 	0xFFFC0000) // (US0) Base Address
-#define AT91C_BASE_TWI       ((AT91PS_TWI) 	0xFFFB8000) // (TWI) Base Address
-#define AT91C_BASE_PDC_MCI   ((AT91PS_PDC) 	0xFFFB4100) // (PDC_MCI) Base Address
-#define AT91C_BASE_MCI       ((AT91PS_MCI) 	0xFFFB4000) // (MCI) Base Address
-#define AT91C_BASE_UDP       ((AT91PS_UDP) 	0xFFFB0000) // (UDP) Base Address
-#define AT91C_BASE_TC5       ((AT91PS_TC) 	0xFFFA4080) // (TC5) Base Address
-#define AT91C_BASE_TC4       ((AT91PS_TC) 	0xFFFA4040) // (TC4) Base Address
-#define AT91C_BASE_TC3       ((AT91PS_TC) 	0xFFFA4000) // (TC3) Base Address
-#define AT91C_BASE_TCB1      ((AT91PS_TCB) 	0xFFFA4080) // (TCB1) Base Address
-#define AT91C_BASE_TC2       ((AT91PS_TC) 	0xFFFA0080) // (TC2) Base Address
-#define AT91C_BASE_TC1       ((AT91PS_TC) 	0xFFFA0040) // (TC1) Base Address
-#define AT91C_BASE_TC0       ((AT91PS_TC) 	0xFFFA0000) // (TC0) Base Address
-#define AT91C_BASE_TCB0      ((AT91PS_TCB) 	0xFFFA0000) // (TCB0) Base Address
-#define AT91C_BASE_UHP       ((AT91PS_UHP) 	0x00300000) // (UHP) Base Address
-#define AT91C_BASE_EMAC      ((AT91PS_EMAC) 	0xFFFBC000) // (EMAC) Base Address
-#define AT91C_BASE_EBI       ((AT91PS_EBI) 	0xFFFFFF60) // (EBI) Base Address
-#define AT91C_BASE_SMC2      ((AT91PS_SMC2) 	0xFFFFFF70) // (SMC2) Base Address
-#define AT91C_BASE_SDRC      ((AT91PS_SDRC) 	0xFFFFFF90) // (SDRC) Base Address
-#define AT91C_BASE_BFC       ((AT91PS_BFC) 	0xFFFFFFC0) // (BFC) Base Address
-
-// *****************************************************************************
-//               MEMORY MAPPING DEFINITIONS FOR AT91RM9200
-// *****************************************************************************
-#define AT91C_ISRAM	 ((char *) 	0x00200000) // Internal SRAM base address
-#define AT91C_ISRAM_SIZE	 ((unsigned int) 0x00004000) // Internal SRAM size in byte (16 Kbyte)
-#define AT91C_IROM 	 ((char *) 	0x00100000) // Internal ROM base address
-#define AT91C_IROM_SIZE	 ((unsigned int) 0x00020000) // Internal ROM size in byte (128 Kbyte)
-
-#endif
diff --git a/target/linux/at91/image/dfboot/src/include/AT91RM9200.inc b/target/linux/at91/image/dfboot/src/include/AT91RM9200.inc
deleted file mode 100644
index 670e023fb..000000000
--- a/target/linux/at91/image/dfboot/src/include/AT91RM9200.inc
+++ /dev/null
@@ -1,2437 +0,0 @@
-;- ----------------------------------------------------------------------------
-;-          ATMEL Microcontroller Software Support  -  ROUSSET  -
-;- ----------------------------------------------------------------------------
-;-  The software is delivered "AS IS" without warranty or condition of any
-;-  kind, either express, implied or statutory. This includes without
-;-  limitation any warranty or condition with respect to merchantability or
-;-  fitness for any particular purpose, or against the infringements of
-;-  intellectual property rights of others.
-;- ----------------------------------------------------------------------------
-;- File Name           : AT91RM9200.h
-;- Object              : AT91RM9200 definitions
-;- Generated           : AT91 SW Application Group  11/19/2003 (17:20:51)
-;- 
-;- CVS Reference       : /AT91RM9200.pl/1.16/Fri Feb 07 10:29:51 2003//
-;- CVS Reference       : /SYS_AT91RM9200.pl/1.2/Fri Jan 17 12:44:37 2003//
-;- CVS Reference       : /MC_1760A.pl/1.1/Fri Aug 23 14:38:22 2002//
-;- CVS Reference       : /AIC_1796B.pl/1.1.1.1/Fri Jun 28 09:36:47 2002//
-;- CVS Reference       : /PMC_2636A.pl/1.1.1.1/Fri Jun 28 09:36:48 2002//
-;- CVS Reference       : /ST_1763B.pl/1.1/Fri Aug 23 14:41:42 2002//
-;- CVS Reference       : /RTC_1245D.pl/1.2/Fri Jan 31 12:19:06 2003//
-;- CVS Reference       : /PIO_1725D.pl/1.1.1.1/Fri Jun 28 09:36:47 2002//
-;- CVS Reference       : /DBGU_1754A.pl/1.4/Fri Jan 31 12:18:24 2003//
-;- CVS Reference       : /UDP_1765B.pl/1.3/Fri Aug 02 14:45:38 2002//
-;- CVS Reference       : /MCI_1764A.pl/1.2/Thu Nov 14 17:48:24 2002//
-;- CVS Reference       : /US_1739C.pl/1.2/Fri Jul 12 07:49:25 2002//
-;- CVS Reference       : /SPI_AT91RMxxxx.pl/1.3/Tue Nov 26 10:20:29 2002//
-;- CVS Reference       : /SSC_1762A.pl/1.2/Fri Nov 08 13:26:39 2002//
-;- CVS Reference       : /TC_1753B.pl/1.2/Fri Jan 31 12:19:55 2003//
-;- CVS Reference       : /TWI_1761B.pl/1.4/Fri Feb 07 10:30:07 2003//
-;- CVS Reference       : /PDC_1734B.pl/1.2/Thu Nov 21 16:38:23 2002//
-;- CVS Reference       : /UHP_xxxxA.pl/1.1/Mon Jul 22 12:21:58 2002//
-;- CVS Reference       : /EMAC_1794A.pl/1.4/Fri Jan 17 12:11:54 2003//
-;- CVS Reference       : /EBI_1759B.pl/1.10/Fri Jan 17 12:44:29 2003//
-;- CVS Reference       : /SMC_1783A.pl/1.3/Thu Oct 31 14:38:17 2002//
-;- CVS Reference       : /SDRC_1758B.pl/1.2/Thu Oct 03 13:04:41 2002//
-;- CVS Reference       : /BFC_1757B.pl/1.3/Thu Oct 31 14:38:00 2002//
-;- ----------------------------------------------------------------------------
-
-;- Hardware register definition
-
-;- *****************************************************************************
-;-              SOFTWARE API DEFINITION  FOR System Peripherals
-;- *****************************************************************************
-
-;- *****************************************************************************
-;-              SOFTWARE API DEFINITION  FOR Memory Controller Interface
-;- *****************************************************************************
-                ^ 0 ;- AT91S_MC
-MC_RCR          #  4 ;- MC Remap Control Register
-MC_ASR          #  4 ;- MC Abort Status Register
-MC_AASR         #  4 ;- MC Abort Address Status Register
-                #  4 ;- Reserved
-MC_PUIA         # 64 ;- MC Protection Unit Area
-MC_PUP          #  4 ;- MC Protection Unit Peripherals
-MC_PUER         #  4 ;- MC Protection Unit Enable Register
-;- -------- MC_RCR : (MC Offset: 0x0) MC Remap Control Register -------- 
-AT91C_MC_RCB              EQU (0x1:SHL:0) ;- (MC) Remap Command Bit
-;- -------- MC_ASR : (MC Offset: 0x4) MC Abort Status Register -------- 
-AT91C_MC_UNDADD           EQU (0x1:SHL:0) ;- (MC) Undefined Addess Abort Status
-AT91C_MC_MISADD           EQU (0x1:SHL:1) ;- (MC) Misaligned Addess Abort Status
-AT91C_MC_MPU              EQU (0x1:SHL:2) ;- (MC) Memory protection Unit Abort Status
-AT91C_MC_ABTSZ            EQU (0x3:SHL:8) ;- (MC) Abort Size Status
-AT91C_MC_ABTSZ_BYTE       EQU (0x0:SHL:8) ;- (MC) Byte
-AT91C_MC_ABTSZ_HWORD      EQU (0x1:SHL:8) ;- (MC) Half-word
-AT91C_MC_ABTSZ_WORD       EQU (0x2:SHL:8) ;- (MC) Word
-AT91C_MC_ABTTYP           EQU (0x3:SHL:10) ;- (MC) Abort Type Status
-AT91C_MC_ABTTYP_DATAR     EQU (0x0:SHL:10) ;- (MC) Data Read
-AT91C_MC_ABTTYP_DATAW     EQU (0x1:SHL:10) ;- (MC) Data Write
-AT91C_MC_ABTTYP_FETCH     EQU (0x2:SHL:10) ;- (MC) Code Fetch
-AT91C_MC_MST0             EQU (0x1:SHL:16) ;- (MC) Master 0 Abort Source
-AT91C_MC_MST1             EQU (0x1:SHL:17) ;- (MC) Master 1 Abort Source
-AT91C_MC_SVMST0           EQU (0x1:SHL:24) ;- (MC) Saved Master 0 Abort Source
-AT91C_MC_SVMST1           EQU (0x1:SHL:25) ;- (MC) Saved Master 1 Abort Source
-;- -------- MC_PUIA : (MC Offset: 0x10) MC Protection Unit Area -------- 
-AT91C_MC_PROT             EQU (0x3:SHL:0) ;- (MC) Protection
-AT91C_MC_PROT_PNAUNA      EQU (0x0) ;- (MC) Privilege: No Access, User: No Access
-AT91C_MC_PROT_PRWUNA      EQU (0x1) ;- (MC) Privilege: Read/Write, User: No Access
-AT91C_MC_PROT_PRWURO      EQU (0x2) ;- (MC) Privilege: Read/Write, User: Read Only
-AT91C_MC_PROT_PRWURW      EQU (0x3) ;- (MC) Privilege: Read/Write, User: Read/Write
-AT91C_MC_SIZE             EQU (0xF:SHL:4) ;- (MC) Internal Area Size
-AT91C_MC_SIZE_1KB         EQU (0x0:SHL:4) ;- (MC) Area size 1KByte
-AT91C_MC_SIZE_2KB         EQU (0x1:SHL:4) ;- (MC) Area size 2KByte
-AT91C_MC_SIZE_4KB         EQU (0x2:SHL:4) ;- (MC) Area size 4KByte
-AT91C_MC_SIZE_8KB         EQU (0x3:SHL:4) ;- (MC) Area size 8KByte
-AT91C_MC_SIZE_16KB        EQU (0x4:SHL:4) ;- (MC) Area size 16KByte
-AT91C_MC_SIZE_32KB        EQU (0x5:SHL:4) ;- (MC) Area size 32KByte
-AT91C_MC_SIZE_64KB        EQU (0x6:SHL:4) ;- (MC) Area size 64KByte
-AT91C_MC_SIZE_128KB       EQU (0x7:SHL:4) ;- (MC) Area size 128KByte
-AT91C_MC_SIZE_256KB       EQU (0x8:SHL:4) ;- (MC) Area size 256KByte
-AT91C_MC_SIZE_512KB       EQU (0x9:SHL:4) ;- (MC) Area size 512KByte
-AT91C_MC_SIZE_1MB         EQU (0xA:SHL:4) ;- (MC) Area size 1MByte
-AT91C_MC_SIZE_2MB         EQU (0xB:SHL:4) ;- (MC) Area size 2MByte
-AT91C_MC_SIZE_4MB         EQU (0xC:SHL:4) ;- (MC) Area size 4MByte
-AT91C_MC_SIZE_8MB         EQU (0xD:SHL:4) ;- (MC) Area size 8MByte
-AT91C_MC_SIZE_16MB        EQU (0xE:SHL:4) ;- (MC) Area size 16MByte
-AT91C_MC_SIZE_64MB        EQU (0xF:SHL:4) ;- (MC) Area size 64MByte
-AT91C_MC_BA               EQU (0x3FFFF:SHL:10) ;- (MC) Internal Area Base Address
-;- -------- MC_PUP : (MC Offset: 0x50) MC Protection Unit Peripheral -------- 
-;- -------- MC_PUER : (MC Offset: 0x54) MC Protection Unit Area -------- 
-AT91C_MC_PUEB             EQU (0x1:SHL:0) ;- (MC) Protection Unit enable Bit
-
-;- *****************************************************************************
-;-              SOFTWARE API DEFINITION  FOR Real-time Clock Alarm and Parallel Load Interface
-;- *****************************************************************************
-                ^ 0 ;- AT91S_RTC
-RTC_CR          #  4 ;- Control Register
-RTC_MR          #  4 ;- Mode Register
-RTC_TIMR        #  4 ;- Time Register
-RTC_CALR        #  4 ;- Calendar Register
-RTC_TIMALR      #  4 ;- Time Alarm Register
-RTC_CALALR      #  4 ;- Calendar Alarm Register
-RTC_SR          #  4 ;- Status Register
-RTC_SCCR        #  4 ;- Status Clear Command Register
-RTC_IER         #  4 ;- Interrupt Enable Register
-RTC_IDR         #  4 ;- Interrupt Disable Register
-RTC_IMR         #  4 ;- Interrupt Mask Register
-RTC_VER         #  4 ;- Valid Entry Register
-;- -------- RTC_CR : (RTC Offset: 0x0) RTC Control Register -------- 
-AT91C_RTC_UPDTIM          EQU (0x1:SHL:0) ;- (RTC) Update Request Time Register
-AT91C_RTC_UPDCAL          EQU (0x1:SHL:1) ;- (RTC) Update Request Calendar Register
-AT91C_RTC_TIMEVSEL        EQU (0x3:SHL:8) ;- (RTC) Time Event Selection
-AT91C_RTC_TIMEVSEL_MINUTE EQU (0x0:SHL:8) ;- (RTC) Minute change.
-AT91C_RTC_TIMEVSEL_HOUR   EQU (0x1:SHL:8) ;- (RTC) Hour change.
-AT91C_RTC_TIMEVSEL_DAY24  EQU (0x2:SHL:8) ;- (RTC) Every day at midnight.
-AT91C_RTC_TIMEVSEL_DAY12  EQU (0x3:SHL:8) ;- (RTC) Every day at noon.
-AT91C_RTC_CALEVSEL        EQU (0x3:SHL:16) ;- (RTC) Calendar Event Selection
-AT91C_RTC_CALEVSEL_WEEK   EQU (0x0:SHL:16) ;- (RTC) Week change (every Monday at time 00:00:00).
-AT91C_RTC_CALEVSEL_MONTH  EQU (0x1:SHL:16) ;- (RTC) Month change (every 01 of each month at time 00:00:00).
-AT91C_RTC_CALEVSEL_YEAR   EQU (0x2:SHL:16) ;- (RTC) Year change (every January 1 at time 00:00:00).
-;- -------- RTC_MR : (RTC Offset: 0x4) RTC Mode Register -------- 
-AT91C_RTC_HRMOD           EQU (0x1:SHL:0) ;- (RTC) 12-24 hour Mode
-;- -------- RTC_TIMR : (RTC Offset: 0x8) RTC Time Register -------- 
-AT91C_RTC_SEC             EQU (0x7F:SHL:0) ;- (RTC) Current Second
-AT91C_RTC_MIN             EQU (0x7F:SHL:8) ;- (RTC) Current Minute
-AT91C_RTC_HOUR            EQU (0x1F:SHL:16) ;- (RTC) Current Hour
-AT91C_RTC_AMPM            EQU (0x1:SHL:22) ;- (RTC) Ante Meridiem, Post Meridiem Indicator
-;- -------- RTC_CALR : (RTC Offset: 0xc) RTC Calendar Register -------- 
-AT91C_RTC_CENT            EQU (0x3F:SHL:0) ;- (RTC) Current Century
-AT91C_RTC_YEAR            EQU (0xFF:SHL:8) ;- (RTC) Current Year
-AT91C_RTC_MONTH           EQU (0x1F:SHL:16) ;- (RTC) Current Month
-AT91C_RTC_DAY             EQU (0x7:SHL:21) ;- (RTC) Current Day
-AT91C_RTC_DATE            EQU (0x3F:SHL:24) ;- (RTC) Current Date
-;- -------- RTC_TIMALR : (RTC Offset: 0x10) RTC Time Alarm Register -------- 
-AT91C_RTC_SECEN           EQU (0x1:SHL:7) ;- (RTC) Second Alarm Enable
-AT91C_RTC_MINEN           EQU (0x1:SHL:15) ;- (RTC) Minute Alarm
-AT91C_RTC_HOUREN          EQU (0x1:SHL:23) ;- (RTC) Current Hour
-;- -------- RTC_CALALR : (RTC Offset: 0x14) RTC Calendar Alarm Register -------- 
-AT91C_RTC_MONTHEN         EQU (0x1:SHL:23) ;- (RTC) Month Alarm Enable
-AT91C_RTC_DATEEN          EQU (0x1:SHL:31) ;- (RTC) Date Alarm Enable
-;- -------- RTC_SR : (RTC Offset: 0x18) RTC Status Register -------- 
-AT91C_RTC_ACKUPD          EQU (0x1:SHL:0) ;- (RTC) Acknowledge for Update
-AT91C_RTC_ALARM           EQU (0x1:SHL:1) ;- (RTC) Alarm Flag
-AT91C_RTC_SECEV           EQU (0x1:SHL:2) ;- (RTC) Second Event
-AT91C_RTC_TIMEV           EQU (0x1:SHL:3) ;- (RTC) Time Event
-AT91C_RTC_CALEV           EQU (0x1:SHL:4) ;- (RTC) Calendar event
-;- -------- RTC_SCCR : (RTC Offset: 0x1c) RTC Status Clear Command Register -------- 
-;- -------- RTC_IER : (RTC Offset: 0x20) RTC Interrupt Enable Register -------- 
-;- -------- RTC_IDR : (RTC Offset: 0x24) RTC Interrupt Disable Register -------- 
-;- -------- RTC_IMR : (RTC Offset: 0x28) RTC Interrupt Mask Register -------- 
-;- -------- RTC_VER : (RTC Offset: 0x2c) RTC Valid Entry Register -------- 
-AT91C_RTC_NVTIM           EQU (0x1:SHL:0) ;- (RTC) Non valid Time
-AT91C_RTC_NVCAL           EQU (0x1:SHL:1) ;- (RTC) Non valid Calendar
-AT91C_RTC_NVTIMALR        EQU (0x1:SHL:2) ;- (RTC) Non valid time Alarm
-AT91C_RTC_NVCALALR        EQU (0x1:SHL:3) ;- (RTC) Nonvalid Calendar Alarm
-
-;- *****************************************************************************
-;-              SOFTWARE API DEFINITION  FOR System Timer Interface
-;- *****************************************************************************
-                ^ 0 ;- AT91S_ST
-ST_CR           #  4 ;- Control Register
-ST_PIMR         #  4 ;- Period Interval Mode Register
-ST_WDMR         #  4 ;- Watchdog Mode Register
-ST_RTMR         #  4 ;- Real-time Mode Register
-ST_SR           #  4 ;- Status Register
-ST_IER          #  4 ;- Interrupt Enable Register
-ST_IDR          #  4 ;- Interrupt Disable Register
-ST_IMR          #  4 ;- Interrupt Mask Register
-ST_RTAR         #  4 ;- Real-time Alarm Register
-ST_CRTR         #  4 ;- Current Real-time Register
-;- -------- ST_CR : (ST Offset: 0x0) System Timer Control Register -------- 
-AT91C_ST_WDRST            EQU (0x1:SHL:0) ;- (ST) Watchdog Timer Restart
-;- -------- ST_PIMR : (ST Offset: 0x4) System Timer Period Interval Mode Register -------- 
-AT91C_ST_PIV              EQU (0xFFFF:SHL:0) ;- (ST) Watchdog Timer Restart
-;- -------- ST_WDMR : (ST Offset: 0x8) System Timer Watchdog Mode Register -------- 
-AT91C_ST_WDV              EQU (0xFFFF:SHL:0) ;- (ST) Watchdog Timer Restart
-AT91C_ST_RSTEN            EQU (0x1:SHL:16) ;- (ST) Reset Enable
-AT91C_ST_EXTEN            EQU (0x1:SHL:17) ;- (ST) External Signal Assertion Enable
-;- -------- ST_RTMR : (ST Offset: 0xc) System Timer Real-time Mode Register -------- 
-AT91C_ST_RTPRES           EQU (0xFFFF:SHL:0) ;- (ST) Real-time Timer Prescaler Value
-;- -------- ST_SR : (ST Offset: 0x10) System Timer Status Register -------- 
-AT91C_ST_PITS             EQU (0x1:SHL:0) ;- (ST) Period Interval Timer Interrupt
-AT91C_ST_WDOVF            EQU (0x1:SHL:1) ;- (ST) Watchdog Overflow
-AT91C_ST_RTTINC           EQU (0x1:SHL:2) ;- (ST) Real-time Timer Increment
-AT91C_ST_ALMS             EQU (0x1:SHL:3) ;- (ST) Alarm Status
-;- -------- ST_IER : (ST Offset: 0x14) System Timer Interrupt Enable Register -------- 
-;- -------- ST_IDR : (ST Offset: 0x18) System Timer Interrupt Disable Register -------- 
-;- -------- ST_IMR : (ST Offset: 0x1c) System Timer Interrupt Mask Register -------- 
-;- -------- ST_RTAR : (ST Offset: 0x20) System Timer Real-time Alarm Register -------- 
-AT91C_ST_ALMV             EQU (0xFFFFF:SHL:0) ;- (ST) Alarm Value Value
-;- -------- ST_CRTR : (ST Offset: 0x24) System Timer Current Real-time Register -------- 
-AT91C_ST_CRTV             EQU (0xFFFFF:SHL:0) ;- (ST) Current Real-time Value
-
-;- *****************************************************************************
-;-              SOFTWARE API DEFINITION  FOR Power Management Controler
-;- *****************************************************************************
-                ^ 0 ;- AT91S_PMC
-PMC_SCER        #  4 ;- System Clock Enable Register
-PMC_SCDR        #  4 ;- System Clock Disable Register
-PMC_SCSR        #  4 ;- System Clock Status Register
-                #  4 ;- Reserved
-PMC_PCER        #  4 ;- Peripheral Clock Enable Register
-PMC_PCDR        #  4 ;- Peripheral Clock Disable Register
-PMC_PCSR        #  4 ;- Peripheral Clock Status Register
-                # 20 ;- Reserved
-PMC_MCKR        #  4 ;- Master Clock Register
-                # 12 ;- Reserved
-PMC_PCKR        # 32 ;- Programmable Clock Register
-PMC_IER         #  4 ;- Interrupt Enable Register
-PMC_IDR         #  4 ;- Interrupt Disable Register
-PMC_SR          #  4 ;- Status Register
-PMC_IMR         #  4 ;- Interrupt Mask Register
-;- -------- PMC_SCER : (PMC Offset: 0x0) System Clock Enable Register -------- 
-AT91C_PMC_PCK             EQU (0x1:SHL:0) ;- (PMC) Processor Clock
-AT91C_PMC_UDP             EQU (0x1:SHL:1) ;- (PMC) USB Device Port Clock
-AT91C_PMC_MCKUDP          EQU (0x1:SHL:2) ;- (PMC) USB Device Port Master Clock Automatic Disable on Suspend
-AT91C_PMC_UHP             EQU (0x1:SHL:4) ;- (PMC) USB Host Port Clock
-AT91C_PMC_PCK0            EQU (0x1:SHL:8) ;- (PMC) Programmable Clock Output
-AT91C_PMC_PCK1            EQU (0x1:SHL:9) ;- (PMC) Programmable Clock Output
-AT91C_PMC_PCK2            EQU (0x1:SHL:10) ;- (PMC) Programmable Clock Output
-AT91C_PMC_PCK3            EQU (0x1:SHL:11) ;- (PMC) Programmable Clock Output
-AT91C_PMC_PCK4            EQU (0x1:SHL:12) ;- (PMC) Programmable Clock Output
-AT91C_PMC_PCK5            EQU (0x1:SHL:13) ;- (PMC) Programmable Clock Output
-AT91C_PMC_PCK6            EQU (0x1:SHL:14) ;- (PMC) Programmable Clock Output
-AT91C_PMC_PCK7            EQU (0x1:SHL:15) ;- (PMC) Programmable Clock Output
-;- -------- PMC_SCDR : (PMC Offset: 0x4) System Clock Disable Register -------- 
-;- -------- PMC_SCSR : (PMC Offset: 0x8) System Clock Status Register -------- 
-;- -------- PMC_MCKR : (PMC Offset: 0x30) Master Clock Register -------- 
-AT91C_PMC_CSS             EQU (0x3:SHL:0) ;- (PMC) Programmable Clock Selection
-AT91C_PMC_CSS_SLOW_CLK    EQU (0x0) ;- (PMC) Slow Clock is selected
-AT91C_PMC_CSS_MAIN_CLK    EQU (0x1) ;- (PMC) Main Clock is selected
-AT91C_PMC_CSS_PLLA_CLK    EQU (0x2) ;- (PMC) Clock from PLL A is selected
-AT91C_PMC_CSS_PLLB_CLK    EQU (0x3) ;- (PMC) Clock from PLL B is selected
-AT91C_PMC_PRES            EQU (0x7:SHL:2) ;- (PMC) Programmable Clock Prescaler
-AT91C_PMC_PRES_CLK        EQU (0x0:SHL:2) ;- (PMC) Selected clock
-AT91C_PMC_PRES_CLK_2      EQU (0x1:SHL:2) ;- (PMC) Selected clock divided by 2
-AT91C_PMC_PRES_CLK_4      EQU (0x2:SHL:2) ;- (PMC) Selected clock divided by 4
-AT91C_PMC_PRES_CLK_8      EQU (0x3:SHL:2) ;- (PMC) Selected clock divided by 8
-AT91C_PMC_PRES_CLK_16     EQU (0x4:SHL:2) ;- (PMC) Selected clock divided by 16
-AT91C_PMC_PRES_CLK_32     EQU (0x5:SHL:2) ;- (PMC) Selected clock divided by 32
-AT91C_PMC_PRES_CLK_64     EQU (0x6:SHL:2) ;- (PMC) Selected clock divided by 64
-AT91C_PMC_MDIV            EQU (0x3:SHL:8) ;- (PMC) Master Clock Division
-AT91C_PMC_MDIV_1          EQU (0x0:SHL:8) ;- (PMC) The master clock and the processor clock are the same
-AT91C_PMC_MDIV_2          EQU (0x1:SHL:8) ;- (PMC) The processor clock is twice as fast as the master clock
-AT91C_PMC_MDIV_3          EQU (0x2:SHL:8) ;- (PMC) The processor clock is three times faster than the master clock
-AT91C_PMC_MDIV_4          EQU (0x3:SHL:8) ;- (PMC) The processor clock is four times faster than the master clock
-;- -------- PMC_PCKR : (PMC Offset: 0x40) Programmable Clock Register -------- 
-;- -------- PMC_IER : (PMC Offset: 0x60) PMC Interrupt Enable Register -------- 
-AT91C_PMC_MOSCS           EQU (0x1:SHL:0) ;- (PMC) MOSC Status/Enable/Disable/Mask
-AT91C_PMC_LOCKA           EQU (0x1:SHL:1) ;- (PMC) PLL A Status/Enable/Disable/Mask
-AT91C_PMC_LOCKB           EQU (0x1:SHL:2) ;- (PMC) PLL B Status/Enable/Disable/Mask
-AT91C_PMC_MCKRDY          EQU (0x1:SHL:3) ;- (PMC) MCK_RDY Status/Enable/Disable/Mask
-AT91C_PMC_PCK0RDY         EQU (0x1:SHL:8) ;- (PMC) PCK0_RDY Status/Enable/Disable/Mask
-AT91C_PMC_PCK1RDY         EQU (0x1:SHL:9) ;- (PMC) PCK1_RDY Status/Enable/Disable/Mask
-AT91C_PMC_PCK2RDY         EQU (0x1:SHL:10) ;- (PMC) PCK2_RDY Status/Enable/Disable/Mask
-AT91C_PMC_PCK3RDY         EQU (0x1:SHL:11) ;- (PMC) PCK3_RDY Status/Enable/Disable/Mask
-AT91C_PMC_PCK4RDY         EQU (0x1:SHL:12) ;- (PMC) PCK4_RDY Status/Enable/Disable/Mask
-AT91C_PMC_PCK5RDY         EQU (0x1:SHL:13) ;- (PMC) PCK5_RDY Status/Enable/Disable/Mask
-AT91C_PMC_PCK6RDY         EQU (0x1:SHL:14) ;- (PMC) PCK6_RDY Status/Enable/Disable/Mask
-AT91C_PMC_PCK7RDY         EQU (0x1:SHL:15) ;- (PMC) PCK7_RDY Status/Enable/Disable/Mask
-;- -------- PMC_IDR : (PMC Offset: 0x64) PMC Interrupt Disable Register -------- 
-;- -------- PMC_SR : (PMC Offset: 0x68) PMC Status Register -------- 
-;- -------- PMC_IMR : (PMC Offset: 0x6c) PMC Interrupt Mask Register -------- 
-
-;- *****************************************************************************
-;-              SOFTWARE API DEFINITION  FOR Clock Generator Controler
-;- *****************************************************************************
-                ^ 0 ;- AT91S_CKGR
-CKGR_MOR        #  4 ;- Main Oscillator Register
-CKGR_MCFR       #  4 ;- Main Clock  Frequency Register
-CKGR_PLLAR      #  4 ;- PLL A Register
-CKGR_PLLBR      #  4 ;- PLL B Register
-;- -------- CKGR_MOR : (CKGR Offset: 0x0) Main Oscillator Register -------- 
-AT91C_CKGR_MOSCEN         EQU (0x1:SHL:0) ;- (CKGR) Main Oscillator Enable
-AT91C_CKGR_OSCTEST        EQU (0x1:SHL:1) ;- (CKGR) Oscillator Test
-AT91C_CKGR_OSCOUNT        EQU (0xFF:SHL:8) ;- (CKGR) Main Oscillator Start-up Time
-;- -------- CKGR_MCFR : (CKGR Offset: 0x4) Main Clock Frequency Register -------- 
-AT91C_CKGR_MAINF          EQU (0xFFFF:SHL:0) ;- (CKGR) Main Clock Frequency
-AT91C_CKGR_MAINRDY        EQU (0x1:SHL:16) ;- (CKGR) Main Clock Ready
-;- -------- CKGR_PLLAR : (CKGR Offset: 0x8) PLL A Register -------- 
-AT91C_CKGR_DIVA           EQU (0xFF:SHL:0) ;- (CKGR) Divider Selected
-AT91C_CKGR_DIVA_0         EQU (0x0) ;- (CKGR) Divider output is 0
-AT91C_CKGR_DIVA_BYPASS    EQU (0x1) ;- (CKGR) Divider is bypassed
-AT91C_CKGR_PLLACOUNT      EQU (0x3F:SHL:8) ;- (CKGR) PLL A Counter
-AT91C_CKGR_OUTA           EQU (0x3:SHL:14) ;- (CKGR) PLL A Output Frequency Range
-AT91C_CKGR_OUTA_0         EQU (0x0:SHL:14) ;- (CKGR) Please refer to the PLLA datasheet
-AT91C_CKGR_OUTA_1         EQU (0x1:SHL:14) ;- (CKGR) Please refer to the PLLA datasheet
-AT91C_CKGR_OUTA_2         EQU (0x2:SHL:14) ;- (CKGR) Please refer to the PLLA datasheet
-AT91C_CKGR_OUTA_3         EQU (0x3:SHL:14) ;- (CKGR) Please refer to the PLLA datasheet
-AT91C_CKGR_MULA           EQU (0x7FF:SHL:16) ;- (CKGR) PLL A Multiplier
-AT91C_CKGR_SRCA           EQU (0x1:SHL:29) ;- (CKGR) PLL A Source
-;- -------- CKGR_PLLBR : (CKGR Offset: 0xc) PLL B Register -------- 
-AT91C_CKGR_DIVB           EQU (0xFF:SHL:0) ;- (CKGR) Divider Selected
-AT91C_CKGR_DIVB_0         EQU (0x0) ;- (CKGR) Divider output is 0
-AT91C_CKGR_DIVB_BYPASS    EQU (0x1) ;- (CKGR) Divider is bypassed
-AT91C_CKGR_PLLBCOUNT      EQU (0x3F:SHL:8) ;- (CKGR) PLL B Counter
-AT91C_CKGR_OUTB           EQU (0x3:SHL:14) ;- (CKGR) PLL B Output Frequency Range
-AT91C_CKGR_OUTB_0         EQU (0x0:SHL:14) ;- (CKGR) Please refer to the PLLB datasheet
-AT91C_CKGR_OUTB_1         EQU (0x1:SHL:14) ;- (CKGR) Please refer to the PLLB datasheet
-AT91C_CKGR_OUTB_2         EQU (0x2:SHL:14) ;- (CKGR) Please refer to the PLLB datasheet
-AT91C_CKGR_OUTB_3         EQU (0x3:SHL:14) ;- (CKGR) Please refer to the PLLB datasheet
-AT91C_CKGR_MULB           EQU (0x7FF:SHL:16) ;- (CKGR) PLL B Multiplier
-AT91C_CKGR_USB_96M        EQU (0x1:SHL:28) ;- (CKGR) Divider for USB Ports
-AT91C_CKGR_USB_PLL        EQU (0x1:SHL:29) ;- (CKGR) PLL Use
-
-;- *****************************************************************************
-;-              SOFTWARE API DEFINITION  FOR Parallel Input Output Controler
-;- *****************************************************************************
-                ^ 0 ;- AT91S_PIO
-PIO_PER         #  4 ;- PIO Enable Register
-PIO_PDR         #  4 ;- PIO Disable Register
-PIO_PSR         #  4 ;- PIO Status Register
-                #  4 ;- Reserved
-PIO_OER         #  4 ;- Output Enable Register
-PIO_ODR         #  4 ;- Output Disable Registerr
-PIO_OSR         #  4 ;- Output Status Register
-                #  4 ;- Reserved
-PIO_IFER        #  4 ;- Input Filter Enable Register
-PIO_IFDR        #  4 ;- Input Filter Disable Register
-PIO_IFSR        #  4 ;- Input Filter Status Register
-                #  4 ;- Reserved
-PIO_SODR        #  4 ;- Set Output Data Register
-PIO_CODR        #  4 ;- Clear Output Data Register
-PIO_ODSR        #  4 ;- Output Data Status Register
-PIO_PDSR        #  4 ;- Pin Data Status Register
-PIO_IER         #  4 ;- Interrupt Enable Register
-PIO_IDR         #  4 ;- Interrupt Disable Register
-PIO_IMR         #  4 ;- Interrupt Mask Register
-PIO_ISR         #  4 ;- Interrupt Status Register
-PIO_MDER        #  4 ;- Multi-driver Enable Register
-PIO_MDDR        #  4 ;- Multi-driver Disable Register
-PIO_MDSR        #  4 ;- Multi-driver Status Register
-                #  4 ;- Reserved
-PIO_PPUDR       #  4 ;- Pull-up Disable Register
-PIO_PPUER       #  4 ;- Pull-up Enable Register
-PIO_PPUSR       #  4 ;- Pad Pull-up Status Register
-                #  4 ;- Reserved
-PIO_ASR         #  4 ;- Select A Register
-PIO_BSR         #  4 ;- Select B Register
-PIO_ABSR        #  4 ;- AB Select Status Register
-                # 36 ;- Reserved
-PIO_OWER        #  4 ;- Output Write Enable Register
-PIO_OWDR        #  4 ;- Output Write Disable Register
-PIO_OWSR        #  4 ;- Output Write Status Register
-
-;- *****************************************************************************
-;-              SOFTWARE API DEFINITION  FOR Debug Unit
-;- *****************************************************************************
-                ^ 0 ;- AT91S_DBGU
-DBGU_CR         #  4 ;- Control Register
-DBGU_MR         #  4 ;- Mode Register
-DBGU_IER        #  4 ;- Interrupt Enable Register
-DBGU_IDR        #  4 ;- Interrupt Disable Register
-DBGU_IMR        #  4 ;- Interrupt Mask Register
-DBGU_CSR        #  4 ;- Channel Status Register
-DBGU_RHR        #  4 ;- Receiver Holding Register
-DBGU_THR        #  4 ;- Transmitter Holding Register
-DBGU_BRGR       #  4 ;- Baud Rate Generator Register
-                # 28 ;- Reserved
-DBGU_C1R        #  4 ;- Chip ID1 Register
-DBGU_C2R        #  4 ;- Chip ID2 Register
-DBGU_FNTR       #  4 ;- Force NTRST Register
-                # 180 ;- Reserved
-DBGU_RPR        #  4 ;- Receive Pointer Register
-DBGU_RCR        #  4 ;- Receive Counter Register
-DBGU_TPR        #  4 ;- Transmit Pointer Register
-DBGU_TCR        #  4 ;- Transmit Counter Register
-DBGU_RNPR       #  4 ;- Receive Next Pointer Register
-DBGU_RNCR       #  4 ;- Receive Next Counter Register
-DBGU_TNPR       #  4 ;- Transmit Next Pointer Register
-DBGU_TNCR       #  4 ;- Transmit Next Counter Register
-DBGU_PTCR       #  4 ;- PDC Transfer Control Register
-DBGU_PTSR       #  4 ;- PDC Transfer Status Register
-;- -------- DBGU_CR : (DBGU Offset: 0x0) Debug Unit Control Register -------- 
-AT91C_US_RSTRX            EQU (0x1:SHL:2) ;- (DBGU) Reset Receiver
-AT91C_US_RSTTX            EQU (0x1:SHL:3) ;- (DBGU) Reset Transmitter
-AT91C_US_RXEN             EQU (0x1:SHL:4) ;- (DBGU) Receiver Enable
-AT91C_US_RXDIS            EQU (0x1:SHL:5) ;- (DBGU) Receiver Disable
-AT91C_US_TXEN             EQU (0x1:SHL:6) ;- (DBGU) Transmitter Enable
-AT91C_US_TXDIS            EQU (0x1:SHL:7) ;- (DBGU) Transmitter Disable
-;- -------- DBGU_MR : (DBGU Offset: 0x4) Debug Unit Mode Register -------- 
-AT91C_US_PAR              EQU (0x7:SHL:9) ;- (DBGU) Parity type
-AT91C_US_PAR_EVEN         EQU (0x0:SHL:9) ;- (DBGU) Even Parity
-AT91C_US_PAR_ODD          EQU (0x1:SHL:9) ;- (DBGU) Odd Parity
-AT91C_US_PAR_SPACE        EQU (0x2:SHL:9) ;- (DBGU) Parity forced to 0 (Space)
-AT91C_US_PAR_MARK         EQU (0x3:SHL:9) ;- (DBGU) Parity forced to 1 (Mark)
-AT91C_US_PAR_NONE         EQU (0x4:SHL:9) ;- (DBGU) No Parity
-AT91C_US_PAR_MULTI_DROP   EQU (0x6:SHL:9) ;- (DBGU) Multi-drop mode
-AT91C_US_CHMODE           EQU (0x3:SHL:14) ;- (DBGU) Channel Mode
-AT91C_US_CHMODE_NORMAL    EQU (0x0:SHL:14) ;- (DBGU) Normal Mode: The USART channel operates as an RX/TX USART.
-AT91C_US_CHMODE_AUTO      EQU (0x1:SHL:14) ;- (DBGU) Automatic Echo: Receiver Data Input is connected to the TXD pin.
-AT91C_US_CHMODE_LOCAL     EQU (0x2:SHL:14) ;- (DBGU) Local Loopback: Transmitter Output Signal is connected to Receiver Input Signal.
-AT91C_US_CHMODE_REMOTE    EQU (0x3:SHL:14) ;- (DBGU) Remote Loopback: RXD pin is internally connected to TXD pin.
-;- -------- DBGU_IER : (DBGU Offset: 0x8) Debug Unit Interrupt Enable Register -------- 
-AT91C_US_RXRDY            EQU (0x1:SHL:0) ;- (DBGU) RXRDY Interrupt
-AT91C_US_TXRDY            EQU (0x1:SHL:1) ;- (DBGU) TXRDY Interrupt
-AT91C_US_ENDRX            EQU (0x1:SHL:3) ;- (DBGU) End of Receive Transfer Interrupt
-AT91C_US_ENDTX            EQU (0x1:SHL:4) ;- (DBGU) End of Transmit Interrupt
-AT91C_US_OVRE             EQU (0x1:SHL:5) ;- (DBGU) Overrun Interrupt
-AT91C_US_FRAME            EQU (0x1:SHL:6) ;- (DBGU) Framing Error Interrupt
-AT91C_US_PARE             EQU (0x1:SHL:7) ;- (DBGU) Parity Error Interrupt
-AT91C_US_TXEMPTY          EQU (0x1:SHL:9) ;- (DBGU) TXEMPTY Interrupt
-AT91C_US_TXBUFE           EQU (0x1:SHL:11) ;- (DBGU) TXBUFE Interrupt
-AT91C_US_RXBUFF           EQU (0x1:SHL:12) ;- (DBGU) RXBUFF Interrupt
-AT91C_US_COMM_TX          EQU (0x1:SHL:30) ;- (DBGU) COMM_TX Interrupt
-AT91C_US_COMM_RX          EQU (0x1:SHL:31) ;- (DBGU) COMM_RX Interrupt
-;- -------- DBGU_IDR : (DBGU Offset: 0xc) Debug Unit Interrupt Disable Register -------- 
-;- -------- DBGU_IMR : (DBGU Offset: 0x10) Debug Unit Interrupt Mask Register -------- 
-;- -------- DBGU_CSR : (DBGU Offset: 0x14) Debug Unit Channel Status Register -------- 
-;- -------- DBGU_FNTR : (DBGU Offset: 0x48) Debug Unit FORCE_NTRST Register -------- 
-AT91C_US_FORCE_NTRST      EQU (0x1:SHL:0) ;- (DBGU) Force NTRST in JTAG
-
-;- *****************************************************************************
-;-              SOFTWARE API DEFINITION  FOR Peripheral Data Controller
-;- *****************************************************************************
-                ^ 0 ;- AT91S_PDC
-PDC_RPR         #  4 ;- Receive Pointer Register
-PDC_RCR         #  4 ;- Receive Counter Register
-PDC_TPR         #  4 ;- Transmit Pointer Register
-PDC_TCR         #  4 ;- Transmit Counter Register
-PDC_RNPR        #  4 ;- Receive Next Pointer Register
-PDC_RNCR        #  4 ;- Receive Next Counter Register
-PDC_TNPR        #  4 ;- Transmit Next Pointer Register
-PDC_TNCR        #  4 ;- Transmit Next Counter Register
-PDC_PTCR        #  4 ;- PDC Transfer Control Register
-PDC_PTSR        #  4 ;- PDC Transfer Status Register
-;- -------- PDC_PTCR : (PDC Offset: 0x20) PDC Transfer Control Register -------- 
-AT91C_PDC_RXTEN           EQU (0x1:SHL:0) ;- (PDC) Receiver Transfer Enable
-AT91C_PDC_RXTDIS          EQU (0x1:SHL:1) ;- (PDC) Receiver Transfer Disable
-AT91C_PDC_TXTEN           EQU (0x1:SHL:8) ;- (PDC) Transmitter Transfer Enable
-AT91C_PDC_TXTDIS          EQU (0x1:SHL:9) ;- (PDC) Transmitter Transfer Disable
-;- -------- PDC_PTSR : (PDC Offset: 0x24) PDC Transfer Status Register -------- 
-
-;- *****************************************************************************
-;-              SOFTWARE API DEFINITION  FOR Advanced Interrupt Controller
-;- *****************************************************************************
-                ^ 0 ;- AT91S_AIC
-AIC_SMR         # 128 ;- Source Mode Register
-AIC_SVR         # 128 ;- Source Vector Register
-AIC_IVR         #  4 ;- IRQ Vector Register
-AIC_FVR         #  4 ;- FIQ Vector Register
-AIC_ISR         #  4 ;- Interrupt Status Register
-AIC_IPR         #  4 ;- Interrupt Pending Register
-AIC_IMR         #  4 ;- Interrupt Mask Register
-AIC_CISR        #  4 ;- Core Interrupt Status Register
-                #  8 ;- Reserved
-AIC_IECR        #  4 ;- Interrupt Enable Command Register
-AIC_IDCR        #  4 ;- Interrupt Disable Command Register
-AIC_ICCR        #  4 ;- Interrupt Clear Command Register
-AIC_ISCR        #  4 ;- Interrupt Set Command Register
-AIC_EOICR       #  4 ;- End of Interrupt Command Register
-AIC_SPU         #  4 ;- Spurious Vector Register
-AIC_DCR         #  4 ;- Debug Control Register (Protect)
-                #  4 ;- Reserved
-AIC_FFER        #  4 ;- Fast Forcing Enable Register
-AIC_FFDR        #  4 ;- Fast Forcing Disable Register
-AIC_FFSR        #  4 ;- Fast Forcing Status Register
-;- -------- AIC_SMR : (AIC Offset: 0x0) Control Register -------- 
-AT91C_AIC_PRIOR           EQU (0x7:SHL:0) ;- (AIC) Priority Level
-AT91C_AIC_PRIOR_LOWEST    EQU (0x0) ;- (AIC) Lowest priority level
-AT91C_AIC_PRIOR_HIGHEST   EQU (0x7) ;- (AIC) Highest priority level
-AT91C_AIC_SRCTYPE         EQU (0x3:SHL:5) ;- (AIC) Interrupt Source Type
-AT91C_AIC_SRCTYPE_INT_LEVEL_SENSITIVE EQU (0x0:SHL:5) ;- (AIC) Internal Sources Code Label Level Sensitive
-AT91C_AIC_SRCTYPE_INT_EDGE_TRIGGERED EQU (0x1:SHL:5) ;- (AIC) Internal Sources Code Label Edge triggered
-AT91C_AIC_SRCTYPE_EXT_HIGH_LEVEL EQU (0x2:SHL:5) ;- (AIC) External Sources Code Label High-level Sensitive
-AT91C_AIC_SRCTYPE_EXT_POSITIVE_EDGE EQU (0x3:SHL:5) ;- (AIC) External Sources Code Label Positive Edge triggered
-;- -------- AIC_CISR : (AIC Offset: 0x114) AIC Core Interrupt Status Register -------- 
-AT91C_AIC_NFIQ            EQU (0x1:SHL:0) ;- (AIC) NFIQ Status
-AT91C_AIC_NIRQ            EQU (0x1:SHL:1) ;- (AIC) NIRQ Status
-;- -------- AIC_DCR : (AIC Offset: 0x138) AIC Debug Control Register (Protect) -------- 
-AT91C_AIC_DCR_PROT        EQU (0x1:SHL:0) ;- (AIC) Protection Mode
-AT91C_AIC_DCR_GMSK        EQU (0x1:SHL:1) ;- (AIC) General Mask
-
-;- *****************************************************************************
-;-              SOFTWARE API DEFINITION  FOR Serial Parallel Interface
-;- *****************************************************************************
-                ^ 0 ;- AT91S_SPI
-SPI_CR          #  4 ;- Control Register
-SPI_MR          #  4 ;- Mode Register
-SPI_RDR         #  4 ;- Receive Data Register
-SPI_TDR         #  4 ;- Transmit Data Register
-SPI_SR          #  4 ;- Status Register
-SPI_IER         #  4 ;- Interrupt Enable Register
-SPI_IDR         #  4 ;- Interrupt Disable Register
-SPI_IMR         #  4 ;- Interrupt Mask Register
-                # 16 ;- Reserved
-SPI_CSR         # 16 ;- Chip Select Register
-                # 192 ;- Reserved
-SPI_RPR         #  4 ;- Receive Pointer Register
-SPI_RCR         #  4 ;- Receive Counter Register
-SPI_TPR         #  4 ;- Transmit Pointer Register
-SPI_TCR         #  4 ;- Transmit Counter Register
-SPI_RNPR        #  4 ;- Receive Next Pointer Register
-SPI_RNCR        #  4 ;- Receive Next Counter Register
-SPI_TNPR        #  4 ;- Transmit Next Pointer Register
-SPI_TNCR        #  4 ;- Transmit Next Counter Register
-SPI_PTCR        #  4 ;- PDC Transfer Control Register
-SPI_PTSR        #  4 ;- PDC Transfer Status Register
-;- -------- SPI_CR : (SPI Offset: 0x0) SPI Control Register -------- 
-AT91C_SPI_SPIEN           EQU (0x1:SHL:0) ;- (SPI) SPI Enable
-AT91C_SPI_SPIDIS          EQU (0x1:SHL:1) ;- (SPI) SPI Disable
-AT91C_SPI_SWRST           EQU (0x1:SHL:7) ;- (SPI) SPI Software reset
-;- -------- SPI_MR : (SPI Offset: 0x4) SPI Mode Register -------- 
-AT91C_SPI_MSTR            EQU (0x1:SHL:0) ;- (SPI) Master/Slave Mode
-AT91C_SPI_PS              EQU (0x1:SHL:1) ;- (SPI) Peripheral Select
-AT91C_SPI_PS_FIXED        EQU (0x0:SHL:1) ;- (SPI) Fixed Peripheral Select
-AT91C_SPI_PS_VARIABLE     EQU (0x1:SHL:1) ;- (SPI) Variable Peripheral Select
-AT91C_SPI_PCSDEC          EQU (0x1:SHL:2) ;- (SPI) Chip Select Decode
-AT91C_SPI_DIV32           EQU (0x1:SHL:3) ;- (SPI) Clock Selection
-AT91C_SPI_MODFDIS         EQU (0x1:SHL:4) ;- (SPI) Mode Fault Detection
-AT91C_SPI_LLB             EQU (0x1:SHL:7) ;- (SPI) Clock Selection
-AT91C_SPI_PCS             EQU (0xF:SHL:16) ;- (SPI) Peripheral Chip Select
-AT91C_SPI_DLYBCS          EQU (0xFF:SHL:24) ;- (SPI) Delay Between Chip Selects
-;- -------- SPI_RDR : (SPI Offset: 0x8) Receive Data Register -------- 
-AT91C_SPI_RD              EQU (0xFFFF:SHL:0) ;- (SPI) Receive Data
-AT91C_SPI_RPCS            EQU (0xF:SHL:16) ;- (SPI) Peripheral Chip Select Status
-;- -------- SPI_TDR : (SPI Offset: 0xc) Transmit Data Register -------- 
-AT91C_SPI_TD              EQU (0xFFFF:SHL:0) ;- (SPI) Transmit Data
-AT91C_SPI_TPCS            EQU (0xF:SHL:16) ;- (SPI) Peripheral Chip Select Status
-;- -------- SPI_SR : (SPI Offset: 0x10) Status Register -------- 
-AT91C_SPI_RDRF            EQU (0x1:SHL:0) ;- (SPI) Receive Data Register Full
-AT91C_SPI_TDRE            EQU (0x1:SHL:1) ;- (SPI) Transmit Data Register Empty
-AT91C_SPI_MODF            EQU (0x1:SHL:2) ;- (SPI) Mode Fault Error
-AT91C_SPI_OVRES           EQU (0x1:SHL:3) ;- (SPI) Overrun Error Status
-AT91C_SPI_SPENDRX         EQU (0x1:SHL:4) ;- (SPI) End of Receiver Transfer
-AT91C_SPI_SPENDTX         EQU (0x1:SHL:5) ;- (SPI) End of Receiver Transfer
-AT91C_SPI_RXBUFF          EQU (0x1:SHL:6) ;- (SPI) RXBUFF Interrupt
-AT91C_SPI_TXBUFE          EQU (0x1:SHL:7) ;- (SPI) TXBUFE Interrupt
-AT91C_SPI_SPIENS          EQU (0x1:SHL:16) ;- (SPI) Enable Status
-;- -------- SPI_IER : (SPI Offset: 0x14) Interrupt Enable Register -------- 
-;- -------- SPI_IDR : (SPI Offset: 0x18) Interrupt Disable Register -------- 
-;- -------- SPI_IMR : (SPI Offset: 0x1c) Interrupt Mask Register -------- 
-;- -------- SPI_CSR : (SPI Offset: 0x30) Chip Select Register -------- 
-AT91C_SPI_CPOL            EQU (0x1:SHL:0) ;- (SPI) Clock Polarity
-AT91C_SPI_NCPHA           EQU (0x1:SHL:1) ;- (SPI) Clock Phase
-AT91C_SPI_BITS            EQU (0xF:SHL:4) ;- (SPI) Bits Per Transfer
-AT91C_SPI_BITS_8          EQU (0x0:SHL:4) ;- (SPI) 8 Bits Per transfer
-AT91C_SPI_BITS_9          EQU (0x1:SHL:4) ;- (SPI) 9 Bits Per transfer
-AT91C_SPI_BITS_10         EQU (0x2:SHL:4) ;- (SPI) 10 Bits Per transfer
-AT91C_SPI_BITS_11         EQU (0x3:SHL:4) ;- (SPI) 11 Bits Per transfer
-AT91C_SPI_BITS_12         EQU (0x4:SHL:4) ;- (SPI) 12 Bits Per transfer
-AT91C_SPI_BITS_13         EQU (0x5:SHL:4) ;- (SPI) 13 Bits Per transfer
-AT91C_SPI_BITS_14         EQU (0x6:SHL:4) ;- (SPI) 14 Bits Per transfer
-AT91C_SPI_BITS_15         EQU (0x7:SHL:4) ;- (SPI) 15 Bits Per transfer
-AT91C_SPI_BITS_16         EQU (0x8:SHL:4) ;- (SPI) 16 Bits Per transfer
-AT91C_SPI_SCBR            EQU (0xFF:SHL:8) ;- (SPI) Serial Clock Baud Rate
-AT91C_SPI_DLYBS           EQU (0xFF:SHL:16) ;- (SPI) Serial Clock Baud Rate
-AT91C_SPI_DLYBCT          EQU (0xFF:SHL:24) ;- (SPI) Delay Between Consecutive Transfers
-
-;- *****************************************************************************
-;-              SOFTWARE API DEFINITION  FOR Synchronous Serial Controller Interface
-;- *****************************************************************************
-                ^ 0 ;- AT91S_SSC
-SSC_CR          #  4 ;- Control Register
-SSC_CMR         #  4 ;- Clock Mode Register
-                #  8 ;- Reserved
-SSC_RCMR        #  4 ;- Receive Clock ModeRegister
-SSC_RFMR        #  4 ;- Receive Frame Mode Register
-SSC_TCMR        #  4 ;- Transmit Clock Mode Register
-SSC_TFMR        #  4 ;- Transmit Frame Mode Register
-SSC_RHR         #  4 ;- Receive Holding Register
-SSC_THR         #  4 ;- Transmit Holding Register
-                #  8 ;- Reserved
-SSC_RSHR        #  4 ;- Receive Sync Holding Register
-SSC_TSHR        #  4 ;- Transmit Sync Holding Register
-SSC_RC0R        #  4 ;- Receive Compare 0 Register
-SSC_RC1R        #  4 ;- Receive Compare 1 Register
-SSC_SR          #  4 ;- Status Register
-SSC_IER         #  4 ;- Interrupt Enable Register
-SSC_IDR         #  4 ;- Interrupt Disable Register
-SSC_IMR         #  4 ;- Interrupt Mask Register
-                # 176 ;- Reserved
-SSC_RPR         #  4 ;- Receive Pointer Register
-SSC_RCR         #  4 ;- Receive Counter Register
-SSC_TPR         #  4 ;- Transmit Pointer Register
-SSC_TCR         #  4 ;- Transmit Counter Register
-SSC_RNPR        #  4 ;- Receive Next Pointer Register
-SSC_RNCR        #  4 ;- Receive Next Counter Register
-SSC_TNPR        #  4 ;- Transmit Next Pointer Register
-SSC_TNCR        #  4 ;- Transmit Next Counter Register
-SSC_PTCR        #  4 ;- PDC Transfer Control Register
-SSC_PTSR        #  4 ;- PDC Transfer Status Register
-;- -------- SSC_CR : (SSC Offset: 0x0) SSC Control Register -------- 
-AT91C_SSC_RXEN            EQU (0x1:SHL:0) ;- (SSC) Receive Enable
-AT91C_SSC_RXDIS           EQU (0x1:SHL:1) ;- (SSC) Receive Disable
-AT91C_SSC_TXEN            EQU (0x1:SHL:8) ;- (SSC) Transmit Enable
-AT91C_SSC_TXDIS           EQU (0x1:SHL:9) ;- (SSC) Transmit Disable
-AT91C_SSC_SWRST           EQU (0x1:SHL:15) ;- (SSC) Software Reset
-;- -------- SSC_RCMR : (SSC Offset: 0x10) SSC Receive Clock Mode Register -------- 
-AT91C_SSC_CKS             EQU (0x3:SHL:0) ;- (SSC) Receive/Transmit Clock Selection
-AT91C_SSC_CKS_DIV         EQU (0x0) ;- (SSC) Divided Clock
-AT91C_SSC_CKS_TK          EQU (0x1) ;- (SSC) TK Clock signal
-AT91C_SSC_CKS_RK          EQU (0x2) ;- (SSC) RK pin
-AT91C_SSC_CKO             EQU (0x7:SHL:2) ;- (SSC) Receive/Transmit Clock Output Mode Selection
-AT91C_SSC_CKO_NONE        EQU (0x0:SHL:2) ;- (SSC) Receive/Transmit Clock Output Mode: None RK pin: Input-only
-AT91C_SSC_CKO_CONTINOUS   EQU (0x1:SHL:2) ;- (SSC) Continuous Receive/Transmit Clock RK pin: Output
-AT91C_SSC_CKO_DATA_TX     EQU (0x2:SHL:2) ;- (SSC) Receive/Transmit Clock only during data transfers RK pin: Output
-AT91C_SSC_CKI             EQU (0x1:SHL:5) ;- (SSC) Receive/Transmit Clock Inversion
-AT91C_SSC_CKG             EQU (0x3:SHL:6) ;- (SSC) Receive/Transmit Clock Gating Selection
-AT91C_SSC_CKG_NONE        EQU (0x0:SHL:6) ;- (SSC) Receive/Transmit Clock Gating: None, continuous clock
-AT91C_SSC_CKG_LOW         EQU (0x1:SHL:6) ;- (SSC) Receive/Transmit Clock enabled only if RF Low
-AT91C_SSC_CKG_HIGH        EQU (0x2:SHL:6) ;- (SSC) Receive/Transmit Clock enabled only if RF High
-AT91C_SSC_START           EQU (0xF:SHL:8) ;- (SSC) Receive/Transmit Start Selection
-AT91C_SSC_START_CONTINOUS EQU (0x0:SHL:8) ;- (SSC) Continuous, as soon as the receiver is enabled, and immediately after the end of transfer of the previous data.
-AT91C_SSC_START_TX        EQU (0x1:SHL:8) ;- (SSC) Transmit/Receive start
-AT91C_SSC_START_LOW_RF    EQU (0x2:SHL:8) ;- (SSC) Detection of a low level on RF input
-AT91C_SSC_START_HIGH_RF   EQU (0x3:SHL:8) ;- (SSC) Detection of a high level on RF input
-AT91C_SSC_START_FALL_RF   EQU (0x4:SHL:8) ;- (SSC) Detection of a falling edge on RF input
-AT91C_SSC_START_RISE_RF   EQU (0x5:SHL:8) ;- (SSC) Detection of a rising edge on RF input
-AT91C_SSC_START_LEVEL_RF  EQU (0x6:SHL:8) ;- (SSC) Detection of any level change on RF input
-AT91C_SSC_START_EDGE_RF   EQU (0x7:SHL:8) ;- (SSC) Detection of any edge on RF input
-AT91C_SSC_START_0         EQU (0x8:SHL:8) ;- (SSC) Compare 0
-AT91C_SSC_STOP            EQU (0x1:SHL:12) ;- (SSC) Receive Stop Selection
-AT91C_SSC_STTOUT          EQU (0x1:SHL:15) ;- (SSC) Receive/Transmit Start Output Selection
-AT91C_SSC_STTDLY          EQU (0xFF:SHL:16) ;- (SSC) Receive/Transmit Start Delay
-AT91C_SSC_PERIOD          EQU (0xFF:SHL:24) ;- (SSC) Receive/Transmit Period Divider Selection
-;- -------- SSC_RFMR : (SSC Offset: 0x14) SSC Receive Frame Mode Register -------- 
-AT91C_SSC_DATLEN          EQU (0x1F:SHL:0) ;- (SSC) Data Length
-AT91C_SSC_LOOP            EQU (0x1:SHL:5) ;- (SSC) Loop Mode
-AT91C_SSC_MSBF            EQU (0x1:SHL:7) ;- (SSC) Most Significant Bit First
-AT91C_SSC_DATNB           EQU (0xF:SHL:8) ;- (SSC) Data Number per Frame
-AT91C_SSC_FSLEN           EQU (0xF:SHL:16) ;- (SSC) Receive/Transmit Frame Sync length
-AT91C_SSC_FSOS            EQU (0x7:SHL:20) ;- (SSC) Receive/Transmit Frame Sync Output Selection
-AT91C_SSC_FSOS_NONE       EQU (0x0:SHL:20) ;- (SSC) Selected Receive/Transmit Frame Sync Signal: None RK pin Input-only
-AT91C_SSC_FSOS_NEGATIVE   EQU (0x1:SHL:20) ;- (SSC) Selected Receive/Transmit Frame Sync Signal: Negative Pulse
-AT91C_SSC_FSOS_POSITIVE   EQU (0x2:SHL:20) ;- (SSC) Selected Receive/Transmit Frame Sync Signal: Positive Pulse
-AT91C_SSC_FSOS_LOW        EQU (0x3:SHL:20) ;- (SSC) Selected Receive/Transmit Frame Sync Signal: Driver Low during data transfer
-AT91C_SSC_FSOS_HIGH       EQU (0x4:SHL:20) ;- (SSC) Selected Receive/Transmit Frame Sync Signal: Driver High during data transfer
-AT91C_SSC_FSOS_TOGGLE     EQU (0x5:SHL:20) ;- (SSC) Selected Receive/Transmit Frame Sync Signal: Toggling at each start of data transfer
-AT91C_SSC_FSEDGE          EQU (0x1:SHL:24) ;- (SSC) Frame Sync Edge Detection
-;- -------- SSC_TCMR : (SSC Offset: 0x18) SSC Transmit Clock Mode Register -------- 
-;- -------- SSC_TFMR : (SSC Offset: 0x1c) SSC Transmit Frame Mode Register -------- 
-AT91C_SSC_DATDEF          EQU (0x1:SHL:5) ;- (SSC) Data Default Value
-AT91C_SSC_FSDEN           EQU (0x1:SHL:23) ;- (SSC) Frame Sync Data Enable
-;- -------- SSC_SR : (SSC Offset: 0x40) SSC Status Register -------- 
-AT91C_SSC_TXRDY           EQU (0x1:SHL:0) ;- (SSC) Transmit Ready
-AT91C_SSC_TXEMPTY         EQU (0x1:SHL:1) ;- (SSC) Transmit Empty
-AT91C_SSC_ENDTX           EQU (0x1:SHL:2) ;- (SSC) End Of Transmission
-AT91C_SSC_TXBUFE          EQU (0x1:SHL:3) ;- (SSC) Transmit Buffer Empty
-AT91C_SSC_RXRDY           EQU (0x1:SHL:4) ;- (SSC) Receive Ready
-AT91C_SSC_OVRUN           EQU (0x1:SHL:5) ;- (SSC) Receive Overrun
-AT91C_SSC_ENDRX           EQU (0x1:SHL:6) ;- (SSC) End of Reception
-AT91C_SSC_RXBUFF          EQU (0x1:SHL:7) ;- (SSC) Receive Buffer Full
-AT91C_SSC_CP0             EQU (0x1:SHL:8) ;- (SSC) Compare 0
-AT91C_SSC_CP1             EQU (0x1:SHL:9) ;- (SSC) Compare 1
-AT91C_SSC_TXSYN           EQU (0x1:SHL:10) ;- (SSC) Transmit Sync
-AT91C_SSC_RXSYN           EQU (0x1:SHL:11) ;- (SSC) Receive Sync
-AT91C_SSC_TXENA           EQU (0x1:SHL:16) ;- (SSC) Transmit Enable
-AT91C_SSC_RXENA           EQU (0x1:SHL:17) ;- (SSC) Receive Enable
-;- -------- SSC_IER : (SSC Offset: 0x44) SSC Interrupt Enable Register -------- 
-;- -------- SSC_IDR : (SSC Offset: 0x48) SSC Interrupt Disable Register -------- 
-;- -------- SSC_IMR : (SSC Offset: 0x4c) SSC Interrupt Mask Register -------- 
-
-;- *****************************************************************************
-;-              SOFTWARE API DEFINITION  FOR Usart
-;- *****************************************************************************
-                ^ 0 ;- AT91S_USART
-US_CR           #  4 ;- Control Register
-US_MR           #  4 ;- Mode Register
-US_IER          #  4 ;- Interrupt Enable Register
-US_IDR          #  4 ;- Interrupt Disable Register
-US_IMR          #  4 ;- Interrupt Mask Register
-US_CSR          #  4 ;- Channel Status Register
-US_RHR          #  4 ;- Receiver Holding Register
-US_THR          #  4 ;- Transmitter Holding Register
-US_BRGR         #  4 ;- Baud Rate Generator Register
-US_RTOR         #  4 ;- Receiver Time-out Register
-US_TTGR         #  4 ;- Transmitter Time-guard Register
-                # 20 ;- Reserved
-US_FIDI         #  4 ;- FI_DI_Ratio Register
-US_NER          #  4 ;- Nb Errors Register
-US_XXR          #  4 ;- XON_XOFF Register
-US_IF           #  4 ;- IRDA_FILTER Register
-                # 176 ;- Reserved
-US_RPR          #  4 ;- Receive Pointer Register
-US_RCR          #  4 ;- Receive Counter Register
-US_TPR          #  4 ;- Transmit Pointer Register
-US_TCR          #  4 ;- Transmit Counter Register
-US_RNPR         #  4 ;- Receive Next Pointer Register
-US_RNCR         #  4 ;- Receive Next Counter Register
-US_TNPR         #  4 ;- Transmit Next Pointer Register
-US_TNCR         #  4 ;- Transmit Next Counter Register
-US_PTCR         #  4 ;- PDC Transfer Control Register
-US_PTSR         #  4 ;- PDC Transfer Status Register
-;- -------- US_CR : (USART Offset: 0x0) Debug Unit Control Register -------- 
-AT91C_US_RSTSTA           EQU (0x1:SHL:8) ;- (USART) Reset Status Bits
-AT91C_US_STTBRK           EQU (0x1:SHL:9) ;- (USART) Start Break
-AT91C_US_STPBRK           EQU (0x1:SHL:10) ;- (USART) Stop Break
-AT91C_US_STTTO            EQU (0x1:SHL:11) ;- (USART) Start Time-out
-AT91C_US_SENDA            EQU (0x1:SHL:12) ;- (USART) Send Address
-AT91C_US_RSTIT            EQU (0x1:SHL:13) ;- (USART) Reset Iterations
-AT91C_US_RSTNACK          EQU (0x1:SHL:14) ;- (USART) Reset Non Acknowledge
-AT91C_US_RETTO            EQU (0x1:SHL:15) ;- (USART) Rearm Time-out
-AT91C_US_DTREN            EQU (0x1:SHL:16) ;- (USART) Data Terminal ready Enable
-AT91C_US_DTRDIS           EQU (0x1:SHL:17) ;- (USART) Data Terminal ready Disable
-AT91C_US_RTSEN            EQU (0x1:SHL:18) ;- (USART) Request to Send enable
-AT91C_US_RTSDIS           EQU (0x1:SHL:19) ;- (USART) Request to Send Disable
-;- -------- US_MR : (USART Offset: 0x4) Debug Unit Mode Register -------- 
-AT91C_US_USMODE           EQU (0xF:SHL:0) ;- (USART) Usart mode
-AT91C_US_USMODE_NORMAL    EQU (0x0) ;- (USART) Normal
-AT91C_US_USMODE_RS485     EQU (0x1) ;- (USART) RS485
-AT91C_US_USMODE_HWHSH     EQU (0x2) ;- (USART) Hardware Handshaking
-AT91C_US_USMODE_MODEM     EQU (0x3) ;- (USART) Modem
-AT91C_US_USMODE_ISO7816_0 EQU (0x4) ;- (USART) ISO7816 protocol: T = 0
-AT91C_US_USMODE_ISO7816_1 EQU (0x6) ;- (USART) ISO7816 protocol: T = 1
-AT91C_US_USMODE_IRDA      EQU (0x8) ;- (USART) IrDA
-AT91C_US_USMODE_SWHSH     EQU (0xC) ;- (USART) Software Handshaking
-AT91C_US_CLKS             EQU (0x3:SHL:4) ;- (USART) Clock Selection (Baud Rate generator Input Clock
-AT91C_US_CLKS_CLOCK       EQU (0x0:SHL:4) ;- (USART) Clock
-AT91C_US_CLKS_FDIV1       EQU (0x1:SHL:4) ;- (USART) fdiv1
-AT91C_US_CLKS_SLOW        EQU (0x2:SHL:4) ;- (USART) slow_clock (ARM)
-AT91C_US_CLKS_EXT         EQU (0x3:SHL:4) ;- (USART) External (SCK)
-AT91C_US_CHRL             EQU (0x3:SHL:6) ;- (USART) Clock Selection (Baud Rate generator Input Clock
-AT91C_US_CHRL_5_BITS      EQU (0x0:SHL:6) ;- (USART) Character Length: 5 bits
-AT91C_US_CHRL_6_BITS      EQU (0x1:SHL:6) ;- (USART) Character Length: 6 bits
-AT91C_US_CHRL_7_BITS      EQU (0x2:SHL:6) ;- (USART) Character Length: 7 bits
-AT91C_US_CHRL_8_BITS      EQU (0x3:SHL:6) ;- (USART) Character Length: 8 bits
-AT91C_US_SYNC             EQU (0x1:SHL:8) ;- (USART) Synchronous Mode Select
-AT91C_US_NBSTOP           EQU (0x3:SHL:12) ;- (USART) Number of Stop bits
-AT91C_US_NBSTOP_1_BIT     EQU (0x0:SHL:12) ;- (USART) 1 stop bit
-AT91C_US_NBSTOP_15_BIT    EQU (0x1:SHL:12) ;- (USART) Asynchronous (SYNC=0) 2 stop bits Synchronous (SYNC=1) 2 stop bits
-AT91C_US_NBSTOP_2_BIT     EQU (0x2:SHL:12) ;- (USART) 2 stop bits
-AT91C_US_MSBF             EQU (0x1:SHL:16) ;- (USART) Bit Order
-AT91C_US_MODE9            EQU (0x1:SHL:17) ;- (USART) 9-bit Character length
-AT91C_US_CKLO             EQU (0x1:SHL:18) ;- (USART) Clock Output Select
-AT91C_US_OVER             EQU (0x1:SHL:19) ;- (USART) Over Sampling Mode
-AT91C_US_INACK            EQU (0x1:SHL:20) ;- (USART) Inhibit Non Acknowledge
-AT91C_US_DSNACK           EQU (0x1:SHL:21) ;- (USART) Disable Successive NACK
-AT91C_US_MAX_ITER         EQU (0x1:SHL:24) ;- (USART) Number of Repetitions
-AT91C_US_FILTER           EQU (0x1:SHL:28) ;- (USART) Receive Line Filter
-;- -------- US_IER : (USART Offset: 0x8) Debug Unit Interrupt Enable Register -------- 
-AT91C_US_RXBRK            EQU (0x1:SHL:2) ;- (USART) Break Received/End of Break
-AT91C_US_TIMEOUT          EQU (0x1:SHL:8) ;- (USART) Receiver Time-out
-AT91C_US_ITERATION        EQU (0x1:SHL:10) ;- (USART) Max number of Repetitions Reached
-AT91C_US_NACK             EQU (0x1:SHL:13) ;- (USART) Non Acknowledge
-AT91C_US_RIIC             EQU (0x1:SHL:16) ;- (USART) Ring INdicator Input Change Flag
-AT91C_US_DSRIC            EQU (0x1:SHL:17) ;- (USART) Data Set Ready Input Change Flag
-AT91C_US_DCDIC            EQU (0x1:SHL:18) ;- (USART) Data Carrier Flag
-AT91C_US_CTSIC            EQU (0x1:SHL:19) ;- (USART) Clear To Send Input Change Flag
-;- -------- US_IDR : (USART Offset: 0xc) Debug Unit Interrupt Disable Register -------- 
-;- -------- US_IMR : (USART Offset: 0x10) Debug Unit Interrupt Mask Register -------- 
-;- -------- US_CSR : (USART Offset: 0x14) Debug Unit Channel Status Register -------- 
-AT91C_US_RI               EQU (0x1:SHL:20) ;- (USART) Image of RI Input
-AT91C_US_DSR              EQU (0x1:SHL:21) ;- (USART) Image of DSR Input
-AT91C_US_DCD              EQU (0x1:SHL:22) ;- (USART) Image of DCD Input
-AT91C_US_CTS              EQU (0x1:SHL:23) ;- (USART) Image of CTS Input
-
-;- *****************************************************************************
-;-              SOFTWARE API DEFINITION  FOR Two-wire Interface
-;- *****************************************************************************
-                ^ 0 ;- AT91S_TWI
-TWI_CR          #  4 ;- Control Register
-TWI_MMR         #  4 ;- Master Mode Register
-TWI_SMR         #  4 ;- Slave Mode Register
-TWI_IADR        #  4 ;- Internal Address Register
-TWI_CWGR        #  4 ;- Clock Waveform Generator Register
-                # 12 ;- Reserved
-TWI_SR          #  4 ;- Status Register
-TWI_IER         #  4 ;- Interrupt Enable Register
-TWI_IDR         #  4 ;- Interrupt Disable Register
-TWI_IMR         #  4 ;- Interrupt Mask Register
-TWI_RHR         #  4 ;- Receive Holding Register
-TWI_THR         #  4 ;- Transmit Holding Register
-;- -------- TWI_CR : (TWI Offset: 0x0) TWI Control Register -------- 
-AT91C_TWI_START           EQU (0x1:SHL:0) ;- (TWI) Send a START Condition
-AT91C_TWI_STOP            EQU (0x1:SHL:1) ;- (TWI) Send a STOP Condition
-AT91C_TWI_MSEN            EQU (0x1:SHL:2) ;- (TWI) TWI Master Transfer Enabled
-AT91C_TWI_MSDIS           EQU (0x1:SHL:3) ;- (TWI) TWI Master Transfer Disabled
-AT91C_TWI_SVEN            EQU (0x1:SHL:4) ;- (TWI) TWI Slave Transfer Enabled
-AT91C_TWI_SVDIS           EQU (0x1:SHL:5) ;- (TWI) TWI Slave Transfer Disabled
-AT91C_TWI_SWRST           EQU (0x1:SHL:7) ;- (TWI) Software Reset
-;- -------- TWI_MMR : (TWI Offset: 0x4) TWI Master Mode Register -------- 
-AT91C_TWI_IADRSZ          EQU (0x3:SHL:8) ;- (TWI) Internal Device Address Size
-AT91C_TWI_IADRSZ_NO       EQU (0x0:SHL:8) ;- (TWI) No internal device address
-AT91C_TWI_IADRSZ_1_BYTE   EQU (0x1:SHL:8) ;- (TWI) One-byte internal device address
-AT91C_TWI_IADRSZ_2_BYTE   EQU (0x2:SHL:8) ;- (TWI) Two-byte internal device address
-AT91C_TWI_IADRSZ_3_BYTE   EQU (0x3:SHL:8) ;- (TWI) Three-byte internal device address
-AT91C_TWI_MREAD           EQU (0x1:SHL:12) ;- (TWI) Master Read Direction
-AT91C_TWI_DADR            EQU (0x7F:SHL:16) ;- (TWI) Device Address
-;- -------- TWI_SMR : (TWI Offset: 0x8) TWI Slave Mode Register -------- 
-AT91C_TWI_SADR            EQU (0x7F:SHL:16) ;- (TWI) Slave Device Address
-;- -------- TWI_CWGR : (TWI Offset: 0x10) TWI Clock Waveform Generator Register -------- 
-AT91C_TWI_CLDIV           EQU (0xFF:SHL:0) ;- (TWI) Clock Low Divider
-AT91C_TWI_CHDIV           EQU (0xFF:SHL:8) ;- (TWI) Clock High Divider
-AT91C_TWI_CKDIV           EQU (0x7:SHL:16) ;- (TWI) Clock Divider
-;- -------- TWI_SR : (TWI Offset: 0x20) TWI Status Register -------- 
-AT91C_TWI_TXCOMP          EQU (0x1:SHL:0) ;- (TWI) Transmission Completed
-AT91C_TWI_RXRDY           EQU (0x1:SHL:1) ;- (TWI) Receive holding register ReaDY
-AT91C_TWI_TXRDY           EQU (0x1:SHL:2) ;- (TWI) Transmit holding register ReaDY
-AT91C_TWI_SVREAD          EQU (0x1:SHL:3) ;- (TWI) Slave Read
-AT91C_TWI_SVACC           EQU (0x1:SHL:4) ;- (TWI) Slave Access
-AT91C_TWI_GCACC           EQU (0x1:SHL:5) ;- (TWI) General Call Access
-AT91C_TWI_OVRE            EQU (0x1:SHL:6) ;- (TWI) Overrun Error
-AT91C_TWI_UNRE            EQU (0x1:SHL:7) ;- (TWI) Underrun Error
-AT91C_TWI_NACK            EQU (0x1:SHL:8) ;- (TWI) Not Acknowledged
-AT91C_TWI_ARBLST          EQU (0x1:SHL:9) ;- (TWI) Arbitration Lost
-;- -------- TWI_IER : (TWI Offset: 0x24) TWI Interrupt Enable Register -------- 
-;- -------- TWI_IDR : (TWI Offset: 0x28) TWI Interrupt Disable Register -------- 
-;- -------- TWI_IMR : (TWI Offset: 0x2c) TWI Interrupt Mask Register -------- 
-
-;- *****************************************************************************
-;-              SOFTWARE API DEFINITION  FOR Multimedia Card Interface
-;- *****************************************************************************
-                ^ 0 ;- AT91S_MCI
-MCI_CR          #  4 ;- MCI Control Register
-MCI_MR          #  4 ;- MCI Mode Register
-MCI_DTOR        #  4 ;- MCI Data Timeout Register
-MCI_SDCR        #  4 ;- MCI SD Card Register
-MCI_ARGR        #  4 ;- MCI Argument Register
-MCI_CMDR        #  4 ;- MCI Command Register
-                #  8 ;- Reserved
-MCI_RSPR        # 16 ;- MCI Response Register
-MCI_RDR         #  4 ;- MCI Receive Data Register
-MCI_TDR         #  4 ;- MCI Transmit Data Register
-                #  8 ;- Reserved
-MCI_SR          #  4 ;- MCI Status Register
-MCI_IER         #  4 ;- MCI Interrupt Enable Register
-MCI_IDR         #  4 ;- MCI Interrupt Disable Register
-MCI_IMR         #  4 ;- MCI Interrupt Mask Register
-                # 176 ;- Reserved
-MCI_RPR         #  4 ;- Receive Pointer Register
-MCI_RCR         #  4 ;- Receive Counter Register
-MCI_TPR         #  4 ;- Transmit Pointer Register
-MCI_TCR         #  4 ;- Transmit Counter Register
-MCI_RNPR        #  4 ;- Receive Next Pointer Register
-MCI_RNCR        #  4 ;- Receive Next Counter Register
-MCI_TNPR        #  4 ;- Transmit Next Pointer Register
-MCI_TNCR        #  4 ;- Transmit Next Counter Register
-MCI_PTCR        #  4 ;- PDC Transfer Control Register
-MCI_PTSR        #  4 ;- PDC Transfer Status Register
-;- -------- MCI_CR : (MCI Offset: 0x0) MCI Control Register -------- 
-AT91C_MCI_MCIEN           EQU (0x1:SHL:0) ;- (MCI) Multimedia Interface Enable
-AT91C_MCI_MCIDIS          EQU (0x1:SHL:1) ;- (MCI) Multimedia Interface Disable
-AT91C_MCI_PWSEN           EQU (0x1:SHL:2) ;- (MCI) Power Save Mode Enable
-AT91C_MCI_PWSDIS          EQU (0x1:SHL:3) ;- (MCI) Power Save Mode Disable
-;- -------- MCI_MR : (MCI Offset: 0x4) MCI Mode Register -------- 
-AT91C_MCI_CLKDIV          EQU (0x1:SHL:0) ;- (MCI) Clock Divider
-AT91C_MCI_PWSDIV          EQU (0x1:SHL:8) ;- (MCI) Power Saving Divider
-AT91C_MCI_PDCPADV         EQU (0x1:SHL:14) ;- (MCI) PDC Padding Value
-AT91C_MCI_PDCMODE         EQU (0x1:SHL:15) ;- (MCI) PDC Oriented Mode
-AT91C_MCI_BLKLEN          EQU (0x1:SHL:18) ;- (MCI) Data Block Length
-;- -------- MCI_DTOR : (MCI Offset: 0x8) MCI Data Timeout Register -------- 
-AT91C_MCI_DTOCYC          EQU (0x1:SHL:0) ;- (MCI) Data Timeout Cycle Number
-AT91C_MCI_DTOMUL          EQU (0x7:SHL:4) ;- (MCI) Data Timeout Multiplier
-AT91C_MCI_DTOMUL_1        EQU (0x0:SHL:4) ;- (MCI) DTOCYC x 1
-AT91C_MCI_DTOMUL_16       EQU (0x1:SHL:4) ;- (MCI) DTOCYC x 16
-AT91C_MCI_DTOMUL_128      EQU (0x2:SHL:4) ;- (MCI) DTOCYC x 128
-AT91C_MCI_DTOMUL_256      EQU (0x3:SHL:4) ;- (MCI) DTOCYC x 256
-AT91C_MCI_DTOMUL_1024     EQU (0x4:SHL:4) ;- (MCI) DTOCYC x 1024
-AT91C_MCI_DTOMUL_4096     EQU (0x5:SHL:4) ;- (MCI) DTOCYC x 4096
-AT91C_MCI_DTOMUL_65536    EQU (0x6:SHL:4) ;- (MCI) DTOCYC x 65536
-AT91C_MCI_DTOMUL_1048576  EQU (0x7:SHL:4) ;- (MCI) DTOCYC x 1048576
-;- -------- MCI_SDCR : (MCI Offset: 0xc) MCI SD Card Register -------- 
-AT91C_MCI_SCDSEL          EQU (0x1:SHL:0) ;- (MCI) SD Card Selector
-AT91C_MCI_SCDBUS          EQU (0x1:SHL:7) ;- (MCI) SD Card Bus Width
-;- -------- MCI_CMDR : (MCI Offset: 0x14) MCI Command Register -------- 
-AT91C_MCI_CMDNB           EQU (0x1F:SHL:0) ;- (MCI) Command Number
-AT91C_MCI_RSPTYP          EQU (0x3:SHL:6) ;- (MCI) Response Type
-AT91C_MCI_RSPTYP_NO       EQU (0x0:SHL:6) ;- (MCI) No response
-AT91C_MCI_RSPTYP_48       EQU (0x1:SHL:6) ;- (MCI) 48-bit response
-AT91C_MCI_RSPTYP_136      EQU (0x2:SHL:6) ;- (MCI) 136-bit response
-AT91C_MCI_SPCMD           EQU (0x7:SHL:8) ;- (MCI) Special CMD
-AT91C_MCI_SPCMD_NONE      EQU (0x0:SHL:8) ;- (MCI) Not a special CMD
-AT91C_MCI_SPCMD_INIT      EQU (0x1:SHL:8) ;- (MCI) Initialization CMD
-AT91C_MCI_SPCMD_SYNC      EQU (0x2:SHL:8) ;- (MCI) Synchronized CMD
-AT91C_MCI_SPCMD_IT_CMD    EQU (0x4:SHL:8) ;- (MCI) Interrupt command
-AT91C_MCI_SPCMD_IT_REP    EQU (0x5:SHL:8) ;- (MCI) Interrupt response
-AT91C_MCI_OPDCMD          EQU (0x1:SHL:11) ;- (MCI) Open Drain Command
-AT91C_MCI_MAXLAT          EQU (0x1:SHL:12) ;- (MCI) Maximum Latency for Command to respond
-AT91C_MCI_TRCMD           EQU (0x3:SHL:16) ;- (MCI) Transfer CMD
-AT91C_MCI_TRCMD_NO        EQU (0x0:SHL:16) ;- (MCI) No transfer
-AT91C_MCI_TRCMD_START     EQU (0x1:SHL:16) ;- (MCI) Start transfer
-AT91C_MCI_TRCMD_STOP      EQU (0x2:SHL:16) ;- (MCI) Stop transfer
-AT91C_MCI_TRDIR           EQU (0x1:SHL:18) ;- (MCI) Transfer Direction
-AT91C_MCI_TRTYP           EQU (0x3:SHL:19) ;- (MCI) Transfer Type
-AT91C_MCI_TRTYP_BLOCK     EQU (0x0:SHL:19) ;- (MCI) Block Transfer type
-AT91C_MCI_TRTYP_MULTIPLE  EQU (0x1:SHL:19) ;- (MCI) Multiple Block transfer type
-AT91C_MCI_TRTYP_STREAM    EQU (0x2:SHL:19) ;- (MCI) Stream transfer type
-;- -------- MCI_SR : (MCI Offset: 0x40) MCI Status Register -------- 
-AT91C_MCI_CMDRDY          EQU (0x1:SHL:0) ;- (MCI) Command Ready flag
-AT91C_MCI_RXRDY           EQU (0x1:SHL:1) ;- (MCI) RX Ready flag
-AT91C_MCI_TXRDY           EQU (0x1:SHL:2) ;- (MCI) TX Ready flag
-AT91C_MCI_BLKE            EQU (0x1:SHL:3) ;- (MCI) Data Block Transfer Ended flag
-AT91C_MCI_DTIP            EQU (0x1:SHL:4) ;- (MCI) Data Transfer in Progress flag
-AT91C_MCI_NOTBUSY         EQU (0x1:SHL:5) ;- (MCI) Data Line Not Busy flag
-AT91C_MCI_ENDRX           EQU (0x1:SHL:6) ;- (MCI) End of RX Buffer flag
-AT91C_MCI_ENDTX           EQU (0x1:SHL:7) ;- (MCI) End of TX Buffer flag
-AT91C_MCI_RXBUFF          EQU (0x1:SHL:14) ;- (MCI) RX Buffer Full flag
-AT91C_MCI_TXBUFE          EQU (0x1:SHL:15) ;- (MCI) TX Buffer Empty flag
-AT91C_MCI_RINDE           EQU (0x1:SHL:16) ;- (MCI) Response Index Error flag
-AT91C_MCI_RDIRE           EQU (0x1:SHL:17) ;- (MCI) Response Direction Error flag
-AT91C_MCI_RCRCE           EQU (0x1:SHL:18) ;- (MCI) Response CRC Error flag
-AT91C_MCI_RENDE           EQU (0x1:SHL:19) ;- (MCI) Response End Bit Error flag
-AT91C_MCI_RTOE            EQU (0x1:SHL:20) ;- (MCI) Response Time-out Error flag
-AT91C_MCI_DCRCE           EQU (0x1:SHL:21) ;- (MCI) data CRC Error flag
-AT91C_MCI_DTOE            EQU (0x1:SHL:22) ;- (MCI) Data timeout Error flag
-AT91C_MCI_OVRE            EQU (0x1:SHL:30) ;- (MCI) Overrun flag
-AT91C_MCI_UNRE            EQU (0x1:SHL:31) ;- (MCI) Underrun flag
-;- -------- MCI_IER : (MCI Offset: 0x44) MCI Interrupt Enable Register -------- 
-;- -------- MCI_IDR : (MCI Offset: 0x48) MCI Interrupt Disable Register -------- 
-;- -------- MCI_IMR : (MCI Offset: 0x4c) MCI Interrupt Mask Register -------- 
-
-;- *****************************************************************************
-;-              SOFTWARE API DEFINITION  FOR USB Device Interface
-;- *****************************************************************************
-                ^ 0 ;- AT91S_UDP
-UDP_NUM         #  4 ;- Frame Number Register
-UDP_GLBSTATE    #  4 ;- Global State Register
-UDP_FADDR       #  4 ;- Function Address Register
-                #  4 ;- Reserved
-UDP_IER         #  4 ;- Interrupt Enable Register
-UDP_IDR         #  4 ;- Interrupt Disable Register
-UDP_IMR         #  4 ;- Interrupt Mask Register
-UDP_ISR         #  4 ;- Interrupt Status Register
-UDP_ICR         #  4 ;- Interrupt Clear Register
-                #  4 ;- Reserved
-UDP_RSTEP       #  4 ;- Reset Endpoint Register
-                #  4 ;- Reserved
-UDP_CSR         # 32 ;- Endpoint Control and Status Register
-UDP_FDR         # 32 ;- Endpoint FIFO Data Register
-;- -------- UDP_FRM_NUM : (UDP Offset: 0x0) USB Frame Number Register -------- 
-AT91C_UDP_FRM_NUM         EQU (0x7FF:SHL:0) ;- (UDP) Frame Number as Defined in the Packet Field Formats
-AT91C_UDP_FRM_ERR         EQU (0x1:SHL:16) ;- (UDP) Frame Error
-AT91C_UDP_FRM_OK          EQU (0x1:SHL:17) ;- (UDP) Frame OK
-;- -------- UDP_GLB_STATE : (UDP Offset: 0x4) USB Global State Register -------- 
-AT91C_UDP_FADDEN          EQU (0x1:SHL:0) ;- (UDP) Function Address Enable
-AT91C_UDP_CONFG           EQU (0x1:SHL:1) ;- (UDP) Configured
-AT91C_UDP_RMWUPE          EQU (0x1:SHL:2) ;- (UDP) Remote Wake Up Enable
-AT91C_UDP_RSMINPR         EQU (0x1:SHL:3) ;- (UDP) A Resume Has Been Sent to the Host
-;- -------- UDP_FADDR : (UDP Offset: 0x8) USB Function Address Register -------- 
-AT91C_UDP_FADD            EQU (0xFF:SHL:0) ;- (UDP) Function Address Value
-AT91C_UDP_FEN             EQU (0x1:SHL:8) ;- (UDP) Function Enable
-;- -------- UDP_IER : (UDP Offset: 0x10) USB Interrupt Enable Register -------- 
-AT91C_UDP_EPINT0          EQU (0x1:SHL:0) ;- (UDP) Endpoint 0 Interrupt
-AT91C_UDP_EPINT1          EQU (0x1:SHL:1) ;- (UDP) Endpoint 0 Interrupt
-AT91C_UDP_EPINT2          EQU (0x1:SHL:2) ;- (UDP) Endpoint 2 Interrupt
-AT91C_UDP_EPINT3          EQU (0x1:SHL:3) ;- (UDP) Endpoint 3 Interrupt
-AT91C_UDP_EPINT4          EQU (0x1:SHL:4) ;- (UDP) Endpoint 4 Interrupt
-AT91C_UDP_EPINT5          EQU (0x1:SHL:5) ;- (UDP) Endpoint 5 Interrupt
-AT91C_UDP_EPINT6          EQU (0x1:SHL:6) ;- (UDP) Endpoint 6 Interrupt
-AT91C_UDP_EPINT7          EQU (0x1:SHL:7) ;- (UDP) Endpoint 7 Interrupt
-AT91C_UDP_RXSUSP          EQU (0x1:SHL:8) ;- (UDP) USB Suspend Interrupt
-AT91C_UDP_RXRSM           EQU (0x1:SHL:9) ;- (UDP) USB Resume Interrupt
-AT91C_UDP_EXTRSM          EQU (0x1:SHL:10) ;- (UDP) USB External Resume Interrupt
-AT91C_UDP_SOFINT          EQU (0x1:SHL:11) ;- (UDP) USB Start Of frame Interrupt
-AT91C_UDP_WAKEUP          EQU (0x1:SHL:13) ;- (UDP) USB Resume Interrupt
-;- -------- UDP_IDR : (UDP Offset: 0x14) USB Interrupt Disable Register -------- 
-;- -------- UDP_IMR : (UDP Offset: 0x18) USB Interrupt Mask Register -------- 
-;- -------- UDP_ISR : (UDP Offset: 0x1c) USB Interrupt Status Register -------- 
-AT91C_UDP_ENDBUSRES       EQU (0x1:SHL:12) ;- (UDP) USB End Of Bus Reset Interrupt
-;- -------- UDP_ICR : (UDP Offset: 0x20) USB Interrupt Clear Register -------- 
-;- -------- UDP_RST_EP : (UDP Offset: 0x28) USB Reset Endpoint Register -------- 
-AT91C_UDP_EP0             EQU (0x1:SHL:0) ;- (UDP) Reset Endpoint 0
-AT91C_UDP_EP1             EQU (0x1:SHL:1) ;- (UDP) Reset Endpoint 1
-AT91C_UDP_EP2             EQU (0x1:SHL:2) ;- (UDP) Reset Endpoint 2
-AT91C_UDP_EP3             EQU (0x1:SHL:3) ;- (UDP) Reset Endpoint 3
-AT91C_UDP_EP4             EQU (0x1:SHL:4) ;- (UDP) Reset Endpoint 4
-AT91C_UDP_EP5             EQU (0x1:SHL:5) ;- (UDP) Reset Endpoint 5
-AT91C_UDP_EP6             EQU (0x1:SHL:6) ;- (UDP) Reset Endpoint 6
-AT91C_UDP_EP7             EQU (0x1:SHL:7) ;- (UDP) Reset Endpoint 7
-;- -------- UDP_CSR : (UDP Offset: 0x30) USB Endpoint Control and Status Register -------- 
-AT91C_UDP_TXCOMP          EQU (0x1:SHL:0) ;- (UDP) Generates an IN packet with data previously written in the DPR
-AT91C_UDP_RX_DATA_BK0     EQU (0x1:SHL:1) ;- (UDP) Receive Data Bank 0
-AT91C_UDP_RXSETUP         EQU (0x1:SHL:2) ;- (UDP) Sends STALL to the Host (Control endpoints)
-AT91C_UDP_ISOERROR        EQU (0x1:SHL:3) ;- (UDP) Isochronous error (Isochronous endpoints)
-AT91C_UDP_TXPKTRDY        EQU (0x1:SHL:4) ;- (UDP) Transmit Packet Ready
-AT91C_UDP_FORCESTALL      EQU (0x1:SHL:5) ;- (UDP) Force Stall (used by Control, Bulk and Isochronous endpoints).
-AT91C_UDP_RX_DATA_BK1     EQU (0x1:SHL:6) ;- (UDP) Receive Data Bank 1 (only used by endpoints with ping-pong attributes).
-AT91C_UDP_DIR             EQU (0x1:SHL:7) ;- (UDP) Transfer Direction
-AT91C_UDP_EPTYPE          EQU (0x7:SHL:8) ;- (UDP) Endpoint type
-AT91C_UDP_EPTYPE_CTRL     EQU (0x0:SHL:8) ;- (UDP) Control
-AT91C_UDP_EPTYPE_ISO_OUT  EQU (0x1:SHL:8) ;- (UDP) Isochronous OUT
-AT91C_UDP_EPTYPE_BULK_OUT EQU (0x2:SHL:8) ;- (UDP) Bulk OUT
-AT91C_UDP_EPTYPE_INT_OUT  EQU (0x3:SHL:8) ;- (UDP) Interrupt OUT
-AT91C_UDP_EPTYPE_ISO_IN   EQU (0x5:SHL:8) ;- (UDP) Isochronous IN
-AT91C_UDP_EPTYPE_BULK_IN  EQU (0x6:SHL:8) ;- (UDP) Bulk IN
-AT91C_UDP_EPTYPE_INT_IN   EQU (0x7:SHL:8) ;- (UDP) Interrupt IN
-AT91C_UDP_DTGLE           EQU (0x1:SHL:11) ;- (UDP) Data Toggle
-AT91C_UDP_EPEDS           EQU (0x1:SHL:15) ;- (UDP) Endpoint Enable Disable
-AT91C_UDP_RXBYTECNT       EQU (0x7FF:SHL:16) ;- (UDP) Number Of Bytes Available in the FIFO
-
-;- *****************************************************************************
-;-              SOFTWARE API DEFINITION  FOR Timer Counter Channel Interface
-;- *****************************************************************************
-                ^ 0 ;- AT91S_TC
-TC_CCR          #  4 ;- Channel Control Register
-TC_CMR          #  4 ;- Channel Mode Register
-                #  8 ;- Reserved
-TC_CV           #  4 ;- Counter Value
-TC_RA           #  4 ;- Register A
-TC_RB           #  4 ;- Register B
-TC_RC           #  4 ;- Register C
-TC_SR           #  4 ;- Status Register
-TC_IER          #  4 ;- Interrupt Enable Register
-TC_IDR          #  4 ;- Interrupt Disable Register
-TC_IMR          #  4 ;- Interrupt Mask Register
-;- -------- TC_CCR : (TC Offset: 0x0) TC Channel Control Register -------- 
-AT91C_TC_CLKEN            EQU (0x1:SHL:0) ;- (TC) Counter Clock Enable Command
-AT91C_TC_CLKDIS           EQU (0x1:SHL:1) ;- (TC) Counter Clock Disable Command
-AT91C_TC_SWTRG            EQU (0x1:SHL:2) ;- (TC) Software Trigger Command
-;- -------- TC_CMR : (TC Offset: 0x4) TC Channel Mode Register: Capture Mode / Waveform Mode -------- 
-AT91C_TC_CPCSTOP          EQU (0x1:SHL:6) ;- (TC) Counter Clock Stopped with RC Compare
-AT91C_TC_CPCDIS           EQU (0x1:SHL:7) ;- (TC) Counter Clock Disable with RC Compare
-AT91C_TC_EEVTEDG          EQU (0x3:SHL:8) ;- (TC) External Event Edge Selection
-AT91C_TC_EEVTEDG_NONE     EQU (0x0:SHL:8) ;- (TC) Edge: None
-AT91C_TC_EEVTEDG_RISING   EQU (0x1:SHL:8) ;- (TC) Edge: rising edge
-AT91C_TC_EEVTEDG_FALLING  EQU (0x2:SHL:8) ;- (TC) Edge: falling edge
-AT91C_TC_EEVTEDG_BOTH     EQU (0x3:SHL:8) ;- (TC) Edge: each edge
-AT91C_TC_EEVT             EQU (0x3:SHL:10) ;- (TC) External Event  Selection
-AT91C_TC_EEVT_NONE        EQU (0x0:SHL:10) ;- (TC) Signal selected as external event: TIOB TIOB direction: input
-AT91C_TC_EEVT_RISING      EQU (0x1:SHL:10) ;- (TC) Signal selected as external event: XC0 TIOB direction: output
-AT91C_TC_EEVT_FALLING     EQU (0x2:SHL:10) ;- (TC) Signal selected as external event: XC1 TIOB direction: output
-AT91C_TC_EEVT_BOTH        EQU (0x3:SHL:10) ;- (TC) Signal selected as external event: XC2 TIOB direction: output
-AT91C_TC_ENETRG           EQU (0x1:SHL:12) ;- (TC) External Event Trigger enable
-AT91C_TC_WAVESEL          EQU (0x3:SHL:13) ;- (TC) Waveform  Selection
-AT91C_TC_WAVESEL_UP       EQU (0x0:SHL:13) ;- (TC) UP mode without atomatic trigger on RC Compare
-AT91C_TC_WAVESEL_UPDOWN   EQU (0x1:SHL:13) ;- (TC) UPDOWN mode without automatic trigger on RC Compare
-AT91C_TC_WAVESEL_UP_AUTO  EQU (0x2:SHL:13) ;- (TC) UP mode with automatic trigger on RC Compare
-AT91C_TC_WAVESEL_UPDOWN_AUTO EQU (0x3:SHL:13) ;- (TC) UPDOWN mode with automatic trigger on RC Compare
-AT91C_TC_CPCTRG           EQU (0x1:SHL:14) ;- (TC) RC Compare Trigger Enable
-AT91C_TC_WAVE             EQU (0x1:SHL:15) ;- (TC) 
-AT91C_TC_ACPA             EQU (0x3:SHL:16) ;- (TC) RA Compare Effect on TIOA
-AT91C_TC_ACPA_NONE        EQU (0x0:SHL:16) ;- (TC) Effect: none
-AT91C_TC_ACPA_SET         EQU (0x1:SHL:16) ;- (TC) Effect: set
-AT91C_TC_ACPA_CLEAR       EQU (0x2:SHL:16) ;- (TC) Effect: clear
-AT91C_TC_ACPA_TOGGLE      EQU (0x3:SHL:16) ;- (TC) Effect: toggle
-AT91C_TC_ACPC             EQU (0x3:SHL:18) ;- (TC) RC Compare Effect on TIOA
-AT91C_TC_ACPC_NONE        EQU (0x0:SHL:18) ;- (TC) Effect: none
-AT91C_TC_ACPC_SET         EQU (0x1:SHL:18) ;- (TC) Effect: set
-AT91C_TC_ACPC_CLEAR       EQU (0x2:SHL:18) ;- (TC) Effect: clear
-AT91C_TC_ACPC_TOGGLE      EQU (0x3:SHL:18) ;- (TC) Effect: toggle
-AT91C_TC_AEEVT            EQU (0x3:SHL:20) ;- (TC) External Event Effect on TIOA
-AT91C_TC_AEEVT_NONE       EQU (0x0:SHL:20) ;- (TC) Effect: none
-AT91C_TC_AEEVT_SET        EQU (0x1:SHL:20) ;- (TC) Effect: set
-AT91C_TC_AEEVT_CLEAR      EQU (0x2:SHL:20) ;- (TC) Effect: clear
-AT91C_TC_AEEVT_TOGGLE     EQU (0x3:SHL:20) ;- (TC) Effect: toggle
-AT91C_TC_ASWTRG           EQU (0x3:SHL:22) ;- (TC) Software Trigger Effect on TIOA
-AT91C_TC_ASWTRG_NONE      EQU (0x0:SHL:22) ;- (TC) Effect: none
-AT91C_TC_ASWTRG_SET       EQU (0x1:SHL:22) ;- (TC) Effect: set
-AT91C_TC_ASWTRG_CLEAR     EQU (0x2:SHL:22) ;- (TC) Effect: clear
-AT91C_TC_ASWTRG_TOGGLE    EQU (0x3:SHL:22) ;- (TC) Effect: toggle
-AT91C_TC_BCPB             EQU (0x3:SHL:24) ;- (TC) RB Compare Effect on TIOB
-AT91C_TC_BCPB_NONE        EQU (0x0:SHL:24) ;- (TC) Effect: none
-AT91C_TC_BCPB_SET         EQU (0x1:SHL:24) ;- (TC) Effect: set
-AT91C_TC_BCPB_CLEAR       EQU (0x2:SHL:24) ;- (TC) Effect: clear
-AT91C_TC_BCPB_TOGGLE      EQU (0x3:SHL:24) ;- (TC) Effect: toggle
-AT91C_TC_BCPC             EQU (0x3:SHL:26) ;- (TC) RC Compare Effect on TIOB
-AT91C_TC_BCPC_NONE        EQU (0x0:SHL:26) ;- (TC) Effect: none
-AT91C_TC_BCPC_SET         EQU (0x1:SHL:26) ;- (TC) Effect: set
-AT91C_TC_BCPC_CLEAR       EQU (0x2:SHL:26) ;- (TC) Effect: clear
-AT91C_TC_BCPC_TOGGLE      EQU (0x3:SHL:26) ;- (TC) Effect: toggle
-AT91C_TC_BEEVT            EQU (0x3:SHL:28) ;- (TC) External Event Effect on TIOB
-AT91C_TC_BEEVT_NONE       EQU (0x0:SHL:28) ;- (TC) Effect: none
-AT91C_TC_BEEVT_SET        EQU (0x1:SHL:28) ;- (TC) Effect: set
-AT91C_TC_BEEVT_CLEAR      EQU (0x2:SHL:28) ;- (TC) Effect: clear
-AT91C_TC_BEEVT_TOGGLE     EQU (0x3:SHL:28) ;- (TC) Effect: toggle
-AT91C_TC_BSWTRG           EQU (0x3:SHL:30) ;- (TC) Software Trigger Effect on TIOB
-AT91C_TC_BSWTRG_NONE      EQU (0x0:SHL:30) ;- (TC) Effect: none
-AT91C_TC_BSWTRG_SET       EQU (0x1:SHL:30) ;- (TC) Effect: set
-AT91C_TC_BSWTRG_CLEAR     EQU (0x2:SHL:30) ;- (TC) Effect: clear
-AT91C_TC_BSWTRG_TOGGLE    EQU (0x3:SHL:30) ;- (TC) Effect: toggle
-;- -------- TC_SR : (TC Offset: 0x20) TC Channel Status Register -------- 
-AT91C_TC_COVFS            EQU (0x1:SHL:0) ;- (TC) Counter Overflow
-AT91C_TC_LOVRS            EQU (0x1:SHL:1) ;- (TC) Load Overrun
-AT91C_TC_CPAS             EQU (0x1:SHL:2) ;- (TC) RA Compare
-AT91C_TC_CPBS             EQU (0x1:SHL:3) ;- (TC) RB Compare
-AT91C_TC_CPCS             EQU (0x1:SHL:4) ;- (TC) RC Compare
-AT91C_TC_LDRAS            EQU (0x1:SHL:5) ;- (TC) RA Loading
-AT91C_TC_LDRBS            EQU (0x1:SHL:6) ;- (TC) RB Loading
-AT91C_TC_ETRCS            EQU (0x1:SHL:7) ;- (TC) External Trigger
-AT91C_TC_ETRGS            EQU (0x1:SHL:16) ;- (TC) Clock Enabling
-AT91C_TC_MTIOA            EQU (0x1:SHL:17) ;- (TC) TIOA Mirror
-AT91C_TC_MTIOB            EQU (0x1:SHL:18) ;- (TC) TIOA Mirror
-;- -------- TC_IER : (TC Offset: 0x24) TC Channel Interrupt Enable Register -------- 
-;- -------- TC_IDR : (TC Offset: 0x28) TC Channel Interrupt Disable Register -------- 
-;- -------- TC_IMR : (TC Offset: 0x2c) TC Channel Interrupt Mask Register -------- 
-
-;- *****************************************************************************
-;-              SOFTWARE API DEFINITION  FOR Timer Counter Interface
-;- *****************************************************************************
-                ^ 0 ;- AT91S_TCB
-TCB_TC0         # 48 ;- TC Channel 0
-                # 16 ;- Reserved
-TCB_TC1         # 48 ;- TC Channel 1
-                # 16 ;- Reserved
-TCB_TC2         # 48 ;- TC Channel 2
-                # 16 ;- Reserved
-TCB_BCR         #  4 ;- TC Block Control Register
-TCB_BMR         #  4 ;- TC Block Mode Register
-;- -------- TCB_BCR : (TCB Offset: 0xc0) TC Block Control Register -------- 
-AT91C_TCB_SYNC            EQU (0x1:SHL:0) ;- (TCB) Synchro Command
-;- -------- TCB_BMR : (TCB Offset: 0xc4) TC Block Mode Register -------- 
-AT91C_TCB_TC0XC0S         EQU (0x1:SHL:0) ;- (TCB) External Clock Signal 0 Selection
-AT91C_TCB_TC0XC0S_TCLK0   EQU (0x0) ;- (TCB) TCLK0 connected to XC0
-AT91C_TCB_TC0XC0S_NONE    EQU (0x1) ;- (TCB) None signal connected to XC0
-AT91C_TCB_TC0XC0S_TIOA1   EQU (0x2) ;- (TCB) TIOA1 connected to XC0
-AT91C_TCB_TC0XC0S_TIOA2   EQU (0x3) ;- (TCB) TIOA2 connected to XC0
-AT91C_TCB_TC1XC1S         EQU (0x1:SHL:2) ;- (TCB) External Clock Signal 1 Selection
-AT91C_TCB_TC1XC1S_TCLK1   EQU (0x0:SHL:2) ;- (TCB) TCLK1 connected to XC1
-AT91C_TCB_TC1XC1S_NONE    EQU (0x1:SHL:2) ;- (TCB) None signal connected to XC1
-AT91C_TCB_TC1XC1S_TIOA0   EQU (0x2:SHL:2) ;- (TCB) TIOA0 connected to XC1
-AT91C_TCB_TC1XC1S_TIOA2   EQU (0x3:SHL:2) ;- (TCB) TIOA2 connected to XC1
-AT91C_TCB_TC2XC2S         EQU (0x1:SHL:4) ;- (TCB) External Clock Signal 2 Selection
-AT91C_TCB_TC2XC2S_TCLK2   EQU (0x0:SHL:4) ;- (TCB) TCLK2 connected to XC2
-AT91C_TCB_TC2XC2S_NONE    EQU (0x1:SHL:4) ;- (TCB) None signal connected to XC2
-AT91C_TCB_TC2XC2S_TIOA0   EQU (0x2:SHL:4) ;- (TCB) TIOA0 connected to XC2
-AT91C_TCB_TC2XC2S_TIOA2   EQU (0x3:SHL:4) ;- (TCB) TIOA2 connected to XC2
-
-;- *****************************************************************************
-;-              SOFTWARE API DEFINITION  FOR USB Host Interface
-;- *****************************************************************************
-                ^ 0 ;- AT91S_UHP
-UHP_HcRevision  #  4 ;- Revision
-UHP_HcControl   #  4 ;- Operating modes for the Host Controller
-UHP_HcCommandStatus #  4 ;- Command & status Register
-UHP_HcInterruptStatus #  4 ;- Interrupt Status Register
-UHP_HcInterruptEnable #  4 ;- Interrupt Enable Register
-UHP_HcInterruptDisable #  4 ;- Interrupt Disable Register
-UHP_HcHCCA      #  4 ;- Pointer to the Host Controller Communication Area
-UHP_HcPeriodCurrentED #  4 ;- Current Isochronous or Interrupt Endpoint Descriptor
-UHP_HcControlHeadED #  4 ;- First Endpoint Descriptor of the Control list
-UHP_HcControlCurrentED #  4 ;- Endpoint Control and Status Register
-UHP_HcBulkHeadED #  4 ;- First endpoint register of the Bulk list
-UHP_HcBulkCurrentED #  4 ;- Current endpoint of the Bulk list
-UHP_HcBulkDoneHead #  4 ;- Last completed transfer descriptor
-UHP_HcFmInterval #  4 ;- Bit time between 2 consecutive SOFs
-UHP_HcFmRemaining #  4 ;- Bit time remaining in the current Frame
-UHP_HcFmNumber  #  4 ;- Frame number
-UHP_HcPeriodicStart #  4 ;- Periodic Start
-UHP_HcLSThreshold #  4 ;- LS Threshold
-UHP_HcRhDescriptorA #  4 ;- Root Hub characteristics A
-UHP_HcRhDescriptorB #  4 ;- Root Hub characteristics B
-UHP_HcRhStatus  #  4 ;- Root Hub Status register
-UHP_HcRhPortStatus #  8 ;- Root Hub Port Status Register
-
-;- *****************************************************************************
-;-              SOFTWARE API DEFINITION  FOR Ethernet MAC
-;- *****************************************************************************
-                ^ 0 ;- AT91S_EMAC
-EMAC_CTL        #  4 ;- Network Control Register
-EMAC_CFG        #  4 ;- Network Configuration Register
-EMAC_SR         #  4 ;- Network Status Register
-EMAC_TAR        #  4 ;- Transmit Address Register
-EMAC_TCR        #  4 ;- Transmit Control Register
-EMAC_TSR        #  4 ;- Transmit Status Register
-EMAC_RBQP       #  4 ;- Receive Buffer Queue Pointer
-                #  4 ;- Reserved
-EMAC_RSR        #  4 ;- Receive Status Register
-EMAC_ISR        #  4 ;- Interrupt Status Register
-EMAC_IER        #  4 ;- Interrupt Enable Register
-EMAC_IDR        #  4 ;- Interrupt Disable Register
-EMAC_IMR        #  4 ;- Interrupt Mask Register
-EMAC_MAN        #  4 ;- PHY Maintenance Register
-                #  8 ;- Reserved
-EMAC_FRA        #  4 ;- Frames Transmitted OK Register
-EMAC_SCOL       #  4 ;- Single Collision Frame Register
-EMAC_MCOL       #  4 ;- Multiple Collision Frame Register
-EMAC_OK         #  4 ;- Frames Received OK Register
-EMAC_SEQE       #  4 ;- Frame Check Sequence Error Register
-EMAC_ALE        #  4 ;- Alignment Error Register
-EMAC_DTE        #  4 ;- Deferred Transmission Frame Register
-EMAC_LCOL       #  4 ;- Late Collision Register
-EMAC_ECOL       #  4 ;- Excessive Collision Register
-EMAC_CSE        #  4 ;- Carrier Sense Error Register
-EMAC_TUE        #  4 ;- Transmit Underrun Error Register
-EMAC_CDE        #  4 ;- Code Error Register
-EMAC_ELR        #  4 ;- Excessive Length Error Register
-EMAC_RJB        #  4 ;- Receive Jabber Register
-EMAC_USF        #  4 ;- Undersize Frame Register
-EMAC_SQEE       #  4 ;- SQE Test Error Register
-EMAC_DRFC       #  4 ;- Discarded RX Frame Register
-                # 12 ;- Reserved
-EMAC_HSH        #  4 ;- Hash Address High[63:32]
-EMAC_HSL        #  4 ;- Hash Address Low[31:0]
-EMAC_SA1L       #  4 ;- Specific Address 1 Low, First 4 bytes
-EMAC_SA1H       #  4 ;- Specific Address 1 High, Last 2 bytes
-EMAC_SA2L       #  4 ;- Specific Address 2 Low, First 4 bytes
-EMAC_SA2H       #  4 ;- Specific Address 2 High, Last 2 bytes
-EMAC_SA3L       #  4 ;- Specific Address 3 Low, First 4 bytes
-EMAC_SA3H       #  4 ;- Specific Address 3 High, Last 2 bytes
-EMAC_SA4L       #  4 ;- Specific Address 4 Low, First 4 bytes
-EMAC_SA4H       #  4 ;- Specific Address 4 High, Last 2 bytesr
-;- -------- EMAC_CTL : (EMAC Offset: 0x0)  -------- 
-AT91C_EMAC_LB             EQU (0x1:SHL:0) ;- (EMAC) Loopback. Optional. When set, loopback signal is at high level.
-AT91C_EMAC_LBL            EQU (0x1:SHL:1) ;- (EMAC) Loopback local. 
-AT91C_EMAC_RE             EQU (0x1:SHL:2) ;- (EMAC) Receive enable. 
-AT91C_EMAC_TE             EQU (0x1:SHL:3) ;- (EMAC) Transmit enable. 
-AT91C_EMAC_MPE            EQU (0x1:SHL:4) ;- (EMAC) Management port enable. 
-AT91C_EMAC_CSR            EQU (0x1:SHL:5) ;- (EMAC) Clear statistics registers. 
-AT91C_EMAC_ISR            EQU (0x1:SHL:6) ;- (EMAC) Increment statistics registers. 
-AT91C_EMAC_WES            EQU (0x1:SHL:7) ;- (EMAC) Write enable for statistics registers. 
-AT91C_EMAC_BP             EQU (0x1:SHL:8) ;- (EMAC) Back pressure. 
-;- -------- EMAC_CFG : (EMAC Offset: 0x4) Network Configuration Register -------- 
-AT91C_EMAC_SPD            EQU (0x1:SHL:0) ;- (EMAC) Speed. 
-AT91C_EMAC_FD             EQU (0x1:SHL:1) ;- (EMAC) Full duplex. 
-AT91C_EMAC_BR             EQU (0x1:SHL:2) ;- (EMAC) Bit rate. 
-AT91C_EMAC_CAF            EQU (0x1:SHL:4) ;- (EMAC) Copy all frames. 
-AT91C_EMAC_NBC            EQU (0x1:SHL:5) ;- (EMAC) No broadcast. 
-AT91C_EMAC_MTI            EQU (0x1:SHL:6) ;- (EMAC) Multicast hash enable
-AT91C_EMAC_UNI            EQU (0x1:SHL:7) ;- (EMAC) Unicast hash enable. 
-AT91C_EMAC_BIG            EQU (0x1:SHL:8) ;- (EMAC) Receive 1522 bytes. 
-AT91C_EMAC_EAE            EQU (0x1:SHL:9) ;- (EMAC) External address match enable. 
-AT91C_EMAC_CLK            EQU (0x3:SHL:10) ;- (EMAC) 
-AT91C_EMAC_CLK_HCLK_8     EQU (0x0:SHL:10) ;- (EMAC) HCLK divided by 8
-AT91C_EMAC_CLK_HCLK_16    EQU (0x1:SHL:10) ;- (EMAC) HCLK divided by 16
-AT91C_EMAC_CLK_HCLK_32    EQU (0x2:SHL:10) ;- (EMAC) HCLK divided by 32
-AT91C_EMAC_CLK_HCLK_64    EQU (0x3:SHL:10) ;- (EMAC) HCLK divided by 64
-AT91C_EMAC_RTY            EQU (0x1:SHL:12) ;- (EMAC) 
-AT91C_EMAC_RMII           EQU (0x1:SHL:13) ;- (EMAC) 
-;- -------- EMAC_SR : (EMAC Offset: 0x8) Network Status Register -------- 
-AT91C_EMAC_MDIO           EQU (0x1:SHL:1) ;- (EMAC) 
-AT91C_EMAC_IDLE           EQU (0x1:SHL:2) ;- (EMAC) 
-;- -------- EMAC_TCR : (EMAC Offset: 0x10) Transmit Control Register -------- 
-AT91C_EMAC_LEN            EQU (0x7FF:SHL:0) ;- (EMAC) 
-AT91C_EMAC_NCRC           EQU (0x1:SHL:15) ;- (EMAC) 
-;- -------- EMAC_TSR : (EMAC Offset: 0x14) Transmit Control Register -------- 
-AT91C_EMAC_OVR            EQU (0x1:SHL:0) ;- (EMAC) 
-AT91C_EMAC_COL            EQU (0x1:SHL:1) ;- (EMAC) 
-AT91C_EMAC_RLE            EQU (0x1:SHL:2) ;- (EMAC) 
-AT91C_EMAC_TXIDLE         EQU (0x1:SHL:3) ;- (EMAC) 
-AT91C_EMAC_BNQ            EQU (0x1:SHL:4) ;- (EMAC) 
-AT91C_EMAC_COMP           EQU (0x1:SHL:5) ;- (EMAC) 
-AT91C_EMAC_UND            EQU (0x1:SHL:6) ;- (EMAC) 
-;- -------- EMAC_RSR : (EMAC Offset: 0x20) Receive Status Register -------- 
-AT91C_EMAC_BNA            EQU (0x1:SHL:0) ;- (EMAC) 
-AT91C_EMAC_REC            EQU (0x1:SHL:1) ;- (EMAC) 
-;- -------- EMAC_ISR : (EMAC Offset: 0x24) Interrupt Status Register -------- 
-AT91C_EMAC_DONE           EQU (0x1:SHL:0) ;- (EMAC) 
-AT91C_EMAC_RCOM           EQU (0x1:SHL:1) ;- (EMAC) 
-AT91C_EMAC_RBNA           EQU (0x1:SHL:2) ;- (EMAC) 
-AT91C_EMAC_TOVR           EQU (0x1:SHL:3) ;- (EMAC) 
-AT91C_EMAC_TUND           EQU (0x1:SHL:4) ;- (EMAC) 
-AT91C_EMAC_RTRY           EQU (0x1:SHL:5) ;- (EMAC) 
-AT91C_EMAC_TBRE           EQU (0x1:SHL:6) ;- (EMAC) 
-AT91C_EMAC_TCOM           EQU (0x1:SHL:7) ;- (EMAC) 
-AT91C_EMAC_TIDLE          EQU (0x1:SHL:8) ;- (EMAC) 
-AT91C_EMAC_LINK           EQU (0x1:SHL:9) ;- (EMAC) 
-AT91C_EMAC_ROVR           EQU (0x1:SHL:10) ;- (EMAC) 
-AT91C_EMAC_HRESP          EQU (0x1:SHL:11) ;- (EMAC) 
-;- -------- EMAC_IER : (EMAC Offset: 0x28) Interrupt Enable Register -------- 
-;- -------- EMAC_IDR : (EMAC Offset: 0x2c) Interrupt Disable Register -------- 
-;- -------- EMAC_IMR : (EMAC Offset: 0x30) Interrupt Mask Register -------- 
-;- -------- EMAC_MAN : (EMAC Offset: 0x34) PHY Maintenance Register -------- 
-AT91C_EMAC_DATA           EQU (0xFFFF:SHL:0) ;- (EMAC) 
-AT91C_EMAC_CODE           EQU (0x3:SHL:16) ;- (EMAC) 
-AT91C_EMAC_REGA           EQU (0x1F:SHL:18) ;- (EMAC) 
-AT91C_EMAC_PHYA           EQU (0x1F:SHL:23) ;- (EMAC) 
-AT91C_EMAC_RW             EQU (0x3:SHL:28) ;- (EMAC) 
-AT91C_EMAC_HIGH           EQU (0x1:SHL:30) ;- (EMAC) 
-AT91C_EMAC_LOW            EQU (0x1:SHL:31) ;- (EMAC) 
-
-;- *****************************************************************************
-;-              SOFTWARE API DEFINITION  FOR External Bus Interface
-;- *****************************************************************************
-                ^ 0 ;- AT91S_EBI
-EBI_CSA         #  4 ;- Chip Select Assignment Register
-EBI_CFGR        #  4 ;- Configuration Register
-;- -------- EBI_CSA : (EBI Offset: 0x0) Chip Select Assignment Register -------- 
-AT91C_EBI_CS0A            EQU (0x1:SHL:0) ;- (EBI) Chip Select 0 Assignment
-AT91C_EBI_CS0A_SMC        EQU (0x0) ;- (EBI) Chip Select 0 is assigned to the Static Memory Controller.
-AT91C_EBI_CS0A_BFC        EQU (0x1) ;- (EBI) Chip Select 0 is assigned to the Burst Flash Controller.
-AT91C_EBI_CS1A            EQU (0x1:SHL:1) ;- (EBI) Chip Select 1 Assignment
-AT91C_EBI_CS1A_SMC        EQU (0x0:SHL:1) ;- (EBI) Chip Select 1 is assigned to the Static Memory Controller.
-AT91C_EBI_CS1A_SDRAMC     EQU (0x1:SHL:1) ;- (EBI) Chip Select 1 is assigned to the SDRAM Controller.
-AT91C_EBI_CS3A            EQU (0x1:SHL:3) ;- (EBI) Chip Select 3 Assignment
-AT91C_EBI_CS3A_SMC        EQU (0x0:SHL:3) ;- (EBI) Chip Select 3 is only assigned to the Static Memory Controller and NCS3 behaves as defined by the SMC2.
-AT91C_EBI_CS3A_SMC_SmartMedia EQU (0x1:SHL:3) ;- (EBI) Chip Select 3 is assigned to the Static Memory Controller and the SmartMedia Logic is activated.
-AT91C_EBI_CS4A            EQU (0x1:SHL:4) ;- (EBI) Chip Select 4 Assignment
-AT91C_EBI_CS4A_SMC        EQU (0x0:SHL:4) ;- (EBI) Chip Select 4 is assigned to the Static Memory Controller and NCS4,NCS5 and NCS6 behave as defined by the SMC2.
-AT91C_EBI_CS4A_SMC_CompactFlash EQU (0x1:SHL:4) ;- (EBI) Chip Select 4 is assigned to the Static Memory Controller and the CompactFlash Logic is activated.
-;- -------- EBI_CFGR : (EBI Offset: 0x4) Configuration Register -------- 
-AT91C_EBI_DBPUC           EQU (0x1:SHL:0) ;- (EBI) Data Bus Pull-Up Configuration
-AT91C_EBI_EBSEN           EQU (0x1:SHL:1) ;- (EBI) Bus Sharing Enable
-
-;- *****************************************************************************
-;-              SOFTWARE API DEFINITION  FOR Static Memory Controller 2 Interface
-;- *****************************************************************************
-                ^ 0 ;- AT91S_SMC2
-SMC2_CSR        # 32 ;- SMC2 Chip Select Register
-;- -------- SMC2_CSR : (SMC2 Offset: 0x0) SMC2 Chip Select Register -------- 
-AT91C_SMC2_NWS            EQU (0x7F:SHL:0) ;- (SMC2) Number of Wait States
-AT91C_SMC2_WSEN           EQU (0x1:SHL:7) ;- (SMC2) Wait State Enable
-AT91C_SMC2_TDF            EQU (0xF:SHL:8) ;- (SMC2) Data Float Time
-AT91C_SMC2_BAT            EQU (0x1:SHL:12) ;- (SMC2) Byte Access Type
-AT91C_SMC2_DBW            EQU (0x1:SHL:13) ;- (SMC2) Data Bus Width
-AT91C_SMC2_DBW_16         EQU (0x1:SHL:13) ;- (SMC2) 16-bit.
-AT91C_SMC2_DBW_8          EQU (0x2:SHL:13) ;- (SMC2) 8-bit.
-AT91C_SMC2_DRP            EQU (0x1:SHL:15) ;- (SMC2) Data Read Protocol
-AT91C_SMC2_ACSS           EQU (0x3:SHL:16) ;- (SMC2) Address to Chip Select Setup
-AT91C_SMC2_ACSS_STANDARD  EQU (0x0:SHL:16) ;- (SMC2) Standard, asserted at the beginning of the access and deasserted at the end.
-AT91C_SMC2_ACSS_1_CYCLE   EQU (0x1:SHL:16) ;- (SMC2) One cycle less at the beginning and the end of the access.
-AT91C_SMC2_ACSS_2_CYCLES  EQU (0x2:SHL:16) ;- (SMC2) Two cycles less at the beginning and the end of the access.
-AT91C_SMC2_ACSS_3_CYCLES  EQU (0x3:SHL:16) ;- (SMC2) Three cycles less at the beginning and the end of the access.
-AT91C_SMC2_RWSETUP        EQU (0x7:SHL:24) ;- (SMC2) Read and Write Signal Setup Time
-AT91C_SMC2_RWHOLD         EQU (0x7:SHL:29) ;- (SMC2) Read and Write Signal Hold Time
-
-;- *****************************************************************************
-;-              SOFTWARE API DEFINITION  FOR SDRAM Controller Interface
-;- *****************************************************************************
-                ^ 0 ;- AT91S_SDRC
-SDRC_MR         #  4 ;- SDRAM Controller Mode Register
-SDRC_TR         #  4 ;- SDRAM Controller Refresh Timer Register
-SDRC_CR         #  4 ;- SDRAM Controller Configuration Register
-SDRC_SRR        #  4 ;- SDRAM Controller Self Refresh Register
-SDRC_LPR        #  4 ;- SDRAM Controller Low Power Register
-SDRC_IER        #  4 ;- SDRAM Controller Interrupt Enable Register
-SDRC_IDR        #  4 ;- SDRAM Controller Interrupt Disable Register
-SDRC_IMR        #  4 ;- SDRAM Controller Interrupt Mask Register
-SDRC_ISR        #  4 ;- SDRAM Controller Interrupt Mask Register
-;- -------- SDRC_MR : (SDRC Offset: 0x0) SDRAM Controller Mode Register -------- 
-AT91C_SDRC_MODE           EQU (0xF:SHL:0) ;- (SDRC) Mode
-AT91C_SDRC_MODE_NORMAL_CMD EQU (0x0) ;- (SDRC) Normal Mode
-AT91C_SDRC_MODE_NOP_CMD   EQU (0x1) ;- (SDRC) NOP Command
-AT91C_SDRC_MODE_PRCGALL_CMD EQU (0x2) ;- (SDRC) All Banks Precharge Command
-AT91C_SDRC_MODE_LMR_CMD   EQU (0x3) ;- (SDRC) Load Mode Register Command
-AT91C_SDRC_MODE_RFSH_CMD  EQU (0x4) ;- (SDRC) Refresh Command
-AT91C_SDRC_DBW            EQU (0x1:SHL:4) ;- (SDRC) Data Bus Width
-AT91C_SDRC_DBW_32_BITS    EQU (0x0:SHL:4) ;- (SDRC) 32 Bits datas bus
-AT91C_SDRC_DBW_16_BITS    EQU (0x1:SHL:4) ;- (SDRC) 16 Bits datas bus
-;- -------- SDRC_TR : (SDRC Offset: 0x4) SDRC Refresh Timer Register -------- 
-AT91C_SDRC_COUNT          EQU (0xFFF:SHL:0) ;- (SDRC) Refresh Counter
-;- -------- SDRC_CR : (SDRC Offset: 0x8) SDRAM Configuration Register -------- 
-AT91C_SDRC_NC             EQU (0x3:SHL:0) ;- (SDRC) Number of Column Bits
-AT91C_SDRC_NC_8           EQU (0x0) ;- (SDRC) 8 Bits
-AT91C_SDRC_NC_9           EQU (0x1) ;- (SDRC) 9 Bits
-AT91C_SDRC_NC_10          EQU (0x2) ;- (SDRC) 10 Bits
-AT91C_SDRC_NC_11          EQU (0x3) ;- (SDRC) 11 Bits
-AT91C_SDRC_NR             EQU (0x3:SHL:2) ;- (SDRC) Number of Row Bits
-AT91C_SDRC_NR_11          EQU (0x0:SHL:2) ;- (SDRC) 11 Bits
-AT91C_SDRC_NR_12          EQU (0x1:SHL:2) ;- (SDRC) 12 Bits
-AT91C_SDRC_NR_13          EQU (0x2:SHL:2) ;- (SDRC) 13 Bits
-AT91C_SDRC_NB             EQU (0x1:SHL:4) ;- (SDRC) Number of Banks
-AT91C_SDRC_NB_2_BANKS     EQU (0x0:SHL:4) ;- (SDRC) 2 banks
-AT91C_SDRC_NB_4_BANKS     EQU (0x1:SHL:4) ;- (SDRC) 4 banks
-AT91C_SDRC_CAS            EQU (0x3:SHL:5) ;- (SDRC) CAS Latency
-AT91C_SDRC_CAS_2          EQU (0x2:SHL:5) ;- (SDRC) 2 cycles
-AT91C_SDRC_TWR            EQU (0xF:SHL:7) ;- (SDRC) Number of Write Recovery Time Cycles
-AT91C_SDRC_TRC            EQU (0xF:SHL:11) ;- (SDRC) Number of RAS Cycle Time Cycles
-AT91C_SDRC_TRP            EQU (0xF:SHL:15) ;- (SDRC) Number of RAS Precharge Time Cycles
-AT91C_SDRC_TRCD           EQU (0xF:SHL:19) ;- (SDRC) Number of RAS to CAS Delay Cycles
-AT91C_SDRC_TRAS           EQU (0xF:SHL:23) ;- (SDRC) Number of RAS Active Time Cycles
-AT91C_SDRC_TXSR           EQU (0xF:SHL:27) ;- (SDRC) Number of Command Recovery Time Cycles
-;- -------- SDRC_SRR : (SDRC Offset: 0xc) SDRAM Controller Self-refresh Register -------- 
-AT91C_SDRC_SRCB           EQU (0x1:SHL:0) ;- (SDRC) Self-refresh Command Bit
-;- -------- SDRC_LPR : (SDRC Offset: 0x10) SDRAM Controller Low-power Register -------- 
-AT91C_SDRC_LPCB           EQU (0x1:SHL:0) ;- (SDRC) Low-power Command Bit
-;- -------- SDRC_IER : (SDRC Offset: 0x14) SDRAM Controller Interrupt Enable Register -------- 
-AT91C_SDRC_RES            EQU (0x1:SHL:0) ;- (SDRC) Refresh Error Status
-;- -------- SDRC_IDR : (SDRC Offset: 0x18) SDRAM Controller Interrupt Disable Register -------- 
-;- -------- SDRC_IMR : (SDRC Offset: 0x1c) SDRAM Controller Interrupt Mask Register -------- 
-;- -------- SDRC_ISR : (SDRC Offset: 0x20) SDRAM Controller Interrupt Status Register -------- 
-
-;- *****************************************************************************
-;-              SOFTWARE API DEFINITION  FOR Burst Flash Controller Interface
-;- *****************************************************************************
-                ^ 0 ;- AT91S_BFC
-BFC_MR          #  4 ;- BFC Mode Register
-;- -------- BFC_MR : (BFC Offset: 0x0) BFC Mode Register -------- 
-AT91C_BFC_BFCOM           EQU (0x3:SHL:0) ;- (BFC) Burst Flash Controller Operating Mode
-AT91C_BFC_BFCOM_DISABLED  EQU (0x0) ;- (BFC) NPCS0 is driven by the SMC or remains high.
-AT91C_BFC_BFCOM_ASYNC     EQU (0x1) ;- (BFC) Asynchronous
-AT91C_BFC_BFCOM_BURST_READ EQU (0x2) ;- (BFC) Burst Read
-AT91C_BFC_BFCC            EQU (0x3:SHL:2) ;- (BFC) Burst Flash Controller Operating Mode
-AT91C_BFC_BFCC_MCK        EQU (0x1:SHL:2) ;- (BFC) Master Clock.
-AT91C_BFC_BFCC_MCK_DIV_2  EQU (0x2:SHL:2) ;- (BFC) Master Clock divided by 2.
-AT91C_BFC_BFCC_MCK_DIV_4  EQU (0x3:SHL:2) ;- (BFC) Master Clock divided by 4.
-AT91C_BFC_AVL             EQU (0xF:SHL:4) ;- (BFC) Address Valid Latency
-AT91C_BFC_PAGES           EQU (0x7:SHL:8) ;- (BFC) Page Size
-AT91C_BFC_PAGES_NO_PAGE   EQU (0x0:SHL:8) ;- (BFC) No page handling.
-AT91C_BFC_PAGES_16        EQU (0x1:SHL:8) ;- (BFC) 16 bytes page size.
-AT91C_BFC_PAGES_32        EQU (0x2:SHL:8) ;- (BFC) 32 bytes page size.
-AT91C_BFC_PAGES_64        EQU (0x3:SHL:8) ;- (BFC) 64 bytes page size.
-AT91C_BFC_PAGES_128       EQU (0x4:SHL:8) ;- (BFC) 128 bytes page size.
-AT91C_BFC_PAGES_256       EQU (0x5:SHL:8) ;- (BFC) 256 bytes page size.
-AT91C_BFC_PAGES_512       EQU (0x6:SHL:8) ;- (BFC) 512 bytes page size.
-AT91C_BFC_PAGES_1024      EQU (0x7:SHL:8) ;- (BFC) 1024 bytes page size.
-AT91C_BFC_OEL             EQU (0x3:SHL:12) ;- (BFC) Output Enable Latency
-AT91C_BFC_BAAEN           EQU (0x1:SHL:16) ;- (BFC) Burst Address Advance Enable
-AT91C_BFC_BFOEH           EQU (0x1:SHL:17) ;- (BFC) Burst Flash Output Enable Handling
-AT91C_BFC_MUXEN           EQU (0x1:SHL:18) ;- (BFC) Multiplexed Bus Enable
-AT91C_BFC_RDYEN           EQU (0x1:SHL:19) ;- (BFC) Ready Enable Mode
-
-;- *****************************************************************************
-;-               REGISTER ADDRESS DEFINITION FOR AT91RM9200
-;- *****************************************************************************
-;- ========== Register definition for SYS peripheral ========== 
-;- ========== Register definition for MC peripheral ========== 
-AT91C_MC_PUER             EQU (0xFFFFFF54) ;- (MC) MC Protection Unit Enable Register
-AT91C_MC_ASR              EQU (0xFFFFFF04) ;- (MC) MC Abort Status Register
-AT91C_MC_PUP              EQU (0xFFFFFF50) ;- (MC) MC Protection Unit Peripherals
-AT91C_MC_PUIA             EQU (0xFFFFFF10) ;- (MC) MC Protection Unit Area
-AT91C_MC_AASR             EQU (0xFFFFFF08) ;- (MC) MC Abort Address Status Register
-AT91C_MC_RCR              EQU (0xFFFFFF00) ;- (MC) MC Remap Control Register
-;- ========== Register definition for RTC peripheral ========== 
-AT91C_RTC_IMR             EQU (0xFFFFFE28) ;- (RTC) Interrupt Mask Register
-AT91C_RTC_IER             EQU (0xFFFFFE20) ;- (RTC) Interrupt Enable Register
-AT91C_RTC_SR              EQU (0xFFFFFE18) ;- (RTC) Status Register
-AT91C_RTC_TIMALR          EQU (0xFFFFFE10) ;- (RTC) Time Alarm Register
-AT91C_RTC_TIMR            EQU (0xFFFFFE08) ;- (RTC) Time Register
-AT91C_RTC_CR              EQU (0xFFFFFE00) ;- (RTC) Control Register
-AT91C_RTC_VER             EQU (0xFFFFFE2C) ;- (RTC) Valid Entry Register
-AT91C_RTC_IDR             EQU (0xFFFFFE24) ;- (RTC) Interrupt Disable Register
-AT91C_RTC_SCCR            EQU (0xFFFFFE1C) ;- (RTC) Status Clear Command Register
-AT91C_RTC_CALALR          EQU (0xFFFFFE14) ;- (RTC) Calendar Alarm Register
-AT91C_RTC_CALR            EQU (0xFFFFFE0C) ;- (RTC) Calendar Register
-AT91C_RTC_MR              EQU (0xFFFFFE04) ;- (RTC) Mode Register
-;- ========== Register definition for ST peripheral ========== 
-AT91C_ST_CRTR             EQU (0xFFFFFD24) ;- (ST) Current Real-time Register
-AT91C_ST_IMR              EQU (0xFFFFFD1C) ;- (ST) Interrupt Mask Register
-AT91C_ST_IER              EQU (0xFFFFFD14) ;- (ST) Interrupt Enable Register
-AT91C_ST_RTMR             EQU (0xFFFFFD0C) ;- (ST) Real-time Mode Register
-AT91C_ST_PIMR             EQU (0xFFFFFD04) ;- (ST) Period Interval Mode Register
-AT91C_ST_RTAR             EQU (0xFFFFFD20) ;- (ST) Real-time Alarm Register
-AT91C_ST_IDR              EQU (0xFFFFFD18) ;- (ST) Interrupt Disable Register
-AT91C_ST_SR               EQU (0xFFFFFD10) ;- (ST) Status Register
-AT91C_ST_WDMR             EQU (0xFFFFFD08) ;- (ST) Watchdog Mode Register
-AT91C_ST_CR               EQU (0xFFFFFD00) ;- (ST) Control Register
-;- ========== Register definition for PMC peripheral ========== 
-AT91C_PMC_SCSR            EQU (0xFFFFFC08) ;- (PMC) System Clock Status Register
-AT91C_PMC_SCER            EQU (0xFFFFFC00) ;- (PMC) System Clock Enable Register
-AT91C_PMC_IMR             EQU (0xFFFFFC6C) ;- (PMC) Interrupt Mask Register
-AT91C_PMC_IDR             EQU (0xFFFFFC64) ;- (PMC) Interrupt Disable Register
-AT91C_PMC_PCDR            EQU (0xFFFFFC14) ;- (PMC) Peripheral Clock Disable Register
-AT91C_PMC_SCDR            EQU (0xFFFFFC04) ;- (PMC) System Clock Disable Register
-AT91C_PMC_SR              EQU (0xFFFFFC68) ;- (PMC) Status Register
-AT91C_PMC_IER             EQU (0xFFFFFC60) ;- (PMC) Interrupt Enable Register
-AT91C_PMC_MCKR            EQU (0xFFFFFC30) ;- (PMC) Master Clock Register
-AT91C_PMC_PCER            EQU (0xFFFFFC10) ;- (PMC) Peripheral Clock Enable Register
-AT91C_PMC_PCSR            EQU (0xFFFFFC18) ;- (PMC) Peripheral Clock Status Register
-AT91C_PMC_PCKR            EQU (0xFFFFFC40) ;- (PMC) Programmable Clock Register
-;- ========== Register definition for CKGR peripheral ========== 
-AT91C_CKGR_PLLBR          EQU (0xFFFFFC2C) ;- (CKGR) PLL B Register
-AT91C_CKGR_MCFR           EQU (0xFFFFFC24) ;- (CKGR) Main Clock  Frequency Register
-AT91C_CKGR_PLLAR          EQU (0xFFFFFC28) ;- (CKGR) PLL A Register
-AT91C_CKGR_MOR            EQU (0xFFFFFC20) ;- (CKGR) Main Oscillator Register
-;- ========== Register definition for PIOD peripheral ========== 
-AT91C_PIOD_PDSR           EQU (0xFFFFFA3C) ;- (PIOD) Pin Data Status Register
-AT91C_PIOD_CODR           EQU (0xFFFFFA34) ;- (PIOD) Clear Output Data Register
-AT91C_PIOD_OWER           EQU (0xFFFFFAA0) ;- (PIOD) Output Write Enable Register
-AT91C_PIOD_MDER           EQU (0xFFFFFA50) ;- (PIOD) Multi-driver Enable Register
-AT91C_PIOD_IMR            EQU (0xFFFFFA48) ;- (PIOD) Interrupt Mask Register
-AT91C_PIOD_IER            EQU (0xFFFFFA40) ;- (PIOD) Interrupt Enable Register
-AT91C_PIOD_ODSR           EQU (0xFFFFFA38) ;- (PIOD) Output Data Status Register
-AT91C_PIOD_SODR           EQU (0xFFFFFA30) ;- (PIOD) Set Output Data Register
-AT91C_PIOD_PER            EQU (0xFFFFFA00) ;- (PIOD) PIO Enable Register
-AT91C_PIOD_OWDR           EQU (0xFFFFFAA4) ;- (PIOD) Output Write Disable Register
-AT91C_PIOD_PPUER          EQU (0xFFFFFA64) ;- (PIOD) Pull-up Enable Register
-AT91C_PIOD_MDDR           EQU (0xFFFFFA54) ;- (PIOD) Multi-driver Disable Register
-AT91C_PIOD_ISR            EQU (0xFFFFFA4C) ;- (PIOD) Interrupt Status Register
-AT91C_PIOD_IDR            EQU (0xFFFFFA44) ;- (PIOD) Interrupt Disable Register
-AT91C_PIOD_PDR            EQU (0xFFFFFA04) ;- (PIOD) PIO Disable Register
-AT91C_PIOD_ODR            EQU (0xFFFFFA14) ;- (PIOD) Output Disable Registerr
-AT91C_PIOD_OWSR           EQU (0xFFFFFAA8) ;- (PIOD) Output Write Status Register
-AT91C_PIOD_ABSR           EQU (0xFFFFFA78) ;- (PIOD) AB Select Status Register
-AT91C_PIOD_ASR            EQU (0xFFFFFA70) ;- (PIOD) Select A Register
-AT91C_PIOD_PPUSR          EQU (0xFFFFFA68) ;- (PIOD) Pad Pull-up Status Register
-AT91C_PIOD_PPUDR          EQU (0xFFFFFA60) ;- (PIOD) Pull-up Disable Register
-AT91C_PIOD_MDSR           EQU (0xFFFFFA58) ;- (PIOD) Multi-driver Status Register
-AT91C_PIOD_PSR            EQU (0xFFFFFA08) ;- (PIOD) PIO Status Register
-AT91C_PIOD_OER            EQU (0xFFFFFA10) ;- (PIOD) Output Enable Register
-AT91C_PIOD_OSR            EQU (0xFFFFFA18) ;- (PIOD) Output Status Register
-AT91C_PIOD_IFER           EQU (0xFFFFFA20) ;- (PIOD) Input Filter Enable Register
-AT91C_PIOD_BSR            EQU (0xFFFFFA74) ;- (PIOD) Select B Register
-AT91C_PIOD_IFDR           EQU (0xFFFFFA24) ;- (PIOD) Input Filter Disable Register
-AT91C_PIOD_IFSR           EQU (0xFFFFFA28) ;- (PIOD) Input Filter Status Register
-;- ========== Register definition for PIOC peripheral ========== 
-AT91C_PIOC_IFDR           EQU (0xFFFFF824) ;- (PIOC) Input Filter Disable Register
-AT91C_PIOC_ODR            EQU (0xFFFFF814) ;- (PIOC) Output Disable Registerr
-AT91C_PIOC_ABSR           EQU (0xFFFFF878) ;- (PIOC) AB Select Status Register
-AT91C_PIOC_SODR           EQU (0xFFFFF830) ;- (PIOC) Set Output Data Register
-AT91C_PIOC_IFSR           EQU (0xFFFFF828) ;- (PIOC) Input Filter Status Register
-AT91C_PIOC_CODR           EQU (0xFFFFF834) ;- (PIOC) Clear Output Data Register
-AT91C_PIOC_ODSR           EQU (0xFFFFF838) ;- (PIOC) Output Data Status Register
-AT91C_PIOC_IER            EQU (0xFFFFF840) ;- (PIOC) Interrupt Enable Register
-AT91C_PIOC_IMR            EQU (0xFFFFF848) ;- (PIOC) Interrupt Mask Register
-AT91C_PIOC_OWDR           EQU (0xFFFFF8A4) ;- (PIOC) Output Write Disable Register
-AT91C_PIOC_MDDR           EQU (0xFFFFF854) ;- (PIOC) Multi-driver Disable Register
-AT91C_PIOC_PDSR           EQU (0xFFFFF83C) ;- (PIOC) Pin Data Status Register
-AT91C_PIOC_IDR            EQU (0xFFFFF844) ;- (PIOC) Interrupt Disable Register
-AT91C_PIOC_ISR            EQU (0xFFFFF84C) ;- (PIOC) Interrupt Status Register
-AT91C_PIOC_PDR            EQU (0xFFFFF804) ;- (PIOC) PIO Disable Register
-AT91C_PIOC_OWSR           EQU (0xFFFFF8A8) ;- (PIOC) Output Write Status Register
-AT91C_PIOC_OWER           EQU (0xFFFFF8A0) ;- (PIOC) Output Write Enable Register
-AT91C_PIOC_ASR            EQU (0xFFFFF870) ;- (PIOC) Select A Register
-AT91C_PIOC_PPUSR          EQU (0xFFFFF868) ;- (PIOC) Pad Pull-up Status Register
-AT91C_PIOC_PPUDR          EQU (0xFFFFF860) ;- (PIOC) Pull-up Disable Register
-AT91C_PIOC_MDSR           EQU (0xFFFFF858) ;- (PIOC) Multi-driver Status Register
-AT91C_PIOC_MDER           EQU (0xFFFFF850) ;- (PIOC) Multi-driver Enable Register
-AT91C_PIOC_IFER           EQU (0xFFFFF820) ;- (PIOC) Input Filter Enable Register
-AT91C_PIOC_OSR            EQU (0xFFFFF818) ;- (PIOC) Output Status Register
-AT91C_PIOC_OER            EQU (0xFFFFF810) ;- (PIOC) Output Enable Register
-AT91C_PIOC_PSR            EQU (0xFFFFF808) ;- (PIOC) PIO Status Register
-AT91C_PIOC_PER            EQU (0xFFFFF800) ;- (PIOC) PIO Enable Register
-AT91C_PIOC_BSR            EQU (0xFFFFF874) ;- (PIOC) Select B Register
-AT91C_PIOC_PPUER          EQU (0xFFFFF864) ;- (PIOC) Pull-up Enable Register
-;- ========== Register definition for PIOB peripheral ========== 
-AT91C_PIOB_OWSR           EQU (0xFFFFF6A8) ;- (PIOB) Output Write Status Register
-AT91C_PIOB_PPUSR          EQU (0xFFFFF668) ;- (PIOB) Pad Pull-up Status Register
-AT91C_PIOB_PPUDR          EQU (0xFFFFF660) ;- (PIOB) Pull-up Disable Register
-AT91C_PIOB_MDSR           EQU (0xFFFFF658) ;- (PIOB) Multi-driver Status Register
-AT91C_PIOB_MDER           EQU (0xFFFFF650) ;- (PIOB) Multi-driver Enable Register
-AT91C_PIOB_IMR            EQU (0xFFFFF648) ;- (PIOB) Interrupt Mask Register
-AT91C_PIOB_OSR            EQU (0xFFFFF618) ;- (PIOB) Output Status Register
-AT91C_PIOB_OER            EQU (0xFFFFF610) ;- (PIOB) Output Enable Register
-AT91C_PIOB_PSR            EQU (0xFFFFF608) ;- (PIOB) PIO Status Register
-AT91C_PIOB_PER            EQU (0xFFFFF600) ;- (PIOB) PIO Enable Register
-AT91C_PIOB_BSR            EQU (0xFFFFF674) ;- (PIOB) Select B Register
-AT91C_PIOB_PPUER          EQU (0xFFFFF664) ;- (PIOB) Pull-up Enable Register
-AT91C_PIOB_IFDR           EQU (0xFFFFF624) ;- (PIOB) Input Filter Disable Register
-AT91C_PIOB_ODR            EQU (0xFFFFF614) ;- (PIOB) Output Disable Registerr
-AT91C_PIOB_ABSR           EQU (0xFFFFF678) ;- (PIOB) AB Select Status Register
-AT91C_PIOB_ASR            EQU (0xFFFFF670) ;- (PIOB) Select A Register
-AT91C_PIOB_IFER           EQU (0xFFFFF620) ;- (PIOB) Input Filter Enable Register
-AT91C_PIOB_IFSR           EQU (0xFFFFF628) ;- (PIOB) Input Filter Status Register
-AT91C_PIOB_SODR           EQU (0xFFFFF630) ;- (PIOB) Set Output Data Register
-AT91C_PIOB_ODSR           EQU (0xFFFFF638) ;- (PIOB) Output Data Status Register
-AT91C_PIOB_CODR           EQU (0xFFFFF634) ;- (PIOB) Clear Output Data Register
-AT91C_PIOB_PDSR           EQU (0xFFFFF63C) ;- (PIOB) Pin Data Status Register
-AT91C_PIOB_OWER           EQU (0xFFFFF6A0) ;- (PIOB) Output Write Enable Register
-AT91C_PIOB_IER            EQU (0xFFFFF640) ;- (PIOB) Interrupt Enable Register
-AT91C_PIOB_OWDR           EQU (0xFFFFF6A4) ;- (PIOB) Output Write Disable Register
-AT91C_PIOB_MDDR           EQU (0xFFFFF654) ;- (PIOB) Multi-driver Disable Register
-AT91C_PIOB_ISR            EQU (0xFFFFF64C) ;- (PIOB) Interrupt Status Register
-AT91C_PIOB_IDR            EQU (0xFFFFF644) ;- (PIOB) Interrupt Disable Register
-AT91C_PIOB_PDR            EQU (0xFFFFF604) ;- (PIOB) PIO Disable Register
-;- ========== Register definition for PIOA peripheral ========== 
-AT91C_PIOA_IMR            EQU (0xFFFFF448) ;- (PIOA) Interrupt Mask Register
-AT91C_PIOA_IER            EQU (0xFFFFF440) ;- (PIOA) Interrupt Enable Register
-AT91C_PIOA_OWDR           EQU (0xFFFFF4A4) ;- (PIOA) Output Write Disable Register
-AT91C_PIOA_ISR            EQU (0xFFFFF44C) ;- (PIOA) Interrupt Status Register
-AT91C_PIOA_PPUDR          EQU (0xFFFFF460) ;- (PIOA) Pull-up Disable Register
-AT91C_PIOA_MDSR           EQU (0xFFFFF458) ;- (PIOA) Multi-driver Status Register
-AT91C_PIOA_MDER           EQU (0xFFFFF450) ;- (PIOA) Multi-driver Enable Register
-AT91C_PIOA_PER            EQU (0xFFFFF400) ;- (PIOA) PIO Enable Register
-AT91C_PIOA_PSR            EQU (0xFFFFF408) ;- (PIOA) PIO Status Register
-AT91C_PIOA_OER            EQU (0xFFFFF410) ;- (PIOA) Output Enable Register
-AT91C_PIOA_BSR            EQU (0xFFFFF474) ;- (PIOA) Select B Register
-AT91C_PIOA_PPUER          EQU (0xFFFFF464) ;- (PIOA) Pull-up Enable Register
-AT91C_PIOA_MDDR           EQU (0xFFFFF454) ;- (PIOA) Multi-driver Disable Register
-AT91C_PIOA_PDR            EQU (0xFFFFF404) ;- (PIOA) PIO Disable Register
-AT91C_PIOA_ODR            EQU (0xFFFFF414) ;- (PIOA) Output Disable Registerr
-AT91C_PIOA_IFDR           EQU (0xFFFFF424) ;- (PIOA) Input Filter Disable Register
-AT91C_PIOA_ABSR           EQU (0xFFFFF478) ;- (PIOA) AB Select Status Register
-AT91C_PIOA_ASR            EQU (0xFFFFF470) ;- (PIOA) Select A Register
-AT91C_PIOA_PPUSR          EQU (0xFFFFF468) ;- (PIOA) Pad Pull-up Status Register
-AT91C_PIOA_ODSR           EQU (0xFFFFF438) ;- (PIOA) Output Data Status Register
-AT91C_PIOA_SODR           EQU (0xFFFFF430) ;- (PIOA) Set Output Data Register
-AT91C_PIOA_IFSR           EQU (0xFFFFF428) ;- (PIOA) Input Filter Status Register
-AT91C_PIOA_IFER           EQU (0xFFFFF420) ;- (PIOA) Input Filter Enable Register
-AT91C_PIOA_OSR            EQU (0xFFFFF418) ;- (PIOA) Output Status Register
-AT91C_PIOA_IDR            EQU (0xFFFFF444) ;- (PIOA) Interrupt Disable Register
-AT91C_PIOA_PDSR           EQU (0xFFFFF43C) ;- (PIOA) Pin Data Status Register
-AT91C_PIOA_CODR           EQU (0xFFFFF434) ;- (PIOA) Clear Output Data Register
-AT91C_PIOA_OWSR           EQU (0xFFFFF4A8) ;- (PIOA) Output Write Status Register
-AT91C_PIOA_OWER           EQU (0xFFFFF4A0) ;- (PIOA) Output Write Enable Register
-;- ========== Register definition for DBGU peripheral ========== 
-AT91C_DBGU_C2R            EQU (0xFFFFF244) ;- (DBGU) Chip ID2 Register
-AT91C_DBGU_THR            EQU (0xFFFFF21C) ;- (DBGU) Transmitter Holding Register
-AT91C_DBGU_CSR            EQU (0xFFFFF214) ;- (DBGU) Channel Status Register
-AT91C_DBGU_IDR            EQU (0xFFFFF20C) ;- (DBGU) Interrupt Disable Register
-AT91C_DBGU_MR             EQU (0xFFFFF204) ;- (DBGU) Mode Register
-AT91C_DBGU_FNTR           EQU (0xFFFFF248) ;- (DBGU) Force NTRST Register
-AT91C_DBGU_C1R            EQU (0xFFFFF240) ;- (DBGU) Chip ID1 Register
-AT91C_DBGU_BRGR           EQU (0xFFFFF220) ;- (DBGU) Baud Rate Generator Register
-AT91C_DBGU_RHR            EQU (0xFFFFF218) ;- (DBGU) Receiver Holding Register
-AT91C_DBGU_IMR            EQU (0xFFFFF210) ;- (DBGU) Interrupt Mask Register
-AT91C_DBGU_IER            EQU (0xFFFFF208) ;- (DBGU) Interrupt Enable Register
-AT91C_DBGU_CR             EQU (0xFFFFF200) ;- (DBGU) Control Register
-;- ========== Register definition for PDC_DBGU peripheral ========== 
-AT91C_DBGU_TNCR           EQU (0xFFFFF31C) ;- (PDC_DBGU) Transmit Next Counter Register
-AT91C_DBGU_RNCR           EQU (0xFFFFF314) ;- (PDC_DBGU) Receive Next Counter Register
-AT91C_DBGU_PTCR           EQU (0xFFFFF320) ;- (PDC_DBGU) PDC Transfer Control Register
-AT91C_DBGU_PTSR           EQU (0xFFFFF324) ;- (PDC_DBGU) PDC Transfer Status Register
-AT91C_DBGU_RCR            EQU (0xFFFFF304) ;- (PDC_DBGU) Receive Counter Register
-AT91C_DBGU_TCR            EQU (0xFFFFF30C) ;- (PDC_DBGU) Transmit Counter Register
-AT91C_DBGU_RPR            EQU (0xFFFFF300) ;- (PDC_DBGU) Receive Pointer Register
-AT91C_DBGU_TPR            EQU (0xFFFFF308) ;- (PDC_DBGU) Transmit Pointer Register
-AT91C_DBGU_RNPR           EQU (0xFFFFF310) ;- (PDC_DBGU) Receive Next Pointer Register
-AT91C_DBGU_TNPR           EQU (0xFFFFF318) ;- (PDC_DBGU) Transmit Next Pointer Register
-;- ========== Register definition for AIC peripheral ========== 
-AT91C_AIC_ICCR            EQU (0xFFFFF128) ;- (AIC) Interrupt Clear Command Register
-AT91C_AIC_IECR            EQU (0xFFFFF120) ;- (AIC) Interrupt Enable Command Register
-AT91C_AIC_SMR             EQU (0xFFFFF000) ;- (AIC) Source Mode Register
-AT91C_AIC_ISCR            EQU (0xFFFFF12C) ;- (AIC) Interrupt Set Command Register
-AT91C_AIC_EOICR           EQU (0xFFFFF130) ;- (AIC) End of Interrupt Command Register
-AT91C_AIC_DCR             EQU (0xFFFFF138) ;- (AIC) Debug Control Register (Protect)
-AT91C_AIC_FFER            EQU (0xFFFFF140) ;- (AIC) Fast Forcing Enable Register
-AT91C_AIC_SVR             EQU (0xFFFFF080) ;- (AIC) Source Vector Register
-AT91C_AIC_SPU             EQU (0xFFFFF134) ;- (AIC) Spurious Vector Register
-AT91C_AIC_FFDR            EQU (0xFFFFF144) ;- (AIC) Fast Forcing Disable Register
-AT91C_AIC_FVR             EQU (0xFFFFF104) ;- (AIC) FIQ Vector Register
-AT91C_AIC_FFSR            EQU (0xFFFFF148) ;- (AIC) Fast Forcing Status Register
-AT91C_AIC_IMR             EQU (0xFFFFF110) ;- (AIC) Interrupt Mask Register
-AT91C_AIC_ISR             EQU (0xFFFFF108) ;- (AIC) Interrupt Status Register
-AT91C_AIC_IVR             EQU (0xFFFFF100) ;- (AIC) IRQ Vector Register
-AT91C_AIC_IDCR            EQU (0xFFFFF124) ;- (AIC) Interrupt Disable Command Register
-AT91C_AIC_CISR            EQU (0xFFFFF114) ;- (AIC) Core Interrupt Status Register
-AT91C_AIC_IPR             EQU (0xFFFFF10C) ;- (AIC) Interrupt Pending Register
-;- ========== Register definition for PDC_SPI peripheral ========== 
-AT91C_SPI_PTCR            EQU (0xFFFE0120) ;- (PDC_SPI) PDC Transfer Control Register
-AT91C_SPI_TNPR            EQU (0xFFFE0118) ;- (PDC_SPI) Transmit Next Pointer Register
-AT91C_SPI_RNPR            EQU (0xFFFE0110) ;- (PDC_SPI) Receive Next Pointer Register
-AT91C_SPI_TPR             EQU (0xFFFE0108) ;- (PDC_SPI) Transmit Pointer Register
-AT91C_SPI_RPR             EQU (0xFFFE0100) ;- (PDC_SPI) Receive Pointer Register
-AT91C_SPI_PTSR            EQU (0xFFFE0124) ;- (PDC_SPI) PDC Transfer Status Register
-AT91C_SPI_TNCR            EQU (0xFFFE011C) ;- (PDC_SPI) Transmit Next Counter Register
-AT91C_SPI_RNCR            EQU (0xFFFE0114) ;- (PDC_SPI) Receive Next Counter Register
-AT91C_SPI_TCR             EQU (0xFFFE010C) ;- (PDC_SPI) Transmit Counter Register
-AT91C_SPI_RCR             EQU (0xFFFE0104) ;- (PDC_SPI) Receive Counter Register
-;- ========== Register definition for SPI peripheral ========== 
-AT91C_SPI_CSR             EQU (0xFFFE0030) ;- (SPI) Chip Select Register
-AT91C_SPI_IDR             EQU (0xFFFE0018) ;- (SPI) Interrupt Disable Register
-AT91C_SPI_SR              EQU (0xFFFE0010) ;- (SPI) Status Register
-AT91C_SPI_RDR             EQU (0xFFFE0008) ;- (SPI) Receive Data Register
-AT91C_SPI_CR              EQU (0xFFFE0000) ;- (SPI) Control Register
-AT91C_SPI_IMR             EQU (0xFFFE001C) ;- (SPI) Interrupt Mask Register
-AT91C_SPI_IER             EQU (0xFFFE0014) ;- (SPI) Interrupt Enable Register
-AT91C_SPI_TDR             EQU (0xFFFE000C) ;- (SPI) Transmit Data Register
-AT91C_SPI_MR              EQU (0xFFFE0004) ;- (SPI) Mode Register
-;- ========== Register definition for PDC_SSC2 peripheral ========== 
-AT91C_SSC2_PTCR           EQU (0xFFFD8120) ;- (PDC_SSC2) PDC Transfer Control Register
-AT91C_SSC2_TNPR           EQU (0xFFFD8118) ;- (PDC_SSC2) Transmit Next Pointer Register
-AT91C_SSC2_RNPR           EQU (0xFFFD8110) ;- (PDC_SSC2) Receive Next Pointer Register
-AT91C_SSC2_TPR            EQU (0xFFFD8108) ;- (PDC_SSC2) Transmit Pointer Register
-AT91C_SSC2_RPR            EQU (0xFFFD8100) ;- (PDC_SSC2) Receive Pointer Register
-AT91C_SSC2_PTSR           EQU (0xFFFD8124) ;- (PDC_SSC2) PDC Transfer Status Register
-AT91C_SSC2_TNCR           EQU (0xFFFD811C) ;- (PDC_SSC2) Transmit Next Counter Register
-AT91C_SSC2_RNCR           EQU (0xFFFD8114) ;- (PDC_SSC2) Receive Next Counter Register
-AT91C_SSC2_TCR            EQU (0xFFFD810C) ;- (PDC_SSC2) Transmit Counter Register
-AT91C_SSC2_RCR            EQU (0xFFFD8104) ;- (PDC_SSC2) Receive Counter Register
-;- ========== Register definition for SSC2 peripheral ========== 
-AT91C_SSC2_IMR            EQU (0xFFFD804C) ;- (SSC2) Interrupt Mask Register
-AT91C_SSC2_IER            EQU (0xFFFD8044) ;- (SSC2) Interrupt Enable Register
-AT91C_SSC2_RC1R           EQU (0xFFFD803C) ;- (SSC2) Receive Compare 1 Register
-AT91C_SSC2_TSHR           EQU (0xFFFD8034) ;- (SSC2) Transmit Sync Holding Register
-AT91C_SSC2_CMR            EQU (0xFFFD8004) ;- (SSC2) Clock Mode Register
-AT91C_SSC2_IDR            EQU (0xFFFD8048) ;- (SSC2) Interrupt Disable Register
-AT91C_SSC2_TCMR           EQU (0xFFFD8018) ;- (SSC2) Transmit Clock Mode Register
-AT91C_SSC2_RCMR           EQU (0xFFFD8010) ;- (SSC2) Receive Clock ModeRegister
-AT91C_SSC2_CR             EQU (0xFFFD8000) ;- (SSC2) Control Register
-AT91C_SSC2_RFMR           EQU (0xFFFD8014) ;- (SSC2) Receive Frame Mode Register
-AT91C_SSC2_TFMR           EQU (0xFFFD801C) ;- (SSC2) Transmit Frame Mode Register
-AT91C_SSC2_THR            EQU (0xFFFD8024) ;- (SSC2) Transmit Holding Register
-AT91C_SSC2_SR             EQU (0xFFFD8040) ;- (SSC2) Status Register
-AT91C_SSC2_RC0R           EQU (0xFFFD8038) ;- (SSC2) Receive Compare 0 Register
-AT91C_SSC2_RSHR           EQU (0xFFFD8030) ;- (SSC2) Receive Sync Holding Register
-AT91C_SSC2_RHR            EQU (0xFFFD8020) ;- (SSC2) Receive Holding Register
-;- ========== Register definition for PDC_SSC1 peripheral ========== 
-AT91C_SSC1_PTCR           EQU (0xFFFD4120) ;- (PDC_SSC1) PDC Transfer Control Register
-AT91C_SSC1_TNPR           EQU (0xFFFD4118) ;- (PDC_SSC1) Transmit Next Pointer Register
-AT91C_SSC1_RNPR           EQU (0xFFFD4110) ;- (PDC_SSC1) Receive Next Pointer Register
-AT91C_SSC1_TPR            EQU (0xFFFD4108) ;- (PDC_SSC1) Transmit Pointer Register
-AT91C_SSC1_RPR            EQU (0xFFFD4100) ;- (PDC_SSC1) Receive Pointer Register
-AT91C_SSC1_PTSR           EQU (0xFFFD4124) ;- (PDC_SSC1) PDC Transfer Status Register
-AT91C_SSC1_TNCR           EQU (0xFFFD411C) ;- (PDC_SSC1) Transmit Next Counter Register
-AT91C_SSC1_RNCR           EQU (0xFFFD4114) ;- (PDC_SSC1) Receive Next Counter Register
-AT91C_SSC1_TCR            EQU (0xFFFD410C) ;- (PDC_SSC1) Transmit Counter Register
-AT91C_SSC1_RCR            EQU (0xFFFD4104) ;- (PDC_SSC1) Receive Counter Register
-;- ========== Register definition for SSC1 peripheral ========== 
-AT91C_SSC1_RFMR           EQU (0xFFFD4014) ;- (SSC1) Receive Frame Mode Register
-AT91C_SSC1_CMR            EQU (0xFFFD4004) ;- (SSC1) Clock Mode Register
-AT91C_SSC1_IDR            EQU (0xFFFD4048) ;- (SSC1) Interrupt Disable Register
-AT91C_SSC1_SR             EQU (0xFFFD4040) ;- (SSC1) Status Register
-AT91C_SSC1_RC0R           EQU (0xFFFD4038) ;- (SSC1) Receive Compare 0 Register
-AT91C_SSC1_RSHR           EQU (0xFFFD4030) ;- (SSC1) Receive Sync Holding Register
-AT91C_SSC1_RHR            EQU (0xFFFD4020) ;- (SSC1) Receive Holding Register
-AT91C_SSC1_TCMR           EQU (0xFFFD4018) ;- (SSC1) Transmit Clock Mode Register
-AT91C_SSC1_RCMR           EQU (0xFFFD4010) ;- (SSC1) Receive Clock ModeRegister
-AT91C_SSC1_CR             EQU (0xFFFD4000) ;- (SSC1) Control Register
-AT91C_SSC1_IMR            EQU (0xFFFD404C) ;- (SSC1) Interrupt Mask Register
-AT91C_SSC1_IER            EQU (0xFFFD4044) ;- (SSC1) Interrupt Enable Register
-AT91C_SSC1_RC1R           EQU (0xFFFD403C) ;- (SSC1) Receive Compare 1 Register
-AT91C_SSC1_TSHR           EQU (0xFFFD4034) ;- (SSC1) Transmit Sync Holding Register
-AT91C_SSC1_THR            EQU (0xFFFD4024) ;- (SSC1) Transmit Holding Register
-AT91C_SSC1_TFMR           EQU (0xFFFD401C) ;- (SSC1) Transmit Frame Mode Register
-;- ========== Register definition for PDC_SSC0 peripheral ========== 
-AT91C_SSC0_PTCR           EQU (0xFFFD0120) ;- (PDC_SSC0) PDC Transfer Control Register
-AT91C_SSC0_TNPR           EQU (0xFFFD0118) ;- (PDC_SSC0) Transmit Next Pointer Register
-AT91C_SSC0_RNPR           EQU (0xFFFD0110) ;- (PDC_SSC0) Receive Next Pointer Register
-AT91C_SSC0_TPR            EQU (0xFFFD0108) ;- (PDC_SSC0) Transmit Pointer Register
-AT91C_SSC0_RPR            EQU (0xFFFD0100) ;- (PDC_SSC0) Receive Pointer Register
-AT91C_SSC0_PTSR           EQU (0xFFFD0124) ;- (PDC_SSC0) PDC Transfer Status Register
-AT91C_SSC0_TNCR           EQU (0xFFFD011C) ;- (PDC_SSC0) Transmit Next Counter Register
-AT91C_SSC0_RNCR           EQU (0xFFFD0114) ;- (PDC_SSC0) Receive Next Counter Register
-AT91C_SSC0_TCR            EQU (0xFFFD010C) ;- (PDC_SSC0) Transmit Counter Register
-AT91C_SSC0_RCR            EQU (0xFFFD0104) ;- (PDC_SSC0) Receive Counter Register
-;- ========== Register definition for SSC0 peripheral ========== 
-AT91C_SSC0_IMR            EQU (0xFFFD004C) ;- (SSC0) Interrupt Mask Register
-AT91C_SSC0_IER            EQU (0xFFFD0044) ;- (SSC0) Interrupt Enable Register
-AT91C_SSC0_RC1R           EQU (0xFFFD003C) ;- (SSC0) Receive Compare 1 Register
-AT91C_SSC0_TSHR           EQU (0xFFFD0034) ;- (SSC0) Transmit Sync Holding Register
-AT91C_SSC0_THR            EQU (0xFFFD0024) ;- (SSC0) Transmit Holding Register
-AT91C_SSC0_TFMR           EQU (0xFFFD001C) ;- (SSC0) Transmit Frame Mode Register
-AT91C_SSC0_RFMR           EQU (0xFFFD0014) ;- (SSC0) Receive Frame Mode Register
-AT91C_SSC0_CMR            EQU (0xFFFD0004) ;- (SSC0) Clock Mode Register
-AT91C_SSC0_IDR            EQU (0xFFFD0048) ;- (SSC0) Interrupt Disable Register
-AT91C_SSC0_SR             EQU (0xFFFD0040) ;- (SSC0) Status Register
-AT91C_SSC0_RC0R           EQU (0xFFFD0038) ;- (SSC0) Receive Compare 0 Register
-AT91C_SSC0_RSHR           EQU (0xFFFD0030) ;- (SSC0) Receive Sync Holding Register
-AT91C_SSC0_RHR            EQU (0xFFFD0020) ;- (SSC0) Receive Holding Register
-AT91C_SSC0_TCMR           EQU (0xFFFD0018) ;- (SSC0) Transmit Clock Mode Register
-AT91C_SSC0_RCMR           EQU (0xFFFD0010) ;- (SSC0) Receive Clock ModeRegister
-AT91C_SSC0_CR             EQU (0xFFFD0000) ;- (SSC0) Control Register
-;- ========== Register definition for PDC_US3 peripheral ========== 
-AT91C_US3_PTSR            EQU (0xFFFCC124) ;- (PDC_US3) PDC Transfer Status Register
-AT91C_US3_TNCR            EQU (0xFFFCC11C) ;- (PDC_US3) Transmit Next Counter Register
-AT91C_US3_RNCR            EQU (0xFFFCC114) ;- (PDC_US3) Receive Next Counter Register
-AT91C_US3_TCR             EQU (0xFFFCC10C) ;- (PDC_US3) Transmit Counter Register
-AT91C_US3_RCR             EQU (0xFFFCC104) ;- (PDC_US3) Receive Counter Register
-AT91C_US3_PTCR            EQU (0xFFFCC120) ;- (PDC_US3) PDC Transfer Control Register
-AT91C_US3_TNPR            EQU (0xFFFCC118) ;- (PDC_US3) Transmit Next Pointer Register
-AT91C_US3_RNPR            EQU (0xFFFCC110) ;- (PDC_US3) Receive Next Pointer Register
-AT91C_US3_TPR             EQU (0xFFFCC108) ;- (PDC_US3) Transmit Pointer Register
-AT91C_US3_RPR             EQU (0xFFFCC100) ;- (PDC_US3) Receive Pointer Register
-;- ========== Register definition for US3 peripheral ========== 
-AT91C_US3_IF              EQU (0xFFFCC04C) ;- (US3) IRDA_FILTER Register
-AT91C_US3_NER             EQU (0xFFFCC044) ;- (US3) Nb Errors Register
-AT91C_US3_RTOR            EQU (0xFFFCC024) ;- (US3) Receiver Time-out Register
-AT91C_US3_THR             EQU (0xFFFCC01C) ;- (US3) Transmitter Holding Register
-AT91C_US3_CSR             EQU (0xFFFCC014) ;- (US3) Channel Status Register
-AT91C_US3_IDR             EQU (0xFFFCC00C) ;- (US3) Interrupt Disable Register
-AT91C_US3_MR              EQU (0xFFFCC004) ;- (US3) Mode Register
-AT91C_US3_XXR             EQU (0xFFFCC048) ;- (US3) XON_XOFF Register
-AT91C_US3_FIDI            EQU (0xFFFCC040) ;- (US3) FI_DI_Ratio Register
-AT91C_US3_TTGR            EQU (0xFFFCC028) ;- (US3) Transmitter Time-guard Register
-AT91C_US3_BRGR            EQU (0xFFFCC020) ;- (US3) Baud Rate Generator Register
-AT91C_US3_RHR             EQU (0xFFFCC018) ;- (US3) Receiver Holding Register
-AT91C_US3_IMR             EQU (0xFFFCC010) ;- (US3) Interrupt Mask Register
-AT91C_US3_IER             EQU (0xFFFCC008) ;- (US3) Interrupt Enable Register
-AT91C_US3_CR              EQU (0xFFFCC000) ;- (US3) Control Register
-;- ========== Register definition for PDC_US2 peripheral ========== 
-AT91C_US2_PTSR            EQU (0xFFFC8124) ;- (PDC_US2) PDC Transfer Status Register
-AT91C_US2_TNCR            EQU (0xFFFC811C) ;- (PDC_US2) Transmit Next Counter Register
-AT91C_US2_RNCR            EQU (0xFFFC8114) ;- (PDC_US2) Receive Next Counter Register
-AT91C_US2_TCR             EQU (0xFFFC810C) ;- (PDC_US2) Transmit Counter Register
-AT91C_US2_PTCR            EQU (0xFFFC8120) ;- (PDC_US2) PDC Transfer Control Register
-AT91C_US2_RCR             EQU (0xFFFC8104) ;- (PDC_US2) Receive Counter Register
-AT91C_US2_TNPR            EQU (0xFFFC8118) ;- (PDC_US2) Transmit Next Pointer Register
-AT91C_US2_RPR             EQU (0xFFFC8100) ;- (PDC_US2) Receive Pointer Register
-AT91C_US2_TPR             EQU (0xFFFC8108) ;- (PDC_US2) Transmit Pointer Register
-AT91C_US2_RNPR            EQU (0xFFFC8110) ;- (PDC_US2) Receive Next Pointer Register
-;- ========== Register definition for US2 peripheral ========== 
-AT91C_US2_XXR             EQU (0xFFFC8048) ;- (US2) XON_XOFF Register
-AT91C_US2_FIDI            EQU (0xFFFC8040) ;- (US2) FI_DI_Ratio Register
-AT91C_US2_TTGR            EQU (0xFFFC8028) ;- (US2) Transmitter Time-guard Register
-AT91C_US2_BRGR            EQU (0xFFFC8020) ;- (US2) Baud Rate Generator Register
-AT91C_US2_RHR             EQU (0xFFFC8018) ;- (US2) Receiver Holding Register
-AT91C_US2_IMR             EQU (0xFFFC8010) ;- (US2) Interrupt Mask Register
-AT91C_US2_IER             EQU (0xFFFC8008) ;- (US2) Interrupt Enable Register
-AT91C_US2_CR              EQU (0xFFFC8000) ;- (US2) Control Register
-AT91C_US2_IF              EQU (0xFFFC804C) ;- (US2) IRDA_FILTER Register
-AT91C_US2_NER             EQU (0xFFFC8044) ;- (US2) Nb Errors Register
-AT91C_US2_RTOR            EQU (0xFFFC8024) ;- (US2) Receiver Time-out Register
-AT91C_US2_THR             EQU (0xFFFC801C) ;- (US2) Transmitter Holding Register
-AT91C_US2_CSR             EQU (0xFFFC8014) ;- (US2) Channel Status Register
-AT91C_US2_IDR             EQU (0xFFFC800C) ;- (US2) Interrupt Disable Register
-AT91C_US2_MR              EQU (0xFFFC8004) ;- (US2) Mode Register
-;- ========== Register definition for PDC_US1 peripheral ========== 
-AT91C_US1_PTSR            EQU (0xFFFC4124) ;- (PDC_US1) PDC Transfer Status Register
-AT91C_US1_TNCR            EQU (0xFFFC411C) ;- (PDC_US1) Transmit Next Counter Register
-AT91C_US1_RNCR            EQU (0xFFFC4114) ;- (PDC_US1) Receive Next Counter Register
-AT91C_US1_TCR             EQU (0xFFFC410C) ;- (PDC_US1) Transmit Counter Register
-AT91C_US1_RCR             EQU (0xFFFC4104) ;- (PDC_US1) Receive Counter Register
-AT91C_US1_PTCR            EQU (0xFFFC4120) ;- (PDC_US1) PDC Transfer Control Register
-AT91C_US1_TNPR            EQU (0xFFFC4118) ;- (PDC_US1) Transmit Next Pointer Register
-AT91C_US1_RNPR            EQU (0xFFFC4110) ;- (PDC_US1) Receive Next Pointer Register
-AT91C_US1_TPR             EQU (0xFFFC4108) ;- (PDC_US1) Transmit Pointer Register
-AT91C_US1_RPR             EQU (0xFFFC4100) ;- (PDC_US1) Receive Pointer Register
-;- ========== Register definition for US1 peripheral ========== 
-AT91C_US1_XXR             EQU (0xFFFC4048) ;- (US1) XON_XOFF Register
-AT91C_US1_RHR             EQU (0xFFFC4018) ;- (US1) Receiver Holding Register
-AT91C_US1_IMR             EQU (0xFFFC4010) ;- (US1) Interrupt Mask Register
-AT91C_US1_IER             EQU (0xFFFC4008) ;- (US1) Interrupt Enable Register
-AT91C_US1_CR              EQU (0xFFFC4000) ;- (US1) Control Register
-AT91C_US1_RTOR            EQU (0xFFFC4024) ;- (US1) Receiver Time-out Register
-AT91C_US1_THR             EQU (0xFFFC401C) ;- (US1) Transmitter Holding Register
-AT91C_US1_CSR             EQU (0xFFFC4014) ;- (US1) Channel Status Register
-AT91C_US1_IDR             EQU (0xFFFC400C) ;- (US1) Interrupt Disable Register
-AT91C_US1_FIDI            EQU (0xFFFC4040) ;- (US1) FI_DI_Ratio Register
-AT91C_US1_BRGR            EQU (0xFFFC4020) ;- (US1) Baud Rate Generator Register
-AT91C_US1_TTGR            EQU (0xFFFC4028) ;- (US1) Transmitter Time-guard Register
-AT91C_US1_IF              EQU (0xFFFC404C) ;- (US1) IRDA_FILTER Register
-AT91C_US1_NER             EQU (0xFFFC4044) ;- (US1) Nb Errors Register
-AT91C_US1_MR              EQU (0xFFFC4004) ;- (US1) Mode Register
-;- ========== Register definition for PDC_US0 peripheral ========== 
-AT91C_US0_PTCR            EQU (0xFFFC0120) ;- (PDC_US0) PDC Transfer Control Register
-AT91C_US0_TNPR            EQU (0xFFFC0118) ;- (PDC_US0) Transmit Next Pointer Register
-AT91C_US0_RNPR            EQU (0xFFFC0110) ;- (PDC_US0) Receive Next Pointer Register
-AT91C_US0_TPR             EQU (0xFFFC0108) ;- (PDC_US0) Transmit Pointer Register
-AT91C_US0_RPR             EQU (0xFFFC0100) ;- (PDC_US0) Receive Pointer Register
-AT91C_US0_PTSR            EQU (0xFFFC0124) ;- (PDC_US0) PDC Transfer Status Register
-AT91C_US0_TNCR            EQU (0xFFFC011C) ;- (PDC_US0) Transmit Next Counter Register
-AT91C_US0_RNCR            EQU (0xFFFC0114) ;- (PDC_US0) Receive Next Counter Register
-AT91C_US0_TCR             EQU (0xFFFC010C) ;- (PDC_US0) Transmit Counter Register
-AT91C_US0_RCR             EQU (0xFFFC0104) ;- (PDC_US0) Receive Counter Register
-;- ========== Register definition for US0 peripheral ========== 
-AT91C_US0_TTGR            EQU (0xFFFC0028) ;- (US0) Transmitter Time-guard Register
-AT91C_US0_BRGR            EQU (0xFFFC0020) ;- (US0) Baud Rate Generator Register
-AT91C_US0_RHR             EQU (0xFFFC0018) ;- (US0) Receiver Holding Register
-AT91C_US0_IMR             EQU (0xFFFC0010) ;- (US0) Interrupt Mask Register
-AT91C_US0_NER             EQU (0xFFFC0044) ;- (US0) Nb Errors Register
-AT91C_US0_RTOR            EQU (0xFFFC0024) ;- (US0) Receiver Time-out Register
-AT91C_US0_XXR             EQU (0xFFFC0048) ;- (US0) XON_XOFF Register
-AT91C_US0_FIDI            EQU (0xFFFC0040) ;- (US0) FI_DI_Ratio Register
-AT91C_US0_CR              EQU (0xFFFC0000) ;- (US0) Control Register
-AT91C_US0_IER             EQU (0xFFFC0008) ;- (US0) Interrupt Enable Register
-AT91C_US0_IF              EQU (0xFFFC004C) ;- (US0) IRDA_FILTER Register
-AT91C_US0_MR              EQU (0xFFFC0004) ;- (US0) Mode Register
-AT91C_US0_IDR             EQU (0xFFFC000C) ;- (US0) Interrupt Disable Register
-AT91C_US0_CSR             EQU (0xFFFC0014) ;- (US0) Channel Status Register
-AT91C_US0_THR             EQU (0xFFFC001C) ;- (US0) Transmitter Holding Register
-;- ========== Register definition for TWI peripheral ========== 
-AT91C_TWI_RHR             EQU (0xFFFB8030) ;- (TWI) Receive Holding Register
-AT91C_TWI_IDR             EQU (0xFFFB8028) ;- (TWI) Interrupt Disable Register
-AT91C_TWI_SR              EQU (0xFFFB8020) ;- (TWI) Status Register
-AT91C_TWI_CWGR            EQU (0xFFFB8010) ;- (TWI) Clock Waveform Generator Register
-AT91C_TWI_SMR             EQU (0xFFFB8008) ;- (TWI) Slave Mode Register
-AT91C_TWI_CR              EQU (0xFFFB8000) ;- (TWI) Control Register
-AT91C_TWI_THR             EQU (0xFFFB8034) ;- (TWI) Transmit Holding Register
-AT91C_TWI_IMR             EQU (0xFFFB802C) ;- (TWI) Interrupt Mask Register
-AT91C_TWI_IER             EQU (0xFFFB8024) ;- (TWI) Interrupt Enable Register
-AT91C_TWI_IADR            EQU (0xFFFB800C) ;- (TWI) Internal Address Register
-AT91C_TWI_MMR             EQU (0xFFFB8004) ;- (TWI) Master Mode Register
-;- ========== Register definition for PDC_MCI peripheral ========== 
-AT91C_MCI_PTCR            EQU (0xFFFB4120) ;- (PDC_MCI) PDC Transfer Control Register
-AT91C_MCI_TNPR            EQU (0xFFFB4118) ;- (PDC_MCI) Transmit Next Pointer Register
-AT91C_MCI_RNPR            EQU (0xFFFB4110) ;- (PDC_MCI) Receive Next Pointer Register
-AT91C_MCI_TPR             EQU (0xFFFB4108) ;- (PDC_MCI) Transmit Pointer Register
-AT91C_MCI_RPR             EQU (0xFFFB4100) ;- (PDC_MCI) Receive Pointer Register
-AT91C_MCI_PTSR            EQU (0xFFFB4124) ;- (PDC_MCI) PDC Transfer Status Register
-AT91C_MCI_TNCR            EQU (0xFFFB411C) ;- (PDC_MCI) Transmit Next Counter Register
-AT91C_MCI_RNCR            EQU (0xFFFB4114) ;- (PDC_MCI) Receive Next Counter Register
-AT91C_MCI_TCR             EQU (0xFFFB410C) ;- (PDC_MCI) Transmit Counter Register
-AT91C_MCI_RCR             EQU (0xFFFB4104) ;- (PDC_MCI) Receive Counter Register
-;- ========== Register definition for MCI peripheral ========== 
-AT91C_MCI_IDR             EQU (0xFFFB4048) ;- (MCI) MCI Interrupt Disable Register
-AT91C_MCI_SR              EQU (0xFFFB4040) ;- (MCI) MCI Status Register
-AT91C_MCI_RDR             EQU (0xFFFB4030) ;- (MCI) MCI Receive Data Register
-AT91C_MCI_RSPR            EQU (0xFFFB4020) ;- (MCI) MCI Response Register
-AT91C_MCI_ARGR            EQU (0xFFFB4010) ;- (MCI) MCI Argument Register
-AT91C_MCI_DTOR            EQU (0xFFFB4008) ;- (MCI) MCI Data Timeout Register
-AT91C_MCI_CR              EQU (0xFFFB4000) ;- (MCI) MCI Control Register
-AT91C_MCI_IMR             EQU (0xFFFB404C) ;- (MCI) MCI Interrupt Mask Register
-AT91C_MCI_IER             EQU (0xFFFB4044) ;- (MCI) MCI Interrupt Enable Register
-AT91C_MCI_TDR             EQU (0xFFFB4034) ;- (MCI) MCI Transmit Data Register
-AT91C_MCI_CMDR            EQU (0xFFFB4014) ;- (MCI) MCI Command Register
-AT91C_MCI_SDCR            EQU (0xFFFB400C) ;- (MCI) MCI SD Card Register
-AT91C_MCI_MR              EQU (0xFFFB4004) ;- (MCI) MCI Mode Register
-;- ========== Register definition for UDP peripheral ========== 
-AT91C_UDP_ISR             EQU (0xFFFB001C) ;- (UDP) Interrupt Status Register
-AT91C_UDP_IDR             EQU (0xFFFB0014) ;- (UDP) Interrupt Disable Register
-AT91C_UDP_GLBSTATE        EQU (0xFFFB0004) ;- (UDP) Global State Register
-AT91C_UDP_FDR             EQU (0xFFFB0050) ;- (UDP) Endpoint FIFO Data Register
-AT91C_UDP_CSR             EQU (0xFFFB0030) ;- (UDP) Endpoint Control and Status Register
-AT91C_UDP_RSTEP           EQU (0xFFFB0028) ;- (UDP) Reset Endpoint Register
-AT91C_UDP_ICR             EQU (0xFFFB0020) ;- (UDP) Interrupt Clear Register
-AT91C_UDP_IMR             EQU (0xFFFB0018) ;- (UDP) Interrupt Mask Register
-AT91C_UDP_IER             EQU (0xFFFB0010) ;- (UDP) Interrupt Enable Register
-AT91C_UDP_FADDR           EQU (0xFFFB0008) ;- (UDP) Function Address Register
-AT91C_UDP_NUM             EQU (0xFFFB0000) ;- (UDP) Frame Number Register
-;- ========== Register definition for TC5 peripheral ========== 
-AT91C_TC5_CMR             EQU (0xFFFA4084) ;- (TC5) Channel Mode Register
-AT91C_TC5_IDR             EQU (0xFFFA40A8) ;- (TC5) Interrupt Disable Register
-AT91C_TC5_SR              EQU (0xFFFA40A0) ;- (TC5) Status Register
-AT91C_TC5_RB              EQU (0xFFFA4098) ;- (TC5) Register B
-AT91C_TC5_CV              EQU (0xFFFA4090) ;- (TC5) Counter Value
-AT91C_TC5_CCR             EQU (0xFFFA4080) ;- (TC5) Channel Control Register
-AT91C_TC5_IMR             EQU (0xFFFA40AC) ;- (TC5) Interrupt Mask Register
-AT91C_TC5_IER             EQU (0xFFFA40A4) ;- (TC5) Interrupt Enable Register
-AT91C_TC5_RC              EQU (0xFFFA409C) ;- (TC5) Register C
-AT91C_TC5_RA              EQU (0xFFFA4094) ;- (TC5) Register A
-;- ========== Register definition for TC4 peripheral ========== 
-AT91C_TC4_IMR             EQU (0xFFFA406C) ;- (TC4) Interrupt Mask Register
-AT91C_TC4_IER             EQU (0xFFFA4064) ;- (TC4) Interrupt Enable Register
-AT91C_TC4_RC              EQU (0xFFFA405C) ;- (TC4) Register C
-AT91C_TC4_RA              EQU (0xFFFA4054) ;- (TC4) Register A
-AT91C_TC4_CMR             EQU (0xFFFA4044) ;- (TC4) Channel Mode Register
-AT91C_TC4_IDR             EQU (0xFFFA4068) ;- (TC4) Interrupt Disable Register
-AT91C_TC4_SR              EQU (0xFFFA4060) ;- (TC4) Status Register
-AT91C_TC4_RB              EQU (0xFFFA4058) ;- (TC4) Register B
-AT91C_TC4_CV              EQU (0xFFFA4050) ;- (TC4) Counter Value
-AT91C_TC4_CCR             EQU (0xFFFA4040) ;- (TC4) Channel Control Register
-;- ========== Register definition for TC3 peripheral ========== 
-AT91C_TC3_IMR             EQU (0xFFFA402C) ;- (TC3) Interrupt Mask Register
-AT91C_TC3_CV              EQU (0xFFFA4010) ;- (TC3) Counter Value
-AT91C_TC3_CCR             EQU (0xFFFA4000) ;- (TC3) Channel Control Register
-AT91C_TC3_IER             EQU (0xFFFA4024) ;- (TC3) Interrupt Enable Register
-AT91C_TC3_CMR             EQU (0xFFFA4004) ;- (TC3) Channel Mode Register
-AT91C_TC3_RA              EQU (0xFFFA4014) ;- (TC3) Register A
-AT91C_TC3_RC              EQU (0xFFFA401C) ;- (TC3) Register C
-AT91C_TC3_IDR             EQU (0xFFFA4028) ;- (TC3) Interrupt Disable Register
-AT91C_TC3_RB              EQU (0xFFFA4018) ;- (TC3) Register B
-AT91C_TC3_SR              EQU (0xFFFA4020) ;- (TC3) Status Register
-;- ========== Register definition for TCB1 peripheral ========== 
-AT91C_TCB1_BCR            EQU (0xFFFA4140) ;- (TCB1) TC Block Control Register
-AT91C_TCB1_BMR            EQU (0xFFFA4144) ;- (TCB1) TC Block Mode Register
-;- ========== Register definition for TC2 peripheral ========== 
-AT91C_TC2_IMR             EQU (0xFFFA00AC) ;- (TC2) Interrupt Mask Register
-AT91C_TC2_IER             EQU (0xFFFA00A4) ;- (TC2) Interrupt Enable Register
-AT91C_TC2_RC              EQU (0xFFFA009C) ;- (TC2) Register C
-AT91C_TC2_RA              EQU (0xFFFA0094) ;- (TC2) Register A
-AT91C_TC2_CMR             EQU (0xFFFA0084) ;- (TC2) Channel Mode Register
-AT91C_TC2_IDR             EQU (0xFFFA00A8) ;- (TC2) Interrupt Disable Register
-AT91C_TC2_SR              EQU (0xFFFA00A0) ;- (TC2) Status Register
-AT91C_TC2_RB              EQU (0xFFFA0098) ;- (TC2) Register B
-AT91C_TC2_CV              EQU (0xFFFA0090) ;- (TC2) Counter Value
-AT91C_TC2_CCR             EQU (0xFFFA0080) ;- (TC2) Channel Control Register
-;- ========== Register definition for TC1 peripheral ========== 
-AT91C_TC1_IMR             EQU (0xFFFA006C) ;- (TC1) Interrupt Mask Register
-AT91C_TC1_IER             EQU (0xFFFA0064) ;- (TC1) Interrupt Enable Register
-AT91C_TC1_RC              EQU (0xFFFA005C) ;- (TC1) Register C
-AT91C_TC1_RA              EQU (0xFFFA0054) ;- (TC1) Register A
-AT91C_TC1_CMR             EQU (0xFFFA0044) ;- (TC1) Channel Mode Register
-AT91C_TC1_IDR             EQU (0xFFFA0068) ;- (TC1) Interrupt Disable Register
-AT91C_TC1_SR              EQU (0xFFFA0060) ;- (TC1) Status Register
-AT91C_TC1_RB              EQU (0xFFFA0058) ;- (TC1) Register B
-AT91C_TC1_CV              EQU (0xFFFA0050) ;- (TC1) Counter Value
-AT91C_TC1_CCR             EQU (0xFFFA0040) ;- (TC1) Channel Control Register
-;- ========== Register definition for TC0 peripheral ========== 
-AT91C_TC0_IMR             EQU (0xFFFA002C) ;- (TC0) Interrupt Mask Register
-AT91C_TC0_IER             EQU (0xFFFA0024) ;- (TC0) Interrupt Enable Register
-AT91C_TC0_RC              EQU (0xFFFA001C) ;- (TC0) Register C
-AT91C_TC0_RA              EQU (0xFFFA0014) ;- (TC0) Register A
-AT91C_TC0_CMR             EQU (0xFFFA0004) ;- (TC0) Channel Mode Register
-AT91C_TC0_IDR             EQU (0xFFFA0028) ;- (TC0) Interrupt Disable Register
-AT91C_TC0_SR              EQU (0xFFFA0020) ;- (TC0) Status Register
-AT91C_TC0_RB              EQU (0xFFFA0018) ;- (TC0) Register B
-AT91C_TC0_CV              EQU (0xFFFA0010) ;- (TC0) Counter Value
-AT91C_TC0_CCR             EQU (0xFFFA0000) ;- (TC0) Channel Control Register
-;- ========== Register definition for TCB0 peripheral ========== 
-AT91C_TCB0_BMR            EQU (0xFFFA00C4) ;- (TCB0) TC Block Mode Register
-AT91C_TCB0_BCR            EQU (0xFFFA00C0) ;- (TCB0) TC Block Control Register
-;- ========== Register definition for UHP peripheral ========== 
-AT91C_UHP_HcRhDescriptorA EQU (0x00300048) ;- (UHP) Root Hub characteristics A
-AT91C_UHP_HcRhPortStatus  EQU (0x00300054) ;- (UHP) Root Hub Port Status Register
-AT91C_UHP_HcRhDescriptorB EQU (0x0030004C) ;- (UHP) Root Hub characteristics B
-AT91C_UHP_HcControl       EQU (0x00300004) ;- (UHP) Operating modes for the Host Controller
-AT91C_UHP_HcInterruptStatus EQU (0x0030000C) ;- (UHP) Interrupt Status Register
-AT91C_UHP_HcRhStatus      EQU (0x00300050) ;- (UHP) Root Hub Status register
-AT91C_UHP_HcRevision      EQU (0x00300000) ;- (UHP) Revision
-AT91C_UHP_HcCommandStatus EQU (0x00300008) ;- (UHP) Command & status Register
-AT91C_UHP_HcInterruptEnable EQU (0x00300010) ;- (UHP) Interrupt Enable Register
-AT91C_UHP_HcHCCA          EQU (0x00300018) ;- (UHP) Pointer to the Host Controller Communication Area
-AT91C_UHP_HcControlHeadED EQU (0x00300020) ;- (UHP) First Endpoint Descriptor of the Control list
-AT91C_UHP_HcInterruptDisable EQU (0x00300014) ;- (UHP) Interrupt Disable Register
-AT91C_UHP_HcPeriodCurrentED EQU (0x0030001C) ;- (UHP) Current Isochronous or Interrupt Endpoint Descriptor
-AT91C_UHP_HcControlCurrentED EQU (0x00300024) ;- (UHP) Endpoint Control and Status Register
-AT91C_UHP_HcBulkCurrentED EQU (0x0030002C) ;- (UHP) Current endpoint of the Bulk list
-AT91C_UHP_HcFmInterval    EQU (0x00300034) ;- (UHP) Bit time between 2 consecutive SOFs
-AT91C_UHP_HcBulkHeadED    EQU (0x00300028) ;- (UHP) First endpoint register of the Bulk list
-AT91C_UHP_HcBulkDoneHead  EQU (0x00300030) ;- (UHP) Last completed transfer descriptor
-AT91C_UHP_HcFmRemaining   EQU (0x00300038) ;- (UHP) Bit time remaining in the current Frame
-AT91C_UHP_HcPeriodicStart EQU (0x00300040) ;- (UHP) Periodic Start
-AT91C_UHP_HcLSThreshold   EQU (0x00300044) ;- (UHP) LS Threshold
-AT91C_UHP_HcFmNumber      EQU (0x0030003C) ;- (UHP) Frame number
-;- ========== Register definition for EMAC peripheral ========== 
-AT91C_EMAC_RSR            EQU (0xFFFBC020) ;- (EMAC) Receive Status Register
-AT91C_EMAC_MAN            EQU (0xFFFBC034) ;- (EMAC) PHY Maintenance Register
-AT91C_EMAC_HSH            EQU (0xFFFBC090) ;- (EMAC) Hash Address High[63:32]
-AT91C_EMAC_MCOL           EQU (0xFFFBC048) ;- (EMAC) Multiple Collision Frame Register
-AT91C_EMAC_IER            EQU (0xFFFBC028) ;- (EMAC) Interrupt Enable Register
-AT91C_EMAC_SA2H           EQU (0xFFFBC0A4) ;- (EMAC) Specific Address 2 High, Last 2 bytes
-AT91C_EMAC_HSL            EQU (0xFFFBC094) ;- (EMAC) Hash Address Low[31:0]
-AT91C_EMAC_LCOL           EQU (0xFFFBC05C) ;- (EMAC) Late Collision Register
-AT91C_EMAC_OK             EQU (0xFFFBC04C) ;- (EMAC) Frames Received OK Register
-AT91C_EMAC_CFG            EQU (0xFFFBC004) ;- (EMAC) Network Configuration Register
-AT91C_EMAC_SA3L           EQU (0xFFFBC0A8) ;- (EMAC) Specific Address 3 Low, First 4 bytes
-AT91C_EMAC_SEQE           EQU (0xFFFBC050) ;- (EMAC) Frame Check Sequence Error Register
-AT91C_EMAC_ECOL           EQU (0xFFFBC060) ;- (EMAC) Excessive Collision Register
-AT91C_EMAC_ELR            EQU (0xFFFBC070) ;- (EMAC) Excessive Length Error Register
-AT91C_EMAC_SR             EQU (0xFFFBC008) ;- (EMAC) Network Status Register
-AT91C_EMAC_RBQP           EQU (0xFFFBC018) ;- (EMAC) Receive Buffer Queue Pointer
-AT91C_EMAC_CSE            EQU (0xFFFBC064) ;- (EMAC) Carrier Sense Error Register
-AT91C_EMAC_RJB            EQU (0xFFFBC074) ;- (EMAC) Receive Jabber Register
-AT91C_EMAC_USF            EQU (0xFFFBC078) ;- (EMAC) Undersize Frame Register
-AT91C_EMAC_IDR            EQU (0xFFFBC02C) ;- (EMAC) Interrupt Disable Register
-AT91C_EMAC_SA1L           EQU (0xFFFBC098) ;- (EMAC) Specific Address 1 Low, First 4 bytes
-AT91C_EMAC_IMR            EQU (0xFFFBC030) ;- (EMAC) Interrupt Mask Register
-AT91C_EMAC_FRA            EQU (0xFFFBC040) ;- (EMAC) Frames Transmitted OK Register
-AT91C_EMAC_SA3H           EQU (0xFFFBC0AC) ;- (EMAC) Specific Address 3 High, Last 2 bytes
-AT91C_EMAC_SA1H           EQU (0xFFFBC09C) ;- (EMAC) Specific Address 1 High, Last 2 bytes
-AT91C_EMAC_SCOL           EQU (0xFFFBC044) ;- (EMAC) Single Collision Frame Register
-AT91C_EMAC_ALE            EQU (0xFFFBC054) ;- (EMAC) Alignment Error Register
-AT91C_EMAC_TAR            EQU (0xFFFBC00C) ;- (EMAC) Transmit Address Register
-AT91C_EMAC_SA4L           EQU (0xFFFBC0B0) ;- (EMAC) Specific Address 4 Low, First 4 bytes
-AT91C_EMAC_SA2L           EQU (0xFFFBC0A0) ;- (EMAC) Specific Address 2 Low, First 4 bytes
-AT91C_EMAC_TUE            EQU (0xFFFBC068) ;- (EMAC) Transmit Underrun Error Register
-AT91C_EMAC_DTE            EQU (0xFFFBC058) ;- (EMAC) Deferred Transmission Frame Register
-AT91C_EMAC_TCR            EQU (0xFFFBC010) ;- (EMAC) Transmit Control Register
-AT91C_EMAC_CTL            EQU (0xFFFBC000) ;- (EMAC) Network Control Register
-AT91C_EMAC_SA4H           EQU (0xFFFBC0B4) ;- (EMAC) Specific Address 4 High, Last 2 bytesr
-AT91C_EMAC_CDE            EQU (0xFFFBC06C) ;- (EMAC) Code Error Register
-AT91C_EMAC_SQEE           EQU (0xFFFBC07C) ;- (EMAC) SQE Test Error Register
-AT91C_EMAC_TSR            EQU (0xFFFBC014) ;- (EMAC) Transmit Status Register
-AT91C_EMAC_DRFC           EQU (0xFFFBC080) ;- (EMAC) Discarded RX Frame Register
-;- ========== Register definition for EBI peripheral ========== 
-AT91C_EBI_CFGR            EQU (0xFFFFFF64) ;- (EBI) Configuration Register
-AT91C_EBI_CSA             EQU (0xFFFFFF60) ;- (EBI) Chip Select Assignment Register
-;- ========== Register definition for SMC2 peripheral ========== 
-AT91C_SMC2_CSR            EQU (0xFFFFFF70) ;- (SMC2) SMC2 Chip Select Register
-;- ========== Register definition for SDRC peripheral ========== 
-AT91C_SDRC_IMR            EQU (0xFFFFFFAC) ;- (SDRC) SDRAM Controller Interrupt Mask Register
-AT91C_SDRC_IER            EQU (0xFFFFFFA4) ;- (SDRC) SDRAM Controller Interrupt Enable Register
-AT91C_SDRC_SRR            EQU (0xFFFFFF9C) ;- (SDRC) SDRAM Controller Self Refresh Register
-AT91C_SDRC_TR             EQU (0xFFFFFF94) ;- (SDRC) SDRAM Controller Refresh Timer Register
-AT91C_SDRC_ISR            EQU (0xFFFFFFB0) ;- (SDRC) SDRAM Controller Interrupt Mask Register
-AT91C_SDRC_IDR            EQU (0xFFFFFFA8) ;- (SDRC) SDRAM Controller Interrupt Disable Register
-AT91C_SDRC_LPR            EQU (0xFFFFFFA0) ;- (SDRC) SDRAM Controller Low Power Register
-AT91C_SDRC_CR             EQU (0xFFFFFF98) ;- (SDRC) SDRAM Controller Configuration Register
-AT91C_SDRC_MR             EQU (0xFFFFFF90) ;- (SDRC) SDRAM Controller Mode Register
-;- ========== Register definition for BFC peripheral ========== 
-AT91C_BFC_MR              EQU (0xFFFFFFC0) ;- (BFC) BFC Mode Register
-
-;- *****************************************************************************
-;-               PIO DEFINITIONS FOR AT91RM9200
-;- *****************************************************************************
-AT91C_PIO_PA0             EQU (1:SHL:0) ;- Pin Controlled by PA0
-AT91C_PA0_MISO            EQU (AT91C_PIO_PA0) ;-  SPI Master In Slave
-AT91C_PA0_PCK3            EQU (AT91C_PIO_PA0) ;-  PMC Programmable Clock Output 3
-AT91C_PIO_PA1             EQU (1:SHL:1) ;- Pin Controlled by PA1
-AT91C_PA1_MOSI            EQU (AT91C_PIO_PA1) ;-  SPI Master Out Slave
-AT91C_PA1_PCK0            EQU (AT91C_PIO_PA1) ;-  PMC Programmable Clock Output 0
-AT91C_PIO_PA10            EQU (1:SHL:10) ;- Pin Controlled by PA10
-AT91C_PA10_ETX1           EQU (AT91C_PIO_PA10) ;-  Ethernet MAC Transmit Data 1
-AT91C_PA10_MCDB1          EQU (AT91C_PIO_PA10) ;-  Multimedia Card B Data 1
-AT91C_PIO_PA11            EQU (1:SHL:11) ;- Pin Controlled by PA11
-AT91C_PA11_ECRS_ECRSDV    EQU (AT91C_PIO_PA11) ;-  Ethernet MAC Carrier Sense/Carrier Sense and Data Valid
-AT91C_PA11_MCDB2          EQU (AT91C_PIO_PA11) ;-  Multimedia Card B Data 2
-AT91C_PIO_PA12            EQU (1:SHL:12) ;- Pin Controlled by PA12
-AT91C_PA12_ERX0           EQU (AT91C_PIO_PA12) ;-  Ethernet MAC Receive Data 0
-AT91C_PA12_MCDB3          EQU (AT91C_PIO_PA12) ;-  Multimedia Card B Data 3
-AT91C_PIO_PA13            EQU (1:SHL:13) ;- Pin Controlled by PA13
-AT91C_PA13_ERX1           EQU (AT91C_PIO_PA13) ;-  Ethernet MAC Receive Data 1
-AT91C_PA13_TCLK0          EQU (AT91C_PIO_PA13) ;-  Timer Counter 0 external clock input
-AT91C_PIO_PA14            EQU (1:SHL:14) ;- Pin Controlled by PA14
-AT91C_PA14_ERXER          EQU (AT91C_PIO_PA14) ;-  Ethernet MAC Receive Error
-AT91C_PA14_TCLK1          EQU (AT91C_PIO_PA14) ;-  Timer Counter 1 external clock input
-AT91C_PIO_PA15            EQU (1:SHL:15) ;- Pin Controlled by PA15
-AT91C_PA15_EMDC           EQU (AT91C_PIO_PA15) ;-  Ethernet MAC Management Data Clock
-AT91C_PA15_TCLK2          EQU (AT91C_PIO_PA15) ;-  Timer Counter 2 external clock input
-AT91C_PIO_PA16            EQU (1:SHL:16) ;- Pin Controlled by PA16
-AT91C_PA16_EMDIO          EQU (AT91C_PIO_PA16) ;-  Ethernet MAC Management Data Input/Output
-AT91C_PA16_IRQ6           EQU (AT91C_PIO_PA16) ;-  AIC Interrupt input 6
-AT91C_PIO_PA17            EQU (1:SHL:17) ;- Pin Controlled by PA17
-AT91C_PA17_TXD0           EQU (AT91C_PIO_PA17) ;-  USART 0 Transmit Data
-AT91C_PA17_TIOA0          EQU (AT91C_PIO_PA17) ;-  Timer Counter 0 Multipurpose Timer I/O Pin A
-AT91C_PIO_PA18            EQU (1:SHL:18) ;- Pin Controlled by PA18
-AT91C_PA18_RXD0           EQU (AT91C_PIO_PA18) ;-  USART 0 Receive Data
-AT91C_PA18_TIOB0          EQU (AT91C_PIO_PA18) ;-  Timer Counter 0 Multipurpose Timer I/O Pin B
-AT91C_PIO_PA19            EQU (1:SHL:19) ;- Pin Controlled by PA19
-AT91C_PA19_SCK0           EQU (AT91C_PIO_PA19) ;-  USART 0 Serial Clock
-AT91C_PA19_TIOA1          EQU (AT91C_PIO_PA19) ;-  Timer Counter 1 Multipurpose Timer I/O Pin A
-AT91C_PIO_PA2             EQU (1:SHL:2) ;- Pin Controlled by PA2
-AT91C_PA2_SPCK            EQU (AT91C_PIO_PA2) ;-  SPI Serial Clock
-AT91C_PA2_IRQ4            EQU (AT91C_PIO_PA2) ;-  AIC Interrupt Input 4
-AT91C_PIO_PA20            EQU (1:SHL:20) ;- Pin Controlled by PA20
-AT91C_PA20_CTS0           EQU (AT91C_PIO_PA20) ;-  USART 0 Clear To Send
-AT91C_PA20_TIOB1          EQU (AT91C_PIO_PA20) ;-  Timer Counter 1 Multipurpose Timer I/O Pin B
-AT91C_PIO_PA21            EQU (1:SHL:21) ;- Pin Controlled by PA21
-AT91C_PA21_RTS0           EQU (AT91C_PIO_PA21) ;-  Usart 0 Ready To Send
-AT91C_PA21_TIOA2          EQU (AT91C_PIO_PA21) ;-  Timer Counter 2 Multipurpose Timer I/O Pin A
-AT91C_PIO_PA22            EQU (1:SHL:22) ;- Pin Controlled by PA22
-AT91C_PA22_RXD2           EQU (AT91C_PIO_PA22) ;-  USART 2 Receive Data
-AT91C_PA22_TIOB2          EQU (AT91C_PIO_PA22) ;-  Timer Counter 2 Multipurpose Timer I/O Pin B
-AT91C_PIO_PA23            EQU (1:SHL:23) ;- Pin Controlled by PA23
-AT91C_PA23_TXD2           EQU (AT91C_PIO_PA23) ;-  USART 2 Transmit Data
-AT91C_PA23_IRQ3           EQU (AT91C_PIO_PA23) ;-  Interrupt input 3
-AT91C_PIO_PA24            EQU (1:SHL:24) ;- Pin Controlled by PA24
-AT91C_PA24_SCK2           EQU (AT91C_PIO_PA24) ;-  USART2 Serial Clock
-AT91C_PA24_PCK1           EQU (AT91C_PIO_PA24) ;-  PMC Programmable Clock Output 1
-AT91C_PIO_PA25            EQU (1:SHL:25) ;- Pin Controlled by PA25
-AT91C_PA25_TWD            EQU (AT91C_PIO_PA25) ;-  TWI Two-wire Serial Data
-AT91C_PA25_IRQ2           EQU (AT91C_PIO_PA25) ;-  Interrupt input 2
-AT91C_PIO_PA26            EQU (1:SHL:26) ;- Pin Controlled by PA26
-AT91C_PA26_TWCK           EQU (AT91C_PIO_PA26) ;-  TWI Two-wire Serial Clock
-AT91C_PA26_IRQ1           EQU (AT91C_PIO_PA26) ;-  Interrupt input 1
-AT91C_PIO_PA27            EQU (1:SHL:27) ;- Pin Controlled by PA27
-AT91C_PA27_MCCK           EQU (AT91C_PIO_PA27) ;-  Multimedia Card Clock
-AT91C_PA27_TCLK3          EQU (AT91C_PIO_PA27) ;-  Timer Counter 3 External Clock Input
-AT91C_PIO_PA28            EQU (1:SHL:28) ;- Pin Controlled by PA28
-AT91C_PA28_MCCDA          EQU (AT91C_PIO_PA28) ;-  Multimedia Card A Command
-AT91C_PA28_TCLK4          EQU (AT91C_PIO_PA28) ;-  Timer Counter 4 external Clock Input
-AT91C_PIO_PA29            EQU (1:SHL:29) ;- Pin Controlled by PA29
-AT91C_PA29_MCDA0          EQU (AT91C_PIO_PA29) ;-  Multimedia Card A Data 0
-AT91C_PA29_TCLK5          EQU (AT91C_PIO_PA29) ;-  Timer Counter 5 external clock input
-AT91C_PIO_PA3             EQU (1:SHL:3) ;- Pin Controlled by PA3
-AT91C_PA3_NPCS0           EQU (AT91C_PIO_PA3) ;-  SPI Peripheral Chip Select 0
-AT91C_PA3_IRQ5            EQU (AT91C_PIO_PA3) ;-  AIC Interrupt Input 5
-AT91C_PIO_PA30            EQU (1:SHL:30) ;- Pin Controlled by PA30
-AT91C_PA30_DRXD           EQU (AT91C_PIO_PA30) ;-  DBGU Debug Receive Data
-AT91C_PA30_CTS2           EQU (AT91C_PIO_PA30) ;-  Usart 2 Clear To Send
-AT91C_PIO_PA31            EQU (1:SHL:31) ;- Pin Controlled by PA31
-AT91C_PA31_DTXD           EQU (AT91C_PIO_PA31) ;-  DBGU Debug Transmit Data
-AT91C_PA31_RTS2           EQU (AT91C_PIO_PA31) ;-  USART 2 Ready To Send
-AT91C_PIO_PA4             EQU (1:SHL:4) ;- Pin Controlled by PA4
-AT91C_PA4_NPCS1           EQU (AT91C_PIO_PA4) ;-  SPI Peripheral Chip Select 1
-AT91C_PA4_PCK1            EQU (AT91C_PIO_PA4) ;-  PMC Programmable Clock Output 1
-AT91C_PIO_PA5             EQU (1:SHL:5) ;- Pin Controlled by PA5
-AT91C_PA5_NPCS2           EQU (AT91C_PIO_PA5) ;-  SPI Peripheral Chip Select 2
-AT91C_PA5_TXD3            EQU (AT91C_PIO_PA5) ;-  USART 3 Transmit Data
-AT91C_PIO_PA6             EQU (1:SHL:6) ;- Pin Controlled by PA6
-AT91C_PA6_NPCS3           EQU (AT91C_PIO_PA6) ;-  SPI Peripheral Chip Select 3
-AT91C_PA6_RXD3            EQU (AT91C_PIO_PA6) ;-  USART 3 Receive Data
-AT91C_PIO_PA7             EQU (1:SHL:7) ;- Pin Controlled by PA7
-AT91C_PA7_ETXCK_EREFCK    EQU (AT91C_PIO_PA7) ;-  Ethernet MAC Transmit Clock/Reference Clock
-AT91C_PA7_PCK2            EQU (AT91C_PIO_PA7) ;-  PMC Programmable Clock 2
-AT91C_PIO_PA8             EQU (1:SHL:8) ;- Pin Controlled by PA8
-AT91C_PA8_ETXEN           EQU (AT91C_PIO_PA8) ;-  Ethernet MAC Transmit Enable
-AT91C_PA8_MCCDB           EQU (AT91C_PIO_PA8) ;-  Multimedia Card B Command
-AT91C_PIO_PA9             EQU (1:SHL:9) ;- Pin Controlled by PA9
-AT91C_PA9_ETX0            EQU (AT91C_PIO_PA9) ;-  Ethernet MAC Transmit Data 0
-AT91C_PA9_MCDB0           EQU (AT91C_PIO_PA9) ;-  Multimedia Card B Data 0
-AT91C_PIO_PB0             EQU (1:SHL:0) ;- Pin Controlled by PB0
-AT91C_PB0_TF0             EQU (AT91C_PIO_PB0) ;-  SSC Transmit Frame Sync 0
-AT91C_PB0_TIOB3           EQU (AT91C_PIO_PB0) ;-  Timer Counter 3 Multipurpose Timer I/O Pin B
-AT91C_PIO_PB1             EQU (1:SHL:1) ;- Pin Controlled by PB1
-AT91C_PB1_TK0             EQU (AT91C_PIO_PB1) ;-  SSC Transmit Clock 0
-AT91C_PB1_CTS3            EQU (AT91C_PIO_PB1) ;-  USART 3 Clear To Send
-AT91C_PIO_PB10            EQU (1:SHL:10) ;- Pin Controlled by PB10
-AT91C_PB10_RK1            EQU (AT91C_PIO_PB10) ;-  SSC Receive Clock 1
-AT91C_PB10_TIOA5          EQU (AT91C_PIO_PB10) ;-  Timer Counter 5 Multipurpose Timer I/O Pin A
-AT91C_PIO_PB11            EQU (1:SHL:11) ;- Pin Controlled by PB11
-AT91C_PB11_RF1            EQU (AT91C_PIO_PB11) ;-  SSC Receive Frame Sync 1
-AT91C_PB11_TIOB5          EQU (AT91C_PIO_PB11) ;-  Timer Counter 5 Multipurpose Timer I/O Pin B
-AT91C_PIO_PB12            EQU (1:SHL:12) ;- Pin Controlled by PB12
-AT91C_PB12_TF2            EQU (AT91C_PIO_PB12) ;-  SSC Transmit Frame Sync 2
-AT91C_PB12_ETX2           EQU (AT91C_PIO_PB12) ;-  Ethernet MAC Transmit Data 2
-AT91C_PIO_PB13            EQU (1:SHL:13) ;- Pin Controlled by PB13
-AT91C_PB13_TK2            EQU (AT91C_PIO_PB13) ;-  SSC Transmit Clock 2
-AT91C_PB13_ETX3           EQU (AT91C_PIO_PB13) ;-  Ethernet MAC Transmit Data 3
-AT91C_PIO_PB14            EQU (1:SHL:14) ;- Pin Controlled by PB14
-AT91C_PB14_TD2            EQU (AT91C_PIO_PB14) ;-  SSC Transmit Data 2
-AT91C_PB14_ETXER          EQU (AT91C_PIO_PB14) ;-  Ethernet MAC Transmikt Coding Error
-AT91C_PIO_PB15            EQU (1:SHL:15) ;- Pin Controlled by PB15
-AT91C_PB15_RD2            EQU (AT91C_PIO_PB15) ;-  SSC Receive Data 2
-AT91C_PB15_ERX2           EQU (AT91C_PIO_PB15) ;-  Ethernet MAC Receive Data 2
-AT91C_PIO_PB16            EQU (1:SHL:16) ;- Pin Controlled by PB16
-AT91C_PB16_RK2            EQU (AT91C_PIO_PB16) ;-  SSC Receive Clock 2
-AT91C_PB16_ERX3           EQU (AT91C_PIO_PB16) ;-  Ethernet MAC Receive Data 3
-AT91C_PIO_PB17            EQU (1:SHL:17) ;- Pin Controlled by PB17
-AT91C_PB17_RF2            EQU (AT91C_PIO_PB17) ;-  SSC Receive Frame Sync 2
-AT91C_PB17_ERXDV          EQU (AT91C_PIO_PB17) ;-  Ethernet MAC Receive Data Valid
-AT91C_PIO_PB18            EQU (1:SHL:18) ;- Pin Controlled by PB18
-AT91C_PB18_RI1            EQU (AT91C_PIO_PB18) ;-  USART 1 Ring Indicator
-AT91C_PB18_ECOL           EQU (AT91C_PIO_PB18) ;-  Ethernet MAC Collision Detected
-AT91C_PIO_PB19            EQU (1:SHL:19) ;- Pin Controlled by PB19
-AT91C_PB19_DTR1           EQU (AT91C_PIO_PB19) ;-  USART 1 Data Terminal ready
-AT91C_PB19_ERXCK          EQU (AT91C_PIO_PB19) ;-  Ethernet MAC Receive Clock
-AT91C_PIO_PB2             EQU (1:SHL:2) ;- Pin Controlled by PB2
-AT91C_PB2_TD0             EQU (AT91C_PIO_PB2) ;-  SSC Transmit data
-AT91C_PB2_SCK3            EQU (AT91C_PIO_PB2) ;-  USART 3 Serial Clock
-AT91C_PIO_PB20            EQU (1:SHL:20) ;- Pin Controlled by PB20
-AT91C_PB20_TXD1           EQU (AT91C_PIO_PB20) ;-  USART 1 Transmit Data
-AT91C_PIO_PB21            EQU (1:SHL:21) ;- Pin Controlled by PB21
-AT91C_PB21_RXD1           EQU (AT91C_PIO_PB21) ;-  USART 1 Receive Data
-AT91C_PIO_PB22            EQU (1:SHL:22) ;- Pin Controlled by PB22
-AT91C_PB22_SCK1           EQU (AT91C_PIO_PB22) ;-  USART1 Serial Clock
-AT91C_PIO_PB23            EQU (1:SHL:23) ;- Pin Controlled by PB23
-AT91C_PB23_DCD1           EQU (AT91C_PIO_PB23) ;-  USART 1 Data Carrier Detect
-AT91C_PIO_PB24            EQU (1:SHL:24) ;- Pin Controlled by PB24
-AT91C_PB24_CTS1           EQU (AT91C_PIO_PB24) ;-  USART 1 Clear To Send
-AT91C_PIO_PB25            EQU (1:SHL:25) ;- Pin Controlled by PB25
-AT91C_PB25_DSR1           EQU (AT91C_PIO_PB25) ;-  USART 1 Data Set ready
-AT91C_PB25_EF100          EQU (AT91C_PIO_PB25) ;-  Ethernet MAC Force 100 Mbits/sec
-AT91C_PIO_PB26            EQU (1:SHL:26) ;- Pin Controlled by PB26
-AT91C_PB26_RTS1           EQU (AT91C_PIO_PB26) ;-  Usart 0 Ready To Send
-AT91C_PIO_PB27            EQU (1:SHL:27) ;- Pin Controlled by PB27
-AT91C_PB27_PCK0           EQU (AT91C_PIO_PB27) ;-  PMC Programmable Clock Output 0
-AT91C_PIO_PB28            EQU (1:SHL:28) ;- Pin Controlled by PB28
-AT91C_PB28_FIQ            EQU (AT91C_PIO_PB28) ;-  AIC Fast Interrupt Input
-AT91C_PIO_PB29            EQU (1:SHL:29) ;- Pin Controlled by PB29
-AT91C_PB29_IRQ0           EQU (AT91C_PIO_PB29) ;-  Interrupt input 0
-AT91C_PIO_PB3             EQU (1:SHL:3) ;- Pin Controlled by PB3
-AT91C_PB3_RD0             EQU (AT91C_PIO_PB3) ;-  SSC Receive Data
-AT91C_PB3_MCDA1           EQU (AT91C_PIO_PB3) ;-  Multimedia Card A Data 1
-AT91C_PIO_PB4             EQU (1:SHL:4) ;- Pin Controlled by PB4
-AT91C_PB4_RK0             EQU (AT91C_PIO_PB4) ;-  SSC Receive Clock
-AT91C_PB4_MCDA2           EQU (AT91C_PIO_PB4) ;-  Multimedia Card A Data 2
-AT91C_PIO_PB5             EQU (1:SHL:5) ;- Pin Controlled by PB5
-AT91C_PB5_RF0             EQU (AT91C_PIO_PB5) ;-  SSC Receive Frame Sync 0
-AT91C_PB5_MCDA3           EQU (AT91C_PIO_PB5) ;-  Multimedia Card A Data 3
-AT91C_PIO_PB6             EQU (1:SHL:6) ;- Pin Controlled by PB6
-AT91C_PB6_TF1             EQU (AT91C_PIO_PB6) ;-  SSC Transmit Frame Sync 1
-AT91C_PB6_TIOA3           EQU (AT91C_PIO_PB6) ;-  Timer Counter 4 Multipurpose Timer I/O Pin A
-AT91C_PIO_PB7             EQU (1:SHL:7) ;- Pin Controlled by PB7
-AT91C_PB7_TK1             EQU (AT91C_PIO_PB7) ;-  SSC Transmit Clock 1
-AT91C_PB7_TIOB3           EQU (AT91C_PIO_PB7) ;-  Timer Counter 3 Multipurpose Timer I/O Pin B
-AT91C_PIO_PB8             EQU (1:SHL:8) ;- Pin Controlled by PB8
-AT91C_PB8_TD1             EQU (AT91C_PIO_PB8) ;-  SSC Transmit Data 1
-AT91C_PB8_TIOA4           EQU (AT91C_PIO_PB8) ;-  Timer Counter 4 Multipurpose Timer I/O Pin A
-AT91C_PIO_PB9             EQU (1:SHL:9) ;- Pin Controlled by PB9
-AT91C_PB9_RD1             EQU (AT91C_PIO_PB9) ;-  SSC Receive Data 1
-AT91C_PB9_TIOB4           EQU (AT91C_PIO_PB9) ;-  Timer Counter 4 Multipurpose Timer I/O Pin B
-AT91C_PIO_PC0             EQU (1:SHL:0) ;- Pin Controlled by PC0
-AT91C_PC0_BFCK            EQU (AT91C_PIO_PC0) ;-  Burst Flash Clock
-AT91C_PIO_PC1             EQU (1:SHL:1) ;- Pin Controlled by PC1
-AT91C_PC1_BFRDY_SMOE      EQU (AT91C_PIO_PC1) ;-  Burst Flash Ready
-AT91C_PIO_PC10            EQU (1:SHL:10) ;- Pin Controlled by PC10
-AT91C_PC10_NCS4_CFCS      EQU (AT91C_PIO_PC10) ;-  Compact Flash Chip Select
-AT91C_PIO_PC11            EQU (1:SHL:11) ;- Pin Controlled by PC11
-AT91C_PC11_NCS5_CFCE1     EQU (AT91C_PIO_PC11) ;-  Chip Select 5 / Compact Flash Chip Enable 1
-AT91C_PIO_PC12            EQU (1:SHL:12) ;- Pin Controlled by PC12
-AT91C_PC12_NCS6_CFCE2     EQU (AT91C_PIO_PC12) ;-  Chip Select 6 / Compact Flash Chip Enable 2
-AT91C_PIO_PC13            EQU (1:SHL:13) ;- Pin Controlled by PC13
-AT91C_PC13_NCS7           EQU (AT91C_PIO_PC13) ;-  Chip Select 7
-AT91C_PIO_PC14            EQU (1:SHL:14) ;- Pin Controlled by PC14
-AT91C_PIO_PC15            EQU (1:SHL:15) ;- Pin Controlled by PC15
-AT91C_PIO_PC16            EQU (1:SHL:16) ;- Pin Controlled by PC16
-AT91C_PC16_D16            EQU (AT91C_PIO_PC16) ;-  Data Bus [16]
-AT91C_PIO_PC17            EQU (1:SHL:17) ;- Pin Controlled by PC17
-AT91C_PC17_D17            EQU (AT91C_PIO_PC17) ;-  Data Bus [17]
-AT91C_PIO_PC18            EQU (1:SHL:18) ;- Pin Controlled by PC18
-AT91C_PC18_D18            EQU (AT91C_PIO_PC18) ;-  Data Bus [18]
-AT91C_PIO_PC19            EQU (1:SHL:19) ;- Pin Controlled by PC19
-AT91C_PC19_D19            EQU (AT91C_PIO_PC19) ;-  Data Bus [19]
-AT91C_PIO_PC2             EQU (1:SHL:2) ;- Pin Controlled by PC2
-AT91C_PC2_BFAVD           EQU (AT91C_PIO_PC2) ;-  Burst Flash Address Valid
-AT91C_PIO_PC20            EQU (1:SHL:20) ;- Pin Controlled by PC20
-AT91C_PC20_D20            EQU (AT91C_PIO_PC20) ;-  Data Bus [20]
-AT91C_PIO_PC21            EQU (1:SHL:21) ;- Pin Controlled by PC21
-AT91C_PC21_D21            EQU (AT91C_PIO_PC21) ;-  Data Bus [21]
-AT91C_PIO_PC22            EQU (1:SHL:22) ;- Pin Controlled by PC22
-AT91C_PC22_D22            EQU (AT91C_PIO_PC22) ;-  Data Bus [22]
-AT91C_PIO_PC23            EQU (1:SHL:23) ;- Pin Controlled by PC23
-AT91C_PC23_D23            EQU (AT91C_PIO_PC23) ;-  Data Bus [23]
-AT91C_PIO_PC24            EQU (1:SHL:24) ;- Pin Controlled by PC24
-AT91C_PC24_D24            EQU (AT91C_PIO_PC24) ;-  Data Bus [24]
-AT91C_PIO_PC25            EQU (1:SHL:25) ;- Pin Controlled by PC25
-AT91C_PC25_D25            EQU (AT91C_PIO_PC25) ;-  Data Bus [25]
-AT91C_PIO_PC26            EQU (1:SHL:26) ;- Pin Controlled by PC26
-AT91C_PC26_D26            EQU (AT91C_PIO_PC26) ;-  Data Bus [26]
-AT91C_PIO_PC27            EQU (1:SHL:27) ;- Pin Controlled by PC27
-AT91C_PC27_D27            EQU (AT91C_PIO_PC27) ;-  Data Bus [27]
-AT91C_PIO_PC28            EQU (1:SHL:28) ;- Pin Controlled by PC28
-AT91C_PC28_D28            EQU (AT91C_PIO_PC28) ;-  Data Bus [28]
-AT91C_PIO_PC29            EQU (1:SHL:29) ;- Pin Controlled by PC29
-AT91C_PC29_D29            EQU (AT91C_PIO_PC29) ;-  Data Bus [29]
-AT91C_PIO_PC3             EQU (1:SHL:3) ;- Pin Controlled by PC3
-AT91C_PC3_BFBAA_SMWE      EQU (AT91C_PIO_PC3) ;-  Burst Flash Address Advance / SmartMedia Write Enable
-AT91C_PIO_PC30            EQU (1:SHL:30) ;- Pin Controlled by PC30
-AT91C_PC30_D30            EQU (AT91C_PIO_PC30) ;-  Data Bus [30]
-AT91C_PIO_PC31            EQU (1:SHL:31) ;- Pin Controlled by PC31
-AT91C_PC31_D31            EQU (AT91C_PIO_PC31) ;-  Data Bus [31]
-AT91C_PIO_PC4             EQU (1:SHL:4) ;- Pin Controlled by PC4
-AT91C_PC4_BFOE            EQU (AT91C_PIO_PC4) ;-  Burst Flash Output Enable
-AT91C_PIO_PC5             EQU (1:SHL:5) ;- Pin Controlled by PC5
-AT91C_PC5_BFWE            EQU (AT91C_PIO_PC5) ;-  Burst Flash Write Enable
-AT91C_PIO_PC6             EQU (1:SHL:6) ;- Pin Controlled by PC6
-AT91C_PC6_NWAIT           EQU (AT91C_PIO_PC6) ;-  NWAIT
-AT91C_PIO_PC7             EQU (1:SHL:7) ;- Pin Controlled by PC7
-AT91C_PC7_A23             EQU (AT91C_PIO_PC7) ;-  Address Bus[23]
-AT91C_PIO_PC8             EQU (1:SHL:8) ;- Pin Controlled by PC8
-AT91C_PC8_A24             EQU (AT91C_PIO_PC8) ;-  Address Bus[24]
-AT91C_PIO_PC9             EQU (1:SHL:9) ;- Pin Controlled by PC9
-AT91C_PC9_A25_CFRNW       EQU (AT91C_PIO_PC9) ;-  Address Bus[25] /  Compact Flash Read Not Write
-AT91C_PIO_PD0             EQU (1:SHL:0) ;- Pin Controlled by PD0
-AT91C_PD0_ETX0            EQU (AT91C_PIO_PD0) ;-  Ethernet MAC Transmit Data 0
-AT91C_PIO_PD1             EQU (1:SHL:1) ;- Pin Controlled by PD1
-AT91C_PD1_ETX1            EQU (AT91C_PIO_PD1) ;-  Ethernet MAC Transmit Data 1
-AT91C_PIO_PD10            EQU (1:SHL:10) ;- Pin Controlled by PD10
-AT91C_PD10_PCK3           EQU (AT91C_PIO_PD10) ;-  PMC Programmable Clock Output 3
-AT91C_PD10_TPS1           EQU (AT91C_PIO_PD10) ;-  ETM ARM9 pipeline status 1
-AT91C_PIO_PD11            EQU (1:SHL:11) ;- Pin Controlled by PD11
-AT91C_PD11_               EQU (AT91C_PIO_PD11) ;-  
-AT91C_PD11_TPS2           EQU (AT91C_PIO_PD11) ;-  ETM ARM9 pipeline status 2
-AT91C_PIO_PD12            EQU (1:SHL:12) ;- Pin Controlled by PD12
-AT91C_PD12_               EQU (AT91C_PIO_PD12) ;-  
-AT91C_PD12_TPK0           EQU (AT91C_PIO_PD12) ;-  ETM Trace Packet 0
-AT91C_PIO_PD13            EQU (1:SHL:13) ;- Pin Controlled by PD13
-AT91C_PD13_               EQU (AT91C_PIO_PD13) ;-  
-AT91C_PD13_TPK1           EQU (AT91C_PIO_PD13) ;-  ETM Trace Packet 1
-AT91C_PIO_PD14            EQU (1:SHL:14) ;- Pin Controlled by PD14
-AT91C_PD14_               EQU (AT91C_PIO_PD14) ;-  
-AT91C_PD14_TPK2           EQU (AT91C_PIO_PD14) ;-  ETM Trace Packet 2
-AT91C_PIO_PD15            EQU (1:SHL:15) ;- Pin Controlled by PD15
-AT91C_PD15_TD0            EQU (AT91C_PIO_PD15) ;-  SSC Transmit data
-AT91C_PD15_TPK3           EQU (AT91C_PIO_PD15) ;-  ETM Trace Packet 3
-AT91C_PIO_PD16            EQU (1:SHL:16) ;- Pin Controlled by PD16
-AT91C_PD16_TD1            EQU (AT91C_PIO_PD16) ;-  SSC Transmit Data 1
-AT91C_PD16_TPK4           EQU (AT91C_PIO_PD16) ;-  ETM Trace Packet 4
-AT91C_PIO_PD17            EQU (1:SHL:17) ;- Pin Controlled by PD17
-AT91C_PD17_TD2            EQU (AT91C_PIO_PD17) ;-  SSC Transmit Data 2
-AT91C_PD17_TPK5           EQU (AT91C_PIO_PD17) ;-  ETM Trace Packet 5
-AT91C_PIO_PD18            EQU (1:SHL:18) ;- Pin Controlled by PD18
-AT91C_PD18_NPCS1          EQU (AT91C_PIO_PD18) ;-  SPI Peripheral Chip Select 1
-AT91C_PD18_TPK6           EQU (AT91C_PIO_PD18) ;-  ETM Trace Packet 6
-AT91C_PIO_PD19            EQU (1:SHL:19) ;- Pin Controlled by PD19
-AT91C_PD19_NPCS2          EQU (AT91C_PIO_PD19) ;-  SPI Peripheral Chip Select 2
-AT91C_PD19_TPK7           EQU (AT91C_PIO_PD19) ;-  ETM Trace Packet 7
-AT91C_PIO_PD2             EQU (1:SHL:2) ;- Pin Controlled by PD2
-AT91C_PD2_ETX2            EQU (AT91C_PIO_PD2) ;-  Ethernet MAC Transmit Data 2
-AT91C_PIO_PD20            EQU (1:SHL:20) ;- Pin Controlled by PD20
-AT91C_PD20_NPCS3          EQU (AT91C_PIO_PD20) ;-  SPI Peripheral Chip Select 3
-AT91C_PD20_TPK8           EQU (AT91C_PIO_PD20) ;-  ETM Trace Packet 8
-AT91C_PIO_PD21            EQU (1:SHL:21) ;- Pin Controlled by PD21
-AT91C_PD21_RTS0           EQU (AT91C_PIO_PD21) ;-  Usart 0 Ready To Send
-AT91C_PD21_TPK9           EQU (AT91C_PIO_PD21) ;-  ETM Trace Packet 9
-AT91C_PIO_PD22            EQU (1:SHL:22) ;- Pin Controlled by PD22
-AT91C_PD22_RTS1           EQU (AT91C_PIO_PD22) ;-  Usart 0 Ready To Send
-AT91C_PD22_TPK10          EQU (AT91C_PIO_PD22) ;-  ETM Trace Packet 10
-AT91C_PIO_PD23            EQU (1:SHL:23) ;- Pin Controlled by PD23
-AT91C_PD23_RTS2           EQU (AT91C_PIO_PD23) ;-  USART 2 Ready To Send
-AT91C_PD23_TPK11          EQU (AT91C_PIO_PD23) ;-  ETM Trace Packet 11
-AT91C_PIO_PD24            EQU (1:SHL:24) ;- Pin Controlled by PD24
-AT91C_PD24_RTS3           EQU (AT91C_PIO_PD24) ;-  USART 3 Ready To Send
-AT91C_PD24_TPK12          EQU (AT91C_PIO_PD24) ;-  ETM Trace Packet 12
-AT91C_PIO_PD25            EQU (1:SHL:25) ;- Pin Controlled by PD25
-AT91C_PD25_DTR1           EQU (AT91C_PIO_PD25) ;-  USART 1 Data Terminal ready
-AT91C_PD25_TPK13          EQU (AT91C_PIO_PD25) ;-  ETM Trace Packet 13
-AT91C_PIO_PD26            EQU (1:SHL:26) ;- Pin Controlled by PD26
-AT91C_PD26_TPK14          EQU (AT91C_PIO_PD26) ;-  ETM Trace Packet 14
-AT91C_PIO_PD27            EQU (1:SHL:27) ;- Pin Controlled by PD27
-AT91C_PD27_TPK15          EQU (AT91C_PIO_PD27) ;-  ETM Trace Packet 15
-AT91C_PIO_PD3             EQU (1:SHL:3) ;- Pin Controlled by PD3
-AT91C_PD3_ETX3            EQU (AT91C_PIO_PD3) ;-  Ethernet MAC Transmit Data 3
-AT91C_PIO_PD4             EQU (1:SHL:4) ;- Pin Controlled by PD4
-AT91C_PD4_ETXEN           EQU (AT91C_PIO_PD4) ;-  Ethernet MAC Transmit Enable
-AT91C_PIO_PD5             EQU (1:SHL:5) ;- Pin Controlled by PD5
-AT91C_PD5_ETXER           EQU (AT91C_PIO_PD5) ;-  Ethernet MAC Transmikt Coding Error
-AT91C_PIO_PD6             EQU (1:SHL:6) ;- Pin Controlled by PD6
-AT91C_PD6_DTXD            EQU (AT91C_PIO_PD6) ;-  DBGU Debug Transmit Data
-AT91C_PIO_PD7             EQU (1:SHL:7) ;- Pin Controlled by PD7
-AT91C_PD7_PCK0            EQU (AT91C_PIO_PD7) ;-  PMC Programmable Clock Output 0
-AT91C_PD7_TSYNC           EQU (AT91C_PIO_PD7) ;-  ETM Synchronization signal
-AT91C_PIO_PD8             EQU (1:SHL:8) ;- Pin Controlled by PD8
-AT91C_PD8_PCK1            EQU (AT91C_PIO_PD8) ;-  PMC Programmable Clock Output 1
-AT91C_PD8_TCLK            EQU (AT91C_PIO_PD8) ;-  ETM Trace Clock signal
-AT91C_PIO_PD9             EQU (1:SHL:9) ;- Pin Controlled by PD9
-AT91C_PD9_PCK2            EQU (AT91C_PIO_PD9) ;-  PMC Programmable Clock 2
-AT91C_PD9_TPS0            EQU (AT91C_PIO_PD9) ;-  ETM ARM9 pipeline status 0
-
-;- *****************************************************************************
-;-               PERIPHERAL ID DEFINITIONS FOR AT91RM9200
-;- *****************************************************************************
-AT91C_ID_FIQ              EQU ( 0) ;- Advanced Interrupt Controller (FIQ)
-AT91C_ID_SYS              EQU ( 1) ;- System Peripheral
-AT91C_ID_PIOA             EQU ( 2) ;- Parallel IO Controller A 
-AT91C_ID_PIOB             EQU ( 3) ;- Parallel IO Controller B
-AT91C_ID_PIOC             EQU ( 4) ;- Parallel IO Controller C
-AT91C_ID_PIOD             EQU ( 5) ;- Parallel IO Controller D
-AT91C_ID_US0              EQU ( 6) ;- USART 0
-AT91C_ID_US1              EQU ( 7) ;- USART 1
-AT91C_ID_US2              EQU ( 8) ;- USART 2
-AT91C_ID_US3              EQU ( 9) ;- USART 3
-AT91C_ID_MCI              EQU (10) ;- Multimedia Card Interface
-AT91C_ID_UDP              EQU (11) ;- USB Device Port
-AT91C_ID_TWI              EQU (12) ;- Two-Wire Interface
-AT91C_ID_SPI              EQU (13) ;- Serial Peripheral Interface
-AT91C_ID_SSC0             EQU (14) ;- Serial Synchronous Controller 0
-AT91C_ID_SSC1             EQU (15) ;- Serial Synchronous Controller 1
-AT91C_ID_SSC2             EQU (16) ;- Serial Synchronous Controller 2
-AT91C_ID_TC0              EQU (17) ;- Timer Counter 0
-AT91C_ID_TC1              EQU (18) ;- Timer Counter 1
-AT91C_ID_TC2              EQU (19) ;- Timer Counter 2
-AT91C_ID_TC3              EQU (20) ;- Timer Counter 3
-AT91C_ID_TC4              EQU (21) ;- Timer Counter 4
-AT91C_ID_TC5              EQU (22) ;- Timer Counter 5
-AT91C_ID_UHP              EQU (23) ;- USB Host port
-AT91C_ID_EMAC             EQU (24) ;- Ethernet MAC
-AT91C_ID_IRQ0             EQU (25) ;- Advanced Interrupt Controller (IRQ0)
-AT91C_ID_IRQ1             EQU (26) ;- Advanced Interrupt Controller (IRQ1)
-AT91C_ID_IRQ2             EQU (27) ;- Advanced Interrupt Controller (IRQ2)
-AT91C_ID_IRQ3             EQU (28) ;- Advanced Interrupt Controller (IRQ3)
-AT91C_ID_IRQ4             EQU (29) ;- Advanced Interrupt Controller (IRQ4)
-AT91C_ID_IRQ5             EQU (30) ;- Advanced Interrupt Controller (IRQ5)
-AT91C_ID_IRQ6             EQU (31) ;- Advanced Interrupt Controller (IRQ6)
-
-;- *****************************************************************************
-;-               BASE ADDRESS DEFINITIONS FOR AT91RM9200
-;- *****************************************************************************
-AT91C_BASE_SYS            EQU (0xFFFFF000) ;- (SYS) Base Address
-AT91C_BASE_MC             EQU (0xFFFFFF00) ;- (MC) Base Address
-AT91C_BASE_RTC            EQU (0xFFFFFE00) ;- (RTC) Base Address
-AT91C_BASE_ST             EQU (0xFFFFFD00) ;- (ST) Base Address
-AT91C_BASE_PMC            EQU (0xFFFFFC00) ;- (PMC) Base Address
-AT91C_BASE_CKGR           EQU (0xFFFFFC20) ;- (CKGR) Base Address
-AT91C_BASE_PIOD           EQU (0xFFFFFA00) ;- (PIOD) Base Address
-AT91C_BASE_PIOC           EQU (0xFFFFF800) ;- (PIOC) Base Address
-AT91C_BASE_PIOB           EQU (0xFFFFF600) ;- (PIOB) Base Address
-AT91C_BASE_PIOA           EQU (0xFFFFF400) ;- (PIOA) Base Address
-AT91C_BASE_DBGU           EQU (0xFFFFF200) ;- (DBGU) Base Address
-AT91C_BASE_PDC_DBGU       EQU (0xFFFFF300) ;- (PDC_DBGU) Base Address
-AT91C_BASE_AIC            EQU (0xFFFFF000) ;- (AIC) Base Address
-AT91C_BASE_PDC_SPI        EQU (0xFFFE0100) ;- (PDC_SPI) Base Address
-AT91C_BASE_SPI            EQU (0xFFFE0000) ;- (SPI) Base Address
-AT91C_BASE_PDC_SSC2       EQU (0xFFFD8100) ;- (PDC_SSC2) Base Address
-AT91C_BASE_SSC2           EQU (0xFFFD8000) ;- (SSC2) Base Address
-AT91C_BASE_PDC_SSC1       EQU (0xFFFD4100) ;- (PDC_SSC1) Base Address
-AT91C_BASE_SSC1           EQU (0xFFFD4000) ;- (SSC1) Base Address
-AT91C_BASE_PDC_SSC0       EQU (0xFFFD0100) ;- (PDC_SSC0) Base Address
-AT91C_BASE_SSC0           EQU (0xFFFD0000) ;- (SSC0) Base Address
-AT91C_BASE_PDC_US3        EQU (0xFFFCC100) ;- (PDC_US3) Base Address
-AT91C_BASE_US3            EQU (0xFFFCC000) ;- (US3) Base Address
-AT91C_BASE_PDC_US2        EQU (0xFFFC8100) ;- (PDC_US2) Base Address
-AT91C_BASE_US2            EQU (0xFFFC8000) ;- (US2) Base Address
-AT91C_BASE_PDC_US1        EQU (0xFFFC4100) ;- (PDC_US1) Base Address
-AT91C_BASE_US1            EQU (0xFFFC4000) ;- (US1) Base Address
-AT91C_BASE_PDC_US0        EQU (0xFFFC0100) ;- (PDC_US0) Base Address
-AT91C_BASE_US0            EQU (0xFFFC0000) ;- (US0) Base Address
-AT91C_BASE_TWI            EQU (0xFFFB8000) ;- (TWI) Base Address
-AT91C_BASE_PDC_MCI        EQU (0xFFFB4100) ;- (PDC_MCI) Base Address
-AT91C_BASE_MCI            EQU (0xFFFB4000) ;- (MCI) Base Address
-AT91C_BASE_UDP            EQU (0xFFFB0000) ;- (UDP) Base Address
-AT91C_BASE_TC5            EQU (0xFFFA4080) ;- (TC5) Base Address
-AT91C_BASE_TC4            EQU (0xFFFA4040) ;- (TC4) Base Address
-AT91C_BASE_TC3            EQU (0xFFFA4000) ;- (TC3) Base Address
-AT91C_BASE_TCB1           EQU (0xFFFA4080) ;- (TCB1) Base Address
-AT91C_BASE_TC2            EQU (0xFFFA0080) ;- (TC2) Base Address
-AT91C_BASE_TC1            EQU (0xFFFA0040) ;- (TC1) Base Address
-AT91C_BASE_TC0            EQU (0xFFFA0000) ;- (TC0) Base Address
-AT91C_BASE_TCB0           EQU (0xFFFA0000) ;- (TCB0) Base Address
-AT91C_BASE_UHP            EQU (0x00300000) ;- (UHP) Base Address
-AT91C_BASE_EMAC           EQU (0xFFFBC000) ;- (EMAC) Base Address
-AT91C_BASE_EBI            EQU (0xFFFFFF60) ;- (EBI) Base Address
-AT91C_BASE_SMC2           EQU (0xFFFFFF70) ;- (SMC2) Base Address
-AT91C_BASE_SDRC           EQU (0xFFFFFF90) ;- (SDRC) Base Address
-AT91C_BASE_BFC            EQU (0xFFFFFFC0) ;- (BFC) Base Address
-
-;- *****************************************************************************
-;-               MEMORY MAPPING DEFINITIONS FOR AT91RM9200
-;- *****************************************************************************
-AT91C_ISRAM               EQU (0x00200000) ;- Internal SRAM base address
-AT91C_ISRAM_SIZE          EQU (0x00004000) ;- Internal SRAM size in byte (16 Kbyte)
-AT91C_IROM                EQU (0x00100000) ;- Internal ROM base address
-AT91C_IROM_SIZE           EQU (0x00020000) ;- Internal ROM size in byte (128 Kbyte)
-
-
-	END
diff --git a/target/linux/at91/image/dfboot/src/include/AT91RM9200_inc.h b/target/linux/at91/image/dfboot/src/include/AT91RM9200_inc.h
deleted file mode 100644
index dabab01c7..000000000
--- a/target/linux/at91/image/dfboot/src/include/AT91RM9200_inc.h
+++ /dev/null
@@ -1,2401 +0,0 @@
-// ----------------------------------------------------------------------------
-//          ATMEL Microcontroller Software Support  -  ROUSSET  -
-// ----------------------------------------------------------------------------
-//  The software is delivered "AS IS" without warranty or condition of any
-//  kind, either express, implied or statutory. This includes without
-//  limitation any warranty or condition with respect to merchantability or
-//  fitness for any particular purpose, or against the infringements of
-//  intellectual property rights of others.
-// ----------------------------------------------------------------------------
-// File Name           : AT91RM9200.h
-// Object              : AT91RM9200 definitions
-// Generated           : AT91 SW Application Group  11/19/2003 (17:20:51)
-// 
-// CVS Reference       : /AT91RM9200.pl/1.16/Fri Feb 07 10:29:51 2003//
-// CVS Reference       : /SYS_AT91RM9200.pl/1.2/Fri Jan 17 12:44:37 2003//
-// CVS Reference       : /MC_1760A.pl/1.1/Fri Aug 23 14:38:22 2002//
-// CVS Reference       : /AIC_1796B.pl/1.1.1.1/Fri Jun 28 09:36:47 2002//
-// CVS Reference       : /PMC_2636A.pl/1.1.1.1/Fri Jun 28 09:36:48 2002//
-// CVS Reference       : /ST_1763B.pl/1.1/Fri Aug 23 14:41:42 2002//
-// CVS Reference       : /RTC_1245D.pl/1.2/Fri Jan 31 12:19:06 2003//
-// CVS Reference       : /PIO_1725D.pl/1.1.1.1/Fri Jun 28 09:36:47 2002//
-// CVS Reference       : /DBGU_1754A.pl/1.4/Fri Jan 31 12:18:24 2003//
-// CVS Reference       : /UDP_1765B.pl/1.3/Fri Aug 02 14:45:38 2002//
-// CVS Reference       : /MCI_1764A.pl/1.2/Thu Nov 14 17:48:24 2002//
-// CVS Reference       : /US_1739C.pl/1.2/Fri Jul 12 07:49:25 2002//
-// CVS Reference       : /SPI_AT91RMxxxx.pl/1.3/Tue Nov 26 10:20:29 2002//
-// CVS Reference       : /SSC_1762A.pl/1.2/Fri Nov 08 13:26:39 2002//
-// CVS Reference       : /TC_1753B.pl/1.2/Fri Jan 31 12:19:55 2003//
-// CVS Reference       : /TWI_1761B.pl/1.4/Fri Feb 07 10:30:07 2003//
-// CVS Reference       : /PDC_1734B.pl/1.2/Thu Nov 21 16:38:23 2002//
-// CVS Reference       : /UHP_xxxxA.pl/1.1/Mon Jul 22 12:21:58 2002//
-// CVS Reference       : /EMAC_1794A.pl/1.4/Fri Jan 17 12:11:54 2003//
-// CVS Reference       : /EBI_1759B.pl/1.10/Fri Jan 17 12:44:29 2003//
-// CVS Reference       : /SMC_1783A.pl/1.3/Thu Oct 31 14:38:17 2002//
-// CVS Reference       : /SDRC_1758B.pl/1.2/Thu Oct 03 13:04:41 2002//
-// CVS Reference       : /BFC_1757B.pl/1.3/Thu Oct 31 14:38:00 2002//
-// ----------------------------------------------------------------------------
-
-// Hardware register definition
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR System Peripherals
-// *****************************************************************************
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR Memory Controller Interface
-// *****************************************************************************
-// *** Register offset in AT91S_MC structure ***
-#define MC_RCR          ( 0) // MC Remap Control Register
-#define MC_ASR          ( 4) // MC Abort Status Register
-#define MC_AASR         ( 8) // MC Abort Address Status Register
-#define MC_PUIA         (16) // MC Protection Unit Area
-#define MC_PUP          (80) // MC Protection Unit Peripherals
-#define MC_PUER         (84) // MC Protection Unit Enable Register
-// -------- MC_RCR : (MC Offset: 0x0) MC Remap Control Register -------- 
-#define AT91C_MC_RCB              (0x1 <<  0) // (MC) Remap Command Bit
-// -------- MC_ASR : (MC Offset: 0x4) MC Abort Status Register -------- 
-#define AT91C_MC_UNDADD           (0x1 <<  0) // (MC) Undefined Addess Abort Status
-#define AT91C_MC_MISADD           (0x1 <<  1) // (MC) Misaligned Addess Abort Status
-#define AT91C_MC_MPU              (0x1 <<  2) // (MC) Memory protection Unit Abort Status
-#define AT91C_MC_ABTSZ            (0x3 <<  8) // (MC) Abort Size Status
-#define 	AT91C_MC_ABTSZ_BYTE                 (0x0 <<  8) // (MC) Byte
-#define 	AT91C_MC_ABTSZ_HWORD                (0x1 <<  8) // (MC) Half-word
-#define 	AT91C_MC_ABTSZ_WORD                 (0x2 <<  8) // (MC) Word
-#define AT91C_MC_ABTTYP           (0x3 << 10) // (MC) Abort Type Status
-#define 	AT91C_MC_ABTTYP_DATAR                (0x0 << 10) // (MC) Data Read
-#define 	AT91C_MC_ABTTYP_DATAW                (0x1 << 10) // (MC) Data Write
-#define 	AT91C_MC_ABTTYP_FETCH                (0x2 << 10) // (MC) Code Fetch
-#define AT91C_MC_MST0             (0x1 << 16) // (MC) Master 0 Abort Source
-#define AT91C_MC_MST1             (0x1 << 17) // (MC) Master 1 Abort Source
-#define AT91C_MC_SVMST0           (0x1 << 24) // (MC) Saved Master 0 Abort Source
-#define AT91C_MC_SVMST1           (0x1 << 25) // (MC) Saved Master 1 Abort Source
-// -------- MC_PUIA : (MC Offset: 0x10) MC Protection Unit Area -------- 
-#define AT91C_MC_PROT             (0x3 <<  0) // (MC) Protection
-#define 	AT91C_MC_PROT_PNAUNA               (0x0) // (MC) Privilege: No Access, User: No Access
-#define 	AT91C_MC_PROT_PRWUNA               (0x1) // (MC) Privilege: Read/Write, User: No Access
-#define 	AT91C_MC_PROT_PRWURO               (0x2) // (MC) Privilege: Read/Write, User: Read Only
-#define 	AT91C_MC_PROT_PRWURW               (0x3) // (MC) Privilege: Read/Write, User: Read/Write
-#define AT91C_MC_SIZE             (0xF <<  4) // (MC) Internal Area Size
-#define 	AT91C_MC_SIZE_1KB                  (0x0 <<  4) // (MC) Area size 1KByte
-#define 	AT91C_MC_SIZE_2KB                  (0x1 <<  4) // (MC) Area size 2KByte
-#define 	AT91C_MC_SIZE_4KB                  (0x2 <<  4) // (MC) Area size 4KByte
-#define 	AT91C_MC_SIZE_8KB                  (0x3 <<  4) // (MC) Area size 8KByte
-#define 	AT91C_MC_SIZE_16KB                 (0x4 <<  4) // (MC) Area size 16KByte
-#define 	AT91C_MC_SIZE_32KB                 (0x5 <<  4) // (MC) Area size 32KByte
-#define 	AT91C_MC_SIZE_64KB                 (0x6 <<  4) // (MC) Area size 64KByte
-#define 	AT91C_MC_SIZE_128KB                (0x7 <<  4) // (MC) Area size 128KByte
-#define 	AT91C_MC_SIZE_256KB                (0x8 <<  4) // (MC) Area size 256KByte
-#define 	AT91C_MC_SIZE_512KB                (0x9 <<  4) // (MC) Area size 512KByte
-#define 	AT91C_MC_SIZE_1MB                  (0xA <<  4) // (MC) Area size 1MByte
-#define 	AT91C_MC_SIZE_2MB                  (0xB <<  4) // (MC) Area size 2MByte
-#define 	AT91C_MC_SIZE_4MB                  (0xC <<  4) // (MC) Area size 4MByte
-#define 	AT91C_MC_SIZE_8MB                  (0xD <<  4) // (MC) Area size 8MByte
-#define 	AT91C_MC_SIZE_16MB                 (0xE <<  4) // (MC) Area size 16MByte
-#define 	AT91C_MC_SIZE_64MB                 (0xF <<  4) // (MC) Area size 64MByte
-#define AT91C_MC_BA               (0x3FFFF << 10) // (MC) Internal Area Base Address
-// -------- MC_PUP : (MC Offset: 0x50) MC Protection Unit Peripheral -------- 
-// -------- MC_PUER : (MC Offset: 0x54) MC Protection Unit Area -------- 
-#define AT91C_MC_PUEB             (0x1 <<  0) // (MC) Protection Unit enable Bit
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR Real-time Clock Alarm and Parallel Load Interface
-// *****************************************************************************
-// *** Register offset in AT91S_RTC structure ***
-#define RTC_CR          ( 0) // Control Register
-#define RTC_MR          ( 4) // Mode Register
-#define RTC_TIMR        ( 8) // Time Register
-#define RTC_CALR        (12) // Calendar Register
-#define RTC_TIMALR      (16) // Time Alarm Register
-#define RTC_CALALR      (20) // Calendar Alarm Register
-#define RTC_SR          (24) // Status Register
-#define RTC_SCCR        (28) // Status Clear Command Register
-#define RTC_IER         (32) // Interrupt Enable Register
-#define RTC_IDR         (36) // Interrupt Disable Register
-#define RTC_IMR         (40) // Interrupt Mask Register
-#define RTC_VER         (44) // Valid Entry Register
-// -------- RTC_CR : (RTC Offset: 0x0) RTC Control Register -------- 
-#define AT91C_RTC_UPDTIM          (0x1 <<  0) // (RTC) Update Request Time Register
-#define AT91C_RTC_UPDCAL          (0x1 <<  1) // (RTC) Update Request Calendar Register
-#define AT91C_RTC_TIMEVSEL        (0x3 <<  8) // (RTC) Time Event Selection
-#define 	AT91C_RTC_TIMEVSEL_MINUTE               (0x0 <<  8) // (RTC) Minute change.
-#define 	AT91C_RTC_TIMEVSEL_HOUR                 (0x1 <<  8) // (RTC) Hour change.
-#define 	AT91C_RTC_TIMEVSEL_DAY24                (0x2 <<  8) // (RTC) Every day at midnight.
-#define 	AT91C_RTC_TIMEVSEL_DAY12                (0x3 <<  8) // (RTC) Every day at noon.
-#define AT91C_RTC_CALEVSEL        (0x3 << 16) // (RTC) Calendar Event Selection
-#define 	AT91C_RTC_CALEVSEL_WEEK                 (0x0 << 16) // (RTC) Week change (every Monday at time 00:00:00).
-#define 	AT91C_RTC_CALEVSEL_MONTH                (0x1 << 16) // (RTC) Month change (every 01 of each month at time 00:00:00).
-#define 	AT91C_RTC_CALEVSEL_YEAR                 (0x2 << 16) // (RTC) Year change (every January 1 at time 00:00:00).
-// -------- RTC_MR : (RTC Offset: 0x4) RTC Mode Register -------- 
-#define AT91C_RTC_HRMOD           (0x1 <<  0) // (RTC) 12-24 hour Mode
-// -------- RTC_TIMR : (RTC Offset: 0x8) RTC Time Register -------- 
-#define AT91C_RTC_SEC             (0x7F <<  0) // (RTC) Current Second
-#define AT91C_RTC_MIN             (0x7F <<  8) // (RTC) Current Minute
-#define AT91C_RTC_HOUR            (0x1F << 16) // (RTC) Current Hour
-#define AT91C_RTC_AMPM            (0x1 << 22) // (RTC) Ante Meridiem, Post Meridiem Indicator
-// -------- RTC_CALR : (RTC Offset: 0xc) RTC Calendar Register -------- 
-#define AT91C_RTC_CENT            (0x3F <<  0) // (RTC) Current Century
-#define AT91C_RTC_YEAR            (0xFF <<  8) // (RTC) Current Year
-#define AT91C_RTC_MONTH           (0x1F << 16) // (RTC) Current Month
-#define AT91C_RTC_DAY             (0x7 << 21) // (RTC) Current Day
-#define AT91C_RTC_DATE            (0x3F << 24) // (RTC) Current Date
-// -------- RTC_TIMALR : (RTC Offset: 0x10) RTC Time Alarm Register -------- 
-#define AT91C_RTC_SECEN           (0x1 <<  7) // (RTC) Second Alarm Enable
-#define AT91C_RTC_MINEN           (0x1 << 15) // (RTC) Minute Alarm
-#define AT91C_RTC_HOUREN          (0x1 << 23) // (RTC) Current Hour
-// -------- RTC_CALALR : (RTC Offset: 0x14) RTC Calendar Alarm Register -------- 
-#define AT91C_RTC_MONTHEN         (0x1 << 23) // (RTC) Month Alarm Enable
-#define AT91C_RTC_DATEEN          (0x1 << 31) // (RTC) Date Alarm Enable
-// -------- RTC_SR : (RTC Offset: 0x18) RTC Status Register -------- 
-#define AT91C_RTC_ACKUPD          (0x1 <<  0) // (RTC) Acknowledge for Update
-#define AT91C_RTC_ALARM           (0x1 <<  1) // (RTC) Alarm Flag
-#define AT91C_RTC_SECEV           (0x1 <<  2) // (RTC) Second Event
-#define AT91C_RTC_TIMEV           (0x1 <<  3) // (RTC) Time Event
-#define AT91C_RTC_CALEV           (0x1 <<  4) // (RTC) Calendar event
-// -------- RTC_SCCR : (RTC Offset: 0x1c) RTC Status Clear Command Register -------- 
-// -------- RTC_IER : (RTC Offset: 0x20) RTC Interrupt Enable Register -------- 
-// -------- RTC_IDR : (RTC Offset: 0x24) RTC Interrupt Disable Register -------- 
-// -------- RTC_IMR : (RTC Offset: 0x28) RTC Interrupt Mask Register -------- 
-// -------- RTC_VER : (RTC Offset: 0x2c) RTC Valid Entry Register -------- 
-#define AT91C_RTC_NVTIM           (0x1 <<  0) // (RTC) Non valid Time
-#define AT91C_RTC_NVCAL           (0x1 <<  1) // (RTC) Non valid Calendar
-#define AT91C_RTC_NVTIMALR        (0x1 <<  2) // (RTC) Non valid time Alarm
-#define AT91C_RTC_NVCALALR        (0x1 <<  3) // (RTC) Nonvalid Calendar Alarm
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR System Timer Interface
-// *****************************************************************************
-// *** Register offset in AT91S_ST structure ***
-#define ST_CR           ( 0) // Control Register
-#define ST_PIMR         ( 4) // Period Interval Mode Register
-#define ST_WDMR         ( 8) // Watchdog Mode Register
-#define ST_RTMR         (12) // Real-time Mode Register
-#define ST_SR           (16) // Status Register
-#define ST_IER          (20) // Interrupt Enable Register
-#define ST_IDR          (24) // Interrupt Disable Register
-#define ST_IMR          (28) // Interrupt Mask Register
-#define ST_RTAR         (32) // Real-time Alarm Register
-#define ST_CRTR         (36) // Current Real-time Register
-// -------- ST_CR : (ST Offset: 0x0) System Timer Control Register -------- 
-#define AT91C_ST_WDRST            (0x1 <<  0) // (ST) Watchdog Timer Restart
-// -------- ST_PIMR : (ST Offset: 0x4) System Timer Period Interval Mode Register -------- 
-#define AT91C_ST_PIV              (0xFFFF <<  0) // (ST) Watchdog Timer Restart
-// -------- ST_WDMR : (ST Offset: 0x8) System Timer Watchdog Mode Register -------- 
-#define AT91C_ST_WDV              (0xFFFF <<  0) // (ST) Watchdog Timer Restart
-#define AT91C_ST_RSTEN            (0x1 << 16) // (ST) Reset Enable
-#define AT91C_ST_EXTEN            (0x1 << 17) // (ST) External Signal Assertion Enable
-// -------- ST_RTMR : (ST Offset: 0xc) System Timer Real-time Mode Register -------- 
-#define AT91C_ST_RTPRES           (0xFFFF <<  0) // (ST) Real-time Timer Prescaler Value
-// -------- ST_SR : (ST Offset: 0x10) System Timer Status Register -------- 
-#define AT91C_ST_PITS             (0x1 <<  0) // (ST) Period Interval Timer Interrupt
-#define AT91C_ST_WDOVF            (0x1 <<  1) // (ST) Watchdog Overflow
-#define AT91C_ST_RTTINC           (0x1 <<  2) // (ST) Real-time Timer Increment
-#define AT91C_ST_ALMS             (0x1 <<  3) // (ST) Alarm Status
-// -------- ST_IER : (ST Offset: 0x14) System Timer Interrupt Enable Register -------- 
-// -------- ST_IDR : (ST Offset: 0x18) System Timer Interrupt Disable Register -------- 
-// -------- ST_IMR : (ST Offset: 0x1c) System Timer Interrupt Mask Register -------- 
-// -------- ST_RTAR : (ST Offset: 0x20) System Timer Real-time Alarm Register -------- 
-#define AT91C_ST_ALMV             (0xFFFFF <<  0) // (ST) Alarm Value Value
-// -------- ST_CRTR : (ST Offset: 0x24) System Timer Current Real-time Register -------- 
-#define AT91C_ST_CRTV             (0xFFFFF <<  0) // (ST) Current Real-time Value
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR Power Management Controler
-// *****************************************************************************
-// *** Register offset in AT91S_PMC structure ***
-#define PMC_SCER        ( 0) // System Clock Enable Register
-#define PMC_SCDR        ( 4) // System Clock Disable Register
-#define PMC_SCSR        ( 8) // System Clock Status Register
-#define PMC_PCER        (16) // Peripheral Clock Enable Register
-#define PMC_PCDR        (20) // Peripheral Clock Disable Register
-#define PMC_PCSR        (24) // Peripheral Clock Status Register
-#define PMC_MCKR        (48) // Master Clock Register
-#define PMC_PCKR        (64) // Programmable Clock Register
-#define PMC_IER         (96) // Interrupt Enable Register
-#define PMC_IDR         (100) // Interrupt Disable Register
-#define PMC_SR          (104) // Status Register
-#define PMC_IMR         (108) // Interrupt Mask Register
-// -------- PMC_SCER : (PMC Offset: 0x0) System Clock Enable Register -------- 
-#define AT91C_PMC_PCK             (0x1 <<  0) // (PMC) Processor Clock
-#define AT91C_PMC_UDP             (0x1 <<  1) // (PMC) USB Device Port Clock
-#define AT91C_PMC_MCKUDP          (0x1 <<  2) // (PMC) USB Device Port Master Clock Automatic Disable on Suspend
-#define AT91C_PMC_UHP             (0x1 <<  4) // (PMC) USB Host Port Clock
-#define AT91C_PMC_PCK0            (0x1 <<  8) // (PMC) Programmable Clock Output
-#define AT91C_PMC_PCK1            (0x1 <<  9) // (PMC) Programmable Clock Output
-#define AT91C_PMC_PCK2            (0x1 << 10) // (PMC) Programmable Clock Output
-#define AT91C_PMC_PCK3            (0x1 << 11) // (PMC) Programmable Clock Output
-#define AT91C_PMC_PCK4            (0x1 << 12) // (PMC) Programmable Clock Output
-#define AT91C_PMC_PCK5            (0x1 << 13) // (PMC) Programmable Clock Output
-#define AT91C_PMC_PCK6            (0x1 << 14) // (PMC) Programmable Clock Output
-#define AT91C_PMC_PCK7            (0x1 << 15) // (PMC) Programmable Clock Output
-// -------- PMC_SCDR : (PMC Offset: 0x4) System Clock Disable Register -------- 
-// -------- PMC_SCSR : (PMC Offset: 0x8) System Clock Status Register -------- 
-// -------- PMC_MCKR : (PMC Offset: 0x30) Master Clock Register -------- 
-#define AT91C_PMC_CSS             (0x3 <<  0) // (PMC) Programmable Clock Selection
-#define 	AT91C_PMC_CSS_SLOW_CLK             (0x0) // (PMC) Slow Clock is selected
-#define 	AT91C_PMC_CSS_MAIN_CLK             (0x1) // (PMC) Main Clock is selected
-#define 	AT91C_PMC_CSS_PLLA_CLK             (0x2) // (PMC) Clock from PLL A is selected
-#define 	AT91C_PMC_CSS_PLLB_CLK             (0x3) // (PMC) Clock from PLL B is selected
-#define AT91C_PMC_PRES            (0x7 <<  2) // (PMC) Programmable Clock Prescaler
-#define 	AT91C_PMC_PRES_CLK                  (0x0 <<  2) // (PMC) Selected clock
-#define 	AT91C_PMC_PRES_CLK_2                (0x1 <<  2) // (PMC) Selected clock divided by 2
-#define 	AT91C_PMC_PRES_CLK_4                (0x2 <<  2) // (PMC) Selected clock divided by 4
-#define 	AT91C_PMC_PRES_CLK_8                (0x3 <<  2) // (PMC) Selected clock divided by 8
-#define 	AT91C_PMC_PRES_CLK_16               (0x4 <<  2) // (PMC) Selected clock divided by 16
-#define 	AT91C_PMC_PRES_CLK_32               (0x5 <<  2) // (PMC) Selected clock divided by 32
-#define 	AT91C_PMC_PRES_CLK_64               (0x6 <<  2) // (PMC) Selected clock divided by 64
-#define AT91C_PMC_MDIV            (0x3 <<  8) // (PMC) Master Clock Division
-#define 	AT91C_PMC_MDIV_1                    (0x0 <<  8) // (PMC) The master clock and the processor clock are the same
-#define 	AT91C_PMC_MDIV_2                    (0x1 <<  8) // (PMC) The processor clock is twice as fast as the master clock
-#define 	AT91C_PMC_MDIV_3                    (0x2 <<  8) // (PMC) The processor clock is three times faster than the master clock
-#define 	AT91C_PMC_MDIV_4                    (0x3 <<  8) // (PMC) The processor clock is four times faster than the master clock
-// -------- PMC_PCKR : (PMC Offset: 0x40) Programmable Clock Register -------- 
-// -------- PMC_IER : (PMC Offset: 0x60) PMC Interrupt Enable Register -------- 
-#define AT91C_PMC_MOSCS           (0x1 <<  0) // (PMC) MOSC Status/Enable/Disable/Mask
-#define AT91C_PMC_LOCKA           (0x1 <<  1) // (PMC) PLL A Status/Enable/Disable/Mask
-#define AT91C_PMC_LOCKB           (0x1 <<  2) // (PMC) PLL B Status/Enable/Disable/Mask
-#define AT91C_PMC_MCKRDY          (0x1 <<  3) // (PMC) MCK_RDY Status/Enable/Disable/Mask
-#define AT91C_PMC_PCK0RDY         (0x1 <<  8) // (PMC) PCK0_RDY Status/Enable/Disable/Mask
-#define AT91C_PMC_PCK1RDY         (0x1 <<  9) // (PMC) PCK1_RDY Status/Enable/Disable/Mask
-#define AT91C_PMC_PCK2RDY         (0x1 << 10) // (PMC) PCK2_RDY Status/Enable/Disable/Mask
-#define AT91C_PMC_PCK3RDY         (0x1 << 11) // (PMC) PCK3_RDY Status/Enable/Disable/Mask
-#define AT91C_PMC_PCK4RDY         (0x1 << 12) // (PMC) PCK4_RDY Status/Enable/Disable/Mask
-#define AT91C_PMC_PCK5RDY         (0x1 << 13) // (PMC) PCK5_RDY Status/Enable/Disable/Mask
-#define AT91C_PMC_PCK6RDY         (0x1 << 14) // (PMC) PCK6_RDY Status/Enable/Disable/Mask
-#define AT91C_PMC_PCK7RDY         (0x1 << 15) // (PMC) PCK7_RDY Status/Enable/Disable/Mask
-// -------- PMC_IDR : (PMC Offset: 0x64) PMC Interrupt Disable Register -------- 
-// -------- PMC_SR : (PMC Offset: 0x68) PMC Status Register -------- 
-// -------- PMC_IMR : (PMC Offset: 0x6c) PMC Interrupt Mask Register -------- 
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR Clock Generator Controler
-// *****************************************************************************
-// *** Register offset in AT91S_CKGR structure ***
-#define CKGR_MOR        ( 0) // Main Oscillator Register
-#define CKGR_MCFR       ( 4) // Main Clock  Frequency Register
-#define CKGR_PLLAR      ( 8) // PLL A Register
-#define CKGR_PLLBR      (12) // PLL B Register
-// -------- CKGR_MOR : (CKGR Offset: 0x0) Main Oscillator Register -------- 
-#define AT91C_CKGR_MOSCEN         (0x1 <<  0) // (CKGR) Main Oscillator Enable
-#define AT91C_CKGR_OSCTEST        (0x1 <<  1) // (CKGR) Oscillator Test
-#define AT91C_CKGR_OSCOUNT        (0xFF <<  8) // (CKGR) Main Oscillator Start-up Time
-// -------- CKGR_MCFR : (CKGR Offset: 0x4) Main Clock Frequency Register -------- 
-#define AT91C_CKGR_MAINF          (0xFFFF <<  0) // (CKGR) Main Clock Frequency
-#define AT91C_CKGR_MAINRDY        (0x1 << 16) // (CKGR) Main Clock Ready
-// -------- CKGR_PLLAR : (CKGR Offset: 0x8) PLL A Register -------- 
-#define AT91C_CKGR_DIVA           (0xFF <<  0) // (CKGR) Divider Selected
-#define 	AT91C_CKGR_DIVA_0                    (0x0) // (CKGR) Divider output is 0
-#define 	AT91C_CKGR_DIVA_BYPASS               (0x1) // (CKGR) Divider is bypassed
-#define AT91C_CKGR_PLLACOUNT      (0x3F <<  8) // (CKGR) PLL A Counter
-#define AT91C_CKGR_OUTA           (0x3 << 14) // (CKGR) PLL A Output Frequency Range
-#define 	AT91C_CKGR_OUTA_0                    (0x0 << 14) // (CKGR) Please refer to the PLLA datasheet
-#define 	AT91C_CKGR_OUTA_1                    (0x1 << 14) // (CKGR) Please refer to the PLLA datasheet
-#define 	AT91C_CKGR_OUTA_2                    (0x2 << 14) // (CKGR) Please refer to the PLLA datasheet
-#define 	AT91C_CKGR_OUTA_3                    (0x3 << 14) // (CKGR) Please refer to the PLLA datasheet
-#define AT91C_CKGR_MULA           (0x7FF << 16) // (CKGR) PLL A Multiplier
-#define AT91C_CKGR_SRCA           (0x1 << 29) // (CKGR) PLL A Source
-// -------- CKGR_PLLBR : (CKGR Offset: 0xc) PLL B Register -------- 
-#define AT91C_CKGR_DIVB           (0xFF <<  0) // (CKGR) Divider Selected
-#define 	AT91C_CKGR_DIVB_0                    (0x0) // (CKGR) Divider output is 0
-#define 	AT91C_CKGR_DIVB_BYPASS               (0x1) // (CKGR) Divider is bypassed
-#define AT91C_CKGR_PLLBCOUNT      (0x3F <<  8) // (CKGR) PLL B Counter
-#define AT91C_CKGR_OUTB           (0x3 << 14) // (CKGR) PLL B Output Frequency Range
-#define 	AT91C_CKGR_OUTB_0                    (0x0 << 14) // (CKGR) Please refer to the PLLB datasheet
-#define 	AT91C_CKGR_OUTB_1                    (0x1 << 14) // (CKGR) Please refer to the PLLB datasheet
-#define 	AT91C_CKGR_OUTB_2                    (0x2 << 14) // (CKGR) Please refer to the PLLB datasheet
-#define 	AT91C_CKGR_OUTB_3                    (0x3 << 14) // (CKGR) Please refer to the PLLB datasheet
-#define AT91C_CKGR_MULB           (0x7FF << 16) // (CKGR) PLL B Multiplier
-#define AT91C_CKGR_USB_96M        (0x1 << 28) // (CKGR) Divider for USB Ports
-#define AT91C_CKGR_USB_PLL        (0x1 << 29) // (CKGR) PLL Use
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR Parallel Input Output Controler
-// *****************************************************************************
-// *** Register offset in AT91S_PIO structure ***
-#define PIO_PER         ( 0) // PIO Enable Register
-#define PIO_PDR         ( 4) // PIO Disable Register
-#define PIO_PSR         ( 8) // PIO Status Register
-#define PIO_OER         (16) // Output Enable Register
-#define PIO_ODR         (20) // Output Disable Registerr
-#define PIO_OSR         (24) // Output Status Register
-#define PIO_IFER        (32) // Input Filter Enable Register
-#define PIO_IFDR        (36) // Input Filter Disable Register
-#define PIO_IFSR        (40) // Input Filter Status Register
-#define PIO_SODR        (48) // Set Output Data Register
-#define PIO_CODR        (52) // Clear Output Data Register
-#define PIO_ODSR        (56) // Output Data Status Register
-#define PIO_PDSR        (60) // Pin Data Status Register
-#define PIO_IER         (64) // Interrupt Enable Register
-#define PIO_IDR         (68) // Interrupt Disable Register
-#define PIO_IMR         (72) // Interrupt Mask Register
-#define PIO_ISR         (76) // Interrupt Status Register
-#define PIO_MDER        (80) // Multi-driver Enable Register
-#define PIO_MDDR        (84) // Multi-driver Disable Register
-#define PIO_MDSR        (88) // Multi-driver Status Register
-#define PIO_PPUDR       (96) // Pull-up Disable Register
-#define PIO_PPUER       (100) // Pull-up Enable Register
-#define PIO_PPUSR       (104) // Pad Pull-up Status Register
-#define PIO_ASR         (112) // Select A Register
-#define PIO_BSR         (116) // Select B Register
-#define PIO_ABSR        (120) // AB Select Status Register
-#define PIO_OWER        (160) // Output Write Enable Register
-#define PIO_OWDR        (164) // Output Write Disable Register
-#define PIO_OWSR        (168) // Output Write Status Register
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR Debug Unit
-// *****************************************************************************
-// *** Register offset in AT91S_DBGU structure ***
-#define DBGU_CR         ( 0) // Control Register
-#define DBGU_MR         ( 4) // Mode Register
-#define DBGU_IER        ( 8) // Interrupt Enable Register
-#define DBGU_IDR        (12) // Interrupt Disable Register
-#define DBGU_IMR        (16) // Interrupt Mask Register
-#define DBGU_CSR        (20) // Channel Status Register
-#define DBGU_RHR        (24) // Receiver Holding Register
-#define DBGU_THR        (28) // Transmitter Holding Register
-#define DBGU_BRGR       (32) // Baud Rate Generator Register
-#define DBGU_C1R        (64) // Chip ID1 Register
-#define DBGU_C2R        (68) // Chip ID2 Register
-#define DBGU_FNTR       (72) // Force NTRST Register
-#define DBGU_RPR        (256) // Receive Pointer Register
-#define DBGU_RCR        (260) // Receive Counter Register
-#define DBGU_TPR        (264) // Transmit Pointer Register
-#define DBGU_TCR        (268) // Transmit Counter Register
-#define DBGU_RNPR       (272) // Receive Next Pointer Register
-#define DBGU_RNCR       (276) // Receive Next Counter Register
-#define DBGU_TNPR       (280) // Transmit Next Pointer Register
-#define DBGU_TNCR       (284) // Transmit Next Counter Register
-#define DBGU_PTCR       (288) // PDC Transfer Control Register
-#define DBGU_PTSR       (292) // PDC Transfer Status Register
-// -------- DBGU_CR : (DBGU Offset: 0x0) Debug Unit Control Register -------- 
-#define AT91C_US_RSTRX            (0x1 <<  2) // (DBGU) Reset Receiver
-#define AT91C_US_RSTTX            (0x1 <<  3) // (DBGU) Reset Transmitter
-#define AT91C_US_RXEN             (0x1 <<  4) // (DBGU) Receiver Enable
-#define AT91C_US_RXDIS            (0x1 <<  5) // (DBGU) Receiver Disable
-#define AT91C_US_TXEN             (0x1 <<  6) // (DBGU) Transmitter Enable
-#define AT91C_US_TXDIS            (0x1 <<  7) // (DBGU) Transmitter Disable
-// -------- DBGU_MR : (DBGU Offset: 0x4) Debug Unit Mode Register -------- 
-#define AT91C_US_PAR              (0x7 <<  9) // (DBGU) Parity type
-#define 	AT91C_US_PAR_EVEN                 (0x0 <<  9) // (DBGU) Even Parity
-#define 	AT91C_US_PAR_ODD                  (0x1 <<  9) // (DBGU) Odd Parity
-#define 	AT91C_US_PAR_SPACE                (0x2 <<  9) // (DBGU) Parity forced to 0 (Space)
-#define 	AT91C_US_PAR_MARK                 (0x3 <<  9) // (DBGU) Parity forced to 1 (Mark)
-#define 	AT91C_US_PAR_NONE                 (0x4 <<  9) // (DBGU) No Parity
-#define 	AT91C_US_PAR_MULTI_DROP           (0x6 <<  9) // (DBGU) Multi-drop mode
-#define AT91C_US_CHMODE           (0x3 << 14) // (DBGU) Channel Mode
-#define 	AT91C_US_CHMODE_NORMAL               (0x0 << 14) // (DBGU) Normal Mode: The USART channel operates as an RX/TX USART.
-#define 	AT91C_US_CHMODE_AUTO                 (0x1 << 14) // (DBGU) Automatic Echo: Receiver Data Input is connected to the TXD pin.
-#define 	AT91C_US_CHMODE_LOCAL                (0x2 << 14) // (DBGU) Local Loopback: Transmitter Output Signal is connected to Receiver Input Signal.
-#define 	AT91C_US_CHMODE_REMOTE               (0x3 << 14) // (DBGU) Remote Loopback: RXD pin is internally connected to TXD pin.
-// -------- DBGU_IER : (DBGU Offset: 0x8) Debug Unit Interrupt Enable Register -------- 
-#define AT91C_US_RXRDY            (0x1 <<  0) // (DBGU) RXRDY Interrupt
-#define AT91C_US_TXRDY            (0x1 <<  1) // (DBGU) TXRDY Interrupt
-#define AT91C_US_ENDRX            (0x1 <<  3) // (DBGU) End of Receive Transfer Interrupt
-#define AT91C_US_ENDTX            (0x1 <<  4) // (DBGU) End of Transmit Interrupt
-#define AT91C_US_OVRE             (0x1 <<  5) // (DBGU) Overrun Interrupt
-#define AT91C_US_FRAME            (0x1 <<  6) // (DBGU) Framing Error Interrupt
-#define AT91C_US_PARE             (0x1 <<  7) // (DBGU) Parity Error Interrupt
-#define AT91C_US_TXEMPTY          (0x1 <<  9) // (DBGU) TXEMPTY Interrupt
-#define AT91C_US_TXBUFE           (0x1 << 11) // (DBGU) TXBUFE Interrupt
-#define AT91C_US_RXBUFF           (0x1 << 12) // (DBGU) RXBUFF Interrupt
-#define AT91C_US_COMM_TX          (0x1 << 30) // (DBGU) COMM_TX Interrupt
-#define AT91C_US_COMM_RX          (0x1 << 31) // (DBGU) COMM_RX Interrupt
-// -------- DBGU_IDR : (DBGU Offset: 0xc) Debug Unit Interrupt Disable Register -------- 
-// -------- DBGU_IMR : (DBGU Offset: 0x10) Debug Unit Interrupt Mask Register -------- 
-// -------- DBGU_CSR : (DBGU Offset: 0x14) Debug Unit Channel Status Register -------- 
-// -------- DBGU_FNTR : (DBGU Offset: 0x48) Debug Unit FORCE_NTRST Register -------- 
-#define AT91C_US_FORCE_NTRST      (0x1 <<  0) // (DBGU) Force NTRST in JTAG
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR Peripheral Data Controller
-// *****************************************************************************
-// *** Register offset in AT91S_PDC structure ***
-#define PDC_RPR         ( 0) // Receive Pointer Register
-#define PDC_RCR         ( 4) // Receive Counter Register
-#define PDC_TPR         ( 8) // Transmit Pointer Register
-#define PDC_TCR         (12) // Transmit Counter Register
-#define PDC_RNPR        (16) // Receive Next Pointer Register
-#define PDC_RNCR        (20) // Receive Next Counter Register
-#define PDC_TNPR        (24) // Transmit Next Pointer Register
-#define PDC_TNCR        (28) // Transmit Next Counter Register
-#define PDC_PTCR        (32) // PDC Transfer Control Register
-#define PDC_PTSR        (36) // PDC Transfer Status Register
-// -------- PDC_PTCR : (PDC Offset: 0x20) PDC Transfer Control Register -------- 
-#define AT91C_PDC_RXTEN           (0x1 <<  0) // (PDC) Receiver Transfer Enable
-#define AT91C_PDC_RXTDIS          (0x1 <<  1) // (PDC) Receiver Transfer Disable
-#define AT91C_PDC_TXTEN           (0x1 <<  8) // (PDC) Transmitter Transfer Enable
-#define AT91C_PDC_TXTDIS          (0x1 <<  9) // (PDC) Transmitter Transfer Disable
-// -------- PDC_PTSR : (PDC Offset: 0x24) PDC Transfer Status Register -------- 
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR Advanced Interrupt Controller
-// *****************************************************************************
-// *** Register offset in AT91S_AIC structure ***
-#define AIC_SMR         ( 0) // Source Mode Register
-#define AIC_SVR         (128) // Source Vector Register
-#define AIC_IVR         (256) // IRQ Vector Register
-#define AIC_FVR         (260) // FIQ Vector Register
-#define AIC_ISR         (264) // Interrupt Status Register
-#define AIC_IPR         (268) // Interrupt Pending Register
-#define AIC_IMR         (272) // Interrupt Mask Register
-#define AIC_CISR        (276) // Core Interrupt Status Register
-#define AIC_IECR        (288) // Interrupt Enable Command Register
-#define AIC_IDCR        (292) // Interrupt Disable Command Register
-#define AIC_ICCR        (296) // Interrupt Clear Command Register
-#define AIC_ISCR        (300) // Interrupt Set Command Register
-#define AIC_EOICR       (304) // End of Interrupt Command Register
-#define AIC_SPU         (308) // Spurious Vector Register
-#define AIC_DCR         (312) // Debug Control Register (Protect)
-#define AIC_FFER        (320) // Fast Forcing Enable Register
-#define AIC_FFDR        (324) // Fast Forcing Disable Register
-#define AIC_FFSR        (328) // Fast Forcing Status Register
-// -------- AIC_SMR : (AIC Offset: 0x0) Control Register -------- 
-#define AT91C_AIC_PRIOR           (0x7 <<  0) // (AIC) Priority Level
-#define 	AT91C_AIC_PRIOR_LOWEST               (0x0) // (AIC) Lowest priority level
-#define 	AT91C_AIC_PRIOR_HIGHEST              (0x7) // (AIC) Highest priority level
-#define AT91C_AIC_SRCTYPE         (0x3 <<  5) // (AIC) Interrupt Source Type
-#define 	AT91C_AIC_SRCTYPE_INT_LEVEL_SENSITIVE  (0x0 <<  5) // (AIC) Internal Sources Code Label Level Sensitive
-#define 	AT91C_AIC_SRCTYPE_INT_EDGE_TRIGGERED   (0x1 <<  5) // (AIC) Internal Sources Code Label Edge triggered
-#define 	AT91C_AIC_SRCTYPE_EXT_HIGH_LEVEL       (0x2 <<  5) // (AIC) External Sources Code Label High-level Sensitive
-#define 	AT91C_AIC_SRCTYPE_EXT_POSITIVE_EDGE    (0x3 <<  5) // (AIC) External Sources Code Label Positive Edge triggered
-// -------- AIC_CISR : (AIC Offset: 0x114) AIC Core Interrupt Status Register -------- 
-#define AT91C_AIC_NFIQ            (0x1 <<  0) // (AIC) NFIQ Status
-#define AT91C_AIC_NIRQ            (0x1 <<  1) // (AIC) NIRQ Status
-// -------- AIC_DCR : (AIC Offset: 0x138) AIC Debug Control Register (Protect) -------- 
-#define AT91C_AIC_DCR_PROT        (0x1 <<  0) // (AIC) Protection Mode
-#define AT91C_AIC_DCR_GMSK        (0x1 <<  1) // (AIC) General Mask
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR Serial Parallel Interface
-// *****************************************************************************
-// *** Register offset in AT91S_SPI structure ***
-#define SPI_CR          ( 0) // Control Register
-#define SPI_MR          ( 4) // Mode Register
-#define SPI_RDR         ( 8) // Receive Data Register
-#define SPI_TDR         (12) // Transmit Data Register
-#define SPI_SR          (16) // Status Register
-#define SPI_IER         (20) // Interrupt Enable Register
-#define SPI_IDR         (24) // Interrupt Disable Register
-#define SPI_IMR         (28) // Interrupt Mask Register
-#define SPI_CSR         (48) // Chip Select Register
-#define SPI_RPR         (256) // Receive Pointer Register
-#define SPI_RCR         (260) // Receive Counter Register
-#define SPI_TPR         (264) // Transmit Pointer Register
-#define SPI_TCR         (268) // Transmit Counter Register
-#define SPI_RNPR        (272) // Receive Next Pointer Register
-#define SPI_RNCR        (276) // Receive Next Counter Register
-#define SPI_TNPR        (280) // Transmit Next Pointer Register
-#define SPI_TNCR        (284) // Transmit Next Counter Register
-#define SPI_PTCR        (288) // PDC Transfer Control Register
-#define SPI_PTSR        (292) // PDC Transfer Status Register
-// -------- SPI_CR : (SPI Offset: 0x0) SPI Control Register -------- 
-#define AT91C_SPI_SPIEN           (0x1 <<  0) // (SPI) SPI Enable
-#define AT91C_SPI_SPIDIS          (0x1 <<  1) // (SPI) SPI Disable
-#define AT91C_SPI_SWRST           (0x1 <<  7) // (SPI) SPI Software reset
-// -------- SPI_MR : (SPI Offset: 0x4) SPI Mode Register -------- 
-#define AT91C_SPI_MSTR            (0x1 <<  0) // (SPI) Master/Slave Mode
-#define AT91C_SPI_PS              (0x1 <<  1) // (SPI) Peripheral Select
-#define 	AT91C_SPI_PS_FIXED                (0x0 <<  1) // (SPI) Fixed Peripheral Select
-#define 	AT91C_SPI_PS_VARIABLE             (0x1 <<  1) // (SPI) Variable Peripheral Select
-#define AT91C_SPI_PCSDEC          (0x1 <<  2) // (SPI) Chip Select Decode
-#define AT91C_SPI_DIV32           (0x1 <<  3) // (SPI) Clock Selection
-#define AT91C_SPI_MODFDIS         (0x1 <<  4) // (SPI) Mode Fault Detection
-#define AT91C_SPI_LLB             (0x1 <<  7) // (SPI) Clock Selection
-#define AT91C_SPI_PCS             (0xF << 16) // (SPI) Peripheral Chip Select
-#define AT91C_SPI_DLYBCS          (0xFF << 24) // (SPI) Delay Between Chip Selects
-// -------- SPI_RDR : (SPI Offset: 0x8) Receive Data Register -------- 
-#define AT91C_SPI_RD              (0xFFFF <<  0) // (SPI) Receive Data
-#define AT91C_SPI_RPCS            (0xF << 16) // (SPI) Peripheral Chip Select Status
-// -------- SPI_TDR : (SPI Offset: 0xc) Transmit Data Register -------- 
-#define AT91C_SPI_TD              (0xFFFF <<  0) // (SPI) Transmit Data
-#define AT91C_SPI_TPCS            (0xF << 16) // (SPI) Peripheral Chip Select Status
-// -------- SPI_SR : (SPI Offset: 0x10) Status Register -------- 
-#define AT91C_SPI_RDRF            (0x1 <<  0) // (SPI) Receive Data Register Full
-#define AT91C_SPI_TDRE            (0x1 <<  1) // (SPI) Transmit Data Register Empty
-#define AT91C_SPI_MODF            (0x1 <<  2) // (SPI) Mode Fault Error
-#define AT91C_SPI_OVRES           (0x1 <<  3) // (SPI) Overrun Error Status
-#define AT91C_SPI_SPENDRX         (0x1 <<  4) // (SPI) End of Receiver Transfer
-#define AT91C_SPI_SPENDTX         (0x1 <<  5) // (SPI) End of Receiver Transfer
-#define AT91C_SPI_RXBUFF          (0x1 <<  6) // (SPI) RXBUFF Interrupt
-#define AT91C_SPI_TXBUFE          (0x1 <<  7) // (SPI) TXBUFE Interrupt
-#define AT91C_SPI_SPIENS          (0x1 << 16) // (SPI) Enable Status
-// -------- SPI_IER : (SPI Offset: 0x14) Interrupt Enable Register -------- 
-// -------- SPI_IDR : (SPI Offset: 0x18) Interrupt Disable Register -------- 
-// -------- SPI_IMR : (SPI Offset: 0x1c) Interrupt Mask Register -------- 
-// -------- SPI_CSR : (SPI Offset: 0x30) Chip Select Register -------- 
-#define AT91C_SPI_CPOL            (0x1 <<  0) // (SPI) Clock Polarity
-#define AT91C_SPI_NCPHA           (0x1 <<  1) // (SPI) Clock Phase
-#define AT91C_SPI_BITS            (0xF <<  4) // (SPI) Bits Per Transfer
-#define 	AT91C_SPI_BITS_8                    (0x0 <<  4) // (SPI) 8 Bits Per transfer
-#define 	AT91C_SPI_BITS_9                    (0x1 <<  4) // (SPI) 9 Bits Per transfer
-#define 	AT91C_SPI_BITS_10                   (0x2 <<  4) // (SPI) 10 Bits Per transfer
-#define 	AT91C_SPI_BITS_11                   (0x3 <<  4) // (SPI) 11 Bits Per transfer
-#define 	AT91C_SPI_BITS_12                   (0x4 <<  4) // (SPI) 12 Bits Per transfer
-#define 	AT91C_SPI_BITS_13                   (0x5 <<  4) // (SPI) 13 Bits Per transfer
-#define 	AT91C_SPI_BITS_14                   (0x6 <<  4) // (SPI) 14 Bits Per transfer
-#define 	AT91C_SPI_BITS_15                   (0x7 <<  4) // (SPI) 15 Bits Per transfer
-#define 	AT91C_SPI_BITS_16                   (0x8 <<  4) // (SPI) 16 Bits Per transfer
-#define AT91C_SPI_SCBR            (0xFF <<  8) // (SPI) Serial Clock Baud Rate
-#define AT91C_SPI_DLYBS           (0xFF << 16) // (SPI) Serial Clock Baud Rate
-#define AT91C_SPI_DLYBCT          (0xFF << 24) // (SPI) Delay Between Consecutive Transfers
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR Synchronous Serial Controller Interface
-// *****************************************************************************
-// *** Register offset in AT91S_SSC structure ***
-#define SSC_CR          ( 0) // Control Register
-#define SSC_CMR         ( 4) // Clock Mode Register
-#define SSC_RCMR        (16) // Receive Clock ModeRegister
-#define SSC_RFMR        (20) // Receive Frame Mode Register
-#define SSC_TCMR        (24) // Transmit Clock Mode Register
-#define SSC_TFMR        (28) // Transmit Frame Mode Register
-#define SSC_RHR         (32) // Receive Holding Register
-#define SSC_THR         (36) // Transmit Holding Register
-#define SSC_RSHR        (48) // Receive Sync Holding Register
-#define SSC_TSHR        (52) // Transmit Sync Holding Register
-#define SSC_RC0R        (56) // Receive Compare 0 Register
-#define SSC_RC1R        (60) // Receive Compare 1 Register
-#define SSC_SR          (64) // Status Register
-#define SSC_IER         (68) // Interrupt Enable Register
-#define SSC_IDR         (72) // Interrupt Disable Register
-#define SSC_IMR         (76) // Interrupt Mask Register
-#define SSC_RPR         (256) // Receive Pointer Register
-#define SSC_RCR         (260) // Receive Counter Register
-#define SSC_TPR         (264) // Transmit Pointer Register
-#define SSC_TCR         (268) // Transmit Counter Register
-#define SSC_RNPR        (272) // Receive Next Pointer Register
-#define SSC_RNCR        (276) // Receive Next Counter Register
-#define SSC_TNPR        (280) // Transmit Next Pointer Register
-#define SSC_TNCR        (284) // Transmit Next Counter Register
-#define SSC_PTCR        (288) // PDC Transfer Control Register
-#define SSC_PTSR        (292) // PDC Transfer Status Register
-// -------- SSC_CR : (SSC Offset: 0x0) SSC Control Register -------- 
-#define AT91C_SSC_RXEN            (0x1 <<  0) // (SSC) Receive Enable
-#define AT91C_SSC_RXDIS           (0x1 <<  1) // (SSC) Receive Disable
-#define AT91C_SSC_TXEN            (0x1 <<  8) // (SSC) Transmit Enable
-#define AT91C_SSC_TXDIS           (0x1 <<  9) // (SSC) Transmit Disable
-#define AT91C_SSC_SWRST           (0x1 << 15) // (SSC) Software Reset
-// -------- SSC_RCMR : (SSC Offset: 0x10) SSC Receive Clock Mode Register -------- 
-#define AT91C_SSC_CKS             (0x3 <<  0) // (SSC) Receive/Transmit Clock Selection
-#define 	AT91C_SSC_CKS_DIV                  (0x0) // (SSC) Divided Clock
-#define 	AT91C_SSC_CKS_TK                   (0x1) // (SSC) TK Clock signal
-#define 	AT91C_SSC_CKS_RK                   (0x2) // (SSC) RK pin
-#define AT91C_SSC_CKO             (0x7 <<  2) // (SSC) Receive/Transmit Clock Output Mode Selection
-#define 	AT91C_SSC_CKO_NONE                 (0x0 <<  2) // (SSC) Receive/Transmit Clock Output Mode: None RK pin: Input-only
-#define 	AT91C_SSC_CKO_CONTINOUS            (0x1 <<  2) // (SSC) Continuous Receive/Transmit Clock RK pin: Output
-#define 	AT91C_SSC_CKO_DATA_TX              (0x2 <<  2) // (SSC) Receive/Transmit Clock only during data transfers RK pin: Output
-#define AT91C_SSC_CKI             (0x1 <<  5) // (SSC) Receive/Transmit Clock Inversion
-#define AT91C_SSC_CKG             (0x3 <<  6) // (SSC) Receive/Transmit Clock Gating Selection
-#define 	AT91C_SSC_CKG_NONE                 (0x0 <<  6) // (SSC) Receive/Transmit Clock Gating: None, continuous clock
-#define 	AT91C_SSC_CKG_LOW                  (0x1 <<  6) // (SSC) Receive/Transmit Clock enabled only if RF Low
-#define 	AT91C_SSC_CKG_HIGH                 (0x2 <<  6) // (SSC) Receive/Transmit Clock enabled only if RF High
-#define AT91C_SSC_START           (0xF <<  8) // (SSC) Receive/Transmit Start Selection
-#define 	AT91C_SSC_START_CONTINOUS            (0x0 <<  8) // (SSC) Continuous, as soon as the receiver is enabled, and immediately after the end of transfer of the previous data.
-#define 	AT91C_SSC_START_TX                   (0x1 <<  8) // (SSC) Transmit/Receive start
-#define 	AT91C_SSC_START_LOW_RF               (0x2 <<  8) // (SSC) Detection of a low level on RF input
-#define 	AT91C_SSC_START_HIGH_RF              (0x3 <<  8) // (SSC) Detection of a high level on RF input
-#define 	AT91C_SSC_START_FALL_RF              (0x4 <<  8) // (SSC) Detection of a falling edge on RF input
-#define 	AT91C_SSC_START_RISE_RF              (0x5 <<  8) // (SSC) Detection of a rising edge on RF input
-#define 	AT91C_SSC_START_LEVEL_RF             (0x6 <<  8) // (SSC) Detection of any level change on RF input
-#define 	AT91C_SSC_START_EDGE_RF              (0x7 <<  8) // (SSC) Detection of any edge on RF input
-#define 	AT91C_SSC_START_0                    (0x8 <<  8) // (SSC) Compare 0
-#define AT91C_SSC_STOP            (0x1 << 12) // (SSC) Receive Stop Selection
-#define AT91C_SSC_STTOUT          (0x1 << 15) // (SSC) Receive/Transmit Start Output Selection
-#define AT91C_SSC_STTDLY          (0xFF << 16) // (SSC) Receive/Transmit Start Delay
-#define AT91C_SSC_PERIOD          (0xFF << 24) // (SSC) Receive/Transmit Period Divider Selection
-// -------- SSC_RFMR : (SSC Offset: 0x14) SSC Receive Frame Mode Register -------- 
-#define AT91C_SSC_DATLEN          (0x1F <<  0) // (SSC) Data Length
-#define AT91C_SSC_LOOP            (0x1 <<  5) // (SSC) Loop Mode
-#define AT91C_SSC_MSBF            (0x1 <<  7) // (SSC) Most Significant Bit First
-#define AT91C_SSC_DATNB           (0xF <<  8) // (SSC) Data Number per Frame
-#define AT91C_SSC_FSLEN           (0xF << 16) // (SSC) Receive/Transmit Frame Sync length
-#define AT91C_SSC_FSOS            (0x7 << 20) // (SSC) Receive/Transmit Frame Sync Output Selection
-#define 	AT91C_SSC_FSOS_NONE                 (0x0 << 20) // (SSC) Selected Receive/Transmit Frame Sync Signal: None RK pin Input-only
-#define 	AT91C_SSC_FSOS_NEGATIVE             (0x1 << 20) // (SSC) Selected Receive/Transmit Frame Sync Signal: Negative Pulse
-#define 	AT91C_SSC_FSOS_POSITIVE             (0x2 << 20) // (SSC) Selected Receive/Transmit Frame Sync Signal: Positive Pulse
-#define 	AT91C_SSC_FSOS_LOW                  (0x3 << 20) // (SSC) Selected Receive/Transmit Frame Sync Signal: Driver Low during data transfer
-#define 	AT91C_SSC_FSOS_HIGH                 (0x4 << 20) // (SSC) Selected Receive/Transmit Frame Sync Signal: Driver High during data transfer
-#define 	AT91C_SSC_FSOS_TOGGLE               (0x5 << 20) // (SSC) Selected Receive/Transmit Frame Sync Signal: Toggling at each start of data transfer
-#define AT91C_SSC_FSEDGE          (0x1 << 24) // (SSC) Frame Sync Edge Detection
-// -------- SSC_TCMR : (SSC Offset: 0x18) SSC Transmit Clock Mode Register -------- 
-// -------- SSC_TFMR : (SSC Offset: 0x1c) SSC Transmit Frame Mode Register -------- 
-#define AT91C_SSC_DATDEF          (0x1 <<  5) // (SSC) Data Default Value
-#define AT91C_SSC_FSDEN           (0x1 << 23) // (SSC) Frame Sync Data Enable
-// -------- SSC_SR : (SSC Offset: 0x40) SSC Status Register -------- 
-#define AT91C_SSC_TXRDY           (0x1 <<  0) // (SSC) Transmit Ready
-#define AT91C_SSC_TXEMPTY         (0x1 <<  1) // (SSC) Transmit Empty
-#define AT91C_SSC_ENDTX           (0x1 <<  2) // (SSC) End Of Transmission
-#define AT91C_SSC_TXBUFE          (0x1 <<  3) // (SSC) Transmit Buffer Empty
-#define AT91C_SSC_RXRDY           (0x1 <<  4) // (SSC) Receive Ready
-#define AT91C_SSC_OVRUN           (0x1 <<  5) // (SSC) Receive Overrun
-#define AT91C_SSC_ENDRX           (0x1 <<  6) // (SSC) End of Reception
-#define AT91C_SSC_RXBUFF          (0x1 <<  7) // (SSC) Receive Buffer Full
-#define AT91C_SSC_CP0             (0x1 <<  8) // (SSC) Compare 0
-#define AT91C_SSC_CP1             (0x1 <<  9) // (SSC) Compare 1
-#define AT91C_SSC_TXSYN           (0x1 << 10) // (SSC) Transmit Sync
-#define AT91C_SSC_RXSYN           (0x1 << 11) // (SSC) Receive Sync
-#define AT91C_SSC_TXENA           (0x1 << 16) // (SSC) Transmit Enable
-#define AT91C_SSC_RXENA           (0x1 << 17) // (SSC) Receive Enable
-// -------- SSC_IER : (SSC Offset: 0x44) SSC Interrupt Enable Register -------- 
-// -------- SSC_IDR : (SSC Offset: 0x48) SSC Interrupt Disable Register -------- 
-// -------- SSC_IMR : (SSC Offset: 0x4c) SSC Interrupt Mask Register -------- 
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR Usart
-// *****************************************************************************
-// *** Register offset in AT91S_USART structure ***
-#define US_CR           ( 0) // Control Register
-#define US_MR           ( 4) // Mode Register
-#define US_IER          ( 8) // Interrupt Enable Register
-#define US_IDR          (12) // Interrupt Disable Register
-#define US_IMR          (16) // Interrupt Mask Register
-#define US_CSR          (20) // Channel Status Register
-#define US_RHR          (24) // Receiver Holding Register
-#define US_THR          (28) // Transmitter Holding Register
-#define US_BRGR         (32) // Baud Rate Generator Register
-#define US_RTOR         (36) // Receiver Time-out Register
-#define US_TTGR         (40) // Transmitter Time-guard Register
-#define US_FIDI         (64) // FI_DI_Ratio Register
-#define US_NER          (68) // Nb Errors Register
-#define US_XXR          (72) // XON_XOFF Register
-#define US_IF           (76) // IRDA_FILTER Register
-#define US_RPR          (256) // Receive Pointer Register
-#define US_RCR          (260) // Receive Counter Register
-#define US_TPR          (264) // Transmit Pointer Register
-#define US_TCR          (268) // Transmit Counter Register
-#define US_RNPR         (272) // Receive Next Pointer Register
-#define US_RNCR         (276) // Receive Next Counter Register
-#define US_TNPR         (280) // Transmit Next Pointer Register
-#define US_TNCR         (284) // Transmit Next Counter Register
-#define US_PTCR         (288) // PDC Transfer Control Register
-#define US_PTSR         (292) // PDC Transfer Status Register
-// -------- US_CR : (USART Offset: 0x0) Debug Unit Control Register -------- 
-#define AT91C_US_RSTSTA           (0x1 <<  8) // (USART) Reset Status Bits
-#define AT91C_US_STTBRK           (0x1 <<  9) // (USART) Start Break
-#define AT91C_US_STPBRK           (0x1 << 10) // (USART) Stop Break
-#define AT91C_US_STTTO            (0x1 << 11) // (USART) Start Time-out
-#define AT91C_US_SENDA            (0x1 << 12) // (USART) Send Address
-#define AT91C_US_RSTIT            (0x1 << 13) // (USART) Reset Iterations
-#define AT91C_US_RSTNACK          (0x1 << 14) // (USART) Reset Non Acknowledge
-#define AT91C_US_RETTO            (0x1 << 15) // (USART) Rearm Time-out
-#define AT91C_US_DTREN            (0x1 << 16) // (USART) Data Terminal ready Enable
-#define AT91C_US_DTRDIS           (0x1 << 17) // (USART) Data Terminal ready Disable
-#define AT91C_US_RTSEN            (0x1 << 18) // (USART) Request to Send enable
-#define AT91C_US_RTSDIS           (0x1 << 19) // (USART) Request to Send Disable
-// -------- US_MR : (USART Offset: 0x4) Debug Unit Mode Register -------- 
-#define AT91C_US_USMODE           (0xF <<  0) // (USART) Usart mode
-#define 	AT91C_US_USMODE_NORMAL               (0x0) // (USART) Normal
-#define 	AT91C_US_USMODE_RS485                (0x1) // (USART) RS485
-#define 	AT91C_US_USMODE_HWHSH                (0x2) // (USART) Hardware Handshaking
-#define 	AT91C_US_USMODE_MODEM                (0x3) // (USART) Modem
-#define 	AT91C_US_USMODE_ISO7816_0            (0x4) // (USART) ISO7816 protocol: T = 0
-#define 	AT91C_US_USMODE_ISO7816_1            (0x6) // (USART) ISO7816 protocol: T = 1
-#define 	AT91C_US_USMODE_IRDA                 (0x8) // (USART) IrDA
-#define 	AT91C_US_USMODE_SWHSH                (0xC) // (USART) Software Handshaking
-#define AT91C_US_CLKS             (0x3 <<  4) // (USART) Clock Selection (Baud Rate generator Input Clock
-#define 	AT91C_US_CLKS_CLOCK                (0x0 <<  4) // (USART) Clock
-#define 	AT91C_US_CLKS_FDIV1                (0x1 <<  4) // (USART) fdiv1
-#define 	AT91C_US_CLKS_SLOW                 (0x2 <<  4) // (USART) slow_clock (ARM)
-#define 	AT91C_US_CLKS_EXT                  (0x3 <<  4) // (USART) External (SCK)
-#define AT91C_US_CHRL             (0x3 <<  6) // (USART) Clock Selection (Baud Rate generator Input Clock
-#define 	AT91C_US_CHRL_5_BITS               (0x0 <<  6) // (USART) Character Length: 5 bits
-#define 	AT91C_US_CHRL_6_BITS               (0x1 <<  6) // (USART) Character Length: 6 bits
-#define 	AT91C_US_CHRL_7_BITS               (0x2 <<  6) // (USART) Character Length: 7 bits
-#define 	AT91C_US_CHRL_8_BITS               (0x3 <<  6) // (USART) Character Length: 8 bits
-#define AT91C_US_SYNC             (0x1 <<  8) // (USART) Synchronous Mode Select
-#define AT91C_US_NBSTOP           (0x3 << 12) // (USART) Number of Stop bits
-#define 	AT91C_US_NBSTOP_1_BIT                (0x0 << 12) // (USART) 1 stop bit
-#define 	AT91C_US_NBSTOP_15_BIT               (0x1 << 12) // (USART) Asynchronous (SYNC=0) 2 stop bits Synchronous (SYNC=1) 2 stop bits
-#define 	AT91C_US_NBSTOP_2_BIT                (0x2 << 12) // (USART) 2 stop bits
-#define AT91C_US_MSBF             (0x1 << 16) // (USART) Bit Order
-#define AT91C_US_MODE9            (0x1 << 17) // (USART) 9-bit Character length
-#define AT91C_US_CKLO             (0x1 << 18) // (USART) Clock Output Select
-#define AT91C_US_OVER             (0x1 << 19) // (USART) Over Sampling Mode
-#define AT91C_US_INACK            (0x1 << 20) // (USART) Inhibit Non Acknowledge
-#define AT91C_US_DSNACK           (0x1 << 21) // (USART) Disable Successive NACK
-#define AT91C_US_MAX_ITER         (0x1 << 24) // (USART) Number of Repetitions
-#define AT91C_US_FILTER           (0x1 << 28) // (USART) Receive Line Filter
-// -------- US_IER : (USART Offset: 0x8) Debug Unit Interrupt Enable Register -------- 
-#define AT91C_US_RXBRK            (0x1 <<  2) // (USART) Break Received/End of Break
-#define AT91C_US_TIMEOUT          (0x1 <<  8) // (USART) Receiver Time-out
-#define AT91C_US_ITERATION        (0x1 << 10) // (USART) Max number of Repetitions Reached
-#define AT91C_US_NACK             (0x1 << 13) // (USART) Non Acknowledge
-#define AT91C_US_RIIC             (0x1 << 16) // (USART) Ring INdicator Input Change Flag
-#define AT91C_US_DSRIC            (0x1 << 17) // (USART) Data Set Ready Input Change Flag
-#define AT91C_US_DCDIC            (0x1 << 18) // (USART) Data Carrier Flag
-#define AT91C_US_CTSIC            (0x1 << 19) // (USART) Clear To Send Input Change Flag
-// -------- US_IDR : (USART Offset: 0xc) Debug Unit Interrupt Disable Register -------- 
-// -------- US_IMR : (USART Offset: 0x10) Debug Unit Interrupt Mask Register -------- 
-// -------- US_CSR : (USART Offset: 0x14) Debug Unit Channel Status Register -------- 
-#define AT91C_US_RI               (0x1 << 20) // (USART) Image of RI Input
-#define AT91C_US_DSR              (0x1 << 21) // (USART) Image of DSR Input
-#define AT91C_US_DCD              (0x1 << 22) // (USART) Image of DCD Input
-#define AT91C_US_CTS              (0x1 << 23) // (USART) Image of CTS Input
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR Two-wire Interface
-// *****************************************************************************
-// *** Register offset in AT91S_TWI structure ***
-#define TWI_CR          ( 0) // Control Register
-#define TWI_MMR         ( 4) // Master Mode Register
-#define TWI_SMR         ( 8) // Slave Mode Register
-#define TWI_IADR        (12) // Internal Address Register
-#define TWI_CWGR        (16) // Clock Waveform Generator Register
-#define TWI_SR          (32) // Status Register
-#define TWI_IER         (36) // Interrupt Enable Register
-#define TWI_IDR         (40) // Interrupt Disable Register
-#define TWI_IMR         (44) // Interrupt Mask Register
-#define TWI_RHR         (48) // Receive Holding Register
-#define TWI_THR         (52) // Transmit Holding Register
-// -------- TWI_CR : (TWI Offset: 0x0) TWI Control Register -------- 
-#define AT91C_TWI_START           (0x1 <<  0) // (TWI) Send a START Condition
-#define AT91C_TWI_STOP            (0x1 <<  1) // (TWI) Send a STOP Condition
-#define AT91C_TWI_MSEN            (0x1 <<  2) // (TWI) TWI Master Transfer Enabled
-#define AT91C_TWI_MSDIS           (0x1 <<  3) // (TWI) TWI Master Transfer Disabled
-#define AT91C_TWI_SVEN            (0x1 <<  4) // (TWI) TWI Slave Transfer Enabled
-#define AT91C_TWI_SVDIS           (0x1 <<  5) // (TWI) TWI Slave Transfer Disabled
-#define AT91C_TWI_SWRST           (0x1 <<  7) // (TWI) Software Reset
-// -------- TWI_MMR : (TWI Offset: 0x4) TWI Master Mode Register -------- 
-#define AT91C_TWI_IADRSZ          (0x3 <<  8) // (TWI) Internal Device Address Size
-#define 	AT91C_TWI_IADRSZ_NO                   (0x0 <<  8) // (TWI) No internal device address
-#define 	AT91C_TWI_IADRSZ_1_BYTE               (0x1 <<  8) // (TWI) One-byte internal device address
-#define 	AT91C_TWI_IADRSZ_2_BYTE               (0x2 <<  8) // (TWI) Two-byte internal device address
-#define 	AT91C_TWI_IADRSZ_3_BYTE               (0x3 <<  8) // (TWI) Three-byte internal device address
-#define AT91C_TWI_MREAD           (0x1 << 12) // (TWI) Master Read Direction
-#define AT91C_TWI_DADR            (0x7F << 16) // (TWI) Device Address
-// -------- TWI_SMR : (TWI Offset: 0x8) TWI Slave Mode Register -------- 
-#define AT91C_TWI_SADR            (0x7F << 16) // (TWI) Slave Device Address
-// -------- TWI_CWGR : (TWI Offset: 0x10) TWI Clock Waveform Generator Register -------- 
-#define AT91C_TWI_CLDIV           (0xFF <<  0) // (TWI) Clock Low Divider
-#define AT91C_TWI_CHDIV           (0xFF <<  8) // (TWI) Clock High Divider
-#define AT91C_TWI_CKDIV           (0x7 << 16) // (TWI) Clock Divider
-// -------- TWI_SR : (TWI Offset: 0x20) TWI Status Register -------- 
-#define AT91C_TWI_TXCOMP          (0x1 <<  0) // (TWI) Transmission Completed
-#define AT91C_TWI_RXRDY           (0x1 <<  1) // (TWI) Receive holding register ReaDY
-#define AT91C_TWI_TXRDY           (0x1 <<  2) // (TWI) Transmit holding register ReaDY
-#define AT91C_TWI_SVREAD          (0x1 <<  3) // (TWI) Slave Read
-#define AT91C_TWI_SVACC           (0x1 <<  4) // (TWI) Slave Access
-#define AT91C_TWI_GCACC           (0x1 <<  5) // (TWI) General Call Access
-#define AT91C_TWI_OVRE            (0x1 <<  6) // (TWI) Overrun Error
-#define AT91C_TWI_UNRE            (0x1 <<  7) // (TWI) Underrun Error
-#define AT91C_TWI_NACK            (0x1 <<  8) // (TWI) Not Acknowledged
-#define AT91C_TWI_ARBLST          (0x1 <<  9) // (TWI) Arbitration Lost
-// -------- TWI_IER : (TWI Offset: 0x24) TWI Interrupt Enable Register -------- 
-// -------- TWI_IDR : (TWI Offset: 0x28) TWI Interrupt Disable Register -------- 
-// -------- TWI_IMR : (TWI Offset: 0x2c) TWI Interrupt Mask Register -------- 
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR Multimedia Card Interface
-// *****************************************************************************
-// *** Register offset in AT91S_MCI structure ***
-#define MCI_CR          ( 0) // MCI Control Register
-#define MCI_MR          ( 4) // MCI Mode Register
-#define MCI_DTOR        ( 8) // MCI Data Timeout Register
-#define MCI_SDCR        (12) // MCI SD Card Register
-#define MCI_ARGR        (16) // MCI Argument Register
-#define MCI_CMDR        (20) // MCI Command Register
-#define MCI_RSPR        (32) // MCI Response Register
-#define MCI_RDR         (48) // MCI Receive Data Register
-#define MCI_TDR         (52) // MCI Transmit Data Register
-#define MCI_SR          (64) // MCI Status Register
-#define MCI_IER         (68) // MCI Interrupt Enable Register
-#define MCI_IDR         (72) // MCI Interrupt Disable Register
-#define MCI_IMR         (76) // MCI Interrupt Mask Register
-#define MCI_RPR         (256) // Receive Pointer Register
-#define MCI_RCR         (260) // Receive Counter Register
-#define MCI_TPR         (264) // Transmit Pointer Register
-#define MCI_TCR         (268) // Transmit Counter Register
-#define MCI_RNPR        (272) // Receive Next Pointer Register
-#define MCI_RNCR        (276) // Receive Next Counter Register
-#define MCI_TNPR        (280) // Transmit Next Pointer Register
-#define MCI_TNCR        (284) // Transmit Next Counter Register
-#define MCI_PTCR        (288) // PDC Transfer Control Register
-#define MCI_PTSR        (292) // PDC Transfer Status Register
-// -------- MCI_CR : (MCI Offset: 0x0) MCI Control Register -------- 
-#define AT91C_MCI_MCIEN           (0x1 <<  0) // (MCI) Multimedia Interface Enable
-#define AT91C_MCI_MCIDIS          (0x1 <<  1) // (MCI) Multimedia Interface Disable
-#define AT91C_MCI_PWSEN           (0x1 <<  2) // (MCI) Power Save Mode Enable
-#define AT91C_MCI_PWSDIS          (0x1 <<  3) // (MCI) Power Save Mode Disable
-// -------- MCI_MR : (MCI Offset: 0x4) MCI Mode Register -------- 
-#define AT91C_MCI_CLKDIV          (0x1 <<  0) // (MCI) Clock Divider
-#define AT91C_MCI_PWSDIV          (0x1 <<  8) // (MCI) Power Saving Divider
-#define AT91C_MCI_PDCPADV         (0x1 << 14) // (MCI) PDC Padding Value
-#define AT91C_MCI_PDCMODE         (0x1 << 15) // (MCI) PDC Oriented Mode
-#define AT91C_MCI_BLKLEN          (0x1 << 18) // (MCI) Data Block Length
-// -------- MCI_DTOR : (MCI Offset: 0x8) MCI Data Timeout Register -------- 
-#define AT91C_MCI_DTOCYC          (0x1 <<  0) // (MCI) Data Timeout Cycle Number
-#define AT91C_MCI_DTOMUL          (0x7 <<  4) // (MCI) Data Timeout Multiplier
-#define 	AT91C_MCI_DTOMUL_1                    (0x0 <<  4) // (MCI) DTOCYC x 1
-#define 	AT91C_MCI_DTOMUL_16                   (0x1 <<  4) // (MCI) DTOCYC x 16
-#define 	AT91C_MCI_DTOMUL_128                  (0x2 <<  4) // (MCI) DTOCYC x 128
-#define 	AT91C_MCI_DTOMUL_256                  (0x3 <<  4) // (MCI) DTOCYC x 256
-#define 	AT91C_MCI_DTOMUL_1024                 (0x4 <<  4) // (MCI) DTOCYC x 1024
-#define 	AT91C_MCI_DTOMUL_4096                 (0x5 <<  4) // (MCI) DTOCYC x 4096
-#define 	AT91C_MCI_DTOMUL_65536                (0x6 <<  4) // (MCI) DTOCYC x 65536
-#define 	AT91C_MCI_DTOMUL_1048576              (0x7 <<  4) // (MCI) DTOCYC x 1048576
-// -------- MCI_SDCR : (MCI Offset: 0xc) MCI SD Card Register -------- 
-#define AT91C_MCI_SCDSEL          (0x1 <<  0) // (MCI) SD Card Selector
-#define AT91C_MCI_SCDBUS          (0x1 <<  7) // (MCI) SD Card Bus Width
-// -------- MCI_CMDR : (MCI Offset: 0x14) MCI Command Register -------- 
-#define AT91C_MCI_CMDNB           (0x1F <<  0) // (MCI) Command Number
-#define AT91C_MCI_RSPTYP          (0x3 <<  6) // (MCI) Response Type
-#define 	AT91C_MCI_RSPTYP_NO                   (0x0 <<  6) // (MCI) No response
-#define 	AT91C_MCI_RSPTYP_48                   (0x1 <<  6) // (MCI) 48-bit response
-#define 	AT91C_MCI_RSPTYP_136                  (0x2 <<  6) // (MCI) 136-bit response
-#define AT91C_MCI_SPCMD           (0x7 <<  8) // (MCI) Special CMD
-#define 	AT91C_MCI_SPCMD_NONE                 (0x0 <<  8) // (MCI) Not a special CMD
-#define 	AT91C_MCI_SPCMD_INIT                 (0x1 <<  8) // (MCI) Initialization CMD
-#define 	AT91C_MCI_SPCMD_SYNC                 (0x2 <<  8) // (MCI) Synchronized CMD
-#define 	AT91C_MCI_SPCMD_IT_CMD               (0x4 <<  8) // (MCI) Interrupt command
-#define 	AT91C_MCI_SPCMD_IT_REP               (0x5 <<  8) // (MCI) Interrupt response
-#define AT91C_MCI_OPDCMD          (0x1 << 11) // (MCI) Open Drain Command
-#define AT91C_MCI_MAXLAT          (0x1 << 12) // (MCI) Maximum Latency for Command to respond
-#define AT91C_MCI_TRCMD           (0x3 << 16) // (MCI) Transfer CMD
-#define 	AT91C_MCI_TRCMD_NO                   (0x0 << 16) // (MCI) No transfer
-#define 	AT91C_MCI_TRCMD_START                (0x1 << 16) // (MCI) Start transfer
-#define 	AT91C_MCI_TRCMD_STOP                 (0x2 << 16) // (MCI) Stop transfer
-#define AT91C_MCI_TRDIR           (0x1 << 18) // (MCI) Transfer Direction
-#define AT91C_MCI_TRTYP           (0x3 << 19) // (MCI) Transfer Type
-#define 	AT91C_MCI_TRTYP_BLOCK                (0x0 << 19) // (MCI) Block Transfer type
-#define 	AT91C_MCI_TRTYP_MULTIPLE             (0x1 << 19) // (MCI) Multiple Block transfer type
-#define 	AT91C_MCI_TRTYP_STREAM               (0x2 << 19) // (MCI) Stream transfer type
-// -------- MCI_SR : (MCI Offset: 0x40) MCI Status Register -------- 
-#define AT91C_MCI_CMDRDY          (0x1 <<  0) // (MCI) Command Ready flag
-#define AT91C_MCI_RXRDY           (0x1 <<  1) // (MCI) RX Ready flag
-#define AT91C_MCI_TXRDY           (0x1 <<  2) // (MCI) TX Ready flag
-#define AT91C_MCI_BLKE            (0x1 <<  3) // (MCI) Data Block Transfer Ended flag
-#define AT91C_MCI_DTIP            (0x1 <<  4) // (MCI) Data Transfer in Progress flag
-#define AT91C_MCI_NOTBUSY         (0x1 <<  5) // (MCI) Data Line Not Busy flag
-#define AT91C_MCI_ENDRX           (0x1 <<  6) // (MCI) End of RX Buffer flag
-#define AT91C_MCI_ENDTX           (0x1 <<  7) // (MCI) End of TX Buffer flag
-#define AT91C_MCI_RXBUFF          (0x1 << 14) // (MCI) RX Buffer Full flag
-#define AT91C_MCI_TXBUFE          (0x1 << 15) // (MCI) TX Buffer Empty flag
-#define AT91C_MCI_RINDE           (0x1 << 16) // (MCI) Response Index Error flag
-#define AT91C_MCI_RDIRE           (0x1 << 17) // (MCI) Response Direction Error flag
-#define AT91C_MCI_RCRCE           (0x1 << 18) // (MCI) Response CRC Error flag
-#define AT91C_MCI_RENDE           (0x1 << 19) // (MCI) Response End Bit Error flag
-#define AT91C_MCI_RTOE            (0x1 << 20) // (MCI) Response Time-out Error flag
-#define AT91C_MCI_DCRCE           (0x1 << 21) // (MCI) data CRC Error flag
-#define AT91C_MCI_DTOE            (0x1 << 22) // (MCI) Data timeout Error flag
-#define AT91C_MCI_OVRE            (0x1 << 30) // (MCI) Overrun flag
-#define AT91C_MCI_UNRE            (0x1 << 31) // (MCI) Underrun flag
-// -------- MCI_IER : (MCI Offset: 0x44) MCI Interrupt Enable Register -------- 
-// -------- MCI_IDR : (MCI Offset: 0x48) MCI Interrupt Disable Register -------- 
-// -------- MCI_IMR : (MCI Offset: 0x4c) MCI Interrupt Mask Register -------- 
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR USB Device Interface
-// *****************************************************************************
-// *** Register offset in AT91S_UDP structure ***
-#define UDP_NUM         ( 0) // Frame Number Register
-#define UDP_GLBSTATE    ( 4) // Global State Register
-#define UDP_FADDR       ( 8) // Function Address Register
-#define UDP_IER         (16) // Interrupt Enable Register
-#define UDP_IDR         (20) // Interrupt Disable Register
-#define UDP_IMR         (24) // Interrupt Mask Register
-#define UDP_ISR         (28) // Interrupt Status Register
-#define UDP_ICR         (32) // Interrupt Clear Register
-#define UDP_RSTEP       (40) // Reset Endpoint Register
-#define UDP_CSR         (48) // Endpoint Control and Status Register
-#define UDP_FDR         (80) // Endpoint FIFO Data Register
-// -------- UDP_FRM_NUM : (UDP Offset: 0x0) USB Frame Number Register -------- 
-#define AT91C_UDP_FRM_NUM         (0x7FF <<  0) // (UDP) Frame Number as Defined in the Packet Field Formats
-#define AT91C_UDP_FRM_ERR         (0x1 << 16) // (UDP) Frame Error
-#define AT91C_UDP_FRM_OK          (0x1 << 17) // (UDP) Frame OK
-// -------- UDP_GLB_STATE : (UDP Offset: 0x4) USB Global State Register -------- 
-#define AT91C_UDP_FADDEN          (0x1 <<  0) // (UDP) Function Address Enable
-#define AT91C_UDP_CONFG           (0x1 <<  1) // (UDP) Configured
-#define AT91C_UDP_RMWUPE          (0x1 <<  2) // (UDP) Remote Wake Up Enable
-#define AT91C_UDP_RSMINPR         (0x1 <<  3) // (UDP) A Resume Has Been Sent to the Host
-// -------- UDP_FADDR : (UDP Offset: 0x8) USB Function Address Register -------- 
-#define AT91C_UDP_FADD            (0xFF <<  0) // (UDP) Function Address Value
-#define AT91C_UDP_FEN             (0x1 <<  8) // (UDP) Function Enable
-// -------- UDP_IER : (UDP Offset: 0x10) USB Interrupt Enable Register -------- 
-#define AT91C_UDP_EPINT0          (0x1 <<  0) // (UDP) Endpoint 0 Interrupt
-#define AT91C_UDP_EPINT1          (0x1 <<  1) // (UDP) Endpoint 0 Interrupt
-#define AT91C_UDP_EPINT2          (0x1 <<  2) // (UDP) Endpoint 2 Interrupt
-#define AT91C_UDP_EPINT3          (0x1 <<  3) // (UDP) Endpoint 3 Interrupt
-#define AT91C_UDP_EPINT4          (0x1 <<  4) // (UDP) Endpoint 4 Interrupt
-#define AT91C_UDP_EPINT5          (0x1 <<  5) // (UDP) Endpoint 5 Interrupt
-#define AT91C_UDP_EPINT6          (0x1 <<  6) // (UDP) Endpoint 6 Interrupt
-#define AT91C_UDP_EPINT7          (0x1 <<  7) // (UDP) Endpoint 7 Interrupt
-#define AT91C_UDP_RXSUSP          (0x1 <<  8) // (UDP) USB Suspend Interrupt
-#define AT91C_UDP_RXRSM           (0x1 <<  9) // (UDP) USB Resume Interrupt
-#define AT91C_UDP_EXTRSM          (0x1 << 10) // (UDP) USB External Resume Interrupt
-#define AT91C_UDP_SOFINT          (0x1 << 11) // (UDP) USB Start Of frame Interrupt
-#define AT91C_UDP_WAKEUP          (0x1 << 13) // (UDP) USB Resume Interrupt
-// -------- UDP_IDR : (UDP Offset: 0x14) USB Interrupt Disable Register -------- 
-// -------- UDP_IMR : (UDP Offset: 0x18) USB Interrupt Mask Register -------- 
-// -------- UDP_ISR : (UDP Offset: 0x1c) USB Interrupt Status Register -------- 
-#define AT91C_UDP_ENDBUSRES       (0x1 << 12) // (UDP) USB End Of Bus Reset Interrupt
-// -------- UDP_ICR : (UDP Offset: 0x20) USB Interrupt Clear Register -------- 
-// -------- UDP_RST_EP : (UDP Offset: 0x28) USB Reset Endpoint Register -------- 
-#define AT91C_UDP_EP0             (0x1 <<  0) // (UDP) Reset Endpoint 0
-#define AT91C_UDP_EP1             (0x1 <<  1) // (UDP) Reset Endpoint 1
-#define AT91C_UDP_EP2             (0x1 <<  2) // (UDP) Reset Endpoint 2
-#define AT91C_UDP_EP3             (0x1 <<  3) // (UDP) Reset Endpoint 3
-#define AT91C_UDP_EP4             (0x1 <<  4) // (UDP) Reset Endpoint 4
-#define AT91C_UDP_EP5             (0x1 <<  5) // (UDP) Reset Endpoint 5
-#define AT91C_UDP_EP6             (0x1 <<  6) // (UDP) Reset Endpoint 6
-#define AT91C_UDP_EP7             (0x1 <<  7) // (UDP) Reset Endpoint 7
-// -------- UDP_CSR : (UDP Offset: 0x30) USB Endpoint Control and Status Register -------- 
-#define AT91C_UDP_TXCOMP          (0x1 <<  0) // (UDP) Generates an IN packet with data previously written in the DPR
-#define AT91C_UDP_RX_DATA_BK0     (0x1 <<  1) // (UDP) Receive Data Bank 0
-#define AT91C_UDP_RXSETUP         (0x1 <<  2) // (UDP) Sends STALL to the Host (Control endpoints)
-#define AT91C_UDP_ISOERROR        (0x1 <<  3) // (UDP) Isochronous error (Isochronous endpoints)
-#define AT91C_UDP_TXPKTRDY        (0x1 <<  4) // (UDP) Transmit Packet Ready
-#define AT91C_UDP_FORCESTALL      (0x1 <<  5) // (UDP) Force Stall (used by Control, Bulk and Isochronous endpoints).
-#define AT91C_UDP_RX_DATA_BK1     (0x1 <<  6) // (UDP) Receive Data Bank 1 (only used by endpoints with ping-pong attributes).
-#define AT91C_UDP_DIR             (0x1 <<  7) // (UDP) Transfer Direction
-#define AT91C_UDP_EPTYPE          (0x7 <<  8) // (UDP) Endpoint type
-#define 	AT91C_UDP_EPTYPE_CTRL                 (0x0 <<  8) // (UDP) Control
-#define 	AT91C_UDP_EPTYPE_ISO_OUT              (0x1 <<  8) // (UDP) Isochronous OUT
-#define 	AT91C_UDP_EPTYPE_BULK_OUT             (0x2 <<  8) // (UDP) Bulk OUT
-#define 	AT91C_UDP_EPTYPE_INT_OUT              (0x3 <<  8) // (UDP) Interrupt OUT
-#define 	AT91C_UDP_EPTYPE_ISO_IN               (0x5 <<  8) // (UDP) Isochronous IN
-#define 	AT91C_UDP_EPTYPE_BULK_IN              (0x6 <<  8) // (UDP) Bulk IN
-#define 	AT91C_UDP_EPTYPE_INT_IN               (0x7 <<  8) // (UDP) Interrupt IN
-#define AT91C_UDP_DTGLE           (0x1 << 11) // (UDP) Data Toggle
-#define AT91C_UDP_EPEDS           (0x1 << 15) // (UDP) Endpoint Enable Disable
-#define AT91C_UDP_RXBYTECNT       (0x7FF << 16) // (UDP) Number Of Bytes Available in the FIFO
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR Timer Counter Channel Interface
-// *****************************************************************************
-// *** Register offset in AT91S_TC structure ***
-#define TC_CCR          ( 0) // Channel Control Register
-#define TC_CMR          ( 4) // Channel Mode Register
-#define TC_CV           (16) // Counter Value
-#define TC_RA           (20) // Register A
-#define TC_RB           (24) // Register B
-#define TC_RC           (28) // Register C
-#define TC_SR           (32) // Status Register
-#define TC_IER          (36) // Interrupt Enable Register
-#define TC_IDR          (40) // Interrupt Disable Register
-#define TC_IMR          (44) // Interrupt Mask Register
-// -------- TC_CCR : (TC Offset: 0x0) TC Channel Control Register -------- 
-#define AT91C_TC_CLKEN            (0x1 <<  0) // (TC) Counter Clock Enable Command
-#define AT91C_TC_CLKDIS           (0x1 <<  1) // (TC) Counter Clock Disable Command
-#define AT91C_TC_SWTRG            (0x1 <<  2) // (TC) Software Trigger Command
-// -------- TC_CMR : (TC Offset: 0x4) TC Channel Mode Register: Capture Mode / Waveform Mode -------- 
-#define AT91C_TC_CPCSTOP          (0x1 <<  6) // (TC) Counter Clock Stopped with RC Compare
-#define AT91C_TC_CPCDIS           (0x1 <<  7) // (TC) Counter Clock Disable with RC Compare
-#define AT91C_TC_EEVTEDG          (0x3 <<  8) // (TC) External Event Edge Selection
-#define 	AT91C_TC_EEVTEDG_NONE                 (0x0 <<  8) // (TC) Edge: None
-#define 	AT91C_TC_EEVTEDG_RISING               (0x1 <<  8) // (TC) Edge: rising edge
-#define 	AT91C_TC_EEVTEDG_FALLING              (0x2 <<  8) // (TC) Edge: falling edge
-#define 	AT91C_TC_EEVTEDG_BOTH                 (0x3 <<  8) // (TC) Edge: each edge
-#define AT91C_TC_EEVT             (0x3 << 10) // (TC) External Event  Selection
-#define 	AT91C_TC_EEVT_NONE                 (0x0 << 10) // (TC) Signal selected as external event: TIOB TIOB direction: input
-#define 	AT91C_TC_EEVT_RISING               (0x1 << 10) // (TC) Signal selected as external event: XC0 TIOB direction: output
-#define 	AT91C_TC_EEVT_FALLING              (0x2 << 10) // (TC) Signal selected as external event: XC1 TIOB direction: output
-#define 	AT91C_TC_EEVT_BOTH                 (0x3 << 10) // (TC) Signal selected as external event: XC2 TIOB direction: output
-#define AT91C_TC_ENETRG           (0x1 << 12) // (TC) External Event Trigger enable
-#define AT91C_TC_WAVESEL          (0x3 << 13) // (TC) Waveform  Selection
-#define 	AT91C_TC_WAVESEL_UP                   (0x0 << 13) // (TC) UP mode without atomatic trigger on RC Compare
-#define 	AT91C_TC_WAVESEL_UPDOWN               (0x1 << 13) // (TC) UPDOWN mode without automatic trigger on RC Compare
-#define 	AT91C_TC_WAVESEL_UP_AUTO              (0x2 << 13) // (TC) UP mode with automatic trigger on RC Compare
-#define 	AT91C_TC_WAVESEL_UPDOWN_AUTO          (0x3 << 13) // (TC) UPDOWN mode with automatic trigger on RC Compare
-#define AT91C_TC_CPCTRG           (0x1 << 14) // (TC) RC Compare Trigger Enable
-#define AT91C_TC_WAVE             (0x1 << 15) // (TC) 
-#define AT91C_TC_ACPA             (0x3 << 16) // (TC) RA Compare Effect on TIOA
-#define 	AT91C_TC_ACPA_NONE                 (0x0 << 16) // (TC) Effect: none
-#define 	AT91C_TC_ACPA_SET                  (0x1 << 16) // (TC) Effect: set
-#define 	AT91C_TC_ACPA_CLEAR                (0x2 << 16) // (TC) Effect: clear
-#define 	AT91C_TC_ACPA_TOGGLE               (0x3 << 16) // (TC) Effect: toggle
-#define AT91C_TC_ACPC             (0x3 << 18) // (TC) RC Compare Effect on TIOA
-#define 	AT91C_TC_ACPC_NONE                 (0x0 << 18) // (TC) Effect: none
-#define 	AT91C_TC_ACPC_SET                  (0x1 << 18) // (TC) Effect: set
-#define 	AT91C_TC_ACPC_CLEAR                (0x2 << 18) // (TC) Effect: clear
-#define 	AT91C_TC_ACPC_TOGGLE               (0x3 << 18) // (TC) Effect: toggle
-#define AT91C_TC_AEEVT            (0x3 << 20) // (TC) External Event Effect on TIOA
-#define 	AT91C_TC_AEEVT_NONE                 (0x0 << 20) // (TC) Effect: none
-#define 	AT91C_TC_AEEVT_SET                  (0x1 << 20) // (TC) Effect: set
-#define 	AT91C_TC_AEEVT_CLEAR                (0x2 << 20) // (TC) Effect: clear
-#define 	AT91C_TC_AEEVT_TOGGLE               (0x3 << 20) // (TC) Effect: toggle
-#define AT91C_TC_ASWTRG           (0x3 << 22) // (TC) Software Trigger Effect on TIOA
-#define 	AT91C_TC_ASWTRG_NONE                 (0x0 << 22) // (TC) Effect: none
-#define 	AT91C_TC_ASWTRG_SET                  (0x1 << 22) // (TC) Effect: set
-#define 	AT91C_TC_ASWTRG_CLEAR                (0x2 << 22) // (TC) Effect: clear
-#define 	AT91C_TC_ASWTRG_TOGGLE               (0x3 << 22) // (TC) Effect: toggle
-#define AT91C_TC_BCPB             (0x3 << 24) // (TC) RB Compare Effect on TIOB
-#define 	AT91C_TC_BCPB_NONE                 (0x0 << 24) // (TC) Effect: none
-#define 	AT91C_TC_BCPB_SET                  (0x1 << 24) // (TC) Effect: set
-#define 	AT91C_TC_BCPB_CLEAR                (0x2 << 24) // (TC) Effect: clear
-#define 	AT91C_TC_BCPB_TOGGLE               (0x3 << 24) // (TC) Effect: toggle
-#define AT91C_TC_BCPC             (0x3 << 26) // (TC) RC Compare Effect on TIOB
-#define 	AT91C_TC_BCPC_NONE                 (0x0 << 26) // (TC) Effect: none
-#define 	AT91C_TC_BCPC_SET                  (0x1 << 26) // (TC) Effect: set
-#define 	AT91C_TC_BCPC_CLEAR                (0x2 << 26) // (TC) Effect: clear
-#define 	AT91C_TC_BCPC_TOGGLE               (0x3 << 26) // (TC) Effect: toggle
-#define AT91C_TC_BEEVT            (0x3 << 28) // (TC) External Event Effect on TIOB
-#define 	AT91C_TC_BEEVT_NONE                 (0x0 << 28) // (TC) Effect: none
-#define 	AT91C_TC_BEEVT_SET                  (0x1 << 28) // (TC) Effect: set
-#define 	AT91C_TC_BEEVT_CLEAR                (0x2 << 28) // (TC) Effect: clear
-#define 	AT91C_TC_BEEVT_TOGGLE               (0x3 << 28) // (TC) Effect: toggle
-#define AT91C_TC_BSWTRG           (0x3 << 30) // (TC) Software Trigger Effect on TIOB
-#define 	AT91C_TC_BSWTRG_NONE                 (0x0 << 30) // (TC) Effect: none
-#define 	AT91C_TC_BSWTRG_SET                  (0x1 << 30) // (TC) Effect: set
-#define 	AT91C_TC_BSWTRG_CLEAR                (0x2 << 30) // (TC) Effect: clear
-#define 	AT91C_TC_BSWTRG_TOGGLE               (0x3 << 30) // (TC) Effect: toggle
-// -------- TC_SR : (TC Offset: 0x20) TC Channel Status Register -------- 
-#define AT91C_TC_COVFS            (0x1 <<  0) // (TC) Counter Overflow
-#define AT91C_TC_LOVRS            (0x1 <<  1) // (TC) Load Overrun
-#define AT91C_TC_CPAS             (0x1 <<  2) // (TC) RA Compare
-#define AT91C_TC_CPBS             (0x1 <<  3) // (TC) RB Compare
-#define AT91C_TC_CPCS             (0x1 <<  4) // (TC) RC Compare
-#define AT91C_TC_LDRAS            (0x1 <<  5) // (TC) RA Loading
-#define AT91C_TC_LDRBS            (0x1 <<  6) // (TC) RB Loading
-#define AT91C_TC_ETRCS            (0x1 <<  7) // (TC) External Trigger
-#define AT91C_TC_ETRGS            (0x1 << 16) // (TC) Clock Enabling
-#define AT91C_TC_MTIOA            (0x1 << 17) // (TC) TIOA Mirror
-#define AT91C_TC_MTIOB            (0x1 << 18) // (TC) TIOA Mirror
-// -------- TC_IER : (TC Offset: 0x24) TC Channel Interrupt Enable Register -------- 
-// -------- TC_IDR : (TC Offset: 0x28) TC Channel Interrupt Disable Register -------- 
-// -------- TC_IMR : (TC Offset: 0x2c) TC Channel Interrupt Mask Register -------- 
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR Timer Counter Interface
-// *****************************************************************************
-// *** Register offset in AT91S_TCB structure ***
-#define TCB_TC0         ( 0) // TC Channel 0
-#define TCB_TC1         (64) // TC Channel 1
-#define TCB_TC2         (128) // TC Channel 2
-#define TCB_BCR         (192) // TC Block Control Register
-#define TCB_BMR         (196) // TC Block Mode Register
-// -------- TCB_BCR : (TCB Offset: 0xc0) TC Block Control Register -------- 
-#define AT91C_TCB_SYNC            (0x1 <<  0) // (TCB) Synchro Command
-// -------- TCB_BMR : (TCB Offset: 0xc4) TC Block Mode Register -------- 
-#define AT91C_TCB_TC0XC0S         (0x1 <<  0) // (TCB) External Clock Signal 0 Selection
-#define 	AT91C_TCB_TC0XC0S_TCLK0                (0x0) // (TCB) TCLK0 connected to XC0
-#define 	AT91C_TCB_TC0XC0S_NONE                 (0x1) // (TCB) None signal connected to XC0
-#define 	AT91C_TCB_TC0XC0S_TIOA1                (0x2) // (TCB) TIOA1 connected to XC0
-#define 	AT91C_TCB_TC0XC0S_TIOA2                (0x3) // (TCB) TIOA2 connected to XC0
-#define AT91C_TCB_TC1XC1S         (0x1 <<  2) // (TCB) External Clock Signal 1 Selection
-#define 	AT91C_TCB_TC1XC1S_TCLK1                (0x0 <<  2) // (TCB) TCLK1 connected to XC1
-#define 	AT91C_TCB_TC1XC1S_NONE                 (0x1 <<  2) // (TCB) None signal connected to XC1
-#define 	AT91C_TCB_TC1XC1S_TIOA0                (0x2 <<  2) // (TCB) TIOA0 connected to XC1
-#define 	AT91C_TCB_TC1XC1S_TIOA2                (0x3 <<  2) // (TCB) TIOA2 connected to XC1
-#define AT91C_TCB_TC2XC2S         (0x1 <<  4) // (TCB) External Clock Signal 2 Selection
-#define 	AT91C_TCB_TC2XC2S_TCLK2                (0x0 <<  4) // (TCB) TCLK2 connected to XC2
-#define 	AT91C_TCB_TC2XC2S_NONE                 (0x1 <<  4) // (TCB) None signal connected to XC2
-#define 	AT91C_TCB_TC2XC2S_TIOA0                (0x2 <<  4) // (TCB) TIOA0 connected to XC2
-#define 	AT91C_TCB_TC2XC2S_TIOA2                (0x3 <<  4) // (TCB) TIOA2 connected to XC2
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR USB Host Interface
-// *****************************************************************************
-// *** Register offset in AT91S_UHP structure ***
-#define UHP_HcRevision  ( 0) // Revision
-#define UHP_HcControl   ( 4) // Operating modes for the Host Controller
-#define UHP_HcCommandStatus ( 8) // Command & status Register
-#define UHP_HcInterruptStatus (12) // Interrupt Status Register
-#define UHP_HcInterruptEnable (16) // Interrupt Enable Register
-#define UHP_HcInterruptDisable (20) // Interrupt Disable Register
-#define UHP_HcHCCA      (24) // Pointer to the Host Controller Communication Area
-#define UHP_HcPeriodCurrentED (28) // Current Isochronous or Interrupt Endpoint Descriptor
-#define UHP_HcControlHeadED (32) // First Endpoint Descriptor of the Control list
-#define UHP_HcControlCurrentED (36) // Endpoint Control and Status Register
-#define UHP_HcBulkHeadED (40) // First endpoint register of the Bulk list
-#define UHP_HcBulkCurrentED (44) // Current endpoint of the Bulk list
-#define UHP_HcBulkDoneHead (48) // Last completed transfer descriptor
-#define UHP_HcFmInterval (52) // Bit time between 2 consecutive SOFs
-#define UHP_HcFmRemaining (56) // Bit time remaining in the current Frame
-#define UHP_HcFmNumber  (60) // Frame number
-#define UHP_HcPeriodicStart (64) // Periodic Start
-#define UHP_HcLSThreshold (68) // LS Threshold
-#define UHP_HcRhDescriptorA (72) // Root Hub characteristics A
-#define UHP_HcRhDescriptorB (76) // Root Hub characteristics B
-#define UHP_HcRhStatus  (80) // Root Hub Status register
-#define UHP_HcRhPortStatus (84) // Root Hub Port Status Register
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR Ethernet MAC
-// *****************************************************************************
-// *** Register offset in AT91S_EMAC structure ***
-#define EMAC_CTL        ( 0) // Network Control Register
-#define EMAC_CFG        ( 4) // Network Configuration Register
-#define EMAC_SR         ( 8) // Network Status Register
-#define EMAC_TAR        (12) // Transmit Address Register
-#define EMAC_TCR        (16) // Transmit Control Register
-#define EMAC_TSR        (20) // Transmit Status Register
-#define EMAC_RBQP       (24) // Receive Buffer Queue Pointer
-#define EMAC_RSR        (32) // Receive Status Register
-#define EMAC_ISR        (36) // Interrupt Status Register
-#define EMAC_IER        (40) // Interrupt Enable Register
-#define EMAC_IDR        (44) // Interrupt Disable Register
-#define EMAC_IMR        (48) // Interrupt Mask Register
-#define EMAC_MAN        (52) // PHY Maintenance Register
-#define EMAC_FRA        (64) // Frames Transmitted OK Register
-#define EMAC_SCOL       (68) // Single Collision Frame Register
-#define EMAC_MCOL       (72) // Multiple Collision Frame Register
-#define EMAC_OK         (76) // Frames Received OK Register
-#define EMAC_SEQE       (80) // Frame Check Sequence Error Register
-#define EMAC_ALE        (84) // Alignment Error Register
-#define EMAC_DTE        (88) // Deferred Transmission Frame Register
-#define EMAC_LCOL       (92) // Late Collision Register
-#define EMAC_ECOL       (96) // Excessive Collision Register
-#define EMAC_CSE        (100) // Carrier Sense Error Register
-#define EMAC_TUE        (104) // Transmit Underrun Error Register
-#define EMAC_CDE        (108) // Code Error Register
-#define EMAC_ELR        (112) // Excessive Length Error Register
-#define EMAC_RJB        (116) // Receive Jabber Register
-#define EMAC_USF        (120) // Undersize Frame Register
-#define EMAC_SQEE       (124) // SQE Test Error Register
-#define EMAC_DRFC       (128) // Discarded RX Frame Register
-#define EMAC_HSH        (144) // Hash Address High[63:32]
-#define EMAC_HSL        (148) // Hash Address Low[31:0]
-#define EMAC_SA1L       (152) // Specific Address 1 Low, First 4 bytes
-#define EMAC_SA1H       (156) // Specific Address 1 High, Last 2 bytes
-#define EMAC_SA2L       (160) // Specific Address 2 Low, First 4 bytes
-#define EMAC_SA2H       (164) // Specific Address 2 High, Last 2 bytes
-#define EMAC_SA3L       (168) // Specific Address 3 Low, First 4 bytes
-#define EMAC_SA3H       (172) // Specific Address 3 High, Last 2 bytes
-#define EMAC_SA4L       (176) // Specific Address 4 Low, First 4 bytes
-#define EMAC_SA4H       (180) // Specific Address 4 High, Last 2 bytesr
-// -------- EMAC_CTL : (EMAC Offset: 0x0)  -------- 
-#define AT91C_EMAC_LB             (0x1 <<  0) // (EMAC) Loopback. Optional. When set, loopback signal is at high level.
-#define AT91C_EMAC_LBL            (0x1 <<  1) // (EMAC) Loopback local. 
-#define AT91C_EMAC_RE             (0x1 <<  2) // (EMAC) Receive enable. 
-#define AT91C_EMAC_TE             (0x1 <<  3) // (EMAC) Transmit enable. 
-#define AT91C_EMAC_MPE            (0x1 <<  4) // (EMAC) Management port enable. 
-#define AT91C_EMAC_CSR            (0x1 <<  5) // (EMAC) Clear statistics registers. 
-#define AT91C_EMAC_ISR            (0x1 <<  6) // (EMAC) Increment statistics registers. 
-#define AT91C_EMAC_WES            (0x1 <<  7) // (EMAC) Write enable for statistics registers. 
-#define AT91C_EMAC_BP             (0x1 <<  8) // (EMAC) Back pressure. 
-// -------- EMAC_CFG : (EMAC Offset: 0x4) Network Configuration Register -------- 
-#define AT91C_EMAC_SPD            (0x1 <<  0) // (EMAC) Speed. 
-#define AT91C_EMAC_FD             (0x1 <<  1) // (EMAC) Full duplex. 
-#define AT91C_EMAC_BR             (0x1 <<  2) // (EMAC) Bit rate. 
-#define AT91C_EMAC_CAF            (0x1 <<  4) // (EMAC) Copy all frames. 
-#define AT91C_EMAC_NBC            (0x1 <<  5) // (EMAC) No broadcast. 
-#define AT91C_EMAC_MTI            (0x1 <<  6) // (EMAC) Multicast hash enable
-#define AT91C_EMAC_UNI            (0x1 <<  7) // (EMAC) Unicast hash enable. 
-#define AT91C_EMAC_BIG            (0x1 <<  8) // (EMAC) Receive 1522 bytes. 
-#define AT91C_EMAC_EAE            (0x1 <<  9) // (EMAC) External address match enable. 
-#define AT91C_EMAC_CLK            (0x3 << 10) // (EMAC) 
-#define 	AT91C_EMAC_CLK_HCLK_8               (0x0 << 10) // (EMAC) HCLK divided by 8
-#define 	AT91C_EMAC_CLK_HCLK_16              (0x1 << 10) // (EMAC) HCLK divided by 16
-#define 	AT91C_EMAC_CLK_HCLK_32              (0x2 << 10) // (EMAC) HCLK divided by 32
-#define 	AT91C_EMAC_CLK_HCLK_64              (0x3 << 10) // (EMAC) HCLK divided by 64
-#define AT91C_EMAC_RTY            (0x1 << 12) // (EMAC) 
-#define AT91C_EMAC_RMII           (0x1 << 13) // (EMAC) 
-// -------- EMAC_SR : (EMAC Offset: 0x8) Network Status Register -------- 
-#define AT91C_EMAC_MDIO           (0x1 <<  1) // (EMAC) 
-#define AT91C_EMAC_IDLE           (0x1 <<  2) // (EMAC) 
-// -------- EMAC_TCR : (EMAC Offset: 0x10) Transmit Control Register -------- 
-#define AT91C_EMAC_LEN            (0x7FF <<  0) // (EMAC) 
-#define AT91C_EMAC_NCRC           (0x1 << 15) // (EMAC) 
-// -------- EMAC_TSR : (EMAC Offset: 0x14) Transmit Control Register -------- 
-#define AT91C_EMAC_OVR            (0x1 <<  0) // (EMAC) 
-#define AT91C_EMAC_COL            (0x1 <<  1) // (EMAC) 
-#define AT91C_EMAC_RLE            (0x1 <<  2) // (EMAC) 
-#define AT91C_EMAC_TXIDLE         (0x1 <<  3) // (EMAC) 
-#define AT91C_EMAC_BNQ            (0x1 <<  4) // (EMAC) 
-#define AT91C_EMAC_COMP           (0x1 <<  5) // (EMAC) 
-#define AT91C_EMAC_UND            (0x1 <<  6) // (EMAC) 
-// -------- EMAC_RSR : (EMAC Offset: 0x20) Receive Status Register -------- 
-#define AT91C_EMAC_BNA            (0x1 <<  0) // (EMAC) 
-#define AT91C_EMAC_REC            (0x1 <<  1) // (EMAC) 
-// -------- EMAC_ISR : (EMAC Offset: 0x24) Interrupt Status Register -------- 
-#define AT91C_EMAC_DONE           (0x1 <<  0) // (EMAC) 
-#define AT91C_EMAC_RCOM           (0x1 <<  1) // (EMAC) 
-#define AT91C_EMAC_RBNA           (0x1 <<  2) // (EMAC) 
-#define AT91C_EMAC_TOVR           (0x1 <<  3) // (EMAC) 
-#define AT91C_EMAC_TUND           (0x1 <<  4) // (EMAC) 
-#define AT91C_EMAC_RTRY           (0x1 <<  5) // (EMAC) 
-#define AT91C_EMAC_TBRE           (0x1 <<  6) // (EMAC) 
-#define AT91C_EMAC_TCOM           (0x1 <<  7) // (EMAC) 
-#define AT91C_EMAC_TIDLE          (0x1 <<  8) // (EMAC) 
-#define AT91C_EMAC_LINK           (0x1 <<  9) // (EMAC) 
-#define AT91C_EMAC_ROVR           (0x1 << 10) // (EMAC) 
-#define AT91C_EMAC_HRESP          (0x1 << 11) // (EMAC) 
-// -------- EMAC_IER : (EMAC Offset: 0x28) Interrupt Enable Register -------- 
-// -------- EMAC_IDR : (EMAC Offset: 0x2c) Interrupt Disable Register -------- 
-// -------- EMAC_IMR : (EMAC Offset: 0x30) Interrupt Mask Register -------- 
-// -------- EMAC_MAN : (EMAC Offset: 0x34) PHY Maintenance Register -------- 
-#define AT91C_EMAC_DATA           (0xFFFF <<  0) // (EMAC) 
-#define AT91C_EMAC_CODE           (0x3 << 16) // (EMAC) 
-#define AT91C_EMAC_REGA           (0x1F << 18) // (EMAC) 
-#define AT91C_EMAC_PHYA           (0x1F << 23) // (EMAC) 
-#define AT91C_EMAC_RW             (0x3 << 28) // (EMAC) 
-#define AT91C_EMAC_HIGH           (0x1 << 30) // (EMAC) 
-#define AT91C_EMAC_LOW            (0x1 << 31) // (EMAC) 
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR External Bus Interface
-// *****************************************************************************
-// *** Register offset in AT91S_EBI structure ***
-#define EBI_CSA         ( 0) // Chip Select Assignment Register
-#define EBI_CFGR        ( 4) // Configuration Register
-// -------- EBI_CSA : (EBI Offset: 0x0) Chip Select Assignment Register -------- 
-#define AT91C_EBI_CS0A            (0x1 <<  0) // (EBI) Chip Select 0 Assignment
-#define 	AT91C_EBI_CS0A_SMC                  (0x0) // (EBI) Chip Select 0 is assigned to the Static Memory Controller.
-#define 	AT91C_EBI_CS0A_BFC                  (0x1) // (EBI) Chip Select 0 is assigned to the Burst Flash Controller.
-#define AT91C_EBI_CS1A            (0x1 <<  1) // (EBI) Chip Select 1 Assignment
-#define 	AT91C_EBI_CS1A_SMC                  (0x0 <<  1) // (EBI) Chip Select 1 is assigned to the Static Memory Controller.
-#define 	AT91C_EBI_CS1A_SDRAMC               (0x1 <<  1) // (EBI) Chip Select 1 is assigned to the SDRAM Controller.
-#define AT91C_EBI_CS3A            (0x1 <<  3) // (EBI) Chip Select 3 Assignment
-#define 	AT91C_EBI_CS3A_SMC                  (0x0 <<  3) // (EBI) Chip Select 3 is only assigned to the Static Memory Controller and NCS3 behaves as defined by the SMC2.
-#define 	AT91C_EBI_CS3A_SMC_SmartMedia       (0x1 <<  3) // (EBI) Chip Select 3 is assigned to the Static Memory Controller and the SmartMedia Logic is activated.
-#define AT91C_EBI_CS4A            (0x1 <<  4) // (EBI) Chip Select 4 Assignment
-#define 	AT91C_EBI_CS4A_SMC                  (0x0 <<  4) // (EBI) Chip Select 4 is assigned to the Static Memory Controller and NCS4,NCS5 and NCS6 behave as defined by the SMC2.
-#define 	AT91C_EBI_CS4A_SMC_CompactFlash     (0x1 <<  4) // (EBI) Chip Select 4 is assigned to the Static Memory Controller and the CompactFlash Logic is activated.
-// -------- EBI_CFGR : (EBI Offset: 0x4) Configuration Register -------- 
-#define AT91C_EBI_DBPUC           (0x1 <<  0) // (EBI) Data Bus Pull-Up Configuration
-#define AT91C_EBI_EBSEN           (0x1 <<  1) // (EBI) Bus Sharing Enable
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR Static Memory Controller 2 Interface
-// *****************************************************************************
-// *** Register offset in AT91S_SMC2 structure ***
-#define SMC2_CSR        ( 0) // SMC2 Chip Select Register
-// -------- SMC2_CSR : (SMC2 Offset: 0x0) SMC2 Chip Select Register -------- 
-#define AT91C_SMC2_NWS            (0x7F <<  0) // (SMC2) Number of Wait States
-#define AT91C_SMC2_WSEN           (0x1 <<  7) // (SMC2) Wait State Enable
-#define AT91C_SMC2_TDF            (0xF <<  8) // (SMC2) Data Float Time
-#define AT91C_SMC2_BAT            (0x1 << 12) // (SMC2) Byte Access Type
-#define AT91C_SMC2_DBW            (0x1 << 13) // (SMC2) Data Bus Width
-#define 	AT91C_SMC2_DBW_16                   (0x1 << 13) // (SMC2) 16-bit.
-#define 	AT91C_SMC2_DBW_8                    (0x2 << 13) // (SMC2) 8-bit.
-#define AT91C_SMC2_DRP            (0x1 << 15) // (SMC2) Data Read Protocol
-#define AT91C_SMC2_ACSS           (0x3 << 16) // (SMC2) Address to Chip Select Setup
-#define 	AT91C_SMC2_ACSS_STANDARD             (0x0 << 16) // (SMC2) Standard, asserted at the beginning of the access and deasserted at the end.
-#define 	AT91C_SMC2_ACSS_1_CYCLE              (0x1 << 16) // (SMC2) One cycle less at the beginning and the end of the access.
-#define 	AT91C_SMC2_ACSS_2_CYCLES             (0x2 << 16) // (SMC2) Two cycles less at the beginning and the end of the access.
-#define 	AT91C_SMC2_ACSS_3_CYCLES             (0x3 << 16) // (SMC2) Three cycles less at the beginning and the end of the access.
-#define AT91C_SMC2_RWSETUP        (0x7 << 24) // (SMC2) Read and Write Signal Setup Time
-#define AT91C_SMC2_RWHOLD         (0x7 << 29) // (SMC2) Read and Write Signal Hold Time
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR SDRAM Controller Interface
-// *****************************************************************************
-// *** Register offset in AT91S_SDRC structure ***
-#define SDRC_MR         ( 0) // SDRAM Controller Mode Register
-#define SDRC_TR         ( 4) // SDRAM Controller Refresh Timer Register
-#define SDRC_CR         ( 8) // SDRAM Controller Configuration Register
-#define SDRC_SRR        (12) // SDRAM Controller Self Refresh Register
-#define SDRC_LPR        (16) // SDRAM Controller Low Power Register
-#define SDRC_IER        (20) // SDRAM Controller Interrupt Enable Register
-#define SDRC_IDR        (24) // SDRAM Controller Interrupt Disable Register
-#define SDRC_IMR        (28) // SDRAM Controller Interrupt Mask Register
-#define SDRC_ISR        (32) // SDRAM Controller Interrupt Mask Register
-// -------- SDRC_MR : (SDRC Offset: 0x0) SDRAM Controller Mode Register -------- 
-#define AT91C_SDRC_MODE           (0xF <<  0) // (SDRC) Mode
-#define 	AT91C_SDRC_MODE_NORMAL_CMD           (0x0) // (SDRC) Normal Mode
-#define 	AT91C_SDRC_MODE_NOP_CMD              (0x1) // (SDRC) NOP Command
-#define 	AT91C_SDRC_MODE_PRCGALL_CMD          (0x2) // (SDRC) All Banks Precharge Command
-#define 	AT91C_SDRC_MODE_LMR_CMD              (0x3) // (SDRC) Load Mode Register Command
-#define 	AT91C_SDRC_MODE_RFSH_CMD             (0x4) // (SDRC) Refresh Command
-#define AT91C_SDRC_DBW            (0x1 <<  4) // (SDRC) Data Bus Width
-#define 	AT91C_SDRC_DBW_32_BITS              (0x0 <<  4) // (SDRC) 32 Bits datas bus
-#define 	AT91C_SDRC_DBW_16_BITS              (0x1 <<  4) // (SDRC) 16 Bits datas bus
-// -------- SDRC_TR : (SDRC Offset: 0x4) SDRC Refresh Timer Register -------- 
-#define AT91C_SDRC_COUNT          (0xFFF <<  0) // (SDRC) Refresh Counter
-// -------- SDRC_CR : (SDRC Offset: 0x8) SDRAM Configuration Register -------- 
-#define AT91C_SDRC_NC             (0x3 <<  0) // (SDRC) Number of Column Bits
-#define 	AT91C_SDRC_NC_8                    (0x0) // (SDRC) 8 Bits
-#define 	AT91C_SDRC_NC_9                    (0x1) // (SDRC) 9 Bits
-#define 	AT91C_SDRC_NC_10                   (0x2) // (SDRC) 10 Bits
-#define 	AT91C_SDRC_NC_11                   (0x3) // (SDRC) 11 Bits
-#define AT91C_SDRC_NR             (0x3 <<  2) // (SDRC) Number of Row Bits
-#define 	AT91C_SDRC_NR_11                   (0x0 <<  2) // (SDRC) 11 Bits
-#define 	AT91C_SDRC_NR_12                   (0x1 <<  2) // (SDRC) 12 Bits
-#define 	AT91C_SDRC_NR_13                   (0x2 <<  2) // (SDRC) 13 Bits
-#define AT91C_SDRC_NB             (0x1 <<  4) // (SDRC) Number of Banks
-#define 	AT91C_SDRC_NB_2_BANKS              (0x0 <<  4) // (SDRC) 2 banks
-#define 	AT91C_SDRC_NB_4_BANKS              (0x1 <<  4) // (SDRC) 4 banks
-#define AT91C_SDRC_CAS            (0x3 <<  5) // (SDRC) CAS Latency
-#define 	AT91C_SDRC_CAS_2                    (0x2 <<  5) // (SDRC) 2 cycles
-#define AT91C_SDRC_TWR            (0xF <<  7) // (SDRC) Number of Write Recovery Time Cycles
-#define AT91C_SDRC_TRC            (0xF << 11) // (SDRC) Number of RAS Cycle Time Cycles
-#define AT91C_SDRC_TRP            (0xF << 15) // (SDRC) Number of RAS Precharge Time Cycles
-#define AT91C_SDRC_TRCD           (0xF << 19) // (SDRC) Number of RAS to CAS Delay Cycles
-#define AT91C_SDRC_TRAS           (0xF << 23) // (SDRC) Number of RAS Active Time Cycles
-#define AT91C_SDRC_TXSR           (0xF << 27) // (SDRC) Number of Command Recovery Time Cycles
-// -------- SDRC_SRR : (SDRC Offset: 0xc) SDRAM Controller Self-refresh Register -------- 
-#define AT91C_SDRC_SRCB           (0x1 <<  0) // (SDRC) Self-refresh Command Bit
-// -------- SDRC_LPR : (SDRC Offset: 0x10) SDRAM Controller Low-power Register -------- 
-#define AT91C_SDRC_LPCB           (0x1 <<  0) // (SDRC) Low-power Command Bit
-// -------- SDRC_IER : (SDRC Offset: 0x14) SDRAM Controller Interrupt Enable Register -------- 
-#define AT91C_SDRC_RES            (0x1 <<  0) // (SDRC) Refresh Error Status
-// -------- SDRC_IDR : (SDRC Offset: 0x18) SDRAM Controller Interrupt Disable Register -------- 
-// -------- SDRC_IMR : (SDRC Offset: 0x1c) SDRAM Controller Interrupt Mask Register -------- 
-// -------- SDRC_ISR : (SDRC Offset: 0x20) SDRAM Controller Interrupt Status Register -------- 
-
-// *****************************************************************************
-//              SOFTWARE API DEFINITION  FOR Burst Flash Controller Interface
-// *****************************************************************************
-// *** Register offset in AT91S_BFC structure ***
-#define BFC_MR          ( 0) // BFC Mode Register
-// -------- BFC_MR : (BFC Offset: 0x0) BFC Mode Register -------- 
-#define AT91C_BFC_BFCOM           (0x3 <<  0) // (BFC) Burst Flash Controller Operating Mode
-#define 	AT91C_BFC_BFCOM_DISABLED             (0x0) // (BFC) NPCS0 is driven by the SMC or remains high.
-#define 	AT91C_BFC_BFCOM_ASYNC                (0x1) // (BFC) Asynchronous
-#define 	AT91C_BFC_BFCOM_BURST_READ           (0x2) // (BFC) Burst Read
-#define AT91C_BFC_BFCC            (0x3 <<  2) // (BFC) Burst Flash Controller Operating Mode
-#define 	AT91C_BFC_BFCC_MCK                  (0x1 <<  2) // (BFC) Master Clock.
-#define 	AT91C_BFC_BFCC_MCK_DIV_2            (0x2 <<  2) // (BFC) Master Clock divided by 2.
-#define 	AT91C_BFC_BFCC_MCK_DIV_4            (0x3 <<  2) // (BFC) Master Clock divided by 4.
-#define AT91C_BFC_AVL             (0xF <<  4) // (BFC) Address Valid Latency
-#define AT91C_BFC_PAGES           (0x7 <<  8) // (BFC) Page Size
-#define 	AT91C_BFC_PAGES_NO_PAGE              (0x0 <<  8) // (BFC) No page handling.
-#define 	AT91C_BFC_PAGES_16                   (0x1 <<  8) // (BFC) 16 bytes page size.
-#define 	AT91C_BFC_PAGES_32                   (0x2 <<  8) // (BFC) 32 bytes page size.
-#define 	AT91C_BFC_PAGES_64                   (0x3 <<  8) // (BFC) 64 bytes page size.
-#define 	AT91C_BFC_PAGES_128                  (0x4 <<  8) // (BFC) 128 bytes page size.
-#define 	AT91C_BFC_PAGES_256                  (0x5 <<  8) // (BFC) 256 bytes page size.
-#define 	AT91C_BFC_PAGES_512                  (0x6 <<  8) // (BFC) 512 bytes page size.
-#define 	AT91C_BFC_PAGES_1024                 (0x7 <<  8) // (BFC) 1024 bytes page size.
-#define AT91C_BFC_OEL             (0x3 << 12) // (BFC) Output Enable Latency
-#define AT91C_BFC_BAAEN           (0x1 << 16) // (BFC) Burst Address Advance Enable
-#define AT91C_BFC_BFOEH           (0x1 << 17) // (BFC) Burst Flash Output Enable Handling
-#define AT91C_BFC_MUXEN           (0x1 << 18) // (BFC) Multiplexed Bus Enable
-#define AT91C_BFC_RDYEN           (0x1 << 19) // (BFC) Ready Enable Mode
-
-// *****************************************************************************
-//               REGISTER ADDRESS DEFINITION FOR AT91RM9200
-// *****************************************************************************
-// ========== Register definition for SYS peripheral ========== 
-// ========== Register definition for MC peripheral ========== 
-#define AT91C_MC_PUER             (0xFFFFFF54) // (MC) MC Protection Unit Enable Register
-#define AT91C_MC_ASR              (0xFFFFFF04) // (MC) MC Abort Status Register
-#define AT91C_MC_PUP              (0xFFFFFF50) // (MC) MC Protection Unit Peripherals
-#define AT91C_MC_PUIA             (0xFFFFFF10) // (MC) MC Protection Unit Area
-#define AT91C_MC_AASR             (0xFFFFFF08) // (MC) MC Abort Address Status Register
-#define AT91C_MC_RCR              (0xFFFFFF00) // (MC) MC Remap Control Register
-// ========== Register definition for RTC peripheral ========== 
-#define AT91C_RTC_IMR             (0xFFFFFE28) // (RTC) Interrupt Mask Register
-#define AT91C_RTC_IER             (0xFFFFFE20) // (RTC) Interrupt Enable Register
-#define AT91C_RTC_SR              (0xFFFFFE18) // (RTC) Status Register
-#define AT91C_RTC_TIMALR          (0xFFFFFE10) // (RTC) Time Alarm Register
-#define AT91C_RTC_TIMR            (0xFFFFFE08) // (RTC) Time Register
-#define AT91C_RTC_CR              (0xFFFFFE00) // (RTC) Control Register
-#define AT91C_RTC_VER             (0xFFFFFE2C) // (RTC) Valid Entry Register
-#define AT91C_RTC_IDR             (0xFFFFFE24) // (RTC) Interrupt Disable Register
-#define AT91C_RTC_SCCR            (0xFFFFFE1C) // (RTC) Status Clear Command Register
-#define AT91C_RTC_CALALR          (0xFFFFFE14) // (RTC) Calendar Alarm Register
-#define AT91C_RTC_CALR            (0xFFFFFE0C) // (RTC) Calendar Register
-#define AT91C_RTC_MR              (0xFFFFFE04) // (RTC) Mode Register
-// ========== Register definition for ST peripheral ========== 
-#define AT91C_ST_CRTR             (0xFFFFFD24) // (ST) Current Real-time Register
-#define AT91C_ST_IMR              (0xFFFFFD1C) // (ST) Interrupt Mask Register
-#define AT91C_ST_IER              (0xFFFFFD14) // (ST) Interrupt Enable Register
-#define AT91C_ST_RTMR             (0xFFFFFD0C) // (ST) Real-time Mode Register
-#define AT91C_ST_PIMR             (0xFFFFFD04) // (ST) Period Interval Mode Register
-#define AT91C_ST_RTAR             (0xFFFFFD20) // (ST) Real-time Alarm Register
-#define AT91C_ST_IDR              (0xFFFFFD18) // (ST) Interrupt Disable Register
-#define AT91C_ST_SR               (0xFFFFFD10) // (ST) Status Register
-#define AT91C_ST_WDMR             (0xFFFFFD08) // (ST) Watchdog Mode Register
-#define AT91C_ST_CR               (0xFFFFFD00) // (ST) Control Register
-// ========== Register definition for PMC peripheral ========== 
-#define AT91C_PMC_SCSR            (0xFFFFFC08) // (PMC) System Clock Status Register
-#define AT91C_PMC_SCER            (0xFFFFFC00) // (PMC) System Clock Enable Register
-#define AT91C_PMC_IMR             (0xFFFFFC6C) // (PMC) Interrupt Mask Register
-#define AT91C_PMC_IDR             (0xFFFFFC64) // (PMC) Interrupt Disable Register
-#define AT91C_PMC_PCDR            (0xFFFFFC14) // (PMC) Peripheral Clock Disable Register
-#define AT91C_PMC_SCDR            (0xFFFFFC04) // (PMC) System Clock Disable Register
-#define AT91C_PMC_SR              (0xFFFFFC68) // (PMC) Status Register
-#define AT91C_PMC_IER             (0xFFFFFC60) // (PMC) Interrupt Enable Register
-#define AT91C_PMC_MCKR            (0xFFFFFC30) // (PMC) Master Clock Register
-#define AT91C_PMC_PCER            (0xFFFFFC10) // (PMC) Peripheral Clock Enable Register
-#define AT91C_PMC_PCSR            (0xFFFFFC18) // (PMC) Peripheral Clock Status Register
-#define AT91C_PMC_PCKR            (0xFFFFFC40) // (PMC) Programmable Clock Register
-// ========== Register definition for CKGR peripheral ========== 
-#define AT91C_CKGR_PLLBR          (0xFFFFFC2C) // (CKGR) PLL B Register
-#define AT91C_CKGR_MCFR           (0xFFFFFC24) // (CKGR) Main Clock  Frequency Register
-#define AT91C_CKGR_PLLAR          (0xFFFFFC28) // (CKGR) PLL A Register
-#define AT91C_CKGR_MOR            (0xFFFFFC20) // (CKGR) Main Oscillator Register
-// ========== Register definition for PIOD peripheral ========== 
-#define AT91C_PIOD_PDSR           (0xFFFFFA3C) // (PIOD) Pin Data Status Register
-#define AT91C_PIOD_CODR           (0xFFFFFA34) // (PIOD) Clear Output Data Register
-#define AT91C_PIOD_OWER           (0xFFFFFAA0) // (PIOD) Output Write Enable Register
-#define AT91C_PIOD_MDER           (0xFFFFFA50) // (PIOD) Multi-driver Enable Register
-#define AT91C_PIOD_IMR            (0xFFFFFA48) // (PIOD) Interrupt Mask Register
-#define AT91C_PIOD_IER            (0xFFFFFA40) // (PIOD) Interrupt Enable Register
-#define AT91C_PIOD_ODSR           (0xFFFFFA38) // (PIOD) Output Data Status Register
-#define AT91C_PIOD_SODR           (0xFFFFFA30) // (PIOD) Set Output Data Register
-#define AT91C_PIOD_PER            (0xFFFFFA00) // (PIOD) PIO Enable Register
-#define AT91C_PIOD_OWDR           (0xFFFFFAA4) // (PIOD) Output Write Disable Register
-#define AT91C_PIOD_PPUER          (0xFFFFFA64) // (PIOD) Pull-up Enable Register
-#define AT91C_PIOD_MDDR           (0xFFFFFA54) // (PIOD) Multi-driver Disable Register
-#define AT91C_PIOD_ISR            (0xFFFFFA4C) // (PIOD) Interrupt Status Register
-#define AT91C_PIOD_IDR            (0xFFFFFA44) // (PIOD) Interrupt Disable Register
-#define AT91C_PIOD_PDR            (0xFFFFFA04) // (PIOD) PIO Disable Register
-#define AT91C_PIOD_ODR            (0xFFFFFA14) // (PIOD) Output Disable Registerr
-#define AT91C_PIOD_OWSR           (0xFFFFFAA8) // (PIOD) Output Write Status Register
-#define AT91C_PIOD_ABSR           (0xFFFFFA78) // (PIOD) AB Select Status Register
-#define AT91C_PIOD_ASR            (0xFFFFFA70) // (PIOD) Select A Register
-#define AT91C_PIOD_PPUSR          (0xFFFFFA68) // (PIOD) Pad Pull-up Status Register
-#define AT91C_PIOD_PPUDR          (0xFFFFFA60) // (PIOD) Pull-up Disable Register
-#define AT91C_PIOD_MDSR           (0xFFFFFA58) // (PIOD) Multi-driver Status Register
-#define AT91C_PIOD_PSR            (0xFFFFFA08) // (PIOD) PIO Status Register
-#define AT91C_PIOD_OER            (0xFFFFFA10) // (PIOD) Output Enable Register
-#define AT91C_PIOD_OSR            (0xFFFFFA18) // (PIOD) Output Status Register
-#define AT91C_PIOD_IFER           (0xFFFFFA20) // (PIOD) Input Filter Enable Register
-#define AT91C_PIOD_BSR            (0xFFFFFA74) // (PIOD) Select B Register
-#define AT91C_PIOD_IFDR           (0xFFFFFA24) // (PIOD) Input Filter Disable Register
-#define AT91C_PIOD_IFSR           (0xFFFFFA28) // (PIOD) Input Filter Status Register
-// ========== Register definition for PIOC peripheral ========== 
-#define AT91C_PIOC_IFDR           (0xFFFFF824) // (PIOC) Input Filter Disable Register
-#define AT91C_PIOC_ODR            (0xFFFFF814) // (PIOC) Output Disable Registerr
-#define AT91C_PIOC_ABSR           (0xFFFFF878) // (PIOC) AB Select Status Register
-#define AT91C_PIOC_SODR           (0xFFFFF830) // (PIOC) Set Output Data Register
-#define AT91C_PIOC_IFSR           (0xFFFFF828) // (PIOC) Input Filter Status Register
-#define AT91C_PIOC_CODR           (0xFFFFF834) // (PIOC) Clear Output Data Register
-#define AT91C_PIOC_ODSR           (0xFFFFF838) // (PIOC) Output Data Status Register
-#define AT91C_PIOC_IER            (0xFFFFF840) // (PIOC) Interrupt Enable Register
-#define AT91C_PIOC_IMR            (0xFFFFF848) // (PIOC) Interrupt Mask Register
-#define AT91C_PIOC_OWDR           (0xFFFFF8A4) // (PIOC) Output Write Disable Register
-#define AT91C_PIOC_MDDR           (0xFFFFF854) // (PIOC) Multi-driver Disable Register
-#define AT91C_PIOC_PDSR           (0xFFFFF83C) // (PIOC) Pin Data Status Register
-#define AT91C_PIOC_IDR            (0xFFFFF844) // (PIOC) Interrupt Disable Register
-#define AT91C_PIOC_ISR            (0xFFFFF84C) // (PIOC) Interrupt Status Register
-#define AT91C_PIOC_PDR            (0xFFFFF804) // (PIOC) PIO Disable Register
-#define AT91C_PIOC_OWSR           (0xFFFFF8A8) // (PIOC) Output Write Status Register
-#define AT91C_PIOC_OWER           (0xFFFFF8A0) // (PIOC) Output Write Enable Register
-#define AT91C_PIOC_ASR            (0xFFFFF870) // (PIOC) Select A Register
-#define AT91C_PIOC_PPUSR          (0xFFFFF868) // (PIOC) Pad Pull-up Status Register
-#define AT91C_PIOC_PPUDR          (0xFFFFF860) // (PIOC) Pull-up Disable Register
-#define AT91C_PIOC_MDSR           (0xFFFFF858) // (PIOC) Multi-driver Status Register
-#define AT91C_PIOC_MDER           (0xFFFFF850) // (PIOC) Multi-driver Enable Register
-#define AT91C_PIOC_IFER           (0xFFFFF820) // (PIOC) Input Filter Enable Register
-#define AT91C_PIOC_OSR            (0xFFFFF818) // (PIOC) Output Status Register
-#define AT91C_PIOC_OER            (0xFFFFF810) // (PIOC) Output Enable Register
-#define AT91C_PIOC_PSR            (0xFFFFF808) // (PIOC) PIO Status Register
-#define AT91C_PIOC_PER            (0xFFFFF800) // (PIOC) PIO Enable Register
-#define AT91C_PIOC_BSR            (0xFFFFF874) // (PIOC) Select B Register
-#define AT91C_PIOC_PPUER          (0xFFFFF864) // (PIOC) Pull-up Enable Register
-// ========== Register definition for PIOB peripheral ========== 
-#define AT91C_PIOB_OWSR           (0xFFFFF6A8) // (PIOB) Output Write Status Register
-#define AT91C_PIOB_PPUSR          (0xFFFFF668) // (PIOB) Pad Pull-up Status Register
-#define AT91C_PIOB_PPUDR          (0xFFFFF660) // (PIOB) Pull-up Disable Register
-#define AT91C_PIOB_MDSR           (0xFFFFF658) // (PIOB) Multi-driver Status Register
-#define AT91C_PIOB_MDER           (0xFFFFF650) // (PIOB) Multi-driver Enable Register
-#define AT91C_PIOB_IMR            (0xFFFFF648) // (PIOB) Interrupt Mask Register
-#define AT91C_PIOB_OSR            (0xFFFFF618) // (PIOB) Output Status Register
-#define AT91C_PIOB_OER            (0xFFFFF610) // (PIOB) Output Enable Register
-#define AT91C_PIOB_PSR            (0xFFFFF608) // (PIOB) PIO Status Register
-#define AT91C_PIOB_PER            (0xFFFFF600) // (PIOB) PIO Enable Register
-#define AT91C_PIOB_BSR            (0xFFFFF674) // (PIOB) Select B Register
-#define AT91C_PIOB_PPUER          (0xFFFFF664) // (PIOB) Pull-up Enable Register
-#define AT91C_PIOB_IFDR           (0xFFFFF624) // (PIOB) Input Filter Disable Register
-#define AT91C_PIOB_ODR            (0xFFFFF614) // (PIOB) Output Disable Registerr
-#define AT91C_PIOB_ABSR           (0xFFFFF678) // (PIOB) AB Select Status Register
-#define AT91C_PIOB_ASR            (0xFFFFF670) // (PIOB) Select A Register
-#define AT91C_PIOB_IFER           (0xFFFFF620) // (PIOB) Input Filter Enable Register
-#define AT91C_PIOB_IFSR           (0xFFFFF628) // (PIOB) Input Filter Status Register
-#define AT91C_PIOB_SODR           (0xFFFFF630) // (PIOB) Set Output Data Register
-#define AT91C_PIOB_ODSR           (0xFFFFF638) // (PIOB) Output Data Status Register
-#define AT91C_PIOB_CODR           (0xFFFFF634) // (PIOB) Clear Output Data Register
-#define AT91C_PIOB_PDSR           (0xFFFFF63C) // (PIOB) Pin Data Status Register
-#define AT91C_PIOB_OWER           (0xFFFFF6A0) // (PIOB) Output Write Enable Register
-#define AT91C_PIOB_IER            (0xFFFFF640) // (PIOB) Interrupt Enable Register
-#define AT91C_PIOB_OWDR           (0xFFFFF6A4) // (PIOB) Output Write Disable Register
-#define AT91C_PIOB_MDDR           (0xFFFFF654) // (PIOB) Multi-driver Disable Register
-#define AT91C_PIOB_ISR            (0xFFFFF64C) // (PIOB) Interrupt Status Register
-#define AT91C_PIOB_IDR            (0xFFFFF644) // (PIOB) Interrupt Disable Register
-#define AT91C_PIOB_PDR            (0xFFFFF604) // (PIOB) PIO Disable Register
-// ========== Register definition for PIOA peripheral ========== 
-#define AT91C_PIOA_IMR            (0xFFFFF448) // (PIOA) Interrupt Mask Register
-#define AT91C_PIOA_IER            (0xFFFFF440) // (PIOA) Interrupt Enable Register
-#define AT91C_PIOA_OWDR           (0xFFFFF4A4) // (PIOA) Output Write Disable Register
-#define AT91C_PIOA_ISR            (0xFFFFF44C) // (PIOA) Interrupt Status Register
-#define AT91C_PIOA_PPUDR          (0xFFFFF460) // (PIOA) Pull-up Disable Register
-#define AT91C_PIOA_MDSR           (0xFFFFF458) // (PIOA) Multi-driver Status Register
-#define AT91C_PIOA_MDER           (0xFFFFF450) // (PIOA) Multi-driver Enable Register
-#define AT91C_PIOA_PER            (0xFFFFF400) // (PIOA) PIO Enable Register
-#define AT91C_PIOA_PSR            (0xFFFFF408) // (PIOA) PIO Status Register
-#define AT91C_PIOA_OER            (0xFFFFF410) // (PIOA) Output Enable Register
-#define AT91C_PIOA_BSR            (0xFFFFF474) // (PIOA) Select B Register
-#define AT91C_PIOA_PPUER          (0xFFFFF464) // (PIOA) Pull-up Enable Register
-#define AT91C_PIOA_MDDR           (0xFFFFF454) // (PIOA) Multi-driver Disable Register
-#define AT91C_PIOA_PDR            (0xFFFFF404) // (PIOA) PIO Disable Register
-#define AT91C_PIOA_ODR            (0xFFFFF414) // (PIOA) Output Disable Registerr
-#define AT91C_PIOA_IFDR           (0xFFFFF424) // (PIOA) Input Filter Disable Register
-#define AT91C_PIOA_ABSR           (0xFFFFF478) // (PIOA) AB Select Status Register
-#define AT91C_PIOA_ASR            (0xFFFFF470) // (PIOA) Select A Register
-#define AT91C_PIOA_PPUSR          (0xFFFFF468) // (PIOA) Pad Pull-up Status Register
-#define AT91C_PIOA_ODSR           (0xFFFFF438) // (PIOA) Output Data Status Register
-#define AT91C_PIOA_SODR           (0xFFFFF430) // (PIOA) Set Output Data Register
-#define AT91C_PIOA_IFSR           (0xFFFFF428) // (PIOA) Input Filter Status Register
-#define AT91C_PIOA_IFER           (0xFFFFF420) // (PIOA) Input Filter Enable Register
-#define AT91C_PIOA_OSR            (0xFFFFF418) // (PIOA) Output Status Register
-#define AT91C_PIOA_IDR            (0xFFFFF444) // (PIOA) Interrupt Disable Register
-#define AT91C_PIOA_PDSR           (0xFFFFF43C) // (PIOA) Pin Data Status Register
-#define AT91C_PIOA_CODR           (0xFFFFF434) // (PIOA) Clear Output Data Register
-#define AT91C_PIOA_OWSR           (0xFFFFF4A8) // (PIOA) Output Write Status Register
-#define AT91C_PIOA_OWER           (0xFFFFF4A0) // (PIOA) Output Write Enable Register
-// ========== Register definition for DBGU peripheral ========== 
-#define AT91C_DBGU_C2R            (0xFFFFF244) // (DBGU) Chip ID2 Register
-#define AT91C_DBGU_THR            (0xFFFFF21C) // (DBGU) Transmitter Holding Register
-#define AT91C_DBGU_CSR            (0xFFFFF214) // (DBGU) Channel Status Register
-#define AT91C_DBGU_IDR            (0xFFFFF20C) // (DBGU) Interrupt Disable Register
-#define AT91C_DBGU_MR             (0xFFFFF204) // (DBGU) Mode Register
-#define AT91C_DBGU_FNTR           (0xFFFFF248) // (DBGU) Force NTRST Register
-#define AT91C_DBGU_C1R            (0xFFFFF240) // (DBGU) Chip ID1 Register
-#define AT91C_DBGU_BRGR           (0xFFFFF220) // (DBGU) Baud Rate Generator Register
-#define AT91C_DBGU_RHR            (0xFFFFF218) // (DBGU) Receiver Holding Register
-#define AT91C_DBGU_IMR            (0xFFFFF210) // (DBGU) Interrupt Mask Register
-#define AT91C_DBGU_IER            (0xFFFFF208) // (DBGU) Interrupt Enable Register
-#define AT91C_DBGU_CR             (0xFFFFF200) // (DBGU) Control Register
-// ========== Register definition for PDC_DBGU peripheral ========== 
-#define AT91C_DBGU_TNCR           (0xFFFFF31C) // (PDC_DBGU) Transmit Next Counter Register
-#define AT91C_DBGU_RNCR           (0xFFFFF314) // (PDC_DBGU) Receive Next Counter Register
-#define AT91C_DBGU_PTCR           (0xFFFFF320) // (PDC_DBGU) PDC Transfer Control Register
-#define AT91C_DBGU_PTSR           (0xFFFFF324) // (PDC_DBGU) PDC Transfer Status Register
-#define AT91C_DBGU_RCR            (0xFFFFF304) // (PDC_DBGU) Receive Counter Register
-#define AT91C_DBGU_TCR            (0xFFFFF30C) // (PDC_DBGU) Transmit Counter Register
-#define AT91C_DBGU_RPR            (0xFFFFF300) // (PDC_DBGU) Receive Pointer Register
-#define AT91C_DBGU_TPR            (0xFFFFF308) // (PDC_DBGU) Transmit Pointer Register
-#define AT91C_DBGU_RNPR           (0xFFFFF310) // (PDC_DBGU) Receive Next Pointer Register
-#define AT91C_DBGU_TNPR           (0xFFFFF318) // (PDC_DBGU) Transmit Next Pointer Register
-// ========== Register definition for AIC peripheral ========== 
-#define AT91C_AIC_ICCR            (0xFFFFF128) // (AIC) Interrupt Clear Command Register
-#define AT91C_AIC_IECR            (0xFFFFF120) // (AIC) Interrupt Enable Command Register
-#define AT91C_AIC_SMR             (0xFFFFF000) // (AIC) Source Mode Register
-#define AT91C_AIC_ISCR            (0xFFFFF12C) // (AIC) Interrupt Set Command Register
-#define AT91C_AIC_EOICR           (0xFFFFF130) // (AIC) End of Interrupt Command Register
-#define AT91C_AIC_DCR             (0xFFFFF138) // (AIC) Debug Control Register (Protect)
-#define AT91C_AIC_FFER            (0xFFFFF140) // (AIC) Fast Forcing Enable Register
-#define AT91C_AIC_SVR             (0xFFFFF080) // (AIC) Source Vector Register
-#define AT91C_AIC_SPU             (0xFFFFF134) // (AIC) Spurious Vector Register
-#define AT91C_AIC_FFDR            (0xFFFFF144) // (AIC) Fast Forcing Disable Register
-#define AT91C_AIC_FVR             (0xFFFFF104) // (AIC) FIQ Vector Register
-#define AT91C_AIC_FFSR            (0xFFFFF148) // (AIC) Fast Forcing Status Register
-#define AT91C_AIC_IMR             (0xFFFFF110) // (AIC) Interrupt Mask Register
-#define AT91C_AIC_ISR             (0xFFFFF108) // (AIC) Interrupt Status Register
-#define AT91C_AIC_IVR             (0xFFFFF100) // (AIC) IRQ Vector Register
-#define AT91C_AIC_IDCR            (0xFFFFF124) // (AIC) Interrupt Disable Command Register
-#define AT91C_AIC_CISR            (0xFFFFF114) // (AIC) Core Interrupt Status Register
-#define AT91C_AIC_IPR             (0xFFFFF10C) // (AIC) Interrupt Pending Register
-// ========== Register definition for PDC_SPI peripheral ========== 
-#define AT91C_SPI_PTCR            (0xFFFE0120) // (PDC_SPI) PDC Transfer Control Register
-#define AT91C_SPI_TNPR            (0xFFFE0118) // (PDC_SPI) Transmit Next Pointer Register
-#define AT91C_SPI_RNPR            (0xFFFE0110) // (PDC_SPI) Receive Next Pointer Register
-#define AT91C_SPI_TPR             (0xFFFE0108) // (PDC_SPI) Transmit Pointer Register
-#define AT91C_SPI_RPR             (0xFFFE0100) // (PDC_SPI) Receive Pointer Register
-#define AT91C_SPI_PTSR            (0xFFFE0124) // (PDC_SPI) PDC Transfer Status Register
-#define AT91C_SPI_TNCR            (0xFFFE011C) // (PDC_SPI) Transmit Next Counter Register
-#define AT91C_SPI_RNCR            (0xFFFE0114) // (PDC_SPI) Receive Next Counter Register
-#define AT91C_SPI_TCR             (0xFFFE010C) // (PDC_SPI) Transmit Counter Register
-#define AT91C_SPI_RCR             (0xFFFE0104) // (PDC_SPI) Receive Counter Register
-// ========== Register definition for SPI peripheral ========== 
-#define AT91C_SPI_CSR             (0xFFFE0030) // (SPI) Chip Select Register
-#define AT91C_SPI_IDR             (0xFFFE0018) // (SPI) Interrupt Disable Register
-#define AT91C_SPI_SR              (0xFFFE0010) // (SPI) Status Register
-#define AT91C_SPI_RDR             (0xFFFE0008) // (SPI) Receive Data Register
-#define AT91C_SPI_CR              (0xFFFE0000) // (SPI) Control Register
-#define AT91C_SPI_IMR             (0xFFFE001C) // (SPI) Interrupt Mask Register
-#define AT91C_SPI_IER             (0xFFFE0014) // (SPI) Interrupt Enable Register
-#define AT91C_SPI_TDR             (0xFFFE000C) // (SPI) Transmit Data Register
-#define AT91C_SPI_MR              (0xFFFE0004) // (SPI) Mode Register
-// ========== Register definition for PDC_SSC2 peripheral ========== 
-#define AT91C_SSC2_PTCR           (0xFFFD8120) // (PDC_SSC2) PDC Transfer Control Register
-#define AT91C_SSC2_TNPR           (0xFFFD8118) // (PDC_SSC2) Transmit Next Pointer Register
-#define AT91C_SSC2_RNPR           (0xFFFD8110) // (PDC_SSC2) Receive Next Pointer Register
-#define AT91C_SSC2_TPR            (0xFFFD8108) // (PDC_SSC2) Transmit Pointer Register
-#define AT91C_SSC2_RPR            (0xFFFD8100) // (PDC_SSC2) Receive Pointer Register
-#define AT91C_SSC2_PTSR           (0xFFFD8124) // (PDC_SSC2) PDC Transfer Status Register
-#define AT91C_SSC2_TNCR           (0xFFFD811C) // (PDC_SSC2) Transmit Next Counter Register
-#define AT91C_SSC2_RNCR           (0xFFFD8114) // (PDC_SSC2) Receive Next Counter Register
-#define AT91C_SSC2_TCR            (0xFFFD810C) // (PDC_SSC2) Transmit Counter Register
-#define AT91C_SSC2_RCR            (0xFFFD8104) // (PDC_SSC2) Receive Counter Register
-// ========== Register definition for SSC2 peripheral ========== 
-#define AT91C_SSC2_IMR            (0xFFFD804C) // (SSC2) Interrupt Mask Register
-#define AT91C_SSC2_IER            (0xFFFD8044) // (SSC2) Interrupt Enable Register
-#define AT91C_SSC2_RC1R           (0xFFFD803C) // (SSC2) Receive Compare 1 Register
-#define AT91C_SSC2_TSHR           (0xFFFD8034) // (SSC2) Transmit Sync Holding Register
-#define AT91C_SSC2_CMR            (0xFFFD8004) // (SSC2) Clock Mode Register
-#define AT91C_SSC2_IDR            (0xFFFD8048) // (SSC2) Interrupt Disable Register
-#define AT91C_SSC2_TCMR           (0xFFFD8018) // (SSC2) Transmit Clock Mode Register
-#define AT91C_SSC2_RCMR           (0xFFFD8010) // (SSC2) Receive Clock ModeRegister
-#define AT91C_SSC2_CR             (0xFFFD8000) // (SSC2) Control Register
-#define AT91C_SSC2_RFMR           (0xFFFD8014) // (SSC2) Receive Frame Mode Register
-#define AT91C_SSC2_TFMR           (0xFFFD801C) // (SSC2) Transmit Frame Mode Register
-#define AT91C_SSC2_THR            (0xFFFD8024) // (SSC2) Transmit Holding Register
-#define AT91C_SSC2_SR             (0xFFFD8040) // (SSC2) Status Register
-#define AT91C_SSC2_RC0R           (0xFFFD8038) // (SSC2) Receive Compare 0 Register
-#define AT91C_SSC2_RSHR           (0xFFFD8030) // (SSC2) Receive Sync Holding Register
-#define AT91C_SSC2_RHR            (0xFFFD8020) // (SSC2) Receive Holding Register
-// ========== Register definition for PDC_SSC1 peripheral ========== 
-#define AT91C_SSC1_PTCR           (0xFFFD4120) // (PDC_SSC1) PDC Transfer Control Register
-#define AT91C_SSC1_TNPR           (0xFFFD4118) // (PDC_SSC1) Transmit Next Pointer Register
-#define AT91C_SSC1_RNPR           (0xFFFD4110) // (PDC_SSC1) Receive Next Pointer Register
-#define AT91C_SSC1_TPR            (0xFFFD4108) // (PDC_SSC1) Transmit Pointer Register
-#define AT91C_SSC1_RPR            (0xFFFD4100) // (PDC_SSC1) Receive Pointer Register
-#define AT91C_SSC1_PTSR           (0xFFFD4124) // (PDC_SSC1) PDC Transfer Status Register
-#define AT91C_SSC1_TNCR           (0xFFFD411C) // (PDC_SSC1) Transmit Next Counter Register
-#define AT91C_SSC1_RNCR           (0xFFFD4114) // (PDC_SSC1) Receive Next Counter Register
-#define AT91C_SSC1_TCR            (0xFFFD410C) // (PDC_SSC1) Transmit Counter Register
-#define AT91C_SSC1_RCR            (0xFFFD4104) // (PDC_SSC1) Receive Counter Register
-// ========== Register definition for SSC1 peripheral ========== 
-#define AT91C_SSC1_RFMR           (0xFFFD4014) // (SSC1) Receive Frame Mode Register
-#define AT91C_SSC1_CMR            (0xFFFD4004) // (SSC1) Clock Mode Register
-#define AT91C_SSC1_IDR            (0xFFFD4048) // (SSC1) Interrupt Disable Register
-#define AT91C_SSC1_SR             (0xFFFD4040) // (SSC1) Status Register
-#define AT91C_SSC1_RC0R           (0xFFFD4038) // (SSC1) Receive Compare 0 Register
-#define AT91C_SSC1_RSHR           (0xFFFD4030) // (SSC1) Receive Sync Holding Register
-#define AT91C_SSC1_RHR            (0xFFFD4020) // (SSC1) Receive Holding Register
-#define AT91C_SSC1_TCMR           (0xFFFD4018) // (SSC1) Transmit Clock Mode Register
-#define AT91C_SSC1_RCMR           (0xFFFD4010) // (SSC1) Receive Clock ModeRegister
-#define AT91C_SSC1_CR             (0xFFFD4000) // (SSC1) Control Register
-#define AT91C_SSC1_IMR            (0xFFFD404C) // (SSC1) Interrupt Mask Register
-#define AT91C_SSC1_IER            (0xFFFD4044) // (SSC1) Interrupt Enable Register
-#define AT91C_SSC1_RC1R           (0xFFFD403C) // (SSC1) Receive Compare 1 Register
-#define AT91C_SSC1_TSHR           (0xFFFD4034) // (SSC1) Transmit Sync Holding Register
-#define AT91C_SSC1_THR            (0xFFFD4024) // (SSC1) Transmit Holding Register
-#define AT91C_SSC1_TFMR           (0xFFFD401C) // (SSC1) Transmit Frame Mode Register
-// ========== Register definition for PDC_SSC0 peripheral ========== 
-#define AT91C_SSC0_PTCR           (0xFFFD0120) // (PDC_SSC0) PDC Transfer Control Register
-#define AT91C_SSC0_TNPR           (0xFFFD0118) // (PDC_SSC0) Transmit Next Pointer Register
-#define AT91C_SSC0_RNPR           (0xFFFD0110) // (PDC_SSC0) Receive Next Pointer Register
-#define AT91C_SSC0_TPR            (0xFFFD0108) // (PDC_SSC0) Transmit Pointer Register
-#define AT91C_SSC0_RPR            (0xFFFD0100) // (PDC_SSC0) Receive Pointer Register
-#define AT91C_SSC0_PTSR           (0xFFFD0124) // (PDC_SSC0) PDC Transfer Status Register
-#define AT91C_SSC0_TNCR           (0xFFFD011C) // (PDC_SSC0) Transmit Next Counter Register
-#define AT91C_SSC0_RNCR           (0xFFFD0114) // (PDC_SSC0) Receive Next Counter Register
-#define AT91C_SSC0_TCR            (0xFFFD010C) // (PDC_SSC0) Transmit Counter Register
-#define AT91C_SSC0_RCR            (0xFFFD0104) // (PDC_SSC0) Receive Counter Register
-// ========== Register definition for SSC0 peripheral ========== 
-#define AT91C_SSC0_IMR            (0xFFFD004C) // (SSC0) Interrupt Mask Register
-#define AT91C_SSC0_IER            (0xFFFD0044) // (SSC0) Interrupt Enable Register
-#define AT91C_SSC0_RC1R           (0xFFFD003C) // (SSC0) Receive Compare 1 Register
-#define AT91C_SSC0_TSHR           (0xFFFD0034) // (SSC0) Transmit Sync Holding Register
-#define AT91C_SSC0_THR            (0xFFFD0024) // (SSC0) Transmit Holding Register
-#define AT91C_SSC0_TFMR           (0xFFFD001C) // (SSC0) Transmit Frame Mode Register
-#define AT91C_SSC0_RFMR           (0xFFFD0014) // (SSC0) Receive Frame Mode Register
-#define AT91C_SSC0_CMR            (0xFFFD0004) // (SSC0) Clock Mode Register
-#define AT91C_SSC0_IDR            (0xFFFD0048) // (SSC0) Interrupt Disable Register
-#define AT91C_SSC0_SR             (0xFFFD0040) // (SSC0) Status Register
-#define AT91C_SSC0_RC0R           (0xFFFD0038) // (SSC0) Receive Compare 0 Register
-#define AT91C_SSC0_RSHR           (0xFFFD0030) // (SSC0) Receive Sync Holding Register
-#define AT91C_SSC0_RHR            (0xFFFD0020) // (SSC0) Receive Holding Register
-#define AT91C_SSC0_TCMR           (0xFFFD0018) // (SSC0) Transmit Clock Mode Register
-#define AT91C_SSC0_RCMR           (0xFFFD0010) // (SSC0) Receive Clock ModeRegister
-#define AT91C_SSC0_CR             (0xFFFD0000) // (SSC0) Control Register
-// ========== Register definition for PDC_US3 peripheral ========== 
-#define AT91C_US3_PTSR            (0xFFFCC124) // (PDC_US3) PDC Transfer Status Register
-#define AT91C_US3_TNCR            (0xFFFCC11C) // (PDC_US3) Transmit Next Counter Register
-#define AT91C_US3_RNCR            (0xFFFCC114) // (PDC_US3) Receive Next Counter Register
-#define AT91C_US3_TCR             (0xFFFCC10C) // (PDC_US3) Transmit Counter Register
-#define AT91C_US3_RCR             (0xFFFCC104) // (PDC_US3) Receive Counter Register
-#define AT91C_US3_PTCR            (0xFFFCC120) // (PDC_US3) PDC Transfer Control Register
-#define AT91C_US3_TNPR            (0xFFFCC118) // (PDC_US3) Transmit Next Pointer Register
-#define AT91C_US3_RNPR            (0xFFFCC110) // (PDC_US3) Receive Next Pointer Register
-#define AT91C_US3_TPR             (0xFFFCC108) // (PDC_US3) Transmit Pointer Register
-#define AT91C_US3_RPR             (0xFFFCC100) // (PDC_US3) Receive Pointer Register
-// ========== Register definition for US3 peripheral ========== 
-#define AT91C_US3_IF              (0xFFFCC04C) // (US3) IRDA_FILTER Register
-#define AT91C_US3_NER             (0xFFFCC044) // (US3) Nb Errors Register
-#define AT91C_US3_RTOR            (0xFFFCC024) // (US3) Receiver Time-out Register
-#define AT91C_US3_THR             (0xFFFCC01C) // (US3) Transmitter Holding Register
-#define AT91C_US3_CSR             (0xFFFCC014) // (US3) Channel Status Register
-#define AT91C_US3_IDR             (0xFFFCC00C) // (US3) Interrupt Disable Register
-#define AT91C_US3_MR              (0xFFFCC004) // (US3) Mode Register
-#define AT91C_US3_XXR             (0xFFFCC048) // (US3) XON_XOFF Register
-#define AT91C_US3_FIDI            (0xFFFCC040) // (US3) FI_DI_Ratio Register
-#define AT91C_US3_TTGR            (0xFFFCC028) // (US3) Transmitter Time-guard Register
-#define AT91C_US3_BRGR            (0xFFFCC020) // (US3) Baud Rate Generator Register
-#define AT91C_US3_RHR             (0xFFFCC018) // (US3) Receiver Holding Register
-#define AT91C_US3_IMR             (0xFFFCC010) // (US3) Interrupt Mask Register
-#define AT91C_US3_IER             (0xFFFCC008) // (US3) Interrupt Enable Register
-#define AT91C_US3_CR              (0xFFFCC000) // (US3) Control Register
-// ========== Register definition for PDC_US2 peripheral ========== 
-#define AT91C_US2_PTSR            (0xFFFC8124) // (PDC_US2) PDC Transfer Status Register
-#define AT91C_US2_TNCR            (0xFFFC811C) // (PDC_US2) Transmit Next Counter Register
-#define AT91C_US2_RNCR            (0xFFFC8114) // (PDC_US2) Receive Next Counter Register
-#define AT91C_US2_TCR             (0xFFFC810C) // (PDC_US2) Transmit Counter Register
-#define AT91C_US2_PTCR            (0xFFFC8120) // (PDC_US2) PDC Transfer Control Register
-#define AT91C_US2_RCR             (0xFFFC8104) // (PDC_US2) Receive Counter Register
-#define AT91C_US2_TNPR            (0xFFFC8118) // (PDC_US2) Transmit Next Pointer Register
-#define AT91C_US2_RPR             (0xFFFC8100) // (PDC_US2) Receive Pointer Register
-#define AT91C_US2_TPR             (0xFFFC8108) // (PDC_US2) Transmit Pointer Register
-#define AT91C_US2_RNPR            (0xFFFC8110) // (PDC_US2) Receive Next Pointer Register
-// ========== Register definition for US2 peripheral ========== 
-#define AT91C_US2_XXR             (0xFFFC8048) // (US2) XON_XOFF Register
-#define AT91C_US2_FIDI            (0xFFFC8040) // (US2) FI_DI_Ratio Register
-#define AT91C_US2_TTGR            (0xFFFC8028) // (US2) Transmitter Time-guard Register
-#define AT91C_US2_BRGR            (0xFFFC8020) // (US2) Baud Rate Generator Register
-#define AT91C_US2_RHR             (0xFFFC8018) // (US2) Receiver Holding Register
-#define AT91C_US2_IMR             (0xFFFC8010) // (US2) Interrupt Mask Register
-#define AT91C_US2_IER             (0xFFFC8008) // (US2) Interrupt Enable Register
-#define AT91C_US2_CR              (0xFFFC8000) // (US2) Control Register
-#define AT91C_US2_IF              (0xFFFC804C) // (US2) IRDA_FILTER Register
-#define AT91C_US2_NER             (0xFFFC8044) // (US2) Nb Errors Register
-#define AT91C_US2_RTOR            (0xFFFC8024) // (US2) Receiver Time-out Register
-#define AT91C_US2_THR             (0xFFFC801C) // (US2) Transmitter Holding Register
-#define AT91C_US2_CSR             (0xFFFC8014) // (US2) Channel Status Register
-#define AT91C_US2_IDR             (0xFFFC800C) // (US2) Interrupt Disable Register
-#define AT91C_US2_MR              (0xFFFC8004) // (US2) Mode Register
-// ========== Register definition for PDC_US1 peripheral ========== 
-#define AT91C_US1_PTSR            (0xFFFC4124) // (PDC_US1) PDC Transfer Status Register
-#define AT91C_US1_TNCR            (0xFFFC411C) // (PDC_US1) Transmit Next Counter Register
-#define AT91C_US1_RNCR            (0xFFFC4114) // (PDC_US1) Receive Next Counter Register
-#define AT91C_US1_TCR             (0xFFFC410C) // (PDC_US1) Transmit Counter Register
-#define AT91C_US1_RCR             (0xFFFC4104) // (PDC_US1) Receive Counter Register
-#define AT91C_US1_PTCR            (0xFFFC4120) // (PDC_US1) PDC Transfer Control Register
-#define AT91C_US1_TNPR            (0xFFFC4118) // (PDC_US1) Transmit Next Pointer Register
-#define AT91C_US1_RNPR            (0xFFFC4110) // (PDC_US1) Receive Next Pointer Register
-#define AT91C_US1_TPR             (0xFFFC4108) // (PDC_US1) Transmit Pointer Register
-#define AT91C_US1_RPR             (0xFFFC4100) // (PDC_US1) Receive Pointer Register
-// ========== Register definition for US1 peripheral ========== 
-#define AT91C_US1_XXR             (0xFFFC4048) // (US1) XON_XOFF Register
-#define AT91C_US1_RHR             (0xFFFC4018) // (US1) Receiver Holding Register
-#define AT91C_US1_IMR             (0xFFFC4010) // (US1) Interrupt Mask Register
-#define AT91C_US1_IER             (0xFFFC4008) // (US1) Interrupt Enable Register
-#define AT91C_US1_CR              (0xFFFC4000) // (US1) Control Register
-#define AT91C_US1_RTOR            (0xFFFC4024) // (US1) Receiver Time-out Register
-#define AT91C_US1_THR             (0xFFFC401C) // (US1) Transmitter Holding Register
-#define AT91C_US1_CSR             (0xFFFC4014) // (US1) Channel Status Register
-#define AT91C_US1_IDR             (0xFFFC400C) // (US1) Interrupt Disable Register
-#define AT91C_US1_FIDI            (0xFFFC4040) // (US1) FI_DI_Ratio Register
-#define AT91C_US1_BRGR            (0xFFFC4020) // (US1) Baud Rate Generator Register
-#define AT91C_US1_TTGR            (0xFFFC4028) // (US1) Transmitter Time-guard Register
-#define AT91C_US1_IF              (0xFFFC404C) // (US1) IRDA_FILTER Register
-#define AT91C_US1_NER             (0xFFFC4044) // (US1) Nb Errors Register
-#define AT91C_US1_MR              (0xFFFC4004) // (US1) Mode Register
-// ========== Register definition for PDC_US0 peripheral ========== 
-#define AT91C_US0_PTCR            (0xFFFC0120) // (PDC_US0) PDC Transfer Control Register
-#define AT91C_US0_TNPR            (0xFFFC0118) // (PDC_US0) Transmit Next Pointer Register
-#define AT91C_US0_RNPR            (0xFFFC0110) // (PDC_US0) Receive Next Pointer Register
-#define AT91C_US0_TPR             (0xFFFC0108) // (PDC_US0) Transmit Pointer Register
-#define AT91C_US0_RPR             (0xFFFC0100) // (PDC_US0) Receive Pointer Register
-#define AT91C_US0_PTSR            (0xFFFC0124) // (PDC_US0) PDC Transfer Status Register
-#define AT91C_US0_TNCR            (0xFFFC011C) // (PDC_US0) Transmit Next Counter Register
-#define AT91C_US0_RNCR            (0xFFFC0114) // (PDC_US0) Receive Next Counter Register
-#define AT91C_US0_TCR             (0xFFFC010C) // (PDC_US0) Transmit Counter Register
-#define AT91C_US0_RCR             (0xFFFC0104) // (PDC_US0) Receive Counter Register
-// ========== Register definition for US0 peripheral ========== 
-#define AT91C_US0_TTGR            (0xFFFC0028) // (US0) Transmitter Time-guard Register
-#define AT91C_US0_BRGR            (0xFFFC0020) // (US0) Baud Rate Generator Register
-#define AT91C_US0_RHR             (0xFFFC0018) // (US0) Receiver Holding Register
-#define AT91C_US0_IMR             (0xFFFC0010) // (US0) Interrupt Mask Register
-#define AT91C_US0_NER             (0xFFFC0044) // (US0) Nb Errors Register
-#define AT91C_US0_RTOR            (0xFFFC0024) // (US0) Receiver Time-out Register
-#define AT91C_US0_XXR             (0xFFFC0048) // (US0) XON_XOFF Register
-#define AT91C_US0_FIDI            (0xFFFC0040) // (US0) FI_DI_Ratio Register
-#define AT91C_US0_CR              (0xFFFC0000) // (US0) Control Register
-#define AT91C_US0_IER             (0xFFFC0008) // (US0) Interrupt Enable Register
-#define AT91C_US0_IF              (0xFFFC004C) // (US0) IRDA_FILTER Register
-#define AT91C_US0_MR              (0xFFFC0004) // (US0) Mode Register
-#define AT91C_US0_IDR             (0xFFFC000C) // (US0) Interrupt Disable Register
-#define AT91C_US0_CSR             (0xFFFC0014) // (US0) Channel Status Register
-#define AT91C_US0_THR             (0xFFFC001C) // (US0) Transmitter Holding Register
-// ========== Register definition for TWI peripheral ========== 
-#define AT91C_TWI_RHR             (0xFFFB8030) // (TWI) Receive Holding Register
-#define AT91C_TWI_IDR             (0xFFFB8028) // (TWI) Interrupt Disable Register
-#define AT91C_TWI_SR              (0xFFFB8020) // (TWI) Status Register
-#define AT91C_TWI_CWGR            (0xFFFB8010) // (TWI) Clock Waveform Generator Register
-#define AT91C_TWI_SMR             (0xFFFB8008) // (TWI) Slave Mode Register
-#define AT91C_TWI_CR              (0xFFFB8000) // (TWI) Control Register
-#define AT91C_TWI_THR             (0xFFFB8034) // (TWI) Transmit Holding Register
-#define AT91C_TWI_IMR             (0xFFFB802C) // (TWI) Interrupt Mask Register
-#define AT91C_TWI_IER             (0xFFFB8024) // (TWI) Interrupt Enable Register
-#define AT91C_TWI_IADR            (0xFFFB800C) // (TWI) Internal Address Register
-#define AT91C_TWI_MMR             (0xFFFB8004) // (TWI) Master Mode Register
-// ========== Register definition for PDC_MCI peripheral ========== 
-#define AT91C_MCI_PTCR            (0xFFFB4120) // (PDC_MCI) PDC Transfer Control Register
-#define AT91C_MCI_TNPR            (0xFFFB4118) // (PDC_MCI) Transmit Next Pointer Register
-#define AT91C_MCI_RNPR            (0xFFFB4110) // (PDC_MCI) Receive Next Pointer Register
-#define AT91C_MCI_TPR             (0xFFFB4108) // (PDC_MCI) Transmit Pointer Register
-#define AT91C_MCI_RPR             (0xFFFB4100) // (PDC_MCI) Receive Pointer Register
-#define AT91C_MCI_PTSR            (0xFFFB4124) // (PDC_MCI) PDC Transfer Status Register
-#define AT91C_MCI_TNCR            (0xFFFB411C) // (PDC_MCI) Transmit Next Counter Register
-#define AT91C_MCI_RNCR            (0xFFFB4114) // (PDC_MCI) Receive Next Counter Register
-#define AT91C_MCI_TCR             (0xFFFB410C) // (PDC_MCI) Transmit Counter Register
-#define AT91C_MCI_RCR             (0xFFFB4104) // (PDC_MCI) Receive Counter Register
-// ========== Register definition for MCI peripheral ========== 
-#define AT91C_MCI_IDR             (0xFFFB4048) // (MCI) MCI Interrupt Disable Register
-#define AT91C_MCI_SR              (0xFFFB4040) // (MCI) MCI Status Register
-#define AT91C_MCI_RDR             (0xFFFB4030) // (MCI) MCI Receive Data Register
-#define AT91C_MCI_RSPR            (0xFFFB4020) // (MCI) MCI Response Register
-#define AT91C_MCI_ARGR            (0xFFFB4010) // (MCI) MCI Argument Register
-#define AT91C_MCI_DTOR            (0xFFFB4008) // (MCI) MCI Data Timeout Register
-#define AT91C_MCI_CR              (0xFFFB4000) // (MCI) MCI Control Register
-#define AT91C_MCI_IMR             (0xFFFB404C) // (MCI) MCI Interrupt Mask Register
-#define AT91C_MCI_IER             (0xFFFB4044) // (MCI) MCI Interrupt Enable Register
-#define AT91C_MCI_TDR             (0xFFFB4034) // (MCI) MCI Transmit Data Register
-#define AT91C_MCI_CMDR            (0xFFFB4014) // (MCI) MCI Command Register
-#define AT91C_MCI_SDCR            (0xFFFB400C) // (MCI) MCI SD Card Register
-#define AT91C_MCI_MR              (0xFFFB4004) // (MCI) MCI Mode Register
-// ========== Register definition for UDP peripheral ========== 
-#define AT91C_UDP_ISR             (0xFFFB001C) // (UDP) Interrupt Status Register
-#define AT91C_UDP_IDR             (0xFFFB0014) // (UDP) Interrupt Disable Register
-#define AT91C_UDP_GLBSTATE        (0xFFFB0004) // (UDP) Global State Register
-#define AT91C_UDP_FDR             (0xFFFB0050) // (UDP) Endpoint FIFO Data Register
-#define AT91C_UDP_CSR             (0xFFFB0030) // (UDP) Endpoint Control and Status Register
-#define AT91C_UDP_RSTEP           (0xFFFB0028) // (UDP) Reset Endpoint Register
-#define AT91C_UDP_ICR             (0xFFFB0020) // (UDP) Interrupt Clear Register
-#define AT91C_UDP_IMR             (0xFFFB0018) // (UDP) Interrupt Mask Register
-#define AT91C_UDP_IER             (0xFFFB0010) // (UDP) Interrupt Enable Register
-#define AT91C_UDP_FADDR           (0xFFFB0008) // (UDP) Function Address Register
-#define AT91C_UDP_NUM             (0xFFFB0000) // (UDP) Frame Number Register
-// ========== Register definition for TC5 peripheral ========== 
-#define AT91C_TC5_CMR             (0xFFFA4084) // (TC5) Channel Mode Register
-#define AT91C_TC5_IDR             (0xFFFA40A8) // (TC5) Interrupt Disable Register
-#define AT91C_TC5_SR              (0xFFFA40A0) // (TC5) Status Register
-#define AT91C_TC5_RB              (0xFFFA4098) // (TC5) Register B
-#define AT91C_TC5_CV              (0xFFFA4090) // (TC5) Counter Value
-#define AT91C_TC5_CCR             (0xFFFA4080) // (TC5) Channel Control Register
-#define AT91C_TC5_IMR             (0xFFFA40AC) // (TC5) Interrupt Mask Register
-#define AT91C_TC5_IER             (0xFFFA40A4) // (TC5) Interrupt Enable Register
-#define AT91C_TC5_RC              (0xFFFA409C) // (TC5) Register C
-#define AT91C_TC5_RA              (0xFFFA4094) // (TC5) Register A
-// ========== Register definition for TC4 peripheral ========== 
-#define AT91C_TC4_IMR             (0xFFFA406C) // (TC4) Interrupt Mask Register
-#define AT91C_TC4_IER             (0xFFFA4064) // (TC4) Interrupt Enable Register
-#define AT91C_TC4_RC              (0xFFFA405C) // (TC4) Register C
-#define AT91C_TC4_RA              (0xFFFA4054) // (TC4) Register A
-#define AT91C_TC4_CMR             (0xFFFA4044) // (TC4) Channel Mode Register
-#define AT91C_TC4_IDR             (0xFFFA4068) // (TC4) Interrupt Disable Register
-#define AT91C_TC4_SR              (0xFFFA4060) // (TC4) Status Register
-#define AT91C_TC4_RB              (0xFFFA4058) // (TC4) Register B
-#define AT91C_TC4_CV              (0xFFFA4050) // (TC4) Counter Value
-#define AT91C_TC4_CCR             (0xFFFA4040) // (TC4) Channel Control Register
-// ========== Register definition for TC3 peripheral ========== 
-#define AT91C_TC3_IMR             (0xFFFA402C) // (TC3) Interrupt Mask Register
-#define AT91C_TC3_CV              (0xFFFA4010) // (TC3) Counter Value
-#define AT91C_TC3_CCR             (0xFFFA4000) // (TC3) Channel Control Register
-#define AT91C_TC3_IER             (0xFFFA4024) // (TC3) Interrupt Enable Register
-#define AT91C_TC3_CMR             (0xFFFA4004) // (TC3) Channel Mode Register
-#define AT91C_TC3_RA              (0xFFFA4014) // (TC3) Register A
-#define AT91C_TC3_RC              (0xFFFA401C) // (TC3) Register C
-#define AT91C_TC3_IDR             (0xFFFA4028) // (TC3) Interrupt Disable Register
-#define AT91C_TC3_RB              (0xFFFA4018) // (TC3) Register B
-#define AT91C_TC3_SR              (0xFFFA4020) // (TC3) Status Register
-// ========== Register definition for TCB1 peripheral ========== 
-#define AT91C_TCB1_BCR            (0xFFFA4140) // (TCB1) TC Block Control Register
-#define AT91C_TCB1_BMR            (0xFFFA4144) // (TCB1) TC Block Mode Register
-// ========== Register definition for TC2 peripheral ========== 
-#define AT91C_TC2_IMR             (0xFFFA00AC) // (TC2) Interrupt Mask Register
-#define AT91C_TC2_IER             (0xFFFA00A4) // (TC2) Interrupt Enable Register
-#define AT91C_TC2_RC              (0xFFFA009C) // (TC2) Register C
-#define AT91C_TC2_RA              (0xFFFA0094) // (TC2) Register A
-#define AT91C_TC2_CMR             (0xFFFA0084) // (TC2) Channel Mode Register
-#define AT91C_TC2_IDR             (0xFFFA00A8) // (TC2) Interrupt Disable Register
-#define AT91C_TC2_SR              (0xFFFA00A0) // (TC2) Status Register
-#define AT91C_TC2_RB              (0xFFFA0098) // (TC2) Register B
-#define AT91C_TC2_CV              (0xFFFA0090) // (TC2) Counter Value
-#define AT91C_TC2_CCR             (0xFFFA0080) // (TC2) Channel Control Register
-// ========== Register definition for TC1 peripheral ========== 
-#define AT91C_TC1_IMR             (0xFFFA006C) // (TC1) Interrupt Mask Register
-#define AT91C_TC1_IER             (0xFFFA0064) // (TC1) Interrupt Enable Register
-#define AT91C_TC1_RC              (0xFFFA005C) // (TC1) Register C
-#define AT91C_TC1_RA              (0xFFFA0054) // (TC1) Register A
-#define AT91C_TC1_CMR             (0xFFFA0044) // (TC1) Channel Mode Register
-#define AT91C_TC1_IDR             (0xFFFA0068) // (TC1) Interrupt Disable Register
-#define AT91C_TC1_SR              (0xFFFA0060) // (TC1) Status Register
-#define AT91C_TC1_RB              (0xFFFA0058) // (TC1) Register B
-#define AT91C_TC1_CV              (0xFFFA0050) // (TC1) Counter Value
-#define AT91C_TC1_CCR             (0xFFFA0040) // (TC1) Channel Control Register
-// ========== Register definition for TC0 peripheral ========== 
-#define AT91C_TC0_IMR             (0xFFFA002C) // (TC0) Interrupt Mask Register
-#define AT91C_TC0_IER             (0xFFFA0024) // (TC0) Interrupt Enable Register
-#define AT91C_TC0_RC              (0xFFFA001C) // (TC0) Register C
-#define AT91C_TC0_RA              (0xFFFA0014) // (TC0) Register A
-#define AT91C_TC0_CMR             (0xFFFA0004) // (TC0) Channel Mode Register
-#define AT91C_TC0_IDR             (0xFFFA0028) // (TC0) Interrupt Disable Register
-#define AT91C_TC0_SR              (0xFFFA0020) // (TC0) Status Register
-#define AT91C_TC0_RB              (0xFFFA0018) // (TC0) Register B
-#define AT91C_TC0_CV              (0xFFFA0010) // (TC0) Counter Value
-#define AT91C_TC0_CCR             (0xFFFA0000) // (TC0) Channel Control Register
-// ========== Register definition for TCB0 peripheral ========== 
-#define AT91C_TCB0_BMR            (0xFFFA00C4) // (TCB0) TC Block Mode Register
-#define AT91C_TCB0_BCR            (0xFFFA00C0) // (TCB0) TC Block Control Register
-// ========== Register definition for UHP peripheral ========== 
-#define AT91C_UHP_HcRhDescriptorA (0x00300048) // (UHP) Root Hub characteristics A
-#define AT91C_UHP_HcRhPortStatus  (0x00300054) // (UHP) Root Hub Port Status Register
-#define AT91C_UHP_HcRhDescriptorB (0x0030004C) // (UHP) Root Hub characteristics B
-#define AT91C_UHP_HcControl       (0x00300004) // (UHP) Operating modes for the Host Controller
-#define AT91C_UHP_HcInterruptStatus (0x0030000C) // (UHP) Interrupt Status Register
-#define AT91C_UHP_HcRhStatus      (0x00300050) // (UHP) Root Hub Status register
-#define AT91C_UHP_HcRevision      (0x00300000) // (UHP) Revision
-#define AT91C_UHP_HcCommandStatus (0x00300008) // (UHP) Command & status Register
-#define AT91C_UHP_HcInterruptEnable (0x00300010) // (UHP) Interrupt Enable Register
-#define AT91C_UHP_HcHCCA          (0x00300018) // (UHP) Pointer to the Host Controller Communication Area
-#define AT91C_UHP_HcControlHeadED (0x00300020) // (UHP) First Endpoint Descriptor of the Control list
-#define AT91C_UHP_HcInterruptDisable (0x00300014) // (UHP) Interrupt Disable Register
-#define AT91C_UHP_HcPeriodCurrentED (0x0030001C) // (UHP) Current Isochronous or Interrupt Endpoint Descriptor
-#define AT91C_UHP_HcControlCurrentED (0x00300024) // (UHP) Endpoint Control and Status Register
-#define AT91C_UHP_HcBulkCurrentED (0x0030002C) // (UHP) Current endpoint of the Bulk list
-#define AT91C_UHP_HcFmInterval    (0x00300034) // (UHP) Bit time between 2 consecutive SOFs
-#define AT91C_UHP_HcBulkHeadED    (0x00300028) // (UHP) First endpoint register of the Bulk list
-#define AT91C_UHP_HcBulkDoneHead  (0x00300030) // (UHP) Last completed transfer descriptor
-#define AT91C_UHP_HcFmRemaining   (0x00300038) // (UHP) Bit time remaining in the current Frame
-#define AT91C_UHP_HcPeriodicStart (0x00300040) // (UHP) Periodic Start
-#define AT91C_UHP_HcLSThreshold   (0x00300044) // (UHP) LS Threshold
-#define AT91C_UHP_HcFmNumber      (0x0030003C) // (UHP) Frame number
-// ========== Register definition for EMAC peripheral ========== 
-#define AT91C_EMAC_RSR            (0xFFFBC020) // (EMAC) Receive Status Register
-#define AT91C_EMAC_MAN            (0xFFFBC034) // (EMAC) PHY Maintenance Register
-#define AT91C_EMAC_HSH            (0xFFFBC090) // (EMAC) Hash Address High[63:32]
-#define AT91C_EMAC_MCOL           (0xFFFBC048) // (EMAC) Multiple Collision Frame Register
-#define AT91C_EMAC_IER            (0xFFFBC028) // (EMAC) Interrupt Enable Register
-#define AT91C_EMAC_SA2H           (0xFFFBC0A4) // (EMAC) Specific Address 2 High, Last 2 bytes
-#define AT91C_EMAC_HSL            (0xFFFBC094) // (EMAC) Hash Address Low[31:0]
-#define AT91C_EMAC_LCOL           (0xFFFBC05C) // (EMAC) Late Collision Register
-#define AT91C_EMAC_OK             (0xFFFBC04C) // (EMAC) Frames Received OK Register
-#define AT91C_EMAC_CFG            (0xFFFBC004) // (EMAC) Network Configuration Register
-#define AT91C_EMAC_SA3L           (0xFFFBC0A8) // (EMAC) Specific Address 3 Low, First 4 bytes
-#define AT91C_EMAC_SEQE           (0xFFFBC050) // (EMAC) Frame Check Sequence Error Register
-#define AT91C_EMAC_ECOL           (0xFFFBC060) // (EMAC) Excessive Collision Register
-#define AT91C_EMAC_ELR            (0xFFFBC070) // (EMAC) Excessive Length Error Register
-#define AT91C_EMAC_SR             (0xFFFBC008) // (EMAC) Network Status Register
-#define AT91C_EMAC_RBQP           (0xFFFBC018) // (EMAC) Receive Buffer Queue Pointer
-#define AT91C_EMAC_CSE            (0xFFFBC064) // (EMAC) Carrier Sense Error Register
-#define AT91C_EMAC_RJB            (0xFFFBC074) // (EMAC) Receive Jabber Register
-#define AT91C_EMAC_USF            (0xFFFBC078) // (EMAC) Undersize Frame Register
-#define AT91C_EMAC_IDR            (0xFFFBC02C) // (EMAC) Interrupt Disable Register
-#define AT91C_EMAC_SA1L           (0xFFFBC098) // (EMAC) Specific Address 1 Low, First 4 bytes
-#define AT91C_EMAC_IMR            (0xFFFBC030) // (EMAC) Interrupt Mask Register
-#define AT91C_EMAC_FRA            (0xFFFBC040) // (EMAC) Frames Transmitted OK Register
-#define AT91C_EMAC_SA3H           (0xFFFBC0AC) // (EMAC) Specific Address 3 High, Last 2 bytes
-#define AT91C_EMAC_SA1H           (0xFFFBC09C) // (EMAC) Specific Address 1 High, Last 2 bytes
-#define AT91C_EMAC_SCOL           (0xFFFBC044) // (EMAC) Single Collision Frame Register
-#define AT91C_EMAC_ALE            (0xFFFBC054) // (EMAC) Alignment Error Register
-#define AT91C_EMAC_TAR            (0xFFFBC00C) // (EMAC) Transmit Address Register
-#define AT91C_EMAC_SA4L           (0xFFFBC0B0) // (EMAC) Specific Address 4 Low, First 4 bytes
-#define AT91C_EMAC_SA2L           (0xFFFBC0A0) // (EMAC) Specific Address 2 Low, First 4 bytes
-#define AT91C_EMAC_TUE            (0xFFFBC068) // (EMAC) Transmit Underrun Error Register
-#define AT91C_EMAC_DTE            (0xFFFBC058) // (EMAC) Deferred Transmission Frame Register
-#define AT91C_EMAC_TCR            (0xFFFBC010) // (EMAC) Transmit Control Register
-#define AT91C_EMAC_CTL            (0xFFFBC000) // (EMAC) Network Control Register
-#define AT91C_EMAC_SA4H           (0xFFFBC0B4) // (EMAC) Specific Address 4 High, Last 2 bytesr
-#define AT91C_EMAC_CDE            (0xFFFBC06C) // (EMAC) Code Error Register
-#define AT91C_EMAC_SQEE           (0xFFFBC07C) // (EMAC) SQE Test Error Register
-#define AT91C_EMAC_TSR            (0xFFFBC014) // (EMAC) Transmit Status Register
-#define AT91C_EMAC_DRFC           (0xFFFBC080) // (EMAC) Discarded RX Frame Register
-// ========== Register definition for EBI peripheral ========== 
-#define AT91C_EBI_CFGR            (0xFFFFFF64) // (EBI) Configuration Register
-#define AT91C_EBI_CSA             (0xFFFFFF60) // (EBI) Chip Select Assignment Register
-// ========== Register definition for SMC2 peripheral ========== 
-#define AT91C_SMC2_CSR            (0xFFFFFF70) // (SMC2) SMC2 Chip Select Register
-// ========== Register definition for SDRC peripheral ========== 
-#define AT91C_SDRC_IMR            (0xFFFFFFAC) // (SDRC) SDRAM Controller Interrupt Mask Register
-#define AT91C_SDRC_IER            (0xFFFFFFA4) // (SDRC) SDRAM Controller Interrupt Enable Register
-#define AT91C_SDRC_SRR            (0xFFFFFF9C) // (SDRC) SDRAM Controller Self Refresh Register
-#define AT91C_SDRC_TR             (0xFFFFFF94) // (SDRC) SDRAM Controller Refresh Timer Register
-#define AT91C_SDRC_ISR            (0xFFFFFFB0) // (SDRC) SDRAM Controller Interrupt Mask Register
-#define AT91C_SDRC_IDR            (0xFFFFFFA8) // (SDRC) SDRAM Controller Interrupt Disable Register
-#define AT91C_SDRC_LPR            (0xFFFFFFA0) // (SDRC) SDRAM Controller Low Power Register
-#define AT91C_SDRC_CR             (0xFFFFFF98) // (SDRC) SDRAM Controller Configuration Register
-#define AT91C_SDRC_MR             (0xFFFFFF90) // (SDRC) SDRAM Controller Mode Register
-// ========== Register definition for BFC peripheral ========== 
-#define AT91C_BFC_MR              (0xFFFFFFC0) // (BFC) BFC Mode Register
-
-// *****************************************************************************
-//               PIO DEFINITIONS FOR AT91RM9200
-// *****************************************************************************
-#define AT91C_PIO_PA0             (1 <<  0) // Pin Controlled by PA0
-#define AT91C_PA0_MISO            (AT91C_PIO_PA0) //  SPI Master In Slave
-#define AT91C_PA0_PCK3            (AT91C_PIO_PA0) //  PMC Programmable Clock Output 3
-#define AT91C_PIO_PA1             (1 <<  1) // Pin Controlled by PA1
-#define AT91C_PA1_MOSI            (AT91C_PIO_PA1) //  SPI Master Out Slave
-#define AT91C_PA1_PCK0            (AT91C_PIO_PA1) //  PMC Programmable Clock Output 0
-#define AT91C_PIO_PA10            (1 << 10) // Pin Controlled by PA10
-#define AT91C_PA10_ETX1           (AT91C_PIO_PA10) //  Ethernet MAC Transmit Data 1
-#define AT91C_PA10_MCDB1          (AT91C_PIO_PA10) //  Multimedia Card B Data 1
-#define AT91C_PIO_PA11            (1 << 11) // Pin Controlled by PA11
-#define AT91C_PA11_ECRS_ECRSDV    (AT91C_PIO_PA11) //  Ethernet MAC Carrier Sense/Carrier Sense and Data Valid
-#define AT91C_PA11_MCDB2          (AT91C_PIO_PA11) //  Multimedia Card B Data 2
-#define AT91C_PIO_PA12            (1 << 12) // Pin Controlled by PA12
-#define AT91C_PA12_ERX0           (AT91C_PIO_PA12) //  Ethernet MAC Receive Data 0
-#define AT91C_PA12_MCDB3          (AT91C_PIO_PA12) //  Multimedia Card B Data 3
-#define AT91C_PIO_PA13            (1 << 13) // Pin Controlled by PA13
-#define AT91C_PA13_ERX1           (AT91C_PIO_PA13) //  Ethernet MAC Receive Data 1
-#define AT91C_PA13_TCLK0          (AT91C_PIO_PA13) //  Timer Counter 0 external clock input
-#define AT91C_PIO_PA14            (1 << 14) // Pin Controlled by PA14
-#define AT91C_PA14_ERXER          (AT91C_PIO_PA14) //  Ethernet MAC Receive Error
-#define AT91C_PA14_TCLK1          (AT91C_PIO_PA14) //  Timer Counter 1 external clock input
-#define AT91C_PIO_PA15            (1 << 15) // Pin Controlled by PA15
-#define AT91C_PA15_EMDC           (AT91C_PIO_PA15) //  Ethernet MAC Management Data Clock
-#define AT91C_PA15_TCLK2          (AT91C_PIO_PA15) //  Timer Counter 2 external clock input
-#define AT91C_PIO_PA16            (1 << 16) // Pin Controlled by PA16
-#define AT91C_PA16_EMDIO          (AT91C_PIO_PA16) //  Ethernet MAC Management Data Input/Output
-#define AT91C_PA16_IRQ6           (AT91C_PIO_PA16) //  AIC Interrupt input 6
-#define AT91C_PIO_PA17            (1 << 17) // Pin Controlled by PA17
-#define AT91C_PA17_TXD0           (AT91C_PIO_PA17) //  USART 0 Transmit Data
-#define AT91C_PA17_TIOA0          (AT91C_PIO_PA17) //  Timer Counter 0 Multipurpose Timer I/O Pin A
-#define AT91C_PIO_PA18            (1 << 18) // Pin Controlled by PA18
-#define AT91C_PA18_RXD0           (AT91C_PIO_PA18) //  USART 0 Receive Data
-#define AT91C_PA18_TIOB0          (AT91C_PIO_PA18) //  Timer Counter 0 Multipurpose Timer I/O Pin B
-#define AT91C_PIO_PA19            (1 << 19) // Pin Controlled by PA19
-#define AT91C_PA19_SCK0           (AT91C_PIO_PA19) //  USART 0 Serial Clock
-#define AT91C_PA19_TIOA1          (AT91C_PIO_PA19) //  Timer Counter 1 Multipurpose Timer I/O Pin A
-#define AT91C_PIO_PA2             (1 <<  2) // Pin Controlled by PA2
-#define AT91C_PA2_SPCK            (AT91C_PIO_PA2) //  SPI Serial Clock
-#define AT91C_PA2_IRQ4            (AT91C_PIO_PA2) //  AIC Interrupt Input 4
-#define AT91C_PIO_PA20            (1 << 20) // Pin Controlled by PA20
-#define AT91C_PA20_CTS0           (AT91C_PIO_PA20) //  USART 0 Clear To Send
-#define AT91C_PA20_TIOB1          (AT91C_PIO_PA20) //  Timer Counter 1 Multipurpose Timer I/O Pin B
-#define AT91C_PIO_PA21            (1 << 21) // Pin Controlled by PA21
-#define AT91C_PA21_RTS0           (AT91C_PIO_PA21) //  Usart 0 Ready To Send
-#define AT91C_PA21_TIOA2          (AT91C_PIO_PA21) //  Timer Counter 2 Multipurpose Timer I/O Pin A
-#define AT91C_PIO_PA22            (1 << 22) // Pin Controlled by PA22
-#define AT91C_PA22_RXD2           (AT91C_PIO_PA22) //  USART 2 Receive Data
-#define AT91C_PA22_TIOB2          (AT91C_PIO_PA22) //  Timer Counter 2 Multipurpose Timer I/O Pin B
-#define AT91C_PIO_PA23            (1 << 23) // Pin Controlled by PA23
-#define AT91C_PA23_TXD2           (AT91C_PIO_PA23) //  USART 2 Transmit Data
-#define AT91C_PA23_IRQ3           (AT91C_PIO_PA23) //  Interrupt input 3
-#define AT91C_PIO_PA24            (1 << 24) // Pin Controlled by PA24
-#define AT91C_PA24_SCK2           (AT91C_PIO_PA24) //  USART2 Serial Clock
-#define AT91C_PA24_PCK1           (AT91C_PIO_PA24) //  PMC Programmable Clock Output 1
-#define AT91C_PIO_PA25            (1 << 25) // Pin Controlled by PA25
-#define AT91C_PA25_TWD            (AT91C_PIO_PA25) //  TWI Two-wire Serial Data
-#define AT91C_PA25_IRQ2           (AT91C_PIO_PA25) //  Interrupt input 2
-#define AT91C_PIO_PA26            (1 << 26) // Pin Controlled by PA26
-#define AT91C_PA26_TWCK           (AT91C_PIO_PA26) //  TWI Two-wire Serial Clock
-#define AT91C_PA26_IRQ1           (AT91C_PIO_PA26) //  Interrupt input 1
-#define AT91C_PIO_PA27            (1 << 27) // Pin Controlled by PA27
-#define AT91C_PA27_MCCK           (AT91C_PIO_PA27) //  Multimedia Card Clock
-#define AT91C_PA27_TCLK3          (AT91C_PIO_PA27) //  Timer Counter 3 External Clock Input
-#define AT91C_PIO_PA28            (1 << 28) // Pin Controlled by PA28
-#define AT91C_PA28_MCCDA          (AT91C_PIO_PA28) //  Multimedia Card A Command
-#define AT91C_PA28_TCLK4          (AT91C_PIO_PA28) //  Timer Counter 4 external Clock Input
-#define AT91C_PIO_PA29            (1 << 29) // Pin Controlled by PA29
-#define AT91C_PA29_MCDA0          (AT91C_PIO_PA29) //  Multimedia Card A Data 0
-#define AT91C_PA29_TCLK5          (AT91C_PIO_PA29) //  Timer Counter 5 external clock input
-#define AT91C_PIO_PA3             (1 <<  3) // Pin Controlled by PA3
-#define AT91C_PA3_NPCS0           (AT91C_PIO_PA3) //  SPI Peripheral Chip Select 0
-#define AT91C_PA3_IRQ5            (AT91C_PIO_PA3) //  AIC Interrupt Input 5
-#define AT91C_PIO_PA30            (1 << 30) // Pin Controlled by PA30
-#define AT91C_PA30_DRXD           (AT91C_PIO_PA30) //  DBGU Debug Receive Data
-#define AT91C_PA30_CTS2           (AT91C_PIO_PA30) //  Usart 2 Clear To Send
-#define AT91C_PIO_PA31            (1 << 31) // Pin Controlled by PA31
-#define AT91C_PA31_DTXD           (AT91C_PIO_PA31) //  DBGU Debug Transmit Data
-#define AT91C_PA31_RTS2           (AT91C_PIO_PA31) //  USART 2 Ready To Send
-#define AT91C_PIO_PA4             (1 <<  4) // Pin Controlled by PA4
-#define AT91C_PA4_NPCS1           (AT91C_PIO_PA4) //  SPI Peripheral Chip Select 1
-#define AT91C_PA4_PCK1            (AT91C_PIO_PA4) //  PMC Programmable Clock Output 1
-#define AT91C_PIO_PA5             (1 <<  5) // Pin Controlled by PA5
-#define AT91C_PA5_NPCS2           (AT91C_PIO_PA5) //  SPI Peripheral Chip Select 2
-#define AT91C_PA5_TXD3            (AT91C_PIO_PA5) //  USART 3 Transmit Data
-#define AT91C_PIO_PA6             (1 <<  6) // Pin Controlled by PA6
-#define AT91C_PA6_NPCS3           (AT91C_PIO_PA6) //  SPI Peripheral Chip Select 3
-#define AT91C_PA6_RXD3            (AT91C_PIO_PA6) //  USART 3 Receive Data
-#define AT91C_PIO_PA7             (1 <<  7) // Pin Controlled by PA7
-#define AT91C_PA7_ETXCK_EREFCK    (AT91C_PIO_PA7) //  Ethernet MAC Transmit Clock/Reference Clock
-#define AT91C_PA7_PCK2            (AT91C_PIO_PA7) //  PMC Programmable Clock 2
-#define AT91C_PIO_PA8             (1 <<  8) // Pin Controlled by PA8
-#define AT91C_PA8_ETXEN           (AT91C_PIO_PA8) //  Ethernet MAC Transmit Enable
-#define AT91C_PA8_MCCDB           (AT91C_PIO_PA8) //  Multimedia Card B Command
-#define AT91C_PIO_PA9             (1 <<  9) // Pin Controlled by PA9
-#define AT91C_PA9_ETX0            (AT91C_PIO_PA9) //  Ethernet MAC Transmit Data 0
-#define AT91C_PA9_MCDB0           (AT91C_PIO_PA9) //  Multimedia Card B Data 0
-#define AT91C_PIO_PB0             (1 <<  0) // Pin Controlled by PB0
-#define AT91C_PB0_TF0             (AT91C_PIO_PB0) //  SSC Transmit Frame Sync 0
-#define AT91C_PB0_TIOB3           (AT91C_PIO_PB0) //  Timer Counter 3 Multipurpose Timer I/O Pin B
-#define AT91C_PIO_PB1             (1 <<  1) // Pin Controlled by PB1
-#define AT91C_PB1_TK0             (AT91C_PIO_PB1) //  SSC Transmit Clock 0
-#define AT91C_PB1_CTS3            (AT91C_PIO_PB1) //  USART 3 Clear To Send
-#define AT91C_PIO_PB10            (1 << 10) // Pin Controlled by PB10
-#define AT91C_PB10_RK1            (AT91C_PIO_PB10) //  SSC Receive Clock 1
-#define AT91C_PB10_TIOA5          (AT91C_PIO_PB10) //  Timer Counter 5 Multipurpose Timer I/O Pin A
-#define AT91C_PIO_PB11            (1 << 11) // Pin Controlled by PB11
-#define AT91C_PB11_RF1            (AT91C_PIO_PB11) //  SSC Receive Frame Sync 1
-#define AT91C_PB11_TIOB5          (AT91C_PIO_PB11) //  Timer Counter 5 Multipurpose Timer I/O Pin B
-#define AT91C_PIO_PB12            (1 << 12) // Pin Controlled by PB12
-#define AT91C_PB12_TF2            (AT91C_PIO_PB12) //  SSC Transmit Frame Sync 2
-#define AT91C_PB12_ETX2           (AT91C_PIO_PB12) //  Ethernet MAC Transmit Data 2
-#define AT91C_PIO_PB13            (1 << 13) // Pin Controlled by PB13
-#define AT91C_PB13_TK2            (AT91C_PIO_PB13) //  SSC Transmit Clock 2
-#define AT91C_PB13_ETX3           (AT91C_PIO_PB13) //  Ethernet MAC Transmit Data 3
-#define AT91C_PIO_PB14            (1 << 14) // Pin Controlled by PB14
-#define AT91C_PB14_TD2            (AT91C_PIO_PB14) //  SSC Transmit Data 2
-#define AT91C_PB14_ETXER          (AT91C_PIO_PB14) //  Ethernet MAC Transmikt Coding Error
-#define AT91C_PIO_PB15            (1 << 15) // Pin Controlled by PB15
-#define AT91C_PB15_RD2            (AT91C_PIO_PB15) //  SSC Receive Data 2
-#define AT91C_PB15_ERX2           (AT91C_PIO_PB15) //  Ethernet MAC Receive Data 2
-#define AT91C_PIO_PB16            (1 << 16) // Pin Controlled by PB16
-#define AT91C_PB16_RK2            (AT91C_PIO_PB16) //  SSC Receive Clock 2
-#define AT91C_PB16_ERX3           (AT91C_PIO_PB16) //  Ethernet MAC Receive Data 3
-#define AT91C_PIO_PB17            (1 << 17) // Pin Controlled by PB17
-#define AT91C_PB17_RF2            (AT91C_PIO_PB17) //  SSC Receive Frame Sync 2
-#define AT91C_PB17_ERXDV          (AT91C_PIO_PB17) //  Ethernet MAC Receive Data Valid
-#define AT91C_PIO_PB18            (1 << 18) // Pin Controlled by PB18
-#define AT91C_PB18_RI1            (AT91C_PIO_PB18) //  USART 1 Ring Indicator
-#define AT91C_PB18_ECOL           (AT91C_PIO_PB18) //  Ethernet MAC Collision Detected
-#define AT91C_PIO_PB19            (1 << 19) // Pin Controlled by PB19
-#define AT91C_PB19_DTR1           (AT91C_PIO_PB19) //  USART 1 Data Terminal ready
-#define AT91C_PB19_ERXCK          (AT91C_PIO_PB19) //  Ethernet MAC Receive Clock
-#define AT91C_PIO_PB2             (1 <<  2) // Pin Controlled by PB2
-#define AT91C_PB2_TD0             (AT91C_PIO_PB2) //  SSC Transmit data
-#define AT91C_PB2_SCK3            (AT91C_PIO_PB2) //  USART 3 Serial Clock
-#define AT91C_PIO_PB20            (1 << 20) // Pin Controlled by PB20
-#define AT91C_PB20_TXD1           (AT91C_PIO_PB20) //  USART 1 Transmit Data
-#define AT91C_PIO_PB21            (1 << 21) // Pin Controlled by PB21
-#define AT91C_PB21_RXD1           (AT91C_PIO_PB21) //  USART 1 Receive Data
-#define AT91C_PIO_PB22            (1 << 22) // Pin Controlled by PB22
-#define AT91C_PB22_SCK1           (AT91C_PIO_PB22) //  USART1 Serial Clock
-#define AT91C_PIO_PB23            (1 << 23) // Pin Controlled by PB23
-#define AT91C_PB23_DCD1           (AT91C_PIO_PB23) //  USART 1 Data Carrier Detect
-#define AT91C_PIO_PB24            (1 << 24) // Pin Controlled by PB24
-#define AT91C_PB24_CTS1           (AT91C_PIO_PB24) //  USART 1 Clear To Send
-#define AT91C_PIO_PB25            (1 << 25) // Pin Controlled by PB25
-#define AT91C_PB25_DSR1           (AT91C_PIO_PB25) //  USART 1 Data Set ready
-#define AT91C_PB25_EF100          (AT91C_PIO_PB25) //  Ethernet MAC Force 100 Mbits/sec
-#define AT91C_PIO_PB26            (1 << 26) // Pin Controlled by PB26
-#define AT91C_PB26_RTS1           (AT91C_PIO_PB26) //  Usart 0 Ready To Send
-#define AT91C_PIO_PB27            (1 << 27) // Pin Controlled by PB27
-#define AT91C_PB27_PCK0           (AT91C_PIO_PB27) //  PMC Programmable Clock Output 0
-#define AT91C_PIO_PB28            (1 << 28) // Pin Controlled by PB28
-#define AT91C_PB28_FIQ            (AT91C_PIO_PB28) //  AIC Fast Interrupt Input
-#define AT91C_PIO_PB29            (1 << 29) // Pin Controlled by PB29
-#define AT91C_PB29_IRQ0           (AT91C_PIO_PB29) //  Interrupt input 0
-#define AT91C_PIO_PB3             (1 <<  3) // Pin Controlled by PB3
-#define AT91C_PB3_RD0             (AT91C_PIO_PB3) //  SSC Receive Data
-#define AT91C_PB3_MCDA1           (AT91C_PIO_PB3) //  Multimedia Card A Data 1
-#define AT91C_PIO_PB4             (1 <<  4) // Pin Controlled by PB4
-#define AT91C_PB4_RK0             (AT91C_PIO_PB4) //  SSC Receive Clock
-#define AT91C_PB4_MCDA2           (AT91C_PIO_PB4) //  Multimedia Card A Data 2
-#define AT91C_PIO_PB5             (1 <<  5) // Pin Controlled by PB5
-#define AT91C_PB5_RF0             (AT91C_PIO_PB5) //  SSC Receive Frame Sync 0
-#define AT91C_PB5_MCDA3           (AT91C_PIO_PB5) //  Multimedia Card A Data 3
-#define AT91C_PIO_PB6             (1 <<  6) // Pin Controlled by PB6
-#define AT91C_PB6_TF1             (AT91C_PIO_PB6) //  SSC Transmit Frame Sync 1
-#define AT91C_PB6_TIOA3           (AT91C_PIO_PB6) //  Timer Counter 4 Multipurpose Timer I/O Pin A
-#define AT91C_PIO_PB7             (1 <<  7) // Pin Controlled by PB7
-#define AT91C_PB7_TK1             (AT91C_PIO_PB7) //  SSC Transmit Clock 1
-#define AT91C_PB7_TIOB3           (AT91C_PIO_PB7) //  Timer Counter 3 Multipurpose Timer I/O Pin B
-#define AT91C_PIO_PB8             (1 <<  8) // Pin Controlled by PB8
-#define AT91C_PB8_TD1             (AT91C_PIO_PB8) //  SSC Transmit Data 1
-#define AT91C_PB8_TIOA4           (AT91C_PIO_PB8) //  Timer Counter 4 Multipurpose Timer I/O Pin A
-#define AT91C_PIO_PB9             (1 <<  9) // Pin Controlled by PB9
-#define AT91C_PB9_RD1             (AT91C_PIO_PB9) //  SSC Receive Data 1
-#define AT91C_PB9_TIOB4           (AT91C_PIO_PB9) //  Timer Counter 4 Multipurpose Timer I/O Pin B
-#define AT91C_PIO_PC0             (1 <<  0) // Pin Controlled by PC0
-#define AT91C_PC0_BFCK            (AT91C_PIO_PC0) //  Burst Flash Clock
-#define AT91C_PIO_PC1             (1 <<  1) // Pin Controlled by PC1
-#define AT91C_PC1_BFRDY_SMOE      (AT91C_PIO_PC1) //  Burst Flash Ready
-#define AT91C_PIO_PC10            (1 << 10) // Pin Controlled by PC10
-#define AT91C_PC10_NCS4_CFCS      (AT91C_PIO_PC10) //  Compact Flash Chip Select
-#define AT91C_PIO_PC11            (1 << 11) // Pin Controlled by PC11
-#define AT91C_PC11_NCS5_CFCE1     (AT91C_PIO_PC11) //  Chip Select 5 / Compact Flash Chip Enable 1
-#define AT91C_PIO_PC12            (1 << 12) // Pin Controlled by PC12
-#define AT91C_PC12_NCS6_CFCE2     (AT91C_PIO_PC12) //  Chip Select 6 / Compact Flash Chip Enable 2
-#define AT91C_PIO_PC13            (1 << 13) // Pin Controlled by PC13
-#define AT91C_PC13_NCS7           (AT91C_PIO_PC13) //  Chip Select 7
-#define AT91C_PIO_PC14            (1 << 14) // Pin Controlled by PC14
-#define AT91C_PIO_PC15            (1 << 15) // Pin Controlled by PC15
-#define AT91C_PIO_PC16            (1 << 16) // Pin Controlled by PC16
-#define AT91C_PC16_D16            (AT91C_PIO_PC16) //  Data Bus [16]
-#define AT91C_PIO_PC17            (1 << 17) // Pin Controlled by PC17
-#define AT91C_PC17_D17            (AT91C_PIO_PC17) //  Data Bus [17]
-#define AT91C_PIO_PC18            (1 << 18) // Pin Controlled by PC18
-#define AT91C_PC18_D18            (AT91C_PIO_PC18) //  Data Bus [18]
-#define AT91C_PIO_PC19            (1 << 19) // Pin Controlled by PC19
-#define AT91C_PC19_D19            (AT91C_PIO_PC19) //  Data Bus [19]
-#define AT91C_PIO_PC2             (1 <<  2) // Pin Controlled by PC2
-#define AT91C_PC2_BFAVD           (AT91C_PIO_PC2) //  Burst Flash Address Valid
-#define AT91C_PIO_PC20            (1 << 20) // Pin Controlled by PC20
-#define AT91C_PC20_D20            (AT91C_PIO_PC20) //  Data Bus [20]
-#define AT91C_PIO_PC21            (1 << 21) // Pin Controlled by PC21
-#define AT91C_PC21_D21            (AT91C_PIO_PC21) //  Data Bus [21]
-#define AT91C_PIO_PC22            (1 << 22) // Pin Controlled by PC22
-#define AT91C_PC22_D22            (AT91C_PIO_PC22) //  Data Bus [22]
-#define AT91C_PIO_PC23            (1 << 23) // Pin Controlled by PC23
-#define AT91C_PC23_D23            (AT91C_PIO_PC23) //  Data Bus [23]
-#define AT91C_PIO_PC24            (1 << 24) // Pin Controlled by PC24
-#define AT91C_PC24_D24            (AT91C_PIO_PC24) //  Data Bus [24]
-#define AT91C_PIO_PC25            (1 << 25) // Pin Controlled by PC25
-#define AT91C_PC25_D25            (AT91C_PIO_PC25) //  Data Bus [25]
-#define AT91C_PIO_PC26            (1 << 26) // Pin Controlled by PC26
-#define AT91C_PC26_D26            (AT91C_PIO_PC26) //  Data Bus [26]
-#define AT91C_PIO_PC27            (1 << 27) // Pin Controlled by PC27
-#define AT91C_PC27_D27            (AT91C_PIO_PC27) //  Data Bus [27]
-#define AT91C_PIO_PC28            (1 << 28) // Pin Controlled by PC28
-#define AT91C_PC28_D28            (AT91C_PIO_PC28) //  Data Bus [28]
-#define AT91C_PIO_PC29            (1 << 29) // Pin Controlled by PC29
-#define AT91C_PC29_D29            (AT91C_PIO_PC29) //  Data Bus [29]
-#define AT91C_PIO_PC3             (1 <<  3) // Pin Controlled by PC3
-#define AT91C_PC3_BFBAA_SMWE      (AT91C_PIO_PC3) //  Burst Flash Address Advance / SmartMedia Write Enable
-#define AT91C_PIO_PC30            (1 << 30) // Pin Controlled by PC30
-#define AT91C_PC30_D30            (AT91C_PIO_PC30) //  Data Bus [30]
-#define AT91C_PIO_PC31            (1 << 31) // Pin Controlled by PC31
-#define AT91C_PC31_D31            (AT91C_PIO_PC31) //  Data Bus [31]
-#define AT91C_PIO_PC4             (1 <<  4) // Pin Controlled by PC4
-#define AT91C_PC4_BFOE            (AT91C_PIO_PC4) //  Burst Flash Output Enable
-#define AT91C_PIO_PC5             (1 <<  5) // Pin Controlled by PC5
-#define AT91C_PC5_BFWE            (AT91C_PIO_PC5) //  Burst Flash Write Enable
-#define AT91C_PIO_PC6             (1 <<  6) // Pin Controlled by PC6
-#define AT91C_PC6_NWAIT           (AT91C_PIO_PC6) //  NWAIT
-#define AT91C_PIO_PC7             (1 <<  7) // Pin Controlled by PC7
-#define AT91C_PC7_A23             (AT91C_PIO_PC7) //  Address Bus[23]
-#define AT91C_PIO_PC8             (1 <<  8) // Pin Controlled by PC8
-#define AT91C_PC8_A24             (AT91C_PIO_PC8) //  Address Bus[24]
-#define AT91C_PIO_PC9             (1 <<  9) // Pin Controlled by PC9
-#define AT91C_PC9_A25_CFRNW       (AT91C_PIO_PC9) //  Address Bus[25] /  Compact Flash Read Not Write
-#define AT91C_PIO_PD0             (1 <<  0) // Pin Controlled by PD0
-#define AT91C_PD0_ETX0            (AT91C_PIO_PD0) //  Ethernet MAC Transmit Data 0
-#define AT91C_PIO_PD1             (1 <<  1) // Pin Controlled by PD1
-#define AT91C_PD1_ETX1            (AT91C_PIO_PD1) //  Ethernet MAC Transmit Data 1
-#define AT91C_PIO_PD10            (1 << 10) // Pin Controlled by PD10
-#define AT91C_PD10_PCK3           (AT91C_PIO_PD10) //  PMC Programmable Clock Output 3
-#define AT91C_PD10_TPS1           (AT91C_PIO_PD10) //  ETM ARM9 pipeline status 1
-#define AT91C_PIO_PD11            (1 << 11) // Pin Controlled by PD11
-#define AT91C_PD11_               (AT91C_PIO_PD11) //  
-#define AT91C_PD11_TPS2           (AT91C_PIO_PD11) //  ETM ARM9 pipeline status 2
-#define AT91C_PIO_PD12            (1 << 12) // Pin Controlled by PD12
-#define AT91C_PD12_               (AT91C_PIO_PD12) //  
-#define AT91C_PD12_TPK0           (AT91C_PIO_PD12) //  ETM Trace Packet 0
-#define AT91C_PIO_PD13            (1 << 13) // Pin Controlled by PD13
-#define AT91C_PD13_               (AT91C_PIO_PD13) //  
-#define AT91C_PD13_TPK1           (AT91C_PIO_PD13) //  ETM Trace Packet 1
-#define AT91C_PIO_PD14            (1 << 14) // Pin Controlled by PD14
-#define AT91C_PD14_               (AT91C_PIO_PD14) //  
-#define AT91C_PD14_TPK2           (AT91C_PIO_PD14) //  ETM Trace Packet 2
-#define AT91C_PIO_PD15            (1 << 15) // Pin Controlled by PD15
-#define AT91C_PD15_TD0            (AT91C_PIO_PD15) //  SSC Transmit data
-#define AT91C_PD15_TPK3           (AT91C_PIO_PD15) //  ETM Trace Packet 3
-#define AT91C_PIO_PD16            (1 << 16) // Pin Controlled by PD16
-#define AT91C_PD16_TD1            (AT91C_PIO_PD16) //  SSC Transmit Data 1
-#define AT91C_PD16_TPK4           (AT91C_PIO_PD16) //  ETM Trace Packet 4
-#define AT91C_PIO_PD17            (1 << 17) // Pin Controlled by PD17
-#define AT91C_PD17_TD2            (AT91C_PIO_PD17) //  SSC Transmit Data 2
-#define AT91C_PD17_TPK5           (AT91C_PIO_PD17) //  ETM Trace Packet 5
-#define AT91C_PIO_PD18            (1 << 18) // Pin Controlled by PD18
-#define AT91C_PD18_NPCS1          (AT91C_PIO_PD18) //  SPI Peripheral Chip Select 1
-#define AT91C_PD18_TPK6           (AT91C_PIO_PD18) //  ETM Trace Packet 6
-#define AT91C_PIO_PD19            (1 << 19) // Pin Controlled by PD19
-#define AT91C_PD19_NPCS2          (AT91C_PIO_PD19) //  SPI Peripheral Chip Select 2
-#define AT91C_PD19_TPK7           (AT91C_PIO_PD19) //  ETM Trace Packet 7
-#define AT91C_PIO_PD2             (1 <<  2) // Pin Controlled by PD2
-#define AT91C_PD2_ETX2            (AT91C_PIO_PD2) //  Ethernet MAC Transmit Data 2
-#define AT91C_PIO_PD20            (1 << 20) // Pin Controlled by PD20
-#define AT91C_PD20_NPCS3          (AT91C_PIO_PD20) //  SPI Peripheral Chip Select 3
-#define AT91C_PD20_TPK8           (AT91C_PIO_PD20) //  ETM Trace Packet 8
-#define AT91C_PIO_PD21            (1 << 21) // Pin Controlled by PD21
-#define AT91C_PD21_RTS0           (AT91C_PIO_PD21) //  Usart 0 Ready To Send
-#define AT91C_PD21_TPK9           (AT91C_PIO_PD21) //  ETM Trace Packet 9
-#define AT91C_PIO_PD22            (1 << 22) // Pin Controlled by PD22
-#define AT91C_PD22_RTS1           (AT91C_PIO_PD22) //  Usart 0 Ready To Send
-#define AT91C_PD22_TPK10          (AT91C_PIO_PD22) //  ETM Trace Packet 10
-#define AT91C_PIO_PD23            (1 << 23) // Pin Controlled by PD23
-#define AT91C_PD23_RTS2           (AT91C_PIO_PD23) //  USART 2 Ready To Send
-#define AT91C_PD23_TPK11          (AT91C_PIO_PD23) //  ETM Trace Packet 11
-#define AT91C_PIO_PD24            (1 << 24) // Pin Controlled by PD24
-#define AT91C_PD24_RTS3           (AT91C_PIO_PD24) //  USART 3 Ready To Send
-#define AT91C_PD24_TPK12          (AT91C_PIO_PD24) //  ETM Trace Packet 12
-#define AT91C_PIO_PD25            (1 << 25) // Pin Controlled by PD25
-#define AT91C_PD25_DTR1           (AT91C_PIO_PD25) //  USART 1 Data Terminal ready
-#define AT91C_PD25_TPK13          (AT91C_PIO_PD25) //  ETM Trace Packet 13
-#define AT91C_PIO_PD26            (1 << 26) // Pin Controlled by PD26
-#define AT91C_PD26_TPK14          (AT91C_PIO_PD26) //  ETM Trace Packet 14
-#define AT91C_PIO_PD27            (1 << 27) // Pin Controlled by PD27
-#define AT91C_PD27_TPK15          (AT91C_PIO_PD27) //  ETM Trace Packet 15
-#define AT91C_PIO_PD3             (1 <<  3) // Pin Controlled by PD3
-#define AT91C_PD3_ETX3            (AT91C_PIO_PD3) //  Ethernet MAC Transmit Data 3
-#define AT91C_PIO_PD4             (1 <<  4) // Pin Controlled by PD4
-#define AT91C_PD4_ETXEN           (AT91C_PIO_PD4) //  Ethernet MAC Transmit Enable
-#define AT91C_PIO_PD5             (1 <<  5) // Pin Controlled by PD5
-#define AT91C_PD5_ETXER           (AT91C_PIO_PD5) //  Ethernet MAC Transmikt Coding Error
-#define AT91C_PIO_PD6             (1 <<  6) // Pin Controlled by PD6
-#define AT91C_PD6_DTXD            (AT91C_PIO_PD6) //  DBGU Debug Transmit Data
-#define AT91C_PIO_PD7             (1 <<  7) // Pin Controlled by PD7
-#define AT91C_PD7_PCK0            (AT91C_PIO_PD7) //  PMC Programmable Clock Output 0
-#define AT91C_PD7_TSYNC           (AT91C_PIO_PD7) //  ETM Synchronization signal
-#define AT91C_PIO_PD8             (1 <<  8) // Pin Controlled by PD8
-#define AT91C_PD8_PCK1            (AT91C_PIO_PD8) //  PMC Programmable Clock Output 1
-#define AT91C_PD8_TCLK            (AT91C_PIO_PD8) //  ETM Trace Clock signal
-#define AT91C_PIO_PD9             (1 <<  9) // Pin Controlled by PD9
-#define AT91C_PD9_PCK2            (AT91C_PIO_PD9) //  PMC Programmable Clock 2
-#define AT91C_PD9_TPS0            (AT91C_PIO_PD9) //  ETM ARM9 pipeline status 0
-
-// *****************************************************************************
-//               PERIPHERAL ID DEFINITIONS FOR AT91RM9200
-// *****************************************************************************
-#define AT91C_ID_FIQ              ( 0) // Advanced Interrupt Controller (FIQ)
-#define AT91C_ID_SYS              ( 1) // System Peripheral
-#define AT91C_ID_PIOA             ( 2) // Parallel IO Controller A 
-#define AT91C_ID_PIOB             ( 3) // Parallel IO Controller B
-#define AT91C_ID_PIOC             ( 4) // Parallel IO Controller C
-#define AT91C_ID_PIOD             ( 5) // Parallel IO Controller D
-#define AT91C_ID_US0              ( 6) // USART 0
-#define AT91C_ID_US1              ( 7) // USART 1
-#define AT91C_ID_US2              ( 8) // USART 2
-#define AT91C_ID_US3              ( 9) // USART 3
-#define AT91C_ID_MCI              (10) // Multimedia Card Interface
-#define AT91C_ID_UDP              (11) // USB Device Port
-#define AT91C_ID_TWI              (12) // Two-Wire Interface
-#define AT91C_ID_SPI              (13) // Serial Peripheral Interface
-#define AT91C_ID_SSC0             (14) // Serial Synchronous Controller 0
-#define AT91C_ID_SSC1             (15) // Serial Synchronous Controller 1
-#define AT91C_ID_SSC2             (16) // Serial Synchronous Controller 2
-#define AT91C_ID_TC0              (17) // Timer Counter 0
-#define AT91C_ID_TC1              (18) // Timer Counter 1
-#define AT91C_ID_TC2              (19) // Timer Counter 2
-#define AT91C_ID_TC3              (20) // Timer Counter 3
-#define AT91C_ID_TC4              (21) // Timer Counter 4
-#define AT91C_ID_TC5              (22) // Timer Counter 5
-#define AT91C_ID_UHP              (23) // USB Host port
-#define AT91C_ID_EMAC             (24) // Ethernet MAC
-#define AT91C_ID_IRQ0             (25) // Advanced Interrupt Controller (IRQ0)
-#define AT91C_ID_IRQ1             (26) // Advanced Interrupt Controller (IRQ1)
-#define AT91C_ID_IRQ2             (27) // Advanced Interrupt Controller (IRQ2)
-#define AT91C_ID_IRQ3             (28) // Advanced Interrupt Controller (IRQ3)
-#define AT91C_ID_IRQ4             (29) // Advanced Interrupt Controller (IRQ4)
-#define AT91C_ID_IRQ5             (30) // Advanced Interrupt Controller (IRQ5)
-#define AT91C_ID_IRQ6             (31) // Advanced Interrupt Controller (IRQ6)
-
-// *****************************************************************************
-//               BASE ADDRESS DEFINITIONS FOR AT91RM9200
-// *****************************************************************************
-#define AT91C_BASE_SYS            (0xFFFFF000) // (SYS) Base Address
-#define AT91C_BASE_MC             (0xFFFFFF00) // (MC) Base Address
-#define AT91C_BASE_RTC            (0xFFFFFE00) // (RTC) Base Address
-#define AT91C_BASE_ST             (0xFFFFFD00) // (ST) Base Address
-#define AT91C_BASE_PMC            (0xFFFFFC00) // (PMC) Base Address
-#define AT91C_BASE_CKGR           (0xFFFFFC20) // (CKGR) Base Address
-#define AT91C_BASE_PIOD           (0xFFFFFA00) // (PIOD) Base Address
-#define AT91C_BASE_PIOC           (0xFFFFF800) // (PIOC) Base Address
-#define AT91C_BASE_PIOB           (0xFFFFF600) // (PIOB) Base Address
-#define AT91C_BASE_PIOA           (0xFFFFF400) // (PIOA) Base Address
-#define AT91C_BASE_DBGU           (0xFFFFF200) // (DBGU) Base Address
-#define AT91C_BASE_PDC_DBGU       (0xFFFFF300) // (PDC_DBGU) Base Address
-#define AT91C_BASE_AIC            (0xFFFFF000) // (AIC) Base Address
-#define AT91C_BASE_PDC_SPI        (0xFFFE0100) // (PDC_SPI) Base Address
-#define AT91C_BASE_SPI            (0xFFFE0000) // (SPI) Base Address
-#define AT91C_BASE_PDC_SSC2       (0xFFFD8100) // (PDC_SSC2) Base Address
-#define AT91C_BASE_SSC2           (0xFFFD8000) // (SSC2) Base Address
-#define AT91C_BASE_PDC_SSC1       (0xFFFD4100) // (PDC_SSC1) Base Address
-#define AT91C_BASE_SSC1           (0xFFFD4000) // (SSC1) Base Address
-#define AT91C_BASE_PDC_SSC0       (0xFFFD0100) // (PDC_SSC0) Base Address
-#define AT91C_BASE_SSC0           (0xFFFD0000) // (SSC0) Base Address
-#define AT91C_BASE_PDC_US3        (0xFFFCC100) // (PDC_US3) Base Address
-#define AT91C_BASE_US3            (0xFFFCC000) // (US3) Base Address
-#define AT91C_BASE_PDC_US2        (0xFFFC8100) // (PDC_US2) Base Address
-#define AT91C_BASE_US2            (0xFFFC8000) // (US2) Base Address
-#define AT91C_BASE_PDC_US1        (0xFFFC4100) // (PDC_US1) Base Address
-#define AT91C_BASE_US1            (0xFFFC4000) // (US1) Base Address
-#define AT91C_BASE_PDC_US0        (0xFFFC0100) // (PDC_US0) Base Address
-#define AT91C_BASE_US0            (0xFFFC0000) // (US0) Base Address
-#define AT91C_BASE_TWI            (0xFFFB8000) // (TWI) Base Address
-#define AT91C_BASE_PDC_MCI        (0xFFFB4100) // (PDC_MCI) Base Address
-#define AT91C_BASE_MCI            (0xFFFB4000) // (MCI) Base Address
-#define AT91C_BASE_UDP            (0xFFFB0000) // (UDP) Base Address
-#define AT91C_BASE_TC5            (0xFFFA4080) // (TC5) Base Address
-#define AT91C_BASE_TC4            (0xFFFA4040) // (TC4) Base Address
-#define AT91C_BASE_TC3            (0xFFFA4000) // (TC3) Base Address
-#define AT91C_BASE_TCB1           (0xFFFA4080) // (TCB1) Base Address
-#define AT91C_BASE_TC2            (0xFFFA0080) // (TC2) Base Address
-#define AT91C_BASE_TC1            (0xFFFA0040) // (TC1) Base Address
-#define AT91C_BASE_TC0            (0xFFFA0000) // (TC0) Base Address
-#define AT91C_BASE_TCB0           (0xFFFA0000) // (TCB0) Base Address
-#define AT91C_BASE_UHP            (0x00300000) // (UHP) Base Address
-#define AT91C_BASE_EMAC           (0xFFFBC000) // (EMAC) Base Address
-#define AT91C_BASE_EBI            (0xFFFFFF60) // (EBI) Base Address
-#define AT91C_BASE_SMC2           (0xFFFFFF70) // (SMC2) Base Address
-#define AT91C_BASE_SDRC           (0xFFFFFF90) // (SDRC) Base Address
-#define AT91C_BASE_BFC            (0xFFFFFFC0) // (BFC) Base Address
-
-// *****************************************************************************
-//               MEMORY MAPPING DEFINITIONS FOR AT91RM9200
-// *****************************************************************************
-#define AT91C_ISRAM	              (0x00200000) // Internal SRAM base address
-#define AT91C_ISRAM_SIZE	         (0x00004000) // Internal SRAM size in byte (16 Kbyte)
-#define AT91C_IROM 	              (0x00100000) // Internal ROM base address
-#define AT91C_IROM_SIZE	          (0x00020000) // Internal ROM size in byte (128 Kbyte)
-
-
diff --git a/target/linux/at91/image/dfboot/src/include/led.h b/target/linux/at91/image/dfboot/src/include/led.h
deleted file mode 100644
index 9bebd9c3c..000000000
--- a/target/linux/at91/image/dfboot/src/include/led.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * (C) Copyright 2006
- * Atmel Nordic AB <www.atmel.com>
- * Ulf Samuelsson <ulf@atmel.com>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
- 
- #ifndef __LED_H
-#define __LED_H
-
-#ifndef	__ASSEMBLY__
-extern void	LED_init (void);
-extern void	LED_set(unsigned int led);
-extern void	red_LED_on(void);
-extern void	red_LED_off(void);
-extern void	green_LED_on(void);
-extern void	green_LED_off(void);
-extern void	yellow_LED_on(void);
-extern void	yellow_LED_off(void);
-extern void	LED_blink(unsigned int led);
-#else
-	.extern LED_init
-	.extern LED_set
-	.extern LED_blink
-	.extern red_LED_on
-	.extern red_LED_off
-	.extern yellow_LED_on
-	.extern yellow_LED_off
-	.extern green_LED_on
-	.extern green_LED_off
-#endif
-#endif
diff --git a/target/linux/at91/image/dfboot/src/include/lib_AT91RM9200.h b/target/linux/at91/image/dfboot/src/include/lib_AT91RM9200.h
deleted file mode 100644
index c322b32a4..000000000
--- a/target/linux/at91/image/dfboot/src/include/lib_AT91RM9200.h
+++ /dev/null
@@ -1,2978 +0,0 @@
-//*----------------------------------------------------------------------------
-//*         ATMEL Microcontroller Software Support  -  ROUSSET  -
-//*----------------------------------------------------------------------------
-//* The software is delivered "AS IS" without warranty or condition of any
-//* kind, either express, implied or statutory. This includes without
-//* limitation any warranty or condition with respect to merchantability or
-//* fitness for any particular purpose, or against the infringements of
-//* intellectual property rights of others.
-//*----------------------------------------------------------------------------
-//* File Name           : lib_AT91RM9200.h
-//* Object              : AT91RM9200 inlined functions
-//* Generated           : AT91 SW Application Group  11/19/2003 (17:20:51)
-//*
-//* CVS Reference       : /lib_pdc.h/1.2/Tue Jul 02 12:29:40 2002//
-//* CVS Reference       : /lib_dbgu.h/1.1/Fri Jan 31 12:18:40 2003//
-//* CVS Reference       : /lib_rtc_1245d.h/1.1/Fri Jan 31 12:19:12 2003//
-//* CVS Reference       : /lib_ssc.h/1.4/Fri Jan 31 12:19:20 2003//
-//* CVS Reference       : /lib_spi_AT91RMxxxx.h/1.2/Fri Jan 31 12:19:31 2003//
-//* CVS Reference       : /lib_tc_1753b.h/1.1/Fri Jan 31 12:20:02 2003//
-//* CVS Reference       : /lib_pmc.h/1.3/Thu Nov 14 07:40:45 2002//
-//* CVS Reference       : /lib_pio.h/1.3/Fri Jan 31 12:18:56 2003//
-//* CVS Reference       : /lib_twi.h/1.2/Fri Jan 31 12:19:38 2003//
-//* CVS Reference       : /lib_usart.h/1.5/Thu Nov 21 16:01:53 2002//
-//* CVS Reference       : /lib_mci.h/1.2/Wed Nov 20 14:18:55 2002//
-//* CVS Reference       : /lib_aic.h/1.3/Fri Jul 12 07:46:11 2002//
-//* CVS Reference       : /lib_udp.h/1.3/Fri Jan 31 12:19:48 2003//
-//* CVS Reference       : /lib_st.h/1.4/Fri Jan 31 12:20:13 2003//
-//*----------------------------------------------------------------------------
-
-#ifndef lib_AT91RM9200_H
-#define lib_AT91RM9200_H
-
-/* *****************************************************************************
-                SOFTWARE API FOR PDC
-   ***************************************************************************** */
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PDC_SetNextRx
-//* \brief Set the next receive transfer descriptor
-//*----------------------------------------------------------------------------
-static inline void AT91F_PDC_SetNextRx (
-	AT91PS_PDC pPDC,     // \arg pointer to a PDC controller
-	char *address,       // \arg address to the next bloc to be received
-	unsigned int bytes)  // \arg number of bytes to be received
-{
-	pPDC->PDC_RNPR = (unsigned int) address;
-	pPDC->PDC_RNCR = bytes;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PDC_SetNextTx
-//* \brief Set the next transmit transfer descriptor
-//*----------------------------------------------------------------------------
-static inline void AT91F_PDC_SetNextTx (
-	AT91PS_PDC pPDC,       // \arg pointer to a PDC controller
-	char *address,         // \arg address to the next bloc to be transmitted
-	unsigned int bytes)    // \arg number of bytes to be transmitted
-{
-	pPDC->PDC_TNPR = (unsigned int) address;
-	pPDC->PDC_TNCR = bytes;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PDC_SetRx
-//* \brief Set the receive transfer descriptor
-//*----------------------------------------------------------------------------
-static inline void AT91F_PDC_SetRx (
-	AT91PS_PDC pPDC,       // \arg pointer to a PDC controller
-	char *address,         // \arg address to the next bloc to be received
-	unsigned int bytes)    // \arg number of bytes to be received
-{
-	pPDC->PDC_RPR = (unsigned int) address;
-	pPDC->PDC_RCR = bytes;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PDC_SetTx
-//* \brief Set the transmit transfer descriptor
-//*----------------------------------------------------------------------------
-static inline void AT91F_PDC_SetTx (
-	AT91PS_PDC pPDC,       // \arg pointer to a PDC controller
-	char *address,         // \arg address to the next bloc to be transmitted
-	unsigned int bytes)    // \arg number of bytes to be transmitted
-{
-	pPDC->PDC_TPR = (unsigned int) address;
-	pPDC->PDC_TCR = bytes;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PDC_EnableTx
-//* \brief Enable transmit
-//*----------------------------------------------------------------------------
-static inline void AT91F_PDC_EnableTx (
-	AT91PS_PDC pPDC )       // \arg pointer to a PDC controller
-{
-	pPDC->PDC_PTCR = AT91C_PDC_TXTEN;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PDC_EnableRx
-//* \brief Enable receive
-//*----------------------------------------------------------------------------
-static inline void AT91F_PDC_EnableRx (
-	AT91PS_PDC pPDC )       // \arg pointer to a PDC controller
-{
-	pPDC->PDC_PTCR = AT91C_PDC_RXTEN;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PDC_DisableTx
-//* \brief Disable transmit
-//*----------------------------------------------------------------------------
-static inline void AT91F_PDC_DisableTx (
-	AT91PS_PDC pPDC )       // \arg pointer to a PDC controller
-{
-	pPDC->PDC_PTCR = AT91C_PDC_TXTDIS;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PDC_DisableRx
-//* \brief Disable receive
-//*----------------------------------------------------------------------------
-static inline void AT91F_PDC_DisableRx (
-	AT91PS_PDC pPDC )       // \arg pointer to a PDC controller
-{
-	pPDC->PDC_PTCR = AT91C_PDC_RXTDIS;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PDC_IsTxEmpty
-//* \brief Test if the current transfer descriptor has been sent
-//*----------------------------------------------------------------------------
-static inline int AT91F_PDC_IsTxEmpty ( // \return return 1 if transfer is complete
-	AT91PS_PDC pPDC )       // \arg pointer to a PDC controller
-{
-	return !(pPDC->PDC_TCR);
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PDC_IsNextTxEmpty
-//* \brief Test if the next transfer descriptor has been moved to the current td
-//*----------------------------------------------------------------------------
-static inline int AT91F_PDC_IsNextTxEmpty ( // \return return 1 if transfer is complete
-	AT91PS_PDC pPDC )       // \arg pointer to a PDC controller
-{
-	return !(pPDC->PDC_TNCR);
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PDC_IsRxEmpty
-//* \brief Test if the current transfer descriptor has been filled
-//*----------------------------------------------------------------------------
-static inline int AT91F_PDC_IsRxEmpty ( // \return return 1 if transfer is complete
-	AT91PS_PDC pPDC )       // \arg pointer to a PDC controller
-{
-	return !(pPDC->PDC_RCR);
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PDC_IsNextRxEmpty
-//* \brief Test if the next transfer descriptor has been moved to the current td
-//*----------------------------------------------------------------------------
-static inline int AT91F_PDC_IsNextRxEmpty ( // \return return 1 if transfer is complete
-	AT91PS_PDC pPDC )       // \arg pointer to a PDC controller
-{
-	return !(pPDC->PDC_RNCR);
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PDC_Open
-//* \brief Open PDC: disable TX and RX reset transfer descriptors, re-enable RX and TX
-//*----------------------------------------------------------------------------
-static inline void AT91F_PDC_Open (
-	AT91PS_PDC pPDC)       // \arg pointer to a PDC controller
-{
-    //* Disable the RX and TX PDC transfer requests
-	AT91F_PDC_DisableRx(pPDC);
-	AT91F_PDC_DisableTx(pPDC);
-
-	//* Reset all Counter register Next buffer first
-	AT91F_PDC_SetNextTx(pPDC, (char *) 0, 0);
-	AT91F_PDC_SetNextRx(pPDC, (char *) 0, 0);
-	AT91F_PDC_SetTx(pPDC, (char *) 0, 0);
-	AT91F_PDC_SetRx(pPDC, (char *) 0, 0);
-
-    //* Enable the RX and TX PDC transfer requests
-	AT91F_PDC_EnableRx(pPDC);
-	AT91F_PDC_EnableTx(pPDC);
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PDC_Close
-//* \brief Close PDC: disable TX and RX reset transfer descriptors
-//*----------------------------------------------------------------------------
-static inline void AT91F_PDC_Close (
-	AT91PS_PDC pPDC)       // \arg pointer to a PDC controller
-{
-    //* Disable the RX and TX PDC transfer requests
-	AT91F_PDC_DisableRx(pPDC);
-	AT91F_PDC_DisableTx(pPDC);
-
-	//* Reset all Counter register Next buffer first
-	AT91F_PDC_SetNextTx(pPDC, (char *) 0, 0);
-	AT91F_PDC_SetNextRx(pPDC, (char *) 0, 0);
-	AT91F_PDC_SetTx(pPDC, (char *) 0, 0);
-	AT91F_PDC_SetRx(pPDC, (char *) 0, 0);
-
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PDC_SendFrame
-//* \brief Close PDC: disable TX and RX reset transfer descriptors
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_PDC_SendFrame(
-	AT91PS_PDC pPDC,
-	char *pBuffer,
-	unsigned int szBuffer,
-	char *pNextBuffer,
-	unsigned int szNextBuffer )
-{
-	if (AT91F_PDC_IsTxEmpty(pPDC)) {
-		//* Buffer and next buffer can be initialized
-		AT91F_PDC_SetTx(pPDC, pBuffer, szBuffer);
-		AT91F_PDC_SetNextTx(pPDC, pNextBuffer, szNextBuffer);
-		return 2;
-	}
-	else if (AT91F_PDC_IsNextTxEmpty(pPDC)) {
-		//* Only one buffer can be initialized
-		AT91F_PDC_SetNextTx(pPDC, pBuffer, szBuffer);
-		return 1;
-	}
-	else {
-		//* All buffer are in use...
-		return 0;
-	}
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PDC_ReceiveFrame
-//* \brief Close PDC: disable TX and RX reset transfer descriptors
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_PDC_ReceiveFrame (
-	AT91PS_PDC pPDC,
-	char *pBuffer,
-	unsigned int szBuffer,
-	char *pNextBuffer,
-	unsigned int szNextBuffer )
-{
-	if (AT91F_PDC_IsRxEmpty(pPDC)) {
-		//* Buffer and next buffer can be initialized
-		AT91F_PDC_SetRx(pPDC, pBuffer, szBuffer);
-		AT91F_PDC_SetNextRx(pPDC, pNextBuffer, szNextBuffer);
-		return 2;
-	}
-	else if (AT91F_PDC_IsNextRxEmpty(pPDC)) {
-		//* Only one buffer can be initialized
-		AT91F_PDC_SetNextRx(pPDC, pBuffer, szBuffer);
-		return 1;
-	}
-	else {
-		//* All buffer are in use...
-		return 0;
-	}
-}
-/* *****************************************************************************
-                SOFTWARE API FOR DBGU
-   ***************************************************************************** */
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_DBGU_InterruptEnable
-//* \brief Enable DBGU Interrupt
-//*----------------------------------------------------------------------------
-static inline void AT91F_DBGU_InterruptEnable(
-        AT91PS_DBGU pDbgu,   // \arg  pointer to a DBGU controller
-        unsigned int flag) // \arg  dbgu interrupt to be enabled
-{
-        pDbgu->DBGU_IER = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_DBGU_InterruptDisable
-//* \brief Disable DBGU Interrupt
-//*----------------------------------------------------------------------------
-static inline void AT91F_DBGU_InterruptDisable(
-        AT91PS_DBGU pDbgu,   // \arg  pointer to a DBGU controller
-        unsigned int flag) // \arg  dbgu interrupt to be disabled
-{
-        pDbgu->DBGU_IDR = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_DBGU_GetInterruptMaskStatus
-//* \brief Return DBGU Interrupt Mask Status
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_DBGU_GetInterruptMaskStatus( // \return DBGU Interrupt Mask Status
-        AT91PS_DBGU pDbgu) // \arg  pointer to a DBGU controller
-{
-        return pDbgu->DBGU_IMR;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_DBGU_IsInterruptMasked
-//* \brief Test if DBGU Interrupt is Masked 
-//*----------------------------------------------------------------------------
-static inline int AT91F_DBGU_IsInterruptMasked(
-        AT91PS_DBGU pDbgu,   // \arg  pointer to a DBGU controller
-        unsigned int flag) // \arg  flag to be tested
-{
-        return (AT91F_DBGU_GetInterruptMaskStatus(pDbgu) & flag);
-}
-
-/* *****************************************************************************
-                SOFTWARE API FOR RTC
-   ***************************************************************************** */
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_RTC_InterruptEnable
-//* \brief Enable RTC Interrupt
-//*----------------------------------------------------------------------------
-static inline void AT91F_RTC_InterruptEnable(
-        AT91PS_RTC pRtc,   // \arg  pointer to a RTC controller
-        unsigned int flag) // \arg  RTC interrupt to be enabled
-{
-        pRtc->RTC_IER = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_RTC_InterruptDisable
-//* \brief Disable RTC Interrupt
-//*----------------------------------------------------------------------------
-static inline void AT91F_RTC_InterruptDisable(
-        AT91PS_RTC pRtc,   // \arg  pointer to a RTC controller
-        unsigned int flag) // \arg  RTC interrupt to be disabled
-{
-        pRtc->RTC_IDR = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_RTC_GetInterruptMaskStatus
-//* \brief Return RTC Interrupt Mask Status
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_RTC_GetInterruptMaskStatus( // \return RTC Interrupt Mask Status
-        AT91PS_RTC pRtc) // \arg  pointer to a RTC controller
-{
-        return pRtc->RTC_IMR;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_RTC_IsInterruptMasked
-//* \brief Test if RTC Interrupt is Masked 
-//*----------------------------------------------------------------------------
-static inline int AT91F_RTC_IsInterruptMasked(
-        AT91PS_RTC pRtc,   // \arg  pointer to a RTC controller
-        unsigned int flag) // \arg  flag to be tested
-{
-        return (AT91F_RTC_GetInterruptMaskStatus(pRtc) & flag);
-}
-
-/* *****************************************************************************
-                SOFTWARE API FOR SSC
-   ***************************************************************************** */
-//* Define the standard I2S mode configuration
-
-//* Configuration to set in the SSC Transmit Clock Mode Register
-//* Parameters :  nb_bit_by_slot : 8, 16 or 32 bits
-//* 			  nb_slot_by_frame : number of channels
-#define AT91C_I2S_ASY_MASTER_TX_SETTING(nb_bit_by_slot, nb_slot_by_frame)( +\
-									   AT91C_SSC_CKS_DIV   +\
-                            		   AT91C_SSC_CKO_CONTINOUS      +\
-                            		   AT91C_SSC_CKG_NONE    +\
-                                       AT91C_SSC_START_FALL_RF +\
-                           			   AT91C_SSC_STTOUT  +\
-                            		   ((1<<16) & AT91C_SSC_STTDLY) +\
-                            		   ((((nb_bit_by_slot*nb_slot_by_frame)/2)-1) <<24))
-
-
-//* Configuration to set in the SSC Transmit Frame Mode Register
-//* Parameters : nb_bit_by_slot : 8, 16 or 32 bits
-//* 			 nb_slot_by_frame : number of channels
-#define AT91C_I2S_ASY_TX_FRAME_SETTING(nb_bit_by_slot, nb_slot_by_frame)( +\
-									(nb_bit_by_slot-1)  +\
-                            		AT91C_SSC_MSBF   +\
-                            		(((nb_slot_by_frame-1)<<8) & AT91C_SSC_DATNB)  +\
-                            		(((nb_bit_by_slot-1)<<16) & AT91C_SSC_FSLEN) +\
-                            		AT91C_SSC_FSOS_NEGATIVE)
-
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SSC_SetBaudrate
-//* \brief Set the baudrate according to the CPU clock
-//*----------------------------------------------------------------------------
-static inline void AT91F_SSC_SetBaudrate (
-        AT91PS_SSC pSSC,        // \arg pointer to a SSC controller
-        unsigned int mainClock, // \arg peripheral clock
-        unsigned int speed)     // \arg SSC baudrate
-{
-        unsigned int baud_value;
-        //* Define the baud rate divisor register
-        if (speed == 0)
-           baud_value = 0;
-        else
-        {
-           baud_value = (unsigned int) (mainClock * 10)/(2*speed);
-           if ((baud_value % 10) >= 5)
-                  baud_value = (baud_value / 10) + 1;
-           else
-                  baud_value /= 10;
-        }
-
-        pSSC->SSC_CMR = baud_value;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SSC_Configure
-//* \brief Configure SSC
-//*----------------------------------------------------------------------------
-static inline void AT91F_SSC_Configure (
-             AT91PS_SSC pSSC,          // \arg pointer to a SSC controller
-             unsigned int syst_clock,  // \arg System Clock Frequency
-             unsigned int baud_rate,   // \arg Expected Baud Rate Frequency
-             unsigned int clock_rx,    // \arg Receiver Clock Parameters
-             unsigned int mode_rx,     // \arg mode Register to be programmed
-             unsigned int clock_tx,    // \arg Transmitter Clock Parameters
-             unsigned int mode_tx)     // \arg mode Register to be programmed
-{
-    //* Disable interrupts
-	pSSC->SSC_IDR = (unsigned int) -1;
-
-    //* Reset receiver and transmitter
-	pSSC->SSC_CR = AT91C_SSC_SWRST | AT91C_SSC_RXDIS | AT91C_SSC_TXDIS ;
-
-    //* Define the Clock Mode Register
-	AT91F_SSC_SetBaudrate(pSSC, syst_clock, baud_rate);
-
-     //* Write the Receive Clock Mode Register
-	pSSC->SSC_RCMR =  clock_rx;
-
-     //* Write the Transmit Clock Mode Register
-	pSSC->SSC_TCMR =  clock_tx;
-
-     //* Write the Receive Frame Mode Register
-	pSSC->SSC_RFMR =  mode_rx;
-
-     //* Write the Transmit Frame Mode Register
-	pSSC->SSC_TFMR =  mode_tx;
-
-    //* Clear Transmit and Receive Counters
-	AT91F_PDC_Open((AT91PS_PDC) &(pSSC->SSC_RPR));
-
-
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SSC_EnableRx
-//* \brief Enable receiving datas
-//*----------------------------------------------------------------------------
-static inline void AT91F_SSC_EnableRx (
-	AT91PS_SSC pSSC)     // \arg pointer to a SSC controller
-{
-    //* Enable receiver
-    pSSC->SSC_CR = AT91C_SSC_RXEN;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SSC_DisableRx
-//* \brief Disable receiving datas
-//*----------------------------------------------------------------------------
-static inline void AT91F_SSC_DisableRx (
-	AT91PS_SSC pSSC)     // \arg pointer to a SSC controller
-{
-    //* Disable receiver
-    pSSC->SSC_CR = AT91C_SSC_RXDIS;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SSC_EnableTx
-//* \brief Enable sending datas
-//*----------------------------------------------------------------------------
-static inline void AT91F_SSC_EnableTx (
-	AT91PS_SSC pSSC)     // \arg pointer to a SSC controller
-{
-    //* Enable  transmitter
-    pSSC->SSC_CR = AT91C_SSC_TXEN;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SSC_DisableTx
-//* \brief Disable sending datas
-//*----------------------------------------------------------------------------
-static inline void AT91F_SSC_DisableTx (
-	AT91PS_SSC pSSC)     // \arg pointer to a SSC controller
-{
-    //* Disable  transmitter
-    pSSC->SSC_CR = AT91C_SSC_TXDIS;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SSC_EnableIt
-//* \brief Enable SSC IT
-//*----------------------------------------------------------------------------
-static inline void AT91F_SSC_EnableIt (
-	AT91PS_SSC pSSC, // \arg pointer to a SSC controller
-	unsigned int flag)   // \arg IT to be enabled
-{
-	//* Write to the IER register
-	pSSC->SSC_IER = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SSC_DisableIt
-//* \brief Disable SSC IT
-//*----------------------------------------------------------------------------
-static inline void AT91F_SSC_DisableIt (
-	AT91PS_SSC pSSC, // \arg pointer to a SSC controller
-	unsigned int flag)   // \arg IT to be disabled
-{
-	//* Write to the IDR register
-	pSSC->SSC_IDR = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SSC_ReceiveFrame
-//* \brief Return 2 if PDC has been initialized with Buffer and Next Buffer, 1 if PDC has been initialized with Next Buffer, 0 if PDC is busy
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_SSC_ReceiveFrame (
-	AT91PS_SSC pSSC,
-	char *pBuffer,
-	unsigned int szBuffer,
-	char *pNextBuffer,
-	unsigned int szNextBuffer )
-{
-	return AT91F_PDC_ReceiveFrame(
-		(AT91PS_PDC) &(pSSC->SSC_RPR),
-		pBuffer,
-		szBuffer,
-		pNextBuffer,
-		szNextBuffer);
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SSC_SendFrame
-//* \brief Return 2 if PDC has been initialized with Buffer and Next Buffer, 1 if PDC has been initialized with Next Buffer, 0 if PDC is busy
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_SSC_SendFrame(
-	AT91PS_SSC pSSC,
-	char *pBuffer,
-	unsigned int szBuffer,
-	char *pNextBuffer,
-	unsigned int szNextBuffer )
-{
-	return AT91F_PDC_SendFrame(
-		(AT91PS_PDC) &(pSSC->SSC_RPR),
-		pBuffer,
-		szBuffer,
-		pNextBuffer,
-		szNextBuffer);
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SSC_GetInterruptMaskStatus
-//* \brief Return SSC Interrupt Mask Status
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_SSC_GetInterruptMaskStatus( // \return SSC Interrupt Mask Status
-        AT91PS_SSC pSsc) // \arg  pointer to a SSC controller
-{
-        return pSsc->SSC_IMR;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SSC_IsInterruptMasked
-//* \brief Test if SSC Interrupt is Masked 
-//*----------------------------------------------------------------------------
-static inline int AT91F_SSC_IsInterruptMasked(
-        AT91PS_SSC pSsc,   // \arg  pointer to a SSC controller
-        unsigned int flag) // \arg  flag to be tested
-{
-        return (AT91F_SSC_GetInterruptMaskStatus(pSsc) & flag);
-}
-
-/* *****************************************************************************
-                SOFTWARE API FOR SPI
-   ***************************************************************************** */
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SPI_Open
-//* \brief Open a SPI Port
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_SPI_Open (
-        const unsigned int null)  // \arg
-{
-        /* NOT DEFINED AT THIS MOMENT */
-        return ( 0 );
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SPI_CfgCs
-//* \brief Configure SPI chip select register
-//*----------------------------------------------------------------------------
-static inline void AT91F_SPI_CfgCs (
-	int cs,     // SPI cs number (0 to 3)
- 	int val)   //  chip select register
-{
-	//* Write to the CSR register
-	*(AT91C_SPI_CSR + cs) = val;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SPI_EnableIt
-//* \brief Enable SPI interrupt
-//*----------------------------------------------------------------------------
-static inline void AT91F_SPI_EnableIt (
-	AT91PS_SPI pSPI,     // pointer to a SPI controller
-	unsigned int flag)   // IT to be enabled
-{
-	//* Write to the IER register
-	pSPI->SPI_IER = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SPI_DisableIt
-//* \brief Disable SPI interrupt
-//*----------------------------------------------------------------------------
-static inline void AT91F_SPI_DisableIt (
-	AT91PS_SPI pSPI, // pointer to a SPI controller
-	unsigned int flag) // IT to be disabled
-{
-	//* Write to the IDR register
-	pSPI->SPI_IDR = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SPI_Reset
-//* \brief Reset the SPI controller
-//*----------------------------------------------------------------------------
-static inline void AT91F_SPI_Reset (
-	AT91PS_SPI pSPI // pointer to a SPI controller
-	)
-{
-	//* Write to the CR register
-	pSPI->SPI_CR = AT91C_SPI_SWRST;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SPI_Enable
-//* \brief Enable the SPI controller
-//*----------------------------------------------------------------------------
-static inline void AT91F_SPI_Enable (
-	AT91PS_SPI pSPI // pointer to a SPI controller
-	)
-{
-	//* Write to the CR register
-	pSPI->SPI_CR = AT91C_SPI_SPIEN;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SPI_Disable
-//* \brief Disable the SPI controller
-//*----------------------------------------------------------------------------
-static inline void AT91F_SPI_Disable (
-	AT91PS_SPI pSPI // pointer to a SPI controller
-	)
-{
-	//* Write to the CR register
-	pSPI->SPI_CR = AT91C_SPI_SPIDIS;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SPI_CfgMode
-//* \brief Enable the SPI controller
-//*----------------------------------------------------------------------------
-static inline void AT91F_SPI_CfgMode (
-	AT91PS_SPI pSPI, // pointer to a SPI controller
-	int mode)        // mode register 
-{
-	//* Write to the MR register
-	pSPI->SPI_MR = mode;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SPI_CfgPCS
-//* \brief Switch to the correct PCS of SPI Mode Register : Fixed Peripheral Selected
-//*----------------------------------------------------------------------------
-static inline void AT91F_SPI_CfgPCS (
-	AT91PS_SPI pSPI, // pointer to a SPI controller
-	char PCS_Device) // PCS of the Device
-{	
- 	//* Write to the MR register
-	pSPI->SPI_MR &= 0xFFF0FFFF;
-	pSPI->SPI_MR |= ( (PCS_Device<<16) & AT91C_SPI_PCS );
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SPI_ReceiveFrame
-//* \brief Return 2 if PDC has been initialized with Buffer and Next Buffer, 1 if PDC has been initializaed with Next Buffer, 0 if PDC is busy
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_SPI_ReceiveFrame (
-	AT91PS_SPI pSPI,
-	char *pBuffer,
-	unsigned int szBuffer,
-	char *pNextBuffer,
-	unsigned int szNextBuffer )
-{
-	return AT91F_PDC_ReceiveFrame(
-		(AT91PS_PDC) &(pSPI->SPI_RPR),
-		pBuffer,
-		szBuffer,
-		pNextBuffer,
-		szNextBuffer);
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SPI_SendFrame
-//* \brief Return 2 if PDC has been initialized with Buffer and Next Buffer, 1 if PDC has been initializaed with Next Buffer, 0 if PDC is bSPIy
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_SPI_SendFrame(
-	AT91PS_SPI pSPI,
-	char *pBuffer,
-	unsigned int szBuffer,
-	char *pNextBuffer,
-	unsigned int szNextBuffer )
-{
-	return AT91F_PDC_SendFrame(
-		(AT91PS_PDC) &(pSPI->SPI_RPR),
-		pBuffer,
-		szBuffer,
-		pNextBuffer,
-		szNextBuffer);
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SPI_Close
-//* \brief Close SPI: disable IT disable transfert, close PDC
-//*----------------------------------------------------------------------------
-static inline void AT91F_SPI_Close (
-	AT91PS_SPI pSPI)     // \arg pointer to a SPI controller
-{
-    //* Reset all the Chip Select register
-    pSPI->SPI_CSR[0] = 0 ;
-    pSPI->SPI_CSR[1] = 0 ;
-    pSPI->SPI_CSR[2] = 0 ;
-    pSPI->SPI_CSR[3] = 0 ;
-
-    //* Reset the SPI mode
-    pSPI->SPI_MR = 0  ;
-
-    //* Disable all interrupts
-    pSPI->SPI_IDR = 0xFFFFFFFF ;
-
-    //* Abort the Peripheral Data Transfers
-    AT91F_PDC_Close((AT91PS_PDC) &(pSPI->SPI_RPR));
-
-    //* Disable receiver and transmitter and stop any activity immediately
-    pSPI->SPI_CR = AT91C_SPI_SPIDIS;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SPI_PutChar
-//* \brief Send a character,does not check if ready to send
-//*----------------------------------------------------------------------------
-static inline void AT91F_SPI_PutChar (
-	AT91PS_SPI pSPI,
-	unsigned int character,
-             unsigned int cs_number )
-{
-    unsigned int value_for_cs;
-    value_for_cs = (~(1 << cs_number)) & 0xF;  //Place a zero among a 4 ONEs number
-    pSPI->SPI_TDR = (character & 0xFFFF) | (value_for_cs << 16);
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SPI_GetChar
-//* \brief Receive a character,does not check if a character is available
-//*----------------------------------------------------------------------------
-static inline int AT91F_SPI_GetChar (
-	const AT91PS_SPI pSPI)
-{
-    return((pSPI->SPI_RDR) & 0xFFFF);
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SPI_GetInterruptMaskStatus
-//* \brief Return SPI Interrupt Mask Status
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_SPI_GetInterruptMaskStatus( // \return SPI Interrupt Mask Status
-        AT91PS_SPI pSpi) // \arg  pointer to a SPI controller
-{
-        return pSpi->SPI_IMR;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SPI_IsInterruptMasked
-//* \brief Test if SPI Interrupt is Masked 
-//*----------------------------------------------------------------------------
-static inline int AT91F_SPI_IsInterruptMasked(
-        AT91PS_SPI pSpi,   // \arg  pointer to a SPI controller
-        unsigned int flag) // \arg  flag to be tested
-{
-        return (AT91F_SPI_GetInterruptMaskStatus(pSpi) & flag);
-}
-
-/* *****************************************************************************
-                SOFTWARE API FOR TC
-   ***************************************************************************** */
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_TC_InterruptEnable
-//* \brief Enable TC Interrupt
-//*----------------------------------------------------------------------------
-static inline void AT91F_TC_InterruptEnable(
-        AT91PS_TC pTc,   // \arg  pointer to a TC controller
-        unsigned int flag) // \arg  TC interrupt to be enabled
-{
-        pTc->TC_IER = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_TC_InterruptDisable
-//* \brief Disable TC Interrupt
-//*----------------------------------------------------------------------------
-static inline void AT91F_TC_InterruptDisable(
-        AT91PS_TC pTc,   // \arg  pointer to a TC controller
-        unsigned int flag) // \arg  TC interrupt to be disabled
-{
-        pTc->TC_IDR = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_TC_GetInterruptMaskStatus
-//* \brief Return TC Interrupt Mask Status
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_TC_GetInterruptMaskStatus( // \return TC Interrupt Mask Status
-        AT91PS_TC pTc) // \arg  pointer to a TC controller
-{
-        return pTc->TC_IMR;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_TC_IsInterruptMasked
-//* \brief Test if TC Interrupt is Masked 
-//*----------------------------------------------------------------------------
-static inline int AT91F_TC_IsInterruptMasked(
-        AT91PS_TC pTc,   // \arg  pointer to a TC controller
-        unsigned int flag) // \arg  flag to be tested
-{
-        return (AT91F_TC_GetInterruptMaskStatus(pTc) & flag);
-}
-
-/* *****************************************************************************
-                SOFTWARE API FOR PMC
-   ***************************************************************************** */
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_CKGR_GetMainClock
-//* \brief Return Main clock in Hz
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_CKGR_GetMainClock (
-	AT91PS_CKGR pCKGR, // \arg pointer to CKGR controller
-	unsigned int slowClock)  // \arg slowClock in Hz
-{
-	return ((pCKGR->CKGR_MCFR  & AT91C_CKGR_MAINF) * slowClock) >> 4;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PMC_GetProcessorClock
-//* \brief Return processor clock in Hz (for AT91RM3400 and AT91RM9200)
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_PMC_GetProcessorClock (
-	AT91PS_PMC pPMC, // \arg pointer to PMC controller
-	AT91PS_CKGR pCKGR, // \arg pointer to CKGR controller
-	unsigned int slowClock)  // \arg slowClock in Hz
-{
-	unsigned int reg = pPMC->PMC_MCKR;
-	unsigned int prescaler = (1 << ((reg & AT91C_PMC_PRES) >> 2));
-	unsigned int pllDivider, pllMultiplier;
-
-	switch (reg & AT91C_PMC_CSS) {
-		case AT91C_PMC_CSS_SLOW_CLK: // Slow clock selected
-			return slowClock / prescaler;
-		case AT91C_PMC_CSS_MAIN_CLK: // Main clock is selected
-			return AT91F_CKGR_GetMainClock(pCKGR, slowClock) / prescaler;
-		case AT91C_PMC_CSS_PLLA_CLK: // PLLA clock is selected
-			reg = pCKGR->CKGR_PLLAR;
-			pllDivider    = (reg  & AT91C_CKGR_DIVA);
-			pllMultiplier = ((reg  & AT91C_CKGR_MULA) >> 16) + 1;
-			if (reg & AT91C_CKGR_SRCA) // Source is Main clock
-				return AT91F_CKGR_GetMainClock(pCKGR, slowClock) / pllDivider * pllMultiplier / prescaler;
-			else                       // Source is Slow clock
-				return slowClock / pllDivider * pllMultiplier / prescaler;
-		case AT91C_PMC_CSS_PLLB_CLK: // PLLB clock is selected
-			reg = pCKGR->CKGR_PLLBR;
-			pllDivider    = (reg  & AT91C_CKGR_DIVB);
-			pllMultiplier = ((reg  & AT91C_CKGR_MULB) >> 16) + 1;
-			return AT91F_CKGR_GetMainClock(pCKGR, slowClock) / pllDivider * pllMultiplier / prescaler;
-	}
-	return 0;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PMC_GetMasterClock
-//* \brief Return master clock in Hz (just for AT91RM9200)
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_PMC_GetMasterClock (
-	AT91PS_PMC pPMC, // \arg pointer to PMC controller
-	AT91PS_CKGR pCKGR, // \arg pointer to CKGR controller
-	unsigned int slowClock)  // \arg slowClock in Hz
-{
-	return AT91F_PMC_GetProcessorClock(pPMC, pCKGR, slowClock) /
-		(((pPMC->PMC_MCKR & AT91C_PMC_MDIV) >> 8)+1);
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PMC_EnablePeriphClock
-//* \brief Enable peripheral clock
-//*----------------------------------------------------------------------------
-static inline void AT91F_PMC_EnablePeriphClock (
-	AT91PS_PMC pPMC, // \arg pointer to PMC controller
-	unsigned int periphIds)  // \arg IDs of peripherals to enable
-{
-	pPMC->PMC_PCER = periphIds;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PMC_DisablePeriphClock
-//* \brief Enable peripheral clock
-//*----------------------------------------------------------------------------
-static inline void AT91F_PMC_DisablePeriphClock (
-	AT91PS_PMC pPMC, // \arg pointer to PMC controller
-	unsigned int periphIds)  // \arg IDs of peripherals to enable
-{
-	pPMC->PMC_PCDR = periphIds;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PMC_EnablePCK
-//* \brief Enable peripheral clock
-//*----------------------------------------------------------------------------
-static inline void AT91F_PMC_EnablePCK (
-	AT91PS_PMC pPMC, // \arg pointer to PMC controller
-	unsigned int pck,  // \arg Peripheral clock identifier 0 .. 7
-	unsigned int ccs,  // \arg clock selection: AT91C_PMC_CSS_SLOW_CLK, AT91C_PMC_CSS_MAIN_CLK, AT91C_PMC_CSS_PLLA_CLK, AT91C_PMC_CSS_PLLB_CLK
-	unsigned int pres) // \arg Programmable clock prescalar AT91C_PMC_PRES_CLK, AT91C_PMC_PRES_CLK_2, ..., AT91C_PMC_PRES_CLK_64
-{
-	pPMC->PMC_PCKR[pck] = ccs | pres;
-	pPMC->PMC_SCER = (1 << pck) << 8;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PMC_DisablePCK
-//* \brief Enable peripheral clock
-//*----------------------------------------------------------------------------
-static inline void AT91F_PMC_DisablePCK (
-	AT91PS_PMC pPMC, // \arg pointer to PMC controller
-	unsigned int pck)  // \arg Peripheral clock identifier 0 .. 7
-{
-	pPMC->PMC_SCDR = (1 << pck) << 8;
-}
-
-/* *****************************************************************************
-                SOFTWARE API FOR PIO
-   ***************************************************************************** */
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_CfgPeriph
-//* \brief Enable pins to be drived by peripheral
-//*----------------------------------------------------------------------------
-static inline void AT91F_PIO_CfgPeriph(
-	AT91PS_PIO pPio,             // \arg pointer to a PIO controller
-	unsigned int periphAEnable,  // \arg PERIPH A to enable
-	unsigned int periphBEnable)  // \arg PERIPH B to enable
-
-{
-	pPio->PIO_ASR = periphAEnable;
-	pPio->PIO_BSR = periphBEnable;
-	pPio->PIO_PDR = (periphAEnable | periphBEnable); // Set in Periph mode
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_CfgOutput
-//* \brief Enable PIO in output mode
-//*----------------------------------------------------------------------------
-static inline void AT91F_PIO_CfgOutput(
-	AT91PS_PIO pPio,             // \arg pointer to a PIO controller
-	unsigned int pioEnable)      // \arg PIO to be enabled
-{
-	pPio->PIO_PER = pioEnable; // Set in PIO mode
-	pPio->PIO_OER = pioEnable; // Configure in Output
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_CfgInput
-//* \brief Enable PIO in input mode
-//*----------------------------------------------------------------------------
-static inline void AT91F_PIO_CfgInput(
-	AT91PS_PIO pPio,             // \arg pointer to a PIO controller
-	unsigned int inputEnable)      // \arg PIO to be enabled
-{
-	// Disable output
-	pPio->PIO_ODR  = inputEnable;
-	pPio->PIO_PER  = inputEnable;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_CfgOpendrain
-//* \brief Configure PIO in open drain
-//*----------------------------------------------------------------------------
-static inline void AT91F_PIO_CfgOpendrain(
-	AT91PS_PIO pPio,             // \arg pointer to a PIO controller
-	unsigned int multiDrvEnable) // \arg pio to be configured in open drain
-{
-	// Configure the multi-drive option
-	pPio->PIO_MDDR = ~multiDrvEnable;
-	pPio->PIO_MDER = multiDrvEnable;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_CfgPullup
-//* \brief Enable pullup on PIO
-//*----------------------------------------------------------------------------
-static inline void AT91F_PIO_CfgPullup(
-	AT91PS_PIO pPio,             // \arg pointer to a PIO controller
-	unsigned int pullupEnable)   // \arg enable pullup on PIO
-{
-		// Connect or not Pullup
-	pPio->PIO_PPUDR = ~pullupEnable;
-	pPio->PIO_PPUER = pullupEnable;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_CfgDirectDrive
-//* \brief Enable direct drive on PIO
-//*----------------------------------------------------------------------------
-static inline void AT91F_PIO_CfgDirectDrive(
-	AT91PS_PIO pPio,             // \arg pointer to a PIO controller
-	unsigned int directDrive)    // \arg PIO to be configured with direct drive
-
-{
-	// Configure the Direct Drive
-	pPio->PIO_OWDR  = ~directDrive;
-	pPio->PIO_OWER  = directDrive;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_CfgInputFilter
-//* \brief Enable input filter on input PIO
-//*----------------------------------------------------------------------------
-static inline void AT91F_PIO_CfgInputFilter(
-	AT91PS_PIO pPio,             // \arg pointer to a PIO controller
-	unsigned int inputFilter)    // \arg PIO to be configured with input filter
-
-{
-	// Configure the Direct Drive
-	pPio->PIO_IFDR  = ~inputFilter;
-	pPio->PIO_IFER  = inputFilter;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_GetInput
-//* \brief Return PIO input value
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_PIO_GetInput( // \return PIO input
-	AT91PS_PIO pPio) // \arg  pointer to a PIO controller
-{
-	return pPio->PIO_PDSR;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_IsInputSet
-//* \brief Test if PIO is input flag is active
-//*----------------------------------------------------------------------------
-static inline int AT91F_PIO_IsInputSet(
-	AT91PS_PIO pPio,   // \arg  pointer to a PIO controller
-	unsigned int flag) // \arg  flag to be tested
-{
-	return (AT91F_PIO_GetInput(pPio) & flag);
-}
-
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_SetOutput
-//* \brief Set to 1 output PIO
-//*----------------------------------------------------------------------------
-static inline void AT91F_PIO_SetOutput(
-	AT91PS_PIO pPio,   // \arg  pointer to a PIO controller
-	unsigned int flag) // \arg  output to be set
-{
-	pPio->PIO_SODR = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_ClearOutput
-//* \brief Set to 0 output PIO
-//*----------------------------------------------------------------------------
-static inline void AT91F_PIO_ClearOutput(
-	AT91PS_PIO pPio,   // \arg  pointer to a PIO controller
-	unsigned int flag) // \arg  output to be cleared
-{
-	pPio->PIO_CODR = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_ForceOutput
-//* \brief Force output when Direct drive option is enabled
-//*----------------------------------------------------------------------------
-static inline void AT91F_PIO_ForceOutput(
-	AT91PS_PIO pPio,   // \arg  pointer to a PIO controller
-	unsigned int flag) // \arg  output to be forced
-{
-	pPio->PIO_ODSR = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_Enable
-//* \brief Enable PIO
-//*----------------------------------------------------------------------------
-static inline void AT91F_PIO_Enable(
-        AT91PS_PIO pPio,   // \arg  pointer to a PIO controller
-        unsigned int flag) // \arg  pio to be enabled 
-{
-        pPio->PIO_PER = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_Disable
-//* \brief Disable PIO
-//*----------------------------------------------------------------------------
-static inline void AT91F_PIO_Disable(
-        AT91PS_PIO pPio,   // \arg  pointer to a PIO controller
-        unsigned int flag) // \arg  pio to be disabled 
-{
-        pPio->PIO_PDR = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_GetStatus
-//* \brief Return PIO Status
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_PIO_GetStatus( // \return PIO Status
-        AT91PS_PIO pPio) // \arg  pointer to a PIO controller
-{
-        return pPio->PIO_PSR;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_IsSet
-//* \brief Test if PIO is Set
-//*----------------------------------------------------------------------------
-static inline int AT91F_PIO_IsSet(
-        AT91PS_PIO pPio,   // \arg  pointer to a PIO controller
-        unsigned int flag) // \arg  flag to be tested
-{
-        return (AT91F_PIO_GetStatus(pPio) & flag);
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_OutputEnable
-//* \brief Output Enable PIO
-//*----------------------------------------------------------------------------
-static inline void AT91F_PIO_OutputEnable(
-        AT91PS_PIO pPio,   // \arg  pointer to a PIO controller
-        unsigned int flag) // \arg  pio output to be enabled
-{
-        pPio->PIO_OER = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_OutputDisable
-//* \brief Output Enable PIO
-//*----------------------------------------------------------------------------
-static inline void AT91F_PIO_OutputDisable(
-        AT91PS_PIO pPio,   // \arg  pointer to a PIO controller
-        unsigned int flag) // \arg  pio output to be disabled
-{
-        pPio->PIO_ODR = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_GetOutputStatus
-//* \brief Return PIO Output Status
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_PIO_GetOutputStatus( // \return PIO Output Status
-        AT91PS_PIO pPio) // \arg  pointer to a PIO controller
-{
-        return pPio->PIO_OSR;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_IsOuputSet
-//* \brief Test if PIO Output is Set
-//*----------------------------------------------------------------------------
-static inline int AT91F_PIO_IsOutputSet(
-        AT91PS_PIO pPio,   // \arg  pointer to a PIO controller
-        unsigned int flag) // \arg  flag to be tested
-{
-        return (AT91F_PIO_GetOutputStatus(pPio) & flag);
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_InputFilterEnable
-//* \brief Input Filter Enable PIO
-//*----------------------------------------------------------------------------
-static inline void AT91F_PIO_InputFilterEnable(
-        AT91PS_PIO pPio,   // \arg  pointer to a PIO controller
-        unsigned int flag) // \arg  pio input filter to be enabled
-{
-        pPio->PIO_IFER = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_InputFilterDisable
-//* \brief Input Filter Disable PIO
-//*----------------------------------------------------------------------------
-static inline void AT91F_PIO_InputFilterDisable(
-        AT91PS_PIO pPio,   // \arg  pointer to a PIO controller
-        unsigned int flag) // \arg  pio input filter to be disabled
-{
-        pPio->PIO_IFDR = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_GetInputFilterStatus
-//* \brief Return PIO Input Filter Status
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_PIO_GetInputFilterStatus( // \return PIO Input Filter Status
-        AT91PS_PIO pPio) // \arg  pointer to a PIO controller
-{
-        return pPio->PIO_IFSR;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_IsInputFilterSet
-//* \brief Test if PIO Input filter is Set
-//*----------------------------------------------------------------------------
-static inline int AT91F_PIO_IsInputFilterSet(
-        AT91PS_PIO pPio,   // \arg  pointer to a PIO controller
-        unsigned int flag) // \arg  flag to be tested
-{
-        return (AT91F_PIO_GetInputFilterStatus(pPio) & flag);
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_GetOutputDataStatus
-//* \brief Return PIO Output Data Status 
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_PIO_GetOutputDataStatus( // \return PIO Output Data Status 
-	AT91PS_PIO pPio) // \arg  pointer to a PIO controller
-{
-        return pPio->PIO_ODSR;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_InterruptEnable
-//* \brief Enable PIO Interrupt
-//*----------------------------------------------------------------------------
-static inline void AT91F_PIO_InterruptEnable(
-        AT91PS_PIO pPio,   // \arg  pointer to a PIO controller
-        unsigned int flag) // \arg  pio interrupt to be enabled
-{
-        pPio->PIO_IER = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_InterruptDisable
-//* \brief Disable PIO Interrupt
-//*----------------------------------------------------------------------------
-static inline void AT91F_PIO_InterruptDisable(
-        AT91PS_PIO pPio,   // \arg  pointer to a PIO controller
-        unsigned int flag) // \arg  pio interrupt to be disabled
-{
-        pPio->PIO_IDR = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_GetInterruptMaskStatus
-//* \brief Return PIO Interrupt Mask Status
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_PIO_GetInterruptMaskStatus( // \return PIO Interrupt Mask Status
-        AT91PS_PIO pPio) // \arg  pointer to a PIO controller
-{
-        return pPio->PIO_IMR;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_GetInterruptStatus
-//* \brief Return PIO Interrupt Status
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_PIO_GetInterruptStatus( // \return PIO Interrupt Status
-        AT91PS_PIO pPio) // \arg  pointer to a PIO controller
-{
-        return pPio->PIO_ISR;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_IsInterruptMasked
-//* \brief Test if PIO Interrupt is Masked 
-//*----------------------------------------------------------------------------
-static inline int AT91F_PIO_IsInterruptMasked(
-        AT91PS_PIO pPio,   // \arg  pointer to a PIO controller
-        unsigned int flag) // \arg  flag to be tested
-{
-        return (AT91F_PIO_GetInterruptMaskStatus(pPio) & flag);
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_IsInterruptSet
-//* \brief Test if PIO Interrupt is Set
-//*----------------------------------------------------------------------------
-static inline int AT91F_PIO_IsInterruptSet(
-        AT91PS_PIO pPio,   // \arg  pointer to a PIO controller
-        unsigned int flag) // \arg  flag to be tested
-{
-        return (AT91F_PIO_GetInterruptStatus(pPio) & flag);
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_MultiDriverEnable
-//* \brief Multi Driver Enable PIO
-//*----------------------------------------------------------------------------
-static inline void AT91F_PIO_MultiDriverEnable(
-        AT91PS_PIO pPio,   // \arg  pointer to a PIO controller
-        unsigned int flag) // \arg  pio to be enabled
-{
-        pPio->PIO_MDER = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_MultiDriverDisable
-//* \brief Multi Driver Disable PIO
-//*----------------------------------------------------------------------------
-static inline void AT91F_PIO_MultiDriverDisable(
-        AT91PS_PIO pPio,   // \arg  pointer to a PIO controller
-        unsigned int flag) // \arg  pio to be disabled
-{
-        pPio->PIO_MDDR = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_GetMultiDriverStatus
-//* \brief Return PIO Multi Driver Status
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_PIO_GetMultiDriverStatus( // \return PIO Multi Driver Status
-        AT91PS_PIO pPio) // \arg  pointer to a PIO controller
-{
-        return pPio->PIO_MDSR;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_IsMultiDriverSet
-//* \brief Test if PIO MultiDriver is Set
-//*----------------------------------------------------------------------------
-static inline int AT91F_PIO_IsMultiDriverSet(
-        AT91PS_PIO pPio,   // \arg  pointer to a PIO controller
-        unsigned int flag) // \arg  flag to be tested
-{
-        return (AT91F_PIO_GetMultiDriverStatus(pPio) & flag);
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_A_RegisterSelection
-//* \brief PIO A Register Selection 
-//*----------------------------------------------------------------------------
-static inline void AT91F_PIO_A_RegisterSelection(
-        AT91PS_PIO pPio,   // \arg  pointer to a PIO controller
-        unsigned int flag) // \arg  pio A register selection
-{
-        pPio->PIO_ASR = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_B_RegisterSelection
-//* \brief PIO B Register Selection 
-//*----------------------------------------------------------------------------
-static inline void AT91F_PIO_B_RegisterSelection(
-        AT91PS_PIO pPio,   // \arg  pointer to a PIO controller
-        unsigned int flag) // \arg  pio B register selection 
-{
-        pPio->PIO_BSR = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_Get_AB_RegisterStatus
-//* \brief Return PIO Interrupt Status
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_PIO_Get_AB_RegisterStatus( // \return PIO AB Register Status
-        AT91PS_PIO pPio) // \arg  pointer to a PIO controller
-{
-        return pPio->PIO_ABSR;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_IsAB_RegisterSet
-//* \brief Test if PIO AB Register is Set
-//*----------------------------------------------------------------------------
-static inline int AT91F_PIO_IsAB_RegisterSet(
-        AT91PS_PIO pPio,   // \arg  pointer to a PIO controller
-        unsigned int flag) // \arg  flag to be tested
-{
-        return (AT91F_PIO_Get_AB_RegisterStatus(pPio) & flag);
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_OutputWriteEnable
-//* \brief Output Write Enable PIO
-//*----------------------------------------------------------------------------
-static inline void AT91F_PIO_OutputWriteEnable(
-        AT91PS_PIO pPio,   // \arg  pointer to a PIO controller
-        unsigned int flag) // \arg  pio output write to be enabled
-{
-        pPio->PIO_OWER = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_OutputWriteDisable
-//* \brief Output Write Disable PIO
-//*----------------------------------------------------------------------------
-static inline void AT91F_PIO_OutputWriteDisable(
-        AT91PS_PIO pPio,   // \arg  pointer to a PIO controller
-        unsigned int flag) // \arg  pio output write to be disabled
-{
-        pPio->PIO_OWDR = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_GetOutputWriteStatus
-//* \brief Return PIO Output Write Status
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_PIO_GetOutputWriteStatus( // \return PIO Output Write Status
-        AT91PS_PIO pPio) // \arg  pointer to a PIO controller
-{
-        return pPio->PIO_OWSR;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_IsOutputWriteSet
-//* \brief Test if PIO OutputWrite is Set
-//*----------------------------------------------------------------------------
-static inline int AT91F_PIO_IsOutputWriteSet(
-        AT91PS_PIO pPio,   // \arg  pointer to a PIO controller
-        unsigned int flag) // \arg  flag to be tested
-{
-        return (AT91F_PIO_GetOutputWriteStatus(pPio) & flag);
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_GetCfgPullup
-//* \brief Return PIO Configuration Pullup
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_PIO_GetCfgPullup( // \return PIO Configuration Pullup 
-        AT91PS_PIO pPio) // \arg  pointer to a PIO controller
-{
-        return pPio->PIO_PPUSR;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_IsOutputDataStatusSet
-//* \brief Test if PIO Output Data Status is Set 
-//*----------------------------------------------------------------------------
-static inline int AT91F_PIO_IsOutputDataStatusSet(
-        AT91PS_PIO pPio,   // \arg  pointer to a PIO controller
-        unsigned int flag) // \arg  flag to be tested
-{
-        return (AT91F_PIO_GetOutputDataStatus(pPio) & flag);
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIO_IsCfgPullupStatusSet
-//* \brief Test if PIO Configuration Pullup Status is Set
-//*----------------------------------------------------------------------------
-static inline int AT91F_PIO_IsCfgPullupStatusSet(
-        AT91PS_PIO pPio,   // \arg  pointer to a PIO controller
-        unsigned int flag) // \arg  flag to be tested
-{
-        return (~AT91F_PIO_GetCfgPullup(pPio) & flag);
-}
-
-/* *****************************************************************************
-                SOFTWARE API FOR TWI
-   ***************************************************************************** */
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_TWI_EnableIt
-//* \brief Enable TWI IT
-//*----------------------------------------------------------------------------
-static inline void AT91F_TWI_EnableIt (
-	AT91PS_TWI pTWI, // \arg pointer to a TWI controller
-	unsigned int flag)   // \arg IT to be enabled
-{
-	//* Write to the IER register
-	pTWI->TWI_IER = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_TWI_DisableIt
-//* \brief Disable TWI IT
-//*----------------------------------------------------------------------------
-static inline void AT91F_TWI_DisableIt (
-	AT91PS_TWI pTWI, // \arg pointer to a TWI controller
-	unsigned int flag)   // \arg IT to be disabled
-{
-	//* Write to the IDR register
-	pTWI->TWI_IDR = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_TWI_Configure
-//* \brief Configure TWI in master mode
-//*----------------------------------------------------------------------------
-static inline void AT91F_TWI_Configure ( AT91PS_TWI pTWI )          // \arg pointer to a TWI controller
-{
-    //* Disable interrupts
-	pTWI->TWI_IDR = (unsigned int) -1;
-
-    //* Reset peripheral
-	pTWI->TWI_CR = AT91C_TWI_SWRST;
-
-	//* Set Master mode
-	pTWI->TWI_CR = AT91C_TWI_MSEN | AT91C_TWI_SVDIS;
-
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_TWI_GetInterruptMaskStatus
-//* \brief Return TWI Interrupt Mask Status
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_TWI_GetInterruptMaskStatus( // \return TWI Interrupt Mask Status
-        AT91PS_TWI pTwi) // \arg  pointer to a TWI controller
-{
-        return pTwi->TWI_IMR;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_TWI_IsInterruptMasked
-//* \brief Test if TWI Interrupt is Masked 
-//*----------------------------------------------------------------------------
-static inline int AT91F_TWI_IsInterruptMasked(
-        AT91PS_TWI pTwi,   // \arg  pointer to a TWI controller
-        unsigned int flag) // \arg  flag to be tested
-{
-        return (AT91F_TWI_GetInterruptMaskStatus(pTwi) & flag);
-}
-
-/* *****************************************************************************
-                SOFTWARE API FOR USART
-   ***************************************************************************** */
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_US_Baudrate
-//* \brief Calculate the baudrate
-//* Standard Asynchronous Mode : 8 bits , 1 stop , no parity
-#define AT91C_US_ASYNC_MODE ( AT91C_US_USMODE_NORMAL + \
-                        AT91C_US_NBSTOP_1_BIT + \
-                        AT91C_US_PAR_NONE + \
-                        AT91C_US_CHRL_8_BITS + \
-                        AT91C_US_CLKS_CLOCK )
-
-//* Standard External Asynchronous Mode : 8 bits , 1 stop , no parity
-#define AT91C_US_ASYNC_SCK_MODE ( AT91C_US_USMODE_NORMAL + \
-                            AT91C_US_NBSTOP_1_BIT + \
-                            AT91C_US_PAR_NONE + \
-                            AT91C_US_CHRL_8_BITS + \
-                            AT91C_US_CLKS_EXT )
-
-//* Standard Synchronous Mode : 8 bits , 1 stop , no parity
-#define AT91C_US_SYNC_MODE ( AT91C_US_SYNC + \
-                       AT91C_US_USMODE_NORMAL + \
-                       AT91C_US_NBSTOP_1_BIT + \
-                       AT91C_US_PAR_NONE + \
-                       AT91C_US_CHRL_8_BITS + \
-                       AT91C_US_CLKS_CLOCK )
-
-//* SCK used Label
-#define AT91C_US_SCK_USED (AT91C_US_CKLO | AT91C_US_CLKS_EXT)
-
-//* Standard ISO T=0 Mode : 8 bits , 1 stop , parity
-#define AT91C_US_ISO_READER_MODE ( AT91C_US_USMODE_ISO7816_0 + \
-					   		 AT91C_US_CLKS_CLOCK +\
-                       		 AT91C_US_NBSTOP_1_BIT + \
-                       		 AT91C_US_PAR_EVEN + \
-                       		 AT91C_US_CHRL_8_BITS + \
-                       		 AT91C_US_CKLO +\
-                       		 AT91C_US_OVER)
-
-//* Standard IRDA mode
-#define AT91C_US_ASYNC_IRDA_MODE (  AT91C_US_USMODE_IRDA + \
-                            AT91C_US_NBSTOP_1_BIT + \
-                            AT91C_US_PAR_NONE + \
-                            AT91C_US_CHRL_8_BITS + \
-                            AT91C_US_CLKS_CLOCK )
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_US_Baudrate
-//* \brief Caluculate baud_value according to the main clock and the baud rate
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_US_Baudrate (
-	const unsigned int main_clock, // \arg peripheral clock
-	const unsigned int baud_rate)  // \arg UART baudrate
-{
-	unsigned int baud_value = ((main_clock*10)/(baud_rate * 16));
-	if ((baud_value % 10) >= 5)
-		baud_value = (baud_value / 10) + 1;
-	else
-		baud_value /= 10;
-	return baud_value;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_US_SetBaudrate
-//* \brief Set the baudrate according to the CPU clock
-//*----------------------------------------------------------------------------
-static inline void AT91F_US_SetBaudrate (
-	AT91PS_USART pUSART,    // \arg pointer to a USART controller
-	unsigned int mainClock, // \arg peripheral clock
-	unsigned int speed)     // \arg UART baudrate
-{
-	//* Define the baud rate divisor register
-	pUSART->US_BRGR = AT91F_US_Baudrate(mainClock, speed);
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_US_SetTimeguard
-//* \brief Set USART timeguard
-//*----------------------------------------------------------------------------
-static inline void AT91F_US_SetTimeguard (
-	AT91PS_USART pUSART,    // \arg pointer to a USART controller
-	unsigned int timeguard) // \arg timeguard value
-{
-	//* Write the Timeguard Register
-	pUSART->US_TTGR = timeguard ;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_US_EnableIt
-//* \brief Enable USART IT
-//*----------------------------------------------------------------------------
-static inline void AT91F_US_EnableIt (
-	AT91PS_USART pUSART, // \arg pointer to a USART controller
-	unsigned int flag)   // \arg IT to be enabled
-{
-	//* Write to the IER register
-	pUSART->US_IER = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_US_DisableIt
-//* \brief Disable USART IT
-//*----------------------------------------------------------------------------
-static inline void AT91F_US_DisableIt (
-	AT91PS_USART pUSART, // \arg pointer to a USART controller
-	unsigned int flag)   // \arg IT to be disabled
-{
-	//* Write to the IER register
-	pUSART->US_IDR = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_US_Configure
-//* \brief Configure USART
-//*----------------------------------------------------------------------------
-static inline void AT91F_US_Configure (
-	AT91PS_USART pUSART,     // \arg pointer to a USART controller
-	unsigned int mainClock,  // \arg peripheral clock
-	unsigned int mode ,      // \arg mode Register to be programmed
-	unsigned int baudRate ,  // \arg baudrate to be programmed
-	unsigned int timeguard ) // \arg timeguard to be programmed
-{
-    //* Disable interrupts
-    pUSART->US_IDR = (unsigned int) -1;
-
-    //* Reset receiver and transmitter
-    pUSART->US_CR = AT91C_US_RSTRX | AT91C_US_RSTTX | AT91C_US_RXDIS | AT91C_US_TXDIS ;
-
-	//* Define the baud rate divisor register
-	AT91F_US_SetBaudrate(pUSART, mainClock, baudRate);
-
-	//* Write the Timeguard Register
-	AT91F_US_SetTimeguard(pUSART, timeguard);
-
-    //* Clear Transmit and Receive Counters
-    AT91F_PDC_Open((AT91PS_PDC) &(pUSART->US_RPR));
-
-    //* Define the USART mode
-    pUSART->US_MR = mode  ;
-
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_US_EnableRx
-//* \brief Enable receiving characters
-//*----------------------------------------------------------------------------
-static inline void AT91F_US_EnableRx (
-	AT91PS_USART pUSART)     // \arg pointer to a USART controller
-{
-    //* Enable receiver
-    pUSART->US_CR = AT91C_US_RXEN;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_US_EnableTx
-//* \brief Enable sending characters
-//*----------------------------------------------------------------------------
-static inline void AT91F_US_EnableTx (
-	AT91PS_USART pUSART)     // \arg pointer to a USART controller
-{
-    //* Enable  transmitter
-    pUSART->US_CR = AT91C_US_TXEN;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_US_ResetRx
-//* \brief Reset Receiver and re-enable it
-//*----------------------------------------------------------------------------
-static inline void AT91F_US_ResetRx (
-	AT91PS_USART pUSART)     // \arg pointer to a USART controller
-{
-	//* Reset receiver
-	pUSART->US_CR = AT91C_US_RSTRX;
-    //* Re-Enable receiver
-    pUSART->US_CR = AT91C_US_RXEN;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_US_ResetTx
-//* \brief Reset Transmitter and re-enable it
-//*----------------------------------------------------------------------------
-static inline void AT91F_US_ResetTx (
-	AT91PS_USART pUSART)     // \arg pointer to a USART controller
-{
-	//* Reset transmitter
-	pUSART->US_CR = AT91C_US_RSTTX;
-    //* Enable transmitter
-    pUSART->US_CR = AT91C_US_TXEN;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_US_DisableRx
-//* \brief Disable Receiver
-//*----------------------------------------------------------------------------
-static inline void AT91F_US_DisableRx (
-	AT91PS_USART pUSART)     // \arg pointer to a USART controller
-{
-    //* Disable receiver
-    pUSART->US_CR = AT91C_US_RXDIS;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_US_DisableTx
-//* \brief Disable Transmitter
-//*----------------------------------------------------------------------------
-static inline void AT91F_US_DisableTx (
-	AT91PS_USART pUSART)     // \arg pointer to a USART controller
-{
-    //* Disable transmitter
-    pUSART->US_CR = AT91C_US_TXDIS;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_US_Close
-//* \brief Close USART: disable IT disable receiver and transmitter, close PDC
-//*----------------------------------------------------------------------------
-static inline void AT91F_US_Close (
-	AT91PS_USART pUSART)     // \arg pointer to a USART controller
-{
-    //* Reset the baud rate divisor register
-    pUSART->US_BRGR = 0 ;
-
-    //* Reset the USART mode
-    pUSART->US_MR = 0  ;
-
-    //* Reset the Timeguard Register
-    pUSART->US_TTGR = 0;
-
-    //* Disable all interrupts
-    pUSART->US_IDR = 0xFFFFFFFF ;
-
-    //* Abort the Peripheral Data Transfers
-    AT91F_PDC_Close((AT91PS_PDC) &(pUSART->US_RPR));
-
-    //* Disable receiver and transmitter and stop any activity immediately
-    pUSART->US_CR = AT91C_US_TXDIS | AT91C_US_RXDIS | AT91C_US_RSTTX | AT91C_US_RSTRX ;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_US_TxReady
-//* \brief Return 1 if a character can be written in US_THR
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_US_TxReady (
-	AT91PS_USART pUSART )     // \arg pointer to a USART controller
-{
-    return (pUSART->US_CSR & AT91C_US_TXRDY);
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_US_RxReady
-//* \brief Return 1 if a character can be read in US_RHR
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_US_RxReady (
-	AT91PS_USART pUSART )     // \arg pointer to a USART controller
-{
-    return (pUSART->US_CSR & AT91C_US_RXRDY);
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_US_Error
-//* \brief Return the error flag
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_US_Error (
-	AT91PS_USART pUSART )     // \arg pointer to a USART controller
-{
-    return (pUSART->US_CSR &
-    	(AT91C_US_OVRE |  // Overrun error
-    	 AT91C_US_FRAME | // Framing error
-    	 AT91C_US_PARE));  // Parity error
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_US_PutChar
-//* \brief Send a character,does not check if ready to send
-//*----------------------------------------------------------------------------
-static inline void AT91F_US_PutChar (
-	AT91PS_USART pUSART,
-	int character )
-{
-    pUSART->US_THR = (character & 0x1FF);
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_US_GetChar
-//* \brief Receive a character,does not check if a character is available
-//*----------------------------------------------------------------------------
-static inline int AT91F_US_GetChar (
-	const AT91PS_USART pUSART)
-{
-    return((pUSART->US_RHR) & 0x1FF);
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_US_SendFrame
-//* \brief Return 2 if PDC has been initialized with Buffer and Next Buffer, 1 if PDC has been initializaed with Next Buffer, 0 if PDC is busy
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_US_SendFrame(
-	AT91PS_USART pUSART,
-	char *pBuffer,
-	unsigned int szBuffer,
-	char *pNextBuffer,
-	unsigned int szNextBuffer )
-{
-	return AT91F_PDC_SendFrame(
-		(AT91PS_PDC) &(pUSART->US_RPR),
-		pBuffer,
-		szBuffer,
-		pNextBuffer,
-		szNextBuffer);
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_US_ReceiveFrame
-//* \brief Return 2 if PDC has been initialized with Buffer and Next Buffer, 1 if PDC has been initializaed with Next Buffer, 0 if PDC is busy
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_US_ReceiveFrame (
-	AT91PS_USART pUSART,
-	char *pBuffer,
-	unsigned int szBuffer,
-	char *pNextBuffer,
-	unsigned int szNextBuffer )
-{
-	return AT91F_PDC_ReceiveFrame(
-		(AT91PS_PDC) &(pUSART->US_RPR),
-		pBuffer,
-		szBuffer,
-		pNextBuffer,
-		szNextBuffer);
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_US_SetIrdaFilter
-//* \brief Set the value of IrDa filter tregister
-//*----------------------------------------------------------------------------
-static inline void AT91F_US_SetIrdaFilter (
-	AT91PS_USART pUSART,
-	unsigned char value
-)
-{
-	pUSART->US_IF = value;
-}
-
-/* *****************************************************************************
-                SOFTWARE API FOR MCI
-   ***************************************************************************** */
-//* Classic MCI Mode Register Configuration with PDC mode enabled and MCK = MCI Clock
-#define AT91C_MCI_MR_PDCMODE	(AT91C_MCI_CLKDIV |\
-                                AT91C_MCI_PWSDIV |\
-                                (AT91C_MCI_PWSDIV<<1) |\
-                                AT91C_MCI_PDCMODE)
-
-//* Classic MCI Data Timeout Register Configuration with 1048576 MCK cycles between 2 data transfer
-#define AT91C_MCI_DTOR_1MEGA_CYCLES	(AT91C_MCI_DTOCYC | AT91C_MCI_DTOMUL)
-
-//* Classic MCI SDCard Register Configuration with 1-bit data bus on slot A
-#define AT91C_MCI_MMC_SLOTA	(AT91C_MCI_SCDSEL & 0x0)
-
-//* Classic MCI SDCard Register Configuration with 1-bit data bus on slot B
-#define AT91C_MCI_MMC_SLOTB	(AT91C_MCI_SCDSEL)
-
-//* Classic MCI SDCard Register Configuration with 4-bit data bus on slot A
-#define AT91C_MCI_SDCARD_4BITS_SLOTA	( (AT91C_MCI_SCDSEL & 0x0) | AT91C_MCI_SCDBUS )
-
-//* Classic MCI SDCard Register Configuration with 4-bit data bus on slot B
-#define AT91C_MCI_SDCARD_4BITS_SLOTB	(AT91C_MCI_SCDSEL | AT91C_MCI_SCDBUS)
-
-
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_MCI_Configure
-//* \brief Configure the MCI
-//*----------------------------------------------------------------------------
-static inline void AT91F_MCI_Configure (
-        AT91PS_MCI pMCI,  			 // \arg pointer to a MCI controller
-        unsigned int DTOR_register,  // \arg Data Timeout Register to be programmed
-        unsigned int MR_register,  	 // \arg Mode Register to be programmed
-        unsigned int SDCR_register)  // \arg SDCard Register to be programmed
-{
-    //* Reset the MCI
-    pMCI->MCI_CR = AT91C_MCI_MCIEN | AT91C_MCI_PWSEN;
-
-    //* Disable all the interrupts
-    pMCI->MCI_IDR = 0xFFFFFFFF;
-
-    //* Set the Data Timeout Register
-    pMCI->MCI_DTOR = DTOR_register;
-
-    //* Set the Mode Register
-    pMCI->MCI_MR = MR_register;
-
-    //* Set the SDCard Register
-    pMCI->MCI_SDCR = SDCR_register;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_MCI_EnableIt
-//* \brief Enable MCI IT
-//*----------------------------------------------------------------------------
-static inline void AT91F_MCI_EnableIt (
-        AT91PS_MCI pMCI, // \arg pointer to a MCI controller
-        unsigned int flag)   // \arg IT to be enabled
-{
-    //* Write to the IER register
-    pMCI->MCI_IER = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_MCI_DisableIt
-//* \brief Disable MCI IT
-//*----------------------------------------------------------------------------
-static inline void AT91F_MCI_DisableIt (
-        AT91PS_MCI pMCI, // \arg pointer to a MCI controller
-        unsigned int flag)   // \arg IT to be disabled
-{
-    //* Write to the IDR register
-    pMCI->MCI_IDR = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_MCI_Enable_Interface
-//* \brief Enable the MCI Interface
-//*----------------------------------------------------------------------------
-static inline void AT91F_MCI_Enable_Interface (
-        AT91PS_MCI pMCI)     // \arg pointer to a MCI controller
-{
-    //* Enable the MCI
-    pMCI->MCI_CR = AT91C_MCI_MCIEN;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_MCI_Disable_Interface
-//* \brief Disable the MCI Interface
-//*----------------------------------------------------------------------------
-static inline void AT91F_MCI_Disable_Interface (
-        AT91PS_MCI pMCI)     // \arg pointer to a MCI controller
-{
-    //* Disable the MCI
-    pMCI->MCI_CR = AT91C_MCI_MCIDIS;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_MCI_Cfg_ModeRegister
-//* \brief Configure the MCI Mode Register
-//*----------------------------------------------------------------------------
-static inline void AT91F_MCI_Cfg_ModeRegister (
-        AT91PS_MCI pMCI, // \arg pointer to a MCI controller
-        unsigned int mode_register)   // \arg value to set in the mode register
-{
-    //* Configure the MCI MR
-    pMCI->MCI_MR = mode_register;
-}
-/* *****************************************************************************
-                SOFTWARE API FOR AIC
-   ***************************************************************************** */
-#define AT91C_AIC_BRANCH_OPCODE ((void (*) ()) 0xE51FFF20) // ldr, pc, [pc, #-&F20]
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_AIC_ConfigureIt
-//* \brief Interrupt Handler Initialization
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_AIC_ConfigureIt (
-	AT91PS_AIC pAic,  // \arg pointer to the AIC registers
-	unsigned int irq_id,     // \arg interrupt number to initialize
-	unsigned int priority,   // \arg priority to give to the interrupt
-	unsigned int src_type,   // \arg activation and sense of activation
-	void (*newHandler) (void) ) // \arg address of the interrupt handler
-{
-	unsigned int oldHandler;
-    unsigned int mask ;
-
-    oldHandler = pAic->AIC_SVR[irq_id];
-
-    mask = 0x1 << irq_id ;
-    //* Disable the interrupt on the interrupt controller
-    pAic->AIC_IDCR = mask ;
-    //* Save the interrupt handler routine pointer and the interrupt priority
-    pAic->AIC_SVR[irq_id] = (unsigned int) newHandler ;
-    //* Store the Source Mode Register
-    pAic->AIC_SMR[irq_id] = src_type | priority  ;
-    //* Clear the interrupt on the interrupt controller
-    pAic->AIC_ICCR = mask ;
-
-	return oldHandler;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_AIC_EnableIt
-//* \brief Enable corresponding IT number
-//*----------------------------------------------------------------------------
-static inline void AT91F_AIC_EnableIt (
-	AT91PS_AIC pAic,      // \arg pointer to the AIC registers
-	unsigned int irq_id ) // \arg interrupt number to initialize
-{
-    //* Enable the interrupt on the interrupt controller
-    pAic->AIC_IECR = 0x1 << irq_id ;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_AIC_DisableIt
-//* \brief Disable corresponding IT number
-//*----------------------------------------------------------------------------
-static inline void AT91F_AIC_DisableIt (
-	AT91PS_AIC pAic,      // \arg pointer to the AIC registers
-	unsigned int irq_id ) // \arg interrupt number to initialize
-{
-    unsigned int mask = 0x1 << irq_id;
-    //* Disable the interrupt on the interrupt controller
-    pAic->AIC_IDCR = mask ;
-    //* Clear the interrupt on the Interrupt Controller ( if one is pending )
-    pAic->AIC_ICCR = mask ;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_AIC_ClearIt
-//* \brief Clear corresponding IT number
-//*----------------------------------------------------------------------------
-static inline void AT91F_AIC_ClearIt (
-	AT91PS_AIC pAic,     // \arg pointer to the AIC registers
-	unsigned int irq_id) // \arg interrupt number to initialize
-{
-    //* Clear the interrupt on the Interrupt Controller ( if one is pending )
-    pAic->AIC_ICCR = (0x1 << irq_id);
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_AIC_AcknowledgeIt
-//* \brief Acknowledge corresponding IT number
-//*----------------------------------------------------------------------------
-static inline void AT91F_AIC_AcknowledgeIt (
-	AT91PS_AIC pAic)     // \arg pointer to the AIC registers
-{
-    pAic->AIC_EOICR = pAic->AIC_EOICR;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_AIC_SetExceptionVector
-//* \brief Configure vector handler
-//*----------------------------------------------------------------------------
-static inline unsigned int  AT91F_AIC_SetExceptionVector (
-	unsigned int *pVector, // \arg pointer to the AIC registers
-	void (*Handler) () )   // \arg Interrupt Handler
-{
-	unsigned int oldVector = *pVector;
-
-	if ((unsigned int) Handler == (unsigned int) AT91C_AIC_BRANCH_OPCODE)
-		*pVector = (unsigned int) AT91C_AIC_BRANCH_OPCODE;
-	else
-		*pVector = (((((unsigned int) Handler) - ((unsigned int) pVector) - 0x8) >> 2) & 0x00FFFFFF) | 0xEA000000;
-
-	return oldVector;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_AIC_Trig
-//* \brief Trig an IT
-//*----------------------------------------------------------------------------
-static inline void  AT91F_AIC_Trig (
-	AT91PS_AIC pAic,     // \arg pointer to the AIC registers
-	unsigned int irq_id) // \arg interrupt number
-{
-	pAic->AIC_ISCR = (0x1 << irq_id) ;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_AIC_IsActive
-//* \brief Test if an IT is active
-//*----------------------------------------------------------------------------
-static inline unsigned int  AT91F_AIC_IsActive (
-	AT91PS_AIC pAic,     // \arg pointer to the AIC registers
-	unsigned int irq_id) // \arg Interrupt Number
-{
-	return (pAic->AIC_ISR & (0x1 << irq_id));
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_AIC_IsPending
-//* \brief Test if an IT is pending
-//*----------------------------------------------------------------------------
-static inline unsigned int  AT91F_AIC_IsPending (
-	AT91PS_AIC pAic,     // \arg pointer to the AIC registers
-	unsigned int irq_id) // \arg Interrupt Number
-{
-	return (pAic->AIC_IPR & (0x1 << irq_id));
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_AIC_Open
-//* \brief Set exception vectors and AIC registers to default values
-//*----------------------------------------------------------------------------
-static inline void AT91F_AIC_Open(
-	AT91PS_AIC pAic,        // \arg pointer to the AIC registers
-	void (*IrqHandler) (),  // \arg Default IRQ vector exception
-	void (*FiqHandler) (),  // \arg Default FIQ vector exception
-	void (*DefaultHandler)  (), // \arg Default Handler set in ISR
-	void (*SpuriousHandler) (), // \arg Default Spurious Handler
-	unsigned int protectMode)   // \arg Debug Control Register
-{
-	int i;
-
-	// Disable all interrupts and set IVR to the default handler
-	for (i = 0; i < 32; ++i) {
-		AT91F_AIC_DisableIt(pAic, i);
-		AT91F_AIC_ConfigureIt(pAic, i, AT91C_AIC_PRIOR_LOWEST, AT91C_AIC_SRCTYPE_INT_LEVEL_SENSITIVE, DefaultHandler);
-	}
-
-	// Set the IRQ exception vector
-	AT91F_AIC_SetExceptionVector((unsigned int *) 0x18, IrqHandler);
-	// Set the Fast Interrupt exception vector
-	AT91F_AIC_SetExceptionVector((unsigned int *) 0x1C, FiqHandler);
-
-	pAic->AIC_SPU = (unsigned int) SpuriousHandler;
-	pAic->AIC_DCR = protectMode;
-}
-/* *****************************************************************************
-                SOFTWARE API FOR UDP
-   ***************************************************************************** */
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_UDP_EnableIt
-//* \brief Enable UDP IT
-//*----------------------------------------------------------------------------
-static inline void AT91F_UDP_EnableIt (
-	AT91PS_UDP pUDP,     // \arg pointer to a UDP controller
-	unsigned int flag)   // \arg IT to be enabled
-{
-	//* Write to the IER register
-	pUDP->UDP_IER = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_UDP_DisableIt
-//* \brief Disable UDP IT
-//*----------------------------------------------------------------------------
-static inline void AT91F_UDP_DisableIt (
-	AT91PS_UDP pUDP,     // \arg pointer to a UDP controller
-	unsigned int flag)   // \arg IT to be disabled
-{
-	//* Write to the IDR register
-	pUDP->UDP_IDR = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_UDP_SetAddress
-//* \brief Set UDP functional address
-//*----------------------------------------------------------------------------
-static inline void AT91F_UDP_SetAddress (
-	AT91PS_UDP pUDP,     // \arg pointer to a UDP controller
-	unsigned char address)   // \arg new UDP address
-{
-	pUDP->UDP_FADDR = (AT91C_UDP_FEN | address);
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_UDP_EnableEp
-//* \brief Enable Endpoint
-//*----------------------------------------------------------------------------
-static inline void AT91F_UDP_EnableEp (
-	AT91PS_UDP pUDP,     // \arg pointer to a UDP controller
-	unsigned int flag)   // \arg endpoints to be enabled
-{
-	pUDP->UDP_GLBSTATE  |= flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_UDP_DisableEp
-//* \brief Enable Endpoint
-//*----------------------------------------------------------------------------
-static inline void AT91F_UDP_DisableEp (
-	AT91PS_UDP pUDP,     // \arg pointer to a UDP controller
-	unsigned int flag)   // \arg endpoints to be enabled
-{
-	pUDP->UDP_GLBSTATE  &= ~(flag);
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_UDP_SetState
-//* \brief Set UDP Device state
-//*----------------------------------------------------------------------------
-static inline void AT91F_UDP_SetState (
-	AT91PS_UDP pUDP,     // \arg pointer to a UDP controller
-	unsigned int flag)   // \arg new UDP address
-{
-	pUDP->UDP_GLBSTATE  &= ~(AT91C_UDP_FADDEN | AT91C_UDP_CONFG);
-	pUDP->UDP_GLBSTATE  |= flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_UDP_GetState
-//* \brief return UDP Device state
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_UDP_GetState ( // \return the UDP device state
-	AT91PS_UDP pUDP)     // \arg pointer to a UDP controller
-{
-	return (pUDP->UDP_GLBSTATE  & (AT91C_UDP_FADDEN | AT91C_UDP_CONFG));
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_UDP_ResetEp
-//* \brief Reset UDP endpoint
-//*----------------------------------------------------------------------------
-static inline void AT91F_UDP_ResetEp ( // \return the UDP device state
-	AT91PS_UDP pUDP,     // \arg pointer to a UDP controller
-	unsigned int flag)   // \arg Endpoints to be reset
-{
-	pUDP->UDP_RSTEP = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_UDP_EpStall
-//* \brief Endpoint will STALL requests
-//*----------------------------------------------------------------------------
-static inline void AT91F_UDP_EpStall(
-	AT91PS_UDP pUDP,     // \arg pointer to a UDP controller
-	unsigned char endpoint)   // \arg endpoint number
-{
-	pUDP->UDP_CSR[endpoint] |= AT91C_UDP_FORCESTALL;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_UDP_EpWrite
-//* \brief Write value in the DPR
-//*----------------------------------------------------------------------------
-static inline void AT91F_UDP_EpWrite(
-	AT91PS_UDP pUDP,         // \arg pointer to a UDP controller
-	unsigned char endpoint,  // \arg endpoint number
-	unsigned char value)     // \arg value to be written in the DPR
-{
-	pUDP->UDP_FDR[endpoint] = value;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_UDP_EpRead
-//* \brief Return value from the DPR
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_UDP_EpRead(
-	AT91PS_UDP pUDP,         // \arg pointer to a UDP controller
-	unsigned char endpoint)  // \arg endpoint number
-{
-	return pUDP->UDP_FDR[endpoint];
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_UDP_EpEndOfWr
-//* \brief Notify the UDP that values in DPR are ready to be sent
-//*----------------------------------------------------------------------------
-static inline void AT91F_UDP_EpEndOfWr(
-	AT91PS_UDP pUDP,         // \arg pointer to a UDP controller
-	unsigned char endpoint)  // \arg endpoint number
-{
-	pUDP->UDP_CSR[endpoint] |= AT91C_UDP_TXPKTRDY;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_UDP_EpClear
-//* \brief Clear flag in the endpoint CSR register
-//*----------------------------------------------------------------------------
-static inline void AT91F_UDP_EpClear(
-	AT91PS_UDP pUDP,         // \arg pointer to a UDP controller
-	unsigned char endpoint,  // \arg endpoint number
-	unsigned int flag)       // \arg flag to be cleared
-{
-	pUDP->UDP_CSR[endpoint] &= ~(flag);
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_UDP_EpSet
-//* \brief Set flag in the endpoint CSR register
-//*----------------------------------------------------------------------------
-static inline void AT91F_UDP_EpSet(
-	AT91PS_UDP pUDP,         // \arg pointer to a UDP controller
-	unsigned char endpoint,  // \arg endpoint number
-	unsigned int flag)       // \arg flag to be cleared
-{
-	pUDP->UDP_CSR[endpoint] |= flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_UDP_EpStatus
-//* \brief Return the endpoint CSR register
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_UDP_EpStatus(
-	AT91PS_UDP pUDP,         // \arg pointer to a UDP controller
-	unsigned char endpoint)  // \arg endpoint number
-{
-	return pUDP->UDP_CSR[endpoint];
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_UDP_GetInterruptMaskStatus
-//* \brief Return UDP Interrupt Mask Status
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_UDP_GetInterruptMaskStatus( // \return UDP Interrupt Mask Status
-        AT91PS_UDP pUdp) // \arg  pointer to a UDP controller
-{
-        return pUdp->UDP_IMR;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_UDP_IsInterruptMasked
-//* \brief Test if UDP Interrupt is Masked 
-//*----------------------------------------------------------------------------
-static inline int AT91F_UDP_IsInterruptMasked(
-        AT91PS_UDP pUdp,   // \arg  pointer to a UDP controller
-        unsigned int flag) // \arg  flag to be tested
-{
-        return (AT91F_UDP_GetInterruptMaskStatus(pUdp) & flag);
-}
-
-/* *****************************************************************************
-                SOFTWARE API FOR ST
-   ***************************************************************************** */
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_ST_SetPeriodInterval
-//* \brief Set Periodic Interval Interrupt (period in ms)
-//*----------------------------------------------------------------------------
-static inline void AT91F_ST_SetPeriodInterval(
-	AT91PS_ST pSt,
-	unsigned int period)
-{
-	volatile int status;
-	pSt->ST_IDR = AT91C_ST_PITS;			/* Interrupt disable Register */
-
-	status = pSt->ST_SR;
-    pSt->ST_PIMR = period << 5;   			/* Period Interval Mode Register == timer interval = 1ms*/
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_ST_EnableIt
-//* \brief Enable system timer interrupt
-//*----------------------------------------------------------------------------
-static inline void AT91F_ST_EnableIt(
-	AT91PS_ST pSt,
-	unsigned int flag)
-{
-	pSt->ST_IER = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_ST_DisableIt
-//* \brief Disable system timer interrupt
-//*----------------------------------------------------------------------------
-static inline void AT91F_ST_DisableIt(
-	AT91PS_ST pSt,
-	unsigned int flag)
-{
-	pSt->ST_IDR = flag;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_ST_GetInterruptMaskStatus
-//* \brief Return ST Interrupt Mask Status
-//*----------------------------------------------------------------------------
-static inline unsigned int AT91F_ST_GetInterruptMaskStatus( // \return ST Interrupt Mask Status
-        AT91PS_ST pSt) // \arg  pointer to a ST controller
-{
-        return pSt->ST_IMR;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_ST_IsInterruptMasked
-//* \brief Test if ST Interrupt is Masked 
-//*----------------------------------------------------------------------------
-static inline int AT91F_ST_IsInterruptMasked(
-        AT91PS_ST pSt,   // \arg  pointer to a ST controller
-        unsigned int flag) // \arg  flag to be tested
-{
-        return (AT91F_ST_GetInterruptMaskStatus(pSt) & flag);
-}
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_EBI_CfgPIO
-//* \brief Configure PIO controllers to drive EBI signals
-//*----------------------------------------------------------------------------
-static inline void AT91F_EBI_CfgPIO (void)
-{
-	// Configure PIO controllers to periph mode
-	AT91F_PIO_CfgPeriph(
-		AT91C_BASE_PIOC, // PIO controller base address
-		((unsigned int) AT91C_PC8_A24     ) |
-		((unsigned int) AT91C_PC7_A23     ), // Peripheral A
-		0); // Peripheral B
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_DBGU_CfgPMC
-//* \brief Enable Peripheral clock in PMC for  DBGU
-//*----------------------------------------------------------------------------
-static inline void AT91F_DBGU_CfgPMC (void)
-{
-	AT91F_PMC_EnablePeriphClock(
-		AT91C_BASE_PMC, // PIO controller base address
-		((unsigned int) 1 << AT91C_ID_SYS));
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_DBGU_CfgPIO
-//* \brief Configure PIO controllers to drive DBGU signals
-//*----------------------------------------------------------------------------
-static inline void AT91F_DBGU_CfgPIO (void)
-{
-	// Configure PIO controllers to periph mode
-	AT91F_PIO_CfgPeriph(
-		AT91C_BASE_PIOA, // PIO controller base address
-		((unsigned int) AT91C_PA31_DTXD    ) |
-		((unsigned int) AT91C_PA30_DRXD    ), // Peripheral A
-		0); // Peripheral B
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SYS_CfgPMC
-//* \brief Enable Peripheral clock in PMC for  SYS
-//*----------------------------------------------------------------------------
-static inline void AT91F_SYS_CfgPMC (void)
-{
-	AT91F_PMC_EnablePeriphClock(
-		AT91C_BASE_PMC, // PIO controller base address
-		((unsigned int) 1 << AT91C_ID_SYS));
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_UHP_CfgPMC
-//* \brief Enable Peripheral clock in PMC for  UHP
-//*----------------------------------------------------------------------------
-static inline void AT91F_UHP_CfgPMC (void)
-{
-	AT91F_PMC_EnablePeriphClock(
-		AT91C_BASE_PMC, // PIO controller base address
-		((unsigned int) 1 << AT91C_ID_UHP));
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SDRC_CfgPIO
-//* \brief Configure PIO controllers to drive SDRC signals
-//*----------------------------------------------------------------------------
-static inline void AT91F_SDRC_CfgPIO (void)
-{
-	// Configure PIO controllers to periph mode
-	AT91F_PIO_CfgPeriph(
-		AT91C_BASE_PIOC, // PIO controller base address
-		((unsigned int) AT91C_PC20_D20     ) |
-		((unsigned int) AT91C_PC21_D21     ) |
-		((unsigned int) AT91C_PC30_D30     ) |
-		((unsigned int) AT91C_PC22_D22     ) |
-		((unsigned int) AT91C_PC31_D31     ) |
-		((unsigned int) AT91C_PC23_D23     ) |
-		((unsigned int) AT91C_PC16_D16     ) |
-		((unsigned int) AT91C_PC24_D24     ) |
-		((unsigned int) AT91C_PC17_D17     ) |
-		((unsigned int) AT91C_PC25_D25     ) |
-		((unsigned int) AT91C_PC18_D18     ) |
-		((unsigned int) AT91C_PC26_D26     ) |
-		((unsigned int) AT91C_PC19_D19     ) |
-		((unsigned int) AT91C_PC27_D27     ) |
-		((unsigned int) AT91C_PC28_D28     ) |
-		((unsigned int) AT91C_PC29_D29     ), // Peripheral A
-		0); // Peripheral B
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_EMAC_CfgPMC
-//* \brief Enable Peripheral clock in PMC for  EMAC
-//*----------------------------------------------------------------------------
-static inline void AT91F_EMAC_CfgPMC (void)
-{
-	AT91F_PMC_EnablePeriphClock(
-		AT91C_BASE_PMC, // PIO controller base address
-		((unsigned int) 1 << AT91C_ID_EMAC));
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_EMAC_CfgPIO
-//* \brief Configure PIO controllers to drive EMAC signals
-//*----------------------------------------------------------------------------
-static inline void AT91F_EMAC_CfgPIO (void)
-{
-	// Configure PIO controllers to periph mode
-	AT91F_PIO_CfgPeriph(
-		AT91C_BASE_PIOA, // PIO controller base address
-		((unsigned int) AT91C_PA14_ERXER   ) |
-		((unsigned int) AT91C_PA12_ERX0    ) |
-		((unsigned int) AT91C_PA13_ERX1    ) |
-		((unsigned int) AT91C_PA8_ETXEN   ) |
-		((unsigned int) AT91C_PA16_EMDIO   ) |
-		((unsigned int) AT91C_PA9_ETX0    ) |
-		((unsigned int) AT91C_PA10_ETX1    ) |
-		((unsigned int) AT91C_PA11_ECRS_ECRSDV) |
-		((unsigned int) AT91C_PA15_EMDC    ) |
-		((unsigned int) AT91C_PA7_ETXCK_EREFCK), // Peripheral A
-		0); // Peripheral B
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_RTC_CfgPMC
-//* \brief Enable Peripheral clock in PMC for  RTC
-//*----------------------------------------------------------------------------
-static inline void AT91F_RTC_CfgPMC (void)
-{
-	AT91F_PMC_EnablePeriphClock(
-		AT91C_BASE_PMC, // PIO controller base address
-		((unsigned int) 1 << AT91C_ID_SYS));
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SSC2_CfgPMC
-//* \brief Enable Peripheral clock in PMC for  SSC2
-//*----------------------------------------------------------------------------
-static inline void AT91F_SSC2_CfgPMC (void)
-{
-	AT91F_PMC_EnablePeriphClock(
-		AT91C_BASE_PMC, // PIO controller base address
-		((unsigned int) 1 << AT91C_ID_SSC2));
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SSC2_CfgPIO
-//* \brief Configure PIO controllers to drive SSC2 signals
-//*----------------------------------------------------------------------------
-static inline void AT91F_SSC2_CfgPIO (void)
-{
-	// Configure PIO controllers to periph mode
-	AT91F_PIO_CfgPeriph(
-		AT91C_BASE_PIOB, // PIO controller base address
-		((unsigned int) AT91C_PB12_TF2     ) |
-		((unsigned int) AT91C_PB17_RF2     ) |
-		((unsigned int) AT91C_PB13_TK2     ) |
-		((unsigned int) AT91C_PB16_RK2     ) |
-		((unsigned int) AT91C_PB14_TD2     ) |
-		((unsigned int) AT91C_PB15_RD2     ), // Peripheral A
-		0); // Peripheral B
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SSC1_CfgPMC
-//* \brief Enable Peripheral clock in PMC for  SSC1
-//*----------------------------------------------------------------------------
-static inline void AT91F_SSC1_CfgPMC (void)
-{
-	AT91F_PMC_EnablePeriphClock(
-		AT91C_BASE_PMC, // PIO controller base address
-		((unsigned int) 1 << AT91C_ID_SSC1));
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SSC1_CfgPIO
-//* \brief Configure PIO controllers to drive SSC1 signals
-//*----------------------------------------------------------------------------
-static inline void AT91F_SSC1_CfgPIO (void)
-{
-	// Configure PIO controllers to periph mode
-	AT91F_PIO_CfgPeriph(
-		AT91C_BASE_PIOB, // PIO controller base address
-		((unsigned int) AT91C_PB11_RF1     ) |
-		((unsigned int) AT91C_PB10_RK1     ) |
-		((unsigned int) AT91C_PB8_TD1     ) |
-		((unsigned int) AT91C_PB9_RD1     ), // Peripheral A
-		0); // Peripheral B
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SSC0_CfgPMC
-//* \brief Enable Peripheral clock in PMC for  SSC0
-//*----------------------------------------------------------------------------
-static inline void AT91F_SSC0_CfgPMC (void)
-{
-	AT91F_PMC_EnablePeriphClock(
-		AT91C_BASE_PMC, // PIO controller base address
-		((unsigned int) 1 << AT91C_ID_SSC0));
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SPI_CfgPMC
-//* \brief Enable Peripheral clock in PMC for  SPI
-//*----------------------------------------------------------------------------
-static inline void AT91F_SPI_CfgPMC (void)
-{
-	AT91F_PMC_EnablePeriphClock(
-		AT91C_BASE_PMC, // PIO controller base address
-		((unsigned int) 1 << AT91C_ID_SPI));
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SPI_CfgPIO
-//* \brief Configure PIO controllers to drive SPI signals
-//*----------------------------------------------------------------------------
-static inline void AT91F_SPI_CfgPIO (void)
-{
-	// Configure PIO controllers to periph mode
-	AT91F_PIO_CfgPeriph(
-		AT91C_BASE_PIOA, // PIO controller base address
-		((unsigned int) AT91C_PA3_NPCS0   ) |
-		((unsigned int) AT91C_PA4_NPCS1   ) |
-		((unsigned int) AT91C_PA1_MOSI    ) |
-		((unsigned int) AT91C_PA5_NPCS2   ) |
-		((unsigned int) AT91C_PA6_NPCS3   ) |
-		((unsigned int) AT91C_PA0_MISO    ) |
-		((unsigned int) AT91C_PA2_SPCK    ), // Peripheral A
-		0); // Peripheral B
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_TC5_CfgPMC
-//* \brief Enable Peripheral clock in PMC for  TC5
-//*----------------------------------------------------------------------------
-static inline void AT91F_TC5_CfgPMC (void)
-{
-	AT91F_PMC_EnablePeriphClock(
-		AT91C_BASE_PMC, // PIO controller base address
-		((unsigned int) 1 << AT91C_ID_TC5));
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_TC4_CfgPMC
-//* \brief Enable Peripheral clock in PMC for  TC4
-//*----------------------------------------------------------------------------
-static inline void AT91F_TC4_CfgPMC (void)
-{
-	AT91F_PMC_EnablePeriphClock(
-		AT91C_BASE_PMC, // PIO controller base address
-		((unsigned int) 1 << AT91C_ID_TC4));
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_TC3_CfgPMC
-//* \brief Enable Peripheral clock in PMC for  TC3
-//*----------------------------------------------------------------------------
-static inline void AT91F_TC3_CfgPMC (void)
-{
-	AT91F_PMC_EnablePeriphClock(
-		AT91C_BASE_PMC, // PIO controller base address
-		((unsigned int) 1 << AT91C_ID_TC3));
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_TC2_CfgPMC
-//* \brief Enable Peripheral clock in PMC for  TC2
-//*----------------------------------------------------------------------------
-static inline void AT91F_TC2_CfgPMC (void)
-{
-	AT91F_PMC_EnablePeriphClock(
-		AT91C_BASE_PMC, // PIO controller base address
-		((unsigned int) 1 << AT91C_ID_TC2));
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_TC1_CfgPMC
-//* \brief Enable Peripheral clock in PMC for  TC1
-//*----------------------------------------------------------------------------
-static inline void AT91F_TC1_CfgPMC (void)
-{
-	AT91F_PMC_EnablePeriphClock(
-		AT91C_BASE_PMC, // PIO controller base address
-		((unsigned int) 1 << AT91C_ID_TC1));
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_TC0_CfgPMC
-//* \brief Enable Peripheral clock in PMC for  TC0
-//*----------------------------------------------------------------------------
-static inline void AT91F_TC0_CfgPMC (void)
-{
-	AT91F_PMC_EnablePeriphClock(
-		AT91C_BASE_PMC, // PIO controller base address
-		((unsigned int) 1 << AT91C_ID_TC0));
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_SMC2_CfgPIO
-//* \brief Configure PIO controllers to drive SMC2 signals
-//*----------------------------------------------------------------------------
-static inline void AT91F_SMC2_CfgPIO (void)
-{
-	// Configure PIO controllers to periph mode
-	AT91F_PIO_CfgPeriph(
-		AT91C_BASE_PIOC, // PIO controller base address
-		((unsigned int) AT91C_PC10_NCS4_CFCS) |
-		((unsigned int) AT91C_PC9_A25_CFRNW) |
-		((unsigned int) AT91C_PC12_NCS6_CFCE2) |
-		((unsigned int) AT91C_PC11_NCS5_CFCE1), // Peripheral A
-		0); // Peripheral B
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PMC_CfgPMC
-//* \brief Enable Peripheral clock in PMC for  PMC
-//*----------------------------------------------------------------------------
-static inline void AT91F_PMC_CfgPMC (void)
-{
-	AT91F_PMC_EnablePeriphClock(
-		AT91C_BASE_PMC, // PIO controller base address
-		((unsigned int) 1 << AT91C_ID_SYS));
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PMC_CfgPIO
-//* \brief Configure PIO controllers to drive PMC signals
-//*----------------------------------------------------------------------------
-static inline void AT91F_PMC_CfgPIO (void)
-{
-	// Configure PIO controllers to periph mode
-	AT91F_PIO_CfgPeriph(
-		AT91C_BASE_PIOA, // PIO controller base address
-		0, // Peripheral A
-		((unsigned int) AT91C_PA24_PCK1    )); // Peripheral B
-	// Configure PIO controllers to periph mode
-	AT91F_PIO_CfgPeriph(
-		AT91C_BASE_PIOB, // PIO controller base address
-		((unsigned int) AT91C_PB27_PCK0    ), // Peripheral A
-		0); // Peripheral B
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIOD_CfgPMC
-//* \brief Enable Peripheral clock in PMC for  PIOD
-//*----------------------------------------------------------------------------
-static inline void AT91F_PIOD_CfgPMC (void)
-{
-	AT91F_PMC_EnablePeriphClock(
-		AT91C_BASE_PMC, // PIO controller base address
-		((unsigned int) 1 << AT91C_ID_PIOD));
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIOC_CfgPMC
-//* \brief Enable Peripheral clock in PMC for  PIOC
-//*----------------------------------------------------------------------------
-static inline void AT91F_PIOC_CfgPMC (void)
-{
-	AT91F_PMC_EnablePeriphClock(
-		AT91C_BASE_PMC, // PIO controller base address
-		((unsigned int) 1 << AT91C_ID_PIOC));
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIOB_CfgPMC
-//* \brief Enable Peripheral clock in PMC for  PIOB
-//*----------------------------------------------------------------------------
-static inline void AT91F_PIOB_CfgPMC (void)
-{
-	AT91F_PMC_EnablePeriphClock(
-		AT91C_BASE_PMC, // PIO controller base address
-		((unsigned int) 1 << AT91C_ID_PIOB));
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_PIOA_CfgPMC
-//* \brief Enable Peripheral clock in PMC for  PIOA
-//*----------------------------------------------------------------------------
-static inline void AT91F_PIOA_CfgPMC (void)
-{
-	AT91F_PMC_EnablePeriphClock(
-		AT91C_BASE_PMC, // PIO controller base address
-		((unsigned int) 1 << AT91C_ID_PIOA));
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_TWI_CfgPMC
-//* \brief Enable Peripheral clock in PMC for  TWI
-//*----------------------------------------------------------------------------
-static inline void AT91F_TWI_CfgPMC (void)
-{
-	AT91F_PMC_EnablePeriphClock(
-		AT91C_BASE_PMC, // PIO controller base address
-		((unsigned int) 1 << AT91C_ID_TWI));
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_TWI_CfgPIO
-//* \brief Configure PIO controllers to drive TWI signals
-//*----------------------------------------------------------------------------
-static inline void AT91F_TWI_CfgPIO (void)
-{
-	// Configure PIO controllers to periph mode
-	AT91F_PIO_CfgPeriph(
-		AT91C_BASE_PIOA, // PIO controller base address
-		((unsigned int) AT91C_PA25_TWD     ) |
-		((unsigned int) AT91C_PA26_TWCK    ), // Peripheral A
-		0); // Peripheral B
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_US3_CfgPMC
-//* \brief Enable Peripheral clock in PMC for  US3
-//*----------------------------------------------------------------------------
-static inline void AT91F_US3_CfgPMC (void)
-{
-	AT91F_PMC_EnablePeriphClock(
-		AT91C_BASE_PMC, // PIO controller base address
-		((unsigned int) 1 << AT91C_ID_US3));
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_US2_CfgPMC
-//* \brief Enable Peripheral clock in PMC for  US2
-//*----------------------------------------------------------------------------
-static inline void AT91F_US2_CfgPMC (void)
-{
-	AT91F_PMC_EnablePeriphClock(
-		AT91C_BASE_PMC, // PIO controller base address
-		((unsigned int) 1 << AT91C_ID_US2));
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_US2_CfgPIO
-//* \brief Configure PIO controllers to drive US2 signals
-//*----------------------------------------------------------------------------
-static inline void AT91F_US2_CfgPIO (void)
-{
-	// Configure PIO controllers to periph mode
-	AT91F_PIO_CfgPeriph(
-		AT91C_BASE_PIOA, // PIO controller base address
-		((unsigned int) AT91C_PA23_TXD2    ) |
-		((unsigned int) AT91C_PA22_RXD2    ), // Peripheral A
-		0); // Peripheral B
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_US1_CfgPMC
-//* \brief Enable Peripheral clock in PMC for  US1
-//*----------------------------------------------------------------------------
-static inline void AT91F_US1_CfgPMC (void)
-{
-	AT91F_PMC_EnablePeriphClock(
-		AT91C_BASE_PMC, // PIO controller base address
-		((unsigned int) 1 << AT91C_ID_US1));
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_US1_CfgPIO
-//* \brief Configure PIO controllers to drive US1 signals
-//*----------------------------------------------------------------------------
-static inline void AT91F_US1_CfgPIO (void)
-{
-	// Configure PIO controllers to periph mode
-	AT91F_PIO_CfgPeriph(
-		AT91C_BASE_PIOB, // PIO controller base address
-		((unsigned int) AT91C_PB21_RXD1    ) |
-		((unsigned int) AT91C_PB26_RTS1    ) |
-		((unsigned int) AT91C_PB25_DSR1    ) |
-		((unsigned int) AT91C_PB24_CTS1    ) |
-		((unsigned int) AT91C_PB19_DTR1    ) |
-		((unsigned int) AT91C_PB23_DCD1    ) |
-		((unsigned int) AT91C_PB20_TXD1    ) |
-		((unsigned int) AT91C_PB18_RI1     ), // Peripheral A
-		0); // Peripheral B
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_US0_CfgPMC
-//* \brief Enable Peripheral clock in PMC for  US0
-//*----------------------------------------------------------------------------
-static inline void AT91F_US0_CfgPMC (void)
-{
-	AT91F_PMC_EnablePeriphClock(
-		AT91C_BASE_PMC, // PIO controller base address
-		((unsigned int) 1 << AT91C_ID_US0));
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_US0_CfgPIO
-//* \brief Configure PIO controllers to drive US0 signals
-//*----------------------------------------------------------------------------
-static inline void AT91F_US0_CfgPIO (void)
-{
-	// Configure PIO controllers to periph mode
-	AT91F_PIO_CfgPeriph(
-		AT91C_BASE_PIOA, // PIO controller base address
-		((unsigned int) AT91C_PA17_TXD0    ) |
-		((unsigned int) AT91C_PA21_RTS0    ) |
-		((unsigned int) AT91C_PA19_SCK0    ) |
-		((unsigned int) AT91C_PA20_CTS0    ), // Peripheral A
-		0); // Peripheral B
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_MCI_CfgPMC
-//* \brief Enable Peripheral clock in PMC for  MCI
-//*----------------------------------------------------------------------------
-static inline void AT91F_MCI_CfgPMC (void)
-{
-	AT91F_PMC_EnablePeriphClock(
-		AT91C_BASE_PMC, // PIO controller base address
-		((unsigned int) 1 << AT91C_ID_MCI));
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_MCI_CfgPIO
-//* \brief Configure PIO controllers to drive MCI signals
-//*----------------------------------------------------------------------------
-static inline void AT91F_MCI_CfgPIO (void)
-{
-	// Configure PIO controllers to periph mode
-	AT91F_PIO_CfgPeriph(
-		AT91C_BASE_PIOA, // PIO controller base address
-		((unsigned int) AT91C_PA28_MCCDA   ) |
-		((unsigned int) AT91C_PA29_MCDA0   ) |
-		((unsigned int) AT91C_PA27_MCCK    ), // Peripheral A
-		0); // Peripheral B
-	// Configure PIO controllers to periph mode
-	AT91F_PIO_CfgPeriph(
-		AT91C_BASE_PIOB, // PIO controller base address
-		0, // Peripheral A
-		((unsigned int) AT91C_PB5_MCDA3   ) |
-		((unsigned int) AT91C_PB3_MCDA1   ) |
-		((unsigned int) AT91C_PB4_MCDA2   )); // Peripheral B
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_AIC_CfgPMC
-//* \brief Enable Peripheral clock in PMC for  AIC
-//*----------------------------------------------------------------------------
-static inline void AT91F_AIC_CfgPMC (void)
-{
-	AT91F_PMC_EnablePeriphClock(
-		AT91C_BASE_PMC, // PIO controller base address
-		((unsigned int) 1 << AT91C_ID_IRQ4) |
-		((unsigned int) 1 << AT91C_ID_FIQ) |
-		((unsigned int) 1 << AT91C_ID_IRQ5) |
-		((unsigned int) 1 << AT91C_ID_IRQ6) |
-		((unsigned int) 1 << AT91C_ID_IRQ0) |
-		((unsigned int) 1 << AT91C_ID_IRQ1) |
-		((unsigned int) 1 << AT91C_ID_IRQ2) |
-		((unsigned int) 1 << AT91C_ID_IRQ3));
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_UDP_CfgPMC
-//* \brief Enable Peripheral clock in PMC for  UDP
-//*----------------------------------------------------------------------------
-static inline void AT91F_UDP_CfgPMC (void)
-{
-	AT91F_PMC_EnablePeriphClock(
-		AT91C_BASE_PMC, // PIO controller base address
-		((unsigned int) 1 << AT91C_ID_UDP));
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_ST_CfgPMC
-//* \brief Enable Peripheral clock in PMC for  ST
-//*----------------------------------------------------------------------------
-static inline void AT91F_ST_CfgPMC (void)
-{
-	AT91F_PMC_EnablePeriphClock(
-		AT91C_BASE_PMC, // PIO controller base address
-		((unsigned int) 1 << AT91C_ID_SYS));
-}
-
-#endif // lib_AT91RM9200_H
diff --git a/target/linux/at91/image/dfboot/src/init.c b/target/linux/at91/image/dfboot/src/init.c
deleted file mode 100644
index 4088973f7..000000000
--- a/target/linux/at91/image/dfboot/src/init.c
+++ /dev/null
@@ -1,165 +0,0 @@
-//*----------------------------------------------------------------------------
-//*         ATMEL Microcontroller Software Support  -  ROUSSET  -
-//*----------------------------------------------------------------------------
-//* The software is delivered "AS IS" without warranty or condition of any
-//* kind, either express, implied or statutory. This includes without
-//* limitation any warranty or condition with respect to merchantability or
-//* fitness for any particular purpose, or against the infringements of
-//* intellectual property rights of others.
-//*----------------------------------------------------------------------------
-//* File Name           : init.c
-//* Object              : Low level initialisations written in C
-//* Creation            : HIi   10/10/2003
-//*
-//*----------------------------------------------------------------------------
-#include "config.h"
-#include "AT91RM9200.h"
-#include "lib_AT91RM9200.h"
-#include "stdio.h"
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_DataAbort
-//* \brief This function reports an Abort
-//*----------------------------------------------------------------------------
-static void AT91F_SpuriousHandler() 
-{
-	puts("ISI");
-	while (1);
-}
-
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_DataAbort
-//* \brief This function reports an Abort
-//*----------------------------------------------------------------------------
-static void AT91F_DataAbort() 
-{
-	puts("IDA");
-	while (1);
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_FetchAbort
-//* \brief This function reports an Abort
-//*----------------------------------------------------------------------------
-static void AT91F_FetchAbort()
-{
-	puts("IFA");
-	while (1);
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_UndefHandler
-//* \brief This function reports that no handler have been set for current IT
-//*----------------------------------------------------------------------------
-static void AT91F_UndefHandler() 
-{
-	puts("IUD");
-	while (1);
-}
-
-
-//*--------------------------------------------------------------------------------------
-//* Function Name       : AT91F_InitSdram
-//* Object              : Initialize the SDRAM
-//* Input Parameters    :
-//* Output Parameters   :
-//*--------------------------------------------------------------------------------------
-static void AT91F_InitSdram()
-{
-	int *pRegister;
-	
-	//* Configure PIOC as peripheral (D16/D31)
-	
-	AT91F_PIO_CfgPeriph(
-		AT91C_BASE_PIOC, // PIO controller base address
-		0xFFFF0030,
-		0
-	);
-	
-	//*Init SDRAM
-	pRegister = (int *)0xFFFFFF98;
-	*pRegister = 0x2188c155; 
-	pRegister = (int *)0xFFFFFF90;
-	*pRegister = 0x2; 
-	pRegister = (int *)0x20000000;
-	*pRegister = 0; 
-	pRegister = (int *)0xFFFFFF90;
-	*pRegister = 0x4; 
-	pRegister = (int *)0x20000000;
-	*pRegister = 0; 
-	*pRegister = 0; 
-	*pRegister = 0; 
-	*pRegister = 0; 
-	*pRegister = 0; 
-	*pRegister = 0; 
-	*pRegister = 0; 
-	*pRegister = 0; 
-	pRegister = (int *)0xFFFFFF90;
-	*pRegister = 0x3; 
-	pRegister = (int *)0x20000080;
-	*pRegister = 0; 
-
-	pRegister = (int *)0xFFFFFF94;
-	*pRegister = 0x2e0; 
-	pRegister = (int *)0x20000000;
-	*pRegister = 0; 
-
-	pRegister = (int *)0xFFFFFF90;
-	*pRegister = 0x00; 
-	pRegister = (int *)0x20000000;
-	*pRegister = 0; 
-}
-
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_InitFlash
-//* \brief This function performs low level HW initialization
-//*----------------------------------------------------------------------------
-static void AT91F_InitMemories()
-{
-	int *pEbi = (int *)0xFFFFFF60;
-
-	//* Setup MEMC to support all connected memories (CS0 = FLASH; CS1=SDRAM)
-	pEbi  = (int *)0xFFFFFF60;
-	*pEbi = 0x00000002;
-
-	//* CS0 cs for flash
-	pEbi  = (int *)0xFFFFFF70;
-	*pEbi = 0x00003284;
-	
-	AT91F_InitSdram();
-}
-
-
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_LowLevelInit
-//* \brief This function performs very low level HW initialization
-//*----------------------------------------------------------------------------
-void AT91F_LowLevelInit(void)
-{
-	int i;
-
-	// Init Interrupt Controller
-	AT91F_AIC_Open(
-		AT91C_BASE_AIC,          // pointer to the AIC registers
-		AT91C_AIC_BRANCH_OPCODE, // IRQ exception vector
-		AT91F_UndefHandler,      // FIQ exception vector
-		AT91F_UndefHandler,      // AIC default handler
-		AT91F_SpuriousHandler,   // AIC spurious handler
-		0);                      // Protect mode
-
-	// Perform 8 End Of Interrupt Command to make sýre AIC will not Lock out nIRQ 
-	for(i=0; i<8; i++)
-		AT91F_AIC_AcknowledgeIt(AT91C_BASE_AIC);
-
-	AT91F_AIC_SetExceptionVector((unsigned int *)0x0C, AT91F_FetchAbort);
-	AT91F_AIC_SetExceptionVector((unsigned int *)0x10, AT91F_DataAbort);
-	AT91F_AIC_SetExceptionVector((unsigned int *)0x4, AT91F_UndefHandler);
-
-	//Initialize SDRAM and Flash
-	AT91F_InitMemories();
-
-}
-
diff --git a/target/linux/at91/image/dfboot/src/jump.S b/target/linux/at91/image/dfboot/src/jump.S
deleted file mode 100644
index cc6931156..000000000
--- a/target/linux/at91/image/dfboot/src/jump.S
+++ /dev/null
@@ -1,4 +0,0 @@
-.global		Jump
-	
-Jump:		mov pc, r0				
-
diff --git a/target/linux/at91/image/dfboot/src/led.c b/target/linux/at91/image/dfboot/src/led.c
deleted file mode 100644
index 40d49113c..000000000
--- a/target/linux/at91/image/dfboot/src/led.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * (C) Copyright 2006
- * Atmel Nordic AB <www.atmel.com>
- * Ulf Samuelsson <ulf@atmel.com>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <AT91RM9200.h>
-
-#define	GREEN_LED	AT91C_PIO_PB0
-#define	YELLOW_LED	AT91C_PIO_PB1
-#define	RED_LED	AT91C_PIO_PB2
-
-void	LED_set(unsigned int led)
-{
-	AT91PS_PIO	PIOB	= AT91C_BASE_PIOB;
-	PIOB->PIO_SODR		= (led ^ 0x7) & 0x7;		// All 0's => Set PIO high => OFF
-	PIOB->PIO_CODR		=  led & 0x7;			// All 1's => Set PIO low   => ON
-}
-
-void	green_LED_on(void)
-{
-	AT91PS_PIO	PIOB	= AT91C_BASE_PIOB;
-//	PIOB->PIO_CODR		= GREEN_LED;
-	PIOB->PIO_CODR		= (1 << 0);
-}
-
-void	 yellow_LED_on(void)
-{
-	AT91PS_PIO	PIOB	= AT91C_BASE_PIOB;
-//	PIOB->PIO_CODR		= YELLOW_LED;
-	PIOB->PIO_CODR		= (1 << 1);
-}
-
-void	 red_LED_on(void)
-{
-	AT91PS_PIO	PIOB	= AT91C_BASE_PIOB;
-//	PIOB->PIO_CODR		= RED_LED;
-	PIOB->PIO_CODR		= (1 << 2);
-}
-
-void	green_LED_off(void)
-{
-	AT91PS_PIO	PIOB	= AT91C_BASE_PIOB;
-//	PIOB->PIO_SODR		= GREEN_LED;
-	PIOB->PIO_SODR		= (1 << 0);
-}
-
-void	yellow_LED_off(void)
-{
-	AT91PS_PIO	PIOB	= AT91C_BASE_PIOB;
-//	PIOB->PIO_SODR		= YELLOW_LED;
-	PIOB->PIO_SODR		= (1 << 1);
-}
-
-void	red_LED_off(void)
-{
-	AT91PS_PIO	PIOB	= AT91C_BASE_PIOB;
-//	PIOB->PIO_SODR		= RED_LED;
-	PIOB->PIO_SODR		= (1 << 2);
-}
-
-void	LED_blink(unsigned int led)
-{
-	volatile int i,j;
-	for(i = 0; i < 5; i++) {
-		LED_set((1 << led)&0x7);
-		for(j= 0; j < 200000; j++);
-		LED_set(0);
-		for(j= 0; j < 200000; j++);
-	}		
-}
-
-
-void LED_init (void)
-{
-	AT91PS_PIO	PIOB	= AT91C_BASE_PIOB;
-	AT91PS_PMC	PMC	= AT91C_BASE_PMC;
-	PMC->PMC_PCER		= (1 << AT91C_ID_PIOB);	// Enable PIOB clock
-	// Disable peripherals on LEDs
-	PIOB->PIO_PER		= AT91C_PIO_PB2 | AT91C_PIO_PB1 | AT91C_PIO_PB0;
-	// Enable pins as outputs
-	PIOB->PIO_OER		= AT91C_PIO_PB2 | AT91C_PIO_PB1 | AT91C_PIO_PB0;
-	// Turn all LEDs OFF
-	PIOB->PIO_SODR		= AT91C_PIO_PB2 | AT91C_PIO_PB1 | AT91C_PIO_PB0;
-}
diff --git a/target/linux/at91/image/dfboot/src/main.c b/target/linux/at91/image/dfboot/src/main.c
deleted file mode 100644
index c0705dec6..000000000
--- a/target/linux/at91/image/dfboot/src/main.c
+++ /dev/null
@@ -1,811 +0,0 @@
-/*----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support  -  ROUSSET  -
- *----------------------------------------------------------------------------
- * The software is delivered "AS IS" without warranty or condition of any
- * kind, either express, implied or statutory. This includes without
- * limitation any warranty or condition with respect to merchantability or
- * fitness for any particular purpose, or against the infringements of
- * intellectual property rights of others.
- *----------------------------------------------------------------------------
- * File Name		: main.c
- * Object		: 
- * Creation		: HIi	10/10/2003
- * Modif		: HIi	15/06/2004 :	add crc32 to verify the download
- *                                          	from dataflash
- *			: HIi	21/09/2004 :	Set first PLLA to 180Mhz and MCK to
- *						60Mhz to speed up dataflash boot (15Mhz)
- *			: MLC	12/04/2005 :	Modify SetPLL() to avoid errata
- *			: USA	30/12/2005 :	Change to page Size 1056
- *						Change startaddress to C0008400
- *						Change SPI Speed to ~4 Mhz
- *						Add retry on CRC Error
- *----------------------------------------------------------------------------
- */
-#include "config.h"
-#include "stdio.h"
-#include "AT91RM9200.h"
-#include "lib_AT91RM9200.h"
-#include "com.h"
-#include "main.h"
-#include "dataflash.h"
-#include "AT91C_MCI_Device.h"
-
-#define	DEBUGOUT
-#define XMODEM
-#define MEMDISP
-
-#ifdef	PAGESZ_1056
-#define	PAGESIZE	1056
-#else
-#define	PAGESIZE	1024
-#endif
-
-#define AT91C_SDRAM_START 0x20000000
-#define AT91C_BOOT_ADDR 0x21F00000
-#define AT91C_BOOT_SIZE 128*PAGESIZE
-#ifdef	PAGESZ_1056
-#define AT91C_BOOT_DATAFLASH_ADDR 0xC0008400
-#else
-#define AT91C_BOOT_DATAFLASH_ADDR 0xC0008000
-#endif
-#define AT91C_PLLA_VALUE 0x237A3E5A  // crystal= 18.432MHz - fixes BRG error at 115kbps
-//#define AT91C_PLLA_VALUE 0x2026BE04	// crystal= 18.432MHz
-//#define AT91C_PLLA_VALUE 0x202CBE01	// crystal= 4MHz
-
-
-
-#define DISP_LINE_LEN 16
-
-// Reason for boot failure
-#define	IMAGE_BAD_SIZE			0
-#define	IMAGE_READ_FAILURE	1
-#define	IMAGE_CRC_ERROR		2
-#define	IMAGE_ERROR			3
-#define	SUCCESS				-1
-
-/* prototypes*/
-extern void AT91F_ST_ASM_HANDLER(void);
-extern void Jump(unsigned int addr);
-
-const char *menu_dataflash[] = {
-#ifdef XMODEM
-	"1: P DFboot\n",
-	"2: P U-Boot\n",
-#endif
-	"3: P SDCard\n",
-#ifdef	PAGESZ_1056
-	"4: R UBOOT\n",
-#else
-	"4: R UBOOT\n",
-#endif
-#ifdef XMODEM
-	"5: P DF [addr]\n",
-#endif
-	"6: RD DF [addr]\n",
-	"7: E DF\n"
-};
-#ifdef XMODEM
-#define	MAXMENU 7
-#else
-#define MAXMENU 4
-#endif
-
-char message[20];
-#ifdef XMODEM
-volatile char XmodemComplete = 0;
-#endif
-unsigned int StTick = 0;
-
-AT91S_RomBoot const *pAT91;
-#ifdef XMODEM
-AT91S_SBuffer sXmBuffer;
-AT91S_SvcXmodem svcXmodem;
-AT91S_Pipe xmodemPipe;
-#endif
-AT91S_CtlTempo ctlTempo;
-
-
-//*--------------------------------------------------------------------------------------
-//* Function Name       : GetTickCount()
-//* Object              : Return the number of systimer tick 
-//* Input Parameters    :
-//* Output Parameters   :
-//*--------------------------------------------------------------------------------------
-unsigned int GetTickCount(void)
-{
-	return StTick;
-}
-
-#ifdef XMODEM
-//*--------------------------------------------------------------------------------------
-//* Function Name       : AT91_XmodemComplete()
-//* Object              : Perform the remap and jump to appli in RAM
-//* Input Parameters    :
-//* Output Parameters   :
-//*--------------------------------------------------------------------------------------
-static void AT91_XmodemComplete(AT91S_PipeStatus status, void *pVoid)
-{
-	/* stop the Xmodem tempo */
-	svcXmodem.tempo.Stop(&(svcXmodem.tempo));
-	XmodemComplete = 1;
-}
-
-
-//*--------------------------------------------------------------------------------------
-//* Function Name       : AT91F_XmodemProtocol(AT91S_PipeStatus status, void *pVoid)
-//* Object              : Xmodem dispatcher
-//* Input Parameters    :
-//* Output Parameters   :
-//*--------------------------------------------------------------------------------------
-static void XmodemProtocol(AT91S_PipeStatus status, void *pVoid)
-{
-	AT91PS_SBuffer pSBuffer = (AT91PS_SBuffer) xmodemPipe.pBuffer->pChild;
-	AT91PS_USART   pUsart     = svcXmodem.pUsart;
-			
-	if (pSBuffer->szRdBuffer == 0) {
-		/* Start a tempo to wait the Xmodem protocol complete */
-		svcXmodem.tempo.Start(&(svcXmodem.tempo), 10, 0, AT91_XmodemComplete, pUsart);								
-	}
-}
-#endif
-
-//*--------------------------------------------------------------------------------------
-//* Function Name       : irq1_c_handler()
-//* Object              : C Interrupt handler for Interrutp source 1
-//* Input Parameters    : none
-//* Output Parameters   : none
-//*--------------------------------------------------------------------------------------
-void AT91F_ST_HANDLER(void)
-{
-	volatile unsigned int csr = *AT91C_DBGU_CSR;
-#ifdef XMODEM
-	unsigned int error;
-#endif
-	
-	if (AT91C_BASE_ST->ST_SR & 0x01) {
-		StTick++;
-		ctlTempo.CtlTempoTick(&ctlTempo);
-		return;
-	}
-
-#ifdef XMODEM
-	error = AT91F_US_Error((AT91PS_USART)AT91C_BASE_DBGU);
-	if (csr & error) {
-		/* Stop previous Xmodem transmition*/
-		*(AT91C_DBGU_CR) = AT91C_US_RSTSTA;
-		AT91F_US_DisableIt((AT91PS_USART)AT91C_BASE_DBGU, AT91C_US_ENDRX);
-		AT91F_US_EnableIt((AT91PS_USART)AT91C_BASE_DBGU, AT91C_US_RXRDY);
-
-	}
-	
-	else if (csr & (AT91C_US_TXRDY | AT91C_US_ENDTX | AT91C_US_TXEMPTY | 
-	                AT91C_US_RXRDY | AT91C_US_ENDRX | AT91C_US_TIMEOUT | 
-	                AT91C_US_RXBUFF)) {
-		if ( !(svcXmodem.eot) )
-			svcXmodem.Handler(&svcXmodem, csr);
-	}
-#endif
-}
-
-
-//*-----------------------------------------------------------------------------
-//* Function Name       : AT91F_DisplayMenu()
-//* Object              : 
-//* Input Parameters    : 
-//* Return value		: 
-//*-----------------------------------------------------------------------------
-static int AT91F_DisplayMenu(void)
-{
-	int i, mci_present = 0;
-	printf("\nDF LOADER %s %s %s\n",AT91C_VERSION,__DATE__,__TIME__);
-	AT91F_DataflashPrintInfo();
-	mci_present = AT91F_MCI_Init();
-	for(i = 0; i < MAXMENU; i++) {
-		puts(menu_dataflash[i]);
-	}
-	return mci_present;
-}	
-
-
-//*-----------------------------------------------------------------------------
-//* Function Name       : AsciiToHex()
-//* Object              : ascii to hexa conversion
-//* Input Parameters    : 
-//* Return value		: 
-//*-----------------------------------------------------------------------------
-static unsigned int AsciiToHex(char *s, unsigned int *val)
-{
-	int n;
-
-	*val=0;
-	
-	if(s[0] == '0' && ((s[1] == 'x') || (s[1] == 'X')))
-		s+=2;
-	n = 0;	
-	while((n < 8) && (s[n] !=0))
-	{
-		*val <<= 4;
-		if ( (s[n] >= '0') && (s[n] <='9'))
-			*val += (s[n] - '0');
-		else	
-			if ((s[n] >= 'a') && (s[n] <='f'))
-				*val += (s[n] - 0x57);
-			else
-				if ((s[n] >= 'A') && (s[n] <='F'))
-					*val += (s[n] - 0x37);
-			else
-				return 0;
-		n++;
-	}
-
-	return 1;				
-}
-
-
-#ifdef MEMDISP
-//*-----------------------------------------------------------------------------
-//* Function Name       : AT91F_MemoryDisplay()
-//* Object              : Display the content of the dataflash
-//* Input Parameters    : 
-//* Return value		: 
-//*-----------------------------------------------------------------------------
-static int AT91F_MemoryDisplay(unsigned int addr, unsigned int length)
-{
-	unsigned long	i, nbytes, linebytes;
-	char	*cp;
-//	unsigned int 	*uip;
-//	unsigned short 	*usp;
-	unsigned char 	*ucp;
-	char linebuf[DISP_LINE_LEN];
-
-//	nbytes = length * size;
-	nbytes = length;
-   	do
-   	{
-//   		uip = (unsigned int *)linebuf;
-//   		usp = (unsigned short *)linebuf;
-		ucp = (unsigned char *)linebuf;
-		
-		printf("%08x:", addr);
-		linebytes = (nbytes > DISP_LINE_LEN)?DISP_LINE_LEN:nbytes;
-                if((addr & 0xF0000000) == 0x20000000) {
-			for(i = 0; i < linebytes; i ++) {
-				linebuf[i] =  *(char *)(addr+i);
-			}
-		} else {
-			read_dataflash(addr, linebytes, linebuf);
-		}
-		for (i=0; i<linebytes; i++)
-		{
-/*			if (size == 4) 
-				printf(" %08x", *uip++);
-			else if (size == 2)
-				printf(" %04x", *usp++);
-			else
-*/
-				printf(" %02x", *ucp++);
-//			addr += size;
-			addr++;
-		}
-		printf("    ");
-		cp = linebuf;
-		for (i=0; i<linebytes; i++) {
-			if ((*cp < 0x20) || (*cp > 0x7e))
-				printf(".");
-			else
-				printf("%c", *cp);
-			cp++;
-		}
-		printf("\n");
-		nbytes -= linebytes;
-	} while (nbytes > 0);
-	return 0;
-}
-#endif
-
-//*--------------------------------------------------------------------------------------
-//* Function Name       : AT91F_SetPLL
-//* Object              : Set the PLLA to 180Mhz and Master clock to 60 Mhz
-//* Input Parameters    :
-//* Output Parameters   :
-//*--------------------------------------------------------------------------------------
-static unsigned int AT91F_SetPLL(void)
-{
-	AT91_REG tmp;
-	AT91PS_PMC pPmc = AT91C_BASE_PMC;
-	AT91PS_CKGR pCkgr = AT91C_BASE_CKGR;
-
-	pPmc->PMC_IDR = 0xFFFFFFFF;
-
-	/* -Setup the PLL A */
-	pCkgr->CKGR_PLLAR = AT91C_PLLA_VALUE;
-
-	while (!(*AT91C_PMC_SR & AT91C_PMC_LOCKA));
-	
-	/* - Switch Master Clock from PLLB to PLLA/3 */
-	tmp = pPmc->PMC_MCKR;
-	/* See Atmel Errata #27 and #28 */
-	if (tmp & 0x0000001C) {
-		tmp = (tmp & ~0x0000001C);
-		pPmc->PMC_MCKR = tmp;
-		while (!(*AT91C_PMC_SR & AT91C_PMC_MCKRDY));
-	}
-	if (tmp != 0x00000202) {
-		pPmc->PMC_MCKR = 0x00000202;
-		if ((tmp & 0x00000003) != 0x00000002)
-			while (!(*AT91C_PMC_SR & AT91C_PMC_MCKRDY));
-	}
-
-	return 1;	
-}
-
-
-//*--------------------------------------------------------------------------------------
-//* Function Name       : AT91F_ResetRegisters
-//* Object              : Restore the initial state to registers
-//* Input Parameters    :
-//* Output Parameters   :
-//*--------------------------------------------------------------------------------------
-static unsigned int AT91F_ResetRegisters(void)
-{
-	volatile int i = 0;
-
-	/* set the PIOs in input*/
-	/* This disables the UART output, so dont execute for now*/
-
-#ifndef	DEBUGOUT
-	*AT91C_PIOA_ODR = 0xFFFFFFFF;	/* Disables all the output pins */
-	*AT91C_PIOA_PER = 0xFFFFFFFF;	/* Enables the PIO to control all the pins */
-#endif
-
-	AT91F_AIC_DisableIt (AT91C_BASE_AIC, AT91C_ID_SYS);
-	/* close all peripheral clocks */
-
-#ifndef	DEBUGOUT
-	AT91C_BASE_PMC->PMC_PCDR = 0xFFFFFFFC;
-#endif
-	/* Disable core interrupts and set supervisor mode */
-	__asm__ ("msr CPSR_c, #0xDF"); //* ARM_MODE_SYS(0x1F) | I_BIT(0x80) | F_BIT(0x40)
-	/* Clear all the interrupts */
-	*AT91C_AIC_ICCR = 0xffffffff;
-
-	/* read the AIC_IVR and AIC_FVR */
-	i = *AT91C_AIC_IVR;
-	i = *AT91C_AIC_FVR;
-
-	/* write the end of interrupt control register */
-	*AT91C_AIC_EOICR	= 0;
-
-	return 1;
-}
-
-
-static int AT91F_LoadBoot(void)
-{
-//	volatile unsigned int crc1 = 0, crc2 = 0;
-	volatile unsigned int SizeToDownload = 0x21400;
-	volatile unsigned int AddressToDownload = AT91C_BOOT_ADDR;
-
-#if 0
-	/* Read vector 6 to extract size to load */	
-	if (read_dataflash(AT91C_BOOT_DATAFLASH_ADDR, 32,
-	                   (char *)AddressToDownload) != AT91C_DATAFLASH_OK)
-	{
-		printf("Bad Code Size\n");
-		return IMAGE_BAD_SIZE;
-	}
-	/* calculate the size to download */
-	SizeToDownload = *(int *)(AddressToDownload + AT91C_OFFSET_VECT6);
-#endif
-	
-//	printf("\nLoad UBOOT from dataflash[%x] to SDRAM[%x]\n",
-//	       AT91C_BOOT_DATAFLASH_ADDR, AT91C_BOOT_ADDR);
-	if (read_dataflash(AT91C_BOOT_DATAFLASH_ADDR, SizeToDownload + 8,
-	                   (char *)AddressToDownload) != AT91C_DATAFLASH_OK)
-	{
-		printf("F DF RD\n");
-		return IMAGE_READ_FAILURE;
-	}
-#if 0
-	pAT91->CRC32((const unsigned char *)AT91C_BOOT_ADDR,
-	             (unsigned int)SizeToDownload , (unsigned int *)&crc2);
-	crc1 = (int)(*(char *)(AddressToDownload + SizeToDownload)) +
-	       (int)(*(char *)(AddressToDownload + SizeToDownload + 1) << 8) +
-	       (int)(*(char *)(AddressToDownload + SizeToDownload + 2) << 16) +
-	       (int)(*(char *)(AddressToDownload + SizeToDownload + 3) << 24);
-
-	/* Restore the value of Vector 6 */
-	*(int *)(AddressToDownload + AT91C_OFFSET_VECT6) =
-		*(int *)(AddressToDownload + SizeToDownload + 4);
-	
-	if (crc1 != crc2) {
-		printf("DF CRC bad %x != %x\n",crc1,crc2);
-	 	return	IMAGE_CRC_ERROR;
-	}
-#endif
-	return SUCCESS;
-}
-
-static int AT91F_StartBoot(void)
-{
-	int	sts;
-	if((sts = AT91F_LoadBoot()) != SUCCESS) return sts;
-//	printf("\n");
-//	printf("PLLA[180MHz], MCK[60Mhz] ==> Start UBOOT\n");
-	if (AT91F_ResetRegisters())
-	{
-		printf("Jump");
-		Jump(AT91C_BOOT_ADDR);
-//		LED_blink(0);
-	}
-	return	IMAGE_ERROR;
-}
-
-#if 0
-static void	AT91F_RepeatedStartBoot(void)
-{
-	int	i;
-	for(i = 0; i < CRC_RETRIES; i++) {
-		if(AT91F_StartBoot() != IMAGE_CRC_ERROR){
-//			LED_blink(1);
-			return;
-		}
-	}
-	return;
-}
-#endif
-
-#define TRUE 1
-#define FALSE 0
-#define TRX_MAGIC 0x30524448  /* "HDR0" */
-#define TRX_VERSION 1
-
-struct trx_header {
-	unsigned int magic;
-	unsigned int len;
-	unsigned int crc32;
-	unsigned int flag_version;
-	unsigned int offsets[3];
-};
-
-#define AT91C_MCI_TIMEOUT 1000000
-
-extern AT91S_MciDevice MCI_Device;
-extern void AT91F_MCIDeviceWaitReady(unsigned int);
-extern int AT91F_MCI_ReadBlockSwab(AT91PS_MciDevice, int, unsigned int *, int);
-
-int Program_From_MCI(void)
-{
-  int i;
-  unsigned int Max_Read_DataBlock_Length;
-  int block = 0;
-  int buffer = AT91C_DOWNLOAD_BASE_ADDRESS;
-  int bufpos = AT91C_DOWNLOAD_BASE_ADDRESS;
-  int NbPage = 0;
-  struct trx_header *p;
-
-	p = (struct trx_header *)bufpos;
-
-	Max_Read_DataBlock_Length = MCI_Device.pMCI_DeviceFeatures->Max_Read_DataBlock_Length;
-
-	AT91F_MCIDeviceWaitReady(AT91C_MCI_TIMEOUT);
-
-  AT91F_MCI_ReadBlockSwab(&MCI_Device, block*Max_Read_DataBlock_Length, (unsigned int *)bufpos, Max_Read_DataBlock_Length);
-
-  if (p->magic != TRX_MAGIC) {
-		printf("Inv IMG 0x%08x\n", p->magic);
-		return FALSE;
-		}
-
-	printf("RDSD");
-	AT91C_BASE_PIOC->PIO_CODR = AT91C_PIO_PC7 | AT91C_PIO_PC15 | AT91C_PIO_PC8 | AT91C_PIO_PC14;
-	for (i=0; i<(p->len/512); i++) {
-		AT91F_MCI_ReadBlockSwab(&MCI_Device, block*Max_Read_DataBlock_Length, (unsigned int *)bufpos, Max_Read_DataBlock_Length);
-		block++;
-		bufpos += Max_Read_DataBlock_Length;
-		}
-
-	NbPage = 0;
-	i = dataflash_info[0].Device.pages_number;
-	while(i >>= 1)
-		NbPage++;
-	i = ((p->offsets[1] - p->offsets[0])/ 512) + 1 + (NbPage << 13) + (dataflash_info[0].Device.pages_size << 17);
-	*(int *)(buffer + p->offsets[0] + AT91C_OFFSET_VECT6) = i;
-
-	printf(" WDFB");
-	AT91C_BASE_PIOC->PIO_CODR = AT91C_PIO_PC7 | AT91C_PIO_PC15 | AT91C_PIO_PC14;
-	AT91C_BASE_PIOC->PIO_SODR = AT91C_PIO_PC8;
-	write_dataflash(0xc0000000, buffer + p->offsets[0], p->offsets[1] - p->offsets[0]);
-	printf(" WUB");
-	AT91C_BASE_PIOC->PIO_CODR = AT91C_PIO_PC7 | AT91C_PIO_PC15;
-	AT91C_BASE_PIOC->PIO_SODR = AT91C_PIO_PC8 | AT91C_PIO_PC14;
-	write_dataflash(0xc0008000, buffer + p->offsets[1], p->offsets[2] - p->offsets[1]);
-	printf(" WKRFS");
-	AT91C_BASE_PIOC->PIO_CODR = AT91C_PIO_PC8 | AT91C_PIO_PC15;
-	AT91C_BASE_PIOC->PIO_SODR = AT91C_PIO_PC7 | AT91C_PIO_PC14;
-	write_dataflash(0xc0042000, buffer + p->offsets[2], p->len - p->offsets[2]);
-	AT91C_BASE_PIOC->PIO_CODR = AT91C_PIO_PC8 | AT91C_PIO_PC14;
-	AT91C_BASE_PIOC->PIO_SODR = AT91C_PIO_PC7 | AT91C_PIO_PC15;
-	return TRUE;
-}
-
-//*----------------------------------------------------------------------------
-//* Function Name       : main
-//* Object              : Main function
-//* Input Parameters    : none
-//* Output Parameters   : True
-//*----------------------------------------------------------------------------
-int main(void)
-{
-#ifdef XMODEM
-	AT91PS_Buffer  		pXmBuffer;
-	AT91PS_SvcComm 		pSvcXmodem;
-#endif
-	AT91S_SvcTempo 		svcBootTempo; 	 // Link to a AT91S_Tempo object
-	unsigned int		ix;
-	volatile unsigned int AddressToDownload, SizeToDownload;	
- 	unsigned int DeviceAddress = 0;
-	char command = 0;
-#ifdef XMODEM
-	volatile int i = 0;	
-	unsigned int crc1 = 0, crc2 = 0;
-	volatile int device;
-	int NbPage;
-#endif
-	volatile int Nb_Device = 0;
-	int mci_present = 0;
-
-	pAT91 = AT91C_ROM_BOOT_ADDRESS;
-
-	if (!AT91F_SetPLL())
-	{
-		printf("F SetPLL");
-		while(1);
-	}
-
-	at91_init_uarts();
-
-	/* Tempo Initialisation */
-	pAT91->OpenCtlTempo(&ctlTempo, (void *) &(pAT91->SYSTIMER_DESC));
-	ctlTempo.CtlTempoStart((void *) &(pAT91->SYSTIMER_DESC));
-	
-	// Attach the tempo to a tempo controler
-	ctlTempo.CtlTempoCreate(&ctlTempo, &svcBootTempo);
-//	LED_init();
-//	LED_blink(2);
-
-#ifdef XMODEM
-	/* Xmodem Initialisation */
-	pXmBuffer = pAT91->OpenSBuffer(&sXmBuffer);
-	pSvcXmodem = pAT91->OpenSvcXmodem(&svcXmodem,
-	             (AT91PS_USART)AT91C_BASE_DBGU, &ctlTempo);
-	pAT91->OpenPipe(&xmodemPipe, pSvcXmodem, pXmBuffer);
-#endif
-
-	/* System Timer initialization */
-	AT91F_AIC_ConfigureIt(
-		AT91C_BASE_AIC,                        // AIC base address
-		AT91C_ID_SYS,                          // System peripheral ID
-		AT91C_AIC_PRIOR_HIGHEST,               // Max priority
-		AT91C_AIC_SRCTYPE_INT_LEVEL_SENSITIVE, // Level sensitive
-		AT91F_ST_ASM_HANDLER
-	);
-	/* Enable ST interrupt */
-	AT91F_AIC_EnableIt(AT91C_BASE_AIC, AT91C_ID_SYS);
-
-#ifndef PRODTEST
-	/* Start tempo to start Boot in a delay of
-	 * AT91C_DELAY_TO_BOOT sec if no key pressed */
-	svcBootTempo.Start(&svcBootTempo, AT91C_DELAY_TO_BOOT,
-	                   0, AT91F_StartBoot, NULL);
-#endif
-
-	while(1)
-	{
-		while(command == 0)
-		{
-			AddressToDownload = AT91C_DOWNLOAD_BASE_ADDRESS;
-			SizeToDownload = AT91C_DOWNLOAD_MAX_SIZE;
-			DeviceAddress = 0;
-			
-			/* try to detect Dataflash */
-			if (!Nb_Device)
-				Nb_Device = AT91F_DataflashInit();				
-							
-			mci_present = AT91F_DisplayMenu();
-
-#ifdef PRODTEST
-			if (mci_present) {
-				if (Program_From_MCI())
-					AT91F_StartBoot();
-			}
-#endif
-
-			message[0] = 0;
-			AT91F_ReadLine ("Enter: ", message);
-
-#ifndef PRODTEST
-			/* stop tempo ==> stop autoboot */
-			svcBootTempo.Stop(&svcBootTempo);
-#endif
-
-			command = message[0];
-			for(ix = 1; (message[ix] == ' ') && (ix < 12); ix++);	// Skip some whitespace
-				
-			if(!AsciiToHex(&message[ix], &DeviceAddress) )
-				DeviceAddress = 0;			// Illegal DeviceAddress
-				
-			switch(command)
-			{
-#ifdef XMODEM
-				case '1':
-				case '2':
-				case '5':
-					if(command == '1') {
-						DeviceAddress = 0xC0000000;
-//						printf("Download DataflashBoot.bin to [0x%x]\n", DeviceAddress);
-					} else if(command == '2') {
-						DeviceAddress = AT91C_BOOT_DATAFLASH_ADDR;
-//						printf("Download u-boot.bin to [0x%x]\n", DeviceAddress);
-					} else {
-//						printf("Download Dataflash to [0x%x]\n", DeviceAddress);
-					}
-					switch(DeviceAddress & 0xFF000000)
-					{
-						case CFG_DATAFLASH_LOGIC_ADDR_CS0:
-							if (dataflash_info[0].id == 0){
-								printf("No DF");
-								AT91F_WaitKeyPressed();
-								command = 0;
-							}
-
-							device = 0;
-						break;
-					
-						case CFG_DATAFLASH_LOGIC_ADDR_CS3:
-							if (dataflash_info[1].id == 0){
-								printf("No DF");
-								AT91F_WaitKeyPressed();
-								command = 0;
-							}
-							device = 1;
-						break;
-					
-						default:
-							command = 0;
-						break;
-					}
-				break;
-#endif
-
-				case '3':
-					if (mci_present)
-						Program_From_MCI();
-					command = 0;
-					break;
-
-				case '4':
-					AT91F_StartBoot();
-					command = 0;
-				break;
-
-#ifdef MEMDISP
-				case '6':
-					do 
-					{
-						AT91F_MemoryDisplay(DeviceAddress, 256);
-						AT91F_ReadLine (NULL, message);
-						DeviceAddress += 0x100;
-					}
-					while(message[0] == '\0');
-					command = 0;
-				break;
-#endif
-
-				case '7':
-					switch(DeviceAddress & 0xFF000000)
-					{
-						case CFG_DATAFLASH_LOGIC_ADDR_CS0:
-							break;
-						case CFG_DATAFLASH_LOGIC_ADDR_CS3:
-							break;
-						default:
-							command = 0;
-							break;
-					}
-
-					if (command != 0) {
-						AT91F_ReadLine ("RDY ERA\nSure?",
-								message);
-						if(message[0] == 'Y' || message[0] == 'y') {
-							erase_dataflash(DeviceAddress & 0xFF000000);
-//							printf("Erase complete\n\n");
-						}
-//						else
-//							printf("Erase aborted\n");
-					}
-					command = 0;
-
-				break;
-
-				default:
-					command = 0;
-				break;
-			}
-		}
-#ifdef XMODEM
-		for(i = 0; i <= AT91C_DOWNLOAD_MAX_SIZE; i++)
-			*(unsigned char *)(AddressToDownload + i) = 0;
-	
-		xmodemPipe.Read(&xmodemPipe, (char *)AddressToDownload,
-		                SizeToDownload, XmodemProtocol, 0);	
-		while(XmodemComplete !=1);
-		SizeToDownload = (unsigned int)((svcXmodem.pData) -
-		                 (unsigned int)AddressToDownload);
-
-		/* Modification of vector 6 */
-		if ((DeviceAddress == CFG_DATAFLASH_LOGIC_ADDR_CS0)) {
-			// Vector 6 must be compliant to the BootRom description (ref Datasheet)
-	   		NbPage = 0;
-	    	i = dataflash_info[device].Device.pages_number;
-	    	while(i >>= 1)
-	    		NbPage++;
-			i = (SizeToDownload / 512)+1 + (NbPage << 13) +
-			    (dataflash_info[device].Device.pages_size << 17); //+4 to add crc32
-		    SizeToDownload = 512 * (i &0xFF);
-		}	
-		else
-		{
-			/* Save the contents of vector 6 ==> will be restored 
-			 * at boot time (AT91F_StartBoot) */
-			*(int *)(AddressToDownload + SizeToDownload + 4) =
-				*(int *)(AddressToDownload + AT91C_OFFSET_VECT6);
-			/* Modify Vector 6 to contain the size of the
-			 * file to copy (Dataflash -> SDRAM)*/
-			i = SizeToDownload;	
-		}		
-
-		*(int *)(AddressToDownload + AT91C_OFFSET_VECT6) = i;
-//		printf("\nModification of Arm Vector 6 :%x\n", i);
-			    
-//		printf("\nWrite %d bytes in DataFlash [0x%x]\n",SizeToDownload, DeviceAddress);
-		crc1 = 0;
-		pAT91->CRC32((const unsigned char *)AddressToDownload, SizeToDownload , &crc1);
-
-		/* Add the crc32 at the end of the code */
-		*(char *)(AddressToDownload + SizeToDownload)     = (char)(crc1 & 0x000000FF);
-		*(char *)(AddressToDownload + SizeToDownload + 1) = (char)((crc1 & 0x0000FF00) >> 8);
-		*(char *)(AddressToDownload + SizeToDownload + 2) = (char)((crc1 & 0x00FF0000) >> 16);
-		*(char *)(AddressToDownload + SizeToDownload + 3) = (char)((crc1 & 0xFF000000) >> 24);
-
-		/* write dataflash */
-		write_dataflash (DeviceAddress, AddressToDownload, (SizeToDownload + 8));
-
-		/* clear the buffer before read */
-		for(i=0; i <= SizeToDownload; i++)
-			*(unsigned char *)(AddressToDownload + i) = 0;
-					
-		/* Read dataflash to check the validity of the data */
-		read_dataflash (DeviceAddress, (SizeToDownload + 4), (char *)(AddressToDownload));
-
-		printf("VFY: ");	
-		crc2 = 0;
-				
-		pAT91->CRC32((const unsigned char *)AddressToDownload, SizeToDownload , &crc2);
- 		crc1 = (int)(*(char *)(AddressToDownload + SizeToDownload))          +
-			   (int)(*(char *)(AddressToDownload + SizeToDownload + 1) << 8) +
-			   (int)(*(char *)(AddressToDownload + SizeToDownload + 2) << 16) +
-			   (int)(*(char *)(AddressToDownload + SizeToDownload + 3) << 24);
-
-		if (crc1 != crc2)
-		 	printf("ERR");
-		else
-		 	printf("OK");
-		 	
- 		command = 0;
- 		XmodemComplete = 0;
-		AT91F_WaitKeyPressed();
-#endif
- 	}
-}
-
diff --git a/target/linux/at91/image/dfboot/src/main.h b/target/linux/at91/image/dfboot/src/main.h
deleted file mode 100644
index a8cd325ca..000000000
--- a/target/linux/at91/image/dfboot/src/main.h
+++ /dev/null
@@ -1,43 +0,0 @@
-//*----------------------------------------------------------------------------
-//*      ATMEL Microcontroller Software Support  -  ROUSSET  -
-//*----------------------------------------------------------------------------
-//* The software is delivered "AS IS" without warranty or condition of any
-//* kind, either express, implied or statutory. This includes without
-//* limitation any warranty or condition with respect to merchantability or
-//* fitness for any particular purpose, or against the infringements of
-//* intellectual property rights of others.
-//*----------------------------------------------------------------------------
-//* File Name           : main.h
-//* Object              :
-//*
-//* 1.0 27/03/03 HIi    : Creation
-//* 1.01 03/05/04 HIi   : AT9C_VERSION incremented to 1.01
-//* 1.02 15/06/04 HIi   : AT9C_VERSION incremented to 1.02 ==> 
-//*                       Add crc32 to verify dataflash download
-//* 1.03 18/04/05 MLC   : AT91C_VERSION incremented to 1.03g
-//*			  Repeat boot on CRC Failure
-//*			  Change Page Size to 1056
-//*			  Reduce SPI speed to 4 Mbit
-//*			  Change U-Boot boot address to a 1056 byte page boundary
-//* 1.04 30/04/05 USA	: AT91C_VERSION incremented to 1.04
-//* 1.05 07/08/06 USA	: AT91C_VERSION incremented to 1.05
-//*			  Will only support loading Dataflashboot.bin and U-Boot
-//*----------------------------------------------------------------------------
-
-#ifndef main_h
-#define main_h
-
-#include    "embedded_services.h"
-
-#define AT91C_DOWNLOAD_BASE_ADDRESS     0x20000000
-#define AT91C_DOWNLOAD_MAX_SIZE         0x00040000
-
-#define AT91C_OFFSET_VECT6              0x14        //* Offset for ARM vector 6
-
-#define AT91C_VERSION   "VER 1.05"
-
-
-// Global variables and functions definition
-extern unsigned int GetTickCount(void);
-#endif
-
diff --git a/target/linux/at91/image/dfboot/src/mci_device.c b/target/linux/at91/image/dfboot/src/mci_device.c
deleted file mode 100644
index cce74a3ae..000000000
--- a/target/linux/at91/image/dfboot/src/mci_device.c
+++ /dev/null
@@ -1,743 +0,0 @@
-//*----------------------------------------------------------------------------
-//*         ATMEL Microcontroller Software Support  -  ROUSSET  -
-//*----------------------------------------------------------------------------
-//* The software is delivered "AS IS" without warranty or condition of any
-//* kind, either express, implied or statutory. This includes without
-//* limitation any warranty or condition with respect to merchantability or
-//* fitness for any particular purpose, or against the infringements of
-//* intellectual property rights of others.
-//*----------------------------------------------------------------------------
-//* File Name           : mci_device.c
-//* Object              : TEST DataFlash Functions
-//* Creation            : FB   26/11/2002
-//*
-//*----------------------------------------------------------------------------
-
-#include <AT91C_MCI_Device.h>
-#include "stdio.h"
-
-#define AT91C_MCI_TIMEOUT			1000000   /* For AT91F_MCIDeviceWaitReady */
-#define BUFFER_SIZE_MCI_DEVICE		512
-#define MASTER_CLOCK				60000000
-#define FALSE						0
-#define TRUE						1
-
-//* External Functions
-extern void AT91F_ASM_MCI_Handler(void);
-//* Global Variables
-AT91S_MciDeviceFeatures			MCI_Device_Features;
-AT91S_MciDeviceDesc				MCI_Device_Desc;
-AT91S_MciDevice					MCI_Device;
-
-#undef ENABLE_WRITE
-#undef MMC
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_MCI_SendCommand
-//* \brief Generic function to send a command to the MMC or SDCard
-//*----------------------------------------------------------------------------
-int AT91F_MCI_SendCommand (
-	AT91PS_MciDevice pMCI_Device,
-	unsigned int Cmd,
-	unsigned int Arg)
-{
-	unsigned int	error,status;
-	//unsigned int	tick=0;
-
-    // Send the command
-    AT91C_BASE_MCI->MCI_ARGR = Arg;
-    AT91C_BASE_MCI->MCI_CMDR = Cmd;
-
-	// wait for CMDRDY Status flag to read the response
-	do
-	{
-		status = AT91C_BASE_MCI->MCI_SR;
-		//tick++;
-	}
-	while( !(status & AT91C_MCI_CMDRDY) );//&& (tick<100) );
-
-    // Test error  ==> if crc error and response R3 ==> don't check error
-    error = (AT91C_BASE_MCI->MCI_SR) & AT91C_MCI_SR_ERROR;
-	if(error != 0 )
-	{
-		// if the command is SEND_OP_COND the CRC error flag is always present (cf : R3 response)
-		if ( (Cmd != AT91C_SDCARD_APP_OP_COND_CMD) && (Cmd != AT91C_MMC_SEND_OP_COND_CMD) )
-			return ((AT91C_BASE_MCI->MCI_SR) & AT91C_MCI_SR_ERROR);
-		else
-		{
-			if (error != AT91C_MCI_RCRCE)
-				return ((AT91C_BASE_MCI->MCI_SR) & AT91C_MCI_SR_ERROR);
-		}
-	}
-    return AT91C_CMD_SEND_OK;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_MCI_SDCard_SendAppCommand
-//* \brief Specific function to send a specific command to the SDCard
-//*----------------------------------------------------------------------------
-int AT91F_MCI_SDCard_SendAppCommand (
-	AT91PS_MciDevice pMCI_Device,
-	unsigned int Cmd_App,
-	unsigned int Arg	)
-{
-	unsigned int status;
-	//unsigned int	tick=0;
-
-	// Send the CMD55 for application specific command
-    AT91C_BASE_MCI->MCI_ARGR = (pMCI_Device->pMCI_DeviceFeatures->Relative_Card_Address << 16 );
-    AT91C_BASE_MCI->MCI_CMDR = AT91C_APP_CMD;
-
-	// wait for CMDRDY Status flag to read the response
-	do
-	{
-		status = AT91C_BASE_MCI->MCI_SR;
-		//tick++;
-	}
-	while( !(status & AT91C_MCI_CMDRDY) );//&& (tick<100) );	
-
-    // if an error occurs
-    if (((AT91C_BASE_MCI->MCI_SR) & AT91C_MCI_SR_ERROR) != 0 )
-		return ((AT91C_BASE_MCI->MCI_SR) & AT91C_MCI_SR_ERROR);
-
-    // check if it is a specific command and then send the command
-	if ( (Cmd_App && AT91C_SDCARD_APP_ALL_CMD) == 0)
-		return AT91C_CMD_SEND_ERROR;
-
-   return( AT91F_MCI_SendCommand(pMCI_Device,Cmd_App,Arg) );
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_MCI_GetStatus
-//* \brief Addressed card sends its status register
-//*----------------------------------------------------------------------------
-int AT91F_MCI_GetStatus(AT91PS_MciDevice pMCI_Device,unsigned int relative_card_address)
-{
-	if (AT91F_MCI_SendCommand(pMCI_Device,
-								AT91C_SEND_STATUS_CMD,
-								relative_card_address <<16) == AT91C_CMD_SEND_OK)
-    	return (AT91C_BASE_MCI->MCI_RSPR[0]);
-
-    return AT91C_CMD_SEND_ERROR;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_MCI_Device_Handler
-//* \brief MCI C interrupt handler
-//*----------------------------------------------------------------------------
-void AT91F_MCI_Device_Handler(
-	AT91PS_MciDevice pMCI_Device,
-	unsigned int status)
-{
-	// If End of Tx Buffer Empty interrupt occurred
-	if ( status & AT91C_MCI_TXBUFE )
-    {
-		AT91C_BASE_MCI->MCI_IDR = AT91C_MCI_TXBUFE;
- 		AT91C_BASE_PDC_MCI->PDC_PTCR = AT91C_PDC_TXTDIS;
-        	
-		pMCI_Device->pMCI_DeviceDesc->state = AT91C_MCI_IDLE;
-	}	// End of if AT91C_MCI_TXBUFF		
-	
-    // If End of Rx Buffer Full interrupt occurred
-    if ( status & AT91C_MCI_RXBUFF )
-    {        
-       	AT91C_BASE_MCI->MCI_IDR = AT91C_MCI_RXBUFF;
- 		AT91C_BASE_PDC_MCI->PDC_PTCR = AT91C_PDC_RXTDIS;
-	
-		pMCI_Device->pMCI_DeviceDesc->state = AT91C_MCI_IDLE;
-	}	// End of if AT91C_MCI_RXBUFF
-
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_MCI_Handler
-//* \brief MCI Handler
-//*----------------------------------------------------------------------------
-void AT91F_MCI_Handler(void)
-{
-	int status;
-
-	status = ( AT91C_BASE_MCI->MCI_SR & AT91C_BASE_MCI->MCI_IMR );
-
-	AT91F_MCI_Device_Handler(&MCI_Device,status);
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_MCI_ReadBlock
-//* \brief Read an ENTIRE block or PARTIAL block
-//*----------------------------------------------------------------------------
-int AT91F_MCI_ReadBlock(
-	AT91PS_MciDevice pMCI_Device,
-	int src,
-	unsigned int *dataBuffer,
-	int sizeToRead )
-{
-    ////////////////////////////////////////////////////////////////////////////////////////////
-    if(pMCI_Device->pMCI_DeviceDesc->state != AT91C_MCI_IDLE)
-    	return AT91C_READ_ERROR;
-    
-    if( (AT91F_MCI_GetStatus(pMCI_Device,pMCI_Device->pMCI_DeviceFeatures->Relative_Card_Address) & AT91C_SR_READY_FOR_DATA) != AT91C_SR_READY_FOR_DATA)
-    	return AT91C_READ_ERROR;
-    	
-    if ( (src + sizeToRead) > pMCI_Device->pMCI_DeviceFeatures->Memory_Capacity )
-		return AT91C_READ_ERROR;
-
-    // If source does not fit a begin of a block
-	if ( (src % pMCI_Device->pMCI_DeviceFeatures->Max_Read_DataBlock_Length) != 0 )
-		return AT91C_READ_ERROR;
-   
-     // Test if the MMC supports Partial Read Block
-     // ALWAYS SUPPORTED IN SD Memory Card
-     if( (sizeToRead < pMCI_Device->pMCI_DeviceFeatures->Max_Read_DataBlock_Length) 
-    	&& (pMCI_Device->pMCI_DeviceFeatures->Read_Partial == 0x00) )
-   		return AT91C_READ_ERROR;
-   		
-    if( sizeToRead > pMCI_Device->pMCI_DeviceFeatures->Max_Read_DataBlock_Length)
-   		return AT91C_READ_ERROR;
-    ////////////////////////////////////////////////////////////////////////////////////////////
-      
-    // Init Mode Register
-	AT91C_BASE_MCI->MCI_MR |= ((pMCI_Device->pMCI_DeviceFeatures->Max_Read_DataBlock_Length << 16) | AT91C_MCI_PDCMODE);
-	 
-    if (sizeToRead %4)
-		sizeToRead = (sizeToRead /4)+1;
-	else
-		sizeToRead = sizeToRead/4;
-
-	AT91C_BASE_PDC_MCI->PDC_PTCR = (AT91C_PDC_TXTDIS | AT91C_PDC_RXTDIS);
-    AT91C_BASE_PDC_MCI->PDC_RPR  = (unsigned int)dataBuffer;
-    AT91C_BASE_PDC_MCI->PDC_RCR  = sizeToRead;
-
-	// Send the Read single block command
-    if ( AT91F_MCI_SendCommand(pMCI_Device, AT91C_READ_SINGLE_BLOCK_CMD, src) != AT91C_CMD_SEND_OK )
-    	return AT91C_READ_ERROR;
-
-	pMCI_Device->pMCI_DeviceDesc->state = AT91C_MCI_RX_SINGLE_BLOCK;
-
-	// Enable AT91C_MCI_RXBUFF Interrupt
-    AT91C_BASE_MCI->MCI_IER = AT91C_MCI_RXBUFF;
-
-	// (PDC) Receiver Transfer Enable
-	AT91C_BASE_PDC_MCI->PDC_PTCR = AT91C_PDC_RXTEN;
-	
-	return AT91C_READ_OK;
-}
-
-
-#ifdef ENABLE_WRITE
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_MCI_WriteBlock
-//* \brief  Write an ENTIRE block but not always PARTIAL block !!!
-//*----------------------------------------------------------------------------
-int AT91F_MCI_WriteBlock(
-	AT91PS_MciDevice pMCI_Device,
-	int dest,
-	unsigned int *dataBuffer,
-	int sizeToWrite )
-{
-    ////////////////////////////////////////////////////////////////////////////////////////////
-	if( pMCI_Device->pMCI_DeviceDesc->state != AT91C_MCI_IDLE)
-    	return AT91C_WRITE_ERROR;
-    
-    if( (AT91F_MCI_GetStatus(pMCI_Device,pMCI_Device->pMCI_DeviceFeatures->Relative_Card_Address) & AT91C_SR_READY_FOR_DATA) != AT91C_SR_READY_FOR_DATA)
-    	return AT91C_WRITE_ERROR;
-    	
-    if ( (dest + sizeToWrite) > pMCI_Device->pMCI_DeviceFeatures->Memory_Capacity )
-		return AT91C_WRITE_ERROR;
-
-    // If source does not fit a begin of a block
-	if ( (dest % pMCI_Device->pMCI_DeviceFeatures->Max_Read_DataBlock_Length) != 0 )
-		return AT91C_WRITE_ERROR;
-   
-    // Test if the MMC supports Partial Write Block 
-    if( (sizeToWrite < pMCI_Device->pMCI_DeviceFeatures->Max_Write_DataBlock_Length) 
-    	&& (pMCI_Device->pMCI_DeviceFeatures->Write_Partial == 0x00) )
-   		return AT91C_WRITE_ERROR;
-   		
-   	if( sizeToWrite > pMCI_Device->pMCI_DeviceFeatures->Max_Write_DataBlock_Length )
-   		return AT91C_WRITE_ERROR;
-    ////////////////////////////////////////////////////////////////////////////////////////////
-  
-    // Init Mode Register
-	AT91C_BASE_MCI->MCI_MR |= ((pMCI_Device->pMCI_DeviceFeatures->Max_Write_DataBlock_Length << 16) | AT91C_MCI_PDCMODE);
-	
-	if (sizeToWrite %4)
-		sizeToWrite = (sizeToWrite /4)+1;
-	else
-		sizeToWrite = sizeToWrite/4;
-
-	// Init PDC for write sequence
-    AT91C_BASE_PDC_MCI->PDC_PTCR = (AT91C_PDC_TXTDIS | AT91C_PDC_RXTDIS);
-    AT91C_BASE_PDC_MCI->PDC_TPR = (unsigned int) dataBuffer;
-    AT91C_BASE_PDC_MCI->PDC_TCR = sizeToWrite;
-
-	// Send the write single block command
-    if ( AT91F_MCI_SendCommand(pMCI_Device, AT91C_WRITE_BLOCK_CMD, dest) != AT91C_CMD_SEND_OK)
-    	return AT91C_WRITE_ERROR;
-
-	pMCI_Device->pMCI_DeviceDesc->state = AT91C_MCI_TX_SINGLE_BLOCK;
-
-	// Enable AT91C_MCI_TXBUFE Interrupt
-    AT91C_BASE_MCI->MCI_IER = AT91C_MCI_TXBUFE;
-  
-  	// Enables TX for PDC transfert requests
-    AT91C_BASE_PDC_MCI->PDC_PTCR = AT91C_PDC_TXTEN;
-  
-	return AT91C_WRITE_OK;
-}
-#endif
-
-#ifdef MMC
-//*------------------------------------------------------------------------------------------------------------
-//* \fn    AT91F_MCI_MMC_SelectCard
-//* \brief Toggles a card between the Stand_by and Transfer states or between Programming and Disconnect states
-//*------------------------------------------------------------------------------------------------------------
-int AT91F_MCI_MMC_SelectCard(AT91PS_MciDevice pMCI_Device, unsigned int relative_card_address)
-{
-    int status;
-	
-	//* Check if the MMC card chosen is already the selected one
-	status = AT91F_MCI_GetStatus(pMCI_Device,relative_card_address);
-
-	if (status < 0)
-		return AT91C_CARD_SELECTED_ERROR;
-
-	if ((status & AT91C_SR_CARD_SELECTED) == AT91C_SR_CARD_SELECTED)
-		return AT91C_CARD_SELECTED_OK;
-
-	//* Search for the MMC Card to be selected, status = the Corresponding Device Number
-	status = 0;
-	while( (pMCI_Device->pMCI_DeviceFeatures[status].Relative_Card_Address != relative_card_address)
-		   && (status < AT91C_MAX_MCI_CARDS) )
-		status++;
-
-	if (status > AT91C_MAX_MCI_CARDS)
-    	return AT91C_CARD_SELECTED_ERROR;
-
-    if (AT91F_MCI_SendCommand( pMCI_Device,
-    								   AT91C_SEL_DESEL_CARD_CMD,
-    								   pMCI_Device->pMCI_DeviceFeatures[status].Relative_Card_Address << 16) == AT91C_CMD_SEND_OK)
-    	return AT91C_CARD_SELECTED_OK;
-    return AT91C_CARD_SELECTED_ERROR;
-}
-#endif
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_MCI_GetCSD
-//* \brief Asks to the specified card to send its CSD
-//*----------------------------------------------------------------------------
-int AT91F_MCI_GetCSD (AT91PS_MciDevice pMCI_Device, unsigned int relative_card_address , unsigned int * response)
-{
- 	
- 	if(AT91F_MCI_SendCommand(pMCI_Device,
-								  AT91C_SEND_CSD_CMD,
-								  (relative_card_address << 16)) != AT91C_CMD_SEND_OK)
-		return AT91C_CMD_SEND_ERROR;
-	
-    response[0] = AT91C_BASE_MCI->MCI_RSPR[0];
-   	response[1] = AT91C_BASE_MCI->MCI_RSPR[1];
-    response[2] = AT91C_BASE_MCI->MCI_RSPR[2];
-    response[3] = AT91C_BASE_MCI->MCI_RSPR[3];
-    
-    return AT91C_CMD_SEND_OK;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_MCI_SetBlocklength
-//* \brief Select a block length for all following block commands (R/W)
-//*----------------------------------------------------------------------------
-int AT91F_MCI_SetBlocklength(AT91PS_MciDevice pMCI_Device,unsigned int length)
-{
-    return( AT91F_MCI_SendCommand(pMCI_Device, AT91C_SET_BLOCKLEN_CMD, length) );
-}
-
-#ifdef MMC
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_MCI_MMC_GetAllOCR
-//* \brief Asks to all cards to send their operations conditions
-//*----------------------------------------------------------------------------
-int AT91F_MCI_MMC_GetAllOCR (AT91PS_MciDevice pMCI_Device)
-{
-	unsigned int	response =0x0;
- 	
- 	while(1)
-    {
-    	response = AT91F_MCI_SendCommand(pMCI_Device,
-  										AT91C_MMC_SEND_OP_COND_CMD,
-  										AT91C_MMC_HOST_VOLTAGE_RANGE);
-		if (response != AT91C_CMD_SEND_OK)
-			return AT91C_INIT_ERROR;
-		
-		response = AT91C_BASE_MCI->MCI_RSPR[0];
-		
-		if ( (response & AT91C_CARD_POWER_UP_BUSY) == AT91C_CARD_POWER_UP_BUSY)
-			return(response);	
-	}
-}
-#endif
-
-#ifdef MMC
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_MCI_MMC_GetAllCID
-//* \brief Asks to the MMC on the chosen slot to send its CID
-//*----------------------------------------------------------------------------
-int AT91F_MCI_MMC_GetAllCID (AT91PS_MciDevice pMCI_Device, unsigned int *response)
-{
-	int Nb_Cards_Found=-1;
-  
-	while(1)
-	{
-	 	if(AT91F_MCI_SendCommand(pMCI_Device,
-								AT91C_MMC_ALL_SEND_CID_CMD,
-								AT91C_NO_ARGUMENT) != AT91C_CMD_SEND_OK)
-			return Nb_Cards_Found;
-		else
-		{		
-			Nb_Cards_Found = 0;
-			//* Assignation of the relative address to the MMC CARD
-			pMCI_Device->pMCI_DeviceFeatures[Nb_Cards_Found].Relative_Card_Address = Nb_Cards_Found + AT91C_FIRST_RCA;
-			//* Set the insert flag
-			pMCI_Device->pMCI_DeviceFeatures[Nb_Cards_Found].Card_Inserted = AT91C_MMC_CARD_INSERTED;
-	
-			if (AT91F_MCI_SendCommand(pMCI_Device,
-									 AT91C_MMC_SET_RELATIVE_ADDR_CMD,
-									 (Nb_Cards_Found + AT91C_FIRST_RCA) << 16) != AT91C_CMD_SEND_OK)
-				return AT91C_CMD_SEND_ERROR;
-				 
-			//* If no error during assignation address ==> Increment Nb_cards_Found
-			Nb_Cards_Found++ ;
-		}
-	}
-}
-#endif
-#ifdef MMC
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_MCI_MMC_Init
-//* \brief Return the MMC initialisation status
-//*----------------------------------------------------------------------------
-int AT91F_MCI_MMC_Init (AT91PS_MciDevice pMCI_Device)
-{
-    unsigned int	tab_response[4];
-	unsigned int	mult,blocknr;
-	unsigned int 	i,Nb_Cards_Found=0;
-
-	//* Resets all MMC Cards in Idle state
-	AT91F_MCI_SendCommand(pMCI_Device, AT91C_MMC_GO_IDLE_STATE_CMD, AT91C_NO_ARGUMENT);
-
-    if(AT91F_MCI_MMC_GetAllOCR(pMCI_Device) == AT91C_INIT_ERROR)
-    	return AT91C_INIT_ERROR;
-
-	Nb_Cards_Found = AT91F_MCI_MMC_GetAllCID(pMCI_Device,tab_response);
-	if (Nb_Cards_Found != AT91C_CMD_SEND_ERROR)
-	{
-	    //* Set the Mode Register
-    	AT91C_BASE_MCI->MCI_MR = AT91C_MCI_MR_PDCMODE;
-
-		for(i = 0; i < Nb_Cards_Found; i++)
-		{
-			if (AT91F_MCI_GetCSD(pMCI_Device,
-									  pMCI_Device->pMCI_DeviceFeatures[i].Relative_Card_Address,
-									  tab_response) != AT91C_CMD_SEND_OK)
-				pMCI_Device->pMCI_DeviceFeatures[i].Relative_Card_Address = 0;					  
-			else
-			{
-				pMCI_Device->pMCI_DeviceFeatures[i].Max_Read_DataBlock_Length = 1 << ((tab_response[1] >> AT91C_CSD_RD_B_LEN_S) & AT91C_CSD_RD_B_LEN_M );
-	 			pMCI_Device->pMCI_DeviceFeatures[i].Max_Write_DataBlock_Length =	1 << ((tab_response[3] >> AT91C_CSD_WBLEN_S) & AT91C_CSD_WBLEN_M );
-				pMCI_Device->pMCI_DeviceFeatures[i].Sector_Size = 1 + ((tab_response[2] >> AT91C_CSD_v22_SECT_SIZE_S) & AT91C_CSD_v22_SECT_SIZE_M );
-		  		pMCI_Device->pMCI_DeviceFeatures[i].Read_Partial = (tab_response[1] >> AT91C_CSD_RD_B_PAR_S) & AT91C_CSD_RD_B_PAR_M;
-				pMCI_Device->pMCI_DeviceFeatures[i].Write_Partial = (tab_response[3] >> AT91C_CSD_WBLOCK_P_S) & AT91C_CSD_WBLOCK_P_M;
-				
-				// None in MMC specification version 2.2
-				pMCI_Device->pMCI_DeviceFeatures[i].Erase_Block_Enable = 0;
-				
-				pMCI_Device->pMCI_DeviceFeatures[i].Read_Block_Misalignment = (tab_response[1] >> AT91C_CSD_RD_B_MIS_S) & AT91C_CSD_RD_B_MIS_M;
-				pMCI_Device->pMCI_DeviceFeatures[i].Write_Block_Misalignment = (tab_response[1] >> AT91C_CSD_WR_B_MIS_S) & AT91C_CSD_WR_B_MIS_M;
-
-				//// Compute Memory Capacity
-				// compute MULT
-				mult = 1 << ( ((tab_response[2] >> AT91C_CSD_C_SIZE_M_S) & AT91C_CSD_C_SIZE_M_M) + 2 );
-				// compute MSB of C_SIZE
-				blocknr = ((tab_response[1] >> AT91C_CSD_CSIZE_H_S) & AT91C_CSD_CSIZE_H_M) << 2;
-				// compute MULT * (LSB of C-SIZE + MSB already computed + 1) = BLOCKNR
-				blocknr = mult * ( ( blocknr + ( (tab_response[2] >> AT91C_CSD_CSIZE_L_S) & AT91C_CSD_CSIZE_L_M) ) + 1 );
-
-				pMCI_Device->pMCI_DeviceFeatures[i].Memory_Capacity =  pMCI_Device->pMCI_DeviceFeatures[i].Max_Read_DataBlock_Length * blocknr;
-		  		//// End of Compute Memory Capacity
-		  		
-			}	// end of else			  
-		}	// end of for
-		
-		return AT91C_INIT_OK;
-	}	// end of if
-
-    return AT91C_INIT_ERROR;
-}
-#endif
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_MCI_SDCard_GetOCR
-//* \brief Asks to all cards to send their operations conditions
-//*----------------------------------------------------------------------------
-int AT91F_MCI_SDCard_GetOCR (AT91PS_MciDevice pMCI_Device)
-{
-	unsigned int	response =0x0;
-
-	// The RCA to be used for CMD55 in Idle state shall be the card's default RCA=0x0000.
-	pMCI_Device->pMCI_DeviceFeatures->Relative_Card_Address = 0x0;
- 	
- 	while( (response & AT91C_CARD_POWER_UP_BUSY) != AT91C_CARD_POWER_UP_BUSY )
-    {
-    	response = AT91F_MCI_SDCard_SendAppCommand(pMCI_Device,
-  										AT91C_SDCARD_APP_OP_COND_CMD,
-  										AT91C_MMC_HOST_VOLTAGE_RANGE);
-		if (response != AT91C_CMD_SEND_OK)
-			return AT91C_INIT_ERROR;
-		
-		response = AT91C_BASE_MCI->MCI_RSPR[0];
-	}
-	
-	return(AT91C_BASE_MCI->MCI_RSPR[0]);
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_MCI_SDCard_GetCID
-//* \brief Asks to the SDCard on the chosen slot to send its CID
-//*----------------------------------------------------------------------------
-int AT91F_MCI_SDCard_GetCID (AT91PS_MciDevice pMCI_Device, unsigned int *response)
-{
- 	if(AT91F_MCI_SendCommand(pMCI_Device,
-							AT91C_ALL_SEND_CID_CMD,
-							AT91C_NO_ARGUMENT) != AT91C_CMD_SEND_OK)
-		return AT91C_CMD_SEND_ERROR;
-	
-    response[0] = AT91C_BASE_MCI->MCI_RSPR[0];
-   	response[1] = AT91C_BASE_MCI->MCI_RSPR[1];
-    response[2] = AT91C_BASE_MCI->MCI_RSPR[2];
-    response[3] = AT91C_BASE_MCI->MCI_RSPR[3];
-    
-    return AT91C_CMD_SEND_OK;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_MCI_SDCard_SetBusWidth
-//* \brief  Set bus width for SDCard
-//*----------------------------------------------------------------------------
-int AT91F_MCI_SDCard_SetBusWidth(AT91PS_MciDevice pMCI_Device)
-{
-	volatile int	ret_value;
-	char			bus_width;
-
-	do
-	{
-		ret_value =AT91F_MCI_GetStatus(pMCI_Device,pMCI_Device->pMCI_DeviceFeatures->Relative_Card_Address);
-	}
-	while((ret_value > 0) && ((ret_value & AT91C_SR_READY_FOR_DATA) == 0));
-
-	// Select Card
-    AT91F_MCI_SendCommand(pMCI_Device,
-    						AT91C_SEL_DESEL_CARD_CMD,
-    						(pMCI_Device->pMCI_DeviceFeatures->Relative_Card_Address)<<16);
-
-	// Set bus width for Sdcard
-	if(pMCI_Device->pMCI_DeviceDesc->SDCard_bus_width == AT91C_MCI_SCDBUS)
-		 	bus_width = AT91C_BUS_WIDTH_4BITS;
-	else	bus_width = AT91C_BUS_WIDTH_1BIT;
-
-	if (AT91F_MCI_SDCard_SendAppCommand(pMCI_Device,AT91C_SDCARD_SET_BUS_WIDTH_CMD,bus_width) != AT91C_CMD_SEND_OK)
-		return AT91C_CMD_SEND_ERROR;
-
-	return AT91C_CMD_SEND_OK;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_MCI_SDCard_Init
-//* \brief Return the SDCard initialisation status
-//*----------------------------------------------------------------------------
-int AT91F_MCI_SDCard_Init (AT91PS_MciDevice pMCI_Device)
-{
-    unsigned int	tab_response[4];
-	unsigned int	mult,blocknr;
-
-	AT91F_MCI_SendCommand(pMCI_Device, AT91C_GO_IDLE_STATE_CMD, AT91C_NO_ARGUMENT);
-
-    if(AT91F_MCI_SDCard_GetOCR(pMCI_Device) == AT91C_INIT_ERROR)
-    	return AT91C_INIT_ERROR;
-
-	if (AT91F_MCI_SDCard_GetCID(pMCI_Device,tab_response) == AT91C_CMD_SEND_OK)
-	{
-	    pMCI_Device->pMCI_DeviceFeatures->Card_Inserted = AT91C_SD_CARD_INSERTED;
-
-	    if (AT91F_MCI_SendCommand(pMCI_Device, AT91C_SET_RELATIVE_ADDR_CMD, 0) == AT91C_CMD_SEND_OK)
-		{
-			pMCI_Device->pMCI_DeviceFeatures->Relative_Card_Address = (AT91C_BASE_MCI->MCI_RSPR[0] >> 16);
-			if (AT91F_MCI_GetCSD(pMCI_Device,pMCI_Device->pMCI_DeviceFeatures->Relative_Card_Address,tab_response) == AT91C_CMD_SEND_OK)
-			{
-		  		pMCI_Device->pMCI_DeviceFeatures->Max_Read_DataBlock_Length = 1 << ((tab_response[1] >> AT91C_CSD_RD_B_LEN_S) & AT91C_CSD_RD_B_LEN_M );
-	 			pMCI_Device->pMCI_DeviceFeatures->Max_Write_DataBlock_Length =	1 << ((tab_response[3] >> AT91C_CSD_WBLEN_S) & AT91C_CSD_WBLEN_M );
-				pMCI_Device->pMCI_DeviceFeatures->Sector_Size = 1 + ((tab_response[2] >> AT91C_CSD_v21_SECT_SIZE_S) & AT91C_CSD_v21_SECT_SIZE_M );
-		  		pMCI_Device->pMCI_DeviceFeatures->Read_Partial = (tab_response[1] >> AT91C_CSD_RD_B_PAR_S) & AT91C_CSD_RD_B_PAR_M;
-				pMCI_Device->pMCI_DeviceFeatures->Write_Partial = (tab_response[3] >> AT91C_CSD_WBLOCK_P_S) & AT91C_CSD_WBLOCK_P_M;
-				pMCI_Device->pMCI_DeviceFeatures->Erase_Block_Enable = (tab_response[3] >> AT91C_CSD_v21_ER_BLEN_EN_S) & AT91C_CSD_v21_ER_BLEN_EN_M;
-				pMCI_Device->pMCI_DeviceFeatures->Read_Block_Misalignment = (tab_response[1] >> AT91C_CSD_RD_B_MIS_S) & AT91C_CSD_RD_B_MIS_M;
-				pMCI_Device->pMCI_DeviceFeatures->Write_Block_Misalignment = (tab_response[1] >> AT91C_CSD_WR_B_MIS_S) & AT91C_CSD_WR_B_MIS_M;
-
-				//// Compute Memory Capacity
-					// compute MULT
-					mult = 1 << ( ((tab_response[2] >> AT91C_CSD_C_SIZE_M_S) & AT91C_CSD_C_SIZE_M_M) + 2 );
-					// compute MSB of C_SIZE
-					blocknr = ((tab_response[1] >> AT91C_CSD_CSIZE_H_S) & AT91C_CSD_CSIZE_H_M) << 2;
-					// compute MULT * (LSB of C-SIZE + MSB already computed + 1) = BLOCKNR
-					blocknr = mult * ( ( blocknr + ( (tab_response[2] >> AT91C_CSD_CSIZE_L_S) & AT91C_CSD_CSIZE_L_M) ) + 1 );
-
-					pMCI_Device->pMCI_DeviceFeatures->Memory_Capacity =  pMCI_Device->pMCI_DeviceFeatures->Max_Read_DataBlock_Length * blocknr;
-			  	//// End of Compute Memory Capacity
-					printf("SD-Card: %d Bytes\n\r", pMCI_Device->pMCI_DeviceFeatures->Memory_Capacity);
-
-		  		if( AT91F_MCI_SDCard_SetBusWidth(pMCI_Device) == AT91C_CMD_SEND_OK )
-				{	
-					 if (AT91F_MCI_SetBlocklength(pMCI_Device,pMCI_Device->pMCI_DeviceFeatures->Max_Read_DataBlock_Length) == AT91C_CMD_SEND_OK)
-					return AT91C_INIT_OK;
-				}
-			}
-		}
-	}
-    return AT91C_INIT_ERROR;
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_CfgDevice
-//* \brief This function is used to initialise MMC or SDCard Features
-//*----------------------------------------------------------------------------
-void AT91F_CfgDevice(void)
-{
-	// Init Device Structure
-
-	MCI_Device_Features.Relative_Card_Address 		= 0;
-	MCI_Device_Features.Card_Inserted 				= AT91C_CARD_REMOVED;
-	MCI_Device_Features.Max_Read_DataBlock_Length	= 0;
-	MCI_Device_Features.Max_Write_DataBlock_Length 	= 0;
-	MCI_Device_Features.Read_Partial 				= 0;
-	MCI_Device_Features.Write_Partial 				= 0;
-	MCI_Device_Features.Erase_Block_Enable 			= 0;
-	MCI_Device_Features.Sector_Size 				= 0;
-	MCI_Device_Features.Memory_Capacity 			= 0;
-	
-	MCI_Device_Desc.state							= AT91C_MCI_IDLE;
-	MCI_Device_Desc.SDCard_bus_width				= AT91C_MCI_SCDBUS;
-	
-	// Init AT91S_DataFlash Global Structure, by default AT45DB choosen !!!
-	MCI_Device.pMCI_DeviceDesc 		= &MCI_Device_Desc;
-	MCI_Device.pMCI_DeviceFeatures 	= &MCI_Device_Features;
-
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_MCI_Init
-//* \brief Initialsise Card
-//*----------------------------------------------------------------------------
-int AT91F_MCI_Init(void)
-{
-
-///////////////////////////////////////////////////////////////////////////////////////////
-//  MCI Init : common to MMC and SDCard
-///////////////////////////////////////////////////////////////////////////////////////////
-
-    // Set up PIO SDC_TYPE to switch on MMC/SDCard and not DataFlash Card
-	AT91F_PIO_CfgOutput(AT91C_BASE_PIOB,AT91C_PIO_PB7);
-	AT91F_PIO_SetOutput(AT91C_BASE_PIOB,AT91C_PIO_PB7);
-	
-	// Init MCI for MMC and SDCard interface
-	AT91F_MCI_CfgPIO();	
-	AT91F_MCI_CfgPMC();
-	AT91F_PDC_Open(AT91C_BASE_PDC_MCI);
-
-    // Disable all the interrupts
-    AT91C_BASE_MCI->MCI_IDR = 0xFFFFFFFF;
-
-	// Init MCI Device Structures
-	AT91F_CfgDevice();
-
-	// Configure MCI interrupt 
-	AT91F_AIC_ConfigureIt(AT91C_BASE_AIC,
-						 AT91C_ID_MCI,
-						 AT91C_AIC_PRIOR_HIGHEST,
-						 AT91C_AIC_SRCTYPE_INT_LEVEL_SENSITIVE,
-						 AT91F_ASM_MCI_Handler);
-
-	// Enable MCI interrupt
-	AT91F_AIC_EnableIt(AT91C_BASE_AIC,AT91C_ID_MCI);
-
-	// Enable Receiver
-	AT91F_US_EnableRx((AT91PS_USART) AT91C_BASE_DBGU);
-
-	AT91F_MCI_Configure(AT91C_BASE_MCI,
-						AT91C_MCI_DTOR_1MEGA_CYCLES,
-						AT91C_MCI_MR_PDCMODE,			// 15MHz for MCK = 60MHz (CLKDIV = 1)
-						AT91C_MCI_SDCARD_4BITS_SLOTA);
-	
-	if(AT91F_MCI_SDCard_Init(&MCI_Device) != AT91C_INIT_OK)
-		return FALSE;
-	else
-		return TRUE;
-
-}
-
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_MCIDeviceWaitReady
-//* \brief Wait for MCI Device ready
-//*----------------------------------------------------------------------------
-void AT91F_MCIDeviceWaitReady(unsigned int timeout)
-{
-	volatile int status;
-	
-	do
-	{
-		status = AT91C_BASE_MCI->MCI_SR;
-		timeout--;
-	}
-	while( !(status & AT91C_MCI_NOTBUSY)  && (timeout>0) );	
-}
-
-unsigned int swab32(unsigned int data)
-{
-	unsigned int res = 0;
-
-	res = (data & 0x000000ff) << 24 |
-				(data & 0x0000ff00) << 8  |
-				(data & 0x00ff0000) >> 8  |
-				(data & 0xff000000) >> 24;
-
-	return res;
-}
-
-//*--------------------------------------------------------------------
-//* \fn    AT91F_MCI_ReadBlockSwab
-//* \brief Read Block and swap byte order
-//*--------------------------------------------------------------------
-int AT91F_MCI_ReadBlockSwab(
-	AT91PS_MciDevice pMCI_Device,
-	int src,
-	unsigned int *databuffer,
-	int sizeToRead)
-{
-	int i;
-	unsigned char *buf = (unsigned char *)databuffer;
-
-	//* Read Block 1
-	for(i=0;i<BUFFER_SIZE_MCI_DEVICE;i++)
-		*buf++ = 0x00;	
-	AT91F_MCI_ReadBlock(&MCI_Device,src,databuffer,sizeToRead);
-
-	//* Wait end of Read
-	AT91F_MCIDeviceWaitReady(AT91C_MCI_TIMEOUT);
-
-	{
-		int index;
-		unsigned int *uiBuffer = databuffer;
-
-		for(index = 0; index < 512/4; index++)
-			uiBuffer[index] = swab32(uiBuffer[index]);
-	}
-	return(1);
-}
-
diff --git a/target/linux/at91/image/dfboot/src/stdio.h b/target/linux/at91/image/dfboot/src/stdio.h
deleted file mode 100644
index e4e35ecf4..000000000
--- a/target/linux/at91/image/dfboot/src/stdio.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-
-#ifndef NULL
-#define NULL ((void *)0)
-#endif
-
-void at91_init_uarts(void);
-int puts(const char *str);
-int putc(int c);
-int putchar(int c);
-int getc();
-
-int strlen(const char *str);
-
-int hvfprintf(const char *fmt, va_list ap);
-
-int printf(const char *fmt, ...);
diff --git a/target/linux/at91/image/u-boot/Makefile b/target/linux/at91/image/u-boot/Makefile
deleted file mode 100644
index f53df11a9..000000000
--- a/target/linux/at91/image/u-boot/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=u-boot
-PKG_VERSION:=1.1.4
-PKG_RELEASE:=1
-
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=ftp://ftp.denx.de/pub/u-boot
-PKG_MD5SUM:=
-PKG_CAT:=bzcat
-
-include $(INCLUDE_DIR)/package.mk
-
-UBOOT_CONFIG=$(strip $(subst ",, $(CONFIG_UBOOT_TARGET)))
-LAN_IP=$(strip $(CONFIG_UBOOT_IPADDR))
-LAN_SERVERIP=$(strip $(subst ",, $(CONFIG_UBOOT_SERVERIP)))
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) $(UBOOT_CONFIG)_config
-	export CROSS_COMPILE=$(TARGET_CROSS); \
-	export LAN_IP=$(LAN_IP); \
-	export LAN_SERVERIP=$(LAN_SERVERIP); \
-	$(MAKE) -C $(PKG_BUILD_DIR)
-	mkdir -p $(PKG_BUILD_DIR)/ubclient
-	$(CP) ./ubclient/* $(PKG_BUILD_DIR)/ubclient
-	export LAN_IP=$(LAN_IP); \
-	export LAN_SERVERIP=$(LAN_SERVERIP); \
-	$(MAKE) -C $(PKG_BUILD_DIR)/ubclient \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS) -Dtarget_$(BOARD)=1"
-endef
-
-define Build/InstallDev
-	dd if=$(PKG_BUILD_DIR)/u-boot.bin of=$(PKG_BUILD_DIR)/u-boot.block bs=232k count=1 conv=sync
-#	$(INSTALL_DIR) $(STAGING_DIR)/ubclient/sbin
-#	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ubclient/ubpar $(STAGING_DIR)/ubclient/sbin/
-	$(CP) $(PKG_BUILD_DIR)/ubclient/ubpar ../../base-files/sbin
-endef
-
-$(eval $(call Build/DefaultTargets))
diff --git a/target/linux/at91/image/u-boot/patches/001-lowlevel-config.patch b/target/linux/at91/image/u-boot/patches/001-lowlevel-config.patch
deleted file mode 100644
index 25f92e496..000000000
--- a/target/linux/at91/image/u-boot/patches/001-lowlevel-config.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- u-boot-1.1.4/cpu/arm920t/config.mk	2005-12-16 17:39:27.000000000 +0100
-+++ u-boot-1.1.4.klaus/cpu/arm920t/config.mk	2006-02-27 19:07:41.000000000 +0100
-@@ -30,5 +30,5 @@
- # Supply options according to compiler version
- #
- # =========================================================================
--PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32,-mabi=apcs-gnu)
-+PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32)
- PLATFORM_RELFLAGS +=$(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,))
---- u-boot-1.1.4/cpu/arm920t/start.S	2005-12-16 17:39:27.000000000 +0100
-+++ u-boot-1.1.4.klaus/cpu/arm920t/start.S	2006-02-22 16:45:24.000000000 +0100
-@@ -237,6 +237,7 @@
-  */
- 
- 
-+#ifndef CONFIG_SKIP_LOWLEVEL_INIT
- cpu_init_crit:
- 	/*
- 	 * flush v4 I/D caches
-@@ -265,6 +266,7 @@
- 	mov	lr, ip
- 	mov	pc, lr
- 
-+#endif
- 
- /*
-  *************************************************************************
---- u-boot-1.1.4/examples/Makefile	2005-12-16 17:39:27.000000000 +0100
-+++ u-boot-1.1.4.klaus/examples/Makefile	2006-03-02 02:37:14.000000000 +0100
-@@ -30,7 +30,7 @@
- endif
- 
- ifeq ($(ARCH),arm)
--LOAD_ADDR = 0xc100000
-+LOAD_ADDR = 0x21000000
- endif
- 
- ifeq ($(ARCH),mips)
---- u-boot-1.1.4/include/config.h	1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-1.1.4.klaus/include/config.h	2006-02-27 19:04:46.000000000 +0100
-@@ -0,0 +1,2 @@
-+/* Automatically generated - do not edit */
-+#include <configs/at91rm9200dk.h>
---- u-boot-1.1.4/include/config.mk	1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-1.1.4.klaus/include/config.mk	2006-02-27 19:04:46.000000000 +0100
-@@ -0,0 +1,4 @@
-+ARCH   = arm
-+CPU    = arm920t
-+BOARD  = at91rm9200dk
-+SOC    = at91rm9200
---- u-boot-1.1.4/include/configs/at91rm9200dk.h	2005-12-16 17:39:27.000000000 +0100
-+++ u-boot-1.1.4.klaus/include/configs/at91rm9200dk.h	2006-02-26 22:44:17.000000000 +0100
-@@ -25,6 +25,11 @@
- #ifndef __CONFIG_H
- #define __CONFIG_H
- 
-+// Added 2 defines to skip re-init lowlevel and relocate HCG HLH
-+//
-+#define CONFIG_SKIP_LOWLEVEL_INIT
-+#define CONFIG_SKIP_RELOCATE_UBOOT
-+
- /* ARM asynchronous clock */
- #define AT91C_MAIN_CLOCK	179712000	/* from 18.432 MHz crystal (18432000 / 4 * 39) */
- #define AT91C_MASTER_CLOCK	59904000	/* peripheral clock (AT91C_MASTER_CLOCK / 3) */
-@@ -165,12 +170,12 @@
- #define CFG_FLASH_ERASE_TOUT		(2*CFG_HZ) /* Timeout for Flash Erase */
- #define CFG_FLASH_WRITE_TOUT		(2*CFG_HZ) /* Timeout for Flash Write */
- 
--#undef	CFG_ENV_IS_IN_DATAFLASH
-+#define	CFG_ENV_IS_IN_DATAFLASH
- 
- #ifdef CFG_ENV_IS_IN_DATAFLASH
--#define CFG_ENV_OFFSET			0x20000
-+#define CFG_ENV_OFFSET			0x21000
- #define CFG_ENV_ADDR			(CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
--#define CFG_ENV_SIZE			0x2000  /* 0x8000 */
-+#define CFG_ENV_SIZE			0x8400  /* 0x8000 */
- #else
- #define CFG_ENV_IS_IN_FLASH		1
- #ifdef CONFIG_SKIP_LOWLEVEL_INIT
---- u-boot-1.1.4/Makefile	2005-12-16 17:39:27.000000000 +0100
-+++ u-boot-1.1.4.klaus/Makefile	2006-03-02 02:49:23.000000000 +0100
-@@ -57,7 +57,7 @@
- CROSS_COMPILE = powerpc-linux-
- endif
- ifeq ($(ARCH),arm)
--CROSS_COMPILE = arm-linux-
-+CROSS_COMPILE = ../staging_dir/bin/arm-linux-
- endif
- ifeq ($(ARCH),i386)
- ifeq ($(HOSTARCH),i387)
diff --git a/target/linux/at91/image/u-boot/patches/002-dataflash_machine.patch b/target/linux/at91/image/u-boot/patches/002-dataflash_machine.patch
deleted file mode 100644
index cf7648c52..000000000
--- a/target/linux/at91/image/u-boot/patches/002-dataflash_machine.patch
+++ /dev/null
@@ -1,6065 +0,0 @@
-diff -Naur u-boot-1.1.4.org/board/vlink/at45.c u-boot-1.1.4.tmp/board/vlink/at45.c
---- u-boot-1.1.4.org/board/vlink/at45.c	1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-1.1.4.tmp/board/vlink/at45.c	2005-12-16 17:39:27.000000000 +0100
-@@ -0,0 +1,621 @@
-+/* Driver for ATMEL DataFlash support
-+ * Author : Hamid Ikdoumi (Atmel)
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ *
-+ */
-+
-+#include <config.h>
-+#include <common.h>
-+#include <asm/hardware.h>
-+
-+#ifdef CONFIG_HAS_DATAFLASH
-+#include <dataflash.h>
-+
-+#define AT91C_SPI_CLK	10000000	/* Max Value = 10MHz to be compliant to
-+the Continuous Array Read function */
-+
-+/* AC Characteristics */
-+/* DLYBS = tCSS = 250ns min and DLYBCT = tCSH = 250ns */
-+#define DATAFLASH_TCSS	(0xC << 16)
-+#define DATAFLASH_TCHS	(0x1 << 24)
-+
-+#define AT91C_TIMEOUT_WRDY			200000
-+#define AT91C_SPI_PCS0_SERIAL_DATAFLASH		0xE     /* Chip Select 0 : NPCS0 %1110 */
-+#define AT91C_SPI_PCS3_DATAFLASH_CARD		0x7     /* Chip Select 3 : NPCS3 %0111 */
-+
-+void AT91F_SpiInit(void) {
-+
-+/*-------------------------------------------------------------------*/
-+/*	SPI DataFlash Init								*/
-+/*-------------------------------------------------------------------*/
-+	/* Configure PIOs */
-+	AT91C_BASE_PIOA->PIO_ASR = AT91C_PA3_NPCS0 | AT91C_PA4_NPCS1 | AT91C_PA1_MOSI | AT91C_PA5_NPCS2 |
-+				   AT91C_PA6_NPCS3 | AT91C_PA0_MISO | AT91C_PA2_SPCK;
-+	AT91C_BASE_PIOA->PIO_PDR = AT91C_PA3_NPCS0 | AT91C_PA4_NPCS1 | AT91C_PA1_MOSI | AT91C_PA5_NPCS2 |
-+				   AT91C_PA6_NPCS3 | AT91C_PA0_MISO | AT91C_PA2_SPCK;
-+	/* Enable CLock */
-+	AT91C_BASE_PMC->PMC_PCER = 1 << AT91C_ID_SPI;
-+
-+	/* Reset the SPI */
-+	AT91C_BASE_SPI->SPI_CR = AT91C_SPI_SWRST;
-+
-+	/* Configure SPI in Master Mode with No CS selected !!! */
-+	AT91C_BASE_SPI->SPI_MR = AT91C_SPI_MSTR | AT91C_SPI_MODFDIS | AT91C_SPI_PCS;
-+
-+	/* Configure CS0 and CS3 */
-+	*(AT91C_SPI_CSR + 0) = AT91C_SPI_CPOL | (AT91C_SPI_DLYBS & DATAFLASH_TCSS) | (AT91C_SPI_DLYBCT &
-+	DATAFLASH_TCHS) | ((AT91C_MASTER_CLOCK / (2*AT91C_SPI_CLK)) << 8);
-+
-+	*(AT91C_SPI_CSR + 3) = AT91C_SPI_CPOL | (AT91C_SPI_DLYBS & DATAFLASH_TCSS) | (AT91C_SPI_DLYBCT &
-+	DATAFLASH_TCHS) | ((AT91C_MASTER_CLOCK / (2*AT91C_SPI_CLK)) << 8);
-+
-+}
-+
-+void AT91F_SpiEnable(int cs) {
-+	switch(cs) {
-+	case 0:	/* Configure SPI CS0 for Serial DataFlash AT45DBxx */
-+		AT91C_BASE_SPI->SPI_MR &= 0xFFF0FFFF;
-+		AT91C_BASE_SPI->SPI_MR |= ((AT91C_SPI_PCS0_SERIAL_DATAFLASH<<16) & AT91C_SPI_PCS);
-+		break;
-+	case 3:	/* Configure SPI CS3 for Serial DataFlash Card */
-+		/* Set up PIO SDC_TYPE to switch on DataFlash Card and not MMC/SDCard */
-+		AT91C_BASE_PIOB->PIO_PER = AT91C_PIO_PB7;	/* Set in PIO mode */
-+		AT91C_BASE_PIOB->PIO_OER = AT91C_PIO_PB7;	/* Configure in output */
-+		/* Clear Output */
-+		AT91C_BASE_PIOB->PIO_CODR = AT91C_PIO_PB7;
-+		/* Configure PCS */
-+		AT91C_BASE_SPI->SPI_MR &= 0xFFF0FFFF;
-+		AT91C_BASE_SPI->SPI_MR |= ((AT91C_SPI_PCS3_DATAFLASH_CARD<<16) & AT91C_SPI_PCS);
-+		break;
-+	}
-+
-+	/* SPI_Enable */
-+	AT91C_BASE_SPI->SPI_CR = AT91C_SPI_SPIEN;
-+}
-+
-+/*----------------------------------------------------------------------------*/
-+/* \fn    AT91F_SpiWrite						      */
-+/* \brief Set the PDC registers for a transfert				      */
-+/*----------------------------------------------------------------------------*/
-+unsigned int AT91F_SpiWrite ( AT91PS_DataflashDesc pDesc )
-+{
-+	unsigned int timeout;
-+
-+	pDesc->state = BUSY;
-+
-+	AT91C_BASE_SPI->SPI_PTCR = AT91C_PDC_TXTDIS + AT91C_PDC_RXTDIS;
-+
-+	/* Initialize the Transmit and Receive Pointer */
-+	AT91C_BASE_SPI->SPI_RPR = (unsigned int)pDesc->rx_cmd_pt ;
-+	AT91C_BASE_SPI->SPI_TPR = (unsigned int)pDesc->tx_cmd_pt ;
-+
-+	/* Intialize the Transmit and Receive Counters */
-+	AT91C_BASE_SPI->SPI_RCR = pDesc->rx_cmd_size;
-+	AT91C_BASE_SPI->SPI_TCR = pDesc->tx_cmd_size;
-+
-+	if ( pDesc->tx_data_size != 0 ) {
-+		/* Initialize the Next Transmit and Next Receive Pointer */
-+		AT91C_BASE_SPI->SPI_RNPR = (unsigned int)pDesc->rx_data_pt ;
-+		AT91C_BASE_SPI->SPI_TNPR = (unsigned int)pDesc->tx_data_pt ;
-+
-+		/* Intialize the Next Transmit and Next Receive Counters */
-+		AT91C_BASE_SPI->SPI_RNCR = pDesc->rx_data_size ;
-+		AT91C_BASE_SPI->SPI_TNCR = pDesc->tx_data_size ;
-+	}
-+
-+	/* arm simple, non interrupt dependent timer */
-+	reset_timer_masked();
-+	timeout = 0;
-+
-+	AT91C_BASE_SPI->SPI_PTCR = AT91C_PDC_TXTEN + AT91C_PDC_RXTEN;
-+	while(!(AT91C_BASE_SPI->SPI_SR & AT91C_SPI_RXBUFF) && ((timeout = get_timer_masked() ) < CFG_SPI_WRITE_TOUT));
-+	AT91C_BASE_SPI->SPI_PTCR = AT91C_PDC_TXTDIS + AT91C_PDC_RXTDIS;
-+	pDesc->state = IDLE;
-+
-+	if (timeout >= CFG_SPI_WRITE_TOUT){
-+		printf("Error Timeout\n\r");
-+		return DATAFLASH_ERROR;
-+	}
-+
-+	return DATAFLASH_OK;
-+}
-+
-+
-+/*----------------------------------------------------------------------*/
-+/* \fn    AT91F_DataFlashSendCommand					*/
-+/* \brief Generic function to send a command to the dataflash		*/
-+/*----------------------------------------------------------------------*/
-+AT91S_DataFlashStatus AT91F_DataFlashSendCommand(
-+	AT91PS_DataFlash pDataFlash,
-+	unsigned char OpCode,
-+	unsigned int CmdSize,
-+	unsigned int DataflashAddress)
-+{
-+    unsigned int adr;
-+
-+	if ( (pDataFlash->pDataFlashDesc->state) != IDLE)
-+		return DATAFLASH_BUSY;
-+
-+	/* process the address to obtain page address and byte address */
-+	adr = ((DataflashAddress / (pDataFlash->pDevice->pages_size)) << pDataFlash->pDevice->page_offset) + (DataflashAddress % (pDataFlash->pDevice->pages_size));
-+
-+	/* fill the  command  buffer */
-+	pDataFlash->pDataFlashDesc->command[0] = OpCode;
-+	if (pDataFlash->pDevice->pages_number >= 16384) {
-+		pDataFlash->pDataFlashDesc->command[1] = (unsigned char)((adr & 0x0F000000) >> 24);
-+		pDataFlash->pDataFlashDesc->command[2] = (unsigned char)((adr & 0x00FF0000) >> 16);
-+		pDataFlash->pDataFlashDesc->command[3] = (unsigned char)((adr & 0x0000FF00) >> 8);
-+		pDataFlash->pDataFlashDesc->command[4] = (unsigned char)(adr & 0x000000FF);
-+	} else {
-+		pDataFlash->pDataFlashDesc->command[1] = (unsigned char)((adr & 0x00FF0000) >> 16);
-+		pDataFlash->pDataFlashDesc->command[2] = (unsigned char)((adr & 0x0000FF00) >> 8);
-+		pDataFlash->pDataFlashDesc->command[3] = (unsigned char)(adr & 0x000000FF) ;
-+		pDataFlash->pDataFlashDesc->command[4] = 0;
-+	}
-+	pDataFlash->pDataFlashDesc->command[5] = 0;
-+	pDataFlash->pDataFlashDesc->command[6] = 0;
-+	pDataFlash->pDataFlashDesc->command[7] = 0;
-+
-+	/* Initialize the SpiData structure for the spi write fuction */
-+	pDataFlash->pDataFlashDesc->tx_cmd_pt   =  pDataFlash->pDataFlashDesc->command ;
-+	pDataFlash->pDataFlashDesc->tx_cmd_size =  CmdSize ;
-+	pDataFlash->pDataFlashDesc->rx_cmd_pt   =  pDataFlash->pDataFlashDesc->command ;
-+	pDataFlash->pDataFlashDesc->rx_cmd_size =  CmdSize ;
-+
-+	/* send the command and read the data */
-+	return AT91F_SpiWrite (pDataFlash->pDataFlashDesc);
-+}
-+
-+
-+/*----------------------------------------------------------------------*/
-+/* \fn    AT91F_DataFlashGetStatus					*/
-+/* \brief Read the status register of the dataflash			*/
-+/*----------------------------------------------------------------------*/
-+AT91S_DataFlashStatus AT91F_DataFlashGetStatus(AT91PS_DataflashDesc pDesc)
-+{
-+	AT91S_DataFlashStatus status;
-+
-+	/* if a transfert is in progress ==> return 0 */
-+	if( (pDesc->state) != IDLE)
-+		return DATAFLASH_BUSY;
-+
-+	/* first send the read status command (D7H) */
-+	pDesc->command[0] = DB_STATUS;
-+	pDesc->command[1] = 0;
-+
-+	pDesc->DataFlash_state  = GET_STATUS;
-+	pDesc->tx_data_size 	= 0 ;	/* Transmit the command and receive response */
-+	pDesc->tx_cmd_pt 		= pDesc->command ;
-+	pDesc->rx_cmd_pt 		= pDesc->command ;
-+	pDesc->rx_cmd_size 		= 2 ;
-+	pDesc->tx_cmd_size 		= 2 ;
-+	status = AT91F_SpiWrite (pDesc);
-+
-+	pDesc->DataFlash_state = *( (unsigned char *) (pDesc->rx_cmd_pt) +1);
-+
-+	return status;
-+}
-+
-+
-+/*----------------------------------------------------------------------*/
-+/* \fn    AT91F_DataFlashWaitReady					*/
-+/* \brief wait for dataflash ready (bit7 of the status register == 1)	*/
-+/*----------------------------------------------------------------------*/
-+AT91S_DataFlashStatus AT91F_DataFlashWaitReady(AT91PS_DataflashDesc pDataFlashDesc, unsigned int timeout)
-+{
-+	pDataFlashDesc->DataFlash_state = IDLE;
-+
-+	do {
-+		AT91F_DataFlashGetStatus(pDataFlashDesc);
-+		timeout--;
-+	} while( ((pDataFlashDesc->DataFlash_state & 0x80) != 0x80) && (timeout > 0) );
-+
-+	if((pDataFlashDesc->DataFlash_state & 0x80) != 0x80)
-+		return DATAFLASH_ERROR;
-+
-+	return DATAFLASH_OK;
-+}
-+
-+
-+/*------------------------------------------------------------------------------*/
-+/* Function Name       : AT91F_DataFlashContinuousRead 				*/
-+/* Object              : Continuous stream Read 				*/
-+/* Input Parameters    : DataFlash Service					*/
-+/*						: <src> = dataflash address	*/
-+/*                     : <*dataBuffer> = data buffer pointer			*/
-+/*                     : <sizeToRead> = data buffer size			*/
-+/* Return value		: State of the dataflash				*/
-+/*------------------------------------------------------------------------------*/
-+AT91S_DataFlashStatus AT91F_DataFlashContinuousRead (
-+	AT91PS_DataFlash pDataFlash,
-+	int src,
-+	unsigned char *dataBuffer,
-+	int sizeToRead )
-+{
-+	AT91S_DataFlashStatus status;
-+	/* Test the size to read in the device */
-+	if ( (src + sizeToRead) > (pDataFlash->pDevice->pages_size * (pDataFlash->pDevice->pages_number)))
-+		return DATAFLASH_MEMORY_OVERFLOW;
-+
-+	pDataFlash->pDataFlashDesc->rx_data_pt = dataBuffer;
-+	pDataFlash->pDataFlashDesc->rx_data_size = sizeToRead;
-+	pDataFlash->pDataFlashDesc->tx_data_pt = dataBuffer;
-+	pDataFlash->pDataFlashDesc->tx_data_size = sizeToRead;
-+
-+	status = AT91F_DataFlashSendCommand (pDataFlash, DB_CONTINUOUS_ARRAY_READ, 8, src);
-+	/* Send the command to the dataflash */
-+	return(status);
-+}
-+
-+
-+/*------------------------------------------------------------------------------*/
-+/* Function Name       : AT91F_DataFlashPagePgmBuf				*/
-+/* Object              : Main memory page program through buffer 1 or buffer 2	*/
-+/* Input Parameters    : DataFlash Service					*/
-+/*						: <*src> = Source buffer	*/
-+/*                     : <dest> = dataflash destination address			*/
-+/*                     : <SizeToWrite> = data buffer size			*/
-+/* Return value		: State of the dataflash				*/
-+/*------------------------------------------------------------------------------*/
-+AT91S_DataFlashStatus AT91F_DataFlashPagePgmBuf(
-+	AT91PS_DataFlash pDataFlash,
-+	unsigned char *src,
-+	unsigned int dest,
-+	unsigned int SizeToWrite)
-+{
-+	int cmdsize;
-+	pDataFlash->pDataFlashDesc->tx_data_pt = src ;
-+	pDataFlash->pDataFlashDesc->tx_data_size = SizeToWrite ;
-+	pDataFlash->pDataFlashDesc->rx_data_pt = src;
-+	pDataFlash->pDataFlashDesc->rx_data_size = SizeToWrite;
-+
-+	cmdsize = 4;
-+	/* Send the command to the dataflash */
-+	if (pDataFlash->pDevice->pages_number >= 16384)
-+		cmdsize = 5;
-+	return(AT91F_DataFlashSendCommand (pDataFlash, DB_PAGE_PGM_BUF1, cmdsize, dest));
-+}
-+
-+
-+/*------------------------------------------------------------------------------*/
-+/* Function Name       : AT91F_MainMemoryToBufferTransfert			*/
-+/* Object              : Read a page in the SRAM Buffer 1 or 2			*/
-+/* Input Parameters    : DataFlash Service					*/
-+/*                     : Page concerned						*/
-+/*                     : 							*/
-+/* Return value		: State of the dataflash				*/
-+/*------------------------------------------------------------------------------*/
-+AT91S_DataFlashStatus AT91F_MainMemoryToBufferTransfert(
-+	AT91PS_DataFlash pDataFlash,
-+	unsigned char BufferCommand,
-+	unsigned int page)
-+{
-+	int cmdsize;
-+	/* Test if the buffer command is legal */
-+	if ((BufferCommand != DB_PAGE_2_BUF1_TRF) && (BufferCommand != DB_PAGE_2_BUF2_TRF))
-+		return DATAFLASH_BAD_COMMAND;
-+
-+	/* no data to transmit or receive */
-+	pDataFlash->pDataFlashDesc->tx_data_size = 0;
-+	cmdsize = 4;
-+	if (pDataFlash->pDevice->pages_number >= 16384)
-+		cmdsize = 5;
-+	return(AT91F_DataFlashSendCommand (pDataFlash, BufferCommand, cmdsize, page*pDataFlash->pDevice->pages_size));
-+}
-+
-+
-+/*----------------------------------------------------------------------------- */
-+/* Function Name       : AT91F_DataFlashWriteBuffer				*/
-+/* Object              : Write data to the internal sram buffer 1 or 2		*/
-+/* Input Parameters    : DataFlash Service					*/
-+/*			: <BufferCommand> = command to write buffer1 or buffer2	*/
-+/*                     : <*dataBuffer> = data buffer to write			*/
-+/*                     : <bufferAddress> = address in the internal buffer	*/
-+/*                     : <SizeToWrite> = data buffer size			*/
-+/* Return value		: State of the dataflash				*/
-+/*------------------------------------------------------------------------------*/
-+AT91S_DataFlashStatus AT91F_DataFlashWriteBuffer (
-+	AT91PS_DataFlash pDataFlash,
-+	unsigned char BufferCommand,
-+	unsigned char *dataBuffer,
-+	unsigned int bufferAddress,
-+	int SizeToWrite )
-+{
-+	int cmdsize;
-+	/* Test if the buffer command is legal */
-+	if ((BufferCommand != DB_BUF1_WRITE) && (BufferCommand != DB_BUF2_WRITE))
-+		return DATAFLASH_BAD_COMMAND;
-+
-+	/* buffer address must be lower than page size */
-+	if (bufferAddress > pDataFlash->pDevice->pages_size)
-+		return DATAFLASH_BAD_ADDRESS;
-+
-+	if ( (pDataFlash->pDataFlashDesc->state)  != IDLE)
-+		return DATAFLASH_BUSY;
-+
-+	/* Send first Write Command */
-+	pDataFlash->pDataFlashDesc->command[0] = BufferCommand;
-+	pDataFlash->pDataFlashDesc->command[1] = 0;
-+	if (pDataFlash->pDevice->pages_number >= 16384) {
-+	    	pDataFlash->pDataFlashDesc->command[2] = 0;
-+	    	pDataFlash->pDataFlashDesc->command[3] = (unsigned char)(((unsigned int)(bufferAddress &  pDataFlash->pDevice->byte_mask)) >> 8) ;
-+	    	pDataFlash->pDataFlashDesc->command[4] = (unsigned char)((unsigned int)bufferAddress  & 0x00FF) ;
-+		cmdsize = 5;
-+	} else {
-+	    	pDataFlash->pDataFlashDesc->command[2] = (unsigned char)(((unsigned int)(bufferAddress &  pDataFlash->pDevice->byte_mask)) >> 8) ;
-+	    	pDataFlash->pDataFlashDesc->command[3] = (unsigned char)((unsigned int)bufferAddress  & 0x00FF) ;
-+	    	pDataFlash->pDataFlashDesc->command[4] = 0;
-+		cmdsize = 4;
-+	}
-+
-+	pDataFlash->pDataFlashDesc->tx_cmd_pt 	 = pDataFlash->pDataFlashDesc->command ;
-+	pDataFlash->pDataFlashDesc->tx_cmd_size = cmdsize ;
-+	pDataFlash->pDataFlashDesc->rx_cmd_pt 	 = pDataFlash->pDataFlashDesc->command ;
-+	pDataFlash->pDataFlashDesc->rx_cmd_size = cmdsize ;
-+
-+	pDataFlash->pDataFlashDesc->rx_data_pt 	= dataBuffer ;
-+	pDataFlash->pDataFlashDesc->tx_data_pt 	= dataBuffer ;
-+	pDataFlash->pDataFlashDesc->rx_data_size 	= SizeToWrite ;
-+	pDataFlash->pDataFlashDesc->tx_data_size 	= SizeToWrite ;
-+
-+	return AT91F_SpiWrite(pDataFlash->pDataFlashDesc);
-+}
-+
-+/*------------------------------------------------------------------------------*/
-+/* Function Name       : AT91F_PageErase                                        */
-+/* Object              : Erase a page 						*/
-+/* Input Parameters    : DataFlash Service					*/
-+/*                     : Page concerned						*/
-+/*                     : 							*/
-+/* Return value		: State of the dataflash				*/
-+/*------------------------------------------------------------------------------*/
-+AT91S_DataFlashStatus AT91F_PageErase(
-+	AT91PS_DataFlash pDataFlash,
-+	unsigned int page)
-+{
-+	int cmdsize;
-+	/* Test if the buffer command is legal */
-+	/* no data to transmit or receive */
-+    	pDataFlash->pDataFlashDesc->tx_data_size = 0;
-+
-+	cmdsize = 4;
-+	if (pDataFlash->pDevice->pages_number >= 16384)
-+		cmdsize = 5;
-+	return(AT91F_DataFlashSendCommand (pDataFlash, DB_PAGE_ERASE, cmdsize, page*pDataFlash->pDevice->pages_size));
-+}
-+
-+
-+/*------------------------------------------------------------------------------*/
-+/* Function Name       : AT91F_BlockErase                                       */
-+/* Object              : Erase a Block 						*/
-+/* Input Parameters    : DataFlash Service					*/
-+/*                     : Page concerned						*/
-+/*                     : 							*/
-+/* Return value		: State of the dataflash				*/
-+/*------------------------------------------------------------------------------*/
-+AT91S_DataFlashStatus AT91F_BlockErase(
-+	AT91PS_DataFlash pDataFlash,
-+	unsigned int block)
-+{
-+	int cmdsize;
-+	/* Test if the buffer command is legal */
-+	/* no data to transmit or receive */
-+    	pDataFlash->pDataFlashDesc->tx_data_size = 0;
-+	cmdsize = 4;
-+	if (pDataFlash->pDevice->pages_number >= 16384)
-+		cmdsize = 5;
-+	return(AT91F_DataFlashSendCommand (pDataFlash, DB_BLOCK_ERASE,cmdsize, block*8*pDataFlash->pDevice->pages_size));
-+}
-+
-+/*------------------------------------------------------------------------------*/
-+/* Function Name       : AT91F_WriteBufferToMain				*/
-+/* Object              : Write buffer to the main memory			*/
-+/* Input Parameters    : DataFlash Service					*/
-+/*		: <BufferCommand> = command to send to buffer1 or buffer2	*/
-+/*                     : <dest> = main memory address				*/
-+/* Return value		: State of the dataflash				*/
-+/*------------------------------------------------------------------------------*/
-+AT91S_DataFlashStatus AT91F_WriteBufferToMain (
-+	AT91PS_DataFlash pDataFlash,
-+	unsigned char BufferCommand,
-+	unsigned int dest )
-+{
-+	int cmdsize;
-+	/* Test if the buffer command is correct */
-+	if ((BufferCommand != DB_BUF1_PAGE_PGM) &&
-+	    (BufferCommand != DB_BUF1_PAGE_ERASE_PGM) &&
-+	    (BufferCommand != DB_BUF2_PAGE_PGM) &&
-+	    (BufferCommand != DB_BUF2_PAGE_ERASE_PGM) )
-+		return DATAFLASH_BAD_COMMAND;
-+
-+	/* no data to transmit or receive */
-+	pDataFlash->pDataFlashDesc->tx_data_size = 0;
-+
-+	cmdsize = 4;
-+	if (pDataFlash->pDevice->pages_number >= 16384)
-+		cmdsize = 5;
-+	/* Send the command to the dataflash */
-+	return(AT91F_DataFlashSendCommand (pDataFlash, BufferCommand, cmdsize, dest));
-+}
-+
-+
-+/*------------------------------------------------------------------------------*/
-+/* Function Name       : AT91F_PartialPageWrite					*/
-+/* Object              : Erase partielly a page					*/
-+/* Input Parameters    : <page> = page number					*/
-+/*			: <AdrInpage> = adr to begin the fading			*/
-+/*                     : <length> = Number of bytes to erase			*/
-+/*------------------------------------------------------------------------------*/
-+AT91S_DataFlashStatus AT91F_PartialPageWrite (
-+	AT91PS_DataFlash pDataFlash,
-+	unsigned char *src,
-+	unsigned int dest,
-+	unsigned int size)
-+{
-+	unsigned int page;
-+	unsigned int AdrInPage;
-+
-+	page = dest / (pDataFlash->pDevice->pages_size);
-+	AdrInPage = dest % (pDataFlash->pDevice->pages_size);
-+
-+	/* Read the contents of the page in the Sram Buffer */
-+	AT91F_MainMemoryToBufferTransfert(pDataFlash, DB_PAGE_2_BUF1_TRF, page);
-+	AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91C_TIMEOUT_WRDY);
-+	/*Update the SRAM buffer */
-+	AT91F_DataFlashWriteBuffer(pDataFlash, DB_BUF1_WRITE, src, AdrInPage, size);
-+
-+	AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91C_TIMEOUT_WRDY);
-+
-+	/* Erase page if a 128 Mbits device */
-+	if (pDataFlash->pDevice->pages_number >= 16384) {
-+		AT91F_PageErase(pDataFlash, page);
-+		/* Rewrite the modified Sram Buffer in the main memory */
-+		AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91C_TIMEOUT_WRDY);
-+	}
-+
-+	/* Rewrite the modified Sram Buffer in the main memory */
-+	return(AT91F_WriteBufferToMain(pDataFlash, DB_BUF1_PAGE_ERASE_PGM, (page*pDataFlash->pDevice->pages_size)));
-+}
-+
-+
-+/*------------------------------------------------------------------------------*/
-+/* Function Name       : AT91F_DataFlashWrite					*/
-+/* Object              :							*/
-+/* Input Parameters    : <*src> = Source buffer					*/
-+/*                     : <dest> = dataflash adress				*/
-+/*                     : <size> = data buffer size				*/
-+/*------------------------------------------------------------------------------*/
-+AT91S_DataFlashStatus AT91F_DataFlashWrite(
-+	AT91PS_DataFlash pDataFlash,
-+	unsigned char *src,
-+	int dest,
-+	int size )
-+{
-+	unsigned int length;
-+	unsigned int page;
-+	unsigned int status;
-+
-+	AT91F_SpiEnable(pDataFlash->pDevice->cs);
-+
-+	if ( (dest + size) > (pDataFlash->pDevice->pages_size * (pDataFlash->pDevice->pages_number)))
-+		return DATAFLASH_MEMORY_OVERFLOW;
-+
-+	/* If destination does not fit a page start address */
-+	if ((dest % ((unsigned int)(pDataFlash->pDevice->pages_size)))  != 0 ) {
-+		length = pDataFlash->pDevice->pages_size - (dest % ((unsigned int)(pDataFlash->pDevice->pages_size)));
-+
-+		if (size < length)
-+			length = size;
-+
-+		if(!AT91F_PartialPageWrite(pDataFlash,src, dest, length))
-+			return DATAFLASH_ERROR;
-+
-+		AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91C_TIMEOUT_WRDY);
-+
-+		/* Update size, source and destination pointers */
-+		size -= length;
-+		dest += length;
-+		src += length;
-+	}
-+
-+	while (( size - pDataFlash->pDevice->pages_size ) >= 0 ) {
-+		/* program dataflash page */
-+		page = (unsigned int)dest / (pDataFlash->pDevice->pages_size);
-+
-+		status = AT91F_DataFlashWriteBuffer(pDataFlash, DB_BUF1_WRITE, src, 0, pDataFlash->pDevice->pages_size);
-+		AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91C_TIMEOUT_WRDY);
-+
-+		status = AT91F_PageErase(pDataFlash, page);
-+		AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91C_TIMEOUT_WRDY);
-+		if (!status)
-+			return DATAFLASH_ERROR;
-+
-+		status = AT91F_WriteBufferToMain (pDataFlash, DB_BUF1_PAGE_PGM, dest);
-+		if(!status)
-+			return DATAFLASH_ERROR;
-+
-+		AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91C_TIMEOUT_WRDY);
-+
-+		/* Update size, source and destination pointers */
-+		size -= pDataFlash->pDevice->pages_size ;
-+		dest += pDataFlash->pDevice->pages_size ;
-+		src  += pDataFlash->pDevice->pages_size ;
-+	}
-+
-+	/* If still some bytes to read */
-+	if ( size > 0 ) {
-+		/* program dataflash page */
-+		if(!AT91F_PartialPageWrite(pDataFlash, src, dest, size) )
-+			return DATAFLASH_ERROR;
-+
-+		AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91C_TIMEOUT_WRDY);
-+	}
-+	return DATAFLASH_OK;
-+}
-+
-+
-+/*------------------------------------------------------------------------------*/
-+/* Function Name       : AT91F_DataFlashRead 					*/
-+/* Object              : Read a block in dataflash				*/
-+/* Input Parameters    : 							*/
-+/* Return value		: 							*/
-+/*------------------------------------------------------------------------------*/
-+int AT91F_DataFlashRead(
-+	AT91PS_DataFlash pDataFlash,
-+	unsigned long addr,
-+	unsigned long size,
-+	char *buffer)
-+{
-+	unsigned long SizeToRead;
-+
-+	AT91F_SpiEnable(pDataFlash->pDevice->cs);
-+
-+	if(AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91C_TIMEOUT_WRDY) != DATAFLASH_OK)
-+		return -1;
-+
-+	while (size) {
-+		SizeToRead = (size < 0x8000)? size:0x8000;
-+
-+		if (AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91C_TIMEOUT_WRDY) != DATAFLASH_OK)
-+			return -1;
-+
-+		if (AT91F_DataFlashContinuousRead (pDataFlash, addr, buffer, SizeToRead) != DATAFLASH_OK)
-+			return -1;
-+
-+		size -= SizeToRead;
-+		addr += SizeToRead;
-+		buffer += SizeToRead;
-+	}
-+
-+	return DATAFLASH_OK;
-+}
-+
-+
-+/*------------------------------------------------------------------------------*/
-+/* Function Name       : AT91F_DataflashProbe 					*/
-+/* Object              : 							*/
-+/* Input Parameters    : 							*/
-+/* Return value	       : Dataflash status register				*/
-+/*------------------------------------------------------------------------------*/
-+int AT91F_DataflashProbe(int cs, AT91PS_DataflashDesc pDesc)
-+{
-+	AT91F_SpiEnable(cs);
-+	AT91F_DataFlashGetStatus(pDesc);
-+	return((pDesc->command[1] == 0xFF)? 0: pDesc->command[1] & 0x3C);
-+}
-+
-+#endif
-diff -Naur u-boot-1.1.4.org/board/vlink/config.mk u-boot-1.1.4.tmp/board/vlink/config.mk
---- u-boot-1.1.4.org/board/vlink/config.mk	1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-1.1.4.tmp/board/vlink/config.mk	2005-12-16 17:39:27.000000000 +0100
-@@ -0,0 +1 @@
-+TEXT_BASE = 0x21f00000
-diff -Naur u-boot-1.1.4.org/board/vlink/flash.c u-boot-1.1.4.tmp/board/vlink/flash.c
---- u-boot-1.1.4.org/board/vlink/flash.c	1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-1.1.4.tmp/board/vlink/flash.c	2006-06-05 02:44:43.000000000 +0200
-@@ -0,0 +1,504 @@
-+/*
-+ * (C) Copyright 2002
-+ * Lineo, Inc. <www.lineo.com>
-+ * Bernhard Kuhn <bkuhn@lineo.com>
-+ *
-+ * (C) Copyright 2002
-+ * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
-+ * Alex Zuepke <azu@sysgo.de>
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+#include <common.h>
-+
-+ulong myflush(void);
-+
-+
-+/* Flash Organization Structure */
-+typedef struct OrgDef
-+{
-+	unsigned int sector_number;
-+	unsigned int sector_size;
-+} OrgDef;
-+
-+
-+/* Flash Organizations */
-+OrgDef OrgAT49BV16x4[] =
-+{
-+	{  8,  8*1024 },	/*   8 *  8 kBytes sectors */
-+	{  2, 32*1024 },	/*   2 * 32 kBytes sectors */
-+	{ 30, 64*1024 },	/*  30 * 64 kBytes sectors */
-+};
-+
-+OrgDef OrgAT49BV16x4A[] =
-+{
-+	{  8,  8*1024 },	/*   8 *  8 kBytes sectors */
-+	{ 31, 64*1024 },	/*  31 * 64 kBytes sectors */
-+};
-+
-+OrgDef OrgAT49BV6416[] =
-+{
-+	{   8,  8*1024 },	/*   8 *  8 kBytes sectors */
-+	{ 127, 64*1024 },	/* 127 * 64 kBytes sectors */
-+};
-+
-+flash_info_t    flash_info[CFG_MAX_FLASH_BANKS];
-+
-+/* AT49BV1614A Codes */
-+#define FLASH_CODE1		0xAA
-+#define FLASH_CODE2		0x55
-+#define ID_IN_CODE		0x90
-+#define ID_OUT_CODE		0xF0
-+
-+
-+#define CMD_READ_ARRAY		0x00F0
-+#define CMD_UNLOCK1		0x00AA
-+#define CMD_UNLOCK2		0x0055
-+#define CMD_ERASE_SETUP		0x0080
-+#define CMD_ERASE_CONFIRM	0x0030
-+#define CMD_PROGRAM		0x00A0
-+#define CMD_UNLOCK_BYPASS	0x0020
-+#define CMD_SECTOR_UNLOCK	0x0070
-+
-+#define MEM_FLASH_ADDR1		(*(volatile u16 *)(CFG_FLASH_BASE + (0x00005555<<1)))
-+#define MEM_FLASH_ADDR2		(*(volatile u16 *)(CFG_FLASH_BASE + (0x00002AAA<<1)))
-+
-+#define BIT_ERASE_DONE		0x0080
-+#define BIT_RDY_MASK		0x0080
-+#define BIT_PROGRAM_ERROR	0x0020
-+#define BIT_TIMEOUT		0x80000000 /* our flag */
-+
-+#define READY 1
-+#define ERR   2
-+#define TMO   4
-+
-+/*-----------------------------------------------------------------------
-+ */
-+void flash_identification (flash_info_t * info)
-+{
-+	volatile u16 manuf_code, device_code, add_device_code;
-+
-+	MEM_FLASH_ADDR1 = FLASH_CODE1;
-+	MEM_FLASH_ADDR2 = FLASH_CODE2;
-+	MEM_FLASH_ADDR1 = ID_IN_CODE;
-+
-+	manuf_code = *(volatile u16 *) CFG_FLASH_BASE;
-+	device_code = *(volatile u16 *) (CFG_FLASH_BASE + 2);
-+	add_device_code = *(volatile u16 *) (CFG_FLASH_BASE + (3 << 1));
-+
-+	MEM_FLASH_ADDR1 = FLASH_CODE1;
-+	MEM_FLASH_ADDR2 = FLASH_CODE2;
-+	MEM_FLASH_ADDR1 = ID_OUT_CODE;
-+
-+	/* Vendor type */
-+	info->flash_id = ATM_MANUFACT & FLASH_VENDMASK;
-+	printf ("Atmel: ");
-+
-+	if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV1614 & FLASH_TYPEMASK)) {
-+
-+		if ((add_device_code & FLASH_TYPEMASK) ==
-+			(ATM_ID_BV1614A & FLASH_TYPEMASK)) {
-+			info->flash_id |= ATM_ID_BV1614A & FLASH_TYPEMASK;
-+			printf ("AT49BV1614A (16Mbit)\n");
-+		} else {				/* AT49BV1614 Flash */
-+			info->flash_id |= ATM_ID_BV1614 & FLASH_TYPEMASK;
-+			printf ("AT49BV1614 (16Mbit)\n");
-+		}
-+
-+	} else if ((device_code & FLASH_TYPEMASK) == (ATM_ID_BV6416 & FLASH_TYPEMASK)) {
-+		info->flash_id |= ATM_ID_BV6416 & FLASH_TYPEMASK;
-+		printf ("AT49BV6416 (64Mbit)\n");
-+	}
-+}
-+
-+ushort flash_number_sector(OrgDef *pOrgDef, unsigned int nb_blocks)
-+{
-+	int i, nb_sectors = 0;
-+
-+	for (i=0; i<nb_blocks; i++){
-+		nb_sectors += pOrgDef[i].sector_number;
-+	}
-+
-+	return nb_sectors;
-+}
-+
-+void flash_unlock_sector(flash_info_t * info, unsigned int sector)
-+{
-+	volatile u16 *addr = (volatile u16 *) (info->start[sector]);
-+
-+	MEM_FLASH_ADDR1 = CMD_UNLOCK1;
-+	*addr = CMD_SECTOR_UNLOCK;
-+}
-+
-+
-+ulong flash_init (void)
-+{
-+	int i, j, k;
-+	unsigned int flash_nb_blocks, sector;
-+	unsigned int start_address;
-+	OrgDef *pOrgDef;
-+
-+	ulong size = 0;
-+
-+	for (i = 0; i < CFG_MAX_FLASH_BANKS; i++) {
-+		ulong flashbase = 0;
-+
-+		flash_identification (&flash_info[i]);
-+
-+		if ((flash_info[i].flash_id & FLASH_TYPEMASK) ==
-+			(ATM_ID_BV1614 & FLASH_TYPEMASK)) {
-+
-+			pOrgDef = OrgAT49BV16x4;
-+			flash_nb_blocks = sizeof (OrgAT49BV16x4) / sizeof (OrgDef);
-+		} else if ((flash_info[i].flash_id & FLASH_TYPEMASK) ==
-+			(ATM_ID_BV1614A & FLASH_TYPEMASK)){	/* AT49BV1614A Flash */
-+
-+			pOrgDef = OrgAT49BV16x4A;
-+			flash_nb_blocks = sizeof (OrgAT49BV16x4A) / sizeof (OrgDef);
-+		} else if ((flash_info[i].flash_id & FLASH_TYPEMASK) ==
-+			(ATM_ID_BV6416 & FLASH_TYPEMASK)){	/* AT49BV6416 Flash */
-+
-+			pOrgDef = OrgAT49BV6416;
-+			flash_nb_blocks = sizeof (OrgAT49BV6416) / sizeof (OrgDef);
-+		} else {
-+			flash_nb_blocks = 0;
-+			pOrgDef = OrgAT49BV16x4;
-+		}
-+
-+		flash_info[i].sector_count = flash_number_sector(pOrgDef, flash_nb_blocks);
-+		memset (flash_info[i].protect, 0, flash_info[i].sector_count);
-+
-+		if (i == 0)
-+			flashbase = PHYS_FLASH_1;
-+		else
-+			panic ("configured too many flash banks!\n");
-+
-+		sector = 0;
-+		start_address = flashbase;
-+		flash_info[i].size = 0;
-+
-+		for (j = 0; j < flash_nb_blocks; j++) {
-+			for (k = 0; k < pOrgDef[j].sector_number; k++) {
-+				flash_info[i].start[sector++] = start_address;
-+				start_address += pOrgDef[j].sector_size;
-+				flash_info[i].size += pOrgDef[j].sector_size;
-+			}
-+		}
-+
-+		size += flash_info[i].size;
-+
-+		if ((flash_info[i].flash_id & FLASH_TYPEMASK) ==
-+			(ATM_ID_BV6416 & FLASH_TYPEMASK)){	/* AT49BV6416 Flash */
-+
-+			/* Unlock all sectors at reset */
-+			for (j=0; j<flash_info[i].sector_count; j++){
-+				flash_unlock_sector(&flash_info[i], j);
-+			}
-+		}
-+	}
-+
-+	/* Protect binary boot image */
-+	flash_protect (FLAG_PROTECT_SET,
-+		       CFG_FLASH_BASE,
-+		       CFG_FLASH_BASE + CFG_BOOT_SIZE - 1, &flash_info[0]);
-+
-+	/* Protect environment variables */
-+	flash_protect (FLAG_PROTECT_SET,
-+		       CFG_ENV_ADDR,
-+		       CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
-+
-+	/* Protect U-Boot gzipped image */
-+	flash_protect (FLAG_PROTECT_SET,
-+		       CFG_U_BOOT_BASE,
-+		       CFG_U_BOOT_BASE + CFG_U_BOOT_SIZE - 1, &flash_info[0]);
-+
-+	return size;
-+}
-+
-+/*-----------------------------------------------------------------------
-+ */
-+void flash_print_info (flash_info_t * info)
-+{
-+	int i;
-+
-+	switch (info->flash_id & FLASH_VENDMASK) {
-+	case (ATM_MANUFACT & FLASH_VENDMASK):
-+		printf ("Atmel: ");
-+		break;
-+	default:
-+		printf ("Unknown Vendor ");
-+		break;
-+	}
-+
-+	switch (info->flash_id & FLASH_TYPEMASK) {
-+	case (ATM_ID_BV1614 & FLASH_TYPEMASK):
-+		printf ("AT49BV1614 (16Mbit)\n");
-+		break;
-+	case (ATM_ID_BV1614A & FLASH_TYPEMASK):
-+		printf ("AT49BV1614A (16Mbit)\n");
-+		break;
-+	case (ATM_ID_BV6416 & FLASH_TYPEMASK):
-+		printf ("AT49BV6416 (64Mbit)\n");
-+		break;
-+	default:
-+		printf ("Unknown Chip Type\n");
-+		return;
-+	}
-+
-+	printf ("  Size: %ld MB in %d Sectors\n",
-+		info->size >> 20, info->sector_count);
-+
-+	printf ("  Sector Start Addresses:");
-+	for (i = 0; i < info->sector_count; i++) {
-+		if ((i % 5) == 0) {
-+			printf ("\n   ");
-+		}
-+		printf (" %08lX%s", info->start[i],
-+			info->protect[i] ? " (RO)" : "     ");
-+	}
-+	printf ("\n");
-+}
-+
-+/*-----------------------------------------------------------------------
-+ */
-+
-+int flash_erase (flash_info_t * info, int s_first, int s_last)
-+{
-+	ulong result;
-+	int iflag, cflag, prot, sect;
-+	int rc = ERR_OK;
-+	int chip1;
-+
-+	/* first look for protection bits */
-+
-+	if (info->flash_id == FLASH_UNKNOWN)
-+		return ERR_UNKNOWN_FLASH_TYPE;
-+
-+	if ((s_first < 0) || (s_first > s_last)) {
-+		return ERR_INVAL;
-+	}
-+
-+	if ((info->flash_id & FLASH_VENDMASK) !=
-+		(ATM_MANUFACT & FLASH_VENDMASK)) {
-+		return ERR_UNKNOWN_FLASH_VENDOR;
-+	}
-+
-+	prot = 0;
-+	for (sect = s_first; sect <= s_last; ++sect) {
-+		if (info->protect[sect]) {
-+			prot++;
-+		}
-+	}
-+	if (prot)
-+		return ERR_PROTECTED;
-+
-+	/*
-+	 * Disable interrupts which might cause a timeout
-+	 * here. Remember that our exception vectors are
-+	 * at address 0 in the flash, and we don't want a
-+	 * (ticker) exception to happen while the flash
-+	 * chip is in programming mode.
-+	 */
-+	cflag = icache_status ();
-+	icache_disable ();
-+	iflag = disable_interrupts ();
-+
-+	/* Start erase on unprotected sectors */
-+	for (sect = s_first; sect <= s_last && !ctrlc (); sect++) {
-+		printf ("Erasing sector %2d ... ", sect);
-+
-+		/* arm simple, non interrupt dependent timer */
-+		reset_timer_masked ();
-+
-+		if (info->protect[sect] == 0) {	/* not protected */
-+			volatile u16 *addr = (volatile u16 *) (info->start[sect]);
-+
-+			MEM_FLASH_ADDR1 = CMD_UNLOCK1;
-+			MEM_FLASH_ADDR2 = CMD_UNLOCK2;
-+			MEM_FLASH_ADDR1 = CMD_ERASE_SETUP;
-+
-+			MEM_FLASH_ADDR1 = CMD_UNLOCK1;
-+			MEM_FLASH_ADDR2 = CMD_UNLOCK2;
-+			*addr = CMD_ERASE_CONFIRM;
-+
-+			/* wait until flash is ready */
-+			chip1 = 0;
-+
-+			do {
-+				result = *addr;
-+
-+				/* check timeout */
-+				if (get_timer_masked () > CFG_FLASH_ERASE_TOUT) {
-+					MEM_FLASH_ADDR1 = CMD_READ_ARRAY;
-+					chip1 = TMO;
-+					break;
-+				}
-+
-+				if (!chip1 && (result & 0xFFFF) & BIT_ERASE_DONE)
-+					chip1 = READY;
-+
-+			} while (!chip1);
-+
-+			MEM_FLASH_ADDR1 = CMD_READ_ARRAY;
-+
-+			if (chip1 == ERR) {
-+				rc = ERR_PROG_ERROR;
-+				goto outahere;
-+			}
-+			if (chip1 == TMO) {
-+				rc = ERR_TIMOUT;
-+				goto outahere;
-+			}
-+
-+			printf ("ok.\n");
-+		} else {			/* it was protected */
-+			printf ("protected!\n");
-+		}
-+	}
-+
-+	if (ctrlc ())
-+		printf ("User Interrupt!\n");
-+
-+outahere:
-+	/* allow flash to settle - wait 10 ms */
-+	udelay_masked (10000);
-+
-+	if (iflag)
-+		enable_interrupts ();
-+
-+	if (cflag)
-+		icache_enable ();
-+
-+	return rc;
-+}
-+
-+/*-----------------------------------------------------------------------
-+ * Copy memory to flash
-+ */
-+
-+volatile static int write_word (flash_info_t * info, ulong dest,
-+								ulong data)
-+{
-+	volatile u16 *addr = (volatile u16 *) dest;
-+	ulong result;
-+	int rc = ERR_OK;
-+	int cflag, iflag;
-+	int chip1;
-+
-+	/*
-+	 * Check if Flash is (sufficiently) erased
-+	 */
-+	result = *addr;
-+	if ((result & data) != data)
-+		return ERR_NOT_ERASED;
-+
-+
-+	/*
-+	 * Disable interrupts which might cause a timeout
-+	 * here. Remember that our exception vectors are
-+	 * at address 0 in the flash, and we don't want a
-+	 * (ticker) exception to happen while the flash
-+	 * chip is in programming mode.
-+	 */
-+	cflag = icache_status ();
-+	icache_disable ();
-+	iflag = disable_interrupts ();
-+
-+	MEM_FLASH_ADDR1 = CMD_UNLOCK1;
-+	MEM_FLASH_ADDR2 = CMD_UNLOCK2;
-+	MEM_FLASH_ADDR1 = CMD_PROGRAM;
-+	*addr = data;
-+
-+	/* arm simple, non interrupt dependent timer */
-+	reset_timer_masked ();
-+
-+	/* wait until flash is ready */
-+	chip1 = 0;
-+	do {
-+		result = *addr;
-+
-+		/* check timeout */
-+		if (get_timer_masked () > CFG_FLASH_ERASE_TOUT) {
-+			chip1 = ERR | TMO;
-+			break;
-+		}
-+		if (!chip1 && ((result & 0x80) == (data & 0x80)))
-+			chip1 = READY;
-+
-+	} while (!chip1);
-+
-+	*addr = CMD_READ_ARRAY;
-+
-+	if (chip1 == ERR || *addr != data)
-+		rc = ERR_PROG_ERROR;
-+
-+	if (iflag)
-+		enable_interrupts ();
-+
-+	if (cflag)
-+		icache_enable ();
-+
-+	return rc;
-+}
-+
-+/*-----------------------------------------------------------------------
-+ * Copy memory to flash.
-+ */
-+
-+int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt)
-+{
-+	ulong wp, data;
-+	int rc;
-+
-+	if (addr & 1) {
-+		printf ("unaligned destination not supported\n");
-+		return ERR_ALIGN;
-+	};
-+
-+	if ((int) src & 1) {
-+		printf ("unaligned source not supported\n");
-+		return ERR_ALIGN;
-+	};
-+
-+	wp = addr;
-+
-+	while (cnt >= 2) {
-+		data = *((volatile u16 *) src);
-+		if ((rc = write_word (info, wp, data)) != 0) {
-+			return (rc);
-+		}
-+		src += 2;
-+		wp += 2;
-+		cnt -= 2;
-+	}
-+
-+	if (cnt == 1) {
-+		data = (*((volatile u8 *) src)) | (*((volatile u8 *) (wp + 1)) <<
-+										   8);
-+		if ((rc = write_word (info, wp, data)) != 0) {
-+			return (rc);
-+		}
-+		src += 1;
-+		wp += 1;
-+		cnt -= 1;
-+	};
-+
-+	return ERR_OK;
-+}
-diff -Naur u-boot-1.1.4.org/board/vlink/Makefile u-boot-1.1.4.tmp/board/vlink/Makefile
---- u-boot-1.1.4.org/board/vlink/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-1.1.4.tmp/board/vlink/Makefile	2006-06-05 02:48:33.000000000 +0200
-@@ -0,0 +1,46 @@
-+#
-+# (C) Copyright 2003
-+# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-+#
-+# See file CREDITS for list of people who contributed to this
-+# project.
-+#
-+# 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.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+# MA 02111-1307 USA
-+#
-+
-+include $(TOPDIR)/config.mk
-+
-+LIB	= lib$(BOARD).a
-+
-+OBJS	:= vlink.o at45.o flash.o
-+
-+$(LIB):	$(OBJS) $(SOBJS)
-+	$(AR) crv $@ $(OBJS) $(SOBJS)
-+
-+clean:
-+	rm -f $(SOBJS) $(OBJS)
-+
-+distclean:	clean
-+	rm -f $(LIB) core *.bak .depend
-+
-+#########################################################################
-+
-+.depend:	Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c)
-+		$(CC) -M $(CPPFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@
-+
-+-include .depend
-+
-+#########################################################################
-diff -Naur u-boot-1.1.4.org/board/vlink/u-boot.lds u-boot-1.1.4.tmp/board/vlink/u-boot.lds
---- u-boot-1.1.4.org/board/vlink/u-boot.lds	1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-1.1.4.tmp/board/vlink/u-boot.lds	2005-12-16 17:39:27.000000000 +0100
-@@ -0,0 +1,57 @@
-+/*
-+ * (C) Copyright 2002
-+ * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
-+/*OUTPUT_FORMAT("elf32-arm", "elf32-arm", "elf32-arm")*/
-+OUTPUT_ARCH(arm)
-+ENTRY(_start)
-+SECTIONS
-+{
-+	. = 0x00000000;
-+
-+	. = ALIGN(4);
-+	.text      :
-+	{
-+	  cpu/arm920t/start.o	(.text)
-+	  *(.text)
-+	}
-+
-+	. = ALIGN(4);
-+	.rodata : { *(.rodata) }
-+
-+	. = ALIGN(4);
-+	.data : { *(.data) }
-+
-+	. = ALIGN(4);
-+	.got : { *(.got) }
-+
-+	. = .;
-+	__u_boot_cmd_start = .;
-+	.u_boot_cmd : { *(.u_boot_cmd) }
-+	__u_boot_cmd_end = .;
-+
-+	. = ALIGN(4);
-+	__bss_start = .;
-+	.bss : { *(.bss) }
-+	_end = .;
-+}
-diff -Naur u-boot-1.1.4.org/board/vlink/vlink.c u-boot-1.1.4.tmp/board/vlink/vlink.c
---- u-boot-1.1.4.org/board/vlink/vlink.c	1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-1.1.4.tmp/board/vlink/vlink.c	2006-06-05 03:10:22.000000000 +0200
-@@ -0,0 +1,89 @@
-+/*
-+ * (C) Copyright 2002
-+ * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
-+ * Marius Groeger <mgroeger@sysgo.de>
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+#include <common.h>
-+#include <asm/arch/AT91RM9200.h>
-+#include <at91rm9200_net.h>
-+#include <dm9161.h>
-+#include <asm/mach-types.h>
-+
-+/* ------------------------------------------------------------------------- */
-+/*
-+ * Miscelaneous platform dependent initialisations
-+ */
-+
-+int board_init (void)
-+{
-+	DECLARE_GLOBAL_DATA_PTR;
-+
-+	/* Enable Ctrlc */
-+	console_init_f ();
-+
-+	/* Correct IRDA resistor problem */
-+	/* Set PA23_TXD in Output */
-+	(AT91PS_PIO) AT91C_BASE_PIOA->PIO_OER = AT91C_PA23_TXD2;
-+
-+	/* memory and cpu-speed are setup before relocation */
-+	/* so we do _nothing_ here */
-+
-+	/* arch number of Versalink-Board */
-+	gd->bd->bi_arch_number = MACH_TYPE_VLINK;
-+	/* adress of boot parameters */
-+	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
-+
-+	return 0;
-+}
-+
-+int dram_init (void)
-+{
-+	DECLARE_GLOBAL_DATA_PTR;
-+
-+	gd->bd->bi_dram[0].start = PHYS_SDRAM;
-+	gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE;
-+	return 0;
-+}
-+
-+#ifdef CONFIG_DRIVER_ETHER
-+#if (CONFIG_COMMANDS & CFG_CMD_NET)
-+
-+/*
-+ * Name:
-+ *	at91rm9200_GetPhyInterface
-+ * Description:
-+ *	Initialise the interface functions to the PHY
-+ * Arguments:
-+ *	None
-+ * Return value:
-+ *	None
-+ */
-+void at91rm9200_GetPhyInterface(AT91PS_PhyOps p_phyops)
-+{
-+	p_phyops->Init = dm9161_InitPhy;
-+	p_phyops->IsPhyConnected = dm9161_IsPhyConnected;
-+	p_phyops->GetLinkSpeed = dm9161_GetLinkSpeed;
-+	p_phyops->AutoNegotiate = dm9161_AutoNegotiate;
-+}
-+
-+#endif	/* CONFIG_COMMANDS & CFG_CMD_NET */
-+#endif	/* CONFIG_DRIVER_ETHER */
-diff -Naur u-boot-1.1.4.org/include/asm-arm/mach-types.h u-boot-1.1.4.tmp/include/asm-arm/mach-types.h
---- u-boot-1.1.4.org/include/asm-arm/mach-types.h	2005-12-16 17:39:27.000000000 +0100
-+++ u-boot-1.1.4.tmp/include/asm-arm/mach-types.h	2006-06-05 01:29:25.000000000 +0200
-@@ -424,7 +424,7 @@
- #define MACH_TYPE_MPORT3S              411
- #define MACH_TYPE_RA_ALPHA             412
- #define MACH_TYPE_XCEP                 413
--#define MACH_TYPE_ARCOM_MERCURY        414
-+#define MACH_TYPE_ARCOM_VULCAN         414
- #define MACH_TYPE_STARGATE             415
- #define MACH_TYPE_ARMADILLOJ           416
- #define MACH_TYPE_ELROY_JACK           417
-@@ -457,7 +457,7 @@
- #define MACH_TYPE_XM250                444
- #define MACH_TYPE_T6TC1XB              445
- #define MACH_TYPE_ESS710               446
--#define MACH_TYPE_MX3ADS               447
-+#define MACH_TYPE_MX31ADS              447
- #define MACH_TYPE_HIMALAYA             448
- #define MACH_TYPE_BOLFENK              449
- #define MACH_TYPE_AT91RM9200KR         450
-@@ -563,8 +563,8 @@
- #define MACH_TYPE_ENS_CMU              550
- #define MACH_TYPE_MM6_SDB              551
- #define MACH_TYPE_SATURN               552
--#define MACH_TYPE_ARGONPLUSEVB         553
--#define MACH_TYPE_SCMA11EVB            554
-+#define MACH_TYPE_I30030EVB            553
-+#define MACH_TYPE_MXC27530EVB          554
- #define MACH_TYPE_SMDK2800             555
- #define MACH_TYPE_MTWILSON             556
- #define MACH_TYPE_ZITI                 557
-@@ -644,7 +644,7 @@
- #define MACH_TYPE_MX2JAZZ              631
- #define MACH_TYPE_MULTIIO              632
- #define MACH_TYPE_HRDISPLAY            633
--#define MACH_TYPE_SCMA11BB             634
-+#define MACH_TYPE_MXC27530ADS          634
- #define MACH_TYPE_TRIZEPS3             635
- #define MACH_TYPE_ZEFEERDZA            636
- #define MACH_TYPE_ZEFEERDZB            637
-@@ -718,7 +718,7 @@
- #define MACH_TYPE_GEM                  707
- #define MACH_TYPE_I858                 708
- #define MACH_TYPE_HX2750               709
--#define MACH_TYPE_ZEUSEVB              710
-+#define MACH_TYPE_MXC91131EVB          710
- #define MACH_TYPE_P700                 711
- #define MACH_TYPE_CPE                  712
- #define MACH_TYPE_SPITZ                713
-@@ -736,6 +736,331 @@
- #define MACH_TYPE_LN2410SBC            725
- #define MACH_TYPE_CB3RUFC              726
- #define MACH_TYPE_MP2USB               727
-+#define MACH_TYPE_NTNP425C             728
-+#define MACH_TYPE_COLIBRI              729
-+#define MACH_TYPE_PCM7220              730
-+#define MACH_TYPE_GATEWAY7001          731
-+#define MACH_TYPE_PCM027               732
-+#define MACH_TYPE_CMPXA                733
-+#define MACH_TYPE_ANUBIS               734
-+#define MACH_TYPE_ITE8152              735
-+#define MACH_TYPE_LPC3XXX              736
-+#define MACH_TYPE_PUPPETEER            737
-+#define MACH_TYPE_MACH_VADATECH        738
-+#define MACH_TYPE_E570                 739
-+#define MACH_TYPE_X50                  740
-+#define MACH_TYPE_RECON                741
-+#define MACH_TYPE_XBOARDGP8            742
-+#define MACH_TYPE_FPIC2                743
-+#define MACH_TYPE_AKITA                744
-+#define MACH_TYPE_A81                  745
-+#define MACH_TYPE_SVM_SC25X            746
-+#define MACH_TYPE_VADATECH020          747
-+#define MACH_TYPE_TLI                  748
-+#define MACH_TYPE_EDB9315LC            749
-+#define MACH_TYPE_PASSEC               750
-+#define MACH_TYPE_DS_TIGER             751
-+#define MACH_TYPE_E310                 752
-+#define MACH_TYPE_E330                 753
-+#define MACH_TYPE_RT3000               754
-+#define MACH_TYPE_NOKIA770             755
-+#define MACH_TYPE_PNX0106              756
-+#define MACH_TYPE_HX21XX               757
-+#define MACH_TYPE_FARADAY              758
-+#define MACH_TYPE_SBC9312              759
-+#define MACH_TYPE_BATMAN               760
-+#define MACH_TYPE_JPD201               761
-+#define MACH_TYPE_MIPSA                762
-+#define MACH_TYPE_KACOM                763
-+#define MACH_TYPE_SWARCOCPU            764
-+#define MACH_TYPE_SWARCODSL            765
-+#define MACH_TYPE_BLUEANGEL            766
-+#define MACH_TYPE_HAIRYGRAMA           767
-+#define MACH_TYPE_BANFF                768
-+#define MACH_TYPE_CARMEVA              769
-+#define MACH_TYPE_SAM255               770
-+#define MACH_TYPE_PPM10                771
-+#define MACH_TYPE_EDB9315A             772
-+#define MACH_TYPE_SUNSET               773
-+#define MACH_TYPE_STARGATE2            774
-+#define MACH_TYPE_INTELMOTE2           775
-+#define MACH_TYPE_TRIZEPS4             776
-+#define MACH_TYPE_MAINSTONE2           777
-+#define MACH_TYPE_EZ_IXP42X            778
-+#define MACH_TYPE_TAPWAVE_ZODIAC       779
-+#define MACH_TYPE_UNIVERSALMETER       780
-+#define MACH_TYPE_HICOARM9             781
-+#define MACH_TYPE_PNX4008              782
-+#define MACH_TYPE_KWS6000              783
-+#define MACH_TYPE_PORTUX920T           784
-+#define MACH_TYPE_EZ_X5                785
-+#define MACH_TYPE_OMAP_RUDOLPH         786
-+#define MACH_TYPE_CPUAT91              787
-+#define MACH_TYPE_REA9200              788
-+#define MACH_TYPE_ACTS_PUNE_SA1110     789
-+#define MACH_TYPE_IXP425               790
-+#define MACH_TYPE_I30030ADS            791
-+#define MACH_TYPE_PERCH                792
-+#define MACH_TYPE_EIS05R1              793
-+#define MACH_TYPE_PEPPERPAD            794
-+#define MACH_TYPE_SB3010               795
-+#define MACH_TYPE_RM9200               796
-+#define MACH_TYPE_DMA03                797
-+#define MACH_TYPE_ROAD_S101            798
-+#define MACH_TYPE_IQ_NEXTGEN_A         799
-+#define MACH_TYPE_IQ_NEXTGEN_B         800
-+#define MACH_TYPE_IQ_NEXTGEN_C         801
-+#define MACH_TYPE_IQ_NEXTGEN_D         802
-+#define MACH_TYPE_IQ_NEXTGEN_E         803
-+#define MACH_TYPE_MALLOW_AT91          804
-+#define MACH_TYPE_CYBERTRACKER_I       805
-+#define MACH_TYPE_GESBC931X            806
-+#define MACH_TYPE_CENTIPAD             807
-+#define MACH_TYPE_ARMSOC               808
-+#define MACH_TYPE_SE4200               809
-+#define MACH_TYPE_EMS197A              810
-+#define MACH_TYPE_MICRO9               811
-+#define MACH_TYPE_MICRO9L              812
-+#define MACH_TYPE_UC5471DSP            813
-+#define MACH_TYPE_SJ5471ENG            814
-+#define MACH_TYPE_CMPXA26X             815
-+#define MACH_TYPE_NC                   816
-+#define MACH_TYPE_OMAP_PALMTE          817
-+#define MACH_TYPE_AJAX52X              818
-+#define MACH_TYPE_SIRIUSTAR            819
-+#define MACH_TYPE_IODATA_HDLG          820
-+#define MACH_TYPE_AT91RM9200UTL        821
-+#define MACH_TYPE_BIOSAFE              822
-+#define MACH_TYPE_MP1000               823
-+#define MACH_TYPE_PARSY                824
-+#define MACH_TYPE_CCXP                 825
-+#define MACH_TYPE_OMAP_GSAMPLE         826
-+#define MACH_TYPE_REALVIEW_EB          827
-+#define MACH_TYPE_SAMOA                828
-+#define MACH_TYPE_T3XSCALE             829
-+#define MACH_TYPE_I878                 830
-+#define MACH_TYPE_BORZOI               831
-+#define MACH_TYPE_GECKO                832
-+#define MACH_TYPE_DS101                833
-+#define MACH_TYPE_OMAP_PALMTT2         834
-+#define MACH_TYPE_XSCALE_PALMLD        835
-+#define MACH_TYPE_CC9C                 836
-+#define MACH_TYPE_SBC1670              837
-+#define MACH_TYPE_IXDP28X5             838
-+#define MACH_TYPE_OMAP_PALMTT          839
-+#define MACH_TYPE_ML696K               840
-+#define MACH_TYPE_ARCOM_ZEUS           841
-+#define MACH_TYPE_OSIRIS               842
-+#define MACH_TYPE_MAESTRO              843
-+#define MACH_TYPE_TUNGE2               844
-+#define MACH_TYPE_IXBBM                845
-+#define MACH_TYPE_MX27                 846
-+#define MACH_TYPE_AX8004               847
-+#define MACH_TYPE_AT91SAM9261EK        848
-+#define MACH_TYPE_LOFT                 849
-+#define MACH_TYPE_MAGPIE               850
-+#define MACH_TYPE_MX21                 851
-+#define MACH_TYPE_MB87M3400            852
-+#define MACH_TYPE_MGUARD_DELTA         853
-+#define MACH_TYPE_DAVINCI_DVDP         854
-+#define MACH_TYPE_HTCUNIVERSAL         855
-+#define MACH_TYPE_TPAD                 856
-+#define MACH_TYPE_ROVERP3              857
-+#define MACH_TYPE_JORNADA928           858
-+#define MACH_TYPE_MV88FXX81            859
-+#define MACH_TYPE_STMP36XX             860
-+#define MACH_TYPE_SXNI79524            861
-+#define MACH_TYPE_AMS_DELTA            862
-+#define MACH_TYPE_URANIUM              863
-+#define MACH_TYPE_UCON                 864
-+#define MACH_TYPE_NAS100D              865
-+#define MACH_TYPE_L083_1000            866
-+#define MACH_TYPE_EZX                  867
-+#define MACH_TYPE_PNX5220              868
-+#define MACH_TYPE_BUTTE                869
-+#define MACH_TYPE_SRM2                 870
-+#define MACH_TYPE_DSBR                 871
-+#define MACH_TYPE_CRYSTALBALL          872
-+#define MACH_TYPE_TINYPXA27X           873
-+#define MACH_TYPE_HERBIE               874
-+#define MACH_TYPE_MAGICIAN             875
-+#define MACH_TYPE_CM4002               876
-+#define MACH_TYPE_B4                   877
-+#define MACH_TYPE_MAUI                 878
-+#define MACH_TYPE_CYBERTRACKER_G       879
-+#define MACH_TYPE_NXDKN                880
-+#define MACH_TYPE_MIO8390              881
-+#define MACH_TYPE_OMI_BOARD            882
-+#define MACH_TYPE_MX21CIV              883
-+#define MACH_TYPE_MAHI_CDAC            884
-+#define MACH_TYPE_XSCALE_PALMTX        885
-+#define MACH_TYPE_S3C2413              887
-+#define MACH_TYPE_SAMSYS_EP0           888
-+#define MACH_TYPE_WG302V1              889
-+#define MACH_TYPE_WG302V2              890
-+#define MACH_TYPE_EB42X                891
-+#define MACH_TYPE_IQ331ES              892
-+#define MACH_TYPE_COSYDSP              893
-+#define MACH_TYPE_UPLAT7D              894
-+#define MACH_TYPE_PTDAVINCI            895
-+#define MACH_TYPE_MBUS                 896
-+#define MACH_TYPE_NADIA2VB             897
-+#define MACH_TYPE_R1000                898
-+#define MACH_TYPE_HW90250              899
-+#define MACH_TYPE_OMAP_2430SDP         900
-+#define MACH_TYPE_DAVINCI_EVM          901
-+#define MACH_TYPE_OMAP_TORNADO         902
-+#define MACH_TYPE_OLOCREEK             903
-+#define MACH_TYPE_PALMZ72              904
-+#define MACH_TYPE_NXDB500              905
-+#define MACH_TYPE_APF9328              906
-+#define MACH_TYPE_OMAP_WIPOQ           907
-+#define MACH_TYPE_OMAP_TWIP            908
-+#define MACH_TYPE_XSCALE_PALMTREO650   909
-+#define MACH_TYPE_ACUMEN               910
-+#define MACH_TYPE_XP100                911
-+#define MACH_TYPE_FS2410               912
-+#define MACH_TYPE_PXA270_CERF          913
-+#define MACH_TYPE_SQ2FTLPALM           914
-+#define MACH_TYPE_BSEMSERVER           915
-+#define MACH_TYPE_NETCLIENT            916
-+#define MACH_TYPE_XSCALE_PALMTT5       917
-+#define MACH_TYPE_OMAP_PALMTC          918
-+#define MACH_TYPE_OMAP_APOLLON         919
-+#define MACH_TYPE_MXC30030EVB          920
-+#define MACH_TYPE_REA_2D               921
-+#define MACH_TYPE_TI3E524              922
-+#define MACH_TYPE_ATEB9200             923
-+#define MACH_TYPE_AUCKLAND             924
-+#define MACH_TYPE_AK3320M              925
-+#define MACH_TYPE_DURAMAX              926
-+#define MACH_TYPE_N35                  927
-+#define MACH_TYPE_PRONGHORN            928
-+#define MACH_TYPE_FUNDY                929
-+#define MACH_TYPE_LOGICPD_PXA270       930
-+#define MACH_TYPE_CPU777               931
-+#define MACH_TYPE_SIMICON9201          932
-+#define MACH_TYPE_LEAP2_HPM            933
-+#define MACH_TYPE_CM922TXA10           934
-+#define MACH_TYPE_PXA                  935
-+#define MACH_TYPE_SANDGATE2            936
-+#define MACH_TYPE_SANDGATE2G           937
-+#define MACH_TYPE_SANDGATE2P           938
-+#define MACH_TYPE_FRED_JACK            939
-+#define MACH_TYPE_TTG_COLOR1           940
-+#define MACH_TYPE_NXEB500HMI           941
-+#define MACH_TYPE_NETDCU8              942
-+#define MACH_TYPE_ML675050_CPU_BOA     943
-+#define MACH_TYPE_NG_FVX538            944
-+#define MACH_TYPE_NG_FVS338            945
-+#define MACH_TYPE_PNX4103              946
-+#define MACH_TYPE_HESDB                947
-+#define MACH_TYPE_XSILO                948
-+#define MACH_TYPE_ESPRESSO             949
-+#define MACH_TYPE_EMLC                 950
-+#define MACH_TYPE_SISTERON             951
-+#define MACH_TYPE_RX1950               952
-+#define MACH_TYPE_TSC_VENUS            953
-+#define MACH_TYPE_DS101J               954
-+#define MACH_TYPE_MXC30030ADS          955
-+#define MACH_TYPE_FUJITSU_WIMAXSOC     956
-+#define MACH_TYPE_DUALPCMODEM          957
-+#define MACH_TYPE_GESBC9312            958
-+#define MACH_TYPE_HTCAPACHE            959
-+#define MACH_TYPE_IXDP435              960
-+#define MACH_TYPE_CATPROVT100          961
-+#define MACH_TYPE_PICOTUX1XX           962
-+#define MACH_TYPE_PICOTUX2XX           963
-+#define MACH_TYPE_DSMG600              964
-+#define MACH_TYPE_EMPC2                965
-+#define MACH_TYPE_VENTURA              966
-+#define MACH_TYPE_PHIDGET_SBC          967
-+#define MACH_TYPE_IJ3K                 968
-+#define MACH_TYPE_PISGAH               969
-+#define MACH_TYPE_OMAP_FSAMPLE         970
-+#define MACH_TYPE_SG720                971
-+#define MACH_TYPE_REDFOX               972
-+#define MACH_TYPE_MYSH_EP9315_1        973
-+#define MACH_TYPE_TPF106               974
-+#define MACH_TYPE_AT91RM9200KG         975
-+#define MACH_TYPE_SLEDB                976
-+#define MACH_TYPE_ONTRACK              977
-+#define MACH_TYPE_PM1200               978
-+#define MACH_TYPE_ESS24XXX             979
-+#define MACH_TYPE_COREMP7              980
-+#define MACH_TYPE_NEXCODER_6446        981
-+#define MACH_TYPE_STVC8380             982
-+#define MACH_TYPE_TEKLYNX              983
-+#define MACH_TYPE_CARBONADO            984
-+#define MACH_TYPE_SYSMOS_MP730         985
-+#define MACH_TYPE_SNAPPER_CL15         986
-+#define MACH_TYPE_PGIGIM               987
-+#define MACH_TYPE_PTX9160P2            988
-+#define MACH_TYPE_DCORE1               989
-+#define MACH_TYPE_VICTORPXA            990
-+#define MACH_TYPE_MX2DTB               991
-+#define MACH_TYPE_PXA_IREX_ER0100      992
-+#define MACH_TYPE_OMAP_PALMZ71         993
-+#define MACH_TYPE_BARTEC_DEG           994
-+#define MACH_TYPE_HW50251              995
-+#define MACH_TYPE_IBOX                 996
-+#define MACH_TYPE_ATLASLH7A404         997
-+#define MACH_TYPE_PT2026               998
-+#define MACH_TYPE_HTCALPINE            999
-+#define MACH_TYPE_BARTEC_VTU           1000
-+#define MACH_TYPE_VCOREII              1001
-+#define MACH_TYPE_PDNB3                1002
-+#define MACH_TYPE_HTCBEETLES           1003
-+#define MACH_TYPE_S3C6400              1004
-+#define MACH_TYPE_S3C2443              1005
-+#define MACH_TYPE_OMAP_LDK             1006
-+#define MACH_TYPE_SMDK2460             1007
-+#define MACH_TYPE_SMDK2440             1008
-+#define MACH_TYPE_SMDK2412             1009
-+#define MACH_TYPE_WEBBOX               1010
-+#define MACH_TYPE_CWWNDP               1011
-+#define MACH_TYPE_DRAGON               1012
-+#define MACH_TYPE_OPENDO_CPU_BOARD     1013
-+#define MACH_TYPE_CCM2200              1014
-+#define MACH_TYPE_ETWARM               1015
-+#define MACH_TYPE_M93030               1016
-+#define MACH_TYPE_CC7U                 1017
-+#define MACH_TYPE_MTT_RANGER           1018
-+#define MACH_TYPE_NEXUS                1019
-+#define MACH_TYPE_DESMAN               1020
-+#define MACH_TYPE_BKDE303              1021
-+#define MACH_TYPE_SMDK2413             1022
-+#define MACH_TYPE_AML_M7200            1023
-+#define MACH_TYPE_AML_M5900            1024
-+#define MACH_TYPE_SG640                1025
-+#define MACH_TYPE_EDG79524             1026
-+#define MACH_TYPE_AI2410               1027
-+#define MACH_TYPE_IXP465               1028
-+#define MACH_TYPE_BALLOON3             1029
-+#define MACH_TYPE_HEINS                1030
-+#define MACH_TYPE_MPLUSEVA             1031
-+#define MACH_TYPE_RT042                1032
-+#define MACH_TYPE_CWIEM                1033
-+#define MACH_TYPE_CM_X270              1034
-+#define MACH_TYPE_CM_X255              1035
-+#define MACH_TYPE_ESH_AT91             1036
-+#define MACH_TYPE_SANDGATE3            1037
-+#define MACH_TYPE_PRIMO                1038
-+#define MACH_TYPE_GEMSTONE             1039
-+#define MACH_TYPE_PRONGHORNMETRO       1040
-+#define MACH_TYPE_SIDEWINDER           1041
-+#define MACH_TYPE_PICOMOD1             1042
-+#define MACH_TYPE_SG590                1043
-+#define MACH_TYPE_AKAI9307             1044
-+#define MACH_TYPE_FONTAINE             1045
-+#define MACH_TYPE_WOMBAT               1046
-+#define MACH_TYPE_ACQ300               1047
-+#define MACH_TYPE_MOD_270              1048
-+#define MACH_TYPE_VC0820               1049
-+#define MACH_TYPE_ANI_AIM              1050
-+#define MACH_TYPE_JELLYFISH            1051
-+#define MACH_TYPE_AMANITA              1052
-+#define MACH_TYPE_VLINK                1053
- 
- #ifdef CONFIG_ARCH_EBSA110
- # ifdef machine_arch_type
-@@ -3540,9 +3865,9 @@
- # else
- #  define machine_arch_type	MACH_TYPE_RAMSES
- # endif
--# define machine_is_ramses()	(machine_arch_type == MACH_TYPE_RAMSES)
-+# define machine_is_mnci()	(machine_arch_type == MACH_TYPE_RAMSES)
- #else
--# define machine_is_ramses()	(0)
-+# define machine_is_mnci()	(0)
- #endif
- 
- #ifdef CONFIG_ARCH_S28X
-@@ -4500,9 +4825,9 @@
- # else
- #  define machine_arch_type	MACH_TYPE_M825XX
- # endif
--# define machine_is_m825xx()	(machine_arch_type == MACH_TYPE_M825XX)
-+# define machine_is_comcerto()	(machine_arch_type == MACH_TYPE_M825XX)
- #else
--# define machine_is_m825xx()	(0)
-+# define machine_is_comcerto()	(0)
- #endif
- 
- #ifdef CONFIG_SA1100_M7100
-@@ -5657,16 +5982,16 @@
- # define machine_is_xcep()	(0)
- #endif
- 
--#ifdef CONFIG_MACH_ARCOM_MERCURY
-+#ifdef CONFIG_MACH_ARCOM_VULCAN
- # ifdef machine_arch_type
- #  undef machine_arch_type
- #  define machine_arch_type	__machine_arch_type
- # else
--#  define machine_arch_type	MACH_TYPE_ARCOM_MERCURY
-+#  define machine_arch_type	MACH_TYPE_ARCOM_VULCAN
- # endif
--# define machine_is_arcom_mercury()	(machine_arch_type == MACH_TYPE_ARCOM_MERCURY)
-+# define machine_is_arcom_vulcan()	(machine_arch_type == MACH_TYPE_ARCOM_VULCAN)
- #else
--# define machine_is_arcom_mercury()	(0)
-+# define machine_is_arcom_vulcan()	(0)
- #endif
- 
- #ifdef CONFIG_MACH_STARGATE
-@@ -6053,16 +6378,16 @@
- # define machine_is_ess710()	(0)
- #endif
- 
--#ifdef CONFIG_MACH_MX3ADS
-+#ifdef CONFIG_MACH_MX31ADS
- # ifdef machine_arch_type
- #  undef machine_arch_type
- #  define machine_arch_type	__machine_arch_type
- # else
--#  define machine_arch_type	MACH_TYPE_MX3ADS
-+#  define machine_arch_type	MACH_TYPE_MX31ADS
- # endif
--# define machine_is_mx3ads()	(machine_arch_type == MACH_TYPE_MX3ADS)
-+# define machine_is_mx31ads()	(machine_arch_type == MACH_TYPE_MX31ADS)
- #else
--# define machine_is_mx3ads()	(0)
-+# define machine_is_mx31ads()	(0)
- #endif
- 
- #ifdef CONFIG_MACH_HIMALAYA
-@@ -7325,28 +7650,28 @@
- # define machine_is_saturn()	(0)
- #endif
- 
--#ifdef CONFIG_MACH_ARGONPLUSEVB
-+#ifdef CONFIG_MACH_I30030EVB
- # ifdef machine_arch_type
- #  undef machine_arch_type
- #  define machine_arch_type	__machine_arch_type
- # else
--#  define machine_arch_type	MACH_TYPE_ARGONPLUSEVB
-+#  define machine_arch_type	MACH_TYPE_I30030EVB
- # endif
--# define machine_is_argonplusevb()	(machine_arch_type == MACH_TYPE_ARGONPLUSEVB)
-+# define machine_is_i30030evb()	(machine_arch_type == MACH_TYPE_I30030EVB)
- #else
--# define machine_is_argonplusevb()	(0)
-+# define machine_is_i30030evb()	(0)
- #endif
- 
--#ifdef CONFIG_MACH_SCMA11EVB
-+#ifdef CONFIG_MACH_MXC27530EVB
- # ifdef machine_arch_type
- #  undef machine_arch_type
- #  define machine_arch_type	__machine_arch_type
- # else
--#  define machine_arch_type	MACH_TYPE_SCMA11EVB
-+#  define machine_arch_type	MACH_TYPE_MXC27530EVB
- # endif
--# define machine_is_scma11evb()	(machine_arch_type == MACH_TYPE_SCMA11EVB)
-+# define machine_is_mxc27530evb()	(machine_arch_type == MACH_TYPE_MXC27530EVB)
- #else
--# define machine_is_scma11evb()	(0)
-+# define machine_is_mxc27530evb()	(0)
- #endif
- 
- #ifdef CONFIG_MACH_SMDK2800
-@@ -8297,16 +8622,16 @@
- # define machine_is_hrdisplay()	(0)
- #endif
- 
--#ifdef CONFIG_MACH_SCMA11BB
-+#ifdef CONFIG_MACH_MXC27530ADS
- # ifdef machine_arch_type
- #  undef machine_arch_type
- #  define machine_arch_type	__machine_arch_type
- # else
--#  define machine_arch_type	MACH_TYPE_SCMA11BB
-+#  define machine_arch_type	MACH_TYPE_MXC27530ADS
- # endif
--# define machine_is_scma11bb()	(machine_arch_type == MACH_TYPE_SCMA11BB)
-+# define machine_is_mxc27530ads()	(machine_arch_type == MACH_TYPE_MXC27530ADS)
- #else
--# define machine_is_scma11bb()	(0)
-+# define machine_is_mxc27530ads()	(0)
- #endif
- 
- #ifdef CONFIG_MACH_TRIZEPS3
-@@ -9185,16 +9510,16 @@
- # define machine_is_hx2750()	(0)
- #endif
- 
--#ifdef CONFIG_MACH_ZEUSEVB
-+#ifdef CONFIG_MACH_MXC91131EVB
- # ifdef machine_arch_type
- #  undef machine_arch_type
- #  define machine_arch_type	__machine_arch_type
- # else
--#  define machine_arch_type	MACH_TYPE_ZEUSEVB
-+#  define machine_arch_type	MACH_TYPE_MXC91131EVB
- # endif
--# define machine_is_zeusevb()	(machine_arch_type == MACH_TYPE_ZEUSEVB)
-+# define machine_is_mxc91131evb()	(machine_arch_type == MACH_TYPE_MXC91131EVB)
- #else
--# define machine_is_zeusevb()	(0)
-+# define machine_is_mxc91131evb()	(0)
- #endif
- 
- #ifdef CONFIG_MACH_P700
-@@ -9401,6 +9726,3906 @@
- # define machine_is_mp2usb()	(0)
- #endif
- 
-+#ifdef CONFIG_MACH_NTNP425C
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_NTNP425C
-+# endif
-+# define machine_is_ntnp425c()	(machine_arch_type == MACH_TYPE_NTNP425C)
-+#else
-+# define machine_is_ntnp425c()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_COLIBRI
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_COLIBRI
-+# endif
-+# define machine_is_colibri()	(machine_arch_type == MACH_TYPE_COLIBRI)
-+#else
-+# define machine_is_colibri()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_PCM7220
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_PCM7220
-+# endif
-+# define machine_is_pcm7220()	(machine_arch_type == MACH_TYPE_PCM7220)
-+#else
-+# define machine_is_pcm7220()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_GATEWAY7001
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_GATEWAY7001
-+# endif
-+# define machine_is_gateway7001()	(machine_arch_type == MACH_TYPE_GATEWAY7001)
-+#else
-+# define machine_is_gateway7001()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_PCM027
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_PCM027
-+# endif
-+# define machine_is_pcm027()	(machine_arch_type == MACH_TYPE_PCM027)
-+#else
-+# define machine_is_pcm027()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_CMPXA
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_CMPXA
-+# endif
-+# define machine_is_cmpxa()	(machine_arch_type == MACH_TYPE_CMPXA)
-+#else
-+# define machine_is_cmpxa()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_ANUBIS
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_ANUBIS
-+# endif
-+# define machine_is_anubis()	(machine_arch_type == MACH_TYPE_ANUBIS)
-+#else
-+# define machine_is_anubis()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_ITE8152
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_ITE8152
-+# endif
-+# define machine_is_ite8152()	(machine_arch_type == MACH_TYPE_ITE8152)
-+#else
-+# define machine_is_ite8152()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_LPC3XXX
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_LPC3XXX
-+# endif
-+# define machine_is_lpc3xxx()	(machine_arch_type == MACH_TYPE_LPC3XXX)
-+#else
-+# define machine_is_lpc3xxx()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_PUPPETEER
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_PUPPETEER
-+# endif
-+# define machine_is_puppeteer()	(machine_arch_type == MACH_TYPE_PUPPETEER)
-+#else
-+# define machine_is_puppeteer()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_MACH_VADATECH
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_MACH_VADATECH
-+# endif
-+# define machine_is_vt001()	(machine_arch_type == MACH_TYPE_MACH_VADATECH)
-+#else
-+# define machine_is_vt001()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_E570
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_E570
-+# endif
-+# define machine_is_e570()	(machine_arch_type == MACH_TYPE_E570)
-+#else
-+# define machine_is_e570()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_X50
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_X50
-+# endif
-+# define machine_is_x50()	(machine_arch_type == MACH_TYPE_X50)
-+#else
-+# define machine_is_x50()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_RECON
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_RECON
-+# endif
-+# define machine_is_recon()	(machine_arch_type == MACH_TYPE_RECON)
-+#else
-+# define machine_is_recon()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_XBOARDGP8
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_XBOARDGP8
-+# endif
-+# define machine_is_xboardgp8()	(machine_arch_type == MACH_TYPE_XBOARDGP8)
-+#else
-+# define machine_is_xboardgp8()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_FPIC2
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_FPIC2
-+# endif
-+# define machine_is_fpic2()	(machine_arch_type == MACH_TYPE_FPIC2)
-+#else
-+# define machine_is_fpic2()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_AKITA
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_AKITA
-+# endif
-+# define machine_is_akita()	(machine_arch_type == MACH_TYPE_AKITA)
-+#else
-+# define machine_is_akita()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_A81
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_A81
-+# endif
-+# define machine_is_a81()	(machine_arch_type == MACH_TYPE_A81)
-+#else
-+# define machine_is_a81()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_SVM_SC25X
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_SVM_SC25X
-+# endif
-+# define machine_is_svm_sc25x()	(machine_arch_type == MACH_TYPE_SVM_SC25X)
-+#else
-+# define machine_is_svm_sc25x()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_VADATECH020
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_VADATECH020
-+# endif
-+# define machine_is_vt020()	(machine_arch_type == MACH_TYPE_VADATECH020)
-+#else
-+# define machine_is_vt020()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_TLI
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_TLI
-+# endif
-+# define machine_is_tli()	(machine_arch_type == MACH_TYPE_TLI)
-+#else
-+# define machine_is_tli()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_EDB9315LC
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_EDB9315LC
-+# endif
-+# define machine_is_edb9315lc()	(machine_arch_type == MACH_TYPE_EDB9315LC)
-+#else
-+# define machine_is_edb9315lc()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_PASSEC
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_PASSEC
-+# endif
-+# define machine_is_passec()	(machine_arch_type == MACH_TYPE_PASSEC)
-+#else
-+# define machine_is_passec()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_DS_TIGER
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_DS_TIGER
-+# endif
-+# define machine_is_ds_tiger()	(machine_arch_type == MACH_TYPE_DS_TIGER)
-+#else
-+# define machine_is_ds_tiger()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_E310
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_E310
-+# endif
-+# define machine_is_e310()	(machine_arch_type == MACH_TYPE_E310)
-+#else
-+# define machine_is_e310()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_E330
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_E330
-+# endif
-+# define machine_is_e330()	(machine_arch_type == MACH_TYPE_E330)
-+#else
-+# define machine_is_e330()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_RT3000
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_RT3000
-+# endif
-+# define machine_is_rt3000()	(machine_arch_type == MACH_TYPE_RT3000)
-+#else
-+# define machine_is_rt3000()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_NOKIA770
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_NOKIA770
-+# endif
-+# define machine_is_nokia770()	(machine_arch_type == MACH_TYPE_NOKIA770)
-+#else
-+# define machine_is_nokia770()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_PNX0106
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_PNX0106
-+# endif
-+# define machine_is_pnx0106()	(machine_arch_type == MACH_TYPE_PNX0106)
-+#else
-+# define machine_is_pnx0106()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_HX21XX
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_HX21XX
-+# endif
-+# define machine_is_hx21xx()	(machine_arch_type == MACH_TYPE_HX21XX)
-+#else
-+# define machine_is_hx21xx()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_FARADAY
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_FARADAY
-+# endif
-+# define machine_is_faraday()	(machine_arch_type == MACH_TYPE_FARADAY)
-+#else
-+# define machine_is_faraday()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_SBC9312
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_SBC9312
-+# endif
-+# define machine_is_sbc9312()	(machine_arch_type == MACH_TYPE_SBC9312)
-+#else
-+# define machine_is_sbc9312()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_BATMAN
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_BATMAN
-+# endif
-+# define machine_is_batman()	(machine_arch_type == MACH_TYPE_BATMAN)
-+#else
-+# define machine_is_batman()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_JPD201
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_JPD201
-+# endif
-+# define machine_is_jpd201()	(machine_arch_type == MACH_TYPE_JPD201)
-+#else
-+# define machine_is_jpd201()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_MIPSA
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_MIPSA
-+# endif
-+# define machine_is_mipsa()	(machine_arch_type == MACH_TYPE_MIPSA)
-+#else
-+# define machine_is_mipsa()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_KACOM
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_KACOM
-+# endif
-+# define machine_is_kacom()	(machine_arch_type == MACH_TYPE_KACOM)
-+#else
-+# define machine_is_kacom()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_SWARCOCPU
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_SWARCOCPU
-+# endif
-+# define machine_is_swarcocpu()	(machine_arch_type == MACH_TYPE_SWARCOCPU)
-+#else
-+# define machine_is_swarcocpu()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_SWARCODSL
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_SWARCODSL
-+# endif
-+# define machine_is_swarcodsl()	(machine_arch_type == MACH_TYPE_SWARCODSL)
-+#else
-+# define machine_is_swarcodsl()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_BLUEANGEL
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_BLUEANGEL
-+# endif
-+# define machine_is_blueangel()	(machine_arch_type == MACH_TYPE_BLUEANGEL)
-+#else
-+# define machine_is_blueangel()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_HAIRYGRAMA
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_HAIRYGRAMA
-+# endif
-+# define machine_is_hairygrama()	(machine_arch_type == MACH_TYPE_HAIRYGRAMA)
-+#else
-+# define machine_is_hairygrama()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_BANFF
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_BANFF
-+# endif
-+# define machine_is_banff()	(machine_arch_type == MACH_TYPE_BANFF)
-+#else
-+# define machine_is_banff()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_CARMEVA
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_CARMEVA
-+# endif
-+# define machine_is_carmeva()	(machine_arch_type == MACH_TYPE_CARMEVA)
-+#else
-+# define machine_is_carmeva()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_SAM255
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_SAM255
-+# endif
-+# define machine_is_sam255()	(machine_arch_type == MACH_TYPE_SAM255)
-+#else
-+# define machine_is_sam255()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_PPM10
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_PPM10
-+# endif
-+# define machine_is_ppm10()	(machine_arch_type == MACH_TYPE_PPM10)
-+#else
-+# define machine_is_ppm10()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_EDB9315A
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_EDB9315A
-+# endif
-+# define machine_is_edb9315a()	(machine_arch_type == MACH_TYPE_EDB9315A)
-+#else
-+# define machine_is_edb9315a()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_SUNSET
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_SUNSET
-+# endif
-+# define machine_is_sunset()	(machine_arch_type == MACH_TYPE_SUNSET)
-+#else
-+# define machine_is_sunset()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_STARGATE2
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_STARGATE2
-+# endif
-+# define machine_is_stargate2()	(machine_arch_type == MACH_TYPE_STARGATE2)
-+#else
-+# define machine_is_stargate2()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_INTELMOTE2
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_INTELMOTE2
-+# endif
-+# define machine_is_intelmote2()	(machine_arch_type == MACH_TYPE_INTELMOTE2)
-+#else
-+# define machine_is_intelmote2()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_TRIZEPS4
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_TRIZEPS4
-+# endif
-+# define machine_is_trizeps4()	(machine_arch_type == MACH_TYPE_TRIZEPS4)
-+#else
-+# define machine_is_trizeps4()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_MAINSTONE2
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_MAINSTONE2
-+# endif
-+# define machine_is_mainstone2()	(machine_arch_type == MACH_TYPE_MAINSTONE2)
-+#else
-+# define machine_is_mainstone2()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_EZ_IXP42X
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_EZ_IXP42X
-+# endif
-+# define machine_is_ez_ixp42x()	(machine_arch_type == MACH_TYPE_EZ_IXP42X)
-+#else
-+# define machine_is_ez_ixp42x()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_TAPWAVE_ZODIAC
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_TAPWAVE_ZODIAC
-+# endif
-+# define machine_is_tapwave_zodiac()	(machine_arch_type == MACH_TYPE_TAPWAVE_ZODIAC)
-+#else
-+# define machine_is_tapwave_zodiac()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_UNIVERSALMETER
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_UNIVERSALMETER
-+# endif
-+# define machine_is_universalmeter()	(machine_arch_type == MACH_TYPE_UNIVERSALMETER)
-+#else
-+# define machine_is_universalmeter()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_HICOARM9
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_HICOARM9
-+# endif
-+# define machine_is_hicoarm9()	(machine_arch_type == MACH_TYPE_HICOARM9)
-+#else
-+# define machine_is_hicoarm9()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_PNX4008
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_PNX4008
-+# endif
-+# define machine_is_pnx4008()	(machine_arch_type == MACH_TYPE_PNX4008)
-+#else
-+# define machine_is_pnx4008()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_KWS6000
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_KWS6000
-+# endif
-+# define machine_is_kws6000()	(machine_arch_type == MACH_TYPE_KWS6000)
-+#else
-+# define machine_is_kws6000()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_PORTUX920T
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_PORTUX920T
-+# endif
-+# define machine_is_portux920t()	(machine_arch_type == MACH_TYPE_PORTUX920T)
-+#else
-+# define machine_is_portux920t()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_EZ_X5
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_EZ_X5
-+# endif
-+# define machine_is_ez_x5()	(machine_arch_type == MACH_TYPE_EZ_X5)
-+#else
-+# define machine_is_ez_x5()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_OMAP_RUDOLPH
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_OMAP_RUDOLPH
-+# endif
-+# define machine_is_omap_rudolph()	(machine_arch_type == MACH_TYPE_OMAP_RUDOLPH)
-+#else
-+# define machine_is_omap_rudolph()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_CPUAT91
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_CPUAT91
-+# endif
-+# define machine_is_cpuat91()	(machine_arch_type == MACH_TYPE_CPUAT91)
-+#else
-+# define machine_is_cpuat91()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_REA9200
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_REA9200
-+# endif
-+# define machine_is_rea9200()	(machine_arch_type == MACH_TYPE_REA9200)
-+#else
-+# define machine_is_rea9200()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_ACTS_PUNE_SA1110
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_ACTS_PUNE_SA1110
-+# endif
-+# define machine_is_acts_pune_sa1110()	(machine_arch_type == MACH_TYPE_ACTS_PUNE_SA1110)
-+#else
-+# define machine_is_acts_pune_sa1110()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_IXP425
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_IXP425
-+# endif
-+# define machine_is_ixp425()	(machine_arch_type == MACH_TYPE_IXP425)
-+#else
-+# define machine_is_ixp425()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_I30030ADS
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_I30030ADS
-+# endif
-+# define machine_is_i30030ads()	(machine_arch_type == MACH_TYPE_I30030ADS)
-+#else
-+# define machine_is_i30030ads()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_PERCH
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_PERCH
-+# endif
-+# define machine_is_perch()	(machine_arch_type == MACH_TYPE_PERCH)
-+#else
-+# define machine_is_perch()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_EIS05R1
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_EIS05R1
-+# endif
-+# define machine_is_eis05r1()	(machine_arch_type == MACH_TYPE_EIS05R1)
-+#else
-+# define machine_is_eis05r1()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_PEPPERPAD
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_PEPPERPAD
-+# endif
-+# define machine_is_pepperpad()	(machine_arch_type == MACH_TYPE_PEPPERPAD)
-+#else
-+# define machine_is_pepperpad()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_SB3010
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_SB3010
-+# endif
-+# define machine_is_sb3010()	(machine_arch_type == MACH_TYPE_SB3010)
-+#else
-+# define machine_is_sb3010()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_RM9200
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_RM9200
-+# endif
-+# define machine_is_rm9200()	(machine_arch_type == MACH_TYPE_RM9200)
-+#else
-+# define machine_is_rm9200()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_DMA03
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_DMA03
-+# endif
-+# define machine_is_dma03()	(machine_arch_type == MACH_TYPE_DMA03)
-+#else
-+# define machine_is_dma03()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_ROAD_S101
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_ROAD_S101
-+# endif
-+# define machine_is_road_s101()	(machine_arch_type == MACH_TYPE_ROAD_S101)
-+#else
-+# define machine_is_road_s101()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_IQ_NEXTGEN_A
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_IQ_NEXTGEN_A
-+# endif
-+# define machine_is_iq_nextgen_a()	(machine_arch_type == MACH_TYPE_IQ_NEXTGEN_A)
-+#else
-+# define machine_is_iq_nextgen_a()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_IQ_NEXTGEN_B
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_IQ_NEXTGEN_B
-+# endif
-+# define machine_is_iq_nextgen_b()	(machine_arch_type == MACH_TYPE_IQ_NEXTGEN_B)
-+#else
-+# define machine_is_iq_nextgen_b()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_IQ_NEXTGEN_C
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_IQ_NEXTGEN_C
-+# endif
-+# define machine_is_iq_nextgen_c()	(machine_arch_type == MACH_TYPE_IQ_NEXTGEN_C)
-+#else
-+# define machine_is_iq_nextgen_c()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_IQ_NEXTGEN_D
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_IQ_NEXTGEN_D
-+# endif
-+# define machine_is_iq_nextgen_d()	(machine_arch_type == MACH_TYPE_IQ_NEXTGEN_D)
-+#else
-+# define machine_is_iq_nextgen_d()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_IQ_NEXTGEN_E
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_IQ_NEXTGEN_E
-+# endif
-+# define machine_is_iq_nextgen_e()	(machine_arch_type == MACH_TYPE_IQ_NEXTGEN_E)
-+#else
-+# define machine_is_iq_nextgen_e()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_MALLOW_AT91
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_MALLOW_AT91
-+# endif
-+# define machine_is_mallow_at91()	(machine_arch_type == MACH_TYPE_MALLOW_AT91)
-+#else
-+# define machine_is_mallow_at91()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_CYBERTRACKER_I
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_CYBERTRACKER_I
-+# endif
-+# define machine_is_cybertracker_i()	(machine_arch_type == MACH_TYPE_CYBERTRACKER_I)
-+#else
-+# define machine_is_cybertracker_i()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_GESBC931X
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_GESBC931X
-+# endif
-+# define machine_is_gesbc931x()	(machine_arch_type == MACH_TYPE_GESBC931X)
-+#else
-+# define machine_is_gesbc931x()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_CENTIPAD
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_CENTIPAD
-+# endif
-+# define machine_is_centipad()	(machine_arch_type == MACH_TYPE_CENTIPAD)
-+#else
-+# define machine_is_centipad()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_ARMSOC
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_ARMSOC
-+# endif
-+# define machine_is_armsoc()	(machine_arch_type == MACH_TYPE_ARMSOC)
-+#else
-+# define machine_is_armsoc()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_SE4200
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_SE4200
-+# endif
-+# define machine_is_se4200()	(machine_arch_type == MACH_TYPE_SE4200)
-+#else
-+# define machine_is_se4200()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_EMS197A
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_EMS197A
-+# endif
-+# define machine_is_ems197a()	(machine_arch_type == MACH_TYPE_EMS197A)
-+#else
-+# define machine_is_ems197a()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_MICRO9
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_MICRO9
-+# endif
-+# define machine_is_micro9()	(machine_arch_type == MACH_TYPE_MICRO9)
-+#else
-+# define machine_is_micro9()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_MICRO9L
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_MICRO9L
-+# endif
-+# define machine_is_micro9l()	(machine_arch_type == MACH_TYPE_MICRO9L)
-+#else
-+# define machine_is_micro9l()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_UC5471DSP
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_UC5471DSP
-+# endif
-+# define machine_is_uc5471dsp()	(machine_arch_type == MACH_TYPE_UC5471DSP)
-+#else
-+# define machine_is_uc5471dsp()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_SJ5471ENG
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_SJ5471ENG
-+# endif
-+# define machine_is_sj5471eng()	(machine_arch_type == MACH_TYPE_SJ5471ENG)
-+#else
-+# define machine_is_sj5471eng()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_CMPXA26X
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_CMPXA26X
-+# endif
-+# define machine_is_none()	(machine_arch_type == MACH_TYPE_CMPXA26X)
-+#else
-+# define machine_is_none()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_NC
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_NC
-+# endif
-+# define machine_is_nc1()	(machine_arch_type == MACH_TYPE_NC)
-+#else
-+# define machine_is_nc1()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_OMAP_PALMTE
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_OMAP_PALMTE
-+# endif
-+# define machine_is_omap_palmte()	(machine_arch_type == MACH_TYPE_OMAP_PALMTE)
-+#else
-+# define machine_is_omap_palmte()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_AJAX52X
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_AJAX52X
-+# endif
-+# define machine_is_ajax52x()	(machine_arch_type == MACH_TYPE_AJAX52X)
-+#else
-+# define machine_is_ajax52x()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_SIRIUSTAR
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_SIRIUSTAR
-+# endif
-+# define machine_is_siriustar()	(machine_arch_type == MACH_TYPE_SIRIUSTAR)
-+#else
-+# define machine_is_siriustar()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_IODATA_HDLG
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_IODATA_HDLG
-+# endif
-+# define machine_is_iodata_hdlg()	(machine_arch_type == MACH_TYPE_IODATA_HDLG)
-+#else
-+# define machine_is_iodata_hdlg()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_AT91RM9200UTL
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_AT91RM9200UTL
-+# endif
-+# define machine_is_at91rm9200utl()	(machine_arch_type == MACH_TYPE_AT91RM9200UTL)
-+#else
-+# define machine_is_at91rm9200utl()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_BIOSAFE
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_BIOSAFE
-+# endif
-+# define machine_is_biosafe()	(machine_arch_type == MACH_TYPE_BIOSAFE)
-+#else
-+# define machine_is_biosafe()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_MP1000
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_MP1000
-+# endif
-+# define machine_is_mp1000()	(machine_arch_type == MACH_TYPE_MP1000)
-+#else
-+# define machine_is_mp1000()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_PARSY
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_PARSY
-+# endif
-+# define machine_is_parsy()	(machine_arch_type == MACH_TYPE_PARSY)
-+#else
-+# define machine_is_parsy()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_CCXP
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_CCXP
-+# endif
-+# define machine_is_ccxp270()	(machine_arch_type == MACH_TYPE_CCXP)
-+#else
-+# define machine_is_ccxp270()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_OMAP_GSAMPLE
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_OMAP_GSAMPLE
-+# endif
-+# define machine_is_omap_gsample()	(machine_arch_type == MACH_TYPE_OMAP_GSAMPLE)
-+#else
-+# define machine_is_omap_gsample()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_REALVIEW_EB
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_REALVIEW_EB
-+# endif
-+# define machine_is_realview_eb()	(machine_arch_type == MACH_TYPE_REALVIEW_EB)
-+#else
-+# define machine_is_realview_eb()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_SAMOA
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_SAMOA
-+# endif
-+# define machine_is_samoa()	(machine_arch_type == MACH_TYPE_SAMOA)
-+#else
-+# define machine_is_samoa()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_T3XSCALE
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_T3XSCALE
-+# endif
-+# define machine_is_t3xscale()	(machine_arch_type == MACH_TYPE_T3XSCALE)
-+#else
-+# define machine_is_t3xscale()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_I878
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_I878
-+# endif
-+# define machine_is_i878()	(machine_arch_type == MACH_TYPE_I878)
-+#else
-+# define machine_is_i878()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_BORZOI
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_BORZOI
-+# endif
-+# define machine_is_borzoi()	(machine_arch_type == MACH_TYPE_BORZOI)
-+#else
-+# define machine_is_borzoi()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_GECKO
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_GECKO
-+# endif
-+# define machine_is_gecko()	(machine_arch_type == MACH_TYPE_GECKO)
-+#else
-+# define machine_is_gecko()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_DS101
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_DS101
-+# endif
-+# define machine_is_ds101()	(machine_arch_type == MACH_TYPE_DS101)
-+#else
-+# define machine_is_ds101()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_OMAP_PALMTT2
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_OMAP_PALMTT2
-+# endif
-+# define machine_is_omap_palmtt2()	(machine_arch_type == MACH_TYPE_OMAP_PALMTT2)
-+#else
-+# define machine_is_omap_palmtt2()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_XSCALE_PALMLD
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_XSCALE_PALMLD
-+# endif
-+# define machine_is_xscale_palmld()	(machine_arch_type == MACH_TYPE_XSCALE_PALMLD)
-+#else
-+# define machine_is_xscale_palmld()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_CC9C
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_CC9C
-+# endif
-+# define machine_is_cc9c()	(machine_arch_type == MACH_TYPE_CC9C)
-+#else
-+# define machine_is_cc9c()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_SBC1670
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_SBC1670
-+# endif
-+# define machine_is_sbc1670()	(machine_arch_type == MACH_TYPE_SBC1670)
-+#else
-+# define machine_is_sbc1670()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_IXDP28X5
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_IXDP28X5
-+# endif
-+# define machine_is_ixdp28x5()	(machine_arch_type == MACH_TYPE_IXDP28X5)
-+#else
-+# define machine_is_ixdp28x5()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_OMAP_PALMTT
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_OMAP_PALMTT
-+# endif
-+# define machine_is_omap_palmtt()	(machine_arch_type == MACH_TYPE_OMAP_PALMTT)
-+#else
-+# define machine_is_omap_palmtt()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_ML696K
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_ML696K
-+# endif
-+# define machine_is_ml696k()	(machine_arch_type == MACH_TYPE_ML696K)
-+#else
-+# define machine_is_ml696k()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_ARCOM_ZEUS
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_ARCOM_ZEUS
-+# endif
-+# define machine_is_arcom_zeus()	(machine_arch_type == MACH_TYPE_ARCOM_ZEUS)
-+#else
-+# define machine_is_arcom_zeus()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_OSIRIS
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_OSIRIS
-+# endif
-+# define machine_is_osiris()	(machine_arch_type == MACH_TYPE_OSIRIS)
-+#else
-+# define machine_is_osiris()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_MAESTRO
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_MAESTRO
-+# endif
-+# define machine_is_maestro()	(machine_arch_type == MACH_TYPE_MAESTRO)
-+#else
-+# define machine_is_maestro()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_TUNGE2
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_TUNGE2
-+# endif
-+# define machine_is_tunge2()	(machine_arch_type == MACH_TYPE_TUNGE2)
-+#else
-+# define machine_is_tunge2()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_IXBBM
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_IXBBM
-+# endif
-+# define machine_is_ixbbm()	(machine_arch_type == MACH_TYPE_IXBBM)
-+#else
-+# define machine_is_ixbbm()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_MX27
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_MX27
-+# endif
-+# define machine_is_mx27ads()	(machine_arch_type == MACH_TYPE_MX27)
-+#else
-+# define machine_is_mx27ads()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_AX8004
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_AX8004
-+# endif
-+# define machine_is_ax8004()	(machine_arch_type == MACH_TYPE_AX8004)
-+#else
-+# define machine_is_ax8004()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_AT91SAM9261EK
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_AT91SAM9261EK
-+# endif
-+# define machine_is_at91sam9261ek()	(machine_arch_type == MACH_TYPE_AT91SAM9261EK)
-+#else
-+# define machine_is_at91sam9261ek()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_LOFT
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_LOFT
-+# endif
-+# define machine_is_loft()	(machine_arch_type == MACH_TYPE_LOFT)
-+#else
-+# define machine_is_loft()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_MAGPIE
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_MAGPIE
-+# endif
-+# define machine_is_magpie()	(machine_arch_type == MACH_TYPE_MAGPIE)
-+#else
-+# define machine_is_magpie()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_MX21
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_MX21
-+# endif
-+# define machine_is_mx21ads()	(machine_arch_type == MACH_TYPE_MX21)
-+#else
-+# define machine_is_mx21ads()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_MB87M3400
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_MB87M3400
-+# endif
-+# define machine_is_mb87m3400()	(machine_arch_type == MACH_TYPE_MB87M3400)
-+#else
-+# define machine_is_mb87m3400()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_MGUARD_DELTA
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_MGUARD_DELTA
-+# endif
-+# define machine_is_mguard_delta()	(machine_arch_type == MACH_TYPE_MGUARD_DELTA)
-+#else
-+# define machine_is_mguard_delta()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_DAVINCI_DVDP
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_DAVINCI_DVDP
-+# endif
-+# define machine_is_davinci_dvdp()	(machine_arch_type == MACH_TYPE_DAVINCI_DVDP)
-+#else
-+# define machine_is_davinci_dvdp()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_HTCUNIVERSAL
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_HTCUNIVERSAL
-+# endif
-+# define machine_is_htcuniversal()	(machine_arch_type == MACH_TYPE_HTCUNIVERSAL)
-+#else
-+# define machine_is_htcuniversal()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_TPAD
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_TPAD
-+# endif
-+# define machine_is_tpad()	(machine_arch_type == MACH_TYPE_TPAD)
-+#else
-+# define machine_is_tpad()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_ROVERP3
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_ROVERP3
-+# endif
-+# define machine_is_roverp3()	(machine_arch_type == MACH_TYPE_ROVERP3)
-+#else
-+# define machine_is_roverp3()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_JORNADA928
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_JORNADA928
-+# endif
-+# define machine_is_jornada928()	(machine_arch_type == MACH_TYPE_JORNADA928)
-+#else
-+# define machine_is_jornada928()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_MV88FXX81
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_MV88FXX81
-+# endif
-+# define machine_is_mv88fxx81()	(machine_arch_type == MACH_TYPE_MV88FXX81)
-+#else
-+# define machine_is_mv88fxx81()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_STMP36XX
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_STMP36XX
-+# endif
-+# define machine_is_stmp36xx()	(machine_arch_type == MACH_TYPE_STMP36XX)
-+#else
-+# define machine_is_stmp36xx()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_SXNI79524
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_SXNI79524
-+# endif
-+# define machine_is_sxni79524()	(machine_arch_type == MACH_TYPE_SXNI79524)
-+#else
-+# define machine_is_sxni79524()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_AMS_DELTA
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_AMS_DELTA
-+# endif
-+# define machine_is_ams_delta()	(machine_arch_type == MACH_TYPE_AMS_DELTA)
-+#else
-+# define machine_is_ams_delta()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_URANIUM
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_URANIUM
-+# endif
-+# define machine_is_uranium()	(machine_arch_type == MACH_TYPE_URANIUM)
-+#else
-+# define machine_is_uranium()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_UCON
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_UCON
-+# endif
-+# define machine_is_ucon()	(machine_arch_type == MACH_TYPE_UCON)
-+#else
-+# define machine_is_ucon()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_NAS100D
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_NAS100D
-+# endif
-+# define machine_is_nas100d()	(machine_arch_type == MACH_TYPE_NAS100D)
-+#else
-+# define machine_is_nas100d()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_L083_1000
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_L083_1000
-+# endif
-+# define machine_is_l083()	(machine_arch_type == MACH_TYPE_L083_1000)
-+#else
-+# define machine_is_l083()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_EZX
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_EZX
-+# endif
-+# define machine_is_ezx()	(machine_arch_type == MACH_TYPE_EZX)
-+#else
-+# define machine_is_ezx()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_PNX5220
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_PNX5220
-+# endif
-+# define machine_is_pnx5220()	(machine_arch_type == MACH_TYPE_PNX5220)
-+#else
-+# define machine_is_pnx5220()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_BUTTE
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_BUTTE
-+# endif
-+# define machine_is_butte()	(machine_arch_type == MACH_TYPE_BUTTE)
-+#else
-+# define machine_is_butte()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_SRM2
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_SRM2
-+# endif
-+# define machine_is_srm2()	(machine_arch_type == MACH_TYPE_SRM2)
-+#else
-+# define machine_is_srm2()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_DSBR
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_DSBR
-+# endif
-+# define machine_is_dsbr()	(machine_arch_type == MACH_TYPE_DSBR)
-+#else
-+# define machine_is_dsbr()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_CRYSTALBALL
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_CRYSTALBALL
-+# endif
-+# define machine_is_crystalball()	(machine_arch_type == MACH_TYPE_CRYSTALBALL)
-+#else
-+# define machine_is_crystalball()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_TINYPXA27X
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_TINYPXA27X
-+# endif
-+# define machine_is_tinypxa27x()	(machine_arch_type == MACH_TYPE_TINYPXA27X)
-+#else
-+# define machine_is_tinypxa27x()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_HERBIE
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_HERBIE
-+# endif
-+# define machine_is_herbie()	(machine_arch_type == MACH_TYPE_HERBIE)
-+#else
-+# define machine_is_herbie()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_MAGICIAN
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_MAGICIAN
-+# endif
-+# define machine_is_magician()	(machine_arch_type == MACH_TYPE_MAGICIAN)
-+#else
-+# define machine_is_magician()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_CM4002
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_CM4002
-+# endif
-+# define machine_is_cm4002()	(machine_arch_type == MACH_TYPE_CM4002)
-+#else
-+# define machine_is_cm4002()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_B4
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_B4
-+# endif
-+# define machine_is_b4()	(machine_arch_type == MACH_TYPE_B4)
-+#else
-+# define machine_is_b4()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_MAUI
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_MAUI
-+# endif
-+# define machine_is_maui()	(machine_arch_type == MACH_TYPE_MAUI)
-+#else
-+# define machine_is_maui()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_CYBERTRACKER_G
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_CYBERTRACKER_G
-+# endif
-+# define machine_is_cybertracker_g()	(machine_arch_type == MACH_TYPE_CYBERTRACKER_G)
-+#else
-+# define machine_is_cybertracker_g()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_NXDKN
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_NXDKN
-+# endif
-+# define machine_is_nxdkn()	(machine_arch_type == MACH_TYPE_NXDKN)
-+#else
-+# define machine_is_nxdkn()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_MIO8390
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_MIO8390
-+# endif
-+# define machine_is_mio8390()	(machine_arch_type == MACH_TYPE_MIO8390)
-+#else
-+# define machine_is_mio8390()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_OMI_BOARD
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_OMI_BOARD
-+# endif
-+# define machine_is_omi_board()	(machine_arch_type == MACH_TYPE_OMI_BOARD)
-+#else
-+# define machine_is_omi_board()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_MX21CIV
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_MX21CIV
-+# endif
-+# define machine_is_mx21civ()	(machine_arch_type == MACH_TYPE_MX21CIV)
-+#else
-+# define machine_is_mx21civ()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_MAHI_CDAC
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_MAHI_CDAC
-+# endif
-+# define machine_is_mahi_cdac()	(machine_arch_type == MACH_TYPE_MAHI_CDAC)
-+#else
-+# define machine_is_mahi_cdac()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_XSCALE_PALMTX
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_XSCALE_PALMTX
-+# endif
-+# define machine_is_xscale_palmtx()	(machine_arch_type == MACH_TYPE_XSCALE_PALMTX)
-+#else
-+# define machine_is_xscale_palmtx()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_S3C2413
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_S3C2413
-+# endif
-+# define machine_is_s3c2413()	(machine_arch_type == MACH_TYPE_S3C2413)
-+#else
-+# define machine_is_s3c2413()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_SAMSYS_EP0
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_SAMSYS_EP0
-+# endif
-+# define machine_is_samsys_ep0()	(machine_arch_type == MACH_TYPE_SAMSYS_EP0)
-+#else
-+# define machine_is_samsys_ep0()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_WG302V1
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_WG302V1
-+# endif
-+# define machine_is_wg302v1()	(machine_arch_type == MACH_TYPE_WG302V1)
-+#else
-+# define machine_is_wg302v1()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_WG302V2
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_WG302V2
-+# endif
-+# define machine_is_wg302v2()	(machine_arch_type == MACH_TYPE_WG302V2)
-+#else
-+# define machine_is_wg302v2()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_EB42X
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_EB42X
-+# endif
-+# define machine_is_eb42x()	(machine_arch_type == MACH_TYPE_EB42X)
-+#else
-+# define machine_is_eb42x()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_IQ331ES
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_IQ331ES
-+# endif
-+# define machine_is_iq331es()	(machine_arch_type == MACH_TYPE_IQ331ES)
-+#else
-+# define machine_is_iq331es()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_COSYDSP
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_COSYDSP
-+# endif
-+# define machine_is_cosydsp()	(machine_arch_type == MACH_TYPE_COSYDSP)
-+#else
-+# define machine_is_cosydsp()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_UPLAT7D
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_UPLAT7D
-+# endif
-+# define machine_is_uplat7d_proto()	(machine_arch_type == MACH_TYPE_UPLAT7D)
-+#else
-+# define machine_is_uplat7d_proto()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_PTDAVINCI
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_PTDAVINCI
-+# endif
-+# define machine_is_ptdavinci()	(machine_arch_type == MACH_TYPE_PTDAVINCI)
-+#else
-+# define machine_is_ptdavinci()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_MBUS
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_MBUS
-+# endif
-+# define machine_is_mbus()	(machine_arch_type == MACH_TYPE_MBUS)
-+#else
-+# define machine_is_mbus()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_NADIA2VB
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_NADIA2VB
-+# endif
-+# define machine_is_nadia2vb()	(machine_arch_type == MACH_TYPE_NADIA2VB)
-+#else
-+# define machine_is_nadia2vb()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_R1000
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_R1000
-+# endif
-+# define machine_is_r1000()	(machine_arch_type == MACH_TYPE_R1000)
-+#else
-+# define machine_is_r1000()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_HW90250
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_HW90250
-+# endif
-+# define machine_is_hw90250()	(machine_arch_type == MACH_TYPE_HW90250)
-+#else
-+# define machine_is_hw90250()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_OMAP_2430SDP
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_OMAP_2430SDP
-+# endif
-+# define machine_is_omap_2430sdp()	(machine_arch_type == MACH_TYPE_OMAP_2430SDP)
-+#else
-+# define machine_is_omap_2430sdp()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_DAVINCI_EVM
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_DAVINCI_EVM
-+# endif
-+# define machine_is_davinci_evm()	(machine_arch_type == MACH_TYPE_DAVINCI_EVM)
-+#else
-+# define machine_is_davinci_evm()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_OMAP_TORNADO
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_OMAP_TORNADO
-+# endif
-+# define machine_is_omap_tornado()	(machine_arch_type == MACH_TYPE_OMAP_TORNADO)
-+#else
-+# define machine_is_omap_tornado()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_OLOCREEK
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_OLOCREEK
-+# endif
-+# define machine_is_olocreek()	(machine_arch_type == MACH_TYPE_OLOCREEK)
-+#else
-+# define machine_is_olocreek()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_PALMZ72
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_PALMZ72
-+# endif
-+# define machine_is_palmz72()	(machine_arch_type == MACH_TYPE_PALMZ72)
-+#else
-+# define machine_is_palmz72()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_NXDB500
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_NXDB500
-+# endif
-+# define machine_is_nxdb500()	(machine_arch_type == MACH_TYPE_NXDB500)
-+#else
-+# define machine_is_nxdb500()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_APF9328
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_APF9328
-+# endif
-+# define machine_is_apf9328()	(machine_arch_type == MACH_TYPE_APF9328)
-+#else
-+# define machine_is_apf9328()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_OMAP_WIPOQ
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_OMAP_WIPOQ
-+# endif
-+# define machine_is_omap_wipoq()	(machine_arch_type == MACH_TYPE_OMAP_WIPOQ)
-+#else
-+# define machine_is_omap_wipoq()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_OMAP_TWIP
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_OMAP_TWIP
-+# endif
-+# define machine_is_omap_twip()	(machine_arch_type == MACH_TYPE_OMAP_TWIP)
-+#else
-+# define machine_is_omap_twip()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_XSCALE_PALMTREO650
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_XSCALE_PALMTREO650
-+# endif
-+# define machine_is_xscale_treo650()	(machine_arch_type == MACH_TYPE_XSCALE_PALMTREO650)
-+#else
-+# define machine_is_xscale_treo650()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_ACUMEN
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_ACUMEN
-+# endif
-+# define machine_is_acumen()	(machine_arch_type == MACH_TYPE_ACUMEN)
-+#else
-+# define machine_is_acumen()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_XP100
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_XP100
-+# endif
-+# define machine_is_xp100()	(machine_arch_type == MACH_TYPE_XP100)
-+#else
-+# define machine_is_xp100()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_FS2410
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_FS2410
-+# endif
-+# define machine_is_fs2410()	(machine_arch_type == MACH_TYPE_FS2410)
-+#else
-+# define machine_is_fs2410()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_PXA270_CERF
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_PXA270_CERF
-+# endif
-+# define machine_is_pxa270_cerf()	(machine_arch_type == MACH_TYPE_PXA270_CERF)
-+#else
-+# define machine_is_pxa270_cerf()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_SQ2FTLPALM
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_SQ2FTLPALM
-+# endif
-+# define machine_is_sq2ftlpalm()	(machine_arch_type == MACH_TYPE_SQ2FTLPALM)
-+#else
-+# define machine_is_sq2ftlpalm()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_BSEMSERVER
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_BSEMSERVER
-+# endif
-+# define machine_is_bsemserver()	(machine_arch_type == MACH_TYPE_BSEMSERVER)
-+#else
-+# define machine_is_bsemserver()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_NETCLIENT
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_NETCLIENT
-+# endif
-+# define machine_is_netclient()	(machine_arch_type == MACH_TYPE_NETCLIENT)
-+#else
-+# define machine_is_netclient()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_XSCALE_PALMTT5
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_XSCALE_PALMTT5
-+# endif
-+# define machine_is_xscale_palmtt5()	(machine_arch_type == MACH_TYPE_XSCALE_PALMTT5)
-+#else
-+# define machine_is_xscale_palmtt5()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_OMAP_PALMTC
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_OMAP_PALMTC
-+# endif
-+# define machine_is_xscale_palmtc()	(machine_arch_type == MACH_TYPE_OMAP_PALMTC)
-+#else
-+# define machine_is_xscale_palmtc()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_OMAP_APOLLON
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_OMAP_APOLLON
-+# endif
-+# define machine_is_omap_apollon()	(machine_arch_type == MACH_TYPE_OMAP_APOLLON)
-+#else
-+# define machine_is_omap_apollon()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_MXC30030EVB
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_MXC30030EVB
-+# endif
-+# define machine_is_mxc30030evb()	(machine_arch_type == MACH_TYPE_MXC30030EVB)
-+#else
-+# define machine_is_mxc30030evb()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_REA_2D
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_REA_2D
-+# endif
-+# define machine_is_rea_2d()	(machine_arch_type == MACH_TYPE_REA_2D)
-+#else
-+# define machine_is_rea_2d()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_TI3E524
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_TI3E524
-+# endif
-+# define machine_is_eti3e524()	(machine_arch_type == MACH_TYPE_TI3E524)
-+#else
-+# define machine_is_eti3e524()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_ATEB9200
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_ATEB9200
-+# endif
-+# define machine_is_ateb9200()	(machine_arch_type == MACH_TYPE_ATEB9200)
-+#else
-+# define machine_is_ateb9200()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_AUCKLAND
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_AUCKLAND
-+# endif
-+# define machine_is_auckland()	(machine_arch_type == MACH_TYPE_AUCKLAND)
-+#else
-+# define machine_is_auckland()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_AK3320M
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_AK3320M
-+# endif
-+# define machine_is_ak3220m()	(machine_arch_type == MACH_TYPE_AK3320M)
-+#else
-+# define machine_is_ak3220m()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_DURAMAX
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_DURAMAX
-+# endif
-+# define machine_is_duramax()	(machine_arch_type == MACH_TYPE_DURAMAX)
-+#else
-+# define machine_is_duramax()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_N35
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_N35
-+# endif
-+# define machine_is_n35()	(machine_arch_type == MACH_TYPE_N35)
-+#else
-+# define machine_is_n35()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_PRONGHORN
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_PRONGHORN
-+# endif
-+# define machine_is_pronghorn()	(machine_arch_type == MACH_TYPE_PRONGHORN)
-+#else
-+# define machine_is_pronghorn()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_FUNDY
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_FUNDY
-+# endif
-+# define machine_is_fundy()	(machine_arch_type == MACH_TYPE_FUNDY)
-+#else
-+# define machine_is_fundy()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_LOGICPD_PXA270
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_LOGICPD_PXA270
-+# endif
-+# define machine_is_logicpd_pxa270()	(machine_arch_type == MACH_TYPE_LOGICPD_PXA270)
-+#else
-+# define machine_is_logicpd_pxa270()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_CPU777
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_CPU777
-+# endif
-+# define machine_is_cpu777()	(machine_arch_type == MACH_TYPE_CPU777)
-+#else
-+# define machine_is_cpu777()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_SIMICON9201
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_SIMICON9201
-+# endif
-+# define machine_is_simicon9201()	(machine_arch_type == MACH_TYPE_SIMICON9201)
-+#else
-+# define machine_is_simicon9201()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_LEAP2_HPM
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_LEAP2_HPM
-+# endif
-+# define machine_is_leap2_hpm()	(machine_arch_type == MACH_TYPE_LEAP2_HPM)
-+#else
-+# define machine_is_leap2_hpm()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_CM922TXA10
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_CM922TXA10
-+# endif
-+# define machine_is_cm922txa10()	(machine_arch_type == MACH_TYPE_CM922TXA10)
-+#else
-+# define machine_is_cm922txa10()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_PXA
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_PXA
-+# endif
-+# define machine_is_sandgate()	(machine_arch_type == MACH_TYPE_PXA)
-+#else
-+# define machine_is_sandgate()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_SANDGATE2
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_SANDGATE2
-+# endif
-+# define machine_is_sandgate2()	(machine_arch_type == MACH_TYPE_SANDGATE2)
-+#else
-+# define machine_is_sandgate2()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_SANDGATE2G
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_SANDGATE2G
-+# endif
-+# define machine_is_sandgate2g()	(machine_arch_type == MACH_TYPE_SANDGATE2G)
-+#else
-+# define machine_is_sandgate2g()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_SANDGATE2P
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_SANDGATE2P
-+# endif
-+# define machine_is_sandgate2p()	(machine_arch_type == MACH_TYPE_SANDGATE2P)
-+#else
-+# define machine_is_sandgate2p()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_FRED_JACK
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_FRED_JACK
-+# endif
-+# define machine_is_fred_jack()	(machine_arch_type == MACH_TYPE_FRED_JACK)
-+#else
-+# define machine_is_fred_jack()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_TTG_COLOR1
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_TTG_COLOR1
-+# endif
-+# define machine_is_ttg_color1()	(machine_arch_type == MACH_TYPE_TTG_COLOR1)
-+#else
-+# define machine_is_ttg_color1()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_NXEB500HMI
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_NXEB500HMI
-+# endif
-+# define machine_is_nxeb500hmi()	(machine_arch_type == MACH_TYPE_NXEB500HMI)
-+#else
-+# define machine_is_nxeb500hmi()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_NETDCU8
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_NETDCU8
-+# endif
-+# define machine_is_netdcu8()	(machine_arch_type == MACH_TYPE_NETDCU8)
-+#else
-+# define machine_is_netdcu8()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_ML675050_CPU_BOA
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_ML675050_CPU_BOA
-+# endif
-+# define machine_is_ml675050_cpu_boa()	(machine_arch_type == MACH_TYPE_ML675050_CPU_BOA)
-+#else
-+# define machine_is_ml675050_cpu_boa()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_NG_FVX538
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_NG_FVX538
-+# endif
-+# define machine_is_ng_fvx538()	(machine_arch_type == MACH_TYPE_NG_FVX538)
-+#else
-+# define machine_is_ng_fvx538()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_NG_FVS338
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_NG_FVS338
-+# endif
-+# define machine_is_ng_fvs338()	(machine_arch_type == MACH_TYPE_NG_FVS338)
-+#else
-+# define machine_is_ng_fvs338()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_PNX4103
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_PNX4103
-+# endif
-+# define machine_is_pnx4103()	(machine_arch_type == MACH_TYPE_PNX4103)
-+#else
-+# define machine_is_pnx4103()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_HESDB
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_HESDB
-+# endif
-+# define machine_is_hesdb()	(machine_arch_type == MACH_TYPE_HESDB)
-+#else
-+# define machine_is_hesdb()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_XSILO
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_XSILO
-+# endif
-+# define machine_is_xsilo()	(machine_arch_type == MACH_TYPE_XSILO)
-+#else
-+# define machine_is_xsilo()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_ESPRESSO
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_ESPRESSO
-+# endif
-+# define machine_is_espresso()	(machine_arch_type == MACH_TYPE_ESPRESSO)
-+#else
-+# define machine_is_espresso()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_EMLC
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_EMLC
-+# endif
-+# define machine_is_emlc()	(machine_arch_type == MACH_TYPE_EMLC)
-+#else
-+# define machine_is_emlc()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_SISTERON
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_SISTERON
-+# endif
-+# define machine_is_sisteron()	(machine_arch_type == MACH_TYPE_SISTERON)
-+#else
-+# define machine_is_sisteron()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_RX1950
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_RX1950
-+# endif
-+# define machine_is_rx1950()	(machine_arch_type == MACH_TYPE_RX1950)
-+#else
-+# define machine_is_rx1950()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_TSC_VENUS
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_TSC_VENUS
-+# endif
-+# define machine_is_tsc_venus()	(machine_arch_type == MACH_TYPE_TSC_VENUS)
-+#else
-+# define machine_is_tsc_venus()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_DS101J
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_DS101J
-+# endif
-+# define machine_is_ds101j()	(machine_arch_type == MACH_TYPE_DS101J)
-+#else
-+# define machine_is_ds101j()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_MXC30030ADS
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_MXC30030ADS
-+# endif
-+# define machine_is_mxc30030ads()	(machine_arch_type == MACH_TYPE_MXC30030ADS)
-+#else
-+# define machine_is_mxc30030ads()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_FUJITSU_WIMAXSOC
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_FUJITSU_WIMAXSOC
-+# endif
-+# define machine_is_fujitsu_wimaxsoc()	(machine_arch_type == MACH_TYPE_FUJITSU_WIMAXSOC)
-+#else
-+# define machine_is_fujitsu_wimaxsoc()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_DUALPCMODEM
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_DUALPCMODEM
-+# endif
-+# define machine_is_dualpcmodem()	(machine_arch_type == MACH_TYPE_DUALPCMODEM)
-+#else
-+# define machine_is_dualpcmodem()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_GESBC9312
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_GESBC9312
-+# endif
-+# define machine_is_gesbc9312()	(machine_arch_type == MACH_TYPE_GESBC9312)
-+#else
-+# define machine_is_gesbc9312()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_HTCAPACHE
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_HTCAPACHE
-+# endif
-+# define machine_is_htcapache()	(machine_arch_type == MACH_TYPE_HTCAPACHE)
-+#else
-+# define machine_is_htcapache()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_IXDP435
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_IXDP435
-+# endif
-+# define machine_is_ixdp435()	(machine_arch_type == MACH_TYPE_IXDP435)
-+#else
-+# define machine_is_ixdp435()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_CATPROVT100
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_CATPROVT100
-+# endif
-+# define machine_is_catprovt100()	(machine_arch_type == MACH_TYPE_CATPROVT100)
-+#else
-+# define machine_is_catprovt100()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_PICOTUX1XX
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_PICOTUX1XX
-+# endif
-+# define machine_is_picotux1xx()	(machine_arch_type == MACH_TYPE_PICOTUX1XX)
-+#else
-+# define machine_is_picotux1xx()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_PICOTUX2XX
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_PICOTUX2XX
-+# endif
-+# define machine_is_picotux2xx()	(machine_arch_type == MACH_TYPE_PICOTUX2XX)
-+#else
-+# define machine_is_picotux2xx()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_DSMG600
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_DSMG600
-+# endif
-+# define machine_is_dsmg600()	(machine_arch_type == MACH_TYPE_DSMG600)
-+#else
-+# define machine_is_dsmg600()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_EMPC2
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_EMPC2
-+# endif
-+# define machine_is_empc2()	(machine_arch_type == MACH_TYPE_EMPC2)
-+#else
-+# define machine_is_empc2()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_VENTURA
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_VENTURA
-+# endif
-+# define machine_is_ventura()	(machine_arch_type == MACH_TYPE_VENTURA)
-+#else
-+# define machine_is_ventura()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_PHIDGET_SBC
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_PHIDGET_SBC
-+# endif
-+# define machine_is_phidget_sbc()	(machine_arch_type == MACH_TYPE_PHIDGET_SBC)
-+#else
-+# define machine_is_phidget_sbc()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_IJ3K
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_IJ3K
-+# endif
-+# define machine_is_ij3k()	(machine_arch_type == MACH_TYPE_IJ3K)
-+#else
-+# define machine_is_ij3k()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_PISGAH
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_PISGAH
-+# endif
-+# define machine_is_pisgah()	(machine_arch_type == MACH_TYPE_PISGAH)
-+#else
-+# define machine_is_pisgah()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_OMAP_FSAMPLE
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_OMAP_FSAMPLE
-+# endif
-+# define machine_is_omap_fsample()	(machine_arch_type == MACH_TYPE_OMAP_FSAMPLE)
-+#else
-+# define machine_is_omap_fsample()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_SG720
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_SG720
-+# endif
-+# define machine_is_sg720()	(machine_arch_type == MACH_TYPE_SG720)
-+#else
-+# define machine_is_sg720()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_REDFOX
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_REDFOX
-+# endif
-+# define machine_is_redfox()	(machine_arch_type == MACH_TYPE_REDFOX)
-+#else
-+# define machine_is_redfox()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_MYSH_EP9315_1
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_MYSH_EP9315_1
-+# endif
-+# define machine_is_mysh_ep9315_1()	(machine_arch_type == MACH_TYPE_MYSH_EP9315_1)
-+#else
-+# define machine_is_mysh_ep9315_1()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_TPF106
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_TPF106
-+# endif
-+# define machine_is_tpf106()	(machine_arch_type == MACH_TYPE_TPF106)
-+#else
-+# define machine_is_tpf106()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_AT91RM9200KG
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_AT91RM9200KG
-+# endif
-+# define machine_is_at91rm9200kg()	(machine_arch_type == MACH_TYPE_AT91RM9200KG)
-+#else
-+# define machine_is_at91rm9200kg()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_SLEDB
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_SLEDB
-+# endif
-+# define machine_is_racemt2()	(machine_arch_type == MACH_TYPE_SLEDB)
-+#else
-+# define machine_is_racemt2()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_ONTRACK
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_ONTRACK
-+# endif
-+# define machine_is_ontrack()	(machine_arch_type == MACH_TYPE_ONTRACK)
-+#else
-+# define machine_is_ontrack()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_PM1200
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_PM1200
-+# endif
-+# define machine_is_pm1200()	(machine_arch_type == MACH_TYPE_PM1200)
-+#else
-+# define machine_is_pm1200()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_ESS24XXX
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_ESS24XXX
-+# endif
-+# define machine_is_ess24562()	(machine_arch_type == MACH_TYPE_ESS24XXX)
-+#else
-+# define machine_is_ess24562()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_COREMP7
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_COREMP7
-+# endif
-+# define machine_is_coremp7()	(machine_arch_type == MACH_TYPE_COREMP7)
-+#else
-+# define machine_is_coremp7()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_NEXCODER_6446
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_NEXCODER_6446
-+# endif
-+# define machine_is_nexcoder_6446()	(machine_arch_type == MACH_TYPE_NEXCODER_6446)
-+#else
-+# define machine_is_nexcoder_6446()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_STVC8380
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_STVC8380
-+# endif
-+# define machine_is_stvc8380()	(machine_arch_type == MACH_TYPE_STVC8380)
-+#else
-+# define machine_is_stvc8380()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_TEKLYNX
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_TEKLYNX
-+# endif
-+# define machine_is_teklynx()	(machine_arch_type == MACH_TYPE_TEKLYNX)
-+#else
-+# define machine_is_teklynx()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_CARBONADO
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_CARBONADO
-+# endif
-+# define machine_is_carbonado()	(machine_arch_type == MACH_TYPE_CARBONADO)
-+#else
-+# define machine_is_carbonado()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_SYSMOS_MP730
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_SYSMOS_MP730
-+# endif
-+# define machine_is_sysmos_mp730()	(machine_arch_type == MACH_TYPE_SYSMOS_MP730)
-+#else
-+# define machine_is_sysmos_mp730()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_SNAPPER_CL15
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_SNAPPER_CL15
-+# endif
-+# define machine_is_snapper_cl15()	(machine_arch_type == MACH_TYPE_SNAPPER_CL15)
-+#else
-+# define machine_is_snapper_cl15()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_PGIGIM
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_PGIGIM
-+# endif
-+# define machine_is_pgigim()	(machine_arch_type == MACH_TYPE_PGIGIM)
-+#else
-+# define machine_is_pgigim()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_PTX9160P2
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_PTX9160P2
-+# endif
-+# define machine_is_ptx9160p2()	(machine_arch_type == MACH_TYPE_PTX9160P2)
-+#else
-+# define machine_is_ptx9160p2()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_DCORE1
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_DCORE1
-+# endif
-+# define machine_is_dcore1()	(machine_arch_type == MACH_TYPE_DCORE1)
-+#else
-+# define machine_is_dcore1()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_VICTORPXA
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_VICTORPXA
-+# endif
-+# define machine_is_victorpxa()	(machine_arch_type == MACH_TYPE_VICTORPXA)
-+#else
-+# define machine_is_victorpxa()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_MX2DTB
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_MX2DTB
-+# endif
-+# define machine_is_mx2dtb()	(machine_arch_type == MACH_TYPE_MX2DTB)
-+#else
-+# define machine_is_mx2dtb()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_PXA_IREX_ER0100
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_PXA_IREX_ER0100
-+# endif
-+# define machine_is_pxa_irex_er0100()	(machine_arch_type == MACH_TYPE_PXA_IREX_ER0100)
-+#else
-+# define machine_is_pxa_irex_er0100()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_OMAP_PALMZ71
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_OMAP_PALMZ71
-+# endif
-+# define machine_is_omap_palmz71()	(machine_arch_type == MACH_TYPE_OMAP_PALMZ71)
-+#else
-+# define machine_is_omap_palmz71()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_BARTEC_DEG
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_BARTEC_DEG
-+# endif
-+# define machine_is_bartec_deg()	(machine_arch_type == MACH_TYPE_BARTEC_DEG)
-+#else
-+# define machine_is_bartec_deg()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_HW50251
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_HW50251
-+# endif
-+# define machine_is_hw50251()	(machine_arch_type == MACH_TYPE_HW50251)
-+#else
-+# define machine_is_hw50251()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_IBOX
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_IBOX
-+# endif
-+# define machine_is_ibox()	(machine_arch_type == MACH_TYPE_IBOX)
-+#else
-+# define machine_is_ibox()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_ATLASLH7A404
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_ATLASLH7A404
-+# endif
-+# define machine_is_atlaslh7a404()	(machine_arch_type == MACH_TYPE_ATLASLH7A404)
-+#else
-+# define machine_is_atlaslh7a404()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_PT2026
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_PT2026
-+# endif
-+# define machine_is_pt2026()	(machine_arch_type == MACH_TYPE_PT2026)
-+#else
-+# define machine_is_pt2026()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_HTCALPINE
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_HTCALPINE
-+# endif
-+# define machine_is_htcalpine()	(machine_arch_type == MACH_TYPE_HTCALPINE)
-+#else
-+# define machine_is_htcalpine()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_BARTEC_VTU
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_BARTEC_VTU
-+# endif
-+# define machine_is_bartec_vtu()	(machine_arch_type == MACH_TYPE_BARTEC_VTU)
-+#else
-+# define machine_is_bartec_vtu()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_VCOREII
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_VCOREII
-+# endif
-+# define machine_is_vcoreii()	(machine_arch_type == MACH_TYPE_VCOREII)
-+#else
-+# define machine_is_vcoreii()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_PDNB3
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_PDNB3
-+# endif
-+# define machine_is_pdnb3()	(machine_arch_type == MACH_TYPE_PDNB3)
-+#else
-+# define machine_is_pdnb3()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_HTCBEETLES
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_HTCBEETLES
-+# endif
-+# define machine_is_htcbeetles()	(machine_arch_type == MACH_TYPE_HTCBEETLES)
-+#else
-+# define machine_is_htcbeetles()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_S3C6400
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_S3C6400
-+# endif
-+# define machine_is_s3c6400()	(machine_arch_type == MACH_TYPE_S3C6400)
-+#else
-+# define machine_is_s3c6400()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_S3C2443
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_S3C2443
-+# endif
-+# define machine_is_s3c2443()	(machine_arch_type == MACH_TYPE_S3C2443)
-+#else
-+# define machine_is_s3c2443()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_OMAP_LDK
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_OMAP_LDK
-+# endif
-+# define machine_is_omap_ldk()	(machine_arch_type == MACH_TYPE_OMAP_LDK)
-+#else
-+# define machine_is_omap_ldk()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_SMDK2460
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_SMDK2460
-+# endif
-+# define machine_is_smdk2460()	(machine_arch_type == MACH_TYPE_SMDK2460)
-+#else
-+# define machine_is_smdk2460()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_SMDK2440
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_SMDK2440
-+# endif
-+# define machine_is_smdk2440()	(machine_arch_type == MACH_TYPE_SMDK2440)
-+#else
-+# define machine_is_smdk2440()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_SMDK2412
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_SMDK2412
-+# endif
-+# define machine_is_smdk2412()	(machine_arch_type == MACH_TYPE_SMDK2412)
-+#else
-+# define machine_is_smdk2412()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_WEBBOX
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_WEBBOX
-+# endif
-+# define machine_is_webbox()	(machine_arch_type == MACH_TYPE_WEBBOX)
-+#else
-+# define machine_is_webbox()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_CWWNDP
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_CWWNDP
-+# endif
-+# define machine_is_cwwndp()	(machine_arch_type == MACH_TYPE_CWWNDP)
-+#else
-+# define machine_is_cwwndp()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_DRAGON
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_DRAGON
-+# endif
-+# define machine_is_dragon()	(machine_arch_type == MACH_TYPE_DRAGON)
-+#else
-+# define machine_is_dragon()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_OPENDO_CPU_BOARD
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_OPENDO_CPU_BOARD
-+# endif
-+# define machine_is_opendo_cpu_board()	(machine_arch_type == MACH_TYPE_OPENDO_CPU_BOARD)
-+#else
-+# define machine_is_opendo_cpu_board()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_CCM2200
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_CCM2200
-+# endif
-+# define machine_is_ccm2200()	(machine_arch_type == MACH_TYPE_CCM2200)
-+#else
-+# define machine_is_ccm2200()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_ETWARM
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_ETWARM
-+# endif
-+# define machine_is_etwarm()	(machine_arch_type == MACH_TYPE_ETWARM)
-+#else
-+# define machine_is_etwarm()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_M93030
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_M93030
-+# endif
-+# define machine_is_m93030()	(machine_arch_type == MACH_TYPE_M93030)
-+#else
-+# define machine_is_m93030()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_CC7U
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_CC7U
-+# endif
-+# define machine_is_cc7u()	(machine_arch_type == MACH_TYPE_CC7U)
-+#else
-+# define machine_is_cc7u()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_MTT_RANGER
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_MTT_RANGER
-+# endif
-+# define machine_is_mtt_ranger()	(machine_arch_type == MACH_TYPE_MTT_RANGER)
-+#else
-+# define machine_is_mtt_ranger()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_NEXUS
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_NEXUS
-+# endif
-+# define machine_is_nexus()	(machine_arch_type == MACH_TYPE_NEXUS)
-+#else
-+# define machine_is_nexus()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_DESMAN
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_DESMAN
-+# endif
-+# define machine_is_desman()	(machine_arch_type == MACH_TYPE_DESMAN)
-+#else
-+# define machine_is_desman()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_BKDE303
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_BKDE303
-+# endif
-+# define machine_is_bkde303()	(machine_arch_type == MACH_TYPE_BKDE303)
-+#else
-+# define machine_is_bkde303()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_SMDK2413
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_SMDK2413
-+# endif
-+# define machine_is_smdk2413()	(machine_arch_type == MACH_TYPE_SMDK2413)
-+#else
-+# define machine_is_smdk2413()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_AML_M7200
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_AML_M7200
-+# endif
-+# define machine_is_aml_m7200()	(machine_arch_type == MACH_TYPE_AML_M7200)
-+#else
-+# define machine_is_aml_m7200()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_AML_M5900
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_AML_M5900
-+# endif
-+# define machine_is_aml_m5900()	(machine_arch_type == MACH_TYPE_AML_M5900)
-+#else
-+# define machine_is_aml_m5900()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_SG640
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_SG640
-+# endif
-+# define machine_is_sg640()	(machine_arch_type == MACH_TYPE_SG640)
-+#else
-+# define machine_is_sg640()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_EDG79524
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_EDG79524
-+# endif
-+# define machine_is_edg79524()	(machine_arch_type == MACH_TYPE_EDG79524)
-+#else
-+# define machine_is_edg79524()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_AI2410
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_AI2410
-+# endif
-+# define machine_is_ai2410()	(machine_arch_type == MACH_TYPE_AI2410)
-+#else
-+# define machine_is_ai2410()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_IXP465
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_IXP465
-+# endif
-+# define machine_is_ixp465()	(machine_arch_type == MACH_TYPE_IXP465)
-+#else
-+# define machine_is_ixp465()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_BALLOON3
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_BALLOON3
-+# endif
-+# define machine_is_balloon3()	(machine_arch_type == MACH_TYPE_BALLOON3)
-+#else
-+# define machine_is_balloon3()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_HEINS
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_HEINS
-+# endif
-+# define machine_is_heins()	(machine_arch_type == MACH_TYPE_HEINS)
-+#else
-+# define machine_is_heins()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_MPLUSEVA
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_MPLUSEVA
-+# endif
-+# define machine_is_mpluseva()	(machine_arch_type == MACH_TYPE_MPLUSEVA)
-+#else
-+# define machine_is_mpluseva()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_RT042
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_RT042
-+# endif
-+# define machine_is_rt042()	(machine_arch_type == MACH_TYPE_RT042)
-+#else
-+# define machine_is_rt042()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_CWIEM
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_CWIEM
-+# endif
-+# define machine_is_cwiem()	(machine_arch_type == MACH_TYPE_CWIEM)
-+#else
-+# define machine_is_cwiem()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_CM_X270
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_CM_X270
-+# endif
-+# define machine_is_cm_x270()	(machine_arch_type == MACH_TYPE_CM_X270)
-+#else
-+# define machine_is_cm_x270()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_CM_X255
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_CM_X255
-+# endif
-+# define machine_is_cm_x255()	(machine_arch_type == MACH_TYPE_CM_X255)
-+#else
-+# define machine_is_cm_x255()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_ESH_AT91
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_ESH_AT91
-+# endif
-+# define machine_is_esh_at91()	(machine_arch_type == MACH_TYPE_ESH_AT91)
-+#else
-+# define machine_is_esh_at91()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_SANDGATE3
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_SANDGATE3
-+# endif
-+# define machine_is_sandgate3()	(machine_arch_type == MACH_TYPE_SANDGATE3)
-+#else
-+# define machine_is_sandgate3()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_PRIMO
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_PRIMO
-+# endif
-+# define machine_is_primo()	(machine_arch_type == MACH_TYPE_PRIMO)
-+#else
-+# define machine_is_primo()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_GEMSTONE
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_GEMSTONE
-+# endif
-+# define machine_is_gemstone()	(machine_arch_type == MACH_TYPE_GEMSTONE)
-+#else
-+# define machine_is_gemstone()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_PRONGHORNMETRO
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_PRONGHORNMETRO
-+# endif
-+# define machine_is_pronghorn_metro()	(machine_arch_type == MACH_TYPE_PRONGHORNMETRO)
-+#else
-+# define machine_is_pronghorn_metro()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_SIDEWINDER
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_SIDEWINDER
-+# endif
-+# define machine_is_sidewinder()	(machine_arch_type == MACH_TYPE_SIDEWINDER)
-+#else
-+# define machine_is_sidewinder()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_PICOMOD1
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_PICOMOD1
-+# endif
-+# define machine_is_picomod1()	(machine_arch_type == MACH_TYPE_PICOMOD1)
-+#else
-+# define machine_is_picomod1()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_SG590
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_SG590
-+# endif
-+# define machine_is_sg590()	(machine_arch_type == MACH_TYPE_SG590)
-+#else
-+# define machine_is_sg590()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_AKAI9307
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_AKAI9307
-+# endif
-+# define machine_is_akai9307()	(machine_arch_type == MACH_TYPE_AKAI9307)
-+#else
-+# define machine_is_akai9307()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_FONTAINE
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_FONTAINE
-+# endif
-+# define machine_is_fontaine()	(machine_arch_type == MACH_TYPE_FONTAINE)
-+#else
-+# define machine_is_fontaine()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_WOMBAT
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_WOMBAT
-+# endif
-+# define machine_is_wombat()	(machine_arch_type == MACH_TYPE_WOMBAT)
-+#else
-+# define machine_is_wombat()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_ACQ300
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_ACQ300
-+# endif
-+# define machine_is_acq300()	(machine_arch_type == MACH_TYPE_ACQ300)
-+#else
-+# define machine_is_acq300()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_MOD_270
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_MOD_270
-+# endif
-+# define machine_is_mod_270()	(machine_arch_type == MACH_TYPE_MOD_270)
-+#else
-+# define machine_is_mod_270()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_VC0820
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_VC0820
-+# endif
-+# define machine_is_vmc_vc0820()	(machine_arch_type == MACH_TYPE_VC0820)
-+#else
-+# define machine_is_vmc_vc0820()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_ANI_AIM
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_ANI_AIM
-+# endif
-+# define machine_is_ani_aim()	(machine_arch_type == MACH_TYPE_ANI_AIM)
-+#else
-+# define machine_is_ani_aim()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_JELLYFISH
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_JELLYFISH
-+# endif
-+# define machine_is_jellyfish()	(machine_arch_type == MACH_TYPE_JELLYFISH)
-+#else
-+# define machine_is_jellyfish()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_AMANITA
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_AMANITA
-+# endif
-+# define machine_is_amanita()	(machine_arch_type == MACH_TYPE_AMANITA)
-+#else
-+# define machine_is_amanita()	(0)
-+#endif
-+
-+#ifdef CONFIG_MACH_VLINK
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_VLINK
-+# endif
-+# define machine_is_vlink()	(machine_arch_type == MACH_TYPE_VLINK)
-+#else
-+# define machine_is_vlink()	(0)
-+#endif
-+
- /*
-  * These have not yet been registered
-  */
-diff -Naur u-boot-1.1.4.org/include/config.h u-boot-1.1.4.tmp/include/config.h
---- u-boot-1.1.4.org/include/config.h	2006-06-05 05:04:25.000000000 +0200
-+++ u-boot-1.1.4.tmp/include/config.h	2006-06-05 05:03:47.000000000 +0200
-@@ -1,2 +1,2 @@
- /* Automatically generated - do not edit */
--#include <configs/at91rm9200dk.h>
-+#include <configs/vlink.h>
-diff -Naur u-boot-1.1.4.org/include/config.mk u-boot-1.1.4.tmp/include/config.mk
---- u-boot-1.1.4.org/include/config.mk	2006-06-05 05:04:25.000000000 +0200
-+++ u-boot-1.1.4.tmp/include/config.mk	2006-06-05 05:03:47.000000000 +0200
-@@ -1,4 +1,4 @@
- ARCH   = arm
- CPU    = arm920t
--BOARD  = at91rm9200dk
-+BOARD  = vlink
- SOC    = at91rm9200
-diff -Naur u-boot-1.1.4.org/include/configs/vlink.h u-boot-1.1.4.tmp/include/configs/vlink.h
---- u-boot-1.1.4.org/include/configs/vlink.h	1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-1.1.4.tmp/include/configs/vlink.h	2006-06-05 03:37:15.000000000 +0200
-@@ -0,0 +1,244 @@
-+/*
-+ * Hamish Guthrie <hamish@prodigi.ch>
-+ *
-+ * Configuation settings for the Figment Designs Versalink board.
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+#ifndef __CONFIG_H
-+#define __CONFIG_H
-+
-+// Added 2 defines to skip re-init lowlevel and relocate HCG HLH
-+//
-+#define CONFIG_SKIP_LOWLEVEL_INIT
-+#define CONFIG_SKIP_RELOCATE_UBOOT
-+
-+/* ARM asynchronous clock */
-+#define AT91C_MAIN_CLOCK	179712000	/* from 18.432 MHz crystal (18432000 / 4 * 39) */
-+#define AT91C_MASTER_CLOCK	59904000	/* peripheral clock (AT91C_MASTER_CLOCK / 3) */
-+/* #define AT91C_MASTER_CLOCK	44928000 */	/* peripheral clock (AT91C_MASTER_CLOCK / 4) */
-+
-+#define AT91_SLOW_CLOCK		32768	/* slow clock */
-+
-+#define CONFIG_ARM920T		1	/* This is an ARM920T Core	*/
-+#define CONFIG_AT91RM9200	1	/* It's an Atmel AT91RM9200 SoC	*/
-+#define CONFIG_VLINK		1	/* on a Versalink Board		*/
-+#define CONFIG_IDENT_STRING 	" FDL Versalink"
-+#undef  CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff	*/
-+#define USE_920T_MMU		1
-+
-+#define CONFIG_CMDLINE_TAG	1	/* enable passing of ATAGs	*/
-+#define CONFIG_SETUP_MEMORY_TAGS 1
-+#define CONFIG_INITRD_TAG	1
-+
-+#ifndef CONFIG_SKIP_LOWLEVEL_INIT
-+#define CFG_USE_MAIN_OSCILLATOR		1
-+/* flash */
-+#define MC_PUIA_VAL	0x00000000
-+#define MC_PUP_VAL	0x00000000
-+#define MC_PUER_VAL	0x00000000
-+#define MC_ASR_VAL	0x00000000
-+#define MC_AASR_VAL	0x00000000
-+#define EBI_CFGR_VAL	0x00000000
-+#define SMC2_CSR_VAL	0x00003284 /* 16bit, 2 TDF, 4 WS */
-+
-+/* clocks */
-+#define PLLAR_VAL	0x20263E04 /* 179.712000 MHz for PCK */
-+#define PLLBR_VAL	0x10483E0E /* 48.054857 MHz (divider by 2 for USB) */
-+#define MCKR_VAL	0x00000202 /* PCK/3 = MCK Master Clock = 59.904000MHz from PLLA */
-+
-+/* sdram */
-+#define PIOC_ASR_VAL	0xFFFF0000 /* Configure PIOC as peripheral (D16/D31) */
-+#define PIOC_BSR_VAL	0x00000000
-+#define PIOC_PDR_VAL	0xFFFF0000
-+#define EBI_CSA_VAL	0x00000002 /* CS1=SDRAM */
-+#define SDRC_CR_VAL	0x2188c155 /* set up the SDRAM */
-+#define SDRAM		0x20000000 /* address of the SDRAM */
-+#define SDRAM1		0x20000080 /* address of the SDRAM */
-+#define SDRAM_VAL	0x00000000 /* value written to SDRAM */
-+#define SDRC_MR_VAL	0x00000002 /* Precharge All */
-+#define SDRC_MR_VAL1	0x00000004 /* refresh */
-+#define SDRC_MR_VAL2	0x00000003 /* Load Mode Register */
-+#define SDRC_MR_VAL3	0x00000000 /* Normal Mode */
-+#define SDRC_TR_VAL	0x000002E0 /* Write refresh rate */
-+#endif	/* CONFIG_SKIP_LOWLEVEL_INIT */
-+/*
-+ * Size of malloc() pool
-+ */
-+#define CFG_MALLOC_LEN	(CFG_ENV_SIZE + 128*1024)
-+#define CFG_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
-+
-+#define CONFIG_BAUDRATE 115200
-+
-+/*
-+ * Hardware drivers
-+ */
-+
-+/* define one of these to choose the DBGU, USART0  or USART1 as console */
-+#define CONFIG_DBGU
-+#undef CONFIG_USART0
-+#undef CONFIG_USART1
-+
-+#undef	CONFIG_HWFLOW			/* don't include RTS/CTS flow control support	*/
-+
-+#undef	CONFIG_MODEM_SUPPORT		/* disable modem initialization stuff */
-+
-+#define CONFIG_BOOTDELAY      3
-+/* #define CONFIG_ENV_OVERWRITE	1 */
-+
-+#define CONFIG_COMMANDS		\
-+		       ((CONFIG_CMD_DFL | CFG_CMD_MII |\
-+			CFG_CMD_DHCP ) & \
-+		      ~(CFG_CMD_BDI | \
-+			CFG_CMD_IMI | \
-+			CFG_CMD_AUTOSCRIPT | \
-+			CFG_CMD_FPGA | \
-+			CFG_CMD_MISC | \
-+			CFG_CMD_LOADS ))
-+
-+/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-+#include <cmd_confdefs.h>
-+
-+#ifndef CONFIG_VLINK
-+#define CFG_MAX_NAND_DEVICE	1	/* Max number of NAND devices		*/
-+#define SECTORSIZE 512
-+
-+#define ADDR_COLUMN 1
-+#define ADDR_PAGE 2
-+#define ADDR_COLUMN_PAGE 3
-+
-+#define NAND_ChipID_UNKNOWN	0x00
-+#define NAND_MAX_FLOORS 1
-+#define NAND_MAX_CHIPS 1
-+
-+#define AT91_SMART_MEDIA_ALE (1 << 22)	/* our ALE is AD22 */
-+#define AT91_SMART_MEDIA_CLE (1 << 21)	/* our CLE is AD21 */
-+
-+#define NAND_DISABLE_CE(nand) do { *AT91C_PIOC_SODR = AT91C_PIO_PC0;} while(0)
-+#define NAND_ENABLE_CE(nand) do { *AT91C_PIOC_CODR = AT91C_PIO_PC0;} while(0)
-+
-+#define NAND_WAIT_READY(nand) while (!(*AT91C_PIOC_PDSR & AT91C_PIO_PC2))
-+
-+#define WRITE_NAND_COMMAND(d, adr) do{ *(volatile __u8 *)((unsigned long)adr | AT91_SMART_MEDIA_CLE) = (__u8)(d); } while(0)
-+#define WRITE_NAND_ADDRESS(d, adr) do{ *(volatile __u8 *)((unsigned long)adr | AT91_SMART_MEDIA_ALE) = (__u8)(d); } while(0)
-+#define WRITE_NAND(d, adr) do{ *(volatile __u8 *)((unsigned long)adr) = (__u8)d; } while(0)
-+#define READ_NAND(adr) ((volatile unsigned char)(*(volatile __u8 *)(unsigned long)adr))
-+/* the following are NOP's in our implementation */
-+#define NAND_CTL_CLRALE(nandptr)
-+#define NAND_CTL_SETALE(nandptr)
-+#define NAND_CTL_CLRCLE(nandptr)
-+#define NAND_CTL_SETCLE(nandptr)
-+#endif
-+
-+#define CONFIG_NR_DRAM_BANKS 1
-+#define PHYS_SDRAM 0x20000000
-+#define PHYS_SDRAM_SIZE 0x2000000  /* 32 megs */
-+
-+#define CFG_MEMTEST_START		PHYS_SDRAM
-+#define CFG_MEMTEST_END			CFG_MEMTEST_START + PHYS_SDRAM_SIZE - 262144
-+
-+#define CONFIG_DRIVER_ETHER
-+#define CONFIG_NET_RETRY_COUNT		20
-+#define CONFIG_AT91C_USE_RMII
-+
-+#define CONFIG_HAS_DATAFLASH		1
-+#define CFG_SPI_WRITE_TOUT		(5*CFG_HZ)
-+#define CFG_MAX_DATAFLASH_BANKS 	2
-+#define CFG_MAX_DATAFLASH_PAGES 	16384
-+#define CFG_DATAFLASH_LOGIC_ADDR_CS0	0xC0000000	/* Logical adress for CS0 */
-+#define CFG_DATAFLASH_LOGIC_ADDR_CS3	0xD0000000	/* Logical adress for CS3 */
-+
-+#ifdef CONFIG_VLINK
-+#define PHYS_FLASH_1			0x10000000
-+#define PHYS_FLASH_SIZE			0x200000  /* 2 megs main flash */
-+#define CFG_FLASH_BASE			PHYS_FLASH_1
-+#define CFG_MAX_FLASH_BANKS		1
-+#define CFG_MAX_FLASH_SECT		256
-+#define CFG_FLASH_ERASE_TOUT		(2*CFG_HZ) /* Timeout for Flash Erase */
-+#define CFG_FLASH_WRITE_TOUT		(2*CFG_HZ) /* Timeout for Flash Write */
-+#endif
-+
-+#define	CFG_ENV_IS_IN_DATAFLASH
-+
-+#ifdef CFG_ENV_IS_IN_DATAFLASH
-+#define CFG_ENV_OFFSET			0x21000
-+#define CFG_ENV_ADDR			(CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
-+#define CFG_ENV_SIZE			0x8400  /* 0x8000 */
-+#else
-+#define CFG_ENV_IS_IN_FLASH		1
-+#ifdef CONFIG_SKIP_LOWLEVEL_INIT
-+#define CFG_ENV_ADDR			(PHYS_FLASH_1 + 0x60000)  /* after u-boot.bin */
-+#define CFG_ENV_SIZE			0x10000 /* sectors are 64K here */
-+#else
-+#define CFG_ENV_ADDR			(PHYS_FLASH_1 + 0xe000)  /* between boot.bin and u-boot.bin.gz */
-+#define CFG_ENV_SIZE			0x2000  /* 0x8000 */
-+#endif	/* CONFIG_SKIP_LOWLEVEL_INIT */
-+#endif	/* CFG_ENV_IS_IN_DATAFLASH */
-+
-+
-+#define CFG_LOAD_ADDR		0x21000000  /* default load address */
-+
-+#ifdef CONFIG_SKIP_LOWLEVEL_INIT
-+#define CFG_BOOT_SIZE		0x00 /* 0 KBytes */
-+#define CFG_U_BOOT_BASE		PHYS_FLASH_1
-+#define CFG_U_BOOT_SIZE		0x60000 /* 384 KBytes */
-+#else
-+#define CFG_BOOT_SIZE		0x6000 /* 24 KBytes */
-+#define CFG_U_BOOT_BASE		(PHYS_FLASH_1 + 0x10000)
-+#define CFG_U_BOOT_SIZE		0x10000 /* 64 KBytes */
-+#endif	/* CONFIG_SKIP_LOWLEVEL_INIT */
-+
-+#define CFG_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
-+
-+#define CFG_PROMPT		"U-Boot> "	/* Monitor Command Prompt */
-+#define CFG_CBSIZE		256		/* Console I/O Buffer Size */
-+#define CFG_MAXARGS		16		/* max number of command args */
-+#define CFG_PBSIZE		(CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /* Print Buffer Size */
-+
-+#ifndef __ASSEMBLY__
-+/*-----------------------------------------------------------------------
-+ * Board specific extension for bd_info
-+ *
-+ * This structure is embedded in the global bd_info (bd_t) structure
-+ * and can be used by the board specific code (eg board/...)
-+ */
-+
-+struct bd_info_ext {
-+	/* helper variable for board environment handling
-+	 *
-+	 * env_crc_valid == 0    =>   uninitialised
-+	 * env_crc_valid  > 0    =>   environment crc in flash is valid
-+	 * env_crc_valid  < 0    =>   environment crc in flash is invalid
-+	 */
-+	int env_crc_valid;
-+};
-+#endif
-+
-+#define CFG_HZ 1000
-+#define CFG_HZ_CLOCK AT91C_MASTER_CLOCK/2	/* AT91C_TC0_CMR is implicitly set to */
-+					/* AT91C_TC_TIMER_DIV1_CLOCK */
-+
-+#define CONFIG_STACKSIZE	(32*1024)	/* regular stack */
-+
-+#ifdef CONFIG_USE_IRQ
-+#error CONFIG_USE_IRQ not supported
-+#endif
-+
-+#endif
-diff -Naur u-boot-1.1.4.org/MAKEALL u-boot-1.1.4.tmp/MAKEALL
---- u-boot-1.1.4.org/MAKEALL	2005-12-16 17:39:27.000000000 +0100
-+++ u-boot-1.1.4.tmp/MAKEALL	2006-06-05 02:44:24.000000000 +0200
-@@ -180,7 +180,7 @@
- 	mx1ads		mx1fs2		omap1510inn	omap1610h2	\
- 	omap1610inn	omap730p2	scb9328		smdk2400	\
- 	smdk2410	trab		VCMA9		versatile	\
--	versatileab	versatilepb	voiceblue
-+	versatileab	versatilepb	voiceblue	vlink
- "
- 
- #########################################################################
-diff -Naur u-boot-1.1.4.org/Makefile u-boot-1.1.4.tmp/Makefile
---- u-boot-1.1.4.org/Makefile	2006-06-02 15:58:57.000000000 +0200
-+++ u-boot-1.1.4.tmp/Makefile	2006-06-05 04:40:45.000000000 +0200
-@@ -1419,6 +1419,9 @@
- mp2usb_config	:	unconfig
- 	@./mkconfig $(@:_config=) arm arm920t mp2usb NULL at91rm9200
- 
-+vlink_config	:	unconfig
-+	@./mkconfig $(@:_config=) arm arm920t vlink NULL at91rm9200
-+
- 
- ########################################################################
- ## ARM Integrator boards - see doc/README-integrator for more info.
diff --git a/target/linux/at91/image/u-boot/patches/003-mac_init.patch b/target/linux/at91/image/u-boot/patches/003-mac_init.patch
deleted file mode 100644
index ec5dffa0c..000000000
--- a/target/linux/at91/image/u-boot/patches/003-mac_init.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- u-boot-1.1.4.org/lib_arm/board.c	2006-06-05 12:36:22.000000000 +0200
-+++ u-boot-1.1.4.tmp/lib_arm/board.c	2006-06-05 12:36:44.000000000 +0200
-@@ -332,6 +332,11 @@
- 	}
- #endif /* CONFIG_DRIVER_SMC91111 || CONFIG_DRIVER_LAN91C96 */
- 
-+#ifdef CONFIG_MACH_VLINK
-+	printf("Initialising MAC address\n\r");
-+	eth_init(gd->bd);
-+#endif
-+
- 	/* Initialize from environment */
- 	if ((s = getenv ("loadaddr")) != NULL) {
- 		load_addr = simple_strtoul (s, NULL, 16);
diff --git a/target/linux/at91/image/u-boot/patches/004-mac_config.patch b/target/linux/at91/image/u-boot/patches/004-mac_config.patch
deleted file mode 100644
index 73a8260d6..000000000
--- a/target/linux/at91/image/u-boot/patches/004-mac_config.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- u-boot-1.1.4.ttt/include/configs/vlink.h	2006-06-05 15:57:37.000000000 +0200
-+++ u-boot-1.1.4/include/configs/vlink.h	2006-06-07 13:11:01.000000000 +0200
-@@ -105,9 +105,9 @@
- 
- #define CONFIG_COMMANDS		\
- 		       ((CONFIG_CMD_DFL | CFG_CMD_MII |\
--			CFG_CMD_DHCP ) & \
--		      ~(CFG_CMD_BDI | \
--			CFG_CMD_IMI | \
-+			CFG_CMD_DHCP | \
-+			CFG_CMD_BDI ) & \
-+		      ~(CFG_CMD_IMI | \
- 			CFG_CMD_AUTOSCRIPT | \
- 			CFG_CMD_FPGA | \
- 			CFG_CMD_MISC | \
diff --git a/target/linux/at91/image/u-boot/patches/005-remove_float.patch b/target/linux/at91/image/u-boot/patches/005-remove_float.patch
deleted file mode 100644
index 802c96339..000000000
--- a/target/linux/at91/image/u-boot/patches/005-remove_float.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN u-boot-1.1.4.old/cpu/arm920t/config.mk u-boot-1.1.4/cpu/arm920t/config.mk
---- u-boot-1.1.4.old/cpu/arm920t/config.mk	2007-03-19 12:44:39.000000000 +0100
-+++ u-boot-1.1.4/cpu/arm920t/config.mk	2007-03-20 09:23:54.000000000 +0100
-@@ -21,8 +21,7 @@
- # MA 02111-1307 USA
- #
- 
--PLATFORM_RELFLAGS += -fno-strict-aliasing  -fno-common -ffixed-r8 \
--	-msoft-float
-+PLATFORM_RELFLAGS += -fno-strict-aliasing  -fno-common -ffixed-r8 
- 
- PLATFORM_CPPFLAGS += -march=armv4
- # =========================================================================
diff --git a/target/linux/at91/image/u-boot/patches/006-generate_params.patch b/target/linux/at91/image/u-boot/patches/006-generate_params.patch
deleted file mode 100644
index d4427c3ec..000000000
--- a/target/linux/at91/image/u-boot/patches/006-generate_params.patch
+++ /dev/null
@@ -1,115 +0,0 @@
---- u-boot-1.1.4.old/tools/Makefile	2007-03-22 18:17:25.000000000 +0100
-+++ u-boot-1.1.4/tools/Makefile	2007-03-22 17:08:46.000000000 +0100
-@@ -21,9 +21,9 @@
- # MA 02111-1307 USA
- #
- 
--BINS	= img2srec$(SFX) mkimage$(SFX) envcrc$(SFX) gen_eth_addr$(SFX) bmp_logo$(SFX)
-+BINS	= img2srec$(SFX) mkimage$(SFX) envcrc$(SFX) gen_eth_addr$(SFX) bmp_logo$(SFX) ubparams$(SFX)
- 
--OBJS	= environment.o img2srec.o mkimage.o crc32.o envcrc.o gen_eth_addr.o bmp_logo.o
-+OBJS	= environment.o img2srec.o mkimage.o crc32.o envcrc.o gen_eth_addr.o bmp_logo.o ubparams.o
- 
- ifeq ($(ARCH),mips)
- BINS   += inca-swap-bytes$(SFX)
-@@ -118,6 +118,9 @@
- 
- all:	.depend $(BINS) $(LOGO_H) subdirs
- 
-+ubparams$(SFX): ubparams.o crc32.o
-+		$(CC) $(CFLAGS) -o $@ $^
-+
- envcrc$(SFX):	envcrc.o crc32.o environment.o
- 		$(CC) $(CFLAGS) -o $@ $^
- 
-@@ -149,6 +152,9 @@
- 		$(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^
- 		$(STRIP) $@
- 
-+ubparams.o: ubparams.c
-+		$(CC) -g $(CFLAGS) -c $<
-+
- envcrc.o:	envcrc.c
- 		$(CC) -g $(CFLAGS) -c $<
- 
---- u-boot-1.1.4.old/tools/ubparams.c	1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-1.1.4/tools/ubparams.c	2007-03-22 18:09:52.000000000 +0100
-@@ -0,0 +1,78 @@
-+/*
-+ * ubparams.c
-+ * 
-+ * Generate a u-boot parameter block with correct crc
-+ *
-+ * (C) 1007 Guthrie Consulting
-+ * hamish@prodigi.ch
-+ *
-+ */
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+
-+#ifndef __ASSEMBLY__
-+#define __ASSEMBLY__
-+#endif
-+#define __ASM_STUB_PROCESSOR_H__
-+#include <config.h>
-+#undef __ASSEMBLY__
-+#include "environment.h"
-+
-+#define XMK_STR(x)  #x
-+#define MK_STR(x)  XMK_STR(x)
-+
-+extern unsigned long crc32 (unsigned long, const unsigned char *, unsigned int);
-+
-+#if !defined(ENV_CRC)
-+#define ENV_CRC ~0
-+#endif
-+
-+unsigned int env_size = 0x8400;
-+env_t environment = {
-+	ENV_CRC,
-+	"bootdelay=3\0"
-+	"baudrate=115200\0"
-+	"stdin=serial\0"
-+	"stdout=serial\0"
-+	"stderr=serial\0"
-+	"partitions=mtdparts=AT45DB642.spi0:132k(bootloader),33k(ubparams),99k(spare),1056k(linux),2112k(rootfs),33k(nvram),-(rootfs_data)\0"
-+	"fbargs=setenv bootargs mtdparts=AT45DB642.spi0:132k(bootloader),33k(ubparams),99k(spare),1056k(linux),2112k(rootfs),33k(nvram),-(rootfs_data) root=/dev/mtdblock4 ro console=/dev/ttyS0,115200,mem=32M\0"
-+	"rdba=setenv bootargs mtdparts=AT45DB642.spi0:132k(bootloader),33k(ubparams),99k(spare),1056k(linux),2112k(rootfs),33k(nvram),-(rootfs_data) root=/dev/ram rw initrd=0x21200000,6000000 ramdisk_size=20000 console=/dev/ttyS0,115200,mem=32M\0"
-+	"rdram=run rdba; tftp 21000000 vImage; tftp 21200000 root.squashfs; bootm 21000000\0"
-+	"flash=run fbargs; bootm 0xc0042000\0"
-+	"bootargs=setenv bootargs mtdparts=AT45DB642.spi0:132k(bootloader),33k(ubparams),99k(spare),1056k(linux),2112k(rootfs),33k(nvram),-(rootfs_data) root=/dev/mtdblock4 ro console=/dev/ttyS0,115200,mem=32M\0"
-+	"bootcmd=bootm 0xc0042000\0"
-+	"ethaddr=00:30:49:00:00:01\0"
-+	"ipaddr=10.0.1.73\0"
-+	"serverip=10.0.1.210\0"
-+	"serial#=MX070205484\0"
-+	"\0"
-+	};
-+
-+int main(void) {
-+	env_t *envptr, *source;
-+	unsigned char *dataptr;
-+	FILE *params;
-+
-+	source = &environment;
-+	envptr = (env_t *)malloc(CFG_ENV_SIZE);
-+	dataptr = (unsigned char *)envptr + ENV_HEADER_SIZE;
-+
-+	printf("Make u-boot params\n");
-+	printf("Params size is %d\n", CFG_ENV_SIZE);
-+
-+	memset(envptr, 0, CFG_ENV_SIZE);
-+	memcpy(envptr, source, sizeof(environment));
-+
-+	envptr->crc = crc32(0, envptr->data, ENV_SIZE);
-+
-+	params = fopen("params", "w");
-+	fwrite(envptr, CFG_ENV_SIZE, 1, params);
-+	fclose(params);
-+
-+	free(envptr);
-+	}
-+	
-+	
diff --git a/target/linux/at91/image/u-boot/patches/007-ubparams_bugfix.patch b/target/linux/at91/image/u-boot/patches/007-ubparams_bugfix.patch
deleted file mode 100644
index 3d069e4d3..000000000
--- a/target/linux/at91/image/u-boot/patches/007-ubparams_bugfix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- u-boot-1.1.4.old/tools/ubparams.c	2007-03-22 18:09:52.000000000 +0100
-+++ u-boot-1.1.4/tools/ubparams.c	2007-03-22 18:29:32.000000000 +0100
-@@ -18,7 +18,7 @@
- #define __ASM_STUB_PROCESSOR_H__
- #include <config.h>
- #undef __ASSEMBLY__
--#include "environment.h"
-+#include <environment.h>
- 
- #define XMK_STR(x)  #x
- #define MK_STR(x)  XMK_STR(x)
diff --git a/target/linux/at91/image/u-boot/patches/008-ubparams_bugfix.patch b/target/linux/at91/image/u-boot/patches/008-ubparams_bugfix.patch
deleted file mode 100644
index 9a16e1998..000000000
--- a/target/linux/at91/image/u-boot/patches/008-ubparams_bugfix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- u-boot-1.1.4.old/tools/ubparams.c	2007-03-23 10:51:17.000000000 +0100
-+++ u-boot-1.1.4/tools/ubparams.c	2007-03-23 10:49:37.000000000 +0100
-@@ -73,6 +73,7 @@
- 	fclose(params);
- 
- 	free(envptr);
-+	return 0;
- 	}
- 	
- 	
diff --git a/target/linux/at91/image/u-boot/patches/009-mac_init_bugfix.patch b/target/linux/at91/image/u-boot/patches/009-mac_init_bugfix.patch
deleted file mode 100644
index a36ebe325..000000000
--- a/target/linux/at91/image/u-boot/patches/009-mac_init_bugfix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN u-boot-1.1.4.old/lib_arm/board.c u-boot-1.1.4/lib_arm/board.c
---- u-boot-1.1.4.old/lib_arm/board.c	2007-03-23 10:53:52.000000000 +0100
-+++ u-boot-1.1.4/lib_arm/board.c	2007-03-24 13:17:12.000000000 +0100
-@@ -332,7 +332,7 @@
- 	}
- #endif /* CONFIG_DRIVER_SMC91111 || CONFIG_DRIVER_LAN91C96 */
- 
--#ifdef CONFIG_MACH_VLINK
-+#ifdef CONFIG_VLINK
- 	printf("Initialising MAC address\n\r");
- 	eth_init(gd->bd);
- #endif
diff --git a/target/linux/at91/image/u-boot/patches/010-irda-patch-remove.patch b/target/linux/at91/image/u-boot/patches/010-irda-patch-remove.patch
deleted file mode 100644
index 2f23f5b38..000000000
--- a/target/linux/at91/image/u-boot/patches/010-irda-patch-remove.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- u-boot-1.1.4.old/board/vlink/vlink.c	2007-04-03 11:42:39.000000000 +0200
-+++ u-boot-1.1.4/board/vlink/vlink.c	2007-04-03 11:48:33.000000000 +0200
-@@ -40,10 +40,6 @@
- 	/* Enable Ctrlc */
- 	console_init_f ();
- 
--	/* Correct IRDA resistor problem */
--	/* Set PA23_TXD in Output */
--	(AT91PS_PIO) AT91C_BASE_PIOA->PIO_OER = AT91C_PA23_TXD2;
--
- 	/* memory and cpu-speed are setup before relocation */
- 	/* so we do _nothing_ here */
- 
diff --git a/target/linux/at91/image/u-boot/patches/011-ubparams_update.patch b/target/linux/at91/image/u-boot/patches/011-ubparams_update.patch
deleted file mode 100644
index de02cc88c..000000000
--- a/target/linux/at91/image/u-boot/patches/011-ubparams_update.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -urN u-boot-1.1.4.old/tools/ubparams.c u-boot-1.1.4/tools/ubparams.c
---- u-boot-1.1.4.old/tools/ubparams.c	2007-05-01 13:20:17.000000000 +0200
-+++ u-boot-1.1.4/tools/ubparams.c	2007-05-04 10:13:34.000000000 +0200
-@@ -37,12 +37,11 @@
- 	"stdin=serial\0"
- 	"stdout=serial\0"
- 	"stderr=serial\0"
--	"partitions=mtdparts=AT45DB642.spi0:132k(bootloader),33k(ubparams),99k(spare),1056k(linux),2112k(rootfs),33k(nvram),-(rootfs_data)\0"
--	"fbargs=setenv bootargs mtdparts=AT45DB642.spi0:132k(bootloader),33k(ubparams),99k(spare),1056k(linux),2112k(rootfs),33k(nvram),-(rootfs_data) root=/dev/mtdblock4 ro console=/dev/ttyS0,115200,mem=32M\0"
--	"rdba=setenv bootargs mtdparts=AT45DB642.spi0:132k(bootloader),33k(ubparams),99k(spare),1056k(linux),2112k(rootfs),33k(nvram),-(rootfs_data) root=/dev/ram rw initrd=0x21200000,6000000 ramdisk_size=20000 console=/dev/ttyS0,115200,mem=32M\0"
-+	"fbargs=setenv bootargs root=/dev/mtdblock3 ro console=/dev/ttyS0,115200,mem=32M\0"
-+	"rdba=setenv bootargs root=/dev/ram rw initrd=0x21200000,6000000 ramdisk_size=20000 console=/dev/ttyS0,115200,mem=32M\0"
- 	"rdram=run rdba; tftp 21000000 vImage; tftp 21200000 root.squashfs; bootm 21000000\0"
- 	"flash=run fbargs; bootm 0xc0042000\0"
--	"bootargs=setenv bootargs mtdparts=AT45DB642.spi0:132k(bootloader),33k(ubparams),99k(spare),1056k(linux),2112k(rootfs),33k(nvram),-(rootfs_data) root=/dev/mtdblock4 ro console=/dev/ttyS0,115200,mem=32M\0"
-+	"bootargs=setenv bootargs root=/dev/mtdblock3 ro console=/dev/ttyS0,115200,mem=32M\0"
- 	"bootcmd=bootm 0xc0042000\0"
- 	"ethaddr=00:30:49:00:00:01\0"
- 	"ipaddr=10.0.1.73\0"
diff --git a/target/linux/at91/image/u-boot/patches/012-make_3.81.patch b/target/linux/at91/image/u-boot/patches/012-make_3.81.patch
deleted file mode 100644
index 767493f90..000000000
--- a/target/linux/at91/image/u-boot/patches/012-make_3.81.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -urN u-boot-1.1.4.orig/examples/Makefile u-boot-1.1.4/examples/Makefile
---- u-boot-1.1.4.orig/examples/Makefile	2007-05-13 13:45:44.000000000 +0200
-+++ u-boot-1.1.4/examples/Makefile	2007-05-13 13:48:43.000000000 +0200
-@@ -123,10 +123,10 @@
- 	$(LD) -g $(EX_LDFLAGS) -Ttext $(LOAD_ADDR) \
- 		-o $@ -e $(<:.o=) $< $(LIB) \
- 		-L$(gcclibdir) -lgcc
--%.srec:	%
-+%.srec:	%.o
- 	$(OBJCOPY) -O srec $< $@ 2>/dev/null
- 
--%.bin:	%
-+%.bin:	%.o
- 	$(OBJCOPY) -O binary $< $@ 2>/dev/null
- 
- #########################################################################
diff --git a/target/linux/at91/image/u-boot/patches/013-params-in-config.patch b/target/linux/at91/image/u-boot/patches/013-params-in-config.patch
deleted file mode 100644
index 5f4220923..000000000
--- a/target/linux/at91/image/u-boot/patches/013-params-in-config.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- u-boot-1.1.4.old/tools/Makefile	2007-06-13 13:35:59.000000000 +0200
-+++ u-boot-1.1.4/tools/Makefile	2007-06-14 15:33:04.000000000 +0200
-@@ -153,7 +153,7 @@
- 		$(STRIP) $@
- 
- ubparams.o: ubparams.c
--		$(CC) -g $(CFLAGS) -c $<
-+		$(CC) -g $(CFLAGS) -DLAN_IP=$(LAN_IP) -DLAN_SERVERIP=$(LAN_SERVERIP) -c $<
- 
- envcrc.o:	envcrc.c
- 		$(CC) -g $(CFLAGS) -c $<
---- u-boot-1.1.4.old/tools/ubparams.c	2007-06-13 13:35:59.000000000 +0200
-+++ u-boot-1.1.4/tools/ubparams.c	2007-06-14 15:31:55.000000000 +0200
-@@ -44,8 +44,8 @@
- 	"bootargs=setenv bootargs root=/dev/mtdblock3 ro console=/dev/ttyS0,115200,mem=32M\0"
- 	"bootcmd=bootm 0xc0042000\0"
- 	"ethaddr=00:30:49:00:00:01\0"
--	"ipaddr=10.0.1.73\0"
--	"serverip=10.0.1.210\0"
-+	"ipaddr=" MK_STR(LAN_IP) "\0"
-+	"serverip=" MK_STR(LAN_SERVERIP) "\0"
- 	"serial#=MX070205484\0"
- 	"\0"
- 	};
diff --git a/target/linux/at91/image/u-boot/patches/014-ubparam-kernel.patch b/target/linux/at91/image/u-boot/patches/014-ubparam-kernel.patch
deleted file mode 100644
index 26f03474e..000000000
--- a/target/linux/at91/image/u-boot/patches/014-ubparam-kernel.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- u-boot-1.1.4.old/tools/ubparams.c	2007-06-19 14:24:39.000000000 +0200
-+++ u-boot-1.1.4/tools/ubparams.c	2007-06-19 14:25:05.000000000 +0200
-@@ -39,7 +39,7 @@
- 	"stderr=serial\0"
- 	"fbargs=setenv bootargs root=/dev/mtdblock3 ro console=/dev/ttyS0,115200,mem=32M\0"
- 	"rdba=setenv bootargs root=/dev/ram rw initrd=0x21200000,6000000 ramdisk_size=20000 console=/dev/ttyS0,115200,mem=32M\0"
--	"rdram=run rdba; tftp 21000000 vImage; tftp 21200000 root.squashfs; bootm 21000000\0"
-+	"rdram=run rdba; tftp 21000000 uImage; tftp 21200000 root.squashfs; bootm 21000000\0"
- 	"flash=run fbargs; bootm 0xc0042000\0"
- 	"bootargs=setenv bootargs root=/dev/mtdblock3 ro console=/dev/ttyS0,115200,mem=32M\0"
- 	"bootcmd=bootm 0xc0042000\0"
diff --git a/target/linux/at91/image/u-boot/patches/015-eabi_fixes.patch b/target/linux/at91/image/u-boot/patches/015-eabi_fixes.patch
deleted file mode 100644
index ec94a4b40..000000000
--- a/target/linux/at91/image/u-boot/patches/015-eabi_fixes.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Index: git/lib_arm/div0.c
-===================================================================
---- git.orig/lib_arm/div0.c
-+++ git/lib_arm/div0.c
-@@ -22,9 +22,3 @@
-  */
- 
- /* Replacement (=dummy) for GNU/Linux division-by zero handler */
--void __div0 (void)
--{
--	extern void hang (void);
--
--	hang();
--}
-Index: git/Makefile
-===================================================================
---- git.orig/Makefile
-+++ git/Makefile
-@@ -225,7 +225,7 @@ LIBS := $(addprefix $(obj),$(LIBS))
- .PHONY : $(LIBS)
- 
- # Add GCC lib
--PLATFORM_LIBS += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc
-+PLATFORM_LIBS += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc -lgcc_eh
- 
- # The "tools" are needed early, so put this first
- # Don't include stuff already done in $(LIBS)
---- a/board/vlink/vlink.c	2009-10-29 16:40:33.000000000 +0100
-+++ b/board/vlink/vlink.c	2009-10-29 16:43:27.000000000 +0100
-@@ -33,6 +33,9 @@
-  * Miscelaneous platform dependent initialisations
-  */
- 
-+void raise() {}
-+void abort() {}
-+
- int board_init (void)
- {
- 	DECLARE_GLOBAL_DATA_PTR;
---- a/board/vlink/u-boot.lds	2009-10-29 16:40:33.000000000 +0100
-+++ b/board/vlink/u-boot.lds	2009-10-29 16:43:57.000000000 +0100
-@@ -38,6 +38,10 @@
- 
- 	. = ALIGN(4);
- 	.rodata : { *(.rodata) }
-+	.ARM.extab   : { *(.ARM.extab* .gnu.linkonce.armextab.*) }
-+	__exidx_start = .;
-+	.ARM.exidx   : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) }
-+	__exidx_end = .;
- 
- 	. = ALIGN(4);
- 	.data : { *(.data) }
diff --git a/target/linux/at91/image/u-boot/ubclient/Makefile b/target/linux/at91/image/u-boot/ubclient/Makefile
deleted file mode 100644
index f8ff67cd1..000000000
--- a/target/linux/at91/image/u-boot/ubclient/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-
-all: ubpar
-
-crc32.c:
-	ln -s ../lib_generic/crc32.c ./
-
-%.o: %.c
-	$(CC) -I ../include $(CFLAGS) $(EXTRA_FLAGS) -DLAN_IP=$(LAN_IP) -DLAN_SERVERIP=$(LAN_SERVERIP) -c -o $@ $^
-
-ubpar: ubpar.o crc32.o
-	$(CC) -o $@ $^
-
-clean:
-	rm -f *.o ubpar
diff --git a/target/linux/at91/image/u-boot/ubclient/ubpar.c b/target/linux/at91/image/u-boot/ubclient/ubpar.c
deleted file mode 100644
index edc5b2cdb..000000000
--- a/target/linux/at91/image/u-boot/ubclient/ubpar.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * ubparams.c
- * 
- * Generate a u-boot parameter block with correct crc
- *
- * (C) 1007 Guthrie Consulting
- * hamish@prodigi.ch
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifndef __ASSEMBLY__
-#define __ASSEMBLY__
-#endif
-#define __ASM_STUB_PROCESSOR_H__
-#include <config.h>
-#undef __ASSEMBLY__
-#include <environment.h>
-
-#define XMK_STR(x)  #x
-#define MK_STR(x)  XMK_STR(x)
-
-extern unsigned long crc32 (unsigned long, const unsigned char *, unsigned int);
-
-#if !defined(ENV_CRC)
-#define ENV_CRC ~0
-#endif
-
-#ifdef LAN_IP
-	#warning LAN_IP
-#else
-	#warning LAN_IP NOT DEFINED
-#endif
-#ifdef LAN_SERVERIP
-	#warning LAN_SERVERIP
-#else
-	#warning LAN_SERVERIP NOT DEFINED
-#endif
-
-static char *environment[] = {
-	"bootdelay=3\0"
-	"baudrate=115200\0"
-	"stdin=serial\0"
-	"stdout=serial\0"
-	"stderr=serial\0"
-	"fbargs=setenv bootargs root=/dev/mtdblock3 ro console=/dev/ttyS0,115200,mem=32M\0"
-	"rdba=setenv bootargs root=/dev/ram rw initrd=0x21200000,6000000 ramdisk_size=20000 console=/dev/ttyS0,115200,mem=32M\0"
-	"rdram=run rdba; tftp 21000000 uImage; tftp 21200000 root.squashfs; bootm 21000000\0"
-	"flash=run fbargs; bootm 0xc0042000\0"
-	"bootargs=setenv bootargs root=/dev/mtdblock3 ro console=/dev/ttyS0,115200,mem=32M\0"
-	"bootcmd=bootm 0xc0042000\0"
-	"ipaddr=" MK_STR(LAN_IP) "\0"
-	"serverip=" MK_STR(LAN_SERVERIP) "\0"
-	"\0"
-	};
-
-int main(int argc, char *argv[]) {
-	env_t *envptr;
-	char *src, *srcptr;
-	char *dataptr;
-	FILE *params;
-	int argfail = 1;
-	char newmac[30];
-	char newser[30];
-	int paramlen = 0;
-	int progmac = 0;
-	int progser = 0;
-
-	if (argc < 3) {
-		printf ("Invalid arguments\n");
-		return 1;
-		}
-
-	switch (argc) {
-		case 5:
-			if (strcmp(argv[3], "--serial") == 0) {
-				argfail = 0;
-				sprintf(newser, "serial#=%s", argv[4]);
-				progser = 1;
-				}
-		case 3:
-			if (strcmp(argv[1], "--mac") == 0) {
-				argfail = 0;
-				sprintf(newmac, "ethaddr=%s", argv[2]);
-				progmac = 1;
-				}
-			else
-				argfail = 1;
-		}
-
-	if (argfail) {
-		printf("Invalid arguments\n");
-		return 1;
-		}
-
-
-	src = srcptr = *environment;
-	envptr = (env_t *)malloc(CFG_ENV_SIZE);
-	dataptr = (char *)envptr + ENV_HEADER_SIZE;
-
-	while(*srcptr) {
-		//printf("%d, %s\n", strlen(srcptr), srcptr);
-		paramlen += strlen(srcptr) + 1;
-		srcptr += strlen(srcptr) + 1;
-		}
-
-	printf("Make u-boot params\n");
-	printf("Params size is %d\n", CFG_ENV_SIZE);
-
-	memset(envptr, 0, CFG_ENV_SIZE);
-	memcpy(dataptr, src, paramlen);
-	dataptr += paramlen;
-
-	if (progmac) {
-		memcpy(dataptr, newmac, strlen(newmac));
-		dataptr += strlen(newmac) + 1;
-		}
-
-	if (progser) {
-		memcpy(dataptr, newser, strlen(newser));
-		dataptr += strlen(newser) + 1;
-		}
-
-	envptr->crc = crc32(0, envptr->data, ENV_SIZE);
-
-	params = fopen("/dev/mtd1", "w");
-	fwrite(envptr, CFG_ENV_SIZE, 1, params);
-	fclose(params);
-
-	free(envptr);
-	return 0;
-}
diff --git a/target/linux/at91/patches-2.6.25/000-at91patches.patch b/target/linux/at91/patches-2.6.25/000-at91patches.patch
deleted file mode 100644
index 06c29351e..000000000
--- a/target/linux/at91/patches-2.6.25/000-at91patches.patch
+++ /dev/null
@@ -1,13019 +0,0 @@
---- a/arch/arm/mach-at91/Kconfig
-+++ b/arch/arm/mach-at91/Kconfig
-@@ -12,18 +12,28 @@ config ARCH_AT91RM9200
- 
- config ARCH_AT91SAM9260
- 	bool "AT91SAM9260 or AT91SAM9XE"
-+	select GENERIC_TIME
-+	select GENERIC_CLOCKEVENTS
- 
- config ARCH_AT91SAM9261
- 	bool "AT91SAM9261"
-+	select GENERIC_TIME
-+	select GENERIC_CLOCKEVENTS
- 
- config ARCH_AT91SAM9263
- 	bool "AT91SAM9263"
-+	select GENERIC_TIME
-+	select GENERIC_CLOCKEVENTS
- 
- config ARCH_AT91SAM9RL
- 	bool "AT91SAM9RL"
-+	select GENERIC_TIME
-+	select GENERIC_CLOCKEVENTS
- 
- config ARCH_AT91CAP9
- 	bool "AT91CAP9"
-+	select GENERIC_TIME
-+	select GENERIC_CLOCKEVENTS
- 
- config ARCH_AT91X40
- 	bool "AT91x40"
-@@ -45,7 +55,7 @@ config MACH_ONEARM
- 	depends on ARCH_AT91RM9200
- 	help
- 	  Select this if you are using Ajeco's 1ARM Single Board Computer.
--	  <http://www.ajeco.fi/products.htm>
-+	  <http://www.ajeco.fi/eng/products_e.htm>
- 
- config ARCH_AT91RM9200DK
- 	bool "Atmel AT91RM9200-DK Development board"
-@@ -94,7 +104,7 @@ config MACH_KB9200
- 	depends on ARCH_AT91RM9200
- 	help
- 	  Select this if you are using KwikByte's KB920x board.
--	  <http://kwikbyte.com/KB9202_description_new.htm>
-+	  <http://www.kwikbyte.com/KB9202.html>
- 
- config MACH_PICOTUX2XX
- 	bool "picotux 200"
-@@ -109,6 +119,38 @@ config MACH_KAFA
- 	help
- 	  Select this if you are using Sperry-Sun's KAFA board.
- 
-+config MACH_CHUB
-+	bool "Promwad Chub board"
-+	depends on ARCH_AT91RM9200
-+	help
-+	  Select this if you are using Promwad's Chub board.
-+
-+config MACH_HOMEMATIC
-+	bool "eQ-3 HomeMatic"
-+	depends on ARCH_AT91RM9200
-+	help
-+	  Select this if you are using eQ-3's HomeMatic device.
-+	  <http://www.eq-3.com>
-+
-+config MACH_ECBAT91
-+	bool "emQbit ECB_AT91 SBC"
-+	depends on ARCH_AT91RM9200
-+	help
-+	  Select this if you are using emQbit's ECB_AT91 board.
-+	  <http://wiki.emqbit.com/free-ecb-at91>
-+
-+config MACH_SWEDATMS
-+	bool "Sweda TMS Board"
-+	depends on ARCH_AT91RM9200
-+	help
-+	  Select this if you are using Sweda TMS-100 board.
-+
-+config MACH_TT9200
-+	bool "Toptech TT9200"
-+	depends on ARCH_AT91RM9200
-+	help
-+	  Select this if you are using Toptech's TT9200 board.
-+
- endif
- 
- # ----------------------------------------------------------
-@@ -133,6 +175,34 @@ config MACH_AT91SAM9260EK
- 	  Select this if you are using Atmel's AT91SAM9260-EK or AT91SAM9XE Evaluation Kit
- 	  <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3933>
- 
-+config MACH_CAM60
-+	bool "KwikByte KB9260 (CAM60) board"
-+	depends on ARCH_AT91SAM9260
-+	help
-+	  Select this if you are using KwikByte's KB9260 (CAM60) board based on the Atmel AT91SAM9260.
-+	  <http://www.kwikbyte.com/KB9260.html>
-+
-+config MACH_SAM9_L9260
-+	bool "Olimex SAM9-L9260 board"
-+	depends on ARCH_AT91SAM9260
-+	help
-+	  Select this if you are using Olimex's SAM9-L9260 board based on the Atmel AT91SAM9260.
-+	  <http://www.olimex.com/dev/sam9-L9260.html>
-+
-+config MACH_USB_A9260
-+	bool "CALAO USB-A9260"
-+	depends on ARCH_AT91SAM9260
-+	help
-+	  Select this if you are using a Calao Systems USB-A9260.
-+	  <http://www.calao-systems.com>
-+
-+config MACH_QIL_A9260
-+	bool "CALAO QIL-A9260 board"
-+	depends on ARCH_AT91SAM9260
-+	help
-+	  Select this if you are using a Calao Systems QIL-A9260 Board.
-+	  <http://www.calao-systems.com>
-+
- endif
- 
- # ----------------------------------------------------------
-@@ -163,6 +233,13 @@ config MACH_AT91SAM9263EK
- 	  Select this if you are using Atmel's AT91SAM9263-EK Evaluation Kit.
- 	  <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4057>
- 
-+config MACH_USB_A9263
-+	bool "CALAO USB-A9263"
-+	depends on ARCH_AT91SAM9263
-+	help
-+	  Select this if you are using a Calao Systems USB-A9263.
-+	  <http://www.calao-systems.com>
-+
- endif
- 
- # ----------------------------------------------------------
-@@ -216,7 +293,7 @@ comment "AT91 Board Options"
- 
- config MTD_AT91_DATAFLASH_CARD
- 	bool "Enable DataFlash Card support"
--	depends on (ARCH_AT91RM9200DK || MACH_AT91RM9200EK || MACH_AT91SAM9260EK || MACH_AT91SAM9261EK || MACH_AT91SAM9263EK || MACH_AT91CAP9ADK)
-+	depends on (ARCH_AT91RM9200DK || MACH_AT91RM9200EK || MACH_AT91SAM9260EK || MACH_AT91SAM9261EK || MACH_AT91SAM9263EK || MACH_ECBAT91 || MACH_SAM9_L9260 || MACH_AT91CAP9ADK)
- 	help
- 	  Enable support for the DataFlash card.
- 
-@@ -237,6 +314,19 @@ config AT91_PROGRAMMABLE_CLOCKS
- 	  Select this if you need to program one or more of the PCK0..PCK3
- 	  programmable clock outputs.
- 
-+config AT91_SLOW_CLOCK
-+	bool "Suspend-to-RAM disables main oscillator"
-+	depends on SUSPEND
-+	help
-+	  Select this if you want Suspend-to-RAM to save the most power
-+	  possible (without powering off the CPU) by disabling the PLLs
-+	  and main oscillator so that only the 32 KiHz clock is available.
-+
-+	  When only that slow-clock is available, some peripherals lose
-+	  functionality.  Many can't issue wakeup events unless faster
-+	  clocks are available.  Some lose their operating state and
-+	  need to be completely re-initialized.
-+
- config AT91_TIMER_HZ
-        int "Kernel HZ (jiffies per second)"
-        range 32 1024
---- a/arch/arm/mach-at91/Makefile
-+++ b/arch/arm/mach-at91/Makefile
-@@ -28,16 +28,26 @@ obj-$(CONFIG_MACH_CARMEVA)	+= board-carm
- obj-$(CONFIG_MACH_KB9200)	+= board-kb9202.o
- obj-$(CONFIG_MACH_ATEB9200)	+= board-eb9200.o
- obj-$(CONFIG_MACH_KAFA)		+= board-kafa.o
-+obj-$(CONFIG_MACH_CHUB)		+= board-chub.o
- obj-$(CONFIG_MACH_PICOTUX2XX)	+= board-picotux200.o
-+obj-$(CONFIG_MACH_HOMEMATIC)	+= board-homematic.o
-+obj-$(CONFIG_MACH_ECBAT91)	+= board-ecbat91.o
-+obj-$(CONFIG_MACH_SWEDATMS)	+= board-tms.o
-+obj-$(CONFIG_MACH_TT9200)	+= board-tt9200.o
- 
- # AT91SAM9260 board-specific support
- obj-$(CONFIG_MACH_AT91SAM9260EK) += board-sam9260ek.o
-+obj-$(CONFIG_MACH_CAM60)	+= board-cam60.o
-+obj-$(CONFIG_MACH_SAM9_L9260)	+= board-sam9-l9260.o
-+obj-$(CONFIG_MACH_USB_A9260)	+= board-usb-a9260.o
-+obj-$(CONFIG_MACH_QIL_A9260)	+= board-qil-a9260.o
- 
- # AT91SAM9261 board-specific support
- obj-$(CONFIG_MACH_AT91SAM9261EK) += board-sam9261ek.o
- 
- # AT91SAM9263 board-specific support
- obj-$(CONFIG_MACH_AT91SAM9263EK) += board-sam9263ek.o
-+obj-$(CONFIG_MACH_USB_A9263)	+= board-usb-a9263.o
- 
- # AT91SAM9RL board-specific support
- obj-$(CONFIG_MACH_AT91SAM9RLEK)	+= board-sam9rlek.o
-@@ -50,9 +60,11 @@ obj-$(CONFIG_MACH_AT91EB01)	+= board-eb0
- 
- # Drivers
- obj-y				+= leds.o
-+obj-$(CONFIG_FB_S1D13XXX)	+= ics1523.o
- 
- # Power Management
- obj-$(CONFIG_PM)		+= pm.o
-+obj-$(CONFIG_AT91_SLOW_CLOCK)	+= pm_slowclock.o
- 
- ifeq ($(CONFIG_PM_DEBUG),y)
- CFLAGS_pm.o += -DDEBUG
---- a/arch/arm/mach-at91/at91cap9.c
-+++ b/arch/arm/mach-at91/at91cap9.c
-@@ -13,12 +13,15 @@
-  */
- 
- #include <linux/module.h>
-+#include <linux/pm.h>
- 
- #include <asm/mach/arch.h>
- #include <asm/mach/map.h>
-+#include <asm/arch/cpu.h>
- #include <asm/arch/at91cap9.h>
- #include <asm/arch/at91_pmc.h>
- #include <asm/arch/at91_rstc.h>
-+#include <asm/arch/at91_shdwc.h>
- 
- #include "generic.h"
- #include "clock.h"
-@@ -288,6 +291,12 @@ static void at91cap9_reset(void)
- 	at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_PROCRST | AT91_RSTC_PERRST);
- }
- 
-+static void at91cap9_poweroff(void)
-+{
-+	at91_sys_write(AT91_SHDW_CR, AT91_SHDW_KEY | AT91_SHDW_SHDW);
-+}
-+
-+
- /* --------------------------------------------------------------------
-  *  AT91CAP9 processor initialization
-  * -------------------------------------------------------------------- */
-@@ -298,6 +307,7 @@ void __init at91cap9_initialize(unsigned
- 	iotable_init(at91cap9_io_desc, ARRAY_SIZE(at91cap9_io_desc));
- 
- 	at91_arch_reset = at91cap9_reset;
-+	pm_power_off = at91cap9_poweroff;
- 	at91_extern_irq = (1 << AT91CAP9_ID_IRQ0) | (1 << AT91CAP9_ID_IRQ1);
- 
- 	/* Init clock subsystem */
-@@ -308,6 +318,12 @@ void __init at91cap9_initialize(unsigned
- 
- 	/* Register GPIO subsystem */
- 	at91_gpio_init(at91cap9_gpio, 4);
-+
-+	/* Remember the silicon revision */
-+	if (cpu_is_at91cap9_revB())
-+		system_rev = 0xB;
-+	else if (cpu_is_at91cap9_revC())
-+		system_rev = 0xC;
- }
- 
- /* --------------------------------------------------------------------
---- a/arch/arm/mach-at91/at91cap9_devices.c
-+++ b/arch/arm/mach-at91/at91cap9_devices.c
-@@ -13,18 +13,20 @@
-  */
- #include <asm/mach/arch.h>
- #include <asm/mach/map.h>
-+#include <asm/mach/irq.h>
- 
- #include <linux/dma-mapping.h>
- #include <linux/platform_device.h>
--#include <linux/mtd/physmap.h>
-+#include <linux/i2c-gpio.h>
- 
- #include <video/atmel_lcdc.h>
- 
- #include <asm/arch/board.h>
-+#include <asm/arch/cpu.h>
- #include <asm/arch/gpio.h>
- #include <asm/arch/at91cap9.h>
--#include <asm/arch/at91sam926x_mc.h>
- #include <asm/arch/at91cap9_matrix.h>
-+#include <asm/arch/at91sam9_smc.h>
- 
- #include "generic.h"
- 
-@@ -69,6 +71,9 @@ void __init at91_add_device_usbh(struct 
- 	if (!data)
- 		return;
- 
-+	if (cpu_is_at91cap9_revB())
-+		set_irq_type(AT91CAP9_ID_UHP, IRQT_HIGH);
-+
- 	/* Enable VBus control for UHP ports */
- 	for (i = 0; i < data->ports; i++) {
- 		if (data->vbus_pin[i])
-@@ -84,6 +89,110 @@ void __init at91_add_device_usbh(struct 
- 
- 
- /* --------------------------------------------------------------------
-+ *  USB HS Device (Gadget)
-+ * -------------------------------------------------------------------- */
-+
-+#if defined(CONFIG_USB_GADGET_ATMEL_USBA) || defined(CONFIG_USB_GADGET_ATMEL_USBA_MODULE)
-+
-+static struct resource usba_udc_resources[] = {
-+	[0] = {
-+		.start	= AT91CAP9_UDPHS_FIFO,
-+		.end	= AT91CAP9_UDPHS_FIFO + SZ_512K - 1,
-+		.flags	= IORESOURCE_MEM,
-+	},
-+	[1] = {
-+		.start	= AT91CAP9_BASE_UDPHS,
-+		.end	= AT91CAP9_BASE_UDPHS + SZ_1K - 1,
-+		.flags	= IORESOURCE_MEM,
-+	},
-+	[2] = {
-+		.start	= AT91CAP9_ID_UDPHS,
-+		.end	= AT91CAP9_ID_UDPHS,
-+		.flags	= IORESOURCE_IRQ,
-+	},
-+};
-+
-+#define EP(nam, idx, maxpkt, maxbk, dma, isoc)			\
-+	[idx] = {						\
-+		.name		= nam,				\
-+		.index		= idx,				\
-+		.fifo_size	= maxpkt,			\
-+		.nr_banks	= maxbk,			\
-+		.can_dma	= dma,				\
-+		.can_isoc	= isoc,				\
-+	}
-+
-+static struct usba_ep_data usba_udc_ep[] = {
-+	EP("ep0", 0,   64, 1, 0, 0),
-+	EP("ep1", 1, 1024, 3, 1, 1),
-+	EP("ep2", 2, 1024, 3, 1, 1),
-+	EP("ep3", 3, 1024, 2, 1, 1),
-+	EP("ep4", 4, 1024, 2, 1, 1),
-+	EP("ep5", 5, 1024, 2, 1, 0),
-+	EP("ep6", 6, 1024, 2, 1, 0),
-+	EP("ep7", 7, 1024, 2, 0, 0),
-+};
-+
-+#undef EP
-+
-+/*
-+ * pdata doesn't have room for any endpoints, so we need to
-+ * append room for the ones we need right after it.
-+ */
-+static struct {
-+	struct usba_platform_data pdata;
-+	struct usba_ep_data ep[8];
-+} usba_udc_data;
-+
-+static struct platform_device at91_usba_udc_device = {
-+	.name		= "atmel_usba_udc",
-+	.id		= -1,
-+	.dev		= {
-+				.platform_data	= &usba_udc_data.pdata,
-+	},
-+	.resource	= usba_udc_resources,
-+	.num_resources	= ARRAY_SIZE(usba_udc_resources),
-+};
-+
-+void __init at91_add_device_usba(struct usba_platform_data *data)
-+{
-+	if (cpu_is_at91cap9_revB()) {
-+		set_irq_type(AT91CAP9_ID_UDPHS, IRQT_HIGH);
-+		at91_sys_write(AT91_MATRIX_UDPHS, AT91_MATRIX_SELECT_UDPHS |
-+						  AT91_MATRIX_UDPHS_BYPASS_LOCK);
-+	}
-+	else
-+		at91_sys_write(AT91_MATRIX_UDPHS, AT91_MATRIX_SELECT_UDPHS);
-+
-+	/*
-+	 * Invalid pins are 0 on AT91, but the usba driver is shared
-+	 * with AVR32, which use negative values instead. Once/if
-+	 * gpio_is_valid() is ported to AT91, revisit this code.
-+	 */
-+	usba_udc_data.pdata.vbus_pin = -EINVAL;
-+	usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep);
-+	memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));;
-+
-+	if (data && data->vbus_pin > 0) {
-+		at91_set_gpio_input(data->vbus_pin, 0);
-+		at91_set_deglitch(data->vbus_pin, 1);
-+		usba_udc_data.pdata.vbus_pin = data->vbus_pin;
-+	}
-+
-+	/* Pullup pin is handled internally by USB device peripheral */
-+
-+	/* Clocks */
-+	at91_clock_associate("utmi_clk", &at91_usba_udc_device.dev, "hclk");
-+	at91_clock_associate("udphs_clk", &at91_usba_udc_device.dev, "pclk");
-+
-+	platform_device_register(&at91_usba_udc_device);
-+}
-+#else
-+void __init at91_add_device_usba(struct usba_platform_data *data) {}
-+#endif
-+
-+
-+/* --------------------------------------------------------------------
-  *  Ethernet
-  * -------------------------------------------------------------------- */
- 
-@@ -246,7 +355,7 @@ void __init at91_add_device_mmc(short mm
- 		}
- 
- 		mmc0_data = *data;
--		at91_clock_associate("mci0_clk", &at91cap9_mmc1_device.dev, "mci_clk");
-+		at91_clock_associate("mci0_clk", &at91cap9_mmc0_device.dev, "mci_clk");
- 		platform_device_register(&at91cap9_mmc0_device);
- 	} else {			/* MCI1 */
- 		/* CLK */
-@@ -283,10 +392,15 @@ static struct at91_nand_data nand_data;
- #define NAND_BASE	AT91_CHIPSELECT_3
- 
- static struct resource nand_resources[] = {
--	{
-+	[0] = {
- 		.start	= NAND_BASE,
- 		.end	= NAND_BASE + SZ_256M - 1,
- 		.flags	= IORESOURCE_MEM,
-+	},
-+	[1] = {
-+		.start	= AT91_BASE_SYS + AT91_ECC,
-+		.end	= AT91_BASE_SYS + AT91_ECC + SZ_512 - 1,
-+		.flags	= IORESOURCE_MEM,
- 	}
- };
- 
-@@ -344,6 +458,7 @@ void __init at91_add_device_nand(struct 
- void __init at91_add_device_nand(struct at91_nand_data *data) {}
- #endif
- 
-+
- /* --------------------------------------------------------------------
-  *  TWI (i2c)
-  * -------------------------------------------------------------------- */
-@@ -532,17 +647,64 @@ void __init at91_add_device_spi(struct s
- 
- 
- /* --------------------------------------------------------------------
-+ *  Timer/Counter block
-+ * -------------------------------------------------------------------- */
-+
-+#ifdef CONFIG_ATMEL_TCLIB
-+
-+static struct resource tcb_resources[] = {
-+	[0] = {
-+		.start	= AT91CAP9_BASE_TCB0,
-+		.end	= AT91CAP9_BASE_TCB0 + SZ_16K - 1,
-+		.flags	= IORESOURCE_MEM,
-+	},
-+	[1] = {
-+		.start	= AT91CAP9_ID_TCB,
-+		.end	= AT91CAP9_ID_TCB,
-+		.flags	= IORESOURCE_IRQ,
-+	},
-+};
-+
-+static struct platform_device at91cap9_tcb_device = {
-+	.name		= "atmel_tcb",
-+	.id		= 0,
-+	.resource	= tcb_resources,
-+	.num_resources	= ARRAY_SIZE(tcb_resources),
-+};
-+
-+static void __init at91_add_device_tc(void)
-+{
-+	/* this chip has one clock and irq for all three TC channels */
-+	at91_clock_associate("tcb_clk", &at91cap9_tcb_device.dev, "t0_clk");
-+	platform_device_register(&at91cap9_tcb_device);
-+}
-+#else
-+static void __init at91_add_device_tc(void) { }
-+#endif
-+
-+
-+/* --------------------------------------------------------------------
-  *  RTT
-  * -------------------------------------------------------------------- */
- 
-+static struct resource rtt_resources[] = {
-+	{
-+		.start	= AT91_BASE_SYS + AT91_RTT,
-+		.end	= AT91_BASE_SYS + AT91_RTT + SZ_16 - 1,
-+		.flags	= IORESOURCE_MEM,
-+	}
-+};
-+
- static struct platform_device at91cap9_rtt_device = {
- 	.name		= "at91_rtt",
--	.id		= -1,
--	.num_resources	= 0,
-+	.id		= 0,
-+	.resource	= rtt_resources,
-+	.num_resources	= ARRAY_SIZE(rtt_resources),
- };
- 
- static void __init at91_add_device_rtt(void)
- {
-+	device_init_wakeup(&at91cap9_rtt_device.dev, 1);
- 	platform_device_register(&at91cap9_rtt_device);
- }
- 
-@@ -660,6 +822,9 @@ void __init at91_add_device_lcdc(struct 
- 	if (!data)
- 		return;
- 
-+	if (cpu_is_at91cap9_revB())
-+		set_irq_type(AT91CAP9_ID_LCDC, IRQT_HIGH);
-+
- 	at91_set_A_periph(AT91_PIN_PC1, 0);	/* LCDHSYNC */
- 	at91_set_A_periph(AT91_PIN_PC2, 0);	/* LCDDOTCK */
- 	at91_set_A_periph(AT91_PIN_PC3, 0);	/* LCDDEN */
-@@ -990,7 +1155,7 @@ static inline void configure_usart2_pins
- 		at91_set_B_periph(AT91_PIN_PD6, 0);	/* CTS2 */
- }
- 
--static struct platform_device *at91_uarts[ATMEL_MAX_UART];	/* the UARTs to use */
-+static struct platform_device *__initdata at91_uarts[ATMEL_MAX_UART];	/* the UARTs to use */
- struct platform_device *atmel_default_console_device;	/* the serial console device */
- 
- void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins)
-@@ -1031,8 +1196,6 @@ void __init at91_set_serial_console(unsi
- {
- 	if (portnr < ATMEL_MAX_UART)
- 		atmel_default_console_device = at91_uarts[portnr];
--	if (!atmel_default_console_device)
--		printk(KERN_INFO "AT91: No default serial console defined.\n");
- }
- 
- void __init at91_add_device_serial(void)
-@@ -1043,6 +1206,9 @@ void __init at91_add_device_serial(void)
- 		if (at91_uarts[i])
- 			platform_device_register(at91_uarts[i]);
- 	}
-+
-+	if (!atmel_default_console_device)
-+		printk(KERN_INFO "AT91: No default serial console defined.\n");
- }
- #else
- void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) {}
-@@ -1060,6 +1226,7 @@ static int __init at91_add_standard_devi
- {
- 	at91_add_device_rtt();
- 	at91_add_device_watchdog();
-+	at91_add_device_tc();
- 	return 0;
- }
- 
---- a/arch/arm/mach-at91/at91rm9200_devices.c
-+++ b/arch/arm/mach-at91/at91rm9200_devices.c
-@@ -513,7 +513,18 @@ void __init at91_add_device_i2c(struct i
-  *  SPI
-  * -------------------------------------------------------------------- */
- 
--#if defined(CONFIG_SPI_ATMEL) || defined(CONFIG_SPI_ATMEL_MODULE)
-+#if defined(CONFIG_AT91_SPI) || defined(CONFIG_AT91_SPI_MODULE)		/* legacy SPI driver */
-+#define SPI_DEVNAME	"at91_spi"
-+
-+#elif defined(CONFIG_SPI_AT91) || defined(CONFIG_SPI_AT91_MODULE)	/* SPI bitbanging driver */
-+#define SPI_DEVNAME	"at91_spi"
-+
-+#elif defined(CONFIG_SPI_ATMEL) || defined(CONFIG_SPI_ATMEL_MODULE)	/* new SPI driver */
-+#define SPI_DEVNAME	"atmel_spi"
-+
-+#endif
-+
-+#ifdef SPI_DEVNAME
- static u64 spi_dmamask = DMA_BIT_MASK(32);
- 
- static struct resource spi_resources[] = {
-@@ -530,7 +541,7 @@ static struct resource spi_resources[] =
- };
- 
- static struct platform_device at91rm9200_spi_device = {
--	.name		= "atmel_spi",
-+	.name		= SPI_DEVNAME,
- 	.id		= 0,
- 	.dev		= {
- 				.dma_mask		= &spi_dmamask,
-@@ -563,6 +574,12 @@ void __init at91_add_device_spi(struct s
- 		else
- 			at91_set_gpio_output(cs_pin, 1);
- 
-+#if defined(CONFIG_AT91_SPI) || defined(CONFIG_AT91_SPI_MODULE)
-+		/*
-+		 * Force peripheral mode when using the legacy SPI driver.
-+		 */
-+		at91_set_A_periph(cs_pin, 0);
-+#endif
- 
- 		/* pass chip-select pin to driver */
- 		devices[i].controller_data = (void *) cs_pin;
-@@ -577,6 +594,90 @@ void __init at91_add_device_spi(struct s
- 
- 
- /* --------------------------------------------------------------------
-+ *  Timer/Counter blocks
-+ * -------------------------------------------------------------------- */
-+
-+#ifdef CONFIG_ATMEL_TCLIB
-+
-+static struct resource tcb0_resources[] = {
-+	[0] = {
-+		.start	= AT91RM9200_BASE_TCB0,
-+		.end	= AT91RM9200_BASE_TCB0 + SZ_16K - 1,
-+		.flags	= IORESOURCE_MEM,
-+	},
-+	[1] = {
-+		.start	= AT91RM9200_ID_TC0,
-+		.end	= AT91RM9200_ID_TC0,
-+		.flags	= IORESOURCE_IRQ,
-+	},
-+	[2] = {
-+		.start	= AT91RM9200_ID_TC1,
-+		.end	= AT91RM9200_ID_TC1,
-+		.flags	= IORESOURCE_IRQ,
-+	},
-+	[3] = {
-+		.start	= AT91RM9200_ID_TC2,
-+		.end	= AT91RM9200_ID_TC2,
-+		.flags	= IORESOURCE_IRQ,
-+	},
-+};
-+
-+static struct platform_device at91rm9200_tcb0_device = {
-+	.name		= "atmel_tcb",
-+	.id		= 0,
-+	.resource	= tcb0_resources,
-+	.num_resources	= ARRAY_SIZE(tcb0_resources),
-+};
-+
-+static struct resource tcb1_resources[] = {
-+	[0] = {
-+		.start	= AT91RM9200_BASE_TCB1,
-+		.end	= AT91RM9200_BASE_TCB1 + SZ_16K - 1,
-+		.flags	= IORESOURCE_MEM,
-+	},
-+	[1] = {
-+		.start	= AT91RM9200_ID_TC3,
-+		.end	= AT91RM9200_ID_TC3,
-+		.flags	= IORESOURCE_IRQ,
-+	},
-+	[2] = {
-+		.start	= AT91RM9200_ID_TC4,
-+		.end	= AT91RM9200_ID_TC4,
-+		.flags	= IORESOURCE_IRQ,
-+	},
-+	[3] = {
-+		.start	= AT91RM9200_ID_TC5,
-+		.end	= AT91RM9200_ID_TC5,
-+		.flags	= IORESOURCE_IRQ,
-+	},
-+};
-+
-+static struct platform_device at91rm9200_tcb1_device = {
-+	.name		= "atmel_tcb",
-+	.id		= 1,
-+	.resource	= tcb1_resources,
-+	.num_resources	= ARRAY_SIZE(tcb1_resources),
-+};
-+
-+static void __init at91_add_device_tc(void)
-+{
-+	/* this chip has a separate clock and irq for each TC channel */
-+	at91_clock_associate("tc0_clk", &at91rm9200_tcb0_device.dev, "t0_clk");
-+	at91_clock_associate("tc1_clk", &at91rm9200_tcb0_device.dev, "t1_clk");
-+	at91_clock_associate("tc2_clk", &at91rm9200_tcb0_device.dev, "t2_clk");
-+	platform_device_register(&at91rm9200_tcb0_device);
-+
-+	at91_clock_associate("tc3_clk", &at91rm9200_tcb1_device.dev, "t0_clk");
-+	at91_clock_associate("tc4_clk", &at91rm9200_tcb1_device.dev, "t1_clk");
-+	at91_clock_associate("tc5_clk", &at91rm9200_tcb1_device.dev, "t2_clk");
-+	platform_device_register(&at91rm9200_tcb1_device);
-+}
-+#else
-+static void __init at91_add_device_tc(void) { }
-+#endif
-+
-+
-+/* --------------------------------------------------------------------
-  *  RTC
-  * -------------------------------------------------------------------- */
- 
-@@ -589,6 +690,7 @@ static struct platform_device at91rm9200
- 
- static void __init at91_add_device_rtc(void)
- {
-+	device_init_wakeup(&at91rm9200_rtc_device.dev, 1);
- 	platform_device_register(&at91rm9200_rtc_device);
- }
- #else
-@@ -1019,7 +1121,7 @@ static inline void configure_usart3_pins
- 		at91_set_B_periph(AT91_PIN_PB0, 0);	/* RTS3 */
- }
- 
--static struct platform_device *at91_uarts[ATMEL_MAX_UART];	/* the UARTs to use */
-+static struct platform_device *__initdata at91_uarts[ATMEL_MAX_UART];	/* the UARTs to use */
- struct platform_device *atmel_default_console_device;	/* the serial console device */
- 
- void __init __deprecated at91_init_serial(struct at91_uart_config *config)
-@@ -1110,8 +1212,6 @@ void __init at91_set_serial_console(unsi
- {
- 	if (portnr < ATMEL_MAX_UART)
- 		atmel_default_console_device = at91_uarts[portnr];
--	if (!atmel_default_console_device)
--		printk(KERN_INFO "AT91: No default serial console defined.\n");
- }
- 
- void __init at91_add_device_serial(void)
-@@ -1122,6 +1222,9 @@ void __init at91_add_device_serial(void)
- 		if (at91_uarts[i])
- 			platform_device_register(at91_uarts[i]);
- 	}
-+
-+	if (!atmel_default_console_device)
-+		printk(KERN_INFO "AT91: No default serial console defined.\n");
- }
- #else
- void __init __deprecated at91_init_serial(struct at91_uart_config *config) {}
-@@ -1141,6 +1244,7 @@ static int __init at91_add_standard_devi
- {
- 	at91_add_device_rtc();
- 	at91_add_device_watchdog();
-+	at91_add_device_tc();
- 	return 0;
- }
- 
---- a/arch/arm/mach-at91/at91rm9200_time.c
-+++ b/arch/arm/mach-at91/at91rm9200_time.c
-@@ -136,8 +136,6 @@ clkevt32k_next_event(unsigned long delta
- 	u32		alm;
- 	int		status = 0;
- 
--	BUG_ON(delta < 2);
--
- 	/* Use "raw" primitives so we behave correctly on RT kernels. */
- 	raw_local_irq_save(flags);
- 
---- a/arch/arm/mach-at91/at91sam9260.c
-+++ b/arch/arm/mach-at91/at91sam9260.c
-@@ -11,6 +11,7 @@
-  */
- 
- #include <linux/module.h>
-+#include <linux/pm.h>
- 
- #include <asm/mach/arch.h>
- #include <asm/mach/map.h>
-@@ -18,6 +19,7 @@
- #include <asm/arch/at91sam9260.h>
- #include <asm/arch/at91_pmc.h>
- #include <asm/arch/at91_rstc.h>
-+#include <asm/arch/at91_shdwc.h>
- 
- #include "generic.h"
- #include "clock.h"
-@@ -267,6 +269,11 @@ static void at91sam9260_reset(void)
- 	at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_PROCRST | AT91_RSTC_PERRST);
- }
- 
-+static void at91sam9260_poweroff(void)
-+{
-+	at91_sys_write(AT91_SHDW_CR, AT91_SHDW_KEY | AT91_SHDW_SHDW);
-+}
-+
- 
- /* --------------------------------------------------------------------
-  *  AT91SAM9260 processor initialization
-@@ -304,6 +311,7 @@ void __init at91sam9260_initialize(unsig
- 		iotable_init(at91sam9260_sram_desc, ARRAY_SIZE(at91sam9260_sram_desc));
- 
- 	at91_arch_reset = at91sam9260_reset;
-+	pm_power_off = at91sam9260_poweroff;
- 	at91_extern_irq = (1 << AT91SAM9260_ID_IRQ0) | (1 << AT91SAM9260_ID_IRQ1)
- 			| (1 << AT91SAM9260_ID_IRQ2);
- 
---- a/arch/arm/mach-at91/at91sam9260_devices.c
-+++ b/arch/arm/mach-at91/at91sam9260_devices.c
-@@ -19,8 +19,8 @@
- #include <asm/arch/board.h>
- #include <asm/arch/gpio.h>
- #include <asm/arch/at91sam9260.h>
--#include <asm/arch/at91sam926x_mc.h>
- #include <asm/arch/at91sam9260_matrix.h>
-+#include <asm/arch/at91sam9_smc.h>
- 
- #include "generic.h"
- 
-@@ -288,10 +288,15 @@ static struct at91_nand_data nand_data;
- #define NAND_BASE	AT91_CHIPSELECT_3
- 
- static struct resource nand_resources[] = {
--	{
-+	[0] = {
- 		.start	= NAND_BASE,
- 		.end	= NAND_BASE + SZ_256M - 1,
- 		.flags	= IORESOURCE_MEM,
-+	},
-+	[1] = {
-+		.start	= AT91_BASE_SYS + AT91_ECC,
-+		.end	= AT91_BASE_SYS + AT91_ECC + SZ_512 - 1,
-+		.flags	= IORESOURCE_MEM,
- 	}
- };
- 
-@@ -540,6 +545,90 @@ void __init at91_add_device_spi(struct s
- 
- 
- /* --------------------------------------------------------------------
-+ *  Timer/Counter blocks
-+ * -------------------------------------------------------------------- */
-+
-+#ifdef CONFIG_ATMEL_TCLIB
-+
-+static struct resource tcb0_resources[] = {
-+	[0] = {
-+		.start	= AT91SAM9260_BASE_TCB0,
-+		.end	= AT91SAM9260_BASE_TCB0 + SZ_16K - 1,
-+		.flags	= IORESOURCE_MEM,
-+	},
-+	[1] = {
-+		.start	= AT91SAM9260_ID_TC0,
-+		.end	= AT91SAM9260_ID_TC0,
-+		.flags	= IORESOURCE_IRQ,
-+	},
-+	[2] = {
-+		.start	= AT91SAM9260_ID_TC1,
-+		.end	= AT91SAM9260_ID_TC1,
-+		.flags	= IORESOURCE_IRQ,
-+	},
-+	[3] = {
-+		.start	= AT91SAM9260_ID_TC2,
-+		.end	= AT91SAM9260_ID_TC2,
-+		.flags	= IORESOURCE_IRQ,
-+	},
-+};
-+
-+static struct platform_device at91sam9260_tcb0_device = {
-+	.name		= "atmel_tcb",
-+	.id		= 0,
-+	.resource	= tcb0_resources,
-+	.num_resources	= ARRAY_SIZE(tcb0_resources),
-+};
-+
-+static struct resource tcb1_resources[] = {
-+	[0] = {
-+		.start	= AT91SAM9260_BASE_TCB1,
-+		.end	= AT91SAM9260_BASE_TCB1 + SZ_16K - 1,
-+		.flags	= IORESOURCE_MEM,
-+	},
-+	[1] = {
-+		.start	= AT91SAM9260_ID_TC3,
-+		.end	= AT91SAM9260_ID_TC3,
-+		.flags	= IORESOURCE_IRQ,
-+	},
-+	[2] = {
-+		.start	= AT91SAM9260_ID_TC4,
-+		.end	= AT91SAM9260_ID_TC4,
-+		.flags	= IORESOURCE_IRQ,
-+	},
-+	[3] = {
-+		.start	= AT91SAM9260_ID_TC5,
-+		.end	= AT91SAM9260_ID_TC5,
-+		.flags	= IORESOURCE_IRQ,
-+	},
-+};
-+
-+static struct platform_device at91sam9260_tcb1_device = {
-+	.name		= "atmel_tcb",
-+	.id		= 1,
-+	.resource	= tcb1_resources,
-+	.num_resources	= ARRAY_SIZE(tcb1_resources),
-+};
-+
-+static void __init at91_add_device_tc(void)
-+{
-+	/* this chip has a separate clock and irq for each TC channel */
-+	at91_clock_associate("tc0_clk", &at91sam9260_tcb0_device.dev, "t0_clk");
-+	at91_clock_associate("tc1_clk", &at91sam9260_tcb0_device.dev, "t1_clk");
-+	at91_clock_associate("tc2_clk", &at91sam9260_tcb0_device.dev, "t2_clk");
-+	platform_device_register(&at91sam9260_tcb0_device);
-+
-+	at91_clock_associate("tc3_clk", &at91sam9260_tcb1_device.dev, "t0_clk");
-+	at91_clock_associate("tc4_clk", &at91sam9260_tcb1_device.dev, "t1_clk");
-+	at91_clock_associate("tc5_clk", &at91sam9260_tcb1_device.dev, "t2_clk");
-+	platform_device_register(&at91sam9260_tcb1_device);
-+}
-+#else
-+static void __init at91_add_device_tc(void) { }
-+#endif
-+
-+
-+/* --------------------------------------------------------------------
-  *  RTT
-  * -------------------------------------------------------------------- */
- 
-@@ -553,13 +642,14 @@ static struct resource rtt_resources[] =
- 
- static struct platform_device at91sam9260_rtt_device = {
- 	.name		= "at91_rtt",
--	.id		= -1,
-+	.id		= 0,
- 	.resource	= rtt_resources,
- 	.num_resources	= ARRAY_SIZE(rtt_resources),
- };
- 
- static void __init at91_add_device_rtt(void)
- {
-+	device_init_wakeup(&at91sam9260_rtt_device.dev, 1);
- 	platform_device_register(&at91sam9260_rtt_device);
- }
- 
-@@ -962,7 +1052,7 @@ static inline void configure_usart5_pins
- 	at91_set_A_periph(AT91_PIN_PB13, 0);		/* RXD5 */
- }
- 
--static struct platform_device *at91_uarts[ATMEL_MAX_UART];	/* the UARTs to use */
-+static struct platform_device *__initdata at91_uarts[ATMEL_MAX_UART];	/* the UARTs to use */
- struct platform_device *atmel_default_console_device;	/* the serial console device */
- 
- void __init __deprecated at91_init_serial(struct at91_uart_config *config)
-@@ -1073,8 +1163,6 @@ void __init at91_set_serial_console(unsi
- {
- 	if (portnr < ATMEL_MAX_UART)
- 		atmel_default_console_device = at91_uarts[portnr];
--	if (!atmel_default_console_device)
--		printk(KERN_INFO "AT91: No default serial console defined.\n");
- }
- 
- void __init at91_add_device_serial(void)
-@@ -1085,6 +1173,9 @@ void __init at91_add_device_serial(void)
- 		if (at91_uarts[i])
- 			platform_device_register(at91_uarts[i]);
- 	}
-+
-+	if (!atmel_default_console_device)
-+		printk(KERN_INFO "AT91: No default serial console defined.\n");
- }
- #else
- void __init __deprecated at91_init_serial(struct at91_uart_config *config) {}
-@@ -1103,6 +1194,7 @@ static int __init at91_add_standard_devi
- {
- 	at91_add_device_rtt();
- 	at91_add_device_watchdog();
-+	at91_add_device_tc();
- 	return 0;
- }
- 
---- a/arch/arm/mach-at91/at91sam9261.c
-+++ b/arch/arm/mach-at91/at91sam9261.c
-@@ -11,12 +11,14 @@
-  */
- 
- #include <linux/module.h>
-+#include <linux/pm.h>
- 
- #include <asm/mach/arch.h>
- #include <asm/mach/map.h>
- #include <asm/arch/at91sam9261.h>
- #include <asm/arch/at91_pmc.h>
- #include <asm/arch/at91_rstc.h>
-+#include <asm/arch/at91_shdwc.h>
- 
- #include "generic.h"
- #include "clock.h"
-@@ -245,6 +247,11 @@ static void at91sam9261_reset(void)
- 	at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_PROCRST | AT91_RSTC_PERRST);
- }
- 
-+static void at91sam9261_poweroff(void)
-+{
-+	at91_sys_write(AT91_SHDW_CR, AT91_SHDW_KEY | AT91_SHDW_SHDW);
-+}
-+
- 
- /* --------------------------------------------------------------------
-  *  AT91SAM9261 processor initialization
-@@ -256,6 +263,7 @@ void __init at91sam9261_initialize(unsig
- 	iotable_init(at91sam9261_io_desc, ARRAY_SIZE(at91sam9261_io_desc));
- 
- 	at91_arch_reset = at91sam9261_reset;
-+	pm_power_off = at91sam9261_poweroff;
- 	at91_extern_irq = (1 << AT91SAM9261_ID_IRQ0) | (1 << AT91SAM9261_ID_IRQ1)
- 			| (1 << AT91SAM9261_ID_IRQ2);
- 
---- a/arch/arm/mach-at91/at91sam9261_devices.c
-+++ b/arch/arm/mach-at91/at91sam9261_devices.c
-@@ -24,7 +24,7 @@
- #include <asm/arch/gpio.h>
- #include <asm/arch/at91sam9261.h>
- #include <asm/arch/at91sam9261_matrix.h>
--#include <asm/arch/at91sam926x_mc.h>
-+#include <asm/arch/at91sam9_smc.h>
- 
- #include "generic.h"
- 
-@@ -548,6 +548,55 @@ void __init at91_add_device_lcdc(struct 
- 
- 
- /* --------------------------------------------------------------------
-+ *  Timer/Counter block
-+ * -------------------------------------------------------------------- */
-+
-+#ifdef CONFIG_ATMEL_TCLIB
-+
-+static struct resource tcb_resources[] = {
-+	[0] = {
-+		.start	= AT91SAM9261_BASE_TCB0,
-+		.end	= AT91SAM9261_BASE_TCB0 + SZ_16K - 1,
-+		.flags	= IORESOURCE_MEM,
-+	},
-+	[1] = {
-+		.start	= AT91SAM9261_ID_TC0,
-+		.end	= AT91SAM9261_ID_TC0,
-+		.flags	= IORESOURCE_IRQ,
-+	},
-+	[2] = {
-+		.start	= AT91SAM9261_ID_TC1,
-+		.end	= AT91SAM9261_ID_TC1,
-+		.flags	= IORESOURCE_IRQ,
-+	},
-+	[3] = {
-+		.start	= AT91SAM9261_ID_TC2,
-+		.end	= AT91SAM9261_ID_TC2,
-+		.flags	= IORESOURCE_IRQ,
-+	},
-+};
-+
-+static struct platform_device at91sam9261_tcb_device = {
-+	.name		= "atmel_tcb",
-+	.id		= 0,
-+	.resource	= tcb_resources,
-+	.num_resources	= ARRAY_SIZE(tcb_resources),
-+};
-+
-+static void __init at91_add_device_tc(void)
-+{
-+	/* this chip has a separate clock and irq for each TC channel */
-+	at91_clock_associate("tc0_clk", &at91sam9261_tcb_device.dev, "t0_clk");
-+	at91_clock_associate("tc1_clk", &at91sam9261_tcb_device.dev, "t1_clk");
-+	at91_clock_associate("tc2_clk", &at91sam9261_tcb_device.dev, "t2_clk");
-+	platform_device_register(&at91sam9261_tcb_device);
-+}
-+#else
-+static void __init at91_add_device_tc(void) { }
-+#endif
-+
-+
-+/* --------------------------------------------------------------------
-  *  RTT
-  * -------------------------------------------------------------------- */
- 
-@@ -561,13 +610,14 @@ static struct resource rtt_resources[] =
- 
- static struct platform_device at91sam9261_rtt_device = {
- 	.name		= "at91_rtt",
--	.id		= -1,
-+	.id		= 0,
- 	.resource	= rtt_resources,
- 	.num_resources	= ARRAY_SIZE(rtt_resources),
- };
- 
- static void __init at91_add_device_rtt(void)
- {
-+	device_init_wakeup(&at91sam9261_rtt_device.dev, 1);
- 	platform_device_register(&at91sam9261_rtt_device);
- }
- 
-@@ -938,7 +988,7 @@ static inline void configure_usart2_pins
- 		at91_set_B_periph(AT91_PIN_PA16, 0);	/* CTS2 */
- }
- 
--static struct platform_device *at91_uarts[ATMEL_MAX_UART];	/* the UARTs to use */
-+static struct platform_device *__initdata at91_uarts[ATMEL_MAX_UART];	/* the UARTs to use */
- struct platform_device *atmel_default_console_device;	/* the serial console device */
- 
- void __init __deprecated at91_init_serial(struct at91_uart_config *config)
-@@ -1019,8 +1069,6 @@ void __init at91_set_serial_console(unsi
- {
- 	if (portnr < ATMEL_MAX_UART)
- 		atmel_default_console_device = at91_uarts[portnr];
--	if (!atmel_default_console_device)
--		printk(KERN_INFO "AT91: No default serial console defined.\n");
- }
- 
- void __init at91_add_device_serial(void)
-@@ -1031,6 +1079,9 @@ void __init at91_add_device_serial(void)
- 		if (at91_uarts[i])
- 			platform_device_register(at91_uarts[i]);
- 	}
-+
-+	if (!atmel_default_console_device)
-+		printk(KERN_INFO "AT91: No default serial console defined.\n");
- }
- #else
- void __init __deprecated at91_init_serial(struct at91_uart_config *config) {}
-@@ -1050,6 +1101,7 @@ static int __init at91_add_standard_devi
- {
- 	at91_add_device_rtt();
- 	at91_add_device_watchdog();
-+	at91_add_device_tc();
- 	return 0;
- }
- 
---- a/arch/arm/mach-at91/at91sam9263.c
-+++ b/arch/arm/mach-at91/at91sam9263.c
-@@ -11,12 +11,14 @@
-  */
- 
- #include <linux/module.h>
-+#include <linux/pm.h>
- 
- #include <asm/mach/arch.h>
- #include <asm/mach/map.h>
- #include <asm/arch/at91sam9263.h>
- #include <asm/arch/at91_pmc.h>
- #include <asm/arch/at91_rstc.h>
-+#include <asm/arch/at91_shdwc.h>
- 
- #include "generic.h"
- #include "clock.h"
-@@ -271,6 +273,11 @@ static void at91sam9263_reset(void)
- 	at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_PROCRST | AT91_RSTC_PERRST);
- }
- 
-+static void at91sam9263_poweroff(void)
-+{
-+	at91_sys_write(AT91_SHDW_CR, AT91_SHDW_KEY | AT91_SHDW_SHDW);
-+}
-+
- 
- /* --------------------------------------------------------------------
-  *  AT91SAM9263 processor initialization
-@@ -282,6 +289,7 @@ void __init at91sam9263_initialize(unsig
- 	iotable_init(at91sam9263_io_desc, ARRAY_SIZE(at91sam9263_io_desc));
- 
- 	at91_arch_reset = at91sam9263_reset;
-+	pm_power_off = at91sam9263_poweroff;
- 	at91_extern_irq = (1 << AT91SAM9263_ID_IRQ0) | (1 << AT91SAM9263_ID_IRQ1);
- 
- 	/* Init clock subsystem */
---- a/arch/arm/mach-at91/at91sam9263_devices.c
-+++ b/arch/arm/mach-at91/at91sam9263_devices.c
-@@ -22,8 +22,8 @@
- #include <asm/arch/board.h>
- #include <asm/arch/gpio.h>
- #include <asm/arch/at91sam9263.h>
--#include <asm/arch/at91sam926x_mc.h>
- #include <asm/arch/at91sam9263_matrix.h>
-+#include <asm/arch/at91sam9_smc.h>
- 
- #include "generic.h"
- 
-@@ -308,7 +308,7 @@ void __init at91_add_device_mmc(short mm
- 		}
- 
- 		mmc0_data = *data;
--		at91_clock_associate("mci0_clk", &at91sam9263_mmc1_device.dev, "mci_clk");
-+		at91_clock_associate("mci0_clk", &at91sam9263_mmc0_device.dev, "mci_clk");
- 		platform_device_register(&at91sam9263_mmc0_device);
- 	} else {			/* MCI1 */
- 		/* CLK */
-@@ -358,10 +358,15 @@ static struct at91_nand_data nand_data;
- #define NAND_BASE	AT91_CHIPSELECT_3
- 
- static struct resource nand_resources[] = {
--	{
-+	[0] = {
- 		.start	= NAND_BASE,
- 		.end	= NAND_BASE + SZ_256M - 1,
- 		.flags	= IORESOURCE_MEM,
-+	},
-+	[1] = {
-+		.start	= AT91_BASE_SYS + AT91_ECC0,
-+		.end	= AT91_BASE_SYS + AT91_ECC0 + SZ_512 - 1,
-+		.flags	= IORESOURCE_MEM,
- 	}
- };
- 
-@@ -783,6 +788,43 @@ void __init at91_add_device_isi(void) {}
- 
- 
- /* --------------------------------------------------------------------
-+ *  Timer/Counter block
-+ * -------------------------------------------------------------------- */
-+
-+#ifdef CONFIG_ATMEL_TCLIB
-+
-+static struct resource tcb_resources[] = {
-+	[0] = {
-+		.start	= AT91SAM9263_BASE_TCB0,
-+		.end	= AT91SAM9263_BASE_TCB0 + SZ_16K - 1,
-+		.flags	= IORESOURCE_MEM,
-+	},
-+	[1] = {
-+		.start	= AT91SAM9263_ID_TCB,
-+		.end	= AT91SAM9263_ID_TCB,
-+		.flags	= IORESOURCE_IRQ,
-+	},
-+};
-+
-+static struct platform_device at91sam9263_tcb_device = {
-+	.name		= "atmel_tcb",
-+	.id		= 0,
-+	.resource	= tcb_resources,
-+	.num_resources	= ARRAY_SIZE(tcb_resources),
-+};
-+
-+static void __init at91_add_device_tc(void)
-+{
-+	/* this chip has one clock and irq for all three TC channels */
-+	at91_clock_associate("tcb_clk", &at91sam9263_tcb_device.dev, "t0_clk");
-+	platform_device_register(&at91sam9263_tcb_device);
-+}
-+#else
-+static void __init at91_add_device_tc(void) { }
-+#endif
-+
-+
-+/* --------------------------------------------------------------------
-  *  RTT
-  * -------------------------------------------------------------------- */
- 
-@@ -818,7 +860,9 @@ static struct platform_device at91sam926
- 
- static void __init at91_add_device_rtt(void)
- {
-+	device_init_wakeup(&at91sam9263_rtt0_device.dev, 1);
- 	platform_device_register(&at91sam9263_rtt0_device);
-+	device_init_wakeup(&at91sam9263_rtt1_device.dev, 1);
- 	platform_device_register(&at91sam9263_rtt1_device);
- }
- 
-@@ -933,9 +977,6 @@ static inline void configure_ssc1_pins(u
- }
- 
- /*
-- * Return the device node so that board init code can use it as the
-- * parent for the device node reflecting how it's used on this board.
-- *
-  * SSC controllers are accessed through library code, instead of any
-  * kind of all-singing/all-dancing driver.  For example one could be
-  * used by a particular I2S audio codec's driver, while another one
-@@ -1146,7 +1187,7 @@ static inline void configure_usart2_pins
- 		at91_set_B_periph(AT91_PIN_PD6, 0);	/* CTS2 */
- }
- 
--static struct platform_device *at91_uarts[ATMEL_MAX_UART];	/* the UARTs to use */
-+static struct platform_device *__initdata at91_uarts[ATMEL_MAX_UART];	/* the UARTs to use */
- struct platform_device *atmel_default_console_device;	/* the serial console device */
- 
- void __init __deprecated at91_init_serial(struct at91_uart_config *config)
-@@ -1227,8 +1268,6 @@ void __init at91_set_serial_console(unsi
- {
- 	if (portnr < ATMEL_MAX_UART)
- 		atmel_default_console_device = at91_uarts[portnr];
--	if (!atmel_default_console_device)
--		printk(KERN_INFO "AT91: No default serial console defined.\n");
- }
- 
- void __init at91_add_device_serial(void)
-@@ -1239,9 +1278,12 @@ void __init at91_add_device_serial(void)
- 		if (at91_uarts[i])
- 			platform_device_register(at91_uarts[i]);
- 	}
-+
-+	if (!atmel_default_console_device)
-+		printk(KERN_INFO "AT91: No default serial console defined.\n");
- }
- #else
--void __init at91_init_serial(struct at91_uart_config *config) {}
-+void __init __deprecated at91_init_serial(struct at91_uart_config *config) {}
- void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) {}
- void __init at91_set_serial_console(unsigned portnr) {}
- void __init at91_add_device_serial(void) {}
-@@ -1257,6 +1299,7 @@ static int __init at91_add_standard_devi
- {
- 	at91_add_device_rtt();
- 	at91_add_device_watchdog();
-+	at91_add_device_tc();
- 	return 0;
- }
- 
---- a/arch/arm/mach-at91/at91sam926x_time.c
-+++ b/arch/arm/mach-at91/at91sam926x_time.c
-@@ -1,23 +1,20 @@
- /*
-- * linux/arch/arm/mach-at91/at91sam926x_time.c
-+ * at91sam926x_time.c - Periodic Interval Timer (PIT) for at91sam926x
-  *
-  * Copyright (C) 2005-2006 M. Amine SAYA, ATMEL Rousset, France
-  * Revision	 2005 M. Nicolas Diremdjian, ATMEL Rousset, France
-+ * Converted to ClockSource/ClockEvents by David Brownell.
-  *
-  * 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.
-  */
--
--#include <linux/init.h>
- #include <linux/interrupt.h>
- #include <linux/irq.h>
- #include <linux/kernel.h>
--#include <linux/sched.h>
--#include <linux/time.h>
-+#include <linux/clk.h>
-+#include <linux/clockchips.h>
- 
--#include <asm/hardware.h>
--#include <asm/io.h>
- #include <asm/mach/time.h>
- 
- #include <asm/arch/at91_pit.h>
-@@ -26,85 +23,167 @@
- #define PIT_CPIV(x)	((x) & AT91_PIT_CPIV)
- #define PIT_PICNT(x)	(((x) & AT91_PIT_PICNT) >> 20)
- 
-+static u32 pit_cycle;		/* write-once */
-+static u32 pit_cnt;		/* access only w/system irq blocked */
-+
-+
- /*
-- * Returns number of microseconds since last timer interrupt.  Note that interrupts
-- * will have been disabled by do_gettimeofday()
-- *  'LATCH' is hwclock ticks (see CLOCK_TICK_RATE in timex.h) per jiffy.
-+ * Clocksource:  just a monotonic counter of MCK/16 cycles.
-+ * We don't care whether or not PIT irqs are enabled.
-  */
--static unsigned long at91sam926x_gettimeoffset(void)
-+static cycle_t read_pit_clk(void)
- {
--	unsigned long elapsed;
--	unsigned long t = at91_sys_read(AT91_PIT_PIIR);
-+	unsigned long flags;
-+	u32 elapsed;
-+	u32 t;
-+
-+	raw_local_irq_save(flags);
-+	elapsed = pit_cnt;
-+	t = at91_sys_read(AT91_PIT_PIIR);
-+	raw_local_irq_restore(flags);
-+
-+	elapsed += PIT_PICNT(t) * pit_cycle;
-+	elapsed += PIT_CPIV(t);
-+	return elapsed;
-+}
-+
-+static struct clocksource pit_clk = {
-+	.name		= "pit",
-+	.rating		= 175,
-+	.read		= read_pit_clk,
-+	.shift		= 20,
-+	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,
-+};
-+
- 
--	elapsed = (PIT_PICNT(t) * LATCH) + PIT_CPIV(t);		/* hardware clock cycles */
-+/*
-+ * Clockevent device:  interrupts every 1/HZ (== pit_cycles * MCK/16)
-+ */
-+static void
-+pit_clkevt_mode(enum clock_event_mode mode, struct clock_event_device *dev)
-+{
-+	unsigned long	flags;
- 
--	return (unsigned long)(elapsed * jiffies_to_usecs(1)) / LATCH;
-+	switch (mode) {
-+	case CLOCK_EVT_MODE_PERIODIC:
-+		/* update clocksource counter, then enable the IRQ */
-+		raw_local_irq_save(flags);
-+		pit_cnt += pit_cycle * PIT_PICNT(at91_sys_read(AT91_PIT_PIVR));
-+		at91_sys_write(AT91_PIT_MR, (pit_cycle - 1) | AT91_PIT_PITEN
-+				| AT91_PIT_PITIEN);
-+		raw_local_irq_restore(flags);
-+		break;
-+	case CLOCK_EVT_MODE_ONESHOT:
-+		BUG();
-+		/* FALLTHROUGH */
-+	case CLOCK_EVT_MODE_SHUTDOWN:
-+	case CLOCK_EVT_MODE_UNUSED:
-+		/* disable irq, leaving the clocksource active */
-+		at91_sys_write(AT91_PIT_MR, (pit_cycle - 1) | AT91_PIT_PITEN);
-+		break;
-+	case CLOCK_EVT_MODE_RESUME:
-+		break;
-+	}
- }
- 
-+static struct clock_event_device pit_clkevt = {
-+	.name		= "pit",
-+	.features	= CLOCK_EVT_FEAT_PERIODIC,
-+	.shift		= 32,
-+	.rating		= 100,
-+	.cpumask	= CPU_MASK_CPU0,
-+	.set_mode	= pit_clkevt_mode,
-+};
-+
-+
- /*
-  * IRQ handler for the timer.
-  */
--static irqreturn_t at91sam926x_timer_interrupt(int irq, void *dev_id)
-+static irqreturn_t at91sam926x_pit_interrupt(int irq, void *dev_id)
- {
--	volatile long nr_ticks;
- 
--	if (at91_sys_read(AT91_PIT_SR) & AT91_PIT_PITS) {	/* This is a shared interrupt */
--		/* Get number to ticks performed before interrupt and clear PIT interrupt */
-+	/* The PIT interrupt may be disabled, and is shared */
-+	if ((pit_clkevt.mode == CLOCK_EVT_MODE_PERIODIC)
-+			&& (at91_sys_read(AT91_PIT_SR) & AT91_PIT_PITS)) {
-+		unsigned nr_ticks;
-+
-+		/* Get number of ticks performed before irq, and ack it */
- 		nr_ticks = PIT_PICNT(at91_sys_read(AT91_PIT_PIVR));
- 		do {
--			timer_tick();
-+			pit_cnt += pit_cycle;
-+			pit_clkevt.event_handler(&pit_clkevt);
- 			nr_ticks--;
- 		} while (nr_ticks);
- 
- 		return IRQ_HANDLED;
--	} else
--		return IRQ_NONE;		/* not handled */
-+	}
-+
-+	return IRQ_NONE;
- }
- 
--static struct irqaction at91sam926x_timer_irq = {
-+static struct irqaction at91sam926x_pit_irq = {
- 	.name		= "at91_tick",
- 	.flags		= IRQF_SHARED | IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
--	.handler	= at91sam926x_timer_interrupt
-+	.handler	= at91sam926x_pit_interrupt
- };
- 
--void at91sam926x_timer_reset(void)
-+static void at91sam926x_pit_reset(void)
- {
--	/* Disable timer */
-+	/* Disable timer and irqs */
- 	at91_sys_write(AT91_PIT_MR, 0);
- 
--	/* Clear any pending interrupts */
--	(void) at91_sys_read(AT91_PIT_PIVR);
-+	/* Clear any pending interrupts, wait for PIT to stop counting */
-+	while (PIT_CPIV(at91_sys_read(AT91_PIT_PIVR)) != 0)
-+		cpu_relax();
- 
--	/* Set Period Interval timer and enable its interrupt */
--	at91_sys_write(AT91_PIT_MR, (LATCH & AT91_PIT_PIV) | AT91_PIT_PITIEN | AT91_PIT_PITEN);
-+	/* Start PIT but don't enable IRQ */
-+	at91_sys_write(AT91_PIT_MR, (pit_cycle - 1) | AT91_PIT_PITEN);
- }
- 
- /*
-- * Set up timer interrupt.
-+ * Set up both clocksource and clockevent support.
-  */
--void __init at91sam926x_timer_init(void)
-+static void __init at91sam926x_pit_init(void)
- {
-+	unsigned long	pit_rate;
-+	unsigned	bits;
-+
-+	/*
-+	 * Use our actual MCK to figure out how many MCK/16 ticks per
-+	 * 1/HZ period (instead of a compile-time constant LATCH).
-+	 */
-+	pit_rate = clk_get_rate(clk_get(NULL, "mck")) / 16;
-+	pit_cycle = (pit_rate + HZ/2) / HZ;
-+	WARN_ON(((pit_cycle - 1) & ~AT91_PIT_PIV) != 0);
-+
- 	/* Initialize and enable the timer */
--	at91sam926x_timer_reset();
-+	at91sam926x_pit_reset();
- 
--	/* Make IRQs happen for the system timer. */
--	setup_irq(AT91_ID_SYS, &at91sam926x_timer_irq);
-+	/*
-+	 * Register clocksource.  The high order bits of PIV are unused,
-+	 * so this isn't a 32-bit counter unless we get clockevent irqs.
-+	 */
-+	pit_clk.mult = clocksource_hz2mult(pit_rate, pit_clk.shift);
-+	bits = 12 /* PICNT */ + ilog2(pit_cycle) /* PIV */;
-+	pit_clk.mask = CLOCKSOURCE_MASK(bits);
-+	clocksource_register(&pit_clk);
-+
-+	/* Set up irq handler */
-+	setup_irq(AT91_ID_SYS, &at91sam926x_pit_irq);
-+
-+	/* Set up and register clockevents */
-+	pit_clkevt.mult = div_sc(pit_rate, NSEC_PER_SEC, pit_clkevt.shift);
-+	clockevents_register_device(&pit_clkevt);
- }
- 
--#ifdef CONFIG_PM
--static void at91sam926x_timer_suspend(void)
-+static void at91sam926x_pit_suspend(void)
- {
- 	/* Disable timer */
- 	at91_sys_write(AT91_PIT_MR, 0);
- }
--#else
--#define at91sam926x_timer_suspend	NULL
--#endif
- 
- struct sys_timer at91sam926x_timer = {
--	.init		= at91sam926x_timer_init,
--	.offset		= at91sam926x_gettimeoffset,
--	.suspend	= at91sam926x_timer_suspend,
--	.resume		= at91sam926x_timer_reset,
-+	.init		= at91sam926x_pit_init,
-+	.suspend	= at91sam926x_pit_suspend,
-+	.resume		= at91sam926x_pit_reset,
- };
--
---- a/arch/arm/mach-at91/at91sam9rl.c
-+++ b/arch/arm/mach-at91/at91sam9rl.c
-@@ -10,6 +10,7 @@
-  */
- 
- #include <linux/module.h>
-+#include <linux/pm.h>
- 
- #include <asm/mach/arch.h>
- #include <asm/mach/map.h>
-@@ -17,6 +18,7 @@
- #include <asm/arch/at91sam9rl.h>
- #include <asm/arch/at91_pmc.h>
- #include <asm/arch/at91_rstc.h>
-+#include <asm/arch/at91_shdwc.h>
- 
- #include "generic.h"
- #include "clock.h"
-@@ -244,6 +246,11 @@ static void at91sam9rl_reset(void)
- 	at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_PROCRST | AT91_RSTC_PERRST);
- }
- 
-+static void at91sam9rl_poweroff(void)
-+{
-+	at91_sys_write(AT91_SHDW_CR, AT91_SHDW_KEY | AT91_SHDW_SHDW);
-+}
-+
- 
- /* --------------------------------------------------------------------
-  *  AT91SAM9RL processor initialization
-@@ -274,6 +281,7 @@ void __init at91sam9rl_initialize(unsign
- 	iotable_init(at91sam9rl_sram_desc, ARRAY_SIZE(at91sam9rl_sram_desc));
- 
- 	at91_arch_reset = at91sam9rl_reset;
-+	pm_power_off = at91sam9rl_poweroff;
- 	at91_extern_irq = (1 << AT91SAM9RL_ID_IRQ0);
- 
- 	/* Init clock subsystem */
---- a/arch/arm/mach-at91/at91sam9rl_devices.c
-+++ b/arch/arm/mach-at91/at91sam9rl_devices.c
-@@ -20,12 +20,107 @@
- #include <asm/arch/gpio.h>
- #include <asm/arch/at91sam9rl.h>
- #include <asm/arch/at91sam9rl_matrix.h>
--#include <asm/arch/at91sam926x_mc.h>
-+#include <asm/arch/at91sam9_smc.h>
- 
- #include "generic.h"
- 
- 
- /* --------------------------------------------------------------------
-+ *  USB HS Device (Gadget)
-+ * -------------------------------------------------------------------- */
-+
-+#if defined(CONFIG_USB_GADGET_ATMEL_USBA) || defined(CONFIG_USB_GADGET_ATMEL_USBA_MODULE)
-+
-+static struct resource usba_udc_resources[] = {
-+	[0] = {
-+		.start	= AT91SAM9RL_UDPHS_FIFO,
-+		.end	= AT91SAM9RL_UDPHS_FIFO + SZ_512K - 1,
-+		.flags	= IORESOURCE_MEM,
-+	},
-+	[1] = {
-+		.start	= AT91SAM9RL_BASE_UDPHS,
-+		.end	= AT91SAM9RL_BASE_UDPHS + SZ_1K - 1,
-+		.flags	= IORESOURCE_MEM,
-+	},
-+	[2] = {
-+		.start	= AT91SAM9RL_ID_UDPHS,
-+		.end	= AT91SAM9RL_ID_UDPHS,
-+		.flags	= IORESOURCE_IRQ,
-+	},
-+};
-+
-+#define EP(nam, idx, maxpkt, maxbk, dma, isoc)			\
-+	[idx] = {						\
-+		.name		= nam,				\
-+		.index		= idx,				\
-+		.fifo_size	= maxpkt,			\
-+		.nr_banks	= maxbk,			\
-+		.can_dma	= dma,				\
-+		.can_isoc	= isoc,				\
-+	}
-+
-+static struct usba_ep_data usba_udc_ep[] __initdata = {
-+	EP("ep0", 0, 64, 1, 0, 0),
-+	EP("ep1", 1, 1024, 2, 1, 1),
-+	EP("ep2", 2, 1024, 2, 1, 1),
-+	EP("ep3", 3, 1024, 3, 1, 0),
-+	EP("ep4", 4, 1024, 3, 1, 0),
-+	EP("ep5", 5, 1024, 3, 1, 1),
-+	EP("ep6", 6, 1024, 3, 1, 1),
-+};
-+
-+#undef EP
-+
-+/*
-+ * pdata doesn't have room for any endpoints, so we need to
-+ * append room for the ones we need right after it.
-+ */
-+static struct {
-+	struct usba_platform_data pdata;
-+	struct usba_ep_data ep[7];
-+} usba_udc_data;
-+
-+static struct platform_device at91_usba_udc_device = {
-+	.name		= "atmel_usba_udc",
-+	.id		= -1,
-+	.dev		= {
-+				.platform_data	= &usba_udc_data.pdata,
-+	},
-+	.resource	= usba_udc_resources,
-+	.num_resources	= ARRAY_SIZE(usba_udc_resources),
-+};
-+
-+void __init at91_add_device_usba(struct usba_platform_data *data)
-+{
-+	/*
-+	 * Invalid pins are 0 on AT91, but the usba driver is shared
-+	 * with AVR32, which use negative values instead. Once/if
-+	 * gpio_is_valid() is ported to AT91, revisit this code.
-+	 */
-+	usba_udc_data.pdata.vbus_pin = -EINVAL;
-+	usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep);
-+	memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));;
-+
-+	if (data && data->vbus_pin > 0) {
-+		at91_set_gpio_input(data->vbus_pin, 0);
-+		at91_set_deglitch(data->vbus_pin, 1);
-+		usba_udc_data.pdata.vbus_pin = data->vbus_pin;
-+	}
-+
-+	/* Pullup pin is handled internally by USB device peripheral */
-+
-+	/* Clocks */
-+	at91_clock_associate("utmi_clk", &at91_usba_udc_device.dev, "hclk");
-+	at91_clock_associate("udphs_clk", &at91_usba_udc_device.dev, "pclk");
-+
-+	platform_device_register(&at91_usba_udc_device);
-+}
-+#else
-+void __init at91_add_device_usba(struct usba_platform_data *data) {}
-+#endif
-+
-+
-+/* --------------------------------------------------------------------
-  *  MMC / SD
-  * -------------------------------------------------------------------- */
- 
-@@ -105,10 +200,15 @@ static struct at91_nand_data nand_data;
- #define NAND_BASE	AT91_CHIPSELECT_3
- 
- static struct resource nand_resources[] = {
--	{
-+	[0] = {
- 		.start	= NAND_BASE,
- 		.end	= NAND_BASE + SZ_256M - 1,
- 		.flags	= IORESOURCE_MEM,
-+	},
-+	[1] = {
-+		.start	= AT91_BASE_SYS + AT91_ECC,
-+		.end	= AT91_BASE_SYS + AT91_ECC + SZ_512 - 1,
-+		.flags	= IORESOURCE_MEM,
- 	}
- };
- 
-@@ -385,6 +485,100 @@ void __init at91_add_device_lcdc(struct 
- 
- 
- /* --------------------------------------------------------------------
-+ *  Timer/Counter block
-+ * -------------------------------------------------------------------- */
-+
-+#ifdef CONFIG_ATMEL_TCLIB
-+
-+static struct resource tcb_resources[] = {
-+	[0] = {
-+		.start	= AT91SAM9RL_BASE_TCB0,
-+		.end	= AT91SAM9RL_BASE_TCB0 + SZ_16K - 1,
-+		.flags	= IORESOURCE_MEM,
-+	},
-+	[1] = {
-+		.start	= AT91SAM9RL_ID_TC0,
-+		.end	= AT91SAM9RL_ID_TC0,
-+		.flags	= IORESOURCE_IRQ,
-+	},
-+	[2] = {
-+		.start	= AT91SAM9RL_ID_TC1,
-+		.end	= AT91SAM9RL_ID_TC1,
-+		.flags	= IORESOURCE_IRQ,
-+	},
-+	[3] = {
-+		.start	= AT91SAM9RL_ID_TC2,
-+		.end	= AT91SAM9RL_ID_TC2,
-+		.flags	= IORESOURCE_IRQ,
-+	},
-+};
-+
-+static struct platform_device at91sam9rl_tcb_device = {
-+	.name		= "atmel_tcb",
-+	.id		= 0,
-+	.resource	= tcb_resources,
-+	.num_resources	= ARRAY_SIZE(tcb_resources),
-+};
-+
-+static void __init at91_add_device_tc(void)
-+{
-+	/* this chip has a separate clock and irq for each TC channel */
-+	at91_clock_associate("tc0_clk", &at91sam9rl_tcb_device.dev, "t0_clk");
-+	at91_clock_associate("tc1_clk", &at91sam9rl_tcb_device.dev, "t1_clk");
-+	at91_clock_associate("tc2_clk", &at91sam9rl_tcb_device.dev, "t2_clk");
-+	platform_device_register(&at91sam9rl_tcb_device);
-+}
-+#else
-+static void __init at91_add_device_tc(void) { }
-+#endif
-+
-+
-+/* --------------------------------------------------------------------
-+ *  Touchscreen
-+ * -------------------------------------------------------------------- */
-+
-+#if defined(CONFIG_TOUCHSCREEN_ATMEL_TSADCC) || defined(CONFIG_TOUCHSCREEN_ATMEL_TSADCC_MODULE)
-+static u64 tsadcc_dmamask = DMA_BIT_MASK(32);
-+
-+static struct resource tsadcc_resources[] = {
-+	[0] = {
-+		.start	= AT91SAM9RL_BASE_TSC,
-+		.end	= AT91SAM9RL_BASE_TSC + SZ_16K - 1,
-+		.flags	= IORESOURCE_MEM,
-+	},
-+	[1] = {
-+		.start	= AT91SAM9RL_ID_TSC,
-+		.end	= AT91SAM9RL_ID_TSC,
-+		.flags	= IORESOURCE_IRQ,
-+	}
-+};
-+
-+static struct platform_device at91_tsadcc_device = {
-+	.name		= "atmel_tsadcc",
-+	.id		= -1,
-+	.dev		= {
-+				.dma_mask		= &tsadcc_dmamask,
-+				.coherent_dma_mask	= DMA_BIT_MASK(32),
-+	},
-+	.resource	= tsadcc_resources,
-+	.num_resources	= ARRAY_SIZE(tsadcc_resources),
-+};
-+
-+void __init at91_add_device_tsadcc(void)
-+{
-+	at91_set_A_periph(AT91_PIN_PA17, 0);	/* AD0_XR */
-+	at91_set_A_periph(AT91_PIN_PA18, 0);	/* AD1_XL */
-+	at91_set_A_periph(AT91_PIN_PA19, 0);	/* AD2_YT */
-+	at91_set_A_periph(AT91_PIN_PA20, 0);	/* AD3_TB */
-+
-+	platform_device_register(&at91_tsadcc_device);
-+}
-+#else
-+void __init at91_add_device_tsadcc(void) {}
-+#endif
-+
-+
-+/* --------------------------------------------------------------------
-  *  RTC
-  * -------------------------------------------------------------------- */
- 
-@@ -397,6 +591,7 @@ static struct platform_device at91sam9rl
- 
- static void __init at91_add_device_rtc(void)
- {
-+	device_init_wakeup(&at91sam9rl_rtc_device.dev, 1);
- 	platform_device_register(&at91sam9rl_rtc_device);
- }
- #else
-@@ -418,13 +613,14 @@ static struct resource rtt_resources[] =
- 
- static struct platform_device at91sam9rl_rtt_device = {
- 	.name		= "at91_rtt",
--	.id		= -1,
-+	.id		= 0,
- 	.resource	= rtt_resources,
- 	.num_resources	= ARRAY_SIZE(rtt_resources),
- };
- 
- static void __init at91_add_device_rtt(void)
- {
-+	device_init_wakeup(&at91sam9rl_rtt_device.dev, 1);
- 	platform_device_register(&at91sam9rl_rtt_device);
- }
- 
-@@ -539,9 +735,6 @@ static inline void configure_ssc1_pins(u
- }
- 
- /*
-- * Return the device node so that board init code can use it as the
-- * parent for the device node reflecting how it's used on this board.
-- *
-  * SSC controllers are accessed through library code, instead of any
-  * kind of all-singing/all-dancing driver.  For example one could be
-  * used by a particular I2S audio codec's driver, while another one
-@@ -802,7 +995,7 @@ static inline void configure_usart3_pins
- 		at91_set_B_periph(AT91_PIN_PD3, 0);	/* CTS3 */
- }
- 
--static struct platform_device *at91_uarts[ATMEL_MAX_UART];	/* the UARTs to use */
-+static struct platform_device *__initdata at91_uarts[ATMEL_MAX_UART];	/* the UARTs to use */
- struct platform_device *atmel_default_console_device;	/* the serial console device */
- 
- void __init __deprecated at91_init_serial(struct at91_uart_config *config)
-@@ -893,8 +1086,6 @@ void __init at91_set_serial_console(unsi
- {
- 	if (portnr < ATMEL_MAX_UART)
- 		atmel_default_console_device = at91_uarts[portnr];
--	if (!atmel_default_console_device)
--		printk(KERN_INFO "AT91: No default serial console defined.\n");
- }
- 
- void __init at91_add_device_serial(void)
-@@ -905,6 +1096,9 @@ void __init at91_add_device_serial(void)
- 		if (at91_uarts[i])
- 			platform_device_register(at91_uarts[i]);
- 	}
-+
-+	if (!atmel_default_console_device)
-+		printk(KERN_INFO "AT91: No default serial console defined.\n");
- }
- #else
- void __init __deprecated at91_init_serial(struct at91_uart_config *config) {}
-@@ -925,6 +1119,7 @@ static int __init at91_add_standard_devi
- 	at91_add_device_rtc();
- 	at91_add_device_rtt();
- 	at91_add_device_watchdog();
-+	at91_add_device_tc();
- 	return 0;
- }
- 
---- /dev/null
-+++ b/arch/arm/mach-at91/board-cam60.c
-@@ -0,0 +1,180 @@
-+/*
-+ * KwikByte CAM60 (KB9260)
-+ *
-+ * based on board-sam9260ek.c
-+ *   Copyright (C) 2005 SAN People
-+ *   Copyright (C) 2006 Atmel
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#include <linux/types.h>
-+#include <linux/init.h>
-+#include <linux/mm.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/spi/spi.h>
-+#include <linux/spi/flash.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/setup.h>
-+#include <asm/mach-types.h>
-+#include <asm/irq.h>
-+
-+#include <asm/mach/arch.h>
-+#include <asm/mach/map.h>
-+#include <asm/mach/irq.h>
-+
-+#include <asm/arch/board.h>
-+#include <asm/arch/gpio.h>
-+
-+#include "generic.h"
-+
-+
-+static void __init cam60_map_io(void)
-+{
-+	/* Initialize processor: 10 MHz crystal */
-+	at91sam9260_initialize(10000000);
-+
-+	/* DGBU on ttyS0. (Rx & Tx only) */
-+	at91_register_uart(0, 0, 0);
-+
-+	/* set serial console to ttyS0 (ie, DBGU) */
-+	at91_set_serial_console(0);
-+}
-+
-+static void __init cam60_init_irq(void)
-+{
-+	at91sam9260_init_interrupts(NULL);
-+}
-+
-+
-+/*
-+ * USB Host
-+ */
-+static struct at91_usbh_data __initdata cam60_usbh_data = {
-+	.ports		= 1,
-+};
-+
-+
-+/*
-+ * SPI devices.
-+ */
-+#if defined(CONFIG_MTD_DATAFLASH)
-+static struct mtd_partition __initdata cam60_spi_partitions[] = {
-+	{
-+		.name	= "BOOT1",
-+		.offset	= 0,
-+		.size	= 4 * 1056,
-+	},
-+	{
-+		.name	= "BOOT2",
-+		.offset	= MTDPART_OFS_NXTBLK,
-+		.size	= 256 * 1056,
-+	},
-+	{
-+		.name	= "kernel",
-+		.offset	= MTDPART_OFS_NXTBLK,
-+		.size	= 2222 * 1056,
-+	},
-+	{
-+		.name	= "file system",
-+		.offset	= MTDPART_OFS_NXTBLK,
-+		.size	= MTDPART_SIZ_FULL,
-+	},
-+};
-+
-+static struct flash_platform_data __initdata cam60_spi_flash_platform_data = {
-+	.name		= "spi_flash",
-+	.parts		= cam60_spi_partitions,
-+	.nr_parts	= ARRAY_SIZE(cam60_spi_partitions)
-+};
-+#endif
-+
-+static struct spi_board_info cam60_spi_devices[] = {
-+#if defined(CONFIG_MTD_DATAFLASH)
-+	{	/* DataFlash chip */
-+		.modalias	= "mtd_dataflash",
-+		.chip_select	= 0,
-+		.max_speed_hz	= 15 * 1000 * 1000,
-+		.bus_num	= 0,
-+		.platform_data	= &cam60_spi_flash_platform_data
-+	},
-+#endif
-+};
-+
-+
-+/*
-+ * MACB Ethernet device
-+ */
-+static struct __initdata at91_eth_data cam60_macb_data = {
-+	.phy_irq_pin	= AT91_PIN_PB5,
-+	.is_rmii	= 0,
-+};
-+
-+
-+/*
-+ * NAND Flash
-+ */
-+static struct mtd_partition __initdata cam60_nand_partition[] = {
-+	{
-+		.name	= "nand_fs",
-+		.offset	= 0,
-+		.size	= MTDPART_SIZ_FULL,
-+	},
-+};
-+
-+static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-+{
-+	*num_partitions = ARRAY_SIZE(cam60_nand_partition);
-+	return cam60_nand_partition;
-+}
-+
-+static struct at91_nand_data __initdata cam60_nand_data = {
-+	.ale		= 21,
-+	.cle		= 22,
-+	// .det_pin	= ... not there
-+	.rdy_pin	= AT91_PIN_PA9,
-+	.enable_pin	= AT91_PIN_PA7,
-+	.partition_info	= nand_partitions,
-+};
-+
-+
-+static void __init cam60_board_init(void)
-+{
-+	/* Serial */
-+	at91_add_device_serial();
-+	/* SPI */
-+	at91_add_device_spi(cam60_spi_devices, ARRAY_SIZE(cam60_spi_devices));
-+	/* Ethernet */
-+	at91_add_device_eth(&cam60_macb_data);
-+	/* USB Host */
-+	/* enable USB power supply circuit */
-+	at91_set_gpio_output(AT91_PIN_PB18, 1);
-+	at91_add_device_usbh(&cam60_usbh_data);
-+	/* NAND */
-+	at91_add_device_nand(&cam60_nand_data);
-+}
-+
-+MACHINE_START(CAM60, "KwikByte CAM60")
-+	/* Maintainer: KwikByte */
-+	.phys_io	= AT91_BASE_SYS,
-+	.io_pg_offst	= (AT91_VA_BASE_SYS >> 18) & 0xfffc,
-+	.boot_params	= AT91_SDRAM_BASE + 0x100,
-+	.timer		= &at91sam926x_timer,
-+	.map_io		= cam60_map_io,
-+	.init_irq	= cam60_init_irq,
-+	.init_machine	= cam60_board_init,
-+MACHINE_END
---- a/arch/arm/mach-at91/board-cap9adk.c
-+++ b/arch/arm/mach-at91/board-cap9adk.c
-@@ -36,16 +36,14 @@
- #include <asm/hardware.h>
- #include <asm/setup.h>
- #include <asm/mach-types.h>
--#include <asm/irq.h>
- 
- #include <asm/mach/arch.h>
- #include <asm/mach/map.h>
--#include <asm/mach/irq.h>
- 
- #include <asm/arch/board.h>
- #include <asm/arch/gpio.h>
- #include <asm/arch/at91cap9_matrix.h>
--#include <asm/arch/at91sam926x_mc.h>
-+#include <asm/arch/at91sam9_smc.h>
- 
- #include "generic.h"
- 
-@@ -78,6 +76,12 @@ static struct at91_usbh_data __initdata 
- 	.ports		= 2,
- };
- 
-+/*
-+ * USB HS Device port
-+ */
-+static struct usba_platform_data __initdata cap9adk_usba_udc_data = {
-+	.vbus_pin	= AT91_PIN_PB31,
-+};
- 
- /*
-  * ADS7846 Touchscreen
-@@ -130,7 +134,7 @@ static struct spi_board_info cap9adk_spi
- 	{
- 		.modalias	= "ads7846",
- 		.chip_select	= 3,		/* can be 2 or 3, depending on J2 jumper */
--		.max_speed_hz	= 125000 * 26,	/* (max sample rate @ 3V) * (cmd + data + overhead) */
-+		.max_speed_hz	= 125000 * 16,	/* max sample rate * clocks per sample */
- 		.bus_num	= 0,
- 		.platform_data	= &ads_info,
- 		.irq		= AT91_PIN_PC4,
-@@ -324,8 +328,9 @@ static void __init cap9adk_board_init(vo
- 	/* Serial */
- 	at91_add_device_serial();
- 	/* USB Host */
--	set_irq_type(AT91CAP9_ID_UHP, IRQT_HIGH);
- 	at91_add_device_usbh(&cap9adk_usbh_data);
-+	/* USB HS */
-+	at91_add_device_usba(&cap9adk_usba_udc_data);
- 	/* SPI */
- 	at91_add_device_spi(cap9adk_spi_devices, ARRAY_SIZE(cap9adk_spi_devices));
- 	/* Touchscreen */
-@@ -341,7 +346,6 @@ static void __init cap9adk_board_init(vo
- 	/* I2C */
- 	at91_add_device_i2c(NULL, 0);
- 	/* LCD Controller */
--	set_irq_type(AT91CAP9_ID_LCDC, IRQT_HIGH);
- 	at91_add_device_lcdc(&cap9adk_lcdc_data);
- 	/* AC97 */
- 	at91_add_device_ac97(&cap9adk_ac97_data);
---- a/arch/arm/mach-at91/board-carmeva.c
-+++ b/arch/arm/mach-at91/board-carmeva.c
-@@ -40,24 +40,21 @@
- #include "generic.h"
- 
- 
--/*
-- * Serial port configuration.
-- *    0 .. 3 = USART0 .. USART3
-- *    4      = DBGU
-- */
--static struct at91_uart_config __initdata carmeva_uart_config = {
--	.console_tty	= 0,				/* ttyS0 */
--	.nr_tty		= 2,
--	.tty_map	= { 4, 1, -1, -1, -1 }		/* ttyS0, ..., ttyS4 */
--};
--
- static void __init carmeva_map_io(void)
- {
- 	/* Initialize processor: 20.000 MHz crystal */
- 	at91rm9200_initialize(20000000, AT91RM9200_BGA);
- 
--	/* Setup the serial ports and console */
--	at91_init_serial(&carmeva_uart_config);
-+	/* DBGU on ttyS0. (Rx & Tx only) */
-+	at91_register_uart(0, 0, 0);
-+
-+	/* USART1 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */
-+	at91_register_uart(AT91RM9200_ID_US1, 1, ATMEL_UART_CTS | ATMEL_UART_RTS
-+			   | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD
-+			   | ATMEL_UART_RI);
-+
-+	/* set serial console to ttyS0 (ie, DBGU) */
-+	at91_set_serial_console(0);
- }
- 
- static void __init carmeva_init_irq(void)
-@@ -117,6 +114,30 @@ static struct spi_board_info carmeva_spi
- 	},
- };
- 
-+static struct gpio_led carmeva_leds[] = {
-+	{ /* "user led 1", LED9 */
-+		.name			= "led9",
-+		.gpio			= AT91_PIN_PA21,
-+		.active_low		= 1,
-+		.default_trigger	= "heartbeat",
-+	},
-+	{ /* "user led 2", LED10 */
-+		.name			= "led10",
-+		.gpio			= AT91_PIN_PA25,
-+		.active_low		= 1,
-+	},
-+	{ /* "user led 3", LED11 */
-+		.name			= "led11",
-+		.gpio			= AT91_PIN_PA26,
-+		.active_low		= 1,
-+	},
-+	{ /* "user led 4", LED12 */
-+		.name			= "led12",
-+		.gpio			= AT91_PIN_PA18,
-+		.active_low		= 1,
-+	}
-+};
-+
- static void __init carmeva_board_init(void)
- {
- 	/* Serial */
-@@ -135,6 +156,8 @@ static void __init carmeva_board_init(vo
- //	at91_add_device_cf(&carmeva_cf_data);
- 	/* MMC */
- 	at91_add_device_mmc(0, &carmeva_mmc_data);
-+	/* LEDs */
-+	at91_gpio_leds(carmeva_leds, ARRAY_SIZE(carmeva_leds));
- }
- 
- MACHINE_START(CARMEVA, "Carmeva")
---- /dev/null
-+++ b/arch/arm/mach-at91/board-chub.c
-@@ -0,0 +1,132 @@
-+/*
-+ * linux/arch/arm/mach-at91/board-chub.c
-+ *
-+ *  Copyright (C) 2005 SAN People, adapted for Promwad Chub board
-+ *  by Kuten Ivan
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#include <linux/types.h>
-+#include <linux/init.h>
-+#include <linux/mm.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/setup.h>
-+#include <asm/mach-types.h>
-+#include <asm/irq.h>
-+
-+#include <asm/mach/arch.h>
-+#include <asm/mach/map.h>
-+#include <asm/mach/irq.h>
-+
-+#include <asm/arch/board.h>
-+#include <asm/arch/gpio.h>
-+
-+#include "generic.h"
-+
-+/*
-+ * Serial port configuration.
-+ *    0 .. 3 = USART0 .. USART3
-+ *    4      = DBGU
-+ */
-+static struct at91_uart_config __initdata chub_uart_config = {
-+	.console_tty	= 0,				/* ttyS0 */
-+	.nr_tty		= 5,
-+	.tty_map	= { 4, 0, 1, 2, 3 }		/* ttyS0, ..., ttyS4 */
-+};
-+
-+static void __init chub_init_irq(void)
-+{
-+	at91rm9200_init_interrupts(NULL);
-+}
-+
-+static void __init chub_map_io(void)
-+{
-+	/* Initialize clocks: 18.432 MHz crystal */
-+	at91rm9200_initialize(18432000, AT91RM9200_PQFP);
-+
-+	/* Setup the serial ports and console */
-+	at91_init_serial(&chub_uart_config);
-+}
-+
-+static struct at91_eth_data __initdata chub_eth_data = {
-+	.phy_irq_pin	= AT91_PIN_PB29,
-+	.is_rmii	= 0,
-+};
-+
-+static struct mtd_partition __initdata chub_nand_partition[] = {
-+	{
-+		.name	= "NAND Partition 1",
-+		.offset = 0,
-+		.size	= MTDPART_SIZ_FULL,
-+	},
-+};
-+
-+static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-+{
-+	*num_partitions = ARRAY_SIZE(chub_nand_partition);
-+	return chub_nand_partition;
-+}
-+
-+static struct at91_nand_data __initdata chub_nand_data = {
-+	.ale		= 22,
-+	.cle		= 21,
-+	.enable_pin	= AT91_PIN_PA27,
-+	.partition_info	= nand_partitions,
-+};
-+
-+static struct spi_board_info chub_spi_devices[] = {
-+	{	/* DataFlash chip */
-+		.modalias	= "mtd_dataflash",
-+		.chip_select	= 0,
-+		.max_speed_hz	= 15 * 1000 * 1000,
-+	},
-+};
-+
-+static void __init chub_board_init(void)
-+{
-+	/* Serial */
-+	at91_add_device_serial();
-+	/* I2C */
-+	at91_add_device_i2c(NULL, 0);
-+	/* Ethernet */
-+	at91_add_device_eth(&chub_eth_data);
-+	/* SPI */
-+	at91_add_device_spi(chub_spi_devices, ARRAY_SIZE(chub_spi_devices));
-+	/* NAND Flash */
-+	at91_add_device_nand(&chub_nand_data);
-+	/* Disable write protect for NAND */
-+	at91_set_gpio_output(AT91_PIN_PB7, 1);
-+	/* Power enable for 3x RS-232 and 1x RS-485 */
-+	at91_set_gpio_output(AT91_PIN_PB9, 1);
-+	/* Disable write protect for FRAM */
-+	at91_set_gpio_output(AT91_PIN_PA21, 1);
-+	/* Disable write protect for Dataflash */
-+	at91_set_gpio_output(AT91_PIN_PA19, 1);
-+}
-+
-+MACHINE_START(CHUB, "Promwad Chub")
-+	/* Maintainer: Ivan Kuten AT Promwad DOT com */
-+	.phys_io	= AT91_BASE_SYS,
-+	.io_pg_offst	= (AT91_VA_BASE_SYS >> 18) & 0xfffc,
-+	.boot_params	= AT91_SDRAM_BASE + 0x100,
-+	.timer		= &at91rm9200_timer,
-+	.map_io		= chub_map_io,
-+	.init_irq	= chub_init_irq,
-+	.init_machine	= chub_board_init,
-+MACHINE_END
---- a/arch/arm/mach-at91/board-csb337.c
-+++ b/arch/arm/mach-at91/board-csb337.c
-@@ -61,6 +61,7 @@ static void __init csb337_map_io(void)
- 
- 	/* Setup the LEDs */
- 	at91_init_leds(AT91_PIN_PB0, AT91_PIN_PB1);
-+	at91_set_gpio_output(AT91_PIN_PB2, 1);		/* third (unused) LED */
- 
- 	/* Setup the serial ports and console */
- 	at91_init_serial(&csb337_uart_config);
-@@ -202,11 +203,11 @@ static struct platform_device csb300_but
- 
- static void __init csb300_add_device_buttons(void)
- {
--	at91_set_gpio_input(AT91_PIN_PB29, 0);	/* sw0 */
-+	at91_set_gpio_input(AT91_PIN_PB29, 1);	/* sw0 */
- 	at91_set_deglitch(AT91_PIN_PB29, 1);
--	at91_set_gpio_input(AT91_PIN_PB28, 0);	/* sw1 */
-+	at91_set_gpio_input(AT91_PIN_PB28, 1);	/* sw1 */
- 	at91_set_deglitch(AT91_PIN_PB28, 1);
--	at91_set_gpio_input(AT91_PIN_PA21, 0);	/* sw2 */
-+	at91_set_gpio_input(AT91_PIN_PA21, 1);	/* sw2 */
- 	at91_set_deglitch(AT91_PIN_PA21, 1);
- 
- 	platform_device_register(&csb300_button_device);
-@@ -233,7 +234,7 @@ static struct gpio_led csb_leds[] = {
- 		.gpio			= AT91_PIN_PB0,
- 		.active_low		= 1,
- 		.default_trigger	= "ide-disk",
--	},
-+	}
- };
- 
- 
---- a/arch/arm/mach-at91/board-csb637.c
-+++ b/arch/arm/mach-at91/board-csb637.c
-@@ -40,27 +40,16 @@
- #include "generic.h"
- 
- 
--/*
-- * Serial port configuration.
-- *    0 .. 3 = USART0 .. USART3
-- *    4      = DBGU
-- */
--static struct at91_uart_config __initdata csb637_uart_config = {
--	.console_tty	= 0,				/* ttyS0 */
--	.nr_tty		= 2,
--	.tty_map	= { 4, 1, -1, -1, -1 }		/* ttyS0, ..., ttyS4 */
--};
--
- static void __init csb637_map_io(void)
- {
- 	/* Initialize processor: 3.6864 MHz crystal */
- 	at91rm9200_initialize(3686400, AT91RM9200_BGA);
- 
--	/* Setup the LEDs */
--	at91_init_leds(AT91_PIN_PB2, AT91_PIN_PB2);
-+	/* DBGU on ttyS0. (Rx & Tx only) */
-+	at91_register_uart(0, 0, 0);
- 
--	/* Setup the serial ports and console */
--	at91_init_serial(&csb637_uart_config);
-+	/* make console=ttyS0 (ie, DBGU) the default */
-+	at91_set_serial_console(0);
- }
- 
- static void __init csb637_init_irq(void)
-@@ -118,8 +107,19 @@ static struct platform_device csb_flash 
- 	.num_resources	= ARRAY_SIZE(csb_flash_resources),
- };
- 
-+static struct gpio_led csb_leds[] = {
-+	{	/* "d1", red */
-+		.name			= "d1",
-+		.gpio			= AT91_PIN_PB2,
-+		.active_low		= 1,
-+		.default_trigger	= "heartbeat",
-+	}
-+};
-+
- static void __init csb637_board_init(void)
- {
-+	/* LED(s) */
-+	at91_gpio_leds(csb_leds, ARRAY_SIZE(csb_leds));
- 	/* Serial */
- 	at91_add_device_serial();
- 	/* Ethernet */
---- a/arch/arm/mach-at91/board-dk.c
-+++ b/arch/arm/mach-at91/board-dk.c
-@@ -25,6 +25,7 @@
- #include <linux/init.h>
- #include <linux/mm.h>
- #include <linux/module.h>
-+#include <linux/dma-mapping.h>
- #include <linux/platform_device.h>
- #include <linux/spi/spi.h>
- #include <linux/mtd/physmap.h>
-@@ -45,17 +46,6 @@
- #include "generic.h"
- 
- 
--/*
-- * Serial port configuration.
-- *    0 .. 3 = USART0 .. USART3
-- *    4      = DBGU
-- */
--static struct at91_uart_config __initdata dk_uart_config = {
--	.console_tty	= 0,				/* ttyS0 */
--	.nr_tty		= 2,
--	.tty_map	= { 4, 1, -1, -1, -1 }		/* ttyS0, ..., ttyS4 */
--};
--
- static void __init dk_map_io(void)
- {
- 	/* Initialize processor: 18.432 MHz crystal */
-@@ -64,8 +54,16 @@ static void __init dk_map_io(void)
- 	/* Setup the LEDs */
- 	at91_init_leds(AT91_PIN_PB2, AT91_PIN_PB2);
- 
--	/* Setup the serial ports and console */
--	at91_init_serial(&dk_uart_config);
-+	/* DBGU on ttyS0. (Rx & Tx only) */
-+	at91_register_uart(0, 0, 0);
-+
-+	/* USART1 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */
-+	at91_register_uart(AT91RM9200_ID_US1, 1, ATMEL_UART_CTS | ATMEL_UART_RTS
-+			   | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD
-+			   | ATMEL_UART_RI);
-+
-+	/* set serial console to ttyS0 (ie, DBGU) */
-+	at91_set_serial_console(0);
- }
- 
- static void __init dk_init_irq(void)
-@@ -73,6 +71,185 @@ static void __init dk_init_irq(void)
- 	at91rm9200_init_interrupts(NULL);
- }
- 
-+#if defined(CONFIG_FB_S1D13XXX) || defined(CONFIG_FB_S1D13XXX_MODULE)
-+#include <video/s1d13xxxfb.h>
-+#include <asm/arch/ics1523.h>
-+
-+/* EPSON S1D13806 FB */
-+#define AT91_FB_REG_BASE	0x30000000L
-+#define AT91_FB_REG_SIZE	0x200
-+#define AT91_FB_VMEM_BASE	0x30200000L
-+#define AT91_FB_VMEM_SIZE	0x140000L
-+
-+static void dk_init_video(void)
-+{
-+	/* NWAIT Signal */
-+	at91_set_A_periph(AT91_PIN_PC6, 0);
-+
-+	/* Initialization of the Static Memory Controller for Chip Select 2 */
-+	at91_sys_write(AT91_SMC_CSR(2), AT91_SMC_DBW_16			/* 16 bit */
-+				| AT91_SMC_WSEN | AT91_SMC_NWS_(4)	/* wait states */
-+				| AT91_SMC_TDF_(1)			/* float time */
-+	);
-+
-+	at91_ics1523_init();
-+}
-+
-+/* CRT:    (active)   640x480 60Hz (PCLK=CLKI=25.175MHz)
-+   Memory: Embedded SDRAM (MCLK=CLKI3=50.000MHz) (BUSCLK=60.000MHz) */
-+static const struct s1d13xxxfb_regval dk_s1dfb_initregs[] = {
-+	{S1DREG_MISC,			0x00},	/* Enable Memory/Register select bit */
-+	{S1DREG_COM_DISP_MODE,		0x00},	/* disable display output */
-+	{S1DREG_GPIO_CNF0,		0x00},
-+	{S1DREG_GPIO_CNF1,		0x00},
-+	{S1DREG_GPIO_CTL0,		0x08},
-+	{S1DREG_GPIO_CTL1,		0x00},
-+	{S1DREG_CLK_CNF,		0x01},	/* no divide, MCLK source is CLKI3 0x02*/
-+	{S1DREG_LCD_CLK_CNF,		0x00},
-+	{S1DREG_CRT_CLK_CNF,		0x00},
-+	{S1DREG_MPLUG_CLK_CNF,		0x00},
-+	{S1DREG_CPU2MEM_WST_SEL,	0x01},	/* 2*period(MCLK) - 4ns > period(BCLK) */
-+	{S1DREG_SDRAM_REF_RATE,		0x03},	/* 32768 <= MCLK <= 50000 (MHz) */
-+	{S1DREG_SDRAM_TC0,		0x00},	/* MCLK source freq (MHz): */
-+	{S1DREG_SDRAM_TC1,		0x01},	/* 42 <= MCLK <= 50 */
-+	{S1DREG_MEM_CNF,		0x80},	/* SDRAM Initialization - needed before mem access */
-+	{S1DREG_PANEL_TYPE,		0x25},	/* std TFT 16bit, 8bit SCP format 2, single passive LCD */
-+	{S1DREG_MOD_RATE,		0x00},	/* toggle every FPFRAME */
-+	{S1DREG_LCD_DISP_HWIDTH,	0x4F},	/* 680 pix */
-+	{S1DREG_LCD_NDISP_HPER,		0x12},	/* 152 pix */
-+	{S1DREG_TFT_FPLINE_START,	0x01},	/* 13 pix */
-+	{S1DREG_TFT_FPLINE_PWIDTH,	0x0B},	/* 96 pix */
-+	{S1DREG_LCD_DISP_VHEIGHT0,	0xDF},
-+	{S1DREG_LCD_DISP_VHEIGHT1,	0x01},	/* 480 lines */
-+	{S1DREG_LCD_NDISP_VPER,		0x2C},	/* 44 lines */
-+	{S1DREG_TFT_FPFRAME_START,	0x0A},	/* 10 lines */
-+	{S1DREG_TFT_FPFRAME_PWIDTH,	0x01},	/* 2 lines */
-+	{S1DREG_LCD_DISP_MODE,		0x05},  /* 16 bpp */
-+	{S1DREG_LCD_MISC,		0x00},	/* dithering enabled, dual panel buffer enabled */
-+	{S1DREG_LCD_DISP_START0,	0x00},
-+	{S1DREG_LCD_DISP_START1,	0xC8},
-+	{S1DREG_LCD_DISP_START2,	0x00},
-+	{S1DREG_LCD_MEM_OFF0,		0x80},
-+	{S1DREG_LCD_MEM_OFF1,		0x02},
-+	{S1DREG_LCD_PIX_PAN,		0x00},
-+	{S1DREG_LCD_DISP_FIFO_HTC,	0x3B},
-+	{S1DREG_LCD_DISP_FIFO_LTC,	0x3C},
-+	{S1DREG_CRT_DISP_HWIDTH,	0x4F},	/* 680 pix */
-+	{S1DREG_CRT_NDISP_HPER,		0x13},	/* 160 pix */
-+	{S1DREG_CRT_HRTC_START,		0x01},	/* 13 pix */
-+	{S1DREG_CRT_HRTC_PWIDTH,	0x0B},	/* 96 pix */
-+	{S1DREG_CRT_DISP_VHEIGHT0,	0xDF},
-+	{S1DREG_CRT_DISP_VHEIGHT1,	0x01},	/* 480 lines */
-+	{S1DREG_CRT_NDISP_VPER,		0x2B},	/* 44 lines */
-+	{S1DREG_CRT_VRTC_START,		0x09},	/* 10 lines */
-+	{S1DREG_CRT_VRTC_PWIDTH,	0x01},	/* 2 lines */
-+	{S1DREG_TV_OUT_CTL,		0x10},
-+	{S1DREG_CRT_DISP_MODE,		0x05},	/* 16 bpp */
-+	{S1DREG_CRT_DISP_START0,	0x00},
-+	{S1DREG_CRT_DISP_START1,	0x00},
-+	{S1DREG_CRT_DISP_START2,	0x00},
-+	{S1DREG_CRT_MEM_OFF0,		0x80},
-+	{S1DREG_CRT_MEM_OFF1,		0x02},
-+	{S1DREG_CRT_PIX_PAN,		0x00},
-+	{S1DREG_CRT_DISP_FIFO_HTC,	0x3B},
-+	{S1DREG_CRT_DISP_FIFO_LTC,	0x3C},
-+	{S1DREG_LCD_CUR_CTL,		0x00},	/* inactive */
-+	{S1DREG_LCD_CUR_START,		0x01},
-+	{S1DREG_LCD_CUR_XPOS0,		0x00},
-+	{S1DREG_LCD_CUR_XPOS1,		0x00},
-+	{S1DREG_LCD_CUR_YPOS0,		0x00},
-+	{S1DREG_LCD_CUR_YPOS1,		0x00},
-+	{S1DREG_LCD_CUR_BCTL0,		0x00},
-+	{S1DREG_LCD_CUR_GCTL0,		0x00},
-+	{S1DREG_LCD_CUR_RCTL0,		0x00},
-+	{S1DREG_LCD_CUR_BCTL1,		0x1F},
-+	{S1DREG_LCD_CUR_GCTL1,		0x3F},
-+	{S1DREG_LCD_CUR_RCTL1,		0x1F},
-+	{S1DREG_LCD_CUR_FIFO_HTC,	0x00},
-+	{S1DREG_CRT_CUR_CTL,		0x00},	/* inactive */
-+	{S1DREG_CRT_CUR_START,		0x01},
-+	{S1DREG_CRT_CUR_XPOS0,		0x00},
-+	{S1DREG_CRT_CUR_XPOS1,		0x00},
-+	{S1DREG_CRT_CUR_YPOS0,		0x00},
-+	{S1DREG_CRT_CUR_YPOS1,		0x00},
-+	{S1DREG_CRT_CUR_BCTL0,		0x00},
-+	{S1DREG_CRT_CUR_GCTL0,		0x00},
-+	{S1DREG_CRT_CUR_RCTL0,		0x00},
-+	{S1DREG_CRT_CUR_BCTL1,		0x1F},
-+	{S1DREG_CRT_CUR_GCTL1,		0x3F},
-+	{S1DREG_CRT_CUR_RCTL1,		0x1F},
-+	{S1DREG_CRT_CUR_FIFO_HTC,	0x00},
-+	{S1DREG_BBLT_CTL0,		0x00},
-+	{S1DREG_BBLT_CTL0,		0x00},
-+	{S1DREG_BBLT_CC_EXP,		0x00},
-+	{S1DREG_BBLT_OP,		0x00},
-+	{S1DREG_BBLT_SRC_START0,	0x00},
-+	{S1DREG_BBLT_SRC_START1,	0x00},
-+	{S1DREG_BBLT_SRC_START2,	0x00},
-+	{S1DREG_BBLT_DST_START0,	0x00},
-+	{S1DREG_BBLT_DST_START1,	0x00},
-+	{S1DREG_BBLT_DST_START2,	0x00},
-+	{S1DREG_BBLT_MEM_OFF0,		0x00},
-+	{S1DREG_BBLT_MEM_OFF1,		0x00},
-+	{S1DREG_BBLT_WIDTH0,		0x00},
-+	{S1DREG_BBLT_WIDTH1,		0x00},
-+	{S1DREG_BBLT_HEIGHT0,		0x00},
-+	{S1DREG_BBLT_HEIGHT1,		0x00},
-+	{S1DREG_BBLT_BGC0,		0x00},
-+	{S1DREG_BBLT_BGC1,		0x00},
-+	{S1DREG_BBLT_FGC0,		0x00},
-+	{S1DREG_BBLT_FGC1,		0x00},
-+	{S1DREG_LKUP_MODE,		0x00},	/* LCD LUT r | LCD and CRT/TV LUT w */
-+	{S1DREG_LKUP_ADDR,		0x00},
-+	{S1DREG_PS_CNF,			0x00},	/* Power Save disable */
-+	{S1DREG_PS_STATUS,		0x02},	/* LCD Panel down, mem up */
-+	{S1DREG_CPU2MEM_WDOGT,		0x00},
-+	{S1DREG_COM_DISP_MODE,		0x02},	/* enable CRT display output */
-+};
-+
-+static struct s1d13xxxfb_pdata dk_s1dfb_pdata = {
-+	.initregs		= dk_s1dfb_initregs,
-+	.initregssize		= ARRAY_SIZE(dk_s1dfb_initregs),
-+	.platform_init_video	= dk_init_video,
-+};
-+
-+static u64 s1dfb_dmamask = DMA_BIT_MASK(32);
-+
-+static struct resource dk_s1dfb_resource[] = {
-+	[0] = {	/* video mem */
-+		.name   = "s1d13806 memory",
-+		.start  = AT91_FB_VMEM_BASE,
-+		.end    = AT91_FB_VMEM_BASE + AT91_FB_VMEM_SIZE -1,
-+		.flags  = IORESOURCE_MEM,
-+	},
-+	[1] = {	/* video registers */
-+		.name   = "s1d13806 registers",
-+		.start  = AT91_FB_REG_BASE,
-+		.end    = AT91_FB_REG_BASE + AT91_FB_REG_SIZE -1,
-+		.flags  = IORESOURCE_MEM,
-+	},
-+};
-+
-+static struct platform_device dk_s1dfb_device = {
-+	.name		= "s1d13806fb",
-+	.id		= -1,
-+	.dev		= {
-+			.dma_mask		= &s1dfb_dmamask,
-+			.coherent_dma_mask	= DMA_BIT_MASK(32),
-+			.platform_data		= &dk_s1dfb_pdata,
-+	},
-+	.resource	= dk_s1dfb_resource,
-+	.num_resources	= ARRAY_SIZE(dk_s1dfb_resource),
-+};
-+
-+static void __init dk_add_device_video(void)
-+{
-+	platform_device_register(&dk_s1dfb_device);
-+}
-+#else
-+static void __init dk_add_device_video(void) {}
-+#endif
-+
- static struct at91_eth_data __initdata dk_eth_data = {
- 	.phy_irq_pin	= AT91_PIN_PC4,
- 	.is_rmii	= 1,
-@@ -164,7 +341,7 @@ static struct at91_nand_data __initdata 
- #define DK_FLASH_SIZE	0x200000
- 
- static struct physmap_flash_data dk_flash_data = {
--	.width	= 2,
-+	.width		= 2,
- };
- 
- static struct resource dk_flash_resource = {
-@@ -223,8 +400,12 @@ static void __init dk_board_init(void)
- 	platform_device_register(&dk_flash);
- 	/* LEDs */
- 	at91_gpio_leds(dk_leds, ARRAY_SIZE(dk_leds));
-+	/* SSC (to LM4549 audio codec) */
-+	at91_add_device_ssc(AT91RM9200_ID_SSC1, ATMEL_SSC_TD | ATMEL_SSC_RX);
-+	/* SSC (to SI3021 line interface) */
-+	at91_add_device_ssc(AT91RM9200_ID_SSC2, ATMEL_SSC_TD | ATMEL_SSC_TK | ATMEL_SSC_RD | ATMEL_SSC_RF);
- 	/* VGA */
--//	dk_add_device_video();
-+	dk_add_device_video();
- }
- 
- MACHINE_START(AT91RM9200DK, "Atmel AT91RM9200-DK")
---- a/arch/arm/mach-at91/board-eb9200.c
-+++ b/arch/arm/mach-at91/board-eb9200.c
-@@ -40,24 +40,24 @@
- #include "generic.h"
- 
- 
--/*
-- * Serial port configuration.
-- *    0 .. 3 = USART0 .. USART3
-- *    4      = DBGU
-- */
--static struct at91_uart_config __initdata eb9200_uart_config = {
--	.console_tty	= 0,				/* ttyS0 */
--	.nr_tty		= 2,
--	.tty_map	= { 4, 1, -1, -1, -1 }		/* ttyS0, ..., ttyS4 */
--};
--
- static void __init eb9200_map_io(void)
- {
- 	/* Initialize processor: 18.432 MHz crystal */
- 	at91rm9200_initialize(18432000, AT91RM9200_BGA);
- 
--	/* Setup the serial ports and console */
--	at91_init_serial(&eb9200_uart_config);
-+	/* DBGU on ttyS0. (Rx & Tx only) */
-+	at91_register_uart(0, 0, 0);
-+
-+	/* USART1 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */
-+	at91_register_uart(AT91RM9200_ID_US1, 1, ATMEL_UART_CTS | ATMEL_UART_RTS
-+			| ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD
-+			| ATMEL_UART_RI);
-+
-+	/* USART2 on ttyS2. (Rx, Tx) - IRDA */
-+	at91_register_uart(AT91RM9200_ID_US2, 2, 0);
-+
-+	/* set serial console to ttyS0 (ie, DBGU) */
-+	at91_set_serial_console(0);
- }
- 
- static void __init eb9200_init_irq(void)
---- /dev/null
-+++ b/arch/arm/mach-at91/board-ecbat91.c
-@@ -0,0 +1,178 @@
-+/*
-+ * linux/arch/arm/mach-at91rm9200/board-ecbat91.c
-+ * Copyright (C) 2007 emQbit.com.
-+ *
-+ * We started from board-dk.c, which is Copyright (C) 2005 SAN People.
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#include <linux/types.h>
-+#include <linux/init.h>
-+#include <linux/mm.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/spi/spi.h>
-+#include <linux/spi/flash.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/setup.h>
-+#include <asm/mach-types.h>
-+#include <asm/irq.h>
-+
-+#include <asm/mach/arch.h>
-+#include <asm/mach/map.h>
-+#include <asm/mach/irq.h>
-+
-+#include <asm/arch/board.h>
-+#include <asm/arch/gpio.h>
-+
-+#include "generic.h"
-+
-+
-+static void __init ecb_at91map_io(void)
-+{
-+	/* Initialize processor: 18.432 MHz crystal */
-+	at91rm9200_initialize(18432000, AT91RM9200_PQFP);
-+
-+	/* Setup the LEDs */
-+	at91_init_leds(AT91_PIN_PC7, AT91_PIN_PC7);
-+
-+	/* DBGU on ttyS0. (Rx & Tx only) */
-+	at91_register_uart(0, 0, 0);
-+
-+	/* USART0 on ttyS1. (Rx & Tx only) */
-+	at91_register_uart(AT91RM9200_ID_US0, 1, 0);
-+
-+	/* set serial console to ttyS0 (ie, DBGU) */
-+	at91_set_serial_console(0);
-+}
-+
-+static void __init ecb_at91init_irq(void)
-+{
-+	at91rm9200_init_interrupts(NULL);
-+}
-+
-+static struct at91_eth_data __initdata ecb_at91eth_data = {
-+	.phy_irq_pin	= AT91_PIN_PC4,
-+	.is_rmii	= 0,
-+};
-+
-+static struct at91_usbh_data __initdata ecb_at91usbh_data = {
-+	.ports		= 1,
-+};
-+
-+static struct at91_mmc_data __initdata ecb_at91mmc_data = {
-+	.slot_b		= 0,
-+	.wire4		= 1,
-+};
-+
-+
-+#if defined(CONFIG_MTD_DATAFLASH)
-+static struct mtd_partition __initdata my_flash0_partitions[] =
-+{
-+	{	/* 0x8400 */
-+		.name	= "Darrell-loader",
-+		.offset	= 0,
-+		.size	= 12* 1056,
-+	},
-+	{
-+		.name	= "U-boot",
-+		.offset	= MTDPART_OFS_NXTBLK,
-+		.size	= 110 * 1056,
-+	},
-+	{	/* 1336 (167 blocks) pages * 1056 bytes = 0x158700 bytes */
-+		.name	= "Uoot-env",
-+		.offset	= MTDPART_OFS_NXTBLK,
-+		.size	= 8 * 1056,
-+	},
-+	{	/* 1336 (167 blocks) pages * 1056 bytes = 0x158700 bytes */
-+		.name	= "Kernel",
-+		.offset	= MTDPART_OFS_NXTBLK,
-+		.size	= 1534 * 1056,
-+	},
-+	{	/* 190200 - jffs2 root filesystem */
-+		.name	= "Filesystem",
-+		.offset	= MTDPART_OFS_NXTBLK,
-+		.size	= MTDPART_SIZ_FULL,	/* 26 sectors */
-+	}
-+};
-+
-+static struct flash_platform_data __initdata my_flash0_platform = {
-+	.name		= "Removable flash card",
-+	.parts		= my_flash0_partitions,
-+	.nr_parts	= ARRAY_SIZE(my_flash0_partitions)
-+};
-+
-+#endif
-+
-+static struct spi_board_info __initdata ecb_at91spi_devices[] = {
-+	{	/* DataFlash chip */
-+		.modalias	= "mtd_dataflash",
-+		.chip_select	= 0,
-+		.max_speed_hz	= 10 * 1000 * 1000,
-+		.bus_num	= 0,
-+#if defined(CONFIG_MTD_DATAFLASH)
-+		.platform_data	= &my_flash0_platform,
-+#endif
-+	},
-+	{	/* User accessable spi - cs1 (250KHz) */
-+		.modalias	= "spi-cs1",
-+		.chip_select	= 1,
-+		.max_speed_hz	= 250 * 1000,
-+	},
-+	{	/* User accessable spi - cs2 (1MHz) */
-+		.modalias	= "spi-cs2",
-+		.chip_select	= 2,
-+		.max_speed_hz	= 1 * 1000 * 1000,
-+	},
-+	{	/* User accessable spi - cs3 (10MHz) */
-+		.modalias	= "spi-cs3",
-+		.chip_select	= 3,
-+		.max_speed_hz	= 10 * 1000 * 1000,
-+	},
-+};
-+
-+static void __init ecb_at91board_init(void)
-+{
-+	/* Serial */
-+	at91_add_device_serial();
-+
-+	/* Ethernet */
-+	at91_add_device_eth(&ecb_at91eth_data);
-+
-+	/* USB Host */
-+	at91_add_device_usbh(&ecb_at91usbh_data);
-+
-+	/* I2C */
-+	at91_add_device_i2c(NULL, 0);
-+
-+	/* MMC */
-+	at91_add_device_mmc(0, &ecb_at91mmc_data);
-+
-+	/* SPI */
-+	at91_add_device_spi(ecb_at91spi_devices, ARRAY_SIZE(ecb_at91spi_devices));
-+}
-+
-+MACHINE_START(ECBAT91, "emQbit's ECB_AT91")
-+	/* Maintainer: emQbit.com */
-+	.phys_io	= AT91_BASE_SYS,
-+	.io_pg_offst	= (AT91_VA_BASE_SYS >> 18) & 0xfffc,
-+	.boot_params	= AT91_SDRAM_BASE + 0x100,
-+	.timer		= &at91rm9200_timer,
-+	.map_io		= ecb_at91map_io,
-+	.init_irq	= ecb_at91init_irq,
-+	.init_machine	= ecb_at91board_init,
-+MACHINE_END
---- a/arch/arm/mach-at91/board-ek.c
-+++ b/arch/arm/mach-at91/board-ek.c
-@@ -25,6 +25,7 @@
- #include <linux/init.h>
- #include <linux/mm.h>
- #include <linux/module.h>
-+#include <linux/dma-mapping.h>
- #include <linux/platform_device.h>
- #include <linux/spi/spi.h>
- #include <linux/mtd/physmap.h>
-@@ -45,17 +46,6 @@
- #include "generic.h"
- 
- 
--/*
-- * Serial port configuration.
-- *    0 .. 3 = USART0 .. USART3
-- *    4      = DBGU
-- */
--static struct at91_uart_config __initdata ek_uart_config = {
--	.console_tty	= 0,				/* ttyS0 */
--	.nr_tty		= 2,
--	.tty_map	= { 4, 1, -1, -1, -1 }		/* ttyS0, ..., ttyS4 */
--};
--
- static void __init ek_map_io(void)
- {
- 	/* Initialize processor: 18.432 MHz crystal */
-@@ -64,8 +54,16 @@ static void __init ek_map_io(void)
- 	/* Setup the LEDs */
- 	at91_init_leds(AT91_PIN_PB1, AT91_PIN_PB2);
- 
--	/* Setup the serial ports and console */
--	at91_init_serial(&ek_uart_config);
-+	/* DBGU on ttyS0. (Rx & Tx only) */
-+	at91_register_uart(0, 0, 0);
-+
-+	/* USART1 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */
-+	at91_register_uart(AT91RM9200_ID_US1, 1, ATMEL_UART_CTS | ATMEL_UART_RTS
-+			   | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD
-+			   | ATMEL_UART_RI);
-+
-+	/* set serial console to ttyS0 (ie, DBGU) */
-+	at91_set_serial_console(0);
- }
- 
- static void __init ek_init_irq(void)
-@@ -73,6 +71,187 @@ static void __init ek_init_irq(void)
- 	at91rm9200_init_interrupts(NULL);
- }
- 
-+#if defined(CONFIG_FB_S1D13XXX) || defined(CONFIG_FB_S1D13XXX_MODULE)
-+#include <video/s1d13xxxfb.h>
-+#include <asm/arch/ics1523.h>
-+
-+/* EPSON S1D13806 FB */
-+#define AT91_FB_REG_BASE	0x40000000L
-+#define	AT91_FB_REG_SIZE	0x200
-+#define AT91_FB_VMEM_BASE	0x40200000L
-+#define AT91_FB_VMEM_SIZE	0x140000L
-+
-+static void ek_init_video(void)
-+{
-+	/* NWAIT Signal */
-+	at91_set_A_periph(AT91_PIN_PC6, 0);
-+
-+	/* Initialization of the Static Memory Controller for Chip Select 3 */
-+	at91_sys_write(AT91_SMC_CSR(3), AT91_SMC_DBW_16			/* 16 bit */
-+				| AT91_SMC_WSEN | AT91_SMC_NWS_(5)	/* wait states */
-+				| AT91_SMC_TDF_(1)			/* float time */
-+	);
-+
-+	at91_ics1523_init();
-+}
-+
-+/* CRT:    (active)   640x480 60Hz (PCLK=CLKI=25.175MHz)
-+   Memory: Embedded SDRAM (MCLK=CLKI3=50.000MHz) (BUSCLK=60.000MHz) */
-+static const struct s1d13xxxfb_regval ek_s1dfb_initregs[] = {
-+	{S1DREG_MISC,			0x00},	/* Enable Memory/Register select bit */
-+	{S1DREG_COM_DISP_MODE,		0x00},	/* disable display output */
-+	{S1DREG_GPIO_CNF0,		0xFF},	// 0x00
-+	{S1DREG_GPIO_CNF1,		0x1F},	// 0x08
-+	{S1DREG_GPIO_CTL0,		0x00},
-+	{S1DREG_GPIO_CTL1,		0x00},
-+	{S1DREG_CLK_CNF,		0x01},	/* no divide, MCLK source is CLKI3 0x02*/
-+	{S1DREG_LCD_CLK_CNF,		0x00},
-+	{S1DREG_CRT_CLK_CNF,		0x00},
-+	{S1DREG_MPLUG_CLK_CNF,		0x00},
-+	{S1DREG_CPU2MEM_WST_SEL,	0x01},	/* 2*period(MCLK) - 4ns > period(BCLK) */
-+	{S1DREG_SDRAM_REF_RATE,		0x03},	/* 32768 <= MCLK <= 50000 (MHz) */
-+	{S1DREG_SDRAM_TC0,		0x00},	/* MCLK source freq (MHz): */
-+	{S1DREG_SDRAM_TC1,		0x01},	/* 42 <= MCLK <= 50 */
-+	{S1DREG_MEM_CNF,		0x80},	/* SDRAM Initialization - needed before mem access */
-+	{S1DREG_PANEL_TYPE,		0x25},	/* std TFT 16bit, 8bit SCP format 2, single passive LCD */
-+	{S1DREG_MOD_RATE,		0x00},	/* toggle every FPFRAME */
-+	{S1DREG_LCD_DISP_HWIDTH,	0x4F},	/* 680 pix */
-+	{S1DREG_LCD_NDISP_HPER,		0x12},	/* 152 pix */
-+	{S1DREG_TFT_FPLINE_START,	0x01},	/* 13 pix */
-+	{S1DREG_TFT_FPLINE_PWIDTH,	0x0B},	/* 96 pix */
-+	{S1DREG_LCD_DISP_VHEIGHT0,	0xDF},
-+	{S1DREG_LCD_DISP_VHEIGHT1,	0x01},	/* 480 lines */
-+	{S1DREG_LCD_NDISP_VPER,		0x2C},	/* 44 lines */
-+	{S1DREG_TFT_FPFRAME_START,	0x0A},	/* 10 lines */
-+	{S1DREG_TFT_FPFRAME_PWIDTH,	0x01},	/* 2 lines */
-+	{S1DREG_LCD_DISP_MODE,		0x05},  /* 16 bpp */
-+	{S1DREG_LCD_MISC,		0x00},	/* dithering enabled, dual panel buffer enabled */
-+	{S1DREG_LCD_DISP_START0,	0x00},
-+	{S1DREG_LCD_DISP_START1,	0xC8},
-+	{S1DREG_LCD_DISP_START2,	0x00},
-+	{S1DREG_LCD_MEM_OFF0,		0x80},
-+	{S1DREG_LCD_MEM_OFF1,		0x02},
-+	{S1DREG_LCD_PIX_PAN,		0x00},
-+	{S1DREG_LCD_DISP_FIFO_HTC,	0x3B},
-+	{S1DREG_LCD_DISP_FIFO_LTC,	0x3C},
-+	{S1DREG_CRT_DISP_HWIDTH,	0x4F},	/* 680 pix */
-+	{S1DREG_CRT_NDISP_HPER,		0x13},	/* 160 pix */
-+	{S1DREG_CRT_HRTC_START,		0x01},	/* 13 pix */
-+	{S1DREG_CRT_HRTC_PWIDTH,	0x0B},	/* 96 pix */
-+	{S1DREG_CRT_DISP_VHEIGHT0,	0xDF},
-+	{S1DREG_CRT_DISP_VHEIGHT1,	0x01},	/* 480 lines */
-+	{S1DREG_CRT_NDISP_VPER,		0x2B},	/* 44 lines */
-+	{S1DREG_CRT_VRTC_START,		0x09},	/* 10 lines */
-+	{S1DREG_CRT_VRTC_PWIDTH,	0x01},	/* 2 lines */
-+	{S1DREG_TV_OUT_CTL,		0x10},
-+	{0x005E,			0x9F},
-+	{0x005F,			0x00},
-+	{S1DREG_CRT_DISP_MODE,		0x05},	/* 16 bpp */
-+	{S1DREG_CRT_DISP_START0,	0x00},
-+	{S1DREG_CRT_DISP_START1,	0x00},
-+	{S1DREG_CRT_DISP_START2,	0x00},
-+	{S1DREG_CRT_MEM_OFF0,		0x80},
-+	{S1DREG_CRT_MEM_OFF1,		0x02},
-+	{S1DREG_CRT_PIX_PAN,		0x00},
-+	{S1DREG_CRT_DISP_FIFO_HTC,	0x3B},
-+	{S1DREG_CRT_DISP_FIFO_LTC,	0x3C},
-+	{S1DREG_LCD_CUR_CTL,		0x00},	/* inactive */
-+	{S1DREG_LCD_CUR_START,		0x01},
-+	{S1DREG_LCD_CUR_XPOS0,		0x00},
-+	{S1DREG_LCD_CUR_XPOS1,		0x00},
-+	{S1DREG_LCD_CUR_YPOS0,		0x00},
-+	{S1DREG_LCD_CUR_YPOS1,		0x00},
-+	{S1DREG_LCD_CUR_BCTL0,		0x00},
-+	{S1DREG_LCD_CUR_GCTL0,		0x00},
-+	{S1DREG_LCD_CUR_RCTL0,		0x00},
-+	{S1DREG_LCD_CUR_BCTL1,		0x1F},
-+	{S1DREG_LCD_CUR_GCTL1,		0x3F},
-+	{S1DREG_LCD_CUR_RCTL1,		0x1F},
-+	{S1DREG_LCD_CUR_FIFO_HTC,	0x00},
-+	{S1DREG_CRT_CUR_CTL,		0x00},	/* inactive */
-+	{S1DREG_CRT_CUR_START,		0x01},
-+	{S1DREG_CRT_CUR_XPOS0,		0x00},
-+	{S1DREG_CRT_CUR_XPOS1,		0x00},
-+	{S1DREG_CRT_CUR_YPOS0,		0x00},
-+	{S1DREG_CRT_CUR_YPOS1,		0x00},
-+	{S1DREG_CRT_CUR_BCTL0,		0x00},
-+	{S1DREG_CRT_CUR_GCTL0,		0x00},
-+	{S1DREG_CRT_CUR_RCTL0,		0x00},
-+	{S1DREG_CRT_CUR_BCTL1,		0x1F},
-+	{S1DREG_CRT_CUR_GCTL1,		0x3F},
-+	{S1DREG_CRT_CUR_RCTL1,		0x1F},
-+	{S1DREG_CRT_CUR_FIFO_HTC,	0x00},
-+	{S1DREG_BBLT_CTL0,		0x00},
-+	{S1DREG_BBLT_CTL0,		0x00},
-+	{S1DREG_BBLT_CC_EXP,		0x00},
-+	{S1DREG_BBLT_OP,		0x00},
-+	{S1DREG_BBLT_SRC_START0,	0x00},
-+	{S1DREG_BBLT_SRC_START1,	0x00},
-+	{S1DREG_BBLT_SRC_START2,	0x00},
-+	{S1DREG_BBLT_DST_START0,	0x00},
-+	{S1DREG_BBLT_DST_START1,	0x00},
-+	{S1DREG_BBLT_DST_START2,	0x00},
-+	{S1DREG_BBLT_MEM_OFF0,		0x00},
-+	{S1DREG_BBLT_MEM_OFF1,		0x00},
-+	{S1DREG_BBLT_WIDTH0,		0x00},
-+	{S1DREG_BBLT_WIDTH1,		0x00},
-+	{S1DREG_BBLT_HEIGHT0,		0x00},
-+	{S1DREG_BBLT_HEIGHT1,		0x00},
-+	{S1DREG_BBLT_BGC0,		0x00},
-+	{S1DREG_BBLT_BGC1,		0x00},
-+	{S1DREG_BBLT_FGC0,		0x00},
-+	{S1DREG_BBLT_FGC1,		0x00},
-+	{S1DREG_LKUP_MODE,		0x00},	/* LCD LUT r | LCD and CRT/TV LUT w */
-+	{S1DREG_LKUP_ADDR,		0x00},
-+	{S1DREG_PS_CNF,			0x10},	/* Power Save disable */
-+	{S1DREG_PS_STATUS,		0x02},	/* LCD Panel down, mem up */
-+	{S1DREG_CPU2MEM_WDOGT,		0x00},
-+	{S1DREG_COM_DISP_MODE,		0x02},	/* enable CRT display output */
-+};
-+
-+static struct s1d13xxxfb_pdata ek_s1dfb_pdata = {
-+	.initregs		= ek_s1dfb_initregs,
-+	.initregssize		= ARRAY_SIZE(ek_s1dfb_initregs),
-+	.platform_init_video	= ek_init_video,
-+};
-+
-+static u64 s1dfb_dmamask = DMA_BIT_MASK(32);
-+
-+static struct resource ek_s1dfb_resource[] = {
-+	[0] = {	/* video mem */
-+		.name   = "s1d13806 memory",
-+		.start  = AT91_FB_VMEM_BASE,
-+		.end    = AT91_FB_VMEM_BASE + AT91_FB_VMEM_SIZE -1,
-+		.flags  = IORESOURCE_MEM,
-+	},
-+	[1] = {	/* video registers */
-+		.name   = "s1d13806 registers",
-+		.start  = AT91_FB_REG_BASE,
-+		.end    = AT91_FB_REG_BASE + AT91_FB_REG_SIZE -1,
-+		.flags  = IORESOURCE_MEM,
-+	},
-+};
-+
-+static struct platform_device ek_s1dfb_device = {
-+	.name		= "s1d13806fb",
-+	.id		= -1,
-+	.dev		= {
-+			.dma_mask		= &s1dfb_dmamask,
-+			.coherent_dma_mask	= DMA_BIT_MASK(32),
-+			.platform_data		= &ek_s1dfb_pdata,
-+	},
-+	.resource	= ek_s1dfb_resource,
-+	.num_resources	= ARRAY_SIZE(ek_s1dfb_resource),
-+};
-+
-+static void __init ek_add_device_video(void)
-+{
-+	platform_device_register(&ek_s1dfb_device);
-+}
-+#else
-+static void __init ek_add_device_video(void) {}
-+#endif
-+
- static struct at91_eth_data __initdata ek_eth_data = {
- 	.phy_irq_pin	= AT91_PIN_PC4,
- 	.is_rmii	= 1,
-@@ -122,7 +301,7 @@ static struct i2c_board_info __initdata 
- #define EK_FLASH_SIZE	0x200000
- 
- static struct physmap_flash_data ek_flash_data = {
--	.width	= 2,
-+	.width		= 2,
- };
- 
- static struct resource ek_flash_resource = {
-@@ -189,7 +368,7 @@ static void __init ek_board_init(void)
- 	/* LEDs */
- 	at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds));
- 	/* VGA */
--//	ek_add_device_video();
-+	ek_add_device_video();
- }
- 
- MACHINE_START(AT91RM9200EK, "Atmel AT91RM9200-EK")
---- /dev/null
-+++ b/arch/arm/mach-at91/board-homematic.c
-@@ -0,0 +1,163 @@
-+/*
-+ * linux/arch/arm/mach-at91/board-homematic.c
-+ *
-+ *  Copyright (C) 2007 eQ-3 Entwicklung GmbH
-+ *
-+ *  based on work
-+ *	Copyright (C) 2005 SAN People
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#include <linux/types.h>
-+#include <linux/init.h>
-+#include <linux/mm.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/spi/spi.h>
-+#include <linux/mtd/physmap.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/setup.h>
-+#include <asm/mach-types.h>
-+#include <asm/irq.h>
-+
-+#include <asm/mach/arch.h>
-+#include <asm/mach/map.h>
-+#include <asm/mach/irq.h>
-+
-+#include <asm/arch/board.h>
-+#include <asm/arch/gpio.h>
-+#include <asm/arch/at91rm9200_mc.h>
-+
-+#include "generic.h"
-+
-+
-+/*
-+ * Serial port configuration.
-+ *    0 .. 3 = USART0 .. USART3
-+ *    4      = DBGU
-+ */
-+static struct at91_uart_config __initdata homematic_uart_config = {
-+	.console_tty	= 0,				/* ttyS0 */
-+	.nr_tty		= 2,
-+	.tty_map	= { 4, 1, -1, -1, -1 }		/* ttyS0, ..., ttyS4 */
-+};
-+
-+static void __init homematic_map_io(void)
-+{
-+	/* Initialize processor: 18.432 MHz crystal */
-+	at91rm9200_initialize(18432000, AT91RM9200_BGA);
-+
-+	/* Setup the serial ports and console */
-+	at91_init_serial(&homematic_uart_config);
-+}
-+
-+static void __init homematic_init_irq(void)
-+{
-+	at91rm9200_init_interrupts(NULL);
-+}
-+
-+static struct at91_eth_data __initdata homematic_eth_data = {
-+	.phy_irq_pin	= AT91_PIN_PC4,
-+	.is_rmii	= 0,
-+};
-+
-+static struct at91_usbh_data __initdata homematic_usbh_data = {
-+	.ports		= 2,
-+};
-+
-+static struct at91_udc_data __initdata homematic_udc_data = {
-+	.vbus_pin	= AT91_PIN_PD4,
-+	.pullup_pin	= AT91_PIN_PD5,
-+};
-+
-+static struct at91_mmc_data __initdata homematic_mmc_data = {
-+	.slot_b		= 0,
-+	.wire4		= 1,
-+};
-+
-+static struct spi_board_info homematic_spi_devices[] = {
-+	{	/* DataFlash chip */
-+		.modalias	= "mtd_dataflash",
-+		.chip_select	= 0,
-+		.max_speed_hz	= 15 * 1000 * 1000,
-+	},
-+};
-+
-+static struct mtd_partition __initdata homematic_nand_partition[] = {
-+	{
-+		.name	= "root",
-+		.offset	= 0,
-+		.size   = 0x02000000,
-+	}, {
-+		.name	= "storage",
-+		.offset	= 0x02000000,
-+		.size	= MTDPART_SIZ_FULL,
-+	},
-+};
-+
-+static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-+{
-+	*num_partitions = ARRAY_SIZE(homematic_nand_partition);
-+	return homematic_nand_partition;
-+}
-+
-+static struct at91_nand_data __initdata homematic_nand_data = {
-+	.ale		= 22,
-+	.cle		= 21,
-+//	.det_pin	= AT91_PIN_PB1,
-+	.rdy_pin	= AT91_PIN_PC2,
-+	.enable_pin	= AT91_PIN_PC0,
-+	.partition_info	= nand_partitions,
-+};
-+
-+static void __init homematic_board_init(void)
-+{
-+	/* Serial */
-+	at91_add_device_serial();
-+	/* Ethernet */
-+	at91_add_device_eth(&homematic_eth_data);
-+	/* USB Host */
-+	at91_add_device_usbh(&homematic_usbh_data);
-+	/* USB Device */
-+	at91_add_device_udc(&homematic_udc_data);
-+	at91_set_multi_drive(homematic_udc_data.pullup_pin, 1);	/* pullup_pin is connected to reset */
-+	/* I2C */
-+	at91_add_device_i2c(NULL, 0);
-+	/* SPI */
-+	at91_add_device_spi(homematic_spi_devices, ARRAY_SIZE(homematic_spi_devices));
-+#ifdef CONFIG_MTD_AT91_DATAFLASH_CARD
-+	/* DataFlash card */
-+	at91_set_gpio_output(AT91_PIN_PB7, 0);
-+#else
-+	/* MMC */
-+	at91_set_gpio_output(AT91_PIN_PB7, 1);	/* this MMC card slot can optionally use SPI signaling (CS3). */
-+	at91_add_device_mmc(0, &homematic_mmc_data);
-+#endif
-+	/* NAND */
-+	at91_add_device_nand(&homematic_nand_data);
-+}
-+
-+MACHINE_START(HOMEMATIC, "HomeMatic")
-+	/* Maintainer: eQ-3 */
-+	.phys_io	= AT91_BASE_SYS,
-+	.io_pg_offst	= (AT91_VA_BASE_SYS >> 18) & 0xfffc,
-+	.boot_params	= AT91_SDRAM_BASE + 0x100,
-+	.timer		= &at91rm9200_timer,
-+	.map_io		= homematic_map_io,
-+	.init_irq	= homematic_init_irq,
-+	.init_machine	= homematic_board_init,
-+MACHINE_END
---- a/arch/arm/mach-at91/board-kb9202.c
-+++ b/arch/arm/mach-at91/board-kb9202.c
-@@ -37,19 +37,10 @@
- #include <asm/arch/board.h>
- #include <asm/arch/gpio.h>
- 
--#include "generic.h"
-+#include <asm/arch/at91rm9200_mc.h>
- 
-+#include "generic.h"
- 
--/*
-- * Serial port configuration.
-- *    0 .. 3 = USART0 .. USART3
-- *    4      = DBGU
-- */
--static struct at91_uart_config __initdata kb9202_uart_config = {
--	.console_tty	= 0,					/* ttyS0 */
--	.nr_tty		= 3,
--	.tty_map	= { 4, 0, 1, -1, -1 }			/* ttyS0, ..., ttyS4 */
--};
- 
- static void __init kb9202_map_io(void)
- {
-@@ -59,8 +50,20 @@ static void __init kb9202_map_io(void)
- 	/* Set up the LEDs */
- 	at91_init_leds(AT91_PIN_PC19, AT91_PIN_PC18);
- 
--	/* Setup the serial ports and console */
--	at91_init_serial(&kb9202_uart_config);
-+	/* DBGU on ttyS0. (Rx & Tx only) */
-+	at91_register_uart(0, 0, 0);
-+
-+	/* USART0 on ttyS1 (Rx & Tx only) */
-+	at91_register_uart(AT91RM9200_ID_US0, 1, 0);
-+
-+	/* USART1 on ttyS2 (Rx & Tx only) - IRDA (optional) */
-+	at91_register_uart(AT91RM9200_ID_US1, 2, 0);
-+	
-+	/* USART3 on ttyS3 (Rx, Tx, CTS, RTS) - RS485 (optional) */
-+	at91_register_uart(AT91RM9200_ID_US3, 3, ATMEL_UART_CTS | ATMEL_UART_RTS);
-+
-+	/* set serial console to ttyS0 (ie, DBGU) */
-+	at91_set_serial_console(0);
- }
- 
- static void __init kb9202_init_irq(void)
-@@ -111,6 +114,48 @@ static struct at91_nand_data __initdata 
- 	.partition_info	= nand_partitions,
- };
- 
-+
-+#if defined(CONFIG_FB_S1D15605)
-+#warning "The Reset pin must be passed via platform_data, not this way"
-+static struct resource kb9202_lcd_resources[] = {
-+	[0] = {
-+		.start	= AT91_CHIPSELECT_2,
-+		.end	= AT91_CHIPSELECT_2 + 0x200FF,
-+		.flags	= IORESOURCE_MEM
-+	},
-+	[1] = {	/* reset pin */
-+		.start	= AT91_PIN_PC22,
-+		.end	= AT91_PIN_PC22,
-+		.flags	= IORESOURCE_MEM
-+	},
-+};
-+
-+static struct platform_device kb9202_lcd_device = {
-+	.name		= "s1d15605fb",
-+	.id		= 0,
-+	.num_resources	= ARRAY_SIZE(kb9202_lcd_resources),
-+	.resource	= kb9202_lcd_resources,
-+};
-+
-+static void __init kb9202_add_device_lcd(void)
-+{
-+ 	/* In case the boot loader did not set the chip select mode and timing */
-+	at91_sys_write(AT91_SMC_CSR(2),
-+		AT91_SMC_WSEN | AT91_SMC_NWS_(18) | AT91_SMC_TDF_(1) | AT91_SMC_DBW_8 |
-+		AT91_SMC_RWSETUP_(1) | AT91_SMC_RWHOLD_(1));
-+
-+	/* Backlight pin = output, off */
-+	at91_set_gpio_output(AT91_PIN_PC23, 0);
-+
-+	/* Reset pin = output, in reset */
-+	at91_set_gpio_output(AT91_PIN_PC22, 0);
-+
-+	platform_device_register(&kb9202_lcd_device);
-+}
-+#else
-+static void __init kb9202_add_device_lcd(void) {}
-+#endif
-+
- static void __init kb9202_board_init(void)
- {
- 	/* Serial */
-@@ -129,6 +174,8 @@ static void __init kb9202_board_init(voi
- 	at91_add_device_spi(NULL, 0);
- 	/* NAND */
- 	at91_add_device_nand(&kb9202_nand_data);
-+	/* LCD */
-+	kb9202_add_device_lcd();
- }
- 
- MACHINE_START(KB9200, "KB920x")
---- /dev/null
-+++ b/arch/arm/mach-at91/board-qil-a9260.c
-@@ -0,0 +1,255 @@
-+/*
-+ * linux/arch/arm/mach-at91/board-qil-a9260.c
-+ *
-+ *  Copyright (C) 2005 SAN People
-+ *  Copyright (C) 2006 Atmel
-+ *  Copyright (C) 2007 Calao-systems
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#include <linux/types.h>
-+#include <linux/init.h>
-+#include <linux/mm.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/spi/spi.h>
-+#include <linux/gpio_keys.h>
-+#include <linux/input.h>
-+#include <linux/clk.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/setup.h>
-+#include <asm/mach-types.h>
-+#include <asm/irq.h>
-+
-+#include <asm/mach/arch.h>
-+#include <asm/mach/map.h>
-+#include <asm/mach/irq.h>
-+
-+#include <asm/arch/board.h>
-+#include <asm/arch/gpio.h>
-+#include <asm/arch/at91_shdwc.h>
-+
-+#include "generic.h"
-+
-+
-+static void __init ek_map_io(void)
-+{
-+	/* Initialize processor: 12.000 MHz crystal */
-+	at91sam9260_initialize(12000000);
-+
-+	/* DGBU on ttyS0. (Rx & Tx only) */
-+	at91_register_uart(0, 0, 0);
-+
-+	/* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */
-+	at91_register_uart(AT91SAM9260_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS
-+			   | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD
-+			   | ATMEL_UART_RI);
-+
-+	/* USART1 on ttyS2. (Rx, Tx, CTS, RTS) */
-+	at91_register_uart(AT91SAM9260_ID_US1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS);
-+
-+	/* USART2 on ttyS3. (Rx, Tx, CTS, RTS) */
-+	at91_register_uart(AT91SAM9260_ID_US2, 3, ATMEL_UART_CTS | ATMEL_UART_RTS);
-+
-+	/* set serial console to ttyS1 (ie, USART0) */
-+	at91_set_serial_console(1);
-+
-+}
-+
-+static void __init ek_init_irq(void)
-+{
-+	at91sam9260_init_interrupts(NULL);
-+}
-+
-+
-+/*
-+ * USB Host port
-+ */
-+static struct at91_usbh_data __initdata ek_usbh_data = {
-+	.ports		= 2,
-+};
-+
-+/*
-+ * USB Device port
-+ */
-+static struct at91_udc_data __initdata ek_udc_data = {
-+	.vbus_pin	= AT91_PIN_PC5,
-+	.pullup_pin	= 0,		/* pull-up driven by UDC */
-+};
-+
-+/*
-+ * SPI devices.
-+ */
-+static struct spi_board_info ek_spi_devices[] = {
-+#if defined(CONFIG_RTC_DRV_M41T94)
-+	{	/* M41T94 RTC */
-+		.modalias	= "m41t94",
-+		.chip_select	= 0,
-+		.max_speed_hz	= 1 * 1000 * 1000,
-+		.bus_num	= 0,
-+	}
-+#endif
-+};
-+
-+/*
-+ * MACB Ethernet device
-+ */
-+static struct at91_eth_data __initdata ek_macb_data = {
-+	.phy_irq_pin	= AT91_PIN_PA31,
-+	.is_rmii	= 1,
-+};
-+
-+/*
-+ * NAND flash
-+ */
-+static struct mtd_partition __initdata ek_nand_partition[] = {
-+	{
-+		.name	= "Uboot & Kernel",
-+		.offset	= 0x00000000,
-+		.size	= 16 * 1024 * 1024,
-+	},
-+	{
-+		.name	= "Root FS",
-+		.offset	= 0x01000000,
-+		.size	= 120 * 1024 * 1024,
-+	},
-+	{
-+		.name	= "FS",
-+		.offset	= 0x08800000,
-+		.size	= 120 * 1024 * 1024,
-+	},
-+};
-+
-+static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-+{
-+	*num_partitions = ARRAY_SIZE(ek_nand_partition);
-+	return ek_nand_partition;
-+}
-+
-+static struct at91_nand_data __initdata ek_nand_data = {
-+	.ale		= 21,
-+	.cle		= 22,
-+//	.det_pin	= ... not connected
-+	.rdy_pin	= AT91_PIN_PC13,
-+	.enable_pin	= AT91_PIN_PC14,
-+	.partition_info	= nand_partitions,
-+#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)
-+	.bus_width_16	= 1,
-+#else
-+	.bus_width_16	= 0,
-+#endif
-+};
-+
-+/*
-+ * MCI (SD/MMC)
-+ */
-+static struct at91_mmc_data __initdata ek_mmc_data = {
-+	.slot_b		= 0,
-+	.wire4		= 1,
-+//	.det_pin	= ... not connected
-+//	.wp_pin		= ... not connected
-+//	.vcc_pin	= ... not connected
-+};
-+
-+/*
-+ * GPIO Buttons
-+ */
-+#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
-+static struct gpio_keys_button ek_buttons[] = {
-+	{	/* USER PUSH BUTTON */
-+		.code		= KEY_ENTER,
-+		.gpio		= AT91_PIN_PB10,
-+		.active_low	= 1,
-+		.desc		= "user_pb",
-+		.wakeup		= 1,
-+	}
-+};
-+
-+static struct gpio_keys_platform_data ek_button_data = {
-+	.buttons	= ek_buttons,
-+	.nbuttons	= ARRAY_SIZE(ek_buttons),
-+};
-+
-+static struct platform_device ek_button_device = {
-+	.name		= "gpio-keys",
-+	.id		= -1,
-+	.num_resources	= 0,
-+	.dev		= {
-+		.platform_data	= &ek_button_data,
-+	}
-+};
-+
-+static void __init ek_add_device_buttons(void)
-+{
-+	at91_set_GPIO_periph(AT91_PIN_PB10, 1);	/* user push button, pull up enabled */
-+	at91_set_deglitch(AT91_PIN_PB10, 1);
-+
-+	platform_device_register(&ek_button_device);
-+}
-+#else
-+static void __init ek_add_device_buttons(void) {}
-+#endif
-+
-+/*
-+ * LEDs
-+ */
-+static struct gpio_led ek_leds[] = {
-+	{	/* user_led (green) */
-+		.name			= "user_led",
-+		.gpio			= AT91_PIN_PB21,
-+		.active_low		= 0,
-+		.default_trigger	= "heartbeat",
-+	}
-+};
-+
-+static void __init ek_board_init(void)
-+{
-+	/* Serial */
-+	at91_add_device_serial();
-+	/* USB Host */
-+	at91_add_device_usbh(&ek_usbh_data);
-+	/* USB Device */
-+	at91_add_device_udc(&ek_udc_data);
-+	/* SPI */
-+	at91_add_device_spi(ek_spi_devices, ARRAY_SIZE(ek_spi_devices));
-+	/* NAND */
-+	at91_add_device_nand(&ek_nand_data);
-+	/* I2C */
-+	at91_add_device_i2c(NULL, 0);
-+	/* Ethernet */
-+	at91_add_device_eth(&ek_macb_data);
-+	/* MMC */
-+	at91_add_device_mmc(0, &ek_mmc_data);
-+	/* Push Buttons */
-+	ek_add_device_buttons();
-+	/* LEDs */
-+	at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds));
-+	/* shutdown controller, wakeup button (5 msec low) */
-+	at91_sys_write(AT91_SHDW_MR, AT91_SHDW_CPTWK0_(10) | AT91_SHDW_WKMODE0_LOW
-+				| AT91_SHDW_RTTWKEN);
-+}
-+
-+MACHINE_START(QIL_A9260, "CALAO QIL_A9260")
-+	/* Maintainer: calao-systems */
-+	.phys_io	= AT91_BASE_SYS,
-+	.io_pg_offst	= (AT91_VA_BASE_SYS >> 18) & 0xfffc,
-+	.boot_params	= AT91_SDRAM_BASE + 0x100,
-+	.timer		= &at91sam926x_timer,
-+	.map_io		= ek_map_io,
-+	.init_irq	= ek_init_irq,
-+	.init_machine	= ek_board_init,
-+MACHINE_END
---- /dev/null
-+++ b/arch/arm/mach-at91/board-sam9-l9260.c
-@@ -0,0 +1,199 @@
-+/*
-+ * linux/arch/arm/mach-at91/board-sam9-l9260.c
-+ *
-+ *  Copyright (C) 2005 SAN People
-+ *  Copyright (C) 2006 Atmel
-+ *  Copyright (C) 2007 Olimex Ltd
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#include <linux/types.h>
-+#include <linux/init.h>
-+#include <linux/mm.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/spi/spi.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/setup.h>
-+#include <asm/mach-types.h>
-+#include <asm/irq.h>
-+
-+#include <asm/mach/arch.h>
-+#include <asm/mach/map.h>
-+#include <asm/mach/irq.h>
-+
-+#include <asm/arch/board.h>
-+#include <asm/arch/gpio.h>
-+
-+#include "generic.h"
-+
-+
-+static void __init ek_map_io(void)
-+{
-+	/* Initialize processor: 18.432 MHz crystal */
-+	at91sam9260_initialize(18432000);
-+
-+	/* Setup the LEDs */
-+	at91_init_leds(AT91_PIN_PA9, AT91_PIN_PA6);
-+
-+	/* DBGU on ttyS0. (Rx & Tx only) */
-+	at91_register_uart(0, 0, 0);
-+
-+	/* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */
-+	at91_register_uart(AT91SAM9260_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS
-+			   | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD
-+			   | ATMEL_UART_RI);
-+
-+	/* USART1 on ttyS2. (Rx, Tx, CTS, RTS) */
-+	at91_register_uart(AT91SAM9260_ID_US1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS);
-+
-+	/* set serial console to ttyS0 (ie, DBGU) */
-+	at91_set_serial_console(0);
-+}
-+
-+static void __init ek_init_irq(void)
-+{
-+	at91sam9260_init_interrupts(NULL);
-+}
-+
-+
-+/*
-+ * USB Host port
-+ */
-+static struct at91_usbh_data __initdata ek_usbh_data = {
-+	.ports		= 2,
-+};
-+
-+/*
-+ * USB Device port
-+ */
-+static struct at91_udc_data __initdata ek_udc_data = {
-+	.vbus_pin	= AT91_PIN_PC5,
-+	.pullup_pin	= 0,		/* pull-up driven by UDC */
-+};
-+
-+
-+/*
-+ * SPI devices.
-+ */
-+static struct spi_board_info ek_spi_devices[] = {
-+#if !defined(CONFIG_MMC_AT91)
-+	{	/* DataFlash chip */
-+		.modalias	= "mtd_dataflash",
-+		.chip_select	= 1,
-+		.max_speed_hz	= 15 * 1000 * 1000,
-+		.bus_num	= 0,
-+	},
-+#if defined(CONFIG_MTD_AT91_DATAFLASH_CARD)
-+	{	/* DataFlash card */
-+		.modalias	= "mtd_dataflash",
-+		.chip_select	= 0,
-+		.max_speed_hz	= 15 * 1000 * 1000,
-+		.bus_num	= 0,
-+	},
-+#endif
-+#endif
-+};
-+
-+
-+/*
-+ * MACB Ethernet device
-+ */
-+static struct at91_eth_data __initdata ek_macb_data = {
-+	.phy_irq_pin	= AT91_PIN_PA7,
-+	.is_rmii	= 0,
-+};
-+
-+
-+/*
-+ * NAND flash
-+ */
-+static struct mtd_partition __initdata ek_nand_partition[] = {
-+	{
-+		.name	= "Bootloader Area",
-+		.offset	= 0,
-+		.size	= 10 * 1024 * 1024,
-+	},
-+	{
-+		.name	= "User Area",
-+		.offset	= 10 * 1024 * 1024,
-+		.size	= MTDPART_SIZ_FULL,
-+	},
-+};
-+
-+static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-+{
-+	*num_partitions = ARRAY_SIZE(ek_nand_partition);
-+	return ek_nand_partition;
-+}
-+
-+static struct at91_nand_data __initdata ek_nand_data = {
-+	.ale		= 21,
-+	.cle		= 22,
-+//	.det_pin	= ... not connected
-+	.rdy_pin	= AT91_PIN_PC13,
-+	.enable_pin	= AT91_PIN_PC14,
-+	.partition_info	= nand_partitions,
-+#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)
-+	.bus_width_16	= 1,
-+#else
-+	.bus_width_16	= 0,
-+#endif
-+};
-+
-+
-+/*
-+ * MCI (SD/MMC)
-+ */
-+static struct at91_mmc_data __initdata ek_mmc_data = {
-+	.slot_b		= 1,
-+	.wire4		= 1,
-+	.det_pin	= AT91_PIN_PC8,
-+	.wp_pin		= AT91_PIN_PC4,
-+//	.vcc_pin	= ... not connected
-+};
-+
-+static void __init ek_board_init(void)
-+{
-+	/* Serial */
-+	at91_add_device_serial();
-+	/* USB Host */
-+	at91_add_device_usbh(&ek_usbh_data);
-+	/* USB Device */
-+	at91_add_device_udc(&ek_udc_data);
-+	/* SPI */
-+	at91_add_device_spi(ek_spi_devices, ARRAY_SIZE(ek_spi_devices));
-+	/* NAND */
-+	at91_add_device_nand(&ek_nand_data);
-+	/* Ethernet */
-+	at91_add_device_eth(&ek_macb_data);
-+	/* MMC */
-+	at91_add_device_mmc(0, &ek_mmc_data);
-+	/* I2C */
-+	at91_add_device_i2c(NULL, 0);
-+}
-+
-+MACHINE_START(SAM9_L9260, "Olimex SAM9-L9260")
-+	/* Maintainer: Olimex */
-+	.phys_io	= AT91_BASE_SYS,
-+	.io_pg_offst	= (AT91_VA_BASE_SYS >> 18) & 0xfffc,
-+	.boot_params	= AT91_SDRAM_BASE + 0x100,
-+	.timer		= &at91sam926x_timer,
-+	.map_io		= ek_map_io,
-+	.init_irq	= ek_init_irq,
-+	.init_machine	= ek_board_init,
-+MACHINE_END
---- a/arch/arm/mach-at91/board-sam9260ek.c
-+++ b/arch/arm/mach-at91/board-sam9260ek.c
-@@ -25,6 +25,10 @@
- #include <linux/module.h>
- #include <linux/platform_device.h>
- #include <linux/spi/spi.h>
-+#include <linux/spi/at73c213.h>
-+#include <linux/clk.h>
-+#include <linux/gpio_keys.h>
-+#include <linux/input.h>
- 
- #include <asm/hardware.h>
- #include <asm/setup.h>
-@@ -37,29 +41,29 @@
- 
- #include <asm/arch/board.h>
- #include <asm/arch/gpio.h>
--#include <asm/arch/at91sam926x_mc.h>
-+#include <asm/arch/at91_shdwc.h>
- 
- #include "generic.h"
- 
- 
--/*
-- * Serial port configuration.
-- *    0 .. 5 = USART0 .. USART5
-- *    6      = DBGU
-- */
--static struct at91_uart_config __initdata ek_uart_config = {
--	.console_tty	= 0,				/* ttyS0 */
--	.nr_tty		= 3,
--	.tty_map	= { 6, 0, 1, -1, -1, -1, -1 }	/* ttyS0, ..., ttyS6 */
--};
--
- static void __init ek_map_io(void)
- {
- 	/* Initialize processor: 18.432 MHz crystal */
- 	at91sam9260_initialize(18432000);
- 
--	/* Setup the serial ports and console */
--	at91_init_serial(&ek_uart_config);
-+	/* DGBU on ttyS0. (Rx & Tx only) */
-+	at91_register_uart(0, 0, 0);
-+
-+	/* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */
-+	at91_register_uart(AT91SAM9260_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS
-+			   | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD
-+			   | ATMEL_UART_RI);
-+
-+	/* USART1 on ttyS2. (Rx, Tx, RTS, CTS) */
-+	at91_register_uart(AT91SAM9260_ID_US1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS);
-+
-+	/* set serial console to ttyS0 (ie, DBGU) */
-+	at91_set_serial_console(0);
- }
- 
- static void __init ek_init_irq(void)
-@@ -85,6 +89,35 @@ static struct at91_udc_data __initdata e
- 
- 
- /*
-+ * Audio
-+ */
-+static struct at73c213_board_info at73c213_data = {
-+	.ssc_id		= 0,
-+	.shortname	= "AT91SAM9260-EK external DAC",
-+};
-+
-+#if defined(CONFIG_SND_AT73C213) || defined(CONFIG_SND_AT73C213_MODULE)
-+static void __init at73c213_set_clk(struct at73c213_board_info *info)
-+{
-+	struct clk *pck0;
-+	struct clk *plla;
-+
-+	pck0 = clk_get(NULL, "pck0");
-+	plla = clk_get(NULL, "plla");
-+
-+	/* AT73C213 MCK Clock */
-+	at91_set_B_periph(AT91_PIN_PC1, 0);	/* PCK0 */
-+
-+	clk_set_parent(pck0, plla);
-+	clk_put(plla);
-+
-+	info->dac_clk = pck0;
-+}
-+#else
-+static void __init at73c213_set_clk(struct at73c213_board_info *info) {}
-+#endif
-+
-+/*
-  * SPI devices.
-  */
- static struct spi_board_info ek_spi_devices[] = {
-@@ -110,6 +143,8 @@ static struct spi_board_info ek_spi_devi
- 		.chip_select	= 0,
- 		.max_speed_hz	= 10 * 1000 * 1000,
- 		.bus_num	= 1,
-+		.mode		= SPI_MODE_1,
-+		.platform_data	= &at73c213_data,
- 	},
- #endif
- };
-@@ -172,6 +207,74 @@ static struct at91_mmc_data __initdata e
- //	.vcc_pin	= ... not connected
- };
- 
-+
-+/*
-+ * LEDs
-+ */
-+static struct gpio_led ek_leds[] = {
-+	{	/* "bottom" led, green, userled1 to be defined */
-+		.name			= "ds5",
-+		.gpio			= AT91_PIN_PA6,
-+		.active_low		= 1,
-+		.default_trigger	= "none",
-+	},
-+	{	/* "power" led, yellow */
-+		.name			= "ds1",
-+		.gpio			= AT91_PIN_PA9,
-+		.default_trigger	= "heartbeat",
-+	}
-+};
-+
-+
-+/*
-+ * GPIO Buttons
-+ */
-+#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
-+static struct gpio_keys_button ek_buttons[] = {
-+	{
-+		.gpio		= AT91_PIN_PA30,
-+		.code		= BTN_3,
-+		.desc		= "Button 3",
-+		.active_low	= 1,
-+		.wakeup		= 1,
-+	},
-+	{
-+		.gpio		= AT91_PIN_PA31,
-+		.code		= BTN_4,
-+		.desc		= "Button 4",
-+		.active_low	= 1,
-+		.wakeup		= 1,
-+	}
-+};
-+
-+static struct gpio_keys_platform_data ek_button_data = {
-+	.buttons	= ek_buttons,
-+	.nbuttons	= ARRAY_SIZE(ek_buttons),
-+};
-+
-+static struct platform_device ek_button_device = {
-+	.name		= "gpio-keys",
-+	.id		= -1,
-+	.num_resources	= 0,
-+	.dev		= {
-+		.platform_data	= &ek_button_data,
-+	}
-+};
-+
-+static void __init ek_add_device_buttons(void)
-+{
-+	at91_set_gpio_input(AT91_PIN_PA30, 1);	/* btn3 */
-+	at91_set_deglitch(AT91_PIN_PA30, 1);
-+	at91_set_gpio_input(AT91_PIN_PA31, 1);	/* btn4 */
-+	at91_set_deglitch(AT91_PIN_PA31, 1);
-+
-+	platform_device_register(&ek_button_device);
-+}
-+#else
-+static void __init ek_add_device_buttons(void) {}
-+#endif
-+
-+
- static void __init ek_board_init(void)
- {
- 	/* Serial */
-@@ -190,6 +293,16 @@ static void __init ek_board_init(void)
- 	at91_add_device_mmc(0, &ek_mmc_data);
- 	/* I2C */
- 	at91_add_device_i2c(NULL, 0);
-+	/* SSC (to AT73C213) */
-+	at73c213_set_clk(&at73c213_data);
-+	at91_add_device_ssc(AT91SAM9260_ID_SSC, ATMEL_SSC_TX);
-+	/* LEDs */
-+	at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds));
-+	/* Push Buttons */
-+	ek_add_device_buttons();
-+	/* shutdown controller, wakeup button (5 msec low) */
-+	at91_sys_write(AT91_SHDW_MR, AT91_SHDW_CPTWK0_(10) | AT91_SHDW_WKMODE0_LOW
-+				| AT91_SHDW_RTTWKEN);
- }
- 
- MACHINE_START(AT91SAM9260EK, "Atmel AT91SAM9260-EK")
---- a/arch/arm/mach-at91/board-sam9261ek.c
-+++ b/arch/arm/mach-at91/board-sam9261ek.c
-@@ -26,6 +26,8 @@
- #include <linux/platform_device.h>
- #include <linux/spi/spi.h>
- #include <linux/spi/ads7846.h>
-+#include <linux/spi/at73c213.h>
-+#include <linux/clk.h>
- #include <linux/dm9000.h>
- #include <linux/fb.h>
- #include <linux/gpio_keys.h>
-@@ -44,22 +46,12 @@
- 
- #include <asm/arch/board.h>
- #include <asm/arch/gpio.h>
--#include <asm/arch/at91sam926x_mc.h>
-+#include <asm/arch/at91sam9_smc.h>
-+#include <asm/arch/at91_shdwc.h>
- 
- #include "generic.h"
- 
- 
--/*
-- * Serial port configuration.
-- *    0 .. 2 = USART0 .. USART2
-- *    3      = DBGU
-- */
--static struct at91_uart_config __initdata ek_uart_config = {
--	.console_tty	= 0,				/* ttyS0 */
--	.nr_tty		= 1,
--	.tty_map	= { 3, -1, -1, -1 }		/* ttyS0, ..., ttyS3 */
--};
--
- static void __init ek_map_io(void)
- {
- 	/* Initialize processor: 18.432 MHz crystal */
-@@ -68,8 +60,11 @@ static void __init ek_map_io(void)
- 	/* Setup the LEDs */
- 	at91_init_leds(AT91_PIN_PA13, AT91_PIN_PA14);
- 
--	/* Setup the serial ports and console */
--	at91_init_serial(&ek_uart_config);
-+	/* DGBU on ttyS0. (Rx & Tx only) */
-+	at91_register_uart(0, 0, 0);
-+
-+	/* set serial console to ttyS0 (ie, DBGU) */
-+	at91_set_serial_console(0);
- }
- 
- static void __init ek_init_irq(void)
-@@ -239,6 +234,35 @@ static void __init ek_add_device_ts(void
- #endif
- 
- /*
-+ * Audio
-+ */
-+static struct at73c213_board_info at73c213_data = {
-+	.ssc_id		= 1,
-+	.shortname	= "AT91SAM9261-EK external DAC",
-+};
-+
-+#if defined(CONFIG_SND_AT73C213) || defined(CONFIG_SND_AT73C213_MODULE)
-+static void __init at73c213_set_clk(struct at73c213_board_info *info)
-+{
-+	struct clk *pck2;
-+	struct clk *plla;
-+
-+	pck2 = clk_get(NULL, "pck2");
-+	plla = clk_get(NULL, "plla");
-+
-+	/* AT73C213 MCK Clock */
-+	at91_set_B_periph(AT91_PIN_PB31, 0);	/* PCK2 */
-+
-+	clk_set_parent(pck2, plla);
-+	clk_put(plla);
-+
-+	info->dac_clk = pck2;
-+}
-+#else
-+static void __init at73c213_set_clk(struct at73c213_board_info *info) {}
-+#endif
-+
-+/*
-  * SPI devices
-  */
- static struct spi_board_info ek_spi_devices[] = {
-@@ -252,10 +276,11 @@ static struct spi_board_info ek_spi_devi
- 	{
- 		.modalias	= "ads7846",
- 		.chip_select	= 2,
--		.max_speed_hz	= 125000 * 26,	/* (max sample rate @ 3V) * (cmd + data + overhead) */
-+		.max_speed_hz	= 125000 * 16,	/* max sample rate * clocks per sample */
- 		.bus_num	= 0,
- 		.platform_data	= &ads_info,
- 		.irq		= AT91SAM9261_ID_IRQ0,
-+		.controller_data = (void *) AT91_PIN_PA28,	/* CS pin */
- 	},
- #endif
- #if defined(CONFIG_MTD_AT91_DATAFLASH_CARD)
-@@ -271,6 +296,9 @@ static struct spi_board_info ek_spi_devi
- 		.chip_select	= 3,
- 		.max_speed_hz	= 10 * 1000 * 1000,
- 		.bus_num	= 0,
-+		.mode		= SPI_MODE_1,
-+		.platform_data	= &at73c213_data,
-+		.controller_data = (void*) AT91_PIN_PA29,	/* default for CS3 is PA6, but it must be PA29 */
- 	},
- #endif
- };
-@@ -408,24 +436,28 @@ static struct gpio_keys_button ek_button
- 		.code		= BTN_0,
- 		.desc		= "Button 0",
- 		.active_low	= 1,
-+		.wakeup		= 1,
- 	},
- 	{
- 		.gpio		= AT91_PIN_PA26,
- 		.code		= BTN_1,
- 		.desc		= "Button 1",
- 		.active_low	= 1,
-+		.wakeup		= 1,
- 	},
- 	{
- 		.gpio		= AT91_PIN_PA25,
- 		.code		= BTN_2,
- 		.desc		= "Button 2",
- 		.active_low	= 1,
-+		.wakeup		= 1,
- 	},
- 	{
- 		.gpio		= AT91_PIN_PA24,
- 		.code		= BTN_3,
- 		.desc		= "Button 3",
- 		.active_low	= 1,
-+		.wakeup		= 1,
- 	}
- };
- 
-@@ -445,13 +477,13 @@ static struct platform_device ek_button_
- 
- static void __init ek_add_device_buttons(void)
- {
--	at91_set_gpio_input(AT91_PIN_PA27, 0);	/* btn0 */
-+	at91_set_gpio_input(AT91_PIN_PA27, 1);	/* btn0 */
- 	at91_set_deglitch(AT91_PIN_PA27, 1);
--	at91_set_gpio_input(AT91_PIN_PA26, 0);	/* btn1 */
-+	at91_set_gpio_input(AT91_PIN_PA26, 1);	/* btn1 */
- 	at91_set_deglitch(AT91_PIN_PA26, 1);
--	at91_set_gpio_input(AT91_PIN_PA25, 0);	/* btn2 */
-+	at91_set_gpio_input(AT91_PIN_PA25, 1);	/* btn2 */
- 	at91_set_deglitch(AT91_PIN_PA25, 1);
--	at91_set_gpio_input(AT91_PIN_PA24, 0);	/* btn3 */
-+	at91_set_gpio_input(AT91_PIN_PA24, 1);	/* btn3 */
- 	at91_set_deglitch(AT91_PIN_PA24, 1);
- 
- 	platform_device_register(&ek_button_device);
-@@ -460,6 +492,29 @@ static void __init ek_add_device_buttons
- static void __init ek_add_device_buttons(void) {}
- #endif
- 
-+/*
-+ * LEDs
-+ */
-+static struct gpio_led ek_leds[] = {
-+	{	/* "bottom" led, green, userled1 to be defined */
-+		.name			= "ds7",
-+		.gpio			= AT91_PIN_PA14,
-+		.active_low		= 1,
-+		.default_trigger	= "none",
-+	},
-+	{	/* "top" led, green, userled2 to be defined */
-+		.name			= "ds8",
-+		.gpio			= AT91_PIN_PA13,
-+		.active_low		= 1,
-+		.default_trigger	= "none",
-+	},
-+	{	/* "power" led, yellow */
-+		.name			= "ds1",
-+		.gpio			= AT91_PIN_PA23,
-+		.default_trigger	= "heartbeat",
-+	}
-+};
-+
- static void __init ek_board_init(void)
- {
- 	/* Serial */
-@@ -481,6 +536,9 @@ static void __init ek_board_init(void)
- 	at91_add_device_spi(ek_spi_devices, ARRAY_SIZE(ek_spi_devices));
- 	/* Touchscreen */
- 	ek_add_device_ts();
-+	/* SSC (to AT73C213) */
-+	at73c213_set_clk(&at73c213_data);
-+	at91_add_device_ssc(AT91SAM9261_ID_SSC1, ATMEL_SSC_TX);
- #else
- 	/* MMC */
- 	at91_add_device_mmc(0, &ek_mmc_data);
-@@ -489,6 +547,11 @@ static void __init ek_board_init(void)
- 	at91_add_device_lcdc(&ek_lcdc_data);
- 	/* Push Buttons */
- 	ek_add_device_buttons();
-+	/* LEDs */
-+	at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds));
-+	/* shutdown controller, wakeup button (5 msec low) */
-+	at91_sys_write(AT91_SHDW_MR, AT91_SHDW_CPTWK0_(10) | AT91_SHDW_WKMODE0_LOW
-+				| AT91_SHDW_RTTWKEN);
- }
- 
- MACHINE_START(AT91SAM9261EK, "Atmel AT91SAM9261-EK")
---- a/arch/arm/mach-at91/board-sam9263ek.c
-+++ b/arch/arm/mach-at91/board-sam9263ek.c
-@@ -43,29 +43,24 @@
- 
- #include <asm/arch/board.h>
- #include <asm/arch/gpio.h>
--#include <asm/arch/at91sam926x_mc.h>
-+#include <asm/arch/at91_shdwc.h>
- 
- #include "generic.h"
- 
- 
--/*
-- * Serial port configuration.
-- *    0 .. 2 = USART0 .. USART2
-- *    3      = DBGU
-- */
--static struct at91_uart_config __initdata ek_uart_config = {
--	.console_tty	= 0,				/* ttyS0 */
--	.nr_tty		= 2,
--	.tty_map	= { 3, 0, -1, -1, }		/* ttyS0, ..., ttyS3 */
--};
--
- static void __init ek_map_io(void)
- {
- 	/* Initialize processor: 16.367 MHz crystal */
- 	at91sam9263_initialize(16367660);
- 
--	/* Setup the serial ports and console */
--	at91_init_serial(&ek_uart_config);
-+	/* DGBU on ttyS0. (Rx & Tx only) */
-+	at91_register_uart(0, 0, 0);
-+
-+	/* USART0 on ttyS1. (Rx, Tx, RTS, CTS) */
-+	at91_register_uart(AT91SAM9263_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS);
-+
-+	/* set serial console to ttyS0 (ie, DBGU) */
-+	at91_set_serial_console(0);
- }
- 
- static void __init ek_init_irq(void)
-@@ -141,7 +136,7 @@ static struct spi_board_info ek_spi_devi
- 	{
- 		.modalias	= "ads7846",
- 		.chip_select	= 3,
--		.max_speed_hz	= 125000 * 26,	/* (max sample rate @ 3V) * (cmd + data + overhead) */
-+		.max_speed_hz	= 125000 * 16,	/* max sample rate * clocks per sample */
- 		.bus_num	= 0,
- 		.platform_data	= &ads_info,
- 		.irq		= AT91SAM9263_ID_IRQ1,
-@@ -301,9 +296,9 @@ static struct platform_device ek_button_
- 
- static void __init ek_add_device_buttons(void)
- {
--	at91_set_GPIO_periph(AT91_PIN_PC5, 0);	/* left button */
-+	at91_set_GPIO_periph(AT91_PIN_PC5, 1);	/* left button */
- 	at91_set_deglitch(AT91_PIN_PC5, 1);
--	at91_set_GPIO_periph(AT91_PIN_PC4, 0);	/* right button */
-+	at91_set_GPIO_periph(AT91_PIN_PC4, 1);	/* right button */
- 	at91_set_deglitch(AT91_PIN_PC4, 1);
- 
- 	platform_device_register(&ek_button_device);
-@@ -341,7 +336,7 @@ static struct gpio_led ek_leds[] = {
- 		.name			= "ds3",
- 		.gpio			= AT91_PIN_PB7,
- 		.default_trigger	= "heartbeat",
--	},
-+	}
- };
- 
- 
-@@ -374,6 +369,9 @@ static void __init ek_board_init(void)
- 	at91_add_device_ac97(&ek_ac97_data);
- 	/* LEDs */
- 	at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds));
-+	/* shutdown controller, wakeup button (5 msec low) */
-+	at91_sys_write(AT91_SHDW_MR, AT91_SHDW_CPTWK0_(10) | AT91_SHDW_WKMODE0_LOW
-+				| AT91_SHDW_RTTWKEN);
- }
- 
- MACHINE_START(AT91SAM9263EK, "Atmel AT91SAM9263-EK")
---- a/arch/arm/mach-at91/board-sam9rlek.c
-+++ b/arch/arm/mach-at91/board-sam9rlek.c
-@@ -29,29 +29,24 @@
- 
- #include <asm/arch/board.h>
- #include <asm/arch/gpio.h>
--#include <asm/arch/at91sam926x_mc.h>
-+#include <asm/arch/at91_shdwc.h>
- 
- #include "generic.h"
- 
- 
--/*
-- * Serial port configuration.
-- *    0 .. 3 = USART0 .. USART3
-- *    4      = DBGU
-- */
--static struct at91_uart_config __initdata ek_uart_config = {
--	.console_tty	= 0,				/* ttyS0 */
--	.nr_tty		= 2,
--	.tty_map	= { 4, 0, -1, -1, -1 }		/* ttyS0, ..., ttyS4 */
--};
--
- static void __init ek_map_io(void)
- {
- 	/* Initialize processor: 12.000 MHz crystal */
- 	at91sam9rl_initialize(12000000);
- 
--	/* Setup the serial ports and console */
--	at91_init_serial(&ek_uart_config);
-+	/* DGBU on ttyS0. (Rx & Tx only) */
-+	at91_register_uart(0, 0, 0);
-+
-+	/* USART0 on ttyS1. (Rx, Tx, CTS, RTS) */
-+	at91_register_uart(AT91SAM9RL_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS);
-+
-+	/* set serial console to ttyS0 (ie, DBGU) */
-+	at91_set_serial_console(0);
- }
- 
- static void __init ek_init_irq(void)
-@@ -61,6 +56,14 @@ static void __init ek_init_irq(void)
- 
- 
- /*
-+ * USB HS Device port
-+ */
-+static struct usba_platform_data __initdata ek_usba_udc_data = {
-+	.vbus_pin	= AT91_PIN_PA8,
-+};
-+
-+
-+/*
-  * MCI (SD/MMC)
-  */
- static struct at91_mmc_data __initdata ek_mmc_data = {
-@@ -180,6 +183,8 @@ static void __init ek_board_init(void)
- {
- 	/* Serial */
- 	at91_add_device_serial();
-+	/* USB HS */
-+	at91_add_device_usba(&ek_usba_udc_data);
- 	/* I2C */
- 	at91_add_device_i2c(NULL, 0);
- 	/* NAND */
-@@ -190,6 +195,9 @@ static void __init ek_board_init(void)
- 	at91_add_device_mmc(0, &ek_mmc_data);
- 	/* LCD Controller */
- 	at91_add_device_lcdc(&ek_lcdc_data);
-+	/* shutdown controller, wakeup button (5 msec low) */
-+	at91_sys_write(AT91_SHDW_MR, AT91_SHDW_CPTWK0_(10) | AT91_SHDW_WKMODE0_LOW
-+				| AT91_SHDW_RTTWKEN);
- }
- 
- MACHINE_START(AT91SAM9RLEK, "Atmel AT91SAM9RL-EK")
---- /dev/null
-+++ b/arch/arm/mach-at91/board-tms.c
-@@ -0,0 +1,198 @@
-+/*
-+* linux/arch/arm/mach-at91/board-tms.c
-+*
-+*  Copyright (C) 2005 SAN People
-+*
-+*  Adapted from board-dk to sweda TMS-100 by Luiz de Barros <lboneto@gmail.com>
-+*
-+* 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.
-+*
-+* This program is distributed in the hope that it will be useful,
-+* but WITHOUT ANY WARRANTY; without even the implied warranty of
-+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+* GNU General Public License for more details.
-+*
-+* You should have received a copy of the GNU General Public License
-+* along with this program; if not, write to the Free Software
-+* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+*/
-+
-+#include <linux/types.h>
-+#include <linux/init.h>
-+#include <linux/mm.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/spi/spi.h>
-+#include <linux/mtd/physmap.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/setup.h>
-+#include <asm/mach-types.h>
-+#include <asm/irq.h>
-+
-+#include <asm/mach/arch.h>
-+#include <asm/mach/map.h>
-+#include <asm/mach/irq.h>
-+
-+#include <asm/arch/board.h>
-+#include <asm/arch/gpio.h>
-+#include <asm/arch/at91rm9200_mc.h>
-+
-+#include "generic.h"
-+#include <linux/serial_8250.h>
-+
-+
-+#define SERIAL_FLAGS	(UPF_BOOT_AUTOCONF | UPF_IOREMAP| UPF_SHARE_IRQ)
-+#define SERIAL_CLK	(1843200)
-+
-+
-+/*---------------------------------------------------------------------
-+ * External UART
-+ */
-+
-+#define PORT(_base, _irq)				\
-+	{						\
-+		.mapbase	= _base,		\
-+		.irq		= _irq,			\
-+		.uartclk	= SERIAL_CLK,		\
-+		.iotype		= UPIO_MEM,		\
-+		.regshift	= 0,			\
-+		.flags		= SERIAL_FLAGS,		\
-+	}
-+
-+static struct plat_serial8250_port tms_data[] = {
-+	PORT(0x70000000, AT91_PIN_PC3),
-+	PORT(0x80000000, AT91_PIN_PC5),
-+	{ },
-+};
-+
-+static struct platform_device tms_device = {
-+	.name			= "serial8250",
-+	.id			= PLAT8250_DEV_PLATFORM,
-+	.dev			=
-+		{
-+			.platform_data	= &tms_data,
-+		},
-+};
-+
-+static void setup_external_uart(void)
-+{
-+	at91_sys_write(AT91_SMC_CSR(2),
-+				  AT91_SMC_ACSS_STD
-+				| AT91_SMC_DBW_8
-+				| AT91_SMC_BAT
-+				| AT91_SMC_WSEN
-+				| AT91_SMC_NWS_(32)	/* wait states */
-+				| AT91_SMC_RWSETUP_(6)	/* setup time */
-+				| AT91_SMC_RWHOLD_(4)	/* hold time */
-+
-+	);
-+	at91_sys_write(AT91_SMC_CSR(6),
-+				  AT91_SMC_ACSS_STD
-+				| AT91_SMC_DBW_8
-+				| AT91_SMC_BAT
-+				| AT91_SMC_WSEN
-+				| AT91_SMC_NWS_(32)	/* wait states */
-+				| AT91_SMC_RWSETUP_(6)	/* setup time */
-+				| AT91_SMC_RWHOLD_(4)	/* hold time */
-+
-+	);
-+	at91_sys_write(AT91_SMC_CSR(7),
-+				  AT91_SMC_ACSS_STD
-+				| AT91_SMC_DBW_8
-+				| AT91_SMC_BAT
-+				| AT91_SMC_WSEN
-+				| AT91_SMC_NWS_(32)	/* wait states */
-+				| AT91_SMC_RWSETUP_(6)	/* setup time */
-+				| AT91_SMC_RWHOLD_(4)	/* hold time */
-+	);
-+
-+	platform_device_register(&tms_device);
-+}
-+
-+
-+/*
-+ * Serial port configuration.
-+ *    0 .. 3 = USART0 .. USART3
-+ *    4      = DBGU
-+ */
-+static struct at91_uart_config __initdata tms_uart_config = {
-+	.console_tty	= 0,				/* ttyS0 */
-+	.nr_tty		= 5,
-+	.tty_map	= { 4, 0, 1, 2, 3 }		/* ttyS0, ..., ttyS4 */
-+};
-+
-+static void __init tms_map_io(void)
-+{
-+	/* Initialize processor: 18.432 MHz crystal */
-+	at91rm9200_initialize(18432000, AT91RM9200_BGA);
-+
-+	/* Setup the LEDs */
-+	at91_init_leds(AT91_PIN_PB2, AT91_PIN_PB2);
-+
-+	/* Setup the serial ports and console */
-+	at91_init_serial(&tms_uart_config);
-+}
-+
-+static void __init tms_init_irq(void)
-+{
-+	at91rm9200_init_interrupts(NULL);
-+}
-+
-+
-+static struct at91_eth_data __initdata tms_eth_data = {
-+	.phy_irq_pin	= AT91_PIN_PC4,
-+	.is_rmii	= 1,
-+};
-+
-+static struct at91_usbh_data __initdata tms_usbh_data = {
-+	.ports		= 2,
-+};
-+
-+static struct spi_board_info tms_spi_devices[] = {
-+	{	/* DataFlash chip */
-+		.modalias	= "mtd_dataflash",
-+		.chip_select	= 0,
-+		.max_speed_hz	= 15 * 1000 * 1000,
-+	},
-+	{	 /* DataFlash chip */
-+		.modalias	= "mtd_dataflash",
-+		.chip_select	= 1,
-+		.max_speed_hz	= 15 * 1000 * 1000,
-+	}
-+};
-+
-+static struct i2c_board_info __initdata tms_i2c_devices[] = {
-+	{
-+		I2C_BOARD_INFO("isl1208", 0x6f),
-+	}
-+};
-+
-+static void __init tms_board_init(void)
-+{
-+	/* Serial */
-+	at91_add_device_serial();
-+	/* Ethernet */
-+	at91_add_device_eth(&tms_eth_data);
-+	at91_add_device_usbh(&tms_usbh_data);
-+	/* I2C */
-+	at91_add_device_i2c(tms_i2c_devices, ARRAY_SIZE(tms_i2c_devices));
-+	/* SPI */
-+	at91_add_device_spi(tms_spi_devices, ARRAY_SIZE(tms_spi_devices));
-+	/* Two port external UART */
-+	setup_external_uart();
-+}
-+
-+MACHINE_START(SWEDATMS, "Sweda TMS-100 Board")
-+	/* Maintainer: Luiz de Barros */
-+	.phys_io	= AT91_BASE_SYS,
-+	.io_pg_offst	= (AT91_VA_BASE_SYS >> 18) & 0xfffc,
-+	.boot_params	= AT91_SDRAM_BASE + 0x100,
-+	.timer		= &at91rm9200_timer,
-+	.map_io		= tms_map_io,
-+	.init_irq	= tms_init_irq,
-+	.init_machine	= tms_board_init,
-+MACHINE_END
---- /dev/null
-+++ b/arch/arm/mach-at91/board-tt9200.c
-@@ -0,0 +1,192 @@
-+/*
-+ * linux/arch/arm/mach-at91rm9200/board-tt9200.c
-+ * Copyright (C) 2007 Toptechnology
-+ *
-+ * Based on board-ecbat91.c
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#include <linux/types.h>
-+#include <linux/init.h>
-+#include <linux/mm.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/spi/spi.h>
-+#include <linux/spi/flash.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/setup.h>
-+#include <asm/mach-types.h>
-+#include <asm/irq.h>
-+
-+#include <asm/mach/arch.h>
-+#include <asm/mach/map.h>
-+#include <asm/mach/irq.h>
-+
-+#include <asm/arch/board.h>
-+#include <asm/arch/gpio.h>
-+
-+#include "generic.h"
-+
-+
-+static void __init tt9200_map_io(void)
-+{
-+	/* Initialize processor: 18.432 MHz crystal */
-+	at91rm9200_initialize(18432000, AT91RM9200_PQFP);
-+
-+	/* Setup the LEDs */
-+	at91_init_leds(AT91_PIN_PB27, AT91_PIN_PB27);
-+
-+	/* DBGU on ttyS0. (Rx & Tx only) */
-+	at91_register_uart(0, 0, 0);
-+
-+	/* USART0 on ttyS1. (Rx & Tx only) */
-+	at91_register_uart(AT91RM9200_ID_US0, 1, 0);
-+
-+	/* USART1 on ttyS2. (Rx & Tx only) */
-+	at91_register_uart(AT91RM9200_ID_US1, 2, 0);
-+
-+	/* USART2 on ttyS3. (Rx & Tx only) */
-+	at91_register_uart(AT91RM9200_ID_US2, 3, 0);
-+
-+	/* USART3 on ttyS4. (Rx, Tx, CTS, RTS) */
-+	at91_register_uart(AT91RM9200_ID_US3, 4, ATMEL_UART_CTS | ATMEL_UART_RTS);
-+
-+	/* Console on ttyS0 (ie, DBGU) */
-+	at91_set_serial_console(0);
-+}
-+
-+static void __init tt9200_init_irq(void)
-+{
-+	at91rm9200_init_interrupts(NULL);
-+}
-+
-+static struct at91_eth_data __initdata tt9200_eth_data = {
-+	.phy_irq_pin	= AT91_PIN_PB29,
-+	.is_rmii	= 0,
-+};
-+
-+static struct at91_usbh_data __initdata tt9200_usbh_data = {
-+	.ports		= 1,
-+};
-+
-+static struct i2c_board_info __initdata tt9200_i2c_devices[] = {
-+	{
-+		I2C_BOARD_INFO("rtc-m41t80", 0x68),
-+		.type	= "m41t80",
-+	}
-+};
-+
-+static struct at91_mmc_data __initdata tt9200_mmc_data = {
-+	.slot_b		= 0,
-+	.wire4		= 1,
-+};
-+
-+
-+#if defined(CONFIG_MTD_DATAFLASH)
-+static struct mtd_partition __initdata tt9200_flash_partitions[] =
-+{
-+	{
-+		.name	= "Darrell",
-+		.offset	= 0,
-+		.size	= 12 * 1056,
-+	},
-+	{
-+		.name	= "U-boot",
-+		.offset	= MTDPART_OFS_NXTBLK,
-+		.size	= 110 * 1056,
-+	},
-+	{
-+		.name	= "U-boot env",
-+		.offset	= MTDPART_OFS_NXTBLK,
-+		.size	= 8 * 1056,
-+	},
-+	{
-+		.name	= "Kernel",
-+		.offset	= MTDPART_OFS_NXTBLK,
-+		.size	= 1534 * 1056,
-+	},
-+	{
-+		.name	= "Filesystem",
-+		.offset	= MTDPART_OFS_NXTBLK,
-+		.size	= MTDPART_SIZ_FULL,
-+	}
-+};
-+
-+static struct flash_platform_data __initdata tt9200_flash_platform = {
-+	.name		= "SPI Dataflash",
-+	.parts		= tt9200_flash_partitions,
-+	.nr_parts	= ARRAY_SIZE(tt9200_flash_partitions)
-+};
-+
-+#endif
-+
-+static struct spi_board_info __initdata tt9200_spi_devices[] = {
-+	{	/* DataFlash chip */
-+		.modalias	= "mtd_dataflash",
-+		.chip_select	= 0,
-+		/* Errata #13 */
-+		.max_speed_hz	= 5 * 1000 * 1000,
-+		.bus_num	= 0,
-+#if defined(CONFIG_MTD_DATAFLASH)
-+		.platform_data	= &tt9200_flash_platform,
-+#endif
-+	},
-+};
-+
-+static struct gpio_led tt9200_leds[] = {
-+	{
-+		.name			= "led0",
-+		.gpio			= AT91_PIN_PB27,
-+		.active_low		= 1,
-+		.default_trigger	= "heartbeat",
-+	}
-+};
-+
-+static void __init tt9200_board_init(void)
-+{
-+	/* Serial */
-+	at91_add_device_serial();
-+
-+	/* Ethernet */
-+	at91_add_device_eth(&tt9200_eth_data);
-+
-+	/* USB Host */
-+	at91_add_device_usbh(&tt9200_usbh_data);
-+
-+	/* I2C */
-+	at91_add_device_i2c(tt9200_i2c_devices, ARRAY_SIZE(tt9200_i2c_devices));
-+
-+	/* MMC */
-+	at91_add_device_mmc(0, &tt9200_mmc_data);
-+
-+	/* LEDS */
-+	at91_gpio_leds(tt9200_leds, ARRAY_SIZE(tt9200_leds));
-+
-+	/* SPI */
-+	at91_add_device_spi(tt9200_spi_devices, ARRAY_SIZE(tt9200_spi_devices));
-+}
-+
-+MACHINE_START(TT9200, "Toptech TT9200")
-+	/* Maintainer: toptech.com.ar */
-+	.phys_io	= AT91_BASE_SYS,
-+	.io_pg_offst	= (AT91_VA_BASE_SYS >> 18) & 0xfffc,
-+	.boot_params	= AT91_SDRAM_BASE + 0x100,
-+	.timer		= &at91rm9200_timer,
-+	.map_io		= tt9200_map_io,
-+	.init_irq	= tt9200_init_irq,
-+	.init_machine	= tt9200_board_init,
-+MACHINE_END
---- /dev/null
-+++ b/arch/arm/mach-at91/board-usb-a9260.c
-@@ -0,0 +1,215 @@
-+/*
-+ * linux/arch/arm/mach-at91/board-usb-a9260.c
-+ *
-+ *  Copyright (C) 2005 SAN People
-+ *  Copyright (C) 2006 Atmel
-+ *  Copyright (C) 2007 Calao-systems
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#include <linux/types.h>
-+#include <linux/init.h>
-+#include <linux/mm.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/spi/spi.h>
-+#include <linux/gpio_keys.h>
-+#include <linux/input.h>
-+#include <linux/clk.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/setup.h>
-+#include <asm/mach-types.h>
-+#include <asm/irq.h>
-+
-+#include <asm/mach/arch.h>
-+#include <asm/mach/map.h>
-+#include <asm/mach/irq.h>
-+
-+#include <asm/arch/board.h>
-+#include <asm/arch/gpio.h>
-+#include <asm/arch/at91_shdwc.h>
-+
-+#include "generic.h"
-+
-+
-+static void __init ek_map_io(void)
-+{
-+	/* Initialize processor: 12.000 MHz crystal */
-+	at91sam9260_initialize(12000000);
-+
-+	/* DGBU on ttyS0. (Rx & Tx only) */
-+	at91_register_uart(0, 0, 0);
-+
-+	/* set serial console to ttyS0 (ie, DBGU) */
-+	at91_set_serial_console(0);
-+}
-+
-+static void __init ek_init_irq(void)
-+{
-+	at91sam9260_init_interrupts(NULL);
-+}
-+
-+
-+/*
-+ * USB Host port
-+ */
-+static struct at91_usbh_data __initdata ek_usbh_data = {
-+	.ports		= 2,
-+};
-+
-+/*
-+ * USB Device port
-+ */
-+static struct at91_udc_data __initdata ek_udc_data = {
-+	.vbus_pin	= AT91_PIN_PC5,
-+	.pullup_pin	= 0,		/* pull-up driven by UDC */
-+};
-+
-+/*
-+ * MACB Ethernet device
-+ */
-+static struct at91_eth_data __initdata ek_macb_data = {
-+	.phy_irq_pin	= AT91_PIN_PA31,
-+	.is_rmii	= 1,
-+};
-+
-+/*
-+ * NAND flash
-+ */
-+static struct mtd_partition __initdata ek_nand_partition[] = {
-+	{
-+		.name	= "Uboot & Kernel",
-+		.offset	= 0x00000000,
-+		.size	= 16 * 1024 * 1024,
-+	},
-+	{
-+		.name	= "Root FS",
-+		.offset	= 0x01000000,
-+		.size	= 120 * 1024 * 1024,
-+	},
-+	{
-+		.name	= "FS",
-+		.offset	= 0x08800000,
-+		.size	= 120 * 1024 * 1024,
-+	}
-+};
-+
-+static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-+{
-+	*num_partitions = ARRAY_SIZE(ek_nand_partition);
-+	return ek_nand_partition;
-+}
-+
-+static struct at91_nand_data __initdata ek_nand_data = {
-+	.ale		= 21,
-+	.cle		= 22,
-+//	.det_pin	= ... not connected
-+	.rdy_pin	= AT91_PIN_PC13,
-+	.enable_pin	= AT91_PIN_PC14,
-+	.partition_info	= nand_partitions,
-+#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)
-+	.bus_width_16	= 1,
-+#else
-+	.bus_width_16	= 0,
-+#endif
-+};
-+
-+/*
-+ * GPIO Buttons
-+ */
-+
-+#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
-+static struct gpio_keys_button ek_buttons[] = {
-+	{	/* USER PUSH BUTTON */
-+		.code		= KEY_ENTER,
-+		.gpio		= AT91_PIN_PB10,
-+		.active_low	= 1,
-+		.desc		= "user_pb",
-+		.wakeup		= 1,
-+	}
-+};
-+
-+static struct gpio_keys_platform_data ek_button_data = {
-+	.buttons	= ek_buttons,
-+	.nbuttons	= ARRAY_SIZE(ek_buttons),
-+};
-+
-+static struct platform_device ek_button_device = {
-+	.name		= "gpio-keys",
-+	.id		= -1,
-+	.num_resources	= 0,
-+	.dev		= {
-+		.platform_data	= &ek_button_data,
-+	}
-+};
-+
-+static void __init ek_add_device_buttons(void)
-+{
-+	at91_set_GPIO_periph(AT91_PIN_PB10, 1);	/* user push button, pull up enabled */
-+	at91_set_deglitch(AT91_PIN_PB10, 1);
-+
-+	platform_device_register(&ek_button_device);
-+}
-+#else
-+static void __init ek_add_device_buttons(void) {}
-+#endif
-+
-+/*
-+ * LEDs
-+ */
-+static struct gpio_led ek_leds[] = {
-+	{	/* user_led (green) */
-+		.name			= "user_led",
-+		.gpio			= AT91_PIN_PB21,
-+		.active_low		= 0,
-+		.default_trigger	= "heartbeat",
-+	}
-+};
-+
-+static void __init ek_board_init(void)
-+{
-+	/* Serial */
-+	at91_add_device_serial();
-+	/* USB Host */
-+	at91_add_device_usbh(&ek_usbh_data);
-+	/* USB Device */
-+	at91_add_device_udc(&ek_udc_data);
-+	/* NAND */
-+	at91_add_device_nand(&ek_nand_data);
-+	/* I2C */
-+	at91_add_device_i2c(NULL, 0);
-+	/* Ethernet */
-+	at91_add_device_eth(&ek_macb_data);
-+	/* Push Buttons */
-+	ek_add_device_buttons();
-+	/* LEDs */
-+	at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds));
-+	/* shutdown controller, wakeup button (5 msec low) */
-+	at91_sys_write(AT91_SHDW_MR, AT91_SHDW_CPTWK0_(10) | AT91_SHDW_WKMODE0_LOW
-+				| AT91_SHDW_RTTWKEN);
-+}
-+
-+MACHINE_START(USB_A9260, "CALAO USB_A9260")
-+	/* Maintainer: calao-systems */
-+	.phys_io	= AT91_BASE_SYS,
-+	.io_pg_offst	= (AT91_VA_BASE_SYS >> 18) & 0xfffc,
-+	.boot_params	= AT91_SDRAM_BASE + 0x100,
-+	.timer		= &at91sam926x_timer,
-+	.map_io		= ek_map_io,
-+	.init_irq	= ek_init_irq,
-+	.init_machine	= ek_board_init,
-+MACHINE_END
---- /dev/null
-+++ b/arch/arm/mach-at91/board-usb-a9263.c
-@@ -0,0 +1,230 @@
-+/*
-+ * linux/arch/arm/mach-at91/board-usb-a9263.c
-+ *
-+ *  Copyright (C) 2005 SAN People
-+ *  Copyright (C) 2007 Atmel Corporation.
-+ *  Copyright (C) 2007 Calao-systems
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#include <linux/types.h>
-+#include <linux/init.h>
-+#include <linux/mm.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/spi/spi.h>
-+#include <linux/gpio_keys.h>
-+#include <linux/input.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/setup.h>
-+#include <asm/mach-types.h>
-+#include <asm/irq.h>
-+
-+#include <asm/mach/arch.h>
-+#include <asm/mach/map.h>
-+#include <asm/mach/irq.h>
-+
-+#include <asm/arch/board.h>
-+#include <asm/arch/gpio.h>
-+#include <asm/arch/at91_shdwc.h>
-+
-+#include "generic.h"
-+
-+
-+static void __init ek_map_io(void)
-+{
-+	/* Initialize processor: 12.00 MHz crystal */
-+	at91sam9263_initialize(12000000);
-+
-+	/* DGBU on ttyS0. (Rx & Tx only) */
-+	at91_register_uart(0, 0, 0);
-+
-+	/* set serial console to ttyS0 (ie, DBGU) */
-+	at91_set_serial_console(0);
-+}
-+
-+static void __init ek_init_irq(void)
-+{
-+	at91sam9263_init_interrupts(NULL);
-+}
-+
-+
-+/*
-+ * USB Host port
-+ */
-+static struct at91_usbh_data __initdata ek_usbh_data = {
-+	.ports		= 2,
-+};
-+
-+/*
-+ * USB Device port
-+ */
-+static struct at91_udc_data __initdata ek_udc_data = {
-+	.vbus_pin	= AT91_PIN_PB11,
-+	.pullup_pin	= 0,		/* pull-up driven by UDC */
-+};
-+
-+/*
-+ * SPI devices.
-+ */
-+static struct spi_board_info ek_spi_devices[] = {
-+#if !defined(CONFIG_MMC_AT91)
-+	{	/* DataFlash chip */
-+		.modalias	= "mtd_dataflash",
-+		.chip_select	= 0,
-+		.max_speed_hz	= 15 * 1000 * 1000,
-+		.bus_num	= 0,
-+	}
-+#endif
-+};
-+
-+/*
-+ * MACB Ethernet device
-+ */
-+static struct at91_eth_data __initdata ek_macb_data = {
-+	.phy_irq_pin	= AT91_PIN_PE31,
-+	.is_rmii	= 1,
-+};
-+
-+/*
-+ * NAND flash
-+ */
-+static struct mtd_partition __initdata ek_nand_partition[] = {
-+	{
-+		.name	= "Linux Kernel",
-+		.offset	= 0x00000000,
-+		.size	= 16 * 1024 * 1024,
-+	},
-+	{
-+		.name	= "Root FS",
-+		.offset	= 0x01000000,
-+		.size	= 120 * 1024 * 1024,
-+	},
-+	{
-+		.name	= "FS",
-+		.offset	= 0x08800000,
-+		.size	= 120 * 1024 * 1024,
-+	}
-+};
-+
-+static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-+{
-+	*num_partitions = ARRAY_SIZE(ek_nand_partition);
-+	return ek_nand_partition;
-+}
-+
-+static struct at91_nand_data __initdata ek_nand_data = {
-+	.ale		= 21,
-+	.cle		= 22,
-+//	.det_pin	= ... not connected
-+	.rdy_pin	= AT91_PIN_PA22,
-+	.enable_pin	= AT91_PIN_PD15,
-+	.partition_info	= nand_partitions,
-+#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)
-+	.bus_width_16	= 1,
-+#else
-+	.bus_width_16	= 0,
-+#endif
-+};
-+
-+/*
-+ * GPIO Buttons
-+ */
-+#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
-+static struct gpio_keys_button ek_buttons[] = {
-+	{	/* USER PUSH BUTTON */
-+		.code		= KEY_ENTER,
-+		.gpio		= AT91_PIN_PB10,
-+		.active_low	= 1,
-+		.desc		= "user_pb",
-+		.wakeup		= 1,
-+	}
-+};
-+
-+static struct gpio_keys_platform_data ek_button_data = {
-+	.buttons	= ek_buttons,
-+	.nbuttons	= ARRAY_SIZE(ek_buttons),
-+};
-+
-+static struct platform_device ek_button_device = {
-+	.name		= "gpio-keys",
-+	.id		= -1,
-+	.num_resources	= 0,
-+	.dev		= {
-+		.platform_data	= &ek_button_data,
-+	}
-+};
-+
-+static void __init ek_add_device_buttons(void)
-+{
-+	at91_set_GPIO_periph(AT91_PIN_PB10, 1);	/* user push button, pull up enabled */
-+	at91_set_deglitch(AT91_PIN_PB10, 1);
-+
-+	platform_device_register(&ek_button_device);
-+}
-+#else
-+static void __init ek_add_device_buttons(void) {}
-+#endif
-+
-+/*
-+ * LEDs
-+ */
-+static struct gpio_led ek_leds[] = {
-+	{	/* user_led (green) */
-+		.name			= "user_led",
-+		.gpio			= AT91_PIN_PB21,
-+		.active_low		= 1,
-+		.default_trigger	= "heartbeat",
-+	}
-+};
-+
-+
-+static void __init ek_board_init(void)
-+{
-+	/* Serial */
-+	at91_add_device_serial();
-+	/* USB Host */
-+	at91_add_device_usbh(&ek_usbh_data);
-+	/* USB Device */
-+	at91_add_device_udc(&ek_udc_data);
-+	/* SPI */
-+	at91_add_device_spi(ek_spi_devices, ARRAY_SIZE(ek_spi_devices));
-+	/* Ethernet */
-+	at91_add_device_eth(&ek_macb_data);
-+	/* NAND */
-+	at91_add_device_nand(&ek_nand_data);
-+	/* I2C */
-+	at91_add_device_i2c(NULL, 0);
-+	/* Push Buttons */
-+	ek_add_device_buttons();
-+	/* LEDs */
-+	at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds));
-+	/* shutdown controller, wakeup button (5 msec low) */
-+	at91_sys_write(AT91_SHDW_MR, AT91_SHDW_CPTWK0_(10) | AT91_SHDW_WKMODE0_LOW
-+				| AT91_SHDW_RTTWKEN);
-+}
-+
-+MACHINE_START(USB_A9263, "CALAO USB_A9263")
-+	/* Maintainer: calao-systems */
-+	.phys_io	= AT91_BASE_SYS,
-+	.io_pg_offst	= (AT91_VA_BASE_SYS >> 18) & 0xfffc,
-+	.boot_params	= AT91_SDRAM_BASE + 0x100,
-+	.timer		= &at91sam926x_timer,
-+	.map_io		= ek_map_io,
-+	.init_irq	= ek_init_irq,
-+	.init_machine	= ek_board_init,
-+MACHINE_END
---- a/arch/arm/mach-at91/clock.c
-+++ b/arch/arm/mach-at91/clock.c
-@@ -32,6 +32,7 @@
- #include <asm/arch/cpu.h>
- 
- #include "clock.h"
-+#include "generic.h"
- 
- 
- /*
-@@ -113,12 +114,34 @@ static void pmc_sys_mode(struct clk *clk
- 		at91_sys_write(AT91_PMC_SCDR, clk->pmc_mask);
- }
- 
-+static void pmc_uckr_mode(struct clk *clk, int is_on)
-+{
-+	unsigned int uckr = at91_sys_read(AT91_CKGR_UCKR);
-+
-+	if (is_on) {
-+		is_on = AT91_PMC_LOCKU;
-+		at91_sys_write(AT91_CKGR_UCKR, uckr | clk->pmc_mask);
-+	} else
-+		at91_sys_write(AT91_CKGR_UCKR, uckr & ~(clk->pmc_mask));
-+
-+	do {
-+		cpu_relax();
-+	} while ((at91_sys_read(AT91_PMC_SR) & AT91_PMC_LOCKU) != is_on);
-+}
-+
- /* USB function clocks (PLLB must be 48 MHz) */
- static struct clk udpck = {
- 	.name		= "udpck",
- 	.parent		= &pllb,
- 	.mode		= pmc_sys_mode,
- };
-+static struct clk utmi_clk = {
-+	.name		= "utmi_clk",
-+	.parent		= &main_clk,
-+	.pmc_mask	= AT91_PMC_UPLLEN,	/* in CKGR_UCKR */
-+	.mode		= pmc_uckr_mode,
-+	.type		= CLK_TYPE_PLL,
-+};
- static struct clk uhpck = {
- 	.name		= "uhpck",
- 	.parent		= &pllb,
-@@ -254,6 +277,23 @@ EXPORT_SYMBOL(clk_get_rate);
- 
- /*------------------------------------------------------------------------*/
- 
-+#ifdef CONFIG_PM
-+
-+int clk_must_disable(struct clk *clk)
-+{
-+	if (!at91_suspend_entering_slow_clock())
-+		return 0;
-+
-+	while (clk->parent)
-+		clk = clk->parent;
-+	return clk != &clk32k;
-+}
-+EXPORT_SYMBOL(clk_must_disable);
-+
-+#endif
-+
-+/*------------------------------------------------------------------------*/
-+
- #ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS
- 
- /*
-@@ -362,7 +402,7 @@ static void __init init_programmable_clo
- 
- static int at91_clk_show(struct seq_file *s, void *unused)
- {
--	u32		scsr, pcsr, sr;
-+	u32		scsr, pcsr, uckr = 0, sr;
- 	struct clk	*clk;
- 
- 	seq_printf(s, "SCSR = %8x\n", scsr = at91_sys_read(AT91_PMC_SCSR));
-@@ -370,7 +410,10 @@ static int at91_clk_show(struct seq_file
- 	seq_printf(s, "MOR  = %8x\n", at91_sys_read(AT91_CKGR_MOR));
- 	seq_printf(s, "MCFR = %8x\n", at91_sys_read(AT91_CKGR_MCFR));
- 	seq_printf(s, "PLLA = %8x\n", at91_sys_read(AT91_CKGR_PLLAR));
--	seq_printf(s, "PLLB = %8x\n", at91_sys_read(AT91_CKGR_PLLBR));
-+	if (!cpu_is_at91sam9rl())
-+		seq_printf(s, "PLLB = %8x\n", at91_sys_read(AT91_CKGR_PLLBR));
-+	if (cpu_is_at91cap9() || cpu_is_at91sam9rl())
-+		seq_printf(s, "UCKR = %8x\n", uckr = at91_sys_read(AT91_CKGR_UCKR));
- 	seq_printf(s, "MCKR = %8x\n", at91_sys_read(AT91_PMC_MCKR));
- 	seq_printf(s, "SR   = %8x\n", sr = at91_sys_read(AT91_PMC_SR));
- 
-@@ -383,6 +426,8 @@ static int at91_clk_show(struct seq_file
- 			state = (scsr & clk->pmc_mask) ? "on" : "off";
- 		else if (clk->mode == pmc_periph_mode)
- 			state = (pcsr & clk->pmc_mask) ? "on" : "off";
-+		else if (clk->mode == pmc_uckr_mode)
-+			state = (uckr & clk->pmc_mask) ? "on" : "off";
- 		else if (clk->pmc_mask)
- 			state = (sr & clk->pmc_mask) ? "on" : "off";
- 		else if (clk == &clk32k || clk == &main_clk)
-@@ -583,6 +628,17 @@ int __init at91_clock_init(unsigned long
- 	uhpck.rate_hz = at91_usb_rate(&pllb, pllb.rate_hz, at91_pllb_usb_init);
- 
- 	/*
-+	 * USB HS clock init
-+	 */
-+	if (cpu_is_at91cap9() || cpu_is_at91sam9rl()) {
-+		/*
-+		 * multiplier is hard-wired to 40
-+		 * (obtain the USB High Speed 480 MHz when input is 12 MHz)
-+		 */
-+		utmi_clk.rate_hz = 40 * utmi_clk.parent->rate_hz;
-+	}
-+
-+	/*
- 	 * MCK and CPU derive from one of those primary clocks.
- 	 * For now, assume this parentage won't change.
- 	 */
-@@ -599,6 +655,9 @@ int __init at91_clock_init(unsigned long
- 	for (i = 0; i < ARRAY_SIZE(standard_pmc_clocks); i++)
- 		list_add_tail(&standard_pmc_clocks[i]->node, &clocks);
- 
-+	if (cpu_is_at91cap9() || cpu_is_at91sam9rl())
-+		list_add_tail(&utmi_clk.node, &clocks);
-+
- 	/* MCK and CPU clock are "always on" */
- 	clk_enable(&mck);
- 
---- a/arch/arm/mach-at91/generic.h
-+++ b/arch/arm/mach-at91/generic.h
-@@ -41,6 +41,7 @@ extern void __init at91_clock_associate(
-  /* Power Management */
- extern void at91_irq_suspend(void);
- extern void at91_irq_resume(void);
-+extern int at91_suspend_entering_slow_clock(void);
- 
-  /* GPIO */
- #define AT91RM9200_PQFP		3	/* AT91RM9200 PQFP package has 3 banks */
---- a/arch/arm/mach-at91/gpio.c
-+++ b/arch/arm/mach-at91/gpio.c
-@@ -490,7 +490,8 @@ postcore_initcall(at91_gpio_debugfs_init
- 
- /*--------------------------------------------------------------------------*/
- 
--/* This lock class tells lockdep that GPIO irqs are in a different
-+/*
-+ * This lock class tells lockdep that GPIO irqs are in a different
-  * category than their parents, so it won't report false recursion.
-  */
- static struct lock_class_key gpio_lock_class;
-@@ -557,6 +558,7 @@ void __init at91_gpio_init(struct at91_g
- 		data->regbase = data->offset + (void __iomem *)AT91_VA_BASE_SYS;
- 
- 		/* AT91SAM9263_ID_PIOCDE groups PIOC, PIOD, PIOE */
-+		/* AT91CAP9_ID_PIOABCD groups PIOA, PIOB, PIOC, PIOD */
- 		if (last && last->id == data->id)
- 			last->next = data;
- 	}
---- /dev/null
-+++ b/arch/arm/mach-at91/ics1523.c
-@@ -0,0 +1,208 @@
-+/*
-+ * arch/arm/mach-at91rm9200/ics1523.c
-+ *
-+ *  Copyright (C) 2003 ATMEL Rousset
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#include <asm/hardware.h>
-+#include <asm/io.h>
-+
-+#include <linux/clk.h>
-+#include <linux/delay.h>
-+#include <linux/err.h>
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+
-+#include <asm/arch/ics1523.h>
-+#include <asm/arch/at91_twi.h>
-+#include <asm/arch/gpio.h>
-+
-+/* TWI Errors */
-+#define	AT91_TWI_ERROR	(AT91_TWI_NACK | AT91_TWI_UNRE | AT91_TWI_OVRE)
-+
-+
-+static void __iomem *twi_base;
-+
-+#define at91_twi_read(reg)		__raw_readl(twi_base + (reg))
-+#define at91_twi_write(reg, val)	__raw_writel((val), twi_base + (reg))
-+
-+
-+/* -----------------------------------------------------------------------------
-+ * Initialization of TWI CLOCK
-+ * ----------------------------------------------------------------------------- */
-+
-+static void at91_ics1523_SetTwiClock(unsigned int mck_khz)
-+{
-+	int sclock;
-+
-+	/* Here, CKDIV = 1 and CHDIV = CLDIV  ==> CLDIV = CHDIV = 1/4*((Fmclk/FTWI) -6) */
-+	sclock = (10*mck_khz / ICS_TRANSFER_RATE);
-+	if (sclock % 10 >= 5)
-+		sclock = (sclock /10) - 5;
-+	else
-+		sclock = (sclock /10)- 6;
-+	sclock = (sclock + (4 - sclock %4)) >> 2;	/* div 4 */
-+
-+	at91_twi_write(AT91_TWI_CWGR, 0x00010000 | sclock | (sclock << 8));
-+}
-+
-+/* -----------------------------------------------------------------------------
-+ * Read a byte with TWI Interface from the Clock Generator ICS1523
-+ * ----------------------------------------------------------------------------- */
-+
-+static int at91_ics1523_ReadByte(unsigned char reg_address, unsigned char *data_in)
-+{
-+	int Status, nb_trial;
-+
-+	at91_twi_write(AT91_TWI_MMR, AT91_TWI_MREAD | AT91_TWI_IADRSZ_1 | ((ICS_ADDR << 16) & AT91_TWI_DADR));
-+	at91_twi_write(AT91_TWI_IADR, reg_address);
-+	at91_twi_write(AT91_TWI_CR, AT91_TWI_START | AT91_TWI_STOP);
-+
-+	/* Program temporizing period (300us) */
-+	udelay(300);
-+
-+	/* Wait TXcomplete ... */
-+	nb_trial = 0;
-+	Status = at91_twi_read(AT91_TWI_SR);
-+	while (!(Status & AT91_TWI_TXCOMP) && (nb_trial < 10)) {
-+		nb_trial++;
-+		Status = at91_twi_read(AT91_TWI_SR);
-+	}
-+
-+	if (Status & AT91_TWI_TXCOMP) {
-+		*data_in = (unsigned char) at91_twi_read(AT91_TWI_RHR);
-+		return ICS1523_ACCESS_OK;
-+	}
-+	else
-+		return ICS1523_ACCESS_ERROR;
-+}
-+
-+/* -----------------------------------------------------------------------------
-+ * Write a byte with TWI Interface to the Clock Generator ICS1523
-+ * ----------------------------------------------------------------------------- */
-+
-+static int at91_ics1523_WriteByte(unsigned char reg_address, unsigned char data_out)
-+{
-+	int Status, nb_trial;
-+
-+	at91_twi_write(AT91_TWI_MMR, AT91_TWI_IADRSZ_1 | ((ICS_ADDR << 16) & AT91_TWI_DADR));
-+	at91_twi_write(AT91_TWI_IADR, reg_address);
-+	at91_twi_write(AT91_TWI_THR, data_out);
-+	at91_twi_write(AT91_TWI_CR, AT91_TWI_START | AT91_TWI_STOP);
-+
-+	/* Program temporizing period (300us) */
-+	udelay(300);
-+
-+	nb_trial = 0;
-+	Status = at91_twi_read(AT91_TWI_SR);
-+	while (!(Status & AT91_TWI_TXCOMP) && (nb_trial < 10)) {
-+		nb_trial++;
-+		if (Status & AT91_TWI_ERROR) {
-+			/* If Underrun OR NACK - Start again */
-+			at91_twi_write(AT91_TWI_CR, AT91_TWI_START | AT91_TWI_STOP);
-+
-+			/*  Program temporizing period (300us) */
-+			udelay(300);
-+		}
-+		Status = at91_twi_read(AT91_TWI_SR);
-+	};
-+
-+	if (Status & AT91_TWI_TXCOMP)
-+		return ICS1523_ACCESS_OK;
-+	else
-+		return ICS1523_ACCESS_ERROR;
-+}
-+
-+/* -----------------------------------------------------------------------------
-+ * Initialization of the Clock Generator ICS1523
-+ * ----------------------------------------------------------------------------- */
-+
-+int at91_ics1523_init(void)
-+{
-+	int		nb_trial;
-+	int		ack = ICS1523_ACCESS_OK;
-+	unsigned int	status = 0xffffffff;
-+	struct clk	*twi_clk;
-+
-+	/* Map in TWI peripheral */
-+	twi_base = ioremap(AT91RM9200_BASE_TWI, SZ_16K);
-+	if (!twi_base)
-+		return -ENOMEM;
-+
-+	/* pins used for TWI interface */
-+	at91_set_A_periph(AT91_PIN_PA25, 0);            /* TWD */
-+	at91_set_multi_drive(AT91_PIN_PA25, 1);
-+	at91_set_A_periph(AT91_PIN_PA26, 0);            /* TWCK */
-+	at91_set_multi_drive(AT91_PIN_PA26, 1);
-+
-+	/* Enable the TWI clock */
-+	twi_clk = clk_get(NULL, "twi_clk");
-+	if (IS_ERR(twi_clk))
-+		return ICS1523_ACCESS_ERROR;
-+	clk_enable(twi_clk);
-+
-+	/* Disable interrupts */
-+	at91_twi_write(AT91_TWI_IDR, -1);
-+
-+	/* Reset peripheral */
-+	at91_twi_write(AT91_TWI_CR, AT91_TWI_SWRST);
-+
-+	/* Set Master mode */
-+	at91_twi_write(AT91_TWI_CR, AT91_TWI_MSEN);
-+
-+	/* Set TWI Clock Waveform Generator Register */
-+	at91_ics1523_SetTwiClock(60000);     /* MCK in KHz = 60000 KHz */
-+
-+	/* ICS1523 Initialisation */
-+	ack |= at91_ics1523_WriteByte ((unsigned char) ICS_ICR, (unsigned char) 0);
-+	ack |= at91_ics1523_WriteByte ((unsigned char) ICS_OE, (unsigned char) (ICS_OEF | ICS_OET2 | ICS_OETCK));
-+	ack |= at91_ics1523_WriteByte ((unsigned char) ICS_OD, (unsigned char) (ICS_INSEL | 0x7F));
-+	ack |= at91_ics1523_WriteByte ((unsigned char) ICS_DPAO, (unsigned char) 0);
-+
-+	nb_trial = 0;
-+	do {
-+		nb_trial++;
-+		ack |= at91_ics1523_WriteByte ((unsigned char) ICS_ICR, (unsigned char) (ICS_ENDLS | ICS_ENPLS | ICS_PDEN /*| ICS_FUNCSEL*/));
-+		ack |= at91_ics1523_WriteByte ((unsigned char) ICS_LCR, (unsigned char) (ICS_PSD | ICS_PFD));
-+		ack |= at91_ics1523_WriteByte ((unsigned char) ICS_FD0, (unsigned char) 0x39) ; /* 0x7A */
-+		ack |= at91_ics1523_WriteByte ((unsigned char) ICS_FD1, (unsigned char) 0x00);
-+		ack |= at91_ics1523_WriteByte ((unsigned char) ICS_SWRST, (unsigned char) (ICS_PLLR));
-+
-+		/* Program 1ms temporizing period */
-+		mdelay(1);
-+
-+		at91_ics1523_ReadByte ((unsigned char) ICS_SR, (char *)&status);
-+	} while (!((unsigned int) status & (unsigned int) ICS_PLLLOCK) && (nb_trial < 10));
-+
-+	ack |= at91_ics1523_WriteByte ((unsigned char) ICS_DPAC, (unsigned char) 0x03) ; /* 0x01 */
-+	ack |= at91_ics1523_WriteByte ((unsigned char) ICS_SWRST, (unsigned char) (ICS_DPAR));
-+
-+	/* Program 1ms temporizing period */
-+	mdelay(1);
-+
-+	ack |= at91_ics1523_WriteByte ((unsigned char) ICS_DPAO, (unsigned char) 0x00);
-+
-+	/* Program 1ms temporizing period */
-+	mdelay(1);
-+
-+	/* All done - cleanup */
-+	iounmap(twi_base);
-+	clk_disable(twi_clk);
-+	clk_put(twi_clk);
-+
-+	return ack;
-+}
---- a/arch/arm/mach-at91/pm.c
-+++ b/arch/arm/mach-at91/pm.c
-@@ -26,12 +26,144 @@
- #include <asm/mach-types.h>
- 
- #include <asm/arch/at91_pmc.h>
--#include <asm/arch/at91rm9200_mc.h>
- #include <asm/arch/gpio.h>
- #include <asm/arch/cpu.h>
- 
- #include "generic.h"
- 
-+#ifdef CONFIG_ARCH_AT91RM9200
-+#include <asm/arch/at91rm9200_mc.h>
-+
-+/*
-+ * The AT91RM9200 goes into self-refresh mode with this command, and will
-+ * terminate self-refresh automatically on the next SDRAM access.
-+ */
-+#define sdram_selfrefresh_enable()	at91_sys_write(AT91_SDRAMC_SRR, 1)
-+#define sdram_selfrefresh_disable()	do {} while (0)
-+
-+#elif defined(CONFIG_ARCH_AT91CAP9)
-+#include <asm/arch/at91cap9_ddrsdr.h>
-+
-+static u32 saved_lpr;
-+
-+static inline void sdram_selfrefresh_enable(void)
-+{
-+	u32 lpr;
-+
-+	saved_lpr = at91_sys_read(AT91_DDRSDRC_LPR);
-+
-+	lpr = saved_lpr & ~AT91_DDRSDRC_LPCB;
-+	at91_sys_write(AT91_DDRSDRC_LPR, lpr | AT91_DDRSDRC_LPCB_SELF_REFRESH);
-+}
-+
-+#define sdram_selfrefresh_disable()	at91_sys_write(AT91_DDRSDRC_LPR, saved_lpr)
-+
-+#else
-+#include <asm/arch/at91sam9_sdramc.h>
-+
-+#ifdef CONFIG_ARCH_AT91SAM9263
-+/*
-+ * FIXME either or both the SDRAM controllers (EB0, EB1) might be in use;
-+ * handle those cases both here and in the Suspend-To-RAM support.
-+ */
-+#define AT91_SDRAMC	AT91_SDRAMC0
-+#warning Assuming EB1 SDRAM controller is *NOT* used
-+#endif
-+
-+static u32 saved_lpr;
-+
-+static inline void sdram_selfrefresh_enable(void)
-+{
-+	u32 lpr;
-+
-+	saved_lpr = at91_sys_read(AT91_SDRAMC_LPR);
-+
-+	lpr = saved_lpr & ~AT91_SDRAMC_LPCB;
-+	at91_sys_write(AT91_SDRAMC_LPR, lpr | AT91_SDRAMC_LPCB_SELF_REFRESH);
-+}
-+
-+#define sdram_selfrefresh_disable()	at91_sys_write(AT91_SDRAMC_LPR, saved_lpr)
-+
-+/*
-+ * FIXME: The AT91SAM9263 has a second EBI controller which may have
-+ *        additional SDRAM.  pm_slowclock.S will require a similar fix.
-+ */
-+
-+#endif
-+
-+
-+/*
-+ * Show the reason for the previous system reset.
-+ */
-+#if defined(AT91_SHDWC)
-+
-+#include <asm/arch/at91_rstc.h>
-+#include <asm/arch/at91_shdwc.h>
-+
-+static void __init show_reset_status(void)
-+{
-+	static char reset[] __initdata = "reset";
-+
-+	static char general[] __initdata = "general";
-+	static char wakeup[] __initdata = "wakeup";
-+	static char watchdog[] __initdata = "watchdog";
-+	static char software[] __initdata = "software";
-+	static char user[] __initdata = "user";
-+	static char unknown[] __initdata = "unknown";
-+
-+	static char signal[] __initdata = "signal";
-+	static char rtc[] __initdata = "rtc";
-+	static char rtt[] __initdata = "rtt";
-+	static char restore[] __initdata = "power-restored";
-+
-+	char *reason, *r2 = reset;
-+	u32 reset_type, wake_type;
-+
-+	reset_type = at91_sys_read(AT91_RSTC_SR) & AT91_RSTC_RSTTYP;
-+	wake_type = at91_sys_read(AT91_SHDW_SR);
-+
-+	switch (reset_type) {
-+	case AT91_RSTC_RSTTYP_GENERAL:
-+		reason = general;
-+		break;
-+	case AT91_RSTC_RSTTYP_WAKEUP:
-+		/* board-specific code enabled the wakeup sources */
-+		reason = wakeup;
-+
-+		/* "wakeup signal" */
-+		if (wake_type & AT91_SHDW_WAKEUP0)
-+			r2 = signal;
-+		else {
-+			r2 = reason;
-+			if (wake_type & AT91_SHDW_RTTWK)	/* rtt wakeup */
-+				reason = rtt;
-+			else if (wake_type & AT91_SHDW_RTCWK)	/* rtc wakeup */
-+				reason = rtc;
-+			else if (wake_type == 0)	/* power-restored wakeup */
-+				reason = restore;
-+			else				/* unknown wakeup */
-+				reason = unknown;
-+		}
-+		break;
-+	case AT91_RSTC_RSTTYP_WATCHDOG:
-+		reason = watchdog;
-+		break;
-+	case AT91_RSTC_RSTTYP_SOFTWARE:
-+		reason = software;
-+		break;
-+	case AT91_RSTC_RSTTYP_USER:
-+		reason = user;
-+		break;
-+	default:
-+		reason = unknown;
-+		break;
-+	}
-+	pr_info("AT91: Starting after %s %s\n", reason, r2);
-+}
-+#else
-+static void __init show_reset_status(void) {}
-+#endif
-+
- 
- static int at91_pm_valid_state(suspend_state_t state)
- {
-@@ -62,6 +194,7 @@ static int at91_pm_begin(suspend_state_t
-  * Verify that all the clocks are correct before entering
-  * slow-clock mode.
-  */
-+#warning "This should probably be moved to clocks.c"
- static int at91_pm_verify_clocks(void)
- {
- 	unsigned long scsr;
-@@ -107,24 +240,24 @@ static int at91_pm_verify_clocks(void)
- }
- 
- /*
-- * Call this from platform driver suspend() to see how deeply to suspend.
-+ * This is called from clk_must_disable(), to see how deeply to suspend.
-  * For example, some controllers (like OHCI) need one of the PLL clocks
-  * in order to act as a wakeup source, and those are not available when
-  * going into slow clock mode.
-- *
-- * REVISIT: generalize as clk_will_be_available(clk)?  Other platforms have
-- * the very same problem (but not using at91 main_clk), and it'd be better
-- * to add one generic API rather than lots of platform-specific ones.
-  */
- int at91_suspend_entering_slow_clock(void)
- {
- 	return (target_state == PM_SUSPEND_MEM);
- }
--EXPORT_SYMBOL(at91_suspend_entering_slow_clock);
- 
- 
- static void (*slow_clock)(void);
- 
-+#ifdef CONFIG_AT91_SLOW_CLOCK
-+extern void at91_slow_clock(void);
-+extern u32 at91_slow_clock_sz;
-+#endif
-+
- 
- static int at91_pm_enter(suspend_state_t state)
- {
-@@ -158,11 +291,14 @@ static int at91_pm_enter(suspend_state_t
- 			 * turning off the main oscillator; reverse on wakeup.
- 			 */
- 			if (slow_clock) {
-+#ifdef CONFIG_AT91_SLOW_CLOCK
-+				/* copy slow_clock handler to SRAM, and call it */
-+				memcpy(slow_clock, at91_slow_clock, at91_slow_clock_sz);
-+#endif
- 				slow_clock();
- 				break;
- 			} else {
--				/* DEVELOPMENT ONLY */
--				pr_info("AT91: PM - no slow clock mode yet ...\n");
-+				pr_info("AT91: PM - no slow clock mode enabled ...\n");
- 				/* FALLTHROUGH leaving master clock alone */
- 			}
- 
-@@ -175,13 +311,15 @@ static int at91_pm_enter(suspend_state_t
- 		case PM_SUSPEND_STANDBY:
- 			/*
- 			 * NOTE: the Wait-for-Interrupt instruction needs to be
--			 * in icache so the SDRAM stays in self-refresh mode until
--			 * the wakeup IRQ occurs.
-+			 * in icache so no SDRAM accesses are needed until the
-+			 * wakeup IRQ occurs and self-refresh is terminated.
- 			 */
- 			asm("b 1f; .align 5; 1:");
- 			asm("mcr p15, 0, r0, c7, c10, 4");	/* drain write buffer */
--			at91_sys_write(AT91_SDRAMC_SRR, 1);	/* self-refresh mode */
--			/* fall though to next state */
-+			sdram_selfrefresh_enable();
-+			asm("mcr p15, 0, r0, c7, c0, 4");	/* wait for interrupt */
-+			sdram_selfrefresh_disable();
-+			break;
- 
- 		case PM_SUSPEND_ON:
- 			asm("mcr p15, 0, r0, c7, c0, 4");	/* wait for interrupt */
-@@ -196,6 +334,7 @@ static int at91_pm_enter(suspend_state_t
- 			at91_sys_read(AT91_AIC_IPR) & at91_sys_read(AT91_AIC_IMR));
- 
- error:
-+	sdram_selfrefresh_disable();
- 	target_state = PM_SUSPEND_ON;
- 	at91_irq_resume();
- 	at91_gpio_resume();
-@@ -220,21 +359,20 @@ static struct platform_suspend_ops at91_
- 
- static int __init at91_pm_init(void)
- {
--	printk("AT91: Power Management\n");
--
--#ifdef CONFIG_AT91_PM_SLOW_CLOCK
--	/* REVISIT allocations of SRAM should be dynamically managed.
--	 * FIQ handlers and other components will want SRAM/TCM too...
--	 */
--	slow_clock = (void *) (AT91_VA_BASE_SRAM + (3 * SZ_4K));
--	memcpy(slow_clock, at91rm9200_slow_clock, at91rm9200_slow_clock_sz);
-+#ifdef CONFIG_AT91_SLOW_CLOCK
-+	slow_clock = (void *) (AT91_IO_VIRT_BASE - at91_slow_clock_sz);
- #endif
- 
--	/* Disable SDRAM low-power mode.  Cannot be used with self-refresh. */
-+	pr_info("AT91: Power Management%s\n", (slow_clock ? " (with slow clock mode)" : ""));
-+
-+#ifdef CONFIG_ARCH_AT91RM9200
-+	/* AT91RM9200 SDRAM low-power mode cannot be used with self-refresh. */
- 	at91_sys_write(AT91_SDRAMC_LPR, 0);
-+#endif
- 
- 	suspend_set_ops(&at91_pm_ops);
- 
-+	show_reset_status();
- 	return 0;
- }
- arch_initcall(at91_pm_init);
---- /dev/null
-+++ b/arch/arm/mach-at91/pm_slowclock.S
-@@ -0,0 +1,283 @@
-+/*
-+ * arch/arm/mach-at91/pm_slow_clock.S
-+ *
-+ *  Copyright (C) 2006 Savin Zlobec
-+ *
-+ * AT91SAM9 support:
-+ *  Copyright (C) 2007 Anti Sullin <anti.sullin@artecdesign.ee
-+ *
-+ * 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.
-+ *
-+ */
-+
-+#include <linux/linkage.h>
-+#include <asm/hardware.h>
-+#include <asm/arch/at91_pmc.h>
-+
-+#ifdef CONFIG_ARCH_AT91RM9200
-+#include <asm/arch/at91rm9200_mc.h>
-+#elif defined(CONFIG_ARCH_AT91CAP9)
-+#include <asm/arch/at91cap9_ddrsdr.h>
-+#else
-+#include <asm/arch/at91sam9_sdramc.h>
-+#endif
-+
-+
-+#ifdef CONFIG_ARCH_AT91SAM9263
-+/*
-+ * FIXME either or both the SDRAM controllers (EB0, EB1) might be in use;
-+ * handle those cases both here and in the Suspend-To-RAM support.
-+ */
-+#define AT91_SDRAMC	AT91_SDRAMC0
-+#warning Assuming EB1 SDRAM controller is *NOT* used
-+#endif
-+
-+/*
-+ * When SLOWDOWN_MASTER_CLOCK is defined we will also slow down the Master
-+ * clock during suspend by adjusting its prescalar and divisor.
-+ * NOTE: This hasn't been shown to be stable on SAM9s; and on the RM9200 there
-+ *       are errata regarding adjusting the prescalar and divisor.
-+ */
-+#undef SLOWDOWN_MASTER_CLOCK
-+
-+#define MCKRDY_TIMEOUT		1000
-+#define MOSCRDY_TIMEOUT 	1000
-+#define PLLALOCK_TIMEOUT	1000
-+#define PLLBLOCK_TIMEOUT	1000
-+
-+
-+/*
-+ * Wait until master clock is ready (after switching master clock source)
-+ */
-+	.macro wait_mckrdy
-+	mov	r4, #MCKRDY_TIMEOUT
-+1:	sub	r4, r4, #1
-+	cmp	r4, #0
-+	beq	2f
-+	ldr	r3, [r1, #(AT91_PMC_SR - AT91_PMC)]
-+	tst	r3, #AT91_PMC_MCKRDY
-+	beq	1b
-+2:
-+	.endm
-+
-+/*
-+ * Wait until master oscillator has stabilized.
-+ */
-+	.macro wait_moscrdy
-+	mov	r4, #MOSCRDY_TIMEOUT
-+1:	sub	r4, r4, #1
-+	cmp	r4, #0
-+	beq	2f
-+	ldr	r3, [r1, #(AT91_PMC_SR - AT91_PMC)]
-+	tst	r3, #AT91_PMC_MOSCS
-+	beq	1b
-+2:
-+	.endm
-+
-+/*
-+ * Wait until PLLA has locked.
-+ */
-+	.macro wait_pllalock
-+	mov	r4, #PLLALOCK_TIMEOUT
-+1:	sub	r4, r4, #1
-+	cmp	r4, #0
-+	beq	2f
-+	ldr	r3, [r1, #(AT91_PMC_SR - AT91_PMC)]
-+	tst	r3, #AT91_PMC_LOCKA
-+	beq	1b
-+2:
-+	.endm
-+
-+/*
-+ * Wait until PLLB has locked.
-+ */
-+	.macro wait_pllblock
-+	mov	r4, #PLLBLOCK_TIMEOUT
-+1:	sub	r4, r4, #1
-+	cmp	r4, #0
-+	beq	2f
-+	ldr	r3, [r1, #(AT91_PMC_SR - AT91_PMC)]
-+	tst	r3, #AT91_PMC_LOCKB
-+	beq	1b
-+2:
-+	.endm
-+
-+	.text
-+
-+ENTRY(at91_slow_clock)
-+	/* Save registers on stack */
-+	stmfd	sp!, {r0 - r12, lr}
-+
-+	/*
-+	 * Register usage:
-+	 *  R1 = Base address of AT91_PMC
-+	 *  R2 = Base address of AT91_SDRAMC (or AT91_SYS on AT91RM9200)
-+	 *  R3 = temporary register
-+	 *  R4 = temporary register
-+	 */
-+	ldr	r1, .at91_va_base_pmc
-+	ldr	r2, .at91_va_base_sdramc
-+
-+	/* Drain write buffer */
-+	mcr	p15, 0, r0, c7, c10, 4
-+
-+#ifdef CONFIG_ARCH_AT91RM9200
-+	/* Put SDRAM in self-refresh mode */
-+	mov	r3, #1
-+	str	r3, [r2, #AT91_SDRAMC_SRR]
-+#elif defined(CONFIG_ARCH_AT91CAP9)
-+	/* Enable SDRAM self-refresh mode */
-+	ldr	r3, [r2, #AT91_DDRSDRC_LPR - AT91_DDRSDRC]
-+	str	r3, .saved_sam9_lpr
-+
-+	mov	r3, #AT91_DDRSDRC_LPCB_SELF_REFRESH
-+	str	r3, [r2, #AT91_DDRSDRC_LPR - AT91_DDRSDRC]
-+#else
-+	/* Enable SDRAM self-refresh mode */
-+	ldr	r3, [r2, #AT91_SDRAMC_LPR - AT91_SDRAMC]
-+	str	r3, .saved_sam9_lpr
-+
-+	mov	r3, #AT91_SDRAMC_LPCB_SELF_REFRESH
-+	str	r3, [r2, #AT91_SDRAMC_LPR - AT91_SDRAMC]
-+#endif
-+
-+	/* Save Master clock setting */
-+	ldr	r3, [r1, #(AT91_PMC_MCKR - AT91_PMC)]
-+	str	r3, .saved_mckr
-+
-+	/*
-+	 * Set the Master clock source to slow clock
-+	 */
-+	bic	r3, r3, #AT91_PMC_CSS
-+	str	r3, [r1, #(AT91_PMC_MCKR - AT91_PMC)]
-+
-+	wait_mckrdy
-+
-+#ifdef SLOWDOWN_MASTER_CLOCK
-+	/*
-+	 * Set the Master Clock PRES and MDIV fields.
-+	 *
-+	 * See AT91RM9200 errata #27 and #28 for details.
-+	 */
-+	mov	r3, #0
-+	str	r3, [r1, #(AT91_PMC_MCKR - AT91_PMC)]
-+
-+	wait_mckrdy
-+#endif
-+
-+	/* Save PLLA setting and disable it */
-+	ldr	r3, [r1, #(AT91_CKGR_PLLAR - AT91_PMC)]
-+	str	r3, .saved_pllar
-+
-+	mov	r3, #AT91_PMC_PLLCOUNT
-+	orr	r3, r3, #(1 << 29)		/* bit 29 always set */
-+	str	r3, [r1, #(AT91_CKGR_PLLAR - AT91_PMC)]
-+
-+	wait_pllalock
-+
-+	/* Save PLLB setting and disable it */
-+	ldr	r3, [r1, #(AT91_CKGR_PLLBR - AT91_PMC)]
-+	str	r3, .saved_pllbr
-+
-+	mov	r3, #AT91_PMC_PLLCOUNT
-+	str	r3, [r1, #(AT91_CKGR_PLLBR - AT91_PMC)]
-+
-+	wait_pllblock
-+
-+	/* Turn off the main oscillator */
-+	ldr	r3, [r1, #(AT91_CKGR_MOR - AT91_PMC)]
-+	bic	r3, r3, #AT91_PMC_MOSCEN
-+	str	r3, [r1, #(AT91_CKGR_MOR - AT91_PMC)]
-+
-+	/* Wait for interrupt */
-+	mcr	p15, 0, r0, c7, c0, 4
-+
-+	/* Turn on the main oscillator */
-+	ldr	r3, [r1, #(AT91_CKGR_MOR - AT91_PMC)]
-+	orr	r3, r3, #AT91_PMC_MOSCEN
-+	str	r3, [r1, #(AT91_CKGR_MOR - AT91_PMC)]
-+
-+	wait_moscrdy
-+
-+	/* Restore PLLB setting */
-+	ldr	r3, .saved_pllbr
-+	str	r3, [r1, #(AT91_CKGR_PLLBR - AT91_PMC)]
-+
-+	wait_pllblock
-+
-+	/* Restore PLLA setting */
-+	ldr	r3, .saved_pllar
-+	str	r3, [r1, #(AT91_CKGR_PLLAR - AT91_PMC)]
-+
-+	wait_pllalock
-+
-+#ifdef SLOWDOWN_MASTER_CLOCK
-+	/*
-+	 * First set PRES if it was not 0,
-+	 * than set CSS and MDIV fields.
-+	 *
-+	 * See AT91RM9200 errata #27 and #28 for details.
-+	 */
-+	ldr	r3, .saved_mckr
-+	tst	r3, #AT91_PMC_PRES
-+	beq	2f
-+	and	r3, r3, #AT91_PMC_PRES
-+	str	r3, [r1, #(AT91_PMC_MCKR - AT91_PMC)]
-+
-+	wait_mckrdy
-+#endif
-+
-+	/*
-+	 * Restore master clock setting
-+	 */
-+2:	ldr	r3, .saved_mckr
-+	str	r3, [r1, #(AT91_PMC_MCKR - AT91_PMC)]
-+
-+	wait_mckrdy
-+
-+#ifdef CONFIG_ARCH_AT91RM9200
-+	/* Do nothing - self-refresh is automatically disabled. */
-+#elif defined(CONFIG_ARCH_AT91CAP9)
-+	/* Restore LPR on AT91CAP9 */
-+	ldr	r3, .saved_sam9_lpr
-+	str	r3, [r2, #AT91_DDRSDRC_LPR - AT91_DDRSDRC]
-+#else
-+	/* Restore LPR on AT91SAM9 */
-+	ldr	r3, .saved_sam9_lpr
-+	str	r3, [r2, #AT91_SDRAMC_LPR - AT91_SDRAMC]
-+#endif
-+
-+	/* Restore registers, and return */
-+	ldmfd	sp!, {r0 - r12, pc}
-+
-+
-+.saved_mckr:
-+	.word 0
-+
-+.saved_pllar:
-+	.word 0
-+
-+.saved_pllbr:
-+	.word 0
-+
-+.saved_sam9_lpr:
-+	.word 0
-+
-+.at91_va_base_pmc:
-+	.word AT91_VA_BASE_SYS + AT91_PMC
-+
-+#ifdef CONFIG_ARCH_AT91RM9200
-+.at91_va_base_sdramc:
-+	.word AT91_VA_BASE_SYS
-+#elif defined(CONFIG_ARCH_AT91CAP9)
-+.at91_va_base_sdramc:
-+	.word AT91_VA_BASE_SYS + AT91_DDRSDRC
-+#else
-+.at91_va_base_sdramc:
-+	.word AT91_VA_BASE_SYS + AT91_SDRAMC
-+#endif
-+
-+ENTRY(at91_slow_clock_sz)
-+	.word .-at91_slow_clock
---- a/arch/arm/mach-ks8695/Makefile
-+++ b/arch/arm/mach-ks8695/Makefile
-@@ -11,5 +11,8 @@ obj-				:=
- # PCI support is optional
- obj-$(CONFIG_PCI)		+= pci.o
- 
-+# LEDs
-+obj-$(CONFIG_LEDS)		+= leds.o
-+
- # Board-specific support
- obj-$(CONFIG_MACH_KS8695)	+= board-micrel.o
---- a/arch/arm/mach-ks8695/devices.c
-+++ b/arch/arm/mach-ks8695/devices.c
-@@ -176,6 +176,27 @@ static void __init ks8695_add_device_wat
- #endif
- 
- 
-+/* --------------------------------------------------------------------
-+ *  LEDs
-+ * -------------------------------------------------------------------- */
-+
-+#if defined(CONFIG_LEDS)
-+short ks8695_leds_cpu = -1;
-+short ks8695_leds_timer = -1;
-+
-+void __init ks8695_init_leds(u8 cpu_led, u8 timer_led)
-+{
-+	/* Enable GPIO to access the LEDs */
-+	gpio_direction_output(cpu_led, 1);
-+	gpio_direction_output(timer_led, 1);
-+
-+	ks8695_leds_cpu   = cpu_led;
-+	ks8695_leds_timer = timer_led;
-+}
-+#else
-+void __init ks8695_init_leds(u8 cpu_led, u8 timer_led) {}
-+#endif
-+
- /* -------------------------------------------------------------------- */
- 
- /*
---- a/arch/arm/mach-ks8695/gpio.c
-+++ b/arch/arm/mach-ks8695/gpio.c
-@@ -136,9 +136,9 @@ int __init_or_module gpio_direction_outp
- 	/* set line state */
- 	x = __raw_readl(KS8695_GPIO_VA + KS8695_IOPD);
- 	if (state)
--		x |= (1 << pin);
-+		x |= IOPD_(pin);
- 	else
--		x &= ~(1 << pin);
-+		x &= ~IOPD_(pin);
- 	__raw_writel(x, KS8695_GPIO_VA + KS8695_IOPD);
- 
- 	/* set pin as output */
-@@ -168,9 +168,9 @@ void gpio_set_value(unsigned int pin, un
- 	/* set output line state */
- 	x = __raw_readl(KS8695_GPIO_VA + KS8695_IOPD);
- 	if (state)
--		x |= (1 << pin);
-+		x |= IOPD_(pin);
- 	else
--		x &= ~(1 << pin);
-+		x &= ~IOPD_(pin);
- 	__raw_writel(x, KS8695_GPIO_VA + KS8695_IOPD);
- 
- 	local_irq_restore(flags);
-@@ -189,7 +189,7 @@ int gpio_get_value(unsigned int pin)
- 		return -EINVAL;
- 
- 	x = __raw_readl(KS8695_GPIO_VA + KS8695_IOPD);
--	return (x & (1 << pin)) != 0;
-+	return (x & IOPD_(pin)) != 0;
- }
- EXPORT_SYMBOL(gpio_get_value);
- 
---- /dev/null
-+++ b/arch/arm/mach-ks8695/leds.c
-@@ -0,0 +1,94 @@
-+/*
-+ * LED driver for KS8695-based boards.
-+ *
-+ * Copyright (C) Andrew Victor
-+ *
-+ * 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.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/init.h>
-+
-+#include <asm/mach-types.h>
-+#include <asm/leds.h>
-+#include <asm/arch/devices.h>
-+#include <asm/arch/gpio.h>
-+
-+
-+static inline void ks8695_led_on(unsigned int led)
-+{
-+	gpio_set_value(led, 0);
-+}
-+
-+static inline void ks8695_led_off(unsigned int led)
-+{
-+	gpio_set_value(led, 1);
-+}
-+
-+static inline void ks8695_led_toggle(unsigned int led)
-+{
-+	unsigned long is_off = gpio_get_value(led);
-+	if (is_off)
-+		ks8695_led_on(led);
-+	else
-+		ks8695_led_off(led);
-+}
-+
-+
-+/*
-+ * Handle LED events.
-+ */
-+static void ks8695_leds_event(led_event_t evt)
-+{
-+	unsigned long flags;
-+
-+	local_irq_save(flags);
-+
-+	switch(evt) {
-+	case led_start:		/* System startup */
-+		ks8695_led_on(ks8695_leds_cpu);
-+		break;
-+
-+	case led_stop:		/* System stop / suspend */
-+		ks8695_led_off(ks8695_leds_cpu);
-+		break;
-+
-+#ifdef CONFIG_LEDS_TIMER
-+	case led_timer:		/* Every 50 timer ticks */
-+		ks8695_led_toggle(ks8695_leds_timer);
-+		break;
-+#endif
-+
-+#ifdef CONFIG_LEDS_CPU
-+	case led_idle_start:	/* Entering idle state */
-+		ks8695_led_off(ks8695_leds_cpu);
-+		break;
-+
-+	case led_idle_end:	/* Exit idle state */
-+		ks8695_led_on(ks8695_leds_cpu);
-+		break;
-+#endif
-+
-+	default:
-+		break;
-+	}
-+
-+	local_irq_restore(flags);
-+}
-+
-+
-+static int __init leds_init(void)
-+{
-+	if ((ks8695_leds_timer == -1) || (ks8695_leds_cpu == -1))
-+		return -ENODEV;
-+
-+	leds_event = ks8695_leds_event;
-+
-+	leds_event(led_start);
-+	return 0;
-+}
-+
-+__initcall(leds_init);
---- a/arch/arm/mach-ks8695/pci.c
-+++ b/arch/arm/mach-ks8695/pci.c
-@@ -141,7 +141,7 @@ static struct pci_ops ks8695_pci_ops = {
- 	.write	= ks8695_pci_writeconfig,
- };
- 
--static struct pci_bus *ks8695_pci_scan_bus(int nr, struct pci_sys_data *sys)
-+static struct pci_bus* __init ks8695_pci_scan_bus(int nr, struct pci_sys_data *sys)
- {
- 	return pci_scan_bus(sys->busnr, &ks8695_pci_ops, sys);
- }
---- a/drivers/char/Kconfig
-+++ b/drivers/char/Kconfig
-@@ -1056,5 +1056,21 @@ config DEVPORT
- 
- source "drivers/s390/char/Kconfig"
- 
-+config AT91_SPI
-+	bool "SPI driver (legacy) for AT91RM9200 processors"
-+	depends on ARCH_AT91RM9200
-+	default y
-+	help
-+	  The SPI driver gives access to this serial bus on the AT91RM9200
-+	  processor.
-+
-+config AT91_SPIDEV
-+	bool "SPI device interface (legacy) for AT91RM9200 processors"
-+	depends on ARCH_AT91RM9200 && AT91_SPI
-+	default n
-+	help
-+	  The SPI driver gives user mode access to this serial
-+	  bus on the AT91RM9200 processor.
-+
- endmenu
- 
---- a/drivers/char/Makefile
-+++ b/drivers/char/Makefile
-@@ -98,6 +98,8 @@ obj-$(CONFIG_GPIO_DEVICE)	+= gpio_dev.o
- obj-$(CONFIG_GPIO_VR41XX)	+= vr41xx_giu.o
- obj-$(CONFIG_GPIO_TB0219)	+= tb0219.o
- obj-$(CONFIG_TELCLOCK)		+= tlclk.o
-+obj-$(CONFIG_AT91_SPI)		+= at91_spi.o
-+obj-$(CONFIG_AT91_SPIDEV)	+= at91_spidev.o
- 
- obj-$(CONFIG_MWAVE)		+= mwave/
- obj-$(CONFIG_AGP)		+= agp/
---- /dev/null
-+++ b/drivers/char/at91_spi.c
-@@ -0,0 +1,337 @@
-+/*
-+ * Serial Peripheral Interface (SPI) driver for the Atmel AT91RM9200 (Thunder)
-+ *
-+ *  Copyright (C) SAN People (Pty) Ltd
-+ *
-+ * 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/init.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/module.h>
-+#include <linux/sched.h>
-+#include <linux/completion.h>
-+#include <linux/interrupt.h>
-+#include <linux/clk.h>
-+#include <linux/platform_device.h>
-+#include <linux/atmel_pdc.h>
-+#include <asm/io.h>
-+#include <asm/semaphore.h>
-+
-+#include <asm/arch/at91_spi.h>
-+#include <asm/arch/board.h>
-+#include <asm/arch/spi.h>
-+
-+#undef DEBUG_SPI
-+
-+static struct spi_local spi_dev[NR_SPI_DEVICES];	/* state of the SPI devices */
-+static int spi_enabled = 0;
-+static struct semaphore spi_lock;			/* protect access to SPI bus */
-+static int current_device = -1;				/* currently selected SPI device */
-+static struct clk *spi_clk;				/* SPI clock */
-+static void __iomem *spi_base;				/* SPI peripheral base-address */
-+
-+DECLARE_COMPLETION(transfer_complete);
-+
-+
-+#define at91_spi_read(reg)		__raw_readl(spi_base + (reg))
-+#define at91_spi_write(reg, val)	__raw_writel((val), spi_base + (reg))
-+
-+
-+/* ......................................................................... */
-+
-+/*
-+ * Access and enable the SPI bus.
-+ * This MUST be called before any transfers are performed.
-+ */
-+void spi_access_bus(short device)
-+{
-+	/* Ensure that requested device is valid */
-+	if ((device < 0) || (device >= NR_SPI_DEVICES))
-+		panic("at91_spi: spi_access_bus called with invalid device");
-+
-+	if (spi_enabled == 0) {
-+		clk_enable(spi_clk);				/* Enable Peripheral clock */
-+		at91_spi_write(AT91_SPI_CR, AT91_SPI_SPIEN);	/* Enable SPI */
-+#ifdef DEBUG_SPI
-+		printk("SPI on\n");
-+#endif
-+	}
-+	spi_enabled++;
-+
-+	/* Lock the SPI bus */
-+	down(&spi_lock);
-+	current_device = device;
-+
-+	/* Configure SPI bus for device */
-+	at91_spi_write(AT91_SPI_MR, AT91_SPI_MSTR | AT91_SPI_MODFDIS | (spi_dev[device].pcs << 16));
-+}
-+
-+/*
-+ * Relinquish control of the SPI bus.
-+ */
-+void spi_release_bus(short device)
-+{
-+	if (device != current_device)
-+		panic("at91_spi: spi_release called with invalid device");
-+
-+	/* Release the SPI bus */
-+	current_device = -1;
-+	up(&spi_lock);
-+
-+	spi_enabled--;
-+	if (spi_enabled == 0) {
-+		at91_spi_write(AT91_SPI_CR, AT91_SPI_SPIDIS);	/* Disable SPI */
-+		clk_disable(spi_clk);				/* Disable Peripheral clock */
-+#ifdef DEBUG_SPI
-+		printk("SPI off\n");
-+#endif
-+	}
-+}
-+
-+/*
-+ * Perform a data transfer over the SPI bus
-+ */
-+int spi_transfer(struct spi_transfer_list* list)
-+{
-+	struct spi_local *device = (struct spi_local *) &spi_dev[current_device];
-+	int tx_size;
-+
-+	if (!list)
-+		panic("at91_spi: spi_transfer called with NULL transfer list");
-+	if (current_device == -1)
-+		panic("at91_spi: spi_transfer called without acquiring bus");
-+
-+#ifdef DEBUG_SPI
-+	printk("SPI transfer start [%i]\n", list->nr_transfers);
-+#endif
-+
-+	/* If we are in 16-bit mode, we need to modify what we pass to the PDC */
-+	tx_size = (at91_spi_read(AT91_SPI_CSR(current_device)) & AT91_SPI_BITS_16) ? 2 : 1;
-+
-+	/* Store transfer list */
-+	device->xfers = list;
-+	list->curr = 0;
-+
-+	/* Assume there must be at least one transfer */
-+	device->tx = dma_map_single(NULL, list->tx[0], list->txlen[0], DMA_TO_DEVICE);
-+	device->rx = dma_map_single(NULL, list->rx[0], list->rxlen[0], DMA_FROM_DEVICE);
-+
-+	/* Program PDC registers */
-+	at91_spi_write(ATMEL_PDC_TPR, device->tx);
-+	at91_spi_write(ATMEL_PDC_RPR, device->rx);
-+	at91_spi_write(ATMEL_PDC_TCR, list->txlen[0] / tx_size);
-+	at91_spi_write(ATMEL_PDC_RCR, list->rxlen[0] / tx_size);
-+
-+	/* Is there a second transfer? */
-+	if (list->nr_transfers > 1) {
-+		device->txnext = dma_map_single(NULL, list->tx[1], list->txlen[1], DMA_TO_DEVICE);
-+		device->rxnext = dma_map_single(NULL, list->rx[1], list->rxlen[1], DMA_FROM_DEVICE);
-+
-+		/* Program Next PDC registers */
-+		at91_spi_write(ATMEL_PDC_TNPR, device->txnext);
-+		at91_spi_write(ATMEL_PDC_RNPR, device->rxnext);
-+		at91_spi_write(ATMEL_PDC_TNCR, list->txlen[1] / tx_size);
-+		at91_spi_write(ATMEL_PDC_RNCR, list->rxlen[1] / tx_size);
-+	}
-+	else {
-+		device->txnext = 0;
-+		device->rxnext = 0;
-+		at91_spi_write(ATMEL_PDC_TNCR, 0);
-+		at91_spi_write(ATMEL_PDC_RNCR, 0);
-+	}
-+
-+	// TODO: If we are doing consecutive transfers (at high speed, or
-+	//   small buffers), then it might be worth modifying the 'Delay between
-+	//   Consecutive Transfers' in the CSR registers.
-+	//   This is an issue if we cannot chain the next buffer fast enough
-+	//   in the interrupt handler.
-+
-+	/* Enable transmitter and receiver */
-+	at91_spi_write(ATMEL_PDC_PTCR, ATMEL_PDC_RXTEN | ATMEL_PDC_TXTEN);
-+
-+	at91_spi_write(AT91_SPI_IER, AT91_SPI_ENDRX);		/* enable buffer complete interrupt */
-+	wait_for_completion(&transfer_complete);
-+
-+#ifdef DEBUG_SPI
-+	printk("SPI transfer end\n");
-+#endif
-+
-+	return 0;
-+}
-+
-+/* ......................................................................... */
-+
-+/*
-+ * Handle interrupts from the SPI controller.
-+ */
-+static irqreturn_t at91spi_interrupt(int irq, void *dev_id)
-+{
-+	unsigned int status;
-+	struct spi_local *device = (struct spi_local *) &spi_dev[current_device];
-+	struct spi_transfer_list *list = device->xfers;
-+
-+#ifdef DEBUG_SPI
-+	printk("SPI interrupt %i\n", current_device);
-+#endif
-+
-+	if (!list)
-+		panic("at91_spi: spi_interrupt with a NULL transfer list");
-+
-+		status = at91_spi_read(AT91_SPI_SR) & at91_spi_read(AT91_SPI_IMR);	/* read status */
-+
-+	dma_unmap_single(NULL, device->tx, list->txlen[list->curr], DMA_TO_DEVICE);
-+	dma_unmap_single(NULL, device->rx, list->rxlen[list->curr], DMA_FROM_DEVICE);
-+
-+	device->tx = device->txnext;	/* move next transfer to current transfer */
-+	device->rx = device->rxnext;
-+
-+	list->curr = list->curr + 1;
-+	if (list->curr == list->nr_transfers) {		/* all transfers complete */
-+		at91_spi_write(AT91_SPI_IDR, AT91_SPI_ENDRX);		/* disable interrupt */
-+
-+		/* Disable transmitter and receiver */
-+		at91_spi_write(ATMEL_PDC_PTCR, ATMEL_PDC_RXTDIS | ATMEL_PDC_TXTDIS);
-+
-+		device->xfers = NULL;
-+		complete(&transfer_complete);
-+	}
-+	else if (list->curr+1 == list->nr_transfers) {	/* no more next transfers */
-+		device->txnext = 0;
-+		device->rxnext = 0;
-+		at91_spi_write(ATMEL_PDC_TNCR, 0);
-+		at91_spi_write(ATMEL_PDC_RNCR, 0);
-+	}
-+	else {
-+		int i = (list->curr)+1;
-+
-+		/* If we are in 16-bit mode, we need to modify what we pass to the PDC */
-+		int tx_size = (at91_spi_read(AT91_SPI_CSR(current_device)) & AT91_SPI_BITS_16) ? 2 : 1;
-+
-+		device->txnext = dma_map_single(NULL, list->tx[i], list->txlen[i], DMA_TO_DEVICE);
-+		device->rxnext = dma_map_single(NULL, list->rx[i], list->rxlen[i], DMA_FROM_DEVICE);
-+		at91_spi_write(ATMEL_PDC_TNPR, device->txnext);
-+		at91_spi_write(ATMEL_PDC_RNPR, device->rxnext);
-+		at91_spi_write(ATMEL_PDC_TNCR, list->txlen[i] / tx_size);
-+		at91_spi_write(ATMEL_PDC_RNCR, list->rxlen[i] / tx_size);
-+	}
-+	return IRQ_HANDLED;
-+}
-+
-+/* ......................................................................... */
-+
-+/*
-+ * Initialize the SPI controller
-+ */
-+static int __init at91spi_probe(struct platform_device *pdev)
-+{
-+	int i;
-+	unsigned long scbr;
-+	struct resource *res;
-+
-+	init_MUTEX(&spi_lock);
-+
-+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if (!res)
-+		return -ENXIO;
-+
-+	if (!request_mem_region(res->start, res->end - res->start + 1, "at91_spi"))
-+		return -EBUSY;
-+
-+	spi_base = ioremap(res->start, res->end - res->start + 1);
-+	if (!spi_base) {
-+		release_mem_region(res->start, res->end - res->start + 1);
-+		return -ENOMEM;
-+	}
-+
-+	spi_clk = clk_get(NULL, "spi_clk");
-+	if (IS_ERR(spi_clk)) {
-+		printk(KERN_ERR "at91_spi: no clock defined\n");
-+		iounmap(spi_base);
-+		release_mem_region(res->start, res->end - res->start + 1);
-+		return -ENODEV;
-+	}
-+
-+	at91_spi_write(AT91_SPI_CR, AT91_SPI_SWRST);	/* software reset of SPI controller */
-+
-+	/*
-+	 * Calculate the correct SPI baud-rate divisor.
-+	 */
-+	scbr = clk_get_rate(spi_clk) / (2 * DEFAULT_SPI_CLK);
-+	scbr = scbr + 1;		/* round up */
-+
-+	printk(KERN_INFO "at91_spi: Baud rate set to %ld\n", clk_get_rate(spi_clk) / (2 * scbr));
-+
-+	/* Set Chip Select registers to good defaults */
-+	for (i = 0; i < 4; i++) {
-+		at91_spi_write(AT91_SPI_CSR(i), AT91_SPI_CPOL | AT91_SPI_BITS_8 | (16 << 16) | (scbr << 8));
-+	}
-+
-+	at91_spi_write(ATMEL_PDC_PTCR, ATMEL_PDC_RXTDIS | ATMEL_PDC_TXTDIS);
-+
-+	memset(&spi_dev, 0, sizeof(spi_dev));
-+	spi_dev[0].pcs = 0xE;
-+	spi_dev[1].pcs = 0xD;
-+	spi_dev[2].pcs = 0xB;
-+	spi_dev[3].pcs = 0x7;
-+
-+	if (request_irq(AT91RM9200_ID_SPI, at91spi_interrupt, 0, "spi", NULL)) {
-+		clk_put(spi_clk);
-+		iounmap(spi_base);
-+		release_mem_region(res->start, res->end - res->start + 1);
-+		return -EBUSY;
-+	}
-+
-+	at91_spi_write(AT91_SPI_CR, AT91_SPI_SPIEN);		/* Enable SPI */
-+
-+	return 0;
-+}
-+
-+static int __devexit at91spi_remove(struct platform_device *pdev)
-+{
-+	struct resource *res;
-+
-+	at91_spi_write(AT91_SPI_CR, AT91_SPI_SPIDIS);		/* Disable SPI */
-+	clk_put(spi_clk);
-+
-+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	iounmap(spi_base);
-+	release_mem_region(res->start, res->end - res->start + 1);
-+
-+	free_irq(AT91RM9200_ID_SPI, 0);
-+	return 0;
-+}
-+
-+static struct platform_driver at91spi_driver = {
-+	.probe		= at91spi_probe,
-+	.remove		= __devexit_p(at91spi_remove),
-+	.driver		= {
-+		.name	= "at91_spi",
-+		.owner	= THIS_MODULE,
-+	},
-+};
-+
-+static int __init at91spi_init(void)
-+{
-+	return platform_driver_register(&at91spi_driver);
-+}
-+
-+static void __exit at91spi_exit(void)
-+{
-+	platform_driver_unregister(&at91spi_driver);
-+}
-+
-+EXPORT_SYMBOL(spi_access_bus);
-+EXPORT_SYMBOL(spi_release_bus);
-+EXPORT_SYMBOL(spi_transfer);
-+
-+module_init(at91spi_init);
-+module_exit(at91spi_exit);
-+
-+MODULE_LICENSE("GPL")
-+MODULE_AUTHOR("Andrew Victor")
-+MODULE_DESCRIPTION("SPI driver for Atmel AT91RM9200")
-+MODULE_ALIAS("platform:at91_spi");
---- /dev/null
-+++ b/drivers/char/at91_spidev.c
-@@ -0,0 +1,233 @@
-+/*
-+ * User-space interface to the SPI bus on Atmel AT91RM9200
-+ *
-+ *  Copyright (C) 2003 SAN People (Pty) Ltd
-+ *
-+ * Based on SPI driver by Rick Bronson
-+ *
-+ * 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/init.h>
-+#include <linux/slab.h>
-+#include <linux/highmem.h>
-+#include <linux/pagemap.h>
-+#include <asm/arch/spi.h>
-+
-+#ifdef CONFIG_DEVFS_FS
-+#include <linux/devfs_fs_kernel.h>
-+#endif
-+
-+
-+#undef DEBUG_SPIDEV
-+
-+/* ......................................................................... */
-+
-+/*
-+ * Read or Write to SPI bus.
-+ */
-+static ssize_t spidev_rd_wr(struct file *file, char *buf, size_t count, loff_t *offset)
-+{
-+	unsigned int spi_device = (unsigned int) file->private_data;
-+
-+	struct mm_struct * mm;
-+	struct page ** maplist;
-+	struct spi_transfer_list* list;
-+	int    pgcount;
-+
-+	unsigned int ofs, pagelen;
-+	int res, i, err;
-+
-+	if (!count) {
-+		return 0;
-+	}
-+
-+	list = kmalloc(sizeof(struct spi_transfer_list), GFP_KERNEL);
-+	if (!list) {
-+		return -ENOMEM;
-+	}
-+
-+	mm = current->mm;
-+
-+	pgcount = ((unsigned long)buf+count+PAGE_SIZE-1)/PAGE_SIZE - (unsigned long)buf/PAGE_SIZE;
-+
-+	if (pgcount >= MAX_SPI_TRANSFERS) {
-+		kfree(list);
-+		return -EFBIG;
-+	}
-+
-+	maplist = kmalloc (pgcount * sizeof (struct page *), GFP_KERNEL);
-+
-+	if (!maplist) {
-+		kfree(list);
-+		return -ENOMEM;
-+	}
-+	flush_cache_all();
-+	down_read(&mm->mmap_sem);
-+	err= get_user_pages(current, mm, (unsigned long)buf, pgcount, 1, 0, maplist, NULL);
-+	up_read(&mm->mmap_sem);
-+
-+	if (err < 0) {
-+		kfree(list);
-+		kfree(maplist);
-+		return err;
-+	}
-+	pgcount = err;
-+
-+#ifdef DEBUG_SPIDEV
-+	printk("spidev_rd_rw: %i %i\n", count, pgcount);
-+#endif
-+
-+	/* Set default return value = transfer length */
-+	res = count;
-+
-+	/*
-+	 * At this point, the virtual area buf[0] .. buf[count-1] will have
-+	 * corresponding pages mapped in the physical memory and locked until
-+	 * we unmap the kiobuf.  The pages cannot be swapped out or moved
-+	 * around.
-+	 */
-+	ofs = (unsigned long) buf & (PAGE_SIZE -1);
-+	pagelen = PAGE_SIZE - ofs;
-+	if (count < pagelen)
-+		pagelen = count;
-+
-+	for (i = 0; i < pgcount; i++) {
-+		flush_dcache_page(maplist[i]);
-+
-+		list->tx[i] = list->rx[i] = page_address(maplist[i]) + ofs;
-+		list->txlen[i] = list->rxlen[i] = pagelen;
-+
-+#ifdef DEBUG_SPIDEV
-+		printk("  %i: %x  (%i)\n", i, list->tx[i], list->txlen[i]);
-+#endif
-+
-+		ofs = 0;	/* all subsequent transfers start at beginning of a page */
-+		count = count - pagelen;
-+		pagelen = (count < PAGE_SIZE) ? count : PAGE_SIZE;
-+	}
-+	list->nr_transfers = pgcount;
-+
-+	/* Perform transfer on SPI bus */
-+	spi_access_bus(spi_device);
-+	spi_transfer(list);
-+	spi_release_bus(spi_device);
-+
-+	while (pgcount--) {
-+		page_cache_release (maplist[pgcount]);
-+	}
-+	flush_cache_all();
-+
-+	kfree(maplist);
-+	kfree(list);
-+
-+	return res;
-+}
-+
-+static int spidev_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
-+{
-+	int spi_device = MINOR(inode->i_rdev);
-+
-+	if (spi_device >= NR_SPI_DEVICES)
-+		return -ENODEV;
-+
-+	// TODO: This interface can be used to configure the SPI bus.
-+	// Configurable options could include: Speed, Clock Polarity, Clock Phase
-+
-+	switch(cmd) {
-+		default:
-+			return -ENOIOCTLCMD;
-+	}
-+}
-+
-+/*
-+ * Open the SPI device
-+ */
-+static int spidev_open(struct inode *inode, struct file *file)
-+{
-+	unsigned int spi_device = MINOR(inode->i_rdev);
-+
-+	if (spi_device >= NR_SPI_DEVICES)
-+		return -ENODEV;
-+
-+	/*
-+	 * 'private_data' is actually a pointer, but we overload it with the
-+	 * value we want to store.
-+	 */
-+	file->private_data = (void *)spi_device;
-+
-+	return 0;
-+}
-+
-+/*
-+ * Close the SPI device
-+ */
-+static int spidev_close(struct inode *inode, struct file *file)
-+{
-+	return 0;
-+}
-+
-+/* ......................................................................... */
-+
-+static struct file_operations spidev_fops = {
-+	.owner		= THIS_MODULE,
-+	.llseek		= no_llseek,
-+	.read		= spidev_rd_wr,
-+	.write		= (int (*) (struct file *file, const char *buf, size_t count, loff_t *offset))spidev_rd_wr,
-+	.ioctl		= spidev_ioctl,
-+	.open		= spidev_open,
-+	.release	= spidev_close,
-+};
-+
-+/*
-+ * Install the SPI /dev interface driver
-+ */
-+static int __init at91_spidev_init(void)
-+{
-+#ifdef CONFIG_DEVFS_FS
-+	int i;
-+#endif
-+
-+	if (register_chrdev(SPI_MAJOR, "spi", &spidev_fops)) {
-+		printk(KERN_ERR "at91_spidev: Unable to get major %d for SPI bus\n", SPI_MAJOR);
-+		return -EIO;
-+	}
-+
-+#ifdef CONFIG_DEVFS_FS
-+	devfs_mk_dir("spi");
-+	for (i = 0; i < NR_SPI_DEVICES; i++) {
-+		devfs_mk_cdev(MKDEV(SPI_MAJOR, i), S_IFCHR | S_IRUSR | S_IWUSR, "spi/%d",i);
-+	}
-+#endif
-+	printk(KERN_INFO "AT91 SPI driver loaded\n");
-+
-+	return 0;
-+}
-+
-+/*
-+ * Remove the SPI /dev interface driver
-+ */
-+static void __exit at91_spidev_exit(void)
-+{
-+#ifdef CONFIG_DEVFS_FS
-+	int i;
-+	for (i = 0; i < NR_SPI_DEVICES; i++) {
-+		devfs_remove("spi/%d", i);
-+	}
-+
-+	devfs_remove("spi");
-+#endif
-+
-+	unregister_chrdev(SPI_MAJOR, "spi");
-+}
-+
-+module_init(at91_spidev_init);
-+module_exit(at91_spidev_exit);
-+
-+MODULE_LICENSE("GPL")
-+MODULE_AUTHOR("Andrew Victor")
-+MODULE_DESCRIPTION("SPI /dev interface for Atmel AT91RM9200")
---- a/drivers/i2c/busses/Kconfig
-+++ b/drivers/i2c/busses/Kconfig
-@@ -88,6 +88,14 @@ config I2C_AT91
- 	  to support combined I2C messages.  Use the i2c-gpio driver
- 	  unless your system can cope with those limitations.
- 
-+config I2C_AT91_CLOCKRATE
-+	prompt "Atmel AT91 I2C/TWI clock-rate"
-+	depends on I2C_AT91
-+	int
-+	default 100000
-+	help
-+	  Set the AT91 I2C/TWI clock-rate.
-+
- config I2C_AU1550
- 	tristate "Au1550/Au1200 SMBus interface"
- 	depends on SOC_AU1550 || SOC_AU1200
-@@ -626,6 +634,14 @@ config I2C_VOODOO3
- 	  This driver can also be built as a module.  If so, the module
- 	  will be called i2c-voodoo3.
- 
-+config I2C_PCA
-+	tristate "PCA9564"
-+	depends on I2C
-+	select I2C_ALGOPCA
-+	help
-+	  This driver support the Philips PCA 9564 Parallel bus to I2C
-+	  bus controller.
-+
- config I2C_PCA_ISA
- 	tristate "PCA9564 on an ISA bus"
- 	depends on ISA
---- a/drivers/i2c/busses/Makefile
-+++ b/drivers/i2c/busses/Makefile
-@@ -29,6 +29,7 @@ obj-$(CONFIG_I2C_OMAP)		+= i2c-omap.o
- obj-$(CONFIG_I2C_PARPORT)	+= i2c-parport.o
- obj-$(CONFIG_I2C_PARPORT_LIGHT)	+= i2c-parport-light.o
- obj-$(CONFIG_I2C_PASEMI)	+= i2c-pasemi.o
-+obj-$(CONFIG_I2C_PCA)		+= i2c-pca.o
- obj-$(CONFIG_I2C_PCA_ISA)	+= i2c-pca-isa.o
- obj-$(CONFIG_I2C_PIIX4)		+= i2c-piix4.o
- obj-$(CONFIG_I2C_PMCMSP)	+= i2c-pmcmsp.o
---- a/drivers/i2c/busses/i2c-at91.c
-+++ b/drivers/i2c/busses/i2c-at91.c
-@@ -31,8 +31,11 @@
- #include <asm/arch/board.h>
- #include <asm/arch/cpu.h>
- 
--#define TWI_CLOCK		100000		/* Hz. max 400 Kbits/sec */
- 
-+/* Clockrate is configurable - max 400 Kbits/sec */
-+static unsigned int clockrate = CONFIG_I2C_AT91_CLOCKRATE;
-+module_param(clockrate, uint, 0);
-+MODULE_PARM_DESC(clockrate, "The TWI clockrate");
- 
- static struct clk *twi_clk;
- static void __iomem *twi_base;
-@@ -53,7 +56,7 @@ static void __devinit at91_twi_hwinit(vo
- 	at91_twi_write(AT91_TWI_CR, AT91_TWI_MSEN);	/* Set Master mode */
- 
- 	/* Calcuate clock dividers */
--	cdiv = (clk_get_rate(twi_clk) / (2 * TWI_CLOCK)) - 3;
-+	cdiv = (clk_get_rate(twi_clk) / (2 * clockrate)) - 3;
- 	cdiv = cdiv + 1;	/* round up */
- 	ckdiv = 0;
- 	while (cdiv > 255) {
-@@ -61,11 +64,12 @@ static void __devinit at91_twi_hwinit(vo
- 		cdiv = cdiv >> 1;
- 	}
- 
--	if (cpu_is_at91rm9200()) {			/* AT91RM9200 Errata #22 */
--		if (ckdiv > 5) {
--			printk(KERN_ERR "AT91 I2C: Invalid TWI_CLOCK value!\n");
--			ckdiv = 5;
--		}
-+	if (cpu_is_at91rm9200() && (ckdiv > 5)) {	/* AT91RM9200 Errata #22 */
-+		printk(KERN_ERR "AT91 I2C: Invalid TWI clockrate!\n");
-+		ckdiv = 5;
-+	} else if (ckdiv > 7) {
-+		printk(KERN_ERR "AT91 I2C: Invalid TWI clockrate!\n");
-+		ckdiv = 7;
- 	}
- 
- 	at91_twi_write(AT91_TWI_CWGR, (ckdiv << 16) | (cdiv << 8) | cdiv);
---- /dev/null
-+++ b/drivers/i2c/busses/i2c-pca.c
-@@ -0,0 +1,213 @@
-+/*
-+ *  Platform driver for PCA9564 I2C bus controller.
-+ *
-+ *  (C) 2006 Andrew Victor
-+ *
-+ *  Based on i2c-pca-isa.c driver for PCA9564 on ISA boards
-+ *    Copyright (C) 2004 Arcom Control Systems
-+ *
-+ *  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.
-+ *
-+ *  This program is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with this program; if not, write to the Free Software
-+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/moduleparam.h>
-+#include <linux/delay.h>
-+#include <linux/init.h>
-+#include <linux/interrupt.h>
-+#include <linux/wait.h>
-+#include <linux/platform_device.h>
-+
-+#include <linux/i2c.h>
-+#include <linux/i2c-algo-pca.h>
-+
-+#include <asm/io.h>
-+
-+#include "../algos/i2c-algo-pca.h"
-+
-+#define PCA_OWN_ADDRESS		0x55	/* our address for slave mode */
-+#define PCA_CLOCK		I2C_PCA_CON_59kHz
-+
-+//#define REG_SHIFT		2
-+#define REG_SHIFT		0
-+
-+//#define DEBUG_IO
-+
-+#define PCA_IO_SIZE 4
-+
-+static void __iomem *base_addr;
-+static int irq;
-+static wait_queue_head_t pca_wait;
-+
-+static int pca_getown(struct i2c_algo_pca_data *adap)
-+{
-+	return PCA_OWN_ADDRESS;
-+}
-+
-+static int pca_getclock(struct i2c_algo_pca_data *adap)
-+{
-+	return PCA_CLOCK;
-+}
-+
-+static void pca_writebyte(struct i2c_algo_pca_data *adap, int reg, int val)
-+{
-+#ifdef DEBUG_IO
-+	static char *names[] = { "T/O", "DAT", "ADR", "CON" };
-+	printk("*** write %s at %#lx <= %#04x\n", names[reg], (unsigned long) base_addr+reg, val);
-+#endif
-+	udelay(1);
-+	outb(val, base_addr + (reg << REG_SHIFT));
-+}
-+
-+static int pca_readbyte(struct i2c_algo_pca_data *adap, int reg)
-+{
-+	int res;
-+
-+	udelay(1);
-+	res = inb(base_addr + (reg << REG_SHIFT));
-+#ifdef DEBUG_IO
-+	{
-+		static char *names[] = { "STA", "DAT", "ADR", "CON" };
-+		printk("*** read  %s => %#04x\n", names[reg], res);
-+	}
-+#endif
-+	return res;
-+}
-+
-+static int pca_waitforinterrupt(struct i2c_algo_pca_data *adap)
-+{
-+	int ret = 0;
-+
-+	if (irq > -1) {
-+		ret = wait_event_interruptible(pca_wait,
-+				pca_readbyte(adap, I2C_PCA_CON) & I2C_PCA_CON_SI);
-+	} else {
-+		while ((pca_readbyte(adap, I2C_PCA_CON) & I2C_PCA_CON_SI) == 0)
-+			udelay(100);
-+	}
-+	return ret;
-+}
-+
-+static irqreturn_t pca_handler(int this_irq, void *dev_id)
-+{
-+	wake_up_interruptible(&pca_wait);
-+	return IRQ_HANDLED;
-+}
-+
-+static struct i2c_algo_pca_data pca_i2c_data = {
-+	.get_own		= pca_getown,
-+	.get_clock		= pca_getclock,
-+	.write_byte		= pca_writebyte,
-+	.read_byte		= pca_readbyte,
-+	.wait_for_interrupt	= pca_waitforinterrupt,
-+};
-+
-+static struct i2c_adapter pca_i2c_ops = {
-+	.owner          = THIS_MODULE,
-+	.id		= I2C_HW_A_PLAT,
-+	.algo_data	= &pca_i2c_data,
-+	.name		= "PCA9564",
-+	.class		= I2C_CLASS_HWMON,
-+};
-+
-+static int __devinit pca_i2c_probe(struct platform_device *pdev)
-+{
-+	struct resource *res;
-+
-+	init_waitqueue_head(&pca_wait);
-+
-+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if (!res)
-+		return -ENODEV;
-+
-+	if (!request_mem_region(res->start, PCA_IO_SIZE, "PCA9564"))
-+		return -ENXIO;
-+
-+	base_addr = ioremap(res->start, PCA_IO_SIZE);
-+	if (base_addr == NULL)
-+		goto out_region;
-+
-+	irq = platform_get_irq(pdev, 0);
-+	if (irq > -1) {
-+		if (request_irq(irq, pca_handler, 0, "pca9564", NULL) < 0) {
-+			printk(KERN_ERR "i2c-pca: Request irq%d failed\n", irq);
-+			goto out_remap;
-+		}
-+	}
-+
-+	/* set up the driverfs linkage to our parent device */
-+	pca_i2c_ops.dev.parent = &pdev->dev;
-+
-+	if (i2c_pca_add_bus(&pca_i2c_ops) < 0) {
-+		printk(KERN_ERR "i2c-pca: Failed to add i2c bus\n");
-+		goto out_irq;
-+	}
-+
-+	return 0;
-+
-+ out_irq:
-+	if (irq > -1)
-+		free_irq(irq, &pca_i2c_ops);
-+
-+ out_remap:
-+	iounmap(base_addr);
-+
-+ out_region:
-+	release_mem_region(res->start, PCA_IO_SIZE);
-+	return -ENODEV;
-+}
-+
-+static int __devexit pca_i2c_remove(struct platform_device *pdev)
-+{
-+	struct resource *res;
-+
-+	i2c_del_adapter(&pca_i2c_ops);
-+
-+	if (irq > 0)
-+		free_irq(irq, NULL);
-+
-+	iounmap(base_addr);
-+
-+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	release_mem_region(res->start, PCA_IO_SIZE);
-+
-+	return 0;
-+}
-+
-+static struct platform_driver pca_i2c_driver = {
-+	.probe		= pca_i2c_probe,
-+	.remove		= __devexit_p(pca_i2c_remove),
-+	.driver		= {
-+		.name	= "pca9564",
-+		.owner	= THIS_MODULE,
-+	},
-+};
-+
-+static int __init pca_i2c_init(void)
-+{
-+	return platform_driver_register(&pca_i2c_driver);
-+}
-+
-+static void __exit pca_i2c_exit(void)
-+{
-+	platform_driver_unregister(&pca_i2c_driver);
-+}
-+
-+module_init(pca_i2c_init);
-+module_exit(pca_i2c_exit);
-+
-+MODULE_AUTHOR("Andrew Victor");
-+MODULE_DESCRIPTION("PCA9564 platform driver");
-+MODULE_LICENSE("GPL");
---- a/drivers/mmc/host/at91_mci.c
-+++ b/drivers/mmc/host/at91_mci.c
-@@ -659,13 +659,14 @@ static void at91_mci_set_ios(struct mmc_
- 	/* maybe switch power to the card */
- 	if (host->board->vcc_pin) {
- 		switch (ios->power_mode) {
--			case MMC_POWER_OFF:
--				gpio_set_value(host->board->vcc_pin, 0);
--				break;
--			case MMC_POWER_UP:
--			case MMC_POWER_ON:
--				gpio_set_value(host->board->vcc_pin, 1);
--				break;
-+		case MMC_POWER_OFF:
-+			gpio_set_value(host->board->vcc_pin, 0);
-+			break;
-+		case MMC_POWER_UP:
-+			gpio_set_value(host->board->vcc_pin, 1);
-+			break;
-+		default:
-+			break;
- 		}
- 	}
- }
---- a/drivers/mtd/devices/Kconfig
-+++ b/drivers/mtd/devices/Kconfig
-@@ -270,5 +270,17 @@ config MTD_DOCPROBE_55AA
- 	  LinuxBIOS or if you need to recover a DiskOnChip Millennium on which
- 	  you have managed to wipe the first block.
- 
--endmenu
-+config MTD_AT91_DATAFLASH
-+	tristate "AT91RM9200 DataFlash AT45DBxxx (legacy driver)"
-+	depends on MTD && ARCH_AT91RM9200 && AT91_SPI
-+	help
-+	  This enables access to the DataFlash (AT45DBxxx) on the AT91RM9200.
-+	  If you have such a board, say 'Y'.
-+
-+config DATAFLASH_ALWAYS_ADD_DEVICE
-+	bool "Register whole DataFlash device"
-+	depends on MTD_AT91_DATAFLASH
-+	help
-+	  Always add the whole DataFlash device when using MTD partitions.
- 
-+endmenu
---- a/drivers/mtd/devices/Makefile
-+++ b/drivers/mtd/devices/Makefile
-@@ -17,3 +17,4 @@ obj-$(CONFIG_MTD_LART)		+= lart.o
- obj-$(CONFIG_MTD_BLOCK2MTD)	+= block2mtd.o
- obj-$(CONFIG_MTD_DATAFLASH)	+= mtd_dataflash.o
- obj-$(CONFIG_MTD_M25P80)	+= m25p80.o
-+obj-$(CONFIG_MTD_AT91_DATAFLASH)+= at91_dataflash.o
---- /dev/null
-+++ b/drivers/mtd/devices/at91_dataflash.c
-@@ -0,0 +1,673 @@
-+/*
-+ * Atmel DataFlash driver for Atmel AT91RM9200 (Thunder)
-+ *
-+ *  Copyright (C) SAN People (Pty) Ltd
-+ *
-+ * 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/init.h>
-+#include <linux/slab.h>
-+#include <linux/pci.h>
-+#include <linux/mtd/mtd.h>
-+#include <linux/mtd/partitions.h>
-+
-+#include <asm/mach-types.h>
-+
-+#include <asm/arch/spi.h>
-+
-+
-+#undef DEBUG_DATAFLASH
-+
-+#define DATAFLASH_MAX_DEVICES	4	/* max number of dataflash devices */
-+
-+#define OP_READ_CONTINUOUS	0xE8
-+#define OP_READ_PAGE		0xD2
-+#define OP_READ_BUFFER1		0xD4
-+#define OP_READ_BUFFER2		0xD6
-+#define OP_READ_STATUS		0xD7
-+
-+#define OP_ERASE_PAGE		0x81
-+#define OP_ERASE_BLOCK		0x50
-+
-+#define OP_TRANSFER_BUF1	0x53
-+#define OP_TRANSFER_BUF2	0x55
-+#define OP_COMPARE_BUF1		0x60
-+#define OP_COMPARE_BUF2		0x61
-+
-+#define OP_PROGRAM_VIA_BUF1	0x82
-+#define OP_PROGRAM_VIA_BUF2	0x85
-+
-+struct dataflash_local
-+{
-+	int spi;			/* SPI chip-select number */
-+
-+	unsigned int page_size;		/* number of bytes per page */
-+	unsigned short page_offset;	/* page offset in flash address */
-+};
-+
-+
-+/* Detected DataFlash devices */
-+static struct mtd_info* mtd_devices[DATAFLASH_MAX_DEVICES];
-+static int nr_devices = 0;
-+
-+/* ......................................................................... */
-+
-+#ifdef CONFIG_MTD_PARTITIONS
-+
-+static struct mtd_partition static_partitions_2M[] =
-+{
-+	{
-+		.name		= "bootloader",
-+		.offset		= 0,
-+		.size		= 1 * 32 * 8 * 528,	/* 1st sector = 32 blocks * 8 pages * 528 bytes */
-+		.mask_flags	= MTD_WRITEABLE,	/* read-only */
-+	},
-+	{
-+		.name		= "kernel",
-+		.offset		= MTDPART_OFS_NXTBLK,
-+		.size		= 6 * 32 * 8 * 528,	/* 6 sectors */
-+	},
-+	{
-+		.name		= "filesystem",
-+		.offset		= MTDPART_OFS_NXTBLK,
-+		.size		= MTDPART_SIZ_FULL,	/* rest = 9 sectors */
-+	}
-+};
-+
-+static struct mtd_partition static_partitions_4M[] =
-+{
-+	{
-+		.name		= "bootloader",
-+		.offset		= 0,
-+		.size		= 1 * 64 * 8 * 528,	/* 1st sector = 64 blocks * 8 pages * 528 bytes */
-+		.mask_flags	= MTD_WRITEABLE,	/* read-only */
-+	},
-+	{
-+		.name		= "kernel",
-+		.offset		= MTDPART_OFS_NXTBLK,
-+		.size		= 4 * 64 * 8 * 528,	/* 4 sectors */
-+	},
-+	{
-+		.name		= "filesystem",
-+		.offset		= MTDPART_OFS_NXTBLK,
-+		.size		= MTDPART_SIZ_FULL,	/* rest = 11 sectors */
-+	}
-+};
-+
-+#if defined(CONFIG_MACH_KAFA)
-+static struct mtd_partition static_partitions_8M[] =
-+{
-+	{
-+		name:		"romboot",
-+		offset:		0,
-+		size:		16 * 1056,	/* 160 Kb */
-+		mask_flags:	MTD_WRITEABLE,		/* read-only */
-+	},
-+	{
-+		name:		"uboot",
-+		offset:		MTDPART_OFS_APPEND, /* Sperry, NXTBLK is broken */
-+		size:		128 * 1056,		/* 1 MB */
-+	},
-+	{
-+		name:		"kernel",
-+		offset:		MTDPART_OFS_APPEND, /* Sperry, NXTBLK is broken */
-+		size:		1024 * 1056,		/* 1 MB */
-+	},
-+	{
-+		name:		"filesystem",
-+		offset:		MTDPART_OFS_APPEND, /* Sperry, NXTBLK is broken */
-+		size:		MTDPART_SIZ_FULL,
-+	}
-+};
-+
-+#elif defined(CONFIG_MACH_MULTMDP)
-+
-+static struct mtd_partition static_partitions_8M[] =
-+{
-+	{
-+		.name		= "bootloader",
-+		.offset		= 0,
-+		.size		= 12 * 1056,		/* 1st sector = 32 blocks * 8 pages * 1056 bytes */
-+		.mask_flags	= MTD_WRITEABLE,	/* read-only */
-+	},
-+	{
-+		.name		= "configuration",
-+		.offset		= MTDPART_OFS_NXTBLK,
-+		.size		= 20 * 1056,
-+	},
-+	{
-+		.name		= "kernel",
-+		.offset		= MTDPART_OFS_NXTBLK,
-+		.size		= 1520 * 1056,
-+	},
-+	{
-+		.name		= "filesystem",
-+		.offset		= MTDPART_OFS_NXTBLK,
-+		.size		= MTDPART_SIZ_FULL,
-+	}
-+};
-+
-+#else
-+
-+static struct mtd_partition static_partitions_8M[] =
-+{
-+	{
-+		.name		= "bootloader",
-+		.offset		= 0,
-+		.size		= 1 * 32 * 8 * 1056,	/* 1st sector = 32 blocks * 8 pages * 1056 bytes */
-+		.mask_flags	= MTD_WRITEABLE,	/* read-only */
-+	},
-+	{
-+		.name		= "kernel",
-+		.offset		= MTDPART_OFS_NXTBLK,
-+		.size		= 5 * 32 * 8 * 1056,	/* 5 sectors */
-+	},
-+	{
-+		.name		= "filesystem",
-+		.offset		= MTDPART_OFS_NXTBLK,
-+		.size		= MTDPART_SIZ_FULL,	/* rest = 26 sectors */
-+	}
-+};
-+#endif
-+
-+static const char *part_probes[] = { "cmdlinepart", NULL, };
-+
-+#endif
-+
-+/* ......................................................................... */
-+
-+/* Allocate a single SPI transfer descriptor.  We're assuming that if multiple
-+   SPI transfers occur at the same time, spi_access_bus() will serialize them.
-+   If this is not valid, then either (i) each dataflash 'priv' structure
-+   needs it's own transfer descriptor, (ii) we lock this one, or (iii) use
-+   another mechanism.   */
-+static struct spi_transfer_list* spi_transfer_desc;
-+
-+/*
-+ * Perform a SPI transfer to access the DataFlash device.
-+ */
-+static int do_spi_transfer(int nr, char* tx, int tx_len, char* rx, int rx_len,
-+		char* txnext, int txnext_len, char* rxnext, int rxnext_len)
-+{
-+	struct spi_transfer_list* list = spi_transfer_desc;
-+
-+	list->tx[0] = tx;	list->txlen[0] = tx_len;
-+	list->rx[0] = rx;	list->rxlen[0] = rx_len;
-+
-+	list->tx[1] = txnext;	list->txlen[1] = txnext_len;
-+	list->rx[1] = rxnext;	list->rxlen[1] = rxnext_len;
-+
-+	list->nr_transfers = nr;
-+
-+	return spi_transfer(list);
-+}
-+
-+/* ......................................................................... */
-+
-+/*
-+ * Poll the DataFlash device until it is READY.
-+ */
-+static void at91_dataflash_waitready(void)
-+{
-+	char* command = kmalloc(2, GFP_KERNEL);
-+
-+	if (!command)
-+		return;
-+
-+	do {
-+		command[0] = OP_READ_STATUS;
-+		command[1] = 0;
-+
-+		do_spi_transfer(1, command, 2, command, 2, NULL, 0, NULL, 0);
-+	} while ((command[1] & 0x80) == 0);
-+
-+	kfree(command);
-+}
-+
-+/*
-+ * Return the status of the DataFlash device.
-+ */
-+static unsigned short at91_dataflash_status(void)
-+{
-+	unsigned short status;
-+	char* command = kmalloc(2, GFP_KERNEL);
-+
-+	if (!command)
-+		return 0;
-+
-+	command[0] = OP_READ_STATUS;
-+	command[1] = 0;
-+
-+	do_spi_transfer(1, command, 2, command, 2, NULL, 0, NULL, 0);
-+	status = command[1];
-+
-+	kfree(command);
-+	return status;
-+}
-+
-+/* ......................................................................... */
-+
-+/*
-+ * Erase blocks of flash.
-+ */
-+static int at91_dataflash_erase(struct mtd_info *mtd, struct erase_info *instr)
-+{
-+	struct dataflash_local *priv = (struct dataflash_local *) mtd->priv;
-+	unsigned int pageaddr;
-+	char* command;
-+
-+#ifdef DEBUG_DATAFLASH
-+	printk("dataflash_erase: addr=%i len=%i\n", instr->addr, instr->len);
-+#endif
-+
-+	/* Sanity checks */
-+	if (instr->addr + instr->len > mtd->size)
-+		return -EINVAL;
-+	if ((instr->len % mtd->erasesize != 0) || (instr->len % priv->page_size != 0))
-+		return -EINVAL;
-+	if ((instr->addr % priv->page_size) != 0)
-+		return -EINVAL;
-+
-+	command = kmalloc(4, GFP_KERNEL);
-+	if (!command)
-+		return -ENOMEM;
-+
-+	while (instr->len > 0) {
-+		/* Calculate flash page address */
-+		pageaddr = (instr->addr / priv->page_size) << priv->page_offset;
-+
-+		command[0] = OP_ERASE_PAGE;
-+		command[1] = (pageaddr & 0x00FF0000) >> 16;
-+		command[2] = (pageaddr & 0x0000FF00) >> 8;
-+		command[3] = 0;
-+#ifdef DEBUG_DATAFLASH
-+		printk("ERASE: (%x) %x %x %x [%i]\n", command[0], command[1], command[2], command[3], pageaddr);
-+#endif
-+
-+		/* Send command to SPI device */
-+		spi_access_bus(priv->spi);
-+		do_spi_transfer(1, command, 4, command, 4, NULL, 0, NULL, 0);
-+
-+		at91_dataflash_waitready();		/* poll status until ready */
-+		spi_release_bus(priv->spi);
-+
-+		instr->addr += priv->page_size;		/* next page */
-+		instr->len -= priv->page_size;
-+	}
-+
-+	kfree(command);
-+
-+	/* Inform MTD subsystem that erase is complete */
-+	instr->state = MTD_ERASE_DONE;
-+	if (instr->callback)
-+		instr->callback(instr);
-+
-+	return 0;
-+}
-+
-+/*
-+ * Read from the DataFlash device.
-+ *   from   : Start offset in flash device
-+ *   len    : Amount to read
-+ *   retlen : About of data actually read
-+ *   buf    : Buffer containing the data
-+ */
-+static int at91_dataflash_read(struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf)
-+{
-+	struct dataflash_local *priv = (struct dataflash_local *) mtd->priv;
-+	unsigned int addr;
-+	char* command;
-+
-+#ifdef DEBUG_DATAFLASH
-+	printk("dataflash_read: %lli .. %lli\n", from, from+len);
-+#endif
-+
-+	*retlen = 0;
-+
-+	/* Sanity checks */
-+	if (!len)
-+		return 0;
-+	if (from + len > mtd->size)
-+		return -EINVAL;
-+
-+	/* Calculate flash page/byte address */
-+	addr = (((unsigned)from / priv->page_size) << priv->page_offset) + ((unsigned)from % priv->page_size);
-+
-+	command = kmalloc(8, GFP_KERNEL);
-+	if (!command)
-+		return -ENOMEM;
-+
-+	command[0] = OP_READ_CONTINUOUS;
-+	command[1] = (addr & 0x00FF0000) >> 16;
-+	command[2] = (addr & 0x0000FF00) >> 8;
-+	command[3] = (addr & 0x000000FF);
-+#ifdef DEBUG_DATAFLASH
-+	printk("READ: (%x) %x %x %x\n", command[0], command[1], command[2], command[3]);
-+#endif
-+
-+	/* Send command to SPI device */
-+	spi_access_bus(priv->spi);
-+	do_spi_transfer(2, command, 8, command, 8, buf, len, buf, len);
-+	spi_release_bus(priv->spi);
-+
-+	*retlen = len;
-+	kfree(command);
-+	return 0;
-+}
-+
-+/*
-+ * Write to the DataFlash device.
-+ *   to     : Start offset in flash device
-+ *   len    : Amount to write
-+ *   retlen : Amount of data actually written
-+ *   buf    : Buffer containing the data
-+ */
-+static int at91_dataflash_write(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf)
-+{
-+	struct dataflash_local *priv = (struct dataflash_local *) mtd->priv;
-+	unsigned int pageaddr, addr, offset, writelen;
-+	size_t remaining;
-+	u_char *writebuf;
-+	unsigned short status;
-+	int res = 0;
-+	char* command;
-+	char* tmpbuf = NULL;
-+
-+#ifdef DEBUG_DATAFLASH
-+	printk("dataflash_write: %lli .. %lli\n", to, to+len);
-+#endif
-+
-+	*retlen = 0;
-+
-+	/* Sanity checks */
-+	if (!len)
-+		return 0;
-+	if (to + len > mtd->size)
-+		return -EINVAL;
-+
-+	command = kmalloc(4, GFP_KERNEL);
-+	if (!command)
-+		return -ENOMEM;
-+
-+	pageaddr = ((unsigned)to / priv->page_size);
-+	offset = ((unsigned)to % priv->page_size);
-+	if (offset + len > priv->page_size)
-+		writelen = priv->page_size - offset;
-+	else
-+		writelen = len;
-+	writebuf = (u_char *)buf;
-+	remaining = len;
-+
-+	/* Allocate temporary buffer */
-+	tmpbuf = kmalloc(priv->page_size, GFP_KERNEL);
-+	if (!tmpbuf) {
-+		kfree(command);
-+		return -ENOMEM;
-+	}
-+
-+	/* Gain access to the SPI bus */
-+	spi_access_bus(priv->spi);
-+
-+	while (remaining > 0) {
-+#ifdef DEBUG_DATAFLASH
-+		printk("write @ %i:%i len=%i\n", pageaddr, offset, writelen);
-+#endif
-+
-+		/* (1) Transfer to Buffer1 */
-+		if (writelen != priv->page_size) {
-+			addr = pageaddr << priv->page_offset;
-+			command[0] = OP_TRANSFER_BUF1;
-+			command[1] = (addr & 0x00FF0000) >> 16;
-+			command[2] = (addr & 0x0000FF00) >> 8;
-+			command[3] = 0;
-+#ifdef DEBUG_DATAFLASH
-+			printk("TRANSFER: (%x) %x %x %x\n", command[0], command[1], command[2], command[3]);
-+#endif
-+			do_spi_transfer(1, command, 4, command, 4, NULL, 0, NULL, 0);
-+			at91_dataflash_waitready();
-+		}
-+
-+		/* (2) Program via Buffer1 */
-+		addr = (pageaddr << priv->page_offset) + offset;
-+		command[0] = OP_PROGRAM_VIA_BUF1;
-+		command[1] = (addr & 0x00FF0000) >> 16;
-+		command[2] = (addr & 0x0000FF00) >> 8;
-+		command[3] = (addr & 0x000000FF);
-+#ifdef DEBUG_DATAFLASH
-+		printk("PROGRAM: (%x) %x %x %x\n", command[0], command[1], command[2], command[3]);
-+#endif
-+		do_spi_transfer(2, command, 4, command, 4, writebuf, writelen, tmpbuf, writelen);
-+		at91_dataflash_waitready();
-+
-+		/* (3) Compare to Buffer1 */
-+		addr = pageaddr << priv->page_offset;
-+		command[0] = OP_COMPARE_BUF1;
-+		command[1] = (addr & 0x00FF0000) >> 16;
-+		command[2] = (addr & 0x0000FF00) >> 8;
-+		command[3] = 0;
-+#ifdef DEBUG_DATAFLASH
-+		printk("COMPARE: (%x) %x %x %x\n", command[0], command[1], command[2], command[3]);
-+#endif
-+		do_spi_transfer(1, command, 4, command, 4, NULL, 0, NULL, 0);
-+		at91_dataflash_waitready();
-+
-+		/* Get result of the compare operation */
-+		status = at91_dataflash_status();
-+		if (status & 0x40) {
-+			printk("at91_dataflash: Write error on page %i\n", pageaddr);
-+			remaining = 0;
-+			writelen = 0;
-+			res = -EIO;
-+		}
-+
-+		remaining = remaining - writelen;
-+		pageaddr++;
-+		offset = 0;
-+		writebuf += writelen;
-+		*retlen += writelen;
-+
-+		if (remaining > priv->page_size)
-+			writelen = priv->page_size;
-+		else
-+			writelen = remaining;
-+	}
-+
-+	/* Release SPI bus */
-+	spi_release_bus(priv->spi);
-+
-+	kfree(tmpbuf);
-+	kfree(command);
-+	return res;
-+}
-+
-+/* ......................................................................... */
-+
-+/*
-+ * Initialize and register DataFlash device with MTD subsystem.
-+ */
-+static int __init add_dataflash(int channel, char *name, int IDsize,
-+		int nr_pages, int pagesize, int pageoffset)
-+{
-+	struct mtd_info *device;
-+	struct dataflash_local *priv;
-+#ifdef CONFIG_MTD_PARTITIONS
-+	struct mtd_partition *mtd_parts = 0;
-+	int mtd_parts_nr = 0;
-+#endif
-+
-+	if (nr_devices >= DATAFLASH_MAX_DEVICES) {
-+		printk(KERN_ERR "at91_dataflash: Too many devices detected\n");
-+		return 0;
-+	}
-+
-+	device = kmalloc(sizeof(struct mtd_info) + strlen(name) + 8, GFP_KERNEL);
-+	if (!device)
-+		return -ENOMEM;
-+	memset(device, 0, sizeof(struct mtd_info));
-+
-+	device->name = (char *)&device[1];
-+	sprintf(device->name, "%s.spi%d", name, channel);
-+	device->size = nr_pages * pagesize;
-+	device->erasesize = pagesize;
-+	device->writesize = pagesize;
-+	device->owner = THIS_MODULE;
-+	device->type = MTD_DATAFLASH;
-+	device->flags = MTD_WRITEABLE;
-+	device->erase = at91_dataflash_erase;
-+	device->read = at91_dataflash_read;
-+	device->write = at91_dataflash_write;
-+
-+	priv = (struct dataflash_local *) kmalloc(sizeof(struct dataflash_local), GFP_KERNEL);
-+	if (!priv) {
-+		kfree(device);
-+		return -ENOMEM;
-+	}
-+	memset(priv, 0, sizeof(struct dataflash_local));
-+
-+	priv->spi = channel;
-+	priv->page_size = pagesize;
-+	priv->page_offset = pageoffset;
-+	device->priv = priv;
-+
-+	mtd_devices[nr_devices] = device;
-+	nr_devices++;
-+	printk("at91_dataflash: %s detected [spi%i] (%i bytes)\n", name, channel, device->size);
-+
-+#ifdef CONFIG_MTD_PARTITIONS
-+#ifdef CONFIG_MTD_CMDLINE_PARTS
-+	mtd_parts_nr = parse_mtd_partitions(device, part_probes, &mtd_parts, 0);
-+#endif
-+	if (mtd_parts_nr <= 0) {
-+		switch (IDsize) {
-+			case SZ_2M:
-+				mtd_parts = static_partitions_2M;
-+				mtd_parts_nr = ARRAY_SIZE(static_partitions_2M);
-+				break;
-+			case SZ_4M:
-+				mtd_parts = static_partitions_4M;
-+				mtd_parts_nr = ARRAY_SIZE(static_partitions_4M);
-+				break;
-+			case SZ_8M:
-+				mtd_parts = static_partitions_8M;
-+				mtd_parts_nr = ARRAY_SIZE(static_partitions_8M);
-+				break;
-+		}
-+	}
-+
-+	if (mtd_parts_nr > 0) {
-+#ifdef CONFIG_DATAFLASH_ALWAYS_ADD_DEVICE
-+		add_mtd_device(device);
-+#endif
-+		return add_mtd_partitions(device, mtd_parts, mtd_parts_nr);
-+	}
-+#endif
-+	return add_mtd_device(device);		/* add whole device */
-+}
-+
-+/*
-+ * Detect and initialize DataFlash device connected to specified SPI channel.
-+ *
-+ *   Device            Density         ID code                 Nr Pages        Page Size       Page offset
-+ *   AT45DB011B        1Mbit   (128K)  xx0011xx (0x0c)         512             264             9
-+ *   AT45DB021B        2Mbit   (256K)  xx0101xx (0x14)         1025            264             9
-+ *   AT45DB041B        4Mbit   (512K)  xx0111xx (0x1c)         2048            264             9
-+ *   AT45DB081B        8Mbit   (1M)    xx1001xx (0x24)         4096            264             9
-+ *   AT45DB0161B       16Mbit  (2M)    xx1011xx (0x2c)         4096            528             10
-+ *   AT45DB0321B       32Mbit  (4M)    xx1101xx (0x34)         8192            528             10
-+ *   AT45DB0642        64Mbit  (8M)    xx1111xx (0x3c)         8192            1056            11
-+ *   AT45DB1282        128Mbit (16M)   xx0100xx (0x10)         16384           1056            11
-+ */
-+static int __init at91_dataflash_detect(int channel)
-+{
-+	int res = 0;
-+	unsigned short status;
-+
-+	spi_access_bus(channel);
-+	status = at91_dataflash_status();
-+	spi_release_bus(channel);
-+	if (status != 0xff) {			/* no dataflash device there */
-+		switch (status & 0x3c) {
-+			case 0x0c:	/* 0 0 1 1 */
-+				res = add_dataflash(channel, "AT45DB011B", SZ_128K, 512, 264, 9);
-+				break;
-+			case 0x14:	/* 0 1 0 1 */
-+				res = add_dataflash(channel, "AT45DB021B", SZ_256K, 1025, 264, 9);
-+				break;
-+			case 0x1c:	/* 0 1 1 1 */
-+				res = add_dataflash(channel, "AT45DB041B", SZ_512K, 2048, 264, 9);
-+				break;
-+			case 0x24:	/* 1 0 0 1 */
-+				res = add_dataflash(channel, "AT45DB081B", SZ_1M, 4096, 264, 9);
-+				break;
-+			case 0x2c:	/* 1 0 1 1 */
-+				res = add_dataflash(channel, "AT45DB161B", SZ_2M, 4096, 528, 10);
-+				break;
-+			case 0x34:	/* 1 1 0 1 */
-+				res = add_dataflash(channel, "AT45DB321B", SZ_4M, 8192, 528, 10);
-+				break;
-+			case 0x3c:	/* 1 1 1 1 */
-+				res = add_dataflash(channel, "AT45DB642", SZ_8M, 8192, 1056, 11);
-+				break;
-+// Currently unsupported since Atmel removed the "Main Memory Program via Buffer" commands.
-+//			case 0x10:	/* 0 1 0 0 */
-+//				res = add_dataflash(channel, "AT45DB1282", SZ_16M, 16384, 1056, 11);
-+//				break;
-+			default:
-+				printk(KERN_ERR "at91_dataflash: Unknown device (%x)\n", status & 0x3c);
-+		}
-+	}
-+
-+	return res;
-+}
-+
-+static int __init at91_dataflash_init(void)
-+{
-+	spi_transfer_desc = kmalloc(sizeof(struct spi_transfer_list), GFP_KERNEL);
-+	if (!spi_transfer_desc)
-+		return -ENOMEM;
-+
-+	/* DataFlash (SPI chip select 0) */
-+	at91_dataflash_detect(0);
-+
-+	if (machine_is_sweda_tms())
-+		at91_dataflash_detect(1);	/* DataFlash device (SPI chip select 1) */
-+
-+#ifdef CONFIG_MTD_AT91_DATAFLASH_CARD
-+	/* DataFlash card (SPI chip select 3) */
-+	at91_dataflash_detect(3);
-+#endif
-+
-+	return 0;
-+}
-+
-+static void __exit at91_dataflash_exit(void)
-+{
-+	int i;
-+
-+	for (i = 0; i < DATAFLASH_MAX_DEVICES; i++) {
-+		if (mtd_devices[i]) {
-+#ifdef CONFIG_MTD_PARTITIONS
-+			del_mtd_partitions(mtd_devices[i]);
-+#else
-+			del_mtd_device(mtd_devices[i]);
-+#endif
-+			kfree(mtd_devices[i]->priv);
-+			kfree(mtd_devices[i]);
-+		}
-+	}
-+	nr_devices = 0;
-+	kfree(spi_transfer_desc);
-+}
-+
-+
-+module_init(at91_dataflash_init);
-+module_exit(at91_dataflash_exit);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Andrew Victor");
-+MODULE_DESCRIPTION("DataFlash driver for Atmel AT91RM9200");
---- a/drivers/mtd/nand/Kconfig
-+++ b/drivers/mtd/nand/Kconfig
-@@ -273,12 +273,53 @@ config MTD_NAND_CS553X
- 	  If you say "m", the module will be called "cs553x_nand.ko".
- 
- config MTD_NAND_AT91
--	bool "Support for NAND Flash / SmartMedia on AT91"
-+	tristate "Support for NAND Flash / SmartMedia on AT91"
- 	depends on ARCH_AT91
- 	help
- 	  Enables support for NAND Flash / Smart Media Card interface
- 	  on Atmel AT91 processors.
- 
-+choice
-+	prompt "ECC management for NAND Flash / SmartMedia on AT91"
-+	depends on MTD_NAND_AT91
-+
-+config MTD_NAND_AT91_ECC_SOFT
-+	bool "Software ECC"
-+	depends on MTD_NAND_AT91
-+	help
-+	  Uses software ECC.
-+
-+	  NB : hardware and software ECC schemes are incompatible.
-+	  If you switch from one to another, you'll have to erase your
-+	  mtd partition.
-+
-+config MTD_NAND_AT91_ECC_HW
-+	bool "Hardware ECC"
-+	depends on MTD_NAND_AT91 && (ARCH_AT91SAM9260 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91CAP9)
-+	help
-+	  Uses hardware ECC provided by the AT91 processor
-+	  instead of software ECC.
-+	  The hardware ECC controller is capable of single bit error
-+	  correction and 2-bit random detection per page.
-+
-+	  NB : hardware and software ECC schemes are incompatible.
-+	  If you switch from one to another, you'll have to erase your
-+	  mtd partition.
-+
-+	  If unsure, say Y
-+
-+config MTD_NAND_AT91_ECC_NONE
-+	bool "No ECC (Testing Only)"
-+	depends on MTD_NAND_AT91
-+	help
-+	  No ECC will be used.
-+	  It's not a good idea and it should be reserved for testing
-+	  purpose only.
-+
-+	  If unsure, say N
-+
-+endchoice
-+
- config MTD_NAND_CM_X270
- 	tristate "Support for NAND Flash on CM-X270 modules"
- 	depends on MTD_NAND && MACH_ARMCORE
---- a/drivers/mtd/nand/at91_nand.c
-+++ b/drivers/mtd/nand/at91_nand.c
-@@ -9,6 +9,15 @@
-  *  Derived from drivers/mtd/spia.c
-  *	 Copyright (C) 2000 Steven J. Hill (sjhill@cotw.com)
-  *
-+ *
-+ *  Add Hardware ECC support for AT91SAM9260 / AT91SAM9263
-+ *     Richard Genoud (richard.genoud@gmail.com), Adeneo Copyright (C) 2007
-+ *
-+ *     Derived from Das U-Boot source code
-+ *     		(u-boot-1.1.5/board/atmel/at91sam9263ek/nand.c)
-+ *     (C) Copyright 2006 ATMEL Rousset, Lacressonniere Nicolas
-+ *
-+ *
-  * 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.
-@@ -28,15 +37,75 @@
- #include <asm/hardware.h>
- #include <asm/arch/board.h>
- #include <asm/arch/gpio.h>
-+#include <asm/arch/at91_ecc.h>
-+
-+#ifdef CONFIG_MTD_NAND_AT91_ECC_HW
-+#define hard_ecc	1
-+#else
-+#define hard_ecc	0
-+#endif
-+
-+#ifdef CONFIG_MTD_NAND_AT91_ECC_NONE
-+#define no_ecc		1
-+#else
-+#define no_ecc		0
-+#endif
-+
-+/* Register access macros */
-+#define ecc_readl(base, reg)		__raw_readl(base + reg)
-+#define ecc_writel(base, reg, value)	__raw_writel((value), base + reg)
-+
-+
-+/*
-+ * OOB layout for large page size.
-+ * bad block info is on bytes 0 and 1
-+ * the bytes must be consecutives to avoid several NAND_CMD_RNDOUT during read.
-+ */
-+static struct nand_ecclayout at91_oobinfo_large = {
-+	.eccbytes	= 4,
-+	.eccpos		= {60, 61, 62, 63},
-+	.oobfree	= { {2, 58} },
-+};
-+
-+/*
-+ * OOB layout for small page size
-+ * bad block info is on bytes 4 and 5
-+ * the bytes must be consecutives to avoid several NAND_CMD_RNDOUT during read.
-+ */
-+static struct nand_ecclayout at91_oobinfo_small = {
-+	.eccbytes	= 4,
-+	.eccpos		= {0, 1, 2, 3},
-+	.oobfree	= { {6, 10} },
-+};
- 
- struct at91_nand_host {
- 	struct nand_chip	nand_chip;
- 	struct mtd_info		mtd;
- 	void __iomem		*io_base;
- 	struct at91_nand_data	*board;
-+	struct device		*dev;
-+	void __iomem		*ecc;
- };
- 
- /*
-+ * Enable NAND chip-select.
-+ */
-+static void at91_nand_enable(struct at91_nand_host *host)
-+{
-+	if (host->board->enable_pin)
-+		at91_set_gpio_value(host->board->enable_pin, 0);
-+}
-+
-+/*
-+ * Disable NAND chip-select.
-+ */
-+static void at91_nand_disable(struct at91_nand_host *host)
-+{
-+	if (host->board->enable_pin)
-+		at91_set_gpio_value(host->board->enable_pin, 1);
-+}
-+
-+/*
-  * Hardware specific access to control-lines
-  */
- static void at91_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
-@@ -44,6 +113,13 @@ static void at91_nand_cmd_ctrl(struct mt
- 	struct nand_chip *nand_chip = mtd->priv;
- 	struct at91_nand_host *host = nand_chip->priv;
- 
-+	if (ctrl & NAND_CTRL_CHANGE) {
-+		if (ctrl & NAND_NCE)
-+			at91_nand_enable(host);
-+		else
-+			at91_nand_disable(host);
-+	}
-+
- 	if (cmd == NAND_CMD_NONE)
- 		return;
- 
-@@ -65,27 +141,249 @@ static int at91_nand_device_ready(struct
- }
- 
- /*
-- * Enable NAND.
-+ * write oob for small pages
-  */
--static void at91_nand_enable(struct at91_nand_host *host)
-+static int at91_nand_write_oob_512(struct mtd_info *mtd,
-+		struct nand_chip *chip, int page)
- {
--	if (host->board->enable_pin)
--		at91_set_gpio_value(host->board->enable_pin, 0);
-+	int chunk = chip->ecc.bytes + chip->ecc.prepad + chip->ecc.postpad;
-+	int eccsize = chip->ecc.size, length = mtd->oobsize;
-+	int len, pos, status = 0;
-+	const uint8_t *bufpoi = chip->oob_poi;
-+
-+	pos = eccsize + chunk;
-+
-+	chip->cmdfunc(mtd, NAND_CMD_SEQIN, pos, page);
-+	len = min_t(int, length, chunk);
-+	chip->write_buf(mtd, bufpoi, len);
-+	bufpoi += len;
-+	length -= len;
-+	if (length > 0)
-+		chip->write_buf(mtd, bufpoi, length);
-+
-+	chip->cmdfunc(mtd, NAND_CMD_PAGEPROG, -1, -1);
-+	status = chip->waitfunc(mtd, chip);
-+
-+	return status & NAND_STATUS_FAIL ? -EIO : 0;
-+
- }
- 
- /*
-- * Disable NAND.
-+ * read oob for small pages
-  */
--static void at91_nand_disable(struct at91_nand_host *host)
-+static int at91_nand_read_oob_512(struct mtd_info *mtd,
-+		struct nand_chip *chip,	int page, int sndcmd)
- {
--	if (host->board->enable_pin)
--		at91_set_gpio_value(host->board->enable_pin, 1);
-+	if (sndcmd) {
-+		chip->cmdfunc(mtd, NAND_CMD_READOOB, 0, page);
-+		sndcmd = 0;
-+	}
-+	chip->read_buf(mtd, chip->oob_poi, mtd->oobsize);
-+	return sndcmd;
-+}
-+
-+/*
-+ * Calculate HW ECC
-+ *
-+ * mtd:        MTD block structure
-+ * dat:        raw data (unused)
-+ * ecc_code:   buffer for ECC
-+ */
-+static int at91_nand_calculate(struct mtd_info *mtd,
-+		const u_char *dat, unsigned char *ecc_code)
-+{
-+	struct nand_chip *nand_chip = mtd->priv;
-+	struct at91_nand_host *host = nand_chip->priv;
-+	uint32_t *eccpos = nand_chip->ecc.layout->eccpos;
-+	unsigned int ecc_value;
-+
-+	/* get the first 2 ECC bytes */
-+	ecc_value = ecc_readl(host->ecc, AT91_ECC_PR) & (AT91_ECC_BITADDR | AT91_ECC_WORDADDR);
-+
-+	ecc_code[eccpos[0]] = ecc_value & 0xFF;
-+	ecc_code[eccpos[1]] = (ecc_value >> 8) & 0xFF;
-+
-+	/* get the last 2 ECC bytes */
-+	ecc_value = ecc_readl(host->ecc, AT91_ECC_NPR) & AT91_ECC_NPARITY;
-+
-+	ecc_code[eccpos[2]] = ecc_value & 0xFF;
-+	ecc_code[eccpos[3]] = (ecc_value >> 8) & 0xFF;
-+
-+	return 0;
- }
- 
-+/*
-+ * HW ECC read page function
-+ *
-+ * mtd:        mtd info structure
-+ * chip:       nand chip info structure
-+ * buf:        buffer to store read data
-+ */
-+static int at91_nand_read_page(struct mtd_info *mtd,
-+		struct nand_chip *chip, uint8_t *buf)
-+{
-+	int eccsize = chip->ecc.size;
-+	int eccbytes = chip->ecc.bytes;
-+	uint32_t *eccpos = chip->ecc.layout->eccpos;
-+	uint8_t *p = buf;
-+	uint8_t *oob = chip->oob_poi;
-+	uint8_t *ecc_pos;
-+	int stat;
-+
-+	/* read the page */
-+	chip->read_buf(mtd, p, eccsize);
-+
-+	/* move to ECC position if needed */
-+	if (eccpos[0] != 0) {
-+		/*
-+		 * This only works on large pages because the ECC controller
-+		 * waits for NAND_CMD_RNDOUTSTART after the NAND_CMD_RNDOUT.
-+		 * Anyway, for small pages, the eccpos[0] == 0
-+		 */
-+		chip->cmdfunc(mtd, NAND_CMD_RNDOUT,
-+				mtd->writesize + eccpos[0], -1);
-+	}
-+
-+	/* the ECC controller needs to read the ECC just after the data */
-+	ecc_pos = oob + eccpos[0];
-+	chip->read_buf(mtd, ecc_pos, eccbytes);
-+
-+	/* check if there's an error */
-+	stat = chip->ecc.correct(mtd, p, oob, NULL);
-+
-+	if (stat < 0)
-+		mtd->ecc_stats.failed++;
-+	else
-+		mtd->ecc_stats.corrected += stat;
-+
-+	/* get back to oob start (end of page) */
-+	chip->cmdfunc(mtd, NAND_CMD_RNDOUT, mtd->writesize, -1);
-+
-+	/* read the oob */
-+	chip->read_buf(mtd, oob, mtd->oobsize);
-+
-+	return 0;
-+}
-+
-+/*
-+ * HW ECC Correction
-+ *
-+ * mtd:        MTD block structure
-+ * dat:        raw data read from the chip
-+ * read_ecc:   ECC from the chip (unused)
-+ * isnull:     unused
-+ *
-+ * Detect and correct a 1 bit error for a page
-+ */
-+static int at91_nand_correct(struct mtd_info *mtd, u_char *dat,
-+		u_char *read_ecc, u_char *isnull)
-+{
-+	struct nand_chip *nand_chip = mtd->priv;
-+	struct at91_nand_host *host = nand_chip->priv;
-+	unsigned int ecc_status;
-+	unsigned int ecc_word, ecc_bit;
-+
-+	/* get the status from the Status Register */
-+	ecc_status = ecc_readl(host->ecc, AT91_ECC_SR);
-+
-+	/* if there's no error */
-+	if (likely(!(ecc_status & AT91_ECC_RECERR)))
-+		return 0;
-+
-+	/* get error bit offset (4 bits) */
-+	ecc_bit = ecc_readl(host->ecc, AT91_ECC_PR) & AT91_ECC_BITADDR;
-+	/* get word address (12 bits) */
-+	ecc_word = ecc_readl(host->ecc, AT91_ECC_PR) & AT91_ECC_WORDADDR;
-+	ecc_word >>= 4;
-+
-+	/* if there are multiple errors */
-+	if (ecc_status & AT91_ECC_MULERR) {
-+		/* Check if it is a freshly erased block (filled with 0xff) */
-+		if ((ecc_bit == AT91_ECC_BITADDR)
-+				&& (ecc_word == (AT91_ECC_WORDADDR >> 4))) {
-+			/* the block has just been erased, return OK */
-+			return 0;
-+		}
-+		/*
-+		 * It doesn't seems to be a freshly-erased block.
-+		 * We can't correct so many errors.
-+		 */
-+		dev_dbg(host->dev, "at91_nand : multiple errors detected."
-+				" Unable to correct.\n");
-+		return -EIO;
-+	}
-+
-+	/* if there's a single bit error : we can correct it */
-+	if (ecc_status & AT91_ECC_ECCERR) {
-+		/*
-+		 * There's nothing much to do here.
-+		 * The bit error is on the ECC itself.
-+		 */
-+		dev_dbg(host->dev, "at91_nand : one bit error on ECC code."
-+				" Nothing to correct\n");
-+		return 0;
-+	}
-+
-+	dev_dbg(host->dev, "at91_nand : one bit error on data."
-+			" (word offset in the page :"
-+			" 0x%x bit offset : 0x%x)\n",
-+			ecc_word, ecc_bit);
-+	/* correct the error */
-+	if (nand_chip->options & NAND_BUSWIDTH_16) {
-+		/* 16 bits words */
-+		((unsigned short *) dat)[ecc_word] ^= (1 << ecc_bit);
-+	} else {
-+		/* 8 bits words */
-+		dat[ecc_word] ^= (1 << ecc_bit);
-+	}
-+	dev_dbg(host->dev, "at91_nand : error corrected\n");
-+	return 1;
-+}
-+
-+/*
-+ * Enable HW ECC : unsused
-+ */
-+static void at91_nand_hwctl(struct mtd_info *mtd, int mode) { ; }
-+
-+/*
-+ * Over-ride the standard functions with our optimized versions.
-+ * We can use read/write blocks to move data to/from the controller.
-+ */
-+static void at91_read_buf8(struct mtd_info *mtd, u8 *buf, int len)
-+{
-+	struct nand_chip	*nand_chip = mtd->priv;
-+
-+	__raw_readsb(nand_chip->IO_ADDR_R, buf, len);
-+}
-+
-+static void at91_read_buf16(struct mtd_info *mtd, u8 *buf, int len)
-+{
-+	struct nand_chip	*nand_chip = mtd->priv;
-+
-+	__raw_readsw(nand_chip->IO_ADDR_R, buf, len / 2);
-+}
-+
-+static void at91_write_buf8(struct mtd_info *mtd, const u8 *buf, int len)
-+{
-+	struct nand_chip	*nand_chip = mtd->priv;
-+
-+	__raw_writesb(nand_chip->IO_ADDR_W, buf, len);
-+}
-+
-+static void at91_write_buf16(struct mtd_info *mtd, const u8 *buf, int len)
-+{
-+	struct nand_chip	*nand_chip = mtd->priv;
-+
-+	__raw_writesw(nand_chip->IO_ADDR_W, buf, len / 2);
-+}
-+
-+
- #ifdef CONFIG_MTD_PARTITIONS
--const char *part_probes[] = { "cmdlinepart", NULL };
-+static const char *part_probes[] = { "cmdlinepart", NULL };
- #endif
- 
-+static char* ecc_modes[] __initdata = { "No", "Software", "Hardware" };
-+
- /*
-  * Probe for the NAND device.
-  */
-@@ -94,6 +392,8 @@ static int __init at91_nand_probe(struct
- 	struct at91_nand_host *host;
- 	struct mtd_info *mtd;
- 	struct nand_chip *nand_chip;
-+	struct resource *regs;
-+	struct resource *mem;
- 	int res;
- 
- #ifdef CONFIG_MTD_PARTITIONS
-@@ -108,8 +408,13 @@ static int __init at91_nand_probe(struct
- 		return -ENOMEM;
- 	}
- 
--	host->io_base = ioremap(pdev->resource[0].start,
--				pdev->resource[0].end - pdev->resource[0].start + 1);
-+	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if (!mem) {
-+		printk(KERN_ERR "at91_nand: can't get I/O resource mem\n");
-+		return -ENXIO;
-+	}
-+
-+	host->io_base = ioremap(mem->start, mem->end - mem->start + 1);
- 	if (host->io_base == NULL) {
- 		printk(KERN_ERR "at91_nand: ioremap failed\n");
- 		kfree(host);
-@@ -119,6 +424,7 @@ static int __init at91_nand_probe(struct
- 	mtd = &host->mtd;
- 	nand_chip = &host->nand_chip;
- 	host->board = pdev->dev.platform_data;
-+	host->dev = &pdev->dev;
- 
- 	nand_chip->priv = host;		/* link the private data structures */
- 	mtd->priv = nand_chip;
-@@ -132,11 +438,40 @@ static int __init at91_nand_probe(struct
- 	if (host->board->rdy_pin)
- 		nand_chip->dev_ready = at91_nand_device_ready;
- 
-+	regs = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-+	if (!regs && hard_ecc) {
-+		printk(KERN_ERR "at91_nand: can't get I/O resource "
-+				"regs\nFalling back on software ECC\n");
-+	}
-+
- 	nand_chip->ecc.mode = NAND_ECC_SOFT;	/* enable ECC */
-+	if (no_ecc)
-+		nand_chip->ecc.mode = NAND_ECC_NONE;
-+	if (hard_ecc && regs) {
-+		host->ecc = (void __force __iomem *) (AT91_VA_BASE_SYS - AT91_BASE_SYS);
-+		host->ecc += regs->start;
-+
-+		nand_chip->ecc.mode = NAND_ECC_HW_SYNDROME;	/* HW SYNDROME ECC */
-+		nand_chip->ecc.calculate = at91_nand_calculate;	/* function called after a write */
-+		nand_chip->ecc.correct = at91_nand_correct;	/* function called after a read */
-+		nand_chip->ecc.hwctl = at91_nand_hwctl;		/* unused */
-+		nand_chip->ecc.read_page = at91_nand_read_page;	/* read page function */
-+		nand_chip->ecc.bytes = 4;			/* 4 ECC bytes for any page size */
-+		nand_chip->ecc.prepad = 0;
-+		nand_chip->ecc.postpad = 0;
-+	}
-+
- 	nand_chip->chip_delay = 20;		/* 20us command delay time */
- 
--	if (host->board->bus_width_16)		/* 16-bit bus width */
-+	if (host->board->bus_width_16) {	/* 16-bit bus width */
- 		nand_chip->options |= NAND_BUSWIDTH_16;
-+		nand_chip->read_buf = at91_read_buf16;
-+		nand_chip->write_buf = at91_write_buf16;
-+	}
-+	else {
-+		nand_chip->read_buf = at91_read_buf8;
-+		nand_chip->write_buf = at91_write_buf8;
-+	}
- 
- 	platform_set_drvdata(pdev, host);
- 	at91_nand_enable(host);
-@@ -149,8 +484,60 @@ static int __init at91_nand_probe(struct
- 		}
- 	}
- 
--	/* Scan to find existance of the device */
--	if (nand_scan(mtd, 1)) {
-+	/* first scan to find the device and get the page size */
-+	if (nand_scan_ident(mtd, 1)) {
-+		res = -ENXIO;
-+		goto out;
-+	}
-+
-+	if (nand_chip->ecc.mode == NAND_ECC_HW_SYNDROME) {
-+		/* ECC is calculated for the whole page (1 step) */
-+		nand_chip->ecc.size = mtd->writesize;
-+
-+		/* set ECC page size and oob layout */
-+		switch (mtd->writesize) {
-+		case 512:
-+			nand_chip->ecc.layout = &at91_oobinfo_small;
-+			nand_chip->ecc.read_oob = at91_nand_read_oob_512;
-+			nand_chip->ecc.write_oob = at91_nand_write_oob_512;
-+			ecc_writel(host->ecc, AT91_ECC_MR, AT91_ECC_PAGESIZE_528);
-+			break;
-+		case 1024:
-+			nand_chip->ecc.layout = &at91_oobinfo_large;
-+			ecc_writel(host->ecc, AT91_ECC_MR, AT91_ECC_PAGESIZE_1056);
-+			break;
-+		case 2048:
-+			nand_chip->ecc.layout = &at91_oobinfo_large;
-+			ecc_writel(host->ecc, AT91_ECC_MR, AT91_ECC_PAGESIZE_2112);
-+			break;
-+		case 4096:
-+			nand_chip->ecc.layout = &at91_oobinfo_large;
-+			ecc_writel(host->ecc, AT91_ECC_MR, AT91_ECC_PAGESIZE_4224);
-+			break;
-+		default:
-+			/*
-+			 * Page size not supported by HW ECC.
-+			 * So switch back to soft ECC
-+			 */
-+			nand_chip->ecc.mode = NAND_ECC_SOFT;
-+			nand_chip->ecc.calculate = NULL;
-+			nand_chip->ecc.correct = NULL;
-+			nand_chip->ecc.hwctl = NULL;
-+			nand_chip->ecc.read_page = NULL;
-+			nand_chip->ecc.postpad = 0;
-+			nand_chip->ecc.prepad = 0;
-+			nand_chip->ecc.bytes = 0;
-+			break;
-+		}
-+	}
-+
-+	printk(KERN_INFO "AT91 NAND: %i-bit, %s ECC\n",
-+		(nand_chip->options & NAND_BUSWIDTH_16) ? 16 : 8,
-+		ecc_modes[nand_chip->ecc.mode]
-+	);
-+
-+	/* second phase scan */
-+	if (nand_scan_tail(mtd)) {
- 		res = -ENXIO;
- 		goto out;
- 	}
-@@ -179,8 +566,11 @@ static int __init at91_nand_probe(struct
- 	if (!res)
- 		return res;
- 
-+#ifdef CONFIG_MTD_PARTITIONS
- release:
-+#endif
- 	nand_release(mtd);
-+
- out:
- 	at91_nand_disable(host);
- 	platform_set_drvdata(pdev, NULL);
-@@ -192,7 +582,7 @@ out:
- /*
-  * Remove a NAND device.
-  */
--static int __devexit at91_nand_remove(struct platform_device *pdev)
-+static int __exit at91_nand_remove(struct platform_device *pdev)
- {
- 	struct at91_nand_host *host = platform_get_drvdata(pdev);
- 	struct mtd_info *mtd = &host->mtd;
-@@ -208,8 +598,7 @@ static int __devexit at91_nand_remove(st
- }
- 
- static struct platform_driver at91_nand_driver = {
--	.probe		= at91_nand_probe,
--	.remove		= at91_nand_remove,
-+	.remove		= __exit_p(at91_nand_remove),
- 	.driver		= {
- 		.name	= "at91_nand",
- 		.owner	= THIS_MODULE,
-@@ -218,7 +607,7 @@ static struct platform_driver at91_nand_
- 
- static int __init at91_nand_init(void)
- {
--	return platform_driver_register(&at91_nand_driver);
-+	return platform_driver_probe(&at91_nand_driver, at91_nand_probe);
- }
- 
- 
-@@ -233,4 +622,4 @@ module_exit(at91_nand_exit);
- 
- MODULE_LICENSE("GPL");
- MODULE_AUTHOR("Rick Bronson");
--MODULE_DESCRIPTION("NAND/SmartMedia driver for AT91RM9200");
-+MODULE_DESCRIPTION("NAND/SmartMedia driver for AT91RM9200 / AT91SAM9 / AT91CAP9");
---- a/drivers/net/arm/Kconfig
-+++ b/drivers/net/arm/Kconfig
-@@ -47,3 +47,10 @@ config EP93XX_ETH
- 	help
- 	  This is a driver for the ethernet hardware included in EP93xx CPUs.
- 	  Say Y if you are building a kernel for EP93xx based devices.
-+
-+config ARM_KS8695_ETHER
-+	tristate "KS8695 Ethernet support"
-+	depends on NET_ETHERNET && ARM && ARCH_KS8695
-+	help
-+	  If you wish to compile a kernel for an KS8695-based board
-+	  and enable Ethernet support, then select this option.
---- a/drivers/net/arm/Makefile
-+++ b/drivers/net/arm/Makefile
-@@ -9,3 +9,4 @@ obj-$(CONFIG_ARM_ETHER3)	+= ether3.o
- obj-$(CONFIG_ARM_ETHER1)	+= ether1.o
- obj-$(CONFIG_ARM_AT91_ETHER)	+= at91_ether.o
- obj-$(CONFIG_EP93XX_ETH)	+= ep93xx_eth.o
-+obj-$(CONFIG_ARM_KS8695_ETHER)	+= ks8695_ether.o
---- a/drivers/net/arm/at91_ether.c
-+++ b/drivers/net/arm/at91_ether.c
-@@ -220,7 +220,7 @@ static irqreturn_t at91ether_phy_interru
- 		if (!(phy & (1 << 0)))
- 			goto done;
- 	}
--	else if (lp->phy_type == MII_KS8721_ID) {
-+	else if ((lp->phy_type == MII_KS8721_ID) || (lp->phy_type == MII_KSZ8041_ID)) {
- 		read_phy(lp->phy_address, MII_TPISTATUS, &phy);		/* ack interrupt in Micrel PHY */
- 		if (!(phy & ((1 << 2) | 1)))
- 			goto done;
-@@ -286,7 +286,7 @@ static void enable_phyirq(struct net_dev
- 		dsintr = (1 << 15) | ( 1 << 14);
- 		write_phy(lp->phy_address, MII_BCMINTR_REG, dsintr);
- 	}
--	else if (lp->phy_type == MII_KS8721_ID) {	/* for Micrel PHY */
-+	else if ((lp->phy_type == MII_KS8721_ID) || (lp->phy_type == MII_KSZ8041_ID)) {	/* for Micrel PHY */
- 		dsintr = (1 << 10) | ( 1 << 8);
- 		write_phy(lp->phy_address, MII_TPISTATUS, dsintr);
- 	}
-@@ -341,7 +341,7 @@ static void disable_phyirq(struct net_de
- 		dsintr = ~(1 << 14);
- 		write_phy(lp->phy_address, MII_BCMINTR_REG, dsintr);
- 	}
--	else if (lp->phy_type == MII_KS8721_ID) {	/* for Micrel PHY */
-+	else if ((lp->phy_type == MII_KS8721_ID) || (lp->phy_type == MII_KSZ8041_ID)) {	/* for Micrel PHY */
- 		read_phy(lp->phy_address, MII_TPISTATUS, &dsintr);
- 		dsintr = ~((1 << 10) | (1 << 8));
- 		write_phy(lp->phy_address, MII_TPISTATUS, dsintr);
-@@ -820,7 +820,7 @@ static int at91ether_tx(struct sk_buff *
- 		lp->skb = skb;
- 		lp->skb_length = skb->len;
- 		lp->skb_physaddr = dma_map_single(NULL, skb->data, skb->len, DMA_TO_DEVICE);
--		lp->stats.tx_bytes += skb->len;
-+		dev->stats.tx_bytes += skb->len;
- 
- 		/* Set address of the data in the Transmit Address register */
- 		at91_emac_write(AT91_EMAC_TAR, lp->skb_physaddr);
-@@ -843,34 +843,32 @@ static int at91ether_tx(struct sk_buff *
-  */
- static struct net_device_stats *at91ether_stats(struct net_device *dev)
- {
--	struct at91_private *lp = netdev_priv(dev);
--	int ale, lenerr, seqe, lcol, ecol;
-+	int ale, lenerr, seqe, ecol;
- 
- 	if (netif_running(dev)) {
--		lp->stats.rx_packets += at91_emac_read(AT91_EMAC_OK);		/* Good frames received */
-+		dev->stats.rx_packets += at91_emac_read(AT91_EMAC_OK);		/* Good frames received */
- 		ale = at91_emac_read(AT91_EMAC_ALE);
--		lp->stats.rx_frame_errors += ale;				/* Alignment errors */
-+		dev->stats.rx_frame_errors += ale;				/* Alignment errors */
- 		lenerr = at91_emac_read(AT91_EMAC_ELR) + at91_emac_read(AT91_EMAC_USF);
--		lp->stats.rx_length_errors += lenerr;				/* Excessive Length or Undersize Frame error */
-+		dev->stats.rx_length_errors += lenerr;				/* Excessive Length or Undersize Frame error */
- 		seqe = at91_emac_read(AT91_EMAC_SEQE);
--		lp->stats.rx_crc_errors += seqe;				/* CRC error */
--		lp->stats.rx_fifo_errors += at91_emac_read(AT91_EMAC_DRFC);	/* Receive buffer not available */
--		lp->stats.rx_errors += (ale + lenerr + seqe
-+		dev->stats.rx_crc_errors += seqe;				/* CRC error */
-+		dev->stats.rx_fifo_errors += at91_emac_read(AT91_EMAC_DRFC);	/* Receive buffer not available */
-+		dev->stats.rx_errors += (ale + lenerr + seqe
- 			+ at91_emac_read(AT91_EMAC_CDE) + at91_emac_read(AT91_EMAC_RJB));
- 
--		lp->stats.tx_packets += at91_emac_read(AT91_EMAC_FRA);		/* Frames successfully transmitted */
--		lp->stats.tx_fifo_errors += at91_emac_read(AT91_EMAC_TUE);	/* Transmit FIFO underruns */
--		lp->stats.tx_carrier_errors += at91_emac_read(AT91_EMAC_CSE);	/* Carrier Sense errors */
--		lp->stats.tx_heartbeat_errors += at91_emac_read(AT91_EMAC_SQEE);/* Heartbeat error */
-+		dev->stats.tx_packets += at91_emac_read(AT91_EMAC_FRA);		/* Frames successfully transmitted */
-+		dev->stats.tx_fifo_errors += at91_emac_read(AT91_EMAC_TUE);	/* Transmit FIFO underruns */
-+		dev->stats.tx_carrier_errors += at91_emac_read(AT91_EMAC_CSE);	/* Carrier Sense errors */
-+		dev->stats.tx_heartbeat_errors += at91_emac_read(AT91_EMAC_SQEE);/* Heartbeat error */
- 
--		lcol = at91_emac_read(AT91_EMAC_LCOL);
-+		dev->stats.tx_window_errors += at91_emac_read(AT91_EMAC_LCOL);	/* Late collisions */
- 		ecol = at91_emac_read(AT91_EMAC_ECOL);
--		lp->stats.tx_window_errors += lcol;			/* Late collisions */
--		lp->stats.tx_aborted_errors += ecol;			/* 16 collisions */
-+		dev->stats.tx_aborted_errors += ecol;				/* 16 collisions */
- 
--		lp->stats.collisions += (at91_emac_read(AT91_EMAC_SCOL) + at91_emac_read(AT91_EMAC_MCOL) + lcol + ecol);
-+		dev->stats.collisions += (at91_emac_read(AT91_EMAC_SCOL) + at91_emac_read(AT91_EMAC_MCOL) + ecol);
- 	}
--	return &lp->stats;
-+	return &dev->stats;
- }
- 
- /*
-@@ -896,16 +894,16 @@ static void at91ether_rx(struct net_devi
- 
- 			skb->protocol = eth_type_trans(skb, dev);
- 			dev->last_rx = jiffies;
--			lp->stats.rx_bytes += pktlen;
-+			dev->stats.rx_bytes += pktlen;
- 			netif_rx(skb);
- 		}
- 		else {
--			lp->stats.rx_dropped += 1;
-+			dev->stats.rx_dropped += 1;
- 			printk(KERN_NOTICE "%s: Memory squeeze, dropping packet.\n", dev->name);
- 		}
- 
- 		if (dlist->descriptors[lp->rxBuffIndex].size & EMAC_MULTICAST)
--			lp->stats.multicast++;
-+			dev->stats.multicast++;
- 
- 		dlist->descriptors[lp->rxBuffIndex].addr &= ~EMAC_DESC_DONE;	/* reset ownership bit */
- 		if (lp->rxBuffIndex == MAX_RX_DESCR-1)				/* wrap after last buffer */
-@@ -934,7 +932,7 @@ static irqreturn_t at91ether_interrupt(i
- 	if (intstatus & AT91_EMAC_TCOM) {	/* Transmit complete */
- 		/* The TCOM bit is set even if the transmission failed. */
- 		if (intstatus & (AT91_EMAC_TUND | AT91_EMAC_RTRY))
--			lp->stats.tx_errors += 1;
-+			dev->stats.tx_errors += 1;
- 
- 		if (lp->skb) {
- 			dev_kfree_skb_irq(lp->skb);
-@@ -978,15 +976,22 @@ static int __init at91ether_setup(unsign
- 	struct net_device *dev;
- 	struct at91_private *lp;
- 	unsigned int val;
--	int res;
-+	struct resource *res;
-+	int ret;
- 	DECLARE_MAC_BUF(mac);
- 
- 	dev = alloc_etherdev(sizeof(struct at91_private));
- 	if (!dev)
- 		return -ENOMEM;
- 
--	dev->base_addr = AT91_VA_BASE_EMAC;
--	dev->irq = AT91RM9200_ID_EMAC;
-+	/* Get I/O base address and IRQ */
-+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if (!res) {
-+		free_netdev(dev);
-+		return -ENODEV;
-+	}
-+	dev->base_addr = res->start;
-+	dev->irq = platform_get_irq(pdev, 0);
- 
- 	/* Install the interrupt handler */
- 	if (request_irq(dev->irq, at91ether_interrupt, 0, dev->name, dev)) {
-@@ -1043,7 +1048,9 @@ static int __init at91ether_setup(unsign
- 	} else if (machine_is_csb337()) {
- 		/* mix link activity status into LED2 link state */
- 		write_phy(phy_address, MII_LEDCTRL_REG, 0x0d22);
--	}
-+	} else if (machine_is_ecbat91())
-+		write_phy(phy_address, MII_LEDCTRL_REG, 0x156A);
-+
- 	disable_mdi();
- 	spin_unlock_irq(&lp->lock);
- 
-@@ -1058,12 +1065,12 @@ static int __init at91ether_setup(unsign
- 	lp->phy_address = phy_address;	/* MDI address of PHY */
- 
- 	/* Register the network interface */
--	res = register_netdev(dev);
--	if (res) {
-+	ret = register_netdev(dev);
-+	if (ret) {
- 		free_irq(dev->irq, dev);
- 		free_netdev(dev);
- 		dma_free_coherent(NULL, sizeof(struct recv_desc_bufs), lp->dlist, (dma_addr_t)lp->dlist_phys);
--		return res;
-+		return ret;
- 	}
- 
- 	/* Determine current link speed */
-@@ -1101,6 +1108,8 @@ static int __init at91ether_setup(unsign
- 		printk(KERN_INFO "%s: National Semiconductor DP83848 PHY\n", dev->name);
- 	else if (phy_type == MII_AC101L_ID)
- 		printk(KERN_INFO "%s: Altima AC101L PHY\n", dev->name);
-+	else if (phy_type == MII_KSZ8041_ID)
-+		printk(KERN_INFO "%s: Micrel KSZ8041 PHY\n", dev->name);
- 	else if (phy_type == MII_KS8721_ID)
- 		printk(KERN_INFO "%s: Micrel KS8721 PHY\n", dev->name);
- 	else if (phy_type == MII_T78Q21x3_ID)
-@@ -1146,6 +1155,7 @@ static int __init at91ether_probe(struct
- 			case MII_DP83847_ID:		/* National Semiconductor DP83847:  */
- 			case MII_DP83848_ID:		/* National Semiconductor DP83848:  */
- 			case MII_AC101L_ID:		/* Altima AC101L: PHY_ID1 = 0x22, PHY_ID2 = 0x5520 */
-+			case MII_KSZ8041_ID:		/* Micrel KSZ8041: PHY_ID1 = 0x22, PHY_ID2 = 0x1512 */
- 			case MII_KS8721_ID:		/* Micrel KS8721: PHY_ID1 = 0x22, PHY_ID2 = 0x1610 */
- 			case MII_T78Q21x3_ID:		/* Teridian 78Q21x3: PHY_ID1 = 0x0E, PHY_ID2 = 7237 */
- 			case MII_LAN83C185_ID:		/* SMSC LAN83C185: PHY_ID1 = 0x0007, PHY_ID2 = 0xC0A1 */
-@@ -1246,3 +1256,4 @@ module_exit(at91ether_exit)
- MODULE_LICENSE("GPL");
- MODULE_DESCRIPTION("AT91RM9200 EMAC Ethernet driver");
- MODULE_AUTHOR("Andrew Victor");
-+MODULE_ALIAS("platform:" DRV_NAME);
---- a/drivers/net/arm/at91_ether.h
-+++ b/drivers/net/arm/at91_ether.h
-@@ -48,6 +48,9 @@
- /* Altima AC101L PHY */
- #define MII_AC101L_ID		0x00225520
- 
-+/* Micrel KSZ8041 PHY */
-+#define MII_KSZ8041_ID		0x00221510
-+
- /* Micrel KS8721 PHY */
- #define MII_KS8721_ID		0x00221610
- 
-@@ -84,7 +87,6 @@ struct recv_desc_bufs
- 
- struct at91_private
- {
--	struct net_device_stats stats;
- 	struct mii_if_info mii;			/* ethtool support */
- 	struct at91_eth_data board_data;	/* board-specific configuration */
- 	struct clk *ether_clk;			/* clock */
---- /dev/null
-+++ b/drivers/net/arm/ks8695_ether.c
-@@ -0,0 +1,1009 @@
-+/*
-+ * Ethernet driver for the Kendin/Micrel KS8695.
-+ *
-+ * Copyright (C) 2006 Andrew Victor
-+ *
-+ * 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/init.h>
-+#include <linux/mii.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/skbuff.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/delay.h>
-+#include <linux/ethtool.h>
-+#include <linux/platform_device.h>
-+
-+#include <asm/io.h>
-+#include <asm/mach/irq.h>
-+#include <asm/uaccess.h>
-+#include <asm/arch/regs-wan.h>
-+#include <asm/arch/regs-lan.h>
-+#include <asm/arch/regs-hpna.h>
-+#include <asm/arch/regs-switch.h>
-+#include <asm/arch/regs-misc.h>
-+
-+#include <asm/arch/regs-irq.h>
-+
-+#include "ks8695_ether.h"
-+
-+
-+#define DRV_NAME	"ks8695_ether"
-+#define DRV_VERSION	"0.01"
-+
-+/* ..................................................................... */
-+
-+static inline unsigned long ks8695_read(struct net_device *dev, unsigned int reg)
-+{
-+	return __raw_readl(dev->base_addr + reg);
-+}
-+
-+static inline void ks8695_write(struct net_device *dev, unsigned int reg, unsigned long value)
-+{
-+	__raw_writel(value, dev->base_addr + reg);
-+}
-+
-+
-+/* ......................... ADDRESS MANAGEMENT ........................ */
-+
-+#define KS8695_NR_ADDRESSES	16
-+
-+/*
-+ * Add the specified multicast addresses to the Additional Station
-+ * Address registers.
-+ */
-+static void ks8695_set_mcast_address(struct net_device *dev, struct dev_mc_list *addr, int nr_addr)
-+{
-+	unsigned long low, high;
-+	int i;
-+
-+	/* Set multicast addresses in Additional Station Address registers */
-+	for (i = 0; i < nr_addr; i++, addr = addr->next) {
-+		if (!addr) break;				/* unexpected end of list */
-+		else if (i == KS8695_NR_ADDRESSES) break;	/* too many addresses */
-+
-+		low = (addr->dmi_addr[2] << 24) | (addr->dmi_addr[3] << 16) | (addr->dmi_addr[4] << 8) | (addr->dmi_addr[5]);
-+		high = (addr->dmi_addr[0] << 8) | (addr->dmi_addr[1]);
-+
-+		ks8695_write(dev, KS8695_WMAAL_(i), low);
-+		ks8695_write(dev, KS8695_WMAAH_(i), WMAAH_E | high);
-+	}
-+
-+	/* Clear the remaining Additional Station Addresses */
-+	for (; i < KS8695_NR_ADDRESSES; i++) {
-+		ks8695_write(dev, KS8695_WMAAL_(i), 0);
-+		ks8695_write(dev, KS8695_WMAAH_(i), 0);
-+	}
-+}
-+
-+/*
-+ * Enable/Disable promiscuous and multicast modes.
-+ */
-+static void ks8695eth_set_multi(struct net_device *dev)
-+{
-+	unsigned long ctrl;
-+
-+	ctrl = ks8695_read(dev, KS8695_WMDRXC);
-+
-+	if (dev->flags & IFF_PROMISC)			/* enable promiscuous mode */
-+		ctrl |= WMDRXC_WMRA;
-+	else if (dev->flags & ~IFF_PROMISC)		/* disable promiscuous mode */
-+		ctrl &= ~WMDRXC_WMRA;
-+
-+	if (dev->flags & IFF_ALLMULTI)			/* enable all multicast mode */
-+		ctrl |= WMDRXC_WMRM;
-+	else if (dev->mc_count > KS8695_NR_ADDRESSES)	/* more specific multicast addresses than can be handled in hardware */
-+		ctrl |= WMDRXC_WMRM;
-+	else if (dev->mc_count > 0) {			/* enable specific multicasts */
-+		ctrl &= ~WMDRXC_WMRM;
-+		ks8695_set_mcast_address(dev, dev->mc_list, dev->mc_count);
-+	}
-+	else if (dev->flags & ~IFF_ALLMULTI) {		/* disable multicast mode */
-+		ctrl &= ~WMDRXC_WMRM;
-+		ks8695_set_mcast_address(dev, NULL, 0);
-+	}
-+
-+	ks8695_write(dev, KS8695_WMDRXC, ctrl);
-+}
-+
-+/*
-+ * Program the hardware MAC address from dev->dev_addr.
-+ */
-+static void update_mac_address(struct net_device *dev)
-+{
-+	unsigned long low, high;
-+
-+	low = (dev->dev_addr[2] << 24) | (dev->dev_addr[3] << 16) | (dev->dev_addr[4] << 8) | (dev->dev_addr[5]);
-+	high = (dev->dev_addr[0] << 8) | (dev->dev_addr[1]);
-+
-+	ks8695_write(dev, KS8695_WMAL, low);
-+	ks8695_write(dev, KS8695_WMAH, high);
-+}
-+
-+/*
-+ * Store the new hardware address in dev->dev_addr, and update the MAC.
-+ */
-+static int ks8695eth_set_mac(struct net_device *dev, void* addr)
-+{
-+	struct sockaddr *address = addr;
-+	DECLARE_MAC_BUF(mac);
-+
-+	if (!is_valid_ether_addr(address->sa_data))
-+		return -EADDRNOTAVAIL;
-+
-+	memcpy(dev->dev_addr, address->sa_data, dev->addr_len);
-+	update_mac_address(dev);
-+
-+	printk("%s: Setting MAC address to %s\n", dev->name, print_mac(mac, dev->dev_addr));
-+
-+	return 0;
-+}
-+
-+/*
-+ * Retrieve the MAC address set by the bootloader.
-+ */
-+static void __init get_mac_address(struct net_device *dev)
-+{
-+	unsigned char addr[6];
-+	unsigned long low, high;
-+
-+	low = ks8695_read(dev, KS8695_WMAL);
-+	high = ks8695_read(dev, KS8695_WMAH);
-+
-+	addr[0] = (high & 0xff00) >> 8;
-+	addr[1] = (high & 0xff);
-+	addr[2] = (low & 0xff000000) >> 24;
-+	addr[3] = (low & 0xff0000) >> 16;
-+	addr[4] = (low & 0xff00) >> 8;
-+	addr[5] = (low & 0xff);
-+
-+	if (is_valid_ether_addr(addr))
-+		memcpy(dev->dev_addr, &addr, 6);
-+}
-+
-+
-+/* ......................... ETHTOOL SUPPORT ........................... */
-+
-+/*
-+ * Get device-specific settings.
-+ */
-+static int ks8695eth_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
-+{
-+	unsigned long ctrl;
-+
-+	/* the defaults for all ports */
-+	cmd->supported = SUPPORTED_10baseT_Half | SUPPORTED_10baseT_Full
-+			| SUPPORTED_100baseT_Half | SUPPORTED_100baseT_Full
-+			| SUPPORTED_TP | SUPPORTED_MII;
-+	cmd->advertising = ADVERTISED_TP | ADVERTISED_MII;
-+	cmd->port = PORT_MII;
-+	cmd->transceiver = XCVR_INTERNAL;
-+
-+	if (dev->base_addr == KS8695_HPNA_VA) {
-+		cmd->phy_address = 0;
-+		cmd->autoneg = AUTONEG_DISABLE;		/* not supported for HPNA */
-+
-+		ctrl = __raw_readl(KS8695_MISC_VA + KS8695_HMC);
-+		cmd->speed = (ctrl & HMC_HSS) ? SPEED_100 : SPEED_10;
-+		cmd->duplex = (ctrl & HMC_HDS) ? DUPLEX_FULL : DUPLEX_HALF;
-+	}
-+	else if (dev->base_addr == KS8695_WAN_VA) {
-+		cmd->supported |= (SUPPORTED_Autoneg | SUPPORTED_Pause);
-+		cmd->phy_address = 0;
-+
-+		ctrl = __raw_readl(KS8695_MISC_VA + KS8695_WMC);
-+		if ((ctrl & WMC_WAND) == 0) {		/* auto-negotiation is enabled */
-+			cmd->advertising |= ADVERTISED_Autoneg;
-+			if (ctrl & WMC_WANA100F)
-+				cmd->advertising |= ADVERTISED_100baseT_Full;
-+			if (ctrl & WMC_WANA100H)
-+				cmd->advertising |= ADVERTISED_100baseT_Half;
-+			if (ctrl & WMC_WANA10F)
-+				cmd->advertising |= ADVERTISED_10baseT_Full;
-+			if (ctrl & WMC_WANA10H)
-+				cmd->advertising |= ADVERTISED_10baseT_Half;
-+			if (ctrl & WMC_WANAP)
-+				cmd->advertising |= ADVERTISED_Pause;
-+			cmd->autoneg = AUTONEG_ENABLE;
-+
-+			cmd->speed = (ctrl & WMC_WSS) ? SPEED_100 : SPEED_10;
-+			cmd->duplex = (ctrl & WMC_WDS) ? DUPLEX_FULL : DUPLEX_HALF;
-+		}
-+		else {					/* auto-negotiation is disabled */
-+			cmd->autoneg = AUTONEG_DISABLE;
-+
-+			cmd->speed = (ctrl & WMC_WANF100) ? SPEED_100 : SPEED_10;
-+			cmd->duplex = (ctrl & WMC_WANFF) ? DUPLEX_FULL : DUPLEX_HALF;
-+		}
-+	}
-+	else if (dev->base_addr == KS8695_LAN_VA) {
-+		// TODO: Implement for Switch ports
-+	}
-+
-+	return 0;
-+}
-+
-+/*
-+ * Set device-specific settings.
-+ */
-+static int ks8695eth_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
-+{
-+	unsigned long ctrl;
-+
-+	if ((cmd->speed != SPEED_10) && (cmd->speed != SPEED_100))
-+		return -EINVAL;
-+	if ((cmd->duplex != DUPLEX_HALF) && (cmd->duplex != DUPLEX_FULL))
-+		return -EINVAL;
-+	if (cmd->port != PORT_MII)
-+		return -EINVAL;
-+	if (cmd->transceiver != XCVR_INTERNAL)
-+		return -EINVAL;
-+	if ((cmd->autoneg != AUTONEG_DISABLE) && (cmd->autoneg != AUTONEG_ENABLE))
-+		return -EINVAL;
-+
-+	if (cmd->autoneg == AUTONEG_ENABLE) {
-+		if ((cmd->advertising & (ADVERTISED_10baseT_Half |
-+				ADVERTISED_10baseT_Full |
-+				ADVERTISED_100baseT_Half |
-+				ADVERTISED_100baseT_Full)) == 0)
-+			return -EINVAL;
-+
-+		if (dev->base_addr == KS8695_HPNA_VA)
-+			return -EINVAL;		/* HPNA does not support auto-negotiation. */
-+		else if (dev->base_addr == KS8695_WAN_VA) {
-+			ctrl = __raw_readl(KS8695_MISC_VA + KS8695_WMC);
-+
-+			ctrl &= ~(WMC_WAND | WMC_WANA100F | WMC_WANA100H | WMC_WANA10F | WMC_WANA10H);
-+			if (cmd->advertising & ADVERTISED_100baseT_Full)
-+				ctrl |= WMC_WANA100F;
-+			if (cmd->advertising & ADVERTISED_100baseT_Half)
-+				ctrl |= WMC_WANA100H;
-+			if (cmd->advertising & ADVERTISED_10baseT_Full)
-+				ctrl |= WMC_WANA10F;
-+			if (cmd->advertising & ADVERTISED_10baseT_Half)
-+				ctrl |= WMC_WANA10H;
-+
-+			ctrl |= WMC_WANR;	/* force a re-negotiation */
-+			__raw_writel(ctrl, KS8695_MISC_VA + KS8695_WMC);
-+		}
-+		else if (dev->base_addr == KS8695_LAN_VA) {
-+			// TODO: Implement for Switch ports
-+		}
-+
-+	}
-+	else {
-+		if (dev->base_addr == KS8695_HPNA_VA) {
-+			ctrl = __raw_readl(KS8695_MISC_VA + KS8695_HMC);
-+
-+			ctrl &= ~(HMC_HSS | HMC_HDS);
-+			if (cmd->speed == SPEED_100)
-+				ctrl |= HMC_HSS;
-+			if (cmd->duplex == DUPLEX_FULL)
-+				ctrl |= HMC_HDS;
-+
-+			__raw_writel(ctrl, KS8695_MISC_VA + KS8695_HMC);
-+		}
-+		else if (dev->base_addr == KS8695_WAN_VA) {
-+			ctrl = __raw_readl(KS8695_MISC_VA + KS8695_WMC);
-+
-+			ctrl |= WMC_WAND;	/* disable auto-negotiation */
-+			ctrl &= ~(WMC_WANF100 | WMC_WANFF);
-+			if (cmd->speed == SPEED_100)
-+				ctrl |= WMC_WANF100;
-+			if (cmd->duplex == DUPLEX_FULL)
-+				ctrl |= WMC_WANFF;
-+
-+			__raw_writel(ctrl, KS8695_MISC_VA + KS8695_WMC);
-+		}
-+		else if (dev->base_addr == KS8695_LAN_VA) {
-+			// TODO: Implement for Switch ports
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+/*
-+ * Restart the auto-negotiation.
-+ */
-+static int ks8695eth_nwayreset(struct net_device *dev)
-+{
-+	unsigned long ctrl;
-+
-+	if (dev->base_addr == KS8695_HPNA_VA)	/* HPNA has no auto-negotiation */
-+		return -EINVAL;
-+	else if (dev->base_addr == KS8695_WAN_VA) {
-+		ctrl = __raw_readl(KS8695_MISC_VA + KS8695_WMC);
-+
-+		if ((ctrl & WMC_WAND) == 0)
-+			__raw_writel(ctrl | WMC_WANR, KS8695_MISC_VA + KS8695_WMC);
-+		else
-+			return -EINVAL;		/* auto-negitiation not enabled */
-+	}
-+	else if (dev->base_addr == KS8695_LAN_VA) {
-+		// TODO: Implement for Switch ports
-+	}
-+
-+	return 0;
-+}
-+
-+static void ks8695eth_get_pause(struct net_device *dev, struct ethtool_pauseparam *param)
-+{
-+	unsigned long ctrl;
-+
-+	if (dev->base_addr == KS8695_HPNA_VA)
-+		return;
-+	else if (dev->base_addr == KS8695_WAN_VA) {
-+		ctrl = __raw_readl(KS8695_MISC_VA + KS8695_WMC);	/* advertise Pause */
-+		param->autoneg = (ctrl & WMC_WANAP);
-+
-+		ctrl = ks8695_read(dev, KS8695_WMDRXC);			/* current Tx Flow-control */
-+		param->rx_pause = (ctrl & WMDRXC_WMRFCE);
-+
-+		ctrl = ks8695_read(dev, KS8695_WMDRXC);			/* current Rx Flow-control */
-+		param->tx_pause = (ctrl & WMDTXC_WMTFCE);
-+	}
-+	else if (dev->base_addr == KS8695_LAN_VA) {
-+		// TODO: Implement for Switch ports
-+	}
-+}
-+
-+static int ks8695eth_set_pause(struct net_device *dev, struct ethtool_pauseparam *param)
-+{
-+	// TODO.
-+
-+	return 0;
-+}
-+
-+static u32 ks8695eth_get_link(struct net_device *dev)
-+{
-+	unsigned long ctrl;
-+
-+	if (dev->base_addr == KS8695_HPNA_VA)
-+		return 1;		/* HPNA always has link */
-+	else if (dev->base_addr == KS8695_WAN_VA) {
-+		ctrl = __raw_readl(KS8695_MISC_VA + KS8695_WMC);
-+		return (ctrl & WMC_WLS);
-+	}
-+	else if (dev->base_addr == KS8695_LAN_VA) {
-+		// TODO: Implement for Switch ports
-+	}
-+
-+	return 0;
-+}
-+
-+/*
-+ * Report driver information.
-+ */
-+static void ks8695eth_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
-+{
-+	strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
-+	strlcpy(info->version, DRV_VERSION, sizeof(info->version));
-+	strlcpy(info->bus_info, dev->dev.parent->bus_id, sizeof(info->bus_info));
-+}
-+
-+static struct ethtool_ops ks8695eth_ethtool_ops = {
-+	.get_settings	= ks8695eth_get_settings,
-+	.set_settings	= ks8695eth_set_settings,
-+	.get_drvinfo	= ks8695eth_get_drvinfo,
-+	.nway_reset	= ks8695eth_nwayreset,
-+	.get_pauseparam = ks8695eth_get_pause,
-+	.set_pauseparam = ks8695eth_set_pause,
-+	.get_link	= ks8695eth_get_link,
-+};
-+
-+
-+/* ................................ MAC ................................ */
-+
-+/*
-+ * Setup the RX DMA descriptors, and enable and start the DMA receiver.
-+ */
-+static void ks8695eth_start_rx(struct net_device *dev)
-+{
-+	struct ks8695eth_priv *lp = (struct ks8695eth_priv *) dev->priv;
-+	unsigned long ctrl;
-+	int i;
-+
-+	/* Setup the DMA descriptors */
-+	for (i = 0; i < MAX_RX_DESC; i++) {
-+		lp->rxdma[i].length = MAX_RXBUF_SIZE;
-+		lp->rxdma[i].addr = (unsigned long) lp->rxSkb[i].dma;
-+		lp->rxdma[i].next = (unsigned long) lp->rxdma_phys + (sizeof(struct rx_descriptor) * (i+1));
-+		lp->rxdma[i].status = RDES_OWN;
-+	}
-+
-+	/* Create ring of DMA descriptors */
-+	lp->rxdma[MAX_RX_DESC-1].next = (unsigned long) lp->rxdma_phys;		/* phys address of 1st descriptor */
-+
-+	/* Reset receive index (since hardware was reset) */
-+	lp->rx_idx = 0;
-+
-+	/* Program address of 1st descriptor in KS8695 */
-+	ks8695_write(dev, KS8695_WRDLB, (unsigned long) lp->rxdma_phys);
-+
-+	/* Enable and start the DMA Receiver */
-+	ctrl = ks8695_read(dev, KS8695_WMDRXC);
-+	ks8695_write(dev, KS8695_WMDRXC, ctrl | WMDRXC_WMRE);
-+	ks8695_write(dev, KS8695_WMDRSC, 0);
-+}
-+
-+/*
-+ * Stop the DMA receiver.
-+ */
-+static void ks8695eth_stop_rx(struct net_device *dev)
-+{
-+	unsigned long ctrl;
-+
-+	/* Disable receive DMA */
-+	ctrl = ks8695_read(dev, KS8695_WMDRXC);
-+	ks8695_write(dev, KS8695_WMDRXC, ctrl & ~WMDRXC_WMRE);
-+}
-+
-+/*
-+ * Setup the TX DMA descriptors, and enable DMA transmitter.
-+ */
-+static void ks8695eth_start_tx(struct net_device *dev)
-+{
-+	struct ks8695eth_priv *lp = (struct ks8695eth_priv *) dev->priv;
-+	unsigned long ctrl;
-+	int i;
-+
-+	/* Setup the DMA descriptors */
-+	for (i = 0; i < MAX_TX_DESC; i++) {
-+		lp->txdma[i].ownership = 0;
-+		lp->txdma[i].status = 0;
-+		lp->txdma[i].addr = 0;
-+		lp->txdma[i].next = (unsigned long) lp->txdma_phys + (sizeof(struct tx_descriptor) * (i+1));
-+	}
-+
-+	/* Create ring of DMA descriptors */
-+	lp->txdma[MAX_TX_DESC-1].next = (unsigned long) lp->txdma_phys;		/* phys address of 1st desc */
-+
-+	/* Reset transmit indexes (since hardware was reset) */
-+	lp->tx_head = 0;
-+	lp->tx_tail = 0;
-+
-+	/* Program address of 1st descriptor in KS8695 */
-+	ks8695_write(dev, KS8695_WTDLB, (unsigned long) lp->txdma_phys);
-+
-+	/* Enable the DMA transmitter (will be started on first packet) */
-+	ctrl = ks8695_read(dev, KS8695_WMDTXC);
-+	ks8695_write(dev, KS8695_WMDTXC, ctrl | WMDTXC_WMTE);
-+}
-+
-+/*
-+ * Stop the DMA transmitter.
-+ */
-+static void ks8695eth_stop_tx(struct net_device *dev)
-+{
-+	struct ks8695eth_priv *lp = (struct ks8695eth_priv *) dev->priv;
-+	unsigned long ctrl;
-+	int i;
-+
-+	/* Disable transmit DMA */
-+	ctrl = ks8695_read(dev, KS8695_WMDTXC);
-+	ks8695_write(dev, KS8695_WMDTXC, ctrl & ~WMDTXC_WMTE);
-+
-+	/* Clear any pending skb's still on transmit queue */
-+	for (i = 0; i < MAX_TX_DESC; i++) {
-+		lp->txdma[i].ownership = 0;
-+		lp->txdma[i].status = 0;
-+		lp->txdma[i].addr = 0;
-+
-+		if (lp->txSkb[i].skb) {
-+			dma_unmap_single(lp->dev, lp->txSkb[i].dma, lp->txSkb[i].length, DMA_TO_DEVICE);
-+			dev_kfree_skb_irq(lp->txSkb[i].skb);
-+			lp->txSkb[i].skb = NULL;
-+		}
-+	}
-+}
-+
-+/*
-+ * Reset the MAC hardware.
-+ */
-+static void ks8695eth_hw_reset(struct net_device *dev)
-+{
-+	/* Perform hardware reset */
-+	ks8695_write(dev, KS8695_WMDTXC, WMDTXC_WMTRST);
-+	while (ks8695_read(dev, KS8695_WMDTXC) & WMDTXC_WMTRST) { barrier(); }
-+
-+	/* Initialize the hardware */
-+	ks8695_write(dev, KS8695_WMDRXC, WMDRXC_WMRU | WMDRXC_WMRB);		/* RX: receive Unicast & Broadcast */
-+	ks8695_write(dev, KS8695_WMDTXC, WMDTXC_WMTEP | WMDTXC_WMTAC);		/* TX: add Padding & CRC */
-+
-+	// TODO: Can set Rx/Tx PBL: (Micrel using 8)
-+	// TODO: Enable hardware checksumming.
-+	// TODO: Enable Rx/Tx flow-control
-+}
-+
-+/*
-+ * Enable or Disable the IRQs associated with a network interface.
-+ */
-+static void ks8695eth_set_irq(struct net_device *dev, short enable)
-+{
-+	struct ks8695eth_priv *lp = (struct ks8695eth_priv *) dev->priv;
-+	int i;
-+
-+	for (i = 0; i < NR_IRQS; i++) {
-+		if (lp->irqs & (1 << i)) {
-+			if (enable)
-+				enable_irq(i);
-+			else
-+				disable_irq(i);
-+		}
-+	}
-+}
-+
-+/*
-+ * Open the ethernet interface.
-+ */
-+static int ks8695eth_open(struct net_device *dev)
-+{
-+	if (!is_valid_ether_addr(dev->dev_addr))
-+		return -EADDRNOTAVAIL;
-+
-+	/* MUST reset hardware in _open() */
-+	ks8695eth_hw_reset(dev);
-+
-+	/*  Update the MAC address (incase user has changed it) */
-+	update_mac_address(dev);
-+
-+	/* Start DMA */
-+	ks8695eth_start_tx(dev);
-+	ks8695eth_start_rx(dev);
-+
-+	/* Enable interrupts */
-+	ks8695eth_set_irq(dev, 1);
-+
-+	netif_start_queue(dev);
-+	return 0;
-+}
-+
-+/*
-+ * Close the ethernet interface.
-+ */
-+static int ks8695eth_close(struct net_device *dev)
-+{
-+	/* Stop DMA */
-+	ks8695eth_stop_rx(dev);
-+	ks8695eth_stop_tx(dev);
-+
-+	/* Disable interrupts */
-+	ks8695eth_set_irq(dev, 0);
-+
-+	netif_stop_queue(dev);
-+	return 0;
-+}
-+
-+/*
-+ * Return the current statistics.
-+ */
-+static struct net_device_stats *ks8695eth_stats(struct net_device *dev)
-+{
-+	return &dev->stats;
-+}
-+
-+/*
-+ * Queue a packet for transmission in next TX DMA descriptor.
-+ */
-+static int ks8695eth_xmit_frame(struct sk_buff *skb, struct net_device *dev)
-+{
-+	struct ks8695eth_priv *lp = (struct ks8695eth_priv *) dev->priv;
-+	int i;
-+
-+	/* Packets are added to head of array */
-+	i = lp->tx_head;
-+
-+	/* Store packet information */
-+	lp->txSkb[i].skb = skb;
-+	lp->txSkb[i].length = skb->len;
-+	lp->txSkb[i].dma = dma_map_single(lp->dev, skb->data, skb->len, DMA_TO_DEVICE);
-+
-+	spin_lock_irq(&lp->tx_lock);
-+
-+	/* Set Tx descriptor information */
-+	lp->txdma[i].addr = lp->txSkb[i].dma;
-+	lp->txdma[i].status = TDES_IC | TDES_FS | TDES_LS | (lp->txSkb[i].length & TDES_TBS);
-+	lp->txdma[i].ownership = TDES_OWN;
-+
-+	/* Start the DMA transmitter (if necessary) */
-+	ks8695_write(dev, KS8695_WMDTSC, 0);
-+
-+	lp->tx_head = (lp->tx_head + 1) % MAX_TX_DESC;
-+	if (lp->tx_head == lp->tx_tail)		/* no more descriptors */
-+		netif_stop_queue(dev);
-+
-+	spin_unlock_irq(&lp->tx_lock);
-+
-+	dev->trans_start = jiffies;
-+	return 0;
-+}
-+
-+/* ..................................................................... */
-+
-+/*
-+ * The link state of the WAN port has changed.
-+ * (Called from interrupt context)
-+ */
-+static void ks8695eth_wan_link(struct net_device *dev)
-+{
-+	unsigned long ctrl;
-+
-+	ctrl = __raw_readl(KS8695_MISC_VA + KS8695_WMC);
-+	if (ctrl & WMC_WLS) {
-+		netif_carrier_on(dev);
-+		printk(KERN_INFO "%s: Link is now %s-%s\n", dev->name,
-+				(ctrl & WMC_WSS) ? "100" : "10",
-+				(ctrl & WMC_WDS) ? "FullDuplex" : "HalfDuplex");
-+	}
-+	else {
-+		netif_carrier_off(dev);
-+		printk(KERN_INFO "%s: Link down.\n", dev->name);
-+	}
-+}
-+
-+/* ..................................................................... */
-+
-+/*
-+ * A frame has been received.  Exteract from buffer descriptor and deliver to
-+ * upper layers.
-+ * (Called from interrupt context)
-+ */
-+static void ks8695eth_rx_interrupt(struct net_device *dev)
-+{
-+	struct ks8695eth_priv *lp = (struct ks8695eth_priv *) dev->priv;
-+	struct sk_buff *skb;
-+	unsigned long flags;
-+	unsigned int pktlen;
-+
-+	while (!(lp->rxdma[lp->rx_idx].status & RDES_OWN)) {
-+		flags = lp->rxdma[lp->rx_idx].status;
-+
-+		if ((flags & (RDES_FS | RDES_LS)) != (RDES_FS | RDES_LS)) {
-+			printk(KERN_ERR "%s: Spanning packet detected\n", dev->name);
-+			goto rx_complete;
-+		}
-+
-+		/* handle errors */
-+		if (flags & (RDES_ES | RDES_RE)) {
-+			dev->stats.rx_errors++;
-+
-+			if (flags & RDES_TL)		/* Frame too long */
-+				dev->stats.rx_length_errors++;
-+			else if (flags & RDES_RF)	/* Runt frame */
-+				dev->stats.rx_length_errors++;
-+			else if (flags & RDES_CE)	/* CRC error */
-+				dev->stats.rx_crc_errors++;
-+			else if (flags & RDES_RE)	/* MII error */
-+				dev->stats.rx_missed_errors++;
-+			// TODO: If hardware checksumming, then check IP/TCP/UDP errors.
-+
-+			goto rx_complete;
-+		}
-+
-+		pktlen = flags & RDES_FLEN;
-+		pktlen = pktlen - 4;			/* remove CRC */
-+
-+		// OLD CALL: consistent_sync(lp->rxSkb[lp->rx_idx].skb->data, MAX_RXBUF_SIZE, DMA_FROM_DEVICE);
-+		dma_sync_single_for_cpu(lp->dev, lp->rxSkb[lp->rx_idx].dma, MAX_RXBUF_SIZE, DMA_FROM_DEVICE);
-+
-+		skb = dev_alloc_skb(pktlen+2);		/* +2 to align IP header */
-+		if (!skb) {
-+			dev->stats.rx_dropped++;
-+			printk(KERN_NOTICE "%s: Memory squeeze, dropping packet.\n", dev->name);
-+			goto rx_complete;
-+		}
-+
-+		skb_reserve(skb, 2);			/* align IP header */
-+		memcpy(skb_put(skb, pktlen), lp->rxSkb[lp->rx_idx].skb->data, pktlen);
-+
-+		skb->protocol = eth_type_trans(skb, dev);
-+		netif_rx(skb);
-+
-+		/* update statistics */
-+		dev->stats.rx_packets++;
-+		dev->stats.rx_bytes += pktlen;
-+		if (flags & RDES_MF)
-+			dev->stats.multicast++;
-+		dev->last_rx = jiffies;
-+
-+rx_complete:
-+		lp->rxdma[lp->rx_idx].status = RDES_OWN;	/* reset ownership bit */
-+
-+		lp->rx_idx = (lp->rx_idx + 1) % MAX_RX_DESC;	/* next descriptor */
-+	}
-+
-+	/* restart DMA receiver incase it was suspended */
-+	ks8695_write(dev, KS8695_WMDRSC, 0);
-+}
-+
-+/*
-+ * A packet has been transmitted.
-+ * (Called from interrupt context)
-+ */
-+static void ks8695eth_tx_interrupt(struct net_device *dev)
-+{
-+	struct ks8695eth_priv *lp = (struct ks8695eth_priv *) dev->priv;
-+	int i;
-+
-+	/* Packets are removed from tail of array */
-+	i = lp->tx_tail;
-+
-+	// TODO: Loop through multiple times?
-+
-+	if (lp->txSkb[i].skb) {
-+		/* update statistics */
-+		dev->stats.tx_packets++;
-+		dev->stats.tx_bytes += lp->txSkb[i].length;
-+
-+		/* free packet */
-+		dma_unmap_single(lp->dev, lp->txSkb[i].dma, lp->txSkb[i].length, DMA_TO_DEVICE);
-+		dev_kfree_skb_irq(lp->txSkb[i].skb);
-+		lp->txSkb[i].skb = NULL;
-+
-+		/* Not necessary to clear descriptor since we still own it */
-+	}
-+
-+	lp->tx_tail = (lp->tx_tail + 1) % MAX_TX_DESC;
-+
-+	netif_wake_queue(dev);
-+}
-+
-+/*
-+ * MAC interrupt handler
-+ */
-+static irqreturn_t ks8695eth_interrupt(int irq, void *dev_id)
-+{
-+	struct net_device *dev = (struct net_device *) dev_id;
-+
-+	switch (irq) {
-+		case KS8695_IRQ_LAN_RX_STATUS:
-+		case KS8695_IRQ_HPNA_RX_STATUS:
-+		case KS8695_IRQ_WAN_RX_STATUS:
-+			ks8695eth_rx_interrupt(dev);
-+			return IRQ_HANDLED;
-+
-+		case KS8695_IRQ_LAN_TX_STATUS:
-+		case KS8695_IRQ_HPNA_TX_STATUS:
-+		case KS8695_IRQ_WAN_TX_STATUS:
-+			ks8695eth_tx_interrupt(dev);
-+			return IRQ_HANDLED;
-+
-+		case KS8695_IRQ_WAN_LINK:
-+			ks8695eth_wan_link(dev);
-+			return IRQ_HANDLED;
-+
-+		default:
-+			return IRQ_NONE;
-+	}
-+}
-+
-+
-+/* ..................................................................... */
-+
-+/*
-+ * Initialize the WAN hardware to known defaults.
-+ */
-+static void __init ks8695eth_init_wan(void)
-+{
-+	unsigned long ctrl;
-+
-+	/* Support auto-negotiation */
-+	ctrl = WMC_WANAP | WMC_WANA100F | WMC_WANA100H | WMC_WANA10F | WMC_WANA10H;
-+
-+	/* LED0 = Activity , LED1 = Link */
-+	ctrl |= (WLED0S_ACTIVITY | WLED1S_LINK);
-+
-+	/* Restart Auto-negotiation */
-+	ctrl |= WMC_WANR;
-+
-+	__raw_writel(ctrl, KS8695_MISC_VA + KS8695_WMC);
-+
-+	__raw_writel(0, KS8695_MISC_VA + KS8695_WPPM);
-+	__raw_writel(0, KS8695_MISC_VA + KS8695_PPS);
-+}
-+
-+/*
-+ * Initialize the LAN Switch hardware to known defaults.
-+ */
-+static void __init ks8695eth_init_switch(void)
-+{
-+	unsigned long ctrl;
-+
-+	ctrl = 0x40819e00;		/* default */
-+
-+	/* LED0 = Speed  LED1 = Link/Activity */
-+	ctrl &= ~(SEC0_LLED1S | SEC0_LLED0S);
-+	ctrl |= (LLED0S_LINK | LLED1S_LINK_ACTIVITY);
-+
-+	/* Enable Switch */
-+	ctrl |= SEC0_ENABLE;
-+
-+	__raw_writel(ctrl, KS8695_SWITCH_VA + KS8695_SEC0);
-+
-+	__raw_writel(0x9400100, KS8695_SWITCH_VA + KS8695_SEC1);	/* reset defaults */
-+}
-+
-+static int ks8695eth_hook_irqs(struct platform_device *pdev, struct net_device *dev, unsigned long *irqset)
-+{
-+	struct resource *res;
-+	int i = 0, ret;
-+
-+	while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, i))) {
-+		set_irq_flags(res->start, IRQF_VALID | IRQF_NOAUTOEN);
-+
-+		ret = request_irq(res->start, ks8695eth_interrupt, IRQF_DISABLED | IRQF_SHARED, res->name, dev);
-+		if (ret) {
-+			printk(KERN_ERR "%s: return_irq %u failed\n", dev->name, res->start);
-+			return -EBUSY;
-+		}
-+
-+		*irqset |= (1 << res->start);
-+
-+		// TODO: Can set different priorities for interrupts [0x  BB AA FF].
-+
-+		i++;
-+	}
-+
-+	return 0;
-+}
-+
-+static int __init ks8695eth_probe(struct platform_device *pdev)
-+{
-+	struct net_device *dev;
-+	struct ks8695eth_priv *lp;
-+	struct resource *res;
-+	int i = 0, ret, size;
-+	DECLARE_MAC_BUF(mac);
-+
-+	/* Create ethernet device */
-+	dev = alloc_etherdev(sizeof(struct ks8695eth_priv));
-+	if (!dev)
-+		return -ENOMEM;
-+
-+	/* Get I/O base address */
-+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if (!res) {
-+		free_netdev(dev);
-+		return -ENODEV;
-+	}
-+	dev->base_addr = res->start;
-+
-+	lp = (struct ks8695eth_priv *) dev->priv;
-+
-+	/* Retreive MAC address before the MAC registers are reset */
-+	get_mac_address(dev);
-+
-+	/* Reset the hardware */
-+	ks8695_write(dev, KS8695_WMDTXC, WMDTXC_WMTRST);
-+	while (ks8695_read(dev, KS8695_WMDTXC) & WMDTXC_WMTRST) { barrier(); }
-+
-+	/* Get IRQ's */
-+	dev->irq = platform_get_irq(pdev, 0);
-+	ret = ks8695eth_hook_irqs(pdev, dev, &lp->irqs);
-+	if (ret) {
-+		// Cleanup.
-+	}
-+
-+	/* Allocate DMA-able memory for Tx descriptor */
-+	size = sizeof(struct tx_descriptor) * MAX_TX_DESC;
-+	lp->txdma = dma_alloc_coherent(&pdev->dev, size, &lp->txdma_phys, GFP_KERNEL);
-+	if (lp->txdma == NULL) {
-+		// free IRQs
-+		free_netdev(dev);
-+		return -ENOMEM;
-+	}
-+	memset(lp->txdma, 0, size);
-+	lp->tx_head = 0;
-+	lp->tx_tail = 0;
-+
-+	/* Allocate DMA-able memory for Rx descriptor */
-+	size = sizeof(struct rx_descriptor) * MAX_RX_DESC;
-+	lp->rxdma = dma_alloc_coherent(&pdev->dev, size, &lp->rxdma_phys, GFP_KERNEL);
-+	if (lp->rxdma == NULL) {
-+		// free IRQs
-+		// Free TX descriptor memory.
-+		free_netdev(dev);
-+		return -ENOMEM;
-+	}
-+	memset(lp->rxdma, 0, size);
-+	lp->rx_idx = 0;
-+
-+	/* Allocate DMA-able memory for Rx Data */
-+	for (i = 0; i < MAX_RX_DESC; i++) {
-+		lp->rxSkb[i].skb = alloc_skb(MAX_RXBUF_SIZE, GFP_KERNEL);
-+		if (lp->rxSkb[i].skb == NULL) {
-+			// Cleanup
-+			return -ENOMEM;
-+		}
-+		lp->rxSkb[i].length = MAX_RXBUF_SIZE;
-+		lp->rxSkb[i].dma = dma_map_single(&pdev->dev, lp->rxSkb[i].skb->data, MAX_RXBUF_SIZE, DMA_FROM_DEVICE);
-+	}
-+
-+	spin_lock_init(&lp->tx_lock);
-+
-+	platform_set_drvdata(pdev, dev);
-+
-+	ether_setup(dev);
-+	dev->open		= ks8695eth_open;
-+	dev->stop		= ks8695eth_close;
-+	dev->hard_start_xmit	= ks8695eth_xmit_frame;
-+	dev->get_stats		= ks8695eth_stats;
-+	dev->set_multicast_list	= ks8695eth_set_multi;
-+	dev->set_mac_address	= ks8695eth_set_mac;
-+	dev->ethtool_ops	= &ks8695eth_ethtool_ops;
-+
-+	SET_NETDEV_DEV(dev, &pdev->dev);
-+	lp->dev = &pdev->dev;
-+
-+	if (dev->base_addr == KS8695_WAN_VA)
-+		ks8695eth_init_wan();
-+	else if (dev->base_addr == KS8695_LAN_VA)
-+		ks8695eth_init_switch();
-+
-+	/* Register the network interface */
-+	ret = register_netdev(dev);
-+	if (ret) {
-+		// free IRQs
-+		free_netdev(dev);
-+//		dma_free_coherent(&pdev->dev, sizeof(struct ks8695_tx_dma), lp->txdma, lp->txdma_phys);
-+//		dma_free_coherent(&pdev->dev, sizeof(struct ks8695_rx_dma), lp->rxdma, lp->rxdma_phys);
-+		return ret;
-+	}
-+
-+	printk(KERN_INFO "%s: KS8695 ethernet (%s)\n", dev->name, print_mac(mac, dev->dev_addr));
-+
-+	return 0;
-+}
-+
-+static int __devexit ks8695eth_remove(struct platform_device *pdev)
-+{
-+	struct net_device *dev = platform_get_drvdata(pdev);
-+//	struct ks8695eth_priv *lp = (struct ks8695eth_priv *) dev->priv;
-+
-+	unregister_netdev(dev);
-+
-+	// Free IRQ
-+//	dma_free_coherent(&pdev->dev, sizeof(struct ks8695_tx_dma), lp->txdma, lp->txdma_phys);
-+//	dma_free_coherent(&pdev->dev, sizeof(struct ks8695_rx_dma), lp->rxdma, lp->rxdma_phys);
-+
-+	platform_set_drvdata(pdev, NULL);
-+	free_netdev(dev);
-+	return 0;
-+}
-+
-+static struct platform_driver ks8695ether_driver = {
-+	.probe		= ks8695eth_probe,
-+	.remove		= __devexit_p(ks8695eth_remove),
-+//	.suspend	=
-+//	.resume		=
-+	.driver		= {
-+		.name	= DRV_NAME,
-+		.owner	= THIS_MODULE,
-+	},
-+};
-+
-+
-+static int __init ks8695eth_init(void)
-+{
-+	return platform_driver_register(&ks8695ether_driver);
-+}
-+
-+static void __exit ks8695eth_exit(void)
-+{
-+	platform_driver_unregister(&ks8695ether_driver);
-+}
-+
-+module_init(ks8695eth_init);
-+module_exit(ks8695eth_exit);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_DESCRIPTION("KS8695 Ethernet driver");
-+MODULE_AUTHOR("Andrew Victor");
-+MODULE_ALIAS("platform:" DRV_NAME);
---- /dev/null
-+++ b/drivers/net/arm/ks8695_ether.h
-@@ -0,0 +1,92 @@
-+/*
-+ * Ethernet driver for the Micrel/Kendin KS8695 (Centaur)
-+ *
-+ * (C) 2006 Andrew Victor
-+ *
-+ */
-+
-+#ifndef KS8695_ETHERNET
-+#define KS8695_ETHERNET
-+
-+/* .... Hardware Descriptors ................................................ */
-+
-+struct rx_descriptor {
-+	unsigned long status;
-+	unsigned long length;
-+	unsigned long addr;
-+	unsigned long next;
-+};
-+
-+#define RDES_OWN	(1 << 31)	/* Ownership */
-+#define RDES_FS		(1 << 30)	/* First Descriptor */
-+#define RDES_LS		(1 << 29)	/* Last Descriptor */
-+#define RDES_IPE	(1 << 28)	/* IP Checksum error */
-+#define RDES_TCPE	(1 << 27)	/* TCP Checksum error */
-+#define RDES_UDPE	(1 << 26)	/* UDP Checksum error */
-+#define RDES_ES		(1 << 25)	/* Error summary */
-+#define RDES_MF		(1 << 24)	/* Multicast Frame */
-+#define RDES_RE		(1 << 19)	/* MII Error reported */
-+#define RDES_TL		(1 << 18)	/* Frame too Long */
-+#define RDES_RF		(1 << 17)	/* Runt Frame */
-+#define RDES_CE		(1 << 16)	/* CRC error */
-+#define RDES_FT		(1 << 15)	/* Frame Type */
-+#define RDES_FLEN	(0x7ff)		/* Frame Length */
-+
-+#define RDES_RER	(1 << 25)	/* Receive End of Ring */
-+#define RDES_RBS	(0x7ff)		/* Receive Buffer Size */
-+
-+
-+struct tx_descriptor {
-+	unsigned long ownership;
-+	unsigned long status;
-+	unsigned long addr;
-+	unsigned long next;
-+};
-+
-+#define TDES_OWN	(1 << 31)	/* Ownership */
-+
-+#define TDES_IC		(1 << 31)	/* Interrupt on Completion */
-+#define TDES_FS		(1 << 30)	/* First Segment */
-+#define TDES_LS		(1 << 29)	/* Last Segment */
-+#define TDES_IPCKG	(1 << 28)	/* IP Checksum generate */
-+#define TDES_TCPCKG	(1 << 27)	/* TCP Checksum generate */
-+#define TDES_UDPCKG	(1 << 26)	/* UDP Checksum generate */
-+#define TDES_TER	(1 << 25)	/* Transmit End of Ring */
-+#define TDES_TBS	(0x7ff)		/* Transmit Buffer Size */
-+
-+
-+/* .... ..................................................................... */
-+
-+#define MAX_RX_DESC	16		/* number of receive descriptors */
-+#define MAX_TX_DESC	8		/* number of transmit descriptors */
-+#define MAX_RXBUF_SIZE	0x600		/* 1518 rounded-up */
-+
-+struct ks8695_buffer
-+{
-+	struct sk_buff *skb;
-+	dma_addr_t dma;
-+	unsigned long length;
-+};
-+
-+
-+struct ks8695eth_priv
-+{
-+	struct device *dev;
-+	unsigned long irqs;				/* IRQ bitset */
-+
-+	/* Transmit */
-+	struct tx_descriptor *txdma;			/* Tx DMA descriptors */
-+	dma_addr_t txdma_phys;				/* TX DMA descriptors (phys address) */
-+	unsigned int tx_head;				/* descriptor index (add) */
-+	unsigned int tx_tail;				/* descriptor index (remove) */
-+	spinlock_t tx_lock;
-+	struct ks8695_buffer txSkb[MAX_TX_DESC];	/* packets being transmitted */
-+
-+	/* Receive */
-+	struct rx_descriptor *rxdma;			/* Rx DMA descriptors */
-+	dma_addr_t rxdma_phys;				/* Rx DMA descriptors (phys address) */
-+	unsigned int rx_idx;				/* descriptor index */
-+	struct ks8695_buffer rxSkb[MAX_RX_DESC];
-+};
-+
-+#endif
---- a/drivers/rtc/Kconfig
-+++ b/drivers/rtc/Kconfig
-@@ -487,12 +487,12 @@ config RTC_DRV_AT91RM9200
- 	  this is powered by the backup power supply.
- 
- config RTC_DRV_AT91SAM9
--	tristate "AT91SAM9x"
-+	tristate "AT91SAM9x or AT91CAP9"
- 	depends on ARCH_AT91 && !(ARCH_AT91RM9200 || ARCH_AT91X40)
- 	help
--	  RTC driver for the Atmel AT91SAM9x internal RTT (Real Time Timer).
--	  These timers are powered by the backup power supply (such as a
--	  small coin cell battery), but do not need to be used as RTCs.
-+	  RTC driver for the Atmel AT91SAM9x and AT91CAP9 internal RTT (Real
-+	  Time Timer).  These timers are powered by the backup power supply
-+	  (such as a small coin cell battery), but do not need to be used as RTCs.
- 
- 	  (On AT91SAM9rl chips you probably want to use the dedicated RTC
- 	  module and leave the RTT available for other uses.)
---- a/drivers/rtc/rtc-at91rm9200.c
-+++ b/drivers/rtc/rtc-at91rm9200.c
-@@ -29,9 +29,6 @@
- #include <linux/completion.h>
- 
- #include <asm/uaccess.h>
--#include <asm/rtc.h>
--
--#include <asm/mach/time.h>
- 
- #include <asm/arch/at91_rtc.h>
- 
-@@ -307,12 +304,6 @@ static int __init at91_rtc_probe(struct 
- 		return ret;
- 	}
- 
--	/* cpu init code should really have flagged this device as
--	 * being wake-capable; if it didn't, do that here.
--	 */
--	if (!device_can_wakeup(&pdev->dev))
--		device_init_wakeup(&pdev->dev, 1);
--
- 	rtc = rtc_device_register(pdev->name, &pdev->dev,
- 				&at91_rtc_ops, THIS_MODULE);
- 	if (IS_ERR(rtc)) {
---- a/drivers/rtc/rtc-at91sam9.c
-+++ b/drivers/rtc/rtc-at91sam9.c
-@@ -21,6 +21,7 @@
- 
- #include <asm/mach/time.h>
- #include <asm/arch/board.h>
-+#include <asm/arch/cpu.h>
- #include <asm/arch/at91_rtt.h>
- 
- 
-@@ -150,6 +151,9 @@ static int at91_rtc_settime(struct devic
- 	return 0;
- }
- 
-+/*
-+ * Read alarm time and date in RTC
-+ */
- static int at91_rtc_readalarm(struct device *dev, struct rtc_wkalrm *alrm)
- {
- 	struct sam9_rtc *rtc = dev_get_drvdata(dev);
-@@ -176,6 +180,9 @@ static int at91_rtc_readalarm(struct dev
- 	return 0;
- }
- 
-+/*
-+ * Set alarm time and date in RTC
-+ */
- static int at91_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)
- {
- 	struct sam9_rtc *rtc = dev_get_drvdata(dev);
-@@ -321,10 +328,6 @@ static int __init at91_rtc_probe(struct 
- 	if (!rtc)
- 		return -ENOMEM;
- 
--	/* platform setup code should have handled this; sigh */
--	if (!device_can_wakeup(&pdev->dev))
--		device_init_wakeup(&pdev->dev, 1);
--
- 	platform_set_drvdata(pdev, rtc);
- 	rtc->rtt = (void __force __iomem *) (AT91_VA_BASE_SYS - AT91_BASE_SYS);
- 	rtc->rtt += r->start;
---- a/drivers/spi/Kconfig
-+++ b/drivers/spi/Kconfig
-@@ -113,6 +113,15 @@ config SPI_GPIO
- 
- 	  If unsure, say N.
- 
-+config SPI_AT91
-+	tristate "AT91RM9200 Bitbang SPI Master"
-+	depends on SPI_MASTER && ARCH_AT91RM9200 && !SPI_ATMEL && EXPERIMENTAL
-+	select SPI_BITBANG
-+	help
-+	  This is dumb PIO bitbanging driver for the Atmel AT91RM9200.
-+	  The SPI_ATMEL driver will be its replacement, using the native
-+	  SPI hardware and its DMA controller.
-+
- config SPI_IMX
- 	tristate "Freescale iMX SPI controller"
- 	depends on SPI_MASTER && ARCH_IMX && EXPERIMENTAL
---- a/drivers/spi/Makefile
-+++ b/drivers/spi/Makefile
-@@ -29,6 +29,7 @@ obj-$(CONFIG_SPI_S3C24XX)		+= spi_s3c24x
- obj-$(CONFIG_SPI_TXX9)			+= spi_txx9.o
- obj-$(CONFIG_SPI_XILINX)		+= xilinx_spi.o
- obj-$(CONFIG_SPI_SH_SCI)		+= spi_sh_sci.o
-+obj-$(CONFIG_SPI_AT91)			+= spi_at91_bitbang.o
- # 	... add above this line ...
- 
- # SPI protocol drivers (device/link on bus)
---- /dev/null
-+++ b/drivers/spi/spi_at91_bitbang.c
-@@ -0,0 +1,208 @@
-+/*
-+ * at91_spi.c - at91 SPI driver (BOOTSTRAP/BITBANG VERSION)
-+ *
-+ * Copyright (C) 2006 David Brownell
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ */
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+
-+#include <linux/spi/spi.h>
-+#include <linux/spi/spi_bitbang.h>
-+
-+#include <asm/arch/gpio.h>
-+
-+
-+/*
-+ * FIXME this bitbanging version is just to help bootstrap systems until
-+ * there's a native SPI+IRQ+DMA controller driver ... such a driver should
-+ * be a drop-in replacement for this one, and much faster.
-+ *
-+ * remember:
-+ *
-+ *	- other at91 parts (like at91sam9) have multiple controllers
-+ *	  and different pin muxing; this version is at91rm9200 specfic.
-+ *
-+ *	- at91sam9261 SPI0 pins are directly muxed with MMC/SD pins.
-+ *
-+ *	- rm9200 spi chipselects drop wrongly, so the native driver
-+ *	  will need to use gpios much like this does.
-+ *
-+ *	- real hardware only allows 8..16 bits per word, while this
-+ *	  bitbanger allows 1..32 (incompatible superset).
-+ *
-+ *	- this disregards clock parameters.  with inlined gpio calls,
-+ *	  gcc 3.4.4 produces about 1.5 mbit/sec, more than 2x faster
-+ *	  than using the subroutined veresion from txrx_word().
-+ *
-+ *	- suspend/resume and <linux/clk.h> support is missing ...
-+ */
-+
-+#define	spi_miso_bit	AT91_PIN_PA0
-+#define	spi_mosi_bit	AT91_PIN_PA1
-+#define	spi_sck_bit	AT91_PIN_PA2
-+
-+struct at91_spi {
-+	struct spi_bitbang	bitbang;
-+	struct platform_device	*pdev;
-+};
-+
-+/*----------------------------------------------------------------------*/
-+
-+static inline void setsck(struct spi_device *spi, int is_on)
-+{
-+	at91_set_gpio_value(spi_sck_bit, is_on);
-+}
-+
-+static inline void setmosi(struct spi_device *spi, int is_on)
-+{
-+	at91_set_gpio_value(spi_mosi_bit, is_on);
-+}
-+
-+static inline int getmiso(struct spi_device *spi)
-+{
-+	return at91_get_gpio_value(spi_miso_bit);
-+}
-+
-+static void at91_spi_chipselect(struct spi_device *spi, int is_active)
-+{
-+	unsigned long cs = (unsigned long) spi->controller_data;
-+
-+	/* set default clock polarity */
-+	if (is_active)
-+		setsck(spi, spi->mode & SPI_CPOL);
-+
-+	/* only support active-low (default) */
-+	at91_set_gpio_value(cs, !is_active);
-+}
-+
-+/*
-+ * NOTE:  this is "as fast as we can"; it should be a function of
-+ * the device clock ...
-+ */
-+#define	spidelay(X)	do{} while(0)
-+
-+#define	EXPAND_BITBANG_TXRX
-+#include <linux/spi/spi_bitbang.h>
-+
-+static u32 at91_spi_txrx_word_mode0(struct spi_device *spi,
-+		unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha0(spi, nsecs, 0, word, 8);
-+}
-+
-+static u32 at91_spi_txrx_word_mode1(struct spi_device *spi,
-+		unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha1(spi, nsecs, 0, word, 8);
-+}
-+
-+static u32 at91_spi_txrx_word_mode2(struct spi_device *spi,
-+		unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha0(spi, nsecs, 1, word, 8);
-+}
-+
-+static u32 at91_spi_txrx_word_mode3(struct spi_device *spi,
-+		unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha1(spi, nsecs, 1, word, 8);
-+}
-+
-+/*----------------------------------------------------------------------*/
-+
-+static int __init at91_spi_probe(struct platform_device *pdev)
-+{
-+	int			status;
-+	struct spi_master	*master;
-+	struct at91_spi		*at91_spi;
-+
-+	if (pdev->id != 0)	/* SPI0 bus */
-+		return -EINVAL;
-+
-+	master = spi_alloc_master(&pdev->dev, sizeof *at91_spi);
-+	if (!master)
-+		return -ENOMEM;
-+
-+	at91_spi = spi_master_get_devdata(master);
-+	at91_spi->pdev = pdev;
-+	platform_set_drvdata(pdev, at91_spi);
-+
-+	/* SPI and bitbang hookup */
-+	master->bus_num = 0;
-+	master->num_chipselect = 4;
-+
-+	at91_spi->bitbang.master = spi_master_get(master);
-+	at91_spi->bitbang.chipselect = at91_spi_chipselect;
-+	at91_spi->bitbang.txrx_word[SPI_MODE_0] = at91_spi_txrx_word_mode0;
-+	at91_spi->bitbang.txrx_word[SPI_MODE_1] = at91_spi_txrx_word_mode1;
-+	at91_spi->bitbang.txrx_word[SPI_MODE_2] = at91_spi_txrx_word_mode2;
-+	at91_spi->bitbang.txrx_word[SPI_MODE_3] = at91_spi_txrx_word_mode3;
-+
-+	status = spi_bitbang_start(&at91_spi->bitbang);
-+	if (status < 0)
-+		(void) spi_master_put(at91_spi->bitbang.master);
-+
-+	return status;
-+}
-+
-+static int __exit at91_spi_remove(struct platform_device *pdev)
-+{
-+	struct at91_spi	*at91_spi = platform_get_drvdata(pdev);
-+	int status;
-+
-+	/* stop() unregisters child devices too */
-+	status = spi_bitbang_stop(&at91_spi->bitbang);
-+	(void) spi_master_put(at91_spi->bitbang.master);
-+
-+	platform_set_drvdata(pdev, NULL);
-+	return status;
-+}
-+
-+static struct platform_driver at91_spi_driver = {
-+	.probe		= at91_spi_probe,
-+	.remove		= __exit_p(at91_spi_remove),
-+	.driver		= {
-+		.name	= "at91_spi",
-+		.owner	= THIS_MODULE,
-+	},
-+};
-+
-+static int __init at91_spi_init(void)
-+{
-+	at91_set_gpio_output(spi_sck_bit, 0);
-+	at91_set_gpio_output(spi_mosi_bit, 0);
-+	at91_set_gpio_input(spi_miso_bit, 1 /* pullup */);
-+
-+	/* register driver */
-+	return platform_driver_register(&at91_spi_driver);
-+}
-+
-+static void __exit at91_spi_exit(void)
-+{
-+	platform_driver_unregister(&at91_spi_driver);
-+}
-+
-+device_initcall(at91_spi_init);
-+module_exit(at91_spi_exit);
-+
-+MODULE_ALIAS("at91_spi.0");
-+
-+MODULE_DESCRIPTION("AT91 SPI support (BOOTSTRAP/BITBANG VERSION)");
-+MODULE_AUTHOR("David Brownell");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS("platform:at91_spi");
---- a/drivers/usb/gadget/Kconfig
-+++ b/drivers/usb/gadget/Kconfig
-@@ -118,10 +118,10 @@ config USB_AMD5536UDC
- config USB_GADGET_ATMEL_USBA
- 	boolean "Atmel USBA"
- 	select USB_GADGET_DUALSPEED
--	depends on AVR32
-+	depends on AVR32 || ARCH_AT91CAP9 || ARCH_AT91SAM9RL
- 	help
- 	  USBA is the integrated high-speed USB Device controller on
--	  the AT32AP700x processors from Atmel.
-+	  the AT32AP700x, some AT91SAM9 and AT91CAP9 processors from Atmel.
- 
- config USB_ATMEL_USBA
- 	tristate
---- a/drivers/usb/gadget/at91_udc.c
-+++ b/drivers/usb/gadget/at91_udc.c
-@@ -1827,7 +1827,7 @@ static int at91udc_suspend(struct platfo
- 	 */
- 	if ((!udc->suspended && udc->addr)
- 			|| !wake
--			|| at91_suspend_entering_slow_clock()) {
-+			|| clk_must_disable(udc->fclk)) {
- 		pullup(udc, 0);
- 		wake = 0;
- 	} else
---- a/drivers/usb/gadget/atmel_usba_udc.c
-+++ b/drivers/usb/gadget/atmel_usba_udc.c
-@@ -18,6 +18,7 @@
- #include <linux/platform_device.h>
- #include <linux/usb/ch9.h>
- #include <linux/usb/gadget.h>
-+#include <linux/usb/atmel_usba_udc.h>
- #include <linux/delay.h>
- 
- #include <asm/gpio.h>
-@@ -27,6 +28,7 @@
- 
- 
- static struct usba_udc the_udc;
-+static struct usba_ep *usba_ep;
- 
- #ifdef CONFIG_USB_GADGET_DEBUG_FS
- #include <linux/debugfs.h>
-@@ -324,53 +326,6 @@ static int vbus_is_present(struct usba_u
- 	return 1;
- }
- 
--static void copy_to_fifo(void __iomem *fifo, const void *buf, int len)
--{
--	unsigned long tmp;
--
--	DBG(DBG_FIFO, "copy to FIFO (len %d):\n", len);
--	for (; len > 0; len -= 4, buf += 4, fifo += 4) {
--		tmp = *(unsigned long *)buf;
--		if (len >= 4) {
--			DBG(DBG_FIFO, "  -> %08lx\n", tmp);
--			__raw_writel(tmp, fifo);
--		} else {
--			do {
--				DBG(DBG_FIFO, "  -> %02lx\n", tmp >> 24);
--				__raw_writeb(tmp >> 24, fifo);
--				fifo++;
--				tmp <<= 8;
--			} while (--len);
--			break;
--		}
--	}
--}
--
--static void copy_from_fifo(void *buf, void __iomem *fifo, int len)
--{
--	union {
--		unsigned long *w;
--		unsigned char *b;
--	} p;
--	unsigned long tmp;
--
--	DBG(DBG_FIFO, "copy from FIFO (len %d):\n", len);
--	for (p.w = buf; len > 0; len -= 4, p.w++, fifo += 4) {
--		if (len >= 4) {
--			tmp = __raw_readl(fifo);
--			*p.w = tmp;
--			DBG(DBG_FIFO, "  -> %08lx\n", tmp);
--		} else {
--			do {
--				tmp = __raw_readb(fifo);
--				*p.b = tmp;
--				DBG(DBG_FIFO, " -> %02lx\n", tmp);
--				fifo++, p.b++;
--			} while (--len);
--		}
--	}
--}
--
- static void next_fifo_transaction(struct usba_ep *ep, struct usba_request *req)
- {
- 	unsigned int transaction_len;
-@@ -387,7 +342,7 @@ static void next_fifo_transaction(struct
- 		ep->ep.name, req, transaction_len,
- 		req->last_transaction ? ", done" : "");
- 
--	copy_to_fifo(ep->fifo, req->req.buf + req->req.actual, transaction_len);
-+	memcpy_toio(ep->fifo, req->req.buf + req->req.actual, transaction_len);
- 	usba_ep_writel(ep, SET_STA, USBA_TX_PK_RDY);
- 	req->req.actual += transaction_len;
- }
-@@ -476,7 +431,7 @@ static void receive_data(struct usba_ep 
- 			bytecount = req->req.length - req->req.actual;
- 		}
- 
--		copy_from_fifo(req->req.buf + req->req.actual,
-+		memcpy_fromio(req->req.buf + req->req.actual,
- 				ep->fifo, bytecount);
- 		req->req.actual += bytecount;
- 
-@@ -1029,33 +984,6 @@ static const struct usb_gadget_ops usba_
- 	.set_selfpowered	= usba_udc_set_selfpowered,
- };
- 
--#define EP(nam, idx, maxpkt, maxbk, dma, isoc)			\
--{								\
--	.ep	= {						\
--		.ops		= &usba_ep_ops,			\
--		.name		= nam,				\
--		.maxpacket	= maxpkt,			\
--	},							\
--	.udc		= &the_udc,				\
--	.queue		= LIST_HEAD_INIT(usba_ep[idx].queue),	\
--	.fifo_size	= maxpkt,				\
--	.nr_banks	= maxbk,				\
--	.index		= idx,					\
--	.can_dma	= dma,					\
--	.can_isoc	= isoc,					\
--}
--
--static struct usba_ep usba_ep[] = {
--	EP("ep0", 0, 64, 1, 0, 0),
--	EP("ep1in-bulk", 1, 512, 2, 1, 1),
--	EP("ep2out-bulk", 2, 512, 2, 1, 1),
--	EP("ep3in-int", 3, 64, 3, 1, 0),
--	EP("ep4out-int", 4, 64, 3, 1, 0),
--	EP("ep5in-iso", 5, 1024, 3, 1, 1),
--	EP("ep6out-iso", 6, 1024, 3, 1, 1),
--};
--#undef EP
--
- static struct usb_endpoint_descriptor usba_ep0_desc = {
- 	.bLength = USB_DT_ENDPOINT_SIZE,
- 	.bDescriptorType = USB_DT_ENDPOINT,
-@@ -1074,7 +1002,6 @@ static void nop_release(struct device *d
- static struct usba_udc the_udc = {
- 	.gadget	= {
- 		.ops		= &usba_udc_ops,
--		.ep0		= &usba_ep[0].ep,
- 		.ep_list	= LIST_HEAD_INIT(the_udc.gadget.ep_list),
- 		.is_dualspeed	= 1,
- 		.name		= "atmel_usba_udc",
-@@ -1231,7 +1158,7 @@ static int do_test_mode(struct usba_udc 
- 		} else {
- 			usba_ep_writel(ep, CTL_ENB, USBA_EPT_ENABLE);
- 			usba_writel(udc, TST, USBA_TST_PKT_MODE);
--			copy_to_fifo(ep->fifo, test_packet_buffer,
-+			memcpy_toio(ep->fifo, test_packet_buffer,
- 					sizeof(test_packet_buffer));
- 			usba_ep_writel(ep, SET_STA, USBA_TX_PK_RDY);
- 			dev_info(dev, "Entering Test_Packet mode...\n");
-@@ -1530,13 +1457,13 @@ restart:
- 		DBG(DBG_HW, "Packet length: %u\n", pkt_len);
- 		if (pkt_len != sizeof(crq)) {
- 			pr_warning("udc: Invalid packet length %u "
--				"(expected %lu)\n", pkt_len, sizeof(crq));
-+				"(expected %zu)\n", pkt_len, sizeof(crq));
- 			set_protocol_stall(udc, ep);
- 			return;
- 		}
- 
- 		DBG(DBG_FIFO, "Copying ctrl request from 0x%p:\n", ep->fifo);
--		copy_from_fifo(crq.data, ep->fifo, sizeof(crq));
-+		memcpy_fromio(crq.data, ep->fifo, sizeof(crq));
- 
- 		/* Free up one bank in the FIFO so that we can
- 		 * generate or receive a reply right away. */
-@@ -1908,7 +1835,7 @@ static int __init usba_udc_probe(struct 
- 
- 	regs = platform_get_resource(pdev, IORESOURCE_MEM, CTRL_IOMEM_ID);
- 	fifo = platform_get_resource(pdev, IORESOURCE_MEM, FIFO_IOMEM_ID);
--	if (!regs || !fifo)
-+	if (!regs || !fifo || !pdata)
- 		return -ENXIO;
- 
- 	irq = platform_get_irq(pdev, 0);
-@@ -1956,16 +1883,44 @@ static int __init usba_udc_probe(struct 
- 	usba_writel(udc, CTRL, 0);
- 	clk_disable(pclk);
- 
-+	usba_ep = kmalloc(sizeof(struct usba_ep) * pdata->num_ep,
-+			  GFP_KERNEL);
-+	if (!usba_ep)
-+		goto err_alloc_ep;
-+
-+	the_udc.gadget.ep0 = &usba_ep[0].ep;
-+
- 	INIT_LIST_HEAD(&usba_ep[0].ep.ep_list);
- 	usba_ep[0].ep_regs = udc->regs + USBA_EPT_BASE(0);
- 	usba_ep[0].dma_regs = udc->regs + USBA_DMA_BASE(0);
- 	usba_ep[0].fifo = udc->fifo + USBA_FIFO_BASE(0);
--	for (i = 1; i < ARRAY_SIZE(usba_ep); i++) {
-+	usba_ep[0].ep.ops = &usba_ep_ops;
-+	usba_ep[0].ep.name = pdata->ep[0].name;
-+	usba_ep[0].ep.maxpacket = pdata->ep[0].fifo_size;
-+	usba_ep[0].udc = &the_udc;
-+	INIT_LIST_HEAD(&usba_ep[0].queue);
-+	usba_ep[0].fifo_size = pdata->ep[0].fifo_size;
-+	usba_ep[0].nr_banks = pdata->ep[0].nr_banks;
-+	usba_ep[0].index = pdata->ep[0].index;
-+	usba_ep[0].can_dma = pdata->ep[0].can_dma;
-+	usba_ep[0].can_isoc = pdata->ep[0].can_isoc;
-+
-+	for (i = 1; i < pdata->num_ep; i++) {
- 		struct usba_ep *ep = &usba_ep[i];
- 
- 		ep->ep_regs = udc->regs + USBA_EPT_BASE(i);
- 		ep->dma_regs = udc->regs + USBA_DMA_BASE(i);
- 		ep->fifo = udc->fifo + USBA_FIFO_BASE(i);
-+		ep->ep.ops = &usba_ep_ops;
-+		ep->ep.name = pdata->ep[i].name;
-+		ep->ep.maxpacket = pdata->ep[i].fifo_size;
-+		ep->udc = &the_udc;
-+		INIT_LIST_HEAD(&ep->queue);
-+		ep->fifo_size = pdata->ep[i].fifo_size;
-+		ep->nr_banks = pdata->ep[i].nr_banks;
-+		ep->index = pdata->ep[i].index;
-+		ep->can_dma = pdata->ep[i].can_dma;
-+		ep->can_isoc = pdata->ep[i].can_isoc;
- 
- 		list_add_tail(&ep->ep.ep_list, &udc->gadget.ep_list);
- 	}
-@@ -1984,7 +1939,7 @@ static int __init usba_udc_probe(struct 
- 		goto err_device_add;
- 	}
- 
--	if (pdata && pdata->vbus_pin != GPIO_PIN_NONE) {
-+	if (pdata->vbus_pin >= 0) {
- 		if (!gpio_request(pdata->vbus_pin, "atmel_usba_udc")) {
- 			udc->vbus_pin = pdata->vbus_pin;
- 
-@@ -2004,7 +1959,7 @@ static int __init usba_udc_probe(struct 
- 	}
- 
- 	usba_init_debugfs(udc);
--	for (i = 1; i < ARRAY_SIZE(usba_ep); i++)
-+	for (i = 1; i < pdata->num_ep; i++)
- 		usba_ep_init_debugfs(udc, &usba_ep[i]);
- 
- 	return 0;
-@@ -2012,6 +1967,8 @@ static int __init usba_udc_probe(struct 
- err_device_add:
- 	free_irq(irq, udc);
- err_request_irq:
-+	kfree(usba_ep);
-+err_alloc_ep:
- 	iounmap(udc->fifo);
- err_map_fifo:
- 	iounmap(udc->regs);
-@@ -2029,10 +1986,11 @@ static int __exit usba_udc_remove(struct
- {
- 	struct usba_udc *udc;
- 	int i;
-+	struct usba_platform_data *pdata = pdev->dev.platform_data;
- 
- 	udc = platform_get_drvdata(pdev);
- 
--	for (i = 1; i < ARRAY_SIZE(usba_ep); i++)
-+	for (i = 1; i < pdata->num_ep; i++)
- 		usba_ep_cleanup_debugfs(&usba_ep[i]);
- 	usba_cleanup_debugfs(udc);
- 
---- a/drivers/usb/host/ohci-at91.c
-+++ b/drivers/usb/host/ohci-at91.c
-@@ -330,7 +330,7 @@ ohci_hcd_at91_drv_suspend(struct platfor
- 	 *
- 	 * REVISIT: some boards will be able to turn VBUS off...
- 	 */
--	if (at91_suspend_entering_slow_clock()) {
-+	if (clk_must_disable(fclk)) {
- 		ohci_usb_reset (ohci);
- 		at91_stop_clock();
- 	}
---- a/drivers/video/Kconfig
-+++ b/drivers/video/Kconfig
-@@ -889,6 +889,17 @@ config FB_EPSON1355
- 	  framebuffer.  Product specs at
- 	  <http://www.erd.epson.com/vdc/html/products.htm>.
- 
-+config FB_S1D15605
-+	tristate "Epson S1D15605 framebuffer support"
-+	depends on FB
-+	default m if MACH_KB9200
-+	select FB_CFB_FILLRECT
-+	select FB_CFB_COPYAREA
-+	select FB_CFB_IMAGEBLIT
-+	help
-+	  Build in support for the S1D15605 Epson Research 128x64
-+	  LCD controller as a framebuffer.
-+
- config FB_S1D13XXX
- 	tristate "Epson S1D13XXX framebuffer support"
- 	depends on FB
---- a/drivers/video/Makefile
-+++ b/drivers/video/Makefile
-@@ -87,7 +87,8 @@ obj-$(CONFIG_FB_G364)             += g36
- obj-$(CONFIG_FB_SA1100)           += sa1100fb.o
- obj-$(CONFIG_FB_HIT)              += hitfb.o
- obj-$(CONFIG_FB_EPSON1355)	  += epson1355fb.o
--obj-$(CONFIG_FB_ATMEL)		  += atmel_lcdfb.o
-+obj-$(CONFIG_FB_S1D15605)	  += s1d15605fb.o
-+obj-$(CONFIG_FB_ATMEL)            += atmel_lcdfb.o
- obj-$(CONFIG_FB_PVR2)             += pvr2fb.o
- obj-$(CONFIG_FB_VOODOO1)          += sstfb.o
- obj-$(CONFIG_FB_ARMCLCD)	  += amba-clcd.o
---- a/drivers/video/atmel_lcdfb.c
-+++ b/drivers/video/atmel_lcdfb.c
-@@ -31,7 +31,7 @@
- #define ATMEL_LCDC_CVAL_DEFAULT		0xc8
- #define ATMEL_LCDC_DMA_BURST_LEN	8
- 
--#if defined(CONFIG_ARCH_AT91SAM9263) || defined(CONFIG_ARCH_AT91CAP9)
-+#if defined(CONFIG_ARCH_AT91SAM9263) || defined(CONFIG_ARCH_AT91CAP9) || defined(CONFIG_ARCH_AT91SAM9RL)
- #define ATMEL_LCDC_FIFO_SIZE		2048
- #else
- #define ATMEL_LCDC_FIFO_SIZE		512
-@@ -903,11 +903,45 @@ static int __exit atmel_lcdfb_remove(str
- 	return 0;
- }
- 
--static struct platform_driver atmel_lcdfb_driver = {
--	.remove		= __exit_p(atmel_lcdfb_remove),
-+#ifdef CONFIG_PM
-+
-+static int atmel_lcdfb_suspend(struct platform_device *pdev, pm_message_t mesg)
-+{
-+	struct fb_info *info = platform_get_drvdata(pdev);
-+	struct atmel_lcdfb_info *sinfo = info->par;
-+
-+	sinfo->saved_lcdcon = lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
-+	lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, 0);
-+	if (sinfo->atmel_lcdfb_power_control)
-+		sinfo->atmel_lcdfb_power_control(0);
-+	atmel_lcdfb_stop_clock(sinfo);
- 
--// FIXME need suspend, resume
-+	return 0;
-+}
-+
-+static int atmel_lcdfb_resume(struct platform_device *pdev)
-+{
-+	struct fb_info *info = platform_get_drvdata(pdev);
-+	struct atmel_lcdfb_info *sinfo = info->par;
- 
-+	atmel_lcdfb_start_clock(sinfo);
-+	if (sinfo->atmel_lcdfb_power_control)
-+		sinfo->atmel_lcdfb_power_control(1);
-+	lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, sinfo->saved_lcdcon);
-+
-+	return 0;
-+}
-+
-+#else
-+#define atmel_lcdfb_suspend	NULL
-+#define atmel_lcdfb_resume	NULL
-+#endif
-+
-+
-+static struct platform_driver atmel_lcdfb_driver = {
-+	.remove		= __exit_p(atmel_lcdfb_remove),
-+	.suspend	= atmel_lcdfb_suspend,
-+	.resume		= atmel_lcdfb_resume,
- 	.driver		= {
- 		.name	= "atmel_lcdfb",
- 		.owner	= THIS_MODULE,
---- a/drivers/video/backlight/Kconfig
-+++ b/drivers/video/backlight/Kconfig
-@@ -112,3 +112,11 @@ config BACKLIGHT_CARILLO_RANCH
- 	help
- 	  If you have a Intel LE80578 (Carillo Ranch) say Y to enable the
- 	  backlight driver.
-+
-+config BACKLIGHT_KB920x
-+	tristate "KwikByte KB9202 Backlight Driver"
-+	depends on BACKLIGHT_CLASS_DEVICE && MACH_KB9200
-+	default y
-+	help
-+	  If you have a KwikByte KB9202 board, say Y to enable the
-+	  backlight driver.
---- a/drivers/video/backlight/Makefile
-+++ b/drivers/video/backlight/Makefile
-@@ -10,3 +10,4 @@ obj-$(CONFIG_BACKLIGHT_LOCOMO)	+= locomo
- obj-$(CONFIG_BACKLIGHT_OMAP1)	+= omap1_bl.o
- obj-$(CONFIG_BACKLIGHT_PROGEAR) += progear_bl.o
- obj-$(CONFIG_BACKLIGHT_CARILLO_RANCH) += cr_bllcd.o
-+obj-$(CONFIG_BACKLIGHT_KB920x)	+= kb920x_bl.o
---- /dev/null
-+++ b/drivers/video/backlight/kb920x_bl.c
-@@ -0,0 +1,164 @@
-+/*
-+ * Backlight Driver for KB9202
-+ *
-+ * Copyright (c) 2006 KwikByte
-+ *
-+ * Based on Sharp's Corgi Backlight Driver
-+ *
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License.  See the file "COPYING" in the main directory of this archive
-+ * for more details.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+#include <linux/spinlock.h>
-+#include <linux/fb.h>
-+#include <linux/backlight.h>
-+
-+#include <asm/arch/gpio.h>
-+
-+/* The backlight is on(1)/off(0) */
-+#define	KB9202_DEFAULT_INTENSITY	1
-+#define	KB9202_MAX_INTENSITY		1
-+
-+static int kb9202bl_suspended;
-+static int current_intensity = 0;
-+static DEFINE_SPINLOCK(bl_lock);
-+
-+static int kb9202bl_set_intensity(struct backlight_device *bd)
-+{
-+	unsigned long flags;
-+	int intensity = bd->props.brightness;
-+
-+	if (bd->props.power != FB_BLANK_UNBLANK)
-+		intensity = 0;
-+	if (bd->props.fb_blank != FB_BLANK_UNBLANK)
-+		intensity = 0;
-+	if (kb9202bl_suspended)
-+		intensity = 0;
-+
-+	if ((!current_intensity) && (bd->props.power == FB_BLANK_UNBLANK))
-+		intensity = 1;
-+
-+	spin_lock_irqsave(&bl_lock, flags);
-+	if (intensity)
-+		gpio_set_value(AT91_PIN_PC23, 1);
-+	else
-+		gpio_set_value(AT91_PIN_PC23, 0);
-+	spin_unlock_irqrestore(&bl_lock, flags);
-+
-+	current_intensity = intensity;
-+
-+	return 0;
-+}
-+
-+static int kb9202bl_get_intensity(struct backlight_device *bd)
-+{
-+	return current_intensity;
-+}
-+
-+static struct backlight_ops kb9202bl_ops = {
-+	.get_brightness	= kb9202bl_get_intensity,
-+	.update_status	= kb9202bl_set_intensity,
-+};
-+
-+static int __init kb9202bl_probe(struct platform_device *pdev)
-+{
-+	struct backlight_device *bd;
-+
-+	bd = backlight_device_register ("kb9202-bl", &pdev->dev, NULL, &kb9202bl_ops);
-+	if (IS_ERR(bd))
-+		return PTR_ERR(bd);
-+
-+	platform_set_drvdata(pdev, bd);
-+
-+	bd->props.max_brightness = KB9202_MAX_INTENSITY;
-+	bd->props.brightness = KB9202_DEFAULT_INTENSITY;
-+	(void) kb9202bl_set_intensity(bd);
-+
-+	return 0;
-+}
-+
-+static int kb9202bl_remove(struct platform_device *pdev)
-+{
-+	struct backlight_device *bd = platform_get_drvdata(pdev);
-+
-+	bd->props.brightness = 0;
-+	bd->props.power = 0;
-+	(void) kb9202bl_set_intensity(bd);
-+
-+	backlight_device_unregister(bd);
-+
-+	return 0;
-+}
-+
-+#ifdef CONFIG_PM
-+static int kb9202bl_suspend(struct platform_device *pdev, pm_message_t state)
-+{
-+	struct backlight_device *bd = platform_get_drvdata(pdev);
-+
-+	kb9202bl_suspended = 1;
-+	(void) kb9202bl_set_intensity(bd);
-+	return 0;
-+}
-+
-+static int kb9202bl_resume(struct platform_device *pdev)
-+{
-+	struct backlight_device *bd = platform_get_drvdata(pdev);
-+
-+	kb9202bl_suspended = 0;
-+	(void) kb9202bl_set_intensity(bd);
-+	return 0;
-+}
-+#else
-+#define kb9202bl_suspend	NULL
-+#define kb9202bl_resume		NULL
-+#endif
-+
-+static struct platform_driver kb9202bl_driver = {
-+	.probe		= kb9202bl_probe,
-+	.remove		= kb9202bl_remove,
-+	.suspend	= kb9202bl_suspend,
-+	.resume		= kb9202bl_resume,
-+	.driver		= {
-+		.name	= "kb9202-bl",
-+		.owner	= THIS_MODULE,
-+	},
-+};
-+
-+static struct platform_device *kb9202bl_device;
-+
-+static int __init kb9202bl_init(void)
-+{
-+	int ret;
-+
-+	ret = platform_driver_register(&kb9202bl_driver);
-+	if (!ret) {
-+		kb9202bl_device = platform_device_alloc("kb9202-bl", -1);
-+		if (!kb9202bl_device)
-+			return -ENOMEM;
-+
-+		ret = platform_device_add(kb9202bl_device);
-+		if (ret) {
-+			platform_device_put(kb9202bl_device);
-+			platform_driver_unregister(&kb9202bl_driver);
-+		}
-+	}
-+	return ret;
-+}
-+
-+static void __exit kb9202bl_exit(void)
-+{
-+	platform_device_unregister(kb9202bl_device);
-+	platform_driver_unregister(&kb9202bl_driver);
-+}
-+
-+module_init(kb9202bl_init);
-+module_exit(kb9202bl_exit);
-+
-+MODULE_AUTHOR("KwikByte <kb9200_dev@kwikbyte.com>");
-+MODULE_DESCRIPTION("KB9202 Backlight Driver");
-+MODULE_LICENSE("GPL");
---- /dev/null
-+++ b/drivers/video/s1d15605fb.c
-@@ -0,0 +1,655 @@
-+/*
-+ *  drivers/video/s1d15605.c
-+ *
-+ * Adapted from several sources including:
-+ * 1) Driver for AT91 LCD Controller
-+ *    Copyright (C) 2006 Atmel
-+ *
-+ * 2) Copyright (C) 2005 S. Kevin Hester
-+ *
-+ *   This file is subject to the terms and conditions of the GNU General Public
-+ *   License. See the file COPYING in the main directory of this archive for
-+ *   more details.
-+ *
-+ *   This is a basic framebuffer driver for the Optrex F-51320 128x64 mono LCD
-+ *   display.  This display uses a clone of the common Epson SED 1531 display
-+ *   controller.
-+ *
-+ *   I've heavily borrowed code from the vfb.c driver.
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#ifdef DEBUG
-+#define MSG(string, args...) printk("s1d15605fb:" string, ##args)
-+#else
-+#define MSG(string, args...)
-+#endif
-+
-+#include <linux/kernel.h>
-+#include <linux/platform_device.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/interrupt.h>
-+#include <linux/clk.h>
-+#include <linux/fb.h>
-+#include <linux/init.h>
-+#include <linux/delay.h>
-+
-+#include <asm/uaccess.h>
-+
-+#include <asm/arch/board.h>
-+#include <asm/arch/gpio.h>
-+
-+#ifdef CONFIG_PMAC_BACKLIGHT
-+#include <asm/backlight.h>
-+#endif
-+
-+#define VIDEOWIDTH		128
-+#define VIDEOHEIGHT		64
-+#define VIDEODEPTH		1	/* bits/pixel */
-+#define VIDEOWIDTH_BYTES	((VIDEOWIDTH * VIDEODEPTH) / 8)
-+
-+/* The number of bytes that actually go to the device */
-+#define ACTUALVIDEOMEMSIZE	(VIDEOWIDTH_BYTES * VIDEOHEIGHT)
-+#define VIDEOMEMSIZE		PAGE_SIZE
-+
-+static struct fb_var_screeninfo s1d15605_default __initdata = {
-+	.xres		= VIDEOWIDTH,
-+	.yres		= VIDEOHEIGHT,
-+	.xres_virtual	= VIDEOWIDTH,
-+	.yres_virtual	= VIDEOHEIGHT,
-+	.bits_per_pixel	= VIDEODEPTH,
-+	.red		= { 0, 1, 0 },
-+	.green		= { 0, 1, 0 },
-+	.blue		= { 0, 1, 0 },
-+	.activate	= FB_ACTIVATE_NOW,
-+	.pixclock	= 20000,
-+	.vmode		= FB_VMODE_NONINTERLACED,
-+};
-+
-+static struct fb_fix_screeninfo s1d15605_fix __initdata = {
-+	.id		= "s1d15605",
-+	.type		= FB_TYPE_PACKED_PIXELS,
-+	.visual		= FB_VISUAL_MONO10,
-+	.xpanstep	= 0,
-+	.ypanstep	= 0,
-+	.ywrapstep	= 0,
-+	.accel		= FB_ACCEL_NONE,
-+};
-+
-+struct s1d15605fb_info {
-+	struct fb_info		*info;
-+	char			*mmio;
-+	unsigned long		reset_pin;
-+	struct platform_device	*pdev;
-+};
-+
-+/*
-+ * LCD device interface
-+ */
-+#define	RESET_DISPLAY		0xE2
-+#define	LCD_BIAS_1_9		0xA2
-+#define	ADC_SELECT_REVERSE	0xA1
-+#define	COMMON_OUTPUT_NORMAL	0xC0
-+#define	V5_RESISTOR_RATIO	0x26
-+#define	ELECTRONIC_VOLUME_SET	0x81
-+#define	ELECTRONIC_VOLUME_INIT	0x20
-+#define	POWER_CONTROL_SET	0x28
-+#define	VOLTAGE_REGULATOR	0x02
-+#define	VOLTAGE_FOLLOWER	0x01
-+#define	BOOSTER_CIRCUIT		0x04
-+#define	DISPLAY_ON		0xAF
-+#define	START_LINE_SET		0x40
-+#define	PAGE_ADDRESS_SET	0xB0
-+#define	COLUMN_ADDRESS_HIGH	0x10
-+#define	COLUMN_ADDRESS_LOW	0x00
-+#define	RESISTOR_RATIO_START	0x20
-+
-+#define	NUM_OF_PAGES		8
-+#define	NUM_OF_COLUMNS		128
-+
-+#define	WRITE_COMMAND(x)	__raw_writeb((x), (sinfo)->mmio)
-+#define	READ_COMMAND		__raw_readb((sinfo)->mmio)
-+#define	WRITE_DATA(x)		__raw_writeb((x), (sinfo)->mmio + (0x10000))
-+#define	READ_DATA		__raw_readb((sinfo)->mmio + (0x10000))
-+
-+
-+/*
-+ *	s1d15605fb_resize_framebuffer
-+ *
-+ *	Free allocated space if different.  Allocate on new of changed.
-+ *	Returns -ENOMEM if the new framebuffer can not be allocated,
-+ *	zero on success.
-+ */
-+static int s1d15605fb_resize_framebuffer(struct s1d15605fb_info *sinfo)
-+{
-+	struct fb_info			*info = sinfo->info;
-+	struct fb_fix_screeninfo	*fix = &info->fix;
-+	struct fb_var_screeninfo	*var = &info->var;
-+	unsigned int			new_size;
-+	void				*new_vaddr;
-+
-+	new_size = ((var->xres_virtual * var->yres_virtual * var->bits_per_pixel) / 8);
-+
-+	MSG("%s: x (%d) y (%d) bpp (%d): new size 0x%08x\n", __FUNCTION__,
-+		var->xres_virtual, var->yres_virtual, var->bits_per_pixel, new_size);
-+
-+	if (new_size == fix->smem_len)
-+		return 0;
-+
-+	if (fix->smem_len) {
-+		kfree(info->screen_base);
-+	}
-+
-+	new_vaddr = kmalloc(new_size, GFP_KERNEL);
-+
-+	if (!new_vaddr) {
-+		fix->smem_len = 0;
-+		return -ENOMEM;
-+	}
-+
-+	info->screen_base = new_vaddr;
-+	fix->smem_start = (unsigned)new_vaddr;
-+	fix->smem_len = new_size;
-+	fix->line_length = (var->xres_virtual * var->bits_per_pixel) / 8;
-+
-+	dev_info(info->device,
-+		"%luKiB frame buffer at %08lx (mapped at %p)\n",
-+		(unsigned long)info->fix.smem_len / 1024,
-+		(unsigned long)info->fix.smem_start,
-+		info->screen_base);
-+
-+	return 0;
-+}
-+
-+
-+/*
-+ * The s1d15605 seems to be divided into eight 128 pixel wide pages (from top to
-+ * bottom) each page seems to be eight pixels high, where these eight pixels are
-+ * one byte
-+ */
-+static void s1d15605_update(struct fb_info *info)
-+{
-+	struct s1d15605fb_info	*sinfo = info->par;
-+	int			page, i, row, colmask;
-+	u8			retVal, *rowPtr;
-+
-+	WRITE_COMMAND(START_LINE_SET);
-+	for (page = 0; page < NUM_OF_PAGES; ++page) {
-+		WRITE_COMMAND(PAGE_ADDRESS_SET + page);
-+		WRITE_COMMAND(COLUMN_ADDRESS_HIGH);
-+		WRITE_COMMAND(COLUMN_ADDRESS_LOW);
-+
-+		for (i = 0; i < NUM_OF_COLUMNS; ++i)
-+		{
-+			/* point of opportunity: optimization */
-+			colmask = (1 << (i & 0x7));
-+			rowPtr = (u8*)(info->screen_base);
-+			rowPtr += (VIDEOWIDTH_BYTES * 8 * page);
-+			rowPtr += (i >> 3);
-+			retVal = 0;
-+			for (row = 0; row < 8; ++row)
-+			{
-+				retVal = (retVal >> 1) | (((*rowPtr) & colmask) ? 0x80 : 0);
-+				rowPtr += VIDEOWIDTH_BYTES;
-+			}
-+			WRITE_DATA(retVal);
-+		}
-+	}
-+
-+	WRITE_COMMAND(DISPLAY_ON);
-+}
-+
-+
-+/*
-+ * Setting the video mode has been split into two parts.
-+ * First part, xxxfb_check_var, must not write anything
-+ * to hardware, it should only verify and adjust var.
-+ * This means it doesn't alter par but it does use hardware
-+ * data from it to check this var.
-+ */
-+static int s1d15605_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
-+{
-+	/*
-+	 * Some very basic checks
-+	 */
-+	if (!var->xres)
-+		var->xres = 1;
-+	if (!var->yres)
-+		var->yres = 1;
-+	if (var->xres > var->xres_virtual)
-+		var->xres_virtual = var->xres;
-+	if (var->yres > var->yres_virtual)
-+		var->yres_virtual = var->yres;
-+
-+	if(var->bits_per_pixel > VIDEODEPTH)
-+		return -EINVAL;
-+
-+	/*
-+	 * Memory limit
-+	 */
-+	if (((var->yres_virtual * var->bits_per_pixel * var->yres_virtual) >> 3) >
-+			ACTUALVIDEOMEMSIZE)
-+		return -ENOMEM;
-+
-+	/*
-+	 * Now that we checked it we alter var. The reason being is that the video
-+	 * mode passed in might not work but slight changes to it might make it
-+	 * work. This way we let the user know what is acceptable.
-+	 */
-+	switch (var->bits_per_pixel) {
-+	case 1:
-+		var->red.offset = var->green.offset = var->blue.offset = 0;
-+		var->red.length = var->green.length = var->blue.length
-+			= var->bits_per_pixel;
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	var->xoffset = var->yoffset = 0;
-+	var->red.msb_right = var->green.msb_right = var->blue.msb_right =
-+		var->transp.msb_right = 0;
-+
-+	return 0;
-+}
-+
-+
-+/*
-+ * This routine actually sets the video mode. It's in here where we
-+ * the hardware state info->par and fix which can be affected by the
-+ * change in par. For this driver it doesn't do much.
-+ */
-+static int s1d15605_set_par(struct fb_info *info)
-+{
-+	int	ret;
-+
-+	MSG("%s:\n", __func__);
-+	MSG("  * resolution: %ux%u (%ux%u virtual)\n",
-+		 info->var.xres, info->var.yres,
-+		 info->var.xres_virtual, info->var.yres_virtual);
-+
-+	ret = s1d15605fb_resize_framebuffer(info->par);
-+
-+	info->fix.visual = FB_VISUAL_MONO10;
-+	return ret;
-+}
-+
-+
-+/*
-+ * Set a single color register. The values supplied are already
-+ * rounded down to the hardware's capabilities (according to the
-+ * entries in the var structure). Return != 0 for invalid regno.
-+ */
-+static int s1d15605_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
-+			u_int transp, struct fb_info *info)
-+{
-+	if (regno > 1)	/* no. of hw registers - we only do mono now */
-+		return 1;
-+
-+	return 0;
-+}
-+
-+
-+/*
-+ * Currently, the routine will simply shut-off the backlight and prevent
-+ * updates/refreshes.  Modify according to application.
-+ *
-+ * 0 unblank, 1 blank, 2 no vsync, 3 no hsync, 4 off
-+ */
-+static int s1d15605_blank(int blank, struct fb_info *info)
-+{
-+#ifdef CONFIG_PMAC_BACKLIGHT
-+	if (blank)
-+		pmac_backlight->props.power = FB_BLANK_POWERDOWN;
-+	else
-+		pmac_backlight->props.power = FB_BLANK_UNBLANK;
-+	backlight_update_status(pmac_backlight);
-+#endif
-+	return 1;
-+}
-+
-+
-+/*
-+ * Pan or Wrap the Display
-+ *
-+ * This call looks only at xoffset, yoffset and the FB_VMODE_YWRAP flag
-+ */
-+/*
-+static int s1d15605_pan_display(struct fb_var_screeninfo *var,
-+			struct fb_info *info)
-+{
-+	if (var->vmode & FB_VMODE_YWRAP) {
-+		if (var->yoffset < 0
-+		    || var->yoffset >= info->var.yres_virtual
-+		    || var->xoffset)
-+			return -EINVAL;
-+	} else {
-+		if (var->xoffset + var->xres > info->var.xres_virtual ||
-+		    var->yoffset + var->yres > info->var.yres_virtual)
-+			return -EINVAL;
-+	}
-+	info->var.xoffset = var->xoffset;
-+	info->var.yoffset = var->yoffset;
-+	if (var->vmode & FB_VMODE_YWRAP)
-+		info->var.vmode |= FB_VMODE_YWRAP;
-+	else
-+		info->var.vmode &= ~FB_VMODE_YWRAP;
-+	return 0;
-+}
-+*/
-+
-+
-+static void s1d15605_copyarea(struct fb_info *info, const struct fb_copyarea *region)
-+{
-+	cfb_copyarea(info, region);
-+	s1d15605_update(info);
-+}
-+
-+
-+static void s1d15605_fillrect (struct fb_info *info, const struct fb_fillrect *rect)
-+{
-+	cfb_fillrect(info, rect);
-+	s1d15605_update(info);
-+}
-+
-+
-+static void s1d15605_imageblit(struct fb_info *p, const struct fb_image *image)
-+{
-+	cfb_imageblit(p, image);
-+	s1d15605_update(p);
-+}
-+
-+
-+/*
-+ * Write the users data to our framebuffer, and then trigger a psuedo DMA
-+ */
-+static ssize_t s1d15605_write(struct fb_info *info, const char *buf,
-+			size_t count, loff_t *ppos)
-+{
-+	unsigned long p = *ppos;
-+	int err;
-+
-+	if (p > info->fix.smem_len)
-+		return -ENOSPC;
-+	if (count >= info->fix.smem_len)
-+		count = info->fix.smem_len;
-+	err = 0;
-+	if (count + p > info->fix.smem_len) {
-+		count = info->fix.smem_len - p;
-+		err = -ENOSPC;
-+	}
-+	if (count) {
-+		char *base_addr;
-+
-+		base_addr = info->screen_base;
-+		count -= copy_from_user(base_addr+p, buf, count);
-+		*ppos += count;
-+		err = -EFAULT;
-+	}
-+
-+	s1d15605_update(info);
-+
-+	if (count)
-+		return count;
-+
-+	return err;
-+}
-+
-+#ifdef	USE_PRIVATE_VMA_FXS
-+static void s1d15605_vma_open(struct vm_area_struct *vma)
-+{
-+	// FIXME - store stats in the device data via vm_private_data
-+}
-+
-+
-+static void s1d15605_vma_close(struct vm_area_struct *vma)
-+{
-+	// FIXME - store stats in the device data via vm_private_data
-+}
-+
-+
-+static struct page *s1d15605_vma_nopage(struct vm_area_struct *vma,
-+				unsigned long address, int *type)
-+{
-+	struct page *page;
-+	struct fb_info *info = vma->vm_private_data;
-+
-+	page = virt_to_page(info->screen_base);
-+	get_page(page);
-+
-+	// FIXME - now someone has a link to our page, start periodically blitting
-+	// latest updates to the actual device.
-+
-+	return page;
-+}
-+
-+
-+static struct vm_operations_struct s1d15605_vm_ops = {
-+	.open	= s1d15605_vma_open,
-+	.close	= s1d15605_vma_close,
-+	.nopage	= s1d15605_vma_nopage
-+};
-+
-+
-+/* We don't do much here - because we have special vm_ops */
-+static int s1d15605_mmap(struct fb_info *info, struct vm_area_struct *vma)
-+{
-+	vma->vm_ops = &s1d15605_vm_ops;
-+	vma->vm_flags |= VM_RESERVED;
-+	vma->vm_private_data = info;
-+	s1d15605_vma_open(vma);
-+
-+	return 0;
-+}
-+#endif /* USE_PRIVATE_VMA_FXS */
-+
-+
-+static struct fb_ops s1d15605fb_ops = {
-+	.owner		= THIS_MODULE,
-+	.fb_check_var	= s1d15605_check_var,
-+	.fb_set_par	= s1d15605_set_par,
-+	.fb_setcolreg	= s1d15605_setcolreg,
-+	.fb_blank	= s1d15605_blank,
-+//	.fb_pan_display	= s1d15605_pan_display,
-+	.fb_fillrect	= s1d15605_fillrect,
-+	.fb_copyarea	= s1d15605_copyarea,
-+	.fb_imageblit	= s1d15605_imageblit,
-+	.fb_write	= s1d15605_write,
-+#ifdef	USE_PRIVATE_VMA_FXS
-+	.fb_mmap	= s1d15605_mmap,
-+#endif
-+};
-+
-+
-+static void s1d15605_device_init(struct s1d15605fb_info *sinfo) {
-+
-+	char	value;
-+
-+	/* release the reset line by reading the device - proto hardware */
-+	value = READ_COMMAND;
-+	value = READ_COMMAND;
-+
-+#ifdef CONFIG_MACH_KB9200
-+	/* new boards have dedicated reset line */
-+	gpio_set_value(sinfo->reset_pin, 1);
-+#endif
-+
-+	/* initialize the device within 5ms */
-+	WRITE_COMMAND(RESET_DISPLAY);
-+	WRITE_COMMAND(LCD_BIAS_1_9);
-+	WRITE_COMMAND(ADC_SELECT_REVERSE);
-+	WRITE_COMMAND(COMMON_OUTPUT_NORMAL);
-+	WRITE_COMMAND(V5_RESISTOR_RATIO);
-+	WRITE_COMMAND(ELECTRONIC_VOLUME_SET);
-+	WRITE_COMMAND(ELECTRONIC_VOLUME_INIT);
-+	WRITE_COMMAND(POWER_CONTROL_SET | VOLTAGE_REGULATOR | VOLTAGE_FOLLOWER | BOOSTER_CIRCUIT);
-+	WRITE_COMMAND(DISPLAY_ON);
-+
-+	WRITE_COMMAND(RESISTOR_RATIO_START + 4);
-+	WRITE_COMMAND(ELECTRONIC_VOLUME_SET);
-+	WRITE_COMMAND(0x33);
-+}
-+
-+
-+static int __init s1d15605fb_probe(struct platform_device *pdev)
-+{
-+	struct device *dev = &pdev->dev;
-+	struct fb_info *info;
-+	struct s1d15605fb_info *sinfo;
-+	int ret;
-+
-+	MSG("%s\n", __func__);
-+
-+	if (!(info = framebuffer_alloc(sizeof(struct s1d15605fb_info), dev))) {
-+		dev_err(dev, "Cannot allocate framebuffer struct\n");
-+		return -ENOMEM;
-+	}
-+
-+	sinfo = info->par;
-+	sinfo->info = info;
-+	sinfo->pdev = pdev;
-+
-+	if (pdev->num_resources < 2) {
-+		dev_err(dev, "Resources unusable\n");
-+		ret = -ENODEV;
-+		goto free_info;
-+	}
-+
-+	info->fbops = &s1d15605fb_ops;
-+	strcpy(info->fix.id, pdev->name);
-+
-+	info->fix.mmio_start = pdev->resource[0].start;
-+	info->fix.mmio_len = pdev->resource[0].end - pdev->resource[0].start + 1;
-+	sinfo->reset_pin = pdev->resource[1].start;
-+
-+	ret = s1d15605fb_resize_framebuffer(sinfo);
-+	if (ret < 0) {
-+		dev_err(dev, "Cannot resize framebuffer: %d\n", ret);
-+		goto free_fb;
-+	}
-+
-+	if (!request_mem_region(info->fix.mmio_start,
-+				info->fix.mmio_len, pdev->name)) {
-+		ret = -EBUSY;
-+		goto free_fb;
-+	}
-+
-+	sinfo->mmio = ioremap(info->fix.mmio_start, info->fix.mmio_len);
-+	if (!sinfo->mmio) {
-+		dev_err(dev, "Cannot map LCD memory region\n");
-+		goto release_mem;
-+	}
-+
-+	s1d15605_device_init(sinfo);
-+
-+	ret = fb_find_mode(&info->var, info, NULL, NULL, 0, NULL, 1);
-+
-+	if (!ret || (ret == 4))
-+		info->var = s1d15605_default;
-+
-+	info->fix = s1d15605_fix;
-+	info->flags = FBINFO_FLAG_DEFAULT |
-+/*		FBINFO_HWACCEL_YPAN | */
-+		FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_COPYAREA;
-+
-+	ret = register_framebuffer(info);
-+	if (ret < 0) {
-+		dev_err(dev, "Failed to register framebuffer device: %d\n", ret);
-+		goto unmap_mmio;
-+	}
-+
-+	dev_set_drvdata(dev, info);
-+
-+	memset(info->screen_base, 0, info->fix.smem_len);
-+	info->var.activate |= FB_ACTIVATE_NOW;
-+	ret = fb_set_var(info, &info->var);
-+	if (ret) {
-+		dev_warn(dev, "Unable to set display parameters\n");
-+	}
-+
-+	info->var.activate &= ~(FB_ACTIVATE_FORCE | FB_ACTIVATE_NOW);
-+
-+	dev_dbg(dev, "%s SUCCESS\n", __func__);
-+
-+	dev_info(dev, "Driver $Revision: 1.1 $\n");
-+
-+	return 0;
-+
-+unmap_mmio:
-+	iounmap(sinfo->mmio);
-+release_mem:
-+	release_mem_region(info->fix.mmio_start, info->fix.mmio_len);
-+free_fb:
-+	kfree(info->screen_base);
-+
-+free_info:
-+	framebuffer_release(info);
-+
-+	dev_dbg(dev, "%s FAILED\n", __func__);
-+	return ret;
-+}
-+
-+
-+static int __exit s1d15605fb_remove(struct platform_device *pdev)
-+{
-+	struct device *dev = &pdev->dev;
-+	struct fb_info *info = dev_get_drvdata(dev);
-+	struct s1d15605fb_info *sinfo = info->par;
-+
-+	if (!sinfo)
-+		return 0;
-+
-+	unregister_framebuffer(info);
-+
-+	iounmap(sinfo->mmio);
-+	release_mem_region(info->fix.mmio_start, info->fix.mmio_len);
-+
-+	kfree(info->screen_base);
-+
-+	dev_set_drvdata(dev, NULL);
-+	framebuffer_release(info);
-+	return 0;
-+}
-+
-+
-+static struct platform_driver s1d15605fb_driver = {
-+	.remove		= __exit_p(s1d15605fb_remove),
-+	.driver		= {
-+		.name	= "s1d15605fb",
-+		.owner	= THIS_MODULE,
-+	},
-+};
-+
-+
-+static int __init s1d15605fb_init(void)
-+{
-+	return platform_driver_probe(&s1d15605fb_driver, s1d15605fb_probe);
-+}
-+
-+
-+static void __exit s1d15605fb_exit(void)
-+{
-+	platform_driver_unregister(&s1d15605fb_driver);
-+}
-+
-+
-+module_init(s1d15605fb_init);
-+module_exit(s1d15605fb_exit);
-+
-+
-+MODULE_AUTHOR("KwikByte");
-+MODULE_DESCRIPTION("Epson S1D15605 LCD Controller framebuffer driver");
-+MODULE_LICENSE("GPL");
---- a/drivers/watchdog/Kconfig
-+++ b/drivers/watchdog/Kconfig
-@@ -66,6 +66,14 @@ config AT91RM9200_WATCHDOG
- 	  Watchdog timer embedded into AT91RM9200 chips. This will reboot your
- 	  system when the timeout is reached.
- 
-+config AT91SAM9_WATCHDOG
-+	tristate "AT91SAM9 watchdog"
-+	depends on ARCH_AT91 && !ARCH_AT91RM9200
-+	select WATCHDOG_NOWAYOUT
-+	help
-+	  Watchdog timer embedded into AT91SAM9 chips. This will reboot your
-+	  system when the timeout is reached.
-+
- config 21285_WATCHDOG
- 	tristate "DC21285 watchdog"
- 	depends on FOOTBRIDGE
---- a/drivers/watchdog/Makefile
-+++ b/drivers/watchdog/Makefile
-@@ -26,6 +26,7 @@ obj-$(CONFIG_USBPCWATCHDOG) += pcwd_usb.
- 
- # ARM Architecture
- obj-$(CONFIG_AT91RM9200_WATCHDOG) += at91rm9200_wdt.o
-+obj-$(CONFIG_AT91SAM9_WATCHDOG) += at91sam9_wdt.o
- obj-$(CONFIG_OMAP_WATCHDOG) += omap_wdt.o
- obj-$(CONFIG_21285_WATCHDOG) += wdt285.o
- obj-$(CONFIG_977_WATCHDOG) += wdt977.o
---- /dev/null
-+++ b/drivers/watchdog/at91sam9_wdt.c
-@@ -0,0 +1,259 @@
-+/*
-+ * Watchdog driver for Atmel AT91SAM9x processors.
-+ *
-+ * Copyright (C) 2007 Renaud CERRATO r.cerrato@til-technologies.fr
-+ *
-+ * 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.
-+ */
-+
-+/*
-+ * The Watchdog Timer Mode Register can be only written to once. If the
-+ * timeout need to be set from Linux, be sure that the bootstrap or the
-+ * bootloader doesn't write to this register.
-+ */
-+
-+#include <linux/errno.h>
-+#include <linux/fs.h>
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/miscdevice.h>
-+#include <linux/module.h>
-+#include <linux/moduleparam.h>
-+#include <linux/platform_device.h>
-+#include <linux/types.h>
-+#include <linux/watchdog.h>
-+#include <linux/bitops.h>
-+#include <linux/uaccess.h>
-+
-+#include <asm/arch/at91_wdt.h>
-+
-+
-+#define WDT_MAX_TIME		16	/* seconds */
-+
-+static int wdt_timeout = -1;		/* invalid */
-+
-+module_param(wdt_timeout, int, 0);
-+MODULE_PARM_DESC(wdt_timeout, "Watchdog time in seconds. (default = disabled)");
-+
-+
-+static unsigned long at91wdt_busy;
-+
-+/* ......................................................................... */
-+
-+/*
-+ * Reload the watchdog timer.  (ie, pat the watchdog)
-+ */
-+static void inline at91_wdt_reload(void)
-+{
-+	at91_sys_write(AT91_WDT_CR, AT91_WDT_KEY | AT91_WDT_WDRSTT);
-+}
-+
-+/* ......................................................................... */
-+
-+/*
-+ * Watchdog device is opened, and watchdog starts running.
-+ */
-+static int at91_wdt_open(struct inode *inode, struct file *file)
-+{
-+	if (test_and_set_bit(0, &at91wdt_busy))
-+		return -EBUSY;
-+
-+	return nonseekable_open(inode, file);
-+}
-+
-+/*
-+ * Close the watchdog device.
-+ */
-+static int at91_wdt_close(struct inode *inode, struct file *file)
-+{
-+	clear_bit(0, &at91wdt_busy);
-+	return 0;
-+}
-+
-+/*
-+ * Change the watchdog time interval.
-+ */
-+static int at91_wdt_settimeout(int new_time)
-+{
-+	unsigned int reg, mr;
-+	/*
-+	 * All counting occurs at SLOW_CLOCK / 128 = 256 Hz
-+	 *
-+	 * Since WDV is a 12-bit counter, the maximum period is
-+	 * 4096 / 256 = 16 seconds.
-+	 */
-+	if ((new_time <= 0) || (new_time > WDT_MAX_TIME))
-+		return -EINVAL;
-+
-+	wdt_timeout = new_time;
-+
-+	/* Program the Watchdog */
-+	reg = AT91_WDT_WDRSTEN					/* causes watchdog reset */
-+		| AT91_WDT_WDRPROC				/* causes processor reset */
-+		| AT91_WDT_WDDBGHLT				/* disabled in debug mode */
-+		| AT91_WDT_WDD					/* restart at any time */
-+		| (((wdt_timeout * 256) - 1) & AT91_WDT_WDV);	/* timer value */
-+	at91_sys_write(AT91_WDT_MR, reg);
-+
-+	/* Check if watchdog could be programmed */
-+	mr = at91_sys_read(AT91_WDT_MR);
-+	if (mr != reg) {
-+		printk(KERN_ERR "at91sam9_wdt: Watchdog register already programmed.\n");
-+		return -EIO;
-+	}
-+
-+	at91_wdt_reload();
-+
-+	printk(KERN_INFO "AT91SAM9 Watchdog enabled (%d seconds, nowayout)\n", wdt_timeout);
-+	return 0;
-+}
-+
-+static struct watchdog_info at91_wdt_info = {
-+	.identity	= "at91sam9 watchdog",
-+	.options	= WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
-+};
-+
-+/*
-+ * Handle commands from user-space.
-+ */
-+static int at91_wdt_ioctl(struct inode *inode, struct file *file,
-+		unsigned int cmd, unsigned long arg)
-+{
-+	void __user *argp = (void __user *)arg;
-+	int __user *p = argp;
-+	int new_value, err;
-+
-+	switch (cmd) {
-+	case WDIOC_KEEPALIVE:
-+		at91_wdt_reload();	/* pat the watchdog */
-+		return 0;
-+
-+	case WDIOC_GETSUPPORT:
-+		return copy_to_user(argp, &at91_wdt_info, sizeof(at91_wdt_info)) ? -EFAULT : 0;
-+
-+	case WDIOC_SETTIMEOUT:
-+		if (get_user(new_value, p))
-+			return -EFAULT;
-+
-+		err = at91_wdt_settimeout(new_value);
-+		if (err)
-+			return err;
-+
-+		return put_user(wdt_timeout, p);	/* return current value */
-+
-+	case WDIOC_GETTIMEOUT:
-+		return put_user(wdt_timeout, p);
-+
-+	case WDIOC_GETSTATUS:
-+	case WDIOC_GETBOOTSTATUS:
-+		return put_user(0, p);
-+	}
-+	return -ENOTTY;
-+}
-+
-+/*
-+ * Pat the watchdog whenever device is written to.
-+ */
-+static ssize_t at91_wdt_write(struct file *file, const char *data, size_t len, loff_t *ppos)
-+{
-+	at91_wdt_reload();		/* pat the watchdog */
-+	return len;
-+}
-+
-+/* ......................................................................... */
-+
-+static const struct file_operations at91wdt_fops = {
-+	.owner		= THIS_MODULE,
-+	.llseek		= no_llseek,
-+	.ioctl		= at91_wdt_ioctl,
-+	.open		= at91_wdt_open,
-+	.release	= at91_wdt_close,
-+	.write		= at91_wdt_write,
-+};
-+
-+static struct miscdevice at91wdt_miscdev = {
-+	.minor		= WATCHDOG_MINOR,
-+	.name		= "watchdog",
-+	.fops		= &at91wdt_fops,
-+};
-+
-+static int __init at91wdt_probe(struct platform_device *pdev)
-+{
-+	int res;
-+
-+	if (at91wdt_miscdev.parent)
-+		return -EBUSY;
-+	at91wdt_miscdev.parent = &pdev->dev;
-+
-+	res = misc_register(&at91wdt_miscdev);
-+	if (res)
-+		return res;
-+
-+	/* Set watchdog */
-+	if (at91_wdt_settimeout(wdt_timeout) == -EINVAL) {
-+		pr_info("at91sam9_wdt: invalid timeout (must be between 1 and %d)\n", WDT_MAX_TIME);
-+		return 0;
-+	}
-+
-+	return 0;
-+}
-+
-+static int __exit at91wdt_remove(struct platform_device *pdev)
-+{
-+	int res;
-+
-+	res = misc_deregister(&at91wdt_miscdev);
-+	if (!res)
-+		at91wdt_miscdev.parent = NULL;
-+
-+	return res;
-+}
-+
-+#ifdef CONFIG_PM
-+
-+static int at91wdt_suspend(struct platform_device *pdev, pm_message_t message)
-+{
-+	return 0;
-+}
-+
-+static int at91wdt_resume(struct platform_device *pdev)
-+{
-+	return 0;
-+}
-+
-+#else
-+#define at91wdt_suspend	NULL
-+#define at91wdt_resume	NULL
-+#endif
-+
-+static struct platform_driver at91wdt_driver = {
-+	.remove		= __exit_p(at91wdt_remove),
-+	.suspend	= at91wdt_suspend,
-+	.resume		= at91wdt_resume,
-+	.driver		= {
-+		.name	= "at91_wdt",
-+		.owner	= THIS_MODULE,
-+	},
-+};
-+
-+static int __init at91sam_wdt_init(void)
-+{
-+	return platform_driver_probe(&at91wdt_driver, at91wdt_probe);
-+}
-+
-+static void __exit at91sam_wdt_exit(void)
-+{
-+	platform_driver_unregister(&at91wdt_driver);
-+}
-+
-+module_init(at91sam_wdt_init);
-+module_exit(at91sam_wdt_exit);
-+
-+MODULE_AUTHOR("Renaud CERRATO");
-+MODULE_DESCRIPTION("Watchdog driver for Atmel AT91SAM9x processors");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
-+MODULE_ALIAS("platform:at91_wdt");
---- a/include/asm-arm/arch-at91/at91_ecc.h
-+++ b/include/asm-arm/arch-at91/at91_ecc.h
-@@ -1,6 +1,9 @@
- /*
-  * include/asm-arm/arch-at91/at91_ecc.h
-  *
-+ * Copyright (C) 2007 Andrew Victor
-+ * Copyright (C) 2007 Atmel Corporation.
-+ *
-  * Error Corrected Code Controller (ECC) - System peripherals regsters.
-  * Based on AT91SAM9260 datasheet revision B.
-  *
-@@ -13,26 +16,26 @@
- #ifndef AT91_ECC_H
- #define AT91_ECC_H
- 
--#define AT91_ECC_CR		(AT91_ECC + 0x00)	/* Control register */
-+#define AT91_ECC_CR		0x00			/* Control register */
- #define		AT91_ECC_RST		(1 << 0)		/* Reset parity */
- 
--#define AT91_ECC_MR		(AT91_ECC + 0x04)	/* Mode register */
-+#define AT91_ECC_MR		0x04			/* Mode register */
- #define		AT91_ECC_PAGESIZE	(3 << 0)		/* Page Size */
- #define			AT91_ECC_PAGESIZE_528		(0)
- #define			AT91_ECC_PAGESIZE_1056		(1)
- #define			AT91_ECC_PAGESIZE_2112		(2)
- #define			AT91_ECC_PAGESIZE_4224		(3)
- 
--#define AT91_ECC_SR		(AT91_ECC + 0x08)	/* Status register */
-+#define AT91_ECC_SR		0x08			/* Status register */
- #define		AT91_ECC_RECERR		(1 << 0)		/* Recoverable Error */
- #define		AT91_ECC_ECCERR		(1 << 1)		/* ECC Single Bit Error */
- #define		AT91_ECC_MULERR		(1 << 2)		/* Multiple Errors */
- 
--#define AT91_ECC_PR		(AT91_ECC + 0x0c)	/* Parity register */
-+#define AT91_ECC_PR		0x0c			/* Parity register */
- #define		AT91_ECC_BITADDR	(0xf << 0)		/* Bit Error Address */
- #define		AT91_ECC_WORDADDR	(0xfff << 4)		/* Word Error Address */
- 
--#define AT91_ECC_NPR		(AT91_ECC + 0x10)	/* NParity register */
-+#define AT91_ECC_NPR		0x10			/* NParity register */
- #define		AT91_ECC_NPARITY	(0xffff << 0)		/* NParity */
- 
- #endif
---- a/include/asm-arm/arch-at91/at91_pit.h
-+++ b/include/asm-arm/arch-at91/at91_pit.h
-@@ -1,6 +1,9 @@
- /*
-  * include/asm-arm/arch-at91/at91_pit.h
-  *
-+ * Copyright (C) 2007 Andrew Victor
-+ * Copyright (C) 2007 Atmel Corporation.
-+ *
-  * Periodic Interval Timer (PIT) - System peripherals regsters.
-  * Based on AT91SAM9261 datasheet revision D.
-  *
---- a/include/asm-arm/arch-at91/at91_pmc.h
-+++ b/include/asm-arm/arch-at91/at91_pmc.h
-@@ -23,6 +23,7 @@
- #define		AT91_PMC_PCK		(1 <<  0)		/* Processor Clock */
- #define		AT91RM9200_PMC_UDP	(1 <<  1)		/* USB Devcice Port Clock [AT91RM9200 only] */
- #define		AT91RM9200_PMC_MCKUDP	(1 <<  2)		/* USB Device Port Master Clock Automatic Disable on Suspend [AT91RM9200 only] */
-+#define		AT91CAP9_PMC_DDR	(1 <<  2)		/* DDR Clock [AT91CAP9 revC only] */
- #define		AT91RM9200_PMC_UHP	(1 <<  4)		/* USB Host Port Clock [AT91RM9200 only] */
- #define		AT91SAM926x_PMC_UHP	(1 <<  6)		/* USB Host Port Clock [AT91SAM926x only] */
- #define		AT91CAP9_PMC_UHP	(1 <<  6)		/* USB Host Port Clock [AT91CAP9 only] */
-@@ -39,10 +40,14 @@
- #define	AT91_PMC_PCSR		(AT91_PMC + 0x18)	/* Peripheral Clock Status Register */
- 
- #define	AT91_CKGR_UCKR		(AT91_PMC + 0x1C)	/* UTMI Clock Register [SAM9RL, CAP9] */
-+#define		AT91_PMC_UPLLEN		(1   << 16)		/* UTMI PLL Enable */
-+#define		AT91_PMC_UPLLCOUNT	(0xf << 20)		/* UTMI PLL Start-up Time */
-+#define		AT91_PMC_BIASEN		(1   << 24)		/* UTMI BIAS Enable */
-+#define		AT91_PMC_BIASCOUNT	(0xf << 28)		/* UTMI PLL Start-up Time */
- 
- #define	AT91_CKGR_MOR		(AT91_PMC + 0x20)	/* Main Oscillator Register [not on SAM9RL] */
- #define		AT91_PMC_MOSCEN		(1    << 0)		/* Main Oscillator Enable */
--#define		AT91_PMC_OSCBYPASS	(1    << 1)		/* Oscillator Bypass [AT91SAM926x only] */
-+#define		AT91_PMC_OSCBYPASS	(1    << 1)		/* Oscillator Bypass [SAM9x, CAP9] */
- #define		AT91_PMC_OSCOUNT	(0xff << 8)		/* Main Oscillator Start-up Time */
- 
- #define	AT91_CKGR_MCFR		(AT91_PMC + 0x24)	/* Main Clock Frequency Register */
-@@ -56,6 +61,7 @@
- #define		AT91_PMC_OUT		(3     << 14)		/* PLL Clock Frequency Range */
- #define		AT91_PMC_MUL		(0x7ff << 16)		/* PLL Multiplier */
- #define		AT91_PMC_USBDIV		(3     << 28)		/* USB Divisor (PLLB only) */
-+#define		AT91CAP9_PMC_USBDIV	(0xf   << 28)		/* USB Divisor (PLLB only) [AT91CAP9 revC only] */
- #define			AT91_PMC_USBDIV_1		(0 << 28)
- #define			AT91_PMC_USBDIV_2		(1 << 28)
- #define			AT91_PMC_USBDIV_4		(2 << 28)
-@@ -76,10 +82,13 @@
- #define			AT91_PMC_PRES_32		(5 << 2)
- #define			AT91_PMC_PRES_64		(6 << 2)
- #define		AT91_PMC_MDIV		(3 <<  8)		/* Master Clock Division */
--#define			AT91_PMC_MDIV_1			(0 << 8)
--#define			AT91_PMC_MDIV_2			(1 << 8)
--#define			AT91_PMC_MDIV_3			(2 << 8)
--#define			AT91_PMC_MDIV_4			(3 << 8)
-+#define			AT91RM9200_PMC_MDIV_1		(0 << 8)	/* [AT91RM9200 only] */
-+#define			AT91RM9200_PMC_MDIV_2		(1 << 8)
-+#define			AT91RM9200_PMC_MDIV_3		(2 << 8)
-+#define			AT91RM9200_PMC_MDIV_4		(3 << 8)
-+#define			AT91SAM9_PMC_MDIV_1		(0 << 8)	/* [SAM9,CAP9 only] */
-+#define			AT91SAM9_PMC_MDIV_2		(1 << 8)
-+#define			AT91SAM9_PMC_MDIV_4		(2 << 8)
- 
- #define	AT91_PMC_PCKR(n)	(AT91_PMC + 0x40 + ((n) * 4))	/* Programmable Clock 0-3 Registers */
- 
-@@ -90,10 +99,17 @@
- #define		AT91_PMC_LOCKA		(1 <<  1)		/* PLLA Lock */
- #define		AT91_PMC_LOCKB		(1 <<  2)		/* PLLB Lock */
- #define		AT91_PMC_MCKRDY		(1 <<  3)		/* Master Clock */
-+#define		AT91_PMC_LOCKU		(1 <<  6)		/* UPLL Lock [AT91CAP9 only] */
-+#define		AT91_PMC_OSCSEL		(1 <<  7)		/* Slow Clock Oscillator [AT91CAP9 revC only] */
- #define		AT91_PMC_PCK0RDY	(1 <<  8)		/* Programmable Clock 0 */
- #define		AT91_PMC_PCK1RDY	(1 <<  9)		/* Programmable Clock 1 */
- #define		AT91_PMC_PCK2RDY	(1 << 10)		/* Programmable Clock 2 */
- #define		AT91_PMC_PCK3RDY	(1 << 11)		/* Programmable Clock 3 */
- #define	AT91_PMC_IMR		(AT91_PMC + 0x6c)	/* Interrupt Mask Register */
- 
-+#define AT91_PMC_PROT		(AT91_PMC + 0xe4)	/* Protect Register [AT91CAP9 revC only] */
-+#define		AT91_PMC_PROTKEY	0x504d4301		/* Activation Code */
-+
-+#define AT91_PMC_VER		(AT91_PMC + 0xfc)	/* PMC Module Version [AT91CAP9 only] */
-+
- #endif
---- a/include/asm-arm/arch-at91/at91_rstc.h
-+++ b/include/asm-arm/arch-at91/at91_rstc.h
-@@ -1,6 +1,9 @@
- /*
-  * include/asm-arm/arch-at91/at91_rstc.h
-  *
-+ * Copyright (C) 2007 Andrew Victor
-+ * Copyright (C) 2007 Atmel Corporation.
-+ *
-  * Reset Controller (RSTC) - System peripherals regsters.
-  * Based on AT91SAM9261 datasheet revision D.
-  *
---- a/include/asm-arm/arch-at91/at91_rtt.h
-+++ b/include/asm-arm/arch-at91/at91_rtt.h
-@@ -1,6 +1,9 @@
- /*
-  * include/asm-arm/arch-at91/at91_rtt.h
-  *
-+ * Copyright (C) 2007 Andrew Victor
-+ * Copyright (C) 2007 Atmel Corporation.
-+ *
-  * Real-time Timer (RTT) - System peripherals regsters.
-  * Based on AT91SAM9261 datasheet revision D.
-  *
---- a/include/asm-arm/arch-at91/at91_shdwc.h
-+++ b/include/asm-arm/arch-at91/at91_shdwc.h
-@@ -1,6 +1,9 @@
- /*
-  * include/asm-arm/arch-at91/at91_shdwc.h
-  *
-+ * Copyright (C) 2007 Andrew Victor
-+ * Copyright (C) 2007 Atmel Corporation.
-+ *
-  * Shutdown Controller (SHDWC) - System peripherals regsters.
-  * Based on AT91SAM9261 datasheet revision D.
-  *
-@@ -24,10 +27,12 @@
- #define			AT91_SHDW_WKMODE0_LOW		2
- #define			AT91_SHDW_WKMODE0_ANYLEVEL	3
- #define		AT91_SHDW_CPTWK0	(0xf << 4)		/* Counter On Wake Up 0 */
-+#define			AT91_SHDW_CPTWK0_(x)	((x) << 4)
- #define		AT91_SHDW_RTTWKEN	(1   << 16)		/* Real Time Timer Wake-up Enable */
- 
- #define AT91_SHDW_SR		(AT91_SHDWC + 0x08)	/* Shut Down Status Register */
- #define		AT91_SHDW_WAKEUP0	(1 <<  0)		/* Wake-up 0 Status */
- #define		AT91_SHDW_RTTWK		(1 << 16)		/* Real-time Timer Wake-up */
-+#define		AT91_SHDW_RTCWK		(1 << 17)		/* Real-time Clock Wake-up [SAM9RL] */
- 
- #endif
---- /dev/null
-+++ b/include/asm-arm/arch-at91/at91_tsc.h
-@@ -0,0 +1,76 @@
-+/*
-+ * include/asm-arm/arch-at91/at91_tsc.h
-+ *
-+ * Copyright (C) 2008 Andrew Victor
-+ *
-+ * Touch Screen ADC Controller (TSC)
-+ * Based on AT91SAM9RL64 preliminary draft datasheet.
-+ *
-+ * 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.
-+ */
-+
-+#ifndef AT91_TSC_H
-+#define AT91_TSC_H
-+
-+#define AT91_TSADCC_CR		0x00	/* Control register */
-+#define		AT91_TSADCC_SWRST	(1 << 0)	/* Software Reset*/
-+#define		AT91_TSADCC_START	(1 << 1)	/* Start conversion */
-+
-+#define AT91_TSADCC_MR		0x04	/* Mode register */
-+#define		AT91_TSADCC_TSAMOD	(3    <<  0)	/* ADC mode */
-+#define		AT91_TSADCC_LOWRES	(1    <<  4)	/* Resolution selection */
-+#define		AT91_TSADCC_SLEEP	(1    <<  5)	/* Sleep mode */
-+#define		AT91_TSADCC_PENDET	(1    <<  6)	/* Pen Detect selection */
-+#define		AT91_TSADCC_PRESCAL	(0x3f <<  8)	/* Prescalar Rate Selection */
-+#define		AT91_TSADCC_STARTUP	(0x7f << 16)	/* Start Up time */
-+#define		AT91_TSADCC_SHTIM	(0xf  << 24)	/* Sample & Hold time */
-+#define		AT91_TSADCC_PENDBC	(0xf  << 28)	/* Pen Detect debouncing time */
-+
-+#define AT91_TSADCC_TRGR	0x08	/* Trigger register */
-+#define		AT91_TSADCC_TRGMOD	(7      << 0)	/* Trigger mode */
-+#define			AT91_TSADCC_TRGMOD_NONE		(0 << 0)
-+#define			AT91_TSADCC_TRGMOD_EXT_RISING	(1 << 0)
-+#define			AT91_TSADCC_TRGMOD_EXT_FALLING	(2 << 0)
-+#define			AT91_TSADCC_TRGMOD_EXT_ANY	(3 << 0)
-+#define			AT91_TSADCC_TRGMOD_PENDET	(4 << 0)
-+#define			AT91_TSADCC_TRGMOD_PERIOD	(5 << 0)
-+#define			AT91_TSADCC_TRGMOD_CONTINUOUS	(6 << 0)
-+#define		AT91_TSADCC_TRGPER	(0xffff << 16)	/* Trigger period */
-+
-+#define AT91_TSADCC_TSR		0x0C	/* Touch Screen register */
-+#define		AT91_TSADCC_TSFREQ	(0xf <<  0)	/* TS Frequency in Interleaved mode */
-+#define		AT91_TSADCC_TSSHTIM	(0xf << 24)	/* Sample & Hold time */
-+
-+#define AT91_TSADCC_CHER	0x10	/* Channel Enable register */
-+#define AT91_TSADCC_CHDR	0x14	/* Channel Disable register */
-+#define AT91_TSADCC_CHSR	0x18	/* Channel Status register */
-+#define		AT91_TSADCC_CH(n)	(1 << (n))	/* Channel number */
-+
-+#define AT91_TSADCC_SR		0x1C	/* Status register */
-+#define		AT91_TSADCC_EOC(n)	(1 << ((n)+0))	/* End of conversion for channel N */
-+#define		AT91_TSADCC_OVRE(n)	(1 << ((n)+8))	/* Overrun error for channel N */
-+#define		AT91_TSADCC_DRDY	(1 << 16)	/* Data Ready */
-+#define		AT91_TSADCC_GOVRE	(1 << 17)	/* General Overrun Error */
-+#define		AT91_TSADCC_ENDRX	(1 << 18)	/* End of RX Buffer */
-+#define		AT91_TSADCC_RXBUFF	(1 << 19)	/* TX Buffer full */
-+#define		AT91_TSADCC_PENCNT	(1 << 20)	/* Pen contact */
-+#define		AT91_TSADCC_NOCNT	(1 << 21)	/* No contact */
-+
-+#define AT91_TSADCC_LCDR	0x20	/* Last Converted Data register */
-+#define		AT91_TSADCC_DATA	(0x3ff << 0)	/* Channel data */
-+
-+#define AT91_TSADCC_IER		0x24	/* Interrupt Enable register */
-+#define AT91_TSADCC_IDR		0x28	/* Interrupt Disable register */
-+#define AT91_TSADCC_IMR		0x2C	/* Interrupt Mask register */
-+#define AT91_TSADCC_CDR0	0x30	/* Channel Data 0 */
-+#define AT91_TSADCC_CDR1	0x34	/* Channel Data 1 */
-+#define AT91_TSADCC_CDR2	0x38	/* Channel Data 2 */
-+#define AT91_TSADCC_CDR3	0x3C	/* Channel Data 3 */
-+#define AT91_TSADCC_CDR4	0x40	/* Channel Data 4 */
-+#define AT91_TSADCC_CDR5	0x44	/* Channel Data 5 */
-+
-+#endif
-+
---- a/include/asm-arm/arch-at91/at91_wdt.h
-+++ b/include/asm-arm/arch-at91/at91_wdt.h
-@@ -1,6 +1,9 @@
- /*
-  * include/asm-arm/arch-at91/at91_wdt.h
-  *
-+ * Copyright (C) 2007 Andrew Victor
-+ * Copyright (C) 2007 Atmel Corporation.
-+ *
-  * Watchdog Timer (WDT) - System peripherals regsters.
-  * Based on AT91SAM9261 datasheet revision D.
-  *
---- a/include/asm-arm/arch-at91/at91cap9.h
-+++ b/include/asm-arm/arch-at91/at91cap9.h
-@@ -101,7 +101,10 @@
- #define AT91_RTT	(0xfffffd20 - AT91_BASE_SYS)
- #define AT91_PIT	(0xfffffd30 - AT91_BASE_SYS)
- #define AT91_WDT	(0xfffffd40 - AT91_BASE_SYS)
--#define AT91_GPBR	(0xfffffd50 - AT91_BASE_SYS)
-+#define AT91_SCKCR	(0xfffffd50 - AT91_BASE_SYS)
-+#define AT91_GPBR	(cpu_is_at91cap9_revB() ? \
-+			(0xfffffd50 - AT91_BASE_SYS) : \
-+			(0xfffffd60 - AT91_BASE_SYS))
- 
- #define AT91_USART0	AT91CAP9_BASE_US0
- #define AT91_USART1	AT91CAP9_BASE_US1
-@@ -118,7 +121,7 @@
- #define AT91CAP9_ROM_SIZE	(32 * SZ_1K)	/* Internal ROM size (32Kb) */
- 
- #define AT91CAP9_LCDC_BASE	0x00500000	/* LCD Controller */
--#define AT91CAP9_UDPHS_BASE	0x00600000	/* USB High Speed Device Port */
-+#define AT91CAP9_UDPHS_FIFO	0x00600000	/* USB High Speed Device Port */
- #define AT91CAP9_UHP_BASE	0x00700000	/* USB Host controller */
- 
- #define CONFIG_DRAM_BASE	AT91_CHIPSELECT_6
---- /dev/null
-+++ b/include/asm-arm/arch-at91/at91cap9_ddrsdr.h
-@@ -0,0 +1,102 @@
-+/*
-+ * include/asm-arm/arch-at91/at91cap9_ddrsdr.h
-+ *
-+ *  (C) 2008 Andrew Victor
-+ *
-+ * DDR/SDR Controller (DDRSDRC) - System peripherals registers.
-+ * Based on AT91CAP9 datasheet revision B.
-+ *
-+ * 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.
-+ */
-+
-+#ifndef AT91CAP9_DDRSDR_H
-+#define AT91CAP9_DDRSDR_H
-+
-+#define AT91_DDRSDRC_MR		(AT91_DDRSDRC + 0x00)	/* Mode Register */
-+#define		AT91_DDRSDRC_MODE	(0xf << 0)		/* Command Mode */
-+#define			AT91_DDRSDRC_MODE_NORMAL		0
-+#define			AT91_DDRSDRC_MODE_NOP		1
-+#define			AT91_DDRSDRC_MODE_PRECHARGE	2
-+#define			AT91_DDRSDRC_MODE_LMR		3
-+#define			AT91_DDRSDRC_MODE_REFRESH	4
-+#define			AT91_DDRSDRC_MODE_EXT_LMR	5
-+#define			AT91_DDRSDRC_MODE_DEEP		6
-+
-+#define AT91_DDRSDRC_RTR	(AT91_DDRSDRC + 0x04)	/* Refresh Timer Register */
-+#define		AT91_DDRSDRC_COUNT	(0xfff << 0)		/* Refresh Timer Counter */
-+
-+#define AT91_DDRSDRC_CR		(AT91_DDRSDRC + 0x08)	/* Configuration Register */
-+#define		AT91_DDRSDRC_NC		(3 << 0)		/* Number of Column Bits */
-+#define			AT91_DDRSDRC_NC_SDR8	(0 << 0)
-+#define			AT91_DDRSDRC_NC_SDR9	(1 << 0)
-+#define			AT91_DDRSDRC_NC_SDR10	(2 << 0)
-+#define			AT91_DDRSDRC_NC_SDR11	(3 << 0)
-+#define			AT91_DDRSDRC_NC_DDR9	(0 << 0)
-+#define			AT91_DDRSDRC_NC_DDR10	(1 << 0)
-+#define			AT91_DDRSDRC_NC_DDR11	(2 << 0)
-+#define			AT91_DDRSDRC_NC_DDR12	(3 << 0)
-+#define		AT91_DDRSDRC_NR		(3 << 2)		/* Number of Row Bits */
-+#define			AT91_DDRSDRC_NR_11	(0 << 2)
-+#define			AT91_DDRSDRC_NR_12	(1 << 2)
-+#define			AT91_DDRSDRC_NR_13	(2 << 2)
-+#define		AT91_DDRSDRC_CAS	(7 << 4)		/* CAS Latency */
-+#define			AT91_DDRSDRC_CAS_2	(2 << 4)
-+#define			AT91_DDRSDRC_CAS_3	(3 << 4)
-+#define			AT91_DDRSDRC_CAS_25	(6 << 4)
-+#define		AT91_DDRSDRC_DLL	(1 << 7)		/* Reset DLL */
-+#define		AT91_DDRSDRC_DICDS	(1 << 8)		/* Output impedance control */
-+
-+#define AT91_DDRSDRC_T0PR	(AT91_DDRSDRC + 0x0C)	/* Timing 0 Register */
-+#define		AT91_DDRSDRC_TRAS	(0xf <<  0)		/* Active to Precharge delay */
-+#define		AT91_DDRSDRC_TRCD	(0xf <<  4)		/* Row to Column delay */
-+#define		AT91_DDRSDRC_TWR	(0xf <<  8)		/* Write recovery delay */
-+#define		AT91_DDRSDRC_TRC	(0xf << 12)		/* Row cycle delay */
-+#define		AT91_DDRSDRC_TRP	(0xf << 16)		/* Row precharge delay */
-+#define		AT91_DDRSDRC_TRRD	(0xf << 20)		/* Active BankA to BankB */
-+#define		AT91_DDRSDRC_TWTR	(1   << 24)		/* Internal Write to Read delay */
-+#define		AT91_DDRSDRC_TMRD	(0xf << 28)		/* Load mode to active/refresh delay */
-+
-+#define AT91_DDRSDRC_T1PR	(AT91_DDRSDRC + 0x10)	/* Timing 1 Register */
-+#define		AT91_DDRSDRC_TRFC	(0x1f << 0)		/* Row Cycle Delay */
-+#define		AT91_DDRSDRC_TXSNR	(0xff << 8)		/* Exit self-refresh to non-read */
-+#define		AT91_DDRSDRC_TXSRD	(0xff << 16)		/* Exit self-refresh to read */
-+#define		AT91_DDRSDRC_TXP	(0xf  << 24)		/* Exit power-down delay */
-+
-+#define AT91_DDRSDRC_LPR	(AT91_DDRSDRC + 0x18)	/* Low Power Register */
-+#define		AT91_DDRSDRC_LPCB		(3 << 0)	/* Low-power Configurations */
-+#define			AT91_DDRSDRC_LPCB_DISABLE		0
-+#define			AT91_DDRSDRC_LPCB_SELF_REFRESH		1
-+#define			AT91_DDRSDRC_LPCB_POWER_DOWN		2
-+#define			AT91_DDRSDRC_LPCB_DEEP_POWER_DOWN	3
-+#define		AT91_DDRSDRC_CLKFR		(1 << 2)	/* Clock Frozen */
-+#define		AT91_DDRSDRC_PASR		(7 << 4)	/* Partial Array Self Refresh */
-+#define		AT91_DDRSDRC_TCSR		(3 << 8)	/* Temperature Compensated Self Refresh */
-+#define		AT91_DDRSDRC_DS			(3 << 10)	/* Drive Strength */
-+#define		AT91_DDRSDRC_TIMEOUT		(3 << 12)	/* Time to define when Low Power Mode is enabled */
-+#define			AT91_DDRSDRC_TIMEOUT_0_CLK_CYCLES	(0 << 12)
-+#define			AT91_DDRSDRC_TIMEOUT_64_CLK_CYCLES	(1 << 12)
-+#define			AT91_DDRSDRC_TIMEOUT_128_CLK_CYCLES	(2 << 12)
-+
-+#define AT91_DDRSDRC_MDR	(AT91_DDRSDRC + 0x1C)	/* Memory Device Register */
-+#define		AT91_DDRSDRC_MD		(3 << 0)		/* Memory Device Type */
-+#define			AT91_DDRSDRC_MD_SDR		0
-+#define			AT91_DDRSDRC_MD_LOW_POWER_SDR	1
-+#define			AT91_DDRSDRC_MD_DDR		2
-+#define			AT91_DDRSDRC_MD_LOW_POWER_DDR	3
-+
-+#define AT91_DDRSDRC_DLLR	(AT91_DDRSDRC + 0x20)	/* DLL Information Register */
-+#define		AT91_DDRSDRC_MDINC	(1 << 0)		/* Master Delay increment */
-+#define		AT91_DDRSDRC_MDDEC	(1 << 1)		/* Master Delay decrement */
-+#define		AT91_DDRSDRC_MDOVF	(1 << 2)		/* Master Delay Overflow */
-+#define		AT91_DDRSDRC_SDCOVF	(1 << 3)		/* Slave Delay Correction Overflow */
-+#define		AT91_DDRSDRC_SDCUDF	(1 << 4)		/* Slave Delay Correction Underflow */
-+#define		AT91_DDRSDRC_SDERF	(1 << 5)		/* Slave Delay Correction error */
-+#define		AT91_DDRSDRC_MDVAL	(0xff <<  8)		/* Master Delay value */
-+#define		AT91_DDRSDRC_SDVAL	(0xff << 16)		/* Slave Delay value */
-+#define		AT91_DDRSDRC_SDCVAL	(0xff << 24)		/* Slave Delay Correction value */
-+
-+
-+#endif
---- a/include/asm-arm/arch-at91/at91cap9_matrix.h
-+++ b/include/asm-arm/arch-at91/at91cap9_matrix.h
-@@ -106,6 +106,11 @@
- #define AT91_MPBS0_SFR		(AT91_MATRIX + 0x114)	/* MPBlock Slave 0 Special Function Register */
- #define AT91_MPBS1_SFR		(AT91_MATRIX + 0x11C)	/* MPBlock Slave 1 Special Function Register */
- 
-+#define AT91_MATRIX_UDPHS	(AT91_MATRIX + 0x118)	/* USBHS Special Function Register [AT91CAP9 only] */
-+#define		AT91_MATRIX_SELECT_UDPHS	(0 << 31)	/* select High Speed UDP */
-+#define		AT91_MATRIX_SELECT_UDP		(1 << 31)	/* select standard UDP */
-+#define		AT91_MATRIX_UDPHS_BYPASS_LOCK	(1 << 30)	/* bypass lock bit */
-+
- #define AT91_MATRIX_EBICSA	(AT91_MATRIX + 0x120)	/* EBI Chip Select Assignment Register */
- #define		AT91_MATRIX_EBI_CS1A		(1 << 1)	/* Chip Select 1 Assignment */
- #define			AT91_MATRIX_EBI_CS1A_SMC		(0 << 1)
---- a/include/asm-arm/arch-at91/at91sam9260_matrix.h
-+++ b/include/asm-arm/arch-at91/at91sam9260_matrix.h
-@@ -1,6 +1,8 @@
- /*
-  * include/asm-arm/arch-at91/at91sam9260_matrix.h
-  *
-+ *  Copyright (C) 2007 Atmel Corporation.
-+ *
-  * Memory Controllers (MATRIX, EBI) - System peripherals registers.
-  * Based on AT91SAM9260 datasheet revision B.
-  *
---- a/include/asm-arm/arch-at91/at91sam9261_matrix.h
-+++ b/include/asm-arm/arch-at91/at91sam9261_matrix.h
-@@ -1,6 +1,8 @@
- /*
-  * include/asm-arm/arch-at91/at91sam9261_matrix.h
-  *
-+ *  Copyright (C) 2007 Atmel Corporation.
-+ *
-  * Memory Controllers (MATRIX, EBI) - System peripherals registers.
-  * Based on AT91SAM9261 datasheet revision D.
-  *
---- a/include/asm-arm/arch-at91/at91sam926x_mc.h
-+++ /dev/null
-@@ -1,141 +0,0 @@
--/*
-- * include/asm-arm/arch-at91/at91sam926x_mc.h
-- *
-- * Memory Controllers (SMC, SDRAMC) - System peripherals registers.
-- * Based on AT91SAM9261 datasheet revision D.
-- *
-- * 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.
-- */
--
--#ifndef AT91SAM926x_MC_H
--#define AT91SAM926x_MC_H
--
--/* SDRAM Controller (SDRAMC) registers */
--#define AT91_SDRAMC_MR		(AT91_SDRAMC + 0x00)	/* SDRAM Controller Mode Register */
--#define		AT91_SDRAMC_MODE	(0xf << 0)		/* Command Mode */
--#define			AT91_SDRAMC_MODE_NORMAL		0
--#define			AT91_SDRAMC_MODE_NOP		1
--#define			AT91_SDRAMC_MODE_PRECHARGE	2
--#define			AT91_SDRAMC_MODE_LMR		3
--#define			AT91_SDRAMC_MODE_REFRESH	4
--#define			AT91_SDRAMC_MODE_EXT_LMR	5
--#define			AT91_SDRAMC_MODE_DEEP		6
--
--#define AT91_SDRAMC_TR		(AT91_SDRAMC + 0x04)	/* SDRAM Controller Refresh Timer Register */
--#define		AT91_SDRAMC_COUNT	(0xfff << 0)		/* Refresh Timer Counter */
--
--#define AT91_SDRAMC_CR		(AT91_SDRAMC + 0x08)	/* SDRAM Controller Configuration Register */
--#define		AT91_SDRAMC_NC		(3 << 0)		/* Number of Column Bits */
--#define			AT91_SDRAMC_NC_8	(0 << 0)
--#define			AT91_SDRAMC_NC_9	(1 << 0)
--#define			AT91_SDRAMC_NC_10	(2 << 0)
--#define			AT91_SDRAMC_NC_11	(3 << 0)
--#define		AT91_SDRAMC_NR		(3 << 2)		/* Number of Row Bits */
--#define			AT91_SDRAMC_NR_11	(0 << 2)
--#define			AT91_SDRAMC_NR_12	(1 << 2)
--#define			AT91_SDRAMC_NR_13	(2 << 2)
--#define		AT91_SDRAMC_NB		(1 << 4)		/* Number of Banks */
--#define			AT91_SDRAMC_NB_2	(0 << 4)
--#define			AT91_SDRAMC_NB_4	(1 << 4)
--#define		AT91_SDRAMC_CAS		(3 << 5)		/* CAS Latency */
--#define			AT91_SDRAMC_CAS_1	(1 << 5)
--#define			AT91_SDRAMC_CAS_2	(2 << 5)
--#define			AT91_SDRAMC_CAS_3	(3 << 5)
--#define		AT91_SDRAMC_DBW		(1 << 7)		/* Data Bus Width */
--#define			AT91_SDRAMC_DBW_32	(0 << 7)
--#define			AT91_SDRAMC_DBW_16	(1 << 7)
--#define		AT91_SDRAMC_TWR		(0xf <<  8)		/* Write Recovery Delay */
--#define		AT91_SDRAMC_TRC		(0xf << 12)		/* Row Cycle Delay */
--#define		AT91_SDRAMC_TRP		(0xf << 16)		/* Row Precharge Delay */
--#define		AT91_SDRAMC_TRCD	(0xf << 20)		/* Row to Column Delay */
--#define		AT91_SDRAMC_TRAS	(0xf << 24)		/* Active to Precharge Delay */
--#define		AT91_SDRAMC_TXSR	(0xf << 28)		/* Exit Self Refresh to Active Delay */
--
--#define AT91_SDRAMC_LPR		(AT91_SDRAMC + 0x10)	/* SDRAM Controller Low Power Register */
--#define		AT91_SDRAMC_LPCB		(3 << 0)	/* Low-power Configurations */
--#define			AT91_SDRAMC_LPCB_DISABLE		0
--#define			AT91_SDRAMC_LPCB_SELF_REFRESH		1
--#define			AT91_SDRAMC_LPCB_POWER_DOWN		2
--#define			AT91_SDRAMC_LPCB_DEEP_POWER_DOWN	3
--#define		AT91_SDRAMC_PASR		(7 << 4)	/* Partial Array Self Refresh */
--#define		AT91_SDRAMC_TCSR		(3 << 8)	/* Temperature Compensated Self Refresh */
--#define		AT91_SDRAMC_DS			(3 << 10)	/* Drive Strenght */
--#define		AT91_SDRAMC_TIMEOUT		(3 << 12)	/* Time to define when Low Power Mode is enabled */
--#define			AT91_SDRAMC_TIMEOUT_0_CLK_CYCLES	(0 << 12)
--#define			AT91_SDRAMC_TIMEOUT_64_CLK_CYCLES	(1 << 12)
--#define			AT91_SDRAMC_TIMEOUT_128_CLK_CYCLES	(2 << 12)
--
--#define AT91_SDRAMC_IER		(AT91_SDRAMC + 0x14)	/* SDRAM Controller Interrupt Enable Register */
--#define AT91_SDRAMC_IDR		(AT91_SDRAMC + 0x18)	/* SDRAM Controller Interrupt Disable Register */
--#define AT91_SDRAMC_IMR		(AT91_SDRAMC + 0x1C)	/* SDRAM Controller Interrupt Mask Register */
--#define AT91_SDRAMC_ISR		(AT91_SDRAMC + 0x20)	/* SDRAM Controller Interrupt Status Register */
--#define		AT91_SDRAMC_RES		(1 << 0)		/* Refresh Error Status */
--
--#define AT91_SDRAMC_MDR		(AT91_SDRAMC + 0x24)	/* SDRAM Memory Device Register */
--#define		AT91_SDRAMC_MD		(3 << 0)		/* Memory Device Type */
--#define			AT91_SDRAMC_MD_SDRAM		0
--#define			AT91_SDRAMC_MD_LOW_POWER_SDRAM	1
--
--
--/* Static Memory Controller (SMC) registers */
--#define AT91_SMC_SETUP(n)	(AT91_SMC + 0x00 + ((n)*0x10))	/* Setup Register for CS n */
--#define		AT91_SMC_NWESETUP	(0x3f << 0)			/* NWE Setup Length */
--#define			AT91_SMC_NWESETUP_(x)	((x) << 0)
--#define		AT91_SMC_NCS_WRSETUP	(0x3f << 8)			/* NCS Setup Length in Write Access */
--#define			AT91_SMC_NCS_WRSETUP_(x)	((x) << 8)
--#define		AT91_SMC_NRDSETUP	(0x3f << 16)			/* NRD Setup Length */
--#define			AT91_SMC_NRDSETUP_(x)	((x) << 16)
--#define		AT91_SMC_NCS_RDSETUP	(0x3f << 24)			/* NCS Setup Length in Read Access */
--#define			AT91_SMC_NCS_RDSETUP_(x)	((x) << 24)
--
--#define AT91_SMC_PULSE(n)	(AT91_SMC + 0x04 + ((n)*0x10))	/* Pulse Register for CS n */
--#define		AT91_SMC_NWEPULSE	(0x7f <<  0)			/* NWE Pulse Length */
--#define			AT91_SMC_NWEPULSE_(x)	((x) << 0)
--#define		AT91_SMC_NCS_WRPULSE	(0x7f <<  8)			/* NCS Pulse Length in Write Access */
--#define			AT91_SMC_NCS_WRPULSE_(x)((x) << 8)
--#define		AT91_SMC_NRDPULSE	(0x7f << 16)			/* NRD Pulse Length */
--#define			AT91_SMC_NRDPULSE_(x)	((x) << 16)
--#define		AT91_SMC_NCS_RDPULSE	(0x7f << 24)			/* NCS Pulse Length in Read Access */
--#define			AT91_SMC_NCS_RDPULSE_(x)((x) << 24)
--
--#define AT91_SMC_CYCLE(n)	(AT91_SMC + 0x08 + ((n)*0x10))	/* Cycle Register for CS n */
--#define		AT91_SMC_NWECYCLE	(0x1ff << 0 )			/* Total Write Cycle Length */
--#define			AT91_SMC_NWECYCLE_(x)	((x) << 0)
--#define		AT91_SMC_NRDCYCLE	(0x1ff << 16)			/* Total Read Cycle Length */
--#define			AT91_SMC_NRDCYCLE_(x)	((x) << 16)
--
--#define AT91_SMC_MODE(n)	(AT91_SMC + 0x0c + ((n)*0x10))	/* Mode Register for CS n */
--#define		AT91_SMC_READMODE	(1 <<  0)			/* Read Mode */
--#define		AT91_SMC_WRITEMODE	(1 <<  1)			/* Write Mode */
--#define		AT91_SMC_EXNWMODE	(3 <<  4)			/* NWAIT Mode */
--#define			AT91_SMC_EXNWMODE_DISABLE	(0 << 4)
--#define			AT91_SMC_EXNWMODE_FROZEN	(2 << 4)
--#define			AT91_SMC_EXNWMODE_READY		(3 << 4)
--#define		AT91_SMC_BAT		(1 <<  8)			/* Byte Access Type */
--#define			AT91_SMC_BAT_SELECT		(0 << 8)
--#define			AT91_SMC_BAT_WRITE		(1 << 8)
--#define		AT91_SMC_DBW		(3 << 12)			/* Data Bus Width */
--#define			AT91_SMC_DBW_8			(0 << 12)
--#define			AT91_SMC_DBW_16			(1 << 12)
--#define			AT91_SMC_DBW_32			(2 << 12)
--#define		AT91_SMC_TDF		(0xf << 16)			/* Data Float Time. */
--#define			AT91_SMC_TDF_(x)		((x) << 16)
--#define		AT91_SMC_TDFMODE	(1 << 20)			/* TDF Optimization - Enabled */
--#define		AT91_SMC_PMEN		(1 << 24)			/* Page Mode Enabled */
--#define		AT91_SMC_PS		(3 << 28)			/* Page Size */
--#define			AT91_SMC_PS_4			(0 << 28)
--#define			AT91_SMC_PS_8			(1 << 28)
--#define			AT91_SMC_PS_16			(2 << 28)
--#define			AT91_SMC_PS_32			(3 << 28)
--
--#if defined(AT91_SMC1)		/* The AT91SAM9263 has 2 Static Memory contollers */
--#define AT91_SMC1_SETUP(n)	(AT91_SMC1 + 0x00 + ((n)*0x10))	/* Setup Register for CS n */
--#define AT91_SMC1_PULSE(n)	(AT91_SMC1 + 0x04 + ((n)*0x10))	/* Pulse Register for CS n */
--#define AT91_SMC1_CYCLE(n)	(AT91_SMC1 + 0x08 + ((n)*0x10))	/* Cycle Register for CS n */
--#define AT91_SMC1_MODE(n)	(AT91_SMC1 + 0x0c + ((n)*0x10))	/* Mode Register for CS n */
--#endif
--
--#endif
---- /dev/null
-+++ b/include/asm-arm/arch-at91/at91sam9_sdramc.h
-@@ -0,0 +1,86 @@
-+/*
-+ * include/asm-arm/arch-at91/at91sam9_sdramc.h
-+ *
-+ * Copyright (C) 2007 Andrew Victor
-+ * Copyright (C) 2007 Atmel Corporation.
-+ *
-+ * SDRAM Controllers (SDRAMC) - System peripherals registers.
-+ * Based on AT91SAM9261 datasheet revision D.
-+ *
-+ * 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.
-+ */
-+
-+#ifndef AT91SAM9_SDRAMC_H
-+#define AT91SAM9_SDRAMC_H
-+
-+/* SDRAM Controller (SDRAMC) registers */
-+#define AT91_SDRAMC_MR		(AT91_SDRAMC + 0x00)	/* SDRAM Controller Mode Register */
-+#define		AT91_SDRAMC_MODE	(0xf << 0)		/* Command Mode */
-+#define			AT91_SDRAMC_MODE_NORMAL		0
-+#define			AT91_SDRAMC_MODE_NOP		1
-+#define			AT91_SDRAMC_MODE_PRECHARGE	2
-+#define			AT91_SDRAMC_MODE_LMR		3
-+#define			AT91_SDRAMC_MODE_REFRESH	4
-+#define			AT91_SDRAMC_MODE_EXT_LMR	5
-+#define			AT91_SDRAMC_MODE_DEEP		6
-+
-+#define AT91_SDRAMC_TR		(AT91_SDRAMC + 0x04)	/* SDRAM Controller Refresh Timer Register */
-+#define		AT91_SDRAMC_COUNT	(0xfff << 0)		/* Refresh Timer Counter */
-+
-+#define AT91_SDRAMC_CR		(AT91_SDRAMC + 0x08)	/* SDRAM Controller Configuration Register */
-+#define		AT91_SDRAMC_NC		(3 << 0)		/* Number of Column Bits */
-+#define			AT91_SDRAMC_NC_8	(0 << 0)
-+#define			AT91_SDRAMC_NC_9	(1 << 0)
-+#define			AT91_SDRAMC_NC_10	(2 << 0)
-+#define			AT91_SDRAMC_NC_11	(3 << 0)
-+#define		AT91_SDRAMC_NR		(3 << 2)		/* Number of Row Bits */
-+#define			AT91_SDRAMC_NR_11	(0 << 2)
-+#define			AT91_SDRAMC_NR_12	(1 << 2)
-+#define			AT91_SDRAMC_NR_13	(2 << 2)
-+#define		AT91_SDRAMC_NB		(1 << 4)		/* Number of Banks */
-+#define			AT91_SDRAMC_NB_2	(0 << 4)
-+#define			AT91_SDRAMC_NB_4	(1 << 4)
-+#define		AT91_SDRAMC_CAS		(3 << 5)		/* CAS Latency */
-+#define			AT91_SDRAMC_CAS_1	(1 << 5)
-+#define			AT91_SDRAMC_CAS_2	(2 << 5)
-+#define			AT91_SDRAMC_CAS_3	(3 << 5)
-+#define		AT91_SDRAMC_DBW		(1 << 7)		/* Data Bus Width */
-+#define			AT91_SDRAMC_DBW_32	(0 << 7)
-+#define			AT91_SDRAMC_DBW_16	(1 << 7)
-+#define		AT91_SDRAMC_TWR		(0xf <<  8)		/* Write Recovery Delay */
-+#define		AT91_SDRAMC_TRC		(0xf << 12)		/* Row Cycle Delay */
-+#define		AT91_SDRAMC_TRP		(0xf << 16)		/* Row Precharge Delay */
-+#define		AT91_SDRAMC_TRCD	(0xf << 20)		/* Row to Column Delay */
-+#define		AT91_SDRAMC_TRAS	(0xf << 24)		/* Active to Precharge Delay */
-+#define		AT91_SDRAMC_TXSR	(0xf << 28)		/* Exit Self Refresh to Active Delay */
-+
-+#define AT91_SDRAMC_LPR		(AT91_SDRAMC + 0x10)	/* SDRAM Controller Low Power Register */
-+#define		AT91_SDRAMC_LPCB		(3 << 0)	/* Low-power Configurations */
-+#define			AT91_SDRAMC_LPCB_DISABLE		0
-+#define			AT91_SDRAMC_LPCB_SELF_REFRESH		1
-+#define			AT91_SDRAMC_LPCB_POWER_DOWN		2
-+#define			AT91_SDRAMC_LPCB_DEEP_POWER_DOWN	3
-+#define		AT91_SDRAMC_PASR		(7 << 4)	/* Partial Array Self Refresh */
-+#define		AT91_SDRAMC_TCSR		(3 << 8)	/* Temperature Compensated Self Refresh */
-+#define		AT91_SDRAMC_DS			(3 << 10)	/* Drive Strength */
-+#define		AT91_SDRAMC_TIMEOUT		(3 << 12)	/* Time to define when Low Power Mode is enabled */
-+#define			AT91_SDRAMC_TIMEOUT_0_CLK_CYCLES	(0 << 12)
-+#define			AT91_SDRAMC_TIMEOUT_64_CLK_CYCLES	(1 << 12)
-+#define			AT91_SDRAMC_TIMEOUT_128_CLK_CYCLES	(2 << 12)
-+
-+#define AT91_SDRAMC_IER		(AT91_SDRAMC + 0x14)	/* SDRAM Controller Interrupt Enable Register */
-+#define AT91_SDRAMC_IDR		(AT91_SDRAMC + 0x18)	/* SDRAM Controller Interrupt Disable Register */
-+#define AT91_SDRAMC_IMR		(AT91_SDRAMC + 0x1C)	/* SDRAM Controller Interrupt Mask Register */
-+#define AT91_SDRAMC_ISR		(AT91_SDRAMC + 0x20)	/* SDRAM Controller Interrupt Status Register */
-+#define		AT91_SDRAMC_RES		(1 << 0)		/* Refresh Error Status */
-+
-+#define AT91_SDRAMC_MDR		(AT91_SDRAMC + 0x24)	/* SDRAM Memory Device Register */
-+#define		AT91_SDRAMC_MD		(3 << 0)		/* Memory Device Type */
-+#define			AT91_SDRAMC_MD_SDRAM		0
-+#define			AT91_SDRAMC_MD_LOW_POWER_SDRAM	1
-+
-+
-+#endif
---- /dev/null
-+++ b/include/asm-arm/arch-at91/at91sam9_smc.h
-@@ -0,0 +1,76 @@
-+/*
-+ * include/asm-arm/arch-at91/at91sam9_smc.h
-+ *
-+ * Copyright (C) 2007 Andrew Victor
-+ * Copyright (C) 2007 Atmel Corporation.
-+ *  
-+ * Static Memory Controllers (SMC) - System peripherals registers.
-+ * Based on AT91SAM9261 datasheet revision D.
-+ *
-+ * 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.
-+ */
-+
-+#ifndef AT91SAM9_SMC_H
-+#define AT91SAM9_SMC_H
-+
-+#define AT91_SMC_SETUP(n)	(AT91_SMC + 0x00 + ((n)*0x10))	/* Setup Register for CS n */
-+#define		AT91_SMC_NWESETUP	(0x3f << 0)			/* NWE Setup Length */
-+#define			AT91_SMC_NWESETUP_(x)	((x) << 0)
-+#define		AT91_SMC_NCS_WRSETUP	(0x3f << 8)			/* NCS Setup Length in Write Access */
-+#define			AT91_SMC_NCS_WRSETUP_(x)	((x) << 8)
-+#define		AT91_SMC_NRDSETUP	(0x3f << 16)			/* NRD Setup Length */
-+#define			AT91_SMC_NRDSETUP_(x)	((x) << 16)
-+#define		AT91_SMC_NCS_RDSETUP	(0x3f << 24)			/* NCS Setup Length in Read Access */
-+#define			AT91_SMC_NCS_RDSETUP_(x)	((x) << 24)
-+
-+#define AT91_SMC_PULSE(n)	(AT91_SMC + 0x04 + ((n)*0x10))	/* Pulse Register for CS n */
-+#define		AT91_SMC_NWEPULSE	(0x7f <<  0)			/* NWE Pulse Length */
-+#define			AT91_SMC_NWEPULSE_(x)	((x) << 0)
-+#define		AT91_SMC_NCS_WRPULSE	(0x7f <<  8)			/* NCS Pulse Length in Write Access */
-+#define			AT91_SMC_NCS_WRPULSE_(x)((x) << 8)
-+#define		AT91_SMC_NRDPULSE	(0x7f << 16)			/* NRD Pulse Length */
-+#define			AT91_SMC_NRDPULSE_(x)	((x) << 16)
-+#define		AT91_SMC_NCS_RDPULSE	(0x7f << 24)			/* NCS Pulse Length in Read Access */
-+#define			AT91_SMC_NCS_RDPULSE_(x)((x) << 24)
-+
-+#define AT91_SMC_CYCLE(n)	(AT91_SMC + 0x08 + ((n)*0x10))	/* Cycle Register for CS n */
-+#define		AT91_SMC_NWECYCLE	(0x1ff << 0 )			/* Total Write Cycle Length */
-+#define			AT91_SMC_NWECYCLE_(x)	((x) << 0)
-+#define		AT91_SMC_NRDCYCLE	(0x1ff << 16)			/* Total Read Cycle Length */
-+#define			AT91_SMC_NRDCYCLE_(x)	((x) << 16)
-+
-+#define AT91_SMC_MODE(n)	(AT91_SMC + 0x0c + ((n)*0x10))	/* Mode Register for CS n */
-+#define		AT91_SMC_READMODE	(1 <<  0)			/* Read Mode */
-+#define		AT91_SMC_WRITEMODE	(1 <<  1)			/* Write Mode */
-+#define		AT91_SMC_EXNWMODE	(3 <<  4)			/* NWAIT Mode */
-+#define			AT91_SMC_EXNWMODE_DISABLE	(0 << 4)
-+#define			AT91_SMC_EXNWMODE_FROZEN	(2 << 4)
-+#define			AT91_SMC_EXNWMODE_READY		(3 << 4)
-+#define		AT91_SMC_BAT		(1 <<  8)			/* Byte Access Type */
-+#define			AT91_SMC_BAT_SELECT		(0 << 8)
-+#define			AT91_SMC_BAT_WRITE		(1 << 8)
-+#define		AT91_SMC_DBW		(3 << 12)			/* Data Bus Width */
-+#define			AT91_SMC_DBW_8			(0 << 12)
-+#define			AT91_SMC_DBW_16			(1 << 12)
-+#define			AT91_SMC_DBW_32			(2 << 12)
-+#define		AT91_SMC_TDF		(0xf << 16)			/* Data Float Time. */
-+#define			AT91_SMC_TDF_(x)		((x) << 16)
-+#define		AT91_SMC_TDFMODE	(1 << 20)			/* TDF Optimization - Enabled */
-+#define		AT91_SMC_PMEN		(1 << 24)			/* Page Mode Enabled */
-+#define		AT91_SMC_PS		(3 << 28)			/* Page Size */
-+#define			AT91_SMC_PS_4			(0 << 28)
-+#define			AT91_SMC_PS_8			(1 << 28)
-+#define			AT91_SMC_PS_16			(2 << 28)
-+#define			AT91_SMC_PS_32			(3 << 28)
-+
-+#if defined(AT91_SMC1)		/* The AT91SAM9263 has 2 Static Memory contollers */
-+#define AT91_SMC1_SETUP(n)	(AT91_SMC1 + 0x00 + ((n)*0x10))	/* Setup Register for CS n */
-+#define AT91_SMC1_PULSE(n)	(AT91_SMC1 + 0x04 + ((n)*0x10))	/* Pulse Register for CS n */
-+#define AT91_SMC1_CYCLE(n)	(AT91_SMC1 + 0x08 + ((n)*0x10))	/* Cycle Register for CS n */
-+#define AT91_SMC1_MODE(n)	(AT91_SMC1 + 0x0c + ((n)*0x10))	/* Mode Register for CS n */
-+#endif
-+
-+#endif
---- a/include/asm-arm/arch-at91/at91sam9rl.h
-+++ b/include/asm-arm/arch-at91/at91sam9rl.h
-@@ -110,6 +110,6 @@
- #define AT91SAM9RL_ROM_SIZE	(2 * SZ_16K)	/* Internal ROM size (32Kb) */
- 
- #define AT91SAM9RL_LCDC_BASE	0x00500000	/* LCD Controller */
--#define AT91SAM9RL_UDPHS_BASE	0x00600000	/* USB Device HS controller */
-+#define AT91SAM9RL_UDPHS_FIFO	0x00600000	/* USB Device HS controller */
- 
- #endif
---- a/include/asm-arm/arch-at91/board.h
-+++ b/include/asm-arm/arch-at91/board.h
-@@ -36,6 +36,7 @@
- #include <linux/i2c.h>
- #include <linux/leds.h>
- #include <linux/spi/spi.h>
-+#include <linux/usb/atmel_usba_udc.h>
- 
-  /* USB Device */
- struct at91_udc_data {
-@@ -45,6 +46,9 @@ struct at91_udc_data {
- };
- extern void __init at91_add_device_udc(struct at91_udc_data *data);
- 
-+ /* USB High Speed Device */
-+extern void __init at91_add_device_usba(struct usba_platform_data *data);
-+
-  /* Compact Flash */
- struct at91_cf_data {
- 	u8	irq_pin;		/* I/O IRQ */
-@@ -158,6 +162,9 @@ extern void __init at91_add_device_ac97(
-  /* ISI */
- extern void __init at91_add_device_isi(void);
- 
-+ /* Touchscreen Controller */
-+extern void __init at91_add_device_tsadcc(void);
-+
-  /* LEDs */
- extern void __init at91_init_leds(u8 cpu_led, u8 timer_led);
- extern void __init at91_gpio_leds(struct gpio_led *leds, int nr);
---- a/include/asm-arm/arch-at91/cpu.h
-+++ b/include/asm-arm/arch-at91/cpu.h
-@@ -48,6 +48,17 @@ static inline unsigned long at91_arch_id
- 	return (at91_sys_read(AT91_DBGU_CIDR) & AT91_CIDR_ARCH);
- }
- 
-+#ifdef CONFIG_ARCH_AT91CAP9
-+#include <asm/arch/at91_pmc.h>
-+
-+#define ARCH_REVISION_CAP9_B	0x399
-+#define ARCH_REVISION_CAP9_C	0x601
-+
-+static inline unsigned long at91cap9_rev_identify(void)
-+{
-+	return (at91_sys_read(AT91_PMC_VER));
-+}
-+#endif
- 
- #ifdef CONFIG_ARCH_AT91RM9200
- #define cpu_is_at91rm9200()	(at91_cpu_identify() == ARCH_ID_AT91RM9200)
-@@ -83,8 +94,12 @@ static inline unsigned long at91_arch_id
- 
- #ifdef CONFIG_ARCH_AT91CAP9
- #define cpu_is_at91cap9()	(at91_cpu_identify() == ARCH_ID_AT91CAP9)
-+#define cpu_is_at91cap9_revB()	(at91cap9_rev_identify() == ARCH_REVISION_CAP9_B)
-+#define cpu_is_at91cap9_revC()	(at91cap9_rev_identify() == ARCH_REVISION_CAP9_C)
- #else
- #define cpu_is_at91cap9()	(0)
-+#define cpu_is_at91cap9_revB()	(0)
-+#define cpu_is_at91cap9_revC()	(0)
- #endif
- 
- /*
---- /dev/null
-+++ b/include/asm-arm/arch-at91/ics1523.h
-@@ -0,0 +1,154 @@
-+//*----------------------------------------------------------------------------
-+//*         ATMEL Microcontroller Software Support  -  ROUSSET  -
-+//*----------------------------------------------------------------------------
-+//* The software is delivered "AS IS" without warranty or condition of any
-+//* kind, either express, implied or statutory. This includes without
-+//* limitation any warranty or condition with respect to merchantability or
-+//* fitness for any particular purpose, or against the infringements of
-+//* intellectual property rights of others.
-+//*----------------------------------------------------------------------------
-+//* File Name           : ics1523.h
-+//* Object              : Clock Generator Prototyping File.
-+//*
-+//* 1.0 08/28/02 ED     : Creation
-+//* 1.2 13/01/03 FB	: Update on lib V3
-+//*----------------------------------------------------------------------------
-+
-+#ifndef ics1523_h
-+#define ics1523_h
-+
-+/*-------------------------------------------*/
-+/* ICS1523 TWI Serial Clock Definition       */
-+/*-------------------------------------------*/
-+
-+#define		ICS_MIN_CLOCK		100		/* Min Frequency Access Clock KHz */
-+#define		ICS_MAX_CLOCK		400		/* Max Frequency Access Clock KHz */
-+#define		ICS_TRANSFER_RATE	ICS_MAX_CLOCK	/* Transfer speed to apply */
-+
-+#define		ICS_WRITE_CLK_PNB	30		/* TWCK Clock Periods required to write */
-+#define		ICS_READ_CLK_PNB	40		/* TWCK Clock Periods required to read */
-+
-+/*-------------------------------------------*/
-+/* ICS1523 Write Operation Definition        */
-+/*-------------------------------------------*/
-+
-+#define		ICS1523_ACCESS_OK	0		/* OK */
-+#define		ICS1523_ACCESS_ERROR	-1		/* NOK */
-+
-+/*-------------------------------------------*/
-+/* ICS1523 Device Addresses Definition       */
-+/*-------------------------------------------*/
-+
-+#define		ICS_ADDR		0x26		/* Device Address */
-+
-+/*--------------------------------------------------*/
-+/* ICS1523 Registers Internal Addresses Definition  */
-+/*--------------------------------------------------*/
-+
-+#define		ICS_ICR			0x0		/* Input Control Register */
-+#define		ICS_LCR			0x1		/* Loop Control Register */
-+#define		ICS_FD0			0x2		/* PLL FeedBack Divider LSBs */
-+#define		ICS_FD1			0x3		/* PLL FeedBack Divider MSBs */
-+#define		ICS_DPAO		0x4		/* Dynamic Phase Aligner Offset */
-+#define		ICS_DPAC		0x5		/* Dynamic Phase Aligner Resolution */
-+#define		ICS_OE			0x6		/* Output Enables Register */
-+#define		ICS_OD			0x7		/* Osc Divider Register */
-+#define		ICS_SWRST		0x8		/* DPA & PLL Reset Register */
-+#define		ICS_VID			0x10		/* Chip Version Register */
-+#define		ICS_RID			0x11		/* Chip Revision Register */
-+#define		ICS_SR			0x12		/* Status Register */
-+
-+/*------------------------------------------------------*/
-+/* ICS1523 Input Control Register Bits Definition       */
-+/*------------------------------------------------------*/
-+
-+#define		ICS_PDEN		0x1		/* Phase Detector Enable */
-+#define		ICS_PDPOL		0x2		/* Phase Detector Enable Polarity */
-+#define		ICS_REFPOL		0x4		/* External Reference Polarity */
-+#define		ICS_FBKPOL		0x8		/* External Feedback Polarity */
-+#define		ICS_FBKSEL		0x10		/* External Feedback Select */
-+#define		ICS_FUNCSEL		0x20		/* Function Out Select */
-+#define		ICS_ENPLS		0x40		/* Enable PLL Lock/Ref Status Output */
-+#define		ICS_ENDLS		0x80		/* Enable DPA Lock/Ref Status Output */
-+
-+/*-----------------------------------------------------*/
-+/* ICS1523 Loop Control Register Bits Definition       */
-+/*-----------------------------------------------------*/
-+
-+#define		ICS_PFD			0x7		/* Phase Detector Gain */
-+#define		ICS_PSD			0x30		/* Post-Scaler Divider */
-+
-+/*----------------------------------------------------*/
-+/* ICS1523 PLL FeedBack Divider LSBs Definition       */
-+/*----------------------------------------------------*/
-+
-+#define		ICS_FBDL		0xFF		/* PLL FeedBack Divider LSBs */
-+
-+/*----------------------------------------------------*/
-+/* ICS1523 PLL FeedBack Divider MSBs Definition       */
-+/*----------------------------------------------------*/
-+
-+#define		ICS_FBDM		0xF		/* PLL FeedBack Divider MSBs */
-+
-+/*------------------------------------------------------------*/
-+/* ICS1523 Dynamic Phase Aligner Offset Bits Definition       */
-+/*------------------------------------------------------------*/
-+
-+#define		ICS_DPAOS		0x2F		/* Dynamic Phase Aligner Offset */
-+#define		ICS_FILSEL		0x80		/* Loop Filter Select */
-+
-+/*----------------------------------------------------------------*/
-+/* ICS1523 Dynamic Phase Aligner Resolution Bits Definition       */
-+/*----------------------------------------------------------------*/
-+
-+#define		ICS_DPARES		0x3		/* Dynamic Phase Aligner Resolution */
-+#define		ICS_MMREV		0xFC		/* Metal Mask Revision Number */
-+
-+/*-------------------------------------------------------*/
-+/* ICS1523 Output Enables Register Bits Definition       */
-+/*-------------------------------------------------------*/
-+
-+#define		ICS_OEPCK		0x1		/* Output Enable for PECL PCLK Outputs */
-+#define		ICS_OETCK		0x2		/* Output Enable for STTL CLK Output */
-+#define		ICS_OEP2		0x4		/* Output Enable for PECL CLK/2 Outputs */
-+#define		ICS_OET2		0x8		/* Output Enable for STTL CLK/2 Output */
-+#define		ICS_OEF			0x10		/* Output Enable for STTL FUNC Output */
-+#define		ICS_CLK2INV		0x20		/* CLK/2 Invert */
-+#define		ICS_OSCL		0xC0		/* SSTL Clock Scaler */
-+
-+/*----------------------------------------------------*/
-+/* ICS1523 Osc Divider Register Bits Definition       */
-+/*----------------------------------------------------*/
-+
-+#define		ICS_OSCDIV		0x7F		/* Oscillator Divider Modulus */
-+#define		ICS_INSEL		0x80		/* Input Select */
-+
-+/*---------------------------------------------------*/
-+/* ICS1523 DPA & PLL Reset Register Definition       */
-+/*---------------------------------------------------*/
-+
-+#define		ICS_DPAR		0x0A		/* DPA Reset Command */
-+#define		ICS_PLLR		0x50		/* PLL Reset Command */
-+
-+/*------------------------------------------------*/
-+/* ICS1523 Chip Version Register Definition       */
-+/*------------------------------------------------*/
-+
-+#define		ICS_CHIPV		0xFF		/* Chip Version */
-+
-+/*-------------------------------------------------*/
-+/* ICS1523 Chip Revision Register Definition       */
-+/*-------------------------------------------------*/
-+
-+#define		ICS_CHIPR		0xFF		/* Chip Revision */
-+
-+/*------------------------------------------*/
-+/* ICS1523 Status Register Definition       */
-+/*------------------------------------------*/
-+
-+#define		ICS_DPALOCK		0x1		/* DPA Lock Status */
-+#define		ICS_PLLLOCK		0x2		/* PLL Lock Status */
-+
-+int at91_ics1523_init(void);
-+
-+#endif /* ics1523_h */
---- /dev/null
-+++ b/include/asm-arm/arch-at91/spi.h
-@@ -0,0 +1,54 @@
-+/*
-+ * Serial Peripheral Interface (SPI) driver for the Atmel AT91RM9200
-+ *
-+ * (c) SAN People (Pty) Ltd
-+ *
-+ * 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.
-+ */
-+
-+#ifndef AT91_LEGACY_SPI_H
-+#define AT91_LEGACY_SPI_H
-+
-+#define SPI_MAJOR		153	/* registered device number */
-+
-+#define DEFAULT_SPI_CLK		6000000
-+
-+
-+/* Maximum number of buffers in a single SPI transfer.
-+ *  DataFlash uses maximum of 2
-+ *  spidev interface supports up to 8.
-+ */
-+#define MAX_SPI_TRANSFERS	8
-+#define NR_SPI_DEVICES		4	/* number of devices on SPI bus */
-+
-+/*
-+ * Describes the buffers for a SPI transfer.
-+ * A transmit & receive buffer must be specified for each transfer
-+ */
-+struct spi_transfer_list {
-+	void* tx[MAX_SPI_TRANSFERS];	/* transmit */
-+	int txlen[MAX_SPI_TRANSFERS];
-+	void* rx[MAX_SPI_TRANSFERS];	/* receive */
-+	int rxlen[MAX_SPI_TRANSFERS];
-+	int nr_transfers;		/* number of transfers */
-+	int curr;			/* current transfer */
-+};
-+
-+struct spi_local {
-+	unsigned int pcs;		/* Peripheral Chip Select value */
-+
-+	struct spi_transfer_list *xfers;	/* current transfer list */
-+	dma_addr_t tx, rx;		/* DMA address for current transfer */
-+	dma_addr_t txnext, rxnext;	/* DMA address for next transfer */
-+};
-+
-+
-+/* Exported functions */
-+extern void spi_access_bus(short device);
-+extern void spi_release_bus(short device);
-+extern int spi_transfer(struct spi_transfer_list* list);
-+
-+#endif
---- a/include/asm-arm/arch-at91/timex.h
-+++ b/include/asm-arm/arch-at91/timex.h
-@@ -27,14 +27,29 @@
- 
- #define CLOCK_TICK_RATE		(AT91_SLOW_CLOCK)
- 
--#elif defined(CONFIG_ARCH_AT91SAM9260) || defined(CONFIG_ARCH_AT91SAM9261)
-+#elif defined(CONFIG_ARCH_AT91SAM9260)
-+
-+#if defined(CONFIG_MACH_USB_A9260) || defined(CONFIG_MACH_QIL_A9260)
-+#define AT91SAM9_MASTER_CLOCK	90000000
-+#else
-+#define AT91SAM9_MASTER_CLOCK	99300000
-+#endif
-+
-+#define CLOCK_TICK_RATE		(AT91SAM9_MASTER_CLOCK/16)
-+
-+#elif defined(CONFIG_ARCH_AT91SAM9261)
- 
- #define AT91SAM9_MASTER_CLOCK	99300000
- #define CLOCK_TICK_RATE		(AT91SAM9_MASTER_CLOCK/16)
- 
- #elif defined(CONFIG_ARCH_AT91SAM9263)
- 
-+#if defined(CONFIG_MACH_USB_A9263)
-+#define AT91SAM9_MASTER_CLOCK	90000000
-+#else
- #define AT91SAM9_MASTER_CLOCK	99959500
-+#endif
-+
- #define CLOCK_TICK_RATE		(AT91SAM9_MASTER_CLOCK/16)
- 
- #elif defined(CONFIG_ARCH_AT91SAM9RL)
---- a/include/asm-arm/arch-ks8695/devices.h
-+++ b/include/asm-arm/arch-ks8695/devices.h
-@@ -18,6 +18,11 @@ extern void __init ks8695_add_device_wan
- extern void __init ks8695_add_device_lan(void);
- extern void __init ks8695_add_device_hpna(void);
- 
-+ /* LEDs */
-+extern short ks8695_leds_cpu;
-+extern short ks8695_leds_timer;
-+extern void __init ks8695_init_leds(u8 cpu_led, u8 timer_led);
-+
-  /* PCI */
- #define KS8695_MODE_PCI		0
- #define KS8695_MODE_MINIPCI	1
---- a/include/linux/clk.h
-+++ b/include/linux/clk.h
-@@ -121,4 +121,24 @@ int clk_set_parent(struct clk *clk, stru
-  */
- struct clk *clk_get_parent(struct clk *clk);
- 
-+/**
-+ * clk_must_disable - report whether a clock's users must disable it
-+ * @clk: one node in the clock tree
-+ *
-+ * This routine returns true only if the upcoming system state requires
-+ * disabling the specified clock.
-+ *
-+ * It's common for platform power states to constrain certain clocks (and
-+ * their descendants) to be unavailable, while other states allow that
-+ * clock to be active.  A platform's power states often include an "all on"
-+ * mode; system wide sleep states like "standby" or "suspend-to-RAM"; and
-+ * operating states which sacrifice functionality for lower power usage.
-+ *
-+ * The constraint value is commonly tested in device driver suspend(), to
-+ * leave clocks active if they are needed for features like wakeup events.
-+ * On platforms that support reduced functionality operating states, the
-+ * constraint may also need to be tested during resume() and probe() calls.
-+ */
-+int clk_must_disable(struct clk *clk);
-+
- #endif
---- a/include/linux/i2c-id.h
-+++ b/include/linux/i2c-id.h
-@@ -131,6 +131,7 @@
- 
- /* --- PCA 9564 based algorithms */
- #define I2C_HW_A_ISA		0x1a0000 /* generic ISA Bus interface card */
-+#define I2C_HW_A_PLAT		0x1a0001 /* generic platform_bus interface */
- 
- /* --- PowerPC on-chip adapters						*/
- #define I2C_HW_OCP		0x120000 /* IBM on-chip I2C adapter */
---- /dev/null
-+++ b/include/linux/usb/atmel_usba_udc.h
-@@ -0,0 +1,23 @@
-+/*
-+* Platform data definitions for Atmel USBA gadget driver.
-+*/
-+#ifndef __LINUX_USB_USBA_H
-+#define __LINUX_USB_USBA_H
-+
-+struct usba_ep_data {
-+	char*	name;
-+	int	index;
-+	int	fifo_size;
-+	int	nr_banks;
-+	int	can_dma;
-+	int	can_isoc;
-+};
-+
-+struct usba_platform_data {
-+	int			vbus_pin;
-+	int			num_ep;
-+	struct usba_ep_data	ep[0];
-+};
-+
-+#endif /* __LINUX_USB_USBA_H */
-+
---- a/include/video/atmel_lcdc.h
-+++ b/include/video/atmel_lcdc.h
-@@ -39,6 +39,7 @@ struct atmel_lcdfb_info {
- 	u8			bl_power;
- #endif
- 	bool			lcdcon_is_backlight;
-+	u8			saved_lcdcon;
- 
- 	u8			default_bpp;
- 	unsigned int		default_lcdcon2;
---- a/sound/soc/at91/eti_b1_wm8731.c
-+++ b/sound/soc/at91/eti_b1_wm8731.c
-@@ -33,8 +33,7 @@
- #include <sound/soc.h>
- #include <sound/soc-dapm.h>
- 
--#include <asm/arch/hardware.h>
--#include <asm/arch/at91_pio.h>
-+#include <asm/hardware.h>
- #include <asm/arch/gpio.h>
- 
- #include "../codecs/wm8731.h"
-@@ -47,13 +46,6 @@
- #define	DBG(x...)
- #endif
- 
--#define AT91_PIO_TF1	(1 << (AT91_PIN_PB6 - PIN_BASE) % 32)
--#define AT91_PIO_TK1	(1 << (AT91_PIN_PB7 - PIN_BASE) % 32)
--#define AT91_PIO_TD1	(1 << (AT91_PIN_PB8 - PIN_BASE) % 32)
--#define AT91_PIO_RD1	(1 << (AT91_PIN_PB9 - PIN_BASE) % 32)
--#define AT91_PIO_RK1	(1 << (AT91_PIN_PB10 - PIN_BASE) % 32)
--#define AT91_PIO_RF1	(1 << (AT91_PIN_PB11 - PIN_BASE) % 32)
--
- static struct clk *pck1_clk;
- static struct clk *pllb_clk;
- 
-@@ -276,7 +268,6 @@ static struct platform_device *eti_b1_sn
- static int __init eti_b1_init(void)
- {
- 	int ret;
--	u32 ssc_pio_lines;
- 	struct at91_ssc_periph *ssc = eti_b1_dai.cpu_dai->private_data;
- 
- 	if (!request_mem_region(AT91RM9200_BASE_SSC1, SZ_16K, "soc-audio")) {
-@@ -310,19 +301,12 @@ static int __init eti_b1_init(void)
- 		goto fail_io_unmap;
- 	}
- 
-- 	ssc_pio_lines = AT91_PIO_TF1 | AT91_PIO_TK1 | AT91_PIO_TD1
--			| AT91_PIO_RD1 /* | AT91_PIO_RK1 */ | AT91_PIO_RF1;
--
--	/* Reset all PIO registers and assign lines to peripheral A */
-- 	at91_sys_write(AT91_PIOB + PIO_PDR,  ssc_pio_lines);
-- 	at91_sys_write(AT91_PIOB + PIO_ODR,  ssc_pio_lines);
-- 	at91_sys_write(AT91_PIOB + PIO_IFDR, ssc_pio_lines);
-- 	at91_sys_write(AT91_PIOB + PIO_CODR, ssc_pio_lines);
-- 	at91_sys_write(AT91_PIOB + PIO_IDR,  ssc_pio_lines);
-- 	at91_sys_write(AT91_PIOB + PIO_MDDR, ssc_pio_lines);
-- 	at91_sys_write(AT91_PIOB + PIO_PUDR, ssc_pio_lines);
-- 	at91_sys_write(AT91_PIOB + PIO_ASR,  ssc_pio_lines);
-- 	at91_sys_write(AT91_PIOB + PIO_OWDR, ssc_pio_lines);
-+ 	at91_set_A_periph(AT91_PIN_PB6, 0);	/* TF1 */
-+ 	at91_set_A_periph(AT91_PIN_PB7, 0);	/* TK1 */
-+ 	at91_set_A_periph(AT91_PIN_PB8, 0);	/* TD1 */
-+ 	at91_set_A_periph(AT91_PIN_PB9, 0);	/* RD1 */
-+/* 	at91_set_A_periph(AT91_PIN_PB10, 0);*/	/* RK1 */
-+ 	at91_set_A_periph(AT91_PIN_PB11, 0);	/* RF1 */
- 
- 	/*
- 	 * Set PCK1 parent to PLLB and its rate to 12 Mhz.
---- a/sound/spi/at73c213.c
-+++ b/sound/spi/at73c213.c
-@@ -114,7 +114,11 @@ snd_at73c213_write_reg(struct snd_at73c2
- static struct snd_pcm_hardware snd_at73c213_playback_hw = {
- 	.info		= SNDRV_PCM_INFO_INTERLEAVED |
- 			  SNDRV_PCM_INFO_BLOCK_TRANSFER,
-+#ifdef __BIG_ENDIAN
- 	.formats	= SNDRV_PCM_FMTBIT_S16_BE,
-+#else
-+	.formats	= SNDRV_PCM_FMTBIT_S16_LE,
-+#endif
- 	.rates		= SNDRV_PCM_RATE_CONTINUOUS,
- 	.rate_min	= 8000,  /* Replaced by chip->bitrate later. */
- 	.rate_max	= 50000, /* Replaced by chip->bitrate later. */
diff --git a/target/linux/at91/patches-2.6.25/001-vlink-machine.patch b/target/linux/at91/patches-2.6.25/001-vlink-machine.patch
deleted file mode 100644
index 76e3698c5..000000000
--- a/target/linux/at91/patches-2.6.25/001-vlink-machine.patch
+++ /dev/null
@@ -1,229 +0,0 @@
---- a/arch/arm/mach-at91/Kconfig
-+++ b/arch/arm/mach-at91/Kconfig
-@@ -151,6 +151,12 @@ config MACH_TT9200
- 	help
- 	  Select this if you are using Toptech's TT9200 board.
- 
-+config MACH_VLINK
-+	bool "Figment Design Labs VersaLink"
-+	depends on ARCH_AT91RM9200
-+	help
-+	  Select this if you are using FDL's VersaLink board
-+
- endif
- 
- # ----------------------------------------------------------
---- a/arch/arm/mach-at91/Makefile
-+++ b/arch/arm/mach-at91/Makefile
-@@ -29,6 +29,7 @@ obj-$(CONFIG_MACH_KB9200)	+= board-kb920
- obj-$(CONFIG_MACH_ATEB9200)	+= board-eb9200.o
- obj-$(CONFIG_MACH_KAFA)		+= board-kafa.o
- obj-$(CONFIG_MACH_CHUB)		+= board-chub.o
-+obj-$(CONFIG_MACH_VLINK)	+= board-vlink.o
- obj-$(CONFIG_MACH_PICOTUX2XX)	+= board-picotux200.o
- obj-$(CONFIG_MACH_HOMEMATIC)	+= board-homematic.o
- obj-$(CONFIG_MACH_ECBAT91)	+= board-ecbat91.o
---- /dev/null
-+++ b/arch/arm/mach-at91/board-vlink.c
-@@ -0,0 +1,201 @@
-+/*
-+ * linux/arch/arm/mach-at91/board-vlink.c
-+ *
-+ *  Copyright (C) 2005 SAN People
-+ *  Copyright (C) 2006,2007 Guthrie Consulting
-+ *
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#include <linux/types.h>
-+#include <linux/init.h>
-+#include <linux/mm.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/spi/spi.h>
-+#include <linux/mtd/physmap.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/setup.h>
-+#include <asm/mach-types.h>
-+#include <asm/irq.h>
-+
-+#include <asm/mach/arch.h>
-+#include <asm/mach/map.h>
-+#include <asm/mach/irq.h>
-+
-+#include <asm/arch/board.h>
-+#include <asm/arch/gpio.h>
-+#include <asm/arch/at91rm9200_mc.h>
-+
-+#include "generic.h"
-+
-+
-+static void __init vlink_map_io(void)
-+{
-+	/* Initialize processor: 18.432 MHz crystal */
-+	at91rm9200_initialize(18432000, AT91RM9200_PQFP);
-+
-+	/* Setup the LEDs */
-+	at91_init_leds(AT91_PIN_PC14, AT91_PIN_PC15);
-+
-+	/* Setup serial ports */
-+	
-+	/* DBGU on ttyS0. (RX and TX only) */
-+	at91_register_uart(0, 0, 0);
-+
-+	/* USART1 on ttyS1. (Rx, Tx, CTS, RTS, DSR, DTR, DCD, RI) */
-+	at91_register_uart(AT91RM9200_ID_US1, 1, ATMEL_UART_CTS 
-+			| ATMEL_UART_RTS | ATMEL_UART_DSR | ATMEL_UART_DTR
-+			| ATMEL_UART_DCD | ATMEL_UART_RI);
-+
-+	/* USART0 on ttys2. (Rx, Tx, CTS, RTS, DTR, DCD, RI) */
-+	at91_register_uart(AT91RM9200_ID_US0, 2, ATMEL_UART_CTS
-+			| ATMEL_UART_RTS | ATMEL_UART_DTR | ATMEL_UART_DCD | ATMEL_UART_RI);
-+
-+	/* USART3 on ttyS3. (Rx, Tx, CTS, RTS, DTR, DCD, RI) */
-+	at91_register_uart(AT91RM9200_ID_US3, 3, ATMEL_UART_CTS
-+			| ATMEL_UART_RTS | ATMEL_UART_DTR | ATMEL_UART_DCD | ATMEL_UART_RI);
-+
-+	/* USART2 on ttyS4. (Rx and Tx only) */
-+	at91_register_uart(AT91RM9200_ID_US2, 4, 0);
-+
-+	/* Console on ttyS0 (ie DBGU) */
-+	at91_set_serial_console(0);
-+}
-+
-+static void __init vlink_init_irq(void)
-+{
-+	at91rm9200_init_interrupts(NULL);
-+}
-+
-+static struct at91_eth_data __initdata vlink_eth_data = {
-+	.phy_irq_pin	= AT91_PIN_PC4,
-+	.is_rmii	= 1,
-+};
-+
-+static struct at91_usbh_data __initdata vlink_usbh_data = {
-+	.ports		= 1,
-+};
-+
-+/*
-+static struct at91_udc_data __initdata vlink_udc_data = {
-+	.vbus_pin	= AT91_PIN_PD4,
-+	.pullup_pin	= AT91_PIN_PD5,
-+};
-+*/
-+
-+static struct at91_mmc_data __initdata vlink_mmc_data = {
-+//	.det_pin	= AT91_PIN_PB27,
-+	.slot_b		= 0,
-+	.wire4		= 1,
-+//	.wp_pin		= AT91_PIN_PA17,
-+};
-+
-+static struct spi_board_info vlink_spi_devices[] = {
-+	{	/* DataFlash chip */
-+		.modalias	= "mtd_dataflash",
-+		.chip_select	= 0,
-+		.max_speed_hz	= 15 * 1000 * 1000,
-+	},
-+#ifdef CONFIG_MTD_AT91_DATAFLASH_CARD
-+	{	/* DataFlash card */
-+		.modalias	= "mtd_dataflash",
-+		.chip_select	= 3,
-+		.max_speed_hz	= 15 * 1000 * 1000,
-+	},
-+#endif
-+};
-+
-+/*static struct at91_gpio_led vlink_leds[] = {
-+	{
-+		.name		= "led0",
-+		.gpio		= AT91_PIN_PC14,
-+		.trigger	= "heartbeat",
-+	},
-+	{
-+		.name		= "led1",
-+		.gpio		= AT91_PIN_PC15,
-+		.trigger	= "timer",
-+	}
-+};
-+*/
-+
-+static void __init vlink_board_init(void)
-+{
-+	/* Serial */
-+	at91_add_device_serial();
-+	/* Ethernet */
-+	at91_add_device_eth(&vlink_eth_data);
-+	/* USB Host */
-+	at91_add_device_usbh(&vlink_usbh_data);
-+	/* USB Device */
-+//	at91_add_device_udc(&vlink_udc_data);
-+//	at91_set_multi_drive(vlink_udc_data.pullup_pin, 1);	/* pullup_pin is connected to reset */
-+	/* I2C */
-+//	at91_add_device_i2c();
-+	/* SPI */
-+	at91_add_device_spi(vlink_spi_devices, ARRAY_SIZE(vlink_spi_devices));
-+#ifdef CONFIG_MTD_AT91_DATAFLASH_CARD
-+	/* DataFlash card */
-+//	at91_set_gpio_output(AT91_PIN_PB22, 0);
-+#else
-+	/* MMC */
-+//	at91_set_gpio_output(AT91_PIN_PB22, 1);	/* this MMC card slot can optionally use SPI signaling (CS3). */
-+	at91_add_device_mmc(0, &vlink_mmc_data);
-+#endif
-+	/* LEDs */
-+//	at91_gpio_leds(vlink_leds, ARRAY_SIZE(vlink_leds));
-+
-+/* Other LED's */
-+       at91_set_gpio_output(AT91_PIN_PC7, 1);  // LED FRONT AP1
-+       at91_set_gpio_output(AT91_PIN_PC8, 1);  // LED FRONT BP1
-+       at91_set_gpio_output(AT91_PIN_PB14, 1); // LED BACK AP1
-+       at91_set_gpio_output(AT91_PIN_PB15, 1); // LED BACK BP1
-+       at91_set_gpio_output(AT91_PIN_PB16, 1); // LED BACK AP2
-+       at91_set_gpio_output(AT91_PIN_PB17, 1); // LED BACK BP2
-+
-+/* SIM Cards */
-+       at91_set_gpio_output(AT91_PIN_PB9, 1);  // ENBSC3
-+       at91_set_gpio_output(AT91_PIN_PB10, 1); // ENBSC2
-+       at91_set_gpio_output(AT91_PIN_PB11, 1); // ENBSC1
-+
-+/* GSM Module Control */
-+       at91_set_gpio_output(AT91_PIN_PB12, 1); // GSMONOFF
-+
-+/* Test jig presence detection */
-+       at91_set_gpio_input(AT91_PIN_PB8, 1);   // JIGPRESENT
-+
-+/* Power indicator */
-+       at91_set_gpio_input(AT91_PIN_PB22, 1);  // PWR_IND
-+
-+/* USB Device control */
-+       at91_set_gpio_input(AT91_PIN_PB27, 1);  // UDB_CNX
-+       at91_set_gpio_output(AT91_PIN_PB28, 1); // UDB_PUP
-+			 at91_set_multi_drive(AT91_PIN_PB28, 1); // Set to multi-drive
-+
-+}
-+
-+MACHINE_START(VLINK, "FDL VersaLink")
-+	/* Maintainer: Guthrie Consulting */
-+	.phys_io	= AT91_BASE_SYS,
-+	.io_pg_offst	= (AT91_VA_BASE_SYS >> 18) & 0xfffc,
-+	.boot_params	= AT91_SDRAM_BASE + 0x100,
-+	.timer		= &at91rm9200_timer,
-+	.map_io		= vlink_map_io,
-+	.init_irq	= vlink_init_irq,
-+	.init_machine	= vlink_board_init,
-+MACHINE_END
diff --git a/target/linux/at91/patches-2.6.25/002-led-driver.patch b/target/linux/at91/patches-2.6.25/002-led-driver.patch
deleted file mode 100644
index 595720dcb..000000000
--- a/target/linux/at91/patches-2.6.25/002-led-driver.patch
+++ /dev/null
@@ -1,167 +0,0 @@
---- a/arch/arm/mach-at91/at91rm9200_devices.c
-+++ b/arch/arm/mach-at91/at91rm9200_devices.c
-@@ -717,6 +717,26 @@ static void __init at91_add_device_watch
- static void __init at91_add_device_watchdog(void) {}
- #endif
- 
-+/* --------------------------------------------------------------------
-+ *  LEDs
-+ * -------------------------------------------------------------------- */
-+
-+#if defined(CONFIG_LEDS)
-+u8 at91_leds_cpu;
-+u8 at91_leds_timer;
-+
-+void __init at91_init_leds(u8 cpu_led, u8 timer_led)
-+{
-+	/* Enable GPIO to access the LEDs */
-+	at91_set_gpio_output(cpu_led, 1);
-+	at91_set_gpio_output(timer_led, 1);
-+
-+	at91_leds_cpu   = cpu_led;
-+	at91_leds_timer = timer_led;
-+}
-+#else
-+void __init at91_init_leds(u8 cpu_led, u8 timer_led) {}
-+#endif
- 
- /* --------------------------------------------------------------------
-  *  SSC -- Synchronous Serial Controller
---- a/arch/arm/mach-at91/Makefile
-+++ b/arch/arm/mach-at91/Makefile
-@@ -60,7 +60,12 @@ obj-$(CONFIG_MACH_AT91CAP9ADK)	+= board-
- obj-$(CONFIG_MACH_AT91EB01)	+= board-eb01.o
- 
- # Drivers
--obj-y				+= leds.o
-+ifeq ($(CONFIG_MACH_VLINK),y)
-+led-$(CONFIG_MACH_VLINK)	+= vlink_leds.o
-+else
-+led-y				+= leds.o
-+endif
-+obj-y				+= $(led-y)
- obj-$(CONFIG_FB_S1D13XXX)	+= ics1523.o
- 
- # Power Management
---- /dev/null
-+++ b/arch/arm/mach-at91/vlink_leds.c
-@@ -0,0 +1,105 @@
-+/*
-+ * LED driver for Atmel AT91-based boards.
-+ *
-+ *  Copyright (C) SAN People (Pty) Ltd
-+ *	Modified for FDL VersaLink Copyright (C) Guthrie Consulting
-+ *
-+ * 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/kernel.h>
-+#include <linux/module.h>
-+#include <linux/init.h>
-+
-+#include <asm/mach-types.h>
-+#include <asm/leds.h>
-+#include <asm/arch/board.h>
-+#include <asm/arch/gpio.h>
-+
-+
-+static inline void at91_led_on(unsigned int led)
-+{
-+	at91_set_gpio_value(led, 0);
-+}
-+
-+static inline void at91_led_off(unsigned int led)
-+{
-+	at91_set_gpio_value(led, 1);
-+}
-+
-+static inline void at91_led_toggle(unsigned int led)
-+{
-+	unsigned long is_off = at91_get_gpio_value(led);
-+	if (is_off) {
-+		at91_led_on(led);
-+		at91_led_off(at91_leds_cpu);
-+		}
-+	else {
-+		at91_led_on(at91_leds_cpu);
-+		at91_led_off(led);
-+		}
-+}
-+
-+
-+/*
-+ * Handle LED events.
-+ */
-+
-+/*
-+ * VersaLink has a single bi-coloured LED which changes colour when the
-+ * polarity is reversed
-+ */
-+static void at91_leds_event(led_event_t evt)
-+{
-+	unsigned long flags;
-+
-+	local_irq_save(flags);
-+
-+	switch(evt) {
-+	case led_start:		/* System startup */
-+		at91_led_toggle(at91_leds_timer);
-+		break;
-+
-+	case led_stop:		/* System stop / suspend */
-+		at91_led_toggle(at91_leds_timer);
-+		break;
-+
-+#ifdef CONFIG_LEDS_TIMER
-+	case led_timer:		/* Every 50 timer ticks */
-+		at91_led_toggle(at91_leds_timer);
-+		break;
-+#endif
-+
-+#ifdef CONFIG_LEDS_CPU
-+	case led_idle_start:	/* Entering idle state */
-+		at91_led_toggle(at91_leds_timer);
-+		break;
-+
-+	case led_idle_end:	/* Exit idle state */
-+		at91_led_toggle(at91_leds_timer);
-+		break;
-+#endif
-+
-+	default:
-+		break;
-+	}
-+
-+	local_irq_restore(flags);
-+}
-+
-+
-+static int __init leds_init(void)
-+{
-+	if (!at91_leds_timer || !at91_leds_cpu)
-+		return -ENODEV;
-+
-+	leds_event = at91_leds_event;
-+
-+	leds_event(led_start);
-+	return 0;
-+}
-+
-+__initcall(leds_init);
---- a/include/asm-arm/arch-at91/board.h
-+++ b/include/asm-arm/arch-at91/board.h
-@@ -162,6 +162,11 @@ extern void __init at91_add_device_ac97(
-  /* ISI */
- extern void __init at91_add_device_isi(void);
- 
-+ /* LEDs */
-+extern u8 at91_leds_cpu;
-+extern u8 at91_leds_timer;
-+extern void __init at91_init_leds(u8 cpu_led, u8 timer_led);
-+
-  /* Touchscreen Controller */
- extern void __init at91_add_device_tsadcc(void);
- 
diff --git a/target/linux/at91/patches-2.6.25/003-gpio-driver.patch b/target/linux/at91/patches-2.6.25/003-gpio-driver.patch
deleted file mode 100644
index 3968c6b2d..000000000
--- a/target/linux/at91/patches-2.6.25/003-gpio-driver.patch
+++ /dev/null
@@ -1,546 +0,0 @@
---- a/arch/arm/mach-at91/board-vlink.c
-+++ b/arch/arm/mach-at91/board-vlink.c
-@@ -99,7 +99,7 @@ static struct at91_udc_data __initdata v
- */
- 
- static struct at91_mmc_data __initdata vlink_mmc_data = {
--//	.det_pin	= AT91_PIN_PB27,
-+//	.det_pin	= AT91_PIN_PC10,
- 	.slot_b		= 0,
- 	.wire4		= 1,
- //	.wp_pin		= AT91_PIN_PA17,
-@@ -136,6 +136,7 @@ static struct spi_board_info vlink_spi_d
- 
- static void __init vlink_board_init(void)
- {
-+	int v100;
- 	/* Serial */
- 	at91_add_device_serial();
- 	/* Ethernet */
-@@ -157,36 +158,66 @@ static void __init vlink_board_init(void
- //	at91_set_gpio_output(AT91_PIN_PB22, 1);	/* this MMC card slot can optionally use SPI signaling (CS3). */
- 	at91_add_device_mmc(0, &vlink_mmc_data);
- #endif
-+
-+// Set VLink version PIN as an input with pull-up (V1.5 = GND)
-+	at91_set_gpio_input(AT91_PIN_PC2, 1);
-+	v100 = at91_get_gpio_value(AT91_PIN_PC2);
-+
- 	/* LEDs */
- //	at91_gpio_leds(vlink_leds, ARRAY_SIZE(vlink_leds));
- 
- /* Other LED's */
--       at91_set_gpio_output(AT91_PIN_PC7, 1);  // LED FRONT AP1
--       at91_set_gpio_output(AT91_PIN_PC8, 1);  // LED FRONT BP1
--       at91_set_gpio_output(AT91_PIN_PB14, 1); // LED BACK AP1
--       at91_set_gpio_output(AT91_PIN_PB15, 1); // LED BACK BP1
--       at91_set_gpio_output(AT91_PIN_PB16, 1); // LED BACK AP2
--       at91_set_gpio_output(AT91_PIN_PB17, 1); // LED BACK BP2
-+	at91_set_gpio_output(AT91_PIN_PC7, 1);  // LED FRONT AP1
-+	at91_set_gpio_output(AT91_PIN_PC8, 1);  // LED FRONT BP1
-+	at91_set_gpio_output(AT91_PIN_PB14, 1); // LED BACK AP1
-+	at91_set_gpio_output(AT91_PIN_PB15, 1); // LED BACK BP1
-+	at91_set_gpio_output(AT91_PIN_PB16, 1); // LED BACK AP2
-+	at91_set_gpio_output(AT91_PIN_PB17, 1); // LED BACK BP2
-+
-+/* Test jig presence detection */
-+	at91_set_gpio_input(AT91_PIN_PB8, 1);   // JIGPRESENT
- 
- /* SIM Cards */
--       at91_set_gpio_output(AT91_PIN_PB9, 1);  // ENBSC3
--       at91_set_gpio_output(AT91_PIN_PB10, 1); // ENBSC2
--       at91_set_gpio_output(AT91_PIN_PB11, 1); // ENBSC1
-+	if (at91_get_gpio_value(AT91_PIN_PB8)) {
-+		at91_set_gpio_output(AT91_PIN_PB11, 0);
-+		if (v100)
-+			at91_set_gpio_output(AT91_PIN_PB9, 1);
-+		else
-+			at91_set_gpio_output(AT91_PIN_PC13, 1);
-+	} else {
-+		at91_set_gpio_output(AT91_PIN_PB11, 1);
-+		if (v100)
-+			at91_set_gpio_output(AT91_PIN_PB9, 0);
-+		else
-+			at91_set_gpio_output(AT91_PIN_PC13, 0);
-+	}
- 
--/* GSM Module Control */
--       at91_set_gpio_output(AT91_PIN_PB12, 1); // GSMONOFF
-+        at91_set_gpio_output(AT91_PIN_PB10, 1); // ENBSC2
- 
--/* Test jig presence detection */
--       at91_set_gpio_input(AT91_PIN_PB8, 1);   // JIGPRESENT
-+/* GSM Module Control */
-+	at91_set_gpio_output(AT91_PIN_PB12, 1); // GSMONOFF
- 
- /* Power indicator */
--       at91_set_gpio_input(AT91_PIN_PB22, 1);  // PWR_IND
-+	at91_set_gpio_input(AT91_PIN_PB22, 1);  // PWR_IND
- 
- /* USB Device control */
--       at91_set_gpio_input(AT91_PIN_PB27, 1);  // UDB_CNX
--       at91_set_gpio_output(AT91_PIN_PB28, 1); // UDB_PUP
--			 at91_set_multi_drive(AT91_PIN_PB28, 1); // Set to multi-drive
--
-+	at91_set_gpio_input(AT91_PIN_PB27, 1);  // UDB_CNX
-+	at91_set_gpio_output(AT91_PIN_PB28, 1); // UDB_PUP
-+	at91_set_multi_drive(AT91_PIN_PB28, 1); // Set to multi-drive
-+
-+/* USB Power controls */
-+
-+	if (v100)
-+	{       // V100
-+		at91_set_gpio_input (AT91_PIN_PC12, 1);   // SD Card present
-+	}
-+	else
-+	{       // DO special things for V1.5
-+		at91_set_gpio_output(AT91_PIN_PB9 , 0);   // USB suspend
-+		at91_set_gpio_input (AT91_PIN_PC10, 1);   // SD Card present
-+		at91_set_gpio_output(AT91_PIN_PC11, 0);   // USB Vin CTRL for modules onboard
-+		at91_set_gpio_output(AT91_PIN_PC12, 0);   // SIM control
-+	}
- }
- 
- MACHINE_START(VLINK, "FDL VersaLink")
---- a/arch/arm/mach-at91/gpio.c
-+++ b/arch/arm/mach-at91/gpio.c
-@@ -29,6 +29,7 @@
- 
- static struct at91_gpio_bank *gpio;
- static int gpio_banks;
-+static u32 pio_gpio_pin[4] = { 0, 0, 0, 0 };
- 
- 
- static inline void __iomem *pin_to_controller(unsigned pin)
-@@ -71,9 +72,13 @@ int __init_or_module at91_set_GPIO_perip
- {
- 	void __iomem	*pio = pin_to_controller(pin);
- 	unsigned	mask = pin_to_mask(pin);
-+	int bank = (pin - PIN_BASE) / 32;
- 
- 	if (!pio)
- 		return -EINVAL;
-+
-+	pio_gpio_pin[bank] |= mask;
-+
- 	__raw_writel(mask, pio + PIO_IDR);
- 	__raw_writel(mask, pio + (use_pullup ? PIO_PUER : PIO_PUDR));
- 	__raw_writel(mask, pio + PIO_PER);
-@@ -130,10 +135,13 @@ int __init_or_module at91_set_gpio_input
- {
- 	void __iomem	*pio = pin_to_controller(pin);
- 	unsigned	mask = pin_to_mask(pin);
-+	int bank = (pin - PIN_BASE) / 32;
- 
- 	if (!pio)
- 		return -EINVAL;
- 
-+	pio_gpio_pin[bank] |= mask;
-+
- 	__raw_writel(mask, pio + PIO_IDR);
- 	__raw_writel(mask, pio + (use_pullup ? PIO_PUER : PIO_PUDR));
- 	__raw_writel(mask, pio + PIO_ODR);
-@@ -151,10 +159,13 @@ int __init_or_module at91_set_gpio_outpu
- {
- 	void __iomem	*pio = pin_to_controller(pin);
- 	unsigned	mask = pin_to_mask(pin);
-+	int bank = (pin - PIN_BASE) / 32;
- 
- 	if (!pio)
- 		return -EINVAL;
- 
-+	pio_gpio_pin[bank] |= mask;
-+
- 	__raw_writel(mask, pio + PIO_IDR);
- 	__raw_writel(mask, pio + PIO_PUDR);
- 	__raw_writel(mask, pio + (value ? PIO_SODR : PIO_CODR));
-@@ -262,6 +273,18 @@ int at91_get_gpio_value(unsigned pin)
- }
- EXPORT_SYMBOL(at91_get_gpio_value);
- 
-+int at91_is_pin_gpio(unsigned pin)
-+{
-+	void __iomem  *pio = pin_to_controller(pin);
-+	unsigned  mask = pin_to_mask(pin);
-+	int     bank = (pin - PIN_BASE) / 32;
-+
-+	if (!pio)
-+		return -EINVAL;
-+	return (pio_gpio_pin[bank] & mask) != 0;
-+}
-+EXPORT_SYMBOL(at91_is_pin_gpio);
-+
- /*--------------------------------------------------------------------------*/
- 
- #ifdef CONFIG_PM
---- a/drivers/char/Kconfig
-+++ b/drivers/char/Kconfig
-@@ -1072,5 +1072,12 @@ config AT91_SPIDEV
- 	  The SPI driver gives user mode access to this serial
- 	  bus on the AT91RM9200 processor.
- 
-+config AT91_VLIO
-+	tristate "Versalink LED and GPIO interface"
-+	depends on ARCH_AT91RM9200 && MACH_VLINK
-+	default n
-+	help
-+	  Provides a handler GPIO's in userspace
-+
- endmenu
- 
---- a/drivers/char/Makefile
-+++ b/drivers/char/Makefile
-@@ -100,6 +100,7 @@ obj-$(CONFIG_GPIO_TB0219)	+= tb0219.o
- obj-$(CONFIG_TELCLOCK)		+= tlclk.o
- obj-$(CONFIG_AT91_SPI)		+= at91_spi.o
- obj-$(CONFIG_AT91_SPIDEV)	+= at91_spidev.o
-+obj-$(CONFIG_AT91_VLIO)		+= vlink_giu.o
- 
- obj-$(CONFIG_MWAVE)		+= mwave/
- obj-$(CONFIG_AGP)		+= agp/
---- /dev/null
-+++ b/drivers/char/vlink_giu.c
-@@ -0,0 +1,333 @@
-+/*
-+ *  Driver for FDL Versalink GPIO
-+ *
-+ *  Copyright (C) 2005 Guthrie Consulting
-+ *	Author: Hamish Guthrie <hamish@prodigi.ch>
-+ *
-+ *  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.
-+ *
-+ *  This program is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with this program; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/moduleparam.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+
-+#include <linux/kernel.h>
-+#include <linux/slab.h>
-+#include <linux/fs.h>
-+#include <linux/errno.h>
-+#include <linux/init.h>
-+#include <linux/types.h>
-+#include <linux/proc_fs.h>
-+#include <linux/fcntl.h>
-+#include <linux/seq_file.h>
-+#include <linux/cdev.h>
-+#include <asm/arch/gpio.h>
-+#include <asm/uaccess.h>
-+
-+static int major;	/* default is dynamic major device number */
-+module_param(major, int, 0);
-+MODULE_PARM_DESC(major, "Major device number");
-+
-+#define VIO_NR_DEVS	96
-+
-+struct vio_dev {
-+	struct cdev cdev;
-+};
-+
-+struct vio_dev *vio_devices;
-+static struct class *vio_class;
-+
-+#define MAX_VIO_NAMES	24
-+typedef struct
-+{
-+	char port;
-+	char pin;
-+	char name100[10];
-+	char name150[10];
-+} VIO_NAMES;
-+
-+VIO_NAMES VioName[MAX_VIO_NAMES] = 
-+{ 	// Port, Pin, V100, V150
-+	{'A',19,"port1DTR" ,"port1DTR"},
-+	{'A',24,"port2DTR" ,"port2DTR"},
-+	{'B',8, "jigOn"    ,"jigOn"} ,
-+	{'B',9, "enbSC3"   ,"usbSUSPND"},
-+	{'B',10,"enbSC2"   ,"enbSC2"},
-+	{'B',11,"enbSC1"   ,"enbSC1"},
-+	{'B',12,"gsmONOFF" ,"gsmONOFF"},
-+	{'B',14,"ledBAP1"  ,"ledBAP1"},
-+	{'B',15,"ledBBP1"  ,"ledBBP1"},
-+	{'B',16,"ledBAP2"  ,"ledBAP2"},
-+	{'B',17,"ledBBP2"  ,"ledBBP2"},
-+	{'B',27,"udpCNX"   ,"udpCNX"},
-+	{'B',28,"udpPUP"   ,"udpPUP"},
-+	{'B',29,"port2DCD" ,"port2DCD"},
-+	{'C',2, "vlVer100" ,"vlVer150"},
-+	{'C',7, "ledFAP1"  ,"ledFAP1"},
-+	{'C',8, "ledFBP1"  ,"ledFBP1"},
-+	{'C',10,"vioC10"   ,"sdCardON"},
-+	{'C',11,"vioC11"   ,"vusbCTRL"},
-+	{'C',12,"sdCardON" ,"simCTRL"},
-+	{'C',13,"vioC13"   ,"enbSC3"},
-+	{'C',14,"ledFBP2"  ,"ledFBP2"},
-+	{'C',15,"ledFAP2"  ,"ledFAP2"},
-+	{0,0,"",""}
-+};
-+
-+/*
-+{'B',18,"gsmRIO"  ,"gsmRIO"},
-+{'B',20,"gsmTX"   ,"gsmTX"},
-+{'B',21,"gsmRX"   ,"gsmRX"},
-+{'B',22,"gsmPIND" ,"gsmPIND"},
-+{'B',23,"gsmDCD"  ,"gsmDCD"},
-+{'B',24,"gsmCTS"  ,"gsmCTS"},
-+{'B',25,"gsmDSR"  ,"gsmDSR"},
-+{'B',26,"gsmRTS"  ,"gsmRTS"},
-+*/
-+static void lookupPINName(char version100, char *devName, char port, char pin);
-+// EOF KWJ + AJE
-+
-+static ssize_t gpio_read(struct file *file, char __user *buf, size_t len,
-+                         loff_t *ppos)
-+{
-+	unsigned int pin;
-+	int retval;
-+	char value = '0';
-+
-+	pin = iminor(file->f_dentry->d_inode);
-+
-+	retval = at91_get_gpio_value(PIN_BASE + pin);
-+	if (retval < 0)
-+		return -EFAULT;
-+
-+	value = retval + 0x30;
-+	if (put_user(value, buf))
-+		return -EFAULT;
-+
-+	return 1;
-+}
-+
-+static ssize_t gpio_write(struct file *file, const char __user *data,
-+                          size_t len, loff_t *ppos)
-+{
-+	unsigned int pin;
-+	size_t i;
-+	char c;
-+	int retval = 0;
-+
-+	pin = iminor(file->f_dentry->d_inode);
-+
-+	for (i = 0; i < len; i++) {
-+		if (get_user(c, data + i))
-+			return -EFAULT;
-+
-+		switch (c) {
-+		case '0':
-+		case '1':
-+			retval = at91_set_gpio_value(PIN_BASE + pin, (int)c - 0x30);
-+			if (retval < 0)
-+				return -EFAULT;
-+			break;
-+		default:
-+			break;
-+		}
-+
-+		if (retval < 0)
-+			break;
-+	}
-+
-+	return i;
-+}
-+
-+static int gpio_open(struct inode *inode, struct file *file)
-+{
-+	return nonseekable_open(inode, file);
-+}
-+
-+static int gpio_release(struct inode *inode, struct file *file)
-+{
-+	return 0;
-+}
-+
-+static struct file_operations vio_fops = {
-+	.owner		= THIS_MODULE,
-+	.read		= gpio_read,
-+	.write		= gpio_write,
-+	.open		= gpio_open,
-+	.release	= gpio_release,
-+};
-+
-+static void vio_setup_cdev(struct vio_dev *dev, int index)
-+{
-+	int err, devno = MKDEV(major, index);
-+
-+	cdev_init(&dev->cdev, &vio_fops);
-+	dev->cdev.owner = THIS_MODULE;
-+	dev->cdev.ops = &vio_fops;
-+	err = cdev_add (&dev->cdev, devno, 1);
-+	if (err)
-+		printk(KERN_NOTICE "vio: Error %d adding vio%d", err, index);
-+}
-+
-+static int vio_remove(struct platform_device *dev)
-+{
-+	int i;
-+	dev_t devno = MKDEV(major, 0);
-+
-+	if (vio_devices) {
-+		for(i=0; i<VIO_NR_DEVS; i++) {
-+			int iodev = at91_is_pin_gpio(PIN_BASE + i);
-+			if (iodev) {
-+				cdev_del(&vio_devices[i].cdev);
-+				class_device_destroy(vio_class, MKDEV(major, i));
-+			}
-+		}
-+		kfree(vio_devices);
-+	}
-+
-+	class_destroy(vio_class);
-+	unregister_chrdev_region(devno, VIO_NR_DEVS);
-+
-+	platform_set_drvdata(dev, NULL);
-+
-+	return 0;
-+}
-+
-+static int vio_probe(struct platform_device *dev)
-+{
-+	int retval, i, j;
-+	dev_t vdev = 0;
-+	char devName[30];
-+	int vlinkV100;
-+
-+	if (major) {
-+		vdev = MKDEV(major, 0);
-+		retval = register_chrdev_region(vdev, VIO_NR_DEVS, "vio");
-+	} else {
-+		retval = alloc_chrdev_region(&vdev, 0, VIO_NR_DEVS, "vio");
-+		major = MAJOR(vdev);
-+	}
-+	if (retval < 0) {
-+		printk(KERN_WARNING "vio: can't get major %d\n", major);
-+		return retval;
-+	}
-+
-+	if (major == 0) {
-+		major = retval;
-+		printk(KERN_INFO "vio: major number %d\n", major);
-+	}
-+
-+	vio_class = class_create(THIS_MODULE, "vio");
-+
-+	if (IS_ERR(vio_class)) {
-+		printk(KERN_ERR "vio: Error creating vio class\n");
-+		vio_remove(dev);
-+		return PTR_ERR(vio_class);
-+	}
-+
-+	vlinkV100 = at91_get_gpio_value(AT91_PIN_PC2); // Denotes V1.5 if GND
-+
-+	vio_devices = kmalloc(VIO_NR_DEVS * sizeof(struct vio_dev), GFP_KERNEL);
-+	if (!vio_devices) {
-+		retval = -ENOMEM;
-+		goto fail;
-+	}
-+	memset(vio_devices, 0, VIO_NR_DEVS * sizeof(struct vio_dev));
-+
-+	for (i=0; i<VIO_NR_DEVS/32; i++)
-+		for(j=0; j<32; j++) {
-+			int iodev = at91_is_pin_gpio(PIN_BASE + i*32 + j);
-+			if (iodev) {
-+				vio_setup_cdev(&vio_devices[i*32 + j], i*32 + j);
-+				// Lookup name of vio to create
-+				lookupPINName(vlinkV100, devName, i, j);
-+				class_device_create(vio_class, NULL, MKDEV(major, i*32 + j), NULL, devName);
-+			}
-+		}
-+
-+	platform_set_drvdata(dev, vio_devices);
-+
-+	return 0;
-+
-+fail:
-+	vio_remove(dev);
-+	return retval;
-+}
-+
-+static void lookupPINName(char version100, char *devName, char port, char pin)
-+{
-+	int i = -1;
-+	char found = 0;
-+	while (!found)
-+	{
-+		i++;
-+		if (i >= MAX_VIO_NAMES)
-+			break;
-+		if (VioName[i].port == port+'A' && VioName[i].pin == pin)
-+		{
-+			printk(KERN_ERR "vio++: %c%d=%s\n",VioName[i].port,VioName[i].pin,VioName[i].name150);
-+			if (version100)
-+				strcpy(devName, VioName[i].name100);
-+			else
-+				strcpy(devName, VioName[i].name150);
-+			found = 1;
-+		}
-+	}
-+	if (!found)
-+		sprintf(devName, "vio%c%d", port + 'A', pin);
-+}
-+	
-+static struct platform_device *vio_platform_device;
-+
-+static struct platform_driver vio_driver = {
-+	.probe 		= vio_probe,
-+	.remove		= vio_remove,
-+	.driver		= {
-+		.name	= "vio",
-+		.owner	= THIS_MODULE,
-+	},
-+};
-+
-+static int __init vio_init(void)
-+{
-+	int retval;
-+
-+	vio_platform_device = platform_device_register_simple("vio", -1, NULL, 0);
-+	if (IS_ERR(vio_platform_device)) {
-+		printk(KERN_WARNING "vio: device registration failed\n");
-+		return PTR_ERR(vio_platform_device);
-+	}
-+
-+	retval = platform_driver_register(&vio_driver);
-+	if (retval < 0) {
-+		printk(KERN_WARNING "vio: driver registration failed\n");
-+		platform_device_unregister(vio_platform_device);
-+	}
-+	
-+	return retval;
-+}
-+
-+static void __exit vio_exit(void)
-+{
-+	platform_driver_unregister(&vio_driver);
-+	platform_device_unregister(vio_platform_device);
-+}
-+
-+module_init(vio_init);
-+module_exit(vio_exit);
-+
-+MODULE_AUTHOR("Hamish Guthrie <hamish@prodigi.ch>");
-+MODULE_DESCRIPTION("FDL Versalink GPIO Driver");
---- a/include/asm-arm/arch-at91/gpio.h
-+++ b/include/asm-arm/arch-at91/gpio.h
-@@ -199,6 +199,7 @@ extern int __init_or_module at91_set_mul
- /* callable at any time */
- extern int at91_set_gpio_value(unsigned pin, int value);
- extern int at91_get_gpio_value(unsigned pin);
-+extern int at91_is_pin_gpio(unsigned pin);
- 
- /* callable only from core power-management code */
- extern void at91_gpio_suspend(void);
diff --git a/target/linux/at91/patches-2.6.25/007-mtd-partition.patch b/target/linux/at91/patches-2.6.25/007-mtd-partition.patch
deleted file mode 100644
index 503c89200..000000000
--- a/target/linux/at91/patches-2.6.25/007-mtd-partition.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/drivers/mtd/devices/at91_dataflash.c
-+++ b/drivers/mtd/devices/at91_dataflash.c
-@@ -175,7 +175,7 @@ static struct mtd_partition static_parti
- };
- #endif
- 
--static const char *part_probes[] = { "cmdlinepart", NULL, };
-+static const char *part_probes[] = { "cmdlinepart", "at91part", NULL, };
- 
- #endif
- 
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -168,6 +168,12 @@ config MTD_OF_PARTS
- 	  the partition map from the children of the flash node,
- 	  as described in Documentation/powerpc/booting-without-of.txt.
- 
-+config MTD_AT91_PARTS
-+	tristate "Atmel AT91 partitioning support"
-+	depends on MTD_PARTITIONS && ARCH_AT91RM9200 && AT91_SPI
-+	---help---
-+	  Atmel AT91 partitioning support
-+	
- comment "User Modules And Translation Layers"
- 
- config MTD_CHAR
---- a/drivers/mtd/Makefile
-+++ b/drivers/mtd/Makefile
-@@ -12,6 +12,7 @@ obj-$(CONFIG_MTD_REDBOOT_PARTS) += redbo
- obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
- obj-$(CONFIG_MTD_AFS_PARTS)	+= afs.o
- obj-$(CONFIG_MTD_OF_PARTS)      += ofpart.o
-+obj-$(CONFIG_MTD_AT91_PARTS)   += at91part.o
- 
- # 'Users' - code which presents functionality to userspace.
- obj-$(CONFIG_MTD_CHAR)		+= mtdchar.o
diff --git a/target/linux/at91/patches-2.6.25/008-fdl-serial.patch b/target/linux/at91/patches-2.6.25/008-fdl-serial.patch
deleted file mode 100644
index cf11ac0da..000000000
--- a/target/linux/at91/patches-2.6.25/008-fdl-serial.patch
+++ /dev/null
@@ -1,161 +0,0 @@
---- a/drivers/serial/atmel_serial.c
-+++ b/drivers/serial/atmel_serial.c
-@@ -214,6 +214,34 @@ static void atmel_set_mctrl(struct uart_
- 				at91_set_gpio_value(AT91_PIN_PA21, 0);
- 			else
- 				at91_set_gpio_value(AT91_PIN_PA21, 1);
-+
-+			/*
-+ 			 * FDL VersaLink adds GPIOS to provide full modem 
-+			 * control on USART 0 - Drive DTR and RI pins manually
-+ 			 */
-+			if (mctrl & TIOCM_DTR)
-+				at91_set_gpio_value(AT91_PIN_PB6, 0);
-+			else
-+				at91_set_gpio_value(AT91_PIN_PB6, 1);
-+			if (mctrl & TIOCM_RI)
-+				at91_set_gpio_value(AT91_PIN_PB7, 0);
-+			else
-+				at91_set_gpio_value(AT91_PIN_PB7, 1);
-+		}
-+
-+		/*
-+		 * FDL VersaLink adds GPIOS to provide full modem control on
-+		 * USART 3 - Drive DTR and RI pins manually
-+		 */
-+		if (port->mapbase == AT91RM9200_BASE_US3) {
-+			if (mctrl & TIOCM_DTR)
-+				at91_set_gpio_value(AT91_PIN_PB29, 0);
-+			else
-+				at91_set_gpio_value(AT91_PIN_PB29, 1);
-+			if (mctrl & TIOCM_RI)
-+				at91_set_gpio_value(AT91_PIN_PB2, 0);
-+			else
-+				at91_set_gpio_value(AT91_PIN_PB2, 1);
- 		}
- 	}
- #endif
-@@ -251,8 +279,10 @@ static u_int atmel_get_mctrl(struct uart
- 	/*
- 	 * The control signals are active low.
- 	 */
--	if (!(status & ATMEL_US_DCD))
--		ret |= TIOCM_CD;
-+
-+	if (!(port->mapbase == AT91RM9200_BASE_US0 || port->mapbase == AT91RM9200_BASE_US3))
-+		if (!(status & ATMEL_US_DCD))
-+			ret |= TIOCM_CD;
- 	if (!(status & ATMEL_US_CTS))
- 		ret |= TIOCM_CTS;
- 	if (!(status & ATMEL_US_DSR))
-@@ -260,6 +290,16 @@ static u_int atmel_get_mctrl(struct uart
- 	if (!(status & ATMEL_US_RI))
- 		ret |= TIOCM_RI;
- 
-+	/*
-+ 	 * Read the GPIO's for the FDL VersaLink special case
-+	 */
-+	if (port->mapbase == AT91RM9200_BASE_US0)
-+		if (!(at91_get_gpio_value(AT91_PIN_PA19)))
-+			ret |= TIOCM_CD;
-+	if (port->mapbase == AT91RM9200_BASE_US3)
-+		if (!(at91_get_gpio_value(AT91_PIN_PA24)))
-+			ret |= TIOCM_CD;
-+
- 	return ret;
- }
- 
-@@ -453,6 +493,34 @@ static void atmel_tx_chars(struct uart_p
- }
- 
- /*
-+ * USART0 DCD Interrupt handler
-+ */
-+
-+static irqreturn_t atmel_u0_DCD_interrupt(int irq, void *dev_id)
-+{
-+	struct uart_port *port = dev_id;
-+	int status = at91_get_gpio_value(irq);
-+
-+	uart_handle_dcd_change(port, !(status));
-+
-+	return IRQ_HANDLED;
-+}
-+
-+/*
-+ * USART3 DCD Interrupt handler
-+ */
-+
-+static irqreturn_t atmel_u3_DCD_interrupt(int irq, void *dev_id)
-+{
-+	struct uart_port *port = dev_id;
-+	int status = at91_get_gpio_value(irq);
-+
-+	uart_handle_dcd_change(port, !(status));
-+
-+	return IRQ_HANDLED;
-+}
-+
-+/*
-  * receive interrupt handler.
-  */
- static void
-@@ -815,6 +883,23 @@ static int atmel_startup(struct uart_por
- 		return retval;
- 	}
- 
-+        if (port->mapbase == AT91RM9200_BASE_US0) {
-+                retval = request_irq(AT91_PIN_PA19, atmel_u0_DCD_interrupt, 0, "atmel_serial", port);
-+                if (retval) {
-+                        printk("atmel_serial: atmel_startup - Can't get u0DCD irq\n");
-+                        free_irq(port->irq, port);
-+                        return retval;
-+                }
-+        }
-+        if (port->mapbase == AT91RM9200_BASE_US3) {
-+                retval = request_irq(AT91_PIN_PA24, atmel_u3_DCD_interrupt, 0, "atmel_serial", port);
-+                if (retval) {
-+                        printk("atmel_serial: atmel_startup - Can't get u3DCD irq\n");
-+                        free_irq(port->irq, port);
-+                        return retval;
-+                }
-+        }
-+
- 	/*
- 	 * Initialize DMA (if necessary)
- 	 */
-@@ -834,6 +919,10 @@ static int atmel_startup(struct uart_por
- 					kfree(atmel_port->pdc_rx[0].buf);
- 				}
- 				free_irq(port->irq, port);
-+				if (port->mapbase == AT91RM9200_BASE_US0)
-+					free_irq(AT91_PIN_PA19, port);
-+				if (port->mapbase == AT91RM9200_BASE_US3)
-+					free_irq(AT91_PIN_PA24, port);
- 				return -ENOMEM;
- 			}
- 			pdc->dma_addr = dma_map_single(port->dev,
-@@ -873,7 +962,11 @@ static int atmel_startup(struct uart_por
- 		retval = atmel_open_hook(port);
- 		if (retval) {
- 			free_irq(port->irq, port);
--			return retval;
-+			if (port->mapbase == AT91RM9200_BASE_US0)
-+				free_irq(AT91_PIN_PA19, port);
-+			if (port->mapbase == AT91RM9200_BASE_US3)
-+				free_irq(AT91_PIN_PA24, port);
-+ 			return retval;
- 		}
- 	}
- 
-@@ -947,6 +1040,10 @@ static void atmel_shutdown(struct uart_p
- 	 * Free the interrupt
- 	 */
- 	free_irq(port->irq, port);
-+	if (port->mapbase == AT91RM9200_BASE_US0)
-+		free_irq(AT91_PIN_PA19, port);
-+	if (port->mapbase == AT91RM9200_BASE_US3)
-+		free_irq(AT91_PIN_PA24, port);
- 
- 	/*
- 	 * If there is a specific "close" function (to unregister
diff --git a/target/linux/at91/patches-2.6.25/009-fdl-uartinit.patch b/target/linux/at91/patches-2.6.25/009-fdl-uartinit.patch
deleted file mode 100644
index d30023186..000000000
--- a/target/linux/at91/patches-2.6.25/009-fdl-uartinit.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/arch/arm/mach-at91/at91rm9200_devices.c
-+++ b/arch/arm/mach-at91/at91rm9200_devices.c
-@@ -1001,7 +1001,15 @@ static inline void configure_usart0_pins
- 		 *  We need to drive the pin manually.  Default is off (RTS is active low).
- 		 */
- 		at91_set_gpio_output(AT91_PIN_PA21, 1);
--	}
-+		}
-+	if (pins & ATMEL_UART_DTR)
-+		at91_set_gpio_output(AT91_PIN_PB6, 1);  /* DTR0 */
-+	if (pins & ATMEL_UART_RI)
-+		at91_set_gpio_output(AT91_PIN_PB7, 1);  /* RI0 */
-+	if (pins & ATMEL_UART_DCD) {
-+		at91_set_gpio_input(AT91_PIN_PA19, 1);  /* DCD0 */
-+		at91_set_deglitch(AT91_PIN_PA19, 1);
-+		}
- }
- 
- static struct resource uart1_resources[] = {
-@@ -1139,6 +1147,14 @@ static inline void configure_usart3_pins
- 		at91_set_B_periph(AT91_PIN_PB1, 0);	/* CTS3 */
- 	if (pins & ATMEL_UART_RTS)
- 		at91_set_B_periph(AT91_PIN_PB0, 0);	/* RTS3 */
-+	if (pins & ATMEL_UART_DTR)
-+		at91_set_gpio_output(AT91_PIN_PB29, 1); /* DTR0 */
-+	if (pins & ATMEL_UART_RI)
-+		at91_set_gpio_output(AT91_PIN_PB2, 1);  /* RI0 */
-+	if (pins & ATMEL_UART_DCD) {
-+		at91_set_gpio_input(AT91_PIN_PA24, 1);  /* DCD0 */
-+		at91_set_deglitch(AT91_PIN_PA24, 1);
-+		}
- }
- 
- static struct platform_device *__initdata at91_uarts[ATMEL_MAX_UART];	/* the UARTs to use */
diff --git a/target/linux/at91/patches-2.6.25/010-dm9161a-phyfix.patch b/target/linux/at91/patches-2.6.25/010-dm9161a-phyfix.patch
deleted file mode 100644
index 756e014f0..000000000
--- a/target/linux/at91/patches-2.6.25/010-dm9161a-phyfix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/drivers/net/arm/at91_ether.c
-+++ b/drivers/net/arm/at91_ether.c
-@@ -146,6 +146,7 @@ static void update_linkspeed(struct net_
- 	struct at91_private *lp = netdev_priv(dev);
- 	unsigned int bmsr, bmcr, lpa, mac_cfg;
- 	unsigned int speed, duplex;
-+	unsigned long timeout = jiffies + HZ;
- 
- 	if (!mii_link_ok(&lp->mii)) {		/* no link */
- 		netif_carrier_off(dev);
-@@ -158,8 +159,15 @@ static void update_linkspeed(struct net_
- 	read_phy(lp->phy_address, MII_BMSR, &bmsr);
- 	read_phy(lp->phy_address, MII_BMCR, &bmcr);
- 	if (bmcr & BMCR_ANENABLE) {				/* AutoNegotiation is enabled */
--		if (!(bmsr & BMSR_ANEGCOMPLETE))
--			return;			/* Do nothing - another interrupt generated when negotiation complete */
-+		while (!(bmsr & BMSR_ANEGCOMPLETE)) {
-+			if (time_after(jiffies, timeout)) {
-+				printk("at91_ether: Auto-negotiate timeout\n");
-+				return;
-+			}
-+			read_phy(lp->phy_address, MII_BMSR, &bmsr);
-+			read_phy(lp->phy_address, MII_BMCR, &bmcr);
-+			cpu_relax();
-+		}
- 
- 		read_phy(lp->phy_address, MII_LPA, &lpa);
- 		if ((lpa & LPA_100FULL) || (lpa & LPA_100HALF)) speed = SPEED_100;
diff --git a/target/linux/at91/patches-2.6.25/014-initpartition.patch b/target/linux/at91/patches-2.6.25/014-initpartition.patch
deleted file mode 100644
index 554c1491e..000000000
--- a/target/linux/at91/patches-2.6.25/014-initpartition.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/drivers/mtd/devices/at91_dataflash.c
-+++ b/drivers/mtd/devices/at91_dataflash.c
-@@ -163,12 +163,12 @@ static struct mtd_partition static_parti
- 		.mask_flags	= MTD_WRITEABLE,	/* read-only */
- 	},
- 	{
--		.name		= "kernel",
-+		.name		= "knlroot",
- 		.offset		= MTDPART_OFS_NXTBLK,
--		.size		= 5 * 32 * 8 * 1056,	/* 5 sectors */
-+		.size		= 0x320400,
- 	},
- 	{
--		.name		= "filesystem",
-+		.name		= "jffs2",
- 		.offset		= MTDPART_OFS_NXTBLK,
- 		.size		= MTDPART_SIZ_FULL,	/* rest = 26 sectors */
- 	}
diff --git a/target/linux/at91/patches-2.6.25/017-usb_serial_endpoint_size.patch b/target/linux/at91/patches-2.6.25/017-usb_serial_endpoint_size.patch
deleted file mode 100644
index 7bd38b443..000000000
--- a/target/linux/at91/patches-2.6.25/017-usb_serial_endpoint_size.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/drivers/usb/serial/usb-serial.c
-+++ b/drivers/usb/serial/usb-serial.c
-@@ -904,7 +904,7 @@ int usb_serial_probe(struct usb_interfac
- 			dev_err(&interface->dev, "No free urbs available\n");
- 			goto probe_error;
- 		}
--		buffer_size = (endpoint->wMaxPacketSize > maxSize) ? endpoint->wMaxPacketSize : maxSize;
-+		buffer_size = 2048;
- 		port->bulk_in_size = buffer_size;
- 		port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
- 		port->bulk_in_buffer = kmalloc (buffer_size, GFP_KERNEL);
diff --git a/target/linux/atheros/config-2.6.33 b/target/linux/atheros/config-2.6.33
deleted file mode 100644
index 24ded4461..000000000
--- a/target/linux/atheros/config-2.6.33
+++ /dev/null
@@ -1,201 +0,0 @@
-CONFIG_32BIT=y
-# CONFIG_64BIT is not set
-CONFIG_ADM6996_PHY=y
-# CONFIG_ALCHEMY_GPIO_INDIRECT is not set
-CONFIG_AR231X_ETHERNET=y
-# CONFIG_AR7 is not set
-CONFIG_AR8216_PHY=y
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_ARCH_SUPPORTS_OPROFILE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ATHEROS_AR2315=y
-CONFIG_ATHEROS_AR2315_PCI=y
-CONFIG_ATHEROS_AR231X=y
-CONFIG_ATHEROS_AR5312=y
-CONFIG_ATHEROS_WDT=y
-# CONFIG_BCM47XX is not set
-# CONFIG_BCM63XX is not set
-CONFIG_BITREVERSE=y
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_BUG is not set
-# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
-# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CEVT_R4K=y
-CONFIG_CEVT_R4K_LIB=y
-CONFIG_CMDLINE="console=ttyS0,9600 rootfstype=squashfs,jffs2"
-CONFIG_CMDLINE_BOOL=y
-# CONFIG_CMDLINE_OVERRIDE is not set
-CONFIG_CPU_BIG_ENDIAN=y
-# CONFIG_CPU_CAVIUM_OCTEON is not set
-CONFIG_CPU_HAS_PREFETCH=y
-CONFIG_CPU_HAS_SYNC=y
-# CONFIG_CPU_LITTLE_ENDIAN is not set
-# CONFIG_CPU_LOONGSON2E is not set
-# CONFIG_CPU_LOONGSON2F is not set
-CONFIG_CPU_MIPS32=y
-CONFIG_CPU_MIPS32_R1=y
-# CONFIG_CPU_MIPS32_R2 is not set
-# CONFIG_CPU_MIPS64_R1 is not set
-# CONFIG_CPU_MIPS64_R2 is not set
-CONFIG_CPU_MIPSR1=y
-# CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R10000 is not set
-# CONFIG_CPU_R3000 is not set
-# CONFIG_CPU_R4300 is not set
-# CONFIG_CPU_R4X00 is not set
-# CONFIG_CPU_R5000 is not set
-# CONFIG_CPU_R5432 is not set
-# CONFIG_CPU_R5500 is not set
-# CONFIG_CPU_R6000 is not set
-# CONFIG_CPU_R8000 is not set
-# CONFIG_CPU_RM7000 is not set
-# CONFIG_CPU_RM9000 is not set
-# CONFIG_CPU_SB1 is not set
-CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_HIGHMEM=y
-# CONFIG_CPU_TX39XX is not set
-# CONFIG_CPU_TX49XX is not set
-# CONFIG_CPU_VR41XX is not set
-CONFIG_CSRC_R4K=y
-CONFIG_CSRC_R4K_LIB=y
-CONFIG_DECOMPRESS_LZMA=y
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_SMACK is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
-CONFIG_DEVPORT=y
-# CONFIG_DM9000 is not set
-CONFIG_DMA_NEED_PCI_MAP_STATE=y
-CONFIG_DMA_NONCOHERENT=y
-CONFIG_EARLY_PRINTK=y
-# CONFIG_FSNOTIFY is not set
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-CONFIG_GPIO_DEVICE=y
-CONFIG_HARDWARE_WATCHPOINTS=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAVE_ARCH_KGDB=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_HAVE_IDE=y
-CONFIG_HAVE_OPROFILE=y
-CONFIG_HW_HAS_PCI=y
-CONFIG_HW_RANDOM=y
-CONFIG_IMAGE_CMDLINE_HACK=y
-CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_INLINE_READ_LOCK is not set
-# CONFIG_INLINE_READ_LOCK_BH is not set
-# CONFIG_INLINE_READ_LOCK_IRQ is not set
-# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_READ_TRYLOCK is not set
-CONFIG_INLINE_READ_UNLOCK=y
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_SPIN_LOCK is not set
-# CONFIG_INLINE_SPIN_LOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_SPIN_TRYLOCK is not set
-# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
-CONFIG_INLINE_SPIN_UNLOCK=y
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_WRITE_LOCK is not set
-# CONFIG_INLINE_WRITE_LOCK_BH is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_WRITE_TRYLOCK is not set
-CONFIG_INLINE_WRITE_UNLOCK=y
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-CONFIG_IP175C_PHY=y
-CONFIG_IRQ_CPU=y
-# CONFIG_LEDS_GPIO is not set
-CONFIG_LOONGSON_UART_BASE=y
-# CONFIG_MACH_ALCHEMY is not set
-# CONFIG_MACH_DECSTATION is not set
-# CONFIG_MACH_JAZZ is not set
-# CONFIG_MACH_LOONGSON is not set
-# CONFIG_MACH_TX39XX is not set
-# CONFIG_MACH_TX49XX is not set
-# CONFIG_MACH_VR41XX is not set
-# CONFIG_MIKROTIK_RB532 is not set
-CONFIG_MIPS=y
-# CONFIG_MIPS_COBALT is not set
-CONFIG_MIPS_L1_CACHE_SHIFT=5
-# CONFIG_MIPS_MACHINE is not set
-# CONFIG_MIPS_MALTA is not set
-CONFIG_MIPS_MT_DISABLED=y
-# CONFIG_MIPS_MT_SMP is not set
-# CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_SIM is not set
-CONFIG_MTD_AR2315=y
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-# CONFIG_MTD_CFI_GEOMETRY is not set
-# CONFIG_MTD_CFI_INTELEXT is not set
-CONFIG_MTD_MYLOADER_PARTS=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-3
-CONFIG_MTD_REDBOOT_PARTS=y
-# CONFIG_MUTEX_SPIN_ON_OWNER is not set
-CONFIG_MVSWITCH_PHY=y
-# CONFIG_NET_PCI is not set
-# CONFIG_NO_IOPORT is not set
-# CONFIG_NXP_STB220 is not set
-# CONFIG_NXP_STB225 is not set
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PCI=y
-CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PHYLIB=y
-# CONFIG_PMC_MSP is not set
-# CONFIG_PMC_YOSEMITE is not set
-# CONFIG_PNX8550_JBS is not set
-# CONFIG_PNX8550_STB810 is not set
-# CONFIG_POWERTV is not set
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-# CONFIG_SCSI_DMA is not set
-# CONFIG_SERIAL_8250_EXTENDED is not set
-CONFIG_SERIAL_8250_NR_UARTS=1
-CONFIG_SERIAL_8250_RUNTIME_UARTS=1
-# CONFIG_SGI_IP22 is not set
-# CONFIG_SGI_IP27 is not set
-# CONFIG_SGI_IP28 is not set
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_SWARM is not set
-# CONFIG_SWAP is not set
-CONFIG_SWCONFIG=y
-CONFIG_SYS_HAS_CPU_MIPS32_R1=y
-CONFIG_SYS_HAS_EARLY_PRINTK=y
-CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
-CONFIG_TRAD_SIGNALS=y
-# CONFIG_TREE_PREEMPT_RCU is not set
-CONFIG_USB_SUPPORT=y
-CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/atheros/patches-2.6.30/002-mips_clocksource_init_war.patch b/target/linux/atheros/patches-2.6.30/002-mips_clocksource_init_war.patch
deleted file mode 100644
index 03a66ff13..000000000
--- a/target/linux/atheros/patches-2.6.30/002-mips_clocksource_init_war.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/arch/mips/kernel/cevt-r4k.c
-+++ b/arch/mips/kernel/cevt-r4k.c
-@@ -15,6 +15,22 @@
- #include <asm/cevt-r4k.h>
- 
- /*
-+ * Compare interrupt can be routed and latched outside the core,
-+ * so a single execution hazard barrier may not be enough to give
-+ * it time to clear as seen in the Cause register.  4 time the
-+ * pipeline depth seems reasonably conservative, and empirically
-+ * works better in configurations with high CPU/bus clock ratios.
-+ */
-+
-+#define compare_change_hazard() \
-+	do { \
-+		irq_disable_hazard(); \
-+		irq_disable_hazard(); \
-+		irq_disable_hazard(); \
-+		irq_disable_hazard(); \
-+	} while (0)
-+
-+/*
-  * The SMTC Kernel for the 34K, 1004K, et. al. replaces several
-  * of these routines with SMTC-specific variants.
-  */
-@@ -30,6 +46,7 @@ static int mips_next_event(unsigned long
- 	cnt = read_c0_count();
- 	cnt += delta;
- 	write_c0_compare(cnt);
-+	compare_change_hazard();
- 	res = ((int)(read_c0_count() - cnt) > 0) ? -ETIME : 0;
- 	return res;
- }
-@@ -99,22 +116,6 @@ static int c0_compare_int_pending(void)
- 	return (read_c0_cause() >> cp0_compare_irq) & 0x100;
- }
- 
--/*
-- * Compare interrupt can be routed and latched outside the core,
-- * so a single execution hazard barrier may not be enough to give
-- * it time to clear as seen in the Cause register.  4 time the
-- * pipeline depth seems reasonably conservative, and empirically
-- * works better in configurations with high CPU/bus clock ratios.
-- */
--
--#define compare_change_hazard() \
--	do { \
--		irq_disable_hazard(); \
--		irq_disable_hazard(); \
--		irq_disable_hazard(); \
--		irq_disable_hazard(); \
--	} while (0)
--
- int c0_compare_int_usable(void)
- {
- 	unsigned int delta;
diff --git a/target/linux/atheros/patches-2.6.30/100-board.patch b/target/linux/atheros/patches-2.6.30/100-board.patch
index 5f5129371..8183fb8aa 100644
--- a/target/linux/atheros/patches-2.6.30/100-board.patch
+++ b/target/linux/atheros/patches-2.6.30/100-board.patch
@@ -1555,7 +1555,7 @@
 +
 --- /dev/null
 +++ b/arch/mips/ar231x/ar5312.c
-@@ -0,0 +1,547 @@
+@@ -0,0 +1,549 @@
 +/*
 + * This file is subject to the terms and conditions of the GNU General Public
 + * License.  See the file "COPYING" in the main directory of this archive
@@ -1938,7 +1938,8 @@
 +		if (!ar231x_board.radio)
 +			return 0;
 +
-+		if (*((u32 *) radio) & AR531X_RADIO0_MASK)
++		if ((*((u32 *) radio) & AR531X_RADIO0_MASK) &&
++		    (config->flags & BD_WLAN0))
 +			ar231x_add_wmac(0, AR531X_WLAN0,
 +				AR5312_IRQ_WLAN0_INTRS);
 +
@@ -1962,7 +1963,8 @@
 +		break;
 +	}
 +
-+	if (*((u32 *) radio) & AR531X_RADIO1_MASK)
++	if ((*((u32 *) radio) & AR531X_RADIO1_MASK) &&
++	    (config->flags & BD_WLAN1))
 +		ar231x_add_wmac(1, AR531X_WLAN1,
 +			AR5312_IRQ_WLAN1_INTRS);
 +
diff --git a/target/linux/atheros/patches-2.6.32/002-mips_clocksource_init_war.patch b/target/linux/atheros/patches-2.6.32/002-mips_clocksource_init_war.patch
deleted file mode 100644
index 894eed1e5..000000000
--- a/target/linux/atheros/patches-2.6.32/002-mips_clocksource_init_war.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/arch/mips/kernel/cevt-r4k.c
-+++ b/arch/mips/kernel/cevt-r4k.c
-@@ -16,6 +16,22 @@
- #include <asm/cevt-r4k.h>
- 
- /*
-+ * Compare interrupt can be routed and latched outside the core,
-+ * so a single execution hazard barrier may not be enough to give
-+ * it time to clear as seen in the Cause register.  4 time the
-+ * pipeline depth seems reasonably conservative, and empirically
-+ * works better in configurations with high CPU/bus clock ratios.
-+ */
-+
-+#define compare_change_hazard() \
-+	do { \
-+		irq_disable_hazard(); \
-+		irq_disable_hazard(); \
-+		irq_disable_hazard(); \
-+		irq_disable_hazard(); \
-+	} while (0)
-+
-+/*
-  * The SMTC Kernel for the 34K, 1004K, et. al. replaces several
-  * of these routines with SMTC-specific variants.
-  */
-@@ -31,6 +47,7 @@ static int mips_next_event(unsigned long
- 	cnt = read_c0_count();
- 	cnt += delta;
- 	write_c0_compare(cnt);
-+	compare_change_hazard();
- 	res = ((int)(read_c0_count() - cnt) > 0) ? -ETIME : 0;
- 	return res;
- }
-@@ -100,22 +117,6 @@ static int c0_compare_int_pending(void)
- 	return (read_c0_cause() >> cp0_compare_irq) & 0x100;
- }
- 
--/*
-- * Compare interrupt can be routed and latched outside the core,
-- * so a single execution hazard barrier may not be enough to give
-- * it time to clear as seen in the Cause register.  4 time the
-- * pipeline depth seems reasonably conservative, and empirically
-- * works better in configurations with high CPU/bus clock ratios.
-- */
--
--#define compare_change_hazard() \
--	do { \
--		irq_disable_hazard(); \
--		irq_disable_hazard(); \
--		irq_disable_hazard(); \
--		irq_disable_hazard(); \
--	} while (0)
--
- int c0_compare_int_usable(void)
- {
- 	unsigned int delta;
diff --git a/target/linux/atheros/patches-2.6.32/100-board.patch b/target/linux/atheros/patches-2.6.32/100-board.patch
index cfa78cdf9..c79897595 100644
--- a/target/linux/atheros/patches-2.6.32/100-board.patch
+++ b/target/linux/atheros/patches-2.6.32/100-board.patch
@@ -1557,7 +1557,7 @@
 +
 --- /dev/null
 +++ b/arch/mips/ar231x/ar5312.c
-@@ -0,0 +1,547 @@
+@@ -0,0 +1,549 @@
 +/*
 + * This file is subject to the terms and conditions of the GNU General Public
 + * License.  See the file "COPYING" in the main directory of this archive
@@ -1940,7 +1940,8 @@
 +		if (!ar231x_board.radio)
 +			return 0;
 +
-+		if (*((u32 *) radio) & AR531X_RADIO0_MASK)
++		if ((*((u32 *) radio) & AR531X_RADIO0_MASK) &&
++		    (config->flags & BD_WLAN0))
 +			ar231x_add_wmac(0, AR531X_WLAN0,
 +				AR5312_IRQ_WLAN0_INTRS);
 +
@@ -1964,7 +1965,8 @@
 +		break;
 +	}
 +
-+	if (*((u32 *) radio) & AR531X_RADIO1_MASK)
++	if ((*((u32 *) radio) & AR531X_RADIO1_MASK) &&
++	    (config->flags & BD_WLAN1))
 +		ar231x_add_wmac(1, AR531X_WLAN1,
 +			AR5312_IRQ_WLAN1_INTRS);
 +
diff --git a/target/linux/atheros/patches-2.6.32/220-enet_micrel_workaround.patch b/target/linux/atheros/patches-2.6.32/220-enet_micrel_workaround.patch
index dc7d63d27..989bd7606 100644
--- a/target/linux/atheros/patches-2.6.32/220-enet_micrel_workaround.patch
+++ b/target/linux/atheros/patches-2.6.32/220-enet_micrel_workaround.patch
@@ -30,7 +30,7 @@
  	if (ar231x_mdiobus_probe(dev) != 0) {
  		printk(KERN_ERR "%s: mdiobus_probe failed\n", dev->name);
  		rx_tasklet_cleanup(dev);
-@@ -334,8 +350,10 @@ static int __exit ar231x_remove(struct p
+@@ -334,8 +350,10 @@ static int __devexit ar231x_remove(struc
  	rx_tasklet_cleanup(dev);
  	ar231x_init_cleanup(dev);
  	unregister_netdev(dev);
diff --git a/target/linux/atheros/patches-2.6.33/001-get_c0_compare_int_fix.patch b/target/linux/atheros/patches-2.6.33/001-get_c0_compare_int_fix.patch
deleted file mode 100644
index 43da96c3f..000000000
--- a/target/linux/atheros/patches-2.6.33/001-get_c0_compare_int_fix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Fix the usage of get_c0_compare_int: override cp0_compare_irq if the returned
-value is in the MIPS CPU IRQ range to ensure that c0_compare_int_usable()
-still works.
-
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-
---- a/arch/mips/kernel/cevt-r4k.c
-+++ b/arch/mips/kernel/cevt-r4k.c
-@@ -168,20 +168,23 @@ int __cpuinit r4k_clockevent_init(void)
- 	struct clock_event_device *cd;
- 	unsigned int irq;
- 
--	if (!cpu_has_counter || !mips_hpt_frequency)
--		return -ENXIO;
--
--	if (!c0_compare_int_usable())
--		return -ENXIO;
--
- 	/*
- 	 * With vectored interrupts things are getting platform specific.
- 	 * get_c0_compare_int is a hook to allow a platform to return the
- 	 * interrupt number of it's liking.
- 	 */
- 	irq = MIPS_CPU_IRQ_BASE + cp0_compare_irq;
--	if (get_c0_compare_int)
-+	if (get_c0_compare_int) {
- 		irq = get_c0_compare_int();
-+		if ((irq >= MIPS_CPU_IRQ_BASE) && (irq < MIPS_CPU_IRQ_BASE + 8))
-+			cp0_compare_irq = irq - MIPS_CPU_IRQ_BASE;
-+	}
-+
-+	if (!cpu_has_counter || !mips_hpt_frequency)
-+		return -ENXIO;
-+
-+	if (!c0_compare_int_usable())
-+		return -ENXIO;
- 
- 	cd = &per_cpu(mips_clockevent_device, cpu);
- 
diff --git a/target/linux/atheros/patches-2.6.33/002-mips_clocksource_init_war.patch b/target/linux/atheros/patches-2.6.33/002-mips_clocksource_init_war.patch
deleted file mode 100644
index 1ce438080..000000000
--- a/target/linux/atheros/patches-2.6.33/002-mips_clocksource_init_war.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/arch/mips/kernel/cevt-r4k.c
-+++ b/arch/mips/kernel/cevt-r4k.c
-@@ -16,6 +16,22 @@
- #include <asm/cevt-r4k.h>
- 
- /*
-+ * Compare interrupt can be routed and latched outside the core,
-+ * so a single execution hazard barrier may not be enough to give
-+ * it time to clear as seen in the Cause register.  4 time the
-+ * pipeline depth seems reasonably conservative, and empirically
-+ * works better in configurations with high CPU/bus clock ratios.
-+ */
-+
-+#define compare_change_hazard() \
-+	do { \
-+		irq_disable_hazard(); \
-+		irq_disable_hazard(); \
-+		irq_disable_hazard(); \
-+		irq_disable_hazard(); \
-+	} while (0)
-+
-+/*
-  * The SMTC Kernel for the 34K, 1004K, et. al. replaces several
-  * of these routines with SMTC-specific variants.
-  */
-@@ -31,6 +47,7 @@ static int mips_next_event(unsigned long
- 	cnt = read_c0_count();
- 	cnt += delta;
- 	write_c0_compare(cnt);
-+	compare_change_hazard();
- 	res = ((int)(read_c0_count() - cnt) > 0) ? -ETIME : 0;
- 	return res;
- }
-@@ -100,22 +117,6 @@ static int c0_compare_int_pending(void)
- 	return (read_c0_cause() >> cp0_compare_irq_shift) & (1ul << CAUSEB_IP);
- }
- 
--/*
-- * Compare interrupt can be routed and latched outside the core,
-- * so a single execution hazard barrier may not be enough to give
-- * it time to clear as seen in the Cause register.  4 time the
-- * pipeline depth seems reasonably conservative, and empirically
-- * works better in configurations with high CPU/bus clock ratios.
-- */
--
--#define compare_change_hazard() \
--	do { \
--		irq_disable_hazard(); \
--		irq_disable_hazard(); \
--		irq_disable_hazard(); \
--		irq_disable_hazard(); \
--	} while (0)
--
- int c0_compare_int_usable(void)
- {
- 	unsigned int delta;
diff --git a/target/linux/atheros/patches-2.6.33/100-board.patch b/target/linux/atheros/patches-2.6.33/100-board.patch
deleted file mode 100644
index 8ecce331b..000000000
--- a/target/linux/atheros/patches-2.6.33/100-board.patch
+++ /dev/null
@@ -1,3124 +0,0 @@
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -84,6 +84,19 @@ config BCM63XX
- 	help
- 	 Support for BCM63XX based boards
- 
-+config ATHEROS_AR231X
-+	bool "Atheros 231x/531x SoC support"
-+	select CEVT_R4K
-+	select CSRC_R4K
-+	select DMA_NONCOHERENT
-+	select IRQ_CPU
-+	select SYS_HAS_CPU_MIPS32_R1
-+	select SYS_SUPPORTS_BIG_ENDIAN
-+	select SYS_SUPPORTS_32BIT_KERNEL
-+	select GENERIC_GPIO
-+	help
-+	  Support for AR231x and AR531x based boards
-+
- config MIPS_COBALT
- 	bool "Cobalt Server"
- 	select CEVT_R4K
-@@ -681,6 +694,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
- 
- endchoice
- 
-+source "arch/mips/ar231x/Kconfig"
- source "arch/mips/alchemy/Kconfig"
- source "arch/mips/bcm63xx/Kconfig"
- source "arch/mips/jazz/Kconfig"
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -310,6 +310,13 @@ cflags-$(CONFIG_SOC_AU1X00)	+= -I$(srctr
- 
- 
- #
-+# Atheros AR5312/AR2312 WiSoC
-+#
-+core-$(CONFIG_ATHEROS_AR231X)		+= arch/mips/ar231x/
-+cflags-$(CONFIG_ATHEROS_AR231X)	+= -I$(srctree)/arch/mips/include/asm/mach-ar231x
-+load-$(CONFIG_ATHEROS_AR231X)		+= 0xffffffff80041000
-+
-+#
- # Cobalt Server
- #
- core-$(CONFIG_MIPS_COBALT)	+= arch/mips/cobalt/
---- /dev/null
-+++ b/arch/mips/ar231x/Kconfig
-@@ -0,0 +1,17 @@
-+config ATHEROS_AR5312
-+	bool "Atheros 5312/2312+ support"
-+	depends on ATHEROS_AR231X
-+	default y
-+
-+config ATHEROS_AR2315
-+	bool "Atheros 2315+ support"
-+	depends on ATHEROS_AR231X
-+	select DMA_NONCOHERENT
-+	select CEVT_R4K
-+	select CSRC_R4K
-+	select IRQ_CPU
-+	select SYS_HAS_CPU_MIPS32_R1
-+	select SYS_SUPPORTS_32BIT_KERNEL
-+	select SYS_SUPPORTS_BIG_ENDIAN
-+	select GENERIC_GPIO
-+	default y
---- /dev/null
-+++ b/arch/mips/ar231x/Makefile
-@@ -0,0 +1,13 @@
-+#
-+# This file is subject to the terms and conditions of the GNU General Public
-+# License.  See the file "COPYING" in the main directory of this archive
-+# for more details.
-+#
-+# Copyright (C) 2006 FON Technology, SL.
-+# Copyright (C) 2006 Imre Kaloz <kaloz@openwrt.org>
-+# Copyright (C) 2006-2009 Felix Fietkau <nbd@openwrt.org>
-+#
-+
-+obj-y += board.o prom.o devices.o
-+obj-$(CONFIG_ATHEROS_AR5312) += ar5312.o
-+obj-$(CONFIG_ATHEROS_AR2315) += ar2315.o
---- /dev/null
-+++ b/arch/mips/ar231x/board.c
-@@ -0,0 +1,251 @@
-+/*
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License.  See the file "COPYING" in the main directory of this archive
-+ * for more details.
-+ *
-+ * Copyright (C) 2003 Atheros Communications, Inc.,  All Rights Reserved.
-+ * Copyright (C) 2006 FON Technology, SL.
-+ * Copyright (C) 2006 Imre Kaloz <kaloz@openwrt.org>
-+ * Copyright (C) 2006-2009 Felix Fietkau <nbd@openwrt.org>
-+ */
-+
-+#include <generated/autoconf.h>
-+#include <linux/init.h>
-+#include <linux/module.h>
-+#include <linux/types.h>
-+#include <linux/string.h>
-+#include <linux/platform_device.h>
-+#include <linux/kernel.h>
-+#include <linux/random.h>
-+#include <linux/etherdevice.h>
-+#include <asm/irq_cpu.h>
-+#include <asm/reboot.h>
-+#include <asm/io.h>
-+
-+#include <ar231x_platform.h>
-+#include "devices.h"
-+#include "ar5312.h"
-+#include "ar2315.h"
-+
-+void (*ar231x_irq_dispatch)(void);
-+
-+static inline bool
-+check_radio_magic(u8 *addr)
-+{
-+	addr += 0x7a; /* offset for flash magic */
-+	if ((addr[0] == 0x5a) && (addr[1] == 0xa5)) {
-+		return 1;
-+	}
-+	return 0;
-+}
-+
-+static inline bool
-+check_board_data(u8 *flash_limit, u8 *addr, bool broken)
-+{
-+	/* config magic found */
-+	if (*((u32 *)addr) == AR531X_BD_MAGIC)
-+		return 1;
-+
-+	if (!broken)
-+		return 0;
-+
-+	if (check_radio_magic(addr + 0xf8))
-+		ar231x_board.radio = addr + 0xf8;
-+	if ((addr < flash_limit + 0x10000) &&
-+	     check_radio_magic(addr + 0x10000))
-+		ar231x_board.radio = addr + 0x10000;
-+
-+	if (ar231x_board.radio) {
-+		/* broken board data detected, use radio data to find the offset,
-+		 * user will fix this */
-+		return 1;
-+	}
-+	return 0;
-+}
-+
-+static u8 *
-+find_board_config(u8 *flash_limit, bool broken)
-+{
-+	u8 *addr;
-+	int found = 0;
-+
-+	for (addr = flash_limit - 0x1000;
-+		addr >= flash_limit - 0x30000;
-+		addr -= 0x1000) {
-+
-+		if (check_board_data(flash_limit, addr, broken)) {
-+			found = 1;
-+			break;
-+		}
-+	}
-+
-+	if (!found)
-+		addr = NULL;
-+
-+	return addr;
-+}
-+
-+static u8 *
-+find_radio_config(u8 *flash_limit, u8 *board_config)
-+{
-+	int found;
-+	u8 *radio_config;
-+
-+	/*
-+	 * Now find the start of Radio Configuration data, using heuristics:
-+	 * Search forward from Board Configuration data by 0x1000 bytes
-+	 * at a time until we find non-0xffffffff.
-+	 */
-+	found = 0;
-+	for (radio_config = board_config + 0x1000;
-+	     (radio_config < flash_limit);
-+	     radio_config += 0x1000) {
-+		if ((*(u32 *)radio_config != 0xffffffff) &&
-+		    check_radio_magic(radio_config)) {
-+			found = 1;
-+			break;
-+		}
-+	}
-+
-+	/* AR2316 relocates radio config to new location */
-+	if (!found) {
-+	    for (radio_config = board_config + 0xf8;
-+			(radio_config < flash_limit - 0x1000 + 0xf8);
-+			 radio_config += 0x1000) {
-+			if ((*(u32 *)radio_config != 0xffffffff) &&
-+				check_radio_magic(radio_config)) {
-+				found = 1;
-+				break;
-+			}
-+	    }
-+	}
-+
-+	if (!found) {
-+		printk("Could not find Radio Configuration data\n");
-+		radio_config = 0;
-+	}
-+
-+	return (u8 *) radio_config;
-+}
-+
-+int __init
-+ar231x_find_config(u8 *flash_limit)
-+{
-+	struct ar231x_boarddata *config;
-+	unsigned int rcfg_size;
-+	int broken_boarddata = 0;
-+	u8 *bcfg, *rcfg;
-+	u8 *board_data;
-+	u8 *radio_data;
-+	u32 offset;
-+
-+	ar231x_board.config = NULL;
-+	ar231x_board.radio = NULL;
-+	/* Copy the board and radio data to RAM, because accessing the mapped
-+	 * memory of the flash directly after booting is not safe */
-+
-+	/* Try to find valid board and radio data */
-+	bcfg = find_board_config(flash_limit, false);
-+
-+	/* If that fails, try to at least find valid radio data */
-+	if (!bcfg) {
-+		bcfg = find_board_config(flash_limit, true);
-+		broken_boarddata = 1;
-+	}
-+
-+	if (!bcfg) {
-+		printk(KERN_WARNING "WARNING: No board configuration data found!\n");
-+		return -ENODEV;
-+	}
-+
-+	board_data = kzalloc(BOARD_CONFIG_BUFSZ, GFP_KERNEL);
-+	ar231x_board.config = (struct ar231x_boarddata *) board_data;
-+	memcpy(board_data, bcfg, 0x100);
-+	if (broken_boarddata) {
-+		printk(KERN_WARNING "WARNING: broken board data detected\n");
-+		config = ar231x_board.config;
-+		if (!memcmp(config->enet0_mac, "\x00\x00\x00\x00\x00\x00", 6)) {
-+			printk(KERN_INFO "Fixing up empty mac addresses\n");
-+			config->resetConfigGpio = 0xffff;
-+			config->sysLedGpio = 0xffff;
-+			random_ether_addr(config->wlan0_mac);
-+			config->wlan0_mac[0] &= ~0x06;
-+			random_ether_addr(config->enet0_mac);
-+			random_ether_addr(config->enet1_mac);
-+		}
-+	}
-+
-+
-+	/* Radio config starts 0x100 bytes after board config, regardless
-+	 * of what the physical layout on the flash chip looks like */
-+
-+	if (ar231x_board.radio)
-+		rcfg = (u8 *) ar231x_board.radio;
-+	else
-+		rcfg = find_radio_config(flash_limit, bcfg);
-+
-+	if (!rcfg)
-+		return -ENODEV;
-+
-+	radio_data = board_data + 0x100 + ((rcfg - bcfg) & 0xfff);
-+	ar231x_board.radio = radio_data;
-+	offset = radio_data - board_data;
-+	printk(KERN_INFO "Radio config found at offset 0x%x(0x%x)\n", rcfg - bcfg, offset);
-+	rcfg_size = BOARD_CONFIG_BUFSZ - offset;
-+	memcpy(radio_data, rcfg, rcfg_size);
-+
-+	return 0;
-+}
-+
-+static void
-+ar231x_halt(void)
-+{
-+	local_irq_disable();
-+	while (1);
-+}
-+
-+void __init
-+plat_mem_setup(void)
-+{
-+	_machine_halt = ar231x_halt;
-+	pm_power_off = ar231x_halt;
-+
-+	ar5312_plat_setup();
-+	ar2315_plat_setup();
-+
-+	/* Disable data watchpoints */
-+	write_c0_watchlo0(0);
-+}
-+
-+
-+asmlinkage void
-+plat_irq_dispatch(void)
-+{
-+	ar231x_irq_dispatch();
-+}
-+
-+void __init
-+plat_time_init(void)
-+{
-+	ar5312_time_init();
-+	ar2315_time_init();
-+}
-+
-+unsigned int __cpuinit
-+get_c0_compare_int(void)
-+{
-+	return CP0_LEGACY_COMPARE_IRQ;
-+}
-+
-+void __init
-+arch_init_irq(void)
-+{
-+	clear_c0_status(ST0_IM);
-+	mips_cpu_irq_init();
-+
-+	/* Initialize interrupt controllers */
-+	ar5312_irq_init();
-+	ar2315_irq_init();
-+}
-+
-+
---- /dev/null
-+++ b/arch/mips/ar231x/prom.c
-@@ -0,0 +1,37 @@
-+/*
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License.  See the file "COPYING" in the main directory of this archive
-+ * for more details.
-+ *
-+ * Copyright MontaVista Software Inc
-+ * Copyright (C) 2003 Atheros Communications, Inc.,  All Rights Reserved.
-+ * Copyright (C) 2006 FON Technology, SL.
-+ * Copyright (C) 2006 Imre Kaloz <kaloz@openwrt.org>
-+ * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
-+ */
-+
-+/*
-+ * Prom setup file for ar531x
-+ */
-+
-+#include <linux/init.h>
-+#include <generated/autoconf.h>
-+#include <linux/kernel.h>
-+#include <linux/string.h>
-+#include <linux/mm.h>
-+#include <linux/bootmem.h>
-+
-+#include <asm/bootinfo.h>
-+#include <asm/addrspace.h>
-+#include "ar5312.h"
-+#include "ar2315.h"
-+
-+void __init prom_init(void)
-+{
-+	ar5312_prom_init();
-+	ar2315_prom_init();
-+}
-+
-+void __init prom_free_prom_memory(void)
-+{
-+}
---- /dev/null
-+++ b/arch/mips/include/asm/mach-ar231x/ar231x_platform.h
-@@ -0,0 +1,83 @@
-+#ifndef __AR531X_PLATFORM_H
-+#define __AR531X_PLATFORM_H
-+
-+/*
-+ * This is board-specific data that is stored in a "fixed" location in flash.
-+ * It is shared across operating systems, so it should not be changed lightly.
-+ * The main reason we need it is in order to extract the ethernet MAC
-+ * address(es).
-+ */
-+struct ar231x_boarddata {
-+    u32 magic;                       /* board data is valid */
-+#define AR531X_BD_MAGIC 0x35333131   /* "5311", for all 531x platforms */
-+    u16 cksum;                       /* checksum (starting with BD_REV 2) */
-+    u16 rev;                         /* revision of this struct */
-+#define BD_REV  4
-+    char boardName[64];            /* Name of board */
-+    u16 major;                       /* Board major number */
-+    u16 minor;                       /* Board minor number */
-+    u32 flags;                      /* Board configuration */
-+#define BD_ENET0        0x00000001   /* ENET0 is stuffed */
-+#define BD_ENET1        0x00000002   /* ENET1 is stuffed */
-+#define BD_UART1        0x00000004   /* UART1 is stuffed */
-+#define BD_UART0        0x00000008   /* UART0 is stuffed (dma) */
-+#define BD_RSTFACTORY   0x00000010   /* Reset factory defaults stuffed */
-+#define BD_SYSLED       0x00000020   /* System LED stuffed */
-+#define BD_EXTUARTCLK   0x00000040   /* External UART clock */
-+#define BD_CPUFREQ      0x00000080   /* cpu freq is valid in nvram */
-+#define BD_SYSFREQ      0x00000100   /* sys freq is set in nvram */
-+#define BD_WLAN0        0x00000200   /* Enable WLAN0 */
-+#define BD_MEMCAP       0x00000400   /* CAP SDRAM @ memCap for testing */
-+#define BD_DISWATCHDOG  0x00000800   /* disable system watchdog */
-+#define BD_WLAN1        0x00001000   /* Enable WLAN1 (ar5212) */
-+#define BD_ISCASPER     0x00002000   /* FLAG for AR2312 */
-+#define BD_WLAN0_2G_EN  0x00004000   /* FLAG for radio0_2G */
-+#define BD_WLAN0_5G_EN  0x00008000   /* FLAG for radio0_2G */
-+#define BD_WLAN1_2G_EN  0x00020000   /* FLAG for radio0_2G */
-+#define BD_WLAN1_5G_EN  0x00040000   /* FLAG for radio0_2G */
-+    u16 resetConfigGpio;             /* Reset factory GPIO pin */
-+    u16 sysLedGpio;                  /* System LED GPIO pin */
-+
-+    u32 cpuFreq;                     /* CPU core frequency in Hz */
-+    u32 sysFreq;                     /* System frequency in Hz */
-+    u32 cntFreq;                     /* Calculated C0_COUNT frequency */
-+
-+    u8  wlan0_mac[6];
-+    u8  enet0_mac[6];
-+    u8  enet1_mac[6];
-+
-+    u16 pciId;                       /* Pseudo PCIID for common code */
-+    u16 memCap;                      /* cap bank1 in MB */
-+
-+    /* version 3 */
-+    u8  wlan1_mac[6];                 /* (ar5212) */
-+};
-+
-+#define BOARD_CONFIG_BUFSZ		0x1000
-+
-+/*
-+ * Platform device information for the Wireless MAC
-+ */
-+struct ar231x_board_config {
-+	u16 devid;
-+
-+	/* board config data */
-+	struct ar231x_boarddata *config;
-+
-+	/* radio calibration data */
-+	const char *radio;
-+};
-+
-+/*
-+ * Platform device information for the Ethernet MAC
-+ */
-+struct ar231x_eth {
-+	u32 reset_base;
-+	u32 reset_mac;
-+	u32 reset_phy;
-+	u32 phy_base;
-+	struct ar231x_board_config *config;
-+	char *macaddr;
-+};
-+
-+#endif /* __AR531X_PLATFORM_H */
---- /dev/null
-+++ b/arch/mips/include/asm/mach-ar231x/cpu-feature-overrides.h
-@@ -0,0 +1,84 @@
-+/*
-+ *  Atheros SoC specific CPU feature overrides
-+ *
-+ *  Copyright (C) 2008 Gabor Juhos <juhosg@openwrt.org>
-+ *
-+ *  This file was derived from: include/asm-mips/cpu-features.h
-+ *	Copyright (C) 2003, 2004 Ralf Baechle
-+ *	Copyright (C) 2004 Maciej W. Rozycki
-+ *
-+ *  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 __ASM_MACH_ATHEROS_CPU_FEATURE_OVERRIDES_H
-+#define __ASM_MACH_ATHEROS_CPU_FEATURE_OVERRIDES_H
-+
-+/*
-+ * The ATHEROS SoCs have MIPS 4Kc/4KEc core.
-+ */
-+#define cpu_has_tlb			1
-+#define cpu_has_4kex			1
-+#define cpu_has_3k_cache		0
-+#define cpu_has_4k_cache		1
-+#define cpu_has_tx39_cache		0
-+#define cpu_has_sb1_cache		0
-+#define cpu_has_fpu			0
-+#define cpu_has_32fpr			0
-+#define cpu_has_counter			1
-+/* #define cpu_has_watch		? */
-+/* #define cpu_has_divec		? */
-+/* #define cpu_has_vce			? */
-+/* #define cpu_has_cache_cdex_p		? */
-+/* #define cpu_has_cache_cdex_s		? */
-+/* #define cpu_has_prefetch		? */
-+/* #define cpu_has_mcheck		? */
-+#define cpu_has_ejtag			1
-+
-+#if !defined(CONFIG_ATHEROS_AR5312)
-+#  define cpu_has_llsc			1
-+#else
-+/*
-+ * The MIPS 4Kc V0.9 core in the AR5312/AR2312 have problems with the
-+ * ll/sc instructions.
-+ */
-+#  define cpu_has_llsc			0
-+#endif
-+
-+#define cpu_has_mips16			0
-+#define cpu_has_mdmx			0
-+#define cpu_has_mips3d			0
-+#define cpu_has_smartmips		0
-+
-+/* #define cpu_has_vtag_icache		? */
-+/* #define cpu_has_dc_aliases		? */
-+/* #define cpu_has_ic_fills_f_dc	? */
-+/* #define cpu_has_pindexed_dcache	? */
-+
-+/* #define cpu_icache_snoops_remote_store	? */
-+
-+#define cpu_has_mips32r1		1
-+
-+#if !defined(CONFIG_ATHEROS_AR5312)
-+#  define cpu_has_mips32r2		1
-+#endif
-+
-+#define cpu_has_mips64r1		0
-+#define cpu_has_mips64r2		0
-+
-+#define cpu_has_dsp			0
-+#define cpu_has_mipsmt			0
-+
-+/* #define cpu_has_nofpuex		? */
-+#define cpu_has_64bits			0
-+#define cpu_has_64bit_zero_reg		0
-+#define cpu_has_64bit_gp_regs		0
-+#define cpu_has_64bit_addresses		0
-+
-+/* #define cpu_has_inclusive_pcaches	? */
-+
-+/* #define cpu_dcache_line_size()	? */
-+/* #define cpu_icache_line_size()	? */
-+
-+#endif /* __ASM_MACH_ATHEROS_CPU_FEATURE_OVERRIDES_H */
---- /dev/null
-+++ b/arch/mips/include/asm/mach-ar231x/dma-coherence.h
-@@ -0,0 +1,64 @@
-+/*
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License.  See the file "COPYING" in the main directory of this archive
-+ * for more details.
-+ *
-+ * Copyright (C) 2006  Ralf Baechle <ralf@linux-mips.org>
-+ * Copyright (C) 2007  Felix Fietkau <nbd@openwrt.org>
-+ *
-+ */
-+#ifndef __ASM_MACH_GENERIC_DMA_COHERENCE_H
-+#define __ASM_MACH_GENERIC_DMA_COHERENCE_H
-+
-+#define PCI_DMA_OFFSET	0x20000000
-+
-+struct device;
-+
-+static dma_addr_t plat_map_dma_mem(struct device *dev, void *addr, size_t size)
-+{
-+	return virt_to_phys(addr) + (dev != NULL ? PCI_DMA_OFFSET : 0);
-+}
-+
-+static dma_addr_t plat_map_dma_mem_page(struct device *dev, struct page *page)
-+{
-+	return page_to_phys(page) + (dev != NULL ? PCI_DMA_OFFSET : 0);
-+}
-+
-+static inline unsigned long plat_dma_addr_to_phys(struct device *dev,
-+	dma_addr_t dma_addr)
-+{
-+	return (dma_addr > PCI_DMA_OFFSET ? dma_addr - PCI_DMA_OFFSET : dma_addr);
-+}
-+
-+static inline void plat_unmap_dma_mem(struct device *dev, dma_addr_t dma_addr,
-+	size_t size, enum dma_data_direction direction)
-+{
-+}
-+
-+static inline int plat_dma_supported(struct device *dev, u64 mask)
-+{
-+	return 1;
-+}
-+
-+static inline void plat_extra_sync_for_device(struct device *dev)
-+{
-+	return;
-+}
-+
-+static inline int plat_dma_mapping_error(struct device *dev,
-+					 dma_addr_t dma_addr)
-+{
-+	return 0;
-+}
-+
-+static inline int plat_device_is_coherent(struct device *dev)
-+{
-+#ifdef CONFIG_DMA_COHERENT
-+	return 1;
-+#endif
-+#ifdef CONFIG_DMA_NONCOHERENT
-+	return 0;
-+#endif
-+}
-+
-+#endif /* __ASM_MACH_GENERIC_DMA_COHERENCE_H */
---- /dev/null
-+++ b/arch/mips/include/asm/mach-ar231x/gpio.h
-@@ -0,0 +1,79 @@
-+#ifndef _ATHEROS_GPIO_H_
-+#define _ATHEROS_GPIO_H_
-+
-+#include <ar231x.h>
-+
-+struct ar231x_gpiodev {
-+	u32 valid_mask;
-+	u32 (*get_output)(void);
-+	u32 (*set_output)(u32 mask, u32 val);
-+	u32 (*get)(void);
-+	u32 (*set)(u32 mask, u32 val);
-+};
-+
-+extern const struct ar231x_gpiodev *ar231x_gpiodev;
-+
-+/*
-+ * Wrappers for the generic GPIO layer
-+ */
-+
-+static inline int gpio_direction_input(unsigned gpio) {
-+	u32 mask = 1 << gpio;
-+
-+	if (!(ar231x_gpiodev->valid_mask & mask))
-+		return -ENXIO;
-+
-+	ar231x_gpiodev->set_output(mask, 0);
-+	return 0;
-+}
-+
-+static inline void gpio_set_value(unsigned gpio, int value) {
-+	u32 mask = 1 << gpio;
-+
-+	if (!(ar231x_gpiodev->valid_mask & mask))
-+		return;
-+
-+	ar231x_gpiodev->set(mask, (!!value) * mask);
-+}
-+
-+static inline int gpio_direction_output(unsigned gpio, int value) {
-+	u32 mask = 1 << gpio;
-+
-+	if (!(ar231x_gpiodev->valid_mask & mask))
-+		return -ENXIO;
-+
-+	ar231x_gpiodev->set_output(mask, mask);
-+	ar231x_gpiodev->set(mask, (!!value) * mask);
-+	return 0;
-+}
-+
-+/* Reads the gpio pin.  Unchecked function */
-+static inline int gpio_get_value(unsigned gpio) {
-+	u32 mask = 1 << gpio;
-+
-+	if (!(ar231x_gpiodev->valid_mask & mask))
-+		return 0;
-+
-+	return !!(ar231x_gpiodev->get() & mask);
-+}
-+
-+static inline int gpio_request(unsigned gpio, const char *label) {
-+	return 0;
-+}
-+
-+static inline void gpio_free(unsigned gpio) {
-+}
-+
-+/* Returns IRQ to attach for gpio.  Unchecked function */
-+static inline int gpio_to_irq(unsigned gpio) {
-+	return AR531X_GPIO_IRQ(gpio);
-+}
-+
-+/* Returns gpio for IRQ attached.  Unchecked function */
-+static inline int irq_to_gpio(unsigned irq) {
-+	return (irq - (AR531X_GPIO_IRQ(0)));
-+}
-+
-+#include <asm-generic/gpio.h> /* cansleep wrappers */
-+
-+#endif
---- /dev/null
-+++ b/arch/mips/include/asm/mach-ar231x/reset.h
-@@ -0,0 +1,6 @@
-+#ifndef __AR531X_RESET_H
-+#define __AR531X_RESET_H
-+
-+void ar531x_disable_reset_button(void);
-+
-+#endif /* __AR531X_RESET_H */
---- /dev/null
-+++ b/arch/mips/include/asm/mach-ar231x/war.h
-@@ -0,0 +1,25 @@
-+/*
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License.  See the file "COPYING" in the main directory of this archive
-+ * for more details.
-+ *
-+ * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
-+ */
-+#ifndef __ASM_MIPS_MACH_ATHEROS_WAR_H
-+#define __ASM_MIPS_MACH_ATHEROS_WAR_H
-+
-+#define R4600_V1_INDEX_ICACHEOP_WAR	0
-+#define R4600_V1_HIT_CACHEOP_WAR	0
-+#define R4600_V2_HIT_CACHEOP_WAR	0
-+#define R5432_CP0_INTERRUPT_WAR		0
-+#define BCM1250_M3_WAR			0
-+#define SIBYTE_1956_WAR			0
-+#define MIPS4K_ICACHE_REFILL_WAR	0
-+#define MIPS_CACHE_SYNC_WAR		0
-+#define TX49XX_ICACHE_INDEX_INV_WAR	0
-+#define RM9000_CDEX_SMP_WAR		0
-+#define ICACHE_REFILLS_WORKAROUND_WAR	0
-+#define R10000_LLSC_WAR			0
-+#define MIPS34K_MISSED_ITLB_WAR		0
-+
-+#endif /* __ASM_MIPS_MACH_ATHEROS_WAR_H */
---- /dev/null
-+++ b/arch/mips/include/asm/mach-ar231x/ar2315_regs.h
-@@ -0,0 +1,580 @@
-+/*
-+ * Register definitions for AR2315+
-+ *
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License.  See the file "COPYING" in the main directory of this archive
-+ * for more details.
-+ *
-+ * Copyright (C) 2003 Atheros Communications, Inc.,  All Rights Reserved.
-+ * Copyright (C) 2006 FON Technology, SL.
-+ * Copyright (C) 2006 Imre Kaloz <kaloz@openwrt.org>
-+ * Copyright (C) 2006-2008 Felix Fietkau <nbd@openwrt.org>
-+ */
-+
-+#ifndef __AR2315_REG_H
-+#define __AR2315_REG_H
-+
-+/*
-+ * IRQs
-+ */
-+#define AR2315_IRQ_MISC_INTRS   MIPS_CPU_IRQ_BASE+2 /* C0_CAUSE: 0x0400 */
-+#define AR2315_IRQ_WLAN0_INTRS  MIPS_CPU_IRQ_BASE+3 /* C0_CAUSE: 0x0800 */
-+#define AR2315_IRQ_ENET0_INTRS  MIPS_CPU_IRQ_BASE+4 /* C0_CAUSE: 0x1000 */
-+#define AR2315_IRQ_LCBUS_PCI    MIPS_CPU_IRQ_BASE+5 /* C0_CAUSE: 0x2000 */
-+#define AR2315_IRQ_WLAN0_POLL   MIPS_CPU_IRQ_BASE+6 /* C0_CAUSE: 0x4000 */
-+
-+/*
-+ * Address map
-+ */
-+#define AR2315_SPI_READ         0x08000000      /* SPI FLASH */
-+#define AR2315_WLAN0            0xB0000000      /* Wireless MMR */
-+#define AR2315_PCI              0xB0100000      /* PCI MMR */
-+#define AR2315_SDRAMCTL         0xB0300000      /* SDRAM MMR */
-+#define AR2315_LOCAL            0xB0400000      /* LOCAL BUS MMR */
-+#define AR2315_ENET0            0xB0500000      /* ETHERNET MMR */
-+#define AR2315_DSLBASE          0xB1000000      /* RESET CONTROL MMR */
-+#define AR2315_UART0            0xB1100003      /* UART MMR */
-+#define AR2315_SPI              0xB1300000      /* SPI FLASH MMR */
-+#define AR2315_PCIEXT           0x80000000      /* pci external */
-+
-+/*
-+ * Reset Register
-+ */
-+#define AR2315_COLD_RESET       (AR2315_DSLBASE + 0x0000)
-+
-+#define AR2315_RESET_COLD_AHB              0x00000001
-+#define AR2315_RESET_COLD_APB              0x00000002
-+#define AR2315_RESET_COLD_CPU              0x00000004
-+#define AR2315_RESET_COLD_CPUWARM          0x00000008
-+#define AR2315_RESET_SYSTEM                (RESET_COLD_CPU | RESET_COLD_APB | RESET_COLD_AHB)      /* full system */
-+#define AR2317_RESET_SYSTEM                0x00000010
-+
-+
-+#define AR2315_RESET            (AR2315_DSLBASE + 0x0004)
-+
-+#define AR2315_RESET_WARM_WLAN0_MAC        0x00000001      /* warm reset WLAN0 MAC */
-+#define AR2315_RESET_WARM_WLAN0_BB         0x00000002      /* warm reset WLAN0 BaseBand */
-+#define AR2315_RESET_MPEGTS_RSVD           0x00000004      /* warm reset MPEG-TS */
-+#define AR2315_RESET_PCIDMA                0x00000008      /* warm reset PCI ahb/dma */
-+#define AR2315_RESET_MEMCTL                0x00000010      /* warm reset memory controller */
-+#define AR2315_RESET_LOCAL                 0x00000020      /* warm reset local bus */
-+#define AR2315_RESET_I2C_RSVD              0x00000040      /* warm reset I2C bus */
-+#define AR2315_RESET_SPI                   0x00000080      /* warm reset SPI interface */
-+#define AR2315_RESET_UART0                 0x00000100      /* warm reset UART0 */
-+#define AR2315_RESET_IR_RSVD               0x00000200      /* warm reset IR interface */
-+#define AR2315_RESET_EPHY0                 0x00000400      /* cold reset ENET0 phy */
-+#define AR2315_RESET_ENET0                 0x00000800      /* cold reset ENET0 mac */
-+
-+/*
-+ * AHB master arbitration control
-+ */
-+#define AR2315_AHB_ARB_CTL      (AR2315_DSLBASE + 0x0008)
-+
-+#define AR2315_ARB_CPU                     0x00000001      /* CPU, default */
-+#define AR2315_ARB_WLAN                    0x00000002      /* WLAN */
-+#define AR2315_ARB_MPEGTS_RSVD             0x00000004      /* MPEG-TS */
-+#define AR2315_ARB_LOCAL                   0x00000008      /* LOCAL */
-+#define AR2315_ARB_PCI                     0x00000010      /* PCI */
-+#define AR2315_ARB_ETHERNET                0x00000020      /* Ethernet */
-+#define AR2315_ARB_RETRY                   0x00000100      /* retry policy, debug only */
-+
-+/*
-+ * Config Register
-+ */
-+#define AR2315_ENDIAN_CTL       (AR2315_DSLBASE + 0x000c)
-+
-+#define AR2315_CONFIG_AHB                  0x00000001      /* EC - AHB bridge endianess */
-+#define AR2315_CONFIG_WLAN                 0x00000002      /* WLAN byteswap */
-+#define AR2315_CONFIG_MPEGTS_RSVD          0x00000004      /* MPEG-TS byteswap */
-+#define AR2315_CONFIG_PCI                  0x00000008      /* PCI byteswap */
-+#define AR2315_CONFIG_MEMCTL               0x00000010      /* Memory controller endianess */
-+#define AR2315_CONFIG_LOCAL                0x00000020      /* Local bus byteswap */
-+#define AR2315_CONFIG_ETHERNET             0x00000040      /* Ethernet byteswap */
-+
-+#define AR2315_CONFIG_MERGE                0x00000200      /* CPU write buffer merge */
-+#define AR2315_CONFIG_CPU                  0x00000400      /* CPU big endian */
-+#define AR2315_CONFIG_PCIAHB               0x00000800
-+#define AR2315_CONFIG_PCIAHB_BRIDGE        0x00001000
-+#define AR2315_CONFIG_SPI                  0x00008000      /* SPI byteswap */
-+#define AR2315_CONFIG_CPU_DRAM             0x00010000
-+#define AR2315_CONFIG_CPU_PCI              0x00020000
-+#define AR2315_CONFIG_CPU_MMR              0x00040000
-+#define AR2315_CONFIG_BIG                  0x00000400
-+
-+
-+/*
-+ * NMI control
-+ */
-+#define AR2315_NMI_CTL          (AR2315_DSLBASE + 0x0010)
-+
-+#define AR2315_NMI_EN  1
-+
-+/*
-+ * Revision Register - Initial value is 0x3010 (WMAC 3.0, AR531X 1.0).
-+ */
-+#define AR2315_SREV             (AR2315_DSLBASE + 0x0014)
-+
-+#define AR2315_REV_MAJ                     0x00f0
-+#define AR2315_REV_MAJ_S                   4
-+#define AR2315_REV_MIN                     0x000f
-+#define AR2315_REV_MIN_S                   0
-+#define AR2315_REV_CHIP                    (AR2315_REV_MAJ|AR2315_REV_MIN)
-+
-+/*
-+ * Interface Enable
-+ */
-+#define AR2315_IF_CTL           (AR2315_DSLBASE + 0x0018)
-+
-+#define AR2315_IF_MASK                     0x00000007
-+#define AR2315_IF_DISABLED                 0
-+#define AR2315_IF_PCI                      1
-+#define AR2315_IF_TS_LOCAL                 2
-+#define AR2315_IF_ALL                      3   /* only for emulation with separate pins */
-+#define AR2315_IF_LOCAL_HOST               0x00000008
-+#define AR2315_IF_PCI_HOST                 0x00000010
-+#define AR2315_IF_PCI_INTR                 0x00000020
-+#define AR2315_IF_PCI_CLK_MASK             0x00030000
-+#define AR2315_IF_PCI_CLK_INPUT            0
-+#define AR2315_IF_PCI_CLK_OUTPUT_LOW       1
-+#define AR2315_IF_PCI_CLK_OUTPUT_CLK       2
-+#define AR2315_IF_PCI_CLK_OUTPUT_HIGH      3
-+#define AR2315_IF_PCI_CLK_SHIFT            16
-+
-+/*
-+ * APB Interrupt control
-+ */
-+
-+#define AR2315_ISR              (AR2315_DSLBASE + 0x0020)
-+#define AR2315_IMR              (AR2315_DSLBASE + 0x0024)
-+#define AR2315_GISR             (AR2315_DSLBASE + 0x0028)
-+
-+#define AR2315_ISR_UART0                   0x0001           /* high speed UART */
-+#define AR2315_ISR_I2C_RSVD                0x0002           /* I2C bus */
-+#define AR2315_ISR_SPI                     0x0004           /* SPI bus */
-+#define AR2315_ISR_AHB                     0x0008           /* AHB error */
-+#define AR2315_ISR_APB                     0x0010           /* APB error */
-+#define AR2315_ISR_TIMER                   0x0020           /* timer */
-+#define AR2315_ISR_GPIO                    0x0040           /* GPIO */
-+#define AR2315_ISR_WD                      0x0080           /* watchdog */
-+#define AR2315_ISR_IR_RSVD                 0x0100           /* IR */
-+
-+#define AR2315_GISR_MISC                   0x0001
-+#define AR2315_GISR_WLAN0                  0x0002
-+#define AR2315_GISR_MPEGTS_RSVD            0x0004
-+#define AR2315_GISR_LOCALPCI               0x0008
-+#define AR2315_GISR_WMACPOLL               0x0010
-+#define AR2315_GISR_TIMER                  0x0020
-+#define AR2315_GISR_ETHERNET               0x0040
-+
-+/*
-+ * Interrupt routing from IO to the processor IP bits
-+ * Define our inter mask and level
-+ */
-+#define AR2315_INTR_MISCIO      SR_IBIT3
-+#define AR2315_INTR_WLAN0       SR_IBIT4
-+#define AR2315_INTR_ENET0       SR_IBIT5
-+#define AR2315_INTR_LOCALPCI    SR_IBIT6
-+#define AR2315_INTR_WMACPOLL    SR_IBIT7
-+#define AR2315_INTR_COMPARE     SR_IBIT8
-+
-+/*
-+ * Timers
-+ */
-+#define AR2315_TIMER            (AR2315_DSLBASE + 0x0030)
-+#define AR2315_RELOAD           (AR2315_DSLBASE + 0x0034)
-+#define AR2315_WD               (AR2315_DSLBASE + 0x0038)
-+#define AR2315_WDC              (AR2315_DSLBASE + 0x003c)
-+
-+#define AR2315_WDC_IGNORE_EXPIRATION       0x00000000
-+#define AR2315_WDC_NMI                     0x00000001               /* NMI on watchdog */
-+#define AR2315_WDC_RESET                   0x00000002               /* reset on watchdog */
-+
-+/*
-+ * CPU Performance Counters
-+ */
-+#define AR2315_PERFCNT0         (AR2315_DSLBASE + 0x0048)
-+#define AR2315_PERFCNT1         (AR2315_DSLBASE + 0x004c)
-+
-+#define AR2315_PERF0_DATAHIT                0x0001  /* Count Data Cache Hits */
-+#define AR2315_PERF0_DATAMISS               0x0002  /* Count Data Cache Misses */
-+#define AR2315_PERF0_INSTHIT                0x0004  /* Count Instruction Cache Hits */
-+#define AR2315_PERF0_INSTMISS               0x0008  /* Count Instruction Cache Misses */
-+#define AR2315_PERF0_ACTIVE                 0x0010  /* Count Active Processor Cycles */
-+#define AR2315_PERF0_WBHIT                  0x0020  /* Count CPU Write Buffer Hits */
-+#define AR2315_PERF0_WBMISS                 0x0040  /* Count CPU Write Buffer Misses */
-+
-+#define AR2315_PERF1_EB_ARDY                0x0001  /* Count EB_ARdy signal */
-+#define AR2315_PERF1_EB_AVALID              0x0002  /* Count EB_AValid signal */
-+#define AR2315_PERF1_EB_WDRDY               0x0004  /* Count EB_WDRdy signal */
-+#define AR2315_PERF1_EB_RDVAL               0x0008  /* Count EB_RdVal signal */
-+#define AR2315_PERF1_VRADDR                 0x0010  /* Count valid read address cycles */
-+#define AR2315_PERF1_VWADDR                 0x0020  /* Count valid write address cycles */
-+#define AR2315_PERF1_VWDATA                 0x0040  /* Count valid write data cycles */
-+
-+/*
-+ * AHB Error Reporting.
-+ */
-+#define AR2315_AHB_ERR0         (AR2315_DSLBASE + 0x0050)  /* error  */
-+#define AR2315_AHB_ERR1         (AR2315_DSLBASE + 0x0054)  /* haddr  */
-+#define AR2315_AHB_ERR2         (AR2315_DSLBASE + 0x0058)  /* hwdata */
-+#define AR2315_AHB_ERR3         (AR2315_DSLBASE + 0x005c)  /* hrdata */
-+#define AR2315_AHB_ERR4         (AR2315_DSLBASE + 0x0060)  /* status */
-+
-+#define AHB_ERROR_DET               1   /* AHB Error has been detected,          */
-+                                        /* write 1 to clear all bits in ERR0     */
-+#define AHB_ERROR_OVR               2   /* AHB Error overflow has been detected  */
-+#define AHB_ERROR_WDT               4   /* AHB Error due to wdt instead of hresp */
-+
-+#define AR2315_PROCERR_HMAST               0x0000000f
-+#define AR2315_PROCERR_HMAST_DFLT          0
-+#define AR2315_PROCERR_HMAST_WMAC          1
-+#define AR2315_PROCERR_HMAST_ENET          2
-+#define AR2315_PROCERR_HMAST_PCIENDPT      3
-+#define AR2315_PROCERR_HMAST_LOCAL         4
-+#define AR2315_PROCERR_HMAST_CPU           5
-+#define AR2315_PROCERR_HMAST_PCITGT        6
-+
-+#define AR2315_PROCERR_HMAST_S             0
-+#define AR2315_PROCERR_HWRITE              0x00000010
-+#define AR2315_PROCERR_HSIZE               0x00000060
-+#define AR2315_PROCERR_HSIZE_S             5
-+#define AR2315_PROCERR_HTRANS              0x00000180
-+#define AR2315_PROCERR_HTRANS_S            7
-+#define AR2315_PROCERR_HBURST              0x00000e00
-+#define AR2315_PROCERR_HBURST_S            9
-+
-+/*
-+ * Clock Control
-+ */
-+#define AR2315_PLLC_CTL         (AR2315_DSLBASE + 0x0064)
-+#define AR2315_PLLV_CTL         (AR2315_DSLBASE + 0x0068)
-+#define AR2315_CPUCLK           (AR2315_DSLBASE + 0x006c)
-+#define AR2315_AMBACLK          (AR2315_DSLBASE + 0x0070)
-+#define AR2315_SYNCCLK          (AR2315_DSLBASE + 0x0074)
-+#define AR2315_DSL_SLEEP_CTL    (AR2315_DSLBASE + 0x0080)
-+#define AR2315_DSL_SLEEP_DUR    (AR2315_DSLBASE + 0x0084)
-+
-+/* PLLc Control fields */
-+#define PLLC_REF_DIV_M              0x00000003
-+#define PLLC_REF_DIV_S              0
-+#define PLLC_FDBACK_DIV_M           0x0000007C
-+#define PLLC_FDBACK_DIV_S           2
-+#define PLLC_ADD_FDBACK_DIV_M       0x00000080
-+#define PLLC_ADD_FDBACK_DIV_S       7
-+#define PLLC_CLKC_DIV_M             0x0001c000
-+#define PLLC_CLKC_DIV_S             14
-+#define PLLC_CLKM_DIV_M             0x00700000
-+#define PLLC_CLKM_DIV_S             20
-+
-+/* CPU CLK Control fields */
-+#define CPUCLK_CLK_SEL_M            0x00000003
-+#define CPUCLK_CLK_SEL_S            0
-+#define CPUCLK_CLK_DIV_M            0x0000000c
-+#define CPUCLK_CLK_DIV_S            2
-+
-+/* AMBA CLK Control fields */
-+#define AMBACLK_CLK_SEL_M           0x00000003
-+#define AMBACLK_CLK_SEL_S           0
-+#define AMBACLK_CLK_DIV_M           0x0000000c
-+#define AMBACLK_CLK_DIV_S           2
-+
-+/*
-+ * GPIO
-+ */
-+#define AR2315_GPIO_DI          (AR2315_DSLBASE + 0x0088)
-+#define AR2315_GPIO_DO          (AR2315_DSLBASE + 0x0090)
-+#define AR2315_GPIO_CR          (AR2315_DSLBASE + 0x0098)
-+#define AR2315_GPIO_INT         (AR2315_DSLBASE + 0x00a0)
-+
-+#define AR2315_GPIO_CR_M(x)                (1 << (x))                  /* mask for i/o */
-+#define AR2315_GPIO_CR_O(x)                (1 << (x))                  /* output */
-+#define AR2315_GPIO_CR_I(x)                (0)                         /* input */
-+
-+#define AR2315_GPIO_INT_S(x)               (x)                         /* interrupt enable */
-+#define AR2315_GPIO_INT_M                  (0x3F)                      /* mask for int */
-+#define AR2315_GPIO_INT_LVL(x)             ((x) << 6)                  /* interrupt level */
-+#define AR2315_GPIO_INT_LVL_M              ((0x3) << 6)                /* mask for int level */
-+
-+#define AR2315_GPIO_INT_MAX_Y				1   /* Maximum value of Y for AR5313_GPIO_INT_* macros */
-+#define AR2315_GPIO_INT_LVL_OFF				0   /* Triggerring off */
-+#define AR2315_GPIO_INT_LVL_LOW				1   /* Low Level Triggered */
-+#define AR2315_GPIO_INT_LVL_HIGH			2   /* High Level Triggered */
-+#define AR2315_GPIO_INT_LVL_EDGE			3   /* Edge Triggered */
-+
-+#define AR2315_RESET_GPIO       5
-+#define AR2315_NUM_GPIO         22
-+
-+/*
-+ *  PCI Clock Control
-+ */
-+#define AR2315_PCICLK           (AR2315_DSLBASE + 0x00a4)
-+
-+#define AR2315_PCICLK_INPUT_M              0x3
-+#define AR2315_PCICLK_INPUT_S              0
-+
-+#define AR2315_PCICLK_PLLC_CLKM            0
-+#define AR2315_PCICLK_PLLC_CLKM1           1
-+#define AR2315_PCICLK_PLLC_CLKC            2
-+#define AR2315_PCICLK_REF_CLK              3
-+
-+#define AR2315_PCICLK_DIV_M                0xc
-+#define AR2315_PCICLK_DIV_S                2
-+
-+#define AR2315_PCICLK_IN_FREQ              0
-+#define AR2315_PCICLK_IN_FREQ_DIV_6        1
-+#define AR2315_PCICLK_IN_FREQ_DIV_8        2
-+#define AR2315_PCICLK_IN_FREQ_DIV_10       3
-+
-+/*
-+ * Observation Control Register
-+ */
-+#define AR2315_OCR              (AR2315_DSLBASE + 0x00b0)
-+#define OCR_GPIO0_IRIN              0x0040
-+#define OCR_GPIO1_IROUT             0x0080
-+#define OCR_GPIO3_RXCLR             0x0200
-+
-+/*
-+ *  General Clock Control
-+ */
-+
-+#define AR2315_MISCCLK          (AR2315_DSLBASE + 0x00b4)
-+#define MISCCLK_PLLBYPASS_EN        0x00000001
-+#define MISCCLK_PROCREFCLK          0x00000002
-+
-+/*
-+ * SDRAM Controller
-+ *   - No read or write buffers are included.
-+ */
-+#define AR2315_MEM_CFG          (AR2315_SDRAMCTL + 0x00)
-+#define AR2315_MEM_CTRL         (AR2315_SDRAMCTL + 0x0c)
-+#define AR2315_MEM_REF          (AR2315_SDRAMCTL + 0x10)
-+
-+#define SDRAM_DATA_WIDTH_M          0x00006000
-+#define SDRAM_DATA_WIDTH_S          13
-+
-+#define SDRAM_COL_WIDTH_M           0x00001E00
-+#define SDRAM_COL_WIDTH_S           9
-+
-+#define SDRAM_ROW_WIDTH_M           0x000001E0
-+#define SDRAM_ROW_WIDTH_S           5
-+
-+#define SDRAM_BANKADDR_BITS_M       0x00000018
-+#define SDRAM_BANKADDR_BITS_S       3
-+
-+/*
-+ * SPI Flash Interface Registers
-+ */
-+
-+#define AR2315_SPI_CTL      (AR2315_SPI + 0x00)
-+#define AR2315_SPI_OPCODE   (AR2315_SPI + 0x04)
-+#define AR2315_SPI_DATA     (AR2315_SPI + 0x08)
-+
-+#define SPI_CTL_START           0x00000100
-+#define SPI_CTL_BUSY            0x00010000
-+#define SPI_CTL_TXCNT_MASK      0x0000000f
-+#define SPI_CTL_RXCNT_MASK      0x000000f0
-+#define SPI_CTL_TX_RX_CNT_MASK  0x000000ff
-+#define SPI_CTL_SIZE_MASK       0x00060000
-+
-+#define SPI_CTL_CLK_SEL_MASK    0x03000000
-+#define SPI_OPCODE_MASK         0x000000ff
-+
-+/*
-+ * PCI Bus Interface Registers
-+ */
-+#define AR2315_PCI_1MS_REG      (AR2315_PCI + 0x0008)
-+#define AR2315_PCI_1MS_MASK     0x3FFFF         /* # of AHB clk cycles in 1ms */
-+
-+#define AR2315_PCI_MISC_CONFIG  (AR2315_PCI + 0x000c)
-+#define AR2315_PCIMISC_TXD_EN   0x00000001      /* Enable TXD for fragments */
-+#define AR2315_PCIMISC_CFG_SEL  0x00000002      /* mem or config cycles */
-+#define AR2315_PCIMISC_GIG_MASK 0x0000000C      /* bits 31-30 for pci req */
-+#define AR2315_PCIMISC_RST_MODE 0x00000030
-+#define AR2315_PCIRST_INPUT     0x00000000      /* 4:5=0 rst is input */
-+#define AR2315_PCIRST_LOW       0x00000010      /* 4:5=1 rst to GND */
-+#define AR2315_PCIRST_HIGH      0x00000020      /* 4:5=2 rst to VDD */
-+#define AR2315_PCIGRANT_EN      0x00000000      /* 6:7=0 early grant en */
-+#define AR2315_PCIGRANT_FRAME   0x00000040      /* 6:7=1 grant waits 4 frame */
-+#define AR2315_PCIGRANT_IDLE    0x00000080      /* 6:7=2 grant waits 4 idle */
-+#define AR2315_PCIGRANT_GAP     0x00000000      /* 6:7=2 grant waits 4 idle */
-+#define AR2315_PCICACHE_DIS     0x00001000      /* PCI external access cache disable */
-+
-+#define AR2315_PCI_OUT_TSTAMP   (AR2315_PCI + 0x0010)
-+
-+#define AR2315_PCI_UNCACHE_CFG  (AR2315_PCI + 0x0014)
-+
-+#define AR2315_PCI_IN_EN        (AR2315_PCI + 0x0100)
-+#define AR2315_PCI_IN_EN0       0x01            /* Enable chain 0 */
-+#define AR2315_PCI_IN_EN1       0x02            /* Enable chain 1 */
-+#define AR2315_PCI_IN_EN2       0x04            /* Enable chain 2 */
-+#define AR2315_PCI_IN_EN3       0x08            /* Enable chain 3 */
-+
-+#define AR2315_PCI_IN_DIS       (AR2315_PCI + 0x0104)
-+#define AR2315_PCI_IN_DIS0      0x01            /* Disable chain 0 */
-+#define AR2315_PCI_IN_DIS1      0x02            /* Disable chain 1 */
-+#define AR2315_PCI_IN_DIS2      0x04            /* Disable chain 2 */
-+#define AR2315_PCI_IN_DIS3      0x08            /* Disable chain 3 */
-+
-+#define AR2315_PCI_IN_PTR       (AR2315_PCI + 0x0200)
-+
-+#define AR2315_PCI_OUT_EN       (AR2315_PCI + 0x0400)
-+#define AR2315_PCI_OUT_EN0      0x01            /* Enable chain 0 */
-+
-+#define AR2315_PCI_OUT_DIS      (AR2315_PCI + 0x0404)
-+#define AR2315_PCI_OUT_DIS0     0x01            /* Disable chain 0 */
-+
-+#define AR2315_PCI_OUT_PTR      (AR2315_PCI + 0x0408)
-+
-+#define AR2315_PCI_INT_STATUS   (AR2315_PCI + 0x0500)   /* write one to clr */
-+#define AR2315_PCI_TXINT        0x00000001      /* Desc In Completed */
-+#define AR2315_PCI_TXOK         0x00000002      /* Desc In OK */
-+#define AR2315_PCI_TXERR        0x00000004      /* Desc In ERR */
-+#define AR2315_PCI_TXEOL        0x00000008      /* Desc In End-of-List */
-+#define AR2315_PCI_RXINT        0x00000010      /* Desc Out Completed */
-+#define AR2315_PCI_RXOK         0x00000020      /* Desc Out OK */
-+#define AR2315_PCI_RXERR        0x00000040      /* Desc Out ERR */
-+#define AR2315_PCI_RXEOL        0x00000080      /* Desc Out EOL */
-+#define AR2315_PCI_TXOOD        0x00000200      /* Desc In Out-of-Desc */
-+#define AR2315_PCI_MASK         0x0000FFFF      /* Desc Mask */
-+#define AR2315_PCI_EXT_INT      0x02000000
-+#define AR2315_PCI_ABORT_INT    0x04000000
-+
-+#define AR2315_PCI_INT_MASK     (AR2315_PCI + 0x0504)   /* same as INT_STATUS */
-+
-+#define AR2315_PCI_INTEN_REG    (AR2315_PCI + 0x0508)
-+#define AR2315_PCI_INT_DISABLE  0x00            /* disable pci interrupts */
-+#define AR2315_PCI_INT_ENABLE   0x01            /* enable pci interrupts */
-+
-+#define AR2315_PCI_HOST_IN_EN   (AR2315_PCI + 0x0800)
-+#define AR2315_PCI_HOST_IN_DIS  (AR2315_PCI + 0x0804)
-+#define AR2315_PCI_HOST_IN_PTR  (AR2315_PCI + 0x0810)
-+#define AR2315_PCI_HOST_OUT_EN  (AR2315_PCI + 0x0900)
-+#define AR2315_PCI_HOST_OUT_DIS (AR2315_PCI + 0x0904)
-+#define AR2315_PCI_HOST_OUT_PTR (AR2315_PCI + 0x0908)
-+
-+
-+/*
-+ * Local Bus Interface Registers
-+ */
-+#define AR2315_LB_CONFIG        (AR2315_LOCAL + 0x0000)
-+#define AR2315_LBCONF_OE        0x00000001      /* =1 OE is low-true */
-+#define AR2315_LBCONF_CS0       0x00000002      /* =1 first CS is low-true */
-+#define AR2315_LBCONF_CS1       0x00000004      /* =1 2nd CS is low-true */
-+#define AR2315_LBCONF_RDY       0x00000008      /* =1 RDY is low-true */
-+#define AR2315_LBCONF_WE        0x00000010      /* =1 Write En is low-true */
-+#define AR2315_LBCONF_WAIT      0x00000020      /* =1 WAIT is low-true */
-+#define AR2315_LBCONF_ADS       0x00000040      /* =1 Adr Strobe is low-true */
-+#define AR2315_LBCONF_MOT       0x00000080      /* =0 Intel, =1 Motorola */
-+#define AR2315_LBCONF_8CS       0x00000100      /* =1 8 bits CS, 0= 16bits */
-+#define AR2315_LBCONF_8DS       0x00000200      /* =1 8 bits Data S, 0=16bits */
-+#define AR2315_LBCONF_ADS_EN    0x00000400      /* =1 Enable ADS */
-+#define AR2315_LBCONF_ADR_OE    0x00000800      /* =1 Adr cap on OE, WE or DS */
-+#define AR2315_LBCONF_ADDT_MUX  0x00001000      /* =1 Adr and Data share bus */
-+#define AR2315_LBCONF_DATA_OE   0x00002000      /* =1 Data cap on OE, WE, DS */
-+#define AR2315_LBCONF_16DATA    0x00004000      /* =1 Data is 16 bits wide */
-+#define AR2315_LBCONF_SWAPDT    0x00008000      /* =1 Byte swap data */
-+#define AR2315_LBCONF_SYNC      0x00010000      /* =1 Bus synchronous to clk */
-+#define AR2315_LBCONF_INT       0x00020000      /* =1 Intr is low true */
-+#define AR2315_LBCONF_INT_CTR0  0x00000000      /* GND high-Z, Vdd is high-Z */
-+#define AR2315_LBCONF_INT_CTR1  0x00040000      /* GND drive, Vdd is high-Z */
-+#define AR2315_LBCONF_INT_CTR2  0x00080000      /* GND high-Z, Vdd drive */
-+#define AR2315_LBCONF_INT_CTR3  0x000C0000      /* GND drive, Vdd drive */
-+#define AR2315_LBCONF_RDY_WAIT  0x00100000      /* =1 RDY is negative of WAIT */
-+#define AR2315_LBCONF_INT_PULSE 0x00200000      /* =1 Interrupt is a pulse */
-+#define AR2315_LBCONF_ENABLE    0x00400000      /* =1 Falcon respond to LB */
-+
-+#define AR2315_LB_CLKSEL        (AR2315_LOCAL + 0x0004)
-+#define AR2315_LBCLK_EXT        0x0001          /* use external clk for lb */
-+
-+#define AR2315_LB_1MS           (AR2315_LOCAL + 0x0008)
-+#define AR2315_LB1MS_MASK       0x3FFFF         /* # of AHB clk cycles in 1ms */
-+
-+#define AR2315_LB_MISCCFG       (AR2315_LOCAL + 0x000C)
-+#define AR2315_LBM_TXD_EN       0x00000001      /* Enable TXD for fragments */
-+#define AR2315_LBM_RX_INTEN     0x00000002      /* Enable LB ints on RX ready */
-+#define AR2315_LBM_MBOXWR_INTEN 0x00000004      /* Enable LB ints on mbox wr */
-+#define AR2315_LBM_MBOXRD_INTEN 0x00000008      /* Enable LB ints on mbox rd */
-+#define AR2315_LMB_DESCSWAP_EN  0x00000010      /* Byte swap desc enable */
-+#define AR2315_LBM_TIMEOUT_MASK 0x00FFFF80
-+#define AR2315_LBM_TIMEOUT_SHFT 7
-+#define AR2315_LBM_PORTMUX      0x07000000
-+
-+
-+#define AR2315_LB_RXTSOFF       (AR2315_LOCAL + 0x0010)
-+
-+#define AR2315_LB_TX_CHAIN_EN   (AR2315_LOCAL + 0x0100)
-+#define AR2315_LB_TXEN_0        0x01
-+#define AR2315_LB_TXEN_1        0x02
-+#define AR2315_LB_TXEN_2        0x04
-+#define AR2315_LB_TXEN_3        0x08
-+
-+#define AR2315_LB_TX_CHAIN_DIS  (AR2315_LOCAL + 0x0104)
-+#define AR2315_LB_TX_DESC_PTR   (AR2315_LOCAL + 0x0200)
-+
-+#define AR2315_LB_RX_CHAIN_EN   (AR2315_LOCAL + 0x0400)
-+#define AR2315_LB_RXEN          0x01
-+
-+#define AR2315_LB_RX_CHAIN_DIS  (AR2315_LOCAL + 0x0404)
-+#define AR2315_LB_RX_DESC_PTR   (AR2315_LOCAL + 0x0408)
-+
-+#define AR2315_LB_INT_STATUS    (AR2315_LOCAL + 0x0500)
-+#define AR2315_INT_TX_DESC      0x0001
-+#define AR2315_INT_TX_OK        0x0002
-+#define AR2315_INT_TX_ERR       0x0004
-+#define AR2315_INT_TX_EOF       0x0008
-+#define AR2315_INT_RX_DESC      0x0010
-+#define AR2315_INT_RX_OK        0x0020
-+#define AR2315_INT_RX_ERR       0x0040
-+#define AR2315_INT_RX_EOF       0x0080
-+#define AR2315_INT_TX_TRUNC     0x0100
-+#define AR2315_INT_TX_STARVE    0x0200
-+#define AR2315_INT_LB_TIMEOUT   0x0400
-+#define AR2315_INT_LB_ERR       0x0800
-+#define AR2315_INT_MBOX_WR      0x1000
-+#define AR2315_INT_MBOX_RD      0x2000
-+
-+/* Bit definitions for INT MASK are the same as INT_STATUS */
-+#define AR2315_LB_INT_MASK      (AR2315_LOCAL + 0x0504)
-+
-+#define AR2315_LB_INT_EN        (AR2315_LOCAL + 0x0508)
-+#define AR2315_LB_MBOX          (AR2315_LOCAL + 0x0600)
-+
-+/*
-+ * IR Interface Registers
-+ */
-+#define AR2315_IR_PKTDATA                   (AR2315_IR + 0x0000)
-+
-+#define AR2315_IR_PKTLEN                    (AR2315_IR + 0x07fc) /* 0 - 63 */
-+
-+#define AR2315_IR_CONTROL                   (AR2315_IR + 0x0800)
-+#define AR2315_IRCTL_TX                     0x00000000  /* use as tranmitter */
-+#define AR2315_IRCTL_RX                     0x00000001  /* use as receiver   */
-+#define AR2315_IRCTL_SAMPLECLK_MASK         0x00003ffe  /* Sample clk divisor mask */
-+#define AR2315_IRCTL_SAMPLECLK_SHFT                  1
-+#define AR2315_IRCTL_OUTPUTCLK_MASK         0x03ffc000  /* Output clk divisor mask */
-+#define AR2315_IRCTL_OUTPUTCLK_SHFT                 14
-+
-+#define AR2315_IR_STATUS                    (AR2315_IR + 0x0804)
-+#define AR2315_IRSTS_RX                     0x00000001  /* receive in progress */
-+#define AR2315_IRSTS_TX                     0x00000002  /* transmit in progress */
-+
-+#define AR2315_IR_CONFIG                    (AR2315_IR + 0x0808)
-+#define AR2315_IRCFG_INVIN                  0x00000001  /* invert input polarity */
-+#define AR2315_IRCFG_INVOUT                 0x00000002  /* invert output polarity */
-+#define AR2315_IRCFG_SEQ_START_WIN_SEL      0x00000004  /* 1 => 28, 0 => 7 */
-+#define AR2315_IRCFG_SEQ_START_THRESH       0x000000f0  /*  */
-+#define AR2315_IRCFG_SEQ_END_UNIT_SEL       0x00000100  /*  */
-+#define AR2315_IRCFG_SEQ_END_UNIT_THRESH    0x00007e00  /*  */
-+#define AR2315_IRCFG_SEQ_END_WIN_SEL        0x00008000  /*  */
-+#define AR2315_IRCFG_SEQ_END_WIN_THRESH     0x001f0000  /*  */
-+#define AR2315_IRCFG_NUM_BACKOFF_WORDS      0x01e00000  /*  */
-+
-+#define HOST_PCI_DEV_ID         3
-+#define HOST_PCI_MBAR0          0x10000000
-+#define HOST_PCI_MBAR1          0x20000000
-+#define HOST_PCI_MBAR2          0x30000000
-+
-+#define HOST_PCI_SDRAM_BASEADDR HOST_PCI_MBAR1
-+#define PCI_DEVICE_MEM_SPACE    0x800000
-+
-+#endif /* __AR2315_REG_H */
---- /dev/null
-+++ b/arch/mips/include/asm/mach-ar231x/ar5312_regs.h
-@@ -0,0 +1,236 @@
-+/*
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License.  See the file "COPYING" in the main directory of this archive
-+ * for more details.
-+ *
-+ * Copyright (C) 2003 Atheros Communications, Inc.,  All Rights Reserved.
-+ * Copyright (C) 2006 Imre Kaloz <kaloz@openwrt.org>
-+ * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
-+ */
-+
-+#ifndef AR5312_H
-+#define AR5312_H
-+
-+#include <asm/addrspace.h>
-+
-+/*
-+ * IRQs
-+ */
-+
-+#define AR5312_IRQ_WLAN0_INTRS  MIPS_CPU_IRQ_BASE+2 /* C0_CAUSE: 0x0400 */
-+#define AR5312_IRQ_ENET0_INTRS  MIPS_CPU_IRQ_BASE+3 /* C0_CAUSE: 0x0800 */
-+#define AR5312_IRQ_ENET1_INTRS  MIPS_CPU_IRQ_BASE+4 /* C0_CAUSE: 0x1000 */
-+#define AR5312_IRQ_WLAN1_INTRS  MIPS_CPU_IRQ_BASE+5 /* C0_CAUSE: 0x2000 */
-+#define AR5312_IRQ_MISC_INTRS   MIPS_CPU_IRQ_BASE+6 /* C0_CAUSE: 0x4000 */
-+
-+
-+/* Address Map */
-+#define AR531X_WLAN0            0x18000000
-+#define AR531X_WLAN1            0x18500000
-+#define AR531X_ENET0            0x18100000
-+#define AR531X_ENET1            0x18200000
-+#define AR531X_SDRAMCTL         0x18300000
-+#define AR531X_FLASHCTL         0x18400000
-+#define AR531X_APBBASE		0x1c000000
-+#define AR531X_FLASH            0x1e000000
-+#define AR531X_UART0            0xbc000003      /* UART MMR */
-+
-+/*
-+ * AR531X_NUM_ENET_MAC defines the number of ethernet MACs that
-+ * should be considered available.  The AR5312 supports 2 enet MACS,
-+ * even though many reference boards only actually use 1 of them
-+ * (i.e. Only MAC 0 is actually connected to an enet PHY or PHY switch.
-+ * The AR2312 supports 1 enet MAC.
-+ */
-+#define AR531X_NUM_ENET_MAC             2
-+
-+/*
-+ * Need these defines to determine true number of ethernet MACs
-+ */
-+#define AR5212_AR5312_REV2      0x0052          /* AR5312 WMAC (AP31) */
-+#define AR5212_AR5312_REV7      0x0057          /* AR5312 WMAC (AP30-040) */
-+#define AR5212_AR2313_REV8      0x0058          /* AR2313 WMAC (AP43-030) */
-+#define AR531X_RADIO_MASK_OFF  0xc8
-+#define AR531X_RADIO0_MASK     0x0003
-+#define AR531X_RADIO1_MASK     0x000c
-+#define AR531X_RADIO1_S        2
-+
-+/*
-+ * AR531X_NUM_WMAC defines the number of Wireless MACs that\
-+ * should be considered available.
-+ */
-+#define AR531X_NUM_WMAC                 2
-+
-+/* Reset/Timer Block Address Map */
-+#define AR531X_RESETTMR		(AR531X_APBBASE  + 0x3000)
-+#define AR531X_TIMER		(AR531X_RESETTMR + 0x0000) /* countdown timer */
-+#define AR531X_WD_CTRL          (AR531X_RESETTMR + 0x0008) /* watchdog cntrl */
-+#define AR531X_WD_TIMER         (AR531X_RESETTMR + 0x000c) /* watchdog timer */
-+#define AR531X_ISR		(AR531X_RESETTMR + 0x0010) /* Intr Status Reg */
-+#define AR531X_IMR		(AR531X_RESETTMR + 0x0014) /* Intr Mask Reg */
-+#define AR531X_RESET		(AR531X_RESETTMR + 0x0020)
-+#define AR5312_CLOCKCTL1	(AR531X_RESETTMR + 0x0064)
-+#define AR5312_SCRATCH   	(AR531X_RESETTMR + 0x006c)
-+#define AR531X_PROCADDR		(AR531X_RESETTMR + 0x0070)
-+#define AR531X_PROC1		(AR531X_RESETTMR + 0x0074)
-+#define AR531X_DMAADDR		(AR531X_RESETTMR + 0x0078)
-+#define AR531X_DMA1		(AR531X_RESETTMR + 0x007c)
-+#define AR531X_ENABLE           (AR531X_RESETTMR + 0x0080) /* interface enb */
-+#define AR531X_REV		(AR531X_RESETTMR + 0x0090) /* revision */
-+
-+/* AR531X_WD_CTRL register bit field definitions */
-+#define AR531X_WD_CTRL_IGNORE_EXPIRATION 0x0000
-+#define AR531X_WD_CTRL_NMI               0x0001
-+#define AR531X_WD_CTRL_RESET             0x0002
-+
-+/* AR531X_ISR register bit field definitions */
-+#define AR531X_ISR_NONE		0x0000
-+#define AR531X_ISR_TIMER	0x0001
-+#define AR531X_ISR_AHBPROC	0x0002
-+#define AR531X_ISR_AHBDMA	0x0004
-+#define AR531X_ISR_GPIO		0x0008
-+#define AR531X_ISR_UART0	0x0010
-+#define AR531X_ISR_UART0DMA	0x0020
-+#define AR531X_ISR_WD		0x0040
-+#define AR531X_ISR_LOCAL	0x0080
-+
-+/* AR531X_RESET register bit field definitions */
-+#define AR531X_RESET_SYSTEM     0x00000001  /* cold reset full system */
-+#define AR531X_RESET_PROC       0x00000002  /* cold reset MIPS core */
-+#define AR531X_RESET_WLAN0      0x00000004  /* cold reset WLAN MAC and BB */
-+#define AR531X_RESET_EPHY0      0x00000008  /* cold reset ENET0 phy */
-+#define AR531X_RESET_EPHY1      0x00000010  /* cold reset ENET1 phy */
-+#define AR531X_RESET_ENET0      0x00000020  /* cold reset ENET0 mac */
-+#define AR531X_RESET_ENET1      0x00000040  /* cold reset ENET1 mac */
-+#define AR531X_RESET_UART0      0x00000100  /* cold reset UART0 (high speed) */
-+#define AR531X_RESET_WLAN1      0x00000200  /* cold reset WLAN MAC/BB */
-+#define AR531X_RESET_APB        0x00000400  /* cold reset APB (ar5312) */
-+#define AR531X_RESET_WARM_PROC  0x00001000  /* warm reset MIPS core */
-+#define AR531X_RESET_WARM_WLAN0_MAC 0x00002000  /* warm reset WLAN0 MAC */
-+#define AR531X_RESET_WARM_WLAN0_BB  0x00004000  /* warm reset WLAN0 BaseBand */
-+#define AR531X_RESET_NMI        0x00010000  /* send an NMI to the processor */
-+#define AR531X_RESET_WARM_WLAN1_MAC 0x00020000  /* warm reset WLAN1 mac */
-+#define AR531X_RESET_WARM_WLAN1_BB  0x00040000  /* warm reset WLAN1 baseband */
-+#define AR531X_RESET_LOCAL_BUS  0x00080000  /* reset local bus */
-+#define AR531X_RESET_WDOG       0x00100000  /* last reset was a watchdog */
-+
-+#define AR531X_RESET_WMAC0_BITS \
-+        AR531X_RESET_WLAN0 |\
-+        AR531X_RESET_WARM_WLAN0_MAC |\
-+        AR531X_RESET_WARM_WLAN0_BB
-+
-+#define AR531X_RESERT_WMAC1_BITS \
-+        AR531X_RESET_WLAN1 |\
-+        AR531X_RESET_WARM_WLAN1_MAC |\
-+        AR531X_RESET_WARM_WLAN1_BB
-+
-+/* AR5312_CLOCKCTL1 register bit field definitions */
-+#define AR5312_CLOCKCTL1_PREDIVIDE_MASK    0x00000030
-+#define AR5312_CLOCKCTL1_PREDIVIDE_SHIFT            4
-+#define AR5312_CLOCKCTL1_MULTIPLIER_MASK   0x00001f00
-+#define AR5312_CLOCKCTL1_MULTIPLIER_SHIFT           8
-+#define AR5312_CLOCKCTL1_DOUBLER_MASK      0x00010000
-+
-+/* Valid for AR5312 and AR2312 */
-+#define AR5312_CLOCKCTL1_PREDIVIDE_MASK    0x00000030
-+#define AR5312_CLOCKCTL1_PREDIVIDE_SHIFT            4
-+#define AR5312_CLOCKCTL1_MULTIPLIER_MASK   0x00001f00
-+#define AR5312_CLOCKCTL1_MULTIPLIER_SHIFT           8
-+#define AR5312_CLOCKCTL1_DOUBLER_MASK      0x00010000
-+
-+/* Valid for AR2313 */
-+#define AR2313_CLOCKCTL1_PREDIVIDE_MASK    0x00003000
-+#define AR2313_CLOCKCTL1_PREDIVIDE_SHIFT           12
-+#define AR2313_CLOCKCTL1_MULTIPLIER_MASK   0x001f0000
-+#define AR2313_CLOCKCTL1_MULTIPLIER_SHIFT          16
-+#define AR2313_CLOCKCTL1_DOUBLER_MASK      0x00000000
-+
-+
-+/* AR531X_ENABLE register bit field definitions */
-+#define AR531X_ENABLE_WLAN0              0x0001
-+#define AR531X_ENABLE_ENET0              0x0002
-+#define AR531X_ENABLE_ENET1              0x0004
-+#define AR531X_ENABLE_UART_AND_WLAN1_PIO 0x0008   /* UART, and WLAN1 PIOs */
-+#define AR531X_ENABLE_WLAN1_DMA          0x0010   /* WLAN1 DMAs */
-+#define AR531X_ENABLE_WLAN1 \
-+            (AR531X_ENABLE_UART_AND_WLAN1_PIO | AR531X_ENABLE_WLAN1_DMA)
-+
-+/* AR531X_REV register bit field definitions */
-+#define AR531X_REV_WMAC_MAJ    0xf000
-+#define AR531X_REV_WMAC_MAJ_S  12
-+#define AR531X_REV_WMAC_MIN    0x0f00
-+#define AR531X_REV_WMAC_MIN_S  8
-+#define AR531X_REV_MAJ         0x00f0
-+#define AR531X_REV_MAJ_S       4
-+#define AR531X_REV_MIN         0x000f
-+#define AR531X_REV_MIN_S       0
-+#define AR531X_REV_CHIP        (AR531X_REV_MAJ|AR531X_REV_MIN)
-+
-+/* Major revision numbers, bits 7..4 of Revision ID register */
-+#define AR531X_REV_MAJ_AR5312          0x4
-+#define AR531X_REV_MAJ_AR2313          0x5
-+
-+/* Minor revision numbers, bits 3..0 of Revision ID register */
-+#define AR5312_REV_MIN_DUAL     0x0     /* Dual WLAN version */
-+#define AR5312_REV_MIN_SINGLE   0x1     /* Single WLAN version */
-+
-+/* AR531X_FLASHCTL register bit field definitions */
-+#define FLASHCTL_IDCY   0x0000000f      /* Idle cycle turn around time */
-+#define FLASHCTL_IDCY_S 0
-+#define FLASHCTL_WST1   0x000003e0      /* Wait state 1 */
-+#define FLASHCTL_WST1_S 5
-+#define FLASHCTL_RBLE   0x00000400      /* Read byte lane enable */
-+#define FLASHCTL_WST2   0x0000f800      /* Wait state 2 */
-+#define FLASHCTL_WST2_S 11
-+#define FLASHCTL_AC     0x00070000      /* Flash address check (added) */
-+#define FLASHCTL_AC_S   16
-+#define FLASHCTL_AC_128K 0x00000000
-+#define FLASHCTL_AC_256K 0x00010000
-+#define FLASHCTL_AC_512K 0x00020000
-+#define FLASHCTL_AC_1M   0x00030000
-+#define FLASHCTL_AC_2M   0x00040000
-+#define FLASHCTL_AC_4M   0x00050000
-+#define FLASHCTL_AC_8M   0x00060000
-+#define FLASHCTL_AC_RES  0x00070000     /* 16MB is not supported */
-+#define FLASHCTL_E      0x00080000      /* Flash bank enable (added) */
-+#define FLASHCTL_BUSERR 0x01000000      /* Bus transfer error status flag */
-+#define FLASHCTL_WPERR  0x02000000      /* Write protect error status flag */
-+#define FLASHCTL_WP     0x04000000      /* Write protect */
-+#define FLASHCTL_BM     0x08000000      /* Burst mode */
-+#define FLASHCTL_MW     0x30000000      /* Memory width */
-+#define FLASHCTL_MWx8   0x00000000      /* Memory width x8 */
-+#define FLASHCTL_MWx16  0x10000000      /* Memory width x16 */
-+#define FLASHCTL_MWx32  0x20000000      /* Memory width x32 (not supported) */
-+#define FLASHCTL_ATNR   0x00000000      /* Access type == no retry */
-+#define FLASHCTL_ATR    0x80000000      /* Access type == retry every */
-+#define FLASHCTL_ATR4   0xc0000000      /* Access type == retry every 4 */
-+
-+/* ARM Flash Controller -- 3 flash banks with either x8 or x16 devices.  */
-+#define AR531X_FLASHCTL0        (AR531X_FLASHCTL + 0x00)
-+#define AR531X_FLASHCTL1        (AR531X_FLASHCTL + 0x04)
-+#define AR531X_FLASHCTL2        (AR531X_FLASHCTL + 0x08)
-+
-+/* ARM SDRAM Controller -- just enough to determine memory size */
-+#define AR531X_MEM_CFG1 (AR531X_SDRAMCTL + 0x04)
-+#define MEM_CFG1_AC0    0x00000700      /* bank 0: SDRAM addr check (added) */
-+#define MEM_CFG1_AC0_S  8
-+#define MEM_CFG1_AC1    0x00007000      /* bank 1: SDRAM addr check (added) */
-+#define MEM_CFG1_AC1_S  12
-+
-+/* GPIO Address Map */
-+#define AR531X_GPIO         (AR531X_APBBASE  + 0x2000)
-+#define AR531X_GPIO_DO      (AR531X_GPIO + 0x00)        /* output register */
-+#define AR531X_GPIO_DI      (AR531X_GPIO + 0x04)        /* intput register */
-+#define AR531X_GPIO_CR      (AR531X_GPIO + 0x08)        /* control register */
-+
-+/* GPIO Control Register bit field definitions */
-+#define AR531X_GPIO_CR_M(x)    (1 << (x))                      /* mask for i/o */
-+#define AR531X_GPIO_CR_O(x)    (0 << (x))                      /* mask for output */
-+#define AR531X_GPIO_CR_I(x)    (1 << (x))                      /* mask for input */
-+#define AR531X_GPIO_CR_INT(x)  (1 << ((x)+8))                  /* mask for interrupt */
-+#define AR531X_GPIO_CR_UART(x) (1 << ((x)+16))                 /* uart multiplex */
-+#define AR531X_NUM_GPIO		8
-+
-+
-+#endif
-+
---- /dev/null
-+++ b/arch/mips/ar231x/ar5312.c
-@@ -0,0 +1,547 @@
-+/*
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License.  See the file "COPYING" in the main directory of this archive
-+ * for more details.
-+ *
-+ * Copyright (C) 2003 Atheros Communications, Inc.,  All Rights Reserved.
-+ * Copyright (C) 2006 FON Technology, SL.
-+ * Copyright (C) 2006 Imre Kaloz <kaloz@openwrt.org>
-+ * Copyright (C) 2006-2009 Felix Fietkau <nbd@openwrt.org>
-+ */
-+
-+/*
-+ * Platform devices for Atheros SoCs
-+ */
-+
-+#include <generated/autoconf.h>
-+#include <linux/init.h>
-+#include <linux/module.h>
-+#include <linux/types.h>
-+#include <linux/string.h>
-+#include <linux/mtd/physmap.h>
-+#include <linux/platform_device.h>
-+#include <linux/kernel.h>
-+#include <linux/reboot.h>
-+#include <linux/leds.h>
-+#include <asm/bootinfo.h>
-+#include <asm/reboot.h>
-+#include <asm/time.h>
-+#include <asm/irq.h>
-+#include <asm/io.h>
-+#include <gpio.h>
-+
-+#include <ar231x_platform.h>
-+#include <ar5312_regs.h>
-+#include <ar231x.h>
-+#include "devices.h"
-+#include "ar5312.h"
-+
-+static void
-+ar5312_misc_irq_dispatch(void)
-+{
-+	unsigned int ar231x_misc_intrs = ar231x_read_reg(AR531X_ISR) & ar231x_read_reg(AR531X_IMR);
-+
-+	if (ar231x_misc_intrs & AR531X_ISR_TIMER) {
-+		do_IRQ(AR531X_MISC_IRQ_TIMER);
-+		(void)ar231x_read_reg(AR531X_TIMER);
-+	} else if (ar231x_misc_intrs & AR531X_ISR_AHBPROC)
-+		do_IRQ(AR531X_MISC_IRQ_AHB_PROC);
-+	else if ((ar231x_misc_intrs & AR531X_ISR_UART0))
-+		do_IRQ(AR531X_MISC_IRQ_UART0);
-+	else if (ar231x_misc_intrs & AR531X_ISR_WD)
-+		do_IRQ(AR531X_MISC_IRQ_WATCHDOG);
-+	else
-+		do_IRQ(AR531X_MISC_IRQ_NONE);
-+}
-+
-+static asmlinkage void
-+ar5312_irq_dispatch(void)
-+{
-+	int pending = read_c0_status() & read_c0_cause();
-+
-+	if (pending & CAUSEF_IP2)
-+		do_IRQ(AR5312_IRQ_WLAN0_INTRS);
-+	else if (pending & CAUSEF_IP3)
-+		do_IRQ(AR5312_IRQ_ENET0_INTRS);
-+	else if (pending & CAUSEF_IP4)
-+		do_IRQ(AR5312_IRQ_ENET1_INTRS);
-+	else if (pending & CAUSEF_IP5)
-+		do_IRQ(AR5312_IRQ_WLAN1_INTRS);
-+	else if (pending & CAUSEF_IP6)
-+		ar5312_misc_irq_dispatch();
-+	else if (pending & CAUSEF_IP7)
-+		do_IRQ(AR531X_IRQ_CPU_CLOCK);
-+}
-+
-+
-+/* Enable the specified AR531X_MISC_IRQ interrupt */
-+static void
-+ar5312_misc_intr_enable(unsigned int irq)
-+{
-+	unsigned int imr;
-+
-+	imr = ar231x_read_reg(AR531X_IMR);
-+	imr |= (1 << (irq - AR531X_MISC_IRQ_BASE - 1));
-+	ar231x_write_reg(AR531X_IMR, imr);
-+}
-+
-+/* Disable the specified AR531X_MISC_IRQ interrupt */
-+static void
-+ar5312_misc_intr_disable(unsigned int irq)
-+{
-+	unsigned int imr;
-+
-+	imr = ar231x_read_reg(AR531X_IMR);
-+	imr &= ~(1 << (irq - AR531X_MISC_IRQ_BASE - 1));
-+	ar231x_write_reg(AR531X_IMR, imr);
-+	ar231x_read_reg(AR531X_IMR); /* flush write buffer */
-+}
-+
-+static void
-+ar5312_misc_intr_end(unsigned int irq)
-+{
-+	if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
-+		ar5312_misc_intr_enable(irq);
-+}
-+
-+static struct irq_chip ar5312_misc_intr_controller = {
-+	.name     = "AR5312-MISC",
-+	.disable  = ar5312_misc_intr_disable,
-+	.ack      = ar5312_misc_intr_disable,
-+	.mask_ack = ar5312_misc_intr_disable,
-+	.mask     = ar5312_misc_intr_disable,
-+	.unmask   = ar5312_misc_intr_enable,
-+	.end      = ar5312_misc_intr_end,
-+};
-+
-+
-+static irqreturn_t ar5312_ahb_proc_handler(int cpl, void *dev_id)
-+{
-+	u32 proc1 = ar231x_read_reg(AR531X_PROC1);
-+	u32 procAddr = ar231x_read_reg(AR531X_PROCADDR); /* clears error state */
-+	u32 dma1 = ar231x_read_reg(AR531X_DMA1);
-+	u32 dmaAddr = ar231x_read_reg(AR531X_DMAADDR);   /* clears error state */
-+
-+	printk("AHB interrupt: PROCADDR=0x%8.8x  PROC1=0x%8.8x  DMAADDR=0x%8.8x  DMA1=0x%8.8x\n",
-+			procAddr, proc1, dmaAddr, dma1);
-+
-+	machine_restart("AHB error"); /* Catastrophic failure */
-+	return IRQ_HANDLED;
-+}
-+
-+
-+static struct irqaction ar5312_ahb_proc_interrupt  = {
-+	.handler = ar5312_ahb_proc_handler,
-+	.flags   = IRQF_DISABLED,
-+	.name    = "ar5312_ahb_proc_interrupt",
-+};
-+
-+
-+static struct irqaction cascade  = {
-+	.handler = no_action,
-+	.flags   = IRQF_DISABLED,
-+	.name    = "cascade",
-+};
-+
-+void __init ar5312_irq_init(void)
-+{
-+	int i;
-+
-+	if (!is_5312())
-+		return;
-+
-+	ar231x_irq_dispatch = ar5312_irq_dispatch;
-+	for (i = 0; i < AR531X_MISC_IRQ_COUNT; i++) {
-+		int irq = AR531X_MISC_IRQ_BASE + i;
-+		set_irq_chip_and_handler(irq, &ar5312_misc_intr_controller,
-+			handle_level_irq);
-+	}
-+	setup_irq(AR531X_MISC_IRQ_AHB_PROC, &ar5312_ahb_proc_interrupt);
-+	setup_irq(AR5312_IRQ_MISC_INTRS, &cascade);
-+}
-+
-+const struct ar231x_gpiodev ar5312_gpiodev;
-+
-+static u32
-+ar5312_gpio_get_output(void)
-+{
-+	u32 reg;
-+	reg = ~(ar231x_read_reg(AR531X_GPIO_CR));
-+	reg &= ar5312_gpiodev.valid_mask;
-+	return reg;
-+}
-+
-+static u32
-+ar5312_gpio_set_output(u32 mask, u32 val)
-+{
-+	u32 reg;
-+
-+	reg = ar231x_read_reg(AR531X_GPIO_CR);
-+	reg |= mask;
-+	reg &= ~val;
-+	ar231x_write_reg(AR531X_GPIO_CR, reg);
-+	return reg;
-+}
-+
-+static u32
-+ar5312_gpio_get(void)
-+{
-+	u32 reg;
-+	reg = ar231x_read_reg(AR531X_GPIO_DI);
-+	reg &= ar5312_gpiodev.valid_mask;
-+	return reg;
-+}
-+
-+static u32
-+ar5312_gpio_set(u32 mask, u32 value)
-+{
-+	u32 reg;
-+	reg = ar231x_read_reg(AR531X_GPIO_DO);
-+	reg &= ~mask;
-+	reg |= value;
-+	ar231x_write_reg(AR531X_GPIO_DO, reg);
-+	return reg;
-+}
-+
-+const struct ar231x_gpiodev ar5312_gpiodev = {
-+	.valid_mask = (1 << 8) - 1,
-+	.get_output = ar5312_gpio_get_output,
-+	.set_output = ar5312_gpio_set_output,
-+	.get = ar5312_gpio_get,
-+	.set = ar5312_gpio_set,
-+};
-+
-+static struct physmap_flash_data ar5312_flash_data = {
-+	.width = 2,
-+};
-+
-+static struct resource ar5312_flash_resource = {
-+	.start = AR531X_FLASH,
-+	.end = AR531X_FLASH + 0x800000 - 1,
-+	.flags = IORESOURCE_MEM,
-+};
-+
-+static struct ar231x_eth ar5312_eth0_data = {
-+	.reset_base = AR531X_RESET,
-+	.reset_mac = AR531X_RESET_ENET0,
-+	.reset_phy = AR531X_RESET_EPHY0,
-+	.phy_base = KSEG1ADDR(AR531X_ENET0),
-+	.config = &ar231x_board,
-+};
-+
-+static struct ar231x_eth ar5312_eth1_data = {
-+	.reset_base = AR531X_RESET,
-+	.reset_mac = AR531X_RESET_ENET1,
-+	.reset_phy = AR531X_RESET_EPHY1,
-+	.phy_base = KSEG1ADDR(AR531X_ENET1),
-+	.config = &ar231x_board,
-+};
-+
-+static struct platform_device ar5312_physmap_flash = {
-+	.name = "physmap-flash",
-+	.id = 0,
-+	.dev.platform_data = &ar5312_flash_data,
-+	.resource = &ar5312_flash_resource,
-+	.num_resources = 1,
-+};
-+
-+#ifdef CONFIG_LEDS_GPIO
-+static struct gpio_led ar5312_leds[] = {
-+	{ .name = "wlan", .gpio = 0, .active_low = 1, },
-+};
-+
-+static const struct gpio_led_platform_data ar5312_led_data = {
-+	.num_leds = ARRAY_SIZE(ar5312_leds),
-+	.leds = (void *) ar5312_leds,
-+};
-+
-+static struct platform_device ar5312_gpio_leds = {
-+	.name = "leds-gpio",
-+	.id = -1,
-+	.dev.platform_data = (void *) &ar5312_led_data,
-+};
-+#endif
-+
-+/*
-+ * NB: This mapping size is larger than the actual flash size,
-+ * but this shouldn't be a problem here, because the flash
-+ * will simply be mapped multiple times.
-+ */
-+static char __init *ar5312_flash_limit(void)
-+{
-+	u32 ctl;
-+	/*
-+	 * Configure flash bank 0.
-+	 * Assume 8M window size. Flash will be aliased if it's smaller
-+	 */
-+	ctl = FLASHCTL_E |
-+		FLASHCTL_AC_8M |
-+		FLASHCTL_RBLE |
-+		(0x01 << FLASHCTL_IDCY_S) |
-+		(0x07 << FLASHCTL_WST1_S) |
-+		(0x07 << FLASHCTL_WST2_S) |
-+		(ar231x_read_reg(AR531X_FLASHCTL0) & FLASHCTL_MW);
-+
-+	ar231x_write_reg(AR531X_FLASHCTL0, ctl);
-+
-+	/* Disable other flash banks */
-+	ar231x_write_reg(AR531X_FLASHCTL1,
-+		ar231x_read_reg(AR531X_FLASHCTL1) & ~(FLASHCTL_E | FLASHCTL_AC));
-+
-+	ar231x_write_reg(AR531X_FLASHCTL2,
-+		ar231x_read_reg(AR531X_FLASHCTL2) & ~(FLASHCTL_E | FLASHCTL_AC));
-+
-+	return (char *) KSEG1ADDR(AR531X_FLASH + 0x800000);
-+}
-+
-+int __init ar5312_init_devices(void)
-+{
-+	struct ar231x_boarddata *config;
-+	u32 fctl = 0;
-+	const u8 *radio;
-+	u8 *c;
-+
-+	if (!is_5312())
-+		return 0;
-+
-+	/* Locate board/radio config data */
-+	ar231x_find_config(ar5312_flash_limit());
-+	config = ar231x_board.config;
-+
-+
-+	/*
-+	 * Chip IDs and hardware detection for some Atheros
-+	 * models are really broken!
-+	 *
-+	 * Atheros uses a disabled WMAC0 and Silicon ID of AR5312
-+	 * as indication for AR2312, which is otherwise
-+	 * indistinguishable from the real AR5312.
-+	 */
-+	if (ar231x_board.radio) {
-+		radio = ar231x_board.radio + AR531X_RADIO_MASK_OFF;
-+		if ((*((const u32 *) radio) & AR531X_RADIO0_MASK) == 0)
-+			config->flags |= BD_ISCASPER;
-+	} else
-+		radio = NULL;
-+
-+	/* AR2313 has CPU minor rev. 10 */
-+	if ((current_cpu_data.processor_id & 0xff) == 0x0a)
-+		ar231x_devtype = DEV_TYPE_AR2313;
-+
-+	/* AR2312 shares the same Silicon ID as AR5312 */
-+	else if (config->flags & BD_ISCASPER)
-+		ar231x_devtype = DEV_TYPE_AR2312;
-+
-+	/* Everything else is probably AR5312 or compatible */
-+	else
-+		ar231x_devtype = DEV_TYPE_AR5312;
-+
-+	/* fixup flash width */
-+	fctl = ar231x_read_reg(AR531X_FLASHCTL) & FLASHCTL_MW;
-+	switch (fctl) {
-+	case FLASHCTL_MWx16:
-+		ar5312_flash_data.width = 2;
-+		break;
-+	case FLASHCTL_MWx8:
-+	default:
-+		ar5312_flash_data.width = 1;
-+		break;
-+	}
-+
-+	platform_device_register(&ar5312_physmap_flash);
-+
-+#ifdef CONFIG_LEDS_GPIO
-+	ar5312_leds[0].gpio = config->sysLedGpio;
-+	platform_device_register(&ar5312_gpio_leds);
-+#endif
-+
-+	/* Fix up MAC addresses if necessary */
-+	if (!memcmp(config->enet0_mac, "\xff\xff\xff\xff\xff\xff", 6))
-+		memcpy(config->enet0_mac, config->enet1_mac, 6);
-+
-+	/* If ENET0 and ENET1 have the same mac address,
-+	 * increment the one from ENET1 */
-+	if (memcmp(config->enet0_mac, config->enet1_mac, 6) == 0) {
-+		c = config->enet1_mac + 5;
-+		while ((c >= config->enet1_mac) && !(++(*c)))
-+			c--;
-+	}
-+
-+	switch(ar231x_devtype) {
-+	case DEV_TYPE_AR5312:
-+		ar5312_eth0_data.macaddr = config->enet0_mac;
-+		ar231x_add_ethernet(0, KSEG1ADDR(AR531X_ENET0),
-+			AR5312_IRQ_ENET0_INTRS, &ar5312_eth0_data);
-+
-+		ar5312_eth1_data.macaddr = config->enet1_mac;
-+		ar231x_add_ethernet(1, KSEG1ADDR(AR531X_ENET1),
-+			AR5312_IRQ_ENET1_INTRS, &ar5312_eth1_data);
-+
-+		if (!ar231x_board.radio)
-+			return 0;
-+
-+		if (*((u32 *) radio) & AR531X_RADIO0_MASK)
-+			ar231x_add_wmac(0, AR531X_WLAN0,
-+				AR5312_IRQ_WLAN0_INTRS);
-+
-+		break;
-+	/*
-+	 * AR2312/3 ethernet uses the PHY of ENET0, but the MAC
-+	 * of ENET1. Atheros calls it 'twisted' for a reason :)
-+	 */
-+	case DEV_TYPE_AR2312:
-+	case DEV_TYPE_AR2313:
-+		ar5312_eth1_data.phy_base = ar5312_eth0_data.phy_base;
-+		ar5312_eth1_data.reset_phy = ar5312_eth0_data.reset_phy;
-+		ar5312_eth1_data.macaddr = config->enet0_mac;
-+		ar231x_add_ethernet(0, KSEG1ADDR(AR531X_ENET1),
-+			AR5312_IRQ_ENET1_INTRS, &ar5312_eth1_data);
-+
-+		if (!ar231x_board.radio)
-+			return 0;
-+		break;
-+	default:
-+		break;
-+	}
-+
-+	if (*((u32 *) radio) & AR531X_RADIO1_MASK)
-+		ar231x_add_wmac(1, AR531X_WLAN1,
-+			AR5312_IRQ_WLAN1_INTRS);
-+
-+	return 0;
-+}
-+
-+
-+static void ar5312_restart(char *command)
-+{
-+	/* reset the system */
-+	local_irq_disable();
-+	while(1) {
-+		ar231x_write_reg(AR531X_RESET, AR531X_RESET_SYSTEM);
-+	}
-+}
-+
-+
-+/*
-+ * This table is indexed by bits 5..4 of the CLOCKCTL1 register
-+ * to determine the predevisor value.
-+ */
-+static int __initdata CLOCKCTL1_PREDIVIDE_TABLE[4] = { 1, 2, 4, 5 };
-+
-+
-+static int __init
-+ar5312_cpu_frequency(void)
-+{
-+	unsigned int result;
-+	unsigned int predivide_mask, predivide_shift;
-+	unsigned int multiplier_mask, multiplier_shift;
-+	unsigned int clockCtl1, preDivideSelect, preDivisor, multiplier;
-+	unsigned int doubler_mask;
-+	u16 devid;
-+
-+	/* Trust the bootrom's idea of cpu frequency. */
-+	if ((result = ar231x_read_reg(AR5312_SCRATCH)))
-+		return result;
-+
-+	devid = ar231x_read_reg(AR531X_REV);
-+	devid &= AR531X_REV_MAJ;
-+	devid >>= AR531X_REV_MAJ_S;
-+	if (devid == AR531X_REV_MAJ_AR2313) {
-+		predivide_mask = AR2313_CLOCKCTL1_PREDIVIDE_MASK;
-+		predivide_shift = AR2313_CLOCKCTL1_PREDIVIDE_SHIFT;
-+		multiplier_mask = AR2313_CLOCKCTL1_MULTIPLIER_MASK;
-+		multiplier_shift = AR2313_CLOCKCTL1_MULTIPLIER_SHIFT;
-+		doubler_mask = AR2313_CLOCKCTL1_DOUBLER_MASK;
-+	} else { /* AR5312 and AR2312 */
-+		predivide_mask = AR5312_CLOCKCTL1_PREDIVIDE_MASK;
-+		predivide_shift = AR5312_CLOCKCTL1_PREDIVIDE_SHIFT;
-+		multiplier_mask = AR5312_CLOCKCTL1_MULTIPLIER_MASK;
-+		multiplier_shift = AR5312_CLOCKCTL1_MULTIPLIER_SHIFT;
-+		doubler_mask = AR5312_CLOCKCTL1_DOUBLER_MASK;
-+	}
-+
-+	/*
-+	 * Clocking is derived from a fixed 40MHz input clock.
-+	 *
-+	 *  cpuFreq = InputClock * MULT (where MULT is PLL multiplier)
-+	 *  sysFreq = cpuFreq / 4	   (used for APB clock, serial,
-+	 *							   flash, Timer, Watchdog Timer)
-+	 *
-+	 *  cntFreq = cpuFreq / 2	   (use for CPU count/compare)
-+	 *
-+	 * So, for example, with a PLL multiplier of 5, we have
-+	 *
-+	 *  cpuFreq = 200MHz
-+	 *  sysFreq = 50MHz
-+	 *  cntFreq = 100MHz
-+	 *
-+	 * We compute the CPU frequency, based on PLL settings.
-+	 */
-+
-+	clockCtl1 = ar231x_read_reg(AR5312_CLOCKCTL1);
-+	preDivideSelect = (clockCtl1 & predivide_mask) >> predivide_shift;
-+	preDivisor = CLOCKCTL1_PREDIVIDE_TABLE[preDivideSelect];
-+	multiplier = (clockCtl1 & multiplier_mask) >> multiplier_shift;
-+
-+	if (clockCtl1 & doubler_mask) {
-+		multiplier = multiplier << 1;
-+	}
-+	return (40000000 / preDivisor) * multiplier;
-+}
-+
-+static inline int
-+ar5312_sys_frequency(void)
-+{
-+	return ar5312_cpu_frequency() / 4;
-+}
-+
-+void __init
-+ar5312_time_init(void)
-+{
-+	if (!is_5312())
-+		return;
-+
-+	mips_hpt_frequency = ar5312_cpu_frequency() / 2;
-+}
-+
-+
-+void __init
-+ar5312_prom_init(void)
-+{
-+	u32 memsize, memcfg, bank0AC, bank1AC;
-+	u32 devid;
-+
-+	if (!is_5312())
-+		return;
-+
-+	/* Detect memory size */
-+	memcfg = ar231x_read_reg(AR531X_MEM_CFG1);
-+	bank0AC = (memcfg & MEM_CFG1_AC0) >> MEM_CFG1_AC0_S;
-+	bank1AC = (memcfg & MEM_CFG1_AC1) >> MEM_CFG1_AC1_S;
-+	memsize = (bank0AC ? (1 << (bank0AC+1)) : 0)
-+	        + (bank1AC ? (1 << (bank1AC+1)) : 0);
-+	memsize <<= 20;
-+	add_memory_region(0, memsize, BOOT_MEM_RAM);
-+
-+	devid = ar231x_read_reg(AR531X_REV);
-+	devid >>= AR531X_REV_WMAC_MIN_S;
-+	devid &= AR531X_REV_CHIP;
-+	ar231x_board.devid = (u16) devid;
-+	ar231x_gpiodev = &ar5312_gpiodev;
-+}
-+
-+void __init
-+ar5312_plat_setup(void)
-+{
-+	if (!is_5312())
-+		return;
-+
-+	/* Clear any lingering AHB errors */
-+	ar231x_read_reg(AR531X_PROCADDR);
-+	ar231x_read_reg(AR531X_DMAADDR);
-+	ar231x_write_reg(AR531X_WD_CTRL, AR531X_WD_CTRL_IGNORE_EXPIRATION);
-+
-+	_machine_restart = ar5312_restart;
-+	ar231x_serial_setup(KSEG1ADDR(AR531X_UART0), ar5312_sys_frequency());
-+}
-+
---- /dev/null
-+++ b/arch/mips/ar231x/ar2315.c
-@@ -0,0 +1,658 @@
-+/*
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License.  See the file "COPYING" in the main directory of this archive
-+ * for more details.
-+ *
-+ * Copyright (C) 2003 Atheros Communications, Inc.,  All Rights Reserved.
-+ * Copyright (C) 2006 FON Technology, SL.
-+ * Copyright (C) 2006 Imre Kaloz <kaloz@openwrt.org>
-+ * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
-+ */
-+
-+/*
-+ * Platform devices for Atheros SoCs
-+ */
-+
-+#include <generated/autoconf.h>
-+#include <linux/init.h>
-+#include <linux/module.h>
-+#include <linux/types.h>
-+#include <linux/string.h>
-+#include <linux/platform_device.h>
-+#include <linux/kernel.h>
-+#include <linux/reboot.h>
-+#include <linux/delay.h>
-+#include <linux/leds.h>
-+#include <asm/bootinfo.h>
-+#include <asm/reboot.h>
-+#include <asm/time.h>
-+#include <asm/irq.h>
-+#include <asm/io.h>
-+#include <asm/gpio.h>
-+
-+#include <ar231x_platform.h>
-+#include <ar2315_regs.h>
-+#include <ar231x.h>
-+#include "devices.h"
-+#include "ar2315.h"
-+
-+static u32 gpiointmask = 0, gpiointval = 0;
-+
-+static inline void ar2315_gpio_irq(void)
-+{
-+	u32 pend;
-+	int bit = -1;
-+
-+	/* only do one gpio interrupt at a time */
-+	pend = (ar231x_read_reg(AR2315_GPIO_DI) ^ gpiointval) & gpiointmask;
-+
-+	if (pend) {
-+		bit = fls(pend) - 1;
-+		pend &= ~(1 << bit);
-+		gpiointval ^= (1 << bit);
-+	}
-+
-+	if (!pend)
-+		ar231x_write_reg(AR2315_ISR, AR2315_ISR_GPIO);
-+
-+	/* Enable interrupt with edge detection */
-+	if ((ar231x_read_reg(AR2315_GPIO_CR) & AR2315_GPIO_CR_M(bit)) != AR2315_GPIO_CR_I(bit))
-+		return;
-+
-+	if (bit >= 0)
-+		do_IRQ(AR531X_GPIO_IRQ_BASE + bit);
-+}
-+
-+
-+/*
-+ * Called when an interrupt is received, this function
-+ * determines exactly which interrupt it was, and it
-+ * invokes the appropriate handler.
-+ *
-+ * Implicitly, we also define interrupt priority by
-+ * choosing which to dispatch first.
-+ */
-+static asmlinkage void
-+ar2315_irq_dispatch(void)
-+{
-+	int pending = read_c0_status() & read_c0_cause();
-+
-+	if (pending & CAUSEF_IP3)
-+		do_IRQ(AR2315_IRQ_WLAN0_INTRS);
-+	else if (pending & CAUSEF_IP4)
-+		do_IRQ(AR2315_IRQ_ENET0_INTRS);
-+	else if (pending & CAUSEF_IP2) {
-+		unsigned int misc_intr = ar231x_read_reg(AR2315_ISR) & ar231x_read_reg(AR2315_IMR);
-+
-+		if (misc_intr & AR2315_ISR_SPI)
-+			do_IRQ(AR531X_MISC_IRQ_SPI);
-+		else if (misc_intr & AR2315_ISR_TIMER)
-+			do_IRQ(AR531X_MISC_IRQ_TIMER);
-+		else if (misc_intr & AR2315_ISR_AHB)
-+			do_IRQ(AR531X_MISC_IRQ_AHB_PROC);
-+		else if (misc_intr & AR2315_ISR_GPIO)
-+			ar2315_gpio_irq();
-+		else if (misc_intr & AR2315_ISR_UART0)
-+			do_IRQ(AR531X_MISC_IRQ_UART0);
-+		else if (misc_intr & AR2315_ISR_WD)
-+			do_IRQ(AR531X_MISC_IRQ_WATCHDOG);
-+		else
-+			do_IRQ(AR531X_MISC_IRQ_NONE);
-+	} else if (pending & CAUSEF_IP7)
-+		do_IRQ(AR531X_IRQ_CPU_CLOCK);
-+}
-+
-+static void ar2315_set_gpiointmask(int gpio, int level)
-+{
-+	u32 reg;
-+
-+	reg = ar231x_read_reg(AR2315_GPIO_INT);
-+	reg &= ~(AR2315_GPIO_INT_M | AR2315_GPIO_INT_LVL_M);
-+	reg |= gpio | AR2315_GPIO_INT_LVL(level);
-+	ar231x_write_reg(AR2315_GPIO_INT, reg);
-+}
-+
-+static void ar2315_gpio_intr_enable(unsigned int irq)
-+{
-+	unsigned int gpio = irq - AR531X_GPIO_IRQ_BASE;
-+
-+	/* Enable interrupt with edge detection */
-+	if ((ar231x_read_reg(AR2315_GPIO_CR) & AR2315_GPIO_CR_M(gpio)) != AR2315_GPIO_CR_I(gpio))
-+		return;
-+
-+	gpiointmask |= (1 << gpio);
-+	ar2315_set_gpiointmask(gpio, 3);
-+}
-+
-+static unsigned int ar2315_gpio_intr_startup(unsigned int irq)
-+{
-+	unsigned int gpio = irq - AR531X_GPIO_IRQ_BASE;
-+
-+	/* reconfigure GPIO line as input */
-+	ar231x_mask_reg(AR2315_GPIO_CR, AR2315_GPIO_CR_M(gpio), AR2315_GPIO_CR_I(gpio));
-+	ar2315_gpio_intr_enable(irq);
-+	return 0;
-+}
-+
-+static void ar2315_gpio_intr_disable(unsigned int irq)
-+{
-+	unsigned int gpio = irq - AR531X_GPIO_IRQ_BASE;
-+
-+	/* Disable interrupt */
-+	gpiointmask &= ~(1 << gpio);
-+	ar2315_set_gpiointmask(gpio, 0);
-+}
-+
-+static void
-+ar2315_gpio_intr_end(unsigned int irq)
-+{
-+	if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
-+		ar2315_gpio_intr_enable(irq);
-+}
-+
-+static struct irq_chip ar2315_gpio_intr_controller = {
-+	.typename	= "AR2315-GPIO",
-+	.startup  = ar2315_gpio_intr_startup,
-+	.ack      = ar2315_gpio_intr_disable,
-+	.mask_ack = ar2315_gpio_intr_disable,
-+	.mask     = ar2315_gpio_intr_disable,
-+	.unmask   = ar2315_gpio_intr_enable,
-+	.end      = ar2315_gpio_intr_end,
-+};
-+
-+static void
-+ar2315_misc_intr_enable(unsigned int irq)
-+{
-+	unsigned int imr;
-+
-+	imr = ar231x_read_reg(AR2315_IMR);
-+	switch(irq) {
-+	case AR531X_MISC_IRQ_SPI:
-+		 imr |= AR2315_ISR_SPI;
-+		 break;
-+	case AR531X_MISC_IRQ_TIMER:
-+	     imr |= AR2315_ISR_TIMER;
-+	     break;
-+	case AR531X_MISC_IRQ_AHB_PROC:
-+	     imr |= AR2315_ISR_AHB;
-+	     break;
-+	case AR531X_MISC_IRQ_GPIO:
-+	     imr |= AR2315_ISR_GPIO;
-+	     break;
-+	case AR531X_MISC_IRQ_UART0:
-+	     imr |= AR2315_ISR_UART0;
-+	     break;
-+	case AR531X_MISC_IRQ_WATCHDOG:
-+	     imr |= AR2315_ISR_WD;
-+	     break;
-+	default:
-+		break;
-+	}
-+	ar231x_write_reg(AR2315_IMR, imr);
-+}
-+
-+static void
-+ar2315_misc_intr_disable(unsigned int irq)
-+{
-+	unsigned int imr;
-+
-+	imr = ar231x_read_reg(AR2315_IMR);
-+	switch(irq) {
-+	case AR531X_MISC_IRQ_SPI:
-+		 imr &= ~AR2315_ISR_SPI;
-+		 break;
-+	case AR531X_MISC_IRQ_TIMER:
-+	     imr &= ~AR2315_ISR_TIMER;
-+	     break;
-+	case AR531X_MISC_IRQ_AHB_PROC:
-+	     imr &= ~AR2315_ISR_AHB;
-+	     break;
-+	case AR531X_MISC_IRQ_GPIO:
-+	     imr &= ~AR2315_ISR_GPIO;
-+	     break;
-+	case AR531X_MISC_IRQ_UART0:
-+	     imr &= ~AR2315_ISR_UART0;
-+	     break;
-+	case AR531X_MISC_IRQ_WATCHDOG:
-+	     imr &= ~AR2315_ISR_WD;
-+	     break;
-+	default:
-+		break;
-+	}
-+	ar231x_write_reg(AR2315_IMR, imr);
-+}
-+
-+static void
-+ar2315_misc_intr_end(unsigned int irq)
-+{
-+	if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
-+		ar2315_misc_intr_enable(irq);
-+}
-+
-+
-+static struct irq_chip ar2315_misc_intr_controller = {
-+	.typename	= "AR2315-MISC",
-+	.ack      = ar2315_misc_intr_disable,
-+	.mask_ack = ar2315_misc_intr_disable,
-+	.mask     = ar2315_misc_intr_disable,
-+	.unmask   = ar2315_misc_intr_enable,
-+	.end      = ar2315_misc_intr_end,
-+};
-+
-+static irqreturn_t ar2315_ahb_proc_handler(int cpl, void *dev_id)
-+{
-+    ar231x_write_reg(AR2315_AHB_ERR0, AHB_ERROR_DET);
-+    ar231x_read_reg(AR2315_AHB_ERR1);
-+
-+    printk(KERN_ERR "AHB fatal error\n");
-+    machine_restart("AHB error"); /* Catastrophic failure */
-+
-+    return IRQ_HANDLED;
-+}
-+
-+static struct irqaction ar2315_ahb_proc_interrupt  = {
-+	.handler	= ar2315_ahb_proc_handler,
-+	.flags		= IRQF_DISABLED,
-+	.name		= "ar2315_ahb_proc_interrupt",
-+};
-+
-+static struct irqaction cascade  = {
-+	.handler	= no_action,
-+	.flags		= IRQF_DISABLED,
-+	.name		= "cascade",
-+};
-+
-+void
-+ar2315_irq_init(void)
-+{
-+	int i;
-+
-+	if (!is_2315())
-+		return;
-+
-+	ar231x_irq_dispatch = ar2315_irq_dispatch;
-+	gpiointval = ar231x_read_reg(AR2315_GPIO_DI);
-+	for (i = 0; i < AR531X_MISC_IRQ_COUNT; i++) {
-+		int irq = AR531X_MISC_IRQ_BASE + i;
-+		set_irq_chip_and_handler(irq, &ar2315_misc_intr_controller,
-+			handle_level_irq);
-+	}
-+	for (i = 0; i < AR531X_GPIO_IRQ_COUNT; i++) {
-+		int irq = AR531X_GPIO_IRQ_BASE + i;
-+		set_irq_chip_and_handler(irq, &ar2315_gpio_intr_controller,
-+			handle_level_irq);
-+	}
-+	setup_irq(AR531X_MISC_IRQ_GPIO, &cascade);
-+	setup_irq(AR531X_MISC_IRQ_AHB_PROC, &ar2315_ahb_proc_interrupt);
-+	setup_irq(AR2315_IRQ_MISC_INTRS, &cascade);
-+}
-+
-+const struct ar231x_gpiodev ar2315_gpiodev;
-+
-+static u32
-+ar2315_gpio_get_output(void)
-+{
-+	u32 reg;
-+	reg = ar231x_read_reg(AR2315_GPIO_CR);
-+	reg &= ar2315_gpiodev.valid_mask;
-+	return reg;
-+}
-+
-+static u32
-+ar2315_gpio_set_output(u32 mask, u32 val)
-+{
-+	u32 reg;
-+
-+	reg = ar231x_read_reg(AR2315_GPIO_CR);
-+	reg &= ~mask;
-+	reg |= val;
-+	ar231x_write_reg(AR2315_GPIO_CR, reg);
-+	return reg;
-+}
-+
-+static u32
-+ar2315_gpio_get(void)
-+{
-+	u32 reg;
-+	reg = ar231x_read_reg(AR2315_GPIO_DI);
-+	reg &= ar2315_gpiodev.valid_mask;
-+	return reg;
-+}
-+
-+static u32
-+ar2315_gpio_set(u32 mask, u32 value)
-+{
-+	u32 reg;
-+	reg = ar231x_read_reg(AR2315_GPIO_DO);
-+	reg &= ~mask;
-+	reg |= value;
-+	ar231x_write_reg(AR2315_GPIO_DO, reg);
-+	return reg;
-+}
-+
-+const struct ar231x_gpiodev ar2315_gpiodev = {
-+	.valid_mask = (1 << 22) - 1,
-+	.get_output = ar2315_gpio_get_output,
-+	.set_output = ar2315_gpio_set_output,
-+	.get = ar2315_gpio_get,
-+	.set = ar2315_gpio_set,
-+};
-+
-+static struct ar231x_eth ar2315_eth_data = {
-+	.reset_base = AR2315_RESET,
-+	.reset_mac = AR2315_RESET_ENET0,
-+	.reset_phy = AR2315_RESET_EPHY0,
-+	.phy_base = AR2315_ENET0,
-+	.config = &ar231x_board,
-+};
-+
-+static struct resource ar2315_spiflash_res[] = {
-+	{
-+		.name = "flash_base",
-+		.flags = IORESOURCE_MEM,
-+		.start = KSEG1ADDR(AR2315_SPI_READ),
-+		.end = KSEG1ADDR(AR2315_SPI_READ) + 0x1000000 - 1,
-+	},
-+	{
-+		.name = "flash_regs",
-+		.flags = IORESOURCE_MEM,
-+		.start = 0x11300000,
-+		.end = 0x11300012,
-+	},
-+};
-+
-+static struct platform_device ar2315_spiflash = {
-+	.id = 0,
-+	.name = "spiflash",
-+	.resource = ar2315_spiflash_res,
-+	.num_resources = ARRAY_SIZE(ar2315_spiflash_res)
-+};
-+
-+static struct platform_device ar2315_wdt = {
-+	.id = 0,
-+	.name = "ar2315_wdt",
-+};
-+
-+#define SPI_FLASH_CTL      0x00
-+#define SPI_FLASH_OPCODE   0x04
-+#define SPI_FLASH_DATA     0x08
-+
-+static inline u32
-+spiflash_read_reg(int reg)
-+{
-+	return ar231x_read_reg(KSEG1ADDR(AR2315_SPI) + reg);
-+}
-+
-+static inline void
-+spiflash_write_reg(int reg, u32 data)
-+{
-+	ar231x_write_reg(KSEG1ADDR(AR2315_SPI) + reg, data);
-+}
-+
-+static u32
-+spiflash_wait_status(void)
-+{
-+	u32 reg;
-+
-+	do {
-+		reg = spiflash_read_reg(SPI_FLASH_CTL);
-+	} while (reg & SPI_CTL_BUSY);
-+
-+	return reg;
-+}
-+
-+static u8
-+spiflash_probe(void)
-+{
-+	u32 reg;
-+
-+	reg = spiflash_wait_status();
-+	reg &= ~SPI_CTL_TX_RX_CNT_MASK;
-+	reg |= (1 << 4) | 4 | SPI_CTL_START;
-+
-+	spiflash_write_reg(SPI_FLASH_OPCODE, 0xab);
-+	spiflash_write_reg(SPI_FLASH_CTL, reg);
-+
-+	reg = spiflash_wait_status();
-+	reg = spiflash_read_reg(SPI_FLASH_DATA);
-+	reg &= 0xff;
-+
-+	return (u8) reg;
-+}
-+
-+
-+#define STM_8MBIT_SIGNATURE     0x13
-+#define STM_16MBIT_SIGNATURE    0x14
-+#define STM_32MBIT_SIGNATURE    0x15
-+#define STM_64MBIT_SIGNATURE    0x16
-+#define STM_128MBIT_SIGNATURE   0x17
-+
-+static u8 __init *
-+ar2315_flash_limit(void)
-+{
-+	u32 flash_size = 0;
-+
-+	/* probe the flash chip size */
-+	switch(spiflash_probe()) {
-+		case STM_8MBIT_SIGNATURE:
-+			flash_size = 0x00100000;
-+			break;
-+		case STM_16MBIT_SIGNATURE:
-+			flash_size = 0x00200000;
-+			break;
-+		case STM_32MBIT_SIGNATURE:
-+			flash_size = 0x00400000;
-+			break;
-+		case STM_64MBIT_SIGNATURE:
-+			flash_size = 0x00800000;
-+			break;
-+		case STM_128MBIT_SIGNATURE:
-+			flash_size = 0x01000000;
-+			break;
-+	}
-+
-+	ar2315_spiflash_res[0].end = ar2315_spiflash_res[0].start +
-+		flash_size - 1;
-+	return (u8 *) ar2315_spiflash_res[0].end + 1;
-+}
-+
-+#ifdef CONFIG_LEDS_GPIO
-+static struct gpio_led ar2315_leds[6];
-+static struct gpio_led_platform_data ar2315_led_data = {
-+	.leds = (void *) ar2315_leds,
-+};
-+
-+static struct platform_device ar2315_gpio_leds = {
-+	.name = "leds-gpio",
-+	.id = -1,
-+	.dev = {
-+		.platform_data = (void *) &ar2315_led_data,
-+	}
-+};
-+
-+static void __init
-+ar2315_init_gpio(void)
-+{
-+	static char led_names[6][6];
-+	int i, led = 0;
-+
-+	ar2315_led_data.num_leds = 0;
-+	for(i = 1; i < 8; i++)
-+	{
-+		if((i == AR2315_RESET_GPIO) ||
-+		   (i == ar231x_board.config->resetConfigGpio))
-+			continue;
-+
-+		if(i == ar231x_board.config->sysLedGpio)
-+			strcpy(led_names[led], "wlan");
-+		else
-+			sprintf(led_names[led], "gpio%d", i);
-+
-+		ar2315_leds[led].name = led_names[led];
-+		ar2315_leds[led].gpio = i;
-+		ar2315_leds[led].active_low = 0;
-+		led++;
-+	}
-+	ar2315_led_data.num_leds = led;
-+	platform_device_register(&ar2315_gpio_leds);
-+}
-+#else
-+static inline void ar2315_init_gpio(void)
-+{
-+}
-+#endif
-+
-+int __init
-+ar2315_init_devices(void)
-+{
-+	if (!is_2315())
-+		return 0;
-+
-+	/* Find board configuration */
-+	ar231x_find_config(ar2315_flash_limit());
-+	ar2315_eth_data.macaddr = ar231x_board.config->enet0_mac;
-+
-+	ar2315_init_gpio();
-+	platform_device_register(&ar2315_wdt);
-+	platform_device_register(&ar2315_spiflash);
-+	ar231x_add_ethernet(0, AR2315_ENET0, AR2315_IRQ_ENET0_INTRS,
-+		&ar2315_eth_data);
-+	ar231x_add_wmac(0, AR2315_WLAN0, AR2315_IRQ_WLAN0_INTRS);
-+
-+	return 0;
-+}
-+
-+static void
-+ar2315_restart(char *command)
-+{
-+	void (*mips_reset_vec)(void) = (void *) 0xbfc00000;
-+
-+	local_irq_disable();
-+
-+	/* try reset the system via reset control */
-+	ar231x_write_reg(AR2315_COLD_RESET,AR2317_RESET_SYSTEM);
-+
-+	/* Cold reset does not work on the AR2315/6, use the GPIO reset bits a workaround.
-+	 * give it some time to attempt a gpio based hardware reset
-+	 * (atheros reference design workaround) */
-+	gpio_direction_output(AR2315_RESET_GPIO, 0);
-+	mdelay(100);
-+
-+	/* Some boards (e.g. Senao EOC-2610) don't implement the reset logic
-+	 * workaround. Attempt to jump to the mips reset location -
-+	 * the boot loader itself might be able to recover the system */
-+	mips_reset_vec();
-+}
-+
-+
-+/*
-+ * This table is indexed by bits 5..4 of the CLOCKCTL1 register
-+ * to determine the predevisor value.
-+ */
-+static int __initdata CLOCKCTL1_PREDIVIDE_TABLE[4] = { 1, 2, 4, 5 };
-+static int __initdata PLLC_DIVIDE_TABLE[5] = { 2, 3, 4, 6, 3 };
-+
-+static unsigned int __init
-+ar2315_sys_clk(unsigned int clockCtl)
-+{
-+    unsigned int pllcCtrl,cpuDiv;
-+    unsigned int pllcOut,refdiv,fdiv,divby2;
-+	unsigned int clkDiv;
-+
-+    pllcCtrl = ar231x_read_reg(AR2315_PLLC_CTL);
-+    refdiv = (pllcCtrl & PLLC_REF_DIV_M) >> PLLC_REF_DIV_S;
-+    refdiv = CLOCKCTL1_PREDIVIDE_TABLE[refdiv];
-+    fdiv = (pllcCtrl & PLLC_FDBACK_DIV_M) >> PLLC_FDBACK_DIV_S;
-+    divby2 = (pllcCtrl & PLLC_ADD_FDBACK_DIV_M) >> PLLC_ADD_FDBACK_DIV_S;
-+    divby2 += 1;
-+    pllcOut = (40000000/refdiv)*(2*divby2)*fdiv;
-+
-+
-+    /* clkm input selected */
-+	switch(clockCtl & CPUCLK_CLK_SEL_M) {
-+		case 0:
-+		case 1:
-+			clkDiv = PLLC_DIVIDE_TABLE[(pllcCtrl & PLLC_CLKM_DIV_M) >> PLLC_CLKM_DIV_S];
-+			break;
-+		case 2:
-+			clkDiv = PLLC_DIVIDE_TABLE[(pllcCtrl & PLLC_CLKC_DIV_M) >> PLLC_CLKC_DIV_S];
-+			break;
-+		default:
-+			pllcOut = 40000000;
-+			clkDiv = 1;
-+			break;
-+	}
-+	cpuDiv = (clockCtl & CPUCLK_CLK_DIV_M) >> CPUCLK_CLK_DIV_S;
-+	cpuDiv = cpuDiv * 2 ?: 1;
-+	return (pllcOut/(clkDiv * cpuDiv));
-+}
-+
-+static inline unsigned int
-+ar2315_cpu_frequency(void)
-+{
-+    return ar2315_sys_clk(ar231x_read_reg(AR2315_CPUCLK));
-+}
-+
-+static inline unsigned int
-+ar2315_apb_frequency(void)
-+{
-+    return ar2315_sys_clk(ar231x_read_reg(AR2315_AMBACLK));
-+}
-+
-+void __init
-+ar2315_time_init(void)
-+{
-+	if (!is_2315())
-+		return;
-+
-+	mips_hpt_frequency = ar2315_cpu_frequency() / 2;
-+}
-+
-+void __init
-+ar2315_prom_init(void)
-+{
-+	u32 memsize, memcfg, devid;
-+
-+	if (!is_2315())
-+		return;
-+
-+	memcfg = ar231x_read_reg(AR2315_MEM_CFG);
-+	memsize   = 1 + ((memcfg & SDRAM_DATA_WIDTH_M) >> SDRAM_DATA_WIDTH_S);
-+	memsize <<= 1 + ((memcfg & SDRAM_COL_WIDTH_M) >> SDRAM_COL_WIDTH_S);
-+	memsize <<= 1 + ((memcfg & SDRAM_ROW_WIDTH_M) >> SDRAM_ROW_WIDTH_S);
-+	memsize <<= 3;
-+	add_memory_region(0, memsize, BOOT_MEM_RAM);
-+
-+	/* Detect the hardware based on the device ID */
-+	devid = ar231x_read_reg(AR2315_SREV) & AR2315_REV_CHIP;
-+	switch(devid) {
-+		case 0x90:
-+		case 0x91:
-+			ar231x_devtype = DEV_TYPE_AR2317;
-+			break;
-+		default:
-+			ar231x_devtype = DEV_TYPE_AR2315;
-+			break;
-+	}
-+	ar231x_gpiodev = &ar2315_gpiodev;
-+	ar231x_board.devid = devid;
-+}
-+
-+void __init
-+ar2315_plat_setup(void)
-+{
-+	u32 config;
-+
-+	if (!is_2315())
-+		return;
-+
-+	/* Clear any lingering AHB errors */
-+	config = read_c0_config();
-+	write_c0_config(config & ~0x3);
-+	ar231x_write_reg(AR2315_AHB_ERR0,AHB_ERROR_DET);
-+	ar231x_read_reg(AR2315_AHB_ERR1);
-+	ar231x_write_reg(AR2315_WDC, AR2315_WDC_IGNORE_EXPIRATION);
-+
-+	_machine_restart = ar2315_restart;
-+	ar231x_serial_setup(KSEG1ADDR(AR2315_UART0), ar2315_apb_frequency());
-+}
---- /dev/null
-+++ b/arch/mips/ar231x/ar2315.h
-@@ -0,0 +1,37 @@
-+#ifndef __AR2315_H
-+#define __AR2315_H
-+
-+#ifdef CONFIG_ATHEROS_AR2315
-+
-+extern void ar2315_irq_init(void);
-+extern int ar2315_init_devices(void);
-+extern void ar2315_prom_init(void);
-+extern void ar2315_plat_setup(void);
-+extern void ar2315_time_init(void);
-+
-+#else
-+
-+static inline void ar2315_irq_init(void)
-+{
-+}
-+
-+static inline int ar2315_init_devices(void)
-+{
-+	return 0;
-+}
-+
-+static inline void ar2315_prom_init(void)
-+{
-+}
-+
-+static inline void ar2315_plat_setup(void)
-+{
-+}
-+
-+static inline void ar2315_time_init(void)
-+{
-+}
-+
-+#endif
-+
-+#endif
---- /dev/null
-+++ b/arch/mips/ar231x/ar5312.h
-@@ -0,0 +1,38 @@
-+#ifndef __AR5312_H
-+#define __AR5312_H
-+
-+#ifdef CONFIG_ATHEROS_AR5312
-+
-+extern void ar5312_irq_init(void);
-+extern int ar5312_init_devices(void);
-+extern void ar5312_prom_init(void);
-+extern void ar5312_plat_setup(void);
-+extern void ar5312_time_init(void);
-+extern void ar5312_time_init(void);
-+
-+#else
-+
-+static inline void ar5312_irq_init(void)
-+{
-+}
-+
-+static inline int ar5312_init_devices(void)
-+{
-+	return 0;
-+}
-+
-+static inline void ar5312_prom_init(void)
-+{
-+}
-+
-+static inline void ar5312_plat_setup(void)
-+{
-+}
-+
-+static inline void ar5312_time_init(void)
-+{
-+}
-+
-+#endif
-+
-+#endif
---- /dev/null
-+++ b/arch/mips/include/asm/mach-ar231x/ar231x.h
-@@ -0,0 +1,54 @@
-+#ifndef __AR531X_H
-+#define __AR531X_H
-+
-+#define AR531X_MISC_IRQ_BASE		0x20
-+#define AR531X_GPIO_IRQ_BASE		0x30
-+
-+/* Software's idea of interrupts handled by "CPU Interrupt Controller" */
-+#define AR531X_IRQ_NONE		MIPS_CPU_IRQ_BASE+0
-+#define AR531X_IRQ_CPU_CLOCK	MIPS_CPU_IRQ_BASE+7 /* C0_CAUSE: 0x8000 */
-+
-+/* Miscellaneous interrupts, which share IP6 */
-+#define AR531X_MISC_IRQ_NONE		AR531X_MISC_IRQ_BASE+0
-+#define AR531X_MISC_IRQ_TIMER		AR531X_MISC_IRQ_BASE+1
-+#define AR531X_MISC_IRQ_AHB_PROC	AR531X_MISC_IRQ_BASE+2
-+#define AR531X_MISC_IRQ_AHB_DMA		AR531X_MISC_IRQ_BASE+3
-+#define AR531X_MISC_IRQ_GPIO		AR531X_MISC_IRQ_BASE+4
-+#define AR531X_MISC_IRQ_UART0		AR531X_MISC_IRQ_BASE+5
-+#define AR531X_MISC_IRQ_UART0_DMA	AR531X_MISC_IRQ_BASE+6
-+#define AR531X_MISC_IRQ_WATCHDOG	AR531X_MISC_IRQ_BASE+7
-+#define AR531X_MISC_IRQ_LOCAL		AR531X_MISC_IRQ_BASE+8
-+#define AR531X_MISC_IRQ_SPI 		AR531X_MISC_IRQ_BASE+9
-+#define AR531X_MISC_IRQ_COUNT		10
-+
-+/* GPIO Interrupts [0..7], share AR531X_MISC_IRQ_GPIO */
-+#define AR531X_GPIO_IRQ_NONE            AR531X_GPIO_IRQ_BASE+0
-+#define AR531X_GPIO_IRQ(n)              AR531X_GPIO_IRQ_BASE+n
-+#define AR531X_GPIO_IRQ_COUNT           22
-+
-+static inline u32
-+ar231x_read_reg(u32 reg)
-+{
-+	return __raw_readl((u32 *) KSEG1ADDR(reg));
-+}
-+
-+static inline void
-+ar231x_write_reg(u32 reg, u32 val)
-+{
-+	__raw_writel(val, (u32 *) KSEG1ADDR(reg));
-+}
-+
-+static inline u32
-+ar231x_mask_reg(u32 reg, u32 mask, u32 val)
-+{
-+	u32 ret;
-+
-+	ret = ar231x_read_reg(reg);
-+	ret &= ~mask;
-+	ret |= val;
-+	ar231x_write_reg(reg, ret);
-+
-+	return ret;
-+}
-+
-+#endif
---- /dev/null
-+++ b/arch/mips/ar231x/devices.h
-@@ -0,0 +1,37 @@
-+#ifndef __AR231X_DEVICES_H
-+#define __AR231X_DEVICES_H
-+
-+enum {
-+	/* handled by ar5312.c */
-+	DEV_TYPE_AR2312,
-+	DEV_TYPE_AR2313,
-+	DEV_TYPE_AR5312,
-+
-+	/* handled by ar2315.c */
-+	DEV_TYPE_AR2315,
-+	DEV_TYPE_AR2316,
-+	DEV_TYPE_AR2317,
-+
-+	DEV_TYPE_UNKNOWN
-+};
-+
-+extern int ar231x_devtype;
-+extern struct ar231x_board_config ar231x_board;
-+extern asmlinkage void (*ar231x_irq_dispatch)(void);
-+
-+extern int ar231x_find_config(u8 *flash_limit);
-+extern void ar231x_serial_setup(u32 mapbase, unsigned int uartclk);
-+extern int ar231x_add_wmac(int nr, u32 base, int irq);
-+extern int ar231x_add_ethernet(int nr, u32 base, int irq, void *pdata);
-+
-+static inline bool is_2315(void)
-+{
-+	return (current_cpu_data.cputype == CPU_4KEC);
-+}
-+
-+static inline bool is_5312(void)
-+{
-+	return !is_2315();
-+}
-+
-+#endif
---- /dev/null
-+++ b/arch/mips/ar231x/devices.c
-@@ -0,0 +1,175 @@
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/serial.h>
-+#include <linux/serial_core.h>
-+#include <linux/serial_8250.h>
-+#include <linux/platform_device.h>
-+#include <ar231x_platform.h>
-+#include <ar231x.h>
-+#include "devices.h"
-+#include "ar5312.h"
-+#include "ar2315.h"
-+
-+struct ar231x_board_config ar231x_board;
-+int ar231x_devtype = DEV_TYPE_UNKNOWN;
-+const struct ar231x_gpiodev *ar231x_gpiodev;
-+EXPORT_SYMBOL(ar231x_gpiodev);
-+
-+static struct resource ar231x_eth0_res[] = {
-+	{
-+		.name = "eth0_membase",
-+		.flags = IORESOURCE_MEM,
-+	},
-+	{
-+		.name = "eth0_irq",
-+		.flags = IORESOURCE_IRQ,
-+	}
-+};
-+
-+static struct resource ar231x_eth1_res[] = {
-+	{
-+		.name = "eth1_membase",
-+		.flags = IORESOURCE_MEM,
-+	},
-+	{
-+		.name = "eth1_irq",
-+		.flags = IORESOURCE_IRQ,
-+	}
-+};
-+
-+static struct platform_device ar231x_eth[] = {
-+	{
-+		.id = 0,
-+		.name = "ar231x-eth",
-+		.resource = ar231x_eth0_res,
-+		.num_resources = ARRAY_SIZE(ar231x_eth0_res)
-+	},
-+	{
-+		.id = 1,
-+		.name = "ar231x-eth",
-+		.resource = ar231x_eth1_res,
-+		.num_resources = ARRAY_SIZE(ar231x_eth1_res)
-+	}
-+};
-+
-+static struct resource ar231x_wmac0_res[] = {
-+	{
-+		.name = "wmac0_membase",
-+		.flags = IORESOURCE_MEM,
-+	},
-+	{
-+		.name = "wmac0_irq",
-+		.flags = IORESOURCE_IRQ,
-+	}
-+};
-+
-+static struct resource ar231x_wmac1_res[] = {
-+	{
-+		.name = "wmac1_membase",
-+		.flags = IORESOURCE_MEM,
-+	},
-+	{
-+		.name = "wmac1_irq",
-+		.flags = IORESOURCE_IRQ,
-+	}
-+};
-+
-+
-+static struct platform_device ar231x_wmac[] = {
-+	{
-+		.id = 0,
-+		.name = "ar231x-wmac",
-+		.resource = ar231x_wmac0_res,
-+		.num_resources = ARRAY_SIZE(ar231x_wmac0_res),
-+		.dev.platform_data = &ar231x_board,
-+	},
-+	{
-+		.id = 1,
-+		.name = "ar231x-wmac",
-+		.resource = ar231x_wmac1_res,
-+		.num_resources = ARRAY_SIZE(ar231x_wmac1_res),
-+		.dev.platform_data = &ar231x_board,
-+	},
-+};
-+
-+static const char *devtype_strings[] = {
-+	[DEV_TYPE_AR5312] = "Atheros AR5312",
-+	[DEV_TYPE_AR2312] = "Atheros AR2312",
-+	[DEV_TYPE_AR2313] = "Atheros AR2313",
-+	[DEV_TYPE_AR2315] = "Atheros AR2315",
-+	[DEV_TYPE_AR2316] = "Atheros AR2316",
-+	[DEV_TYPE_AR2317] = "Atheros AR2317",
-+	[DEV_TYPE_UNKNOWN] = "Atheros (unknown)",
-+};
-+
-+const char *get_system_type(void)
-+{
-+	if ((ar231x_devtype >= ARRAY_SIZE(devtype_strings)) ||
-+		!devtype_strings[ar231x_devtype])
-+		return devtype_strings[DEV_TYPE_UNKNOWN];
-+	return devtype_strings[ar231x_devtype];
-+}
-+
-+
-+int __init
-+ar231x_add_ethernet(int nr, u32 base, int irq, void *pdata)
-+{
-+	struct resource *res;
-+
-+	ar231x_eth[nr].dev.platform_data = pdata;
-+	res = &ar231x_eth[nr].resource[0];
-+	res->start = base;
-+	res->end = base + 0x2000 - 1;
-+	res++;
-+	res->start = irq;
-+	res->end = irq;
-+	return platform_device_register(&ar231x_eth[nr]);
-+}
-+
-+void __init
-+ar231x_serial_setup(u32 mapbase, unsigned int uartclk)
-+{
-+	struct uart_port s;
-+
-+	memset(&s, 0, sizeof(s));
-+
-+	s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
-+	s.iotype = UPIO_MEM;
-+	s.irq = AR531X_MISC_IRQ_UART0;
-+	s.regshift = 2;
-+	s.mapbase = mapbase;
-+	s.uartclk = uartclk;
-+	s.membase = (void __iomem *)s.mapbase;
-+
-+	early_serial_setup(&s);
-+}
-+
-+int __init
-+ar231x_add_wmac(int nr, u32 base, int irq)
-+{
-+	struct resource *res;
-+
-+	ar231x_wmac[nr].dev.platform_data = &ar231x_board;
-+	res = &ar231x_wmac[nr].resource[0];
-+	res->start = base;
-+	res->end = base + 0x10000 - 1;
-+	res++;
-+	res->start = irq;
-+	res->end = irq;
-+	return platform_device_register(&ar231x_wmac[nr]);
-+}
-+
-+static int __init ar231x_register_devices(void)
-+{
-+	static struct resource res = {
-+		.start = 0xFFFFFFFF,
-+	};
-+
-+	platform_device_register_simple("GPIODEV", 0, &res, 1);
-+	ar5312_init_devices();
-+	ar2315_init_devices();
-+
-+	return 0;
-+}
-+
-+device_initcall(ar231x_register_devices);
diff --git a/target/linux/atheros/patches-2.6.33/101-early-printk-support.patch b/target/linux/atheros/patches-2.6.33/101-early-printk-support.patch
deleted file mode 100644
index 8feec4c67..000000000
--- a/target/linux/atheros/patches-2.6.33/101-early-printk-support.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- /dev/null
-+++ b/arch/mips/ar231x/early_printk.c
-@@ -0,0 +1,44 @@
-+/*
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License.  See the file "COPYING" in the main directory of this archive
-+ * for more details.
-+ *
-+ * Copyright (C) 2010 Gabor Juhos <juhosg@openwrt.org>
-+ */
-+
-+#include <linux/mm.h>
-+#include <linux/io.h>
-+#include <linux/serial_reg.h>
-+#include <asm/addrspace.h>
-+
-+#include <asm/mach-ar231x/ar2315_regs.h>
-+#include <asm/mach-ar231x/ar5312_regs.h>
-+#include "devices.h"
-+
-+static inline void prom_uart_wr(void __iomem *base, unsigned reg,
-+				unsigned char ch)
-+{
-+	__raw_writeb(ch, base + 4 * reg);
-+}
-+
-+static inline unsigned char prom_uart_rr(void __iomem *base, unsigned reg)
-+{
-+	return __raw_readb(base + 4 * reg);
-+}
-+
-+void prom_putchar(unsigned char ch)
-+{
-+	static void __iomem *base;
-+
-+	if (unlikely(base == NULL)) {
-+		if (is_2315())
-+			base = (void __iomem *)(KSEG1ADDR(AR2315_UART0));
-+		else
-+			base = (void __iomem *)(KSEG1ADDR(AR531X_UART0));
-+	}
-+
-+	while ((prom_uart_rr(base, UART_LSR) & UART_LSR_THRE) == 0);
-+	prom_uart_wr(base, UART_TX, ch);
-+	while ((prom_uart_rr(base, UART_LSR) & UART_LSR_THRE) == 0);
-+}
-+
---- a/arch/mips/ar231x/Makefile
-+++ b/arch/mips/ar231x/Makefile
-@@ -9,5 +9,8 @@
- #
- 
- obj-y += board.o prom.o devices.o
-+
-+obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
-+
- obj-$(CONFIG_ATHEROS_AR5312) += ar5312.o
- obj-$(CONFIG_ATHEROS_AR2315) += ar2315.o
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -94,6 +94,7 @@ config ATHEROS_AR231X
- 	select SYS_SUPPORTS_BIG_ENDIAN
- 	select SYS_SUPPORTS_32BIT_KERNEL
- 	select GENERIC_GPIO
-+	select SYS_HAS_EARLY_PRINTK
- 	help
- 	  Support for AR231x and AR531x based boards
- 
diff --git a/target/linux/atheros/patches-2.6.33/105-ar2315_pci.patch b/target/linux/atheros/patches-2.6.33/105-ar2315_pci.patch
deleted file mode 100644
index 3f5e6b452..000000000
--- a/target/linux/atheros/patches-2.6.33/105-ar2315_pci.patch
+++ /dev/null
@@ -1,297 +0,0 @@
---- a/arch/mips/ar231x/Makefile
-+++ b/arch/mips/ar231x/Makefile
-@@ -14,3 +14,4 @@ obj-$(CONFIG_EARLY_PRINTK) += early_prin
- 
- obj-$(CONFIG_ATHEROS_AR5312) += ar5312.o
- obj-$(CONFIG_ATHEROS_AR2315) += ar2315.o
-+obj-$(CONFIG_ATHEROS_AR2315_PCI) += pci.o
---- /dev/null
-+++ b/arch/mips/ar231x/pci.c
-@@ -0,0 +1,230 @@
-+/*
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+ */
-+
-+#include <linux/types.h>
-+#include <linux/pci.h>
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/mm.h>
-+#include <linux/spinlock.h>
-+#include <linux/delay.h>
-+#include <linux/irq.h>
-+#include <asm/bootinfo.h>
-+#include <asm/paccess.h>
-+#include <asm/irq_cpu.h>
-+#include <asm/io.h>
-+#include <ar231x_platform.h>
-+#include <ar231x.h>
-+#include <ar2315_regs.h>
-+#include "devices.h"
-+
-+#define AR531X_MEM_BASE    0x80800000UL
-+#define AR531X_MEM_SIZE    0x00ffffffUL
-+#define AR531X_IO_SIZE     0x00007fffUL
-+
-+static unsigned long configspace;
-+
-+static int config_access(int devfn, int where, int size, u32 *ptr, bool write)
-+{
-+	unsigned long flags;
-+	int func = PCI_FUNC(devfn);
-+	int dev = PCI_SLOT(devfn);
-+	u32 value = 0;
-+	int err = 0;
-+	u32 addr;
-+
-+	if (((dev != 0) && (dev != 3)) || (func > 2))
-+		return PCIBIOS_DEVICE_NOT_FOUND;
-+
-+	/* Select Configuration access */
-+	local_irq_save(flags);
-+	ar231x_mask_reg(AR2315_PCI_MISC_CONFIG, 0, AR2315_PCIMISC_CFG_SEL);
-+	mb();
-+
-+	addr = (u32) configspace + (1 << (13 + dev)) + (func << 8) + where;
-+	if (size == 1)
-+		addr ^= 0x3;
-+	else if (size == 2)
-+		addr ^= 0x2;
-+
-+	if (write) {
-+		value = *ptr;
-+		if (size == 1)
-+			err = put_dbe(value, (u8 *) addr);
-+		else if (size == 2)
-+			err = put_dbe(value, (u16 *) addr);
-+		else if (size == 4)
-+			err = put_dbe(value, (u32 *) addr);
-+	} else {
-+		if (size == 1)
-+			err = get_dbe(value, (u8 *) addr);
-+		else if (size == 2)
-+			err = get_dbe(value, (u16 *) addr);
-+		else if (size == 4)
-+			err = get_dbe(value, (u32 *) addr);
-+		if (err)
-+			*ptr = 0xffffffff;
-+		else
-+			*ptr = value;
-+	}
-+
-+	/* Select Memory access */
-+	ar231x_mask_reg(AR2315_PCI_MISC_CONFIG, AR2315_PCIMISC_CFG_SEL, 0);
-+	local_irq_restore(flags);
-+
-+	return (err ? PCIBIOS_DEVICE_NOT_FOUND : PCIBIOS_SUCCESSFUL);
-+}
-+
-+static int ar231x_pci_read(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 * value)
-+{
-+	return config_access(devfn, where, size, value, 0);
-+}
-+
-+static int ar231x_pci_write(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 value)
-+{
-+	return config_access(devfn, where, size, &value, 1);
-+}
-+
-+struct pci_ops ar231x_pci_ops = {
-+	.read	= ar231x_pci_read,
-+	.write	= ar231x_pci_write,
-+};
-+
-+static struct resource ar231x_mem_resource = {
-+	.name	= "AR531x PCI MEM",
-+	.start	= AR531X_MEM_BASE,
-+	.end	= AR531X_MEM_BASE + AR531X_MEM_SIZE - AR531X_IO_SIZE - 1 + 0x4000000,
-+	.flags	= IORESOURCE_MEM,
-+};
-+
-+static struct resource ar231x_io_resource = {
-+	.name	= "AR531x PCI I/O",
-+	.start	= AR531X_MEM_BASE + AR531X_MEM_SIZE - AR531X_IO_SIZE,
-+	.end	= AR531X_MEM_BASE + AR531X_MEM_SIZE - 1,
-+	.flags	= IORESOURCE_IO,
-+};
-+
-+struct pci_controller ar231x_pci_controller = {
-+	.pci_ops		= &ar231x_pci_ops,
-+	.mem_resource	= &ar231x_mem_resource,
-+	.io_resource	= &ar231x_io_resource,
-+	.mem_offset     = 0x00000000UL,
-+	.io_offset      = 0x00000000UL,
-+};
-+
-+int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
-+{
-+	return AR2315_IRQ_LCBUS_PCI;
-+}
-+
-+int pcibios_plat_dev_init(struct pci_dev *dev)
-+{
-+	pci_write_config_byte(dev, PCI_INTERRUPT_LINE, 5);
-+	pci_write_config_word(dev, 0x40, 0);
-+
-+	/* Clear any pending Abort or external Interrupts
-+	 * and enable interrupt processing */
-+	ar231x_mask_reg(AR2315_PCI_INTEN_REG, AR2315_PCI_INT_ENABLE, 0);
-+	ar231x_write_reg(AR2315_PCI_INT_STATUS, (AR2315_PCI_ABORT_INT | AR2315_PCI_EXT_INT));
-+	ar231x_write_reg(AR2315_PCI_INT_MASK, (AR2315_PCI_ABORT_INT | AR2315_PCI_EXT_INT));
-+	ar231x_mask_reg(AR2315_PCI_INTEN_REG, 0, AR2315_PCI_INT_ENABLE);
-+
-+	return 0;
-+}
-+
-+static void
-+ar2315_pci_fixup(struct pci_dev *dev)
-+{
-+	unsigned int devfn = dev->devfn;
-+
-+	if (dev->bus->number != 0)
-+		return;
-+
-+	/* Only fix up the PCI host settings */
-+	if ((PCI_SLOT(devfn) != 3) || (PCI_FUNC(devfn) != 0))
-+		return;
-+
-+	/* Fix up MBARs */
-+	pci_write_config_dword(dev, PCI_BASE_ADDRESS_0, HOST_PCI_MBAR0);
-+	pci_write_config_dword(dev, PCI_BASE_ADDRESS_1, HOST_PCI_MBAR1);
-+	pci_write_config_dword(dev, PCI_BASE_ADDRESS_2, HOST_PCI_MBAR2);
-+	pci_write_config_dword(dev, PCI_COMMAND,
-+		PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER | PCI_COMMAND_SPECIAL |
-+		PCI_COMMAND_INVALIDATE | PCI_COMMAND_PARITY | PCI_COMMAND_SERR |
-+		PCI_COMMAND_FAST_BACK);
-+}
-+DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, ar2315_pci_fixup);
-+
-+static int __init
-+ar2315_pci_init(void)
-+{
-+	u32 reg;
-+
-+	if (ar231x_devtype != DEV_TYPE_AR2315)
-+		return -ENODEV;
-+
-+	configspace = (unsigned long) ioremap_nocache(0x80000000, 1*1024*1024); /* Remap PCI config space */
-+	ar231x_pci_controller.io_map_base =
-+		(unsigned long) ioremap_nocache(AR531X_MEM_BASE + AR531X_MEM_SIZE, AR531X_IO_SIZE);
-+	set_io_port_base(ar231x_pci_controller.io_map_base); /* PCI I/O space */
-+
-+	reg = ar231x_mask_reg(AR2315_RESET, 0, AR2315_RESET_PCIDMA);
-+	msleep(10);
-+
-+	reg &= ~AR2315_RESET_PCIDMA;
-+	ar231x_write_reg(AR2315_RESET, reg);
-+	msleep(10);
-+
-+	ar231x_mask_reg(AR2315_ENDIAN_CTL, 0,
-+		AR2315_CONFIG_PCIAHB | AR2315_CONFIG_PCIAHB_BRIDGE);
-+
-+	ar231x_write_reg(AR2315_PCICLK, AR2315_PCICLK_PLLC_CLKM |
-+		(AR2315_PCICLK_IN_FREQ_DIV_6 << AR2315_PCICLK_DIV_S));
-+	ar231x_mask_reg(AR2315_AHB_ARB_CTL, 0, AR2315_ARB_PCI);
-+	ar231x_mask_reg(AR2315_IF_CTL, AR2315_IF_PCI_CLK_MASK | AR2315_IF_MASK,
-+		AR2315_IF_PCI | AR2315_IF_PCI_HOST | AR2315_IF_PCI_INTR |
-+		 (AR2315_IF_PCI_CLK_OUTPUT_CLK << AR2315_IF_PCI_CLK_SHIFT));
-+
-+	/* Reset the PCI bus by setting bits 5-4 in PCI_MCFG */
-+	ar231x_mask_reg(AR2315_PCI_MISC_CONFIG, AR2315_PCIMISC_RST_MODE,
-+		AR2315_PCIRST_LOW);
-+	msleep(100);
-+
-+	/* Bring the PCI out of reset */
-+	ar231x_mask_reg(AR2315_PCI_MISC_CONFIG, AR2315_PCIMISC_RST_MODE,
-+		AR2315_PCIRST_HIGH | AR2315_PCICACHE_DIS | 0x8);
-+
-+	ar231x_write_reg(AR2315_PCI_UNCACHE_CFG,
-+			0x1E | /* 1GB uncached */
-+			(1 << 5) | /* Enable uncached */
-+			(0x2 << 30) /* Base: 0x80000000 */
-+	);
-+	ar231x_read_reg(AR2315_PCI_UNCACHE_CFG);
-+
-+	msleep(500);
-+
-+	/* dirty hack - anyone with a datasheet that knows the memory map ? */
-+	ioport_resource.start = 0x10000000;
-+	ioport_resource.end = 0xffffffff;
-+	iomem_resource.start = 0x10000000;
-+	iomem_resource.end = 0xffffffff;
-+
-+	register_pci_controller(&ar231x_pci_controller);
-+
-+	return 0;
-+}
-+
-+arch_initcall(ar2315_pci_init);
---- a/arch/mips/ar231x/Kconfig
-+++ b/arch/mips/ar231x/Kconfig
-@@ -15,3 +15,13 @@ config ATHEROS_AR2315
- 	select SYS_SUPPORTS_BIG_ENDIAN
- 	select GENERIC_GPIO
- 	default y
-+
-+config ATHEROS_AR2315_PCI
-+	bool "PCI support"
-+	depends on ATHEROS_AR2315
-+	select HW_HAS_PCI
-+	select PCI
-+	select USB_ARCH_HAS_HCD
-+	select USB_ARCH_HAS_OHCI
-+	select USB_ARCH_HAS_EHCI
-+	default y
---- a/arch/mips/ar231x/ar2315.c
-+++ b/arch/mips/ar231x/ar2315.c
-@@ -63,6 +63,27 @@ static inline void ar2315_gpio_irq(void)
- 		do_IRQ(AR531X_GPIO_IRQ_BASE + bit);
- }
- 
-+#ifdef CONFIG_ATHEROS_AR2315_PCI
-+static inline void pci_abort_irq(void)
-+{
-+	ar231x_write_reg(AR2315_PCI_INT_STATUS, AR2315_PCI_ABORT_INT);
-+}
-+
-+static inline void pci_ack_irq(void)
-+{
-+	ar231x_write_reg(AR2315_PCI_INT_STATUS, AR2315_PCI_EXT_INT);
-+}
-+
-+void ar2315_pci_irq(int irq)
-+{
-+	if (ar231x_read_reg(AR2315_PCI_INT_STATUS) == AR2315_PCI_ABORT_INT)
-+		pci_abort_irq();
-+	else {
-+		do_IRQ(irq);
-+		pci_ack_irq();
-+	}
-+}
-+#endif /* CONFIG_ATHEROS_AR2315_PCI */
- 
- /*
-  * Called when an interrupt is received, this function
-@@ -81,6 +102,10 @@ ar2315_irq_dispatch(void)
- 		do_IRQ(AR2315_IRQ_WLAN0_INTRS);
- 	else if (pending & CAUSEF_IP4)
- 		do_IRQ(AR2315_IRQ_ENET0_INTRS);
-+#ifdef CONFIG_ATHEROS_AR2315_PCI
-+	else if (pending & CAUSEF_IP5)
-+		ar2315_pci_irq(AR2315_IRQ_LCBUS_PCI);
-+#endif
- 	else if (pending & CAUSEF_IP2) {
- 		unsigned int misc_intr = ar231x_read_reg(AR2315_ISR) & ar231x_read_reg(AR2315_IMR);
- 
diff --git a/target/linux/atheros/patches-2.6.33/110-ar2313_ethernet.patch b/target/linux/atheros/patches-2.6.33/110-ar2313_ethernet.patch
deleted file mode 100644
index 6ce948efe..000000000
--- a/target/linux/atheros/patches-2.6.33/110-ar2313_ethernet.patch
+++ /dev/null
@@ -1,1596 +0,0 @@
---- a/drivers/net/Kconfig
-+++ b/drivers/net/Kconfig
-@@ -359,6 +359,12 @@ config AX88796_93CX6
- 	help
- 	  Select this if your platform comes with an external 93CX6 eeprom.
- 
-+config AR231X_ETHERNET
-+	tristate "AR231x Ethernet support"
-+	depends on ATHEROS_AR231X
-+	help
-+	  Support for the AR231x/531x ethernet controller
-+
- config MACE
- 	tristate "MACE (Power Mac ethernet) support"
- 	depends on PPC_PMAC && PPC32
---- a/drivers/net/Makefile
-+++ b/drivers/net/Makefile
-@@ -216,6 +216,7 @@ obj-$(CONFIG_EQUALIZER) += eql.o
- obj-$(CONFIG_KORINA) += korina.o
- obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o
- obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o
-+obj-$(CONFIG_AR231X_ETHERNET) += ar231x.o
- obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
- obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o
- obj-$(CONFIG_DECLANCE) += declance.o
---- /dev/null
-+++ b/drivers/net/ar231x.c
-@@ -0,0 +1,1263 @@
-+/*
-+ * ar231x.c: Linux driver for the Atheros AR231x Ethernet device.
-+ *
-+ * Copyright (C) 2004 by Sameer Dekate <sdekate@arubanetworks.com>
-+ * Copyright (C) 2006 Imre Kaloz <kaloz@openwrt.org>
-+ * Copyright (C) 2006-2009 Felix Fietkau <nbd@openwrt.org>
-+ *
-+ * Thanks to Atheros for providing hardware and documentation
-+ * enabling me to write this driver.
-+ *
-+ * 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.
-+ *
-+ * Additional credits:
-+ * 	This code is taken from John Taylor's Sibyte driver and then
-+ * 	modified for the AR2313.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/version.h>
-+#include <linux/types.h>
-+#include <linux/errno.h>
-+#include <linux/ioport.h>
-+#include <linux/pci.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/skbuff.h>
-+#include <linux/init.h>
-+#include <linux/delay.h>
-+#include <linux/mm.h>
-+#include <linux/highmem.h>
-+#include <linux/sockios.h>
-+#include <linux/pkt_sched.h>
-+#include <linux/mii.h>
-+#include <linux/phy.h>
-+#include <linux/ethtool.h>
-+#include <linux/ctype.h>
-+#include <linux/platform_device.h>
-+
-+#include <net/sock.h>
-+#include <net/ip.h>
-+
-+#include <asm/system.h>
-+#include <asm/io.h>
-+#include <asm/irq.h>
-+#include <asm/byteorder.h>
-+#include <asm/uaccess.h>
-+#include <asm/bootinfo.h>
-+
-+#define AR2313_MTU                     1692
-+#define AR2313_PRIOS                   1
-+#define AR2313_QUEUES                  (2*AR2313_PRIOS)
-+#define AR2313_DESCR_ENTRIES           64
-+
-+
-+#ifndef min
-+#define min(a,b)	(((a)<(b))?(a):(b))
-+#endif
-+
-+#ifndef SMP_CACHE_BYTES
-+#define SMP_CACHE_BYTES	L1_CACHE_BYTES
-+#endif
-+
-+#define AR2313_MBOX_SET_BIT  0x8
-+
-+#include "ar231x.h"
-+
-+/*
-+ * New interrupt handler strategy:
-+ *
-+ * An old interrupt handler worked using the traditional method of
-+ * replacing an skbuff with a new one when a packet arrives. However
-+ * the rx rings do not need to contain a static number of buffer
-+ * descriptors, thus it makes sense to move the memory allocation out
-+ * of the main interrupt handler and do it in a bottom half handler
-+ * and only allocate new buffers when the number of buffers in the
-+ * ring is below a certain threshold. In order to avoid starving the
-+ * NIC under heavy load it is however necessary to force allocation
-+ * when hitting a minimum threshold. The strategy for alloction is as
-+ * follows:
-+ *
-+ *     RX_LOW_BUF_THRES    - allocate buffers in the bottom half
-+ *     RX_PANIC_LOW_THRES  - we are very low on buffers, allocate
-+ *                           the buffers in the interrupt handler
-+ *     RX_RING_THRES       - maximum number of buffers in the rx ring
-+ *
-+ * One advantagous side effect of this allocation approach is that the
-+ * entire rx processing can be done without holding any spin lock
-+ * since the rx rings and registers are totally independent of the tx
-+ * ring and its registers.  This of course includes the kmalloc's of
-+ * new skb's. Thus start_xmit can run in parallel with rx processing
-+ * and the memory allocation on SMP systems.
-+ *
-+ * Note that running the skb reallocation in a bottom half opens up
-+ * another can of races which needs to be handled properly. In
-+ * particular it can happen that the interrupt handler tries to run
-+ * the reallocation while the bottom half is either running on another
-+ * CPU or was interrupted on the same CPU. To get around this the
-+ * driver uses bitops to prevent the reallocation routines from being
-+ * reentered.
-+ *
-+ * TX handling can also be done without holding any spin lock, wheee
-+ * this is fun! since tx_csm is only written to by the interrupt
-+ * handler.
-+ */
-+
-+/*
-+ * Threshold values for RX buffer allocation - the low water marks for
-+ * when to start refilling the rings are set to 75% of the ring
-+ * sizes. It seems to make sense to refill the rings entirely from the
-+ * intrrupt handler once it gets below the panic threshold, that way
-+ * we don't risk that the refilling is moved to another CPU when the
-+ * one running the interrupt handler just got the slab code hot in its
-+ * cache.
-+ */
-+#define RX_RING_SIZE		AR2313_DESCR_ENTRIES
-+#define RX_PANIC_THRES	        (RX_RING_SIZE/4)
-+#define RX_LOW_THRES	        ((3*RX_RING_SIZE)/4)
-+#define CRC_LEN                 4
-+#define RX_OFFSET               2
-+
-+#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
-+#define VLAN_HDR                4
-+#else
-+#define VLAN_HDR                0
-+#endif
-+
-+#define AR2313_BUFSIZE		(AR2313_MTU + VLAN_HDR + ETH_HLEN + CRC_LEN + RX_OFFSET)
-+
-+#ifdef MODULE
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Sameer Dekate <sdekate@arubanetworks.com>, Imre Kaloz <kaloz@openwrt.org>, Felix Fietkau <nbd@openwrt.org>");
-+MODULE_DESCRIPTION("AR231x Ethernet driver");
-+#endif
-+
-+#define virt_to_phys(x) ((u32)(x) & 0x1fffffff)
-+
-+// prototypes
-+static void ar231x_halt(struct net_device *dev);
-+static void rx_tasklet_func(unsigned long data);
-+static void rx_tasklet_cleanup(struct net_device *dev);
-+static void ar231x_multicast_list(struct net_device *dev);
-+
-+static int ar231x_mdiobus_read(struct mii_bus *bus, int phy_addr, int regnum);
-+static int ar231x_mdiobus_write(struct mii_bus *bus, int phy_addr, int regnum, u16 value);
-+static int ar231x_mdiobus_reset(struct mii_bus *bus);
-+static int ar231x_mdiobus_probe (struct net_device *dev);
-+static void ar231x_adjust_link(struct net_device *dev);
-+
-+#ifndef ERR
-+#define ERR(fmt, args...) printk("%s: " fmt, __func__, ##args)
-+#endif
-+
-+static const struct net_device_ops ar231x_ops = {
-+	.ndo_open = ar231x_open,
-+	.ndo_stop = ar231x_close,
-+	.ndo_start_xmit = ar231x_start_xmit,
-+	.ndo_set_multicast_list = ar231x_multicast_list,
-+	.ndo_do_ioctl = ar231x_ioctl,
-+};
-+
-+int __init ar231x_probe(struct platform_device *pdev)
-+{
-+	struct net_device *dev;
-+	struct ar231x_private *sp;
-+	struct resource *res;
-+	unsigned long ar_eth_base;
-+	char buf[64];
-+
-+	dev = alloc_etherdev(sizeof(struct ar231x_private));
-+
-+	if (dev == NULL) {
-+		printk(KERN_ERR
-+			   "ar231x: Unable to allocate net_device structure!\n");
-+		return -ENOMEM;
-+	}
-+
-+	platform_set_drvdata(pdev, dev);
-+
-+	sp = netdev_priv(dev);
-+	sp->dev = dev;
-+	sp->cfg = pdev->dev.platform_data;
-+
-+	sprintf(buf, "eth%d_membase", pdev->id);
-+	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, buf);
-+	if (!res)
-+		return -ENODEV;
-+
-+	sp->link = 0;
-+	ar_eth_base = res->start;
-+
-+	sprintf(buf, "eth%d_irq", pdev->id);
-+	dev->irq = platform_get_irq_byname(pdev, buf);
-+
-+	spin_lock_init(&sp->lock);
-+
-+	dev->features |= NETIF_F_HIGHDMA;
-+	dev->netdev_ops = &ar231x_ops;
-+
-+	tasklet_init(&sp->rx_tasklet, rx_tasklet_func, (unsigned long) dev);
-+	tasklet_disable(&sp->rx_tasklet);
-+
-+	sp->eth_regs =
-+		ioremap_nocache(virt_to_phys(ar_eth_base), sizeof(*sp->eth_regs));
-+	if (!sp->eth_regs) {
-+		printk("Can't remap eth registers\n");
-+		return (-ENXIO);
-+	}
-+
-+	/*
-+	 * When there's only one MAC, PHY regs are typically on ENET0,
-+	 * even though the MAC might be on ENET1.
-+	 * Needto remap PHY regs separately in this case
-+	 */
-+	if (virt_to_phys(ar_eth_base) == virt_to_phys(sp->phy_regs))
-+		sp->phy_regs = sp->eth_regs;
-+	else {
-+		sp->phy_regs =
-+			ioremap_nocache(virt_to_phys(sp->cfg->phy_base),
-+							sizeof(*sp->phy_regs));
-+		if (!sp->phy_regs) {
-+			printk("Can't remap phy registers\n");
-+			return (-ENXIO);
-+		}
-+	}
-+
-+	sp->dma_regs =
-+		ioremap_nocache(virt_to_phys(ar_eth_base + 0x1000),
-+						sizeof(*sp->dma_regs));
-+	dev->base_addr = (unsigned int) sp->dma_regs;
-+	if (!sp->dma_regs) {
-+		printk("Can't remap DMA registers\n");
-+		return (-ENXIO);
-+	}
-+
-+	sp->int_regs = ioremap_nocache(virt_to_phys(sp->cfg->reset_base), 4);
-+	if (!sp->int_regs) {
-+		printk("Can't remap INTERRUPT registers\n");
-+		return (-ENXIO);
-+	}
-+
-+	strncpy(sp->name, "Atheros AR231x", sizeof(sp->name) - 1);
-+	sp->name[sizeof(sp->name) - 1] = '\0';
-+	memcpy(dev->dev_addr, sp->cfg->macaddr, 6);
-+
-+	if (ar231x_init(dev)) {
-+		/*
-+		 * ar231x_init() calls ar231x_init_cleanup() on error.
-+		 */
-+		kfree(dev);
-+		return -ENODEV;
-+	}
-+
-+	if (register_netdev(dev)) {
-+		printk("%s: register_netdev failed\n", __func__);
-+		return -1;
-+	}
-+
-+	printk("%s: %s: %02x:%02x:%02x:%02x:%02x:%02x, irq %d\n",
-+		   dev->name, sp->name,
-+		   dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
-+		   dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5], dev->irq);
-+
-+	sp->mii_bus = mdiobus_alloc();
-+	if (sp->mii_bus == NULL)
-+		return -1;
-+
-+	sp->mii_bus->priv = dev;
-+	sp->mii_bus->read = ar231x_mdiobus_read;
-+	sp->mii_bus->write = ar231x_mdiobus_write;
-+	sp->mii_bus->reset = ar231x_mdiobus_reset;
-+	sp->mii_bus->name = "ar231x_eth_mii";
-+	snprintf(sp->mii_bus->id, MII_BUS_ID_SIZE, "%d", pdev->id);
-+	sp->mii_bus->irq = kmalloc(sizeof(int), GFP_KERNEL);
-+	*sp->mii_bus->irq = PHY_POLL;
-+
-+	mdiobus_register(sp->mii_bus);
-+
-+	if (ar231x_mdiobus_probe(dev) != 0) {
-+		printk(KERN_ERR "%s: mdiobus_probe failed\n", dev->name);
-+		rx_tasklet_cleanup(dev);
-+		ar231x_init_cleanup(dev);
-+		unregister_netdev(dev);
-+		kfree(dev);
-+		return -ENODEV;
-+	}
-+
-+	/* start link poll timer */
-+	ar231x_setup_timer(dev);
-+
-+	return 0;
-+}
-+
-+
-+static void ar231x_multicast_list(struct net_device *dev)
-+{
-+	struct ar231x_private *sp = netdev_priv(dev);
-+	unsigned int filter;
-+
-+	filter = sp->eth_regs->mac_control;
-+
-+	if (dev->flags & IFF_PROMISC)
-+		filter |= MAC_CONTROL_PR;
-+	else
-+		filter &= ~MAC_CONTROL_PR;
-+	if ((dev->flags & IFF_ALLMULTI) || (dev->mc_count > 0))
-+		filter |= MAC_CONTROL_PM;
-+	else
-+		filter &= ~MAC_CONTROL_PM;
-+
-+	sp->eth_regs->mac_control = filter;
-+}
-+
-+static void rx_tasklet_cleanup(struct net_device *dev)
-+{
-+	struct ar231x_private *sp = netdev_priv(dev);
-+
-+	/*
-+	 * Tasklet may be scheduled. Need to get it removed from the list
-+	 * since we're about to free the struct.
-+	 */
-+
-+	sp->unloading = 1;
-+	tasklet_enable(&sp->rx_tasklet);
-+	tasklet_kill(&sp->rx_tasklet);
-+}
-+
-+static int __devexit ar231x_remove(struct platform_device *pdev)
-+{
-+	struct net_device *dev = platform_get_drvdata(pdev);
-+	struct ar231x_private *sp = netdev_priv(dev);
-+	rx_tasklet_cleanup(dev);
-+	ar231x_init_cleanup(dev);
-+	unregister_netdev(dev);
-+	mdiobus_unregister(sp->mii_bus);
-+	mdiobus_free(sp->mii_bus);
-+	kfree(dev);
-+	return 0;
-+}
-+
-+
-+/*
-+ * Restart the AR2313 ethernet controller.
-+ */
-+static int ar231x_restart(struct net_device *dev)
-+{
-+	/* disable interrupts */
-+	disable_irq(dev->irq);
-+
-+	/* stop mac */
-+	ar231x_halt(dev);
-+
-+	/* initialize */
-+	ar231x_init(dev);
-+
-+	/* enable interrupts */
-+	enable_irq(dev->irq);
-+
-+	return 0;
-+}
-+
-+static struct platform_driver ar231x_driver = {
-+	.driver.name = "ar231x-eth",
-+	.probe = ar231x_probe,
-+	.remove = __devexit_p(ar231x_remove),
-+};
-+
-+int __init ar231x_module_init(void)
-+{
-+	return platform_driver_register(&ar231x_driver);
-+}
-+
-+void __exit ar231x_module_cleanup(void)
-+{
-+	platform_driver_unregister(&ar231x_driver);
-+}
-+
-+module_init(ar231x_module_init);
-+module_exit(ar231x_module_cleanup);
-+
-+
-+static void ar231x_free_descriptors(struct net_device *dev)
-+{
-+	struct ar231x_private *sp = netdev_priv(dev);
-+	if (sp->rx_ring != NULL) {
-+		kfree((void *) KSEG0ADDR(sp->rx_ring));
-+		sp->rx_ring = NULL;
-+		sp->tx_ring = NULL;
-+	}
-+}
-+
-+
-+static int ar231x_allocate_descriptors(struct net_device *dev)
-+{
-+	struct ar231x_private *sp = netdev_priv(dev);
-+	int size;
-+	int j;
-+	ar231x_descr_t *space;
-+
-+	if (sp->rx_ring != NULL) {
-+		printk("%s: already done.\n", __FUNCTION__);
-+		return 0;
-+	}
-+
-+	size =
-+		(sizeof(ar231x_descr_t) * (AR2313_DESCR_ENTRIES * AR2313_QUEUES));
-+	space = kmalloc(size, GFP_KERNEL);
-+	if (space == NULL)
-+		return 1;
-+
-+	/* invalidate caches */
-+	dma_cache_inv((unsigned int) space, size);
-+
-+	/* now convert pointer to KSEG1 */
-+	space = (ar231x_descr_t *) KSEG1ADDR(space);
-+
-+	memset((void *) space, 0, size);
-+
-+	sp->rx_ring = space;
-+	space += AR2313_DESCR_ENTRIES;
-+
-+	sp->tx_ring = space;
-+	space += AR2313_DESCR_ENTRIES;
-+
-+	/* Initialize the transmit Descriptors */
-+	for (j = 0; j < AR2313_DESCR_ENTRIES; j++) {
-+		ar231x_descr_t *td = &sp->tx_ring[j];
-+		td->status = 0;
-+		td->devcs = DMA_TX1_CHAINED;
-+		td->addr = 0;
-+		td->descr =
-+			virt_to_phys(&sp->
-+						 tx_ring[(j + 1) & (AR2313_DESCR_ENTRIES - 1)]);
-+	}
-+
-+	return 0;
-+}
-+
-+
-+/*
-+ * Generic cleanup handling data allocated during init. Used when the
-+ * module is unloaded or if an error occurs during initialization
-+ */
-+static void ar231x_init_cleanup(struct net_device *dev)
-+{
-+	struct ar231x_private *sp = netdev_priv(dev);
-+	struct sk_buff *skb;
-+	int j;
-+
-+	ar231x_free_descriptors(dev);
-+
-+	if (sp->eth_regs)
-+		iounmap((void *) sp->eth_regs);
-+	if (sp->dma_regs)
-+		iounmap((void *) sp->dma_regs);
-+
-+	if (sp->rx_skb) {
-+		for (j = 0; j < AR2313_DESCR_ENTRIES; j++) {
-+			skb = sp->rx_skb[j];
-+			if (skb) {
-+				sp->rx_skb[j] = NULL;
-+				dev_kfree_skb(skb);
-+			}
-+		}
-+		kfree(sp->rx_skb);
-+		sp->rx_skb = NULL;
-+	}
-+
-+	if (sp->tx_skb) {
-+		for (j = 0; j < AR2313_DESCR_ENTRIES; j++) {
-+			skb = sp->tx_skb[j];
-+			if (skb) {
-+				sp->tx_skb[j] = NULL;
-+				dev_kfree_skb(skb);
-+			}
-+		}
-+		kfree(sp->tx_skb);
-+		sp->tx_skb = NULL;
-+	}
-+}
-+
-+static int ar231x_setup_timer(struct net_device *dev)
-+{
-+	struct ar231x_private *sp = netdev_priv(dev);
-+
-+	init_timer(&sp->link_timer);
-+
-+	sp->link_timer.function = ar231x_link_timer_fn;
-+	sp->link_timer.data = (int) dev;
-+	sp->link_timer.expires = jiffies + HZ;
-+
-+	add_timer(&sp->link_timer);
-+	return 0;
-+
-+}
-+
-+static void ar231x_link_timer_fn(unsigned long data)
-+{
-+	struct net_device *dev = (struct net_device *) data;
-+	struct ar231x_private *sp = netdev_priv(dev);
-+
-+	// see if the link status changed
-+	// This was needed to make sure we set the PHY to the
-+	// autonegotiated value of half or full duplex.
-+	ar231x_check_link(dev);
-+
-+	// Loop faster when we don't have link.
-+	// This was needed to speed up the AP bootstrap time.
-+	if (sp->link == 0) {
-+		mod_timer(&sp->link_timer, jiffies + HZ / 2);
-+	} else {
-+		mod_timer(&sp->link_timer, jiffies + LINK_TIMER);
-+	}
-+}
-+
-+static void ar231x_check_link(struct net_device *dev)
-+{
-+	struct ar231x_private *sp = netdev_priv(dev);
-+	u16 phyData;
-+
-+	phyData = ar231x_mdiobus_read(sp->mii_bus, sp->phy, MII_BMSR);
-+	if (sp->phyData != phyData) {
-+		if (phyData & BMSR_LSTATUS) {
-+			/* link is present, ready link partner ability to deterine
-+			   duplexity */
-+			int duplex = 0;
-+			u16 reg;
-+
-+			sp->link = 1;
-+			reg = ar231x_mdiobus_read(sp->mii_bus, sp->phy, MII_BMCR);
-+			if (reg & BMCR_ANENABLE) {
-+				/* auto neg enabled */
-+				reg = ar231x_mdiobus_read(sp->mii_bus, sp->phy, MII_LPA);
-+				duplex = (reg & (LPA_100FULL | LPA_10FULL)) ? 1 : 0;
-+			} else {
-+				/* no auto neg, just read duplex config */
-+				duplex = (reg & BMCR_FULLDPLX) ? 1 : 0;
-+			}
-+
-+			printk(KERN_INFO "%s: Configuring MAC for %s duplex\n",
-+				   dev->name, (duplex) ? "full" : "half");
-+
-+			if (duplex) {
-+				/* full duplex */
-+				sp->eth_regs->mac_control =
-+					((sp->eth_regs->
-+					  mac_control | MAC_CONTROL_F) & ~MAC_CONTROL_DRO);
-+			} else {
-+				/* half duplex */
-+				sp->eth_regs->mac_control =
-+					((sp->eth_regs->
-+					  mac_control | MAC_CONTROL_DRO) & ~MAC_CONTROL_F);
-+			}
-+		} else {
-+			/* no link */
-+			sp->link = 0;
-+		}
-+		sp->phyData = phyData;
-+	}
-+}
-+
-+static int ar231x_reset_reg(struct net_device *dev)
-+{
-+	struct ar231x_private *sp = netdev_priv(dev);
-+	unsigned int ethsal, ethsah;
-+	unsigned int flags;
-+
-+	*sp->int_regs |= sp->cfg->reset_mac;
-+	mdelay(10);
-+	*sp->int_regs &= ~sp->cfg->reset_mac;
-+	mdelay(10);
-+	*sp->int_regs |= sp->cfg->reset_phy;
-+	mdelay(10);
-+	*sp->int_regs &= ~sp->cfg->reset_phy;
-+	mdelay(10);
-+
-+	sp->dma_regs->bus_mode = (DMA_BUS_MODE_SWR);
-+	mdelay(10);
-+	sp->dma_regs->bus_mode =
-+		((32 << DMA_BUS_MODE_PBL_SHIFT) | DMA_BUS_MODE_BLE);
-+
-+	/* enable interrupts */
-+	sp->dma_regs->intr_ena = (DMA_STATUS_AIS |
-+							  DMA_STATUS_NIS |
-+							  DMA_STATUS_RI |
-+							  DMA_STATUS_TI | DMA_STATUS_FBE);
-+	sp->dma_regs->xmt_base = virt_to_phys(sp->tx_ring);
-+	sp->dma_regs->rcv_base = virt_to_phys(sp->rx_ring);
-+	sp->dma_regs->control =
-+		(DMA_CONTROL_SR | DMA_CONTROL_ST | DMA_CONTROL_SF);
-+
-+	sp->eth_regs->flow_control = (FLOW_CONTROL_FCE);
-+	sp->eth_regs->vlan_tag = (0x8100);
-+
-+	/* Enable Ethernet Interface */
-+	flags = (MAC_CONTROL_TE |	/* transmit enable */
-+			 MAC_CONTROL_PM |	/* pass mcast */
-+			 MAC_CONTROL_F |	/* full duplex */
-+			 MAC_CONTROL_HBD);	/* heart beat disabled */
-+
-+	if (dev->flags & IFF_PROMISC) {	/* set promiscuous mode */
-+		flags |= MAC_CONTROL_PR;
-+	}
-+	sp->eth_regs->mac_control = flags;
-+
-+	/* Set all Ethernet station address registers to their initial values */
-+	ethsah = ((((u_int) (dev->dev_addr[5]) << 8) & (u_int) 0x0000FF00) |
-+			  (((u_int) (dev->dev_addr[4]) << 0) & (u_int) 0x000000FF));
-+
-+	ethsal = ((((u_int) (dev->dev_addr[3]) << 24) & (u_int) 0xFF000000) |
-+			  (((u_int) (dev->dev_addr[2]) << 16) & (u_int) 0x00FF0000) |
-+			  (((u_int) (dev->dev_addr[1]) << 8) & (u_int) 0x0000FF00) |
-+			  (((u_int) (dev->dev_addr[0]) << 0) & (u_int) 0x000000FF));
-+
-+	sp->eth_regs->mac_addr[0] = ethsah;
-+	sp->eth_regs->mac_addr[1] = ethsal;
-+
-+	mdelay(10);
-+
-+	return (0);
-+}
-+
-+
-+static int ar231x_init(struct net_device *dev)
-+{
-+	struct ar231x_private *sp = netdev_priv(dev);
-+	int ecode = 0;
-+
-+	/*
-+	 * Allocate descriptors
-+	 */
-+	if (ar231x_allocate_descriptors(dev)) {
-+		printk("%s: %s: ar231x_allocate_descriptors failed\n",
-+			   dev->name, __FUNCTION__);
-+		ecode = -EAGAIN;
-+		goto init_error;
-+	}
-+
-+	/*
-+	 * Get the memory for the skb rings.
-+	 */
-+	if (sp->rx_skb == NULL) {
-+		sp->rx_skb =
-+			kmalloc(sizeof(struct sk_buff *) * AR2313_DESCR_ENTRIES,
-+					GFP_KERNEL);
-+		if (!(sp->rx_skb)) {
-+			printk("%s: %s: rx_skb kmalloc failed\n",
-+				   dev->name, __FUNCTION__);
-+			ecode = -EAGAIN;
-+			goto init_error;
-+		}
-+	}
-+	memset(sp->rx_skb, 0, sizeof(struct sk_buff *) * AR2313_DESCR_ENTRIES);
-+
-+	if (sp->tx_skb == NULL) {
-+		sp->tx_skb =
-+			kmalloc(sizeof(struct sk_buff *) * AR2313_DESCR_ENTRIES,
-+					GFP_KERNEL);
-+		if (!(sp->tx_skb)) {
-+			printk("%s: %s: tx_skb kmalloc failed\n",
-+				   dev->name, __FUNCTION__);
-+			ecode = -EAGAIN;
-+			goto init_error;
-+		}
-+	}
-+	memset(sp->tx_skb, 0, sizeof(struct sk_buff *) * AR2313_DESCR_ENTRIES);
-+
-+	/*
-+	 * Set tx_csm before we start receiving interrupts, otherwise
-+	 * the interrupt handler might think it is supposed to process
-+	 * tx ints before we are up and running, which may cause a null
-+	 * pointer access in the int handler.
-+	 */
-+	sp->rx_skbprd = 0;
-+	sp->cur_rx = 0;
-+	sp->tx_prd = 0;
-+	sp->tx_csm = 0;
-+
-+	/*
-+	 * Zero the stats before starting the interface
-+	 */
-+	memset(&dev->stats, 0, sizeof(dev->stats));
-+
-+	/*
-+	 * We load the ring here as there seem to be no way to tell the
-+	 * firmware to wipe the ring without re-initializing it.
-+	 */
-+	ar231x_load_rx_ring(dev, RX_RING_SIZE);
-+
-+	/*
-+	 * Init hardware
-+	 */
-+	ar231x_reset_reg(dev);
-+
-+	/*
-+	 * Get the IRQ
-+	 */
-+	ecode =
-+		request_irq(dev->irq, &ar231x_interrupt,
-+					IRQF_DISABLED | IRQF_SAMPLE_RANDOM,
-+					dev->name, dev);
-+	if (ecode) {
-+		printk(KERN_WARNING "%s: %s: Requested IRQ %d is busy\n",
-+			   dev->name, __FUNCTION__, dev->irq);
-+		goto init_error;
-+	}
-+
-+
-+	tasklet_enable(&sp->rx_tasklet);
-+
-+	return 0;
-+
-+  init_error:
-+	ar231x_init_cleanup(dev);
-+	return ecode;
-+}
-+
-+/*
-+ * Load the rx ring.
-+ *
-+ * Loading rings is safe without holding the spin lock since this is
-+ * done only before the device is enabled, thus no interrupts are
-+ * generated and by the interrupt handler/tasklet handler.
-+ */
-+static void ar231x_load_rx_ring(struct net_device *dev, int nr_bufs)
-+{
-+
-+	struct ar231x_private *sp = netdev_priv(dev);
-+	short i, idx;
-+
-+	idx = sp->rx_skbprd;
-+
-+	for (i = 0; i < nr_bufs; i++) {
-+		struct sk_buff *skb;
-+		ar231x_descr_t *rd;
-+
-+		if (sp->rx_skb[idx])
-+			break;
-+
-+		skb = netdev_alloc_skb(dev, AR2313_BUFSIZE);
-+		if (!skb) {
-+			printk("\n\n\n\n %s: No memory in system\n\n\n\n",
-+				   __FUNCTION__);
-+			break;
-+		}
-+
-+		/*
-+		 * Make sure IP header starts on a fresh cache line.
-+		 */
-+		skb->dev = dev;
-+		skb_reserve(skb, RX_OFFSET);
-+		sp->rx_skb[idx] = skb;
-+
-+		rd = (ar231x_descr_t *) & sp->rx_ring[idx];
-+
-+		/* initialize dma descriptor */
-+		rd->devcs = ((AR2313_BUFSIZE << DMA_RX1_BSIZE_SHIFT) |
-+					 DMA_RX1_CHAINED);
-+		rd->addr = virt_to_phys(skb->data);
-+		rd->descr =
-+			virt_to_phys(&sp->
-+						 rx_ring[(idx + 1) & (AR2313_DESCR_ENTRIES - 1)]);
-+		rd->status = DMA_RX_OWN;
-+
-+		idx = DSC_NEXT(idx);
-+	}
-+
-+	if (i)
-+		sp->rx_skbprd = idx;
-+
-+	return;
-+}
-+
-+#define AR2313_MAX_PKTS_PER_CALL        64
-+
-+static int ar231x_rx_int(struct net_device *dev)
-+{
-+	struct ar231x_private *sp = netdev_priv(dev);
-+	struct sk_buff *skb, *skb_new;
-+	ar231x_descr_t *rxdesc;
-+	unsigned int status;
-+	u32 idx;
-+	int pkts = 0;
-+	int rval;
-+
-+	idx = sp->cur_rx;
-+
-+	/* process at most the entire ring and then wait for another interrupt
-+	 */
-+	while (1) {
-+
-+		rxdesc = &sp->rx_ring[idx];
-+		status = rxdesc->status;
-+		if (status & DMA_RX_OWN) {
-+			/* SiByte owns descriptor or descr not yet filled in */
-+			rval = 0;
-+			break;
-+		}
-+
-+		if (++pkts > AR2313_MAX_PKTS_PER_CALL) {
-+			rval = 1;
-+			break;
-+		}
-+
-+		if ((status & DMA_RX_ERROR) && !(status & DMA_RX_LONG)) {
-+			dev->stats.rx_errors++;
-+			dev->stats.rx_dropped++;
-+
-+			/* add statistics counters */
-+			if (status & DMA_RX_ERR_CRC)
-+				dev->stats.rx_crc_errors++;
-+			if (status & DMA_RX_ERR_COL)
-+				dev->stats.rx_over_errors++;
-+			if (status & DMA_RX_ERR_LENGTH)
-+				dev->stats.rx_length_errors++;
-+			if (status & DMA_RX_ERR_RUNT)
-+				dev->stats.rx_over_errors++;
-+			if (status & DMA_RX_ERR_DESC)
-+				dev->stats.rx_over_errors++;
-+
-+		} else {
-+			/* alloc new buffer. */
-+			skb_new = netdev_alloc_skb(dev, AR2313_BUFSIZE + RX_OFFSET);
-+			if (skb_new != NULL) {
-+
-+				skb = sp->rx_skb[idx];
-+				/* set skb */
-+				skb_put(skb,
-+						((status >> DMA_RX_LEN_SHIFT) & 0x3fff) - CRC_LEN);
-+
-+				dev->stats.rx_bytes += skb->len;
-+				skb->protocol = eth_type_trans(skb, dev);
-+				/* pass the packet to upper layers */
-+				netif_rx(skb);
-+
-+				skb_new->dev = dev;
-+				/* 16 bit align */
-+				skb_reserve(skb_new, RX_OFFSET);
-+				/* reset descriptor's curr_addr */
-+				rxdesc->addr = virt_to_phys(skb_new->data);
-+
-+				dev->stats.rx_packets++;
-+				sp->rx_skb[idx] = skb_new;
-+			} else {
-+				dev->stats.rx_dropped++;
-+			}
-+		}
-+
-+		rxdesc->devcs = ((AR2313_BUFSIZE << DMA_RX1_BSIZE_SHIFT) |
-+						 DMA_RX1_CHAINED);
-+		rxdesc->status = DMA_RX_OWN;
-+
-+		idx = DSC_NEXT(idx);
-+	}
-+
-+	sp->cur_rx = idx;
-+
-+	return rval;
-+}
-+
-+
-+static void ar231x_tx_int(struct net_device *dev)
-+{
-+	struct ar231x_private *sp = netdev_priv(dev);
-+	u32 idx;
-+	struct sk_buff *skb;
-+	ar231x_descr_t *txdesc;
-+	unsigned int status = 0;
-+
-+	idx = sp->tx_csm;
-+
-+	while (idx != sp->tx_prd) {
-+		txdesc = &sp->tx_ring[idx];
-+
-+		if ((status = txdesc->status) & DMA_TX_OWN) {
-+			/* ar231x dma still owns descr */
-+			break;
-+		}
-+		/* done with this descriptor */
-+		dma_unmap_single(NULL, txdesc->addr,
-+						 txdesc->devcs & DMA_TX1_BSIZE_MASK,
-+						 DMA_TO_DEVICE);
-+		txdesc->status = 0;
-+
-+		if (status & DMA_TX_ERROR) {
-+			dev->stats.tx_errors++;
-+			dev->stats.tx_dropped++;
-+			if (status & DMA_TX_ERR_UNDER)
-+				dev->stats.tx_fifo_errors++;
-+			if (status & DMA_TX_ERR_HB)
-+				dev->stats.tx_heartbeat_errors++;
-+			if (status & (DMA_TX_ERR_LOSS | DMA_TX_ERR_LINK))
-+				dev->stats.tx_carrier_errors++;
-+			if (status & (DMA_TX_ERR_LATE |
-+						  DMA_TX_ERR_COL |
-+						  DMA_TX_ERR_JABBER | DMA_TX_ERR_DEFER))
-+				dev->stats.tx_aborted_errors++;
-+		} else {
-+			/* transmit OK */
-+			dev->stats.tx_packets++;
-+		}
-+
-+		skb = sp->tx_skb[idx];
-+		sp->tx_skb[idx] = NULL;
-+		idx = DSC_NEXT(idx);
-+		dev->stats.tx_bytes += skb->len;
-+		dev_kfree_skb_irq(skb);
-+	}
-+
-+	sp->tx_csm = idx;
-+
-+	return;
-+}
-+
-+
-+static void rx_tasklet_func(unsigned long data)
-+{
-+	struct net_device *dev = (struct net_device *) data;
-+	struct ar231x_private *sp = netdev_priv(dev);
-+
-+	if (sp->unloading) {
-+		return;
-+	}
-+
-+	if (ar231x_rx_int(dev)) {
-+		tasklet_hi_schedule(&sp->rx_tasklet);
-+	} else {
-+		unsigned long flags;
-+		spin_lock_irqsave(&sp->lock, flags);
-+		sp->dma_regs->intr_ena |= DMA_STATUS_RI;
-+		spin_unlock_irqrestore(&sp->lock, flags);
-+	}
-+}
-+
-+static void rx_schedule(struct net_device *dev)
-+{
-+	struct ar231x_private *sp = netdev_priv(dev);
-+
-+	sp->dma_regs->intr_ena &= ~DMA_STATUS_RI;
-+
-+	tasklet_hi_schedule(&sp->rx_tasklet);
-+}
-+
-+static irqreturn_t ar231x_interrupt(int irq, void *dev_id)
-+{
-+	struct net_device *dev = (struct net_device *) dev_id;
-+	struct ar231x_private *sp = netdev_priv(dev);
-+	unsigned int status, enabled;
-+
-+	/* clear interrupt */
-+	/*
-+	 * Don't clear RI bit if currently disabled.
-+	 */
-+	status = sp->dma_regs->status;
-+	enabled = sp->dma_regs->intr_ena;
-+	sp->dma_regs->status = status & enabled;
-+
-+	if (status & DMA_STATUS_NIS) {
-+		/* normal status */
-+		/*
-+		 * Don't schedule rx processing if interrupt
-+		 * is already disabled.
-+		 */
-+		if (status & enabled & DMA_STATUS_RI) {
-+			/* receive interrupt */
-+			rx_schedule(dev);
-+		}
-+		if (status & DMA_STATUS_TI) {
-+			/* transmit interrupt */
-+			ar231x_tx_int(dev);
-+		}
-+	}
-+
-+	/* abnormal status */
-+	if (status & (DMA_STATUS_FBE | DMA_STATUS_TPS)) {
-+		ar231x_restart(dev);
-+	}
-+	return IRQ_HANDLED;
-+}
-+
-+
-+static int ar231x_open(struct net_device *dev)
-+{
-+	struct ar231x_private *sp = netdev_priv(dev);
-+	unsigned int ethsal, ethsah;
-+
-+	/* reset the hardware, in case the MAC address changed */
-+	ethsah = ((((u_int) (dev->dev_addr[5]) << 8) & (u_int) 0x0000FF00) |
-+			  (((u_int) (dev->dev_addr[4]) << 0) & (u_int) 0x000000FF));
-+
-+	ethsal = ((((u_int) (dev->dev_addr[3]) << 24) & (u_int) 0xFF000000) |
-+			  (((u_int) (dev->dev_addr[2]) << 16) & (u_int) 0x00FF0000) |
-+			  (((u_int) (dev->dev_addr[1]) << 8) & (u_int) 0x0000FF00) |
-+			  (((u_int) (dev->dev_addr[0]) << 0) & (u_int) 0x000000FF));
-+
-+	sp->eth_regs->mac_addr[0] = ethsah;
-+	sp->eth_regs->mac_addr[1] = ethsal;
-+
-+	mdelay(10);
-+
-+	dev->mtu = 1500;
-+	netif_start_queue(dev);
-+
-+	sp->eth_regs->mac_control |= MAC_CONTROL_RE;
-+
-+	return 0;
-+}
-+
-+static void ar231x_halt(struct net_device *dev)
-+{
-+	struct ar231x_private *sp = netdev_priv(dev);
-+	int j;
-+
-+	tasklet_disable(&sp->rx_tasklet);
-+
-+	/* kill the MAC */
-+	sp->eth_regs->mac_control &= ~(MAC_CONTROL_RE |	/* disable Receives */
-+								   MAC_CONTROL_TE);	/* disable Transmits */
-+	/* stop dma */
-+	sp->dma_regs->control = 0;
-+	sp->dma_regs->bus_mode = DMA_BUS_MODE_SWR;
-+
-+	/* place phy and MAC in reset */
-+	*sp->int_regs |= (sp->cfg->reset_mac | sp->cfg->reset_phy);
-+
-+	/* free buffers on tx ring */
-+	for (j = 0; j < AR2313_DESCR_ENTRIES; j++) {
-+		struct sk_buff *skb;
-+		ar231x_descr_t *txdesc;
-+
-+		txdesc = &sp->tx_ring[j];
-+		txdesc->descr = 0;
-+
-+		skb = sp->tx_skb[j];
-+		if (skb) {
-+			dev_kfree_skb(skb);
-+			sp->tx_skb[j] = NULL;
-+		}
-+	}
-+}
-+
-+/*
-+ * close should do nothing. Here's why. It's called when
-+ * 'ifconfig bond0 down' is run. If it calls free_irq then
-+ * the irq is gone forever ! When bond0 is made 'up' again,
-+ * the ar231x_open () does not call request_irq (). Worse,
-+ * the call to ar231x_halt() generates a WDOG reset due to
-+ * the write to 'sp->int_regs' and the box reboots.
-+ * Commenting this out is good since it allows the
-+ * system to resume when bond0 is made up again.
-+ */
-+static int ar231x_close(struct net_device *dev)
-+{
-+#if 0
-+	/*
-+	 * Disable interrupts
-+	 */
-+	disable_irq(dev->irq);
-+
-+	/*
-+	 * Without (or before) releasing irq and stopping hardware, this
-+	 * is an absolute non-sense, by the way. It will be reset instantly
-+	 * by the first irq.
-+	 */
-+	netif_stop_queue(dev);
-+
-+	/* stop the MAC and DMA engines */
-+	ar231x_halt(dev);
-+
-+	/* release the interrupt */
-+	free_irq(dev->irq, dev);
-+
-+#endif
-+	return 0;
-+}
-+
-+static int ar231x_start_xmit(struct sk_buff *skb, struct net_device *dev)
-+{
-+	struct ar231x_private *sp = netdev_priv(dev);
-+	ar231x_descr_t *td;
-+	u32 idx;
-+
-+	idx = sp->tx_prd;
-+	td = &sp->tx_ring[idx];
-+
-+	if (td->status & DMA_TX_OWN) {
-+		/* free skbuf and lie to the caller that we sent it out */
-+		dev->stats.tx_dropped++;
-+		dev_kfree_skb(skb);
-+
-+		/* restart transmitter in case locked */
-+		sp->dma_regs->xmt_poll = 0;
-+		return 0;
-+	}
-+
-+	/* Setup the transmit descriptor. */
-+	td->devcs = ((skb->len << DMA_TX1_BSIZE_SHIFT) |
-+				 (DMA_TX1_LS | DMA_TX1_IC | DMA_TX1_CHAINED));
-+	td->addr = dma_map_single(NULL, skb->data, skb->len, DMA_TO_DEVICE);
-+	td->status = DMA_TX_OWN;
-+
-+	/* kick transmitter last */
-+	sp->dma_regs->xmt_poll = 0;
-+
-+	sp->tx_skb[idx] = skb;
-+	idx = DSC_NEXT(idx);
-+	sp->tx_prd = idx;
-+
-+	return 0;
-+}
-+
-+static int ar231x_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
-+{
-+	struct mii_ioctl_data *data = (struct mii_ioctl_data *) &ifr->ifr_data;
-+	struct ar231x_private *sp = netdev_priv(dev);
-+	int ret;
-+
-+	switch (cmd) {
-+
-+	case SIOCETHTOOL:
-+		spin_lock_irq(&sp->lock);
-+		ret = phy_ethtool_ioctl(sp->phy_dev, (void *) ifr->ifr_data);
-+		spin_unlock_irq(&sp->lock);
-+		return ret;
-+
-+	case SIOCSIFHWADDR:
-+		if (copy_from_user
-+			(dev->dev_addr, ifr->ifr_data, sizeof(dev->dev_addr)))
-+			return -EFAULT;
-+		return 0;
-+
-+	case SIOCGIFHWADDR:
-+		if (copy_to_user
-+			(ifr->ifr_data, dev->dev_addr, sizeof(dev->dev_addr)))
-+			return -EFAULT;
-+		return 0;
-+
-+	case SIOCGMIIPHY:
-+	case SIOCGMIIREG:
-+	case SIOCSMIIREG:
-+		return phy_mii_ioctl(sp->phy_dev, data, cmd);
-+
-+	default:
-+		break;
-+	}
-+
-+	return -EOPNOTSUPP;
-+}
-+
-+static void ar231x_adjust_link(struct net_device *dev)
-+{
-+	struct ar231x_private *sp = netdev_priv(dev);
-+	unsigned int mc;
-+
-+	if (!sp->phy_dev->link)
-+		return;
-+
-+	if (sp->phy_dev->duplex != sp->oldduplex) {
-+		mc = readl(&sp->eth_regs->mac_control);
-+		mc &= ~(MAC_CONTROL_F | MAC_CONTROL_DRO);
-+		if (sp->phy_dev->duplex)
-+			mc |= MAC_CONTROL_F;
-+		else
-+			mc |= MAC_CONTROL_DRO;
-+		writel(mc, &sp->eth_regs->mac_control);
-+		sp->oldduplex = sp->phy_dev->duplex;
-+	}
-+}
-+
-+#define MII_ADDR(phy, reg) \
-+	((reg << MII_ADDR_REG_SHIFT) | (phy << MII_ADDR_PHY_SHIFT))
-+
-+static int
-+ar231x_mdiobus_read(struct mii_bus *bus, int phy_addr, int regnum)
-+{
-+	struct net_device *const dev = bus->priv;
-+	struct ar231x_private *sp = netdev_priv(dev);
-+	volatile ETHERNET_STRUCT *ethernet = sp->phy_regs;
-+
-+	ethernet->mii_addr = MII_ADDR(phy_addr, regnum);
-+	while (ethernet->mii_addr & MII_ADDR_BUSY);
-+	return (ethernet->mii_data >> MII_DATA_SHIFT);
-+}
-+
-+static int
-+ar231x_mdiobus_write(struct mii_bus *bus, int phy_addr, int regnum,
-+             u16 value)
-+{
-+	struct net_device *const dev = bus->priv;
-+	struct ar231x_private *sp = netdev_priv(dev);
-+	volatile ETHERNET_STRUCT *ethernet = sp->phy_regs;
-+
-+	while (ethernet->mii_addr & MII_ADDR_BUSY);
-+	ethernet->mii_data = value << MII_DATA_SHIFT;
-+	ethernet->mii_addr = MII_ADDR(phy_addr, regnum) | MII_ADDR_WRITE;
-+
-+	return 0;
-+}
-+
-+static int ar231x_mdiobus_reset(struct mii_bus *bus)
-+{
-+	struct net_device *const dev = bus->priv;
-+
-+	ar231x_reset_reg(dev);
-+
-+	return 0;
-+}
-+
-+static int ar231x_mdiobus_probe (struct net_device *dev)
-+{
-+	struct ar231x_private *const sp = netdev_priv(dev);
-+	struct phy_device *phydev = NULL;
-+	int phy_addr;
-+
-+	/* find the first (lowest address) PHY on the current MAC's MII bus */
-+	for (phy_addr = 0; phy_addr < PHY_MAX_ADDR; phy_addr++)
-+		if (sp->mii_bus->phy_map[phy_addr]) {
-+			phydev = sp->mii_bus->phy_map[phy_addr];
-+			sp->phy = phy_addr;
-+			break; /* break out with first one found */
-+		}
-+
-+	if (!phydev) {
-+		printk (KERN_ERR "ar231x: %s: no PHY found\n", dev->name);
-+		return -1;
-+	}
-+
-+	/* now we are supposed to have a proper phydev, to attach to... */
-+	BUG_ON(!phydev);
-+	BUG_ON(phydev->attached_dev);
-+
-+	phydev = phy_connect(dev, dev_name(&phydev->dev), &ar231x_adjust_link, 0,
-+		PHY_INTERFACE_MODE_MII);
-+
-+	if (IS_ERR(phydev)) {
-+		printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name);
-+		return PTR_ERR(phydev);
-+	}
-+
-+	/* mask with MAC supported features */
-+	phydev->supported &= (SUPPORTED_10baseT_Half
-+		| SUPPORTED_10baseT_Full
-+		| SUPPORTED_100baseT_Half
-+		| SUPPORTED_100baseT_Full
-+		| SUPPORTED_Autoneg
-+		/* | SUPPORTED_Pause | SUPPORTED_Asym_Pause */
-+		| SUPPORTED_MII
-+		| SUPPORTED_TP);
-+
-+	phydev->advertising = phydev->supported;
-+
-+	sp->oldduplex = -1;
-+	sp->phy_dev = phydev;
-+
-+	printk(KERN_INFO "%s: attached PHY driver [%s] "
-+		"(mii_bus:phy_addr=%s)\n",
-+		dev->name, phydev->drv->name, dev_name(&phydev->dev));
-+
-+	return 0;
-+}
-+
---- /dev/null
-+++ b/drivers/net/ar231x.h
-@@ -0,0 +1,302 @@
-+/*
-+ * ar231x.h: Linux driver for the Atheros AR231x Ethernet device.
-+ *
-+ * Copyright (C) 2004 by Sameer Dekate <sdekate@arubanetworks.com>
-+ * Copyright (C) 2006 Imre Kaloz <kaloz@openwrt.org>
-+ * Copyright (C) 2006-2009 Felix Fietkau <nbd@openwrt.org>
-+ *
-+ * Thanks to Atheros for providing hardware and documentation
-+ * enabling me to write this driver.
-+ *
-+ * 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.
-+ */
-+
-+#ifndef _AR2313_H_
-+#define _AR2313_H_
-+
-+#include <generated/autoconf.h>
-+#include <linux/bitops.h>
-+#include <asm/bootinfo.h>
-+#include <ar231x_platform.h>
-+
-+/*
-+ * probe link timer - 5 secs
-+ */
-+#define LINK_TIMER    (5*HZ)
-+
-+#define IS_DMA_TX_INT(X)   (((X) & (DMA_STATUS_TI)) != 0)
-+#define IS_DMA_RX_INT(X)   (((X) & (DMA_STATUS_RI)) != 0)
-+#define IS_DRIVER_OWNED(X) (((X) & (DMA_TX_OWN))    == 0)
-+
-+#define AR2313_TX_TIMEOUT (HZ/4)
-+
-+/*
-+ * Rings
-+ */
-+#define DSC_RING_ENTRIES_SIZE	(AR2313_DESCR_ENTRIES * sizeof(struct desc))
-+#define DSC_NEXT(idx)	        ((idx + 1) & (AR2313_DESCR_ENTRIES - 1))
-+
-+#define AR2313_MBGET		2
-+#define AR2313_MBSET		3
-+#define AR2313_PCI_RECONFIG	4
-+#define AR2313_PCI_DUMP		5
-+#define AR2313_TEST_PANIC	6
-+#define AR2313_TEST_NULLPTR	7
-+#define AR2313_READ_DATA	8
-+#define AR2313_WRITE_DATA	9
-+#define AR2313_GET_VERSION	10
-+#define AR2313_TEST_HANG	11
-+#define AR2313_SYNC		12
-+
-+#define DMA_RX_ERR_CRC		BIT(1)
-+#define DMA_RX_ERR_DRIB		BIT(2)
-+#define DMA_RX_ERR_MII		BIT(3)
-+#define DMA_RX_EV2		BIT(5)
-+#define DMA_RX_ERR_COL		BIT(6)
-+#define DMA_RX_LONG		BIT(7)
-+#define DMA_RX_LS		BIT(8)	/* last descriptor */
-+#define DMA_RX_FS		BIT(9)	/* first descriptor */
-+#define DMA_RX_MF		BIT(10)	/* multicast frame */
-+#define DMA_RX_ERR_RUNT		BIT(11)	/* runt frame */
-+#define DMA_RX_ERR_LENGTH	BIT(12)	/* length error */
-+#define DMA_RX_ERR_DESC		BIT(14)	/* descriptor error */
-+#define DMA_RX_ERROR		BIT(15)	/* error summary */
-+#define DMA_RX_LEN_MASK		0x3fff0000
-+#define DMA_RX_LEN_SHIFT	16
-+#define DMA_RX_FILT		BIT(30)
-+#define DMA_RX_OWN		BIT(31)	/* desc owned by DMA controller */
-+
-+#define DMA_RX1_BSIZE_MASK	0x000007ff
-+#define DMA_RX1_BSIZE_SHIFT	0
-+#define DMA_RX1_CHAINED		BIT(24)
-+#define DMA_RX1_RER		BIT(25)
-+
-+#define DMA_TX_ERR_UNDER	BIT(1)	/* underflow error */
-+#define DMA_TX_ERR_DEFER	BIT(2)	/* excessive deferral */
-+#define DMA_TX_COL_MASK		0x78
-+#define DMA_TX_COL_SHIFT	3
-+#define DMA_TX_ERR_HB		BIT(7)	/* hearbeat failure */
-+#define DMA_TX_ERR_COL		BIT(8)	/* excessive collisions */
-+#define DMA_TX_ERR_LATE		BIT(9)	/* late collision */
-+#define DMA_TX_ERR_LINK		BIT(10)	/* no carrier */
-+#define DMA_TX_ERR_LOSS		BIT(11)	/* loss of carrier */
-+#define DMA_TX_ERR_JABBER	BIT(14)	/* transmit jabber timeout */
-+#define DMA_TX_ERROR		BIT(15)	/* frame aborted */
-+#define DMA_TX_OWN		BIT(31)	/* descr owned by DMA controller */
-+
-+#define DMA_TX1_BSIZE_MASK	0x000007ff
-+#define DMA_TX1_BSIZE_SHIFT	0
-+#define DMA_TX1_CHAINED		BIT(24)	/* chained descriptors */
-+#define DMA_TX1_TER		BIT(25)	/* transmit end of ring */
-+#define DMA_TX1_FS		BIT(29)	/* first segment */
-+#define DMA_TX1_LS		BIT(30)	/* last segment */
-+#define DMA_TX1_IC		BIT(31)	/* interrupt on completion */
-+
-+#define RCVPKT_LENGTH(X)	(X  >> 16)	/* Received pkt Length */
-+
-+#define MAC_CONTROL_RE		BIT(2)	/* receive enable */
-+#define MAC_CONTROL_TE		BIT(3)	/* transmit enable */
-+#define MAC_CONTROL_DC		BIT(5)	/* Deferral check */
-+#define MAC_CONTROL_ASTP	BIT(8)	/* Auto pad strip */
-+#define MAC_CONTROL_DRTY	BIT(10)	/* Disable retry */
-+#define MAC_CONTROL_DBF		BIT(11)	/* Disable bcast frames */
-+#define MAC_CONTROL_LCC		BIT(12)	/* late collision ctrl */
-+#define MAC_CONTROL_HP		BIT(13)	/* Hash Perfect filtering */
-+#define MAC_CONTROL_HASH	BIT(14)	/* Unicast hash filtering */
-+#define MAC_CONTROL_HO		BIT(15)	/* Hash only filtering */
-+#define MAC_CONTROL_PB		BIT(16)	/* Pass Bad frames */
-+#define MAC_CONTROL_IF		BIT(17)	/* Inverse filtering */
-+#define MAC_CONTROL_PR		BIT(18)	/* promiscuous mode (valid frames only) */
-+#define MAC_CONTROL_PM		BIT(19)	/* pass multicast */
-+#define MAC_CONTROL_F		BIT(20)	/* full-duplex */
-+#define MAC_CONTROL_DRO		BIT(23)	/* Disable Receive Own */
-+#define MAC_CONTROL_HBD		BIT(28)	/* heart-beat disabled (MUST BE SET) */
-+#define MAC_CONTROL_BLE		BIT(30)	/* big endian mode */
-+#define MAC_CONTROL_RA		BIT(31)	/* receive all (valid and invalid frames) */
-+
-+#define MII_ADDR_BUSY		BIT(0)
-+#define MII_ADDR_WRITE		BIT(1)
-+#define MII_ADDR_REG_SHIFT	6
-+#define MII_ADDR_PHY_SHIFT	11
-+#define MII_DATA_SHIFT		0
-+
-+#define FLOW_CONTROL_FCE	BIT(1)
-+
-+#define DMA_BUS_MODE_SWR	BIT(0)	/* software reset */
-+#define DMA_BUS_MODE_BLE	BIT(7)	/* big endian mode */
-+#define DMA_BUS_MODE_PBL_SHIFT	8	/* programmable burst length 32 */
-+#define DMA_BUS_MODE_DBO	BIT(20)	/* big-endian descriptors */
-+
-+#define DMA_STATUS_TI		BIT(0)	/* transmit interrupt */
-+#define DMA_STATUS_TPS		BIT(1)	/* transmit process stopped */
-+#define DMA_STATUS_TU		BIT(2)	/* transmit buffer unavailable */
-+#define DMA_STATUS_TJT		BIT(3)	/* transmit buffer timeout */
-+#define DMA_STATUS_UNF		BIT(5)	/* transmit underflow */
-+#define DMA_STATUS_RI		BIT(6)	/* receive interrupt */
-+#define DMA_STATUS_RU		BIT(7)	/* receive buffer unavailable */
-+#define DMA_STATUS_RPS		BIT(8)	/* receive process stopped */
-+#define DMA_STATUS_ETI		BIT(10)	/* early transmit interrupt */
-+#define DMA_STATUS_FBE		BIT(13)	/* fatal bus interrupt */
-+#define DMA_STATUS_ERI		BIT(14)	/* early receive interrupt */
-+#define DMA_STATUS_AIS		BIT(15)	/* abnormal interrupt summary */
-+#define DMA_STATUS_NIS		BIT(16)	/* normal interrupt summary */
-+#define DMA_STATUS_RS_SHIFT	17	/* receive process state */
-+#define DMA_STATUS_TS_SHIFT	20	/* transmit process state */
-+#define DMA_STATUS_EB_SHIFT	23	/* error bits */
-+
-+#define DMA_CONTROL_SR		BIT(1)	/* start receive */
-+#define DMA_CONTROL_ST		BIT(13)	/* start transmit */
-+#define DMA_CONTROL_SF		BIT(21)	/* store and forward */
-+
-+
-+typedef struct {
-+	volatile unsigned int status;	// OWN, Device control and status.
-+	volatile unsigned int devcs;	// pkt Control bits + Length
-+	volatile unsigned int addr;	// Current Address.
-+	volatile unsigned int descr;	// Next descriptor in chain.
-+} ar231x_descr_t;
-+
-+
-+
-+//
-+// New Combo structure for Both Eth0 AND eth1
-+//
-+typedef struct {
-+	volatile unsigned int mac_control;	/* 0x00 */
-+	volatile unsigned int mac_addr[2];	/* 0x04 - 0x08 */
-+	volatile unsigned int mcast_table[2];	/* 0x0c - 0x10 */
-+	volatile unsigned int mii_addr;	/* 0x14 */
-+	volatile unsigned int mii_data;	/* 0x18 */
-+	volatile unsigned int flow_control;	/* 0x1c */
-+	volatile unsigned int vlan_tag;	/* 0x20 */
-+	volatile unsigned int pad[7];	/* 0x24 - 0x3c */
-+	volatile unsigned int ucast_table[8];	/* 0x40-0x5c */
-+
-+} ETHERNET_STRUCT;
-+
-+/********************************************************************
-+ * Interrupt controller
-+ ********************************************************************/
-+
-+typedef struct {
-+	volatile unsigned int wdog_control;	/* 0x08 */
-+	volatile unsigned int wdog_timer;	/* 0x0c */
-+	volatile unsigned int misc_status;	/* 0x10 */
-+	volatile unsigned int misc_mask;	/* 0x14 */
-+	volatile unsigned int global_status;	/* 0x18 */
-+	volatile unsigned int reserved;	/* 0x1c */
-+	volatile unsigned int reset_control;	/* 0x20 */
-+} INTERRUPT;
-+
-+/********************************************************************
-+ * DMA controller
-+ ********************************************************************/
-+typedef struct {
-+	volatile unsigned int bus_mode;	/* 0x00 (CSR0) */
-+	volatile unsigned int xmt_poll;	/* 0x04 (CSR1) */
-+	volatile unsigned int rcv_poll;	/* 0x08 (CSR2) */
-+	volatile unsigned int rcv_base;	/* 0x0c (CSR3) */
-+	volatile unsigned int xmt_base;	/* 0x10 (CSR4) */
-+	volatile unsigned int status;	/* 0x14 (CSR5) */
-+	volatile unsigned int control;	/* 0x18 (CSR6) */
-+	volatile unsigned int intr_ena;	/* 0x1c (CSR7) */
-+	volatile unsigned int rcv_missed;	/* 0x20 (CSR8) */
-+	volatile unsigned int reserved[11];	/* 0x24-0x4c (CSR9-19) */
-+	volatile unsigned int cur_tx_buf_addr;	/* 0x50 (CSR20) */
-+	volatile unsigned int cur_rx_buf_addr;	/* 0x50 (CSR21) */
-+} DMA;
-+
-+/*
-+ * Struct private for the Sibyte.
-+ *
-+ * Elements are grouped so variables used by the tx handling goes
-+ * together, and will go into the same cache lines etc. in order to
-+ * avoid cache line contention between the rx and tx handling on SMP.
-+ *
-+ * Frequently accessed variables are put at the beginning of the
-+ * struct to help the compiler generate better/shorter code.
-+ */
-+struct ar231x_private {
-+	struct net_device *dev;
-+	int version;
-+	u32 mb[2];
-+
-+	volatile ETHERNET_STRUCT *phy_regs;
-+	volatile ETHERNET_STRUCT *eth_regs;
-+	volatile DMA *dma_regs;
-+	volatile u32 *int_regs;
-+	struct ar231x_eth *cfg;
-+
-+	spinlock_t lock;			/* Serialise access to device */
-+
-+	/*
-+	 * RX and TX descriptors, must be adjacent
-+	 */
-+	ar231x_descr_t *rx_ring;
-+	ar231x_descr_t *tx_ring;
-+
-+
-+	struct sk_buff **rx_skb;
-+	struct sk_buff **tx_skb;
-+
-+	/*
-+	 * RX elements
-+	 */
-+	u32 rx_skbprd;
-+	u32 cur_rx;
-+
-+	/*
-+	 * TX elements
-+	 */
-+	u32 tx_prd;
-+	u32 tx_csm;
-+
-+	/*
-+	 * Misc elements
-+	 */
-+	char name[48];
-+	struct {
-+		u32 address;
-+		u32 length;
-+		char *mapping;
-+	} desc;
-+
-+
-+	struct timer_list link_timer;
-+	unsigned short phy;			/* merlot phy = 1, samsung phy = 0x1f */
-+	unsigned short mac;
-+	unsigned short link;		/* 0 - link down, 1 - link up */
-+	u16 phyData;
-+
-+	struct tasklet_struct rx_tasklet;
-+	int unloading;
-+
-+	struct phy_device *phy_dev;
-+	struct mii_bus *mii_bus;
-+	int oldduplex;
-+};
-+
-+
-+/*
-+ * Prototypes
-+ */
-+static int ar231x_init(struct net_device *dev);
-+#ifdef TX_TIMEOUT
-+static void ar231x_tx_timeout(struct net_device *dev);
-+#endif
-+static int ar231x_restart(struct net_device *dev);
-+static void ar231x_load_rx_ring(struct net_device *dev, int bufs);
-+static irqreturn_t ar231x_interrupt(int irq, void *dev_id);
-+static int ar231x_open(struct net_device *dev);
-+static int ar231x_start_xmit(struct sk_buff *skb, struct net_device *dev);
-+static int ar231x_close(struct net_device *dev);
-+static int ar231x_ioctl(struct net_device *dev, struct ifreq *ifr,
-+						int cmd);
-+static void ar231x_init_cleanup(struct net_device *dev);
-+static int ar231x_setup_timer(struct net_device *dev);
-+static void ar231x_link_timer_fn(unsigned long data);
-+static void ar231x_check_link(struct net_device *dev);
-+#endif							/* _AR2313_H_ */
diff --git a/target/linux/atheros/patches-2.6.33/120-spiflash.patch b/target/linux/atheros/patches-2.6.33/120-spiflash.patch
deleted file mode 100644
index 8e3714649..000000000
--- a/target/linux/atheros/patches-2.6.33/120-spiflash.patch
+++ /dev/null
@@ -1,659 +0,0 @@
---- a/drivers/mtd/devices/Kconfig
-+++ b/drivers/mtd/devices/Kconfig
-@@ -112,6 +112,10 @@ config MTD_SST25L
- 	  Set up your spi devices with the right board-specific platform data,
- 	  if you want to specify device partitioning.
- 
-+config MTD_AR2315
-+	tristate "Atheros AR2315+ SPI Flash support"
-+	depends on ATHEROS_AR2315
-+
- config MTD_SLRAM
- 	tristate "Uncached system RAM"
- 	help
---- a/drivers/mtd/devices/Makefile
-+++ b/drivers/mtd/devices/Makefile
-@@ -17,3 +17,4 @@ obj-$(CONFIG_MTD_BLOCK2MTD)	+= block2mtd
- obj-$(CONFIG_MTD_DATAFLASH)	+= mtd_dataflash.o
- obj-$(CONFIG_MTD_M25P80)	+= m25p80.o
- obj-$(CONFIG_MTD_SST25L)	+= sst25l.o
-+obj-$(CONFIG_MTD_AR2315)	+= ar2315.o
---- /dev/null
-+++ b/drivers/mtd/devices/ar2315.c
-@@ -0,0 +1,517 @@
-+
-+/*
-+ * MTD driver for the SPI Flash Memory support on Atheros AR2315
-+ *
-+ * Copyright (c) 2005-2006 Atheros Communications Inc.
-+ * Copyright (C) 2006-2007 FON Technology, SL.
-+ * Copyright (C) 2006-2007 Imre Kaloz <kaloz@openwrt.org>
-+ * Copyright (C) 2006-2009 Felix Fietkau <nbd@openwrt.org>
-+ *
-+ * This code 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.
-+ *
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/types.h>
-+#include <linux/version.h>
-+#include <linux/errno.h>
-+#include <linux/slab.h>
-+#include <linux/mtd/mtd.h>
-+#include <linux/mtd/partitions.h>
-+#include <linux/platform_device.h>
-+#include <linux/sched.h>
-+#include <linux/root_dev.h>
-+#include <linux/delay.h>
-+#include <asm/delay.h>
-+#include <asm/io.h>
-+
-+#include <ar2315_spiflash.h>
-+#include <ar231x_platform.h>
-+#include <ar231x.h>
-+
-+
-+#define SPIFLASH "spiflash: "
-+#define busy_wait(_priv, _condition, _wait) do { \
-+	while (_condition) { \
-+		spin_unlock_bh(&_priv->lock); \
-+		if (_wait > 1) \
-+			msleep(_wait); \
-+		else if ((_wait == 1) && need_resched()) \
-+			schedule(); \
-+		else \
-+			udelay(1); \
-+		spin_lock_bh(&_priv->lock); \
-+	} \
-+} while (0)
-+
-+enum {
-+	FLASH_NONE,
-+	FLASH_1MB,
-+	FLASH_2MB,
-+	FLASH_4MB,
-+	FLASH_8MB,
-+	FLASH_16MB,
-+};
-+
-+/* Flash configuration table */
-+struct flashconfig {
-+	u32 byte_cnt;
-+	u32 sector_cnt;
-+	u32 sector_size;
-+};
-+
-+const struct flashconfig flashconfig_tbl[] = {
-+	[FLASH_NONE] = { 0, 0, 0},
-+	[FLASH_1MB]  = { STM_1MB_BYTE_COUNT, STM_1MB_SECTOR_COUNT, STM_1MB_SECTOR_SIZE},
-+	[FLASH_2MB]  = { STM_2MB_BYTE_COUNT, STM_2MB_SECTOR_COUNT, STM_2MB_SECTOR_SIZE},
-+	[FLASH_4MB]  = { STM_4MB_BYTE_COUNT, STM_4MB_SECTOR_COUNT, STM_4MB_SECTOR_SIZE},
-+	[FLASH_8MB]  = { STM_8MB_BYTE_COUNT, STM_8MB_SECTOR_COUNT, STM_8MB_SECTOR_SIZE},
-+	[FLASH_16MB] = { STM_16MB_BYTE_COUNT, STM_16MB_SECTOR_COUNT, STM_16MB_SECTOR_SIZE}
-+};
-+
-+/* Mapping of generic opcodes to STM serial flash opcodes */
-+enum {
-+	SPI_WRITE_ENABLE,
-+	SPI_WRITE_DISABLE,
-+	SPI_RD_STATUS,
-+	SPI_WR_STATUS,
-+	SPI_RD_DATA,
-+	SPI_FAST_RD_DATA,
-+	SPI_PAGE_PROGRAM,
-+	SPI_SECTOR_ERASE,
-+	SPI_BULK_ERASE,
-+	SPI_DEEP_PWRDOWN,
-+	SPI_RD_SIG,
-+};
-+
-+struct opcodes {
-+    __u16 code;
-+    __s8 tx_cnt;
-+    __s8 rx_cnt;
-+};
-+const struct opcodes stm_opcodes[] = {
-+	[SPI_WRITE_ENABLE] = {STM_OP_WR_ENABLE, 1, 0},
-+	[SPI_WRITE_DISABLE] = {STM_OP_WR_DISABLE, 1, 0},
-+	[SPI_RD_STATUS] = {STM_OP_RD_STATUS, 1, 1},
-+	[SPI_WR_STATUS] = {STM_OP_WR_STATUS, 1, 0},
-+	[SPI_RD_DATA] = {STM_OP_RD_DATA, 4, 4},
-+	[SPI_FAST_RD_DATA] = {STM_OP_FAST_RD_DATA, 5, 0},
-+	[SPI_PAGE_PROGRAM] = {STM_OP_PAGE_PGRM, 8, 0},
-+	[SPI_SECTOR_ERASE] = {STM_OP_SECTOR_ERASE, 4, 0},
-+	[SPI_BULK_ERASE] = {STM_OP_BULK_ERASE, 1, 0},
-+	[SPI_DEEP_PWRDOWN] = {STM_OP_DEEP_PWRDOWN, 1, 0},
-+	[SPI_RD_SIG] = {STM_OP_RD_SIG, 4, 1},
-+};
-+
-+/* Driver private data structure */
-+struct spiflash_priv {
-+	struct mtd_info mtd;
-+	void *readaddr; /* memory mapped data for read  */
-+	void *mmraddr;  /* memory mapped register space */
-+	wait_queue_head_t wq;
-+	spinlock_t lock;
-+	int state;
-+};
-+
-+#define to_spiflash(_mtd) container_of(_mtd, struct spiflash_priv, mtd)
-+
-+enum {
-+	FL_READY,
-+	FL_READING,
-+	FL_ERASING,
-+	FL_WRITING
-+};
-+
-+/***************************************************************************************************/
-+
-+static u32
-+spiflash_read_reg(struct spiflash_priv *priv, int reg)
-+{
-+	return ar231x_read_reg((u32) priv->mmraddr + reg);
-+}
-+
-+static void
-+spiflash_write_reg(struct spiflash_priv *priv, int reg, u32 data)
-+{
-+	ar231x_write_reg((u32) priv->mmraddr + reg, data);
-+}
-+
-+static u32
-+spiflash_wait_busy(struct spiflash_priv *priv)
-+{
-+	u32 reg;
-+
-+	busy_wait(priv, (reg = spiflash_read_reg(priv, SPI_FLASH_CTL)) &
-+		SPI_CTL_BUSY, 0);
-+	return reg;
-+}
-+
-+static u32
-+spiflash_sendcmd (struct spiflash_priv *priv, int opcode, u32 addr)
-+{
-+	const struct opcodes *op;
-+	u32 reg, mask;
-+
-+	op = &stm_opcodes[opcode];
-+	reg = spiflash_wait_busy(priv);
-+	spiflash_write_reg(priv, SPI_FLASH_OPCODE,
-+		((u32) op->code) | (addr << 8));
-+
-+	reg &= ~SPI_CTL_TX_RX_CNT_MASK;
-+	reg |= SPI_CTL_START | op->tx_cnt | (op->rx_cnt << 4);
-+
-+	spiflash_write_reg(priv, SPI_FLASH_CTL, reg);
-+	spiflash_wait_busy(priv);
-+
-+	if (!op->rx_cnt)
-+		return 0;
-+
-+	reg = spiflash_read_reg(priv, SPI_FLASH_DATA);
-+
-+	switch (op->rx_cnt) {
-+	case 1:
-+		mask = 0x000000ff;
-+		break;
-+	case 2:
-+		mask = 0x0000ffff;
-+		break;
-+	case 3:
-+		mask = 0x00ffffff;
-+		break;
-+	default:
-+		mask = 0xffffffff;
-+		break;
-+	}
-+	reg &= mask;
-+
-+	return reg;
-+}
-+
-+
-+/*
-+ * Probe SPI flash device
-+ * Function returns 0 for failure.
-+ * and flashconfig_tbl array index for success.
-+ */
-+static int
-+spiflash_probe_chip (struct spiflash_priv *priv)
-+{
-+	u32 sig;
-+	int flash_size;
-+
-+	/* Read the signature on the flash device */
-+	spin_lock_bh(&priv->lock);
-+	sig = spiflash_sendcmd(priv, SPI_RD_SIG, 0);
-+	spin_unlock_bh(&priv->lock);
-+
-+	switch (sig) {
-+	case STM_8MBIT_SIGNATURE:
-+		flash_size = FLASH_1MB;
-+		break;
-+	case STM_16MBIT_SIGNATURE:
-+		flash_size = FLASH_2MB;
-+		break;
-+	case STM_32MBIT_SIGNATURE:
-+		flash_size = FLASH_4MB;
-+		break;
-+	case STM_64MBIT_SIGNATURE:
-+		flash_size = FLASH_8MB;
-+		break;
-+	case STM_128MBIT_SIGNATURE:
-+		flash_size = FLASH_16MB;
-+		break;
-+	default:
-+		printk (KERN_WARNING SPIFLASH "Read of flash device signature failed!\n");
-+		return 0;
-+	}
-+
-+	return flash_size;
-+}
-+
-+
-+/* wait until the flash chip is ready and grab a lock */
-+static int spiflash_wait_ready(struct spiflash_priv *priv, int state)
-+{
-+	DECLARE_WAITQUEUE(wait, current);
-+
-+retry:
-+	spin_lock_bh(&priv->lock);
-+	if (priv->state != FL_READY) {
-+		set_current_state(TASK_UNINTERRUPTIBLE);
-+		add_wait_queue(&priv->wq, &wait);
-+		spin_unlock_bh(&priv->lock);
-+		schedule();
-+		remove_wait_queue(&priv->wq, &wait);
-+
-+		if(signal_pending(current))
-+			return 0;
-+
-+		goto retry;
-+	}
-+	priv->state = state;
-+
-+	return 1;
-+}
-+
-+static inline void spiflash_done(struct spiflash_priv *priv)
-+{
-+	priv->state = FL_READY;
-+	spin_unlock_bh(&priv->lock);
-+	wake_up(&priv->wq);
-+}
-+
-+static void
-+spiflash_wait_complete(struct spiflash_priv *priv, unsigned int timeout)
-+{
-+	busy_wait(priv, spiflash_sendcmd(priv, SPI_RD_STATUS, 0) &
-+		SPI_STATUS_WIP, timeout);
-+	spiflash_done(priv);
-+}
-+
-+
-+
-+static int
-+spiflash_erase (struct mtd_info *mtd, struct erase_info *instr)
-+{
-+	struct spiflash_priv *priv = to_spiflash(mtd);
-+	const struct opcodes *op;
-+	u32 temp, reg;
-+
-+	if (instr->addr + instr->len > mtd->size)
-+		return -EINVAL;
-+
-+	if (!spiflash_wait_ready(priv, FL_ERASING))
-+		return -EINTR;
-+
-+	spiflash_sendcmd(priv, SPI_WRITE_ENABLE, 0);
-+	reg = spiflash_wait_busy(priv);
-+
-+	op = &stm_opcodes[SPI_SECTOR_ERASE];
-+	temp = ((u32)instr->addr << 8) | (u32)(op->code);
-+	spiflash_write_reg(priv, SPI_FLASH_OPCODE, temp);
-+
-+	reg &= ~SPI_CTL_TX_RX_CNT_MASK;
-+	reg |= op->tx_cnt | SPI_CTL_START;
-+	spiflash_write_reg(priv, SPI_FLASH_CTL, reg);
-+
-+	spiflash_wait_complete(priv, 20);
-+
-+	instr->state = MTD_ERASE_DONE;
-+	mtd_erase_callback(instr);
-+
-+	return 0;
-+}
-+
-+static int
-+spiflash_read (struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf)
-+{
-+	struct spiflash_priv *priv = to_spiflash(mtd);
-+	u8 *read_addr;
-+
-+	if (!len)
-+		return 0;
-+
-+	if (from + len > mtd->size)
-+		return -EINVAL;
-+
-+	*retlen = len;
-+
-+	if (!spiflash_wait_ready(priv, FL_READING))
-+		return -EINTR;
-+
-+	read_addr = (u8 *)(priv->readaddr + from);
-+	memcpy_fromio(buf, read_addr, len);
-+	spiflash_done(priv);
-+
-+	return 0;
-+}
-+
-+static int
-+spiflash_write (struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u8 *buf)
-+{
-+	struct spiflash_priv *priv = to_spiflash(mtd);
-+	u32 opcode, bytes_left;
-+
-+	*retlen = 0;
-+
-+	if (!len)
-+		return 0;
-+
-+	if (to + len > mtd->size)
-+		return -EINVAL;
-+
-+	bytes_left = len;
-+
-+	do {
-+		u32 read_len, reg, page_offset, spi_data = 0;
-+
-+		read_len = min(bytes_left, sizeof(u32));
-+
-+		/* 32-bit writes cannot span across a page boundary
-+		 * (256 bytes). This types of writes require two page
-+		 * program operations to handle it correctly. The STM part
-+		 * will write the overflow data to the beginning of the
-+		 * current page as opposed to the subsequent page.
-+		 */
-+		page_offset = (to & (STM_PAGE_SIZE - 1)) + read_len;
-+
-+		if (page_offset > STM_PAGE_SIZE)
-+			read_len -= (page_offset - STM_PAGE_SIZE);
-+
-+		if (!spiflash_wait_ready(priv, FL_WRITING))
-+			return -EINTR;
-+
-+		spiflash_sendcmd(priv, SPI_WRITE_ENABLE, 0);
-+		spi_data = 0;
-+		switch (read_len) {
-+		case 4:
-+			spi_data |= buf[3] << 24;
-+			/* fall through */
-+		case 3:
-+			spi_data |= buf[2] << 16;
-+			/* fall through */
-+		case 2:
-+			spi_data |= buf[1] << 8;
-+			/* fall through */
-+		case 1:
-+			spi_data |= buf[0] & 0xff;
-+			break;
-+		default:
-+			break;
-+		}
-+
-+		spiflash_write_reg(priv, SPI_FLASH_DATA, spi_data);
-+		opcode = stm_opcodes[SPI_PAGE_PROGRAM].code |
-+			(to & 0x00ffffff) << 8;
-+		spiflash_write_reg(priv, SPI_FLASH_OPCODE, opcode);
-+
-+		reg = spiflash_read_reg(priv, SPI_FLASH_CTL);
-+		reg &= ~SPI_CTL_TX_RX_CNT_MASK;
-+		reg |= (read_len + 4) | SPI_CTL_START;
-+		spiflash_write_reg(priv, SPI_FLASH_CTL, reg);
-+
-+		spiflash_wait_complete(priv, 1);
-+
-+		bytes_left -= read_len;
-+		to += read_len;
-+		buf += read_len;
-+
-+		*retlen += read_len;
-+	} while (bytes_left != 0);
-+
-+	return 0;
-+}
-+
-+
-+#ifdef CONFIG_MTD_PARTITIONS
-+static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", "MyLoader", NULL };
-+#endif
-+
-+
-+static int
-+spiflash_probe(struct platform_device *pdev)
-+{
-+	struct spiflash_priv *priv;
-+	struct mtd_partition *parts;
-+	struct mtd_info *mtd;
-+	int index, num_parts;
-+	int result = 0;
-+
-+	priv = kzalloc(sizeof(struct spiflash_priv), GFP_KERNEL);
-+	spin_lock_init(&priv->lock);
-+	init_waitqueue_head(&priv->wq);
-+	priv->state = FL_READY;
-+	mtd = &priv->mtd;
-+
-+	priv->mmraddr = ioremap_nocache(SPI_FLASH_MMR, SPI_FLASH_MMR_SIZE);
-+	if (!priv->mmraddr) {
-+		printk(KERN_WARNING SPIFLASH "Failed to map flash device\n");
-+		goto error;
-+	}
-+
-+	index = spiflash_probe_chip(priv);
-+	if (!index) {
-+		printk (KERN_WARNING SPIFLASH "Found no serial flash device\n");
-+		goto error;
-+	}
-+
-+	priv->readaddr = ioremap_nocache(SPI_FLASH_READ, flashconfig_tbl[index].byte_cnt);
-+	if (!priv->readaddr) {
-+		printk (KERN_WARNING SPIFLASH "Failed to map flash device\n");
-+		goto error;
-+	}
-+
-+	platform_set_drvdata(pdev, priv);
-+	mtd->name = "spiflash";
-+	mtd->type = MTD_NORFLASH;
-+	mtd->flags = (MTD_CAP_NORFLASH|MTD_WRITEABLE);
-+	mtd->size = flashconfig_tbl[index].byte_cnt;
-+	mtd->erasesize = flashconfig_tbl[index].sector_size;
-+	mtd->writesize = 1;
-+	mtd->numeraseregions = 0;
-+	mtd->eraseregions = NULL;
-+	mtd->erase = spiflash_erase;
-+	mtd->read = spiflash_read;
-+	mtd->write = spiflash_write;
-+	mtd->owner = THIS_MODULE;
-+
-+#ifdef CONFIG_MTD_PARTITIONS
-+	/* parse redboot partitions */
-+	num_parts = parse_mtd_partitions(mtd, part_probe_types, &parts, 0);
-+	if (!num_parts)
-+		goto error;
-+
-+	result = add_mtd_partitions(mtd, parts, num_parts);
-+#endif
-+
-+	return result;
-+
-+error:
-+	if (priv->mmraddr)
-+		iounmap(priv->mmraddr);
-+	kfree(priv);
-+	return -ENXIO;
-+}
-+
-+static int
-+spiflash_remove (struct platform_device *pdev)
-+{
-+	struct spiflash_priv *priv = platform_get_drvdata(pdev);
-+	struct mtd_info *mtd = &priv->mtd;
-+
-+	del_mtd_partitions(mtd);
-+	iounmap(priv->mmraddr);
-+	iounmap(priv->readaddr);
-+	kfree(priv);
-+
-+	return 0;
-+}
-+
-+struct platform_driver spiflash_driver = {
-+	.driver.name = "spiflash",
-+	.probe = spiflash_probe,
-+	.remove = spiflash_remove,
-+};
-+
-+int __init
-+spiflash_init (void)
-+{
-+	return platform_driver_register(&spiflash_driver);
-+}
-+
-+void __exit
-+spiflash_exit (void)
-+{
-+	return platform_driver_unregister(&spiflash_driver);
-+}
-+
-+module_init (spiflash_init);
-+module_exit (spiflash_exit);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("OpenWrt.org, Atheros Communications Inc");
-+MODULE_DESCRIPTION("MTD driver for SPI Flash on Atheros SOC");
-+
---- /dev/null
-+++ b/arch/mips/include/asm/mach-ar231x/ar2315_spiflash.h
-@@ -0,0 +1,116 @@
-+/*
-+ * SPI Flash Memory support header file.
-+ *
-+ * Copyright (c) 2005, Atheros Communications Inc.
-+ * Copyright (C) 2006 FON Technology, SL.
-+ * Copyright (C) 2006 Imre Kaloz <kaloz@openwrt.org>
-+ * Copyright (C) 2006-2009 Felix Fietkau <nbd@openwrt.org>
-+ *
-+ * This code 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 __AR2315_SPIFLASH_H
-+#define __AR2315_SPIFLASH_H
-+
-+#define STM_PAGE_SIZE           256
-+
-+#define SFI_WRITE_BUFFER_SIZE   4
-+#define SFI_FLASH_ADDR_MASK     0x00ffffff
-+
-+#define STM_8MBIT_SIGNATURE     0x13
-+#define STM_M25P80_BYTE_COUNT   1048576
-+#define STM_M25P80_SECTOR_COUNT 16
-+#define STM_M25P80_SECTOR_SIZE  0x10000
-+
-+#define STM_16MBIT_SIGNATURE    0x14
-+#define STM_M25P16_BYTE_COUNT   2097152
-+#define STM_M25P16_SECTOR_COUNT 32
-+#define STM_M25P16_SECTOR_SIZE  0x10000
-+
-+#define STM_32MBIT_SIGNATURE    0x15
-+#define STM_M25P32_BYTE_COUNT   4194304
-+#define STM_M25P32_SECTOR_COUNT 64
-+#define STM_M25P32_SECTOR_SIZE  0x10000
-+
-+#define STM_64MBIT_SIGNATURE    0x16
-+#define STM_M25P64_BYTE_COUNT   8388608
-+#define STM_M25P64_SECTOR_COUNT 128
-+#define STM_M25P64_SECTOR_SIZE  0x10000
-+
-+#define STM_128MBIT_SIGNATURE   0x17
-+#define STM_M25P128_BYTE_COUNT   16777216
-+#define STM_M25P128_SECTOR_COUNT 256
-+#define STM_M25P128_SECTOR_SIZE  0x10000
-+
-+#define STM_1MB_BYTE_COUNT   STM_M25P80_BYTE_COUNT
-+#define STM_1MB_SECTOR_COUNT STM_M25P80_SECTOR_COUNT
-+#define STM_1MB_SECTOR_SIZE  STM_M25P80_SECTOR_SIZE
-+#define STM_2MB_BYTE_COUNT   STM_M25P16_BYTE_COUNT
-+#define STM_2MB_SECTOR_COUNT STM_M25P16_SECTOR_COUNT
-+#define STM_2MB_SECTOR_SIZE  STM_M25P16_SECTOR_SIZE
-+#define STM_4MB_BYTE_COUNT   STM_M25P32_BYTE_COUNT
-+#define STM_4MB_SECTOR_COUNT STM_M25P32_SECTOR_COUNT
-+#define STM_4MB_SECTOR_SIZE  STM_M25P32_SECTOR_SIZE
-+#define STM_8MB_BYTE_COUNT   STM_M25P64_BYTE_COUNT
-+#define STM_8MB_SECTOR_COUNT STM_M25P64_SECTOR_COUNT
-+#define STM_8MB_SECTOR_SIZE  STM_M25P64_SECTOR_SIZE
-+#define STM_16MB_BYTE_COUNT   STM_M25P128_BYTE_COUNT
-+#define STM_16MB_SECTOR_COUNT STM_M25P128_SECTOR_COUNT
-+#define STM_16MB_SECTOR_SIZE  STM_M25P128_SECTOR_SIZE
-+
-+/*
-+ * ST Microelectronics Opcodes for Serial Flash
-+ */
-+
-+#define STM_OP_WR_ENABLE       0x06     /* Write Enable */
-+#define STM_OP_WR_DISABLE      0x04     /* Write Disable */
-+#define STM_OP_RD_STATUS       0x05     /* Read Status */
-+#define STM_OP_WR_STATUS       0x01     /* Write Status */
-+#define STM_OP_RD_DATA         0x03     /* Read Data */
-+#define STM_OP_FAST_RD_DATA    0x0b     /* Fast Read Data */
-+#define STM_OP_PAGE_PGRM       0x02     /* Page Program */
-+#define STM_OP_SECTOR_ERASE    0xd8     /* Sector Erase */
-+#define STM_OP_BULK_ERASE      0xc7     /* Bulk Erase */
-+#define STM_OP_DEEP_PWRDOWN    0xb9     /* Deep Power-Down Mode */
-+#define STM_OP_RD_SIG          0xab     /* Read Electronic Signature */
-+
-+#define STM_STATUS_WIP       0x01       /* Write-In-Progress */
-+#define STM_STATUS_WEL       0x02       /* Write Enable Latch */
-+#define STM_STATUS_BP0       0x04       /* Block Protect 0 */
-+#define STM_STATUS_BP1       0x08       /* Block Protect 1 */
-+#define STM_STATUS_BP2       0x10       /* Block Protect 2 */
-+#define STM_STATUS_SRWD      0x80       /* Status Register Write Disable */
-+
-+/*
-+ * SPI Flash Interface Registers
-+ */
-+#define AR531XPLUS_SPI_READ     0x08000000
-+#define AR531XPLUS_SPI_MMR      0x11300000
-+#define AR531XPLUS_SPI_MMR_SIZE 12
-+
-+#define AR531XPLUS_SPI_CTL      0x00
-+#define AR531XPLUS_SPI_OPCODE   0x04
-+#define AR531XPLUS_SPI_DATA     0x08
-+
-+#define SPI_FLASH_READ          AR531XPLUS_SPI_READ
-+#define SPI_FLASH_MMR           AR531XPLUS_SPI_MMR
-+#define SPI_FLASH_MMR_SIZE      AR531XPLUS_SPI_MMR_SIZE
-+#define SPI_FLASH_CTL           AR531XPLUS_SPI_CTL
-+#define SPI_FLASH_OPCODE        AR531XPLUS_SPI_OPCODE
-+#define SPI_FLASH_DATA          AR531XPLUS_SPI_DATA
-+
-+#define SPI_CTL_START           0x00000100
-+#define SPI_CTL_BUSY            0x00010000
-+#define SPI_CTL_TXCNT_MASK      0x0000000f
-+#define SPI_CTL_RXCNT_MASK      0x000000f0
-+#define SPI_CTL_TX_RX_CNT_MASK  0x000000ff
-+#define SPI_CTL_SIZE_MASK       0x00060000
-+
-+#define SPI_CTL_CLK_SEL_MASK    0x03000000
-+#define SPI_OPCODE_MASK         0x000000ff
-+
-+#define SPI_STATUS_WIP		STM_STATUS_WIP
-+
-+#endif
diff --git a/target/linux/atheros/patches-2.6.33/130-watchdog.patch b/target/linux/atheros/patches-2.6.33/130-watchdog.patch
deleted file mode 100644
index ed80e79e5..000000000
--- a/target/linux/atheros/patches-2.6.33/130-watchdog.patch
+++ /dev/null
@@ -1,228 +0,0 @@
---- /dev/null
-+++ b/drivers/watchdog/ar2315-wtd.c
-@@ -0,0 +1,200 @@
-+/*
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ * Copyright (C) 2008 John Crispin <blogic@openwrt.org>
-+ * Based on EP93xx and ifxmips wdt driver
-+ */
-+
-+#include <linux/interrupt.h>
-+#include <linux/module.h>
-+#include <linux/moduleparam.h>
-+#include <linux/types.h>
-+#include <linux/miscdevice.h>
-+#include <linux/watchdog.h>
-+#include <linux/fs.h>
-+#include <linux/ioport.h>
-+#include <linux/notifier.h>
-+#include <linux/reboot.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+
-+#include <asm/io.h>
-+#include <asm/uaccess.h>
-+#include <asm/system.h>
-+#include <asm/addrspace.h>
-+#include <ar231x_platform.h>
-+#include <ar2315_regs.h>
-+#include <ar231x.h>
-+
-+#define CLOCK_RATE 40000000
-+#define HEARTBEAT(x) (x < 1 || x > 90)?(20):(x)
-+
-+static int wdt_timeout = 20;
-+static int started = 0;
-+static int in_use = 0;
-+
-+static void
-+ar2315_wdt_enable(void)
-+{
-+	ar231x_write_reg(AR2315_WD, wdt_timeout * CLOCK_RATE);
-+	ar231x_write_reg(AR2315_ISR, 0x80);
-+}
-+
-+static ssize_t
-+ar2315_wdt_write(struct file *file, const char __user *data, size_t len, loff_t *ppos)
-+{
-+	if(len)
-+		ar2315_wdt_enable();
-+	return len;
-+}
-+
-+static int
-+ar2315_wdt_open(struct inode *inode, struct file *file)
-+{
-+	if(in_use)
-+		return -EBUSY;
-+	ar2315_wdt_enable();
-+	in_use = started = 1;
-+	return nonseekable_open(inode, file);
-+}
-+
-+static int
-+ar2315_wdt_release(struct inode *inode, struct file *file)
-+{
-+	in_use = 0;
-+	return 0;
-+}
-+
-+static irqreturn_t
-+ar2315_wdt_interrupt(int irq, void *dev_id)
-+{
-+	if(started)
-+	{
-+		printk(KERN_CRIT "watchdog expired, rebooting system\n");
-+		emergency_restart();
-+	} else {
-+		ar231x_write_reg(AR2315_WDC, 0);
-+		ar231x_write_reg(AR2315_WD, 0);
-+		ar231x_write_reg(AR2315_ISR, 0x80);
-+	}
-+	return IRQ_HANDLED;
-+}
-+
-+static struct watchdog_info ident = {
-+	.options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
-+	.identity = "ar2315 Watchdog",
-+};
-+
-+static int
-+ar2315_wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
-+{
-+	int new_wdt_timeout;
-+	int ret = -ENOIOCTLCMD;
-+
-+	switch(cmd)
-+	{
-+		case WDIOC_GETSUPPORT:
-+			ret = copy_to_user((struct watchdog_info __user *)arg, &ident, sizeof(ident)) ? -EFAULT : 0;
-+			break;
-+
-+		case WDIOC_KEEPALIVE:
-+			ar2315_wdt_enable();
-+			ret = 0;
-+			break;
-+
-+		case WDIOC_SETTIMEOUT:
-+			if((ret = get_user(new_wdt_timeout, (int __user *)arg)))
-+				break;
-+			wdt_timeout = HEARTBEAT(new_wdt_timeout);
-+			ar2315_wdt_enable();
-+			break;
-+
-+		case WDIOC_GETTIMEOUT:
-+			ret = put_user(wdt_timeout, (int __user *)arg);
-+			break;
-+	}
-+	return ret;
-+}
-+
-+static struct file_operations ar2315_wdt_fops = {
-+	.owner		= THIS_MODULE,
-+	.llseek		= no_llseek,
-+	.write		= ar2315_wdt_write,
-+	.ioctl		= ar2315_wdt_ioctl,
-+	.open		= ar2315_wdt_open,
-+	.release	= ar2315_wdt_release,
-+};
-+
-+static struct miscdevice ar2315_wdt_miscdev = {
-+	.minor	= WATCHDOG_MINOR,
-+	.name	= "watchdog",
-+	.fops	= &ar2315_wdt_fops,
-+};
-+
-+static int
-+ar2315_wdt_probe(struct platform_device *dev)
-+{
-+	int ret = 0;
-+
-+	ar2315_wdt_enable();
-+	ret = request_irq(AR531X_MISC_IRQ_WATCHDOG, ar2315_wdt_interrupt, IRQF_DISABLED, "ar2315_wdt", NULL);
-+	if(ret)
-+	{
-+		printk(KERN_ERR "ar2315wdt: failed to register inetrrupt\n");
-+		goto out;
-+	}
-+
-+	ret = misc_register(&ar2315_wdt_miscdev);
-+	if(ret)
-+		printk(KERN_ERR "ar2315wdt: failed to register miscdev\n");
-+
-+out:
-+	return ret;
-+}
-+
-+static int
-+ar2315_wdt_remove(struct platform_device *dev)
-+{
-+	misc_deregister(&ar2315_wdt_miscdev);
-+	free_irq(AR531X_MISC_IRQ_WATCHDOG, NULL);
-+	return 0;
-+}
-+
-+static struct platform_driver ar2315_wdt_driver = {
-+	.probe = ar2315_wdt_probe,
-+	.remove = ar2315_wdt_remove,
-+	.driver = {
-+		.name = "ar2315_wdt",
-+		.owner = THIS_MODULE,
-+	},
-+};
-+
-+static int __init
-+init_ar2315_wdt(void)
-+{
-+	int ret = platform_driver_register(&ar2315_wdt_driver);
-+	if(ret)
-+		printk(KERN_INFO "ar2315_wdt: error registering platfom driver!");
-+	return ret;
-+}
-+
-+static void __exit
-+exit_ar2315_wdt(void)
-+{
-+	platform_driver_unregister(&ar2315_wdt_driver);
-+}
-+
-+module_init(init_ar2315_wdt);
-+module_exit(exit_ar2315_wdt);
---- a/drivers/watchdog/Kconfig
-+++ b/drivers/watchdog/Kconfig
-@@ -840,6 +840,12 @@ config TXX9_WDT
- 	help
- 	  Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs.
- 
-+config ATHEROS_WDT
-+	tristate "Atheros wisoc Watchdog Timer"
-+	depends on ATHEROS_AR231X
-+	help
-+	  Hardware driver for the Atheros wisoc Watchdog Timer.
-+
- # PARISC Architecture
- 
- # POWERPC Architecture
---- a/drivers/watchdog/Makefile
-+++ b/drivers/watchdog/Makefile
-@@ -112,6 +112,7 @@ obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt
- obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
- obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
- obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
-+obj-$(CONFIG_ATHEROS_WDT) += ar2315-wtd.o
- 
- # PARISC Architecture
- 
diff --git a/target/linux/atheros/patches-2.6.33/140-redboot_partition_scan.patch b/target/linux/atheros/patches-2.6.33/140-redboot_partition_scan.patch
deleted file mode 100644
index 289d4eb99..000000000
--- a/target/linux/atheros/patches-2.6.33/140-redboot_partition_scan.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/drivers/mtd/redboot.c
-+++ b/drivers/mtd/redboot.c
-@@ -60,31 +60,32 @@ static int parse_redboot_partitions(stru
- 	static char nullstring[] = "unallocated";
- #endif
- 
-+	buf = vmalloc(master->erasesize);
-+	if (!buf)
-+		return -ENOMEM;
-+
-+ restart:
- 	if ( directory < 0 ) {
- 		offset = master->size + directory * master->erasesize;
--		while (master->block_isbad && 
-+		while (master->block_isbad &&
- 		       master->block_isbad(master, offset)) {
- 			if (!offset) {
- 			nogood:
- 				printk(KERN_NOTICE "Failed to find a non-bad block to check for RedBoot partition table\n");
-+				vfree(buf);
- 				return -EIO;
- 			}
- 			offset -= master->erasesize;
- 		}
- 	} else {
- 		offset = directory * master->erasesize;
--		while (master->block_isbad && 
-+		while (master->block_isbad &&
- 		       master->block_isbad(master, offset)) {
- 			offset += master->erasesize;
- 			if (offset == master->size)
- 				goto nogood;
- 		}
- 	}
--	buf = vmalloc(master->erasesize);
--
--	if (!buf)
--		return -ENOMEM;
--
- 	printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n",
- 	       master->name, offset);
- 
-@@ -156,6 +157,11 @@ static int parse_redboot_partitions(stru
- 	}
- 	if (i == numslots) {
- 		/* Didn't find it */
-+		if (offset + master->erasesize < master->size) {
-+			/* not at the end of the flash yet, maybe next block :) */
-+			directory++;
-+			goto restart;
-+		}
- 		printk(KERN_NOTICE "No RedBoot partition table detected in %s\n",
- 		       master->name);
- 		ret = 0;
diff --git a/target/linux/atheros/patches-2.6.33/141-redboot_various_erase_size_fix.patch b/target/linux/atheros/patches-2.6.33/141-redboot_various_erase_size_fix.patch
deleted file mode 100644
index b9cb0b4bc..000000000
--- a/target/linux/atheros/patches-2.6.33/141-redboot_various_erase_size_fix.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- a/drivers/mtd/redboot.c
-+++ b/drivers/mtd/redboot.c
-@@ -39,6 +39,22 @@ static inline int redboot_checksum(struc
- 	return 1;
- }
- 
-+static uint32_t mtd_get_offset_erasesize(struct mtd_info *mtd, uint64_t offset)
-+{
-+	struct mtd_erase_region_info *regions = mtd->eraseregions;
-+	int i;
-+
-+	for (i = 0; i < mtd->numeraseregions; i++) {
-+		if (regions[i].offset +
-+		    regions[i].numblocks * regions[i].erasesize <= offset)
-+			continue;
-+
-+		return regions[i].erasesize;
-+	}
-+
-+	return mtd->erasesize;
-+}
-+
- static int parse_redboot_partitions(struct mtd_info *master,
-                              struct mtd_partition **pparts,
-                              unsigned long fis_origin)
-@@ -55,6 +71,7 @@ static int parse_redboot_partitions(stru
- 	int namelen = 0;
- 	int nulllen = 0;
- 	int numslots;
-+	int first_slot;
- 	unsigned long offset;
- #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
- 	static char nullstring[] = "unallocated";
-@@ -168,7 +185,10 @@ static int parse_redboot_partitions(stru
- 		goto out;
- 	}
- 
--	for (i = 0; i < numslots; i++) {
-+	first_slot = (buf[i].flash_base & (master->erasesize - 1)) /
-+		     sizeof(struct fis_image_desc);
-+
-+	for (i = first_slot; i < first_slot + numslots; i++) {
- 		struct fis_list *new_fl, **prev;
- 
- 		if (buf[i].name[0] == 0xff) {
-@@ -244,12 +264,13 @@ static int parse_redboot_partitions(stru
- 	}
- #endif
- 	for ( ; i<nrparts; i++) {
--		if(max_offset < buf[i].flash_base + buf[i].size)
--			max_offset = buf[i].flash_base + buf[i].size;
- 		parts[i].size = fl->img->size;
- 		parts[i].offset = fl->img->flash_base;
- 		parts[i].name = names;
- 
-+		if (max_offset < parts[i].offset + parts[i].size)
-+			max_offset = parts[i].offset + parts[i].size;
-+
- 		strcpy(names, fl->img->name);
- #ifdef CONFIG_MTD_REDBOOT_PARTS_READONLY
- 		if (!memcmp(names, "RedBoot", 8) ||
-@@ -279,7 +300,9 @@ static int parse_redboot_partitions(stru
- 		fl = fl->next;
- 		kfree(tmp_fl);
- 	}
--	if(master->size - max_offset >= master->erasesize)
-+
-+	if (master->size - max_offset >=
-+	    mtd_get_offset_erasesize(master, max_offset))
- 	{
- 		parts[nrparts].size = master->size - max_offset;
- 		parts[nrparts].offset = max_offset;
diff --git a/target/linux/atheros/patches-2.6.33/200-ar2313_enable_mvswitch.patch b/target/linux/atheros/patches-2.6.33/200-ar2313_enable_mvswitch.patch
deleted file mode 100644
index b97a62d81..000000000
--- a/target/linux/atheros/patches-2.6.33/200-ar2313_enable_mvswitch.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- a/drivers/net/ar231x.c
-+++ b/drivers/net/ar231x.c
-@@ -735,6 +735,7 @@ static void ar231x_load_rx_ring(struct n
- 	for (i = 0; i < nr_bufs; i++) {
- 		struct sk_buff *skb;
- 		ar231x_descr_t *rd;
-+		int offset = RX_OFFSET;
- 
- 		if (sp->rx_skb[idx])
- 			break;
-@@ -750,7 +751,9 @@ static void ar231x_load_rx_ring(struct n
- 		 * Make sure IP header starts on a fresh cache line.
- 		 */
- 		skb->dev = dev;
--		skb_reserve(skb, RX_OFFSET);
-+		if (sp->phy_dev)
-+			offset += sp->phy_dev->pkt_align;
-+		skb_reserve(skb, offset);
- 		sp->rx_skb[idx] = skb;
- 
- 		rd = (ar231x_descr_t *) & sp->rx_ring[idx];
-@@ -824,20 +827,23 @@ static int ar231x_rx_int(struct net_devi
- 			/* alloc new buffer. */
- 			skb_new = netdev_alloc_skb(dev, AR2313_BUFSIZE + RX_OFFSET);
- 			if (skb_new != NULL) {
-+				int offset;
- 
- 				skb = sp->rx_skb[idx];
- 				/* set skb */
- 				skb_put(skb,
- 						((status >> DMA_RX_LEN_SHIFT) & 0x3fff) - CRC_LEN);
--
- 				dev->stats.rx_bytes += skb->len;
--				skb->protocol = eth_type_trans(skb, dev);
--				/* pass the packet to upper layers */
--				netif_rx(skb);
- 
-+				/* pass the packet to upper layers */
-+				sp->rx(skb);
- 				skb_new->dev = dev;
-+
- 				/* 16 bit align */
--				skb_reserve(skb_new, RX_OFFSET);
-+				offset = RX_OFFSET;
-+				if (sp->phy_dev)
-+					offset += sp->phy_dev->pkt_align;
-+				skb_reserve(skb_new, offset);
- 				/* reset descriptor's curr_addr */
- 				rxdesc->addr = virt_to_phys(skb_new->data);
- 
-@@ -1239,6 +1245,8 @@ static int ar231x_mdiobus_probe (struct 
- 		return PTR_ERR(phydev);
- 	}
- 
-+	sp->rx = phydev->netif_rx;
-+
- 	/* mask with MAC supported features */
- 	phydev->supported &= (SUPPORTED_10baseT_Half
- 		| SUPPORTED_10baseT_Full
---- a/drivers/net/ar231x.h
-+++ b/drivers/net/ar231x.h
-@@ -221,6 +221,8 @@ typedef struct {
-  */
- struct ar231x_private {
- 	struct net_device *dev;
-+	int (*rx)(struct sk_buff *skb);
-+
- 	int version;
- 	u32 mb[2];
- 
diff --git a/target/linux/atheros/patches-2.6.33/210-reset_button.patch b/target/linux/atheros/patches-2.6.33/210-reset_button.patch
deleted file mode 100644
index 3c9181814..000000000
--- a/target/linux/atheros/patches-2.6.33/210-reset_button.patch
+++ /dev/null
@@ -1,174 +0,0 @@
---- a/arch/mips/ar231x/Makefile
-+++ b/arch/mips/ar231x/Makefile
-@@ -8,7 +8,7 @@
- # Copyright (C) 2006-2009 Felix Fietkau <nbd@openwrt.org>
- #
- 
--obj-y += board.o prom.o devices.o
-+obj-y += board.o prom.o devices.o reset.o
- 
- obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
- 
---- /dev/null
-+++ b/arch/mips/ar231x/reset.c
-@@ -0,0 +1,160 @@
-+#include <linux/init.h>
-+#include <linux/module.h>
-+#include <linux/timer.h>
-+#include <linux/interrupt.h>
-+#include <linux/kobject.h>
-+#include <linux/workqueue.h>
-+#include <linux/skbuff.h>
-+#include <linux/netlink.h>
-+#include <net/sock.h>
-+#include <asm/uaccess.h>
-+#include <ar231x_platform.h>
-+#include <ar231x.h>
-+#include <gpio.h>
-+#include "devices.h"
-+
-+#define AR531X_RESET_GPIO_IRQ	(AR531X_GPIO_IRQ(ar231x_board.config->resetConfigGpio))
-+
-+struct event_t {
-+	struct work_struct wq;
-+	int set;
-+	unsigned long jiffies;
-+};
-+
-+static struct timer_list rst_button_timer;
-+static unsigned long seen;
-+
-+extern struct sock *uevent_sock;
-+extern u64 uevent_next_seqnum(void);
-+
-+static int no_release_workaround = 1;
-+module_param(no_release_workaround, int, 0);
-+
-+static inline void
-+add_msg(struct sk_buff *skb, char *msg)
-+{
-+	char *scratch;
-+	scratch = skb_put(skb, strlen(msg) + 1);
-+	sprintf(scratch, msg);
-+}
-+
-+static void
-+hotplug_button(struct work_struct *wq)
-+{
-+	struct sk_buff *skb;
-+	struct event_t *event;
-+	size_t len;
-+	char *scratch, *s;
-+	char buf[128];
-+
-+	event = container_of(wq, struct event_t, wq);
-+	if (!uevent_sock)
-+		goto done;
-+
-+	/* allocate message with the maximum possible size */
-+	s = event->set ? "pressed" : "released";
-+	len = strlen(s) + 2;
-+	skb = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);
-+	if (!skb)
-+		goto done;
-+
-+	/* add header */
-+	scratch = skb_put(skb, len);
-+	sprintf(scratch, "%s@",s);
-+
-+	/* copy keys to our continuous event payload buffer */
-+	add_msg(skb, "HOME=/");
-+	add_msg(skb, "PATH=/sbin:/bin:/usr/sbin:/usr/bin");
-+	add_msg(skb, "SUBSYSTEM=button");
-+	add_msg(skb, "BUTTON=reset");
-+	add_msg(skb, (event->set ? "ACTION=pressed" : "ACTION=released"));
-+	sprintf(buf, "SEEN=%ld", (event->jiffies - seen)/HZ);
-+	add_msg(skb, buf);
-+	snprintf(buf, 128, "SEQNUM=%llu", uevent_next_seqnum());
-+	add_msg(skb, buf);
-+
-+	NETLINK_CB(skb).dst_group = 1;
-+	netlink_broadcast(uevent_sock, skb, 0, 1, GFP_KERNEL);
-+
-+done:
-+	kfree(event);
-+}
-+
-+static void
-+reset_button_poll(unsigned long unused)
-+{
-+	struct event_t *event;
-+	int gpio = ~0;
-+
-+	if(!no_release_workaround)
-+		return;
-+
-+	gpio = ar231x_gpiodev->get();
-+	gpio &= (1 << (AR531X_RESET_GPIO_IRQ - AR531X_GPIO_IRQ_BASE));
-+	if(gpio) {
-+		rst_button_timer.expires = jiffies + (HZ / 4);
-+		add_timer(&rst_button_timer);
-+		return;
-+	}
-+
-+	event = (struct event_t *) kzalloc(sizeof(struct event_t), GFP_ATOMIC);
-+	if (!event)
-+		return;
-+
-+	event->set = 0;
-+	event->jiffies = jiffies;
-+	INIT_WORK(&event->wq, hotplug_button);
-+	schedule_work(&event->wq);
-+}
-+
-+static irqreturn_t
-+button_handler(int irq, void *dev_id)
-+{
-+	static int pressed = 0;
-+	struct event_t *event;
-+	u32 gpio = ~0;
-+
-+	event = (struct event_t *) kzalloc(sizeof(struct event_t), GFP_ATOMIC);
-+	if (!event)
-+		return IRQ_NONE;
-+
-+	pressed = !pressed;
-+
-+	gpio = ar231x_gpiodev->get() & (1 << (irq - AR531X_GPIO_IRQ_BASE));
-+
-+	event->set = gpio;
-+	if(!event->set)
-+		no_release_workaround = 0;
-+
-+	event->jiffies = jiffies;
-+
-+	INIT_WORK(&event->wq, hotplug_button);
-+	schedule_work(&event->wq);
-+
-+	seen = jiffies;
-+	if(event->set && no_release_workaround)
-+		mod_timer(&rst_button_timer, jiffies + (HZ / 4));
-+
-+	return IRQ_HANDLED;
-+}
-+
-+
-+static int __init
-+ar231x_init_reset(void)
-+{
-+	seen = jiffies;
-+
-+	if (ar231x_board.config->resetConfigGpio == 0xffff)
-+		return -ENODEV;
-+
-+	init_timer(&rst_button_timer);
-+	rst_button_timer.function = reset_button_poll;
-+	rst_button_timer.expires = jiffies + HZ / 50;
-+	add_timer(&rst_button_timer);
-+
-+	request_irq(AR531X_RESET_GPIO_IRQ, &button_handler, IRQF_SAMPLE_RANDOM, "ar231x_reset", NULL);
-+
-+	return 0;
-+}
-+
-+module_init(ar231x_init_reset);
diff --git a/target/linux/atheros/patches-2.6.33/220-enet_micrel_workaround.patch b/target/linux/atheros/patches-2.6.33/220-enet_micrel_workaround.patch
deleted file mode 100644
index 989bd7606..000000000
--- a/target/linux/atheros/patches-2.6.33/220-enet_micrel_workaround.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- a/drivers/net/ar231x.c
-+++ b/drivers/net/ar231x.c
-@@ -148,6 +148,7 @@ static int ar231x_mdiobus_write(struct m
- static int ar231x_mdiobus_reset(struct mii_bus *bus);
- static int ar231x_mdiobus_probe (struct net_device *dev);
- static void ar231x_adjust_link(struct net_device *dev);
-+static bool no_phy = false;
- 
- #ifndef ERR
- #define ERR(fmt, args...) printk("%s: " fmt, __func__, ##args)
-@@ -278,6 +279,21 @@ int __init ar231x_probe(struct platform_
- 
- 	mdiobus_register(sp->mii_bus);
- 
-+	/* Workaround for Micrel switch, which is only available on
-+	 * one PHY and cannot be configured through MDIO */
-+	if (!no_phy) {
-+		u32 phy_id = 0;
-+		get_phy_id(sp->mii_bus, 1, &phy_id);
-+		if (phy_id == 0x00221450)
-+			no_phy = true;
-+	}
-+	if (no_phy) {
-+		sp->link = 1;
-+		netif_carrier_on(dev);
-+		return 0;
-+	}
-+	no_phy = true;
-+
- 	if (ar231x_mdiobus_probe(dev) != 0) {
- 		printk(KERN_ERR "%s: mdiobus_probe failed\n", dev->name);
- 		rx_tasklet_cleanup(dev);
-@@ -334,8 +350,10 @@ static int __devexit ar231x_remove(struc
- 	rx_tasklet_cleanup(dev);
- 	ar231x_init_cleanup(dev);
- 	unregister_netdev(dev);
--	mdiobus_unregister(sp->mii_bus);
--	mdiobus_free(sp->mii_bus);
-+	if (sp->mii_bus) {
-+		mdiobus_unregister(sp->mii_bus);
-+		mdiobus_free(sp->mii_bus);
-+	}
- 	kfree(dev);
- 	return 0;
- }
-@@ -836,7 +854,12 @@ static int ar231x_rx_int(struct net_devi
- 				dev->stats.rx_bytes += skb->len;
- 
- 				/* pass the packet to upper layers */
--				sp->rx(skb);
-+				if (sp->rx) {
-+					sp->rx(skb);
-+				} else {
-+					skb->protocol = eth_type_trans(skb, skb->dev);
-+					netif_rx(skb);
-+				}
- 				skb_new->dev = dev;
- 
- 				/* 16 bit align */
-@@ -1123,6 +1146,9 @@ static int ar231x_ioctl(struct net_devic
- 	struct ar231x_private *sp = netdev_priv(dev);
- 	int ret;
- 
-+	if (!sp->phy_dev)
-+		return -ENODEV;
-+
- 	switch (cmd) {
- 
- 	case SIOCETHTOOL:
diff --git a/target/linux/brcm47xx/config-2.6.33 b/target/linux/brcm47xx/config-2.6.33
deleted file mode 100644
index ffc491336..000000000
--- a/target/linux/brcm47xx/config-2.6.33
+++ /dev/null
@@ -1,208 +0,0 @@
-CONFIG_32BIT=y
-# CONFIG_64BIT is not set
-# CONFIG_ALCHEMY_GPIO_INDIRECT is not set
-# CONFIG_AR7 is not set
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_ARCH_SUPPORTS_OPROFILE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-# CONFIG_ARPD is not set
-CONFIG_B44=y
-CONFIG_B44_PCI=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_BCM47XX=y
-CONFIG_BCM47XX_WDT=y
-# CONFIG_BCM63XX is not set
-CONFIG_BITREVERSE=y
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
-# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
-CONFIG_CEVT_R4K=y
-CONFIG_CEVT_R4K_LIB=y
-CONFIG_CFE=y
-CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"
-CONFIG_CMDLINE_BOOL=y
-# CONFIG_CMDLINE_OVERRIDE is not set
-# CONFIG_CPU_BIG_ENDIAN is not set
-# CONFIG_CPU_CAVIUM_OCTEON is not set
-CONFIG_CPU_HAS_PREFETCH=y
-CONFIG_CPU_HAS_SYNC=y
-CONFIG_CPU_LITTLE_ENDIAN=y
-# CONFIG_CPU_LOONGSON2E is not set
-# CONFIG_CPU_LOONGSON2F is not set
-CONFIG_CPU_MIPS32=y
-CONFIG_CPU_MIPS32_R1=y
-# CONFIG_CPU_MIPS32_R2 is not set
-# CONFIG_CPU_MIPS64_R1 is not set
-# CONFIG_CPU_MIPS64_R2 is not set
-CONFIG_CPU_MIPSR1=y
-# CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R10000 is not set
-# CONFIG_CPU_R3000 is not set
-# CONFIG_CPU_R4300 is not set
-# CONFIG_CPU_R4X00 is not set
-# CONFIG_CPU_R5000 is not set
-# CONFIG_CPU_R5432 is not set
-# CONFIG_CPU_R5500 is not set
-# CONFIG_CPU_R6000 is not set
-# CONFIG_CPU_R8000 is not set
-# CONFIG_CPU_RM7000 is not set
-# CONFIG_CPU_RM9000 is not set
-# CONFIG_CPU_SB1 is not set
-CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_HIGHMEM=y
-# CONFIG_CPU_TX39XX is not set
-# CONFIG_CPU_TX49XX is not set
-# CONFIG_CPU_VR41XX is not set
-CONFIG_CSRC_R4K=y
-CONFIG_CSRC_R4K_LIB=y
-CONFIG_DECOMPRESS_LZMA=y
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_SMACK is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
-CONFIG_DEVPORT=y
-# CONFIG_DM9000 is not set
-CONFIG_DMA_NEED_PCI_MAP_STATE=y
-CONFIG_DMA_NONCOHERENT=y
-# CONFIG_FSNOTIFY is not set
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-# CONFIG_HAMRADIO is not set
-CONFIG_HARDWARE_WATCHPOINTS=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAVE_ARCH_KGDB=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_HAVE_IDE=y
-CONFIG_HAVE_OPROFILE=y
-CONFIG_HW_HAS_PCI=y
-CONFIG_HW_RANDOM=y
-CONFIG_HZ=250
-# CONFIG_HZ_100 is not set
-CONFIG_HZ_250=y
-CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_INLINE_READ_LOCK is not set
-# CONFIG_INLINE_READ_LOCK_BH is not set
-# CONFIG_INLINE_READ_LOCK_IRQ is not set
-# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_READ_TRYLOCK is not set
-CONFIG_INLINE_READ_UNLOCK=y
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_SPIN_LOCK is not set
-# CONFIG_INLINE_SPIN_LOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_SPIN_TRYLOCK is not set
-# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
-CONFIG_INLINE_SPIN_UNLOCK=y
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_WRITE_LOCK is not set
-# CONFIG_INLINE_WRITE_LOCK_BH is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_WRITE_TRYLOCK is not set
-CONFIG_INLINE_WRITE_UNLOCK=y
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-# CONFIG_IP_ROUTE_VERBOSE is not set
-CONFIG_IRQ_CPU=y
-CONFIG_KALLSYMS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LOONGSON_UART_BASE=y
-# CONFIG_MACH_ALCHEMY is not set
-# CONFIG_MACH_DECSTATION is not set
-# CONFIG_MACH_JAZZ is not set
-# CONFIG_MACH_LOONGSON is not set
-# CONFIG_MACH_TX39XX is not set
-# CONFIG_MACH_TX49XX is not set
-# CONFIG_MACH_VR41XX is not set
-# CONFIG_MIKROTIK_RB532 is not set
-CONFIG_MIPS=y
-# CONFIG_MIPS_COBALT is not set
-CONFIG_MIPS_L1_CACHE_SHIFT=5
-# CONFIG_MIPS_MACHINE is not set
-# CONFIG_MIPS_MALTA is not set
-CONFIG_MIPS_MT_DISABLED=y
-# CONFIG_MIPS_MT_SMP is not set
-# CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_SIM is not set
-CONFIG_MTD_BCM47XX=y
-# CONFIG_MUTEX_SPIN_ON_OWNER is not set
-# CONFIG_NO_IOPORT is not set
-# CONFIG_NXP_STB220 is not set
-# CONFIG_NXP_STB225 is not set
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PHYLIB=y
-# CONFIG_PMC_MSP is not set
-# CONFIG_PMC_YOSEMITE is not set
-# CONFIG_PNX8550_JBS is not set
-# CONFIG_PNX8550_STB810 is not set
-# CONFIG_POWERTV is not set
-# CONFIG_PROC_KCORE is not set
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-# CONFIG_SCSI_DMA is not set
-# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-CONFIG_SERIAL_8250_EXTENDED=y
-# CONFIG_SERIAL_8250_MANY_PORTS is not set
-# CONFIG_SERIAL_8250_RSA is not set
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-# CONFIG_SGI_IP22 is not set
-# CONFIG_SGI_IP27 is not set
-# CONFIG_SGI_IP28 is not set
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_SWARM is not set
-CONFIG_SSB=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_DEBUG=y
-CONFIG_SSB_DRIVER_EXTIF=y
-CONFIG_SSB_DRIVER_GIGE=y
-CONFIG_SSB_DRIVER_MIPS=y
-CONFIG_SSB_DRIVER_PCICORE=y
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_EMBEDDED=y
-CONFIG_SSB_PCICORE_HOSTMODE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_SERIAL=y
-CONFIG_SSB_SPROM=y
-CONFIG_SYS_HAS_CPU_MIPS32_R1=y
-CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
-# CONFIG_TC35815 is not set
-# CONFIG_TINY_RCU is not set
-CONFIG_TRAD_SIGNALS=y
-# CONFIG_TREE_PREEMPT_RCU is not set
-CONFIG_TREE_RCU=y
-CONFIG_USB_SUPPORT=y
-CONFIG_WATCHDOG_NOWAYOUT=y
-CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/brcm47xx/patches-2.6.32/150-cpu_fixes.patch b/target/linux/brcm47xx/patches-2.6.32/150-cpu_fixes.patch
index 9e3309307..e6ac4c8e8 100644
--- a/target/linux/brcm47xx/patches-2.6.32/150-cpu_fixes.patch
+++ b/target/linux/brcm47xx/patches-2.6.32/150-cpu_fixes.patch
@@ -345,7 +345,7 @@
  }
 --- a/arch/mips/mm/tlbex.c
 +++ b/arch/mips/mm/tlbex.c
-@@ -739,6 +739,9 @@ static void __cpuinit build_r4000_tlb_re
+@@ -733,6 +733,9 @@ static void __cpuinit build_r4000_tlb_re
  		/* No need for uasm_i_nop */
  	}
  
@@ -355,7 +355,7 @@
  #ifdef CONFIG_64BIT
  	build_get_pmde64(&p, &l, &r, K0, K1); /* get pmd in K1 */
  #else
-@@ -1193,6 +1196,9 @@ build_r4000_tlbchange_handler_head(u32 *
+@@ -1185,6 +1188,9 @@ build_r4000_tlbchange_handler_head(u32 *
  				   struct uasm_reloc **r, unsigned int pte,
  				   unsigned int ptr)
  {
diff --git a/target/linux/brcm47xx/patches-2.6.32/180-ssb_extif_interrupt.patch b/target/linux/brcm47xx/patches-2.6.32/180-ssb_extif_interrupt.patch
deleted file mode 100644
index d89531cda..000000000
--- a/target/linux/brcm47xx/patches-2.6.32/180-ssb_extif_interrupt.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 83e34f03ee9b86b49bde4707a1fe03a1837e29be Mon Sep 17 00:00:00 2001
-From: Jochen Friedrich <jochen@scram.de>
-Date: Wed, 3 Feb 2010 21:28:11 +0100
-Subject: [PATCH 1/1] ssb: fix interrupt assignment
-
-Explicitely enable shared interrupt 2 for any core that didn't get a dedicated IRQ
-anymore (fallthrough case) and for EXTIF cores to make gpio interrupts work.
-Also remove a bogus comment.
-
-Signed-off-by: Jochen Friedrich <jochen@scram.de>
-Signed-off-by: John W. Linville <linville@tuxdriver.com>
----
- drivers/ssb/driver_mipscore.c |    5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
---- a/drivers/ssb/driver_mipscore.c
-+++ b/drivers/ssb/driver_mipscore.c
-@@ -270,7 +270,6 @@ void ssb_mipscore_init(struct ssb_mipsco
- 				set_irq(dev, irq++);
- 			}
- 			break;
--			/* fallthrough */
- 		case SSB_DEV_PCI:
- 		case SSB_DEV_ETHERNET:
- 		case SSB_DEV_ETHERNET_GBIT:
-@@ -281,6 +280,10 @@ void ssb_mipscore_init(struct ssb_mipsco
- 				set_irq(dev, irq++);
- 				break;
- 			}
-+			/* fallthrough */
-+		case SSB_DEV_EXTIF:
-+			set_irq(dev, 0);
-+			break;
- 		}
- 	}
- 	ssb_dprintk(KERN_INFO PFX "after irq reconfiguration\n");
diff --git a/target/linux/brcm47xx/patches-2.6.32/220-bcm5354.patch b/target/linux/brcm47xx/patches-2.6.32/220-bcm5354.patch
index 360751a7a..1d75e171d 100644
--- a/target/linux/brcm47xx/patches-2.6.32/220-bcm5354.patch
+++ b/target/linux/brcm47xx/patches-2.6.32/220-bcm5354.patch
@@ -1,6 +1,6 @@
 --- a/drivers/ssb/driver_chipcommon.c
 +++ b/drivers/ssb/driver_chipcommon.c
-@@ -258,6 +258,8 @@ void ssb_chipco_resume(struct ssb_chipco
+@@ -260,6 +260,8 @@ void ssb_chipco_resume(struct ssb_chipco
  void ssb_chipco_get_clockcpu(struct ssb_chipcommon *cc,
                               u32 *plltype, u32 *n, u32 *m)
  {
@@ -9,7 +9,7 @@
  	*n = chipco_read32(cc, SSB_CHIPCO_CLOCK_N);
  	*plltype = (cc->capabilities & SSB_CHIPCO_CAP_PLLT);
  	switch (*plltype) {
-@@ -281,6 +283,8 @@ void ssb_chipco_get_clockcpu(struct ssb_
+@@ -283,6 +285,8 @@ void ssb_chipco_get_clockcpu(struct ssb_
  void ssb_chipco_get_clockcontrol(struct ssb_chipcommon *cc,
  				 u32 *plltype, u32 *n, u32 *m)
  {
@@ -31,7 +31,7 @@
  	}
 --- a/drivers/ssb/main.c
 +++ b/drivers/ssb/main.c
-@@ -1066,6 +1066,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
+@@ -1073,6 +1073,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
  
  	if (bus->chip_id == 0x5365) {
  		rate = 100000000;
diff --git a/target/linux/brcm47xx/patches-2.6.32/610-pci_ide_fix.patch b/target/linux/brcm47xx/patches-2.6.32/610-pci_ide_fix.patch
new file mode 100644
index 000000000..26ba3b755
--- /dev/null
+++ b/target/linux/brcm47xx/patches-2.6.32/610-pci_ide_fix.patch
@@ -0,0 +1,14 @@
+--- a/include/linux/ide.h
++++ b/include/linux/ide.h
+@@ -195,7 +195,11 @@
+ 	hw->io_ports.ctl_addr = ctl_addr;
+ }
+ 
++#if defined CONFIG_BCM47XX
++# define MAX_HWIFS	2
++#else
+ #define MAX_HWIFS	10
++#endif
+ 
+ /*
+  * Now for the data we need to maintain per-drive:  ide_drive_t
diff --git a/target/linux/brcm47xx/patches-2.6.32/700-ssb-gigabit-ethernet-driver.patch b/target/linux/brcm47xx/patches-2.6.32/700-ssb-gigabit-ethernet-driver.patch
index de2501950..dce689f19 100644
--- a/target/linux/brcm47xx/patches-2.6.32/700-ssb-gigabit-ethernet-driver.patch
+++ b/target/linux/brcm47xx/patches-2.6.32/700-ssb-gigabit-ethernet-driver.patch
@@ -102,7 +102,7 @@
  		tg3_readphy(tp, MII_BMSR, &tmp);
  		if (!tg3_readphy(tp, MII_BMSR, &tmp) &&
  		    (tmp & BMSR_LSTATUS))
-@@ -6264,6 +6289,11 @@ static int tg3_poll_fw(struct tg3 *tp)
+@@ -6273,6 +6298,11 @@ static int tg3_poll_fw(struct tg3 *tp)
  	int i;
  	u32 val;
  
@@ -114,7 +114,7 @@
  	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) {
  		/* Wait up to 20ms for init done. */
  		for (i = 0; i < 200; i++) {
-@@ -6541,6 +6571,14 @@ static int tg3_chip_reset(struct tg3 *tp
+@@ -6550,6 +6580,14 @@ static int tg3_chip_reset(struct tg3 *tp
  		tw32(0x5000, 0x400);
  	}
  
@@ -129,7 +129,7 @@
  	tw32(GRC_MODE, tp->grc_mode);
  
  	if (tp->pci_chip_rev_id == CHIPREV_ID_5705_A0) {
-@@ -6695,9 +6733,12 @@ static int tg3_halt_cpu(struct tg3 *tp, 
+@@ -6704,9 +6742,12 @@ static int tg3_halt_cpu(struct tg3 *tp, 
  		return -ENODEV;
  	}
  
@@ -145,7 +145,7 @@
  	return 0;
  }
  
-@@ -6760,6 +6801,11 @@ static int tg3_load_5701_a0_firmware_fix
+@@ -6769,6 +6810,11 @@ static int tg3_load_5701_a0_firmware_fix
  	const __be32 *fw_data;
  	int err, i;
  
@@ -157,7 +157,7 @@
  	fw_data = (void *)tp->fw->data;
  
  	/* Firmware blob starts with version numbers, followed by
-@@ -6819,6 +6865,11 @@ static int tg3_load_tso_firmware(struct 
+@@ -6828,6 +6874,11 @@ static int tg3_load_tso_firmware(struct 
  	unsigned long cpu_base, cpu_scratch_base, cpu_scratch_size;
  	int err, i;
  
@@ -169,7 +169,7 @@
  	if (tp->tg3_flags2 & TG3_FLG2_HW_TSO)
  		return 0;
  
-@@ -7906,6 +7957,11 @@ static void tg3_timer(unsigned long __op
+@@ -7915,6 +7966,11 @@ static void tg3_timer(unsigned long __op
  
  	spin_lock(&tp->lock);
  
@@ -181,7 +181,7 @@
  	if (!(tp->tg3_flags & TG3_FLAG_TAGGED_STATUS)) {
  		/* All of this garbage is because when using non-tagged
  		 * IRQ status the mailbox/status_block protocol the chip
-@@ -9791,6 +9847,11 @@ static int tg3_test_nvram(struct tg3 *tp
+@@ -9800,6 +9856,11 @@ static int tg3_test_nvram(struct tg3 *tp
  	if (tp->tg3_flags3 & TG3_FLG3_NO_NVRAM)
  		return 0;
  
@@ -193,7 +193,7 @@
  	if (tg3_nvram_read(tp, 0, &magic) != 0)
  		return -EIO;
  
-@@ -10585,7 +10646,7 @@ static int tg3_ioctl(struct net_device *
+@@ -10594,7 +10655,7 @@ static int tg3_ioctl(struct net_device *
  			return -EAGAIN;
  
  		spin_lock_bh(&tp->lock);
@@ -202,7 +202,7 @@
  		spin_unlock_bh(&tp->lock);
  
  		data->val_out = mii_regval;
-@@ -10601,7 +10662,7 @@ static int tg3_ioctl(struct net_device *
+@@ -10610,7 +10671,7 @@ static int tg3_ioctl(struct net_device *
  			return -EAGAIN;
  
  		spin_lock_bh(&tp->lock);
@@ -211,7 +211,7 @@
  		spin_unlock_bh(&tp->lock);
  
  		return err;
-@@ -11246,6 +11307,12 @@ static void __devinit tg3_get_5717_nvram
+@@ -11255,6 +11316,12 @@ static void __devinit tg3_get_5717_nvram
  /* Chips other than 5700/5701 use the NVRAM for fetching info. */
  static void __devinit tg3_nvram_init(struct tg3 *tp)
  {
@@ -224,7 +224,7 @@
  	tw32_f(GRC_EEPROM_ADDR,
  	     (EEPROM_ADDR_FSM_RESET |
  	      (EEPROM_DEFAULT_CLOCK_PERIOD <<
-@@ -11506,6 +11573,9 @@ static int tg3_nvram_write_block(struct 
+@@ -11515,6 +11582,9 @@ static int tg3_nvram_write_block(struct 
  {
  	int ret;
  
@@ -234,7 +234,7 @@
  	if (tp->tg3_flags & TG3_FLAG_EEPROM_WRITE_PROT) {
  		tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl &
  		       ~GRC_LCLCTRL_GPIO_OUTPUT1);
-@@ -12788,6 +12858,11 @@ static int __devinit tg3_get_invariants(
+@@ -12800,6 +12870,11 @@ static int __devinit tg3_get_invariants(
  	      GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701)))
  		tp->tg3_flags |= TG3_FLAG_SRAM_USE_CONFIG;
  
@@ -246,7 +246,7 @@
  	/* Get eeprom hw config before calling tg3_set_power_state().
  	 * In particular, the TG3_FLG2_IS_NIC flag must be
  	 * determined before calling tg3_set_power_state() so that
-@@ -13177,6 +13252,10 @@ static int __devinit tg3_get_device_addr
+@@ -13189,6 +13264,10 @@ static int __devinit tg3_get_device_addr
  	}
  
  	if (!is_valid_ether_addr(&dev->dev_addr[0])) {
@@ -257,7 +257,7 @@
  #ifdef CONFIG_SPARC
  		if (!tg3_get_default_macaddr_sparc(tp))
  			return 0;
-@@ -13669,6 +13748,7 @@ static char * __devinit tg3_phy_string(s
+@@ -13681,6 +13760,7 @@ static char * __devinit tg3_phy_string(s
  	case PHY_ID_BCM5704:	return "5704";
  	case PHY_ID_BCM5705:	return "5705";
  	case PHY_ID_BCM5750:	return "5750";
@@ -265,7 +265,7 @@
  	case PHY_ID_BCM5752:	return "5752";
  	case PHY_ID_BCM5714:	return "5714";
  	case PHY_ID_BCM5780:	return "5780";
-@@ -13880,6 +13960,13 @@ static int __devinit tg3_init_one(struct
+@@ -13892,6 +13972,13 @@ static int __devinit tg3_init_one(struct
  		tp->msg_enable = tg3_debug;
  	else
  		tp->msg_enable = TG3_DEF_MSG_ENABLE;
@@ -291,7 +291,7 @@
  
  #define NIC_SRAM_RX_MINI_BUFFER_DESC	0x00001000
  
-@@ -2821,6 +2824,7 @@ struct tg3 {
+@@ -2824,6 +2827,7 @@ struct tg3 {
  #define PHY_ID_BCM5714			0x60008340
  #define PHY_ID_BCM5780			0x60008350
  #define PHY_ID_BCM5755			0xbc050cc0
@@ -299,7 +299,7 @@
  #define PHY_ID_BCM5787			0xbc050ce0
  #define PHY_ID_BCM5756			0xbc050ed0
  #define PHY_ID_BCM5784			0xbc050fa0
-@@ -2865,7 +2869,7 @@ struct tg3 {
+@@ -2868,7 +2872,7 @@ struct tg3 {
  	 (X) == PHY_ID_BCM5780 || (X) == PHY_ID_BCM5787 || \
  	 (X) == PHY_ID_BCM5755 || (X) == PHY_ID_BCM5756 || \
  	 (X) == PHY_ID_BCM5906 || (X) == PHY_ID_BCM5761 || \
diff --git a/target/linux/brcm47xx/patches-2.6.32/813-use_netdev_alloc_skb.patch b/target/linux/brcm47xx/patches-2.6.32/813-use_netdev_alloc_skb.patch
index c431e4096..a9b2db586 100644
--- a/target/linux/brcm47xx/patches-2.6.32/813-use_netdev_alloc_skb.patch
+++ b/target/linux/brcm47xx/patches-2.6.32/813-use_netdev_alloc_skb.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/b44.c
 +++ b/drivers/net/b44.c
-@@ -815,7 +815,7 @@ static int b44_rx(struct b44 *bp, int bu
+@@ -848,7 +848,7 @@ static int b44_rx(struct b44 *bp, int bu
  			struct sk_buff *copy_skb;
  
  			b44_recycle_rx(bp, cons, bp->rx_prod);
diff --git a/target/linux/brcm47xx/patches-2.6.32/920-cache-wround.patch b/target/linux/brcm47xx/patches-2.6.32/920-cache-wround.patch
index 3a527df25..688d3e138 100644
--- a/target/linux/brcm47xx/patches-2.6.32/920-cache-wround.patch
+++ b/target/linux/brcm47xx/patches-2.6.32/920-cache-wround.patch
@@ -31,7 +31,7 @@
  
 --- a/arch/mips/mm/tlbex.c
 +++ b/arch/mips/mm/tlbex.c
-@@ -601,6 +601,9 @@ build_get_pgde32(u32 **p, unsigned int t
+@@ -595,6 +595,9 @@ build_get_pgde32(u32 **p, unsigned int t
  #endif
  	uasm_i_addu(p, ptr, tmp, ptr);
  #else
@@ -41,7 +41,7 @@
  	UASM_i_LA_mostly(p, ptr, pgdc);
  #endif
  	uasm_i_mfc0(p, tmp, C0_BADVADDR); /* get faulting address */
-@@ -739,12 +742,12 @@ static void __cpuinit build_r4000_tlb_re
+@@ -733,12 +736,12 @@ static void __cpuinit build_r4000_tlb_re
  		/* No need for uasm_i_nop */
  	}
  
@@ -57,7 +57,7 @@
  	build_get_pgde32(&p, K0, K1); /* get pgd in K1 */
  #endif
  
-@@ -756,6 +759,9 @@ static void __cpuinit build_r4000_tlb_re
+@@ -750,6 +753,9 @@ static void __cpuinit build_r4000_tlb_re
  	build_update_entries(&p, K0, K1);
  	build_tlb_write_entry(&p, &l, &r, tlb_random);
  	uasm_l_leave(&l, p);
@@ -67,7 +67,7 @@
  	uasm_i_eret(&p); /* return from trap */
  
  #ifdef CONFIG_HUGETLB_PAGE
-@@ -1196,12 +1202,12 @@ build_r4000_tlbchange_handler_head(u32 *
+@@ -1188,12 +1194,12 @@ build_r4000_tlbchange_handler_head(u32 *
  				   struct uasm_reloc **r, unsigned int pte,
  				   unsigned int ptr)
  {
@@ -83,7 +83,7 @@
  	build_get_pgde32(p, pte, ptr); /* get pgd in ptr */
  #endif
  
-@@ -1238,6 +1244,9 @@ build_r4000_tlbchange_handler_tail(u32 *
+@@ -1230,6 +1236,9 @@ build_r4000_tlbchange_handler_tail(u32 *
  	build_update_entries(p, tmp, ptr);
  	build_tlb_write_entry(p, l, r, tlb_indexed);
  	uasm_l_leave(l, *p);
diff --git a/target/linux/brcm47xx/patches-2.6.32/930-bcm47xx-pci-iomem.patch b/target/linux/brcm47xx/patches-2.6.32/930-bcm47xx-pci-iomem.patch
deleted file mode 100644
index 4f47a3c52..000000000
--- a/target/linux/brcm47xx/patches-2.6.32/930-bcm47xx-pci-iomem.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/drivers/ssb/driver_pcicore.c
-+++ b/drivers/ssb/driver_pcicore.c
-@@ -246,20 +246,12 @@ static struct pci_controller ssb_pcicore
- 	.pci_ops	= &ssb_pcicore_pciops,
- 	.io_resource	= &ssb_pcicore_io_resource,
- 	.mem_resource	= &ssb_pcicore_mem_resource,
--	.mem_offset	= 0x24000000,
- };
- 
--static u32 ssb_pcicore_pcibus_iobase = 0x100;
--static u32 ssb_pcicore_pcibus_membase = SSB_PCI_DMA;
--
- /* This function is called when doing a pci_enable_device().
-  * We must first check if the device is a device on the PCI-core bridge. */
- int ssb_pcicore_plat_dev_init(struct pci_dev *d)
- {
--	struct resource *res;
--	int pos, size;
--	u32 *base;
--
- 	if (d->bus->ops != &ssb_pcicore_pciops) {
- 		/* This is not a device on the PCI-core bridge. */
- 		return -ENODEV;
-@@ -268,27 +260,6 @@ int ssb_pcicore_plat_dev_init(struct pci
- 	ssb_printk(KERN_INFO "PCI: Fixing up device %s\n",
- 		   pci_name(d));
- 
--	/* Fix up resource bases */
--	for (pos = 0; pos < 6; pos++) {
--		res = &d->resource[pos];
--		if (res->flags & IORESOURCE_IO)
--			base = &ssb_pcicore_pcibus_iobase;
--		else
--			base = &ssb_pcicore_pcibus_membase;
--		res->flags |= IORESOURCE_PCI_FIXED;
--		if (res->end) {
--			size = res->end - res->start + 1;
--			if (*base & (size - 1))
--				*base = (*base + size) & ~(size - 1);
--			res->start = *base;
--			res->end = res->start + size - 1;
--			*base += size;
--			pci_write_config_dword(d, PCI_BASE_ADDRESS_0 + (pos << 2), res->start);
--		}
--		/* Fix up PCI bridge BAR0 only */
--		if (d->bus->number == 0 && PCI_SLOT(d->devfn) == 0)
--			break;
--	}
- 	/* Fix up interrupt lines */
- 	d->irq = ssb_mips_irq(extpci_core->dev) + 2;
- 	pci_write_config_byte(d, PCI_INTERRUPT_LINE, d->irq);
diff --git a/target/linux/brcm47xx/patches-2.6.33/110-flash_map.patch b/target/linux/brcm47xx/patches-2.6.33/110-flash_map.patch
deleted file mode 100644
index 307bc7b78..000000000
--- a/target/linux/brcm47xx/patches-2.6.33/110-flash_map.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/drivers/mtd/maps/Kconfig
-+++ b/drivers/mtd/maps/Kconfig
-@@ -325,6 +325,12 @@ config MTD_CFI_FLAGADM
- 	  Mapping for the Flaga digital module. If you don't have one, ignore
- 	  this setting.
- 
-+config MTD_BCM47XX
-+	tristate "BCM47xx flash device"
-+	depends on MIPS && MTD_CFI && BCM47XX
-+	help
-+	  Support for the flash chips on the BCM947xx board.
-+
- config MTD_REDWOOD
- 	tristate "CFI Flash devices mapped on IBM Redwood"
- 	depends on MTD_CFI && ( REDWOOD_4 || REDWOOD_5 || REDWOOD_6 )
---- a/drivers/mtd/maps/Makefile
-+++ b/drivers/mtd/maps/Makefile
-@@ -29,6 +29,7 @@ obj-$(CONFIG_MTD_PMC_MSP_EVM)   += pmcms
- obj-$(CONFIG_MTD_PCMCIA)	+= pcmciamtd.o
- obj-$(CONFIG_MTD_RPXLITE)	+= rpxlite.o
- obj-$(CONFIG_MTD_TQM8XXL)	+= tqm8xxl.o
-+obj-$(CONFIG_MTD_BCM47XX)	+= bcm47xx-flash.o
- obj-$(CONFIG_MTD_SA1100)	+= sa1100-flash.o
- obj-$(CONFIG_MTD_SBC_GXX)	+= sbc_gxx.o
- obj-$(CONFIG_MTD_SC520CDP)	+= sc520cdp.o
diff --git a/target/linux/brcm47xx/patches-2.6.33/130-remove_scache.patch b/target/linux/brcm47xx/patches-2.6.33/130-remove_scache.patch
deleted file mode 100644
index fc750eb30..000000000
--- a/target/linux/brcm47xx/patches-2.6.33/130-remove_scache.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -205,7 +205,6 @@ config MIPS_MALTA
- 	select I8259
- 	select MIPS_BOARDS_GEN
- 	select MIPS_BONITO64
--	select MIPS_CPU_SCACHE
- 	select PCI_GT64XXX_PCI0
- 	select MIPS_MSC
- 	select SWAP_IO_SPACE
-@@ -1561,13 +1560,6 @@ config IP22_CPU_SCACHE
- 	bool
- 	select BOARD_SCACHE
- 
--#
--# Support for a MIPS32 / MIPS64 style S-caches
--#
--config MIPS_CPU_SCACHE
--	bool
--	select BOARD_SCACHE
--
- config R5000_CPU_SCACHE
- 	bool
- 	select BOARD_SCACHE
---- a/arch/mips/kernel/cpu-probe.c
-+++ b/arch/mips/kernel/cpu-probe.c
-@@ -759,6 +759,8 @@ static inline void cpu_probe_mips(struct
- 	case PRID_IMP_25KF:
- 		c->cputype = CPU_25KF;
- 		__cpu_name[cpu] = "MIPS 25Kc";
-+		/* Probe for L2 cache */
-+		c->scache.flags &= ~MIPS_CACHE_NOT_PRESENT;
- 		break;
- 	case PRID_IMP_34K:
- 		c->cputype = CPU_34K;
---- a/arch/mips/mm/Makefile
-+++ b/arch/mips/mm/Makefile
-@@ -33,6 +33,5 @@ obj-$(CONFIG_CPU_CAVIUM_OCTEON)	+= c-oct
- obj-$(CONFIG_IP22_CPU_SCACHE)	+= sc-ip22.o
- obj-$(CONFIG_R5000_CPU_SCACHE)  += sc-r5k.o
- obj-$(CONFIG_RM7000_CPU_SCACHE)	+= sc-rm7k.o
--obj-$(CONFIG_MIPS_CPU_SCACHE)	+= sc-mips.o
- 
- EXTRA_CFLAGS += -Werror
---- a/arch/mips/mm/c-r4k.c
-+++ b/arch/mips/mm/c-r4k.c
-@@ -1148,7 +1148,6 @@ static void __init loongson2_sc_init(voi
- 
- extern int r5k_sc_init(void);
- extern int rm7k_sc_init(void);
--extern int mips_sc_init(void);
- 
- static void __cpuinit setup_scache(void)
- {
-@@ -1202,29 +1201,17 @@ static void __cpuinit setup_scache(void)
- #endif
- 
- 	default:
--		if (c->isa_level == MIPS_CPU_ISA_M32R1 ||
--		    c->isa_level == MIPS_CPU_ISA_M32R2 ||
--		    c->isa_level == MIPS_CPU_ISA_M64R1 ||
--		    c->isa_level == MIPS_CPU_ISA_M64R2) {
--#ifdef CONFIG_MIPS_CPU_SCACHE
--			if (mips_sc_init ()) {
--				scache_size = c->scache.ways * c->scache.sets * c->scache.linesz;
--				printk("MIPS secondary cache %ldkB, %s, linesize %d bytes.\n",
--				       scache_size >> 10,
--				       way_string[c->scache.ways], c->scache.linesz);
--			}
--#else
--			if (!(c->scache.flags & MIPS_CACHE_NOT_PRESENT))
--				panic("Dunno how to handle MIPS32 / MIPS64 second level cache");
--#endif
--			return;
--		}
- 		sc_present = 0;
- 	}
- 
- 	if (!sc_present)
- 		return;
- 
-+	if ((c->isa_level == MIPS_CPU_ISA_M32R1 ||
-+	     c->isa_level == MIPS_CPU_ISA_M64R1) &&
-+	    !(c->scache.flags & MIPS_CACHE_NOT_PRESENT))
-+		panic("Dunno how to handle MIPS32 / MIPS64 second level cache");
-+
- 	/* compute a couple of other cache variables */
- 	c->scache.waysize = scache_size / c->scache.ways;
- 
diff --git a/target/linux/brcm47xx/patches-2.6.33/150-cpu_fixes.patch b/target/linux/brcm47xx/patches-2.6.33/150-cpu_fixes.patch
deleted file mode 100644
index 419861444..000000000
--- a/target/linux/brcm47xx/patches-2.6.33/150-cpu_fixes.patch
+++ /dev/null
@@ -1,367 +0,0 @@
---- a/arch/mips/include/asm/r4kcache.h
-+++ b/arch/mips/include/asm/r4kcache.h
-@@ -17,6 +17,20 @@
- #include <asm/cpu-features.h>
- #include <asm/mipsmtregs.h>
- 
-+#ifdef CONFIG_BCM47XX
-+#include <asm/paccess.h>
-+#include <linux/ssb/ssb.h>
-+#define BCM4710_DUMMY_RREG() ((void) *((u8 *) KSEG1ADDR(SSB_ENUM_BASE + SSB_IMSTATE)))
-+
-+#define BCM4710_FILL_TLB(addr) (*(volatile unsigned long *)(addr))
-+#define BCM4710_PROTECTED_FILL_TLB(addr) ({ unsigned long x; get_dbe(x, (volatile unsigned long *)(addr)); })
-+#else
-+#define BCM4710_DUMMY_RREG()
-+
-+#define BCM4710_FILL_TLB(addr)
-+#define BCM4710_PROTECTED_FILL_TLB(addr)
-+#endif
-+
- /*
-  * This macro return a properly sign-extended address suitable as base address
-  * for indexed cache operations.  Two issues here:
-@@ -150,6 +164,7 @@ static inline void flush_icache_line_ind
- static inline void flush_dcache_line_indexed(unsigned long addr)
- {
- 	__dflush_prologue
-+	BCM4710_DUMMY_RREG();
- 	cache_op(Index_Writeback_Inv_D, addr);
- 	__dflush_epilogue
- }
-@@ -169,6 +184,7 @@ static inline void flush_icache_line(uns
- static inline void flush_dcache_line(unsigned long addr)
- {
- 	__dflush_prologue
-+	BCM4710_DUMMY_RREG();
- 	cache_op(Hit_Writeback_Inv_D, addr);
- 	__dflush_epilogue
- }
-@@ -176,6 +192,7 @@ static inline void flush_dcache_line(uns
- static inline void invalidate_dcache_line(unsigned long addr)
- {
- 	__dflush_prologue
-+	BCM4710_DUMMY_RREG();
- 	cache_op(Hit_Invalidate_D, addr);
- 	__dflush_epilogue
- }
-@@ -208,6 +225,7 @@ static inline void flush_scache_line(uns
-  */
- static inline void protected_flush_icache_line(unsigned long addr)
- {
-+	BCM4710_DUMMY_RREG();
- 	protected_cache_op(Hit_Invalidate_I, addr);
- }
- 
-@@ -219,6 +237,7 @@ static inline void protected_flush_icach
-  */
- static inline void protected_writeback_dcache_line(unsigned long addr)
- {
-+	BCM4710_DUMMY_RREG();
- 	protected_cache_op(Hit_Writeback_Inv_D, addr);
- }
- 
-@@ -339,8 +358,52 @@ static inline void invalidate_tcache_pag
- 		: "r" (base),						\
- 		  "i" (op));
- 
-+static inline void blast_dcache(void)
-+{
-+	unsigned long start = KSEG0;
-+	unsigned long dcache_size = current_cpu_data.dcache.waysize * current_cpu_data.dcache.ways;
-+	unsigned long end = (start + dcache_size);
-+
-+	do {
-+		BCM4710_DUMMY_RREG();
-+		cache_op(Index_Writeback_Inv_D, start);
-+		start += current_cpu_data.dcache.linesz;
-+	} while(start < end);
-+}
-+
-+static inline void blast_dcache_page(unsigned long page)
-+{
-+	unsigned long start = page;
-+	unsigned long end = start + PAGE_SIZE;
-+
-+	BCM4710_FILL_TLB(start);
-+	do {
-+		BCM4710_DUMMY_RREG();
-+		cache_op(Hit_Writeback_Inv_D, start);
-+		start += current_cpu_data.dcache.linesz;
-+	} while(start < end);
-+}
-+
-+static inline void blast_dcache_page_indexed(unsigned long page)
-+{
-+	unsigned long start = page;
-+	unsigned long end = start + PAGE_SIZE;
-+	unsigned long ws_inc = 1UL << current_cpu_data.dcache.waybit;
-+	unsigned long ws_end = current_cpu_data.dcache.ways <<
-+	                       current_cpu_data.dcache.waybit;
-+	unsigned long ws, addr;
-+	for (ws = 0; ws < ws_end; ws += ws_inc) {
-+		start = page + ws;
-+		for (addr = start; addr < end; addr += current_cpu_data.dcache.linesz) {
-+			BCM4710_DUMMY_RREG();
-+			cache_op(Index_Writeback_Inv_D, addr);
-+		}
-+	}
-+}
-+
-+
- /* build blast_xxx, blast_xxx_page, blast_xxx_page_indexed */
--#define __BUILD_BLAST_CACHE(pfx, desc, indexop, hitop, lsize) \
-+#define __BUILD_BLAST_CACHE(pfx, desc, indexop, hitop, lsize, war) \
- static inline void blast_##pfx##cache##lsize(void)			\
- {									\
- 	unsigned long start = INDEX_BASE;				\
-@@ -352,6 +415,7 @@ static inline void blast_##pfx##cache##l
- 									\
- 	__##pfx##flush_prologue						\
- 									\
-+	war								\
- 	for (ws = 0; ws < ws_end; ws += ws_inc)				\
- 		for (addr = start; addr < end; addr += lsize * 32)	\
- 			cache##lsize##_unroll32(addr|ws, indexop);	\
-@@ -366,6 +430,7 @@ static inline void blast_##pfx##cache##l
- 									\
- 	__##pfx##flush_prologue						\
- 									\
-+	war								\
- 	do {								\
- 		cache##lsize##_unroll32(start, hitop);			\
- 		start += lsize * 32;					\
-@@ -384,6 +449,8 @@ static inline void blast_##pfx##cache##l
- 	                       current_cpu_data.desc.waybit;		\
- 	unsigned long ws, addr;						\
- 									\
-+	war								\
-+									\
- 	__##pfx##flush_prologue						\
- 									\
- 	for (ws = 0; ws < ws_end; ws += ws_inc)				\
-@@ -393,36 +460,38 @@ static inline void blast_##pfx##cache##l
- 	__##pfx##flush_epilogue						\
- }
- 
--__BUILD_BLAST_CACHE(d, dcache, Index_Writeback_Inv_D, Hit_Writeback_Inv_D, 16)
--__BUILD_BLAST_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I, 16)
--__BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 16)
--__BUILD_BLAST_CACHE(d, dcache, Index_Writeback_Inv_D, Hit_Writeback_Inv_D, 32)
--__BUILD_BLAST_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I, 32)
--__BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 32)
--__BUILD_BLAST_CACHE(d, dcache, Index_Writeback_Inv_D, Hit_Writeback_Inv_D, 64)
--__BUILD_BLAST_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I, 64)
--__BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 64)
--__BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 128)
--
--__BUILD_BLAST_CACHE(inv_d, dcache, Index_Writeback_Inv_D, Hit_Invalidate_D, 16)
--__BUILD_BLAST_CACHE(inv_d, dcache, Index_Writeback_Inv_D, Hit_Invalidate_D, 32)
--__BUILD_BLAST_CACHE(inv_s, scache, Index_Writeback_Inv_SD, Hit_Invalidate_SD, 16)
--__BUILD_BLAST_CACHE(inv_s, scache, Index_Writeback_Inv_SD, Hit_Invalidate_SD, 32)
--__BUILD_BLAST_CACHE(inv_s, scache, Index_Writeback_Inv_SD, Hit_Invalidate_SD, 64)
--__BUILD_BLAST_CACHE(inv_s, scache, Index_Writeback_Inv_SD, Hit_Invalidate_SD, 128)
-+__BUILD_BLAST_CACHE(d, dcache, Index_Writeback_Inv_D, Hit_Writeback_Inv_D, 16, )
-+__BUILD_BLAST_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I, 16, BCM4710_FILL_TLB(start);)
-+__BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 16, )
-+__BUILD_BLAST_CACHE(d, dcache, Index_Writeback_Inv_D, Hit_Writeback_Inv_D, 32, )
-+__BUILD_BLAST_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I, 32, BCM4710_FILL_TLB(start);)
-+__BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 32, )
-+__BUILD_BLAST_CACHE(d, dcache, Index_Writeback_Inv_D, Hit_Writeback_Inv_D, 64, )
-+__BUILD_BLAST_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I, 64, BCM4710_FILL_TLB(start);)
-+__BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 64, )
-+__BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 128, )
-+
-+__BUILD_BLAST_CACHE(inv_d, dcache, Index_Writeback_Inv_D, Hit_Invalidate_D, 16, )
-+__BUILD_BLAST_CACHE(inv_d, dcache, Index_Writeback_Inv_D, Hit_Invalidate_D, 32, )
-+__BUILD_BLAST_CACHE(inv_s, scache, Index_Writeback_Inv_SD, Hit_Invalidate_SD, 16, )
-+__BUILD_BLAST_CACHE(inv_s, scache, Index_Writeback_Inv_SD, Hit_Invalidate_SD, 32, )
-+__BUILD_BLAST_CACHE(inv_s, scache, Index_Writeback_Inv_SD, Hit_Invalidate_SD, 64, )
-+__BUILD_BLAST_CACHE(inv_s, scache, Index_Writeback_Inv_SD, Hit_Invalidate_SD, 128, )
- 
- /* build blast_xxx_range, protected_blast_xxx_range */
--#define __BUILD_BLAST_CACHE_RANGE(pfx, desc, hitop, prot) \
-+#define __BUILD_BLAST_CACHE_RANGE(pfx, desc, hitop, prot, war, war2) \
- static inline void prot##blast_##pfx##cache##_range(unsigned long start, \
- 						    unsigned long end)	\
- {									\
- 	unsigned long lsize = cpu_##desc##_line_size();			\
- 	unsigned long addr = start & ~(lsize - 1);			\
- 	unsigned long aend = (end - 1) & ~(lsize - 1);			\
-+	war								\
- 									\
- 	__##pfx##flush_prologue						\
- 									\
- 	while (1) {							\
-+		war2						\
- 		prot##cache_op(hitop, addr);				\
- 		if (addr == aend)					\
- 			break;						\
-@@ -432,13 +501,13 @@ static inline void prot##blast_##pfx##ca
- 	__##pfx##flush_epilogue						\
- }
- 
--__BUILD_BLAST_CACHE_RANGE(d, dcache, Hit_Writeback_Inv_D, protected_)
--__BUILD_BLAST_CACHE_RANGE(s, scache, Hit_Writeback_Inv_SD, protected_)
--__BUILD_BLAST_CACHE_RANGE(i, icache, Hit_Invalidate_I, protected_)
--__BUILD_BLAST_CACHE_RANGE(d, dcache, Hit_Writeback_Inv_D, )
--__BUILD_BLAST_CACHE_RANGE(s, scache, Hit_Writeback_Inv_SD, )
-+__BUILD_BLAST_CACHE_RANGE(d, dcache, Hit_Writeback_Inv_D, protected_, BCM4710_PROTECTED_FILL_TLB(addr); BCM4710_PROTECTED_FILL_TLB(aend);, BCM4710_DUMMY_RREG();)
-+__BUILD_BLAST_CACHE_RANGE(s, scache, Hit_Writeback_Inv_SD, protected_,, )
-+__BUILD_BLAST_CACHE_RANGE(i, icache, Hit_Invalidate_I, protected_,, )
-+__BUILD_BLAST_CACHE_RANGE(d, dcache, Hit_Writeback_Inv_D,, BCM4710_FILL_TLB(addr); BCM4710_FILL_TLB(aend);, BCM4710_DUMMY_RREG();)
-+__BUILD_BLAST_CACHE_RANGE(s, scache, Hit_Writeback_Inv_SD,,, )
- /* blast_inv_dcache_range */
--__BUILD_BLAST_CACHE_RANGE(inv_d, dcache, Hit_Invalidate_D, )
--__BUILD_BLAST_CACHE_RANGE(inv_s, scache, Hit_Invalidate_SD, )
-+__BUILD_BLAST_CACHE_RANGE(inv_d, dcache, Hit_Invalidate_D,,,BCM4710_DUMMY_RREG();)
-+__BUILD_BLAST_CACHE_RANGE(inv_s, scache, Hit_Invalidate_SD,,, )
- 
- #endif /* _ASM_R4KCACHE_H */
---- a/arch/mips/include/asm/stackframe.h
-+++ b/arch/mips/include/asm/stackframe.h
-@@ -430,6 +430,10 @@
- 		.macro	RESTORE_SP_AND_RET
- 		LONG_L	sp, PT_R29(sp)
- 		.set	mips3
-+#ifdef CONFIG_BCM47XX
-+		nop
-+		nop
-+#endif
- 		eret
- 		.set	mips0
- 		.endm
---- a/arch/mips/kernel/genex.S
-+++ b/arch/mips/kernel/genex.S
-@@ -52,6 +52,10 @@ NESTED(except_vec1_generic, 0, sp)
- NESTED(except_vec3_generic, 0, sp)
- 	.set	push
- 	.set	noat
-+#ifdef CONFIG_BCM47XX
-+	nop
-+	nop
-+#endif
- #if R5432_CP0_INTERRUPT_WAR
- 	mfc0	k0, CP0_INDEX
- #endif
---- a/arch/mips/mm/c-r4k.c
-+++ b/arch/mips/mm/c-r4k.c
-@@ -35,6 +35,9 @@
- #include <asm/cacheflush.h> /* for run_uncached() */
- 
- 
-+/* For enabling BCM4710 cache workarounds */
-+int bcm4710 = 0;
-+
- /*
-  * Special Variant of smp_call_function for use by cache functions:
-  *
-@@ -111,6 +114,9 @@ static void __cpuinit r4k_blast_dcache_p
- {
- 	unsigned long  dc_lsize = cpu_dcache_line_size();
- 
-+	if (bcm4710)
-+		r4k_blast_dcache_page = blast_dcache_page;
-+	else
- 	if (dc_lsize == 0)
- 		r4k_blast_dcache_page = (void *)cache_noop;
- 	else if (dc_lsize == 16)
-@@ -127,6 +133,9 @@ static void __cpuinit r4k_blast_dcache_p
- {
- 	unsigned long dc_lsize = cpu_dcache_line_size();
- 
-+	if (bcm4710)
-+		r4k_blast_dcache_page_indexed = blast_dcache_page_indexed;
-+	else
- 	if (dc_lsize == 0)
- 		r4k_blast_dcache_page_indexed = (void *)cache_noop;
- 	else if (dc_lsize == 16)
-@@ -143,6 +152,9 @@ static void __cpuinit r4k_blast_dcache_s
- {
- 	unsigned long dc_lsize = cpu_dcache_line_size();
- 
-+	if (bcm4710)
-+		r4k_blast_dcache = blast_dcache;
-+	else
- 	if (dc_lsize == 0)
- 		r4k_blast_dcache = (void *)cache_noop;
- 	else if (dc_lsize == 16)
-@@ -680,6 +692,8 @@ static void local_r4k_flush_cache_sigtra
- 	unsigned long addr = (unsigned long) arg;
- 
- 	R4600_HIT_CACHEOP_WAR_IMPL;
-+	BCM4710_PROTECTED_FILL_TLB(addr);
-+	BCM4710_PROTECTED_FILL_TLB(addr + 4);
- 	if (dc_lsize)
- 		protected_writeback_dcache_line(addr & ~(dc_lsize - 1));
- 	if (!cpu_icache_snoops_remote_store && scache_size)
-@@ -1298,6 +1312,17 @@ static void __cpuinit coherency_setup(vo
- 	 * silly idea of putting something else there ...
- 	 */
- 	switch (current_cpu_type()) {
-+	case CPU_BCM3302:
-+		{
-+			u32 cm;
-+			cm = read_c0_diag();
-+			/* Enable icache */
-+			cm |= (1 << 31);
-+			/* Enable dcache */
-+			cm |= (1 << 30);
-+			write_c0_diag(cm);
-+		}
-+		break;
- 	case CPU_R4000PC:
- 	case CPU_R4000SC:
- 	case CPU_R4000MC:
-@@ -1354,6 +1379,15 @@ void __cpuinit r4k_cache_init(void)
- 		break;
- 	}
- 
-+	/* Check if special workarounds are required */
-+#ifdef CONFIG_BCM47XX
-+	if (current_cpu_data.cputype == CPU_BCM4710 && (current_cpu_data.processor_id & 0xff) == 0) {
-+		printk("Enabling BCM4710A0 cache workarounds.\n");
-+		bcm4710 = 1;
-+	} else
-+#endif
-+		bcm4710 = 0;
-+
- 	probe_pcache();
- 	setup_scache();
- 
-@@ -1412,5 +1446,13 @@ void __cpuinit r4k_cache_init(void)
- #if !defined(CONFIG_MIPS_CMP)
- 	local_r4k___flush_cache_all(NULL);
- #endif
-+#ifdef CONFIG_BCM47XX
-+	{
-+		static void (*_coherency_setup)(void);
-+		_coherency_setup = (void (*)(void)) KSEG1ADDR(coherency_setup);
-+		_coherency_setup();
-+	}
-+#else
- 	coherency_setup();
-+#endif
- }
---- a/arch/mips/mm/tlbex.c
-+++ b/arch/mips/mm/tlbex.c
-@@ -749,6 +749,9 @@ static void __cpuinit build_r4000_tlb_re
- 		/* No need for uasm_i_nop */
- 	}
- 
-+#ifdef CONFIG_BCM47XX
-+	uasm_i_nop(&p);
-+#endif
- #ifdef CONFIG_64BIT
- 	build_get_pmde64(&p, &l, &r, K0, K1); /* get pmd in K1 */
- #else
-@@ -1203,6 +1206,9 @@ build_r4000_tlbchange_handler_head(u32 *
- 				   struct uasm_reloc **r, unsigned int pte,
- 				   unsigned int ptr)
- {
-+#ifdef CONFIG_BCM47XX
-+	uasm_i_nop(p);
-+#endif
- #ifdef CONFIG_64BIT
- 	build_get_pmde64(p, l, r, pte, ptr); /* get pmd in ptr */
- #else
diff --git a/target/linux/brcm47xx/patches-2.6.33/160-kmap_coherent.patch b/target/linux/brcm47xx/patches-2.6.33/160-kmap_coherent.patch
deleted file mode 100644
index 9cba353da..000000000
--- a/target/linux/brcm47xx/patches-2.6.33/160-kmap_coherent.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- a/arch/mips/include/asm/cpu-features.h
-+++ b/arch/mips/include/asm/cpu-features.h
-@@ -107,6 +107,9 @@
- #ifndef cpu_has_pindexed_dcache
- #define cpu_has_pindexed_dcache	(cpu_data[0].dcache.flags & MIPS_CACHE_PINDEX)
- #endif
-+#ifndef cpu_use_kmap_coherent
-+#define cpu_use_kmap_coherent 1
-+#endif
- 
- /*
-  * I-Cache snoops remote store.  This only matters on SMP.  Some multiprocessors
---- /dev/null
-+++ b/arch/mips/include/asm/mach-bcm47xx/cpu-feature-overrides.h
-@@ -0,0 +1,13 @@
-+/*
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License.  See the file "COPYING" in the main directory of this archive
-+ * for more details.
-+ *
-+ * Copyright (C) 2005 Ralf Baechle (ralf@linux-mips.org)
-+ */
-+#ifndef __ASM_MACH_BCM47XX_CPU_FEATURE_OVERRIDES_H
-+#define __ASM_MACH_BCM47XX_CPU_FEATURE_OVERRIDES_H
-+
-+#define cpu_use_kmap_coherent	0
-+
-+#endif /* __ASM_MACH_BCM47XX_CPU_FEATURE_OVERRIDES_H */
---- a/arch/mips/mm/c-r4k.c
-+++ b/arch/mips/mm/c-r4k.c
-@@ -507,7 +507,7 @@ static inline void local_r4k_flush_cache
- 		 */
- 		map_coherent = (cpu_has_dc_aliases &&
- 				page_mapped(page) && !Page_dcache_dirty(page));
--		if (map_coherent)
-+		if (map_coherent && cpu_use_kmap_coherent)
- 			vaddr = kmap_coherent(page, addr);
- 		else
- 			vaddr = kmap_atomic(page, KM_USER0);
-@@ -530,7 +530,7 @@ static inline void local_r4k_flush_cache
- 	}
- 
- 	if (vaddr) {
--		if (map_coherent)
-+		if (map_coherent && cpu_use_kmap_coherent)
- 			kunmap_coherent();
- 		else
- 			kunmap_atomic(vaddr, KM_USER0);
---- a/arch/mips/mm/init.c
-+++ b/arch/mips/mm/init.c
-@@ -209,7 +209,7 @@ void copy_user_highpage(struct page *to,
- 	void *vfrom, *vto;
- 
- 	vto = kmap_atomic(to, KM_USER1);
--	if (cpu_has_dc_aliases &&
-+	if (cpu_has_dc_aliases && cpu_use_kmap_coherent &&
- 	    page_mapped(from) && !Page_dcache_dirty(from)) {
- 		vfrom = kmap_coherent(from, vaddr);
- 		copy_page(vto, vfrom);
-@@ -231,7 +231,7 @@ void copy_to_user_page(struct vm_area_st
- 	struct page *page, unsigned long vaddr, void *dst, const void *src,
- 	unsigned long len)
- {
--	if (cpu_has_dc_aliases &&
-+	if (cpu_has_dc_aliases && cpu_use_kmap_coherent &&
- 	    page_mapped(page) && !Page_dcache_dirty(page)) {
- 		void *vto = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
- 		memcpy(vto, src, len);
-@@ -249,7 +249,7 @@ void copy_from_user_page(struct vm_area_
- 	struct page *page, unsigned long vaddr, void *dst, const void *src,
- 	unsigned long len)
- {
--	if (cpu_has_dc_aliases &&
-+	if (cpu_has_dc_aliases && cpu_use_kmap_coherent &&
- 	    page_mapped(page) && !Page_dcache_dirty(page)) {
- 		void *vfrom = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
- 		memcpy(dst, vfrom, len);
diff --git a/target/linux/brcm47xx/patches-2.6.33/170-128MB_ram_bugfix.patch b/target/linux/brcm47xx/patches-2.6.33/170-128MB_ram_bugfix.patch
deleted file mode 100644
index 9819ad711..000000000
--- a/target/linux/brcm47xx/patches-2.6.33/170-128MB_ram_bugfix.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/arch/mips/bcm47xx/prom.c
-+++ b/arch/mips/bcm47xx/prom.c
-@@ -126,6 +126,7 @@ static __init void prom_init_cmdline(voi
- static __init void prom_init_mem(void)
- {
- 	unsigned long mem;
-+	unsigned long max;
- 
- 	/* Figure out memory size by finding aliases.
- 	 *
-@@ -134,21 +135,26 @@ static __init void prom_init_mem(void)
- 	 * want to reuse the memory used by CFE (around 4MB). That means cfe_*
- 	 * functions stop to work at some point during the boot, we should only
- 	 * call them at the beginning of the boot.
-+	 * 
-+	 * BCM47XX uses 128MB for addressing the ram, if the system contains
-+	 * less that that amount of ram it remaps the ram more often into the
-+	 * available space.
-+	 * Accessing memory after 128MB will cause an exception.
-+	 * max contains the biggest possible address supported by the platform.
-+	 * If the method wants to try something above we assume 128MB ram.
- 	 */
-+	max = ((unsigned long)(prom_init) | ((128 << 20) - 1));
- 	for (mem = (1 << 20); mem < (128 << 20); mem += (1 << 20)) {
-+		if (((unsigned long)(prom_init) + mem) > max) {
-+			mem = (128 << 20);
-+			printk("assume 128MB RAM\n");
-+			break;
-+		}
- 		if (*(unsigned long *)((unsigned long)(prom_init) + mem) ==
- 		    *(unsigned long *)(prom_init))
- 			break;
- 	}
- 
--	/* Ignoring the last page when ddr size is 128M. Cached
--	 * accesses to last page is causing the processor to prefetch
--	 * using address above 128M stepping out of the ddr address
--	 * space.
--	 */
--	if (mem == 0x8000000)
--		mem -= 0x1000;
--
- 	add_memory_region(0, mem, BOOT_MEM_RAM);
- }
- 
diff --git a/target/linux/brcm47xx/patches-2.6.33/180-ssb_extif_interrupt.patch b/target/linux/brcm47xx/patches-2.6.33/180-ssb_extif_interrupt.patch
deleted file mode 100644
index d89531cda..000000000
--- a/target/linux/brcm47xx/patches-2.6.33/180-ssb_extif_interrupt.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 83e34f03ee9b86b49bde4707a1fe03a1837e29be Mon Sep 17 00:00:00 2001
-From: Jochen Friedrich <jochen@scram.de>
-Date: Wed, 3 Feb 2010 21:28:11 +0100
-Subject: [PATCH 1/1] ssb: fix interrupt assignment
-
-Explicitely enable shared interrupt 2 for any core that didn't get a dedicated IRQ
-anymore (fallthrough case) and for EXTIF cores to make gpio interrupts work.
-Also remove a bogus comment.
-
-Signed-off-by: Jochen Friedrich <jochen@scram.de>
-Signed-off-by: John W. Linville <linville@tuxdriver.com>
----
- drivers/ssb/driver_mipscore.c |    5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
---- a/drivers/ssb/driver_mipscore.c
-+++ b/drivers/ssb/driver_mipscore.c
-@@ -270,7 +270,6 @@ void ssb_mipscore_init(struct ssb_mipsco
- 				set_irq(dev, irq++);
- 			}
- 			break;
--			/* fallthrough */
- 		case SSB_DEV_PCI:
- 		case SSB_DEV_ETHERNET:
- 		case SSB_DEV_ETHERNET_GBIT:
-@@ -281,6 +280,10 @@ void ssb_mipscore_init(struct ssb_mipsco
- 				set_irq(dev, irq++);
- 				break;
- 			}
-+			/* fallthrough */
-+		case SSB_DEV_EXTIF:
-+			set_irq(dev, 0);
-+			break;
- 		}
- 	}
- 	ssb_dprintk(KERN_INFO PFX "after irq reconfiguration\n");
diff --git a/target/linux/brcm47xx/patches-2.6.33/210-b44_phy_fix.patch b/target/linux/brcm47xx/patches-2.6.33/210-b44_phy_fix.patch
deleted file mode 100644
index 3540c23e7..000000000
--- a/target/linux/brcm47xx/patches-2.6.33/210-b44_phy_fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/drivers/net/b44.c
-+++ b/drivers/net/b44.c
-@@ -339,7 +339,7 @@ static int b44_phy_reset(struct b44 *bp)
- 		}
- 	}
- 
--	return 0;
-+	return err;
- }
- 
- static void __b44_set_flow_ctrl(struct b44 *bp, u32 pause_flags)
-@@ -2223,6 +2223,10 @@ static int __devinit b44_init_one(struct
- 	 */
- 	b44_chip_reset(bp, B44_CHIP_RESET_FULL);
- 
-+	/* do a phy reset to test if there is an active phy */
-+	if (b44_phy_reset(bp) < 0)
-+		bp->phy_addr = B44_PHY_ADDR_NO_PHY;
-+
- 	printk(KERN_INFO "%s: Broadcom 44xx/47xx 10/100BaseT Ethernet %pM\n",
- 	       dev->name, dev->dev_addr);
- 
diff --git a/target/linux/brcm47xx/patches-2.6.33/220-bcm5354.patch b/target/linux/brcm47xx/patches-2.6.33/220-bcm5354.patch
deleted file mode 100644
index f396ca745..000000000
--- a/target/linux/brcm47xx/patches-2.6.33/220-bcm5354.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/drivers/ssb/driver_chipcommon.c
-+++ b/drivers/ssb/driver_chipcommon.c
-@@ -258,6 +258,8 @@ void ssb_chipco_resume(struct ssb_chipco
- void ssb_chipco_get_clockcpu(struct ssb_chipcommon *cc,
-                              u32 *plltype, u32 *n, u32 *m)
- {
-+	if ((chipco_read32(cc, SSB_CHIPCO_CHIPID) & SSB_CHIPCO_IDMASK) == 0x5354)
-+		return;
- 	*n = chipco_read32(cc, SSB_CHIPCO_CLOCK_N);
- 	*plltype = (cc->capabilities & SSB_CHIPCO_CAP_PLLT);
- 	switch (*plltype) {
-@@ -281,6 +283,8 @@ void ssb_chipco_get_clockcpu(struct ssb_
- void ssb_chipco_get_clockcontrol(struct ssb_chipcommon *cc,
- 				 u32 *plltype, u32 *n, u32 *m)
- {
-+	if ((chipco_read32(cc, SSB_CHIPCO_CHIPID) & SSB_CHIPCO_IDMASK) == 0x5354)
-+		return;
- 	*n = chipco_read32(cc, SSB_CHIPCO_CLOCK_N);
- 	*plltype = (cc->capabilities & SSB_CHIPCO_CAP_PLLT);
- 	switch (*plltype) {
---- a/drivers/ssb/driver_mipscore.c
-+++ b/drivers/ssb/driver_mipscore.c
-@@ -217,6 +217,8 @@ u32 ssb_cpu_clock(struct ssb_mipscore *m
- 
- 	if ((pll_type == SSB_PLLTYPE_5) || (bus->chip_id == 0x5365)) {
- 		rate = 200000000;
-+	} else if (bus->chip_id == 0x5354) {
-+		rate = 240000000;
- 	} else {
- 		rate = ssb_calc_clock_rate(pll_type, n, m);
- 	}
---- a/drivers/ssb/main.c
-+++ b/drivers/ssb/main.c
-@@ -1069,6 +1069,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
- 
- 	if (bus->chip_id == 0x5365) {
- 		rate = 100000000;
-+	} else if (bus->chip_id == 0x5354) {
-+		rate = 120000000;
- 	} else {
- 		rate = ssb_calc_clock_rate(plltype, clkctl_n, clkctl_m);
- 		if (plltype == SSB_PLLTYPE_3) /* 25Mhz, 2 dividers */
diff --git a/target/linux/brcm47xx/patches-2.6.33/250-ohci-ssb-usb2.patch b/target/linux/brcm47xx/patches-2.6.33/250-ohci-ssb-usb2.patch
deleted file mode 100644
index 25b27e47e..000000000
--- a/target/linux/brcm47xx/patches-2.6.33/250-ohci-ssb-usb2.patch
+++ /dev/null
@@ -1,60 +0,0 @@
----
- drivers/usb/host/ohci-ssb.c |   39 ++++++++++++++++++++++++++++++++++++---
- 1 file changed, 36 insertions(+), 3 deletions(-)
-
---- a/drivers/usb/host/ohci-ssb.c
-+++ b/drivers/usb/host/ohci-ssb.c
-@@ -106,10 +106,42 @@ static int ssb_ohci_attach(struct ssb_de
- 	int err = -ENOMEM;
- 	u32 tmp, flags = 0;
- 
--	if (dev->id.coreid == SSB_DEV_USB11_HOSTDEV)
-+	if (dev->id.coreid == SSB_DEV_USB11_HOSTDEV) {
-+		/* Put the device into host-mode. */
- 		flags |= SSB_OHCI_TMSLOW_HOSTMODE;
--
--	ssb_device_enable(dev, flags);
-+		ssb_device_enable(dev, flags);
-+	} else if (dev->id.coreid == SSB_DEV_USB20_HOST) {
-+		/*
-+		 * USB 2.0 special considerations:
-+		 *
-+		 * 1. Since the core supports both OHCI and EHCI functions, it must
-+		 *    only be reset once.
-+		 *
-+		 * 2. In addition to the standard SSB reset sequence, the Host Control
-+		 *    Register must be programmed to bring the USB core and various
-+		 *    phy components out of reset.
-+		 */
-+		ssb_device_enable(dev, 0);
-+		ssb_write32(dev, 0x200, 0x7ff);
-+		udelay(1);
-+		if (dev->id.revision == 1) { // bug in rev 1
-+
-+			/* Change Flush control reg */
-+			tmp = ssb_read32(dev, 0x400);
-+			tmp &= ~8;
-+			ssb_write32(dev, 0x400, tmp);
-+			tmp = ssb_read32(dev, 0x400);
-+			printk("USB20H fcr: 0x%0x\n", tmp);
-+
-+			/* Change Shim control reg */
-+			tmp = ssb_read32(dev, 0x304);
-+			tmp &= ~0x100;
-+			ssb_write32(dev, 0x304, tmp);
-+			tmp = ssb_read32(dev, 0x304);
-+			printk("USB20H shim: 0x%0x\n", tmp);
-+		}
-+	} else
-+		ssb_device_enable(dev, 0);
- 
- 	hcd = usb_create_hcd(&ssb_ohci_hc_driver, dev->dev,
- 			dev_name(dev->dev));
-@@ -200,6 +232,7 @@ static int ssb_ohci_resume(struct ssb_de
- static const struct ssb_device_id ssb_ohci_table[] = {
- 	SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB11_HOSTDEV, SSB_ANY_REV),
- 	SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB11_HOST, SSB_ANY_REV),
-+	SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB20_HOST, SSB_ANY_REV),
- 	SSB_DEVTABLE_END
- };
- MODULE_DEVICE_TABLE(ssb, ssb_ohci_table);
diff --git a/target/linux/brcm47xx/patches-2.6.33/260-ohci-set-dma-mask.patch b/target/linux/brcm47xx/patches-2.6.33/260-ohci-set-dma-mask.patch
deleted file mode 100644
index 962779847..000000000
--- a/target/linux/brcm47xx/patches-2.6.33/260-ohci-set-dma-mask.patch
+++ /dev/null
@@ -1,16 +0,0 @@
----
- drivers/usb/host/ohci-ssb.c |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/usb/host/ohci-ssb.c
-+++ b/drivers/usb/host/ohci-ssb.c
-@@ -106,6 +106,9 @@ static int ssb_ohci_attach(struct ssb_de
- 	int err = -ENOMEM;
- 	u32 tmp, flags = 0;
- 
-+	if (ssb_dma_set_mask(dev, DMA_BIT_MASK(32)))
-+		return -EOPNOTSUPP;
-+
- 	if (dev->id.coreid == SSB_DEV_USB11_HOSTDEV) {
- 		/* Put the device into host-mode. */
- 		flags |= SSB_OHCI_TMSLOW_HOSTMODE;
diff --git a/target/linux/brcm47xx/patches-2.6.33/270-ehci-ssb.patch b/target/linux/brcm47xx/patches-2.6.33/270-ehci-ssb.patch
deleted file mode 100644
index 27b3923c9..000000000
--- a/target/linux/brcm47xx/patches-2.6.33/270-ehci-ssb.patch
+++ /dev/null
@@ -1,314 +0,0 @@
----
- drivers/usb/host/Kconfig    |   13 ++
- drivers/usb/host/ehci-hcd.c |   12 ++
- drivers/usb/host/ehci-ssb.c |  201 ++++++++++++++++++++++++++++++++++++++++++++
- drivers/usb/host/ohci-ssb.c |   23 +++++
- 4 files changed, 247 insertions(+), 2 deletions(-)
-
---- a/drivers/usb/host/Kconfig
-+++ b/drivers/usb/host/Kconfig
-@@ -150,6 +150,19 @@ config USB_OXU210HP_HCD
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called oxu210hp-hcd.
- 
-+config USB_EHCI_HCD_SSB
-+	bool "EHCI support for Broadcom SSB EHCI core"
-+	depends on USB_EHCI_HCD && SSB && EXPERIMENTAL
-+	default n
-+	---help---
-+	  Support for the Sonics Silicon Backplane (SSB) attached
-+	  Broadcom USB EHCI core.
-+
-+	  This device is present in some embedded devices with
-+	  Broadcom based SSB bus.
-+
-+	  If unsure, say N.
-+
- config USB_ISP116X_HCD
- 	tristate "ISP116X HCD support"
- 	depends on USB
---- a/drivers/usb/host/ehci-hcd.c
-+++ b/drivers/usb/host/ehci-hcd.c
-@@ -1158,8 +1158,16 @@ MODULE_LICENSE ("GPL");
- #define	PLATFORM_DRIVER		ehci_atmel_driver
- #endif
- 
--#if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
--    !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER)
-+#ifdef CONFIG_USB_EHCI_HCD_SSB
-+#include "ehci-ssb.c"
-+#define SSB_EHCI_DRIVER         ssb_ehci_driver
-+#endif
-+
-+#if !defined(PCI_DRIVER) && \
-+    !defined(PLATFORM_DRIVER) && \
-+    !defined(PS3_SYSTEM_BUS_DRIVER) && \
-+    !defined(OF_PLATFORM_DRIVER) && \
-+    !defined(SSB_EHCI_DRIVER)
- #error "missing bus glue for ehci-hcd"
- #endif
- 
---- /dev/null
-+++ b/drivers/usb/host/ehci-ssb.c
-@@ -0,0 +1,201 @@
-+/*
-+ * Sonics Silicon Backplane
-+ * Broadcom USB-core EHCI driver (SSB bus glue)
-+ *
-+ * Copyright 2007 Steven Brown <sbrown@cortland.com>
-+ *
-+ * Derived from the OHCI-SSB driver
-+ * Copyright 2007 Michael Buesch <mb@bu3sch.de>
-+ *
-+ * Derived from the EHCI-PCI driver
-+ * Copyright (c) 2000-2004 by David Brownell
-+ *
-+ * Derived from the OHCI-PCI driver
-+ * Copyright 1999 Roman Weissgaerber
-+ * Copyright 2000-2002 David Brownell
-+ * Copyright 1999 Linus Torvalds
-+ * Copyright 1999 Gregory P. Smith
-+ *
-+ * Derived from the USBcore related parts of Broadcom-SB
-+ * Copyright 2005 Broadcom Corporation
-+ *
-+ * Licensed under the GNU/GPL. See COPYING for details.
-+ */
-+#include <linux/ssb/ssb.h>
-+
-+#define SSB_OHCI_TMSLOW_HOSTMODE	(1 << 29)
-+
-+struct ssb_ehci_device {
-+	struct ehci_hcd ehci; /* _must_ be at the beginning. */
-+
-+	u32 enable_flags;
-+};
-+
-+static inline
-+struct ssb_ehci_device *hcd_to_ssb_ehci(struct usb_hcd *hcd)
-+{
-+	return (struct ssb_ehci_device *)(hcd->hcd_priv);
-+}
-+
-+
-+static int ssb_ehci_reset(struct usb_hcd *hcd)
-+{
-+	struct ehci_hcd *ehci = hcd_to_ehci(hcd);
-+	int err;
-+
-+	ehci->caps = hcd->regs;
-+	ehci->regs = hcd->regs +
-+		HC_LENGTH(ehci_readl(ehci, &ehci->caps->hc_capbase));
-+
-+	dbg_hcs_params(ehci, "reset");
-+	dbg_hcc_params(ehci, "reset");
-+
-+	ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);
-+
-+	err = ehci_halt(ehci);
-+
-+	if (err)
-+		return err;
-+
-+	err = ehci_init(hcd);
-+
-+	if (err)
-+		return err;
-+
-+	ehci_port_power(ehci, 0);
-+
-+	return err;
-+}
-+
-+static int ssb_ehci_start(struct usb_hcd *hcd)
-+{
-+	struct ehci_hcd *ehci = hcd_to_ehci(hcd);
-+	int err;
-+
-+	err = ehci_run(hcd);
-+	if (err < 0) {
-+		ehci_err(ehci, "can't start\n");
-+		ehci_stop(hcd);
-+	}
-+
-+	return err;
-+}
-+
-+#ifdef CONFIG_PM
-+static int ssb_ehci_hcd_suspend(struct usb_hcd *hcd, pm_message_t message)
-+{
-+	struct ssb_ehci_device *ehcidev = hcd_to_ssb_ehci(hcd);
-+	struct ehci_hcd *ehci = &ehcidev->ehci;
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&ehci->lock, flags);
-+
-+	ehci_writel(ehci, EHCI_INTR_MIE, &ehci->regs->intrdisable);
-+	ehci_readl(ehci, &ehci->regs->intrdisable); /* commit write */
-+
-+	/* make sure snapshot being resumed re-enumerates everything */
-+	if (message.event == PM_EVENT_PRETHAW)
-+		ehci_usb_reset(ehci);
-+
-+	clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
-+
-+	spin_unlock_irqrestore(&ehci->lock, flags);
-+	return 0;
-+}
-+
-+static int ssb_ehci_hcd_resume(struct usb_hcd *hcd)
-+{
-+	set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
-+	usb_hcd_resume_root_hub(hcd);
-+	return 0;
-+}
-+#endif /* CONFIG_PM */
-+
-+static const struct hc_driver ssb_ehci_hc_driver = {
-+	.description		= "ssb-usb-ehci",
-+	.product_desc		= "SSB EHCI Controller",
-+	.hcd_priv_size		= sizeof(struct ssb_ehci_device),
-+
-+	.irq			= ehci_irq,
-+	.flags			= HCD_MEMORY | HCD_USB2,
-+
-+	.reset			= ssb_ehci_reset,
-+	.start			= ssb_ehci_start,
-+	.stop			= ehci_stop,
-+	.shutdown		= ehci_shutdown,
-+
-+#ifdef CONFIG_PM
-+	.suspend		= ssb_ehci_hcd_suspend,
-+	.resume			= ssb_ehci_hcd_resume,
-+#endif
-+
-+	.urb_enqueue		= ehci_urb_enqueue,
-+	.urb_dequeue		= ehci_urb_dequeue,
-+	.endpoint_disable	= ehci_endpoint_disable,
-+
-+	.get_frame_number	= ehci_get_frame,
-+
-+	.hub_status_data	= ehci_hub_status_data,
-+	.hub_control		= ehci_hub_control,
-+#ifdef CONFIG_PM
-+	.bus_suspend		= ehci_bus_suspend,
-+	.bus_resume		= ehci_bus_resume,
-+#endif
-+
-+};
-+
-+static void ssb_ehci_detach(struct ssb_device *dev, struct usb_hcd *hcd)
-+{
-+
-+	usb_remove_hcd(hcd);
-+	iounmap(hcd->regs);
-+	usb_put_hcd(hcd);
-+}
-+EXPORT_SYMBOL_GPL(ssb_ehci_detach);
-+
-+static int ssb_ehci_attach(struct ssb_device *dev, struct usb_hcd **ehci_hcd)
-+{
-+	struct ssb_ehci_device *ehcidev;
-+	struct usb_hcd *hcd;
-+	int err = -ENOMEM;
-+	u32 tmp, flags = 0;
-+
-+	hcd = usb_create_hcd(&ssb_ehci_hc_driver, dev->dev,
-+			     dev_name(dev->dev));
-+	if (!hcd)
-+		goto err_dev_disable;
-+
-+	ehcidev = hcd_to_ssb_ehci(hcd);
-+	ehcidev->enable_flags = flags;
-+	tmp = ssb_read32(dev, SSB_ADMATCH0);
-+	hcd->rsrc_start = ssb_admatch_base(tmp) + 0x800; /* ehci core offset */
-+	hcd->rsrc_len = 0x100; /* ehci reg block size */
-+	/*
-+	 * start & size modified per sbutils.c
-+	 */
-+	hcd->regs = ioremap_nocache(hcd->rsrc_start, hcd->rsrc_len);
-+	if (!hcd->regs)
-+		goto err_put_hcd;
-+	err = usb_add_hcd(hcd, dev->irq, IRQF_SHARED | IRQF_DISABLED);
-+	if (err)
-+		goto err_iounmap;
-+
-+	*ehci_hcd = hcd;
-+
-+	return err;
-+
-+err_iounmap:
-+	iounmap(hcd->regs);
-+err_put_hcd:
-+	usb_put_hcd(hcd);
-+err_dev_disable:
-+	ssb_device_disable(dev, flags);
-+	return err;
-+}
-+EXPORT_SYMBOL_GPL(ssb_ehci_attach);
-+
-+static const struct ssb_device_id ssb_ehci_table[] = {
-+	SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB20_HOST, SSB_ANY_REV),
-+	SSB_DEVTABLE_END
-+};
-+MODULE_DEVICE_TABLE(ssb, ssb_ehci_table);
---- a/drivers/usb/host/ohci-ssb.c
-+++ b/drivers/usb/host/ohci-ssb.c
-@@ -17,6 +17,8 @@
-  */
- #include <linux/ssb/ssb.h>
- 
-+extern int ssb_ehci_attach(struct ssb_device *dev, struct usb_hcd **hcd);
-+extern void ssb_ehci_detach(struct ssb_device *dev, struct usb_hcd *hcd);
- 
- #define SSB_OHCI_TMSLOW_HOSTMODE	(1 << 29)
- 
-@@ -24,6 +26,7 @@ struct ssb_ohci_device {
- 	struct ohci_hcd ohci; /* _must_ be at the beginning. */
- 
- 	u32 enable_flags;
-+	struct usb_hcd *ehci_hcd;
- };
- 
- static inline
-@@ -92,13 +95,25 @@ static const struct hc_driver ssb_ohci_h
- static void ssb_ohci_detach(struct ssb_device *dev)
- {
- 	struct usb_hcd *hcd = ssb_get_drvdata(dev);
-+#ifdef CONFIG_USB_EHCI_HCD_SSB
-+	struct ssb_ohci_device *ohcidev = hcd_to_ssb_ohci(hcd);
-+#endif
- 
- 	usb_remove_hcd(hcd);
- 	iounmap(hcd->regs);
- 	usb_put_hcd(hcd);
-+
-+#ifdef CONFIG_USB_EHCI_HCD_SSB
-+	/*
-+	 * Also detach ehci function
-+	 */
-+	if (dev->id.coreid == SSB_DEV_USB20_HOST)
-+		ssb_ehci_detach(dev, ohcidev->ehci_hcd);
-+#endif
- 	ssb_device_disable(dev, 0);
- }
- 
-+
- static int ssb_ohci_attach(struct ssb_device *dev)
- {
- 	struct ssb_ohci_device *ohcidev;
-@@ -165,6 +180,14 @@ static int ssb_ohci_attach(struct ssb_de
- 
- 	ssb_set_drvdata(dev, hcd);
- 
-+#ifdef CONFIG_USB_EHCI_HCD_SSB
-+	/*
-+	 * attach ehci function in this core
-+	 */
-+	if (dev->id.coreid == SSB_DEV_USB20_HOST)
-+		err = ssb_ehci_attach(dev, &(ohcidev->ehci_hcd));
-+#endif
-+
- 	return err;
- 
- err_iounmap:
diff --git a/target/linux/brcm47xx/patches-2.6.33/275-usb2-bcm5354-init.patch b/target/linux/brcm47xx/patches-2.6.33/275-usb2-bcm5354-init.patch
deleted file mode 100644
index 3d8327ebf..000000000
--- a/target/linux/brcm47xx/patches-2.6.33/275-usb2-bcm5354-init.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-This patch significantly improves the reliability of high speed 
-usb writes on the bcm5354. It implements a work around for version 2
-of the usb20 core that was cribbed from the GPL sources for the 
-Asus wl500gpv2 and verified against the wl520gu sources.
-
-Reference:
-GPL/WL-520gu-NewUI/src/linux/linux/arch/mips/brcm-boards/bcm947xx/pcibios.c
-GPL/WL-500gPV2-NewUI/src/linux/linux/arch/mips/brcm-boards/bcm947xx/pcibios.c
-
-Signed-off-by: Steve Brown <sbrown@cortland.com>
-
----
- drivers/usb/host/ohci-ssb.c |   37 +++++++++++++++++++++++--------------
- 1 file changed, 23 insertions(+), 14 deletions(-)
-
---- a/drivers/usb/host/ohci-ssb.c
-+++ b/drivers/usb/host/ohci-ssb.c
-@@ -141,22 +141,31 @@ static int ssb_ohci_attach(struct ssb_de
- 		 */
- 		ssb_device_enable(dev, 0);
- 		ssb_write32(dev, 0x200, 0x7ff);
-+
-+		/* Change Flush control reg */
-+		tmp = ssb_read32(dev, 0x400);
-+		tmp &= ~8;
-+		ssb_write32(dev, 0x400, tmp);
-+		tmp = ssb_read32(dev, 0x400);
-+
-+		/* Change Shim control reg */
-+		tmp = ssb_read32(dev, 0x304);
-+		tmp &= ~0x100;
-+		ssb_write32(dev, 0x304, tmp);
-+		tmp = ssb_read32(dev, 0x304);
-+
- 		udelay(1);
--		if (dev->id.revision == 1) { // bug in rev 1
- 
--			/* Change Flush control reg */
--			tmp = ssb_read32(dev, 0x400);
--			tmp &= ~8;
--			ssb_write32(dev, 0x400, tmp);
--			tmp = ssb_read32(dev, 0x400);
--			printk("USB20H fcr: 0x%0x\n", tmp);
--
--			/* Change Shim control reg */
--			tmp = ssb_read32(dev, 0x304);
--			tmp &= ~0x100;
--			ssb_write32(dev, 0x304, tmp);
--			tmp = ssb_read32(dev, 0x304);
--			printk("USB20H shim: 0x%0x\n", tmp);
-+		/* Work around for 5354 failures */
-+		if ((dev->id.revision == 2) && (dev->bus->chip_id == 0x5354)) {
-+			/* Change syn01 reg */
-+			tmp = 0x00fe00fe;
-+			ssb_write32(dev, 0x894, tmp);
-+
-+			/* Change syn03 reg */
-+			tmp = ssb_read32(dev, 0x89c);
-+			tmp |= 0x1;
-+			ssb_write32(dev, 0x89c, tmp);
- 		}
- 	} else
- 		ssb_device_enable(dev, 0);
diff --git a/target/linux/brcm47xx/patches-2.6.33/280-activate_ssb_support_in_usb.patch b/target/linux/brcm47xx/patches-2.6.33/280-activate_ssb_support_in_usb.patch
deleted file mode 100644
index f22415856..000000000
--- a/target/linux/brcm47xx/patches-2.6.33/280-activate_ssb_support_in_usb.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-This prevents the options from being delete with make kernel_oldconfig.
----
- drivers/ssb/Kconfig |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/ssb/Kconfig
-+++ b/drivers/ssb/Kconfig
-@@ -140,6 +140,8 @@ config SSB_DRIVER_MIPS
- config SSB_EMBEDDED
- 	bool
- 	depends on SSB_DRIVER_MIPS
-+	select USB_EHCI_HCD_SSB if USB_EHCI_HCD
-+	select USB_OHCI_HCD_SSB if USB_OHCI_HCD
- 	default y
- 
- config SSB_DRIVER_EXTIF
diff --git a/target/linux/brcm47xx/patches-2.6.33/300-fork_cacheflush.patch b/target/linux/brcm47xx/patches-2.6.33/300-fork_cacheflush.patch
deleted file mode 100644
index 686fb1b94..000000000
--- a/target/linux/brcm47xx/patches-2.6.33/300-fork_cacheflush.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/mips/include/asm/cacheflush.h
-+++ b/arch/mips/include/asm/cacheflush.h
-@@ -32,7 +32,7 @@
- extern void (*flush_cache_all)(void);
- extern void (*__flush_cache_all)(void);
- extern void (*flush_cache_mm)(struct mm_struct *mm);
--#define flush_cache_dup_mm(mm)	do { (void) (mm); } while (0)
-+#define flush_cache_dup_mm(mm) flush_cache_mm(mm)
- extern void (*flush_cache_range)(struct vm_area_struct *vma,
- 	unsigned long start, unsigned long end);
- extern void (*flush_cache_page)(struct vm_area_struct *vma, unsigned long page, unsigned long pfn);
diff --git a/target/linux/brcm47xx/patches-2.6.33/301-kmod-fuse-dcache-bug-r4k.patch b/target/linux/brcm47xx/patches-2.6.33/301-kmod-fuse-dcache-bug-r4k.patch
deleted file mode 100644
index e960dbacc..000000000
--- a/target/linux/brcm47xx/patches-2.6.33/301-kmod-fuse-dcache-bug-r4k.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/arch/mips/mm/c-r4k.c
-+++ b/arch/mips/mm/c-r4k.c
-@@ -373,7 +373,7 @@ static inline void local_r4k___flush_cac
- 	}
- }
- 
--static void r4k___flush_cache_all(void)
-+void r4k___flush_cache_all(void)
- {
- 	r4k_on_each_cpu(local_r4k___flush_cache_all, NULL, 1);
- }
-@@ -537,7 +537,7 @@ static inline void local_r4k_flush_cache
- 	}
- }
- 
--static void r4k_flush_cache_page(struct vm_area_struct *vma,
-+void r4k_flush_cache_page(struct vm_area_struct *vma,
- 	unsigned long addr, unsigned long pfn)
- {
- 	struct flush_cache_page_args args;
-@@ -1456,3 +1456,10 @@ void __cpuinit r4k_cache_init(void)
- 	coherency_setup();
- #endif
- }
-+
-+// fuse package DCACHE BUG patch exports
-+void (*fuse_flush_cache_all)(void) = r4k___flush_cache_all;
-+void (*fuse_flush_cache_page)(struct vm_area_struct *vma, unsigned long page,
-+        unsigned long pfn) = r4k_flush_cache_page;
-+EXPORT_SYMBOL(fuse_flush_cache_page);
-+EXPORT_SYMBOL(fuse_flush_cache_all);
diff --git a/target/linux/brcm47xx/patches-2.6.33/302-kmod-fuse-dcache-bug-fuse.patch b/target/linux/brcm47xx/patches-2.6.33/302-kmod-fuse-dcache-bug-fuse.patch
deleted file mode 100644
index d6c0b3ab5..000000000
--- a/target/linux/brcm47xx/patches-2.6.33/302-kmod-fuse-dcache-bug-fuse.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- a/fs/fuse/dev.c
-+++ b/fs/fuse/dev.c
-@@ -533,6 +533,11 @@ static void fuse_copy_finish(struct fuse
- 	}
- }
- 
-+#ifdef DCACHE_BUG
-+extern void (*fuse_flush_cache_all)(void);
-+extern void (*fuse_flush_cache_page)(struct vm_area_struct *vma, unsigned long page, unsigned long pfn);
-+#endif
-+
- /*
-  * Get another pagefull of userspace buffer, and map it to kernel
-  * address space, and lock request
-@@ -541,6 +546,9 @@ static int fuse_copy_fill(struct fuse_co
- {
- 	unsigned long offset;
- 	int err;
-+#ifdef DCACHE_BUG
-+	struct vm_area_struct *vma;
-+#endif
- 
- 	unlock_request(cs->fc, cs->req);
- 	fuse_copy_finish(cs);
-@@ -552,14 +560,22 @@ static int fuse_copy_fill(struct fuse_co
- 		cs->nr_segs--;
- 	}
- 	down_read(&current->mm->mmap_sem);
-+#ifndef DCACHE_BUG
- 	err = get_user_pages(current, current->mm, cs->addr, 1, cs->write, 0,
- 			     &cs->pg, NULL);
-+#else
-+	err = get_user_pages(current, current->mm, cs->addr, 1, cs->write, 0,
-+			     &cs->pg, &vma);
-+#endif
- 	up_read(&current->mm->mmap_sem);
- 	if (err < 0)
- 		return err;
- 	BUG_ON(err != 1);
- 	offset = cs->addr % PAGE_SIZE;
- 	cs->mapaddr = kmap_atomic(cs->pg, KM_USER0);
-+#ifdef DCACHE_BUG
-+	fuse_flush_cache_page(vma, cs->addr, page_to_pfn(cs->pg));
-+#endif
- 	cs->buf = cs->mapaddr + offset;
- 	cs->len = min(PAGE_SIZE - offset, cs->seglen);
- 	cs->seglen -= cs->len;
-@@ -573,6 +589,11 @@ static int fuse_copy_do(struct fuse_copy
- {
- 	unsigned ncpy = min(*size, cs->len);
- 	if (val) {
-+#ifdef DCACHE_BUG
-+		// patch from mailing list, it is very important, otherwise,
-+		// can't mount, or ls mount point will hang
-+		fuse_flush_cache_all();
-+#endif
- 		if (cs->write)
- 			memcpy(cs->buf, *val, ncpy);
- 		else
---- a/fs/fuse/fuse_i.h
-+++ b/fs/fuse/fuse_i.h
-@@ -8,6 +8,7 @@
- 
- #ifndef _FS_FUSE_I_H
- #define _FS_FUSE_I_H
-+#define DCACHE_BUG
- 
- #include <linux/fuse.h>
- #include <linux/fs.h>
---- a/fs/fuse/inode.c
-+++ b/fs/fuse/inode.c
-@@ -1201,6 +1201,10 @@ static int __init fuse_init(void)
- 	printk(KERN_INFO "fuse init (API version %i.%i)\n",
- 	       FUSE_KERNEL_VERSION, FUSE_KERNEL_MINOR_VERSION);
- 
-+#ifdef DCACHE_BUG
-+printk("fuse init: DCACHE_BUG enabled\n");
-+#endif
-+
- 	INIT_LIST_HEAD(&fuse_conn_list);
- 	res = fuse_fs_init();
- 	if (res)
diff --git a/target/linux/brcm47xx/patches-2.6.33/310-no_highpage.patch b/target/linux/brcm47xx/patches-2.6.33/310-no_highpage.patch
deleted file mode 100644
index cde3cbf72..000000000
--- a/target/linux/brcm47xx/patches-2.6.33/310-no_highpage.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- a/arch/mips/include/asm/page.h
-+++ b/arch/mips/include/asm/page.h
-@@ -43,6 +43,7 @@
- #ifndef __ASSEMBLY__
- 
- #include <linux/pfn.h>
-+#include <asm/cpu-features.h>
- #include <asm/io.h>
- 
- extern void build_clear_page(void);
-@@ -78,13 +79,16 @@ static inline void clear_user_page(void 
- 		flush_data_cache_page((unsigned long)addr);
- }
- 
--extern void copy_user_page(void *vto, void *vfrom, unsigned long vaddr,
--	struct page *to);
--struct vm_area_struct;
--extern void copy_user_highpage(struct page *to, struct page *from,
--	unsigned long vaddr, struct vm_area_struct *vma);
-+static inline void copy_user_page(void *vto, void *vfrom, unsigned long vaddr,
-+	struct page *to)
-+{
-+	extern void (*flush_data_cache_page)(unsigned long addr);
- 
--#define __HAVE_ARCH_COPY_USER_HIGHPAGE
-+	copy_page(vto, vfrom);
-+	if (!cpu_has_ic_fills_f_dc ||
-+	    pages_do_alias((unsigned long)vto, vaddr & PAGE_MASK))
-+		flush_data_cache_page((unsigned long)vto);
-+}
- 
- /*
-  * These are used to make use of C type-checking..
---- a/arch/mips/mm/init.c
-+++ b/arch/mips/mm/init.c
-@@ -203,30 +203,6 @@ void kunmap_coherent(void)
- 	preempt_check_resched();
- }
- 
--void copy_user_highpage(struct page *to, struct page *from,
--	unsigned long vaddr, struct vm_area_struct *vma)
--{
--	void *vfrom, *vto;
--
--	vto = kmap_atomic(to, KM_USER1);
--	if (cpu_has_dc_aliases && cpu_use_kmap_coherent &&
--	    page_mapped(from) && !Page_dcache_dirty(from)) {
--		vfrom = kmap_coherent(from, vaddr);
--		copy_page(vto, vfrom);
--		kunmap_coherent();
--	} else {
--		vfrom = kmap_atomic(from, KM_USER0);
--		copy_page(vto, vfrom);
--		kunmap_atomic(vfrom, KM_USER0);
--	}
--	if ((!cpu_has_ic_fills_f_dc) ||
--	    pages_do_alias((unsigned long)vto, vaddr & PAGE_MASK))
--		flush_data_cache_page((unsigned long)vto);
--	kunmap_atomic(vto, KM_USER1);
--	/* Make sure this page is cleared on other CPU's too before using it */
--	smp_wmb();
--}
--
- void copy_to_user_page(struct vm_area_struct *vma,
- 	struct page *page, unsigned long vaddr, void *dst, const void *src,
- 	unsigned long len)
diff --git a/target/linux/brcm47xx/patches-2.6.33/400-arch-bcm47xx.patch b/target/linux/brcm47xx/patches-2.6.33/400-arch-bcm47xx.patch
deleted file mode 100644
index f5158a85b..000000000
--- a/target/linux/brcm47xx/patches-2.6.33/400-arch-bcm47xx.patch
+++ /dev/null
@@ -1,319 +0,0 @@
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -62,6 +62,7 @@ config BCM47XX
- 	select SSB_DRIVER_MIPS
- 	select SSB_DRIVER_EXTIF
- 	select SSB_EMBEDDED
-+	select SSB_B43_PCI_BRIDGE if PCI
- 	select SSB_PCICORE_HOSTMODE if PCI
- 	select GENERIC_GPIO
- 	select SYS_HAS_EARLY_PRINTK
---- a/arch/mips/bcm47xx/Makefile
-+++ b/arch/mips/bcm47xx/Makefile
-@@ -3,4 +3,4 @@
- # under Linux.
- #
- 
--obj-y := gpio.o irq.o prom.o serial.o setup.o time.o wgt634u.o
-+obj-y := cfe_env.o gpio.o irq.o nvram.o prom.o serial.o setup.o time.o wgt634u.o
---- a/arch/mips/bcm47xx/irq.c
-+++ b/arch/mips/bcm47xx/irq.c
-@@ -1,5 +1,6 @@
- /*
-  *  Copyright (C) 2004 Florian Schirmer <jolt@tuxbox.org>
-+ *  Copyright (C) 2008 Michael Buesch <mb@bu3sch.de>
-  *
-  *  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
-@@ -23,10 +24,19 @@
-  */
- 
- #include <linux/types.h>
-+#include <linux/errno.h>
-+#include <linux/init.h>
- #include <linux/interrupt.h>
- #include <linux/irq.h>
-+#include <linux/pci.h>
-+#include <linux/ssb/ssb.h>
-+
- #include <asm/irq_cpu.h>
- 
-+
-+extern struct ssb_bus ssb_bcm47xx;
-+
-+
- void plat_irq_dispatch(void)
- {
- 	u32 cause;
---- a/arch/mips/bcm47xx/nvram.c
-+++ b/arch/mips/bcm47xx/nvram.c
-@@ -24,10 +24,10 @@
- #include <asm/io.h>
- #include <asm/uaccess.h>
- 
--#include <nvram.h>
-+#include "include/nvram.h"
- 
- #define MB * 1048576
--extern struct ssb_bus ssb;
-+extern struct ssb_bus ssb_bcm47xx;
- 
- static char nvram_buf[NVRAM_SPACE];
- static int cfe_env;
-@@ -36,7 +36,7 @@ extern char *cfe_env_get(char *nv_buf, c
- /* Probe for NVRAM header */
- static void __init early_nvram_init(void)
- {
--	struct ssb_mipscore *mcore = &ssb.mipscore;
-+	struct ssb_mipscore *mcore = &ssb_bcm47xx.mipscore;
- 	struct nvram_header *header;
- 	int i;
- 	u32 base, lim, off;
---- a/arch/mips/bcm47xx/setup.c
-+++ b/arch/mips/bcm47xx/setup.c
-@@ -2,7 +2,7 @@
-  *  Copyright (C) 2004 Florian Schirmer <jolt@tuxbox.org>
-  *  Copyright (C) 2005 Waldemar Brodkorb <wbx@openwrt.org>
-  *  Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
-- *  Copyright (C) 2006 Michael Buesch <mb@bu3sch.de>
-+ *  Copyright (C) 2006-2008 Michael Buesch <mb@bu3sch.de>
-  *
-  *  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
-@@ -25,18 +25,28 @@
-  *  675 Mass Ave, Cambridge, MA 02139, USA.
-  */
- 
-+#include <linux/init.h>
- #include <linux/types.h>
- #include <linux/ssb/ssb.h>
- #include <linux/ssb/ssb_embedded.h>
-+#include <linux/tty.h>
-+#include <linux/serial.h>
-+#include <linux/serial_core.h>
-+#include <linux/serial_reg.h>
-+#include <linux/serial_8250.h>
- #include <asm/bootinfo.h>
- #include <asm/reboot.h>
- #include <asm/time.h>
--#include <bcm47xx.h>
- #include <asm/fw/cfe/cfe_api.h>
-+#include <linux/pm.h>
-+
-+#include "include/nvram.h"
- 
- struct ssb_bus ssb_bcm47xx;
- EXPORT_SYMBOL(ssb_bcm47xx);
- 
-+extern void bcm47xx_pci_init(void);
-+
- static void bcm47xx_machine_restart(char *command)
- {
- 	printk(KERN_ALERT "Please stand by while rebooting the system...\n");
-@@ -56,7 +66,7 @@ static void bcm47xx_machine_halt(void)
- 		cpu_relax();
- }
- 
--static void str2eaddr(char *str, char *dest)
-+static void e_aton(char *str, char *dest)
- {
- 	int i = 0;
- 
-@@ -73,52 +83,142 @@ static void str2eaddr(char *str, char *d
- 	}
- }
- 
--static int bcm47xx_get_invariants(struct ssb_bus *bus,
--				   struct ssb_init_invariants *iv)
-+static void bcm47xx_fill_sprom(struct ssb_sprom *sprom)
- {
--	char buf[100];
-+	char *s;
- 
--	/* Fill boardinfo structure */
--	memset(&(iv->boardinfo), 0 , sizeof(struct ssb_boardinfo));
-+	memset(sprom, 0xFF, sizeof(struct ssb_sprom));
- 
--	if (cfe_getenv("boardvendor", buf, sizeof(buf)) >= 0)
--		iv->boardinfo.type = (u16)simple_strtoul(buf, NULL, 0);
--	if (cfe_getenv("boardtype", buf, sizeof(buf)) >= 0)
--		iv->boardinfo.type = (u16)simple_strtoul(buf, NULL, 0);
--	if (cfe_getenv("boardrev", buf, sizeof(buf)) >= 0)
--		iv->boardinfo.rev = (u16)simple_strtoul(buf, NULL, 0);
--
--	/* Fill sprom structure */
--	memset(&(iv->sprom), 0, sizeof(struct ssb_sprom));
--	iv->sprom.revision = 3;
--
--	if (cfe_getenv("et0macaddr", buf, sizeof(buf)) >= 0)
--		str2eaddr(buf, iv->sprom.et0mac);
--	if (cfe_getenv("et1macaddr", buf, sizeof(buf)) >= 0)
--		str2eaddr(buf, iv->sprom.et1mac);
--	if (cfe_getenv("et0phyaddr", buf, sizeof(buf)) >= 0)
--		iv->sprom.et0phyaddr = simple_strtoul(buf, NULL, 10);
--	if (cfe_getenv("et1phyaddr", buf, sizeof(buf)) >= 0)
--		iv->sprom.et1phyaddr = simple_strtoul(buf, NULL, 10);
--	if (cfe_getenv("et0mdcport", buf, sizeof(buf)) >= 0)
--		iv->sprom.et0mdcport = simple_strtoul(buf, NULL, 10);
--	if (cfe_getenv("et1mdcport", buf, sizeof(buf)) >= 0)
--		iv->sprom.et1mdcport = simple_strtoul(buf, NULL, 10);
-+	sprom->revision = 1;
-+	if ((s = nvram_get("il0macaddr")))
-+		e_aton(s, sprom->il0mac);
-+	if ((s = nvram_get("et0macaddr")))
-+		e_aton(s, sprom->et0mac);
-+	if ((s = nvram_get("et1macaddr")))
-+		e_aton(s, sprom->et1mac);
-+	if ((s = nvram_get("et0phyaddr")))
-+		sprom->et0phyaddr = simple_strtoul(s, NULL, 0);
-+	if ((s = nvram_get("et1phyaddr")))
-+		sprom->et1phyaddr = simple_strtoul(s, NULL, 0);
-+	if ((s = nvram_get("et0mdcport")))
-+		sprom->et0mdcport = !!simple_strtoul(s, NULL, 10);
-+	if ((s = nvram_get("et1mdcport")))
-+		sprom->et1mdcport = !!simple_strtoul(s, NULL, 10);
-+	if ((s = nvram_get("pa0b0")))
-+		sprom->pa0b0 = simple_strtoul(s, NULL, 0);
-+	if ((s = nvram_get("pa0b1")))
-+		sprom->pa0b1 = simple_strtoul(s, NULL, 0);
-+	if ((s = nvram_get("pa0b2")))
-+		sprom->pa0b2 = simple_strtoul(s, NULL, 0);
-+	if ((s = nvram_get("pa1b0")))
-+		sprom->pa1b0 = simple_strtoul(s, NULL, 0);
-+	if ((s = nvram_get("pa1b1")))
-+		sprom->pa1b1 = simple_strtoul(s, NULL, 0);
-+	if ((s = nvram_get("pa1b2")))
-+		sprom->pa1b2 = simple_strtoul(s, NULL, 0);
-+	if ((s = nvram_get("wl0gpio0")))
-+		sprom->gpio0 = simple_strtoul(s, NULL, 0);
-+	if ((s = nvram_get("wl0gpio1")))
-+		sprom->gpio1 = simple_strtoul(s, NULL, 0);
-+	if ((s = nvram_get("wl0gpio2")))
-+		sprom->gpio2 = simple_strtoul(s, NULL, 0);
-+	if ((s = nvram_get("wl0gpio3")))
-+		sprom->gpio3 = simple_strtoul(s, NULL, 0);
-+	if ((s = nvram_get("pa0maxpwr")))
-+		sprom->maxpwr_bg = simple_strtoul(s, NULL, 0);
-+	if ((s = nvram_get("pa1maxpwr")))
-+		sprom->maxpwr_a = simple_strtoul(s, NULL, 0);
-+	if ((s = nvram_get("pa0itssit")))
-+		sprom->itssi_bg = simple_strtoul(s, NULL, 0);
-+	if ((s = nvram_get("pa1itssit")))
-+		sprom->itssi_a = simple_strtoul(s, NULL, 0);
-+	sprom->boardflags_lo = 0;
-+	if ((s = nvram_get("boardflags")))
-+		sprom->boardflags_lo = simple_strtoul(s, NULL, 0);
-+	sprom->boardflags_hi = 0;
-+	if ((s = nvram_get("boardflags2")))
-+		sprom->boardflags_hi = simple_strtoul(s, NULL, 0);
-+}
-+
-+static int bcm47xx_get_invariants(struct ssb_bus *bus, struct ssb_init_invariants *iv)
-+{
-+	char *s;
-+
-+	iv->boardinfo.vendor = SSB_BOARDVENDOR_BCM;
-+	if ((s = nvram_get("boardtype")))
-+		iv->boardinfo.type = (u16)simple_strtoul(s, NULL, 0);
-+	if ((s = nvram_get("boardrev")))
-+		iv->boardinfo.rev = (u16)simple_strtoul(s, NULL, 0);
-+
-+	bcm47xx_fill_sprom(&iv->sprom);
-+
-+	if ((s = nvram_get("cardbus")))
-+		iv->has_cardbus_slot = !!simple_strtoul(s, NULL, 10);
- 
- 	return 0;
- }
- 
- void __init plat_mem_setup(void)
- {
--	int err;
-+	int i, err;
-+	char *s;
-+	struct ssb_mipscore *mcore;
-+
-+	err = ssb_bus_ssbbus_register(&ssb_bcm47xx, SSB_ENUM_BASE, bcm47xx_get_invariants);
-+	if (err) {
-+		const char *msg = "Failed to initialize SSB bus (err %d)\n";
-+		printk(msg, err); /* Make sure the message gets out of the box. */
-+		panic(msg, err);
-+	}
-+	mcore = &ssb_bcm47xx.mipscore;
- 
--	err = ssb_bus_ssbbus_register(&ssb_bcm47xx, SSB_ENUM_BASE,
--				      bcm47xx_get_invariants);
--	if (err)
--		panic("Failed to initialize SSB bus (err %d)\n", err);
-+	s = nvram_get("kernel_args");
-+	if (s && !strncmp(s, "console=ttyS1", 13)) {
-+		struct ssb_serial_port port;
-+
-+		printk("Swapping serial ports!\n");
-+		/* swap serial ports */
-+		memcpy(&port, &mcore->serial_ports[0], sizeof(port));
-+		memcpy(&mcore->serial_ports[0], &mcore->serial_ports[1], sizeof(port));
-+		memcpy(&mcore->serial_ports[1], &port, sizeof(port));
-+	}
-+
-+	for (i = 0; i < mcore->nr_serial_ports; i++) {
-+		struct ssb_serial_port *port = &(mcore->serial_ports[i]);
-+		struct uart_port s;
-+
-+		memset(&s, 0, sizeof(s));
-+		s.line = i;
-+		s.mapbase = (unsigned int) port->regs;
-+		s.membase = port->regs;
-+		s.irq = port->irq + 2;
-+		s.uartclk = port->baud_base;
-+		s.flags = UPF_BOOT_AUTOCONF | UPF_SHARE_IRQ;
-+		s.iotype = SERIAL_IO_MEM;
-+		s.regshift = port->reg_shift;
-+
-+		early_serial_setup(&s);
-+	}
-+	printk("Serial init done.\n");
- 
- 	_machine_restart = bcm47xx_machine_restart;
- 	_machine_halt = bcm47xx_machine_halt;
- 	pm_power_off = bcm47xx_machine_halt;
- }
- 
-+static int __init bcm47xx_register_gpiodev(void)
-+{
-+	static struct resource res = {
-+		.start = 0xFFFFFFFF,
-+	};
-+	struct platform_device *pdev;
-+
-+	pdev = platform_device_register_simple("GPIODEV", 0, &res, 1);
-+	if (!pdev) {
-+		printk(KERN_ERR "bcm47xx: GPIODEV init failed\n");
-+		return -ENODEV;
-+	}
-+
-+	return 0;
-+}
-+device_initcall(bcm47xx_register_gpiodev);
---- a/arch/mips/bcm47xx/time.c
-+++ b/arch/mips/bcm47xx/time.c
-@@ -22,11 +22,17 @@
-  *  675 Mass Ave, Cambridge, MA 02139, USA.
-  */
- 
--
- #include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/sched.h>
-+#include <linux/serial_reg.h>
-+#include <linux/interrupt.h>
- #include <linux/ssb/ssb.h>
-+#include <asm/addrspace.h>
-+#include <asm/io.h>
- #include <asm/time.h>
--#include <bcm47xx.h>
-+
-+extern struct ssb_bus ssb_bcm47xx;
- 
- void __init plat_time_init(void)
- {
diff --git a/target/linux/brcm47xx/patches-2.6.33/601-mips-remove-pci-collision-check.patch b/target/linux/brcm47xx/patches-2.6.33/601-mips-remove-pci-collision-check.patch
deleted file mode 100644
index 7860ca0dd..000000000
--- a/target/linux/brcm47xx/patches-2.6.33/601-mips-remove-pci-collision-check.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/arch/mips/pci/pci.c
-+++ b/arch/mips/pci/pci.c
-@@ -185,12 +185,10 @@ static int pcibios_enable_resources(stru
- 		if ((idx == PCI_ROM_RESOURCE) &&
- 				(!(r->flags & IORESOURCE_ROM_ENABLE)))
- 			continue;
--		if (!r->start && r->end) {
--			printk(KERN_ERR "PCI: Device %s not available "
--			       "because of resource collisions\n",
-+		if (!r->start && r->end)
-+			printk(KERN_WARNING "PCI: Device %s resource"
-+			       "collisions detected. Ignoring...\n",
- 			       pci_name(dev));
--			return -EINVAL;
--		}
- 		if (r->flags & IORESOURCE_IO)
- 			cmd |= PCI_COMMAND_IO;
- 		if (r->flags & IORESOURCE_MEM)
diff --git a/target/linux/brcm47xx/patches-2.6.33/700-ssb-gigabit-ethernet-driver.patch b/target/linux/brcm47xx/patches-2.6.33/700-ssb-gigabit-ethernet-driver.patch
deleted file mode 100644
index 04185d729..000000000
--- a/target/linux/brcm47xx/patches-2.6.33/700-ssb-gigabit-ethernet-driver.patch
+++ /dev/null
@@ -1,329 +0,0 @@
---- a/drivers/net/tg3.c
-+++ b/drivers/net/tg3.c
-@@ -41,6 +41,7 @@
- #include <linux/prefetch.h>
- #include <linux/dma-mapping.h>
- #include <linux/firmware.h>
-+#include <linux/ssb/ssb_driver_gige.h>
- 
- #include <net/checksum.h>
- #include <net/ip.h>
-@@ -466,8 +467,9 @@ static void _tw32_flush(struct tg3 *tp, 
- static inline void tw32_mailbox_flush(struct tg3 *tp, u32 off, u32 val)
- {
- 	tp->write32_mbox(tp, off, val);
--	if (!(tp->tg3_flags & TG3_FLAG_MBOX_WRITE_REORDER) &&
--	    !(tp->tg3_flags2 & TG3_FLG2_ICH_WORKAROUND))
-+	if ((tp->tg3_flags3 & TG3_FLG3_FLUSH_POSTED_WRITES) ||
-+	    (!(tp->tg3_flags & TG3_FLAG_MBOX_WRITE_REORDER) &&
-+	     !(tp->tg3_flags2 & TG3_FLG2_ICH_WORKAROUND)))
- 		tp->read32_mbox(tp, off);
- }
- 
-@@ -477,7 +479,7 @@ static void tg3_write32_tx_mbox(struct t
- 	writel(val, mbox);
- 	if (tp->tg3_flags & TG3_FLAG_TXD_MBOX_HWBUG)
- 		writel(val, mbox);
--	if (tp->tg3_flags & TG3_FLAG_MBOX_WRITE_REORDER)
-+	if ((tp->tg3_flags & TG3_FLAG_MBOX_WRITE_REORDER) || (tp->tg3_flags3 & TG3_FLG3_FLUSH_POSTED_WRITES))
- 		readl(mbox);
- }
- 
-@@ -777,7 +779,7 @@ static void tg3_switch_clocks(struct tg3
- 
- #define PHY_BUSY_LOOPS	5000
- 
--static int tg3_readphy(struct tg3 *tp, int reg, u32 *val)
-+static int __tg3_readphy(struct tg3 *tp, unsigned int phy_addr, int reg, u32 *val)
- {
- 	u32 frame_val;
- 	unsigned int loops;
-@@ -791,7 +793,7 @@ static int tg3_readphy(struct tg3 *tp, i
- 
- 	*val = 0x0;
- 
--	frame_val  = ((tp->phy_addr << MI_COM_PHY_ADDR_SHIFT) &
-+	frame_val  = ((phy_addr << MI_COM_PHY_ADDR_SHIFT) &
- 		      MI_COM_PHY_ADDR_MASK);
- 	frame_val |= ((reg << MI_COM_REG_ADDR_SHIFT) &
- 		      MI_COM_REG_ADDR_MASK);
-@@ -826,7 +828,12 @@ static int tg3_readphy(struct tg3 *tp, i
- 	return ret;
- }
- 
--static int tg3_writephy(struct tg3 *tp, int reg, u32 val)
-+static int tg3_readphy(struct tg3 *tp, int reg, u32 *val)
-+{
-+	return __tg3_readphy(tp, tp->phy_addr, reg, val);
-+}
-+
-+static int __tg3_writephy(struct tg3 *tp, unsigned int phy_addr, int reg, u32 val)
- {
- 	u32 frame_val;
- 	unsigned int loops;
-@@ -842,7 +849,7 @@ static int tg3_writephy(struct tg3 *tp, 
- 		udelay(80);
- 	}
- 
--	frame_val  = ((tp->phy_addr << MI_COM_PHY_ADDR_SHIFT) &
-+	frame_val  = ((phy_addr << MI_COM_PHY_ADDR_SHIFT) &
- 		      MI_COM_PHY_ADDR_MASK);
- 	frame_val |= ((reg << MI_COM_REG_ADDR_SHIFT) &
- 		      MI_COM_REG_ADDR_MASK);
-@@ -875,6 +882,11 @@ static int tg3_writephy(struct tg3 *tp, 
- 	return ret;
- }
- 
-+static int tg3_writephy(struct tg3 *tp, int reg, u32 val)
-+{
-+	return __tg3_writephy(tp, tp->phy_addr, reg, val);
-+}
-+
- static int tg3_bmcr_reset(struct tg3 *tp)
- {
- 	u32 phy_control;
-@@ -2381,6 +2393,9 @@ static int tg3_nvram_read(struct tg3 *tp
- {
- 	int ret;
- 
-+	if (tp->tg3_flags3 & TG3_FLG3_IS_SSB_CORE)
-+		return -ENODEV;
-+
- 	if (!(tp->tg3_flags & TG3_FLAG_NVRAM))
- 		return tg3_nvram_read_using_eeprom(tp, offset, val);
- 
-@@ -2712,8 +2727,10 @@ static int tg3_set_power_state(struct tg
- 	tg3_frob_aux_power(tp);
- 
- 	/* Workaround for unstable PLL clock */
--	if ((GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5750_AX) ||
--	    (GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5750_BX)) {
-+	if ((tp->phy_id & PHY_ID_MASK) != PHY_ID_BCM5750_2 &&
-+				/* !!! FIXME !!! */
-+	    ((GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5750_AX) ||
-+	    (GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5750_BX))) {
- 		u32 val = tr32(0x7d00);
- 
- 		val &= ~((1 << 16) | (1 << 4) | (1 << 2) | (1 << 1) | 1);
-@@ -3205,6 +3222,14 @@ relink:
- 
- 		tg3_phy_copper_begin(tp);
- 
-+		if (tp->tg3_flags3 & TG3_FLG3_ROBOSWITCH) {
-+			current_link_up = 1;
-+			current_speed = SPEED_1000; //FIXME
-+			current_duplex = DUPLEX_FULL;
-+			tp->link_config.active_speed = current_speed;
-+			tp->link_config.active_duplex = current_duplex;
-+		}
-+
- 		tg3_readphy(tp, MII_BMSR, &tmp);
- 		if (!tg3_readphy(tp, MII_BMSR, &tmp) &&
- 		    (tmp & BMSR_LSTATUS))
-@@ -6633,6 +6658,11 @@ static int tg3_poll_fw(struct tg3 *tp)
- 	int i;
- 	u32 val;
- 
-+	if (tp->tg3_flags3 & TG3_FLG3_IS_SSB_CORE) {
-+		/* We don't use firmware. */
-+		return 0;
-+	}
-+
- 	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) {
- 		/* Wait up to 20ms for init done. */
- 		for (i = 0; i < 200; i++) {
-@@ -6910,6 +6940,14 @@ static int tg3_chip_reset(struct tg3 *tp
- 		tw32(0x5000, 0x400);
- 	}
- 
-+	if (tp->tg3_flags3 & TG3_FLG3_IS_SSB_CORE) {
-+		/* BCM4785: In order to avoid repercussions from using potentially
-+		 * defective internal ROM, stop the Rx RISC CPU, which is not
-+		 * required. */
-+		tg3_stop_fw(tp);
-+		tg3_halt_cpu(tp, RX_CPU_BASE);
-+	}
-+
- 	tw32(GRC_MODE, tp->grc_mode);
- 
- 	if (tp->pci_chip_rev_id == CHIPREV_ID_5705_A0) {
-@@ -7089,9 +7127,12 @@ static int tg3_halt_cpu(struct tg3 *tp, 
- 		return -ENODEV;
- 	}
- 
--	/* Clear firmware's nvram arbitration. */
--	if (tp->tg3_flags & TG3_FLAG_NVRAM)
--		tw32(NVRAM_SWARB, SWARB_REQ_CLR0);
-+	if (!(tp->tg3_flags3 & TG3_FLG3_IS_SSB_CORE)) {
-+		/* Clear firmware's nvram arbitration. */
-+		if (tp->tg3_flags & TG3_FLAG_NVRAM)
-+			tw32(NVRAM_SWARB, SWARB_REQ_CLR0);
-+	}
-+
- 	return 0;
- }
- 
-@@ -7154,6 +7195,11 @@ static int tg3_load_5701_a0_firmware_fix
- 	const __be32 *fw_data;
- 	int err, i;
- 
-+	if (tp->tg3_flags3 & TG3_FLG3_IS_SSB_CORE) {
-+		/* We don't use firmware. */
-+		return 0;
-+	}
-+
- 	fw_data = (void *)tp->fw->data;
- 
- 	/* Firmware blob starts with version numbers, followed by
-@@ -7213,6 +7259,11 @@ static int tg3_load_tso_firmware(struct 
- 	unsigned long cpu_base, cpu_scratch_base, cpu_scratch_size;
- 	int err, i;
- 
-+	if (tp->tg3_flags3 & TG3_FLG3_IS_SSB_CORE) {
-+		/* We don't use firmware. */
-+		return 0;
-+	}
-+
- 	if (tp->tg3_flags2 & TG3_FLG2_HW_TSO)
- 		return 0;
- 
-@@ -8317,6 +8368,11 @@ static void tg3_timer(unsigned long __op
- 
- 	spin_lock(&tp->lock);
- 
-+	if (tp->tg3_flags3 & TG3_FLG3_FLUSH_POSTED_WRITES) {
-+		/* BCM4785: Flush posted writes from GbE to host memory. */
-+		tr32(HOSTCC_MODE);
-+	}
-+
- 	if (!(tp->tg3_flags & TG3_FLAG_TAGGED_STATUS)) {
- 		/* All of this garbage is because when using non-tagged
- 		 * IRQ status the mailbox/status_block protocol the chip
-@@ -10214,6 +10270,11 @@ static int tg3_test_nvram(struct tg3 *tp
- 	if (tp->tg3_flags3 & TG3_FLG3_NO_NVRAM)
- 		return 0;
- 
-+	if (tp->tg3_flags3 & TG3_FLG3_IS_SSB_CORE) {
-+		/* We don't have NVRAM. */
-+		return 0;
-+	}
-+
- 	if (tg3_nvram_read(tp, 0, &magic) != 0)
- 		return -EIO;
- 
-@@ -11014,7 +11075,7 @@ static int tg3_ioctl(struct net_device *
- 			return -EAGAIN;
- 
- 		spin_lock_bh(&tp->lock);
--		err = tg3_readphy(tp, data->reg_num & 0x1f, &mii_regval);
-+		err = __tg3_readphy(tp, data->phy_id & 0x1f, data->reg_num & 0x1f, &mii_regval);
- 		spin_unlock_bh(&tp->lock);
- 
- 		data->val_out = mii_regval;
-@@ -11030,7 +11091,7 @@ static int tg3_ioctl(struct net_device *
- 			return -EAGAIN;
- 
- 		spin_lock_bh(&tp->lock);
--		err = tg3_writephy(tp, data->reg_num & 0x1f, data->val_in);
-+		err = __tg3_writephy(tp, data->phy_id & 0x1f, data->reg_num & 0x1f, data->val_in);
- 		spin_unlock_bh(&tp->lock);
- 
- 		return err;
-@@ -11675,6 +11736,12 @@ static void __devinit tg3_get_5717_nvram
- /* Chips other than 5700/5701 use the NVRAM for fetching info. */
- static void __devinit tg3_nvram_init(struct tg3 *tp)
- {
-+	if (tp->tg3_flags3 & TG3_FLG3_IS_SSB_CORE) {
-+		/* No NVRAM and EEPROM on the SSB Broadcom GigE core. */
-+		tp->tg3_flags &= ~(TG3_FLAG_NVRAM | TG3_FLAG_NVRAM_BUFFERED);
-+		return;
-+	}
-+
- 	tw32_f(GRC_EEPROM_ADDR,
- 	     (EEPROM_ADDR_FSM_RESET |
- 	      (EEPROM_DEFAULT_CLOCK_PERIOD <<
-@@ -11936,6 +12003,9 @@ static int tg3_nvram_write_block(struct 
- {
- 	int ret;
- 
-+	if (tp->tg3_flags3 & TG3_FLG3_IS_SSB_CORE)
-+		return -ENODEV;
-+
- 	if (tp->tg3_flags & TG3_FLAG_EEPROM_WRITE_PROT) {
- 		tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl &
- 		       ~GRC_LCLCTRL_GPIO_OUTPUT1);
-@@ -13246,6 +13316,11 @@ static int __devinit tg3_get_invariants(
- 	      GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701)))
- 		tp->tg3_flags |= TG3_FLAG_SRAM_USE_CONFIG;
- 
-+	if (tp->tg3_flags3 & TG3_FLG3_FLUSH_POSTED_WRITES) {
-+		tp->write32_tx_mbox = tg3_write_flush_reg32;
-+		tp->write32_rx_mbox = tg3_write_flush_reg32;
-+	}
-+
- 	/* Get eeprom hw config before calling tg3_set_power_state().
- 	 * In particular, the TG3_FLG2_IS_NIC flag must be
- 	 * determined before calling tg3_set_power_state() so that
-@@ -13637,6 +13712,10 @@ static int __devinit tg3_get_device_addr
- 	}
- 
- 	if (!is_valid_ether_addr(&dev->dev_addr[0])) {
-+		if (tp->tg3_flags3 & TG3_FLG3_IS_SSB_CORE)
-+			ssb_gige_get_macaddr(tp->pdev, &dev->dev_addr[0]);
-+	}
-+	if (!is_valid_ether_addr(&dev->dev_addr[0])) {
- #ifdef CONFIG_SPARC
- 		if (!tg3_get_default_macaddr_sparc(tp))
- 			return 0;
-@@ -14139,6 +14218,7 @@ static char * __devinit tg3_phy_string(s
- 	case PHY_ID_BCM5704:	return "5704";
- 	case PHY_ID_BCM5705:	return "5705";
- 	case PHY_ID_BCM5750:	return "5750";
-+	case PHY_ID_BCM5750_2:	return "5750-2";
- 	case PHY_ID_BCM5752:	return "5752";
- 	case PHY_ID_BCM5714:	return "5714";
- 	case PHY_ID_BCM5780:	return "5780";
-@@ -14351,6 +14431,13 @@ static int __devinit tg3_init_one(struct
- 		tp->msg_enable = tg3_debug;
- 	else
- 		tp->msg_enable = TG3_DEF_MSG_ENABLE;
-+	if (pdev_is_ssb_gige_core(pdev)) {
-+		tp->tg3_flags3 |= TG3_FLG3_IS_SSB_CORE;
-+		if (ssb_gige_must_flush_posted_writes(pdev))
-+			tp->tg3_flags3 |= TG3_FLG3_FLUSH_POSTED_WRITES;
-+		if (ssb_gige_have_roboswitch(pdev))
-+			tp->tg3_flags3 |= TG3_FLG3_ROBOSWITCH;
-+	}
- 
- 	/* The word/byte swap controls here control register access byte
- 	 * swapping.  DMA data byte swapping is controlled in the GRC_MODE
---- a/drivers/net/tg3.h
-+++ b/drivers/net/tg3.h
-@@ -1959,6 +1959,9 @@
- #define  NIC_SRAM_RGMII_STD_IBND_DISABLE 0x00000004
- #define  NIC_SRAM_RGMII_EXT_IBND_RX_EN	 0x00000008
- #define  NIC_SRAM_RGMII_EXT_IBND_TX_EN	 0x00000010
-+#define TG3_FLG3_IS_SSB_CORE		0x00000800
-+#define TG3_FLG3_FLUSH_POSTED_WRITES	0x00001000
-+#define TG3_FLG3_ROBOSWITCH		0x00002000
- 
- #define NIC_SRAM_RX_MINI_BUFFER_DESC	0x00001000
- 
-@@ -2874,6 +2877,7 @@ struct tg3 {
- #define PHY_ID_BCM5714			0x60008340
- #define PHY_ID_BCM5780			0x60008350
- #define PHY_ID_BCM5755			0xbc050cc0
-+#define PHY_ID_BCM5750_2		0xbc050cd0
- #define PHY_ID_BCM5787			0xbc050ce0
- #define PHY_ID_BCM5756			0xbc050ed0
- #define PHY_ID_BCM5784			0xbc050fa0
-@@ -2921,7 +2925,8 @@ struct tg3 {
- 	 (X) == PHY_ID_BCM5780 || (X) == PHY_ID_BCM5787 || \
- 	 (X) == PHY_ID_BCM5755 || (X) == PHY_ID_BCM5756 || \
- 	 (X) == PHY_ID_BCM5906 || (X) == PHY_ID_BCM5761 || \
--	 (X) == PHY_ID_BCM5717 || (X) == PHY_ID_BCM8002)
-+	 (X) == PHY_ID_BCM5717 || (X) == PHY_ID_BCM8002 || \
-+	 (X) == PHY_ID_BCM5750_2)
- 
- 	struct tg3_hw_stats		*hw_stats;
- 	dma_addr_t			stats_mapping;
diff --git a/target/linux/brcm47xx/patches-2.6.33/800-fix_cfe_detection.patch b/target/linux/brcm47xx/patches-2.6.33/800-fix_cfe_detection.patch
deleted file mode 100644
index a29805570..000000000
--- a/target/linux/brcm47xx/patches-2.6.33/800-fix_cfe_detection.patch
+++ /dev/null
@@ -1,108 +0,0 @@
---- a/arch/mips/bcm47xx/prom.c
-+++ b/arch/mips/bcm47xx/prom.c
-@@ -32,6 +32,7 @@
- #include <asm/fw/cfe/cfe_error.h>
- 
- static int cfe_cons_handle;
-+static void (* __prom_putchar)(char c);
- 
- const char *get_system_type(void)
- {
-@@ -40,65 +41,40 @@ const char *get_system_type(void)
- 
- void prom_putchar(char c)
- {
-+	if (__prom_putchar)
-+		__prom_putchar(c);
-+}
-+
-+void prom_putchar_cfe(char c)
-+{
- 	while (cfe_write(cfe_cons_handle, &c, 1) == 0)
- 		;
- }
- 
--static __init void prom_init_cfe(void)
-+static __init int prom_init_cfe(void)
- {
- 	uint32_t cfe_ept;
- 	uint32_t cfe_handle;
- 	uint32_t cfe_eptseal;
--	int argc = fw_arg0;
--	char **envp = (char **) fw_arg2;
--	int *prom_vec = (int *) fw_arg3;
--
--	/*
--	 * Check if a loader was used; if NOT, the 4 arguments are
--	 * what CFE gives us (handle, 0, EPT and EPTSEAL)
--	 */
--	if (argc < 0) {
--		cfe_handle = (uint32_t)argc;
--		cfe_ept = (uint32_t)envp;
--		cfe_eptseal = (uint32_t)prom_vec;
--	} else {
--		if ((int)prom_vec < 0) {
--			/*
--			 * Old loader; all it gives us is the handle,
--			 * so use the "known" entrypoint and assume
--			 * the seal.
--			 */
--			cfe_handle = (uint32_t)prom_vec;
--			cfe_ept = 0xBFC00500;
--			cfe_eptseal = CFE_EPTSEAL;
--		} else {
--			/*
--			 * Newer loaders bundle the handle/ept/eptseal
--			 * Note: prom_vec is in the loader's useg
--			 * which is still alive in the TLB.
--			 */
--			cfe_handle = prom_vec[0];
--			cfe_ept = prom_vec[2];
--			cfe_eptseal = prom_vec[3];
--		}
--	}
- 
--	if (cfe_eptseal != CFE_EPTSEAL) {
--		/* too early for panic to do any good */
--		printk(KERN_ERR "CFE's entrypoint seal doesn't match.");
--		while (1) ;
--	}
-+	cfe_eptseal = (uint32_t) fw_arg3;
-+	cfe_handle = (uint32_t) fw_arg0;
-+	cfe_ept = (uint32_t) fw_arg2;
-+
-+	if (cfe_eptseal != CFE_EPTSEAL)
-+		return -1;
- 
- 	cfe_init(cfe_handle, cfe_ept);
-+	return 0;
- }
- 
--static __init void prom_init_console(void)
-+static __init void prom_init_console_cfe(void)
- {
- 	/* Initialize CFE console */
- 	cfe_cons_handle = cfe_getstdhandle(CFE_STDHANDLE_CONSOLE);
- }
- 
--static __init void prom_init_cmdline(void)
-+static __init void prom_init_cmdline_cfe(void)
- {
- 	static char buf[COMMAND_LINE_SIZE] __initdata;
- 
-@@ -160,9 +136,12 @@ static __init void prom_init_mem(void)
- 
- void __init prom_init(void)
- {
--	prom_init_cfe();
--	prom_init_console();
--	prom_init_cmdline();
-+	if (prom_init_cfe() == 0) {
-+		//prom_init_console_cfe();
-+		//prom_init_cmdline_cfe();
-+		__prom_putchar = prom_putchar_cfe;
-+	}
-+
- 	prom_init_mem();
- }
- 
diff --git a/target/linux/brcm47xx/patches-2.6.33/812-disable_wgt634u_crap.patch b/target/linux/brcm47xx/patches-2.6.33/812-disable_wgt634u_crap.patch
deleted file mode 100644
index eb212f3d1..000000000
--- a/target/linux/brcm47xx/patches-2.6.33/812-disable_wgt634u_crap.patch
+++ /dev/null
@@ -1,178 +0,0 @@
---- a/arch/mips/bcm47xx/Makefile
-+++ b/arch/mips/bcm47xx/Makefile
-@@ -3,4 +3,4 @@
- # under Linux.
- #
- 
--obj-y := cfe_env.o gpio.o irq.o nvram.o prom.o serial.o setup.o time.o wgt634u.o
-+obj-y := cfe_env.o gpio.o irq.o nvram.o prom.o serial.o setup.o time.o
---- a/arch/mips/bcm47xx/wgt634u.c
-+++ /dev/null
-@@ -1,167 +0,0 @@
--/*
-- * This file is subject to the terms and conditions of the GNU General Public
-- * License.  See the file "COPYING" in the main directory of this archive
-- * for more details.
-- *
-- * Copyright (C) 2007 Aurelien Jarno <aurelien@aurel32.net>
-- */
--
--#include <linux/platform_device.h>
--#include <linux/module.h>
--#include <linux/leds.h>
--#include <linux/mtd/physmap.h>
--#include <linux/ssb/ssb.h>
--#include <linux/interrupt.h>
--#include <linux/reboot.h>
--#include <linux/gpio.h>
--#include <asm/mach-bcm47xx/bcm47xx.h>
--
--/* GPIO definitions for the WGT634U */
--#define WGT634U_GPIO_LED	3
--#define WGT634U_GPIO_RESET	2
--#define WGT634U_GPIO_TP1	7
--#define WGT634U_GPIO_TP2	6
--#define WGT634U_GPIO_TP3	5
--#define WGT634U_GPIO_TP4	4
--#define WGT634U_GPIO_TP5	1
--
--static struct gpio_led wgt634u_leds[] = {
--	{
--		.name = "power",
--		.gpio = WGT634U_GPIO_LED,
--		.active_low = 1,
--		.default_trigger = "heartbeat",
--	},
--};
--
--static struct gpio_led_platform_data wgt634u_led_data = {
--	.num_leds =     ARRAY_SIZE(wgt634u_leds),
--	.leds =         wgt634u_leds,
--};
--
--static struct platform_device wgt634u_gpio_leds = {
--	.name =         "leds-gpio",
--	.id =           -1,
--	.dev = {
--		.platform_data = &wgt634u_led_data,
--	}
--};
--
--
--/* 8MiB flash. The struct mtd_partition matches original Netgear WGT634U
--   firmware. */
--static struct mtd_partition wgt634u_partitions[] = {
--	{
--		.name       = "cfe",
--		.offset     = 0,
--		.size       = 0x60000,		/* 384k */
--		.mask_flags = MTD_WRITEABLE 	/* force read-only */
--	},
--	{
--		.name   = "config",
--		.offset = 0x60000,
--		.size   = 0x20000		/* 128k */
--	},
--	{
--		.name   = "linux",
--		.offset = 0x80000,
--		.size   = 0x140000 		/* 1280k */
--	},
--	{
--		.name   = "jffs",
--		.offset = 0x1c0000,
--		.size   = 0x620000 		/* 6272k */
--	},
--	{
--		.name   = "nvram",
--		.offset = 0x7e0000,
--		.size   = 0x20000		/* 128k */
--	},
--};
--
--static struct physmap_flash_data wgt634u_flash_data = {
--	.parts    = wgt634u_partitions,
--	.nr_parts = ARRAY_SIZE(wgt634u_partitions)
--};
--
--static struct resource wgt634u_flash_resource = {
--	.flags = IORESOURCE_MEM,
--};
--
--static struct platform_device wgt634u_flash = {
--	.name          = "physmap-flash",
--	.id            = 0,
--	.dev           = { .platform_data = &wgt634u_flash_data, },
--	.resource      = &wgt634u_flash_resource,
--	.num_resources = 1,
--};
--
--/* Platform devices */
--static struct platform_device *wgt634u_devices[] __initdata = {
--	&wgt634u_flash,
--	&wgt634u_gpio_leds,
--};
--
--static irqreturn_t gpio_interrupt(int irq, void *ignored)
--{
--	int state;
--
--	/* Interrupts are shared, check if the current one is
--	   a GPIO interrupt. */
--	if (!ssb_chipco_irq_status(&ssb_bcm47xx.chipco,
--				   SSB_CHIPCO_IRQ_GPIO))
--		return IRQ_NONE;
--
--	state = gpio_get_value(WGT634U_GPIO_RESET);
--
--	/* Interrupt are level triggered, revert the interrupt polarity
--	   to clear the interrupt. */
--	gpio_polarity(WGT634U_GPIO_RESET, state);
--
--	if (!state) {
--		printk(KERN_INFO "Reset button pressed");
--		ctrl_alt_del();
--	}
--
--	return IRQ_HANDLED;
--}
--
--static int __init wgt634u_init(void)
--{
--	/* There is no easy way to detect that we are running on a WGT634U
--	 * machine. Use the MAC address as an heuristic. Netgear Inc. has
--	 * been allocated ranges 00:09:5b:xx:xx:xx and 00:0f:b5:xx:xx:xx.
--	 */
--
--	u8 *et0mac = ssb_bcm47xx.sprom.et0mac;
--
--	if (et0mac[0] == 0x00 &&
--	    ((et0mac[1] == 0x09 && et0mac[2] == 0x5b) ||
--	     (et0mac[1] == 0x0f && et0mac[2] == 0xb5))) {
--		struct ssb_mipscore *mcore = &ssb_bcm47xx.mipscore;
--
--		printk(KERN_INFO "WGT634U machine detected.\n");
--
--		if (!request_irq(gpio_to_irq(WGT634U_GPIO_RESET),
--				 gpio_interrupt, IRQF_SHARED,
--				 "WGT634U GPIO", &ssb_bcm47xx.chipco)) {
--			gpio_direction_input(WGT634U_GPIO_RESET);
--			gpio_intmask(WGT634U_GPIO_RESET, 1);
--			ssb_chipco_irq_mask(&ssb_bcm47xx.chipco,
--					    SSB_CHIPCO_IRQ_GPIO,
--					    SSB_CHIPCO_IRQ_GPIO);
--		}
--
--		wgt634u_flash_data.width = mcore->flash_buswidth;
--		wgt634u_flash_resource.start = mcore->flash_window;
--		wgt634u_flash_resource.end = mcore->flash_window
--					   + mcore->flash_window_size
--					   - 1;
--		return platform_add_devices(wgt634u_devices,
--					    ARRAY_SIZE(wgt634u_devices));
--	} else
--		return -ENODEV;
--}
--
--module_init(wgt634u_init);
--
diff --git a/target/linux/brcm47xx/patches-2.6.33/813-use_netdev_alloc_skb.patch b/target/linux/brcm47xx/patches-2.6.33/813-use_netdev_alloc_skb.patch
deleted file mode 100644
index c431e4096..000000000
--- a/target/linux/brcm47xx/patches-2.6.33/813-use_netdev_alloc_skb.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/drivers/net/b44.c
-+++ b/drivers/net/b44.c
-@@ -815,7 +815,7 @@ static int b44_rx(struct b44 *bp, int bu
- 			struct sk_buff *copy_skb;
- 
- 			b44_recycle_rx(bp, cons, bp->rx_prod);
--			copy_skb = dev_alloc_skb(len + 2);
-+			copy_skb = netdev_alloc_skb(bp->dev, len + 2);
- 			if (copy_skb == NULL)
- 				goto drop_it_no_recycle;
- 
diff --git a/target/linux/brcm47xx/patches-2.6.33/900-disable_early_printk.patch b/target/linux/brcm47xx/patches-2.6.33/900-disable_early_printk.patch
deleted file mode 100644
index c5fb54bc8..000000000
--- a/target/linux/brcm47xx/patches-2.6.33/900-disable_early_printk.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -65,7 +65,6 @@ config BCM47XX
- 	select SSB_B43_PCI_BRIDGE if PCI
- 	select SSB_PCICORE_HOSTMODE if PCI
- 	select GENERIC_GPIO
--	select SYS_HAS_EARLY_PRINTK
- 	select CFE
- 	help
- 	 Support for BCM47XX based boards
diff --git a/target/linux/brcm47xx/patches-2.6.33/920-cache-wround.patch b/target/linux/brcm47xx/patches-2.6.33/920-cache-wround.patch
deleted file mode 100644
index 3edf04bf0..000000000
--- a/target/linux/brcm47xx/patches-2.6.33/920-cache-wround.patch
+++ /dev/null
@@ -1,135 +0,0 @@
---- a/arch/mips/include/asm/r4kcache.h
-+++ b/arch/mips/include/asm/r4kcache.h
-@@ -20,10 +20,25 @@
- #ifdef CONFIG_BCM47XX
- #include <asm/paccess.h>
- #include <linux/ssb/ssb.h>
--#define BCM4710_DUMMY_RREG() ((void) *((u8 *) KSEG1ADDR(SSB_ENUM_BASE + SSB_IMSTATE)))
-+#define BCM4710_DUMMY_RREG() bcm4710_dummy_rreg()
-+
-+static inline unsigned long bcm4710_dummy_rreg(void) {
-+      return (*(volatile unsigned long *)(KSEG1ADDR(SSB_ENUM_BASE + SSB_IMSTATE)));
-+}
-+
-+#define BCM4710_FILL_TLB(addr) bcm4710_fill_tlb((void*)(addr))
-+
-+static inline unsigned long bcm4710_fill_tlb(void *addr) {
-+      return (*(unsigned long *)addr);
-+}
-+
-+#define BCM4710_PROTECTED_FILL_TLB(addr) bcm4710_protected_fill_tlb((void*)(addr))
-+
-+static inline void bcm4710_protected_fill_tlb(void *addr) {
-+      unsigned long x;
-+      get_dbe(x, (unsigned long *)addr);;
-+}
- 
--#define BCM4710_FILL_TLB(addr) (*(volatile unsigned long *)(addr))
--#define BCM4710_PROTECTED_FILL_TLB(addr) ({ unsigned long x; get_dbe(x, (volatile unsigned long *)(addr)); })
- #else
- #define BCM4710_DUMMY_RREG()
- 
---- a/arch/mips/mm/tlbex.c
-+++ b/arch/mips/mm/tlbex.c
-@@ -611,6 +611,9 @@ build_get_pgde32(u32 **p, unsigned int t
- #endif
- 	uasm_i_addu(p, ptr, tmp, ptr);
- #else
-+#ifdef CONFIG_BCM47XX
-+	uasm_i_nop(p);
-+#endif
- 	UASM_i_LA_mostly(p, ptr, pgdc);
- #endif
- 	uasm_i_mfc0(p, tmp, C0_BADVADDR); /* get faulting address */
-@@ -749,12 +752,12 @@ static void __cpuinit build_r4000_tlb_re
- 		/* No need for uasm_i_nop */
- 	}
- 
--#ifdef CONFIG_BCM47XX
--	uasm_i_nop(&p);
--#endif
- #ifdef CONFIG_64BIT
- 	build_get_pmde64(&p, &l, &r, K0, K1); /* get pmd in K1 */
- #else
-+# ifdef CONFIG_BCM47XX
-+	uasm_i_nop(&p);
-+# endif
- 	build_get_pgde32(&p, K0, K1); /* get pgd in K1 */
- #endif
- 
-@@ -766,6 +769,9 @@ static void __cpuinit build_r4000_tlb_re
- 	build_update_entries(&p, K0, K1);
- 	build_tlb_write_entry(&p, &l, &r, tlb_random);
- 	uasm_l_leave(&l, p);
-+#ifdef CONFIG_BCM47XX
-+	uasm_i_nop(&p);
-+#endif
- 	uasm_i_eret(&p); /* return from trap */
- 
- #ifdef CONFIG_HUGETLB_PAGE
-@@ -1206,12 +1212,12 @@ build_r4000_tlbchange_handler_head(u32 *
- 				   struct uasm_reloc **r, unsigned int pte,
- 				   unsigned int ptr)
- {
--#ifdef CONFIG_BCM47XX
--	uasm_i_nop(p);
--#endif
- #ifdef CONFIG_64BIT
- 	build_get_pmde64(p, l, r, pte, ptr); /* get pmd in ptr */
- #else
-+# ifdef CONFIG_BCM47XX
-+	uasm_i_nop(p);
-+# endif
- 	build_get_pgde32(p, pte, ptr); /* get pgd in ptr */
- #endif
- 
-@@ -1248,6 +1254,9 @@ build_r4000_tlbchange_handler_tail(u32 *
- 	build_update_entries(p, tmp, ptr);
- 	build_tlb_write_entry(p, l, r, tlb_indexed);
- 	uasm_l_leave(l, *p);
-+#ifdef CONFIG_BCM47XX
-+	uasm_i_nop(p);
-+#endif
- 	uasm_i_eret(p); /* return from trap */
- 
- #ifdef CONFIG_64BIT
---- a/arch/mips/kernel/genex.S
-+++ b/arch/mips/kernel/genex.S
-@@ -22,6 +22,19 @@
- #include <asm/page.h>
- #include <asm/thread_info.h>
- 
-+#ifdef CONFIG_BCM47XX
-+# ifdef eret
-+#  undef eret
-+# endif
-+# define eret 					\
-+	.set push;				\
-+	.set noreorder;				\
-+	 nop; 					\
-+	 nop;					\
-+	 eret;					\
-+	.set pop;
-+#endif
-+
- #define PANIC_PIC(msg)					\
- 		.set push;				\
- 		.set	reorder;			\
-@@ -54,7 +67,6 @@ NESTED(except_vec3_generic, 0, sp)
- 	.set	noat
- #ifdef CONFIG_BCM47XX
- 	nop
--	nop
- #endif
- #if R5432_CP0_INTERRUPT_WAR
- 	mfc0	k0, CP0_INDEX
-@@ -79,6 +91,9 @@ NESTED(except_vec3_r4000, 0, sp)
- 	.set	push
- 	.set	mips3
- 	.set	noat
-+#ifdef CONFIG_BCM47XX
-+	nop
-+#endif
- 	mfc0	k1, CP0_CAUSE
- 	li	k0, 31<<2
- 	andi	k1, k1, 0x7c
diff --git a/target/linux/brcm47xx/patches-2.6.33/930-bcm47xx-pci-iomem.patch b/target/linux/brcm47xx/patches-2.6.33/930-bcm47xx-pci-iomem.patch
deleted file mode 100644
index 1ceccb5c6..000000000
--- a/target/linux/brcm47xx/patches-2.6.33/930-bcm47xx-pci-iomem.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Index: linux-2.6.33/drivers/ssb/driver_pcicore.c
-===================================================================
---- linux-2.6.33.orig/drivers/ssb/driver_pcicore.c	2010-03-15 14:52:55.000000000 +0100
-+++ linux-2.6.33/drivers/ssb/driver_pcicore.c	2010-03-15 15:57:38.000000000 +0100
-@@ -246,20 +246,12 @@
- 	.pci_ops	= &ssb_pcicore_pciops,
- 	.io_resource	= &ssb_pcicore_io_resource,
- 	.mem_resource	= &ssb_pcicore_mem_resource,
--	.mem_offset	= 0x24000000,
- };
- 
--static u32 ssb_pcicore_pcibus_iobase = 0x100;
--static u32 ssb_pcicore_pcibus_membase = SSB_PCI_DMA;
--
- /* This function is called when doing a pci_enable_device().
-  * We must first check if the device is a device on the PCI-core bridge. */
- int ssb_pcicore_plat_dev_init(struct pci_dev *d)
- {
--	struct resource *res;
--	int pos, size;
--	u32 *base;
--
- 	if (d->bus->ops != &ssb_pcicore_pciops) {
- 		/* This is not a device on the PCI-core bridge. */
- 		return -ENODEV;
-@@ -268,27 +260,6 @@
- 	ssb_printk(KERN_INFO "PCI: Fixing up device %s\n",
- 		   pci_name(d));
- 
--	/* Fix up resource bases */
--	for (pos = 0; pos < 6; pos++) {
--		res = &d->resource[pos];
--		if (res->flags & IORESOURCE_IO)
--			base = &ssb_pcicore_pcibus_iobase;
--		else
--			base = &ssb_pcicore_pcibus_membase;
--		res->flags |= IORESOURCE_PCI_FIXED;
--		if (res->end) {
--			size = res->end - res->start + 1;
--			if (*base & (size - 1))
--				*base = (*base + size) & ~(size - 1);
--			res->start = *base;
--			res->end = res->start + size - 1;
--			*base += size;
--			pci_write_config_dword(d, PCI_BASE_ADDRESS_0 + (pos << 2), res->start);
--		}
--		/* Fix up PCI bridge BAR0 only */
--		if (d->bus->number == 0 && PCI_SLOT(d->devfn) == 0)
--			break;
--	}
- 	/* Fix up interrupt lines */
- 	d->irq = ssb_mips_irq(extpci_core->dev) + 2;
- 	pci_write_config_byte(d, PCI_INTERRUPT_LINE, d->irq);
diff --git a/target/linux/brcm47xx/patches-2.6.33/940-bcm47xx-yenta.patch b/target/linux/brcm47xx/patches-2.6.33/940-bcm47xx-yenta.patch
deleted file mode 100644
index aaff52339..000000000
--- a/target/linux/brcm47xx/patches-2.6.33/940-bcm47xx-yenta.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: linux-2.6.32.9/drivers/pcmcia/yenta_socket.c
-===================================================================
---- linux-2.6.32.9.orig/drivers/pcmcia/yenta_socket.c	2010-03-12 09:43:45.000000000 +0100
-+++ linux-2.6.32.9/drivers/pcmcia/yenta_socket.c	2010-03-12 10:05:33.000000000 +0100
-@@ -866,6 +866,8 @@
- 	 * Probe for usable interrupts using the force
- 	 * register to generate bogus card status events.
- 	 */
-+#ifndef CONFIG_BCM47XX
-+	/* WRT54G3G does not like this */
- 	cb_writel(socket, CB_SOCKET_EVENT, -1);
- 	cb_writel(socket, CB_SOCKET_MASK, CB_CSTSMASK);
- 	exca_writeb(socket, I365_CSCINT, 0);
-@@ -880,6 +882,7 @@
- 	}
- 	cb_writel(socket, CB_SOCKET_MASK, 0);
- 	exca_writeb(socket, I365_CSCINT, 0);
-+#endif
- 
- 	mask = probe_irq_mask(val) & 0xffff;
- 
-@@ -960,6 +963,10 @@
- 	else
- 		socket->socket.irq_mask = 0;
- 
-+	/* irq mask probing is broken for the WRT54G3G */
-+	if (socket->socket.irq_mask == 0)
-+		socket->socket.irq_mask = 0x6f8;
-+
- 	dev_printk(KERN_INFO, &socket->dev->dev,
- 		   "ISA IRQ mask 0x%04x, PCI irq %d\n",
- 		   socket->socket.irq_mask, socket->cb_irq);
-@@ -1198,6 +1205,15 @@
- 	dev_printk(KERN_INFO, &dev->dev,
- 		   "Socket status: %08x\n", cb_readl(socket, CB_SOCKET_STATE));
- 
-+	/* Generate an interrupt on card insert/remove */
-+	config_writew(socket, CB_SOCKET_MASK, CB_CSTSMASK | CB_CDMASK);
-+
-+	/* Set up Multifunction Routing Status Register */
-+	config_writew(socket, 0x8C, 0x1000 /* MFUNC3 to GPIO3 */ | 0x2 /* MFUNC0 to INTA */);
-+
-+	/* Switch interrupts to parallelized */
-+	config_writeb(socket, 0x92, 0x64);
-+
- 	yenta_fixup_parent_bridge(dev->subordinate);
- 
- 	/* Register it with the pcmcia layer.. */
diff --git a/target/linux/brcm63xx/config-2.6.33 b/target/linux/brcm63xx/config-2.6.33
deleted file mode 100644
index c9dd63814..000000000
--- a/target/linux/brcm63xx/config-2.6.33
+++ /dev/null
@@ -1,257 +0,0 @@
-CONFIG_32BIT=y
-# CONFIG_64BIT is not set
-# CONFIG_ALCHEMY_GPIO_INDIRECT is not set
-# CONFIG_AR7 is not set
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-CONFIG_ARCH_REQUIRE_GPIOLIB=y
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_ARCH_SUPPORTS_OPROFILE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-# CONFIG_ATH_COMMON is not set
-CONFIG_AUDIT=y
-CONFIG_AUDIT_GENERIC=y
-# CONFIG_BATMAN_ADV is not set
-# CONFIG_BCM47XX is not set
-CONFIG_BCM63XX=y
-CONFIG_BCM63XX_CPU_6338=y
-CONFIG_BCM63XX_CPU_6345=y
-CONFIG_BCM63XX_CPU_6348=y
-CONFIG_BCM63XX_CPU_6358=y
-CONFIG_BCM63XX_ENET=y
-CONFIG_BCM63XX_PHY=y
-CONFIG_BCM63XX_WDT=y
-CONFIG_BITREVERSE=y
-CONFIG_BOARD_BCM963XX=y
-# CONFIG_BOARD_LIVEBOX is not set
-CONFIG_BSD_PROCESS_ACCT_V3=y
-# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
-# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CEVT_R4K=y
-CONFIG_CEVT_R4K_LIB=y
-CONFIG_CFG80211=m
-# CONFIG_CFG80211_DEBUGFS is not set
-CONFIG_CFG80211_DEFAULT_PS=y
-# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-# CONFIG_CFG80211_REG_DEBUG is not set
-CONFIG_CFG80211_WEXT=y
-CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"
-CONFIG_CMDLINE_BOOL=y
-# CONFIG_CMDLINE_OVERRIDE is not set
-CONFIG_CPU_BIG_ENDIAN=y
-# CONFIG_CPU_CAVIUM_OCTEON is not set
-CONFIG_CPU_HAS_PREFETCH=y
-CONFIG_CPU_HAS_SYNC=y
-# CONFIG_CPU_LITTLE_ENDIAN is not set
-# CONFIG_CPU_LOONGSON2E is not set
-# CONFIG_CPU_LOONGSON2F is not set
-CONFIG_CPU_MIPS32=y
-CONFIG_CPU_MIPS32_R1=y
-# CONFIG_CPU_MIPS32_R2 is not set
-# CONFIG_CPU_MIPS64_R1 is not set
-# CONFIG_CPU_MIPS64_R2 is not set
-CONFIG_CPU_MIPSR1=y
-# CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R10000 is not set
-# CONFIG_CPU_R3000 is not set
-# CONFIG_CPU_R4300 is not set
-# CONFIG_CPU_R4X00 is not set
-# CONFIG_CPU_R5000 is not set
-# CONFIG_CPU_R5432 is not set
-# CONFIG_CPU_R5500 is not set
-# CONFIG_CPU_R6000 is not set
-# CONFIG_CPU_R8000 is not set
-# CONFIG_CPU_RM7000 is not set
-# CONFIG_CPU_RM9000 is not set
-# CONFIG_CPU_SB1 is not set
-CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_HIGHMEM=y
-# CONFIG_CPU_TX39XX is not set
-# CONFIG_CPU_TX49XX is not set
-# CONFIG_CPU_VR41XX is not set
-CONFIG_CRAMFS=y
-CONFIG_CSRC_R4K=y
-CONFIG_CSRC_R4K_LIB=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DEFAULT_SECURITY=""
-CONFIG_DEFAULT_SECURITY_DAC=y
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_SMACK is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
-CONFIG_DEVPORT=y
-# CONFIG_DM9000 is not set
-CONFIG_DMA_NEED_PCI_MAP_STATE=y
-CONFIG_DMA_NONCOHERENT=y
-CONFIG_EARLY_PRINTK=y
-CONFIG_ELF_CORE=y
-CONFIG_FIRMWARE_IN_KERNEL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-CONFIG_GPIOLIB=y
-# CONFIG_GPIO_CS5535 is not set
-CONFIG_GPIO_DEVICE=y
-CONFIG_GPIO_SYSFS=y
-# CONFIG_HAMRADIO is not set
-CONFIG_HARDWARE_WATCHPOINTS=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAVE_ARCH_KGDB=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_HAVE_IDE=y
-CONFIG_HAVE_OPROFILE=y
-CONFIG_HW_HAS_PCI=y
-CONFIG_HW_RANDOM=y
-CONFIG_HZ=250
-# CONFIG_HZ_100 is not set
-CONFIG_HZ_250=y
-CONFIG_IMAGE_CMDLINE_HACK=y
-CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_INLINE_READ_LOCK is not set
-# CONFIG_INLINE_READ_LOCK_BH is not set
-# CONFIG_INLINE_READ_LOCK_IRQ is not set
-# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_READ_TRYLOCK is not set
-CONFIG_INLINE_READ_UNLOCK=y
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_SPIN_LOCK is not set
-# CONFIG_INLINE_SPIN_LOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_SPIN_TRYLOCK is not set
-# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
-CONFIG_INLINE_SPIN_UNLOCK=y
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_WRITE_LOCK is not set
-# CONFIG_INLINE_WRITE_LOCK_BH is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_WRITE_TRYLOCK is not set
-CONFIG_INLINE_WRITE_UNLOCK=y
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-CONFIG_INOTIFY=y
-CONFIG_INOTIFY_USER=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-CONFIG_IRQ_CPU=y
-CONFIG_KEXEC=y
-CONFIG_LEDS_GPIO=y
-# CONFIG_LEDS_LT3593 is not set
-# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
-CONFIG_LOONGSON_UART_BASE=y
-# CONFIG_MACH_ALCHEMY is not set
-# CONFIG_MACH_DECSTATION is not set
-# CONFIG_MACH_JAZZ is not set
-# CONFIG_MACH_LOONGSON is not set
-# CONFIG_MACH_TX39XX is not set
-# CONFIG_MACH_TX49XX is not set
-# CONFIG_MACH_VR41XX is not set
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_MIKROTIK_RB532 is not set
-CONFIG_MIPS=y
-# CONFIG_MIPS_COBALT is not set
-CONFIG_MIPS_L1_CACHE_SHIFT=5
-# CONFIG_MIPS_MACHINE is not set
-# CONFIG_MIPS_MALTA is not set
-CONFIG_MIPS_MT_DISABLED=y
-# CONFIG_MIPS_MT_SMP is not set
-# CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_SIM is not set
-CONFIG_MODULE_FORCE_LOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MTD_BCM963XX=y
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-CONFIG_MTD_CFI_BE_BYTE_SWAP=y
-# CONFIG_MTD_CFI_GEOMETRY is not set
-# CONFIG_MTD_CFI_NOSWAP is not set
-CONFIG_MTD_CFI_STAA=y
-CONFIG_MTD_CMDLINE_PARTS=y
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-CONFIG_MTD_CONCAT=y
-CONFIG_MTD_JEDECPROBE=y
-CONFIG_MTD_REDBOOT_PARTS=y
-CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
-# CONFIG_MUTEX_SPIN_ON_OWNER is not set
-# CONFIG_NL80211_TESTMODE is not set
-# CONFIG_NO_IOPORT is not set
-# CONFIG_NXP_STB220 is not set
-# CONFIG_NXP_STB225 is not set
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PHYLIB=y
-# CONFIG_PMC_MSP is not set
-# CONFIG_PMC_YOSEMITE is not set
-# CONFIG_PNX8550_JBS is not set
-# CONFIG_PNX8550_STB810 is not set
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-# CONFIG_POWERTV is not set
-# CONFIG_R8187SE is not set
-# CONFIG_RAMZSWAP is not set
-CONFIG_RELAY=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-# CONFIG_SCSI_DMA is not set
-# CONFIG_SERIAL_8250 is not set
-CONFIG_SERIAL_BCM63XX=y
-CONFIG_SERIAL_BCM63XX_CONSOLE=y
-# CONFIG_SGI_IP22 is not set
-# CONFIG_SGI_IP27 is not set
-# CONFIG_SGI_IP28 is not set
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_SWARM is not set
-CONFIG_SQUASHFS_EMBEDDED=y
-CONFIG_SSB=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-# CONFIG_SSB_DRIVER_MIPS is not set
-CONFIG_SSB_DRIVER_PCICORE=y
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_SPROM=y
-CONFIG_SWAP_IO_SPACE=y
-CONFIG_SYS_HAS_CPU_MIPS32_R1=y
-CONFIG_SYS_HAS_EARLY_PRINTK=y
-CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
-# CONFIG_TC35815 is not set
-# CONFIG_TINY_RCU is not set
-CONFIG_TRAD_SIGNALS=y
-# CONFIG_TREE_PREEMPT_RCU is not set
-CONFIG_TREE_RCU=y
-CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y
-CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
-CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
-CONFIG_USB_SUPPORT=y
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_WATCHDOG_NOWAYOUT=y
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/brcm63xx/patches-2.6.33/007-usb-ohci-support.patch b/target/linux/brcm63xx/patches-2.6.33/007-usb-ohci-support.patch
deleted file mode 100644
index 526d3e778..000000000
--- a/target/linux/brcm63xx/patches-2.6.33/007-usb-ohci-support.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-The bcm63xx SOC has an integrated OHCI controller, this patch adds
-platform device registration and change board code to register ohci
-device when necessary.
-
-Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
----
- arch/mips/bcm63xx/Kconfig                          |    6 ++
- arch/mips/bcm63xx/Makefile                         |    3 +-
- arch/mips/bcm63xx/boards/board_bcm963xx.c          |    4 ++
- arch/mips/bcm63xx/dev-usb-ohci.c                   |   49 ++++++++++++++++++++
- .../asm/mach-bcm63xx/bcm63xx_dev_usb_ohci.h        |    6 ++
- 5 files changed, 67 insertions(+), 1 deletions(-)
- create mode 100644 arch/mips/bcm63xx/dev-usb-ohci.c
- create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_ohci.h
-
---- a/arch/mips/bcm63xx/Kconfig
-+++ b/arch/mips/bcm63xx/Kconfig
-@@ -16,10 +16,16 @@ config BCM63XX_CPU_6345
- config BCM63XX_CPU_6348
- 	bool "support 6348 CPU"
- 	select HW_HAS_PCI
-+	select USB_ARCH_HAS_OHCI
-+	select USB_OHCI_BIG_ENDIAN_DESC
-+	select USB_OHCI_BIG_ENDIAN_MMIO
- 
- config BCM63XX_CPU_6358
- 	bool "support 6358 CPU"
- 	select HW_HAS_PCI
-+	select USB_ARCH_HAS_OHCI
-+	select USB_OHCI_BIG_ENDIAN_DESC
-+	select USB_OHCI_BIG_ENDIAN_MMIO
- endmenu
- 
- source "arch/mips/bcm63xx/boards/Kconfig"
---- a/arch/mips/bcm63xx/Makefile
-+++ b/arch/mips/bcm63xx/Makefile
-@@ -1,5 +1,6 @@
- obj-y		+= clk.o cpu.o cs.o gpio.o irq.o prom.o setup.o timer.o \
--		   dev-dsp.o dev-enet.o dev-pcmcia.o dev-uart.o dev-wdt.o
-+		   dev-dsp.o dev-enet.o dev-pcmcia.o dev-uart.o dev-wdt.o \
-+		   dev-usb-ohci.o
- obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
- 
- obj-y		+= boards/
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -24,6 +24,7 @@
- #include <bcm63xx_dev_enet.h>
- #include <bcm63xx_dev_dsp.h>
- #include <bcm63xx_dev_pcmcia.h>
-+#include <bcm63xx_dev_usb_ohci.h>
- #include <board_bcm963xx.h>
- 
- #define PFX	"board_bcm963xx: "
-@@ -803,6 +804,9 @@ int __init board_register_devices(void)
- 	    !board_get_mac_address(board.enet1.mac_addr))
- 		bcm63xx_enet_register(1, &board.enet1);
- 
-+	if (board.has_ohci0)
-+		bcm63xx_ohci_register();
-+
- 	if (board.has_dsp)
- 		bcm63xx_dsp_register(&board.dsp);
- 
---- /dev/null
-+++ b/arch/mips/bcm63xx/dev-usb-ohci.c
-@@ -0,0 +1,49 @@
-+/*
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License.  See the file "COPYING" in the main directory of this archive
-+ * for more details.
-+ *
-+ * Copyright (C) 2010 Maxime Bizon <mbizon@freebox.fr>
-+ */
-+
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/platform_device.h>
-+#include <bcm63xx_cpu.h>
-+#include <bcm63xx_dev_usb_ohci.h>
-+
-+static struct resource ohci_resources[] = {
-+	{
-+		/* start & end filled at runtime */
-+		.flags		= IORESOURCE_MEM,
-+	},
-+	{
-+		/* start filled at runtime */
-+		.flags		= IORESOURCE_IRQ,
-+	},
-+};
-+
-+static u64 ohci_dmamask = ~(u32)0;
-+
-+static struct platform_device bcm63xx_ohci_device = {
-+	.name		= "bcm63xx_ohci",
-+	.id		= 0,
-+	.num_resources	= ARRAY_SIZE(ohci_resources),
-+	.resource	= ohci_resources,
-+	.dev		= {
-+		.dma_mask		= &ohci_dmamask,
-+		.coherent_dma_mask	= 0xffffffff,
-+	},
-+};
-+
-+int __init bcm63xx_ohci_register(void)
-+{
-+	if (!BCMCPU_IS_6348() && !BCMCPU_IS_6358())
-+		return 0;
-+
-+	ohci_resources[0].start = bcm63xx_regset_address(RSET_OHCI0);
-+	ohci_resources[0].end = ohci_resources[0].start;
-+	ohci_resources[0].end += RSET_OHCI_SIZE - 1;
-+	ohci_resources[1].start = bcm63xx_get_irq_number(IRQ_OHCI0);
-+	return platform_device_register(&bcm63xx_ohci_device);
-+}
---- /dev/null
-+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_ohci.h
-@@ -0,0 +1,6 @@
-+#ifndef BCM63XX_DEV_USB_OHCI_H_
-+#define BCM63XX_DEV_USB_OHCI_H_
-+
-+int bcm63xx_ohci_register(void);
-+
-+#endif /* BCM63XX_DEV_USB_OHCI_H_ */
diff --git a/target/linux/brcm63xx/patches-2.6.33/008-usb-ehci-support.patch b/target/linux/brcm63xx/patches-2.6.33/008-usb-ehci-support.patch
deleted file mode 100644
index e5a682d6c..000000000
--- a/target/linux/brcm63xx/patches-2.6.33/008-usb-ehci-support.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-The bcm63xx SOC has an integrated EHCI controller, this patch adds
-platform device registration and change board code to register
-EHCI device when necessary.
-
-Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
----
- arch/mips/bcm63xx/Kconfig                          |    2 +
- arch/mips/bcm63xx/Makefile                         |    2 +-
- arch/mips/bcm63xx/boards/board_bcm963xx.c          |    4 ++
- arch/mips/bcm63xx/dev-usb-ehci.c                   |   49 ++++++++++++++++++++
- .../asm/mach-bcm63xx/bcm63xx_dev_usb_ehci.h        |    6 ++
- 5 files changed, 62 insertions(+), 1 deletions(-)
- create mode 100644 arch/mips/bcm63xx/dev-usb-ehci.c
- create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_ehci.h
-
---- a/arch/mips/bcm63xx/Kconfig
-+++ b/arch/mips/bcm63xx/Kconfig
-@@ -26,6 +26,8 @@ config BCM63XX_CPU_6358
- 	select USB_ARCH_HAS_OHCI
- 	select USB_OHCI_BIG_ENDIAN_DESC
- 	select USB_OHCI_BIG_ENDIAN_MMIO
-+	select USB_ARCH_HAS_EHCI
-+	select USB_EHCI_BIG_ENDIAN_MMIO
- endmenu
- 
- source "arch/mips/bcm63xx/boards/Kconfig"
---- a/arch/mips/bcm63xx/Makefile
-+++ b/arch/mips/bcm63xx/Makefile
-@@ -1,6 +1,6 @@
- obj-y		+= clk.o cpu.o cs.o gpio.o irq.o prom.o setup.o timer.o \
- 		   dev-dsp.o dev-enet.o dev-pcmcia.o dev-uart.o dev-wdt.o \
--		   dev-usb-ohci.o
-+		   dev-usb-ohci.o dev-usb-ehci.o
- obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
- 
- obj-y		+= boards/
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -25,6 +25,7 @@
- #include <bcm63xx_dev_dsp.h>
- #include <bcm63xx_dev_pcmcia.h>
- #include <bcm63xx_dev_usb_ohci.h>
-+#include <bcm63xx_dev_usb_ehci.h>
- #include <board_bcm963xx.h>
- 
- #define PFX	"board_bcm963xx: "
-@@ -804,6 +805,9 @@ int __init board_register_devices(void)
- 	    !board_get_mac_address(board.enet1.mac_addr))
- 		bcm63xx_enet_register(1, &board.enet1);
- 
-+	if (board.has_ehci0)
-+		bcm63xx_ehci_register();
-+
- 	if (board.has_ohci0)
- 		bcm63xx_ohci_register();
- 
---- /dev/null
-+++ b/arch/mips/bcm63xx/dev-usb-ehci.c
-@@ -0,0 +1,49 @@
-+/*
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License.  See the file "COPYING" in the main directory of this archive
-+ * for more details.
-+ *
-+ * Copyright (C) 2010 Maxime Bizon <mbizon@freebox.fr>
-+ */
-+
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/platform_device.h>
-+#include <bcm63xx_cpu.h>
-+#include <bcm63xx_dev_usb_ehci.h>
-+
-+static struct resource ehci_resources[] = {
-+	{
-+		/* start & end filled at runtime */
-+		.flags		= IORESOURCE_MEM,
-+	},
-+	{
-+		/* start filled at runtime */
-+		.flags		= IORESOURCE_IRQ,
-+	},
-+};
-+
-+static u64 ehci_dmamask = ~(u32)0;
-+
-+static struct platform_device bcm63xx_ehci_device = {
-+	.name		= "bcm63xx_ehci",
-+	.id		= 0,
-+	.num_resources	= ARRAY_SIZE(ehci_resources),
-+	.resource	= ehci_resources,
-+	.dev		= {
-+		.dma_mask		= &ehci_dmamask,
-+		.coherent_dma_mask	= 0xffffffff,
-+	},
-+};
-+
-+int __init bcm63xx_ehci_register(void)
-+{
-+	if (!BCMCPU_IS_6358())
-+		return 0;
-+
-+	ehci_resources[0].start = bcm63xx_regset_address(RSET_EHCI0);
-+	ehci_resources[0].end = ehci_resources[0].start;
-+	ehci_resources[0].end += RSET_EHCI_SIZE - 1;
-+	ehci_resources[1].start = bcm63xx_get_irq_number(IRQ_EHCI0);
-+	return platform_device_register(&bcm63xx_ehci_device);
-+}
---- /dev/null
-+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_ehci.h
-@@ -0,0 +1,6 @@
-+#ifndef BCM63XX_DEV_USB_EHCI_H_
-+#define BCM63XX_DEV_USB_EHCI_H_
-+
-+int bcm63xx_ehci_register(void);
-+
-+#endif /* BCM63XX_DEV_USB_EHCI_H_ */
diff --git a/target/linux/brcm63xx/patches-2.6.33/009-fix-double-gpio-registration.patch b/target/linux/brcm63xx/patches-2.6.33/009-fix-double-gpio-registration.patch
deleted file mode 100644
index 56b44ee1d..000000000
--- a/target/linux/brcm63xx/patches-2.6.33/009-fix-double-gpio-registration.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-bcm63xx_gpio_init is already called from prom_init to allow board to
-use them early, so we can remove the unneeded arch_initcall.
-
-Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
----
- arch/mips/bcm63xx/gpio.c |    2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
---- a/arch/mips/bcm63xx/gpio.c
-+++ b/arch/mips/bcm63xx/gpio.c
-@@ -130,5 +130,3 @@ int __init bcm63xx_gpio_init(void)
- 
- 	return gpiochip_add(&bcm63xx_gpio_chip);
- }
--
--arch_initcall(bcm63xx_gpio_init);
diff --git a/target/linux/brcm63xx/patches-2.6.33/010-add_bcm63xx_ohci_controller.patch b/target/linux/brcm63xx/patches-2.6.33/010-add_bcm63xx_ohci_controller.patch
deleted file mode 100644
index 49e6ea140..000000000
--- a/target/linux/brcm63xx/patches-2.6.33/010-add_bcm63xx_ohci_controller.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
----
- drivers/usb/host/ohci-bcm63xx.c |  166 +++++++++++++++++++++++++++++++++++++++
- drivers/usb/host/ohci-hcd.c     |    5 +
- drivers/usb/host/ohci.h         |    2 +-
- 3 files changed, 172 insertions(+), 1 deletions(-)
- create mode 100644 drivers/usb/host/ohci-bcm63xx.c
-
---- /dev/null
-+++ b/drivers/usb/host/ohci-bcm63xx.c
-@@ -0,0 +1,166 @@
-+/*
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License.  See the file "COPYING" in the main directory of this archive
-+ * for more details.
-+ *
-+ * Copyright (C) 2010 Maxime Bizon <mbizon@freebox.fr>
-+ */
-+
-+#include <linux/init.h>
-+#include <linux/clk.h>
-+#include <linux/platform_device.h>
-+#include <bcm63xx_cpu.h>
-+#include <bcm63xx_regs.h>
-+#include <bcm63xx_io.h>
-+
-+static struct clk *usb_host_clock;
-+
-+static int __devinit ohci_bcm63xx_start(struct usb_hcd *hcd)
-+{
-+	struct ohci_hcd *ohci = hcd_to_ohci(hcd);
-+	int ret;
-+
-+        /*
-+         * port 2 can be shared with USB slave, but all boards seem to
-+         * have only one host port populated, so we can hardcode it
-+         */
-+	ohci->num_ports = 1;
-+
-+	ret = ohci_init(ohci);
-+	if (ret < 0)
-+		return ret;
-+
-+	ret = ohci_run(ohci);
-+	if (ret < 0) {
-+		err("can't start %s", hcd->self.bus_name);
-+		ohci_stop(hcd);
-+		return ret;
-+	}
-+	return 0;
-+}
-+
-+static const struct hc_driver ohci_bcm63xx_hc_driver = {
-+	.description =		hcd_name,
-+	.product_desc =		"BCM63XX integrated OHCI controller",
-+	.hcd_priv_size =	sizeof(struct ohci_hcd),
-+
-+	.irq =			ohci_irq,
-+	.flags =		HCD_USB11 | HCD_MEMORY,
-+	.start =		ohci_bcm63xx_start,
-+	.stop =			ohci_stop,
-+	.shutdown =		ohci_shutdown,
-+	.urb_enqueue =		ohci_urb_enqueue,
-+	.urb_dequeue =		ohci_urb_dequeue,
-+	.endpoint_disable =	ohci_endpoint_disable,
-+	.get_frame_number =	ohci_get_frame,
-+	.hub_status_data =	ohci_hub_status_data,
-+	.hub_control =		ohci_hub_control,
-+	.start_port_reset =	ohci_start_port_reset,
-+};
-+
-+static int __devinit ohci_hcd_bcm63xx_drv_probe(struct platform_device *pdev)
-+{
-+	struct resource *res_mem;
-+	struct usb_hcd *hcd;
-+	struct ohci_hcd *ohci;
-+	u32 reg;
-+	int ret, irq;
-+
-+	res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	irq = platform_get_irq(pdev, 0);
-+	if (!res_mem || irq < 0)
-+		return -ENODEV;
-+
-+	if (BCMCPU_IS_6348()) {
-+		struct clk *clk;
-+		/* enable USB host clock */
-+		clk = clk_get(&pdev->dev, "usbh");
-+		if (IS_ERR(clk))
-+			return -ENODEV;
-+
-+		clk_enable(clk);
-+		usb_host_clock = clk;
-+		bcm_rset_writel(RSET_OHCI_PRIV, 0, OHCI_PRIV_REG);
-+
-+	} else if (BCMCPU_IS_6358()) {
-+		reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SWAP_REG);
-+		reg &= ~USBH_PRIV_SWAP_OHCI_ENDN_MASK;
-+		reg |= USBH_PRIV_SWAP_OHCI_DATA_MASK;
-+		bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_SWAP_REG);
-+		/*
-+		 * The magic value comes for the original vendor BSP
-+		 * and is needed for USB to work. Datasheet does not
-+		 * help, so the magic value is used as-is.
-+		 */
-+		bcm_rset_writel(RSET_USBH_PRIV, 0x1c0020, USBH_PRIV_TEST_REG);
-+	} else
-+		return 0;
-+
-+	hcd = usb_create_hcd(&ohci_bcm63xx_hc_driver, &pdev->dev, "bcm63xx");
-+	if (!hcd)
-+		return -ENOMEM;
-+	hcd->rsrc_start = res_mem->start;
-+	hcd->rsrc_len = res_mem->end - res_mem->start + 1;
-+
-+	if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
-+		pr_debug("request_mem_region failed\n");
-+		ret = -EBUSY;
-+		goto out;
-+	}
-+
-+	hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
-+	if (!hcd->regs) {
-+		pr_debug("ioremap failed\n");
-+		ret = -EIO;
-+		goto out1;
-+	}
-+
-+	ohci = hcd_to_ohci(hcd);
-+	ohci->flags |= OHCI_QUIRK_BE_MMIO | OHCI_QUIRK_BE_DESC |
-+		OHCI_QUIRK_FRAME_NO;
-+	ohci_hcd_init(ohci);
-+
-+	ret = usb_add_hcd(hcd, irq, IRQF_DISABLED);
-+	if (ret)
-+		goto out2;
-+
-+	platform_set_drvdata(pdev, hcd);
-+	return 0;
-+
-+out2:
-+	iounmap(hcd->regs);
-+out1:
-+	release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
-+out:
-+	usb_put_hcd(hcd);
-+	return ret;
-+}
-+
-+static int __devexit ohci_hcd_bcm63xx_drv_remove(struct platform_device *pdev)
-+{
-+	struct usb_hcd *hcd;
-+
-+	hcd = platform_get_drvdata(pdev);
-+	usb_remove_hcd(hcd);
-+	iounmap(hcd->regs);
-+	usb_put_hcd(hcd);
-+	release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
-+	if (usb_host_clock) {
-+		clk_disable(usb_host_clock);
-+		clk_put(usb_host_clock);
-+	}
-+	platform_set_drvdata(pdev, NULL);
-+	return 0;
-+}
-+
-+static struct platform_driver ohci_hcd_bcm63xx_driver = {
-+	.probe		= ohci_hcd_bcm63xx_drv_probe,
-+	.remove		= __devexit_p(ohci_hcd_bcm63xx_drv_remove),
-+	.shutdown	= usb_hcd_platform_shutdown,
-+	.driver		= {
-+		.name	= "bcm63xx_ohci",
-+		.owner	= THIS_MODULE,
-+	},
-+};
-+
-+MODULE_ALIAS("platform:bcm63xx_ohci");
---- a/drivers/usb/host/ohci-hcd.c
-+++ b/drivers/usb/host/ohci-hcd.c
-@@ -1051,6 +1051,11 @@ MODULE_LICENSE ("GPL");
- #define PLATFORM_DRIVER		usb_hcd_pnx4008_driver
- #endif
- 
-+#ifdef CONFIG_BCM63XX
-+#include "ohci-bcm63xx.c"
-+#define PLATFORM_DRIVER		ohci_hcd_bcm63xx_driver
-+#endif
-+
- #if defined(CONFIG_CPU_SUBTYPE_SH7720) || \
-     defined(CONFIG_CPU_SUBTYPE_SH7721) || \
-     defined(CONFIG_CPU_SUBTYPE_SH7763) || \
---- a/drivers/usb/host/ohci.h
-+++ b/drivers/usb/host/ohci.h
-@@ -655,7 +655,7 @@ static inline u32 hc32_to_cpup (const st
-  * some big-endian SOC implementations.  Same thing happens with PSW access.
-  */
- 
--#ifdef CONFIG_PPC_MPC52xx
-+#if defined(CONFIG_PPC_MPC52xx) || defined(CONFIG_BCM63XX)
- #define big_endian_frame_no_quirk(ohci)	(ohci->flags & OHCI_QUIRK_FRAME_NO)
- #else
- #define big_endian_frame_no_quirk(ohci)	0
diff --git a/target/linux/brcm63xx/patches-2.6.33/011-add_bcm63xx_ehci_controller.patch b/target/linux/brcm63xx/patches-2.6.33/011-add_bcm63xx_ehci_controller.patch
deleted file mode 100644
index 16ca692a2..000000000
--- a/target/linux/brcm63xx/patches-2.6.33/011-add_bcm63xx_ehci_controller.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
----
- drivers/usb/host/ehci-bcm63xx.c |  154 +++++++++++++++++++++++++++++++++++++++
- drivers/usb/host/ehci-hcd.c     |    5 +
- 2 files changed, 159 insertions(+), 0 deletions(-)
- create mode 100644 drivers/usb/host/ehci-bcm63xx.c
-
---- /dev/null
-+++ b/drivers/usb/host/ehci-bcm63xx.c
-@@ -0,0 +1,154 @@
-+/*
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License.  See the file "COPYING" in the main directory of this archive
-+ * for more details.
-+ *
-+ * Copyright (C) 2008 Maxime Bizon <mbizon@freebox.fr>
-+ */
-+
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+#include <bcm63xx_cpu.h>
-+#include <bcm63xx_regs.h>
-+#include <bcm63xx_io.h>
-+
-+static int ehci_bcm63xx_setup(struct usb_hcd *hcd)
-+{
-+	struct ehci_hcd *ehci = hcd_to_ehci(hcd);
-+	int retval;
-+
-+	retval = ehci_halt(ehci);
-+	if (retval)
-+		return retval;
-+
-+	retval = ehci_init(hcd);
-+	if (retval)
-+		return retval;
-+
-+	ehci_reset(ehci);
-+	ehci_port_power(ehci, 0);
-+
-+	return retval;
-+}
-+
-+
-+static const struct hc_driver ehci_bcm63xx_hc_driver = {
-+	.description =		hcd_name,
-+	.product_desc =		"BCM63XX integrated EHCI controller",
-+	.hcd_priv_size =	sizeof(struct ehci_hcd),
-+
-+	.irq =			ehci_irq,
-+	.flags =		HCD_MEMORY | HCD_USB2,
-+
-+	.reset =		ehci_bcm63xx_setup,
-+	.start =		ehci_run,
-+	.stop =			ehci_stop,
-+	.shutdown =		ehci_shutdown,
-+
-+	.urb_enqueue =		ehci_urb_enqueue,
-+	.urb_dequeue =		ehci_urb_dequeue,
-+	.endpoint_disable =	ehci_endpoint_disable,
-+
-+	.get_frame_number =	ehci_get_frame,
-+
-+	.hub_status_data =	ehci_hub_status_data,
-+	.hub_control =		ehci_hub_control,
-+	.bus_suspend =		ehci_bus_suspend,
-+	.bus_resume =		ehci_bus_resume,
-+	.relinquish_port =	ehci_relinquish_port,
-+	.port_handed_over =	ehci_port_handed_over,
-+};
-+
-+static int __devinit ehci_hcd_bcm63xx_drv_probe(struct platform_device *pdev)
-+{
-+	struct resource *res_mem;
-+	struct usb_hcd *hcd;
-+	struct ehci_hcd *ehci;
-+	u32 reg;
-+	int ret, irq;
-+
-+	res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	irq = platform_get_irq(pdev, 0);;
-+	if (!res_mem || irq < 0)
-+		return -ENODEV;
-+
-+	reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SWAP_REG);
-+	reg &= ~USBH_PRIV_SWAP_EHCI_DATA_MASK;
-+	reg |= USBH_PRIV_SWAP_EHCI_ENDN_MASK;
-+	bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_SWAP_REG);
-+
-+	/*
-+	 * The magic value comes for the original vendor BSP and is
-+	 * needed for USB to work. Datasheet does not help, so the
-+	 * magic value is used as-is.
-+	 */
-+	bcm_rset_writel(RSET_USBH_PRIV, 0x1c0020, USBH_PRIV_TEST_REG);
-+
-+	hcd = usb_create_hcd(&ehci_bcm63xx_hc_driver, &pdev->dev, "bcm63xx");
-+	if (!hcd)
-+		return -ENOMEM;
-+	hcd->rsrc_start = res_mem->start;
-+	hcd->rsrc_len = res_mem->end - res_mem->start + 1;
-+
-+	if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
-+		pr_debug("request_mem_region failed\n");
-+		ret = -EBUSY;
-+		goto out;
-+	}
-+
-+	hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
-+	if (!hcd->regs) {
-+		pr_debug("ioremap failed\n");
-+		ret = -EIO;
-+		goto out1;
-+	}
-+
-+	ehci = hcd_to_ehci(hcd);
-+	ehci->big_endian_mmio = 1;
-+	ehci->big_endian_desc = 0;
-+	ehci->caps = hcd->regs;
-+	ehci->regs = hcd->regs +
-+		HC_LENGTH(ehci_readl(ehci, &ehci->caps->hc_capbase));
-+	ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);
-+	ehci->sbrn = 0x20;
-+
-+	ret = usb_add_hcd(hcd, irq, IRQF_DISABLED);
-+	if (ret)
-+		goto out2;
-+
-+	platform_set_drvdata(pdev, hcd);
-+	return 0;
-+
-+out2:
-+	iounmap(hcd->regs);
-+out1:
-+	release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
-+out:
-+	usb_put_hcd(hcd);
-+	return ret;
-+}
-+
-+static int __devexit ehci_hcd_bcm63xx_drv_remove(struct platform_device *pdev)
-+{
-+	struct usb_hcd *hcd;
-+
-+	hcd = platform_get_drvdata(pdev);
-+	usb_remove_hcd(hcd);
-+	iounmap(hcd->regs);
-+	usb_put_hcd(hcd);
-+	release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
-+	platform_set_drvdata(pdev, NULL);
-+	return 0;
-+}
-+
-+static struct platform_driver ehci_hcd_bcm63xx_driver = {
-+	.probe		= ehci_hcd_bcm63xx_drv_probe,
-+	.remove		= __devexit_p(ehci_hcd_bcm63xx_drv_remove),
-+	.shutdown	= usb_hcd_platform_shutdown,
-+	.driver		= {
-+		.name	= "bcm63xx_ehci",
-+		.owner	= THIS_MODULE,
-+	},
-+};
-+
-+MODULE_ALIAS("platform:bcm63xx_ehci");
---- a/drivers/usb/host/ehci-hcd.c
-+++ b/drivers/usb/host/ehci-hcd.c
-@@ -1158,6 +1158,11 @@ MODULE_LICENSE ("GPL");
- #define	PLATFORM_DRIVER		ehci_atmel_driver
- #endif
- 
-+#ifdef CONFIG_BCM63XX
-+#include "ehci-bcm63xx.c"
-+#define	PLATFORM_DRIVER		ehci_hcd_bcm63xx_driver
-+#endif
-+
- #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
-     !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER)
- #error "missing bus glue for ehci-hcd"
diff --git a/target/linux/brcm63xx/patches-2.6.33/012-mips_add_readl_writel_be_accessors.patch b/target/linux/brcm63xx/patches-2.6.33/012-mips_add_readl_writel_be_accessors.patch
deleted file mode 100644
index 71b715dcf..000000000
--- a/target/linux/brcm63xx/patches-2.6.33/012-mips_add_readl_writel_be_accessors.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-MIPS currently lacks the readl_be and writel_be accessors
-which are required by BCM63xx for OHCI and EHCI support.
-Let's define them globally for MIPS. This also fixes the
-compilation of the bcm63xx defconfig against USB.
-
-Signed-off-by: Florian Fainelli <ffainelli@freebox.fr>
----
---- a/arch/mips/include/asm/io.h
-+++ b/arch/mips/include/asm/io.h
-@@ -447,6 +447,9 @@ __BUILDIO(q, u64)
- #define readl_relaxed			readl
- #define readq_relaxed			readq
- 
-+#define readl_be(addr)			be32_to_cpu(__raw_readl((__force unsigned *)(addr)))
-+#define writel_be(val, addr)		__raw_writel(cpu_to_be32((val)), (__force unsigned *)(addr))
-+
- /*
-  * Some code tests for these symbols
-  */
diff --git a/target/linux/brcm63xx/patches-2.6.33/020-watchdog.patch b/target/linux/brcm63xx/patches-2.6.33/020-watchdog.patch
deleted file mode 100644
index b4204d8f1..000000000
--- a/target/linux/brcm63xx/patches-2.6.33/020-watchdog.patch
+++ /dev/null
@@ -1,366 +0,0 @@
---- a/drivers/watchdog/Makefile
-+++ b/drivers/watchdog/Makefile
-@@ -112,6 +112,7 @@ obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt
- obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
- obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
- obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
-+obj-$(CONFIG_BCM63XX_WDT) += bcm63xx_wdt.o
- 
- # PARISC Architecture
- 
---- a/drivers/watchdog/Kconfig
-+++ b/drivers/watchdog/Kconfig
-@@ -840,6 +840,16 @@ config TXX9_WDT
- 	help
- 	  Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs.
- 
-+config BCM63XX_WDT
-+	tristate "Broadcom BCM63xx hardware watchdog"
-+	depends on BCM63XX
-+	help
-+	  Watchdog driver for the built in watchdog hardware in Broadcom
-+	  BCM63xx SoC.
-+
-+	  To compile thi driver as a loadable module, choose M here.
-+	  The module will be called bcm63xx_wdt.
-+
- # PARISC Architecture
- 
- # POWERPC Architecture
---- /dev/null
-+++ b/drivers/watchdog/bcm63xx_wdt.c
-@@ -0,0 +1,334 @@
-+/*
-+ *  Broadcom BCM63xx SoC watchdog driver
-+ *
-+ *  Copyright (C) 2007, Miguel Gaio <miguel.gaio@efixo.com>
-+ *  Copyright (C) 2008, Florian Fainelli <florian@openwrt.org>
-+ *
-+ *  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/bitops.h>
-+#include <linux/errno.h>
-+#include <linux/fs.h>
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/miscdevice.h>
-+#include <linux/module.h>
-+#include <linux/moduleparam.h>
-+#include <linux/reboot.h>
-+#include <linux/types.h>
-+#include <linux/uaccess.h>
-+#include <linux/watchdog.h>
-+#include <linux/timer.h>
-+#include <linux/jiffies.h>
-+#include <linux/resource.h>
-+#include <linux/platform_device.h>
-+
-+#include <bcm63xx_cpu.h>
-+#include <bcm63xx_io.h>
-+#include <bcm63xx_regs.h>
-+
-+#define PFX KBUILD_MODNAME
-+
-+#define WDT_HZ		50000000 /* Fclk */
-+#define WDT_DEFAULT_TIME	30      /* seconds */
-+#define WDT_MAX_TIME		256     /* seconds */
-+
-+static struct {
-+	void __iomem *regs;
-+	struct timer_list timer;
-+	int default_ticks;
-+	unsigned long inuse;
-+	atomic_t ticks;
-+} bcm63xx_wdt_device;
-+
-+static int expect_close;
-+static int timeout;
-+
-+static int wdt_time = WDT_DEFAULT_TIME;
-+static int nowayout = WATCHDOG_NOWAYOUT;
-+module_param(nowayout, int, 0);
-+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-+	__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
-+
-+/* HW functions */
-+static void bcm63xx_wdt_hw_start(void)
-+{
-+	bcm_writel(0xfffffffe, bcm63xx_wdt_device.regs + WDT_DEFVAL_REG);
-+	bcm_writel(WDT_START_1, bcm63xx_wdt_device.regs + WDT_CTL_REG);
-+	bcm_writel(WDT_START_2, bcm63xx_wdt_device.regs + WDT_CTL_REG);
-+}
-+
-+static void bcm63xx_wdt_hw_stop(void)
-+{
-+	bcm_writel(WDT_STOP_1, bcm63xx_wdt_device.regs + WDT_CTL_REG);
-+	bcm_writel(WDT_STOP_2, bcm63xx_wdt_device.regs + WDT_CTL_REG);
-+}
-+
-+static void bcm63xx_timer_tick(unsigned long unused)
-+{
-+	if (!atomic_dec_and_test(&bcm63xx_wdt_device.ticks)) {
-+		bcm63xx_wdt_hw_start();
-+		mod_timer(&bcm63xx_wdt_device.timer, jiffies + HZ);
-+	} else
-+		printk(KERN_CRIT PFX ": watchdog will restart system\n");
-+}
-+
-+static void bcm63xx_wdt_pet(void)
-+{
-+	atomic_set(&bcm63xx_wdt_device.ticks, wdt_time);
-+}
-+
-+static void bcm63xx_wdt_start(void)
-+{
-+	bcm63xx_wdt_pet();
-+	bcm63xx_timer_tick(0);
-+}
-+
-+static void bcm63xx_wdt_pause(void)
-+{
-+	del_timer_sync(&bcm63xx_wdt_device.timer);
-+	bcm63xx_wdt_hw_stop();
-+}
-+
-+static int bcm63xx_wdt_settimeout(int new_time)
-+{
-+	if ((new_time <= 0) || (new_time > WDT_MAX_TIME))
-+		return -EINVAL;
-+
-+	wdt_time = new_time;
-+
-+	return 0;
-+}
-+
-+static int bcm63xx_wdt_open(struct inode *inode, struct file *file)
-+{
-+	if (test_and_set_bit(0, &bcm63xx_wdt_device.inuse))
-+		return -EBUSY;
-+
-+	bcm63xx_wdt_start();
-+	return nonseekable_open(inode, file);
-+}
-+
-+static int bcm63xx_wdt_release(struct inode *inode, struct file *file)
-+{
-+	if (expect_close == 42)
-+		bcm63xx_wdt_pause();
-+	else {
-+		printk(KERN_CRIT PFX
-+			": Unexpected close, not stopping watchdog!\n");
-+		bcm63xx_wdt_start();
-+	}
-+	clear_bit(0, &bcm63xx_wdt_device.inuse);
-+	expect_close = 0;
-+	return 0;
-+}
-+
-+static ssize_t bcm63xx_wdt_write(struct file *file, const char *data,
-+				size_t len, loff_t *ppos)
-+{
-+	if (len) {
-+		if (!nowayout) {
-+			size_t i;
-+
-+			/* In case it was set long ago */
-+			expect_close = 0;
-+
-+			for (i = 0; i != len; i++) {
-+				char c;
-+				if (get_user(c, data + i))
-+					return -EFAULT;
-+				if (c == 'V')
-+					expect_close = 42;
-+			}
-+		}
-+		bcm63xx_wdt_pet();
-+	}
-+	return len;
-+}
-+
-+static struct watchdog_info bcm63xx_wdt_info = {
-+	.identity       = PFX,
-+	.options        = WDIOF_SETTIMEOUT |
-+				WDIOF_KEEPALIVEPING |
-+				WDIOF_MAGICCLOSE,
-+};
-+
-+
-+static long bcm63xx_wdt_ioctl(struct file *file, unsigned int cmd,
-+				unsigned long arg)
-+{
-+	void __user *argp = (void __user *)arg;
-+	int __user *p = argp;
-+	int new_value, retval = -EINVAL;
-+
-+	switch (cmd) {
-+	case WDIOC_GETSUPPORT:
-+		return copy_to_user(argp, &bcm63xx_wdt_info,
-+			sizeof(bcm63xx_wdt_info)) ? -EFAULT : 0;
-+
-+	case WDIOC_GETSTATUS:
-+	case WDIOC_GETBOOTSTATUS:
-+		return put_user(0, p);
-+
-+	case WDIOC_SETOPTIONS:
-+		if (get_user(new_value, p))
-+			return -EFAULT;
-+
-+		if (new_value & WDIOS_DISABLECARD) {
-+			bcm63xx_wdt_pause();
-+			retval = 0;
-+		}
-+		if (new_value & WDIOS_ENABLECARD) {
-+			bcm63xx_wdt_start();
-+			retval = 0;
-+		}
-+
-+		return retval;
-+
-+	case WDIOC_KEEPALIVE:
-+		bcm63xx_wdt_pet();
-+		return 0;
-+
-+	case WDIOC_SETTIMEOUT:
-+		if (get_user(new_value, p))
-+			return -EFAULT;
-+
-+		if (bcm63xx_wdt_settimeout(new_value))
-+			return -EINVAL;
-+
-+		bcm63xx_wdt_pet();
-+
-+	case WDIOC_GETTIMEOUT:
-+		return put_user(wdt_time, p);
-+
-+	default:
-+		return -ENOTTY;
-+
-+	}
-+}
-+
-+static int bcm63xx_wdt_notify_sys(struct notifier_block *this,
-+				unsigned long code, void *unused)
-+{
-+	if (code == SYS_DOWN || code == SYS_HALT)
-+		bcm63xx_wdt_pause();
-+	return NOTIFY_DONE;
-+}
-+
-+static const struct file_operations bcm63xx_wdt_fops = {
-+	.owner		= THIS_MODULE,
-+	.llseek		= no_llseek,
-+	.write		= bcm63xx_wdt_write,
-+	.unlocked_ioctl	= bcm63xx_wdt_ioctl,
-+	.open		= bcm63xx_wdt_open,
-+	.release	= bcm63xx_wdt_release,
-+};
-+
-+static struct miscdevice bcm63xx_wdt_miscdev = {
-+	.minor	= WATCHDOG_MINOR,
-+	.name	= "watchdog",
-+	.fops	= &bcm63xx_wdt_fops,
-+};
-+
-+static struct notifier_block bcm63xx_wdt_notifier = {
-+	.notifier_call = bcm63xx_wdt_notify_sys,
-+};
-+
-+
-+static int bcm63xx_wdt_probe(struct platform_device *pdev)
-+{
-+	int ret;
-+	struct resource *r;
-+
-+	setup_timer(&bcm63xx_wdt_device.timer, bcm63xx_timer_tick, 0L);
-+
-+	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if (!r) {
-+		printk(KERN_ERR PFX
-+			"failed to retrieve resources\n");
-+		return -ENODEV;
-+	}
-+
-+	bcm63xx_wdt_device.regs = ioremap_nocache(r->start, r->end - r->start);
-+	if (!bcm63xx_wdt_device.regs) {
-+		printk(KERN_ERR PFX
-+			"failed to remap I/O resources\n");
-+		return -ENXIO;
-+	}
-+
-+	if (bcm63xx_wdt_settimeout(wdt_time)) {
-+		bcm63xx_wdt_settimeout(WDT_DEFAULT_TIME);
-+		printk(KERN_INFO PFX
-+			": wdt_time value must be 1 <= wdt_time <= 256, using %d\n",
-+			wdt_time);
-+	}
-+
-+	ret = register_reboot_notifier(&bcm63xx_wdt_notifier);
-+	if (ret) {
-+		printk(KERN_ERR PFX
-+			"failed to register reboot_notifier\n");
-+		return ret;
-+	}
-+
-+	ret = misc_register(&bcm63xx_wdt_miscdev);
-+	if (ret < 0) {
-+		printk(KERN_ERR PFX
-+			"failed to register watchdog device\n");
-+		goto unmap;
-+	}
-+
-+	printk(KERN_INFO PFX " started, timer margin: %d sec\n", WDT_DEFAULT_TIME);
-+
-+	return 0;
-+
-+unmap:
-+	unregister_reboot_notifier(&bcm63xx_wdt_notifier);
-+	iounmap(bcm63xx_wdt_device.regs);
-+	return ret;
-+}
-+
-+static int bcm63xx_wdt_remove(struct platform_device *pdev)
-+{
-+	if (!nowayout)
-+		bcm63xx_wdt_pause();
-+
-+	misc_deregister(&bcm63xx_wdt_miscdev);
-+
-+	iounmap(bcm63xx_wdt_device.regs);
-+
-+	unregister_reboot_notifier(&bcm63xx_wdt_notifier);
-+
-+	return 0;
-+}
-+
-+static struct platform_driver bcm63xx_wdt = {
-+	.probe	= bcm63xx_wdt_probe,
-+	.remove = bcm63xx_wdt_remove,
-+	.driver = {
-+		.name = "bcm63xx-wdt",
-+	}
-+};
-+
-+static int __init bcm63xx_wdt_init(void)
-+{
-+	return platform_driver_register(&bcm63xx_wdt);
-+}
-+
-+static void __exit bcm63xx_wdt_exit(void)
-+{
-+	platform_driver_unregister(&bcm63xx_wdt);
-+}
-+
-+module_init(bcm63xx_wdt_init);
-+module_exit(bcm63xx_wdt_exit);
-+
-+MODULE_AUTHOR("Miguel Gaio <miguel.gaio@efixo.com>");
-+MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>");
-+MODULE_DESCRIPTION("Driver for the Broadcom BCM63xx SoC watchdog");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
-+MODULE_ALIAS("platform:bcm63xx-wdt");
diff --git a/target/linux/brcm63xx/patches-2.6.33/040-bcm963xx_flashmap.patch b/target/linux/brcm63xx/patches-2.6.33/040-bcm963xx_flashmap.patch
deleted file mode 100644
index cd0ec549d..000000000
--- a/target/linux/brcm63xx/patches-2.6.33/040-bcm963xx_flashmap.patch
+++ /dev/null
@@ -1,512 +0,0 @@
-From e734ace5baa04e0e8af1d4483475fbd6bd2b32a1 Mon Sep 17 00:00:00 2001
-From: Axel Gembe <ago@bastart.eu.org>
-Date: Mon, 12 May 2008 18:54:09 +0200
-Subject: [PATCH] bcm963xx: flashmap support
-
-
-Signed-off-by: Axel Gembe <ago@bastart.eu.org>
----
- drivers/mtd/maps/Kconfig  |    7 +++++++
- drivers/mtd/maps/Makefile |    1 +
- drivers/mtd/redboot.c     |   13 ++++++++++---
- 3 files changed, 18 insertions(+), 3 deletions(-)
-
---- a/drivers/mtd/maps/Kconfig
-+++ b/drivers/mtd/maps/Kconfig
-@@ -257,6 +257,13 @@ config MTD_ALCHEMY
- 	help
- 	  Flash memory access on AMD Alchemy Pb/Db/RDK Reference Boards
- 
-+config MTD_BCM963XX
-+        tristate "BCM963xx Flash device"
-+        depends on MIPS && BCM63XX
-+        help
-+	  Flash memory access on BCM963xx boards. Currently only works with
-+	  RedBoot and CFE.
-+
- config MTD_DILNETPC
- 	tristate "CFI Flash device mapped on DIL/Net PC"
- 	depends on X86 && MTD_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT && BROKEN
---- a/drivers/mtd/redboot.c
-+++ b/drivers/mtd/redboot.c
-@@ -39,7 +39,7 @@ static inline int redboot_checksum(struc
- 	return 1;
- }
- 
--static int parse_redboot_partitions(struct mtd_info *master,
-+int parse_redboot_partitions(struct mtd_info *master,
-                              struct mtd_partition **pparts,
-                              unsigned long fis_origin)
- {
-@@ -162,6 +162,14 @@ static int parse_redboot_partitions(stru
- 		goto out;
- 	}
- 
-+	if (!fis_origin) {
-+		for (i = 0; i < numslots; i++) {
-+			if (!strncmp(buf[i].name, "RedBoot", 8)) {
-+				fis_origin = (buf[i].flash_base & (master->size << 1) - 1);
-+			}
-+		}
-+	}
-+
- 	for (i = 0; i < numslots; i++) {
- 		struct fis_list *new_fl, **prev;
- 
-@@ -184,9 +192,8 @@ static int parse_redboot_partitions(stru
- 		new_fl->img = &buf[i];
-                 if (fis_origin) {
-                         buf[i].flash_base -= fis_origin;
--                } else {
--                        buf[i].flash_base &= master->size-1;
-                 }
-+		buf[i].flash_base &= (master->size << 1) - 1;
- 
- 		/* I'm sure the JFFS2 code has done me permanent damage.
- 		 * I now think the following is _normal_
---- a/drivers/mtd/maps/Makefile
-+++ b/drivers/mtd/maps/Makefile
-@@ -61,3 +61,4 @@ obj-$(CONFIG_MTD_BFIN_ASYNC)	+= bfin-asy
- obj-$(CONFIG_MTD_RBTX4939)	+= rbtx4939-flash.o
- obj-$(CONFIG_MTD_VMU)		+= vmu-flash.o
- obj-$(CONFIG_MTD_GPIO_ADDR)	+= gpio-addr-flash.o
-+obj-$(CONFIG_MTD_BCM963XX)	+= bcm963xx-flash.o
---- /dev/null
-+++ b/drivers/mtd/maps/bcm963xx-flash.c
-@@ -0,0 +1,399 @@
-+/*
-+ * Copyright (C) 2006-2008  Florian Fainelli <florian@openwrt.org>
-+ * 			    Mike Albon <malbon@openwrt.org>
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-+ */
-+
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/mtd/map.h>
-+#include <linux/mtd/mtd.h>
-+#include <linux/mtd/partitions.h>
-+#include <linux/vmalloc.h>
-+#include <linux/platform_device.h>
-+
-+#include <bcm_tag.h>
-+#include <asm/io.h>
-+
-+#define BUSWIDTH 2                     /* Buswidth */
-+#define EXTENDED_SIZE 0xBFC00000       /* Extended flash address */
-+
-+#define PFX KBUILD_MODNAME ": "
-+
-+extern int parse_redboot_partitions(struct mtd_info *master, struct mtd_partition **pparts, unsigned long fis_origin);
-+static struct mtd_partition *parsed_parts;
-+
-+static struct mtd_info *bcm963xx_mtd_info;
-+
-+static struct map_info bcm963xx_map = {
-+       .name		= "bcm963xx",
-+       .bankwidth	= BUSWIDTH,
-+};
-+
-+static struct tagiddesc_t tagidtab[NUM_TAGID] = TAGID_DEFINITIONS;
-+
-+static uint32_t tagcrc32tab[256] = {
-+	0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
-+	0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
-+	0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
-+	0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
-+	0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
-+	0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
-+	0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
-+	0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
-+	0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
-+	0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
-+	0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
-+	0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
-+	0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
-+	0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
-+	0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
-+	0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
-+	0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
-+	0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
-+	0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
-+	0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
-+	0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
-+	0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
-+	0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
-+	0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
-+	0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
-+	0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
-+	0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
-+	0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
-+	0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
-+	0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
-+	0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
-+	0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
-+};
-+
-+static uint32_t tagcrc32(uint32_t crc, uint8_t *data, size_t len)
-+{
-+	while (len--)
-+		crc = (crc >> 8) ^ tagcrc32tab[(crc ^ *data++) & 0xFF];
-+
-+	return crc;
-+}
-+
-+static int parse_cfe_partitions( struct mtd_info *master, struct mtd_partition **pparts)
-+{
-+	int nrparts = 3, curpart = 0; /* CFE,NVRAM and global LINUX are always present. */
-+	union bcm_tag *buf;
-+	struct mtd_partition *parts;
-+	int ret;
-+	size_t retlen;
-+	unsigned int rootfsaddr, kerneladdr, spareaddr;
-+	unsigned int rootfslen, kernellen, sparelen, totallen;
-+	unsigned char *tagid;
-+	int namelen = 0;
-+	int i;
-+	uint32_t tagidcrc;
-+	uint32_t calctagidcrc;
-+        bool tagid_match = false;
-+	char *boardid;
-+        char *tagversion;
-+	char *matchtagid;
-+
-+	/* Allocate memory for buffer */
-+	buf = vmalloc(sizeof(union bcm_tag));
-+	if (!buf)
-+		return -ENOMEM;
-+
-+	/* Get the tag */
-+	ret = master->read(master,master->erasesize,sizeof(union bcm_tag), &retlen, (void *)buf);
-+	if (retlen != sizeof(union bcm_tag)){
-+		vfree(buf);
-+		return -EIO;
-+	}
-+
-+	/* tagId isn't in the same location, so we check each tagid against the
-+         * tagid CRC.  If the CRC is valid we have found the right tag and so
-+         * use that tag
-+         */
-+
-+	for (i = 0; i < NUM_TAGID; i++) {
-+	  switch(i) {
-+	  case 0:
-+	    matchtagid = "bccfe";
-+	    tagid = &(buf->bccfe.tagId[0]);
-+	    sscanf(buf->bccfe.rootAddress,"%u", &rootfsaddr);
-+	    sscanf(buf->bccfe.rootLength, "%u", &rootfslen);
-+	    sscanf(buf->bccfe.kernelAddress, "%u", &kerneladdr);
-+	    sscanf(buf->bccfe.kernelLength, "%u", &kernellen);
-+	    sscanf(buf->bccfe.totalLength, "%u", &totallen);
-+	    tagidcrc = *(uint32_t *)&(buf->bccfe.tagIdCRC[0]);
-+	    tagversion = &(buf->bccfe.tagVersion[0]);
-+	    boardid = &(buf->bccfe.boardid[0]);
-+	    break;
-+	  case 1:
-+	    matchtagid = "bc300";
-+	    tagid = &(buf->bc300.tagId[0]);
-+	    sscanf(buf->bc300.rootAddress,"%u", &rootfsaddr);
-+	    sscanf(buf->bc300.rootLength, "%u", &rootfslen);
-+	    sscanf(buf->bc300.kernelAddress, "%u", &kerneladdr);
-+	    sscanf(buf->bc300.kernelLength, "%u", &kernellen);
-+	    sscanf(buf->bc300.totalLength, "%u", &totallen);
-+	    tagidcrc = *(uint32_t *)&(buf->bc300.tagIdCRC[0]);
-+	    tagversion = &(buf->bc300.tagVersion[0]);
-+	    boardid = &(buf->bc300.boardid[0]);
-+	    break;
-+	  case 2:
-+	    matchtagid = "ag306";
-+	    tagid = &(buf->ag306.tagId[0]);
-+	    sscanf(buf->ag306.rootAddress,"%u", &rootfsaddr);
-+	    sscanf(buf->ag306.rootLength, "%u", &rootfslen);
-+	    sscanf(buf->ag306.kernelAddress, "%u", &kerneladdr);
-+	    sscanf(buf->ag306.kernelLength, "%u", &kernellen);
-+	    sscanf(buf->ag306.totalLength, "%u", &totallen);
-+	    tagidcrc = *(uint32_t *)&(buf->ag306.tagIdCRC[0]);
-+	    tagversion = &(buf->ag306.tagVersion[0]);
-+	    boardid = &(buf->ag306.boardid[0]);
-+	    break;
-+	  case 3:
-+	    matchtagid = "bc221";
-+	    tagid = &(buf->bc221.tagId[0]);
-+	    sscanf(buf->bc221.rootAddress,"%u", &rootfsaddr);
-+	    sscanf(buf->bc221.rootLength, "%u", &rootfslen);
-+	    sscanf(buf->bc221.kernelAddress, "%u", &kerneladdr);
-+	    sscanf(buf->bc221.kernelLength, "%u", &kernellen);
-+	    sscanf(buf->bc221.totalLength, "%u", &totallen);
-+	    tagidcrc = *(uint32_t *)&(buf->bc221.tagIdCRC[0]);
-+	    tagversion = &(buf->bc221.tagVersion[0]);
-+	    boardid = &(buf->bc221.boardid[0]);
-+	    break;
-+	  case 4:
-+	    matchtagid = "bc310";
-+	    tagid = &(buf->bc310.tagId[0]);
-+	    sscanf(buf->bc310.rootAddress,"%u", &rootfsaddr);
-+	    sscanf(buf->bc310.rootLength, "%u", &rootfslen);
-+	    sscanf(buf->bc310.kernelAddress, "%u", &kerneladdr);
-+	    sscanf(buf->bc310.kernelLength, "%u", &kernellen);
-+	    sscanf(buf->bc310.totalLength, "%u", &totallen);
-+	    tagidcrc = *(uint32_t *)&(buf->bc310.tagIdCRC[0]);
-+	    tagversion = &(buf->bc310.tagVersion[0]);
-+	    boardid = &(buf->bc310.boardid[0]);
-+	    break;
-+	  }
-+	  if (strncmp(tagid, matchtagid, TAGID_LEN) != 0) {
-+	    continue;
-+	  }
-+
-+	  calctagidcrc = htonl(tagcrc32(IMAGETAG_CRC_START, tagid, TAGID_LEN));
-+	  if (tagidcrc == calctagidcrc) {
-+	    tagid_match = true;
-+	    break;
-+	  }
-+	}
-+
-+	if (!tagid_match) {
-+	    tagid = "bcram";
-+	    sscanf(buf->bccfe.rootAddress,"%u", &rootfsaddr);
-+	    sscanf(buf->bccfe.rootLength, "%u", &rootfslen);
-+	    sscanf(buf->bccfe.kernelAddress, "%u", &kerneladdr);
-+	    sscanf(buf->bccfe.kernelLength, "%u", &kernellen);
-+	    sscanf(buf->bccfe.totalLength, "%u", &totallen);
-+	    tagidcrc = *(uint32_t *)&(buf->bccfe.tagIdCRC[0]);
-+	    tagversion = &(buf->bccfe.tagVersion[0]);
-+	    boardid = &(buf->bccfe.boardid[0]);
-+	}
-+
-+	printk(KERN_INFO PFX "CFE boot tag found with version %s, board type %s, and tagid %s.\n",tagversion,boardid,tagid);
-+
-+	rootfsaddr = rootfsaddr - EXTENDED_SIZE;
-+	kerneladdr = kerneladdr - EXTENDED_SIZE;
-+	spareaddr = roundup(totallen,master->erasesize) + master->erasesize;
-+	sparelen = master->size - spareaddr - master->erasesize;
-+
-+	/* Determine number of partitions */
-+	namelen = 8;
-+	if (rootfslen > 0){
-+		nrparts++;
-+		namelen =+ 6;
-+	};
-+	if (kernellen > 0) {
-+		nrparts++;
-+		namelen =+ 6;
-+	};
-+
-+	/* Ask kernel for more memory */
-+	parts = kzalloc(sizeof(*parts) * nrparts + 10 * nrparts, GFP_KERNEL);
-+	if (!parts) {
-+		vfree(buf);
-+		return -ENOMEM;
-+	};
-+
-+	/* Start building partition list */
-+	parts[curpart].name = "CFE";
-+	parts[curpart].offset = 0;
-+	parts[curpart].size = master->erasesize;
-+	curpart++;
-+
-+	if (kernellen > 0) {
-+		parts[curpart].name = "kernel";
-+		parts[curpart].offset = kerneladdr;
-+		parts[curpart].size = kernellen;
-+		curpart++;
-+	};
-+
-+	if (rootfslen > 0) {
-+		parts[curpart].name = "rootfs";
-+		parts[curpart].offset = rootfsaddr;
-+		parts[curpart].size = rootfslen;
-+		if (sparelen > 0)
-+			parts[curpart].size += sparelen;
-+		curpart++;
-+	};
-+
-+	parts[curpart].name = "nvram";
-+	parts[curpart].offset = master->size - master->erasesize;
-+	parts[curpart].size = master->erasesize;
-+
-+	/* Global partition "linux" to make easy firmware upgrade */
-+	curpart++;
-+	parts[curpart].name = "linux";
-+	parts[curpart].offset = parts[0].size;
-+	parts[curpart].size = master->size - parts[0].size - parts[3].size;
-+ 
-+	for (i = 0; i < nrparts; i++)
-+		printk(KERN_INFO PFX "Partition %d is %s offset %lx and length %lx\n", i, parts[i].name, parts[i].offset, parts[i].size);
-+
-+ 	printk(KERN_INFO PFX "Spare partition is %x offset and length %x\n", spareaddr, sparelen);
-+	*pparts = parts;
-+	vfree(buf);
-+
-+	return nrparts;
-+};
-+
-+static int bcm963xx_detect_cfe(struct mtd_info *master)
-+{
-+	int idoffset = 0x4e0;
-+	static char idstring[8] = "CFE1CFE1";
-+	char buf[9];
-+	int ret;
-+	size_t retlen;
-+
-+	ret = master->read(master, idoffset, 8, &retlen, (void *)buf);
-+	buf[retlen] = 0;
-+	printk(KERN_INFO PFX "Read Signature value of %s\n", buf);
-+
-+	return strncmp(idstring, buf, 8);
-+}
-+
-+static int bcm963xx_probe(struct platform_device *pdev)
-+{
-+	int err = 0;
-+	int parsed_nr_parts = 0;
-+	char *part_type;
-+	struct resource *r;
-+
-+	r = platform_get_resource(pdev, IORESOURCE_MEM, 0); 
-+	bcm963xx_map.phys = r->start;
-+	bcm963xx_map.size = (r->end - r->start) + 1;
-+	bcm963xx_map.virt = ioremap(r->start, r->end - r->start + 1);
-+
-+	if (!bcm963xx_map.virt) {
-+		printk(KERN_ERR PFX "Failed to ioremap\n");
-+		return -EIO;
-+	}
-+	printk(KERN_INFO PFX "0x%08lx at 0x%08x\n", bcm963xx_map.size, bcm963xx_map.phys);
-+
-+	simple_map_init(&bcm963xx_map);
-+
-+	bcm963xx_mtd_info = do_map_probe("cfi_probe", &bcm963xx_map);
-+	if (!bcm963xx_mtd_info) {
-+		printk(KERN_ERR PFX "Failed to probe using CFI\n");
-+		err = -EIO;
-+		goto err_probe;
-+	}
-+
-+	bcm963xx_mtd_info->owner = THIS_MODULE;
-+
-+	/* This is mutually exclusive */
-+	if (bcm963xx_detect_cfe(bcm963xx_mtd_info) == 0) {
-+		printk(KERN_INFO PFX "CFE bootloader detected\n");
-+		if (parsed_nr_parts == 0) {
-+			int ret = parse_cfe_partitions(bcm963xx_mtd_info, &parsed_parts);
-+			if (ret > 0) {
-+				part_type = "CFE";
-+				parsed_nr_parts = ret;
-+			}
-+		}
-+	} else {
-+		printk(KERN_INFO PFX "assuming RedBoot bootloader\n");
-+		if (bcm963xx_mtd_info->size > 0x00400000) {
-+			printk(KERN_INFO PFX "Support for extended flash memory size : 0x%lx ; ONLY 64MBIT SUPPORT\n", bcm963xx_mtd_info->size);
-+			bcm963xx_map.virt = (u32)(EXTENDED_SIZE);
-+		}
-+
-+#ifdef CONFIG_MTD_REDBOOT_PARTS
-+		if (parsed_nr_parts == 0) {
-+			int ret = parse_redboot_partitions(bcm963xx_mtd_info, &parsed_parts, 0);
-+			if (ret > 0) {
-+				part_type = "RedBoot";
-+				parsed_nr_parts = ret;
-+			}
-+		}
-+#endif
-+	}
-+
-+	return add_mtd_partitions(bcm963xx_mtd_info, parsed_parts, parsed_nr_parts);
-+
-+err_probe:
-+	iounmap(bcm963xx_map.virt);
-+	return err;
-+}
-+
-+static int bcm963xx_remove(struct platform_device *pdev)
-+{
-+	if (bcm963xx_mtd_info) {
-+		del_mtd_partitions(bcm963xx_mtd_info);
-+		map_destroy(bcm963xx_mtd_info);
-+	}
-+
-+	if (bcm963xx_map.virt) {
-+		iounmap(bcm963xx_map.virt);
-+		bcm963xx_map.virt = 0;
-+	}
-+
-+	return 0;
-+}
-+
-+static struct platform_driver bcm63xx_mtd_dev = {
-+	.probe	= bcm963xx_probe,
-+	.remove = bcm963xx_remove,
-+	.driver = {
-+		.name	= "bcm963xx-flash",
-+		.owner	= THIS_MODULE,
-+	},
-+};
-+
-+static int __init bcm963xx_mtd_init(void)
-+{
-+	return platform_driver_register(&bcm63xx_mtd_dev);
-+}
-+
-+static void __exit bcm963xx_mtd_exit(void)
-+{
-+	platform_driver_unregister(&bcm63xx_mtd_dev);
-+}
-+
-+module_init(bcm963xx_mtd_init);
-+module_exit(bcm963xx_mtd_exit);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_DESCRIPTION("Broadcom BCM63xx MTD partition parser/mapping for CFE and RedBoot");
-+MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>");
-+MODULE_AUTHOR("Mike Albon <malbon@openwrt.org>");
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -721,20 +721,6 @@ static int board_get_mac_address(u8 *mac
- 	return 0;
- }
- 
--static struct mtd_partition mtd_partitions[] = {
--	{
--		.name		= "cfe",
--		.offset		= 0x0,
--		.size		= 0x40000,
--	}
--};
--
--static struct physmap_flash_data flash_data = {
--	.width			= 2,
--	.nr_parts		= ARRAY_SIZE(mtd_partitions),
--	.parts			= mtd_partitions,
--};
--
- static struct resource mtd_resources[] = {
- 	{
- 		.start		= 0,	/* filled at runtime */
-@@ -744,12 +730,9 @@ static struct resource mtd_resources[] =
- };
- 
- static struct platform_device mtd_dev = {
--	.name			= "physmap-flash",
-+	.name			= "bcm963xx-flash",
- 	.resource		= mtd_resources,
- 	.num_resources		= ARRAY_SIZE(mtd_resources),
--	.dev			= {
--		.platform_data	= &flash_data,
--	},
- };
- 
- /*
diff --git a/target/linux/brcm63xx/patches-2.6.33/070_bcm63xx_enet_vlan_incoming_fixed.patch b/target/linux/brcm63xx/patches-2.6.33/070_bcm63xx_enet_vlan_incoming_fixed.patch
deleted file mode 100644
index dd0a72246..000000000
--- a/target/linux/brcm63xx/patches-2.6.33/070_bcm63xx_enet_vlan_incoming_fixed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/drivers/net/bcm63xx_enet.c
-+++ b/drivers/net/bcm63xx_enet.c
-@@ -1523,7 +1523,7 @@ static int compute_hw_mtu(struct bcm_ene
- 	actual_mtu = mtu;
- 
- 	/* add ethernet header + vlan tag size */
--	actual_mtu += VLAN_ETH_HLEN;
-+	actual_mtu += VLAN_ETH_HLEN + VLAN_HLEN;
- 
- 	if (actual_mtu < 64 || actual_mtu > BCMENET_MAX_MTU)
- 		return -EINVAL;
diff --git a/target/linux/brcm63xx/patches-2.6.33/100-reset_buttons.patch b/target/linux/brcm63xx/patches-2.6.33/100-reset_buttons.patch
deleted file mode 100644
index e1faeeeda..000000000
--- a/target/linux/brcm63xx/patches-2.6.33/100-reset_buttons.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -15,6 +15,8 @@
- #include <linux/mtd/partitions.h>
- #include <linux/mtd/physmap.h>
- #include <linux/ssb/ssb.h>
-+#include <linux/gpio_buttons.h>
-+#include <linux/input.h>
- #include <asm/addrspace.h>
- #include <bcm63xx_board.h>
- #include <bcm63xx_cpu.h>
-@@ -288,6 +290,16 @@ static struct board_info __initdata boar
- 			.active_low	= 1,
- 		},
- 	},
-+	.reset_buttons = {
-+		{
-+			.desc		= "reset",
-+			.gpio		= 32,
-+			.active_low	= 1,
-+			.type		= EV_KEY,
-+			.code		= BTN_0,
-+			.threshold	= 3,
-+		},
-+	},
- };
- 
- static struct board_info __initdata board_96348gw = {
-@@ -345,6 +357,16 @@ static struct board_info __initdata boar
- 			.active_low	= 1,
- 		},
- 	},
-+	.reset_buttons = {
-+		{
-+			.desc		= "reset",
-+			.gpio		= 36,
-+			.active_low	= 1,
-+			.type		= EV_KEY,
-+			.code		= BTN_0,
-+			.threshold	= 3,
-+		},
-+	},
- };
- 
- static struct board_info __initdata board_FAST2404 = {
-@@ -770,6 +792,16 @@ static struct platform_device bcm63xx_gp
- 	.dev.platform_data	= &bcm63xx_led_data,
- };
- 
-+static struct gpio_buttons_platform_data bcm63xx_gpio_buttons_data = {
-+	.poll_interval  = 20,
-+};
-+
-+static struct platform_device bcm63xx_gpio_buttons_device = {
-+	.name		= "gpio-buttons",
-+	.id		= 0,
-+	.dev.platform_data = &bcm63xx_gpio_buttons_data,
-+};
-+
- /*
-  * third stage init callback, register all board devices.
-  */
-@@ -825,6 +857,13 @@ int __init board_register_devices(void)
- 
- 	platform_device_register(&bcm63xx_gpio_leds);
- 
-+	if (board.reset_buttons) {
-+		bcm63xx_gpio_buttons_data.nbuttons = ARRAY_SIZE(board.reset_buttons);
-+		bcm63xx_gpio_buttons_data.buttons = board.reset_buttons;
-+
-+		platform_device_register(&bcm63xx_gpio_buttons_device);
-+	}
-+
- 	return 0;
- }
- 
---- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-@@ -55,6 +55,9 @@ struct board_info {
- 
- 	/* GPIO LEDs */
- 	struct gpio_led leds[5];
-+
-+	/* Reset button */
-+	struct gpio_button reset_buttons[1];
- };
- 
- #endif /* ! BOARD_BCM963XX_H_ */
diff --git a/target/linux/brcm63xx/patches-2.6.33/110-gpiodev.patch b/target/linux/brcm63xx/patches-2.6.33/110-gpiodev.patch
deleted file mode 100644
index 8530c4e87..000000000
--- a/target/linux/brcm63xx/patches-2.6.33/110-gpiodev.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -784,6 +784,10 @@ static struct ssb_sprom bcm63xx_sprom =
- };
- #endif
- 
-+static struct resource gpiodev_resource = {
-+	.start			= 0xFFFFFFFF,
-+};
-+
- static struct gpio_led_platform_data bcm63xx_led_data;
- 
- static struct platform_device bcm63xx_gpio_leds = {
-@@ -852,6 +856,8 @@ int __init board_register_devices(void)
- 
- 	platform_device_register(&mtd_dev);
- 
-+	platform_device_register_simple("GPIODEV", 0, &gpiodev_resource, 1);
-+
- 	bcm63xx_led_data.num_leds = ARRAY_SIZE(board.leds);
- 	bcm63xx_led_data.leds = board.leds;
- 
diff --git a/target/linux/brcm63xx/patches-2.6.33/120-board_rta1025w_16.patch b/target/linux/brcm63xx/patches-2.6.33/120-board_rta1025w_16.patch
deleted file mode 100644
index 370c39706..000000000
--- a/target/linux/brcm63xx/patches-2.6.33/120-board_rta1025w_16.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -392,6 +392,25 @@ static struct board_info __initdata boar
- 	.has_ehci0			= 1,
- };
- 
-+static struct board_info __initdata board_rta1025w_16 = {
-+	.name				= "RTA1025W_16",
-+	.expected_cpu_id		= 0x6348,
-+
-+	.has_enet0			= 1,
-+	.has_enet1			= 1,
-+	.has_pci			= 1,
-+
-+	.enet0 = {
-+		.has_phy		= 1,
-+		.use_internal_phy	= 1,
-+	},
-+	.enet1 = {
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
-+	},
-+};
-+
-+
- static struct board_info __initdata board_DV201AMR = {
- 	.name				= "DV201AMR",
- 	.expected_cpu_id		= 0x6348,
-@@ -576,6 +595,7 @@ static const struct board_info __initdat
- 	&board_FAST2404,
- 	&board_DV201AMR,
- 	&board_96348gw_a,
-+	&board_rta1025w_16,
- #endif
- 
- #ifdef CONFIG_BCM63XX_CPU_6358
diff --git a/target/linux/brcm63xx/patches-2.6.33/130-board_DWVS0.patch b/target/linux/brcm63xx/patches-2.6.33/130-board_DWVS0.patch
deleted file mode 100644
index 440189cd5..000000000
--- a/target/linux/brcm63xx/patches-2.6.33/130-board_DWVS0.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -574,6 +574,27 @@ static struct board_info __initdata boar
- 	.has_ohci0 = 1,
- 	.has_ehci0 = 1,
- };
-+
-+static struct board_info __initdata board_DWVS0 = {
-+	.name				= "DWV-S0",
-+	.expected_cpu_id		= 0x6358,
-+
-+	.has_enet0			= 1,
-+	.has_enet1			= 1,
-+	.has_pci			= 1,
-+
-+	.enet0 = {
-+		.has_phy		= 1,
-+		.use_internal_phy	= 1,
-+	},
-+
-+	.enet1 = {
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
-+	},
-+
-+	.has_ohci0 = 1,
-+};
- #endif
- 
- /*
-@@ -602,6 +623,7 @@ static const struct board_info __initdat
- 	&board_96358vw,
- 	&board_96358vw2,
- 	&board_AGPFS0,
-+	&board_DWVS0,
- #endif
- };
- 
diff --git a/target/linux/brcm63xx/patches-2.6.33/140-new_bcm96348gw_leds.patch b/target/linux/brcm63xx/patches-2.6.33/140-new_bcm96348gw_leds.patch
deleted file mode 100644
index f1a66c9f9..000000000
--- a/target/linux/brcm63xx/patches-2.6.33/140-new_bcm96348gw_leds.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -336,24 +336,39 @@ static struct board_info __initdata boar
- 			.active_low	= 1,
- 		},
- 		{
--			.name		= "ppp",
--			.gpio		= 3,
-+			.name		= "power",
-+			.gpio		= 0,
- 			.active_low	= 1,
-+			.default_trigger = "default-on",
- 		},
- 		{
--			.name		= "ppp-fail",
-+			.name		= "stop",
-+			.gpio		= 1,
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "line1",
- 			.gpio		= 4,
- 			.active_low	= 1,
- 		},
- 		{
--			.name		= "power",
--			.gpio		= 0,
-+			.name		= "line2",
-+			.gpio		= 5,
- 			.active_low	= 1,
--			.default_trigger = "default-on",
- 		},
- 		{
--			.name		= "stop",
--			.gpio		= 1,
-+			.name		= "line3",
-+			.gpio		= 6,
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "tel",
-+			.gpio		= 7,
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "eth",
-+			.gpio		= 35,
- 			.active_low	= 1,
- 		},
- 	},
-@@ -854,6 +869,7 @@ static struct platform_device bcm63xx_gp
- int __init board_register_devices(void)
- {
- 	u32 val;
-+	int led_count = 0;
- 
- 	if (board.has_pccard)
- 		bcm63xx_pcmcia_register();
-@@ -900,7 +916,11 @@ int __init board_register_devices(void)
- 
- 	platform_device_register_simple("GPIODEV", 0, &gpiodev_resource, 1);
- 
--	bcm63xx_led_data.num_leds = ARRAY_SIZE(board.leds);
-+	/* count number of LEDs defined by this device */
-+	while (led_count < ARRAY_SIZE(board.leds) && board.leds[led_count].name)
-+		led_count++;
-+
-+	bcm63xx_led_data.num_leds = led_count;
- 	bcm63xx_led_data.leds = board.leds;
- 
- 	platform_device_register(&bcm63xx_gpio_leds);
---- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-@@ -54,7 +54,7 @@ struct board_info {
- 	struct bcm63xx_dsp_platform_data dsp;
- 
- 	/* GPIO LEDs */
--	struct gpio_led leds[5];
-+	struct gpio_led leds[8];
- 
- 	/* Reset button */
- 	struct gpio_button reset_buttons[1];
diff --git a/target/linux/brcm63xx/patches-2.6.33/150-alice_gate2_leds.patch b/target/linux/brcm63xx/patches-2.6.33/150-alice_gate2_leds.patch
deleted file mode 100644
index 7795f99ef..000000000
--- a/target/linux/brcm63xx/patches-2.6.33/150-alice_gate2_leds.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -588,6 +588,63 @@ static struct board_info __initdata boar
- 
- 	.has_ohci0 = 1,
- 	.has_ehci0 = 1,
-+
-+	.leds = {
-+		/*Each led on alice gate is bi-color */
-+		{
-+			.name		= "power:red",
-+			.gpio		= 5,
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "power:green",
-+			.gpio		= 4,
-+			.active_low	= 1,
-+			.default_trigger = "default-on",
-+		},
-+		{
-+			.name		= "wifi:red",
-+			.gpio		= 23,
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "wifi:green",
-+			.gpio		= 22,
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "usr1:red",
-+			.gpio		= 27,
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "usr1:green",
-+			.gpio		= 26,
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "usr2:red",
-+			.gpio		= 30,
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "usr2:green",
-+			.gpio		= 29,
-+			.active_low	= 1,
-+		},
-+	},
-+
-+	.reset_buttons = {
-+		{
-+			.desc           = "sw2",
-+			.gpio           = 37,
-+			.active_low     = 1,
-+			.type           = EV_KEY,
-+			.code           = BTN_0,
-+			.threshold      = 3,
-+		},
-+	},
-+	/* sw1 is connected to gpio34*/
- };
- 
- static struct board_info __initdata board_DWVS0 = {
diff --git a/target/linux/brcm63xx/patches-2.6.33/160-fix_gpio_count.patch b/target/linux/brcm63xx/patches-2.6.33/160-fix_gpio_count.patch
deleted file mode 100644
index f99768536..000000000
--- a/target/linux/brcm63xx/patches-2.6.33/160-fix_gpio_count.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h
-@@ -10,6 +10,10 @@ static inline unsigned long bcm63xx_gpio
- 	switch (bcm63xx_get_cpu_id()) {
- 	case BCM6358_CPU_ID:
- 		return 40;
-+	case BCM6338_CPU_ID:
-+		return 8;
-+	case BCM6345_CPU_ID:
-+		return 16;
- 	case BCM6348_CPU_ID:
- 	default:
- 		return 37;
diff --git a/target/linux/brcm63xx/patches-2.6.33/170-board_livebox.patch b/target/linux/brcm63xx/patches-2.6.33/170-board_livebox.patch
deleted file mode 100644
index 02354d573..000000000
--- a/target/linux/brcm63xx/patches-2.6.33/170-board_livebox.patch
+++ /dev/null
@@ -1,246 +0,0 @@
---- a/arch/mips/bcm63xx/boards/Kconfig
-+++ b/arch/mips/bcm63xx/boards/Kconfig
-@@ -8,4 +8,10 @@ config BOARD_BCM963XX
- 	select SSB
-        help
- 
-+config BOARD_LIVEBOX
-+	bool "Inventel Livebox(es) boards"
-+	select SSB
-+	help
-+	 Inventel Livebox boards using the RedBoot bootloader.
-+
- endchoice
---- a/arch/mips/bcm63xx/boards/Makefile
-+++ b/arch/mips/bcm63xx/boards/Makefile
-@@ -1,3 +1,4 @@
- obj-$(CONFIG_BOARD_BCM963XX)		+= board_bcm963xx.o
-+obj-$(CONFIG_BOARD_LIVEBOX)		+= board_livebox.o
- 
- EXTRA_CFLAGS += -Werror
---- /dev/null
-+++ b/arch/mips/bcm63xx/boards/board_livebox.c
-@@ -0,0 +1,223 @@
-+/*
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License.  See the file "COPYING" in the main directory of this archive
-+ * for more details.
-+ *
-+ * Copyright (C) 2008 Florian Fainelli <florian@openwrt.org>
-+ */
-+
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/string.h>
-+#include <linux/platform_device.h>
-+#include <linux/mtd/mtd.h>
-+#include <linux/mtd/partitions.h>
-+#include <linux/mtd/physmap.h>
-+#include <linux/input.h>
-+#include <linux/gpio_buttons.h>
-+#include <asm/addrspace.h>
-+#include <bcm63xx_board.h>
-+#include <bcm63xx_cpu.h>
-+#include <bcm63xx_regs.h>
-+#include <bcm63xx_io.h>
-+#include <bcm63xx_dev_pci.h>
-+#include <bcm63xx_dev_enet.h>
-+#include <bcm63xx_dev_pcmcia.h>
-+#include <bcm63xx_dev_usb_ohci.h>
-+#include <bcm63xx_dev_usb_ehci.h>
-+#include <board_bcm963xx.h>
-+
-+#define PFX	"board_livebox: "
-+
-+static unsigned int mac_addr_used = 0;
-+static struct board_info board;
-+
-+/*
-+ * known 6348 boards
-+ */
-+#ifdef CONFIG_BCM63XX_CPU_6348
-+static struct board_info __initdata board_livebox = {
-+	.name				= "Livebox",
-+	.expected_cpu_id		= 0x6348,
-+
-+	.has_enet0			= 1,
-+	.has_enet1			= 1,
-+	.has_pci			= 1,
-+
-+	.enet0 = {
-+		.has_phy		= 1,
-+		.use_internal_phy	= 1,
-+	},
-+
-+	.enet1 = {
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
-+	},
-+
-+	.has_ohci0			= 1,
-+	.has_pccard			= 1,
-+	.has_ehci0			= 1,
-+};
-+#endif
-+
-+/*
-+ * all boards
-+ */
-+static const struct board_info __initdata *bcm963xx_boards[] = {
-+#ifdef CONFIG_BCM63XX_CPU_6348
-+	&board_livebox
-+#endif
-+};
-+
-+/*
-+ * early init callback
-+ */
-+void __init board_prom_init(void)
-+{
-+	u32 val;
-+
-+	/* read base address of boot chip select (0) */
-+	val = bcm_mpi_readl(MPI_CSBASE_REG(0));
-+	val &= MPI_CSBASE_BASE_MASK;
-+
-+	/* assume board is a Livebox */
-+	memcpy(&board, bcm963xx_boards[0], sizeof(board));
-+
-+	/* setup pin multiplexing depending on board enabled device,
-+	 * this has to be done this early since PCI init is done
-+	 * inside arch_initcall */
-+	val = 0;
-+
-+	if (board.has_pci) {
-+		bcm63xx_pci_enabled = 1;
-+		if (BCMCPU_IS_6348())
-+			val |= GPIO_MODE_6348_G2_PCI;
-+	}
-+
-+	if (board.has_pccard) {
-+		if (BCMCPU_IS_6348())
-+			val |= GPIO_MODE_6348_G1_MII_PCCARD;
-+	}
-+
-+	if (board.has_enet0 && !board.enet0.use_internal_phy) {
-+		if (BCMCPU_IS_6348())
-+			val |= GPIO_MODE_6348_G3_EXT_MII |
-+				GPIO_MODE_6348_G0_EXT_MII;
-+	}
-+
-+	if (board.has_enet1 && !board.enet1.use_internal_phy) {
-+		if (BCMCPU_IS_6348())
-+			val |= GPIO_MODE_6348_G3_EXT_MII |
-+				GPIO_MODE_6348_G0_EXT_MII;
-+	}
-+
-+	bcm_gpio_writel(val, GPIO_MODE_REG);
-+}
-+
-+/*
-+ * second stage init callback, good time to panic if we couldn't
-+ * identify on which board we're running since early printk is working
-+ */
-+void __init board_setup(void)
-+{
-+	if (!board.name[0])
-+		panic("unable to detect bcm963xx board");
-+	printk(KERN_INFO PFX "board name: %s\n", board.name);
-+
-+	/* make sure we're running on expected cpu */
-+	if (bcm63xx_get_cpu_id() != board.expected_cpu_id)
-+		panic("unexpected CPU for bcm963xx board");
-+}
-+
-+/*
-+ * return board name for /proc/cpuinfo
-+ */
-+const char *board_get_name(void)
-+{
-+	return board.name;
-+}
-+
-+/*
-+ * register & return a new board mac address
-+ */
-+
-+static int board_get_mac_address(u8 *mac)
-+{
-+	u8 default_mac[ETH_ALEN] = {0x00, 0x07, 0x3A, 0x00, 0x00, 0x00};
-+	u8 *p;
-+	int count;
-+
-+	memcpy(mac, default_mac, ETH_ALEN);
-+
-+	p = mac + ETH_ALEN - 1;
-+	count = mac_addr_used;
-+
-+	while (count--) {
-+		do {
-+			(*p)++;
-+			if (*p != 0)
-+				break;
-+			p--;
-+		} while (p != mac);
-+	}
-+
-+	if (p == mac) {
-+		printk(KERN_ERR PFX "unable to fetch mac address\n");
-+		return -ENODEV;
-+	}
-+        mac_addr_used++;
-+
-+	return 0;
-+}
-+
-+static struct resource mtd_resources[] = {
-+	{
-+		.start          = 0,    /* filled at runtime */
-+		.end            = 0,    /* filled at runtime */
-+		.flags          = IORESOURCE_MEM,
-+	}
-+};
-+
-+static struct platform_device mtd_dev = {
-+	.name                   = "bcm963xx-flash",
-+	.resource               = mtd_resources,
-+	.num_resources          = ARRAY_SIZE(mtd_resources),
-+};
-+
-+
-+/*
-+ * third stage init callback, register all board devices.
-+ */
-+int __init board_register_devices(void)
-+{
-+	u32 val;
-+
-+	if (board.has_pccard)
-+		bcm63xx_pcmcia_register();
-+
-+	if (board.has_enet0 &&
-+	    !board_get_mac_address(board.enet0.mac_addr))
-+		bcm63xx_enet_register(0, &board.enet0);
-+
-+	if (board.has_enet1 &&
-+	    !board_get_mac_address(board.enet1.mac_addr))
-+		bcm63xx_enet_register(1, &board.enet1);
-+
-+	if (board.has_ohci0)
-+		bcm63xx_ohci_register();
-+
-+	if (board.has_ehci0)
-+		bcm63xx_ehci_register();
-+
-+
-+	/* read base address of boot chip select (0) */
-+	val = bcm_mpi_readl(MPI_CSBASE_REG(0));
-+	val &= MPI_CSBASE_BASE_MASK;
-+	mtd_resources[0].start = val;
-+	mtd_resources[0].end = 0x1FFFFFFF;
-+
-+	platform_device_register(&mtd_dev);
-+
-+	return 0;
-+}
-+
diff --git a/target/linux/brcm63xx/patches-2.6.33/180-udc_preliminary_support.patch b/target/linux/brcm63xx/patches-2.6.33/180-udc_preliminary_support.patch
deleted file mode 100644
index e0999da41..000000000
--- a/target/linux/brcm63xx/patches-2.6.33/180-udc_preliminary_support.patch
+++ /dev/null
@@ -1,243 +0,0 @@
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -28,6 +28,7 @@
- #include <bcm63xx_dev_pcmcia.h>
- #include <bcm63xx_dev_usb_ohci.h>
- #include <bcm63xx_dev_usb_ehci.h>
-+#include <bcm63xx_dev_usb_udc.h>
- #include <board_bcm963xx.h>
- 
- #define PFX	"board_bcm963xx: "
-@@ -405,6 +406,8 @@ static struct board_info __initdata boar
- 	.has_ohci0			= 1,
- 	.has_pccard			= 1,
- 	.has_ehci0			= 1,
-+
-+	.has_udc0			= 1,
- };
- 
- static struct board_info __initdata board_rta1025w_16 = {
-@@ -948,6 +951,9 @@ int __init board_register_devices(void)
- 	if (board.has_dsp)
- 		bcm63xx_dsp_register(&board.dsp);
- 
-+	if (board.has_udc0)
-+		bcm63xx_udc_register();
-+
- 	/* Generate MAC address for WLAN and
- 	 * register our SPROM */
- #ifdef CONFIG_SSB_PCIHOST
---- /dev/null
-+++ b/arch/mips/bcm63xx/dev-usb-udc.c
-@@ -0,0 +1,58 @@
-+/*
-+ * Copyright (C) 2009	Henk Vergonet <Henk.Vergonet@gmail.com>
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ */
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/platform_device.h>
-+#include <bcm63xx_cpu.h>
-+
-+static struct resource udc_resources[] = {
-+	{
-+		.start		= -1, /* filled at runtime */
-+		.end		= -1, /* filled at runtime */
-+		.flags		= IORESOURCE_MEM,
-+	},
-+	{
-+		.start		= -1, /* filled at runtime */
-+		.flags		= IORESOURCE_IRQ,
-+	},
-+};
-+
-+static u64 udc_dmamask = ~(u32)0;
-+
-+static struct platform_device bcm63xx_udc_device = {
-+	.name		= "bcm63xx-udc",
-+	.id		= 0,
-+	.num_resources	= ARRAY_SIZE(udc_resources),
-+	.resource	= udc_resources,
-+	.dev		= {
-+		.dma_mask		= &udc_dmamask,
-+		.coherent_dma_mask	= 0xffffffff,
-+	},
-+};
-+
-+int __init bcm63xx_udc_register(void)
-+{
-+	if (!BCMCPU_IS_6338() && !BCMCPU_IS_6345() && !BCMCPU_IS_6348())
-+		return 0;
-+
-+	udc_resources[0].start = bcm63xx_regset_address(RSET_UDC0);
-+	udc_resources[0].end = udc_resources[0].start;
-+	udc_resources[0].end += RSET_UDC_SIZE - 1;
-+	udc_resources[1].start = bcm63xx_get_irq_number(IRQ_UDC0);
-+	return platform_device_register(&bcm63xx_udc_device);
-+}
---- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
-@@ -125,7 +125,7 @@ enum bcm63xx_regs_set {
- #define BCM_6338_UART0_BASE		(0xfffe0300)
- #define BCM_6338_GPIO_BASE		(0xfffe0400)
- #define BCM_6338_SPI_BASE		(0xfffe0c00)
--#define BCM_6338_UDC0_BASE		(0xdeadbeef)
-+#define BCM_6338_UDC0_BASE		(0xfffe3000)
- #define BCM_6338_USBDMA_BASE		(0xfffe2400)
- #define BCM_6338_OHCI0_BASE		(0xdeadbeef)
- #define BCM_6338_OHCI_PRIV_BASE		(0xfffe3000)
-@@ -155,7 +155,7 @@ enum bcm63xx_regs_set {
- #define BCM_6345_UART0_BASE		(0xfffe0300)
- #define BCM_6345_GPIO_BASE		(0xfffe0400)
- #define BCM_6345_SPI_BASE		(0xdeadbeef)
--#define BCM_6345_UDC0_BASE		(0xdeadbeef)
-+#define BCM_6345_UDC0_BASE		(0xfffe2100)
- #define BCM_6345_USBDMA_BASE		(0xfffe2800)
- #define BCM_6345_ENET0_BASE		(0xfffe1800)
- #define BCM_6345_ENETDMA_BASE		(0xfffe2800)
-@@ -210,7 +210,7 @@ enum bcm63xx_regs_set {
- #define BCM_6358_UART0_BASE		(0xfffe0100)
- #define BCM_6358_GPIO_BASE		(0xfffe0080)
- #define BCM_6358_SPI_BASE		(0xdeadbeef)
--#define BCM_6358_UDC0_BASE		(0xfffe0800)
-+#define BCM_6358_UDC0_BASE		(0xfffe0400)
- #define BCM_6358_OHCI0_BASE		(0xfffe1400)
- #define BCM_6358_OHCI_PRIV_BASE		(0xdeadbeef)
- #define BCM_6358_USBH_PRIV_BASE		(0xfffe1500)
-@@ -430,6 +430,7 @@ enum bcm63xx_irq {
- 	IRQ_TIMER = 0,
- 	IRQ_UART0,
- 	IRQ_DSL,
-+	IRQ_UDC0,
- 	IRQ_ENET0,
- 	IRQ_ENET1,
- 	IRQ_ENET_PHY,
-@@ -472,7 +473,7 @@ enum bcm63xx_irq {
- #define BCM_6345_UART0_IRQ		(IRQ_INTERNAL_BASE + 2)
- #define BCM_6345_DSL_IRQ		(IRQ_INTERNAL_BASE + 3)
- #define BCM_6345_ATM_IRQ		(IRQ_INTERNAL_BASE + 4)
--#define BCM_6345_USB_IRQ		(IRQ_INTERNAL_BASE + 5)
-+#define BCM_6345_UDC0_IRQ		(IRQ_INTERNAL_BASE + 5)
- #define BCM_6345_ENET0_IRQ		(IRQ_INTERNAL_BASE + 8)
- #define BCM_6345_ENET_PHY_IRQ		(IRQ_INTERNAL_BASE + 12)
- #define BCM_6345_ENET0_RXDMA_IRQ	(IRQ_INTERNAL_BASE + 13 + 1)
-@@ -494,10 +495,17 @@ enum bcm63xx_irq {
- #define BCM_6348_TIMER_IRQ		(IRQ_INTERNAL_BASE + 0)
- #define BCM_6348_UART0_IRQ		(IRQ_INTERNAL_BASE + 2)
- #define BCM_6348_DSL_IRQ		(IRQ_INTERNAL_BASE + 4)
-+#define BCM_6348_UDC0_IRQ		(IRQ_INTERNAL_BASE + 6)
- #define BCM_6348_ENET1_IRQ		(IRQ_INTERNAL_BASE + 7)
- #define BCM_6348_ENET0_IRQ		(IRQ_INTERNAL_BASE + 8)
- #define BCM_6348_ENET_PHY_IRQ		(IRQ_INTERNAL_BASE + 9)
- #define BCM_6348_OHCI0_IRQ		(IRQ_INTERNAL_BASE + 12)
-+#define BCM_6348_USB_CNTL_RX_DMA_IRQ	(IRQ_INTERNAL_BASE + 14)
-+#define BCM_6348_USB_CNTL_TX_DMA_IRQ	(IRQ_INTERNAL_BASE + 15)
-+#define BCM_6348_USB_BULK_RX_DMA_IRQ	(IRQ_INTERNAL_BASE + 16)
-+#define BCM_6348_USB_BULK_TX_DMA_IRQ	(IRQ_INTERNAL_BASE + 17)
-+#define BCM_6348_USB_ISO_RX_DMA_IRQ	(IRQ_INTERNAL_BASE + 18)
-+#define BCM_6348_USB_ISO_TX_DMA_IRQ	(IRQ_INTERNAL_BASE + 19)
- #define BCM_6348_ENET0_RXDMA_IRQ	(IRQ_INTERNAL_BASE + 20)
- #define BCM_6348_ENET0_TXDMA_IRQ	(IRQ_INTERNAL_BASE + 21)
- #define BCM_6348_ENET1_RXDMA_IRQ	(IRQ_INTERNAL_BASE + 22)
---- /dev/null
-+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_udc.h
-@@ -0,0 +1,6 @@
-+#ifndef BCM63XX_DEV_USB_UDC_H_
-+#define BCM63XX_DEV_USB_UDC_H_
-+
-+int bcm63xx_udc_register(void);
-+
-+#endif /* BCM63XX_DEV_USB_UDC_H_ */
---- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-@@ -45,6 +45,7 @@ struct board_info {
- 	unsigned int	has_ohci0:1;
- 	unsigned int	has_ehci0:1;
- 	unsigned int	has_dsp:1;
-+	unsigned int	has_udc0:1;
- 
- 	/* ethernet config */
- 	struct bcm63xx_enet_platform_data enet0;
---- a/arch/mips/bcm63xx/Makefile
-+++ b/arch/mips/bcm63xx/Makefile
-@@ -1,6 +1,6 @@
- obj-y		+= clk.o cpu.o cs.o gpio.o irq.o prom.o setup.o timer.o \
- 		   dev-dsp.o dev-enet.o dev-pcmcia.o dev-uart.o dev-wdt.o \
--		   dev-usb-ohci.o dev-usb-ehci.o
-+		   dev-usb-ohci.o dev-usb-ehci.o dev-usb-udc.o
- obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
- 
- obj-y		+= boards/
---- a/arch/mips/bcm63xx/clk.c
-+++ b/arch/mips/bcm63xx/clk.c
-@@ -141,6 +141,30 @@ static struct clk clk_usbh = {
- };
- 
- /*
-+ * USB slave clock
-+ */
-+static void usbs_set(struct clk *clk, int enable)
-+{
-+	u32 mask;
-+
-+	switch(bcm63xx_get_cpu_id()) {
-+	case BCM6338_CPU_ID:
-+		mask = CKCTL_6338_USBS_EN;
-+		break;
-+	case BCM6348_CPU_ID:
-+		mask = CKCTL_6348_USBS_EN;
-+		break;
-+	default:
-+		return;
-+	}
-+	bcm_hwclock_set(mask, enable);
-+}
-+
-+static struct clk clk_usbs = {
-+	.set    = usbs_set,
-+};
-+
-+/*
-  * SPI clock
-  */
- static void spi_set(struct clk *clk, int enable)
-@@ -208,6 +232,8 @@ struct clk *clk_get(struct device *dev,
- 		return &clk_ephy;
- 	if (!strcmp(id, "usbh"))
- 		return &clk_usbh;
-+	if (!strcmp(id, "usbs"))
-+		return &clk_usbs;
- 	if (!strcmp(id, "spi"))
- 		return &clk_spi;
- 	if (!strcmp(id, "periph"))
---- a/arch/mips/bcm63xx/Kconfig
-+++ b/arch/mips/bcm63xx/Kconfig
-@@ -7,6 +7,7 @@ config BCM63XX_CPU_6338
- 	select USB_ARCH_HAS_OHCI
- 	select USB_OHCI_BIG_ENDIAN_DESC
- 	select USB_OHCI_BIG_ENDIAN_MMIO
-+	select USB_ARCH_HAS_UDC
- 
- config BCM63XX_CPU_6345
- 	bool "support 6345 CPU"
-@@ -19,6 +20,7 @@ config BCM63XX_CPU_6348
- 	select USB_ARCH_HAS_OHCI
- 	select USB_OHCI_BIG_ENDIAN_DESC
- 	select USB_OHCI_BIG_ENDIAN_MMIO
-+	select USB_ARCH_HAS_UDC
- 
- config BCM63XX_CPU_6358
- 	bool "support 6358 CPU"
diff --git a/target/linux/brcm63xx/patches-2.6.33/190-typo_cpu_features_override.patch b/target/linux/brcm63xx/patches-2.6.33/190-typo_cpu_features_override.patch
deleted file mode 100644
index cf5e6111f..000000000
--- a/target/linux/brcm63xx/patches-2.6.33/190-typo_cpu_features_override.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fix typo: CONFIG_BCMCPU_IS_63xx does not exists,
-CONFIG_BCM63XX_CPU_63xx is the valid config option.
-
-Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
----
- .../asm/mach-bcm63xx/cpu-feature-overrides.h       |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
---- a/arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h
-@@ -24,7 +24,7 @@
- #define cpu_has_smartmips		0
- #define cpu_has_vtag_icache		0
- 
--#if !defined(BCMCPU_RUNTIME_DETECT) && (defined(CONFIG_BCMCPU_IS_6348) || defined(CONFIG_CPU_IS_6338) || defined(CONFIG_CPU_IS_BCM6345))
-+#if !defined(BCMCPU_RUNTIME_DETECT) && (defined(CONFIG_BCM63XX_CPU_6348) || defined(CONFIG_BCM63XX_CPU_6345) || defined(CONFIG_BCM63XX_CPU_6338))
- #define cpu_has_dc_aliases		0
- #endif
- 
diff --git a/target/linux/brcm63xx/patches-2.6.33/210-init_gpio_out_low_high_current_value_at_boot.patch b/target/linux/brcm63xx/patches-2.6.33/210-init_gpio_out_low_high_current_value_at_boot.patch
deleted file mode 100644
index 902840b39..000000000
--- a/target/linux/brcm63xx/patches-2.6.33/210-init_gpio_out_low_high_current_value_at_boot.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-To avoid glitch during gpio initialisation, fetch gpio output
-registers values left by bootloader.
-
-Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
----
- arch/mips/bcm63xx/gpio.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
---- a/arch/mips/bcm63xx/gpio.c
-+++ b/arch/mips/bcm63xx/gpio.c
-@@ -125,6 +125,8 @@ static struct gpio_chip bcm63xx_gpio_chi
- 
- int __init bcm63xx_gpio_init(void)
- {
-+	gpio_out_low = bcm_gpio_readl(GPIO_DATA_LO_REG);
-+	gpio_out_high = bcm_gpio_readl(GPIO_DATA_HI_REG);
- 	bcm63xx_gpio_chip.ngpio = bcm63xx_gpio_count();
- 	pr_info("registering %d GPIOs\n", bcm63xx_gpio_chip.ngpio);
- 
diff --git a/target/linux/brcm63xx/patches-2.6.33/220-board-D4PW.patch b/target/linux/brcm63xx/patches-2.6.33/220-board-D4PW.patch
deleted file mode 100644
index 528b6fdb8..000000000
--- a/target/linux/brcm63xx/patches-2.6.33/220-board-D4PW.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -467,6 +467,49 @@
- 
- 	.has_ohci0 = 1,
- };
-+
-+static struct board_info __initdata board_96348_D4PW = {
-+	.name				= "D-4P-W",
-+	.expected_cpu_id		= 0x6348,
-+
-+	.has_enet0			= 1,
-+	.has_enet1			= 1,
-+	.has_pci			= 1,
-+
-+	.enet0 = {
-+		.has_phy		= 1,
-+		.use_internal_phy	= 1,
-+	},
-+	.enet1 = {
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
-+	},
-+
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
-+
-+	.leds = {
-+		{
-+			.name		= "ppp",
-+			.gpio		= 4,
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "ppp-fail",
-+			.gpio		= 5,
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "power",
-+			.gpio		= 0,
-+			.active_low	= 1,
-+			.default_trigger = "default-on",
-+
-+		},
-+	},
-+
-+};
-+
- #endif
- 
- /*
-@@ -692,6 +735,7 @@
- 	&board_DV201AMR,
- 	&board_96348gw_a,
- 	&board_rta1025w_16,
-+	&board_96348_D4PW,
- #endif
- 
- #ifdef CONFIG_BCM63XX_CPU_6358
diff --git a/target/linux/cobalt/config-2.6.32 b/target/linux/cobalt/config-2.6.32
index b561ce468..6ebd2ee09 100644
--- a/target/linux/cobalt/config-2.6.32
+++ b/target/linux/cobalt/config-2.6.32
@@ -131,7 +131,6 @@ CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_CPU_NEVADA=y
 CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
-CONFIG_CRC16=y
 CONFIG_CSRC_R4K=y
 CONFIG_CSRC_R4K_LIB=y
 CONFIG_DE2104X=y
diff --git a/target/linux/coldfire/Makefile b/target/linux/coldfire/Makefile
deleted file mode 100644
index b9f96422a..000000000
--- a/target/linux/coldfire/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2009 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-ARCH:=m68k
-BOARD:=coldfire
-BOARDNAME:=Freescale Coldfire v4e
-FEATURES:=squashfs broken
-
-LINUX_VERSION:=2.6.25.20
-
-include $(INCLUDE_DIR)/target.mk
-
-define Target/Description
-	Build firmware images for ColdFire v4e boards
-endef
-
-$(eval $(call BuildTarget))
diff --git a/target/linux/coldfire/config-default b/target/linux/coldfire/config-default
deleted file mode 100644
index 245cd1cba..000000000
--- a/target/linux/coldfire/config-default
+++ /dev/null
@@ -1,98 +0,0 @@
-# CONFIG_8139TOO is not set
-CONFIG_ADVANCED=y
-# CONFIG_AMIGA is not set
-# CONFIG_APOLLO is not set
-# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_ARCH_SUPPORTS_AOUT=y
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-# CONFIG_ATARI is not set
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BITREVERSE=y
-# CONFIG_BOOTPARAM is not set
-CONFIG_BOUNCE=y
-CONFIG_CFV4E=y
-CONFIG_CLASSIC_RCU=y
-# CONFIG_COLDFIRE_EDMA is not set
-# CONFIG_COLDFIRE_WATCHDOG is not set
-CONFIG_COLDFIRE=y
-CONFIG_FEC_548x_AUTO_NEGOTIATION=y
-CONFIG_FEC_548x_ENABLE_FEC2=y
-CONFIG_FEC_548x=y
-# CONFIG_GENERIC_CLOCKEVENTS is not set
-CONFIG_GENERIC_IOMAP=y
-# CONFIG_GENERIC_TIME is not set
-# CONFIG_GEN_RTC is not set
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAVE_IDE=y
-# CONFIG_HAVE_KPROBES is not set
-# CONFIG_HAVE_KRETPROBES is not set
-# CONFIG_HAVE_OPROFILE is not set
-# CONFIG_HP300 is not set
-CONFIG_HW_RANDOM=y
-# CONFIG_IDE is not set
-CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_LEDS_ALIX is not set
-# CONFIG_M5445X is not set
-# CONFIG_M5475AFE is not set
-# CONFIG_M5475BFE is not set
-# CONFIG_M5475CFE is not set
-# CONFIG_M5475DFE is not set
-# CONFIG_M5475EFE is not set
-# CONFIG_M5475FFE is not set
-CONFIG_M547X_8X=y
-# CONFIG_M547X is not set
-# CONFIG_M5485AFE is not set
-# CONFIG_M5485BFE is not set
-CONFIG_M5485CFE=y
-# CONFIG_M5485DFE is not set
-# CONFIG_M5485EFE is not set
-# CONFIG_M5485FFE is not set
-CONFIG_M548X=y
-# CONFIG_M68020 is not set
-# CONFIG_M68030 is not set
-# CONFIG_M68040 is not set
-# CONFIG_M68060 is not set
-# CONFIG_M68KFPU_EMU is not set
-CONFIG_M68K=y
-# CONFIG_MAC is not set
-CONFIG_MCD_DMA=y
-CONFIG_MCFCLK=200000000
-CONFIG_MCF_USER_HALT=y
-# CONFIG_MEMSTICK is not set
-CONFIG_MMU_CFV4E=y
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-# CONFIG_MTD_CFI_GEOMETRY is not set
-# CONFIG_NE2K_PCI is not set
-CONFIG_NEED_MULTIPLE_NODES=y
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_NO_DMA is not set
-# CONFIG_NO_IOPORT is not set
-CONFIG_NOR_FLASH_BASE=0xE0000000
-CONFIG_PCI_LEGACY=y
-# CONFIG_PCIPCWATCHDOG is not set
-# CONFIG_PROC_HARDWARE is not set
-# CONFIG_Q40 is not set
-# CONFIG_R6040 is not set
-# CONFIG_RMW_INSNS is not set
-# CONFIG_SCSI_DMA is not set
-CONFIG_SDRAM_BASE=0x00000000
-CONFIG_SDRAM_SIZE=0x04000000
-# CONFIG_SERIAL_8250 is not set
-# CONFIG_SERIAL_COLDFIRE_IRDA is not set
-CONFIG_SERIAL_COLDFIRE=y
-# CONFIG_SERIAL_CONSOLE is not set
-# CONFIG_SERIAL_MCF is not set
-CONFIG_SINGLE_MEMORY_CHUNK=y
-CONFIG_SLABINFO=y
-# CONFIG_SUN3 is not set
-# CONFIG_SUN3X is not set
-CONFIG_TIME_LOW_RES=y
-CONFIG_UID16=y
-# CONFIG_VGASTATE is not set
-# CONFIG_VIA_RHINE is not set
-# CONFIG_VME is not set
diff --git a/target/linux/coldfire/image/Makefile b/target/linux/coldfire/image/Makefile
deleted file mode 100644
index 94e28b2cb..000000000
--- a/target/linux/coldfire/image/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright (C) 2009-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/image.mk
-
-JFFS2_BLOCKSIZE=128k
-
-define Image/Prepare
-endef
-
-define Image/BuildKernel
-	$(TARGET_CROSS)objcopy -O binary -R .bss -R .note -R .comment \
-		-R .note.gnu.build-id -S $(LINUX_DIR)/vmlinux $(KDIR)/vmlinux.bin
-	mkimage -A m68k -O linux -T kernel -a 0x00020000 -e 0x00020000 \
-		-C none -n 'M68K OpenWrt Linux-$(LINUX_VERSION)' \
-		-d $(KDIR)/vmlinux.bin $(BIN_DIR)/$(IMG_PREFIX)-uImage
-endef
-
-define Image/Build
-	$(call Image/Build/$(1),$(1))
-endef
-
-define Image/Build/jffs2-128k
-endef
-
-define Image/Build/squashfs
-	$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
-endef
-
-$(eval $(call BuildImage))
diff --git a/target/linux/coldfire/patches/001-mcfv4e_checkfiles_script.patch b/target/linux/coldfire/patches/001-mcfv4e_checkfiles_script.patch
deleted file mode 100644
index 16b85368a..000000000
--- a/target/linux/coldfire/patches/001-mcfv4e_checkfiles_script.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From d54d785a28afb65811c5d5ad727c57233deb6f60 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Wed, 31 Oct 2007 16:36:51 -0600
-Subject: [PATCH] Scripts to allow running files through checkpatch.pl
-
-Scripts based on scripts/checkfiles that are in various trees.
-
-These should not be sent up because there are already patches from
-the original script author.
-
-LTIBName: mcfv4e-checkfiles-script
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- scripts/checkfiles      |   35 +++++++++++++++++++++++++++++++++++
- scripts/checkfilesterse |   34 ++++++++++++++++++++++++++++++++++
- 2 files changed, 69 insertions(+), 0 deletions(-)
- create mode 100755 scripts/checkfiles
- create mode 100755 scripts/checkfilesterse
-
---- /dev/null
-+++ b/scripts/checkfiles
-@@ -0,0 +1,35 @@
-+#!/bin/sh
-+# (c) 2007, Erez Zadok <ezk@cs.sunysb.edu> (initial version)
-+# Licensed under the terms of the GNU GPL License version 2
-+#
-+# Check source files for compliance with coding standards, using terse
-+# output in the style that g/cc produces.  This output can be easily parsed
-+# within text editors (e.g., emacs/vim) which can produce a split text
-+# screen showing in one screen the error message, and in another screen the
-+# corresponding source file, with the cursor placed on the offending line.
-+# See for example the documentation for Emacs's "next-error" command, often
-+# bound to M-x ` (ESC x back-tick).
-+
-+# Usage: checkfiles file [files...]
-+#        if "file" is a directory, will check all *.[hc] files recursively
-+
-+# check usage
-+usage() {
-+	echo "Usage: checkfiles file [files...]"
-+	echo "(if \"file\" is a directory, check recursively for all C sources/headers)"
-+	exit 1
-+}
-+
-+# if test -z "$@" ; then
-+# 	usage
-+# fi
-+if ! test -f scripts/checkpatch.pl ; then
-+	echo "checkfiles: must run from top level source tree"
-+	exit 1
-+fi
-+
-+# check coding-style compliance of each source file found
-+find "$@" -type f -name '*.[hc]' | \
-+while read f ; do
-+	diff -u /dev/null $f | perl scripts/checkpatch.pl -
-+done
---- /dev/null
-+++ b/scripts/checkfilesterse
-@@ -0,0 +1,34 @@
-+#!/bin/sh
-+# (c) 2007, Erez Zadok <ezk@cs.sunysb.edu> (initial version)
-+# Licensed under the terms of the GNU GPL License version 2
-+#
-+# Check source files for compliance with coding standards, using terse
-+# output in the style that g/cc produces.  This output can be easily parsed
-+# within text editors (e.g., emacs/vim) which can produce a split text
-+# screen showing in one screen the error message, and in another screen the
-+# corresponding source file, with the cursor placed on the offending line.
-+# See for example the documentation for Emacs's "next-error" command, often
-+# bound to M-x ` (ESC x back-tick).
-+
-+# Usage: checkfiles file [files...]
-+#        if "file" is a directory, will check all *.[hc] files recursively
-+
-+# check usage
-+usage() {
-+	echo "Usage: checkfiles file [files...]"
-+	echo "(if \"file\" is a directory, check recursively for all C sources/headers)"
-+	exit 1
-+}
-+if test -z "" ; then
-+	usage
-+fi
-+if ! test -f scripts/checkpatch.pl ; then
-+	echo "checkfiles: must run from top level source tree"
-+	exit 1
-+fi
-+
-+# check coding-style compliance of each source file found, using terse output
-+find "$@" -type f -name '*.[hc]' | \
-+while read f ; do
-+	diff -u /dev/null $f | perl scripts/checkpatch.pl -t -
-+done
diff --git a/target/linux/coldfire/patches/002-mcfv4e_coldfire_headers.patch b/target/linux/coldfire/patches/002-mcfv4e_coldfire_headers.patch
deleted file mode 100644
index a31b28817..000000000
--- a/target/linux/coldfire/patches/002-mcfv4e_coldfire_headers.patch
+++ /dev/null
@@ -1,1646 +0,0 @@
-From 127797e5cf8a036825007586b914b75897aba554 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Wed, 31 Oct 2007 16:39:31 -0600
-Subject: [PATCH] Add Coldfire Support into existing headers.
-
-Modifications to the various M68k header files to add
-Coldfire processor support.
-
-LTIBName: mcfv4e-coldfire-headers
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- include/asm-m68k/atomic.h      |   23 ++-
- include/asm-m68k/bitops.h      |  426 ++++++++++++++++++++++++++++++++++++++++
- include/asm-m68k/bootinfo.h    |   13 ++
- include/asm-m68k/byteorder.h   |   12 +-
- include/asm-m68k/cacheflush.h  |    4 +
- include/asm-m68k/checksum.h    |   10 +
- include/asm-m68k/delay.h       |   26 +++
- include/asm-m68k/div64.h       |    4 +
- include/asm-m68k/elf.h         |    2 +-
- include/asm-m68k/fpu.h         |    2 +
- include/asm-m68k/io.h          |   26 +++-
- include/asm-m68k/irq.h         |    5 +-
- include/asm-m68k/machdep.h     |    7 +
- include/asm-m68k/mmu_context.h |   84 ++++++++-
- include/asm-m68k/page.h        |   20 ++-
- include/asm-m68k/page_offset.h |    7 +-
- include/asm-m68k/pci.h         |   99 ++++++----
- include/asm-m68k/pgalloc.h     |    4 +-
- include/asm-m68k/pgtable.h     |   15 ++
- include/asm-m68k/processor.h   |   46 ++++-
- include/asm-m68k/ptrace.h      |   11 +
- include/asm-m68k/raw_io.h      |   58 ++++++
- include/asm-m68k/segment.h     |   10 +
- include/asm-m68k/setup.h       |   27 +++
- include/asm-m68k/signal.h      |    5 +
- include/asm-m68k/string.h      |    2 +
- include/asm-m68k/system.h      |   17 ++-
- include/asm-m68k/thread_info.h |    1 +
- include/asm-m68k/tlbflush.h    |   16 ++-
- include/asm-m68k/uaccess.h     |    4 +
- 30 files changed, 925 insertions(+), 61 deletions(-)
-
---- a/include/asm-m68k/atomic.h
-+++ b/include/asm-m68k/atomic.h
-@@ -2,7 +2,7 @@
- #define __ARCH_M68K_ATOMIC__
- 
- 
--#include <asm/system.h>
-+#include <asm/system.h>	/* local_irq_XXX() */
- 
- /*
-  * Atomic operations that C can't guarantee us.  Useful for
-@@ -21,12 +21,20 @@ typedef struct { int counter; } atomic_t
- 
- static inline void atomic_add(int i, atomic_t *v)
- {
-+#ifndef CONFIG_COLDFIRE
- 	__asm__ __volatile__("addl %1,%0" : "+m" (*v) : "id" (i));
-+#else
-+	__asm__ __volatile__("addl %1,%0" : "=m" (*v) : "d" (i), "m" (*v));
-+#endif
- }
- 
- static inline void atomic_sub(int i, atomic_t *v)
- {
-+#ifndef CONFIG_COLDFIRE
- 	__asm__ __volatile__("subl %1,%0" : "+m" (*v) : "id" (i));
-+#else
-+	__asm__ __volatile__("subl %1,%0" : "=m" (*v) : "d" (i), "m" (*v));
-+#endif
- }
- 
- static inline void atomic_inc(atomic_t *v)
-@@ -46,6 +54,14 @@ static inline int atomic_dec_and_test(at
- 	return c != 0;
- }
- 
-+static __inline__ int atomic_dec_and_test_lt(volatile atomic_t *v)
-+{
-+	char c;
-+	__asm__ __volatile__("subql #1,%1; slt %0" : "=d" (c), "=m" (*v)
-+			     : "m" (*v));
-+	return c != 0 ;
-+}
-+
- static inline int atomic_inc_and_test(atomic_t *v)
- {
- 	char c;
-@@ -156,7 +172,12 @@ static inline int atomic_sub_and_test(in
- static inline int atomic_add_negative(int i, atomic_t *v)
- {
- 	char c;
-+#ifndef CONFIG_COLDFIRE
- 	__asm__ __volatile__("addl %2,%1; smi %0" : "=d" (c), "+m" (*v): "g" (i));
-+#else
-+	 __asm__ __volatile__("addl %2,%1; smi %0" : "=d" (c), "=m" (*v)
-+			      : "d" (i) , "m" (*v));
-+#endif
- 	return c != 0;
- }
- 
---- a/include/asm-m68k/bitops.h
-+++ b/include/asm-m68k/bitops.h
-@@ -19,6 +19,7 @@
-  *
-  * They use the standard big-endian m680x0 bit ordering.
-  */
-+#ifndef CONFIG_COLDFIRE
- 
- #define test_and_set_bit(nr,vaddr) \
-   (__builtin_constant_p(nr) ? \
-@@ -457,4 +458,429 @@ static inline int ext2_find_next_bit(con
- 
- #endif /* __KERNEL__ */
- 
-+#else /* CONFIG_COLDFIRE */
-+
-+#define test_and_set_bit(nr,vaddr)			\
-+  (__builtin_constant_p(nr) ?				\
-+   __constant_coldfire_test_and_set_bit(nr, vaddr) :	\
-+   __generic_coldfire_test_and_set_bit(nr, vaddr))
-+
-+
-+static __inline__ int __constant_coldfire_test_and_set_bit(int nr,
-+	volatile void *vaddr)
-+{
-+	char retval;
-+	volatile char *p = &((volatile char *)vaddr)[(nr^31) >> 3];
-+
-+	__asm__ __volatile__ ("bset %2,%1; sne %0"
-+	     : "=d" (retval), "+QUd" (*p)
-+	     : "di" (nr & 7));
-+	return retval;
-+}
-+
-+static __inline__ int __generic_coldfire_test_and_set_bit(int nr,
-+	volatile void *vaddr)
-+{
-+	char retval;
-+
-+	__asm__ __volatile__ ("bset %2,%1; sne %0"
-+	     : "=d" (retval), "=m" (((volatile char *)vaddr)[(nr^31) >> 3])
-+	     : "d" (nr)
-+	     : "memory");
-+	return retval;
-+}
-+#define __test_and_set_bit(nr, vaddr) test_and_set_bit(nr, vaddr)
-+
-+#define set_bit(nr,vaddr)			\
-+  (__builtin_constant_p(nr) ?			\
-+   __constant_coldfire_set_bit(nr, vaddr) :	\
-+   __generic_coldfire_set_bit(nr, vaddr))
-+
-+static __inline__ void __constant_coldfire_set_bit(int nr,
-+	volatile void *vaddr)
-+{
-+	volatile char *p = &((volatile char *)vaddr)[(nr^31) >> 3];
-+	__asm__ __volatile__ ("bset %1,%0"
-+	     : "+QUd" (*p) : "di" (nr & 7));
-+}
-+
-+static __inline__ void __generic_coldfire_set_bit(int nr, volatile void *vaddr)
-+{
-+	__asm__ __volatile__ ("bset %1,%0"
-+	     : "=m" (((volatile char *)vaddr)[(nr^31) >> 3])
-+	     : "d" (nr)
-+	     : "memory");
-+}
-+#define __set_bit(nr, vaddr) set_bit(nr, vaddr)
-+
-+#define test_and_clear_bit(nr, vaddr)			\
-+  (__builtin_constant_p(nr) ?				\
-+   __constant_coldfire_test_and_clear_bit(nr, vaddr) :	\
-+   __generic_coldfire_test_and_clear_bit(nr, vaddr))
-+
-+static __inline__ int __constant_coldfire_test_and_clear_bit(int nr,
-+	volatile void *vaddr)
-+{
-+	char retval;
-+	volatile char *p = &((volatile char *)vaddr)[(nr^31) >> 3];
-+
-+	__asm__ __volatile__ ("bclr %2,%1; sne %0"
-+	     : "=d" (retval), "+QUd" (*p)
-+	     : "id" (nr & 7));
-+
-+	return retval;
-+}
-+
-+static __inline__ int __generic_coldfire_test_and_clear_bit(int nr,
-+	volatile void *vaddr)
-+{
-+	char retval;
-+
-+	__asm__ __volatile__ ("bclr %2,%1; sne %0"
-+	     : "=d" (retval), "=m" (((volatile char *)vaddr)[(nr^31) >> 3])
-+	     : "d" (nr & 7)
-+	     : "memory");
-+
-+	return retval;
-+}
-+#define __test_and_clear_bit(nr, vaddr) test_and_clear_bit(nr, vaddr)
-+
-+/*
-+ * clear_bit() doesn't provide any barrier for the compiler.
-+ */
-+#define smp_mb__before_clear_bit()	barrier()
-+#define smp_mb__after_clear_bit()	barrier()
-+
-+#define clear_bit(nr,vaddr)			\
-+  (__builtin_constant_p(nr) ?			\
-+   __constant_coldfire_clear_bit(nr, vaddr) :	\
-+   __generic_coldfire_clear_bit(nr, vaddr))
-+
-+static __inline__ void __constant_coldfire_clear_bit(int nr,
-+	volatile void *vaddr)
-+{
-+	volatile char *p = &((volatile char *)vaddr)[(nr^31) >> 3];
-+	__asm__ __volatile__ ("bclr %1,%0"
-+	     : "+QUd" (*p) : "id" (nr & 7));
-+}
-+
-+static __inline__ void __generic_coldfire_clear_bit(int nr,
-+	volatile void *vaddr)
-+{
-+	__asm__ __volatile__ ("bclr %1,%0"
-+	     : "=m" (((volatile char *)vaddr)[(nr^31) >> 3])
-+	     : "d" (nr)
-+	     : "memory");
-+}
-+#define __clear_bit(nr, vaddr) clear_bit(nr, vaddr)
-+
-+#define test_and_change_bit(nr, vaddr)			\
-+  (__builtin_constant_p(nr) ?				\
-+   __constant_coldfire_test_and_change_bit(nr, vaddr) :	\
-+   __generic_coldfire_test_and_change_bit(nr, vaddr))
-+
-+static __inline__ int __constant_coldfire_test_and_change_bit(int nr,
-+	volatile void *vaddr)
-+{
-+	char retval;
-+	volatile char *p = &((volatile char *)vaddr)[(nr^31) >> 3];
-+
-+	__asm__ __volatile__ ("bchg %2,%1; sne %0"
-+	     : "=d" (retval), "+QUd" (*p)
-+	     : "id" (nr & 7));
-+
-+	return retval;
-+}
-+
-+static __inline__ int __generic_coldfire_test_and_change_bit(int nr,
-+	volatile void *vaddr)
-+{
-+	char retval;
-+
-+	__asm__ __volatile__ ("bchg %2,%1; sne %0"
-+	     : "=d" (retval), "=m" (((volatile char *)vaddr)[(nr^31) >> 3])
-+	     : "id" (nr)
-+	     : "memory");
-+
-+	return retval;
-+}
-+#define __test_and_change_bit(nr, vaddr) test_and_change_bit(nr, vaddr)
-+#define __change_bit(nr, vaddr) change_bit(nr, vaddr)
-+
-+#define change_bit(nr,vaddr)			\
-+  (__builtin_constant_p(nr) ?			\
-+   __constant_coldfire_change_bit(nr, vaddr) :	\
-+   __generic_coldfire_change_bit(nr, vaddr))
-+
-+static __inline__ void __constant_coldfire_change_bit(int nr,
-+	volatile void *vaddr)
-+{
-+	volatile char *p = &((volatile char *)vaddr)[(nr^31) >> 3];
-+	__asm__ __volatile__ ("bchg %1,%0"
-+	     : "+QUd" (*p) : "id" (nr & 7));
-+}
-+
-+static __inline__ void __generic_coldfire_change_bit(int nr,
-+	volatile void *vaddr)
-+{
-+	__asm__ __volatile__ ("bchg %1,%0"
-+	     : "=m" (((volatile char *)vaddr)[(nr^31) >> 3])
-+	     : "d" (nr)
-+	     : "memory");
-+}
-+
-+static inline int test_bit(int nr, const unsigned long *vaddr)
-+{
-+	return (vaddr[nr >> 5] & (1UL << (nr & 31))) != 0;
-+}
-+
-+static __inline__ unsigned long ffz(unsigned long word)
-+{
-+	unsigned long result = 0;
-+
-+	while (word & 1) {
-+		result++;
-+		word >>= 1;
-+	}
-+	return result;
-+}
-+
-+/* find_next_zero_bit() finds the first zero bit in a bit string of length
-+ * 'size' bits, starting the search at bit 'offset'.  This is largely based
-+ * on Linus's ALPHA routines.
-+ */
-+static __inline__ unsigned long find_next_zero_bit(void *addr,
-+	unsigned long size, unsigned long offset)
-+{
-+	unsigned long *p = ((unsigned long *) addr) + (offset >> 5);
-+	unsigned long result = offset & ~31UL;
-+	unsigned long tmp;
-+
-+	if (offset >= size)
-+		return size;
-+	size -= result;
-+	offset &= 31UL;
-+	if (offset) {
-+		tmp = *(p++);
-+		tmp |= ~0UL >> (32-offset);
-+		if (size < 32)
-+			goto found_first;
-+		if (~tmp)
-+			goto found_middle;
-+		size -= 32;
-+		result += 32;
-+	}
-+	while (size & ~31UL) {
-+		tmp = *(p++);
-+		if (~tmp)
-+			goto found_middle;
-+		result += 32;
-+		size -= 32;
-+	}
-+	if (!size)
-+		return result;
-+	tmp = *p;
-+
-+found_first:
-+	tmp |= ~0UL >> size;
-+found_middle:
-+	return result + ffz(tmp);
-+}
-+
-+#define find_first_zero_bit(addr, size) find_next_zero_bit(((void *)addr), \
-+		(size), 0)
-+
-+/* Ported from included/linux/bitops.h  */
-+static __inline__ int ffs(int x)
-+{
-+	int r = 1;
-+
-+	if (!x)
-+		return 0;
-+	if (!(x & 0xffff)) {
-+		x >>= 16;
-+		r += 16;
-+	}
-+	if (!(x & 0xff)) {
-+		x >>= 8;
-+		r += 8;
-+	}
-+	if (!(x & 0xf)) {
-+		x >>= 4;
-+		r += 4;
-+	}
-+	if (!(x & 3)) {
-+		x >>= 2;
-+		r += 2;
-+	}
-+	if (!(x & 1)) {
-+		x >>= 1;
-+		r += 1;
-+	}
-+	return r;
-+}
-+#define __ffs(x) (ffs(x) - 1)
-+
-+/* find_next_bit - find the next set bit in a memory region
-+ * (from asm-ppc/bitops.h)
-+ */
-+static __inline__ unsigned long find_next_bit(const unsigned long *addr,
-+	unsigned long size, unsigned long offset)
-+{
-+	unsigned int *p = ((unsigned int *) addr) + (offset >> 5);
-+	unsigned int result = offset & ~31UL;
-+	unsigned int tmp;
-+
-+	if (offset >= size)
-+		return size;
-+	size -= result;
-+	offset &= 31UL;
-+	if (offset) {
-+		tmp = *p++;
-+		tmp &= ~0UL << offset;
-+		if (size < 32)
-+			goto found_first;
-+		if (tmp)
-+			goto found_middle;
-+		size -= 32;
-+		result += 32;
-+	}
-+	while (size >= 32) {
-+		tmp = *p++;
-+		if (tmp != 0)
-+			goto found_middle;
-+		result += 32;
-+		size -= 32;
-+	}
-+	if (!size)
-+		return result;
-+	tmp = *p;
-+
-+found_first:
-+	tmp &= ~0UL >> (32 - size);
-+	if (tmp == 0UL)        /* Are any bits set? */
-+		return result + size; /* Nope. */
-+found_middle:
-+	return result + __ffs(tmp);
-+}
-+
-+#define find_first_bit(addr, size) find_next_bit((addr), (size), 0)
-+
-+#ifdef __KERNEL__
-+
-+/* Ported from include/linux/bitops.h */
-+static  __inline__ int fls(int x)
-+{
-+	int r = 32;
-+
-+	if (!x)
-+		return 0;
-+	if (!(x & 0xffff0000u)) {
-+		x <<= 16;
-+		r -= 16;
-+	}
-+	if (!(x & 0xff000000u)) {
-+		x <<= 8;
-+		r -= 8;
-+	}
-+	if (!(x & 0xf0000000u)) {
-+		x <<= 4;
-+		r -= 4;
-+	}
-+	if (!(x & 0xc0000000u)) {
-+		x <<= 2;
-+		r -= 2;
-+	}
-+	if (!(x & 0x80000000u)) {
-+		x <<= 1;
-+		r -= 1;
-+	}
-+	return r;
-+}
-+
-+#include <asm-generic/bitops/fls64.h>
-+#include <asm-generic/bitops/sched.h>
-+#include <asm-generic/bitops/hweight.h>
-+
-+#define minix_find_first_zero_bit(addr, size)	find_next_zero_bit((addr), \
-+							(size), 0)
-+#define minix_test_and_set_bit(nr, addr)	test_and_set_bit((nr), \
-+							(unsigned long *)(addr))
-+#define minix_set_bit(nr, addr)			set_bit((nr), \
-+							(unsigned long *)(addr))
-+#define minix_test_and_clear_bit(nr, addr)	test_and_clear_bit((nr), \
-+							(unsigned long *)(addr))
-+
-+static inline int minix_test_bit(int nr, const volatile unsigned long *vaddr)
-+{
-+	int 	*a = (int *)vaddr;
-+	int	mask;
-+
-+	a += nr >> 5;
-+	mask = 1 << (nr & 0x1f);
-+	return ((mask & *a) != 0);
-+}
-+
-+#define ext2_set_bit(nr, addr)			test_and_set_bit((nr) ^ 24, \
-+							(unsigned long *)(addr))
-+#define ext2_set_bit_atomic(lock, nr, addr)	test_and_set_bit((nr) ^ 24, \
-+							(unsigned long *)(addr))
-+#define ext2_clear_bit(nr, addr)		test_and_clear_bit((nr) ^ 24, \
-+							(unsigned long *)(addr))
-+#define ext2_clear_bit_atomic(lock, nr, addr)	test_and_clear_bit((nr) ^ 24, \
-+							(unsigned long *)(addr))
-+
-+static inline int ext2_test_bit(int nr, const void *vaddr)
-+{
-+	const unsigned char *p = vaddr;
-+	return (p[nr >> 3] & (1U << (nr & 7))) != 0;
-+}
-+
-+static inline int ext2_find_first_zero_bit(const void *vaddr, unsigned size)
-+{
-+	const unsigned long *p = vaddr, *addr = vaddr;
-+	int res;
-+
-+	if (!size)
-+		return 0;
-+
-+	size = (size >> 5) + ((size & 31) > 0);
-+	while (*p++ == ~0UL) {
-+		if (--size == 0)
-+			return (p - addr) << 5;
-+	}
-+
-+	--p;
-+	for (res = 0; res < 32; res++)
-+		if (!ext2_test_bit (res, p))
-+			break;
-+	return (p - addr) * 32 + res;
-+}
-+
-+static inline int ext2_find_next_zero_bit(const void *vaddr, unsigned size,
-+					  unsigned offset)
-+{
-+	const unsigned long *addr = vaddr;
-+	const unsigned long *p = addr + (offset >> 5);
-+	int bit = offset & 31UL, res;
-+
-+	if (offset >= size)
-+		return size;
-+
-+	if (bit) {
-+		/* Look for zero in first longword */
-+		for (res = bit; res < 32; res++)
-+			if (!ext2_test_bit (res, p))
-+				return (p - addr) * 32 + res;
-+		p++;
-+	}
-+	/* No zero yet, search remaining full bytes for a zero */
-+	res = ext2_find_first_zero_bit(p, size - 32 * (p - addr));
-+	return (p - addr) * 32 + res;
-+}
-+
-+#endif /* KERNEL */
-+
-+#endif /* CONFIG_COLDFIRE */
-+
- #endif /* _M68K_BITOPS_H */
---- a/include/asm-m68k/bootinfo.h
-+++ b/include/asm-m68k/bootinfo.h
-@@ -49,6 +49,19 @@ struct bi_record {
- #endif /* __ASSEMBLY__ */
- 
- 
-+#ifndef __ASSEMBLY__
-+
-+struct uboot_record {
-+    unsigned long bd_info;
-+    unsigned long initrd_start;
-+    unsigned long initrd_end;
-+    unsigned long cmd_line_start;
-+    unsigned long cmd_line_stop;
-+};
-+
-+#endif /* __ASSEMBLY__ */
-+
-+
-     /*
-      *  Tag Definitions
-      *
---- a/include/asm-m68k/byteorder.h
-+++ b/include/asm-m68k/byteorder.h
-@@ -4,8 +4,15 @@
- #include <asm/types.h>
- #include <linux/compiler.h>
- 
--#ifdef __GNUC__
--
-+#if defined(__GNUC__)
-+#if defined(__mcfisaaplus__) || defined(__mcfisac__)
-+static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 val)
-+{
-+	__asm__ ("byterev %0" : "=d" (val) : "0" (val));
-+	return val;
-+}
-+#define __arch__swab32(x) ___arch__swab32(x)
-+#elif !defined(__mcoldfire__)
- static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 val)
- {
- 	__asm__("rolw #8,%0; swap %0; rolw #8,%0" : "=d" (val) : "0" (val));
-@@ -14,6 +21,7 @@ static __inline__ __attribute_const__ __
- #define __arch__swab32(x) ___arch__swab32(x)
- 
- #endif
-+#endif
- 
- #if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__)
- #  define __BYTEORDER_HAS_U64__
---- a/include/asm-m68k/cacheflush.h
-+++ b/include/asm-m68k/cacheflush.h
-@@ -6,6 +6,9 @@
- /* cache code */
- #define FLUSH_I_AND_D	(0x00000808)
- #define FLUSH_I		(0x00000008)
-+#ifdef CONFIG_COLDFIRE
-+#include <asm/cf_cacheflush.h>
-+#else /* !CONFIG_COLDFIRE */
- 
- /*
-  * Cache handling functions
-@@ -153,4 +156,5 @@ static inline void copy_from_user_page(s
- 	memcpy(dst, src, len);
- }
- 
-+#endif /* !CONFIG_COLDFIRE */
- #endif /* _M68K_CACHEFLUSH_H */
---- a/include/asm-m68k/checksum.h
-+++ b/include/asm-m68k/checksum.h
-@@ -34,6 +34,7 @@ extern __wsum csum_partial_copy_nocheck(
- 					      void *dst, int len,
- 					      __wsum sum);
- 
-+#ifndef CONFIG_COLDFIRE  /* CF has own copy in arch/m68k/lib/checksum.c */
- /*
-  *	This is a version of ip_compute_csum() optimized for IP headers,
-  *	which always checksum on 4 octet boundaries.
-@@ -59,6 +60,9 @@ static inline __sum16 ip_fast_csum(const
- 		 : "memory");
- 	return (__force __sum16)~sum;
- }
-+#else
-+extern __sum16 ip_fast_csum(const void *iph, unsigned int ihl);
-+#endif
- 
- /*
-  *	Fold a partial checksum
-@@ -67,6 +71,11 @@ static inline __sum16 ip_fast_csum(const
- static inline __sum16 csum_fold(__wsum sum)
- {
- 	unsigned int tmp = (__force u32)sum;
-+#ifdef CONFIG_COLDFIRE
-+	tmp = (tmp & 0xffff) + (tmp >> 16);
-+	tmp = (tmp & 0xffff) + (tmp >> 16);
-+	return (__force __sum16) ~tmp;
-+#else
- 	__asm__("swap %1\n\t"
- 		"addw %1, %0\n\t"
- 		"clrw %1\n\t"
-@@ -74,6 +83,7 @@ static inline __sum16 csum_fold(__wsum s
- 		: "=&d" (sum), "=&d" (tmp)
- 		: "0" (sum), "1" (tmp));
- 	return (__force __sum16)~sum;
-+#endif
- }
- 
- 
---- a/include/asm-m68k/delay.h
-+++ b/include/asm-m68k/delay.h
-@@ -11,8 +11,25 @@
- 
- static inline void __delay(unsigned long loops)
- {
-+#if defined(CONFIG_COLDFIRE)
-+	/* The coldfire runs this loop at significantly different speeds
-+	 * depending upon long word alignment or not.  We'll pad it to
-+	 * long word alignment which is the faster version.
-+	 * The 0x4a8e is of course a 'tstl %fp' instruction.  This is better
-+	 * than using a NOP (0x4e71) instruction because it executes in one
-+	 * cycle not three and doesn't allow for an arbitary delay waiting
-+	 * for bus cycles to finish.  Also fp/a6 isn't likely to cause a
-+	 * stall waiting for the register to become valid if such is added
-+	 * to the coldfire at some stage.
-+	 */
-+	__asm__ __volatile__ (".balignw 4, 0x4a8e\n\t"
-+			      "1: subql #1, %0\n\t"
-+			      "jcc 1b"
-+			      : "=d" (loops) : "0" (loops));
-+#else
- 	__asm__ __volatile__ ("1: subql #1,%0; jcc 1b"
- 		: "=d" (loops) : "0" (loops));
-+#endif
- }
- 
- extern void __bad_udelay(void);
-@@ -26,12 +43,17 @@ extern void __bad_udelay(void);
-  */
- static inline void __const_udelay(unsigned long xloops)
- {
-+#if defined(CONFIG_COLDFIRE)
-+
-+	__delay(((((unsigned long long) xloops * loops_per_jiffy))>>32)*HZ);
-+#else
- 	unsigned long tmp;
- 
- 	__asm__ ("mulul %2,%0:%1"
- 		: "=d" (xloops), "=d" (tmp)
- 		: "d" (xloops), "1" (loops_per_jiffy));
- 	__delay(xloops * HZ);
-+#endif
- }
- 
- static inline void __udelay(unsigned long usecs)
-@@ -46,12 +68,16 @@ static inline void __udelay(unsigned lon
- static inline unsigned long muldiv(unsigned long a, unsigned long b,
- 				   unsigned long c)
- {
-+#if defined(CONFIG_COLDFIRE)
-+	return (long)(((unsigned long long)a * b)/c);
-+#else
- 	unsigned long tmp;
- 
- 	__asm__ ("mulul %2,%0:%1; divul %3,%0:%1"
- 		: "=d" (tmp), "=d" (a)
- 		: "d" (b), "d" (c), "1" (a));
- 	return a;
-+#endif
- }
- 
- #endif /* defined(_M68K_DELAY_H) */
---- a/include/asm-m68k/div64.h
-+++ b/include/asm-m68k/div64.h
-@@ -5,6 +5,7 @@
- 
- /* n = n / base; return rem; */
- 
-+#ifndef CONFIG_COLDFIRE
- #define do_div(n, base) ({					\
- 	union {							\
- 		unsigned long n32[2];				\
-@@ -24,6 +25,9 @@
- 	(n) = __n.n64;						\
- 	__rem;							\
- })
-+#else
-+#  include <asm-generic/div64.h>
-+#endif
- 
- extern uint64_t div64_64(uint64_t dividend, uint64_t divisor);
- #endif /* _M68K_DIV64_H */
---- a/include/asm-m68k/elf.h
-+++ b/include/asm-m68k/elf.h
-@@ -60,7 +60,7 @@ typedef struct user_m68kfp_struct elf_fp
- #define ELF_PLAT_INIT(_r, load_addr)	_r->a1 = 0
- 
- #define USE_ELF_CORE_DUMP
--#ifndef CONFIG_SUN3
-+#if !defined(CONFIG_SUN3) && !defined(CONFIG_COLDFIRE)
- #define ELF_EXEC_PAGESIZE	4096
- #else
- #define ELF_EXEC_PAGESIZE	8192
---- a/include/asm-m68k/fpu.h
-+++ b/include/asm-m68k/fpu.h
-@@ -12,6 +12,8 @@
- #define FPSTATESIZE (96/sizeof(unsigned char))
- #elif defined(CONFIG_M68KFPU_EMU)
- #define FPSTATESIZE (28/sizeof(unsigned char))
-+#elif defined(CONFIG_CFV4E)
-+#define FPSTATESIZE (16/sizeof(unsigned char))
- #elif defined(CONFIG_M68060)
- #define FPSTATESIZE (12/sizeof(unsigned char))
- #else
---- a/include/asm-m68k/io.h
-+++ b/include/asm-m68k/io.h
-@@ -397,10 +397,12 @@ static inline void memcpy_toio(volatile 
- 	__builtin_memcpy((void __force *) dst, src, count);
- }
- 
--#ifndef CONFIG_SUN3
--#define IO_SPACE_LIMIT 0xffff
--#else
-+#if defined(CONFIG_SUN3)
- #define IO_SPACE_LIMIT 0x0fffffff
-+#elif defined(CONFIG_COLDFIRE)
-+#define IO_SPACE_LIMIT 0xffffffff
-+#else
-+#define IO_SPACE_LIMIT 0xffff
- #endif
- 
- #endif /* __KERNEL__ */
-@@ -418,4 +420,22 @@ static inline void memcpy_toio(volatile 
-  */
- #define xlate_dev_kmem_ptr(p)	p
- 
-+#ifdef CONFIG_COLDFIRE
-+
-+#define memset_io(a, b, c) memset((void *)(a), (b), (c))
-+#define memcpy_fromio(a, b, c) memcpy((a), (void *)(b), (c))
-+#define memcpy_toio(a, b, c) memcpy((void *)(a), (b), (c))
-+#if !defined(readb)
-+#define readb(addr) \
-+    ({ unsigned char __v = (*(volatile unsigned char *) (addr)); __v; })
-+#define readw(addr) \
-+    ({ unsigned short __v = (*(volatile unsigned short *) (addr)); __v; })
-+#define readl(addr) \
-+    ({ unsigned int __v = (*(volatile unsigned int *) (addr)); __v; })
-+#define writeb(b, addr) (void)((*(volatile unsigned char *) (addr)) = (b))
-+#define writew(b, addr) (void)((*(volatile unsigned short *) (addr)) = (b))
-+#define writel(b, addr) (void)((*(volatile unsigned int *) (addr)) = (b))
-+#endif /* readb */
-+#endif /* CONFIG_COLDFIRE */
-+
- #endif /* _IO_H */
---- a/include/asm-m68k/irq.h
-+++ b/include/asm-m68k/irq.h
-@@ -11,7 +11,10 @@
-  * Currently the Atari has 72 and the Amiga 24, but if both are
-  * supported in the kernel it is better to make room for 72.
-  */
--#if defined(CONFIG_VME) || defined(CONFIG_SUN3) || defined(CONFIG_SUN3X)
-+#if defined(CONFIG_COLDFIRE)
-+#define SYS_IRQS 256
-+#define NR_IRQS SYS_IRQS
-+#elif defined(CONFIG_VME) || defined(CONFIG_SUN3) || defined(CONFIG_SUN3X)
- #define NR_IRQS 200
- #elif defined(CONFIG_ATARI) || defined(CONFIG_MAC)
- #define NR_IRQS 72
---- a/include/asm-m68k/machdep.h
-+++ b/include/asm-m68k/machdep.h
-@@ -32,4 +32,11 @@ extern void (*mach_heartbeat) (int);
- extern void (*mach_l2_flush) (int);
- extern void (*mach_beep) (unsigned int, unsigned int);
- 
-+#ifdef CONFIG_COLDFIRE
-+extern void __init config_coldfire(void);
-+extern void __init mmu_context_init(void);
-+extern irq_handler_t mach_default_handler;
-+extern void (*mach_tick)(void);
-+#endif
-+
- #endif /* _M68K_MACHDEP_H */
---- a/include/asm-m68k/mmu_context.h
-+++ b/include/asm-m68k/mmu_context.h
-@@ -7,7 +7,7 @@ static inline void enter_lazy_tlb(struct
- {
- }
- 
--#ifndef CONFIG_SUN3
-+#if !defined(CONFIG_SUN3) && !defined(CONFIG_COLDFIRE)
- 
- #include <asm/setup.h>
- #include <asm/page.h>
-@@ -102,7 +102,7 @@ static inline void activate_mm(struct mm
- 		switch_mm_0460(next_mm);
- }
- 
--#else  /* CONFIG_SUN3 */
-+#elif defined(CONFIG_SUN3)
- #include <asm/sun3mmu.h>
- #include <linux/sched.h>
- 
-@@ -150,5 +150,83 @@ static inline void activate_mm(struct mm
- 	activate_context(next_mm);
- }
- 
--#endif
-+#else /* CONFIG_COLDFIRE */
-+
-+#include <asm/atomic.h>
-+#include <asm/bitops.h>
-+#include <asm/mmu.h>
-+
-+#define NO_CONTEXT		256
-+#define LAST_CONTEXT		255
-+#define FIRST_CONTEXT		1
-+
-+extern void set_context(mm_context_t context, pgd_t *pgd);
-+extern unsigned long context_map[];
-+extern mm_context_t next_mmu_context;
-+
-+extern atomic_t nr_free_contexts;
-+extern struct mm_struct *context_mm[LAST_CONTEXT+1];
-+extern void steal_context(void);
-+
-+static inline void get_mmu_context(struct mm_struct *mm)
-+{
-+	mm_context_t ctx;
-+
-+	if (mm->context != NO_CONTEXT)
-+		return;
-+	while (atomic_dec_and_test_lt(&nr_free_contexts)) {
-+		atomic_inc(&nr_free_contexts);
-+		steal_context();
-+	}
-+	ctx = next_mmu_context;
-+	while (test_and_set_bit(ctx, context_map)) {
-+		ctx = find_next_zero_bit(context_map, LAST_CONTEXT+1, ctx);
-+		if (ctx > LAST_CONTEXT)
-+			ctx = 0;
-+	}
-+	next_mmu_context = (ctx + 1) & LAST_CONTEXT;
-+	mm->context = ctx;
-+	context_mm[ctx] = mm;
-+}
-+
-+/*
-+ * Set up the context for a new address space.
-+ */
-+#define init_new_context(tsk, mm)	(((mm)->context = NO_CONTEXT), 0)
-+
-+/*
-+ * We're finished using the context for an address space.
-+ */
-+static inline void destroy_context(struct mm_struct *mm)
-+{
-+	if (mm->context != NO_CONTEXT) {
-+		clear_bit(mm->context, context_map);
-+		mm->context = NO_CONTEXT;
-+		atomic_inc(&nr_free_contexts);
-+	}
-+}
-+
-+static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
-+	struct task_struct *tsk)
-+{
-+	get_mmu_context(tsk->mm);
-+	set_context(tsk->mm->context, next->pgd);
-+}
-+
-+/*
-+ * After we have set current->mm to a new value, this activates
-+ * the context for the new mm so we see the new mappings.
-+ */
-+static inline void activate_mm(struct mm_struct *active_mm,
-+	struct mm_struct *mm)
-+{
-+	get_mmu_context(mm);
-+	set_context(mm->context, mm->pgd);
-+}
-+
-+#define deactivate_mm(tsk, mm) do { } while (0)
-+
-+extern void mmu_context_init(void);
-+
-+#endif /* CONFIG_COLDFIRE */
- #endif
---- a/include/asm-m68k/page.h
-+++ b/include/asm-m68k/page.h
-@@ -4,7 +4,7 @@
- #include <linux/const.h>
- 
- /* PAGE_SHIFT determines the page size */
--#ifndef CONFIG_SUN3
-+#if !defined(CONFIG_SUN3) && !defined(CONFIG_COLDFIRE)
- #define PAGE_SHIFT	(12)
- #else
- #define PAGE_SHIFT	(13)
-@@ -116,10 +116,23 @@ typedef struct page *pgtable_t;
- 
- extern unsigned long m68k_memoffset;
- 
--#ifndef CONFIG_SUN3
-+#if !defined(CONFIG_SUN3)
- 
- #define WANT_PAGE_VIRTUAL
- 
-+#if defined(CONFIG_COLDFIRE)
-+static inline unsigned long ___pa(void *vaddr)
-+{
-+	return (((unsigned long)vaddr & 0x0fffffff) + CONFIG_SDRAM_BASE);
-+}
-+#define __pa(vaddr)	___pa((void *)(vaddr))
-+
-+static inline void *__va(unsigned long paddr)
-+{
-+	return (void *)((paddr & 0x0fffffff) + PAGE_OFFSET);
-+}
-+
-+#else
- static inline unsigned long ___pa(void *vaddr)
- {
- 	unsigned long paddr;
-@@ -141,6 +154,7 @@ static inline void *__va(unsigned long p
- 		: "0" (paddr), "i" (m68k_fixup_memoffset));
- 	return vaddr;
- }
-+#endif
- 
- #else	/* !CONFIG_SUN3 */
- /* This #define is a horrible hack to suppress lots of warnings. --m */
-@@ -172,6 +186,8 @@ static inline void *__va(unsigned long x
-  * memory node, but we have no highmem, so that works for now.
-  * TODO: implement (fast) pfn<->pgdat_idx conversion functions, this makes lots
-  * of the shifts unnecessary.
-+ *
-+ * PFNs are used to map physical pages.  So PFN[0] maps to the base phys addr.
-  */
- #define virt_to_pfn(kaddr)	(__pa(kaddr) >> PAGE_SHIFT)
- #define pfn_to_virt(pfn)	__va((pfn) << PAGE_SHIFT)
---- a/include/asm-m68k/page_offset.h
-+++ b/include/asm-m68k/page_offset.h
-@@ -1,8 +1,11 @@
- 
- /* This handles the memory map.. */
--#ifndef CONFIG_SUN3
-+#if !defined(CONFIG_SUN3) && !defined(CONFIG_COLDFIRE)
- #define PAGE_OFFSET_RAW		0x00000000
--#else
-+#elif defined(CONFIG_SUN3)
- #define PAGE_OFFSET_RAW		0x0E000000
-+#else /* CONFIG_COLDFIRE */
-+#define PAGE_OFFSET_RAW		0xC0000000
-+#define	PHYS_OFFSET		0x40000000
- #endif
- 
---- a/include/asm-m68k/pci.h
-+++ b/include/asm-m68k/pci.h
-@@ -1,57 +1,86 @@
--#ifndef _ASM_M68K_PCI_H
--#define _ASM_M68K_PCI_H
--
- /*
-- * asm-m68k/pci_m68k.h - m68k specific PCI declarations.
-+ * asm-m68k/pci.h - m68k specific PCI declarations.
-  *
-- * Written by Wout Klaren.
-+ * Coldfire Implementation Copyright (c) 2007 Freescale Semiconductor, Inc.
-+ *	Kurt Mahan <kmahan@freescale.com>
-  */
-+#ifndef _ASM_M68K_PCI_H
-+#define _ASM_M68K_PCI_H
- 
--#include <asm/scatterlist.h>
-+#ifdef CONFIG_PCI
- 
--struct pci_ops;
-+#include <asm-generic/pci-dma-compat.h>
- 
- /*
-- * Structure with hardware dependent information and functions of the
-- * PCI bus.
-+ * The PCI address space does equal the physical memory
-+ * address space.  The networking and block device layers use
-+ * this boolean for bounce buffer decisions.
-  */
-+#define PCI_DMA_BUS_IS_PHYS		(1)
- 
--struct pci_bus_info
--{
--	/*
--	 * Resources of the PCI bus.
--	 */
--
--	struct resource mem_space;
--	struct resource io_space;
-+#define PCIBIOS_MIN_IO			0x00004000
-+#define PCIBIOS_MIN_MEM			0x02000000
- 
--	/*
--	 * System dependent functions.
--	 */
-+#define pcibios_assign_all_busses()	0
-+#define pcibios_scan_all_fns(a, b)	0
- 
--	struct pci_ops *m68k_pci_ops;
-+static inline void
-+pcibios_set_master(struct pci_dev *dev)
-+{
-+	/* no special bus mastering setup handling */
-+}
- 
--	void (*fixup)(int pci_modify);
--	void (*conf_device)(struct pci_dev *dev);
--};
-+static inline void
-+pcibios_penalize_isa_irq(int irq, int active)
-+{
-+	/* no dynamic PCI IRQ allocation */
-+}
- 
--#define pcibios_assign_all_busses()	0
--#define pcibios_scan_all_fns(a, b)	0
-+static inline void
-+pcibios_add_platform_entries(struct pci_dev *dev)
-+{
-+	/* no special handling */
-+}
- 
--static inline void pcibios_set_master(struct pci_dev *dev)
-+static inline void
-+pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
-+			 struct resource *res)
- {
--	/* No special bus mastering setup handling */
-+#ifdef CONFIG_M54455
-+	if ((res->start == 0xa0000000) || (res->start == 0xa8000000)) {
-+		/* HACK!  FIX! kludge to fix bridge mapping */
-+		region->start = res->start & 0x0fffffff;
-+		region->end = res->end & 0x0fffffff;
-+	} else {
-+		region->start = res->start;
-+		region->end = res->end;
-+	}
-+#else
-+	region->start = res->start;
-+	region->end = res->end;
-+#endif
- }
- 
--static inline void pcibios_penalize_isa_irq(int irq, int active)
-+static inline void
-+pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
-+			struct pci_bus_region *region)
- {
--	/* We don't do dynamic PCI IRQ allocation */
-+	res->start = region->start;
-+	res->end = region->end;
- }
- 
--/* The PCI address space does equal the physical memory
-- * address space.  The networking and block device layers use
-- * this boolean for bounce buffer decisions.
-- */
--#define PCI_DMA_BUS_IS_PHYS	(1)
-+static inline struct resource *
-+pcibios_select_root(struct pci_dev *pdev, struct resource *res)
-+{
-+	struct resource *root = NULL;
-+
-+	if (res->flags & IORESOURCE_IO)
-+		root = &ioport_resource;
-+	if (res->flags & IORESOURCE_MEM)
-+		root = &iomem_resource;
-+
-+	return root;
-+}
- 
-+#endif /* CONFIG_PCI */
- #endif /* _ASM_M68K_PCI_H */
---- a/include/asm-m68k/pgalloc.h
-+++ b/include/asm-m68k/pgalloc.h
-@@ -8,8 +8,10 @@
- #include <asm/virtconvert.h>
- 
- 
--#ifdef CONFIG_SUN3
-+#if defined(CONFIG_SUN3)
- #include <asm/sun3_pgalloc.h>
-+#elif defined(CONFIG_COLDFIRE)
-+#include <asm/cf_pgalloc.h>
- #else
- #include <asm/motorola_pgalloc.h>
- #endif
---- a/include/asm-m68k/pgtable.h
-+++ b/include/asm-m68k/pgtable.h
-@@ -40,6 +40,8 @@
- /* PGDIR_SHIFT determines what a third-level page table entry can map */
- #ifdef CONFIG_SUN3
- #define PGDIR_SHIFT     17
-+#elif defined(CONFIG_COLDFIRE)
-+#define PGDIR_SHIFT	22
- #else
- #define PGDIR_SHIFT	25
- #endif
-@@ -54,6 +56,10 @@
- #define PTRS_PER_PTE   16
- #define PTRS_PER_PMD   1
- #define PTRS_PER_PGD   2048
-+#elif defined(CONFIG_COLDFIRE)
-+#define PTRS_PER_PTE    512
-+#define PTRS_PER_PMD    1
-+#define PTRS_PER_PGD    1024
- #else
- #define PTRS_PER_PTE	1024
- #define PTRS_PER_PMD	8
-@@ -66,6 +72,9 @@
- #ifdef CONFIG_SUN3
- #define KMAP_START     0x0DC00000
- #define KMAP_END       0x0E000000
-+#elif defined(CONFIG_COLDFIRE)
-+#define KMAP_START	0xe0000000
-+#define KMAP_END	0xf0000000
- #else
- #define	KMAP_START	0xd0000000
- #define	KMAP_END	0xf0000000
-@@ -130,6 +139,8 @@ static inline void update_mmu_cache(stru
- 
- #ifdef CONFIG_SUN3
- #include <asm/sun3_pgtable.h>
-+#elif defined(CONFIG_COLDFIRE)
-+#include <asm/cf_pgtable.h>
- #else
- #include <asm/motorola_pgtable.h>
- #endif
-@@ -140,6 +151,9 @@ static inline void update_mmu_cache(stru
- /*
-  * Macro to mark a page protection value as "uncacheable".
-  */
-+#ifdef CONFIG_COLDFIRE
-+# define pgprot_noncached(prot)	(__pgprot(pgprot_val(prot) | CF_PAGE_NOCACHE))
-+#else /* CONFIG_COLDFIRE */
- #ifdef SUN3_PAGE_NOCACHE
- # define __SUN3_PAGE_NOCACHE	SUN3_PAGE_NOCACHE
- #else
-@@ -154,6 +168,7 @@ static inline void update_mmu_cache(stru
- 	    ? (__pgprot((pgprot_val(prot) & _CACHEMASK040) | _PAGE_NOCACHE_S))	\
- 	    : (prot)))
- 
-+#endif /* CONFIG_COLDFIRE */
- #endif /* !__ASSEMBLY__ */
- 
- /*
---- a/include/asm-m68k/processor.h
-+++ b/include/asm-m68k/processor.h
-@@ -22,24 +22,38 @@ static inline unsigned long rdusp(void)
- {
- 	unsigned long usp;
- 
-+#ifndef CONFIG_COLDFIRE
- 	__asm__ __volatile__("move %/usp,%0" : "=a" (usp));
-+#else
-+	__asm__ __volatile__("movel %/usp,%0" : "=a" (usp));
-+#endif
- 	return usp;
- }
- 
- static inline void wrusp(unsigned long usp)
- {
-+#ifndef CONFIG_COLDFIRE
- 	__asm__ __volatile__("move %0,%/usp" : : "a" (usp));
-+#else
-+	__asm__ __volatile__("movel %0,%/usp" : : "a" (usp));
-+#endif
- }
- 
- /*
-  * User space process size: 3.75GB. This is hardcoded into a few places,
-  * so don't change it unless you know what you are doing.
-  */
--#ifndef CONFIG_SUN3
-+#if !defined(CONFIG_SUN3) && !defined(CONFIG_COLDFIRE)
- #define TASK_SIZE	(0xF0000000UL)
-+#elif defined(CONFIG_COLDFIRE)
-+#define TASK_SIZE       (0xC0000000UL)
-+#else /* CONFIG_SUN3 */
-+#ifdef __ASSEMBLY__
-+#define TASK_SIZE	(0x0E000000)
- #else
- #define TASK_SIZE	(0x0E000000UL)
- #endif
-+#endif
- 
- #ifdef __KERNEL__
- #define STACK_TOP	TASK_SIZE
-@@ -49,9 +63,11 @@ static inline void wrusp(unsigned long u
- /* This decides where the kernel will search for a free chunk of vm
-  * space during mmap's.
-  */
--#ifndef CONFIG_SUN3
--#define TASK_UNMAPPED_BASE	0xC0000000UL
--#else
-+#if !defined(CONFIG_SUN3) && !defined(CONFIG_COLDFIRE)
-+#define TASK_UNMAPPED_BASE     0xC0000000UL
-+#elif defined(CONFIG_COLDFIRE)
-+#define TASK_UNMAPPED_BASE     0x80000000UL
-+#else /* CONFIG_SUN3 */
- #define TASK_UNMAPPED_BASE	0x0A000000UL
- #endif
- #define TASK_UNMAPPED_ALIGN(addr, off)	PAGE_ALIGN(addr)
-@@ -60,7 +76,11 @@ struct thread_struct {
- 	unsigned long  ksp;		/* kernel stack pointer */
- 	unsigned long  usp;		/* user stack pointer */
- 	unsigned short sr;		/* saved status register */
-+#ifndef CONFIG_COLDFIRE
- 	unsigned short fs;		/* saved fs (sfc, dfc) */
-+#else
-+	mm_segment_t   fs;
-+#endif
- 	unsigned long  crp[2];		/* cpu root pointer */
- 	unsigned long  esp0;		/* points to SR of stack frame */
- 	unsigned long  faddr;		/* info about last fault */
-@@ -81,6 +101,7 @@ struct thread_struct {
- /*
-  * Do necessary setup to start up a newly executed thread.
-  */
-+#ifndef CONFIG_COLDFIRE
- static inline void start_thread(struct pt_regs * regs, unsigned long pc,
- 				unsigned long usp)
- {
-@@ -91,6 +112,23 @@ static inline void start_thread(struct p
- 	regs->sr &= ~0x2000;
- 	wrusp(usp);
- }
-+#else
-+/*
-+ * Do necessary setup to start up a newly executed thread.
-+ *
-+ * pass the data segment into user programs if it exists,
-+ * it can't hurt anything as far as I can tell
-+ */
-+#define start_thread(_regs, _pc, _usp)			\
-+do {							\
-+	set_fs(USER_DS); /* reads from user space */	\
-+	(_regs)->pc = (_pc);				\
-+	if (current->mm)				\
-+		(_regs)->d5 = current->mm->start_data;	\
-+	(_regs)->sr &= ~0x2000;				\
-+	wrusp(_usp);					\
-+} while (0)
-+#endif
- 
- /* Forward declaration, a strange C thing */
- struct task_struct;
---- a/include/asm-m68k/ptrace.h
-+++ b/include/asm-m68k/ptrace.h
-@@ -38,10 +38,21 @@ struct pt_regs {
-   long     d0;
-   long     orig_d0;
-   long     stkadj;
-+#ifndef CONFIG_COLDFIRE
-   unsigned short sr;
-   unsigned long  pc;
-   unsigned format :  4; /* frame format specifier */
-   unsigned vector : 12; /* vector offset */
-+#else
-+  unsigned long mmuar;
-+  unsigned long mmusr;
-+  unsigned format : 4;  /* frame format specifier */
-+  unsigned fs2 : 2;
-+  unsigned vector: 8;
-+  unsigned fs1 : 2;
-+  unsigned short sr;
-+  unsigned long pc;
-+#endif
- };
- 
- /*
---- a/include/asm-m68k/raw_io.h
-+++ b/include/asm-m68k/raw_io.h
-@@ -77,6 +77,7 @@ static inline void raw_outsb(volatile u8
- 		out_8(port, *buf++);
- }
- 
-+#ifndef CONFIG_COLDFIRE
- static inline void raw_insw(volatile u16 __iomem *port, u16 *buf, unsigned int nr)
- {
- 	unsigned int tmp;
-@@ -342,6 +343,63 @@ static inline void raw_outsw_swapw(volat
- 		: "d0", "a0", "a1", "d6");
- }
- 
-+
-+#else /*CONFIG_COLDFIRE */
-+
-+static inline void raw_insw(volatile u16 *port, u16 *buf, unsigned int nr)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < nr; i++)
-+		*buf++ = raw_inw(port);
-+}
-+
-+static inline void raw_outsw(volatile u16 *port, const u16 *buf,
-+	unsigned int nr)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < nr; i++, buf++)
-+		raw_outw(*buf, port);
-+}
-+
-+static inline void raw_insl(volatile u32 *port, u32 *buf, unsigned int nr)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < nr; i++)
-+		*buf++ = raw_inl(port);
-+}
-+
-+static inline void raw_outsl(volatile u32 *port, const u32 *buf,
-+	unsigned int nr)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < nr; i++, buf++)
-+		raw_outl(*buf, port);
-+}
-+
-+static inline void raw_insw_swapw(volatile u16 *port, u16 *buf,
-+				  unsigned int nr)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < nr; i++)
-+		*buf++ = in_le16(port);
-+
-+}
-+
-+static inline void raw_outsw_swapw(volatile u16 __iomem *port, const u16 *buf,
-+				   unsigned int nr)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < nr; i++, buf++)
-+		out_le16(port, *buf);
-+}
-+#endif /*CONFIG_COLDFIRE */
-+
- #endif /* __KERNEL__ */
- 
- #endif /* _RAW_IO_H */
---- a/include/asm-m68k/segment.h
-+++ b/include/asm-m68k/segment.h
-@@ -29,6 +29,7 @@ typedef struct {
-  * Get/set the SFC/DFC registers for MOVES instructions
-  */
- 
-+#ifndef CONFIG_COLDFIRE
- static inline mm_segment_t get_fs(void)
- {
- 	mm_segment_t _v;
-@@ -50,6 +51,15 @@ static inline void set_fs(mm_segment_t v
- 			      : /* no outputs */ : "r" (val.seg) : "memory");
- }
- 
-+#else /* CONFIG_COLDFIRE */
-+
-+#include <asm/current.h>
-+#define get_fs()        (current->thread.fs)
-+#define set_fs(val)     (current->thread.fs = (val))
-+#define get_ds()	(KERNEL_DS)
-+
-+#endif /* CONFIG_COLDFIRE */
-+
- #define segment_eq(a,b)	((a).seg == (b).seg)
- 
- #endif /* __ASSEMBLY__ */
---- a/include/asm-m68k/setup.h
-+++ b/include/asm-m68k/setup.h
-@@ -40,6 +40,7 @@
- #define MACH_HP300    9
- #define MACH_Q40     10
- #define MACH_SUN3X   11
-+#define MACH_CFMMU   12
- 
- #define COMMAND_LINE_SIZE 256
- 
-@@ -189,6 +190,14 @@ extern unsigned long m68k_machtype;
- #  define MACH_TYPE (MACH_SUN3X)
- #endif
- 
-+#if !defined(CONFIG_COLDFIRE)
-+#  define MACH_IS_COLDFIRE (0)
-+#else
-+#  define CONFIG_COLDFIRE_ONLY
-+#  define MACH_IS_COLDFIRE (1)
-+#  define MACH_TYPE (MACH_CFMMU)
-+#endif
-+
- #ifndef MACH_TYPE
- #  define MACH_TYPE (m68k_machtype)
- #endif
-@@ -211,23 +220,31 @@ extern unsigned long m68k_machtype;
- #define CPUB_68030     1
- #define CPUB_68040     2
- #define CPUB_68060     3
-+#define CPUB_CFV4E     4
- 
- #define CPU_68020      (1<<CPUB_68020)
- #define CPU_68030      (1<<CPUB_68030)
- #define CPU_68040      (1<<CPUB_68040)
- #define CPU_68060      (1<<CPUB_68060)
-+#define CPU_CFV4E      (1<<CPUB_CFV4E)
- 
- #define FPUB_68881     0
- #define FPUB_68882     1
- #define FPUB_68040     2                       /* Internal FPU */
- #define FPUB_68060     3                       /* Internal FPU */
- #define FPUB_SUNFPA    4                       /* Sun-3 FPA */
-+#define FPUB_CFV4E     5
- 
- #define FPU_68881      (1<<FPUB_68881)
- #define FPU_68882      (1<<FPUB_68882)
- #define FPU_68040      (1<<FPUB_68040)
- #define FPU_68060      (1<<FPUB_68060)
- #define FPU_SUNFPA     (1<<FPUB_SUNFPA)
-+#ifndef CONFIG_M54455
-+#define FPU_CFV4E      (1<<FPUB_CFV4E)
-+#else
-+#define FPU_CFV4E      0
-+#endif
- 
- #define MMUB_68851     0
- #define MMUB_68030     1                       /* Internal MMU */
-@@ -235,6 +252,7 @@ extern unsigned long m68k_machtype;
- #define MMUB_68060     3                       /* Internal MMU */
- #define MMUB_APOLLO    4                       /* Custom Apollo */
- #define MMUB_SUN3      5                       /* Custom Sun-3 */
-+#define MMUB_CFV4E     6
- 
- #define MMU_68851      (1<<MMUB_68851)
- #define MMU_68030      (1<<MMUB_68030)
-@@ -242,6 +260,7 @@ extern unsigned long m68k_machtype;
- #define MMU_68060      (1<<MMUB_68060)
- #define MMU_SUN3       (1<<MMUB_SUN3)
- #define MMU_APOLLO     (1<<MMUB_APOLLO)
-+#define MMU_CFV4E      (1<<MMUB_CFV4E)
- 
- #ifdef __KERNEL__
- 
-@@ -341,6 +360,14 @@ extern int m68k_is040or060;
- #  endif
- #endif
- 
-+#if !defined(CONFIG_CFV4E)
-+#  define CPU_IS_COLDFIRE (0)
-+#else
-+#  define CPU_IS_COLDFIRE (1)
-+#  define CPU_IS_CFV4E    (1)
-+#  define MMU_IS_CFV4E    (1)
-+#endif
-+
- #define CPU_TYPE (m68k_cputype)
- 
- #ifdef CONFIG_M68KFPU_EMU
---- a/include/asm-m68k/signal.h
-+++ b/include/asm-m68k/signal.h
-@@ -150,6 +150,7 @@ typedef struct sigaltstack {
- #ifdef __KERNEL__
- #include <asm/sigcontext.h>
- 
-+#ifndef CONFIG_COLDFIRE
- #define __HAVE_ARCH_SIG_BITOPS
- 
- static inline void sigaddset(sigset_t *set, int _sig)
-@@ -200,6 +201,10 @@ static inline int sigfindinword(unsigned
- 
- struct pt_regs;
- extern void ptrace_signal_deliver(struct pt_regs *regs, void *cookie);
-+#else
-+
-+#define ptrace_signal_deliver(regs, cookie) do { } while (0)
-+#endif /* CONFIG_COLDFIRE */
- 
- #endif /* __KERNEL__ */
- 
---- a/include/asm-m68k/string.h
-+++ b/include/asm-m68k/string.h
-@@ -93,6 +93,7 @@ static inline char *strchr(const char *s
- 	return (char *)s - 1;
- }
- 
-+#ifndef CONFIG_COLDFIRE
- #define __HAVE_ARCH_STRCMP
- static inline int strcmp(const char *cs, const char *ct)
- {
-@@ -110,6 +111,7 @@ static inline int strcmp(const char *cs,
- 		: "+a" (cs), "+a" (ct), "=d" (res));
- 	return res;
- }
-+#endif
- 
- #define __HAVE_ARCH_MEMSET
- extern void *memset(void *, int, __kernel_size_t);
---- a/include/asm-m68k/system.h
-+++ b/include/asm-m68k/system.h
-@@ -63,16 +63,25 @@ asmlinkage void resume(void);
- #define smp_read_barrier_depends()	((void)0)
- 
- /* interrupt control.. */
--#if 0
--#define local_irq_enable() asm volatile ("andiw %0,%%sr": : "i" (ALLOWINT) : "memory")
--#else
- #include <linux/hardirq.h>
-+#ifndef CONFIG_COLDFIRE
- #define local_irq_enable() ({							\
- 	if (MACH_IS_Q40 || !hardirq_count())					\
- 		asm volatile ("andiw %0,%%sr": : "i" (ALLOWINT) : "memory");	\
- })
--#endif
- #define local_irq_disable() asm volatile ("oriw  #0x0700,%%sr": : : "memory")
-+#else /* CONFIG_COLDFIRE */
-+#define local_irq_enable()						\
-+	asm volatile ("move.w %%sr, %%d0\n\t"				\
-+		      "andil #0xf8ff,%%d0\n\t"				\
-+		      "move.w %%d0, %%sr\n"				\
-+		      : : : "cc", "d0", "memory")
-+#define local_irq_disable()						\
-+	asm volatile ("move %/sr,%%d0\n\t"				\
-+		      "ori.l  #0x0700,%%d0\n\t"				\
-+		      "move %%d0,%/sr\n"				\
-+		      : : : "cc", "%d0", "memory")
-+#endif
- #define local_save_flags(x) asm volatile ("movew %%sr,%0":"=d" (x) : : "memory")
- #define local_irq_restore(x) asm volatile ("movew %0,%%sr": :"d" (x) : "memory")
- 
---- a/include/asm-m68k/thread_info.h
-+++ b/include/asm-m68k/thread_info.h
-@@ -58,5 +58,6 @@ struct thread_info {
- #define TIF_DELAYED_TRACE	14	/* single step a syscall */
- #define TIF_SYSCALL_TRACE	15	/* syscall trace active */
- #define TIF_MEMDIE		16
-+#define TIF_FREEZE		17	/* freezing processes */
- 
- #endif	/* _ASM_M68K_THREAD_INFO_H */
---- a/include/asm-m68k/tlbflush.h
-+++ b/include/asm-m68k/tlbflush.h
-@@ -2,7 +2,7 @@
- #define _M68K_TLBFLUSH_H
- 
- 
--#ifndef CONFIG_SUN3
-+#if !defined(CONFIG_SUN3) && !defined(CONFIG_COLDFIRE)
- 
- #include <asm/current.h>
- 
-@@ -92,7 +92,12 @@ static inline void flush_tlb_kernel_rang
- 	flush_tlb_all();
- }
- 
--#else
-+static inline void flush_tlb_pgtables(struct mm_struct *mm,
-+				      unsigned long start, unsigned long end)
-+{
-+}
-+
-+#elif defined(CONFIG_SUN3)
- 
- 
- /* Reserved PMEGs. */
-@@ -214,6 +219,13 @@ static inline void flush_tlb_kernel_page
- 	sun3_put_segmap (addr & ~(SUN3_PMEG_SIZE - 1), SUN3_INVALID_PMEG);
- }
- 
-+static inline void flush_tlb_pgtables(struct mm_struct *mm,
-+				      unsigned long start, unsigned long end)
-+{
-+}
-+
-+#else /* CONFIG_COLDFIRE */
-+#include <asm/cf_tlbflush.h>
- #endif
- 
- #endif /* _M68K_TLBFLUSH_H */
---- a/include/asm-m68k/uaccess.h
-+++ b/include/asm-m68k/uaccess.h
-@@ -1,6 +1,9 @@
- #ifndef __M68K_UACCESS_H
- #define __M68K_UACCESS_H
- 
-+#ifdef CONFIG_COLDFIRE
-+#include <asm/cf_uaccess.h>
-+#else
- /*
-  * User space memory access functions
-  */
-@@ -367,4 +370,5 @@ unsigned long __clear_user(void __user *
- 
- #define strlen_user(str) strnlen_user(str, 32767)
- 
-+#endif /* CONFIG_COLDFIRE */
- #endif /* _M68K_UACCESS_H */
diff --git a/target/linux/coldfire/patches/003-mcfv4e_coldfire_headers2.patch b/target/linux/coldfire/patches/003-mcfv4e_coldfire_headers2.patch
deleted file mode 100644
index 473cebcf7..000000000
--- a/target/linux/coldfire/patches/003-mcfv4e_coldfire_headers2.patch
+++ /dev/null
@@ -1,1865 +0,0 @@
-From 3da86cd2810e9ba4e4a9e7471a92025172c1c990 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Wed, 31 Oct 2007 16:41:41 -0600
-Subject: [PATCH] Add Coldfire specific header files.
-
-LTIBName: mcfv4e-coldfire-headers2
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- include/asm-m68k/cf_cacheflush.h |  160 ++++++++++++++++
- include/asm-m68k/cf_entry.h      |  146 +++++++++++++++
- include/asm-m68k/cf_pgalloc.h    |   99 ++++++++++
- include/asm-m68k/cf_pgtable.h    |  357 ++++++++++++++++++++++++++++++++++++
- include/asm-m68k/cf_tlbflush.h   |   59 ++++++
- include/asm-m68k/cf_uaccess.h    |  376 ++++++++++++++++++++++++++++++++++++++
- include/asm-m68k/cfcache.h       |   86 +++++++++
- include/asm-m68k/cfmmu.h         |  104 +++++++++++
- include/asm-m68k/coldfire.h      |   38 ++++
- include/asm-m68k/coldfire_edma.h |   39 ++++
- include/asm-m68k/mcfqspi.h       |   50 +++++
- include/asm-m68k/mcfsim.h        |   96 ++++++++++
- include/asm-m68k/mcfuart.h       |  180 ++++++++++++++++++
- 13 files changed, 1790 insertions(+), 0 deletions(-)
- create mode 100644 include/asm-m68k/cf_cacheflush.h
- create mode 100644 include/asm-m68k/cf_entry.h
- create mode 100644 include/asm-m68k/cf_pgalloc.h
- create mode 100644 include/asm-m68k/cf_pgtable.h
- create mode 100644 include/asm-m68k/cf_tlbflush.h
- create mode 100644 include/asm-m68k/cf_uaccess.h
- create mode 100644 include/asm-m68k/cfcache.h
- create mode 100644 include/asm-m68k/cfmmu.h
- create mode 100644 include/asm-m68k/coldfire.h
- create mode 100644 include/asm-m68k/coldfire_edma.h
- create mode 100644 include/asm-m68k/mcfqspi.h
- create mode 100644 include/asm-m68k/mcfsim.h
- create mode 100644 include/asm-m68k/mcfuart.h
-
---- /dev/null
-+++ b/include/asm-m68k/cf_cacheflush.h
-@@ -0,0 +1,160 @@
-+#ifndef M68K_CF_CACHEFLUSH_H
-+#define M68K_CF_CACHEFLUSH_H
-+
-+#include <asm/cfcache.h>
-+
-+/*
-+ * Cache handling functions
-+ */
-+
-+#define flush_icache()						\
-+({								\
-+  unsigned long set;						\
-+  unsigned long start_set;					\
-+  unsigned long end_set;					\
-+								\
-+  start_set = 0;						\
-+  end_set = (unsigned long)LAST_DCACHE_ADDR;			\
-+								\
-+  for (set = start_set; set <= end_set; set += (0x10 - 3)) 	\
-+    asm volatile("cpushl %%ic,(%0)\n"				\
-+		 "\taddq%.l #1,%0\n"				\
-+		 "\tcpushl %%ic,(%0)\n"				\
-+		 "\taddq%.l #1,%0\n"				\
-+		 "\tcpushl %%ic,(%0)\n"				\
-+		 "\taddq%.l #1,%0\n"				\
-+		 "\tcpushl %%ic,(%0)" : : "a" (set));		\
-+})
-+
-+/*
-+ * invalidate the cache for the specified memory range.
-+ * It starts at the physical address specified for
-+ * the given number of bytes.
-+ */
-+extern void cache_clear(unsigned long paddr, int len);
-+/*
-+ * push any dirty cache in the specified memory range.
-+ * It starts at the physical address specified for
-+ * the given number of bytes.
-+ */
-+extern void cache_push(unsigned long paddr, int len);
-+
-+/*
-+ * push and invalidate pages in the specified user virtual
-+ * memory range.
-+ */
-+extern void cache_push_v(unsigned long vaddr, int len);
-+
-+/* This is needed whenever the virtual mapping of the current
-+   process changes.  */
-+
-+
-+#define flush_cache_all()		do { } while (0)
-+#define flush_cache_mm(mm)		do { } while (0)
-+#define flush_cache_range(mm, a, b)	do { } while (0)
-+#define flush_cache_page(vma, vmaddr, pfn)	do { } while (0)
-+
-+#define flush_dcache_range(paddr, len)	do { } while (0)
-+
-+/* Push the page at kernel virtual address and clear the icache */
-+/* use cpush %bc instead of cpush %dc, cinv %ic */
-+#define flush_page_to_ram(page) __flush_page_to_ram((void *) page_address(page))
-+extern inline void __flush_page_to_ram(void *address)
-+{
-+  unsigned long set;
-+  unsigned long start_set;
-+  unsigned long end_set;
-+  unsigned long addr = (unsigned long) address;
-+
-+  addr &= ~(PAGE_SIZE - 1); /* round down to page start address */
-+
-+  start_set = addr & _ICACHE_SET_MASK;
-+  end_set = (addr + PAGE_SIZE-1) & _ICACHE_SET_MASK;
-+
-+  if (start_set > end_set) {
-+    /* from the begining to the lowest address */
-+    for (set = 0; set <= end_set; set += (0x10 - 3))
-+      asm volatile("cpushl %%bc,(%0)\n"
-+		   "\taddq%.l #1,%0\n"
-+		   "\tcpushl %%bc,(%0)\n"
-+		   "\taddq%.l #1,%0\n"
-+		   "\tcpushl %%bc,(%0)\n"
-+		   "\taddq%.l #1,%0\n"
-+		   "\tcpushl %%bc,(%0)" : : "a" (set));
-+
-+    /* next loop will finish the cache ie pass the hole */
-+    end_set = LAST_ICACHE_ADDR;
-+  }
-+  for (set = start_set; set <= end_set; set += (0x10 - 3))
-+    asm volatile("cpushl %%bc,(%0)\n"
-+		 "\taddq%.l #1,%0\n"
-+		 "\tcpushl %%bc,(%0)\n"
-+		 "\taddq%.l #1,%0\n"
-+		 "\tcpushl %%bc,(%0)\n"
-+		 "\taddq%.l #1,%0\n"
-+		 "\tcpushl %%bc,(%0)" : : "a" (set));
-+}
-+
-+#define flush_dcache_page(page)			do { } while (0)
-+#define flush_icache_page(vma, pg)		do { } while (0)
-+#define flush_icache_user_range(adr, len)	do { } while (0)
-+/* NL */
-+#define flush_icache_user_page(vma, page, addr, len)	do { } while (0)
-+
-+/* Push n pages at kernel virtual address and clear the icache */
-+/* use cpush %bc instead of cpush %dc, cinv %ic */
-+extern inline void flush_icache_range(unsigned long address,
-+				      unsigned long endaddr)
-+{
-+  unsigned long set;
-+  unsigned long start_set;
-+  unsigned long end_set;
-+
-+  start_set = address & _ICACHE_SET_MASK;
-+  end_set = endaddr & _ICACHE_SET_MASK;
-+
-+  if (start_set > end_set) {
-+    /* from the begining to the lowest address */
-+    for (set = 0; set <= end_set; set += (0x10 - 3))
-+      asm volatile("cpushl %%ic,(%0)\n"
-+		   "\taddq%.l #1,%0\n"
-+		   "\tcpushl %%ic,(%0)\n"
-+		   "\taddq%.l #1,%0\n"
-+		   "\tcpushl %%ic,(%0)\n"
-+		   "\taddq%.l #1,%0\n"
-+		   "\tcpushl %%ic,(%0)" : : "a" (set));
-+
-+    /* next loop will finish the cache ie pass the hole */
-+    end_set = LAST_ICACHE_ADDR;
-+  }
-+  for (set = start_set; set <= end_set; set += (0x10 - 3))
-+    asm volatile("cpushl %%ic,(%0)\n"
-+		 "\taddq%.l #1,%0\n"
-+		 "\tcpushl %%ic,(%0)\n"
-+		 "\taddq%.l #1,%0\n"
-+		 "\tcpushl %%ic,(%0)\n"
-+		 "\taddq%.l #1,%0\n"
-+		 "\tcpushl %%ic,(%0)" : : "a" (set));
-+}
-+
-+static inline void copy_to_user_page(struct vm_area_struct *vma,
-+				     struct page *page, unsigned long vaddr,
-+				     void *dst, void *src, int len)
-+{
-+	memcpy(dst, src, len);
-+	flush_icache_user_page(vma, page, vaddr, len);
-+}
-+static inline void copy_from_user_page(struct vm_area_struct *vma,
-+				       struct page *page, unsigned long vaddr,
-+				       void *dst, void *src, int len)
-+{
-+	memcpy(dst, src, len);
-+}
-+
-+#define flush_cache_dup_mm(mm)			flush_cache_mm(mm)
-+#define flush_cache_vmap(start, end)		flush_cache_all()
-+#define flush_cache_vunmap(start, end)		flush_cache_all()
-+#define flush_dcache_mmap_lock(mapping)		do { } while (0)
-+#define flush_dcache_mmap_unlock(mapping)	do { } while (0)
-+
-+#endif /* M68K_CF_CACHEFLUSH_H */
---- /dev/null
-+++ b/include/asm-m68k/cf_entry.h
-@@ -0,0 +1,146 @@
-+#ifndef __CF_M68K_ENTRY_H
-+#define __CF_M68K_ENTRY_H
-+
-+#include <asm/setup.h>
-+#include <asm/page.h>
-+#include <asm/coldfire.h>
-+#include <asm/cfmmu.h>
-+#include <asm/asm-offsets.h>
-+
-+/*
-+ * Stack layout in 'ret_from_exception':
-+ *
-+ *	This allows access to the syscall arguments in registers d1-d5
-+ *
-+ *	 0(sp) - d1
-+ *	 4(sp) - d2
-+ *	 8(sp) - d3
-+ *	 C(sp) - d4
-+ *	10(sp) - d5
-+ *	14(sp) - a0
-+ *	18(sp) - a1
-+ *	1C(sp) - a2
-+ *	20(sp) - d0
-+ *	24(sp) - orig_d0
-+ *	28(sp) - stack adjustment
-+ *	2C(sp) - sr
-+ *	2E(sp) - pc
-+ *	32(sp) - format & vector
-+ *	36(sp) - MMUSR
-+ *	3A(sp) - MMUAR
-+ */
-+
-+/*
-+ * 97/05/14 Andreas: Register %a2 is now set to the current task throughout
-+ *		     the whole kernel.
-+ */
-+
-+/* the following macro is used when enabling interrupts */
-+/* portable version */
-+#define ALLOWINT	(~0x700)
-+#define	MAX_NOINT_IPL	0
-+
-+#ifdef __ASSEMBLY__
-+
-+#define curptr a2
-+
-+LFLUSH_I_AND_D = 0x00000808
-+LSIGTRAP = 5
-+
-+/* process bits for task_struct.ptrace */
-+PT_TRACESYS_OFF = 3
-+PT_TRACESYS_BIT = 1
-+PT_PTRACED_OFF = 3
-+PT_PTRACED_BIT = 0
-+PT_DTRACE_OFF = 3
-+PT_DTRACE_BIT = 2
-+
-+#define SAVE_ALL_INT save_all_int
-+#define SAVE_ALL_SYS save_all_sys
-+#define RESTORE_ALL restore_all
-+/*
-+ * This defines the normal kernel pt-regs layout.
-+ *
-+ * regs a3-a6 and d6-d7 are preserved by C code
-+ * the kernel doesn't mess with usp unless it needs to
-+ */
-+
-+/*
-+ * a -1 in the orig_d0 field signifies
-+ * that the stack frame is NOT for syscall
-+ */
-+.macro	save_all_int
-+	movel	MMUSR,%sp@-
-+	movel	MMUAR,%sp@-
-+	clrl	%sp@-		| stk_adj
-+	pea	-1:w		| orig d0
-+	movel	%d0,%sp@-	| d0
-+	subal	#(8*4), %sp
-+	moveml	%d1-%d5/%a0-%a1/%curptr,%sp@
-+.endm
-+
-+.macro	save_all_sys
-+	movel	MMUSR,%sp@-
-+	movel	MMUAR,%sp@-
-+	clrl	%sp@-		| stk_adj
-+	movel	%d0,%sp@-	| orig d0
-+	movel	%d0,%sp@-	| d0
-+	subal	#(8*4), %sp
-+	moveml	%d1-%d5/%a0-%a1/%curptr,%sp@
-+.endm
-+
-+.macro	restore_all
-+	moveml	%sp@,%a0-%a1/%curptr/%d1-%d5
-+	addal	#(8*4), %sp
-+	movel	%sp@+,%d0	| d0
-+	addql	#4,%sp		| orig d0
-+	addl	%sp@+,%sp	| stk_adj
-+	addql	#8,%sp		| MMUAR & MMUSR
-+	rte
-+.endm
-+
-+#define SWITCH_STACK_SIZE (6*4+4)	/* includes return address */
-+
-+#define SAVE_SWITCH_STACK save_switch_stack
-+#define RESTORE_SWITCH_STACK restore_switch_stack
-+#define GET_CURRENT(tmp) get_current tmp
-+
-+.macro	save_switch_stack
-+	subal	#(6*4), %sp
-+	moveml	%a3-%a6/%d6-%d7,%sp@
-+.endm
-+
-+.macro	restore_switch_stack
-+	moveml	%sp@,%a3-%a6/%d6-%d7
-+	addal	#(6*4), %sp
-+.endm
-+
-+.macro	get_current reg=%d0
-+	movel	%sp,\reg
-+	andl	#-THREAD_SIZE,\reg
-+	movel	\reg,%curptr
-+	movel	%curptr@,%curptr
-+.endm
-+
-+#else /* C source */
-+
-+#define STR(X) STR1(X)
-+#define STR1(X) #X
-+
-+#define PT_OFF_ORIG_D0	 0x24
-+#define PT_OFF_FORMATVEC 0x32
-+#define PT_OFF_SR	 0x2C
-+#define SAVE_ALL_INT				\
-+	"clrl	%%sp@-;"    /* stk_adj */	\
-+	"pea	-1:w;"	    /* orig d0 = -1 */	\
-+	"movel	%%d0,%%sp@-;" /* d0 */		\
-+	"subal	#(8*4),%sp"			\
-+	"moveml	%%d1-%%d5/%%a0-%%a2,%%sp@"
-+#define GET_CURRENT(tmp) \
-+	"movel	%%sp,"#tmp"\n\t" \
-+	"andw	#-"STR(THREAD_SIZE)","#tmp"\n\t" \
-+	"movel	"#tmp",%%a2\n\t"
-+
-+#endif
-+
-+#endif /* __CF_M68K_ENTRY_H */
---- /dev/null
-+++ b/include/asm-m68k/cf_pgalloc.h
-@@ -0,0 +1,99 @@
-+#ifndef M68K_CF_PGALLOC_H
-+#define M68K_CF_PGALLOC_H
-+
-+#include <asm/coldfire.h>
-+#include <asm/page.h>
-+#include <asm/cf_tlbflush.h>
-+
-+extern inline void pte_free_kernel(pte_t *pte)
-+{
-+	free_page((unsigned long) pte);
-+}
-+
-+extern const char bad_pmd_string[];
-+
-+extern inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
-+	unsigned long address)
-+{
-+	unsigned long page = __get_free_page(GFP_DMA|__GFP_REPEAT);
-+
-+	if (!page)
-+		return NULL;
-+
-+	memset((void *)page, 0, PAGE_SIZE);
-+	return (pte_t *) (page);
-+}
-+
-+extern inline pmd_t *pmd_alloc_kernel(pgd_t *pgd, unsigned long address)
-+{
-+	return (pmd_t *) pgd;
-+}
-+
-+#define pmd_alloc_one_fast(mm, address) ({ BUG(); ((pmd_t *)1); })
-+#define pmd_alloc_one(mm, address)      ({ BUG(); ((pmd_t *)2); })
-+
-+#define pte_alloc_one_fast(mm, addr) pte_alloc_one(mm, addr)
-+
-+#define pmd_populate(mm, pmd, page) (pmd_val(*pmd) = \
-+	(unsigned long)(page_address(page)))
-+#define pmd_populate_kernel(mm, pmd, pte) (pmd_val(*pmd) = (unsigned long)(pte))
-+
-+static inline void __pte_free_tlb(struct mmu_gather *tlb, struct page *page)
-+{
-+	__free_page(page);
-+}
-+
-+#define __pmd_free_tlb(tlb, pmd) do { } while (0)
-+
-+static inline struct page *pte_alloc_one(struct mm_struct *mm,
-+	unsigned long address)
-+{
-+	struct page *page = alloc_pages(GFP_DMA|__GFP_REPEAT, 0);
-+	pte_t *pte;
-+
-+	if (!page)
-+		return NULL;
-+
-+	pte = kmap(page);
-+	if (pte) {
-+		clear_page(pte);
-+		__flush_page_to_ram(pte);
-+		flush_tlb_kernel_page(pte);
-+		nocache_page(pte);
-+	}
-+	kunmap(pte);
-+
-+	return page;
-+}
-+
-+extern inline void pte_free(struct page *page)
-+{
-+	__free_page(page);
-+}
-+
-+/*
-+ * In our implementation, each pgd entry contains 1 pmd that is never allocated
-+ * or freed.  pgd_present is always 1, so this should never be called. -NL
-+ */
-+#define pmd_free(pmd) BUG()
-+
-+extern inline void pgd_free(pgd_t *pgd)
-+{
-+	free_page((unsigned long) pgd);
-+}
-+
-+extern inline pgd_t *pgd_alloc(struct mm_struct *mm)
-+{
-+     pgd_t *new_pgd;
-+
-+     new_pgd = (pgd_t *)__get_free_page(GFP_DMA | __GFP_NOWARN);
-+     if (!new_pgd)
-+	     return NULL;
-+     memcpy(new_pgd, swapper_pg_dir, PAGE_SIZE);
-+     memset(new_pgd, 0, PAGE_OFFSET >> PGDIR_SHIFT);
-+     return new_pgd;
-+}
-+
-+#define pgd_populate(mm, pmd, pte) BUG()
-+
-+#endif /* M68K_CF_PGALLOC_H */
---- /dev/null
-+++ b/include/asm-m68k/cf_pgtable.h
-@@ -0,0 +1,357 @@
-+#ifndef _CF_PGTABLE_H
-+#define _CF_PGTABLE_H
-+
-+#include <asm/cfmmu.h>
-+#include <asm/page.h>
-+
-+#ifndef __ASSEMBLY__
-+#include <asm/virtconvert.h>
-+#include <linux/linkage.h>
-+
-+/* For virtual address to physical address conversion */
-+#define VTOP(addr)	__pa(addr)
-+#define PTOV(addr)	__va(addr)
-+
-+
-+#endif	/* !__ASSEMBLY__ */
-+
-+/* Page protection values within PTE. */
-+
-+/* MMUDR bits, in proper place. */
-+#define CF_PAGE_LOCKED      (0x00000002)
-+#define CF_PAGE_EXEC        (0x00000004)
-+#define CF_PAGE_WRITABLE    (0x00000008)
-+#define CF_PAGE_READABLE    (0x00000010)
-+#define CF_PAGE_SYSTEM      (0x00000020)
-+#define CF_PAGE_COPYBACK    (0x00000040)
-+#define CF_PAGE_NOCACHE     (0x00000080)
-+
-+#define CF_CACHEMASK       (~0x00000040)
-+#define CF_PAGE_MMUDR_MASK  (0x000000fe)
-+
-+#define _PAGE_NOCACHE030  (CF_PAGE_NOCACHE)
-+
-+/* MMUTR bits, need shifting down.  */
-+#define CF_PAGE_VALID       (0x00000400)
-+#define CF_PAGE_SHARED      (0x00000800)
-+
-+#define CF_PAGE_MMUTR_MASK  (0x00000c00)
-+#define CF_PAGE_MMUTR_SHIFT (10)
-+#define CF_ASID_MMU_SHIFT   (2)
-+
-+/* Fake bits, not implemented in CF, will get masked out before
-+   hitting hardware, and might go away altogether once this port is
-+   complete.  */
-+#if PAGE_SHIFT < 13
-+#error COLDFIRE Error: Pages must be at least 8k in size
-+#endif
-+#define CF_PAGE_ACCESSED    (0x00001000)
-+#define CF_PAGE_FILE        (0x00000200)
-+#define CF_PAGE_DIRTY       (0x00000001)
-+
-+#define _PAGE_CACHE040	0x020   /* 68040 cache mode, cachable, copyback */
-+#define _PAGE_NOCACHE_S 0x040   /* 68040 no-cache mode, serialized */
-+#define _PAGE_NOCACHE   0x060   /* 68040 cache mode, non-serialized */
-+#define _PAGE_CACHE040W 0x000   /* 68040 cache mode, cachable, write-through */
-+#define _DESCTYPE_MASK  0x003
-+#define _CACHEMASK040   (~0x060)
-+#define _PAGE_GLOBAL040 0x400   /* 68040 global bit, used for kva descs */
-+
-+
-+/* Externally used page protection values. */
-+#define _PAGE_PRESENT	(CF_PAGE_VALID)
-+#define _PAGE_ACCESSED	(CF_PAGE_ACCESSED)
-+#define _PAGE_DIRTY	(CF_PAGE_DIRTY)
-+#define _PAGE_READWRITE (CF_PAGE_WRITABLE \
-+			| CF_PAGE_READABLE \
-+			| CF_PAGE_SYSTEM \
-+			| CF_PAGE_SHARED)
-+
-+/* Compound page protection values. */
-+#define PAGE_NONE	__pgprot(CF_PAGE_VALID \
-+				 | CF_PAGE_ACCESSED)
-+
-+#define PAGE_SHARED     __pgprot(CF_PAGE_VALID \
-+				 | CF_PAGE_ACCESSED \
-+				 | CF_PAGE_SHARED)
-+
-+#define PAGE_INIT	__pgprot(CF_PAGE_VALID \
-+				 | CF_PAGE_WRITABLE \
-+				 | CF_PAGE_READABLE \
-+				 | CF_PAGE_EXEC \
-+				 | CF_PAGE_SYSTEM \
-+				 | CF_PAGE_SHARED)
-+
-+#define PAGE_KERNEL	__pgprot(CF_PAGE_VALID \
-+				 | CF_PAGE_WRITABLE \
-+				 | CF_PAGE_READABLE \
-+				 | CF_PAGE_EXEC \
-+				 | CF_PAGE_SYSTEM \
-+				 | CF_PAGE_SHARED \
-+				 | CF_PAGE_ACCESSED)
-+
-+#define PAGE_COPY	__pgprot(CF_PAGE_VALID \
-+				 | CF_PAGE_ACCESSED \
-+				 | CF_PAGE_READABLE \
-+				 | CF_PAGE_DIRTY)
-+/*
-+ * Page protections for initialising protection_map.  See mm/mmap.c
-+ * for use.  In general, the bit positions are xwr, and P-items are
-+ * private, the S-items are shared.
-+ */
-+
-+#define __P000	PAGE_NONE
-+#define __P100	__pgprot(CF_PAGE_VALID \
-+			 | CF_PAGE_ACCESSED \
-+			 | CF_PAGE_EXEC)
-+#define __P010	__pgprot(CF_PAGE_VALID \
-+			 | CF_PAGE_WRITABLE \
-+			 | CF_PAGE_ACCESSED)
-+#define __P110	__pgprot(CF_PAGE_VALID \
-+			 | CF_PAGE_ACCESSED \
-+			 | CF_PAGE_WRITABLE \
-+			 | CF_PAGE_EXEC)
-+#define __P001	__pgprot(CF_PAGE_VALID \
-+			 | CF_PAGE_ACCESSED \
-+			 | CF_PAGE_READABLE)
-+#define __P101	__pgprot(CF_PAGE_VALID \
-+			 | CF_PAGE_ACCESSED \
-+			 | CF_PAGE_READABLE \
-+			 | CF_PAGE_EXEC)
-+#define __P011	__pgprot(CF_PAGE_VALID \
-+			 | CF_PAGE_READABLE \
-+			 | CF_PAGE_WRITABLE \
-+			 | CF_PAGE_ACCESSED)
-+#define __P111	__pgprot(CF_PAGE_VALID \
-+			 | CF_PAGE_ACCESSED \
-+			 | CF_PAGE_WRITABLE \
-+			 | CF_PAGE_READABLE \
-+			 | CF_PAGE_EXEC)
-+
-+#define __S000	PAGE_NONE
-+#define __S100	__pgprot(CF_PAGE_VALID \
-+			 | CF_PAGE_ACCESSED \
-+			 | CF_PAGE_SHARED \
-+			 | CF_PAGE_EXEC)
-+#define __S010	PAGE_SHARED
-+#define __S110	__pgprot(CF_PAGE_VALID \
-+			 | CF_PAGE_ACCESSED \
-+			 | CF_PAGE_SHARED \
-+			 | CF_PAGE_EXEC)
-+#define __S001	__pgprot(CF_PAGE_VALID \
-+			 | CF_PAGE_ACCESSED \
-+			 | CF_PAGE_SHARED \
-+			 | CF_PAGE_READABLE)
-+#define __S101	__pgprot(CF_PAGE_VALID \
-+			 | CF_PAGE_ACCESSED \
-+			 | CF_PAGE_SHARED \
-+			 | CF_PAGE_READABLE \
-+			 | CF_PAGE_EXEC)
-+#define __S011	__pgprot(CF_PAGE_VALID \
-+			 | CF_PAGE_ACCESSED \
-+			 | CF_PAGE_SHARED \
-+			 | CF_PAGE_READABLE)
-+#define __S111	__pgprot(CF_PAGE_VALID \
-+			 | CF_PAGE_ACCESSED \
-+			 | CF_PAGE_SHARED \
-+			 | CF_PAGE_READABLE \
-+			 | CF_PAGE_EXEC)
-+
-+#define PTE_MASK	PAGE_MASK
-+#define CF_PAGE_CHG_MASK	(PTE_MASK | CF_PAGE_ACCESSED | CF_PAGE_DIRTY)
-+
-+#ifndef __ASSEMBLY__
-+
-+/*
-+ * Conversion functions: convert a page and protection to a page entry,
-+ * and a page entry and page directory to the page they refer to.
-+ */
-+#define mk_pte(page, pgprot) pfn_pte(page_to_pfn(page), (pgprot))
-+
-+extern inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
-+{
-+	pte_val(pte) = (pte_val(pte) & CF_PAGE_CHG_MASK) | pgprot_val(newprot);
-+	return pte;
-+}
-+
-+#define pmd_set(pmdp, ptep) do {} while (0)
-+
-+extern inline void pgd_set(pgd_t *pgdp, pmd_t *pmdp)
-+{
-+	pgd_val(*pgdp) = virt_to_phys(pmdp);
-+}
-+
-+#define __pte_page(pte) \
-+	((unsigned long) ((pte_val(pte) & CF_PAGE_PGNUM_MASK) + PAGE_OFFSET))
-+#define __pmd_page(pmd) ((unsigned long) (pmd_val(pmd)))
-+
-+extern inline int pte_none(pte_t pte)
-+{
-+	return !pte_val(pte);
-+}
-+extern inline int pte_present(pte_t pte)
-+{
-+	return pte_val(pte) & CF_PAGE_VALID;
-+}
-+extern inline void pte_clear(struct mm_struct *mm, unsigned long addr,
-+	pte_t *ptep)
-+{
-+	pte_val(*ptep) = 0;
-+}
-+
-+#define pte_pagenr(pte)		((__pte_page(pte) - PAGE_OFFSET) >> PAGE_SHIFT)
-+#define pte_page(pte)		virt_to_page(__pte_page(pte))
-+
-+extern inline int pmd_none2(pmd_t *pmd) { return !pmd_val(*pmd); }
-+#define pmd_none(pmd) pmd_none2(&(pmd))
-+extern inline int pmd_bad2(pmd_t *pmd) { return 0; }
-+#define pmd_bad(pmd) pmd_bad2(&(pmd))
-+#define pmd_present(pmd) (!pmd_none2(&(pmd)))
-+extern inline void pmd_clear(pmd_t *pmdp) { pmd_val(*pmdp) = 0; }
-+
-+extern inline int pgd_none(pgd_t pgd) { return 0; }
-+extern inline int pgd_bad(pgd_t pgd) { return 0; }
-+extern inline int pgd_present(pgd_t pgd) { return 1; }
-+extern inline void pgd_clear(pgd_t *pgdp) {}
-+
-+
-+#define pte_ERROR(e) \
-+	printk(KERN_ERR "%s:%d: bad pte %08lx.\n",	\
-+	__FILE__, __LINE__, pte_val(e))
-+#define pmd_ERROR(e) \
-+	printk(KERN_ERR "%s:%d: bad pmd %08lx.\n",	\
-+	__FILE__, __LINE__, pmd_val(e))
-+#define pgd_ERROR(e) \
-+	printk(KERN_ERR "%s:%d: bad pgd %08lx.\n",	\
-+	__FILE__, __LINE__, pgd_val(e))
-+
-+
-+/*
-+ * The following only work if pte_present() is true.
-+ * Undefined behaviour if not...
-+ * [we have the full set here even if they don't change from m68k]
-+ */
-+extern inline int pte_read(pte_t pte)	\
-+	{ return pte_val(pte) & CF_PAGE_READABLE; }
-+extern inline int pte_write(pte_t pte)	\
-+	{ return pte_val(pte) & CF_PAGE_WRITABLE; }
-+extern inline int pte_exec(pte_t pte)	\
-+	{ return pte_val(pte) & CF_PAGE_EXEC; }
-+extern inline int pte_dirty(pte_t pte)	\
-+	{ return pte_val(pte) & CF_PAGE_DIRTY; }
-+extern inline int pte_young(pte_t pte)	\
-+	{ return pte_val(pte) & CF_PAGE_ACCESSED; }
-+extern inline int pte_file(pte_t pte)	\
-+	{ return pte_val(pte) & CF_PAGE_FILE; }
-+
-+extern inline pte_t pte_wrprotect(pte_t pte)	\
-+	{ pte_val(pte) &= ~CF_PAGE_WRITABLE; return pte; }
-+extern inline pte_t pte_rdprotect(pte_t pte)	\
-+	{ pte_val(pte) &= ~CF_PAGE_READABLE; return pte; }
-+extern inline pte_t pte_exprotect(pte_t pte)	\
-+	{ pte_val(pte) &= ~CF_PAGE_EXEC; return pte; }
-+extern inline pte_t pte_mkclean(pte_t pte)	\
-+	{ pte_val(pte) &= ~CF_PAGE_DIRTY; return pte; }
-+extern inline pte_t pte_mkold(pte_t pte)	\
-+	{ pte_val(pte) &= ~CF_PAGE_ACCESSED; return pte; }
-+extern inline pte_t pte_mkwrite(pte_t pte)	\
-+	{ pte_val(pte) |= CF_PAGE_WRITABLE; return pte; }
-+extern inline pte_t pte_mkread(pte_t pte)	\
-+	{ pte_val(pte) |= CF_PAGE_READABLE; return pte; }
-+extern inline pte_t pte_mkexec(pte_t pte)	\
-+	{ pte_val(pte) |= CF_PAGE_EXEC; return pte; }
-+extern inline pte_t pte_mkdirty(pte_t pte)	\
-+	{ pte_val(pte) |= CF_PAGE_DIRTY; return pte; }
-+extern inline pte_t pte_mkyoung(pte_t pte)	\
-+	{ pte_val(pte) |= CF_PAGE_ACCESSED; return pte; }
-+extern inline pte_t pte_mknocache(pte_t pte)	\
-+	{ pte_val(pte) |= 0x80 | (pte_val(pte) & ~0x40); return pte; }
-+extern inline pte_t pte_mkcache(pte_t pte)	\
-+	{ pte_val(pte) &= ~CF_PAGE_NOCACHE; return pte; }
-+
-+#define swapper_pg_dir kernel_pg_dir
-+extern pgd_t kernel_pg_dir[PTRS_PER_PGD];
-+
-+/* Find an entry in a pagetable directory. */
-+#define pgd_index(address)     ((address) >> PGDIR_SHIFT)
-+
-+#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
-+
-+/* Find an entry in a kernel pagetable directory. */
-+#define pgd_offset_k(address) pgd_offset(&init_mm, address)
-+
-+/* Find an entry in the second-level pagetable. */
-+extern inline pmd_t *pmd_offset(pgd_t *pgd, unsigned long address)
-+{
-+	return (pmd_t *) pgd;
-+}
-+
-+/* Find an entry in the third-level pagetable. */
-+#define __pte_offset(address) ((address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
-+#define pte_offset_kernel(dir, address) ((pte_t *) __pmd_page(*(dir)) + \
-+					  __pte_offset(address))
-+
-+/* Disable caching for page at given kernel virtual address. */
-+static inline void nocache_page(void *vaddr)
-+{
-+	pgd_t *dir;
-+	pmd_t *pmdp;
-+	pte_t *ptep;
-+	unsigned long addr = (unsigned long)vaddr;
-+
-+	dir = pgd_offset_k(addr);
-+	pmdp = pmd_offset(dir, addr);
-+	ptep = pte_offset_kernel(pmdp, addr);
-+	*ptep = pte_mknocache(*ptep);
-+}
-+
-+/* Enable caching for page at given kernel virtual address. */
-+static inline void cache_page(void *vaddr)
-+{
-+	pgd_t *dir;
-+	pmd_t *pmdp;
-+	pte_t *ptep;
-+	unsigned long addr = (unsigned long)vaddr;
-+
-+	dir = pgd_offset_k(addr);
-+	pmdp = pmd_offset(dir, addr);
-+	ptep = pte_offset_kernel(pmdp, addr);
-+	*ptep = pte_mkcache(*ptep);
-+}
-+
-+#define PTE_FILE_MAX_BITS	21
-+#define PTE_FILE_SHIFT		11
-+
-+static inline unsigned long pte_to_pgoff(pte_t pte)
-+{
-+	return pte_val(pte) >> PTE_FILE_SHIFT;
-+}
-+
-+static inline pte_t pgoff_to_pte(unsigned pgoff)
-+{
-+	pte_t pte = __pte((pgoff << PTE_FILE_SHIFT) + CF_PAGE_FILE);
-+	return pte;
-+}
-+
-+/* Encode and de-code a swap entry (must be !pte_none(e) && !pte_present(e)) */
-+#define __swp_entry(type, offset) ((swp_entry_t) { (type) |	\
-+				   (offset << PTE_FILE_SHIFT) })
-+#define __swp_type(x)		((x).val & 0xFF)
-+#define __swp_offset(x)		((x).val >> PTE_FILE_SHIFT)
-+#define __pte_to_swp_entry(pte)	((swp_entry_t) { pte_val(pte) })
-+#define __swp_entry_to_pte(x)	(__pte((x).val))
-+
-+#define pmd_page(pmd)		virt_to_page(__pmd_page(pmd))
-+
-+#define pte_offset_map(pmdp, address) ((pte_t *)__pmd_page(*pmdp) +	\
-+				       __pte_offset(address))
-+#define pte_offset_map_nested(pmdp, address) pte_offset_map(pmdp, address)
-+#define pte_unmap(pte) kunmap(pte)
-+#define pte_unmap_nested(pte) kunmap(pte)
-+
-+#define pfn_pte(pfn, prot)	__pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot))
-+#define pte_pfn(pte)		(pte_val(pte) >> PAGE_SHIFT)
-+
-+
-+#endif	/* !__ASSEMBLY__ */
-+#endif	/* !_CF_PGTABLE_H */
---- /dev/null
-+++ b/include/asm-m68k/cf_tlbflush.h
-@@ -0,0 +1,59 @@
-+#ifndef M68K_CF_TLBFLUSH_H
-+#define M68K_CF_TLBFLUSH_H
-+
-+#include <asm/coldfire.h>
-+
-+/* Flush all userspace mappings.  */
-+static inline void flush_tlb_all(void)
-+{
-+	preempt_disable();
-+	*MMUOR = MMUOR_CNL;
-+	preempt_enable();
-+}
-+
-+/* Clear user TLB entries within the context named in mm */
-+static inline void flush_tlb_mm(struct mm_struct *mm)
-+{
-+	preempt_disable();
-+	*MMUOR = MMUOR_CNL;
-+	preempt_enable();
-+}
-+
-+/* Flush a single TLB page.  */
-+static inline void flush_tlb_page(struct vm_area_struct *vma,
-+				   unsigned long addr)
-+{
-+	preempt_disable();
-+	*MMUOR = MMUOR_CNL;
-+	preempt_enable();
-+}
-+/* Flush a range of pages from TLB. */
-+
-+static inline void flush_tlb_range(struct mm_struct *mm,
-+		      unsigned long start, unsigned long end)
-+{
-+	preempt_disable();
-+	*MMUOR = MMUOR_CNL;
-+	preempt_enable();
-+}
-+
-+/* Flush kernel page from TLB. */
-+static inline void flush_tlb_kernel_page(void *addr)
-+{
-+	preempt_disable();
-+	*MMUOR = MMUOR_CNL;
-+	preempt_enable();
-+}
-+
-+static inline void flush_tlb_kernel_range(unsigned long start,
-+	unsigned long end)
-+{
-+	flush_tlb_all();
-+}
-+
-+extern inline void flush_tlb_pgtables(struct mm_struct *mm,
-+				      unsigned long start, unsigned long end)
-+{
-+}
-+
-+#endif /* M68K_CF_TLBFLUSH_H */
---- /dev/null
-+++ b/include/asm-m68k/cf_uaccess.h
-@@ -0,0 +1,376 @@
-+#ifndef __M68K_CF_UACCESS_H
-+#define __M68K_CF_UACCESS_H
-+
-+/*
-+ * User space memory access functions
-+ */
-+
-+/* The "moves" command is not available in the CF instruction set. */
-+#include <linux/compiler.h>
-+#include <linux/errno.h>
-+#include <linux/types.h>
-+#include <linux/sched.h>
-+#include <asm/segment.h>
-+
-+#define VERIFY_READ	0
-+#define VERIFY_WRITE	1
-+
-+/* We let the MMU do all checking */
-+#define access_ok(type, addr, size) 1
-+
-+/*
-+ * The exception table consists of pairs of addresses: the first is the
-+ * address of an instruction that is allowed to fault, and the second is
-+ * the address at which the program should continue.  No registers are
-+ * modified, so it is entirely up to the continuation code to figure out
-+ * what to do.
-+ *
-+ * All the routines below use bits of fixup code that are out of line
-+ * with the main instruction path.  This means when everything is well,
-+ * we don't even have to jump over them.  Further, they do not intrude
-+ * on our cache or tlb entries.
-+ */
-+
-+struct exception_table_entry
-+{
-+	unsigned long insn, fixup;
-+};
-+
-+extern int __put_user_bad(void);
-+extern int __get_user_bad(void);
-+
-+#define __put_user_asm(res, x, ptr, bwl, reg, err)	\
-+asm volatile ("\n"					\
-+	"1:	move."#bwl"	%2,%1\n"		\
-+	"2:\n"						\
-+	"	.section .fixup,\"ax\"\n"		\
-+	"	.even\n"				\
-+	"10:	moveq.l	%3,%0\n"			\
-+	"	jra 2b\n"				\
-+	"	.previous\n"				\
-+	"\n"						\
-+	"	.section __ex_table,\"a\"\n"		\
-+	"	.align	4\n"				\
-+	"	.long	1b,10b\n"			\
-+	"	.long	2b,10b\n"			\
-+	"	.previous"				\
-+	: "+d" (res), "=m" (*(ptr))			\
-+	: #reg (x), "i" (err))
-+
-+/*
-+ * These are the main single-value transfer routines.  They automatically
-+ * use the right size if we just have the right pointer type.
-+ */
-+
-+#define __put_user(x, ptr)						\
-+({									\
-+	typeof(*(ptr)) __pu_val = (x);					\
-+	int __pu_err = 0;						\
-+	__chk_user_ptr(ptr);						\
-+	switch (sizeof (*(ptr))) {					\
-+	case 1:								\
-+		__put_user_asm(__pu_err, __pu_val, ptr, b, d, -EFAULT);	\
-+		break;							\
-+	case 2:								\
-+		__put_user_asm(__pu_err, __pu_val, ptr, w, d, -EFAULT);	\
-+		break;							\
-+	case 4:								\
-+		__put_user_asm(__pu_err, __pu_val, ptr, l, r, -EFAULT);	\
-+		break;							\
-+	case 8:								\
-+		{							\
-+		const void __user *__pu_ptr = (ptr);			\
-+		asm volatile ("\n"					\
-+			"1:	move.l	%2,(%1)+\n"			\
-+			"2:	move.l	%R2,(%1)\n"			\
-+			"3:\n"						\
-+			"	.section .fixup,\"ax\"\n"		\
-+			"	.even\n"				\
-+			"10:	movel %3,%0\n"				\
-+			"	jra 3b\n"				\
-+			"	.previous\n"				\
-+			"\n"						\
-+			"	.section __ex_table,\"a\"\n"		\
-+			"	.align 4\n"				\
-+			"	.long 1b,10b\n"				\
-+			"	.long 2b,10b\n"				\
-+			"	.long 3b,10b\n"				\
-+			"	.previous"				\
-+			: "+d" (__pu_err), "+a" (__pu_ptr)		\
-+			: "r" (__pu_val), "i" (-EFAULT)			\
-+			: "memory");					\
-+		break;							\
-+	    }								\
-+	default:							\
-+		__pu_err = __put_user_bad();				\
-+		break;							\
-+	}								\
-+	__pu_err;							\
-+})
-+#define put_user(x, ptr)	__put_user(x, ptr)
-+
-+
-+#define __get_user_asm(res, x, ptr, type, bwl, reg, err) ({	\
-+	type __gu_val;						\
-+	asm volatile ("\n"					\
-+		"1:	move."#bwl"	%2,%1\n"		\
-+		"2:\n"						\
-+		"	.section .fixup,\"ax\"\n"		\
-+		"	.even\n"				\
-+		"10:	move.l	%3,%0\n"			\
-+		"	subl	%1,%1\n"			\
-+		"	jra	2b\n"				\
-+		"	.previous\n"				\
-+		"\n"						\
-+		"	.section __ex_table,\"a\"\n"		\
-+		"	.align	4\n"				\
-+		"	.long	1b,10b\n"			\
-+		"	.previous"				\
-+		: "+d" (res), "=&" #reg (__gu_val)		\
-+		: "m" (*(ptr)), "i" (err));			\
-+	(x) = (typeof(*(ptr)))(unsigned long)__gu_val;		\
-+})
-+
-+#define __get_user(x, ptr)						\
-+({									\
-+	int __gu_err = 0;						\
-+	__chk_user_ptr(ptr);						\
-+	switch (sizeof(*(ptr))) {					\
-+	case 1:								\
-+		__get_user_asm(__gu_err, x, ptr, u8, b, d, -EFAULT);	\
-+		break;							\
-+	case 2:								\
-+		__get_user_asm(__gu_err, x, ptr, u16, w, d, -EFAULT);	\
-+		break;							\
-+	case 4:								\
-+		__get_user_asm(__gu_err, x, ptr, u32, l, r, -EFAULT);	\
-+		break;							\
-+/*	case 8:	disabled because gcc-4.1 has a broken typeof		\
-+		{							\
-+		const void *__gu_ptr = (ptr);				\
-+		u64 __gu_val;						\
-+		asm volatile ("\n"					\
-+			"1:	move.l	(%2)+,%1\n"			\
-+			"2:	move.l	(%2),%R1\n"			\
-+			"3:\n"						\
-+			"	.section .fixup,\"ax\"\n"		\
-+			"	.even\n"				\
-+			"10:	move.l	%3,%0\n"			\
-+			"	subl	%1,%1\n"			\
-+			"	subl	%R1,%R1\n"			\
-+			"	jra	3b\n"				\
-+			"	.previous\n"				\
-+			"\n"						\
-+			"	.section __ex_table,\"a\"\n"		\
-+			"	.align	4\n"				\
-+			"	.long	1b,10b\n"			\
-+			"	.long	2b,10b\n"			\
-+			"	.previous"				\
-+			: "+d" (__gu_err), "=&r" (__gu_val),		\
-+			  "+a" (__gu_ptr)				\
-+			: "i" (-EFAULT)					\
-+			: "memory");					\
-+		(x) = (typeof(*(ptr)))__gu_val;				\
-+		break;							\
-+	    }	*/							\
-+	default:							\
-+		__gu_err = __get_user_bad();				\
-+		break;							\
-+	}								\
-+	__gu_err;							\
-+})
-+#define get_user(x, ptr) __get_user(x, ptr)
-+
-+unsigned long __generic_copy_from_user(void *to, const void __user *from,
-+	unsigned long n);
-+unsigned long __generic_copy_to_user(void __user *to, const void *from,
-+	unsigned long n);
-+
-+#define __constant_copy_from_user_asm(res, to, from, tmp, n, s1, s2, s3)\
-+	asm volatile ("\n"						\
-+		"1:	move."#s1"	(%2)+,%3\n"			\
-+		"	move."#s1"	%3,(%1)+\n"			\
-+		"2:	move."#s2"	(%2)+,%3\n"			\
-+		"	move."#s2"	%3,(%1)+\n"			\
-+		"	.ifnc	\""#s3"\",\"\"\n"			\
-+		"3:	move."#s3"	(%2)+,%3\n"			\
-+		"	move."#s3"	%3,(%1)+\n"			\
-+		"	.endif\n"					\
-+		"4:\n"							\
-+		"	.section __ex_table,\"a\"\n"			\
-+		"	.align	4\n"					\
-+		"	.long	1b,10f\n"				\
-+		"	.long	2b,20f\n"				\
-+		"	.ifnc	\""#s3"\",\"\"\n"			\
-+		"	.long	3b,30f\n"				\
-+		"	.endif\n"					\
-+		"	.previous\n"					\
-+		"\n"							\
-+		"	.section .fixup,\"ax\"\n"			\
-+		"	.even\n"					\
-+		"10:	clr."#s1"	(%1)+\n"			\
-+		"20:	clr."#s2"	(%1)+\n"			\
-+		"	.ifnc	\""#s3"\",\"\"\n"			\
-+		"30:	clr."#s3"	(%1)+\n"			\
-+		"	.endif\n"					\
-+		"	moveq.l	#"#n",%0\n"				\
-+		"	jra	4b\n"					\
-+		"	.previous\n"					\
-+		: "+d" (res), "+&a" (to), "+a" (from), "=&d" (tmp)	\
-+		: : "memory")
-+
-+static __always_inline unsigned long
-+__constant_copy_from_user(void *to, const void __user *from, unsigned long n)
-+{
-+	unsigned long res = 0, tmp;
-+
-+	switch (n) {
-+	case 1:
-+		__get_user_asm(res, *(u8 *)to, (u8 __user *)from, u8, b, d, 1);
-+		break;
-+	case 2:
-+		__get_user_asm(res, *(u16 *)to, (u16 __user *)from, u16, w,
-+			d, 2);
-+		break;
-+	case 3:
-+		__constant_copy_from_user_asm(res, to, from, tmp, 3, w, b,);
-+		break;
-+	case 4:
-+		__get_user_asm(res, *(u32 *)to, (u32 __user *)from, u32, l,
-+			r, 4);
-+		break;
-+	case 5:
-+		__constant_copy_from_user_asm(res, to, from, tmp, 5, l, b,);
-+		break;
-+	case 6:
-+		__constant_copy_from_user_asm(res, to, from, tmp, 6, l, w,);
-+		break;
-+	case 7:
-+		__constant_copy_from_user_asm(res, to, from, tmp, 7, l, w, b);
-+		break;
-+	case 8:
-+		__constant_copy_from_user_asm(res, to, from, tmp, 8, l, l,);
-+		break;
-+	case 9:
-+		__constant_copy_from_user_asm(res, to, from, tmp, 9, l, l, b);
-+		break;
-+	case 10:
-+		__constant_copy_from_user_asm(res, to, from, tmp, 10, l, l, w);
-+		break;
-+	case 12:
-+		__constant_copy_from_user_asm(res, to, from, tmp, 12, l, l, l);
-+		break;
-+	default:
-+		/* we limit the inlined version to 3 moves */
-+		return __generic_copy_from_user(to, from, n);
-+	}
-+
-+	return res;
-+}
-+
-+#define __constant_copy_to_user_asm(res, to, from, tmp, n, s1, s2, s3)	\
-+	asm volatile ("\n"						\
-+		"	move."#s1"	(%2)+,%3\n"			\
-+		"11:	move."#s1"	%3,(%1)+\n"			\
-+		"12:	move."#s2"	(%2)+,%3\n"			\
-+		"21:	move."#s2"	%3,(%1)+\n"			\
-+		"22:\n"							\
-+		"	.ifnc	\""#s3"\",\"\"\n"			\
-+		"	move."#s3"	(%2)+,%3\n"			\
-+		"31:	move."#s3"	%3,(%1)+\n"			\
-+		"32:\n"							\
-+		"	.endif\n"					\
-+		"4:\n"							\
-+		"\n"							\
-+		"	.section __ex_table,\"a\"\n"			\
-+		"	.align	4\n"					\
-+		"	.long	11b,5f\n"				\
-+		"	.long	12b,5f\n"				\
-+		"	.long	21b,5f\n"				\
-+		"	.long	22b,5f\n"				\
-+		"	.ifnc	\""#s3"\",\"\"\n"			\
-+		"	.long	31b,5f\n"				\
-+		"	.long	32b,5f\n"				\
-+		"	.endif\n"					\
-+		"	.previous\n"					\
-+		"\n"							\
-+		"	.section .fixup,\"ax\"\n"			\
-+		"	.even\n"					\
-+		"5:	moveq.l	#"#n",%0\n"				\
-+		"	jra	4b\n"					\
-+		"	.previous\n"					\
-+		: "+d" (res), "+a" (to), "+a" (from), "=&d" (tmp)	\
-+		: : "memory")
-+
-+static __always_inline unsigned long
-+__constant_copy_to_user(void __user *to, const void *from, unsigned long n)
-+{
-+	unsigned long res = 0, tmp;
-+
-+	switch (n) {
-+	case 1:
-+		__put_user_asm(res, *(u8 *)from, (u8 __user *)to, b, d, 1);
-+		break;
-+	case 2:
-+		__put_user_asm(res, *(u16 *)from, (u16 __user *)to, w, d, 2);
-+		break;
-+	case 3:
-+		__constant_copy_to_user_asm(res, to, from, tmp, 3, w, b,);
-+		break;
-+	case 4:
-+		__put_user_asm(res, *(u32 *)from, (u32 __user *)to, l, r, 4);
-+		break;
-+	case 5:
-+		__constant_copy_to_user_asm(res, to, from, tmp, 5, l, b,);
-+		break;
-+	case 6:
-+		__constant_copy_to_user_asm(res, to, from, tmp, 6, l, w,);
-+		break;
-+	case 7:
-+		__constant_copy_to_user_asm(res, to, from, tmp, 7, l, w, b);
-+		break;
-+	case 8:
-+		__constant_copy_to_user_asm(res, to, from, tmp, 8, l, l,);
-+		break;
-+	case 9:
-+		__constant_copy_to_user_asm(res, to, from, tmp, 9, l, l, b);
-+		break;
-+	case 10:
-+		__constant_copy_to_user_asm(res, to, from, tmp, 10, l, l, w);
-+		break;
-+	case 12:
-+		__constant_copy_to_user_asm(res, to, from, tmp, 12, l, l, l);
-+		break;
-+	default:
-+		/* limit the inlined version to 3 moves */
-+		return __generic_copy_to_user(to, from, n);
-+	}
-+
-+	return res;
-+}
-+
-+#define __copy_from_user(to, from, n)		\
-+(__builtin_constant_p(n) ?			\
-+ __constant_copy_from_user(to, from, n) :	\
-+ __generic_copy_from_user(to, from, n))
-+
-+#define __copy_to_user(to, from, n)		\
-+(__builtin_constant_p(n) ?			\
-+ __constant_copy_to_user(to, from, n) :		\
-+ __generic_copy_to_user(to, from, n))
-+
-+#define __copy_to_user_inatomic		__copy_to_user
-+#define __copy_from_user_inatomic	__copy_from_user
-+
-+#define copy_from_user(to, from, n)	__copy_from_user(to, from, n)
-+#define copy_to_user(to, from, n)	__copy_to_user(to, from, n)
-+
-+long strncpy_from_user(char *dst, const char __user *src, long count);
-+long strnlen_user(const char __user *src, long n);
-+unsigned long __clear_user(void __user *to, unsigned long n);
-+
-+#define clear_user __clear_user
-+
-+#define strlen_user(str) strnlen_user(str, 32767)
-+
-+#endif /* _M68K_CF_UACCESS_H */
---- /dev/null
-+++ b/include/asm-m68k/cfcache.h
-@@ -0,0 +1,86 @@
-+/*
-+ * include/asm-m68k/cfcache.h
-+ */
-+#ifndef CF_CFCACHE_H
-+#define CF_CFCACHE_H
-+
-+#define CF_CACR_DEC         (0x80000000) /* Data Cache Enable                */
-+#define CF_CACR_DW          (0x40000000) /* Data default Write-protect       */
-+#define CF_CACR_DESB        (0x20000000) /* Data Enable Store Buffer         */
-+#define CF_CACR_DDPI        (0x10000000) /* Data Disable CPUSHL Invalidate   */
-+#define CF_CACR_DHLCK       (0x08000000) /* 1/2 Data Cache Lock Mode         */
-+#define CF_CACR_DDCM_00     (0x00000000) /* Cacheable writethrough imprecise */
-+#define CF_CACR_DDCM_01     (0x02000000) /* Cacheable copyback               */
-+#define CF_CACR_DDCM_10     (0x04000000) /* Noncacheable precise             */
-+#define CF_CACR_DDCM_11     (0x06000000) /* Noncacheable imprecise           */
-+#define CF_CACR_DCINVA      (0x01000000) /* Data Cache Invalidate All        */
-+#define CF_CACR_IVO         (0x00100000) /* Invalidate only                  */
-+#define CF_CACR_BEC         (0x00080000) /* Branch Cache Enable              */
-+#define CF_CACR_BCINVA      (0x00040000) /* Branch Cache Invalidate All      */
-+#define CF_CACR_IEC         (0x00008000) /* Instruction Cache Enable         */
-+#define CF_CACR_SPA         (0x00004000) /* Search by Physical Address       */
-+#define CF_CACR_DNFB        (0x00002000) /* Default cache-inhibited fill buf */
-+#define CF_CACR_IDPI        (0x00001000) /* Instr Disable CPUSHL Invalidate  */
-+#define CF_CACR_IHLCK       (0x00000800) /* 1/2 Instruction Cache Lock Mode  */
-+#define CF_CACR_IDCM        (0x00000400) /* Noncacheable Instr default mode  */
-+#define CF_CACR_ICINVA      (0x00000100) /* Instr Cache Invalidate All       */
-+#define CF_CACR_EUSP        (0x00000020) /* Switch stacks in user mode       */
-+
-+#define DCACHE_LINE_SIZE 0x0010     /* bytes per line        */
-+#define DCACHE_WAY_SIZE  0x2000     /* words per cache block */
-+#define CACHE_DISABLE_MODE (CF_CACR_DCINVA+CF_CACR_BCINVA+CF_CACR_ICINVA)
-+#ifdef CONFIG_M5445X_DISABLE_CACHE
-+/* disable cache for testing rev0 silicon */
-+#define CACHE_INITIAL_MODE (CF_CACR_EUSP)
-+#else
-+#define CACHE_INITIAL_MODE (CF_CACR_DEC+CF_CACR_BEC+CF_CACR_IEC+CF_CACR_EUSP)
-+#endif
-+
-+#define _DCACHE_SIZE (2*16384)
-+#define _ICACHE_SIZE (2*16384)
-+
-+#define _SET_SHIFT 4
-+
-+/*
-+ * Masks for cache sizes.  Programming note: because the set size is a
-+ * power of two, the mask is also the last address in the set.
-+ * This may need to be #ifdef for other Coldfire processors.
-+ */
-+
-+#define _DCACHE_SET_MASK ((_DCACHE_SIZE/64-1)<<_SET_SHIFT)
-+#define _ICACHE_SET_MASK ((_ICACHE_SIZE/64-1)<<_SET_SHIFT)
-+#define LAST_DCACHE_ADDR _DCACHE_SET_MASK
-+#define LAST_ICACHE_ADDR _ICACHE_SET_MASK
-+
-+
-+#ifndef __ASSEMBLY__
-+
-+extern void DcacheFlushInvalidate(void);
-+
-+extern void DcacheDisable(void);
-+extern void DcacheEnable(void);
-+
-+/******************************************************************************/
-+/*** Unimplemented Cache functionality                                      ***/
-+/******************************************************************************/
-+#define preDcacheInvalidateBlockMark()
-+#define postDcacheInvalidateBlockMark()
-+#define DcacheZeroBlock(p, l)           fast_bzero((char *)(p), (long)(l))
-+#define loadDcacheInvalidateBlock()     ASSERT(!"Not Implemented on V4e")
-+#define IcacheInvalidateBlock()         ASSERT(!"Not Implemented on V4e")
-+
-+/******************************************************************************/
-+/*** Redundant Cache functionality on ColdFire                              ***/
-+/******************************************************************************/
-+#define DcacheInvalidateBlock(p, l) DcacheFlushInvalidateCacheBlock(p, l)
-+#define DcacheFlushCacheBlock(p, l) DcacheFlushInvalidateCacheBlock(p, l)
-+#define DcacheFlushBlock(p, l)      DcacheFlushInvalidateCacheBlock(p, l)
-+
-+extern void DcacheFlushInvalidateCacheBlock(void *start, unsigned long size);
-+extern void FLASHDcacheFlushInvalidate(void);
-+
-+extern void cacr_set(unsigned long x);
-+
-+#endif /* !__ASSEMBLY__ */
-+
-+#endif /* CF_CACHE_H */
---- /dev/null
-+++ b/include/asm-m68k/cfmmu.h
-@@ -0,0 +1,104 @@
-+/*
-+ * Definitions for Coldfire V4e MMU
-+ */
-+#include <asm/movs.h>
-+
-+#ifndef __CF_MMU_H__
-+#define __CF_MMU_H__
-+
-+
-+#define MMU_BASE 0xE1000000
-+
-+
-+#define MMUCR (MMU_BASE+0x00)
-+#define MMUCR_ASMN  1
-+#define MMUCR_ASM   (1<<MMUCR_ASMN)
-+#define MMUCR_ENN   0
-+#define MMUCR_EN    (1<<MMUCR_ENN)
-+
-+#define MMUOR REG16(MMU_BASE+0x04+0x02)
-+#define MMUOR_AAN   16
-+#define MMUOR_AA    (0xffff<<MMUOR_AAN)
-+#define MMUOR_STLBN 8
-+#define MMUOR_STLB  (1<<MMUOR_STLBN)
-+#define MMUOR_CAN   7
-+#define MMUOR_CA    (1<<MMUOR_CAN)
-+#define MMUOR_CNLN  6
-+#define MMUOR_CNL   (1<<MMUOR_CNLN)
-+#define MMUOR_CASN  5
-+#define MMUOR_CAS   (1<<MMUOR_CASN)
-+#define MMUOR_ITLBN 4
-+#define MMUOR_ITLB  (1<<MMUOR_ITLBN)
-+#define MMUOR_ADRN  3
-+#define MMUOR_ADR   (1<<MMUOR_ADRN)
-+#define MMUOR_RWN   2
-+#define MMUOR_RW    (1<<MMUOR_RWN)
-+#define MMUOR_ACCN  1
-+#define MMUOR_ACC   (1<<MMUOR_ACCN)
-+#define MMUOR_UAAN  0
-+#define MMUOR_UAA   (1<<MMUOR_UAAN)
-+
-+#define MMUSR REG32(MMU_BASE+0x08)
-+#define MMUSR_SPFN  5
-+#define MMUSR_SPF   (1<<MMUSR_SPFN)
-+#define MMUSR_RFN   4
-+#define MMUSR_RF    (1<<MMUSR_RFN)
-+#define MMUSR_WFN   3
-+#define MMUSR_WF    (1<<MMUSR_WFN)
-+#define MMUSR_HITN  1
-+#define MMUSR_HIT   (1<<MMUSR_HITN)
-+
-+#define MMUAR REG32(MMU_BASE+0x10)
-+#define MMUAR_VPN   1
-+#define MMUAR_VP    (0xfffffffe)
-+#define MMUAR_SN    0
-+#define MMUAR_S     (1<<MMUAR_SN)
-+
-+#define MMUTR REG32(MMU_BASE+0x14)
-+#define MMUTR_VAN   10
-+#define MMUTR_VA    (0xfffffc00)
-+#define MMUTR_IDN   2
-+#define MMUTR_ID    (0xff<<MMUTR_IDN)
-+#define MMUTR_SGN   1
-+#define MMUTR_SG    (1<<MMUTR_SGN)
-+#define MMUTR_VN    0
-+#define MMUTR_V     (1<<MMUTR_VN)
-+
-+#define MMUDR REG32(MMU_BASE+0x18)
-+#define MMUDR_PAN   10
-+#define MMUDR_PA    (0xfffffc00)
-+#define MMUDR_SZN   8
-+#define MMUDR_SZ_MASK (0x2<<MMUDR_SZN)
-+#define MMUDR_SZ1M  (0<<MMUDR_SZN)
-+#define MMUDR_SZ4K  (1<<MMUDR_SZN)
-+#define MMUDR_SZ8K  (2<<MMUDR_SZN)
-+#define MMUDR_SZ16M (3<<MMUDR_SZN)
-+#define MMUDR_CMN   6
-+#define MMUDR_INC   (2<<MMUDR_CMN)
-+#define MMUDR_IC    (0<<MMUDR_CMN)
-+#define MMUDR_DWT   (0<<MMUDR_CMN)
-+#define MMUDR_DCB   (1<<MMUDR_CMN)
-+#define MMUDR_DNCP  (2<<MMUDR_CMN)
-+#define MMUDR_DNCIP (3<<MMUDR_CMN)
-+#define MMUDR_SPN   5
-+#define MMUDR_SP    (1<<MMUDR_SPN)
-+#define MMUDR_RN    4
-+#define MMUDR_R     (1<<MMUDR_RN)
-+#define MMUDR_WN    3
-+#define MMUDR_W     (1<<MMUDR_WN)
-+#define MMUDR_XN    2
-+#define MMUDR_X     (1<<MMUDR_XN)
-+#define MMUDR_LKN   1
-+#define MMUDR_LK    (1<<MMUDR_LKN)
-+
-+
-+#ifndef __ASSEMBLY__
-+#define CF_PMEGS_NUM		256
-+#define CF_INVALID_CONTEXT 	255
-+#define CF_PAGE_PGNUM_MASK 	(PAGE_MASK)
-+
-+extern int cf_tlb_miss(struct pt_regs *regs, int write, int dtlb,
-+		       int extension_word);
-+#endif /* __ASSEMBLY__*/
-+
-+#endif	/* !__CF_MMU_H__ */
---- /dev/null
-+++ b/include/asm-m68k/coldfire.h
-@@ -0,0 +1,38 @@
-+#ifndef _COLDFIRE_H_
-+#define _COLDFIRE_H_
-+
-+#define MCF_MBAR	0x0
-+#define MCF_RAMBAR1 	0x40000000
-+#define MCF_SRAM	0x80000000
-+#define MCF_CLK     	CONFIG_MCFCLK
-+#define MCF_BUSCLK	(CONFIG_MCFCLK/2)
-+
-+#ifdef __ASSEMBLY__
-+#define REG32
-+#define REG16
-+#define REG08
-+#else  /* __ASSEMBLY__ */
-+#define REG32(x) ((volatile unsigned long  *)(x))
-+#define REG16(x) ((volatile unsigned short *)(x))
-+#define REG08(x) ((volatile unsigned char  *)(x))
-+
-+#define MCF_REG32(x) *(volatile unsigned long  *)(MCF_MBAR+(x))
-+#define MCF_REG16(x) *(volatile unsigned short *)(MCF_MBAR+(x))
-+#define MCF_REG08(x) *(volatile unsigned char  *)(MCF_MBAR+(x))
-+
-+void cacr_set(unsigned long);
-+unsigned long cacr_get(void);
-+
-+#define coldfire_enable_irq0(irq)	MCF_INTC0_CIMR = (irq);
-+
-+#define coldfire_enable_irq1(irq)	MCF_INTC1_CIMR = (irq);
-+
-+#define coldfire_disable_irq0(irq)	MCF_INTC0_SIMR = (irq);
-+
-+#define coldfire_disable_irq1(irq)	MCF_INTC1_SIMR = (irq);
-+
-+#define getiprh()			MCF_INTC0_IPRH
-+
-+#endif /* __ASSEMBLY__ */
-+
-+#endif  /* _COLDFIRE_H_  */
---- /dev/null
-+++ b/include/asm-m68k/coldfire_edma.h
-@@ -0,0 +1,39 @@
-+#ifndef _LINUX_COLDFIRE_DMA_H
-+#define _LINUX_COLDFIRE_DMA_H
-+
-+#include <linux/interrupt.h>
-+
-+#define EDMA_DRIVER_NAME 		"ColdFire-eDMA"
-+#define DMA_DEV_MINOR 			1
-+
-+#define EDMA_INT_CHANNEL_BASE 		8
-+#define EDMA_INT_CONTROLLER_BASE 	64
-+#define EDMA_CHANNELS			16
-+
-+#define EDMA_IRQ_LEVEL			5
-+
-+typedef irqreturn_t (*edma_irq_handler)(int, void *);
-+typedef void (*edma_error_handler)(int, void *);
-+
-+void set_edma_params(int channel, u32 source, u32 dest,
-+	u32 attr, u32 soff, u32 nbytes, u32 slast,
-+	u32 citer, u32 biter, u32 doff, u32 dlast_sga);
-+
-+void start_edma_transfer(int channel, int major_int);
-+
-+void stop_edma_transfer(int channel);
-+
-+void confirm_edma_interrupt_handled(int channel);
-+
-+void init_edma(void);
-+
-+int  request_edma_channel(int channel,
-+			edma_irq_handler handler,
-+			edma_error_handler error_handler,
-+			void *dev,
-+			spinlock_t *lock,
-+			const char *device_id);
-+
-+int free_edma_channel(int channel, void *dev);
-+
-+#endif
---- /dev/null
-+++ b/include/asm-m68k/mcfqspi.h
-@@ -0,0 +1,50 @@
-+/****************************************************************************/
-+/*
-+ *	mcfqspi.h - Master QSPI controller for the ColdFire processors
-+ *
-+ *	(C) Copyright 2005, Intec Automation,
-+ *			    Mike Lavender (mike@steroidmicros)
-+ *
-+
-+     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.
-+
-+     This program is distributed in the hope that it will be useful,
-+     but WITHOUT ANY WARRANTY; without even the implied warranty of
-+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+     GNU General Public License for more details.
-+
-+     You should have received a copy of the GNU General Public License
-+     along with this program; if not, write to the Free Software
-+     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.		     */
-+/* ------------------------------------------------------------------------- */
-+
-+#ifndef MCFQSPI_H_
-+#define MCFQSPI_H_
-+
-+#define QSPI_CS_INIT     0x01
-+#define QSPI_CS_ASSERT	 0x02
-+#define QSPI_CS_DROP	 0x04
-+
-+struct coldfire_spi_master {
-+	u16 bus_num;
-+	u16 num_chipselect;
-+	u8  irq_source;
-+	u32 irq_vector;
-+	u32 irq_mask;
-+	u8  irq_lp;
-+	u8  par_val;
-+	void (*cs_control)(u8 cs, u8 command);
-+};
-+
-+
-+struct coldfire_spi_chip {
-+	u8 mode;
-+	u8 bits_per_word;
-+	u8 del_cs_to_clk;
-+	u8 del_after_trans;
-+	u16 void_write_data;
-+};
-+#endif /*MCFQSPI_H_*/
---- /dev/null
-+++ b/include/asm-m68k/mcfsim.h
-@@ -0,0 +1,96 @@
-+/*
-+ *	mcfsim.h -- ColdFire System Integration Module support.
-+ *
-+ *	(C) Copyright 1999-2003, Greg Ungerer (gerg@snapgear.com)
-+ * 	(C) Copyright 2000, Lineo Inc. (www.lineo.com)
-+ */
-+
-+#ifndef	mcfsim_h
-+#define	mcfsim_h
-+
-+#if defined(CONFIG_COLDFIRE)
-+#include <asm/coldfire.h>
-+#endif
-+
-+#if defined(CONFIG_M54455)
-+#include <asm/mcf5445x_intc.h>
-+#include <asm/mcf5445x_gpio.h>
-+#include <asm/mcf5445x_i2c.h>
-+#include <asm/mcf5445x_ccm.h>
-+#include <asm/mcf5445x_pci.h>
-+#include <asm/mcf5445x_pciarb.h>
-+#include <asm/mcf5445x_eport.h>
-+#endif
-+
-+/*
-+ *	Define the base address of the SIM within the MBAR address space.
-+ */
-+#define	MCFSIM_BASE		0x0		/* Base address of SIM */
-+
-+/*
-+ *	Bit definitions for the ICR family of registers.
-+ */
-+#define	MCFSIM_ICR_AUTOVEC	0x80		/* Auto-vectored intr */
-+#define	MCFSIM_ICR_LEVEL0	0x00		/* Level 0 intr */
-+#define	MCFSIM_ICR_LEVEL1	0x04		/* Level 1 intr */
-+#define	MCFSIM_ICR_LEVEL2	0x08		/* Level 2 intr */
-+#define	MCFSIM_ICR_LEVEL3	0x0c		/* Level 3 intr */
-+#define	MCFSIM_ICR_LEVEL4	0x10		/* Level 4 intr */
-+#define	MCFSIM_ICR_LEVEL5	0x14		/* Level 5 intr */
-+#define	MCFSIM_ICR_LEVEL6	0x18		/* Level 6 intr */
-+#define	MCFSIM_ICR_LEVEL7	0x1c		/* Level 7 intr */
-+
-+#define	MCFSIM_ICR_PRI0		0x00		/* Priority 0 intr */
-+#define	MCFSIM_ICR_PRI1		0x01		/* Priority 1 intr */
-+#define	MCFSIM_ICR_PRI2		0x02		/* Priority 2 intr */
-+#define	MCFSIM_ICR_PRI3		0x03		/* Priority 3 intr */
-+
-+/*
-+ *	Bit definitions for the Interrupt Mask register (IMR).
-+ */
-+#define	MCFSIM_IMR_EINT1	0x0002		/* External intr # 1 */
-+#define	MCFSIM_IMR_EINT2	0x0004		/* External intr # 2 */
-+#define	MCFSIM_IMR_EINT3	0x0008		/* External intr # 3 */
-+#define	MCFSIM_IMR_EINT4	0x0010		/* External intr # 4 */
-+#define	MCFSIM_IMR_EINT5	0x0020		/* External intr # 5 */
-+#define	MCFSIM_IMR_EINT6	0x0040		/* External intr # 6 */
-+#define	MCFSIM_IMR_EINT7	0x0080		/* External intr # 7 */
-+
-+#define	MCFSIM_IMR_SWD		0x0100		/* Software Watchdog intr */
-+#define	MCFSIM_IMR_TIMER1	0x0200		/* TIMER 1 intr */
-+#define	MCFSIM_IMR_TIMER2	0x0400		/* TIMER 2 intr */
-+#define MCFSIM_IMR_MBUS		0x0800		/* MBUS intr	*/
-+#define	MCFSIM_IMR_UART1	0x1000		/* UART 1 intr */
-+#define	MCFSIM_IMR_UART2	0x2000		/* UART 2 intr */
-+
-+/*
-+ *	Mask for all of the SIM devices. Some parts have more or less
-+ *	SIM devices. This is a catchall for the sandard set.
-+ */
-+#ifndef MCFSIM_IMR_MASKALL
-+#define	MCFSIM_IMR_MASKALL	0x3ffe		/* All intr sources */
-+#endif
-+
-+
-+/*
-+ *	PIT interrupt settings, if not found in mXXXXsim.h file.
-+ */
-+#ifndef	ICR_INTRCONF
-+#define	ICR_INTRCONF		0x2b            /* PIT1 level 5, priority 3 */
-+#endif
-+#ifndef	MCFPIT_IMR
-+#define	MCFPIT_IMR		MCFINTC_IMRH
-+#endif
-+#ifndef	MCFPIT_IMR_IBIT
-+#define	MCFPIT_IMR_IBIT		(1 << (MCFINT_PIT1 - 32))
-+#endif
-+
-+
-+#ifndef __ASSEMBLY__
-+/*
-+ *	Definition for the interrupt auto-vectoring support.
-+ */
-+extern void	mcf_autovector(unsigned int vec);
-+#endif /* __ASSEMBLY__ */
-+
-+#endif	/* mcfsim_h */
---- /dev/null
-+++ b/include/asm-m68k/mcfuart.h
-@@ -0,0 +1,180 @@
-+/*
-+ *	mcfuart.h -- ColdFire internal UART support defines.
-+ *
-+ *	Matt Waddel Matt.Waddel@freescale.com
-+ *	Copyright Freescale Semiconductor, Inc. 2007
-+ *
-+ *	Derived from m68knommu version of this same file (Greg Ungerer & Lineo).
-+ *
-+ */
-+
-+#ifndef	mcfuart_h
-+#define	mcfuart_h
-+
-+/*
-+ *	Define the base address of the UARTS within the MBAR address
-+ *	space.
-+ */
-+#if defined(CONFIG_M54455)
-+#include <asm/mcf5445x_intc.h>
-+#define MCFUART_BASE1		0xfc060000	/* Base address of UART1 */
-+#define MCFUART_BASE2		0xfc064000	/* Base address of UART2 */
-+#define MCFUART_BASE3		0xfc068000	/* Base address of UART3 */
-+#define MCFINT_VECBASE		64
-+#define MCFINT_UART0		26
-+#endif
-+
-+
-+/*
-+ *	Define the ColdFire UART register set addresses.
-+ */
-+#define	MCFUART_UMR		0x00		/* Mode register (r/w) */
-+#define	MCFUART_USR		0x04		/* Status register (r) */
-+#define	MCFUART_UCSR		0x04		/* Clock Select (w) */
-+#define	MCFUART_UCR		0x08		/* Command register (w) */
-+#define	MCFUART_URB		0x0c		/* Receiver Buffer (r) */
-+#define	MCFUART_UTB		0x0c		/* Transmit Buffer (w) */
-+#define	MCFUART_UIPCR		0x10		/* Input Port Change (r) */
-+#define	MCFUART_UACR		0x10		/* Auxiliary Control (w) */
-+#define	MCFUART_UISR		0x14		/* Interrup Status (r) */
-+#define	MCFUART_UIMR		0x14		/* Interrupt Mask (w) */
-+#define	MCFUART_UBG1		0x18		/* Baud Rate MSB (r/w) */
-+#define	MCFUART_UBG2		0x1c		/* Baud Rate LSB (r/w) */
-+#ifdef	CONFIG_M5272
-+#define	MCFUART_UTF		0x28		/* Transmitter FIFO (r/w) */
-+#define	MCFUART_URF		0x2c		/* Receiver FIFO (r/w) */
-+#define	MCFUART_UFPD		0x30		/* Frac Prec. Divider (r/w) */
-+#else
-+#define	MCFUART_UIVR		0x30		/* Interrupt Vector (r/w) */
-+#endif
-+#define	MCFUART_UIPR		0x34		/* Input Port (r) */
-+#define	MCFUART_UOP1		0x38		/* Output Port Bit Set (w) */
-+#define	MCFUART_UOP0		0x3c		/* Output Port Bit Reset (w) */
-+
-+
-+/*
-+ *	Define bit flags in Mode Register 1 (MR1).
-+ */
-+#define	MCFUART_MR1_RXRTS	0x80		/* Auto RTS flow control */
-+#define	MCFUART_MR1_RXIRQFULL	0x40		/* RX IRQ type FULL */
-+#define	MCFUART_MR1_RXIRQRDY	0x00		/* RX IRQ type RDY */
-+#define	MCFUART_MR1_RXERRBLOCK	0x20		/* RX block error mode */
-+#define	MCFUART_MR1_RXERRCHAR	0x00		/* RX char error mode */
-+
-+#define	MCFUART_MR1_PARITYNONE	0x10		/* No parity */
-+#define	MCFUART_MR1_PARITYEVEN	0x00		/* Even parity */
-+#define	MCFUART_MR1_PARITYODD	0x04		/* Odd parity */
-+#define	MCFUART_MR1_PARITYSPACE	0x08		/* Space parity */
-+#define	MCFUART_MR1_PARITYMARK	0x0c		/* Mark parity */
-+
-+#define	MCFUART_MR1_CS5		0x00		/* 5 bits per char */
-+#define	MCFUART_MR1_CS6		0x01		/* 6 bits per char */
-+#define	MCFUART_MR1_CS7		0x02		/* 7 bits per char */
-+#define	MCFUART_MR1_CS8		0x03		/* 8 bits per char */
-+
-+/*
-+ *	Define bit flags in Mode Register 2 (MR2).
-+ */
-+#define	MCFUART_MR2_LOOPBACK	0x80		/* Loopback mode */
-+#define	MCFUART_MR2_REMOTELOOP	0xc0		/* Remote loopback mode */
-+#define	MCFUART_MR2_AUTOECHO	0x40		/* Automatic echo */
-+#define	MCFUART_MR2_TXRTS	0x20		/* Assert RTS on TX */
-+#define	MCFUART_MR2_TXCTS	0x10		/* Auto CTS flow control */
-+
-+#define	MCFUART_MR2_STOP1	0x07		/* 1 stop bit */
-+#define	MCFUART_MR2_STOP15	0x08		/* 1.5 stop bits */
-+#define	MCFUART_MR2_STOP2	0x0f		/* 2 stop bits */
-+
-+/*
-+ *	Define bit flags in Status Register (USR).
-+ */
-+#define	MCFUART_USR_RXBREAK	0x80		/* Received BREAK */
-+#define	MCFUART_USR_RXFRAMING	0x40		/* Received framing error */
-+#define	MCFUART_USR_RXPARITY	0x20		/* Received parity error */
-+#define	MCFUART_USR_RXOVERRUN	0x10		/* Received overrun error */
-+#define	MCFUART_USR_TXEMPTY	0x08		/* Transmitter empty */
-+#define	MCFUART_USR_TXREADY	0x04		/* Transmitter ready */
-+#define	MCFUART_USR_RXFULL	0x02		/* Receiver full */
-+#define	MCFUART_USR_RXREADY	0x01		/* Receiver ready */
-+
-+#define	MCFUART_USR_RXERR	(MCFUART_USR_RXBREAK | MCFUART_USR_RXFRAMING | \
-+				MCFUART_USR_RXPARITY | MCFUART_USR_RXOVERRUN)
-+
-+/*
-+ *	Define bit flags in Clock Select Register (UCSR).
-+ */
-+#define	MCFUART_UCSR_RXCLKTIMER	0xd0		/* RX clock is timer */
-+#define	MCFUART_UCSR_RXCLKEXT16	0xe0		/* RX clock is external x16 */
-+#define	MCFUART_UCSR_RXCLKEXT1	0xf0		/* RX clock is external x1 */
-+
-+#define	MCFUART_UCSR_TXCLKTIMER	0x0d		/* TX clock is timer */
-+#define	MCFUART_UCSR_TXCLKEXT16	0x0e		/* TX clock is external x16 */
-+#define	MCFUART_UCSR_TXCLKEXT1	0x0f		/* TX clock is external x1 */
-+
-+/*
-+ *	Define bit flags in Command Register (UCR).
-+ */
-+#define	MCFUART_UCR_CMDNULL		0x00	/* No command */
-+#define	MCFUART_UCR_CMDRESETMRPTR	0x10	/* Reset MR pointer */
-+#define	MCFUART_UCR_CMDRESETRX		0x20	/* Reset receiver */
-+#define	MCFUART_UCR_CMDRESETTX		0x30	/* Reset transmitter */
-+#define	MCFUART_UCR_CMDRESETERR		0x40	/* Reset error status */
-+#define	MCFUART_UCR_CMDRESETBREAK	0x50	/* Reset BREAK change */
-+#define	MCFUART_UCR_CMDBREAKSTART	0x60	/* Start BREAK */
-+#define	MCFUART_UCR_CMDBREAKSTOP	0x70	/* Stop BREAK */
-+
-+#define	MCFUART_UCR_TXNULL	0x00		/* No TX command */
-+#define	MCFUART_UCR_TXENABLE	0x04		/* Enable TX */
-+#define	MCFUART_UCR_TXDISABLE	0x08		/* Disable TX */
-+#define	MCFUART_UCR_RXNULL	0x00		/* No RX command */
-+#define	MCFUART_UCR_RXENABLE	0x01		/* Enable RX */
-+#define	MCFUART_UCR_RXDISABLE	0x02		/* Disable RX */
-+
-+/*
-+ *	Define bit flags in Input Port Change Register (UIPCR).
-+ */
-+#define	MCFUART_UIPCR_CTSCOS	0x10		/* CTS change of state */
-+#define	MCFUART_UIPCR_CTS	0x01		/* CTS value */
-+
-+/*
-+ *	Define bit flags in Input Port Register (UIP).
-+ */
-+#define	MCFUART_UIPR_CTS	0x01		/* CTS value */
-+
-+/*
-+ *	Define bit flags in Output Port Registers (UOP).
-+ *	Clear bit by writing to UOP0, set by writing to UOP1.
-+ */
-+#define	MCFUART_UOP_RTS		0x01		/* RTS set or clear */
-+
-+/*
-+ *	Define bit flags in the Auxiliary Control Register (UACR).
-+ */
-+#define	MCFUART_UACR_IEC	0x01		/* Input enable control */
-+
-+/*
-+ *	Define bit flags in Interrupt Status Register (UISR).
-+ *	These same bits are used for the Interrupt Mask Register (UIMR).
-+ */
-+#define	MCFUART_UIR_COS		0x80		/* Change of state (CTS) */
-+#define	MCFUART_UIR_DELTABREAK	0x04		/* Break start or stop */
-+#define	MCFUART_UIR_RXREADY	0x02		/* Receiver ready */
-+#define	MCFUART_UIR_TXREADY	0x01		/* Transmitter ready */
-+
-+#ifdef	CONFIG_M5272
-+/*
-+ *	Define bit flags in the Transmitter FIFO Register (UTF).
-+ */
-+#define	MCFUART_UTF_TXB		0x1f		/* Transmitter data level */
-+#define	MCFUART_UTF_FULL	0x20		/* Transmitter fifo full */
-+#define	MCFUART_UTF_TXS		0xc0		/* Transmitter status */
-+
-+/*
-+ *	Define bit flags in the Receiver FIFO Register (URF).
-+ */
-+#define	MCFUART_URF_RXB		0x1f		/* Receiver data level */
-+#define	MCFUART_URF_FULL	0x20		/* Receiver fifo full */
-+#define	MCFUART_URF_RXS		0xc0		/* Receiver status */
-+#endif
-+
-+#endif	/* mcfuart_h */
diff --git a/target/linux/coldfire/patches/004-m5445x_headers.patch b/target/linux/coldfire/patches/004-m5445x_headers.patch
deleted file mode 100644
index 3a72bf65d..000000000
--- a/target/linux/coldfire/patches/004-m5445x_headers.patch
+++ /dev/null
@@ -1,5136 +0,0 @@
-From fa0f89c9cf9ceecc3feac1d96914c8e91f98d90f Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Wed, 31 Oct 2007 16:43:01 -0600
-Subject: [PATCH] Add MCF5445x Specific Header Files.
-
-LTIBName: m5445x-headers
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- include/asm-m68k/mcf5445x_ccm.h    |  161 ++++
- include/asm-m68k/mcf5445x_dspi.h   |  402 ++++++++++
- include/asm-m68k/mcf5445x_dtim.h   |   87 +++
- include/asm-m68k/mcf5445x_edma.h   | 1458 ++++++++++++++++++++++++++++++++++++
- include/asm-m68k/mcf5445x_eport.h  |  117 +++
- include/asm-m68k/mcf5445x_fbcs.h   |  182 +++++
- include/asm-m68k/mcf5445x_gpio.h   | 1257 +++++++++++++++++++++++++++++++
- include/asm-m68k/mcf5445x_i2c.h    |   39 +
- include/asm-m68k/mcf5445x_intc.h   |  724 ++++++++++++++++++
- include/asm-m68k/mcf5445x_pci.h    |  238 ++++++
- include/asm-m68k/mcf5445x_pciarb.h |   40 +
- include/asm-m68k/mcf5445x_sdramc.h |  115 +++
- include/asm-m68k/mcf5445x_ssi.h    |  187 +++++
- include/asm-m68k/mcf5445x_usb.h    |   49 ++
- 14 files changed, 5056 insertions(+), 0 deletions(-)
- create mode 100644 include/asm-m68k/mcf5445x_ccm.h
- create mode 100644 include/asm-m68k/mcf5445x_dspi.h
- create mode 100644 include/asm-m68k/mcf5445x_dtim.h
- create mode 100644 include/asm-m68k/mcf5445x_edma.h
- create mode 100644 include/asm-m68k/mcf5445x_eport.h
- create mode 100644 include/asm-m68k/mcf5445x_fbcs.h
- create mode 100644 include/asm-m68k/mcf5445x_gpio.h
- create mode 100644 include/asm-m68k/mcf5445x_i2c.h
- create mode 100644 include/asm-m68k/mcf5445x_intc.h
- create mode 100644 include/asm-m68k/mcf5445x_pci.h
- create mode 100644 include/asm-m68k/mcf5445x_pciarb.h
- create mode 100644 include/asm-m68k/mcf5445x_sdramc.h
- create mode 100644 include/asm-m68k/mcf5445x_ssi.h
- create mode 100644 include/asm-m68k/mcf5445x_usb.h
-
---- /dev/null
-+++ b/include/asm-m68k/mcf5445x_ccm.h
-@@ -0,0 +1,161 @@
-+/*
-+ * Matt Waddel Matt.Waddel@freescale.com
-+ *
-+ * Copyright Freescale Semiconductor, Inc. 2007
-+ *
-+ * 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.
-+ */
-+
-+#ifndef __MCF5445X_CCM_H__
-+#define __MCF5445X_CCM_H__
-+
-+/*********************************************************************
-+*
-+* Chip Configuration Module (CCM)
-+*
-+*********************************************************************/
-+
-+/* Register read/write macros */
-+#define MCF_CCM_CCR	MCF_REG16(0xFC0A0004)	/* Chip Configuration Register (Read-only) (256 or 360 TEPBGA) */
-+#define MCF_CCM_RCON	MCF_REG16(0xFC0A0008)	/* Reset Configuration (Read-only) (256 or 360 TEPBGA) */
-+#define MCF_CCM_CIR	MCF_REG16(0xFC0A000A)	/* Chip Identification Register (Read-only) */
-+#define MCF_CCM_MISCCR	MCF_REG16(0xFC0A0010)	/* Miscellaneous Control Register */
-+#define MCF_CCM_CDR	MCF_REG16(0xFC0A0012)	/* Clock Divider Register */
-+#define MCF_CCM_UOCSR	MCF_REG16(0xFC0A0014)	/* USB On-the-Go Controller Status Register */
-+#define MCF_CCM_SBFSR	MCF_REG16(0xFC0A0018)	/* Serial Boot Facility Status Register (Read Only) */
-+#define MCF_CCM_SBFCR	MCF_REG16(0xFC0A0020)	/* Serial Boot Facility Control Register */
-+
-+/* Bit definitions and macros for CCR_360 */
-+#define MCF_CCM_CCR_360_PLLMULT2(x)         (((x) & 0x0003))	/* 2-Bit PLL clock mode */
-+#define MCF_CCM_CCR_360_PCISLEW             (0x0004)		/* PCI pad slew rate mode */
-+#define MCF_CCM_CCR_360_PCIMODE             (0x0008)		/* PCI host/agent mode */
-+#define MCF_CCM_CCR_360_PLLMODE             (0x0010)		/* PLL Mode */
-+#define MCF_CCM_CCR_360_FBCONFIG(x)         (((x) & 0x0007) << 5)  /* Flexbus/PCI port size configuration */
-+#define MCF_CCM_CCR_360_PLLMULT3(x)         (((x) & 0x0007))	/* 3-Bit PLL Clock Mode */
-+#define MCF_CCM_CCR_360_OSCMODE             (0x0008)		/* Oscillator Clock Mode */
-+#define MCF_CCM_CCR_360_FBCONFIG_MASK       (0x00E0)
-+#define MCF_CCM_CCR_360_PLLMULT2_MASK       (0x0003)
-+#define MCF_CCM_CCR_360_PLLMULT3_MASK       (0x0007)
-+#define MCF_CCM_CCR_360_FBCONFIG_NM_NP_32   (0x0000)
-+#define MCF_CCM_CCR_360_FBCONFIG_NM_NP_8    (0x0020)
-+#define MCF_CCM_CCR_360_FBCONFIG_NM_NP_16   (0x0040)
-+#define MCF_CCM_CCR_360_FBCONFIG_M_P_16     (0x0060)
-+#define MCF_CCM_CCR_360_FBCONFIG_M_NP_32    (0x0080)
-+#define MCF_CCM_CCR_360_FBCONFIG_M_NP_8     (0x00A0)
-+#define MCF_CCM_CCR_360_FBCONFIG_M_NP_16    (0x00C0)
-+#define MCF_CCM_CCR_360_FBCONFIG_M_P_8      (0x00E0)
-+#define MCF_CCM_CCR_360_PLLMULT2_12X        (0x0000)
-+#define MCF_CCM_CCR_360_PLLMULT2_6X         (0x0001)
-+#define MCF_CCM_CCR_360_PLLMULT2_16X        (0x0002)
-+#define MCF_CCM_CCR_360_PLLMULT2_8X         (0x0003)
-+#define MCF_CCM_CCR_360_PLLMULT3_20X        (0x0000)
-+#define MCF_CCM_CCR_360_PLLMULT3_10X        (0x0001)
-+#define MCF_CCM_CCR_360_PLLMULT3_24X        (0x0002)
-+#define MCF_CCM_CCR_360_PLLMULT3_18X        (0x0003)
-+#define MCF_CCM_CCR_360_PLLMULT3_12X        (0x0004)
-+#define MCF_CCM_CCR_360_PLLMULT3_6X         (0x0005)
-+#define MCF_CCM_CCR_360_PLLMULT3_16X        (0x0006)
-+#define MCF_CCM_CCR_360_PLLMULT3_8X         (0x0007)
-+
-+/* Bit definitions and macros for CCR_256 */
-+#define MCF_CCM_CCR_256_PLLMULT3(x)         (((x) & 0x0007))  /* 3-Bit PLL clock mode */
-+#define MCF_CCM_CCR_256_OSCMODE             (0x0008)	      /* Oscillator clock mode */
-+#define MCF_CCM_CCR_256_PLLMODE             (0x0010)	      /* PLL Mode */
-+#define MCF_CCM_CCR_256_FBCONFIG(x)         (((x) & 0x0007) << 5)  /* Flexbus/PCI port size configuration */
-+#define MCF_CCM_CCR_256_FBCONFIG_MASK       (0x00E0)
-+#define MCF_CCM_CCR_256_FBCONFIG_NM_32      (0x0000)
-+#define MCF_CCM_CCR_256_FBCONFIG_NM_8       (0x0020)
-+#define MCF_CCM_CCR_256_FBCONFIG_NM_16      (0x0040)
-+#define MCF_CCM_CCR_256_FBCONFIG_M_32       (0x0080)
-+#define MCF_CCM_CCR_256_FBCONFIG_M_8        (0x00A0)
-+#define MCF_CCM_CCR_256_FBCONFIG_M_16       (0x00C0)
-+#define MCF_CCM_CCR_256_PLLMULT3_MASK       (0x0007)
-+#define MCF_CCM_CCR_256_PLLMULT3_20X        (0x0000)
-+#define MCF_CCM_CCR_256_PLLMULT3_10X        (0x0001)
-+#define MCF_CCM_CCR_256_PLLMULT3_24X        (0x0002)
-+#define MCF_CCM_CCR_256_PLLMULT3_18X        (0x0003)
-+#define MCF_CCM_CCR_256_PLLMULT3_12X        (0x0004)
-+#define MCF_CCM_CCR_256_PLLMULT3_6X         (0x0005)
-+#define MCF_CCM_CCR_256_PLLMULT3_16X        (0x0006)
-+#define MCF_CCM_CCR_256_PLLMULT3_8X         (0x0007)
-+
-+/* Bit definitions and macros for RCON_360 */
-+#define MCF_CCM_RCON_360_PLLMULT(x)     (((x)&0x0003))	/* PLL clock mode */
-+#define MCF_CCM_RCON_360_PCISLEW        (0x0004)	/* PCI pad slew rate mode */
-+#define MCF_CCM_RCON_360_PCIMODE        (0x0008)	/* PCI host/agent mode */
-+#define MCF_CCM_RCON_360_PLLMODE        (0x0010)	/* PLL Mode */
-+#define MCF_CCM_RCON_360_FBCONFIG(x)    (((x) & 0x0007) << 5)	/* Flexbus/PCI port size configuration */
-+
-+/* Bit definitions and macros for RCON_256 */
-+#define MCF_CCM_RCON_256_PLLMULT(x)     (((x) & 0x0007)) /* PLL clock mode */
-+#define MCF_CCM_RCON_256_OSCMODE        (0x0008)	/* Oscillator clock mode */
-+#define MCF_CCM_RCON_256_PLLMODE        (0x0010)	/* PLL Mode */
-+#define MCF_CCM_RCON_256_FBCONFIG(x)    (((x) & 0x0007) << 5)	/* Flexbus/PCI port size configuration */
-+
-+/* Bit definitions and macros for CIR */
-+#define MCF_CCM_CIR_PRN(x)          (((x) & 0x003F))	/* Part revision number */
-+#define MCF_CCM_CIR_PIN(x)          (((x) & 0x03FF) << 6)	/* Part identification number */
-+#define MCF_CCM_CIR_PIN_MASK        (0xFFC0)
-+#define MCF_CCM_CIR_PRN_MASK        (0x003F)
-+#define MCF_CCM_CIR_PIN_MCF54450    (0x4F << 6)
-+#define MCF_CCM_CIR_PIN_MCF54451    (0x4D << 6)
-+#define MCF_CCM_CIR_PIN_MCF54452    (0x4B << 6)
-+#define MCF_CCM_CIR_PIN_MCF54453    (0x49 << 6)
-+#define MCF_CCM_CIR_PIN_MCF54454    (0x4A << 6)
-+#define MCF_CCM_CIR_PIN_MCF54455    (0x48 << 6)
-+
-+/* Bit definitions and macros for MISCCR */
-+#define MCF_CCM_MISCCR_USBSRC           (0x0001)	/* USB clock source */
-+#define MCF_CCM_MISCCR_USBOC            (0x0002)	/* USB VBUS over-current sense polarity */
-+#define MCF_CCM_MISCCR_USBPUE           (0x0004)	/* USB transceiver pull-up enable */
-+#define MCF_CCM_MISCCR_SSISRC           (0x0010)	/* SSI clock source */
-+#define MCF_CCM_MISCCR_TIMDMA           (0x0020)	/* Timer DMA mux selection */
-+#define MCF_CCM_MISCCR_SSIPUS           (0x0040)	/* SSI RXD/TXD pull select */
-+#define MCF_CCM_MISCCR_SSIPUE           (0x0080)	/* SSI RXD/TXD pull enable */
-+#define MCF_CCM_MISCCR_BMT(x)           (((x) & 0x0007) << 8)	/* Bus monitor timing field */
-+#define MCF_CCM_MISCCR_BME              (0x0800)	/* Bus monitor external enable bit */
-+#define MCF_CCM_MISCCR_LIMP             (0x1000)	/* Limp mode enable */
-+#define MCF_CCM_MISCCR_BMT_65536        (0)
-+#define MCF_CCM_MISCCR_BMT_32768        (1)
-+#define MCF_CCM_MISCCR_BMT_16384        (2)
-+#define MCF_CCM_MISCCR_BMT_8192         (3)
-+#define MCF_CCM_MISCCR_BMT_4096         (4)
-+#define MCF_CCM_MISCCR_BMT_2048         (5)
-+#define MCF_CCM_MISCCR_BMT_1024         (6)
-+#define MCF_CCM_MISCCR_BMT_512          (7)
-+#define MCF_CCM_MISCCR_SSIPUS_UP        (1)
-+#define MCF_CCM_MISCCR_SSIPUS_DOWN      (0)
-+#define MCF_CCM_MISCCR_TIMDMA_TIM       (1)
-+#define MCF_CCM_MISCCR_TIMDMA_SSI       (0)
-+#define MCF_CCM_MISCCR_SSISRC_CLKIN     (0)
-+#define MCF_CCM_MISCCR_SSISRC_PLL       (1)
-+#define MCF_CCM_MISCCR_USBOC_ACTHI      (0)
-+#define MCF_CCM_MISCCR_USBOV_ACTLO      (1)
-+#define MCF_CCM_MISCCR_USBSRC_CLKIN     (0)
-+#define MCF_CCM_MISCCR_USBSRC_PLL       (1)
-+
-+/* Bit definitions and macros for CDR */
-+#define MCF_CCM_CDR_SSIDIV(x)   (((x) & 0x00FF))	/* SSI oversampling clock divider */
-+#define MCF_CCM_CDR_LPDIV(x)    (((x) & 0x000F) << 8)	/* Low power clock divider */
-+
-+/* Bit definitions and macros for UOCSR */
-+#define MCF_CCM_UOCSR_XPDE          (0x0001)	/* On-chip transceiver pull-down enable */
-+#define MCF_CCM_UOCSR_UOMIE         (0x0002)	/* USB OTG misc interrupt enable */
-+#define MCF_CCM_UOCSR_WKUP          (0x0004)	/* USB OTG controller wake-up event */
-+#define MCF_CCM_UOCSR_PWRFLT        (0x0008)	/* VBUS power fault */
-+#define MCF_CCM_UOCSR_SEND          (0x0010)	/* Session end */
-+#define MCF_CCM_UOCSR_VVLD          (0x0020)	/* VBUS valid indicator */
-+#define MCF_CCM_UOCSR_BVLD          (0x0040)	/* B-peripheral valid indicator */
-+#define MCF_CCM_UOCSR_AVLD          (0x0080)	/* A-peripheral valid indicator */
-+#define MCF_CCM_UOCSR_DPPU          (0x0100)	/* D+ pull-up for FS enabled (read-only) */
-+#define MCF_CCM_UOCSR_DCR_VBUS      (0x0200)	/* VBUS discharge resistor enabled (read-only) */
-+#define MCF_CCM_UOCSR_CRG_VBUS      (0x0400)	/* VBUS charge resistor enabled (read-only) */
-+#define MCF_CCM_UOCSR_DMPD          (0x1000)	/* D- 15Kohm pull-down (read-only) */
-+#define MCF_CCM_UOCSR_DPPD          (0x2000)	/* D+ 15Kohm pull-down (read-only) */
-+
-+/********************************************************************/
-+
-+#endif /* __MCF5445X_CCM_H__ */
---- /dev/null
-+++ b/include/asm-m68k/mcf5445x_dspi.h
-@@ -0,0 +1,402 @@
-+/*
-+ * Yaroslav Vinogradov yaroslav.vinogradov@freescale.com
-+ *
-+ * Copyright Freescale Semiconductor, Inc. 2007
-+ *
-+ * 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.
-+ */
-+
-+#ifndef __MCF5445X_DSPI_H__
-+#define __MCF5445X_DSPI_H__
-+
-+/*********************************************************************
-+*
-+* DMA Serial Peripheral Interface (DSPI)
-+*
-+*********************************************************************/
-+
-+/* Register read/write macros */
-+#define MCF_DSPI_DMCR           MCF_REG32(0xFC05C000)   /* DSPI Module Configuration Register */
-+#define MCF_DSPI_DTCR           MCF_REG32(0xFC05C008)   /* DSPI Transfer Count Register */
-+#define MCF_DSPI_DCTAR0         MCF_REG32(0xFC05C00C)   /* DSPI Clock and Transfer Attributes Register */
-+#define MCF_DSPI_DCTAR1         MCF_REG32(0xFC05C010)   /* DSPI Clock and Transfer Attributes Register */
-+#define MCF_DSPI_DCTAR2         MCF_REG32(0xFC05C014)   /* DSPI Clock and Transfer Attributes Register */
-+#define MCF_DSPI_DCTAR3         MCF_REG32(0xFC05C018)   /* DSPI Clock and Transfer Attributes Register */
-+#define MCF_DSPI_DCTAR4         MCF_REG32(0xFC05C01C)   /* DSPI Clock and Transfer Attributes Register */
-+#define MCF_DSPI_DCTAR5         MCF_REG32(0xFC05C020)   /* DSPI Clock and Transfer Attributes Register */
-+#define MCF_DSPI_DCTAR6         MCF_REG32(0xFC05C024)   /* DSPI Clock and Transfer Attributes Register */
-+#define MCF_DSPI_DCTAR7         MCF_REG32(0xFC05C028)   /* DSPI Clock and Transfer Attributes Register */
-+#define MCF_DSPI_DSR            MCF_REG32(0xFC05C02C)   /* DSPI Status Register */
-+#define MCF_DSPI_DRSER          MCF_REG32(0xFC05C030)   /* DSPI DMA/Interrupt Request Select and Enable Register */
-+#define MCF_DSPI_DTFR           MCF_REG32(0xFC05C034)   /* DSPI Transmit FIFO Register */
-+#define MCF_DSPI_DRFR           MCF_REG32(0xFC05C038)   /* DSPI Receive FIFO Register */
-+#define MCF_DSPI_DTFDR0         MCF_REG32(0xFC05C03C)   /* DSPI Transmit FIFO Debugging Registers */
-+#define MCF_DSPI_DTFDR1         MCF_REG32(0xFC05C040)   /* DSPI Transmit FIFO Debugging Registers */
-+#define MCF_DSPI_DTFDR2         MCF_REG32(0xFC05C044)   /* DSPI Transmit FIFO Debugging Registers */
-+#define MCF_DSPI_DTFDR3         MCF_REG32(0xFC05C048)   /* DSPI Transmit FIFO Debugging Registers */
-+#define MCF_DSPI_DRFDR0         MCF_REG32(0xFC05C07C)   /* DSPI Receive FIFO Debugging Registers */
-+#define MCF_DSPI_DRFDR1         MCF_REG32(0xFC05C080)   /* DSPI Receive FIFO Debugging Registers */
-+#define MCF_DSPI_DRFDR2         MCF_REG32(0xFC05C084)   /* DSPI Receive FIFO Debugging Registers */
-+#define MCF_DSPI_DRFDR3         MCF_REG32(0xFC05C088)   /* DSPI Receive FIFO Debugging Registers */
-+
-+/* Parameterized register read/write macros for multiple registers */
-+#define MCF_DSPI_DCTAR(x)       MCF_REG32(0xFC05C00C+((x)*0x004))	/* DSPI Clock and Transfer Attributes Register */
-+#define MCF_DSPI_DTFDR(x)       MCF_REG32(0xFC05C03C+((x)*0x004))	/* DSPI Transmit FIFO Debugging Registers */
-+#define MCF_DSPI_DRFDR(x)       MCF_REG32(0xFC05C07C+((x)*0x004))	/* DSPI Receive FIFO Debugging Registers */
-+
-+/* Bit definitions and macros for DMCR */
-+#define MCF_DSPI_DMCR_HALT          (0x00000001)            /* Halt -- stops and starts DSPI transfers */
-+#define MCF_DSPI_DMCR_SMPLPT(x)     (((x)&0x00000003)<<8)   /* Sample point selection */
-+#define MCF_DSPI_DMCR_CLRRXF        (0x00000400)            /* Clear receive FIFO */
-+#define MCF_DSPI_DMCR_CLRTXF        (0x00000800)            /* Clear transmit FIFO */
-+#define MCF_DSPI_DMCR_DISRXF        (0x00001000)            /* Disable receive FIFO */
-+#define MCF_DSPI_DMCR_DISTXF        (0x00002000)            /* Disable transmit FIFO */
-+#define MCF_DSPI_DMCR_MDIS          (0x00004000)            /* Module Disable */
-+#define MCF_DSPI_DMCR_PCSIS0        (0x00010000)            /* Peripheral chip-select 0 inactive state */
-+#define MCF_DSPI_DMCR_PCSIS1        (0x00020000)            /* Peripheral chip-select 1 inactive state */
-+#define MCF_DSPI_DMCR_PCSIS2        (0x00040000)            /* Peripheral chip-select 2 inactive state */
-+#define MCF_DSPI_DMCR_PCSIS3        (0x00080000)            /* Peripheral chip-select 3 inactive state */
-+#define MCF_DSPI_DMCR_PCSIS4        (0x00100000)            /* Peripheral chip-select 4 inactive state */
-+#define MCF_DSPI_DMCR_PCSIS5        (0x00200000)            /* Peripheral chip-select 5 inactive state */
-+#define MCF_DSPI_DMCR_PCSIS6        (0x00400000)            /* Peripheral chip-select 6 inactive state */
-+#define MCF_DSPI_DMCR_PCSIS7        (0x00800000)            /* Peripheral chip-select 7 inactive state */
-+#define MCF_DSPI_DMCR_ROOE          (0x01000000)            /* Receive FIFO overflow overwrite enable */
-+#define MCF_DSPI_DMCR_PCSSE         (0x02000000)            /* Peripheral chip select strobe enable */
-+#define MCF_DSPI_DMCR_MTFE          (0x04000000)            /* Modified timing format enable */
-+#define MCF_DSPI_DMCR_FRZ           (0x08000000)            /* Freeze */
-+#define MCF_DSPI_DMCR_DCONF(x)      (((x)&0x00000003)<<28)  /* DSPI configuration */
-+#define MCF_DSPI_DMCR_CONT_SCKE     (0x40000000)            /* Continuous SCK enable */
-+#define MCF_DSPI_DMCR_MSTR          (0x80000000)            /* Master/Slave mode select */
-+#define MCF_DSPI_DMCR_DCONF_SPI     (0x00000000)
-+#define MCF_DSPI_DMCR_PCSIS7_LOW    (0x00000000)
-+#define MCF_DSPI_DMCR_PCSIS7_HIGH   (0x00800000)
-+#define MCF_DSPI_DMCR_PCSIS6_LOW    (0x00000000)
-+#define MCF_DSPI_DMCR_PCSIS6_HIGH   (0x00400000)
-+#define MCF_DSPI_DMCR_PCSIS5_LOW    (0x00000000)
-+#define MCF_DSPI_DMCR_PCSIS5_HIGH   (0x00200000)
-+#define MCF_DSPI_DMCR_PCSIS4_LOW    (0x00000000)
-+#define MCF_DSPI_DMCR_PCSIS4_HIGH   (0x00100000)
-+#define MCF_DSPI_DMCR_PCSIS3_LOW    (0x00000000)
-+#define MCF_DSPI_DMCR_PCSIS3_HIGH   (0x00080000)
-+#define MCF_DSPI_DMCR_PCSIS2_LOW    (0x00000000)
-+#define MCF_DSPI_DMCR_PCSIS2_HIGH   (0x00040000)
-+#define MCF_DSPI_DMCR_PCSIS1_LOW    (0x00000000)
-+#define MCF_DSPI_DMCR_PCSIS1_HIGH   (0x00020000)
-+#define MCF_DSPI_DMCR_PCSIS0_LOW    (0x00000000)
-+#define MCF_DSPI_DMCR_PCSIS0_HIGH   (0x00010000)
-+
-+/* Bit definitions and macros for DTCR */
-+#define MCF_DSPI_DTCR_SPI_TCNT(x)   (((x)&0x0000FFFF)<<16)  /* SPI transfer count */
-+
-+/* Bit definitions and macros for DCTAR group */
-+#define MCF_DSPI_DCTAR_BR(x)                (((x)&0x0000000F))      /* Baud rate scaler */
-+#define MCF_DSPI_DCTAR_DT(x)                (((x)&0x0000000F)<<4)   /* Delay after transfer scaler */
-+#define MCF_DSPI_DCTAR_ASC(x)               (((x)&0x0000000F)<<8)   /* After SCK delay scaler */
-+#define MCF_DSPI_DCTAR_CSSCK(x)             (((x)&0x0000000F)<<12)  /* PCS to SCK delay scaler */
-+#define MCF_DSPI_DCTAR_PBR(x)               (((x)&0x00000003)<<16)  /* Baud rate prescaler */
-+#define MCF_DSPI_DCTAR_PDT(x)               (((x)&0x00000003)<<18)  /* Delay after transfer prescaler */
-+#define MCF_DSPI_DCTAR_PASC(x)              (((x)&0x00000003)<<20)  /* After SCK delay prescaler */
-+#define MCF_DSPI_DCTAR_PCSSCK(x)            (((x)&0x00000003)<<22)  /* PCS to SCK delay prescaler */
-+#define MCF_DSPI_DCTAR_LSBFE                (0x01000000)            /* LSB first enable */
-+#define MCF_DSPI_DCTAR_CPHA                 (0x02000000)            /* Clock phase */
-+#define MCF_DSPI_DCTAR_CPOL                 (0x04000000)            /* Clock polarity */
-+#define MCF_DSPI_DCTAR_FMSZ(x)              (((x)&0x0000000F)<<27)  /* Frame size */
-+#define MCF_DSPI_DCTAR_DBR                  (0x80000000)            /* Double baud rate */
-+#define MCF_DSPI_DCTAR_CPOL_LOW             (0x00000000)
-+#define MCF_DSPI_DCTAR_CPOL_HIGH            (0x04000000)
-+#define MCF_DSPI_DCTAR_CPHA_LATCH_RISING    (0x00000000)
-+#define MCF_DSPI_DCTAR_CPHA_LATCH_FALLING   (0x02000000)
-+#define MCF_DSPI_DCTAR_PCSSCK_1CLK          (0x00000000)
-+#define MCF_DSPI_DCTAR_PCSSCK_3CLK          (0x00400000)
-+#define MCF_DSPI_DCTAR_PCSSCK_5CLK          (0x00800000)
-+#define MCF_DSPI_DCTAR_PCSSCK_7CLK          (0x00C00000)
-+#define MCF_DSPI_DCTAR_PASC_1CLK            (0x00000000)
-+#define MCF_DSPI_DCTAR_PASC_3CLK            (0x00100000)
-+#define MCF_DSPI_DCTAR_PASC_5CLK            (0x00200000)
-+#define MCF_DSPI_DCTAR_PASC_7CLK            (0x00300000)
-+#define MCF_DSPI_DCTAR_PDT_1CLK             (0x00000000)
-+#define MCF_DSPI_DCTAR_PDT_3CLK             (0x00040000)
-+#define MCF_DSPI_DCTAR_PDT_5CLK             (0x00080000)
-+#define MCF_DSPI_DCTAR_PDT_7CLK             (0x000C0000)
-+#define MCF_DSPI_DCTAR_PBR_2CLK             (0x00000000)
-+#define MCF_DSPI_DCTAR_PBR_3CLK             (0x00010000)
-+#define MCF_DSPI_DCTAR_PBR_5CLK             (0x00020000)
-+#define MCF_DSPI_DCTAR_PBR_7CLK             (0x00030000)
-+
-+/* Bit definitions and macros for DCTAR0 */
-+#define MCF_DSPI_DCTAR0_BR(x)                   (((x)&0x0000000F))      /* Baud rate scaler */
-+#define MCF_DSPI_DCTAR0_DT(x)                   (((x)&0x0000000F)<<4)   /* Delay after transfer scaler */
-+#define MCF_DSPI_DCTAR0_ASC(x)                  (((x)&0x0000000F)<<8)   /* After SCK delay scaler */
-+#define MCF_DSPI_DCTAR0_CSSCK(x)                (((x)&0x0000000F)<<12)  /* PCS to SCK delay scaler */
-+#define MCF_DSPI_DCTAR0_PBR(x)                  (((x)&0x00000003)<<16)  /* Baud rate prescaler */
-+#define MCF_DSPI_DCTAR0_PDT(x)                  (((x)&0x00000003)<<18)  /* Delay after transfer prescaler */
-+#define MCF_DSPI_DCTAR0_PASC(x)                 (((x)&0x00000003)<<20)  /* After SCK delay prescaler */
-+#define MCF_DSPI_DCTAR0_PCSSCK(x)               (((x)&0x00000003)<<22)  /* PCS to SCK delay prescaler */
-+#define MCF_DSPI_DCTAR0_LSBFE                   (0x01000000)            /* LSB first enable */
-+#define MCF_DSPI_DCTAR0_CPHA                    (0x02000000)            /* Clock phase */
-+#define MCF_DSPI_DCTAR0_CPOL                    (0x04000000)            /* Clock polarity */
-+#define MCF_DSPI_DCTAR0_FMSZ(x)                 (((x)&0x0000000F)<<27)  /* Frame size */
-+#define MCF_DSPI_DCTAR0_DBR                     (0x80000000)            /* Double baud rate */
-+#define MCF_DSPI_DCTAR0_CPOL_LOW                (0x00000000)
-+#define MCF_DSPI_DCTAR0_CPOL_HIGH               (0x04000000)
-+#define MCF_DSPI_DCTAR0_CPHA_LATCH_RISING       (0x00000000)
-+#define MCF_DSPI_DCTAR0_CPHA_LATCH_FALLING      (0x02000000)
-+#define MCF_DSPI_DCTAR0_PCSSCK_1CLK             (0x00000000)
-+#define MCF_DSPI_DCTAR0_PCSSCK_3CLK             (0x00400000)
-+#define MCF_DSPI_DCTAR0_PCSSCK_5CLK             (0x00800000)
-+#define MCF_DSPI_DCTAR0_PCSSCK_7CLK             (0x00C00000)
-+#define MCF_DSPI_DCTAR0_PASC_1CLK               (0x00000000)
-+#define MCF_DSPI_DCTAR0_PASC_3CLK               (0x00100000)
-+#define MCF_DSPI_DCTAR0_PASC_5CLK               (0x00200000)
-+#define MCF_DSPI_DCTAR0_PASC_7CLK               (0x00300000)
-+#define MCF_DSPI_DCTAR0_PDT_1CLK                (0x00000000)
-+#define MCF_DSPI_DCTAR0_PDT_3CLK                (0x00040000)
-+#define MCF_DSPI_DCTAR0_PDT_5CLK                (0x00080000)
-+#define MCF_DSPI_DCTAR0_PDT_7CLK                (0x000C0000)
-+#define MCF_DSPI_DCTAR0_PBR_2CLK                (0x00000000)
-+#define MCF_DSPI_DCTAR0_PBR_3CLK                (0x00010000)
-+#define MCF_DSPI_DCTAR0_PBR_5CLK                (0x00020000)
-+#define MCF_DSPI_DCTAR0_PBR_7CLK                (0x00030000)
-+
-+/* Bit definitions and macros for DCTAR1 */
-+#define MCF_DSPI_DCTAR1_BR(x)       (((x)&0x0000000F))      /* Baud rate scaler */
-+#define MCF_DSPI_DCTAR1_DT(x)       (((x)&0x0000000F)<<4)   /* Delay after transfer scaler */
-+#define MCF_DSPI_DCTAR1_ASC(x)      (((x)&0x0000000F)<<8)   /* After SCK delay scaler */
-+#define MCF_DSPI_DCTAR1_CSSCK(x)    (((x)&0x0000000F)<<12)  /* PCS to SCK delay scaler */
-+#define MCF_DSPI_DCTAR1_PBR(x)      (((x)&0x00000003)<<16)  /* Baud rate prescaler */
-+#define MCF_DSPI_DCTAR1_PDT(x)      (((x)&0x00000003)<<18)  /* Delay after transfer prescaler */
-+#define MCF_DSPI_DCTAR1_PASC(x)     (((x)&0x00000003)<<20)  /* After SCK delay prescaler */
-+#define MCF_DSPI_DCTAR1_PCSSCK(x)   (((x)&0x00000003)<<22)  /* PCS to SCK delay prescaler */
-+#define MCF_DSPI_DCTAR1_LSBFE       (0x01000000)            /* LSB first enable */
-+#define MCF_DSPI_DCTAR1_CPHA        (0x02000000)            /* Clock phase */
-+#define MCF_DSPI_DCTAR1_CPOL        (0x04000000)            /* Clock polarity */
-+#define MCF_DSPI_DCTAR1_FMSZ(x)     (((x)&0x0000000F)<<27)  /* Frame size */
-+#define MCF_DSPI_DCTAR1_DBR         (0x80000000)            /* Double baud rate */
-+
-+/* Bit definitions and macros for DCTAR2 */
-+#define MCF_DSPI_DCTAR2_BR(x)       (((x)&0x0000000F))      /* Baud rate scaler */
-+#define MCF_DSPI_DCTAR2_DT(x)       (((x)&0x0000000F)<<4)   /* Delay after transfer scaler */
-+#define MCF_DSPI_DCTAR2_ASC(x)      (((x)&0x0000000F)<<8)   /* After SCK delay scaler */
-+#define MCF_DSPI_DCTAR2_CSSCK(x)    (((x)&0x0000000F)<<12)  /* PCS to SCK delay scaler */
-+#define MCF_DSPI_DCTAR2_PBR(x)      (((x)&0x00000003)<<16)  /* Baud rate prescaler */
-+#define MCF_DSPI_DCTAR2_PDT(x)      (((x)&0x00000003)<<18)  /* Delay after transfer prescaler */
-+#define MCF_DSPI_DCTAR2_PASC(x)     (((x)&0x00000003)<<20)  /* After SCK delay prescaler */
-+#define MCF_DSPI_DCTAR2_PCSSCK(x)   (((x)&0x00000003)<<22)  /* PCS to SCK delay prescaler */
-+#define MCF_DSPI_DCTAR2_LSBFE       (0x01000000)            /* LSB first enable */
-+#define MCF_DSPI_DCTAR2_CPHA        (0x02000000)            /* Clock phase */
-+#define MCF_DSPI_DCTAR2_CPOL        (0x04000000)            /* Clock polarity */
-+#define MCF_DSPI_DCTAR2_FMSZ(x)     (((x)&0x0000000F)<<27)  /* Frame size */
-+#define MCF_DSPI_DCTAR2_DBR         (0x80000000)            /* Double baud rate */
-+
-+/* Bit definitions and macros for DCTAR3 */
-+#define MCF_DSPI_DCTAR3_BR(x)       (((x)&0x0000000F))      /* Baud rate scaler */
-+#define MCF_DSPI_DCTAR3_DT(x)       (((x)&0x0000000F)<<4)   /* Delay after transfer scaler */
-+#define MCF_DSPI_DCTAR3_ASC(x)      (((x)&0x0000000F)<<8)   /* After SCK delay scaler */
-+#define MCF_DSPI_DCTAR3_CSSCK(x)    (((x)&0x0000000F)<<12)  /* PCS to SCK delay scaler */
-+#define MCF_DSPI_DCTAR3_PBR(x)      (((x)&0x00000003)<<16)  /* Baud rate prescaler */
-+#define MCF_DSPI_DCTAR3_PDT(x)      (((x)&0x00000003)<<18)  /* Delay after transfer prescaler */
-+#define MCF_DSPI_DCTAR3_PASC(x)     (((x)&0x00000003)<<20)  /* After SCK delay prescaler */
-+#define MCF_DSPI_DCTAR3_PCSSCK(x)   (((x)&0x00000003)<<22)  /* PCS to SCK delay prescaler */
-+#define MCF_DSPI_DCTAR3_LSBFE       (0x01000000)            /* LSB first enable */
-+#define MCF_DSPI_DCTAR3_CPHA        (0x02000000)            /* Clock phase */
-+#define MCF_DSPI_DCTAR3_CPOL        (0x04000000)            /* Clock polarity */
-+#define MCF_DSPI_DCTAR3_FMSZ(x)     (((x)&0x0000000F)<<27)  /* Frame size */
-+#define MCF_DSPI_DCTAR3_DBR         (0x80000000)            /* Double baud rate */
-+
-+/* Bit definitions and macros for DCTAR4 */
-+#define MCF_DSPI_DCTAR4_BR(x)       (((x)&0x0000000F))      /* Baud rate scaler */
-+#define MCF_DSPI_DCTAR4_DT(x)       (((x)&0x0000000F)<<4)   /* Delay after transfer scaler */
-+#define MCF_DSPI_DCTAR4_ASC(x)      (((x)&0x0000000F)<<8)   /* After SCK delay scaler */
-+#define MCF_DSPI_DCTAR4_CSSCK(x)    (((x)&0x0000000F)<<12)  /* PCS to SCK delay scaler */
-+#define MCF_DSPI_DCTAR4_PBR(x)      (((x)&0x00000003)<<16)  /* Baud rate prescaler */
-+#define MCF_DSPI_DCTAR4_PDT(x)      (((x)&0x00000003)<<18)  /* Delay after transfer prescaler */
-+#define MCF_DSPI_DCTAR4_PASC(x)     (((x)&0x00000003)<<20)  /* After SCK delay prescaler */
-+#define MCF_DSPI_DCTAR4_PCSSCK(x)   (((x)&0x00000003)<<22)  /* PCS to SCK delay prescaler */
-+#define MCF_DSPI_DCTAR4_LSBFE       (0x01000000)            /* LSB first enable */
-+#define MCF_DSPI_DCTAR4_CPHA        (0x02000000)            /* Clock phase */
-+#define MCF_DSPI_DCTAR4_CPOL        (0x04000000)            /* Clock polarity */
-+#define MCF_DSPI_DCTAR4_FMSZ(x)     (((x)&0x0000000F)<<27)  /* Frame size */
-+#define MCF_DSPI_DCTAR4_DBR         (0x80000000)            /* Double baud rate */
-+
-+/* Bit definitions and macros for DCTAR5 */
-+#define MCF_DSPI_DCTAR5_BR(x)       (((x)&0x0000000F))      /* Baud rate scaler */
-+#define MCF_DSPI_DCTAR5_DT(x)       (((x)&0x0000000F)<<4)   /* Delay after transfer scaler */
-+#define MCF_DSPI_DCTAR5_ASC(x)      (((x)&0x0000000F)<<8)   /* After SCK delay scaler */
-+#define MCF_DSPI_DCTAR5_CSSCK(x)    (((x)&0x0000000F)<<12)  /* PCS to SCK delay scaler */
-+#define MCF_DSPI_DCTAR5_PBR(x)      (((x)&0x00000003)<<16)  /* Baud rate prescaler */
-+#define MCF_DSPI_DCTAR5_PDT(x)      (((x)&0x00000003)<<18)  /* Delay after transfer prescaler */
-+#define MCF_DSPI_DCTAR5_PASC(x)     (((x)&0x00000003)<<20)  /* After SCK delay prescaler */
-+#define MCF_DSPI_DCTAR5_PCSSCK(x)   (((x)&0x00000003)<<22)  /* PCS to SCK delay prescaler */
-+#define MCF_DSPI_DCTAR5_LSBFE       (0x01000000)            /* LSB first enable */
-+#define MCF_DSPI_DCTAR5_CPHA        (0x02000000)            /* Clock phase */
-+#define MCF_DSPI_DCTAR5_CPOL        (0x04000000)            /* Clock polarity */
-+#define MCF_DSPI_DCTAR5_FMSZ(x)     (((x)&0x0000000F)<<27)  /* Frame size */
-+#define MCF_DSPI_DCTAR5_DBR         (0x80000000)            /* Double baud rate */
-+
-+/* Bit definitions and macros for DCTAR6 */
-+#define MCF_DSPI_DCTAR6_BR(x)       (((x)&0x0000000F))      /* Baud rate scaler */
-+#define MCF_DSPI_DCTAR6_DT(x)       (((x)&0x0000000F)<<4)   /* Delay after transfer scaler */
-+#define MCF_DSPI_DCTAR6_ASC(x)      (((x)&0x0000000F)<<8)   /* After SCK delay scaler */
-+#define MCF_DSPI_DCTAR6_CSSCK(x)    (((x)&0x0000000F)<<12)  /* PCS to SCK delay scaler */
-+#define MCF_DSPI_DCTAR6_PBR(x)      (((x)&0x00000003)<<16)  /* Baud rate prescaler */
-+#define MCF_DSPI_DCTAR6_PDT(x)      (((x)&0x00000003)<<18)  /* Delay after transfer prescaler */
-+#define MCF_DSPI_DCTAR6_PASC(x)     (((x)&0x00000003)<<20)  /* After SCK delay prescaler */
-+#define MCF_DSPI_DCTAR6_PCSSCK(x)   (((x)&0x00000003)<<22)  /* PCS to SCK delay prescaler */
-+#define MCF_DSPI_DCTAR6_LSBFE       (0x01000000)            /* LSB first enable */
-+#define MCF_DSPI_DCTAR6_CPHA        (0x02000000)            /* Clock phase */
-+#define MCF_DSPI_DCTAR6_CPOL        (0x04000000)            /* Clock polarity */
-+#define MCF_DSPI_DCTAR6_FMSZ(x)     (((x)&0x0000000F)<<27)  /* Frame size */
-+#define MCF_DSPI_DCTAR6_DBR         (0x80000000)            /* Double baud rate */
-+
-+/* Bit definitions and macros for DCTAR7 */
-+#define MCF_DSPI_DCTAR7_BR(x)       (((x)&0x0000000F))      /* Baud rate scaler */
-+#define MCF_DSPI_DCTAR7_DT(x)       (((x)&0x0000000F)<<4)   /* Delay after transfer scaler */
-+#define MCF_DSPI_DCTAR7_ASC(x)      (((x)&0x0000000F)<<8)   /* After SCK delay scaler */
-+#define MCF_DSPI_DCTAR7_CSSCK(x)    (((x)&0x0000000F)<<12)  /* PCS to SCK delay scaler */
-+#define MCF_DSPI_DCTAR7_PBR(x)      (((x)&0x00000003)<<16)  /* Baud rate prescaler */
-+#define MCF_DSPI_DCTAR7_PDT(x)      (((x)&0x00000003)<<18)  /* Delay after transfer prescaler */
-+#define MCF_DSPI_DCTAR7_PASC(x)     (((x)&0x00000003)<<20)  /* After SCK delay prescaler */
-+#define MCF_DSPI_DCTAR7_PCSSCK(x)   (((x)&0x00000003)<<22)  /* PCS to SCK delay prescaler */
-+#define MCF_DSPI_DCTAR7_LSBFE       (0x01000000)            /* LSB first enable */
-+#define MCF_DSPI_DCTAR7_CPHA        (0x02000000)            /* Clock phase */
-+#define MCF_DSPI_DCTAR7_CPOL        (0x04000000)            /* Clock polarity */
-+#define MCF_DSPI_DCTAR7_FMSZ(x)     (((x)&0x0000000F)<<27)  /* Frame size */
-+#define MCF_DSPI_DCTAR7_DBR         (0x80000000)            /* Double baud rate */
-+
-+/* Bit definitions and macros for DSR */
-+#define MCF_DSPI_DSR_RXPTR(x)   (((x)&0x0000000F))      /* Receive next pointer */
-+#define MCF_DSPI_DSR_RXCTR(x)   (((x)&0x0000000F)<<4)   /* Receive FIFO counter */
-+#define MCF_DSPI_DSR_TXPTR(x)   (((x)&0x0000000F)<<8)   /* Transmit next pointer */
-+#define MCF_DSPI_DSR_TXCTR(x)   (((x)&0x0000000F)<<12)  /* Transmit FIFO counter */
-+#define MCF_DSPI_DSR_RFDF       (0x00020000)            /* Receive FIFO drain flag */
-+#define MCF_DSPI_DSR_RFOF       (0x00080000)            /* Receive FIFO overflow flag */
-+#define MCF_DSPI_DSR_TFFF       (0x02000000)            /* Transmit FIFO fill flag */
-+#define MCF_DSPI_DSR_TFUF       (0x08000000)            /* Transmit FIFO underflow flag */
-+#define MCF_DSPI_DSR_EOQF       (0x10000000)            /* End of queue flag */
-+#define MCF_DSPI_DSR_TXRXS      (0x40000000)            /* Tx and Rx status (enabled | disabled) */
-+#define MCF_DSPI_DSR_TCF        (0x80000000)            /* Transfer complete flag */
-+
-+/* Bit definitions and macros for DRSER */
-+#define MCF_DSPI_DRSER_RFDFS    (0x00010000)    /* Receive FIFO drain DMA or interrupt select */
-+#define MCF_DSPI_DRSER_RFDFE    (0x00020000)    /* Receive FIFO drain request enable */
-+#define MCF_DSPI_DRSER_RFOFE    (0x00080000)    /* Receive FIFO overflow request enable */
-+#define MCF_DSPI_DRSER_TFFFS    (0x01000000)    /* Transmit FIFO fill DMA or interrupt select */
-+#define MCF_DSPI_DRSER_TFFFE    (0x02000000)    /* Transmit FIFO fill request enable */
-+#define MCF_DSPI_DRSER_TFUFE    (0x08000000)    /* Transmit FIFO underflow request enable */
-+#define MCF_DSPI_DRSER_EOQFE    (0x10000000)    /* DSPI finished request enable */
-+#define MCF_DSPI_DRSER_TCFE     (0x80000000)    /* Transmission complete request enable */
-+
-+/* Bit definitions and macros for DTFR */
-+#define MCF_DSPI_DTFR_TXDATA(x)     (((x)&0x0000FFFF))      /* Transmit data */
-+#define MCF_DSPI_DTFR_PCS0          (0x00010000)            /* Peripheral chip select 0 */
-+#define MCF_DSPI_DTFR_PCS1          (0x00020000)            /* Peripheral chip select 1 */
-+#define MCF_DSPI_DTFR_PCS2          (0x00040000)            /* Peripheral chip select 2 */
-+#define MCF_DSPI_DTFR_PCS3          (0x00080000)            /* Peripheral chip select 3 */
-+#define MCF_DSPI_DTFR_PCS4          (0x00100000)            /* Peripheral chip select 4 */
-+#define MCF_DSPI_DTFR_PCS5          (0x00200000)            /* Peripheral chip select 5 */
-+#define MCF_DSPI_DTFR_PCS6          (0x00400000)            /* Peripheral chip select 6 */
-+#define MCF_DSPI_DTFR_PCS7          (0x00800000)            /* Peripheral chip select 7 */
-+#define MCF_DSPI_DTFR_CTCNT         (0x04000000)            /* Clear SPI transfer counter */
-+#define MCF_DSPI_DTFR_EOQ           (0x08000000)            /* End of queue */
-+#define MCF_DSPI_DTFR_CTAS(x)       (((x)&0x00000007)<<28)  /* Clock and transfer attributes select */
-+#define MCF_DSPI_DTFR_CONT          (0x80000000)            /* Continuous peripheral chip-select enable */
-+
-+/* Bit definitions and macros for DRFR */
-+#define MCF_DSPI_DRFR_RXDATA(x)     (((x)&0x0000FFFF))  /* Receive data */
-+
-+/* Bit definitions and macros for DTFDR group */
-+#define MCF_DSPI_DTFDR_TXDATA(x)    (((x)&0x0000FFFF))      /* Transmit data */
-+#define MCF_DSPI_DTFDR_PCS0         (0x00010000)            /* Peripheral chip select 0 */
-+#define MCF_DSPI_DTFDR_PCS1         (0x00020000)            /* Peripheral chip select 1 */
-+#define MCF_DSPI_DTFDR_PCS2         (0x00040000)            /* Peripheral chip select 2 */
-+#define MCF_DSPI_DTFDR_PCS3         (0x00080000)            /* Peripheral chip select 3 */
-+#define MCF_DSPI_DTFDR_PCS4         (0x00100000)            /* Peripheral chip select 4 */
-+#define MCF_DSPI_DTFDR_PCS5         (0x00200000)            /* Peripheral chip select 5 */
-+#define MCF_DSPI_DTFDR_PCS6         (0x00400000)            /* Peripheral chip select 6 */
-+#define MCF_DSPI_DTFDR_PCS7         (0x00800000)            /* Peripheral chip select 7 */
-+#define MCF_DSPI_DTFDR_CTCNT        (0x04000000)            /* Clear SPI transfer counter */
-+#define MCF_DSPI_DTFDR_EOQ          (0x08000000)            /* End of queue */
-+#define MCF_DSPI_DTFDR_CTAS(x)      (((x)&0x00000007)<<28)  /* Clock and transfer attributes select */
-+#define MCF_DSPI_DTFDR_CONT         (0x80000000)            /* Continuous peripheral chip-select enable */
-+
-+/* Bit definitions and macros for DTFDR0 */
-+#define MCF_DSPI_DTFDR0_TXDATA(x)   (((x)&0x0000FFFF))      /* Transmit data */
-+#define MCF_DSPI_DTFDR0_PCS0        (0x00010000)            /* Peripheral chip select 0 */
-+#define MCF_DSPI_DTFDR0_PCS1        (0x00020000)            /* Peripheral chip select 1 */
-+#define MCF_DSPI_DTFDR0_PCS2        (0x00040000)            /* Peripheral chip select 2 */
-+#define MCF_DSPI_DTFDR0_PCS3        (0x00080000)            /* Peripheral chip select 3 */
-+#define MCF_DSPI_DTFDR0_PCS4        (0x00100000)            /* Peripheral chip select 4 */
-+#define MCF_DSPI_DTFDR0_PCS5        (0x00200000)            /* Peripheral chip select 5 */
-+#define MCF_DSPI_DTFDR0_PCS6        (0x00400000)            /* Peripheral chip select 6 */
-+#define MCF_DSPI_DTFDR0_PCS7        (0x00800000)            /* Peripheral chip select 7 */
-+#define MCF_DSPI_DTFDR0_CTCNT       (0x04000000)            /* Clear SPI transfer counter */
-+#define MCF_DSPI_DTFDR0_EOQ         (0x08000000)            /* End of queue */
-+#define MCF_DSPI_DTFDR0_CTAS(x)     (((x)&0x00000007)<<28)  /* Clock and transfer attributes select */
-+#define MCF_DSPI_DTFDR0_CONT        (0x80000000)            /* Continuous peripheral chip-select enable */
-+
-+/* Bit definitions and macros for DTFDR1 */
-+#define MCF_DSPI_DTFDR1_TXDATA(x)   (((x)&0x0000FFFF))      /* Transmit data */
-+#define MCF_DSPI_DTFDR1_PCS0        (0x00010000)            /* Peripheral chip select 0 */
-+#define MCF_DSPI_DTFDR1_PCS1        (0x00020000)            /* Peripheral chip select 1 */
-+#define MCF_DSPI_DTFDR1_PCS2        (0x00040000)            /* Peripheral chip select 2 */
-+#define MCF_DSPI_DTFDR1_PCS3        (0x00080000)            /* Peripheral chip select 3 */
-+#define MCF_DSPI_DTFDR1_PCS4        (0x00100000)            /* Peripheral chip select 4 */
-+#define MCF_DSPI_DTFDR1_PCS5        (0x00200000)            /* Peripheral chip select 5 */
-+#define MCF_DSPI_DTFDR1_PCS6        (0x00400000)            /* Peripheral chip select 6 */
-+#define MCF_DSPI_DTFDR1_PCS7        (0x00800000)            /* Peripheral chip select 7 */
-+#define MCF_DSPI_DTFDR1_CTCNT       (0x04000000)            /* Clear SPI transfer counter */
-+#define MCF_DSPI_DTFDR1_EOQ         (0x08000000)            /* End of queue */
-+#define MCF_DSPI_DTFDR1_CTAS(x)     (((x)&0x00000007)<<28)  /* Clock and transfer attributes select */
-+#define MCF_DSPI_DTFDR1_CONT        (0x80000000)            /* Continuous peripheral chip-select enable */
-+
-+/* Bit definitions and macros for DTFDR2 */
-+#define MCF_DSPI_DTFDR2_TXDATA(x)   (((x)&0x0000FFFF))      /* Transmit data */
-+#define MCF_DSPI_DTFDR2_PCS0        (0x00010000)            /* Peripheral chip select 0 */
-+#define MCF_DSPI_DTFDR2_PCS1        (0x00020000)            /* Peripheral chip select 1 */
-+#define MCF_DSPI_DTFDR2_PCS2        (0x00040000)            /* Peripheral chip select 2 */
-+#define MCF_DSPI_DTFDR2_PCS3        (0x00080000)            /* Peripheral chip select 3 */
-+#define MCF_DSPI_DTFDR2_PCS4        (0x00100000)            /* Peripheral chip select 4 */
-+#define MCF_DSPI_DTFDR2_PCS5        (0x00200000)            /* Peripheral chip select 5 */
-+#define MCF_DSPI_DTFDR2_PCS6        (0x00400000)            /* Peripheral chip select 6 */
-+#define MCF_DSPI_DTFDR2_PCS7        (0x00800000)            /* Peripheral chip select 7 */
-+#define MCF_DSPI_DTFDR2_CTCNT       (0x04000000)            /* Clear SPI transfer counter */
-+#define MCF_DSPI_DTFDR2_EOQ         (0x08000000)            /* End of queue */
-+#define MCF_DSPI_DTFDR2_CTAS(x)     (((x)&0x00000007)<<28)  /* Clock and transfer attributes select */
-+#define MCF_DSPI_DTFDR2_CONT        (0x80000000)            /* Continuous peripheral chip-select enable */
-+
-+/* Bit definitions and macros for DTFDR3 */
-+#define MCF_DSPI_DTFDR3_TXDATA(x)   (((x)&0x0000FFFF))      /* Transmit data */
-+#define MCF_DSPI_DTFDR3_PCS0        (0x00010000)            /* Peripheral chip select 0 */
-+#define MCF_DSPI_DTFDR3_PCS1        (0x00020000)            /* Peripheral chip select 1 */
-+#define MCF_DSPI_DTFDR3_PCS2        (0x00040000)            /* Peripheral chip select 2 */
-+#define MCF_DSPI_DTFDR3_PCS3        (0x00080000)            /* Peripheral chip select 3 */
-+#define MCF_DSPI_DTFDR3_PCS4        (0x00100000)            /* Peripheral chip select 4 */
-+#define MCF_DSPI_DTFDR3_PCS5        (0x00200000)            /* Peripheral chip select 5 */
-+#define MCF_DSPI_DTFDR3_PCS6        (0x00400000)            /* Peripheral chip select 6 */
-+#define MCF_DSPI_DTFDR3_PCS7        (0x00800000)            /* Peripheral chip select 7 */
-+#define MCF_DSPI_DTFDR3_CTCNT       (0x04000000)            /* Clear SPI transfer counter */
-+#define MCF_DSPI_DTFDR3_EOQ         (0x08000000)            /* End of queue */
-+#define MCF_DSPI_DTFDR3_CTAS(x)     (((x)&0x00000007)<<28)  /* Clock and transfer attributes select */
-+#define MCF_DSPI_DTFDR3_CONT        (0x80000000)            /* Continuous peripheral chip-select enable */
-+
-+/* Bit definitions and macros for DRFDR group */
-+#define MCF_DSPI_DRFDR_RXDATA(x)    (((x)&0x0000FFFF))  /* Receive data */
-+
-+/* Bit definitions and macros for DRFDR0 */
-+#define MCF_DSPI_DRFDR0_RXDATA(x)   (((x)&0x0000FFFF))  /* Receive data */
-+
-+/* Bit definitions and macros for DRFDR1 */
-+#define MCF_DSPI_DRFDR1_RXDATA(x)   (((x)&0x0000FFFF))  /* Receive data */
-+
-+/* Bit definitions and macros for DRFDR2 */
-+#define MCF_DSPI_DRFDR2_RXDATA(x)   (((x)&0x0000FFFF))  /* Receive data */
-+
-+/* Bit definitions and macros for DRFDR3 */
-+#define MCF_DSPI_DRFDR3_RXDATA(x)   (((x)&0x0000FFFF))  /* Receive data */
-+
-+/********************************************************************/
-+
-+#endif /* __MCF5445X_DSPI_H__ */
---- /dev/null
-+++ b/include/asm-m68k/mcf5445x_dtim.h
-@@ -0,0 +1,87 @@
-+/*
-+ * Matt Waddel Matt.Waddel@freescale.com
-+ *
-+ * Copyright Freescale Semiconductor, Inc. 2007
-+ *
-+ * 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.
-+ */
-+
-+#ifndef __MCF5445X_DTIM_H__
-+#define __MCF5445X_DTIM_H__
-+
-+/*********************************************************************
-+*
-+* DMA Timers (DTIM)
-+*
-+*********************************************************************/
-+/* Register read/write macros */
-+#define MCF_DTIM0_DTMR	0xFC070000	/* DMA Timer Mode Register */
-+#define MCF_DTIM0_DTXMR	0xFC070002	/* DMA Timer Extended Mode Register */
-+#define MCF_DTIM0_DTER	0xFC070003	/* DMA Timer Event Register */
-+#define MCF_DTIM0_DTRR	0xFC070004	/* DMA Timer Reference Register */
-+#define MCF_DTIM0_DTCR	0xFC070008	/* DMA Timer Capture Register */
-+#define MCF_DTIM0_DTCN	0xFC07000C	/* DMA Timer Counter Register */
-+#define MCF_DTIM1_DTMR	0xFC074000	/* DMA Timer Mode Register */
-+#define MCF_DTIM1_DTXMR	0xFC074002	/* DMA Timer Extended Mode Register */
-+#define MCF_DTIM1_DTER	0xFC074003	/* DMA Timer Event Register */
-+#define MCF_DTIM1_DTRR	0xFC074004	/* DMA Timer Reference Register */
-+#define MCF_DTIM1_DTCR	0xFC074008	/* DMA Timer Capture Register */
-+#define MCF_DTIM1_DTCN	0xFC07400C	/* DMA Timer Counter Register */
-+#define MCF_DTIM2_DTMR	0xFC078000	/* DMA Timer Mode Register */
-+#define MCF_DTIM2_DTXMR	0xFC078002	/* DMA Timer Extended Mode Register */
-+#define MCF_DTIM2_DTER	0xFC078003	/* DMA Timer Event Register */
-+#define MCF_DTIM2_DTRR	0xFC078004	/* DMA Timer Reference Register */
-+#define MCF_DTIM2_DTCR	0xFC078008	/* DMA Timer Capture Register */
-+#define MCF_DTIM2_DTCN	0xFC07800C	/* DMA Timer Counter Register */
-+#define MCF_DTIM3_DTMR	0xFC07C000	/* DMA Timer Mode Register */
-+#define MCF_DTIM3_DTXMR	0xFC07C002	/* DMA Timer Extended Mode Register */
-+#define MCF_DTIM3_DTER	0xFC07C003	/* DMA Timer Event Register */
-+#define MCF_DTIM3_DTRR	0xFC07C004	/* DMA Timer Reference Register */
-+#define MCF_DTIM3_DTCR	0xFC07C008	/* DMA Timer Capture Register */
-+#define MCF_DTIM3_DTCN	0xFC07C00C	/* DMA Timer Counter Register */
-+
-+/* Parameterized register read/write macros for multiple modules */
-+#define MCF_DTIM_DTMR(x)	0xFC070000+((x)*0x4000)  /* DMA Timer Mode Register */
-+#define MCF_DTIM_DTXMR(x)	0xFC070002+((x)*0x4000)  /* DMA Timer Extended Mode Register */
-+#define MCF_DTIM_DTER(x)	0xFC070003+((x)*0x4000)  /* DMA Timer Event Register */
-+#define MCF_DTIM_DTRR(x)	0xFC070004+((x)*0x4000)  /* DMA Timer Reference Register */
-+#define MCF_DTIM_DTCR(x)	0xFC070008+((x)*0x4000)  /* DMA Timer Capture Register */
-+#define MCF_DTIM_DTCN(x)	0xFC07000C+((x)*0x4000)  /* DMA Timer Counter Register */
-+
-+/* Bit definitions and macros for DTMR */
-+#define MCF_DTIM_DTMR_RST	(0x0001)		/* Reset */
-+#define MCF_DTIM_DTMR_CLK(x)	(((x)&0x0003)<<1)	/* Input clock source */
-+#define MCF_DTIM_DTMR_FRR	(0x0008)		/* Free run/restart */
-+#define MCF_DTIM_DTMR_ORRI	(0x0010)		/* Output reference request/interrupt enable */
-+#define MCF_DTIM_DTMR_OM	(0x0020)		/* Output Mode */
-+#define MCF_DTIM_DTMR_CE(x)	(((x)&0x0003)<<6)	/* Capture Edge */
-+#define MCF_DTIM_DTMR_PS(x)	(((x)&0x00FF)<<8)	/* Prescaler value */
-+#define MCF_DTIM_DTMR_RST_EN	(0x0001)
-+#define MCF_DTIM_DTMR_RST_RST	(0x0000)
-+#define MCF_DTIM_DTMR_CE_ANY	(0x00C0)
-+#define MCF_DTIM_DTMR_CE_FALL	(0x0080)
-+#define MCF_DTIM_DTMR_CE_RISE	(0x0040)
-+#define MCF_DTIM_DTMR_CE_NONE	(0x0000)
-+#define MCF_DTIM_DTMR_CLK_DTIN	(0x0006)
-+#define MCF_DTIM_DTMR_CLK_DIV16	(0x0004)
-+#define MCF_DTIM_DTMR_CLK_DIV1	(0x0002)
-+#define MCF_DTIM_DTMR_CLK_STOP	(0x0000)
-+
-+/* Bit definitions and macros for DTXMR */
-+#define MCF_DTIM_DTXMR_MODE16	(0x01)	/* Increment Mode */
-+#define MCF_DTIM_DTXMR_DMAEN	(0x80)	/* DMA request */
-+
-+/* Bit definitions and macros for DTER */
-+#define MCF_DTIM_DTER_CAP	(0x01)	/* Capture event */
-+#define MCF_DTIM_DTER_REF	(0x02)	/* Output reference event */
-+
-+/* Interrupts used for system timers */
-+#define MCFSIM_ICR_TIMER1       (0xFC048040+32)
-+#define MCFSIM_ICR_TIMER2       (0xFC048040+33)
-+
-+/********************************************************************/
-+
-+#endif /* __MCF5445X_DTIM_H__ */
---- /dev/null
-+++ b/include/asm-m68k/mcf5445x_edma.h
-@@ -0,0 +1,1458 @@
-+/*
-+ * Yaroslav Vinogradov yaroslav.vinogradov@freescale.com
-+ *
-+ * Copyright Freescale Semiconductor, Inc. 2007
-+ *
-+ * 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.
-+ */
-+#ifndef __MCF5445X_EDMA_H__
-+#define __MCF5445X_EDMA_H__
-+
-+/*********************************************************************
-+*
-+* Enhanced DMA (EDMA)
-+*
-+*********************************************************************/
-+
-+/* Register read/write macros */
-+#define MCF_EDMA_CR                     MCF_REG32(0xFC044000)
-+#define MCF_EDMA_ES                     MCF_REG32(0xFC044004)
-+#define MCF_EDMA_ERQ                    MCF_REG16(0xFC04400E)
-+#define MCF_EDMA_EEI                    MCF_REG16(0xFC044016)
-+#define MCF_EDMA_SERQ                   MCF_REG08(0xFC044018)
-+#define MCF_EDMA_CERQ                   MCF_REG08(0xFC044019)
-+#define MCF_EDMA_SEEI                   MCF_REG08(0xFC04401A)
-+#define MCF_EDMA_CEEI                   MCF_REG08(0xFC04401B)
-+#define MCF_EDMA_CINT                   MCF_REG08(0xFC04401C)
-+#define MCF_EDMA_CERR                   MCF_REG08(0xFC04401D)
-+#define MCF_EDMA_SSRT                   MCF_REG08(0xFC04401E)
-+#define MCF_EDMA_CDNE                   MCF_REG08(0xFC04401F)
-+#define MCF_EDMA_INTR                   MCF_REG16(0xFC044026)
-+#define MCF_EDMA_ERR                    MCF_REG16(0xFC04402E)
-+#define MCF_EDMA_DCHPRI0                MCF_REG08(0xFC044100)
-+#define MCF_EDMA_DCHPRI1                MCF_REG08(0xFC044101)
-+#define MCF_EDMA_DCHPRI2                MCF_REG08(0xFC044102)
-+#define MCF_EDMA_DCHPRI3                MCF_REG08(0xFC044103)
-+#define MCF_EDMA_DCHPRI4                MCF_REG08(0xFC044104)
-+#define MCF_EDMA_DCHPRI5                MCF_REG08(0xFC044105)
-+#define MCF_EDMA_DCHPRI6                MCF_REG08(0xFC044106)
-+#define MCF_EDMA_DCHPRI7                MCF_REG08(0xFC044107)
-+#define MCF_EDMA_DCHPRI8                MCF_REG08(0xFC044108)
-+#define MCF_EDMA_DCHPRI9                MCF_REG08(0xFC044109)
-+#define MCF_EDMA_DCHPRI10               MCF_REG08(0xFC04410A)
-+#define MCF_EDMA_DCHPRI11               MCF_REG08(0xFC04410B)
-+#define MCF_EDMA_DCHPRI12               MCF_REG08(0xFC04410C)
-+#define MCF_EDMA_DCHPRI13               MCF_REG08(0xFC04410D)
-+#define MCF_EDMA_DCHPRI14               MCF_REG08(0xFC04410E)
-+#define MCF_EDMA_DCHPRI15               MCF_REG08(0xFC04410F)
-+#define MCF_EDMA_TCD0_SADDR             MCF_REG32(0xFC045000)
-+#define MCF_EDMA_TCD0_ATTR              MCF_REG16(0xFC045004)
-+#define MCF_EDMA_TCD0_SOFF              MCF_REG16(0xFC045006)
-+#define MCF_EDMA_TCD0_NBYTES            MCF_REG32(0xFC045008)
-+#define MCF_EDMA_TCD0_SLAST             MCF_REG32(0xFC04500C)
-+#define MCF_EDMA_TCD0_DADDR             MCF_REG32(0xFC045010)
-+#define MCF_EDMA_TCD0_CITER_ELINK       MCF_REG16(0xFC045014)
-+#define MCF_EDMA_TCD0_CITER             MCF_REG16(0xFC045014)
-+#define MCF_EDMA_TCD0_DOFF              MCF_REG16(0xFC045016)
-+#define MCF_EDMA_TCD0_DLAST_SGA         MCF_REG32(0xFC045018)
-+#define MCF_EDMA_TCD0_BITER_ELINK       MCF_REG16(0xFC04501C)
-+#define MCF_EDMA_TCD0_BITER             MCF_REG16(0xFC04501C)
-+#define MCF_EDMA_TCD0_CSR               MCF_REG16(0xFC04501E)
-+#define MCF_EDMA_TCD1_SADDR             MCF_REG32(0xFC045020)
-+#define MCF_EDMA_TCD1_ATTR              MCF_REG16(0xFC045024)
-+#define MCF_EDMA_TCD1_SOFF              MCF_REG16(0xFC045026)
-+#define MCF_EDMA_TCD1_NBYTES            MCF_REG32(0xFC045028)
-+#define MCF_EDMA_TCD1_SLAST             MCF_REG32(0xFC04502C)
-+#define MCF_EDMA_TCD1_DADDR             MCF_REG32(0xFC045030)
-+#define MCF_EDMA_TCD1_CITER_ELINK       MCF_REG16(0xFC045034)
-+#define MCF_EDMA_TCD1_CITER             MCF_REG16(0xFC045034)
-+#define MCF_EDMA_TCD1_DOFF              MCF_REG16(0xFC045036)
-+#define MCF_EDMA_TCD1_DLAST_SGA         MCF_REG32(0xFC045038)
-+#define MCF_EDMA_TCD1_BITER             MCF_REG16(0xFC04503C)
-+#define MCF_EDMA_TCD1_BITER_ELINK       MCF_REG16(0xFC04503C)
-+#define MCF_EDMA_TCD1_CSR               MCF_REG16(0xFC04503E)
-+#define MCF_EDMA_TCD2_SADDR             MCF_REG32(0xFC045040)
-+#define MCF_EDMA_TCD2_ATTR              MCF_REG16(0xFC045044)
-+#define MCF_EDMA_TCD2_SOFF              MCF_REG16(0xFC045046)
-+#define MCF_EDMA_TCD2_NBYTES            MCF_REG32(0xFC045048)
-+#define MCF_EDMA_TCD2_SLAST             MCF_REG32(0xFC04504C)
-+#define MCF_EDMA_TCD2_DADDR             MCF_REG32(0xFC045050)
-+#define MCF_EDMA_TCD2_CITER             MCF_REG16(0xFC045054)
-+#define MCF_EDMA_TCD2_CITER_ELINK       MCF_REG16(0xFC045054)
-+#define MCF_EDMA_TCD2_DOFF              MCF_REG16(0xFC045056)
-+#define MCF_EDMA_TCD2_DLAST_SGA         MCF_REG32(0xFC045058)
-+#define MCF_EDMA_TCD2_BITER_ELINK       MCF_REG16(0xFC04505C)
-+#define MCF_EDMA_TCD2_BITER             MCF_REG16(0xFC04505C)
-+#define MCF_EDMA_TCD2_CSR               MCF_REG16(0xFC04505E)
-+#define MCF_EDMA_TCD3_SADDR             MCF_REG32(0xFC045060)
-+#define MCF_EDMA_TCD3_ATTR              MCF_REG16(0xFC045064)
-+#define MCF_EDMA_TCD3_SOFF              MCF_REG16(0xFC045066)
-+#define MCF_EDMA_TCD3_NBYTES            MCF_REG32(0xFC045068)
-+#define MCF_EDMA_TCD3_SLAST             MCF_REG32(0xFC04506C)
-+#define MCF_EDMA_TCD3_DADDR             MCF_REG32(0xFC045070)
-+#define MCF_EDMA_TCD3_CITER             MCF_REG16(0xFC045074)
-+#define MCF_EDMA_TCD3_CITER_ELINK       MCF_REG16(0xFC045074)
-+#define MCF_EDMA_TCD3_DOFF              MCF_REG16(0xFC045076)
-+#define MCF_EDMA_TCD3_DLAST_SGA         MCF_REG32(0xFC045078)
-+#define MCF_EDMA_TCD3_BITER_ELINK       MCF_REG16(0xFC04507C)
-+#define MCF_EDMA_TCD3_BITER             MCF_REG16(0xFC04507C)
-+#define MCF_EDMA_TCD3_CSR               MCF_REG16(0xFC04507E)
-+#define MCF_EDMA_TCD4_SADDR             MCF_REG32(0xFC045080)
-+#define MCF_EDMA_TCD4_ATTR              MCF_REG16(0xFC045084)
-+#define MCF_EDMA_TCD4_SOFF              MCF_REG16(0xFC045086)
-+#define MCF_EDMA_TCD4_NBYTES            MCF_REG32(0xFC045088)
-+#define MCF_EDMA_TCD4_SLAST             MCF_REG32(0xFC04508C)
-+#define MCF_EDMA_TCD4_DADDR             MCF_REG32(0xFC045090)
-+#define MCF_EDMA_TCD4_CITER             MCF_REG16(0xFC045094)
-+#define MCF_EDMA_TCD4_CITER_ELINK       MCF_REG16(0xFC045094)
-+#define MCF_EDMA_TCD4_DOFF              MCF_REG16(0xFC045096)
-+#define MCF_EDMA_TCD4_DLAST_SGA         MCF_REG32(0xFC045098)
-+#define MCF_EDMA_TCD4_BITER             MCF_REG16(0xFC04509C)
-+#define MCF_EDMA_TCD4_BITER_ELINK       MCF_REG16(0xFC04509C)
-+#define MCF_EDMA_TCD4_CSR               MCF_REG16(0xFC04509E)
-+#define MCF_EDMA_TCD5_SADDR             MCF_REG32(0xFC0450A0)
-+#define MCF_EDMA_TCD5_ATTR              MCF_REG16(0xFC0450A4)
-+#define MCF_EDMA_TCD5_SOFF              MCF_REG16(0xFC0450A6)
-+#define MCF_EDMA_TCD5_NBYTES            MCF_REG32(0xFC0450A8)
-+#define MCF_EDMA_TCD5_SLAST             MCF_REG32(0xFC0450AC)
-+#define MCF_EDMA_TCD5_DADDR             MCF_REG32(0xFC0450B0)
-+#define MCF_EDMA_TCD5_CITER             MCF_REG16(0xFC0450B4)
-+#define MCF_EDMA_TCD5_CITER_ELINK       MCF_REG16(0xFC0450B4)
-+#define MCF_EDMA_TCD5_DOFF              MCF_REG16(0xFC0450B6)
-+#define MCF_EDMA_TCD5_DLAST_SGA         MCF_REG32(0xFC0450B8)
-+#define MCF_EDMA_TCD5_BITER_ELINK       MCF_REG16(0xFC0450BC)
-+#define MCF_EDMA_TCD5_BITER             MCF_REG16(0xFC0450BC)
-+#define MCF_EDMA_TCD5_CSR               MCF_REG16(0xFC0450BE)
-+#define MCF_EDMA_TCD6_SADDR             MCF_REG32(0xFC0450C0)
-+#define MCF_EDMA_TCD6_ATTR              MCF_REG16(0xFC0450C4)
-+#define MCF_EDMA_TCD6_SOFF              MCF_REG16(0xFC0450C6)
-+#define MCF_EDMA_TCD6_NBYTES            MCF_REG32(0xFC0450C8)
-+#define MCF_EDMA_TCD6_SLAST             MCF_REG32(0xFC0450CC)
-+#define MCF_EDMA_TCD6_DADDR             MCF_REG32(0xFC0450D0)
-+#define MCF_EDMA_TCD6_CITER             MCF_REG16(0xFC0450D4)
-+#define MCF_EDMA_TCD6_CITER_ELINK       MCF_REG16(0xFC0450D4)
-+#define MCF_EDMA_TCD6_DOFF              MCF_REG16(0xFC0450D6)
-+#define MCF_EDMA_TCD6_DLAST_SGA         MCF_REG32(0xFC0450D8)
-+#define MCF_EDMA_TCD6_BITER_ELINK       MCF_REG16(0xFC0450DC)
-+#define MCF_EDMA_TCD6_BITER             MCF_REG16(0xFC0450DC)
-+#define MCF_EDMA_TCD6_CSR               MCF_REG16(0xFC0450DE)
-+#define MCF_EDMA_TCD7_SADDR             MCF_REG32(0xFC0450E0)
-+#define MCF_EDMA_TCD7_ATTR              MCF_REG16(0xFC0450E4)
-+#define MCF_EDMA_TCD7_SOFF              MCF_REG16(0xFC0450E6)
-+#define MCF_EDMA_TCD7_NBYTES            MCF_REG32(0xFC0450E8)
-+#define MCF_EDMA_TCD7_SLAST             MCF_REG32(0xFC0450EC)
-+#define MCF_EDMA_TCD7_DADDR             MCF_REG32(0xFC0450F0)
-+#define MCF_EDMA_TCD7_CITER             MCF_REG16(0xFC0450F4)
-+#define MCF_EDMA_TCD7_CITER_ELINK       MCF_REG16(0xFC0450F4)
-+#define MCF_EDMA_TCD7_DOFF              MCF_REG16(0xFC0450F6)
-+#define MCF_EDMA_TCD7_DLAST_SGA         MCF_REG32(0xFC0450F8)
-+#define MCF_EDMA_TCD7_BITER_ELINK       MCF_REG16(0xFC0450FC)
-+#define MCF_EDMA_TCD7_BITER             MCF_REG16(0xFC0450FC)
-+#define MCF_EDMA_TCD7_CSR               MCF_REG16(0xFC0450FE)
-+#define MCF_EDMA_TCD8_SADDR             MCF_REG32(0xFC045100)
-+#define MCF_EDMA_TCD8_ATTR              MCF_REG16(0xFC045104)
-+#define MCF_EDMA_TCD8_SOFF              MCF_REG16(0xFC045106)
-+#define MCF_EDMA_TCD8_NBYTES            MCF_REG32(0xFC045108)
-+#define MCF_EDMA_TCD8_SLAST             MCF_REG32(0xFC04510C)
-+#define MCF_EDMA_TCD8_DADDR             MCF_REG32(0xFC045110)
-+#define MCF_EDMA_TCD8_CITER             MCF_REG16(0xFC045114)
-+#define MCF_EDMA_TCD8_CITER_ELINK       MCF_REG16(0xFC045114)
-+#define MCF_EDMA_TCD8_DOFF              MCF_REG16(0xFC045116)
-+#define MCF_EDMA_TCD8_DLAST_SGA         MCF_REG32(0xFC045118)
-+#define MCF_EDMA_TCD8_BITER_ELINK       MCF_REG16(0xFC04511C)
-+#define MCF_EDMA_TCD8_BITER             MCF_REG16(0xFC04511C)
-+#define MCF_EDMA_TCD8_CSR               MCF_REG16(0xFC04511E)
-+#define MCF_EDMA_TCD9_SADDR             MCF_REG32(0xFC045120)
-+#define MCF_EDMA_TCD9_ATTR              MCF_REG16(0xFC045124)
-+#define MCF_EDMA_TCD9_SOFF              MCF_REG16(0xFC045126)
-+#define MCF_EDMA_TCD9_NBYTES            MCF_REG32(0xFC045128)
-+#define MCF_EDMA_TCD9_SLAST             MCF_REG32(0xFC04512C)
-+#define MCF_EDMA_TCD9_DADDR             MCF_REG32(0xFC045130)
-+#define MCF_EDMA_TCD9_CITER_ELINK       MCF_REG16(0xFC045134)
-+#define MCF_EDMA_TCD9_CITER             MCF_REG16(0xFC045134)
-+#define MCF_EDMA_TCD9_DOFF              MCF_REG16(0xFC045136)
-+#define MCF_EDMA_TCD9_DLAST_SGA         MCF_REG32(0xFC045138)
-+#define MCF_EDMA_TCD9_BITER_ELINK       MCF_REG16(0xFC04513C)
-+#define MCF_EDMA_TCD9_BITER             MCF_REG16(0xFC04513C)
-+#define MCF_EDMA_TCD9_CSR               MCF_REG16(0xFC04513E)
-+#define MCF_EDMA_TCD10_SADDR            MCF_REG32(0xFC045140)
-+#define MCF_EDMA_TCD10_ATTR             MCF_REG16(0xFC045144)
-+#define MCF_EDMA_TCD10_SOFF             MCF_REG16(0xFC045146)
-+#define MCF_EDMA_TCD10_NBYTES           MCF_REG32(0xFC045148)
-+#define MCF_EDMA_TCD10_SLAST            MCF_REG32(0xFC04514C)
-+#define MCF_EDMA_TCD10_DADDR            MCF_REG32(0xFC045150)
-+#define MCF_EDMA_TCD10_CITER_ELINK      MCF_REG16(0xFC045154)
-+#define MCF_EDMA_TCD10_CITER            MCF_REG16(0xFC045154)
-+#define MCF_EDMA_TCD10_DOFF             MCF_REG16(0xFC045156)
-+#define MCF_EDMA_TCD10_DLAST_SGA        MCF_REG32(0xFC045158)
-+#define MCF_EDMA_TCD10_BITER            MCF_REG16(0xFC04515C)
-+#define MCF_EDMA_TCD10_BITER_ELINK      MCF_REG16(0xFC04515C)
-+#define MCF_EDMA_TCD10_CSR              MCF_REG16(0xFC04515E)
-+#define MCF_EDMA_TCD11_SADDR            MCF_REG32(0xFC045160)
-+#define MCF_EDMA_TCD11_ATTR             MCF_REG16(0xFC045164)
-+#define MCF_EDMA_TCD11_SOFF             MCF_REG16(0xFC045166)
-+#define MCF_EDMA_TCD11_NBYTES           MCF_REG32(0xFC045168)
-+#define MCF_EDMA_TCD11_SLAST            MCF_REG32(0xFC04516C)
-+#define MCF_EDMA_TCD11_DADDR            MCF_REG32(0xFC045170)
-+#define MCF_EDMA_TCD11_CITER            MCF_REG16(0xFC045174)
-+#define MCF_EDMA_TCD11_CITER_ELINK      MCF_REG16(0xFC045174)
-+#define MCF_EDMA_TCD11_DOFF             MCF_REG16(0xFC045176)
-+#define MCF_EDMA_TCD11_DLAST_SGA        MCF_REG32(0xFC045178)
-+#define MCF_EDMA_TCD11_BITER            MCF_REG16(0xFC04517C)
-+#define MCF_EDMA_TCD11_BITER_ELINK      MCF_REG16(0xFC04517C)
-+#define MCF_EDMA_TCD11_CSR              MCF_REG16(0xFC04517E)
-+#define MCF_EDMA_TCD12_SADDR            MCF_REG32(0xFC045180)
-+#define MCF_EDMA_TCD12_ATTR             MCF_REG16(0xFC045184)
-+#define MCF_EDMA_TCD12_SOFF             MCF_REG16(0xFC045186)
-+#define MCF_EDMA_TCD12_NBYTES           MCF_REG32(0xFC045188)
-+#define MCF_EDMA_TCD12_SLAST            MCF_REG32(0xFC04518C)
-+#define MCF_EDMA_TCD12_DADDR            MCF_REG32(0xFC045190)
-+#define MCF_EDMA_TCD12_CITER            MCF_REG16(0xFC045194)
-+#define MCF_EDMA_TCD12_CITER_ELINK      MCF_REG16(0xFC045194)
-+#define MCF_EDMA_TCD12_DOFF             MCF_REG16(0xFC045196)
-+#define MCF_EDMA_TCD12_DLAST_SGA        MCF_REG32(0xFC045198)
-+#define MCF_EDMA_TCD12_BITER            MCF_REG16(0xFC04519C)
-+#define MCF_EDMA_TCD12_BITER_ELINK      MCF_REG16(0xFC04519C)
-+#define MCF_EDMA_TCD12_CSR              MCF_REG16(0xFC04519E)
-+#define MCF_EDMA_TCD13_SADDR            MCF_REG32(0xFC0451A0)
-+#define MCF_EDMA_TCD13_ATTR             MCF_REG16(0xFC0451A4)
-+#define MCF_EDMA_TCD13_SOFF             MCF_REG16(0xFC0451A6)
-+#define MCF_EDMA_TCD13_NBYTES           MCF_REG32(0xFC0451A8)
-+#define MCF_EDMA_TCD13_SLAST            MCF_REG32(0xFC0451AC)
-+#define MCF_EDMA_TCD13_DADDR            MCF_REG32(0xFC0451B0)
-+#define MCF_EDMA_TCD13_CITER_ELINK      MCF_REG16(0xFC0451B4)
-+#define MCF_EDMA_TCD13_CITER            MCF_REG16(0xFC0451B4)
-+#define MCF_EDMA_TCD13_DOFF             MCF_REG16(0xFC0451B6)
-+#define MCF_EDMA_TCD13_DLAST_SGA        MCF_REG32(0xFC0451B8)
-+#define MCF_EDMA_TCD13_BITER_ELINK      MCF_REG16(0xFC0451BC)
-+#define MCF_EDMA_TCD13_BITER            MCF_REG16(0xFC0451BC)
-+#define MCF_EDMA_TCD13_CSR              MCF_REG16(0xFC0451BE)
-+#define MCF_EDMA_TCD14_SADDR            MCF_REG32(0xFC0451C0)
-+#define MCF_EDMA_TCD14_ATTR             MCF_REG16(0xFC0451C4)
-+#define MCF_EDMA_TCD14_SOFF             MCF_REG16(0xFC0451C6)
-+#define MCF_EDMA_TCD14_NBYTES           MCF_REG32(0xFC0451C8)
-+#define MCF_EDMA_TCD14_SLAST            MCF_REG32(0xFC0451CC)
-+#define MCF_EDMA_TCD14_DADDR            MCF_REG32(0xFC0451D0)
-+#define MCF_EDMA_TCD14_CITER            MCF_REG16(0xFC0451D4)
-+#define MCF_EDMA_TCD14_CITER_ELINK      MCF_REG16(0xFC0451D4)
-+#define MCF_EDMA_TCD14_DOFF             MCF_REG16(0xFC0451D6)
-+#define MCF_EDMA_TCD14_DLAST_SGA        MCF_REG32(0xFC0451D8)
-+#define MCF_EDMA_TCD14_BITER_ELINK      MCF_REG16(0xFC0451DC)
-+#define MCF_EDMA_TCD14_BITER            MCF_REG16(0xFC0451DC)
-+#define MCF_EDMA_TCD14_CSR              MCF_REG16(0xFC0451DE)
-+#define MCF_EDMA_TCD15_SADDR            MCF_REG32(0xFC0451E0)
-+#define MCF_EDMA_TCD15_ATTR             MCF_REG16(0xFC0451E4)
-+#define MCF_EDMA_TCD15_SOFF             MCF_REG16(0xFC0451E6)
-+#define MCF_EDMA_TCD15_NBYTES           MCF_REG32(0xFC0451E8)
-+#define MCF_EDMA_TCD15_SLAST            MCF_REG32(0xFC0451EC)
-+#define MCF_EDMA_TCD15_DADDR            MCF_REG32(0xFC0451F0)
-+#define MCF_EDMA_TCD15_CITER_ELINK      MCF_REG16(0xFC0451F4)
-+#define MCF_EDMA_TCD15_CITER            MCF_REG16(0xFC0451F4)
-+#define MCF_EDMA_TCD15_DOFF             MCF_REG16(0xFC0451F6)
-+#define MCF_EDMA_TCD15_DLAST_SGA        MCF_REG32(0xFC0451F8)
-+#define MCF_EDMA_TCD15_BITER            MCF_REG16(0xFC0451FC)
-+#define MCF_EDMA_TCD15_BITER_ELINK      MCF_REG16(0xFC0451FC)
-+#define MCF_EDMA_TCD15_CSR              MCF_REG16(0xFC0451FE)
-+
-+/* Parameterized register read/write macros for multiple registers */
-+#define MCF_EDMA_DCHPRI(x)              MCF_REG08(0xFC044100+((x)*0x001))
-+#define MCF_EDMA_TCD_SADDR(x)           MCF_REG32(0xFC045000+((x)*0x020))
-+#define MCF_EDMA_TCD_ATTR(x)            MCF_REG16(0xFC045004+((x)*0x020))
-+#define MCF_EDMA_TCD_SOFF(x)            MCF_REG16(0xFC045006+((x)*0x020))
-+#define MCF_EDMA_TCD_NBYTES(x)          MCF_REG32(0xFC045008+((x)*0x020))
-+#define MCF_EDMA_TCD_SLAST(x)           MCF_REG32(0xFC04500C+((x)*0x020))
-+#define MCF_EDMA_TCD_DADDR(x)           MCF_REG32(0xFC045010+((x)*0x020))
-+#define MCF_EDMA_TCD_CITER_ELINK(x)     MCF_REG16(0xFC045014+((x)*0x020))
-+#define MCF_EDMA_TCD_CITER(x)           MCF_REG16(0xFC045014+((x)*0x020))
-+#define MCF_EDMA_TCD_DOFF(x)            MCF_REG16(0xFC045016+((x)*0x020))
-+#define MCF_EDMA_TCD_DLAST_SGA(x)       MCF_REG32(0xFC045018+((x)*0x020))
-+#define MCF_EDMA_TCD_BITER_ELINK(x)     MCF_REG16(0xFC04501C+((x)*0x020))
-+#define MCF_EDMA_TCD_BITER(x)           MCF_REG16(0xFC04501C+((x)*0x020))
-+#define MCF_EDMA_TCD_CSR(x)             MCF_REG16(0xFC04501e +((x)*0x020))
-+
-+/* Bit definitions and macros for CR */
-+#define MCF_EDMA_CR_EDBG        (0x00000002)
-+#define MCF_EDMA_CR_ERCA        (0x00000004)
-+
-+/* Bit definitions and macros for ES */
-+#define MCF_EDMA_ES_DBE         (0x00000001)
-+#define MCF_EDMA_ES_SBE         (0x00000002)
-+#define MCF_EDMA_ES_SGE         (0x00000004)
-+#define MCF_EDMA_ES_NCE         (0x00000008)
-+#define MCF_EDMA_ES_DOE         (0x00000010)
-+#define MCF_EDMA_ES_DAE         (0x00000020)
-+#define MCF_EDMA_ES_SOE         (0x00000040)
-+#define MCF_EDMA_ES_SAE         (0x00000080)
-+#define MCF_EDMA_ES_ERRCHN(x)   (((x)&0x0000000F)<<8)
-+#define MCF_EDMA_ES_CPE         (0x00004000)
-+#define MCF_EDMA_ES_VLD         (0x80000000)
-+
-+/* Bit definitions and macros for ERQ */
-+#define MCF_EDMA_ERQ_ERQ0       (0x0001)
-+#define MCF_EDMA_ERQ_ERQ1       (0x0002)
-+#define MCF_EDMA_ERQ_ERQ2       (0x0004)
-+#define MCF_EDMA_ERQ_ERQ3       (0x0008)
-+#define MCF_EDMA_ERQ_ERQ4       (0x0010)
-+#define MCF_EDMA_ERQ_ERQ5       (0x0020)
-+#define MCF_EDMA_ERQ_ERQ6       (0x0040)
-+#define MCF_EDMA_ERQ_ERQ7       (0x0080)
-+#define MCF_EDMA_ERQ_ERQ8       (0x0100)
-+#define MCF_EDMA_ERQ_ERQ9       (0x0200)
-+#define MCF_EDMA_ERQ_ERQ10      (0x0400)
-+#define MCF_EDMA_ERQ_ERQ11      (0x0800)
-+#define MCF_EDMA_ERQ_ERQ12      (0x1000)
-+#define MCF_EDMA_ERQ_ERQ13      (0x2000)
-+#define MCF_EDMA_ERQ_ERQ14      (0x4000)
-+#define MCF_EDMA_ERQ_ERQ15      (0x8000)
-+
-+/* Bit definitions and macros for EEI */
-+#define MCF_EDMA_EEI_EEI0       (0x0001)
-+#define MCF_EDMA_EEI_EEI1       (0x0002)
-+#define MCF_EDMA_EEI_EEI2       (0x0004)
-+#define MCF_EDMA_EEI_EEI3       (0x0008)
-+#define MCF_EDMA_EEI_EEI4       (0x0010)
-+#define MCF_EDMA_EEI_EEI5       (0x0020)
-+#define MCF_EDMA_EEI_EEI6       (0x0040)
-+#define MCF_EDMA_EEI_EEI7       (0x0080)
-+#define MCF_EDMA_EEI_EEI8       (0x0100)
-+#define MCF_EDMA_EEI_EEI9       (0x0200)
-+#define MCF_EDMA_EEI_EEI10      (0x0400)
-+#define MCF_EDMA_EEI_EEI11      (0x0800)
-+#define MCF_EDMA_EEI_EEI12      (0x1000)
-+#define MCF_EDMA_EEI_EEI13      (0x2000)
-+#define MCF_EDMA_EEI_EEI14      (0x4000)
-+#define MCF_EDMA_EEI_EEI15      (0x8000)
-+
-+/* Bit definitions and macros for SERQ */
-+#define MCF_EDMA_SERQ_SERQ(x)   (((x)&0x0F))
-+#define MCF_EDMA_SERQ_SAER      (0x40)
-+
-+/* Bit definitions and macros for CERQ */
-+#define MCF_EDMA_CERQ_CERQ(x)   (((x)&0x0F))
-+#define MCF_EDMA_CERQ_CAER      (0x40)
-+
-+/* Bit definitions and macros for SEEI */
-+#define MCF_EDMA_SEEI_SEEI(x)   (((x)&0x0F))
-+#define MCF_EDMA_SEEI_SAEE      (0x40)
-+
-+/* Bit definitions and macros for CEEI */
-+#define MCF_EDMA_CEEI_CEEI(x)   (((x)&0x0F))
-+#define MCF_EDMA_CEEI_CAEE      (0x40)
-+
-+/* Bit definitions and macros for CINT */
-+#define MCF_EDMA_CINT_CINT(x)   (((x)&0x0F))
-+#define MCF_EDMA_CINT_CAIR      (0x40)
-+
-+/* Bit definitions and macros for CERR */
-+#define MCF_EDMA_CERR_CERR(x)   (((x)&0x0F))
-+#define MCF_EDMA_CERR_CAER      (0x40)
-+
-+/* Bit definitions and macros for SSRT */
-+#define MCF_EDMA_SSRT_SSRT(x)   (((x)&0x0F))
-+#define MCF_EDMA_SSRT_SAST      (0x40)
-+
-+/* Bit definitions and macros for CDNE */
-+#define MCF_EDMA_CDNE_CDNE(x)   (((x)&0x0F))
-+#define MCF_EDMA_CDNE_CADN      (0x40)
-+
-+/* Bit definitions and macros for INTR */
-+#define MCF_EDMA_INTR_INT0      (0x0001)
-+#define MCF_EDMA_INTR_INT1      (0x0002)
-+#define MCF_EDMA_INTR_INT2      (0x0004)
-+#define MCF_EDMA_INTR_INT3      (0x0008)
-+#define MCF_EDMA_INTR_INT4      (0x0010)
-+#define MCF_EDMA_INTR_INT5      (0x0020)
-+#define MCF_EDMA_INTR_INT6      (0x0040)
-+#define MCF_EDMA_INTR_INT7      (0x0080)
-+#define MCF_EDMA_INTR_INT8      (0x0100)
-+#define MCF_EDMA_INTR_INT9      (0x0200)
-+#define MCF_EDMA_INTR_INT10     (0x0400)
-+#define MCF_EDMA_INTR_INT11     (0x0800)
-+#define MCF_EDMA_INTR_INT12     (0x1000)
-+#define MCF_EDMA_INTR_INT13     (0x2000)
-+#define MCF_EDMA_INTR_INT14     (0x4000)
-+#define MCF_EDMA_INTR_INT15     (0x8000)
-+
-+/* Bit definitions and macros for ERR */
-+#define MCF_EDMA_ERR_ERR0       (0x0001)
-+#define MCF_EDMA_ERR_ERR1       (0x0002)
-+#define MCF_EDMA_ERR_ERR2       (0x0004)
-+#define MCF_EDMA_ERR_ERR3       (0x0008)
-+#define MCF_EDMA_ERR_ERR4       (0x0010)
-+#define MCF_EDMA_ERR_ERR5       (0x0020)
-+#define MCF_EDMA_ERR_ERR6       (0x0040)
-+#define MCF_EDMA_ERR_ERR7       (0x0080)
-+#define MCF_EDMA_ERR_ERR8       (0x0100)
-+#define MCF_EDMA_ERR_ERR9       (0x0200)
-+#define MCF_EDMA_ERR_ERR10      (0x0400)
-+#define MCF_EDMA_ERR_ERR11      (0x0800)
-+#define MCF_EDMA_ERR_ERR12      (0x1000)
-+#define MCF_EDMA_ERR_ERR13      (0x2000)
-+#define MCF_EDMA_ERR_ERR14      (0x4000)
-+#define MCF_EDMA_ERR_ERR15      (0x8000)
-+
-+/* Bit definitions and macros for DCHPRI group */
-+#define MCF_EDMA_DCHPRI_CHPRI(x)    (((x)&0x0F))
-+#define MCF_EDMA_DCHPRI_ECP         (0x80)
-+
-+/* Bit definitions and macros for DCHPRI0 */
-+#define MCF_EDMA_DCHPRI0_CHPRI(x)   (((x)&0x0F))
-+#define MCF_EDMA_DCHPRI0_ECP        (0x80)
-+
-+/* Bit definitions and macros for DCHPRI1 */
-+#define MCF_EDMA_DCHPRI1_CHPRI(x)   (((x)&0x0F))
-+#define MCF_EDMA_DCHPRI1_ECP        (0x80)
-+
-+/* Bit definitions and macros for DCHPRI2 */
-+#define MCF_EDMA_DCHPRI2_CHPRI(x)   (((x)&0x0F))
-+#define MCF_EDMA_DCHPRI2_ECP        (0x80)
-+
-+/* Bit definitions and macros for DCHPRI3 */
-+#define MCF_EDMA_DCHPRI3_CHPRI(x)   (((x)&0x0F))
-+#define MCF_EDMA_DCHPRI3_ECP        (0x80)
-+
-+/* Bit definitions and macros for DCHPRI4 */
-+#define MCF_EDMA_DCHPRI4_CHPRI(x)   (((x)&0x0F))
-+#define MCF_EDMA_DCHPRI4_ECP        (0x80)
-+
-+/* Bit definitions and macros for DCHPRI5 */
-+#define MCF_EDMA_DCHPRI5_CHPRI(x)   (((x)&0x0F))
-+#define MCF_EDMA_DCHPRI5_ECP        (0x80)
-+
-+/* Bit definitions and macros for DCHPRI6 */
-+#define MCF_EDMA_DCHPRI6_CHPRI(x)   (((x)&0x0F))
-+#define MCF_EDMA_DCHPRI6_ECP        (0x80)
-+
-+/* Bit definitions and macros for DCHPRI7 */
-+#define MCF_EDMA_DCHPRI7_CHPRI(x)   (((x)&0x0F))
-+#define MCF_EDMA_DCHPRI7_ECP        (0x80)
-+
-+/* Bit definitions and macros for DCHPRI8 */
-+#define MCF_EDMA_DCHPRI8_CHPRI(x)   (((x)&0x0F))
-+#define MCF_EDMA_DCHPRI8_ECP        (0x80)
-+
-+/* Bit definitions and macros for DCHPRI9 */
-+#define MCF_EDMA_DCHPRI9_CHPRI(x)   (((x)&0x0F))
-+#define MCF_EDMA_DCHPRI9_ECP        (0x80)
-+
-+/* Bit definitions and macros for DCHPRI10 */
-+#define MCF_EDMA_DCHPRI10_CHPRI(x)      (((x)&0x0F))
-+#define MCF_EDMA_DCHPRI10_ECP           (0x80)
-+
-+/* Bit definitions and macros for DCHPRI11 */
-+#define MCF_EDMA_DCHPRI11_CHPRI(x)      (((x)&0x0F))
-+#define MCF_EDMA_DCHPRI11_ECP           (0x80)
-+
-+/* Bit definitions and macros for DCHPRI12 */
-+#define MCF_EDMA_DCHPRI12_CHPRI(x)      (((x)&0x0F))
-+#define MCF_EDMA_DCHPRI12_ECP           (0x80)
-+
-+/* Bit definitions and macros for DCHPRI13 */
-+#define MCF_EDMA_DCHPRI13_CHPRI(x)      (((x)&0x0F))
-+#define MCF_EDMA_DCHPRI13_ECP           (0x80)
-+
-+/* Bit definitions and macros for DCHPRI14 */
-+#define MCF_EDMA_DCHPRI14_CHPRI(x)      (((x)&0x0F))
-+#define MCF_EDMA_DCHPRI14_ECP           (0x80)
-+
-+/* Bit definitions and macros for DCHPRI15 */
-+#define MCF_EDMA_DCHPRI15_CHPRI(x)      (((x)&0x0F))
-+#define MCF_EDMA_DCHPRI15_ECP           (0x80)
-+
-+/* Bit definitions and macros for TCD_SADDR group */
-+#define MCF_EDMA_TCD_SADDR_SADDR(x)     (x)
-+
-+/* Bit definitions and macros for TCD0_SADDR */
-+#define MCF_EDMA_TCD0_SADDR_SADDR(x)    (x)
-+
-+/* Bit definitions and macros for TCD_ATTR group */
-+#define MCF_EDMA_TCD_ATTR_DSIZE(x)          (((x)&0x0007))
-+#define MCF_EDMA_TCD_ATTR_DMOD(x)           (((x)&0x001F)<<3)
-+#define MCF_EDMA_TCD_ATTR_SSIZE(x)          (((x)&0x0007)<<8)
-+#define MCF_EDMA_TCD_ATTR_SMOD(x)           (((x)&0x001F)<<11)
-+#define MCF_EDMA_TCD_ATTR_SSIZE_8BIT        (0x0000)
-+#define MCF_EDMA_TCD_ATTR_SSIZE_16BIT       (0x0100)
-+#define MCF_EDMA_TCD_ATTR_SSIZE_32BIT       (0x0200)
-+#define MCF_EDMA_TCD_ATTR_SSIZE_16BYTE      (0x0400)
-+#define MCF_EDMA_TCD_ATTR_DSIZE_8BIT        (0x0000)
-+#define MCF_EDMA_TCD_ATTR_DSIZE_16BIT       (0x0001)
-+#define MCF_EDMA_TCD_ATTR_DSIZE_32BIT       (0x0002)
-+#define MCF_EDMA_TCD_ATTR_DSIZE_16BYTE      (0x0004)
-+
-+/* Bit definitions and macros for TCD0_ATTR */
-+#define MCF_EDMA_TCD0_ATTR_DSIZE(x)         (((x)&0x0007))
-+#define MCF_EDMA_TCD0_ATTR_DMOD(x)          (((x)&0x001F)<<3)
-+#define MCF_EDMA_TCD0_ATTR_SSIZE(x)         (((x)&0x0007)<<8)
-+#define MCF_EDMA_TCD0_ATTR_SMOD(x)          (((x)&0x001F)<<11)
-+#define MCF_EDMA_TCD0_ATTR_SSIZE_8BIT       (0x0000)
-+#define MCF_EDMA_TCD0_ATTR_SSIZE_16BIT      (0x0100)
-+#define MCF_EDMA_TCD0_ATTR_SSIZE_32BIT      (0x0200)
-+#define MCF_EDMA_TCD0_ATTR_SSIZE_16BYTE     (0x0400)
-+#define MCF_EDMA_TCD0_ATTR_DSIZE_8BIT       (0x0000)
-+#define MCF_EDMA_TCD0_ATTR_DSIZE_16BIT      (0x0001)
-+#define MCF_EDMA_TCD0_ATTR_DSIZE_32BIT      (0x0002)
-+#define MCF_EDMA_TCD0_ATTR_DSIZE_16BYTE     (0x0004)
-+
-+/* Bit definitions and macros for TCD_SOFF group */
-+#define MCF_EDMA_TCD_SOFF_SOFF(x)   (x)
-+
-+/* Bit definitions and macros for TCD0_SOFF */
-+#define MCF_EDMA_TCD0_SOFF_SOFF(x)      (x)
-+
-+/* Bit definitions and macros for TCD_NBYTES group */
-+#define MCF_EDMA_TCD_NBYTES_NBYTES(x)   (x)
-+
-+/* Bit definitions and macros for TCD0_NBYTES */
-+#define MCF_EDMA_TCD0_NBYTES_NBYTES(x)      (x)
-+
-+/* Bit definitions and macros for TCD_SLAST group */
-+#define MCF_EDMA_TCD_SLAST_SLAST(x)     (x)
-+
-+/* Bit definitions and macros for TCD0_SLAST */
-+#define MCF_EDMA_TCD0_SLAST_SLAST(x)    (x)
-+
-+/* Bit definitions and macros for TCD_DADDR group */
-+#define MCF_EDMA_TCD_DADDR_DADDR(x)     (x)
-+
-+/* Bit definitions and macros for TCD0_DADDR */
-+#define MCF_EDMA_TCD0_DADDR_DADDR(x)    (x)
-+
-+/* Bit definitions and macros for TCD_CITER_ELINK group */
-+#define MCF_EDMA_TCD_CITER_ELINK_CITER(x)       (((x)&0x01FF))
-+#define MCF_EDMA_TCD_CITER_ELINK_LINKCH(x)      (((x)&0x003F)<<9)
-+#define MCF_EDMA_TCD_CITER_ELINK_E_LINK         (0x8000)
-+
-+/* Bit definitions and macros for TCD0_CITER_ELINK */
-+#define MCF_EDMA_TCD0_CITER_ELINK_CITER(x)      (((x)&0x01FF))
-+#define MCF_EDMA_TCD0_CITER_ELINK_LINKCH(x)     (((x)&0x003F)<<9)
-+#define MCF_EDMA_TCD0_CITER_ELINK_E_LINK        (0x8000)
-+
-+/* Bit definitions and macros for TCD_CITER group */
-+#define MCF_EDMA_TCD_CITER_CITER(x)     (((x)&0x7FFF))
-+#define MCF_EDMA_TCD_CITER_E_LINK       (0x8000)
-+
-+/* Bit definitions and macros for TCD0_CITER */
-+#define MCF_EDMA_TCD0_CITER_CITER(x)    (((x)&0x7FFF))
-+#define MCF_EDMA_TCD0_CITER_E_LINK      (0x8000)
-+
-+/* Bit definitions and macros for TCD_DOFF group */
-+#define MCF_EDMA_TCD_DOFF_DOFF(x)   (x)
-+
-+/* Bit definitions and macros for TCD0_DOFF */
-+#define MCF_EDMA_TCD0_DOFF_DOFF(x)      (x)
-+
-+/* Bit definitions and macros for TCD_DLAST_SGA group */
-+#define MCF_EDMA_TCD_DLAST_SGA_DLAST_SGA(x)     (x)
-+
-+/* Bit definitions and macros for TCD0_DLAST_SGA */
-+#define MCF_EDMA_TCD0_DLAST_SGA_DLAST_SGA(x)    (x)
-+
-+/* Bit definitions and macros for TCD_BITER_ELINK group */
-+#define MCF_EDMA_TCD_BITER_ELINK_BITER(x)       (((x)&0x01FF))
-+#define MCF_EDMA_TCD_BITER_ELINK_LINKCH(x)      (((x)&0x003F)<<9)
-+#define MCF_EDMA_TCD_BITER_ELINK_E_LINK         (0x8000)
-+
-+/* Bit definitions and macros for TCD0_BITER_ELINK */
-+#define MCF_EDMA_TCD0_BITER_ELINK_BITER(x)      (((x)&0x01FF))
-+#define MCF_EDMA_TCD0_BITER_ELINK_LINKCH(x)     (((x)&0x003F)<<9)
-+#define MCF_EDMA_TCD0_BITER_ELINK_E_LINK        (0x8000)
-+
-+/* Bit definitions and macros for TCD_BITER group */
-+#define MCF_EDMA_TCD_BITER_BITER(x)     (((x)&0x7FFF))
-+#define MCF_EDMA_TCD_BITER_E_LINK       (0x8000)
-+
-+/* Bit definitions and macros for TCD0_BITER */
-+#define MCF_EDMA_TCD0_BITER_BITER(x)    (((x)&0x7FFF))
-+#define MCF_EDMA_TCD0_BITER_E_LINK      (0x8000)
-+
-+/* Bit definitions and macros for TCD_CSR group */
-+#define MCF_EDMA_TCD_CSR_START              (0x0001)
-+#define MCF_EDMA_TCD_CSR_INT_MAJOR          (0x0002)
-+#define MCF_EDMA_TCD_CSR_INT_HALF           (0x0004)
-+#define MCF_EDMA_TCD_CSR_D_REQ              (0x0008)
-+#define MCF_EDMA_TCD_CSR_E_SG               (0x0010)
-+#define MCF_EDMA_TCD_CSR_E_LINK             (0x0020)
-+#define MCF_EDMA_TCD_CSR_ACTIVE             (0x0040)
-+#define MCF_EDMA_TCD_CSR_DONE               (0x0080)
-+#define MCF_EDMA_TCD_CSR_LINKCH(x)          (((x)&0x003F)<<8)
-+#define MCF_EDMA_TCD_CSR_BWC(x)             (((x)&0x0003)<<14)
-+#define MCF_EDMA_TCD_CSR_BWC_NO_STALL       (0x0000)
-+#define MCF_EDMA_TCD_CSR_BWC_4CYC_STALL     (0x8000)
-+#define MCF_EDMA_TCD_CSR_BWC_8CYC_STALL     (0xC000)
-+
-+/* Bit definitions and macros for TCD0_CSR */
-+#define MCF_EDMA_TCD0_CSR_START             (0x0001)
-+#define MCF_EDMA_TCD0_CSR_INT_MAJOR         (0x0002)
-+#define MCF_EDMA_TCD0_CSR_INT_HALF          (0x0004)
-+#define MCF_EDMA_TCD0_CSR_D_REQ             (0x0008)
-+#define MCF_EDMA_TCD0_CSR_E_SG              (0x0010)
-+#define MCF_EDMA_TCD0_CSR_E_LINK            (0x0020)
-+#define MCF_EDMA_TCD0_CSR_ACTIVE            (0x0040)
-+#define MCF_EDMA_TCD0_CSR_DONE              (0x0080)
-+#define MCF_EDMA_TCD0_CSR_LINKCH(x)         (((x)&0x003F)<<8)
-+#define MCF_EDMA_TCD0_CSR_BWC(x)            (((x)&0x0003)<<14)
-+#define MCF_EDMA_TCD0_CSR_BWC_NO_STALL      (0x0000)
-+#define MCF_EDMA_TCD0_CSR_BWC_4CYC_STALL    (0x8000)
-+#define MCF_EDMA_TCD0_CSR_BWC_8CYC_STALL    (0xC000)
-+
-+/* Bit definitions and macros for TCD1_SADDR */
-+#define MCF_EDMA_TCD1_SADDR_SADDR(x)    (x)
-+
-+/* Bit definitions and macros for TCD1_ATTR */
-+#define MCF_EDMA_TCD1_ATTR_DSIZE(x)     (((x)&0x0007))
-+#define MCF_EDMA_TCD1_ATTR_DMOD(x)      (((x)&0x001F)<<3)
-+#define MCF_EDMA_TCD1_ATTR_SSIZE(x)     (((x)&0x0007)<<8)
-+#define MCF_EDMA_TCD1_ATTR_SMOD(x)      (((x)&0x001F)<<11)
-+
-+/* Bit definitions and macros for TCD1_SOFF */
-+#define MCF_EDMA_TCD1_SOFF_SOFF(x)      (x)
-+
-+/* Bit definitions and macros for TCD1_NBYTES */
-+#define MCF_EDMA_TCD1_NBYTES_NBYTES(x)      (x)
-+
-+/* Bit definitions and macros for TCD1_SLAST */
-+#define MCF_EDMA_TCD1_SLAST_SLAST(x)    (x)
-+
-+/* Bit definitions and macros for TCD1_DADDR */
-+#define MCF_EDMA_TCD1_DADDR_DADDR(x)    (x)
-+
-+/* Bit definitions and macros for TCD1_CITER_ELINK */
-+#define MCF_EDMA_TCD1_CITER_ELINK_CITER(x)      (((x)&0x01FF))
-+#define MCF_EDMA_TCD1_CITER_ELINK_LINKCH(x)     (((x)&0x003F)<<9)
-+#define MCF_EDMA_TCD1_CITER_ELINK_E_LINK        (0x8000)
-+
-+/* Bit definitions and macros for TCD1_CITER */
-+#define MCF_EDMA_TCD1_CITER_CITER(x)    (((x)&0x7FFF))
-+#define MCF_EDMA_TCD1_CITER_E_LINK      (0x8000)
-+
-+/* Bit definitions and macros for TCD1_DOFF */
-+#define MCF_EDMA_TCD1_DOFF_DOFF(x)      (x)
-+
-+/* Bit definitions and macros for TCD1_DLAST_SGA */
-+#define MCF_EDMA_TCD1_DLAST_SGA_DLAST_SGA(x)    (x)
-+
-+/* Bit definitions and macros for TCD1_BITER */
-+#define MCF_EDMA_TCD1_BITER_BITER(x)    (((x)&0x7FFF))
-+#define MCF_EDMA_TCD1_BITER_E_LINK      (0x8000)
-+
-+/* Bit definitions and macros for TCD1_BITER_ELINK */
-+#define MCF_EDMA_TCD1_BITER_ELINK_BITER(x)      (((x)&0x01FF))
-+#define MCF_EDMA_TCD1_BITER_ELINK_LINKCH(x)     (((x)&0x003F)<<9)
-+#define MCF_EDMA_TCD1_BITER_ELINK_E_LINK        (0x8000)
-+
-+/* Bit definitions and macros for TCD1_CSR */
-+#define MCF_EDMA_TCD1_CSR_START         (0x0001)
-+#define MCF_EDMA_TCD1_CSR_INT_MAJOR     (0x0002)
-+#define MCF_EDMA_TCD1_CSR_INT_HALF      (0x0004)
-+#define MCF_EDMA_TCD1_CSR_D_REQ         (0x0008)
-+#define MCF_EDMA_TCD1_CSR_E_SG          (0x0010)
-+#define MCF_EDMA_TCD1_CSR_E_LINK        (0x0020)
-+#define MCF_EDMA_TCD1_CSR_ACTIVE        (0x0040)
-+#define MCF_EDMA_TCD1_CSR_DONE          (0x0080)
-+#define MCF_EDMA_TCD1_CSR_LINKCH(x)     (((x)&0x003F)<<8)
-+#define MCF_EDMA_TCD1_CSR_BWC(x)        (((x)&0x0003)<<14)
-+
-+/* Bit definitions and macros for TCD2_SADDR */
-+#define MCF_EDMA_TCD2_SADDR_SADDR(x)    (x)
-+
-+/* Bit definitions and macros for TCD2_ATTR */
-+#define MCF_EDMA_TCD2_ATTR_DSIZE(x)     (((x)&0x0007))
-+#define MCF_EDMA_TCD2_ATTR_DMOD(x)      (((x)&0x001F)<<3)
-+#define MCF_EDMA_TCD2_ATTR_SSIZE(x)     (((x)&0x0007)<<8)
-+#define MCF_EDMA_TCD2_ATTR_SMOD(x)      (((x)&0x001F)<<11)
-+
-+/* Bit definitions and macros for TCD2_SOFF */
-+#define MCF_EDMA_TCD2_SOFF_SOFF(x)      (x)
-+
-+/* Bit definitions and macros for TCD2_NBYTES */
-+#define MCF_EDMA_TCD2_NBYTES_NBYTES(x)      (x)
-+
-+/* Bit definitions and macros for TCD2_SLAST */
-+#define MCF_EDMA_TCD2_SLAST_SLAST(x)    (x)
-+
-+/* Bit definitions and macros for TCD2_DADDR */
-+#define MCF_EDMA_TCD2_DADDR_DADDR(x)    (x)
-+
-+/* Bit definitions and macros for TCD2_CITER */
-+#define MCF_EDMA_TCD2_CITER_CITER(x)    (((x)&0x7FFF))
-+#define MCF_EDMA_TCD2_CITER_E_LINK      (0x8000)
-+
-+/* Bit definitions and macros for TCD2_CITER_ELINK */
-+#define MCF_EDMA_TCD2_CITER_ELINK_CITER(x)      (((x)&0x01FF))
-+#define MCF_EDMA_TCD2_CITER_ELINK_LINKCH(x)     (((x)&0x003F)<<9)
-+#define MCF_EDMA_TCD2_CITER_ELINK_E_LINK        (0x8000)
-+
-+/* Bit definitions and macros for TCD2_DOFF */
-+#define MCF_EDMA_TCD2_DOFF_DOFF(x)      (x)
-+
-+/* Bit definitions and macros for TCD2_DLAST_SGA */
-+#define MCF_EDMA_TCD2_DLAST_SGA_DLAST_SGA(x)    (x)
-+
-+/* Bit definitions and macros for TCD2_BITER_ELINK */
-+#define MCF_EDMA_TCD2_BITER_ELINK_BITER(x)      (((x)&0x01FF))
-+#define MCF_EDMA_TCD2_BITER_ELINK_LINKCH(x)     (((x)&0x003F)<<9)
-+#define MCF_EDMA_TCD2_BITER_ELINK_E_LINK        (0x8000)
-+
-+/* Bit definitions and macros for TCD2_BITER */
-+#define MCF_EDMA_TCD2_BITER_BITER(x)    (((x)&0x7FFF))
-+#define MCF_EDMA_TCD2_BITER_E_LINK      (0x8000)
-+
-+/* Bit definitions and macros for TCD2_CSR */
-+#define MCF_EDMA_TCD2_CSR_START         (0x0001)
-+#define MCF_EDMA_TCD2_CSR_INT_MAJOR     (0x0002)
-+#define MCF_EDMA_TCD2_CSR_INT_HALF      (0x0004)
-+#define MCF_EDMA_TCD2_CSR_D_REQ         (0x0008)
-+#define MCF_EDMA_TCD2_CSR_E_SG          (0x0010)
-+#define MCF_EDMA_TCD2_CSR_E_LINK        (0x0020)
-+#define MCF_EDMA_TCD2_CSR_ACTIVE        (0x0040)
-+#define MCF_EDMA_TCD2_CSR_DONE          (0x0080)
-+#define MCF_EDMA_TCD2_CSR_LINKCH(x)     (((x)&0x003F)<<8)
-+#define MCF_EDMA_TCD2_CSR_BWC(x)        (((x)&0x0003)<<14)
-+
-+/* Bit definitions and macros for TCD3_SADDR */
-+#define MCF_EDMA_TCD3_SADDR_SADDR(x)    (x)
-+
-+/* Bit definitions and macros for TCD3_ATTR */
-+#define MCF_EDMA_TCD3_ATTR_DSIZE(x)     (((x)&0x0007))
-+#define MCF_EDMA_TCD3_ATTR_DMOD(x)      (((x)&0x001F)<<3)
-+#define MCF_EDMA_TCD3_ATTR_SSIZE(x)     (((x)&0x0007)<<8)
-+#define MCF_EDMA_TCD3_ATTR_SMOD(x)      (((x)&0x001F)<<11)
-+
-+/* Bit definitions and macros for TCD3_SOFF */
-+#define MCF_EDMA_TCD3_SOFF_SOFF(x)      (x)
-+
-+/* Bit definitions and macros for TCD3_NBYTES */
-+#define MCF_EDMA_TCD3_NBYTES_NBYTES(x)      (x)
-+
-+/* Bit definitions and macros for TCD3_SLAST */
-+#define MCF_EDMA_TCD3_SLAST_SLAST(x)    (x)
-+
-+/* Bit definitions and macros for TCD3_DADDR */
-+#define MCF_EDMA_TCD3_DADDR_DADDR(x)    (x)
-+
-+/* Bit definitions and macros for TCD3_CITER */
-+#define MCF_EDMA_TCD3_CITER_CITER(x)    (((x)&0x7FFF))
-+#define MCF_EDMA_TCD3_CITER_E_LINK      (0x8000)
-+
-+/* Bit definitions and macros for TCD3_CITER_ELINK */
-+#define MCF_EDMA_TCD3_CITER_ELINK_CITER(x)      (((x)&0x01FF))
-+#define MCF_EDMA_TCD3_CITER_ELINK_LINKCH(x)     (((x)&0x003F)<<9)
-+#define MCF_EDMA_TCD3_CITER_ELINK_E_LINK        (0x8000)
-+
-+/* Bit definitions and macros for TCD3_DOFF */
-+#define MCF_EDMA_TCD3_DOFF_DOFF(x)      (x)
-+
-+/* Bit definitions and macros for TCD3_DLAST_SGA */
-+#define MCF_EDMA_TCD3_DLAST_SGA_DLAST_SGA(x)    (x)
-+
-+/* Bit definitions and macros for TCD3_BITER_ELINK */
-+#define MCF_EDMA_TCD3_BITER_ELINK_BITER(x)      (((x)&0x01FF))
-+#define MCF_EDMA_TCD3_BITER_ELINK_LINKCH(x)     (((x)&0x003F)<<9)
-+#define MCF_EDMA_TCD3_BITER_ELINK_E_LINK        (0x8000)
-+
-+/* Bit definitions and macros for TCD3_BITER */
-+#define MCF_EDMA_TCD3_BITER_BITER(x)    (((x)&0x7FFF))
-+#define MCF_EDMA_TCD3_BITER_E_LINK      (0x8000)
-+
-+/* Bit definitions and macros for TCD3_CSR */
-+#define MCF_EDMA_TCD3_CSR_START         (0x0001)
-+#define MCF_EDMA_TCD3_CSR_INT_MAJOR     (0x0002)
-+#define MCF_EDMA_TCD3_CSR_INT_HALF      (0x0004)
-+#define MCF_EDMA_TCD3_CSR_D_REQ         (0x0008)
-+#define MCF_EDMA_TCD3_CSR_E_SG          (0x0010)
-+#define MCF_EDMA_TCD3_CSR_E_LINK        (0x0020)
-+#define MCF_EDMA_TCD3_CSR_ACTIVE        (0x0040)
-+#define MCF_EDMA_TCD3_CSR_DONE          (0x0080)
-+#define MCF_EDMA_TCD3_CSR_LINKCH(x)     (((x)&0x003F)<<8)
-+#define MCF_EDMA_TCD3_CSR_BWC(x)        (((x)&0x0003)<<14)
-+
-+/* Bit definitions and macros for TCD4_SADDR */
-+#define MCF_EDMA_TCD4_SADDR_SADDR(x)    (x)
-+
-+/* Bit definitions and macros for TCD4_ATTR */
-+#define MCF_EDMA_TCD4_ATTR_DSIZE(x)     (((x)&0x0007))
-+#define MCF_EDMA_TCD4_ATTR_DMOD(x)      (((x)&0x001F)<<3)
-+#define MCF_EDMA_TCD4_ATTR_SSIZE(x)     (((x)&0x0007)<<8)
-+#define MCF_EDMA_TCD4_ATTR_SMOD(x)      (((x)&0x001F)<<11)
-+
-+/* Bit definitions and macros for TCD4_SOFF */
-+#define MCF_EDMA_TCD4_SOFF_SOFF(x)      (x)
-+
-+/* Bit definitions and macros for TCD4_NBYTES */
-+#define MCF_EDMA_TCD4_NBYTES_NBYTES(x)      (x)
-+
-+/* Bit definitions and macros for TCD4_SLAST */
-+#define MCF_EDMA_TCD4_SLAST_SLAST(x)    (x)
-+
-+/* Bit definitions and macros for TCD4_DADDR */
-+#define MCF_EDMA_TCD4_DADDR_DADDR(x)    (x)
-+
-+/* Bit definitions and macros for TCD4_CITER */
-+#define MCF_EDMA_TCD4_CITER_CITER(x)    (((x)&0x7FFF))
-+#define MCF_EDMA_TCD4_CITER_E_LINK      (0x8000)
-+
-+/* Bit definitions and macros for TCD4_CITER_ELINK */
-+#define MCF_EDMA_TCD4_CITER_ELINK_CITER(x)      (((x)&0x01FF))
-+#define MCF_EDMA_TCD4_CITER_ELINK_LINKCH(x)     (((x)&0x003F)<<9)
-+#define MCF_EDMA_TCD4_CITER_ELINK_E_LINK        (0x8000)
-+
-+/* Bit definitions and macros for TCD4_DOFF */
-+#define MCF_EDMA_TCD4_DOFF_DOFF(x)      (x)
-+
-+/* Bit definitions and macros for TCD4_DLAST_SGA */
-+#define MCF_EDMA_TCD4_DLAST_SGA_DLAST_SGA(x)    (x)
-+
-+/* Bit definitions and macros for TCD4_BITER */
-+#define MCF_EDMA_TCD4_BITER_BITER(x)    (((x)&0x7FFF))
-+#define MCF_EDMA_TCD4_BITER_E_LINK      (0x8000)
-+
-+/* Bit definitions and macros for TCD4_BITER_ELINK */
-+#define MCF_EDMA_TCD4_BITER_ELINK_BITER(x)      (((x)&0x01FF))
-+#define MCF_EDMA_TCD4_BITER_ELINK_LINKCH(x)     (((x)&0x003F)<<9)
-+#define MCF_EDMA_TCD4_BITER_ELINK_E_LINK        (0x8000)
-+
-+/* Bit definitions and macros for TCD4_CSR */
-+#define MCF_EDMA_TCD4_CSR_START         (0x0001)
-+#define MCF_EDMA_TCD4_CSR_INT_MAJOR     (0x0002)
-+#define MCF_EDMA_TCD4_CSR_INT_HALF      (0x0004)
-+#define MCF_EDMA_TCD4_CSR_D_REQ         (0x0008)
-+#define MCF_EDMA_TCD4_CSR_E_SG          (0x0010)
-+#define MCF_EDMA_TCD4_CSR_E_LINK        (0x0020)
-+#define MCF_EDMA_TCD4_CSR_ACTIVE        (0x0040)
-+#define MCF_EDMA_TCD4_CSR_DONE          (0x0080)
-+#define MCF_EDMA_TCD4_CSR_LINKCH(x)     (((x)&0x003F)<<8)
-+#define MCF_EDMA_TCD4_CSR_BWC(x)        (((x)&0x0003)<<14)
-+
-+/* Bit definitions and macros for TCD5_SADDR */
-+#define MCF_EDMA_TCD5_SADDR_SADDR(x)    (x)
-+
-+/* Bit definitions and macros for TCD5_ATTR */
-+#define MCF_EDMA_TCD5_ATTR_DSIZE(x)     (((x)&0x0007))
-+#define MCF_EDMA_TCD5_ATTR_DMOD(x)      (((x)&0x001F)<<3)
-+#define MCF_EDMA_TCD5_ATTR_SSIZE(x)     (((x)&0x0007)<<8)
-+#define MCF_EDMA_TCD5_ATTR_SMOD(x)      (((x)&0x001F)<<11)
-+
-+/* Bit definitions and macros for TCD5_SOFF */
-+#define MCF_EDMA_TCD5_SOFF_SOFF(x)      (x)
-+
-+/* Bit definitions and macros for TCD5_NBYTES */
-+#define MCF_EDMA_TCD5_NBYTES_NBYTES(x)      (x)
-+
-+/* Bit definitions and macros for TCD5_SLAST */
-+#define MCF_EDMA_TCD5_SLAST_SLAST(x)    (x)
-+
-+/* Bit definitions and macros for TCD5_DADDR */
-+#define MCF_EDMA_TCD5_DADDR_DADDR(x)    (x)
-+
-+/* Bit definitions and macros for TCD5_CITER */
-+#define MCF_EDMA_TCD5_CITER_CITER(x)    (((x)&0x7FFF))
-+#define MCF_EDMA_TCD5_CITER_E_LINK      (0x8000)
-+
-+/* Bit definitions and macros for TCD5_CITER_ELINK */
-+#define MCF_EDMA_TCD5_CITER_ELINK_CITER(x)      (((x)&0x01FF))
-+#define MCF_EDMA_TCD5_CITER_ELINK_LINKCH(x)     (((x)&0x003F)<<9)
-+#define MCF_EDMA_TCD5_CITER_ELINK_E_LINK        (0x8000)
-+
-+/* Bit definitions and macros for TCD5_DOFF */
-+#define MCF_EDMA_TCD5_DOFF_DOFF(x)      (x)
-+
-+/* Bit definitions and macros for TCD5_DLAST_SGA */
-+#define MCF_EDMA_TCD5_DLAST_SGA_DLAST_SGA(x)    (x)
-+
-+/* Bit definitions and macros for TCD5_BITER_ELINK */
-+#define MCF_EDMA_TCD5_BITER_ELINK_BITER(x)      (((x)&0x01FF))
-+#define MCF_EDMA_TCD5_BITER_ELINK_LINKCH(x)     (((x)&0x003F)<<9)
-+#define MCF_EDMA_TCD5_BITER_ELINK_E_LINK        (0x8000)
-+
-+/* Bit definitions and macros for TCD5_BITER */
-+#define MCF_EDMA_TCD5_BITER_BITER(x)    (((x)&0x7FFF))
-+#define MCF_EDMA_TCD5_BITER_E_LINK      (0x8000)
-+
-+/* Bit definitions and macros for TCD5_CSR */
-+#define MCF_EDMA_TCD5_CSR_START         (0x0001)
-+#define MCF_EDMA_TCD5_CSR_INT_MAJOR     (0x0002)
-+#define MCF_EDMA_TCD5_CSR_INT_HALF      (0x0004)
-+#define MCF_EDMA_TCD5_CSR_D_REQ         (0x0008)
-+#define MCF_EDMA_TCD5_CSR_E_SG          (0x0010)
-+#define MCF_EDMA_TCD5_CSR_E_LINK        (0x0020)
-+#define MCF_EDMA_TCD5_CSR_ACTIVE        (0x0040)
-+#define MCF_EDMA_TCD5_CSR_DONE          (0x0080)
-+#define MCF_EDMA_TCD5_CSR_LINKCH(x)     (((x)&0x003F)<<8)
-+#define MCF_EDMA_TCD5_CSR_BWC(x)        (((x)&0x0003)<<14)
-+
-+/* Bit definitions and macros for TCD6_SADDR */
-+#define MCF_EDMA_TCD6_SADDR_SADDR(x)    (x)
-+
-+/* Bit definitions and macros for TCD6_ATTR */
-+#define MCF_EDMA_TCD6_ATTR_DSIZE(x)     (((x)&0x0007))
-+#define MCF_EDMA_TCD6_ATTR_DMOD(x)      (((x)&0x001F)<<3)
-+#define MCF_EDMA_TCD6_ATTR_SSIZE(x)     (((x)&0x0007)<<8)
-+#define MCF_EDMA_TCD6_ATTR_SMOD(x)      (((x)&0x001F)<<11)
-+
-+/* Bit definitions and macros for TCD6_SOFF */
-+#define MCF_EDMA_TCD6_SOFF_SOFF(x)      (x)
-+
-+/* Bit definitions and macros for TCD6_NBYTES */
-+#define MCF_EDMA_TCD6_NBYTES_NBYTES(x)      (x)
-+
-+/* Bit definitions and macros for TCD6_SLAST */
-+#define MCF_EDMA_TCD6_SLAST_SLAST(x)    (x)
-+
-+/* Bit definitions and macros for TCD6_DADDR */
-+#define MCF_EDMA_TCD6_DADDR_DADDR(x)    (x)
-+
-+/* Bit definitions and macros for TCD6_CITER */
-+#define MCF_EDMA_TCD6_CITER_CITER(x)    (((x)&0x7FFF))
-+#define MCF_EDMA_TCD6_CITER_E_LINK      (0x8000)
-+
-+/* Bit definitions and macros for TCD6_CITER_ELINK */
-+#define MCF_EDMA_TCD6_CITER_ELINK_CITER(x)      (((x)&0x01FF))
-+#define MCF_EDMA_TCD6_CITER_ELINK_LINKCH(x)     (((x)&0x003F)<<9)
-+#define MCF_EDMA_TCD6_CITER_ELINK_E_LINK        (0x8000)
-+
-+/* Bit definitions and macros for TCD6_DOFF */
-+#define MCF_EDMA_TCD6_DOFF_DOFF(x)      (x)
-+
-+/* Bit definitions and macros for TCD6_DLAST_SGA */
-+#define MCF_EDMA_TCD6_DLAST_SGA_DLAST_SGA(x)    (x)
-+
-+/* Bit definitions and macros for TCD6_BITER_ELINK */
-+#define MCF_EDMA_TCD6_BITER_ELINK_BITER(x)      (((x)&0x01FF))
-+#define MCF_EDMA_TCD6_BITER_ELINK_LINKCH(x)     (((x)&0x003F)<<9)
-+#define MCF_EDMA_TCD6_BITER_ELINK_E_LINK        (0x8000)
-+
-+/* Bit definitions and macros for TCD6_BITER */
-+#define MCF_EDMA_TCD6_BITER_BITER(x)    (((x)&0x7FFF))
-+#define MCF_EDMA_TCD6_BITER_E_LINK      (0x8000)
-+
-+/* Bit definitions and macros for TCD6_CSR */
-+#define MCF_EDMA_TCD6_CSR_START         (0x0001)
-+#define MCF_EDMA_TCD6_CSR_INT_MAJOR     (0x0002)
-+#define MCF_EDMA_TCD6_CSR_INT_HALF      (0x0004)
-+#define MCF_EDMA_TCD6_CSR_D_REQ         (0x0008)
-+#define MCF_EDMA_TCD6_CSR_E_SG          (0x0010)
-+#define MCF_EDMA_TCD6_CSR_E_LINK        (0x0020)
-+#define MCF_EDMA_TCD6_CSR_ACTIVE        (0x0040)
-+#define MCF_EDMA_TCD6_CSR_DONE          (0x0080)
-+#define MCF_EDMA_TCD6_CSR_LINKCH(x)     (((x)&0x003F)<<8)
-+#define MCF_EDMA_TCD6_CSR_BWC(x)        (((x)&0x0003)<<14)
-+
-+/* Bit definitions and macros for TCD7_SADDR */
-+#define MCF_EDMA_TCD7_SADDR_SADDR(x)    (x)
-+
-+/* Bit definitions and macros for TCD7_ATTR */
-+#define MCF_EDMA_TCD7_ATTR_DSIZE(x)     (((x)&0x0007))
-+#define MCF_EDMA_TCD7_ATTR_DMOD(x)      (((x)&0x001F)<<3)
-+#define MCF_EDMA_TCD7_ATTR_SSIZE(x)     (((x)&0x0007)<<8)
-+#define MCF_EDMA_TCD7_ATTR_SMOD(x)      (((x)&0x001F)<<11)
-+
-+/* Bit definitions and macros for TCD7_SOFF */
-+#define MCF_EDMA_TCD7_SOFF_SOFF(x)      (x)
-+
-+/* Bit definitions and macros for TCD7_NBYTES */
-+#define MCF_EDMA_TCD7_NBYTES_NBYTES(x)      (x)
-+
-+/* Bit definitions and macros for TCD7_SLAST */
-+#define MCF_EDMA_TCD7_SLAST_SLAST(x)    (x)
-+
-+/* Bit definitions and macros for TCD7_DADDR */
-+#define MCF_EDMA_TCD7_DADDR_DADDR(x)    (x)
-+
-+/* Bit definitions and macros for TCD7_CITER */
-+#define MCF_EDMA_TCD7_CITER_CITER(x)    (((x)&0x7FFF))
-+#define MCF_EDMA_TCD7_CITER_E_LINK      (0x8000)
-+
-+/* Bit definitions and macros for TCD7_CITER_ELINK */
-+#define MCF_EDMA_TCD7_CITER_ELINK_CITER(x)      (((x)&0x01FF))
-+#define MCF_EDMA_TCD7_CITER_ELINK_LINKCH(x)     (((x)&0x003F)<<9)
-+#define MCF_EDMA_TCD7_CITER_ELINK_E_LINK        (0x8000)
-+
-+/* Bit definitions and macros for TCD7_DOFF */
-+#define MCF_EDMA_TCD7_DOFF_DOFF(x)      (x)
-+
-+/* Bit definitions and macros for TCD7_DLAST_SGA */
-+#define MCF_EDMA_TCD7_DLAST_SGA_DLAST_SGA(x)    (x)
-+
-+/* Bit definitions and macros for TCD7_BITER_ELINK */
-+#define MCF_EDMA_TCD7_BITER_ELINK_BITER(x)      (((x)&0x01FF))
-+#define MCF_EDMA_TCD7_BITER_ELINK_LINKCH(x)     (((x)&0x003F)<<9)
-+#define MCF_EDMA_TCD7_BITER_ELINK_E_LINK        (0x8000)
-+
-+/* Bit definitions and macros for TCD7_BITER */
-+#define MCF_EDMA_TCD7_BITER_BITER(x)    (((x)&0x7FFF))
-+#define MCF_EDMA_TCD7_BITER_E_LINK      (0x8000)
-+
-+/* Bit definitions and macros for TCD7_CSR */
-+#define MCF_EDMA_TCD7_CSR_START         (0x0001)
-+#define MCF_EDMA_TCD7_CSR_INT_MAJOR     (0x0002)
-+#define MCF_EDMA_TCD7_CSR_INT_HALF      (0x0004)
-+#define MCF_EDMA_TCD7_CSR_D_REQ         (0x0008)
-+#define MCF_EDMA_TCD7_CSR_E_SG          (0x0010)
-+#define MCF_EDMA_TCD7_CSR_E_LINK        (0x0020)
-+#define MCF_EDMA_TCD7_CSR_ACTIVE        (0x0040)
-+#define MCF_EDMA_TCD7_CSR_DONE          (0x0080)
-+#define MCF_EDMA_TCD7_CSR_LINKCH(x)     (((x)&0x003F)<<8)
-+#define MCF_EDMA_TCD7_CSR_BWC(x)        (((x)&0x0003)<<14)
-+
-+/* Bit definitions and macros for TCD8_SADDR */
-+#define MCF_EDMA_TCD8_SADDR_SADDR(x)    (x)
-+
-+/* Bit definitions and macros for TCD8_ATTR */
-+#define MCF_EDMA_TCD8_ATTR_DSIZE(x)     (((x)&0x0007))
-+#define MCF_EDMA_TCD8_ATTR_DMOD(x)      (((x)&0x001F)<<3)
-+#define MCF_EDMA_TCD8_ATTR_SSIZE(x)     (((x)&0x0007)<<8)
-+#define MCF_EDMA_TCD8_ATTR_SMOD(x)      (((x)&0x001F)<<11)
-+
-+/* Bit definitions and macros for TCD8_SOFF */
-+#define MCF_EDMA_TCD8_SOFF_SOFF(x)      (x)
-+
-+/* Bit definitions and macros for TCD8_NBYTES */
-+#define MCF_EDMA_TCD8_NBYTES_NBYTES(x)      (x)
-+
-+/* Bit definitions and macros for TCD8_SLAST */
-+#define MCF_EDMA_TCD8_SLAST_SLAST(x)    (x)
-+
-+/* Bit definitions and macros for TCD8_DADDR */
-+#define MCF_EDMA_TCD8_DADDR_DADDR(x)    (x)
-+
-+/* Bit definitions and macros for TCD8_CITER */
-+#define MCF_EDMA_TCD8_CITER_CITER(x)    (((x)&0x7FFF))
-+#define MCF_EDMA_TCD8_CITER_E_LINK      (0x8000)
-+
-+/* Bit definitions and macros for TCD8_CITER_ELINK */
-+#define MCF_EDMA_TCD8_CITER_ELINK_CITER(x)      (((x)&0x01FF))
-+#define MCF_EDMA_TCD8_CITER_ELINK_LINKCH(x)     (((x)&0x003F)<<9)
-+#define MCF_EDMA_TCD8_CITER_ELINK_E_LINK        (0x8000)
-+
-+/* Bit definitions and macros for TCD8_DOFF */
-+#define MCF_EDMA_TCD8_DOFF_DOFF(x)      (x)
-+
-+/* Bit definitions and macros for TCD8_DLAST_SGA */
-+#define MCF_EDMA_TCD8_DLAST_SGA_DLAST_SGA(x)    (x)
-+
-+/* Bit definitions and macros for TCD8_BITER_ELINK */
-+#define MCF_EDMA_TCD8_BITER_ELINK_BITER(x)      (((x)&0x01FF))
-+#define MCF_EDMA_TCD8_BITER_ELINK_LINKCH(x)     (((x)&0x003F)<<9)
-+#define MCF_EDMA_TCD8_BITER_ELINK_E_LINK        (0x8000)
-+
-+/* Bit definitions and macros for TCD8_BITER */
-+#define MCF_EDMA_TCD8_BITER_BITER(x)    (((x)&0x7FFF))
-+#define MCF_EDMA_TCD8_BITER_E_LINK      (0x8000)
-+
-+/* Bit definitions and macros for TCD8_CSR */
-+#define MCF_EDMA_TCD8_CSR_START         (0x0001)
-+#define MCF_EDMA_TCD8_CSR_INT_MAJOR     (0x0002)
-+#define MCF_EDMA_TCD8_CSR_INT_HALF      (0x0004)
-+#define MCF_EDMA_TCD8_CSR_D_REQ         (0x0008)
-+#define MCF_EDMA_TCD8_CSR_E_SG          (0x0010)
-+#define MCF_EDMA_TCD8_CSR_E_LINK        (0x0020)
-+#define MCF_EDMA_TCD8_CSR_ACTIVE        (0x0040)
-+#define MCF_EDMA_TCD8_CSR_DONE          (0x0080)
-+#define MCF_EDMA_TCD8_CSR_LINKCH(x)     (((x)&0x003F)<<8)
-+#define MCF_EDMA_TCD8_CSR_BWC(x)        (((x)&0x0003)<<14)
-+
-+/* Bit definitions and macros for TCD9_SADDR */
-+#define MCF_EDMA_TCD9_SADDR_SADDR(x)    (x)
-+
-+/* Bit definitions and macros for TCD9_ATTR */
-+#define MCF_EDMA_TCD9_ATTR_DSIZE(x)     (((x)&0x0007))
-+#define MCF_EDMA_TCD9_ATTR_DMOD(x)      (((x)&0x001F)<<3)
-+#define MCF_EDMA_TCD9_ATTR_SSIZE(x)     (((x)&0x0007)<<8)
-+#define MCF_EDMA_TCD9_ATTR_SMOD(x)      (((x)&0x001F)<<11)
-+
-+/* Bit definitions and macros for TCD9_SOFF */
-+#define MCF_EDMA_TCD9_SOFF_SOFF(x)      (x)
-+
-+/* Bit definitions and macros for TCD9_NBYTES */
-+#define MCF_EDMA_TCD9_NBYTES_NBYTES(x)      (x)
-+
-+/* Bit definitions and macros for TCD9_SLAST */
-+#define MCF_EDMA_TCD9_SLAST_SLAST(x)    (x)
-+
-+/* Bit definitions and macros for TCD9_DADDR */
-+#define MCF_EDMA_TCD9_DADDR_DADDR(x)    (x)
-+
-+/* Bit definitions and macros for TCD9_CITER_ELINK */
-+#define MCF_EDMA_TCD9_CITER_ELINK_CITER(x)      (((x)&0x01FF))
-+#define MCF_EDMA_TCD9_CITER_ELINK_LINKCH(x)     (((x)&0x003F)<<9)
-+#define MCF_EDMA_TCD9_CITER_ELINK_E_LINK        (0x8000)
-+
-+/* Bit definitions and macros for TCD9_CITER */
-+#define MCF_EDMA_TCD9_CITER_CITER(x)    (((x)&0x7FFF))
-+#define MCF_EDMA_TCD9_CITER_E_LINK      (0x8000)
-+
-+/* Bit definitions and macros for TCD9_DOFF */
-+#define MCF_EDMA_TCD9_DOFF_DOFF(x)      (x)
-+
-+/* Bit definitions and macros for TCD9_DLAST_SGA */
-+#define MCF_EDMA_TCD9_DLAST_SGA_DLAST_SGA(x)    (x)
-+
-+/* Bit definitions and macros for TCD9_BITER_ELINK */
-+#define MCF_EDMA_TCD9_BITER_ELINK_BITER(x)      (((x)&0x01FF))
-+#define MCF_EDMA_TCD9_BITER_ELINK_LINKCH(x)     (((x)&0x003F)<<9)
-+#define MCF_EDMA_TCD9_BITER_ELINK_E_LINK        (0x8000)
-+
-+/* Bit definitions and macros for TCD9_BITER */
-+#define MCF_EDMA_TCD9_BITER_BITER(x)    (((x)&0x7FFF))
-+#define MCF_EDMA_TCD9_BITER_E_LINK      (0x8000)
-+
-+/* Bit definitions and macros for TCD9_CSR */
-+#define MCF_EDMA_TCD9_CSR_START         (0x0001)
-+#define MCF_EDMA_TCD9_CSR_INT_MAJOR     (0x0002)
-+#define MCF_EDMA_TCD9_CSR_INT_HALF      (0x0004)
-+#define MCF_EDMA_TCD9_CSR_D_REQ         (0x0008)
-+#define MCF_EDMA_TCD9_CSR_E_SG          (0x0010)
-+#define MCF_EDMA_TCD9_CSR_E_LINK        (0x0020)
-+#define MCF_EDMA_TCD9_CSR_ACTIVE        (0x0040)
-+#define MCF_EDMA_TCD9_CSR_DONE          (0x0080)
-+#define MCF_EDMA_TCD9_CSR_LINKCH(x)     (((x)&0x003F)<<8)
-+#define MCF_EDMA_TCD9_CSR_BWC(x)        (((x)&0x0003)<<14)
-+
-+/* Bit definitions and macros for TCD10_SADDR */
-+#define MCF_EDMA_TCD10_SADDR_SADDR(x)   (x)
-+
-+/* Bit definitions and macros for TCD10_ATTR */
-+#define MCF_EDMA_TCD10_ATTR_DSIZE(x)    (((x)&0x0007))
-+#define MCF_EDMA_TCD10_ATTR_DMOD(x)     (((x)&0x001F)<<3)
-+#define MCF_EDMA_TCD10_ATTR_SSIZE(x)    (((x)&0x0007)<<8)
-+#define MCF_EDMA_TCD10_ATTR_SMOD(x)     (((x)&0x001F)<<11)
-+
-+/* Bit definitions and macros for TCD10_SOFF */
-+#define MCF_EDMA_TCD10_SOFF_SOFF(x)     (x)
-+
-+/* Bit definitions and macros for TCD10_NBYTES */
-+#define MCF_EDMA_TCD10_NBYTES_NBYTES(x)     (x)
-+
-+/* Bit definitions and macros for TCD10_SLAST */
-+#define MCF_EDMA_TCD10_SLAST_SLAST(x)   (x)
-+
-+/* Bit definitions and macros for TCD10_DADDR */
-+#define MCF_EDMA_TCD10_DADDR_DADDR(x)   (x)
-+
-+/* Bit definitions and macros for TCD10_CITER_ELINK */
-+#define MCF_EDMA_TCD10_CITER_ELINK_CITER(x)     (((x)&0x01FF))
-+#define MCF_EDMA_TCD10_CITER_ELINK_LINKCH(x)    (((x)&0x003F)<<9)
-+#define MCF_EDMA_TCD10_CITER_ELINK_E_LINK       (0x8000)
-+
-+/* Bit definitions and macros for TCD10_CITER */
-+#define MCF_EDMA_TCD10_CITER_CITER(x)   (((x)&0x7FFF))
-+#define MCF_EDMA_TCD10_CITER_E_LINK     (0x8000)
-+
-+/* Bit definitions and macros for TCD10_DOFF */
-+#define MCF_EDMA_TCD10_DOFF_DOFF(x)     (x)
-+
-+/* Bit definitions and macros for TCD10_DLAST_SGA */
-+#define MCF_EDMA_TCD10_DLAST_SGA_DLAST_SGA(x)   (x)
-+
-+/* Bit definitions and macros for TCD10_BITER */
-+#define MCF_EDMA_TCD10_BITER_BITER(x)   (((x)&0x7FFF))
-+#define MCF_EDMA_TCD10_BITER_E_LINK     (0x8000)
-+
-+/* Bit definitions and macros for TCD10_BITER_ELINK */
-+#define MCF_EDMA_TCD10_BITER_ELINK_BITER(x)     (((x)&0x01FF))
-+#define MCF_EDMA_TCD10_BITER_ELINK_LINKCH(x)    (((x)&0x003F)<<9)
-+#define MCF_EDMA_TCD10_BITER_ELINK_E_LINK       (0x8000)
-+
-+/* Bit definitions and macros for TCD10_CSR */
-+#define MCF_EDMA_TCD10_CSR_START        (0x0001)
-+#define MCF_EDMA_TCD10_CSR_INT_MAJOR    (0x0002)
-+#define MCF_EDMA_TCD10_CSR_INT_HALF     (0x0004)
-+#define MCF_EDMA_TCD10_CSR_D_REQ        (0x0008)
-+#define MCF_EDMA_TCD10_CSR_E_SG         (0x0010)
-+#define MCF_EDMA_TCD10_CSR_E_LINK       (0x0020)
-+#define MCF_EDMA_TCD10_CSR_ACTIVE       (0x0040)
-+#define MCF_EDMA_TCD10_CSR_DONE         (0x0080)
-+#define MCF_EDMA_TCD10_CSR_LINKCH(x)    (((x)&0x003F)<<8)
-+#define MCF_EDMA_TCD10_CSR_BWC(x)       (((x)&0x0003)<<14)
-+
-+/* Bit definitions and macros for TCD11_SADDR */
-+#define MCF_EDMA_TCD11_SADDR_SADDR(x)   (x)
-+
-+/* Bit definitions and macros for TCD11_ATTR */
-+#define MCF_EDMA_TCD11_ATTR_DSIZE(x)    (((x)&0x0007))
-+#define MCF_EDMA_TCD11_ATTR_DMOD(x)     (((x)&0x001F)<<3)
-+#define MCF_EDMA_TCD11_ATTR_SSIZE(x)    (((x)&0x0007)<<8)
-+#define MCF_EDMA_TCD11_ATTR_SMOD(x)     (((x)&0x001F)<<11)
-+
-+/* Bit definitions and macros for TCD11_SOFF */
-+#define MCF_EDMA_TCD11_SOFF_SOFF(x)     (x)
-+
-+/* Bit definitions and macros for TCD11_NBYTES */
-+#define MCF_EDMA_TCD11_NBYTES_NBYTES(x)     (x)
-+
-+/* Bit definitions and macros for TCD11_SLAST */
-+#define MCF_EDMA_TCD11_SLAST_SLAST(x)   (x)
-+
-+/* Bit definitions and macros for TCD11_DADDR */
-+#define MCF_EDMA_TCD11_DADDR_DADDR(x)   (x)
-+
-+/* Bit definitions and macros for TCD11_CITER */
-+#define MCF_EDMA_TCD11_CITER_CITER(x)   (((x)&0x7FFF))
-+#define MCF_EDMA_TCD11_CITER_E_LINK     (0x8000)
-+
-+/* Bit definitions and macros for TCD11_CITER_ELINK */
-+#define MCF_EDMA_TCD11_CITER_ELINK_CITER(x)     (((x)&0x01FF))
-+#define MCF_EDMA_TCD11_CITER_ELINK_LINKCH(x)    (((x)&0x003F)<<9)
-+#define MCF_EDMA_TCD11_CITER_ELINK_E_LINK       (0x8000)
-+
-+/* Bit definitions and macros for TCD11_DOFF */
-+#define MCF_EDMA_TCD11_DOFF_DOFF(x)     (x)
-+
-+/* Bit definitions and macros for TCD11_DLAST_SGA */
-+#define MCF_EDMA_TCD11_DLAST_SGA_DLAST_SGA(x)   (x)
-+
-+/* Bit definitions and macros for TCD11_BITER */
-+#define MCF_EDMA_TCD11_BITER_BITER(x)   (((x)&0x7FFF))
-+#define MCF_EDMA_TCD11_BITER_E_LINK     (0x8000)
-+
-+/* Bit definitions and macros for TCD11_BITER_ELINK */
-+#define MCF_EDMA_TCD11_BITER_ELINK_BITER(x)     (((x)&0x01FF))
-+#define MCF_EDMA_TCD11_BITER_ELINK_LINKCH(x)    (((x)&0x003F)<<9)
-+#define MCF_EDMA_TCD11_BITER_ELINK_E_LINK       (0x8000)
-+
-+/* Bit definitions and macros for TCD11_CSR */
-+#define MCF_EDMA_TCD11_CSR_START        (0x0001)
-+#define MCF_EDMA_TCD11_CSR_INT_MAJOR    (0x0002)
-+#define MCF_EDMA_TCD11_CSR_INT_HALF     (0x0004)
-+#define MCF_EDMA_TCD11_CSR_D_REQ        (0x0008)
-+#define MCF_EDMA_TCD11_CSR_E_SG         (0x0010)
-+#define MCF_EDMA_TCD11_CSR_E_LINK       (0x0020)
-+#define MCF_EDMA_TCD11_CSR_ACTIVE       (0x0040)
-+#define MCF_EDMA_TCD11_CSR_DONE         (0x0080)
-+#define MCF_EDMA_TCD11_CSR_LINKCH(x)    (((x)&0x003F)<<8)
-+#define MCF_EDMA_TCD11_CSR_BWC(x)       (((x)&0x0003)<<14)
-+
-+/* Bit definitions and macros for TCD12_SADDR */
-+#define MCF_EDMA_TCD12_SADDR_SADDR(x)   (x)
-+
-+/* Bit definitions and macros for TCD12_ATTR */
-+#define MCF_EDMA_TCD12_ATTR_DSIZE(x)    (((x)&0x0007))
-+#define MCF_EDMA_TCD12_ATTR_DMOD(x)     (((x)&0x001F)<<3)
-+#define MCF_EDMA_TCD12_ATTR_SSIZE(x)    (((x)&0x0007)<<8)
-+#define MCF_EDMA_TCD12_ATTR_SMOD(x)     (((x)&0x001F)<<11)
-+
-+/* Bit definitions and macros for TCD12_SOFF */
-+#define MCF_EDMA_TCD12_SOFF_SOFF(x)     (x)
-+
-+/* Bit definitions and macros for TCD12_NBYTES */
-+#define MCF_EDMA_TCD12_NBYTES_NBYTES(x)     (x)
-+
-+/* Bit definitions and macros for TCD12_SLAST */
-+#define MCF_EDMA_TCD12_SLAST_SLAST(x)   (x)
-+
-+/* Bit definitions and macros for TCD12_DADDR */
-+#define MCF_EDMA_TCD12_DADDR_DADDR(x)   (x)
-+
-+/* Bit definitions and macros for TCD12_CITER */
-+#define MCF_EDMA_TCD12_CITER_CITER(x)   (((x)&0x7FFF))
-+#define MCF_EDMA_TCD12_CITER_E_LINK     (0x8000)
-+
-+/* Bit definitions and macros for TCD12_CITER_ELINK */
-+#define MCF_EDMA_TCD12_CITER_ELINK_CITER(x)     (((x)&0x01FF))
-+#define MCF_EDMA_TCD12_CITER_ELINK_LINKCH(x)    (((x)&0x003F)<<9)
-+#define MCF_EDMA_TCD12_CITER_ELINK_E_LINK       (0x8000)
-+
-+/* Bit definitions and macros for TCD12_DOFF */
-+#define MCF_EDMA_TCD12_DOFF_DOFF(x)     (x)
-+
-+/* Bit definitions and macros for TCD12_DLAST_SGA */
-+#define MCF_EDMA_TCD12_DLAST_SGA_DLAST_SGA(x)   (x)
-+
-+/* Bit definitions and macros for TCD12_BITER */
-+#define MCF_EDMA_TCD12_BITER_BITER(x)   (((x)&0x7FFF))
-+#define MCF_EDMA_TCD12_BITER_E_LINK     (0x8000)
-+
-+/* Bit definitions and macros for TCD12_BITER_ELINK */
-+#define MCF_EDMA_TCD12_BITER_ELINK_BITER(x)     (((x)&0x01FF))
-+#define MCF_EDMA_TCD12_BITER_ELINK_LINKCH(x)    (((x)&0x003F)<<9)
-+#define MCF_EDMA_TCD12_BITER_ELINK_E_LINK       (0x8000)
-+
-+/* Bit definitions and macros for TCD12_CSR */
-+#define MCF_EDMA_TCD12_CSR_START        (0x0001)
-+#define MCF_EDMA_TCD12_CSR_INT_MAJOR    (0x0002)
-+#define MCF_EDMA_TCD12_CSR_INT_HALF     (0x0004)
-+#define MCF_EDMA_TCD12_CSR_D_REQ        (0x0008)
-+#define MCF_EDMA_TCD12_CSR_E_SG         (0x0010)
-+#define MCF_EDMA_TCD12_CSR_E_LINK       (0x0020)
-+#define MCF_EDMA_TCD12_CSR_ACTIVE       (0x0040)
-+#define MCF_EDMA_TCD12_CSR_DONE         (0x0080)
-+#define MCF_EDMA_TCD12_CSR_LINKCH(x)    (((x)&0x003F)<<8)
-+#define MCF_EDMA_TCD12_CSR_BWC(x)       (((x)&0x0003)<<14)
-+
-+/* Bit definitions and macros for TCD13_SADDR */
-+#define MCF_EDMA_TCD13_SADDR_SADDR(x)   (x)
-+
-+/* Bit definitions and macros for TCD13_ATTR */
-+#define MCF_EDMA_TCD13_ATTR_DSIZE(x)    (((x)&0x0007))
-+#define MCF_EDMA_TCD13_ATTR_DMOD(x)     (((x)&0x001F)<<3)
-+#define MCF_EDMA_TCD13_ATTR_SSIZE(x)    (((x)&0x0007)<<8)
-+#define MCF_EDMA_TCD13_ATTR_SMOD(x)     (((x)&0x001F)<<11)
-+
-+/* Bit definitions and macros for TCD13_SOFF */
-+#define MCF_EDMA_TCD13_SOFF_SOFF(x)     (x)
-+
-+/* Bit definitions and macros for TCD13_NBYTES */
-+#define MCF_EDMA_TCD13_NBYTES_NBYTES(x)     (x)
-+
-+/* Bit definitions and macros for TCD13_SLAST */
-+#define MCF_EDMA_TCD13_SLAST_SLAST(x)   (x)
-+
-+/* Bit definitions and macros for TCD13_DADDR */
-+#define MCF_EDMA_TCD13_DADDR_DADDR(x)   (x)
-+
-+/* Bit definitions and macros for TCD13_CITER_ELINK */
-+#define MCF_EDMA_TCD13_CITER_ELINK_CITER(x)     (((x)&0x01FF))
-+#define MCF_EDMA_TCD13_CITER_ELINK_LINKCH(x)    (((x)&0x003F)<<9)
-+#define MCF_EDMA_TCD13_CITER_ELINK_E_LINK       (0x8000)
-+
-+/* Bit definitions and macros for TCD13_CITER */
-+#define MCF_EDMA_TCD13_CITER_CITER(x)   (((x)&0x7FFF))
-+#define MCF_EDMA_TCD13_CITER_E_LINK     (0x8000)
-+
-+/* Bit definitions and macros for TCD13_DOFF */
-+#define MCF_EDMA_TCD13_DOFF_DOFF(x)     (x)
-+
-+/* Bit definitions and macros for TCD13_DLAST_SGA */
-+#define MCF_EDMA_TCD13_DLAST_SGA_DLAST_SGA(x)   (x)
-+
-+/* Bit definitions and macros for TCD13_BITER_ELINK */
-+#define MCF_EDMA_TCD13_BITER_ELINK_BITER(x)     (((x)&0x01FF))
-+#define MCF_EDMA_TCD13_BITER_ELINK_LINKCH(x)    (((x)&0x003F)<<9)
-+#define MCF_EDMA_TCD13_BITER_ELINK_E_LINK       (0x8000)
-+
-+/* Bit definitions and macros for TCD13_BITER */
-+#define MCF_EDMA_TCD13_BITER_BITER(x)   (((x)&0x7FFF))
-+#define MCF_EDMA_TCD13_BITER_E_LINK     (0x8000)
-+
-+/* Bit definitions and macros for TCD13_CSR */
-+#define MCF_EDMA_TCD13_CSR_START        (0x0001)
-+#define MCF_EDMA_TCD13_CSR_INT_MAJOR    (0x0002)
-+#define MCF_EDMA_TCD13_CSR_INT_HALF     (0x0004)
-+#define MCF_EDMA_TCD13_CSR_D_REQ        (0x0008)
-+#define MCF_EDMA_TCD13_CSR_E_SG         (0x0010)
-+#define MCF_EDMA_TCD13_CSR_E_LINK       (0x0020)
-+#define MCF_EDMA_TCD13_CSR_ACTIVE       (0x0040)
-+#define MCF_EDMA_TCD13_CSR_DONE         (0x0080)
-+#define MCF_EDMA_TCD13_CSR_LINKCH(x)    (((x)&0x003F)<<8)
-+#define MCF_EDMA_TCD13_CSR_BWC(x)       (((x)&0x0003)<<14)
-+
-+/* Bit definitions and macros for TCD14_SADDR */
-+#define MCF_EDMA_TCD14_SADDR_SADDR(x)   (x)
-+
-+/* Bit definitions and macros for TCD14_ATTR */
-+#define MCF_EDMA_TCD14_ATTR_DSIZE(x)    (((x)&0x0007))
-+#define MCF_EDMA_TCD14_ATTR_DMOD(x)     (((x)&0x001F)<<3)
-+#define MCF_EDMA_TCD14_ATTR_SSIZE(x)    (((x)&0x0007)<<8)
-+#define MCF_EDMA_TCD14_ATTR_SMOD(x)     (((x)&0x001F)<<11)
-+
-+/* Bit definitions and macros for TCD14_SOFF */
-+#define MCF_EDMA_TCD14_SOFF_SOFF(x)     (x)
-+
-+/* Bit definitions and macros for TCD14_NBYTES */
-+#define MCF_EDMA_TCD14_NBYTES_NBYTES(x)     (x)
-+
-+/* Bit definitions and macros for TCD14_SLAST */
-+#define MCF_EDMA_TCD14_SLAST_SLAST(x)   (x)
-+
-+/* Bit definitions and macros for TCD14_DADDR */
-+#define MCF_EDMA_TCD14_DADDR_DADDR(x)   (x)
-+
-+/* Bit definitions and macros for TCD14_CITER */
-+#define MCF_EDMA_TCD14_CITER_CITER(x)   (((x)&0x7FFF))
-+#define MCF_EDMA_TCD14_CITER_E_LINK     (0x8000)
-+
-+/* Bit definitions and macros for TCD14_CITER_ELINK */
-+#define MCF_EDMA_TCD14_CITER_ELINK_CITER(x)     (((x)&0x01FF))
-+#define MCF_EDMA_TCD14_CITER_ELINK_LINKCH(x)    (((x)&0x003F)<<9)
-+#define MCF_EDMA_TCD14_CITER_ELINK_E_LINK       (0x8000)
-+
-+/* Bit definitions and macros for TCD14_DOFF */
-+#define MCF_EDMA_TCD14_DOFF_DOFF(x)     (x)
-+
-+/* Bit definitions and macros for TCD14_DLAST_SGA */
-+#define MCF_EDMA_TCD14_DLAST_SGA_DLAST_SGA(x)   (x)
-+
-+/* Bit definitions and macros for TCD14_BITER_ELINK */
-+#define MCF_EDMA_TCD14_BITER_ELINK_BITER(x)     (((x)&0x01FF))
-+#define MCF_EDMA_TCD14_BITER_ELINK_LINKCH(x)    (((x)&0x003F)<<9)
-+#define MCF_EDMA_TCD14_BITER_ELINK_E_LINK       (0x8000)
-+
-+/* Bit definitions and macros for TCD14_BITER */
-+#define MCF_EDMA_TCD14_BITER_BITER(x)   (((x)&0x7FFF))
-+#define MCF_EDMA_TCD14_BITER_E_LINK     (0x8000)
-+
-+/* Bit definitions and macros for TCD14_CSR */
-+#define MCF_EDMA_TCD14_CSR_START        (0x0001)
-+#define MCF_EDMA_TCD14_CSR_INT_MAJOR    (0x0002)
-+#define MCF_EDMA_TCD14_CSR_INT_HALF     (0x0004)
-+#define MCF_EDMA_TCD14_CSR_D_REQ        (0x0008)
-+#define MCF_EDMA_TCD14_CSR_E_SG         (0x0010)
-+#define MCF_EDMA_TCD14_CSR_E_LINK       (0x0020)
-+#define MCF_EDMA_TCD14_CSR_ACTIVE       (0x0040)
-+#define MCF_EDMA_TCD14_CSR_DONE         (0x0080)
-+#define MCF_EDMA_TCD14_CSR_LINKCH(x)    (((x)&0x003F)<<8)
-+#define MCF_EDMA_TCD14_CSR_BWC(x)       (((x)&0x0003)<<14)
-+
-+/* Bit definitions and macros for TCD15_SADDR */
-+#define MCF_EDMA_TCD15_SADDR_SADDR(x)   (x)
-+
-+/* Bit definitions and macros for TCD15_ATTR */
-+#define MCF_EDMA_TCD15_ATTR_DSIZE(x)    (((x)&0x0007))
-+#define MCF_EDMA_TCD15_ATTR_DMOD(x)     (((x)&0x001F)<<3)
-+#define MCF_EDMA_TCD15_ATTR_SSIZE(x)    (((x)&0x0007)<<8)
-+#define MCF_EDMA_TCD15_ATTR_SMOD(x)     (((x)&0x001F)<<11)
-+
-+/* Bit definitions and macros for TCD15_SOFF */
-+#define MCF_EDMA_TCD15_SOFF_SOFF(x)     (x)
-+
-+/* Bit definitions and macros for TCD15_NBYTES */
-+#define MCF_EDMA_TCD15_NBYTES_NBYTES(x)     (x)
-+
-+/* Bit definitions and macros for TCD15_SLAST */
-+#define MCF_EDMA_TCD15_SLAST_SLAST(x)   (x)
-+
-+/* Bit definitions and macros for TCD15_DADDR */
-+#define MCF_EDMA_TCD15_DADDR_DADDR(x)   (x)
-+
-+/* Bit definitions and macros for TCD15_CITER_ELINK */
-+#define MCF_EDMA_TCD15_CITER_ELINK_CITER(x)     (((x)&0x01FF))
-+#define MCF_EDMA_TCD15_CITER_ELINK_LINKCH(x)    (((x)&0x003F)<<9)
-+#define MCF_EDMA_TCD15_CITER_ELINK_E_LINK       (0x8000)
-+
-+/* Bit definitions and macros for TCD15_CITER */
-+#define MCF_EDMA_TCD15_CITER_CITER(x)   (((x)&0x7FFF))
-+#define MCF_EDMA_TCD15_CITER_E_LINK     (0x8000)
-+
-+/* Bit definitions and macros for TCD15_DOFF */
-+#define MCF_EDMA_TCD15_DOFF_DOFF(x)     (x)
-+
-+/* Bit definitions and macros for TCD15_DLAST_SGA */
-+#define MCF_EDMA_TCD15_DLAST_SGA_DLAST_SGA(x)   (x)
-+
-+/* Bit definitions and macros for TCD15_BITER */
-+#define MCF_EDMA_TCD15_BITER_BITER(x)   (((x)&0x7FFF))
-+#define MCF_EDMA_TCD15_BITER_E_LINK     (0x8000)
-+
-+/* Bit definitions and macros for TCD15_BITER_ELINK */
-+#define MCF_EDMA_TCD15_BITER_ELINK_BITER(x)     (((x)&0x01FF))
-+#define MCF_EDMA_TCD15_BITER_ELINK_LINKCH(x)    (((x)&0x003F)<<9)
-+#define MCF_EDMA_TCD15_BITER_ELINK_E_LINK       (0x8000)
-+
-+/* Bit definitions and macros for TCD15_CSR */
-+#define MCF_EDMA_TCD15_CSR_START        (0x0001)
-+#define MCF_EDMA_TCD15_CSR_INT_MAJOR    (0x0002)
-+#define MCF_EDMA_TCD15_CSR_INT_HALF     (0x0004)
-+#define MCF_EDMA_TCD15_CSR_D_REQ        (0x0008)
-+#define MCF_EDMA_TCD15_CSR_E_SG         (0x0010)
-+#define MCF_EDMA_TCD15_CSR_E_LINK       (0x0020)
-+#define MCF_EDMA_TCD15_CSR_ACTIVE       (0x0040)
-+#define MCF_EDMA_TCD15_CSR_DONE         (0x0080)
-+#define MCF_EDMA_TCD15_CSR_LINKCH(x)    (((x)&0x003F)<<8)
-+#define MCF_EDMA_TCD15_CSR_BWC(x)       (((x)&0x0003)<<14)
-+
-+/********************************************************************/
-+
-+#endif /* __MCF5445X_EDMA_H__ */
---- /dev/null
-+++ b/include/asm-m68k/mcf5445x_eport.h
-@@ -0,0 +1,117 @@
-+/*
-+ * Kurt Mahan kmahan@freescale.com
-+ *
-+ * Copyright Freescale Semiconductor, Inc. 2007
-+ *
-+ * 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.
-+ */
-+
-+#ifndef __MCF5445X_EPORT_H__
-+#define __MCF5445X_EPORT_H__
-+
-+/*********************************************************************
-+*
-+* Edge Port Module (EPORT)
-+*
-+*********************************************************************/
-+
-+/* Register read/write macros */
-+#define MCF_EPORT_EPPAR         MCF_REG16(0xFC094000)
-+#define MCF_EPORT_EPDDR         MCF_REG08(0xFC094002)
-+#define MCF_EPORT_EPIER         MCF_REG08(0xFC094003)
-+#define MCF_EPORT_EPDR          MCF_REG08(0xFC094004)
-+#define MCF_EPORT_EPPDR         MCF_REG08(0xFC094005)
-+#define MCF_EPORT_EPFR          MCF_REG08(0xFC094006)
-+
-+/* Bit definitions and macros for EPPAR */
-+#define MCF_EPORT_EPPAR_EPPA1(x)        (((x)&0x0003)<<2)
-+#define MCF_EPORT_EPPAR_EPPA2(x)        (((x)&0x0003)<<4)
-+#define MCF_EPORT_EPPAR_EPPA3(x)        (((x)&0x0003)<<6)
-+#define MCF_EPORT_EPPAR_EPPA4(x)        (((x)&0x0003)<<8)
-+#define MCF_EPORT_EPPAR_EPPA5(x)        (((x)&0x0003)<<10)
-+#define MCF_EPORT_EPPAR_EPPA6(x)        (((x)&0x0003)<<12)
-+#define MCF_EPORT_EPPAR_EPPA7(x)        (((x)&0x0003)<<14)
-+#define MCF_EPORT_EPPAR_LEVEL           (0)
-+#define MCF_EPORT_EPPAR_RISING          (1)
-+#define MCF_EPORT_EPPAR_FALLING         (2)
-+#define MCF_EPORT_EPPAR_BOTH            (3)
-+#define MCF_EPORT_EPPAR_EPPA7_LEVEL     (0x0000)
-+#define MCF_EPORT_EPPAR_EPPA7_RISING    (0x4000)
-+#define MCF_EPORT_EPPAR_EPPA7_FALLING   (0x8000)
-+#define MCF_EPORT_EPPAR_EPPA7_BOTH      (0xC000)
-+#define MCF_EPORT_EPPAR_EPPA6_LEVEL     (0x0000)
-+#define MCF_EPORT_EPPAR_EPPA6_RISING    (0x1000)
-+#define MCF_EPORT_EPPAR_EPPA6_FALLING   (0x2000)
-+#define MCF_EPORT_EPPAR_EPPA6_BOTH      (0x3000)
-+#define MCF_EPORT_EPPAR_EPPA5_LEVEL     (0x0000)
-+#define MCF_EPORT_EPPAR_EPPA5_RISING    (0x0400)
-+#define MCF_EPORT_EPPAR_EPPA5_FALLING   (0x0800)
-+#define MCF_EPORT_EPPAR_EPPA5_BOTH      (0x0C00)
-+#define MCF_EPORT_EPPAR_EPPA4_LEVEL     (0x0000)
-+#define MCF_EPORT_EPPAR_EPPA4_RISING    (0x0100)
-+#define MCF_EPORT_EPPAR_EPPA4_FALLING   (0x0200)
-+#define MCF_EPORT_EPPAR_EPPA4_BOTH      (0x0300)
-+#define MCF_EPORT_EPPAR_EPPA3_LEVEL     (0x0000)
-+#define MCF_EPORT_EPPAR_EPPA3_RISING    (0x0040)
-+#define MCF_EPORT_EPPAR_EPPA3_FALLING   (0x0080)
-+#define MCF_EPORT_EPPAR_EPPA3_BOTH      (0x00C0)
-+#define MCF_EPORT_EPPAR_EPPA2_LEVEL     (0x0000)
-+#define MCF_EPORT_EPPAR_EPPA2_RISING    (0x0010)
-+#define MCF_EPORT_EPPAR_EPPA2_FALLING   (0x0020)
-+#define MCF_EPORT_EPPAR_EPPA2_BOTH      (0x0030)
-+#define MCF_EPORT_EPPAR_EPPA1_LEVEL     (0x0000)
-+#define MCF_EPORT_EPPAR_EPPA1_RISING    (0x0004)
-+#define MCF_EPORT_EPPAR_EPPA1_FALLING   (0x0008)
-+#define MCF_EPORT_EPPAR_EPPA1_BOTH      (0x000C)
-+
-+/* Bit definitions and macros for EPDDR */
-+#define MCF_EPORT_EPDDR_EPDD1   (0x02)
-+#define MCF_EPORT_EPDDR_EPDD2   (0x04)
-+#define MCF_EPORT_EPDDR_EPDD3   (0x08)
-+#define MCF_EPORT_EPDDR_EPDD4   (0x10)
-+#define MCF_EPORT_EPDDR_EPDD5   (0x20)
-+#define MCF_EPORT_EPDDR_EPDD6   (0x40)
-+#define MCF_EPORT_EPDDR_EPDD7   (0x80)
-+
-+/* Bit definitions and macros for EPIER */
-+#define MCF_EPORT_EPIER_EPIE1   (0x02)
-+#define MCF_EPORT_EPIER_EPIE2   (0x04)
-+#define MCF_EPORT_EPIER_EPIE3   (0x08)
-+#define MCF_EPORT_EPIER_EPIE4   (0x10)
-+#define MCF_EPORT_EPIER_EPIE5   (0x20)
-+#define MCF_EPORT_EPIER_EPIE6   (0x40)
-+#define MCF_EPORT_EPIER_EPIE7   (0x80)
-+
-+/* Bit definitions and macros for EPDR */
-+#define MCF_EPORT_EPDR_EPD1     (0x02)
-+#define MCF_EPORT_EPDR_EPD2     (0x04)
-+#define MCF_EPORT_EPDR_EPD3     (0x08)
-+#define MCF_EPORT_EPDR_EPD4     (0x10)
-+#define MCF_EPORT_EPDR_EPD5     (0x20)
-+#define MCF_EPORT_EPDR_EPD6     (0x40)
-+#define MCF_EPORT_EPDR_EPD7     (0x80)
-+
-+/* Bit definitions and macros for EPPDR */
-+#define MCF_EPORT_EPPDR_EPPD1   (0x02)
-+#define MCF_EPORT_EPPDR_EPPD2   (0x04)
-+#define MCF_EPORT_EPPDR_EPPD3   (0x08)
-+#define MCF_EPORT_EPPDR_EPPD4   (0x10)
-+#define MCF_EPORT_EPPDR_EPPD5   (0x20)
-+#define MCF_EPORT_EPPDR_EPPD6   (0x40)
-+#define MCF_EPORT_EPPDR_EPPD7   (0x80)
-+
-+/* Bit definitions and macros for EPFR */
-+#define MCF_EPORT_EPFR_EPF1     (0x02)
-+#define MCF_EPORT_EPFR_EPF2     (0x04)
-+#define MCF_EPORT_EPFR_EPF3     (0x08)
-+#define MCF_EPORT_EPFR_EPF4     (0x10)
-+#define MCF_EPORT_EPFR_EPF5     (0x20)
-+#define MCF_EPORT_EPFR_EPF6     (0x40)
-+#define MCF_EPORT_EPFR_EPF7     (0x80)
-+
-+/********************************************************************/
-+
-+#endif /* __MCF5445X_EPORT_H__ */
---- /dev/null
-+++ b/include/asm-m68k/mcf5445x_fbcs.h
-@@ -0,0 +1,182 @@
-+/*
-+ * Matt Waddel Matt.Waddel@freescale.com
-+ *
-+ * Copyright Freescale Semiconductor, Inc. 2007
-+ *
-+ * 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.
-+ */
-+
-+#ifndef __MCF5445X_FBCS_H__
-+#define __MCF5445X_FBCS_H__
-+
-+/*********************************************************************
-+*
-+* FlexBus Chip Selects (FBCS)
-+*
-+*********************************************************************/
-+
-+/* Register read/write macros */
-+#define MCF_FBCS_CSAR0	MCF_REG32(0xFC008000)   /* Chip-select Addr Register */
-+#define MCF_FBCS_CSMR0	MCF_REG32(0xFC008004)   /* Chip-select Mask Register */
-+#define MCF_FBCS_CSCR0	MCF_REG32(0xFC008008)   /* Chip-select Cntl Register */
-+#define MCF_FBCS_CSAR1	MCF_REG32(0xFC00800C)   /* Chip-select Addr Register */
-+#define MCF_FBCS_CSMR1	MCF_REG32(0xFC008010)   /* Chip-select Mask Register */
-+#define MCF_FBCS_CSCR1	MCF_REG32(0xFC008014)   /* Chip-select Cntl Register */
-+#define MCF_FBCS_CSAR2	MCF_REG32(0xFC008018)   /* Chip-select Addr Register */
-+#define MCF_FBCS_CSMR2	MCF_REG32(0xFC00801C)   /* Chip-select Mask Register */
-+#define MCF_FBCS_CSCR2	MCF_REG32(0xFC008020)   /* Chip-select Cntl Register */
-+#define MCF_FBCS_CSAR3	MCF_REG32(0xFC008024)   /* Chip-select Addr Register */
-+#define MCF_FBCS_CSMR3	MCF_REG32(0xFC008028)   /* Chip-select Mask Register */
-+#define MCF_FBCS_CSCR3	MCF_REG32(0xFC00802C)   /* Chip-select Cntl Register */
-+
-+/* Parameterized register read/write macros for multiple registers */
-+#define MCF_FBCS_CSAR(x)	MCF_REG32(0xFC008000+((x)*0x00C))   /* Chip-select Addr Register */
-+#define MCF_FBCS_CSMR(x)	MCF_REG32(0xFC008004+((x)*0x00C))   /* Chip-select Mask Register */
-+#define MCF_FBCS_CSCR(x)	MCF_REG32(0xFC008008+((x)*0x00C))   /* Chip-select Cntl Register */
-+
-+/* Bit definitions and macros for CSAR group */
-+#define MCF_FBCS_CSAR_BA(x)     ((x)&0xFFFF0000)
-+
-+/* Bit definitions and macros for CSAR0 */
-+#define MCF_FBCS_CSAR0_BA(x)    ((x)&0xFFFF0000)
-+
-+/* Bit definitions and macros for CSMR group */
-+#define MCF_FBCS_CSMR_V             (0x00000001)            /* Valid bit */
-+#define MCF_FBCS_CSMR_WP            (0x00000100)            /* Write protect */
-+#define MCF_FBCS_CSMR_BAM(x)        (((x)&0x0000FFFF)<<16)  /* Base addr mask */
-+#define MCF_FBCS_CSMR_BAM_4G        (0xFFFF0000)
-+#define MCF_FBCS_CSMR_BAM_2G        (0x7FFF0000)
-+#define MCF_FBCS_CSMR_BAM_1G        (0x3FFF0000)
-+#define MCF_FBCS_CSMR_BAM_1024M     (0x3FFF0000)
-+#define MCF_FBCS_CSMR_BAM_512M      (0x1FFF0000)
-+#define MCF_FBCS_CSMR_BAM_256M      (0x0FFF0000)
-+#define MCF_FBCS_CSMR_BAM_128M      (0x07FF0000)
-+#define MCF_FBCS_CSMR_BAM_64M       (0x03FF0000)
-+#define MCF_FBCS_CSMR_BAM_32M       (0x01FF0000)
-+#define MCF_FBCS_CSMR_BAM_16M       (0x00FF0000)
-+#define MCF_FBCS_CSMR_BAM_8M        (0x007F0000)
-+#define MCF_FBCS_CSMR_BAM_4M        (0x003F0000)
-+#define MCF_FBCS_CSMR_BAM_2M        (0x001F0000)
-+#define MCF_FBCS_CSMR_BAM_1M        (0x000F0000)
-+#define MCF_FBCS_CSMR_BAM_1024K     (0x000F0000)
-+#define MCF_FBCS_CSMR_BAM_512K      (0x00070000)
-+#define MCF_FBCS_CSMR_BAM_256K      (0x00030000)
-+#define MCF_FBCS_CSMR_BAM_128K      (0x00010000)
-+#define MCF_FBCS_CSMR_BAM_64K       (0x00000000)
-+
-+/* Bit definitions and macros for CSMR0 */
-+#define MCF_FBCS_CSMR0_V            (0x00000001)            /* Valid bit */
-+#define MCF_FBCS_CSMR0_WP           (0x00000100)            /* Write protect */
-+#define MCF_FBCS_CSMR0_BAM(x)       (((x)&0x0000FFFF)<<16)  /* Base addr mask */
-+#define MCF_FBCS_CSMR0_BAM_4G       (0xFFFF0000)
-+#define MCF_FBCS_CSMR0_BAM_2G       (0x7FFF0000)
-+#define MCF_FBCS_CSMR0_BAM_1G       (0x3FFF0000)
-+#define MCF_FBCS_CSMR0_BAM_1024M    (0x3FFF0000)
-+#define MCF_FBCS_CSMR0_BAM_512M     (0x1FFF0000)
-+#define MCF_FBCS_CSMR0_BAM_256M     (0x0FFF0000)
-+#define MCF_FBCS_CSMR0_BAM_128M     (0x07FF0000)
-+#define MCF_FBCS_CSMR0_BAM_64M      (0x03FF0000)
-+#define MCF_FBCS_CSMR0_BAM_32M      (0x01FF0000)
-+#define MCF_FBCS_CSMR0_BAM_16M      (0x00FF0000)
-+#define MCF_FBCS_CSMR0_BAM_8M       (0x007F0000)
-+#define MCF_FBCS_CSMR0_BAM_4M       (0x003F0000)
-+#define MCF_FBCS_CSMR0_BAM_2M       (0x001F0000)
-+#define MCF_FBCS_CSMR0_BAM_1M       (0x000F0000)
-+#define MCF_FBCS_CSMR0_BAM_1024K    (0x000F0000)
-+#define MCF_FBCS_CSMR0_BAM_512K     (0x00070000)
-+#define MCF_FBCS_CSMR0_BAM_256K     (0x00030000)
-+#define MCF_FBCS_CSMR0_BAM_128K     (0x00010000)
-+#define MCF_FBCS_CSMR0_BAM_64K      (0x00000000)
-+
-+/* Bit definitions and macros for CSCR group */
-+#define MCF_FBCS_CSCR_BSTW      (0x00000008)            /* Burst-write enable */
-+#define MCF_FBCS_CSCR_BSTR      (0x00000010)            /* Burst-read enable */
-+#define MCF_FBCS_CSCR_BEM       (0x00000020)            /* Byte-enable mode */
-+#define MCF_FBCS_CSCR_PS(x)     (((x)&0x00000003)<<6)   /* Port size */
-+#define MCF_FBCS_CSCR_AA        (0x00000100)            /* Auto-acknowledge */
-+#define MCF_FBCS_CSCR_WS(x)     (((x)&0x0000003F)<<10)  /* Wait states */
-+#define MCF_FBCS_CSCR_WRAH(x)   (((x)&0x00000003)<<16)  /* Write address hold or deselect */
-+#define MCF_FBCS_CSCR_RDAH(x)   (((x)&0x00000003)<<18)  /* Read address hold or deselect */
-+#define MCF_FBCS_CSCR_ASET(x)   (((x)&0x00000003)<<20)  /* Address setup */
-+#define MCF_FBCS_CSCR_SWSEN     (0x00800000)            /* Secondary wait state enable */
-+#define MCF_FBCS_CSCR_SWS(x)    (((x)&0x0000003F)<<26)  /* Secondary wait states */
-+#define MCF_FBCS_CSCR_PS_8      (0x00000040)
-+#define MCF_FBCS_CSCR_PS_16     (0x00000080)
-+#define MCF_FBCS_CSCR_PS_32     (0x00000000)
-+
-+/* Bit definitions and macros for CSCR0 */
-+#define MCF_FBCS_CSCR0_BSTW	(0x00000008)            /* Burst-write enable */
-+#define MCF_FBCS_CSCR0_BSTR	(0x00000010)            /* Burst-read enable */
-+#define MCF_FBCS_CSCR0_BEM	(0x00000020)            /* Byte-enable mode */
-+#define MCF_FBCS_CSCR0_PS(x)	(((x)&0x00000003)<<6)   /* Port size */
-+#define MCF_FBCS_CSCR0_AA	(0x00000100)            /* Auto-acknowledge */
-+#define MCF_FBCS_CSCR0_WS(x)	(((x)&0x0000003F)<<10)  /* Wait states */
-+#define MCF_FBCS_CSCR0_WRAH(x)	(((x)&0x00000003)<<16)  /* Write address hold or deselect */
-+#define MCF_FBCS_CSCR0_RDAH(x)	(((x)&0x00000003)<<18)  /* Read address hold or deselect */
-+#define MCF_FBCS_CSCR0_ASET(x)	(((x)&0x00000003)<<20)  /* Address setup */
-+#define MCF_FBCS_CSCR0_SWSEN	(0x00800000)            /* Secondary wait state enable */
-+#define MCF_FBCS_CSCR0_SWS(x)	(((x)&0x0000003F)<<26)  /* Secondary wait states */
-+#define MCF_FBCS_CSCR0_PS_8	(0x00000040)
-+#define MCF_FBCS_CSCR0_PS_16	(0x00000080)
-+#define MCF_FBCS_CSCR0_PS_32	(0x00000000)
-+
-+/* Bit definitions and macros for CSMR1 */
-+#define MCF_FBCS_CSMR1_V	(0x00000001)            /* Valid bit */
-+#define MCF_FBCS_CSMR1_WP	(0x00000100)            /* Write protect */
-+#define MCF_FBCS_CSMR1_BAM(x)	(((x)&0x0000FFFF)<<16)  /* Base address mask */
-+
-+/* Bit definitions and macros for CSCR1 */
-+#define MCF_FBCS_CSCR1_BSTW	(0x00000008)            /* Burst-write enable */
-+#define MCF_FBCS_CSCR1_BSTR	(0x00000010)            /* Burst-read enable */
-+#define MCF_FBCS_CSCR1_BEM	(0x00000020)            /* Byte-enable mode */
-+#define MCF_FBCS_CSCR1_PS(x)	(((x)&0x00000003)<<6)   /* Port size */
-+#define MCF_FBCS_CSCR1_AA	(0x00000100)            /* Auto-acknowledge */
-+#define MCF_FBCS_CSCR1_WS(x)	(((x)&0x0000003F)<<10)  /* Wait states */
-+#define MCF_FBCS_CSCR1_WRAH(x)	(((x)&0x00000003)<<16)  /* Write address hold or deselect */
-+#define MCF_FBCS_CSCR1_RDAH(x)	(((x)&0x00000003)<<18)  /* Read address hold or deselect */
-+#define MCF_FBCS_CSCR1_ASET(x)	(((x)&0x00000003)<<20)  /* Address setup */
-+#define MCF_FBCS_CSCR1_SWSEN	(0x00800000)            /* Secondary wait state enable */
-+#define MCF_FBCS_CSCR1_SWS(x)	(((x)&0x0000003F)<<26)  /* Secondary wait states */
-+
-+/* Bit definitions and macros for CSMR2 */
-+#define MCF_FBCS_CSMR2_V	(0x00000001)            /* Valid bit */
-+#define MCF_FBCS_CSMR2_WP	(0x00000100)            /* Write protect */
-+#define MCF_FBCS_CSMR2_BAM(x)	(((x)&0x0000FFFF)<<16)  /* Base address mask */
-+
-+/* Bit definitions and macros for CSCR2 */
-+#define MCF_FBCS_CSCR2_BSTW	(0x00000008)            /* Burst-write enable */
-+#define MCF_FBCS_CSCR2_BSTR	(0x00000010)            /* Burst-read enable */
-+#define MCF_FBCS_CSCR2_BEM	(0x00000020)            /* Byte-enable mode */
-+#define MCF_FBCS_CSCR2_PS(x)	(((x)&0x00000003)<<6)   /* Port size */
-+#define MCF_FBCS_CSCR2_AA	(0x00000100)            /* Auto-acknowledge */
-+#define MCF_FBCS_CSCR2_WS(x)	(((x)&0x0000003F)<<10)  /* Wait states */
-+#define MCF_FBCS_CSCR2_WRAH(x)	(((x)&0x00000003)<<16)  /* Write address hold or deselect */
-+#define MCF_FBCS_CSCR2_RDAH(x)	(((x)&0x00000003)<<18)  /* Read address hold or deselect */
-+#define MCF_FBCS_CSCR2_ASET(x)	(((x)&0x00000003)<<20)  /* Address setup */
-+#define MCF_FBCS_CSCR2_SWSEN	(0x00800000)            /* Secondary wait state enable */
-+#define MCF_FBCS_CSCR2_SWS(x)	(((x)&0x0000003F)<<26)  /* Secondary wait states */
-+
-+/* Bit definitions and macros for CSMR3 */
-+#define MCF_FBCS_CSMR3_V	(0x00000001)            /* Valid bit */
-+#define MCF_FBCS_CSMR3_WP	(0x00000100)            /* Write protect */
-+#define MCF_FBCS_CSMR3_BAM(x)	(((x)&0x0000FFFF)<<16)  /* Base address mask */
-+
-+/* Bit definitions and macros for CSCR3 */
-+#define MCF_FBCS_CSCR3_BSTW	(0x00000008)            /* Burst-write enable */
-+#define MCF_FBCS_CSCR3_BSTR	(0x00000010)            /* Burst-read enable */
-+#define MCF_FBCS_CSCR3_BEM	(0x00000020)            /* Byte-enable mode */
-+#define MCF_FBCS_CSCR3_PS(x)	(((x)&0x00000003)<<6)   /* Port size */
-+#define MCF_FBCS_CSCR3_AA	(0x00000100)            /* Auto-acknowledge */
-+#define MCF_FBCS_CSCR3_WS(x)	(((x)&0x0000003F)<<10)  /* Wait states */
-+#define MCF_FBCS_CSCR3_WRAH(x)	(((x)&0x00000003)<<16)  /* Write address hold or deselect */
-+#define MCF_FBCS_CSCR3_RDAH(x)	(((x)&0x00000003)<<18)  /* Read address hold or deselect */
-+#define MCF_FBCS_CSCR3_ASET(x)	(((x)&0x00000003)<<20)  /* Address setup */
-+#define MCF_FBCS_CSCR3_SWSEN	(0x00800000)            /* Secondary wait state enable */
-+#define MCF_FBCS_CSCR3_SWS(x)	(((x)&0x0000003F)<<26)  /* Secondary wait states */
-+
-+/********************************************************************/
-+
-+#endif /* __MCF5445X_FBCS_H__ */
---- /dev/null
-+++ b/include/asm-m68k/mcf5445x_gpio.h
-@@ -0,0 +1,1257 @@
-+/*
-+ * Matt Waddel Matt.Waddel@freescale.com
-+ *
-+ * Copyright Freescale Semiconductor, Inc. 2007
-+ *
-+ * 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.
-+ */
-+
-+#ifndef __MCF5445X_GPIO_H__
-+#define __MCF5445X_GPIO_H__
-+
-+/*********************************************************************
-+*
-+* General Purpose I/O Module (GPIO)
-+*
-+*********************************************************************/
-+
-+/* Register read/write macros */
-+#define MCF_GPIO_PODR_FEC0H	MCF_REG08(0xFC0A4000)	/* FEC0 High Port Output Data Register */
-+#define MCF_GPIO_PODR_FEC0L	MCF_REG08(0xFC0A4001)	/* FEC0 Low Port Output Data Register */
-+#define MCF_GPIO_PODR_SSI	MCF_REG08(0xFC0A4002)	/* SSI Port Output Data Register */
-+#define MCF_GPIO_PODR_FBCTL	MCF_REG08(0xFC0A4003)	/* Flexbus Control Port Output Data Register */
-+#define MCF_GPIO_PODR_BE	MCF_REG08(0xFC0A4004)	/* Flexbus Byte Enable Port Output Data Register */
-+#define MCF_GPIO_PODR_CS	MCF_REG08(0xFC0A4005)	/* Flexbus Chip-Select Port Output Data Register */
-+#define MCF_GPIO_PODR_DMA	MCF_REG08(0xFC0A4006)	/* DMA Port Output Data Register */
-+#define MCF_GPIO_PODR_FECI2C	MCF_REG08(0xFC0A4007)	/* FEC1 / I2C Port Output Data Register */
-+#define MCF_GPIO_PODR_UART	MCF_REG08(0xFC0A4009)	/* UART Port Output Data Register */
-+#define MCF_GPIO_PODR_DSPI	MCF_REG08(0xFC0A400A)	/* DSPI Port Output Data Register */
-+#define MCF_GPIO_PODR_TIMER	MCF_REG08(0xFC0A400B)	/* Timer Port Output Data Register */
-+#define MCF_GPIO_PODR_PCI	MCF_REG08(0xFC0A400C)	/* PCI Port Output Data Register */
-+#define MCF_GPIO_PODR_USB	MCF_REG08(0xFC0A400D)	/* USB Port Output Data Register */
-+#define MCF_GPIO_PODR_ATAH	MCF_REG08(0xFC0A400E)	/* ATA High Port Output Data Register */
-+#define MCF_GPIO_PODR_ATAL	MCF_REG08(0xFC0A400F)	/* ATA Low Port Output Data Register */
-+#define MCF_GPIO_PODR_FEC1H	MCF_REG08(0xFC0A4010)	/* FEC1 High Port Output Data Register */
-+#define MCF_GPIO_PODR_FEC1L	MCF_REG08(0xFC0A4011)	/* FEC1 Low Port Output Data Register */
-+#define MCF_GPIO_PODR_FBADH	MCF_REG08(0xFC0A4014)	/* Flexbus AD High Port Output Data Register */
-+#define MCF_GPIO_PODR_FBADMH	MCF_REG08(0xFC0A4015)	/* Flexbus AD Med-High Port Output Data Register */
-+#define MCF_GPIO_PODR_FBADML	MCF_REG08(0xFC0A4016)	/* Flexbus AD Med-Low Port Output Data Register */
-+#define MCF_GPIO_PODR_FBADL	MCF_REG08(0xFC0A4017)	/* Flexbus AD Low Port Output Data Register */
-+#define MCF_GPIO_PDDR_FEC0H	MCF_REG08(0xFC0A4018)	/* FEC0 High Port Data Direction Register */
-+#define MCF_GPIO_PDDR_FEC0L	MCF_REG08(0xFC0A4019)	/* FEC0 Low Port Data Direction Register */
-+#define MCF_GPIO_PDDR_SSI	MCF_REG08(0xFC0A401A)	/* SSI Port Data Direction Register */
-+#define MCF_GPIO_PDDR_FBCTL	MCF_REG08(0xFC0A401B)	/* Flexbus Control Port Data Direction Register */
-+#define MCF_GPIO_PDDR_BE	MCF_REG08(0xFC0A401C)	/* Flexbus Byte Enable Port Data Direction Register */
-+#define MCF_GPIO_PDDR_CS	MCF_REG08(0xFC0A401D)	/* Flexbus Chip-Select Port Data Direction Register */
-+#define MCF_GPIO_PDDR_DMA	MCF_REG08(0xFC0A401E)	/* DMA Port Data Direction Register */
-+#define MCF_GPIO_PDDR_FECI2C	MCF_REG08(0xFC0A401F)	/* FEC1 / I2C Port Data Direction Register */
-+#define MCF_GPIO_PDDR_UART	MCF_REG08(0xFC0A4021)	/* UART Port Data Direction Register */
-+#define MCF_GPIO_PDDR_DSPI	MCF_REG08(0xFC0A4022)	/* DSPI Port Data Direction Register */
-+#define MCF_GPIO_PDDR_TIMER	MCF_REG08(0xFC0A4023)	/* Timer Port Data Direction Register */
-+#define MCF_GPIO_PDDR_PCI	MCF_REG08(0xFC0A4024)	/* PCI Port Data Direction Register */
-+#define MCF_GPIO_PDDR_USB	MCF_REG08(0xFC0A4025)	/* USB Port Data Direction Register */
-+#define MCF_GPIO_PDDR_ATAH	MCF_REG08(0xFC0A4026)	/* ATA High Port Data Direction Register */
-+#define MCF_GPIO_PDDR_ATAL	MCF_REG08(0xFC0A4027)	/* ATA Low Port Data Direction Register */
-+#define MCF_GPIO_PDDR_FEC1H	MCF_REG08(0xFC0A4028)	/* FEC1 High Port Data Direction Register */
-+#define MCF_GPIO_PDDR_FEC1L	MCF_REG08(0xFC0A4029)	/* FEC1 Low Port Data Direction Register */
-+#define MCF_GPIO_PDDR_FBADH	MCF_REG08(0xFC0A402C)	/* Flexbus AD High Port Data Direction Register */
-+#define MCF_GPIO_PDDR_FBADMH	MCF_REG08(0xFC0A402D)	/* Flexbus AD Med-High Port Data Direction Register */
-+#define MCF_GPIO_PDDR_FBADML	MCF_REG08(0xFC0A402E)	/* Flexbus AD Med-Low Port Data Direction Register */
-+#define MCF_GPIO_PDDR_FBADL	MCF_REG08(0xFC0A402F)	/* Flexbus AD Low Port Data Direction Register */
-+#define MCF_GPIO_PPDSDR_FEC0H	MCF_REG08(0xFC0A4030)	/* FEC0 High Port Pin Data/Set Data Register */
-+#define MCF_GPIO_PPDSDR_FEC0L	MCF_REG08(0xFC0A4031)	/* FEC0 Low Port Clear Output Data Register */
-+#define MCF_GPIO_PPDSDR_SSI	MCF_REG08(0xFC0A4032)	/* SSI Port Pin Data/Set Data Register */
-+#define MCF_GPIO_PPDSDR_FBCTL	MCF_REG08(0xFC0A4033)	/* Flexbus Control Port Pin Data/Set Data Register */
-+#define MCF_GPIO_PPDSDR_BE	MCF_REG08(0xFC0A4034)	/* Flexbus Byte Enable Port Pin Data/Set Data Register */
-+#define MCF_GPIO_PPDSDR_CS	MCF_REG08(0xFC0A4035)	/* Flexbus Chip-Select Port Pin Data/Set Data Register */
-+#define MCF_GPIO_PPDSDR_DMA	MCF_REG08(0xFC0A4036)	/* DMA Port Pin Data/Set Data Register */
-+#define MCF_GPIO_PPDSDR_FECI2C	MCF_REG08(0xFC0A4037)	/* FEC1 / I2C Port Pin Data/Set Data Register */
-+#define MCF_GPIO_PPDSDR_UART	MCF_REG08(0xFC0A4039)	/* UART Port Pin Data/Set Data Register */
-+#define MCF_GPIO_PPDSDR_DSPI	MCF_REG08(0xFC0A403A)	/* DSPI Port Pin Data/Set Data Register */
-+#define MCF_GPIO_PPDSDR_TIMER	MCF_REG08(0xFC0A403B)	/* FTimer Port Pin Data/Set Data Register */
-+#define MCF_GPIO_PPDSDR_PCI	MCF_REG08(0xFC0A403C)	/* PCI Port Pin Data/Set Data Register */
-+#define MCF_GPIO_PPDSDR_USB	MCF_REG08(0xFC0A403D)	/* USB Port Pin Data/Set Data Register */
-+#define MCF_GPIO_PPDSDR_ATAH	MCF_REG08(0xFC0A403E)	/* ATA High Port Pin Data/Set Data Register */
-+#define MCF_GPIO_PPDSDR_ATAL	MCF_REG08(0xFC0A403F)	/* ATA Low Port Pin Data/Set Data Register */
-+#define MCF_GPIO_PPDSDR_FEC1H	MCF_REG08(0xFC0A4040)	/* FEC1 High Port Pin Data/Set Data Register */
-+#define MCF_GPIO_PPDSDR_FEC1L	MCF_REG08(0xFC0A4041)	/* FEC1 Low Port Pin Data/Set Data Register */
-+#define MCF_GPIO_PPDSDR_FBADH	MCF_REG08(0xFC0A4044)	/* Flexbus AD High Port Pin Data/Set Data Register */
-+#define MCF_GPIO_PPDSDR_FBADMH	MCF_REG08(0xFC0A4045)	/* Flexbus AD Med-High Port Pin Data/Set Data Register */
-+#define MCF_GPIO_PPDSDR_FBADML	MCF_REG08(0xFC0A4046)	/* Flexbus AD Med-Low Port Pin Data/Set Data Register */
-+#define MCF_GPIO_PPDSDR_FBADL	MCF_REG08(0xFC0A4047)	/* Flexbus AD Low Port Pin Data/Set Data Register */
-+#define MCF_GPIO_PCLRR_FEC0H	MCF_REG08(0xFC0A4048)	/* FEC0 High Port Clear Output Data Register */
-+#define MCF_GPIO_PCLRR_FEC0L	MCF_REG08(0xFC0A4049)	/* FEC0 Low Port Pin Data/Set Data Register */
-+#define MCF_GPIO_PCLRR_SSI	MCF_REG08(0xFC0A404A)	/* SSI Port Clear Output Data Register */
-+#define MCF_GPIO_PCLRR_FBCTL	MCF_REG08(0xFC0A404B)	/* Flexbus Control Port Clear Output Data Register */
-+#define MCF_GPIO_PCLRR_BE	MCF_REG08(0xFC0A404C)	/* Flexbus Byte Enable Port Clear Output Data Register */
-+#define MCF_GPIO_PCLRR_CS	MCF_REG08(0xFC0A404D)	/* Flexbus Chip-Select Port Clear Output Data Register */
-+#define MCF_GPIO_PCLRR_DMA	MCF_REG08(0xFC0A404E)	/* DMA Port Clear Output Data Register */
-+#define MCF_GPIO_PCLRR_FECI2C	MCF_REG08(0xFC0A404F)	/* FEC1 / I2C Port Clear Output Data Register */
-+#define MCF_GPIO_PCLRR_UART	MCF_REG08(0xFC0A4051)	/* UART Port Clear Output Data Register */
-+#define MCF_GPIO_PCLRR_DSPI	MCF_REG08(0xFC0A4052)	/* DSPI Port Clear Output Data Register */
-+#define MCF_GPIO_PCLRR_TIMER	MCF_REG08(0xFC0A4053)	/* Timer Port Clear Output Data Register */
-+#define MCF_GPIO_PCLRR_PCI	MCF_REG08(0xFC0A4054)	/* PCI Port Clear Output Data Register */
-+#define MCF_GPIO_PCLRR_USB	MCF_REG08(0xFC0A4055)	/* USB Port Clear Output Data Register */
-+#define MCF_GPIO_PCLRR_ATAH	MCF_REG08(0xFC0A4056)	/* ATA High Port Clear Output Data Register */
-+#define MCF_GPIO_PCLRR_ATAL	MCF_REG08(0xFC0A4057)	/* ATA Low Port Clear Output Data Register */
-+#define MCF_GPIO_PCLRR_FEC1H	MCF_REG08(0xFC0A4058)	/* FEC1 High Port Clear Output Data Register */
-+#define MCF_GPIO_PCLRR_FEC1L	MCF_REG08(0xFC0A4059)	/* FEC1 Low Port Clear Output Data Register */
-+#define MCF_GPIO_PCLRR_FBADH	MCF_REG08(0xFC0A405C)	/* Flexbus AD High Port Clear Output Data Register */
-+#define MCF_GPIO_PCLRR_FBADMH	MCF_REG08(0xFC0A405D)	/* Flexbus AD Med-High Port Clear Output Data Register */
-+#define MCF_GPIO_PCLRR_FBADML	MCF_REG08(0xFC0A405E)	/* Flexbus AD Med-Low Port Clear Output Data Register */
-+#define MCF_GPIO_PCLRR_FBADL	MCF_REG08(0xFC0A405F)	/* Flexbus AD Low Port Clear Output Data Register */
-+#define MCF_GPIO_PAR_FEC	MCF_REG08(0xFC0A4060)	/* FEC Pin Assignment Register */
-+#define MCF_GPIO_PAR_DMA	MCF_REG08(0xFC0A4061)	/* DMA Pin Assignment Register */
-+#define MCF_GPIO_PAR_FBCTL	MCF_REG08(0xFC0A4062)	/* Flexbus Control Pin Assignment Register */
-+#define MCF_GPIO_PAR_DSPI	MCF_REG08(0xFC0A4063)	/* DSPI Pin Assignment Register */
-+#define MCF_GPIO_PAR_BE		MCF_REG08(0xFC0A4064)	/* Flexbus Byte-Enable Pin Assignment Register */
-+#define MCF_GPIO_PAR_CS		MCF_REG08(0xFC0A4065)	/* Flexbus Chip-Select Pin Assignment Register */
-+#define MCF_GPIO_PAR_TIMER	MCF_REG08(0xFC0A4066)	/* Time Pin Assignment Register */
-+#define MCF_GPIO_PAR_USB	MCF_REG08(0xFC0A4067)	/* USB Pin Assignment Register */
-+#define MCF_GPIO_PAR_UART	MCF_REG08(0xFC0A4069)	/* UART Pin Assignment Register */
-+#define MCF_GPIO_PAR_FECI2C	MCF_REG16(0xFC0A406A)	/* FEC / I2C Pin Assignment Register */
-+#define MCF_GPIO_PAR_SSI	MCF_REG16(0xFC0A406C)	/* SSI Pin Assignment Register */
-+#define MCF_GPIO_PAR_ATA	MCF_REG16(0xFC0A406E)	/* ATA Pin Assignment Register */
-+#define MCF_GPIO_PAR_IRQ	MCF_REG08(0xFC0A4070)	/* IRQ Pin Assignment Register */
-+#define MCF_GPIO_PAR_PCI	MCF_REG16(0xFC0A4072)	/* PCI Pin Assignment Register */
-+#define MCF_GPIO_MSCR_SDRAM	MCF_REG08(0xFC0A4074)	/* SDRAM Mode Select Control Register */
-+#define MCF_GPIO_MSCR_PCI	MCF_REG08(0xFC0A4075)	/* PCI Mode Select Control Register */
-+#define MCF_GPIO_DSCR_I2C	MCF_REG08(0xFC0A4078)	/* I2C Drive Strength Control Register */
-+#define MCF_GPIO_DSCR_FLEXBUS	MCF_REG08(0xFC0A4079)	/* FLEXBUS Drive Strength Control Register */
-+#define MCF_GPIO_DSCR_FEC	MCF_REG08(0xFC0A407A)	/* FEC Drive Strength Control Register */
-+#define MCF_GPIO_DSCR_UART	MCF_REG08(0xFC0A407B)	/* UART Drive Strength Control Register */
-+#define MCF_GPIO_DSCR_DSPI	MCF_REG08(0xFC0A407C)	/* DSPI Drive Strength Control Register */
-+#define MCF_GPIO_DSCR_TIMER	MCF_REG08(0xFC0A407D)	/* TIMER Drive Strength Control Register */
-+#define MCF_GPIO_DSCR_SSI	MCF_REG08(0xFC0A407E)	/* SSI Drive Strength Control Register */
-+#define MCF_GPIO_DSCR_DMA	MCF_REG08(0xFC0A407F)	/* DMA Drive Strength Control Register */
-+#define MCF_GPIO_DSCR_DEBUG	MCF_REG08(0xFC0A4080)	/* DEBUG Drive Strength Control Register */
-+#define MCF_GPIO_DSCR_RESET	MCF_REG08(0xFC0A4081)	/* RESET Drive Strength Control Register */
-+#define MCF_GPIO_DSCR_IRQ	MCF_REG08(0xFC0A4082)	/* IRQ Drive Strength Control Register */
-+#define MCF_GPIO_DSCR_USB	MCF_REG08(0xFC0A4083)	/* USB Drive Strength Control Register */
-+#define MCF_GPIO_DSCR_ATA	MCF_REG08(0xFC0A4084)	/* ATA Drive Strength Control Register */
-+
-+/* Bit definitions and macros for PODR_FEC0H */
-+#define MCF_GPIO_PODR_FEC0H_PODR0	(0x01)	/* FEC0_CRS / ULPI_DATA6 */
-+#define MCF_GPIO_PODR_FEC0H_PODR1	(0x02)	/* FEC0_RXD0 / FEC0_RMII_RXD0 */
-+#define MCF_GPIO_PODR_FEC0H_PODR2	(0x04)	/* FEC0_RXDV/FEC0_RMII_CRS_DV */
-+#define MCF_GPIO_PODR_FEC0H_PODR3	(0x08)	/* FEC0_RXCLK / ULPI_DATA1 */
-+#define MCF_GPIO_PODR_FEC0H_PODR4	(0x10)	/* FEC0_COL / ULPI_DATA7 */
-+#define MCF_GPIO_PODR_FEC0H_PODR5	(0x20)	/* FEC0_TXD0 / FEC0_RMII_TXD0 */
-+#define MCF_GPIO_PODR_FEC0H_PODR6	(0x40)	/* FEC0_TXEN / FEC0_RMII_TXEN */
-+#define MCF_GPIO_PODR_FEC0H_PODR7	(0x80)	/* FEC0_TXCLK / FEC0_RMII_REF_CLK */
-+
-+/* Bit definitions and macros for PODR_FEC0L */
-+#define MCF_GPIO_PODR_FEC0L_PODR0	(0x01)	/* FEC0_RXER / FEC0_RMII_RXER */
-+#define MCF_GPIO_PODR_FEC0L_PODR1	(0x02)	/* FEC0_RXD1 / FEC0_RMII_RXD1 */
-+#define MCF_GPIO_PODR_FEC0L_PODR2	(0x04)	/* FEC0_RXD2 / ULPI_DATA4 */
-+#define MCF_GPIO_PODR_FEC0L_PODR3	(0x08)	/* FEC0_RXD3 / ULPI_DATA5 */
-+#define MCF_GPIO_PODR_FEC0L_PODR4	(0x10)	/* FEC0_TXER / ULPI_DATA0 */
-+#define MCF_GPIO_PODR_FEC0L_PODR5	(0x20)	/* FEC0_TXD1 / FEC0_RMII_TXD1 */
-+#define MCF_GPIO_PODR_FEC0L_PODR6	(0x40)	/* FEC0_TXD2 / ULPI_DATA2 */
-+#define MCF_GPIO_PODR_FEC0L_PODR7	(0x80)	/* FEC0_TXD3 / ULPI_DATA3 */
-+
-+/* Bit definitions and macros for PODR_SSI */
-+#define MCF_GPIO_PODR_SSI_PODR0		(0x01)	/* SSI_TXD / U1TXD */
-+#define MCF_GPIO_PODR_SSI_PODR1		(0x02)	/* SSI_RXD / U1RXD */
-+#define MCF_GPIO_PODR_SSI_PODR2		(0x04)	/* SSI_FS / U1RTS */
-+#define MCF_GPIO_PODR_SSI_PODR3		(0x08)	/* SSI_BCLK / U1CTS */
-+#define MCF_GPIO_PODR_SSI_PODR4		(0x10)	/* SSI_MCLK */
-+
-+/* Bit definitions and macros for PODR_FBCTL */
-+#define MCF_GPIO_PODR_FBCTL_PODR0	(0x01)	/* FB_TS / FB_ALE / FB_TBST */
-+#define MCF_GPIO_PODR_FBCTL_PODR1	(0x02)	/* FB_RW */
-+#define MCF_GPIO_PODR_FBCTL_PODR2	(0x04)	/* FB_TA */
-+#define MCF_GPIO_PODR_FBCTL_PODR3	(0x08)	/* FB_OE */
-+
-+/* Bit definitions and macros for PODR_BE */
-+#define MCF_GPIO_PODR_BE_PODR0		(0x01)	/* FB_BE/BWE0 / FB_SIZ0 */
-+#define MCF_GPIO_PODR_BE_PODR1		(0x02)	/* FB_BE/BWE1 / FB_SIZ1 */
-+#define MCF_GPIO_PODR_BE_PODR2		(0x04)	/* FB_BE/BWE2 / FB_SIZ2 */
-+#define MCF_GPIO_PODR_BE_PODR3		(0x08)	/* FB_BE/BWE3 / FB_SIZ3 */
-+
-+/* Bit definitions and macros for PODR_CS */
-+#define MCF_GPIO_PODR_CS_PODR1		(0x02)	/* FB_CS1 */
-+#define MCF_GPIO_PODR_CS_PODR2		(0x04)	/* FB_CS2 */
-+#define MCF_GPIO_PODR_CS_PODR3		(0x08)	/* FB_CS3 */
-+
-+/* Bit definitions and macros for PODR_DMA */
-+#define MCF_GPIO_PODR_DMA_PODR0		(0x01)	/* DREQ0 */
-+#define MCF_GPIO_PODR_DMA_PODR1		(0x02)	/* DACK0 / DSPI_PCS3 */
-+#define MCF_GPIO_PODR_DMA_PODR2		(0x04)	/* DREQ1 / USB_CLKIN */
-+#define MCF_GPIO_PODR_DMA_PODR3		(0x08)	/* DACK1 / ULPI_DIR */
-+
-+/* Bit definitions and macros for PODR_FECI2C */
-+#define MCF_GPIO_PODR_FECI2C_PODR0	(0x01)	/* I2C_SDA / U2RXD */
-+#define MCF_GPIO_PODR_FECI2C_PODR1	(0x02)	/* I2C_SCL / U2TXD */
-+#define MCF_GPIO_PODR_FECI2C_PODR2	(0x04)	/* FEC0_MDIO */
-+#define MCF_GPIO_PODR_FECI2C_PODR3	(0x08)	/* FEC0_MDC */
-+#define MCF_GPIO_PODR_FECI2C_PODR4	(0x10)	/* FEC1_MDIO / ATA_DIOW */
-+#define MCF_GPIO_PODR_FECI2C_PODR5	(0x20)	/* FEC1_MDC / ATA_DIOR */
-+
-+/* Bit definitions and macros for PODR_UART */
-+#define MCF_GPIO_PODR_UART_PODR0	(0x01)	/* U1TXD */
-+#define MCF_GPIO_PODR_UART_PODR1	(0x02)	/* U1RXD */
-+#define MCF_GPIO_PODR_UART_PODR2	(0x04)	/* U1RTS */
-+#define MCF_GPIO_PODR_UART_PODR3	(0x08)	/* U0CTS */
-+#define MCF_GPIO_PODR_UART_PODR4	(0x10)	/* U1TXD */
-+#define MCF_GPIO_PODR_UART_PODR5	(0x20)	/* U1RXD */
-+#define MCF_GPIO_PODR_UART_PODR6	(0x40)	/* U1RTS */
-+#define MCF_GPIO_PODR_UART_PODR7	(0x80)	/* U1CTS */
-+
-+/* Bit definitions and macros for PODR_DSPI */
-+#define MCF_GPIO_PODR_DSPI_PODR0	(0x01)	/* DSPI_SOUT / SBF_DO */
-+#define MCF_GPIO_PODR_DSPI_PODR1	(0x02)	/* DSPI_SIN / SBF_DI */
-+#define MCF_GPIO_PODR_DSPI_PODR2	(0x04)	/* DSPI_SCK / SBF_CK */
-+#define MCF_GPIO_PODR_DSPI_PODR3	(0x08)	/* DSPI_PCS0/SS */
-+#define MCF_GPIO_PODR_DSPI_PODR4	(0x10)	/* DSPI_PCS1 / SBF_CS */
-+#define MCF_GPIO_PODR_DSPI_PODR5	(0x20)	/* DSPI_PCS2 */
-+#define MCF_GPIO_PODR_DSPI_PODR6	(0x40)	/* DSPI_PCS5/SS */
-+
-+/* Bit definitions and macros for PODR_TIMER */
-+#define MCF_GPIO_PODR_TIMER_PODR0	(0x01)	/* T0IN / T0OUT / U2RTS */
-+#define MCF_GPIO_PODR_TIMER_PODR1	(0x02)	/* T1IN / T1OUT / U2CTS */
-+#define MCF_GPIO_PODR_TIMER_PODR2	(0x04)	/* T2IN / T2OUT / U2TXD */
-+#define MCF_GPIO_PODR_TIMER_PODR3	(0x08)	/* T3IN / T3OUT / U2RXD */
-+
-+/* Bit definitions and macros for PODR_PCI */
-+#define MCF_GPIO_PODR_PCI_PODR0		(0x01)	/* PCI_REQ0/PCI_EXTGNT */
-+#define MCF_GPIO_PODR_PCI_PODR1		(0x02)	/* PCI_REQ1 */
-+#define MCF_GPIO_PODR_PCI_PODR2		(0x04)	/* PCI_REQ2 */
-+#define MCF_GPIO_PODR_PCI_PODR3		(0x08)	/* PCI_REQ3 / ATA_INTR */
-+#define MCF_GPIO_PODR_PCI_PODR4		(0x10)	/* PCI_GNT0/PCI_EXTREQ */
-+#define MCF_GPIO_PODR_PCI_PODR5		(0x20)	/* PCI_GNT1 /  */
-+#define MCF_GPIO_PODR_PCI_PODR6		(0x40)	/* PCI_GNT2 /  */
-+#define MCF_GPIO_PODR_PCI_PODR7		(0x80)	/* PCI_GNT3 / ATA_DMACK */
-+
-+/* Bit definitions and macros for PODR_USB */
-+#define MCF_GPIO_PODR_USB_PODR0		(0x01)	/* USB_VBUS_OC / ULPI_STP */
-+#define MCF_GPIO_PODR_USB_PODR1		(0x02)	/* USB_VBUS_EN / USB_PULLUP / ULPI_NXT */
-+
-+/* Bit definitions and macros for PODR_ATAH */
-+#define MCF_GPIO_PODR_ATAH_PODR0	(0x01)	/* ATA_DA0 */
-+#define MCF_GPIO_PODR_ATAH_PODR1	(0x02)	/* ATA_DA1 */
-+#define MCF_GPIO_PODR_ATAH_PODR2	(0x04)	/* ATA_DA2 */
-+#define MCF_GPIO_PODR_ATAH_PODR3	(0x08)	/* ATA_CS0 */
-+#define MCF_GPIO_PODR_ATAH_PODR4	(0x10)	/* ATA_CS1 */
-+#define MCF_GPIO_PODR_ATAH_PODR5	(0x20)	/* ATA_BUFFER_EN */
-+
-+/* Bit definitions and macros for PODR_ATAL */
-+#define MCF_GPIO_PODR_ATAL_PODR0	(0x01)	/* ATA_IORDY */
-+#define MCF_GPIO_PODR_ATAL_PODR1	(0x02)	/* ATA_DMARQ */
-+#define MCF_GPIO_PODR_ATAL_PODR2	(0x04)	/* ATA_RESET */
-+
-+/* Bit definitions and macros for PODR_FEC1H */
-+#define MCF_GPIO_PODR_FEC1H_PODR0	(0x01)	/* FEC1_CRS / ATA_DATA6 */
-+#define MCF_GPIO_PODR_FEC1H_PODR1	(0x02)	/* FEC1_RXD0 / FEC1_RMII_RXD0 / ATA_DATA13 */
-+#define MCF_GPIO_PODR_FEC1H_PODR2	(0x04)	/* FEC1_RXDV / FEC1_RMII_CRS_DV / ATA_DATA15 */
-+#define MCF_GPIO_PODR_FEC1H_PODR3	(0x08)	/* FEC1_RXCLK / ATA_DATA5 */
-+#define MCF_GPIO_PODR_FEC1H_PODR4	(0x10)	/* FEC1_COL / ATA_DATA7 */
-+#define MCF_GPIO_PODR_FEC1H_PODR5	(0x20)	/* FEC1_TXD0 / FEC1_RMII_TXD0 / ATA_DATA9 */
-+#define MCF_GPIO_PODR_FEC1H_PODR6	(0x40)	/* FEC1_TXEN / FEC1_RMII_TXEN / ATA_DATA8 */
-+#define MCF_GPIO_PODR_FEC1H_PODR7	(0x80)	/* FEC1_TXCLK / FEC1_RMII_REF_CLK / ATA_DATA11 */
-+
-+/* Bit definitions and macros for PODR_FEC1L */
-+#define MCF_GPIO_PODR_FEC1L_PODR0	(0x01)	/* FEC1_RXER / FEC1_RMII_RXER / ATA_DATA12 */
-+#define MCF_GPIO_PODR_FEC1L_PODR1	(0x02)	/* FEC1_RXD1 / FEC1_RMII_RXD1 / ATA_DATA14 */
-+#define MCF_GPIO_PODR_FEC1L_PODR2	(0x04)	/* FEC1_RXD2 / ATA_DATA3 */
-+#define MCF_GPIO_PODR_FEC1L_PODR3	(0x08)	/* FEC1_RXD3 / ATA_DATA4 */
-+#define MCF_GPIO_PODR_FEC1L_PODR4	(0x10)	/* FEC1_TXER / ATA_DATA0 */
-+#define MCF_GPIO_PODR_FEC1L_PODR5	(0x20)	/* FEC1_TXD1 / FEC1_RMII_TXD1 / ATA_DATA10 */
-+#define MCF_GPIO_PODR_FEC1L_PODR6	(0x40)	/* FEC1_TXD2 / ATA_DATA1 */
-+#define MCF_GPIO_PODR_FEC1L_PODR7	(0x80)	/* FEC1_TXD3 / ATA_DATA2 */
-+
-+/* Bit definitions and macros for PODR_FBADH */
-+#define MCF_GPIO_PODR_FBADH_PODR0	(0x01)	/* FB_AD24 */
-+#define MCF_GPIO_PODR_FBADH_PODR1	(0x02)	/* FB_AD25 */
-+#define MCF_GPIO_PODR_FBADH_PODR2	(0x04)	/* FB_AD26 */
-+#define MCF_GPIO_PODR_FBADH_PODR3	(0x08)	/* FB_AD27 */
-+#define MCF_GPIO_PODR_FBADH_PODR4	(0x10)	/* FB_AD28 */
-+#define MCF_GPIO_PODR_FBADH_PODR5	(0x20)	/* FB_AD29 */
-+#define MCF_GPIO_PODR_FBADH_PODR6	(0x40)	/* FB_AD30 */
-+#define MCF_GPIO_PODR_FBADH_PODR7	(0x80)	/* FB_AD31 */
-+
-+/* Bit definitions and macros for PODR_FBADMH */
-+#define MCF_GPIO_PODR_FBADMH_PODR0	(0x01)	/* FB_AD16 */
-+#define MCF_GPIO_PODR_FBADMH_PODR1	(0x02)	/* FB_AD17 */
-+#define MCF_GPIO_PODR_FBADMH_PODR2	(0x04)	/* FB_AD18 */
-+#define MCF_GPIO_PODR_FBADMH_PODR3	(0x08)	/* FB_AD19 */
-+#define MCF_GPIO_PODR_FBADMH_PODR4	(0x10)	/* FB_AD20 */
-+#define MCF_GPIO_PODR_FBADMH_PODR5	(0x20)	/* FB_AD21 */
-+#define MCF_GPIO_PODR_FBADMH_PODR6	(0x40)	/* FB_AD22 */
-+#define MCF_GPIO_PODR_FBADMH_PODR7	(0x80)	/* FB_AD23 */
-+
-+/* Bit definitions and macros for PODR_FBADML */
-+#define MCF_GPIO_PODR_FBADML_PODR0	(0x01)	/* FB_AD8 */
-+#define MCF_GPIO_PODR_FBADML_PODR1	(0x02)	/* FB_AD9 */
-+#define MCF_GPIO_PODR_FBADML_PODR2	(0x04)	/* FB_AD10 */
-+#define MCF_GPIO_PODR_FBADML_PODR3	(0x08)	/* FB_AD11 */
-+#define MCF_GPIO_PODR_FBADML_PODR4	(0x10)	/* FB_AD12 */
-+#define MCF_GPIO_PODR_FBADML_PODR5	(0x20)	/* FB_AD13 */
-+#define MCF_GPIO_PODR_FBADML_PODR6	(0x40)	/* FB_AD14 */
-+#define MCF_GPIO_PODR_FBADML_PODR7	(0x80)	/* FB_AD15 */
-+
-+/* Bit definitions and macros for PODR_FBADL */
-+#define MCF_GPIO_PODR_FBADL_PODR0	(0x01)	/* FB_AD0 */
-+#define MCF_GPIO_PODR_FBADL_PODR1	(0x02)	/* FB_AD1 */
-+#define MCF_GPIO_PODR_FBADL_PODR2	(0x04)	/* FB_AD2 */
-+#define MCF_GPIO_PODR_FBADL_PODR3	(0x08)	/* FB_AD3 */
-+#define MCF_GPIO_PODR_FBADL_PODR4	(0x10)	/* FB_AD4 */
-+#define MCF_GPIO_PODR_FBADL_PODR5	(0x20)	/* FB_AD5 */
-+#define MCF_GPIO_PODR_FBADL_PODR6	(0x40)	/* FB_AD6 */
-+#define MCF_GPIO_PODR_FBADL_PODR7	(0x80)	/* FB_AD7 */
-+
-+/* Bit definitions and macros for PDDR_FEC0H */
-+#define MCF_GPIO_PDDR_FEC0H_PDDR0	(0x01)	/* FEC0_CRS / ULPI_DATA6 */
-+#define MCF_GPIO_PDDR_FEC0H_PDDR1	(0x02)	/* FEC0_RXD0 / FEC0_RMII_RXD0 */
-+#define MCF_GPIO_PDDR_FEC0H_PDDR2	(0x04)	/* FEC0_RXDV/FEC0_RMII_CRS_DV */
-+#define MCF_GPIO_PDDR_FEC0H_PDDR3	(0x08)	/* FEC0_RXCLK / ULPI_DATA1 */
-+#define MCF_GPIO_PDDR_FEC0H_PDDR4	(0x10)	/* FEC0_COL / ULPI_DATA7 */
-+#define MCF_GPIO_PDDR_FEC0H_PDDR5	(0x20)	/* FEC0_TXD0 / FEC0_RMII_TXD0 */
-+#define MCF_GPIO_PDDR_FEC0H_PDDR6	(0x40)	/* FEC0_TXEN / FEC0_RMII_TXEN */
-+#define MCF_GPIO_PDDR_FEC0H_PDDR7	(0x80)	/* FEC0_TXCLK / FEC0_RMII_REF_CLK */
-+
-+/* Bit definitions and macros for PDDR_FEC0L */
-+#define MCF_GPIO_PDDR_FEC0L_PDDR0	(0x01)	/* FEC0_RXER / FEC0_RMII_RXER */
-+#define MCF_GPIO_PDDR_FEC0L_PDDR1	(0x02)	/* FEC0_RXD1 / FEC0_RMII_RXD1 */
-+#define MCF_GPIO_PDDR_FEC0L_PDDR2	(0x04)	/* FEC0_RXD2 / ULPI_DATA4 */
-+#define MCF_GPIO_PDDR_FEC0L_PDDR3	(0x08)	/* FEC0_RXD3 / ULPI_DATA5 */
-+#define MCF_GPIO_PDDR_FEC0L_PDDR4	(0x10)	/* FEC0_TXER / ULPI_DATA0 */
-+#define MCF_GPIO_PDDR_FEC0L_PDDR5	(0x20)	/* FEC0_TXD1 / FEC0_RMII_TXD1 */
-+#define MCF_GPIO_PDDR_FEC0L_PDDR6	(0x40)	/* FEC0_TXD2 / ULPI_DATA2 */
-+#define MCF_GPIO_PDDR_FEC0L_PDDR7	(0x80)	/* FEC0_TXD3 / ULPI_DATA3 */
-+
-+/* Bit definitions and macros for PDDR_SSI */
-+#define MCF_GPIO_PDDR_SSI_PDDR0		(0x01)	/* SSI_TXD / U1TXD */
-+#define MCF_GPIO_PDDR_SSI_PDDR1		(0x02)	/* SSI_RXD / U1RXD */
-+#define MCF_GPIO_PDDR_SSI_PDDR2		(0x04)	/* SSI_FS / U1RTS */
-+#define MCF_GPIO_PDDR_SSI_PDDR3		(0x08)	/* SSI_BCLK / U1CTS */
-+#define MCF_GPIO_PDDR_SSI_PDDR4		(0x10)	/* SSI_MCLK */
-+
-+/* Bit definitions and macros for PDDR_FBCTL */
-+#define MCF_GPIO_PDDR_FBCTL_PDDR0	(0x01)	/* FB_TS / FB_ALE / FB_TBST */
-+#define MCF_GPIO_PDDR_FBCTL_PDDR1	(0x02)	/* FB_RW */
-+#define MCF_GPIO_PDDR_FBCTL_PDDR2	(0x04)	/* FB_TA */
-+#define MCF_GPIO_PDDR_FBCTL_PDDR3	(0x08)	/* FB_OE */
-+
-+/* Bit definitions and macros for PDDR_BE */
-+#define MCF_GPIO_PDDR_BE_PDDR0		(0x01)	/* FB_BE/BWE0 / FB_SIZ0 */
-+#define MCF_GPIO_PDDR_BE_PDDR1		(0x02)	/* FB_BE/BWE1 / FB_SIZ1 */
-+#define MCF_GPIO_PDDR_BE_PDDR2		(0x04)	/* FB_BE/BWE2 / FB_SIZ2 */
-+#define MCF_GPIO_PDDR_BE_PDDR3		(0x08)	/* FB_BE/BWE3 / FB_SIZ3 */
-+
-+/* Bit definitions and macros for PDDR_CS */
-+#define MCF_GPIO_PDDR_CS_PDDR1		(0x02)	/* FB_CS1 */
-+#define MCF_GPIO_PDDR_CS_PDDR2		(0x04)	/* FB_CS2 */
-+#define MCF_GPIO_PDDR_CS_PDDR3		(0x08)	/* FB_CS3 */
-+
-+/* Bit definitions and macros for PDDR_DMA */
-+#define MCF_GPIO_PDDR_DMA_PDDR0		(0x01)	/* DREQ0 */
-+#define MCF_GPIO_PDDR_DMA_PDDR1		(0x02)	/* DACK0 / DSPI_PCS3 */
-+#define MCF_GPIO_PDDR_DMA_PDDR2		(0x04)	/* DREQ1 / USB_CLKIN */
-+#define MCF_GPIO_PDDR_DMA_PDDR3		(0x08)	/* DACK1 / ULPI_DIR */
-+
-+/* Bit definitions and macros for PDDR_FECI2C */
-+#define MCF_GPIO_PDDR_FECI2C_PDDR0	(0x01)	/* I2C_SDA / U2RXD */
-+#define MCF_GPIO_PDDR_FECI2C_PDDR1	(0x02)	/* I2C_SCL / U2TXD */
-+#define MCF_GPIO_PDDR_FECI2C_PDDR2	(0x04)	/* FEC0_MDIO */
-+#define MCF_GPIO_PDDR_FECI2C_PDDR3	(0x08)	/* FEC0_MDC */
-+#define MCF_GPIO_PDDR_FECI2C_PDDR4	(0x10)	/* FEC1_MDIO / ATA_DIOW */
-+#define MCF_GPIO_PDDR_FECI2C_PDDR5	(0x20)	/* FEC1_MDC / ATA_DIOR */
-+
-+/* Bit definitions and macros for PDDR_UART */
-+#define MCF_GPIO_PDDR_UART_PDDR0	(0x01)	/* U1TXD */
-+#define MCF_GPIO_PDDR_UART_PDDR1	(0x02)	/* U1RXD */
-+#define MCF_GPIO_PDDR_UART_PDDR2	(0x04)	/* U1RTS */
-+#define MCF_GPIO_PDDR_UART_PDDR3	(0x08)	/* U0CTS */
-+#define MCF_GPIO_PDDR_UART_PDDR4	(0x10)	/* U1TXD */
-+#define MCF_GPIO_PDDR_UART_PDDR5	(0x20)	/* U1RXD */
-+#define MCF_GPIO_PDDR_UART_PDDR6	(0x40)	/* U1RTS */
-+#define MCF_GPIO_PDDR_UART_PDDR7	(0x80)	/* U1CTS */
-+
-+/* Bit definitions and macros for PDDR_DSPI */
-+#define MCF_GPIO_PDDR_DSPI_PDDR0	(0x01)	/* DSPI_SOUT / SBF_DO */
-+#define MCF_GPIO_PDDR_DSPI_PDDR1	(0x02)	/* DSPI_SIN / SBF_DI */
-+#define MCF_GPIO_PDDR_DSPI_PDDR2	(0x04)	/* DSPI_SCK / SBF_CK */
-+#define MCF_GPIO_PDDR_DSPI_PDDR3	(0x08)	/* DSPI_PCS0/SS */
-+#define MCF_GPIO_PDDR_DSPI_PDDR4	(0x10)	/* DSPI_PCS1 / SBF_CS */
-+#define MCF_GPIO_PDDR_DSPI_PDDR5	(0x20)	/* DSPI_PCS2 */
-+#define MCF_GPIO_PDDR_DSPI_PDDR6	(0x40)	/* DSPI_PCS5/SS */
-+
-+/* Bit definitions and macros for PDDR_TIMER */
-+#define MCF_GPIO_PDDR_TIMER_PDDR0	(0x01)	/* T0IN / T0OUT / U2RTS */
-+#define MCF_GPIO_PDDR_TIMER_PDDR1	(0x02)	/* T1IN / T1OUT / U2CTS */
-+#define MCF_GPIO_PDDR_TIMER_PDDR2	(0x04)	/* T2IN / T2OUT / U2TXD */
-+#define MCF_GPIO_PDDR_TIMER_PDDR3	(0x08)	/* T3IN / T3OUT / U2RXD */
-+
-+/* Bit definitions and macros for PDDR_PCI */
-+#define MCF_GPIO_PDDR_PCI_PDDR0		(0x01)	/* PCI_REQ0/PCI_EXTGNT */
-+#define MCF_GPIO_PDDR_PCI_PDDR1		(0x02)	/* PCI_REQ1 */
-+#define MCF_GPIO_PDDR_PCI_PDDR2		(0x04)	/* PCI_REQ2 */
-+#define MCF_GPIO_PDDR_PCI_PDDR3		(0x08)	/* PCI_REQ3 / ATA_INTR */
-+#define MCF_GPIO_PDDR_PCI_PDDR4		(0x10)	/* PCI_GNT0/PCI_EXTREQ */
-+#define MCF_GPIO_PDDR_PCI_PDDR5		(0x20)	/* PCI_GNT1 /  */
-+#define MCF_GPIO_PDDR_PCI_PDDR6		(0x40)	/* PCI_GNT2 /  */
-+#define MCF_GPIO_PDDR_PCI_PDDR7		(0x80)	/* PCI_GNT3 / ATA_DMACK */
-+
-+/* Bit definitions and macros for PDDR_USB */
-+#define MCF_GPIO_PDDR_USB_PDDR0		(0x01)	/* USB_VBUS_OC / ULPI_STP */
-+#define MCF_GPIO_PDDR_USB_PDDR1		(0x02)	/* USB_VBUS_EN / USB_PULLUP / ULPI_NXT */
-+
-+/* Bit definitions and macros for PDDR_ATAH */
-+#define MCF_GPIO_PDDR_ATAH_PDDR0	(0x01)	/* ATA_DA0 */
-+#define MCF_GPIO_PDDR_ATAH_PDDR1	(0x02)	/* ATA_DA1 */
-+#define MCF_GPIO_PDDR_ATAH_PDDR2	(0x04)	/* ATA_DA2 */
-+#define MCF_GPIO_PDDR_ATAH_PDDR3	(0x08)	/* ATA_CS0 */
-+#define MCF_GPIO_PDDR_ATAH_PDDR4	(0x10)	/* ATA_CS1 */
-+#define MCF_GPIO_PDDR_ATAH_PDDR5	(0x20)	/* ATA_BUFFER_EN */
-+
-+/* Bit definitions and macros for PDDR_ATAL */
-+#define MCF_GPIO_PDDR_ATAL_PDDR0	(0x01)	/* ATA_IORDY */
-+#define MCF_GPIO_PDDR_ATAL_PDDR1	(0x02)	/* ATA_DMARQ */
-+#define MCF_GPIO_PDDR_ATAL_PDDR2	(0x04)	/* ATA_RESET */
-+
-+/* Bit definitions and macros for PDDR_FEC1H */
-+#define MCF_GPIO_PDDR_FEC1H_PDDR0	(0x01)	/* FEC1_CRS / ATA_DATA6 */
-+#define MCF_GPIO_PDDR_FEC1H_PDDR1	(0x02)	/* FEC1_RXD0 / FEC1_RMII_RXD0 / ATA_DATA13 */
-+#define MCF_GPIO_PDDR_FEC1H_PDDR2	(0x04)	/* FEC1_RXDV / FEC1_RMII_CRS_DV / ATA_DATA15 */
-+#define MCF_GPIO_PDDR_FEC1H_PDDR3	(0x08)	/* FEC1_RXCLK / ATA_DATA5 */
-+#define MCF_GPIO_PDDR_FEC1H_PDDR4	(0x10)	/* FEC1_COL / ATA_DATA7 */
-+#define MCF_GPIO_PDDR_FEC1H_PDDR5	(0x20)	/* FEC1_TXD0 / FEC1_RMII_TXD0 / ATA_DATA9 */
-+#define MCF_GPIO_PDDR_FEC1H_PDDR6	(0x40)	/* FEC1_TXEN / FEC1_RMII_TXEN / ATA_DATA8 */
-+#define MCF_GPIO_PDDR_FEC1H_PDDR7	(0x80)	/* FEC1_TXCLK / FEC1_RMII_REF_CLK / ATA_DATA11 */
-+
-+/* Bit definitions and macros for PDDR_FEC1L */
-+#define MCF_GPIO_PDDR_FEC1L_PDDR0	(0x01)	/* FEC1_RXER / FEC1_RMII_RXER / ATA_DATA12 */
-+#define MCF_GPIO_PDDR_FEC1L_PDDR1	(0x02)	/* FEC1_RXD1 / FEC1_RMII_RXD1 / ATA_DATA14 */
-+#define MCF_GPIO_PDDR_FEC1L_PDDR2	(0x04)	/* FEC1_RXD2 / ATA_DATA3 */
-+#define MCF_GPIO_PDDR_FEC1L_PDDR3	(0x08)	/* FEC1_RXD3 / ATA_DATA4 */
-+#define MCF_GPIO_PDDR_FEC1L_PDDR4	(0x10)	/* FEC1_TXER / ATA_DATA0 */
-+#define MCF_GPIO_PDDR_FEC1L_PDDR5	(0x20)	/* FEC1_TXD1 / FEC1_RMII_TXD1 / ATA_DATA10 */
-+#define MCF_GPIO_PDDR_FEC1L_PDDR6	(0x40)	/* FEC1_TXD2 / ATA_DATA1 */
-+#define MCF_GPIO_PDDR_FEC1L_PDDR7	(0x80)	/* FEC1_TXD3 / ATA_DATA2 */
-+
-+/* Bit definitions and macros for PDDR_FBADH */
-+#define MCF_GPIO_PDDR_FBADH_PDDR0	(0x01)	/* FB_AD24 */
-+#define MCF_GPIO_PDDR_FBADH_PDDR1	(0x02)	/* FB_AD25 */
-+#define MCF_GPIO_PDDR_FBADH_PDDR2	(0x04)	/* FB_AD26 */
-+#define MCF_GPIO_PDDR_FBADH_PDDR3	(0x08)	/* FB_AD27 */
-+#define MCF_GPIO_PDDR_FBADH_PDDR4	(0x10)	/* FB_AD28 */
-+#define MCF_GPIO_PDDR_FBADH_PDDR5	(0x20)	/* FB_AD29 */
-+#define MCF_GPIO_PDDR_FBADH_PDDR6	(0x40)	/* FB_AD30 */
-+#define MCF_GPIO_PDDR_FBADH_PDDR7	(0x80)	/* FB_AD31 */
-+
-+/* Bit definitions and macros for PDDR_FBADMH */
-+#define MCF_GPIO_PDDR_FBADMH_PDDR0	(0x01)	/* FB_AD16 */
-+#define MCF_GPIO_PDDR_FBADMH_PDDR1	(0x02)	/* FB_AD17 */
-+#define MCF_GPIO_PDDR_FBADMH_PDDR2	(0x04)	/* FB_AD18 */
-+#define MCF_GPIO_PDDR_FBADMH_PDDR3	(0x08)	/* FB_AD19 */
-+#define MCF_GPIO_PDDR_FBADMH_PDDR4	(0x10)	/* FB_AD20 */
-+#define MCF_GPIO_PDDR_FBADMH_PDDR5	(0x20)	/* FB_AD21 */
-+#define MCF_GPIO_PDDR_FBADMH_PDDR6	(0x40)	/* FB_AD22 */
-+#define MCF_GPIO_PDDR_FBADMH_PDDR7	(0x80)	/* FB_AD23 */
-+
-+/* Bit definitions and macros for PDDR_FBADML */
-+#define MCF_GPIO_PDDR_FBADML_PDDR0	(0x01)	/* FB_AD8 */
-+#define MCF_GPIO_PDDR_FBADML_PDDR1	(0x02)	/* FB_AD9 */
-+#define MCF_GPIO_PDDR_FBADML_PDDR2	(0x04)	/* FB_AD10 */
-+#define MCF_GPIO_PDDR_FBADML_PDDR3	(0x08)	/* FB_AD11 */
-+#define MCF_GPIO_PDDR_FBADML_PDDR4	(0x10)	/* FB_AD12 */
-+#define MCF_GPIO_PDDR_FBADML_PDDR5	(0x20)	/* FB_AD13 */
-+#define MCF_GPIO_PDDR_FBADML_PDDR6	(0x40)	/* FB_AD14 */
-+#define MCF_GPIO_PDDR_FBADML_PDDR7	(0x80)	/* FB_AD15 */
-+
-+/* Bit definitions and macros for PDDR_FBADL */
-+#define MCF_GPIO_PDDR_FBADL_PDDR0	(0x01)	/* FB_AD0 */
-+#define MCF_GPIO_PDDR_FBADL_PDDR1	(0x02)	/* FB_AD1 */
-+#define MCF_GPIO_PDDR_FBADL_PDDR2	(0x04)	/* FB_AD2 */
-+#define MCF_GPIO_PDDR_FBADL_PDDR3	(0x08)	/* FB_AD3 */
-+#define MCF_GPIO_PDDR_FBADL_PDDR4	(0x10)	/* FB_AD4 */
-+#define MCF_GPIO_PDDR_FBADL_PDDR5	(0x20)	/* FB_AD5 */
-+#define MCF_GPIO_PDDR_FBADL_PDDR6	(0x40)	/* FB_AD6 */
-+#define MCF_GPIO_PDDR_FBADL_PDDR7	(0x80)	/* FB_AD7 */
-+
-+/* Bit definitions and macros for PPDSDR_FEC0H */
-+#define MCF_GPIO_PPDSDR_FEC0H_PPDR0	(0x01)	/* FEC0_CRS / ULPI_DATA6 */
-+#define MCF_GPIO_PPDSDR_FEC0H_PPDR1	(0x02)	/* FEC0_RXD0 / FEC0_RMII_RXD0 */
-+#define MCF_GPIO_PPDSDR_FEC0H_PPDR2	(0x04)	/* FEC0_RXDV / FEC0_RMII_CRS_DV */
-+#define MCF_GPIO_PPDSDR_FEC0H_PPDR3	(0x08)	/* FEC0_RXCLK / ULPI_DATA1 */
-+#define MCF_GPIO_PPDSDR_FEC0H_PPDR4	(0x10)	/* FEC0_COL / ULPI_DATA7 */
-+#define MCF_GPIO_PPDSDR_FEC0H_PPDR5	(0x20)	/* FEC0_TXD0 / FEC0_RMII_TXD0 */
-+#define MCF_GPIO_PPDSDR_FEC0H_PPDR6	(0x40)	/* FEC0_TXEN / FEC0_RMII_TXEN */
-+#define MCF_GPIO_PPDSDR_FEC0H_PPDR7	(0x80)	/* FEC0_TXCLK / FEC0_RMII_REF_CLK */
-+
-+/* Bit definitions and macros for PPDSDR_FEC0L */
-+#define MCF_GPIO_PPDSDR_FEC0L_PCLRR0	(0x01)	/* FEC0_RXER / FEC0_RMII_RXER */
-+#define MCF_GPIO_PPDSDR_FEC0L_PCLRR1	(0x02)	/* FEC0_RXD1 / FEC0_RMII_RXD1 */
-+#define MCF_GPIO_PPDSDR_FEC0L_PCLRR2	(0x04)	/* FEC0_RXD2 / ULPI_DATA4 */
-+#define MCF_GPIO_PPDSDR_FEC0L_PCLRR3	(0x08)	/* FEC0_RXD3 / ULPI_DATA5 */
-+#define MCF_GPIO_PPDSDR_FEC0L_PCLRR4	(0x10)	/* FEC0_TXER / ULPI_DATA0 */
-+#define MCF_GPIO_PPDSDR_FEC0L_PCLRR5	(0x20)	/* FEC0_TXD1 / FEC0_RMII_TXD1 */
-+#define MCF_GPIO_PPDSDR_FEC0L_PCLRR6	(0x40)	/* FEC0_TXD2 / ULPI_DATA2 */
-+#define MCF_GPIO_PPDSDR_FEC0L_PCLRR7	(0x80)	/* FEC0_TXD3 / ULPI_DATA3 */
-+
-+/* Bit definitions and macros for PPDSDR_SSI */
-+#define MCF_GPIO_PPDSDR_SSI_PPDR0	(0x01)	/* SSI_TXD / U1TXD */
-+#define MCF_GPIO_PPDSDR_SSI_PPDR1	(0x02)	/* SSI_RXD / U1RXD */
-+#define MCF_GPIO_PPDSDR_SSI_PPDR2	(0x04)	/* SSI_FS / U1RTS */
-+#define MCF_GPIO_PPDSDR_SSI_PPDR3	(0x08)	/* SSI_BCLK / U1CTS */
-+#define MCF_GPIO_PPDSDR_SSI_PPDR4	(0x10)	/* SSI_MCLK */
-+
-+/* Bit definitions and macros for PPDSDR_FBCTL */
-+#define MCF_GPIO_PPDSDR_FBCTL_PPDR0	(0x01)	/* FB_TS / FB_ALE / FB_TBST */
-+#define MCF_GPIO_PPDSDR_FBCTL_PPDR1	(0x02)	/* FB_RW */
-+#define MCF_GPIO_PPDSDR_FBCTL_PPDR2	(0x04)	/* FB_TA */
-+#define MCF_GPIO_PPDSDR_FBCTL_PPDR3	(0x08)	/* FB_OE */
-+
-+/* Bit definitions and macros for PPDSDR_BE */
-+#define MCF_GPIO_PPDSDR_BE_PPDR0	(0x01)	/* FB_BE/BWE0 / FB_SIZ0 */
-+#define MCF_GPIO_PPDSDR_BE_PPDR1	(0x02)	/* FB_BE/BWE1 / FB_SIZ1 */
-+#define MCF_GPIO_PPDSDR_BE_PPDR2	(0x04)	/* FB_BE/BWE2 / FB_SIZ2 */
-+#define MCF_GPIO_PPDSDR_BE_PPDR3	(0x08)	/* FB_BE/BWE3 / FB_SIZ3 */
-+
-+/* Bit definitions and macros for PPDSDR_CS */
-+#define MCF_GPIO_PPDSDR_CS_PPDR1	(0x02)	/* FB_CS1 */
-+#define MCF_GPIO_PPDSDR_CS_PPDR2	(0x04)	/* FB_CS2 */
-+#define MCF_GPIO_PPDSDR_CS_PPDR3	(0x08)	/* FB_CS3 */
-+
-+/* Bit definitions and macros for PPDSDR_DMA */
-+#define MCF_GPIO_PPDSDR_DMA_PPDR0	(0x01)	/* DREQ0 */
-+#define MCF_GPIO_PPDSDR_DMA_PPDR1	(0x02)	/* DACK0 / DSPI_PCS3 */
-+#define MCF_GPIO_PPDSDR_DMA_PPDR2	(0x04)	/* DREQ1 / USB_CLKIN */
-+#define MCF_GPIO_PPDSDR_DMA_PPDR3	(0x08)	/* DACK1 / ULPI_DIR */
-+
-+/* Bit definitions and macros for PPDSDR_FECI2C */
-+#define MCF_GPIO_PPDSDR_FECI2C_PPDR0	(0x01)	/* I2C_SDA / U2RXD */
-+#define MCF_GPIO_PPDSDR_FECI2C_PPDR1	(0x02)	/* I2C_SCL / U2TXD */
-+#define MCF_GPIO_PPDSDR_FECI2C_PPDR2	(0x04)	/* FEC0_MDIO */
-+#define MCF_GPIO_PPDSDR_FECI2C_PPDR3	(0x08)	/* FEC0_MDC */
-+#define MCF_GPIO_PPDSDR_FECI2C_PPDR4	(0x10)	/* FEC1_MDIO / ATA_DIOW */
-+#define MCF_GPIO_PPDSDR_FECI2C_PPDR5	(0x20)	/* FEC1_MDC / ATA_DIOR */
-+
-+/* Bit definitions and macros for PPDSDR_UART */
-+#define MCF_GPIO_PPDSDR_UART_PPDR0	(0x01)	/* U1TXD */
-+#define MCF_GPIO_PPDSDR_UART_PPDR1	(0x02)	/* U1RXD */
-+#define MCF_GPIO_PPDSDR_UART_PPDR2	(0x04)	/* U1RTS */
-+#define MCF_GPIO_PPDSDR_UART_PPDR3	(0x08)	/* U0CTS */
-+#define MCF_GPIO_PPDSDR_UART_PPDR4	(0x10)	/* U1TXD */
-+#define MCF_GPIO_PPDSDR_UART_PPDR5	(0x20)	/* U1RXD */
-+#define MCF_GPIO_PPDSDR_UART_PPDR6	(0x40)	/* U1RTS */
-+#define MCF_GPIO_PPDSDR_UART_PPDR7	(0x80)	/* U1CTS */
-+
-+/* Bit definitions and macros for PPDSDR_DSPI */
-+#define MCF_GPIO_PPDSDR_DSPI_PPDR0	(0x01)	/* DSPI_SOUT / SBF_DO */
-+#define MCF_GPIO_PPDSDR_DSPI_PPDR1	(0x02)	/* DSPI_SIN / SBF_DI */
-+#define MCF_GPIO_PPDSDR_DSPI_PPDR2	(0x04)	/* DSPI_SCK / SBF_CK */
-+#define MCF_GPIO_PPDSDR_DSPI_PPDR3	(0x08)	/* DSPI_PCS0/SS */
-+#define MCF_GPIO_PPDSDR_DSPI_PPDR4	(0x10)	/* DSPI_PCS1 / SBF_CS */
-+#define MCF_GPIO_PPDSDR_DSPI_PPDR5	(0x20)	/* DSPI_PCS2 */
-+#define MCF_GPIO_PPDSDR_DSPI_PPDR6	(0x40)	/* DSPI_PCS5/SS */
-+
-+/* Bit definitions and macros for PPDSDR_TIMER */
-+#define MCF_GPIO_PPDSDR_TIMER_PPDR0	(0x01)	/* T0IN / T0OUT / U2RTS */
-+#define MCF_GPIO_PPDSDR_TIMER_PPDR1	(0x02)	/* T1IN / T1OUT / U2CTS */
-+#define MCF_GPIO_PPDSDR_TIMER_PPDR2	(0x04)	/* T2IN / T2OUT / U2TXD */
-+#define MCF_GPIO_PPDSDR_TIMER_PPDR3	(0x08)	/* T3IN / T3OUT / U2RXD */
-+
-+/* Bit definitions and macros for PPDSDR_PCI */
-+#define MCF_GPIO_PPDSDR_PCI_PPDR0	(0x01)	/* PCI_REQ0/PCI_EXTGNT */
-+#define MCF_GPIO_PPDSDR_PCI_PPDR1	(0x02)	/* PCI_REQ1 */
-+#define MCF_GPIO_PPDSDR_PCI_PPDR2	(0x04)	/* PCI_REQ2 */
-+#define MCF_GPIO_PPDSDR_PCI_PPDR3	(0x08)	/* PCI_REQ3 / ATA_INTR */
-+#define MCF_GPIO_PPDSDR_PCI_PPDR4	(0x10)	/* PCI_GNT0/PCI_EXTREQ */
-+#define MCF_GPIO_PPDSDR_PCI_PPDR5	(0x20)	/* PCI_GNT1 /  */
-+#define MCF_GPIO_PPDSDR_PCI_PPDR6	(0x40)	/* PCI_GNT2 /  */
-+#define MCF_GPIO_PPDSDR_PCI_PPDR7	(0x80)	/* PCI_GNT3 / ATA_DMACK */
-+
-+/* Bit definitions and macros for PPDSDR_USB */
-+#define MCF_GPIO_PPDSDR_USB_PPDR0	(0x01)	/* USB_VBUS_OC / ULPI_STP */
-+#define MCF_GPIO_PPDSDR_USB_PPDR1	(0x02)	/* USB_VBUS_EN / USB_PULLUP / ULPI_NXT */
-+
-+/* Bit definitions and macros for PPDSDR_ATAH */
-+#define MCF_GPIO_PPDSDR_ATAH_PPDR0	(0x01)	/* ATA_DA0 */
-+#define MCF_GPIO_PPDSDR_ATAH_PPDR1	(0x02)	/* ATA_DA1 */
-+#define MCF_GPIO_PPDSDR_ATAH_PPDR2	(0x04)	/* ATA_DA2 */
-+#define MCF_GPIO_PPDSDR_ATAH_PPDR3	(0x08)	/* ATA_CS0 */
-+#define MCF_GPIO_PPDSDR_ATAH_PPDR4	(0x10)	/* ATA_CS1 */
-+#define MCF_GPIO_PPDSDR_ATAH_PPDR5	(0x20)	/* ATA_BUFFER_EN */
-+
-+/* Bit definitions and macros for PPDSDR_ATAL */
-+#define MCF_GPIO_PPDSDR_ATAL_PPDR0	(0x01)	/* ATA_IORDY */
-+#define MCF_GPIO_PPDSDR_ATAL_PPDR1	(0x02)	/* ATA_DMARQ */
-+#define MCF_GPIO_PPDSDR_ATAL_PPDR2	(0x04)	/* ATA_RESET */
-+
-+/* Bit definitions and macros for PPDSDR_FEC1H */
-+#define MCF_GPIO_PPDSDR_FEC1H_PPDR0	(0x01)	/* FEC1_CRS / ATA_DATA6 */
-+#define MCF_GPIO_PPDSDR_FEC1H_PPDR1	(0x02)	/* FEC1_RXD0 / FEC1_RMII_RXD0 / ATA_DATA13 */
-+#define MCF_GPIO_PPDSDR_FEC1H_PPDR2	(0x04)	/* FEC1_RXDV / FEC1_RMII_CRS_DV / ATA_DATA15 */
-+#define MCF_GPIO_PPDSDR_FEC1H_PPDR3	(0x08)	/* FEC1_RXCLK / ATA_DATA5 */
-+#define MCF_GPIO_PPDSDR_FEC1H_PPDR4	(0x10)	/* FEC1_COL / ATA_DATA7 */
-+#define MCF_GPIO_PPDSDR_FEC1H_PPDR5	(0x20)	/* FEC1_TXD0 / FEC1_RMII_TXD0 / ATA_DATA9 */
-+#define MCF_GPIO_PPDSDR_FEC1H_PPDR6	(0x40)	/* FEC1_TXEN / FEC1_RMII_TXEN / ATA_DATA8 */
-+#define MCF_GPIO_PPDSDR_FEC1H_PPDR7	(0x80)	/* FEC1_TXCLK / FEC1_RMII_REF_CLK / ATA_DATA11 */
-+
-+/* Bit definitions and macros for PPDSDR_FEC1L */
-+#define MCF_GPIO_PPDSDR_FEC1L_PPDR0	(0x01)	/* FEC1_RXER / FEC1_RMII_RXER / ATA_DATA12 */
-+#define MCF_GPIO_PPDSDR_FEC1L_PPDR1	(0x02)	/* FEC1_RXD1 / FEC1_RMII_RXD1 / ATA_DATA14 */
-+#define MCF_GPIO_PPDSDR_FEC1L_PPDR2	(0x04)	/* FEC1_RXD2 / ATA_DATA3 */
-+#define MCF_GPIO_PPDSDR_FEC1L_PPDR3	(0x08)	/* FEC1_RXD3 / ATA_DATA4 */
-+#define MCF_GPIO_PPDSDR_FEC1L_PPDR4	(0x10)	/* FEC1_TXER / ATA_DATA0 */
-+#define MCF_GPIO_PPDSDR_FEC1L_PPDR5	(0x20)	/* FEC1_TXD1 / FEC1_RMII_TXD1 / ATA_DATA10 */
-+#define MCF_GPIO_PPDSDR_FEC1L_PPDR6	(0x40)	/* FEC1_TXD2 / ATA_DATA1 */
-+#define MCF_GPIO_PPDSDR_FEC1L_PPDR7	(0x80)	/* FEC1_TXD3 / ATA_DATA2 */
-+
-+/* Bit definitions and macros for PPDSDR_FBADH */
-+#define MCF_GPIO_PPDSDR_FBADH_PPDR0	(0x01)	/* FB_AD24 */
-+#define MCF_GPIO_PPDSDR_FBADH_PPDR1	(0x02)	/* FB_AD25 */
-+#define MCF_GPIO_PPDSDR_FBADH_PPDR2	(0x04)	/* FB_AD26 */
-+#define MCF_GPIO_PPDSDR_FBADH_PPDR3	(0x08)	/* FB_AD27 */
-+#define MCF_GPIO_PPDSDR_FBADH_PPDR4	(0x10)	/* FB_AD28 */
-+#define MCF_GPIO_PPDSDR_FBADH_PPDR5	(0x20)	/* FB_AD29 */
-+#define MCF_GPIO_PPDSDR_FBADH_PPDR6	(0x40)	/* FB_AD30 */
-+#define MCF_GPIO_PPDSDR_FBADH_PPDR7	(0x80)	/* FB_AD31 */
-+
-+/* Bit definitions and macros for PPDSDR_FBADMH */
-+#define MCF_GPIO_PPDSDR_FBADMH_PPDR0	(0x01)	/* FB_AD16 */
-+#define MCF_GPIO_PPDSDR_FBADMH_PPDR1	(0x02)	/* FB_AD17 */
-+#define MCF_GPIO_PPDSDR_FBADMH_PPDR2	(0x04)	/* FB_AD18 */
-+#define MCF_GPIO_PPDSDR_FBADMH_PPDR3	(0x08)	/* FB_AD19 */
-+#define MCF_GPIO_PPDSDR_FBADMH_PPDR4	(0x10)	/* FB_AD20 */
-+#define MCF_GPIO_PPDSDR_FBADMH_PPDR5	(0x20)	/* FB_AD21 */
-+#define MCF_GPIO_PPDSDR_FBADMH_PPDR6	(0x40)	/* FB_AD22 */
-+#define MCF_GPIO_PPDSDR_FBADMH_PPDR7	(0x80)	/* FB_AD23 */
-+
-+/* Bit definitions and macros for PPDSDR_FBADML */
-+#define MCF_GPIO_PPDSDR_FBADML_PPDR0	(0x01)	/* FB_AD8 */
-+#define MCF_GPIO_PPDSDR_FBADML_PPDR1	(0x02)	/* FB_AD9 */
-+#define MCF_GPIO_PPDSDR_FBADML_PPDR2	(0x04)	/* FB_AD10 */
-+#define MCF_GPIO_PPDSDR_FBADML_PPDR3	(0x08)	/* FB_AD11 */
-+#define MCF_GPIO_PPDSDR_FBADML_PPDR4	(0x10)	/* FB_AD12 */
-+#define MCF_GPIO_PPDSDR_FBADML_PPDR5	(0x20)	/* FB_AD13 */
-+#define MCF_GPIO_PPDSDR_FBADML_PPDR6	(0x40)	/* FB_AD14 */
-+#define MCF_GPIO_PPDSDR_FBADML_PPDR7	(0x80)	/* FB_AD15 */
-+
-+/* Bit definitions and macros for PPDSDR_FBADL */
-+#define MCF_GPIO_PPDSDR_FBADL_PPDR0	(0x01)	/* FB_AD0 */
-+#define MCF_GPIO_PPDSDR_FBADL_PPDR1	(0x02)	/* FB_AD1 */
-+#define MCF_GPIO_PPDSDR_FBADL_PPDR2	(0x04)	/* FB_AD2 */
-+#define MCF_GPIO_PPDSDR_FBADL_PPDR3	(0x08)	/* FB_AD3 */
-+#define MCF_GPIO_PPDSDR_FBADL_PPDR4	(0x10)	/* FB_AD4 */
-+#define MCF_GPIO_PPDSDR_FBADL_PPDR5	(0x20)	/* FB_AD5 */
-+#define MCF_GPIO_PPDSDR_FBADL_PPDR6	(0x40)	/* FB_AD6 */
-+#define MCF_GPIO_PPDSDR_FBADL_PPDR7	(0x80)	/* FB_AD7 */
-+
-+/* Bit definitions and macros for PCLRR_FEC0H */
-+#define MCF_GPIO_PCLRR_FEC0H_PCLRR0	(0x01)	/* FEC0_CRS / ULPI_DATA6 */
-+#define MCF_GPIO_PCLRR_FEC0H_PCLRR1	(0x02)	/* FEC0_RXD0 / FEC0_RMII_RXD0 */
-+#define MCF_GPIO_PCLRR_FEC0H_PCLRR2	(0x04)	/* FEC0_RXDV/FEC0_RMII_CRS_DV */
-+#define MCF_GPIO_PCLRR_FEC0H_PCLRR3	(0x08)	/* FEC0_RXCLK / ULPI_DATA1 */
-+#define MCF_GPIO_PCLRR_FEC0H_PCLRR4	(0x10)	/* FEC0_COL / ULPI_DATA7 */
-+#define MCF_GPIO_PCLRR_FEC0H_PCLRR5	(0x20)	/* FEC0_TXD0 / FEC0_RMII_TXD0 */
-+#define MCF_GPIO_PCLRR_FEC0H_PCLRR6	(0x40)	/* FEC0_TXEN / FEC0_RMII_TXEN */
-+#define MCF_GPIO_PCLRR_FEC0H_PCLRR7	(0x80)	/* FEC0_TXCLK / FEC0_RMII_REF_CLK */
-+
-+/* Bit definitions and macros for PCLRR_FEC0L */
-+#define MCF_GPIO_PCLRR_FEC0L_PPDR0	(0x01)	/* FEC0_RXER / FEC0_RMII_RXER */
-+#define MCF_GPIO_PCLRR_FEC0L_PPDR1	(0x02)	/* FEC0_RXD1 / FEC0_RMII_RXD1 */
-+#define MCF_GPIO_PCLRR_FEC0L_PPDR2	(0x04)	/* FEC0_RXD2 / ULPI_DATA4 */
-+#define MCF_GPIO_PCLRR_FEC0L_PPDR3	(0x08)	/* FEC0_RXD3 / ULPI_DATA5 */
-+#define MCF_GPIO_PCLRR_FEC0L_PPDR4	(0x10)	/* FEC0_TXER / ULPI_DATA0 */
-+#define MCF_GPIO_PCLRR_FEC0L_PPDR5	(0x20)	/* FEC0_TXD1 / FEC0_RMII_TXD1 */
-+#define MCF_GPIO_PCLRR_FEC0L_PPDR6	(0x40)	/* FEC0_TXD2 / ULPI_DATA2 */
-+#define MCF_GPIO_PCLRR_FEC0L_PPDR7	(0x80)	/* FEC0_TXD3 / ULPI_DATA3 */
-+
-+/* Bit definitions and macros for PCLRR_SSI */
-+#define MCF_GPIO_PCLRR_SSI_PCLRR0	(0x01)	/* SSI_TXD / U1TXD */
-+#define MCF_GPIO_PCLRR_SSI_PCLRR1	(0x02)	/* SSI_RXD / U1RXD */
-+#define MCF_GPIO_PCLRR_SSI_PCLRR2	(0x04)	/* SSI_FS / U1RTS */
-+#define MCF_GPIO_PCLRR_SSI_PCLRR3	(0x08)	/* SSI_BCLK / U1CTS */
-+#define MCF_GPIO_PCLRR_SSI_PCLRR4	(0x10)	/* SSI_MCLK */
-+
-+/* Bit definitions and macros for PCLRR_FBCTL */
-+#define MCF_GPIO_PCLRR_FBCTL_PCLRR0	(0x01)	/* FB_TS / FB_ALE / FB_TBST */
-+#define MCF_GPIO_PCLRR_FBCTL_PCLRR1	(0x02)	/* FB_RW */
-+#define MCF_GPIO_PCLRR_FBCTL_PCLRR2	(0x04)	/* FB_TA */
-+#define MCF_GPIO_PCLRR_FBCTL_PCLRR3	(0x08)	/* FB_OE */
-+
-+/* Bit definitions and macros for PCLRR_BE */
-+#define MCF_GPIO_PCLRR_BE_PCLRR0	(0x01)	/* FB_BE/BWE0 / FB_SIZ0 */
-+#define MCF_GPIO_PCLRR_BE_PCLRR1	(0x02)	/* FB_BE/BWE1 / FB_SIZ1 */
-+#define MCF_GPIO_PCLRR_BE_PCLRR2	(0x04)	/* FB_BE/BWE2 / FB_SIZ2 */
-+#define MCF_GPIO_PCLRR_BE_PCLRR3	(0x08)	/* FB_BE/BWE3 / FB_SIZ3 */
-+
-+/* Bit definitions and macros for PCLRR_CS */
-+#define MCF_GPIO_PCLRR_CS_PCLRR1	(0x02)	/* FB_CS1 */
-+#define MCF_GPIO_PCLRR_CS_PCLRR2	(0x04)	/* FB_CS2 */
-+#define MCF_GPIO_PCLRR_CS_PCLRR3	(0x08)	/* FB_CS3 */
-+
-+/* Bit definitions and macros for PCLRR_DMA */
-+#define MCF_GPIO_PCLRR_DMA_PCLRR0	(0x01)	/* DREQ0 */
-+#define MCF_GPIO_PCLRR_DMA_PCLRR1	(0x02)	/* DACK0 / DSPI_PCS3 */
-+#define MCF_GPIO_PCLRR_DMA_PCLRR2	(0x04)	/* DREQ1 / USB_CLKIN */
-+#define MCF_GPIO_PCLRR_DMA_PCLRR3	(0x08)	/* DACK1 / ULPI_DIR */
-+
-+/* Bit definitions and macros for PCLRR_FECI2C */
-+#define MCF_GPIO_PCLRR_FECI2C_PCLRR0	(0x01)	/* I2C_SDA / U2RXD */
-+#define MCF_GPIO_PCLRR_FECI2C_PCLRR1	(0x02)	/* I2C_SCL / U2TXD */
-+#define MCF_GPIO_PCLRR_FECI2C_PCLRR2	(0x04)	/* FEC0_MDIO */
-+#define MCF_GPIO_PCLRR_FECI2C_PCLRR3	(0x08)	/* FEC0_MDC */
-+#define MCF_GPIO_PCLRR_FECI2C_PCLRR4	(0x10)	/* FEC1_MDIO / ATA_DIOW */
-+#define MCF_GPIO_PCLRR_FECI2C_PCLRR5	(0x20)	/* FEC1_MDC / ATA_DIOR */
-+
-+/* Bit definitions and macros for PCLRR_UART */
-+#define MCF_GPIO_PCLRR_UART_PCLRR0	(0x01)	/* U1TXD */
-+#define MCF_GPIO_PCLRR_UART_PCLRR1	(0x02)	/* U1RXD */
-+#define MCF_GPIO_PCLRR_UART_PCLRR2	(0x04)	/* U1RTS */
-+#define MCF_GPIO_PCLRR_UART_PCLRR3	(0x08)	/* U0CTS */
-+#define MCF_GPIO_PCLRR_UART_PCLRR4	(0x10)	/* U1TXD */
-+#define MCF_GPIO_PCLRR_UART_PCLRR5	(0x20)	/* U1RXD */
-+#define MCF_GPIO_PCLRR_UART_PCLRR6	(0x40)	/* U1RTS */
-+#define MCF_GPIO_PCLRR_UART_PCLRR7	(0x80)	/* U1CTS */
-+
-+/* Bit definitions and macros for PCLRR_DSPI */
-+#define MCF_GPIO_PCLRR_DSPI_PCLRR0	(0x01)	/* DSPI_SOUT / SBF_DO */
-+#define MCF_GPIO_PCLRR_DSPI_PCLRR1	(0x02)	/* DSPI_SIN / SBF_DI */
-+#define MCF_GPIO_PCLRR_DSPI_PCLRR2	(0x04)	/* DSPI_SCK / SBF_CK */
-+#define MCF_GPIO_PCLRR_DSPI_PCLRR3	(0x08)	/* DSPI_PCS0/SS */
-+#define MCF_GPIO_PCLRR_DSPI_PCLRR4	(0x10)	/* DSPI_PCS1 / SBF_CS */
-+#define MCF_GPIO_PCLRR_DSPI_PCLRR5	(0x20)	/* DSPI_PCS2 */
-+#define MCF_GPIO_PCLRR_DSPI_PCLRR6	(0x40)	/* DSPI_PCS5/SS */
-+
-+/* Bit definitions and macros for PCLRR_TIMER */
-+#define MCF_GPIO_PCLRR_TIMER_PCLRR0	(0x01)	/* T0IN / T0OUT / U2RTS */
-+#define MCF_GPIO_PCLRR_TIMER_PCLRR1	(0x02)	/* T1IN / T1OUT / U2CTS */
-+#define MCF_GPIO_PCLRR_TIMER_PCLRR2	(0x04)	/* T2IN / T2OUT / U2TXD */
-+#define MCF_GPIO_PCLRR_TIMER_PCLRR3	(0x08)	/* T3IN / T3OUT / U2RXD */
-+
-+/* Bit definitions and macros for PCLRR_PCI */
-+#define MCF_GPIO_PCLRR_PCI_PCLRR0	(0x01)	/* PCI_REQ0/PCI_EXTGNT */
-+#define MCF_GPIO_PCLRR_PCI_PCLRR1	(0x02)	/* PCI_REQ1 */
-+#define MCF_GPIO_PCLRR_PCI_PCLRR2	(0x04)	/* PCI_REQ2 */
-+#define MCF_GPIO_PCLRR_PCI_PCLRR3	(0x08)	/* PCI_REQ3 / ATA_INTR */
-+#define MCF_GPIO_PCLRR_PCI_PCLRR4	(0x10)	/* PCI_GNT0/PCI_EXTREQ */
-+#define MCF_GPIO_PCLRR_PCI_PCLRR5	(0x20)	/* PCI_GNT1 /  */
-+#define MCF_GPIO_PCLRR_PCI_PCLRR6	(0x40)	/* PCI_GNT2 /  */
-+#define MCF_GPIO_PCLRR_PCI_PCLRR7	(0x80)	/* PCI_GNT3 / ATA_DMACK */
-+
-+/* Bit definitions and macros for PCLRR_USB */
-+#define MCF_GPIO_PCLRR_USB_PCLRR0	(0x01)	/* USB_VBUS_OC / ULPI_STP */
-+#define MCF_GPIO_PCLRR_USB_PCLRR1	(0x02)	/* USB_VBUS_EN / USB_PULLUP / ULPI_NXT */
-+
-+/* Bit definitions and macros for PCLRR_ATAH */
-+#define MCF_GPIO_PCLRR_ATAH_PCLRR0	(0x01)	/* ATA_DA0 */
-+#define MCF_GPIO_PCLRR_ATAH_PCLRR1	(0x02)	/* ATA_DA1 */
-+#define MCF_GPIO_PCLRR_ATAH_PCLRR2	(0x04)	/* ATA_DA2 */
-+#define MCF_GPIO_PCLRR_ATAH_PCLRR3	(0x08)	/* ATA_CS0 */
-+#define MCF_GPIO_PCLRR_ATAH_PCLRR4	(0x10)	/* ATA_CS1 */
-+#define MCF_GPIO_PCLRR_ATAH_PCLRR5	(0x20)	/* ATA_BUFFER_EN */
-+
-+/* Bit definitions and macros for PCLRR_ATAL */
-+#define MCF_GPIO_PCLRR_ATAL_PCLRR0	(0x01)	/* ATA_IORDY */
-+#define MCF_GPIO_PCLRR_ATAL_PCLRR1	(0x02)	/* ATA_DMARQ */
-+#define MCF_GPIO_PCLRR_ATAL_PCLRR2	(0x04)	/* ATA_RESET */
-+
-+/* Bit definitions and macros for PCLRR_FEC1H */
-+#define MCF_GPIO_PCLRR_FEC1H_PCLRR0	(0x01)	/* FEC1_CRS / ATA_DATA6 */
-+#define MCF_GPIO_PCLRR_FEC1H_PCLRR1	(0x02)	/* FEC1_RXD0 / FEC1_RMII_RXD0 / ATA_DATA13 */
-+#define MCF_GPIO_PCLRR_FEC1H_PCLRR2	(0x04)	/* FEC1_RXDV / FEC1_RMII_CRS_DV / ATA_DATA15 */
-+#define MCF_GPIO_PCLRR_FEC1H_PCLRR3	(0x08)	/* FEC1_RXCLK / ATA_DATA5 */
-+#define MCF_GPIO_PCLRR_FEC1H_PCLRR4	(0x10)	/* FEC1_COL / ATA_DATA7 */
-+#define MCF_GPIO_PCLRR_FEC1H_PCLRR5	(0x20)	/* FEC1_TXD0 / FEC1_RMII_TXD0 / ATA_DATA9 */
-+#define MCF_GPIO_PCLRR_FEC1H_PCLRR6	(0x40)	/* FEC1_TXEN / FEC1_RMII_TXEN / ATA_DATA8 */
-+#define MCF_GPIO_PCLRR_FEC1H_PCLRR7	(0x80)	/* FEC1_TXCLK / FEC1_RMII_REF_CLK / ATA_DATA11 */
-+
-+/* Bit definitions and macros for PCLRR_FEC1L */
-+#define MCF_GPIO_PCLRR_FEC1L_PCLRR0	(0x01)	/* FEC1_RXER / FEC1_RMII_RXER / ATA_DATA12 */
-+#define MCF_GPIO_PCLRR_FEC1L_PCLRR1	(0x02)	/* FEC1_RXD1 / FEC1_RMII_RXD1 / ATA_DATA14 */
-+#define MCF_GPIO_PCLRR_FEC1L_PCLRR2	(0x04)	/* FEC1_RXD2 / ATA_DATA3 */
-+#define MCF_GPIO_PCLRR_FEC1L_PCLRR3	(0x08)	/* FEC1_RXD3 / ATA_DATA4 */
-+#define MCF_GPIO_PCLRR_FEC1L_PCLRR4	(0x10)	/* FEC1_TXER / ATA_DATA0 */
-+#define MCF_GPIO_PCLRR_FEC1L_PCLRR5	(0x20)	/* FEC1_TXD1 / FEC1_RMII_TXD1 / ATA_DATA10 */
-+#define MCF_GPIO_PCLRR_FEC1L_PCLRR6	(0x40)	/* FEC1_TXD2 / ATA_DATA1 */
-+#define MCF_GPIO_PCLRR_FEC1L_PCLRR7	(0x80)	/* FEC1_TXD3 / ATA_DATA2 */
-+
-+/* Bit definitions and macros for PCLRR_FBADH */
-+#define MCF_GPIO_PCLRR_FBADH_PCLRR0	(0x01)	/* FB_AD24 */
-+#define MCF_GPIO_PCLRR_FBADH_PCLRR1	(0x02)	/* FB_AD25 */
-+#define MCF_GPIO_PCLRR_FBADH_PCLRR2	(0x04)	/* FB_AD26 */
-+#define MCF_GPIO_PCLRR_FBADH_PCLRR3	(0x08)	/* FB_AD27 */
-+#define MCF_GPIO_PCLRR_FBADH_PCLRR4	(0x10)	/* FB_AD28 */
-+#define MCF_GPIO_PCLRR_FBADH_PCLRR5	(0x20)	/* FB_AD29 */
-+#define MCF_GPIO_PCLRR_FBADH_PCLRR6	(0x40)	/* FB_AD30 */
-+#define MCF_GPIO_PCLRR_FBADH_PCLRR7	(0x80)	/* FB_AD31 */
-+
-+/* Bit definitions and macros for PCLRR_FBADMH */
-+#define MCF_GPIO_PCLRR_FBADMH_PCLRR0	(0x01)	/* FB_AD16 */
-+#define MCF_GPIO_PCLRR_FBADMH_PCLRR1	(0x02)	/* FB_AD17 */
-+#define MCF_GPIO_PCLRR_FBADMH_PCLRR2	(0x04)	/* FB_AD18 */
-+#define MCF_GPIO_PCLRR_FBADMH_PCLRR3	(0x08)	/* FB_AD19 */
-+#define MCF_GPIO_PCLRR_FBADMH_PCLRR4	(0x10)	/* FB_AD20 */
-+#define MCF_GPIO_PCLRR_FBADMH_PCLRR5	(0x20)	/* FB_AD21 */
-+#define MCF_GPIO_PCLRR_FBADMH_PCLRR6	(0x40)	/* FB_AD22 */
-+#define MCF_GPIO_PCLRR_FBADMH_PCLRR7	(0x80)	/* FB_AD23 */
-+
-+/* Bit definitions and macros for PCLRR_FBADML */
-+#define MCF_GPIO_PCLRR_FBADML_PCLRR0	(0x01)	/* FB_AD8 */
-+#define MCF_GPIO_PCLRR_FBADML_PCLRR1	(0x02)	/* FB_AD9 */
-+#define MCF_GPIO_PCLRR_FBADML_PCLRR2	(0x04)	/* FB_AD10 */
-+#define MCF_GPIO_PCLRR_FBADML_PCLRR3	(0x08)	/* FB_AD11 */
-+#define MCF_GPIO_PCLRR_FBADML_PCLRR4	(0x10)	/* FB_AD12 */
-+#define MCF_GPIO_PCLRR_FBADML_PCLRR5	(0x20)	/* FB_AD13 */
-+#define MCF_GPIO_PCLRR_FBADML_PCLRR6	(0x40)	/* FB_AD14 */
-+#define MCF_GPIO_PCLRR_FBADML_PCLRR7	(0x80)	/* FB_AD15 */
-+
-+/* Bit definitions and macros for PCLRR_FBADL */
-+#define MCF_GPIO_PCLRR_FBADL_PCLRR0	(0x01)	/* FB_AD0 */
-+#define MCF_GPIO_PCLRR_FBADL_PCLRR1	(0x02)	/* FB_AD1 */
-+#define MCF_GPIO_PCLRR_FBADL_PCLRR2	(0x04)	/* FB_AD2 */
-+#define MCF_GPIO_PCLRR_FBADL_PCLRR3	(0x08)	/* FB_AD3 */
-+#define MCF_GPIO_PCLRR_FBADL_PCLRR4	(0x10)	/* FB_AD4 */
-+#define MCF_GPIO_PCLRR_FBADL_PCLRR5	(0x20)	/* FB_AD5 */
-+#define MCF_GPIO_PCLRR_FBADL_PCLRR6	(0x40)	/* FB_AD6 */
-+#define MCF_GPIO_PCLRR_FBADL_PCLRR7	(0x80)	/* FB_AD7 */
-+
-+/* Bit definitions and macros for PAR_FEC */
-+#define MCF_GPIO_PAR_FEC_FEC0(x)	(((x)&0x07))
-+#define MCF_GPIO_PAR_FEC_FEC1(x)	(((x)&0x07)<<4)
-+#define MCF_GPIO_PAR_FEC_FEC1_MASK	(0x8F)
-+#define MCF_GPIO_PAR_FEC_FEC1_MII	(0x70)
-+#define MCF_GPIO_PAR_FEC_FEC1_RMII_GPIO	(0x30)
-+#define MCF_GPIO_PAR_FEC_FEC1_RMII_ATA	(0x20)
-+#define MCF_GPIO_PAR_FEC_FEC1_ATA	(0x10)
-+#define MCF_GPIO_PAR_FEC_FEC1_GPIO	(0x00)
-+#define MCF_GPIO_PAR_FEC_FEC0_MASK	(0xF8)
-+#define MCF_GPIO_PAR_FEC_FEC0_MII	(0x07)
-+#define MCF_GPIO_PAR_FEC_FEC0_RMII_GPIO	(0x03)
-+#define MCF_GPIO_PAR_FEC_FEC0_RMII_ULPI	(0x02)
-+#define MCF_GPIO_PAR_FEC_FEC0_ULPI	(0x01)
-+#define MCF_GPIO_PAR_FEC_FEC0_GPIO	(0x00)
-+
-+/* Bit definitions and macros for PAR_DMA */
-+#define MCF_GPIO_PAR_DMA_DREQ0		(0x01)
-+#define MCF_GPIO_PAR_DMA_DACK0(x)	(((x)&0x03)<<2)
-+#define MCF_GPIO_PAR_DMA_DREQ1(x)	(((x)&0x03)<<4)
-+#define MCF_GPIO_PAR_DMA_DACK1(x)	(((x)&0x03)<<6)
-+#define MCF_GPIO_PAR_DMA_DACK1_MASK	(0x3F)
-+#define MCF_GPIO_PAR_DMA_DACK1_DACK1	(0xC0)
-+#define MCF_GPIO_PAR_DMA_DACK1_ULPI_DIR	(0x40)
-+#define MCF_GPIO_PAR_DMA_DACK1_GPIO	(0x00)
-+#define MCF_GPIO_PAR_DMA_DREQ1_MASK	(0xCF)
-+#define MCF_GPIO_PAR_DMA_DREQ1_DREQ1	(0x30)
-+#define MCF_GPIO_PAR_DMA_DREQ1_USB_CLKIN (0x10)
-+#define MCF_GPIO_PAR_DMA_DREQ1_GPIO	(0x00)
-+#define MCF_GPIO_PAR_DMA_DACK0_MASK	(0xF3)
-+#define MCF_GPIO_PAR_DMA_DACK0_DACK1	(0x0C)
-+#define MCF_GPIO_PAR_DMA_DACK0_ULPI_DIR	(0x04)
-+#define MCF_GPIO_PAR_DMA_DACK0_GPIO	(0x00)
-+#define MCF_GPIO_PAR_DMA_DREQ0_DREQ0	(0x01)
-+#define MCF_GPIO_PAR_DMA_DREQ0_GPIO	(0x00)
-+
-+/* Bit definitions and macros for PAR_FBCTL */
-+#define MCF_GPIO_PAR_FBCTL_TS(x)	(((x)&0x03)<<3)
-+#define MCF_GPIO_PAR_FBCTL_RW		(0x20)
-+#define MCF_GPIO_PAR_FBCTL_TA		(0x40)
-+#define MCF_GPIO_PAR_FBCTL_OE		(0x80)
-+#define MCF_GPIO_PAR_FBCTL_OE_OE	(0x80)
-+#define MCF_GPIO_PAR_FBCTL_OE_GPIO	(0x00)
-+#define MCF_GPIO_PAR_FBCTL_TA_TA	(0x40)
-+#define MCF_GPIO_PAR_FBCTL_TA_GPIO	(0x00)
-+#define MCF_GPIO_PAR_FBCTL_RW_RW	(0x20)
-+#define MCF_GPIO_PAR_FBCTL_RW_GPIO	(0x00)
-+#define MCF_GPIO_PAR_FBCTL_TS_MASK	(0xE7)
-+#define MCF_GPIO_PAR_FBCTL_TS_TS	(0x18)
-+#define MCF_GPIO_PAR_FBCTL_TS_ALE	(0x10)
-+#define MCF_GPIO_PAR_FBCTL_TS_TBST	(0x08)
-+#define MCF_GPIO_PAR_FBCTL_TS_GPIO	(0x80)
-+
-+/* Bit definitions and macros for PAR_DSPI */
-+#define MCF_GPIO_PAR_DSPI_SCK		(0x01)
-+#define MCF_GPIO_PAR_DSPI_SOUT		(0x02)
-+#define MCF_GPIO_PAR_DSPI_SIN		(0x04)
-+#define MCF_GPIO_PAR_DSPI_PCS0		(0x08)
-+#define MCF_GPIO_PAR_DSPI_PCS1		(0x10)
-+#define MCF_GPIO_PAR_DSPI_PCS2		(0x20)
-+#define MCF_GPIO_PAR_DSPI_PCS5		(0x40)
-+#define MCF_GPIO_PAR_DSPI_PCS5_PCS5	(0x40)
-+#define MCF_GPIO_PAR_DSPI_PCS5_GPIO	(0x00)
-+#define MCF_GPIO_PAR_DSPI_PCS2_PCS2	(0x20)
-+#define MCF_GPIO_PAR_DSPI_PCS2_GPIO	(0x00)
-+#define MCF_GPIO_PAR_DSPI_PCS1_PCS1	(0x10)
-+#define MCF_GPIO_PAR_DSPI_PCS1_GPIO	(0x00)
-+#define MCF_GPIO_PAR_DSPI_PCS0_PCS0	(0x08)
-+#define MCF_GPIO_PAR_DSPI_PCS0_GPIO	(0x00)
-+#define MCF_GPIO_PAR_DSPI_SIN_SIN	(0x04)
-+#define MCF_GPIO_PAR_DSPI_SIN_GPIO	(0x00)
-+#define MCF_GPIO_PAR_DSPI_SOUT_SOUT	(0x02)
-+#define MCF_GPIO_PAR_DSPI_SOUT_GPIO	(0x00)
-+#define MCF_GPIO_PAR_DSPI_SCK_SCK	(0x01)
-+#define MCF_GPIO_PAR_DSPI_SCK_GPIO	(0x00)
-+
-+/* Bit definitions and macros for PAR_BE */
-+#define MCF_GPIO_PAR_BE_BE0		(0x01)
-+#define MCF_GPIO_PAR_BE_BE1		(0x04)
-+#define MCF_GPIO_PAR_BE_BE2(x)		(((x)&0x03)<<4)
-+#define MCF_GPIO_PAR_BE_BE3(x)		(((x)&0x03)<<6)
-+#define MCF_GPIO_PAR_BE_BE3_MASK	(0x3F)
-+#define MCF_GPIO_PAR_BE_BE3_BE3		(0xC0)
-+#define MCF_GPIO_PAR_BE_BE3_TSIZ1	(0x80)
-+#define MCF_GPIO_PAR_BE_BE3_GPIO	(0x00)
-+#define MCF_GPIO_PAR_BE_BE2_MASK	(0xCF)
-+#define MCF_GPIO_PAR_BE_BE2_BE2		(0x30)
-+#define MCF_GPIO_PAR_BE_BE2_TSIZ0	(0x20)
-+#define MCF_GPIO_PAR_BE_BE2_GPIO	(0x00)
-+#define MCF_GPIO_PAR_BE_BE1_BE1		(0x04)
-+#define MCF_GPIO_PAR_BE_BE1_GPIO	(0x00)
-+#define MCF_GPIO_PAR_BE_BE0_BE0		(0x01)
-+#define MCF_GPIO_PAR_BE_BE0_GPIO	(0x00)
-+
-+/* Bit definitions and macros for PAR_CS */
-+#define MCF_GPIO_PAR_CS_CS1		(0x02)
-+#define MCF_GPIO_PAR_CS_CS2		(0x04)
-+#define MCF_GPIO_PAR_CS_CS3		(0x08)
-+#define MCF_GPIO_PAR_CS_CS3_CS3		(0x08)
-+#define MCF_GPIO_PAR_CS_CS3_GPIO	(0x00)
-+#define MCF_GPIO_PAR_CS_CS2_CS2		(0x04)
-+#define MCF_GPIO_PAR_CS_CS2_GPIO	(0x00)
-+#define MCF_GPIO_PAR_CS_CS1_CS1		(0x02)
-+#define MCF_GPIO_PAR_CS_CS1_GPIO	(0x00)
-+
-+/* Bit definitions and macros for PAR_TIMER */
-+#define MCF_GPIO_PAR_TIMER_T0IN(x)	(((x)&0x03))
-+#define MCF_GPIO_PAR_TIMER_T1IN(x)	(((x)&0x03)<<2)
-+#define MCF_GPIO_PAR_TIMER_T2IN(x)	(((x)&0x03)<<4)
-+#define MCF_GPIO_PAR_TIMER_T3IN(x)	(((x)&0x03)<<6)
-+#define MCF_GPIO_PAR_TIMER_T3IN_MASK	(0x3F)
-+#define MCF_GPIO_PAR_TIMER_T3IN_T3IN	(0xC0)
-+#define MCF_GPIO_PAR_TIMER_T3IN_T3OUT	(0x80)
-+#define MCF_GPIO_PAR_TIMER_T3IN_U2RXD	(0x40)
-+#define MCF_GPIO_PAR_TIMER_T3IN_GPIO	(0x00)
-+#define MCF_GPIO_PAR_TIMER_T2IN_MASK	(0xCF)
-+#define MCF_GPIO_PAR_TIMER_T2IN_T2IN	(0x30)
-+#define MCF_GPIO_PAR_TIMER_T2IN_T2OUT	(0x20)
-+#define MCF_GPIO_PAR_TIMER_T2IN_U2TXD	(0x10)
-+#define MCF_GPIO_PAR_TIMER_T2IN_GPIO	(0x00)
-+#define MCF_GPIO_PAR_TIMER_T1IN_MASK	(0xF3)
-+#define MCF_GPIO_PAR_TIMER_T1IN_T1IN	(0x0C)
-+#define MCF_GPIO_PAR_TIMER_T1IN_T1OUT	(0x08)
-+#define MCF_GPIO_PAR_TIMER_T1IN_U2CTS	(0x04)
-+#define MCF_GPIO_PAR_TIMER_T1IN_GPIO	(0x00)
-+#define MCF_GPIO_PAR_TIMER_T0IN_MASK	(0xFC)
-+#define MCF_GPIO_PAR_TIMER_T0IN_T0IN	(0x03)
-+#define MCF_GPIO_PAR_TIMER_T0IN_T0OUT	(0x02)
-+#define MCF_GPIO_PAR_TIMER_T0IN_U2RTS	(0x01)
-+#define MCF_GPIO_PAR_TIMER_T0IN_GPIO	(0x00)
-+
-+/* Bit definitions and macros for PAR_USB */
-+#define MCF_GPIO_PAR_USB_VBUSOC(x)		(((x)&0x03))
-+#define MCF_GPIO_PAR_USB_VBUSEN(x)		(((x)&0x03)<<2)
-+#define MCF_GPIO_PAR_USB_VBUSEN_MASK		(0xF3)
-+#define MCF_GPIO_PAR_USB_VBUSEN_VBUSEN		(0x0C)
-+#define MCF_GPIO_PAR_USB_VBUSEN_USBPULLUP	(0x08)
-+#define MCF_GPIO_PAR_USB_VBUSEN_ULPI_NXT	(0x04)
-+#define MCF_GPIO_PAR_USB_VBUSEN_GPIO		(0x00)
-+#define MCF_GPIO_PAR_USB_VBUSOC_MASK		(0xFC)
-+#define MCF_GPIO_PAR_USB_VBUSOC_VBUSOC		(0x03)
-+#define MCF_GPIO_PAR_USB_VBUSOC_ULPI_STP	(0x01)
-+#define MCF_GPIO_PAR_USB_VBUSOC_GPIO		(0x00)
-+
-+/* Bit definitions and macros for PAR_UART */
-+#define MCF_GPIO_PAR_UART_U0TXD		(0x01)
-+#define MCF_GPIO_PAR_UART_U0RXD		(0x02)
-+#define MCF_GPIO_PAR_UART_U0RTS		(0x04)
-+#define MCF_GPIO_PAR_UART_U0CTS		(0x08)
-+#define MCF_GPIO_PAR_UART_U1TXD		(0x10)
-+#define MCF_GPIO_PAR_UART_U1RXD		(0x20)
-+#define MCF_GPIO_PAR_UART_U1RTS		(0x40)
-+#define MCF_GPIO_PAR_UART_U1CTS		(0x80)
-+#define MCF_GPIO_PAR_UART_U1CTS_U1CTS	(0x80)
-+#define MCF_GPIO_PAR_UART_U1CTS_GPIO	(0x00)
-+#define MCF_GPIO_PAR_UART_U1RTS_U1RTS	(0x40)
-+#define MCF_GPIO_PAR_UART_U1RTS_GPIO	(0x00)
-+#define MCF_GPIO_PAR_UART_U1RXD_U1RXD	(0x20)
-+#define MCF_GPIO_PAR_UART_U1RXD_GPIO	(0x00)
-+#define MCF_GPIO_PAR_UART_U1TXD_U1TXD	(0x10)
-+#define MCF_GPIO_PAR_UART_U1TXD_GPIO	(0x00)
-+#define MCF_GPIO_PAR_UART_U0CTS_U0CTS	(0x08)
-+#define MCF_GPIO_PAR_UART_U0CTS_GPIO	(0x00)
-+#define MCF_GPIO_PAR_UART_U0RTS_U0RTS	(0x04)
-+#define MCF_GPIO_PAR_UART_U0RTS_GPIO	(0x00)
-+#define MCF_GPIO_PAR_UART_U0RXD_U0RXD	(0x02)
-+#define MCF_GPIO_PAR_UART_U0RXD_GPIO	(0x00)
-+#define MCF_GPIO_PAR_UART_U0TXD_U0TXD	(0x01)
-+#define MCF_GPIO_PAR_UART_U0TXD_GPIO	(0x00)
-+
-+/* Bit definitions and macros for PAR_FECI2C */
-+#define MCF_GPIO_PAR_FECI2C_SDA(x)	(((x)&0x0003))
-+#define MCF_GPIO_PAR_FECI2C_SCL(x)	(((x)&0x0003)<<2)
-+#define MCF_GPIO_PAR_FECI2C_PAR_SDA(x)	(((x)&0x0003))
-+#define MCF_GPIO_PAR_FECI2C_PAR_SCL(x)	(((x)&0x0003)<<2)
-+#define MCF_GPIO_PAR_FECI2C_MDIO0	(0x0010)
-+#define MCF_GPIO_PAR_FECI2C_MDC0	(0x0040)
-+#define MCF_GPIO_PAR_FECI2C_MDIO1(x)	(((x)&0x0003)<<8)
-+#define MCF_GPIO_PAR_FECI2C_MDC1(x)	(((x)&0x0003)<<10)
-+#define MCF_GPIO_PAR_FECI2C_MDC1_MASK	(0xF3FF)
-+#define MCF_GPIO_PAR_FECI2C_MDC1_MDC1	(0x0C00)
-+#define MCF_GPIO_PAR_FECI2C_MDC1_ATA_DIOR (0x0800)
-+#define MCF_GPIO_PAR_FECI2C_MDC1_GPIO	(0x0000)
-+#define MCF_GPIO_PAR_FECI2C_MDIO1_MASK	(0xFCFF)
-+#define MCF_GPIO_PAR_FECI2C_MDIO1_MDIO1	(0x0300)
-+#define MCF_GPIO_PAR_FECI2C_MDIO1_ATA_DIOW (0x0200)
-+#define MCF_GPIO_PAR_FECI2C_MDIO1_GPIO	(0x0000)
-+#define MCF_GPIO_PAR_FECI2C_MDC0_MDC0	(0x0040)
-+#define MCF_GPIO_PAR_FECI2C_MDC0_GPIO	(0x0000)
-+#define MCF_GPIO_PAR_FECI2C_MDIO0_MDIO0	(0x0010)
-+#define MCF_GPIO_PAR_FECI2C_MDIO0_GPIO	(0x0000)
-+#define MCF_GPIO_PAR_FECI2C_SCL_MASK	(0xFFF3)
-+#define MCF_GPIO_PAR_FECI2C_SCL_SCL	(0x000C)
-+#define MCF_GPIO_PAR_FECI2C_SCL_U2TXD	(0x0004)
-+#define MCF_GPIO_PAR_FECI2C_SCL_GPIO	(0x0000)
-+#define MCF_GPIO_PAR_FECI2C_SDA_MASK	(0xFFFC)
-+#define MCF_GPIO_PAR_FECI2C_SDA_SDA	(0x0003)
-+#define MCF_GPIO_PAR_FECI2C_SDA_U2RXD	(0x0001)
-+#define MCF_GPIO_PAR_FECI2C_SDA_GPIO	(0x0000)
-+
-+/* Bit definitions and macros for PAR_SSI */
-+#define MCF_GPIO_PAR_SSI_MCLK		(0x0001)
-+#define MCF_GPIO_PAR_SSI_STXD(x)	(((x)&0x0003)<<2)
-+#define MCF_GPIO_PAR_SSI_SRXD(x)	(((x)&0x0003)<<4)
-+#define MCF_GPIO_PAR_SSI_FS(x)		(((x)&0x0003)<<6)
-+#define MCF_GPIO_PAR_SSI_BCLK(x)	(((x)&0x0003)<<8)
-+#define MCF_GPIO_PAR_SSI_BCLK_MASK	(0xFCFF)
-+#define MCF_GPIO_PAR_SSI_BCLK_BCLK	(0x0300)
-+#define MCF_GPIO_PAR_SSI_BCLK_U1CTS	(0x0200)
-+#define MCF_GPIO_PAR_SSI_BCLK_GPIO	(0x0000)
-+#define MCF_GPIO_PAR_SSI_FS_MASK	(0xFF3F)
-+#define MCF_GPIO_PAR_SSI_FS_FS		(0x00C0)
-+#define MCF_GPIO_PAR_SSI_FS_U1RTS	(0x0080)
-+#define MCF_GPIO_PAR_SSI_FS_GPIO	(0x0000)
-+#define MCF_GPIO_PAR_SSI_SRXD_MASK	(0xFFCF)
-+#define MCF_GPIO_PAR_SSI_SRXD_SRXD	(0x0030)
-+#define MCF_GPIO_PAR_SSI_SRXD_U1RXD	(0x0020)
-+#define MCF_GPIO_PAR_SSI_SRXD_GPIO	(0x0000)
-+#define MCF_GPIO_PAR_SSI_STXD_MASK	(0xFFF3)
-+#define MCF_GPIO_PAR_SSI_STXD_STXD	(0x000C)
-+#define MCF_GPIO_PAR_SSI_STXD_U1TXD	(0x0008)
-+#define MCF_GPIO_PAR_SSI_STXD_GPIO	(0x0000)
-+#define MCF_GPIO_PAR_SSI_MCLK_MCLK	(0x0001)
-+#define MCF_GPIO_PAR_SSI_MCLK_GPIO	(0x0000)
-+
-+/* Bit definitions and macros for PAR_ATA */
-+#define MCF_GPIO_PAR_ATA_IORDY		(0x0001)
-+#define MCF_GPIO_PAR_ATA_DMARQ		(0x0002)
-+#define MCF_GPIO_PAR_ATA_RESET		(0x0004)
-+#define MCF_GPIO_PAR_ATA_DA0		(0x0020)
-+#define MCF_GPIO_PAR_ATA_DA1		(0x0040)
-+#define MCF_GPIO_PAR_ATA_DA2		(0x0080)
-+#define MCF_GPIO_PAR_ATA_CS0		(0x0100)
-+#define MCF_GPIO_PAR_ATA_CS1		(0x0200)
-+#define MCF_GPIO_PAR_ATA_BUFEN		(0x0400)
-+#define MCF_GPIO_PAR_ATA_BUFEN_BUFEN	(0x0400)
-+#define MCF_GPIO_PAR_ATA_BUFEN_GPIO	(0x0000)
-+#define MCF_GPIO_PAR_ATA_CS1_CS1	(0x0200)
-+#define MCF_GPIO_PAR_ATA_CS1_GPIO	(0x0000)
-+#define MCF_GPIO_PAR_ATA_CS0_CS0	(0x0100)
-+#define MCF_GPIO_PAR_ATA_CS0_GPIO	(0x0000)
-+#define MCF_GPIO_PAR_ATA_DA2_DA2	(0x0080)
-+#define MCF_GPIO_PAR_ATA_DA2_GPIO	(0x0000)
-+#define MCF_GPIO_PAR_ATA_DA1_DA1	(0x0040)
-+#define MCF_GPIO_PAR_ATA_DA1_GPIO	(0x0000)
-+#define MCF_GPIO_PAR_ATA_DA0_DA0	(0x0020)
-+#define MCF_GPIO_PAR_ATA_DA0_GPIO	(0x0000)
-+#define MCF_GPIO_PAR_ATA_RESET_RESET	(0x0004)
-+#define MCF_GPIO_PAR_ATA_RESET_GPIO	(0x0000)
-+#define MCF_GPIO_PAR_ATA_DMARQ_DMARQ	(0x0002)
-+#define MCF_GPIO_PAR_ATA_DMARQ_GPIO	(0x0000)
-+#define MCF_GPIO_PAR_ATA_IORDY_IORDY	(0x0001)
-+#define MCF_GPIO_PAR_ATA_IORDY_GPIO	(0x0000)
-+
-+/* Bit definitions and macros for PAR_IRQ */
-+#define MCF_GPIO_PAR_IRQ_IRQ1		(0x02)
-+#define MCF_GPIO_PAR_IRQ_IRQ4		(0x10)
-+#define MCF_GPIO_PAR_IRQ_IRQ4_IRQ4	(0x10)
-+#define MCF_GPIO_PAR_IRQ_IRQ4_GPIO	(0x00)
-+#define MCF_GPIO_PAR_IRQ_IRQ1_IRQ1	(0x02)
-+#define MCF_GPIO_PAR_IRQ_IRQ1_GPIO	(0x00)
-+
-+/* Bit definitions and macros for PAR_PCI */
-+#define MCF_GPIO_PAR_PCI_REQ0		(0x0001)
-+#define MCF_GPIO_PAR_PCI_REQ1		(0x0004)
-+#define MCF_GPIO_PAR_PCI_REQ2		(0x0010)
-+#define MCF_GPIO_PAR_PCI_REQ3(x)	(((x)&0x0003)<<6)
-+#define MCF_GPIO_PAR_PCI_GNT0		(0x0100)
-+#define MCF_GPIO_PAR_PCI_GNT1		(0x0400)
-+#define MCF_GPIO_PAR_PCI_GNT2		(0x1000)
-+#define MCF_GPIO_PAR_PCI_GNT3(x)	(((x)&0x0003)<<14)
-+#define MCF_GPIO_PAR_PCI_GNT3_MASK	(0x3FFF)
-+#define MCF_GPIO_PAR_PCI_GNT3_GNT3	(0xC000)
-+#define MCF_GPIO_PAR_PCI_GNT3_ATA_DMACK	(0x8000)
-+#define MCF_GPIO_PAR_PCI_GNT3_GPIO	(0x0000)
-+#define MCF_GPIO_PAR_PCI_GNT2_GNT2	(0x1000)
-+#define MCF_GPIO_PAR_PCI_GNT2_GPIO	(0x0000)
-+#define MCF_GPIO_PAR_PCI_GNT1_GNT1	(0x0400)
-+#define MCF_GPIO_PAR_PCI_GNT1_GPIO	(0x0000)
-+#define MCF_GPIO_PAR_PCI_GNT0_GNT0	(0x0100)
-+#define MCF_GPIO_PAR_PCI_GNT0_GPIO	(0x0000)
-+#define MCF_GPIO_PAR_PCI_REQ3_MASK	(0xFF3F)
-+#define MCF_GPIO_PAR_PCI_REQ3_REQ3	(0x00C0)
-+#define MCF_GPIO_PAR_PCI_REQ3_ATA_INTRQ	(0x0080)
-+#define MCF_GPIO_PAR_PCI_REQ3_GPIO	(0x0000)
-+#define MCF_GPIO_PAR_PCI_REQ2_REQ2	(0x0010)
-+#define MCF_GPIO_PAR_PCI_REQ2_GPIO	(0x0000)
-+#define MCF_GPIO_PAR_PCI_REQ1_REQ1	(0x0040)
-+#define MCF_GPIO_PAR_PCI_REQ1_GPIO	(0x0000)
-+#define MCF_GPIO_PAR_PCI_REQ0_REQ0	(0x0001)
-+#define MCF_GPIO_PAR_PCI_REQ0_GPIO	(0x0000)
-+
-+/* Bit definitions and macros for MSCR_SDRAM */
-+#define MCF_GPIO_MSCR_SDRAM_SDCTL(x)		(((x)&0x03))
-+#define MCF_GPIO_MSCR_SDRAM_SDCLK(x)		(((x)&0x03)<<2)
-+#define MCF_GPIO_MSCR_SDRAM_SDDQS(x)		(((x)&0x03)<<4)
-+#define MCF_GPIO_MSCR_SDRAM_SDDATA(x)		(((x)&0x03)<<6)
-+#define MCF_GPIO_MSCR_SDRAM_SDDATA_MASK		(0x3F)
-+#define MCF_GPIO_MSCR_SDRAM_SDDATA_DDR1		(0xC0)
-+#define MCF_GPIO_MSCR_SDRAM_SDDATA_DDR2		(0x80)
-+#define MCF_GPIO_MSCR_SDRAM_SDDATA_FS_LPDDR	(0x40)
-+#define MCF_GPIO_MSCR_SDRAM_SDDATA_HS_LPDDR	(0x00)
-+#define MCF_GPIO_MSCR_SDRAM_SDDQS_MASK		(0xCF)
-+#define MCF_GPIO_MSCR_SDRAM_SDDQS_DDR1		(0x30)
-+#define MCF_GPIO_MSCR_SDRAM_SDDQS_DDR2		(0x20)
-+#define MCF_GPIO_MSCR_SDRAM_SDDQS_FS_LPDDR	(0x10)
-+#define MCF_GPIO_MSCR_SDRAM_SDDQS_HS_LPDDR	(0x00)
-+#define MCF_GPIO_MSCR_SDRAM_SDCLK_MASK		(0xF3)
-+#define MCF_GPIO_MSCR_SDRAM_SDCLK_DDR1		(0x0C)
-+#define MCF_GPIO_MSCR_SDRAM_SDCLK_DDR2		(0x08)
-+#define MCF_GPIO_MSCR_SDRAM_SDCLK_FS_LPDDR	(0x04)
-+#define MCF_GPIO_MSCR_SDRAM_SDCLK_HS_LPDDR	(0x00)
-+#define MCF_GPIO_MSCR_SDRAM_SDCTL_MASK		(0xFC)
-+#define MCF_GPIO_MSCR_SDRAM_SDCTL_DDR1		(0x03)
-+#define MCF_GPIO_MSCR_SDRAM_SDCTL_DDR2		(0x02)
-+#define MCF_GPIO_MSCR_SDRAM_SDCTL_FS_LPDDR	(0x01)
-+#define MCF_GPIO_MSCR_SDRAM_SDCTL_HS_LPDDR	(0x00)
-+
-+/* Bit definitions and macros for MSCR_PCI */
-+#define MCF_GPIO_MSCR_PCI_PCI		(0x01)
-+#define MCF_GPIO_MSCR_PCI_PCI_HI_66MHZ	(0x01)
-+#define MCF_GPIO_MSCR_PCI_PCI_LO_33MHZ	(0x00)
-+
-+/* Bit definitions and macros for DSCR_I2C */
-+#define MCF_GPIO_DSCR_I2C_I2C(x)	(((x)&0x03))
-+#define MCF_GPIO_DSCR_I2C_I2C_LOAD_50PF	(0x03)
-+#define MCF_GPIO_DSCR_I2C_I2C_LOAD_30PF	(0x02)
-+#define MCF_GPIO_DSCR_I2C_I2C_LOAD_20PF	(0x01)
-+#define MCF_GPIO_DSCR_I2C_I2C_LOAD_10PF	(0x00)
-+
-+/* Bit definitions and macros for DSCR_FLEXBUS */
-+#define MCF_GPIO_DSCR_FLEXBUS_FBADL(x)		(((x)&0x03))
-+#define MCF_GPIO_DSCR_FLEXBUS_FBADH(x)		(((x)&0x03)<<2)
-+#define MCF_GPIO_DSCR_FLEXBUS_FBCTL(x)		(((x)&0x03)<<4)
-+#define MCF_GPIO_DSCR_FLEXBUS_FBCLK(x)		(((x)&0x03)<<6)
-+#define MCF_GPIO_DSCR_FLEXBUS_FBCLK_LOAD_50PF	(0xC0)
-+#define MCF_GPIO_DSCR_FLEXBUS_FBCLK_LOAD_30P	(0x80)
-+#define MCF_GPIO_DSCR_FLEXBUS_FBCLK_LOAD_20PF	(0x40)
-+#define MCF_GPIO_DSCR_FLEXBUS_FBCLK_LOAD_10PF	(0x00)
-+#define MCF_GPIO_DSCR_FLEXBUS_FBCTL_LOAD_50PF	(0x30)
-+#define MCF_GPIO_DSCR_FLEXBUS_FBCTL_LOAD_30PF	(0x20)
-+#define MCF_GPIO_DSCR_FLEXBUS_FBCTL_LOAD_20PF	(0x10)
-+#define MCF_GPIO_DSCR_FLEXBUS_FBCTL_LOAD_10PF	(0x00)
-+#define MCF_GPIO_DSCR_FLEXBUS_FBADH_LOAD_50PF	(0x0C)
-+#define MCF_GPIO_DSCR_FLEXBUS_FBADH_LOAD_30PF	(0x08)
-+#define MCF_GPIO_DSCR_FLEXBUS_FBADH_LOAD_20PF	(0x04)
-+#define MCF_GPIO_DSCR_FLEXBUS_FBADH_LOAD_10PF	(0x00)
-+#define MCF_GPIO_DSCR_FLEXBUS_FBADL_LOAD_50PF	(0x03)
-+#define MCF_GPIO_DSCR_FLEXBUS_FBADL_LOAD_30PF	(0x02)
-+#define MCF_GPIO_DSCR_FLEXBUS_FBADL_LOAD_20PF	(0x01)
-+#define MCF_GPIO_DSCR_FLEXBUS_FBADL_LOAD_10PF	(0x00)
-+
-+/* Bit definitions and macros for DSCR_FEC */
-+#define MCF_GPIO_DSCR_FEC_FEC0(x)		(((x)&0x03))
-+#define MCF_GPIO_DSCR_FEC_FEC1(x)		(((x)&0x03)<<2)
-+#define MCF_GPIO_DSCR_FEC_FEC1_LOAD_50PF	(0x0C)
-+#define MCF_GPIO_DSCR_FEC_FEC1_LOAD_30PF	(0x08)
-+#define MCF_GPIO_DSCR_FEC_FEC1_LOAD_20PF	(0x04)
-+#define MCF_GPIO_DSCR_FEC_FEC1_LOAD_10PF	(0x00)
-+#define MCF_GPIO_DSCR_FEC_FEC0_LOAD_50PF	(0x03)
-+#define MCF_GPIO_DSCR_FEC_FEC0_LOAD_30PF	(0x02)
-+#define MCF_GPIO_DSCR_FEC_FEC0_LOAD_20PF	(0x01)
-+#define MCF_GPIO_DSCR_FEC_FEC0_LOAD_10PF	(0x00)
-+
-+/* Bit definitions and macros for DSCR_UART */
-+#define MCF_GPIO_DSCR_UART_UART0(x)		(((x)&0x03))
-+#define MCF_GPIO_DSCR_UART_UART1(x)		(((x)&0x03)<<2)
-+#define MCF_GPIO_DSCR_UART_UART1_LOAD_50PF	(0x0C)
-+#define MCF_GPIO_DSCR_UART_UART1_LOAD_30PF	(0x08)
-+#define MCF_GPIO_DSCR_UART_UART1_LOAD_20PF	(0x04)
-+#define MCF_GPIO_DSCR_UART_UART1_LOAD_10PF	(0x00)
-+#define MCF_GPIO_DSCR_UART_UART0_LOAD_50PF	(0x03)
-+#define MCF_GPIO_DSCR_UART_UART0_LOAD_30PF	(0x02)
-+#define MCF_GPIO_DSCR_UART_UART0_LOAD_20PF	(0x01)
-+#define MCF_GPIO_DSCR_UART_UART0_LOAD_10PF	(0x00)
-+
-+/* Bit definitions and macros for DSCR_DSPI */
-+#define MCF_GPIO_DSCR_DSPI_DSPI(x)		(((x)&0x03))
-+#define MCF_GPIO_DSCR_DSPI_DSPI_LOAD_50PF	(0x03)
-+#define MCF_GPIO_DSCR_DSPI_DSPI_LOAD_30PF	(0x02)
-+#define MCF_GPIO_DSCR_DSPI_DSPI_LOAD_20PF	(0x01)
-+#define MCF_GPIO_DSCR_DSPI_DSPI_LOAD_10PF	(0x00)
-+
-+/* Bit definitions and macros for DSCR_TIMER */
-+#define MCF_GPIO_DSCR_TIMER_TIMER(x)		(((x)&0x03))
-+#define MCF_GPIO_DSCR_TIMER_TIMER_LOAD_50PF	(0x03)
-+#define MCF_GPIO_DSCR_TIMER_TIMER_LOAD_30PF	(0x02)
-+#define MCF_GPIO_DSCR_TIMER_TIMER_LOAD_20PF	(0x01)
-+#define MCF_GPIO_DSCR_TIMER_TIMER_LOAD_10PF	(0x00)
-+
-+/* Bit definitions and macros for DSCR_SSI */
-+#define MCF_GPIO_DSCR_SSI_SSI(x)	(((x)&0x03))
-+#define MCF_GPIO_DSCR_SSI_SSI_LOAD_50PF	(0x03)
-+#define MCF_GPIO_DSCR_SSI_SSI_LOAD_30PF	(0x02)
-+#define MCF_GPIO_DSCR_SSI_SSI_LOAD_20PF (0x01)
-+#define MCF_GPIO_DSCR_SSI_SSI_LOAD_10PF (0x00)
-+
-+/* Bit definitions and macros for DSCR_DMA */
-+#define MCF_GPIO_DSCR_DMA_DMA(x)	(((x)&0x03))
-+#define MCF_GPIO_DSCR_DMA_DMA_LOAD_50PF	(0x03)
-+#define MCF_GPIO_DSCR_DMA_DMA_LOAD_30PF	(0x02)
-+#define MCF_GPIO_DSCR_DMA_DMA_LOAD_20PF	(0x01)
-+#define MCF_GPIO_DSCR_DMA_DMA_LOAD_10PF	(0x00)
-+
-+/* Bit definitions and macros for DSCR_DEBUG */
-+#define MCF_GPIO_DSCR_DEBUG_DEBUG(x)		(((x)&0x03))
-+#define MCF_GPIO_DSCR_DEBUG_DEBUG_LOAD_50PF	(0x03)
-+#define MCF_GPIO_DSCR_DEBUG_DEBUG_LOAD_30PF	(0x02)
-+#define MCF_GPIO_DSCR_DEBUG_DEBUG_LOAD_20PF	(0x01)
-+#define MCF_GPIO_DSCR_DEBUG_DEBUG_LOAD_10PF	(0x00)
-+
-+/* Bit definitions and macros for DSCR_RESET */
-+#define MCF_GPIO_DSCR_RESET_RESET(x)		(((x)&0x03))
-+#define MCF_GPIO_DSCR_RESET_RESET_LOAD_50PF	(0x03)
-+#define MCF_GPIO_DSCR_RESET_RESET_LOAD_30PF	(0x02)
-+#define MCF_GPIO_DSCR_RESET_RESET_LOAD_20PF	(0x01)
-+#define MCF_GPIO_DSCR_RESET_RESET_LOAD_10PF	(0x00)
-+
-+/* Bit definitions and macros for DSCR_IRQ */
-+#define MCF_GPIO_DSCR_IRQ_IRQ(x)	(((x)&0x03))
-+#define MCF_GPIO_DSCR_IRQ_IRQ_LOAD_50PF	(0x03)
-+#define MCF_GPIO_DSCR_IRQ_IRQ_LOAD_30PF	(0x02)
-+#define MCF_GPIO_DSCR_IRQ_IRQ_LOAD_20PF	(0x01)
-+#define MCF_GPIO_DSCR_IRQ_IRQ_LOAD_10PF	(0x00)
-+
-+/* Bit definitions and macros for DSCR_USB */
-+#define MCF_GPIO_DSCR_USB_USB(x)	(((x)&0x03))
-+#define MCF_GPIO_DSCR_USB_USB_LOAD_50PF	(0x03)
-+#define MCF_GPIO_DSCR_USB_USB_LOAD_30PF	(0x02)
-+#define MCF_GPIO_DSCR_USB_USB_LOAD_20PF	(0x01)
-+#define MCF_GPIO_DSCR_USB_USB_LOAD_10PF	(0x00)
-+
-+/* Bit definitions and macros for DSCR_ATA */
-+#define MCF_GPIO_DSCR_ATA_ATA(x)	(((x)&0x03))
-+#define MCF_GPIO_DSCR_ATA_ATA_LOAD_50PF	(0x03)
-+#define MCF_GPIO_DSCR_ATA_ATA_LOAD_30PF	(0x02)
-+#define MCF_GPIO_DSCR_ATA_ATA_LOAD_20PF	(0x01)
-+#define MCF_GPIO_DSCR_ATA_ATA_LOAD_10PF	(0x00)
-+
-+/********************************************************************/
-+
-+#endif /* __MCF5445X_GPIO_H__ */
---- /dev/null
-+++ b/include/asm-m68k/mcf5445x_i2c.h
-@@ -0,0 +1,39 @@
-+/*
-+ * Matt Waddel Matt.Waddel@freescale.com
-+ *
-+ * Copyright Freescale Semiconductor, Inc. 2007
-+ *
-+ * 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.
-+ */
-+
-+#ifndef __MCF5445X_I2C_H__
-+#define __MCF5445X_I2C_H__
-+
-+/*********************************************************************
-+*
-+* I2C Module (I2C)
-+*
-+*********************************************************************/
-+
-+/* Register read/write macros */
-+#define MCF_I2C_I2ADR	(volatile u8 *)(0xFC058000)
-+#define MCF_I2C_I2FDR	(volatile u8 *)(0xFC058004)
-+#define MCF_I2C_I2CR	(volatile u8 *)(0xFC058008)
-+#define MCF_I2C_I2SR	(volatile u8 *)(0xFC05800C)
-+#define MCF_I2C_I2DR	(volatile u8 *)(0xFC058010)
-+
-+/* Bit definitions and macros for I2AR */
-+#define MCF_I2C_I2AR_ADR(x)	(((x)&0x7F)<<1)
-+
-+/* Bit definitions and macros for I2FDR */
-+#define MCF_I2C_I2FDR_IC(x)	(((x)&0x3F))
-+
-+/* Bit definitions and macros for I2DR */
-+#define MCF_I2C_I2DR_DATA(x)	(x)
-+
-+/********************************************************************/
-+
-+#endif /* __MCF5445X_I2C_H__ */
---- /dev/null
-+++ b/include/asm-m68k/mcf5445x_intc.h
-@@ -0,0 +1,724 @@
-+/*
-+ * Matt Waddel Matt.Waddel@freescale.com
-+ *
-+ * Copyright Freescale Semiconductor, Inc. 2007
-+ *
-+ * 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.
-+ */
-+
-+#ifndef __MCF5445X_INTC_H__
-+#define __MCF5445X_INTC_H__
-+
-+/*********************************************************************
-+*
-+* Interrupt Controller (INTC)
-+*
-+*********************************************************************/
-+
-+/* Register read/write macros */
-+#define MCF_INTC0_IPRH          MCF_REG32(0xFC048000)
-+#define MCF_INTC0_IPRL          MCF_REG32(0xFC048004)
-+#define MCF_INTC0_IMRH          MCF_REG32(0xFC048008)
-+#define MCF_INTC0_IMRL          MCF_REG32(0xFC04800C)
-+#define MCF_INTC0_INTFRCH       MCF_REG32(0xFC048010)
-+#define MCF_INTC0_INTFRCL       MCF_REG32(0xFC048014)
-+#define MCF_INTC0_ICONFIG       MCF_REG16(0xFC04801A)
-+#define MCF_INTC0_SIMR          MCF_REG08(0xFC04801C)
-+#define MCF_INTC0_CIMR          MCF_REG08(0xFC04801D)
-+#define MCF_INTC0_CLMASK        MCF_REG08(0xFC04801E)
-+#define MCF_INTC0_SLMASK        MCF_REG08(0xFC04801F)
-+#define MCF_INTC0_ICR1          MCF_REG08(0xFC048041)
-+#define MCF_INTC0_ICR2          MCF_REG08(0xFC048042)
-+#define MCF_INTC0_ICR3          MCF_REG08(0xFC048043)
-+#define MCF_INTC0_ICR4          MCF_REG08(0xFC048044)
-+#define MCF_INTC0_ICR5          MCF_REG08(0xFC048045)
-+#define MCF_INTC0_ICR6          MCF_REG08(0xFC048046)
-+#define MCF_INTC0_ICR7          MCF_REG08(0xFC048047)
-+#define MCF_INTC0_ICR8          MCF_REG08(0xFC048048)
-+#define MCF_INTC0_ICR9          MCF_REG08(0xFC048049)
-+#define MCF_INTC0_ICR10         MCF_REG08(0xFC04804A)
-+#define MCF_INTC0_ICR11         MCF_REG08(0xFC04804B)
-+#define MCF_INTC0_ICR12         MCF_REG08(0xFC04804C)
-+#define MCF_INTC0_ICR13         MCF_REG08(0xFC04804D)
-+#define MCF_INTC0_ICR14         MCF_REG08(0xFC04804E)
-+#define MCF_INTC0_ICR15         MCF_REG08(0xFC04804F)
-+#define MCF_INTC0_ICR16         MCF_REG08(0xFC048050)
-+#define MCF_INTC0_ICR17         MCF_REG08(0xFC048051)
-+#define MCF_INTC0_ICR18         MCF_REG08(0xFC048052)
-+#define MCF_INTC0_ICR19         MCF_REG08(0xFC048053)
-+#define MCF_INTC0_ICR20         MCF_REG08(0xFC048054)
-+#define MCF_INTC0_ICR21         MCF_REG08(0xFC048055)
-+#define MCF_INTC0_ICR22         MCF_REG08(0xFC048056)
-+#define MCF_INTC0_ICR23         MCF_REG08(0xFC048057)
-+#define MCF_INTC0_ICR24         MCF_REG08(0xFC048058)
-+#define MCF_INTC0_ICR25         MCF_REG08(0xFC048059)
-+#define MCF_INTC0_ICR26         MCF_REG08(0xFC04805A)
-+#define MCF_INTC0_ICR27         MCF_REG08(0xFC04805B)
-+#define MCF_INTC0_ICR28         MCF_REG08(0xFC04805C)
-+#define MCF_INTC0_ICR29         MCF_REG08(0xFC04805D)
-+#define MCF_INTC0_ICR30         MCF_REG08(0xFC04805E)
-+#define MCF_INTC0_ICR31         MCF_REG08(0xFC04805F)
-+#define MCF_INTC0_ICR32         MCF_REG08(0xFC048060)
-+#define MCF_INTC0_ICR33         MCF_REG08(0xFC048061)
-+#define MCF_INTC0_ICR34         MCF_REG08(0xFC048062)
-+#define MCF_INTC0_ICR35         MCF_REG08(0xFC048063)
-+#define MCF_INTC0_ICR36         MCF_REG08(0xFC048064)
-+#define MCF_INTC0_ICR37         MCF_REG08(0xFC048065)
-+#define MCF_INTC0_ICR38         MCF_REG08(0xFC048066)
-+#define MCF_INTC0_ICR39         MCF_REG08(0xFC048067)
-+#define MCF_INTC0_ICR40         MCF_REG08(0xFC048068)
-+#define MCF_INTC0_ICR41         MCF_REG08(0xFC048069)
-+#define MCF_INTC0_ICR42         MCF_REG08(0xFC04806A)
-+#define MCF_INTC0_ICR43         MCF_REG08(0xFC04806B)
-+#define MCF_INTC0_ICR44         MCF_REG08(0xFC04806C)
-+#define MCF_INTC0_ICR45         MCF_REG08(0xFC04806D)
-+#define MCF_INTC0_ICR46         MCF_REG08(0xFC04806E)
-+#define MCF_INTC0_ICR47         MCF_REG08(0xFC04806F)
-+#define MCF_INTC0_ICR48         MCF_REG08(0xFC048070)
-+#define MCF_INTC0_ICR49         MCF_REG08(0xFC048071)
-+#define MCF_INTC0_ICR50         MCF_REG08(0xFC048072)
-+#define MCF_INTC0_ICR51         MCF_REG08(0xFC048073)
-+#define MCF_INTC0_ICR52         MCF_REG08(0xFC048074)
-+#define MCF_INTC0_ICR53         MCF_REG08(0xFC048075)
-+#define MCF_INTC0_ICR54         MCF_REG08(0xFC048076)
-+#define MCF_INTC0_ICR55         MCF_REG08(0xFC048077)
-+#define MCF_INTC0_ICR56         MCF_REG08(0xFC048078)
-+#define MCF_INTC0_ICR57         MCF_REG08(0xFC048079)
-+#define MCF_INTC0_ICR58         MCF_REG08(0xFC04807A)
-+#define MCF_INTC0_ICR59         MCF_REG08(0xFC04807B)
-+#define MCF_INTC0_ICR60         MCF_REG08(0xFC04807C)
-+#define MCF_INTC0_ICR61         MCF_REG08(0xFC04807D)
-+#define MCF_INTC0_ICR62         MCF_REG08(0xFC04807E)
-+#define MCF_INTC0_ICR63         MCF_REG08(0xFC04807F)
-+#define MCF_INTC0_SWIACK        MCF_REG08(0xFC0480E0)
-+#define MCF_INTC0_L1IACK        MCF_REG08(0xFC0480E4)
-+#define MCF_INTC0_L2IACK        MCF_REG08(0xFC0480E8)
-+#define MCF_INTC0_L3IACK        MCF_REG08(0xFC0480EC)
-+#define MCF_INTC0_L4IACK        MCF_REG08(0xFC0480F0)
-+#define MCF_INTC0_L5IACK        MCF_REG08(0xFC0480F4)
-+#define MCF_INTC0_L6IACK        MCF_REG08(0xFC0480F8)
-+#define MCF_INTC0_L7IACK        MCF_REG08(0xFC0480FC)
-+#define MCF_INTC1_IPRH          MCF_REG32(0xFC04C000)
-+#define MCF_INTC1_IPRL          MCF_REG32(0xFC04C004)
-+#define MCF_INTC1_IMRH          MCF_REG32(0xFC04C008)
-+#define MCF_INTC1_IMRL          MCF_REG32(0xFC04C00C)
-+#define MCF_INTC1_INTFRCH       MCF_REG32(0xFC04C010)
-+#define MCF_INTC1_INTFRCL       MCF_REG32(0xFC04C014)
-+#define MCF_INTC1_ICONFIG       MCF_REG16(0xFC04C01A)
-+#define MCF_INTC1_SIMR          MCF_REG08(0xFC04C01C)
-+#define MCF_INTC1_CIMR          MCF_REG08(0xFC04C01D)
-+#define MCF_INTC1_CLMASK        MCF_REG08(0xFC04C01E)
-+#define MCF_INTC1_SLMASK        MCF_REG08(0xFC04C01F)
-+#define MCF_INTC1_ICR1          MCF_REG08(0xFC04C041)
-+#define MCF_INTC1_ICR2          MCF_REG08(0xFC04C042)
-+#define MCF_INTC1_ICR3          MCF_REG08(0xFC04C043)
-+#define MCF_INTC1_ICR4          MCF_REG08(0xFC04C044)
-+#define MCF_INTC1_ICR5          MCF_REG08(0xFC04C045)
-+#define MCF_INTC1_ICR6          MCF_REG08(0xFC04C046)
-+#define MCF_INTC1_ICR7          MCF_REG08(0xFC04C047)
-+#define MCF_INTC1_ICR8          MCF_REG08(0xFC04C048)
-+#define MCF_INTC1_ICR9          MCF_REG08(0xFC04C049)
-+#define MCF_INTC1_ICR10         MCF_REG08(0xFC04C04A)
-+#define MCF_INTC1_ICR11         MCF_REG08(0xFC04C04B)
-+#define MCF_INTC1_ICR12         MCF_REG08(0xFC04C04C)
-+#define MCF_INTC1_ICR13         MCF_REG08(0xFC04C04D)
-+#define MCF_INTC1_ICR14         MCF_REG08(0xFC04C04E)
-+#define MCF_INTC1_ICR15         MCF_REG08(0xFC04C04F)
-+#define MCF_INTC1_ICR16         MCF_REG08(0xFC04C050)
-+#define MCF_INTC1_ICR17         MCF_REG08(0xFC04C051)
-+#define MCF_INTC1_ICR18         MCF_REG08(0xFC04C052)
-+#define MCF_INTC1_ICR19         MCF_REG08(0xFC04C053)
-+#define MCF_INTC1_ICR20         MCF_REG08(0xFC04C054)
-+#define MCF_INTC1_ICR21         MCF_REG08(0xFC04C055)
-+#define MCF_INTC1_ICR22         MCF_REG08(0xFC04C056)
-+#define MCF_INTC1_ICR23         MCF_REG08(0xFC04C057)
-+#define MCF_INTC1_ICR24         MCF_REG08(0xFC04C058)
-+#define MCF_INTC1_ICR25         MCF_REG08(0xFC04C059)
-+#define MCF_INTC1_ICR26         MCF_REG08(0xFC04C05A)
-+#define MCF_INTC1_ICR27         MCF_REG08(0xFC04C05B)
-+#define MCF_INTC1_ICR28         MCF_REG08(0xFC04C05C)
-+#define MCF_INTC1_ICR29         MCF_REG08(0xFC04C05D)
-+#define MCF_INTC1_ICR30         MCF_REG08(0xFC04C05E)
-+#define MCF_INTC1_ICR31         MCF_REG08(0xFC04C05F)
-+#define MCF_INTC1_ICR32         MCF_REG08(0xFC04C060)
-+#define MCF_INTC1_ICR33         MCF_REG08(0xFC04C061)
-+#define MCF_INTC1_ICR34         MCF_REG08(0xFC04C062)
-+#define MCF_INTC1_ICR35         MCF_REG08(0xFC04C063)
-+#define MCF_INTC1_ICR36         MCF_REG08(0xFC04C064)
-+#define MCF_INTC1_ICR37         MCF_REG08(0xFC04C065)
-+#define MCF_INTC1_ICR38         MCF_REG08(0xFC04C066)
-+#define MCF_INTC1_ICR39         MCF_REG08(0xFC04C067)
-+#define MCF_INTC1_ICR40         MCF_REG08(0xFC04C068)
-+#define MCF_INTC1_ICR41         MCF_REG08(0xFC04C069)
-+#define MCF_INTC1_ICR42         MCF_REG08(0xFC04C06A)
-+#define MCF_INTC1_ICR43         MCF_REG08(0xFC04C06B)
-+#define MCF_INTC1_ICR44         MCF_REG08(0xFC04C06C)
-+#define MCF_INTC1_ICR45         MCF_REG08(0xFC04C06D)
-+#define MCF_INTC1_ICR46         MCF_REG08(0xFC04C06E)
-+#define MCF_INTC1_ICR47         MCF_REG08(0xFC04C06F)
-+#define MCF_INTC1_ICR48         MCF_REG08(0xFC04C070)
-+#define MCF_INTC1_ICR49         MCF_REG08(0xFC04C071)
-+#define MCF_INTC1_ICR50         MCF_REG08(0xFC04C072)
-+#define MCF_INTC1_ICR51         MCF_REG08(0xFC04C073)
-+#define MCF_INTC1_ICR52         MCF_REG08(0xFC04C074)
-+#define MCF_INTC1_ICR53         MCF_REG08(0xFC04C075)
-+#define MCF_INTC1_ICR54         MCF_REG08(0xFC04C076)
-+#define MCF_INTC1_ICR55         MCF_REG08(0xFC04C077)
-+#define MCF_INTC1_ICR56         MCF_REG08(0xFC04C078)
-+#define MCF_INTC1_ICR57         MCF_REG08(0xFC04C079)
-+#define MCF_INTC1_ICR58         MCF_REG08(0xFC04C07A)
-+#define MCF_INTC1_ICR59         MCF_REG08(0xFC04C07B)
-+#define MCF_INTC1_ICR60         MCF_REG08(0xFC04C07C)
-+#define MCF_INTC1_ICR61         MCF_REG08(0xFC04C07D)
-+#define MCF_INTC1_ICR62         MCF_REG08(0xFC04C07E)
-+#define MCF_INTC1_ICR63         MCF_REG08(0xFC04C07F)
-+#define MCF_INTC1_SWIACK        MCF_REG08(0xFC04C0E0)
-+#define MCF_INTC1_L1IACK        MCF_REG08(0xFC04C0E4)
-+#define MCF_INTC1_L2IACK        MCF_REG08(0xFC04C0E8)
-+#define MCF_INTC1_L3IACK        MCF_REG08(0xFC04C0EC)
-+#define MCF_INTC1_L4IACK        MCF_REG08(0xFC04C0F0)
-+#define MCF_INTC1_L5IACK        MCF_REG08(0xFC04C0F4)
-+#define MCF_INTC1_L6IACK        MCF_REG08(0xFC04C0F8
-+#define MCF_INTC1_L7IACK        MCF_REG08(0xFC04C0FC)
-+
-+/* Parameterized register read/write macros for multiple registers */
-+#define MCF_INTC0_ICR(x)        MCF_REG08(0xFC048041+((x-1)*0x001))
-+#define MCF_INTC0_LIACK(x)      MCF_REG08(0xFC0480E4+((x-1)*0x004))
-+#define MCF_INTC1_ICR(x)        MCF_REG08(0xFC04C041+((x-1)*0x001))
-+#define MCF_INTC1_LIACK(x)      MCF_REG08(0xFC04C0E4+((x-1)*0x004))
-+
-+/* Parameterized register read/write macros for multiple modules */
-+#define MCF_INTC_IPRH(x)        MCF_REG32(0xFC048000+((x)*0x4000))
-+#define MCF_INTC_IPRL(x)        MCF_REG32(0xFC048004+((x)*0x4000))
-+#define MCF_INTC_IMRH(x)        MCF_REG32(0xFC048008+((x)*0x4000))
-+#define MCF_INTC_IMRL(x)        MCF_REG32(0xFC04800C+((x)*0x4000))
-+#define MCF_INTC_INTFRCH(x)     MCF_REG32(0xFC048010+((x)*0x4000))
-+#define MCF_INTC_INTFRCL(x)     MCF_REG32(0xFC048014+((x)*0x4000))
-+#define MCF_INTC_ICONFIG(x)     MCF_REG16(0xFC04801A+((x)*0x4000))
-+#define MCF_INTC_SIMR(x)        MCF_REG08(0xFC04801C+((x)*0x4000))
-+#define MCF_INTC_CIMR(x)        MCF_REG08(0xFC04801D+((x)*0x4000))
-+#define MCF_INTC_CLMASK(x)      MCF_REG08(0xFC04801E+((x)*0x4000))
-+#define MCF_INTC_SLMASK(x)      MCF_REG08(0xFC04801F+((x)*0x4000))
-+#define MCF_INTC_ICR1(x)        MCF_REG08(0xFC048041+((x)*0x4000))
-+#define MCF_INTC_ICR2(x)        MCF_REG08(0xFC048042+((x)*0x4000))
-+#define MCF_INTC_ICR3(x)        MCF_REG08(0xFC048043+((x)*0x4000))
-+#define MCF_INTC_ICR4(x)        MCF_REG08(0xFC048044+((x)*0x4000))
-+#define MCF_INTC_ICR5(x)        MCF_REG08(0xFC048045+((x)*0x4000))
-+#define MCF_INTC_ICR6(x)        MCF_REG08(0xFC048046+((x)*0x4000))
-+#define MCF_INTC_ICR7(x)        MCF_REG08(0xFC048047+((x)*0x4000))
-+#define MCF_INTC_ICR8(x)        MCF_REG08(0xFC048048+((x)*0x4000))
-+#define MCF_INTC_ICR9(x)        MCF_REG08(0xFC048049+((x)*0x4000))
-+#define MCF_INTC_ICR10(x)       MCF_REG08(0xFC04804A+((x)*0x4000))
-+#define MCF_INTC_ICR11(x)       MCF_REG08(0xFC04804B+((x)*0x4000))
-+#define MCF_INTC_ICR12(x)       MCF_REG08(0xFC04804C+((x)*0x4000))
-+#define MCF_INTC_ICR13(x)       MCF_REG08(0xFC04804D+((x)*0x4000))
-+#define MCF_INTC_ICR14(x)       MCF_REG08(0xFC04804E+((x)*0x4000))
-+#define MCF_INTC_ICR15(x)       MCF_REG08(0xFC04804F+((x)*0x4000))
-+#define MCF_INTC_ICR16(x)       MCF_REG08(0xFC048050+((x)*0x4000))
-+#define MCF_INTC_ICR17(x)       MCF_REG08(0xFC048051+((x)*0x4000))
-+#define MCF_INTC_ICR18(x)       MCF_REG08(0xFC048052+((x)*0x4000))
-+#define MCF_INTC_ICR19(x)       MCF_REG08(0xFC048053+((x)*0x4000))
-+#define MCF_INTC_ICR20(x)       MCF_REG08(0xFC048054+((x)*0x4000))
-+#define MCF_INTC_ICR21(x)       MCF_REG08(0xFC048055+((x)*0x4000))
-+#define MCF_INTC_ICR22(x)       MCF_REG08(0xFC048056+((x)*0x4000))
-+#define MCF_INTC_ICR23(x)       MCF_REG08(0xFC048057+((x)*0x4000))
-+#define MCF_INTC_ICR24(x)       MCF_REG08(0xFC048058+((x)*0x4000))
-+#define MCF_INTC_ICR25(x)       MCF_REG08(0xFC048059+((x)*0x4000))
-+#define MCF_INTC_ICR26(x)       MCF_REG08(0xFC04805A+((x)*0x4000))
-+#define MCF_INTC_ICR27(x)       MCF_REG08(0xFC04805B+((x)*0x4000))
-+#define MCF_INTC_ICR28(x)       MCF_REG08(0xFC04805C+((x)*0x4000))
-+#define MCF_INTC_ICR29(x)       MCF_REG08(0xFC04805D+((x)*0x4000))
-+#define MCF_INTC_ICR30(x)       MCF_REG08(0xFC04805E+((x)*0x4000))
-+#define MCF_INTC_ICR31(x)       MCF_REG08(0xFC04805F+((x)*0x4000))
-+#define MCF_INTC_ICR32(x)       MCF_REG08(0xFC048060+((x)*0x4000))
-+#define MCF_INTC_ICR33(x)       MCF_REG08(0xFC048061+((x)*0x4000))
-+#define MCF_INTC_ICR34(x)       MCF_REG08(0xFC048062+((x)*0x4000))
-+#define MCF_INTC_ICR35(x)       MCF_REG08(0xFC048063+((x)*0x4000))
-+#define MCF_INTC_ICR36(x)       MCF_REG08(0xFC048064+((x)*0x4000))
-+#define MCF_INTC_ICR37(x)       MCF_REG08(0xFC048065+((x)*0x4000))
-+#define MCF_INTC_ICR38(x)       MCF_REG08(0xFC048066+((x)*0x4000))
-+#define MCF_INTC_ICR39(x)       MCF_REG08(0xFC048067+((x)*0x4000))
-+#define MCF_INTC_ICR40(x)       MCF_REG08(0xFC048068+((x)*0x4000))
-+#define MCF_INTC_ICR41(x)       MCF_REG08(0xFC048069+((x)*0x4000))
-+#define MCF_INTC_ICR42(x)       MCF_REG08(0xFC04806A+((x)*0x4000))
-+#define MCF_INTC_ICR43(x)       MCF_REG08(0xFC04806B+((x)*0x4000))
-+#define MCF_INTC_ICR44(x)       MCF_REG08(0xFC04806C+((x)*0x4000))
-+#define MCF_INTC_ICR45(x)       MCF_REG08(0xFC04806D+((x)*0x4000))
-+#define MCF_INTC_ICR46(x)       MCF_REG08(0xFC04806E+((x)*0x4000))
-+#define MCF_INTC_ICR47(x)       MCF_REG08(0xFC04806F+((x)*0x4000))
-+#define MCF_INTC_ICR48(x)       MCF_REG08(0xFC048070+((x)*0x4000))
-+#define MCF_INTC_ICR49(x)       MCF_REG08(0xFC048071+((x)*0x4000))
-+#define MCF_INTC_ICR50(x)       MCF_REG08(0xFC048072+((x)*0x4000))
-+#define MCF_INTC_ICR51(x)       MCF_REG08(0xFC048073+((x)*0x4000))
-+#define MCF_INTC_ICR52(x)       MCF_REG08(0xFC048074+((x)*0x4000))
-+#define MCF_INTC_ICR53(x)       MCF_REG08(0xFC048075+((x)*0x4000))
-+#define MCF_INTC_ICR54(x)       MCF_REG08(0xFC048076+((x)*0x4000))
-+#define MCF_INTC_ICR55(x)       MCF_REG08(0xFC048077+((x)*0x4000))
-+#define MCF_INTC_ICR56(x)       MCF_REG08(0xFC048078+((x)*0x4000))
-+#define MCF_INTC_ICR57(x)       MCF_REG08(0xFC048079+((x)*0x4000))
-+#define MCF_INTC_ICR58(x)       MCF_REG08(0xFC04807A+((x)*0x4000))
-+#define MCF_INTC_ICR59(x)       MCF_REG08(0xFC04807B+((x)*0x4000))
-+#define MCF_INTC_ICR60(x)       MCF_REG08(0xFC04807C+((x)*0x4000))
-+#define MCF_INTC_ICR61(x)       MCF_REG08(0xFC04807D+((x)*0x4000))
-+#define MCF_INTC_ICR62(x)       MCF_REG08(0xFC04807E+((x)*0x4000))
-+#define MCF_INTC_ICR63(x)       MCF_REG08(0xFC04807F+((x)*0x4000))
-+#define MCF_INTC_SWIACK(x)      MCF_REG08(0xFC0480E0+((x)*0x4000))
-+#define MCF_INTC_L1IACK(x)      MCF_REG08(0xFC0480E4+((x)*0x4000))
-+#define MCF_INTC_L2IACK(x)      MCF_REG08(0xFC0480E8+((x)*0x4000))
-+#define MCF_INTC_L3IACK(x)      MCF_REG08(0xFC0480EC+((x)*0x4000))
-+#define MCF_INTC_L4IACK(x)      MCF_REG08(0xFC0480F0+((x)*0x4000))
-+#define MCF_INTC_L5IACK(x)      MCF_REG08(0xFC0480F4+((x)*0x4000))
-+#define MCF_INTC_L6IACK(x)      MCF_REG08(0xFC0480F8+((x)*0x4000))
-+#define MCF_INTC_L7IACK(x)      MCF_REG08(0xFC0480FC+((x)*0x4000))
-+
-+/* Bit definitions and macros for IPRH */
-+#define MCF_INTC_IPRH_INT32     (0x00000001)
-+#define MCF_INTC_IPRH_INT33     (0x00000002)
-+#define MCF_INTC_IPRH_INT34     (0x00000004)
-+#define MCF_INTC_IPRH_INT35     (0x00000008)
-+#define MCF_INTC_IPRH_INT36     (0x00000010)
-+#define MCF_INTC_IPRH_INT37     (0x00000020)
-+#define MCF_INTC_IPRH_INT38     (0x00000040)
-+#define MCF_INTC_IPRH_INT39     (0x00000080)
-+#define MCF_INTC_IPRH_INT40     (0x00000100)
-+#define MCF_INTC_IPRH_INT41     (0x00000200)
-+#define MCF_INTC_IPRH_INT42     (0x00000400)
-+#define MCF_INTC_IPRH_INT43     (0x00000800)
-+#define MCF_INTC_IPRH_INT44     (0x00001000)
-+#define MCF_INTC_IPRH_INT45     (0x00002000)
-+#define MCF_INTC_IPRH_INT46     (0x00004000)
-+#define MCF_INTC_IPRH_INT47     (0x00008000)
-+#define MCF_INTC_IPRH_INT48     (0x00010000)
-+#define MCF_INTC_IPRH_INT49     (0x00020000)
-+#define MCF_INTC_IPRH_INT50     (0x00040000)
-+#define MCF_INTC_IPRH_INT51     (0x00080000)
-+#define MCF_INTC_IPRH_INT52     (0x00100000)
-+#define MCF_INTC_IPRH_INT53     (0x00200000)
-+#define MCF_INTC_IPRH_INT54     (0x00400000)
-+#define MCF_INTC_IPRH_INT55     (0x00800000)
-+#define MCF_INTC_IPRH_INT56     (0x01000000)
-+#define MCF_INTC_IPRH_INT57     (0x02000000)
-+#define MCF_INTC_IPRH_INT58     (0x04000000)
-+#define MCF_INTC_IPRH_INT59     (0x08000000)
-+#define MCF_INTC_IPRH_INT60     (0x10000000)
-+#define MCF_INTC_IPRH_INT61     (0x20000000)
-+#define MCF_INTC_IPRH_INT62     (0x40000000)
-+#define MCF_INTC_IPRH_INT63     (0x80000000)
-+
-+/* Bit definitions and macros for IPRL */
-+#define MCF_INTC_IPRL_INT0      (0x00000001)
-+#define MCF_INTC_IPRL_INT1      (0x00000002)
-+#define MCF_INTC_IPRL_INT2      (0x00000004)
-+#define MCF_INTC_IPRL_INT3      (0x00000008)
-+#define MCF_INTC_IPRL_INT4      (0x00000010)
-+#define MCF_INTC_IPRL_INT5      (0x00000020)
-+#define MCF_INTC_IPRL_INT6      (0x00000040)
-+#define MCF_INTC_IPRL_INT7      (0x00000080)
-+#define MCF_INTC_IPRL_INT8      (0x00000100)
-+#define MCF_INTC_IPRL_INT9      (0x00000200)
-+#define MCF_INTC_IPRL_INT10     (0x00000400)
-+#define MCF_INTC_IPRL_INT11     (0x00000800)
-+#define MCF_INTC_IPRL_INT12     (0x00001000)
-+#define MCF_INTC_IPRL_INT13     (0x00002000)
-+#define MCF_INTC_IPRL_INT14     (0x00004000)
-+#define MCF_INTC_IPRL_INT15     (0x00008000)
-+#define MCF_INTC_IPRL_INT16     (0x00010000)
-+#define MCF_INTC_IPRL_INT17     (0x00020000)
-+#define MCF_INTC_IPRL_INT18     (0x00040000)
-+#define MCF_INTC_IPRL_INT19     (0x00080000)
-+#define MCF_INTC_IPRL_INT20     (0x00100000)
-+#define MCF_INTC_IPRL_INT21     (0x00200000)
-+#define MCF_INTC_IPRL_INT22     (0x00400000)
-+#define MCF_INTC_IPRL_INT23     (0x00800000)
-+#define MCF_INTC_IPRL_INT24     (0x01000000)
-+#define MCF_INTC_IPRL_INT25     (0x02000000)
-+#define MCF_INTC_IPRL_INT26     (0x04000000)
-+#define MCF_INTC_IPRL_INT27     (0x08000000)
-+#define MCF_INTC_IPRL_INT28     (0x10000000)
-+#define MCF_INTC_IPRL_INT29     (0x20000000)
-+#define MCF_INTC_IPRL_INT30     (0x40000000)
-+#define MCF_INTC_IPRL_INT31     (0x80000000)
-+
-+/* Bit definitions and macros for IMRH */
-+#define MCF_INTC_IMRH_INT_MASK32    (0x00000001)
-+#define MCF_INTC_IMRH_INT_MASK33    (0x00000002)
-+#define MCF_INTC_IMRH_INT_MASK34    (0x00000004)
-+#define MCF_INTC_IMRH_INT_MASK35    (0x00000008)
-+#define MCF_INTC_IMRH_INT_MASK36    (0x00000010)
-+#define MCF_INTC_IMRH_INT_MASK37    (0x00000020)
-+#define MCF_INTC_IMRH_INT_MASK38    (0x00000040)
-+#define MCF_INTC_IMRH_INT_MASK39    (0x00000080)
-+#define MCF_INTC_IMRH_INT_MASK40    (0x00000100)
-+#define MCF_INTC_IMRH_INT_MASK41    (0x00000200)
-+#define MCF_INTC_IMRH_INT_MASK42    (0x00000400)
-+#define MCF_INTC_IMRH_INT_MASK43    (0x00000800)
-+#define MCF_INTC_IMRH_INT_MASK44    (0x00001000)
-+#define MCF_INTC_IMRH_INT_MASK45    (0x00002000)
-+#define MCF_INTC_IMRH_INT_MASK46    (0x00004000)
-+#define MCF_INTC_IMRH_INT_MASK47    (0x00008000)
-+#define MCF_INTC_IMRH_INT_MASK48    (0x00010000)
-+#define MCF_INTC_IMRH_INT_MASK49    (0x00020000)
-+#define MCF_INTC_IMRH_INT_MASK50    (0x00040000)
-+#define MCF_INTC_IMRH_INT_MASK51    (0x00080000)
-+#define MCF_INTC_IMRH_INT_MASK52    (0x00100000)
-+#define MCF_INTC_IMRH_INT_MASK53    (0x00200000)
-+#define MCF_INTC_IMRH_INT_MASK54    (0x00400000)
-+#define MCF_INTC_IMRH_INT_MASK55    (0x00800000)
-+#define MCF_INTC_IMRH_INT_MASK56    (0x01000000)
-+#define MCF_INTC_IMRH_INT_MASK57    (0x02000000)
-+#define MCF_INTC_IMRH_INT_MASK58    (0x04000000)
-+#define MCF_INTC_IMRH_INT_MASK59    (0x08000000)
-+#define MCF_INTC_IMRH_INT_MASK60    (0x10000000)
-+#define MCF_INTC_IMRH_INT_MASK61    (0x20000000)
-+#define MCF_INTC_IMRH_INT_MASK62    (0x40000000)
-+#define MCF_INTC_IMRH_INT_MASK63    (0x80000000)
-+
-+/* Bit definitions and macros for IMRL */
-+#define MCF_INTC_IMRL_INT_MASK0     (0x00000001)
-+#define MCF_INTC_IMRL_INT_MASK1     (0x00000002)
-+#define MCF_INTC_IMRL_INT_MASK2     (0x00000004)
-+#define MCF_INTC_IMRL_INT_MASK3     (0x00000008)
-+#define MCF_INTC_IMRL_INT_MASK4     (0x00000010)
-+#define MCF_INTC_IMRL_INT_MASK5     (0x00000020)
-+#define MCF_INTC_IMRL_INT_MASK6     (0x00000040)
-+#define MCF_INTC_IMRL_INT_MASK7     (0x00000080)
-+#define MCF_INTC_IMRL_INT_MASK8     (0x00000100)
-+#define MCF_INTC_IMRL_INT_MASK9     (0x00000200)
-+#define MCF_INTC_IMRL_INT_MASK10    (0x00000400)
-+#define MCF_INTC_IMRL_INT_MASK11    (0x00000800)
-+#define MCF_INTC_IMRL_INT_MASK12    (0x00001000)
-+#define MCF_INTC_IMRL_INT_MASK13    (0x00002000)
-+#define MCF_INTC_IMRL_INT_MASK14    (0x00004000)
-+#define MCF_INTC_IMRL_INT_MASK15    (0x00008000)
-+#define MCF_INTC_IMRL_INT_MASK16    (0x00010000)
-+#define MCF_INTC_IMRL_INT_MASK17    (0x00020000)
-+#define MCF_INTC_IMRL_INT_MASK18    (0x00040000)
-+#define MCF_INTC_IMRL_INT_MASK19    (0x00080000)
-+#define MCF_INTC_IMRL_INT_MASK20    (0x00100000)
-+#define MCF_INTC_IMRL_INT_MASK21    (0x00200000)
-+#define MCF_INTC_IMRL_INT_MASK22    (0x00400000)
-+#define MCF_INTC_IMRL_INT_MASK23    (0x00800000)
-+#define MCF_INTC_IMRL_INT_MASK24    (0x01000000)
-+#define MCF_INTC_IMRL_INT_MASK25    (0x02000000)
-+#define MCF_INTC_IMRL_INT_MASK26    (0x04000000)
-+#define MCF_INTC_IMRL_INT_MASK27    (0x08000000)
-+#define MCF_INTC_IMRL_INT_MASK28    (0x10000000)
-+#define MCF_INTC_IMRL_INT_MASK29    (0x20000000)
-+#define MCF_INTC_IMRL_INT_MASK30    (0x40000000)
-+#define MCF_INTC_IMRL_INT_MASK31    (0x80000000)
-+
-+/* Bit definitions and macros for INTFRCH */
-+#define MCF_INTC_INTFRCH_INTFRC32   (0x00000001)
-+#define MCF_INTC_INTFRCH_INTFRC33   (0x00000002)
-+#define MCF_INTC_INTFRCH_INTFRC34   (0x00000004)
-+#define MCF_INTC_INTFRCH_INTFRC35   (0x00000008)
-+#define MCF_INTC_INTFRCH_INTFRC36   (0x00000010)
-+#define MCF_INTC_INTFRCH_INTFRC37   (0x00000020)
-+#define MCF_INTC_INTFRCH_INTFRC38   (0x00000040)
-+#define MCF_INTC_INTFRCH_INTFRC39   (0x00000080)
-+#define MCF_INTC_INTFRCH_INTFRC40   (0x00000100)
-+#define MCF_INTC_INTFRCH_INTFRC41   (0x00000200)
-+#define MCF_INTC_INTFRCH_INTFRC42   (0x00000400)
-+#define MCF_INTC_INTFRCH_INTFRC43   (0x00000800)
-+#define MCF_INTC_INTFRCH_INTFRC44   (0x00001000)
-+#define MCF_INTC_INTFRCH_INTFRC45   (0x00002000)
-+#define MCF_INTC_INTFRCH_INTFRC46   (0x00004000)
-+#define MCF_INTC_INTFRCH_INTFRC47   (0x00008000)
-+#define MCF_INTC_INTFRCH_INTFRC48   (0x00010000)
-+#define MCF_INTC_INTFRCH_INTFRC49   (0x00020000)
-+#define MCF_INTC_INTFRCH_INTFRC50   (0x00040000)
-+#define MCF_INTC_INTFRCH_INTFRC51   (0x00080000)
-+#define MCF_INTC_INTFRCH_INTFRC52   (0x00100000)
-+#define MCF_INTC_INTFRCH_INTFRC53   (0x00200000)
-+#define MCF_INTC_INTFRCH_INTFRC54   (0x00400000)
-+#define MCF_INTC_INTFRCH_INTFRC55   (0x00800000)
-+#define MCF_INTC_INTFRCH_INTFRC56   (0x01000000)
-+#define MCF_INTC_INTFRCH_INTFRC57   (0x02000000)
-+#define MCF_INTC_INTFRCH_INTFRC58   (0x04000000)
-+#define MCF_INTC_INTFRCH_INTFRC59   (0x08000000)
-+#define MCF_INTC_INTFRCH_INTFRC60   (0x10000000)
-+#define MCF_INTC_INTFRCH_INTFRC61   (0x20000000)
-+#define MCF_INTC_INTFRCH_INTFRC62   (0x40000000)
-+#define MCF_INTC_INTFRCH_INTFRC63   (0x80000000)
-+
-+/* Bit definitions and macros for INTFRCL */
-+#define MCF_INTC_INTFRCL_INTFRC0    (0x00000001)
-+#define MCF_INTC_INTFRCL_INTFRC1    (0x00000002)
-+#define MCF_INTC_INTFRCL_INTFRC2    (0x00000004)
-+#define MCF_INTC_INTFRCL_INTFRC3    (0x00000008)
-+#define MCF_INTC_INTFRCL_INTFRC4    (0x00000010)
-+#define MCF_INTC_INTFRCL_INTFRC5    (0x00000020)
-+#define MCF_INTC_INTFRCL_INTFRC6    (0x00000040)
-+#define MCF_INTC_INTFRCL_INTFRC7    (0x00000080)
-+#define MCF_INTC_INTFRCL_INTFRC8    (0x00000100)
-+#define MCF_INTC_INTFRCL_INTFRC9    (0x00000200)
-+#define MCF_INTC_INTFRCL_INTFRC10   (0x00000400)
-+#define MCF_INTC_INTFRCL_INTFRC11   (0x00000800)
-+#define MCF_INTC_INTFRCL_INTFRC12   (0x00001000)
-+#define MCF_INTC_INTFRCL_INTFRC13   (0x00002000)
-+#define MCF_INTC_INTFRCL_INTFRC14   (0x00004000)
-+#define MCF_INTC_INTFRCL_INTFRC15   (0x00008000)
-+#define MCF_INTC_INTFRCL_INTFRC16   (0x00010000)
-+#define MCF_INTC_INTFRCL_INTFRC17   (0x00020000)
-+#define MCF_INTC_INTFRCL_INTFRC18   (0x00040000)
-+#define MCF_INTC_INTFRCL_INTFRC19   (0x00080000)
-+#define MCF_INTC_INTFRCL_INTFRC20   (0x00100000)
-+#define MCF_INTC_INTFRCL_INTFRC21   (0x00200000)
-+#define MCF_INTC_INTFRCL_INTFRC22   (0x00400000)
-+#define MCF_INTC_INTFRCL_INTFRC23   (0x00800000)
-+#define MCF_INTC_INTFRCL_INTFRC24   (0x01000000)
-+#define MCF_INTC_INTFRCL_INTFRC25   (0x02000000)
-+#define MCF_INTC_INTFRCL_INTFRC26   (0x04000000)
-+#define MCF_INTC_INTFRCL_INTFRC27   (0x08000000)
-+#define MCF_INTC_INTFRCL_INTFRC28   (0x10000000)
-+#define MCF_INTC_INTFRCL_INTFRC29   (0x20000000)
-+#define MCF_INTC_INTFRCL_INTFRC30   (0x40000000)
-+#define MCF_INTC_INTFRCL_INTFRC31   (0x80000000)
-+
-+/* Bit definitions and macros for ICONFIG */
-+#define MCF_INTC_ICONFIG_EMASK      (0x0020)
-+#define MCF_INTC_ICONFIG_ELVLPRI1   (0x0200)
-+#define MCF_INTC_ICONFIG_ELVLPRI2   (0x0400)
-+#define MCF_INTC_ICONFIG_ELVLPRI3   (0x0800)
-+#define MCF_INTC_ICONFIG_ELVLPRI4   (0x1000)
-+#define MCF_INTC_ICONFIG_ELVLPRI5   (0x2000)
-+#define MCF_INTC_ICONFIG_ELVLPRI6   (0x4000)
-+#define MCF_INTC_ICONFIG_ELVLPRI7   (0x8000)
-+
-+/* Bit definitions and macros for SIMR */
-+#define MCF_INTC_SIMR_SIMR(x)   (((x)&0x7F))
-+
-+/* Bit definitions and macros for CIMR */
-+#define MCF_INTC_CIMR_CIMR(x)   (((x)&0x7F))
-+
-+/* Bit definitions and macros for CLMASK */
-+#define MCF_INTC_CLMASK_CLMASK(x)   (((x)&0x0F))
-+
-+/* Bit definitions and macros for SLMASK */
-+#define MCF_INTC_SLMASK_SLMASK(x)   (((x)&0x0F))
-+
-+/* Bit definitions and macros for ICR group */
-+#define MCF_INTC_ICR_IL(x)      (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR1 */
-+#define MCF_INTC_ICR1_IL(x)     (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR2 */
-+#define MCF_INTC_ICR2_IL(x)     (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR3 */
-+#define MCF_INTC_ICR3_IL(x)     (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR4 */
-+#define MCF_INTC_ICR4_IL(x)     (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR5 */
-+#define MCF_INTC_ICR5_IL(x)     (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR6 */
-+#define MCF_INTC_ICR6_IL(x)     (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR7 */
-+#define MCF_INTC_ICR7_IL(x)     (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR8 */
-+#define MCF_INTC_ICR8_IL(x)     (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR9 */
-+#define MCF_INTC_ICR9_IL(x)     (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR10 */
-+#define MCF_INTC_ICR10_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR11 */
-+#define MCF_INTC_ICR11_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR12 */
-+#define MCF_INTC_ICR12_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR13 */
-+#define MCF_INTC_ICR13_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR14 */
-+#define MCF_INTC_ICR14_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR15 */
-+#define MCF_INTC_ICR15_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR16 */
-+#define MCF_INTC_ICR16_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR17 */
-+#define MCF_INTC_ICR17_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR18 */
-+#define MCF_INTC_ICR18_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR19 */
-+#define MCF_INTC_ICR19_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR20 */
-+#define MCF_INTC_ICR20_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR21 */
-+#define MCF_INTC_ICR21_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR22 */
-+#define MCF_INTC_ICR22_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR23 */
-+#define MCF_INTC_ICR23_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR24 */
-+#define MCF_INTC_ICR24_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR25 */
-+#define MCF_INTC_ICR25_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR26 */
-+#define MCF_INTC_ICR26_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR27 */
-+#define MCF_INTC_ICR27_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR28 */
-+#define MCF_INTC_ICR28_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR29 */
-+#define MCF_INTC_ICR29_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR30 */
-+#define MCF_INTC_ICR30_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR31 */
-+#define MCF_INTC_ICR31_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR32 */
-+#define MCF_INTC_ICR32_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR33 */
-+#define MCF_INTC_ICR33_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR34 */
-+#define MCF_INTC_ICR34_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR35 */
-+#define MCF_INTC_ICR35_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR36 */
-+#define MCF_INTC_ICR36_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR37 */
-+#define MCF_INTC_ICR37_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR38 */
-+#define MCF_INTC_ICR38_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR39 */
-+#define MCF_INTC_ICR39_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR40 */
-+#define MCF_INTC_ICR40_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR41 */
-+#define MCF_INTC_ICR41_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR42 */
-+#define MCF_INTC_ICR42_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR43 */
-+#define MCF_INTC_ICR43_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR44 */
-+#define MCF_INTC_ICR44_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR45 */
-+#define MCF_INTC_ICR45_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR46 */
-+#define MCF_INTC_ICR46_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR47 */
-+#define MCF_INTC_ICR47_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR48 */
-+#define MCF_INTC_ICR48_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR49 */
-+#define MCF_INTC_ICR49_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR50 */
-+#define MCF_INTC_ICR50_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR51 */
-+#define MCF_INTC_ICR51_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR52 */
-+#define MCF_INTC_ICR52_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR53 */
-+#define MCF_INTC_ICR53_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR54 */
-+#define MCF_INTC_ICR54_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR55 */
-+#define MCF_INTC_ICR55_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR56 */
-+#define MCF_INTC_ICR56_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR57 */
-+#define MCF_INTC_ICR57_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR58 */
-+#define MCF_INTC_ICR58_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR59 */
-+#define MCF_INTC_ICR59_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR60 */
-+#define MCF_INTC_ICR60_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR61 */
-+#define MCF_INTC_ICR61_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR62 */
-+#define MCF_INTC_ICR62_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for ICR63 */
-+#define MCF_INTC_ICR63_IL(x)    (((x)&0x07))
-+
-+/* Bit definitions and macros for SWIACK */
-+#define MCF_INTC_SWIACK_VECTOR(x)   (x)
-+
-+/* Bit definitions and macros for LIACK group */
-+#define MCF_INTC_LIACK_VECTOR(x)    (x)
-+
-+/* Bit definitions and macros for L1IACK */
-+#define MCF_INTC_L1IACK_VECTOR(x)   (x)
-+
-+/* Bit definitions and macros for L2IACK */
-+#define MCF_INTC_L2IACK_VECTOR(x)   (x)
-+
-+/* Bit definitions and macros for L3IACK */
-+#define MCF_INTC_L3IACK_VECTOR(x)   (x)
-+
-+/* Bit definitions and macros for L4IACK */
-+#define MCF_INTC_L4IACK_VECTOR(x)   (x)
-+
-+/* Bit definitions and macros for L5IACK */
-+#define MCF_INTC_L5IACK_VECTOR(x)   (x)
-+
-+/* Bit definitions and macros for L6IACK */
-+#define MCF_INTC_L6IACK_VECTOR(x)   (x)
-+
-+/* Bit definitions and macros for L7IACK */
-+#define MCF_INTC_L7IACK_VECTOR(x)   (x)
-+
-+/********************************************************************/
-+
-+#endif /* __MCF5445X_INTC_H__ */
---- /dev/null
-+++ b/include/asm-m68k/mcf5445x_pci.h
-@@ -0,0 +1,238 @@
-+/*
-+ * Kurt Mahan kmahan@freescale.com
-+ *
-+ * Copyright Freescale Semiconductor, Inc. 2007
-+ *
-+ * 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.
-+ */
-+
-+#ifndef __MCF5445X_PCI_H__
-+#define __MCF5445X_PCI_H__
-+
-+/*********************************************************************
-+*
-+* PCI Bus Controller (PCI)
-+*
-+*********************************************************************/
-+
-+/* Register read/write macros */
-+#define MCF_PCI_PCIIDR          MCF_REG32(0xFC0A8000)
-+#define MCF_PCI_PCISCR          MCF_REG32(0xFC0A8004)
-+#define MCF_PCI_PCICCRIR        MCF_REG32(0xFC0A8008)
-+#define MCF_PCI_PCICR1          MCF_REG32(0xFC0A800C)
-+#define MCF_PCI_PCIBAR0         MCF_REG32(0xFC0A8010)
-+#define MCF_PCI_PCIBAR1         MCF_REG32(0xFC0A8014)
-+#define MCF_PCI_PCIBAR2         MCF_REG32(0xFC0A8018)
-+#define MCF_PCI_PCIBAR3         MCF_REG32(0xFC0A801C)
-+#define MCF_PCI_PCIBAR4         MCF_REG32(0xFC0A8020)
-+#define MCF_PCI_PCIBAR5         MCF_REG32(0xFC0A8024)
-+#define MCF_PCI_PCISID          MCF_REG32(0xFC0A802C)
-+#define MCF_PCI_PCICR2          MCF_REG32(0xFC0A803C)
-+#define MCF_PCI_PCIGSCR         MCF_REG32(0xFC0A8060)
-+#define MCF_PCI_PCITBATR0A      MCF_REG32(0xFC0A8064)
-+#define MCF_PCI_PCITBATR1A      MCF_REG32(0xFC0A8068)
-+#define MCF_PCI_PCITCR          MCF_REG32(0xFC0A806C)
-+#define MCF_PCI_PCIIW0BTAR      MCF_REG32(0xFC0A8070)
-+#define MCF_PCI_PCIIW1BTAR      MCF_REG32(0xFC0A8074)
-+#define MCF_PCI_PCIIW2BTAR      MCF_REG32(0xFC0A8078)
-+#define MCF_PCI_PCIIWCR         MCF_REG32(0xFC0A8080)
-+#define MCF_PCI_PCIICR          MCF_REG32(0xFC0A8084)
-+#define MCF_PCI_PCIISR          MCF_REG32(0xFC0A8088)
-+#define MCF_PCI_PCITCR2         MCF_REG32(0xFC0A808C)
-+#define MCF_PCI_PCITBATR0       MCF_REG32(0xFC0A8090)
-+#define MCF_PCI_PCITBATR1       MCF_REG32(0xFC0A8094)
-+#define MCF_PCI_PCITBATR2       MCF_REG32(0xFC0A8098)
-+#define MCF_PCI_PCITBATR3       MCF_REG32(0xFC0A809C)
-+#define MCF_PCI_PCITBATR4       MCF_REG32(0xFC0A80A0)
-+#define MCF_PCI_PCITBATR5       MCF_REG32(0xFC0A80A4)
-+#define MCF_PCI_PCICAR          MCF_REG32(0xFC0A80F8)
-+
-+/* Parameterized register read/write macros for multiple registers */
-+#define MCF_PCI_PCIIWBTAR(x)    MCF_REG32(0xFC0A8070+((x)*0x004))
-+
-+/* Bit definitions and macros for PCIIDR */
-+#define MCF_PCI_PCIIDR_VENDORID(x)      (((x)&0x0000FFFF))
-+#define MCF_PCI_PCIIDR_DEVICEID(x)      (((x)&0x0000FFFF)<<16)
-+
-+/* Bit definitions and macros for PCISCR */
-+#define MCF_PCI_PCISCR_M        (0x00000002)
-+#define MCF_PCI_PCISCR_B        (0x00000004)
-+#define MCF_PCI_PCISCR_SP       (0x00000008)
-+#define MCF_PCI_PCISCR_MW       (0x00000010)
-+#define MCF_PCI_PCISCR_PER      (0x00000040)
-+#define MCF_PCI_PCISCR_S        (0x00000100)
-+#define MCF_PCI_PCISCR_F        (0x00000200)
-+#define MCF_PCI_PCISCR_C        (0x00100000)
-+#define MCF_PCI_PCISCR_66M      (0x00200000)
-+#define MCF_PCI_PCISCR_R        (0x00400000)
-+#define MCF_PCI_PCISCR_FC       (0x00800000)
-+#define MCF_PCI_PCISCR_DP       (0x01000000)
-+#define MCF_PCI_PCISCR_DT(x)    (((x)&0x00000003)<<25)
-+#define MCF_PCI_PCISCR_TS       (0x08000000)
-+#define MCF_PCI_PCISCR_TR       (0x10000000)
-+#define MCF_PCI_PCISCR_MA       (0x20000000)
-+#define MCF_PCI_PCISCR_SE       (0x40000000)
-+#define MCF_PCI_PCISCR_PE       (0x80000000)
-+
-+/* Bit definitions and macros for PCICCRIR */
-+#define MCF_PCI_PCICCRIR_REVID(x)       (((x)&0x000000FF))
-+#define MCF_PCI_PCICCRIR_CLASSCODE(x)   (((x)&0x00FFFFFF)<<8)
-+
-+/* Bit definitions and macros for PCICR1 */
-+#define MCF_PCI_PCICR1_CACHELINESIZE(x)     (((x)&0x0000000F))
-+#define MCF_PCI_PCICR1_LATTIMER(x)          (((x)&0x000000FF)<<8)
-+#define MCF_PCI_PCICR1_HEADERTYPE(x)        (((x)&0x000000FF)<<16)
-+#define MCF_PCI_PCICR1_BIST(x)              (((x)&0x000000FF)<<24)
-+
-+/* Bit definitions and macros for PCIBAR0 */
-+#define MCF_PCI_PCIBAR0_IO          (0x00000001)
-+#define MCF_PCI_PCIBAR0_RANGE(x)    (((x)&0x00000003)<<1)
-+#define MCF_PCI_PCIBAR0_PREF        (0x00000008)
-+#define MCF_PCI_PCIBAR0_BAR0(x)     (((x)&0x00003FFF)<<18)
-+
-+/* Bit definitions and macros for PCIBAR1 */
-+#define MCF_PCI_PCIBAR1_IO          (0x00000001)
-+#define MCF_PCI_PCIBAR1_PREF        (0x00000008)
-+#define MCF_PCI_PCIBAR1_BAR1(x)     (((x)&0x00000FFF)<<20)
-+
-+/* Bit definitions and macros for PCIBAR2 */
-+#define MCF_PCI_PCIBAR2_IO          (0x00000001)
-+#define MCF_PCI_PCIBAR2_RANGE(x)    (((x)&0x00000003)<<1)
-+#define MCF_PCI_PCIBAR2_PREF        (0x00000008)
-+#define MCF_PCI_PCIBAR2_BAR2(x)     (((x)&0x000003FF)<<22)
-+
-+/* Bit definitions and macros for PCIBAR3 */
-+#define MCF_PCI_PCIBAR3_IO          (0x00000001)
-+#define MCF_PCI_PCIBAR3_PREF        (0x00000008)
-+#define MCF_PCI_PCIBAR3_BAR3(x)     (((x)&0x000000FF)<<24)
-+
-+/* Bit definitions and macros for PCIBAR4 */
-+#define MCF_PCI_PCIBAR4_IO          (0x00000001)
-+#define MCF_PCI_PCIBAR4_RANGE(x)    (((x)&0x00000003)<<1)
-+#define MCF_PCI_PCIBAR4_PREF        (0x00000008)
-+#define MCF_PCI_PCIBAR4_BAR4(x)     (((x)&0x0000001F)<<27)
-+
-+/* Bit definitions and macros for PCIBAR5 */
-+#define MCF_PCI_PCIBAR5_IO          (0x00000001)
-+#define MCF_PCI_PCIBAR5_PREF        (0x00000008)
-+#define MCF_PCI_PCIBAR5_BAR5(x)     (((x)&0x0000000F)<<28)
-+
-+/* Bit definitions and macros for PCISID */
-+#define MCF_PCI_PCISID_VENDORID(x)      (((x)&0x0000FFFF))
-+#define MCF_PCI_PCISID_ID(x)            (((x)&0x0000FFFF)<<16)
-+
-+/* Bit definitions and macros for PCICR2 */
-+#define MCF_PCI_PCICR2_INTLINE(x)   (((x)&0x000000FF))
-+#define MCF_PCI_PCICR2_INTPIN(x)    (((x)&0x000000FF)<<8)
-+#define MCF_PCI_PCICR2_MINGNT(x)    (((x)&0x000000FF)<<16)
-+#define MCF_PCI_PCICR2_MAXLAT(x)    (((x)&0x000000FF)<<24)
-+
-+/* Bit definitions and macros for PCIGSCR */
-+#define MCF_PCI_PCIGSCR_PR      (0x00000001)
-+#define MCF_PCI_PCIGSCR_SEE     (0x00001000)
-+#define MCF_PCI_PCIGSCR_PEE     (0x00002000)
-+#define MCF_PCI_PCIGSCR_SE      (0x10000000)
-+#define MCF_PCI_PCIGSCR_PE      (0x20000000)
-+
-+/* Bit definitions and macros for PCITBATR0A */
-+#define MCF_PCI_PCITBATR0A_EN           (0x00000001)
-+#define MCF_PCI_PCITBATR0A_BAT0(x)      (((x)&0x00003FFF)<<18)
-+
-+/* Bit definitions and macros for PCITBATR1A */
-+#define MCF_PCI_PCITBATR1A_EN           (0x00000001)
-+#define MCF_PCI_PCITBATR1A_BAT1(x)      (((x)&0x00000FFF)<<20)
-+
-+/* Bit definitions and macros for PCITCR */
-+#define MCF_PCI_PCITCR_WCT(x)   (((x)&0x000000FF))
-+#define MCF_PCI_PCITCR_WCD      (0x00000100)
-+#define MCF_PCI_PCITCR_P        (0x00010000)
-+#define MCF_PCI_PCITCR_PID      (0x00020000)
-+#define MCF_PCI_PCITCR_LD       (0x01000000)
-+
-+/* Bit definitions and macros for PCIIWBTAR group */
-+#define MCF_PCI_PCIIWBTAR_WBA(x)    ((((x)&0xFF000000)))
-+#define MCF_PCI_PCIIWBTAR_WAM(x)    ((((x)&0xFF000000)
-+#define MCF_PCI_PCIIWBTAR_WTA(x)    ((((x)&0xFF000000)
-+
-+/* Bit definitions and macros for PCIIW0BTAR */
-+#define MCF_PCI_PCIIW0BTAR_WBA(x)   ((((x)&0xFF000000)))
-+#define MCF_PCI_PCIIW0BTAR_WAM(x)   ((((x)&0xFF000000)
-+#define MCF_PCI_PCIIW0BTAR_WTA(x)   ((((x)&0xFF000000)
-+
-+/* Bit definitions and macros for PCIIWCR */
-+#define MCF_PCI_PCIIWCR_WINCTRL2(x)             (((x)&0x0000000F)<<8)
-+#define MCF_PCI_PCIIWCR_WINCTRL1(x)             (((x)&0x0000000F)<<16)
-+#define MCF_PCI_PCIIWCR_WINCTRL0(x)             (((x)&0x0000000F)<<24)
-+#define MCF_PCI_PCIIWCR_WINCTRL0_ENABLE         (0x01000000)
-+#define MCF_PCI_PCIIWCR_WINCTRL0_MEMREAD        (0x01000000)
-+#define MCF_PCI_PCIIWCR_WINCTRL0_MEMRDLINE      (0x03000000)
-+#define MCF_PCI_PCIIWCR_WINCTRL0_MEMRDMUL       (0x05000000)
-+#define MCF_PCI_PCIIWCR_WINCTRL0_IO             (0x09000000)
-+#define MCF_PCI_PCIIWCR_WINCTRL1_MEMREAD        (0x00010000)
-+#define MCF_PCI_PCIIWCR_WINCTRL1_ENABLE         (0x00010000)
-+#define MCF_PCI_PCIIWCR_WINCTRL1_MEMRDLINE      (0x00030000)
-+#define MCF_PCI_PCIIWCR_WINCTRL1_MEMRDMUL       (0x00050000)
-+#define MCF_PCI_PCIIWCR_WINCTRL1_IO             (0x00090000)
-+#define MCF_PCI_PCIIWCR_WINCTRL2_ENABLE         (0x00000100)
-+#define MCF_PCI_PCIIWCR_WINCTRL2_MEMREAD        (0x00000100)
-+#define MCF_PCI_PCIIWCR_WINCTRL2_MEMRDLINE      (0x00000300)
-+#define MCF_PCI_PCIIWCR_WINCTRL2_MEMRDMUL       (0x00000500)
-+#define MCF_PCI_PCIIWCR_WINCTRL2_IO             (0x00000900)
-+
-+/* Bit definitions and macros for PCIICR */
-+#define MCF_PCI_PCIICR_MAXRETRY(x)      (((x)&0x000000FF))
-+#define MCF_PCI_PCIICR_TAE              (0x01000000)
-+#define MCF_PCI_PCIICR_IAE              (0x02000000)
-+#define MCF_PCI_PCIICR_REE              (0x04000000)
-+
-+/* Bit definitions and macros for PCIISR */
-+#define MCF_PCI_PCIISR_TA       (0x01000000)
-+#define MCF_PCI_PCIISR_IA       (0x02000000)
-+#define MCF_PCI_PCIISR_RE       (0x04000000)
-+
-+/* Bit definitions and macros for PCITCR2 */
-+#define MCF_PCI_PCITCR2_CR      (0x00000001)
-+#define MCF_PCI_PCITCR2_B0E     (0x00000100)
-+#define MCF_PCI_PCITCR2_B1E     (0x00000200)
-+#define MCF_PCI_PCITCR2_B2E     (0x00000400)
-+#define MCF_PCI_PCITCR2_B3E     (0x00000800)
-+#define MCF_PCI_PCITCR2_B4E     (0x00001000)
-+#define MCF_PCI_PCITCR2_B5E     (0x00002000)
-+
-+/* Bit definitions and macros for PCITBATR0 */
-+#define MCF_PCI_PCITBATR0_EN        (0x00000001)
-+#define MCF_PCI_PCITBATR0_BAT0(x)   (((x)&0x00003FFF)<<18)
-+
-+/* Bit definitions and macros for PCITBATR1 */
-+#define MCF_PCI_PCITBATR1_EN        (0x00000001)
-+#define MCF_PCI_PCITBATR1_BAT1(x)   (((x)&0x00000FFF)<<20)
-+
-+/* Bit definitions and macros for PCITBATR2 */
-+#define MCF_PCI_PCITBATR2_EN        (0x00000001)
-+#define MCF_PCI_PCITBATR2_BAT2(x)   (((x)&0x000003FF)<<22)
-+
-+/* Bit definitions and macros for PCITBATR3 */
-+#define MCF_PCI_PCITBATR3_EN        (0x00000001)
-+#define MCF_PCI_PCITBATR3_BAT3(x)   (((x)&0x000000FF)<<24)
-+
-+/* Bit definitions and macros for PCITBATR4 */
-+#define MCF_PCI_PCITBATR4_EN        (0x00000001)
-+#define MCF_PCI_PCITBATR4_BAT4(x)   (((x)&0x0000001F)<<27)
-+
-+/* Bit definitions and macros for PCITBATR5 */
-+#define MCF_PCI_PCITBATR5_EN        (0x00000001)
-+#define MCF_PCI_PCITBATR5_BAT5(x)   (((x)&0x0000000F)<<28)
-+
-+/* Bit definitions and macros for PCICAR */
-+#define MCF_PCI_PCICAR_DWORD(x)     ((x)&0x000000FC)
-+#define MCF_PCI_PCICAR_FUNCNUM(x)   (((x)&0x00000007)<<8)
-+#define MCF_PCI_PCICAR_DEVNUM(x)    (((x)&0x0000001F)<<11)
-+#define MCF_PCI_PCICAR_BUSNUM(x)    (((x)&0x000000FF)<<16)
-+#define MCF_PCI_PCICAR_E            (0x80000000)
-+
-+/********************************************************************/
-+
-+#endif /* __MCF5445X_PCI_H__ */
---- /dev/null
-+++ b/include/asm-m68k/mcf5445x_pciarb.h
-@@ -0,0 +1,40 @@
-+/*
-+ * Kurt Mahan kmahan@freescale.com
-+ *
-+ * Copyright Freescale Semiconductor, Inc. 2007
-+ *
-+ * 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.
-+ */
-+
-+#ifndef __MCF5445X_PCIARB_H__
-+#define __MCF5445X_PCIARB_H__
-+
-+/*********************************************************************
-+*
-+* PCI Arbiter Module (PCIARB)
-+*
-+*********************************************************************/
-+
-+/* Register read/write macros */
-+#define MCF_PCIARB_PACR         	MCF_REG32(0xFC0AC000)
-+#define MCF_PCIARB_PASR         	MCF_REG32(0xFC0AC004)
-+
-+/* Bit definitions and macros for PACR */
-+#define MCF_PCIARB_PACR_INTMPRI         (0x00000001)
-+#define MCF_PCIARB_PACR_EXTMPRI(x)      (((x)&0x0000001F)<<1)
-+#define MCF_PCIARB_PACR_RA              (0x00008000)
-+#define MCF_PCIARB_PACR_INTMINTEN       (0x00010000)
-+#define MCF_PCIARB_PACR_EXTMINTEN(x)    (((x)&0x0000001F)<<17)
-+#define MCF_PCIARB_PACR_PKMD            (0x40000000)
-+#define MCF_PCIARB_PACR_DS              (0x80000000)
-+
-+/* Bit definitions and macros for PASR */
-+#define MCF_PCIARB_PASR_ITLMBK      	(0x00010000)
-+#define MCF_PCIARB_PASR_EXTMBK(x)   	(((x)&0x0000001F)<<17)
-+
-+/********************************************************************/
-+
-+#endif /* __MCF5445X_PCIARB_H__ */
---- /dev/null
-+++ b/include/asm-m68k/mcf5445x_sdramc.h
-@@ -0,0 +1,115 @@
-+/*
-+ * Matt Waddel Matt.Waddel@freescale.com
-+ *
-+ * Copyright Freescale Semiconductor, Inc. 2007
-+ *
-+ * 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.
-+ */
-+
-+#ifndef __MCF5445X_SDRAMC_H__
-+#define __MCF5445X_SDRAMC_H__
-+
-+/*********************************************************************
-+*
-+* SDRAM Controller (SDRAMC)
-+*
-+*********************************************************************/
-+
-+/* Register read/write macros */
-+#define MCF_SDRAMC_SDMR         (*(vuint32 *)(0xFC0B8000))   /* SDRAM Mode/Extended Mode Register */
-+#define MCF_SDRAMC_SDCR         (*(vuint32 *)(0xFC0B8004))   /* SDRAM Control Register */
-+#define MCF_SDRAMC_SDCFG1       (*(vuint32 *)(0xFC0B8008))   /* SDRAM Configuration Register 1 */
-+#define MCF_SDRAMC_SDCFG2       (*(vuint32 *)(0xFC0B800C))   /* SDRAM Configuration Register 2 */
-+#define MCF_SDRAMC_SDCS0        (*(vuint32 *)(0xFC0B8110))   /* SDRAM Chip Select Register */
-+#define MCF_SDRAMC_SDCS1        (*(vuint32 *)(0xFC0B8114))   /* SDRAM Chip Select Register */
-+
-+/* Parameterized register read/write macros for multiple registers */
-+#define MCF_SDRAMC_SDCS(x)      (*(vuint32 *)(0xFC0B8110+((x)*0x004)))   /* SDRAM Chip Select Register */
-+
-+/* Bit definitions and macros for SDMR */
-+#define MCF_SDRAMC_SDMR_DDR2_AD(x)      (((x)&0x00003FFF))      /* Address for DDR2 */
-+#define MCF_SDRAMC_SDMR_CMD             (0x00010000)            /* Command */
-+#define MCF_SDRAMC_SDMR_AD(x)           (((x)&0x00000FFF)<<18)  /* Address */
-+#define MCF_SDRAMC_SDMR_BK(x)           (((x)&0x00000003)<<30)  /* Bank Address */
-+#define MCF_SDRAMC_SDMR_BK_LMR          (0x00000000)
-+#define MCF_SDRAMC_SDMR_BK_LEMR         (0x40000000)
-+
-+/* Bit definitions and macros for SDCR */
-+#define MCF_SDRAMC_SDCR_DPD             (0x00000001)            /* Deep Power-Down Mode */
-+#define MCF_SDRAMC_SDCR_IPALL           (0x00000002)            /* Initiate Precharge All */
-+#define MCF_SDRAMC_SDCR_IREF            (0x00000004)            /* Initiate Refresh */
-+#define MCF_SDRAMC_SDCR_DQS_OE(x)       (((x)&0x00000003)<<10)  /* DQS Output Enable */
-+#define MCF_SDRAMC_SDCR_MEM_PS          (0x00002000)            /* Data Port Size */
-+#define MCF_SDRAMC_SDCR_REF_CNT(x)      (((x)&0x0000003F)<<16)  /* Periodic Refresh Counter */
-+#define MCF_SDRAMC_SDCR_OE_RULE         (0x00400000)            /* Drive Rule Selection */
-+#define MCF_SDRAMC_SDCR_ADDR_MUX(x)     (((x)&0x00000003)<<24)  /* Internal Address Mux Select */
-+#define MCF_SDRAMC_SDCR_DDR2_MODE       (0x08000000)            /* DDR2 Mode Select */
-+#define MCF_SDRAMC_SDCR_REF_EN          (0x10000000)            /* Refresh Enable */
-+#define MCF_SDRAMC_SDCR_DDR_MODE        (0x20000000)            /* DDR Mode Select */
-+#define MCF_SDRAMC_SDCR_CKE             (0x40000000)            /* Clock Enable */
-+#define MCF_SDRAMC_SDCR_MODE_EN         (0x80000000)            /* SDRAM Mode Register Programming Enable */
-+#define MCF_SDRAMC_SDCR_DQS_OE_BOTH     (0x00000C00)
-+
-+/* Bit definitions and macros for SDCFG1 */
-+#define MCF_SDRAMC_SDCFG1_WT_LAT(x)     (((x)&0x00000007)<<4)   /* Write Latency */
-+#define MCF_SDRAMC_SDCFG1_REF2ACT(x)    (((x)&0x0000000F)<<8)   /* Refresh to active delay */
-+#define MCF_SDRAMC_SDCFG1_PRE2ACT(x)    (((x)&0x00000007)<<12)  /* Precharge to active delay */
-+#define MCF_SDRAMC_SDCFG1_ACT2RW(x)     (((x)&0x00000007)<<16)  /* Active to read/write delay */
-+#define MCF_SDRAMC_SDCFG1_RD_LAT(x)     (((x)&0x0000000F)<<20)  /* Read CAS Latency */
-+#define MCF_SDRAMC_SDCFG1_SWT2RWP(x)    (((x)&0x00000007)<<24)  /* Single write to read/write/precharge delay */
-+#define MCF_SDRAMC_SDCFG1_SRD2RWP(x)    (((x)&0x0000000F)<<28)  /* Single read to read/write/precharge delay */
-+
-+/* Bit definitions and macros for SDCFG2 */
-+#define MCF_SDRAMC_SDCFG2_BL(x)         (((x)&0x0000000F)<<16)  /* Burst Length */
-+#define MCF_SDRAMC_SDCFG2_BRD2W(x)      (((x)&0x0000000F)<<20)  /* Burst read to write delay */
-+#define MCF_SDRAMC_SDCFG2_BWT2RWP(x)    (((x)&0x0000000F)<<24)  /* Burst write to read/write/precharge delay */
-+#define MCF_SDRAMC_SDCFG2_BRD2RP(x)     (((x)&0x0000000F)<<28)  /* Burst read to read/precharge delay */
-+
-+/* Bit definitions and macros for SDCS group */
-+#define MCF_SDRAMC_SDCS_CSSZ(x)         (((x)&0x0000001F))      /* Chip-Select Size */
-+#define MCF_SDRAMC_SDCS_CSBA(x)         (((x)&0x00000FFF)<<20)  /* Chip-Select Base Address */
-+#define MCF_SDRAMC_SDCS_BA(x)           ((x)&0xFFF00000)
-+#define MCF_SDRAMC_SDCS_CSSZ_DISABLE    (0x00000000)
-+#define MCF_SDRAMC_SDCS_CSSZ_1MBYTE     (0x00000013)
-+#define MCF_SDRAMC_SDCS_CSSZ_2MBYTE     (0x00000014)
-+#define MCF_SDRAMC_SDCS_CSSZ_4MBYTE     (0x00000015)
-+#define MCF_SDRAMC_SDCS_CSSZ_8MBYTE     (0x00000016)
-+#define MCF_SDRAMC_SDCS_CSSZ_16MBYTE    (0x00000017)
-+#define MCF_SDRAMC_SDCS_CSSZ_32MBYTE    (0x00000018)
-+#define MCF_SDRAMC_SDCS_CSSZ_64MBYTE    (0x00000019)
-+#define MCF_SDRAMC_SDCS_CSSZ_128MBYTE   (0x0000001A)
-+#define MCF_SDRAMC_SDCS_CSSZ_256MBYTE   (0x0000001B)
-+#define MCF_SDRAMC_SDCS_CSSZ_512MBYTE   (0x0000001C)
-+#define MCF_SDRAMC_SDCS_CSSZ_1GBYTE     (0x0000001D)
-+#define MCF_SDRAMC_SDCS_CSSZ_2GBYTE     (0x0000001E)
-+#define MCF_SDRAMC_SDCS_CSSZ_4GBYTE     (0x0000001F)
-+
-+/* Bit definitions and macros for SDCS0 */
-+#define MCF_SDRAMC_SDCS0_CSSZ(x)            (((x)&0x0000001F))      /* Chip-Select Size */
-+#define MCF_SDRAMC_SDCS0_CSBA(x)            (((x)&0x00000FFF)<<20)  /* Chip-Select Base Address */
-+#define MCF_SDRAMC_SDCS0_BA(x)              ((x)&0xFFF00000)
-+#define MCF_SDRAMC_SDCS0_CSSZ_DISABLE       (0x00000000)
-+#define MCF_SDRAMC_SDCS0_CSSZ_1MBYTE        (0x00000013)
-+#define MCF_SDRAMC_SDCS0_CSSZ_2MBYTE        (0x00000014)
-+#define MCF_SDRAMC_SDCS0_CSSZ_4MBYTE        (0x00000015)
-+#define MCF_SDRAMC_SDCS0_CSSZ_8MBYTE        (0x00000016)
-+#define MCF_SDRAMC_SDCS0_CSSZ_16MBYTE       (0x00000017)
-+#define MCF_SDRAMC_SDCS0_CSSZ_32MBYTE       (0x00000018)
-+#define MCF_SDRAMC_SDCS0_CSSZ_64MBYTE       (0x00000019)
-+#define MCF_SDRAMC_SDCS0_CSSZ_128MBYTE      (0x0000001A)
-+#define MCF_SDRAMC_SDCS0_CSSZ_256MBYTE      (0x0000001B)
-+#define MCF_SDRAMC_SDCS0_CSSZ_512MBYTE      (0x0000001C)
-+#define MCF_SDRAMC_SDCS0_CSSZ_1GBYTE        (0x0000001D)
-+#define MCF_SDRAMC_SDCS0_CSSZ_2GBYTE        (0x0000001E)
-+#define MCF_SDRAMC_SDCS0_CSSZ_4GBYTE        (0x0000001F)
-+
-+/* Bit definitions and macros for SDCS1 */
-+#define MCF_SDRAMC_SDCS1_CSSZ(x)    (((x)&0x0000001F))      /* Chip-Select Size */
-+#define MCF_SDRAMC_SDCS1_CSBA(x)    (((x)&0x00000FFF)<<20)  /* Chip-Select Base Address */
-+
-+/********************************************************************/
-+
-+#endif /* __MCF5445X_SDRAMC_H__ */
---- /dev/null
-+++ b/include/asm-m68k/mcf5445x_ssi.h
-@@ -0,0 +1,187 @@
-+/*
-+ * Yaroslav Vinogradov yaroslav.vinogradov@freescale.com
-+ *
-+ * Copyright Freescale Semiconductor, Inc. 2007
-+ *
-+ * 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.
-+ */
-+
-+#ifndef __MCF5445X_SSI_H__
-+#define __MCF5445X_SSI_H__
-+
-+/*********************************************************************
-+*
-+* Synchronous Serial Interface (SSI)
-+*
-+*********************************************************************/
-+
-+/* Register read/write macros */
-+#define MCF_SSI_TX0             MCF_REG32(0xFC0BC000)
-+#define MCF_SSI_TX1             MCF_REG32(0xFC0BC004)
-+#define MCF_SSI_RX0             MCF_REG32(0xFC0BC008)
-+#define MCF_SSI_RX1             MCF_REG32(0xFC0BC00C)
-+#define MCF_SSI_CR              MCF_REG32(0xFC0BC010)
-+#define MCF_SSI_ISR             MCF_REG32(0xFC0BC014)
-+#define MCF_SSI_IER             MCF_REG32(0xFC0BC018)
-+#define MCF_SSI_TCR             MCF_REG32(0xFC0BC01C)
-+#define MCF_SSI_RCR             MCF_REG32(0xFC0BC020)
-+#define MCF_SSI_CCR             MCF_REG32(0xFC0BC024)
-+#define MCF_SSI_FCSR            MCF_REG32(0xFC0BC02C)
-+#define MCF_SSI_ACR             MCF_REG32(0xFC0BC038)
-+#define MCF_SSI_ACADD           MCF_REG32(0xFC0BC03C)
-+#define MCF_SSI_ACDAT           MCF_REG32(0xFC0BC040)
-+#define MCF_SSI_ATAG            MCF_REG32(0xFC0BC044)
-+#define MCF_SSI_TMASK           MCF_REG32(0xFC0BC048)
-+#define MCF_SSI_RMASK           MCF_REG32(0xFC0BC04C)
-+
-+/* Parameterized register read/write macros for multiple registers */
-+#define MCF_SSI_TX(x)           MCF_REG32(0xFC0BC000+((x)*0x004))
-+#define MCF_SSI_RX(x)           MCF_REG32(0xFC0BC008+((x)*0x004))
-+
-+/* Bit definitions and macros for TX group */
-+#define MCF_SSI_TX_SSI_TX(x)    (x)
-+
-+/* Bit definitions and macros for TX0 */
-+#define MCF_SSI_TX0_SSI_TX(x)   (x)
-+
-+/* Bit definitions and macros for TX1 */
-+#define MCF_SSI_TX1_SSI_TX(x)   (x)
-+
-+/* Bit definitions and macros for RX group */
-+#define MCF_SSI_RX_SSI_RX(x)    (x)
-+
-+/* Bit definitions and macros for RX0 */
-+#define MCF_SSI_RX0_SSI_RX(x)   (x)
-+
-+/* Bit definitions and macros for RX1 */
-+#define MCF_SSI_RX1_SSI_RX(x)   (x)
-+
-+/* Bit definitions and macros for CR */
-+#define MCF_SSI_CR_SSI_EN       (0x00000001)
-+#define MCF_SSI_CR_TE           (0x00000002)
-+#define MCF_SSI_CR_RE           (0x00000004)
-+#define MCF_SSI_CR_NET          (0x00000008)
-+#define MCF_SSI_CR_SYN          (0x00000010)
-+#define MCF_SSI_CR_I2S(x)       (((x)&0x00000003)<<5)
-+#define MCF_SSI_CR_MCE          (0x00000080)
-+#define MCF_SSI_CR_TCH          (0x00000100)
-+#define MCF_SSI_CR_CIS          (0x00000200)
-+#define MCF_SSI_CR_I2S_NORMAL   (0x00000000)
-+#define MCF_SSI_CR_I2S_MASTER   (0x00000020)
-+#define MCF_SSI_CR_I2S_SLAVE    (0x00000040)
-+
-+/* Bit definitions and macros for ISR */
-+#define MCF_SSI_ISR_TFE0        (0x00000001)
-+#define MCF_SSI_ISR_TFE1        (0x00000002)
-+#define MCF_SSI_ISR_RFF0        (0x00000004)
-+#define MCF_SSI_ISR_RFF1        (0x00000008)
-+#define MCF_SSI_ISR_RLS         (0x00000010)
-+#define MCF_SSI_ISR_TLS         (0x00000020)
-+#define MCF_SSI_ISR_RFS         (0x00000040)
-+#define MCF_SSI_ISR_TFS         (0x00000080)
-+#define MCF_SSI_ISR_TUE0        (0x00000100)
-+#define MCF_SSI_ISR_TUE1        (0x00000200)
-+#define MCF_SSI_ISR_ROE0        (0x00000400)
-+#define MCF_SSI_ISR_ROE1        (0x00000800)
-+#define MCF_SSI_ISR_TDE0        (0x00001000)
-+#define MCF_SSI_ISR_TDE1        (0x00002000)
-+#define MCF_SSI_ISR_RDR0        (0x00004000)
-+#define MCF_SSI_ISR_RDR1        (0x00008000)
-+#define MCF_SSI_ISR_RXT         (0x00010000)
-+#define MCF_SSI_ISR_CMDDU       (0x00020000)
-+#define MCF_SSI_ISR_CMDAU       (0x00040000)
-+
-+/* Bit definitions and macros for IER */
-+#define MCF_SSI_IER_TFE0        (0x00000001)
-+#define MCF_SSI_IER_TFE1        (0x00000002)
-+#define MCF_SSI_IER_RFF0        (0x00000004)
-+#define MCF_SSI_IER_RFF1        (0x00000008)
-+#define MCF_SSI_IER_RLS         (0x00000010)
-+#define MCF_SSI_IER_TLS         (0x00000020)
-+#define MCF_SSI_IER_RFS         (0x00000040)
-+#define MCF_SSI_IER_TFS         (0x00000080)
-+#define MCF_SSI_IER_TUE0        (0x00000100)
-+#define MCF_SSI_IER_TUE1        (0x00000200)
-+#define MCF_SSI_IER_ROE0        (0x00000400)
-+#define MCF_SSI_IER_ROE1        (0x00000800)
-+#define MCF_SSI_IER_TDE0        (0x00001000)
-+#define MCF_SSI_IER_TDE1        (0x00002000)
-+#define MCF_SSI_IER_RDR0        (0x00004000)
-+#define MCF_SSI_IER_RDR1        (0x00008000)
-+#define MCF_SSI_IER_RXT         (0x00010000)
-+#define MCF_SSI_IER_CMDU        (0x00020000)
-+#define MCF_SSI_IER_CMDAU       (0x00040000)
-+#define MCF_SSI_IER_TIE         (0x00080000)
-+#define MCF_SSI_IER_TDMAE       (0x00100000)
-+#define MCF_SSI_IER_RIE         (0x00200000)
-+#define MCF_SSI_IER_RDMAE       (0x00400000)
-+
-+/* Bit definitions and macros for TCR */
-+#define MCF_SSI_TCR_TEFS        (0x00000001)
-+#define MCF_SSI_TCR_TFSL        (0x00000002)
-+#define MCF_SSI_TCR_TFSI        (0x00000004)
-+#define MCF_SSI_TCR_TSCKP       (0x00000008)
-+#define MCF_SSI_TCR_TSHFD       (0x00000010)
-+#define MCF_SSI_TCR_TXDIR       (0x00000020)
-+#define MCF_SSI_TCR_TFDIR       (0x00000040)
-+#define MCF_SSI_TCR_TFEN0       (0x00000080)
-+#define MCF_SSI_TCR_TFEN1       (0x00000100)
-+#define MCF_SSI_TCR_TXBIT0      (0x00000200)
-+
-+/* Bit definitions and macros for RCR */
-+#define MCF_SSI_RCR_REFS        (0x00000001)
-+#define MCF_SSI_RCR_RFSL        (0x00000002)
-+#define MCF_SSI_RCR_RFSI        (0x00000004)
-+#define MCF_SSI_RCR_RSCKP       (0x00000008)
-+#define MCF_SSI_RCR_RSHFD       (0x00000010)
-+#define MCF_SSI_RCR_RFEN0       (0x00000080)
-+#define MCF_SSI_RCR_RFEN1       (0x00000100)
-+#define MCF_SSI_RCR_RXBIT0      (0x00000200)
-+#define MCF_SSI_RCR_RXEXT       (0x00000400)
-+
-+/* Bit definitions and macros for CCR */
-+#define MCF_SSI_CCR_PM(x)       (((x)&0x000000FF))
-+#define MCF_SSI_CCR_DC(x)       (((x)&0x0000001F)<<8)
-+#define MCF_SSI_CCR_WL(x)       (((x)&0x0000000F)<<13)
-+#define MCF_SSI_CCR_PSR         (0x00020000)
-+#define MCF_SSI_CCR_DIV2        (0x00040000)
-+
-+/* Bit definitions and macros for FCSR */
-+#define MCF_SSI_FCSR_TFWM0(x)       (((x)&0x0000000F))
-+#define MCF_SSI_FCSR_RFWM0(x)       (((x)&0x0000000F)<<4)
-+#define MCF_SSI_FCSR_TFCNT0(x)      (((x)&0x0000000F)<<8)
-+#define MCF_SSI_FCSR_RFCNT0(x)      (((x)&0x0000000F)<<12)
-+#define MCF_SSI_FCSR_TFWM1(x)       (((x)&0x0000000F)<<16)
-+#define MCF_SSI_FCSR_RFWM1(x)       (((x)&0x0000000F)<<20)
-+#define MCF_SSI_FCSR_TFCNT1(x)      (((x)&0x0000000F)<<24)
-+#define MCF_SSI_FCSR_RFCNT1(x)      (((x)&0x0000000F)<<28)
-+
-+/* Bit definitions and macros for ACR */
-+#define MCF_SSI_ACR_AC97EN      (0x00000001)
-+#define MCF_SSI_ACR_FV          (0x00000002)
-+#define MCF_SSI_ACR_TIF         (0x00000004)
-+#define MCF_SSI_ACR_RD          (0x00000008)
-+#define MCF_SSI_ACR_WR          (0x00000010)
-+#define MCF_SSI_ACR_FRDIV(x)    (((x)&0x0000003F)<<5)
-+
-+/* Bit definitions and macros for ACADD */
-+#define MCF_SSI_ACADD_SSI_ACADD(x)      (((x)&0x0007FFFF))
-+
-+/* Bit definitions and macros for ACDAT */
-+#define MCF_SSI_ACDAT_SSI_ACDAT(x)      (((x)&0x0007FFFF))
-+
-+/* Bit definitions and macros for ATAG */
-+#define MCF_SSI_ATAG_DDI_ATAG(x)    (((x)&0x0000FFFF))
-+
-+/* Bit definitions and macros for TMASK */
-+#define MCF_SSI_TMASK_SSI_TMASK(x)      (x)
-+
-+/* Bit definitions and macros for RMASK */
-+#define MCF_SSI_RMASK_SSI_RMASK(x)      (x)
-+
-+/********************************************************************/
-+
-+#endif /* __MCF5445X_SSI_H__ */
---- /dev/null
-+++ b/include/asm-m68k/mcf5445x_usb.h
-@@ -0,0 +1,49 @@
-+/*
-+ * Duck Schmid duck@freescale.com
-+ *
-+ * Copyright 2005-2007 Freescale Semiconductor, Inc. All Rights Reserved.
-+ */
-+
-+/*
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+#include <asm/mcfsim.h>
-+
-+/* ehci_arc_hc_driver.flags value */
-+#define FSL_PLATFORM_HC_FLAGS (HCD_USB2 | HCD_MEMORY)
-+
-+static inline int fsl_platform_verify(struct platform_device *pdev)
-+{
-+	return 0;
-+}
-+
-+static inline void fsl_platform_usb_setup(struct usb_hcd *hcd)
-+{
-+}
-+
-+static inline void fsl_platform_set_host_mode(struct usb_hcd *hcd)
-+{
-+	unsigned int temp;
-+	struct fsl_usb2_platform_data *pdata;
-+	struct fsl_usb_host_regs *regs;
-+
-+	pdata = hcd->self.controller->platform_data;
-+	regs = pdata->regs;
-+
-+	if (pdata->xcvr_ops && pdata->xcvr_ops->set_host)
-+		pdata->xcvr_ops->set_host();
-+
-+	/* set host mode and select "big endian" */
-+	temp = fsl_readl(&regs->usbmode);
-+	fsl_writel(temp | USBMODE_CM_HOST | USBMODE_ES, &regs->usbmode);
-+
-+	pr_debug("%s: set usbmode to 0x%x\n\n", __FUNCTION__,
-+		fsl_readl(&regs->usbmode));
-+
-+}
diff --git a/target/linux/coldfire/patches/005-mcfv4e_kernel_mods.patch b/target/linux/coldfire/patches/005-mcfv4e_kernel_mods.patch
deleted file mode 100644
index 05ffbd648..000000000
--- a/target/linux/coldfire/patches/005-mcfv4e_kernel_mods.patch
+++ /dev/null
@@ -1,571 +0,0 @@
-From 823ad3e6e88353226ec28f48183a467181887a1b Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Wed, 31 Oct 2007 16:56:09 -0600
-Subject: [PATCH] Core Coldfire/MCF54455 kernel changes.
-
-LTIBName: mcfv4e-kernel-mods
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/Kconfig              |   65 ++++++++++++++++++++++++++++++++++++++-
- arch/m68k/Kconfig.debug        |    9 +++++
- arch/m68k/Makefile             |   14 ++++++++
- arch/m68k/kernel/Makefile      |   15 ++++++---
- arch/m68k/kernel/asm-offsets.c |    7 ++++
- arch/m68k/kernel/dma.c         |   17 ++++++++++
- arch/m68k/kernel/process.c     |   57 +++++++++++++++++++++++++++++++++++
- arch/m68k/kernel/setup.c       |   49 ++++++++++++++++++++++++++----
- arch/m68k/kernel/time.c        |    5 +++
- arch/m68k/kernel/vmlinux.lds.S |    2 +
- 10 files changed, 227 insertions(+), 13 deletions(-)
-
---- a/arch/m68k/Kconfig
-+++ b/arch/m68k/Kconfig
-@@ -119,6 +119,20 @@ config SUN3
- 
- 	  If you don't want to compile a kernel exclusively for a Sun 3, say N.
- 
-+config COLDFIRE
-+	bool "ColdFire V4e support"
-+	default y
-+	select CFV4E
-+	help
-+	  Say Y if you want to build a kernel to run on one of the ColdFire
-+	  V4e boards.
-+
-+config CFV4E
-+	bool
-+	depends on COLDFIRE
-+	select MMU_CFV4E if MMU
-+	default y
-+
- config AMIGA
- 	bool "Amiga support"
- 	depends on !MMU_SUN3
-@@ -294,14 +308,53 @@ config M68060
- 	  If you anticipate running this kernel on a computer with a MC68060
- 	  processor, say Y. Otherwise, say N.
- 
-+config M54455
-+	bool "MCF54455 support"
-+	depends on COLDFIRE
-+	default y
-+	help
-+          This option will add support for the MCF54455 processor with mmu.
-+
-+config MCFCLK
-+	int "M54455EVB System Clock"
-+	depends on M54455
-+	default 266666666
-+	help
-+	  System clock for EVB.  Usually 266MHz for u-boot and 200MHz for dBUG.
-+
-+config MCF_USER_HALT
-+	bool "Coldfire User Halt Enable"
-+	depends on M54455
-+	default n
-+	help
-+	  Enables the HALT instruction in User Mode.
-+
- config MMU_MOTOROLA
- 	bool
--	depends on MMU && !MMU_SUN3
-+	depends on MMU && !MMU_SUN3 && !COLDFIRE
- 	default y
- 
- config MMU_SUN3
- 	bool
- 
-+config MMU_CFV4E
-+	bool
-+
-+config SDRAM_BASE
-+	hex
-+	depends on M54455
-+	default 0x40000000
-+
-+config SDRAM_SIZE
-+	hex
-+	depends on M54455
-+	default 0x0FFFFFFF
-+
-+config NOR_FLASH_BASE
-+	hex "NOR Flash Base Address"
-+	depends on M54455
-+	default 0x00000000
-+
- config M68KFPU_EMU
- 	bool "Math emulation support (EXPERIMENTAL)"
- 	depends on EXPERIMENTAL
-@@ -468,6 +521,14 @@ config ZONE_DMA
- source "drivers/pci/Kconfig"
- 
- source "drivers/zorro/Kconfig"
-+endmenu
-+
-+menu "Power management options"
-+
-+config PM
-+	bool "Power Management support"
-+	help
-+	  Support processor power management modes
- 
- endmenu
- 
-@@ -647,7 +708,7 @@ config DN_SERIAL
- 
- config SERIAL_CONSOLE
- 	bool "Support for serial port console"
--	depends on (AMIGA || ATARI || MAC || SUN3 || SUN3X || VME || APOLLO) && (ATARI_MFPSER=y || ATARI_SCC=y || ATARI_MIDI=y || MAC_SCC=y || AMIGA_BUILTIN_SERIAL=y || GVPIOEXT=y || MULTIFACE_III_TTY=y || SERIAL=y || MVME147_SCC || SERIAL167 || MVME162_SCC || BVME6000_SCC || DN_SERIAL)
-+	depends on (AMIGA || ATARI || MAC || SUN3 || SUN3X || VME || APOLLO || COLDFIRE) && (ATARI_MFPSER=y || ATARI_SCC=y || ATARI_MIDI=y || MAC_SCC=y || AMIGA_BUILTIN_SERIAL=y || GVPIOEXT=y || MULTIFACE_III_TTY=y || SERIAL=y || MVME147_SCC || SERIAL167 || MVME162_SCC || BVME6000_SCC || DN_SERIAL || SERIAL_COLDFIRE)
- 	---help---
- 	  If you say Y here, it will be possible to use a serial port as the
- 	  system console (the system console is the device which receives all
---- a/arch/m68k/Kconfig.debug
-+++ b/arch/m68k/Kconfig.debug
-@@ -2,4 +2,13 @@ menu "Kernel hacking"
- 
- source "lib/Kconfig.debug"
- 
-+config BOOTPARAM
-+	bool 'Compiled-in Kernel Boot Parameter'
-+	depends on COLDFIRE
-+
-+config BOOTPARAM_STRING
-+	string 'Kernel Boot Parameter'
-+	default 'console=ttyS0,115200'
-+	depends on BOOTPARAM
-+
- endmenu
---- a/arch/m68k/Makefile
-+++ b/arch/m68k/Makefile
-@@ -16,7 +16,9 @@
- KBUILD_DEFCONFIG := amiga_defconfig
- 
- # override top level makefile
-+ifndef CONFIG_COLDFIRE
- AS += -m68020
-+endif
- LDFLAGS := -m m68kelf
- LDFLAGS_MODULE += -T $(srctree)/arch/m68k/kernel/module.lds
- ifneq ($(SUBARCH),$(ARCH))
-@@ -36,6 +38,7 @@ CHECKFLAGS += -D__mc68000__
- KBUILD_CFLAGS += -pipe -fno-strength-reduce -ffixed-a2
- 
- # enable processor switch if compiled only for a single cpu
-+ifndef CONFIG_COLDFIRE
- ifndef CONFIG_M68020
- ifndef CONFIG_M68030
- 
-@@ -49,6 +52,12 @@ endif
- 
- endif
- endif
-+endif
-+
-+ifdef CONFIG_M54455
-+CFLAGS := $(CFLAGS) -march=isac -mcpu=54455 -msoft-float -g 
-+AFLAGS := $(AFLAGS) -march=isac -mcpu=54455 -msoft-float  
-+endif
- 
- ifdef CONFIG_KGDB
- # If configured for kgdb support, include debugging infos and keep the
-@@ -57,8 +66,12 @@ KBUILD_CFLAGS := $(subst -fomit-frame-po
- endif
- 
- ifndef CONFIG_SUN3
-+ifndef CONFIG_COLDFIRE
- head-y := arch/m68k/kernel/head.o
- else
-+head-y := arch/m68k/coldfire/head.o
-+endif
-+else
- head-y := arch/m68k/kernel/sun3-head.o
- endif
- 
-@@ -79,6 +92,7 @@ core-$(CONFIG_SUN3)		+= arch/m68k/sun3/	
- core-$(CONFIG_M68040)		+= arch/m68k/fpsp040/
- core-$(CONFIG_M68060)		+= arch/m68k/ifpsp060/
- core-$(CONFIG_M68KFPU_EMU)	+= arch/m68k/math-emu/
-+core-$(CONFIG_COLDFIRE)		+= arch/m68k/coldfire/
- 
- all:	zImage
- 
---- a/arch/m68k/kernel/Makefile
-+++ b/arch/m68k/kernel/Makefile
-@@ -2,14 +2,19 @@
- # Makefile for the linux kernel.
- #
- 
--ifndef CONFIG_SUN3
--  extra-y := head.o
-+ifdef CONFIG_SUN3
-+  extra-y := sun3-head.o vmlinux.lds
-+  obj-y := entry.o signal.o ints.o
- else
--  extra-y := sun3-head.o
-+ifndef CONFIG_COLDFIRE
-+  extra-y := head.o vmlinux.lds
-+  obj-y := entry.o signal.o traps.o ints.o
-+else   # CONFIG_COLDFIRE
-+  extra-y := ../coldfire/head.o vmlinux.lds
-+endif
- endif
--extra-y	+= vmlinux.lds
- 
--obj-y	:= entry.o process.o traps.o ints.o signal.o ptrace.o module.o \
-+obj-y	+= process.o ptrace.o module.o \
- 	   sys_m68k.o time.o semaphore.o setup.o m68k_ksyms.o devres.o
- 
- devres-y = ../../../kernel/irq/devres.o
---- a/arch/m68k/kernel/asm-offsets.c
-+++ b/arch/m68k/kernel/asm-offsets.c
-@@ -58,8 +58,15 @@ int main(void)
- 	DEFINE(PT_A2, offsetof(struct pt_regs, a2));
- 	DEFINE(PT_PC, offsetof(struct pt_regs, pc));
- 	DEFINE(PT_SR, offsetof(struct pt_regs, sr));
-+#ifdef CONFIG_COLDFIRE
-+	/* Need to get the context out of struct mm for ASID setting */
-+	DEFINE(MM_CONTEXT, offsetof(struct mm_struct, context));
-+	/* Coldfire exception frame has vector *before* pc */
-+	DEFINE(PT_VECTOR, offsetof(struct pt_regs, pc) - 4);
-+#else
- 	/* bitfields are a bit difficult */
- 	DEFINE(PT_VECTOR, offsetof(struct pt_regs, pc) + 4);
-+#endif
- 
- 	/* offsets into the irq_handler struct */
- 	DEFINE(IRQ_HANDLER, offsetof(struct irq_node, handler));
---- a/arch/m68k/kernel/dma.c
-+++ b/arch/m68k/kernel/dma.c
-@@ -17,6 +17,7 @@
- void *dma_alloc_coherent(struct device *dev, size_t size,
- 			 dma_addr_t *handle, gfp_t flag)
- {
-+#ifndef CONFIG_M54455
- 	struct page *page, **map;
- 	pgprot_t pgprot;
- 	void *addr;
-@@ -55,6 +56,18 @@ void *dma_alloc_coherent(struct device *
- 	kfree(map);
- 
- 	return addr;
-+#else
-+	/*
-+	 * On the M5445x platform the memory allocated with GFP_DMA
-+	 * is guaranteed to be DMA'able.
-+	 */
-+	void *addr;
-+
-+	size = PAGE_ALIGN(size);
-+	addr = kmalloc(size, GFP_DMA);
-+	*handle = virt_to_phys(addr);
-+	return addr;
-+#endif
- }
- EXPORT_SYMBOL(dma_alloc_coherent);
- 
-@@ -62,7 +75,11 @@ void dma_free_coherent(struct device *de
- 		       void *addr, dma_addr_t handle)
- {
- 	pr_debug("dma_free_coherent: %p, %x\n", addr, handle);
-+#ifndef CONFIG_M54455
- 	vfree(addr);
-+#else
-+	kfree(addr);
-+#endif
- }
- EXPORT_SYMBOL(dma_free_coherent);
- 
---- a/arch/m68k/kernel/process.c
-+++ b/arch/m68k/kernel/process.c
-@@ -191,6 +191,7 @@ EXPORT_SYMBOL(kernel_thread);
- 
- void flush_thread(void)
- {
-+#if !defined(CONFIG_COLDFIRE)
- 	unsigned long zero = 0;
- 	set_fs(USER_DS);
- 	current->thread.fs = __USER_DS;
-@@ -198,6 +199,14 @@ void flush_thread(void)
- 		asm volatile (".chip 68k/68881\n\t"
- 			      "frestore %0@\n\t"
- 			      ".chip 68k" : : "a" (&zero));
-+#else
-+	set_fs(USER_DS);
-+	current->thread.fs = USER_DS;
-+#if defined(CONFIG_FPU)
-+	if (!FPU_IS_EMU)
-+		asm volatile ("frestore %0@\n\t" : : "a" (&zero));
-+#endif
-+#endif
- }
- 
- /*
-@@ -261,6 +270,7 @@ int copy_thread(int nr, unsigned long cl
- 	 * Must save the current SFC/DFC value, NOT the value when
- 	 * the parent was last descheduled - RGH  10-08-96
- 	 */
-+#if !defined(CONFIG_COLDFIRE)
- 	p->thread.fs = get_fs().seg;
- 
- 	if (!FPU_IS_EMU) {
-@@ -272,9 +282,34 @@ int copy_thread(int nr, unsigned long cl
- 				"fmoveml %/fpiar/%/fpcr/%/fpsr,%1"
- 				: : "m" (p->thread.fp[0]), "m" (p->thread.fpcntl[0])
- 				: "memory");
-+#else
-+	p->thread.fs = get_fs();
-+
-+#if defined(CONFIG_FPU)
-+	if (!FPU_IS_EMU) {
-+		/* Copy the current fpu state */
-+		asm volatile ("fsave %0" : : "m" (p->thread.fpstate[0])
-+			      : "memory");
-+
-+		if (p->thread.fpstate[0]) {
-+			asm volatile ("fmovemd %/fp0-%/fp7,%0"
-+				      : : "m" (p->thread.fp[0])
-+				      : "memory");
-+			asm volatile ("fmovel %/fpiar,%0"
-+				      : : "m" (p->thread.fpcntl[0])
-+				      : "memory");
-+			asm volatile ("fmovel %/fpcr,%0"
-+				      : : "m" (p->thread.fpcntl[1])
-+				      : "memory");
-+			asm volatile ("fmovel %/fpsr,%0"
-+				      : : "m" (p->thread.fpcntl[2])
-+				      : "memory");
-+		}
- 		/* Restore the state in case the fpu was busy */
- 		asm volatile ("frestore %0" : : "m" (p->thread.fpstate[0]));
- 	}
-+#endif
-+#endif
- 
- 	return 0;
- }
-@@ -283,7 +318,9 @@ int copy_thread(int nr, unsigned long cl
- 
- int dump_fpu (struct pt_regs *regs, struct user_m68kfp_struct *fpu)
- {
-+#if !defined(CONFIG_COLDFIRE) || defined(CONFIG_FPU)
- 	char fpustate[216];
-+#endif
- 
- 	if (FPU_IS_EMU) {
- 		int i;
-@@ -300,6 +337,7 @@ int dump_fpu (struct pt_regs *regs, stru
- 	}
- 
- 	/* First dump the fpu context to avoid protocol violation.  */
-+#if !defined(CONFIG_COLDFIRE)
- 	asm volatile ("fsave %0" :: "m" (fpustate[0]) : "memory");
- 	if (!CPU_IS_060 ? !fpustate[0] : !fpustate[2])
- 		return 0;
-@@ -310,6 +348,25 @@ int dump_fpu (struct pt_regs *regs, stru
- 	asm volatile ("fmovemx %/fp0-%/fp7,%0"
- 		:: "m" (fpu->fpregs[0])
- 		: "memory");
-+#elif defined(CONFIG_FPU)
-+	asm volatile ("fsave %0" :: "m" (fpustate[0]) : "memory");
-+	if (!CPU_IS_060 ? !fpustate[0] : !fpustate[2])
-+		return 0;
-+
-+	asm volatile ("fmovel %/fpiar,%0"
-+		      : : "m" (fpu->fpcntl[0])
-+		      : "memory");
-+	asm volatile ("fmovel %/fpcr,%0"
-+		      : : "m" (fpu->fpcntl[1])
-+		      : "memory");
-+	asm volatile ("fmovel %/fpsr,%0"
-+		      : : "m" (fpu->fpcntl[2])
-+		      : "memory");
-+	asm volatile ("fmovemd %/fp0-%/fp7,%0"
-+		      : : "m" (fpu->fpregs[0])
-+		      : "memory");
-+#endif
-+
- 	return 1;
- }
- EXPORT_SYMBOL(dump_fpu);
---- a/arch/m68k/kernel/setup.c
-+++ b/arch/m68k/kernel/setup.c
-@@ -67,13 +67,22 @@ EXPORT_SYMBOL(m68k_memory);
- 
- struct mem_info m68k_ramdisk;
- 
-+#if !defined(CONFIG_COLDFIRE)
- static char m68k_command_line[CL_SIZE];
-+#else
-+char m68k_command_line[CL_SIZE];
-+unsigned long uboot_info_stk;
-+EXPORT_SYMBOL(uboot_info_stk);
-+#endif
- 
- void (*mach_sched_init) (irq_handler_t handler) __initdata = NULL;
- /* machine dependent irq functions */
- void (*mach_init_IRQ) (void) __initdata = NULL;
- void (*mach_get_model) (char *model);
- int (*mach_get_hardware_list) (char *buffer);
-+#ifdef CONFIG_COLDFIRE
-+void (*mach_tick)(void);
-+#endif
- /* machine dependent timer functions */
- unsigned long (*mach_gettimeoffset) (void);
- int (*mach_hwclk) (int, struct rtc_time*);
-@@ -128,13 +137,17 @@ extern void config_hp300(void);
- extern void config_q40(void);
- extern void config_sun3x(void);
- 
-+#ifdef CONFIG_COLDFIRE
-+void coldfire_sort_memrec(void);
-+#endif
-+
- #define MASK_256K 0xfffc0000
- 
- extern void paging_init(void);
- 
- static void __init m68k_parse_bootinfo(const struct bi_record *record)
- {
--	while (record->tag != BI_LAST) {
-+	while ((record->tag != BI_LAST) && !(CONFIG_COLDFIRE)) {
- 		int unknown = 0;
- 		const unsigned long *data = record->data;
- 
-@@ -192,7 +205,11 @@ static void __init m68k_parse_bootinfo(c
- 					      record->size);
- 	}
- 
--	m68k_realnum_memory = m68k_num_memory;
-+#ifdef CONFIG_COLDFIRE
-+    coldfire_sort_memrec();
-+#endif
-+
-+    m68k_realnum_memory = m68k_num_memory;
- #ifdef CONFIG_SINGLE_MEMORY_CHUNK
- 	if (m68k_num_memory > 1) {
- 		printk("Ignoring last %i chunks of physical memory\n",
-@@ -205,7 +222,9 @@ static void __init m68k_parse_bootinfo(c
- void __init setup_arch(char **cmdline_p)
- {
- 	extern int _etext, _edata, _end;
-+#if !defined(CONFIG_SUN3) && !defined(CONFIG_COLDFIRE)
- 	int i;
-+#endif
- 
- 	/* The bootinfo is located right after the kernel bss */
- 	m68k_parse_bootinfo((const struct bi_record *)&_end);
-@@ -220,9 +239,10 @@ void __init setup_arch(char **cmdline_p)
- 	 * We should really do our own FPU check at startup.
- 	 * [what do we do with buggy 68LC040s? if we have problems
- 	 *  with them, we should add a test to check_bugs() below] */
--#ifndef CONFIG_M68KFPU_EMU_ONLY
-+#if !defined(CONFIG_M68KFPU_EMU_ONLY) && defined(CONFIG_FPU)
- 	/* clear the fpu if we have one */
--	if (m68k_fputype & (FPU_68881|FPU_68882|FPU_68040|FPU_68060)) {
-+	if (m68k_fputype & (FPU_68881|FPU_68882|FPU_68040|FPU_68060|
-+			    FPU_CFV4E)) {
- 		volatile int zero = 0;
- 		asm volatile ("frestore %0" : : "m" (zero));
- 	}
-@@ -310,13 +330,18 @@ void __init setup_arch(char **cmdline_p)
- 		config_sun3x();
- 		break;
- #endif
-+#ifdef CONFIG_COLDFIRE
-+	case MACH_CFMMU:
-+		config_coldfire();
-+		break;
-+#endif
- 	default:
- 		panic("No configuration setup");
- 	}
- 
- 	paging_init();
- 
--#ifndef CONFIG_SUN3
-+#if !defined(CONFIG_SUN3) && !defined(CONFIG_COLDFIRE)
- 	for (i = 1; i < m68k_num_memory; i++)
- 		free_bootmem_node(NODE_DATA(i), m68k_memory[i].addr,
- 				  m68k_memory[i].size);
-@@ -343,6 +368,10 @@ void __init setup_arch(char **cmdline_p)
- 
- #endif /* !CONFIG_SUN3 */
- 
-+#ifdef CONFIG_COLDFIRE
-+	mmu_context_init();
-+#endif
-+
- /* set ISA defs early as possible */
- #if defined(CONFIG_ISA) && defined(MULTI_ISA)
- #if defined(CONFIG_Q40)
-@@ -373,6 +402,7 @@ static int show_cpuinfo(struct seq_file 
- #define LOOP_CYCLES_68030	(8)
- #define LOOP_CYCLES_68040	(3)
- #define LOOP_CYCLES_68060	(1)
-+#define LOOP_CYCLES_COLDFIRE	(2)
- 
- 	if (CPU_IS_020) {
- 		cpu = "68020";
-@@ -386,6 +416,9 @@ static int show_cpuinfo(struct seq_file 
- 	} else if (CPU_IS_060) {
- 		cpu = "68060";
- 		clockfactor = LOOP_CYCLES_68060;
-+	} else if (CPU_IS_CFV4E) {
-+		cpu = "ColdFire V4e";
-+		clockfactor = LOOP_CYCLES_COLDFIRE;
- 	} else {
- 		cpu = "680x0";
- 		clockfactor = 0;
-@@ -404,6 +437,8 @@ static int show_cpuinfo(struct seq_file 
- 		fpu = "68060";
- 	else if (m68k_fputype & FPU_SUNFPA)
- 		fpu = "Sun FPA";
-+	else if (m68k_fputype & FPU_CFV4E)
-+		fpu = "ColdFire V4e";
- 	else
- 		fpu = "none";
- #endif
-@@ -420,6 +455,8 @@ static int show_cpuinfo(struct seq_file 
- 		mmu = "Sun-3";
- 	else if (m68k_mmutype & MMU_APOLLO)
- 		mmu = "Apollo";
-+	else if (m68k_mmutype & MMU_CFV4E)
-+		mmu = "ColdFire";
- 	else
- 		mmu = "unknown";
- 
-@@ -482,7 +519,7 @@ int get_hardware_list(char *buffer)
- 
- void check_bugs(void)
- {
--#ifndef CONFIG_M68KFPU_EMU
-+#if !defined(CONFIG_M68KFPU_EMU) && !defined(CONFIG_M54455)
- 	if (m68k_fputype == 0) {
- 		printk(KERN_EMERG "*** YOU DO NOT HAVE A FLOATING POINT UNIT, "
- 			"WHICH IS REQUIRED BY LINUX/M68K ***\n");
---- a/arch/m68k/kernel/time.c
-+++ b/arch/m68k/kernel/time.c
-@@ -40,6 +40,11 @@ static inline int set_rtc_mmss(unsigned 
-  */
- static irqreturn_t timer_interrupt(int irq, void *dummy)
- {
-+#ifdef CONFIG_COLDFIRE
-+	/* kick hardware timer if necessary */
-+	if (mach_tick)
-+		mach_tick();
-+#endif
- 	do_timer(1);
- #ifndef CONFIG_SMP
- 	update_process_times(user_mode(get_irq_regs()));
---- a/arch/m68k/kernel/vmlinux.lds.S
-+++ b/arch/m68k/kernel/vmlinux.lds.S
-@@ -5,6 +5,8 @@ PHDRS
- }
- #ifdef CONFIG_SUN3
- #include "vmlinux-sun3.lds"
-+#elif CONFIG_COLDFIRE
-+#include "../coldfire/vmlinux-cf.lds"
- #else
- #include "vmlinux-std.lds"
- #endif
diff --git a/target/linux/coldfire/patches/006-mcfv4e_arch_lib_mods.patch b/target/linux/coldfire/patches/006-mcfv4e_arch_lib_mods.patch
deleted file mode 100644
index f699e5fb4..000000000
--- a/target/linux/coldfire/patches/006-mcfv4e_arch_lib_mods.patch
+++ /dev/null
@@ -1,564 +0,0 @@
-From a9faf34ba120d9d39ff0c7656ee3de12a110e22a Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Wed, 31 Oct 2007 16:57:05 -0600
-Subject: [PATCH] Core Coldfire/MCF5445x arch lib changes.
-
-LTIBName: mcfv4e-arch-lib-mods
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/lib/checksum.c  |  124 +++++++++++++++++++++++
- arch/m68k/lib/muldi3.c    |   10 ++
- arch/m68k/lib/semaphore.S |   25 +++++
- arch/m68k/lib/string.c    |   64 ++++++++++++
- arch/m68k/lib/uaccess.c   |  242 +++++++++++++++++++++++++++++++++++++++++++++
- 5 files changed, 465 insertions(+), 0 deletions(-)
-
---- a/arch/m68k/lib/checksum.c
-+++ b/arch/m68k/lib/checksum.c
-@@ -39,8 +39,131 @@
-  * computes a partial checksum, e.g. for TCP/UDP fragments
-  */
- 
-+#ifdef CONFIG_COLDFIRE
-+
-+static inline unsigned short from32to16(unsigned long x)
-+{
-+	/* add up 16-bit and 16-bit for 16+c bit */
-+	x = (x & 0xffff) + (x >> 16);
-+	/* add up carry.. */
-+	x = (x & 0xffff) + (x >> 16);
-+	return x;
-+}
-+
-+static unsigned long do_csum(const unsigned char *buff, int len)
-+{
-+	int odd, count;
-+	unsigned long result = 0;
-+
-+	if (len <= 0)
-+		goto out;
-+	odd = 1 & (unsigned long) buff;
-+	if (odd) {
-+		result = *buff;
-+		len--;
-+		buff++;
-+	}
-+	count = len >> 1;		/* nr of 16-bit words.. */
-+	if (count) {
-+		if (2 & (unsigned long) buff) {
-+			result += *(unsigned short *) buff;
-+			count--;
-+			len -= 2;
-+			buff += 2;
-+		}
-+		count >>= 1;		/* nr of 32-bit words.. */
-+		if (count) {
-+			unsigned long carry = 0;
-+			do {
-+				unsigned long w = *(unsigned long *) buff;
-+				count--;
-+				buff += 4;
-+				result += carry;
-+				result += w;
-+				carry = (w > result);
-+			} while (count);
-+			result += carry;
-+			result = (result & 0xffff) + (result >> 16);
-+		}
-+		if (len & 2) {
-+			result += *(unsigned short *) buff;
-+			buff += 2;
-+		}
-+	}
-+	if (len & 1)
-+		result += (*buff << 8);
-+	result = from32to16(result);
-+	if (odd)
-+		result = ((result >> 8) & 0xff) | ((result & 0xff) << 8);
-+out:
-+	return result;
-+}
-+
-+/*
-+ *	This is a version of ip_compute_csum() optimized for IP headers,
-+ *	which always checksum on 4 octet boundaries.
-+ */
-+__sum16 ip_fast_csum(const void *iph, unsigned int ihl)
-+{
-+	return ~do_csum(iph, ihl*4);
-+}
-+EXPORT_SYMBOL(ip_fast_csum);
-+
-+/*
-+ * computes the checksum of a memory block at buff, length len,
-+ * and adds in "sum" (32-bit)
-+ *
-+ * returns a 32-bit number suitable for feeding into itself
-+ * or csum_tcpudp_magic
-+ *
-+ * this function must be called with even lengths, except
-+ * for the last fragment, which may be odd
-+ *
-+ * it's best to have buff aligned on a 32-bit boundary
-+ */
- __wsum csum_partial(const void *buff, int len, __wsum sum)
- {
-+	unsigned int result = do_csum(buff, len);
-+
-+	/* add in old sum, and carry.. */
-+	result += sum;
-+	if (sum > result)
-+		result += 1;
-+	return result;
-+}
-+EXPORT_SYMBOL(csum_partial);
-+
-+/*
-+ * copy from fs while checksumming, otherwise like csum_partial
-+ */
-+
-+__wsum
-+csum_partial_copy_from_user(const void __user *src, void *dst, int len,
-+			    __wsum sum, int *csum_err)
-+{
-+	if (csum_err) *csum_err = 0;
-+	memcpy(dst, src, len);
-+	return csum_partial(dst, len, sum);
-+}
-+EXPORT_SYMBOL(csum_partial_copy_from_user);
-+
-+/*
-+ * copy from ds while checksumming, otherwise like csum_partial
-+ */
-+
-+__wsum
-+csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)
-+{
-+	memcpy(dst, src, len);
-+	return csum_partial(dst, len, sum);
-+}
-+EXPORT_SYMBOL(csum_partial_copy_nocheck);
-+
-+#else /* !CONFIG_COLDFIRE */
-+
-+unsigned int
-+csum_partial(const unsigned char *buff, int len, unsigned int sum)
-+{
- 	unsigned long tmp1, tmp2;
- 	  /*
- 	   * Experiments with ethernet and slip connections show that buff
-@@ -423,3 +546,4 @@ csum_partial_copy_nocheck(const void *sr
-     return(sum);
- }
- EXPORT_SYMBOL(csum_partial_copy_nocheck);
-+#endif /* CONFIG_COLDFIRE */
---- a/arch/m68k/lib/muldi3.c
-+++ b/arch/m68k/lib/muldi3.c
-@@ -21,12 +21,22 @@ Boston, MA 02111-1307, USA.  */
- 
- #define BITS_PER_UNIT 8
- 
-+#ifdef CONFIG_COLDFIRE
-+#define umul_ppmm(w1, w0, u, v) \
-+  do { \
-+       unsigned long long x; \
-+       x = (unsigned long long)u * v; \
-+       w0 = (unsigned long)(x & 0x00000000ffffffff); \
-+       w1 = (unsigned long)(x & 0xffffffff00000000) >> 32; \
-+     } while (0)
-+#else /* CONFIG_COLDFIRE */
- #define umul_ppmm(w1, w0, u, v) \
-   __asm__ ("mulu%.l %3,%1:%0"						\
-            : "=d" ((USItype)(w0)),					\
-              "=d" ((USItype)(w1))					\
-            : "%0" ((USItype)(u)),					\
-              "dmi" ((USItype)(v)))
-+#endif /* CONFIG_COLDFIRE */
- 
- #define __umulsidi3(u, v) \
-   ({DIunion __w;							\
---- a/arch/m68k/lib/semaphore.S
-+++ b/arch/m68k/lib/semaphore.S
-@@ -16,11 +16,24 @@
-  * there is contention on the semaphore.
-  */
- ENTRY(__down_failed)
-+#ifndef CONFIG_COLDFIRE
- 	moveml %a0/%d0/%d1,-(%sp)
-+#else
-+	movel %a0,-(%sp)
-+	movel %d0,-(%sp)
-+	movel %d1,-(%sp)
-+#endif
- 	movel %a1,-(%sp)
- 	jbsr __down
- 	movel (%sp)+,%a1
-+#ifndef CONFIG_COLDFIRE
- 	moveml (%sp)+,%a0/%d0/%d1
-+#else
-+	movel (%sp)+,%d1
-+	movel (%sp)+,%d0
-+	movel (%sp)+,%a0
-+#endif
-+
- 	rts
- 
- ENTRY(__down_failed_interruptible)
-@@ -44,10 +57,22 @@ ENTRY(__down_failed_trylock)
- 	rts
- 
- ENTRY(__up_wakeup)
-+#ifndef CONFIG_COLDFIRE
- 	moveml %a0/%d0/%d1,-(%sp)
-+#else
-+	movel %a0,-(%sp)
-+	movel %d0,-(%sp)
-+	movel %d1,-(%sp)
-+#endif
- 	movel %a1,-(%sp)
- 	jbsr __up
- 	movel (%sp)+,%a1
-+#ifndef CONFIG_COLDFIRE
- 	moveml (%sp)+,%a0/%d0/%d1
-+#else
-+	movel (%sp)+,%d1
-+	movel (%sp)+,%d0
-+	movel (%sp)+,%a0
-+#endif
- 	rts
- 
---- a/arch/m68k/lib/string.c
-+++ b/arch/m68k/lib/string.c
-@@ -15,6 +15,7 @@ char *strcpy(char *dest, const char *src
- }
- EXPORT_SYMBOL(strcpy);
- 
-+#ifndef CONFIG_COLDFIRE
- void *memset(void *s, int c, size_t count)
- {
- 	void *xs = s;
-@@ -143,6 +144,69 @@ void *memcpy(void *to, const void *from,
- }
- EXPORT_SYMBOL(memcpy);
- 
-+#else /* CONFIG_COLDFIRE */
-+
-+void *memset(void *s, int c, size_t count)
-+{
-+  unsigned long x;
-+  void *originalTo;
-+
-+  for (x = 0; x < count; x++)
-+    *(unsigned char *)s++ = (unsigned char)c;
-+
-+  return originalTo;
-+}
-+EXPORT_SYMBOL(memset);
-+
-+void *memcpy(void *to, const void *from, size_t n)
-+{
-+  void *xto = to;
-+  size_t temp;
-+
-+  if (!n)
-+    return xto;
-+  if ((long) to & 1) {
-+      char *cto = to;
-+      const char *cfrom = from;
-+      *cto++ = *cfrom++;
-+      to = cto;
-+      from = cfrom;
-+      n--;
-+    }
-+  if (n > 2 && (long) to & 2) {
-+      short *sto = to;
-+      const short *sfrom = from;
-+      *sto++ = *sfrom++;
-+      to = sto;
-+      from = sfrom;
-+      n -= 2;
-+    }
-+  temp = n >> 2;
-+  if (temp) {
-+      long *lto = to;
-+      const long *lfrom = from;
-+      for (; temp; temp--)
-+	*lto++ = *lfrom++;
-+      to = lto;
-+      from = lfrom;
-+    }
-+  if (n & 2) {
-+      short *sto = to;
-+      const short *sfrom = from;
-+      *sto++ = *sfrom++;
-+      to = sto;
-+      from = sfrom;
-+    }
-+  if (n & 1) {
-+      char *cto = to;
-+      const char *cfrom = from;
-+      *cto = *cfrom;
-+    }
-+  return xto;
-+}
-+EXPORT_SYMBOL(memcpy);
-+#endif /* CONFIG_COLDFIRE */
-+
- void *memmove(void *dest, const void *src, size_t n)
- {
- 	void *xdest = dest;
---- a/arch/m68k/lib/uaccess.c
-+++ b/arch/m68k/lib/uaccess.c
-@@ -5,6 +5,7 @@
-  */
- 
- #include <linux/module.h>
-+#ifndef CONFIG_COLDFIRE
- #include <asm/uaccess.h>
- 
- unsigned long __generic_copy_from_user(void *to, const void __user *from,
-@@ -220,3 +221,244 @@ unsigned long __clear_user(void __user *
-     return res;
- }
- EXPORT_SYMBOL(__clear_user);
-+
-+#else /* CONFIG_COLDFIRE */
-+
-+#include <asm/cf_uaccess.h>
-+
-+unsigned long __generic_copy_from_user(void *to, const void *from,
-+		unsigned long n)
-+{
-+    unsigned long tmp;
-+    __asm__ __volatile__
-+	("   tstl %2\n"
-+	 "   jeq 2f\n"
-+	 "1: movel (%1)+,%3\n"
-+	 "   movel %3,(%0)+\n"
-+	 "   subql #1,%2\n"
-+	 "   jne 1b\n"
-+	 "2: movel %4,%2\n"
-+	 "   bclr #1,%2\n"
-+	 "   jeq 4f\n"
-+	 "3: movew (%1)+,%3\n"
-+	 "   movew %3,(%0)+\n"
-+	 "4: bclr #0,%2\n"
-+	 "   jeq 6f\n"
-+	 "5: moveb (%1)+,%3\n"
-+	 "   moveb %3,(%0)+\n"
-+	 "6:\n"
-+	 ".section .fixup,\"ax\"\n"
-+	 "   .even\n"
-+	 "7: movel %2,%%d0\n"
-+	 "71:clrl (%0)+\n"
-+	 "   subql #1,%%d0\n"
-+	 "   jne 71b\n"
-+	 "   lsll #2,%2\n"
-+	 "   addl %4,%2\n"
-+	 "   btst #1,%4\n"
-+	 "   jne 81f\n"
-+	 "   btst #0,%4\n"
-+	 "   jne 91f\n"
-+	 "   jra 6b\n"
-+	 "8: addql #2,%2\n"
-+	 "81:clrw (%0)+\n"
-+	 "   btst #0,%4\n"
-+	 "   jne 91f\n"
-+	 "   jra 6b\n"
-+	 "9: addql #1,%2\n"
-+	 "91:clrb (%0)+\n"
-+	 "   jra 6b\n"
-+	 ".previous\n"
-+	 ".section __ex_table,\"a\"\n"
-+	 "   .align 4\n"
-+	 "   .long 1b,7b\n"
-+	 "   .long 3b,8b\n"
-+	 "   .long 5b,9b\n"
-+	 ".previous"
-+	 : "=a"(to), "=a"(from), "=d"(n), "=&d"(tmp)
-+	 : "d"(n & 3), "0"(to), "1"(from), "2"(n/4)
-+	 : "d0", "memory");
-+    return n;
-+}
-+EXPORT_SYMBOL(__generic_copy_from_user);
-+
-+
-+unsigned long __generic_copy_to_user(void *to, const void *from,
-+		unsigned long n)
-+{
-+    unsigned long tmp;
-+    __asm__ __volatile__
-+	("   tstl %2\n"
-+	 "   jeq 3f\n"
-+	 "1: movel (%1)+,%3\n"
-+	 "22:movel %3,(%0)+\n"
-+	 "2: subql #1,%2\n"
-+	 "   jne 1b\n"
-+	 "3: movel %4,%2\n"
-+	 "   bclr #1,%2\n"
-+	 "   jeq 4f\n"
-+	 "   movew (%1)+,%3\n"
-+	 "24:movew %3,(%0)+\n"
-+	 "4: bclr #0,%2\n"
-+	 "   jeq 5f\n"
-+	 "   moveb (%1)+,%3\n"
-+	 "25:moveb %3,(%0)+\n"
-+	 "5:\n"
-+	 ".section .fixup,\"ax\"\n"
-+	 "   .even\n"
-+	 "60:addql #1,%2\n"
-+	 "6: lsll #2,%2\n"
-+	 "   addl %4,%2\n"
-+	 "   jra 5b\n"
-+	 "7: addql #2,%2\n"
-+	 "   jra 5b\n"
-+	 "8: addql #1,%2\n"
-+	 "   jra 5b\n"
-+	 ".previous\n"
-+	 ".section __ex_table,\"a\"\n"
-+	 "   .align 4\n"
-+	 "   .long 1b,60b\n"
-+	 "   .long 22b,6b\n"
-+	 "   .long 2b,6b\n"
-+	 "   .long 24b,7b\n"
-+	 "   .long 3b,60b\n"
-+	 "   .long 4b,7b\n"
-+	 "   .long 25b,8b\n"
-+	 "   .long 5b,8b\n"
-+	 ".previous"
-+	 : "=a"(to), "=a"(from), "=d"(n), "=&d"(tmp)
-+	 : "r"(n & 3), "0"(to), "1"(from), "2"(n / 4)
-+	 : "memory");
-+    return n;
-+}
-+EXPORT_SYMBOL(__generic_copy_to_user);
-+
-+/*
-+ * Copy a null terminated string from userspace.
-+ */
-+
-+long strncpy_from_user(char *dst, const char *src, long count)
-+{
-+	long res = -EFAULT;
-+	if (!(access_ok(VERIFY_READ, src, 1))) /* --tym-- */
-+		return res;
-+    if (count == 0) return count;
-+    __asm__ __volatile__
-+	("1: moveb (%2)+,%%d0\n"
-+	 "12:moveb %%d0,(%1)+\n"
-+	 "   jeq 2f\n"
-+	 "   subql #1,%3\n"
-+	 "   jne 1b\n"
-+	 "2: subl %3,%0\n"
-+	 "3:\n"
-+	 ".section .fixup,\"ax\"\n"
-+	 "   .even\n"
-+	 "4: movel %4,%0\n"
-+	 "   jra 3b\n"
-+	 ".previous\n"
-+	 ".section __ex_table,\"a\"\n"
-+	 "   .align 4\n"
-+	 "   .long 1b,4b\n"
-+	 "   .long 12b,4b\n"
-+	 ".previous"
-+	 : "=d"(res), "=a"(dst), "=a"(src), "=d"(count)
-+	 : "i"(-EFAULT), "0"(count), "1"(dst), "2"(src), "3"(count)
-+	 : "d0", "memory");
-+    return res;
-+}
-+EXPORT_SYMBOL(strncpy_from_user);
-+
-+/*
-+ * Return the size of a string (including the ending 0)
-+ *
-+ * Return 0 on exception, a value greater than N if too long
-+ */
-+long strnlen_user(const char *src, long n)
-+{
-+    long res = -EFAULT;
-+    if (!(access_ok(VERIFY_READ, src, 1))) /* --tym-- */
-+	return res;
-+
-+	res = -(long)src;
-+	__asm__ __volatile__
-+		("1:\n"
-+		 "   tstl %2\n"
-+		 "   jeq 3f\n"
-+		 "2: moveb (%1)+,%%d0\n"
-+		 "22:\n"
-+		 "   subql #1,%2\n"
-+		 "   tstb %%d0\n"
-+		 "   jne 1b\n"
-+		 "   jra 4f\n"
-+		 "3:\n"
-+		 "   addql #1,%0\n"
-+		 "4:\n"
-+		 "   addl %1,%0\n"
-+		 "5:\n"
-+		 ".section .fixup,\"ax\"\n"
-+		 "   .even\n"
-+		 "6: moveq %3,%0\n"
-+		 "   jra 5b\n"
-+		 ".previous\n"
-+		 ".section __ex_table,\"a\"\n"
-+		 "   .align 4\n"
-+		 "   .long 2b,6b\n"
-+		 "   .long 22b,6b\n"
-+		 ".previous"
-+		 : "=d"(res), "=a"(src), "=d"(n)
-+		 : "i"(0), "0"(res), "1"(src), "2"(n)
-+		 : "d0");
-+	return res;
-+}
-+EXPORT_SYMBOL(strnlen_user);
-+
-+
-+/*
-+ * Zero Userspace
-+ */
-+
-+unsigned long __clear_user(void *to, unsigned long n)
-+{
-+    __asm__ __volatile__
-+	("   tstl %1\n"
-+	 "   jeq 3f\n"
-+	 "1: movel %3,(%0)+\n"
-+	 "2: subql #1,%1\n"
-+	 "   jne 1b\n"
-+	 "3: movel %2,%1\n"
-+	 "   bclr #1,%1\n"
-+	 "   jeq 4f\n"
-+	 "24:movew %3,(%0)+\n"
-+	 "4: bclr #0,%1\n"
-+	 "   jeq 5f\n"
-+	 "25:moveb %3,(%0)+\n"
-+	 "5:\n"
-+	 ".section .fixup,\"ax\"\n"
-+	 "   .even\n"
-+	 "61:addql #1,%1\n"
-+	 "6: lsll #2,%1\n"
-+	 "   addl %2,%1\n"
-+	 "   jra 5b\n"
-+	 "7: addql #2,%1\n"
-+	 "   jra 5b\n"
-+	 "8: addql #1,%1\n"
-+	 "   jra 5b\n"
-+	 ".previous\n"
-+	 ".section __ex_table,\"a\"\n"
-+	 "   .align 4\n"
-+	 "   .long 1b,61b\n"
-+	 "   .long 2b,6b\n"
-+	 "   .long 3b,61b\n"
-+	 "   .long 24b,7b\n"
-+	 "   .long 4b,7b\n"
-+	 "   .long 25b,8b\n"
-+	 "   .long 5b,8b\n"
-+	 ".previous"
-+	 : "=a"(to), "=d"(n)
-+	 : "r"(n & 3), "d"(0), "0"(to), "1"(n/4));
-+    return n;
-+}
-+EXPORT_SYMBOL(__clear_user);
-+
-+#endif /* CONFIG_COLDFIRE */
-+
diff --git a/target/linux/coldfire/patches/007-mcfv4e_arch_mm_mods_1.patch b/target/linux/coldfire/patches/007-mcfv4e_arch_mm_mods_1.patch
deleted file mode 100644
index 2abd47746..000000000
--- a/target/linux/coldfire/patches/007-mcfv4e_arch_mm_mods_1.patch
+++ /dev/null
@@ -1,513 +0,0 @@
-From 2bef1f8ce148cce9e782f75f9537767c1d8c0eea Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Wed, 31 Oct 2007 16:58:27 -0600
-Subject: [PATCH] Core Coldfire/MCF5445x arch/mm changes.
-
-LTIBName: mcfv4e-arch-mm-mods-1
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/mm/Makefile |    1 +
- arch/m68k/mm/cache.c  |   41 ++++++++
- arch/m68k/mm/cf-mmu.c |  251 +++++++++++++++++++++++++++++++++++++++++++++++++
- arch/m68k/mm/hwtest.c |    2 +
- arch/m68k/mm/init.c   |    3 +-
- arch/m68k/mm/kmap.c   |   13 +++
- arch/m68k/mm/memory.c |   66 +++++++++++++-
- 7 files changed, 373 insertions(+), 4 deletions(-)
- create mode 100644 arch/m68k/mm/cf-mmu.c
-
---- a/arch/m68k/mm/Makefile
-+++ b/arch/m68k/mm/Makefile
-@@ -6,3 +6,4 @@ obj-y		:= cache.o init.o fault.o hwtest.
- 
- obj-$(CONFIG_MMU_MOTOROLA)	+= kmap.o memory.o motorola.o
- obj-$(CONFIG_MMU_SUN3)		+= sun3kmap.o sun3mmu.o
-+obj-$(CONFIG_MMU_CFV4E)		+= cf-mmu.o kmap.o memory.o
---- a/arch/m68k/mm/cache.c
-+++ b/arch/m68k/mm/cache.c
-@@ -10,7 +10,11 @@
- #include <asm/pgalloc.h>
- #include <asm/traps.h>
- 
-+#ifdef CONFIG_COLDFIRE
-+#include <asm/cfcache.h>
-+#endif /* CONFIG_COLDFIRE */
- 
-+#ifndef CONFIG_COLDFIRE
- static unsigned long virt_to_phys_slow(unsigned long vaddr)
- {
- 	if (CPU_IS_060) {
-@@ -69,11 +73,45 @@ static unsigned long virt_to_phys_slow(u
- 	}
- 	return 0;
- }
-+#endif /* CONFIG_COLDFIRE */
-+
- 
- /* Push n pages at kernel virtual address and clear the icache */
- /* RZ: use cpush %bc instead of cpush %dc, cinv %ic */
- void flush_icache_range(unsigned long address, unsigned long endaddr)
- {
-+#ifdef CONFIG_COLDFIRE
-+	unsigned long set;
-+	unsigned long start_set;
-+	unsigned long end_set;
-+
-+	start_set = address & _ICACHE_SET_MASK;
-+	end_set = endaddr & _ICACHE_SET_MASK;
-+
-+	if (start_set > end_set) {
-+	/* from the begining to the lowest address */
-+		for (set = 0; set <= end_set; set += (0x10 - 3))
-+			asm volatile ("cpushl %%ic,(%0)\n"
-+				      "\taddq%.l #1,%0\n"
-+				      "\tcpushl %%ic,(%0)\n"
-+				      "\taddq%.l #1,%0\n"
-+				      "\tcpushl %%ic,(%0)\n"
-+				      "\taddq%.l #1,%0\n"
-+				      "\tcpushl %%ic,(%0)" : : "a" (set));
-+
-+		/* next loop will finish the cache ie pass the hole */
-+		end_set = LAST_ICACHE_ADDR;
-+	}
-+	for (set = start_set; set <= end_set; set += (0x10 - 3))
-+		asm volatile ("cpushl %%ic,(%0)\n"
-+			      "\taddq%.l #1,%0\n"
-+			      "\tcpushl %%ic,(%0)\n"
-+			      "\taddq%.l #1,%0\n"
-+			      "\tcpushl %%ic,(%0)\n"
-+			      "\taddq%.l #1,%0\n"
-+			      "\tcpushl %%ic,(%0)" : : "a" (set));
-+
-+#else /* !CONFIG_COLDFIRE */
- 
- 	if (CPU_IS_040_OR_060) {
- 		address &= PAGE_MASK;
-@@ -94,9 +132,11 @@ void flush_icache_range(unsigned long ad
- 			      : "=&d" (tmp)
- 			      : "di" (FLUSH_I));
- 	}
-+#endif /* CONFIG_COLDFIRE */
- }
- EXPORT_SYMBOL(flush_icache_range);
- 
-+#ifndef CONFIG_COLDFIRE
- void flush_icache_user_range(struct vm_area_struct *vma, struct page *page,
- 			     unsigned long addr, int len)
- {
-@@ -115,4 +155,5 @@ void flush_icache_user_range(struct vm_a
- 			      : "di" (FLUSH_I));
- 	}
- }
-+#endif /* CONFIG_COLDFIRE */
- 
---- /dev/null
-+++ b/arch/m68k/mm/cf-mmu.c
-@@ -0,0 +1,251 @@
-+/*
-+ * linux/arch/m68k/mm/cf-mmu.c
-+ *
-+ * Based upon linux/arch/m68k/mm/sun3mmu.c
-+ * Based upon linux/arch/ppc/mm/mmu_context.c
-+ *
-+ * Implementations of mm routines specific to the Coldfire MMU.
-+ *
-+ * Copyright (c) 2008 Freescale Semiconductor, Inc.
-+ */
-+
-+#include <linux/signal.h>
-+#include <linux/sched.h>
-+#include <linux/mm.h>
-+#include <linux/swap.h>
-+#include <linux/kernel.h>
-+#include <linux/string.h>
-+#include <linux/types.h>
-+#include <linux/init.h>
-+#ifdef CONFIG_BLK_DEV_RAM
-+#include <linux/blkdev.h>
-+#endif
-+#include <linux/bootmem.h>
-+
-+#include <asm/setup.h>
-+#include <asm/uaccess.h>
-+#include <asm/page.h>
-+#include <asm/pgtable.h>
-+#include <asm/system.h>
-+#include <asm/machdep.h>
-+#include <asm/io.h>
-+#include <asm/mmu_context.h>
-+#include <asm/cf_pgalloc.h>
-+
-+#include <asm/coldfire.h>
-+#include <asm/tlbflush.h>
-+
-+mm_context_t next_mmu_context;
-+unsigned long context_map[LAST_CONTEXT / BITS_PER_LONG + 1];
-+
-+atomic_t nr_free_contexts;
-+struct mm_struct *context_mm[LAST_CONTEXT+1];
-+void steal_context(void);
-+
-+
-+const char bad_pmd_string[] = "Bad pmd in pte_alloc: %08lx\n";
-+
-+extern unsigned long empty_bad_page_table;
-+extern unsigned long empty_bad_page;
-+extern unsigned long num_pages;
-+
-+extern char __init_begin, __init_end;
-+
-+void free_initmem(void)
-+{
-+	unsigned long addr;
-+	unsigned long start = (unsigned long)&__init_begin;
-+	unsigned long end = (unsigned long)&__init_end;
-+
-+	printk(KERN_INFO "free_initmem: __init_begin = 0x%lx  __init_end = 0x%lx\n", start, end);
-+
-+	addr = (unsigned long)&__init_begin;
-+	for (; addr < (unsigned long)&__init_end; addr += PAGE_SIZE) {
-+		/* not currently used */
-+		virt_to_page(addr)->flags &= ~(1 << PG_reserved);
-+		init_page_count(virt_to_page(addr));
-+		free_page(addr);
-+		totalram_pages++;
-+	}
-+}
-+
-+/* Coldfire paging_init derived from sun3 */
-+void __init paging_init(void)
-+{
-+	pgd_t * pg_dir;
-+	pte_t * pg_table;
-+	int i;
-+	unsigned long address;
-+	unsigned long next_pgtable;
-+	unsigned long bootmem_end;
-+	unsigned long zones_size[MAX_NR_ZONES];
-+	unsigned long size;
-+	enum zone_type zone;
-+
-+	empty_zero_page = (void *)alloc_bootmem_pages(PAGE_SIZE);
-+	memset((void *)empty_zero_page, 0, PAGE_SIZE);
-+
-+	pg_dir = swapper_pg_dir;
-+	memset(swapper_pg_dir, 0, sizeof (swapper_pg_dir));
-+
-+	size = num_pages * sizeof(pte_t);  
-+	size = (size + PAGE_SIZE) & ~(PAGE_SIZE-1);
-+	next_pgtable = (unsigned long)alloc_bootmem_pages(size);
-+
-+	bootmem_end = (next_pgtable + size + PAGE_SIZE) & PAGE_MASK; 
-+	pg_dir += PAGE_OFFSET >> PGDIR_SHIFT; 
-+
-+	address = PAGE_OFFSET;
-+	while (address < (unsigned long)high_memory) 
-+	{
-+    		pg_table = (pte_t *)next_pgtable; 
-+	    	next_pgtable += PTRS_PER_PTE * sizeof (pte_t);
-+		pgd_val(*pg_dir) = (unsigned long) pg_table;
-+		pg_dir++;
-+
-+		/* now change pg_table to kernel virtual addresses */
-+		for (i=0; i<PTRS_PER_PTE; ++i, ++pg_table)
-+		{
-+			pte_t pte = pfn_pte(virt_to_pfn(address), PAGE_INIT);
-+			if (address >= (unsigned long)high_memory)
-+				pte_val (pte) = 0;
-+
-+			set_pte (pg_table, pte);
-+			address += PAGE_SIZE;
-+		}
-+	}
-+	
-+	current->mm = NULL;
-+
-+	/* clear zones */
-+	for (zone = 0; zone < MAX_NR_ZONES; zone++)
-+		zones_size[zone] = 0x0;
-+
-+	/* allocate the bottom 32M (0x40x 0x41x) to DMA - head.S marks them NO CACHE */
-+	/* JKM - this should be changed to allocate from the TOP (0x4f,0x4e) but the
-+	 * allocator is being a bit challenging */
-+        zones_size[ZONE_DMA] = (32*1024*1024) >> PAGE_SHIFT;
-+
-+	/* allocate the rest to NORMAL - head.S marks them CACHE */
-+	zones_size[ZONE_NORMAL] = (((unsigned long)high_memory - PAGE_OFFSET) >> PAGE_SHIFT) - zones_size[0];
-+
-+	free_area_init(zones_size);
-+}
-+
-+
-+int cf_tlb_miss(struct pt_regs *regs, int write, int dtlb, int extension_word)
-+{
-+        struct mm_struct *mm;
-+        pgd_t *pgd;
-+        pmd_t *pmd;
-+        pte_t *pte;
-+        unsigned long mmuar;
-+        int asid;
-+	int flags;
-+
-+	local_save_flags(flags);
-+	local_irq_disable();
-+
-+	mmuar = ( dtlb ) ? regs->mmuar
-+			 : regs->pc + (extension_word * sizeof(long));
-+
-+        mm = (!user_mode(regs) && (mmuar >= PAGE_OFFSET)) ? &init_mm
-+							  : current->mm;
-+        if (!mm) {
-+	    local_irq_restore(flags);
-+	    return (-1);
-+	}
-+
-+        pgd = pgd_offset(mm, mmuar);
-+        if (pgd_none(*pgd))  {
-+	    local_irq_restore(flags);
-+	    return (-1);
-+	}
-+	    
-+    	pmd = pmd_offset(pgd, mmuar);
-+    	if (pmd_none(*pmd)) {
-+	    local_irq_restore(flags);
-+	    return (-1);
-+	}	
-+    	
-+	pte = (mmuar >= PAGE_OFFSET) ? pte_offset_kernel(pmd, mmuar)
-+	                             : pte_offset_map(pmd, mmuar);
-+    	if (pte_none(*pte) || !pte_present(*pte)) {
-+	    local_irq_restore(flags);
-+	    return (-1);		
-+	}
-+
-+	if (write) {
-+            if (!pte_write(*pte)) {
-+		local_irq_restore(flags);
-+	    	return (-1);
-+	    }
-+    	    set_pte(pte, pte_mkdirty(*pte));
-+	}
-+	
-+        set_pte(pte, pte_mkyoung(*pte));
-+        asid = mm->context & 0xff;
-+        if (!pte_dirty(*pte) && mmuar<=PAGE_OFFSET)
-+    	    set_pte(pte, pte_wrprotect(*pte));
-+
-+        *MMUTR = (mmuar & PAGE_MASK) | (asid << CF_ASID_MMU_SHIFT)
-+               | (((int)(pte->pte) & (int)CF_PAGE_MMUTR_MASK ) >> CF_PAGE_MMUTR_SHIFT)
-+               | MMUTR_V;
-+
-+        *MMUDR = (pte_val(*pte) & PAGE_MASK) 
-+	       | ((pte->pte) & CF_PAGE_MMUDR_MASK)
-+               | MMUDR_SZ8K | MMUDR_X;
-+	    
-+	if ( dtlb )
-+    	    *MMUOR = MMUOR_ACC | MMUOR_UAA;
-+	else
-+	    *MMUOR = MMUOR_ITLB | MMUOR_ACC | MMUOR_UAA;
-+
-+	asm ("nop");
-+	/*printk("cf_tlb_miss: va=%lx, pa=%lx\n", (mmuar & PAGE_MASK), 
-+		  (pte_val(*pte)  & PAGE_MASK));*/
-+	local_irq_restore(flags);
-+        return (0);
-+}
-+
-+
-+/* The following was taken from arch/ppc/mmu_context.c
-+ *
-+ * Initialize the context management stuff.
-+ */
-+void __init mmu_context_init(void)
-+{
-+	/*
-+	 * Some processors have too few contexts to reserve one for
-+	 * init_mm, and require using context 0 for a normal task.
-+	 * Other processors reserve the use of context zero for the kernel.
-+	 * This code assumes FIRST_CONTEXT < 32.
-+	 */
-+	context_map[0] = (1 << FIRST_CONTEXT) - 1;
-+	next_mmu_context = FIRST_CONTEXT;
-+	atomic_set(&nr_free_contexts, LAST_CONTEXT - FIRST_CONTEXT + 1);
-+}
-+
-+/*
-+ * Steal a context from a task that has one at the moment.
-+ * This is only used on 8xx and 4xx and we presently assume that
-+ * they don't do SMP.  If they do then thicfpgalloc.hs will have to check
-+ * whether the MM we steal is in use.
-+ * We also assume that this is only used on systems that don't
-+ * use an MMU hash table - this is true for 8xx and 4xx.
-+ * This isn't an LRU system, it just frees up each context in
-+ * turn (sort-of pseudo-random replacement :).  This would be the
-+ * place to implement an LRU scheme if anyone was motivated to do it.
-+ *  -- paulus
-+ */
-+void steal_context(void)
-+{
-+	struct mm_struct *mm;
-+	/* free up context `next_mmu_context' */
-+	/* if we shouldn't free context 0, don't... */
-+	if (next_mmu_context < FIRST_CONTEXT)
-+		next_mmu_context = FIRST_CONTEXT;
-+	mm = context_mm[next_mmu_context];
-+	flush_tlb_mm(mm);
-+	destroy_context(mm);
-+}
---- a/arch/m68k/mm/hwtest.c
-+++ b/arch/m68k/mm/hwtest.c
-@@ -25,6 +25,7 @@
- 
- #include <linux/module.h>
- 
-+#ifndef CONFIG_COLDFIRE
- int hwreg_present( volatile void *regp )
- {
-     int	ret = 0;
-@@ -82,4 +83,5 @@ int hwreg_write( volatile void *regp, un
- 	return( ret );
- }
- EXPORT_SYMBOL(hwreg_write);
-+#endif
- 
---- a/arch/m68k/mm/init.c
-+++ b/arch/m68k/mm/init.c
-@@ -122,7 +122,6 @@ void __init mem_init(void)
- 	if (MACH_IS_ATARI)
- 		atari_stram_mem_init_hook();
- #endif
--
- 	/* this will put all memory onto the freelists */
- 	totalram_pages = num_physpages = 0;
- 	for_each_online_pgdat(pgdat) {
-@@ -146,7 +145,7 @@ void __init mem_init(void)
- 		}
- 	}
- 
--#ifndef CONFIG_SUN3
-+#if !defined(CONFIG_SUN3) && !defined(CONFIG_COLDFIRE)
- 	/* insert pointer tables allocated so far into the tablelist */
- 	init_pointer_table((unsigned long)kernel_pg_dir);
- 	for (i = 0; i < PTRS_PER_PGD; i++) {
---- a/arch/m68k/mm/kmap.c
-+++ b/arch/m68k/mm/kmap.c
-@@ -24,7 +24,11 @@
- 
- #undef DEBUG
- 
-+#ifndef CONFIG_COLDFIRE
- #define PTRTREESIZE	(256*1024)
-+#else
-+#define PTRTREESIZE     PAGE_SIZE
-+#endif
- 
- /*
-  * For 040/060 we can use the virtual memory area like other architectures,
-@@ -50,7 +54,11 @@ static inline void free_io_area(void *ad
- 
- #else
- 
-+#ifdef CONFIG_COLDFIRE
-+#define IO_SIZE         PAGE_SIZE
-+#else
- #define IO_SIZE		(256*1024)
-+#endif
- 
- static struct vm_struct *iolist;
- 
-@@ -170,7 +178,12 @@ void __iomem *__ioremap(unsigned long ph
- 			break;
- 		}
- 	} else {
-+#ifndef CONFIG_COLDFIRE
- 		physaddr |= (_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_DIRTY);
-+#else
-+		physaddr |= (_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_DIRTY | \
-+			     _PAGE_READWRITE);
-+#endif
- 		switch (cacheflag) {
- 		case IOMAP_NOCACHE_SER:
- 		case IOMAP_NOCACHE_NONSER:
---- a/arch/m68k/mm/memory.c
-+++ b/arch/m68k/mm/memory.c
-@@ -203,7 +203,38 @@ static inline void pushcl040(unsigned lo
- 
- void cache_clear (unsigned long paddr, int len)
- {
--    if (CPU_IS_040_OR_060) {
-+    if (CPU_IS_CFV4E) {
-+	unsigned long set;
-+	unsigned long start_set;
-+	unsigned long end_set;
-+
-+	start_set = paddr & _ICACHE_SET_MASK;
-+	end_set = (paddr+len-1) & _ICACHE_SET_MASK;
-+
-+	if (start_set > end_set) {
-+		/* from the begining to the lowest address */
-+		for (set = 0; set <= end_set; set += (0x10 - 3))
-+			asm volatile("cpushl %%bc,(%0)\n"
-+				     "\taddq%.l #1,%0\n"
-+				     "\tcpushl %%bc,(%0)\n"
-+				     "\taddq%.l #1,%0\n"
-+				     "\tcpushl %%bc,(%0)\n"
-+				     "\taddq%.l #1,%0\n"
-+				     "\tcpushl %%bc,(%0)" : : "a" (set));
-+
-+		/* next loop will finish the cache ie pass the hole */
-+		end_set = LAST_ICACHE_ADDR;
-+	}
-+	for (set = start_set; set <= end_set; set += (0x10 - 3))
-+		asm volatile("cpushl %%bc,(%0)\n"
-+			     "\taddq%.l #1,%0\n"
-+			     "\tcpushl %%bc,(%0)\n"
-+			     "\taddq%.l #1,%0\n"
-+			     "\tcpushl %%bc,(%0)\n"
-+			     "\taddq%.l #1,%0\n"
-+			     "\tcpushl %%bc,(%0)" : : "a" (set));
-+
-+    } else if (CPU_IS_040_OR_060) {
- 	int tmp;
- 
- 	/*
-@@ -250,7 +281,38 @@ EXPORT_SYMBOL(cache_clear);
- 
- void cache_push (unsigned long paddr, int len)
- {
--    if (CPU_IS_040_OR_060) {
-+    if (CPU_IS_CFV4E) {
-+	unsigned long set;
-+	unsigned long start_set;
-+	unsigned long end_set;
-+
-+	start_set = paddr & _ICACHE_SET_MASK;
-+	end_set = (paddr+len-1) & _ICACHE_SET_MASK;
-+
-+	if (start_set > end_set) {
-+		/* from the begining to the lowest address */
-+		for (set = 0; set <= end_set; set += (0x10 - 3))
-+			asm volatile("cpushl %%bc,(%0)\n"
-+				     "\taddq%.l #1,%0\n"
-+				     "\tcpushl %%bc,(%0)\n"
-+				     "\taddq%.l #1,%0\n"
-+				     "\tcpushl %%bc,(%0)\n"
-+				     "\taddq%.l #1,%0\n"
-+				     "\tcpushl %%bc,(%0)" : : "a" (set));
-+
-+		/* next loop will finish the cache ie pass the hole */
-+		end_set = LAST_ICACHE_ADDR;
-+	}
-+	for (set = start_set; set <= end_set; set += (0x10 - 3))
-+		asm volatile("cpushl %%bc,(%0)\n"
-+			     "\taddq%.l #1,%0\n"
-+			     "\tcpushl %%bc,(%0)\n"
-+			     "\taddq%.l #1,%0\n"
-+			     "\tcpushl %%bc,(%0)\n"
-+			     "\taddq%.l #1,%0\n"
-+			     "\tcpushl %%bc,(%0)" : : "a" (set));
-+
-+    } else if (CPU_IS_040_OR_060) {
- 	int tmp = PAGE_SIZE;
- 
- 	/*
diff --git a/target/linux/coldfire/patches/008-mcfv4e_coldfire_code.patch b/target/linux/coldfire/patches/008-mcfv4e_coldfire_code.patch
deleted file mode 100644
index 9da89c802..000000000
--- a/target/linux/coldfire/patches/008-mcfv4e_coldfire_code.patch
+++ /dev/null
@@ -1,4484 +0,0 @@
-From 70b2bd01829b38a1a79caeda05d436b2e5fecf82 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Wed, 31 Oct 2007 17:00:18 -0600
-Subject: [PATCH] Core Coldfire/MCF5445x specific code.
-
-LTIBName: mcfv4e-coldfire-code
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/coldfire/Makefile       |   11 +
- arch/m68k/coldfire/cache.c        |  215 +++++++++
- arch/m68k/coldfire/config.c       |  420 ++++++++++++++++++
- arch/m68k/coldfire/entry.S        |  701 ++++++++++++++++++++++++++++++
- arch/m68k/coldfire/head.S         |  474 ++++++++++++++++++++
- arch/m68k/coldfire/ints.c         |  384 ++++++++++++++++
- arch/m68k/coldfire/iomap.c        |   54 +++
- arch/m68k/coldfire/mcf5445x-pci.c |  427 ++++++++++++++++++
- arch/m68k/coldfire/muldi3.S       |   64 +++
- arch/m68k/coldfire/pci.c          |  245 +++++++++++
- arch/m68k/coldfire/signal.c       |  868 +++++++++++++++++++++++++++++++++++++
- arch/m68k/coldfire/traps.c        |  454 +++++++++++++++++++
- arch/m68k/coldfire/vmlinux-cf.lds |   92 ++++
- 13 files changed, 4409 insertions(+), 0 deletions(-)
- create mode 100644 arch/m68k/coldfire/Makefile
- create mode 100644 arch/m68k/coldfire/cache.c
- create mode 100644 arch/m68k/coldfire/config.c
- create mode 100644 arch/m68k/coldfire/entry.S
- create mode 100644 arch/m68k/coldfire/head.S
- create mode 100644 arch/m68k/coldfire/ints.c
- create mode 100644 arch/m68k/coldfire/iomap.c
- create mode 100644 arch/m68k/coldfire/mcf5445x-pci.c
- create mode 100644 arch/m68k/coldfire/muldi3.S
- create mode 100644 arch/m68k/coldfire/pci.c
- create mode 100644 arch/m68k/coldfire/signal.c
- create mode 100644 arch/m68k/coldfire/traps.c
- create mode 100644 arch/m68k/coldfire/vmlinux-cf.lds
-
---- /dev/null
-+++ b/arch/m68k/coldfire/Makefile
-@@ -0,0 +1,11 @@
-+#
-+# Makefile for Linux arch/m68k/coldfire source directory
-+#
-+
-+obj-y:= entry.o config.o cache.o signal.o muldi3.o traps.o ints.o
-+
-+ifneq ($(strip $(CONFIG_USB) $(CONFIG_USB_GADGET_MCF5445X)),)
-+	obj-y	+= usb.o usb/
-+endif
-+
-+obj-$(CONFIG_PCI)	+= pci.o mcf5445x-pci.o iomap.o
---- /dev/null
-+++ b/arch/m68k/coldfire/cache.c
-@@ -0,0 +1,215 @@
-+/*
-+ *  linux/arch/m68k/coldifre/cache.c
-+ *
-+ *  Matt Waddel Matt.Waddel@freescale.com
-+ *  Copyright Freescale Semiconductor, Inc. 2007
-+ *
-+ *  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/interrupt.h>
-+#include <asm/cfcache.h>
-+#include <asm/coldfire.h>
-+#include <asm/system.h>
-+
-+#define _DCACHE_SIZE (2*16384)
-+#define _ICACHE_SIZE (2*16384)
-+
-+#define _SET_SHIFT 4
-+
-+/*
-+ * Masks for cache sizes.  Programming note: because the set size is a
-+ * power of two, the mask is also the last address in the set.
-+ */
-+
-+#define _DCACHE_SET_MASK ((_DCACHE_SIZE/64-1)<<_SET_SHIFT)
-+#define _ICACHE_SET_MASK ((_ICACHE_SIZE/64-1)<<_SET_SHIFT)
-+#define LAST_DCACHE_ADDR _DCACHE_SET_MASK
-+#define LAST_ICACHE_ADDR _ICACHE_SET_MASK
-+
-+/************************************************************
-+ *  Routine to cleanly flush the cache, pushing all lines and
-+ *  invalidating them.
-+ *
-+ *  The is the flash-resident version, used after copying the .text
-+ *  segment from flash to ram.
-+ *************************************************************/
-+void FLASHDcacheFlushInvalidate(void)
-+	__attribute__ ((section (".text_loader")));
-+
-+void FLASHDcacheFlushInvalidate()
-+{
-+	unsigned long set;
-+	unsigned long start_set;
-+	unsigned long end_set;
-+
-+	start_set = 0;
-+	end_set = (unsigned long)LAST_DCACHE_ADDR;
-+
-+	for (set = start_set; set < end_set; set += (0x10 - 3))
-+		asm volatile("cpushl %%dc,(%0)\n"
-+			     "\taddq%.l #1,%0\n"
-+			     "\tcpushl %%dc,(%0)\n"
-+			     "\taddq%.l #1,%0\n"
-+			     "\tcpushl %%dc,(%0)\n"
-+			     "\taddq%.l #1,%0\n"
-+			     "\tcpushl %%dc,(%0)" : : "a" (set));
-+}
-+
-+/************************************************************
-+ *  Routine to cleanly flush the cache, pushing all lines and
-+ *  invalidating them.
-+ *
-+ *************************************************************/
-+void DcacheFlushInvalidate()
-+{
-+	unsigned long set;
-+	unsigned long start_set;
-+	unsigned long end_set;
-+
-+	start_set = 0;
-+	end_set = (unsigned long)LAST_DCACHE_ADDR;
-+
-+	for (set = start_set; set < end_set; set += (0x10 - 3))
-+		asm volatile("cpushl %%dc,(%0)\n"
-+			     "\taddq%.l #1,%0\n"
-+			     "\tcpushl %%dc,(%0)\n"
-+			     "\taddq%.l #1,%0\n"
-+			     "\tcpushl %%dc,(%0)\n"
-+			     "\taddq%.l #1,%0\n"
-+			     "\tcpushl %%dc,(%0)" : : "a" (set));
-+}
-+
-+
-+
-+/******************************************************************************
-+ *  Routine to cleanly flush the a block of cache, pushing all relevant lines
-+ *  and invalidating them.
-+ *
-+ ******************************************************************************/
-+void DcacheFlushInvalidateCacheBlock(void *start, unsigned long size)
-+{
-+	unsigned long set;
-+	unsigned long start_set;
-+	unsigned long end_set;
-+
-+	/* if size is bigger than the cache can store
-+	 * set the size to the maximum amount
-+	 */
-+
-+	if (size > LAST_DCACHE_ADDR)
-+		size = LAST_DCACHE_ADDR;
-+
-+	start_set = ((unsigned long)start) & _DCACHE_SET_MASK;
-+	end_set = ((unsigned long)(start+size-1)) & _DCACHE_SET_MASK;
-+
-+	if (start_set > end_set) {
-+		/* from the begining to the lowest address */
-+		for (set = 0; set <= end_set; set += (0x10 - 3))
-+			asm volatile("cpushl %%dc,(%0)\n"
-+				     "\taddq%.l #1,%0\n"
-+				     "\tcpushl %%dc,(%0)\n"
-+				     "\taddq%.l #1,%0\n"
-+				     "\tcpushl %%dc,(%0)\n"
-+				     "\taddq%.l #1,%0\n"
-+				     "\tcpushl %%dc,(%0)" : : "a" (set));
-+
-+		/* next loop will finish the cache ie pass the hole */
-+		end_set = LAST_DCACHE_ADDR;
-+	}
-+	for (set = start_set; set <= end_set; set += (0x10 - 3))
-+		asm volatile("cpushl %%dc,(%0)\n"
-+			     "\taddq%.l #1,%0\n"
-+			     "\tcpushl %%dc,(%0)\n"
-+			     "\taddq%.l #1,%0\n"
-+			     "\tcpushl %%dc,(%0)\n"
-+			     "\taddq%.l #1,%0\n"
-+			     "\tcpushl %%dc,(%0)" : : "a" (set));
-+}
-+
-+
-+void IcacheInvalidateCacheBlock(void *start, unsigned long size)
-+{
-+	unsigned long set;
-+	unsigned long start_set;
-+	unsigned long end_set;
-+
-+	/* if size is bigger than the cache can store
-+	 * set the size to the maximum ammount
-+	 */
-+
-+	if (size > LAST_ICACHE_ADDR)
-+		size = LAST_ICACHE_ADDR;
-+
-+	start_set = ((unsigned long)start) & _ICACHE_SET_MASK;
-+	end_set = ((unsigned long)(start+size-1)) & _ICACHE_SET_MASK;
-+
-+	if (start_set > end_set) {
-+		/* from the begining to the lowest address */
-+		for (set = 0; set <= end_set; set += (0x10 - 3))
-+			asm volatile("cpushl %%ic,(%0)\n"
-+				     "\taddq%.l #1,%0\n"
-+				     "\tcpushl %%ic,(%0)\n"
-+				     "\taddq%.l #1,%0\n"
-+				     "\tcpushl %%ic,(%0)\n"
-+				     "\taddq%.l #1,%0\n"
-+				     "\tcpushl %%ic,(%0)" : : "a" (set));
-+
-+		/* next loop will finish the cache ie pass the hole */
-+		end_set = LAST_ICACHE_ADDR;
-+	}
-+	for (set = start_set; set <= end_set; set += (0x10 - 3))
-+		asm volatile("cpushl %%ic,(%0)\n"
-+			     "\taddq%.l #1,%0\n"
-+			     "\tcpushl %%ic,(%0)\n"
-+			     "\taddq%.l #1,%0\n"
-+			     "\tcpushl %%ic,(%0)\n"
-+			     "\taddq%.l #1,%0\n"
-+			     "\tcpushl %%ic,(%0)" : : "a" (set));
-+}
-+
-+
-+/********************************************************************
-+ *  Disable the data cache completely
-+ ********************************************************************/
-+void DcacheDisable(void)
-+{
-+	int newValue;
-+	unsigned long flags;
-+
-+	local_save_flags(flags);
-+	local_irq_disable();
-+
-+	DcacheFlushInvalidate();      /* begin by flushing the cache */
-+	newValue = CACHE_DISABLE_MODE; /* disable it */
-+	cacr_set(newValue);
-+	local_irq_restore(flags);
-+}
-+
-+/********************************************************************
-+ *  Unconditionally enable the data cache
-+ ********************************************************************/
-+void DcacheEnable(void)
-+{
-+	cacr_set(CACHE_INITIAL_MODE);
-+}
-+
-+
-+unsigned long shadow_cacr;
-+
-+void cacr_set(unsigned long x)
-+{
-+	shadow_cacr = x;
-+
-+	__asm__ __volatile__ ("movec %0, %%cacr"
-+			      : /* no outputs */
-+			      : "r" (shadow_cacr));
-+}
-+
-+unsigned long cacr_get(void)
-+{
-+	return shadow_cacr;
-+}
---- /dev/null
-+++ b/arch/m68k/coldfire/config.c
-@@ -0,0 +1,420 @@
-+/*
-+ *  linux/arch/m68k/coldifre/config.c
-+ *
-+ *  Matt Waddel Matt.Waddel@freescale.com
-+ *  Copyright Freescale Semiconductor, Inc. 2007
-+ *
-+ *  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/init.h>
-+#include <linux/string.h>
-+#include <linux/kernel.h>
-+#include <linux/console.h>
-+#include <linux/bootmem.h>
-+#include <linux/mm.h>
-+#include <asm/bootinfo.h>
-+#include <asm/machdep.h>
-+#include <asm/coldfire.h>
-+#include <asm/cfcache.h>
-+#include <asm/bootinfo.h>
-+#include <asm/io.h>
-+#include <asm/cfmmu.h>
-+#include <asm/setup.h>
-+#include <asm/irq.h>
-+#include <asm/traps.h>
-+#include <asm/movs.h>
-+#include <asm/movs.h>
-+#include <asm/page.h>
-+#include <asm/pgalloc.h>
-+#include <asm/mcf5445x_intc.h>
-+#include <asm/mcf5445x_sdramc.h>
-+#include <asm/mcf5445x_fbcs.h>
-+#include <asm/mcf5445x_dtim.h>
-+
-+/* JKM -- testing */
-+#include <linux/pfn.h>
-+/* JKM */
-+
-+extern int get_irq_list(struct seq_file *p, void *v);
-+extern char _text, _end;
-+extern char _etext, _edata, __init_begin, __init_end;
-+extern struct console mcfrs_console;
-+extern char m68k_command_line[CL_SIZE];
-+extern unsigned long availmem;
-+
-+static int irq_enable[NR_IRQS];
-+unsigned long num_pages;
-+
-+void coldfire_sort_memrec(void)
-+{
-+	int i, j;
-+
-+	/* Sort the m68k_memory records by address */
-+	for (i = 0; i < m68k_num_memory; ++i) {
-+		for (j = i + 1; j < m68k_num_memory; ++j) {
-+			if (m68k_memory[i].addr > m68k_memory[j].addr) {
-+				struct mem_info tmp;
-+				tmp = m68k_memory[i];
-+				m68k_memory[i] = m68k_memory[j];
-+				m68k_memory[j] = tmp;
-+			}
-+		}
-+	}
-+	/* Trim off discontiguous bits */
-+	for (i = 1; i < m68k_num_memory; ++i) {
-+		if ((m68k_memory[i-1].addr + m68k_memory[i-1].size) !=
-+			m68k_memory[i].addr) {
-+			printk(KERN_DEBUG "m68k_parse_bootinfo: addr gap between \
-+				0x%lx & 0x%lx\n",
-+				m68k_memory[i-1].addr+m68k_memory[i-1].size,
-+				m68k_memory[i].addr);
-+			m68k_num_memory = i;
-+			break;
-+		}
-+	}
-+}
-+
-+int __init uboot_commandline(char *bootargs)
-+{
-+	int len = 0, cmd_line_len;
-+	static struct uboot_record uboot_info;
-+
-+	extern unsigned long uboot_info_stk;
-+
-+	/* Add 0x80000000 to get post-remapped kernel memory location */
-+	uboot_info.bd_info = (*(u32 *)(uboot_info_stk)) + 0x80000000;
-+	uboot_info.initrd_start = (*(u32 *)(uboot_info_stk+4)) + 0x80000000;
-+	uboot_info.initrd_end = (*(u32 *)(uboot_info_stk+8)) + 0x80000000;
-+	uboot_info.cmd_line_start = (*(u32 *)(uboot_info_stk+12)) + 0x80000000;
-+	uboot_info.cmd_line_stop = (*(u32 *)(uboot_info_stk+16)) + 0x80000000;
-+
-+	cmd_line_len = uboot_info.cmd_line_stop - uboot_info.cmd_line_start;
-+	if ((cmd_line_len > 0) && (cmd_line_len < CL_SIZE-1))
-+		len = (int)strncpy(bootargs, (char *)uboot_info.cmd_line_start,\
-+				   cmd_line_len);
-+
-+	return len;
-+}
-+
-+/*
-+ * This routine does things not done in the bootloader.
-+ */
-+#define DEFAULT_COMMAND_LINE "root=/dev/mtdblock1 rw rootfstype=jffs2 ip=none mtdparts=physmap-flash.0:5M(kernel)ro,-(jffs2)"
-+asmlinkage void __init cf_early_init(void)
-+{
-+	struct bi_record *record = (struct bi_record *) &_end;
-+
-+	extern char _end;
-+
-+	SET_VBR((void *)MCF_RAMBAR1);
-+
-+	/* Mask all interrupts */
-+	MCF_INTC0_IMRL = 0xFFFFFFFF;
-+	MCF_INTC0_IMRH = 0xFFFFFFFF;
-+	MCF_INTC1_IMRL = 0xFFFFFFFF;
-+	MCF_INTC1_IMRH = 0xFFFFFFFF;
-+
-+#if defined(CONFIG_NOR_FLASH_BASE)
-+	MCF_FBCS_CSAR(1) = CONFIG_NOR_FLASH_BASE;
-+#else
-+	MCF_FBCS_CSAR(1) = 0x00000000;
-+#endif
-+
-+#if CONFIG_SDRAM_SIZE > (256*1024*1024)
-+	/* Init optional SDRAM chip select */
-+	MCF_SDRAMC_SDCS(1) = (256*1024*1024) | 0x1B;
-+#endif
-+
-+	m68k_machtype = MACH_CFMMU;
-+	m68k_fputype = FPU_CFV4E;
-+	m68k_mmutype = MMU_CFV4E;
-+	m68k_cputype = CPU_CFV4E;
-+
-+	m68k_num_memory = 0;
-+	m68k_memory[m68k_num_memory].addr = CONFIG_SDRAM_BASE;
-+	m68k_memory[m68k_num_memory++].size = CONFIG_SDRAM_SIZE;
-+
-+	if (!uboot_commandline(m68k_command_line)) {
-+#if defined(CONFIG_BOOTPARAM)
-+		strncpy(m68k_command_line, CONFIG_BOOTPARAM_STRING, CL_SIZE-1);
-+#else
-+		strcpy(m68k_command_line, DEFAULT_COMMAND_LINE);
-+#endif
-+	}
-+
-+
-+#if defined(CONFIG_BLK_DEV_INITRD)
-+	/* add initrd image */
-+	record = (struct bi_record *) ((void *)record + record->size);
-+	record->tag = BI_RAMDISK;
-+	record->size =  sizeof(record->tag) + sizeof(record->size)
-+		+ sizeof(record->data[0]) + sizeof(record->data[1]);
-+#endif
-+
-+	/* Mark end of tags. */
-+	record = (struct bi_record *) ((void *) record + record->size);
-+	record->tag = 0;
-+	record->data[0] = 0;
-+	record->data[1] = 0;
-+	record->size = sizeof(record->tag) + sizeof(record->size)
-+		+ sizeof(record->data[0]) + sizeof(record->data[1]);
-+
-+	/* Invalidate caches via CACR */
-+	cacr_set(CACHE_DISABLE_MODE);
-+
-+	/* Turn on caches via CACR, enable EUSP */
-+	cacr_set(CACHE_INITIAL_MODE);
-+}
-+
-+void settimericr(unsigned int timer, unsigned int level)
-+{
-+	volatile unsigned char *icrp;
-+	unsigned int icr;
-+	unsigned char irq;
-+
-+	if (timer <= 2) {
-+		switch (timer) {
-+		case 2:  irq = 33; icr = MCFSIM_ICR_TIMER2; break;
-+		default: irq = 32; icr = MCFSIM_ICR_TIMER1; break;
-+		}
-+
-+		icrp = (volatile unsigned char *) (icr);
-+		*icrp = level;
-+		coldfire_enable_irq0(irq);
-+	}
-+}
-+
-+/* Assembler routines */
-+asmlinkage void buserr(void);
-+asmlinkage void trap(void);
-+asmlinkage void system_call(void);
-+asmlinkage void inthandler(void);
-+
-+void __init coldfire_trap_init(void)
-+{
-+	int i = 0;
-+	e_vector *vectors;
-+
-+	vectors = (e_vector *)MCF_RAMBAR1;
-+	/*
-+	 * There is a common trap handler and common interrupt
-+	 * handler that handle almost every vector. We treat
-+	 * the system call and bus error special, they get their
-+	 * own first level handlers.
-+	 */
-+	for (i = 3; (i <= 23); i++)
-+		vectors[i] = trap;
-+	for (i = 33; (i <= 63); i++)
-+		vectors[i] = trap;
-+	for (i = 24; (i <= 31); i++)
-+		vectors[i] = inthandler;
-+	for (i = 64; (i < 255); i++)
-+		vectors[i] = inthandler;
-+
-+	vectors[255] = 0;
-+	vectors[2] = buserr;
-+	vectors[32] = system_call;
-+}
-+
-+void coldfire_tick(void)
-+{
-+	/* Reset the ColdFire timer */
-+	__raw_writeb(MCF_DTIM_DTER_CAP | MCF_DTIM_DTER_REF, MCF_DTIM0_DTER);
-+}
-+
-+void __init coldfire_sched_init(irq_handler_t handler)
-+{
-+	unsigned int	mcf_timerlevel = 5;
-+	unsigned int	mcf_timervector = 64+32;
-+
-+	__raw_writew(MCF_DTIM_DTMR_RST_RST, MCF_DTIM0_DTMR);
-+	__raw_writel(((MCF_BUSCLK / 16) / HZ), MCF_DTIM0_DTRR);
-+	__raw_writew(MCF_DTIM_DTMR_ORRI	| MCF_DTIM_DTMR_CLK_DIV16 |
-+		     MCF_DTIM_DTMR_FRR	| MCF_DTIM_DTMR_RST_EN, \
-+		     MCF_DTIM0_DTMR);
-+
-+	request_irq(mcf_timervector, handler, SA_INTERRUPT, \
-+		    "timer", (void *)MCF_DTIM0_DTMR);
-+
-+	settimericr(1, mcf_timerlevel);
-+}
-+
-+int timerirqpending(int timer)
-+{
-+	unsigned int imr = 0;
-+
-+	switch (timer) {
-+	case 1:  imr = 0x1; break;
-+	case 2:  imr = 0x2; break;
-+	default: break;
-+	}
-+
-+	return (getiprh() & imr);
-+}
-+
-+unsigned long coldfire_gettimeoffset(void)
-+{
-+	volatile unsigned long trr, tcn, offset;
-+
-+	tcn = __raw_readw(MCF_DTIM0_DTCN);
-+	trr = __raw_readl(MCF_DTIM0_DTRR);
-+	offset = (tcn * (1000000 / HZ)) / trr;
-+
-+	/* Check if we just wrapped the counters and maybe missed a tick */
-+	if ((offset < (1000000 / HZ / 2)) && timerirqpending(1))
-+		offset += 1000000 / HZ;
-+	return offset;
-+}
-+
-+void coldfire_reboot(void)
-+{
-+	/* disable interrupts and do a software reset */
-+	asm("movew #0x2700, %%sr\n\t"
-+	    "moveb #0x80, %%d0\n\t"
-+	    "moveb %%d0, 0xfc0a0000\n\t"
-+	    : : : "%d0");
-+}
-+
-+/* int coldfire_hwclk(int i, struct rtc_time *t)
-+{
-+	printk ("Real time clock needs porting.\n");
-+	return 0;
-+}*/
-+
-+static void coldfire_get_model(char *model)
-+{
-+	sprintf(model, "Version 4 ColdFire");
-+}
-+
-+void coldfire_enable_irq(unsigned int vec)
-+{
-+	unsigned long flags;
-+
-+	vec -= 64;
-+
-+	if (((int)vec < 0) || (vec > 63)) {
-+		printk(KERN_WARNING "enable_irq %d failed\n", vec);
-+		return;
-+	}
-+
-+	local_irq_save(flags);
-+	irq_enable[vec]++;
-+	if (vec < 32)
-+		MCF_INTC0_IMRL &= ~(1 << vec);
-+	else
-+		MCF_INTC0_IMRH &= ~(1 << (vec - 32));
-+	local_irq_restore(flags);
-+}
-+
-+void coldfire_disable_irq(unsigned int vec)
-+{
-+	unsigned long flags;
-+
-+	vec -= 64;
-+
-+	if (((int)vec < 0) || (vec > 63)) {
-+		printk(KERN_WARNING "disable_irq %d failed\n", vec);
-+		return;
-+	}
-+
-+	local_irq_save(flags);
-+	if (--irq_enable[vec] == 0) {
-+		if (vec < 32)
-+			MCF_INTC0_IMRL |= (1 << vec);
-+		else
-+			MCF_INTC0_IMRH |= (1 << (vec - 32));
-+
-+	}
-+	local_irq_restore(flags);
-+}
-+
-+static void __init
-+coldfire_bootmem_alloc(unsigned long memory_start, unsigned long memory_end)
-+{
-+	unsigned long base_pfn;
-+
-+	/* compute total pages in system */
-+	num_pages = PAGE_ALIGN(memory_end - PAGE_OFFSET) >> PAGE_SHIFT;
-+
-+	/* align start/end to page boundries */
-+	memory_start = PAGE_ALIGN(memory_start);
-+	memory_end = memory_end & PAGE_MASK;
-+
-+	/* page numbers */
-+	base_pfn = __pa(PAGE_OFFSET) >> PAGE_SHIFT;
-+	min_low_pfn = __pa(memory_start) >> PAGE_SHIFT;
-+	max_low_pfn = __pa(memory_end) >> PAGE_SHIFT;
-+
-+	high_memory = (void *)memory_end;
-+	availmem = memory_start;
-+
-+	/* setup bootmem data */
-+	m68k_setup_node(0);
-+	availmem += init_bootmem_node(NODE_DATA(0), min_low_pfn,
-+		base_pfn, max_low_pfn);
-+	availmem = PAGE_ALIGN(availmem);
-+	free_bootmem(__pa(availmem), memory_end - (availmem));
-+}
-+
-+void __init config_coldfire(void)
-+{
-+	unsigned long endmem, startmem;
-+	int i;
-+
-+	/*
-+	 * Calculate endmem from m68k_memory, assume all are contiguous
-+	 */
-+	startmem = ((((int) &_end) + (PAGE_SIZE - 1)) & PAGE_MASK);
-+	endmem = PAGE_OFFSET;
-+	for (i = 0; i < m68k_num_memory; ++i)
-+		endmem += m68k_memory[i].size;
-+
-+	printk(KERN_INFO "starting up linux startmem 0x%lx, endmem 0x%lx, \
-+		size %luMB\n", startmem,  endmem, (endmem - startmem) >> 20);
-+
-+	memset(irq_enable, 0, sizeof(irq_enable));
-+
-+	/*
-+	 * Setup coldfire mach-specific handlers
-+	 */
-+	mach_max_dma_address 	= 0xffffffff;
-+	mach_sched_init 	= coldfire_sched_init;
-+	mach_tick		= coldfire_tick;
-+	mach_gettimeoffset 	= coldfire_gettimeoffset;
-+	mach_reset 		= coldfire_reboot;
-+/*	mach_hwclk 		= coldfire_hwclk; to be done */
-+	mach_get_model 		= coldfire_get_model;
-+
-+	coldfire_bootmem_alloc(startmem, endmem);
-+
-+	/*
-+	 * initrd setup
-+	 */
-+/* #ifdef CONFIG_BLK_DEV_INITRD
-+	if (m68k_ramdisk.size)  {
-+		reserve_bootmem (__pa(m68k_ramdisk.addr), m68k_ramdisk.size);
-+		initrd_start = (unsigned long) m68k_ramdisk.addr;
-+		initrd_end = initrd_start + m68k_ramdisk.size;
-+		printk (KERN_DEBUG "initrd: %08lx - %08lx\n", initrd_start,
-+			initrd_end);
-+	}
-+#endif */
-+
-+#if defined(CONFIG_DUMMY_CONSOLE) || defined(CONFIG_FRAMEBUFFER_CONSOLE)
-+	conswitchp = &dummy_con;
-+#endif
-+
-+#if defined(CONFIG_SERIAL_COLDFIRE)
-+	/*
-+	 * This causes trouble when it is re-registered later.
-+	 * Currently this is fixed by conditionally commenting
-+	 * out the register_console in mcf_serial.c
-+	 */
-+	register_console(&mcfrs_console);
-+#endif
-+}
---- /dev/null
-+++ b/arch/m68k/coldfire/entry.S
-@@ -0,0 +1,701 @@
-+/*
-+ *  arch/m68k/coldfire/entry.S
-+ *
-+ *  Copyright (C) 1999-2002, Greg Ungerer (gerg@snapgear.com)
-+ *  Copyright (C) 1998  D. Jeff Dionne <jeff@lineo.ca>,
-+ *                      Kenneth Albanowski <kjahds@kjahds.com>,
-+ *  Copyright (C) 2000  Lineo Inc. (www.lineo.com)
-+ *  Copyright (C) 2004-2006  Macq Electronique SA. (www.macqel.com)
-+ *  Matt Waddel Matt.Waddel@freescale.com
-+ *  Kurt Mahan kmahan@freescale.com
-+ *  Copyright Freescale Semiconductor, Inc. 2007
-+ *
-+ * Based on:
-+ *
-+ *  arch/m68knommu/platform/5307/entry.S &
-+ *  arch/m68k/kernel/entry.S
-+ *
-+ *  Copyright (C) 1991, 1992  Linus Torvalds
-+ *
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License.  See the file README.legal in the main directory of this archive
-+ * for more details.
-+ *
-+ * Linux/m68k support by Hamish Macdonald
-+ *
-+ * ColdFire support by Greg Ungerer (gerg@snapgear.com)
-+ * 5307 fixes by David W. Miller
-+ * linux 2.4 support David McCullough <davidm@snapgear.com>
-+ * Bug, speed and maintainability fixes by Philippe De Muyter <phdm@macqel.be>
-+ * Ported to mmu Coldfire by Matt Waddel
-+ */
-+
-+#include <linux/sys.h>
-+#include <linux/linkage.h>
-+#include <asm/cf_entry.h>
-+#include <asm/errno.h>
-+#include <asm/setup.h>
-+#include <asm/segment.h>
-+#include <asm/traps.h>
-+#include <asm/unistd.h>
-+
-+/*
-+ * TASK_INFO:
-+ *
-+ *  - TINFO_PREEMPT (struct thread_info / preempt_count)
-+ *      Used to keep track of preemptability
-+ *  - TINFO_FLAGS (struct thread_info / flags - include/asm-m68k/thread_info.h)
-+ *      Various bit flags that are checked for scheduling/tracing
-+ *	Bits 0-7  are checked every exception exit
-+ *	     8-15 are checked every syscall exit
-+ *
-+ *      TIF_SIGPENDING		6
-+ *      TIF_NEED_RESCHED	7
-+ *      TIF_DELAYED_TRACE	14
-+ *      TIF_SYSCALL_TRACE	15
-+ *      TIF_MEMDIE		16 (never checked here)
-+ */
-+
-+.bss
-+
-+sw_ksp:
-+.long	0
-+
-+sw_usp:
-+.long	0
-+
-+.text
-+
-+.globl system_call
-+.globl buserr
-+.globl trap
-+.globl resume
-+.globl ret_from_exception
-+.globl ret_from_signal
-+.globl sys_call_table
-+.globl ret_from_interrupt
-+.globl inthandler
-+
-+ENTRY(buserr)
-+	SAVE_ALL_INT
-+	GET_CURRENT(%d0)
-+	movel   %sp,%sp@-		/* stack frame pointer argument */
-+	jsr     buserr_c
-+	addql   #4,%sp
-+	jra     .Lret_from_exception
-+
-+ENTRY(trap)
-+	SAVE_ALL_INT
-+	GET_CURRENT(%d0)
-+	movel   %sp,%sp@-		/* stack frame pointer argument */
-+	jsr     trap_c
-+	addql   #4,%sp
-+	jra     .Lret_from_exception
-+
-+	/* After a fork we jump here directly from resume,
-+	   %d1 contains the previous task schedule_tail */
-+ENTRY(ret_from_fork)
-+	movel   %d1,%sp@-
-+	jsr     schedule_tail
-+	addql   #4,%sp
-+	jra     .Lret_from_exception
-+
-+do_trace_entry:
-+	movel	#-ENOSYS,%d1		/* needed for strace */
-+	movel	%d1,%sp@(PT_D0)
-+	subql	#4,%sp
-+	SAVE_SWITCH_STACK
-+	jbsr	syscall_trace
-+	RESTORE_SWITCH_STACK
-+	addql	#4,%sp
-+	movel	%sp@(PT_ORIG_D0),%d0
-+	cmpl	#NR_syscalls,%d0
-+	jcs	syscall
-+badsys:
-+	movel	#-ENOSYS,%d1
-+	movel	%d1,%sp@(PT_D0)
-+	jra	ret_from_exception
-+
-+do_trace_exit:
-+	subql	#4,%sp
-+	SAVE_SWITCH_STACK
-+	jbsr	syscall_trace
-+	RESTORE_SWITCH_STACK
-+	addql	#4,%sp
-+	jra	.Lret_from_exception
-+
-+ENTRY(ret_from_signal)
-+	RESTORE_SWITCH_STACK
-+	addql	#4,%sp
-+	jra	.Lret_from_exception
-+
-+ENTRY(system_call)
-+	SAVE_ALL_SYS
-+
-+	GET_CURRENT(%d1)
-+	/* save top of frame */
-+	movel	%sp,%curptr@(TASK_THREAD+THREAD_ESP0)
-+
-+	/* syscall trace */
-+	tstb	%curptr@(TASK_INFO+TINFO_FLAGS+2)
-+	jmi	do_trace_entry		/* SYSCALL_TRACE is set */
-+	cmpl	#NR_syscalls,%d0
-+	jcc	badsys
-+syscall:
-+	movel	#sys_call_table,%a0
-+	asll	#2,%d0
-+	addl	%d0,%a0
-+	movel	%a0@,%a0
-+	jsr	%a0@
-+	movel	%d0,%sp@(PT_D0)		/* save the return value */
-+ret_from_syscall:
-+	movew	%curptr@(TASK_INFO+TINFO_FLAGS+2),%d0
-+	jne	syscall_exit_work	/* flags set so process */
-+1:	RESTORE_ALL
-+
-+syscall_exit_work:
-+	btst	#5,%sp@(PT_SR)		/* check if returning to kernel */
-+	bnes	1b			/* if so, skip resched, signals */
-+
-+	btstl	#15,%d0			/* check if SYSCALL_TRACE */
-+	jne	do_trace_exit
-+	btstl	#14,%d0			/* check if DELAYED_TRACE */
-+	jne	do_delayed_trace
-+	btstl	#6,%d0			/* check if SIGPENDING */
-+	jne	do_signal_return
-+	pea	resume_userspace
-+	jra	schedule
-+
-+ENTRY(ret_from_exception)
-+.Lret_from_exception:
-+	btst	#5,%sp@(PT_SR)		/* check if returning to kernel */
-+	bnes	1f			/* if so, skip resched, signals */
-+	movel	%d0,%sp@-		/* Only allow interrupts when we are  */
-+	move	%sr,%d0			/* last one on the kernel stack,      */
-+	andl	#ALLOWINT,%d0		/* otherwise stack overflow can occur */
-+	move	%d0,%sr			/* during heavy interrupt load.       */
-+	movel	%sp@+,%d0
-+
-+resume_userspace:
-+	moveb	%curptr@(TASK_INFO+TINFO_FLAGS+3),%d0
-+	jne	exit_work	/* SIGPENDING and/or NEED_RESCHED set */
-+1:	RESTORE_ALL
-+
-+exit_work:
-+	/* save top of frame */
-+	movel	%sp,%curptr@(TASK_THREAD+THREAD_ESP0)
-+	btstl	#6,%d0			/* check for SIGPENDING in flags */
-+	jne	do_signal_return
-+	pea	resume_userspace
-+	jra	schedule
-+
-+do_signal_return:
-+	subql	#4,%sp			/* dummy return address */
-+	SAVE_SWITCH_STACK
-+	pea	%sp@(SWITCH_STACK_SIZE)
-+	clrl	%sp@-
-+	bsrl	do_signal
-+	addql	#8,%sp
-+	RESTORE_SWITCH_STACK
-+	addql	#4,%sp
-+	jbra	resume_userspace
-+
-+do_delayed_trace:
-+	bclr	#7,%sp@(PT_SR)		/* clear trace bit in SR */
-+	pea	1			/* send SIGTRAP */
-+	movel	%curptr,%sp@-
-+	pea	LSIGTRAP
-+	jbsr	send_sig
-+	addql	#8,%sp
-+	addql	#4,%sp
-+	jbra	resume_userspace
-+
-+/*
-+ * This is the interrupt handler (for all hardware interrupt
-+ * sources). It figures out the vector number and calls the appropriate
-+ * interrupt service routine directly.
-+ */
-+ENTRY(inthandler)
-+	SAVE_ALL_INT
-+	GET_CURRENT(%d0)
-+	addql	#1,%curptr@(TASK_INFO+TINFO_PREEMPT)
-+	/* put exception # in d0 */
-+	movel	%sp@(PT_VECTOR),%d0
-+	swap	%d0			/* extract bits 25:18 */
-+	lsrl	#2,%d0
-+	andl	#0x0ff,%d0
-+
-+	movel	%sp,%sp@-
-+	movel	%d0,%sp@-		/* put vector # on stack */
-+auto_irqhandler_fixup = . + 2
-+	jbsr	process_int		/* process the IRQ */
-+	addql	#8,%sp			/* pop parameters off stack */
-+
-+ENTRY(ret_from_interrupt)
-+ret_from_interrupt:
-+
-+	subql	#1,%curptr@(TASK_INFO+TINFO_PREEMPT)
-+	jeq	ret_from_last_interrupt
-+2:	RESTORE_ALL
-+
-+	ALIGN
-+ret_from_last_interrupt:
-+	moveb	%sp@(PT_SR),%d0
-+	andl	#(~ALLOWINT>>8)&0xff,%d0
-+	jne	2b
-+
-+	/* check if we need to do software interrupts */
-+	tstl	irq_stat+CPUSTAT_SOFTIRQ_PENDING
-+	jeq	.Lret_from_exception
-+	pea	ret_from_exception
-+	jra	do_softirq
-+
-+ENTRY(user_inthandler)
-+	SAVE_ALL_INT
-+	GET_CURRENT(%d0)
-+	addql	#1,%curptr@(TASK_INFO+TINFO_PREEMPT)
-+	/* put exception # in d0 */
-+	movel	%sp@(PT_VECTOR),%d0
-+user_irqvec_fixup = . + 2
-+	swap	%d0			/* extract bits 25:18 */
-+	lsrl	#2,%d0
-+	andl	#0x0ff,%d0
-+
-+	movel	%sp,%sp@-
-+	movel	%d0,%sp@-		/* put vector # on stack */
-+user_irqhandler_fixup = . + 2
-+	jbsr	process_int		/* process the IRQ */
-+	addql	#8,%sp			/* pop parameters off stack */
-+
-+	subql	#1,%curptr@(TASK_INFO+TINFO_PREEMPT)
-+	jeq	ret_from_last_interrupt
-+        RESTORE_ALL
-+
-+/* Handler for uninitialized and spurious interrupts */
-+
-+ENTRY(bad_inthandler)
-+	SAVE_ALL_INT
-+	GET_CURRENT(%d0)
-+	addql	#1,%curptr@(TASK_INFO+TINFO_PREEMPT)
-+
-+	movel	%sp,%sp@-
-+	jsr	handle_badint
-+	addql	#4,%sp
-+
-+	subql	#1,%curptr@(TASK_INFO+TINFO_PREEMPT)
-+	jeq	ret_from_last_interrupt
-+	RESTORE_ALL
-+
-+ENTRY(sys_fork)
-+	SAVE_SWITCH_STACK
-+	pea	%sp@(SWITCH_STACK_SIZE)
-+	jbsr	m68k_fork
-+	addql	#4,%sp
-+	RESTORE_SWITCH_STACK
-+	rts
-+
-+ENTRY(sys_clone)
-+	SAVE_SWITCH_STACK
-+	pea	%sp@(SWITCH_STACK_SIZE)
-+	jbsr	m68k_clone
-+	addql	#4,%sp
-+	RESTORE_SWITCH_STACK
-+	rts
-+
-+ENTRY(sys_vfork)
-+	SAVE_SWITCH_STACK
-+	pea	%sp@(SWITCH_STACK_SIZE)
-+	jbsr	m68k_vfork
-+	addql	#4,%sp
-+	RESTORE_SWITCH_STACK
-+	rts
-+
-+ENTRY(sys_sigsuspend)
-+	SAVE_SWITCH_STACK
-+	pea	%sp@(SWITCH_STACK_SIZE)
-+	jbsr	do_sigsuspend
-+	addql	#4,%sp
-+	RESTORE_SWITCH_STACK
-+	rts
-+
-+ENTRY(sys_rt_sigsuspend)
-+	SAVE_SWITCH_STACK
-+	pea	%sp@(SWITCH_STACK_SIZE)
-+	jbsr	do_rt_sigsuspend
-+	addql	#4,%sp
-+	RESTORE_SWITCH_STACK
-+	rts
-+
-+ENTRY(sys_sigreturn)
-+	SAVE_SWITCH_STACK
-+	jbsr	do_sigreturn
-+	RESTORE_SWITCH_STACK
-+	rts
-+
-+ENTRY(sys_rt_sigreturn)
-+	SAVE_SWITCH_STACK
-+	jbsr	do_rt_sigreturn
-+	RESTORE_SWITCH_STACK
-+	rts
-+
-+resume:
-+	/*
-+	 * Beware - when entering resume, prev (the current task) is
-+	 * in a0, next (the new task) is in a1,so don't change these
-+	 * registers until their contents are no longer needed.
-+	 */
-+
-+	/* save sr */
-+	movew	%sr,%d0
-+	movew	%d0,%a0@(TASK_THREAD+THREAD_SR)
-+
-+	/* save usp */
-+	/* Save USP via %a1 (which is saved/restored from %d0) */
-+	movel   %a1,%d0
-+	movel   %usp,%a1
-+	movel   %a1,%a0@(TASK_THREAD+THREAD_USP)
-+	movel   %d0,%a1
-+
-+	/* save non-scratch registers on stack */
-+	SAVE_SWITCH_STACK
-+
-+	/* save current kernel stack pointer */
-+	movel	%sp,%a0@(TASK_THREAD+THREAD_KSP)
-+
-+	/* Return previous task in %d1 */
-+	movel	%curptr,%d1
-+
-+	/* switch to new task (a1 contains new task) */
-+	movel	%a1,%curptr
-+
-+	/* restore the kernel stack pointer */
-+	movel	%a1@(TASK_THREAD+THREAD_KSP),%sp
-+
-+	/* restore non-scratch registers */
-+	RESTORE_SWITCH_STACK
-+
-+	/* restore user stack pointer */
-+	movel	%a1@(TASK_THREAD+THREAD_USP),%a0
-+	movel	%a0,%usp
-+
-+	/* restore status register */
-+	movew	%a1@(TASK_THREAD+THREAD_SR),%d0
-+	movew	%d0,%sr
-+
-+	rts
-+
-+.data
-+ALIGN
-+sys_call_table:
-+	.long sys_ni_syscall	/* 0  -  old "setup()" system call*/
-+	.long sys_exit
-+	.long sys_fork
-+	.long sys_read
-+	.long sys_write
-+	.long sys_open		/* 5 */
-+	.long sys_close
-+	.long sys_waitpid
-+	.long sys_creat
-+	.long sys_link
-+	.long sys_unlink	/* 10 */
-+	.long sys_execve
-+	.long sys_chdir
-+	.long sys_time
-+	.long sys_mknod
-+	.long sys_chmod		/* 15 */
-+	.long sys_chown16
-+	.long sys_ni_syscall			/* old break syscall holder */
-+	.long sys_stat
-+	.long sys_lseek
-+	.long sys_getpid	/* 20 */
-+	.long sys_mount
-+	.long sys_oldumount
-+	.long sys_setuid16
-+	.long sys_getuid16
-+	.long sys_stime		/* 25 */
-+	.long sys_ptrace
-+	.long sys_alarm
-+	.long sys_fstat
-+	.long sys_pause
-+	.long sys_utime		/* 30 */
-+	.long sys_ni_syscall			/* old stty syscall holder */
-+	.long sys_ni_syscall			/* old gtty syscall holder */
-+	.long sys_access
-+	.long sys_nice
-+	.long sys_ni_syscall	/* 35 */	/* old ftime syscall holder */
-+	.long sys_sync
-+	.long sys_kill
-+	.long sys_rename
-+	.long sys_mkdir
-+	.long sys_rmdir		/* 40 */
-+	.long sys_dup
-+	.long sys_pipe
-+	.long sys_times
-+	.long sys_ni_syscall			/* old prof syscall holder */
-+	.long sys_brk		/* 45 */
-+	.long sys_setgid16
-+	.long sys_getgid16
-+	.long sys_signal
-+	.long sys_geteuid16
-+	.long sys_getegid16	/* 50 */
-+	.long sys_acct
-+	.long sys_umount			/* recycled never used phys() */
-+	.long sys_ni_syscall			/* old lock syscall holder */
-+	.long sys_ioctl
-+	.long sys_fcntl		/* 55 */
-+	.long sys_ni_syscall			/* old mpx syscall holder */
-+	.long sys_setpgid
-+	.long sys_ni_syscall			/* old ulimit syscall holder */
-+	.long sys_ni_syscall
-+	.long sys_umask		/* 60 */
-+	.long sys_chroot
-+	.long sys_ustat
-+	.long sys_dup2
-+	.long sys_getppid
-+	.long sys_getpgrp	/* 65 */
-+	.long sys_setsid
-+	.long sys_sigaction
-+	.long sys_sgetmask
-+	.long sys_ssetmask
-+	.long sys_setreuid16	/* 70 */
-+	.long sys_setregid16
-+	.long sys_sigsuspend
-+	.long sys_sigpending
-+	.long sys_sethostname
-+	.long sys_setrlimit	/* 75 */
-+	.long sys_old_getrlimit
-+	.long sys_getrusage
-+	.long sys_gettimeofday
-+	.long sys_settimeofday
-+	.long sys_getgroups16	/* 80 */
-+	.long sys_setgroups16
-+	.long old_select
-+	.long sys_symlink
-+	.long sys_lstat
-+	.long sys_readlink	/* 85 */
-+	.long sys_uselib
-+	.long sys_swapon
-+	.long sys_reboot
-+	.long old_readdir
-+	.long old_mmap		/* 90 */
-+	.long sys_munmap
-+	.long sys_truncate
-+	.long sys_ftruncate
-+	.long sys_fchmod
-+	.long sys_fchown16	/* 95 */
-+	.long sys_getpriority
-+	.long sys_setpriority
-+	.long sys_ni_syscall			/* old profil syscall holder */
-+	.long sys_statfs
-+	.long sys_fstatfs	/* 100 */
-+	.long sys_ni_syscall			/* ioperm for i386 */
-+	.long sys_socketcall
-+	.long sys_syslog
-+	.long sys_setitimer
-+	.long sys_getitimer	/* 105 */
-+	.long sys_newstat
-+	.long sys_newlstat
-+	.long sys_newfstat
-+	.long sys_ni_syscall
-+	.long sys_ni_syscall	/* 110 */	/* iopl for i386 */
-+	.long sys_vhangup
-+	.long sys_ni_syscall			/* obsolete idle() syscall */
-+	.long sys_ni_syscall			/* vm86old for i386 */
-+	.long sys_wait4
-+	.long sys_swapoff	/* 115 */
-+	.long sys_sysinfo
-+	.long sys_ipc
-+	.long sys_fsync
-+	.long sys_sigreturn
-+	.long sys_clone		/* 120 */
-+	.long sys_setdomainname
-+	.long sys_newuname
-+	.long sys_cacheflush			/* modify_ldt for i386 */
-+	.long sys_adjtimex
-+	.long sys_mprotect	/* 125 */
-+	.long sys_sigprocmask
-+	.long sys_ni_syscall			/* old "create_module" */
-+	.long sys_init_module
-+	.long sys_delete_module
-+	.long sys_ni_syscall	/* 130 - old "get_kernel_syms" */
-+	.long sys_quotactl
-+	.long sys_getpgid
-+	.long sys_fchdir
-+	.long sys_bdflush
-+	.long sys_sysfs		/* 135 */
-+	.long sys_personality
-+	.long sys_ni_syscall			/* for afs_syscall */
-+	.long sys_setfsuid16
-+	.long sys_setfsgid16
-+	.long sys_llseek	/* 140 */
-+	.long sys_getdents
-+	.long sys_select
-+	.long sys_flock
-+	.long sys_msync
-+	.long sys_readv		/* 145 */
-+	.long sys_writev
-+	.long sys_getsid
-+	.long sys_fdatasync
-+	.long sys_sysctl
-+	.long sys_mlock		/* 150 */
-+	.long sys_munlock
-+	.long sys_mlockall
-+	.long sys_munlockall
-+	.long sys_sched_setparam
-+	.long sys_sched_getparam	/* 155 */
-+	.long sys_sched_setscheduler
-+	.long sys_sched_getscheduler
-+	.long sys_sched_yield
-+	.long sys_sched_get_priority_max
-+	.long sys_sched_get_priority_min  /* 160 */
-+	.long sys_sched_rr_get_interval
-+	.long sys_nanosleep
-+	.long sys_mremap
-+	.long sys_setresuid16
-+	.long sys_getresuid16	/* 165 */
-+	.long sys_getpagesize
-+	.long sys_ni_syscall			/* old sys_query_module */
-+	.long sys_poll
-+	.long sys_nfsservctl
-+	.long sys_setresgid16	/* 170 */
-+	.long sys_getresgid16
-+	.long sys_prctl
-+	.long sys_rt_sigreturn
-+	.long sys_rt_sigaction
-+	.long sys_rt_sigprocmask	/* 175 */
-+	.long sys_rt_sigpending
-+	.long sys_rt_sigtimedwait
-+	.long sys_rt_sigqueueinfo
-+	.long sys_rt_sigsuspend
-+	.long sys_pread64	/* 180 */
-+	.long sys_pwrite64
-+	.long sys_lchown16;
-+	.long sys_getcwd
-+	.long sys_capget
-+	.long sys_capset	/* 185 */
-+	.long sys_sigaltstack
-+	.long sys_sendfile
-+	.long sys_ni_syscall			/* streams1 */
-+	.long sys_ni_syscall			/* streams2 */
-+	.long sys_vfork		/* 190 */
-+	.long sys_getrlimit
-+	.long sys_mmap2
-+	.long sys_truncate64
-+	.long sys_ftruncate64
-+	.long sys_stat64	/* 195 */
-+	.long sys_lstat64
-+	.long sys_fstat64
-+	.long sys_chown
-+	.long sys_getuid
-+	.long sys_getgid	/* 200 */
-+	.long sys_geteuid
-+	.long sys_getegid
-+	.long sys_setreuid
-+	.long sys_setregid
-+	.long sys_getgroups	/* 205 */
-+	.long sys_setgroups
-+	.long sys_fchown
-+	.long sys_setresuid
-+	.long sys_getresuid
-+	.long sys_setresgid	/* 210 */
-+	.long sys_getresgid
-+	.long sys_lchown
-+	.long sys_setuid
-+	.long sys_setgid
-+	.long sys_setfsuid	/* 215 */
-+	.long sys_setfsgid
-+	.long sys_pivot_root
-+	.long sys_ni_syscall
-+	.long sys_ni_syscall
-+	.long sys_getdents64	/* 220 */
-+	.long sys_gettid
-+	.long sys_tkill
-+	.long sys_setxattr
-+	.long sys_lsetxattr
-+	.long sys_fsetxattr	/* 225 */
-+	.long sys_getxattr
-+	.long sys_lgetxattr
-+	.long sys_fgetxattr
-+	.long sys_listxattr
-+	.long sys_llistxattr	/* 230 */
-+	.long sys_flistxattr
-+	.long sys_removexattr
-+	.long sys_lremovexattr
-+	.long sys_fremovexattr
-+	.long sys_futex		/* 235 */
-+	.long sys_sendfile64
-+	.long sys_mincore
-+	.long sys_madvise
-+	.long sys_fcntl64
-+	.long sys_readahead	/* 240 */
-+	.long sys_io_setup
-+	.long sys_io_destroy
-+	.long sys_io_getevents
-+	.long sys_io_submit
-+	.long sys_io_cancel	/* 245 */
-+	.long sys_fadvise64
-+	.long sys_exit_group
-+	.long sys_lookup_dcookie
-+	.long sys_epoll_create
-+	.long sys_epoll_ctl	/* 250 */
-+	.long sys_epoll_wait
-+	.long sys_remap_file_pages
-+	.long sys_set_tid_address
-+	.long sys_timer_create
-+	.long sys_timer_settime	/* 255 */
-+	.long sys_timer_gettime
-+	.long sys_timer_getoverrun
-+	.long sys_timer_delete
-+	.long sys_clock_settime
-+	.long sys_clock_gettime	/* 260 */
-+	.long sys_clock_getres
-+	.long sys_clock_nanosleep
-+	.long sys_statfs64
-+	.long sys_fstatfs64
-+	.long sys_tgkill	/* 265 */
-+	.long sys_utimes
-+	.long sys_fadvise64_64
-+	.long sys_mbind	
-+	.long sys_get_mempolicy
-+	.long sys_set_mempolicy	/* 270 */
-+	.long sys_mq_open
-+	.long sys_mq_unlink
-+	.long sys_mq_timedsend
-+	.long sys_mq_timedreceive
-+	.long sys_mq_notify	/* 275 */
-+	.long sys_mq_getsetattr
-+	.long sys_waitid
-+	.long sys_ni_syscall			/* for sys_vserver */
-+	.long sys_add_key
-+	.long sys_request_key	/* 280 */
-+	.long sys_keyctl
-+	.long sys_ioprio_set
-+	.long sys_ioprio_get
-+	.long sys_inotify_init
-+	.long sys_inotify_add_watch	/* 285 */
-+	.long sys_inotify_rm_watch
-+	.long sys_migrate_pages
-+	.long sys_openat
-+	.long sys_mkdirat
-+	.long sys_mknodat		/* 290 */
-+	.long sys_fchownat
-+	.long sys_futimesat
-+	.long sys_fstatat64
-+	.long sys_unlinkat
-+	.long sys_renameat		/* 295 */
-+	.long sys_linkat
-+	.long sys_symlinkat
-+	.long sys_readlinkat
-+	.long sys_fchmodat
-+	.long sys_faccessat		/* 300 */
-+	.long sys_ni_syscall			/* Reserved for pselect6 */
-+	.long sys_ni_syscall			/* Reserved for ppoll */
-+	.long sys_unshare
-+	.long sys_set_robust_list
-+	.long sys_get_robust_list	/* 305 */
-+	.long sys_splice
-+	.long sys_sync_file_range
-+	.long sys_tee
-+	.long sys_vmsplice
-+	.long sys_move_pages		/* 310 */
-+
---- /dev/null
-+++ b/arch/m68k/coldfire/head.S
-@@ -0,0 +1,474 @@
-+/*
-+ *  head.S is the MMU enabled ColdFire specific initial boot code
-+ *
-+ *  Ported to ColdFire by
-+ *  Matt Waddel Matt.Waddel@freescale.com
-+ *  Kurt Mahan kmahan@freescale.com
-+ *  Copyright Freescale Semiconductor, Inc. 2007
-+ *
-+ *  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.
-+ *
-+ *  Parts of this code came from arch/m68k/kernel/head.S
-+ */
-+#include <linux/linkage.h>
-+#include <linux/init.h>
-+#include <asm/bootinfo.h>
-+#include <asm/setup.h>
-+#include <asm/entry.h>
-+#include <asm/pgtable.h>
-+#include <asm/page.h>
-+#include <asm/coldfire.h>
-+#include <asm/mcfuart.h>
-+#include <asm/cfcache.h>
-+
-+#define DEBUG
-+
-+.globl kernel_pg_dir
-+.globl availmem
-+.globl set_context
-+.globl set_fpga
-+
-+#ifdef DEBUG
-+/* When debugging use readable names for labels */
-+#ifdef __STDC__
-+#define L(name) .head.S.##name
-+#else
-+#define L(name) .head.S./**/name
-+#endif
-+#else
-+#ifdef __STDC__
-+#define L(name) .L##name
-+#else
-+#define L(name) .L/**/name
-+#endif
-+#endif
-+
-+/* The __INITDATA stuff is a no-op when ftrace or kgdb are turned on */
-+#ifndef __INITDATA
-+#define __INITDATA	.data
-+#define __FINIT		.previous
-+#endif
-+
-+/*
-+ * Setup ACR mappings to provide the following memory map:
-+ *   Data
-+ *     0xA0000000 -> 0xAFFFFFFF [0] NO CACHE / PRECISE / SUPER ONLY
-+ *     0xFC000000 -> 0xFCFFFFFF [1] NO CACHE / PRECISE / SUPER ONLY
-+ *   Code
-+ *     None currently (mapped via TLBs)
-+ */
-+
-+#define ACR0_DEFAULT	#0xA00FA048   /* ACR0 default value */
-+#define ACR1_DEFAULT	#0xFC00A040   /* ACR1 default value */
-+#define ACR2_DEFAULT	#0x00000000   /* ACR2 default value */
-+#define ACR3_DEFAULT	#0x00000000   /* ACR3 default value */
-+
-+/* ACR mapping for FPGA (maps 0) */
-+#define ACR0_FPGA	#0x000FA048   /* ACR0 enable FPGA */
-+
-+/* Several macros to make the writing of subroutines easier:
-+ * - func_start marks the beginning of the routine which setups the frame
-+ *   register and saves the registers, it also defines another macro
-+ *   to automatically restore the registers again.
-+ * - func_return marks the end of the routine and simply calls the prepared
-+ *   macro to restore registers and jump back to the caller.
-+ * - func_define generates another macro to automatically put arguments
-+ *   onto the stack call the subroutine and cleanup the stack again.
-+ */
-+
-+.macro	load_symbol_address	symbol,register
-+	movel	#\symbol,\register
-+.endm
-+	
-+.macro	func_start	name,saveregs,savesize,stack=0
-+L(\name):
-+	linkw	%a6,#-\stack
-+	subal	#(\savesize),%sp
-+	moveml	\saveregs,%sp@
-+.set	stackstart,-\stack
-+
-+.macro	func_return_\name
-+	moveml	%sp@,\saveregs
-+	addal	#(\savesize),%sp
-+	unlk	%a6
-+	rts
-+.endm
-+.endm
-+
-+.macro	func_return	name
-+	func_return_\name
-+.endm
-+
-+.macro	func_call	name
-+	jbsr	L(\name)
-+.endm
-+
-+.macro	move_stack	nr,arg1,arg2,arg3,arg4
-+.if	\nr
-+	move_stack	"(\nr-1)",\arg2,\arg3,\arg4
-+	movel	\arg1,%sp@-
-+.endif
-+.endm
-+
-+.macro	func_define	name,nr=0
-+.macro	\name	arg1,arg2,arg3,arg4
-+	move_stack	\nr,\arg1,\arg2,\arg3,\arg4
-+	func_call	\name
-+.if	\nr
-+	lea	%sp@(\nr*4),%sp
-+.endif
-+.endm
-+.endm
-+
-+func_define	serial_putc,1
-+
-+.macro	putc	ch
-+	pea	\ch
-+	func_call	serial_putc
-+	addql	#4,%sp
-+.endm
-+
-+.macro	dputc	ch
-+#ifdef DEBUG
-+	putc	\ch
-+#endif
-+.endm
-+
-+func_define	putn,1
-+
-+.macro	dputn	nr
-+#ifdef DEBUG
-+	putn	\nr
-+#endif
-+.endm
-+
-+/*
-+	mmu_map  -  creates a new TLB entry
-+
-+	virt_addr      Must be on proper boundary
-+	phys_addr      Must be on proper boundary
-+	itlb           MMUOR_ITLB if instruction TLB or 0
-+	asid           address space ID
-+	shared_global  MMUTR_SG if shared between different ASIDs or 0
-+	size_code      MMUDR_SZ1M  1 MB
-+	               MMUDR_SZ4K  4 KB
-+	               MMUDR_SZ8K  8 KB
-+	               MMUDR_SZ16M 16 MB
-+	cache_mode     MMUDR_INC   instruction non-cacheable
-+                       MMUDR_IC    instruction cacheable
-+                       MMUDR_DWT   data writethrough
-+	               MMUDR_DCB   data copyback
-+	               MMUDR_DNCP  data non-cacheable, precise
-+	               MMUDR_DNCIP data non-cacheable, imprecise
-+	super_prot     MMUDR_SP if user mode generates exception or 0
-+	readable       MMUDR_R if permits read access (data TLB) or 0
-+	writable       MMUDR_W if permits write access (data TLB) or 0
-+	executable     MMUDR_X if permits execute access (instruction TLB) or 0
-+	locked         MMUDR_LK prevents TLB entry from being replaced or 0
-+	temp_data_reg  a data register to use for temporary values
-+*/
-+.macro mmu_map	virt_addr,phys_addr,itlb,asid,shared_global,size_code,cache_mode,super_prot,readable,writable,executable,locked,temp_data_reg
-+	/* Set up search of TLB. */
-+	movel	#(\virt_addr+1), \temp_data_reg
-+	movel	\temp_data_reg, MMUAR
-+	/* Search.  */
-+	movel	#(MMUOR_STLB + MMUOR_ADR +\itlb), \temp_data_reg
-+	movew	\temp_data_reg, (MMUOR)
-+	/* Set up tag value.  */
-+	movel	#(\virt_addr + \asid + \shared_global + MMUTR_V), \temp_data_reg
-+	movel	\temp_data_reg, MMUTR
-+	/* Set up data value.  */
-+	movel	#(\phys_addr + \size_code + \cache_mode + \super_prot + \readable + \writable + \executable + \locked), \temp_data_reg
-+	movel	\temp_data_reg, MMUDR
-+	/* Save it.  */
-+	movel	#(MMUOR_ACC + MMUOR_UAA + \itlb), \temp_data_reg
-+	movew	\temp_data_reg, (MMUOR)
-+.endm	/* mmu_map */
-+
-+.macro mmu_unmap	virt_addr,itlb,temp_data_reg
-+	/* Set up search of TLB. */
-+	movel	#(\virt_addr+1), \temp_data_reg
-+	movel	\temp_data_reg, MMUAR
-+	/* Search.  */
-+	movel	#(MMUOR_STLB + MMUOR_ADR +\itlb), \temp_data_reg
-+	movew	\temp_data_reg, (MMUOR)
-+	/* Test for hit.  */
-+	movel	MMUSR,\temp_data_reg
-+	btst	#MMUSR_HITN,\temp_data_reg
-+	beq	1f
-+	/* Read the TLB.  */
-+	movel	#(MMUOR_RW + MMUOR_ACC +\itlb), \temp_data_reg
-+	movew	\temp_data_reg, (MMUOR)
-+	movel	MMUSR,\temp_data_reg
-+	/* Set up tag value.  */
-+	movel	#0, \temp_data_reg
-+	movel	\temp_data_reg, MMUTR
-+	/* Set up data value.  */
-+	movel	#0, \temp_data_reg
-+	movel	\temp_data_reg, MMUDR
-+	/* Save it.  */
-+	movel	#(MMUOR_ACC + MMUOR_UAA + \itlb), \temp_data_reg
-+	movew	\temp_data_reg, (MMUOR)
-+1:	
-+.endm	/* mmu_unmap */
-+
-+/* .text */
-+.section ".text.head","ax"
-+ENTRY(_stext)
-+/* Version numbers of the bootinfo interface -- if we later pass info
-+ * from boot ROM we might want to put something real here.
-+ *
-+ * The area from _stext to _start will later be used as kernel pointer table
-+ */
-+	bras	1f	/* Jump over bootinfo version numbers */
-+
-+	.long	BOOTINFOV_MAGIC
-+	.long	0
-+1:	jmp	__start-0x80000000
-+
-+.equ	kernel_pg_dir,_stext
-+.equ	.,_stext+0x1000
-+
-+ENTRY(_start)
-+	jra	__start
-+__INIT
-+ENTRY(__start)
-+
-+/* Save the location of u-boot info - cmd line, bd_info, etc. */
-+	movel	%a7,%a4		/* Don't use %a4 before cf_early_init */
-+	addl	#0x80000004,%a4	/* 0x80000004= 1 stack push + high mem offset */
-+
-+/* Setup initial stack pointer */
-+	movel	#0x40001000,%sp	
-+
-+/* Clear usp */
-+	subl	%a0,%a0
-+	movel	%a0,%usp
-+
-+	movel  #(MCF_RAMBAR1 + 0x221), %d0
-+	movec   %d0, %rambar1
-+	movew	#0x2700,%sr
-+
-+	movel	#(MMU_BASE+1),%d0
-+	movecl	%d0,%mmubar
-+	movel	#MMUOR_CA,%a0  			/* Clear tlb entries */
-+	movew	%a0,(MMUOR)
-+	movel	#(MMUOR_CA + MMUOR_ITLB),%a0 	/* Use ITLB for searches */
-+	movew	%a0,(MMUOR)
-+	movel	#0,%a0 				/* Clear Addr Space User ID */
-+	movecl	%a0,%asid 
-+
-+/* setup ACRs */
-+	movel	ACR0_DEFAULT, %d0  		/* ACR0 (DATA) setup */
-+	movec   %d0, %acr0
-+	movel	ACR1_DEFAULT, %d0  		/* ACR1 (DATA) setup */
-+	movec   %d0, %acr1
-+	movel	ACR2_DEFAULT, %d0  		/* ACR2 (CODE) setup */
-+	movec   %d0, %acr2
-+	movel	ACR3_DEFAULT, %d0  		/* ACR3 (CODE) setup */
-+	movec   %d0, %acr3
-+
-+	/* If you change the memory size to another value make a matching 
-+	   change in paging_init(cf-mmu.c) to zones_size[]. */
-+
-+	/* Map 256MB as code */
-+	mmu_map	(PAGE_OFFSET+0*0x1000000),  (PHYS_OFFSET+0*0x1000000), \
-+		MMUOR_ITLB, 0, MMUTR_SG, MMUDR_SZ16M, MMUDR_IC,  MMUDR_SP, \
-+		0, 0, MMUDR_X, MMUDR_LK, %d0
-+	mmu_map	(PAGE_OFFSET+1*0x1000000),  (PHYS_OFFSET+1*0x1000000), \
-+		MMUOR_ITLB, 0, MMUTR_SG, MMUDR_SZ16M, MMUDR_IC,  MMUDR_SP, \
-+		0, 0, MMUDR_X, MMUDR_LK, %d0
-+	mmu_map	(PAGE_OFFSET+2*0x1000000),  (PHYS_OFFSET+2*0x1000000), \
-+		MMUOR_ITLB, 0, MMUTR_SG, MMUDR_SZ16M, MMUDR_IC,  MMUDR_SP, \
-+		0, 0, MMUDR_X, MMUDR_LK, %d0
-+	mmu_map	(PAGE_OFFSET+3*0x1000000),  (PHYS_OFFSET+3*0x1000000), \
-+		MMUOR_ITLB, 0, MMUTR_SG, MMUDR_SZ16M, MMUDR_IC,  MMUDR_SP, \
-+		0, 0, MMUDR_X, MMUDR_LK, %d0
-+	mmu_map	(PAGE_OFFSET+4*0x1000000),  (PHYS_OFFSET+4*0x1000000), \
-+		MMUOR_ITLB, 0, MMUTR_SG, MMUDR_SZ16M, MMUDR_IC,  MMUDR_SP, \
-+		0, 0, MMUDR_X, MMUDR_LK, %d0
-+	mmu_map	(PAGE_OFFSET+5*0x1000000),  (PHYS_OFFSET+5*0x1000000), \
-+		MMUOR_ITLB, 0, MMUTR_SG, MMUDR_SZ16M, MMUDR_IC,  MMUDR_SP, \
-+		0, 0, MMUDR_X, MMUDR_LK, %d0
-+	mmu_map	(PAGE_OFFSET+6*0x1000000),  (PHYS_OFFSET+6*0x1000000), \
-+		MMUOR_ITLB, 0, MMUTR_SG, MMUDR_SZ16M, MMUDR_IC,  MMUDR_SP, \
-+		0, 0, MMUDR_X, MMUDR_LK, %d0
-+	mmu_map	(PAGE_OFFSET+7*0x1000000),  (PHYS_OFFSET+7*0x1000000), \
-+		MMUOR_ITLB, 0, MMUTR_SG, MMUDR_SZ16M, MMUDR_IC,  MMUDR_SP, \
-+		0, 0, MMUDR_X, MMUDR_LK, %d0
-+	mmu_map	(PAGE_OFFSET+8*0x1000000),  (PHYS_OFFSET+8*0x1000000), \
-+		MMUOR_ITLB, 0, MMUTR_SG, MMUDR_SZ16M, MMUDR_IC,  MMUDR_SP, \
-+		0, 0, MMUDR_X, MMUDR_LK, %d0
-+	mmu_map	(PAGE_OFFSET+9*0x1000000),  (PHYS_OFFSET+9*0x1000000), \
-+		MMUOR_ITLB, 0, MMUTR_SG, MMUDR_SZ16M, MMUDR_IC,  MMUDR_SP, \
-+		0, 0, MMUDR_X, MMUDR_LK, %d0
-+	mmu_map	(PAGE_OFFSET+10*0x1000000), (PHYS_OFFSET+10*0x1000000), \
-+		MMUOR_ITLB, 0, MMUTR_SG, MMUDR_SZ16M, MMUDR_IC,  MMUDR_SP, \
-+		0, 0, MMUDR_X, MMUDR_LK, %d0
-+	mmu_map	(PAGE_OFFSET+11*0x1000000), (PHYS_OFFSET+11*0x1000000), \
-+		MMUOR_ITLB, 0, MMUTR_SG, MMUDR_SZ16M, MMUDR_IC,  MMUDR_SP, \
-+		0, 0, MMUDR_X, MMUDR_LK, %d0
-+	mmu_map	(PAGE_OFFSET+12*0x1000000), (PHYS_OFFSET+12*0x1000000), \
-+		MMUOR_ITLB, 0, MMUTR_SG, MMUDR_SZ16M, MMUDR_IC,  MMUDR_SP, \
-+		0, 0, MMUDR_X, MMUDR_LK, %d0
-+	mmu_map	(PAGE_OFFSET+13*0x1000000), (PHYS_OFFSET+13*0x1000000), \
-+		MMUOR_ITLB, 0, MMUTR_SG, MMUDR_SZ16M, MMUDR_IC,  MMUDR_SP, \
-+		0, 0, MMUDR_X, MMUDR_LK, %d0
-+	mmu_map	(PAGE_OFFSET+14*0x1000000), (PHYS_OFFSET+14*0x1000000), \
-+		MMUOR_ITLB, 0, MMUTR_SG, MMUDR_SZ16M, MMUDR_IC,  MMUDR_SP, \
-+		0, 0, MMUDR_X, MMUDR_LK, %d0
-+	mmu_map	(PAGE_OFFSET+15*0x1000000), (PHYS_OFFSET+15*0x1000000), \
-+		MMUOR_ITLB, 0, MMUTR_SG, MMUDR_SZ16M, MMUDR_IC,  MMUDR_SP, \
-+		0, 0, MMUDR_X, MMUDR_LK, %d0
-+
-+	/* Map 256MB as data also */
-+	mmu_map	(PAGE_OFFSET+0*0x1000000),  (PHYS_OFFSET+0*0x1000000), 0, 0, \
-+		MMUTR_SG, MMUDR_SZ16M, MMUDR_DNCP, MMUDR_SP, MMUDR_R, MMUDR_W, \
-+		0, MMUDR_LK, %d0
-+	mmu_map	(PAGE_OFFSET+1*0x1000000),  (PHYS_OFFSET+1*0x1000000), 0, 0, \
-+		MMUTR_SG, MMUDR_SZ16M, MMUDR_DNCP, MMUDR_SP, MMUDR_R, MMUDR_W, \
-+		0, MMUDR_LK, %d0
-+	mmu_map	(PAGE_OFFSET+2*0x1000000),  (PHYS_OFFSET+2*0x1000000), 0, 0, \
-+		MMUTR_SG, MMUDR_SZ16M, MMUDR_DNCP, MMUDR_SP, MMUDR_R, MMUDR_W, \
-+		0, MMUDR_LK, %d0
-+	mmu_map	(PAGE_OFFSET+3*0x1000000),  (PHYS_OFFSET+3*0x1000000), 0, 0, \
-+		MMUTR_SG, MMUDR_SZ16M, MMUDR_DNCP, MMUDR_SP, MMUDR_R, MMUDR_W, \
-+		0, MMUDR_LK, %d0
-+	mmu_map	(PAGE_OFFSET+4*0x1000000),  (PHYS_OFFSET+4*0x1000000), 0, 0, \
-+		MMUTR_SG, MMUDR_SZ16M, MMUDR_DNCP, MMUDR_SP, MMUDR_R, MMUDR_W, \
-+		0, MMUDR_LK, %d0
-+	mmu_map	(PAGE_OFFSET+5*0x1000000),  (PHYS_OFFSET+5*0x1000000), 0, 0, \
-+		MMUTR_SG, MMUDR_SZ16M, MMUDR_DNCP, MMUDR_SP, MMUDR_R, MMUDR_W, \
-+		0, MMUDR_LK, %d0
-+	mmu_map	(PAGE_OFFSET+6*0x1000000),  (PHYS_OFFSET+6*0x1000000), 0, 0, \
-+		MMUTR_SG, MMUDR_SZ16M, MMUDR_DNCP, MMUDR_SP, MMUDR_R, MMUDR_W, \
-+		0, MMUDR_LK, %d0
-+	mmu_map	(PAGE_OFFSET+7*0x1000000),  (PHYS_OFFSET+7*0x1000000), 0, 0, \
-+		MMUTR_SG, MMUDR_SZ16M, MMUDR_DNCP, MMUDR_SP, MMUDR_R, MMUDR_W, \
-+		0, MMUDR_LK, %d0
-+	mmu_map	(PAGE_OFFSET+8*0x1000000),  (PHYS_OFFSET+8*0x1000000), 0, 0, \
-+		MMUTR_SG, MMUDR_SZ16M, MMUDR_DNCP, MMUDR_SP, MMUDR_R, MMUDR_W, \
-+		0, MMUDR_LK, %d0
-+	mmu_map	(PAGE_OFFSET+9*0x1000000),  (PHYS_OFFSET+9*0x1000000), 0, 0, \
-+		MMUTR_SG, MMUDR_SZ16M, MMUDR_DNCP, MMUDR_SP, MMUDR_R, MMUDR_W, \
-+		0, MMUDR_LK, %d0
-+	mmu_map	(PAGE_OFFSET+10*0x1000000), (PHYS_OFFSET+10*0x1000000), 0, 0, \
-+		MMUTR_SG, MMUDR_SZ16M, MMUDR_DNCP, MMUDR_SP, MMUDR_R, MMUDR_W, \
-+		0, MMUDR_LK, %d0
-+	mmu_map	(PAGE_OFFSET+11*0x1000000), (PHYS_OFFSET+11*0x1000000), 0, 0, \
-+		MMUTR_SG, MMUDR_SZ16M, MMUDR_DNCP, MMUDR_SP, MMUDR_R, MMUDR_W, \
-+		0, MMUDR_LK, %d0
-+	mmu_map	(PAGE_OFFSET+12*0x1000000), (PHYS_OFFSET+12*0x1000000), 0, 0, \
-+		MMUTR_SG, MMUDR_SZ16M, MMUDR_DNCP, MMUDR_SP, MMUDR_R, MMUDR_W, \
-+		0, MMUDR_LK, %d0
-+	mmu_map	(PAGE_OFFSET+13*0x1000000), (PHYS_OFFSET+13*0x1000000), 0, 0, \
-+		MMUTR_SG, MMUDR_SZ16M, MMUDR_DNCP, MMUDR_SP, MMUDR_R, MMUDR_W, \
-+		0, MMUDR_LK, %d0
-+	mmu_map	(PAGE_OFFSET+14*0x1000000), (PHYS_OFFSET+14*0x1000000), 0, 0, \
-+		MMUTR_SG, MMUDR_SZ16M, MMUDR_DNCP, MMUDR_SP, MMUDR_R, MMUDR_W, \
-+		0, MMUDR_LK, %d0
-+	mmu_map	(PAGE_OFFSET+15*0x1000000), (PHYS_OFFSET+15*0x1000000), 0, 0, \
-+		MMUTR_SG, MMUDR_SZ16M, MMUDR_DNCP, MMUDR_SP, MMUDR_R, MMUDR_W, \
-+		0, MMUDR_LK, %d0
-+
-+	/* Do unity mapping to enable the MMU.  Map first 16 MB in place as 
-+	   code (delete TLBs after MMU is enabled and we are executing in high 
-+	   memory). */
-+	mmu_map	(PHYS_OFFSET+0*0x1000000), (PHYS_OFFSET+0*0x1000000), \
-+		MMUOR_ITLB, 0, MMUTR_SG, MMUDR_SZ16M, MMUDR_INC,  MMUDR_SP, 0, \
-+		0, MMUDR_X, 0, %d0
-+	/* Map first 16 MB as data too.  */
-+	mmu_map	(PHYS_OFFSET+0*0x1000000), (PHYS_OFFSET+0*0x1000000), 0, 0, \
-+		MMUTR_SG, MMUDR_SZ16M, MMUDR_DNCP, MMUDR_SP, MMUDR_R, MMUDR_W, \
-+		0, 0, %d0
-+
-+	/* Turn on MMU */
-+	movel	#(MMUCR_EN),%a0
-+	movel	%a0,MMUCR
-+	nop	/* This synchs the pipeline after a write to MMUCR */
-+
-+	movel	#__running_high,%a0  /* Get around PC-relative addressing. */
-+	jmp	%a0@
-+
-+ENTRY(__running_high)
-+	load_symbol_address _stext,%sp
-+	movel	L(memory_start),%a0
-+	movel	%a0,availmem
-+	load_symbol_address L(phys_kernel_start),%a0
-+	load_symbol_address _stext,%a1
-+	subl	#_stext,%a1
-+	addl	#PAGE_OFFSET,%a1
-+	movel	%a1,%a0@
-+
-+	/* Unmap first 16 MB, code and data.  */
-+	mmu_unmap (PHYS_OFFSET+0*0x1000000), MMUOR_ITLB, %d0
-+	mmu_unmap (PHYS_OFFSET+0*0x1000000), 0, %d0
-+
-+/* Setup initial stack pointer */
-+	lea	init_task,%a2 
-+	lea	init_thread_union+THREAD_SIZE,%sp
-+	subl	%a6,%a6		/* clear a6 for gdb */
-+
-+#ifdef CONFIG_MCF_USER_HALT
-+/* Setup debug control reg to allow halts from user space */
-+	lea	wdbg_uhe,%a0
-+	wdebug	(%a0)
-+#endif
-+
-+	movel	%a4,uboot_info_stk /* save uboot info to variable */
-+	jsr	cf_early_init
-+	jmp	start_kernel
-+
-+.section ".text.head","ax"
-+set_context:
-+func_start	set_context,%d0,(1*4)
-+	movel	12(%sp),%d0
-+	movec	%d0,%asid
-+func_return	set_context
-+
-+/*
-+ * set_fpga(addr,val)
-+ *
-+ * Map in 0x00000000 -> 0x0fffffff and then do the write.
-+ */
-+set_fpga:
-+	movew	%sr,%d1
-+	movew	#0x2700,%sr
-+	movel	ACR0_FPGA, %d0
-+	movec   %d0, %acr0
-+	nop
-+	moveal	4(%sp),%a0
-+	movel	8(%sp),%a0@
-+	movel	ACR0_DEFAULT, %d0
-+	movec   %d0, %acr0
-+	nop
-+	movew	%d1,%sr
-+	rts
-+
-+	.data
-+	.align	4
-+
-+availmem:
-+	.long	0
-+L(phys_kernel_start):
-+	.long	PAGE_OFFSET
-+L(kernel_end):
-+	.long	0
-+L(memory_start):
-+	.long	PAGE_OFFSET_RAW
-+
-+#ifdef CONFIG_MCF_USER_HALT
-+/*
-+ * Enable User Halt Enable in the debug control register.
-+ */
-+wdbg_uhe:
-+	.word	0x2c80	/* DR0 */
-+	.word	0x00b0	/* 31:16 */
-+	.word	0x0400	/* 15:0 -- enable UHE */
-+	.word	0x0000	/* unused */
-+#endif
-+
-+
---- /dev/null
-+++ b/arch/m68k/coldfire/ints.c
-@@ -0,0 +1,384 @@
-+/*
-+ * linux/arch/m68k/coldfire/ints.c -- General interrupt handling code
-+ *
-+ * Copyright (C) 1999-2002  Greg Ungerer (gerg@snapgear.com)
-+ * Copyright (C) 1998  D. Jeff Dionne <jeff@lineo.ca>,
-+ *                     Kenneth Albanowski <kjahds@kjahds.com>,
-+ * Copyright (C) 2000  Lineo Inc. (www.lineo.com)
-+ * Matt Waddel Matt.Waddel@freescale.com
-+ * Copyright Freescale Semiconductor, Inc. 2007
-+ * Kurt Mahan kmahan@freescale.com
-+ *
-+ * Based on:
-+ * linux/arch/m68k/kernel/ints.c &
-+ * linux/arch/m68knommu/5307/ints.c
-+ *
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License.  See the file COPYING in the main directory of this archive
-+ * for more details.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/types.h>
-+#include <linux/init.h>
-+#include <linux/sched.h>
-+#include <linux/kernel_stat.h>
-+#include <linux/errno.h>
-+#include <linux/seq_file.h>
-+#include <linux/interrupt.h>
-+
-+#include <asm/system.h>
-+#include <asm/irq.h>
-+#include <asm/traps.h>
-+#include <asm/page.h>
-+#include <asm/machdep.h>
-+#include <asm/irq_regs.h>
-+
-+#include <asm/mcfsim.h>
-+
-+/*
-+ * IRQ Handler lists.
-+ */
-+static struct irq_node *irq_list[SYS_IRQS];
-+static struct irq_controller *irq_controller[SYS_IRQS];
-+static int irq_depth[SYS_IRQS];
-+
-+/*
-+ * IRQ Controller
-+ */
-+#ifdef CONFIG_M54455
-+void m5445x_irq_enable(unsigned int irq);
-+void m5445x_irq_disable(unsigned int irq);
-+static struct irq_controller m5445x_irq_controller = {
-+	.name		= "M5445X",
-+	.lock		= SPIN_LOCK_UNLOCKED,
-+	.enable		= m5445x_irq_enable,
-+	.disable	= m5445x_irq_disable,
-+};
-+#endif
-+
-+#define	POOL_SIZE 	SYS_IRQS
-+static struct irq_node  pool[POOL_SIZE];
-+static struct irq_node *get_irq_node(void);
-+
-+/* The number of spurious interrupts */
-+unsigned int num_spurious;
-+asmlinkage void handle_badint(struct pt_regs *regs);
-+
-+/*
-+ * void init_IRQ(void)
-+ *
-+ * This function should be called during kernel startup to initialize
-+ * the IRQ handling routines.
-+ */
-+void __init init_IRQ(void)
-+{
-+	int i;
-+
-+#ifdef CONFIG_M54455
-+	for (i = 0; i < SYS_IRQS; i++)
-+		irq_controller[i] = &m5445x_irq_controller;
-+#endif
-+}
-+
-+/*
-+ * process_int(unsigned long vec, struct pt_regs *fp)
-+ *
-+ * Process an interrupt.  Called from entry.S.
-+ */
-+asmlinkage void process_int(unsigned long vec, struct pt_regs *fp)
-+{
-+	struct pt_regs *old_regs;
-+	struct irq_node *node;
-+	old_regs = set_irq_regs(fp);
-+	kstat_cpu(0).irqs[vec]++;
-+
-+	node = irq_list[vec];
-+	if (!node)
-+		handle_badint(fp);
-+	else {
-+		do {
-+			node->handler(vec, node->dev_id);
-+			node = node->next;
-+		} while (node);
-+	}
-+
-+	set_irq_regs(old_regs);
-+}
-+
-+/*
-+ * show_interrupts( struct seq_file *p, void *v)
-+ *
-+ * Called to show all the current interrupt information.
-+ */
-+int show_interrupts(struct seq_file *p, void *v)
-+{
-+	struct irq_controller *contr;
-+	struct irq_node *node;
-+	int i = *(loff_t *) v;
-+
-+	if ((i < NR_IRQS) && (irq_list[i])) {
-+		contr = irq_controller[i];
-+		node = irq_list[i];
-+		seq_printf(p, "%-8s %3u: %10u %s", contr->name, i,
-+			kstat_cpu(0).irqs[i], node->devname);
-+		while ((node = node->next))
-+			seq_printf(p, ", %s", node->devname);
-+
-+		seq_printf(p, "\n");
-+	}
-+
-+	return 0;
-+}
-+
-+/*
-+ * get_irq_node(void)
-+ *
-+ * Get an irq node from the pool.
-+ */
-+struct irq_node *get_irq_node(void)
-+{
-+	struct irq_node *p = pool;
-+	int i;
-+
-+	for (i = 0; i < POOL_SIZE; i++, p++) {
-+		if (!p->handler) {
-+			memset(p, 0, sizeof(struct irq_node));
-+			return p;
-+		}
-+	}
-+	printk(KERN_INFO "%s(%s:%d): No more irq nodes, I suggest you \
-+		increase POOL_SIZE", __FUNCTION__, __FILE__, __LINE__);
-+	return NULL;
-+}
-+
-+void init_irq_proc(void)
-+{
-+	/* Insert /proc/irq driver here */
-+}
-+
-+int setup_irq(unsigned int irq, struct irq_node *node)
-+{
-+	struct irq_controller *contr;
-+	struct irq_node **prev;
-+	unsigned long flags;
-+
-+	if (irq >= NR_IRQS || !irq_controller[irq]) {
-+		printk("%s: Incorrect IRQ %d from %s\n",
-+		       __FUNCTION__, irq, node->devname);
-+		return -ENXIO;
-+	}
-+
-+	contr = irq_controller[irq];
-+	spin_lock_irqsave(&contr->lock, flags);
-+
-+	prev = irq_list + irq;
-+	if (*prev) {
-+		/* Can't share interrupts unless both agree to */
-+		if (!((*prev)->flags & node->flags & IRQF_SHARED)) {
-+			spin_unlock_irqrestore(&contr->lock, flags);
-+			return -EBUSY;
-+		}
-+		while (*prev)
-+			prev = &(*prev)->next;
-+	}
-+
-+	if (!irq_list[irq]) {
-+		if (contr->startup)
-+			contr->startup(irq);
-+		else
-+			contr->enable(irq);
-+	}
-+	node->next = NULL;
-+	*prev = node;
-+
-+	spin_unlock_irqrestore(&contr->lock, flags);
-+
-+	return 0;
-+}
-+
-+int request_irq(unsigned int irq,
-+		irq_handler_t handler,
-+		unsigned long flags, const char *devname, void *dev_id)
-+{
-+	struct irq_node *node = get_irq_node();
-+	int res;
-+
-+	if (!node)
-+		return -ENOMEM;
-+
-+	node->handler = handler;
-+	node->flags   = flags;
-+	node->dev_id  = dev_id;
-+	node->devname = devname;
-+
-+	res = setup_irq(irq, node);
-+	if (res)
-+		node->handler = NULL;
-+
-+	return res;
-+}
-+EXPORT_SYMBOL(request_irq);
-+
-+void free_irq(unsigned int irq, void *dev_id)
-+{
-+	struct irq_controller *contr;
-+	struct irq_node **p, *node;
-+	unsigned long flags;
-+
-+	if (irq >= NR_IRQS || !irq_controller[irq]) {
-+		printk(KERN_DEBUG "%s: Incorrect IRQ %d\n", __FUNCTION__, irq);
-+		return;
-+	}
-+
-+	contr = irq_controller[irq];
-+	spin_lock_irqsave(&contr->lock, flags);
-+
-+	p = irq_list + irq;
-+	while ((node = *p)) {
-+		if (node->dev_id == dev_id)
-+			break;
-+		p = &node->next;
-+	}
-+
-+	if (node) {
-+		*p = node->next;
-+		node->handler = NULL;
-+	} else
-+		printk(KERN_DEBUG "%s: Removing probably wrong IRQ %d\n",
-+		       __FUNCTION__, irq);
-+
-+	if (!irq_list[irq]) {
-+		if (contr->shutdown)
-+			contr->shutdown(irq);
-+		else
-+			contr->disable(irq);
-+	}
-+
-+	spin_unlock_irqrestore(&contr->lock, flags);
-+}
-+EXPORT_SYMBOL(free_irq);
-+
-+void enable_irq(unsigned int irq)
-+{
-+	struct irq_controller *contr;
-+	unsigned long flags;
-+
-+	if (irq >= NR_IRQS || !irq_controller[irq]) {
-+		printk(KERN_DEBUG "%s: Incorrect IRQ %d\n", __FUNCTION__, irq);
-+		return;
-+	}
-+
-+	contr = irq_controller[irq];
-+	spin_lock_irqsave(&contr->lock, flags);
-+	if (irq_depth[irq]) {
-+		if (!--irq_depth[irq]) {
-+			if (contr->enable)
-+				contr->enable(irq);
-+		}
-+	} else
-+		WARN_ON(1);
-+	spin_unlock_irqrestore(&contr->lock, flags);
-+}
-+EXPORT_SYMBOL(enable_irq);
-+
-+void disable_irq(unsigned int irq)
-+{
-+	struct irq_controller *contr;
-+	unsigned long flags;
-+
-+	if (irq >= NR_IRQS || !irq_controller[irq]) {
-+		printk(KERN_DEBUG "%s: Incorrect IRQ %d\n", __FUNCTION__, irq);
-+		return;
-+	}
-+
-+	contr = irq_controller[irq];
-+	spin_lock_irqsave(&contr->lock, flags);
-+	if (!irq_depth[irq]++) {
-+		if (contr->disable)
-+			contr->disable(irq);
-+	}
-+	spin_unlock_irqrestore(&contr->lock, flags);
-+}
-+EXPORT_SYMBOL(disable_irq);
-+
-+unsigned long probe_irq_on(void)
-+{
-+	return 0;
-+}
-+EXPORT_SYMBOL(probe_irq_on);
-+
-+int probe_irq_off(unsigned long irqs)
-+{
-+	return 0;
-+}
-+EXPORT_SYMBOL(probe_irq_off);
-+
-+asmlinkage void handle_badint(struct pt_regs *regs)
-+{
-+	kstat_cpu(0).irqs[0]++;
-+	num_spurious++;
-+	printk(KERN_DEBUG "unexpected interrupt from %u\n", regs->vector);
-+}
-+EXPORT_SYMBOL(handle_badint);
-+
-+#ifdef CONFIG_M54455
-+/*
-+ * M5445X Implementation
-+ */
-+void m5445x_irq_enable(unsigned int irq)
-+{
-+	/* enable the interrupt hardware */
-+	if (irq < 64)
-+		return;
-+
-+	/* adjust past non-hardware ints */
-+	irq -= 64;
-+
-+	/* check for eport */
-+	if ((irq > 0) && (irq < 8)) {
-+		/* enable eport */
-+		MCF_EPORT_EPPAR &= ~(3 << (irq*2));	/* level */
-+		MCF_EPORT_EPDDR &= ~(1 << irq);		/* input */
-+		MCF_EPORT_EPIER |= 1 << irq;		/* irq enabled */
-+	}
-+
-+	if (irq < 64) {
-+		/* controller 0 */
-+		MCF_INTC0_ICR(irq) = 0x02;
-+		MCF_INTC0_CIMR = irq;
-+	} else {
-+		/* controller 1 */
-+		irq -= 64;
-+		MCF_INTC1_ICR(irq) = 0x02;
-+		MCF_INTC1_CIMR = irq;
-+	}
-+}
-+
-+void m5445x_irq_disable(unsigned int irq)
-+{
-+	/* disable the interrupt hardware */
-+	if (irq < 64)
-+		return;
-+
-+	/* adjust past non-hardware ints */
-+	irq -= 64;
-+
-+	/* check for eport */
-+	if ((irq > 0) && (irq < 8)) {
-+		/* disable eport */
-+		MCF_EPORT_EPIER &= ~(1 << irq);
-+	}
-+
-+	if (irq < 64) {
-+		/* controller 0 */
-+		MCF_INTC0_ICR(irq) = 0x00;
-+		MCF_INTC0_SIMR = irq;
-+	} else {
-+		/* controller 1 */
-+		irq -= 64;
-+		MCF_INTC1_ICR(irq) = 0x00;
-+		MCF_INTC1_SIMR = irq;
-+	}
-+}
-+#endif
---- /dev/null
-+++ b/arch/m68k/coldfire/iomap.c
-@@ -0,0 +1,54 @@
-+/*
-+ * arch/m68k/coldfire/iomap.c
-+ *
-+ * Generic coldfire iomap interface
-+ *
-+ * Based on the sh64 iomap.c by Paul Mundt.
-+ *
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License.  See the file "COPYING" in the main directory of this archive
-+ * for more details.
-+ */
-+#include <linux/pci.h>
-+#include <asm/io.h>
-+
-+void __iomem *__attribute__ ((weak))
-+ioport_map(unsigned long port, unsigned int len)
-+{
-+	return (void __iomem *)port;
-+}
-+EXPORT_SYMBOL(pci_iomap);
-+
-+void ioport_unmap(void __iomem *addr)
-+{
-+	/* Nothing .. */
-+}
-+EXPORT_SYMBOL(pci_iounmap);
-+
-+void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max)
-+{
-+	unsigned long start = pci_resource_start(dev, bar);
-+	unsigned long len = pci_resource_len(dev, bar);
-+	unsigned long flags = pci_resource_flags(dev, bar);
-+printk(KERN_INFO "PCI_IOMAP: BAR=%d  START=0x%lx  LEN=0x%lx  FLAGS=0x%lx\n",
-+       bar, start, len, flags);
-+
-+	if (!len)
-+		return NULL;
-+	if (max && len > max)
-+		len = max;
-+	if (flags & IORESOURCE_IO)
-+		return ioport_map(start, len);
-+	if (flags & IORESOURCE_MEM)
-+		return (void __iomem *)start;
-+
-+	/* What? */
-+	return NULL;
-+}
-+EXPORT_SYMBOL(ioport_map);
-+
-+void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
-+{
-+	/* Nothing .. */
-+}
-+EXPORT_SYMBOL(ioport_unmap);
---- /dev/null
-+++ b/arch/m68k/coldfire/mcf5445x-pci.c
-@@ -0,0 +1,427 @@
-+/*
-+ * arch/m68k/coldfire/mcf5445x-pci.c
-+ *
-+ * Coldfire M5445x specific PCI implementation.
-+ *
-+ * Copyright (c) 2007 Freescale Semiconductor, Inc.
-+ *	Kurt Mahan <kmahan@freescale.com>
-+ */
-+
-+#include <linux/delay.h>
-+#include <linux/pci.h>
-+
-+#include <asm/mcfsim.h>
-+#include <asm/pci.h>
-+#include <asm/irq.h>
-+
-+/*
-+ * Layout MCF5445x to PCI memory mappings:
-+ *
-+ *	WIN         MCF5445x                    PCI            TYPE
-+ *	---         --------                    ---            ----
-+ *	[0] 0xA0000000 -> 0xA7FFFFFF  0xA0000000 -> 0xA7FFFFFF  MEM
-+ *	[1] 0xA8000000 -> 0xABFFFFFF  0xA8000000 -> 0xABFFFFFF  MEM
-+ *	[2] 0xAC000000 -> 0xAFFFFFFF  0xAC000000 -> 0xAFFFFFFF  IO
-+ */
-+
-+#define MCF5445X_PCI_MEM_BASE		0xA0000000
-+#define MCF5445X_PCI_MEM_SIZE		0x0C000000
-+
-+#define MCF5445X_PCI_CONFIG_BASE	0xAC000000
-+#define MCF5445X_PCI_CONFIG_SIZE	0x04000000
-+
-+#define MCF5445X_PCI_IO_BASE		0xAC000000
-+#define MCF5445X_PCI_IO_SIZE		0x04000000
-+
-+/* PCI Bus memory resource block */
-+struct resource pci_iomem_resource = {
-+	.name = "PCI memory space",
-+	.start = MCF5445X_PCI_MEM_BASE,
-+	.flags = IORESOURCE_MEM,
-+	.end = MCF5445X_PCI_MEM_BASE + MCF5445X_PCI_MEM_SIZE - 1
-+};
-+
-+/* PCI Bus ioport resource block */
-+struct resource pci_ioport_resource = {
-+	.name = "PCI I/O space",
-+	.start = MCF5445X_PCI_IO_BASE,
-+	.flags = IORESOURCE_IO,
-+	.end = MCF5445X_PCI_IO_BASE + MCF5445X_PCI_IO_SIZE - 1
-+};
-+
-+/*
-+ * The M54455EVB multiplexes all the PCI interrupts via
-+ * the FPGA and routes them to a single interrupt.  The
-+ * PCI spec requires all PCI interrupt routines be smart
-+ * enough to sort out their own interrupts.
-+ * The interrupt source from the FPGA is configured
-+ * to EPORT 3.
-+ */
-+#define MCF5445X_PCI_IRQ		0x43
-+
-+#define PCI_SLOTS			4
-+
-+/*
-+ * FPGA Info
-+ */
-+#define FPGA_PCI_IRQ_ENABLE		(u32 *)0x09000000
-+#define FPGA_PCI_IRQ_STATUS		(u32 *)0x09000004
-+#define FPGA_PCI_IRQ_ROUTE 		(u32 *)0x0900000c
-+#define FPGA_SEVEN_LED			(u32 *)0x09000014
-+
-+extern void set_fpga(u32 *addr, u32 val);
-+
-+#ifdef DEBUG
-+void mcf5445x_pci_dumpregs(void);
-+#endif
-+
-+/*
-+ * static void mcf5445x_conf_device(struct pci_dev *dev)
-+ *
-+ * Machine dependent Configure the given device.
-+ *
-+ * Parameters:
-+ *
-+ * dev		- the pci device.
-+ */
-+void __init
-+mcf5445x_conf_device(struct pci_dev *dev)
-+{
-+	set_fpga(FPGA_PCI_IRQ_ENABLE, 0x0f);
-+}
-+
-+/*
-+ * int mcf5445x_pci_config_read(unsigned int seg, unsigned int bus,
-+ *			      	unsigned int devfn, int reg,
-+ *			      	u32 *value)
-+ *
-+ * Read from PCI configuration space.
-+ *
-+ */
-+int mcf5445x_pci_config_read(unsigned int seg, unsigned int bus,
-+			     unsigned int devfn, int reg, int len, u32 *value)
-+{
-+	u32 addr = MCF_PCI_PCICAR_BUSNUM(bus) |
-+		   MCF_PCI_PCICAR_DEVNUM(PCI_SLOT(devfn)) |
-+		   MCF_PCI_PCICAR_FUNCNUM(PCI_FUNC(devfn)) |
-+		   MCF_PCI_PCICAR_DWORD(reg) |
-+		   MCF_PCI_PCICAR_E;
-+
-+	if ((bus > 255) || (devfn > 255) || (reg > 255)) {
-+		*value = -1;
-+		return -EINVAL;
-+	}
-+
-+	/* setup for config mode */
-+	MCF_PCI_PCICAR = addr;
-+	__asm__ __volatile__("nop");
-+
-+	switch (len) {
-+	case 1:
-+		*value = *(volatile u8 *)(MCF5445X_PCI_CONFIG_BASE+(reg&3));
-+		break;
-+	case 2:
-+		*value = le16_to_cpu(*(volatile u16 *)
-+				(MCF5445X_PCI_CONFIG_BASE + (reg&2)));
-+		break;
-+	case 4:
-+		*value = le32_to_cpu(*(volatile u32 *)
-+				(MCF5445X_PCI_CONFIG_BASE));
-+		break;
-+	}
-+
-+	/* clear config mode */
-+	MCF_PCI_PCICAR = ~MCF_PCI_PCICAR_E;
-+	__asm__ __volatile__("nop");
-+
-+	return 0;
-+}
-+
-+/*
-+ * int mcf5445x_pci_config_write(unsigned int seg, unsigned int bus,
-+ *			      	 unsigned int devfn, int reg,
-+ *			      	 u32 *value)
-+ *
-+ * Write to PCI configuration space
-+ */
-+int mcf5445x_pci_config_write(unsigned int seg, unsigned int bus,
-+		    unsigned int devfn, int reg, int len, u32 value)
-+{
-+	u32 addr = MCF_PCI_PCICAR_BUSNUM(bus) |
-+		   MCF_PCI_PCICAR_DEVNUM(PCI_SLOT(devfn)) |
-+		   MCF_PCI_PCICAR_FUNCNUM(PCI_FUNC(devfn)) |
-+		   MCF_PCI_PCICAR_DWORD(reg) |
-+		   MCF_PCI_PCICAR_E;
-+
-+	if ((bus > 255) || (devfn > 255) || (reg > 255))
-+		return -EINVAL;
-+
-+	/* setup for config mode */
-+	MCF_PCI_PCICAR = addr;
-+	__asm__ __volatile__("nop");
-+
-+	switch (len) {
-+	case 1:
-+		*(volatile u8 *)(MCF5445X_PCI_CONFIG_BASE+(reg&3)) = (u8)value;
-+		break;
-+	case 2:
-+		*(volatile u16 *)(MCF5445X_PCI_CONFIG_BASE+(reg&2)) =
-+				cpu_to_le16((u16)value);
-+		break;
-+	case 4:
-+		*(volatile u32 *)(MCF5445X_PCI_CONFIG_BASE) =
-+				cpu_to_le32(value);
-+		break;
-+	}
-+
-+	/* clear config mode */
-+	MCF_PCI_PCICAR = ~MCF_PCI_PCICAR_E;
-+	__asm__ __volatile__("nop");
-+
-+	return 0;
-+}
-+
-+/* hardware operations */
-+static struct pci_raw_ops mcf5445x_pci_ops = {
-+	.read =		mcf5445x_pci_config_read,
-+	.write =	mcf5445x_pci_config_write,
-+};
-+
-+/*
-+ * irqreturn_t mcf5445x_pci_interrupt( int irq, void *dev)
-+ *
-+ * PCI controller interrupt handler.
-+ */
-+static irqreturn_t
-+mcf5445x_pci_interrupt(int irq, void *dev)
-+{
-+	u32 status = MCF_PCI_PCIGSCR;
-+#ifdef DEBUG
-+	printk(KERN_INFO "PCI: Controller irq status=0x%08x\n", status);
-+#endif
-+	/* clear */
-+	MCF_PCI_PCIGSCR = status;
-+
-+	return IRQ_HANDLED;
-+}
-+
-+/*
-+ * irqreturn_t mcf5445x_pci_arb_interrupt( int irq, void *dev)
-+ *
-+ * PCI Arbiter interrupt handler.
-+ */
-+static irqreturn_t
-+mcf5445x_pci_arb_interrupt(int irq, void *dev)
-+{
-+	u32 status = MCF_PCIARB_PASR;
-+#ifdef DEBUG
-+	printk(KERN_INFO "PCI: Arbiter irq status=0x%08x\n", status);
-+#endif
-+	/* clear */
-+	MCF_PCIARB_PASR = status;
-+	return IRQ_HANDLED;
-+}
-+
-+/*
-+ * struct pci_bus_info *init_mcf5445x_pci(void)
-+ *
-+ * Machine specific initialisation:
-+ *
-+ * - Allocate and initialise a 'pci_bus_info' structure
-+ * - Initialize hardware
-+ *
-+ * Result: pointer to 'pci_bus_info' structure.
-+ */
-+int __init
-+init_mcf5445x_pci(void)
-+{
-+	/*
-+	 * Initialize the PCI core
-+	 */
-+
-+	/* arbitration controller */
-+	MCF_PCIARB_PACR = MCF_PCIARB_PACR_INTMPRI |
-+			  MCF_PCIARB_PACR_EXTMPRI(0x0f) |
-+			  MCF_PCIARB_PACR_INTMINTEN |
-+			  MCF_PCIARB_PACR_EXTMINTEN(0x0f);
-+
-+	/* pci pin assignment regs */
-+	MCF_GPIO_PAR_PCI = MCF_GPIO_PAR_PCI_GNT0 |
-+			   MCF_GPIO_PAR_PCI_GNT1 |
-+			   MCF_GPIO_PAR_PCI_GNT2 |
-+			   MCF_GPIO_PAR_PCI_GNT3_GNT3 |
-+			   MCF_GPIO_PAR_PCI_REQ0 |
-+			   MCF_GPIO_PAR_PCI_REQ1 |
-+			   MCF_GPIO_PAR_PCI_REQ2 |
-+			   MCF_GPIO_PAR_PCI_REQ3_REQ3;
-+
-+	/* target control reg */
-+	MCF_PCI_PCITCR = MCF_PCI_PCITCR_P |
-+			 MCF_PCI_PCITCR_WCT(8);
-+
-+	/* PCI MEM address */
-+	MCF_PCI_PCIIW0BTAR = 0xA007A000;
-+
-+	/* PCI MEM address */
-+	MCF_PCI_PCIIW1BTAR = 0xA803A800;
-+
-+	/* PCI IO address */
-+	MCF_PCI_PCIIW2BTAR = 0xAC03AC00;
-+
-+	/* window control */
-+	MCF_PCI_PCIIWCR = MCF_PCI_PCIIWCR_WINCTRL0_ENABLE |
-+			  MCF_PCI_PCIIWCR_WINCTRL0_MEMREAD |
-+			  MCF_PCI_PCIIWCR_WINCTRL1_ENABLE |
-+			  MCF_PCI_PCIIWCR_WINCTRL1_MEMREAD |
-+			  MCF_PCI_PCIIWCR_WINCTRL2_ENABLE |
-+			  MCF_PCI_PCIIWCR_WINCTRL2_IO;
-+
-+	/* initiator control reg */
-+	MCF_PCI_PCIICR = 0x00ff;
-+
-+	/* type 0 - command */
-+	MCF_PCI_PCISCR = MCF_PCI_PCISCR_MW |	/* mem write/inval */
-+			 MCF_PCI_PCISCR_B |	/* bus master enable */
-+			 MCF_PCI_PCISCR_M;	/* mem access enable */
-+
-+	/* type 0 - config reg */
-+	MCF_PCI_PCICR1 = MCF_PCI_PCICR1_CACHELINESIZE(8) |
-+			 MCF_PCI_PCICR1_LATTIMER(0xff);
-+
-+	/* type 0 - config 2 reg */
-+	MCF_PCI_PCICR2 = 0;
-+
-+	/* target control reg */
-+	MCF_PCI_PCITCR2 = MCF_PCI_PCITCR2_B0E |
-+			  MCF_PCI_PCITCR2_B4E;
-+
-+	/* translate addresses from PCI[0] to CF[SDRAM] */
-+	MCF_PCI_PCITBATR0 = MCF_RAMBAR1 | MCF_PCI_PCITBATR0_EN;
-+	MCF_PCI_PCITBATR4 = MCF_RAMBAR1 | MCF_PCI_PCITBATR4_EN;
-+
-+	/* setup controller interrupt handlers */
-+	if (request_irq(55+128, mcf5445x_pci_interrupt, IRQF_SHARED,
-+			"PCI Controller", NULL))
-+		printk(KERN_ERR "PCI: Unable to register controller irq\n");
-+
-+	if (request_irq (56+128, mcf5445x_pci_arb_interrupt, IRQF_SHARED, "PCI Arbiter", NULL))
-+		printk(KERN_ERR "PCI: Unable to register arbiter irq\n");
-+
-+	/* global control - clear reset bit */
-+	MCF_PCI_PCIGSCR = MCF_PCI_PCIGSCR_SEE |
-+			  MCF_PCI_PCIGSCR_PEE;
-+
-+	/* let everything settle */
-+	udelay(1000);
-+
-+	/* allocate bus ioport resource */
-+	if (request_resource(&ioport_resource, &pci_ioport_resource) < 0)
-+		printk(KERN_ERR "PCI: Unable to alloc ioport resource\n");
-+
-+	/* allocate bus iomem resource */
-+	if (request_resource(&iomem_resource, &pci_iomem_resource) < 0)
-+		printk(KERN_ERR "PCI: Unable to alloc iomem resource\n");
-+
-+	/* setup FPGA to route PCI to IRQ3(67), SW7 to IRQ7, SW6 to IRQ4 */
-+	set_fpga(FPGA_PCI_IRQ_ENABLE, 0x00000000);
-+	set_fpga(FPGA_PCI_IRQ_ROUTE, 0x00000039);
-+	set_fpga(FPGA_SEVEN_LED, 0x000000FF);
-+
-+	raw_pci_ops = &mcf5445x_pci_ops;
-+
-+	return 0;
-+}
-+
-+/*
-+ * DEBUGGING
-+ */
-+
-+#ifdef DEBUG
-+struct regdump {
-+	u32 addr;
-+	char regname[16];
-+};
-+
-+struct regdump type0regs[] = {
-+	{ 0xfc0a8000, "PCIIDR" },
-+	{ 0xfc0a8004, "PCISCR" },
-+	{ 0xfc0a8008, "PCICCRIR" },
-+	{ 0xfc0a800c, "PCICR1" },
-+	{ 0xfc0a8010, "PCIBAR0" },
-+	{ 0xfc0a8014, "PCIBAR1" },
-+	{ 0xfc0a8018, "PCIBAR2" },
-+	{ 0xfc0a801c, "PCIBAR3" },
-+	{ 0xfc0a8020, "PCIBAR4" },
-+	{ 0xfc0a8024, "PCIBAR5" },
-+	{ 0xfc0a8028, "PCICCPR" },
-+	{ 0xfc0a802c, "PCISID" },
-+	{ 0xfc0a8030, "PCIERBAR" },
-+	{ 0xfc0a8034, "PCICPR" },
-+	{ 0xfc0a803c, "PCICR2" },
-+	{ 0, "" }
-+};
-+
-+struct regdump genregs[] = {
-+	{ 0xfc0a8060, "PCIGSCR" },
-+	{ 0xfc0a8064, "PCITBATR0" },
-+	{ 0xfc0a8068, "PCITBATR1" },
-+	{ 0xfc0a806c, "PCITCR1" },
-+	{ 0xfc0a8070, "PCIIW0BTAR" },
-+	{ 0xfc0a8074, "PCIIW1BTAR" },
-+	{ 0xfc0a8078, "PCIIW2BTAR" },
-+	{ 0xfc0a8080, "PCIIWCR" },
-+	{ 0xfc0a8084, "PCIICR" },
-+	{ 0xfc0a8088, "PCIISR" },
-+	{ 0xfc0a808c, "PCITCR2" },
-+	{ 0xfc0a8090, "PCITBATR0" },
-+	{ 0xfc0a8094, "PCITBATR1" },
-+	{ 0xfc0a8098, "PCITBATR2" },
-+	{ 0xfc0a809c, "PCITBATR3" },
-+	{ 0xfc0a80a0, "PCITBATR4" },
-+	{ 0xfc0a80a4, "PCITBATR5" },
-+	{ 0xfc0a80a8, "PCIINTR" },
-+	{ 0xfc0a80f8, "PCICAR" },
-+	{ 0, "" }
-+};
-+
-+struct regdump arbregs[] = {
-+	{ 0xfc0ac000, "PACR" },
-+	{ 0xfc0ac004, "PASR" },	/* documentation error */
-+	{ 0, "" }
-+};
-+
-+/*
-+ * void mcf5445x_pci_dumpregs()
-+ *
-+ * Dump out all the PCI registers
-+ */
-+void
-+mcf5445x_pci_dumpregs(void)
-+{
-+	struct regdump *reg;
-+
-+	printk(KERN_INFO "*** MCF5445x PCI TARGET 0 REGISTERS ***\n");
-+
-+	reg = type0regs;
-+	while (reg->addr) {
-+		printk(KERN_INFO "0x%08x  0x%08x  %s\n", reg->addr,
-+			*((u32 *)reg->addr), reg->regname);
-+		reg++;
-+	}
-+
-+	printk(KERN_INFO "\n*** MCF5445x PCI GENERAL REGISTERS ***\n");
-+	reg = genregs;
-+	while (reg->addr) {
-+		printk(KERN_INFO "0x%08x  0x%08x  %s\n", reg->addr,
-+			*((u32 *)reg->addr), reg->regname);
-+		reg++;
-+	}
-+	printk(KERN_INFO "\n*** MCF5445x PCI ARBITER REGISTERS ***\n");
-+	reg = arbregs;
-+	while (reg->addr) {
-+		printk(KERN_INFO "0x%08x  0x%08x  %s\n", reg->addr,
-+			*((u32 *)reg->addr), reg->regname);
-+		reg++;
-+	}
-+}
-+#endif /* DEBUG */
---- /dev/null
-+++ b/arch/m68k/coldfire/muldi3.S
-@@ -0,0 +1,64 @@
-+/*
-+ * Coldfire muldi3 assembly verion
-+ */
-+ 
-+#include <linux/linkage.h>
-+.globl __muldi3
-+
-+ENTRY(__muldi3)
-+	linkw 	%fp,#0
-+	lea 	%sp@(-32),%sp
-+	moveml 	%d2-%d7/%a2-%a3,%sp@
-+	moveal 	%fp@(8), %a2
-+	moveal 	%fp@(12), %a3
-+	moveal  %fp@(16), %a0
-+	moveal  %fp@(20),%a1
-+	movel 	%a3,%d2
-+	andil   #65535,%d2
-+	movel   %a3,%d3
-+	clrw 	%d3
-+	swap 	%d3
-+	movel 	%a1,%d0
-+	andil 	#65535,%d0
-+	movel 	%a1,%d1
-+	clrw 	%d1
-+	swap 	%d1
-+	movel 	%d2,%d7
-+	mulsl 	%d0,%d7
-+	movel 	%d2,%d4
-+	mulsl 	%d1,%d4
-+	movel 	%d3,%d2
-+	mulsl 	%d0,%d2
-+	mulsl 	%d1,%d3
-+	movel 	%d7,%d0
-+	clrw 	%d0
-+	swap 	%d0
-+	addl 	%d0,%d4
-+	addl 	%d2,%d4
-+	cmpl 	%d4,%d2
-+	blss 	1f
-+	addil 	#65536,%d3
-+1:
-+	movel 	%d4,%d0
-+	clrw 	%d0
-+	swap 	%d0
-+	movel 	%d3,%d5
-+	addl 	%d0,%d5
-+	movew 	%d4,%d6
-+	swap 	%d6
-+	movew 	%d7,%d6
-+	movel 	%d5,%d0
-+	movel 	%d6,%d1
-+	movel 	%a3,%d2
-+	movel 	%a0,%d3
-+	mulsl 	%d3,%d2
-+	movel 	%a2,%d3
-+	movel 	%a1,%d4
-+	mulsl 	%d4,%d3
-+	addl 	%d3,%d2
-+	movel 	%d2,%d0
-+	addl 	%d5,%d0
-+	moveml 	%sp@, %d2-%d7/%a2-%a3
-+	lea 	%sp@(32),%sp
-+	unlk 	%fp
-+	rts
---- /dev/null
-+++ b/arch/m68k/coldfire/pci.c
-@@ -0,0 +1,245 @@
-+/*
-+ * linux/arch/m68k/coldfire/pci.c
-+ *
-+ * PCI initialization for Coldfire architectures.
-+ *
-+ * Currently Supported:
-+ *	M5445x
-+ *
-+ * Copyright (c) 2007 Freescale Semiconductor, Inc.
-+ *	Kurt Mahan <kmahan@freescale.com>
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/pci.h>
-+
-+#include <asm/mcfsim.h>
-+#include <asm/pci.h>
-+
-+/* pci ops for reading/writing config */
-+struct pci_raw_ops *raw_pci_ops;
-+
-+/* pci debug flag */
-+static int debug_pci;
-+
-+#ifdef CONFIG_M54455
-+extern int init_mcf5445x_pci(void);
-+extern void mcf5445x_conf_device(struct pci_dev *dev);
-+extern void mcf5445x_pci_dumpregs(void);
-+
-+extern struct resource pci_ioport_resource;
-+extern struct resource pci_iomem_resource;
-+#endif
-+
-+static int
-+pci_read(struct pci_bus *bus, unsigned int devfn, int where,
-+	 int size, u32 *value)
-+{
-+	return raw_pci_ops->read(0, bus->number, devfn, where, size, value);
-+}
-+
-+static int
-+pci_write(struct pci_bus *bus, unsigned int devfn, int where,
-+	  int size, u32 value)
-+{
-+	return raw_pci_ops->write(0, bus->number, devfn, where, size, value);
-+}
-+
-+struct pci_ops pci_root_ops = {
-+	.read = pci_read,
-+	.write = pci_write,
-+};
-+
-+/*
-+ * pcibios_setup(char *)
-+ *
-+ * Initialize the pcibios based on cmd line params.
-+ */
-+char * __init
-+pcibios_setup(char *str)
-+{
-+	if (!strcmp(str, "debug")) {
-+		debug_pci = 1;
-+		return NULL;
-+	}
-+	return str;
-+}
-+
-+/*
-+ * We need to avoid collisions with `mirrored' VGA ports
-+ * and other strange ISA hardware, so we always want the
-+ * addresses to be allocated in the 0x000-0x0ff region
-+ * modulo 0x400.
-+ *
-+ * Why? Because some silly external IO cards only decode
-+ * the low 10 bits of the IO address. The 0x00-0xff region
-+ * is reserved for motherboard devices that decode all 16
-+ * bits, so it's ok to allocate at, say, 0x2800-0x28ff,
-+ * but we want to try to avoid allocating at 0x2900-0x2bff
-+ * which might have be mirrored at 0x0100-0x03ff..
-+ */
-+void
-+pcibios_align_resource(void *data, struct resource *res, resource_size_t size,
-+		       resource_size_t align)
-+{
-+	struct pci_dev *dev = data;
-+
-+	if (res->flags & IORESOURCE_IO) {
-+		resource_size_t start = res->start;
-+
-+		if (size > 0x100)
-+			printk(KERN_ERR "PCI: I/O Region %s/%d too large"
-+			       " (%ld bytes)\n", pci_name(dev),
-+			       dev->resource - res, (long int)size);
-+
-+		if (start & 0x300) {
-+			start = (start + 0x3ff) & ~0x3ff;
-+			res->start = start;
-+		}
-+	}
-+}
-+
-+/*
-+ * Swizzle the device pin each time we cross a bridge
-+ * and return the slot number.
-+ */
-+static u8 __devinit
-+pcibios_swizzle(struct pci_dev *dev, u8 *pin)
-+{
-+	return 0;
-+}
-+
-+/*
-+ * Map a slot/pin to an IRQ.
-+ */
-+static int
-+pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
-+{
-+	return 0x43;
-+}
-+
-+/*
-+ * pcibios_update_irq(struct pci_dev *dev, int irq)
-+ *
-+ * Update a PCI interrupt.
-+ */
-+void __init
-+pcibios_update_irq(struct pci_dev *dev, int irq)
-+{
-+	pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
-+}
-+
-+/*
-+ * pcibios_enable_device(struct pci_dev *dev, int mask)
-+ *
-+ * Enable a device on the PCI bus.
-+ */
-+int
-+pcibios_enable_device(struct pci_dev *dev, int mask)
-+{
-+	u16 cmd, old_cmd;
-+	int idx;
-+	struct resource *r;
-+
-+	pci_read_config_word(dev, PCI_COMMAND, &cmd);
-+	old_cmd = cmd;
-+	for (idx = 0; idx < 6; idx++) {
-+		r = &dev->resource[idx];
-+		if (!r->start && r->end) {
-+			printk(KERN_ERR "PCI: Device %s not available because "
-+			       "of resource collisions\n", pci_name(dev));
-+			return -EINVAL;
-+		}
-+		if (r->flags & IORESOURCE_IO)
-+			cmd |= PCI_COMMAND_IO;
-+		if (r->flags & IORESOURCE_MEM)
-+			cmd |= PCI_COMMAND_MEMORY;
-+	}
-+	if (cmd != old_cmd) {
-+		printk("PCI: Enabling device %s (%04x -> %04x)\n",
-+		       pci_name(dev), old_cmd, cmd);
-+		pci_write_config_word(dev, PCI_COMMAND, cmd);
-+#ifdef CONFIG_M54455
-+		mcf5445x_conf_device(dev);
-+#endif
-+	}
-+
-+	return 0;
-+}
-+
-+/*
-+ * pcibios_fixup_bus(struct pci_bus *bus)
-+ */
-+void __init
-+pcibios_fixup_bus(struct pci_bus *bus)
-+{
-+	struct pci_dev *dev = bus->self;
-+
-+	if (!dev) {
-+		/* Root bus. */
-+#ifdef CONFIG_M54455
-+		bus->resource[0] = &pci_ioport_resource;
-+		bus->resource[1] = &pci_iomem_resource;
-+#endif
-+	}
-+}
-+
-+/*
-+ * pcibios_init(void)
-+ *
-+ * Allocate/initialize low level pci bus/devices.
-+ */
-+static int __init
-+pcibios_init(void)
-+{
-+	struct pci_bus *bus;
-+
-+	if (!raw_pci_ops) {
-+		printk(KERN_WARNING "PCIBIOS: FATAL: NO PCI Hardware found\n");
-+		return 0;
-+	}
-+
-+	/* allocate and scan the (only) bus */
-+	bus = pci_scan_bus_parented(NULL, 0, &pci_root_ops, NULL);
-+
-+	/* setup everything */
-+	if (bus) {
-+		/* compute the bridge window sizes */
-+		pci_bus_size_bridges(bus);
-+
-+		/* (re)assign device resources */
-+		pci_bus_assign_resources(bus);
-+
-+		/* add the bus to the system */
-+		pci_bus_add_devices(bus);
-+
-+		/* fixup irqs */
-+		pci_fixup_irqs(pcibios_swizzle, pcibios_map_irq);
-+	}
-+
-+	return 0;
-+}
-+
-+/*
-+ * pci_init(void)
-+ *
-+ * Initialize the PCI Hardware.
-+ */
-+static int __init
-+pci_init(void)
-+{
-+#if defined(CONFIG_M54455)
-+	init_mcf5445x_pci();
-+#endif
-+	if (!raw_pci_ops)
-+		printk(KERN_ERR "PCI: FATAL: NO PCI Detected\n");
-+
-+	return 0;
-+}
-+
-+/* low level hardware (first) */
-+arch_initcall(pci_init);
-+
-+/* basic bios init (second) */
-+subsys_initcall(pcibios_init);
---- /dev/null
-+++ b/arch/m68k/coldfire/signal.c
-@@ -0,0 +1,868 @@
-+/*
-+ *  linux/arch/m68k/kernel/signal.c
-+ *
-+ *  Copyright (C) 1991, 1992  Linus Torvalds
-+ *
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License.  See the file COPYING in the main directory of this archive
-+ * for more details.
-+ */
-+
-+/*
-+ * Derived from m68k/kernel/signal.c and the original authors are credited
-+ * there.
-+ *
-+ * Coldfire support by:
-+ * Matt Waddel Matt.Waddel@freescale.com
-+ * Copyright Freescale Semiconductor, Inc 2007
-+ */
-+
-+#include <linux/sched.h>
-+#include <linux/mm.h>
-+#include <linux/kernel.h>
-+#include <linux/signal.h>
-+#include <linux/syscalls.h>
-+#include <linux/errno.h>
-+#include <linux/wait.h>
-+#include <linux/ptrace.h>
-+#include <linux/unistd.h>
-+#include <linux/stddef.h>
-+#include <linux/highuid.h>
-+#include <linux/personality.h>
-+#include <linux/tty.h>
-+#include <linux/binfmts.h>
-+
-+#include <asm/setup.h>
-+#include <asm/cf_uaccess.h>
-+#include <asm/cf_pgtable.h>
-+#include <asm/traps.h>
-+#include <asm/ucontext.h>
-+
-+#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
-+
-+asmlinkage int do_signal(sigset_t *oldset, struct pt_regs *regs);
-+
-+const int frame_extra_sizes[16] = {
-+  [1]	= -1,
-+  [2]	= sizeof(((struct frame *)0)->un.fmt2),
-+  [3]	= sizeof(((struct frame *)0)->un.fmt3),
-+  [4]	= 0,
-+  [5]	= -1,
-+  [6]	= -1,
-+  [7]	= sizeof(((struct frame *)0)->un.fmt7),
-+  [8]	= -1,
-+  [9]	= sizeof(((struct frame *)0)->un.fmt9),
-+  [10]	= sizeof(((struct frame *)0)->un.fmta),
-+  [11]	= sizeof(((struct frame *)0)->un.fmtb),
-+  [12]	= -1,
-+  [13]	= -1,
-+  [14]	= -1,
-+  [15]	= -1,
-+};
-+
-+/*
-+ * Atomically swap in the new signal mask, and wait for a signal.
-+ */
-+asmlinkage int do_sigsuspend(struct pt_regs *regs)
-+{
-+	old_sigset_t mask = regs->d3;
-+	sigset_t saveset;
-+
-+	mask &= _BLOCKABLE;
-+	spin_lock_irq(&current->sighand->siglock);
-+	saveset = current->blocked;
-+	siginitset(&current->blocked, mask);
-+	recalc_sigpending();
-+	spin_unlock_irq(&current->sighand->siglock);
-+
-+	regs->d0 = -EINTR;
-+	while (1) {
-+		current->state = TASK_INTERRUPTIBLE;
-+		schedule();
-+		if (do_signal(&saveset, regs))
-+			return -EINTR;
-+	}
-+}
-+
-+asmlinkage int
-+do_rt_sigsuspend(struct pt_regs *regs)
-+{
-+	sigset_t __user *unewset = (sigset_t __user *)regs->d1;
-+	size_t sigsetsize = (size_t)regs->d2;
-+	sigset_t saveset, newset;
-+
-+	/* XXX: Don't preclude handling different sized sigset_t's.  */
-+	if (sigsetsize != sizeof(sigset_t))
-+		return -EINVAL;
-+
-+	if (copy_from_user(&newset, unewset, sizeof(newset)))
-+		return -EFAULT;
-+	sigdelsetmask(&newset, ~_BLOCKABLE);
-+
-+	spin_lock_irq(&current->sighand->siglock);
-+	saveset = current->blocked;
-+	current->blocked = newset;
-+	recalc_sigpending();
-+	spin_unlock_irq(&current->sighand->siglock);
-+
-+	regs->d0 = -EINTR;
-+	while (1) {
-+		current->state = TASK_INTERRUPTIBLE;
-+		schedule();
-+		if (do_signal(&saveset, regs))
-+			return -EINTR;
-+	}
-+}
-+
-+asmlinkage int
-+sys_sigaction(int sig, const struct old_sigaction __user *act,
-+	      struct old_sigaction __user *oact)
-+{
-+	struct k_sigaction new_ka, old_ka;
-+	int ret;
-+
-+	if (act) {
-+		old_sigset_t mask;
-+		if (!access_ok(VERIFY_READ, act, sizeof(*act)) ||
-+		    __get_user(new_ka.sa.sa_handler, &act->sa_handler) ||
-+		    __get_user(new_ka.sa.sa_restorer, &act->sa_restorer))
-+			return -EFAULT;
-+		__get_user(new_ka.sa.sa_flags, &act->sa_flags);
-+		__get_user(mask, &act->sa_mask);
-+		siginitset(&new_ka.sa.sa_mask, mask);
-+	}
-+
-+	ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL);
-+
-+	if (!ret && oact) {
-+		if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact)) ||
-+		    __put_user(old_ka.sa.sa_handler, &oact->sa_handler) ||
-+		    __put_user(old_ka.sa.sa_restorer, &oact->sa_restorer))
-+			return -EFAULT;
-+		__put_user(old_ka.sa.sa_flags, &oact->sa_flags);
-+		__put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask);
-+	}
-+
-+	return ret;
-+}
-+
-+asmlinkage int
-+sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss)
-+{
-+	return do_sigaltstack(uss, uoss, rdusp());
-+}
-+
-+
-+/*
-+ * Do a signal return; undo the signal stack.
-+ *
-+ * Keep the return code on the stack quadword aligned!
-+ * That makes the cache flush below easier.
-+ */
-+
-+struct sigframe
-+{
-+	char __user *pretcode;
-+	int sig;
-+	int code;
-+	struct sigcontext __user *psc;
-+	char retcode[16];
-+	unsigned long extramask[_NSIG_WORDS-1];
-+	struct sigcontext sc;
-+};
-+
-+struct rt_sigframe
-+{
-+	char __user *pretcode;
-+	int sig;
-+	struct siginfo __user *pinfo;
-+	void __user *puc;
-+	char retcode[16];
-+	struct siginfo info;
-+	struct ucontext uc;
-+};
-+
-+#define FPCONTEXT_SIZE	216
-+#define uc_fpstate	uc_filler[0]
-+#define uc_formatvec	uc_filler[FPCONTEXT_SIZE/4]
-+#define uc_extra	uc_filler[FPCONTEXT_SIZE/4+1]
-+
-+#ifdef CONFIG_FPU
-+static unsigned char fpu_version; /* version num of fpu, set by setup_frame */
-+
-+static inline int restore_fpu_state(struct sigcontext *sc)
-+{
-+	int err = 1;
-+
-+	if (FPU_IS_EMU) {
-+	    /* restore registers */
-+	    memcpy(current->thread.fpcntl, sc->sc_fpcntl, 12);
-+	    memcpy(current->thread.fp, sc->sc_fpregs, 24);
-+	    return 0;
-+	}
-+
-+	if (CPU_IS_060 ? sc->sc_fpstate[2] : sc->sc_fpstate[0]) {
-+	    /* Verify the frame format.  */
-+	    if (!CPU_IS_060 && (sc->sc_fpstate[0] != fpu_version))
-+		goto out;
-+	    if (CPU_IS_020_OR_030) {
-+		if (m68k_fputype & FPU_68881 &&
-+		    !(sc->sc_fpstate[1] == 0x18 || sc->sc_fpstate[1] == 0xb4))
-+		    goto out;
-+		if (m68k_fputype & FPU_68882 &&
-+		    !(sc->sc_fpstate[1] == 0x38 || sc->sc_fpstate[1] == 0xd4))
-+		    goto out;
-+	    } else if (CPU_IS_040) {
-+		if (!(sc->sc_fpstate[1] == 0x00 ||
-+		      sc->sc_fpstate[1] == 0x28 ||
-+		      sc->sc_fpstate[1] == 0x60))
-+		    goto out;
-+	    } else if (CPU_IS_060) {
-+		if (!(sc->sc_fpstate[3] == 0x00 ||
-+		      sc->sc_fpstate[3] == 0x60 ||
-+		      sc->sc_fpstate[3] == 0xe0))
-+		    goto out;
-+	    } else
-+		goto out;
-+
-+	}
-+	err = 0;
-+
-+out:
-+	return err;
-+}
-+
-+static inline int rt_restore_fpu_state(struct ucontext __user *uc)
-+{
-+	unsigned char fpstate[FPCONTEXT_SIZE];
-+	int context_size = CPU_IS_060 ? 8 : 0;
-+	fpregset_t fpregs;
-+	int err = 1;
-+
-+	if (FPU_IS_EMU) {
-+		/* restore fpu control register */
-+		if (__copy_from_user(current->thread.fpcntl,
-+				uc->uc_mcontext.fpregs.f_fpcntl, 12))
-+			goto out;
-+		/* restore all other fpu register */
-+		if (__copy_from_user(current->thread.fp,
-+				uc->uc_mcontext.fpregs.f_fpregs, 96))
-+			goto out;
-+		return 0;
-+	}
-+
-+	if (__get_user(*(long *)fpstate, (long __user *)&uc->uc_fpstate))
-+		goto out;
-+	if (CPU_IS_060 ? fpstate[2] : fpstate[0]) {
-+		if (!CPU_IS_060)
-+			context_size = fpstate[1];
-+		/* Verify the frame format.  */
-+		if (!CPU_IS_060 && (fpstate[0] != fpu_version))
-+			goto out;
-+		if (CPU_IS_020_OR_030) {
-+			if (m68k_fputype & FPU_68881 &&
-+			    !(context_size == 0x18 || context_size == 0xb4))
-+				goto out;
-+			if (m68k_fputype & FPU_68882 &&
-+			    !(context_size == 0x38 || context_size == 0xd4))
-+				goto out;
-+		} else if (CPU_IS_040) {
-+			if (!(context_size == 0x00 ||
-+			      context_size == 0x28 ||
-+			      context_size == 0x60))
-+				goto out;
-+		} else if (CPU_IS_060) {
-+			if (!(fpstate[3] == 0x00 ||
-+			      fpstate[3] == 0x60 ||
-+			      fpstate[3] == 0xe0))
-+				goto out;
-+		} else
-+			goto out;
-+		if (__copy_from_user(&fpregs, &uc->uc_mcontext.fpregs,
-+				     sizeof(fpregs)))
-+			goto out;
-+	}
-+	if (context_size &&
-+	    __copy_from_user(fpstate + 4, (long __user *)&uc->uc_fpstate + 1,
-+			     context_size))
-+		goto out;
-+	err = 0;
-+
-+out:
-+	return err;
-+}
-+#endif
-+
-+static inline int
-+restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *usc,
-+	void __user *fp, int *pd0)
-+{
-+	int fsize, formatvec;
-+	struct sigcontext context;
-+	int err = 0;
-+
-+	/* get previous context */
-+	if (copy_from_user(&context, usc, sizeof(context)))
-+		goto badframe;
-+
-+	/* restore passed registers */
-+	regs->d1 = context.sc_d1;
-+	regs->a0 = context.sc_a0;
-+	regs->a1 = context.sc_a1;
-+	regs->sr = (regs->sr & 0xff00) | (context.sc_sr & 0xff);
-+	regs->pc = context.sc_pc;
-+	regs->orig_d0 = -1;		/* disable syscall checks */
-+	wrusp(context.sc_usp);
-+	formatvec = context.sc_formatvec;
-+	regs->format = formatvec >> 12;
-+	regs->vector = formatvec & 0xfff;
-+
-+#ifdef CONFIG_FPU
-+	err = restore_fpu_state(&context);
-+#endif
-+
-+	fsize = frame_extra_sizes[regs->format];
-+	if (fsize < 0) {
-+		/*
-+		 * user process trying to return with weird frame format
-+		 */
-+#ifdef DEBUG
-+		printk(KERN_DEBUG "user process returning with weird \
-+			frame format\n");
-+#endif
-+		goto badframe;
-+	}
-+
-+	/* OK.	Make room on the supervisor stack for the extra junk,
-+	 * if necessary.
-+	 */
-+
-+	{
-+		struct switch_stack *sw = (struct switch_stack *)regs - 1;
-+		regs->d0 = context.sc_d0;
-+#define frame_offset (sizeof(struct pt_regs)+sizeof(struct switch_stack))
-+		__asm__ __volatile__
-+			("   movel %0,%/sp\n\t"
-+			 "   bra ret_from_signal\n"
-+			 "4:\n"
-+			 ".section __ex_table,\"a\"\n"
-+			 "   .align 4\n"
-+			 "   .long 2b,4b\n"
-+			 ".previous"
-+			 : /* no outputs, it doesn't ever return */
-+			 : "a" (sw), "d" (fsize), "d" (frame_offset/4-1),
-+			   "n" (frame_offset), "a" (fp)
-+			 : "a0");
-+#undef frame_offset
-+		/*
-+		 * If we ever get here an exception occurred while
-+		 * building the above stack-frame.
-+		 */
-+		goto badframe;
-+	}
-+
-+	*pd0 = context.sc_d0;
-+	return err;
-+
-+badframe:
-+	return 1;
-+}
-+
-+static inline int
-+rt_restore_ucontext(struct pt_regs *regs, struct switch_stack *sw,
-+		    struct ucontext __user *uc, int *pd0)
-+{
-+	int fsize, temp;
-+	greg_t __user *gregs = uc->uc_mcontext.gregs;
-+	unsigned long usp;
-+	int err;
-+
-+	err = __get_user(temp, &uc->uc_mcontext.version);
-+	if (temp != MCONTEXT_VERSION)
-+		goto badframe;
-+	/* restore passed registers */
-+	err |= __get_user(regs->d0, &gregs[0]);
-+	err |= __get_user(regs->d1, &gregs[1]);
-+	err |= __get_user(regs->d2, &gregs[2]);
-+	err |= __get_user(regs->d3, &gregs[3]);
-+	err |= __get_user(regs->d4, &gregs[4]);
-+	err |= __get_user(regs->d5, &gregs[5]);
-+	err |= __get_user(sw->d6, &gregs[6]);
-+	err |= __get_user(sw->d7, &gregs[7]);
-+	err |= __get_user(regs->a0, &gregs[8]);
-+	err |= __get_user(regs->a1, &gregs[9]);
-+	err |= __get_user(regs->a2, &gregs[10]);
-+	err |= __get_user(sw->a3, &gregs[11]);
-+	err |= __get_user(sw->a4, &gregs[12]);
-+	err |= __get_user(sw->a5, &gregs[13]);
-+	err |= __get_user(sw->a6, &gregs[14]);
-+	err |= __get_user(usp, &gregs[15]);
-+	wrusp(usp);
-+	err |= __get_user(regs->pc, &gregs[16]);
-+	err |= __get_user(temp, &gregs[17]);
-+	regs->sr = (regs->sr & 0xff00) | (temp & 0xff);
-+	regs->orig_d0 = -1;		/* disable syscall checks */
-+	err |= __get_user(temp, &uc->uc_formatvec);
-+	regs->format = temp >> 12;
-+	regs->vector = temp & 0xfff;
-+
-+#ifdef CONFIG_FPU
-+	err |= rt_restore_fpu_state(uc);
-+#endif
-+
-+	if (do_sigaltstack(&uc->uc_stack, NULL, usp) == -EFAULT)
-+		goto badframe;
-+
-+	fsize = frame_extra_sizes[regs->format];
-+	if (fsize < 0) {
-+		/*
-+		 * user process trying to return with weird frame format
-+		 */
-+#ifdef DEBUG
-+		printk(KERN_DEBUG "user process returning with weird \
-+			frame format\n");
-+#endif
-+		goto badframe;
-+	}
-+
-+	/* OK.	Make room on the supervisor stack for the extra junk,
-+	 * if necessary.
-+	 */
-+
-+	{
-+#define frame_offset (sizeof(struct pt_regs)+sizeof(struct switch_stack))
-+		__asm__ __volatile__
-+			("   movel %0,%/sp\n\t"
-+			 "   bra ret_from_signal\n"
-+			 "4:\n"
-+			 ".section __ex_table,\"a\"\n"
-+			 "   .align 4\n"
-+			 "   .long 2b,4b\n"
-+			 ".previous"
-+			 : /* no outputs, it doesn't ever return */
-+			 : "a" (sw), "d" (fsize), "d" (frame_offset/4-1),
-+			   "n" (frame_offset), "a" (&uc->uc_extra)
-+			 : "a0");
-+#undef frame_offset
-+		/*
-+		 * If we ever get here an exception occurred while
-+		 * building the above stack-frame.
-+		 */
-+		goto badframe;
-+	}
-+
-+	*pd0 = regs->d0;
-+	return err;
-+
-+badframe:
-+	return 1;
-+}
-+
-+asmlinkage int do_sigreturn(unsigned long __unused)
-+{
-+	struct switch_stack *sw = (struct switch_stack *) &__unused;
-+	struct pt_regs *regs = (struct pt_regs *) (sw + 1);
-+	unsigned long usp = rdusp();
-+	struct sigframe __user *frame = (struct sigframe __user *)(usp - 4);
-+	sigset_t set;
-+	int d0;
-+
-+	if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))
-+		goto badframe;
-+	if (__get_user(set.sig[0], &frame->sc.sc_mask) ||
-+	    (_NSIG_WORDS > 1 &&
-+	     __copy_from_user(&set.sig[1], &frame->extramask,
-+			      sizeof(frame->extramask))))
-+		goto badframe;
-+
-+	sigdelsetmask(&set, ~_BLOCKABLE);
-+	spin_lock_irq(&current->sighand->siglock);
-+	current->blocked = set;
-+	recalc_sigpending();
-+	spin_unlock_irq(&current->sighand->siglock);
-+
-+	if (restore_sigcontext(regs, &frame->sc, frame + 1, &d0))
-+		goto badframe;
-+	return d0;
-+
-+badframe:
-+	force_sig(SIGSEGV, current);
-+	return 0;
-+}
-+
-+asmlinkage int do_rt_sigreturn(unsigned long __unused)
-+{
-+	struct switch_stack *sw = (struct switch_stack *) &__unused;
-+	struct pt_regs *regs = (struct pt_regs *) (sw + 1);
-+	unsigned long usp = rdusp();
-+	struct rt_sigframe __user *frame =
-+		(struct rt_sigframe __user *)(usp - 4);
-+	sigset_t set;
-+	int d0;
-+
-+	if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))
-+		goto badframe;
-+	if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set)))
-+		goto badframe;
-+
-+	sigdelsetmask(&set, ~_BLOCKABLE);
-+	spin_lock_irq(&current->sighand->siglock);
-+	current->blocked = set;
-+	recalc_sigpending();
-+	spin_unlock_irq(&current->sighand->siglock);
-+
-+	if (rt_restore_ucontext(regs, sw, &frame->uc, &d0))
-+		goto badframe;
-+	return d0;
-+
-+badframe:
-+	force_sig(SIGSEGV, current);
-+	return 0;
-+}
-+
-+#ifdef CONFIG_FPU
-+/*
-+ * Set up a signal frame.
-+ */
-+
-+static inline void save_fpu_state(struct sigcontext *sc, struct pt_regs *regs)
-+{
-+	if (FPU_IS_EMU) {
-+		/* save registers */
-+		memcpy(sc->sc_fpcntl, current->thread.fpcntl, 12);
-+		memcpy(sc->sc_fpregs, current->thread.fp, 24);
-+		return;
-+	}
-+}
-+
-+static inline int rt_save_fpu_state(struct ucontext __user *uc,
-+	struct pt_regs *regs)
-+{
-+	int err = 0;
-+
-+	if (FPU_IS_EMU) {
-+		/* save fpu control register */
-+		err |= copy_to_user(uc->uc_mcontext.fpregs.f_fpcntl,
-+				current->thread.fpcntl, 12);
-+		/* save all other fpu register */
-+		err |= copy_to_user(uc->uc_mcontext.fpregs.f_fpregs,
-+				current->thread.fp, 96);
-+		return err;
-+	}
-+
-+	return err;
-+}
-+#endif
-+
-+static void setup_sigcontext(struct sigcontext *sc, struct pt_regs *regs,
-+			     unsigned long mask)
-+{
-+	sc->sc_mask = mask;
-+	sc->sc_usp = rdusp();
-+	sc->sc_d0 = regs->d0;
-+	sc->sc_d1 = regs->d1;
-+	sc->sc_a0 = regs->a0;
-+	sc->sc_a1 = regs->a1;
-+	sc->sc_sr = regs->sr;
-+	sc->sc_pc = regs->pc;
-+	sc->sc_formatvec = regs->format << 12 | regs->vector;
-+#ifdef CONFIG_FPU
-+	save_fpu_state(sc, regs);
-+#endif
-+}
-+
-+static inline int rt_setup_ucontext(struct ucontext __user *uc,
-+	struct pt_regs *regs)
-+{
-+	struct switch_stack *sw = (struct switch_stack *)regs - 1;
-+	greg_t __user *gregs = uc->uc_mcontext.gregs;
-+	int err = 0;
-+
-+	err |= __put_user(MCONTEXT_VERSION, &uc->uc_mcontext.version);
-+	err |= __put_user(regs->d0, &gregs[0]);
-+	err |= __put_user(regs->d1, &gregs[1]);
-+	err |= __put_user(regs->d2, &gregs[2]);
-+	err |= __put_user(regs->d3, &gregs[3]);
-+	err |= __put_user(regs->d4, &gregs[4]);
-+	err |= __put_user(regs->d5, &gregs[5]);
-+	err |= __put_user(sw->d6, &gregs[6]);
-+	err |= __put_user(sw->d7, &gregs[7]);
-+	err |= __put_user(regs->a0, &gregs[8]);
-+	err |= __put_user(regs->a1, &gregs[9]);
-+	err |= __put_user(regs->a2, &gregs[10]);
-+	err |= __put_user(sw->a3, &gregs[11]);
-+	err |= __put_user(sw->a4, &gregs[12]);
-+	err |= __put_user(sw->a5, &gregs[13]);
-+	err |= __put_user(sw->a6, &gregs[14]);
-+	err |= __put_user(rdusp(), &gregs[15]);
-+	err |= __put_user(regs->pc, &gregs[16]);
-+	err |= __put_user(regs->sr, &gregs[17]);
-+	err |= __put_user((regs->format << 12) | regs->vector,
-+			  &uc->uc_formatvec);
-+#ifdef CONFIG_FPU
-+	err |= rt_save_fpu_state(uc, regs);
-+#endif
-+	return err;
-+}
-+
-+extern void IcacheInvalidateCacheBlock(void *, unsigned long);
-+static inline void push_cache(unsigned long vaddr)
-+{
-+	IcacheInvalidateCacheBlock((void *)vaddr, 8);
-+}
-+
-+static inline void __user *
-+get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size)
-+{
-+	unsigned long usp;
-+
-+	/* Default to using normal stack.  */
-+	usp = rdusp();
-+
-+	/* This is the X/Open sanctioned signal stack switching.  */
-+	if (ka->sa.sa_flags & SA_ONSTACK) {
-+		if (!sas_ss_flags(usp))
-+			usp = current->sas_ss_sp + current->sas_ss_size;
-+	}
-+	return (void __user *)((usp - frame_size) & -8UL);
-+}
-+
-+static void setup_frame(int sig, struct k_sigaction *ka,
-+			 sigset_t *set, struct pt_regs *regs)
-+{
-+	struct sigframe __user *frame;
-+	int fsize = frame_extra_sizes[regs->format];
-+	struct sigcontext context;
-+	int err = 0;
-+
-+	if (fsize < 0) {
-+#ifdef DEBUG
-+		printk(KERN_DEBUG "setup_frame: Unknown frame format %#x\n",
-+			regs->format);
-+#endif
-+		goto give_sigsegv;
-+	}
-+
-+	frame = get_sigframe(ka, regs, sizeof(*frame));
-+
-+	err |= __put_user((current_thread_info()->exec_domain
-+			&& current_thread_info()->exec_domain->signal_invmap
-+			&& sig < 32
-+			? current_thread_info()->exec_domain->signal_invmap[sig]
-+			: sig),
-+			&frame->sig);
-+
-+	err |= __put_user(regs->vector, &frame->code);
-+	err |= __put_user(&frame->sc, &frame->psc);
-+
-+	if (_NSIG_WORDS > 1)
-+		err |= copy_to_user(frame->extramask, &set->sig[1],
-+				    sizeof(frame->extramask));
-+
-+	setup_sigcontext(&context, regs, set->sig[0]);
-+	err |= copy_to_user(&frame->sc, &context, sizeof(context));
-+
-+	/* Set up to return from userspace.  */
-+	err |= __put_user(frame->retcode, &frame->pretcode);
-+	/* moveq #,d0; trap #0 */
-+	err |= __put_user(0x70004e40 + (__NR_sigreturn << 16),
-+			  (long __user *)(frame->retcode));
-+
-+	if (err)
-+		goto give_sigsegv;
-+
-+	push_cache((unsigned long) &frame->retcode);
-+
-+	/* Set up registers for signal handler */
-+	wrusp((unsigned long) frame);
-+	regs->pc = (unsigned long) ka->sa.sa_handler;
-+
-+adjust_stack:
-+	/* Prepare to skip over the extra stuff in the exception frame.  */
-+	if (regs->stkadj) {
-+		struct pt_regs *tregs =
-+			(struct pt_regs *)((ulong)regs + regs->stkadj);
-+#ifdef DEBUG
-+		printk(KERN_DEBUG "Performing stackadjust=%04x\n",
-+			regs->stkadj);
-+#endif
-+		/* This must be copied with decreasing addresses to
-+		   handle overlaps.  */
-+		tregs->vector = 0;
-+		tregs->format = 0;
-+		tregs->pc = regs->pc;
-+		tregs->sr = regs->sr;
-+	}
-+	return;
-+
-+give_sigsegv:
-+	force_sigsegv(sig, current);
-+	goto adjust_stack;
-+}
-+
-+static void setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
-+	sigset_t *set, struct pt_regs *regs)
-+{
-+	struct rt_sigframe __user *frame;
-+	int fsize = frame_extra_sizes[regs->format];
-+	int err = 0;
-+
-+	if (fsize < 0) {
-+#ifdef DEBUG
-+		printk(KERN_DEBUG "setup_frame: Unknown frame format %#x\n",
-+			regs->format);
-+#endif
-+		goto give_sigsegv;
-+	}
-+
-+	frame = get_sigframe(ka, regs, sizeof(*frame));
-+
-+	if (fsize) {
-+		err |= copy_to_user(&frame->uc.uc_extra, regs + 1, fsize);
-+		regs->stkadj = fsize;
-+	}
-+
-+	err |= __put_user((current_thread_info()->exec_domain
-+			&& current_thread_info()->exec_domain->signal_invmap
-+			&& sig < 32
-+			? current_thread_info()->exec_domain->signal_invmap[sig]
-+			: sig),
-+			&frame->sig);
-+	err |= __put_user(&frame->info, &frame->pinfo);
-+	err |= __put_user(&frame->uc, &frame->puc);
-+	err |= copy_siginfo_to_user(&frame->info, info);
-+
-+	/* Create the ucontext.  */
-+	err |= __put_user(0, &frame->uc.uc_flags);
-+	err |= __put_user(NULL, &frame->uc.uc_link);
-+	err |= __put_user((void __user *)current->sas_ss_sp,
-+			  &frame->uc.uc_stack.ss_sp);
-+	err |= __put_user(sas_ss_flags(rdusp()),
-+			  &frame->uc.uc_stack.ss_flags);
-+	err |= __put_user(current->sas_ss_size, &frame->uc.uc_stack.ss_size);
-+	err |= rt_setup_ucontext(&frame->uc, regs);
-+	err |= copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
-+
-+	/* Set up to return from userspace.  */
-+	err |= __put_user(frame->retcode, &frame->pretcode);
-+
-+	/* moveq #,d0; andi.l #,D0; trap #0 */
-+	err |= __put_user(0x70AD0280, (long *)(frame->retcode + 0));
-+	err |= __put_user(0x000000ff, (long *)(frame->retcode + 4));
-+	err |= __put_user(0x4e400000, (long *)(frame->retcode + 8));
-+
-+	if (err)
-+		goto give_sigsegv;
-+
-+	push_cache((unsigned long) &frame->retcode);
-+
-+	/* Set up registers for signal handler */
-+	wrusp((unsigned long) frame);
-+	regs->pc = (unsigned long) ka->sa.sa_handler;
-+
-+adjust_stack:
-+	/* Prepare to skip over the extra stuff in the exception frame.  */
-+	if (regs->stkadj) {
-+		struct pt_regs *tregs =
-+			(struct pt_regs *)((ulong)regs + regs->stkadj);
-+#ifdef DEBUG
-+		printk(KERN_DEBUG "Performing stackadjust=%04x\n",
-+			regs->stkadj);
-+#endif
-+		/* This must be copied with decreasing addresses to
-+		   handle overlaps.  */
-+		tregs->vector = 0;
-+		tregs->format = 0;
-+		tregs->pc = regs->pc;
-+		tregs->sr = regs->sr;
-+	}
-+	return;
-+
-+give_sigsegv:
-+	force_sigsegv(sig, current);
-+	goto adjust_stack;
-+}
-+
-+static inline void
-+handle_restart(struct pt_regs *regs, struct k_sigaction *ka, int has_handler)
-+{
-+	switch (regs->d0) {
-+	case -ERESTARTNOHAND:
-+		if (!has_handler)
-+			goto do_restart;
-+		regs->d0 = -EINTR;
-+		break;
-+
-+	case -ERESTARTSYS:
-+		if (has_handler && !(ka->sa.sa_flags & SA_RESTART)) {
-+			regs->d0 = -EINTR;
-+			break;
-+		}
-+	/* fallthrough */
-+	case -ERESTARTNOINTR:
-+do_restart:
-+		regs->d0 = regs->orig_d0;
-+		regs->pc -= 2;
-+		break;
-+	}
-+}
-+
-+/*
-+ * OK, we're invoking a handler
-+ */
-+static void
-+handle_signal(int sig, struct k_sigaction *ka, siginfo_t *info,
-+	      sigset_t *oldset, struct pt_regs *regs)
-+{
-+	/* are we from a system call? */
-+	if (regs->orig_d0 >= 0)
-+		/* If so, check system call restarting.. */
-+		handle_restart(regs, ka, 1);
-+
-+	/* set up the stack frame */
-+	if (ka->sa.sa_flags & SA_SIGINFO)
-+		setup_rt_frame(sig, ka, info, oldset, regs);
-+	else
-+		setup_frame(sig, ka, oldset, regs);
-+
-+	if (ka->sa.sa_flags & SA_ONESHOT)
-+		ka->sa.sa_handler = SIG_DFL;
-+
-+	spin_lock_irq(&current->sighand->siglock);
-+	sigorsets(&current->blocked, &current->blocked, &ka->sa.sa_mask);
-+	if (!(ka->sa.sa_flags & SA_NODEFER))
-+		sigaddset(&current->blocked, sig);
-+	recalc_sigpending();
-+	spin_unlock_irq(&current->sighand->siglock);
-+}
-+
-+/*
-+ * Note that 'init' is a special process: it doesn't get signals it doesn't
-+ * want to handle. Thus you cannot kill init even with a SIGKILL even by
-+ * mistake.
-+ */
-+asmlinkage int do_signal(sigset_t *oldset, struct pt_regs *regs)
-+{
-+	siginfo_t info;
-+	struct k_sigaction ka;
-+	int signr;
-+
-+	current->thread.esp0 = (unsigned long) regs;
-+
-+	if (!oldset)
-+		oldset = &current->blocked;
-+
-+	signr = get_signal_to_deliver(&info, &ka, regs, NULL);
-+	if (signr > 0) {
-+		/* Whee!  Actually deliver the signal.  */
-+		handle_signal(signr, &ka, &info, oldset, regs);
-+		return 1;
-+	}
-+
-+	/* Did we come from a system call? */
-+	if (regs->orig_d0 >= 0)
-+		/* Restart the system call - no handlers present */
-+		handle_restart(regs, NULL, 0);
-+
-+	return 0;
-+}
---- /dev/null
-+++ b/arch/m68k/coldfire/traps.c
-@@ -0,0 +1,454 @@
-+/*
-+ *  linux/arch/m68knommu/kernel/traps.c
-+ *
-+ *  Copyright (C) 1993, 1994 by Hamish Macdonald
-+ *
-+ *  68040 fixes by Michael Rausch
-+ *  68040 fixes by Martin Apel
-+ *  68060 fixes by Roman Hodek
-+ *  68060 fixes by Jesper Skov
-+ *
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License.  See the file COPYING in the main directory of this archive
-+ * for more details.
-+ */
-+
-+/*
-+ * Sets up all exception vectors
-+ */
-+#include <linux/sched.h>
-+#include <linux/signal.h>
-+#include <linux/kernel.h>
-+#include <linux/mm.h>
-+#include <linux/module.h>
-+#include <linux/types.h>
-+#include <linux/a.out.h>
-+#include <linux/user.h>
-+#include <linux/string.h>
-+#include <linux/linkage.h>
-+#include <linux/init.h>
-+#include <linux/ptrace.h>
-+#include <linux/kallsyms.h>
-+
-+#include <asm/setup.h>
-+#include <asm/fpu.h>
-+#include <asm/system.h>
-+#include <asm/uaccess.h>
-+#include <asm/traps.h>
-+#include <asm/pgtable.h>
-+#include <asm/machdep.h>
-+#include <asm/siginfo.h>
-+
-+static char const * const vec_names[] = {
-+	"RESET SP", "RESET PC", "BUS ERROR", "ADDRESS ERROR",
-+	"ILLEGAL INSTRUCTION", "ZERO DIVIDE", "CHK", "TRAPcc",
-+	"PRIVILEGE VIOLATION", "TRACE", "LINE 1010", "LINE 1111",
-+	"UNASSIGNED RESERVED 12", "COPROCESSOR PROTOCOL VIOLATION",
-+	"FORMAT ERROR", "UNINITIALIZED INTERRUPT",
-+	"UNASSIGNED RESERVED 16", "UNASSIGNED RESERVED 17",
-+	"UNASSIGNED RESERVED 18", "UNASSIGNED RESERVED 19",
-+	"UNASSIGNED RESERVED 20", "UNASSIGNED RESERVED 21",
-+	"UNASSIGNED RESERVED 22", "UNASSIGNED RESERVED 23",
-+	"SPURIOUS INTERRUPT", "LEVEL 1 INT", "LEVEL 2 INT", "LEVEL 3 INT",
-+	"LEVEL 4 INT", "LEVEL 5 INT", "LEVEL 6 INT", "LEVEL 7 INT",
-+	"SYSCALL", "TRAP #1", "TRAP #2", "TRAP #3",
-+	"TRAP #4", "TRAP #5", "TRAP #6", "TRAP #7",
-+	"TRAP #8", "TRAP #9", "TRAP #10", "TRAP #11",
-+	"TRAP #12", "TRAP #13", "TRAP #14", "TRAP #15",
-+	"FPCP BSUN", "FPCP INEXACT", "FPCP DIV BY 0", "FPCP UNDERFLOW",
-+	"FPCP OPERAND ERROR", "FPCP OVERFLOW", "FPCP SNAN",
-+	"FPCP UNSUPPORTED OPERATION",
-+	"MMU CONFIGURATION ERROR"
-+};
-+
-+asmlinkage int do_page_fault(struct pt_regs *regs, unsigned long address,
-+			     unsigned long error_code);
-+asmlinkage void trap_c(struct frame *fp);
-+extern void __init coldfire_trap_init(void);
-+
-+void __init trap_init(void)
-+{
-+	coldfire_trap_init();
-+}
-+
-+/* The following table converts the FS encoding of a ColdFire
-+   exception stack frame into the error_code value needed by
-+   do_fault. */
-+
-+static const unsigned char fs_err_code[] = {
-+	0,  /* 0000 */
-+	0,  /* 0001 */
-+	0,  /* 0010 */
-+	0,  /* 0011 */
-+	1,  /* 0100 */
-+	0,  /* 0101 */
-+	0,  /* 0110 */
-+	0,  /* 0111 */
-+	2,  /* 1000 */
-+	3,  /* 1001 */
-+	2,  /* 1010 */
-+	0,  /* 1011 */
-+	1,  /* 1100 */
-+	1,  /* 1101 */
-+	0,  /* 1110 */
-+	0   /* 1111 */
-+};
-+
-+#ifdef DEBUG
-+static const char *fs_err_msg[16] = {
-+	"Normal",
-+	"Reserved",
-+	"Interrupt during debug service routine",
-+	"Reserved",
-+	"X Protection",
-+	"TLB X miss (opword)",
-+	"TLB X miss (ext. word)",
-+	"IFP in emulator mode",
-+	"W Protection",
-+	"Write error",
-+	"TLB W miss",
-+	"Reserved",
-+	"R Protection",
-+	"R/RMW Protection",
-+	"TLB R miss",
-+	"OEP in emulator mode",
-+};
-+#endif
-+
-+static inline void access_errorCF(struct frame *fp)
-+{
-+	unsigned long int mmusr, complainingAddress;
-+	unsigned int err_code, fs;
-+	int need_page_fault;
-+
-+	mmusr = fp->ptregs.mmusr;
-+	complainingAddress = fp->ptregs.mmuar;
-+#ifdef DEBUG
-+	printk(KERN_DEBUG "pc %#lx, mmusr %#lx, complainingAddress %#lx\n", \
-+		fp->ptregs.pc, mmusr, complainingAddress);
-+#endif
-+
-+	/*
-+	 * error_code:
-+	 *	bit 0 == 0 means no page found, 1 means protection fault
-+	 *	bit 1 == 0 means read, 1 means write
-+	 */
-+
-+	fs = (fp->ptregs.fs2 << 2) | fp->ptregs.fs1;
-+	switch (fs) {
-+	case  5:  /* 0101 TLB opword X miss */
-+		need_page_fault = cf_tlb_miss(&fp->ptregs, 0, 0, 0);
-+		complainingAddress = fp->ptregs.pc;
-+		break;
-+	case  6:  /* 0110 TLB extension word X miss */
-+		need_page_fault = cf_tlb_miss(&fp->ptregs, 0, 0, 1);
-+		complainingAddress = fp->ptregs.pc + sizeof(long);
-+		break;
-+	case 10:  /* 1010 TLB W miss */
-+		need_page_fault = cf_tlb_miss(&fp->ptregs, 1, 1, 0);
-+		break;
-+	case 14: /* 1110 TLB R miss */
-+		need_page_fault = cf_tlb_miss(&fp->ptregs, 0, 1, 0);
-+		break;
-+	default:
-+		/* 0000 Normal  */
-+		/* 0001 Reserved */
-+		/* 0010 Interrupt during debug service routine */
-+		/* 0011 Reserved */
-+		/* 0100 X Protection */
-+		/* 0111 IFP in emulator mode */
-+		/* 1000 W Protection*/
-+		/* 1001 Write error*/
-+		/* 1011 Reserved*/
-+		/* 1100 R Protection*/
-+		/* 1101 R Protection*/
-+		/* 1111 OEP in emulator mode*/
-+		need_page_fault = 1;
-+		break;
-+	}
-+
-+	if (need_page_fault) {
-+		err_code = fs_err_code[fs];
-+		if ((fs == 13) && (mmusr & MMUSR_WF)) /* rd-mod-wr access */
-+			err_code |= 2; /* bit1 - write, bit0 - protection */
-+		do_page_fault(&fp->ptregs, complainingAddress, err_code);
-+	}
-+}
-+
-+void die_if_kernel(char *str, struct pt_regs *fp, int nr)
-+{
-+	if (!(fp->sr & PS_S))
-+		return;
-+
-+	console_verbose();
-+	printk(KERN_EMERG "%s: %08x\n", str, nr);
-+	printk(KERN_EMERG "PC: [<%08lx>]", fp->pc);
-+	print_symbol(" %s", fp->pc);
-+	printk(KERN_EMERG "\nSR: %04x  SP: %p  a2: %08lx\n",
-+	       fp->sr, fp, fp->a2);
-+	printk(KERN_EMERG "d0: %08lx    d1: %08lx    d2: %08lx    d3: %08lx\n",
-+	       fp->d0, fp->d1, fp->d2, fp->d3);
-+	printk(KERN_EMERG "d4: %08lx    d5: %08lx    a0: %08lx    a1: %08lx\n",
-+	       fp->d4, fp->d5, fp->a0, fp->a1);
-+
-+	printk(KERN_EMERG "Process %s (pid: %d, stackpage=%08lx)\n",
-+		current->comm, current->pid, PAGE_SIZE+(unsigned long)current);
-+	show_stack(NULL, (unsigned long *)fp);
-+	do_exit(SIGSEGV);
-+}
-+
-+asmlinkage void buserr_c(struct frame *fp)
-+{
-+	unsigned int fs;
-+
-+	/* Only set esp0 if coming from user mode */
-+	if (user_mode(&fp->ptregs))
-+		current->thread.esp0 = (unsigned long) fp;
-+
-+	fs = (fp->ptregs.fs2 << 2) | fp->ptregs.fs1;
-+#if defined(DEBUG)
-+	printk(KERN_DEBUG "*** Bus Error *** (%x)%s\n", fs,
-+		fs_err_msg[fs & 0xf]);
-+#endif
-+	switch (fs) {
-+	case 0x5:
-+	case 0x6:
-+	case 0x7:
-+	case 0x9:
-+	case 0xa:
-+	case 0xd:
-+	case 0xe:
-+	case 0xf:
-+		access_errorCF(fp);
-+		break;
-+	default:
-+		die_if_kernel("bad frame format", &fp->ptregs, 0);
-+#if defined(DEBUG)
-+		printk(KERN_DEBUG "Unknown SIGSEGV - 4\n");
-+#endif
-+		force_sig(SIGSEGV, current);
-+	}
-+}
-+
-+
-+int kstack_depth_to_print = 48;
-+
-+void show_stack(struct task_struct *task, unsigned long *stack)
-+{
-+	unsigned long *endstack, addr, symaddr;
-+	extern char _start, _etext;
-+	int i;
-+
-+	if (!stack) {
-+		if (task)
-+			stack = (unsigned long *)task->thread.ksp;
-+		else
-+			stack = (unsigned long *)&stack;
-+	}
-+
-+	addr = (unsigned long) stack;
-+	endstack = (unsigned long *) PAGE_ALIGN(addr);
-+
-+	printk(KERN_EMERG "Stack from %08lx:", (unsigned long)stack);
-+	for (i = 0; i < kstack_depth_to_print; i++) {
-+		if (stack + 1 > endstack)
-+			break;
-+		if (i % 8 == 0)
-+			printk("\n" KERN_EMERG "       ");
-+		symaddr = *stack;
-+		printk(KERN_EMERG " %08lx", *stack++);
-+		if ((symaddr >= 0xc0000000) && (symaddr < 0xc1000000))
-+			print_symbol("(%s)", symaddr);
-+	}
-+	printk("\n");
-+
-+	printk(KERN_EMERG "Call Trace:");
-+	i = 0;
-+	while (stack + 1 <= endstack) {
-+		addr = *stack++;
-+		/*
-+		 * If the address is either in the text segment of the
-+		 * kernel, or in the region which contains vmalloc'ed
-+		 * memory, it *may* be the address of a calling
-+		 * routine; if so, print it so that someone tracing
-+		 * down the cause of the crash will be able to figure
-+		 * out the call path that was taken.
-+		 */
-+		if (((addr >= (unsigned long) &_start) &&
-+		     (addr <= (unsigned long) &_etext))) {
-+			if (i % 4 == 0)
-+				printk("\n" KERN_EMERG "       ");
-+			printk(KERN_EMERG " [<%08lx>]", addr);
-+			i++;
-+		}
-+	}
-+	printk("\n");
-+}
-+
-+void bad_super_trap(struct frame *fp)
-+{
-+	console_verbose();
-+	if (fp->ptregs.vector < 4*sizeof(vec_names)/sizeof(vec_names[0]))
-+		printk(KERN_WARNING "*** %s ***   FORMAT=%X\n",
-+			vec_names[(fp->ptregs.vector) >> 2],
-+			fp->ptregs.format);
-+	else
-+		printk(KERN_WARNING "*** Exception %d ***   FORMAT=%X\n",
-+			(fp->ptregs.vector) >> 2,
-+			fp->ptregs.format);
-+	printk(KERN_WARNING "Current process id is %d\n", current->pid);
-+	die_if_kernel("BAD KERNEL TRAP", &fp->ptregs, 0);
-+}
-+
-+asmlinkage void trap_c(struct frame *fp)
-+{
-+	int sig;
-+	siginfo_t info;
-+
-+	if (fp->ptregs.sr & PS_S) {
-+		if ((fp->ptregs.vector >> 2) == VEC_TRACE) {
-+			/* traced a trapping instruction */
-+			current->ptrace |= PT_DTRACE;
-+		} else
-+			bad_super_trap(fp);
-+		return;
-+	}
-+
-+	/* send the appropriate signal to the user program */
-+	switch ((fp->ptregs.vector) >> 2) {
-+	case VEC_ADDRERR:
-+		info.si_code = BUS_ADRALN;
-+		sig = SIGBUS;
-+		break;
-+	case VEC_ILLEGAL:
-+	case VEC_LINE10:
-+	case VEC_LINE11:
-+		info.si_code = ILL_ILLOPC;
-+		sig = SIGILL;
-+		break;
-+	case VEC_PRIV:
-+		info.si_code = ILL_PRVOPC;
-+		sig = SIGILL;
-+		break;
-+	case VEC_COPROC:
-+		info.si_code = ILL_COPROC;
-+		sig = SIGILL;
-+		break;
-+	case VEC_TRAP1: /* gdbserver breakpoint */
-+		fp->ptregs.pc -= 2;
-+		info.si_code = TRAP_TRACE;
-+		sig = SIGTRAP;
-+		break;
-+	case VEC_TRAP2:
-+	case VEC_TRAP3:
-+	case VEC_TRAP4:
-+	case VEC_TRAP5:
-+	case VEC_TRAP6:
-+	case VEC_TRAP7:
-+	case VEC_TRAP8:
-+	case VEC_TRAP9:
-+	case VEC_TRAP10:
-+	case VEC_TRAP11:
-+	case VEC_TRAP12:
-+	case VEC_TRAP13:
-+	case VEC_TRAP14:
-+		info.si_code = ILL_ILLTRP;
-+		sig = SIGILL;
-+		break;
-+	case VEC_FPBRUC:
-+	case VEC_FPOE:
-+	case VEC_FPNAN:
-+		info.si_code = FPE_FLTINV;
-+		sig = SIGFPE;
-+		break;
-+	case VEC_FPIR:
-+		info.si_code = FPE_FLTRES;
-+		sig = SIGFPE;
-+		break;
-+	case VEC_FPDIVZ:
-+		info.si_code = FPE_FLTDIV;
-+		sig = SIGFPE;
-+		break;
-+	case VEC_FPUNDER:
-+		info.si_code = FPE_FLTUND;
-+		sig = SIGFPE;
-+		break;
-+	case VEC_FPOVER:
-+		info.si_code = FPE_FLTOVF;
-+		sig = SIGFPE;
-+		break;
-+	case VEC_ZERODIV:
-+		info.si_code = FPE_INTDIV;
-+		sig = SIGFPE;
-+		break;
-+	case VEC_CHK:
-+	case VEC_TRAP:
-+		info.si_code = FPE_INTOVF;
-+		sig = SIGFPE;
-+		break;
-+	case VEC_TRACE:		/* ptrace single step */
-+		info.si_code = TRAP_TRACE;
-+		sig = SIGTRAP;
-+		break;
-+	case VEC_TRAP15:		/* breakpoint */
-+		info.si_code = TRAP_BRKPT;
-+		sig = SIGTRAP;
-+		break;
-+	default:
-+		info.si_code = ILL_ILLOPC;
-+		sig = SIGILL;
-+		break;
-+	}
-+	info.si_signo = sig;
-+	info.si_errno = 0;
-+	switch (fp->ptregs.format) {
-+	default:
-+		info.si_addr = (void *) fp->ptregs.pc;
-+		break;
-+	case 2:
-+		info.si_addr = (void *) fp->un.fmt2.iaddr;
-+		break;
-+	case 7:
-+		info.si_addr = (void *) fp->un.fmt7.effaddr;
-+		break;
-+	case 9:
-+		info.si_addr = (void *) fp->un.fmt9.iaddr;
-+		break;
-+	case 10:
-+		info.si_addr = (void *) fp->un.fmta.daddr;
-+		break;
-+	case 11:
-+		info.si_addr = (void *) fp->un.fmtb.daddr;
-+		break;
-+	}
-+	force_sig_info(sig, &info, current);
-+}
-+
-+asmlinkage void set_esp0(unsigned long ssp)
-+{
-+	current->thread.esp0 = ssp;
-+}
-+
-+/*
-+ * The architecture-independent backtrace generator
-+ */
-+void dump_stack(void)
-+{
-+	unsigned long stack;
-+
-+	show_stack(current, &stack);
-+}
-+EXPORT_SYMBOL(dump_stack);
-+
-+#ifdef CONFIG_M68KFPU_EMU
-+asmlinkage void fpemu_signal(int signal, int code, void *addr)
-+{
-+	siginfo_t info;
-+
-+	info.si_signo = signal;
-+	info.si_errno = 0;
-+	info.si_code = code;
-+	info.si_addr = addr;
-+	force_sig_info(signal, &info, current);
-+}
-+#endif
---- /dev/null
-+++ b/arch/m68k/coldfire/vmlinux-cf.lds
-@@ -0,0 +1,92 @@
-+/* ld script to make m68k Coldfire Linux kernel */
-+
-+#include <asm-generic/vmlinux.lds.h>
-+
-+OUTPUT_FORMAT("elf32-m68k", "elf32-m68k", "elf32-m68k")
-+OUTPUT_ARCH(m68k)
-+ENTRY(_start)
-+jiffies = jiffies_64 + 4;
-+SECTIONS
-+{
-+  . = 0xC0020000;
-+  _text = .;			/* Text and read-only data */
-+  .text : {
-+	*(.text.head)
-+	TEXT_TEXT
-+	SCHED_TEXT
-+	LOCK_TEXT
-+	*(.fixup)
-+	*(.gnu.warning)
-+	} :text = 0x4e75
-+
-+  _etext = .;			/* End of text section */
-+
-+  . = ALIGN(16);
-+  __start___ex_table = .;
-+  __ex_table : { *(__ex_table) }
-+  __stop___ex_table = .;
-+
-+  RODATA
-+
-+  .data : {			/* Data */
-+	DATA_DATA
-+	CONSTRUCTORS
-+	}
-+
-+  .bss : { *(.bss) }		/* BSS */
-+
-+  . = ALIGN(16);
-+  .data.cacheline_aligned : { *(.data.cacheline_aligned) } :data
-+
-+  _edata = .;			/* End of data section */
-+
-+  . = ALIGN(8192);		/* Initrd */
-+  __init_begin = .;
-+  .init.text : {
-+	_sinittext = .;
-+	*(.init.text)
-+	_einittext = .;
-+  }
-+  .init.data : { *(.init.data) }
-+  . = ALIGN(16);
-+  __setup_start = .;
-+  .init.setup : { *(.init.setup) }
-+  __setup_end = .;
-+  __initcall_start = .;
-+  .initcall.init : {
-+	INITCALLS
-+  }
-+  __initcall_end = .;
-+  __con_initcall_start = .;
-+  .con_initcall.init : { *(.con_initcall.init) }
-+  __con_initcall_end = .;
-+  SECURITY_INIT
-+#ifdef CONFIG_BLK_DEV_INITRD
-+  . = ALIGN(8192);
-+  __initramfs_start = .;
-+  .init.ramfs : { *(.init.ramfs) }
-+  __initramfs_end = .;
-+#endif
-+  . = ALIGN(8192);
-+  __init_end = .;
-+
-+  .data.init_task : { *(.data.init_task) }	/* The initial task and kernel stack */
-+
-+  _end = . ;
-+
-+  /* Sections to be discarded */
-+  /DISCARD/ : {
-+	*(.exit.text)
-+	*(.exit.data)
-+	*(.exitcall.exit)
-+	}
-+
-+  /* Stabs debugging sections.  */
-+  .stab 0 : { *(.stab) }
-+  .stabstr 0 : { *(.stabstr) }
-+  .stab.excl 0 : { *(.stab.excl) }
-+  .stab.exclstr 0 : { *(.stab.exclstr) }
-+  .stab.index 0 : { *(.stab.index) }
-+  .stab.indexstr 0 : { *(.stab.indexstr) }
-+  .comment 0 : { *(.comment) }
-+}
diff --git a/target/linux/coldfire/patches/009-m5445x_serial.patch b/target/linux/coldfire/patches/009-m5445x_serial.patch
deleted file mode 100644
index 351ea8a12..000000000
--- a/target/linux/coldfire/patches/009-m5445x_serial.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 4b5a534c16325217c05a87938885c0ee1fe69a34 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Wed, 31 Oct 2007 17:01:41 -0600
-Subject: [PATCH] MCF5445x core serial support.
-
-LTIBName: m5445x-serial
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- drivers/serial/mcfserial.c |   23 +++++++++++++++++++++--
- 1 files changed, 21 insertions(+), 2 deletions(-)
-
---- a/drivers/serial/mcfserial.c
-+++ b/drivers/serial/mcfserial.c
-@@ -45,7 +45,9 @@
- #include <asm/coldfire.h>
- #include <asm/mcfsim.h>
- #include <asm/mcfuart.h>
-+#ifdef CONFIG_NETtel
- #include <asm/nettel.h>
-+#endif
- #include <asm/uaccess.h>
- #include "mcfserial.h"
- 
-@@ -61,7 +63,8 @@ struct timer_list mcfrs_timer_struct;
- #define	CONSOLE_BAUD_RATE	38400
- #define	DEFAULT_CBAUD		B38400
- #elif defined(CONFIG_MOD5272) || defined(CONFIG_M5208EVB) || \
--      defined(CONFIG_M5329EVB) || defined(CONFIG_GILBARCO)
-+      defined(CONFIG_M5329EVB) || defined(CONFIG_GILBARCO) || \
-+      defined(CONFIG_M54455)
- #define CONSOLE_BAUD_RATE 	115200
- #define DEFAULT_CBAUD		B115200
- #elif defined(CONFIG_ARNEWSH) || defined(CONFIG_FREESCALE) || \
-@@ -94,7 +97,7 @@ static struct tty_driver *mcfrs_serial_d
- #undef SERIAL_DEBUG_FLOW
- 
- #if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \
--    defined(CONFIG_M520x) || defined(CONFIG_M532x)
-+    defined(CONFIG_M520x) || defined(CONFIG_M532x) || defined(CONFIG_M54455)
- #define	IRQBASE	(MCFINT_VECBASE+MCFINT_UART0)
- #else
- #define	IRQBASE	73
-@@ -1604,6 +1607,20 @@ static void mcfrs_irqinit(struct mcf_ser
- 		/* GPIOs also must be initalized, depends on board */
- 		break;
- 	}
-+#elif defined(CONFIG_M54455)
-+	volatile unsigned char *uartp;
-+	uartp = info->addr;
-+	switch (info->line) {
-+	case 0:
-+		MCF_GPIO_PAR_UART |= 0x000F;
-+		break;
-+	case 1:
-+		MCF_GPIO_PAR_UART |= 0x0FF0;
-+		break;
-+	case 2:
-+		/* GPIOs also must be initalized, depends on board */
-+		break;
-+	}
- #else
- 	volatile unsigned char	*icrp, *uartp;
- 
-@@ -1966,7 +1983,9 @@ struct console mcfrs_console = {
- 
- static int __init mcfrs_console_init(void)
- {
-+#ifndef CONFIG_M54455
- 	register_console(&mcfrs_console);
-+#endif
- 	return 0;
- }
- 
diff --git a/target/linux/coldfire/patches/010-m5445x_fec.patch b/target/linux/coldfire/patches/010-m5445x_fec.patch
deleted file mode 100644
index 0a87bd4cd..000000000
--- a/target/linux/coldfire/patches/010-m5445x_fec.patch
+++ /dev/null
@@ -1,392 +0,0 @@
-From c562ab80fe383e6fa49dbe38257421cf37f0e4b3 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Wed, 31 Oct 2007 17:07:25 -0600
-Subject: [PATCH] MCF5445x FEC support.
-
-LTIBName: m5445x-fec
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- drivers/net/Kconfig |    8 ++-
- drivers/net/fec.c   |  207 ++++++++++++++++++++++++++++++++++++++++++++++----
- drivers/net/fec.h   |    2 +-
- 3 files changed, 198 insertions(+), 19 deletions(-)
-
---- a/drivers/net/Kconfig
-+++ b/drivers/net/Kconfig
-@@ -1973,7 +1973,7 @@ config 68360_ENET
- 
- config FEC
- 	bool "FEC ethernet controller (of ColdFire CPUs)"
--	depends on M523x || M527x || M5272 || M528x || M520x
-+	depends on M523x || M527x || M5272 || M528x || M520x || M54455
- 	help
- 	  Say Y here if you want to use the built-in 10/100 Fast ethernet
- 	  controller on some Motorola ColdFire processors.
-@@ -1985,6 +1985,12 @@ config FEC2
- 	  Say Y here if you want to use the second built-in 10/100 Fast
- 	  ethernet controller on some Motorola ColdFire processors.
- 
-+config FEC_SHARED_PHY
-+	bool "Shared PHY interface(on some ColdFire designs)"
-+	depends on FEC2
-+	help
-+	  Say Y here if both PHYs are controlled via a single channel.
-+
- config FEC_MPC52xx
- 	tristate "MPC52xx FEC driver"
- 	depends on PPC_MERGE && PPC_MPC52xx && PPC_BESTCOMM_FEC
---- a/drivers/net/fec.c
-+++ b/drivers/net/fec.c
-@@ -51,7 +51,9 @@
- 
- #if defined(CONFIG_M523x) || defined(CONFIG_M527x) || \
-     defined(CONFIG_M5272) || defined(CONFIG_M528x) || \
--    defined(CONFIG_M520x) || defined(CONFIG_M532x)
-+    defined(CONFIG_M520x) || defined(CONFIG_M532x) || \
-+    defined(CONFIG_M54455)
-+
- #include <asm/coldfire.h>
- #include <asm/mcfsim.h>
- #include "fec.h"
-@@ -82,6 +84,11 @@ static unsigned int fec_hw[] = {
- 	(MCF_MBAR+0x30000),
- #elif defined(CONFIG_M532x)
- 	(MCF_MBAR+0xfc030000),
-+#elif defined(CONFIG_M54455)
-+	(MCF_MBAR+0xfc030000),
-+#if defined(CONFIG_FEC2)
-+	(MCF_MBAR+0xfc034000),
-+#endif
- #else
- 	&(((immap_t *)IMAP_ADDR)->im_cpm.cp_fec),
- #endif
-@@ -172,7 +179,7 @@ typedef struct {
-  * account when setting it.
-  */
- #if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \
--    defined(CONFIG_M520x) || defined(CONFIG_M532x)
-+    defined(CONFIG_M520x) || defined(CONFIG_M532x) || defined(CONFIG_M54455)
- #define	OPT_FRAME_SIZE	(PKT_MAXBUF_SIZE << 16)
- #else
- #define	OPT_FRAME_SIZE	0
-@@ -213,6 +220,7 @@ struct fec_enet_private {
- 	uint	phy_speed;
- 	phy_info_t const	*phy;
- 	struct work_struct phy_task;
-+	volatile fec_t	*phy_hwp;
- 
- 	uint	sequence_done;
- 	uint	mii_phy_task_queued;
-@@ -349,7 +357,8 @@ fec_enet_start_xmit(struct sk_buff *skb,
- 	if (bdp->cbd_bufaddr & 0x3) {
- 		unsigned int index;
- 		index = bdp - fep->tx_bd_base;
--		memcpy(fep->tx_bounce[index], (void *) bdp->cbd_bufaddr, bdp->cbd_datlen);
-+		memcpy(fep->tx_bounce[index],
-+		       (void *)skb->data, bdp->cbd_datlen);
- 		bdp->cbd_bufaddr = __pa(fep->tx_bounce[index]);
- 	}
- 
-@@ -702,7 +711,7 @@ fec_enet_mii(struct net_device *dev)
- 	uint		mii_reg;
- 
- 	fep = netdev_priv(dev);
--	ep = fep->hwp;
-+	ep = fep->phy_hwp;
- 	mii_reg = ep->fec_mii_data;
- 
- 	spin_lock(&fep->lock);
-@@ -753,7 +762,7 @@ mii_queue(struct net_device *dev, int re
- 			mii_tail = mip;
- 		} else {
- 			mii_head = mii_tail = mip;
--			fep->hwp->fec_mii_data = regval;
-+			fep->phy_hwp->fec_mii_data = regval;
- 		}
- 	} else {
- 		retval = 1;
-@@ -1151,8 +1160,7 @@ static phy_info_t const phy_info_ks8721b
- };
- 
- /* ------------------------------------------------------------------------- */
--/* register definitions for the DP83848 */
--
-+/* register definitions for the DP83848 and DP83849 */
- #define MII_DP8384X_PHYSTST    16  /* PHY Status Register */
- 
- static void mii_parse_dp8384x_sr2(uint mii_reg, struct net_device *dev)
-@@ -1186,27 +1194,50 @@ static void mii_parse_dp8384x_sr2(uint m
- 		*s |= PHY_STAT_FAULT;
- }
- 
-+static phy_cmd_t const phy_cmd_dp8384x_ack_int[] = {
-+		{ mk_mii_end, }
-+	};
-+
-+static phy_cmd_t const phy_cmd_dp8384x_shutdown[] = {
-+		{ mk_mii_end, }
-+	};
-+
- static phy_info_t phy_info_dp83848= {
--	0x020005c9,
--	"DP83848",
-+	.id = 0x020005c9,
-+	.name = "DP83848",
- 
--	(const phy_cmd_t []) {  /* config */
-+	.config = (const phy_cmd_t []) {  /* config */
- 		{ mk_mii_read(MII_REG_CR), mii_parse_cr },
- 		{ mk_mii_read(MII_REG_ANAR), mii_parse_anar },
- 		{ mk_mii_read(MII_DP8384X_PHYSTST), mii_parse_dp8384x_sr2 },
- 		{ mk_mii_end, }
- 	},
--	(const phy_cmd_t []) {  /* startup - enable interrupts */
-+	.startup = (const phy_cmd_t []) {  /* startup - enable interrupts */
- 		{ mk_mii_write(MII_REG_CR, 0x1200), NULL }, /* autonegotiate */
- 		{ mk_mii_read(MII_REG_SR), mii_parse_sr },
- 		{ mk_mii_end, }
- 	},
--	(const phy_cmd_t []) { /* ack_int - never happens, no interrupt */
-+	.ack_int = phy_cmd_dp8384x_ack_int,
-+	.shutdown = phy_cmd_dp8384x_shutdown,
-+};
-+
-+static phy_info_t phy_info_dp83849 = {
-+	.id = 0x020005ca,
-+	.name = "DP83849",
-+
-+	.config = (const phy_cmd_t []) {  /* config */
-+		{ mk_mii_read(MII_REG_CR), mii_parse_cr },
-+		{ mk_mii_read(MII_REG_ANAR), mii_parse_anar },
-+		{ mk_mii_read(MII_DP8384X_PHYSTST), mii_parse_dp8384x_sr2 },
- 		{ mk_mii_end, }
- 	},
--	(const phy_cmd_t []) {  /* shutdown */
-+	.startup = (const phy_cmd_t []) {  /* startup - enable interrupts */
-+		{ mk_mii_write(MII_REG_CR, 0x1200), NULL }, /* autonegotiate */
-+		{ mk_mii_read(MII_REG_SR), mii_parse_sr },
- 		{ mk_mii_end, }
- 	},
-+	.ack_int = phy_cmd_dp8384x_ack_int,
-+	.shutdown = phy_cmd_dp8384x_shutdown,
- };
- 
- /* ------------------------------------------------------------------------- */
-@@ -1218,6 +1249,7 @@ static phy_info_t const * const phy_info
- 	&phy_info_am79c874,
- 	&phy_info_ks8721bl,
- 	&phy_info_dp83848,
-+	&phy_info_dp83849,
- 	NULL
- };
- 
-@@ -1799,6 +1831,138 @@ static void __inline__ fec_uncache(unsig
- 
- /* ------------------------------------------------------------------------- */
- 
-+#elif defined(CONFIG_M54455)
-+/*
-+ * Code specific for M54455
-+ */
-+
-+static void __inline__ fec_request_intrs(struct net_device *dev)
-+{
-+	struct fec_enet_private *fep;
-+	int b;
-+	static const struct idesc {
-+		char *name;
-+		unsigned short irq;
-+	} *idp, id[] = {
-+	    { "fec(TXF)", 36 },
-+	    { "fec(TXB)", 37 },
-+	    { "fec(TXFIFO)", 38 },
-+	    { "fec(TXCR)", 39 },
-+	    { "fec(RXF)", 40 },
-+	    { "fec(RXB)", 41 },
-+	    { "fec(MII)", 42 },
-+	    { "fec(LC)", 43 },
-+	    { "fec(HBERR)", 44 },
-+	    { "fec(GRA)", 45 },
-+	    { "fec(EBERR)", 46 },
-+	    { "fec(BABT)", 47 },
-+	    { "fec(BABR)", 48 },
-+	    { NULL },
-+	};
-+
-+	fep = netdev_priv(dev);
-+	b = (fep->index) ? 77 : 64;
-+
-+	/* Setup interrupt handlers. */
-+	for (idp = id; idp->name; idp++) {
-+		if (request_irq(b+idp->irq, fec_enet_interrupt, 0,
-+		    idp->name, dev) != 0)
-+			printk(KERN_ERR "FEC: Could not alloc %s IRQ(%d)!\n",
-+				idp->name, b+idp->irq);
-+	}
-+
-+	if (fep->index) {
-+		/* Configure RMII */
-+		MCF_GPIO_PAR_FEC = (MCF_GPIO_PAR_FEC &
-+			MCF_GPIO_PAR_FEC_FEC1_MASK) |
-+			MCF_GPIO_PAR_FEC_FEC1_RMII_GPIO;
-+	} else {
-+		/* Configure RMII */
-+		MCF_GPIO_PAR_FEC = (MCF_GPIO_PAR_FEC &
-+			MCF_GPIO_PAR_FEC_FEC0_MASK) |
-+			MCF_GPIO_PAR_FEC_FEC0_RMII_GPIO;
-+	}
-+
-+	/* Set up gpio outputs for MII lines on FEC0 */
-+	MCF_GPIO_PAR_FECI2C |= (0 |
-+		MCF_GPIO_PAR_FECI2C_MDIO0_MDIO0 |
-+		MCF_GPIO_PAR_FECI2C_MDC0_MDC0);
-+}
-+
-+static void __inline__ fec_set_mii(struct net_device *dev,
-+	struct fec_enet_private *fep)
-+{
-+	volatile fec_t *fecp;
-+
-+	fecp = fep->hwp;
-+	fecp->fec_r_cntrl = OPT_FRAME_SIZE | 0x04;
-+	fecp->fec_x_cntrl = 0x00;
-+
-+	/*
-+	 * Set MII speed to 2.5 MHz
-+	 */
-+	fep->phy_speed = ((((MCF_CLK / 2) / (2500000 / 10)) + 5) / 10) * 2;
-+	fecp->fec_mii_speed = fep->phy_speed;
-+
-+	fec_restart(dev, 0);
-+}
-+
-+static void __inline__ fec_get_mac(struct net_device *dev)
-+{
-+	struct fec_enet_private *fep = netdev_priv(dev);
-+	volatile fec_t *fecp;
-+	unsigned char *iap, tmpaddr[ETH_ALEN];
-+
-+	fecp = fep->hwp;
-+
-+	if (FEC_FLASHMAC) {
-+		/*
-+		 * Get MAC address from FLASH.
-+		 * If it is all 1's or 0's, use the default.
-+		 */
-+		iap = FEC_FLASHMAC;
-+		if ((iap[0] == 0) && (iap[1] == 0) && (iap[2] == 0) &&
-+		    (iap[3] == 0) && (iap[4] == 0) && (iap[5] == 0))
-+			iap = fec_mac_default;
-+		if ((iap[0] == 0xff) && (iap[1] == 0xff) && (iap[2] == 0xff) &&
-+		    (iap[3] == 0xff) && (iap[4] == 0xff) && (iap[5] == 0xff))
-+			iap = fec_mac_default;
-+	} else {
-+		*((unsigned long *) &tmpaddr[0]) = fecp->fec_addr_low;
-+		*((unsigned short *) &tmpaddr[4]) = (fecp->fec_addr_high >> 16);
-+		iap = &tmpaddr[0];
-+	}
-+
-+	memcpy(dev->dev_addr, iap, ETH_ALEN);
-+
-+	/* Adjust MAC if using default MAC address */
-+	if (iap == fec_mac_default)
-+		dev->dev_addr[ETH_ALEN-1] = fec_mac_default[ETH_ALEN-1] +
-+			fep->index;
-+}
-+
-+static void __inline__ fec_enable_phy_intr(void)
-+{
-+}
-+
-+static void __inline__ fec_disable_phy_intr(void)
-+{
-+}
-+
-+static void __inline__ fec_phy_ack_intr(void)
-+{
-+}
-+
-+static void __inline__ fec_localhw_setup(void)
-+{
-+}
-+
-+static void __inline__ fec_uncache(unsigned long addr)
-+{
-+}
-+
-+/* ------------------------------------------------------------------------- */
-+
- 
- #else
- 
-@@ -2305,7 +2469,7 @@ fec_set_mac_address(struct net_device *d
- 
- }
- 
--/* Initialize the FEC Ethernet on 860T (or ColdFire 5272).
-+/* Initialize the FEC Ethernet.
-  */
-  /*
-   * XXX:  We need to clean up on failure exits here.
-@@ -2326,7 +2490,7 @@ int __init fec_enet_init(struct net_devi
- 
- 	/* Allocate memory for buffer descriptors.
- 	*/
--	mem_addr = __get_free_page(GFP_KERNEL);
-+	mem_addr = __get_free_page(GFP_DMA);
- 	if (mem_addr == 0) {
- 		printk("FEC: allocate descriptor memory failed?\n");
- 		return -ENOMEM;
-@@ -2339,6 +2503,11 @@ int __init fec_enet_init(struct net_devi
- 	fep->index = index;
- 	fep->hwp = fecp;
- 	fep->netdev = dev;
-+#ifdef CONFIG_FEC_SHARED_PHY
-+	fep->phy_hwp = (volatile fec_t *) fec_hw[index & ~1];
-+#else
-+	fep->phy_hwp = fecp;
-+#endif
- 
- 	/* Whack a reset.  We should wait for this.
- 	*/
-@@ -2375,7 +2544,7 @@ int __init fec_enet_init(struct net_devi
- 
- 		/* Allocate a page.
- 		*/
--		mem_addr = __get_free_page(GFP_KERNEL);
-+		mem_addr = __get_free_page(GFP_DMA);
- 		/* XXX: missing check for allocation failure */
- 
- 		fec_uncache(mem_addr);
-@@ -2400,7 +2569,7 @@ int __init fec_enet_init(struct net_devi
- 	bdp = fep->tx_bd_base;
- 	for (i=0, j=FEC_ENET_TX_FRPPG; i<TX_RING_SIZE; i++) {
- 		if (j >= FEC_ENET_TX_FRPPG) {
--			mem_addr = __get_free_page(GFP_KERNEL);
-+			mem_addr = __get_free_page(GFP_DMA);
- 			j = 1;
- 		} else {
- 			mem_addr += FEC_ENET_TX_FRSIZE;
-@@ -2462,7 +2631,11 @@ int __init fec_enet_init(struct net_devi
- 	 * remainder of the interface.
- 	 */
- 	fep->phy_id_done = 0;
-+#ifndef CONFIG_FEC_SHARED_PHY
- 	fep->phy_addr = 0;
-+#else
-+	fep->phy_addr = fep->index;
-+#endif
- 	mii_queue(dev, mk_mii_read(MII_REG_PHYIR1), mii_discover_phy);
- 
- 	index++;
---- a/drivers/net/fec.h
-+++ b/drivers/net/fec.h
-@@ -14,7 +14,7 @@
- /****************************************************************************/
- 
- #if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \
--    defined(CONFIG_M520x) || defined(CONFIG_M532x)
-+    defined(CONFIG_M520x) || defined(CONFIG_M532x) || defined(CONFIG_M54455)
- /*
-  *	Just figures, Motorola would have to change the offsets for
-  *	registers in the same peripheral device on different models
diff --git a/target/linux/coldfire/patches/011-mcfv4e_namespace_align.patch b/target/linux/coldfire/patches/011-mcfv4e_namespace_align.patch
deleted file mode 100644
index 6bdac8845..000000000
--- a/target/linux/coldfire/patches/011-mcfv4e_namespace_align.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a51f4e9bff26cc43b53938169f98c27183ec63ea Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Wed, 31 Oct 2007 17:08:59 -0600
-Subject: [PATCH] Change to align on page size for COLDFIRE.
-
-LTIBName: mcfv4e-namespace-align
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- fs/namespace.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
---- a/fs/namespace.c
-+++ b/fs/namespace.c
-@@ -1364,7 +1364,11 @@ int copy_mount_options(const void __user
- 	/* copy_from_user cannot cross TASK_SIZE ! */
- 	size = TASK_SIZE - (unsigned long)data;
- 	if (size > PAGE_SIZE)
-+#ifndef CONFIG_COLDFIRE
- 		size = PAGE_SIZE;
-+#else
-+		size = PAGE_SIZE - ((unsigned long)data & ~PAGE_MASK);
-+#endif
- 
- 	i = size - exact_copy_from_user((void *)page, data, size);
- 	if (!i) {
diff --git a/target/linux/coldfire/patches/012-m5445x_defconfig_base.patch b/target/linux/coldfire/patches/012-m5445x_defconfig_base.patch
deleted file mode 100644
index 32e4b0df1..000000000
--- a/target/linux/coldfire/patches/012-m5445x_defconfig_base.patch
+++ /dev/null
@@ -1,877 +0,0 @@
-From d0910067712299dc63cf58447b5dd83513fcbdb4 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Wed, 31 Oct 2007 17:12:03 -0600
-Subject: [PATCH] MCF54455 EVB default configuration.
-
-LTIBName: m5445x-defconfig-base
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/configs/m54455evb_defconfig |  862 +++++++++++++++++++++++++++++++++
- 1 files changed, 862 insertions(+), 0 deletions(-)
- create mode 100644 arch/m68k/configs/m54455evb_defconfig
-
---- /dev/null
-+++ b/arch/m68k/configs/m54455evb_defconfig
-@@ -0,0 +1,862 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.23
-+# Tue Nov 27 23:42:38 2007
-+#
-+CONFIG_M68K=y
-+CONFIG_MMU=y
-+CONFIG_RWSEM_GENERIC_SPINLOCK=y
-+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_TIME_LOW_RES=y
-+CONFIG_GENERIC_IOMAP=y
-+CONFIG_NO_IOPORT=y
-+# CONFIG_NO_DMA is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_USER_NS is not set
-+# CONFIG_AUDIT is not set
-+CONFIG_IKCONFIG=y
-+CONFIG_IKCONFIG_PROC=y
-+CONFIG_LOG_BUF_SHIFT=17
-+CONFIG_SYSFS_DEPRECATED=y
-+# CONFIG_RELAY is not set
-+# CONFIG_BLK_DEV_INITRD is not set
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+# CONFIG_EMBEDDED is not set
-+CONFIG_UID16=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_ALL is not set
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+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_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=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
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+CONFIG_MODULE_FORCE_UNLOAD=y
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+# CONFIG_KMOD is not set
-+CONFIG_BLOCK=y
-+CONFIG_LBD=y
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+# CONFIG_DEFAULT_AS is not set
-+# CONFIG_DEFAULT_DEADLINE is not set
-+CONFIG_DEFAULT_CFQ=y
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="cfq"
-+
-+#
-+# Platform dependent setup
-+#
-+# CONFIG_SUN3 is not set
-+CONFIG_COLDFIRE=y
-+CONFIG_CFV4E=y
-+# CONFIG_AMIGA is not set
-+# CONFIG_ATARI is not set
-+# CONFIG_MAC is not set
-+# CONFIG_APOLLO is not set
-+# CONFIG_VME is not set
-+# CONFIG_HP300 is not set
-+# CONFIG_SUN3X is not set
-+# CONFIG_Q40 is not set
-+
-+#
-+# Processor type
-+#
-+# CONFIG_M68020 is not set
-+# CONFIG_M68030 is not set
-+# CONFIG_M68040 is not set
-+# CONFIG_M68060 is not set
-+CONFIG_M54455=y
-+CONFIG_MCFCLK=266666666
-+# CONFIG_MCF_USER_HALT is not set
-+CONFIG_MMU_CFV4E=y
-+CONFIG_SDRAM_BASE=0x40000000
-+CONFIG_SDRAM_SIZE=0x0FFFFFFF
-+CONFIG_NOR_FLASH_BASE=0x00000000
-+# CONFIG_M68KFPU_EMU is not set
-+CONFIG_ADVANCED=y
-+# CONFIG_RMW_INSNS is not set
-+CONFIG_SINGLE_MEMORY_CHUNK=y
-+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+CONFIG_NEED_MULTIPLE_NODES=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+
-+#
-+# General setup
-+#
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_AOUT is not set
-+# CONFIG_BINFMT_MISC is not set
-+CONFIG_PROC_HARDWARE=y
-+CONFIG_ZONE_DMA=y
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
-+
-+#
-+# Power management options
-+#
-+# CONFIG_PM is not set
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+CONFIG_NET_KEY=y
-+# CONFIG_NET_KEY_MIGRATE is not set
-+CONFIG_INET=y
-+# CONFIG_IP_MULTICAST is not set
-+CONFIG_IP_ADVANCED_ROUTER=y
-+CONFIG_ASK_IP_FIB_HASH=y
-+# CONFIG_IP_FIB_TRIE is not set
-+CONFIG_IP_FIB_HASH=y
-+# CONFIG_IP_MULTIPLE_TABLES is not set
-+# CONFIG_IP_ROUTE_MULTIPATH is not set
-+# CONFIG_IP_ROUTE_VERBOSE is not set
-+CONFIG_IP_PNP=y
-+# CONFIG_IP_PNP_DHCP is not set
-+# CONFIG_IP_PNP_BOOTP is not set
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_ARPD is not set
-+# CONFIG_SYN_COOKIES is not set
-+CONFIG_INET_AH=y
-+CONFIG_INET_ESP=y
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_BEET is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+
-+#
-+# QoS and/or fair queueing
-+#
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+# CONFIG_STANDALONE is not set
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=y
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+CONFIG_MTD=y
-+CONFIG_MTD_DEBUG=y
-+CONFIG_MTD_DEBUG_VERBOSE=0
-+CONFIG_MTD_CONCAT=y
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+CONFIG_MTD_BLOCK=y
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+CONFIG_MTD_CFI_ADV_OPTIONS=y
-+CONFIG_MTD_CFI_NOSWAP=y
-+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-+CONFIG_MTD_CFI_GEOMETRY=y
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_2 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+# CONFIG_MTD_CFI_I2 is not set
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+# CONFIG_MTD_OTP is not set
-+CONFIG_MTD_CFI_INTELEXT=y
-+# CONFIG_MTD_CFI_AMDSTD is not set
-+# CONFIG_MTD_CFI_STAA is not set
-+CONFIG_MTD_CFI_UTIL=y
-+# CONFIG_MTD_RAM is not set
-+# CONFIG_MTD_ROM is not set
-+# CONFIG_MTD_ABSENT is not set
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+CONFIG_MTD_PHYSMAP=y
-+CONFIG_MTD_PHYSMAP_START=0x00000000
-+CONFIG_MTD_PHYSMAP_LEN=0x1000000
-+CONFIG_MTD_PHYSMAP_BANKWIDTH=1
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+# CONFIG_MTD_NAND is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=64000
-+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# 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
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=m
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+# CONFIG_BLK_DEV_SR is not set
-+# CONFIG_CHR_DEV_SG is not set
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+# CONFIG_SCSI_SCAN_ASYNC is not set
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_SCSI_DEBUG is not set
-+CONFIG_ATA=m
-+# CONFIG_ATA_NONSTANDARD is not set
-+CONFIG_PATA_FSL=m
-+# CONFIG_MD is not set
-+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 is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+CONFIG_FEC=y
-+# CONFIG_FEC2 is not set
-+CONFIG_NETDEV_1000=y
-+CONFIG_NETDEV_10000=y
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_SHAPER is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+CONFIG_INPUT_MOUSEDEV=y
-+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_TSDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+CONFIG_SERIO=y
-+CONFIG_SERIO_SERPORT=y
-+# CONFIG_SERIO_RAW is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+CONFIG_VT=y
-+CONFIG_VT_CONSOLE=y
-+CONFIG_HW_CONSOLE=y
-+# CONFIG_VT_HW_CONSOLE_BINDING is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+# CONFIG_SERIAL_8250 is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+CONFIG_SERIAL_COLDFIRE=y
-+CONFIG_UNIX98_PTYS=y
-+# CONFIG_LEGACY_PTYS is not set
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_WATCHDOG is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+
-+#
-+# Console display driver support
-+#
-+CONFIG_DUMMY_CONSOLE=y
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+CONFIG_HID_DEBUG=y
-+CONFIG_USB_SUPPORT=y
-+# CONFIG_USB_ARCH_HAS_HCD is not set
-+# CONFIG_USB_ARCH_HAS_OHCI is not set
-+# CONFIG_USB_ARCH_HAS_EHCI is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+
-+#
-+# USB Gadget Support
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_RTC_CLASS is not set
-+
-+#
-+# DMA Engine support
-+#
-+# CONFIG_DMA_ENGINE is not set
-+
-+#
-+# DMA Clients
-+#
-+
-+#
-+# DMA Devices
-+#
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_SERIAL_CONSOLE is not set
-+
-+#
-+# File systems
-+#
-+# CONFIG_EXT2_FS is not set
-+CONFIG_EXT3_FS=y
-+CONFIG_EXT3_FS_XATTR=y
-+# CONFIG_EXT3_FS_POSIX_ACL is not set
-+# CONFIG_EXT3_FS_SECURITY is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+# CONFIG_JBD_DEBUG is not set
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_MINIX_FS=y
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_INOTIFY is not set
-+# CONFIG_QUOTA is not set
-+CONFIG_DNOTIFY=y
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+CONFIG_FAT_FS=y
-+CONFIG_MSDOS_FS=y
-+CONFIG_VFAT_FS=y
-+CONFIG_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+CONFIG_NTFS_FS=y
-+# CONFIG_NTFS_DEBUG is not set
-+CONFIG_NTFS_RW=y
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+# CONFIG_PROC_KCORE is not set
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+CONFIG_RAMFS=y
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+CONFIG_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+# CONFIG_JFFS2_SUMMARY is not set
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+# CONFIG_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+
-+#
-+# Network File Systems
-+#
-+CONFIG_NFS_FS=y
-+# CONFIG_NFS_V3 is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_BSD_DISKLABEL is not set
-+# CONFIG_MINIX_SUBPARTITION is not set
-+# CONFIG_SOLARIS_X86_PARTITION is not set
-+# CONFIG_UNIXWARE_DISKLABEL is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+
-+#
-+# Native Language Support
-+#
-+CONFIG_NLS=y
-+CONFIG_NLS_DEFAULT="iso8859-1"
-+CONFIG_NLS_CODEPAGE_437=y
-+# CONFIG_NLS_CODEPAGE_737 is not set
-+# CONFIG_NLS_CODEPAGE_775 is not set
-+# CONFIG_NLS_CODEPAGE_850 is not set
-+# CONFIG_NLS_CODEPAGE_852 is not set
-+# CONFIG_NLS_CODEPAGE_855 is not set
-+# CONFIG_NLS_CODEPAGE_857 is not set
-+# CONFIG_NLS_CODEPAGE_860 is not set
-+# CONFIG_NLS_CODEPAGE_861 is not set
-+# CONFIG_NLS_CODEPAGE_862 is not set
-+# CONFIG_NLS_CODEPAGE_863 is not set
-+# CONFIG_NLS_CODEPAGE_864 is not set
-+# CONFIG_NLS_CODEPAGE_865 is not set
-+# CONFIG_NLS_CODEPAGE_866 is not set
-+# CONFIG_NLS_CODEPAGE_869 is not set
-+# CONFIG_NLS_CODEPAGE_936 is not set
-+# CONFIG_NLS_CODEPAGE_950 is not set
-+# CONFIG_NLS_CODEPAGE_932 is not set
-+# CONFIG_NLS_CODEPAGE_949 is not set
-+# CONFIG_NLS_CODEPAGE_874 is not set
-+# CONFIG_NLS_ISO8859_8 is not set
-+# CONFIG_NLS_CODEPAGE_1250 is not set
-+# CONFIG_NLS_CODEPAGE_1251 is not set
-+# CONFIG_NLS_ASCII is not set
-+CONFIG_NLS_ISO8859_1=y
-+# CONFIG_NLS_ISO8859_2 is not set
-+# CONFIG_NLS_ISO8859_3 is not set
-+# CONFIG_NLS_ISO8859_4 is not set
-+# CONFIG_NLS_ISO8859_5 is not set
-+# CONFIG_NLS_ISO8859_6 is not set
-+# CONFIG_NLS_ISO8859_7 is not set
-+# CONFIG_NLS_ISO8859_9 is not set
-+# CONFIG_NLS_ISO8859_13 is not set
-+# CONFIG_NLS_ISO8859_14 is not set
-+# CONFIG_NLS_ISO8859_15 is not set
-+# CONFIG_NLS_KOI8_R is not set
-+# CONFIG_NLS_KOI8_U is not set
-+CONFIG_NLS_UTF8=y
-+
-+#
-+# Distributed Lock Manager
-+#
-+# CONFIG_DLM is not set
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+# CONFIG_ENABLE_MUST_CHECK is not set
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+CONFIG_DEBUG_SLAB=y
-+# CONFIG_DEBUG_SLAB_LEAK is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+CONFIG_DEBUG_BUGVERBOSE=y
-+CONFIG_DEBUG_INFO=y
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_FRAME_POINTER is not set
-+CONFIG_FORCED_INLINING=y
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+CONFIG_BOOTPARAM=y
-+CONFIG_BOOTPARAM_STRING="root=/dev/nfs rw nfsroot=172.27.163.2:/tftpboot/ltib ip=172.27.163.3:172.27.163.2:172.27.255.254:255.255.0.0::eth0:off mtdparts=phys_mapped_flash:16m(User)"
-+
-+#
-+# CodeTEST Setup
-+#
-+# CONFIG_CODETEST is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+CONFIG_CRYPTO_HASH=y
-+CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_HMAC=y
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+CONFIG_CRYPTO_MD5=y
-+CONFIG_CRYPTO_SHA1=y
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=y
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+CONFIG_CRYPTO_TEST=m
-+CONFIG_CRYPTO_HW=y
-+CONFIG_CRYPTO_DEV_MCFCAU=y
-+CONFIG_CRYPTO_DEV_MCFCAU_DES=y
-+CONFIG_CRYPTO_DEV_MCFCAU_AES=y
-+CONFIG_CRYPTO_DEV_MCFCAU_MD5=y
-+CONFIG_CRYPTO_DEV_MCFCAU_SHA1=y
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+CONFIG_CRC_CCITT=y
-+CONFIG_CRC16=y
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+CONFIG_LIBCRC32C=y
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_ZLIB_DEFLATE=y
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_DMA=y
diff --git a/target/linux/coldfire/patches/013-m5445x_ata.patch b/target/linux/coldfire/patches/013-m5445x_ata.patch
deleted file mode 100644
index 0f269c15e..000000000
--- a/target/linux/coldfire/patches/013-m5445x_ata.patch
+++ /dev/null
@@ -1,1079 +0,0 @@
-From c9e68ea1a541b9762ec0b656509aef3cdd75e035 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Mon, 19 Nov 2007 12:01:34 -0700
-Subject: [PATCH] Add support for the M5445x ATA controller.
-
-LTIBName: m5445x-ata
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/coldfire/Makefile           |    1 +
- arch/m68k/coldfire/head.S             |    5 +
- arch/m68k/coldfire/mcf5445x-devices.c |  125 +++++
- drivers/ata/Kconfig                   |   11 +-
- drivers/ata/Makefile                  |    2 +-
- drivers/ata/pata_fsl.c                |  829 +++++++++++++++++++++++++++++++++
- include/asm-m68k/pci.h                |   10 +-
- include/linux/fsl_devices.h           |   11 +
- 8 files changed, 990 insertions(+), 4 deletions(-)
- create mode 100644 arch/m68k/coldfire/mcf5445x-devices.c
- create mode 100644 drivers/ata/pata_fsl.c
-
---- a/arch/m68k/coldfire/Makefile
-+++ b/arch/m68k/coldfire/Makefile
-@@ -9,3 +9,4 @@ ifneq ($(strip $(CONFIG_USB) $(CONFIG_US
- endif
- 
- obj-$(CONFIG_PCI)	+= pci.o mcf5445x-pci.o iomap.o
-+obj-$(CONFIG_M54455)	+= mcf5445x-devices.o
---- a/arch/m68k/coldfire/head.S
-+++ b/arch/m68k/coldfire/head.S
-@@ -374,6 +374,11 @@ ENTRY(__start)
- 		MMUTR_SG, MMUDR_SZ16M, MMUDR_DNCP, MMUDR_SP, MMUDR_R, MMUDR_W, \
- 		0, MMUDR_LK, %d0
- 
-+	/* Map ATA registers -- sacrifice a data TLB due to the hw design */
-+	mmu_map	(0x90000000), (0x90000000), 0, 0, \
-+		MMUTR_SG, MMUDR_SZ16M, MMUDR_DNCP, MMUDR_SP, MMUDR_R, MMUDR_W, \
-+		0, MMUDR_LK, %d0
-+
- 	/* Do unity mapping to enable the MMU.  Map first 16 MB in place as 
- 	   code (delete TLBs after MMU is enabled and we are executing in high 
- 	   memory). */
---- /dev/null
-+++ b/arch/m68k/coldfire/mcf5445x-devices.c
-@@ -0,0 +1,125 @@
-+/*
-+ * arch/m68k/coldfire/mcf5445x-devices.c
-+ *
-+ * Coldfire M5445x Platform Device Configuration
-+ *
-+ * Based on the Freescale MXC devices.c
-+ *
-+ * Copyright (c) 2007 Freescale Semiconductor, Inc.
-+ *	Kurt Mahan <kmahan@freescale.com>
-+ */
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+#include <linux/fsl_devices.h>
-+
-+#include <asm/coldfire.h>
-+#include <asm/mcfsim.h>
-+
-+/* ATA Interrupt */
-+#define IRQ_ATA		(64 + 64 + 54)
-+
-+/* ATA Base */
-+#define	BASE_IO_ATA	0x90000000
-+
-+#define ATA_IER		MCF_REG08(BASE_IO_ATA+0x2c)	/* int enable reg */
-+#define ATA_ICR		MCF_REG08(BASE_IO_ATA+0x30)	/* int clear reg */
-+
-+/*
-+ * On-chip PATA
-+ */
-+#if defined(CONFIG_PATA_FSL) || defined(CONFIG_PATA_FSL_MODULE)
-+static int ata_init(struct platform_device *pdev)
-+{
-+	/* clear ints */
-+	ATA_IER = 0x00;
-+	ATA_ICR = 0xff;
-+
-+	/* setup shared pins */
-+	MCF_GPIO_PAR_FEC = (MCF_GPIO_PAR_FEC & MCF_GPIO_PAR_FEC_FEC1_MASK) |
-+			   MCF_GPIO_PAR_FEC_FEC1_ATA;
-+
-+	MCF_GPIO_PAR_FECI2C = (MCF_GPIO_PAR_FECI2C &
-+	  		      (MCF_GPIO_PAR_FECI2C_MDC1_MASK &
-+			      MCF_GPIO_PAR_FECI2C_MDIO1_MASK)) |
-+	  		      MCF_GPIO_PAR_FECI2C_MDC1_ATA_DIOR |
-+	  		      MCF_GPIO_PAR_FECI2C_MDIO1_ATA_DIOW;
-+
-+	MCF_GPIO_PAR_ATA = MCF_GPIO_PAR_ATA_BUFEN |
-+			   MCF_GPIO_PAR_ATA_CS1 |
-+			   MCF_GPIO_PAR_ATA_CS0 |
-+			   MCF_GPIO_PAR_ATA_DA2 |
-+			   MCF_GPIO_PAR_ATA_DA1 |
-+			   MCF_GPIO_PAR_ATA_DA0 |
-+			   MCF_GPIO_PAR_ATA_RESET_RESET |
-+			   MCF_GPIO_PAR_ATA_DMARQ_DMARQ |
-+			   MCF_GPIO_PAR_ATA_IORDY_IORDY;
-+
-+	MCF_GPIO_PAR_PCI = (MCF_GPIO_PAR_PCI &
-+			     (MCF_GPIO_PAR_PCI_GNT3_MASK &
-+			      MCF_GPIO_PAR_PCI_REQ3_MASK)) |
-+			   MCF_GPIO_PAR_PCI_GNT3_ATA_DMACK |
-+			   MCF_GPIO_PAR_PCI_REQ3_ATA_INTRQ;
-+
-+	return 0;
-+}
-+
-+static void ata_exit(void)
-+{
-+	printk(KERN_INFO "** ata_exit\n");
-+}
-+
-+static int ata_get_clk_rate(void)
-+{
-+	return MCF_BUSCLK;
-+}
-+
-+static struct fsl_ata_platform_data ata_data = {
-+	.init             = ata_init,
-+	.exit             = ata_exit,
-+	.get_clk_rate     = ata_get_clk_rate,
-+};
-+
-+static struct resource pata_fsl_resources[] = {
-+	[0] = {		/* I/O */
-+		.start		= BASE_IO_ATA,
-+		.end		= BASE_IO_ATA + 0x000000d8,
-+		.flags		= IORESOURCE_MEM,
-+	},
-+	[2] = {		/* IRQ */
-+		.start		= IRQ_ATA,
-+		.end		= IRQ_ATA,
-+		.flags		= IORESOURCE_IRQ,
-+	},
-+};
-+
-+static struct platform_device pata_fsl_device = {
-+	.name			= "pata_fsl",
-+	.id			= -1,
-+	.num_resources		= ARRAY_SIZE(pata_fsl_resources),
-+	.resource		= pata_fsl_resources,
-+	.dev			= {
-+		.platform_data	= &ata_data,
-+		.coherent_dma_mask = ~0,	/* $$$ REVISIT */
-+	},
-+};
-+
-+static inline void mcf5445x_init_pata(void)
-+{
-+	(void)platform_device_register(&pata_fsl_device);
-+}
-+#else
-+static inline void mcf5445x_init_pata(void)
-+{
-+}
-+#endif
-+
-+static int __init mcf5445x_init_devices(void)
-+{
-+	printk(KERN_INFO "MCF5445x INIT_DEVICES\n");
-+	mcf5445x_init_pata();
-+
-+	return 0;
-+}
-+arch_initcall(mcf5445x_init_devices);
---- a/drivers/ata/Kconfig
-+++ b/drivers/ata/Kconfig
-@@ -6,7 +6,7 @@ menuconfig ATA
- 	tristate "Serial ATA (prod) and Parallel ATA (experimental) drivers"
- 	depends on HAS_IOMEM
- 	depends on BLOCK
--	depends on !(M32R || M68K) || BROKEN
-+	depends on !M32R || BROKEN
- 	depends on !SUN4 || BROKEN
- 	select SCSI
- 	---help---
-@@ -679,4 +679,13 @@ config PATA_BF54X
- 
- 	  If unsure, say N.
- 
-+config PATA_FSL
-+	tristate "Freescale on-chip PATA support"
-+	depends on (ARCH_MX3 || ARCH_MX27 || PPC_512x || M54455)
-+	help
-+	  On Freescale processors, say Y here if you wish to use the on-chip
-+	  ATA interface.
-+
-+	  If you are unsure, say N to this.
-+
- endif # ATA
---- a/drivers/ata/Makefile
-+++ b/drivers/ata/Makefile
-@@ -1,4 +1,3 @@
--
- obj-$(CONFIG_ATA)		+= libata.o
- 
- obj-$(CONFIG_SATA_AHCI)		+= ahci.o
-@@ -71,6 +70,7 @@ obj-$(CONFIG_PATA_BF54X)	+= pata_bf54x.o
- obj-$(CONFIG_PATA_PLATFORM)	+= pata_platform.o
- obj-$(CONFIG_PATA_OF_PLATFORM)	+= pata_of_platform.o
- obj-$(CONFIG_PATA_ICSIDE)	+= pata_icside.o
-+obj-$(CONFIG_PATA_FSL)		+= pata_fsl.o
- # Should be last but two libata driver
- obj-$(CONFIG_PATA_ACPI)		+= pata_acpi.o
- # Should be last but one libata driver
---- /dev/null
-+++ b/drivers/ata/pata_fsl.c
-@@ -0,0 +1,829 @@
-+/*
-+ * Freescale integrated PATA driver
-+ */
-+
-+/*
-+ * Copyright 2007 Freescale Semiconductor, Inc. All Rights Reserved.
-+ */
-+
-+/*
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/blkdev.h>
-+#include <scsi/scsi_host.h>
-+#include <linux/ata.h>
-+#include <linux/libata.h>
-+#include <linux/platform_device.h>
-+#include <linux/fsl_devices.h>
-+#ifdef CONFIG_FSL_PATA_USE_DMA
-+#include <asm/dma.h>
-+#endif
-+
-+#define DRV_NAME "pata_fsl"
-+#define DRV_VERSION "1.0"
-+
-+#ifdef CONFIG_M54455
-+#define WRITE_ATA8(val, reg)			\
-+	__raw_writeb(val, (ata_regs + reg));
-+#define WRITE_ATA16(val, reg)			\
-+	__raw_writew(val, (ata_regs + reg));
-+#else
-+#define WRITE_ATA8(val, reg)			\
-+	__raw_writel(val, (ata_regs + reg));
-+#define WRITE_ATA16(val, reg)			\
-+	__raw_writel(val, (ata_regs + reg));
-+#endif
-+
-+struct pata_fsl_priv {
-+#ifdef CONFIG_FSL_PATA_USE_DMA
-+	int ultra;
-+#endif
-+	u8 *fsl_ata_regs;
-+#ifdef CONFIG_FSL_PATA_USE_DMA
-+	int dma_rchan;
-+	int dma_wchan;
-+	int dma_done;
-+	int dma_dir;
-+#endif
-+};
-+
-+enum {
-+	/* various constants */
-+
-+#ifdef CONFIG_FSL_PATA_USE_DMA
-+	FSL_ATA_MAX_SG_LEN      = 65534,
-+#endif
-+
-+	/* offsets to registers */
-+
-+	FSL_ATA_TIMING_REGS     = 0x00,
-+	FSL_ATA_FIFO_FILL       = 0x20,
-+	FSL_ATA_CONTROL         = 0x24,
-+	FSL_ATA_INT_PEND        = 0x28,
-+	FSL_ATA_INT_EN          = 0x2C,
-+	FSL_ATA_INT_CLEAR       = 0x30,
-+	FSL_ATA_FIFO_ALARM      = 0x34,
-+	FSL_ATA_DRIVE_DATA      = 0xA0,
-+	FSL_ATA_DRIVE_CONTROL   = 0xD8,
-+
-+	/* bits within FSL_ATA_CONTROL */
-+
-+	FSL_ATA_CTRL_FIFO_RST_B    = 0x80,
-+	FSL_ATA_CTRL_ATA_RST_B     = 0x40,
-+	FSL_ATA_CTRL_FIFO_TX_EN    = 0x20,
-+	FSL_ATA_CTRL_FIFO_RCV_EN   = 0x10,
-+	FSL_ATA_CTRL_DMA_PENDING   = 0x08,
-+	FSL_ATA_CTRL_DMA_ULTRA     = 0x04,
-+	FSL_ATA_CTRL_DMA_WRITE     = 0x02,
-+	FSL_ATA_CTRL_IORDY_EN      = 0x01,
-+
-+	/* bits within the interrupt control registers */
-+
-+	FSL_ATA_INTR_ATA_INTRQ1      = 0x80,
-+	FSL_ATA_INTR_FIFO_UNDERFLOW  = 0x40,
-+	FSL_ATA_INTR_FIFO_OVERFLOW   = 0x20,
-+	FSL_ATA_INTR_CTRL_IDLE       = 0x10,
-+	FSL_ATA_INTR_ATA_INTRQ2      = 0x08,
-+};
-+
-+/*
-+ * This structure contains the timing parameters for
-+ * ATA bus timing in the 5 PIO modes.  The timings
-+ * are in nanoseconds, and are converted to clock
-+ * cycles before being stored in the ATA controller
-+ * timing registers.
-+ */
-+static struct {
-+	short t0, t1, t2_8, t2_16, t2i, t4, t9, tA;
-+} pio_specs[] = {
-+	[0] = {
-+		.t0 = 600, .t1 = 70, .t2_8 = 290, .t2_16 = 165, .t2i = 0,
-+		.t4 = 30,.t9 = 20,.tA = 50
-+	},
-+	[1] = {
-+		.t0 = 383, .t1 = 50, .t2_8 = 290, .t2_16 = 125, .t2i = 0,
-+		.t4 = 20, .t9 = 15, .tA = 50
-+	},
-+	[2] = {
-+		.t0 = 240, .t1 = 30, .t2_8 = 290, .t2_16 = 100, .t2i = 0,
-+		.t4 = 15, .t9 = 10, .tA = 50
-+	},
-+	[3] = {
-+		.t0 = 180, .t1 = 30, .t2_8 = 80, .t2_16 = 80, .t2i = 0,
-+		.t4 = 10, .t9 = 10, .tA = 50
-+	},
-+	[4] = {
-+		.t0 = 120, .t1 = 25, .t2_8 = 70, .t2_16 = 70, .t2i = 0,
-+		.t4 = 10, .t9 = 10, .tA = 50
-+	},
-+};
-+
-+#define NR_PIO_SPECS (sizeof pio_specs / sizeof pio_specs[0])
-+
-+/*
-+ * This structure contains the timing parameters for
-+ * ATA bus timing in the 3 MDMA modes.  The timings
-+ * are in nanoseconds, and are converted to clock
-+ * cycles before being stored in the ATA controller
-+ * timing registers.
-+ */
-+static struct {
-+	short t0M, tD, tH, tJ, tKW, tM, tN, tJNH;
-+} mdma_specs[] = {
-+	[0] = {
-+		.t0M = 480, .tD = 215, .tH = 20, .tJ = 20, .tKW = 215,
-+		.tM = 50, .tN = 15, .tJNH = 20
-+	},
-+	[1] = {
-+		.t0M = 150, .tD = 80, .tH = 15, .tJ = 5, .tKW = 50,
-+		.tM = 30, .tN = 10, .tJNH = 15
-+	},
-+	[2] = {
-+		.t0M = 120, .tD = 70, .tH = 10, .tJ = 5, .tKW = 25,
-+		.tM = 25, .tN = 10, .tJNH = 10
-+	},
-+};
-+
-+#define NR_MDMA_SPECS (sizeof mdma_specs / sizeof mdma_specs[0])
-+
-+/*
-+ * This structure contains the timing parameters for
-+ * ATA bus timing in the 6 UDMA modes.  The timings
-+ * are in nanoseconds, and are converted to clock
-+ * cycles before being stored in the ATA controller
-+ * timing registers.
-+ */
-+static struct {
-+	short t2CYC, tCYC, tDS, tDH, tDVS, tDVH, tCVS, tCVH, tFS_min, tLI_max,
-+	    tMLI, tAZ, tZAH, tENV_min, tSR, tRFS, tRP, tACK, tSS, tDZFS;
-+} udma_specs[] = {
-+	[0] = {
-+		.t2CYC = 235, .tCYC = 114, .tDS = 15, .tDH = 5, .tDVS = 70,
-+		.tDVH = 6, .tCVS = 70, .tCVH = 6, .tFS_min = 0,
-+		.tLI_max = 100, .tMLI = 20, .tAZ = 10, .tZAH = 20,
-+		.tENV_min = 20, .tSR = 50, .tRFS = 75, .tRP = 160,
-+		.tACK = 20, .tSS = 50, .tDZFS = 80
-+	},
-+	[1] = {
-+		.t2CYC = 156, .tCYC = 75, .tDS = 10, .tDH = 5, .tDVS = 48,
-+		.tDVH = 6, .tCVS = 48, .tCVH = 6, .tFS_min = 0,
-+		.tLI_max = 100, .tMLI = 20, .tAZ = 10, .tZAH = 20,
-+		.tENV_min = 20, .tSR = 30, .tRFS = 70, .tRP = 125,
-+		.tACK = 20, .tSS = 50, .tDZFS = 63
-+	},
-+	[2] = {
-+		.t2CYC = 117, .tCYC = 55, .tDS = 7, .tDH = 5, .tDVS = 34,
-+		.tDVH = 6, .tCVS = 34, .tCVH = 6, .tFS_min = 0,
-+		.tLI_max = 100, .tMLI = 20, .tAZ = 10, .tZAH = 20,
-+		.tENV_min = 20, .tSR = 20, .tRFS = 60, .tRP = 100,
-+		.tACK = 20, .tSS = 50, .tDZFS = 47
-+	},
-+	[3] = {
-+		.t2CYC = 86, .tCYC = 39, .tDS = 7, .tDH = 5, .tDVS = 20,
-+		.tDVH = 6, .tCVS = 20, .tCVH = 6, .tFS_min = 0,
-+		.tLI_max = 100, .tMLI = 20, .tAZ = 10, .tZAH = 20,
-+		.tENV_min = 20, .tSR = 20, .tRFS = 60, .tRP = 100,
-+		.tACK = 20, .tSS = 50, .tDZFS = 35
-+	},
-+	[4] = {
-+		.t2CYC = 57, .tCYC = 25, .tDS = 5, .tDH = 5, .tDVS = 7,
-+		.tDVH = 6, .tCVS = 7, .tCVH = 6, .tFS_min = 0,
-+		.tLI_max = 100, .tMLI = 20, .tAZ = 10, .tZAH = 20,
-+		.tENV_min = 20, .tSR = 50, .tRFS = 60, .tRP = 100,
-+		.tACK = 20, .tSS = 50, .tDZFS = 25
-+	},
-+	[5] = {
-+		.t2CYC = 38, .tCYC = 17, .tDS = 4, .tDH = 5, .tDVS = 5,
-+		.tDVH = 6, .tCVS = 10, .tCVH = 10, .tFS_min = 0,
-+		.tLI_max = 75, .tMLI = 20, .tAZ = 10, .tZAH = 20,
-+		.tENV_min = 20, .tSR = 20, .tRFS = 50, .tRP = 85,
-+		.tACK = 20, .tSS = 50, .tDZFS = 40
-+	},
-+};
-+
-+#define NR_UDMA_SPECS (sizeof udma_specs / sizeof udma_specs[0])
-+
-+struct fsl_ata_time_regs {
-+	u8 time_off, time_on, time_1, time_2w;
-+	u8 time_2r, time_ax, time_pio_rdx, time_4;
-+	u8 time_9, time_m, time_jn, time_d;
-+	u8 time_k, time_ack, time_env, time_rpx;
-+	u8 time_zah, time_mlix, time_dvh, time_dzfs;
-+	u8 time_dvs, time_cvh, time_ss, time_cyc;
-+};
-+
-+static void update_timing_config(struct fsl_ata_time_regs *tp, struct ata_host *host)
-+{
-+	u32 *lp = (u32 *)tp;
-+	struct pata_fsl_priv *priv = host->private_data;
-+	u32 *ctlp = (u32 *)priv->fsl_ata_regs;
-+	int i;
-+
-+	/* 
-+	 * JKM - this could have endianess issues on BE depending
-+	 * on how the controller is glued to the bus -- probably
-+	 * should rewrite this to write byte at a time.
-+	 */
-+	for (i = 0; i < 5; i++) {
-+		__raw_writel(*lp, ctlp);
-+		lp++;
-+		ctlp++;
-+	}
-+	mb();
-+}
-+
-+/*!
-+ * Calculate values for the ATA bus timing registers and store
-+ * them into the hardware.
-+ *
-+ * @param       xfer_mode   specifies XFER xfer_mode
-+ * @param       pdev        specifies platform_device
-+ *
-+ * @return      EINVAL      speed out of range, or illegal mode
-+ */
-+static int set_ata_bus_timing(u8 xfer_mode, struct platform_device *pdev)
-+{
-+	struct fsl_ata_platform_data *plat = (struct fsl_ata_platform_data *)
-+					     pdev->dev.platform_data;
-+	struct ata_host *host = dev_get_drvdata(&pdev->dev);
-+
-+	/* get the bus clock cycle time, in ns */
-+	int T = 1 * 1000 * 1000 * 1000 / plat->get_clk_rate();
-+	struct fsl_ata_time_regs tr = {0};
-+	DPRINTK("clk_rate = %d  T = %d\n",plat->get_clk_rate(), T);
-+
-+	/*
-+	 * every mode gets the same t_off and t_on
-+	 */
-+	tr.time_off = 3;
-+	tr.time_on = 3;
-+
-+	if (xfer_mode >= XFER_UDMA_0) {
-+		int speed = xfer_mode - XFER_UDMA_0;
-+		if (speed >= NR_UDMA_SPECS) {
-+			return -EINVAL;
-+		}
-+		tr.time_ack = (udma_specs[speed].tACK + T) / T;
-+		tr.time_env = (udma_specs[speed].tENV_min + T) / T;
-+		tr.time_rpx = (udma_specs[speed].tRP + T) / T + 2;
-+
-+		tr.time_zah = (udma_specs[speed].tZAH + T) / T;
-+		tr.time_mlix = (udma_specs[speed].tMLI + T) / T;
-+		tr.time_dvh = (udma_specs[speed].tDVH + T) / T + 1;
-+		tr.time_dzfs = (udma_specs[speed].tDZFS + T) / T;
-+
-+		tr.time_dvs = (udma_specs[speed].tDVS + T) / T;
-+		tr.time_cvh = (udma_specs[speed].tCVH + T) / T;
-+		tr.time_ss = (udma_specs[speed].tSS + T) / T;
-+		tr.time_cyc = (udma_specs[speed].tCYC + T) / T;
-+	} else if (xfer_mode >= XFER_MW_DMA_0) {
-+		int speed = xfer_mode - XFER_MW_DMA_0;
-+		if (speed >= NR_MDMA_SPECS) {
-+			return -EINVAL;
-+		}
-+		tr.time_m = (mdma_specs[speed].tM + T) / T;
-+		tr.time_jn = (mdma_specs[speed].tJNH + T) / T;
-+		tr.time_d = (mdma_specs[speed].tD + T) / T;
-+
-+		tr.time_k = (mdma_specs[speed].tKW + T) / T;
-+	} else {
-+		int speed = xfer_mode - XFER_PIO_0;
-+		if (speed >= NR_PIO_SPECS) {
-+			return -EINVAL;
-+		}
-+		tr.time_1 = (pio_specs[speed].t1 + T) / T;
-+		tr.time_2w = (pio_specs[speed].t2_8 + T) / T;
-+
-+		tr.time_2r = (pio_specs[speed].t2_8 + T) / T;
-+		tr.time_ax = (pio_specs[speed].tA + T) / T + 2;
-+		tr.time_pio_rdx = 1;
-+		tr.time_4 = (pio_specs[speed].t4 + T) / T;
-+
-+		tr.time_9 = (pio_specs[speed].t9 + T) / T;
-+	}
-+
-+	update_timing_config(&tr, host);
-+
-+	return 0;
-+}
-+
-+static void pata_fsl_set_piomode(struct ata_port *ap, struct ata_device *adev)
-+{
-+	set_ata_bus_timing(adev->pio_mode, to_platform_device(ap->dev));
-+}
-+
-+#ifdef CONFIG_FSL_PATA_USE_DMA
-+static void pata_fsl_set_dmamode(struct ata_port *ap, struct ata_device *adev)
-+{
-+	struct pata_fsl_priv *priv = ap->host->private_data;
-+
-+	priv->ultra = adev->dma_mode >= XFER_UDMA_0;
-+
-+	set_ata_bus_timing(adev->dma_mode, to_platform_device(ap->dev));
-+}
-+#endif
-+
-+static int pata_fsl_port_start(struct ata_port *ap)
-+{
-+	return 0;
-+}
-+
-+#ifdef CONFIG_FSL_PATA_USE_DMA
-+static void dma_callback(void *arg, int error_status, unsigned int count)
-+{
-+	struct ata_port *ap = arg;
-+	struct pata_fsl_priv *priv = ap->host->private_data;
-+	u8 *ata_regs = priv->fsl_ata_regs;
-+
-+	priv->dma_done = 1;
-+	/* 
-+	 * DMA is finished, so unmask INTRQ from the drive to allow the
-+	 * normal ISR to fire.
-+	 */
-+#if 0
-+	__raw_writel(FSL_ATA_INTR_ATA_INTRQ2, ata_regs + FSL_ATA_INT_EN);
-+#else
-+	WRITE_ATA8(FSL_ATA_INTR_ATA_INTRQ2, FSL_ATA_INT_EN);
-+#endif
-+	mb();
-+}
-+
-+static void pata_fsl_bmdma_setup(struct ata_queued_cmd *qc)
-+{
-+	int nr_sg = 0;
-+	int chan;
-+	int dma_mode = 0, dma_ultra;
-+	u8 ata_control;
-+	struct ata_port *ap = qc->ap;
-+	struct pata_fsl_priv *priv = ap->host->private_data;
-+	u8 *ata_regs = priv->fsl_ata_regs;
-+	struct fsl_ata_platform_data *plat = ap->dev->platform_data;
-+	struct scatterlist tmp[plat->max_sg], *tsg, *sg;
-+	int err;
-+
-+	DPRINTK("ENTER\n");
-+
-+	priv->dma_dir = qc->dma_dir;
-+
-+	/*
-+	 * Configure the on-chip ATA interface hardware.
-+	 */
-+	dma_ultra = priv->ultra ?
-+		FSL_ATA_CTRL_DMA_ULTRA : 0;
-+
-+	ata_control = FSL_ATA_CTRL_FIFO_RST_B |
-+		      FSL_ATA_CTRL_ATA_RST_B |
-+		      FSL_ATA_CTRL_DMA_PENDING |
-+		      dma_ultra;
-+
-+	if (qc->dma_dir == DMA_TO_DEVICE) {
-+		chan = priv->dma_wchan;
-+		ata_control |= FSL_ATA_CTRL_FIFO_TX_EN |
-+			      FSL_ATA_CTRL_DMA_WRITE;
-+		dma_mode = DMA_MODE_WRITE;
-+	} else {
-+		chan = priv->dma_rchan;
-+		ata_control |= FSL_ATA_CTRL_FIFO_RCV_EN;
-+		dma_mode = DMA_MODE_READ;
-+	}
-+#if 0
-+	__raw_writel(ata_control, ata_regs + FSL_ATA_CONTROL);
-+	__raw_writel(plat->fifo_alarm, ata_regs + FSL_ATA_FIFO_ALARM);
-+	__raw_writel(FSL_ATA_INTR_ATA_INTRQ1, ata_regs + FSL_ATA_INT_EN);
-+#else
-+	WRITE_ATA8(ata_control, FSL_ATA_CONTROL);
-+	WRITE_ATA8(plat->fifo_alarm, FSL_ATA_FIFO_ALARM);
-+	WRITE_ATA8(FSL_ATA_INTR_ATA_INTRQ1, FSL_ATA_INT_EN);
-+#endif
-+	mb();
-+
-+	/*
-+	 * Set up the DMA completion callback.
-+	 */
-+	mxc_dma_callback_set(chan, dma_callback, (void *)ap);
-+
-+	/*
-+	 * Copy the sg list to an array.
-+	 */
-+	tsg = tmp;
-+	ata_for_each_sg(sg, qc) {
-+		memcpy(tsg, sg, sizeof *sg);
-+		tsg++;
-+		nr_sg++;
-+	}
-+	
-+	err = mxc_dma_sg_config(chan, tmp, nr_sg, 0, dma_mode);
-+	if (err) {
-+		printk(KERN_ERR "pata_fsl_bmdma_setup: error %d\n", err);
-+	}
-+	DPRINTK("EXIT\n");
-+}
-+
-+static void pata_fsl_bmdma_start(struct ata_queued_cmd *qc)
-+{
-+	struct ata_port *ap = qc->ap;
-+	struct pata_fsl_priv *priv = ap->host->private_data;
-+	int chan;
-+	int err;
-+
-+	/*
-+	 * Start the channel.
-+	 */
-+	chan = qc->dma_dir == DMA_TO_DEVICE ? priv->dma_wchan : priv->dma_rchan;
-+
-+	priv->dma_done = 0;
-+
-+	err = mxc_dma_enable(chan);
-+	if (err) {
-+		printk(KERN_ERR "%s: : error %d\n", __func__, err);
-+	}
-+
-+	ap->ops->exec_command(ap, &qc->tf);
-+}
-+
-+static void pata_fsl_bmdma_stop(struct ata_queued_cmd *qc)
-+{
-+	struct ata_port *ap = qc->ap;
-+
-+	/* do a dummy read as in ata_bmdma_stop */
-+	ata_altstatus(ap);
-+}
-+
-+static u8 pata_fsl_bmdma_status(struct ata_port *ap)
-+{
-+	struct pata_fsl_priv *priv = ap->host->private_data;
-+
-+	return priv->dma_done ? ATA_DMA_INTR : 0;
-+}
-+
-+static void pata_fsl_dma_init(struct ata_port *ap)
-+{
-+	struct pata_fsl_priv *priv = ap->host->private_data;
-+
-+	priv->dma_rchan = -1;
-+	priv->dma_wchan = -1;
-+
-+	priv->dma_rchan = mxc_dma_request(MXC_DMA_ATA_RX, "MXC ATA RX");
-+	if (priv->dma_rchan < 0) {
-+		dev_printk(KERN_ERR, ap->dev, "couldn't get RX DMA channel\n");
-+		goto err_out;
-+	}
-+
-+	priv->dma_wchan = mxc_dma_request(MXC_DMA_ATA_TX, "MXC ATA TX");
-+	if (priv->dma_wchan < 0) {
-+		dev_printk(KERN_ERR, ap->dev, "couldn't get TX DMA channel\n");
-+		goto err_out;
-+	}       
-+
-+	dev_printk(KERN_ERR, ap->dev, "rchan=%d wchan=%d\n", priv->dma_rchan,
-+		   priv->dma_wchan);
-+	return;
-+
-+err_out:
-+	ap->mwdma_mask = 0;
-+	ap->udma_mask = 0;
-+	mxc_dma_free(priv->dma_rchan);
-+	mxc_dma_free(priv->dma_wchan);
-+	kfree(priv);
-+}
-+#endif /* CONFIG_FSL_PATA_USE_DMA */
-+
-+static u8 pata_fsl_irq_ack(struct ata_port *ap, unsigned int chk_drq)
-+{
-+	unsigned int bits = chk_drq ? ATA_BUSY | ATA_DRQ : ATA_BUSY;
-+	u8 status;
-+
-+	status = ata_busy_wait(ap, bits, 1000);
-+	if (status & bits)
-+		if (ata_msg_err(ap))
-+			printk(KERN_ERR "abnormal status 0x%X\n", status);
-+
-+	return status;
-+}
-+
-+static void ata_dummy_noret(struct ata_port *ap) { return; }
-+
-+static struct scsi_host_template pata_fsl_sht = {
-+	.module			= THIS_MODULE,
-+	.name			= DRV_NAME,
-+	.ioctl			= ata_scsi_ioctl,
-+	.queuecommand		= ata_scsi_queuecmd,
-+	.can_queue		= ATA_DEF_QUEUE,
-+	.this_id		= ATA_SHT_THIS_ID,
-+	.sg_tablesize		= LIBATA_MAX_PRD,
-+	.cmd_per_lun		= ATA_SHT_CMD_PER_LUN,
-+	.emulated		= ATA_SHT_EMULATED,
-+	.use_clustering		= ATA_SHT_USE_CLUSTERING,
-+	.proc_name		= DRV_NAME,
-+#ifdef CONFIG_FSL_PATA_USE_DMA
-+	.dma_boundary		= FSL_ATA_MAX_SG_LEN,
-+#endif
-+	.slave_configure	= ata_scsi_slave_config,
-+	.slave_destroy		= ata_scsi_slave_destroy,
-+	.bios_param		= ata_std_bios_param,
-+};
-+
-+static struct ata_port_operations pata_fsl_port_ops = {
-+	.set_piomode		= pata_fsl_set_piomode,
-+#ifdef CONFIG_FSL_PATA_USE_DMA
-+	.set_dmamode		= pata_fsl_set_dmamode,
-+#endif
-+
-+	.port_disable		= ata_port_disable,
-+	.tf_load		= ata_tf_load,
-+	.tf_read		= ata_tf_read,
-+	.check_status		= ata_check_status,
-+	.exec_command		= ata_exec_command,
-+	.dev_select		= ata_std_dev_select,
-+
-+	.freeze			= ata_bmdma_freeze,
-+	.thaw			= ata_bmdma_thaw,
-+	.error_handler		= ata_bmdma_error_handler,
-+	.post_internal_cmd	= ata_bmdma_post_internal_cmd,
-+	.cable_detect		= ata_cable_unknown,
-+
-+#ifdef CONFIG_FSL_PATA_USE_DMA
-+	.bmdma_setup		= pata_fsl_bmdma_setup,
-+	.bmdma_start		= pata_fsl_bmdma_start,
-+#endif
-+
-+	.qc_prep		= ata_noop_qc_prep,
-+	.qc_issue		= ata_qc_issue_prot,
-+
-+	.data_xfer		= ata_data_xfer_noirq,
-+
-+	.irq_clear		= ata_dummy_noret,
-+	.irq_on			= ata_irq_on,
-+	.irq_ack		= pata_fsl_irq_ack,
-+
-+	.port_start		= pata_fsl_port_start,
-+
-+#ifdef CONFIG_FSL_PATA_USE_DMA
-+	.bmdma_stop		= pata_fsl_bmdma_stop,
-+	.bmdma_status		= pata_fsl_bmdma_status,
-+#endif
-+};
-+
-+static void fsl_setup_port(struct ata_ioports *ioaddr)
-+{
-+	unsigned int shift = 2;
-+
-+	ioaddr->data_addr	= ioaddr->cmd_addr + (ATA_REG_DATA    << shift);
-+	ioaddr->error_addr	= ioaddr->cmd_addr + (ATA_REG_ERR     << shift);
-+	ioaddr->feature_addr	= ioaddr->cmd_addr + (ATA_REG_FEATURE << shift);
-+	ioaddr->nsect_addr	= ioaddr->cmd_addr + (ATA_REG_NSECT   << shift);
-+	ioaddr->lbal_addr	= ioaddr->cmd_addr + (ATA_REG_LBAL    << shift);
-+	ioaddr->lbam_addr	= ioaddr->cmd_addr + (ATA_REG_LBAM    << shift);
-+	ioaddr->lbah_addr	= ioaddr->cmd_addr + (ATA_REG_LBAH    << shift);
-+	ioaddr->device_addr	= ioaddr->cmd_addr + (ATA_REG_DEVICE  << shift);
-+	ioaddr->status_addr	= ioaddr->cmd_addr + (ATA_REG_STATUS  << shift);
-+	ioaddr->command_addr	= ioaddr->cmd_addr + (ATA_REG_CMD     << shift);
-+}
-+
-+/**
-+ *	pata_fsl_probe		-	attach a platform interface
-+ *	@pdev: platform device
-+ *
-+ *	Register a platform bus integrated ATA host controller
-+ *
-+ *	The 3 platform device resources are used as follows:
-+ *
-+ *		- I/O Base (IORESOURCE_MEM) virt. addr. of ATA controller regs
-+ *		- CTL Base (IORESOURCE_MEM) unused
-+ *		- IRQ	   (IORESOURCE_IRQ) platform IRQ assigned to ATA
-+ *
-+ */
-+static int __devinit pata_fsl_probe(struct platform_device *pdev)
-+{
-+	struct resource *io_res;
-+	struct ata_host *host;
-+	struct ata_port *ap;
-+	struct fsl_ata_platform_data *plat = (struct fsl_ata_platform_data *)
-+					     pdev->dev.platform_data;
-+	struct pata_fsl_priv *priv;
-+	u8 *ata_regs;
-+	int ret;
-+
-+	DPRINTK("ENTER\n");
-+	/* 
-+	 * Get an ata_host structure for this device
-+	 */
-+	host = ata_host_alloc(&pdev->dev, 1);
-+	if (!host)
-+		return -ENOMEM;
-+	ap = host->ports[0];
-+
-+	/* 
-+	 * Allocate private data
-+	 */
-+	priv = kzalloc(sizeof (struct pata_fsl_priv), GFP_KERNEL);
-+	if(priv == NULL) {
-+		/* free(host); */
-+		return -ENOMEM;
-+	}
-+	host->private_data = priv;
-+
-+	/*
-+	 * Set up resources
-+	 */
-+	if (unlikely(pdev->num_resources != 3)) {
-+		dev_err(&pdev->dev, "invalid number of resources\n");
-+		return -EINVAL;
-+	}
-+
-+	io_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	ata_regs = (u8 *)io_res->start;
-+	priv->fsl_ata_regs = ata_regs;
-+	ap->ioaddr.cmd_addr = (void *)(ata_regs + FSL_ATA_DRIVE_DATA);
-+	ap->ioaddr.ctl_addr = (void *)(ata_regs + FSL_ATA_DRIVE_CONTROL);
-+	ap->ioaddr.altstatus_addr = ap->ioaddr.ctl_addr;
-+	ap->ops = &pata_fsl_port_ops;
-+	ap->pio_mask = 0x7F;
-+#ifdef CONFIG_FSL_PATA_USE_DMA
-+	ap->mwdma_mask = 0x7F;
-+	ap->udma_mask = plat->udma_mask;
-+	pata_fsl_sht.sg_tablesize = plat->max_sg;
-+#else
-+	ap->mwdma_mask = 0x00;
-+	ap->udma_mask = 0x00;
-+#endif
-+	fsl_setup_port(&ap->ioaddr);
-+
-+	/*
-+	 * Do platform-specific initialization (e.g. allocate pins,
-+	 * turn on clock).  After this call it is assumed that
-+	 * plat->get_clk_rate() can be called to calculate
-+	 * timing.
-+	 */
-+	if (plat->init && plat->init(pdev)) {
-+		/* REVISIT: don't leak what ata_host_alloc() allocated */
-+		return -ENODEV;
-+	}
-+
-+	/* Deassert the reset bit to enable the interface */
-+	WRITE_ATA8(FSL_ATA_CTRL_ATA_RST_B, FSL_ATA_CONTROL);
-+	mb();
-+
-+	/* Set initial timing and mode */
-+	set_ata_bus_timing(XFER_PIO_4, pdev);
-+
-+#ifdef CONFIG_FSL_PATA_USE_DMA
-+	/* get DMA ready */
-+	pata_fsl_dma_init(ap);
-+#endif
-+
-+	/*
-+	 * Enable the ATA INTRQ interrupt from the bus, but
-+	 * only allow the CPU to see it (INTRQ2) at this point.
-+	 * INTRQ1, which goes to the DMA, will be enabled later.
-+	 */
-+#if 0
-+	__raw_writel(FSL_ATA_INTR_ATA_INTRQ2, ata_regs + FSL_ATA_INT_EN);
-+#else
-+	WRITE_ATA8(FSL_ATA_INTR_ATA_INTRQ2, FSL_ATA_INT_EN);
-+#endif
-+	mb();
-+
-+	/* activate */
-+	ret = ata_host_activate(host, platform_get_irq(pdev, 0), ata_interrupt,
-+				 0, &pata_fsl_sht);
-+	DPRINTK("EXIT ret=%d\n", ret);
-+	return ret;
-+}
-+
-+/**
-+ *	pata_fsl_remove	-	unplug a platform interface
-+ *	@pdev: platform device
-+ *
-+ *	A platform bus ATA device has been unplugged. Perform the needed
-+ *	cleanup. Also called on module unload for any active devices.
-+ */
-+static int __devexit pata_fsl_remove(struct platform_device *pdev)
-+{
-+	struct device *dev = &pdev->dev;
-+	struct ata_host *host = dev_get_drvdata(dev);
-+	struct pata_fsl_priv *priv = host->private_data;
-+	struct fsl_ata_platform_data *plat = (struct fsl_ata_platform_data *)
-+					     pdev->dev.platform_data;
-+	u8 *ata_regs = priv->fsl_ata_regs;
-+
-+#if 0
-+	__raw_writel(0, ata_regs + FSL_ATA_INT_EN);  /* Disable interrupts */
-+#else
-+	WRITE_ATA8(0, FSL_ATA_INT_EN); /* Disable interrupts */
-+#endif
-+	mb();
-+
-+	ata_host_detach(host);
-+
-+	if (plat->exit)
-+		plat->exit();
-+
-+	kfree(priv);
-+
-+	return 0;
-+}
-+
-+#ifdef CONFIG_PM
-+static int pata_fsl_suspend(struct platform_device *pdev, pm_message_t state)
-+{
-+	struct ata_host *host = dev_get_drvdata(&pdev->dev);
-+	struct pata_fsl_priv *priv = host->private_data;
-+	struct fsl_ata_platform_data *plat = (struct fsl_ata_platform_data *)
-+					     pdev->dev.platform_data;
-+	u8 *ata_regs = priv->fsl_ata_regs;
-+
-+	/* Disable interrupts. */
-+#if 0
-+	__raw_writel(0, ata_regs + FSL_ATA_INT_EN);
-+#else
-+	WRITE_ATA8(0, FSL_ATA_INT_EN);
-+#endif
-+	mb();
-+
-+	if (plat->exit)
-+		plat->exit();
-+
-+	return 0;
-+}
-+
-+static int pata_fsl_resume(struct platform_device *pdev)
-+{
-+	struct ata_host *host = dev_get_drvdata(&pdev->dev);
-+	struct pata_fsl_priv *priv = host->private_data;
-+	struct fsl_ata_platform_data *plat = (struct fsl_ata_platform_data *)
-+					     pdev->dev.platform_data;
-+	u8 *ata_regs = priv->fsl_ata_regs;
-+
-+	if (plat->init && plat->init(pdev)) {
-+		return -ENODEV;
-+	}
-+
-+	/* Deassert the reset bit to enable the interface */
-+#if 0
-+	__raw_writel(FSL_ATA_CTRL_ATA_RST_B, ata_regs + FSL_ATA_CONTROL);
-+#else
-+	WRITE_ATA8(FSL_ATA_CTRL_ATA_RST_B, FSL_ATA_CONTROL);
-+#endif
-+	mb();
-+
-+	/* Set initial timing and mode */
-+	set_ata_bus_timing(XFER_PIO_4, pdev);
-+
-+	/*
-+	 * Enable hardware interrupts.
-+	 */
-+#if 0
-+	__raw_writel(FSL_ATA_INTR_ATA_INTRQ2, ata_regs + FSL_ATA_INT_EN);
-+#else
-+	WRITE_ATA8(FSL_ATA_INTR_ATA_INTRQ2, FSL_ATA_INT_EN);
-+#endif
-+	mb();
-+
-+	return 0;
-+}
-+#endif
-+
-+static struct platform_driver pata_fsl_driver = {
-+	.probe		= pata_fsl_probe,
-+	.remove		= __devexit_p(pata_fsl_remove),
-+#ifdef CONFIG_PM
-+	.suspend	= pata_fsl_suspend,
-+	.resume		= pata_fsl_resume,
-+#endif
-+	.driver = {
-+		.name		= DRV_NAME,
-+		.owner		= THIS_MODULE,
-+	},
-+};
-+
-+static int __init pata_fsl_init(void)
-+{
-+	int ret;
-+
-+	DPRINTK("ENTER\n");
-+	ret = platform_driver_register(&pata_fsl_driver);
-+	DPRINTK("EXIT ret=%d\n", ret);
-+	return ret;
-+}
-+
-+static void __exit pata_fsl_exit(void)
-+{
-+	platform_driver_unregister(&pata_fsl_driver);
-+}
-+module_init(pata_fsl_init);
-+module_exit(pata_fsl_exit);
-+
-+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
-+MODULE_DESCRIPTION("low-level driver for Freescale ATA");
-+MODULE_LICENSE("GPL");
-+MODULE_VERSION(DRV_VERSION);
---- a/include/asm-m68k/pci.h
-+++ b/include/asm-m68k/pci.h
-@@ -7,8 +7,14 @@
- #ifndef _ASM_M68K_PCI_H
- #define _ASM_M68K_PCI_H
- 
--#ifdef CONFIG_PCI
--
-+#ifndef CONFIG_PCI
-+/*
-+ * The PCI address space does equal the physical memory
-+ * address space.  The networking and block device layers use
-+ * this boolean for bounce buffer decisions.
-+ */
-+#define PCI_DMA_BUS_IS_PHYS		(1)
-+#else
- #include <asm-generic/pci-dma-compat.h>
- 
- /*
---- a/include/linux/fsl_devices.h
-+++ b/include/linux/fsl_devices.h
-@@ -126,5 +126,16 @@ struct mpc8xx_pcmcia_ops {
- 	int(*voltage_set)(int slot, int vcc, int vpp);
- };
- 
-+struct fsl_ata_platform_data {
-+#ifdef	CONFIG_FSL_PATA_USE_DMA
-+	int	udma_mask;	/* UDMA modes h/w can handle */
-+	int	fifo_alarm;	/* value for fifo_alarm reg */
-+	int	max_sg;		/* longest sglist h/w can handle */
-+#endif
-+	int	(*init)(struct platform_device *pdev);
-+	void	(*exit)(void);
-+	int	(*get_clk_rate)(void);
-+};
-+
- #endif /* _FSL_DEVICE_H_ */
- #endif /* __KERNEL__ */
diff --git a/target/linux/coldfire/patches/014-m5445x_ioremap_xf0000000.patch b/target/linux/coldfire/patches/014-m5445x_ioremap_xf0000000.patch
deleted file mode 100644
index 11bbbe247..000000000
--- a/target/linux/coldfire/patches/014-m5445x_ioremap_xf0000000.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From ed9d4b88136173a4e17701d9c1162ddfecf902e4 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Mon, 19 Nov 2007 15:24:30 -0700
-Subject: [PATCH] Short circuit IOREMAP calls in the 0xF0000000 range.
-
-LTIBName: m5445x-ioremap-xf0000000
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/coldfire/head.S |    4 ++--
- arch/m68k/mm/kmap.c       |   14 ++++++++++++--
- 2 files changed, 14 insertions(+), 4 deletions(-)
-
---- a/arch/m68k/coldfire/head.S
-+++ b/arch/m68k/coldfire/head.S
-@@ -56,13 +56,13 @@
-  * Setup ACR mappings to provide the following memory map:
-  *   Data
-  *     0xA0000000 -> 0xAFFFFFFF [0] NO CACHE / PRECISE / SUPER ONLY
-- *     0xFC000000 -> 0xFCFFFFFF [1] NO CACHE / PRECISE / SUPER ONLY
-+ *     0xF0000000 -> 0xFFFFFFFF [1] NO CACHE / PRECISE / SUPER ONLY
-  *   Code
-  *     None currently (mapped via TLBs)
-  */
- 
- #define ACR0_DEFAULT	#0xA00FA048   /* ACR0 default value */
--#define ACR1_DEFAULT	#0xFC00A040   /* ACR1 default value */
-+#define ACR1_DEFAULT	#0xF00FA040   /* ACR1 default value */
- #define ACR2_DEFAULT	#0x00000000   /* ACR2 default value */
- #define ACR3_DEFAULT	#0x00000000   /* ACR3 default value */
- 
---- a/arch/m68k/mm/kmap.c
-+++ b/arch/m68k/mm/kmap.c
-@@ -133,8 +133,18 @@ void __iomem *__ioremap(unsigned long ph
- 	}
- #endif
- 
-+#ifdef CONFIG_M54455
-+	if (physaddr >= 0xf0000000) {
-+		/* short circuit mappings for xf0000000 */
- #ifdef DEBUG
--	printk("ioremap: 0x%lx,0x%lx(%d) - ", physaddr, size, cacheflag);
-+		printk(KERN_INFO "ioremap: short circuiting 0x%lx mapping\n", physaddr);
-+#endif
-+		return (void __iomem *)physaddr;
-+	}
-+#endif
-+
-+#ifdef DEBUG
-+	printk("ioremap: paddr=0x%lx,size=0x%lx(%d) - ", physaddr, size, cacheflag);
- #endif
- 	/*
- 	 * Mappings have to be aligned
-@@ -153,7 +163,7 @@ void __iomem *__ioremap(unsigned long ph
- 	virtaddr = (unsigned long)area->addr;
- 	retaddr = virtaddr + offset;
- #ifdef DEBUG
--	printk("0x%lx,0x%lx,0x%lx", physaddr, virtaddr, retaddr);
-+	printk(" paddr=0x%lx,vaddr=0x%lx,retaddr=0x%lx", physaddr, virtaddr, retaddr);
- #endif
- 
- 	/*
diff --git a/target/linux/coldfire/patches/015-m5445x_cau_crypto.patch b/target/linux/coldfire/patches/015-m5445x_cau_crypto.patch
deleted file mode 100644
index dac62e285..000000000
--- a/target/linux/coldfire/patches/015-m5445x_cau_crypto.patch
+++ /dev/null
@@ -1,1937 +0,0 @@
-From 67e24d4008a39fa02a4748a3abf54410b15262b3 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Tue, 20 Nov 2007 10:02:16 -0700
-Subject: [PATCH] Add Coldfire CAU crypto support for DES/3DES/AES/MD5/AES.
-
-LTIBName: m5445x-cau-crypto
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- drivers/crypto/Kconfig       |   63 ++++
- drivers/crypto/Makefile      |    5 +
- drivers/crypto/mcfcau-aes.c  |  311 ++++++++++++++++++++
- drivers/crypto/mcfcau-des.c  |  437 ++++++++++++++++++++++++++++
- drivers/crypto/mcfcau-md5.c  |  654 ++++++++++++++++++++++++++++++++++++++++++
- drivers/crypto/mcfcau-sha1.c |  280 ++++++++++++++++++
- drivers/crypto/mcfcau.c      |   32 ++
- drivers/crypto/mcfcau.h      |   98 +++++++
- 8 files changed, 1880 insertions(+), 0 deletions(-)
- create mode 100644 drivers/crypto/mcfcau-aes.c
- create mode 100644 drivers/crypto/mcfcau-des.c
- create mode 100644 drivers/crypto/mcfcau-md5.c
- create mode 100644 drivers/crypto/mcfcau-sha1.c
- create mode 100644 drivers/crypto/mcfcau.c
- create mode 100644 drivers/crypto/mcfcau.h
-
---- a/drivers/crypto/Kconfig
-+++ b/drivers/crypto/Kconfig
-@@ -60,6 +60,69 @@ config CRYPTO_DEV_GEODE
- 	  To compile this driver as a module, choose M here: the module
- 	  will be called geode-aes.
- 
-+config CRYPTO_DEV_MCFCAU
-+	bool "Support for Freescale Coldfire Cryptographic Acceleration Unit (CAU)"
-+	depends on M54455
-+	select CRYPTO_ALGAPI
-+	help
-+	  The cryptographic acceleration unit (CAU) is a ColdFire coprocessor
-+	  implementing a set of specialized operations in hardware. For example, you can
-+	  find it on MCF54455.
-+
-+config CRYPTO_DEV_MCFCAU_DES
-+	tristate "DES and Triple DES cipher algorithms (MCF54455)"
-+	depends on CRYPTO_DEV_MCFCAU
-+	select CRYPTO_ALGAPI
-+	select CRYPTO_BLKCIPHER
-+	help
-+	  DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3).
-+	  
-+	  Say 'Y' here to use the CAU coprocessor for 
-+	  the CryptoAPI DES and 3DES alogrithms.
-+	 	  
-+	  To compile this driver as a module, choose M here: the module
-+	  will be called mcfcau-des.
-+
-+config CRYPTO_DEV_MCFCAU_AES
-+	tristate "AES cipher algorithm (MCF54455)"
-+	depends on CRYPTO_DEV_MCFCAU
-+	select CRYPTO_ALGAPI
-+	select CRYPTO_BLKCIPHER
-+	help
-+	  AES cipher algorithm (FIPS 197).
-+
-+	  Say 'Y' here to use the CAU coprocessor for
-+	  the CryptoAPI AES alogrithm.
-+
-+	  To compile this driver as a module, choose M here: the module
-+	  will be called mcfcau-aes.
-+
-+config CRYPTO_DEV_MCFCAU_MD5
-+	tristate "MD5 digest algorithm (MCF54455)"
-+	depends on CRYPTO_DEV_MCFCAU
-+	select CRYPTO_ALGAPI
-+	help
-+	  MD5 message digest algorithm (RFC1321).
-+
-+	  Say 'Y' here to use the CAU coprocessor for
-+	  the CryptoAPI MD5 alogrithm.
-+
-+	  To compile this driver as a module, choose M here: the module
-+	  will be called mcfcau-md5.
-+
-+config CRYPTO_DEV_MCFCAU_SHA1
-+	tristate "SHA1 digest algorithm (MCF54455)"
-+	depends on CRYPTO_DEV_MCFCAU
-+	select CRYPTO_ALGAPI
-+	help
-+	  SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2).
-+
-+	  Say 'Y' here to use the CAU coprocessor for
-+	  the CryptoAPI SHA1 alogrithm.
-+
-+	  To compile this driver as a module, choose M here: the module
-+	  will be called mcfcau-sha1.
-+
- config ZCRYPT
- 	tristate "Support for PCI-attached cryptographic adapters"
- 	depends on S390
---- a/drivers/crypto/Makefile
-+++ b/drivers/crypto/Makefile
-@@ -2,3 +2,8 @@ obj-$(CONFIG_CRYPTO_DEV_PADLOCK_AES) += 
- obj-$(CONFIG_CRYPTO_DEV_PADLOCK_SHA) += padlock-sha.o
- obj-$(CONFIG_CRYPTO_DEV_GEODE) += geode-aes.o
- obj-$(CONFIG_CRYPTO_DEV_HIFN_795X) += hifn_795x.o
-+obj-$(CONFIG_CRYPTO_DEV_MCFCAU) += mcfcau.o
-+obj-$(CONFIG_CRYPTO_DEV_MCFCAU_DES) += mcfcau-des.o
-+obj-$(CONFIG_CRYPTO_DEV_MCFCAU_AES) += mcfcau-aes.o
-+obj-$(CONFIG_CRYPTO_DEV_MCFCAU_MD5) += mcfcau-md5.o
-+obj-$(CONFIG_CRYPTO_DEV_MCFCAU_SHA1) += mcfcau-sha1.o
---- /dev/null
-+++ b/drivers/crypto/mcfcau-aes.c
-@@ -0,0 +1,311 @@
-+ /***************************************************************************
-+ * mcfcau-aes.c - Implementation of AES Cipher Algorithm
-+ *                for Freescale ColdFire Cryptographic Acceleration Unit (CAU).
-+ *
-+ * Author: Andrey Butok
-+ * Copyright Freescale Semiconductor Inc.  2007
-+ *
-+ * NOTE: You can find the ColdFire CAU module on MCF54455 and MCF52235.
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+ * for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software Foundation,
-+ * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ *
-+ ***************************************************************************
-+ * Changes:
-+ * v0.01	17 September 2007	Andrey Butok
-+ *   		Initial Release - developed on 2.6.20 Linux kernel.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/types.h>
-+#include <linux/errno.h>
-+#include <linux/crypto.h>
-+
-+/*
-+#undef DEBUG
-+#define DEBUG 1
-+*/
-+
-+#include "mcfcau.h"
-+
-+#define MCFCAU_AES_MIN_KEY_SIZE	(16)
-+#define MCFCAU_AES_MAX_KEY_SIZE	(32)
-+#define MCFCAU_AES_BLOCK_SIZE	(16)
-+
-+#define	MCFCAU_AES_DRIVER_DESC		"AES ColdFire CAU driver"
-+#define	MCFCAU_AES_DRIVER_VERSION	"v0.01"
-+
-+struct mcfcau_aes_ctx {
-+	int Nr_1;
-+	u32 buf[120];
-+	u32 buf_tmp[16];
-+};
-+
-+static u32 mcfcau_rco_tab[10]={ 0x01000000, 0x02000000, 0x04000000, 0x08000000,
-+				0x10000000, 0x20000000, 0x40000000, 0x80000000,
-+				0x1b000000, 0x36000000};
-+
-+int mcfcau_aes_setkey(struct crypto_tfm *tfm, const u8 *in_key,
-+		       unsigned int key_len)
-+{
-+	struct mcfcau_aes_ctx *ctx = crypto_tfm_ctx(tfm);
-+	const u32 * key = (const u32 *)in_key;
-+	u32 *flags = &tfm->crt_flags;
-+	u32 i;
-+	u32* key_sch = (&ctx->buf[0]);
-+	u32 * temp_p, * rcon_p;
-+	u32 Nx;
-+	u32 Nk;
-+	unsigned long iflags;
-+
-+	DBG("\n");
-+
-+	if (key_len % 8) {
-+		*flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
-+		return -EINVAL;
-+	}
-+
-+	Nk = key_len>>2;
-+
-+	for(i=0;i<Nk;i++){
-+		key_sch[i] = key[i];
-+	}
-+
-+	ctx->Nr_1 = Nk+5;
-+
-+	/* Key Expansion */
-+	temp_p=&key_sch[Nk-1];
-+	rcon_p=&mcfcau_rco_tab[0];
-+
-+	spin_lock_irqsave(&mcfcau_lock, iflags);
-+
-+	asm volatile ("move.l	%0, %%a1"::"m"(temp_p):"a1");
-+	asm volatile ("move.l	%0, %%a3"::"m"(rcon_p):"a3");
-+	asm volatile ("move.l	%0, %%a4"::"m"(key_sch):"a4");
-+
-+	Nx=(Nk+7)<<2; /* (Nr+1)*Nb */
-+
-+	for(i=Nk; i<Nx; i++)
-+	{
-+		/* temp = key_sch[Nk-1] */
-+		asm volatile ("cp0ld.l	(%%a1)+,%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CAA):"a1");
-+
-+		if(i%Nk==0){
-+			asm volatile ("moveq	#8, %%d0":::"d0");
-+			/* CAA=RotWord(temp) */
-+			asm volatile ("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA):"d0");
-+			/* SubWord(CAA) */
-+			asm volatile ("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_AESS+MCFCAU_CAA));
-+			/* ACC xor rcon[i/Nk] */
-+			asm volatile ("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_XOR+MCFCAU_CAA):"a3");
-+
-+		}else if((Nk>6) && (i%Nk ==4)){
-+			/* SubWord(ACC) */
-+			asm volatile ("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_AESS+MCFCAU_CAA));
-+		}
-+
-+		/* key_sch[i]^=key_sch[i-Nk]; store ACC to key_sch[i] */
-+		asm volatile ("cp0ld.l	(%%a4)+,%%d0,#1,%0"	::"n"(MCFCAU_XOR+MCFCAU_CAA):"a4");
-+		asm volatile ("cp0st.l	%%d0,(%%a1),#1,%0"	::"n"(MCFCAU_STR+MCFCAU_CAA));
-+	}
-+	spin_unlock_irqrestore(&mcfcau_lock, iflags);
-+
-+	return 0;
-+}
-+
-+
-+/* encrypt a block of text */
-+static void mcfcau_aes_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
-+{
-+	struct mcfcau_aes_ctx *ctx = crypto_tfm_ctx(tfm);
-+	const int Nr_1 = ctx->Nr_1;
-+
-+	u32* key_sch = &(ctx->buf[0]);
-+	u32 i;
-+	unsigned long iflags;
-+
-+	DBG("\n");
-+
-+	spin_lock_irqsave(&mcfcau_lock, iflags);
-+	asm("move.l	%0, %%a1"::"m"(in):"a1");
-+	asm("move.l	%0, %%a0"::"m"(key_sch):"a0");
-+	/* state=in */
-+	asm("cp0ld.l	(%%a1)+,%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA0):"a1");
-+	asm("cp0ld.l	(%%a1)+,%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA1):"a1");
-+	asm("cp0ld.l	(%%a1)+,%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA2):"a1");
-+	asm("cp0ld.l	(%%a1)+,%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA3):"a1");
-+	/* AddRoundKey() */
-+	asm("cp0ld.l	(%%a0)+,%%d0,#1,%0"	::"n"(MCFCAU_XOR+MCFCAU_CA0):"a0");
-+	asm("cp0ld.l	(%%a0)+,%%d0,#1,%0"	::"n"(MCFCAU_XOR+MCFCAU_CA1):"a0");
-+	asm("cp0ld.l	(%%a0)+,%%d0,#1,%0"	::"n"(MCFCAU_XOR+MCFCAU_CA2):"a0");
-+	asm("cp0ld.l	(%%a0)+,%%d0,#1,%0"	::"n"(MCFCAU_XOR+MCFCAU_CA3):"a0");
-+
-+	for(i=Nr_1;i>0;i--){
-+		/* SubBytes(state) */
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_AESS+MCFCAU_CA0));
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_AESS+MCFCAU_CA1));
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_AESS+MCFCAU_CA2));
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_AESS+MCFCAU_CA3));
-+		/* ShiftRows(state) */
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_AESR));
-+		/* MixColumns(state); AddRoundKey() */
-+		asm("cp0ld.l	(%%a0)+,%%d0,#1,%0"	::"n"(MCFCAU_AESC+MCFCAU_CA0):"a0");
-+		asm("cp0ld.l	(%%a0)+,%%d0,#1,%0"	::"n"(MCFCAU_AESC+MCFCAU_CA1):"a0");
-+		asm("cp0ld.l	(%%a0)+,%%d0,#1,%0"	::"n"(MCFCAU_AESC+MCFCAU_CA2):"a0");
-+		asm("cp0ld.l	(%%a0)+,%%d0,#1,%0"	::"n"(MCFCAU_AESC+MCFCAU_CA3):"a0");
-+	}
-+	/* SubBytes(state)*/
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_AESS+MCFCAU_CA0));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_AESS+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_AESS+MCFCAU_CA2));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_AESS+MCFCAU_CA3));
-+	/* ShiftRows(state) */
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_AESR));
-+	/* AddRoundKey() */
-+	asm("cp0ld.l	(%%a0)+,%%d0,#1,%0"	::"n"(MCFCAU_XOR+MCFCAU_CA0):"a0");
-+	asm("cp0ld.l	(%%a0)+,%%d0,#1,%0"	::"n"(MCFCAU_XOR+MCFCAU_CA1):"a0");
-+	asm("cp0ld.l	(%%a0)+,%%d0,#1,%0"	::"n"(MCFCAU_XOR+MCFCAU_CA2):"a0");
-+	asm("cp0ld.l	(%%a0)+,%%d0,#1,%0"	::"n"(MCFCAU_XOR+MCFCAU_CA3):"a0");
-+	/* out = state */
-+	asm("move.l	%0, %%a1"		::"m"(out):"a1");
-+	asm("cp0st.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_STR+MCFCAU_CA0):"d0");
-+	asm("cp0st.l	%%d0,%%d1,#1,%0"	::"n"(MCFCAU_STR+MCFCAU_CA1):"d1");
-+
-+	asm("move.l	%%d0,(%%a1)+":::"a1");
-+	asm("move.l	%%d1,(%%a1)+":::"a1");
-+
-+	asm("cp0st.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_STR+MCFCAU_CA2):"d0");
-+	asm("cp0st.l	%%d0,%%d1,#1,%0"	::"n"(MCFCAU_STR+MCFCAU_CA3):"d1");
-+
-+	asm("move.l	%%d0,(%%a1)+":::"a1");
-+	asm("move.l	%%d1,(%%a1)+":::"a1");
-+	spin_unlock_irqrestore(&mcfcau_lock, iflags);
-+}
-+
-+
-+/* decrypt a block of text */
-+static void mcfcau_aes_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
-+{
-+	struct mcfcau_aes_ctx *ctx = crypto_tfm_ctx(tfm);
-+	u32* key_sch = &(ctx->buf[0]);
-+	u32 i;
-+	unsigned long iflags;
-+	const int Nr_1 = ctx->Nr_1;
-+	key_sch=&key_sch[(Nr_1+2)*4];
-+
-+	DBG("\n");
-+
-+	spin_lock_irqsave(&mcfcau_lock, iflags);
-+
-+	asm("move.l	%0, %%a1"::"m"(in):"a1");
-+	asm("move.l	%0, %%a0"::"m"(key_sch):"a0");
-+	/* state=in */
-+	asm("cp0ld.l	(%%a1)+,%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA0):"a1");
-+	asm("cp0ld.l	(%%a1)+,%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA1):"a1");
-+	asm("cp0ld.l	(%%a1)+,%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA2):"a1");
-+	asm("cp0ld.l	(%%a1)+,%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA3):"a1");
-+	/* AddRoundKey() */
-+	asm("cp0ld.l	-(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_XOR+MCFCAU_CA3):"a0");
-+	asm("cp0ld.l	-(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_XOR+MCFCAU_CA2):"a0");
-+	asm("cp0ld.l	-(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_XOR+MCFCAU_CA1):"a0");
-+	asm("cp0ld.l	-(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_XOR+MCFCAU_CA0):"a0");
-+
-+	for(i=Nr_1;i>0;i--){
-+		/* InvShiftRows(state) */
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_AESIR));
-+		/* InvSubBytes(state) */
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_AESIS+MCFCAU_CA3));
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_AESIS+MCFCAU_CA2));
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_AESIS+MCFCAU_CA1));
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_AESIS+MCFCAU_CA0));
-+		/* InvMixColumns(state); AddRoundKey() */
-+		asm("cp0ld.l	-(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_AESIC+MCFCAU_CA3):"a0");
-+		asm("cp0ld.l	-(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_AESIC+MCFCAU_CA2):"a0");
-+		asm("cp0ld.l	-(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_AESIC+MCFCAU_CA1):"a0");
-+		asm("cp0ld.l	-(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_AESIC+MCFCAU_CA0):"a0");
-+	}
-+	/* InvShiftRows(state) */
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_AESIR));
-+	/* InvSubBytes(state)*/
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_AESIS+MCFCAU_CA3));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_AESIS+MCFCAU_CA2));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_AESIS+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_AESIS+MCFCAU_CA0));
-+	/* AddRoundKey() */
-+	asm("cp0ld.l	-(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_XOR+MCFCAU_CA3):"a0");
-+	asm("cp0ld.l	-(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_XOR+MCFCAU_CA2):"a0");
-+	asm("cp0ld.l	-(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_XOR+MCFCAU_CA1):"a0");
-+	asm("cp0ld.l	-(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_XOR+MCFCAU_CA0):"a0");
-+	/* out = state */
-+	asm("move.l	%0, %%a1"		::"m"(out):"a1");
-+	asm("cp0st.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_STR+MCFCAU_CA0):"d0");
-+	asm("cp0st.l	%%d0,%%d1,#1,%0"	::"n"(MCFCAU_STR+MCFCAU_CA1):"d1");
-+
-+	asm("move.l	%%d0,(%%a1)+":::"a1");
-+	asm("move.l	%%d1,(%%a1)+":::"a1");
-+
-+	asm("cp0st.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_STR+MCFCAU_CA2):"d0");
-+	asm("cp0st.l	%%d0,%%d1,#1,%0"	::"n"(MCFCAU_STR+MCFCAU_CA3):"d1");
-+
-+	asm("move.l	%%d0,(%%a1)+":::"a1");
-+	asm("move.l	%%d1,(%%a1)+":::"a1");
-+	spin_unlock_irqrestore(&mcfcau_lock, iflags);
-+
-+}
-+
-+
-+static struct crypto_alg mcfcau_aes_alg = {
-+	.cra_name		=	"aes",
-+	.cra_driver_name	=	"aes-mcfcau",
-+	.cra_priority		=	MCFCAU_CRA_PRIORITY,
-+	.cra_flags		=	CRYPTO_ALG_TYPE_CIPHER,
-+	.cra_blocksize		=	MCFCAU_AES_BLOCK_SIZE,
-+	.cra_ctxsize		=	sizeof(struct mcfcau_aes_ctx),
-+	.cra_alignmask		=	3,
-+	.cra_module		=	THIS_MODULE,
-+	.cra_list		=	LIST_HEAD_INIT(mcfcau_aes_alg.cra_list),
-+	.cra_u			=	{
-+		.cipher = {
-+			.cia_min_keysize	=	MCFCAU_AES_MIN_KEY_SIZE,
-+			.cia_max_keysize	=	MCFCAU_AES_MAX_KEY_SIZE,
-+			.cia_setkey	   	= 	mcfcau_aes_setkey,
-+			.cia_encrypt	 	=	mcfcau_aes_encrypt,
-+			.cia_decrypt	  	=	mcfcau_aes_decrypt
-+		}
-+	}
-+};
-+
-+static int __init mcfcau_aes_init(void)
-+{
-+	int ret = crypto_register_alg(&mcfcau_aes_alg);
-+
-+	printk(KERN_INFO MCFCAU_AES_DRIVER_DESC " "
-+		MCFCAU_AES_DRIVER_VERSION " %s.\n",ret?"failed":"registered");
-+	return ret;
-+}
-+
-+static void __exit mcfcau_aes_fini(void)
-+{
-+	crypto_unregister_alg(&mcfcau_aes_alg);
-+	printk(KERN_INFO MCFCAU_AES_DRIVER_DESC " "
-+		MCFCAU_AES_DRIVER_VERSION " unregistered.\n");
-+}
-+
-+module_init(mcfcau_aes_init);
-+module_exit(mcfcau_aes_fini);
-+
-+MODULE_DESCRIPTION(MCFCAU_AES_DRIVER_DESC);
-+MODULE_LICENSE("Dual BSD/GPL");
-+MODULE_AUTHOR("Andrey Butok");
---- /dev/null
-+++ b/drivers/crypto/mcfcau-des.c
-@@ -0,0 +1,437 @@
-+/***************************************************************************
-+ * mcfcau-des.c - Implementation of DES & Triple DES EDE Cipher Algorithms
-+ *                for Freescale ColdFire Cryptographic Acceleration Unit (CAU).
-+ *
-+ * Author: Andrey Butok
-+ * Copyright Freescale Semiconductor Inc.  2007
-+ *
-+ * NOTE: You can find the ColdFire CAU module on MCF54455 and MCF52235.
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+ * for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software Foundation,
-+ * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ *
-+ ***************************************************************************
-+ * Changes:
-+ * v0.01	14 August 2007	Andrey Butok
-+ *   		Initial Release - developed on 2.6.20 Linux kernel.
-+ */
-+
-+#include <linux/init.h>
-+#include <linux/module.h>
-+#include <linux/errno.h>
-+#include <linux/crypto.h>
-+#include <linux/types.h>
-+
-+/*
-+#undef DEBUG
-+#define DEBUG 1
-+*/
-+
-+#include "mcfcau.h"
-+
-+#define MCFCAU_DES_KEY_SIZE		(8)
-+#define MCFCAU_DES_EXPKEY_WORDS		(32)
-+#define MCFCAU_DES_BLOCK_SIZE		(8)
-+
-+#define MCFCAU_DES3_EDE_KEY_SIZE	(3 * MCFCAU_DES_KEY_SIZE)
-+#define MCFCAU_DES3_EDE_EXPKEY_WORDS	(3 * MCFCAU_DES_EXPKEY_WORDS)
-+#define MCFCAU_DES3_EDE_BLOCK_SIZE	(MCFCAU_DES_BLOCK_SIZE)
-+
-+#define	MCFCAU_DES_DRIVER_DESC		"DES & 3DES ColdFire CAU driver"
-+#define	MCFCAU_DES_DRIVER_VERSION	"v0.01"
-+
-+struct mcfcau_des_ctx {
-+	u32 expkey[MCFCAU_DES_EXPKEY_WORDS];
-+};
-+
-+struct mcfcau_des3_ede_ctx {
-+	u32 expkey[MCFCAU_DES3_EDE_EXPKEY_WORDS];
-+};
-+
-+/* DES round operations */
-+static inline void mcfcau_des_encipher(void)
-+{
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_DESK));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_DESR+MCFCAU_IP+MCFCAU_KSL1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_DESR+MCFCAU_KSL2));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_DESR+MCFCAU_KSL2));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_DESR+MCFCAU_KSL2));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_DESR+MCFCAU_KSL2));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_DESR+MCFCAU_KSL2));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_DESR+MCFCAU_KSL2));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_DESR+MCFCAU_KSL1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_DESR+MCFCAU_KSL2));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_DESR+MCFCAU_KSL2));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_DESR+MCFCAU_KSL2));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_DESR+MCFCAU_KSL2));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_DESR+MCFCAU_KSL2));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_DESR+MCFCAU_KSL2));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_DESR+MCFCAU_KSL1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_DESR+MCFCAU_FP+MCFCAU_KSL1));
-+}
-+
-+static inline void mcfcau_des_decipher(void)
-+{
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_DESK+MCFCAU_DC));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_DESR+MCFCAU_IP+MCFCAU_KSR1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_DESR+MCFCAU_KSR2));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_DESR+MCFCAU_KSR2));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_DESR+MCFCAU_KSR2));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_DESR+MCFCAU_KSR2));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_DESR+MCFCAU_KSR2));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_DESR+MCFCAU_KSR2));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_DESR+MCFCAU_KSR1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_DESR+MCFCAU_KSR2));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_DESR+MCFCAU_KSR2));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_DESR+MCFCAU_KSR2));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_DESR+MCFCAU_KSR2));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_DESR+MCFCAU_KSR2));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_DESR+MCFCAU_KSR2));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_DESR+MCFCAU_KSR1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"::"n"(MCFCAU_DESR+MCFCAU_FP+MCFCAU_KSL1));
-+}
-+
-+
-+static int mcfcau_des_setkey(struct crypto_tfm *tfm, const u8 *key_p,
-+		      unsigned int keylen)
-+{
-+	struct mcfcau_des_ctx *dctx = crypto_tfm_ctx(tfm);
-+	u32 *flags = &tfm->crt_flags;
-+	u32 * key = (u32 *) key_p;
-+
-+	DBG("\n");
-+
-+	/*
-+	* RFC2451: Weak key checks SHOULD be performed.
-+	*
-+	* FIPS 74:
-+	*   Keys having duals are keys which produce all zeros, all ones, or
-+	*   alternating zero-one patterns in the C and D registers after Permuted
-+	*   Choice 1 has operated on the key.
-+	*
-+	*/
-+	if(*flags & CRYPTO_TFM_REQ_WEAK_KEY){ /* FIPS 74 */
-+		if(key[0]<0xE001E00l){
-+			if(key[0]<0x1FE01FE0){
-+				if(key[0]<0x01E001E0){
-+					if(((key[0]==0x01010101)&&(key[1]==0x01010101))||
-+						((key[0]==0x011F011F)&&(key[1]==0x010E010E)) )
-+						goto WEAK_KEY;
-+				}
-+				else{
-+					if(((key[0]==0x01E001E0)&&(key[1]==0x01F101F1))||
-+						((key[0]==0x01FE01FE)&&(key[1]==0x01FE01FE)) )
-+						goto WEAK_KEY;
-+				}
-+			}
-+			else{
-+				if(key[0]<0x1F1F1F1F){
-+					if(((key[0]==0x1FE01FE0)&&(key[1]==0x0EF10EF1))||
-+						((key[0]==0x1F011F0l)&&(key[1]==0x0E010E01)) )
-+						goto WEAK_KEY;
-+				}
-+				else{
-+					if(((key[0]==0x1F1F1F1F)&&(key[1]==0x0E0E0E0E))||
-+						((key[0]==0x1FFE1FFE)&&(key[1]==0x0EFE0EFE)) )
-+						goto WEAK_KEY;
-+				}
-+			}
-+		} else {
-+			if(key[0]<0xFE01FE01){
-+				if(key[0]<0xE0E0E0E0){
-+					if(((key[0]==0xE001E00l)&&(key[1]==0xF101F101))||
-+						((key[0]==0xE01FE01F)&&(key[1]==0xF10EF10E)) )
-+						goto WEAK_KEY;
-+				}
-+				else{
-+					if(((key[0]==0xE0E0E0E0)&&(key[1]==0xF1F1F1F1))||
-+						((key[0]==0xE0FEE0FE)&&(key[1]==0xF1FEF1FE)) )
-+						goto WEAK_KEY;
-+				}
-+			}
-+			else{
-+				if(key[0]<0xFEE0FEE0){
-+					if(((key[0]==0xFE01FE01)&&(key[1]==0xFE01FE01))||
-+						((key[0]==0xFE1FFE1F)&&(key[1]==0xFE0EFE0E)) )
-+						goto WEAK_KEY;
-+				}
-+				else{
-+					if(((key[0]==0xFEE0FEE0)&&(key[1]==0xFEF1FEF1))||
-+						((key[0]==0xFEFEFEFE)&&(key[1]==0xFEFEFEFE)) )
-+						goto WEAK_KEY;
-+				}
-+			}
-+		}
-+	}
-+	memcpy(dctx->expkey, key_p, keylen);
-+	return 0;
-+WEAK_KEY:
-+	*flags |= CRYPTO_TFM_RES_WEAK_KEY;
-+	return -EINVAL;
-+}
-+
-+
-+void mcfcau_des_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
-+{
-+	struct mcfcau_des_ctx *ctx = crypto_tfm_ctx(tfm);
-+	u32 * des_key_tmp = ctx->expkey;
-+	unsigned long iflags;
-+
-+	DBG("\n");
-+
-+	spin_lock_irqsave(&mcfcau_lock, iflags);
-+
-+	asm("move.l	%0, %%a0"::"m"(src):"a0");
-+	asm("move.l	%0, %%a1"::"m"(des_key_tmp):"a1");
-+
-+	asm("cp0ld.l	(%%a0)+,%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA2):"a0");
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA3));
-+	asm("cp0ld.l	(%%a1)+,%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA0):"a1");
-+	asm("cp0ld.l	(%%a1),%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA1));
-+
-+	mcfcau_des_encipher();
-+
-+	asm("cp0st.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_STR+MCFCAU_CA2):"d0");
-+	asm("cp0st.l	%%d0,%%d1,#1,%0"	::"n"(MCFCAU_STR+MCFCAU_CA3):"d1");
-+	asm("move.l	%0, %%a1"		::"m"(dst):"a1");
-+	asm("move.l	%d0,(%a1)+");
-+	asm("move.l	%d1,(%a1)");
-+
-+	spin_unlock_irqrestore(&mcfcau_lock, iflags);
-+}
-+
-+
-+void mcfcau_des_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
-+{
-+	struct mcfcau_des_ctx *ctx = crypto_tfm_ctx(tfm);
-+	u32 * des_key_tmp = ctx->expkey;
-+	unsigned long iflags;
-+
-+	DBG("\n");
-+
-+	spin_lock_irqsave(&mcfcau_lock, iflags);
-+
-+	asm("move.l	%0, %%a0"::"m"(src):"a0");
-+	asm("move.l	%0, %%a1"::"m"(des_key_tmp):"a1");
-+
-+	asm("cp0ld.l	(%%a0)+,%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA2):"a0");
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA3));
-+	asm("cp0ld.l	(%%a1)+,%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA0):"a1");
-+	asm("cp0ld.l	(%%a1),%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA1));
-+
-+	mcfcau_des_decipher();
-+
-+	asm("move.l	%0, %%a1"		::"m"(dst):"a1");
-+	asm("cp0st.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_STR+MCFCAU_CA2):"d0");
-+	asm("cp0st.l	%%d0,%%d1,#1,%0"	::"n"(MCFCAU_STR+MCFCAU_CA3):"d1");
-+	asm("move.l	%d0,(%a1)+");
-+	asm("move.l	%d1,(%a1)");
-+
-+	spin_unlock_irqrestore(&mcfcau_lock, iflags);
-+}
-+
-+
-+/*
-+ * RFC2451:
-+ *
-+ *   For DES-EDE3, there is no known need to reject weak or
-+ *   complementation keys.  Any weakness is obviated by the use of
-+ *   multiple keys.
-+ *
-+ *   However, if the first two or last two independent 64-bit keys are
-+ *   equal (k1 == k2 or k2 == k3), then the DES3 operation is simply the
-+ *   same as DES.  Implementers MUST reject keys that exhibit this
-+ *   property.
-+ *
-+ */
-+
-+static int mcfcau_des3_ede_setkey(struct crypto_tfm *tfm, const u8 *key_p, unsigned int keylen)
-+{
-+	const u32 *key = (const u32 *)key_p;
-+	struct mcfcau_des3_ede_ctx *dctx = crypto_tfm_ctx(tfm);
-+	u32 *flags = &tfm->crt_flags;
-+
-+DBG("\n");
-+
-+	if (unlikely(!((key[0] ^ key[2]) | (key[1] ^ key[3])) ||
-+		     !((key[2] ^ key[4]) | (key[3] ^ key[5]))))
-+	{
-+		*flags |= CRYPTO_TFM_RES_BAD_KEY_SCHED;
-+		return -EINVAL;
-+	}
-+
-+	memcpy(dctx->expkey,key_p,keylen);
-+
-+	return 0;
-+}
-+
-+static void mcfcau_des3_ede_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
-+{
-+	struct mcfcau_des3_ede_ctx *dctx = crypto_tfm_ctx(tfm);
-+	const u32 * des_key_tmp = dctx->expkey;
-+	unsigned long iflags;
-+
-+	DBG("\n");
-+
-+	spin_lock_irqsave(&mcfcau_lock, iflags);
-+
-+	/*EK1*/
-+	asm("move.l	%0, %%a0"::"m"(src):"a0");
-+	asm("move.l	%0, %%a1"::"m"(des_key_tmp):"a1");
-+
-+	asm("cp0ld.l	(%%a0)+,%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA2):"a0");
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA3));
-+	asm("cp0ld.l	(%%a1)+,%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA0):"a1");
-+	asm("cp0ld.l	(%%a1)+,%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA1):"a1");
-+
-+	mcfcau_des_encipher();
-+
-+	/*DK2*/
-+	asm("cp0ld.l	(%%a1)+,%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA0):"a1");
-+	asm("cp0ld.l	(%%a1)+,%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA1):"a1");
-+
-+	mcfcau_des_decipher();
-+
-+	/*EK3*/
-+	asm("cp0ld.l	(%%a1)+,%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA0):"a1");
-+	asm("cp0ld.l	(%%a1),%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA1));
-+
-+	mcfcau_des_encipher();
-+
-+	asm("move.l	%0, %%a1"		::"m"(dst):"a1");
-+	asm("cp0st.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_STR+MCFCAU_CA2):"d0");
-+	asm("cp0st.l	%%d0,%%d1,#1,%0"	::"n"(MCFCAU_STR+MCFCAU_CA3):"d1");
-+	asm("move.l	%d0,(%a1)+");
-+	asm("move.l	%d1,(%a1)");
-+
-+	spin_unlock_irqrestore(&mcfcau_lock, iflags);
-+}
-+
-+static void mcfcau_des3_ede_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
-+{
-+	struct mcfcau_des3_ede_ctx *dctx = crypto_tfm_ctx(tfm);
-+	const u32 * des_key_tmp = dctx->expkey + 6 - 2;
-+	unsigned long iflags;
-+
-+	DBG("\n");
-+
-+	spin_lock_irqsave(&mcfcau_lock, iflags);
-+
-+	/*DK3*/
-+	asm("move.l	%0, %%a0"::"m"(src):"a0");
-+	asm("move.l	%0, %%a1"::"m"(des_key_tmp):"a1");
-+
-+	asm("cp0ld.l	(%%a0)+,%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA2):"a0");
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA3));
-+	asm("cp0ld.l	(%%a1)+,%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA0):"a1");
-+	asm("cp0ld.l	(%%a1),%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA1));
-+
-+	mcfcau_des_decipher();
-+
-+	/*EK2*/
-+	asm("suba.l	#12,%a1");	/*dec key pointer*/
-+
-+	asm("cp0ld.l	(%%a1)+,%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA0):"a1");
-+	asm("cp0ld.l	(%%a1),%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA1));
-+
-+	mcfcau_des_encipher();
-+
-+	/*DK1*/
-+	asm("suba.l	#12,%a1");	/*dec key pointer*/
-+
-+	asm("cp0ld.l	(%%a1)+,%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA0):"a1");
-+	asm("cp0ld.l	(%%a1),%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA1));
-+
-+	mcfcau_des_decipher();
-+
-+	asm("move.l	%0, %%a1"		::"m"(dst):"a1");
-+	asm("cp0st.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_STR+MCFCAU_CA2):"d0");
-+	asm("cp0st.l	%%d0,%%d1,#1,%0"	::"n"(MCFCAU_STR+MCFCAU_CA3):"d1");
-+	asm("move.l	%d0,(%a1)+");
-+	asm("move.l	%d1,(%a1)");
-+
-+	spin_unlock_irqrestore(&mcfcau_lock, iflags);
-+}
-+
-+
-+static struct crypto_alg mcfcau_des_alg = {
-+	.cra_name		=	"des",
-+	.cra_driver_name	=	"des-mcfcau",
-+	.cra_priority		=	MCFCAU_CRA_PRIORITY,
-+	.cra_flags		=	CRYPTO_ALG_TYPE_CIPHER,
-+	.cra_blocksize		=	MCFCAU_DES_BLOCK_SIZE,
-+	.cra_ctxsize		=	sizeof(struct mcfcau_des_ctx),
-+	.cra_module		=	THIS_MODULE,
-+	.cra_alignmask		=	3,
-+	.cra_list		=	LIST_HEAD_INIT(mcfcau_des_alg.cra_list),
-+	.cra_u			=	{ .cipher = {
-+	.cia_min_keysize	=	MCFCAU_DES_KEY_SIZE,
-+	.cia_max_keysize	=	MCFCAU_DES_KEY_SIZE,
-+	.cia_setkey		=	mcfcau_des_setkey,
-+	.cia_encrypt		=	mcfcau_des_encrypt,
-+	.cia_decrypt		=	mcfcau_des_decrypt } }
-+};
-+
-+static struct crypto_alg mcfcau_des3_ede_alg = {
-+	.cra_name		=	"des3_ede",
-+	.cra_driver_name	=	"des3_ede-mcfcau",
-+	.cra_priority		=	MCFCAU_CRA_PRIORITY,
-+	.cra_flags		=	CRYPTO_ALG_TYPE_CIPHER,
-+	.cra_blocksize		=	MCFCAU_DES3_EDE_BLOCK_SIZE,
-+	.cra_ctxsize		=	sizeof(struct mcfcau_des3_ede_ctx),
-+	.cra_module		=	THIS_MODULE,
-+	.cra_alignmask		=	3,
-+	.cra_list		=	LIST_HEAD_INIT(mcfcau_des3_ede_alg.cra_list),
-+	.cra_u			=	{ .cipher = {
-+	.cia_min_keysize	=	MCFCAU_DES3_EDE_KEY_SIZE,
-+	.cia_max_keysize	=	MCFCAU_DES3_EDE_KEY_SIZE,
-+	.cia_setkey		=	mcfcau_des3_ede_setkey,
-+	.cia_encrypt		=	mcfcau_des3_ede_encrypt,
-+	.cia_decrypt		=	mcfcau_des3_ede_decrypt } }
-+};
-+
-+MODULE_ALIAS("mcfcau_des3_ede");
-+
-+static int __init mcfcau_des_init(void)
-+{
-+	int ret;
-+
-+	ret = crypto_register_alg(&mcfcau_des_alg);
-+	if (ret < 0)
-+		goto out;
-+
-+	ret = crypto_register_alg(&mcfcau_des3_ede_alg);
-+	if (ret < 0)
-+		crypto_unregister_alg(&mcfcau_des_alg);
-+out:
-+	printk(KERN_INFO MCFCAU_DES_DRIVER_DESC " "
-+		MCFCAU_DES_DRIVER_VERSION " %s.\n",ret?"failed":"registered");
-+	return ret;
-+}
-+
-+static void __exit mcfcau_des_exit(void)
-+{
-+	crypto_unregister_alg(&mcfcau_des3_ede_alg);
-+	crypto_unregister_alg(&mcfcau_des_alg);
-+
-+	printk(KERN_INFO MCFCAU_DES_DRIVER_DESC " "
-+		MCFCAU_DES_DRIVER_VERSION " unregistered.\n");
-+}
-+
-+module_init(mcfcau_des_init);
-+module_exit(mcfcau_des_exit);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_DESCRIPTION("DES & Triple DES EDE Cipher Algorithms for ColdFire CAU");
-+MODULE_AUTHOR("Andrey Butok");
---- /dev/null
-+++ b/drivers/crypto/mcfcau-md5.c
-@@ -0,0 +1,654 @@
-+ /***************************************************************************
-+ * mcfcau-md5.c - Implementation of MD5 Message Digest Algorithm (RFC1321)
-+ *                for Freescale ColdFire Cryptographic Acceleration Unit (CAU).
-+ *
-+ * Author: Andrey Butok
-+ * Copyright Freescale Semiconductor Inc.  2007
-+ *
-+ * NOTE: You can find the ColdFire CAU module on MCF54455 and MCF52235.
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+ * for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software Foundation,
-+ * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ *
-+ ***************************************************************************
-+ * Changes:
-+ * v0.01	30 September 2007	Andrey Butok
-+ *   		Initial Release - developed on 2.6.20 Linux kernel.
-+ */
-+#include <linux/init.h>
-+#include <linux/module.h>
-+#include <linux/string.h>
-+#include <linux/crypto.h>
-+#include <linux/types.h>
-+#include <asm/byteorder.h>
-+
-+/*
-+#undef DEBUG
-+#define DEBUG 1
-+*/
-+
-+#include "mcfcau.h"
-+
-+
-+#define MCFCAU_MD5_DIGEST_SIZE		(16)
-+#define MCFCAU_MD5_HMAC_BLOCK_SIZE	(64)
-+#define MCFCAU_MD5_BLOCK_WORDS		(16)
-+#define MCFCAU_MD5_HASH_WORDS		(4)
-+
-+#define	MCFCAU_MD5_DRIVER_DESC		"MD5 ColdFire CAU driver"
-+#define	MCFCAU_MD5_DRIVER_VERSION	"v0.01"
-+
-+
-+struct mcfcau_md5_ctx {
-+	u32 hash[MCFCAU_MD5_HASH_WORDS];
-+	u32 block[MCFCAU_MD5_BLOCK_WORDS];
-+	u64 byte_count;
-+};
-+
-+u32 mcfcau_md5_t[64]={0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee,
-+			0xf57c0faf, 0x4787c62a, 0xa8304613, 0xfd469501,
-+			0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be,
-+			0x6b901122, 0xfd987193, 0xa679438e, 0x49b40821,
-+			0xf61e2562, 0xc040b340, 0x265e5a51, 0xe9b6c7aa,
-+			0xd62f105d, 0x02441453, 0xd8a1e681, 0xe7d3fbc8,
-+			0x21e1cde6, 0xc33707d6, 0xf4d50d87, 0x455a14ed,
-+			0xa9e3e905, 0xfcefa3f8, 0x676f02d9, 0x8d2a4c8a,
-+			0xfffa3942, 0x8771f681, 0x6d9d6122, 0xfde5380c,
-+			0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70,
-+			0x289b7ec6, 0xeaa127fa, 0xd4ef3085, 0x04881d05,
-+			0xd9d4d039, 0xe6db99e5, 0x1fa27cf8, 0xc4ac5665,
-+			0xf4292244, 0x432aff97, 0xab9423a7, 0xfc93a039,
-+			0x655b59c3, 0x8f0ccc92, 0xffeff47d, 0x85845dd1,
-+			0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1,
-+			0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391};
-+
-+
-+
-+static void mcfcau_md5_transform(u32 *hash, u32 const *in)
-+{
-+	int i;
-+	u32 * md5_t_p=&mcfcau_md5_t[0];
-+	unsigned long iflags;
-+
-+	spin_lock_irqsave(&mcfcau_lock, iflags);
-+	asm("move.l	%0, %%a1"::"m"(hash):"a1");
-+	asm("cp0ld.l	(%%a1)+,%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CAA):"a1");/*a*/
-+	asm("cp0ld.l	(%%a1)+,%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA1):"a1");/*b*/
-+	asm("cp0ld.l	(%%a1)+,%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA2):"a1");/*c*/
-+	asm("cp0ld.l	(%%a1)+,%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA3):"a1");/*d*/
-+	asm("move.l	%0, %%a0"::"m"(in):"a0");	/* X[] */
-+	asm("move.l	%0, %%a3"::"m"(md5_t_p):"a3");	/* T[] */
-+
-+	
-+	/*  Round 1 */
-+	asm("moveq.l	#7, %%d4":::"d4");	/* for rotating by 7 */
-+	asm("moveq.l	#12, %%d5":::"d5");	/* for rotating by 12 */
-+	asm("moveq.l	#17, %%d6":::"d6");	/* for rotating by 17 */
-+	asm("moveq.l	#22, %%d7":::"d7");	/* for rotating by 22 */
-+
-+	for(i=0; i<4;i++){
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFF));		/* a+F(b,c,d) */
-+		asm("cp0ld.l	(%%a0)+,%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");	/* add byterev x[i] */
-+		asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");	/* add t[i] */
-+		asm("cp0ld.l	%%d4,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));		/* rotate by 7 */
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));		/* add b */
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));			/* register to register shift */
-+
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFF));
-+		asm("cp0ld.l	(%%a0)+,%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+		asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+		asm("cp0ld.l	%%d5,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFF));
-+		asm("cp0ld.l	(%%a0)+,%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+		asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+		asm("cp0ld.l	%%d6,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFF));
-+		asm("cp0ld.l	(%%a0)+,%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+		asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+		asm("cp0ld.l	%%d7,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+	};
-+
-+
-+	/* Round 2 */
-+	asm("moveq.l	#5, %%d4":::"d4");	/* for rotating by 5 */
-+	asm("moveq.l	#9, %%d5":::"d5");	/* for rotating by 9 */
-+	asm("moveq.l	#14, %%d6":::"d6");	/* for rotating by 14 */
-+	asm("moveq.l	#20, %%d7":::"d7");	/* for rotating by 20 */
-+
-+	asm("lea -60(%%a0),%%a0":::"a0");
-+
-+	for(i=0; i<2;i++){
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFG));
-+		asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+		asm("lea	20(%%a0),%%a0"		:::"a0");
-+		asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+		asm("cp0ld.l	%%d4,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFG));
-+		asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+		asm("lea	20(%%a0),%%a0"		:::"a0");
-+		asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+		asm("cp0ld.l	%%d5,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFG));
-+		asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+		asm("lea	-44(%%a0),%%a0"		:::"a0");
-+		asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+		asm("cp0ld.l	%%d6,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFG));
-+		asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+		asm("lea	20(%%a0),%%a0"		:::"a0");
-+		asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+		asm("cp0ld.l	%%d7,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+	};
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFG));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	20(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d4,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFG));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	-44(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d5,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFG));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	20(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d6,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFG));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	20(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d7,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFG));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	-44(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d4,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFG));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	20(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d5,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFG));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	20(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d6,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFG));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	-28(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d7,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+
-+	/* Round 3 */
-+	asm("moveq.l	#4, %%d4":::"d4");	/* for rotating by 5 */
-+	asm("moveq.l	#11, %%d5":::"d5");	/* for rotating by 9 */
-+	asm("moveq.l	#16, %%d6":::"d6");	/* for rotating by 14 */
-+	asm("moveq.l	#23, %%d7":::"d7");	/* for rotating by 20 */
-+
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFH));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	12(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d4,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFH));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	12(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d5,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFH));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	12(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d6,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFH));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	-52(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d7,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFH));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	12(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d4,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFH));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	12(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d5,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFH));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	12(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d6,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFH));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	12(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d7,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFH));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	-52(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d4,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFH));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	12(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d5,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFH));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	12(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d6,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFH));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	12(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d7,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFH));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	12(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d4,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFH));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	12(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d5,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFH));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	-52(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d6,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFH));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	-8(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d7,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+	
-+	/* Round 4 */
-+	asm("moveq.l	#6, %%d4":::"d4");	/* for rotating by 6 */
-+	asm("moveq.l	#10, %%d5":::"d5");	/* for rotating by 10 */
-+	asm("moveq.l	#15, %%d6":::"d6");	/* for rotating by 15 */
-+	asm("moveq.l	#21, %%d7":::"d7");	/* for rotating by 21 */
-+
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFI));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	28(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d4,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFI));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	28(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d5,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFI));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	-36(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d6,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFI));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	28(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d7,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFI));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	-36(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d4,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFI));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	28(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d5,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFI));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	-36(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d6,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFI));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	28(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d7,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFI));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	28(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d4,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFI));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	-36(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d5,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFI));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	28(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d6,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFI));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	-36(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d7,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFI));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	28(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d4,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFI));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	-36(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d5,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFI));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	28(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d6,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFI));
-+	asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_RADR+MCFCAU_CAA):"a0");
-+	asm("lea	28(%%a0),%%a0"		:::"a0");
-+	asm("cp0ld.l	(%%a3)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a3");
-+	asm("cp0ld.l	%%d7,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA1));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MDS));
-+
-+	
-+	asm("move.l	%0, %%a1"::"m"(hash):"a1");
-+
-+	asm("cp0ld.l	(%%a1)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a1");/*a*/
-+	asm("cp0ld.l	(%%a1)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CA1):"a1");/*b*/
-+	asm("cp0ld.l	(%%a1)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CA2):"a1");/*c*/
-+	asm("cp0ld.l	(%%a1)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CA3):"a1");/*d*/
-+
-+	asm("cp0st.l	%%d0,-(%%a1),#1,%0"	::"n"(MCFCAU_STR+MCFCAU_CA3):"a1");/*d*/
-+	asm("cp0st.l	%%d0,-(%%a1),#1,%0"	::"n"(MCFCAU_STR+MCFCAU_CA2):"a1");/*c*/
-+	asm("cp0st.l	%%d0,-(%%a1),#1,%0"	::"n"(MCFCAU_STR+MCFCAU_CA1):"a1");/*b*/
-+	asm("cp0st.l	%%d0,-(%%a1),#1,%0"	::"n"(MCFCAU_STR+MCFCAU_CAA):"a1");/*a*/
-+	spin_unlock_irqrestore(&mcfcau_lock, iflags);
-+}
-+
-+static inline void le32_to_cpu_array(u32 *buf, unsigned int words)
-+{
-+	while (words--) {
-+		__le32_to_cpus(buf);
-+		buf++;
-+	}
-+}
-+
-+static inline void cpu_to_le32_array(u32 *buf, unsigned int words)
-+{
-+	while (words--) {
-+		__cpu_to_le32s(buf);
-+		buf++;
-+	}
-+}
-+
-+static void mcfcau_md5_initialization(struct crypto_tfm *tfm)
-+{
-+	struct mcfcau_md5_ctx *mctx = crypto_tfm_ctx(tfm);
-+
-+	DBG("\n");
-+	mctx->hash[0] = 0x67452301;
-+	mctx->hash[1] = 0xefcdab89;
-+	mctx->hash[2] = 0x98badcfe;
-+	mctx->hash[3] = 0x10325476;
-+	mctx->byte_count = 0;
-+}
-+
-+static void mcfcau_md5_update(struct crypto_tfm *tfm, const u8 *data, unsigned int len)
-+{
-+	struct mcfcau_md5_ctx *mctx = crypto_tfm_ctx(tfm);
-+	const u32 avail = sizeof(mctx->block) - (mctx->byte_count & 0x3f);
-+
-+	DBG("\n");
-+	mctx->byte_count += len;
-+
-+	if (avail > len) {
-+		memcpy((char *)mctx->block + (sizeof(mctx->block) - avail),
-+		       data, len);
-+	}
-+	else {
-+		memcpy((char *)mctx->block + (sizeof(mctx->block) - avail), data, avail);
-+
-+		mcfcau_md5_transform(mctx->hash, mctx->block);
-+		data += avail;
-+		len -= avail;
-+
-+		while (len >= sizeof(mctx->block)) {
-+			memcpy(mctx->block, data, sizeof(mctx->block));
-+			mcfcau_md5_transform(mctx->hash, mctx->block);
-+			data += sizeof(mctx->block);
-+			len -= sizeof(mctx->block);
-+		}
-+
-+		memcpy(mctx->block, data, len);
-+	}
-+}
-+
-+static void mcfcau_md5_final(struct crypto_tfm *tfm, u8 *out)
-+{
-+	struct mcfcau_md5_ctx *mctx = crypto_tfm_ctx(tfm);
-+	const unsigned int offset = mctx->byte_count & 0x3f;
-+	char *p = (char *)mctx->block + offset;
-+	int padding = 56 - (offset + 1);
-+
-+	DBG("\n");
-+
-+	*p++ = 0x80;
-+	if (padding < 0) {
-+		memset(p, 0x00, padding + sizeof (u64));
-+		mcfcau_md5_transform(mctx->hash, mctx->block);
-+		p = (char *)mctx->block;
-+		padding = 56;
-+	}
-+
-+	memset(p, 0, padding);
-+	mctx->block[14] = mctx->byte_count << 3;
-+	mctx->block[15] = mctx->byte_count >> 29;
-+	le32_to_cpu_array(&mctx->block[14], 2);
-+
-+	mcfcau_md5_transform(mctx->hash, mctx->block);
-+
-+	cpu_to_le32_array(mctx->hash, sizeof(mctx->hash) / sizeof(u32));
-+	memcpy(out, mctx->hash, sizeof(mctx->hash));
-+	memset(mctx, 0, sizeof(*mctx));
-+}
-+
-+static struct crypto_alg mcfcau_md5_alg = {
-+	.cra_name		=	"md5",
-+	.cra_driver_name	=	"md5-mcfcau",
-+	.cra_priority		=	MCFCAU_CRA_PRIORITY,
-+	.cra_flags		=	CRYPTO_ALG_TYPE_DIGEST,
-+	.cra_blocksize		=	MCFCAU_MD5_HMAC_BLOCK_SIZE,
-+	.cra_ctxsize		=	sizeof(struct mcfcau_md5_ctx),
-+	.cra_module		=	THIS_MODULE,
-+	.cra_list		=	LIST_HEAD_INIT(mcfcau_md5_alg.cra_list),
-+	.cra_u			=	{ .digest = {
-+	.dia_digestsize		=	MCFCAU_MD5_DIGEST_SIZE,
-+	.dia_init   		= 	mcfcau_md5_initialization,
-+	.dia_update 		=	mcfcau_md5_update,
-+	.dia_final  		=	mcfcau_md5_final } }
-+};
-+
-+static int __init mcfcau_md5_init(void)
-+{
-+	int ret = crypto_register_alg(&mcfcau_md5_alg);
-+	printk(KERN_INFO MCFCAU_MD5_DRIVER_DESC " "
-+		MCFCAU_MD5_DRIVER_VERSION " %s.\n",ret?"failed":"registered");
-+	return ret;
-+}
-+
-+static void __exit mcfcau_md5_exit(void)
-+{
-+	crypto_unregister_alg(&mcfcau_md5_alg);
-+	printk(KERN_INFO MCFCAU_MD5_DRIVER_DESC " "
-+		MCFCAU_MD5_DRIVER_VERSION " unregistered.\n");
-+}
-+
-+module_init(mcfcau_md5_init);
-+module_exit(mcfcau_md5_exit);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_DESCRIPTION(MCFCAU_MD5_DRIVER_DESC);
-+MODULE_AUTHOR("Andrey Butok");
---- /dev/null
-+++ b/drivers/crypto/mcfcau-sha1.c
-@@ -0,0 +1,280 @@
-+ /***************************************************************************
-+ * mcfcau-sha1.c - Implementation of SHA1 Secure Hash Algorithm
-+ *                for Freescale ColdFire Cryptographic Acceleration Unit (CAU).
-+ *
-+ * Author: Andrey Butok
-+ * Copyright Freescale Semiconductor Inc.  2007
-+ *
-+ * NOTE: You can find the ColdFire CAU module on MCF54455 and MCF52235.
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+ * for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software Foundation,
-+ * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ *
-+ ***************************************************************************
-+ * Changes:
-+ * v0.01	15 October 2007	Andrey Butok
-+ *   		Initial Release - developed on 2.6.20 Linux kernel.
-+ */
-+
-+#include <linux/init.h>
-+#include <linux/module.h>
-+#include <linux/mm.h>
-+#include <linux/crypto.h>
-+#include <linux/types.h>
-+
-+
-+/*
-+#undef DEBUG
-+#define DEBUG 1
-+*/
-+
-+#include "mcfcau.h"
-+
-+#define MCFCAU_SHA1_DIGEST_WORDS	(5)
-+#define MCFCAU_SHA1_WORKSPACE_WORDS	(80)
-+
-+#define MCFCAU_SHA1_DIGEST_SIZE		(20)
-+#define MCFCAU_SHA1_HMAC_BLOCK_SIZE	(64)
-+
-+#define	MCFCAU_SHA1_DRIVER_DESC		"SHA1 ColdFire CAU driver"
-+#define	MCFCAU_SHA1_DRIVER_VERSION	"v0.01"
-+
-+struct mcfcau_sha1_ctx {
-+        u64 count;
-+        u32 state[5];
-+        u8 buffer[64];
-+};
-+
-+const static u32 K[4]={0x5A827999L,	/* Rounds  0-19: sqrt(2) * 2^30 */
-+			0x6ED9EBA1L,	/* Rounds 20-39: sqrt(3) * 2^30 */
-+			0x8F1BBCDCL,	/* Rounds 40-59: sqrt(5) * 2^30 */
-+			0xCA62C1D6L};	/* Rounds 60-79: sqrt(10) * 2^30 */
-+
-+static void noinline mcfcau_sha1_transform(__u32 *digest, const char *in, __u32 *W)
-+{
-+	int i;
-+	u32 * tmp_p;
-+	unsigned long iflags;
-+
-+	/* (a) Devide M(i) into 16 words W */
-+	for (i = 0; i < 16; i++)
-+		W[i] = ((const u32 *)in)[i];
-+
-+	/* (b) W[i+16] = S^1(W[i+13] ^ W[i+8] ^ W[i+2] ^ W[i]) */
-+	tmp_p=&W[16];
-+
-+	spin_lock_irqsave(&mcfcau_lock, iflags);
-+	asm("move.l	%0, %%a0"::"m"(tmp_p):"a0");
-+	asm("moveq.l	#1, %%d3":::"d3");
-+
-+	for (i = 0; i < 64; i++){
-+		asm("cp0ld.l	-64(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA0));
-+		asm("cp0ld.l	-56(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_XOR+MCFCAU_CA0));
-+		asm("cp0ld.l	-32(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_XOR+MCFCAU_CA0));
-+		asm("cp0ld.l	-12(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_XOR+MCFCAU_CA0));
-+		asm("cp0ld.l	%%d3,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CA0):"d3");
-+		asm("cp0st.l	%%d0,(%%a0)+,#1,%0"	::"n"(MCFCAU_STR+MCFCAU_CA0));
-+	}
-+
-+	/* (c) */
-+	asm("move.l	%0, %%a0"::"m"(digest):"a0");
-+	asm("cp0ld.l	(%%a0)+,%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA0):"a0"); /* a */
-+	asm("cp0ld.l	(%%a0)+,%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA1):"a0"); /* b */
-+	asm("cp0ld.l	(%%a0)+,%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA2):"a0"); /* c */
-+	asm("cp0ld.l	(%%a0)+,%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA3):"a0"); /* d */
-+	asm("cp0ld.l	(%%a0)+,%%d0,#1,%0"	::"n"(MCFCAU_LDR+MCFCAU_CA4):"a0"); /* e */
-+
-+	/* (d) */
-+	asm("moveq.l	#5, %%d0":::"d0");
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_MVRA+MCFCAU_CA0));
-+	asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ROTL+MCFCAU_CAA)); /*S^5(A)*/
-+
-+	tmp_p=(u32*)K;
-+	asm("move.l	%0, %%a0"::"m"(tmp_p):"a0");
-+	asm("move.l	%0, %%a1"::"m"(W):"a1");
-+
-+	for (i = 0; i < 20; i++) {
-+		/* t = f1(b, c, d) + K1 + rol32(a, 5) + e + W[i]; */
-+		/* e = d; d = c; c = rol32(b, 30); b = a; a = t; */
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFC)); /*f(b,c,d)*/
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA4)); /*+e*/
-+		asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA)); /*+K*/
-+		asm("cp0ld.l	(%%a1)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a1"); /*+W*/
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_SHS));
-+	}
-+
-+	asm("add.l #4,%%a0"	:::"a0"); /* update K */
-+
-+	for (; i < 40; i ++) {
-+		/* t = f2(b, c, d) + K2 + rol32(a, 5) + e + W[i]; */
-+		/* e = d; d = c; c = rol32(b, 30); b = a; a = t; */
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFH)); /*f(b,c,d)*/
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA4)); /*+e*/
-+		asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA)); /*+K*/
-+		asm("cp0ld.l	(%%a1)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a1"); /*+W*/
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_SHS));
-+	}
-+
-+	asm("add.l #4,%%a0"	:::"a0"); /* update K */
-+
-+	for (; i < 60; i ++) {
-+		/* t = f3(b, c, d) + K3 + rol32(a, 5) + e + W[i]; */
-+		/* e = d; d = c; c = rol32(b, 30); b = a; a = t; */
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFM)); /*f(b,c,d)*/
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA4)); /*+e*/
-+		asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA)); /*+K*/
-+		asm("cp0ld.l	(%%a1)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a1"); /*+W*/
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_SHS));
-+	}
-+
-+	asm("add.l #4,%%a0"	:::"a0"); /* update K */
-+
-+	for (; i < 80; i ++) {
-+		/* t = f2(b, c, d) + K4 + rol32(a, 5) + e + W[i]; */
-+		/* e = d; d = c; c = rol32(b, 30); b = a; a = t; */
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_HASH+MCFCAU_HFH)); /*f(b,c,d)*/
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_ADRA+MCFCAU_CA4)); /*+e*/
-+		asm("cp0ld.l	(%%a0),%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA)); /*+K*/
-+		asm("cp0ld.l	(%%a1)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CAA):"a1"); /*+W*/
-+		asm("cp0ld.l	%%d0,%%d0,#1,%0"	::"n"(MCFCAU_SHS));
-+	}
-+
-+	/* (e) */
-+	asm("move.l	%0, %%a0"::"m"(digest):"a0");
-+	asm("cp0ld.l	(%%a0)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CA0):"a0"); /* +a */
-+	asm("cp0ld.l	(%%a0)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CA1):"a0"); /* +b */
-+	asm("cp0ld.l	(%%a0)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CA2):"a0"); /* +c */
-+	asm("cp0ld.l	(%%a0)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CA3):"a0"); /* +d */
-+	asm("cp0ld.l	(%%a0)+,%%d0,#1,%0"	::"n"(MCFCAU_ADR+MCFCAU_CA4):"a0"); /* +e */
-+
-+	asm("cp0st.l	%%d0,-(%%a0),#1,%0"	::"n"(MCFCAU_STR+MCFCAU_CA4):"a0");
-+	asm("cp0st.l	%%d0,-(%%a0),#1,%0"	::"n"(MCFCAU_STR+MCFCAU_CA3):"a0");
-+	asm("cp0st.l	%%d0,-(%%a0),#1,%0"	::"n"(MCFCAU_STR+MCFCAU_CA2):"a0");
-+	asm("cp0st.l	%%d0,-(%%a0),#1,%0"	::"n"(MCFCAU_STR+MCFCAU_CA1):"a0");
-+	asm("cp0st.l	%%d0,-(%%a0),#1,%0"	::"n"(MCFCAU_STR+MCFCAU_CA0):"a0");
-+	spin_unlock_irqrestore(&mcfcau_lock, iflags);
-+}
-+
-+static void mcfcau_sha1_init(struct crypto_tfm *tfm)
-+{
-+	struct mcfcau_sha1_ctx *sctx = crypto_tfm_ctx(tfm);
-+	static const struct mcfcau_sha1_ctx initstate = {
-+	  0,
-+	  { 0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0 },
-+	  { 0, }
-+	};
-+
-+	*sctx = initstate;
-+}
-+
-+static void mcfcau_sha1_update(struct crypto_tfm *tfm, const u8 *data,
-+			unsigned int len)
-+{
-+	struct mcfcau_sha1_ctx *sctx = crypto_tfm_ctx(tfm);
-+	unsigned int partial, done;
-+	const u8 *src;
-+
-+	partial = sctx->count & 0x3f;
-+	sctx->count += len;
-+	done = 0;
-+	src = data;
-+
-+	if ((partial + len) > 63) {
-+		u32 temp[MCFCAU_SHA1_WORKSPACE_WORDS];
-+
-+		if (partial) {
-+			done = -partial;
-+			memcpy(sctx->buffer + partial, data, done + 64);
-+			src = sctx->buffer;
-+		}
-+
-+		do {
-+			mcfcau_sha1_transform(sctx->state, src, temp);
-+			done += 64;
-+			src = data + done;
-+		} while (done + 63 < len);
-+
-+		memset(temp, 0, sizeof(temp));
-+		partial = 0;
-+	}
-+	memcpy(sctx->buffer + partial, src, len - done);
-+}
-+
-+
-+/* Add padding and return the message digest. */
-+static void mcfcau_sha1_final(struct crypto_tfm *tfm, u8 *out)
-+{
-+	struct mcfcau_sha1_ctx *sctx = crypto_tfm_ctx(tfm);
-+	u32 *dst = (u32 *)out;
-+	u32 i, index, padlen;
-+	u64 bits;
-+	static const u8 padding[64] = { 0x80, };
-+
-+	bits = sctx->count << 3;
-+
-+	/* Pad out to 56 mod 64 */
-+	index = sctx->count & 0x3f;
-+	padlen = (index < 56) ? (56 - index) : ((64+56) - index);
-+	mcfcau_sha1_update(tfm, padding, padlen);
-+
-+	/* Append length */
-+	mcfcau_sha1_update(tfm, (const u8 *)&bits, sizeof(bits));
-+
-+	/* Store state in digest */
-+	for (i = 0; i < 5; i++)
-+		dst[i] = sctx->state[i];
-+
-+
-+	/* Wipe context */
-+	memset(sctx, 0, sizeof *sctx);
-+}
-+
-+static struct crypto_alg mcfcau_sha1_alg = {
-+	.cra_name	=	"sha1",
-+	.cra_driver_name=	"sha1-mcfcau",
-+	.cra_priority	=	MCFCAU_CRA_PRIORITY,
-+	.cra_flags	=	CRYPTO_ALG_TYPE_DIGEST,
-+	.cra_blocksize	=	MCFCAU_SHA1_HMAC_BLOCK_SIZE,
-+	.cra_ctxsize	=	sizeof(struct mcfcau_sha1_ctx),
-+	.cra_module	=	THIS_MODULE,
-+	.cra_alignmask	=	3,
-+	.cra_list       =       LIST_HEAD_INIT(mcfcau_sha1_alg.cra_list),
-+	.cra_u		=	{ .digest = {
-+	.dia_digestsize	=	MCFCAU_SHA1_DIGEST_SIZE,
-+	.dia_init   	= 	mcfcau_sha1_init,
-+	.dia_update 	=	mcfcau_sha1_update,
-+	.dia_final  	=	mcfcau_sha1_final } }
-+};
-+
-+static int __init init(void)
-+{
-+	int ret = crypto_register_alg(&mcfcau_sha1_alg);
-+	printk(KERN_INFO MCFCAU_SHA1_DRIVER_DESC " "
-+		MCFCAU_SHA1_DRIVER_VERSION " %s.\n",ret?"failed":"registered");
-+	return ret;
-+}
-+
-+static void __exit fini(void)
-+{
-+	crypto_unregister_alg(&mcfcau_sha1_alg);
-+	printk(KERN_INFO MCFCAU_SHA1_DRIVER_DESC " "
-+		MCFCAU_SHA1_DRIVER_VERSION " unregistered.\n");
-+}
-+
-+module_init(init);
-+module_exit(fini);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_DESCRIPTION(MCFCAU_SHA1_DRIVER_DESC);
-+MODULE_AUTHOR("Andrey Butok");
---- /dev/null
-+++ b/drivers/crypto/mcfcau.c
-@@ -0,0 +1,32 @@
-+/***************************************************************************
-+ * mcfcau.c - Implementation of DES & Triple DES EDE Cipher Algorithms
-+ *                for Freescale ColdFire Cryptographic Acceleration Unit (CAU).
-+ *
-+ * Author: Andrey Butok
-+ * Copyright Freescale Semiconductor Inc.  2007
-+ *
-+ * NOTE: You can find the ColdFire CAU module on MCF54455 and MCF52235.
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+ * for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software Foundation,
-+ * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ *
-+ ***************************************************************************
-+ * Changes:
-+ * v0.01	28 September 2006	Andrey Butok
-+ *   		Initial Release - developed on 2.6.20 Linux kernel.
-+ */
-+#include <linux/module.h>
-+
-+DEFINE_SPINLOCK(mcfcau_lock);
-+EXPORT_SYMBOL(mcfcau_lock);
---- /dev/null
-+++ b/drivers/crypto/mcfcau.h
-@@ -0,0 +1,98 @@
-+/***************************************************************************
-+ * mcfcau.h - Common header file for Freescale ColdFire
-+ *            Cryptographic Acceleration Unit (CAU) drivers.
-+ *
-+ * Author: Andrey Butok
-+ * Copyright Freescale Semiconductor Inc.  2007
-+ *
-+ * NOTE: You can find the ColdFire CAU module on MCF54455 and MCF52235.
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+ * for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software Foundation,
-+ * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ *
-+ ***************************************************************************
-+ * Changes:
-+ * v0.01	14 August 2007	Andrey Butok
-+ */
-+
-+#ifndef MCFCAU_H
-+#define MCFCAU_H
-+
-+#include <linux/spinlock.h>
-+
-+/* CAU Registers (CAx) */
-+#define MCFCAU_CASR		(0x0)
-+#define MCFCAU_CAA		(0x1)
-+#define MCFCAU_CA0		(0x2)
-+#define MCFCAU_CA1		(0x3)
-+#define MCFCAU_CA2		(0x4)
-+#define MCFCAU_CA3		(0x5)
-+#define MCFCAU_CA4		(0x6)
-+#define MCFCAU_CA5		(0x7)
-+
-+ /* CAU Commands */
-+#define MCFCAU_CNOP		(0x000)
-+#define MCFCAU_LDR		(0x010)
-+#define MCFCAU_STR		(0x020)
-+#define MCFCAU_ADR		(0x030)
-+#define MCFCAU_RADR		(0x040)
-+#define MCFCAU_ADRA		(0x050)
-+#define MCFCAU_XOR		(0x060)
-+#define MCFCAU_ROTL		(0x070)
-+#define MCFCAU_MVRA		(0x080)
-+#define MCFCAU_MVAR		(0x090)
-+#define MCFCAU_AESS		(0x0A0)
-+#define MCFCAU_AESIS		(0x0B0)
-+#define MCFCAU_AESC		(0x0C0)
-+#define MCFCAU_AESIC		(0x0D0)
-+#define MCFCAU_AESR		(0x0E0)
-+#define MCFCAU_AESIR		(0x0F0)
-+#define MCFCAU_DESR		(0x100)
-+#define MCFCAU_DESK		(0x110)
-+#define MCFCAU_HASH		(0x120)
-+#define MCFCAU_SHS		(0x130)
-+#define MCFCAU_MDS		(0x140)
-+#define MCFCAU_ILL		(0x1F0)
-+
-+/* DESR Fields */
-+#define MCFCAU_IP		(0x08)	/* initial permutation */
-+#define MCFCAU_FP		(0x04)	/* final permutation */
-+#define MCFCAU_KSL1		(0x00)	/* key schedule left 1 bit */
-+#define MCFCAU_KSL2		(0x01)	/* key schedule left 2 bits */
-+#define MCFCAU_KSR1		(0x02)	/* key schedule right 1 bit */
-+#define MCFCAU_KSR2		(0x03)	/* key schedule right 2 bits */
-+
-+/* DESK Field */
-+#define MCFCAU_DC		(0x01)	/* decrypt key schedule */
-+#define MCFCAU_CP		(0x02)	/* check parity */
-+
-+/* HASH Functions Codes */
-+#define MCFCAU_HFF		(0x0)	/* MD5 F() CA1&CA2 | ~CA1&CA3 */
-+#define MCFCAU_HFG		(0x1)	/* MD5 G() CA1&CA3 | CA2&~CA3 */
-+#define MCFCAU_HFH		(0x2)	/* MD5 H(), SHA Parity() CA1^CA2^CA3 */
-+#define MCFCAU_HFI		(0x3)	/* MD5 I() CA2^(CA1|~CA3) */
-+#define MCFCAU_HFC		(0x4)	/* SHA Ch() CA1&CA2 ^ ~CA1&CA3 */
-+#define MCFCAU_HFM		(0x5)	/* SHA Maj() CA1&CA2 ^ CA1&CA3 ^ CA2&CA3 */
-+
-+#define MCFCAU_CRA_PRIORITY	(300)
-+
-+extern spinlock_t mcfcau_lock;
-+
-+#ifdef DEBUG
-+#define DBG(fmt, args...)	printk( "[%s]  " fmt , __FUNCTION__, ## args)
-+#else
-+#define DBG(fmt, args...)	do{}while(0)
-+#endif
-+
-+#endif
diff --git a/target/linux/coldfire/patches/016-m5445x_usb_initial_port.patch b/target/linux/coldfire/patches/016-m5445x_usb_initial_port.patch
deleted file mode 100644
index 432179441..000000000
--- a/target/linux/coldfire/patches/016-m5445x_usb_initial_port.patch
+++ /dev/null
@@ -1,7360 +0,0 @@
-From 6694c72448723499ce8a8603b4830bbd9d2fa0df Mon Sep 17 00:00:00 2001
-From: Bruce Schmid <duck@freescale.com>
-Date: Tue, 20 Nov 2007 11:06:14 -0700
-Subject: [PATCH] USB: initial port
-
-LTIBName: m5445x-usb-initial-port
-Signed-off-by: Duck <duck@freescale.com>
----
- arch/m68k/coldfire/usb.c            |  182 +++
- arch/m68k/coldfire/usb/Makefile     |   28 +
- arch/m68k/coldfire/usb/otg_cmn.c    |  106 ++
- arch/m68k/coldfire/usb/otg_device.c |   89 ++
- arch/m68k/coldfire/usb/otg_host.c   |   68 +
- arch/m68k/coldfire/usb/otg_otg.c    |   96 ++
- arch/m68k/coldfire/usb/xcvr.c       |  156 ++
- drivers/usb/Kconfig                 |    1 +
- drivers/usb/Makefile                |    2 +
- drivers/usb/core/usb.c              |    2 +-
- drivers/usb/gadget/Kconfig          |   43 +-
- drivers/usb/gadget/Makefile         |    1 +
- drivers/usb/gadget/ether.c          |    3 +
- drivers/usb/gadget/fsl_usb2_udc.h   |  194 +---
- drivers/usb/gadget/gadget_chips.h   |    7 +
- drivers/usb/gadget/mcf5445x_udc.c   | 2758 +++++++++++++++++++++++++++++++++++
- drivers/usb/host/Kconfig            |   21 +-
- drivers/usb/host/ehci-arc.c         |  431 ++++++
- drivers/usb/host/ehci-fsl.h         |   28 +-
- drivers/usb/host/ehci-hcd.c         |    5 +
- drivers/usb/host/ehci-mem.c         |    9 +-
- drivers/usb/host/ehci.h             |   22 +
- drivers/usb/otg/Makefile            |    5 +
- drivers/usb/otg/fsl_otg.c           | 1515 +++++++++++++++++++
- drivers/usb/otg/fsl_otg.h           |  139 ++
- drivers/usb/otg/otg_fsm.c           |  381 +++++
- drivers/usb/otg/otg_fsm.h           |  170 +++
- include/asm-m68k/mcf5445x_usb.h     |    3 +-
- include/linux/fsl_devices.h         |   42 +-
- include/linux/usb/fsl_usb2.h        |  464 ++++++
- include/linux/usb/fsl_xcvr.h        |   42 +
- 31 files changed, 6809 insertions(+), 204 deletions(-)
- create mode 100644 arch/m68k/coldfire/usb.c
- create mode 100644 arch/m68k/coldfire/usb/Makefile
- create mode 100644 arch/m68k/coldfire/usb/otg_cmn.c
- create mode 100644 arch/m68k/coldfire/usb/otg_device.c
- create mode 100644 arch/m68k/coldfire/usb/otg_host.c
- create mode 100644 arch/m68k/coldfire/usb/otg_otg.c
- create mode 100644 arch/m68k/coldfire/usb/xcvr.c
- create mode 100644 drivers/usb/gadget/mcf5445x_udc.c
- create mode 100644 drivers/usb/host/ehci-arc.c
- create mode 100644 drivers/usb/otg/Makefile
- create mode 100644 drivers/usb/otg/fsl_otg.c
- create mode 100644 drivers/usb/otg/fsl_otg.h
- create mode 100644 drivers/usb/otg/otg_fsm.c
- create mode 100644 drivers/usb/otg/otg_fsm.h
- create mode 100644 include/linux/usb/fsl_usb2.h
- create mode 100644 include/linux/usb/fsl_xcvr.h
-
---- /dev/null
-+++ b/arch/m68k/coldfire/usb.c
-@@ -0,0 +1,182 @@
-+/*
-+ *
-+ * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.
-+ *
-+ *	otg_{get,set}_transceiver() are from arm/plat-omap/usb.c.
-+ *	which is Copyright (C) 2004 Texas Instruments, Inc.
-+ */
-+
-+/*
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/types.h>
-+#include <linux/errno.h>
-+#include <linux/init.h>
-+#include <linux/io.h>
-+#include <linux/err.h>
-+#include <linux/platform_device.h>
-+#include <linux/usb/otg.h>
-+#include <linux/delay.h>
-+#include <linux/fsl_devices.h>
-+#include <linux/usb/fsl_xcvr.h>
-+
-+
-+/* The dmamask must be set for EHCI to work */
-+static u64 ehci_dmamask = ~(u32) 0;
-+
-+struct fsl_xcvr_ops *xc_ops[3] = { NULL };
-+
-+void fsl_usb_enable_clk(void)
-+{
-+}
-+EXPORT_SYMBOL(fsl_usb_enable_clk);
-+
-+void fsl_usb_disable_clk(void)
-+{
-+}
-+EXPORT_SYMBOL(fsl_usb_disable_clk);
-+
-+void fsl_usb_xcvr_register(struct fsl_xcvr_ops *xcvr_ops)
-+{
-+	pr_debug("%s ctrlr=%d\n", __FUNCTION__, xcvr_ops->ctrlr);
-+	xc_ops[xcvr_ops->ctrlr] = xcvr_ops;
-+
-+}
-+EXPORT_SYMBOL(fsl_usb_xcvr_register);
-+
-+void fsl_usb_xcvr_unregister(enum fsl_usb_ctrlr ctrlr)
-+{
-+	pr_debug("%s ctrlr=%d\n", __FUNCTION__, ctrlr);
-+	xc_ops[ctrlr] = NULL;
-+}
-+EXPORT_SYMBOL(fsl_usb_xcvr_unregister);
-+
-+/*!
-+ * Register an instance of a USB host platform device.
-+ *
-+ * @param	res:	resource pointer
-+ * @param       n_res:	number of resources
-+ * @param       config: config pointer
-+ *
-+ * @return      newly-registered platform_device
-+ *
-+ * DDD fix this comment:
-+ * The USB controller supports 3 host interfaces, and the
-+ * kernel can be configured to support some number of them.
-+ * Each supported host interface is registered as an instance
-+ * of the "fsl-ehci" device.  Call this function multiple times
-+ * to register each host interface.
-+ */
-+static int instance_id;
-+struct platform_device *host_pdev_register(struct resource *res, int n_res,
-+					  struct fsl_usb2_platform_data *config)
-+{
-+	struct platform_device *pdev;
-+
-+	pr_debug("register host res=0x%p, size=%d\n", res, n_res);
-+
-+	pdev = platform_device_register_simple("fsl-ehci",
-+					       instance_id, res, n_res);
-+	if (IS_ERR(pdev)) {
-+		printk(KERN_ERR "usb: can't register %s Host, %ld\n",
-+		       config->name, PTR_ERR(pdev));
-+		return NULL;
-+	}
-+
-+	pdev->dev.coherent_dma_mask = 0xffffffff;
-+	pdev->dev.dma_mask = &ehci_dmamask;
-+
-+	/*
-+	 * platform_device_add_data() makes a copy of
-+	 * the platform_data passed in.  That makes it
-+	 * impossible to share the same config struct for
-+	 * all OTG devices (host,gadget,otg).  So, just
-+	 * set the platform_data pointer ourselves.
-+	 */
-+	pdev->dev.platform_data = config;
-+
-+	printk(KERN_INFO "usb: %s Host registered\n", config->name);
-+	pr_debug("pdev=0x%p  dev=0x%p  resources=0x%p  pdata=0x%p\n",
-+		 pdev, &pdev->dev, pdev->resource, pdev->dev.platform_data);
-+
-+	instance_id++;
-+
-+	return pdev;
-+}
-+
-+
-+int fsl_usb_mem_init(struct platform_device *pdev)
-+{
-+	struct resource *res;
-+	struct fsl_usb2_platform_data *pdata;
-+
-+	pdata = (struct fsl_usb2_platform_data *)pdev->dev.platform_data;
-+
-+	pr_debug("%s: pdev=0x%p  pdata=0x%p\n", __FUNCTION__, pdev, pdata);
-+
-+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if (!res) {
-+		dev_err(&pdev->dev, "no MEM resource.\n");
-+		return -ENODEV;
-+	}
-+
-+	pdata->r_start = res->start;
-+	pdata->r_len = res->end - res->start + 1;
-+	pr_debug("%s: MEM resource start=0x%x  len=0x%x\n", pdata->name,
-+		 res->start, pdata->r_len);
-+
-+	if (!request_mem_region(pdata->r_start, pdata->r_len, "OTG")) {
-+		dev_err(&pdev->dev, "request_mem_region failed\n");
-+		return -EBUSY;
-+	}
-+	pdata->regs = ioremap(pdata->r_start, pdata->r_len);
-+	pr_debug("ioremapped to 0x%p\n", pdata->regs);
-+
-+	if (pdata->regs == NULL) {
-+		dev_err(&pdev->dev, "ioremap failed\n");
-+		release_mem_region(pdata->r_start, pdata->r_len);
-+		return -EFAULT;
-+	}
-+
-+	pr_debug("%s: success\n", __FUNCTION__);
-+	return 0;
-+}
-+
-+
-+#if defined(CONFIG_USB_OTG)
-+static struct otg_transceiver *xceiv;
-+
-+/**
-+ * otg_get_transceiver - find the (single) OTG transceiver driver
-+ *
-+ * Returns the transceiver driver, after getting a refcount to it; or
-+ * null if there is no such transceiver.  The caller is responsible for
-+ * releasing that count.
-+ */
-+struct otg_transceiver *otg_get_transceiver(void)
-+{
-+	pr_debug("%s xceiv=0x%p\n", __FUNCTION__, xceiv);
-+	if (xceiv)
-+		get_device(xceiv->dev);
-+	return xceiv;
-+}
-+EXPORT_SYMBOL(otg_get_transceiver);
-+
-+int otg_set_transceiver(struct otg_transceiver *x)
-+{
-+	pr_debug("%s xceiv=0x%p  x=0x%p\n", __FUNCTION__, xceiv, x);
-+	if (xceiv && x)
-+		return -EBUSY;
-+	xceiv = x;
-+	return 0;
-+}
-+EXPORT_SYMBOL(otg_set_transceiver);
-+#endif
---- /dev/null
-+++ b/arch/m68k/coldfire/usb/Makefile
-@@ -0,0 +1,28 @@
-+#
-+# Makefile for the linux kernel.
-+#
-+
-+# Object file lists.
-+
-+ifneq ($(CONFIG_USB_EHCI_HCD),)
-+	obj-y	+= otg_host.o
-+endif
-+
-+ifneq ($(CONFIG_USB_GADGET_MCF5445X),)
-+	obj-y	+= otg_device.o
-+endif
-+
-+ifneq ($(strip $(CONFIG_USB_GADGET_MCF5445X) $(CONFIG_USB_EHCI_HCD)),)
-+	obj-y	+= otg_cmn.o
-+endif
-+
-+ifneq ($(CONFIG_USB_OTG),)
-+	obj-y	+= otg_otg.o
-+endif
-+
-+
-+# USB Transceiver driver:
-+ifneq ($(strip $(CONFIG_USB) $(CONFIG_USB_GADGET_MCF5445X)),)
-+	obj-y	+= xcvr.o
-+endif
-+
---- /dev/null
-+++ b/arch/m68k/coldfire/usb/otg_cmn.c
-@@ -0,0 +1,106 @@
-+/*
-+ * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.
-+ */
-+
-+/*
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/types.h>
-+#include <linux/err.h>
-+#include <linux/errno.h>
-+#include <linux/init.h>
-+#include <linux/io.h>
-+#include <linux/irq.h>
-+#include <linux/platform_device.h>
-+#include <linux/delay.h>
-+#include <linux/fsl_devices.h>
-+#include <linux/usb/fsl_xcvr.h>
-+
-+#include <asm/system.h>
-+#include <asm/coldfire.h>
-+
-+extern void fsl_usb_enable_clk(void);
-+extern void fsl_usb_disable_clk(void);
-+extern int fsl_usb_mem_init(struct platform_device *pdev);
-+
-+extern struct fsl_xcvr_ops *xc_ops[];
-+
-+static int otg_used;
-+
-+int usbotg_init(struct platform_device *pdev)
-+{
-+	struct fsl_usb2_platform_data *pdata;
-+	struct fsl_xcvr_ops *xops = xc_ops[USB_CTRLR_OTG];
-+	int rc;
-+
-+	pdata = (struct fsl_usb2_platform_data *)pdev->dev.platform_data;
-+
-+	pr_debug("%s: pdev=0x%p  pdata=0x%p\n", __FUNCTION__, pdev, pdata);
-+
-+	if (!xops) {
-+		printk(KERN_ERR "OTG transceiver ops missing\n");
-+		return -EINVAL;
-+	}
-+	pdata->xcvr_ops = xops;
-+	pdata->xcvr_type = xops->xcvr_type;
-+
-+	if (!otg_used) {
-+		/* request_mem_region and ioremap registers */
-+		rc = fsl_usb_mem_init(pdev);
-+		if (rc)
-+			return rc;
-+
-+		fsl_usb_enable_clk();
-+
-+		if (xops->init)
-+			xops->init(pdev);
-+	}
-+
-+	otg_used++;
-+	pr_debug("%s: success\n", __FUNCTION__);
-+	return 0;
-+}
-+
-+void usbotg_uninit(struct platform_device *pdev)
-+{
-+	struct fsl_usb2_platform_data *pdata;
-+	pdata = (struct fsl_usb2_platform_data *)pdev->dev.platform_data;
-+
-+	pr_debug("%s\n", __FUNCTION__);
-+
-+	otg_used--;
-+	if (!otg_used) {
-+		if (pdata->xcvr_ops && pdata->xcvr_ops->uninit)
-+			pdata->xcvr_ops->uninit(pdev);
-+
-+		iounmap(pdata->regs);
-+		release_mem_region(pdata->r_start, pdata->r_len);
-+
-+		pdata->regs = NULL;
-+		pdata->r_start = pdata->r_len = 0;
-+
-+		fsl_usb_disable_clk();
-+	}
-+}
-+
-+struct fsl_usb2_platform_data mxc_otg_config = {
-+	.name            = "OTG",
-+	.platform_init   = usbotg_init,
-+	.platform_uninit = usbotg_uninit,
-+	.es              = 1,
-+	.big_endian_mmio = 1,
-+	.big_endian_desc = 1,
-+	.le_setup_buf    = 1,
-+	.does_otg        = 1,
-+	.power_budget    = 500,		/* 500 mA max power */
-+	.max_ep_nr       = 4,		/* DDD read from a register ? */
-+	.phy_mode	 = FSL_USB2_PHY_ULPI, /* DDD redundant with xcvr_type */
-+};
---- /dev/null
-+++ b/arch/m68k/coldfire/usb/otg_device.c
-@@ -0,0 +1,89 @@
-+/*
-+ * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.
-+ */
-+
-+/*
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/types.h>
-+#include <linux/errno.h>
-+#include <linux/init.h>
-+#include <linux/io.h>
-+#include <linux/irq.h>
-+#include <linux/err.h>
-+#include <linux/platform_device.h>
-+#include <linux/usb/otg.h>
-+#include <linux/delay.h>
-+#include <linux/fsl_devices.h>
-+#include <linux/usb/fsl_xcvr.h>
-+
-+#include <asm/system.h>
-+#include <asm/coldfire.h>
-+
-+#define USB_OTGREGS_BASE MCF_REG32(0xFC0B0000)
-+#define INT_USB		(64 + 64 + 47)	/* INTC1:47 16.2.9.1 */
-+#define INT_UOCSR	(64 + 64 + 53)	/* INTC1:53 16.2.9.1 */
-+
-+extern int usbotg_init(struct platform_device *pdev);
-+extern void usbotg_uninit(struct fsl_usb2_platform_data *pdata);
-+extern struct fsl_usb2_platform_data mxc_otg_config;
-+
-+struct platform_device otg_udc_device;
-+
-+/*!
-+ * OTG Gadget device
-+ */
-+
-+static void usb_release(struct device *dev)
-+{
-+	/* normally not freed */
-+}
-+
-+static u64 udc_dmamask = ~(u32) 0;
-+static struct resource otg_udc_resources[] = {
-+	[0] = {
-+		.start = (u32) (&USB_OTGREGS_BASE),
-+		.end   = (u32) (&USB_OTGREGS_BASE + 0x1ff),
-+		.flags = IORESOURCE_MEM,
-+	},
-+	[1] = {
-+		.start = INT_USB,
-+		.flags = IORESOURCE_IRQ,
-+	},
-+};
-+
-+
-+struct platform_device otg_udc_device = {
-+	.name = "fsl-usb2-udc",
-+	.id   = -1,
-+	.dev  = {
-+		.release           = usb_release,
-+		.dma_mask          = &udc_dmamask,
-+		.coherent_dma_mask = 0xffffffff,
-+		.platform_data     = &mxc_otg_config,
-+		},
-+	.resource = otg_udc_resources,
-+	.num_resources = ARRAY_SIZE(otg_udc_resources),
-+};
-+
-+static int __init udc_init(void)
-+{
-+	int rc __attribute((unused));
-+
-+	rc = platform_device_register(&otg_udc_device);
-+	if (rc)
-+		printk(KERN_ERR "usb: can't register OTG Gadget, rc=%d\n", rc);
-+	else
-+		printk(KERN_INFO "usb: OTG Gadget registered\n");
-+	return rc;
-+}
-+
-+subsys_initcall(udc_init);
---- /dev/null
-+++ b/arch/m68k/coldfire/usb/otg_host.c
-@@ -0,0 +1,68 @@
-+/*
-+ * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.
-+ */
-+
-+/*
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/types.h>
-+#include <linux/errno.h>
-+#include <linux/init.h>
-+#include <linux/io.h>
-+#include <linux/irq.h>
-+#include <linux/err.h>
-+#include <linux/platform_device.h>
-+#include <linux/delay.h>
-+#include <linux/fsl_devices.h>
-+#include <linux/usb/fsl_xcvr.h>
-+
-+#include <asm/system.h>
-+#include <asm/mcfsim.h>
-+
-+#define USB_OTGREGS_BASE MCF_REG32(0xFC0B0000)
-+#define INT_USB		(64 + 64 + 47)	/* INTC1:47 16.2.9.1 */
-+#define INT_UOCSR	(64 + 64 + 53)	/* INTC1:53 16.2.9.1 */
-+
-+struct platform_device *otg_host_device;
-+
-+extern struct platform_device *host_pdev_register(struct resource *res,
-+						  int n_res,
-+						  struct fsl_usb2_platform_data
-+						  *config);
-+
-+extern int usbotg_init(struct platform_device *pdev);
-+extern void usbotg_uninit(struct fsl_usb2_platform_data *pdata);
-+extern struct fsl_usb2_platform_data mxc_otg_config;
-+
-+/*!
-+ * OTG host config
-+ */
-+static struct resource otg_host_resources[] = {
-+	[0] = {
-+		.start = (u32) (&USB_OTGREGS_BASE),
-+		.end   = (u32) (&USB_OTGREGS_BASE + 0x1ff),
-+		.flags = IORESOURCE_MEM,
-+	},
-+	[1] = {
-+		.start = INT_USB,
-+		.flags = IORESOURCE_IRQ,
-+	},
-+};
-+
-+static int __init otg_host_init(void)
-+{
-+	otg_host_device = host_pdev_register(otg_host_resources,
-+					     ARRAY_SIZE(otg_host_resources),
-+					     &mxc_otg_config);
-+	return 0;
-+}
-+
-+subsys_initcall(otg_host_init);
---- /dev/null
-+++ b/arch/m68k/coldfire/usb/otg_otg.c
-@@ -0,0 +1,96 @@
-+/*
-+ * Copyright 2005-2007 Freescale Semiconductor, Inc. All Rights Reserved.
-+ */
-+
-+/*
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/*
-+ * platform_device registration for ULPI OTG device
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/types.h>
-+#include <linux/errno.h>
-+#include <linux/init.h>
-+#include <linux/err.h>
-+#include <linux/platform_device.h>
-+#include <linux/fsl_devices.h>
-+
-+#include <asm/mcfsim.h>
-+
-+#define USB_OTGREGS_BASE MCF_REG32(0xFC0B0000)
-+#define INT_USB		(64 + 64 + 47)	/* INTC1:47 16.2.9.1 */
-+#define INT_UOCSR	(64 + 64 + 53)	/* INTC1:53 16.2.9.1 */
-+
-+extern int usbotg_init(struct platform_device *pdev);
-+extern void usbotg_uninit(struct fsl_usb2_platform_data *pdata);
-+extern struct fsl_usb2_platform_data mxc_otg_config;
-+
-+static void otg_otg_release(struct device *dev)
-+{
-+	/* normally not freed */
-+}
-+
-+/* *INDENT-OFF* */
-+static struct resource otg_otg_resources[] = {
-+	[0] = {
-+		.start = (u32) (&USB_OTGREGS_BASE),
-+		.end   = (u32) (&USB_OTGREGS_BASE + 0x1ff),
-+		.flags = IORESOURCE_MEM,
-+	},
-+	[1] = {
-+		.start = INT_USB,
-+		.flags = IORESOURCE_IRQ,
-+	},
-+};
-+
-+/*!
-+ * OTG device
-+ */
-+static u64 otg_otg_dmamask = ~(u32) 0;
-+static struct platform_device otg_otg_device = {
-+	.name = "fsl-usb2-otg",
-+	.id   = -1,
-+	.dev  = {
-+		.release           = otg_otg_release,
-+		.dma_mask          = &otg_otg_dmamask,
-+		.coherent_dma_mask = 0xffffffff,
-+		.platform_data     = &mxc_otg_config,
-+	},
-+	.resource = otg_otg_resources,
-+	.num_resources = ARRAY_SIZE(otg_otg_resources),
-+};
-+/* *INDENT-ON* */
-+
-+static int __init mx31_otg_otg_init(void)
-+{
-+	int rc = 0;
-+
-+	pr_debug("register OTG otg res=0x%p, size=%d\n",
-+		 otg_otg_device.resource, otg_otg_device.num_resources);
-+
-+	rc = platform_device_register(&otg_otg_device);
-+	if (rc) {
-+		pr_debug("can't register ULPI OTG dvc, %d\n", rc);
-+	} else {
-+		printk(KERN_INFO "usb: OTG ULPI transceiver registered\n");
-+		pr_debug("otg_otg_device=0x%p  resources=0x%p.\n",
-+			 &otg_otg_device, otg_otg_device.resource);
-+	}
-+
-+	return rc;
-+}
-+
-+subsys_initcall(mx31_otg_otg_init);
-+
-+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
-+MODULE_DESCRIPTION("ULPI OTG device registration");
-+MODULE_LICENSE("GPL");
---- /dev/null
-+++ b/arch/m68k/coldfire/usb/xcvr.c
-@@ -0,0 +1,156 @@
-+/*
-+ * Copyright 2005-2007 Freescale Semiconductor, Inc. All Rights Reserved.
-+ */
-+
-+/*
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/types.h>
-+#include <linux/errno.h>
-+#include <linux/init.h>
-+#include <linux/err.h>
-+#include <linux/platform_device.h>
-+#include <linux/delay.h>
-+#include <linux/fsl_devices.h>
-+#include <linux/usb/fsl_xcvr.h>
-+#include <linux/usb/fsl_usb2.h>
-+
-+#include <asm/mcfsim.h>
-+
-+extern void fsl_usb_xcvr_register(struct fsl_xcvr_ops *xcvr_ops);
-+extern void fsl_usb_xcvr_unregister(enum fsl_usb_ctrlr ctrlr);
-+
-+#define MCF_SCM_BCR		MCF_REG32(0xFC040024)
-+#define MCF_SCM_BCR_GBR		(1 << 9)	/* global bursts for read */
-+#define MCF_SCM_BCR_GBW		(1 << 8)	/* global bursts for write */
-+#define MCF_SCM_BCR_SBE_ALL	(0xff << 0)	/* slave burst enable */
-+
-+
-+#ifdef ULPI_DEBUG
-+void print_ulpi_regs(void)
-+{
-+	pr_debug("MCF_SCM_BCR=0x%08lx  MCF_CCM_MISCCR=0x%08x  "
-+		 "MCF_GPIO_PAR_DMA=0x%08x  MCF_GPIO_PAR_USB=08%08x  "
-+		 "MCF_GPIO_PAR_FEC=08%08x\n",
-+		 MCF_SCM_BCR, MCF_CCM_MISCCR, MCF_GPIO_PAR_DMA,
-+		 MCF_GPIO_PAR_USB, MCF_GPIO_PAR_FEC);
-+}
-+EXPORT_SYMBOL(print_ulpi_regs);
-+#endif
-+
-+
-+static void xcvr_init(struct platform_device *pdev)
-+{
-+	struct fsl_usb2_platform_data *pdata = pdev->dev.platform_data;
-+	struct fsl_xcvr_ops *this = pdata->xcvr_ops;
-+	struct fsl_usb_host_regs *regs = pdata->regs;
-+
-+	pr_debug("%s: ctrlr=%d  pdata=0x%p  regs=0x%p\n", __FUNCTION__,
-+		 this->ctrlr, pdata, pdata->regs);
-+
-+	/* enable USB read, write and slave bursts */
-+	MCF_SCM_BCR = MCF_SCM_BCR_GBR | MCF_SCM_BCR_GBW | MCF_SCM_BCR_SBE_ALL;
-+
-+	/* Use external clock source if PLL isn't a multiple of 60MHz */
-+	MCF_CCM_MISCCR &= ~MCF_CCM_MISCCR_USBSRC;
-+
-+	/* Initialize the USB Clock: use USB input clock */
-+	MCF_GPIO_PAR_DMA = (MCF_GPIO_PAR_DMA & MCF_GPIO_PAR_DMA_DREQ1_MASK) |
-+			   MCF_GPIO_PAR_DMA_DREQ1_USB_CLKIN;
-+
-+	switch (this->xcvr_type) {
-+	case PORTSCX_PTS_ULPI:
-+		/* Enable the required ULPI signals */
-+		MCF_GPIO_PAR_DMA = (MCF_GPIO_PAR_DMA &
-+				    MCF_GPIO_PAR_DMA_DACK1_MASK) |
-+				    MCF_GPIO_PAR_DMA_DACK1_ULPI_DIR;
-+
-+		MCF_GPIO_PAR_USB = MCF_GPIO_PAR_USB_VBUSEN_ULPI_NXT |
-+				   MCF_GPIO_PAR_USB_VBUSOC_ULPI_STP;
-+
-+		MCF_GPIO_PAR_FEC = (MCF_GPIO_PAR_FEC &
-+				    MCF_GPIO_PAR_FEC_FEC0_MASK) |
-+				    MCF_GPIO_PAR_FEC_FEC0_RMII_ULPI;
-+		break;
-+	case PORTSCX_PTS_ONCHIP:
-+		/* Enable VBUS_EN and VBUS_OC signals */
-+		MCF_GPIO_PAR_USB = MCF_GPIO_PAR_USB_VBUSEN_VBUSEN |
-+				   MCF_GPIO_PAR_USB_VBUSOC_VBUSOC;
-+
-+		/* Setup USB_VBUS_OC signal to be active-low */
-+		MCF_CCM_MISCCR |= MCF_CCM_MISCCR_USBOC;
-+
-+		break;
-+	}
-+
-+	pr_debug("&regs->portsc1=0x%p  old portsc1=0x%x \n", &regs->portsc1,
-+		 regs->portsc1);
-+
-+	regs->portsc1 &= ~PORTSCX_PTS_MASK;
-+	regs->portsc1 |= this->xcvr_type;
-+
-+	/*
-+	 * need to reset the controller here so that the ID pin
-+	 * is correctly detected.
-+	 */
-+	regs->usbcmd |= USB_CMD_CTRL_RESET;
-+
-+	/*
-+	 * allow controller to reset, and leave time for
-+	 * the ULPI transceiver to reset too.
-+	 */
-+	mdelay(10);
-+
-+	pr_debug("DDD %s: done.  portsc1=0x%x\n", __FUNCTION__, regs->portsc1);
-+}
-+
-+static void xcvr_uninit(struct platform_device *pdev)
-+{
-+	pr_debug("%s: pdev=0x%p\n", __FUNCTION__, pdev);
-+}
-+
-+
-+struct fsl_xcvr_ops xcvr_ops_otg = {
-+	.ctrlr          = USB_CTRLR_OTG,
-+	.init           = xcvr_init,
-+	.uninit         = xcvr_uninit,
-+
-+#ifdef CONFIG_USB_M5445X_ULPI
-+	.xcvr_type      = PORTSCX_PTS_ULPI,
-+#elif defined CONFIG_USB_M5445X_FSLS
-+	.xcvr_type      = PORTSCX_PTS_ONCHIP,
-+#else
-+#error "Invalid USB transceiver selection."
-+#endif
-+};
-+
-+static int __init usb_xcvr_init(void)
-+{
-+	pr_debug("%s\n", __FUNCTION__);
-+
-+	fsl_usb_xcvr_register(&xcvr_ops_otg);
-+
-+	pr_debug("%s done\n", __FUNCTION__);
-+	return 0;
-+}
-+
-+static void __exit usb_xcvr_exit(void)
-+{
-+	fsl_usb_xcvr_unregister(USB_CTRLR_OTG);
-+}
-+
-+module_init(usb_xcvr_init);
-+module_exit(usb_xcvr_exit);
-+
-+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
-+MODULE_DESCRIPTION("External ULPI xcvr driver");
-+MODULE_LICENSE("GPL");
-+
---- a/drivers/usb/Kconfig
-+++ b/drivers/usb/Kconfig
-@@ -55,6 +55,7 @@ config USB_ARCH_HAS_EHCI
- 	default y if PPC_83xx
- 	default y if SOC_AU1200
- 	default y if ARCH_IXP4XX
-+	default y if M54455
- 	default PCI
- 
- # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.
---- a/drivers/usb/Makefile
-+++ b/drivers/usb/Makefile
-@@ -32,3 +32,5 @@ obj-$(CONFIG_USB)		+= misc/
- 
- obj-$(CONFIG_USB_ATM)		+= atm/
- obj-$(CONFIG_USB_SPEEDTOUCH)	+= atm/
-+
-+obj-$(CONFIG_USB_OTG)		+= otg/
---- a/drivers/usb/core/usb.c
-+++ b/drivers/usb/core/usb.c
-@@ -52,7 +52,7 @@ static int nousb;	/* Disable USB when bu
- struct workqueue_struct *ksuspend_usb_wq;
- 
- #ifdef	CONFIG_USB_SUSPEND
--static int usb_autosuspend_delay = 2;		/* Default delay value,
-+static int usb_autosuspend_delay = -1;		/* Default delay value,
- 						 * in seconds */
- module_param_named(autosuspend, usb_autosuspend_delay, int, 0644);
- MODULE_PARM_DESC(autosuspend, "default autosuspend delay");
---- a/drivers/usb/gadget/Kconfig
-+++ b/drivers/usb/gadget/Kconfig
-@@ -231,6 +231,26 @@ config SUPERH_BUILT_IN_M66592
- 	   However, this problem is improved if change a value of
- 	   NET_IP_ALIGN to 4.
- 
-+config USB_GADGET_MCF5445X
-+	boolean "MCF5445X USB Device Controller"
-+	depends on M54455 && USB_M5445X_ULPI
-+	select USB_GADGET_DUALSPEED
-+	help
-+	   Freescale's MCF5445X processors include
-+	   an integrated device controller (as part of the OTG module).
-+	   It has four programmable, bidirectional endpoints,
-+	   including endpoint 0.
-+
-+	   Say "y" to link the driver statically, or "m" to build a
-+	   dynamically linked module called "mcf5445_udc" and force all
-+	   gadget drivers to also be dynamically linked.
-+
-+config USB_MCF5445X
-+	tristate
-+	depends on USB_GADGET_MCF5445X
-+	default USB_GADGET
-+	select USB_GADGET_SELECTED
-+
- config USB_GADGET_GOKU
- 	boolean "Toshiba TC86C001 'Goku-S'"
- 	depends on PCI
-@@ -285,17 +305,6 @@ config USB_OMAP
- 	default USB_GADGET
- 	select USB_GADGET_SELECTED
- 
--config USB_OTG
--	boolean "OTG Support"
--	depends on USB_GADGET_OMAP && ARCH_OMAP_OTG && USB_OHCI_HCD
--	help
--	   The most notable feature of USB OTG is support for a
--	   "Dual-Role" device, which can act as either a device
--	   or a host.  The initial role choice can be changed
--	   later, when two dual-role devices talk to each other.
--
--	   Select this only if your OMAP board has a Mini-AB connector.
--
- config USB_GADGET_S3C2410
- 	boolean "S3C2410 USB Device Controller"
- 	depends on ARCH_S3C2410
-@@ -369,6 +378,18 @@ config USB_DUMMY_HCD
- 
- endchoice
- 
-+config USB_OTG
-+	boolean "OTG Support"
-+	depends on (USB_GADGET_OMAP && ARCH_OMAP_OTG && USB_OHCI_HCD) || \
-+		   (USB_GADGET_MCF5445X && USB_M5445X_ULPI)
-+	help
-+	   The most notable feature of USB OTG is support for a
-+	   "Dual-Role" device, which can act as either a device
-+	   or a host.  The initial role choice can be changed
-+	   later, when two dual-role devices talk to each other.
-+
-+	   Select this only if your OMAP board has a Mini-AB connector.
-+
- config USB_GADGET_DUALSPEED
- 	bool
- 	depends on USB_GADGET
---- a/drivers/usb/gadget/Makefile
-+++ b/drivers/usb/gadget/Makefile
-@@ -17,6 +17,7 @@ obj-$(CONFIG_USB_AT91)		+= at91_udc.o
- obj-$(CONFIG_USB_ATMEL_USBA)	+= atmel_usba_udc.o
- obj-$(CONFIG_USB_FSL_USB2)	+= fsl_usb2_udc.o
- obj-$(CONFIG_USB_M66592)	+= m66592-udc.o
-+obj-$(CONFIG_USB_MCF5445X)	+= mcf5445x_udc.o
- 
- #
- # USB gadget drivers
---- a/drivers/usb/gadget/ether.c
-+++ b/drivers/usb/gadget/ether.c
-@@ -287,6 +287,9 @@ MODULE_PARM_DESC(host_addr, "Host Ethern
- #define	DEV_CONFIG_CDC
- #endif
- 
-+#ifdef CONFIG_USB_GADGET_MCF5445X
-+#define DEV_CONFIG_CDC
-+#endif
- 
- /*-------------------------------------------------------------------------*/
- 
---- a/drivers/usb/gadget/fsl_usb2_udc.h
-+++ b/drivers/usb/gadget/fsl_usb2_udc.h
-@@ -83,16 +83,6 @@ struct usb_dr_host {
- 	u32 endptctrl[6];	/* Endpoint Control Registers */
- };
- 
-- /* non-EHCI USB system interface registers (Big Endian) */
--struct usb_sys_interface {
--	u32 snoop1;
--	u32 snoop2;
--	u32 age_cnt_thresh;	/* Age Count Threshold Register */
--	u32 pri_ctrl;		/* Priority Control Register */
--	u32 si_ctrl;		/* System Interface Control Register */
--	u8 res[236];
--	u32 control;		/* General Purpose Control Register */
--};
- 
- /* ep0 transfer state */
- #define WAIT_FOR_SETUP          0
-@@ -101,10 +91,6 @@ struct usb_sys_interface {
- #define WAIT_FOR_OUT_STATUS     3
- #define DATA_STATE_RECV         4
- 
--/* Device Controller Capability Parameter register */
--#define DCCPARAMS_DC				0x00000080
--#define DCCPARAMS_DEN_MASK			0x0000001f
--
- /* Frame Index Register Bit Masks */
- #define	USB_FRINDEX_MASKS			0x3fff
- /* USB CMD  Register Bit Masks */
-@@ -180,172 +166,6 @@ struct usb_sys_interface {
- /* endpoint list address bit masks */
- #define USB_EP_LIST_ADDRESS_MASK              0xfffff800
- 
--/* PORTSCX  Register Bit Masks */
--#define  PORTSCX_CURRENT_CONNECT_STATUS       0x00000001
--#define  PORTSCX_CONNECT_STATUS_CHANGE        0x00000002
--#define  PORTSCX_PORT_ENABLE                  0x00000004
--#define  PORTSCX_PORT_EN_DIS_CHANGE           0x00000008
--#define  PORTSCX_OVER_CURRENT_ACT             0x00000010
--#define  PORTSCX_OVER_CURRENT_CHG             0x00000020
--#define  PORTSCX_PORT_FORCE_RESUME            0x00000040
--#define  PORTSCX_PORT_SUSPEND                 0x00000080
--#define  PORTSCX_PORT_RESET                   0x00000100
--#define  PORTSCX_LINE_STATUS_BITS             0x00000C00
--#define  PORTSCX_PORT_POWER                   0x00001000
--#define  PORTSCX_PORT_INDICTOR_CTRL           0x0000C000
--#define  PORTSCX_PORT_TEST_CTRL               0x000F0000
--#define  PORTSCX_WAKE_ON_CONNECT_EN           0x00100000
--#define  PORTSCX_WAKE_ON_CONNECT_DIS          0x00200000
--#define  PORTSCX_WAKE_ON_OVER_CURRENT         0x00400000
--#define  PORTSCX_PHY_LOW_POWER_SPD            0x00800000
--#define  PORTSCX_PORT_FORCE_FULL_SPEED        0x01000000
--#define  PORTSCX_PORT_SPEED_MASK              0x0C000000
--#define  PORTSCX_PORT_WIDTH                   0x10000000
--#define  PORTSCX_PHY_TYPE_SEL                 0xC0000000
--
--/* bit 11-10 are line status */
--#define  PORTSCX_LINE_STATUS_SE0              0x00000000
--#define  PORTSCX_LINE_STATUS_JSTATE           0x00000400
--#define  PORTSCX_LINE_STATUS_KSTATE           0x00000800
--#define  PORTSCX_LINE_STATUS_UNDEF            0x00000C00
--#define  PORTSCX_LINE_STATUS_BIT_POS          10
--
--/* bit 15-14 are port indicator control */
--#define  PORTSCX_PIC_OFF                      0x00000000
--#define  PORTSCX_PIC_AMBER                    0x00004000
--#define  PORTSCX_PIC_GREEN                    0x00008000
--#define  PORTSCX_PIC_UNDEF                    0x0000C000
--#define  PORTSCX_PIC_BIT_POS                  14
--
--/* bit 19-16 are port test control */
--#define  PORTSCX_PTC_DISABLE                  0x00000000
--#define  PORTSCX_PTC_JSTATE                   0x00010000
--#define  PORTSCX_PTC_KSTATE                   0x00020000
--#define  PORTSCX_PTC_SEQNAK                   0x00030000
--#define  PORTSCX_PTC_PACKET                   0x00040000
--#define  PORTSCX_PTC_FORCE_EN                 0x00050000
--#define  PORTSCX_PTC_BIT_POS                  16
--
--/* bit 27-26 are port speed */
--#define  PORTSCX_PORT_SPEED_FULL              0x00000000
--#define  PORTSCX_PORT_SPEED_LOW               0x04000000
--#define  PORTSCX_PORT_SPEED_HIGH              0x08000000
--#define  PORTSCX_PORT_SPEED_UNDEF             0x0C000000
--#define  PORTSCX_SPEED_BIT_POS                26
--
--/* bit 28 is parallel transceiver width for UTMI interface */
--#define  PORTSCX_PTW                          0x10000000
--#define  PORTSCX_PTW_8BIT                     0x00000000
--#define  PORTSCX_PTW_16BIT                    0x10000000
--
--/* bit 31-30 are port transceiver select */
--#define  PORTSCX_PTS_UTMI                     0x00000000
--#define  PORTSCX_PTS_ULPI                     0x80000000
--#define  PORTSCX_PTS_FSLS                     0xC0000000
--#define  PORTSCX_PTS_BIT_POS                  30
--
--/* otgsc Register Bit Masks */
--#define  OTGSC_CTRL_VUSB_DISCHARGE            0x00000001
--#define  OTGSC_CTRL_VUSB_CHARGE               0x00000002
--#define  OTGSC_CTRL_OTG_TERM                  0x00000008
--#define  OTGSC_CTRL_DATA_PULSING              0x00000010
--#define  OTGSC_STS_USB_ID                     0x00000100
--#define  OTGSC_STS_A_VBUS_VALID               0x00000200
--#define  OTGSC_STS_A_SESSION_VALID            0x00000400
--#define  OTGSC_STS_B_SESSION_VALID            0x00000800
--#define  OTGSC_STS_B_SESSION_END              0x00001000
--#define  OTGSC_STS_1MS_TOGGLE                 0x00002000
--#define  OTGSC_STS_DATA_PULSING               0x00004000
--#define  OTGSC_INTSTS_USB_ID                  0x00010000
--#define  OTGSC_INTSTS_A_VBUS_VALID            0x00020000
--#define  OTGSC_INTSTS_A_SESSION_VALID         0x00040000
--#define  OTGSC_INTSTS_B_SESSION_VALID         0x00080000
--#define  OTGSC_INTSTS_B_SESSION_END           0x00100000
--#define  OTGSC_INTSTS_1MS                     0x00200000
--#define  OTGSC_INTSTS_DATA_PULSING            0x00400000
--#define  OTGSC_INTR_USB_ID                    0x01000000
--#define  OTGSC_INTR_A_VBUS_VALID              0x02000000
--#define  OTGSC_INTR_A_SESSION_VALID           0x04000000
--#define  OTGSC_INTR_B_SESSION_VALID           0x08000000
--#define  OTGSC_INTR_B_SESSION_END             0x10000000
--#define  OTGSC_INTR_1MS_TIMER                 0x20000000
--#define  OTGSC_INTR_DATA_PULSING              0x40000000
--
--/* USB MODE Register Bit Masks */
--#define  USB_MODE_CTRL_MODE_IDLE              0x00000000
--#define  USB_MODE_CTRL_MODE_DEVICE            0x00000002
--#define  USB_MODE_CTRL_MODE_HOST              0x00000003
--#define  USB_MODE_CTRL_MODE_RSV               0x00000001
--#define  USB_MODE_SETUP_LOCK_OFF              0x00000008
--#define  USB_MODE_STREAM_DISABLE              0x00000010
--/* Endpoint Flush Register */
--#define EPFLUSH_TX_OFFSET		      0x00010000
--#define EPFLUSH_RX_OFFSET		      0x00000000
--
--/* Endpoint Setup Status bit masks */
--#define  EP_SETUP_STATUS_MASK                 0x0000003F
--#define  EP_SETUP_STATUS_EP0		      0x00000001
--
--/* ENDPOINTCTRLx  Register Bit Masks */
--#define  EPCTRL_TX_ENABLE                     0x00800000
--#define  EPCTRL_TX_DATA_TOGGLE_RST            0x00400000	/* Not EP0 */
--#define  EPCTRL_TX_DATA_TOGGLE_INH            0x00200000	/* Not EP0 */
--#define  EPCTRL_TX_TYPE                       0x000C0000
--#define  EPCTRL_TX_DATA_SOURCE                0x00020000	/* Not EP0 */
--#define  EPCTRL_TX_EP_STALL                   0x00010000
--#define  EPCTRL_RX_ENABLE                     0x00000080
--#define  EPCTRL_RX_DATA_TOGGLE_RST            0x00000040	/* Not EP0 */
--#define  EPCTRL_RX_DATA_TOGGLE_INH            0x00000020	/* Not EP0 */
--#define  EPCTRL_RX_TYPE                       0x0000000C
--#define  EPCTRL_RX_DATA_SINK                  0x00000002	/* Not EP0 */
--#define  EPCTRL_RX_EP_STALL                   0x00000001
--
--/* bit 19-18 and 3-2 are endpoint type */
--#define  EPCTRL_EP_TYPE_CONTROL               0
--#define  EPCTRL_EP_TYPE_ISO                   1
--#define  EPCTRL_EP_TYPE_BULK                  2
--#define  EPCTRL_EP_TYPE_INTERRUPT             3
--#define  EPCTRL_TX_EP_TYPE_SHIFT              18
--#define  EPCTRL_RX_EP_TYPE_SHIFT              2
--
--/* SNOOPn Register Bit Masks */
--#define  SNOOP_ADDRESS_MASK                   0xFFFFF000
--#define  SNOOP_SIZE_ZERO                      0x00	/* snooping disable */
--#define  SNOOP_SIZE_4KB                       0x0B	/* 4KB snoop size */
--#define  SNOOP_SIZE_8KB                       0x0C
--#define  SNOOP_SIZE_16KB                      0x0D
--#define  SNOOP_SIZE_32KB                      0x0E
--#define  SNOOP_SIZE_64KB                      0x0F
--#define  SNOOP_SIZE_128KB                     0x10
--#define  SNOOP_SIZE_256KB                     0x11
--#define  SNOOP_SIZE_512KB                     0x12
--#define  SNOOP_SIZE_1MB                       0x13
--#define  SNOOP_SIZE_2MB                       0x14
--#define  SNOOP_SIZE_4MB                       0x15
--#define  SNOOP_SIZE_8MB                       0x16
--#define  SNOOP_SIZE_16MB                      0x17
--#define  SNOOP_SIZE_32MB                      0x18
--#define  SNOOP_SIZE_64MB                      0x19
--#define  SNOOP_SIZE_128MB                     0x1A
--#define  SNOOP_SIZE_256MB                     0x1B
--#define  SNOOP_SIZE_512MB                     0x1C
--#define  SNOOP_SIZE_1GB                       0x1D
--#define  SNOOP_SIZE_2GB                       0x1E	/* 2GB snoop size */
--
--/* pri_ctrl Register Bit Masks */
--#define  PRI_CTRL_PRI_LVL1                    0x0000000C
--#define  PRI_CTRL_PRI_LVL0                    0x00000003
--
--/* si_ctrl Register Bit Masks */
--#define  SI_CTRL_ERR_DISABLE                  0x00000010
--#define  SI_CTRL_IDRC_DISABLE                 0x00000008
--#define  SI_CTRL_RD_SAFE_EN                   0x00000004
--#define  SI_CTRL_RD_PREFETCH_DISABLE          0x00000002
--#define  SI_CTRL_RD_PREFEFETCH_VAL            0x00000001
--
--/* control Register Bit Masks */
--#define  USB_CTRL_IOENB                       0x00000004
--#define  USB_CTRL_ULPI_INT0EN                 0x00000001
- 
- /* Endpoint Queue Head data struct
-  * Rem: all the variables of qh are LittleEndian Mode
-@@ -477,7 +297,10 @@ struct fsl_udc {
- 	unsigned int irq;
- 
- 	struct usb_ctrlrequest local_setup_buff;
--	spinlock_t lock;
-+	spinlock_t lock;		/* udc lock */
-+	struct fsl_usb2_platform_data *pdata;
-+	u32 xcvr_type;
-+
- 	struct otg_transceiver *transceiver;
- 	unsigned softconnect:1;
- 	unsigned vbus_active:1;
-@@ -514,7 +337,7 @@ struct fsl_udc {
- #define DBG(fmt, args...) 	printk(KERN_DEBUG "[%s]  " fmt "\n", \
- 				__FUNCTION__, ## args)
- #else
--#define DBG(fmt, args...)	do{}while(0)
-+#define DBG(fmt, args...)	do {} while (0)
- #endif
- 
- #if 0
-@@ -548,7 +371,7 @@ static void dump_msg(const char *label, 
- #ifdef VERBOSE
- #define VDBG		DBG
- #else
--#define VDBG(stuff...)	do{}while(0)
-+#define VDBG(stuff...)	do {} while (0)
- #endif
- 
- #define ERR(stuff...)		pr_err("udc: " stuff)
-@@ -573,11 +396,14 @@ static void dump_msg(const char *label, 
- #define ep_maxpacket(EP)	((EP)->ep.maxpacket)
- #define ep_is_in(EP)	( (ep_index(EP) == 0) ? (EP->udc->ep0_dir == \
- 			USB_DIR_IN ):((EP)->desc->bEndpointAddress \
--			& USB_DIR_IN)==USB_DIR_IN)
-+			& USB_DIR_IN) == USB_DIR_IN)
- #define get_ep_by_pipe(udc, pipe)	((pipe == 1)? &udc->eps[0]: \
- 					&udc->eps[pipe])
- #define get_pipe_by_windex(windex)	((windex & USB_ENDPOINT_NUMBER_MASK) \
- 					* 2 + ((windex & USB_DIR_IN) ? 1 : 0))
- #define get_pipe_by_ep(EP)	(ep_index(EP) * 2 + ep_is_in(EP))
- 
-+/* Bulk only class request */
-+#define USB_BULK_RESET_REQUEST          0xff
-+
- #endif
---- a/drivers/usb/gadget/gadget_chips.h
-+++ b/drivers/usb/gadget/gadget_chips.h
-@@ -147,6 +147,11 @@
- #define	gadget_is_m66592(g)	0
- #endif
- 
-+#ifdef CONFIG_USB_GADGET_MCF5445X
-+#define gadget_is_mcf5445x(g)	!strcmp("fsl-usb2-udc", (g)->name)
-+#else
-+#define gadget_is_mcf5445x(g)	0
-+#endif
- 
- // CONFIG_USB_GADGET_SX2
- // CONFIG_USB_GADGET_AU1X00
-@@ -212,5 +217,7 @@ static inline int usb_gadget_controller_
- 		return 0x20;
- 	else if (gadget_is_m66592(gadget))
- 		return 0x21;
-+	else if (gadget_is_mcf5445x(gadget))
-+		return 0x22;
- 	return -ENOENT;
- }
---- /dev/null
-+++ b/drivers/usb/gadget/mcf5445x_udc.c
-@@ -0,0 +1,2758 @@
-+/*
-+ * Copyright Freescale Semiconductor, Inc. 2006-2007
-+ *
-+ *      Based on mpc_udc.c code
-+ *      of Li Yang and Jiang Bo (Freescale Semiconductor, Inc.)
-+ *
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ ***************************************************************************
-+ * Changes:
-+ *   v0.004	30 July 2007		Duck
-+ *   		mcf5445x port
-+ *   v0.003	27 October 2006		Andrey Butok
-+ *		Added M5329EVB support (without external transceiver).
-+ *   v0.002	29 September 2006	Andrey Butok
-+ *		Some little changes. Added OTG support.
-+ *   v0.001	12 July 2006		Andrey Butok
-+ *   		Initial Release - developed on uClinux with 2.6.17.1 kernel.
-+ *   		Based on mpc_udc.c code
-+ *   		of Li Yang and Jiang Bo (Freescale Semiconductor, Inc.)
-+ *
-+ */
-+
-+#define DEBUG
-+#undef VERBOSE
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/ioport.h>
-+#include <linux/types.h>
-+#include <linux/errno.h>
-+#include <linux/delay.h>
-+#include <linux/sched.h>
-+#include <linux/slab.h>
-+#include <linux/init.h>
-+#include <linux/io.h>
-+#include <linux/irq.h>
-+#include <linux/timer.h>
-+#include <linux/list.h>
-+#include <linux/interrupt.h>
-+#include <linux/proc_fs.h>
-+#include <linux/mm.h>
-+#include <linux/platform_device.h>
-+#include <linux/moduleparam.h>
-+#include <linux/device.h>
-+#include <linux/usb/ch9.h>
-+#include <linux/usb_gadget.h>
-+#include <linux/usb/otg.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/dmapool.h>
-+#include <linux/fsl_devices.h>
-+#include <linux/usb/fsl_xcvr.h>
-+#include <linux/usb/fsl_usb2.h>
-+#include <linux/pm.h>
-+
-+#include <asm/byteorder.h>
-+#include <asm/system.h>
-+#include <asm/unaligned.h>
-+#include <asm/dma.h>
-+
-+#include <asm/mcfsim.h>
-+#include <asm/cacheflush.h>
-+
-+#include "fsl_usb2_udc.h"
-+
-+#define	DRIVER_DESC	"Freescale High-Speed USB SoC Device Controller driver"
-+#define	DRIVER_AUTHOR	"Freescale Semiconductor Inc."
-+#define	DRIVER_VERSION	"30 July 2007"
-+
-+#define cpu_to_hc32(x)	(x)
-+#define hc32_to_cpu(x)	(x)
-+
-+static int udc_suspend(struct fsl_udc *udc);
-+
-+#define	DMA_ADDR_INVALID	(~(dma_addr_t)0)
-+
-+static const char driver_name[] = "fsl-usb2-udc";
-+static const char driver_desc[] = DRIVER_DESC;
-+
-+volatile static struct fsl_usb_device_regs *dr_regs;
-+volatile static struct usb_sys_interface *usb_sys_regs;
-+
-+/* it is initialized in probe()  */
-+static struct fsl_udc *udc_controller;
-+
-+static const struct usb_endpoint_descriptor
-+fsl_ep0_desc = {
-+	.bLength =		USB_DT_ENDPOINT_SIZE,
-+	.bDescriptorType =	USB_DT_ENDPOINT,
-+	.bEndpointAddress =	0,
-+	.bmAttributes =		USB_ENDPOINT_XFER_CONTROL,
-+	.wMaxPacketSize =	USB_MAX_CTRL_PAYLOAD,
-+};
-+
-+static int fsl_udc_suspend(struct device *dev, pm_message_t state);
-+static int fsl_udc_resume(struct device *dev);
-+static void fsl_ep_fifo_flush(struct usb_ep *_ep);
-+
-+/********************************************************************
-+ *	Internal Used Function
-+********************************************************************/
-+/*-----------------------------------------------------------------
-+ * done() - retire a request; caller blocked irqs
-+ * @status : request status to be set, only works when
-+ *	request is still in progress.
-+ *--------------------------------------------------------------*/
-+static void done(struct fsl_ep *ep, struct fsl_req *req, int status)
-+{
-+	struct fsl_udc *udc = NULL;
-+	unsigned char stopped = ep->stopped;
-+
-+	udc = (struct fsl_udc *)ep->udc;
-+
-+	pr_debug("udc: req=0x%p\n", req);
-+	if (req->head) {
-+		pr_debug("udc: freeing head=0x%p\n", req->head);
-+		dma_pool_free(udc->td_pool, req->head, req->head->td_dma);
-+	}
-+
-+	/* the req->queue pointer is used by ep_queue() func, in which
-+	 * the request will be added into a udc_ep->queue 'd tail
-+	 * so here the req will be dropped from the ep->queue
-+	 */
-+	list_del_init(&req->queue);
-+
-+	/* req.status should be set as -EINPROGRESS in ep_queue() */
-+	if (req->req.status == -EINPROGRESS)
-+		req->req.status = status;
-+	else
-+		status = req->req.status;
-+
-+	pr_debug("udc: req=0x%p  mapped=%x\n", req, req->mapped);
-+
-+	if (req->mapped) {
-+		pr_debug("udc: calling dma_unmap_single(buf,%s)  req=0x%p  "
-+			 "a=0x%x  len=%d\n",
-+			 ep_is_in(ep) ? "to_dvc" : "from_dvc",
-+			 req, req->req.dma, req->req.length);
-+
-+		dma_unmap_single(ep->udc->gadget.dev.parent,
-+				 req->req.dma, req->req.length, ep_is_in(ep) ?
-+				 DMA_TO_DEVICE : DMA_FROM_DEVICE);
-+
-+		req->req.dma = DMA_ADDR_INVALID;
-+		req->mapped = 0;
-+		pr_debug("udc: req=0x%p set req.dma=0x%x\n", req, req->req.dma);
-+	} else {
-+		if ((req->req.length != 0)
-+		    && (req->req.dma != DMA_ADDR_INVALID)) {
-+			pr_debug("udc: calling dma_sync_single_for_cpu(buf,%s) "
-+				 "req=0x%p  dma=0x%x  len=%d\n",
-+				 ep_is_in(ep) ? "to_dvc" : "from_dvc", req,
-+				 req->req.dma, req->req.length);
-+
-+			dma_sync_single_for_cpu(ep->udc->gadget.dev.parent,
-+						req->req.dma, req->req.length,
-+						ep_is_in(ep) ? DMA_TO_DEVICE :
-+						DMA_FROM_DEVICE);
-+		}
-+	}
-+
-+	if (status && (status != -ESHUTDOWN)) {
-+		pr_debug("udc: complete %s req 0c%p stat %d len %u/%u\n",
-+			 ep->ep.name, &req->req, status,
-+			 req->req.actual, req->req.length);
-+	}
-+
-+	/* don't modify queue heads during completion callback */
-+	ep->stopped = 1;
-+
-+	spin_unlock(&ep->udc->lock);
-+
-+	/* this complete() should a func implemented by gadget layer,
-+	 * eg fsg->bulk_in_complete() */
-+	if (req->req.complete) {
-+		pr_debug("udc: calling gadget's complete()  req=0x%p\n", req);
-+		req->req.complete(&ep->ep, &req->req);
-+		pr_debug("udc: back from gadget's complete()\n");
-+	}
-+
-+	spin_lock(&ep->udc->lock);
-+	ep->stopped = stopped;
-+}
-+
-+/*
-+ * nuke(): delete all requests related to this ep
-+ * called with spinlock held
-+ *--------------------------------------------------------------*/
-+static void nuke(struct fsl_ep *ep, int status)
-+{
-+	ep->stopped = 1;
-+
-+	/* Flush fifo */
-+	fsl_ep_fifo_flush(&ep->ep);
-+
-+	/* Whether this eq has request linked */
-+	while (!list_empty(&ep->queue)) {
-+		struct fsl_req *req = NULL;
-+
-+		req = list_entry(ep->queue.next, struct fsl_req, queue);
-+		done(ep, req, status);
-+	}
-+}
-+
-+/*------------------------------------------------------------------
-+	Internal Hardware related function
-+ ------------------------------------------------------------------*/
-+
-+static int dr_controller_setup(struct fsl_udc *udc)
-+{
-+	unsigned int tmp;
-+	unsigned int __attribute((unused)) ctrl = 0;
-+	unsigned long timeout;
-+	struct fsl_usb2_platform_data *pdata;
-+
-+#define FSL_UDC_RESET_TIMEOUT 1000
-+
-+	/* before here, make sure dr_regs has been initialized */
-+	if (!udc)
-+		return -EINVAL;
-+	pdata = udc->pdata;
-+
-+	/* Stop and reset the usb controller */
-+	tmp = fsl_readl(&dr_regs->usbcmd);
-+	tmp &= ~USB_CMD_RUN_STOP;
-+	fsl_writel(tmp, &dr_regs->usbcmd);
-+
-+	tmp = fsl_readl(&dr_regs->usbcmd);
-+	tmp |= USB_CMD_CTRL_RESET;
-+	fsl_writel(tmp, &dr_regs->usbcmd);
-+
-+	/* Wait for reset to complete */
-+	timeout = jiffies + FSL_UDC_RESET_TIMEOUT;
-+	while (fsl_readl(&dr_regs->usbcmd) & USB_CMD_CTRL_RESET) {
-+		if (time_after(jiffies, timeout)) {
-+			ERR("udc reset timeout! \n");
-+			return -ETIMEDOUT;
-+		}
-+		cpu_relax();
-+	}
-+
-+	tmp = fsl_readl(&dr_regs->usbmode);
-+	tmp &= ~0x3;	/* clear mode bits */
-+	tmp |= USB_MODE_CTRL_MODE_DEVICE;
-+	/* Disable Setup Lockout */
-+	tmp |= USB_MODE_SETUP_LOCK_OFF;
-+	if (pdata->es)
-+		tmp |= USBMODE_ES;
-+	fsl_writel(tmp, &dr_regs->usbmode);
-+
-+	if (pdata->xcvr_ops && pdata->xcvr_ops->set_device)
-+		pdata->xcvr_ops->set_device();
-+
-+	/* Clear the setup status */
-+	fsl_writel(0, &dr_regs->usbsts);
-+
-+	tmp = udc->ep_qh_dma;
-+	tmp &= USB_EP_LIST_ADDRESS_MASK;
-+	fsl_writel(tmp, &dr_regs->endpointlistaddr);
-+
-+	/*
-+	VDBG("vir[qh_base] is %p phy[qh_base] is 0x%8x reg is 0x%8x",
-+		(int)udc->ep_qh, (int)tmp,
-+		fsl_readl(&dr_regs->endpointlistaddr));
-+	*/
-+
-+
-+	if (pdata->have_sysif_regs) {
-+		/* Config control enable i/o output, cpu endian register */
-+		ctrl = __raw_readl(&usb_sys_regs->control);
-+		ctrl |= USB_CTRL_IOENB;
-+		__raw_writel(ctrl, &usb_sys_regs->control);
-+	}
-+
-+#if defined(CONFIG_PPC32) && !defined(CONFIG_NOT_COHERENT_CACHE)
-+	/* Turn on cache snooping hardware, since some PowerPC platforms
-+	 * wholly rely on hardware to deal with cache coherent. */
-+
-+	if (pdata->have_sysif_regs) {
-+		/* Setup Snooping for all the 4GB space */
-+		tmp = SNOOP_SIZE_2GB;	/* starts from 0x0, size 2G */
-+		__raw_writel(tmp, &usb_sys_regs->snoop1);
-+		tmp |= 0x80000000;	/* starts from 0x8000000, size 2G */
-+		__raw_writel(tmp, &usb_sys_regs->snoop2);
-+	}
-+#endif
-+
-+	return 0;
-+}
-+
-+static void pullup_enable(struct fsl_udc *udc)
-+{
-+	u32 temp;
-+
-+	unsigned short ccm = fsl_readw(&MCF_CCM_UOCSR);
-+	ccm |= MCF_CCM_UOCSR_BVLD;
-+	ccm &= ~MCF_CCM_UOCSR_SEND;
-+	fsl_writew(ccm, &MCF_CCM_UOCSR);
-+
-+	/* Enable DR irq reg */
-+	temp = USB_INTR_INT_EN | USB_INTR_ERR_INT_EN
-+		| USB_INTR_PTC_DETECT_EN | USB_INTR_RESET_EN
-+		| USB_INTR_DEVICE_SUSPEND | USB_INTR_SYS_ERR_EN;
-+
-+	fsl_writel(temp, &dr_regs->usbintr);
-+
-+	/* Set controller to Run */
-+	temp = fsl_readl(&dr_regs->usbcmd);
-+	temp |= USB_CMD_RUN_STOP;
-+	fsl_writel(temp, &dr_regs->usbcmd);
-+
-+#ifdef NEVER /* DDD FIXME: we want this? */
-+	if (!udc->transceiver)
-+		*((u16 *)(MCF_FBCS1_CSAR)) &= ~0x1; /* Enable pullup register */
-+#endif
-+}
-+
-+static void pullup_disable(struct fsl_udc *udc)
-+{
-+	unsigned int tmp;
-+	unsigned short ccm;
-+
-+	VDBG();
-+	/* disable all INTRs */
-+	fsl_writel(0, &dr_regs->usbintr);
-+
-+	ccm = fsl_readw(&MCF_CCM_UOCSR);
-+	ccm &= ~MCF_CCM_UOCSR_BVLD;
-+	fsl_writew(ccm, &MCF_CCM_UOCSR);
-+
-+	/* set controller to Stop */
-+	tmp = fsl_readl(&dr_regs->usbcmd);
-+	tmp &= ~USB_CMD_RUN_STOP;
-+	fsl_writel(tmp, &dr_regs->usbcmd);
-+
-+#ifdef NEVER /* DDD FIXME: we want this? */
-+	if (!udc->transceiver)
-+		*((u16 *)(MCF_FBCS1_CSAR)) |= 0x1; /* Disable pullup register */
-+#endif
-+
-+}
-+
-+static void dr_controller_run(struct fsl_udc *udc)
-+{
-+	VDBG();
-+	pullup_enable(udc);
-+	udc->stopped = 0;
-+}
-+
-+static void dr_controller_stop(struct fsl_udc *udc)
-+{
-+	pullup_disable(udc);
-+	udc->stopped = 1;
-+	udc->gadget.b_hnp_enable = 0;
-+	udc->gadget.a_hnp_support = 0;
-+	udc->gadget.a_alt_hnp_support = 0;
-+}
-+
-+void dr_ep_setup(unsigned char ep_num, unsigned char dir, unsigned char ep_type)
-+{
-+	unsigned int tmp_epctrl = 0;
-+
-+	tmp_epctrl = fsl_readl(&dr_regs->endptctrl[ep_num]);
-+	if (dir) {
-+		if (ep_num)
-+			tmp_epctrl |= EPCTRL_TX_DATA_TOGGLE_RST;
-+		tmp_epctrl |= EPCTRL_TX_ENABLE;
-+		tmp_epctrl |= ((unsigned int)(ep_type)
-+				<< EPCTRL_TX_EP_TYPE_SHIFT);
-+	} else {
-+		if (ep_num)
-+			tmp_epctrl |= EPCTRL_RX_DATA_TOGGLE_RST;
-+		tmp_epctrl |= EPCTRL_RX_ENABLE;
-+		tmp_epctrl |= ((unsigned int)(ep_type)
-+				<< EPCTRL_RX_EP_TYPE_SHIFT);
-+	}
-+
-+	fsl_writel(tmp_epctrl, &dr_regs->endptctrl[ep_num]);
-+}
-+
-+static void dr_ep_change_stall(unsigned char ep_num, unsigned char dir,
-+			       int value)
-+{
-+	u32 tmp_epctrl = 0;
-+
-+	tmp_epctrl = fsl_readl(&dr_regs->endptctrl[ep_num]);
-+
-+	if (value) {
-+		/* set the stall bit */
-+		if (dir)
-+			tmp_epctrl |= EPCTRL_TX_EP_STALL;
-+		else
-+			tmp_epctrl |= EPCTRL_RX_EP_STALL;
-+	} else {
-+		/* clear the stall bit and reset data toggle */
-+		if (dir) {
-+			tmp_epctrl &= ~EPCTRL_TX_EP_STALL;
-+			tmp_epctrl |= EPCTRL_TX_DATA_TOGGLE_RST;
-+		} else {
-+			tmp_epctrl &= ~EPCTRL_RX_EP_STALL;
-+			tmp_epctrl |= EPCTRL_RX_DATA_TOGGLE_RST;
-+		}
-+	}
-+	fsl_writel(tmp_epctrl, &dr_regs->endptctrl[ep_num]);
-+}
-+
-+/* Get stall status of a specific ep
-+   Return: 0: not stalled; 1:stalled */
-+static int dr_ep_get_stall(unsigned char ep_num, unsigned char dir)
-+{
-+	u32 epctrl;
-+
-+	epctrl = fsl_readl(&dr_regs->endptctrl[ep_num]);
-+	if (dir)
-+		return (epctrl & EPCTRL_TX_EP_STALL) ? 1 : 0;
-+	else
-+		return (epctrl & EPCTRL_RX_EP_STALL) ? 1 : 0;
-+}
-+
-+/********************************************************************
-+	Internal Structure Build up functions
-+********************************************************************/
-+
-+/*------------------------------------------------------------------
-+* struct_ep_qh_setup(): set the Endpoint Capabilites field of QH
-+ * @zlt: Zero Length Termination Select (1: disable; 0: enable)
-+ * @mult: Mult field
-+ ------------------------------------------------------------------*/
-+static void struct_ep_qh_setup(struct fsl_udc *udc, unsigned char ep_num,
-+		unsigned char dir, unsigned char ep_type,
-+		unsigned int max_pkt_len,
-+		unsigned int zlt, unsigned char mult)
-+{
-+	struct ep_queue_head *p_QH = &udc->ep_qh[2 * ep_num + dir];
-+	unsigned int tmp = 0;
-+
-+	/* set the Endpoint Capabilites in QH */
-+	switch (ep_type) {
-+	case USB_ENDPOINT_XFER_CONTROL:
-+		/* Interrupt On Setup (IOS). for control ep  */
-+		tmp = (max_pkt_len << EP_QUEUE_HEAD_MAX_PKT_LEN_POS)
-+			| EP_QUEUE_HEAD_IOS;
-+		break;
-+	case USB_ENDPOINT_XFER_ISOC:
-+		tmp = (max_pkt_len << EP_QUEUE_HEAD_MAX_PKT_LEN_POS)
-+			| (mult << EP_QUEUE_HEAD_MULT_POS);
-+		break;
-+	case USB_ENDPOINT_XFER_BULK:
-+	case USB_ENDPOINT_XFER_INT:
-+		tmp = max_pkt_len << EP_QUEUE_HEAD_MAX_PKT_LEN_POS;
-+		break;
-+	default:
-+		VDBG("error ep type is %d", ep_type);
-+		return;
-+	}
-+	if (zlt)
-+		tmp |= EP_QUEUE_HEAD_ZLT_SEL;
-+	p_QH->max_pkt_length = cpu_to_hc32(tmp);
-+
-+	return;
-+}
-+
-+/* Setup qh structure and ep register for ep0. */
-+static void ep0_setup(struct fsl_udc *udc)
-+{
-+	/* the intialization of an ep includes: fields in QH, Regs,
-+	 * fsl_ep struct */
-+	struct_ep_qh_setup(udc, 0, USB_RECV, USB_ENDPOINT_XFER_CONTROL,
-+			USB_MAX_CTRL_PAYLOAD, 0, 0);
-+	struct_ep_qh_setup(udc, 0, USB_SEND, USB_ENDPOINT_XFER_CONTROL,
-+			USB_MAX_CTRL_PAYLOAD, 0, 0);
-+	dr_ep_setup(0, USB_RECV, USB_ENDPOINT_XFER_CONTROL);
-+	dr_ep_setup(0, USB_SEND, USB_ENDPOINT_XFER_CONTROL);
-+
-+	return;
-+
-+}
-+
-+/***********************************************************************
-+		Endpoint Management Functions
-+***********************************************************************/
-+
-+/*-------------------------------------------------------------------------
-+ * when configurations are set, or when interface settings change
-+ * for example the do_set_interface() in gadget layer,
-+ * the driver will enable or disable the relevant endpoints
-+ * ep0 doesn't use this routine. It is always enabled.
-+-------------------------------------------------------------------------*/
-+static int fsl_ep_enable(struct usb_ep *_ep,
-+		const struct usb_endpoint_descriptor *desc)
-+{
-+	struct fsl_udc *udc = NULL;
-+	struct fsl_ep *ep = NULL;
-+	unsigned short max = 0;
-+	unsigned char mult = 0, zlt;
-+	int retval = -EINVAL;
-+	unsigned long flags = 0;
-+
-+	ep = container_of(_ep, struct fsl_ep, ep);
-+
-+	/* catch various bogus parameters */
-+	if (!_ep || !desc || ep->desc
-+			|| (desc->bDescriptorType != USB_DT_ENDPOINT))
-+		return -EINVAL;
-+
-+	udc = ep->udc;
-+
-+	if (!udc->driver || (udc->gadget.speed == USB_SPEED_UNKNOWN))
-+		return -ESHUTDOWN;
-+
-+	max = le16_to_cpu(desc->wMaxPacketSize);
-+
-+	/* Disable automatic zlp generation.  Driver is reponsible to indicate
-+	 * explicitly through req->req.zero.  This is needed to enable multi-td
-+	 * request. */
-+	zlt = 1;
-+
-+	/* Assume the max packet size from gadget is always correct */
-+	switch (desc->bmAttributes & 0x03) {
-+	case USB_ENDPOINT_XFER_CONTROL:
-+	case USB_ENDPOINT_XFER_BULK:
-+	case USB_ENDPOINT_XFER_INT:
-+		/* mult = 0.  Execute N Transactions as demonstrated by
-+		 * the USB variable length packet protocol where N is
-+		 * computed using the Maximum Packet Length (dQH) and
-+		 * the Total Bytes field (dTD) */
-+		mult = 0;
-+		break;
-+	case USB_ENDPOINT_XFER_ISOC:
-+		/* Calculate transactions needed for high bandwidth iso */
-+		mult = (unsigned char)(1 + ((max >> 11) & 0x03));
-+		max = max & 0x8ff;	/* bit 0~10 */
-+		/* 3 transactions at most */
-+		if (mult > 3)
-+			goto en_done;
-+		break;
-+	default:
-+		goto en_done;
-+	}
-+
-+	spin_lock_irqsave(&udc->lock, flags);
-+	ep->ep.maxpacket = max;
-+	ep->desc = desc;
-+	ep->stopped = 0;
-+
-+	/* Controller related setup */
-+	/* Init EPx Queue Head (Ep Capabilites field in QH
-+	 * according to max, zlt, mult) */
-+	struct_ep_qh_setup(udc, (unsigned char) ep_index(ep),
-+			(unsigned char) ((desc->bEndpointAddress & USB_DIR_IN)
-+					?  USB_SEND : USB_RECV),
-+			(unsigned char) (desc->bmAttributes
-+					& USB_ENDPOINT_XFERTYPE_MASK),
-+			max, zlt, mult);
-+
-+	/* Init endpoint ctrl register */
-+	dr_ep_setup((unsigned char) ep_index(ep),
-+			(unsigned char) ((desc->bEndpointAddress & USB_DIR_IN)
-+					? USB_SEND : USB_RECV),
-+			(unsigned char) (desc->bmAttributes
-+					& USB_ENDPOINT_XFERTYPE_MASK));
-+
-+	spin_unlock_irqrestore(&udc->lock, flags);
-+	retval = 0;
-+
-+	VDBG("enabled %s (ep%d%s) maxpacket %d", ep->ep.name,
-+			ep->desc->bEndpointAddress & 0x0f,
-+			(desc->bEndpointAddress & USB_DIR_IN)
-+				? "in" : "out", max);
-+en_done:
-+	return retval;
-+}
-+
-+/*---------------------------------------------------------------------
-+ * @ep : the ep being unconfigured. May not be ep0
-+ * Any pending and uncomplete req will complete with status (-ESHUTDOWN)
-+*---------------------------------------------------------------------*/
-+static int fsl_ep_disable(struct usb_ep *_ep)
-+{
-+	struct fsl_udc *udc = NULL;
-+	struct fsl_ep *ep = NULL;
-+	unsigned long flags = 0;
-+	u32 epctrl;
-+	int ep_num;
-+
-+	ep = container_of(_ep, struct fsl_ep, ep);
-+	if (!_ep || !ep->desc) {
-+		pr_debug("udc: %s not enabled\n", _ep ? ep->ep.name : NULL);
-+		return -EINVAL;
-+	}
-+
-+	/* disable ep on controller */
-+	ep_num = ep_index(ep);
-+	epctrl = fsl_readl(&dr_regs->endptctrl[ep_num]);
-+	if (ep_is_in(ep))
-+		epctrl &= ~EPCTRL_TX_ENABLE;
-+	else
-+		epctrl &= ~EPCTRL_RX_ENABLE;
-+	fsl_writel(epctrl, &dr_regs->endptctrl[ep_num]);
-+
-+	udc = (struct fsl_udc *)ep->udc;
-+	spin_lock_irqsave(&udc->lock, flags);
-+
-+	/* nuke all pending requests (does flush) */
-+	nuke(ep, -ESHUTDOWN);
-+
-+	ep->desc = 0;
-+	ep->stopped = 1;
-+	spin_unlock_irqrestore(&udc->lock, flags);
-+
-+	pr_debug("udc: disabled %s OK\n", _ep->name);
-+	return 0;
-+}
-+
-+/*---------------------------------------------------------------------
-+ * allocate a request object used by this endpoint
-+ * the main operation is to insert the req->queue to the eq->queue
-+ * Returns the request, or null if one could not be allocated
-+*---------------------------------------------------------------------*/
-+static struct usb_request *
-+fsl_alloc_request(struct usb_ep *_ep, gfp_t gfp_flags)
-+{
-+	struct fsl_req *req = NULL;
-+
-+	req = kzalloc(sizeof *req, gfp_flags);
-+	if (!req)
-+		return NULL;
-+
-+	req->req.dma = DMA_ADDR_INVALID;
-+	pr_debug("udc: req=0x%p   set req.dma=0x%x\n", req, req->req.dma);
-+	INIT_LIST_HEAD(&req->queue);
-+
-+	return &req->req;
-+}
-+
-+static void fsl_free_request(struct usb_ep *_ep, struct usb_request *_req)
-+{
-+	struct fsl_req *req;
-+
-+	req = container_of(_req, struct fsl_req, req);
-+	pr_debug("udc: req=0x%p\n", req);
-+
-+	if (_req)
-+		kfree(req);
-+}
-+
-+/*-------------------------------------------------------------------------*/
-+static int fsl_queue_td(struct fsl_ep *ep, struct fsl_req *req)
-+{
-+	int i = ep_index(ep) * 2 + ep_is_in(ep);
-+	u32 temp, bitmask, tmp_stat;
-+	struct ep_queue_head *dQH = &ep->udc->ep_qh[i];
-+
-+	pr_debug("udc: queue req=0x%p to ep index %d\n", req, i);
-+
-+	bitmask = ep_is_in(ep)
-+		? (1 << (ep_index(ep) + 16))
-+		: (1 << (ep_index(ep)));
-+
-+	/* check if the pipe is empty */
-+	if (!(list_empty(&ep->queue))) {
-+		/* Add td to the end */
-+		struct fsl_req *lastreq;
-+		lastreq = list_entry(ep->queue.prev, struct fsl_req, queue);
-+		lastreq->tail->next_td_ptr =
-+			cpu_to_hc32(req->head->td_dma & DTD_ADDR_MASK);
-+		/* Read prime bit, if 1 goto done */
-+		if (fsl_readl(&dr_regs->endpointprime) & bitmask)
-+			goto out;
-+
-+		do {
-+			/* Set ATDTW bit in USBCMD */
-+			temp = fsl_readl(&dr_regs->usbcmd);
-+			fsl_writel(temp | USB_CMD_ATDTW, &dr_regs->usbcmd);
-+
-+			/* Read correct status bit */
-+			tmp_stat = fsl_readl(&dr_regs->endptstatus) & bitmask;
-+
-+		} while (!(fsl_readl(&dr_regs->usbcmd) & USB_CMD_ATDTW));
-+
-+		/* Write ATDTW bit to 0 */
-+		temp = fsl_readl(&dr_regs->usbcmd);
-+		fsl_writel(temp & ~USB_CMD_ATDTW, &dr_regs->usbcmd);
-+
-+		if (tmp_stat)
-+			goto out;
-+	}
-+
-+	/* Write dQH next pointer and terminate bit to 0 */
-+	temp = req->head->td_dma & EP_QUEUE_HEAD_NEXT_POINTER_MASK;
-+	dQH->next_dtd_ptr = cpu_to_hc32(temp);
-+
-+	/* Clear active and halt bit */
-+	temp = cpu_to_hc32(~(EP_QUEUE_HEAD_STATUS_ACTIVE
-+			| EP_QUEUE_HEAD_STATUS_HALT));
-+	dQH->size_ioc_int_sts &= temp;
-+
-+	/* Prime endpoint by writing 1 to ENDPTPRIME */
-+	temp = ep_is_in(ep)
-+		? (1 << (ep_index(ep) + 16))
-+		: (1 << (ep_index(ep)));
-+	fsl_writel(temp, &dr_regs->endpointprime);
-+out:
-+	return 0;
-+}
-+
-+/* Fill in the dTD structure
-+ * @req: request that the transfer belongs to
-+ * @length: return actually data length of the dTD
-+ * @dma: return dma address of the dTD
-+ * @is_last: return flag if it is the last dTD of the request
-+ * return: pointer to the built dTD */
-+static struct ep_td_struct *fsl_build_dtd(struct fsl_req *req, unsigned *length,
-+		dma_addr_t *dma, int *is_last)
-+{
-+	u32 swap_temp;
-+	struct ep_td_struct *dtd;
-+
-+	/* how big will this transfer be? */
-+	*length = min(req->req.length - req->req.actual,
-+			(unsigned)EP_MAX_LENGTH_TRANSFER);
-+
-+	dtd = dma_pool_alloc(udc_controller->td_pool, GFP_KERNEL, dma);
-+	if (dtd == NULL)
-+		return dtd;
-+
-+	dtd->td_dma = *dma;
-+	/* Clear reserved field */
-+	swap_temp = hc32_to_cpu(dtd->size_ioc_sts);
-+	swap_temp &= ~DTD_RESERVED_FIELDS;
-+	dtd->size_ioc_sts = cpu_to_hc32(swap_temp);
-+
-+	/* Init all of buffer page pointers */
-+	swap_temp = (u32) (req->req.dma + req->req.actual);
-+	dtd->buff_ptr0 = cpu_to_hc32(swap_temp);
-+	dtd->buff_ptr1 = cpu_to_hc32(swap_temp + 0x1000);
-+	dtd->buff_ptr2 = cpu_to_hc32(swap_temp + 0x2000);
-+	dtd->buff_ptr3 = cpu_to_hc32(swap_temp + 0x3000);
-+	dtd->buff_ptr4 = cpu_to_hc32(swap_temp + 0x4000);
-+
-+	req->req.actual += *length;
-+
-+	/* zlp is needed if req->req.zero is set */
-+	if (req->req.zero) {
-+		if (*length == 0 || (*length % req->ep->ep.maxpacket) != 0)
-+			*is_last = 1;
-+		else
-+			*is_last = 0;
-+	} else if (req->req.length == req->req.actual)
-+		*is_last = 1;
-+	else
-+		*is_last = 0;
-+
-+	if ((*is_last) == 0)
-+		VDBG("multi-dtd request!\n");
-+	/* Fill in the transfer size; set active bit */
-+	swap_temp = ((*length << DTD_LENGTH_BIT_POS) | DTD_STATUS_ACTIVE);
-+
-+	/* Enable interrupt for the last dtd of a request */
-+	if (*is_last && !req->req.no_interrupt)
-+		swap_temp |= DTD_IOC;
-+
-+	dtd->size_ioc_sts = cpu_to_hc32(swap_temp);
-+
-+	mb();
-+
-+	VDBG("length = %d address= 0x%x", *length, (int)*dma);
-+
-+	return dtd;
-+}
-+
-+/* Generate dtd chain for a request */
-+static int fsl_req_to_dtd(struct fsl_req *req)
-+{
-+	unsigned	count;
-+	int		is_last;
-+	int		is_first = 1;
-+	struct ep_td_struct	*last_dtd = NULL, *dtd;
-+	dma_addr_t dma;
-+
-+	do {
-+		dtd = fsl_build_dtd(req, &count, &dma, &is_last);
-+		if (dtd == NULL)
-+			return -ENOMEM;
-+
-+		if (is_first) {
-+			is_first = 0;
-+			req->head = dtd;
-+		} else {
-+			last_dtd->next_td_ptr = hc32_to_cpu(dma);
-+			last_dtd->next_td_virt = dtd;
-+		}
-+		last_dtd = dtd;
-+
-+		req->dtd_count++;
-+	} while (!is_last);
-+
-+	dtd->next_td_ptr = cpu_to_hc32(DTD_NEXT_TERMINATE);
-+
-+	req->tail = dtd;
-+
-+	return 0;
-+}
-+
-+/* queues (submits) an I/O request to an endpoint */
-+static int
-+fsl_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags)
-+{
-+	struct fsl_ep *ep = container_of(_ep, struct fsl_ep, ep);
-+	struct fsl_req *req = container_of(_req, struct fsl_req, req);
-+	struct fsl_udc *udc;
-+	unsigned long flags;
-+	int is_iso = 0;
-+
-+	/* catch various bogus parameters */
-+	if (!_req || !req->req.complete || !req->req.buf
-+			|| !list_empty(&req->queue)) {
-+		VDBG("%s, bad params\n", __FUNCTION__);
-+		return -EINVAL;
-+	}
-+	if (!_ep || (!ep->desc && ep_index(ep))) {
-+		VDBG("%s, bad ep\n", __FUNCTION__);
-+		return -EINVAL;
-+	}
-+	if (ep->desc->bmAttributes == USB_ENDPOINT_XFER_ISOC) {
-+		if (req->req.length > ep->ep.maxpacket)
-+			return -EMSGSIZE;
-+		is_iso = 1;
-+	}
-+
-+	udc = ep->udc;
-+	if (!udc->driver || udc->gadget.speed == USB_SPEED_UNKNOWN)
-+		return -ESHUTDOWN;
-+
-+	req->ep = ep;
-+
-+	/* map virtual address to hardware */
-+	if (req->req.dma == DMA_ADDR_INVALID) {
-+		req->req.dma = dma_map_single(ep->udc->gadget.dev.parent,
-+					req->req.buf,
-+					req->req.length, ep_is_in(ep)
-+						? DMA_TO_DEVICE
-+						: DMA_FROM_DEVICE);
-+		req->mapped = 1;
-+	} else {
-+		dma_sync_single_for_device(ep->udc->gadget.dev.parent,
-+					req->req.dma, req->req.length,
-+					ep_is_in(ep)
-+						? DMA_TO_DEVICE
-+						: DMA_FROM_DEVICE);
-+		req->mapped = 0;
-+	}
-+
-+	req->req.status = -EINPROGRESS;
-+	req->req.actual = 0;
-+	req->dtd_count = 0;
-+
-+	spin_lock_irqsave(&udc->lock, flags);
-+
-+	/* build dtds and push them to device queue */
-+	if (!fsl_req_to_dtd(req)) {
-+		fsl_queue_td(ep, req);
-+	} else {
-+		spin_unlock_irqrestore(&udc->lock, flags);
-+		return -ENOMEM;
-+	}
-+
-+	/* Update ep0 state */
-+	if ((ep_index(ep) == 0))
-+		udc->ep0_state = DATA_STATE_XMIT;
-+
-+	/* irq handler advances the queue */
-+	if (req != NULL)
-+		list_add_tail(&req->queue, &ep->queue);
-+	spin_unlock_irqrestore(&udc->lock, flags);
-+
-+	return 0;
-+}
-+
-+/* dequeues (cancels, unlinks) an I/O request from an endpoint */
-+static int fsl_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req)
-+{
-+	struct fsl_ep *ep = container_of(_ep, struct fsl_ep, ep);
-+	struct fsl_req *req;
-+	unsigned long flags;
-+	int ep_num, stopped, ret = 0;
-+	u32 epctrl;
-+
-+	if (!_ep || !_req)
-+		return -EINVAL;
-+
-+	spin_lock_irqsave(&ep->udc->lock, flags);
-+	stopped = ep->stopped;
-+
-+	/* Stop the ep before we deal with the queue */
-+	ep->stopped = 1;
-+	ep_num = ep_index(ep);
-+	epctrl = fsl_readl(&dr_regs->endptctrl[ep_num]);
-+	if (ep_is_in(ep))
-+		epctrl &= ~EPCTRL_TX_ENABLE;
-+	else
-+		epctrl &= ~EPCTRL_RX_ENABLE;
-+	fsl_writel(epctrl, &dr_regs->endptctrl[ep_num]);
-+
-+	/* make sure it's actually queued on this endpoint */
-+	list_for_each_entry(req, &ep->queue, queue) {
-+		if (&req->req == _req)
-+			break;
-+	}
-+	if (&req->req != _req) {
-+		ret = -EINVAL;
-+		goto out;
-+	}
-+
-+	/* The request is in progress, or completed but not dequeued */
-+	if (ep->queue.next == &req->queue) {
-+		_req->status = -ECONNRESET;
-+		fsl_ep_fifo_flush(_ep);	/* flush current transfer */
-+
-+		/* The request isn't the last request in this ep queue */
-+		if (req->queue.next != &ep->queue) {
-+			struct ep_queue_head *qh;
-+			struct fsl_req *next_req;
-+
-+			qh = ep->qh;
-+			next_req = list_entry(req->queue.next, struct fsl_req,
-+					queue);
-+
-+			/* Point the QH to the first TD of next request */
-+			fsl_writel((u32) next_req->head, &qh->curr_dtd_ptr);
-+		}
-+
-+		/* The request hasn't been processed, patch up the TD chain */
-+	} else {
-+		struct fsl_req *prev_req;
-+
-+		prev_req = list_entry(req->queue.prev, struct fsl_req, queue);
-+		fsl_writel(fsl_readl(&req->tail->next_td_ptr),
-+				&prev_req->tail->next_td_ptr);
-+
-+	}
-+
-+	done(ep, req, -ECONNRESET);
-+
-+	/* Enable EP */
-+out:	epctrl = fsl_readl(&dr_regs->endptctrl[ep_num]);
-+	if (ep_is_in(ep))
-+		epctrl |= EPCTRL_TX_ENABLE;
-+	else
-+		epctrl |= EPCTRL_RX_ENABLE;
-+	fsl_writel(epctrl, &dr_regs->endptctrl[ep_num]);
-+	ep->stopped = stopped;
-+
-+	spin_unlock_irqrestore(&ep->udc->lock, flags);
-+	return ret;
-+}
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/*-----------------------------------------------------------------
-+ * modify the endpoint halt feature
-+ * @ep: the non-isochronous endpoint being stalled
-+ * @value: 1--set halt  0--clear halt
-+ * Returns zero, or a negative error code.
-+*----------------------------------------------------------------*/
-+static int fsl_ep_set_halt(struct usb_ep *_ep, int value)
-+{
-+	struct fsl_ep *ep = NULL;
-+	unsigned long flags = 0;
-+	int status = -EOPNOTSUPP;	/* operation not supported */
-+	unsigned char ep_dir = 0, ep_num = 0;
-+	struct fsl_udc *udc = NULL;
-+
-+	ep = container_of(_ep, struct fsl_ep, ep);
-+	udc = ep->udc;
-+	if (!_ep || !ep->desc) {
-+		status = -EINVAL;
-+		goto out;
-+	}
-+
-+	if (ep->desc->bmAttributes == USB_ENDPOINT_XFER_ISOC) {
-+		status = -EOPNOTSUPP;
-+		goto out;
-+	}
-+
-+	/* Attempt to halt IN ep will fail if any transfer requests
-+	 * are still queue */
-+	if (value && ep_is_in(ep) && !list_empty(&ep->queue)) {
-+		status = -EAGAIN;
-+		goto out;
-+	}
-+
-+	status = 0;
-+	ep_dir = ep_is_in(ep) ? USB_SEND : USB_RECV;
-+	ep_num = (unsigned char)(ep_index(ep));
-+	spin_lock_irqsave(&ep->udc->lock, flags);
-+	dr_ep_change_stall(ep_num, ep_dir, value);
-+	spin_unlock_irqrestore(&ep->udc->lock, flags);
-+
-+	if (ep_index(ep) == 0) {
-+		udc->ep0_state = WAIT_FOR_SETUP;
-+		udc->ep0_dir = 0;
-+	}
-+out:
-+	VDBG(" %s %s halt stat %d", ep->ep.name,
-+			value ?  "set" : "clear", status);
-+
-+	return status;
-+}
-+
-+static void fsl_ep_fifo_flush(struct usb_ep *_ep)
-+{
-+	struct fsl_ep *ep;
-+	int ep_num, ep_dir;
-+	u32 bits;
-+	unsigned long timeout;
-+#define FSL_UDC_FLUSH_TIMEOUT 1000
-+
-+	if (!_ep) {
-+		return;
-+	} else {
-+		ep = container_of(_ep, struct fsl_ep, ep);
-+		if (!ep->desc)
-+			return;
-+	}
-+	ep_num = ep_index(ep);
-+	ep_dir = ep_is_in(ep) ? USB_SEND : USB_RECV;
-+
-+	if (ep_num == 0)
-+		bits = (1 << 16) | 1;
-+	else if (ep_dir == USB_SEND)
-+		bits = 1 << (16 + ep_num);
-+	else
-+		bits = 1 << ep_num;
-+
-+	timeout = jiffies + FSL_UDC_FLUSH_TIMEOUT;
-+	do {
-+		fsl_writel(bits, &dr_regs->endptflush);
-+
-+		/* Wait until flush complete */
-+		while (fsl_readl(&dr_regs->endptflush)) {
-+			if (time_after(jiffies, timeout)) {
-+				ERR("ep flush timeout\n");
-+				return;
-+			}
-+			cpu_relax();
-+		}
-+		/* See if we need to flush again */
-+	} while (fsl_readl(&dr_regs->endptstatus) & bits);
-+}
-+
-+static struct usb_ep_ops fsl_ep_ops = {
-+	.enable = fsl_ep_enable,
-+	.disable = fsl_ep_disable,
-+
-+	.alloc_request = fsl_alloc_request,
-+	.free_request = fsl_free_request,
-+
-+	.queue = fsl_ep_queue,
-+	.dequeue = fsl_ep_dequeue,
-+
-+	.set_halt = fsl_ep_set_halt,
-+	.fifo_flush = fsl_ep_fifo_flush,	/* flush fifo */
-+};
-+
-+/*-------------------------------------------------------------------------
-+		Gadget Driver Layer Operations
-+-------------------------------------------------------------------------*/
-+
-+/*----------------------------------------------------------------------
-+ * Get the current frame number (from DR frame_index Reg )
-+ *----------------------------------------------------------------------*/
-+static int fsl_get_frame(struct usb_gadget *gadget)
-+{
-+	return (int)(fsl_readl(&dr_regs->frindex) & USB_FRINDEX_MASKS);
-+}
-+
-+/*-----------------------------------------------------------------------
-+ * Tries to wake up the host connected to this gadget
-+ -----------------------------------------------------------------------*/
-+static int fsl_wakeup(struct usb_gadget *gadget)
-+{
-+	struct fsl_udc *udc = container_of(gadget, struct fsl_udc, gadget);
-+	u32 portsc;
-+
-+	/* Remote wakeup feature not enabled by host */
-+	if (!udc->remote_wakeup)
-+		return -ENOTSUPP;
-+
-+	portsc = fsl_readl(&dr_regs->portsc1);
-+	/* not suspended? */
-+	if (!(portsc & PORTSCX_PORT_SUSPEND))
-+		return 0;
-+	/* trigger force resume */
-+	portsc |= PORTSCX_PORT_FORCE_RESUME;
-+	fsl_writel(portsc, &dr_regs->portsc1);
-+	return 0;
-+}
-+
-+static int can_pullup(struct fsl_udc *udc)
-+{
-+	return udc->driver && udc->softconnect && udc->vbus_active;
-+}
-+
-+/*
-+ * Notify controller that VBUS is powered, Called by whatever
-+ * detects VBUS sessions
-+ * @param gadger    gadger pointer
-+ * @param is_active is active?
-+ * @return Returns zero on success , or a negative error code
-+ */
-+static int fsl_vbus_session(struct usb_gadget *gadget, int is_active)
-+{
-+	struct fsl_udc	*udc;
-+	unsigned long	flags;
-+
-+	udc = container_of(gadget, struct fsl_udc, gadget);
-+	spin_lock_irqsave(&udc->lock, flags);
-+
-+	pr_debug("udc: VBUS %s\n", is_active ? "on" : "off");
-+	udc->vbus_active = (is_active != 0);
-+
-+	if (can_pullup(udc)) {
-+		pullup_enable(udc);
-+		udc_controller->usb_state = USB_STATE_ATTACHED;
-+	} else {
-+		pullup_disable(udc);
-+		udc_controller->usb_state = USB_STATE_NOTATTACHED;
-+	}
-+	udc_controller->ep0_state = WAIT_FOR_SETUP;
-+	udc_controller->ep0_dir = 0;
-+
-+	spin_unlock_irqrestore(&udc->lock, flags);
-+	return 0;
-+}
-+
-+/* constrain controller's VBUS power usage
-+ * This call is used by gadget drivers during SET_CONFIGURATION calls,
-+ * reporting how much power the device may consume.  For example, this
-+ * could affect how quickly batteries are recharged.
-+ *
-+ * Returns zero on success, else negative errno.
-+ */
-+static int fsl_vbus_draw(struct usb_gadget *gadget, unsigned mA)
-+{
-+#ifdef CONFIG_USB_OTG
-+	struct fsl_udc *udc;
-+
-+	udc = container_of(gadget, struct fsl_udc, gadget);
-+
-+	if (udc->transceiver)
-+		return otg_set_power(udc->transceiver, mA);
-+#endif
-+	return -ENOTSUPP;
-+}
-+
-+/*
-+ * Change Data+ pullup status
-+ * this func is used by usb_gadget_connect/disconnet
-+ */
-+static int fsl_pullup(struct usb_gadget *gadget, int is_on)
-+{
-+	struct fsl_udc *udc;
-+
-+	udc = container_of(gadget, struct fsl_udc, gadget);
-+	udc->softconnect = (is_on != 0);
-+	if (can_pullup(udc))
-+		fsl_writel((fsl_readl(&dr_regs->usbcmd) | USB_CMD_RUN_STOP),
-+				&dr_regs->usbcmd);
-+	else
-+		fsl_writel((fsl_readl(&dr_regs->usbcmd) & ~USB_CMD_RUN_STOP),
-+				&dr_regs->usbcmd);
-+
-+	return 0;
-+}
-+
-+/* defined in usb_gadget.h */
-+static struct usb_gadget_ops fsl_gadget_ops = {
-+	.get_frame = fsl_get_frame,
-+	.wakeup = fsl_wakeup,
-+	.vbus_session = fsl_vbus_session,
-+	.vbus_draw = fsl_vbus_draw,
-+	.pullup = fsl_pullup,
-+};
-+
-+/* Set protocol stall on ep0, protocol stall will automatically be cleared
-+   on new transaction */
-+static void ep0stall(struct fsl_udc *udc)
-+{
-+	u32 tmp;
-+
-+	/* must set tx and rx to stall at the same time */
-+	tmp = fsl_readl(&dr_regs->endptctrl[0]);
-+	tmp |= EPCTRL_TX_EP_STALL | EPCTRL_RX_EP_STALL;
-+	fsl_writel(tmp, &dr_regs->endptctrl[0]);
-+	udc->ep0_state = WAIT_FOR_SETUP;
-+	udc->ep0_dir = 0;
-+}
-+
-+/* Prime a status phase for ep0 */
-+static int ep0_prime_status(struct fsl_udc *udc, int direction)
-+{
-+	struct fsl_req *req = udc->status_req;
-+	struct fsl_ep *ep;
-+	int status = 0;
-+
-+	if (direction == EP_DIR_IN)
-+		udc->ep0_dir = USB_DIR_IN;
-+	else
-+		udc->ep0_dir = USB_DIR_OUT;
-+
-+	ep = &udc->eps[0];
-+	udc->ep0_state = WAIT_FOR_OUT_STATUS;
-+
-+	req->ep = ep;
-+	req->req.length = 0;
-+	req->req.status = -EINPROGRESS;
-+	req->req.actual = 0;
-+	req->req.complete = NULL;
-+	req->dtd_count = 0;
-+
-+	if (fsl_req_to_dtd(req) == 0)
-+		status = fsl_queue_td(ep, req);
-+	else
-+		return -ENOMEM;
-+
-+	if (status)
-+		ERR("Can't queue ep0 status request \n");
-+	list_add_tail(&req->queue, &ep->queue);
-+
-+	return status;
-+}
-+
-+static inline int udc_reset_ep_queue(struct fsl_udc *udc, u8 pipe)
-+{
-+	struct fsl_ep *ep = get_ep_by_pipe(udc, pipe);
-+
-+	if (!ep->name)
-+		return 0;
-+
-+	nuke(ep, -ESHUTDOWN);
-+
-+	return 0;
-+}
-+
-+/*
-+ * ch9 Set address
-+ */
-+static void ch9setaddress(struct fsl_udc *udc, u16 value, u16 index, u16 length)
-+{
-+	/* Save the new address to device struct */
-+	udc->device_address = (u8) value;
-+	/* Update usb state */
-+	udc->usb_state = USB_STATE_ADDRESS;
-+	/* Status phase */
-+	if (ep0_prime_status(udc, EP_DIR_IN))
-+		ep0stall(udc);
-+}
-+
-+/*
-+ * ch9 Get status
-+ */
-+static void ch9getstatus(struct fsl_udc *udc, u8 request_type, u16 value,
-+			 u16 index, u16 length)
-+{
-+	u16 tmp = 0;		/* Status, cpu endian */
-+
-+	struct fsl_req *req;
-+	struct fsl_ep *ep;
-+	int status = 0;
-+
-+	ep = &udc->eps[0];
-+
-+	if ((request_type & USB_RECIP_MASK) == USB_RECIP_DEVICE) {
-+		/* Get device status */
-+		tmp = 1 << USB_DEVICE_SELF_POWERED;
-+		tmp |= udc->remote_wakeup << USB_DEVICE_REMOTE_WAKEUP;
-+	} else if ((request_type & USB_RECIP_MASK) == USB_RECIP_INTERFACE) {
-+		/* Get interface status */
-+		/* We don't have interface information in udc driver */
-+		tmp = 0;
-+	} else if ((request_type & USB_RECIP_MASK) == USB_RECIP_ENDPOINT) {
-+		/* Get endpoint status */
-+		struct fsl_ep *target_ep;
-+
-+		target_ep = get_ep_by_pipe(udc, get_pipe_by_windex(index));
-+
-+		/* stall if endpoint doesn't exist */
-+		if (!target_ep->desc)
-+			goto stall;
-+		tmp = dr_ep_get_stall(ep_index(target_ep), ep_is_in(target_ep))
-+				<< USB_ENDPOINT_HALT;
-+	}
-+
-+	udc->ep0_dir = USB_DIR_IN;
-+	/* Borrow the per device status_req */
-+	req = udc->status_req;
-+	/* Fill in the reqest structure */
-+	*((u16 *) req->req.buf) = cpu_to_le16(tmp);
-+	req->ep = ep;
-+	req->req.length = 2;
-+	req->req.status = -EINPROGRESS;
-+	req->req.actual = 0;
-+	req->req.complete = NULL;
-+	req->dtd_count = 0;
-+
-+	/* prime the data phase */
-+	if ((fsl_req_to_dtd(req) == 0))
-+		status = fsl_queue_td(ep, req);
-+	else			/* no mem */
-+		goto stall;
-+
-+	if (status) {
-+		ERR("Can't respond to getstatus request \n");
-+		goto stall;
-+	}
-+	list_add_tail(&req->queue, &ep->queue);
-+	udc->ep0_state = DATA_STATE_XMIT;
-+	return;
-+stall:
-+	ep0stall(udc);
-+}
-+
-+static void ch9setconfig(struct fsl_udc *udc, u16 value, u16 index,
-+			 u16 length)
-+{
-+	pr_debug("udc: 1 calling gadget driver->setup\n");
-+	udc->ep0_dir = USB_DIR_IN;
-+	if (udc->driver->setup(&udc->gadget, &udc->local_setup_buff) >= 0) {
-+		/* gadget layer deal with the status phase */
-+		udc->usb_state = USB_STATE_CONFIGURED;
-+		udc->ep0_state = WAIT_FOR_OUT_STATUS;
-+		pr_debug("udc: ep0_state now WAIT_FOR_OUT_STATUS\n");
-+	}
-+}
-+
-+static void setup_received_irq(struct fsl_udc *udc,
-+			       struct usb_ctrlrequest *setup)
-+{
-+	u32 tmp;
-+	u16 ptc = 0;		/* port test control */
-+	int handled = 1;	/* set to zero if we do not handle the message,
-+				   and should pass it to the gadget driver */
-+
-+	/*
-+	 * gadget drivers expect the setup pkt to be in wire format,
-+	 * so leave it alone and make local copies of stuff we need.
-+	 */
-+	u16 wValue = le16_to_cpu(setup->wValue);
-+	u16 wIndex = le16_to_cpu(setup->wIndex);
-+	u16 wLength = le16_to_cpu(setup->wLength);
-+
-+
-+	pr_debug("udc: request=0x%x\n", setup->bRequest);
-+
-+	udc_reset_ep_queue(udc, 0);
-+
-+	/* We asume setup only occurs on EP0 */
-+	if (setup->bRequestType & USB_DIR_IN)
-+		udc->ep0_dir = USB_DIR_IN;
-+	else
-+		udc->ep0_dir = USB_DIR_OUT;
-+
-+	if ((setup->bRequestType & USB_TYPE_MASK) == USB_TYPE_CLASS) {
-+		/* handle class requests */
-+		switch (setup->bRequest) {
-+
-+		case USB_BULK_RESET_REQUEST:
-+			udc->ep0_dir = USB_DIR_IN;
-+			if (udc->driver->setup(&udc->gadget,
-+					       &udc->local_setup_buff) >= 0) {
-+				udc->ep0_state = WAIT_FOR_SETUP;
-+				pr_debug("udc: ep0_state now WAIT_FOR_SETUP\n");
-+			}
-+			break;
-+
-+		default:
-+			handled = 0;
-+			break;
-+		}
-+	} else if ((setup->bRequestType & USB_TYPE_MASK) == USB_TYPE_STANDARD) {
-+		/* handle standard requests */
-+		switch (setup->bRequest) {
-+
-+		case USB_REQ_GET_STATUS:
-+			if ((setup->
-+			     bRequestType & (USB_DIR_IN | USB_TYPE_STANDARD))
-+			    != (USB_DIR_IN | USB_TYPE_STANDARD))
-+				break;
-+			ch9getstatus(udc, setup->bRequestType, wValue, wIndex,
-+				     wLength);
-+			break;
-+
-+		case USB_REQ_SET_ADDRESS:
-+			if (setup->bRequestType !=
-+			    (USB_DIR_OUT | USB_TYPE_STANDARD |
-+			     USB_RECIP_DEVICE))
-+				break;
-+			ch9setaddress(udc, wValue, wIndex, wLength);
-+			break;
-+
-+		case USB_REQ_SET_CONFIGURATION:
-+			if (setup->bRequestType !=
-+			    (USB_DIR_OUT | USB_TYPE_STANDARD |
-+			     USB_RECIP_DEVICE))
-+				break;
-+			/* gadget layer take over the status phase */
-+			ch9setconfig(udc, wValue, wIndex, wLength);
-+			break;
-+		case USB_REQ_SET_INTERFACE:
-+			if (setup->bRequestType !=
-+			    (USB_DIR_OUT | USB_TYPE_STANDARD |
-+			     USB_RECIP_INTERFACE))
-+				break;
-+			udc->ep0_dir = USB_DIR_IN;
-+			if (udc->driver->setup(&udc->gadget,
-+					       &udc->local_setup_buff) >= 0)
-+				/* gadget layer take over the status phase */
-+				break;
-+			/* Requests with no data phase */
-+		case USB_REQ_CLEAR_FEATURE:
-+		case USB_REQ_SET_FEATURE:
-+			{	/* status transaction */
-+				int rc = -EOPNOTSUPP;
-+
-+				if ((setup->bRequestType & USB_TYPE_MASK) !=
-+				    USB_TYPE_STANDARD)
-+					break;
-+
-+				/* we only support set/clear feature for
-+				 * endpoint */
-+				if (setup->bRequestType == USB_RECIP_ENDPOINT) {
-+					int dir = (wIndex & 0x0080) ?
-+					    EP_DIR_IN : EP_DIR_OUT;
-+					int num = (wIndex & 0x000f);
-+					struct fsl_ep *ep;
-+
-+					if (wValue != 0
-+					    || wLength != 0
-+					    || (num * 2 + dir) > udc->max_ep)
-+						break;
-+					ep = &udc->eps[num * 2 + dir];
-+
-+					if (setup->bRequest ==
-+					    USB_REQ_SET_FEATURE) {
-+						pr_debug("udc: udc: SET_FEATURE"
-+							 " doing set_halt\n");
-+						rc = fsl_ep_set_halt(&ep-> ep,
-+								     1);
-+					} else {
-+						pr_debug("udc: CLEAR_FEATURE"
-+							 " doing clear_halt\n");
-+						rc = fsl_ep_set_halt(&ep-> ep,
-+								     0);
-+					}
-+
-+				} else if (setup->bRequestType ==
-+					   USB_RECIP_DEVICE) {
-+					if (setup->bRequest ==
-+					    USB_REQ_SET_FEATURE) {
-+						ptc = wIndex >> 8;
-+						rc = 0;
-+					}
-+					if (!udc->gadget.is_otg)
-+						break;
-+					else if (setup->bRequest ==
-+						 USB_DEVICE_B_HNP_ENABLE)
-+						udc->gadget.b_hnp_enable = 1;
-+					else if (setup->bRequest ==
-+						 USB_DEVICE_A_HNP_SUPPORT)
-+						udc->gadget.a_hnp_support = 1;
-+					else if (setup->bRequest ==
-+						 USB_DEVICE_A_ALT_HNP_SUPPORT)
-+						udc->gadget.a_alt_hnp_support =
-+						    1;
-+					rc = 0;
-+				}
-+				if (rc == 0) {
-+					/* send status only if
-+					 * fsl_ep_set_halt success */
-+					if (ep0_prime_status(udc, EP_DIR_IN))
-+						ep0stall(udc);
-+				}
-+				break;
-+			}
-+		default:
-+			handled = 0;
-+			break;
-+		}
-+	} else {
-+		/* vendor requests */
-+		handled = 0;
-+	}
-+
-+	if (!handled) {
-+		if (udc->driver->setup(&udc->gadget, &udc->local_setup_buff)
-+		    != 0) {
-+			ep0stall(udc);
-+		} else if (setup->bRequestType & USB_DIR_IN) {
-+			udc->ep0_state = DATA_STATE_XMIT;
-+			pr_debug("udc: ep0_state now DATA_STATE_XMIT\n");
-+		} else {
-+			udc->ep0_state = DATA_STATE_RECV;
-+			pr_debug("udc: ep0_state now DATA_STATE_RECV\n");
-+		}
-+	}
-+
-+	if (ptc) {
-+		tmp =fsl_readl(&dr_regs->portsc1) | ptc << 16;
-+		fsl_writel(tmp, &dr_regs->portsc1);
-+		pr_debug("udc: switch to test mode.\n");
-+	}
-+}
-+
-+/* Process request for Data or Status phase of ep0
-+ * prime status phase if needed */
-+static void ep0_req_complete(struct fsl_udc *udc, struct fsl_ep *ep0,
-+		struct fsl_req *req)
-+{
-+	if (udc->usb_state == USB_STATE_ADDRESS) {
-+		/* Set the new address */
-+		u32 new_address = (u32) udc->device_address;
-+		fsl_writel(new_address << USB_DEVICE_ADDRESS_BIT_POS,
-+				&dr_regs->deviceaddr);
-+	}
-+
-+	done(ep0, req, 0);
-+
-+	switch (udc->ep0_state) {
-+	case DATA_STATE_XMIT:
-+		/* receive status phase */
-+		if (ep0_prime_status(udc, EP_DIR_OUT))
-+			ep0stall(udc);
-+		break;
-+	case DATA_STATE_RECV:
-+		/* send status phase */
-+		if (ep0_prime_status(udc, EP_DIR_IN))
-+			ep0stall(udc);
-+		break;
-+	case WAIT_FOR_OUT_STATUS:
-+		udc->ep0_state = WAIT_FOR_SETUP;
-+		break;
-+	case WAIT_FOR_SETUP:
-+		ERR("Unexpect ep0 packets \n");
-+		break;
-+	default:
-+		ep0stall(udc);
-+		break;
-+	}
-+}
-+
-+/* Tripwire mechanism to ensure a setup packet payload is extracted without
-+ * being corrupted by another incoming setup packet */
-+static void tripwire_handler(struct fsl_udc *udc, u8 ep_num, u8 *buffer_ptr)
-+{
-+	u32 temp;
-+	struct ep_queue_head *qh;
-+	struct fsl_usb2_platform_data *pdata = udc->pdata;
-+
-+	qh = &udc->ep_qh[ep_num * 2 + EP_DIR_OUT];
-+
-+	/* Clear bit in ENDPTSETUPSTAT */
-+	temp = fsl_readl(&dr_regs->endptsetupstat);
-+	fsl_writel(temp | (1 << ep_num), &dr_regs->endptsetupstat);
-+
-+	/* while a hazard exists when setup package arrives */
-+	do {
-+		/* Set Setup Tripwire */
-+		temp = fsl_readl(&dr_regs->usbcmd);
-+		fsl_writel(temp | USB_CMD_SUTW, &dr_regs->usbcmd);
-+
-+		/* Copy the setup packet to local buffer */
-+		if (pdata->le_setup_buf) {
-+			u32 *p = (u32 *)buffer_ptr;
-+			u32 *s = (u32 *)qh->setup_buffer;
-+			
-+			/* Convert little endian setup buffer to CPU endian */
-+			*p++ = le32_to_cpu(*s++);
-+			*p = le32_to_cpu(*s);
-+		} else {
-+			memcpy(buffer_ptr, (u8 *) qh->setup_buffer, 8);
-+		}
-+	} while (!(fsl_readl(&dr_regs->usbcmd) & USB_CMD_SUTW));
-+
-+	/* Clear Setup Tripwire */
-+	temp = fsl_readl(&dr_regs->usbcmd);
-+	fsl_writel(temp & ~USB_CMD_SUTW, &dr_regs->usbcmd);
-+}
-+
-+/* process-ep_req(): free the completed Tds for this req */
-+static int process_ep_req(struct fsl_udc *udc, int pipe,
-+		struct fsl_req *curr_req)
-+{
-+	struct ep_td_struct *curr_td;
-+	int	td_complete, actual, remaining_length, j, tmp;
-+	int	status = 0;
-+	int	errors = 0;
-+	struct  ep_queue_head *curr_qh = &udc->ep_qh[pipe];
-+	int direction = pipe % 2;
-+
-+	curr_td = curr_req->head;
-+	td_complete = 0;
-+	actual = curr_req->req.length;
-+
-+	for (j = 0; j < curr_req->dtd_count; j++) {
-+		remaining_length = (hc32_to_cpu(curr_td->size_ioc_sts)
-+					& DTD_PACKET_SIZE)
-+				>> DTD_LENGTH_BIT_POS;
-+		actual -= remaining_length;
-+
-+		(errors = hc32_to_cpu(curr_td->size_ioc_sts) & DTD_ERROR_MASK);
-+		if (errors) {
-+			if (errors & DTD_STATUS_HALTED) {
-+				ERR("dTD error %08x QH=%d\n", errors, pipe);
-+				/* Clear the errors and Halt condition */
-+				tmp = hc32_to_cpu(curr_qh->size_ioc_int_sts);
-+				tmp &= ~errors;
-+				curr_qh->size_ioc_int_sts = cpu_to_hc32(tmp);
-+				status = -EPIPE;
-+				/* FIXME: continue with next queued TD? */
-+
-+				break;
-+			}
-+			if (errors & DTD_STATUS_DATA_BUFF_ERR) {
-+				VDBG("Transfer overflow");
-+				status = -EPROTO;
-+				break;
-+			} else if (errors & DTD_STATUS_TRANSACTION_ERR) {
-+				VDBG("ISO error");
-+				status = -EILSEQ;
-+				break;
-+			} else
-+				ERR("Unknown error has occured (0x%x)!\r\n",
-+					errors);
-+
-+		} else if (hc32_to_cpu(curr_td->size_ioc_sts) &
-+					DTD_STATUS_ACTIVE) {
-+			VDBG("Request not complete");
-+			status = REQ_UNCOMPLETE;
-+			return status;
-+		} else if (remaining_length) {
-+			if (direction) {
-+				VDBG("Transmit dTD remaining length not zero");
-+				status = -EPROTO;
-+				break;
-+			} else {
-+				td_complete++;
-+				break;
-+			}
-+		} else {
-+			td_complete++;
-+			VDBG("dTD transmitted successful ");
-+		}
-+
-+		if (j != curr_req->dtd_count - 1)
-+			curr_td = curr_td->next_td_virt;
-+	}
-+
-+	if (status)
-+		return status;
-+
-+	curr_req->req.actual = actual;
-+
-+	return 0;
-+}
-+
-+/* Process a DTD completion interrupt */
-+static void dtd_complete_irq(struct fsl_udc *udc)
-+{
-+	u32 bit_pos;
-+	int i, ep_num, direction, bit_mask, status;
-+	struct fsl_ep *curr_ep;
-+	struct fsl_req *curr_req, *temp_req;
-+
-+	/* Clear the bits in the register */
-+	bit_pos = fsl_readl(&dr_regs->endptcomplete);
-+	fsl_writel(bit_pos, &dr_regs->endptcomplete);
-+
-+	if (!bit_pos)
-+		return;
-+
-+	for (i = 0; i < udc->max_ep * 2; i++) {
-+		ep_num = i >> 1;
-+		direction = i % 2;
-+
-+		bit_mask = 1 << (ep_num + 16 * direction);
-+
-+		if (!(bit_pos & bit_mask))
-+			continue;
-+
-+		curr_ep = get_ep_by_pipe(udc, i);
-+
-+		/* If the ep is configured */
-+		if (curr_ep->name == NULL) {
-+			WARN("Invalid EP?");
-+			continue;
-+		}
-+
-+		/* process the req queue until an uncomplete request */
-+		list_for_each_entry_safe(curr_req, temp_req, &curr_ep->queue,
-+				queue) {
-+			status = process_ep_req(udc, i, curr_req);
-+
-+			VDBG("status of process_ep_req= %d, ep = %d",
-+					status, ep_num);
-+			if (status == REQ_UNCOMPLETE)
-+				break;
-+			/* write back status to req */
-+			curr_req->req.status = status;
-+
-+			if (ep_num == 0) {
-+				ep0_req_complete(udc, curr_ep, curr_req);
-+				break;
-+			} else {
-+				done(curr_ep, curr_req, status);
-+			}
-+		}
-+	}
-+}
-+
-+/* Process a port change interrupt */
-+static void port_change_irq(struct fsl_udc *udc)
-+{
-+	u32 speed;
-+
-+	VDBG("portsc=0x%x", fsl_readl(&dr_regs->portsc1) );
-+	if (udc->bus_reset)
-+		udc->bus_reset = 0;
-+
-+	/* Bus resetting is finished */
-+	if (!(fsl_readl(&dr_regs->portsc1) & PORTSCX_PORT_RESET)) {
-+		/* Get the speed */
-+		speed = fsl_readl(&dr_regs->portsc1) & PORTSCX_PORT_SPEED_MASK;
-+		switch (speed) {
-+		case PORTSCX_PORT_SPEED_HIGH:
-+			udc->gadget.speed = USB_SPEED_HIGH;
-+			break;
-+		case PORTSCX_PORT_SPEED_FULL:
-+			udc->gadget.speed = USB_SPEED_FULL;
-+			break;
-+		case PORTSCX_PORT_SPEED_LOW:
-+			udc->gadget.speed = USB_SPEED_LOW;
-+			break;
-+		default:
-+			udc->gadget.speed = USB_SPEED_UNKNOWN;
-+			break;
-+		}
-+	}
-+
-+	/* Update USB state */
-+	if (!udc->resume_state)
-+		udc->usb_state = USB_STATE_DEFAULT;
-+}
-+
-+/* Process suspend interrupt */
-+static void suspend_irq(struct fsl_udc *udc)
-+{
-+	udc->resume_state = udc->usb_state;
-+	udc->usb_state = USB_STATE_SUSPENDED;
-+
-+	/* report suspend to the driver, serial.c does not support this */
-+	if (udc->driver->suspend)
-+		udc->driver->suspend(&udc->gadget);
-+}
-+
-+static void bus_resume(struct fsl_udc *udc)
-+{
-+	udc->usb_state = udc->resume_state;
-+	udc->resume_state = 0;
-+
-+	/* report resume to the driver, serial.c does not support this */
-+	if (udc->driver->resume)
-+		udc->driver->resume(&udc->gadget);
-+}
-+
-+/* Clear up all ep queues */
-+static int reset_queues(struct fsl_udc *udc)
-+{
-+	u8 pipe;
-+
-+	for (pipe = 0; pipe < udc->max_pipes; pipe++)
-+		udc_reset_ep_queue(udc, pipe);
-+
-+	/* report disconnect; the driver is already quiesced */
-+	udc->driver->disconnect(&udc->gadget);
-+
-+	return 0;
-+}
-+
-+/* Process reset interrupt */
-+static void reset_irq(struct fsl_udc *udc)
-+{
-+	u32 temp;
-+	unsigned long timeout;
-+
-+	/* Clear the device address */
-+	temp = fsl_readl(&dr_regs->deviceaddr);
-+	fsl_writel(temp & ~USB_DEVICE_ADDRESS_MASK, &dr_regs->deviceaddr);
-+
-+	udc->device_address = 0;
-+
-+	/* Clear usb state */
-+	udc->resume_state = 0;
-+	udc->ep0_dir = 0;
-+	udc->ep0_state = WAIT_FOR_SETUP;
-+	udc->remote_wakeup = 0;	/* default to 0 on reset */
-+	udc->gadget.b_hnp_enable = 0;
-+	udc->gadget.a_hnp_support = 0;
-+	udc->gadget.a_alt_hnp_support = 0;
-+
-+	/* Clear all the setup token semaphores */
-+	temp = fsl_readl(&dr_regs->endptsetupstat);
-+	fsl_writel(temp, &dr_regs->endptsetupstat);
-+
-+	/* Clear all the endpoint complete status bits */
-+	temp = fsl_readl(&dr_regs->endptcomplete);
-+	fsl_writel(temp, &dr_regs->endptcomplete);
-+
-+	timeout = jiffies + 100;
-+	while (fsl_readl(&dr_regs->endpointprime)) {
-+		/* Wait until all endptprime bits cleared */
-+		if (time_after(jiffies, timeout)) {
-+			ERR("Timeout for reset\n");
-+			break;
-+		}
-+		cpu_relax();
-+	}
-+
-+	/* Write 1s to the flush register */
-+	fsl_writel(0xffffffff, &dr_regs->endptflush);
-+
-+	if (fsl_readl(&dr_regs->portsc1) & PORTSCX_PORT_RESET) {
-+		VDBG("Bus reset");
-+		/* Bus is reseting */
-+		udc->bus_reset = 1;
-+		/* Reset all the queues, include XD, dTD, EP queue
-+		 * head and TR Queue */
-+		reset_queues(udc);
-+		udc->usb_state = USB_STATE_DEFAULT;
-+	} else {
-+		VDBG("Controller reset");
-+		/* initialize usb hw reg except for regs for EP, not
-+		 * touch usbintr reg */
-+		dr_controller_setup(udc);
-+
-+		/* Reset all internal used Queues */
-+		reset_queues(udc);
-+
-+		ep0_setup(udc);
-+
-+		/* Enable DR IRQ reg, Set Run bit, change udc state */
-+		dr_controller_run(udc);
-+		udc->usb_state = USB_STATE_ATTACHED;
-+	}
-+}
-+
-+/*
-+ * USB device controller interrupt handler
-+ */
-+static irqreturn_t fsl_udc_irq(int irq, void *_udc)
-+{
-+	struct fsl_udc *udc = _udc;
-+	u32 irq_src;
-+	irqreturn_t status = IRQ_NONE;
-+	unsigned long flags;
-+
-+	/* Disable ISR for OTG host mode */
-+	if (udc->stopped)
-+		return IRQ_NONE;
-+	spin_lock_irqsave(&udc->lock, flags);
-+	irq_src = fsl_readl(&dr_regs->usbsts) & fsl_readl(&dr_regs->usbintr);
-+	/* Clear notification bits */
-+	fsl_writel(irq_src, &dr_regs->usbsts);
-+
-+	VDBG("irq_src [0x%8x]  portsc=0x%x", irq_src,
-+	     fsl_readl(&dr_regs->portsc1));
-+
-+	/* Need to resume? */
-+	if (udc->usb_state == USB_STATE_SUSPENDED)
-+		if ((fsl_readl(&dr_regs->portsc1) & PORTSCX_PORT_SUSPEND) == 0)
-+			bus_resume(udc);
-+
-+	/* USB Interrupt */
-+	if (irq_src & USB_STS_INT) {
-+		VDBG("Packet int");
-+		/* Setup package, we only support ep0 as control ep */
-+		if (fsl_readl(&dr_regs->endptsetupstat) & EP_SETUP_STATUS_EP0) {
-+			tripwire_handler(udc, 0,
-+					(u8 *) (&udc->local_setup_buff));
-+			setup_received_irq(udc, &udc->local_setup_buff);
-+			status = IRQ_HANDLED;
-+		}
-+
-+		/* completion of dtd */
-+		if (fsl_readl(&dr_regs->endptcomplete)) {
-+			dtd_complete_irq(udc);
-+			status = IRQ_HANDLED;
-+		}
-+	}
-+
-+	/* SOF (for ISO transfer) */
-+	if (irq_src & USB_STS_SOF) {
-+		status = IRQ_HANDLED;
-+	}
-+
-+	/* Port Change */
-+	if (irq_src & USB_STS_PORT_CHANGE) {
-+		port_change_irq(udc);
-+		status = IRQ_HANDLED;
-+	}
-+
-+	/* Reset Received */
-+	if (irq_src & USB_STS_RESET) {
-+		reset_irq(udc);
-+		status = IRQ_HANDLED;
-+	}
-+
-+	/* Sleep Enable (Suspend) */
-+	if (irq_src & USB_STS_SUSPEND) {
-+		suspend_irq(udc);
-+		status = IRQ_HANDLED;
-+	}
-+
-+	if (irq_src & (USB_STS_ERR | USB_STS_SYS_ERR)) {
-+		VDBG("Error IRQ %x ", irq_src);
-+	}
-+
-+	spin_unlock_irqrestore(&udc->lock, flags);
-+	return status;
-+}
-+
-+/*----------------------------------------------------------------*
-+ * Hook to gadget drivers
-+ * Called by initialization code of gadget drivers
-+*----------------------------------------------------------------*/
-+int usb_gadget_register_driver(struct usb_gadget_driver *driver)
-+{
-+	int retval = -ENODEV;
-+	unsigned long flags = 0;
-+	struct fsl_udc *udc = udc_controller;
-+
-+	pr_debug("udc: udc=0x%p\n", udc);
-+
-+	if (!udc)
-+		return -ENODEV;
-+
-+	if (!driver || (driver->speed != USB_SPEED_FULL
-+			&& driver->speed != USB_SPEED_HIGH)
-+			|| !driver->bind || !driver->disconnect
-+			|| !driver->setup)
-+		return -EINVAL;
-+
-+	if (udc->driver)
-+		return -EBUSY;
-+
-+	/* lock is needed but whether should use this lock or another */
-+	spin_lock_irqsave(&udc->lock, flags);
-+
-+	driver->driver.bus = 0;
-+	udc->softconnect = 1;
-+	/* hook up the driver */
-+	udc->driver = driver;
-+	udc->gadget.dev.driver = &driver->driver;
-+	spin_unlock_irqrestore(&udc->lock, flags);
-+
-+	/* bind udc driver to gadget driver */
-+	retval = driver->bind(&udc->gadget);
-+	if (retval) {
-+		pr_debug("bind to %s --> %d\n", driver->driver.name, retval);
-+		udc->gadget.dev.driver = 0;
-+		udc->driver = 0;
-+		goto out;
-+	}
-+
-+	/* Enable DR IRQ reg and Set usbcmd reg  Run bit */
-+	if (udc->transceiver) {
-+		/* Suspend the controller until OTG enables it */
-+		udc_suspend(udc);
-+		pr_debug("udc: suspend udc for OTG auto detect \n");
-+
-+		/* Export udc suspend/resume call to OTG */
-+		udc->gadget.dev.parent->driver->suspend = fsl_udc_suspend;
-+		udc->gadget.dev.parent->driver->resume = fsl_udc_resume;
-+
-+		retval = otg_set_peripheral(udc->transceiver, &udc->gadget);
-+		if (retval < 0) {
-+			printk(KERN_ERR "can't bind to transceiver\n");
-+			driver->unbind(&udc->gadget);
-+			udc->gadget.dev.driver = 0;
-+			udc->driver = 0;
-+			return retval;
-+		}
-+	} else {
-+		/* Enable DR IRQ reg and Set usbcmd reg  Run bit */
-+		dr_controller_run(udc);
-+		udc->usb_state = USB_STATE_ATTACHED;
-+		udc->ep0_state = WAIT_FOR_SETUP;
-+		pr_debug("udc: ep0_state now WAIT_FOR_SETUP\n");
-+		udc->ep0_dir = 0;
-+	}
-+
-+	printk(KERN_INFO "%s: bind to driver %s \n", udc->gadget.name,
-+		driver->driver.name);
-+
-+out:
-+	return retval;
-+}
-+EXPORT_SYMBOL(usb_gadget_register_driver);
-+
-+/* Disconnect from gadget driver */
-+int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
-+{
-+	struct fsl_ep *loop_ep;
-+	unsigned long flags;
-+
-+	if (!udc_controller)
-+		return -ENODEV;
-+
-+	if (!driver || driver != udc_controller->driver || !driver->unbind)
-+		return -EINVAL;
-+
-+#ifdef CONFIG_USB_OTG
-+	if (udc_controller->transceiver)
-+		(void)otg_set_peripheral(udc_controller->transceiver, 0);
-+#endif
-+
-+	/* stop DR, disable intr */
-+	dr_controller_stop(udc_controller);
-+
-+	/* in fact, no needed */
-+	udc_controller->usb_state = USB_STATE_ATTACHED;
-+	udc_controller->ep0_state = WAIT_FOR_SETUP;
-+	udc_controller->ep0_dir = 0;
-+
-+	/* stand operation */
-+	spin_lock_irqsave(&udc_controller->lock, flags);
-+	udc_controller->gadget.speed = USB_SPEED_UNKNOWN;
-+	nuke(&udc_controller->eps[0], -ESHUTDOWN);
-+	list_for_each_entry(loop_ep, &udc_controller->gadget.ep_list,
-+			ep.ep_list)
-+		nuke(loop_ep, -ESHUTDOWN);
-+	spin_unlock_irqrestore(&udc_controller->lock, flags);
-+
-+	/* unbind gadget and unhook driver. */
-+	driver->unbind(&udc_controller->gadget);
-+	udc_controller->gadget.dev.driver = 0;
-+	udc_controller->driver = 0;
-+
-+	printk(KERN_INFO "unregistered gadget '%s'\n", driver->driver.name);
-+	return 0;
-+}
-+EXPORT_SYMBOL(usb_gadget_unregister_driver);
-+
-+/*-------------------------------------------------------------------------
-+		PROC File System Support
-+-------------------------------------------------------------------------*/
-+#ifdef CONFIG_USB_GADGET_DEBUG_FILES
-+
-+#include <linux/seq_file.h>
-+
-+static const char proc_filename[] = "driver/fsl_usb2_udc";
-+
-+static int fsl_proc_read(char *page, char **start, off_t off, int count,
-+		int *eof, void *_dev)
-+{
-+	char *buf = page;
-+	char *next = buf;
-+	unsigned size = count;
-+	unsigned long flags;
-+	int t, i;
-+	u32 tmp_reg;
-+	struct fsl_ep *ep = NULL;
-+	struct fsl_req *req;
-+
-+	struct fsl_udc *udc = udc_controller;
-+	if (off != 0)
-+		return 0;
-+
-+	spin_lock_irqsave(&udc->lock, flags);
-+
-+	/* ------basic driver infomation ---- */
-+	t = scnprintf(next, size,
-+			DRIVER_DESC "\n"
-+			"%s version: %s\n"
-+			"Gadget driver: %s\n\n",
-+			driver_name, DRIVER_VERSION,
-+			udc->driver ? udc->driver->driver.name : "(none)");
-+	size -= t;
-+	next += t;
-+
-+	/* ------ DR Registers ----- */
-+	tmp_reg = fsl_readl(&dr_regs->usbcmd);
-+	t = scnprintf(next, size,
-+			"USBCMD reg: 0x%08x\n"
-+			"\tSetupTW: %d\n"
-+			"\tRun/Stop: %s\n\n",
-+			tmp_reg,
-+			(tmp_reg & USB_CMD_SUTW) ? 1 : 0,
-+			(tmp_reg & USB_CMD_RUN_STOP) ? "Run" : "Stop");
-+	size -= t;
-+	next += t;
-+
-+	tmp_reg = fsl_readl(&dr_regs->usbsts);
-+	t = scnprintf(next, size,
-+			"USB Status Reg: 0x%08x\n"
-+			"\tDr Suspend: %d   Reset Received: %d   "
-+			"System Error: %s  USB Error Interrupt: %s\n\n",
-+			tmp_reg,
-+			(tmp_reg & USB_STS_SUSPEND) ? 1 : 0,
-+			(tmp_reg & USB_STS_RESET) ? 1 : 0,
-+			(tmp_reg & USB_STS_SYS_ERR) ? "Err" : "Normal",
-+			(tmp_reg & USB_STS_ERR) ? "Err detected" : "No err");
-+	size -= t;
-+	next += t;
-+
-+	tmp_reg = fsl_readl(&dr_regs->usbintr);
-+	t = scnprintf(next, size,
-+			"USB Interrupt Enable Reg: 0x%08x\n"
-+			"\tSleep Enable: %d   SOF Received Enable: %d  "
-+			"Reset Enable: %d\n"
-+			"\tSystem Error Enable: %d  "
-+			"Port Change Dectected Enable: %d\n"
-+			"\tUSB Error Intr Enable: %d  USB Intr Enable: %d\n\n",
-+			tmp_reg,
-+			(tmp_reg & USB_INTR_DEVICE_SUSPEND) ? 1 : 0,
-+			(tmp_reg & USB_INTR_SOF_EN) ? 1 : 0,
-+			(tmp_reg & USB_INTR_RESET_EN) ? 1 : 0,
-+			(tmp_reg & USB_INTR_SYS_ERR_EN) ? 1 : 0,
-+			(tmp_reg & USB_INTR_PTC_DETECT_EN) ? 1 : 0,
-+			(tmp_reg & USB_INTR_ERR_INT_EN) ? 1 : 0,
-+			(tmp_reg & USB_INTR_INT_EN) ? 1 : 0);
-+	size -= t;
-+	next += t;
-+
-+	tmp_reg = fsl_readl(&dr_regs->frindex);
-+	t = scnprintf(next, size,
-+			"USB Frame Index Reg:  Frame Number is 0x%x\n\n",
-+			(tmp_reg & USB_FRINDEX_MASKS));
-+	size -= t;
-+	next += t;
-+
-+	tmp_reg = fsl_readl(&dr_regs->deviceaddr);
-+	t = scnprintf(next, size,
-+			"USB Device Address Reg:  Device Addr is 0x%x\n\n",
-+			(tmp_reg & USB_DEVICE_ADDRESS_MASK));
-+	size -= t;
-+	next += t;
-+
-+	tmp_reg = fsl_readl(&dr_regs->endpointlistaddr);
-+	t = scnprintf(next, size,
-+			"USB Endpoint List Address Reg:"
-+			"Device Addr is 0x%x\n\n",
-+			(tmp_reg & USB_EP_LIST_ADDRESS_MASK));
-+	size -= t;
-+	next += t;
-+
-+	tmp_reg = fsl_readl(&dr_regs->portsc1);
-+	t = scnprintf(next, size,
-+		"USB Port Status&Control Reg:\n"
-+		"\tPort Transceiver Type : %s" "Port Speed: %s \n"
-+		"\tPHY Low Power Suspend: %s" "Port Reset: %s  "
-+		"Port Suspend Mode: %s \n" "\tOver-current Change: %s  "
-+		"Port Enable/Disable Change: %s\n"
-+		"\tPort Enabled/Disabled: %s"
-+		"Current Connect Status: %s\n\n", ( {
-+			char *s;
-+			switch (tmp_reg & PORTSCX_PTS_FSLS) {
-+			case PORTSCX_PTS_UTMI:
-+				s = "UTMI"; break;
-+			case PORTSCX_PTS_ULPI:
-+				s = "ULPI "; break;
-+			case PORTSCX_PTS_FSLS:
-+				s = "FS/LS Serial"; break;
-+			default:
-+				s = "None"; break;
-+			}
-+			s; } ), ( {
-+			char *s;
-+			switch (tmp_reg & PORTSCX_PORT_SPEED_UNDEF) {
-+			case PORTSCX_PORT_SPEED_FULL:
-+				s = "Full Speed"; break;
-+			case PORTSCX_PORT_SPEED_LOW:
-+				s = "Low Speed"; break;
-+			case PORTSCX_PORT_SPEED_HIGH:
-+				s = "High Speed"; break;
-+			default:
-+				s = "Undefined"; break;
-+			}
-+			s;
-+		} ),
-+		(tmp_reg & PORTSCX_PHY_LOW_POWER_SPD) ?
-+		"Normal PHY mode" : "Low power mode",
-+		(tmp_reg & PORTSCX_PORT_RESET) ? "In Reset" :
-+		"Not in Reset",
-+		(tmp_reg & PORTSCX_PORT_SUSPEND) ? "In " : "Not in",
-+		(tmp_reg & PORTSCX_OVER_CURRENT_CHG) ? "Dected" :
-+		"No",
-+		(tmp_reg & PORTSCX_PORT_EN_DIS_CHANGE) ? "Disable" :
-+		"Not change",
-+		(tmp_reg & PORTSCX_PORT_ENABLE) ? "Enable" :
-+		"Not correct",
-+		(tmp_reg & PORTSCX_CURRENT_CONNECT_STATUS) ?
-+		"Attached" : "Not-Att");
-+	size -= t;
-+	next += t;
-+
-+	tmp_reg = fsl_readl(&dr_regs->usbmode);
-+	t = scnprintf(next, size,
-+			"USB Mode Reg:" "Controller Mode is : %s\n\n", ( {
-+				char *s;
-+				switch (tmp_reg & USB_MODE_CTRL_MODE_HOST) {
-+				case USB_MODE_CTRL_MODE_IDLE:
-+					s = "Idle"; break;
-+				case USB_MODE_CTRL_MODE_DEVICE:
-+					s = "Device Controller"; break;
-+				case USB_MODE_CTRL_MODE_HOST:
-+					s = "Host Controller"; break;
-+				default:
-+					s = "None"; break;
-+				}
-+				s;
-+			} ));
-+	size -= t;
-+	next += t;
-+
-+	tmp_reg = fsl_readl(&dr_regs->endptsetupstat);
-+	t = scnprintf(next, size,
-+			"Endpoint Setup Status Reg:" "SETUP on ep 0x%x\n\n",
-+			(tmp_reg & EP_SETUP_STATUS_MASK));
-+	size -= t;
-+	next += t;
-+
-+	for (i = 0; i < udc->max_ep / 2; i++) {
-+		tmp_reg = fsl_readl(&dr_regs->endptctrl[i]);
-+		t = scnprintf(next, size, "EP Ctrl Reg [0x%x]: = [0x%x]\n",
-+				i, tmp_reg);
-+		size -= t;
-+		next += t;
-+	}
-+	tmp_reg = fsl_readl(&dr_regs->endpointprime);
-+	t = scnprintf(next, size, "EP Prime Reg = [0x%x]\n", tmp_reg);
-+	size -= t;
-+	next += t;
-+
-+#ifdef HAVE_SYS_REGS
-+	tmp_reg = usb_sys_regs->snoop1;
-+	t = scnprintf(next, size, "\nSnoop1 Reg : = [0x%x]\n\n", tmp_reg);
-+	size -= t;
-+	next += t;
-+
-+	tmp_reg = usb_sys_regs->control;
-+	t = scnprintf(next, size, "General Control Reg : = [0x%x]\n\n",
-+			tmp_reg);
-+	size -= t;
-+	next += t;
-+#endif
-+
-+	/* ------fsl_udc, fsl_ep, fsl_request structure information ----- */
-+	ep = &udc->eps[0];
-+	t = scnprintf(next, size, "For %s Maxpkt is 0x%x index is 0x%x\n",
-+			ep->ep.name, ep_maxpacket(ep), ep_index(ep));
-+	size -= t;
-+	next += t;
-+
-+	if (list_empty(&ep->queue)) {
-+		t = scnprintf(next, size, "its req queue is empty\n\n");
-+		size -= t;
-+		next += t;
-+	} else {
-+		list_for_each_entry(req, &ep->queue, queue) {
-+			t = scnprintf(next, size,
-+				"req %p actual 0x%x length 0x%x  buf %p\n",
-+				&req->req, req->req.actual,
-+				req->req.length, req->req.buf);
-+			size -= t;
-+			next += t;
-+		}
-+	}
-+	/* other gadget->eplist ep */
-+	list_for_each_entry(ep, &udc->gadget.ep_list, ep.ep_list) {
-+		if (ep->desc) {
-+			t = scnprintf(next, size,
-+					"\nFor %s Maxpkt is 0x%x "
-+					"index is 0x%x\n",
-+					ep->ep.name, ep_maxpacket(ep),
-+					ep_index(ep));
-+			size -= t;
-+			next += t;
-+
-+			if (list_empty(&ep->queue)) {
-+				t = scnprintf(next, size,
-+						"its req queue is empty\n\n");
-+				size -= t;
-+				next += t;
-+			} else {
-+				list_for_each_entry(req, &ep->queue, queue) {
-+					t = scnprintf(next, size,
-+						"req %p actual 0x%x length"
-+						"0x%x  buf %p\n",
-+						&req->req, req->req.actual,
-+						req->req.length, req->req.buf);
-+					size -= t;
-+					next += t;
-+					} /* end for each_entry of ep req */
-+				}	/* end for else */
-+			}	/* end for if(ep->queue) */
-+		}		/* end (ep->desc) */
-+
-+	spin_unlock_irqrestore(&udc->lock, flags);
-+
-+	*eof = 1;
-+	return count - size;
-+}
-+
-+#define create_proc_file()	create_proc_read_entry(proc_filename, \
-+				0, NULL, fsl_proc_read, NULL)
-+
-+#define remove_proc_file()	remove_proc_entry(proc_filename, NULL)
-+
-+#else				/* !CONFIG_USB_GADGET_DEBUG_FILES */
-+
-+#define create_proc_file()	do {} while (0)
-+#define remove_proc_file()	do {} while (0)
-+
-+#endif				/* CONFIG_USB_GADGET_DEBUG_FILES */
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/* Release udc structures */
-+static void fsl_udc_release(struct device *dev)
-+{
-+	complete(udc_controller->done);
-+	dma_free_coherent(dev, udc_controller->ep_qh_size,
-+			udc_controller->ep_qh, udc_controller->ep_qh_dma);
-+	kfree(udc_controller);
-+}
-+
-+/******************************************************************
-+	Internal structure setup functions
-+*******************************************************************/
-+/*------------------------------------------------------------------
-+ * init resource for globle controller
-+ * Return the udc handle on success or NULL on failure
-+ ------------------------------------------------------------------*/
-+static struct fsl_udc *__init struct_udc_setup(struct platform_device *pdev)
-+{
-+	struct fsl_udc *udc;
-+	struct fsl_usb2_platform_data *pdata;
-+	size_t size;
-+
-+	udc = kzalloc(sizeof(struct fsl_udc), GFP_KERNEL);
-+	if (udc == NULL) {
-+		ERR("malloc udc failed\n");
-+		return NULL;
-+	}
-+
-+	pdata = pdev->dev.platform_data;
-+	udc->phy_mode = pdata->phy_mode;	/* DDD FIXME */
-+
-+	/* max_ep_nr is bidirectional ep number, max_ep doubles the number */
-+	udc->max_ep = pdata->max_ep_nr * 2;
-+
-+	udc->eps = kzalloc(sizeof(struct fsl_ep) * udc->max_ep, GFP_KERNEL);
-+	if (!udc->eps) {
-+		ERR("malloc fsl_ep failed\n");
-+		goto cleanup;
-+	}
-+
-+	/* initialized QHs, take care of alignment */
-+	size = udc->max_ep * sizeof(struct ep_queue_head);
-+	if (size < QH_ALIGNMENT)
-+		size = QH_ALIGNMENT;
-+	else if ((size % QH_ALIGNMENT) != 0) {
-+		size += QH_ALIGNMENT + 1;
-+		size &= ~(QH_ALIGNMENT - 1);
-+	}
-+	udc->ep_qh = dma_alloc_coherent(&pdev->dev, size,
-+					&udc->ep_qh_dma, GFP_KERNEL);
-+	if (!udc->ep_qh) {
-+		ERR("malloc QHs for udc failed\n");
-+		kfree(udc->eps);
-+		goto cleanup;
-+	}
-+
-+	udc->ep_qh_size = size;
-+
-+	/* Initialize ep0 status request structure */
-+	udc->status_req = container_of(fsl_alloc_request(NULL, GFP_KERNEL),
-+			struct fsl_req, req);
-+	/* allocate a small amount of memory to get valid address */
-+	udc->status_req->req.buf = kmalloc(8, GFP_KERNEL);
-+	udc->status_req->req.dma = virt_to_phys(udc->status_req->req.buf);
-+
-+	udc->resume_state = USB_STATE_NOTATTACHED;
-+	udc->usb_state = USB_STATE_POWERED;
-+	udc->ep0_dir = 0;
-+	udc->remote_wakeup = 0;	/* default to 0 on reset */
-+	spin_lock_init(&udc->lock);
-+
-+	return udc;
-+
-+cleanup:
-+	kfree(udc);
-+	return NULL;
-+}
-+
-+/*----------------------------------------------------------------
-+ * Setup the fsl_ep struct for eps
-+ * Link fsl_ep->ep to gadget->ep_list
-+ * ep0out is not used so do nothing here
-+ * ep0in should be taken care
-+ *--------------------------------------------------------------*/
-+static int __init struct_ep_setup(struct fsl_udc *udc, unsigned char index,
-+		char *name, int link)
-+{
-+	struct fsl_ep *ep = &udc->eps[index];
-+
-+	ep->udc = udc;
-+	strcpy(ep->name, name);
-+	ep->ep.name = ep->name;
-+
-+	ep->ep.ops = &fsl_ep_ops;
-+	ep->stopped = 0;
-+
-+	/* for ep0: maxP defined in desc
-+	 * for other eps, maxP is set by epautoconfig() called by gadget layer
-+	 */
-+	ep->ep.maxpacket = (unsigned short) ~0;
-+
-+	/* the queue lists any req for this ep */
-+	INIT_LIST_HEAD(&ep->queue);
-+
-+	/* gagdet.ep_list used for ep_autoconfig so no ep0 */
-+	if (link)
-+		list_add_tail(&ep->ep.ep_list, &udc->gadget.ep_list);
-+	ep->gadget = &udc->gadget;
-+	ep->qh = &udc->ep_qh[index];
-+
-+	return 0;
-+}
-+
-+static int board_init(struct platform_device *pdev)
-+{
-+	struct fsl_usb2_platform_data *pdata = pdev->dev.platform_data;
-+
-+	pr_debug("udc: pdev=0x%p  pdata=0x%p\n", pdev, pdata);
-+
-+	/*
-+	 * do platform specific init: check the clock, grab/config pins, etc.
-+	 */
-+	if (pdata->platform_init && pdata->platform_init(pdev) != 0)
-+		return -EINVAL;
-+
-+	return 0;
-+}
-+
-+/* Driver probe functions */
-+
-+static int __init fsl_udc_probe(struct platform_device *pdev)
-+{
-+	struct fsl_usb2_platform_data *pdata = pdev->dev.platform_data;
-+	struct fsl_udc *udc;
-+	unsigned int i;
-+	struct otg_transceiver *transceiver = NULL;
-+	int status = -ENODEV;
-+	u32 id;
-+	int irq_number;
-+	u64 rsrc_start, rsrc_len;
-+	int ret = -ENODEV;
-+
-+	pr_debug("udc: pdev=0x%p  pdata=0x%p\n", pdev, pdata);
-+
-+	if (board_init(pdev) != 0)
-+		return -EINVAL;
-+
-+	/* Initialize the udc structure including QH member and other member */
-+	udc = (struct fsl_udc *) struct_udc_setup(pdev);
-+	udc_controller = udc;
-+
-+	if (!udc) {
-+		ERR("udc is NULL \n");
-+		return -ENOMEM;
-+	}
-+	dev_set_drvdata(&pdev->dev, udc);
-+	pr_debug("udc_controller=0x%p", udc_controller);
-+
-+	udc->pdata = pdata;
-+	udc->xcvr_type = pdata->xcvr_type;
-+
-+#ifdef CONFIG_USB_OTG
-+	udc->transceiver = otg_get_transceiver();
-+	pr_debug("udc: otg_get_transceiver returns 0x%p", udc->transceiver);
-+#endif
-+
-+	if (pdev->resource[1].flags != IORESOURCE_IRQ)
-+		return -ENODEV;
-+
-+	rsrc_start = pdev->resource[0].start;
-+	rsrc_len = pdev->resource[0].end - pdev->resource[0].start + 1;
-+
-+	pr_debug("     start=0x%ux   end=0x%ux\n",
-+		 pdev->resource[0].start, pdev->resource[0].end);
-+	pr_debug("rsrc_start=0x%llx  rsrc_len=0x%llx\n", rsrc_start, rsrc_len);
-+
-+	dr_regs = (struct fsl_usb_device_regs *)pdata->regs;
-+
-+	pr_debug("udc: pdate=0x%p dr_regs=0x%p\n", pdata, dr_regs);
-+	pr_debug("udc: hci_version=0x%x\n", dr_regs->hciversion);
-+	pr_debug("udc: otgsc at 0x%p\n", &dr_regs->otgsc);
-+
-+	id = fsl_readl(&dr_regs->id);
-+	printk(KERN_INFO "FSL2 USBOTG h/w ID=0x%x  revision=0x%x\n",
-+	       id & 0x3f, id >> 16);
-+
-+	/* USB OTG module IRQ */
-+	irq_number = platform_get_irq(pdev, 0);
-+	if (irq_number > 128) {
-+		status = request_irq(irq_number, fsl_udc_irq, IRQF_SHARED,
-+				     driver_name, udc);
-+		if (status) {
-+			ERR("can't get irq %d, err=%d\n", irq_number, status);
-+			goto err2;
-+		}
-+	} else {
-+		status = -ENODEV;
-+		goto err2;
-+	}
-+
-+	if (!udc->transceiver) {
-+		/* initialize usb hw reg except for regs for EP,
-+		 * leave usbintr reg untouched*/
-+		dr_controller_setup(udc);
-+	}
-+
-+	/* here comes the stand operations for probe
-+	 * set the fsl_udc->gadget.xxx
-+	 */
-+	udc->gadget.ops = &fsl_gadget_ops;
-+
-+	/* gadget.ep0 is a pointer */
-+	udc->gadget.ep0 = &udc->eps[0].ep;
-+	INIT_LIST_HEAD(&udc->gadget.ep_list);
-+	udc->gadget.speed = USB_SPEED_UNKNOWN;
-+	udc->gadget.name = driver_name;
-+
-+	/* Setup gadget.dev and register with kernel */
-+	strcpy(udc->gadget.dev.bus_id, "gadget");
-+	udc->gadget.dev.release = fsl_udc_release;
-+	udc->gadget.dev.parent = &pdev->dev;
-+
-+	ret = device_register(&udc->gadget.dev);
-+	if (ret < 0)
-+		goto err3;
-+
-+	if (udc->transceiver)
-+		udc->gadget.is_otg = 1;
-+
-+	/* setup QH and epctrl for ep0 */
-+	ep0_setup(udc);
-+
-+	/* setup udc->eps[] for ep0 */
-+	struct_ep_setup(udc_controller, 0, "ep0", 0);
-+	/* for ep0: the desc defined here;
-+	 * for other eps, gadget layer called ep_enable with defined desc
-+	 */
-+	udc->eps[0].desc = &fsl_ep0_desc;
-+	udc->eps[0].ep.maxpacket = USB_MAX_CTRL_PAYLOAD;
-+
-+	/* setup the udc->eps[] for non-control endpoints and link
-+	 * to gadget.ep_list */
-+	for (i = 1; i < (int)(udc->max_ep / 2); i++) {
-+		char name[14];
-+
-+		sprintf(name, "ep%dout", i);
-+		struct_ep_setup(udc, i * 2, name, 1);
-+		sprintf(name, "ep%din", i);
-+		struct_ep_setup(udc, i * 2 + 1, name, 1);
-+	}
-+
-+	/* use dma_pool for TD management */
-+	udc_controller->td_pool = dma_pool_create("udc_td", &pdev->dev,
-+			sizeof(struct ep_td_struct),
-+			DTD_ALIGNMENT, UDC_DMA_BOUNDARY);
-+	if (udc->td_pool == NULL) {
-+		ret = -ENOMEM;
-+		goto err4;
-+	}
-+#if 0 // DDD why this? hoarks OTG host
-+	pullup_disable(udc);
-+#endif
-+
-+	create_proc_file();
-+	return 0;
-+
-+err4:
-+	device_unregister(&udc_controller->gadget.dev);
-+err3:
-+	free_irq(udc_controller->irq, udc_controller);
-+err2:
-+	kfree(udc);
-+	if (transceiver)
-+		put_device(transceiver->dev);
-+	release_mem_region(pdev->resource[0].start,
-+			   pdev->resource[0].end - pdev->resource[0].start + 1);
-+	return status;
-+
-+}
-+
-+/* Driver removal functions
-+ * Free resources
-+ * Finish pending transaction
-+ */
-+static int __exit fsl_udc_remove(struct platform_device *pdev)
-+{
-+	struct device *dev = &pdev->dev;
-+	struct fsl_udc *udc = (struct fsl_udc *)dev_get_drvdata(dev);
-+	struct fsl_usb2_platform_data *pdata;
-+	int irq_number;
-+
-+	DECLARE_COMPLETION(done);
-+
-+	pdata = pdev->dev.platform_data;
-+
-+	if (!udc)
-+		return -ENODEV;
-+
-+	udc->done = &done;
-+
-+	/* DR has been stopped in usb_gadget_unregister_driver() */
-+
-+	if (udc->transceiver) {
-+		put_device(udc->transceiver->dev);
-+		udc->transceiver = NULL;
-+	}
-+
-+	/* remove proc */
-+	remove_proc_file();
-+
-+	/* free irq */
-+	irq_number = udc->irq;
-+	free_irq(pdev->resource[1].start, udc);
-+	udc->irq = 0;
-+
-+	/* Free allocated memory */
-+	kfree(udc->status_req->req.buf);
-+	kfree(udc->status_req);
-+	kfree(udc_controller->eps);
-+
-+	dma_pool_destroy(udc_controller->td_pool);
-+	/* deinitlaize all ep: strcut */
-+	/* deinitialize ep0: reg and QH */
-+
-+	device_unregister(&udc->gadget.dev);
-+	/* free udc --wait for the release() finished */
-+	wait_for_completion(&done);
-+
-+	/*
-+	 * do platform specific un-initialization:
-+	 * release iomux pins, etc.
-+	 */
-+	if (pdata->platform_uninit)
-+		pdata->platform_uninit(pdev);
-+
-+	return 0;
-+}
-+
-+static int udc_suspend(struct fsl_udc *udc)
-+{
-+	udc->stopped = 1;
-+	return 0;
-+}
-+
-+/*
-+ * Modify Power management attributes
-+ * Used by OTG statemachine to disable gadget temporarily
-+ * Here we stop the DR controller and disable the irq
-+ * @param dev device controller pointer
-+ * @param state current state
-+ * @return The function returns 0 on success or -1 if failed
-+ */
-+static int fsl_udc_suspend(struct device *dev, pm_message_t state)
-+{
-+	struct fsl_udc *udc = (struct fsl_udc *)dev_get_drvdata(dev);
-+	pr_debug("udc: Suspend. state=%d\n", state.event);
-+	return udc_suspend(udc);
-+}
-+
-+static int udc_resume(struct fsl_udc *udc)
-+{
-+	/*Enable DR irq reg and set controller Run */
-+	if (udc->stopped) {
-+		dr_controller_setup(udc);
-+		dr_controller_run(udc);
-+	}
-+	udc->usb_state = USB_STATE_ATTACHED;
-+	udc->ep0_state = WAIT_FOR_SETUP;
-+	udc->ep0_dir = 0;
-+	return 0;
-+}
-+
-+/*
-+ * Invoked on USB resume. May be called in_interrupt.
-+ * Here we start the DR controller and enable the irq
-+ * @param dev device controller pointer
-+ * @return The function returns 0 on success or -1 if failed
-+ */
-+static int fsl_udc_resume(struct device *dev)
-+{
-+	struct fsl_udc *udc = (struct fsl_udc *)dev_get_drvdata(dev);
-+	pr_debug("udc: Resume dev=0x%p udc=0x%p\n", dev, udc);
-+
-+	return udc_resume(udc);
-+}
-+
-+/*-------------------------------------------------------------------------
-+	Register entry point for the peripheral controller driver
-+--------------------------------------------------------------------------*/
-+static struct platform_driver udc_driver = {
-+	.probe   = fsl_udc_probe,
-+	.remove  = __exit_p(fsl_udc_remove),
-+	.driver  = {
-+		.name = (char *)driver_name,
-+		.owner = THIS_MODULE,
-+	},
-+};
-+
-+static int __init udc_init(void)
-+{
-+	printk(KERN_INFO "%s version %s init \n", driver_desc, DRIVER_VERSION);
-+	return platform_driver_register(&udc_driver);
-+}
-+
-+module_init(udc_init);
-+
-+static void __exit udc_exit(void)
-+{
-+	platform_driver_unregister(&udc_driver);
-+	printk(KERN_INFO "%s unregistered \n", driver_desc);
-+}
-+
-+module_exit(udc_exit);
-+
-+MODULE_DESCRIPTION(DRIVER_DESC);
-+MODULE_AUTHOR(DRIVER_AUTHOR);
-+MODULE_LICENSE("GPL");
---- a/drivers/usb/host/Kconfig
-+++ b/drivers/usb/host/Kconfig
-@@ -32,6 +32,7 @@ config USB_EHCI_HCD
- config USB_EHCI_ROOT_HUB_TT
- 	bool "Root Hub Transaction Translators (EXPERIMENTAL)"
- 	depends on USB_EHCI_HCD && EXPERIMENTAL
-+	default y if M54455
- 	---help---
- 	  Some EHCI chips have vendor-specific extensions to integrate
- 	  transaction translators, so that no OHCI or UHCI companion
-@@ -60,12 +61,12 @@ config USB_EHCI_TT_NEWSCHED
- 
- config USB_EHCI_BIG_ENDIAN_MMIO
- 	bool
--	depends on USB_EHCI_HCD && (PPC_CELLEB || PPC_PS3 || 440EPX || ARCH_IXP4XX)
-+	depends on USB_EHCI_HCD && (PPC_CELLEB || PPC_PS3 || 440EPX || ARCH_IXP4XX || M54455)
- 	default y
- 
- config USB_EHCI_BIG_ENDIAN_DESC
- 	bool
--	depends on USB_EHCI_HCD && (440EPX || ARCH_IXP4XX)
-+	depends on USB_EHCI_HCD && (440EPX || ARCH_IXP4XX || M54455)
- 	default y
- 
- config USB_EHCI_FSL
-@@ -260,3 +261,19 @@ config USB_R8A66597_HCD
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called r8a66597-hcd.
- 
-+choice
-+	prompt "Select transceiver"
-+	depends on M54455
-+	default USB_M5445X_ULPI 
-+
-+config USB_M5445X_ULPI
-+	bool "External ULPI"
-+	---help---
-+	  Enable support for the external HS ULPI transceiver.
-+
-+config USB_M5445X_FSLS
-+	bool "On-chip (FL/LS only)"
-+	---help---
-+	  Enable support for the on-chip FL/LS transceiver.
-+endchoice
-+
---- /dev/null
-+++ b/drivers/usb/host/ehci-arc.c
-@@ -0,0 +1,431 @@
-+/*
-+ * drivers/usb/host/ehci-arc.c
-+ *
-+ * Copyright 2005-2007 Freescale Semiconductor, Inc. All Rights Reserved.
-+ */
-+
-+/*
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/* Note: this file is #included by ehci-hcd.c */
-+
-+#include <linux/platform_device.h>
-+#include <linux/usb/fsl_usb2.h>
-+#include <linux/fsl_devices.h>
-+#include <linux/usb/otg.h>
-+
-+#include "ehci-fsl.h"
-+
-+
-+/* FIXME: Power Managment is un-ported so temporarily disable it */
-+#undef CONFIG_PM
-+
-+/* PCI-based HCs are common, but plenty of non-PCI HCs are used too */
-+
-+/* configure so an HC device and id are always provided */
-+/* always called with process context; sleeping is OK */
-+
-+/**
-+ * usb_hcd_fsl_probe - initialize FSL-based HCDs
-+ * @drvier: Driver to be used for this HCD
-+ * @pdev: USB Host Controller being probed
-+ * Context: !in_interrupt()
-+ *
-+ * Allocates basic resources for this USB host controller.
-+ *
-+ */
-+static int usb_hcd_fsl_probe(const struct hc_driver *driver,
-+			     struct platform_device *pdev)
-+{
-+	struct fsl_usb2_platform_data *pdata = pdev->dev.platform_data;
-+	struct usb_hcd *hcd;
-+	struct resource *res;
-+	int irq;
-+	int retval;
-+
-+	pr_debug("initializing FSL-SOC USB Controller\n");
-+
-+	/* Need platform data for setup */
-+	if (!pdata) {
-+		dev_err(&pdev->dev,
-+			"No platform data for %s.\n", pdev->dev.bus_id);
-+		return -ENODEV;
-+	}
-+
-+	retval = fsl_platform_verify(pdev);
-+	if (retval)
-+		return retval;
-+
-+	/*
-+	 * do platform specific init: check the clock, grab/config pins, etc.
-+	 */
-+	if (pdata->platform_init && pdata->platform_init(pdev)) {
-+		retval = -ENODEV;
-+		goto err1;
-+	}
-+
-+	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-+	if (!res) {
-+		dev_err(&pdev->dev,
-+			"Found HC with no IRQ. Check %s setup!\n",
-+			pdev->dev.bus_id);
-+		return -ENODEV;
-+	}
-+	irq = res->start;
-+
-+	fsl_platform_set_vbus_power(pdev, 1);
-+
-+	hcd = usb_create_hcd(driver, &pdev->dev, pdev->dev.bus_id);
-+	if (!hcd) {
-+		retval = -ENOMEM;
-+		goto err1;
-+	}
-+
-+	if (pdata->regs) {
-+		pr_debug("REGS: using pdata->regs (0x%p)\n", pdata->regs);
-+		hcd->regs = pdata->regs;
-+		hcd->rsrc_start = pdata->r_start;
-+		hcd->rsrc_len = pdata->r_len;
-+	} else {
-+		pr_debug("REGS: NO pdata->regs\n");
-+		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+		if (!res) {
-+			dev_err(&pdev->dev, "Found HC with no register addr. "
-+				"Check %s setup!\n", pdev->dev.bus_id);
-+			retval = -ENODEV;
-+			goto err2;
-+		}
-+		hcd->rsrc_start = res->start;
-+		hcd->rsrc_len = res->end - res->start + 1;
-+
-+		/*
-+		printk("DDD %s(): rsrc_start=0x%llx  rsrc_len=0x%llx  "
-+			"pdata=0x%p\n", __FUNCTION__,
-+			hcd->rsrc_start, hcd->rsrc_len, pdata);
-+		*/
-+
-+		if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len,
-+					driver->description)) {
-+			dev_dbg(&pdev->dev, "request_mem_region failed\n");
-+			retval = -EBUSY;
-+			goto err2;
-+		}
-+		hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
-+
-+		if (hcd->regs == NULL) {
-+			dev_dbg(&pdev->dev, "error mapping memory\n");
-+			retval = -EFAULT;
-+			goto err3;
-+		}
-+	}
-+	hcd->power_budget = pdata->power_budget;
-+
-+	/* DDD
-+	 * the following must be done by this point, otherwise the OTG
-+	 * host port doesn't make it thru initializtion.
-+	 * ehci_halt(), called by ehci_fsl_setup() returns -ETIMEDOUT
-+	 */
-+	fsl_platform_set_host_mode(hcd);
-+
-+	retval = usb_add_hcd(hcd, irq, IRQF_SHARED);
-+	if (retval != 0)
-+		goto err4;
-+
-+#if defined(CONFIG_USB_OTG)
-+	if (pdata->does_otg) {
-+		struct ehci_hcd *ehci = hcd_to_ehci(hcd);
-+
-+		ehci->transceiver = otg_get_transceiver();
-+
-+		if (ehci->transceiver) {
-+			retval = otg_set_host(ehci->transceiver,
-+					      &ehci_to_hcd(ehci)->self);
-+			if (retval) {
-+				if (ehci->transceiver)
-+					put_device(ehci->transceiver->dev);
-+				goto err3;
-+			}
-+		} else {
-+			printk(KERN_ERR "can't find transceiver\n");
-+			retval = -ENODEV;
-+			goto err3;
-+		}
-+	}
-+#endif
-+
-+	return retval;
-+
-+err4:
-+	/* DDD only if we did the iomap() iounmap(hcd->regs); */
-+err3:
-+	/* DDD only if we did a request_
-+	 * release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
-+	 */
-+err2:
-+	usb_put_hcd(hcd);
-+err1:
-+	dev_err(&pdev->dev, "init %s fail, %d\n", pdev->dev.bus_id, retval);
-+	if (pdata->platform_uninit)
-+		pdata->platform_uninit(pdev);
-+	return retval;
-+}
-+
-+/* may be called without controller electrically present */
-+/* may be called with controller, bus, and devices active */
-+
-+/**
-+ * usb_hcd_fsl_remove - shutdown processing for FSL-based HCDs
-+ * @dev: USB Host Controller being removed
-+ * Context: !in_interrupt()
-+ *
-+ * Reverses the effect of usb_hcd_fsl_probe().
-+ *
-+ */
-+static void usb_hcd_fsl_remove(struct usb_hcd *hcd,
-+			       struct platform_device *pdev)
-+{
-+	struct ehci_hcd *ehci = hcd_to_ehci(hcd);
-+	struct fsl_usb2_platform_data *pdata = pdev->dev.platform_data;
-+
-+	/* DDD shouldn't we turn off the power here? */
-+	fsl_platform_set_vbus_power(pdev, 0);
-+
-+	usb_remove_hcd(hcd);
-+
-+	if (ehci->transceiver) {
-+		(void)otg_set_host(ehci->transceiver, 0);
-+		put_device(ehci->transceiver->dev);
-+	}
-+	usb_put_hcd(hcd);
-+
-+	/*
-+	 * do platform specific un-initialization:
-+	 * release iomux pins, etc.
-+	 */
-+	if (pdata->platform_uninit)
-+		pdata->platform_uninit(pdev);
-+}
-+
-+/* called after powerup, by probe or system-pm "wakeup" */
-+static int ehci_fsl_reinit(struct ehci_hcd *ehci)
-+{
-+	fsl_platform_usb_setup(ehci_to_hcd(ehci));
-+	ehci_port_power(ehci, 0);
-+
-+	return 0;
-+}
-+
-+/* called during probe() after chip reset completes */
-+static int ehci_fsl_setup(struct usb_hcd *hcd)
-+{
-+	struct ehci_hcd *ehci = hcd_to_ehci(hcd);
-+	int retval;
-+	struct fsl_usb2_platform_data *pdata;
-+	pdata = hcd->self.controller-> platform_data;
-+
-+	ehci->big_endian_desc = pdata->big_endian_desc;
-+	ehci->big_endian_mmio = pdata->big_endian_mmio;
-+
-+	/* EHCI registers start at offset 0x100 */
-+	ehci->caps = hcd->regs + 0x100;
-+	ehci->regs = hcd->regs + 0x100 +
-+	    HC_LENGTH(ehci_readl(ehci, &ehci->caps->hc_capbase));
-+
-+	pr_debug("%s(): ehci->caps=0x%p  ehci->regs=0x%p\n", __FUNCTION__,
-+		 ehci->caps, ehci->regs);
-+
-+	dbg_hcs_params(ehci, "reset");
-+	dbg_hcc_params(ehci, "reset");
-+
-+	/* cache this readonly data; minimize chip reads */
-+	ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);
-+
-+	retval = ehci_halt(ehci);
-+	if (retval)
-+		return retval;
-+
-+	/* data structure init */
-+	retval = ehci_init(hcd);
-+	if (retval)
-+		return retval;
-+
-+	ehci->is_tdi_rh_tt = 1;
-+
-+	ehci->sbrn = 0x20;
-+
-+	ehci_reset(ehci);
-+
-+	retval = ehci_fsl_reinit(ehci);
-+	return retval;
-+}
-+
-+static const struct hc_driver ehci_fsl_hc_driver = {
-+	.description = hcd_name,
-+	.product_desc = "Freescale On-Chip EHCI Host Controller",
-+	.hcd_priv_size = sizeof(struct ehci_hcd),
-+
-+	/*
-+	 * generic hardware linkage
-+	 */
-+	.irq = ehci_irq,
-+	.flags = FSL_PLATFORM_HC_FLAGS,
-+
-+	/*
-+	 * basic lifecycle operations
-+	 */
-+	.reset = ehci_fsl_setup,
-+	.start = ehci_run,
-+	.stop = ehci_stop,
-+	.shutdown = ehci_shutdown,
-+
-+	/*
-+	 * managing i/o requests and associated device resources
-+	 */
-+	.urb_enqueue = ehci_urb_enqueue,
-+	.urb_dequeue = ehci_urb_dequeue,
-+	.endpoint_disable = ehci_endpoint_disable,
-+
-+	/*
-+	 * scheduling support
-+	 */
-+	.get_frame_number = ehci_get_frame,
-+
-+	/*
-+	 * root hub support
-+	 */
-+	.hub_status_data = ehci_hub_status_data,
-+	.hub_control = ehci_hub_control,
-+	.bus_suspend = ehci_bus_suspend,
-+	.bus_resume = ehci_bus_resume,
-+};
-+
-+#ifdef CONFIG_USB_OTG
-+/*
-+ * Holding pen for all the EHCI registers except port_status,
-+ * which is a zero element array and hence takes no space.
-+ * The port_status register is saved in usb_ehci_portsc.
-+ */
-+volatile static struct ehci_regs usb_ehci_regs;
-+static u32 usb_ehci_portsc;
-+
-+/* suspend/resume, section 4.3 */
-+
-+/* These routines rely on the bus (pci, platform, etc)
-+ * to handle powerdown and wakeup, and currently also on
-+ * transceivers that don't need any software attention to set up
-+ * the right sort of wakeup.
-+ *
-+ * They're also used for turning on/off the port when doing OTG.
-+ */
-+static int ehci_fsl_drv_suspend(struct platform_device *pdev,
-+				pm_message_t message)
-+{
-+	struct usb_hcd *hcd = platform_get_drvdata(pdev);
-+	struct ehci_hcd *ehci = hcd_to_ehci(hcd);
-+	u32 tmp;
-+
-+	pr_debug("%s pdev=0x%p  ehci=0x%p  hcd=0x%p\n",
-+		 __FUNCTION__, pdev, ehci, hcd);
-+	pr_debug("%s ehci->regs=0x%p  hcd->regs=0x%p  hcd->state=%d\n",
-+		 __FUNCTION__, ehci->regs, hcd->regs, hcd->state);
-+
-+	hcd->state = HC_STATE_SUSPENDED;
-+	pdev->dev.power.power_state = PMSG_SUSPEND;
-+
-+	if (hcd->driver->suspend)
-+		return hcd->driver->suspend(hcd, message);
-+
-+	/* ignore non-host interrupts */
-+	clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
-+
-+	tmp = ehci_readl(ehci, &ehci->regs->command);
-+	tmp &= ~CMD_RUN;
-+	ehci_writel(ehci, tmp, &ehci->regs->command);
-+
-+	memcpy((void *)&usb_ehci_regs, ehci->regs, sizeof(struct ehci_regs));
-+	usb_ehci_portsc = ehci_readl(ehci, &ehci->regs->port_status[0]);
-+
-+	/* clear the W1C bits */
-+	usb_ehci_portsc &= cpu_to_hc32(ehci, ~PORT_RWC_BITS);
-+
-+	fsl_platform_set_vbus_power(pdev, 0);
-+	/* clear PP to cut power to the port */
-+	tmp = ehci_readl(ehci, &ehci->regs->port_status[0]);
-+	tmp &= ~PORT_POWER;
-+	ehci_writel(ehci, tmp, &ehci->regs->port_status[0]);
-+
-+	return 0;
-+}
-+
-+static int ehci_fsl_drv_resume(struct platform_device *pdev)
-+{
-+	struct usb_hcd *hcd = platform_get_drvdata(pdev);
-+	struct ehci_hcd *ehci = hcd_to_ehci(hcd);
-+	u32 tmp;
-+	struct fsl_usb2_platform_data *pdata = pdev->dev.platform_data;
-+
-+	pr_debug("%s pdev=0x%p  pdata=0x%p  ehci=0x%p  hcd=0x%p\n",
-+		 __FUNCTION__, pdev, pdata, ehci, hcd);
-+
-+	pr_debug("%s ehci->regs=0x%p  hcd->regs=0x%p",
-+		 __FUNCTION__, ehci->regs, hcd->regs);
-+
-+	memcpy(ehci->regs, (void *)&usb_ehci_regs, sizeof(struct ehci_regs));
-+	ehci_writel(ehci, usb_ehci_portsc, &ehci->regs->port_status[0]);
-+
-+	tmp = USBMODE_CM_HOST | (pdata->es ? USBMODE_ES : 0);
-+	ehci_writel(ehci, tmp, hcd->regs + FSL_SOC_USB_USBMODE);
-+
-+	set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
-+	hcd->state = HC_STATE_RUNNING;
-+	pdev->dev.power.power_state = PMSG_ON;
-+
-+	tmp = ehci_readl(ehci, &ehci->regs->command);
-+	tmp |= CMD_RUN;
-+	ehci_writel(ehci, tmp, &ehci->regs->command);
-+
-+	fsl_platform_set_vbus_power(pdev, 1);
-+
-+	usb_hcd_resume_root_hub(hcd);
-+
-+	return 0;
-+}
-+#endif				/* CONFIG_USB_OTG */
-+
-+static int ehci_fsl_drv_probe(struct platform_device *pdev)
-+{
-+	if (usb_disabled())
-+		return -ENODEV;
-+
-+	return usb_hcd_fsl_probe(&ehci_fsl_hc_driver, pdev);
-+}
-+
-+static int ehci_fsl_drv_remove(struct platform_device *pdev)
-+{
-+	struct usb_hcd *hcd = platform_get_drvdata(pdev);
-+
-+	usb_hcd_fsl_remove(hcd, pdev);
-+
-+	return 0;
-+}
-+
-+MODULE_ALIAS("fsl-ehci");
-+
-+static struct platform_driver ehci_fsl_driver = {
-+	.probe = ehci_fsl_drv_probe,
-+	.remove = ehci_fsl_drv_remove,
-+	.shutdown = usb_hcd_platform_shutdown,
-+#ifdef CONFIG_USB_OTG
-+	.suspend = ehci_fsl_drv_suspend,
-+	.resume  = ehci_fsl_drv_resume,
-+#endif
-+	.driver = {
-+		   .name = "fsl-ehci",
-+		   },
-+};
---- a/drivers/usb/host/ehci-fsl.h
-+++ b/drivers/usb/host/ehci-fsl.h
-@@ -18,6 +18,8 @@
- #ifndef _EHCI_FSL_H
- #define _EHCI_FSL_H
- 
-+#include <linux/usb/fsl_xcvr.h>
-+
- /* offsets for the non-ehci registers in the FSL SOC USB controller */
- #define FSL_SOC_USB_ULPIVP	0x170
- #define FSL_SOC_USB_PORTSC1	0x184
-@@ -34,5 +36,29 @@
- #define FSL_SOC_USB_PRICTRL	0x40c	/* NOTE: big-endian */
- #define FSL_SOC_USB_SICTRL	0x410	/* NOTE: big-endian */
- #define FSL_SOC_USB_CTRL	0x500	/* NOTE: big-endian */
--#define SNOOP_SIZE_2GB		0x1e
-+
-+#ifdef CONFIG_MPC834x
-+#include <sysdev/fsl_usb.h>
-+#endif
-+
-+#ifdef CONFIG_ARCH_MX3
-+#include <asm/arch/mx31_usb.h>
-+#endif
-+
-+#ifdef CONFIG_ARCH_MX27
-+#include <asm/arch/mx27_usb.h>
-+#endif
-+
-+#ifdef CONFIG_M54455
-+#include <asm-m68k/mcf5445x_usb.h>
-+#endif
-+
-+
-+static void fsl_platform_set_vbus_power(struct platform_device *pdev, int on)
-+{
-+	struct fsl_usb2_platform_data *pdata = pdev->dev.platform_data;
-+
-+	if (pdata->xcvr_ops && pdata->xcvr_ops->set_vbus_power)
-+		pdata->xcvr_ops->set_vbus_power(pdata, on);
-+}
- #endif				/* _EHCI_FSL_H */
---- a/drivers/usb/host/ehci-hcd.c
-+++ b/drivers/usb/host/ehci-hcd.c
-@@ -1043,6 +1043,11 @@ MODULE_LICENSE ("GPL");
- #define	PLATFORM_DRIVER		ixp4xx_ehci_driver
- #endif
- 
-+#ifdef CONFIG_M54455
-+#include "ehci-arc.c"
-+#define	PLATFORM_DRIVER		ehci_fsl_driver
-+#endif
-+
- #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
-     !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER)
- #error "missing bus glue for ehci-hcd"
---- a/drivers/usb/host/ehci-mem.c
-+++ b/drivers/usb/host/ehci-mem.c
-@@ -40,7 +40,8 @@ static inline void ehci_qtd_init(struct 
- {
- 	memset (qtd, 0, sizeof *qtd);
- 	qtd->qtd_dma = dma;
--	qtd->hw_token = cpu_to_le32 (QTD_STS_HALT);
-+	// DDD official code` has: qtd->hw_token = cpu_to_le32 (QTD_STS_HALT);
-+	qtd->hw_token = cpu_to_hc32 (ehci, QTD_STS_HALT);
- 	qtd->hw_next = EHCI_LIST_END(ehci);
- 	qtd->hw_alt_next = EHCI_LIST_END(ehci);
- 	INIT_LIST_HEAD (&qtd->qtd_list);
-@@ -211,9 +212,11 @@ static int ehci_mem_init (struct ehci_hc
- 	}
- 
- 	/* Hardware periodic table */
--	ehci->periodic = (__le32 *)
-+	// DDD official code has: ehci->periodic = (__le32 *)
-+	ehci->periodic = (__hc32 *)
- 		dma_alloc_coherent (ehci_to_hcd(ehci)->self.controller,
--			ehci->periodic_size * sizeof(__le32),
-+			// DDD official: ehci->periodic_size * sizeof(__le32),
-+			ehci->periodic_size * sizeof(__hc32),
- 			&ehci->periodic_dma, 0);
- 	if (ehci->periodic == NULL) {
- 		goto fail;
---- a/drivers/usb/host/ehci.h
-+++ b/drivers/usb/host/ehci.h
-@@ -122,6 +122,12 @@ struct ehci_hcd {			/* one per controlle
- 
- 	u8			sbrn;		/* packed release number */
- 
-+	/*
-+	 * OTG controllers and transceivers need software interaction;
-+	 * other external transceivers should be software-transparent
-+	 */
-+	struct otg_transceiver	*transceiver;
-+
- 	/* irq statistics */
- #ifdef EHCI_STATS
- 	struct ehci_stats	stats;
-@@ -753,6 +759,22 @@ ehci_port_speed(struct ehci_hcd *ehci, u
- #define writel_be(val, addr)	__raw_writel(val, (__force unsigned *)addr)
- #endif
- 
-+#if defined(CONFIG_COLDFIRE)
-+/*
-+ * Sorry, include/asm-m68k/io.h is messed up.  It will give you a
-+ * BE readl or a LE readl depending on whether or not CONFIG_PCI is set.
-+ * how broken is that?  Do the right thing here.
-+ */
-+#undef readl
-+#undef writel
-+
-+#define readl(addr)		in_le32((__force unsigned *)(addr))
-+#define writel(val,addr)	out_le32((__force unsigned *)(addr),(val))
-+
-+#define readl_be(addr)		in_be32((__force unsigned *)(addr))
-+#define writel_be(val, addr)	out_be32((__force unsigned *)(addr), (val))
-+#endif
-+
- static inline unsigned int ehci_readl(const struct ehci_hcd *ehci,
- 		__u32 __iomem * regs)
- {
---- /dev/null
-+++ b/drivers/usb/otg/Makefile
-@@ -0,0 +1,5 @@
-+#
-+# Makefile for USB OTG controller  driver
-+#
-+fsl_usb2_otg-objs		:= fsl_otg.o otg_fsm.o
-+obj-y				+= fsl_usb2_otg.o
---- /dev/null
-+++ b/drivers/usb/otg/fsl_otg.c
-@@ -0,0 +1,1515 @@
-+/*
-+ * Copyright (c) Freescale Semiconductor, Inc. 2006-2007
-+ *
-+ * USB OTG ULPI driver
-+ *
-+ * Based on code for MPC from:
-+ *  Leo Li<LeoLi@freescale.com>
-+ *  Jerry Huang<Chang-Ming.Huang@freescale.com>
-+ *
-+ * and M5329 code from
-+ *  Yaroslav Vinogradov yaroslav.vinogradov@freescale.com
-+ *  Andrey Butok
-+ *
-+ *  Initialization based on code from Shlomi Gridish.
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the  GNU General Public License along
-+ * with this program; if not, write  to the Free Software Foundation, Inc.,
-+ * 675 Mass Ave, Cambridge, MA 02139, USA.
-+ ***************************************************************************
-+ * Changes:
-+ *   v0.3	08 August 2007		Duck
-+ *   v0.2	20 October 2006		Andrey Butok
-+ *		Issues fixing and some changes.
-+ *   v0.1	September 2006		Yaroslav Vinogradov
-+ *		Initial version.
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/moduleparam.h>
-+#include <linux/kernel.h>
-+#include <linux/delay.h>
-+#include <linux/ioport.h>
-+#include <linux/sched.h>
-+#include <linux/slab.h>
-+#include <linux/smp_lock.h>
-+#include <linux/proc_fs.h>
-+#include <linux/errno.h>
-+#include <linux/init.h>
-+#include <linux/reboot.h>
-+#include <linux/timer.h>
-+#include <linux/list.h>
-+#include <linux/interrupt.h>
-+#include <linux/usb.h>
-+#include <linux/device.h>
-+#include <linux/platform_device.h>
-+#include <linux/usb/ch9.h>
-+#include <linux/usb_gadget.h>
-+#include <linux/workqueue.h>
-+#include <linux/time.h>
-+#include <linux/fsl_devices.h>
-+#include <linux/usb/fsl_usb2.h>
-+
-+#include <linux/io.h>
-+
-+#if defined CONFIG_M54455
-+#include <asm/mcfsim.h>
-+#endif
-+
-+#define USE_WORK_QUEUES
-+#include "fsl_otg.h"
-+
-+#define CONFIG_USB_OTG_DEBUG_FILES
-+#define DRIVER_VERSION "Revision: 1.56"
-+#define DRIVER_AUTHOR "Freescale Semiconductor Inc."
-+#define DRIVER_DESC "Freescale USB OTG ULPI Driver"
-+#define DRIVER_INFO DRIVER_VERSION " " DRIVER_DESC
-+
-+MODULE_DESCRIPTION("Freescale USB OTG Controller Driver");
-+
-+static const char driver_name[] = "fsl-usb2-otg";
-+
-+static spinlock_t usb_dr_regs_lock;
-+
-+/*#define HA_DATA_PULSE 1*/
-+
-+volatile static struct fsl_usb_device_regs *usb_dr_regs;
-+static struct fsl_otg *fsl_otg_dev;
-+static int srp_wait_done;
-+
-+/* Driver specific timers */
-+struct fsl_otg_timer *b_data_pulse_tmr, *b_vbus_pulse_tmr, *b_srp_fail_tmr,
-+	*b_srp_wait_tmr, *a_wait_enum_tmr;
-+
-+static struct list_head active_timers;
-+
-+static struct fsl_otg_config fsl_otg_initdata = {
-+	.otg_port = 1,
-+};
-+
-+static void dump_state(const char *string, struct otg_fsm *fsm)
-+{
-+	printk(KERN_DEBUG "%s\n\tOTG state: %s\n", string,
-+	       state_string(fsl_otg_dev->otg.state));
-+	printk(KERN_DEBUG "\tFSM protocol=%s\n", fsm->protocol ?
-+	       (fsm->protocol == PROTO_HOST ? "Host" : "Gadget")
-+	       : "None");
-+
-+	/* regs */
-+	printk(KERN_DEBUG "\t  OTGSC 0x%08x\n",
-+	       fsl_readl(&usb_dr_regs->otgsc));
-+	printk(KERN_DEBUG "\tPORTSC1 0x%08x\n",
-+	       fsl_readl(&usb_dr_regs->portsc1));
-+	printk(KERN_DEBUG "\tUSBMODE 0x%08x\n",
-+	       fsl_readl(&usb_dr_regs->usbmode));
-+	printk(KERN_DEBUG "\t USBCMD 0x%08x\n",
-+	       fsl_readl(&usb_dr_regs->usbcmd));
-+	printk(KERN_DEBUG "\t USBSTS 0x%08x\n",
-+	       fsl_readl(&usb_dr_regs->usbsts));
-+
-+	/* ------ State Machine Variables ----- */
-+	printk(KERN_DEBUG "\ta_bus_req: %d\n", fsm->a_bus_req);
-+	printk(KERN_DEBUG "\tb_bus_req: %d\n", fsm->b_bus_req);
-+	printk(KERN_DEBUG "\ta_bus_resume: %d\n", fsm->a_bus_resume);
-+	printk(KERN_DEBUG "\ta_bus_suspend: %d\n", fsm->a_bus_suspend);
-+	printk(KERN_DEBUG "\ta_conn: %d\n", fsm->a_conn);
-+	printk(KERN_DEBUG "\ta_sess_vld: %d\n", fsm->a_sess_vld);
-+	printk(KERN_DEBUG "\ta_srp_det: %d\n", fsm->a_srp_det);
-+	printk(KERN_DEBUG "\ta_vbus_vld: %d\n", fsm->a_vbus_vld);
-+	printk(KERN_DEBUG "\tb_bus_resume: %d\n", fsm->b_bus_resume);
-+	printk(KERN_DEBUG "\tb_bus_suspend: %d\n", fsm->b_bus_suspend);
-+	printk(KERN_DEBUG "\tb_conn: %d\n", fsm->b_conn);
-+	printk(KERN_DEBUG "\tb_se0_srp: %d\n", fsm->b_se0_srp);
-+	printk(KERN_DEBUG "\tb_sess_end: %d\n", fsm->b_sess_end);
-+	printk(KERN_DEBUG "\tb_sess_vld: %d\n", fsm->b_sess_vld);
-+	printk(KERN_DEBUG "\tid: %d\n", fsm->id);
-+}
-+
-+
-+/* Routines to access transceiver ULPI registers */
-+u8 view_ulpi(u8 addr)
-+{
-+	u32 temp;
-+
-+	temp = 0x40000000 | (addr << 16);
-+	fsl_writel(temp, &usb_dr_regs->ulpiview);
-+
-+	udelay(1000);
-+
-+	/* DDD timeout this loop: */
-+	do {
-+		temp = fsl_readl(&usb_dr_regs->ulpiview);
-+	} while (temp & 0x40000000);
-+
-+	return (temp & 0x0000ff00) >> 8;
-+}
-+
-+int write_ulpi(u8 addr, u8 data)
-+{
-+	u32 temp;
-+
-+	temp = 0x60000000 | (addr << 16) | data;
-+	fsl_writel(temp, &usb_dr_regs->ulpiview);
-+	return 0;
-+}
-+
-+/* prototype declaration */
-+void fsl_otg_add_timer(void *timer);
-+void fsl_otg_del_timer(void *timer);
-+
-+/* -------------------------------------------------------------*/
-+/* Operations that will be called from OTG Finite State Machine */
-+
-+/* Charge vbus for vbus pulsing in SRP */
-+void fsl_otg_chrg_vbus(int on)
-+{
-+	u32 tmp;
-+
-+	VDBG(" %d\n", on);
-+
-+	tmp = fsl_readl(&usb_dr_regs->otgsc) & ~OTGSC_INTSTS_MASK;
-+
-+	if (on) {
-+		tmp &= ~OTGSC_CTRL_VBUS_DISCHARGE;
-+		tmp |= OTGSC_CTRL_VBUS_CHARGE;
-+	} else {
-+		tmp &= ~OTGSC_CTRL_VBUS_CHARGE;
-+	}
-+	fsl_writel(tmp, &usb_dr_regs->otgsc);
-+}
-+
-+/* Discharge vbus through a resistor to ground */
-+void fsl_otg_dischrg_vbus(int on)
-+{
-+	u32 tmp;
-+
-+	VDBG(" %d\n", on);
-+
-+	tmp = fsl_readl(&usb_dr_regs->otgsc) & ~OTGSC_INTSTS_MASK;
-+
-+	if (on)
-+		tmp |= OTGSC_CTRL_VBUS_DISCHARGE;
-+	else
-+		tmp &= ~OTGSC_CTRL_VBUS_DISCHARGE;
-+
-+	fsl_writel(tmp, &usb_dr_regs->otgsc);
-+}
-+
-+/* A-device driver vbus, controlled through PP bit in PORTSC */
-+void fsl_otg_drv_vbus(int on)
-+{
-+	u32 tmp;
-+
-+	VDBG(" %d\n", on);
-+
-+	tmp = fsl_readl(&usb_dr_regs->portsc1) & ~PORTSCX_W1C_BITS;
-+
-+	if (on)
-+		tmp |= PORTSCX_PORT_POWER;
-+	else
-+		tmp &= ~PORTSCX_PORT_POWER;
-+
-+	fsl_writel(tmp, &usb_dr_regs->portsc1);
-+}
-+
-+/* Pull-up D+, signalling connect by periperal. Also used in
-+ * data-line pulsing in SRP */
-+void fsl_otg_loc_conn(int on)
-+{
-+	u32 tmp;
-+
-+	VDBG(" %d\n", on);
-+
-+	tmp = fsl_readl(&usb_dr_regs->otgsc) & ~OTGSC_INTSTS_MASK;
-+
-+	if (on)
-+		tmp |= OTGSC_CTRL_DATA_PULSING;
-+	else
-+		tmp &= ~OTGSC_CTRL_DATA_PULSING;
-+
-+	fsl_writel(tmp, &usb_dr_regs->otgsc);
-+}
-+
-+/* Generate SOF by host.  This is controlled through suspend/resume the
-+ * port.  In host mode, controller will automatically send SOF.
-+ * Suspend will block the data on the port.
-+ */
-+void fsl_otg_loc_sof(int on)
-+{
-+	u32 tmp;
-+
-+	VDBG(" %d\n", on);
-+
-+	tmp = fsl_readl(&usb_dr_regs->portsc1) & ~PORTSCX_W1C_BITS;
-+
-+	if (on)
-+		tmp |= PORTSCX_PORT_FORCE_RESUME;
-+	else
-+		tmp |= PORTSCX_PORT_SUSPEND;
-+
-+	fsl_writel(tmp, &usb_dr_regs->portsc1);
-+}
-+
-+/* Start SRP pulsing by data-line pulsing, followed with v-bus pulsing. */
-+void fsl_otg_start_pulse(void)
-+{
-+	u32 __attribute__ ((unused)) tmp;
-+
-+	VDBG("\n");
-+	srp_wait_done = 0;
-+
-+#ifdef HA_DATA_PULSE
-+	tmp = fsl_readl(&usb_dr_regs->otgsc) &= ~OTGSC_INTSTS_MASK;
-+	tmp |= OTGSC_HA_DATA_PULSE;
-+	fsl_writel(tmp, &usb_dr_regs->otgsc);
-+#else
-+	fsl_otg_loc_conn(1);
-+#endif
-+
-+	fsl_otg_add_timer(b_data_pulse_tmr);
-+}
-+
-+void fsl_otg_pulse_vbus(void);
-+
-+void b_data_pulse_end(unsigned long foo)
-+{
-+#ifdef HA_DATA_PULSE
-+#else
-+	fsl_otg_loc_conn(0);
-+#endif
-+
-+	/* Do VBUS pulse after data pulse */
-+	fsl_otg_pulse_vbus();
-+}
-+
-+void fsl_otg_pulse_vbus(void)
-+{
-+	srp_wait_done = 0;
-+	fsl_otg_chrg_vbus(1);
-+	/* start the timer to end vbus charge */
-+	fsl_otg_add_timer(b_vbus_pulse_tmr);
-+}
-+
-+void b_vbus_pulse_end(unsigned long foo)
-+{
-+	fsl_otg_chrg_vbus(0);
-+
-+	/* As USB3300 using the same a_sess_vld and b_sess_vld voltage
-+	 * we need to discharge the bus for a while to distinguish
-+	 * residual voltage of vbus pulsing and A device pull up */
-+	fsl_otg_dischrg_vbus(1);
-+	fsl_otg_add_timer(b_srp_wait_tmr);
-+}
-+
-+void b_srp_end(unsigned long foo)
-+{
-+	fsl_otg_dischrg_vbus(0);
-+	srp_wait_done = 1;
-+
-+	if ((fsl_otg_dev->otg.state == OTG_STATE_B_SRP_INIT) &&
-+	    fsl_otg_dev->fsm.b_sess_vld)
-+		fsl_otg_dev->fsm.b_srp_done = 1;
-+}
-+
-+/* Workaround for a_host suspending too fast.  When a_bus_req=0,
-+ * a_host will start by SRP.  It needs to set b_hnp_enable before
-+ * actually suspending to start HNP
-+ */
-+void a_wait_enum(unsigned long foo)
-+{
-+	VDBG("a_wait_enum timeout\n");
-+	if (!fsl_otg_dev->otg.host->b_hnp_enable)
-+		fsl_otg_add_timer(a_wait_enum_tmr);
-+	else
-+		otg_statemachine(&fsl_otg_dev->fsm);
-+}
-+
-+/* ------------------------------------------------------*/
-+
-+/* The timeout callback function to set time out bit */
-+void set_tmout(unsigned long indicator)
-+{
-+	*(int *)indicator = 1;
-+}
-+
-+/* Initialize timers */
-+void fsl_otg_init_timers(struct otg_fsm *fsm)
-+{
-+	/* FSM used timers */
-+	fsm->a_wait_vrise_tmr = otg_timer_initializer(&set_tmout, TA_WAIT_VRISE,
-+				(unsigned long)&fsm->a_wait_vrise_tmout);
-+	fsm->a_wait_bcon_tmr = otg_timer_initializer(&set_tmout, TA_WAIT_BCON,
-+				(unsigned long)&fsm->a_wait_bcon_tmout);
-+	fsm->a_aidl_bdis_tmr = otg_timer_initializer(&set_tmout, TA_AIDL_BDIS,
-+				(unsigned long)&fsm->a_aidl_bdis_tmout);
-+	fsm->b_ase0_brst_tmr = otg_timer_initializer(&set_tmout, TB_ASE0_BRST,
-+				(unsigned long)&fsm->b_ase0_brst_tmout);
-+	fsm->b_se0_srp_tmr = otg_timer_initializer(&set_tmout, TB_SE0_SRP,
-+				(unsigned long)&fsm->b_se0_srp);
-+	fsm->b_srp_fail_tmr = otg_timer_initializer(&set_tmout, TB_SRP_FAIL,
-+				(unsigned long)&fsm->b_srp_done);
-+	fsm->a_wait_enum_tmr = otg_timer_initializer(&a_wait_enum, 10,
-+				(unsigned long)&fsm);
-+
-+	/* device driver used timers */
-+	b_srp_wait_tmr = otg_timer_initializer(&b_srp_end, TB_SRP_WAIT, 0);
-+	b_data_pulse_tmr = otg_timer_initializer(&b_data_pulse_end,
-+				TB_DATA_PLS, 0);
-+	b_vbus_pulse_tmr = otg_timer_initializer(&b_vbus_pulse_end,
-+				TB_VBUS_PLS, 0);
-+
-+}
-+
-+/* Add timer to timer list */
-+void fsl_otg_add_timer(void *gtimer)
-+{
-+	struct fsl_otg_timer *timer = (struct fsl_otg_timer *)gtimer;
-+	struct fsl_otg_timer *tmp_timer;
-+
-+	/* Check if the timer is already in the active list,
-+	 * if so update timer count
-+	 */
-+	list_for_each_entry(tmp_timer, &active_timers, list)
-+	    if (tmp_timer == timer) {
-+		timer->count = timer->expires;
-+		return;
-+	}
-+	timer->count = timer->expires;
-+	list_add_tail(&timer->list, &active_timers);
-+}
-+
-+/* Remove timer from the timer list; clear timeout status */
-+void fsl_otg_del_timer(void *gtimer)
-+{
-+	struct fsl_otg_timer *timer = (struct fsl_otg_timer *)gtimer;
-+	struct fsl_otg_timer *tmp_timer, *del_tmp;
-+
-+	list_for_each_entry_safe(tmp_timer, del_tmp, &active_timers, list)
-+		if (tmp_timer == timer)
-+			list_del(&timer->list);
-+}
-+
-+/*
-+ * Reduce timer count by 1, and find timeout conditions.
-+ * Called by fsl_otg 1ms timer interrupt
-+ */
-+int fsl_otg_tick_timer(void)
-+{
-+	struct fsl_otg_timer *tmp_timer, *del_tmp;
-+	int expired = 0;
-+
-+	list_for_each_entry_safe(tmp_timer, del_tmp, &active_timers, list) {
-+		tmp_timer->count--;
-+		/* check if timer expires */
-+		if (!tmp_timer->count) {
-+			list_del(&tmp_timer->list);
-+			tmp_timer->function(tmp_timer->data);
-+			expired = 1;
-+		}
-+	}
-+
-+	return expired;
-+}
-+
-+/* Reset controller, not reset the bus */
-+void otg_reset_controller(void)
-+{
-+	u32 command;
-+	unsigned long flags;
-+	int timeout;
-+
-+	VDBG("\n");
-+
-+	spin_lock_irqsave(&usb_dr_regs_lock, flags);
-+
-+	command = fsl_readl(&usb_dr_regs->usbcmd);
-+	command |= USB_CMD_CTRL_RESET;
-+	fsl_writel(command, &usb_dr_regs->usbcmd);
-+	spin_unlock_irqrestore(&usb_dr_regs_lock, flags);
-+
-+	/* Wait reset completed */
-+	timeout = 500;
-+	while (fsl_readl(&usb_dr_regs->usbcmd) & USB_CMD_CTRL_RESET)
-+		udelay(1);
-+	if (timeout <= 0)
-+		ERR("%s - USBCMD_RST never clear. Timeout is %d \n",
-+			__FUNCTION__, timeout);
-+}
-+
-+/* Call suspend/resume routines in host driver */
-+int fsl_otg_start_host(struct otg_fsm *fsm, int on)
-+{
-+	struct otg_transceiver *xceiv = fsm->transceiver;
-+	struct device *dev;
-+	struct fsl_otg *otg_dev = container_of(xceiv, struct fsl_otg, otg);
-+	u32 retval = 0;
-+
-+	if (!xceiv->host)
-+		return -ENODEV;
-+
-+	dev = xceiv->host->controller;
-+
-+	/*
-+	 * Update a_vbus_vld state as a_vbus_vld int is disabled
-+	 * in device mode
-+	 */
-+	fsm->a_vbus_vld =
-+		!!(fsl_readl(&usb_dr_regs->otgsc) & OTGSC_STS_A_VBUS_VALID);
-+	if (on) {
-+		/* start fsl usb host controller */
-+		if (otg_dev->host_working)
-+			goto end;
-+		else {
-+			otg_reset_controller();
-+			VDBG("host on......\n");
-+			if (dev->driver->resume) {
-+				retval = dev->driver->resume(dev);
-+				if (fsm->id) {
-+					/* default-b */
-+					fsl_otg_drv_vbus(1);
-+					/* Workaround: b_host can't driver
-+					 * vbus, but PP in PORTSC needs to
-+					 * be 1 for host to work.
-+					 * So we set drv_vbus bit in
-+					 * transceiver to 0 thru ULPI. */
-+					write_ulpi(0x0c, 0x20);
-+				}
-+			}
-+
-+			otg_dev->host_working = 1;
-+		}
-+	} else {
-+		/* stop fsl usb host controller */
-+		if (!otg_dev->host_working)
-+			goto end;
-+		else {
-+			VDBG("host off......\n");
-+			if (dev && dev->driver) {
-+				retval = dev->driver->suspend(dev, PMSG_SUSPEND);
-+				if (fsm->id)
-+					/* default-b */
-+					fsl_otg_drv_vbus(0);
-+			}
-+			otg_dev->host_working = 0;
-+		}
-+	}
-+end:
-+	return retval;
-+}
-+
-+/*
-+ * Call suspend and resume function in udc driver
-+ * to stop and start udc driver.
-+ */
-+int fsl_otg_start_gadget(struct otg_fsm *fsm, int on)
-+{
-+	struct otg_transceiver *xceiv = fsm->transceiver;
-+	struct device *dev;
-+
-+	VDBG("DDD fsm=%p  xceiv=%p\n", fsm, xceiv);
-+	if (!xceiv->gadget || !xceiv->gadget->dev.parent)
-+		return -ENODEV;
-+
-+	VDBG("DDD xceiv=%p  xceiv->gadget=%p  parent=%p\n", xceiv, xceiv->gadget,
-+		xceiv->gadget->dev.parent);
-+
-+	VDBG("gadget %s\n", on ? "on" : "off");
-+	/* DDD  dump_state("starting gadget", fsm); */
-+
-+	dev = xceiv->gadget->dev.parent;
-+
-+	if (on)
-+		dev->driver->resume(dev);
-+	else
-+		dev->driver->suspend(dev, PMSG_SUSPEND);
-+
-+	return 0;
-+}
-+
-+static void fsl_otg_enable(struct otg_transceiver *otg_p)
-+{
-+	struct fsl_otg *otg_dev = container_of(otg_p, struct fsl_otg, otg);
-+	struct otg_fsm *fsm = &(otg_dev)->fsm;
-+	u32 otg_sc;
-+
-+	/* DDD VDBG(""); */
-+	/* enable OTG interrupt */
-+	otg_sc = fsl_readl(&usb_dr_regs->otgsc);
-+	otg_sc |= OTGSC_INTERRUPT_ENABLE_BITS_MASK;
-+	otg_sc &= ~OTGSC_IE_1ms_TIMER;
-+	otg_sc &= ~OTGSC_CTRL_VBUS_DISCHARGE;
-+	otg_sc |= OTGSC_IE_USB_ID;	/* DDD added this */
-+	fsl_writel(otg_sc, &usb_dr_regs->otgsc);
-+
-+	fsm->id = (otg_sc & OTGSC_STS_USB_ID) ? 1 : 0;
-+
-+	if (fsm->id) {
-+		otg_p->state = OTG_STATE_UNDEFINED;
-+	} else {
-+		otg_p->state = OTG_STATE_A_IDLE;
-+	}
-+
-+	otg_p->default_a = (fsm->id == 0);
-+	otg_p->host->is_b_host = fsm->id;
-+	otg_p->gadget->is_a_peripheral = !fsm->id;
-+
-+	fsm->a_vbus_vld = 1;
-+
-+	fsm->b_sess_vld = (otg_sc & OTGSC_STS_B_SESSION_VALID) ? 1 : 0;
-+	fsm->a_sess_vld = (otg_sc & OTGSC_STS_A_SESSION_VALID) ? 1 : 0;
-+	fsm->b_sess_end = (otg_sc & OTGSC_STS_B_SESSION_END) ? 1 : 0;
-+}
-+
-+/*
-+ * Called by initialization code of host driver.  Register host controller
-+ * to the OTG.  Suspend host for OTG role detection.
-+ */
-+static int fsl_otg_set_host(struct otg_transceiver *otg_p, struct usb_bus *host)
-+{
-+#if 0 // DDD beta-final
-+	struct fsl_otg *otg_dev = container_of(otg_p, struct fsl_otg, otg);
-+	struct device *dev = host->controller;
-+
-+	if (!otg_p || otg_dev != fsl_otg_dev)
-+		return -ENODEV;
-+
-+	otg_p->host = host;
-+	otg_p->host->is_b_host = otg_dev->fsm.id;
-+
-+	otg_dev->fsm.a_bus_drop = 0;
-+	otg_dev->fsm.a_bus_req = 1;
-+
-+	otg_p->host->otg_port = fsl_otg_initdata.otg_port;
-+
-+	if (dev && dev->driver) {
-+		VDBG("suspending host\n");
-+		dev->driver->suspend(dev, PMSG_SUSPEND);
-+		otg_dev->host_working = 0;
-+		VDBG("back\n");
-+	}
-+
-+
-+	/* dump_state("set_host running statemachine", &otg_dev->fsm); DDD */
-+	otg_statemachine(&otg_dev->fsm);
-+
-+	return 0;
-+#else
-+	struct fsl_otg *otg_dev = container_of(otg_p, struct fsl_otg, otg);
-+
-+	if (!otg_p || otg_dev != fsl_otg_dev)
-+		return -ENODEV;
-+
-+	otg_p->host = host;
-+
-+	otg_dev->fsm.a_bus_drop = 0;
-+	otg_dev->fsm.a_bus_req = 1;
-+
-+	if (host) {
-+		VDBG("host off......\n");
-+
-+		otg_p->host->otg_port = fsl_otg_initdata.otg_port;
-+		otg_p->host->is_b_host = otg_dev->fsm.id;
-+		/* must leave time for khubd to finish its thing
-+		 * before yanking the host driver out from under it,
-+		 * so suspend the host after a short delay.
-+		 */
-+		otg_dev->host_working = 1;
-+		schedule_delayed_work(&otg_dev->otg_event, 100);
-+		return 0;
-+	} else {		/* host driver going away */
-+
-+		if (!(le32_to_cpu(otg_dev->dr_mem_map->otgsc) &
-+		      OTGSC_STS_USB_ID)) {
-+			/* Mini-A cable connected */
-+			struct otg_fsm *fsm = &otg_dev->fsm;
-+
-+			otg_p->state = OTG_STATE_UNDEFINED;
-+			fsm->protocol = PROTO_UNDEF;
-+		}
-+	}
-+
-+	otg_dev->host_working = 0;
-+
-+	otg_statemachine(&otg_dev->fsm);
-+
-+	return 0;
-+#endif
-+}
-+
-+/* Called by initialization code of udc.  Register udc to OTG.*/
-+static int fsl_otg_set_peripheral(struct otg_transceiver *otg_p,
-+				  struct usb_gadget *gadget)
-+{
-+	struct fsl_otg *otg_dev = container_of(otg_p, struct fsl_otg, otg);
-+
-+	VDBG("\n");
-+
-+	if (!otg_p || otg_dev != fsl_otg_dev)
-+		return -ENODEV;
-+
-+	if (!gadget) {
-+		if (!otg_dev->otg.default_a)
-+			otg_p->gadget->ops->vbus_draw(otg_p->gadget, 0);
-+		usb_gadget_vbus_disconnect(otg_dev->otg.gadget);
-+		otg_dev->otg.gadget = 0;
-+		otg_dev->fsm.b_bus_req = 0;
-+		otg_statemachine(&otg_dev->fsm);
-+		return 0;
-+	}
-+
-+	otg_p->gadget = gadget;
-+	otg_p->gadget->is_a_peripheral = !otg_dev->fsm.id;
-+
-+	otg_dev->fsm.b_bus_req = 1;
-+
-+#if 0 /* DDD uClinux */
-+	if (otg_p->host) {
-+		fsl_otg_enable(otg_p);
-+		otg_statemachine(&otg_dev->fsm);
-+	}
-+#endif
-+	/* start the gadget right away if the ID pin says Mini-B */
-+	DBG("ID pin=%d\n", otg_dev->fsm.id);
-+	if (otg_dev->fsm.id == 1) {
-+		fsl_otg_start_host(&otg_dev->fsm, 0);
-+		fsl_otg_drv_vbus(0);
-+		fsl_otg_start_gadget(&otg_dev->fsm, 1);
-+	}
-+
-+	return 0;
-+}
-+
-+/* Set OTG port power, only for B-device */
-+static int fsl_otg_set_power(struct otg_transceiver *otg_p, unsigned mA)
-+{
-+	if (!fsl_otg_dev)
-+		return -ENODEV;
-+	if (otg_p->state == OTG_STATE_B_PERIPHERAL)
-+		printk(KERN_DEBUG "FSL OTG:Draw %d mA\n", mA);
-+
-+	return 0;
-+}
-+
-+/* Delayed pin detect interrupt processing.
-+ *
-+ * When the Mini-A cable is disconnected from the board,
-+ * the pin-detect interrupt happens before the disconnnect
-+ * interrupts for the connected device(s).  In order to
-+ * process the disconnect interrupt(s) prior to switching
-+ * roles, the pin-detect interrupts are delayed, and handled
-+ * by this routine.
-+ */
-+static void fsl_otg_event(struct work_struct *work)
-+{
-+	struct fsl_otg *og = container_of(work, struct fsl_otg, otg_event.work);
-+	struct otg_fsm *fsm = &og->fsm;
-+
-+	VDBG("DDD fsm->id=%d\n", fsm->id);
-+	if (fsm->id) {		/* switch to gadget */
-+		fsl_otg_start_host(fsm, 0);
-+		fsl_otg_drv_vbus(0);
-+		fsl_otg_start_gadget(fsm, 1);
-+	}
-+}
-+
-+/* B-device start SRP */
-+static int fsl_otg_start_srp(struct otg_transceiver *otg_p)
-+{
-+	struct fsl_otg *otg_dev = container_of(otg_p, struct fsl_otg, otg);
-+
-+	if (!otg_p || otg_dev != fsl_otg_dev
-+	    || otg_p->state != OTG_STATE_B_IDLE)
-+		return -ENODEV;
-+
-+	otg_dev->fsm.b_bus_req = 1;
-+	otg_statemachine(&otg_dev->fsm);
-+
-+	return 0;
-+}
-+
-+/* A_host suspend will call this function to start hnp */
-+static int fsl_otg_start_hnp(struct otg_transceiver *otg_p)
-+{
-+	struct fsl_otg *otg_dev = container_of(otg_p, struct fsl_otg, otg);
-+
-+	if (!otg_p || otg_dev != fsl_otg_dev)
-+		return -ENODEV;
-+
-+	VDBG("start_hnp.............\n");
-+	/* clear a_bus_req to enter a_suspend state */
-+	otg_dev->fsm.a_bus_req = 0;
-+	otg_statemachine(&otg_dev->fsm);
-+
-+	return 0;
-+}
-+
-+/*
-+ * Interrupt handler.  OTG/host/peripheral share the same int line.
-+ * OTG driver clears OTGSC interrupts and leaves USB interrupts
-+ * intact.  It needs to have knowledge of some USB interrupts
-+ * such as port change.
-+ */
-+irqreturn_t fsl_otg_isr(int irq, void *dev_id)
-+{
-+	struct otg_fsm *fsm = &((struct fsl_otg *)dev_id)->fsm;
-+	struct otg_transceiver *otg = &((struct fsl_otg *)dev_id)->otg;
-+	u32 otg_int_src, otg_sc;
-+
-+	otg_sc = fsl_readl(&usb_dr_regs->otgsc);
-+	otg_int_src = otg_sc & OTGSC_INTSTS_MASK & (otg_sc >> 8);
-+
-+	/* Only clear otg interrupts */
-+	fsl_writel(otg_sc, &usb_dr_regs->otgsc);
-+
-+	/*FIXME: ID change not generate when init to 0 */
-+	fsm->id = (otg_sc & OTGSC_STS_USB_ID) ? 1 : 0;
-+	otg->default_a = (fsm->id == 0);
-+
-+	/* process OTG interrupts */
-+	if (otg_int_src) {
-+		VDBG("\nOTG irq 0x%08x\n", otg_int_src);
-+
-+		if (otg_int_src & OTGSC_INTSTS_USB_ID) {
-+			fsm->id = (otg_sc & OTGSC_STS_USB_ID) ? 1 : 0;
-+			otg->default_a = (fsm->id == 0);
-+			/* clear conn information */
-+			if (fsm->id)
-+				fsm->b_conn = 0;
-+			else
-+				fsm->a_conn = 0;
-+
-+			if (otg->host)
-+				otg->host->is_b_host = fsm->id;
-+			if (otg->gadget)
-+				otg->gadget->is_a_peripheral = !fsm->id;
-+			VDBG("ID int (ID is %d)\n", fsm->id);
-+
-+			if (fsm->id) {	/* switch to gadget */
-+				schedule_delayed_work(&((struct fsl_otg *)
-+							dev_id)->otg_event, 25);
-+			} else {	/* switch to host */
-+				cancel_delayed_work(&
-+						    ((struct fsl_otg *)dev_id)->
-+						    otg_event);
-+				fsl_otg_start_gadget(fsm, 0);
-+				fsl_otg_drv_vbus(1);
-+				fsl_otg_start_host(fsm, 1);
-+			}
-+
-+			return IRQ_HANDLED;
-+		}
-+	}
-+
-+	return IRQ_NONE;
-+}
-+
-+
-+#if 0 // DDD feta-final
-+irqreturn_t foo_fsl_otg_isr(int irq, void *dev_id)
-+{
-+	struct otg_fsm *fsm = &((struct fsl_otg *)dev_id)->fsm;
-+	struct otg_transceiver *otg = &((struct fsl_otg *)dev_id)->otg;
-+	u32 otg_int_src, usb_int_src, otg_sc;
-+	int trigger = 0;
-+	int tmp;
-+
-+	usb_int_src = fsl_readl(&usb_dr_regs->usbsts);
-+	otg_sc = fsl_readl(&usb_dr_regs->otgsc);
-+	otg_int_src = otg_sc & OTGSC_INTSTS_MASK & (otg_sc >> 8);
-+
-+	/* Only clear otg interrupts */
-+	fsl_writel(otg_sc, &usb_dr_regs->otgsc);
-+
-+	/*FIXME: ID change not generate when init to 0 */
-+	/* process OTG interrupts */
-+	if (otg_int_src) {
-+		VDBG("\nOTG irq 0x%08x\n", otg_int_src);
-+		if (otg_int_src & OTGSC_INTSTS_1MS_TIMER)
-+			trigger = fsl_otg_tick_timer();
-+
-+		if (otg_int_src & OTGSC_INTSTS_USB_ID) {
-+			fsm->id = (otg_sc & OTGSC_STS_USB_ID) ? 1 : 0;
-+			otg->default_a = (fsm->id == 0);
-+			if (otg->host)
-+				otg->host->is_b_host = fsm->id;
-+			if (otg->gadget)
-+				otg->gadget->is_a_peripheral = !fsm->id;
-+			VDBG("IRQ=ID now=%d\n", fsm->id);
-+
-+			if (fsm->id) {	/* switch to gadget */
-+				schedule_delayed_work(&((struct fsl_otg *)
-+							dev_id)->otg_event, 25);
-+			} else {	/* switch to host */
-+				cancel_delayed_work(&
-+						    ((struct fsl_otg *)dev_id)->
-+						    otg_event);
-+				fsl_otg_start_gadget(fsm, 0);
-+				fsl_otg_drv_vbus(1);
-+				fsl_otg_start_host(fsm, 1);
-+			}
-+
-+			return IRQ_HANDLED;
-+		}
-+		if (otg_int_src & OTGSC_INTSTS_DATA_PULSE) {
-+			fsm->a_srp_det = 1;
-+			trigger = 1;
-+			VDBG("!!!!Data pulse int\n");
-+		}
-+		if (otg_int_src & OTGSC_INTSTS_A_SESSION_VALID) {
-+			fsm->a_sess_vld =
-+			    (otg_sc & OTGSC_STS_A_SESSION_VALID) ? 1 : 0;
-+			/* detect VBUS pulsing */
-+			if ((fsm->transceiver->state == OTG_STATE_A_IDLE)
-+			    && fsm->a_sess_vld)
-+				fsm->a_srp_det = 1;
-+			trigger = 1;
-+			VDBG("!!!a_sess_vld int state=%d\n", fsm->a_sess_vld);
-+		}
-+		if (otg_int_src & OTGSC_INTSTS_A_VBUS_VALID) {
-+			fsm->a_vbus_vld = !!(otg_sc & OTGSC_STS_A_VBUS_VALID);
-+			trigger = 1;
-+			VDBG("!!!a_vbus_vld int state=%d\n", fsm->a_vbus_vld);
-+
-+#if 1
-+		if ((fsm->a_vbus_vld == 0) && (fsm->id == 0)) {
-+			if (fsm->transceiver->state != OTG_STATE_A_WAIT_VFALL)
-+				/* Warning insted of transfer to Error state. */
-+				printk(KERN_WARNING "ulpi: The USB Device is "
-+				       "sinking too much current!!\n");
-+			fsm->a_vbus_vld = 1;
-+		}
-+#endif
-+
-+
-+		}
-+		if (otg_int_src & OTGSC_INTSTS_B_SESSION_VALID) {
-+			fsm->b_sess_vld =
-+			    (otg_sc & OTGSC_STS_B_SESSION_VALID) ? 1 : 0;
-+			trigger = 1;
-+			/* SRP done */
-+			if ((fsl_otg_dev->otg.state == OTG_STATE_B_SRP_INIT) &&
-+			    fsm->b_sess_vld && srp_wait_done)
-+				fsm->b_srp_done = 1;
-+			VDBG("!!!!b_sess_vld int state=%d\n", fsm->b_sess_vld);
-+		}
-+		if (otg_int_src & OTGSC_INTSTS_B_SESSION_END) {
-+			fsm->b_sess_end =
-+			    (otg_sc & OTGSC_STS_B_SESSION_END) ? 1 : 0;
-+			trigger = 1;
-+			VDBG("!!!!b_sess_end int state=%d\n", fsm->b_sess_end);
-+		}
-+	}
-+
-+	/* process USB interrupts */
-+	if ((usb_int_src & USB_STS_PORT_CHANGE)
-+	    && (fsm->protocol == PROTO_HOST)) {
-+		VDBG("\nUSB irq A 0x%08x\n", usb_int_src);
-+		/* Device resume do not generate statemachine change */
-+		if (fsl_readl(&usb_dr_regs->portsc1) &
-+		    PORTSCX_PORT_FORCE_RESUME) {
-+			if (otg->default_a) {
-+				fsm->b_bus_resume = 1;
-+				trigger = 1;
-+			} else {
-+				fsm->a_bus_resume = 1;
-+				trigger = 1;
-+			}
-+		}
-+
-+		tmp = (fsl_readl(&usb_dr_regs->portsc1) &
-+		       PORTSCX_CURRENT_CONNECT_STATUS) ? 1 : 0;
-+		if (otg->default_a && (fsm->b_conn != tmp)) {
-+			fsm->b_conn = tmp;
-+			trigger = 1;
-+		} else if (!otg->default_a && (fsm->a_conn != tmp)) {
-+			fsm->a_conn = tmp;
-+			trigger = 1;
-+		}
-+	}
-+	/* Workaround: sometimes CSC bit will lost.  We change to
-+	 * polling CCS bit for connect change */
-+	if (fsm->protocol == PROTO_GADGET) {
-+		if (usb_int_src & USB_STS_SUSPEND) {
-+			VDBG("\nUSB irq B 0x%08x\n", usb_int_src);
-+			VDBG("peripheral detected suspend\n");
-+			if (otg->default_a)
-+				/* A-device detects B suspend */
-+				fsm->b_bus_suspend = 1;
-+			else
-+				/* B-device detects A suspend */
-+				fsm->a_bus_suspend = 1;
-+			trigger = 1;
-+		} else if (usb_int_src & USB_STS_PORT_CHANGE) {
-+			VDBG("\nUSB irq C 0x%08x\n", usb_int_src);
-+			VDBG("peripheral resumed\n");
-+			if (otg->default_a)
-+				fsm->b_bus_suspend = 0;
-+			else
-+				fsm->a_bus_suspend = 0;
-+			trigger = 1;
-+		}
-+	}
-+
-+	/* Invoke statemachine until state is stable */
-+	while (trigger) {
-+		trigger = otg_statemachine(fsm);
-+	}
-+
-+	return IRQ_HANDLED;
-+}
-+#endif
-+
-+
-+static struct otg_fsm_ops fsl_otg_ops = {
-+	.chrg_vbus = fsl_otg_chrg_vbus,
-+	.drv_vbus = fsl_otg_drv_vbus,
-+	.loc_conn = fsl_otg_loc_conn,
-+	.loc_sof = fsl_otg_loc_sof,
-+	.start_pulse = fsl_otg_start_pulse,
-+
-+	.add_timer = fsl_otg_add_timer,
-+	.del_timer = fsl_otg_del_timer,
-+
-+	.start_host = fsl_otg_start_host,
-+	.start_gadget = fsl_otg_start_gadget,
-+};
-+
-+/* Initialize the global variable fsl_otg_dev and request IRQ for OTG */
-+int fsl_otg_cfg(struct platform_device *pdev)
-+{
-+	int status;
-+	struct fsl_otg *fsl_otg_tc;
-+	struct fsl_usb2_platform_data *pdata = pdev->dev.platform_data;
-+	struct resource *res;
-+
-+	DBG("\n");
-+
-+	if (fsl_otg_dev)
-+		return 0;
-+
-+	/* allocate space to fsl otg device */
-+	fsl_otg_tc = kzalloc(sizeof(struct fsl_otg), GFP_KERNEL);
-+	if (!fsl_otg_tc)
-+		return -ENODEV;
-+
-+#if 1 // DDD
-+	if (pdata->regs) {
-+		fsl_otg_tc->dr_mem_map = pdata->regs;
-+	} else {
-+		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+		if (!res) {
-+			dev_err(&pdev->dev, "no register addr.\n");
-+			return -ENODEV;
-+		}
-+
-+		printk("DDD %s(): rsrc_start=0x%x  rsrc_len=0x%x\n",
-+		     __FUNCTION__, res->start, res->end - res->start + 1);
-+
-+		if (!request_mem_region(res->start, res->end - res->start + 1,
-+					"OTG")) {
-+			dev_dbg(&pdev->dev, "request_mem_region failed\n");
-+			return -EBUSY;
-+		}
-+		fsl_otg_tc->dr_mem_map = ioremap(res->start,
-+						 res->end - res->start + 1);
-+	}
-+	DBG("set dr_mem_map to 0x%p\n", fsl_otg_tc->dr_mem_map);
-+
-+#endif 
-+	INIT_DELAYED_WORK(&fsl_otg_tc->otg_event, fsl_otg_event);
-+
-+	INIT_LIST_HEAD(&active_timers);
-+	fsl_otg_init_timers(&fsl_otg_tc->fsm);
-+
-+	/* Set OTG state machine operations */
-+	fsl_otg_tc->fsm.ops = &fsl_otg_ops;
-+
-+#if 1 /* DDD */
-+	/* record initial state of ID pin */
-+	fsl_otg_tc->fsm.id = (fsl_otg_tc->dr_mem_map->otgsc & OTGSC_STS_USB_ID)
-+	    ? 1 : 0;
-+	DBG("initial ID pin=%d\n", fsl_otg_tc->fsm.id);
-+#endif
-+	/* initialize the otg structure */
-+	fsl_otg_tc->otg.label = DRIVER_DESC;
-+	fsl_otg_tc->otg.set_host = fsl_otg_set_host;
-+	fsl_otg_tc->otg.set_peripheral = fsl_otg_set_peripheral;
-+	fsl_otg_tc->otg.set_power = fsl_otg_set_power;
-+	fsl_otg_tc->otg.start_hnp = fsl_otg_start_hnp;
-+	fsl_otg_tc->otg.start_srp = fsl_otg_start_srp;
-+
-+	fsl_otg_dev = fsl_otg_tc;
-+
-+	/* Store the otg transceiver */
-+	status = otg_set_transceiver(&fsl_otg_tc->otg);
-+	if (status) {
-+		printk(KERN_WARNING ": unable to register OTG transceiver.\n");
-+		return status;
-+	}
-+
-+	return 0;
-+}
-+
-+/* OTG Initialization*/
-+int usb_otg_start(struct platform_device *pdev)
-+{
-+	struct fsl_otg *p_otg;
-+	struct otg_transceiver *otg_trans = otg_get_transceiver();
-+	struct otg_fsm *fsm;
-+	int status;
-+	u32 temp;
-+	struct fsl_usb2_platform_data *pdata = pdev->dev.platform_data;
-+	int timeout;
-+
-+	DBG("\n");
-+
-+	p_otg = container_of(otg_trans, struct fsl_otg, otg);
-+	fsm = &p_otg->fsm;
-+
-+	/* Initialize the state machine structure with default values */
-+	SET_OTG_STATE(otg_trans, OTG_STATE_UNDEFINED);
-+	fsm->transceiver = &p_otg->otg;
-+
-+	usb_dr_regs = p_otg->dr_mem_map;
-+	DBG("set usb_dr_regs to 0x%p\n", usb_dr_regs);
-+
-+	/* request irq */
-+	p_otg->irq = platform_get_irq(pdev, 0);
-+	status = request_irq(p_otg->irq, fsl_otg_isr,
-+				IRQF_SHARED, driver_name, p_otg);
-+	if (status) {
-+		dev_dbg(p_otg->otg.dev, "can't get IRQ %d, error %d\n",
-+			p_otg->irq, status);
-+		kfree(p_otg);
-+		return status;
-+	}
-+
-+
-+	/* stop the controller */
-+	temp = fsl_readl(&usb_dr_regs->usbcmd) & ~USB_CMD_RUN_STOP;
-+	fsl_writel(temp, &usb_dr_regs->usbcmd);
-+
-+	/* reset the controller */
-+	temp = fsl_readl(&usb_dr_regs->usbcmd);
-+	temp |= USB_CMD_CTRL_RESET;
-+	fsl_writel(temp, &usb_dr_regs->usbcmd);
-+
-+	/* wait reset completed */
-+	timeout = 500;
-+	while (timeout-- &&
-+		fsl_readl(&usb_dr_regs->usbcmd) & USB_CMD_CTRL_RESET)
-+		udelay(1);
-+	if (timeout <= 0)
-+		ERR("%s - USBCMD_RST never clear. Timeout is %d \n",
-+			__FUNCTION__, timeout);
-+
-+	/* configure the VBUSHS as IDLE(both host and device) */
-+#if 0
-+	/* DDD really have to check into setting the following */
-+	fsl_writel(USB_MODE_STREAM_DISABLE, &usb_dr_regs->usbmode);
-+#else
-+	temp = USB_MODE_STREAM_DISABLE | (pdata->es ? USBMODE_ES : 0);
-+	fsl_writel(temp, &usb_dr_regs->usbmode);
-+#endif
-+
-+	/* configure PHY interface */
-+	temp = fsl_readl(&usb_dr_regs->portsc1);
-+	temp &= ~(PORTSCX_PHY_TYPE_SEL | PORTSCX_PTW_8BIT);
-+
-+	/* DDD wrong xcvr setting stuff follows */
-+	temp |= PORTSCX_PTS_ULPI;
-+	fsl_writel(temp, &usb_dr_regs->portsc1);
-+
-+
-+	/* disable all interrupt and clear all OTGSC status */
-+	temp = fsl_readl(&usb_dr_regs->otgsc);
-+	temp &= ~OTGSC_INTERRUPT_ENABLE_BITS_MASK;
-+#if 0 // DDD
-+	/* DDD only want ID int
-+	 * temp |= OTGSC_INTERRUPT_STATUS_BITS_MASK | OTGSC_CTRL_VBUS_DISCHARGE;
-+	 */
-+	temp |= OTGSC_IE_USB_ID;	/* DDD added this */
-+	temp &= ~OTGSC_IE_1ms_TIMER;	/* DDD added this */
-+#else
-+	temp |= OTGSC_INTERRUPT_STATUS_BITS_MASK | OTGSC_CTRL_VBUS_DISCHARGE;
-+#endif
-+	fsl_writel(temp, &usb_dr_regs->otgsc);
-+
-+	fsl_otg_drv_vbus(0);
-+
-+#if 0 // DDD beta-final
-+	temp = fsl_readl(&usb_dr_regs->otgsc);
-+	temp |= OTGSC_IE_A_SESSION_VALID;
-+	fsl_writel(temp, &usb_dr_regs->otgsc);
-+#else
-+	/*
-+	 * The identification (id) input is FALSE when a Mini-A plug is inserted
-+	 * in the devices Mini-AB receptacle. Otherwise, this input is TRUE.
-+	 * Also: record initial state of ID pin
-+	 */
-+	if (fsl_readl(&usb_dr_regs->otgsc) & OTGSC_STS_USB_ID) {
-+		p_otg->otg.state = OTG_STATE_UNDEFINED;
-+		p_otg->fsm.id = 1;
-+	} else {
-+		p_otg->otg.state = OTG_STATE_A_IDLE;
-+		p_otg->fsm.id = 0;
-+	}
-+
-+	DBG("initial ID pin=%d\n", p_otg->fsm.id);
-+
-+	/* enable OTG ID pin interrupt */
-+	temp = fsl_readl(&usb_dr_regs->otgsc);
-+	temp |= OTGSC_IE_USB_ID;
-+	temp &= ~(OTGSC_CTRL_VBUS_DISCHARGE | OTGSC_IE_1ms_TIMER);
-+	fsl_writel(temp, &usb_dr_regs->otgsc);
-+#endif
-+
-+	return 0;
-+}
-+
-+/* Initialize board specific registers,PIB board,clock and pin multiplexing */
-+static int board_init(struct platform_device *pdev)
-+{
-+	struct fsl_usb2_platform_data *pdata;
-+	pdata = (struct fsl_usb2_platform_data *)pdev->dev.platform_data;
-+
-+	/*
-+	 * do platform specific init: check the clock, grab/config pins, etc.
-+	 */
-+	if (pdata->platform_init(pdev) != 0)
-+		return -EINVAL;
-+
-+	return 0;
-+}
-+
-+/*-------------------------------------------------------------------------
-+		PROC File System Support
-+-------------------------------------------------------------------------*/
-+#ifdef CONFIG_USB_OTG_DEBUG_FILES
-+
-+#include <linux/seq_file.h>
-+
-+static const char proc_filename[] = "driver/fsl_usb2_otg";
-+
-+static int otg_proc_read(char *page, char **start, off_t off, int count,
-+			 int *eof, void *_dev)
-+{
-+	struct otg_fsm *fsm = &fsl_otg_dev->fsm;
-+	char *buf = page;
-+	char *next = buf;
-+	unsigned size = count;
-+	unsigned long flags;
-+	int t;
-+	u32 tmp_reg;
-+
-+	if (off != 0)
-+		return 0;
-+
-+	spin_lock_irqsave(&fsm->lock, flags);
-+
-+	/* ------basic driver infomation ---- */
-+	t = scnprintf(next, size,
-+		      DRIVER_DESC "\n" "fsl_usb2_otg version: %s\n\n",
-+		      DRIVER_VERSION);
-+	size -= t;
-+	next += t;
-+
-+	/* ------ Registers ----- */
-+	/* tmp_reg = le32_to_cpu(usb_dr_regs->otgsc); */
-+	tmp_reg = fsl_readl(&usb_dr_regs->otgsc);
-+	t = scnprintf(next, size, "OTGSC reg: 0x%08x\n", tmp_reg);
-+	size -= t;
-+	next += t;
-+
-+	/* tmp_reg = le32_to_cpu(usb_dr_regs->portsc); */
-+	tmp_reg = fsl_readl(&usb_dr_regs->portsc1);
-+	t = scnprintf(next, size, "PORTSC reg: 0x%08x\n", tmp_reg);
-+	size -= t;
-+	next += t;
-+
-+	/* tmp_reg = le32_to_cpu(usb_dr_regs->usbmode); */
-+	tmp_reg = fsl_readl(&usb_dr_regs->usbmode);
-+	t = scnprintf(next, size, "USBMODE reg: 0x%08x\n", tmp_reg);
-+	size -= t;
-+	next += t;
-+
-+	/* tmp_reg = le32_to_cpu(usb_dr_regs->usbcmd); */
-+	tmp_reg = fsl_readl(&usb_dr_regs->usbcmd);
-+	t = scnprintf(next, size, "USBCMD reg: 0x%08x\n", tmp_reg);
-+	size -= t;
-+	next += t;
-+
-+	/* tmp_reg = le32_to_cpu(usb_dr_regs->usbsts); */
-+	tmp_reg = fsl_readl(&usb_dr_regs->usbsts);
-+	t = scnprintf(next, size, "USBSTS reg: 0x%08x\n", tmp_reg);
-+	size -= t;
-+	next += t;
-+
-+	/* ------ State ----- */
-+	t = scnprintf(next, size, "FSM protocol=%d %s\n", fsm->protocol,
-+		fsm->protocol ?
-+		(fsm->protocol == PROTO_HOST ? "Host" : "Gadget")
-+		: "None");
-+	size -= t;
-+	next += t;
-+
-+	t = scnprintf(next, size,
-+		      "OTG state: %s\n\n",
-+		      state_string(fsl_otg_dev->otg.state));
-+	size -= t;
-+	next += t;
-+
-+	/* ------ State Machine Variables ----- */
-+	t = scnprintf(next, size, "a_bus_req: %d\n", fsm->a_bus_req);
-+	size -= t;
-+	next += t;
-+
-+	t = scnprintf(next, size, "b_bus_req: %d\n", fsm->b_bus_req);
-+	size -= t;
-+	next += t;
-+
-+	t = scnprintf(next, size, "a_bus_resume: %d\n", fsm->a_bus_resume);
-+	size -= t;
-+	next += t;
-+
-+	t = scnprintf(next, size, "a_bus_suspend: %d\n", fsm->a_bus_suspend);
-+	size -= t;
-+	next += t;
-+
-+	t = scnprintf(next, size, "a_conn: %d\n", fsm->a_conn);
-+	size -= t;
-+	next += t;
-+
-+	t = scnprintf(next, size, "a_sess_vld: %d\n", fsm->a_sess_vld);
-+	size -= t;
-+	next += t;
-+
-+	t = scnprintf(next, size, "a_srp_det: %d\n", fsm->a_srp_det);
-+	size -= t;
-+	next += t;
-+
-+	t = scnprintf(next, size, "a_vbus_vld: %d\n", fsm->a_vbus_vld);
-+	size -= t;
-+	next += t;
-+
-+	t = scnprintf(next, size, "b_bus_resume: %d\n", fsm->b_bus_resume);
-+	size -= t;
-+	next += t;
-+
-+	t = scnprintf(next, size, "b_bus_suspend: %d\n", fsm->b_bus_suspend);
-+	size -= t;
-+	next += t;
-+
-+	t = scnprintf(next, size, "b_conn: %d\n", fsm->b_conn);
-+	size -= t;
-+	next += t;
-+
-+	t = scnprintf(next, size, "b_se0_srp: %d\n", fsm->b_se0_srp);
-+	size -= t;
-+	next += t;
-+
-+	t = scnprintf(next, size, "b_sess_end: %d\n", fsm->b_sess_end);
-+	size -= t;
-+	next += t;
-+
-+	t = scnprintf(next, size, "b_sess_vld: %d\n", fsm->b_sess_vld);
-+	size -= t;
-+	next += t;
-+
-+	t = scnprintf(next, size, "id: %d\n", fsm->id);
-+	size -= t;
-+	next += t;
-+
-+	spin_unlock_irqrestore(&fsm->lock, flags);
-+
-+	*eof = 1;
-+	return count - size;
-+}
-+
-+#define create_proc_file()	create_proc_read_entry(proc_filename, \
-+				0, NULL, otg_proc_read, NULL)
-+
-+#define remove_proc_file()	remove_proc_entry(proc_filename, NULL)
-+
-+#else				/* !CONFIG_USB_OTG_DEBUG_FILES */
-+
-+#define create_proc_file()	do {} while (0)
-+#define remove_proc_file()	do {} while (0)
-+
-+#endif				/*CONFIG_USB_OTG_DEBUG_FILES */
-+
-+/*----------------------------------------------------------*/
-+/* Char driver interface to control some OTG input */
-+
-+/*
-+ * This function handle some ioctl command,such as get otg
-+ * status and set host suspend
-+ */
-+static int fsl_otg_ioctl(struct inode *inode, struct file *file,
-+			 unsigned int cmd, unsigned long arg)
-+{
-+	u32 retval = 0;
-+
-+	switch (cmd) {
-+	case GET_OTG_STATUS:
-+		retval = fsl_otg_dev->host_working;
-+		break;
-+
-+	case SET_A_SUSPEND_REQ:
-+		fsl_otg_dev->fsm.a_suspend_req = arg;
-+		break;
-+
-+	case SET_A_BUS_DROP:
-+		fsl_otg_dev->fsm.a_bus_drop = arg;
-+		break;
-+
-+	case SET_A_BUS_REQ:
-+		fsl_otg_dev->fsm.a_bus_req = arg;
-+		break;
-+
-+	case SET_B_BUS_REQ:
-+		fsl_otg_dev->fsm.b_bus_req = arg;
-+		break;
-+
-+	default:
-+		break;
-+	}
-+
-+	otg_statemachine(&fsl_otg_dev->fsm);
-+
-+	return retval;
-+}
-+
-+static int fsl_otg_open(struct inode *inode, struct file *file)
-+{
-+
-+	return 0;
-+}
-+
-+static int fsl_otg_release(struct inode *inode, struct file *file)
-+{
-+
-+	return 0;
-+}
-+
-+static struct file_operations otg_fops = {
-+	.owner = THIS_MODULE,
-+	.llseek = NULL,
-+	.read = NULL,
-+	.write = NULL,
-+	.ioctl = fsl_otg_ioctl,
-+	.open = fsl_otg_open,
-+	.release = fsl_otg_release,
-+};
-+
-+static int __init fsl_otg_probe(struct platform_device *pdev)
-+{
-+	int status;
-+	struct fsl_usb2_platform_data *pdata;
-+
-+	DBG("pdev=0x%p\n", pdev);
-+
-+	if (!pdev)
-+		return -ENODEV;
-+
-+	if (!pdev->dev.platform_data)
-+		return -ENOMEM;
-+
-+	pdata = pdev->dev.platform_data;
-+#if 1 // DDD do this elsewhere
-+	/* Initialize the clock, multiplexing pin and PHY interface */
-+	board_init(pdev);
-+#endif
-+
-+	/* configure the OTG */
-+	status = fsl_otg_cfg(pdev);
-+	if (status) {
-+		printk(KERN_INFO "Couldn't init OTG module\n");
-+		return -status;
-+	}
-+
-+	/* start OTG */
-+	status = usb_otg_start(pdev);
-+
-+	if (register_chrdev(FSL_OTG_MAJOR, FSL_OTG_NAME, &otg_fops)) {
-+		printk(KERN_WARNING FSL_OTG_NAME
-+		       ": unable to register FSL OTG device\n");
-+		return -EIO;
-+	}
-+
-+	create_proc_file();
-+	return status;
-+}
-+
-+static int fsl_otg_remove(struct platform_device *pdev)
-+{
-+	u32 ie;
-+	struct fsl_usb2_platform_data *pdata = pdev->dev.platform_data;
-+	unsigned long flags;
-+
-+	DBG("pdev=0x%p  pdata=0x%p\n", pdev, pdata);
-+
-+	otg_set_transceiver(NULL);
-+
-+	/* disable and clear OTGSC interrupts */
-+	spin_lock_irqsave(&usb_dr_regs_lock, flags);
-+	ie = fsl_readl(&usb_dr_regs->otgsc);
-+	ie &= ~OTGSC_INTERRUPT_ENABLE_BITS_MASK;
-+	ie |= OTGSC_INTERRUPT_STATUS_BITS_MASK;
-+	fsl_writel(ie, &usb_dr_regs->otgsc);
-+	spin_unlock_irqrestore(&usb_dr_regs_lock, flags);
-+
-+	free_irq(fsl_otg_dev->irq, fsl_otg_dev);
-+
-+	kfree(fsl_otg_dev);
-+
-+	remove_proc_file();
-+
-+	unregister_chrdev(FSL_OTG_MAJOR, FSL_OTG_NAME);
-+
-+	if (pdata->platform_uninit)
-+		pdata->platform_uninit(pdev);
-+
-+	fsl_otg_dev = NULL;
-+	return 0;
-+}
-+
-+struct platform_driver fsl_otg_driver = {
-+	.probe = fsl_otg_probe,
-+	.remove = fsl_otg_remove,
-+	.driver = {
-+		.name  = driver_name,
-+		.owner = THIS_MODULE,
-+	},
-+};
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static int __init fsl_usb_otg_init(void)
-+{
-+	printk(KERN_INFO DRIVER_DESC " loaded, %s\n", DRIVER_VERSION);
-+	return platform_driver_register(&fsl_otg_driver);
-+}
-+
-+static void __exit fsl_usb_otg_exit(void)
-+{
-+	platform_driver_unregister(&fsl_otg_driver);
-+}
-+
-+module_init(fsl_usb_otg_init);
-+module_exit(fsl_usb_otg_exit);
-+
-+MODULE_DESCRIPTION(DRIVER_INFO);
-+MODULE_AUTHOR(DRIVER_AUTHOR);
-+MODULE_LICENSE("GPL");
---- /dev/null
-+++ b/drivers/usb/otg/fsl_otg.h
-@@ -0,0 +1,139 @@
-+/*
-+ * Copyright 2005-2007 Freescale Semiconductor, Inc. All Rights Reserved.
-+ */
-+
-+/*
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+#ifndef FSL_OTG_H
-+#define FSL_OTG_H
-+#include <linux/usb/otg.h>
-+#include "otg_fsm.h"
-+#include <linux/ioctl.h>
-+
-+#define ERR(format, arg...) \
-+printk(KERN_ERR "%s:%s: " format "\n" , __FILE__,  __FUNCTION__ , ## arg)
-+
-+/*
-+ *  A-DEVICE timing  constants
-+ */
-+
-+/* Wait for VBUS Rise  */
-+#define TA_WAIT_VRISE	(100)	/* a_wait_vrise 100 ms, section: 6.6.5.1 */
-+
-+/* Wait for B-Connect */
-+#define TA_WAIT_BCON	(10000)	/* a_wait_bcon > 1 sec, section: 6.6.5.2
-+				 * This is only used to get out of
-+				 * OTG_STATE_A_WAIT_BCON state if there was
-+				 * no connection for these many milliseconds
-+				 */
-+
-+/* A-Idle to B-Disconnect */
-+/* It is necessary for this timer to be more than 750 ms because of a bug in OPT
-+ * test 5.4 in which B OPT disconnects after 750 ms instead of 75ms as stated
-+ * in the test description
-+ */
-+#define TA_AIDL_BDIS	(5000)	/* a_suspend minimum 200 ms, section: 6.6.5.3 */
-+
-+/* B-Idle to A-Disconnect */
-+#define TA_BIDL_ADIS	(12)	/* 3 to 200 ms */
-+
-+/* B-device timing constants */
-+
-+/* Data-Line Pulse Time*/
-+#define TB_DATA_PLS	(10)	/* b_srp_init,continue 5~10ms, section:5.3.3 */
-+#define TB_DATA_PLS_MIN	(5)	/* minimum 5 ms */
-+#define TB_DATA_PLS_MAX	(10)	/* maximum 10 ms */
-+
-+/* SRP Initiate Time  */
-+#define TB_SRP_INIT	(100)	/* b_srp_init,maximum 100 ms, section:5.3.8 */
-+
-+/* SRP Fail Time  */
-+#define TB_SRP_FAIL	(7000)	/* b_srp_init,Fail time 5~30s, section:6.8.2.2 */
-+
-+/* SRP result wait time */
-+#define TB_SRP_WAIT	(60)
-+
-+/* VBus time */
-+#define TB_VBUS_PLS	(30)	/* time to keep vbus pulsing asserted */
-+
-+/* Discharge time */
-+/* This time should be less than 10ms. It varies from system to system. */
-+#define TB_VBUS_DSCHRG	(8)
-+
-+/* A-SE0 to B-Reset  */
-+#define TB_ASE0_BRST	(20)	/* b_wait_acon, mini 3.125 ms,section:6.8.2.4 */
-+
-+/* A bus suspend timer before we can switch to b_wait_aconn */
-+#define TB_A_SUSPEND	(7)
-+#define TB_BUS_RESUME	(12)
-+
-+/* SE0 Time Before SRP */
-+#define TB_SE0_SRP	(2)	/* b_idle,minimum 2 ms, section:5.3.2 */
-+
-+#define SET_OTG_STATE(otg_ptr, newstate)	((otg_ptr)->state = newstate)
-+
-+
-+struct fsl_otg_timer {
-+	unsigned long expires;	/* Number of count increase to timeout */
-+	unsigned long count;	/* Tick counter */
-+	void (*function) (unsigned long);	/* Timeout function */
-+	unsigned long data;	/* Data passed to function */
-+	struct list_head list;
-+};
-+
-+struct fsl_otg_timer inline *otg_timer_initializer
-+    (void (*function) (unsigned long), unsigned long expires,
-+     unsigned long data) {
-+	struct fsl_otg_timer *timer;
-+	timer = kmalloc(sizeof(struct fsl_otg_timer), GFP_KERNEL);
-+	if (timer == NULL)
-+		return NULL;
-+	timer->function = function;
-+	timer->expires = expires;
-+	timer->data = data;
-+	return timer;
-+}
-+
-+struct fsl_otg {
-+	struct otg_transceiver otg;
-+	struct otg_fsm fsm;
-+	struct fsl_usb_device_regs *dr_mem_map;
-+	struct delayed_work otg_event;
-+
-+	/*used for usb host */
-+	u8 host_working;
-+	u8 on_off;
-+
-+	int irq;
-+};
-+
-+struct fsl_otg_config {
-+	u8 otg_port;
-+};
-+
-+/*For SRP and HNP handle*/
-+#define FSL_OTG_MAJOR	66
-+#define FSL_OTG_NAME	"fsl-otg"
-+/*Command to OTG driver(ioctl)*/
-+#define OTG_IOCTL_MAGIC		FSL_OTG_MAJOR
-+/*if otg work as host,it should return 1,otherwise it return 0*/
-+#define GET_OTG_STATUS		_IOR(OTG_IOCTL_MAGIC, 1, int)
-+#define SET_A_SUSPEND_REQ	_IOW(OTG_IOCTL_MAGIC, 2, int)
-+#define SET_A_BUS_DROP		_IOW(OTG_IOCTL_MAGIC, 3, int)
-+#define SET_A_BUS_REQ		_IOW(OTG_IOCTL_MAGIC, 4, int)
-+#define SET_B_BUS_REQ		_IOW(OTG_IOCTL_MAGIC, 5, int)
-+#define GET_A_SUSPEND_REQ	_IOR(OTG_IOCTL_MAGIC, 6, int)
-+#define GET_A_BUS_DROP		_IOR(OTG_IOCTL_MAGIC, 7, int)
-+#define GET_A_BUS_REQ		_IOR(OTG_IOCTL_MAGIC, 8, int)
-+#define GET_B_BUS_REQ		_IOR(OTG_IOCTL_MAGIC, 9, int)
-+
-+
-+/********************************************************************/
-+#endif
---- /dev/null
-+++ b/drivers/usb/otg/otg_fsm.c
-@@ -0,0 +1,381 @@
-+/* OTG Finite State Machine from OTG spec
-+ *
-+ * Copyright (C) 2007 Freescale Semiconductor, Inc.
-+ *
-+ * Author: 	Li Yang <LeoLi@freescale.com>
-+ * 		Jerry Huang <Chang-Ming.Huang@freescale.com>
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the  GNU General Public License along
-+ * with this program; if not, write  to the Free Software Foundation, Inc.,
-+ * 675 Mass Ave, Cambridge, MA 02139, USA.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/types.h>
-+#include <linux/usb/otg.h>
-+#include <linux/spinlock.h>
-+#include <linux/delay.h>
-+#include <linux/usb.h>
-+#include <linux/usb_gadget.h>
-+
-+#include "otg_fsm.h"
-+
-+
-+/* Defined by device specific driver, for different timer implementation */
-+extern void *a_wait_vrise_tmr, *a_wait_bcon_tmr, *a_aidl_bdis_tmr,
-+	*b_ase0_brst_tmr, *b_se0_srp_tmr, *b_srp_fail_tmr, *a_wait_enum_tmr;
-+
-+const char *state_string(enum usb_otg_state state)
-+{
-+	switch (state) {
-+	case OTG_STATE_A_IDLE:		return "a_idle";
-+	case OTG_STATE_A_WAIT_VRISE:	return "a_wait_vrise";
-+	case OTG_STATE_A_WAIT_BCON:	return "a_wait_bcon";
-+	case OTG_STATE_A_HOST:		return "a_host";
-+	case OTG_STATE_A_SUSPEND:	return "a_suspend";
-+	case OTG_STATE_A_PERIPHERAL:	return "a_peripheral";
-+	case OTG_STATE_A_WAIT_VFALL:	return "a_wait_vfall";
-+	case OTG_STATE_A_VBUS_ERR:	return "a_vbus_err";
-+	case OTG_STATE_B_IDLE:		return "b_idle";
-+	case OTG_STATE_B_SRP_INIT:	return "b_srp_init";
-+	case OTG_STATE_B_PERIPHERAL:	return "b_peripheral";
-+	case OTG_STATE_B_WAIT_ACON:	return "b_wait_acon";
-+	case OTG_STATE_B_HOST:		return "b_host";
-+	default:			return "UNDEFINED";
-+	}
-+}
-+EXPORT_SYMBOL(state_string);
-+
-+/* Change USB protocol when there is a protocol change */
-+static int otg_set_protocol(struct otg_fsm *fsm, int protocol)
-+{
-+	int ret = 0;
-+
-+	VDBG("DDD old fsm->protocol= %d; new protocol= %d\n",
-+		     fsm->protocol, protocol);
-+	if (fsm->protocol != protocol) {
-+		VDBG("Changing role fsm->protocol= %d; new protocol= %d\n",
-+				fsm->protocol, protocol);
-+		/* stop old protocol */
-+		if (fsm->protocol == PROTO_HOST)
-+			ret = fsm->ops->start_host(fsm, 0);
-+		else if (fsm->protocol == PROTO_GADGET)
-+			ret = fsm->ops->start_gadget(fsm, 0);
-+		if (ret)
-+			return ret;
-+
-+		/* start new protocol */
-+		if (protocol == PROTO_HOST)
-+			ret = fsm->ops->start_host(fsm, 1);
-+		else if (protocol == PROTO_GADGET)
-+			ret = fsm->ops->start_gadget(fsm, 1);
-+		if (ret)
-+			return ret;
-+
-+		fsm->protocol = protocol;
-+		return 0;
-+	}
-+
-+	return 0;
-+}
-+
-+static int state_changed;
-+
-+/* Called when leaving a state.  Do state clean up jobs here */
-+static void otg_leave_state(struct otg_fsm *fsm, enum usb_otg_state old_state)
-+{
-+	switch (old_state) {
-+	case OTG_STATE_B_IDLE:
-+		otg_del_timer(fsm, fsm->b_se0_srp_tmr);
-+		fsm->b_se0_srp = 0;
-+		break;
-+	case OTG_STATE_B_SRP_INIT:
-+		fsm->b_srp_done = 0;
-+		break;
-+	case OTG_STATE_B_PERIPHERAL:
-+		break;
-+	case OTG_STATE_B_WAIT_ACON:
-+		otg_del_timer(fsm, fsm->b_ase0_brst_tmr);
-+		fsm->b_ase0_brst_tmout = 0;
-+		break;
-+	case OTG_STATE_B_HOST:
-+		break;
-+	case OTG_STATE_A_IDLE:
-+		break;
-+	case OTG_STATE_A_WAIT_VRISE:
-+		otg_del_timer(fsm, fsm->a_wait_vrise_tmr);
-+		fsm->a_wait_vrise_tmout = 0;
-+		break;
-+	case OTG_STATE_A_WAIT_BCON:
-+		otg_del_timer(fsm, fsm->a_wait_bcon_tmr);
-+		fsm->a_wait_bcon_tmout = 0;
-+		break;
-+	case OTG_STATE_A_HOST:
-+		otg_del_timer(fsm, fsm->a_wait_enum_tmr);
-+		break;
-+	case OTG_STATE_A_SUSPEND:
-+		otg_del_timer(fsm, fsm->a_aidl_bdis_tmr);
-+		fsm->a_aidl_bdis_tmout = 0;
-+		fsm->a_suspend_req = 0;
-+		fsm->a_bus_req = 1;	/* FIXME */
-+		break;
-+	case OTG_STATE_A_PERIPHERAL:
-+		break;
-+	case OTG_STATE_A_WAIT_VFALL:
-+		otg_del_timer(fsm, fsm->a_wait_vrise_tmr);
-+		break;
-+	case OTG_STATE_A_VBUS_ERR:
-+		break;
-+	default:
-+		break;
-+	}
-+}
-+
-+/* Called when entering a state */
-+static int otg_set_state(struct otg_fsm *fsm, enum usb_otg_state new_state)
-+{
-+	state_changed = 1;
-+	VDBG("State: old=%s new=%s \n",
-+		state_string(fsm->transceiver->state), state_string(new_state));
-+
-+	if (fsm->transceiver->state == new_state)
-+		return 0;
-+
-+	otg_leave_state(fsm, fsm->transceiver->state);
-+	switch (new_state) {
-+	case OTG_STATE_B_IDLE:
-+		otg_drv_vbus(fsm, 0);
-+		otg_chrg_vbus(fsm, 0);
-+		otg_loc_conn(fsm, 0);
-+		otg_loc_sof(fsm, 0);
-+		otg_set_protocol(fsm, PROTO_UNDEF);
-+		otg_add_timer(fsm, fsm->b_se0_srp_tmr);
-+		break;
-+	case OTG_STATE_B_SRP_INIT:
-+		otg_start_pulse(fsm);
-+		otg_loc_sof(fsm, 0);
-+		otg_set_protocol(fsm, PROTO_UNDEF);
-+		otg_add_timer(fsm, fsm->b_srp_fail_tmr);
-+		break;
-+	case OTG_STATE_B_PERIPHERAL:
-+		otg_chrg_vbus(fsm, 0);
-+		otg_loc_conn(fsm, 1);
-+		otg_loc_sof(fsm, 0);
-+		otg_set_protocol(fsm, PROTO_GADGET);
-+		break;
-+	case OTG_STATE_B_WAIT_ACON:
-+		otg_chrg_vbus(fsm, 0);
-+		otg_loc_conn(fsm, 0);
-+		otg_loc_sof(fsm, 0);
-+		otg_set_protocol(fsm, PROTO_HOST);
-+		otg_add_timer(fsm, fsm->b_ase0_brst_tmr);
-+		fsm->a_bus_suspend = 0;
-+		break;
-+	case OTG_STATE_B_HOST:
-+		otg_chrg_vbus(fsm, 0);
-+		otg_loc_conn(fsm, 0);
-+		otg_loc_sof(fsm, 1);
-+		otg_set_protocol(fsm, PROTO_HOST);
-+		usb_bus_start_enum(fsm->transceiver->host,
-+				   fsm->transceiver->host->otg_port);
-+		break;
-+	case OTG_STATE_A_IDLE:
-+		otg_drv_vbus(fsm, 0);
-+		otg_chrg_vbus(fsm, 0);
-+		otg_loc_conn(fsm, 0);
-+		otg_loc_sof(fsm, 0);
-+		otg_set_protocol(fsm, PROTO_HOST);
-+		break;
-+	case OTG_STATE_A_WAIT_VRISE:
-+		otg_drv_vbus(fsm, 1);
-+		otg_loc_conn(fsm, 0);
-+		otg_loc_sof(fsm, 0);
-+		otg_set_protocol(fsm, PROTO_HOST);
-+		otg_add_timer(fsm, fsm->a_wait_vrise_tmr);
-+		break;
-+	case OTG_STATE_A_WAIT_BCON:
-+		otg_drv_vbus(fsm, 1);
-+		otg_loc_conn(fsm, 0);
-+		otg_loc_sof(fsm, 0);
-+		otg_set_protocol(fsm, PROTO_HOST);
-+		otg_add_timer(fsm, fsm->a_wait_bcon_tmr);
-+		break;
-+	case OTG_STATE_A_HOST:
-+		otg_drv_vbus(fsm, 1);
-+		otg_loc_conn(fsm, 0);
-+		otg_loc_sof(fsm, 1);
-+		otg_set_protocol(fsm, PROTO_HOST);
-+		/*
-+		 * When HNP is triggered while a_bus_req = 0, a_host will
-+		 * suspend too fast to complete a_set_b_hnp_en
-+		 */
-+		if (!fsm->a_bus_req || fsm->a_suspend_req)
-+			otg_add_timer(fsm, fsm->a_wait_enum_tmr);
-+		break;
-+	case OTG_STATE_A_SUSPEND:
-+		otg_drv_vbus(fsm, 1);
-+		otg_loc_conn(fsm, 0);
-+		otg_loc_sof(fsm, 0);
-+		otg_set_protocol(fsm, PROTO_HOST);
-+		otg_add_timer(fsm, fsm->a_aidl_bdis_tmr);
-+
-+		break;
-+	case OTG_STATE_A_PERIPHERAL:
-+		otg_loc_conn(fsm, 1);
-+		otg_loc_sof(fsm, 0);
-+		otg_set_protocol(fsm, PROTO_GADGET);
-+		otg_drv_vbus(fsm, 1);
-+		break;
-+	case OTG_STATE_A_WAIT_VFALL:
-+		otg_drv_vbus(fsm, 0);
-+		otg_loc_conn(fsm, 0);
-+		otg_loc_sof(fsm, 0);
-+		otg_set_protocol(fsm, PROTO_HOST);
-+		break;
-+	case OTG_STATE_A_VBUS_ERR:
-+		otg_drv_vbus(fsm, 0);
-+		otg_loc_conn(fsm, 0);
-+		otg_loc_sof(fsm, 0);
-+		otg_set_protocol(fsm, PROTO_UNDEF);
-+		break;
-+	default:
-+		break;
-+	}
-+
-+	fsm->transceiver->state = new_state;
-+	return 0;
-+}
-+
-+/* State change judgement */
-+int otg_statemachine(struct otg_fsm *fsm)
-+{
-+	enum usb_otg_state state;
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&fsm->lock, flags);
-+
-+	state = fsm->transceiver->state;
-+	state_changed = 0;
-+	/* State machine state change judgement */
-+
-+	VDBG(" State: %s \n", state_string(state));
-+
-+	switch (state) {
-+	case OTG_STATE_UNDEFINED:
-+		if (fsm->id)
-+			otg_set_state(fsm, OTG_STATE_B_IDLE);
-+		else
-+			otg_set_state(fsm, OTG_STATE_A_IDLE);
-+		break;
-+	case OTG_STATE_B_IDLE:
-+		if (!fsm->id)
-+			otg_set_state(fsm, OTG_STATE_A_IDLE);
-+		else if (fsm->b_sess_vld && fsm->transceiver->gadget)
-+			otg_set_state(fsm, OTG_STATE_B_PERIPHERAL);
-+		else if (fsm->b_bus_req && fsm->b_sess_end && fsm->b_se0_srp)
-+			otg_set_state(fsm, OTG_STATE_B_SRP_INIT);
-+		break;
-+	case OTG_STATE_B_SRP_INIT:
-+		if (!fsm->id || fsm->b_srp_done)
-+			otg_set_state(fsm, OTG_STATE_B_IDLE);
-+		break;
-+	case OTG_STATE_B_PERIPHERAL:
-+		if (!fsm->id || !fsm->b_sess_vld)
-+			otg_set_state(fsm, OTG_STATE_B_IDLE);
-+		else if (fsm->b_bus_req &&
-+			 fsm->transceiver->
-+			 gadget->b_hnp_enable && fsm->a_bus_suspend)
-+			otg_set_state(fsm, OTG_STATE_B_WAIT_ACON);
-+		break;
-+	case OTG_STATE_B_WAIT_ACON:
-+		if (fsm->a_conn)
-+			otg_set_state(fsm, OTG_STATE_B_HOST);
-+		else if (!fsm->id || !fsm->b_sess_vld)
-+			otg_set_state(fsm, OTG_STATE_B_IDLE);
-+		else if (fsm->a_bus_resume || fsm->b_ase0_brst_tmout) {
-+			fsm->b_ase0_brst_tmout = 0;
-+			otg_set_state(fsm, OTG_STATE_B_PERIPHERAL);
-+		}
-+		break;
-+	case OTG_STATE_B_HOST:
-+		if (!fsm->id || !fsm->b_sess_vld)
-+			otg_set_state(fsm, OTG_STATE_B_IDLE);
-+		else if (!fsm->b_bus_req || !fsm->a_conn)
-+			otg_set_state(fsm, OTG_STATE_B_PERIPHERAL);
-+		break;
-+	case OTG_STATE_A_IDLE:
-+		if (fsm->id)
-+			otg_set_state(fsm, OTG_STATE_B_IDLE);
-+		else if (!fsm->a_bus_drop && (fsm->a_bus_req || fsm->a_srp_det))
-+			otg_set_state(fsm, OTG_STATE_A_WAIT_VRISE);
-+		break;
-+	case OTG_STATE_A_WAIT_VRISE:
-+		if (fsm->id || fsm->a_bus_drop || fsm->a_vbus_vld ||
-+		    fsm->a_wait_vrise_tmout) {
-+			otg_set_state(fsm, OTG_STATE_A_WAIT_BCON);
-+		}
-+		break;
-+	case OTG_STATE_A_WAIT_BCON:
-+		if (!fsm->a_vbus_vld)
-+			otg_set_state(fsm, OTG_STATE_A_VBUS_ERR);
-+		else if (fsm->id | fsm->a_bus_drop | fsm->a_wait_bcon_tmout)
-+			otg_set_state(fsm, OTG_STATE_A_WAIT_VFALL);
-+		else if (fsm->b_conn)
-+			otg_set_state(fsm, OTG_STATE_A_HOST);
-+		break;
-+	case OTG_STATE_A_HOST:
-+		if ((!fsm->a_bus_req || fsm->a_suspend_req) &&
-+		    fsm->transceiver->host->b_hnp_enable)
-+			otg_set_state(fsm, OTG_STATE_A_SUSPEND);
-+		else if (fsm->id || !fsm->b_conn || fsm->a_bus_drop)
-+			otg_set_state(fsm, OTG_STATE_A_WAIT_BCON);
-+		else if (!fsm->a_vbus_vld)
-+			otg_set_state(fsm, OTG_STATE_A_VBUS_ERR);
-+		break;
-+	case OTG_STATE_A_SUSPEND:
-+		if (!fsm->b_conn && fsm->transceiver->host->b_hnp_enable)
-+			otg_set_state(fsm, OTG_STATE_A_PERIPHERAL);
-+		else if (!fsm->b_conn && !fsm->transceiver->host->b_hnp_enable)
-+			otg_set_state(fsm, OTG_STATE_A_WAIT_BCON);
-+		else if (fsm->a_bus_req || fsm->b_bus_resume)
-+			otg_set_state(fsm, OTG_STATE_A_HOST);
-+		else if (fsm->id || fsm->a_bus_drop || fsm->a_aidl_bdis_tmout)
-+			otg_set_state(fsm, OTG_STATE_A_WAIT_VFALL);
-+		else if (!fsm->a_vbus_vld)
-+			otg_set_state(fsm, OTG_STATE_A_VBUS_ERR);
-+		break;
-+	case OTG_STATE_A_PERIPHERAL:
-+		if (fsm->id || fsm->a_bus_drop)
-+			otg_set_state(fsm, OTG_STATE_A_WAIT_VFALL);
-+		else if (fsm->b_bus_suspend)
-+			otg_set_state(fsm, OTG_STATE_A_WAIT_BCON);
-+		else if (!fsm->a_vbus_vld)
-+			otg_set_state(fsm, OTG_STATE_A_VBUS_ERR);
-+		break;
-+	case OTG_STATE_A_WAIT_VFALL:
-+		if (fsm->id || fsm->a_bus_req || (!fsm->a_sess_vld &&
-+						  !fsm->b_conn))
-+			otg_set_state(fsm, OTG_STATE_A_IDLE);
-+		break;
-+	case OTG_STATE_A_VBUS_ERR:
-+		if (fsm->id || fsm->a_bus_drop || fsm->a_clr_err)
-+			otg_set_state(fsm, OTG_STATE_A_WAIT_VFALL);
-+		break;
-+	default:
-+		break;
-+	}
-+	spin_unlock_irqrestore(&fsm->lock, flags);
-+
-+	return state_changed;
-+}
-+EXPORT_SYMBOL(otg_statemachine);
---- /dev/null
-+++ b/drivers/usb/otg/otg_fsm.h
-@@ -0,0 +1,170 @@
-+/* Copyright (C) 2006-2007 Freescale Semiconductor, Inc.
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the  GNU General Public License along
-+ * with this program; if not, write  to the Free Software Foundation, Inc.,
-+ * 675 Mass Ave, Cambridge, MA 02139, USA.
-+ */
-+
-+#ifndef OTG_FSM_H
-+#define OTG_FSM_H
-+
-+#if 1
-+#define DEBUG 	1
-+#define VERBOSE 	1
-+#endif
-+
-+#ifdef DEBUG
-+#define DBG(fmt, args...) 	printk(KERN_DEBUG "[%s]  " fmt , \
-+				__FUNCTION__, ## args)
-+#else
-+#define DBG(fmt, args...)	do {} while (0)
-+#endif
-+
-+#ifdef VERBOSE
-+#define VDBG		DBG
-+#else
-+#define VDBG(stuff...)	do {} while (0)
-+#endif
-+
-+#ifdef VERBOSE
-+#define MPC_LOC printk("Current Location [%s]:[%d]\n", __FILE__, __LINE__)
-+#else
-+#define MPC_LOC do {} while (0)
-+#endif
-+
-+#define PROTO_UNDEF	0
-+#define PROTO_HOST	1
-+#define PROTO_GADGET	2
-+
-+
-+
-+
-+
-+/* OTG state machine according to the OTG spec */
-+struct otg_fsm {
-+	/* Input */
-+	int a_bus_resume;
-+	int a_bus_suspend;
-+	int a_conn;
-+	int a_sess_vld;
-+	int a_srp_det;
-+	int a_vbus_vld;
-+	int b_bus_resume;
-+	int b_bus_suspend;
-+	int b_conn;
-+	int b_se0_srp;
-+	int b_sess_end;
-+	int b_sess_vld;
-+	int id;
-+
-+	/* Internal variables */
-+	int a_set_b_hnp_en;
-+	int b_srp_done;
-+	int b_hnp_enable;
-+
-+	/* Timeout indicator for timers */
-+	int a_wait_vrise_tmout;
-+	int a_wait_bcon_tmout;
-+	int a_aidl_bdis_tmout;
-+	int b_ase0_brst_tmout;
-+
-+	/* Informative variables */
-+	int a_bus_drop;
-+	int a_bus_req;
-+	int a_clr_err;
-+	int a_suspend_req;
-+	int b_bus_req;
-+
-+	/* Output */
-+	int drv_vbus;
-+	int loc_conn;
-+	int loc_sof;
-+
-+	struct otg_fsm_ops *ops;
-+	struct otg_transceiver *transceiver;
-+
-+	void *a_wait_vrise_tmr;
-+	void *a_wait_bcon_tmr;
-+	void *a_aidl_bdis_tmr;
-+	void *b_ase0_brst_tmr;
-+	void *b_se0_srp_tmr;
-+	void *b_srp_fail_tmr;
-+	void *a_wait_enum_tmr;
-+
-+	/* Current usb protocol used: 0:undefine; 1:host; 2:client */
-+	int protocol;
-+	spinlock_t lock;		/* fsm lock */
-+};
-+
-+struct otg_fsm_ops {
-+	void 	(*chrg_vbus)(int on);
-+	void 	(*drv_vbus)(int on);
-+	void 	(*loc_conn)(int on);
-+	void 	(*loc_sof)(int on);
-+	void	(*start_pulse)(void);
-+	void	(*add_timer)(void *timer);
-+	void	(*del_timer)(void *timer);
-+	int	(*start_host)(struct otg_fsm *fsm, int on);
-+	int	(*start_gadget)(struct otg_fsm *fsm, int on);
-+};
-+
-+
-+static inline void otg_chrg_vbus(struct otg_fsm *fsm, int on)
-+{
-+	fsm->ops->chrg_vbus(on);
-+}
-+
-+static inline void otg_drv_vbus(struct otg_fsm *fsm, int on)
-+{
-+	if (fsm->drv_vbus != on) {
-+		fsm->drv_vbus = on;
-+		fsm->ops->drv_vbus(on);
-+	}
-+}
-+
-+static inline void otg_loc_conn(struct otg_fsm *fsm, int on)
-+{
-+	if (fsm->loc_conn != on) {
-+		fsm->loc_conn = on;
-+		fsm->ops->loc_conn(on);
-+	}
-+}
-+
-+static inline void otg_loc_sof(struct otg_fsm *fsm, int on)
-+{
-+	if (fsm->loc_sof != on) {
-+		fsm->loc_sof = on;
-+		fsm->ops->loc_sof(on);
-+	}
-+}
-+
-+static inline void otg_start_pulse(struct otg_fsm *fsm)
-+{
-+	fsm->ops->start_pulse();
-+}
-+
-+static inline void otg_add_timer(struct otg_fsm *fsm, void *timer)
-+{
-+	fsm->ops->add_timer(timer);
-+}
-+
-+static inline void otg_del_timer(struct otg_fsm *fsm, void *timer)
-+{
-+	fsm->ops->del_timer(timer);
-+}
-+
-+extern int otg_statemachine(struct otg_fsm *fsm);
-+
-+extern const char *state_string(enum usb_otg_state state);
-+
-+#endif
---- a/include/asm-m68k/mcf5445x_usb.h
-+++ b/include/asm-m68k/mcf5445x_usb.h
-@@ -41,7 +41,8 @@ static inline void fsl_platform_set_host
- 
- 	/* set host mode and select "big endian" */
- 	temp = fsl_readl(&regs->usbmode);
--	fsl_writel(temp | USBMODE_CM_HOST | USBMODE_ES, &regs->usbmode);
-+	temp |= USBMODE_CM_HOST | (pdata->es ? USBMODE_ES : 0);
-+	fsl_writel(temp, &regs->usbmode);
- 
- 	pr_debug("%s: set usbmode to 0x%x\n\n", __FUNCTION__,
- 		fsl_readl(&regs->usbmode));
---- a/include/linux/fsl_devices.h
-+++ b/include/linux/fsl_devices.h
-@@ -91,6 +91,19 @@ enum fsl_usb2_operating_modes {
- 	FSL_USB2_DR_OTG,
- };
- 
-+/* DDD
-+ * replace _operating_modes with _controller
-+ *
-+ * the operating_mode tests in fsl_platform_verify() aren't needed,
-+ * since the ehci driver isn't going to be probe()d unless it's
-+ * "fsl-ehci" device anyway, and what we really need to know is
-+ * which controller (MPH/DR) we're dealing with
-+ */
-+enum fsl_usb2_controller {
-+	FSL_USB2_MPH,
-+	FSL_USB2_DR,
-+};
-+
- enum fsl_usb2_phy_modes {
- 	FSL_USB2_PHY_NONE,
- 	FSL_USB2_PHY_ULPI,
-@@ -101,9 +114,36 @@ enum fsl_usb2_phy_modes {
- 
- struct fsl_usb2_platform_data {
- 	/* board specific information */
--	enum fsl_usb2_operating_modes	operating_mode;
-+	/*
-+	 * DDD see note above
-+	 * enum fsl_usb2_operating_modes	operating_mode;
-+	 */
-+	enum fsl_usb2_controller	controller;
- 	enum fsl_usb2_phy_modes		phy_mode;
- 	unsigned int			port_enables;
-+	/*
-+	 * DDD this could arguably be moved to a separate
-+	 * fsl usb2 device header file
-+	 */
-+	char *name;			/* pretty print */
-+	int (*platform_init) (struct platform_device *);
-+	void (*platform_uninit) (struct platform_device *);
-+	int (*platform_verify) (struct platform_device *);
-+	u32				xcvr_type;	/* PORTSCX_PTS_* */
-+	u32				view;		/* ULPI viewport register */
-+	u32				r_start;	/* start of MEM resource */
-+	u32				r_len;		/* length of MEM resource */
-+	void __iomem			*regs;		/* ioremap'd register base */
-+	unsigned			big_endian_mmio : 1;
-+	unsigned			big_endian_desc : 1;
-+	unsigned			es : 1;		/* need USBMODE:ES */
-+	unsigned			have_sysif_regs : 1;
-+	unsigned			le_setup_buf : 1;
-+	unsigned			does_otg : 1;	/* set IFF it's an OTG port */
-+
-+	unsigned			power_budget;	/* for hcd->power_budget */
-+	struct fsl_xcvr_ops		*xcvr_ops;
-+	int				max_ep_nr;	/* max # of endpoints */
- };
- 
- /* Flags in fsl_usb2_mph_platform_data */
---- /dev/null
-+++ b/include/linux/usb/fsl_usb2.h
-@@ -0,0 +1,464 @@
-+/*
-+ * Copyright 2005-2007 Freescale Semiconductor, Inc. All Rights Reserved.
-+ */
-+
-+/*
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/*
-+ * Freescale USB device/endpoint management registers
-+ */
-+#ifndef __FSL_USB2_H
-+#define __FSL_USB2_H
-+
-+
-+ /* USB DR device mode registers (Little Endian) */
-+struct fsl_usb_device_regs {
-+	/* Capability register */
-+	u32 id;
-+	u32 res1[63];
-+	u16 caplength;		/* Capability Register Length */
-+	u16 hciversion;		/* Host Controller Interface Version */
-+	u32 hcsparams;		/* Host Controller Structual Parameters */
-+	u32 hccparams;		/* Host Controller Capability Parameters */
-+	u32 res2[5];
-+	u32 dciversion;		/* Device Controller Interface Version */
-+	u32 dccparams;		/* Device Controller Capability Parameters */
-+	u32 res3[6];
-+	/* Operation register */
-+	u32 usbcmd;		/* USB Command Register */
-+	u32 usbsts;		/* USB Status Register */
-+	u32 usbintr;		/* USB Interrupt Enable Register */
-+	u32 frindex;		/* Frame Index Register */
-+	u32 res4;
-+	u32 deviceaddr;		/* Device Address */
-+	u32 endpointlistaddr;	/* Endpoint List Address Register */
-+	u32 res5;
-+	u32 burstsize;		/* Master Interface Data Burst Size Register */
-+	u32 txttfilltuning;	/* Transmit FIFO Tuning Controls Register */
-+	u32 res6[2];
-+	u32 ulpiview;
-+	u32 res7[3];
-+	u32 configflag;		/* Configure Flag Register */
-+	u32 portsc1;		/* Port 1 Status and Control Register */
-+	u32 res8[7];
-+	u32 otgsc;		/* On-The-Go Status and Control */
-+	u32 usbmode;		/* USB Mode Register */
-+	u32 endptsetupstat;	/* Endpoint Setup Status Register */
-+	u32 endpointprime;	/* Endpoint Initialization Register */
-+	u32 endptflush;		/* Endpoint Flush Register */
-+	u32 endptstatus;	/* Endpoint Status Register */
-+	u32 endptcomplete;	/* Endpoint Complete Register */
-+#if 0
-+	u32 endptctrl[USB_MAX_ENDPOINTS]; /* Endpoint Control Registers */
-+#else
-+	// DDD see DCCPARAMS:DEN for the real number of device endpoints
-+	// DDD 16 is the max
-+	u32 endptctrl[16];	/* Endpoint Control Registers */
-+#endif
-+};
-+
-+ /* USB DR host mode registers (Little Endian) */
-+struct fsl_usb_host_regs {
-+	/* Capability register */
-+	u32 id;
-+	u32 res1[63];
-+	u16 caplength;		/* Capability Register Length */
-+	u16 hciversion;		/* Host Controller Interface Version */
-+	u32 hcsparams;		/* Host Controller Structual Parameters */
-+	u32 hccparams;		/* Host Controller Capability Parameters */
-+	u32 res2[5];
-+	u32 dciversion;		/* Device Controller Interface Version */
-+	u32 dccparams;		/* Device Controller Capability Parameters */
-+	u32 res3[6];
-+	/* Operation register */
-+	u32 usbcmd;		/* USB Command Register */
-+	u32 usbsts;		/* USB Status Register */
-+	u32 usbintr;		/* USB Interrupt Enable Register */
-+	u32 frindex;		/* Frame Index Register */
-+	u32 res4;
-+	u32 periodiclistbase;	/* Periodic Frame List Base Address Register */
-+	u32 asynclistaddr;	/* Current Asynchronous List Address Register */
-+	u32 res5;
-+	u32 burstsize;		/* Master Interface Data Burst Size Register */
-+	u32 txttfilltuning;	/* Transmit FIFO Tuning Controls Register */
-+	u32 res6[2];
-+	u32 ulpiview;
-+	u32 res7[3];
-+	u32 configflag;		/* Configure Flag Register */
-+	u32 portsc1;		/* Port 1 Status and Control Register */
-+	u32 res8[7];
-+	u32 otgsc;		/* On-The-Go Status and Control */
-+	u32 usbmode;		/* USB Mode Register */
-+	u32 endptsetupstat;	/* Endpoint Setup Status Register */
-+	u32 endpointprime;	/* Endpoint Initialization Register */
-+	u32 endptflush;		/* Endpoint Flush Register */
-+	u32 endptstatus;	/* Endpoint Status Register */
-+	u32 endptcomplete;	/* Endpoint Complete Register */
-+#if 0
-+	u32 endptctrl[USB_MAX_ENDPOINTS]; /* Endpoint Control Registers */
-+#else
-+	// DDD: do these exits in the host register set??
-+	// DDD see DCCPARAMS:DEN for the real number of device endpoints
-+	// DDD 16 is the max
-+	u32 endptctrl[16];	/* Endpoint Control Registers */
-+#endif
-+};
-+
-+ /* non-EHCI USB system interface registers (Big Endian) */
-+struct usb_sys_interface {
-+	u32 snoop1;
-+	u32 snoop2;
-+	u32 age_cnt_thresh;	/* Age Count Threshold Register */
-+	u32 pri_ctrl;		/* Priority Control Register */
-+	u32 si_ctrl;		/* System Interface Control Register */
-+	u32 res[59];
-+	u32 control;		/* General Purpose Control Register */
-+};
-+
-+/* ep0 transfer state */
-+#define WAIT_FOR_SETUP		0
-+#define DATA_STATE_XMIT		1
-+#define DATA_STATE_NEED_ZLP	2
-+#define WAIT_FOR_OUT_STATUS	3
-+#define DATA_STATE_RECV		4
-+
-+/* Frame Index Register Bit Masks */
-+#define	USB_FRINDEX_MASKS			0x3fff
-+
-+
-+
-+/* USBCMD Register Bit Masks */
-+#define USB_CMD_RUN_STOP			0x00000001
-+#define USB_CMD_CTRL_RESET			0x00000002
-+#define USB_CMD_PERIODIC_SCHEDULE_EN		0x00000010
-+#define USB_CMD_ASYNC_SCHEDULE_EN		0x00000020
-+#define USB_CMD_INT_AA_DOORBELL			0x00000040
-+#define USB_CMD_ASP				0x00000300
-+#define USB_CMD_ASYNC_SCH_PARK_EN		0x00000800
-+#define USB_CMD_SUTW				0x00002000
-+#define USB_CMD_ATDTW				0x00004000
-+#define USB_CMD_ITC				0x00FF0000
-+
-+/* bit 15,3,2 are frame list size */
-+#define USB_CMD_FRAME_SIZE_1024			0x00000000
-+#define USB_CMD_FRAME_SIZE_512			0x00000004
-+#define USB_CMD_FRAME_SIZE_256			0x00000008
-+#define USB_CMD_FRAME_SIZE_128			0x0000000C
-+#define USB_CMD_FRAME_SIZE_64			0x00008000
-+#define USB_CMD_FRAME_SIZE_32			0x00008004
-+#define USB_CMD_FRAME_SIZE_16			0x00008008
-+#define USB_CMD_FRAME_SIZE_8			0x0000800C
-+
-+/* bit 9-8 are async schedule park mode count */
-+#define USB_CMD_ASP_00				0x00000000
-+#define USB_CMD_ASP_01				0x00000100
-+#define USB_CMD_ASP_10				0x00000200
-+#define USB_CMD_ASP_11				0x00000300
-+#define USB_CMD_ASP_BIT_POS			8
-+
-+/* bit 23-16 are interrupt threshold control */
-+#define USB_CMD_ITC_NO_THRESHOLD		0x00000000
-+#define USB_CMD_ITC_1_MICRO_FRM			0x00010000
-+#define USB_CMD_ITC_2_MICRO_FRM			0x00020000
-+#define USB_CMD_ITC_4_MICRO_FRM			0x00040000
-+#define USB_CMD_ITC_8_MICRO_FRM			0x00080000
-+#define USB_CMD_ITC_16_MICRO_FRM		0x00100000
-+#define USB_CMD_ITC_32_MICRO_FRM		0x00200000
-+#define USB_CMD_ITC_64_MICRO_FRM		0x00400000
-+#define USB_CMD_ITC_BIT_POS			16
-+
-+
-+
-+
-+/* USB STS Register Bit Masks */
-+#define USB_STS_INT				0x00000001
-+#define USB_STS_ERR				0x00000002
-+#define USB_STS_PORT_CHANGE			0x00000004
-+#define USB_STS_FRM_LST_ROLL			0x00000008
-+#define USB_STS_SYS_ERR				0x00000010
-+#define USB_STS_IAA				0x00000020
-+#define USB_STS_RESET				0x00000040
-+#define USB_STS_SOF				0x00000080
-+#define USB_STS_SUSPEND				0x00000100
-+#define USB_STS_HC_HALTED			0x00001000
-+#define USB_STS_RCL				0x00002000
-+#define USB_STS_PERIODIC_SCHEDULE		0x00004000
-+#define USB_STS_ASYNC_SCHEDULE			0x00008000
-+
-+/* USB INTR Register Bit Masks */
-+#define USB_INTR_INT_EN				0x00000001
-+#define USB_INTR_ERR_INT_EN			0x00000002
-+#define USB_INTR_PTC_DETECT_EN			0x00000004
-+#define USB_INTR_FRM_LST_ROLL_EN		0x00000008
-+#define USB_INTR_SYS_ERR_EN			0x00000010
-+#define USB_INTR_ASYN_ADV_EN			0x00000020
-+#define USB_INTR_RESET_EN			0x00000040
-+#define USB_INTR_SOF_EN				0x00000080
-+#define USB_INTR_DEVICE_SUSPEND			0x00000100
-+
-+/* Device Address bit masks */
-+#define USB_DEVICE_ADDRESS_MASK			0xFE000000
-+#define USB_DEVICE_ADDRESS_BIT_POS		25
-+
-+/* endpoint list address bit masks */
-+#define USB_EP_LIST_ADDRESS_MASK		0xfffff800
-+
-+
-+/* x_PORTSCx */
-+/* bit 31-30 are port transceiver select */
-+#define PORTSCX_PTS_MASK		(3 << 30)	/* parallel xcvr select mask */
-+#define PORTSCX_PHY_TYPE_SEL		PORTSCX_PTS_MASK
-+#define PORTSCX_PTS_UTMI		(0 << 30)	/* UTMI/UTMI+ */
-+#define PORTSCX_PTS_PHILIPS		(1 << 30)	/* Philips classic */
-+#define PORTSCX_PTS_ULPI		(2 << 30)	/* ULPI */
-+#define PORTSCX_PTS_SERIAL		(3 << 30)	/* serial */
-+#define PORTSCX_PTS_FSLS		PORTSCX_PTS_SERIAL
-+#define PORTSCX_PTS_ONCHIP		PORTSCX_PTS_FSLS
-+
-+#define PORTSCX_STS			(1 << 29)	/* serial xcvr select */
-+
-+/* bit 28 is parallel transceiver width for UTMI interface */
-+#define PORTSCX_PTW_8BIT		(0 << 28)	/* 8 bit parallel xcvr */
-+#define PORTSCX_PTW_16BIT		(1 << 28)	/* 16 bi parallel xcvr */
-+
-+/* bit 27-26 are port speed */
-+#define PORTSCX_PORT_SPEED_FULL		(0 << 26)
-+#define PORTSCX_PORT_SPEED_LOW		(1 << 26)
-+#define PORTSCX_PORT_SPEED_HIGH		(2 << 26)
-+#define PORTSCX_PORT_SPEED_UNDEF	(3 << 26)
-+#define PORTSCX_PORT_SPEED_MASK		(3 << 26)
-+
-+#define PORTSCX_PHY_LOW_POWER_SPD	(1 << 23)	/* phy low pwr suspend/clk disable */
-+
-+/* bit 19-16 are port test control */
-+#define PORTSCX_PTC_DISABLE		(0 << 16)
-+#define PORTSCX_PTC_JSTATE		(1 << 16)
-+#define PORTSCX_PTC_KSTATE		(2 << 16)
-+#define PORTSCX_PTC_SEQNAK		(3 << 16)	/* SE0 (host) / NAK (device) */
-+#define PORTSCX_PTC_PACKET		(4 << 16)
-+#define PORTSCX_PTC_FORCE_EN_HS		(5 << 16)
-+#define PORTSCX_PTC_FORCE_EN_FS		(6 << 16)
-+#define PORTSCX_PTC_FORCE_EN_LS		(7 << 16)
-+
-+
-+/* bit 15-14 are port indicator control */
-+#define PORTSCX_PIC_OFF			(0 << 14)
-+#define PORTSCX_PIC_AMBER		(1 << 14)
-+#define PORTSCX_PIC_GREEN		(2 << 14)
-+#define PORTSCX_PIC_UNDEF		(3 << 14)
-+
-+#define PORTSCX_PORT_POWER		(1 << 12)	/* port power */
-+
-+/* bit 11-10 are line status */
-+#define PORTSCX_LS_MASK			(3 << 10)	/* Line State mask */
-+#define PORTSCX_LS_SE0			(0 << 10)	/* SE0     */
-+#define PORTSCX_LS_K_STATE		(1 << 10)	/* K-state */
-+#define PORTSCX_LS_J_STATE		(2 << 10)	/* J-state */
-+
-+#define PORTSCX_PORT_RESET		(1 <<  8)	/* Port reset */
-+#define PORTSCX_PORT_SUSPEND		(1 <<  7)	/* Suspend */
-+#define PORTSCX_PORT_FORCE_RESUME	(1 <<  6)	/* Force port resume */
-+#define PORTSCX_OVER_CURRENT_CHG	(1 <<  5)	/* over current change */
-+#define PORTSCX_OVER_CURRENT_ACT	(1 <<  4)	/* over currrent active */
-+#define PORTSCX_PORT_EN_DIS_CHANGE	(1 <<  3)	/* port {en,dis}able change */
-+#define PORTSCX_PORT_ENABLE		(1 <<  2)	/* port enabled */
-+#define PORTSCX_CONNECT_STATUS_CHANGE	(1 <<  1)	/* connect status change */
-+#define PORTSCX_CURRENT_CONNECT_STATUS	(1 <<  0)	/* current connect status */
-+
-+#define PORTSCX_W1C_BITS                     \
-+       ( PORTSCX_CONNECT_STATUS_CHANGE |     \
-+         PORTSCX_PORT_EN_DIS_CHANGE    |     \
-+         PORTSCX_OVER_CURRENT_CHG )
-+
-+
-+
-+/* UOG_OTGSC Register Bits */
-+/* control bits: */
-+#define  OTGSC_CTRL_VBUS_DISCHARGE	(1 <<  0)
-+#define  OTGSC_CTRL_VBUS_CHARGE		(1 <<  1)
-+#define  OTGSC_CTRL_OTG_TERM		(1 <<  3)	/* controls DM pulldown */
-+#define  OTGSC_CTRL_DATA_PULSING	(1 <<  4)
-+#define  OTGSC_CTRL_USB_ID_PU		(1 <<  5)	/* enable ID pullup */
-+/* current status: (R/O) */
-+#define  OTGSC_STS_USB_ID		(1 <<  8)	/* 0=A-device  1=B-device */
-+#define  OTGSC_STS_A_VBUS_VALID		(1 <<  9)
-+#define  OTGSC_STS_A_SESSION_VALID	(1 << 10)
-+#define  OTGSC_STS_B_SESSION_VALID	(1 << 11)
-+#define  OTGSC_STS_B_SESSION_END	(1 << 12)
-+#define  OTGSC_STS_1ms_TIMER		(1 << 13)
-+#define  OTGSC_STS_DATA_PULSE		(1 << 14)
-+/* interrupt status: (write to clear) */
-+#define  OTGSC_INTSTS_MASK		(0x7f << 16)
-+#define  OTGSC_INTSTS_USB_ID		(1 << 16)
-+#define  OTGSC_INTSTS_A_VBUS_VALID	(1 << 17)
-+#define  OTGSC_INTSTS_A_SESSION_VALID	(1 << 18)
-+#define  OTGSC_INTSTS_B_SESSION_VALID	(1 << 19)
-+#define  OTGSC_INTSTS_B_SESSION_END	(1 << 20)
-+#define  OTGSC_INTSTS_1MS_TIMER		(1 << 21)
-+#define  OTGSC_INTSTS_DATA_PULSE	(1 << 22)
-+/* interrupt enables: */
-+#define  OTGSC_IE_MASK			(0x7f << 24)
-+#define  OTGSC_IE_USB_ID		(1 << 24)
-+#define  OTGSC_IE_A_VBUS_VALID		(1 << 25)
-+#define  OTGSC_IE_A_SESSION_VALID	(1 << 26)
-+#define  OTGSC_IE_B_SESSION_VALID	(1 << 27)
-+#define  OTGSC_IE_B_SESSION_END		(1 << 28)
-+#define  OTGSC_IE_1ms_TIMER		(1 << 29)
-+#define  OTGSC_IE_DATA_PULSE		(1 << 30)
-+
-+#if 1	/* DDD FIXME these here for compatibility between my names and Leo's */
-+/* OTG interrupt enable bit masks */
-+#define  OTGSC_INTERRUPT_ENABLE_BITS_MASK	OTGSC_IE_MASK
-+
-+/* OTG interrupt status bit masks */
-+#define  OTGSC_INTERRUPT_STATUS_BITS_MASK	OTGSC_INTSTS_MASK
-+#endif // 1
-+
-+
-+
-+/* x_USBMODE */
-+#undef USBMODE_SDIS	/* defined as bit 3 in drivers/usb/host/ehci.h */
-+#define USBMODE_SDIS		(1 << 4)	/* stream disable mode */
-+#define USBMODE_SLOM		(1 << 3)	/* setup lockout mode */
-+#define USBMODE_ES		(1 << 2)	/* (big) endian select */
-+#define USBMODE_CM_MASK		(3 << 0)	/* controller mode mask */
-+#define USBMODE_CM_HOST		(3 << 0)	/* host */
-+#define USBMODE_CM_DEVICE	(2 << 0)	/* device */
-+// DDD #define USBMODE_CM_IDLE		(0 << 0)	/* idle */
-+
-+/* DDD for compatibility for now */
-+#define USB_MODE_CTRL_MODE_IDLE		USBMODE_CM_IDLE
-+#define USB_MODE_CTRL_MODE_DEVICE	USBMODE_CM_DEVICE
-+#define USB_MODE_CTRL_MODE_HOST		USBMODE_CM_HOST
-+#define USB_MODE_SETUP_LOCK_OFF		USBMODE_SLOM
-+#define USB_MODE_STREAM_DISABLE		USBMODE_SDIS
-+
-+
-+/* ULPIVIEW register bits */
-+#define ULPIVW_WU		(1 << 31)	/* Wakeup */
-+#define ULPIVW_RUN		(1 << 30)	/* read/write run */
-+#define ULPIVW_WRITE		(1 << 29)	/* 0=read  1=write */
-+#define ULPIVW_SS		(1 << 27)	/* SyncState */
-+#define ULPIVW_PORT_MASK	0x07		/* Port field */
-+#define ULPIVW_PORT_SHIFT	24
-+#define ULPIVW_ADDR_MASK	0xFF		/* data address field */
-+#define ULPIVW_ADDR_SHIFT	16
-+#define ULPIVW_RDATA_MASK	0xFF		/* read data field */
-+#define ULPIVW_RDATA_SHIFT	8
-+#define ULPIVW_WDATA_MASK	0xFF		/* write data field */
-+#define ULPIVW_WDATA_SHIFT	0
-+
-+
-+/* Endpoint Flush Register */
-+#define EPFLUSH_TX_OFFSET			0x00010000
-+#define EPFLUSH_RX_OFFSET			0x00000000
-+
-+/* Endpoint Setup Status bit masks */
-+#define EP_SETUP_STATUS_MASK			0x0000003F
-+#define EP_SETUP_STATUS_EP0			0x00000001
-+
-+/* ENDPOINTCTRLx  Register Bit Masks */
-+#define EPCTRL_TX_ENABLE			0x00800000
-+#define EPCTRL_TX_DATA_TOGGLE_RST		0x00400000	/* Not EP0 */
-+#define EPCTRL_TX_DATA_TOGGLE_INH		0x00200000	/* Not EP0 */
-+#define EPCTRL_TX_TYPE				0x000C0000
-+#define EPCTRL_TX_DATA_SOURCE			0x00020000	/* Not EP0 */
-+#define EPCTRL_TX_EP_STALL			0x00010000
-+#define EPCTRL_RX_ENABLE			0x00000080
-+#define EPCTRL_RX_DATA_TOGGLE_RST		0x00000040	/* Not EP0 */
-+#define EPCTRL_RX_DATA_TOGGLE_INH		0x00000020	/* Not EP0 */
-+#define EPCTRL_RX_TYPE				0x0000000C
-+#define EPCTRL_RX_DATA_SINK			0x00000002	/* Not EP0 */
-+#define EPCTRL_RX_EP_STALL			0x00000001
-+
-+/* bit 19-18 and 3-2 are endpoint type */
-+#define EPCTRL_EP_TYPE_CONTROL			0
-+#define EPCTRL_EP_TYPE_ISO			1
-+#define EPCTRL_EP_TYPE_BULK			2
-+#define EPCTRL_EP_TYPE_INTERRUPT		3
-+#define EPCTRL_TX_EP_TYPE_SHIFT			18
-+#define EPCTRL_RX_EP_TYPE_SHIFT			2
-+
-+/* SNOOPn Register Bit Masks */
-+#define SNOOP_ADDRESS_MASK			0xFFFFF000
-+#define SNOOP_SIZE_ZERO				0x00	/* snooping disable */
-+#define SNOOP_SIZE_4KB				0x0B	/* 4KB snoop size */
-+#define SNOOP_SIZE_8KB				0x0C
-+#define SNOOP_SIZE_16KB				0x0D
-+#define SNOOP_SIZE_32KB				0x0E
-+#define SNOOP_SIZE_64KB				0x0F
-+#define SNOOP_SIZE_128KB			0x10
-+#define SNOOP_SIZE_256KB			0x11
-+#define SNOOP_SIZE_512KB			0x12
-+#define SNOOP_SIZE_1MB				0x13
-+#define SNOOP_SIZE_2MB				0x14
-+#define SNOOP_SIZE_4MB				0x15
-+#define SNOOP_SIZE_8MB				0x16
-+#define SNOOP_SIZE_16MB				0x17
-+#define SNOOP_SIZE_32MB				0x18
-+#define SNOOP_SIZE_64MB				0x19
-+#define SNOOP_SIZE_128MB			0x1A
-+#define SNOOP_SIZE_256MB			0x1B
-+#define SNOOP_SIZE_512MB			0x1C
-+#define SNOOP_SIZE_1GB				0x1D
-+#define SNOOP_SIZE_2GB				0x1E	/* 2GB snoop size */
-+
-+/* pri_ctrl Register Bit Masks */
-+#define PRI_CTRL_PRI_LVL1			0x0000000C
-+#define PRI_CTRL_PRI_LVL0			0x00000003
-+
-+/* si_ctrl Register Bit Masks */
-+#define SI_CTRL_ERR_DISABLE			0x00000010
-+#define SI_CTRL_IDRC_DISABLE			0x00000008
-+#define SI_CTRL_RD_SAFE_EN			0x00000004
-+#define SI_CTRL_RD_PREFETCH_DISABLE		0x00000002
-+#define SI_CTRL_RD_PREFEFETCH_VAL		0x00000001
-+
-+
-+/* control Register Bit Masks */
-+#define USB_CTRL_IOENB				0x00000004
-+#define USB_CTRL_ULPI_INT0EN			0x00000001
-+
-+
-+/* Endpoint Transfer Descriptor bit Masks */
-+#define DTD_NEXT_TERMINATE			0x00000001
-+#define DTD_IOC					0x00008000
-+#define DTD_STATUS_ACTIVE			0x00000080
-+#define DTD_STATUS_HALTED			0x00000040
-+#define DTD_STATUS_DATA_BUFF_ERR		0x00000020
-+#define DTD_STATUS_TRANSACTION_ERR		0x00000008
-+#define DTD_RESERVED_FIELDS			0x80007300
-+#define DTD_ADDR_MASK				0xFFFFFFE0
-+#define DTD_PACKET_SIZE				0x7FFF0000
-+#define DTD_LENGTH_BIT_POS			16
-+#define DTD_ERROR_MASK (DTD_STATUS_HALTED | \
-+			DTD_STATUS_DATA_BUFF_ERR | \
-+			DTD_STATUS_TRANSACTION_ERR)
-+/* Alignment requirements; must be a power of two */
-+#define DTD_ALIGNMENT				0x20
-+#define QH_ALIGNMENT				2048
-+
-+/* Controller dma boundary */
-+#define UDC_DMA_BOUNDARY			0x1000
-+
-+#if defined CONFIG_PPC32
-+#define fsl_readl(addr)		in_le32((addr))
-+#define fsl_writel(addr, val32)	out_le32((addr), (val32))
-+#elif defined CONFIG_COLDFIRE
-+#define fsl_readl(addr)		in_be32((__force unsigned *)(addr))
-+#define fsl_writel(val32, addr)	out_be32((__force unsigned *)(addr), (val32))
-+
-+#define fsl_readw(addr)		in_be16((__force unsigned *)(addr))
-+#define fsl_writew(val16, addr)	out_be16((__force unsigned *)(addr), (val16))
-+#else
-+#error fsl_{readl, writel} must be defined
-+#endif
-+
-+#endif	/* __FSL_USB2_H */
---- /dev/null
-+++ b/include/linux/usb/fsl_xcvr.h
-@@ -0,0 +1,42 @@
-+/*
-+ * Copyright 2007 Freescale Semiconductor, Inc. All Rights Reserved.
-+ */
-+
-+/*
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+enum fsl_usb_ctrlr {
-+	USB_CTRLR_H1 = 0,
-+	USB_CTRLR_H2 = 1,
-+	USB_CTRLR_OTG = 2,
-+};
-+
-+
-+/**
-+ * struct fsl_xcvr_ops - USB transceiver operations
-+ *
-+ * @xcvr_type: one of PORTSCX_PTS_{UTMI,SERIAL,ULPI}
-+ * @init: transceiver- and board-specific initialization function
-+ * @uninit: transceiver- and board-specific uninitialization function
-+ * @set_host:
-+ * @set_device:
-+ *
-+ */
-+struct fsl_xcvr_ops {
-+	enum fsl_usb_ctrlr ctrlr;	/* H1, H2, OTG */
-+	u32 xcvr_type;
-+
-+	void (*init)(struct platform_device *pdev);
-+	void (*uninit)(struct platform_device *pdev);
-+	void (*set_host)(void);	/* DDD combine set_host and _device ? */
-+	void (*set_device)(void);
-+	void (*set_vbus_power)(struct fsl_usb2_platform_data *pdata, int on);
-+};
-+
-+
diff --git a/target/linux/coldfire/patches/017-mcfv4e_elf_entry_stext.patch b/target/linux/coldfire/patches/017-mcfv4e_elf_entry_stext.patch
deleted file mode 100644
index ffb3c8aec..000000000
--- a/target/linux/coldfire/patches/017-mcfv4e_elf_entry_stext.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2beb3e5edd46ea1d87ac87dbb977dce423a1f124 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Wed, 21 Nov 2007 14:56:19 -0700
-Subject: [PATCH] Change elf entry point from _start to _stext.
-
-Changing the symbol was required by CodeWarrior so it could
-locate the entry point.
-
-LTIBName: mcfv4e-elf-entry-stext
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/coldfire/vmlinux-cf.lds |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
---- a/arch/m68k/coldfire/vmlinux-cf.lds
-+++ b/arch/m68k/coldfire/vmlinux-cf.lds
-@@ -4,7 +4,7 @@
- 
- OUTPUT_FORMAT("elf32-m68k", "elf32-m68k", "elf32-m68k")
- OUTPUT_ARCH(m68k)
--ENTRY(_start)
-+ENTRY(_stext)
- jiffies = jiffies_64 + 4;
- SECTIONS
- {
diff --git a/target/linux/coldfire/patches/018-mcfv4e_linker_script_update.patch b/target/linux/coldfire/patches/018-mcfv4e_linker_script_update.patch
deleted file mode 100644
index 3c7da5693..000000000
--- a/target/linux/coldfire/patches/018-mcfv4e_linker_script_update.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-From 3aa2c28ff4271e9232b6c98ba000804de3ed3f33 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Mon, 26 Nov 2007 23:41:23 -0700
-Subject: [PATCH] Rewrite coldfire linker script.
-
-LTIBName: mcfv4e-linker-script-update
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/coldfire/vmlinux-cf.lds |  107 ++++++++++++++++++++++++-------------
- arch/m68k/kernel/vmlinux.lds.S    |    3 +-
- 2 files changed, 72 insertions(+), 38 deletions(-)
-
---- a/arch/m68k/coldfire/vmlinux-cf.lds
-+++ b/arch/m68k/coldfire/vmlinux-cf.lds
-@@ -1,76 +1,115 @@
--/* ld script to make m68k Coldfire Linux kernel */
-+/* ld script to make m68k Coldfire Linux kernel
-+ *
-+ * Derived from arch/m68k/kernel/vmlinux-std.lds
-+ *
-+ * Updated 11/26/2007 for new CodeSourcery toolset
-+ *     by Kurt Mahan <kmahan@freescale.com>
-+ */
-+
-+#define	LOAD_OFFSET	0x00000000
- 
- #include <asm-generic/vmlinux.lds.h>
-+#include <asm/page_offset.h>
-+
-+#define	START_OFFSET	0x00020000
-+#define	IMAGE_START	PAGE_OFFSET_RAW + START_OFFSET
- 
- OUTPUT_FORMAT("elf32-m68k", "elf32-m68k", "elf32-m68k")
- OUTPUT_ARCH(m68k)
- ENTRY(_stext)
- jiffies = jiffies_64 + 4;
-+
- SECTIONS
- {
--  . = 0xC0020000;
--  _text = .;			/* Text and read-only data */
--  .text : {
-+  . = IMAGE_START;
-+  .text.head : AT(ADDR(.text.head) - LOAD_OFFSET) {
-+  	_text = .;			/* Text and read-only data */
- 	*(.text.head)
-+  } :text = 0x4e75
-+
-+  .text : AT(ADDR(.text) - LOAD_OFFSET) {
- 	TEXT_TEXT
- 	SCHED_TEXT
- 	LOCK_TEXT
- 	*(.fixup)
- 	*(.gnu.warning)
--	} :text = 0x4e75
--
-+  } :text = 0x4e75
-   _etext = .;			/* End of text section */
- 
-   . = ALIGN(16);
--  __start___ex_table = .;
--  __ex_table : { *(__ex_table) }
--  __stop___ex_table = .;
-+  __ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) {
-+	__start___ex_table = .;
-+	*(__ex_table)
-+	__stop___ex_table = .;
-+  }
- 
-   RODATA
- 
--  .data : {			/* Data */
-+  . = ALIGN(8192);
-+  .data : AT(ADDR(.data) - LOAD_OFFSET) {	/* Data */
- 	DATA_DATA
- 	CONSTRUCTORS
--	}
-+  } :data
- 
--  .bss : { *(.bss) }		/* BSS */
-+  .bss : AT(ADDR(.bss) - LOAD_OFFSET) {		/* BSS */
-+	*(.bss)
-+  }
- 
-   . = ALIGN(16);
--  .data.cacheline_aligned : { *(.data.cacheline_aligned) } :data
-+  .data.cacheline_aligned : AT(ADDR(.data.cacheline_aligned) - LOAD_OFFSET ) {
-+	*(.data.cacheline_aligned)
-+  } :data
- 
-   _edata = .;			/* End of data section */
- 
-   . = ALIGN(8192);		/* Initrd */
--  __init_begin = .;
--  .init.text : {
-+  .init.text : AT(ADDR(.init.text) - LOAD_OFFSET) {
-+  	__init_begin = .;
- 	_sinittext = .;
- 	*(.init.text)
- 	_einittext = .;
-   }
--  .init.data : { *(.init.data) }
-+
-+  .init.data : AT(ADDR(.init.data) - LOAD_OFFSET) {
-+	*(.init.data)
-+  }
-+
-   . = ALIGN(16);
--  __setup_start = .;
--  .init.setup : { *(.init.setup) }
--  __setup_end = .;
--  __initcall_start = .;
--  .initcall.init : {
-+  .init.setup : AT(ADDR(.init.setup) - LOAD_OFFSET) {
-+	__setup_start = .;
-+	*(.init.setup)
-+  	__setup_end = .;
-+  }
-+
-+  .initcall.init : AT(ADDR(.initcall.init) - LOAD_OFFSET) {
-+	__initcall_start = .;
- 	INITCALLS
-+	__initcall_end = .;
-   }
--  __initcall_end = .;
--  __con_initcall_start = .;
--  .con_initcall.init : { *(.con_initcall.init) }
--  __con_initcall_end = .;
-+
-+  .con_initcall.init : AT(ADDR(.con_initcall.init) - LOAD_OFFSET) {
-+	__con_initcall_start = .;
-+	*(.con_initcall.init)
-+	__con_initcall_end = .;
-+  }
-+
-   SECURITY_INIT
-+
- #ifdef CONFIG_BLK_DEV_INITRD
-   . = ALIGN(8192);
--  __initramfs_start = .;
--  .init.ramfs : { *(.init.ramfs) }
--  __initramfs_end = .;
-+  .init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET) {
-+	__initramfs_start = .;
-+	*(.init.ramfs)
-+	__initramfs_end = .;
-+  }
- #endif
-+
-   . = ALIGN(8192);
-   __init_end = .;
- 
--  .data.init_task : { *(.data.init_task) }	/* The initial task and kernel stack */
-+  .data.init_task : AT(ADDR(.data.init_task) - LOAD_OFFSET) {
-+	*(.data.init_task)	/* The initial task and kernel stack */
-+  }
- 
-   _end = . ;
- 
-@@ -79,14 +118,8 @@ SECTIONS
- 	*(.exit.text)
- 	*(.exit.data)
- 	*(.exitcall.exit)
--	}
-+  }
- 
-   /* Stabs debugging sections.  */
--  .stab 0 : { *(.stab) }
--  .stabstr 0 : { *(.stabstr) }
--  .stab.excl 0 : { *(.stab.excl) }
--  .stab.exclstr 0 : { *(.stab.exclstr) }
--  .stab.index 0 : { *(.stab.index) }
--  .stab.indexstr 0 : { *(.stab.indexstr) }
--  .comment 0 : { *(.comment) }
-+  STABS_DEBUG
- }
---- a/arch/m68k/kernel/vmlinux.lds.S
-+++ b/arch/m68k/kernel/vmlinux.lds.S
-@@ -1,6 +1,7 @@
- PHDRS
- {
--  text PT_LOAD FILEHDR PHDRS FLAGS (7);
-+  headers PT_PHDR PHDRS ;
-+  text PT_LOAD FILEHDR PHDRS FLAGS (5);
-   data PT_LOAD FLAGS (7);
- }
- #ifdef CONFIG_SUN3
diff --git a/target/linux/coldfire/patches/019-m5445x_spi.patch b/target/linux/coldfire/patches/019-m5445x_spi.patch
deleted file mode 100644
index 49b83e0b1..000000000
--- a/target/linux/coldfire/patches/019-m5445x_spi.patch
+++ /dev/null
@@ -1,3345 +0,0 @@
-From bc755a3b8859e7307a8b10f39ca4cb6401c51987 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Tue, 27 Nov 2007 14:39:37 -0700
-Subject: [PATCH] Add M5445x SPI support.
-
-LTIBName: m5445x-spi
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/configs/m54455evb_defconfig |   24 +-
- drivers/spi/Kconfig                   |   36 +
- drivers/spi/Makefile                  |    4 +
- drivers/spi/coldfire_edma.c           |  358 ++++++++
- drivers/spi/spi-m5445x.c              |  156 ++++
- drivers/spi/spi_coldfire.c            | 1552 +++++++++++++++++++++++++++++++++
- drivers/spi/ssi_audio.c               |  906 +++++++++++++++++++
- include/asm-m68k/coldfire_edma.h      |  101 ++-
- include/linux/spi/mcfqspi.h           |   80 ++
- 9 files changed, 3196 insertions(+), 21 deletions(-)
- create mode 100644 drivers/spi/coldfire_edma.c
- create mode 100644 drivers/spi/spi-m5445x.c
- create mode 100644 drivers/spi/spi_coldfire.c
- create mode 100644 drivers/spi/ssi_audio.c
- create mode 100644 include/linux/spi/mcfqspi.h
-
---- a/arch/m68k/configs/m54455evb_defconfig
-+++ b/arch/m68k/configs/m54455evb_defconfig
-@@ -321,6 +321,8 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1
- #
- # Self-contained MTD device drivers
- #
-+# CONFIG_MTD_DATAFLASH is not set
-+# CONFIG_MTD_M25P80 is not set
- # CONFIG_MTD_SLRAM is not set
- # CONFIG_MTD_PHRAM is not set
- # CONFIG_MTD_MTDRAM is not set
-@@ -497,8 +499,26 @@ CONFIG_UNIX98_PTYS=y
- #
- # SPI support
- #
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
-+CONFIG_SPI=y
-+# CONFIG_SPI_DEBUG is not set
-+CONFIG_COLDFIRE_EDMA=y
-+CONFIG_SPI_MASTER=y
-+
-+#
-+# SPI Master Controller Drivers
-+#
-+# CONFIG_SPI_BITBANG is not set
-+CONFIG_SPI_COLDFIRE=y
-+CONFIG_SPI_COLDFIRE_DSPI_EDMA=y
-+
-+#
-+# SPI Protocol Masters
-+#
-+# CONFIG_SPI_AT25 is not set
-+# CONFIG_SPI_SPIDEV is not set
-+# CONFIG_SPI_TLE62X0 is not set
-+CONFIG_SPI_COLDFIRE_SSI_AUDIO=y
-+# CONFIG_SSIAUDIO_USE_EDMA is not set
- # CONFIG_W1 is not set
- # CONFIG_POWER_SUPPLY is not set
- # CONFIG_HWMON is not set
---- a/drivers/spi/Kconfig
-+++ b/drivers/spi/Kconfig
-@@ -35,6 +35,15 @@ config SPI_DEBUG
- 	  Say "yes" to enable debug messaging (like dev_dbg and pr_debug),
- 	  sysfs, and debugfs support in SPI controller and protocol drivers.
- 
-+config COLDFIRE_EDMA
-+	tristate "Coldfire eDMA"
-+	depends on COLDFIRE && EXPERIMENTAL
-+	help
-+	    Support for Coldfire eDMA controller. Required for example
-+	    by SSI audio device driver.
-+
-+
-+
- #
- # MASTER side ... talking to discrete SPI slave chips including microcontrollers
- #
-@@ -113,6 +122,21 @@ config SPI_GPIO
- 
- 	  If unsure, say N.
- 
-+config SPI_COLDFIRE
-+	tristate "Coldfire QSPI/DSPI SPI Master"
-+	depends on SPI_MASTER && COLDFIRE && EXPERIMENTAL
-+	help
-+	  SPI driver for Freescale Coldfire QSPI module in master mode.
-+	  Tested with the 5282 processor, but should also work with other
-+	  Coldfire variants.
-+
-+config SPI_COLDFIRE_DSPI_EDMA	  
-+	boolean "Coldfire DSPI master driver uses eDMA"
-+	depends on SPI_MASTER && COLDFIRE && SPI_COLDFIRE && EXPERIMENTAL && COLDFIRE_EDMA
-+	default n
-+	help
-+	  Say "yes" if you want DSPI master driver to use eDMA for transfers.
-+
- config SPI_IMX
- 	tristate "Freescale iMX SPI controller"
- 	depends on SPI_MASTER && ARCH_IMX && EXPERIMENTAL
-@@ -255,6 +279,18 @@ config SPI_TLE62X0
- #
- # Add new SPI protocol masters in alphabetical order above this line
- #
-+config SPI_COLDFIRE_SSI_AUDIO
-+	tristate "Coldfire SSI AUDIO"
-+	depends on SPI_MASTER && SPI_COLDFIRE && EXPERIMENTAL
-+	help
-+	  SSI audio device driver
-+
-+config SSIAUDIO_USE_EDMA
-+	boolean "Coldfire DSPI master driver uses eDMA"
-+	default y
-+	depends on EXPERIMENTAL && COLDFIRE_EDMA && SPI_COLDFIRE_SSI_AUDIO
-+	help
-+	  Say "yes" if you want SSI audio driver to use eDMA for SSI transfers.
- 
- # (slave support would go here)
- 
---- a/drivers/spi/Makefile
-+++ b/drivers/spi/Makefile
-@@ -6,6 +6,8 @@ ifeq ($(CONFIG_SPI_DEBUG),y)
- EXTRA_CFLAGS += -DDEBUG
- endif
- 
-+obj-$(CONFIG_COLDFIRE_EDMA)		+= coldfire_edma.o
-+
- # small core, mostly translating board-specific
- # config declarations into driver model code
- obj-$(CONFIG_SPI_MASTER)		+= spi.o
-@@ -16,6 +18,7 @@ obj-$(CONFIG_SPI_BFIN)			+= spi_bfin5xx.
- obj-$(CONFIG_SPI_BITBANG)		+= spi_bitbang.o
- obj-$(CONFIG_SPI_AU1550)		+= au1550_spi.o
- obj-$(CONFIG_SPI_BUTTERFLY)		+= spi_butterfly.o
-+obj-$(CONFIG_SPI_COLDFIRE)		+= spi_coldfire.o spi-m5445x.o
- obj-$(CONFIG_SPI_GPIO)			+= spi_gpio.o
- obj-$(CONFIG_SPI_IMX)			+= spi_imx.o
- obj-$(CONFIG_SPI_LM70_LLP)		+= spi_lm70llp.o
-@@ -35,6 +38,7 @@ obj-$(CONFIG_SPI_SH_SCI)		+= spi_sh_sci.
- obj-$(CONFIG_SPI_AT25)		+= at25.o
- obj-$(CONFIG_SPI_SPIDEV)	+= spidev.o
- obj-$(CONFIG_SPI_TLE62X0)	+= tle62x0.o
-+obj-$(CONFIG_SPI_COLDFIRE_SSI_AUDIO)	+= ssi_audio.o
- # 	... add above this line ...
- 
- # SPI slave controller drivers (upstream link)
---- /dev/null
-+++ b/drivers/spi/coldfire_edma.c
-@@ -0,0 +1,358 @@
-+/*
-+ *
-+ * coldfire_edma.c - eDMA driver for Coldfire MCF5445x
-+ *
-+ * Yaroslav Vinogradov yaroslav.vinogradov@freescale.com
-+ *
-+ * Copyright Freescale Semiconductor, Inc. 2007
-+ *
-+ * 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/init.h>
-+#include <linux/module.h>
-+#include <asm/virtconvert.h>
-+#include <asm/coldfire.h>
-+#include <linux/fs.h>
-+#include <linux/cdev.h>
-+#include <linux/seq_file.h>
-+#include <linux/proc_fs.h>
-+#include <asm/mcf5445x_edma.h>
-+#include <asm/mcf5445x_intc.h>
-+#include <asm/coldfire_edma.h>
-+
-+
-+/* callback handler data for each TCD */
-+struct edma_isr_record {
-+	edma_irq_handler irq_handler;       /* interrupt handler */
-+	edma_error_handler error_handler;	/* error interrupt handler */
-+	void* dev;							/* device used for the channel */
-+	int  allocated;						/* busy flag */
-+	spinlock_t *lock;					/* spin lock (if needs to be locked in interrupt) */
-+	const char* device_id;				/* device id string, used in proc file system */
-+};
-+
-+/* device structure */
-+struct coldfire_edma_dev {
-+	struct cdev cdev; 			/* character device */
-+	struct edma_isr_record dma_interrupt_handlers[EDMA_CHANNELS]; /* channel handlers */
-+};
-+
-+/* allocated major device number */
-+static int coldfire_dma_major;
-+/* device driver structure */
-+static struct coldfire_edma_dev* devp = NULL;
-+
-+/* device driver file operations */
-+struct file_operations coldfire_edma_fops = {
-+	.owner = THIS_MODULE,
-+};
-+
-+/* eDMA channel interrupt handler */
-+static int dmaisr(int irq, void *dev_id)
-+{
-+	int channel = irq - EDMA_INT_CONTROLLER_BASE - EDMA_INT_CHANNEL_BASE;
-+	int result = IRQ_HANDLED;
-+
-+	if (devp!=NULL && devp->dma_interrupt_handlers[channel].lock) {
-+		spin_lock(devp->dma_interrupt_handlers[channel].lock);
-+	}
-+
-+	if (devp!=NULL && devp->dma_interrupt_handlers[channel].irq_handler) {
-+		result = devp->dma_interrupt_handlers[channel].irq_handler(channel,
-+							devp->dma_interrupt_handlers[channel].dev);
-+	} else {
-+		confirm_edma_interrupt_handled(channel);
-+		printk(EDMA_DRIVER_NAME ": No handler for DMA channel %d\n", channel);
-+	}
-+
-+   	if (devp!=NULL && devp->dma_interrupt_handlers[channel].lock) {
-+		spin_unlock(devp->dma_interrupt_handlers[channel].lock);
-+	}
-+
-+	return result;
-+}
-+
-+/* eDMA error interrupt handler */
-+static int dma_error_isr(int irq, void* dev_id)
-+{
-+	u16 err;
-+	int i;
-+
-+	err = MCF_EDMA_ERR;
-+	for (i=0;i<EDMA_CHANNELS;i++) {
-+		if (err & (1<<i)) {
-+			if (devp!=NULL && devp->dma_interrupt_handlers[i].error_handler) {
-+				devp->dma_interrupt_handlers[i].error_handler(i, devp->dma_interrupt_handlers[i].dev);
-+			} else {
-+				printk(KERN_WARNING EDMA_DRIVER_NAME ": DMA error on channel %d\n", i);
-+			}
-+		}
-+	}
-+
-+	MCF_EDMA_CERR = MCF_EDMA_CERR_CAER;
-+	return IRQ_HANDLED;
-+}
-+
-+/* sets channel parameters */
-+void set_edma_params(int channel, u32 source, u32 dest,
-+					 u32 attr, u32 soff, u32 nbytes, u32 slast,
-+					 u32 citer, u32 biter, u32 doff, u32 dlast_sga,
-+					 int major_int, int disable_req)
-+{
-+
-+	if (channel<0 || channel>EDMA_CHANNELS)
-+		return;
-+
-+	MCF_EDMA_TCD_SADDR(channel) = source;
-+	MCF_EDMA_TCD_DADDR(channel) = dest;
-+	MCF_EDMA_TCD_ATTR(channel) = attr;
-+	MCF_EDMA_TCD_SOFF(channel) = MCF_EDMA_TCD_SOFF_SOFF(soff);
-+	MCF_EDMA_TCD_NBYTES(channel) = MCF_EDMA_TCD_NBYTES_NBYTES(nbytes);
-+	MCF_EDMA_TCD_SLAST(channel) = MCF_EDMA_TCD_SLAST_SLAST(slast);
-+	MCF_EDMA_TCD_CITER(channel) = MCF_EDMA_TCD_CITER_CITER(citer);
-+	MCF_EDMA_TCD_BITER(channel)=MCF_EDMA_TCD_BITER_BITER(biter);
-+	MCF_EDMA_TCD_DOFF(channel) = MCF_EDMA_TCD_DOFF_DOFF(doff);
-+	MCF_EDMA_TCD_DLAST_SGA(channel) = MCF_EDMA_TCD_DLAST_SGA_DLAST_SGA(dlast_sga);
-+	/* interrupt at the end of major loop */
-+	if (major_int) {
-+		MCF_EDMA_TCD_CSR(channel) |= MCF_EDMA_TCD_CSR_INT_MAJOR;
-+	} else {
-+		MCF_EDMA_TCD_CSR(channel) &= ~MCF_EDMA_TCD_CSR_INT_MAJOR;
-+	}
-+	/* disable request at the end of major loop of transfer or not*/
-+	if (disable_req) {
-+		MCF_EDMA_TCD_CSR(channel) |= MCF_EDMA_TCD_CSR_D_REQ;
-+	} else {
-+		MCF_EDMA_TCD_CSR(channel) &= ~MCF_EDMA_TCD_CSR_D_REQ;
-+	}
-+
-+}
-+EXPORT_SYMBOL(set_edma_params);
-+
-+/* init eDMA controller */
-+void init_edma(void)
-+{
-+	MCF_EDMA_CR = 0;
-+}
-+EXPORT_SYMBOL(init_edma);
-+
-+/* request eDMA channel */
-+int request_edma_channel(int channel,
-+						edma_irq_handler handler,
-+						edma_error_handler error_handler,
-+						void* dev,
-+						spinlock_t *lock,
-+						const char* device_id )
-+{
-+	if (devp!=NULL && channel>=0 && channel<=EDMA_CHANNELS) {
-+		if (devp->dma_interrupt_handlers[channel].allocated) {
-+			return -EBUSY;
-+		}
-+		devp->dma_interrupt_handlers[channel].allocated = 1;
-+		devp->dma_interrupt_handlers[channel].irq_handler = handler;
-+		devp->dma_interrupt_handlers[channel].error_handler = error_handler;
-+		devp->dma_interrupt_handlers[channel].dev = dev;
-+		devp->dma_interrupt_handlers[channel].lock = lock;
-+		devp->dma_interrupt_handlers[channel].device_id = device_id;
-+		return 0;
-+	}
-+	return -EINVAL;
-+}
-+EXPORT_SYMBOL(request_edma_channel);
-+
-+/* free eDMA channel */
-+int free_edma_channel(int channel, void* dev)
-+{
-+	if (devp!=NULL && channel>=0 && channel<=EDMA_CHANNELS) {
-+		if (devp->dma_interrupt_handlers[channel].allocated) {
-+			if (devp->dma_interrupt_handlers[channel].dev != dev) {
-+				return -EBUSY;
-+			}
-+			devp->dma_interrupt_handlers[channel].allocated = 0;
-+			devp->dma_interrupt_handlers[channel].dev = NULL;
-+			devp->dma_interrupt_handlers[channel].irq_handler = NULL;
-+			devp->dma_interrupt_handlers[channel].error_handler = NULL;
-+			devp->dma_interrupt_handlers[channel].lock = NULL;
-+		}
-+		return 0;
-+	}
-+	return -EINVAL;
-+}
-+EXPORT_SYMBOL(free_edma_channel);
-+
-+/* clean-up device driver allocated resources */
-+static void coldfire_edma_cleanup(void)
-+{
-+	dev_t devno;
-+	int i;
-+
-+	/* free interrupts/memory */
-+	if (devp) {
-+		for (i=0;i<EDMA_CHANNELS;i++)
-+		{
-+			MCF_INTC0_SIMR = EDMA_INT_CHANNEL_BASE+i;
-+			free_irq(EDMA_INT_CHANNEL_BASE+EDMA_INT_CONTROLLER_BASE+i,	devp);
-+		}
-+		MCF_INTC0_SIMR = EDMA_INT_CHANNEL_BASE+EDMA_CHANNELS;
-+		free_irq(EDMA_INT_CHANNEL_BASE+EDMA_INT_CONTROLLER_BASE+EDMA_CHANNELS, devp);
-+		cdev_del(&devp->cdev);
-+		kfree(devp);
-+	}
-+
-+	/* unregister character device */
-+	devno = MKDEV(coldfire_dma_major, 0);
-+	unregister_chrdev_region(devno, 1);
-+}
-+
-+#ifdef CONFIG_PROC_FS
-+/* proc file system support */
-+
-+#define FREE_CHANNEL "free"
-+#define DEVICE_UNKNOWN "device unknown"
-+
-+static int proc_edma_show(struct seq_file *m, void *v)
-+{
-+	int i;
-+
-+	if (devp==NULL) return 0;
-+
-+	for (i = 0 ; i < EDMA_CHANNELS ; i++) {
-+		if (devp->dma_interrupt_handlers[i].allocated) {
-+			if (devp->dma_interrupt_handlers[i].device_id)
-+		    	seq_printf(m, "%2d: %s\n", i, devp->dma_interrupt_handlers[i].device_id);
-+			else
-+				seq_printf(m, "%2d: %s\n", i, DEVICE_UNKNOWN);
-+		} else {
-+			seq_printf(m, "%2d: %s\n", i, FREE_CHANNEL);
-+		}
-+	}
-+	return 0;
-+}
-+
-+static int proc_edma_open(struct inode *inode, struct file *file)
-+{
-+	return single_open(file, proc_edma_show, NULL);
-+}
-+
-+static const struct file_operations proc_edma_operations = {
-+	.open		= proc_edma_open,
-+	.read		= seq_read,
-+	.llseek		= seq_lseek,
-+	.release	= single_release,
-+};
-+
-+static int __init proc_edma_init(void)
-+{
-+	struct proc_dir_entry *e;
-+
-+	e = create_proc_entry("edma", 0, NULL);
-+	if (e)
-+		e->proc_fops = &proc_edma_operations;
-+
-+	return 0;
-+}
-+
-+#endif
-+
-+/* initializes device driver */
-+static int __init coldfire_edma_init(void)
-+{
-+	dev_t dev;
-+	int result;
-+	int i;
-+
-+	/* allocate free major number */
-+	result = alloc_chrdev_region(&dev, DMA_DEV_MINOR, 1, EDMA_DRIVER_NAME);
-+	if (result<0) {
-+		printk(KERN_WARNING EDMA_DRIVER_NAME": can't get major %d\n", result);
-+		return result;
-+	}
-+	coldfire_dma_major = MAJOR(dev);
-+
-+	/* allocate device driver structure */
-+	devp = kmalloc(sizeof(struct coldfire_edma_dev), GFP_KERNEL);
-+	if (!devp) {
-+		result = -ENOMEM;
-+		goto fail;
-+	}
-+
-+	/* init handlers (no handlers for beggining) */
-+   	for (i=0;i<EDMA_CHANNELS;i++) {
-+		devp->dma_interrupt_handlers[i].irq_handler = NULL;
-+		devp->dma_interrupt_handlers[i].error_handler = NULL;
-+		devp->dma_interrupt_handlers[i].dev = NULL;
-+		devp->dma_interrupt_handlers[i].allocated = 0;
-+		devp->dma_interrupt_handlers[i].lock = NULL;
-+		devp->dma_interrupt_handlers[i].device_id = NULL;
-+	}
-+
-+    /* register char device */
-+	cdev_init(&devp->cdev, &coldfire_edma_fops);
-+	devp->cdev.owner = THIS_MODULE;
-+	devp->cdev.ops = &coldfire_edma_fops;
-+	result = cdev_add(&devp->cdev, dev, 1);
-+	if (result) {
-+		printk(KERN_NOTICE EDMA_DRIVER_NAME": Error %d adding coldfire-dma device\n", result);
-+		result = -ENODEV;
-+		goto fail;
-+	}
-+
-+	/* request/enable irq for each eDMA channel */
-+	for (i=0;i<EDMA_CHANNELS;i++)
-+	{
-+		result = request_irq(EDMA_INT_CHANNEL_BASE+EDMA_INT_CONTROLLER_BASE+i,
-+			dmaisr, SA_INTERRUPT, EDMA_DRIVER_NAME, devp);
-+		if (result) {
-+			printk(KERN_WARNING EDMA_DRIVER_NAME": Cannot request irq %d\n",
-+				EDMA_INT_CHANNEL_BASE+EDMA_INT_CONTROLLER_BASE+i);
-+			result = -EBUSY;
-+			goto fail;
-+		}
-+
-+		MCF_INTC0_ICR(EDMA_INT_CHANNEL_BASE+i) = EDMA_IRQ_LEVEL;
-+		MCF_INTC0_CIMR = EDMA_INT_CHANNEL_BASE+i;
-+
-+	}
-+
-+    /* request error interrupt */
-+	result = request_irq(EDMA_INT_CHANNEL_BASE + EDMA_INT_CONTROLLER_BASE + EDMA_CHANNELS,
-+				dma_error_isr, SA_INTERRUPT, EDMA_DRIVER_NAME, devp);
-+	if (result) {
-+		printk(KERN_WARNING EDMA_DRIVER_NAME": Cannot request irq %d\n",
-+				EDMA_INT_CHANNEL_BASE+EDMA_INT_CONTROLLER_BASE+EDMA_CHANNELS);
-+		result = -EBUSY;
-+		goto fail;
-+	}
-+
-+	/* enable error interrupt in interrupt controller */
-+	MCF_INTC0_ICR(EDMA_INT_CHANNEL_BASE+EDMA_CHANNELS) = EDMA_IRQ_LEVEL;
-+	MCF_INTC0_CIMR = EDMA_INT_CHANNEL_BASE+EDMA_CHANNELS;
-+
-+#ifdef CONFIG_PROC_FS
-+	proc_edma_init();
-+#endif
-+
-+	printk(EDMA_DRIVER_NAME ": initialized successfully\n");
-+
-+	return 0;
-+fail:
-+	coldfire_edma_cleanup();
-+	return result;
-+
-+}
-+
-+static void __exit coldfire_edma_exit(void)
-+{
-+	coldfire_edma_cleanup();
-+}
-+
-+module_init(coldfire_edma_init);
-+module_exit(coldfire_edma_exit);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Yaroslav Vinogradov, Freescale Inc.");
-+MODULE_DESCRIPTION("eDMA library for Coldfire 5445x");
---- /dev/null
-+++ b/drivers/spi/spi-m5445x.c
-@@ -0,0 +1,156 @@
-+/***************************************************************************/
-+/*
-+ *	linux/arch/m68k/coldfire/spi-m5445x.c
-+ *
-+ *	Sub-architcture dependant initialization code for the Freescale
-+ *	5445x SPI module
-+ *
-+ *	Yaroslav Vinogradov yaroslav.vinogradov@freescale.com
-+ *	Copyright Freescale Semiconductor, Inc 2007
-+ *
-+ *	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/kernel.h>
-+#include <linux/sched.h>
-+#include <linux/param.h>
-+#include <linux/init.h>
-+#include <linux/interrupt.h>
-+#include <linux/device.h>
-+#include <linux/platform_device.h>
-+#include <linux/spi/spi.h>
-+
-+#include <asm/dma.h>
-+#include <asm/traps.h>
-+#include <asm/machdep.h>
-+#include <asm/coldfire.h>
-+#include <asm/mcfsim.h>
-+#include <asm/mcfqspi.h>
-+#include <asm/mcf5445x_gpio.h>
-+
-+#define SPI_NUM_CHIPSELECTS 	0x10
-+#define SPI_PAR_VAL  (0 | MCF_GPIO_PAR_DSPI_PCS5_PCS5 | MCF_GPIO_PAR_DSPI_PCS2_PCS2 \
-+		| MCF_GPIO_PAR_DSPI_PCS1_PCS1 | MCF_GPIO_PAR_DSPI_PCS0_PCS0 | MCF_GPIO_PAR_DSPI_SIN_SIN \
-+		| MCF_GPIO_PAR_DSPI_SOUT_SOUT | MCF_GPIO_PAR_DSPI_SCK_SCK)
-+
-+#define MCF5445x_DSPI_IRQ_SOURCE	(31)
-+#define MCF5445x_DSPI_IRQ_VECTOR	(64 + MCF5445x_DSPI_IRQ_SOURCE)
-+
-+#define MCF5445x_DSPI_PAR	(0xFC0A4063)
-+#define MCF5445x_DSPI_MCR	(0xFC05C000)
-+#define MCF5445x_INTC0_ICR	(0xFC048040)
-+#define MCF5445x_INTC0_IMRL	(0xFC04800C)
-+
-+
-+#define M5445x_AUDIO_IRQ_SOURCE 49
-+#define M5445x_AUDIO_IRQ_VECTOR (128+M5445x_AUDIO_IRQ_SOURCE)
-+#define M5445x_AUDIO_IRQ_LEVEL	4
-+
-+void coldfire_qspi_cs_control(u8 cs, u8 command)
-+{
-+}
-+
-+#if defined(CONFIG_SPI_COLDFIRE_SSI_AUDIO)
-+static struct coldfire_spi_chip ssi_audio_chip_info = {
-+	.mode = SPI_MODE_0,
-+	.bits_per_word = 16,
-+	.del_cs_to_clk = 16,
-+	.del_after_trans = 16,
-+	.void_write_data = 0
-+};
-+
-+#endif
-+
-+static struct spi_board_info spi_board_info[] = {
-+
-+#if defined(CONFIG_SPI_COLDFIRE_SSI_AUDIO)
-+	{
-+		.modalias = "ssi_audio",
-+		.max_speed_hz = 300000,
-+		.bus_num = 1,
-+		.chip_select = 5,
-+		.irq = M5445x_AUDIO_IRQ_VECTOR,
-+		.platform_data = NULL,
-+		.controller_data = &ssi_audio_chip_info
-+	}
-+#endif
-+
-+};
-+
-+static struct coldfire_spi_master coldfire_master_info = {
-+	.bus_num = 1,
-+	.num_chipselect = SPI_NUM_CHIPSELECTS,
-+	.irq_source = MCF5445x_DSPI_IRQ_SOURCE,
-+	.irq_vector = MCF5445x_DSPI_IRQ_VECTOR,
-+	.irq_mask = (0x01 << MCF5445x_DSPI_IRQ_SOURCE),
-+	.irq_lp = 0x2,  /* Level */
-+	.par_val = SPI_PAR_VAL,
-+//	.par_val16 = SPI_PAR_VAL,
-+	.cs_control = coldfire_qspi_cs_control,
-+};
-+
-+static struct resource coldfire_spi_resources[] = {
-+	[0] = {
-+		.name = "qspi-par",
-+		.start = MCF5445x_DSPI_PAR,
-+		.end = MCF5445x_DSPI_PAR,
-+		.flags = IORESOURCE_MEM
-+	},
-+
-+	[1] = {
-+		.name = "qspi-module",
-+		.start = MCF5445x_DSPI_MCR,
-+		.end = MCF5445x_DSPI_MCR + 0xB8,
-+		.flags = IORESOURCE_MEM
-+	},
-+
-+	[2] = {
-+		.name = "qspi-int-level",
-+		.start = MCF5445x_INTC0_ICR + MCF5445x_DSPI_IRQ_SOURCE,
-+		.end = MCF5445x_INTC0_ICR + MCF5445x_DSPI_IRQ_SOURCE,
-+		.flags = IORESOURCE_MEM
-+	},
-+
-+	[3] = {
-+		.name = "qspi-int-mask",
-+		.start = MCF5445x_INTC0_IMRL,
-+		.end = MCF5445x_INTC0_IMRL,
-+		.flags = IORESOURCE_MEM
-+	}
-+};
-+
-+static struct platform_device coldfire_spi = {
-+	.name = "spi_coldfire", //"coldfire-qspi",
-+	.id = -1,
-+	.resource = coldfire_spi_resources,
-+	.num_resources = ARRAY_SIZE(coldfire_spi_resources),
-+	.dev = {
-+		.platform_data = &coldfire_master_info,
-+	}
-+};
-+
-+static int __init spi_dev_init(void)
-+{
-+	int retval = 0;
-+	
-+	retval = platform_device_register(&coldfire_spi);
-+
-+	if (retval < 0) {
-+		printk(KERN_ERR "SPI-m5445x: platform_device_register failed with code=%d\n", retval);
-+		goto out;
-+	}
-+
-+	if (ARRAY_SIZE(spi_board_info))
-+		retval = spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info));
-+
-+
-+out:
-+	return retval;
-+}
-+
-+arch_initcall(spi_dev_init);
---- /dev/null
-+++ b/drivers/spi/spi_coldfire.c
-@@ -0,0 +1,1552 @@
-+/****************************************************************************/
-+
-+/*
-+ *	spi_coldfire.c - Master QSPI/DSPI controller for the ColdFire processors
-+ *
-+ *	(C) Copyright 2005, Intec Automation,
-+ *			    Mike Lavender (mike@steroidmicros)
-+ *
-+ *	(C) Copyright 2007, Freescale Inc,
-+ *			    Yaroslav Vinogradov (yaroslav.vinogradov@freescale.com)
-+ *
-+
-+     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.
-+
-+     This program is distributed in the hope that it will be useful,
-+     but WITHOUT ANY WARRANTY; without even the implied warranty of
-+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+     GNU General Public License for more details.
-+
-+     You should have received a copy of the GNU General Public License
-+     along with this program; if not, write to the Free Software
-+     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.		     */
-+/* ------------------------------------------------------------------------- */
-+
-+
-+/****************************************************************************/
-+
-+/*
-+ * Includes
-+ */
-+
-+#include <linux/autoconf.h>
-+#include <linux/init.h>
-+#include <linux/module.h>
-+#include <linux/device.h>
-+#include <linux/interrupt.h>
-+#include <linux/platform_device.h>
-+#include <linux/spi/spi.h>
-+#include <linux/workqueue.h>
-+#include <linux/delay.h>
-+
-+#include <asm/delay.h>
-+#include <asm/mcfsim.h>
-+#include <asm/mcfqspi.h>
-+#include <asm/coldfire.h>
-+#include <asm/virtconvert.h>
-+
-+#if defined(CONFIG_M54455)
-+	#define SPI_DSPI
-+	#if defined(CONFIG_SPI_COLDFIRE_DSPI_EDMA)
-+		#define SPI_DSPI_EDMA
-+		#ifdef CONFIG_MMU
-+			#define SPI_USE_MMU
-+		#endif
-+	#endif
-+#endif
-+
-+#ifdef SPI_DSPI
-+#include <asm/mcf5445x_dspi.h>
-+
-+
-+#endif
-+
-+#if defined(SPI_DSPI_EDMA)
-+
-+/* edma buffer size in transfer units (32bits) */
-+#define EDMA_BUFFER_SIZE	(PAGE_SIZE/4)
-+#define EDMA_BUFSIZE_KMALLOC (EDMA_BUFFER_SIZE*4)
-+
-+#define DSPI_DMA_RX_TCD	12
-+#define DSPI_DMA_TX_TCD 13
-+
-+
-+#include <asm/coldfire_edma.h>
-+#include <asm/mcf5445x_edma.h>
-+#endif
-+
-+
-+MODULE_AUTHOR("Mike Lavender");
-+MODULE_DESCRIPTION("ColdFire QSPI Contoller");
-+MODULE_LICENSE("GPL");
-+
-+#define DRIVER_NAME "Coldfire QSPI/DSPI"
-+
-+/****************************************************************************/
-+
-+/*
-+ * Local constants and macros
-+ */
-+
-+#define QSPI_RAM_SIZE		0x10    /* 16 word table */
-+
-+#define QSPI_TRANSMIT_RAM 	0x00
-+#define QSPI_RECEIVE_RAM  	0x10
-+#define QSPI_COMMAND_RAM  	0x20
-+
-+#define QSPI_COMMAND		0x7000  /* 15:   X = Continuous CS
-+					 * 14:   1 = Get BITSE from QMR[BITS]
-+					 * 13:   1 = Get DT    from QDLYR[DTL]
-+					 * 12:   1 = Get DSK   from QDLYR[QCD]
-+					 * 8-11: XXXX = next 4 bytes for CS
-+					 * 0-7:  0000 0000 Reserved
-+					 */
-+
-+#define QIR_WCEF                0x0008  /* write collison */
-+#define QIR_ABRT                0x0004  /* abort */
-+#define QIR_SPIF                0x0001  /* finished */
-+
-+#define QIR_WCEFE              	0x0800
-+#define QIR_ABRTE              	0x0400
-+#define QIR_SPIFE              	0x0100
-+
-+#define QIR_WCEFB              	0x8000
-+#define QIR_ABRTB              	0x4000
-+#define QIR_ABRTL              	0x1000
-+
-+#define QMR_BITS             	0x3C00
-+#define QMR_BITS_8              0x2000
-+
-+#define QCR_CONT              	0x8000
-+
-+#define QDLYR_SPE		0x8000
-+
-+#define QWR_ENDQP_MASK		0x0F00
-+#define QWR_CSIV		0x1000  /* 1 = active low chip selects */
-+
-+
-+#define START_STATE ((void*)0)
-+#define RUNNING_STATE ((void*)1)
-+#define DONE_STATE ((void*)2)
-+#define ERROR_STATE ((void*)-1)
-+
-+#define QUEUE_RUNNING 0
-+#define QUEUE_STOPPED 1
-+
-+/****************************************************************************/
-+
-+/*
-+ * Local Data Structures
-+ */
-+
-+struct transfer_state {
-+	u32 index;
-+	u32 len;
-+	void *tx;
-+	void *tx_end;
-+	void *rx;
-+	void *rx_end;
-+	char flags;
-+#define TRAN_STATE_RX_VOID	   0x01
-+#define TRAN_STATE_TX_VOID 	   0x02
-+#define TRAN_STATE_WORD_ODD_NUM	   0x04
-+	u8 cs;
-+	u16 void_write_data;
-+	unsigned cs_change:1;
-+};
-+
-+typedef struct {
-+	unsigned master:1;
-+	unsigned dohie:1;
-+	unsigned bits:4;
-+	unsigned cpol:1;
-+	unsigned cpha:1;
-+	unsigned baud:8;
-+} QMR;
-+
-+typedef struct {
-+	unsigned spe:1;
-+	unsigned qcd:7;
-+	unsigned dtl:8;
-+} QDLYR;
-+
-+typedef struct {
-+	unsigned halt:1;
-+	unsigned wren:1;
-+	unsigned wrto:1;
-+	unsigned csiv:1;
-+	unsigned endqp:4;
-+	unsigned cptqp:4;
-+	unsigned newqp:4;
-+} QWR;
-+
-+
-+typedef struct {
-+	unsigned master:1;
-+	unsigned cont_scke:1;
-+	unsigned dconf:2;
-+	unsigned frz:1;
-+	unsigned mtfe:1;
-+	unsigned pcsse:1;
-+	unsigned rooe:1;
-+	unsigned pcsis:8;
-+	unsigned reserved15:1;
-+	unsigned mdis:1;
-+	unsigned dis_tx:1;
-+	unsigned dis_rxf:1;
-+	unsigned clr_tx:1;
-+	unsigned clr_rxf:1;
-+	unsigned smpl_pt:2;
-+	unsigned reserved71:7;
-+	unsigned halt:1;
-+} DSPI_MCR;
-+
-+typedef struct {
-+	unsigned dbr:1;
-+	unsigned fmsz:4;
-+	unsigned cpol:1;
-+	unsigned cpha:1;
-+	unsigned lsbfe:1;
-+	unsigned pcssck:2;
-+	unsigned pasc:2;
-+	unsigned pdt:2;
-+	unsigned pbr:2;
-+	unsigned cssck:4;
-+	unsigned asc:4;
-+	unsigned dt:4;
-+	unsigned br:4;
-+} DSPI_CTAR;
-+
-+struct chip_data {
-+#if defined(SPI_DSPI)
-+	/* dspi data */
-+	union {
-+		u32 mcr_val;
-+		DSPI_MCR mcr;
-+	};
-+	union {
-+		u32 ctar_val;
-+		DSPI_CTAR ctar;
-+	};
-+#else
-+	union {
-+		u16 qmr_val;
-+		QMR qmr;
-+	};
-+	union {
-+		u16 qdlyr_val;
-+		QDLYR qdlyr;
-+	};
-+	union {
-+		u16 qwr_val;
-+		QWR qwr;
-+	};
-+#endif
-+
-+	u16 void_write_data;
-+};
-+
-+
-+struct driver_data {
-+	/* Driver model hookup */
-+	struct platform_device *pdev;
-+
-+	/* SPI framework hookup */
-+	struct spi_master *master;
-+
-+	/* Driver message queue */
-+	struct workqueue_struct	*workqueue;
-+	struct work_struct pump_messages;
-+	spinlock_t lock;
-+	struct list_head queue;
-+	int busy;
-+	int run;
-+
-+	/* Message Transfer pump */
-+	struct tasklet_struct pump_transfers;
-+
-+	/* Current message transfer state info */
-+	struct spi_message* cur_msg;
-+	struct spi_transfer* cur_transfer;
-+	struct chip_data *cur_chip;
-+	size_t len;
-+	void *tx;
-+	void *tx_end;
-+	void *rx;
-+	void *rx_end;
-+	char flags;
-+#define TRAN_STATE_RX_VOID	   0x01
-+#define TRAN_STATE_TX_VOID 	   0x02
-+#define TRAN_STATE_WORD_ODD_NUM	   0x04
-+	u8 cs;
-+	u16 void_write_data;
-+	unsigned cs_change:1;
-+
-+	u32 trans_cnt;
-+	u32 wce_cnt;
-+	u32 abrt_cnt;
-+#if defined(SPI_DSPI)
-+	u32 *mcr;			/* DSPI MCR register */
-+	u32 *ctar;			/* DSPI CTAR register */
-+	u32 *dspi_dtfr;		/* DSPI DTFR register */
-+	u32 *dspi_drfr;		/* DSPI DRFR register */
-+	u32 *dspi_rser;		/* DSPI RSER register */
-+	u32 *dspi_sr;		/* DSPI status register */
-+	u8	dspi_ctas;		/* DSPI CTAS value*/
-+	
-+#if defined(SPI_DSPI_EDMA)
-+	void*	edma_tx_buf;
-+	void*	edma_rx_buf;
-+#endif
-+	
-+		
-+#else
-+ 	u16 *qmr;          /* QSPI mode register      */
-+ 	u16 *qdlyr;        /* QSPI delay register     */
-+ 	u16 *qwr;	   /* QSPI wrap register      */
-+ 	u16 *qir;          /* QSPI interrupt register */
-+ 	u16 *qar;          /* QSPI address register   */
-+ 	u16 *qdr;          /* QSPI data register      */
-+ 	u16 *qcr;	   /* QSPI command register   */
-+#endif
-+ 	u8  *par;	   /* Pin assignment register */
-+ 	u8  *int_icr;	   /* Interrupt level and priority register */
-+ 	u32 *int_mr;       /* Interrupt mask register */
-+ 	void (*cs_control)(u8 cs, u8 command);
-+};
-+
-+#define DSPI_CS(cs) ((1<<(cs))<<16)
-+
-+
-+/****************************************************************************/
-+
-+/*
-+ * SPI local functions
-+ */
-+
-+//#define SPI_COLDFIRE_DEBUG
-+
-+static void *next_transfer(struct driver_data *drv_data)
-+{
-+	struct spi_message *msg = drv_data->cur_msg;
-+	struct spi_transfer *trans = drv_data->cur_transfer;
-+
-+	/* Move to next transfer */
-+	if (trans->transfer_list.next != &msg->transfers) {
-+		drv_data->cur_transfer =
-+			list_entry(trans->transfer_list.next,
-+					struct spi_transfer,
-+					transfer_list);
-+		return RUNNING_STATE;
-+	} else
-+		return DONE_STATE;
-+}
-+
-+
-+#define DSPI_BITS MCF_DSPI_DCTAR_FMSZ(15)
-+#define DSPI_BITS_16 MCF_DSPI_DCTAR_FMSZ(15)
-+#define DSPI_BITS_8 MCF_DSPI_DCTAR_FMSZ(7)
-+#define DSPI_FIFO_SIZE 16
-+
-+static inline int is_word_transfer(struct driver_data *drv_data)
-+{
-+#if defined(SPI_DSPI)
-+	return ((*drv_data->ctar & DSPI_BITS_16) == DSPI_BITS_8) ? 0 : 1;
-+#else
-+	return ((*drv_data->qmr & QMR_BITS) == QMR_BITS_8) ? 0 : 1;
-+#endif
-+}
-+
-+static void inline set_8bit_transfer_mode(struct driver_data *drv_data)
-+{
-+#if defined(SPI_DSPI)
-+	*drv_data->ctar |= (*drv_data->ctar & ~DSPI_BITS) | DSPI_BITS_8;
-+#else
-+	*drv_data->qmr |= (*drv_data->qmr & ~QMR_BITS) | QMR_BITS_8;
-+#endif
-+}
-+
-+static void inline set_16bit_transfer_mode(struct driver_data *drv_data)
-+{
-+#if defined(SPI_DSPI)
-+	*drv_data->ctar |= (*drv_data->ctar & ~DSPI_BITS) | DSPI_BITS_16;
-+#else
-+	*drv_data->qmr |= (*drv_data->qmr & ~QMR_BITS);
-+#endif
-+}
-+
-+static int write(struct driver_data *drv_data)
-+{
-+ 	int tx_count = 0;
-+#ifndef SPI_DSPI
-+ 	int cmd_count = 0;
-+#endif
-+ 	int tx_word;
-+
-+#if defined(SPI_DSPI)
-+
-+#if defined(SPI_DSPI_EDMA)
-+	u32* edma_wr;
-+#endif
-+
-+ 	u16 d16;
-+ 	u8  d8;
-+ 	u32 dspi_pushr;
-+ 	int first = 1;
-+#endif
-+
-+	tx_word = is_word_transfer(drv_data);
-+
-+	// If we are in word mode, but only have a single byte to transfer
-+	// then switch to byte mode temporarily.  Will switch back at the
-+	// end of the transfer.
-+ 	if (tx_word && ((drv_data->tx_end - drv_data->tx) == 1)) {
-+ 		drv_data->flags |= TRAN_STATE_WORD_ODD_NUM;
-+ 		set_8bit_transfer_mode(drv_data);
-+ 		tx_word = 0;
-+	}
-+
-+
-+#if defined(SPI_DSPI)
-+
-+#if defined(SPI_DSPI_EDMA)
-+	edma_wr = (u32*)(drv_data->edma_tx_buf);
-+#endif
-+
-+
-+#if defined(SPI_DSPI_EDMA)
-+	while ((drv_data->tx < drv_data->tx_end) && (tx_count < EDMA_BUFFER_SIZE)) {
-+#else
-+	while ((drv_data->tx < drv_data->tx_end) && (tx_count < DSPI_FIFO_SIZE)) {
-+#endif
-+		if (tx_word) {
-+			if ((drv_data->tx_end - drv_data->tx) == 1)
-+				break;
-+			if (!(drv_data->flags & TRAN_STATE_TX_VOID)) {
-+ 				d16 = *(u16 *)drv_data->tx;
-+			} else {
-+ 				d16 = drv_data->void_write_data;
-+			}
-+
-+			dspi_pushr = MCF_DSPI_DTFR_TXDATA(d16)
-+						  | DSPI_CS(drv_data->cs)
-+						 | MCF_DSPI_DTFR_CTAS(drv_data->dspi_ctas)
-+						 //| MCF_DSPI_DTFR_CONT
-+						 ;
-+
-+			drv_data->tx += 2;
-+
-+#if defined(SPI_DSPI_EDMA)
-+			if (drv_data->tx == drv_data->tx_end  || tx_count==EDMA_BUFFER_SIZE-1) {
-+#else			
-+			if (drv_data->tx == drv_data->tx_end  || tx_count==DSPI_FIFO_SIZE-1) {
-+#endif				
-+				// last transfer in queue
-+				dspi_pushr |= MCF_DSPI_DTFR_EOQ;
-+				if (drv_data->cs_change) {
-+					dspi_pushr &= ~MCF_DSPI_DTFR_CONT;
-+				}
-+			}
-+
-+			if (first) {
-+				first = 0;
-+				dspi_pushr |= MCF_DSPI_DTFR_CTCNT; // clear counter
-+			}
-+#if defined(SPI_DSPI_EDMA)
-+			*edma_wr = dspi_pushr;
-+			edma_wr++;			
-+#else
-+			*drv_data->dspi_dtfr = dspi_pushr;
-+			//MCF_DSPI_DTFR = dspi_pushr;
-+#endif
-+
-+
-+		} else {
-+			if (!(drv_data->flags & TRAN_STATE_TX_VOID)) {
-+ 				d8 = *(u8 *)drv_data->tx;
-+			} else {
-+ 				d8 = *(u8 *)&drv_data->void_write_data;
-+			}
-+
-+			dspi_pushr = MCF_DSPI_DTFR_TXDATA(d8)
-+						 | DSPI_CS(drv_data->cs)
-+						 /* | MCF_DSPI_DTFR_PCS5 | */
-+						 | MCF_DSPI_DTFR_CTAS(drv_data->dspi_ctas)
-+						 | MCF_DSPI_DTFR_CONT;
-+
-+			drv_data->tx++;
-+
-+			if (drv_data->tx == drv_data->tx_end  || tx_count==DSPI_FIFO_SIZE-1) {
-+				// last transfer in queue
-+				dspi_pushr |= MCF_DSPI_DTFR_EOQ;
-+				if (drv_data->cs_change) {
-+					dspi_pushr &= ~MCF_DSPI_DTFR_CONT;
-+				}
-+			}
-+
-+			if (first) {
-+				first = 0;
-+				dspi_pushr |= MCF_DSPI_DTFR_CTCNT; // clear counter
-+			}
-+
-+#if defined(SPI_DSPI_EDMA)
-+			*edma_wr = dspi_pushr;
-+			edma_wr++;			
-+#else			
-+			*drv_data->dspi_dtfr = dspi_pushr;
-+			//MCF_DSPI_DTFR = dspi_pushr;
-+#endif			
-+
-+		}
-+		tx_count++;
-+	}
-+
-+#if defined(SPI_DSPI_EDMA)
-+
-+	if (tx_count>0) {
-+
-+		// TODO: initiate eDMA transfer
-+		set_edma_params(DSPI_DMA_TX_TCD,
-+#ifdef SPI_USE_MMU
-+					virt_to_phys(drv_data->edma_tx_buf),
-+#else
-+					drv_data->edma_tx_buf,
-+#endif
-+					(u32)drv_data->dspi_dtfr,
-+					MCF_EDMA_TCD_ATTR_SSIZE_32BIT | MCF_EDMA_TCD_ATTR_DSIZE_32BIT,
-+					4,  // soff
-+					4,  // nbytes
-+					0,  // slast
-+					tx_count, // citer
-+					tx_count, // biter
-+					0, // doff
-+					0, // dlastsga
-+					0, // major_int
-+					1  // disable_req
-+					);
-+
-+		set_edma_params(DSPI_DMA_RX_TCD,
-+					(u32)drv_data->dspi_drfr,
-+#ifdef SPI_USE_MMU
-+					virt_to_phys(drv_data->edma_rx_buf),
-+#else
-+					drv_data->edma_rx_buf,
-+#endif
-+					MCF_EDMA_TCD_ATTR_SSIZE_32BIT | MCF_EDMA_TCD_ATTR_DSIZE_32BIT,
-+					0,  // soff
-+					4,  // nbytes
-+					0,  // slast
-+					tx_count, // citer
-+					tx_count, // biter
-+					4, // doff
-+					0,  // dlastsga
-+                    0,   // major_int
-+					1	// disable_req
-+					);
-+
-+
-+		start_edma_transfer(DSPI_DMA_TX_TCD); // transmit SPI data
-+		start_edma_transfer(DSPI_DMA_RX_TCD); // receive SPI data
-+	}
-+#endif
-+
-+#else
-+
-+	*drv_data->qar = QSPI_TRANSMIT_RAM;
-+ 	while ((drv_data->tx < drv_data->tx_end) && (tx_count < QSPI_RAM_SIZE)) {
-+ 		if (tx_word) {
-+			if ((drv_data->tx_end - drv_data->tx) == 1)
-+				break;
-+
-+ 			if (!(drv_data->flags & TRAN_STATE_TX_VOID))
-+ 				*drv_data->qdr = *(u16 *)drv_data->tx;
-+ 			else
-+ 				*drv_data->qdr = drv_data->void_write_data;
-+ 			drv_data->tx += 2;
-+ 		} else {
-+ 			if (!(drv_data->flags & TRAN_STATE_TX_VOID))
-+ 				*drv_data->qdr = *(u8 *)drv_data->tx;
-+ 			else
-+ 				*drv_data->qdr = *(u8 *)&drv_data->void_write_data;
-+ 			drv_data->tx++;
-+ 		}
-+ 		tx_count++;
-+ 	}
-+
-+
-+ 	*drv_data->qar = QSPI_COMMAND_RAM;
-+ 	while (cmd_count < tx_count) {
-+		u16 qcr =   QSPI_COMMAND
-+			  | QCR_CONT
-+			  | (~((0x01 << drv_data->cs) << 8) & 0x0F00);
-+
-+		if ( 	   (cmd_count == tx_count - 1)
-+			&& (drv_data->tx == drv_data->tx_end)
-+			&& (drv_data->cs_change) ) {
-+			qcr &= ~QCR_CONT;
-+		}
-+		*drv_data->qcr = qcr;
-+		cmd_count++;
-+	}
-+
-+	*drv_data->qwr = (*drv_data->qwr & ~QWR_ENDQP_MASK) | ((cmd_count - 1) << 8);
-+
-+ 	/* Fire it up! */
-+ 	*drv_data->qdlyr |= QDLYR_SPE;
-+#endif
-+
-+ 	return tx_count;
-+}
-+
-+
-+static int read(struct driver_data *drv_data)
-+{
-+	int rx_count = 0;
-+	int rx_word;
-+#if defined(SPI_DSPI_EDMA)
-+	u32* rx_edma;
-+#endif
-+	u16 d;
-+	rx_word = is_word_transfer(drv_data);
-+
-+#if defined(SPI_DSPI)
-+
-+#if defined(SPI_DSPI_EDMA)
-+	rx_edma = (u32*) drv_data->edma_tx_buf;
-+	while ((drv_data->rx < drv_data->rx_end) && (rx_count < EDMA_BUFFER_SIZE)) {
-+#else
-+	while ((drv_data->rx < drv_data->rx_end) && (rx_count < DSPI_FIFO_SIZE)) {
-+#endif
-+		if (rx_word) {
-+			if ((drv_data->rx_end - drv_data->rx) == 1)
-+				break;
-+#if defined(SPI_DSPI_EDMA)
-+			d = MCF_DSPI_DRFR_RXDATA(*rx_edma);
-+			rx_edma++;
-+#else
-+			d = MCF_DSPI_DRFR_RXDATA(*drv_data->dspi_drfr);
-+#endif
-+
-+			if (!(drv_data->flags & TRAN_STATE_RX_VOID))
-+				*(u16 *)drv_data->rx = d;
-+			drv_data->rx += 2;
-+		} else {
-+#if defined(SPI_DSPI_EDMA)
-+			d = MCF_DSPI_DRFR_RXDATA(*rx_edma);
-+			rx_edma++;
-+#else
-+			d = MCF_DSPI_DRFR_RXDATA(*drv_data->dspi_drfr);
-+#endif
-+			if (!(drv_data->flags & TRAN_STATE_RX_VOID))
-+				*(u8 *)drv_data->rx = d;
-+			drv_data->rx++;
-+		}
-+		rx_count++;
-+	}
-+
-+
-+#else
-+
-+	*drv_data->qar = QSPI_RECEIVE_RAM;
-+	while ((drv_data->rx < drv_data->rx_end) && (rx_count < QSPI_RAM_SIZE)) {
-+		if (rx_word) {
-+			if ((drv_data->rx_end - drv_data->rx) == 1)
-+				break;
-+
-+			if (!(drv_data->flags & TRAN_STATE_RX_VOID))
-+				*(u16 *)drv_data->rx = *drv_data->qdr;
-+			drv_data->rx += 2;
-+		} else {
-+			if (!(drv_data->flags & TRAN_STATE_RX_VOID))
-+				*(u8 *)drv_data->rx = *drv_data->qdr;
-+			drv_data->rx++;
-+		}
-+		rx_count++;
-+	}
-+#endif
-+
-+	return rx_count;
-+}
-+
-+
-+static inline void qspi_setup_chip(struct driver_data *drv_data)
-+{
-+	struct chip_data *chip = drv_data->cur_chip;
-+
-+#if defined(SPI_DSPI)
-+
-+	*drv_data->mcr = chip->mcr_val;
-+
-+	// TODO: remove later
-+	chip->ctar_val = 0x78560118;
-+
-+	*drv_data->ctar = chip->ctar_val;
-+	*drv_data->dspi_rser =  0
-+							| MCF_DSPI_DRSER_EOQFE
-+#if defined(SPI_DSPI_EDMA)
-+							| MCF_DSPI_DRSER_TFFFE
-+							| MCF_DSPI_DRSER_TFFFS
-+#endif
-+							;
-+
-+
-+#else
-+	*drv_data->qmr = chip->qmr_val;
-+	*drv_data->qdlyr = chip->qdlyr_val;
-+	*drv_data->qwr = chip->qwr_val;
-+
-+	/*
-+	 * Enable all the interrupts and clear all the flags
-+	 */
-+	*drv_data->qir =  (QIR_SPIFE | QIR_ABRTE | QIR_WCEFE)
-+			| (QIR_WCEFB | QIR_ABRTB | QIR_ABRTL)
-+			| (QIR_SPIF  | QIR_ABRT  | QIR_WCEF);
-+#endif
-+}
-+
-+#if defined(SPI_DSPI_EDMA)
-+static int edma_tx_handler(int channel, void* dev)
-+{
-+	if (channel == DSPI_DMA_TX_TCD) {
-+		stop_edma_transfer(DSPI_DMA_TX_TCD);
-+	}
-+	return IRQ_HANDLED;
-+}
-+
-+static int edma_rx_handler(int channel, void* dev)
-+{
-+	if (channel == DSPI_DMA_RX_TCD) {
-+		stop_edma_transfer(DSPI_DMA_RX_TCD);
-+	}
-+
-+	return IRQ_HANDLED;
-+}
-+#endif
-+
-+static irqreturn_t qspi_interrupt(int irq, void *dev_id)
-+{
-+	struct driver_data *drv_data = (struct driver_data *)dev_id;
-+	struct spi_message *msg = drv_data->cur_msg;
-+#if defined(SPI_DSPI)
-+#if !defined(SPI_DSPI_EDMA)
-+ 	u32 irq_status = *drv_data->dspi_sr;
-+#endif
-+#else
-+	u16 irq_status = *drv_data->qir;
-+#endif
-+
-+	/* Clear all flags immediately */
-+#if defined(SPI_DSPI)
-+	*drv_data->dspi_sr = MCF_DSPI_DSR_EOQF;
-+#else
-+	*drv_data->qir |= (QIR_SPIF | QIR_ABRT | QIR_WCEF);
-+#endif
-+
-+	if (!drv_data->cur_msg || !drv_data->cur_msg->state) {
-+#if !defined(SPI_DSPI_EDMA)
-+		/* if eDMA is used it happens some time (at least once)*/
-+		printk(KERN_ERR "coldfire-qspi: bad message or transfer "
-+		"state in interrupt handler. IRQ status=%x\n", irq_status);
-+#endif
-+		return IRQ_NONE;
-+	}
-+
-+#if !defined(SPI_DSPI)
-+	if (irq_status & QIR_SPIF) {
-+#endif
-+		/*
-+		 * Read the data into the buffer and reload and start
-+		 * queue with new data if not finished.  If finished
-+		 * then setup the next transfer
-+		 */
-+		 read(drv_data);
-+
-+		 if (drv_data->rx == drv_data->rx_end) {
-+			/*
-+			 * Finished now - fall through and schedule next
-+			 * transfer tasklet
-+			 */
-+			if (drv_data->flags & TRAN_STATE_WORD_ODD_NUM) {
-+				//*drv_data->qmr &= ~QMR_BITS;
-+				set_16bit_transfer_mode(drv_data);
-+			}
-+
-+			msg->state = next_transfer(drv_data);
-+			msg->actual_length += drv_data->len;
-+		 } else {
-+			/* not finished yet - keep going */
-+		 	write(drv_data);
-+		 	return IRQ_HANDLED;
-+		 }
-+#if !defined(SPI_DSPI)
-+	} else {
-+		if (irq_status & QIR_WCEF)
-+			drv_data->wce_cnt++;
-+
-+		if (irq_status & QIR_ABRT)
-+			drv_data->abrt_cnt++;
-+
-+		msg->state = ERROR_STATE;
-+	}
-+#endif
-+
-+	tasklet_schedule(&drv_data->pump_transfers);
-+
-+	return IRQ_HANDLED;
-+}
-+
-+/* caller already set message->status; dma and pio irqs are blocked */
-+static void giveback(struct driver_data *drv_data)
-+{
-+	struct spi_transfer* last_transfer;
-+	unsigned long flags;
-+	struct spi_message *msg;
-+
-+	spin_lock_irqsave(&drv_data->lock, flags);
-+	msg = drv_data->cur_msg;
-+	drv_data->cur_msg = NULL;
-+	drv_data->cur_transfer = NULL;
-+	drv_data->cur_chip = NULL;
-+	queue_work(drv_data->workqueue, &drv_data->pump_messages);
-+	spin_unlock_irqrestore(&drv_data->lock, flags);
-+
-+	last_transfer = list_entry(msg->transfers.prev,
-+					struct spi_transfer,
-+					transfer_list);
-+
-+	if (!last_transfer->cs_change)
-+		drv_data->cs_control(drv_data->cs, QSPI_CS_DROP);
-+
-+	msg->state = NULL;
-+	if (msg->complete)
-+		msg->complete(msg->context);
-+}
-+
-+
-+static void pump_transfers(unsigned long data)
-+{
-+	struct driver_data *drv_data = (struct driver_data *)data;
-+	struct spi_message *message = NULL;
-+	struct spi_transfer *transfer = NULL;
-+	struct spi_transfer *previous = NULL;
-+	struct chip_data *chip = NULL;
-+	unsigned long flags;
-+
-+	/* Get current state information */
-+	message = drv_data->cur_msg;
-+	transfer = drv_data->cur_transfer;
-+	chip = drv_data->cur_chip;
-+
-+	/* Handle for abort */
-+	if (message->state == ERROR_STATE) {
-+		message->status = -EIO;
-+		giveback(drv_data);
-+		return;
-+	}
-+
-+	/* Handle end of message */
-+	if (message->state == DONE_STATE) {
-+		message->status = 0;
-+		giveback(drv_data);
-+		return;
-+	}
-+
-+	if (message->state == START_STATE) {
-+		qspi_setup_chip(drv_data);
-+
-+		if (drv_data->cs_control) {
-+			//printk( "m s\n" );
-+        		drv_data->cs_control(message->spi->chip_select, QSPI_CS_ASSERT);
-+		}
-+	}
-+
-+	/* Delay if requested at end of transfer*/
-+	if (message->state == RUNNING_STATE) {
-+		previous = list_entry(transfer->transfer_list.prev,
-+					struct spi_transfer,
-+					transfer_list);
-+
-+		if (drv_data->cs_control && transfer->cs_change)
-+			drv_data->cs_control(message->spi->chip_select, QSPI_CS_DROP);
-+
-+		if (previous->delay_usecs)
-+			udelay(previous->delay_usecs);
-+
-+		if (drv_data->cs_control && transfer->cs_change)
-+			drv_data->cs_control(message->spi->chip_select, QSPI_CS_ASSERT);
-+	}
-+
-+	drv_data->flags = 0;
-+	drv_data->tx = (void *)transfer->tx_buf;
-+	drv_data->tx_end = drv_data->tx + transfer->len;
-+	drv_data->rx = transfer->rx_buf;
-+	drv_data->rx_end = drv_data->rx + transfer->len;
-+	drv_data->len = transfer->len;
-+	if (!drv_data->rx)
-+		drv_data->flags |= TRAN_STATE_RX_VOID;
-+	if (!drv_data->tx)
-+		drv_data->flags |= TRAN_STATE_TX_VOID;
-+	drv_data->cs = message->spi->chip_select;
-+	drv_data->cs_change = transfer->cs_change;
-+	drv_data->void_write_data = chip->void_write_data;
-+
-+	message->state = RUNNING_STATE;
-+
-+	/* Go baby, go */
-+	local_irq_save(flags);
-+	write(drv_data);
-+	local_irq_restore(flags);
-+}
-+
-+
-+static void pump_messages(struct work_struct * work)
-+{
-+	struct driver_data *drv_data;
-+	unsigned long flags;
-+
-+	drv_data = container_of(work,  struct driver_data, pump_messages);
-+
-+	/* Lock queue and check for queue work */
-+	spin_lock_irqsave(&drv_data->lock, flags);
-+	if (list_empty(&drv_data->queue) || drv_data->run == QUEUE_STOPPED) {
-+		drv_data->busy = 0;
-+		spin_unlock_irqrestore(&drv_data->lock, flags);
-+		return;
-+	}
-+
-+	/* Make sure we are not already running a message */
-+	if (drv_data->cur_msg) {
-+		spin_unlock_irqrestore(&drv_data->lock, flags);
-+		return;
-+	}
-+
-+	/* Extract head of queue */
-+	drv_data->cur_msg = list_entry(drv_data->queue.next,
-+					struct spi_message, queue);
-+	list_del_init(&drv_data->cur_msg->queue);
-+
-+	/* Initial message state*/
-+	drv_data->cur_msg->state = START_STATE;
-+	drv_data->cur_transfer = list_entry(drv_data->cur_msg->transfers.next,
-+						struct spi_transfer,
-+						transfer_list);
-+
-+	/* Setup the SPI Registers using the per chip configuration */
-+	drv_data->cur_chip = spi_get_ctldata(drv_data->cur_msg->spi);
-+
-+	/* Mark as busy and launch transfers */
-+	tasklet_schedule(&drv_data->pump_transfers);
-+
-+	drv_data->busy = 1;
-+	spin_unlock_irqrestore(&drv_data->lock, flags);
-+}
-+
-+/****************************************************************************/
-+
-+/*
-+ * SPI master implementation
-+ */
-+
-+static int transfer(struct spi_device *spi, struct spi_message *msg)
-+{
-+	struct driver_data *drv_data = spi_master_get_devdata(spi->master);
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&drv_data->lock, flags);
-+
-+	if (drv_data->run == QUEUE_STOPPED) {
-+		spin_unlock_irqrestore(&drv_data->lock, flags);
-+		return -ESHUTDOWN;
-+	}
-+
-+	msg->actual_length = 0;
-+	msg->status = -EINPROGRESS;
-+	msg->state = START_STATE;
-+
-+	list_add_tail(&msg->queue, &drv_data->queue);
-+
-+	if (drv_data->run == QUEUE_RUNNING && !drv_data->busy)
-+		queue_work(drv_data->workqueue, &drv_data->pump_messages);
-+
-+	spin_unlock_irqrestore(&drv_data->lock, flags);
-+
-+	return 0;
-+}
-+
-+
-+static int setup(struct spi_device *spi)
-+{
-+	struct coldfire_spi_chip *chip_info;
-+	struct chip_data *chip;
-+#ifndef SPI_DSPI
-+	u32 baud_divisor = 255;
-+#endif
-+
-+	chip_info = (struct coldfire_spi_chip *)spi->controller_data;
-+
-+	/* Only alloc on first setup */
-+	chip = spi_get_ctldata(spi);
-+	if (chip == NULL) {
-+ 		chip = kcalloc(1, sizeof(struct chip_data), GFP_KERNEL);
-+		if (!chip)
-+			return -ENOMEM;
-+		spi->mode = chip_info->mode;
-+		spi->bits_per_word = chip_info->bits_per_word;
-+	}
-+
-+#if defined(SPI_DSPI)
-+	chip->mcr.master = 1;
-+	chip->mcr.cont_scke = 0;
-+	chip->mcr.dconf = 0;
-+	chip->mcr.frz = 0;
-+	chip->mcr.mtfe = 1;
-+	chip->mcr.pcsse = 0;
-+	chip->mcr.rooe = 0;
-+	chip->mcr.pcsis = 0xFF;
-+	chip->mcr.reserved15 = 0;
-+	chip->mcr.mdis = 0;
-+	chip->mcr.dis_tx = 0;
-+	chip->mcr.dis_rxf = 0;
-+	chip->mcr.clr_tx = 1;
-+	chip->mcr.clr_rxf = 1;
-+	chip->mcr.smpl_pt = 0;
-+	chip->mcr.reserved71 = 0;
-+	chip->mcr.halt = 0;
-+
-+	if ((spi->bits_per_word >= 4) && (spi->bits_per_word <= 16)) {
-+		chip->ctar.fmsz = spi->bits_per_word-1;
-+	} else {
-+		printk(KERN_ERR "coldfire-qspi: invalid wordsize\n");
-+		kfree(chip);
-+		return -ENODEV;
-+	}
-+
-+	if (spi->mode & SPI_CPHA)
-+		chip->ctar.cpha = 1;
-+	else
-+		chip->ctar.cpha = 0;
-+
-+	if (spi->mode & SPI_CPOL)
-+		chip->ctar.cpol = 1;
-+	else
-+		chip->ctar.cpol = 0;
-+
-+	if (spi->mode & SPI_LSB_FIRST)
-+		chip->ctar.lsbfe = 1;
-+	else
-+		chip->ctar.lsbfe = 0;
-+
-+	/* This values are default for audio device */
-+	chip->ctar.dbr = 0;
-+	chip->ctar.pbr = 2;
-+	chip->ctar.br = 8;
-+
-+	/* This values are default for audio device */
-+	chip->ctar.pcssck = 1;
-+	chip->ctar.pasc = 1;
-+	chip->ctar.pdt = 1;
-+	chip->ctar.cssck = 0;
-+	chip->ctar.asc = 1;
-+	chip->ctar.dt = 1;
-+
-+	chip->void_write_data = chip_info->void_write_data;
-+
-+#else
-+
-+	chip->qwr.csiv = 1;    // Chip selects are active low
-+	chip->qmr.master = 1;  // Must set to master mode
-+	chip->qmr.dohie = 1;   // Data output high impediance enabled
-+	chip->void_write_data = chip_info->void_write_data;
-+
-+	chip->qdlyr.qcd = chip_info->del_cs_to_clk;
-+	chip->qdlyr.dtl = chip_info->del_after_trans;
-+
-+	if (spi->max_speed_hz != 0)
-+		baud_divisor = (MCF_CLK/(2*spi->max_speed_hz));
-+
-+	if (baud_divisor < 2)
-+		baud_divisor = 2;
-+
-+	if (baud_divisor > 255)
-+		baud_divisor = 255;
-+
-+	chip->qmr.baud = baud_divisor;
-+
-+	//printk( "QSPI: spi->max_speed_hz %d\n", spi->max_speed_hz );
-+	//printk( "QSPI: Baud set to %d\n", chip->qmr.baud );
-+
-+	if (spi->mode & SPI_CPHA)
-+		chip->qmr.cpha = 1;
-+
-+	if (spi->mode & SPI_CPOL)
-+		chip->qmr.cpol = 1;
-+
-+	if (spi->bits_per_word == 16) {
-+		chip->qmr.bits = 0;
-+	} else if ((spi->bits_per_word >= 8) && (spi->bits_per_word <= 15)) {
-+		chip->qmr.bits = spi->bits_per_word;
-+	} else {
-+		printk(KERN_ERR "coldfire-qspi: invalid wordsize\n");
-+		kfree(chip);
-+		return -ENODEV;
-+	}
-+
-+#endif
-+
-+ 	spi_set_ctldata(spi, chip);
-+
-+ 	return 0;
-+}
-+
-+static int init_queue(struct driver_data *drv_data)
-+{
-+	INIT_LIST_HEAD(&drv_data->queue);
-+	spin_lock_init(&drv_data->lock);
-+
-+	drv_data->run = QUEUE_STOPPED;
-+	drv_data->busy = 0;
-+
-+	tasklet_init(&drv_data->pump_transfers,
-+			pump_transfers,	(unsigned long)drv_data);
-+
-+	INIT_WORK(&drv_data->pump_messages, pump_messages/*, drv_data*/);
-+
-+	drv_data->workqueue = create_singlethread_workqueue(
-+					drv_data->master->cdev.dev->bus_id);
-+	if (drv_data->workqueue == NULL)
-+		return -EBUSY;
-+
-+	return 0;
-+}
-+
-+static int start_queue(struct driver_data *drv_data)
-+{
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&drv_data->lock, flags);
-+
-+	if (drv_data->run == QUEUE_RUNNING || drv_data->busy) {
-+		spin_unlock_irqrestore(&drv_data->lock, flags);
-+		return -EBUSY;
-+	}
-+
-+	drv_data->run = QUEUE_RUNNING;
-+	drv_data->cur_msg = NULL;
-+	drv_data->cur_transfer = NULL;
-+	drv_data->cur_chip = NULL;
-+	spin_unlock_irqrestore(&drv_data->lock, flags);
-+
-+	queue_work(drv_data->workqueue, &drv_data->pump_messages);
-+
-+	return 0;
-+}
-+
-+static int stop_queue(struct driver_data *drv_data)
-+{
-+	unsigned long flags;
-+	unsigned limit = 500;
-+	int status = 0;
-+
-+	spin_lock_irqsave(&drv_data->lock, flags);
-+
-+	/* This is a bit lame, but is optimized for the common execution path.
-+	 * A wait_queue on the drv_data->busy could be used, but then the common
-+	 * execution path (pump_messages) would be required to call wake_up or
-+	 * friends on every SPI message. Do this instead */
-+	drv_data->run = QUEUE_STOPPED;
-+	while (!list_empty(&drv_data->queue) && drv_data->busy && limit--) {
-+		spin_unlock_irqrestore(&drv_data->lock, flags);
-+		msleep(10);
-+		spin_lock_irqsave(&drv_data->lock, flags);
-+	}
-+
-+	if (!list_empty(&drv_data->queue) || drv_data->busy)
-+		status = -EBUSY;
-+
-+	spin_unlock_irqrestore(&drv_data->lock, flags);
-+
-+	return status;
-+}
-+
-+static int destroy_queue(struct driver_data *drv_data)
-+{
-+	int status;
-+
-+	status = stop_queue(drv_data);
-+	if (status != 0)
-+		return status;
-+
-+	destroy_workqueue(drv_data->workqueue);
-+
-+	return 0;
-+}
-+
-+
-+static void cleanup(const struct spi_device *spi)
-+{
-+	struct chip_data *chip = spi_get_ctldata((struct spi_device *)spi);
-+
-+ 	dev_dbg(&spi->dev, "spi_device %u.%u cleanup\n",
-+ 		spi->master->bus_num, spi->chip_select);
-+
-+	kfree(chip);
-+}
-+
-+
-+/****************************************************************************/
-+
-+/*
-+ * Generic Device driver routines and interface implementation
-+ */
-+
-+static int coldfire_spi_probe(struct platform_device *pdev)
-+{
-+ 	struct device *dev = &pdev->dev;
-+ 	struct coldfire_spi_master *platform_info;
-+ 	struct spi_master *master;
-+ 	struct driver_data *drv_data = 0;
-+ 	struct resource *memory_resource;
-+	int irq;
-+	int status = 0;
-+	int i;
-+
-+#if defined(SPI_DSPI_EDMA)
-+	init_edma();
-+#endif
-+
-+ 	platform_info = (struct coldfire_spi_master *)pdev->dev.platform_data;
-+
-+  	master = spi_alloc_master(dev, sizeof(struct driver_data));
-+  	if (!master)
-+ 		return -ENOMEM;
-+
-+ 	drv_data = class_get_devdata(&master->cdev);
-+ 	drv_data->master = master;
-+
-+	INIT_LIST_HEAD(&drv_data->queue);
-+	spin_lock_init(&drv_data->lock);
-+
-+	master->bus_num = platform_info->bus_num;
-+	master->num_chipselect = platform_info->num_chipselect;
-+	master->cleanup = cleanup;
-+	master->setup = setup;
-+	master->transfer = transfer;
-+
-+ 	drv_data->cs_control = platform_info->cs_control;
-+ 	if (drv_data->cs_control)
-+ 		for(i = 0; i < master->num_chipselect; i++)
-+ 			drv_data->cs_control(i, QSPI_CS_INIT | QSPI_CS_DROP);
-+
-+	/* Setup register addresses */
-+ 	memory_resource = platform_get_resource_byname(pdev, IORESOURCE_MEM, "qspi-module");
-+ 	if (!memory_resource) {
-+ 		dev_dbg(dev, "can not find platform module memory\n");
-+ 		goto out_error_master_alloc;
-+ 	}
-+
-+#if defined(SPI_DSPI_EDMA)
-+ 	drv_data->edma_tx_buf = kmalloc(EDMA_BUFSIZE_KMALLOC, GFP_DMA);
-+ 	if (!drv_data->edma_tx_buf) {
-+	 	dev_dbg(dev, "cannot allocate eDMA TX memory\n");
-+	 	goto out_error_master_alloc;
-+ 	}
-+ 	drv_data->edma_rx_buf = kmalloc(EDMA_BUFSIZE_KMALLOC, GFP_DMA);
-+ 	if (!drv_data->edma_rx_buf) {
-+	 	kfree(drv_data->edma_tx_buf);
-+	 	dev_dbg(dev, "cannot allocate eDMA RX memory\n");
-+	 	goto out_error_master_alloc;
-+ 	}
-+#endif 	
-+ 	
-+#if defined(SPI_DSPI)
-+
-+	drv_data->mcr 		= (void *)(memory_resource->start + 0x00000000);
-+	drv_data->ctar 		= (void *)(memory_resource->start + 0x0000000C);
-+	drv_data->dspi_sr 	= (void *)(memory_resource->start + 0x0000002C);
-+	drv_data->dspi_rser = (void *)(memory_resource->start + 0x00000030);
-+	drv_data->dspi_dtfr = (void *)(memory_resource->start + 0x00000034);
-+	drv_data->dspi_drfr = (void *)(memory_resource->start + 0x00000038);
-+
-+#else
-+
-+ 	drv_data->qmr   = (void *)(memory_resource->start + 0x00000000);
-+ 	drv_data->qdlyr = (void *)(memory_resource->start + 0x00000004);
-+ 	drv_data->qwr   = (void *)(memory_resource->start + 0x00000008);
-+ 	drv_data->qir   = (void *)(memory_resource->start + 0x0000000c);
-+ 	drv_data->qar   = (void *)(memory_resource->start + 0x00000010);
-+ 	drv_data->qdr   = (void *)(memory_resource->start + 0x00000014);
-+ 	drv_data->qcr   = (void *)(memory_resource->start + 0x00000014);
-+
-+#endif
-+
-+	/* Setup register addresses */
-+ 	memory_resource = platform_get_resource_byname(pdev, IORESOURCE_MEM, "qspi-par");
-+ 	if (!memory_resource) {
-+ 		dev_dbg(dev, "can not find platform par memory\n");
-+ 		goto out_error_master_alloc;
-+ 	}
-+
-+ 	drv_data->par = (void *)memory_resource->start;
-+
-+	/* Setup register addresses */
-+ 	memory_resource = platform_get_resource_byname(pdev, IORESOURCE_MEM, "qspi-int-level");
-+ 	if (!memory_resource) {
-+ 		dev_dbg(dev, "can not find platform par memory\n");
-+ 		goto out_error_master_alloc;
-+ 	}
-+
-+ 	drv_data->int_icr = (void *)memory_resource->start;
-+
-+	/* Setup register addresses */
-+ 	memory_resource = platform_get_resource_byname(pdev, IORESOURCE_MEM, "qspi-int-mask");
-+ 	if (!memory_resource) {
-+ 		dev_dbg(dev, "can not find platform par memory\n");
-+ 		goto out_error_master_alloc;
-+ 	}
-+
-+ 	drv_data->int_mr = (void *)memory_resource->start;
-+
-+	irq = platform_info->irq_vector;
-+
-+	status = request_irq(platform_info->irq_vector, qspi_interrupt, SA_INTERRUPT, dev->bus_id, drv_data);
-+	if (status < 0) {
-+		dev_err(&pdev->dev, "unable to attach ColdFire QSPI interrupt\n");
-+		goto out_error_master_alloc;
-+	}
-+
-+	/* Now that we have all the addresses etc.  Let's set it up */
-+	// TODO:
-+	//*drv_data->par = platform_info->par_val;
-+
-+	MCF_GPIO_PAR_DSPI = 0
-+		| MCF_GPIO_PAR_DSPI_PCS5_PCS5
-+		| MCF_GPIO_PAR_DSPI_PCS2_PCS2
-+		| MCF_GPIO_PAR_DSPI_PCS1_PCS1
-+		| MCF_GPIO_PAR_DSPI_PCS0_PCS0
-+		| MCF_GPIO_PAR_DSPI_SIN_SIN
-+		| MCF_GPIO_PAR_DSPI_SOUT_SOUT
-+		| MCF_GPIO_PAR_DSPI_SCK_SCK;
-+
-+	*drv_data->int_icr = platform_info->irq_lp;
-+	*drv_data->int_mr &= ~platform_info->irq_mask;
-+
-+#ifdef SPI_DSPI
-+	drv_data->dspi_ctas = 0; // TODO: change later
-+#endif
-+
-+	/* Initial and start queue */
-+	status = init_queue(drv_data);
-+	if (status != 0) {
-+		dev_err(&pdev->dev, "problem initializing queue\n");
-+		goto out_error_irq_alloc;
-+	}
-+	status = start_queue(drv_data);
-+	if (status != 0) {
-+		dev_err(&pdev->dev, "problem starting queue\n");
-+		goto out_error_irq_alloc;
-+	}
-+
-+	/* Register with the SPI framework */
-+	platform_set_drvdata(pdev, drv_data);
-+	status = spi_register_master(master);
-+	if (status != 0) {
-+		dev_err(&pdev->dev, "problem registering spi master\n");
-+		status = -EINVAL;
-+                goto out_error_queue_alloc;
-+	}
-+
-+#if defined(SPI_DSPI_EDMA)
-+	if (request_edma_channel(DSPI_DMA_TX_TCD,
-+							edma_tx_handler,
-+							NULL,
-+							pdev,
-+							NULL, /* spinlock */
-+							DRIVER_NAME
-+							)!=0)
-+	{
-+		dev_err(&pdev->dev, "problem requesting edma transmit channel\n");
-+		status = -EINVAL;
-+        goto out_error_queue_alloc;
-+	}
-+
-+	if (request_edma_channel(DSPI_DMA_RX_TCD,
-+							edma_rx_handler,
-+							NULL,
-+							pdev,
-+							NULL, /* spinlock */
-+							DRIVER_NAME
-+							)!=0)
-+	{
-+		dev_err(&pdev->dev, "problem requesting edma receive channel\n");
-+		status = -EINVAL;
-+        goto out_edma_transmit;
-+	}
-+#endif
-+
-+	printk( "SPI: Coldfire master initialized\n" );
-+	//dev_info(&pdev->dev, "driver initialized\n");
-+	return status;
-+
-+#if defined(SPI_DSPI_EDMA)
-+out_edma_transmit:
-+	free_edma_channel(DSPI_DMA_TX_TCD, pdev);
-+#endif
-+
-+out_error_queue_alloc:
-+	destroy_queue(drv_data);
-+
-+out_error_irq_alloc:
-+	free_irq(irq, drv_data);
-+
-+out_error_master_alloc:
-+	spi_master_put(master);
-+	return status;
-+
-+}
-+
-+static int coldfire_spi_remove(struct platform_device *pdev)
-+{
-+	struct driver_data *drv_data = platform_get_drvdata(pdev);
-+	int irq;
-+	int status = 0;
-+
-+	if (!drv_data)
-+		return 0;
-+
-+#if defined(SPI_DSPI_EDMA)
-+	free_edma_channel(DSPI_DMA_TX_TCD, pdev);
-+	free_edma_channel(DSPI_DMA_RX_TCD, pdev);
-+#endif	
-+
-+	/* Remove the queue */
-+	status = destroy_queue(drv_data);
-+	if (status != 0)
-+		return status;
-+
-+	/* Disable the SSP at the peripheral and SOC level */
-+	/*write_SSCR0(0, drv_data->ioaddr);
-+	pxa_set_cken(drv_data->master_info->clock_enable, 0);*/
-+
-+	/* Release DMA */
-+	/*if (drv_data->master_info->enable_dma) {
-+		if (drv_data->ioaddr == SSP1_VIRT) {
-+			DRCMRRXSSDR = 0;
-+			DRCMRTXSSDR = 0;
-+		} else if (drv_data->ioaddr == SSP2_VIRT) {
-+			DRCMRRXSS2DR = 0;
-+			DRCMRTXSS2DR = 0;
-+		} else if (drv_data->ioaddr == SSP3_VIRT) {
-+			DRCMRRXSS3DR = 0;
-+			DRCMRTXSS3DR = 0;
-+		}
-+		pxa_free_dma(drv_data->tx_channel);
-+		pxa_free_dma(drv_data->rx_channel);
-+	}*/
-+
-+	/* Release IRQ */
-+	irq = platform_get_irq(pdev, 0);
-+	if (irq >= 0)
-+		free_irq(irq, drv_data);
-+
-+	/* Disconnect from the SPI framework */
-+	spi_unregister_master(drv_data->master);
-+
-+	/* Prevent double remove */
-+	platform_set_drvdata(pdev, NULL);
-+
-+	return 0;
-+}
-+
-+static void coldfire_spi_shutdown(struct platform_device *pdev)
-+{
-+	int status = 0;
-+
-+	if ((status = coldfire_spi_remove(pdev)) != 0)
-+		dev_err(&pdev->dev, "shutdown failed with %d\n", status);
-+}
-+
-+
-+#ifdef CONFIG_PM
-+static int suspend_devices(struct device *dev, void *pm_message)
-+{
-+	pm_message_t *state = pm_message;
-+
-+	if (dev->power.power_state.event != state->event) {
-+		dev_warn(dev, "pm state does not match request\n");
-+		return -1;
-+	}
-+
-+	return 0;
-+}
-+
-+static int coldfire_spi_suspend(struct platform_device *pdev, pm_message_t state)
-+{
-+	struct driver_data *drv_data = platform_get_drvdata(pdev);
-+	int status = 0;
-+
-+	/* Check all childern for current power state */
-+	if (device_for_each_child(&pdev->dev, &state, suspend_devices) != 0) {
-+		dev_warn(&pdev->dev, "suspend aborted\n");
-+		return -1;
-+	}
-+
-+	status = stop_queue(drv_data);
-+	if (status != 0)
-+		return status;
-+	/*write_SSCR0(0, drv_data->ioaddr);
-+	pxa_set_cken(drv_data->master_info->clock_enable, 0);*/
-+
-+	return 0;
-+}
-+
-+static int coldfire_spi_resume(struct platform_device *pdev)
-+{
-+	struct driver_data *drv_data = platform_get_drvdata(pdev);
-+	int status = 0;
-+
-+	/* Enable the SSP clock */
-+	/*pxa_set_cken(drv_data->master_info->clock_enable, 1);*/
-+
-+	/* Start the queue running */
-+	status = start_queue(drv_data);
-+	if (status != 0) {
-+		dev_err(&pdev->dev, "problem starting queue (%d)\n", status);
-+		return status;
-+	}
-+
-+	return 0;
-+}
-+#else
-+#define coldfire_spi_suspend NULL
-+#define coldfire_spi_resume NULL
-+#endif /* CONFIG_PM */
-+
-+static struct platform_driver driver = {
-+	.driver = {
-+		.name = "spi_coldfire",
-+		.bus = &platform_bus_type,
-+		.owner = THIS_MODULE,
-+	},
-+	.probe = coldfire_spi_probe,
-+	.remove = __devexit_p(coldfire_spi_remove),
-+	.shutdown = coldfire_spi_shutdown,
-+	.suspend = coldfire_spi_suspend,
-+	.resume = coldfire_spi_resume,
-+};
-+
-+static int __init coldfire_spi_init(void)
-+{
-+	platform_driver_register(&driver);
-+
-+	return 0;
-+}
-+module_init(coldfire_spi_init);
-+
-+static void __exit coldfire_spi_exit(void)
-+{
-+	platform_driver_unregister(&driver);
-+}
-+module_exit(coldfire_spi_exit);
---- /dev/null
-+++ b/drivers/spi/ssi_audio.c
-@@ -0,0 +1,906 @@
-+/*
-+ * MCF5445x audio driver.
-+ *
-+ * Yaroslav Vinogradov yaroslav.vinogradov@freescale.com
-+ * Copyright Freescale Semiconductor, Inc. 2006
-+ *
-+ * 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/device.h>
-+#include <linux/init.h>
-+#include <linux/delay.h>
-+#include <linux/spi/spi.h>
-+#include <linux/fs.h>
-+#include <linux/kernel.h>
-+#include <linux/major.h>
-+#include <asm/mcfsim.h>
-+#include <linux/interrupt.h>
-+#include <linux/soundcard.h>
-+#include <asm/uaccess.h>
-+#include <asm/virtconvert.h>
-+
-+#include <asm/coldfire.h>
-+#include <asm/coldfire_edma.h>
-+#include <asm/mcf5445x_ssi.h>
-+#include <asm/mcf5445x_ccm.h>
-+#include <asm/mcf5445x_gpio.h>
-+
-+#define SOUND_DEVICE_NAME "sound"
-+#define DRIVER_NAME "ssi_audio"
-+
-+
-+/* #define AUDIO_DEBUG */
-+
-+#ifdef CONFIG_MMU
-+#define USE_MMU
-+#endif
-+
-+#define MAX_SPEED_HZ 12000000
-+
-+#define M5445x_AUDIO_IRQ_SOURCE 49
-+#define M5445x_AUDIO_IRQ_VECTOR (128+M5445x_AUDIO_IRQ_SOURCE)
-+#define M5445x_AUDIO_IRQ_LEVEL	5
-+
-+/* TLV320DAC23 audio chip registers */
-+
-+#define CODEC_LEFT_IN_REG			(0x00)
-+#define CODEC_RIGHT_IN_REG			(0x01)
-+#define CODEC_LEFT_HP_VOL_REG		(0x02)
-+#define CODEC_RIGHT_HP_VOL_REG		(0x03)
-+#define CODEC_ANALOG_APATH_REG		(0x04)
-+#define CODEC_DIGITAL_APATH_REG		(0x05)
-+#define CODEC_POWER_DOWN_REG		(0x06)
-+#define CODEC_DIGITAL_IF_FMT_REG	(0x07)
-+#define CODEC_SAMPLE_RATE_REG		(0x08)
-+#define CODEC_DIGITAL_IF_ACT_REG	(0x09)
-+#define CODEC_RESET_REG				(0x0f)
-+
-+#define CODEC_SAMPLE_8KHZ		(0x0C)
-+#define CODEC_SAMPLE_16KHZ		(0x58)
-+#define CODEC_SAMPLE_22KHZ		(0x62)
-+#define CODEC_SAMPLE_32KHZ		(0x18)
-+#define CODEC_SAMPLE_44KHZ		(0x22)
-+#define CODEC_SAMPLE_48KHZ		(0x00)
-+
-+/* Audio buffer data size */
-+#define	BUFSIZE		(64*1024)
-+/* DMA transfer size */
-+#define DMASIZE		(16*1024)
-+
-+/* transmit eDMA channel for SSI channel 0 */
-+#define DMA_TCD 	10
-+/* transmit eDMA channel for SSI channel 1 */
-+#define DMA_TCD2 	11
-+
-+struct ssi_audio {
-+	struct spi_device	*spi;
-+	u32 speed;
-+	u32 stereo;
-+	u32 bits;
-+	u32 format;
-+	u8  isopen;
-+	u8  dmaing;
-+	u8  ssi_enabled;
-+	u8  channel;
-+	spinlock_t lock;
-+	u8* audio_buf;
-+};
-+
-+static struct ssi_audio* audio_device = NULL;
-+volatile u32 audio_start;
-+volatile u32 audio_count;
-+volatile u32 audio_append;
-+volatile u32 audio_appstart;
-+volatile u32 audio_txbusy;
-+
-+struct ssi_audio_format {
-+	unsigned int	format;
-+	unsigned int	bits;
-+} ssi_audio_formattable[] = {
-+	{ AFMT_MU_LAW,		8 },
-+	{ AFMT_A_LAW,		8 },
-+	{ AFMT_IMA_ADPCM,	8 },
-+	{ AFMT_U8,		8 },
-+	{ AFMT_S16_LE,		16 },
-+	{ AFMT_S16_BE,		16 },
-+	{ AFMT_S8,		8 },
-+	{ AFMT_U16_LE,		16 },
-+	{ AFMT_U16_BE,		16 },
-+};
-+
-+#define	FORMATSIZE	(sizeof(ssi_audio_formattable) / sizeof(struct ssi_audio_format))
-+
-+static void ssi_audio_setsamplesize(int val)
-+{
-+	int	i;
-+
-+	if (audio_device == NULL) return;
-+
-+	for (i = 0; (i < FORMATSIZE); i++) {
-+		if (ssi_audio_formattable[i].format == val) {
-+			audio_device->format = ssi_audio_formattable[i].format;
-+			audio_device->bits = ssi_audio_formattable[i].bits;
-+			break;
-+		}
-+	}
-+
-+#ifdef AUDIO_DEBUG
-+	printk(DRIVER_NAME ":ssi_audio_setsamplesize %d %d\n", audio_device->format, audio_device->bits);
-+#endif
-+}
-+
-+static void ssi_audio_txdrain(void)
-+{
-+#ifdef AUDIO_DEBUG
-+	printk(DRIVER_NAME ":ssi_audio_txdrain()\n");
-+#endif
-+
-+	if (audio_device == NULL) return;
-+
-+	while (!signal_pending(current)) {
-+		if (audio_txbusy == 0)
-+			break;
-+		current->state = TASK_INTERRUPTIBLE;
-+		schedule_timeout(1);
-+	}
-+}
-+
-+#ifdef CONFIG_SSIAUDIO_USE_EDMA
-+/*
-+ *	Configure and start DMA engine.
-+ */
-+void __inline__ ssi_audio_dmarun(void)
-+{
-+	set_edma_params(DMA_TCD,
-+#ifdef USE_MMU
-+					virt_to_phys(&(audio_device->audio_buf[audio_start])),
-+#else
-+					(u32)&(audio_device->audio_buf[audio_start]),
-+#endif
-+					(u32)&MCF_SSI_TX0,
-+					MCF_EDMA_TCD_ATTR_SSIZE_32BIT | MCF_EDMA_TCD_ATTR_DSIZE_32BIT,
-+					8,
-+					4,
-+					0,
-+					audio_count/8,
-+					audio_count/8,
-+					0,
-+					0,
-+					0, // major_int
-+					0  // disable_req
-+					);
-+
-+	set_edma_params(DMA_TCD2,
-+#ifdef USE_MMU
-+					virt_to_phys(&(audio_device->audio_buf[audio_start+4])),
-+#else
-+					(u32)&(audio_device->audio_buf[audio_start+4]),
-+#endif
-+					(u32)&MCF_SSI_TX1,
-+					MCF_EDMA_TCD_ATTR_SSIZE_32BIT | MCF_EDMA_TCD_ATTR_DSIZE_32BIT,
-+					8,
-+					4,
-+					0,
-+					audio_count/8,
-+					audio_count/8,
-+					0,
-+					0,
-+					1, // major_int
-+                    0  // disable_req
-+					);
-+
-+	audio_device->dmaing = 1;
-+	audio_txbusy = 1;
-+
-+	start_edma_transfer(DMA_TCD);
-+	start_edma_transfer(DMA_TCD2);
-+#if 0
-+	MCF_EDMA_ERQ |= (1<<DMA_TCD) | (1<<DMA_TCD2);
-+	MCF_EDMA_SSRT = DMA_TCD;
-+	MCF_EDMA_SSRT = DMA_TCD2;
-+#endif
-+
-+}
-+
-+/*
-+ *	Start DMA'ing a new buffer of data if any available.
-+ */
-+static void ssi_audio_dmabuf(void)
-+{
-+#ifdef AUDIO_DEBUG
-+	printk(DRIVER_NAME ":ssi_audio_dmabuf(): append=%x start=%x\n", audio_append, audio_appstart);
-+#endif
-+
-+	/* If already running then nothing to do... */
-+	if (audio_device->dmaing)
-+		return;
-+
-+	/* Set DMA buffer size */
-+	audio_count = (audio_append >= audio_appstart) ?
-+		(audio_append - audio_appstart) :
-+		(BUFSIZE - audio_appstart);
-+	if (audio_count > DMASIZE)
-+		audio_count = DMASIZE;
-+
-+	/* Adjust pointers and counters accordingly */
-+	audio_appstart += audio_count;
-+	if (audio_appstart >= BUFSIZE)
-+		audio_appstart = 0;
-+
-+	if (audio_count > 0)
-+		ssi_audio_dmarun();
-+	else {
-+		audio_txbusy = 0;
-+#ifdef AUDIO_DEBUG
-+		printk(DRIVER_NAME ":DMA buffer is empty!\n");
-+#endif
-+	}
-+}
-+
-+void __inline__ stop_dma(void) {
-+	stop_edma_transfer(DMA_TCD);
-+	stop_edma_transfer(DMA_TCD2);
-+}
-+
-+static int ssi_audio_dma_handler_empty(int channel, void *dev_id)
-+{
-+	return IRQ_HANDLED;
-+}
-+
-+static int ssi_audio_dma_handler(int channel, void *dev_id)
-+{
-+#ifdef AUDIO_DEBUG
-+	printk(DRIVER_NAME ":ssi_audio_dma_handler(channel=%d)\n", channel);
-+#endif
-+
-+	/* Clear DMA interrupt */
-+	stop_dma();
-+
-+	audio_device->dmaing = 0;
-+
-+	/* Update data pointers and counts */
-+	audio_start += audio_count;
-+	if (audio_start >= BUFSIZE)
-+		audio_start = 0;
-+	audio_count = 0;
-+
-+	/* Start new DMA buffer if we can */
-+	ssi_audio_dmabuf();
-+
-+	return IRQ_HANDLED;
-+}
-+
-+static void init_dma(void)
-+{
-+	/* SSI DMA Signals mapped to DMA request */
-+	MCF_CCM_MISCCR &= ~MCF_CCM_MISCCR_TIMDMA;
-+	init_edma();
-+}
-+
-+#endif	/* CONFIG_SSIAUDIO_USE_EDMA */
-+
-+
-+/* Write CODEC register using SPI
-+ *   address - CODEC register address
-+ *   data - data to be written into register
-+ */
-+static int codec_write(u8 addr, u16 data)
-+{
-+	u16 spi_word;
-+
-+	if (audio_device==NULL || audio_device->spi==NULL)
-+		return -ENODEV;
-+
-+	spi_word = ((addr & 0x7F)<<9)|(data & 0x1FF);
-+	return spi_write(audio_device->spi, (const u8*)&spi_word, sizeof(spi_word));
-+}
-+
-+static inline void enable_ssi(void)
-+{
-+	if (audio_device==NULL || audio_device->ssi_enabled) return;
-+	audio_device->ssi_enabled = 1;
-+	MCF_SSI_CR |= MCF_SSI_CR_SSI_EN;  /* enable SSI module */
-+	MCF_SSI_CR |= MCF_SSI_CR_TE;  	  /* enable tranmitter */
-+}
-+
-+static inline void disable_ssi(void)
-+{
-+	if (audio_device==NULL || audio_device->ssi_enabled==0) return;
-+	MCF_SSI_CR &= ~MCF_SSI_CR_TE;  		/* disable transmitter */
-+	MCF_SSI_CR &= ~MCF_SSI_CR_SSI_EN;	/* disable SSI module  */
-+	audio_device->ssi_enabled = 0;
-+}
-+
-+/* Audio CODEC initialization */
-+/* TODO: also the SSI frequency/dividers must be adjusted */
-+static void adjust_codec_speed(void) {
-+#ifdef AUDIO_DEBUG
-+	printk(DRIVER_NAME ":adjust_codec_speed: %d\n", audio_device->speed);
-+#endif
-+
-+	if (audio_device->speed == 8000) {
-+		codec_write(CODEC_SAMPLE_RATE_REG,CODEC_SAMPLE_8KHZ);
-+	} else if (audio_device->speed == 16000) {
-+		codec_write(CODEC_SAMPLE_RATE_REG,CODEC_SAMPLE_16KHZ);
-+	} else if (audio_device->speed == 22000) {
-+		codec_write(CODEC_SAMPLE_RATE_REG,CODEC_SAMPLE_22KHZ);
-+	} else if (audio_device->speed == 44000 || audio_device->speed == 44100) {
-+		codec_write(CODEC_SAMPLE_RATE_REG,CODEC_SAMPLE_44KHZ);
-+	} else if (audio_device->speed == 48000) {
-+		codec_write(CODEC_SAMPLE_RATE_REG,CODEC_SAMPLE_48KHZ);
-+	} else {
-+		/* default 44KHz */
-+		codec_write(CODEC_SAMPLE_RATE_REG,CODEC_SAMPLE_44KHZ);
-+	}
-+}
-+
-+static void codec_reset(void)
-+{
-+	codec_write(CODEC_RESET_REG, 0); /* reset the audio chip */
-+	udelay(1500); /* wait for reset */
-+}
-+
-+static void init_audio_codec(void)
-+{
-+#ifdef AUDIO_DEBUG
-+	printk(DRIVER_NAME ":init_audio_codec()\n");
-+#endif
-+	codec_reset();
-+
-+	codec_write(CODEC_LEFT_IN_REG, 0x017);
-+	codec_write(CODEC_RIGHT_IN_REG, 0x017);
-+	codec_write(CODEC_POWER_DOWN_REG, 0x000); /* Turn off line input */
-+	codec_write(CODEC_DIGITAL_IF_FMT_REG, 0x00A); /* I2S slave mode */
-+	/* codec_write(CODEC_DIGITAL_IF_FMT_REG, 0x042); // I2S master mode */
-+	codec_write(CODEC_DIGITAL_APATH_REG, 0x007); /* Set A path */
-+
-+	/* set sample rate */
-+    adjust_codec_speed();
-+
-+	codec_write(CODEC_LEFT_HP_VOL_REG, 0x075); /* set volume */
-+	codec_write(CODEC_RIGHT_HP_VOL_REG, 0x075); /* set volume */
-+	codec_write(CODEC_DIGITAL_IF_ACT_REG, 1); /* Activate digital interface */
-+	codec_write(CODEC_ANALOG_APATH_REG, 0x0F2);
-+}
-+
-+
-+static void chip_init(void)
-+{
-+#ifdef CONFIG_SSIAUDIO_USE_EDMA
-+	init_dma();
-+#endif
-+
-+	/* Enable the SSI pins */
-+	MCF_GPIO_PAR_SSI = ( 0
-+							| MCF_GPIO_PAR_SSI_MCLK
-+							| MCF_GPIO_PAR_SSI_STXD(3)
-+							| MCF_GPIO_PAR_SSI_SRXD(3)
-+							| MCF_GPIO_PAR_SSI_FS(3)
-+							| MCF_GPIO_PAR_SSI_BCLK(3) );
-+
-+}
-+
-+static void init_ssi(void)
-+{
-+#ifdef AUDIO_DEBUG
-+	printk(DRIVER_NAME ":init_ssi()\n");
-+#endif
-+
-+	/* Dividers are for MCF54445 on 266Mhz, the output is 44.1Khz*/
-+	/* Enable SSI clock in CCM */
-+	MCF_CCM_CDR = MCF_CCM_CDR_SSIDIV(47);
-+
-+	/* Issue a SSI reset */
-+	MCF_SSI_CR &= ~MCF_SSI_CR_SSI_EN;  /* disable SSI module */
-+
-+	/* SSI module uses internal CPU clock */
-+	MCF_CCM_MISCCR |= MCF_CCM_MISCCR_SSISRC;
-+
-+	MCF_CCM_MISCCR |= MCF_CCM_MISCCR_SSIPUE;
-+	MCF_CCM_MISCCR |= MCF_CCM_MISCCR_SSIPUS_UP;
-+
-+	MCF_SSI_CR = 0
-+			| MCF_SSI_CR_CIS
-+			| MCF_SSI_CR_TCH    /* Enable two channel mode */
-+			| MCF_SSI_CR_MCE    /* Set clock out on SSI_MCLK pin */
-+			| MCF_SSI_CR_I2S_MASTER    /* Set I2S master mode */
-+			| MCF_SSI_CR_SYN      /* Enable synchronous mode */
-+			| MCF_SSI_CR_NET
-+			;
-+
-+	MCF_SSI_TCR = 0
-+			| MCF_SSI_TCR_TXDIR  /* internally generated bit clock */
-+			| MCF_SSI_TCR_TFDIR  /* internally generated frame sync */
-+			| MCF_SSI_TCR_TSCKP  /* Clock data on falling edge of bit clock */
-+			| MCF_SSI_TCR_TFSI   /* Frame sync active low */
-+			| MCF_SSI_TCR_TEFS   /* TX frame sync 1 bit before data */
-+			| MCF_SSI_TCR_TFEN0  /* TX FIFO 0 enabled */
-+			| MCF_SSI_TCR_TFEN1  /* TX FIFO 1 enabled */
-+			| MCF_SSI_TCR_TXBIT0
-+			;
-+
-+	MCF_SSI_CCR = MCF_SSI_CCR_WL(7)  /* 16 bit word length */
-+			| MCF_SSI_CCR_DC(1)  	 /* Frame rate divider */
-+			| MCF_SSI_CCR_PM(0)
-+			| MCF_SSI_CCR_DIV2
-+			;
-+
-+	MCF_SSI_FCSR = 0
-+			| MCF_SSI_FCSR_TFWM0(0)
-+			| MCF_SSI_FCSR_TFWM1(0)
-+			;
-+
-+	MCF_SSI_IER =   0 // interrupts
-+#ifndef CONFIG_SSIAUDIO_USE_EDMA
-+				| MCF_SSI_IER_TIE   /* transmit interrupts */
-+				| MCF_SSI_IER_TFE0  /* transmit FIFO 0 empty */
-+				| MCF_SSI_IER_TFE1  /* transmit FIFO 1 empty */
-+#else
-+				| MCF_SSI_IER_TDMAE /* DMA request enabled */
-+				| MCF_SSI_IER_TFE0  /* transmit FIFO 0 empty */
-+				| MCF_SSI_IER_TFE1  /* transmit FIFO 1 empty */
-+#endif
-+				;
-+
-+#ifndef CONFIG_SSIAUDIO_USE_EDMA
-+	/* enable IRQ:  SSI interrupt */
-+	MCF_INTC1_ICR(M5445x_AUDIO_IRQ_SOURCE) = M5445x_AUDIO_IRQ_LEVEL;
-+	MCF_INTC1_CIMR = M5445x_AUDIO_IRQ_SOURCE;
-+#endif
-+}
-+
-+#ifndef CONFIG_SSIAUDIO_USE_EDMA
-+/* interrupt for SSI */
-+static int ssi_audio_isr(int irq, void *dev_id)
-+{
-+	unsigned long	*bp;
-+
-+	if (audio_txbusy==0) {
-+		return IRQ_HANDLED;
-+	}
-+
-+	spin_lock(&(audio_device->lock));
-+
-+	if (audio_start == audio_append) {
-+		disable_ssi();
-+		audio_txbusy = 0;
-+	} else {
-+		if (MCF_SSI_ISR & (MCF_SSI_ISR_TFE0|MCF_SSI_ISR_TFE1)) {
-+			bp = (unsigned long *) &audio_device->audio_buf[audio_start];
-+			if (audio_device->channel) {
-+				MCF_SSI_TX1 = *bp;
-+				audio_device->channel = 0;
-+			} else {
-+				MCF_SSI_TX0 = *bp;
-+				audio_device->channel = 1;
-+			}
-+			audio_start += 4;
-+			if (audio_start >= BUFSIZE)
-+				audio_start = 0;
-+		}
-+	}
-+
-+	spin_unlock(&(audio_device->lock));
-+
-+	return IRQ_HANDLED;
-+}
-+#endif
-+
-+/* Set initial driver playback defaults. */
-+static void init_driver_variables(void)
-+{
-+	audio_device->speed = 44100;
-+	audio_device->format = AFMT_S16_LE;
-+	audio_device->bits = 16;
-+	audio_device->stereo = 1;
-+	audio_device->ssi_enabled = 0;
-+
-+	audio_start = 0;
-+	audio_count = 0;
-+	audio_append = 0;
-+	audio_appstart = 0;
-+	audio_txbusy = 0;
-+	audio_device->dmaing = 0;
-+}
-+
-+/* open audio device */
-+static int ssi_audio_open(struct inode *inode, struct file *filp)
-+{
-+#ifdef AUDIO_DEBUG
-+	printk(DRIVER_NAME ":ssi_audio_open()\n");
-+#endif
-+
-+	if (audio_device==NULL) return (-ENODEV);
-+
-+	if (audio_device->isopen)
-+		return(-EBUSY);
-+
-+	spin_lock(&(audio_device->lock));
-+
-+	audio_device->isopen = 1;
-+
-+	init_driver_variables();
-+	init_ssi();
-+	init_audio_codec();
-+
-+	spin_unlock(&(audio_device->lock));
-+
-+	udelay(100);
-+
-+	return 0;
-+}
-+
-+/* close audio device */
-+static int ssi_audio_close(struct inode *inode, struct file *filp)
-+{
-+#ifdef AUDIO_DEBUG
-+	printk(DRIVER_NAME ":ssi_audio_close()\n");
-+#endif
-+
-+	if (audio_device==NULL) return (-ENODEV);
-+
-+	ssi_audio_txdrain();
-+
-+	spin_lock(&(audio_device->lock));
-+
-+#ifdef CONFIG_SSIAUDIO_USE_EDMA
-+	stop_dma();
-+#endif
-+	disable_ssi();
-+	codec_reset();
-+	init_driver_variables();
-+	audio_device->isopen = 0;
-+
-+	spin_unlock(&(audio_device->lock));
-+	return 0;
-+}
-+
-+/* write to audio device */
-+static ssize_t ssi_audio_write(struct file *filp, const char *buf, size_t count, loff_t *ppos)
-+{
-+	unsigned long	*dp, *buflp;
-+	unsigned short	*bufwp;
-+	unsigned char	*bufbp;
-+	unsigned int	slen, bufcnt, i, s, e;
-+
-+#ifdef AUDIO_DEBUG
-+	printk(DRIVER_NAME ":ssi_audio_write(buf=%x,count=%d)\n", (int) buf, count);
-+#endif
-+
-+	if (audio_device==NULL) return (-ENODEV);
-+
-+	if (count <= 0)
-+		return 0;
-+
-+	spin_lock(&(audio_device->lock));
-+
-+	buflp = (unsigned long *) buf;
-+	bufwp = (unsigned short *) buf;
-+	bufbp = (unsigned char *) buf;
-+
-+	bufcnt = count & ~0x3;
-+
-+	bufcnt <<= 1;
-+	if (audio_device->stereo == 0)
-+		bufcnt <<= 1;
-+	if (audio_device->bits == 8)
-+		bufcnt <<= 1;
-+
-+tryagain:
-+	/*
-+	 *	Get a snapshot of buffer, so we can figure out how
-+	 *	much data we can fit in...
-+	 */
-+	s = audio_start;
-+	e = audio_append;
-+	dp = (unsigned long *) &(audio_device->audio_buf[e]);
-+
-+	slen = ((s > e) ? (s - e) : (BUFSIZE - (e - s))) - 4;
-+	if (slen > bufcnt)
-+		slen = bufcnt;
-+	if ((BUFSIZE - e) < slen)
-+		slen = BUFSIZE - e;
-+
-+	if (slen == 0) {
-+		if (signal_pending(current))
-+			return(-ERESTARTSYS);
-+		set_current_state(TASK_INTERRUPTIBLE);
-+		schedule_timeout(1);
-+		goto tryagain;
-+	}
-+
-+	/* For DMA we need to have data as 32 bit
-+	   values (since SSI TX register is 32 bit).
-+	   So, the incomming 16 bit data must be put to buffer as 32 bit values.
-+	   Also, the endianess is converted if needed
-+	*/
-+	if (audio_device->stereo) {
-+		if (audio_device->bits == 16) {
-+			if (audio_device->format==AFMT_S16_LE) {
-+				/*- convert endianess, probably could be done by SSI also */
-+				for (i = 0; (i < slen); i += 4) {
-+					unsigned short val = le16_to_cpu((*bufwp++));
-+					*dp++ = val;
-+				}
-+			} else {
-+				for (i = 0; (i < slen); i += 4) {
-+					*dp++ = *bufwp++;
-+				}
-+			}
-+		} else {
-+			for (i = 0; (i < slen); i += 4) {
-+				*dp    = (((unsigned long) *bufbp++) << 24);
-+				*dp++ |= (((unsigned long) *bufbp++) << 8);
-+			}
-+		}
-+	} else {
-+		if (audio_device->bits == 16) {
-+			for (i = 0; (i < slen); i += 4) {
-+				*dp++ = (((unsigned long)*bufwp)<<16) | *bufwp;
-+				bufwp++;
-+			}
-+		} else {
-+			for (i = 0; (i < slen); i += 4) {
-+				*dp++ = (((unsigned long) *bufbp) << 24) |
-+					(((unsigned long) *bufbp) << 8);
-+				bufbp++;
-+			}
-+		}
-+	}
-+
-+	e += slen;
-+	if (e >= BUFSIZE)
-+		e = 0;
-+	audio_append = e;
-+
-+	/* If not outputing audio, then start now */
-+	if (audio_txbusy == 0) {
-+		audio_txbusy++;
-+		audio_device->channel = 0;
-+		enable_ssi();
-+#ifdef CONFIG_SSIAUDIO_USE_EDMA
-+		ssi_audio_dmabuf(); /* start first DMA transfer */
-+#endif
-+	}
-+
-+	bufcnt -= slen;
-+
-+	if (bufcnt > 0)
-+		goto tryagain;
-+
-+	spin_unlock(&(audio_device->lock));
-+
-+	return count;
-+}
-+
-+/* ioctl: control the driver */
-+static int ssi_audio_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg)
-+{
-+	long	val;
-+	int	rc = 0;
-+
-+#ifdef AUDIO_DEBUG
-+    printk(DRIVER_NAME ":ssi_audio_ioctl(cmd=%x,arg=%x)\n", (int) cmd, (int) arg);
-+#endif
-+
-+	if (audio_device==NULL) return (-ENODEV);
-+
-+	switch (cmd) {
-+
-+	case SNDCTL_DSP_SPEED:
-+		if (access_ok(VERIFY_READ, (void *) arg, sizeof(val))) {
-+			get_user(val, (unsigned long *) arg);
-+#ifdef AUDIO_DEBUG
-+			printk(DRIVER_NAME ":ssi_audio_ioctl: SNDCTL_DSP_SPEED: %ld\n", val);
-+#endif
-+			ssi_audio_txdrain();
-+			audio_device->speed = val;
-+			init_audio_codec();
-+		} else {
-+			rc = -EINVAL;
-+		}
-+		break;
-+
-+	case SNDCTL_DSP_SAMPLESIZE:
-+		if (access_ok(VERIFY_READ, (void *) arg, sizeof(val))) {
-+			get_user(val, (unsigned long *) arg);
-+			ssi_audio_txdrain();
-+			ssi_audio_setsamplesize(val);
-+		} else {
-+			rc = -EINVAL;
-+		}
-+		break;
-+
-+	case SNDCTL_DSP_STEREO:
-+		if (access_ok(VERIFY_READ, (void *) arg, sizeof(val))) {
-+			get_user(val, (unsigned long *) arg);
-+			ssi_audio_txdrain();
-+			audio_device->stereo = val;
-+		} else {
-+			rc = -EINVAL;
-+		}
-+		break;
-+
-+	case SNDCTL_DSP_GETBLKSIZE:
-+		if (access_ok(VERIFY_WRITE, (void *) arg, sizeof(long)))
-+			put_user(BUFSIZE, (long *) arg);
-+		else
-+			rc = -EINVAL;
-+		break;
-+
-+	case SNDCTL_DSP_SYNC:
-+		ssi_audio_txdrain();
-+		break;
-+
-+	default:
-+		rc = -EINVAL;
-+		break;
-+	}
-+
-+	return rc;
-+}
-+
-+/****************************************************************************/
-+
-+struct file_operations	ssi_audio_fops = {
-+	open: ssi_audio_open,		/* open */
-+	release: ssi_audio_close,	/* close */
-+	write: ssi_audio_write,		/* write */
-+	ioctl: ssi_audio_ioctl,		/* ioctl */
-+};
-+
-+/* initialize audio driver */
-+static int __devinit ssi_audio_probe(struct spi_device *spi)
-+{
-+	struct ssi_audio	*audio;
-+	int	err;
-+
-+#ifdef AUDIO_DEBUG
-+	printk(DRIVER_NAME": probe\n");
-+#endif
-+
-+	if (!spi->irq) {
-+		dev_dbg(&spi->dev, "no IRQ?\n");
-+		return -ENODEV;
-+	}
-+
-+	/* don't exceed max specified sample rate */
-+	if (spi->max_speed_hz > MAX_SPEED_HZ) {
-+		dev_dbg(&spi->dev, "f(sample) %d KHz?\n",
-+				(spi->max_speed_hz)/1000);
-+		return -EINVAL;
-+	}
-+
-+	/* register charcter device */
-+	if (register_chrdev(SOUND_MAJOR, SOUND_DEVICE_NAME, &ssi_audio_fops) < 0) {
-+		printk(KERN_WARNING DRIVER_NAME ": failed to register major %d\n", SOUND_MAJOR);
-+		dev_dbg(&spi->dev, DRIVER_NAME ": failed to register major %d\n", SOUND_MAJOR);
-+		return -ENODEV;
-+	}
-+
-+	audio = kzalloc(sizeof(struct ssi_audio), GFP_KERNEL);
-+	if (!audio) {
-+		err = -ENOMEM;
-+		goto err_out;
-+	}
-+
-+	/* DMA buffer must be from GFP_DMA zone, so it will not be cached */
-+	audio->audio_buf = kmalloc(BUFSIZE, GFP_DMA);
-+	if (audio->audio_buf == NULL) {
-+		dev_dbg(&spi->dev, DRIVER_NAME ": failed to allocate DMA[%d] buffer\n", BUFSIZE);
-+		err = -ENOMEM;
-+		goto err_free_mem;
-+	}
-+
-+	audio_device = audio;
-+
-+	dev_set_drvdata(&spi->dev, audio);
-+	spi->dev.power.power_state = PMSG_ON;
-+
-+	audio->spi = spi;
-+
-+#ifndef CONFIG_SSIAUDIO_USE_EDMA
-+	if (request_irq(spi->irq, ssi_audio_isr, SA_INTERRUPT,	spi->dev.bus_id, audio)) {
-+		dev_dbg(&spi->dev, "irq %d busy?\n", spi->irq);
-+		err = -EBUSY;
-+		goto err_free_mem;
-+	}
-+
-+#else
-+	/* request 2 eDMA channels since two channel output mode is used */
-+	if (request_edma_channel(DMA_TCD,
-+							ssi_audio_dma_handler_empty,
-+							NULL,
-+							audio,
-+							&(audio_device->lock),
-+							DRIVER_NAME
-+							)!=0)
-+	{
-+		dev_dbg(&spi->dev, "DMA channel %d busy?\n", DMA_TCD);
-+		err = -EBUSY;
-+		goto err_free_mem;
-+	}
-+	if (request_edma_channel(DMA_TCD2,
-+							ssi_audio_dma_handler,
-+							NULL,
-+							audio,
-+							&(audio_device->lock),
-+							DRIVER_NAME
-+							)!=0)
-+	{
-+		dev_dbg(&spi->dev, "DMA channel %d busy?\n", DMA_TCD2);
-+		err = -EBUSY;
-+		goto err_free_mem;
-+	}
-+
-+#endif
-+	chip_init();
-+	printk(DRIVER_NAME ": Probed successfully\n");
-+
-+	return 0;
-+
-+ err_free_mem:
-+ 	kfree(audio);
-+	audio_device = NULL;
-+ err_out:
-+ 	unregister_chrdev(SOUND_MAJOR, SOUND_DEVICE_NAME);
-+	return err;
-+}
-+
-+static int __devexit ssi_audio_remove(struct spi_device *spi)
-+{
-+	struct ssi_audio *audio = dev_get_drvdata(&spi->dev);
-+
-+	ssi_audio_txdrain();
-+#ifndef CONFIG_SSIAUDIO_USE_EDMA
-+	free_irq(spi->irq, audio);
-+#else
-+	free_edma_channel(DMA_TCD, audio);
-+	free_edma_channel(DMA_TCD2, audio);
-+#endif
-+	kfree(audio->audio_buf);
-+	kfree(audio);
-+	audio_device = NULL;
-+	unregister_chrdev(SOUND_MAJOR, SOUND_DEVICE_NAME);
-+	dev_dbg(&spi->dev, "unregistered audio\n");
-+	return 0;
-+}
-+
-+static int ssi_audio_suspend(struct spi_device *spi, pm_message_t message) {
-+	return 0;
-+}
-+
-+static int ssi_audio_resume(struct spi_device *spi) {
-+	return 0;
-+}
-+
-+static struct spi_driver ssi_audio_driver = {
-+	.driver = {
-+		.name	= DRIVER_NAME,
-+		.bus	= &spi_bus_type,
-+		.owner	= THIS_MODULE,
-+	},
-+	.probe		= ssi_audio_probe,
-+	.remove		= __devexit_p(ssi_audio_remove),
-+	.suspend	= ssi_audio_suspend,
-+	.resume		= ssi_audio_resume,
-+};
-+
-+static int __init ssi_audio_init(void)
-+{
-+	return spi_register_driver(&ssi_audio_driver);
-+}
-+module_init(ssi_audio_init);
-+
-+static void __exit ssi_audio_exit(void)
-+{
-+	spi_unregister_driver(&ssi_audio_driver);
-+}
-+module_exit(ssi_audio_exit);
-+
-+MODULE_DESCRIPTION("SSI/I2S Audio Driver");
-+MODULE_LICENSE("GPL");
---- a/include/asm-m68k/coldfire_edma.h
-+++ b/include/asm-m68k/coldfire_edma.h
-@@ -1,39 +1,102 @@
-+/*
-+ * coldfire_edma.h - eDMA driver for Coldfire MCF5445x
-+ *
-+ * Yaroslav Vinogradov yaroslav.vinogradov@freescale.com
-+ *
-+ * Copyright Freescale Semiconductor, Inc. 2007
-+ *
-+ * 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.
-+ */
-+
- #ifndef _LINUX_COLDFIRE_DMA_H
- #define _LINUX_COLDFIRE_DMA_H
- 
- #include <linux/interrupt.h>
-+#include <asm/mcf5445x_edma.h>
- 
--#define EDMA_DRIVER_NAME 		"ColdFire-eDMA"
--#define DMA_DEV_MINOR 			1
-+#define EDMA_DRIVER_NAME "ColdFire-eDMA"
-+#define DMA_DEV_MINOR 1
- 
- #define EDMA_INT_CHANNEL_BASE 		8
- #define EDMA_INT_CONTROLLER_BASE 	64
- #define EDMA_CHANNELS			16
--
-+ 
- #define EDMA_IRQ_LEVEL			5
--
-+ 
- typedef irqreturn_t (*edma_irq_handler)(int, void *);
- typedef void (*edma_error_handler)(int, void *);
--
-+ 
-+/* Setup transfer control descriptor (TCD)
-+ *   channel - descriptor number
-+ *   source  - source address
-+ *   dest    - destination address
-+ *   attr    - attributes
-+ *   soff    - source offset
-+ *   nbytes  - number of bytes to be transfered in minor loop
-+ *   slast   - last source address adjustment
-+ *   citer   - major loop count
-+ *   biter   - beggining minor loop count
-+ *   doff    - destination offset
-+ *   dlast_sga - last destination address adjustment
-+ *   major_int - generate interrupt after each major loop
-+ *   disable_req - disable DMA request after major loop
-+ */
- void set_edma_params(int channel, u32 source, u32 dest,
--	u32 attr, u32 soff, u32 nbytes, u32 slast,
--	u32 citer, u32 biter, u32 doff, u32 dlast_sga);
--
--void start_edma_transfer(int channel, int major_int);
--
--void stop_edma_transfer(int channel);
--
--void confirm_edma_interrupt_handled(int channel);
--
-+		u32 attr, u32 soff, u32 nbytes, u32 slast,
-+		u32 citer, u32 biter, u32 doff, u32 dlast_sga,
-+		int major_int, int disable_req);
-+
-+/* Starts eDMA transfer on specified channel
-+ *   channel - eDMA TCD number
-+ */
-+static inline void  start_edma_transfer(int channel)
-+{
-+	MCF_EDMA_SERQ = channel;
-+	MCF_EDMA_SSRT = channel;
-+}
-+
-+/* Stops eDMA transfer
-+ *   channel - eDMA TCD number
-+ */
-+static inline void stop_edma_transfer(int channel)
-+{
-+	MCF_EDMA_CINT = channel;
-+	MCF_EDMA_CERQ = channel;
-+}
-+
-+
-+/* Confirm that interrupt has been handled
-+ *   channel - eDMA TCD number
-+ */
-+static inline void confirm_edma_interrupt_handled(int channel)
-+{
-+	MCF_EDMA_CINT = channel;
-+}
-+ 
-+/* Initialize eDMA controller */
- void init_edma(void);
--
--int  request_edma_channel(int channel,
--			edma_irq_handler handler,
--			edma_error_handler error_handler,
--			void *dev,
--			spinlock_t *lock,
--			const char *device_id);
--
-+ 
-+/* Request eDMA channel:
-+ *   channel - eDMA TCD number
-+ *   handler - channel IRQ callback
-+ *   error_handler - error interrupt handler callback for channel
-+ *   dev - device
-+ *   lock - spinlock to be locked (can be NULL)
-+ *   device_id - device driver name for proc file system output
-+ */
-+int request_edma_channel(int channel,
-+		edma_irq_handler handler,
-+		edma_error_handler error_handler,
-+		void *dev,
-+		spinlock_t *lock,
-+		const char *device_id);
-+  
-+/* Free eDMA channel
-+ *  channel - eDMA TCD number
-+ *  dev - device
-+ */
- int free_edma_channel(int channel, void *dev);
--
- #endif
---- /dev/null
-+++ b/include/linux/spi/mcfqspi.h
-@@ -0,0 +1,80 @@
-+/****************************************************************************/
-+
-+/*
-+ *	mcfqspi.c - Master QSPI controller for the ColdFire processors
-+ *
-+ *	(C) Copyright 2005, Intec Automation,
-+ *			    Mike Lavender (mike@steroidmicros)
-+ *
-+
-+     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.
-+
-+     This program is distributed in the hope that it will be useful,
-+     but WITHOUT ANY WARRANTY; without even the implied warranty of
-+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+     GNU General Public License for more details.
-+
-+     You should have received a copy of the GNU General Public License
-+     along with this program; if not, write to the Free Software
-+     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.		     */
-+/* ------------------------------------------------------------------------- */
-+
-+#ifndef MCFQSPI_H_
-+#define MCFQSPI_H_
-+
-+#define QSPI_CS_INIT		0x01
-+#define QSPI_CS_ASSERT		0x02
-+#define QSPI_CS_DROP		0x04
-+
-+#define QSPIIOCS_DOUT_HIZ	1	/* QMR[DOHIE] set hi-z dout between transfers */
-+#define QSPIIOCS_BITS		2	/* QMR[BITS] set transfer size */
-+#define QSPIIOCG_BITS		3	/* QMR[BITS] get transfer size */
-+#define QSPIIOCS_CPOL		4	/* QMR[CPOL] set SCK inactive state */
-+#define QSPIIOCS_CPHA		5	/* QMR[CPHA] set SCK phase, 1=rising edge */
-+#define QSPIIOCS_BAUD		6	/* QMR[BAUD] set SCK baud rate divider */
-+#define QSPIIOCS_QCD		7	/* QDLYR[QCD] set start delay */
-+#define QSPIIOCS_DTL		8	/* QDLYR[DTL] set after delay */
-+#define QSPIIOCS_CONT		9	/* continuous CS asserted during transfer */
-+#define QSPIIOCS_READDATA	10	/* set data send during read */
-+#define QSPIIOCS_ODD_MOD	11	/* if length of buffer is a odd number, 16-bit transfers */
-+					/* are finalized with a 8-bit transfer */
-+#define QSPIIOCS_DSP_MOD	12	/* transfers are bounded to 15/30 bytes (a multiple of 3 bytes = 1 DSPword) */
-+#define QSPIIOCS_POLL_MOD	13	/* driver uses polling instead of interrupts */
-+
-+#define QSPIIOCS_SET_CSIV	14	/* sets CSIV flag (cs inactive level) */
-+
-+#ifdef CONFIG_M520x
-+#undef  MCF_GPIO_PAR_QSPI
-+#define MCF_GPIO_PAR_QSPI      (0xA4034)
-+#endif
-+
-+struct coldfire_spi_master {
-+	u16 bus_num;
-+	u16 num_chipselect;
-+	u8  irq_source;
-+	u32 irq_vector;
-+	u32 irq_mask;
-+	u8  irq_lp;
-+	u8  par_val;
-+	u16 par_val16;
-+	void (*cs_control)(u8 cs, u8 command);
-+};
-+
-+
-+struct coldfire_spi_chip {
-+	u8 mode;
-+	u8 bits_per_word;
-+	u8 del_cs_to_clk;
-+	u8 del_after_trans;
-+	u16 void_write_data;
-+};
-+
-+typedef struct qspi_read_data {
-+        __u32 length;
-+        __u8 *buf;                   /* data to send during read */
-+        unsigned int loop : 1;
-+} qspi_read_data;
-+#endif /*MCFQSPI_H_*/
diff --git a/target/linux/coldfire/patches/020-mcfv4e_inline_memory_params.patch b/target/linux/coldfire/patches/020-mcfv4e_inline_memory_params.patch
deleted file mode 100644
index bd1769d08..000000000
--- a/target/linux/coldfire/patches/020-mcfv4e_inline_memory_params.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-From 3f698a1cf08cc02911cdb2ca3217be77eeba794b Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Tue, 27 Nov 2007 23:17:53 -0700
-Subject: [PATCH] Change inline assembly memory params.
-
-For various routines change how the assembly memory pointer
-is passed in.
-
-LTIBName: mcfv4e-inline-memory-params
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- include/asm-m68k/bitops.h |   68 ++++++++++++++++++++++++++++++++++++++++++++-
- 1 files changed, 67 insertions(+), 1 deletions(-)
-
---- a/include/asm-m68k/bitops.h
-+++ b/include/asm-m68k/bitops.h
-@@ -465,7 +465,7 @@ static inline int ext2_find_next_bit(con
-    __constant_coldfire_test_and_set_bit(nr, vaddr) :	\
-    __generic_coldfire_test_and_set_bit(nr, vaddr))
- 
--
-+#if 0
- static __inline__ int __constant_coldfire_test_and_set_bit(int nr,
- 	volatile void *vaddr)
- {
-@@ -477,6 +477,17 @@ static __inline__ int __constant_coldfir
- 	     : "di" (nr & 7));
- 	return retval;
- }
-+#else
-+static __inline__ int __constant_coldfire_test_and_set_bit(int nr,volatile void * vaddr)
-+{
-+	char retval;
-+	volatile char *p = &((volatile char *)vaddr)[(nr^31) >> 3];
-+	__asm__ __volatile__ ("bset %2,(%4); sne %0"
-+	     : "=d" (retval), "=m" (*p)
-+	     : "di" (nr & 7), "m" (*p), "a" (p));
-+	return retval;
-+}
-+#endif
- 
- static __inline__ int __generic_coldfire_test_and_set_bit(int nr,
- 	volatile void *vaddr)
-@@ -496,6 +507,7 @@ static __inline__ int __generic_coldfire
-    __constant_coldfire_set_bit(nr, vaddr) :	\
-    __generic_coldfire_set_bit(nr, vaddr))
- 
-+#if 0
- static __inline__ void __constant_coldfire_set_bit(int nr,
- 	volatile void *vaddr)
- {
-@@ -503,6 +515,14 @@ static __inline__ void __constant_coldfi
- 	__asm__ __volatile__ ("bset %1,%0"
- 	     : "+QUd" (*p) : "di" (nr & 7));
- }
-+#else
-+static __inline__ void __constant_coldfire_set_bit(int nr, volatile void * vaddr)
-+{
-+	volatile char *p = &((volatile char *)vaddr)[(nr^31) >> 3];
-+	__asm__ __volatile__ ("bset %1,(%3)"
-+	     : "=m" (*p) : "di" (nr & 7), "m" (*p), "a" (p));
-+}
-+#endif
- 
- static __inline__ void __generic_coldfire_set_bit(int nr, volatile void *vaddr)
- {
-@@ -518,6 +538,7 @@ static __inline__ void __generic_coldfir
-    __constant_coldfire_test_and_clear_bit(nr, vaddr) :	\
-    __generic_coldfire_test_and_clear_bit(nr, vaddr))
- 
-+#if 0
- static __inline__ int __constant_coldfire_test_and_clear_bit(int nr,
- 	volatile void *vaddr)
- {
-@@ -530,6 +551,19 @@ static __inline__ int __constant_coldfir
- 
- 	return retval;
- }
-+#else
-+static __inline__ int __constant_coldfire_test_and_clear_bit(int nr, volatile void *vaddr)
-+{
-+	char retval;
-+	volatile char *p = &((volatile char *)vaddr)[(nr^31) >> 3];
-+
-+	__asm__ __volatile__ ("bclr %2,(%4); sne %0"
-+	     : "=d" (retval), "=m" (*p)
-+	     : "id" (nr & 7), "m" (*p), "a" (p));
-+
-+	return retval;
-+}
-+#endif
- 
- static __inline__ int __generic_coldfire_test_and_clear_bit(int nr,
- 	volatile void *vaddr)
-@@ -556,6 +590,7 @@ static __inline__ int __generic_coldfire
-    __constant_coldfire_clear_bit(nr, vaddr) :	\
-    __generic_coldfire_clear_bit(nr, vaddr))
- 
-+#if 0
- static __inline__ void __constant_coldfire_clear_bit(int nr,
- 	volatile void *vaddr)
- {
-@@ -563,6 +598,14 @@ static __inline__ void __constant_coldfi
- 	__asm__ __volatile__ ("bclr %1,%0"
- 	     : "+QUd" (*p) : "id" (nr & 7));
- }
-+#else
-+static __inline__ void __constant_coldfire_clear_bit(int nr, volatile void * vaddr)
-+{
-+	volatile char *p = &((volatile char *)vaddr)[(nr^31) >> 3];
-+	__asm__ __volatile__ ("bclr %1,(%3)"
-+	     : "=m" (*p) : "id" (nr & 7), "m" (*p), "a" (p));
-+}
-+#endif
- 
- static __inline__ void __generic_coldfire_clear_bit(int nr,
- 	volatile void *vaddr)
-@@ -579,6 +622,7 @@ static __inline__ void __generic_coldfir
-    __constant_coldfire_test_and_change_bit(nr, vaddr) :	\
-    __generic_coldfire_test_and_change_bit(nr, vaddr))
- 
-+#if 0
- static __inline__ int __constant_coldfire_test_and_change_bit(int nr,
- 	volatile void *vaddr)
- {
-@@ -591,6 +635,19 @@ static __inline__ int __constant_coldfir
- 
- 	return retval;
- }
-+#else
-+static __inline__ int __constant_coldfire_test_and_change_bit(int nr, volatile void * vaddr)
-+{
-+	char retval;
-+	volatile char *p = &((volatile char *)vaddr)[(nr^31) >> 3];
-+
-+	__asm__ __volatile__ ("bchg %2,(%4); sne %0"
-+	     : "=d" (retval), "=m" (*p)
-+	     : "id" (nr & 7), "m" (*p), "a" (p));
-+
-+	return retval;
-+}
-+#endif
- 
- static __inline__ int __generic_coldfire_test_and_change_bit(int nr,
- 	volatile void *vaddr)
-@@ -612,6 +669,7 @@ static __inline__ int __generic_coldfire
-    __constant_coldfire_change_bit(nr, vaddr) :	\
-    __generic_coldfire_change_bit(nr, vaddr))
- 
-+#if 0
- static __inline__ void __constant_coldfire_change_bit(int nr,
- 	volatile void *vaddr)
- {
-@@ -619,6 +677,14 @@ static __inline__ void __constant_coldfi
- 	__asm__ __volatile__ ("bchg %1,%0"
- 	     : "+QUd" (*p) : "id" (nr & 7));
- }
-+#else
-+static __inline__ void __constant_coldfire_change_bit(int nr, volatile void * vaddr)
-+{
-+	volatile char *p = &((volatile char *)vaddr)[(nr^31) >> 3];
-+	__asm__ __volatile__ ("bchg %1,(%3)"
-+	     : "=m" (*p) : "id" (nr & 7), "m" (*p), "a" (p));
-+}
-+#endif
- 
- static __inline__ void __generic_coldfire_change_bit(int nr,
- 	volatile void *vaddr)
diff --git a/target/linux/coldfire/patches/021-m5445x_usb_premerge.patch b/target/linux/coldfire/patches/021-m5445x_usb_premerge.patch
deleted file mode 100644
index 4650aae6e..000000000
--- a/target/linux/coldfire/patches/021-m5445x_usb_premerge.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 3d7f85e904cf9dab191eeab9933ecac1e90d06e4 Mon Sep 17 00:00:00 2001
-From: Bruce Schmid <duck@freescale.com>
-Date: Thu, 29 Nov 2007 16:30:47 -0700
-Subject: [PATCH] USB pre-merge
-
-LTIBName: m5445x-usb-premerge
-Signed-off-by: Duck <duck@freescale.com>
----
- drivers/usb/host/ehci-arc.c |   18 +++++++++++++++++-
- 1 files changed, 17 insertions(+), 1 deletions(-)
-
---- a/drivers/usb/host/ehci-arc.c
-+++ b/drivers/usb/host/ehci-arc.c
-@@ -373,14 +373,30 @@ static int ehci_fsl_drv_resume(struct pl
- 	pr_debug("%s pdev=0x%p  pdata=0x%p  ehci=0x%p  hcd=0x%p\n",
- 		 __FUNCTION__, pdev, pdata, ehci, hcd);
- 
--	pr_debug("%s ehci->regs=0x%p  hcd->regs=0x%p",
-+	pr_debug("%s ehci->regs=0x%p  hcd->regs=0x%p\n",
- 		 __FUNCTION__, ehci->regs, hcd->regs);
- 
- 	memcpy(ehci->regs, (void *)&usb_ehci_regs, sizeof(struct ehci_regs));
-+
-+#if 0 // DDD test
- 	ehci_writel(ehci, usb_ehci_portsc, &ehci->regs->port_status[0]);
-+	printk("set portsc %08x  %08x\n", usb_ehci_portsc,
-+		ehci_readl(ehci,  &ehci->regs->port_status[0]));
-+	printk("set usbmode %08x\n", 
-+		ehci_readl(ehci,  &ehci->regs + FSL_SOC_USB_USBMODE));
- 
- 	tmp = USBMODE_CM_HOST | (pdata->es ? USBMODE_ES : 0);
- 	ehci_writel(ehci, tmp, hcd->regs + FSL_SOC_USB_USBMODE);
-+#else
-+	tmp = USBMODE_CM_HOST | (pdata->es ? USBMODE_ES : 0);
-+	ehci_writel(ehci, tmp, hcd->regs + FSL_SOC_USB_USBMODE);
-+	printk("tmp %08x  set usbmode %08x\n", tmp,
-+		ehci_readl(ehci,  hcd->regs + FSL_SOC_USB_USBMODE));
-+
-+	ehci_writel(ehci, usb_ehci_portsc, &ehci->regs->port_status[0]);
-+	printk("set portsc %08x  %08x\n", usb_ehci_portsc,
-+		ehci_readl(ehci,  &ehci->regs->port_status[0]));
-+#endif
- 
- 	set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
- 	hcd->state = HC_STATE_RUNNING;
diff --git a/target/linux/coldfire/patches/022-m5445x_ccm_bitdefs.patch b/target/linux/coldfire/patches/022-m5445x_ccm_bitdefs.patch
deleted file mode 100644
index dbaae3a5d..000000000
--- a/target/linux/coldfire/patches/022-m5445x_ccm_bitdefs.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From b100a50c3bf7884a97d5008fc79d9b45f3b6e999 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Fri, 30 Nov 2007 12:55:12 -0700
-Subject: [PATCH] Fix bitfield definitions.
-
-LTIBName: m5445x-ccm-bitdefs
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- include/asm-m68k/mcf5445x_ccm.h |   34 ++++++++++++++++++----------------
- 1 files changed, 18 insertions(+), 16 deletions(-)
-
---- a/include/asm-m68k/mcf5445x_ccm.h
-+++ b/include/asm-m68k/mcf5445x_ccm.h
-@@ -118,22 +118,24 @@
- #define MCF_CCM_MISCCR_BMT(x)           (((x) & 0x0007) << 8)	/* Bus monitor timing field */
- #define MCF_CCM_MISCCR_BME              (0x0800)	/* Bus monitor external enable bit */
- #define MCF_CCM_MISCCR_LIMP             (0x1000)	/* Limp mode enable */
--#define MCF_CCM_MISCCR_BMT_65536        (0)
--#define MCF_CCM_MISCCR_BMT_32768        (1)
--#define MCF_CCM_MISCCR_BMT_16384        (2)
--#define MCF_CCM_MISCCR_BMT_8192         (3)
--#define MCF_CCM_MISCCR_BMT_4096         (4)
--#define MCF_CCM_MISCCR_BMT_2048         (5)
--#define MCF_CCM_MISCCR_BMT_1024         (6)
--#define MCF_CCM_MISCCR_BMT_512          (7)
--#define MCF_CCM_MISCCR_SSIPUS_UP        (1)
--#define MCF_CCM_MISCCR_SSIPUS_DOWN      (0)
--#define MCF_CCM_MISCCR_TIMDMA_TIM       (1)
--#define MCF_CCM_MISCCR_TIMDMA_SSI       (0)
--#define MCF_CCM_MISCCR_SSISRC_CLKIN     (0)
--#define MCF_CCM_MISCCR_SSISRC_PLL       (1)
--#define MCF_CCM_MISCCR_USBOC_ACTHI      (0)
--#define MCF_CCM_MISCCR_USBOV_ACTLO      (1)
-+#define MCF_CCM_MISCCR_BMT_65536        (0 << 8)
-+#define MCF_CCM_MISCCR_BMT_32768        (1 << 8)
-+#define MCF_CCM_MISCCR_BMT_16384        (2 << 8)
-+#define MCF_CCM_MISCCR_BMT_8192         (3 << 8)
-+#define MCF_CCM_MISCCR_BMT_4096         (4 << 8)
-+#define MCF_CCM_MISCCR_BMT_2048         (5 << 8)
-+#define MCF_CCM_MISCCR_BMT_1024         (6 << 8)
-+#define MCF_CCM_MISCCR_BMT_512          (7 << 8)
-+#define MCF_CCM_MISCCR_SSIPUE_UP        (1 << 7)
-+#define MCF_CCM_MISCCR_SSIPUE_DOWN      (0 << 7)
-+#define MCF_CCM_MISCCR_SSIPUS_UP        (1 << 6)
-+#define MCF_CCM_MISCCR_SSIPUS_DOWN      (0 << 6)
-+#define MCF_CCM_MISCCR_TIMDMA_TIM       (1 << 5)
-+#define MCF_CCM_MISCCR_TIMDMA_SSI       (0 << 5)
-+#define MCF_CCM_MISCCR_SSISRC_CLKIN     (0 << 4)
-+#define MCF_CCM_MISCCR_SSISRC_PLL       (1 << 4)
-+#define MCF_CCM_MISCCR_USBOC_ACTHI      (0 << 1)
-+#define MCF_CCM_MISCCR_USBOC_ACTLO      (1 << 1)
- #define MCF_CCM_MISCCR_USBSRC_CLKIN     (0)
- #define MCF_CCM_MISCCR_USBSRC_PLL       (1)
- 
diff --git a/target/linux/coldfire/patches/023-mcfv4e_cache_base_update.patch b/target/linux/coldfire/patches/023-mcfv4e_cache_base_update.patch
deleted file mode 100644
index 9215085a0..000000000
--- a/target/linux/coldfire/patches/023-mcfv4e_cache_base_update.patch
+++ /dev/null
@@ -1,1194 +0,0 @@
-From 3592cd3db82e5b010df590079f1e310b5d317248 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Mon, 3 Dec 2007 23:03:07 -0700
-Subject: [PATCH] Rewrite Coldfire cache code.
-
-LTIBName: mcfv4e-cache-base-update
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/coldfire/cache.c       |  196 +-------------
- arch/m68k/coldfire/head.S        |    6 +-
- arch/m68k/coldfire/signal.c      |    4 +-
- arch/m68k/kernel/sys_m68k.c      |   16 ++
- arch/m68k/mm/cache.c             |   31 +---
- arch/m68k/mm/memory.c            |   76 +-----
- include/asm-m68k/cf_cacheflush.h |  525 +++++++++++++++++++++++++++++---------
- include/asm-m68k/cfcache.h       |   95 ++++----
- 8 files changed, 495 insertions(+), 454 deletions(-)
-
---- a/arch/m68k/coldfire/cache.c
-+++ b/arch/m68k/coldfire/cache.c
-@@ -1,7 +1,8 @@
- /*
-- *  linux/arch/m68k/coldifre/cache.c
-+ *  linux/arch/m68k/coldfire/cache.c
-  *
-  *  Matt Waddel Matt.Waddel@freescale.com
-+ *  Kurt Mahan kmahan@freescale.com
-  *  Copyright Freescale Semiconductor, Inc. 2007
-  *
-  *  This program is free software; you can redistribute it and/or modify
-@@ -15,191 +16,13 @@
- #include <asm/coldfire.h>
- #include <asm/system.h>
- 
--#define _DCACHE_SIZE (2*16384)
--#define _ICACHE_SIZE (2*16384)
--
--#define _SET_SHIFT 4
--
--/*
-- * Masks for cache sizes.  Programming note: because the set size is a
-- * power of two, the mask is also the last address in the set.
-- */
--
--#define _DCACHE_SET_MASK ((_DCACHE_SIZE/64-1)<<_SET_SHIFT)
--#define _ICACHE_SET_MASK ((_ICACHE_SIZE/64-1)<<_SET_SHIFT)
--#define LAST_DCACHE_ADDR _DCACHE_SET_MASK
--#define LAST_ICACHE_ADDR _ICACHE_SET_MASK
--
--/************************************************************
-- *  Routine to cleanly flush the cache, pushing all lines and
-- *  invalidating them.
-- *
-- *  The is the flash-resident version, used after copying the .text
-- *  segment from flash to ram.
-- *************************************************************/
--void FLASHDcacheFlushInvalidate(void)
--	__attribute__ ((section (".text_loader")));
--
--void FLASHDcacheFlushInvalidate()
--{
--	unsigned long set;
--	unsigned long start_set;
--	unsigned long end_set;
--
--	start_set = 0;
--	end_set = (unsigned long)LAST_DCACHE_ADDR;
--
--	for (set = start_set; set < end_set; set += (0x10 - 3))
--		asm volatile("cpushl %%dc,(%0)\n"
--			     "\taddq%.l #1,%0\n"
--			     "\tcpushl %%dc,(%0)\n"
--			     "\taddq%.l #1,%0\n"
--			     "\tcpushl %%dc,(%0)\n"
--			     "\taddq%.l #1,%0\n"
--			     "\tcpushl %%dc,(%0)" : : "a" (set));
--}
--
--/************************************************************
-- *  Routine to cleanly flush the cache, pushing all lines and
-- *  invalidating them.
-- *
-- *************************************************************/
--void DcacheFlushInvalidate()
--{
--	unsigned long set;
--	unsigned long start_set;
--	unsigned long end_set;
--
--	start_set = 0;
--	end_set = (unsigned long)LAST_DCACHE_ADDR;
--
--	for (set = start_set; set < end_set; set += (0x10 - 3))
--		asm volatile("cpushl %%dc,(%0)\n"
--			     "\taddq%.l #1,%0\n"
--			     "\tcpushl %%dc,(%0)\n"
--			     "\taddq%.l #1,%0\n"
--			     "\tcpushl %%dc,(%0)\n"
--			     "\taddq%.l #1,%0\n"
--			     "\tcpushl %%dc,(%0)" : : "a" (set));
--}
--
--
--
--/******************************************************************************
-- *  Routine to cleanly flush the a block of cache, pushing all relevant lines
-- *  and invalidating them.
-- *
-- ******************************************************************************/
--void DcacheFlushInvalidateCacheBlock(void *start, unsigned long size)
--{
--	unsigned long set;
--	unsigned long start_set;
--	unsigned long end_set;
--
--	/* if size is bigger than the cache can store
--	 * set the size to the maximum amount
--	 */
--
--	if (size > LAST_DCACHE_ADDR)
--		size = LAST_DCACHE_ADDR;
--
--	start_set = ((unsigned long)start) & _DCACHE_SET_MASK;
--	end_set = ((unsigned long)(start+size-1)) & _DCACHE_SET_MASK;
--
--	if (start_set > end_set) {
--		/* from the begining to the lowest address */
--		for (set = 0; set <= end_set; set += (0x10 - 3))
--			asm volatile("cpushl %%dc,(%0)\n"
--				     "\taddq%.l #1,%0\n"
--				     "\tcpushl %%dc,(%0)\n"
--				     "\taddq%.l #1,%0\n"
--				     "\tcpushl %%dc,(%0)\n"
--				     "\taddq%.l #1,%0\n"
--				     "\tcpushl %%dc,(%0)" : : "a" (set));
--
--		/* next loop will finish the cache ie pass the hole */
--		end_set = LAST_DCACHE_ADDR;
--	}
--	for (set = start_set; set <= end_set; set += (0x10 - 3))
--		asm volatile("cpushl %%dc,(%0)\n"
--			     "\taddq%.l #1,%0\n"
--			     "\tcpushl %%dc,(%0)\n"
--			     "\taddq%.l #1,%0\n"
--			     "\tcpushl %%dc,(%0)\n"
--			     "\taddq%.l #1,%0\n"
--			     "\tcpushl %%dc,(%0)" : : "a" (set));
--}
--
--
--void IcacheInvalidateCacheBlock(void *start, unsigned long size)
--{
--	unsigned long set;
--	unsigned long start_set;
--	unsigned long end_set;
--
--	/* if size is bigger than the cache can store
--	 * set the size to the maximum ammount
--	 */
--
--	if (size > LAST_ICACHE_ADDR)
--		size = LAST_ICACHE_ADDR;
--
--	start_set = ((unsigned long)start) & _ICACHE_SET_MASK;
--	end_set = ((unsigned long)(start+size-1)) & _ICACHE_SET_MASK;
--
--	if (start_set > end_set) {
--		/* from the begining to the lowest address */
--		for (set = 0; set <= end_set; set += (0x10 - 3))
--			asm volatile("cpushl %%ic,(%0)\n"
--				     "\taddq%.l #1,%0\n"
--				     "\tcpushl %%ic,(%0)\n"
--				     "\taddq%.l #1,%0\n"
--				     "\tcpushl %%ic,(%0)\n"
--				     "\taddq%.l #1,%0\n"
--				     "\tcpushl %%ic,(%0)" : : "a" (set));
--
--		/* next loop will finish the cache ie pass the hole */
--		end_set = LAST_ICACHE_ADDR;
--	}
--	for (set = start_set; set <= end_set; set += (0x10 - 3))
--		asm volatile("cpushl %%ic,(%0)\n"
--			     "\taddq%.l #1,%0\n"
--			     "\tcpushl %%ic,(%0)\n"
--			     "\taddq%.l #1,%0\n"
--			     "\tcpushl %%ic,(%0)\n"
--			     "\taddq%.l #1,%0\n"
--			     "\tcpushl %%ic,(%0)" : : "a" (set));
--}
--
--
--/********************************************************************
-- *  Disable the data cache completely
-- ********************************************************************/
--void DcacheDisable(void)
--{
--	int newValue;
--	unsigned long flags;
--
--	local_save_flags(flags);
--	local_irq_disable();
--
--	DcacheFlushInvalidate();      /* begin by flushing the cache */
--	newValue = CACHE_DISABLE_MODE; /* disable it */
--	cacr_set(newValue);
--	local_irq_restore(flags);
--}
--
--/********************************************************************
-- *  Unconditionally enable the data cache
-- ********************************************************************/
--void DcacheEnable(void)
--{
--	cacr_set(CACHE_INITIAL_MODE);
--}
--
--
-+/* Cache Control Reg shadow reg */
- unsigned long shadow_cacr;
- 
-+/**
-+ * cacr_set - Set the Cache Control Register
-+ * @x Value to set
-+ */
- void cacr_set(unsigned long x)
- {
- 	shadow_cacr = x;
-@@ -209,6 +32,11 @@ void cacr_set(unsigned long x)
- 			      : "r" (shadow_cacr));
- }
- 
-+/**
-+ * cacr_get - Get the current value of the Cache Control Register
-+ *
-+ * @return CACR value
-+ */
- unsigned long cacr_get(void)
- {
- 	return shadow_cacr;
---- a/arch/m68k/coldfire/head.S
-+++ b/arch/m68k/coldfire/head.S
-@@ -244,7 +244,7 @@ ENTRY(__start)
- /* Setup initial stack pointer */
- 	movel	#0x40001000,%sp	
- 
--/* Clear usp */
-+/* Setup usp */
- 	subl	%a0,%a0
- 	movel	%a0,%usp
- 
-@@ -252,6 +252,10 @@ ENTRY(__start)
- 	movec   %d0, %rambar1
- 	movew	#0x2700,%sr
- 
-+/* reset cache */
-+	movel	#(CF_CACR_ICINVA + CF_CACR_DCINVA),%d0
-+	movecl	%d0,%cacr
-+
- 	movel	#(MMU_BASE+1),%d0
- 	movecl	%d0,%mmubar
- 	movel	#MMUOR_CA,%a0  			/* Clear tlb entries */
---- a/arch/m68k/coldfire/signal.c
-+++ b/arch/m68k/coldfire/signal.c
-@@ -37,6 +37,7 @@
- #include <asm/cf_pgtable.h>
- #include <asm/traps.h>
- #include <asm/ucontext.h>
-+#include <asm/cacheflush.h>
- 
- #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
- 
-@@ -605,10 +606,9 @@ static inline int rt_setup_ucontext(stru
- 	return err;
- }
- 
--extern void IcacheInvalidateCacheBlock(void *, unsigned long);
- static inline void push_cache(unsigned long vaddr)
- {
--	IcacheInvalidateCacheBlock((void *)vaddr, 8);
-+	cf_cache_push(__pa(vaddr), 8);
- }
- 
- static inline void __user *
---- a/arch/m68k/kernel/sys_m68k.c
-+++ b/arch/m68k/kernel/sys_m68k.c
-@@ -29,6 +29,9 @@
- #include <asm/traps.h>
- #include <asm/page.h>
- #include <asm/unistd.h>
-+#ifdef CONFIG_COLDFIRE
-+#include <asm/cacheflush.h>
-+#endif
- 
- /*
-  * sys_pipe() is the normal C calling standard for creating
-@@ -257,6 +260,7 @@ asmlinkage int sys_ipc (uint call, int f
- 	return -EINVAL;
- }
- 
-+#ifndef CONFIG_COLDFIRE
- /* Convert virtual (user) address VADDR to physical address PADDR */
- #define virt_to_phys_040(vaddr)						\
- ({									\
-@@ -580,6 +584,7 @@ cache_flush_060 (unsigned long addr, int
-     }
-   return 0;
- }
-+#endif /* CONFIG_COLDFIRE */
- 
- /* sys_cacheflush -- flush (part of) the processor cache.  */
- asmlinkage int
-@@ -612,6 +617,7 @@ sys_cacheflush (unsigned long addr, int 
- 			goto out;
- 	}
- 
-+#ifndef CONFIG_COLDFIRE
- 	if (CPU_IS_020_OR_030) {
- 		if (scope == FLUSH_SCOPE_LINE && len < 256) {
- 			unsigned long cacr;
-@@ -656,6 +662,16 @@ sys_cacheflush (unsigned long addr, int 
- 		ret = cache_flush_060 (addr, scope, cache, len);
- 	    }
- 	}
-+#else /* CONFIG_COLDFIRE */
-+	if ((cache & FLUSH_CACHE_INSN) && (cache & FLUSH_CACHE_DATA))
-+		flush_bcache();
-+	else if (cache & FLUSH_CACHE_INSN)
-+		flush_icache();
-+	else
-+		flush_dcache();
-+
-+	ret = 0;
-+#endif /* CONFIG_COLDFIRE */
- out:
- 	unlock_kernel();
- 	return ret;
---- a/arch/m68k/mm/cache.c
-+++ b/arch/m68k/mm/cache.c
-@@ -81,36 +81,7 @@ static unsigned long virt_to_phys_slow(u
- void flush_icache_range(unsigned long address, unsigned long endaddr)
- {
- #ifdef CONFIG_COLDFIRE
--	unsigned long set;
--	unsigned long start_set;
--	unsigned long end_set;
--
--	start_set = address & _ICACHE_SET_MASK;
--	end_set = endaddr & _ICACHE_SET_MASK;
--
--	if (start_set > end_set) {
--	/* from the begining to the lowest address */
--		for (set = 0; set <= end_set; set += (0x10 - 3))
--			asm volatile ("cpushl %%ic,(%0)\n"
--				      "\taddq%.l #1,%0\n"
--				      "\tcpushl %%ic,(%0)\n"
--				      "\taddq%.l #1,%0\n"
--				      "\tcpushl %%ic,(%0)\n"
--				      "\taddq%.l #1,%0\n"
--				      "\tcpushl %%ic,(%0)" : : "a" (set));
--
--		/* next loop will finish the cache ie pass the hole */
--		end_set = LAST_ICACHE_ADDR;
--	}
--	for (set = start_set; set <= end_set; set += (0x10 - 3))
--		asm volatile ("cpushl %%ic,(%0)\n"
--			      "\taddq%.l #1,%0\n"
--			      "\tcpushl %%ic,(%0)\n"
--			      "\taddq%.l #1,%0\n"
--			      "\tcpushl %%ic,(%0)\n"
--			      "\taddq%.l #1,%0\n"
--			      "\tcpushl %%ic,(%0)" : : "a" (set));
--
-+	cf_icache_flush_range(address, endaddr);
- #else /* !CONFIG_COLDFIRE */
- 
- 	if (CPU_IS_040_OR_060) {
---- a/arch/m68k/mm/memory.c
-+++ b/arch/m68k/mm/memory.c
-@@ -127,6 +127,7 @@ int free_pointer_table (pmd_t *ptable)
- 	return 0;
- }
- 
-+#ifndef CONFIG_COLDFIRE
- /* invalidate page in both caches */
- static inline void clear040(unsigned long paddr)
- {
-@@ -173,6 +174,7 @@ static inline void pushcl040(unsigned lo
- 		clear040(paddr);
- 	local_irq_restore(flags);
- }
-+#endif /* CONFIG_COLDFIRE */
- 
- /*
-  * 040: Hit every page containing an address in the range paddr..paddr+len-1.
-@@ -203,38 +205,10 @@ static inline void pushcl040(unsigned lo
- 
- void cache_clear (unsigned long paddr, int len)
- {
--    if (CPU_IS_CFV4E) {
--	unsigned long set;
--	unsigned long start_set;
--	unsigned long end_set;
--
--	start_set = paddr & _ICACHE_SET_MASK;
--	end_set = (paddr+len-1) & _ICACHE_SET_MASK;
--
--	if (start_set > end_set) {
--		/* from the begining to the lowest address */
--		for (set = 0; set <= end_set; set += (0x10 - 3))
--			asm volatile("cpushl %%bc,(%0)\n"
--				     "\taddq%.l #1,%0\n"
--				     "\tcpushl %%bc,(%0)\n"
--				     "\taddq%.l #1,%0\n"
--				     "\tcpushl %%bc,(%0)\n"
--				     "\taddq%.l #1,%0\n"
--				     "\tcpushl %%bc,(%0)" : : "a" (set));
--
--		/* next loop will finish the cache ie pass the hole */
--		end_set = LAST_ICACHE_ADDR;
--	}
--	for (set = start_set; set <= end_set; set += (0x10 - 3))
--		asm volatile("cpushl %%bc,(%0)\n"
--			     "\taddq%.l #1,%0\n"
--			     "\tcpushl %%bc,(%0)\n"
--			     "\taddq%.l #1,%0\n"
--			     "\tcpushl %%bc,(%0)\n"
--			     "\taddq%.l #1,%0\n"
--			     "\tcpushl %%bc,(%0)" : : "a" (set));
--
--    } else if (CPU_IS_040_OR_060) {
-+#ifdef CONFIG_COLDFIRE
-+	cf_cache_clear(paddr, len);
-+#else
-+    if (CPU_IS_040_OR_060) {
- 	int tmp;
- 
- 	/*
-@@ -268,6 +242,7 @@ void cache_clear (unsigned long paddr, i
-     if(mach_l2_flush)
- 	mach_l2_flush(0);
- #endif
-+#endif /* CONFIG_COLDFIRE */
- }
- EXPORT_SYMBOL(cache_clear);
- 
-@@ -281,38 +256,10 @@ EXPORT_SYMBOL(cache_clear);
- 
- void cache_push (unsigned long paddr, int len)
- {
--    if (CPU_IS_CFV4E) {
--	unsigned long set;
--	unsigned long start_set;
--	unsigned long end_set;
--
--	start_set = paddr & _ICACHE_SET_MASK;
--	end_set = (paddr+len-1) & _ICACHE_SET_MASK;
--
--	if (start_set > end_set) {
--		/* from the begining to the lowest address */
--		for (set = 0; set <= end_set; set += (0x10 - 3))
--			asm volatile("cpushl %%bc,(%0)\n"
--				     "\taddq%.l #1,%0\n"
--				     "\tcpushl %%bc,(%0)\n"
--				     "\taddq%.l #1,%0\n"
--				     "\tcpushl %%bc,(%0)\n"
--				     "\taddq%.l #1,%0\n"
--				     "\tcpushl %%bc,(%0)" : : "a" (set));
--
--		/* next loop will finish the cache ie pass the hole */
--		end_set = LAST_ICACHE_ADDR;
--	}
--	for (set = start_set; set <= end_set; set += (0x10 - 3))
--		asm volatile("cpushl %%bc,(%0)\n"
--			     "\taddq%.l #1,%0\n"
--			     "\tcpushl %%bc,(%0)\n"
--			     "\taddq%.l #1,%0\n"
--			     "\tcpushl %%bc,(%0)\n"
--			     "\taddq%.l #1,%0\n"
--			     "\tcpushl %%bc,(%0)" : : "a" (set));
--
--    } else if (CPU_IS_040_OR_060) {
-+#ifdef CONFIG_COLDFIRE
-+	cf_cache_push(paddr, len);
-+#else
-+    if (CPU_IS_040_OR_060) {
- 	int tmp = PAGE_SIZE;
- 
- 	/*
-@@ -352,6 +299,7 @@ void cache_push (unsigned long paddr, in
-     if(mach_l2_flush)
- 	mach_l2_flush(1);
- #endif
-+#endif /* CONFIG_COLDFIRE */
- }
- EXPORT_SYMBOL(cache_push);
- 
---- a/include/asm-m68k/cf_cacheflush.h
-+++ b/include/asm-m68k/cf_cacheflush.h
-@@ -1,160 +1,439 @@
-+/*
-+ * include/asm-m68k/cf_cacheflush.h - Coldfire Cache
-+ *
-+ * Based on include/asm-m68k/cacheflush.h
-+ *
-+ * Coldfire pieces by:
-+ *   Kurt Mahan kmahan@freescale.com
-+ *
-+ * Copyright Freescale Semiconductor, Inc. 2007
-+ *
-+ * 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.
-+ */
- #ifndef M68K_CF_CACHEFLUSH_H
- #define M68K_CF_CACHEFLUSH_H
- 
- #include <asm/cfcache.h>
- 
- /*
-- * Cache handling functions
-+ * Coldfire Cache Model
-+ *
-+ * The Coldfire processors use a Harvard architecture cache configured
-+ * as four-way set associative.  The cache does not implement bus snooping
-+ * so cache coherency with other masters must be maintained in software.
-+ *
-+ * The cache is managed via the CPUSHL instruction in conjunction with
-+ * bits set in the CACR (cache control register).  Currently the code
-+ * uses the CPUSHL enhancement which adds the ability to
-+ * invalidate/clear/push a cacheline by physical address.  This feature
-+ * is designated in the Hardware Configuration Register [D1-CPES].
-+ *
-+ * CACR Bits:
-+ *	DPI[28]		cpushl invalidate disable for d-cache
-+ *	IDPI[12]	cpushl invalidate disable for i-cache
-+ *	SPA[14]		cpushl search by physical address
-+ *	IVO[20]		cpushl invalidate only
-+ *
-+ * Random Terminology:
-+ *  * invalidate = reset the cache line's valid bit
-+ *  * push = generate a line-sized store of the data if its contents are marked
-+ *	     as modifed (the modified flag is cleared after the store)
-+ *  * clear = push + invalidate
-  */
- 
--#define flush_icache()						\
--({								\
--  unsigned long set;						\
--  unsigned long start_set;					\
--  unsigned long end_set;					\
--								\
--  start_set = 0;						\
--  end_set = (unsigned long)LAST_DCACHE_ADDR;			\
--								\
--  for (set = start_set; set <= end_set; set += (0x10 - 3)) 	\
--    asm volatile("cpushl %%ic,(%0)\n"				\
--		 "\taddq%.l #1,%0\n"				\
--		 "\tcpushl %%ic,(%0)\n"				\
--		 "\taddq%.l #1,%0\n"				\
--		 "\tcpushl %%ic,(%0)\n"				\
--		 "\taddq%.l #1,%0\n"				\
--		 "\tcpushl %%ic,(%0)" : : "a" (set));		\
--})
-+/**
-+ * flush_icache - Flush all of the instruction cache
-+ */
-+static inline void flush_icache(void)
-+{
-+	asm volatile("nop\n"
-+		     "moveq%.l	#0,%%d0\n"
-+		     "moveq%.l	#0,%%d1\n"
-+		     "move%.l	%%d0,%%a0\n"
-+		     "1:\n"
-+		     "cpushl	%%ic,(%%a0)\n"
-+		     "add%.l	#0x0010,%%a0\n"
-+		     "addq%.l	#1,%%d1\n"
-+		     "cmpi%.l	%0,%%d1\n"
-+		     "bne	1b\n"
-+		     "moveq%.l	#0,%%d1\n"
-+		     "addq%.l	#1,%%d0\n"
-+		     "move%.l	%%d0,%%a0\n"
-+		     "cmpi%.l	#4,%%d0\n"
-+		     "bne	1b\n"
-+		     : : "i" (CACHE_SETS)
-+		     : "a0", "d0", "d1");
-+}
- 
--/*
-- * invalidate the cache for the specified memory range.
-- * It starts at the physical address specified for
-- * the given number of bytes.
-+/**
-+ * flush_dcache - Flush all of the data cache
-  */
--extern void cache_clear(unsigned long paddr, int len);
--/*
-- * push any dirty cache in the specified memory range.
-- * It starts at the physical address specified for
-- * the given number of bytes.
-+static inline void flush_dcache(void)
-+{
-+	asm volatile("nop\n"
-+		     "moveq%.l	#0,%%d0\n"
-+		     "moveq%.l	#0,%%d1\n"
-+		     "move%.l	%%d0,%%a0\n"
-+		     "1:\n"
-+		     "cpushl	%%dc,(%%a0)\n"
-+		     "add%.l	#0x0010,%%a0\n"
-+		     "addq%.l	#1,%%d1\n"
-+		     "cmpi%.l	%0,%%d1\n"
-+		     "bne	1b\n"
-+		     "moveq%.l	#0,%%d1\n"
-+		     "addq%.l	#1,%%d0\n"
-+		     "move%.l	%%d0,%%a0\n"
-+		     "cmpi%.l	#4,%%d0\n"
-+		     "bne	1b\n"
-+		     : : "i" (CACHE_SETS)
-+		     : "a0", "d0", "d1");
-+}
-+
-+/**
-+ * flush_bcache - Flush all of both caches
-  */
--extern void cache_push(unsigned long paddr, int len);
-+static inline void flush_bcache(void)
-+{
-+	asm volatile("nop\n"
-+		     "moveq%.l	#0,%%d0\n"
-+		     "moveq%.l	#0,%%d1\n"
-+		     "move%.l	%%d0,%%a0\n"
-+		     "1:\n"
-+		     "cpushl	%%bc,(%%a0)\n"
-+		     "add%.l	#0x0010,%%a0\n"
-+		     "addq%.l	#1,%%d1\n"
-+		     "cmpi%.l	%0,%%d1\n"
-+		     "bne	1b\n"
-+		     "moveq%.l	#0,%%d1\n"
-+		     "addq%.l	#1,%%d0\n"
-+		     "move%.l	%%d0,%%a0\n"
-+		     "cmpi%.l	#4,%%d0\n"
-+		     "bne	1b\n"
-+		     : : "i" (CACHE_SETS)
-+		     : "a0", "d0", "d1");
-+}
- 
--/*
-- * push and invalidate pages in the specified user virtual
-- * memory range.
-+/**
-+ * cf_cache_clear - invalidate cache
-+ * @paddr: starting physical address
-+ * @len: number of bytes
-+ *
-+ * Invalidate cache lines starting at paddr for len bytes.
-+ * Those lines are not pushed.
-+ */
-+static inline void cf_cache_clear(unsigned long paddr, int len)
-+{
-+	/* number of lines */
-+	len =  (len + (CACHE_LINE_SIZE-1)) / CACHE_LINE_SIZE;
-+
-+	/* align on set boundary */
-+	paddr &= 0xfffffff0;
-+
-+	asm volatile("nop\n"
-+		     "move%.l   %2,%%d0\n"
-+		     "or%.l	%3,%%d0\n"
-+		     "movec	%%d0,%%cacr\n"
-+		     "move%.l	%0,%%a0\n"
-+		     "move%.l	%1,%%d0\n"
-+		     "1:\n"
-+		     "cpushl	%%bc,(%%a0)\n"
-+		     "lea	0x10(%%a0),%%a0\n"
-+		     "subq%.l	#1,%%d0\n"
-+		     "bne%.b	1b\n"
-+		     "movec	%2,%%cacr\n"
-+		     : : "a" (paddr), "r" (len),
-+			 "r" (shadow_cacr),
-+			 "i" (CF_CACR_SPA+CF_CACR_IVO)
-+		     : "a0", "d0");
-+}
-+
-+/**
-+ * cf_cache_push - Push dirty cache out with no invalidate
-+ * @paddr: starting physical address
-+ * @len: number of bytes
-+ *
-+ * Push the any dirty lines starting at paddr for len bytes.
-+ * Those lines are not invalidated.
-+ */
-+static inline void cf_cache_push(unsigned long paddr, int len)
-+{
-+	/* number of lines */
-+	len =  (len + (CACHE_LINE_SIZE-1)) / CACHE_LINE_SIZE;
-+
-+	/* align on set boundary */
-+	paddr &= 0xfffffff0;
-+
-+	asm volatile("nop\n"
-+		     "move%.l   %2,%%d0\n"
-+		     "or%.l	%3,%%d0\n"
-+		     "movec	%%d0,%%cacr\n"
-+		     "move%.l	%0,%%a0\n"
-+		     "move%.l	%1,%%d0\n"
-+		     "1:\n"
-+		     "cpushl	%%bc,(%%a0)\n"
-+		     "lea	0x10(%%a0),%%a0\n"
-+		     "subq%.l	#1,%%d0\n"
-+		     "bne.b	1b\n"
-+		     "movec	%2,%%cacr\n"
-+		     : : "a" (paddr), "r" (len),
-+			 "r" (shadow_cacr),
-+			 "i" (CF_CACR_SPA+CF_CACR_DPI+CF_CACR_IDPI)
-+		     : "a0", "d0");
-+}
-+
-+/**
-+ * cf_cache_flush - Push dirty cache out and invalidate
-+ * @paddr: starting physical address
-+ * @len: number of bytes
-+ *
-+ * Push the any dirty lines starting at paddr for len bytes and
-+ * invalidate those lines.
-+ */
-+static inline void cf_cache_flush(unsigned long paddr, int len)
-+{
-+	/* number of lines */
-+	len =  (len + (CACHE_LINE_SIZE-1)) / CACHE_LINE_SIZE;
-+
-+	/* align on set boundary */
-+	paddr &= 0xfffffff0;
-+
-+	asm volatile("nop\n"
-+		     "move%.l   %2,%%d0\n"
-+		     "or%.l	%3,%%d0\n"
-+		     "movec	%%d0,%%cacr\n"
-+		     "move%.l	%0,%%a0\n"
-+		     "move%.l	%1,%%d0\n"
-+		     "1:\n"
-+		     "cpushl	%%bc,(%%a0)\n"
-+		     "lea	0x10(%%a0),%%a0\n"
-+		     "subq%.l	#1,%%d0\n"
-+		     "bne.b	1b\n"
-+		     "movec	%2,%%cacr\n"
-+		     : : "a" (paddr), "r" (len),
-+			 "r" (shadow_cacr),
-+			 "i" (CF_CACR_SPA)
-+		     : "a0", "d0");
-+}
-+
-+/**
-+ * cf_cache_flush_range - Push dirty data/inst cache in range out and invalidate
-+ * @vstart - starting virtual address
-+ * @vend: ending virtual address
-+ *
-+ * Push the any dirty data/instr lines starting at paddr for len bytes and
-+ * invalidate those lines.
-+ */
-+static inline void cf_cache_flush_range(unsigned long vstart, unsigned long vend)
-+{
-+	int len;
-+
-+	/* align on set boundary */
-+	vstart &= 0xfffffff0;
-+	vend = PAGE_ALIGN((vend + (CACHE_LINE_SIZE-1))) & 0xfffffff0;
-+	len = vend - vstart;
-+	vstart = __pa(vstart);
-+	vend = vstart + len;
-+
-+	asm volatile("nop\n"
-+		     "move%.l   %2,%%d0\n"
-+		     "or%.l	%3,%%d0\n"
-+		     "movec	%%d0,%%cacr\n"
-+		     "move%.l	%0,%%a0\n"
-+		     "move%.l	%1,%%a1\n"
-+		     "1:\n"
-+		     "cpushl	%%bc,(%%a0)\n"
-+		     "lea	0x10(%%a0),%%a0\n"
-+		     "cmpa%.l	%%a0,%%a1\n"
-+		     "bne.b	1b\n"
-+		     "movec	%2,%%cacr\n"
-+		     : /* no return */
-+		     : "a" (vstart), "a" (vend),
-+		       "r" (shadow_cacr),
-+		       "i" (CF_CACR_SPA)
-+		     : "a0", "a1", "d0");
-+}
-+
-+/**
-+ * cf_dcache_flush_range - Push dirty data cache in range out and invalidate
-+ * @vstart - starting virtual address
-+ * @vend: ending virtual address
-+ *
-+ * Push the any dirty data lines starting at paddr for len bytes and
-+ * invalidate those lines.
-+ */
-+static inline void cf_dcache_flush_range(unsigned long vstart, unsigned long vend)
-+{
-+	/* align on set boundary */
-+	vstart &= 0xfffffff0;
-+	vend = (vend + (CACHE_LINE_SIZE-1)) & 0xfffffff0;
-+
-+	asm volatile("nop\n"
-+		     "move%.l   %2,%%d0\n"
-+		     "or%.l	%3,%%d0\n"
-+		     "movec	%%d0,%%cacr\n"
-+		     "move%.l	%0,%%a0\n"
-+		     "move%.l	%1,%%a1\n"
-+		     "1:\n"
-+		     "cpushl	%%dc,(%%a0)\n"
-+		     "lea	0x10(%%a0),%%a0\n"
-+		     "cmpa%.l	%%a0,%%a1\n"
-+		     "bne.b	1b\n"
-+		     "movec	%2,%%cacr\n"
-+		     : /* no return */
-+		     : "a" (__pa(vstart)), "a" (__pa(vend)),
-+		       "r" (shadow_cacr),
-+		       "i" (CF_CACR_SPA)
-+		     : "a0", "a1", "d0");
-+}
-+
-+/**
-+ * cf_icache_flush_range - Push dirty inst cache in range out and invalidate
-+ * @vstart - starting virtual address
-+ * @vend: ending virtual address
-+ *
-+ * Push the any dirty instr lines starting at paddr for len bytes and
-+ * invalidate those lines.  This should just be an invalidate since you
-+ * shouldn't be able to have dirty instruction cache.
-  */
--extern void cache_push_v(unsigned long vaddr, int len);
-+static inline void cf_icache_flush_range(unsigned long vstart, unsigned long vend)
-+{
-+	/* align on set boundary */
-+	vstart &= 0xfffffff0;
-+	vend = (vend + (CACHE_LINE_SIZE-1)) & 0xfffffff0;
-+
-+	asm volatile("nop\n"
-+		     "move%.l   %2,%%d0\n"
-+		     "or%.l	%3,%%d0\n"
-+		     "movec	%%d0,%%cacr\n"
-+		     "move%.l	%0,%%a0\n"
-+		     "move%.l	%1,%%a1\n"
-+		     "1:\n"
-+		     "cpushl	%%ic,(%%a0)\n"
-+		     "lea	0x10(%%a0),%%a0\n"
-+		     "cmpa%.l	%%a0,%%a1\n"
-+		     "bne.b	1b\n"
-+		     "movec	%2,%%cacr\n"
-+		     : /* no return */
-+		     : "a" (__pa(vstart)), "a" (__pa(vend)),
-+		       "r" (shadow_cacr),
-+		       "i" (CF_CACR_SPA)
-+		     : "a0", "a1", "d0");
-+}
- 
--/* This is needed whenever the virtual mapping of the current
--   process changes.  */
-+/**
-+ * flush_cache_mm - Flush an mm_struct
-+ * @mm: mm_struct to flush
-+ */
-+static inline void flush_cache_mm(struct mm_struct *mm)
-+{
-+	if (mm == current->mm)
-+		flush_bcache();
-+}
- 
-+#define flush_cache_dup_mm(mm)	flush_cache_mm(mm)
- 
--#define flush_cache_all()		do { } while (0)
--#define flush_cache_mm(mm)		do { } while (0)
--#define flush_cache_range(mm, a, b)	do { } while (0)
--#define flush_cache_page(vma, vmaddr, pfn)	do { } while (0)
--
--#define flush_dcache_range(paddr, len)	do { } while (0)
--
--/* Push the page at kernel virtual address and clear the icache */
--/* use cpush %bc instead of cpush %dc, cinv %ic */
--#define flush_page_to_ram(page) __flush_page_to_ram((void *) page_address(page))
--extern inline void __flush_page_to_ram(void *address)
--{
--  unsigned long set;
--  unsigned long start_set;
--  unsigned long end_set;
--  unsigned long addr = (unsigned long) address;
--
--  addr &= ~(PAGE_SIZE - 1); /* round down to page start address */
--
--  start_set = addr & _ICACHE_SET_MASK;
--  end_set = (addr + PAGE_SIZE-1) & _ICACHE_SET_MASK;
--
--  if (start_set > end_set) {
--    /* from the begining to the lowest address */
--    for (set = 0; set <= end_set; set += (0x10 - 3))
--      asm volatile("cpushl %%bc,(%0)\n"
--		   "\taddq%.l #1,%0\n"
--		   "\tcpushl %%bc,(%0)\n"
--		   "\taddq%.l #1,%0\n"
--		   "\tcpushl %%bc,(%0)\n"
--		   "\taddq%.l #1,%0\n"
--		   "\tcpushl %%bc,(%0)" : : "a" (set));
--
--    /* next loop will finish the cache ie pass the hole */
--    end_set = LAST_ICACHE_ADDR;
--  }
--  for (set = start_set; set <= end_set; set += (0x10 - 3))
--    asm volatile("cpushl %%bc,(%0)\n"
--		 "\taddq%.l #1,%0\n"
--		 "\tcpushl %%bc,(%0)\n"
--		 "\taddq%.l #1,%0\n"
--		 "\tcpushl %%bc,(%0)\n"
--		 "\taddq%.l #1,%0\n"
--		 "\tcpushl %%bc,(%0)" : : "a" (set));
--}
--
--#define flush_dcache_page(page)			do { } while (0)
--#define flush_icache_page(vma, pg)		do { } while (0)
--#define flush_icache_user_range(adr, len)	do { } while (0)
--/* NL */
--#define flush_icache_user_page(vma, page, addr, len)	do { } while (0)
--
--/* Push n pages at kernel virtual address and clear the icache */
--/* use cpush %bc instead of cpush %dc, cinv %ic */
--extern inline void flush_icache_range(unsigned long address,
--				      unsigned long endaddr)
--{
--  unsigned long set;
--  unsigned long start_set;
--  unsigned long end_set;
--
--  start_set = address & _ICACHE_SET_MASK;
--  end_set = endaddr & _ICACHE_SET_MASK;
--
--  if (start_set > end_set) {
--    /* from the begining to the lowest address */
--    for (set = 0; set <= end_set; set += (0x10 - 3))
--      asm volatile("cpushl %%ic,(%0)\n"
--		   "\taddq%.l #1,%0\n"
--		   "\tcpushl %%ic,(%0)\n"
--		   "\taddq%.l #1,%0\n"
--		   "\tcpushl %%ic,(%0)\n"
--		   "\taddq%.l #1,%0\n"
--		   "\tcpushl %%ic,(%0)" : : "a" (set));
--
--    /* next loop will finish the cache ie pass the hole */
--    end_set = LAST_ICACHE_ADDR;
--  }
--  for (set = start_set; set <= end_set; set += (0x10 - 3))
--    asm volatile("cpushl %%ic,(%0)\n"
--		 "\taddq%.l #1,%0\n"
--		 "\tcpushl %%ic,(%0)\n"
--		 "\taddq%.l #1,%0\n"
--		 "\tcpushl %%ic,(%0)\n"
--		 "\taddq%.l #1,%0\n"
--		 "\tcpushl %%ic,(%0)" : : "a" (set));
-+/**
-+ * flush_cache_range - Flush a cache range
-+ * @vma: vma struct
-+ * @start: Starting address
-+ * @end: Ending address
-+ *
-+ * flush_cache_range must be a macro to avoid a dependency on
-+ * linux/mm.h which includes this file.
-+ */
-+static inline void flush_cache_range(struct vm_area_struct *vma,
-+	unsigned long start, unsigned long end)
-+{
-+	if (vma->vm_mm == current->mm)
-+		cf_cache_flush_range(start, end);
- }
- 
-+/**
-+ * flush_cache_page - Flush a page of the cache
-+ * @vma: vma struct
-+ * @vmaddr:
-+ * @pfn: page numer
-+ *
-+ * flush_cache_page must be a macro to avoid a dependency on
-+ * linux/mm.h which includes this file.
-+ */
-+static inline void flush_cache_page(struct vm_area_struct *vma,
-+	unsigned long vmaddr, unsigned long pfn)
-+{
-+	if (vma->vm_mm == current->mm)
-+		cf_cache_flush_range(vmaddr, vmaddr+PAGE_SIZE);
-+}
-+
-+/**
-+ * __flush_page_to_ram - Push a page out of the cache
-+ * @vaddr: Virtual address at start of page
-+ *
-+ * Push the page at kernel virtual address *vaddr* and clear
-+ * the icache.
-+ */
-+static inline void __flush_page_to_ram(void *vaddr)
-+{
-+	asm volatile("nop\n"
-+		     "move%.l   %2,%%d0\n"
-+		     "or%.l	%3,%%d0\n"
-+		     "movec	%%d0,%%cacr\n"
-+		     "move%.l	%0,%%d0\n"
-+		     "and%.l	#0xfffffff0,%%d0\n"
-+		     "move%.l	%%d0,%%a0\n"
-+		     "move%.l	%1,%%d0\n"
-+		     "1:\n"
-+		     "cpushl	%%bc,(%%a0)\n"
-+		     "lea	0x10(%%a0),%%a0\n"
-+		     "subq%.l	#1,%%d0\n"
-+		     "bne.b	1b\n"
-+		     "movec	%2,%%cacr\n"
-+		     : : "a" (__pa(vaddr)), "i" (PAGE_SIZE / CACHE_LINE_SIZE),
-+			 "r" (shadow_cacr), "i" (CF_CACR_SPA)
-+		     : "a0", "d0");
-+}
-+
-+/*
-+ * Various defines for the kernel.
-+ */
-+
-+extern void cache_clear(unsigned long paddr, int len);
-+extern void cache_push(unsigned long paddr, int len);
-+extern void flush_icache_range(unsigned long address, unsigned long endaddr);
-+
-+#define flush_cache_all()			flush_bcache()
-+#define flush_cache_vmap(start, end)		flush_bcache()
-+#define flush_cache_vunmap(start, end)		flush_bcache()
-+
-+#define flush_dcache_range(vstart, vend)	cf_dcache_flush_range(vstart, vend)
-+#define flush_dcache_page(page)			__flush_page_to_ram(page_address(page))
-+#define flush_dcache_mmap_lock(mapping)		do { } while (0)
-+#define flush_dcache_mmap_unlock(mapping)	do { } while (0)
-+
-+#define flush_icache_page(vma, page)		__flush_page_to_ram(page_address(page))
-+
-+/**
-+ * copy_to_user_page - Copy memory to user page
-+ */
- static inline void copy_to_user_page(struct vm_area_struct *vma,
- 				     struct page *page, unsigned long vaddr,
- 				     void *dst, void *src, int len)
- {
- 	memcpy(dst, src, len);
--	flush_icache_user_page(vma, page, vaddr, len);
-+	cf_cache_flush(page_to_phys(page), PAGE_SIZE);
- }
-+
-+/**
-+ * copy_from_user_page - Copy memory from user page
-+ */
- static inline void copy_from_user_page(struct vm_area_struct *vma,
- 				       struct page *page, unsigned long vaddr,
- 				       void *dst, void *src, int len)
- {
-+	cf_cache_flush(page_to_phys(page), PAGE_SIZE);
- 	memcpy(dst, src, len);
- }
- 
--#define flush_cache_dup_mm(mm)			flush_cache_mm(mm)
--#define flush_cache_vmap(start, end)		flush_cache_all()
--#define flush_cache_vunmap(start, end)		flush_cache_all()
--#define flush_dcache_mmap_lock(mapping)		do { } while (0)
--#define flush_dcache_mmap_unlock(mapping)	do { } while (0)
--
- #endif /* M68K_CF_CACHEFLUSH_H */
---- a/include/asm-m68k/cfcache.h
-+++ b/include/asm-m68k/cfcache.h
-@@ -1,19 +1,32 @@
- /*
-- * include/asm-m68k/cfcache.h
-+ * include/asm-m68k/cfcache.h - Coldfire Cache Controller
-+ *
-+ * Kurt Mahan kmahan@freescale.com
-+ *
-+ * Copyright Freescale Semiconductor, Inc. 2007
-+ *
-+ * 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.
-  */
- #ifndef CF_CFCACHE_H
- #define CF_CFCACHE_H
- 
-+/*
-+ * CACR Cache Control Register
-+ */
- #define CF_CACR_DEC         (0x80000000) /* Data Cache Enable                */
- #define CF_CACR_DW          (0x40000000) /* Data default Write-protect       */
- #define CF_CACR_DESB        (0x20000000) /* Data Enable Store Buffer         */
--#define CF_CACR_DDPI        (0x10000000) /* Data Disable CPUSHL Invalidate   */
-+#define CF_CACR_DPI         (0x10000000) /* Data Disable CPUSHL Invalidate   */
- #define CF_CACR_DHLCK       (0x08000000) /* 1/2 Data Cache Lock Mode         */
- #define CF_CACR_DDCM_00     (0x00000000) /* Cacheable writethrough imprecise */
- #define CF_CACR_DDCM_01     (0x02000000) /* Cacheable copyback               */
- #define CF_CACR_DDCM_10     (0x04000000) /* Noncacheable precise             */
- #define CF_CACR_DDCM_11     (0x06000000) /* Noncacheable imprecise           */
- #define CF_CACR_DCINVA      (0x01000000) /* Data Cache Invalidate All        */
-+#define CF_CACR_DDSP        (0x00800000) /* Data default supervisor-protect  */
- #define CF_CACR_IVO         (0x00100000) /* Invalidate only                  */
- #define CF_CACR_BEC         (0x00080000) /* Branch Cache Enable              */
- #define CF_CACR_BCINVA      (0x00040000) /* Branch Cache Invalidate All      */
-@@ -24,61 +37,43 @@
- #define CF_CACR_IHLCK       (0x00000800) /* 1/2 Instruction Cache Lock Mode  */
- #define CF_CACR_IDCM        (0x00000400) /* Noncacheable Instr default mode  */
- #define CF_CACR_ICINVA      (0x00000100) /* Instr Cache Invalidate All       */
-+#define CF_CACR_IDSP	    (0x00000080) /* Ins default supervisor-protect   */
- #define CF_CACR_EUSP        (0x00000020) /* Switch stacks in user mode       */
- 
--#define DCACHE_LINE_SIZE 0x0010     /* bytes per line        */
--#define DCACHE_WAY_SIZE  0x2000     /* words per cache block */
--#define CACHE_DISABLE_MODE (CF_CACR_DCINVA+CF_CACR_BCINVA+CF_CACR_ICINVA)
--#ifdef CONFIG_M5445X_DISABLE_CACHE
--/* disable cache for testing rev0 silicon */
--#define CACHE_INITIAL_MODE (CF_CACR_EUSP)
--#else
--#define CACHE_INITIAL_MODE (CF_CACR_DEC+CF_CACR_BEC+CF_CACR_IEC+CF_CACR_EUSP)
--#endif
--
--#define _DCACHE_SIZE (2*16384)
--#define _ICACHE_SIZE (2*16384)
--
--#define _SET_SHIFT 4
--
-+#ifdef CONFIG_M54455
- /*
-- * Masks for cache sizes.  Programming note: because the set size is a
-- * power of two, the mask is also the last address in the set.
-- * This may need to be #ifdef for other Coldfire processors.
-+ * M5445x Cache Configuration
-+ *	- cache line size is 16 bytes
-+ *	- cache is 4-way set associative
-+ *	- each cache has 256 sets (64k / 16bytes / 4way)
-+ *	- I-Cache size is 16KB
-+ *	- D-Cache size is 16KB
-  */
-+#define ICACHE_SIZE 0x4000		/* instruction - 16k */
-+#define DCACHE_SIZE 0x4000		/* data - 16k */
- 
--#define _DCACHE_SET_MASK ((_DCACHE_SIZE/64-1)<<_SET_SHIFT)
--#define _ICACHE_SET_MASK ((_ICACHE_SIZE/64-1)<<_SET_SHIFT)
--#define LAST_DCACHE_ADDR _DCACHE_SET_MASK
--#define LAST_ICACHE_ADDR _ICACHE_SET_MASK
--
-+#define CACHE_LINE_SIZE 0x0010		/* 16 bytes */
-+#define CACHE_SETS 0x0100		/* 256 sets */
-+#define CACHE_WAYS 0x0004		/* 4 way */
-+
-+#define CACHE_DISABLE_MODE	(CF_CACR_DCINVA+	\
-+				 CF_CACR_BCINVA+	\
-+				 CF_CACR_ICINVA)
-+
-+#ifndef CONFIG_M5445X_DISABLE_CACHE
-+#define CACHE_INITIAL_MODE 	(CF_CACR_DEC+		\
-+				 CF_CACR_BEC+		\
-+				 CF_CACR_IEC+		\
-+				 CF_CACR_EUSP)
-+#else
-+/* cache disabled for testing */
-+#define CACHE_INITIAL_MODE 	(CF_CACR_EUSP)
-+#endif /* CONFIG_M5445X_DISABLE_CACHE */
-+#endif /* CONFIG_M54455 */
- 
- #ifndef __ASSEMBLY__
- 
--extern void DcacheFlushInvalidate(void);
--
--extern void DcacheDisable(void);
--extern void DcacheEnable(void);
--
--/******************************************************************************/
--/*** Unimplemented Cache functionality                                      ***/
--/******************************************************************************/
--#define preDcacheInvalidateBlockMark()
--#define postDcacheInvalidateBlockMark()
--#define DcacheZeroBlock(p, l)           fast_bzero((char *)(p), (long)(l))
--#define loadDcacheInvalidateBlock()     ASSERT(!"Not Implemented on V4e")
--#define IcacheInvalidateBlock()         ASSERT(!"Not Implemented on V4e")
--
--/******************************************************************************/
--/*** Redundant Cache functionality on ColdFire                              ***/
--/******************************************************************************/
--#define DcacheInvalidateBlock(p, l) DcacheFlushInvalidateCacheBlock(p, l)
--#define DcacheFlushCacheBlock(p, l) DcacheFlushInvalidateCacheBlock(p, l)
--#define DcacheFlushBlock(p, l)      DcacheFlushInvalidateCacheBlock(p, l)
--
--extern void DcacheFlushInvalidateCacheBlock(void *start, unsigned long size);
--extern void FLASHDcacheFlushInvalidate(void);
--
-+extern unsigned long shadow_cacr;
- extern void cacr_set(unsigned long x);
- 
- #endif /* !__ASSEMBLY__ */
diff --git a/target/linux/coldfire/patches/024-m5445x_enable_cache_store.patch b/target/linux/coldfire/patches/024-m5445x_enable_cache_store.patch
deleted file mode 100644
index e0b9c8033..000000000
--- a/target/linux/coldfire/patches/024-m5445x_enable_cache_store.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 96de11ad11db226423d364a75cc82c6118a18a1f Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Tue, 4 Dec 2007 00:04:21 -0700
-Subject: [PATCH] Enable Cache Store Buffer.
-
-LTIBName: m5445x-enable-cache-store
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/coldfire/config.c |    2 ++
- include/asm-m68k/cfcache.h  |    1 +
- 2 files changed, 3 insertions(+), 0 deletions(-)
-
---- a/arch/m68k/coldfire/config.c
-+++ b/arch/m68k/coldfire/config.c
-@@ -21,6 +21,7 @@
- #include <asm/machdep.h>
- #include <asm/coldfire.h>
- #include <asm/cfcache.h>
-+#include <asm/cacheflush.h>
- #include <asm/bootinfo.h>
- #include <asm/io.h>
- #include <asm/cfmmu.h>
-@@ -165,6 +166,7 @@ asmlinkage void __init cf_early_init(voi
- 		+ sizeof(record->data[0]) + sizeof(record->data[1]);
- 
- 	/* Invalidate caches via CACR */
-+	flush_bcache();
- 	cacr_set(CACHE_DISABLE_MODE);
- 
- 	/* Turn on caches via CACR, enable EUSP */
---- a/include/asm-m68k/cfcache.h
-+++ b/include/asm-m68k/cfcache.h
-@@ -64,6 +64,7 @@
- #define CACHE_INITIAL_MODE 	(CF_CACR_DEC+		\
- 				 CF_CACR_BEC+		\
- 				 CF_CACR_IEC+		\
-+				 CF_CACR_DESB+		\
- 				 CF_CACR_EUSP)
- #else
- /* cache disabled for testing */
diff --git a/target/linux/coldfire/patches/025-m5445x_usb_autosuspend_delay.patch b/target/linux/coldfire/patches/025-m5445x_usb_autosuspend_delay.patch
deleted file mode 100644
index 39f4e6a38..000000000
--- a/target/linux/coldfire/patches/025-m5445x_usb_autosuspend_delay.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 2ff438b85bd3f34f31886883d9dacbd15bc16df8 Mon Sep 17 00:00:00 2001
-From: Bruce Schmid <duck@freescale.com>
-Date: Tue, 4 Dec 2007 11:30:14 -0700
-Subject: [PATCH] USB: restore usb_autosuspend_delay
-
-LTIBName: m5445x-usb-autosuspend-delay
-Signed-off-by: Duck <duck@freescale.com>
----
- drivers/usb/core/usb.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
---- a/drivers/usb/core/usb.c
-+++ b/drivers/usb/core/usb.c
-@@ -52,7 +52,7 @@ static int nousb;	/* Disable USB when bu
- struct workqueue_struct *ksuspend_usb_wq;
- 
- #ifdef	CONFIG_USB_SUSPEND
--static int usb_autosuspend_delay = -1;		/* Default delay value,
-+static int usb_autosuspend_delay = 2;		/* Default delay value,
- 						 * in seconds */
- module_param_named(autosuspend, usb_autosuspend_delay, int, 0644);
- MODULE_PARM_DESC(autosuspend, "default autosuspend delay");
diff --git a/target/linux/coldfire/patches/026-m5445x_usb_cleanup_2.patch b/target/linux/coldfire/patches/026-m5445x_usb_cleanup_2.patch
deleted file mode 100644
index 634e9dfc6..000000000
--- a/target/linux/coldfire/patches/026-m5445x_usb_cleanup_2.patch
+++ /dev/null
@@ -1,470 +0,0 @@
-From b014a8a0b66b1f0f55b3384f586f43e67e6dcc5d Mon Sep 17 00:00:00 2001
-From: Bruce Schmid <duck@freescale.com>
-Date: Tue, 4 Dec 2007 16:03:17 -0700
-Subject: [PATCH] USB: cleanup
-
-LTIBName: m5445x-usb-cleanup-2
-Signed-off-by: Duck <duck@freescale.com>
----
- drivers/usb/gadget/mcf5445x_udc.c |   14 ---
- drivers/usb/host/ehci-arc.c       |   19 +---
- drivers/usb/otg/fsl_otg.c         |  225 ++-----------------------------------
- drivers/usb/otg/otg_fsm.h         |    2 +-
- include/linux/usb/fsl_usb2.h      |    5 +-
- 5 files changed, 15 insertions(+), 250 deletions(-)
-
---- a/drivers/usb/gadget/mcf5445x_udc.c
-+++ b/drivers/usb/gadget/mcf5445x_udc.c
-@@ -321,11 +321,6 @@ static void pullup_enable(struct fsl_udc
- 	temp = fsl_readl(&dr_regs->usbcmd);
- 	temp |= USB_CMD_RUN_STOP;
- 	fsl_writel(temp, &dr_regs->usbcmd);
--
--#ifdef NEVER /* DDD FIXME: we want this? */
--	if (!udc->transceiver)
--		*((u16 *)(MCF_FBCS1_CSAR)) &= ~0x1; /* Enable pullup register */
--#endif
- }
- 
- static void pullup_disable(struct fsl_udc *udc)
-@@ -345,12 +340,6 @@ static void pullup_disable(struct fsl_ud
- 	tmp = fsl_readl(&dr_regs->usbcmd);
- 	tmp &= ~USB_CMD_RUN_STOP;
- 	fsl_writel(tmp, &dr_regs->usbcmd);
--
--#ifdef NEVER /* DDD FIXME: we want this? */
--	if (!udc->transceiver)
--		*((u16 *)(MCF_FBCS1_CSAR)) |= 0x1; /* Disable pullup register */
--#endif
--
- }
- 
- static void dr_controller_run(struct fsl_udc *udc)
-@@ -2598,9 +2587,6 @@ static int __init fsl_udc_probe(struct p
- 		ret = -ENOMEM;
- 		goto err4;
- 	}
--#if 0 // DDD why this? hoarks OTG host
--	pullup_disable(udc);
--#endif
- 
- 	create_proc_file();
- 	return 0;
---- a/drivers/usb/host/ehci-arc.c
-+++ b/drivers/usb/host/ehci-arc.c
-@@ -378,25 +378,14 @@ static int ehci_fsl_drv_resume(struct pl
- 
- 	memcpy(ehci->regs, (void *)&usb_ehci_regs, sizeof(struct ehci_regs));
- 
--#if 0 // DDD test
--	ehci_writel(ehci, usb_ehci_portsc, &ehci->regs->port_status[0]);
--	printk("set portsc %08x  %08x\n", usb_ehci_portsc,
--		ehci_readl(ehci,  &ehci->regs->port_status[0]));
--	printk("set usbmode %08x\n", 
--		ehci_readl(ehci,  &ehci->regs + FSL_SOC_USB_USBMODE));
--
- 	tmp = USBMODE_CM_HOST | (pdata->es ? USBMODE_ES : 0);
- 	ehci_writel(ehci, tmp, hcd->regs + FSL_SOC_USB_USBMODE);
--#else
--	tmp = USBMODE_CM_HOST | (pdata->es ? USBMODE_ES : 0);
--	ehci_writel(ehci, tmp, hcd->regs + FSL_SOC_USB_USBMODE);
--	printk("tmp %08x  set usbmode %08x\n", tmp,
--		ehci_readl(ehci,  hcd->regs + FSL_SOC_USB_USBMODE));
-+	pr_debug("tmp %08x  set usbmode %08x\n", tmp,
-+		 ehci_readl(ehci, hcd->regs + FSL_SOC_USB_USBMODE));
- 
- 	ehci_writel(ehci, usb_ehci_portsc, &ehci->regs->port_status[0]);
--	printk("set portsc %08x  %08x\n", usb_ehci_portsc,
--		ehci_readl(ehci,  &ehci->regs->port_status[0]));
--#endif
-+	pr_debug("set portsc %08x  %08x\n", usb_ehci_portsc,
-+		 ehci_readl(ehci, &ehci->regs->port_status[0]));
- 
- 	set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
- 	hcd->state = HC_STATE_RUNNING;
---- a/drivers/usb/otg/fsl_otg.c
-+++ b/drivers/usb/otg/fsl_otg.c
-@@ -98,6 +98,7 @@ static struct fsl_otg_config fsl_otg_ini
- 	.otg_port = 1,
- };
- 
-+#if 0
- static void dump_state(const char *string, struct otg_fsm *fsm)
- {
- 	printk(KERN_DEBUG "%s\n\tOTG state: %s\n", string,
-@@ -135,6 +136,7 @@ static void dump_state(const char *strin
- 	printk(KERN_DEBUG "\tb_sess_vld: %d\n", fsm->b_sess_vld);
- 	printk(KERN_DEBUG "\tid: %d\n", fsm->id);
- }
-+#endif
- 
- 
- /* Routines to access transceiver ULPI registers */
-@@ -537,6 +539,7 @@ int fsl_otg_start_gadget(struct otg_fsm 
- 	return 0;
- }
- 
-+#if 0
- static void fsl_otg_enable(struct otg_transceiver *otg_p)
- {
- 	struct fsl_otg *otg_dev = container_of(otg_p, struct fsl_otg, otg);
-@@ -549,7 +552,7 @@ static void fsl_otg_enable(struct otg_tr
- 	otg_sc |= OTGSC_INTERRUPT_ENABLE_BITS_MASK;
- 	otg_sc &= ~OTGSC_IE_1ms_TIMER;
- 	otg_sc &= ~OTGSC_CTRL_VBUS_DISCHARGE;
--	otg_sc |= OTGSC_IE_USB_ID;	/* DDD added this */
-+	otg_sc |= OTGSC_IE_USB_ID;
- 	fsl_writel(otg_sc, &usb_dr_regs->otgsc);
- 
- 	fsm->id = (otg_sc & OTGSC_STS_USB_ID) ? 1 : 0;
-@@ -570,6 +573,7 @@ static void fsl_otg_enable(struct otg_tr
- 	fsm->a_sess_vld = (otg_sc & OTGSC_STS_A_SESSION_VALID) ? 1 : 0;
- 	fsm->b_sess_end = (otg_sc & OTGSC_STS_B_SESSION_END) ? 1 : 0;
- }
-+#endif
- 
- /*
-  * Called by initialization code of host driver.  Register host controller
-@@ -577,34 +581,6 @@ static void fsl_otg_enable(struct otg_tr
-  */
- static int fsl_otg_set_host(struct otg_transceiver *otg_p, struct usb_bus *host)
- {
--#if 0 // DDD beta-final
--	struct fsl_otg *otg_dev = container_of(otg_p, struct fsl_otg, otg);
--	struct device *dev = host->controller;
--
--	if (!otg_p || otg_dev != fsl_otg_dev)
--		return -ENODEV;
--
--	otg_p->host = host;
--	otg_p->host->is_b_host = otg_dev->fsm.id;
--
--	otg_dev->fsm.a_bus_drop = 0;
--	otg_dev->fsm.a_bus_req = 1;
--
--	otg_p->host->otg_port = fsl_otg_initdata.otg_port;
--
--	if (dev && dev->driver) {
--		VDBG("suspending host\n");
--		dev->driver->suspend(dev, PMSG_SUSPEND);
--		otg_dev->host_working = 0;
--		VDBG("back\n");
--	}
--
--
--	/* dump_state("set_host running statemachine", &otg_dev->fsm); DDD */
--	otg_statemachine(&otg_dev->fsm);
--
--	return 0;
--#else
- 	struct fsl_otg *otg_dev = container_of(otg_p, struct fsl_otg, otg);
- 
- 	if (!otg_p || otg_dev != fsl_otg_dev)
-@@ -644,7 +620,6 @@ static int fsl_otg_set_host(struct otg_t
- 	otg_statemachine(&otg_dev->fsm);
- 
- 	return 0;
--#endif
- }
- 
- /* Called by initialization code of udc.  Register udc to OTG.*/
-@@ -673,12 +648,6 @@ static int fsl_otg_set_peripheral(struct
- 
- 	otg_dev->fsm.b_bus_req = 1;
- 
--#if 0 /* DDD uClinux */
--	if (otg_p->host) {
--		fsl_otg_enable(otg_p);
--		otg_statemachine(&otg_dev->fsm);
--	}
--#endif
- 	/* start the gadget right away if the ID pin says Mini-B */
- 	DBG("ID pin=%d\n", otg_dev->fsm.id);
- 	if (otg_dev->fsm.id == 1) {
-@@ -815,162 +784,6 @@ irqreturn_t fsl_otg_isr(int irq, void *d
- }
- 
- 
--#if 0 // DDD feta-final
--irqreturn_t foo_fsl_otg_isr(int irq, void *dev_id)
--{
--	struct otg_fsm *fsm = &((struct fsl_otg *)dev_id)->fsm;
--	struct otg_transceiver *otg = &((struct fsl_otg *)dev_id)->otg;
--	u32 otg_int_src, usb_int_src, otg_sc;
--	int trigger = 0;
--	int tmp;
--
--	usb_int_src = fsl_readl(&usb_dr_regs->usbsts);
--	otg_sc = fsl_readl(&usb_dr_regs->otgsc);
--	otg_int_src = otg_sc & OTGSC_INTSTS_MASK & (otg_sc >> 8);
--
--	/* Only clear otg interrupts */
--	fsl_writel(otg_sc, &usb_dr_regs->otgsc);
--
--	/*FIXME: ID change not generate when init to 0 */
--	/* process OTG interrupts */
--	if (otg_int_src) {
--		VDBG("\nOTG irq 0x%08x\n", otg_int_src);
--		if (otg_int_src & OTGSC_INTSTS_1MS_TIMER)
--			trigger = fsl_otg_tick_timer();
--
--		if (otg_int_src & OTGSC_INTSTS_USB_ID) {
--			fsm->id = (otg_sc & OTGSC_STS_USB_ID) ? 1 : 0;
--			otg->default_a = (fsm->id == 0);
--			if (otg->host)
--				otg->host->is_b_host = fsm->id;
--			if (otg->gadget)
--				otg->gadget->is_a_peripheral = !fsm->id;
--			VDBG("IRQ=ID now=%d\n", fsm->id);
--
--			if (fsm->id) {	/* switch to gadget */
--				schedule_delayed_work(&((struct fsl_otg *)
--							dev_id)->otg_event, 25);
--			} else {	/* switch to host */
--				cancel_delayed_work(&
--						    ((struct fsl_otg *)dev_id)->
--						    otg_event);
--				fsl_otg_start_gadget(fsm, 0);
--				fsl_otg_drv_vbus(1);
--				fsl_otg_start_host(fsm, 1);
--			}
--
--			return IRQ_HANDLED;
--		}
--		if (otg_int_src & OTGSC_INTSTS_DATA_PULSE) {
--			fsm->a_srp_det = 1;
--			trigger = 1;
--			VDBG("!!!!Data pulse int\n");
--		}
--		if (otg_int_src & OTGSC_INTSTS_A_SESSION_VALID) {
--			fsm->a_sess_vld =
--			    (otg_sc & OTGSC_STS_A_SESSION_VALID) ? 1 : 0;
--			/* detect VBUS pulsing */
--			if ((fsm->transceiver->state == OTG_STATE_A_IDLE)
--			    && fsm->a_sess_vld)
--				fsm->a_srp_det = 1;
--			trigger = 1;
--			VDBG("!!!a_sess_vld int state=%d\n", fsm->a_sess_vld);
--		}
--		if (otg_int_src & OTGSC_INTSTS_A_VBUS_VALID) {
--			fsm->a_vbus_vld = !!(otg_sc & OTGSC_STS_A_VBUS_VALID);
--			trigger = 1;
--			VDBG("!!!a_vbus_vld int state=%d\n", fsm->a_vbus_vld);
--
--#if 1
--		if ((fsm->a_vbus_vld == 0) && (fsm->id == 0)) {
--			if (fsm->transceiver->state != OTG_STATE_A_WAIT_VFALL)
--				/* Warning insted of transfer to Error state. */
--				printk(KERN_WARNING "ulpi: The USB Device is "
--				       "sinking too much current!!\n");
--			fsm->a_vbus_vld = 1;
--		}
--#endif
--
--
--		}
--		if (otg_int_src & OTGSC_INTSTS_B_SESSION_VALID) {
--			fsm->b_sess_vld =
--			    (otg_sc & OTGSC_STS_B_SESSION_VALID) ? 1 : 0;
--			trigger = 1;
--			/* SRP done */
--			if ((fsl_otg_dev->otg.state == OTG_STATE_B_SRP_INIT) &&
--			    fsm->b_sess_vld && srp_wait_done)
--				fsm->b_srp_done = 1;
--			VDBG("!!!!b_sess_vld int state=%d\n", fsm->b_sess_vld);
--		}
--		if (otg_int_src & OTGSC_INTSTS_B_SESSION_END) {
--			fsm->b_sess_end =
--			    (otg_sc & OTGSC_STS_B_SESSION_END) ? 1 : 0;
--			trigger = 1;
--			VDBG("!!!!b_sess_end int state=%d\n", fsm->b_sess_end);
--		}
--	}
--
--	/* process USB interrupts */
--	if ((usb_int_src & USB_STS_PORT_CHANGE)
--	    && (fsm->protocol == PROTO_HOST)) {
--		VDBG("\nUSB irq A 0x%08x\n", usb_int_src);
--		/* Device resume do not generate statemachine change */
--		if (fsl_readl(&usb_dr_regs->portsc1) &
--		    PORTSCX_PORT_FORCE_RESUME) {
--			if (otg->default_a) {
--				fsm->b_bus_resume = 1;
--				trigger = 1;
--			} else {
--				fsm->a_bus_resume = 1;
--				trigger = 1;
--			}
--		}
--
--		tmp = (fsl_readl(&usb_dr_regs->portsc1) &
--		       PORTSCX_CURRENT_CONNECT_STATUS) ? 1 : 0;
--		if (otg->default_a && (fsm->b_conn != tmp)) {
--			fsm->b_conn = tmp;
--			trigger = 1;
--		} else if (!otg->default_a && (fsm->a_conn != tmp)) {
--			fsm->a_conn = tmp;
--			trigger = 1;
--		}
--	}
--	/* Workaround: sometimes CSC bit will lost.  We change to
--	 * polling CCS bit for connect change */
--	if (fsm->protocol == PROTO_GADGET) {
--		if (usb_int_src & USB_STS_SUSPEND) {
--			VDBG("\nUSB irq B 0x%08x\n", usb_int_src);
--			VDBG("peripheral detected suspend\n");
--			if (otg->default_a)
--				/* A-device detects B suspend */
--				fsm->b_bus_suspend = 1;
--			else
--				/* B-device detects A suspend */
--				fsm->a_bus_suspend = 1;
--			trigger = 1;
--		} else if (usb_int_src & USB_STS_PORT_CHANGE) {
--			VDBG("\nUSB irq C 0x%08x\n", usb_int_src);
--			VDBG("peripheral resumed\n");
--			if (otg->default_a)
--				fsm->b_bus_suspend = 0;
--			else
--				fsm->a_bus_suspend = 0;
--			trigger = 1;
--		}
--	}
--
--	/* Invoke statemachine until state is stable */
--	while (trigger) {
--		trigger = otg_statemachine(fsm);
--	}
--
--	return IRQ_HANDLED;
--}
--#endif
--
--
- static struct otg_fsm_ops fsl_otg_ops = {
- 	.chrg_vbus = fsl_otg_chrg_vbus,
- 	.drv_vbus = fsl_otg_drv_vbus,
-@@ -1003,7 +816,6 @@ int fsl_otg_cfg(struct platform_device *
- 	if (!fsl_otg_tc)
- 		return -ENODEV;
- 
--#if 1 // DDD
- 	if (pdata->regs) {
- 		fsl_otg_tc->dr_mem_map = pdata->regs;
- 	} else {
-@@ -1013,8 +825,10 @@ int fsl_otg_cfg(struct platform_device *
- 			return -ENODEV;
- 		}
- 
-+		/*
- 		printk("DDD %s(): rsrc_start=0x%x  rsrc_len=0x%x\n",
- 		     __FUNCTION__, res->start, res->end - res->start + 1);
-+		*/
- 
- 		if (!request_mem_region(res->start, res->end - res->start + 1,
- 					"OTG")) {
-@@ -1026,7 +840,6 @@ int fsl_otg_cfg(struct platform_device *
- 	}
- 	DBG("set dr_mem_map to 0x%p\n", fsl_otg_tc->dr_mem_map);
- 
--#endif 
- 	INIT_DELAYED_WORK(&fsl_otg_tc->otg_event, fsl_otg_event);
- 
- 	INIT_LIST_HEAD(&active_timers);
-@@ -1035,12 +848,11 @@ int fsl_otg_cfg(struct platform_device *
- 	/* Set OTG state machine operations */
- 	fsl_otg_tc->fsm.ops = &fsl_otg_ops;
- 
--#if 1 /* DDD */
- 	/* record initial state of ID pin */
- 	fsl_otg_tc->fsm.id = (fsl_otg_tc->dr_mem_map->otgsc & OTGSC_STS_USB_ID)
- 	    ? 1 : 0;
- 	DBG("initial ID pin=%d\n", fsl_otg_tc->fsm.id);
--#endif
-+
- 	/* initialize the otg structure */
- 	fsl_otg_tc->otg.label = DRIVER_DESC;
- 	fsl_otg_tc->otg.set_host = fsl_otg_set_host;
-@@ -1115,13 +927,8 @@ int usb_otg_start(struct platform_device
- 			__FUNCTION__, timeout);
- 
- 	/* configure the VBUSHS as IDLE(both host and device) */
--#if 0
--	/* DDD really have to check into setting the following */
--	fsl_writel(USB_MODE_STREAM_DISABLE, &usb_dr_regs->usbmode);
--#else
- 	temp = USB_MODE_STREAM_DISABLE | (pdata->es ? USBMODE_ES : 0);
- 	fsl_writel(temp, &usb_dr_regs->usbmode);
--#endif
- 
- 	/* configure PHY interface */
- 	temp = fsl_readl(&usb_dr_regs->portsc1);
-@@ -1135,24 +942,11 @@ int usb_otg_start(struct platform_device
- 	/* disable all interrupt and clear all OTGSC status */
- 	temp = fsl_readl(&usb_dr_regs->otgsc);
- 	temp &= ~OTGSC_INTERRUPT_ENABLE_BITS_MASK;
--#if 0 // DDD
--	/* DDD only want ID int
--	 * temp |= OTGSC_INTERRUPT_STATUS_BITS_MASK | OTGSC_CTRL_VBUS_DISCHARGE;
--	 */
--	temp |= OTGSC_IE_USB_ID;	/* DDD added this */
--	temp &= ~OTGSC_IE_1ms_TIMER;	/* DDD added this */
--#else
- 	temp |= OTGSC_INTERRUPT_STATUS_BITS_MASK | OTGSC_CTRL_VBUS_DISCHARGE;
--#endif
- 	fsl_writel(temp, &usb_dr_regs->otgsc);
- 
- 	fsl_otg_drv_vbus(0);
- 
--#if 0 // DDD beta-final
--	temp = fsl_readl(&usb_dr_regs->otgsc);
--	temp |= OTGSC_IE_A_SESSION_VALID;
--	fsl_writel(temp, &usb_dr_regs->otgsc);
--#else
- 	/*
- 	 * The identification (id) input is FALSE when a Mini-A plug is inserted
- 	 * in the devices Mini-AB receptacle. Otherwise, this input is TRUE.
-@@ -1173,7 +967,6 @@ int usb_otg_start(struct platform_device
- 	temp |= OTGSC_IE_USB_ID;
- 	temp &= ~(OTGSC_CTRL_VBUS_DISCHARGE | OTGSC_IE_1ms_TIMER);
- 	fsl_writel(temp, &usb_dr_regs->otgsc);
--#endif
- 
- 	return 0;
- }
-@@ -1427,10 +1220,8 @@ static int __init fsl_otg_probe(struct p
- 		return -ENOMEM;
- 
- 	pdata = pdev->dev.platform_data;
--#if 1 // DDD do this elsewhere
- 	/* Initialize the clock, multiplexing pin and PHY interface */
- 	board_init(pdev);
--#endif
- 
- 	/* configure the OTG */
- 	status = fsl_otg_cfg(pdev);
---- a/drivers/usb/otg/otg_fsm.h
-+++ b/drivers/usb/otg/otg_fsm.h
-@@ -18,7 +18,7 @@
- #ifndef OTG_FSM_H
- #define OTG_FSM_H
- 
--#if 1
-+#if 0
- #define DEBUG 	1
- #define VERBOSE 	1
- #endif
---- a/include/linux/usb/fsl_usb2.h
-+++ b/include/linux/usb/fsl_usb2.h
-@@ -104,9 +104,8 @@ struct fsl_usb_host_regs {
- #if 0
- 	u32 endptctrl[USB_MAX_ENDPOINTS]; /* Endpoint Control Registers */
- #else
--	// DDD: do these exits in the host register set??
--	// DDD see DCCPARAMS:DEN for the real number of device endpoints
--	// DDD 16 is the max
-+	/* DDD see DCCPARAMS:DEN for the real number of device endpoints */
-+	/* DDD 16 is the max */
- 	u32 endptctrl[16];	/* Endpoint Control Registers */
- #endif
- };
diff --git a/target/linux/coldfire/patches/027-m5445x_usb_sdram_priority.patch b/target/linux/coldfire/patches/027-m5445x_usb_sdram_priority.patch
deleted file mode 100644
index e75f092a3..000000000
--- a/target/linux/coldfire/patches/027-m5445x_usb_sdram_priority.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From b6b6d18a54e22784cb48e1953201484830d030e4 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Thu, 6 Dec 2007 14:17:46 -0700
-Subject: [PATCH] Change USB to SDRAM priority.
-
-Increase the USB priority to the maximum, above ColdfireCore,
-in the SDRAM crossbar switch.  This fixes the issues with the
-USB core not being able to transfer to memory fast enough to
-keep up with HS.
-
-LTIBName: m5445x-usb-sdram-priority
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/coldfire/config.c     |   12 ++++++
- include/asm-m68k/mcf5445x_xbs.h |   81 +++++++++++++++++++++++++++++++++++++++
- 2 files changed, 93 insertions(+), 0 deletions(-)
- create mode 100644 include/asm-m68k/mcf5445x_xbs.h
-
---- a/arch/m68k/coldfire/config.c
-+++ b/arch/m68k/coldfire/config.c
-@@ -36,6 +36,7 @@
- #include <asm/mcf5445x_sdramc.h>
- #include <asm/mcf5445x_fbcs.h>
- #include <asm/mcf5445x_dtim.h>
-+#include <asm/mcf5445x_xbs.h>
- 
- /* JKM -- testing */
- #include <linux/pfn.h>
-@@ -131,6 +132,17 @@ asmlinkage void __init cf_early_init(voi
- 	MCF_SDRAMC_SDCS(1) = (256*1024*1024) | 0x1B;
- #endif
- 
-+	/* Setup SDRAM crossbar(XBS) priorities */
-+printk(KERN_INFO "Bumping USB Priority\n");
-+	MCF_XBS_PRS2 = (MCF_XBS_PRS_M0(MCF_XBS_PRI_2) |
-+			MCF_XBS_PRS_M1(MCF_XBS_PRI_3) |
-+			MCF_XBS_PRS_M2(MCF_XBS_PRI_4) |
-+			MCF_XBS_PRS_M3(MCF_XBS_PRI_5) |
-+			MCF_XBS_PRS_M5(MCF_XBS_PRI_6) |
-+			MCF_XBS_PRS_M6(MCF_XBS_PRI_1) |
-+			MCF_XBS_PRS_M7(MCF_XBS_PRI_7));
-+	
-+
- 	m68k_machtype = MACH_CFMMU;
- 	m68k_fputype = FPU_CFV4E;
- 	m68k_mmutype = MMU_CFV4E;
---- /dev/null
-+++ b/include/asm-m68k/mcf5445x_xbs.h
-@@ -0,0 +1,81 @@
-+/*
-+ * Kurt Mahan kmahan@freescale.com
-+ *
-+ * Copyright Freescale Semiconductor, Inc. 2007
-+ *
-+ * 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.
-+ */
-+
-+#ifndef __MCF5445X_XBS_H__
-+#define __MCF5445X_XBS_H__
-+
-+/*
-+ * Crossbar Switch (XBS)
-+ */
-+
-+/* Register read/write macros */
-+#define MCF_XBS_PRS1		MCF_REG32(0xFC004100) /* Flexbus Priority */
-+#define MCF_XBS_CRS1		MCF_REG32(0xFC004110) /* Flexbus Control */
-+#define MCF_XBS_PRS2		MCF_REG32(0xFC004200) /* SDRam Priority */
-+#define MCF_XBS_CRS2		MCF_REG32(0xFC004210) /* SDRam Control */
-+#define MCF_XBS_PRS3		MCF_REG32(0xFC004300) /* ATA Priority */
-+#define MCF_XBS_CRS3		MCF_REG32(0xFC004310) /* ATA Control */
-+#define MCF_XBS_PRS4		MCF_REG32(0xFC004400) /* SRAM Priority */
-+#define MCF_XBS_CRS4		MCF_REG32(0xFC004410) /* SRAM Control */
-+#define MCF_XBS_PRS5		MCF_REG32(0xFC004500) /* PCI Priority */
-+#define MCF_XBS_CRS5		MCF_REG32(0xFC004510) /* PCI Control */
-+#define MCF_XBS_PRS6		MCF_REG32(0xFC004600) /* Slave6 Priority */
-+#define MCF_XBS_CRS6		MCF_REG32(0xFC004610) /* Slave6 Control */
-+#define MCF_XBS_PRS7		MCF_REG32(0xFC004700) /* Other Priority */
-+#define MCF_XBS_CRS7		MCF_REG32(0xFC004710) /* Other Control */
-+
-+/* Priorities */
-+#define MCF_XBS_PRI_1		0	/* Level 1 (highest) */
-+#define MCF_XBS_PRI_2		1	/* Level 2 */
-+#define MCF_XBS_PRI_3		2	/* Level 3 */
-+#define MCF_XBS_PRI_4		3	/* Level 4 */
-+#define MCF_XBS_PRI_5		4	/* Level 5 */
-+#define MCF_XBS_PRI_6		5	/* Level 6 */
-+#define MCF_XBS_PRI_7		6	/* Level 7 (lowest) */
-+#define MCF_XBS_PRI_MASK	7	/* Mask (Not a valid level) */
-+
-+/* Priority Register (PRSn) Defs */
-+#define	MCF_XBS_PRS_MACRO(m,p)	((p)<<((m)<<2))
-+#define	MCF_XBS_PRS_M0(p)	MCF_XBS_PRS_MACRO(0, p)	/* Coldfire Core */
-+#define	MCF_XBS_PRS_M1(p)	MCF_XBS_PRS_MACRO(1, p) /* eDMA */
-+#define	MCF_XBS_PRS_M2(p)	MCF_XBS_PRS_MACRO(2, p) /* FEC0 */
-+#define	MCF_XBS_PRS_M3(p)	MCF_XBS_PRS_MACRO(3, p) /* FEC1 */
-+#define	MCF_XBS_PRS_M4(p)	MCF_XBS_PRS_MACRO(4, p) /* Master 4 */
-+#define	MCF_XBS_PRS_M5(p)	MCF_XBS_PRS_MACRO(5, p) /* PCI */
-+#define	MCF_XBS_PRS_M6(p)	MCF_XBS_PRS_MACRO(6, p) /* USB OTG */
-+#define	MCF_XBS_PRS_M7(p)	MCF_XBS_PRS_MACRO(7, p) /* Serial Boot */
-+
-+/* Control Register (CRSn) Defs */
-+#define MCF_XBS_CRS_RO		0x80000000	/* Read Only */
-+#define	MCF_XBS_CRS_ARB		0x00000100	/* Arbitration Mode */
-+#define	MCF_XBS_CRS_PCTL	0x00000030	/* Parking Control */
-+#define	MCF_XBS_CRS_PARK	0x00000007	/* Park Location */
-+
-+/* MCF_XBS_CRS_ARB Defs */
-+#define MCF_ABS_CRS_ARB_FIXED	0x00000000	/* Fixed priority */
-+#define MCF_ABS_CRS_ARB_ROUND	0x00000100	/* Round Robin priority */
-+
-+/* MCF_XBS_CRS_PCTL Defs */
-+#define MCF_ABS_CRS_PCTL_PARK	0x00000000	/* Park on the defined PARK */
-+#define MCF_ABS_CRS_PCTL_LAST 	0x00000010	/* Park on the last master */
-+#define MCF_ABS_CRS_PCTL_NONE 	0x00000020	/* Don't park */
-+
-+/* MCF_XBS_CRS_PARK Defs */
-+#define MCF_ABS_CRS_PARK_M0	0x00000000	/* Park on Coldfire Core */
-+#define MCF_ABS_CRS_PARK_M1	0x00000001	/* Park on eDMA */
-+#define MCF_ABS_CRS_PARK_M2	0x00000002	/* Park on FEC0 */
-+#define MCF_ABS_CRS_PARK_M3	0x00000003	/* Park on FEC1 */
-+#define MCF_ABS_CRS_PARK_M4	0x00000004	/* Park on Reserved */
-+#define MCF_ABS_CRS_PARK_M5	0x00000005	/* Park on PCI */
-+#define MCF_ABS_CRS_PARK_M6	0x00000006	/* Park on USB OTG */
-+#define MCF_ABS_CRS_PARK_M7	0x00000007	/* Park on Serial Boot */
-+
-+#endif /* __MCF5445X_XBS_H__ */
diff --git a/target/linux/coldfire/patches/028-mcfv4e_cache_ck_0_len.patch b/target/linux/coldfire/patches/028-mcfv4e_cache_ck_0_len.patch
deleted file mode 100644
index a160f5600..000000000
--- a/target/linux/coldfire/patches/028-mcfv4e_cache_ck_0_len.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 679a5be6f06b909adccc9c588feb26bf6d6df402 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Thu, 6 Dec 2007 16:40:39 -0700
-Subject: [PATCH] Add zero length checking to cache routines.
-
-LTIBName: mcfv4e-cache-ck-0-len
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- include/asm-m68k/cf_cacheflush.h |   14 +++++++++++---
- 1 files changed, 11 insertions(+), 3 deletions(-)
-
---- a/include/asm-m68k/cf_cacheflush.h
-+++ b/include/asm-m68k/cf_cacheflush.h
-@@ -127,7 +127,9 @@ static inline void flush_bcache(void)
- static inline void cf_cache_clear(unsigned long paddr, int len)
- {
- 	/* number of lines */
--	len =  (len + (CACHE_LINE_SIZE-1)) / CACHE_LINE_SIZE;
-+	len = (len + (CACHE_LINE_SIZE-1)) / CACHE_LINE_SIZE;
-+	if (len == 0)
-+		return;
- 
- 	/* align on set boundary */
- 	paddr &= 0xfffffff0;
-@@ -161,7 +163,9 @@ static inline void cf_cache_clear(unsign
- static inline void cf_cache_push(unsigned long paddr, int len)
- {
- 	/* number of lines */
--	len =  (len + (CACHE_LINE_SIZE-1)) / CACHE_LINE_SIZE;
-+	len = (len + (CACHE_LINE_SIZE-1)) / CACHE_LINE_SIZE;
-+	if (len == 0)
-+		return;
- 
- 	/* align on set boundary */
- 	paddr &= 0xfffffff0;
-@@ -195,7 +199,9 @@ static inline void cf_cache_push(unsigne
- static inline void cf_cache_flush(unsigned long paddr, int len)
- {
- 	/* number of lines */
--	len =  (len + (CACHE_LINE_SIZE-1)) / CACHE_LINE_SIZE;
-+	len = (len + (CACHE_LINE_SIZE-1)) / CACHE_LINE_SIZE;
-+	if (len == 0)
-+		return;
- 
- 	/* align on set boundary */
- 	paddr &= 0xfffffff0;
-@@ -234,6 +240,8 @@ static inline void cf_cache_flush_range(
- 	vstart &= 0xfffffff0;
- 	vend = PAGE_ALIGN((vend + (CACHE_LINE_SIZE-1))) & 0xfffffff0;
- 	len = vend - vstart;
-+	if (len == 0)
-+		return;
- 	vstart = __pa(vstart);
- 	vend = vstart + len;
- 
diff --git a/target/linux/coldfire/patches/029-m5445x_usb_disable_debug.patch b/target/linux/coldfire/patches/029-m5445x_usb_disable_debug.patch
deleted file mode 100644
index fa7478652..000000000
--- a/target/linux/coldfire/patches/029-m5445x_usb_disable_debug.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From d6cd1bb1f60f790f8a5d410cfe40bfb344dde09b Mon Sep 17 00:00:00 2001
-From: Bruce Schmid <duck@freescale.com>
-Date: Thu, 6 Dec 2007 17:22:23 -0700
-Subject: [PATCH] USB: gadget: turn off DEBUG
-
-LTIBName: m5445x-usb-disable-debug
-Signed-off-by: Duck <duck@freescale.com>
----
- drivers/usb/gadget/mcf5445x_udc.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
---- a/drivers/usb/gadget/mcf5445x_udc.c
-+++ b/drivers/usb/gadget/mcf5445x_udc.c
-@@ -34,7 +34,7 @@
-  *
-  */
- 
--#define DEBUG
-+#undef DEBUG
- #undef VERBOSE
- 
- #include <linux/module.h>
diff --git a/target/linux/coldfire/patches/030-m5445x_usb_add_dualspeed.patch b/target/linux/coldfire/patches/030-m5445x_usb_add_dualspeed.patch
deleted file mode 100644
index d2ffa69ad..000000000
--- a/target/linux/coldfire/patches/030-m5445x_usb_add_dualspeed.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 5fb2a68befbec97dba2264b2834487c72f47095d Mon Sep 17 00:00:00 2001
-From: Bruce Schmid <duck@freescale.com>
-Date: Wed, 5 Dec 2007 14:43:19 -0700
-Subject: [PATCH] USB: add is_dualspeed.
-
-LTIBName: m5445x-usb-add-dualspeed
-Signed-off-by: Duck <duck@freescale.com>
----
- drivers/usb/gadget/mcf5445x_udc.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
---- a/drivers/usb/gadget/mcf5445x_udc.c
-+++ b/drivers/usb/gadget/mcf5445x_udc.c
-@@ -2538,6 +2538,7 @@ static int __init fsl_udc_probe(struct p
- 	 * set the fsl_udc->gadget.xxx
- 	 */
- 	udc->gadget.ops = &fsl_gadget_ops;
-+	udc->gadget.is_dualspeed = 1;
- 
- 	/* gadget.ep0 is a pointer */
- 	udc->gadget.ep0 = &udc->eps[0].ep;
diff --git a/target/linux/coldfire/patches/031-m5445x_usb_defconfig.patch b/target/linux/coldfire/patches/031-m5445x_usb_defconfig.patch
deleted file mode 100644
index e39f03f73..000000000
--- a/target/linux/coldfire/patches/031-m5445x_usb_defconfig.patch
+++ /dev/null
@@ -1,273 +0,0 @@
-From 023b850e67316fbf595bf0cda13f02fabca1f29d Mon Sep 17 00:00:00 2001
-From: Bruce Schmid <duck@freescale.com>
-Date: Fri, 7 Dec 2007 10:30:46 -0700
-Subject: [PATCH] USB: add default USB settings
-
-LTIBName: m5445x-usb-defconfig
-Signed-off-by: Duck <duck@freescale.com>
----
- arch/m68k/configs/m54455evb_defconfig |  175 +++++++++++++++++++++++++++++++--
- 1 files changed, 165 insertions(+), 10 deletions(-)
-
---- a/arch/m68k/configs/m54455evb_defconfig
-+++ b/arch/m68k/configs/m54455evb_defconfig
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
- # Linux kernel version: 2.6.23
--# Tue Nov 27 23:42:38 2007
-+# Thu Dec  6 12:14:18 2007
- #
- CONFIG_M68K=y
- CONFIG_MMU=y
-@@ -347,6 +347,7 @@ CONFIG_BLK_DEV=y
- CONFIG_BLK_DEV_LOOP=y
- # CONFIG_BLK_DEV_CRYPTOLOOP is not set
- # CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_UB is not set
- CONFIG_BLK_DEV_RAM=y
- CONFIG_BLK_DEV_RAM_COUNT=16
- CONFIG_BLK_DEV_RAM_SIZE=64000
-@@ -361,7 +362,7 @@ CONFIG_MISC_DEVICES=y
- # SCSI device support
- #
- # CONFIG_RAID_ATTRS is not set
--CONFIG_SCSI=m
-+CONFIG_SCSI=y
- CONFIG_SCSI_DMA=y
- # CONFIG_SCSI_TGT is not set
- # CONFIG_SCSI_NETLINK is not set
-@@ -370,7 +371,7 @@ CONFIG_SCSI_PROC_FS=y
- #
- # SCSI support type (disk, tape, CD-ROM)
- #
--CONFIG_BLK_DEV_SD=m
-+CONFIG_BLK_DEV_SD=y
- # CONFIG_CHR_DEV_ST is not set
- # CONFIG_CHR_DEV_OSST is not set
- # CONFIG_BLK_DEV_SR is not set
-@@ -380,7 +381,7 @@ CONFIG_BLK_DEV_SD=m
- #
- # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
- #
--# CONFIG_SCSI_MULTI_LUN is not set
-+CONFIG_SCSI_MULTI_LUN=y
- # CONFIG_SCSI_CONSTANTS is not set
- # CONFIG_SCSI_LOGGING is not set
- # CONFIG_SCSI_SCAN_ASYNC is not set
-@@ -420,6 +421,26 @@ CONFIG_NETDEV_10000=y
- #
- # CONFIG_WLAN_PRE80211 is not set
- # CONFIG_WLAN_80211 is not set
-+
-+#
-+# USB Network Adapters
-+#
-+# CONFIG_USB_CATC is not set
-+# CONFIG_USB_KAWETH is not set
-+CONFIG_USB_PEGASUS=m
-+CONFIG_USB_RTL8150=m
-+CONFIG_USB_USBNET_MII=m
-+CONFIG_USB_USBNET=m
-+CONFIG_USB_NET_AX8817X=m
-+CONFIG_USB_NET_CDCETHER=m
-+# CONFIG_USB_NET_DM9601 is not set
-+# CONFIG_USB_NET_GL620A is not set
-+# CONFIG_USB_NET_NET1080 is not set
-+# CONFIG_USB_NET_PLUSB is not set
-+# CONFIG_USB_NET_MCS7830 is not set
-+# CONFIG_USB_NET_RNDIS_HOST is not set
-+# CONFIG_USB_NET_CDC_SUBSET is not set
-+# CONFIG_USB_NET_ZAURUS is not set
- # CONFIG_WAN is not set
- # CONFIG_PPP is not set
- # CONFIG_SLIP is not set
-@@ -446,13 +467,19 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
- CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
- # CONFIG_INPUT_JOYDEV is not set
- # CONFIG_INPUT_TSDEV is not set
--# CONFIG_INPUT_EVDEV is not set
-+CONFIG_INPUT_EVDEV=y
- # CONFIG_INPUT_EVBUG is not set
- 
- #
- # Input Device Drivers
- #
--# CONFIG_INPUT_KEYBOARD is not set
-+CONFIG_INPUT_KEYBOARD=y
-+# CONFIG_KEYBOARD_ATKBD is not set
-+# CONFIG_KEYBOARD_SUNKBD is not set
-+# CONFIG_KEYBOARD_LKKBD is not set
-+# CONFIG_KEYBOARD_XTKBD is not set
-+# CONFIG_KEYBOARD_NEWTON is not set
-+# CONFIG_KEYBOARD_STOWAWAY is not set
- # CONFIG_INPUT_MOUSE is not set
- # CONFIG_INPUT_JOYSTICK is not set
- # CONFIG_INPUT_TABLET is not set
-@@ -534,6 +561,7 @@ CONFIG_SPI_COLDFIRE_SSI_AUDIO=y
- # CONFIG_VIDEO_DEV is not set
- # CONFIG_DVB_CORE is not set
- CONFIG_DAB=y
-+# CONFIG_USB_DABUSB is not set
- 
- #
- # Graphics support
-@@ -560,19 +588,144 @@ CONFIG_DUMMY_CONSOLE=y
- CONFIG_HID_SUPPORT=y
- CONFIG_HID=y
- CONFIG_HID_DEBUG=y
-+
-+#
-+# USB Input Devices
-+#
-+CONFIG_USB_HID=y
-+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-+# CONFIG_HID_FF is not set
-+# CONFIG_USB_HIDDEV is not set
- CONFIG_USB_SUPPORT=y
--# CONFIG_USB_ARCH_HAS_HCD is not set
-+CONFIG_USB_ARCH_HAS_HCD=y
- # CONFIG_USB_ARCH_HAS_OHCI is not set
--# CONFIG_USB_ARCH_HAS_EHCI is not set
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+
-+#
-+# Miscellaneous USB options
-+#
-+CONFIG_USB_DEVICEFS=y
-+# CONFIG_USB_DEVICE_CLASS is not set
-+# CONFIG_USB_DYNAMIC_MINORS is not set
-+# CONFIG_USB_OTG is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+CONFIG_USB_EHCI_HCD=m
-+CONFIG_USB_EHCI_SPLIT_ISO=y
-+CONFIG_USB_EHCI_ROOT_HUB_TT=y
-+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-+CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y
-+CONFIG_USB_EHCI_BIG_ENDIAN_DESC=y
-+# CONFIG_USB_ISP116X_HCD is not set
-+# CONFIG_USB_SL811_HCD is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+CONFIG_USB_M5445X_ULPI=y
-+# CONFIG_USB_M5445X_FSLS is not set
-+
-+#
-+# USB Device Class drivers
-+#
-+# CONFIG_USB_ACM is not set
-+# CONFIG_USB_PRINTER is not set
- 
- #
- # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
- #
- 
- #
-+# may also be needed; see USB_STORAGE Help for more information
-+#
-+CONFIG_USB_STORAGE=y
-+# CONFIG_USB_STORAGE_DEBUG is not set
-+# CONFIG_USB_STORAGE_DATAFAB is not set
-+# CONFIG_USB_STORAGE_FREECOM is not set
-+# CONFIG_USB_STORAGE_DPCM is not set
-+# CONFIG_USB_STORAGE_USBAT is not set
-+# CONFIG_USB_STORAGE_SDDR09 is not set
-+# CONFIG_USB_STORAGE_SDDR55 is not set
-+# CONFIG_USB_STORAGE_JUMPSHOT is not set
-+# CONFIG_USB_STORAGE_ALAUDA is not set
-+# CONFIG_USB_STORAGE_ONETOUCH is not set
-+# CONFIG_USB_STORAGE_KARMA is not set
-+# CONFIG_USB_LIBUSUAL is not set
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
-+# CONFIG_USB_MON is not set
-+
-+#
-+# USB port drivers
-+#
-+
-+#
-+# USB Serial Converter support
-+#
-+# CONFIG_USB_SERIAL is not set
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+# CONFIG_USB_EMI62 is not set
-+# CONFIG_USB_EMI26 is not set
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_AUERSWALD is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+# CONFIG_USB_BERRY_CHARGE is not set
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_PHIDGET is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+# CONFIG_USB_SISUSBVGA is not set
-+# CONFIG_USB_LD is not set
-+# CONFIG_USB_TRANCEVIBRATOR is not set
-+# CONFIG_USB_IOWARRIOR is not set
-+# CONFIG_USB_TEST is not set
-+
-+#
-+# USB DSL modem support
-+#
-+
-+#
- # USB Gadget Support
- #
--# CONFIG_USB_GADGET is not set
-+CONFIG_USB_GADGET=m
-+# CONFIG_USB_GADGET_DEBUG is not set
-+# 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_MCF5445X=y
-+CONFIG_USB_MCF5445X=m
-+# 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
-+# CONFIG_USB_ZERO is not set
-+CONFIG_USB_ETH=m
-+CONFIG_USB_ETH_RNDIS=y
-+CONFIG_USB_GADGETFS=m
-+CONFIG_USB_FILE_STORAGE=m
-+# CONFIG_USB_FILE_STORAGE_TEST is not set
-+# CONFIG_USB_G_SERIAL is not set
-+# CONFIG_USB_MIDI_GADGET is not set
- # CONFIG_MMC is not set
- # CONFIG_NEW_LEDS is not set
- # CONFIG_RTC_CLASS is not set
-@@ -603,7 +756,9 @@ CONFIG_USB_SUPPORT=y
- #
- # File systems
- #
--# CONFIG_EXT2_FS is not set
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
- CONFIG_EXT3_FS=y
- CONFIG_EXT3_FS_XATTR=y
- # CONFIG_EXT3_FS_POSIX_ACL is not set
diff --git a/target/linux/coldfire/patches/032-m5445x_edma_update.patch b/target/linux/coldfire/patches/032-m5445x_edma_update.patch
deleted file mode 100644
index 17f2becbd..000000000
--- a/target/linux/coldfire/patches/032-m5445x_edma_update.patch
+++ /dev/null
@@ -1,553 +0,0 @@
-From 7b5b08d99d5362e9c36fd7d42d6c06c2a848266c Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Sun, 9 Dec 2007 02:21:19 -0700
-Subject: [PATCH] Update EDMA.
-
-LTIBName: m5445x-edma-update
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- drivers/spi/coldfire_edma.c      |  261 +++++++++++++++++++++++---------------
- include/asm-m68k/coldfire_edma.h |    9 +-
- include/asm-m68k/mcf5445x_edma.h |   28 +++-
- 3 files changed, 188 insertions(+), 110 deletions(-)
-
---- a/drivers/spi/coldfire_edma.c
-+++ b/drivers/spi/coldfire_edma.c
-@@ -20,76 +20,91 @@
- #include <linux/cdev.h>
- #include <linux/seq_file.h>
- #include <linux/proc_fs.h>
-+#ifdef CONFIG_M54455
- #include <asm/mcf5445x_edma.h>
- #include <asm/mcf5445x_intc.h>
-+#endif /* CONFIG_M54455 */
- #include <asm/coldfire_edma.h>
- 
--
--/* callback handler data for each TCD */
-+/*
-+ * Callback handler data for each TCD
-+ */
- struct edma_isr_record {
--	edma_irq_handler irq_handler;       /* interrupt handler */
--	edma_error_handler error_handler;	/* error interrupt handler */
--	void* dev;							/* device used for the channel */
--	int  allocated;						/* busy flag */
--	spinlock_t *lock;					/* spin lock (if needs to be locked in interrupt) */
--	const char* device_id;				/* device id string, used in proc file system */
-+	edma_irq_handler irq_handler;	  /* interrupt handler */
-+	edma_error_handler error_handler; /* error interrupt handler */
-+	void *arg;			  /* argument to pass back */
-+	int allocated;			  /* busy flag */
-+	spinlock_t *lock;		  /* spin lock (optional) */
-+	const char *device_id;		  /* dev id string, used in procfs */
- };
- 
--/* device structure */
-+/*
-+ * Device structure
-+ */
- struct coldfire_edma_dev {
--	struct cdev cdev; 			/* character device */
--	struct edma_isr_record dma_interrupt_handlers[EDMA_CHANNELS]; /* channel handlers */
-+	struct cdev cdev;		  /* character device */
-+	struct edma_isr_record dma_interrupt_handlers[EDMA_CHANNELS];
- };
- 
- /* allocated major device number */
- static int coldfire_dma_major;
-+
- /* device driver structure */
--static struct coldfire_edma_dev* devp = NULL;
-+static struct coldfire_edma_dev *devp = NULL;
- 
- /* device driver file operations */
- struct file_operations coldfire_edma_fops = {
- 	.owner = THIS_MODULE,
- };
- 
--/* eDMA channel interrupt handler */
-+/**
-+ * dmaisr - eDMA channel interrupt handler
-+ * @irq: interrupt number
-+ * @dev_id: argument
-+ */
- static int dmaisr(int irq, void *dev_id)
- {
- 	int channel = irq - EDMA_INT_CONTROLLER_BASE - EDMA_INT_CHANNEL_BASE;
- 	int result = IRQ_HANDLED;
- 
--	if (devp!=NULL && devp->dma_interrupt_handlers[channel].lock) {
--		spin_lock(devp->dma_interrupt_handlers[channel].lock);
--	}
-+	if ((devp != NULL) &&
-+	    (devp->dma_interrupt_handlers[channel].irq_handler)) {
-+		/* call user irq handler */
-+		if (devp->dma_interrupt_handlers[channel].lock)
-+			spin_lock(devp->dma_interrupt_handlers[channel].lock);
-+
-+		result = devp->dma_interrupt_handlers[channel].irq_handler(
-+			channel, devp->dma_interrupt_handlers[channel].arg);
- 
--	if (devp!=NULL && devp->dma_interrupt_handlers[channel].irq_handler) {
--		result = devp->dma_interrupt_handlers[channel].irq_handler(channel,
--							devp->dma_interrupt_handlers[channel].dev);
-+   		if (devp->dma_interrupt_handlers[channel].lock)
-+			spin_unlock(devp->dma_interrupt_handlers[channel].lock);
- 	} else {
-+		/* no irq handler so just ack it */
- 		confirm_edma_interrupt_handled(channel);
--		printk(EDMA_DRIVER_NAME ": No handler for DMA channel %d\n", channel);
--	}
--
--   	if (devp!=NULL && devp->dma_interrupt_handlers[channel].lock) {
--		spin_unlock(devp->dma_interrupt_handlers[channel].lock);
-+		printk(EDMA_DRIVER_NAME ": No handler for DMA channel %d\n",
-+		       channel);
- 	}
- 
- 	return result;
- }
- 
--/* eDMA error interrupt handler */
-+/**
-+ * dma_error_isr - eDMA error interrupt handler
-+ * @irq: interrupt number
-+ * @dev_id: argument
-+ */
- static int dma_error_isr(int irq, void* dev_id)
- {
- 	u16 err;
- 	int i;
- 
- 	err = MCF_EDMA_ERR;
--	for (i=0;i<EDMA_CHANNELS;i++) {
-+	for (i=0; i<EDMA_CHANNELS; i++) {
- 		if (err & (1<<i)) {
--			if (devp!=NULL && devp->dma_interrupt_handlers[i].error_handler) {
--				devp->dma_interrupt_handlers[i].error_handler(i, devp->dma_interrupt_handlers[i].dev);
--			} else {
-+			if (devp!=NULL && devp->dma_interrupt_handlers[i].error_handler)
-+				devp->dma_interrupt_handlers[i].error_handler(i, devp->dma_interrupt_handlers[i].arg);
-+			else
- 				printk(KERN_WARNING EDMA_DRIVER_NAME ": DMA error on channel %d\n", i);
--			}
- 		}
- 	}
- 
-@@ -97,11 +112,26 @@ static int dma_error_isr(int irq, void* 
- 	return IRQ_HANDLED;
- }
- 
--/* sets channel parameters */
-+/**
-+ * set_edma_params - Set transfer control descriptor (TCD)
-+ * @channel: channel number
-+ * @source: source address
-+ * @dest: destination address
-+ * @attr: attributes
-+ * @soff: source offset
-+ * @nbytes: number of bytes to be transfered in minor loop
-+ * @slast: last source address adjustment
-+ * @citer: major loop count
-+ * @biter: beginning minor loop count
-+ * @doff: destination offset
-+ * @dlast_sga: last destination address adjustment
-+ * @major_int: generate interrupt after each major loop
-+ * @disable_req: disable DMA request after major loop
-+ */
- void set_edma_params(int channel, u32 source, u32 dest,
--					 u32 attr, u32 soff, u32 nbytes, u32 slast,
--					 u32 citer, u32 biter, u32 doff, u32 dlast_sga,
--					 int major_int, int disable_req)
-+	u32 attr, u32 soff, u32 nbytes, u32 slast,
-+	u32 citer, u32 biter, u32 doff, u32 dlast_sga,
-+	int major_int, int disable_req)
- {
- 
- 	if (channel<0 || channel>EDMA_CHANNELS)
-@@ -117,45 +147,56 @@ void set_edma_params(int channel, u32 so
- 	MCF_EDMA_TCD_BITER(channel)=MCF_EDMA_TCD_BITER_BITER(biter);
- 	MCF_EDMA_TCD_DOFF(channel) = MCF_EDMA_TCD_DOFF_DOFF(doff);
- 	MCF_EDMA_TCD_DLAST_SGA(channel) = MCF_EDMA_TCD_DLAST_SGA_DLAST_SGA(dlast_sga);
-+
- 	/* interrupt at the end of major loop */
--	if (major_int) {
-+	if (major_int)
- 		MCF_EDMA_TCD_CSR(channel) |= MCF_EDMA_TCD_CSR_INT_MAJOR;
--	} else {
-+	else
- 		MCF_EDMA_TCD_CSR(channel) &= ~MCF_EDMA_TCD_CSR_INT_MAJOR;
--	}
-+
- 	/* disable request at the end of major loop of transfer or not*/
--	if (disable_req) {
-+	if (disable_req)
- 		MCF_EDMA_TCD_CSR(channel) |= MCF_EDMA_TCD_CSR_D_REQ;
--	} else {
-+	else
- 		MCF_EDMA_TCD_CSR(channel) &= ~MCF_EDMA_TCD_CSR_D_REQ;
--	}
--
- }
- EXPORT_SYMBOL(set_edma_params);
- 
--/* init eDMA controller */
-+/**
-+ * init_edma - Initialize the eDMA controller
-+ */
- void init_edma(void)
- {
- 	MCF_EDMA_CR = 0;
- }
- EXPORT_SYMBOL(init_edma);
- 
--/* request eDMA channel */
-+/**
-+ * request_edma_channel - Request an eDMA channel
-+ * @channel: channel number
-+ * @handler: dma handler
-+ * @error_handler: dma error handler
-+ * @arg: argument to pass back
-+ * @lock: optional spinlock to hold over interrupt
-+ * @device_id: device id
-+ *
-+ * Returns 0 if success or a negative value if failure
-+ */
- int request_edma_channel(int channel,
--						edma_irq_handler handler,
--						edma_error_handler error_handler,
--						void* dev,
--						spinlock_t *lock,
--						const char* device_id )
-+	edma_irq_handler handler,
-+	edma_error_handler error_handler,
-+	void *arg,
-+	spinlock_t *lock,
-+	const char *device_id )
- {
- 	if (devp!=NULL && channel>=0 && channel<=EDMA_CHANNELS) {
--		if (devp->dma_interrupt_handlers[channel].allocated) {
-+		if (devp->dma_interrupt_handlers[channel].allocated)
- 			return -EBUSY;
--		}
-+
- 		devp->dma_interrupt_handlers[channel].allocated = 1;
- 		devp->dma_interrupt_handlers[channel].irq_handler = handler;
- 		devp->dma_interrupt_handlers[channel].error_handler = error_handler;
--		devp->dma_interrupt_handlers[channel].dev = dev;
-+		devp->dma_interrupt_handlers[channel].arg = arg;
- 		devp->dma_interrupt_handlers[channel].lock = lock;
- 		devp->dma_interrupt_handlers[channel].device_id = device_id;
- 		return 0;
-@@ -164,16 +205,22 @@ int request_edma_channel(int channel,
- }
- EXPORT_SYMBOL(request_edma_channel);
- 
--/* free eDMA channel */
--int free_edma_channel(int channel, void* dev)
-+/**
-+ * free_edma_channel - Free the edma channel
-+ * @channel: channel number
-+ * @arg: argument created with
-+ *
-+ * Returns 0 if success or a negative value if failure
-+ */
-+int free_edma_channel(int channel, void *arg)
- {
- 	if (devp!=NULL && channel>=0 && channel<=EDMA_CHANNELS) {
- 		if (devp->dma_interrupt_handlers[channel].allocated) {
--			if (devp->dma_interrupt_handlers[channel].dev != dev) {
-+			if (devp->dma_interrupt_handlers[channel].arg != arg)
- 				return -EBUSY;
--			}
-+
- 			devp->dma_interrupt_handlers[channel].allocated = 0;
--			devp->dma_interrupt_handlers[channel].dev = NULL;
-+			devp->dma_interrupt_handlers[channel].arg = NULL;
- 			devp->dma_interrupt_handlers[channel].irq_handler = NULL;
- 			devp->dma_interrupt_handlers[channel].error_handler = NULL;
- 			devp->dma_interrupt_handlers[channel].lock = NULL;
-@@ -184,7 +231,9 @@ int free_edma_channel(int channel, void*
- }
- EXPORT_SYMBOL(free_edma_channel);
- 
--/* clean-up device driver allocated resources */
-+/**
-+ * coldfire_edma_cleanup - cleanup driver allocated resources
-+ */
- static void coldfire_edma_cleanup(void)
- {
- 	dev_t devno;
-@@ -192,13 +241,10 @@ static void coldfire_edma_cleanup(void)
- 
- 	/* free interrupts/memory */
- 	if (devp) {
--		for (i=0;i<EDMA_CHANNELS;i++)
--		{
--			MCF_INTC0_SIMR = EDMA_INT_CHANNEL_BASE+i;
--			free_irq(EDMA_INT_CHANNEL_BASE+EDMA_INT_CONTROLLER_BASE+i,	devp);
--		}
--		MCF_INTC0_SIMR = EDMA_INT_CHANNEL_BASE+EDMA_CHANNELS;
--		free_irq(EDMA_INT_CHANNEL_BASE+EDMA_INT_CONTROLLER_BASE+EDMA_CHANNELS, devp);
-+		for (i=0; i<EDMA_CHANNELS; i++)
-+			free_irq(EDMA_INT_BASE+i, devp);
-+
-+		free_irq(EDMA_INT_BASE+EDMA_INT_ERR, devp);
- 		cdev_del(&devp->cdev);
- 		kfree(devp);
- 	}
-@@ -209,30 +255,42 @@ static void coldfire_edma_cleanup(void)
- }
- 
- #ifdef CONFIG_PROC_FS
--/* proc file system support */
-+/*
-+ * proc file system support
-+ */
- 
- #define FREE_CHANNEL "free"
- #define DEVICE_UNKNOWN "device unknown"
- 
-+/**
-+ * proc_edma_show - print out proc info
-+ * @m: seq_file
-+ * @v:
-+ */
- static int proc_edma_show(struct seq_file *m, void *v)
- {
- 	int i;
- 
--	if (devp==NULL) return 0;
-+	if (devp == NULL)
-+		return 0;
- 
- 	for (i = 0 ; i < EDMA_CHANNELS ; i++) {
- 		if (devp->dma_interrupt_handlers[i].allocated) {
- 			if (devp->dma_interrupt_handlers[i].device_id)
--		    	seq_printf(m, "%2d: %s\n", i, devp->dma_interrupt_handlers[i].device_id);
-+		    		seq_printf(m, "%2d: %s\n", i, devp->dma_interrupt_handlers[i].device_id);
- 			else
- 				seq_printf(m, "%2d: %s\n", i, DEVICE_UNKNOWN);
--		} else {
-+		} else
- 			seq_printf(m, "%2d: %s\n", i, FREE_CHANNEL);
--		}
- 	}
- 	return 0;
- }
- 
-+/**
-+ * proc_edma_open - open the proc file
-+ * @inode: inode ptr
-+ * @file: file ptr
-+ */
- static int proc_edma_open(struct inode *inode, struct file *file)
- {
- 	return single_open(file, proc_edma_show, NULL);
-@@ -245,6 +303,9 @@ static const struct file_operations proc
- 	.release	= single_release,
- };
- 
-+/**
-+ * proc_edma_init - initialize proc filesystem
-+ */
- static int __init proc_edma_init(void)
- {
- 	struct proc_dir_entry *e;
-@@ -258,7 +319,9 @@ static int __init proc_edma_init(void)
- 
- #endif
- 
--/* initializes device driver */
-+/**
-+ * coldfire_edma_init - eDMA module init
-+ */
- static int __init coldfire_edma_init(void)
- {
- 	dev_t dev;
-@@ -267,8 +330,9 @@ static int __init coldfire_edma_init(voi
- 
- 	/* allocate free major number */
- 	result = alloc_chrdev_region(&dev, DMA_DEV_MINOR, 1, EDMA_DRIVER_NAME);
--	if (result<0) {
--		printk(KERN_WARNING EDMA_DRIVER_NAME": can't get major %d\n", result);
-+	if (result < 0) {
-+		printk(KERN_WARNING EDMA_DRIVER_NAME": can't get major %d\n",
-+		       result);
- 		return result;
- 	}
- 	coldfire_dma_major = MAJOR(dev);
-@@ -280,71 +344,68 @@ static int __init coldfire_edma_init(voi
- 		goto fail;
- 	}
- 
--	/* init handlers (no handlers for beggining) */
--   	for (i=0;i<EDMA_CHANNELS;i++) {
-+	/* init handlers (no handlers for beginning) */
-+   	for (i = 0; i < EDMA_CHANNELS; i++) {
- 		devp->dma_interrupt_handlers[i].irq_handler = NULL;
- 		devp->dma_interrupt_handlers[i].error_handler = NULL;
--		devp->dma_interrupt_handlers[i].dev = NULL;
-+		devp->dma_interrupt_handlers[i].arg = NULL;
- 		devp->dma_interrupt_handlers[i].allocated = 0;
- 		devp->dma_interrupt_handlers[i].lock = NULL;
- 		devp->dma_interrupt_handlers[i].device_id = NULL;
- 	}
- 
--    /* register char device */
-+	/* register char device */
- 	cdev_init(&devp->cdev, &coldfire_edma_fops);
- 	devp->cdev.owner = THIS_MODULE;
- 	devp->cdev.ops = &coldfire_edma_fops;
- 	result = cdev_add(&devp->cdev, dev, 1);
- 	if (result) {
--		printk(KERN_NOTICE EDMA_DRIVER_NAME": Error %d adding coldfire-dma device\n", result);
-+		printk(KERN_NOTICE EDMA_DRIVER_NAME
-+		       ": Error %d adding coldfire-dma device\n", result);
- 		result = -ENODEV;
- 		goto fail;
- 	}
- 
- 	/* request/enable irq for each eDMA channel */
--	for (i=0;i<EDMA_CHANNELS;i++)
--	{
--		result = request_irq(EDMA_INT_CHANNEL_BASE+EDMA_INT_CONTROLLER_BASE+i,
--			dmaisr, SA_INTERRUPT, EDMA_DRIVER_NAME, devp);
-+	for (i = 0; i < EDMA_CHANNELS;i++) {
-+		result = request_irq(EDMA_INT_BASE + i,
-+				     dmaisr, IRQF_DISABLED,
-+				     EDMA_DRIVER_NAME, devp);
- 		if (result) {
--			printk(KERN_WARNING EDMA_DRIVER_NAME": Cannot request irq %d\n",
--				EDMA_INT_CHANNEL_BASE+EDMA_INT_CONTROLLER_BASE+i);
-+			printk(KERN_WARNING EDMA_DRIVER_NAME
-+			       ": Cannot request irq %d\n",
-+			       (EDMA_INT_BASE + EDMA_INT_ERR+i));
- 			result = -EBUSY;
- 			goto fail;
- 		}
--
--		MCF_INTC0_ICR(EDMA_INT_CHANNEL_BASE+i) = EDMA_IRQ_LEVEL;
--		MCF_INTC0_CIMR = EDMA_INT_CHANNEL_BASE+i;
--
- 	}
- 
--    /* request error interrupt */
--	result = request_irq(EDMA_INT_CHANNEL_BASE + EDMA_INT_CONTROLLER_BASE + EDMA_CHANNELS,
--				dma_error_isr, SA_INTERRUPT, EDMA_DRIVER_NAME, devp);
-+	/* request error interrupt */
-+	result = request_irq(EDMA_INT_BASE + EDMA_INT_ERR,
-+			     dma_error_isr, IRQF_DISABLED,
-+			     EDMA_DRIVER_NAME, devp);
- 	if (result) {
--		printk(KERN_WARNING EDMA_DRIVER_NAME": Cannot request irq %d\n",
--				EDMA_INT_CHANNEL_BASE+EDMA_INT_CONTROLLER_BASE+EDMA_CHANNELS);
-+		printk(KERN_WARNING EDMA_DRIVER_NAME
-+		       ": Cannot request irq %d\n",
-+		       (EDMA_INT_BASE + EDMA_INT_ERR));
- 		result = -EBUSY;
- 		goto fail;
- 	}
- 
--	/* enable error interrupt in interrupt controller */
--	MCF_INTC0_ICR(EDMA_INT_CHANNEL_BASE+EDMA_CHANNELS) = EDMA_IRQ_LEVEL;
--	MCF_INTC0_CIMR = EDMA_INT_CHANNEL_BASE+EDMA_CHANNELS;
--
- #ifdef CONFIG_PROC_FS
- 	proc_edma_init();
- #endif
- 
- 	printk(EDMA_DRIVER_NAME ": initialized successfully\n");
--
- 	return 0;
- fail:
- 	coldfire_edma_cleanup();
- 	return result;
--
- }
- 
-+/**
-+ * coldfire_edma_exit - eDMA module exit
-+ */
- static void __exit coldfire_edma_exit(void)
- {
- 	coldfire_edma_cleanup();
-@@ -354,5 +415,5 @@ module_init(coldfire_edma_init);
- module_exit(coldfire_edma_exit);
- 
- MODULE_LICENSE("GPL");
--MODULE_AUTHOR("Yaroslav Vinogradov, Freescale Inc.");
--MODULE_DESCRIPTION("eDMA library for Coldfire 5445x");
-+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
-+MODULE_DESCRIPTION("eDMA library for Coldfire M5445x");
---- a/include/asm-m68k/coldfire_edma.h
-+++ b/include/asm-m68k/coldfire_edma.h
-@@ -20,11 +20,14 @@
- #define EDMA_DRIVER_NAME "ColdFire-eDMA"
- #define DMA_DEV_MINOR 1
- 
-+#ifdef CONFIG_M54455
- #define EDMA_INT_CHANNEL_BASE 		8
- #define EDMA_INT_CONTROLLER_BASE 	64
-+#define EDMA_INT_BASE			(EDMA_INT_CHANNEL_BASE + \
-+					 EDMA_INT_CONTROLLER_BASE)
- #define EDMA_CHANNELS			16
-- 
--#define EDMA_IRQ_LEVEL			5
-+#define EDMA_INT_ERR			16	/* edma error interrupt */
-+#endif /* CONFIG_M54455 */
-  
- typedef irqreturn_t (*edma_irq_handler)(int, void *);
- typedef void (*edma_error_handler)(int, void *);
-@@ -38,7 +41,7 @@ typedef void (*edma_error_handler)(int, 
-  *   nbytes  - number of bytes to be transfered in minor loop
-  *   slast   - last source address adjustment
-  *   citer   - major loop count
-- *   biter   - beggining minor loop count
-+ *   biter   - begining minor loop count
-  *   doff    - destination offset
-  *   dlast_sga - last destination address adjustment
-  *   major_int - generate interrupt after each major loop
---- a/include/asm-m68k/mcf5445x_edma.h
-+++ b/include/asm-m68k/mcf5445x_edma.h
-@@ -11,11 +11,27 @@
- #ifndef __MCF5445X_EDMA_H__
- #define __MCF5445X_EDMA_H__
- 
--/*********************************************************************
--*
--* Enhanced DMA (EDMA)
--*
--*********************************************************************/
-+/*
-+ * Enhanced DMA (EDMA)
-+ */
-+
-+/* Channels */
-+#define MCF_EDMA_CHAN_DREQ0	0	/* External DMA request 0 */
-+#define MCF_EDMA_CHAN_DREQ1	1	/* External DMA request 1 */
-+#define MCF_EDMA_CHAN_UART0_RX	2	/* UART0 Receive */
-+#define MCF_EDMA_CHAN_UART0_TX	3	/* UART0 Transmit */
-+#define MCF_EDMA_CHAN_UART1_RX	4	/* UART1 Receive */
-+#define MCF_EDMA_CHAN_UART1_TX	5	/* UART1 Transmit */
-+#define MCF_EDMA_CHAN_UART2_RX	6	/* UART2 Receive */
-+#define MCF_EDMA_CHAN_UART2_TX	7	/* UART2 Transmit */
-+#define MCF_EDMA_CHAN_TIMER0	8	/* Timer 0 / SSI0 Rx */
-+#define MCF_EDMA_CHAN_TIMER1	9	/* Timer 1 / SSI1 Rx */
-+#define MCF_EDMA_CHAN_TIMER2	10	/* Timer 2 / SSI0 Tx */
-+#define MCF_EDMA_CHAN_TIMER3	11	/* Timer 3 / SSI1 Tx */
-+#define MCF_EDMA_CHAN_DSPI_RX	12	/* DSPI Receive */
-+#define MCF_EDMA_CHAN_DSPI_TX	13	/* DSPI Transmit */
-+#define MCF_EDMA_CHAN_ATA_RX	14	/* ATA Receive */
-+#define MCF_EDMA_CHAN_ATA_TX	15	/* ATA Transmit */
- 
- /* Register read/write macros */
- #define MCF_EDMA_CR                     MCF_REG32(0xFC044000)
-@@ -1453,6 +1469,4 @@
- #define MCF_EDMA_TCD15_CSR_LINKCH(x)    (((x)&0x003F)<<8)
- #define MCF_EDMA_TCD15_CSR_BWC(x)       (((x)&0x0003)<<14)
- 
--/********************************************************************/
--
- #endif /* __MCF5445X_EDMA_H__ */
diff --git a/target/linux/coldfire/patches/033-m5445x_ssi_cleanup.patch b/target/linux/coldfire/patches/033-m5445x_ssi_cleanup.patch
deleted file mode 100644
index 068323b06..000000000
--- a/target/linux/coldfire/patches/033-m5445x_ssi_cleanup.patch
+++ /dev/null
@@ -1,437 +0,0 @@
-From 98e15babf1e25868d22c024dac6133cc29059d39 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Sun, 9 Dec 2007 02:24:13 -0700
-Subject: [PATCH] Fix DMA mode and cleanup driver.
-
-LTIBName: m5445x-ssi-cleanup
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- drivers/spi/ssi_audio.c |  207 ++++++++++++++++++++++++-----------------------
- 1 files changed, 104 insertions(+), 103 deletions(-)
-
---- a/drivers/spi/ssi_audio.c
-+++ b/drivers/spi/ssi_audio.c
-@@ -2,7 +2,7 @@
-  * MCF5445x audio driver.
-  *
-  * Yaroslav Vinogradov yaroslav.vinogradov@freescale.com
-- * Copyright Freescale Semiconductor, Inc. 2006
-+ * Copyright Freescale Semiconductor, Inc. 2006, 2007
-  *
-  * 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
-@@ -25,9 +25,11 @@
- 
- #include <asm/coldfire.h>
- #include <asm/coldfire_edma.h>
-+#ifdef CONFIG_M54455
- #include <asm/mcf5445x_ssi.h>
- #include <asm/mcf5445x_ccm.h>
- #include <asm/mcf5445x_gpio.h>
-+#endif
- 
- #define SOUND_DEVICE_NAME "sound"
- #define DRIVER_NAME "ssi_audio"
-@@ -47,8 +49,8 @@
- 
- /* TLV320DAC23 audio chip registers */
- 
--#define CODEC_LEFT_IN_REG			(0x00)
--#define CODEC_RIGHT_IN_REG			(0x01)
-+#define CODEC_LEFT_IN_REG		(0x00)
-+#define CODEC_RIGHT_IN_REG		(0x01)
- #define CODEC_LEFT_HP_VOL_REG		(0x02)
- #define CODEC_RIGHT_HP_VOL_REG		(0x03)
- #define CODEC_ANALOG_APATH_REG		(0x04)
-@@ -57,7 +59,7 @@
- #define CODEC_DIGITAL_IF_FMT_REG	(0x07)
- #define CODEC_SAMPLE_RATE_REG		(0x08)
- #define CODEC_DIGITAL_IF_ACT_REG	(0x09)
--#define CODEC_RESET_REG				(0x0f)
-+#define CODEC_RESET_REG			(0x0f)
- 
- #define CODEC_SAMPLE_8KHZ		(0x0C)
- #define CODEC_SAMPLE_16KHZ		(0x58)
-@@ -71,21 +73,21 @@
- /* DMA transfer size */
- #define DMASIZE		(16*1024)
- 
--/* transmit eDMA channel for SSI channel 0 */
--#define DMA_TCD 	10
--/* transmit eDMA channel for SSI channel 1 */
--#define DMA_TCD2 	11
-+/* eDMA channel for SSI channel 0 TX */
-+#define DMA_TCD 	MCF_EDMA_CHAN_TIMER2
-+/* eDMA channel for SSI channel 1 TX */
-+#define DMA_TCD2 	MCF_EDMA_CHAN_TIMER3
- 
- struct ssi_audio {
--	struct spi_device	*spi;
-+	struct spi_device *spi;
- 	u32 speed;
- 	u32 stereo;
- 	u32 bits;
- 	u32 format;
--	u8  isopen;
--	u8  dmaing;
--	u8  ssi_enabled;
--	u8  channel;
-+	u8 isopen;
-+	u8 dmaing;
-+	u8 ssi_enabled;
-+	u8 channel;
- 	spinlock_t lock;
- 	u8* audio_buf;
- };
-@@ -129,7 +131,8 @@ static void ssi_audio_setsamplesize(int 
- 	}
- 
- #ifdef AUDIO_DEBUG
--	printk(DRIVER_NAME ":ssi_audio_setsamplesize %d %d\n", audio_device->format, audio_device->bits);
-+	printk(DRIVER_NAME ":ssi_audio_setsamplesize %d %d\n",
-+	       audio_device->format, audio_device->bits);
- #endif
- }
- 
-@@ -157,62 +160,57 @@ void __inline__ ssi_audio_dmarun(void)
- {
- 	set_edma_params(DMA_TCD,
- #ifdef USE_MMU
--					virt_to_phys(&(audio_device->audio_buf[audio_start])),
-+			virt_to_phys(&(audio_device->audio_buf[audio_start])),
- #else
--					(u32)&(audio_device->audio_buf[audio_start]),
-+			(u32)&(audio_device->audio_buf[audio_start]),
- #endif
--					(u32)&MCF_SSI_TX0,
--					MCF_EDMA_TCD_ATTR_SSIZE_32BIT | MCF_EDMA_TCD_ATTR_DSIZE_32BIT,
--					8,
--					4,
--					0,
--					audio_count/8,
--					audio_count/8,
--					0,
--					0,
--					0, // major_int
--					0  // disable_req
--					);
-+			(u32)&MCF_SSI_TX0,
-+			MCF_EDMA_TCD_ATTR_SSIZE_32BIT | MCF_EDMA_TCD_ATTR_DSIZE_32BIT,
-+			8,
-+			4,
-+			0,
-+			audio_count/8,
-+			audio_count/8,
-+			0,
-+			0,
-+			0, // major_int
-+			0  // disable_req
-+			);
- 
- 	set_edma_params(DMA_TCD2,
- #ifdef USE_MMU
--					virt_to_phys(&(audio_device->audio_buf[audio_start+4])),
-+			virt_to_phys(&(audio_device->audio_buf[audio_start+4])),
- #else
--					(u32)&(audio_device->audio_buf[audio_start+4]),
-+			(u32)&(audio_device->audio_buf[audio_start+4]),
- #endif
--					(u32)&MCF_SSI_TX1,
--					MCF_EDMA_TCD_ATTR_SSIZE_32BIT | MCF_EDMA_TCD_ATTR_DSIZE_32BIT,
--					8,
--					4,
--					0,
--					audio_count/8,
--					audio_count/8,
--					0,
--					0,
--					1, // major_int
--                    0  // disable_req
--					);
-+			(u32)&MCF_SSI_TX1,
-+			MCF_EDMA_TCD_ATTR_SSIZE_32BIT | MCF_EDMA_TCD_ATTR_DSIZE_32BIT,
-+			8,
-+			4,
-+			0,
-+			audio_count/8,
-+			audio_count/8,
-+			0,
-+			0,
-+			1, // major_int
-+                    	0  // disable_req
-+			);
- 
- 	audio_device->dmaing = 1;
- 	audio_txbusy = 1;
- 
- 	start_edma_transfer(DMA_TCD);
- 	start_edma_transfer(DMA_TCD2);
--#if 0
--	MCF_EDMA_ERQ |= (1<<DMA_TCD) | (1<<DMA_TCD2);
--	MCF_EDMA_SSRT = DMA_TCD;
--	MCF_EDMA_SSRT = DMA_TCD2;
--#endif
--
- }
- 
--/*
-- *	Start DMA'ing a new buffer of data if any available.
-+/**
-+ * ssi_audio_dmabuf - Start DMA'ing a new buffer of data if any available.
-  */
- static void ssi_audio_dmabuf(void)
- {
- #ifdef AUDIO_DEBUG
--	printk(DRIVER_NAME ":ssi_audio_dmabuf(): append=%x start=%x\n", audio_append, audio_appstart);
-+	printk(DRIVER_NAME ":ssi_audio_dmabuf(): append=%x start=%x\n",
-+	       audio_append, audio_appstart);
- #endif
- 
- 	/* If already running then nothing to do... */
-@@ -241,7 +239,8 @@ static void ssi_audio_dmabuf(void)
- 	}
- }
- 
--void __inline__ stop_dma(void) {
-+void __inline__ stop_dma(void)
-+{
- 	stop_edma_transfer(DMA_TCD);
- 	stop_edma_transfer(DMA_TCD2);
- }
-@@ -283,7 +282,6 @@ static void init_dma(void)
- 
- #endif	/* CONFIG_SSIAUDIO_USE_EDMA */
- 
--
- /* Write CODEC register using SPI
-  *   address - CODEC register address
-  *   data - data to be written into register
-@@ -296,7 +294,8 @@ static int codec_write(u8 addr, u16 data
- 		return -ENODEV;
- 
- 	spi_word = ((addr & 0x7F)<<9)|(data & 0x1FF);
--	return spi_write(audio_device->spi, (const u8*)&spi_word, sizeof(spi_word));
-+	return spi_write(audio_device->spi, (const u8*)&spi_word,
-+			 sizeof(spi_word));
- }
- 
- static inline void enable_ssi(void)
-@@ -359,7 +358,7 @@ static void init_audio_codec(void)
- 	codec_write(CODEC_DIGITAL_APATH_REG, 0x007); /* Set A path */
- 
- 	/* set sample rate */
--    adjust_codec_speed();
-+	adjust_codec_speed();
- 
- 	codec_write(CODEC_LEFT_HP_VOL_REG, 0x075); /* set volume */
- 	codec_write(CODEC_RIGHT_HP_VOL_REG, 0x075); /* set volume */
-@@ -375,13 +374,12 @@ static void chip_init(void)
- #endif
- 
- 	/* Enable the SSI pins */
--	MCF_GPIO_PAR_SSI = ( 0
--							| MCF_GPIO_PAR_SSI_MCLK
--							| MCF_GPIO_PAR_SSI_STXD(3)
--							| MCF_GPIO_PAR_SSI_SRXD(3)
--							| MCF_GPIO_PAR_SSI_FS(3)
--							| MCF_GPIO_PAR_SSI_BCLK(3) );
--
-+	MCF_GPIO_PAR_SSI = (0
-+			    | MCF_GPIO_PAR_SSI_MCLK
-+			    | MCF_GPIO_PAR_SSI_STXD(3)
-+			    | MCF_GPIO_PAR_SSI_SRXD(3)
-+			    | MCF_GPIO_PAR_SSI_FS(3)
-+			    | MCF_GPIO_PAR_SSI_BCLK(3) );
- }
- 
- static void init_ssi(void)
-@@ -430,8 +428,8 @@ static void init_ssi(void)
- 			;
- 
- 	MCF_SSI_FCSR = 0
--			| MCF_SSI_FCSR_TFWM0(0)
--			| MCF_SSI_FCSR_TFWM1(0)
-+			| MCF_SSI_FCSR_TFWM0(2)
-+			| MCF_SSI_FCSR_TFWM1(2)
- 			;
- 
- 	MCF_SSI_IER =   0 // interrupts
-@@ -459,9 +457,8 @@ static int ssi_audio_isr(int irq, void *
- {
- 	unsigned long	*bp;
- 
--	if (audio_txbusy==0) {
-+	if (audio_txbusy==0)
- 		return IRQ_HANDLED;
--	}
- 
- 	spin_lock(&(audio_device->lock));
- 
-@@ -560,7 +557,8 @@ static int ssi_audio_close(struct inode 
- }
- 
- /* write to audio device */
--static ssize_t ssi_audio_write(struct file *filp, const char *buf, size_t count, loff_t *ppos)
-+static ssize_t ssi_audio_write(struct file *filp, const char *buf,
-+	size_t count, loff_t *ppos)
- {
- 	unsigned long	*dp, *buflp;
- 	unsigned short	*bufwp;
-@@ -568,10 +566,12 @@ static ssize_t ssi_audio_write(struct fi
- 	unsigned int	slen, bufcnt, i, s, e;
- 
- #ifdef AUDIO_DEBUG
--	printk(DRIVER_NAME ":ssi_audio_write(buf=%x,count=%d)\n", (int) buf, count);
-+	printk(DRIVER_NAME ":ssi_audio_write(buf=%x,count=%d)\n",
-+	       (int)buf, count);
- #endif
- 
--	if (audio_device==NULL) return (-ENODEV);
-+	if (audio_device==NULL)
-+		return (-ENODEV);
- 
- 	if (count <= 0)
- 		return 0;
-@@ -592,8 +592,8 @@ static ssize_t ssi_audio_write(struct fi
- 
- tryagain:
- 	/*
--	 *	Get a snapshot of buffer, so we can figure out how
--	 *	much data we can fit in...
-+	 * Get a snapshot of buffer, so we can figure out how
-+	 * much data we can fit in...
- 	 */
- 	s = audio_start;
- 	e = audio_append;
-@@ -613,11 +613,12 @@ tryagain:
- 		goto tryagain;
- 	}
- 
--	/* For DMA we need to have data as 32 bit
--	   values (since SSI TX register is 32 bit).
--	   So, the incomming 16 bit data must be put to buffer as 32 bit values.
--	   Also, the endianess is converted if needed
--	*/
-+	/*
-+	 * For DMA we need to have data as 32 bit
-+	 * values (since SSI TX register is 32 bit).
-+	 * So, the incoming 16 bit data must be put to buffer as 32 bit values.
-+	 * Also, the endianess is converted if needed
-+	 */
- 	if (audio_device->stereo) {
- 		if (audio_device->bits == 16) {
- 			if (audio_device->format==AFMT_S16_LE) {
-@@ -678,16 +679,19 @@ tryagain:
- }
- 
- /* ioctl: control the driver */
--static int ssi_audio_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg)
-+static int ssi_audio_ioctl(struct inode *inode, struct file *filp,
-+	unsigned int cmd, unsigned long arg)
- {
--	long	val;
--	int	rc = 0;
-+	long val;
-+	int rc = 0;
- 
- #ifdef AUDIO_DEBUG
--    printk(DRIVER_NAME ":ssi_audio_ioctl(cmd=%x,arg=%x)\n", (int) cmd, (int) arg);
-+    printk(DRIVER_NAME ":ssi_audio_ioctl(cmd=%x,arg=%x)\n",
-+	   (int)cmd, (int)arg);
- #endif
- 
--	if (audio_device==NULL) return (-ENODEV);
-+	if (audio_device==NULL)
-+		return (-ENODEV);
- 
- 	switch (cmd) {
- 
-@@ -744,8 +748,6 @@ static int ssi_audio_ioctl(struct inode 
- 	return rc;
- }
- 
--/****************************************************************************/
--
- struct file_operations	ssi_audio_fops = {
- 	open: ssi_audio_open,		/* open */
- 	release: ssi_audio_close,	/* close */
-@@ -756,8 +758,8 @@ struct file_operations	ssi_audio_fops = 
- /* initialize audio driver */
- static int __devinit ssi_audio_probe(struct spi_device *spi)
- {
--	struct ssi_audio	*audio;
--	int	err;
-+	struct ssi_audio *audio;
-+	int err;
- 
- #ifdef AUDIO_DEBUG
- 	printk(DRIVER_NAME": probe\n");
-@@ -804,7 +806,7 @@ static int __devinit ssi_audio_probe(str
- 	audio->spi = spi;
- 
- #ifndef CONFIG_SSIAUDIO_USE_EDMA
--	if (request_irq(spi->irq, ssi_audio_isr, SA_INTERRUPT,	spi->dev.bus_id, audio)) {
-+	if (request_irq(spi->irq, ssi_audio_isr, IRQF_DISABLED,	spi->dev.bus_id, audio)) {
- 		dev_dbg(&spi->dev, "irq %d busy?\n", spi->irq);
- 		err = -EBUSY;
- 		goto err_free_mem;
-@@ -813,25 +815,21 @@ static int __devinit ssi_audio_probe(str
- #else
- 	/* request 2 eDMA channels since two channel output mode is used */
- 	if (request_edma_channel(DMA_TCD,
--							ssi_audio_dma_handler_empty,
--							NULL,
--							audio,
--							&(audio_device->lock),
--							DRIVER_NAME
--							)!=0)
--	{
-+				 ssi_audio_dma_handler_empty,
-+				 NULL,
-+				 audio,
-+				 &(audio_device->lock),
-+				 DRIVER_NAME)!=0) {
- 		dev_dbg(&spi->dev, "DMA channel %d busy?\n", DMA_TCD);
- 		err = -EBUSY;
- 		goto err_free_mem;
- 	}
- 	if (request_edma_channel(DMA_TCD2,
--							ssi_audio_dma_handler,
--							NULL,
--							audio,
--							&(audio_device->lock),
--							DRIVER_NAME
--							)!=0)
--	{
-+				 ssi_audio_dma_handler,
-+				 NULL,
-+				 audio,
-+				 &(audio_device->lock),
-+				 DRIVER_NAME)!=0) {
- 		dev_dbg(&spi->dev, "DMA channel %d busy?\n", DMA_TCD2);
- 		err = -EBUSY;
- 		goto err_free_mem;
-@@ -870,11 +868,13 @@ static int __devexit ssi_audio_remove(st
- 	return 0;
- }
- 
--static int ssi_audio_suspend(struct spi_device *spi, pm_message_t message) {
-+static int ssi_audio_suspend(struct spi_device *spi, pm_message_t message)
-+{
- 	return 0;
- }
- 
--static int ssi_audio_resume(struct spi_device *spi) {
-+static int ssi_audio_resume(struct spi_device *spi)
-+{
- 	return 0;
- }
- 
-@@ -902,5 +902,6 @@ static void __exit ssi_audio_exit(void)
- }
- module_exit(ssi_audio_exit);
- 
--MODULE_DESCRIPTION("SSI/I2S Audio Driver");
- MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
-+MODULE_DESCRIPTION("SSI/I2S Audio Driver");
diff --git a/target/linux/coldfire/patches/034-m5445x_spi_deprecated_api.patch b/target/linux/coldfire/patches/034-m5445x_spi_deprecated_api.patch
deleted file mode 100644
index 7e96268cd..000000000
--- a/target/linux/coldfire/patches/034-m5445x_spi_deprecated_api.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From b999c1fe5c6e5fa4f7e43fae02f59fc547d18093 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Sun, 9 Dec 2007 02:24:57 -0700
-Subject: [PATCH] Fix use of deprecated API.
-
-LTIBName: m5445x-spi-deprecated-api
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- drivers/spi/spi_coldfire.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
---- a/drivers/spi/spi_coldfire.c
-+++ b/drivers/spi/spi_coldfire.c
-@@ -1311,7 +1311,7 @@ static int coldfire_spi_probe(struct pla
- 
- 	irq = platform_info->irq_vector;
- 
--	status = request_irq(platform_info->irq_vector, qspi_interrupt, SA_INTERRUPT, dev->bus_id, drv_data);
-+	status = request_irq(platform_info->irq_vector, qspi_interrupt, IRQF_DISABLED, dev->bus_id, drv_data);
- 	if (status < 0) {
- 		dev_err(&pdev->dev, "unable to attach ColdFire QSPI interrupt\n");
- 		goto out_error_master_alloc;
diff --git a/target/linux/coldfire/patches/035-mcfv4e_bitops_cleanup.patch b/target/linux/coldfire/patches/035-mcfv4e_bitops_cleanup.patch
deleted file mode 100644
index c4f8cecdb..000000000
--- a/target/linux/coldfire/patches/035-mcfv4e_bitops_cleanup.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 898b269952d096ce3f990c51b02457c27e16b83c Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Sun, 9 Dec 2007 02:25:49 -0700
-Subject: [PATCH] Clean up formatting.
-
-LTIBName: mcfv4e-bitops-cleanup
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- include/asm-m68k/bitops.h |   21 ++++++++++++++-------
- 1 files changed, 14 insertions(+), 7 deletions(-)
-
---- a/include/asm-m68k/bitops.h
-+++ b/include/asm-m68k/bitops.h
-@@ -478,7 +478,8 @@ static __inline__ int __constant_coldfir
- 	return retval;
- }
- #else
--static __inline__ int __constant_coldfire_test_and_set_bit(int nr,volatile void * vaddr)
-+static __inline__ int __constant_coldfire_test_and_set_bit(int nr,
-+	volatile void *vaddr)
- {
- 	char retval;
- 	volatile char *p = &((volatile char *)vaddr)[(nr^31) >> 3];
-@@ -516,7 +517,8 @@ static __inline__ void __constant_coldfi
- 	     : "+QUd" (*p) : "di" (nr & 7));
- }
- #else
--static __inline__ void __constant_coldfire_set_bit(int nr, volatile void * vaddr)
-+static __inline__ void __constant_coldfire_set_bit(int nr,
-+	volatile void *vaddr)
- {
- 	volatile char *p = &((volatile char *)vaddr)[(nr^31) >> 3];
- 	__asm__ __volatile__ ("bset %1,(%3)"
-@@ -524,7 +526,8 @@ static __inline__ void __constant_coldfi
- }
- #endif
- 
--static __inline__ void __generic_coldfire_set_bit(int nr, volatile void *vaddr)
-+static __inline__ void __generic_coldfire_set_bit(int nr,
-+	volatile void *vaddr)
- {
- 	__asm__ __volatile__ ("bset %1,%0"
- 	     : "=m" (((volatile char *)vaddr)[(nr^31) >> 3])
-@@ -552,7 +555,8 @@ static __inline__ int __constant_coldfir
- 	return retval;
- }
- #else
--static __inline__ int __constant_coldfire_test_and_clear_bit(int nr, volatile void *vaddr)
-+static __inline__ int __constant_coldfire_test_and_clear_bit(int nr,
-+	volatile void *vaddr)
- {
- 	char retval;
- 	volatile char *p = &((volatile char *)vaddr)[(nr^31) >> 3];
-@@ -599,7 +603,8 @@ static __inline__ void __constant_coldfi
- 	     : "+QUd" (*p) : "id" (nr & 7));
- }
- #else
--static __inline__ void __constant_coldfire_clear_bit(int nr, volatile void * vaddr)
-+static __inline__ void __constant_coldfire_clear_bit(int nr,
-+	volatile void *vaddr)
- {
- 	volatile char *p = &((volatile char *)vaddr)[(nr^31) >> 3];
- 	__asm__ __volatile__ ("bclr %1,(%3)"
-@@ -636,7 +641,8 @@ static __inline__ int __constant_coldfir
- 	return retval;
- }
- #else
--static __inline__ int __constant_coldfire_test_and_change_bit(int nr, volatile void * vaddr)
-+static __inline__ int __constant_coldfire_test_and_change_bit(int nr,
-+	volatile void *vaddr)
- {
- 	char retval;
- 	volatile char *p = &((volatile char *)vaddr)[(nr^31) >> 3];
-@@ -678,7 +684,8 @@ static __inline__ void __constant_coldfi
- 	     : "+QUd" (*p) : "id" (nr & 7));
- }
- #else
--static __inline__ void __constant_coldfire_change_bit(int nr, volatile void * vaddr)
-+static __inline__ void __constant_coldfire_change_bit(int nr,
-+	volatile void *vaddr)
- {
- 	volatile char *p = &((volatile char *)vaddr)[(nr^31) >> 3];
- 	__asm__ __volatile__ ("bchg %1,(%3)"
diff --git a/target/linux/coldfire/patches/036-m5445x_pci.patch b/target/linux/coldfire/patches/036-m5445x_pci.patch
deleted file mode 100644
index abeaad42c..000000000
--- a/target/linux/coldfire/patches/036-m5445x_pci.patch
+++ /dev/null
@@ -1,251 +0,0 @@
-From da8e8fe3d6ad5eb9589c8e77e7716e4f7e1a7499 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Mon, 10 Dec 2007 03:36:05 -0700
-Subject: [PATCH] Coldfire M5445x PCI Bits.
-
-LTIBName: m5445x-pci
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/Kconfig                     |   12 ++++++++++--
- arch/m68k/Makefile                    |    4 ++++
- arch/m68k/coldfire/config.c           |    2 +-
- arch/m68k/coldfire/iomap.c            |    2 ++
- arch/m68k/coldfire/mcf5445x-devices.c |    9 +++++++++
- arch/m68k/coldfire/mcf5445x-pci.c     |    5 +++--
- arch/m68k/coldfire/pci.c              |    6 +++---
- arch/m68k/kernel/Makefile             |    2 +-
- drivers/macintosh/Kconfig             |    1 -
- drivers/pci/Makefile                  |    1 +
- include/asm-m68k/io.h                 |   13 ++++++++++++-
- include/asm-m68k/pci.h                |    2 ++
- 12 files changed, 48 insertions(+), 11 deletions(-)
-
---- a/arch/m68k/Kconfig
-+++ b/arch/m68k/Kconfig
-@@ -11,6 +11,14 @@ config MMU
- 	bool
- 	default y
- 
-+config GENERIC_TIME
-+        bool
-+        default n
-+
-+config GENERIC_CLOCKEVENTS
-+        bool
-+        default n
-+
- config RWSEM_GENERIC_SPINLOCK
- 	bool
- 	default y
-@@ -48,7 +56,7 @@ config ARCH_MAY_HAVE_PC_FDC
- 	default y
- 
- config NO_IOPORT
--	def_bool y
-+	def_bool !M54455
- 
- config NO_DMA
- 	def_bool SUN3
-@@ -159,7 +167,7 @@ config HADES
- 
- config PCI
- 	bool
--	depends on HADES
-+	depends on HADES || M54455
- 	default y
- 	help
- 	  Find out whether you have a PCI motherboard. PCI is the name of a
---- a/arch/m68k/Makefile
-+++ b/arch/m68k/Makefile
-@@ -32,6 +32,10 @@ ifdef CONFIG_SUN3
- LDFLAGS_vmlinux = -N
- endif
- 
-+ifdef CONFIG_COLDFIRE
-+# LDFLAGS_vmlinux = --verbose
-+endif
-+
- CHECKFLAGS += -D__mc68000__
- 
- # without -fno-strength-reduce the 53c7xx.c driver fails ;-(
---- a/arch/m68k/coldfire/config.c
-+++ b/arch/m68k/coldfire/config.c
-@@ -252,7 +252,7 @@ void __init coldfire_sched_init(irq_hand
- 		     MCF_DTIM_DTMR_FRR	| MCF_DTIM_DTMR_RST_EN, \
- 		     MCF_DTIM0_DTMR);
- 
--	request_irq(mcf_timervector, handler, SA_INTERRUPT, \
-+	request_irq(mcf_timervector, handler, IRQF_DISABLED, \
- 		    "timer", (void *)MCF_DTIM0_DTMR);
- 
- 	settimericr(1, mcf_timerlevel);
---- a/arch/m68k/coldfire/iomap.c
-+++ b/arch/m68k/coldfire/iomap.c
-@@ -12,6 +12,7 @@
- #include <linux/pci.h>
- #include <asm/io.h>
- 
-+#if 0
- void __iomem *__attribute__ ((weak))
- ioport_map(unsigned long port, unsigned int len)
- {
-@@ -52,3 +53,4 @@ void pci_iounmap(struct pci_dev *dev, vo
- 	/* Nothing .. */
- }
- EXPORT_SYMBOL(ioport_unmap);
-+#endif
---- a/arch/m68k/coldfire/mcf5445x-devices.c
-+++ b/arch/m68k/coldfire/mcf5445x-devices.c
-@@ -75,10 +75,19 @@ static int ata_get_clk_rate(void)
- 	return MCF_BUSCLK;
- }
- 
-+/* JKM -- move these to a header file */
-+#define MCF_IDE_DMA_WATERMARK	32	/* DMA watermark level in bytes */
-+#define MCF_IDE_DMA_BD_NR	(512/3/4) /* number of BDs per channel */
-+
- static struct fsl_ata_platform_data ata_data = {
- 	.init             = ata_init,
- 	.exit             = ata_exit,
- 	.get_clk_rate     = ata_get_clk_rate,
-+#ifdef CONFIG_PATA_FSL_USE_DMA
-+        .udma_mask        = 0x0F, /* the board handles up to UDMA3 */
-+        .fifo_alarm       = MCF_IDE_DMA_WATERMARK / 2,
-+        .max_sg           = MCF_IDE_DMA_BD_NR,
-+#endif
- };
- 
- static struct resource pata_fsl_resources[] = {
---- a/arch/m68k/coldfire/mcf5445x-pci.c
-+++ b/arch/m68k/coldfire/mcf5445x-pci.c
-@@ -8,6 +8,7 @@
-  */
- 
- #include <linux/delay.h>
-+#include <linux/interrupt.h>
- #include <linux/pci.h>
- 
- #include <asm/mcfsim.h>
-@@ -76,7 +77,7 @@ void mcf5445x_pci_dumpregs(void);
- #endif
- 
- /*
-- * static void mcf5445x_conf_device(struct pci_dev *dev)
-+ * mcf5445x_conf_device(struct pci_dev *dev)
-  *
-  * Machine dependent Configure the given device.
-  *
-@@ -84,7 +85,7 @@ void mcf5445x_pci_dumpregs(void);
-  *
-  * dev		- the pci device.
-  */
--void __init
-+void
- mcf5445x_conf_device(struct pci_dev *dev)
- {
- 	set_fpga(FPGA_PCI_IRQ_ENABLE, 0x0f);
---- a/arch/m68k/coldfire/pci.c
-+++ b/arch/m68k/coldfire/pci.c
-@@ -56,7 +56,7 @@ struct pci_ops pci_root_ops = {
-  *
-  * Initialize the pcibios based on cmd line params.
-  */
--char * __init
-+char *
- pcibios_setup(char *str)
- {
- 	if (!strcmp(str, "debug")) {
-@@ -124,7 +124,7 @@ pcibios_map_irq(struct pci_dev *dev, u8 
-  *
-  * Update a PCI interrupt.
-  */
--void __init
-+void
- pcibios_update_irq(struct pci_dev *dev, int irq)
- {
- 	pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
-@@ -171,7 +171,7 @@ pcibios_enable_device(struct pci_dev *de
- /*
-  * pcibios_fixup_bus(struct pci_bus *bus)
-  */
--void __init
-+void
- pcibios_fixup_bus(struct pci_bus *bus)
- {
- 	struct pci_dev *dev = bus->self;
---- a/arch/m68k/kernel/Makefile
-+++ b/arch/m68k/kernel/Makefile
-@@ -9,6 +9,7 @@ else
- ifndef CONFIG_COLDFIRE
-   extra-y := head.o vmlinux.lds
-   obj-y := entry.o signal.o traps.o ints.o
-+  obj-$(CONFIG_PCI) += bios32.o
- else   # CONFIG_COLDFIRE
-   extra-y := ../coldfire/head.o vmlinux.lds
- endif
-@@ -19,7 +20,6 @@ obj-y	+= process.o ptrace.o module.o \
- 
- devres-y = ../../../kernel/irq/devres.o
- 
--obj-$(CONFIG_PCI)	+= bios32.o
- obj-y$(CONFIG_MMU_SUN3) += dma.o	# no, it's not a typo
- 
- EXTRA_AFLAGS := -traditional
---- a/drivers/macintosh/Kconfig
-+++ b/drivers/macintosh/Kconfig
-@@ -118,7 +118,6 @@ config PMAC_SMU
- 
- config PMAC_APM_EMU
- 	tristate "APM emulation"
--	select APM_EMULATION
- 	depends on ADB_PMU && PM && PPC32
- 
- config PMAC_MEDIABAY
---- a/drivers/pci/Makefile
-+++ b/drivers/pci/Makefile
-@@ -39,6 +39,7 @@ obj-$(CONFIG_PPC) += setup-bus.o
- obj-$(CONFIG_MIPS) += setup-bus.o setup-irq.o
- obj-$(CONFIG_X86_VISWS) += setup-irq.o
- obj-$(CONFIG_MN10300) += setup-bus.o
-+obj-$(CONFIG_M54455) += setup-bus.o setup-irq.o
- 
- #
- # ACPI Related PCI FW Functions
---- a/include/asm-m68k/io.h
-+++ b/include/asm-m68k/io.h
-@@ -306,7 +306,18 @@ static inline void isa_delay(void)
- #define outw(val,port) out_le16((port),(val))
- #define inl(port)      in_le32(port)
- #define outl(val,port) out_le32((port),(val))
--
-+#define insb(port, buf, nr)	\
-+		raw_insb((u8 *)(port), (u8 *)(buf), (nr))
-+#define outsb(port, buf, nr)	\
-+		raw_outsb((u8 *)(port), (u8 *)(buf), (nr))
-+#define insw(port, buf, nr)	\
-+		raw_insw_swapw((u16 *)(port), (u16 *)(buf), (nr))
-+#define outsw(port, buf, nr)	\
-+		raw_outsw_swapw((u16 *)(port), (u16 *)(buf), (nr))
-+#define insl(port, buf, nr)	\
-+		raw_insw_swapw((u16 *)(port), (u16 *)(buf), (nr)<<1)
-+#define outsl(port, buf, nr)	\
-+		raw_outsw_swapw((u16 *)(port), (u16 *)(buf), (nr)<<1)
- #else
- /*
-  * kernel with both ISA and PCI compiled in, those have
---- a/include/asm-m68k/pci.h
-+++ b/include/asm-m68k/pci.h
-@@ -42,11 +42,13 @@ pcibios_penalize_isa_irq(int irq, int ac
- 	/* no dynamic PCI IRQ allocation */
- }
- 
-+#if 0
- static inline void
- pcibios_add_platform_entries(struct pci_dev *dev)
- {
- 	/* no special handling */
- }
-+#endif
- 
- static inline void
- pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
diff --git a/target/linux/coldfire/patches/037-m5445x_edma_callback.patch b/target/linux/coldfire/patches/037-m5445x_edma_callback.patch
deleted file mode 100644
index af2705c63..000000000
--- a/target/linux/coldfire/patches/037-m5445x_edma_callback.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From acd937ac924aefd22ea9a66ea621ab80a4f9b594 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Mon, 10 Dec 2007 03:37:19 -0700
-Subject: [PATCH] Update EDMA driver to allow callback/arg changes.
-
-LTIBName: m5445x-edma-callback
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- drivers/spi/coldfire_edma.c      |   27 +++++++++++++++++++++++++++
- include/asm-m68k/coldfire_edma.h |   20 ++++++++++++++++++++
- 2 files changed, 47 insertions(+), 0 deletions(-)
-
---- a/drivers/spi/coldfire_edma.c
-+++ b/drivers/spi/coldfire_edma.c
-@@ -206,6 +206,31 @@ int request_edma_channel(int channel,
- EXPORT_SYMBOL(request_edma_channel);
- 
- /**
-+ * set_edma_callback - Update the channel callback/arg
-+ * @channel: channel number
-+ * @handler: dma handler
-+ * @error_handler: dma error handler
-+ * @arg: argument to pass back
-+ *
-+ * Returns 0 if success or a negative value if failure
-+ */
-+int set_edma_callback(int channel,
-+	edma_irq_handler handler,
-+	edma_error_handler error_handler,
-+	void *arg )
-+{
-+	if (devp!=NULL && channel>=0 && channel<=EDMA_CHANNELS &&
-+	    devp->dma_interrupt_handlers[channel].allocated) {
-+		devp->dma_interrupt_handlers[channel].irq_handler = handler;
-+		devp->dma_interrupt_handlers[channel].error_handler = error_handler;
-+		devp->dma_interrupt_handlers[channel].arg = arg;
-+		return 0;
-+	}
-+	return -EINVAL;
-+}
-+EXPORT_SYMBOL(set_edma_callback);
-+
-+/**
-  * free_edma_channel - Free the edma channel
-  * @channel: channel number
-  * @arg: argument created with
-@@ -216,8 +241,10 @@ int free_edma_channel(int channel, void 
- {
- 	if (devp!=NULL && channel>=0 && channel<=EDMA_CHANNELS) {
- 		if (devp->dma_interrupt_handlers[channel].allocated) {
-+#if 0
- 			if (devp->dma_interrupt_handlers[channel].arg != arg)
- 				return -EBUSY;
-+#endif
- 
- 			devp->dma_interrupt_handlers[channel].allocated = 0;
- 			devp->dma_interrupt_handlers[channel].arg = NULL;
---- a/include/asm-m68k/coldfire_edma.h
-+++ b/include/asm-m68k/coldfire_edma.h
-@@ -96,10 +96,30 @@ int request_edma_channel(int channel,
- 		void *dev,
- 		spinlock_t *lock,
- 		const char *device_id);
-+
-+/**
-+ * set_edma_callback - Update the channel callback/arg
-+ * @channel: channel number
-+ * @handler: dma handler
-+ * @error_handler: dma error handler
-+ * @arg: argument to pass back
-+ *
-+ * Returns 0 if success or a negative value if failure
-+ */
-+int set_edma_callback(int channel,
-+		edma_irq_handler handler,
-+		edma_error_handler error_handler,
-+		void *arg);
-   
- /* Free eDMA channel
-  *  channel - eDMA TCD number
-  *  dev - device
-  */
- int free_edma_channel(int channel, void *dev);
-+
-+/*
-+ * DMA Modes
-+ */
-+#define	DMA_MODE_READ		0
-+#define DMA_MODE_WRITE		1
- #endif
diff --git a/target/linux/coldfire/patches/038-m5445x_audio_rates.patch b/target/linux/coldfire/patches/038-m5445x_audio_rates.patch
deleted file mode 100644
index 09e47c414..000000000
--- a/target/linux/coldfire/patches/038-m5445x_audio_rates.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From de5f4660856350ac43f642bb7c5adf063fc68287 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Mon, 10 Dec 2007 13:15:33 -0700
-Subject: [PATCH] Fix to allow playback at other than 44.1.
-
-LTIBName: m5445x-audio-rates
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- drivers/spi/ssi_audio.c |   34 ++++++++++++++++++++++++----------
- 1 files changed, 24 insertions(+), 10 deletions(-)
-
---- a/drivers/spi/ssi_audio.c
-+++ b/drivers/spi/ssi_audio.c
-@@ -34,7 +34,6 @@
- #define SOUND_DEVICE_NAME "sound"
- #define DRIVER_NAME "ssi_audio"
- 
--
- /* #define AUDIO_DEBUG */
- 
- #ifdef CONFIG_MMU
-@@ -315,24 +314,36 @@ static inline void disable_ssi(void)
- }
- 
- /* Audio CODEC initialization */
--/* TODO: also the SSI frequency/dividers must be adjusted */
- static void adjust_codec_speed(void) {
- #ifdef AUDIO_DEBUG
- 	printk(DRIVER_NAME ":adjust_codec_speed: %d\n", audio_device->speed);
- #endif
--
--	if (audio_device->speed == 8000) {
-+	disable_ssi();
-+	switch (audio_device->speed) {
-+	case 8000:
-+		MCF_CCM_CDR = MCF_CCM_CDR_SSIDIV(255);
- 		codec_write(CODEC_SAMPLE_RATE_REG,CODEC_SAMPLE_8KHZ);
--	} else if (audio_device->speed == 16000) {
-+		break;
-+	case 16000:
-+		MCF_CCM_CDR = MCF_CCM_CDR_SSIDIV(129);
- 		codec_write(CODEC_SAMPLE_RATE_REG,CODEC_SAMPLE_16KHZ);
--	} else if (audio_device->speed == 22000) {
-+		break;
-+	case 22000:
-+	case 22050:
-+		MCF_CCM_CDR = MCF_CCM_CDR_SSIDIV(94);
- 		codec_write(CODEC_SAMPLE_RATE_REG,CODEC_SAMPLE_22KHZ);
--	} else if (audio_device->speed == 44000 || audio_device->speed == 44100) {
-+		break;
-+	case 44000:
-+	case 44100:
-+		MCF_CCM_CDR = MCF_CCM_CDR_SSIDIV(47);
- 		codec_write(CODEC_SAMPLE_RATE_REG,CODEC_SAMPLE_44KHZ);
--	} else if (audio_device->speed == 48000) {
-+		break;
-+	case 48000:
-+		MCF_CCM_CDR = MCF_CCM_CDR_SSIDIV(42);
- 		codec_write(CODEC_SAMPLE_RATE_REG,CODEC_SAMPLE_48KHZ);
--	} else {
--		/* default 44KHz */
-+		break;
-+	default:
-+		MCF_CCM_CDR = MCF_CCM_CDR_SSIDIV(47);
- 		codec_write(CODEC_SAMPLE_RATE_REG,CODEC_SAMPLE_44KHZ);
- 	}
- }
-@@ -712,6 +723,9 @@ static int ssi_audio_ioctl(struct inode 
- 	case SNDCTL_DSP_SAMPLESIZE:
- 		if (access_ok(VERIFY_READ, (void *) arg, sizeof(val))) {
- 			get_user(val, (unsigned long *) arg);
-+#ifdef AUDIO_DEBUG
-+			printk(DRIVER_NAME ":ssi_audio_ioctl: SNDCTL_DSP_SAMPLESIZE: %d\n", val);
-+#endif
- 			ssi_audio_txdrain();
- 			ssi_audio_setsamplesize(val);
- 		} else {
diff --git a/target/linux/coldfire/patches/039-mcfv4e_kbuild_flags_update.patch b/target/linux/coldfire/patches/039-mcfv4e_kbuild_flags_update.patch
deleted file mode 100644
index e56074956..000000000
--- a/target/linux/coldfire/patches/039-mcfv4e_kbuild_flags_update.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From ea71d637a9d8606624056fad67d050face9fc03c Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Fri, 15 Feb 2008 15:32:35 -0700
-Subject: [PATCH] Update to use KBUILD_ for CFLAGS and AFLAGS.
-
-LTIBName: mcfv4e-kbuild-flags-update
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/Makefile |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
---- a/arch/m68k/Makefile
-+++ b/arch/m68k/Makefile
-@@ -33,6 +33,7 @@ LDFLAGS_vmlinux = -N
- endif
- 
- ifdef CONFIG_COLDFIRE
-+# OBJCOPYFLAGS    := -R .note -R .note.gnu.build-id -R .comment -S
- # LDFLAGS_vmlinux = --verbose
- endif
- 
-@@ -59,8 +60,8 @@ endif
- endif
- 
- ifdef CONFIG_M54455
--CFLAGS := $(CFLAGS) -march=isac -mcpu=54455 -msoft-float -g 
--AFLAGS := $(AFLAGS) -march=isac -mcpu=54455 -msoft-float  
-+KBUILD_CFLAGS += -march=isac -mcpu=54455 -msoft-float -g
-+KBUILD_AFLAGS += -march=isac -mcpu=54455 -msoft-float  
- endif
- 
- ifdef CONFIG_KGDB
diff --git a/target/linux/coldfire/patches/040-m5445x_usb_header_move.patch b/target/linux/coldfire/patches/040-m5445x_usb_header_move.patch
deleted file mode 100644
index a131d56de..000000000
--- a/target/linux/coldfire/patches/040-m5445x_usb_header_move.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 9d8ff9acf372506a60b2e54964d230e0a5a95eb1 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Fri, 15 Feb 2008 15:33:23 -0700
-Subject: [PATCH] Change linux/usb_gadget.h to linux/usb/gadget.h
-
-LTIBName: m5445x-usb-header-move
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- drivers/usb/gadget/mcf5445x_udc.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
---- a/drivers/usb/gadget/mcf5445x_udc.c
-+++ b/drivers/usb/gadget/mcf5445x_udc.c
-@@ -57,7 +57,7 @@
- #include <linux/moduleparam.h>
- #include <linux/device.h>
- #include <linux/usb/ch9.h>
--#include <linux/usb_gadget.h>
-+#include <linux/usb/gadget.h>
- #include <linux/usb/otg.h>
- #include <linux/dma-mapping.h>
- #include <linux/dmapool.h>
diff --git a/target/linux/coldfire/patches/041-mcfv4e_bitops_lock_hdr.patch b/target/linux/coldfire/patches/041-mcfv4e_bitops_lock_hdr.patch
deleted file mode 100644
index 7117629b2..000000000
--- a/target/linux/coldfire/patches/041-mcfv4e_bitops_lock_hdr.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From ff3d02768c1cbfbc1f0f07db4aef3d500101e4a7 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Fri, 15 Feb 2008 15:34:06 -0700
-Subject: [PATCH] Add generic lock header.
-
-LTIBName: mcfv4e-bitops-lock-hdr
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- include/asm-m68k/bitops.h |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
---- a/include/asm-m68k/bitops.h
-+++ b/include/asm-m68k/bitops.h
-@@ -874,6 +874,7 @@ static  __inline__ int fls(int x)
- #include <asm-generic/bitops/fls64.h>
- #include <asm-generic/bitops/sched.h>
- #include <asm-generic/bitops/hweight.h>
-+#include <asm-generic/bitops/lock.h>
- 
- #define minix_find_first_zero_bit(addr, size)	find_next_zero_bit((addr), \
- 							(size), 0)
diff --git a/target/linux/coldfire/patches/042-m5445x_pata_24_cleanup.patch b/target/linux/coldfire/patches/042-m5445x_pata_24_cleanup.patch
deleted file mode 100644
index 022998778..000000000
--- a/target/linux/coldfire/patches/042-m5445x_pata_24_cleanup.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 329eae71bdbe9e30f76164ba3dd5ef0dba932eef Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Fri, 15 Feb 2008 15:34:58 -0700
-Subject: [PATCH] Remove .port_disable and .irq_ack for 2.6.24.
-
-LTIBName: m5445x-pata-24-cleanup
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- drivers/ata/pata_fsl.c |   15 ---------------
- 1 files changed, 0 insertions(+), 15 deletions(-)
-
---- a/drivers/ata/pata_fsl.c
-+++ b/drivers/ata/pata_fsl.c
-@@ -497,19 +497,6 @@ err_out:
- }
- #endif /* CONFIG_FSL_PATA_USE_DMA */
- 
--static u8 pata_fsl_irq_ack(struct ata_port *ap, unsigned int chk_drq)
--{
--	unsigned int bits = chk_drq ? ATA_BUSY | ATA_DRQ : ATA_BUSY;
--	u8 status;
--
--	status = ata_busy_wait(ap, bits, 1000);
--	if (status & bits)
--		if (ata_msg_err(ap))
--			printk(KERN_ERR "abnormal status 0x%X\n", status);
--
--	return status;
--}
--
- static void ata_dummy_noret(struct ata_port *ap) { return; }
- 
- static struct scsi_host_template pata_fsl_sht = {
-@@ -538,7 +525,6 @@ static struct ata_port_operations pata_f
- 	.set_dmamode		= pata_fsl_set_dmamode,
- #endif
- 
--	.port_disable		= ata_port_disable,
- 	.tf_load		= ata_tf_load,
- 	.tf_read		= ata_tf_read,
- 	.check_status		= ata_check_status,
-@@ -563,7 +549,6 @@ static struct ata_port_operations pata_f
- 
- 	.irq_clear		= ata_dummy_noret,
- 	.irq_on			= ata_irq_on,
--	.irq_ack		= pata_fsl_irq_ack,
- 
- 	.port_start		= pata_fsl_port_start,
- 
diff --git a/target/linux/coldfire/patches/043-m5445x_spi_cdev_remove.patch b/target/linux/coldfire/patches/043-m5445x_spi_cdev_remove.patch
deleted file mode 100644
index 077f74d5a..000000000
--- a/target/linux/coldfire/patches/043-m5445x_spi_cdev_remove.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 13e26ba450f92bafe7dde67ad68779eeea65a53f Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Fri, 15 Feb 2008 15:36:04 -0700
-Subject: [PATCH] Remove cdev as the structure has changed for 2.6.24.
-
-LTIBName: m5445x-spi-cdev-remove
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- drivers/spi/spi_coldfire.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/spi/spi_coldfire.c
-+++ b/drivers/spi/spi_coldfire.c
-@@ -1115,7 +1115,7 @@ static int init_queue(struct driver_data
- 	INIT_WORK(&drv_data->pump_messages, pump_messages/*, drv_data*/);
- 
- 	drv_data->workqueue = create_singlethread_workqueue(
--					drv_data->master->cdev.dev->bus_id);
-+					drv_data->master->dev.parent->bus_id);
- 	if (drv_data->workqueue == NULL)
- 		return -EBUSY;
- 
-@@ -1223,7 +1223,7 @@ static int coldfire_spi_probe(struct pla
-   	if (!master)
-  		return -ENOMEM;
- 
-- 	drv_data = class_get_devdata(&master->cdev);
-+ 	drv_data = spi_master_get_devdata(master);
-  	drv_data->master = master;
- 
- 	INIT_LIST_HEAD(&drv_data->queue);
diff --git a/target/linux/coldfire/patches/044-m547x_8x_initial.patch b/target/linux/coldfire/patches/044-m547x_8x_initial.patch
deleted file mode 100644
index e313a3638..000000000
--- a/target/linux/coldfire/patches/044-m547x_8x_initial.patch
+++ /dev/null
@@ -1,3403 +0,0 @@
-From 5b8edb0ea5cafb522e21b2973eaff6298062dd81 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Thu, 28 Feb 2008 10:56:17 -0700
-Subject: [PATCH] Initial M547x/M548x port.
-
-LTIBName: m547x-8x-initial
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/Kconfig                    |   84 ++++-
- arch/m68k/Makefile                   |    4 +
- arch/m68k/coldfire/config.c          |  112 +++++-
- arch/m68k/coldfire/head.S            |  153 ++++++-
- arch/m68k/coldfire/ints.c            |   78 ++++-
- arch/m68k/configs/m5485evb_defconfig |  777 ++++++++++++++++++++++++++++++++++
- drivers/serial/mcfserial.c           |   45 ++-
- include/asm-m68k/cf_pgalloc.h        |    5 +
- include/asm-m68k/cfcache.h           |   28 ++-
- include/asm-m68k/coldfire.h          |    7 +
- include/asm-m68k/m5485gpio.h         |  694 ++++++++++++++++++++++++++++++
- include/asm-m68k/m5485gpt.h          |   88 ++++
- include/asm-m68k/m5485psc.h          |  474 +++++++++++++++++++++
- include/asm-m68k/m5485sim.h          |  219 ++++++++++
- include/asm-m68k/mcfsim.h            |    5 +
- include/asm-m68k/mcfuart.h           |   14 +
- include/asm-m68k/mmu_context.h       |   72 ++++
- include/asm-m68k/page_offset.h       |    5 +
- 18 files changed, 2824 insertions(+), 40 deletions(-)
- create mode 100644 arch/m68k/configs/m5485evb_defconfig
- create mode 100644 include/asm-m68k/m5485gpio.h
- create mode 100644 include/asm-m68k/m5485gpt.h
- create mode 100644 include/asm-m68k/m5485psc.h
- create mode 100644 include/asm-m68k/m5485sim.h
-
---- a/arch/m68k/Kconfig
-+++ b/arch/m68k/Kconfig
-@@ -56,7 +56,7 @@ config ARCH_MAY_HAVE_PC_FDC
- 	default y
- 
- config NO_IOPORT
--	def_bool !M54455
-+	def_bool !(M54455 || M547X_8X)
- 
- config NO_DMA
- 	def_bool SUN3
-@@ -319,20 +319,80 @@ config M68060
- config M54455
- 	bool "MCF54455 support"
- 	depends on COLDFIRE
--	default y
- 	help
-           This option will add support for the MCF54455 processor with mmu.
- 
-+config M547X_8X
-+	bool "MCF547x/MCF548x support"
-+	depends on COLDFIRE
-+	help
-+          This option will add support for the MCF547x/MCF548x processor with mmu.
-+
-+config M547X
-+	bool
-+	depends on M547X_8X
-+	default n
-+
-+config M548X
-+	bool
-+	depends on M547X_8X
-+	default n
-+
-+choice
-+	prompt "Model"
-+	depends on M547X_8X
-+	default M5485CFE
-+	config M5475AFE
-+		bool "MCF5475AFE"
-+		select M547X
-+	config M5475BFE
-+		bool "MCF5475BFE"
-+		select M547X
-+	config M5475CFE
-+		bool "MCF5475CFE"
-+		select M547X
-+	config M5475DFE
-+		bool "MCF5475DFE"
-+		select M547X
-+	config M5475EFE
-+		bool "MCF5475EFE"
-+		select M547X
-+	config M5475FFE
-+		bool "MCF5475FFE"
-+		select M547X
-+
-+	config M5485AFE
-+		bool "MCF5485AFE"
-+		select M548X
-+	config M5485BFE
-+		bool "MCF5485BFE"
-+		select M548X
-+	config M5485CFE
-+		bool "MCF5485CFE"
-+		select M548X
-+	config M5485DFE
-+		bool "MCF5485DFE"
-+		select M548X
-+	config M5485EFE
-+		bool "MCF5485EFE"
-+		select M548X
-+	config M5485FFE
-+		bool "MCF5485FFE"
-+		select M548X
-+
-+endchoice
-+
- config MCFCLK
--	int "M54455EVB System Clock"
--	depends on M54455
--	default 266666666
-+	int
-+	default 266666666 if M54455
-+	default 266000000 if M547X
-+	default 200000000 if M548X
- 	help
--	  System clock for EVB.  Usually 266MHz for u-boot and 200MHz for dBUG.
-+	  Coldfire System clock.
- 
- config MCF_USER_HALT
- 	bool "Coldfire User Halt Enable"
--	depends on M54455
-+	depends on M54455 || M547X_8X
- 	default n
- 	help
- 	  Enables the HALT instruction in User Mode.
-@@ -350,13 +410,15 @@ config MMU_CFV4E
- 
- config SDRAM_BASE
- 	hex
--	depends on M54455
--	default 0x40000000
-+	depends on COLDFIRE
-+	default 0x40000000 if M54455
-+	default 0x00000000 if M547X_8X
- 
- config SDRAM_SIZE
- 	hex
--	depends on M54455
--	default 0x0FFFFFFF
-+	depends on COLDFIRE
-+	default 0x0FFFFFFF if M54455
-+	default 0x04000000 if M547X_8X
- 
- config NOR_FLASH_BASE
- 	hex "NOR Flash Base Address"
---- a/arch/m68k/Makefile
-+++ b/arch/m68k/Makefile
-@@ -63,6 +63,10 @@ ifdef CONFIG_M54455
- KBUILD_CFLAGS += -march=isac -mcpu=54455 -msoft-float -g
- KBUILD_AFLAGS += -march=isac -mcpu=54455 -msoft-float  
- endif
-+ifdef CONFIG_M547X_8X
-+KBUILD_CFLAGS += -mcfv4e -g
-+KBUILD_AFLAGS += -mcfv4e
-+endif
- 
- ifdef CONFIG_KGDB
- # If configured for kgdb support, include debugging infos and keep the
---- a/arch/m68k/coldfire/config.c
-+++ b/arch/m68k/coldfire/config.c
-@@ -1,8 +1,9 @@
- /*
-- *  linux/arch/m68k/coldifre/config.c
-+ *  linux/arch/m68k/coldfire/config.c
-  *
-+ *  Kurt Mahan kmahan@freescale.com
-  *  Matt Waddel Matt.Waddel@freescale.com
-- *  Copyright Freescale Semiconductor, Inc. 2007
-+ *  Copyright Freescale Semiconductor, Inc. 2007, 2008
-  *
-  *  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
-@@ -32,11 +33,16 @@
- #include <asm/movs.h>
- #include <asm/page.h>
- #include <asm/pgalloc.h>
-+
-+#include <asm/mcfsim.h>
-+
-+#if 0
- #include <asm/mcf5445x_intc.h>
- #include <asm/mcf5445x_sdramc.h>
- #include <asm/mcf5445x_fbcs.h>
- #include <asm/mcf5445x_dtim.h>
- #include <asm/mcf5445x_xbs.h>
-+#endif
- 
- /* JKM -- testing */
- #include <linux/pfn.h>
-@@ -85,15 +91,21 @@ int __init uboot_commandline(char *boota
- {
- 	int len = 0, cmd_line_len;
- 	static struct uboot_record uboot_info;
-+	u32 offset = PAGE_OFFSET_RAW - PHYS_OFFSET;
- 
- 	extern unsigned long uboot_info_stk;
- 
--	/* Add 0x80000000 to get post-remapped kernel memory location */
--	uboot_info.bd_info = (*(u32 *)(uboot_info_stk)) + 0x80000000;
--	uboot_info.initrd_start = (*(u32 *)(uboot_info_stk+4)) + 0x80000000;
--	uboot_info.initrd_end = (*(u32 *)(uboot_info_stk+8)) + 0x80000000;
--	uboot_info.cmd_line_start = (*(u32 *)(uboot_info_stk+12)) + 0x80000000;
--	uboot_info.cmd_line_stop = (*(u32 *)(uboot_info_stk+16)) + 0x80000000;
-+	/* validate address */
-+	if ((uboot_info_stk < PAGE_OFFSET_RAW) ||
-+	    (uboot_info_stk >= (PAGE_OFFSET_RAW + CONFIG_SDRAM_SIZE)))
-+		return 0;
-+
-+	/* Add offset to get post-remapped kernel memory location */
-+	uboot_info.bd_info = (*(u32 *)(uboot_info_stk)) + offset;
-+	uboot_info.initrd_start = (*(u32 *)(uboot_info_stk+4)) + offset;
-+	uboot_info.initrd_end = (*(u32 *)(uboot_info_stk+8)) + offset;
-+	uboot_info.cmd_line_start = (*(u32 *)(uboot_info_stk+12)) + offset;
-+	uboot_info.cmd_line_stop = (*(u32 *)(uboot_info_stk+16)) + offset;
- 
- 	cmd_line_len = uboot_info.cmd_line_stop - uboot_info.cmd_line_start;
- 	if ((cmd_line_len > 0) && (cmd_line_len < CL_SIZE-1))
-@@ -106,21 +118,36 @@ int __init uboot_commandline(char *boota
- /*
-  * This routine does things not done in the bootloader.
-  */
-+#if defined(CONFIG_M54455)
- #define DEFAULT_COMMAND_LINE "root=/dev/mtdblock1 rw rootfstype=jffs2 ip=none mtdparts=physmap-flash.0:5M(kernel)ro,-(jffs2)"
-+#elif defined(CONFIG_M547X_8X)
-+#define DEFAULT_COMMAND_LINE "debug root=/dev/nfs nfsroot=172.27.155.1:/tftpboot/rigo/rootfs/ ip=172.27.155.85:172.27.155.1"
-+#endif
- asmlinkage void __init cf_early_init(void)
- {
- 	struct bi_record *record = (struct bi_record *) &_end;
- 
- 	extern char _end;
- 
-+#if defined(CONFIG_M54455)
- 	SET_VBR((void *)MCF_RAMBAR1);
-+#elif defined(CONFIG_M547X_8X)
-+	SET_VBR((void *)MCF_RAMBAR0);
-+#endif
- 
- 	/* Mask all interrupts */
-+#if defined(CONFIG_M54455)
- 	MCF_INTC0_IMRL = 0xFFFFFFFF;
- 	MCF_INTC0_IMRH = 0xFFFFFFFF;
- 	MCF_INTC1_IMRL = 0xFFFFFFFF;
- 	MCF_INTC1_IMRH = 0xFFFFFFFF;
-+#elif defined(CONFIG_M547X_8X)
-+/* JKM -- ?? */
-+	MCF_IMRL = 0xFFFFFFFF;
-+	MCF_IMRH = 0xFFFFFFFF;
-+#endif
- 
-+#if defined(CONFIG_M54455)
- #if defined(CONFIG_NOR_FLASH_BASE)
- 	MCF_FBCS_CSAR(1) = CONFIG_NOR_FLASH_BASE;
- #else
-@@ -131,9 +158,10 @@ asmlinkage void __init cf_early_init(voi
- 	/* Init optional SDRAM chip select */
- 	MCF_SDRAMC_SDCS(1) = (256*1024*1024) | 0x1B;
- #endif
-+#endif /* CONFIG_M54455 */
- 
-+#if defined(CONFIG_M54455)
- 	/* Setup SDRAM crossbar(XBS) priorities */
--printk(KERN_INFO "Bumping USB Priority\n");
- 	MCF_XBS_PRS2 = (MCF_XBS_PRS_M0(MCF_XBS_PRI_2) |
- 			MCF_XBS_PRS_M1(MCF_XBS_PRI_3) |
- 			MCF_XBS_PRS_M2(MCF_XBS_PRI_4) |
-@@ -141,6 +169,7 @@ printk(KERN_INFO "Bumping USB Priority\n
- 			MCF_XBS_PRS_M5(MCF_XBS_PRI_6) |
- 			MCF_XBS_PRS_M6(MCF_XBS_PRI_1) |
- 			MCF_XBS_PRS_M7(MCF_XBS_PRI_7));
-+#endif
- 	
- 
- 	m68k_machtype = MACH_CFMMU;
-@@ -152,6 +181,7 @@ printk(KERN_INFO "Bumping USB Priority\n
- 	m68k_memory[m68k_num_memory].addr = CONFIG_SDRAM_BASE;
- 	m68k_memory[m68k_num_memory++].size = CONFIG_SDRAM_SIZE;
- 
-+#if defined(CONFIG_M54455)
- 	if (!uboot_commandline(m68k_command_line)) {
- #if defined(CONFIG_BOOTPARAM)
- 		strncpy(m68k_command_line, CONFIG_BOOTPARAM_STRING, CL_SIZE-1);
-@@ -159,6 +189,10 @@ printk(KERN_INFO "Bumping USB Priority\n
- 		strcpy(m68k_command_line, DEFAULT_COMMAND_LINE);
- #endif
- 	}
-+#else
-+/* JKM -- hack until mappings get resolved */
-+	strcpy(m68k_command_line, DEFAULT_COMMAND_LINE);
-+#endif
- 
- 
- #if defined(CONFIG_BLK_DEV_INITRD)
-@@ -185,6 +219,7 @@ printk(KERN_INFO "Bumping USB Priority\n
- 	cacr_set(CACHE_INITIAL_MODE);
- }
- 
-+#if defined(CONFIG_M54455)
- void settimericr(unsigned int timer, unsigned int level)
- {
- 	volatile unsigned char *icrp;
-@@ -202,6 +237,7 @@ void settimericr(unsigned int timer, uns
- 		coldfire_enable_irq0(irq);
- 	}
- }
-+#endif
- 
- /* Assembler routines */
- asmlinkage void buserr(void);
-@@ -214,7 +250,11 @@ void __init coldfire_trap_init(void)
- 	int i = 0;
- 	e_vector *vectors;
- 
-+#if defined(CONFIG_M54455)
- 	vectors = (e_vector *)MCF_RAMBAR1;
-+#elif defined(CONFIG_M547X_8X)
-+	vectors = (e_vector *)MCF_RAMBAR0;
-+#endif
- 	/*
- 	 * There is a common trap handler and common interrupt
- 	 * handler that handle almost every vector. We treat
-@@ -235,6 +275,8 @@ void __init coldfire_trap_init(void)
- 	vectors[32] = system_call;
- }
- 
-+#if defined(CONFIG_M54455)
-+
- void coldfire_tick(void)
- {
- 	/* Reset the ColdFire timer */
-@@ -285,13 +327,49 @@ unsigned long coldfire_gettimeoffset(voi
- 	return offset;
- }
- 
-+#elif defined(CONFIG_M547X_8X)
-+
-+void coldfire_tick(void)
-+{
-+	/* Reset the ColdFire timer */
-+	MCF_SSR(0) = MCF_SSR_ST;
-+}
-+
-+void __init coldfire_sched_init(irq_handler_t handler)
-+{
-+	int irq = ISC_SLTn(0);
-+
-+	MCF_SCR(0) = 0;
-+	MCF_ICR(irq) = ILP_SLT0;
-+	request_irq(64 + irq, handler, IRQF_DISABLED, "ColdFire Timer 0", NULL);
-+	MCF_SLTCNT(0) = MCF_BUSCLK / HZ;
-+	MCF_SCR(0) |=  MCF_SCR_TEN | MCF_SCR_IEN | MCF_SCR_RUN;
-+}
-+
-+unsigned long coldfire_gettimeoffset(void)
-+{
-+	volatile unsigned long trr, tcn, offset;
-+	trr = MCF_SLTCNT(0);
-+	tcn = MCF_SCNT(0);
-+
-+	offset = (trr - tcn) * ((1000000 >> 3) / HZ) / (trr >> 3);
-+	if (MCF_SSR(0) & MCF_SSR_ST)
-+		offset += 1000000 / HZ;
-+
-+	return offset;
-+}
-+
-+#endif
-+
- void coldfire_reboot(void)
- {
-+#if defined(CONFIG_M54455)
- 	/* disable interrupts and do a software reset */
- 	asm("movew #0x2700, %%sr\n\t"
- 	    "moveb #0x80, %%d0\n\t"
- 	    "moveb %%d0, 0xfc0a0000\n\t"
- 	    : : : "%d0");
-+#endif
- }
- 
- /* int coldfire_hwclk(int i, struct rtc_time *t)
-@@ -305,6 +383,7 @@ static void coldfire_get_model(char *mod
- 	sprintf(model, "Version 4 ColdFire");
- }
- 
-+/* JKM -- Why do we need these? */
- void coldfire_enable_irq(unsigned int vec)
- {
- 	unsigned long flags;
-@@ -318,13 +397,21 @@ void coldfire_enable_irq(unsigned int ve
- 
- 	local_irq_save(flags);
- 	irq_enable[vec]++;
-+#if defined(CONFIG_M54455)
- 	if (vec < 32)
- 		MCF_INTC0_IMRL &= ~(1 << vec);
- 	else
- 		MCF_INTC0_IMRH &= ~(1 << (vec - 32));
-+#elif defined(CONFIG_M547X_8X)
-+	if (vec < 32)
-+		MCF_IMRL &= ~(1 << vec);
-+	else
-+		MCF_IMRH &= ~(1 << (vec - 32));
-+#endif
- 	local_irq_restore(flags);
- }
- 
-+/* JKM -- Why do we need these? */
- void coldfire_disable_irq(unsigned int vec)
- {
- 	unsigned long flags;
-@@ -338,10 +425,17 @@ void coldfire_disable_irq(unsigned int v
- 
- 	local_irq_save(flags);
- 	if (--irq_enable[vec] == 0) {
-+#if defined(CONFIG_M54455)
- 		if (vec < 32)
- 			MCF_INTC0_IMRL |= (1 << vec);
- 		else
- 			MCF_INTC0_IMRH |= (1 << (vec - 32));
-+#elif defined(CONFIG_M547X_8X)
-+		if (vec < 32)
-+			MCF_IMRL |= (1 << vec);
-+		else
-+			MCF_IMRH |= (1 << (vec - 32));
-+#endif
- 
- 	}
- 	local_irq_restore(flags);
---- a/arch/m68k/coldfire/head.S
-+++ b/arch/m68k/coldfire/head.S
-@@ -2,9 +2,9 @@
-  *  head.S is the MMU enabled ColdFire specific initial boot code
-  *
-  *  Ported to ColdFire by
-- *  Matt Waddel Matt.Waddel@freescale.com
-- *  Kurt Mahan kmahan@freescale.com
-- *  Copyright Freescale Semiconductor, Inc. 2007
-+ *    Matt Waddel Matt.Waddel@freescale.com
-+ *    Kurt Mahan kmahan@freescale.com
-+ *  Copyright Freescale Semiconductor, Inc. 2007, 2008
-  *
-  *  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
-@@ -52,6 +52,7 @@
- #define __FINIT		.previous
- #endif
- 
-+/* JKM -- REVISE DOCS FOR RIGO */
- /*
-  * Setup ACR mappings to provide the following memory map:
-  *   Data
-@@ -61,13 +62,20 @@
-  *     None currently (mapped via TLBs)
-  */
- 
-+#if defined(CONFIG_M54455)
- #define ACR0_DEFAULT	#0xA00FA048   /* ACR0 default value */
- #define ACR1_DEFAULT	#0xF00FA040   /* ACR1 default value */
- #define ACR2_DEFAULT	#0x00000000   /* ACR2 default value */
- #define ACR3_DEFAULT	#0x00000000   /* ACR3 default value */
--
- /* ACR mapping for FPGA (maps 0) */
- #define ACR0_FPGA	#0x000FA048   /* ACR0 enable FPGA */
-+#elif defined(CONFIG_M547X_8X)
-+#define ACR0_DEFAULT	#0xE000C040   /* ACR0 default value */
-+#define ACR1_DEFAULT	#0x00000000   /* ACR1 default value */
-+#define ACR2_DEFAULT	#0x00000000   /* ACR2 default value */
-+#define ACR3_DEFAULT	#0x00000000   /* ACR3 default value */
-+#endif
-+
- 
- /* Several macros to make the writing of subroutines easier:
-  * - func_start marks the beginning of the routine which setups the frame
-@@ -227,7 +235,7 @@ ENTRY(_stext)
- 
- 	.long	BOOTINFOV_MAGIC
- 	.long	0
--1:	jmp	__start-0x80000000
-+1:	jmp	__start-(0xc0000000-CONFIG_SDRAM_BASE)
- 
- .equ	kernel_pg_dir,_stext
- .equ	.,_stext+0x1000
-@@ -237,19 +245,40 @@ ENTRY(_start)
- __INIT
- ENTRY(__start)
- 
-+/* JKM -- make sure Rigo handles UBOOT */
- /* Save the location of u-boot info - cmd line, bd_info, etc. */
- 	movel	%a7,%a4		/* Don't use %a4 before cf_early_init */
-+/* JKM -- fix to use CONFIG_SDRAM_BASE) */
-+#if defined(CONFIG_M54455)
- 	addl	#0x80000004,%a4	/* 0x80000004= 1 stack push + high mem offset */
-+#elif defined(CONFIG_M547X_8X)
-+	addl	#0xc0000004,%a4	/* 0x80000004= 1 stack push + high mem offset */
-+#endif
- 
-+/* JKM -- fix this to work off of CONFIG_SDRAM_BASE */
- /* Setup initial stack pointer */
-+#if defined(CONFIG_M54455)
- 	movel	#0x40001000,%sp	
-+#elif defined(CONFIG_M547X_8X)
-+	movel	#0x00001000,%sp	
-+#endif
- 
- /* Setup usp */
- 	subl	%a0,%a0
- 	movel	%a0,%usp
- 
-+#if defined(CONFIG_M54455)
- 	movel  #(MCF_RAMBAR1 + 0x221), %d0
- 	movec   %d0, %rambar1
-+#elif defined(CONFIG_M547X_8X)
-+	movel   #MCF_MBAR, %d0
-+	movec   %d0, %mbar
-+	move.l  #(MCF_RAMBAR0 + 0x21), %d0
-+	movec   %d0, %rambar0
-+	move.l  #(MCF_RAMBAR1 + 0x21), %d0
-+	movec   %d0, %rambar1
-+#endif
-+
- 	movew	#0x2700,%sr
- 
- /* reset cache */
-@@ -278,6 +307,7 @@ ENTRY(__start)
- 	/* If you change the memory size to another value make a matching 
- 	   change in paging_init(cf-mmu.c) to zones_size[]. */
- 
-+#if defined(CONFIG_M54455)
- 	/* Map 256MB as code */
- 	mmu_map	(PAGE_OFFSET+0*0x1000000),  (PHYS_OFFSET+0*0x1000000), \
- 		MMUOR_ITLB, 0, MMUTR_SG, MMUDR_SZ16M, MMUDR_IC,  MMUDR_SP, \
-@@ -383,16 +413,104 @@ ENTRY(__start)
- 		MMUTR_SG, MMUDR_SZ16M, MMUDR_DNCP, MMUDR_SP, MMUDR_R, MMUDR_W, \
- 		0, MMUDR_LK, %d0
- 
--	/* Do unity mapping to enable the MMU.  Map first 16 MB in place as 
--	   code (delete TLBs after MMU is enabled and we are executing in high 
--	   memory). */
-+#elif defined(CONFIG_M547X_8X)
-+
-+	/* Map first 8 MB as code */
-+	mmu_map (PAGE_OFFSET+0*1024*1024),  (0*1024*1024), MMUOR_ITLB, 0, \
-+		MMUTR_SG, MMUDR_SZ1M, MMUDR_IC,  MMUDR_SP, 0, 0, MMUDR_X, \
-+		MMUDR_LK, %d0
-+	mmu_map (PAGE_OFFSET+1*1024*1024),  (1*1024*1024), MMUOR_ITLB, 0, \
-+		MMUTR_SG, MMUDR_SZ1M, MMUDR_IC,  MMUDR_SP, 0, 0, MMUDR_X, \
-+		MMUDR_LK, %d0
-+	mmu_map (PAGE_OFFSET+2*1024*1024),  (2*1024*1024), MMUOR_ITLB, 0, \
-+		MMUTR_SG, MMUDR_SZ1M, MMUDR_IC,  MMUDR_SP, 0, 0, MMUDR_X, \
-+		MMUDR_LK, %d0
-+	mmu_map (PAGE_OFFSET+3*1024*1024),  (3*1024*1024), MMUOR_ITLB, 0, \
-+		MMUTR_SG, MMUDR_SZ1M, MMUDR_IC,  MMUDR_SP, 0, 0, MMUDR_X, \
-+		MMUDR_LK, %d0
-+	mmu_map (PAGE_OFFSET+4*1024*1024),  (4*1024*1024), MMUOR_ITLB, 0, \
-+		MMUTR_SG, MMUDR_SZ1M, MMUDR_IC,  MMUDR_SP, 0, 0, MMUDR_X, \
-+		MMUDR_LK, %d0
-+	mmu_map (PAGE_OFFSET+5*1024*1024),  (5*1024*1024), MMUOR_ITLB, 0, \
-+		MMUTR_SG, MMUDR_SZ1M, MMUDR_IC,  MMUDR_SP, 0, 0, MMUDR_X, \
-+		MMUDR_LK, %d0
-+	mmu_map (PAGE_OFFSET+6*1024*1024),  (6*1024*1024), MMUOR_ITLB, 0, \
-+		MMUTR_SG, MMUDR_SZ1M, MMUDR_IC,  MMUDR_SP, 0, 0, MMUDR_X, \
-+		MMUDR_LK, %d0
-+	mmu_map (PAGE_OFFSET+7*1024*1024),  (7*1024*1024), MMUOR_ITLB, 0, \
-+		MMUTR_SG, MMUDR_SZ1M, MMUDR_IC,  MMUDR_SP, 0, 0, MMUDR_X, \
-+		MMUDR_LK, %d0
-+
-+	/* Map first 8 MB as data */
-+	mmu_map (PAGE_OFFSET+0*1024*1024),  (0*1024*1024), 0, 0, \
-+		MMUTR_SG, MMUDR_SZ1M, MMUDR_DNCP, MMUDR_SP, MMUDR_R, \
-+		MMUDR_W, 0, MMUDR_LK, %d0
-+	mmu_map (PAGE_OFFSET+1*1024*1024),  (1*1024*1024), 0, 0, \
-+		MMUTR_SG, MMUDR_SZ1M, MMUDR_DNCP, MMUDR_SP, MMUDR_R, \
-+		MMUDR_W, 0, MMUDR_LK, %d0
-+	mmu_map (PAGE_OFFSET+2*1024*1024),  (2*1024*1024), 0, 0, \
-+		MMUTR_SG, MMUDR_SZ1M, MMUDR_DNCP, MMUDR_SP, MMUDR_R, \
-+		MMUDR_W, 0, MMUDR_LK, %d0
-+	mmu_map (PAGE_OFFSET+3*1024*1024),  (3*1024*1024), 0, 0, \
-+		MMUTR_SG, MMUDR_SZ1M, MMUDR_DNCP, MMUDR_SP, MMUDR_R, \
-+		MMUDR_W, 0, MMUDR_LK, %d0
-+	mmu_map (PAGE_OFFSET+4*1024*1024),  (4*1024*1024), 0, 0, \
-+		MMUTR_SG, MMUDR_SZ1M, MMUDR_DNCP, MMUDR_SP, MMUDR_R, \
-+		MMUDR_W, 0, MMUDR_LK, %d0
-+	mmu_map (PAGE_OFFSET+5*1024*1024),  (5*1024*1024), 0, 0, \
-+		MMUTR_SG, MMUDR_SZ1M, MMUDR_DNCP, MMUDR_SP, MMUDR_R, \
-+		MMUDR_W, 0, MMUDR_LK, %d0
-+	mmu_map (PAGE_OFFSET+6*1024*1024),  (6*1024*1024), 0, 0, \
-+		MMUTR_SG, MMUDR_SZ1M, MMUDR_DNCP, MMUDR_SP, MMUDR_R, \
-+		MMUDR_W, 0, MMUDR_LK, %d0
-+	mmu_map (PAGE_OFFSET+7*1024*1024),  (7*1024*1024), 0, 0, \
-+		MMUTR_SG, MMUDR_SZ1M, MMUDR_DNCP, MMUDR_SP, MMUDR_R, \
-+		MMUDR_W, 0, MMUDR_LK, %d0
-+#endif
-+	/*
-+	 * Do unity mapping to enable the MMU.  Map first chunk of memory
-+	 * in place as code/data.  The TLBs will be deleted after the MMU is
-+	 * enabled and we are executing in high memory.
-+	 */
-+
-+#if defined(CONFIG_M54455)
-+	/* Map first 16 MB as code */
- 	mmu_map	(PHYS_OFFSET+0*0x1000000), (PHYS_OFFSET+0*0x1000000), \
- 		MMUOR_ITLB, 0, MMUTR_SG, MMUDR_SZ16M, MMUDR_INC,  MMUDR_SP, 0, \
- 		0, MMUDR_X, 0, %d0
--	/* Map first 16 MB as data too.  */
-+	/* Map first 16 MB as data too  */
- 	mmu_map	(PHYS_OFFSET+0*0x1000000), (PHYS_OFFSET+0*0x1000000), 0, 0, \
- 		MMUTR_SG, MMUDR_SZ16M, MMUDR_DNCP, MMUDR_SP, MMUDR_R, MMUDR_W, \
- 		0, 0, %d0
-+#elif defined(CONFIG_M547X_8X)
-+	/* Map first 4 MB as code */
-+	mmu_map (0*1024*1024), (0*1024*1024), MMUOR_ITLB, 0, \
-+		MMUTR_SG, MMUDR_SZ1M, MMUDR_IC,  MMUDR_SP, 0, 0, \
-+		MMUDR_X, 0, %d0
-+	mmu_map (1*1024*1024), (1*1024*1024), MMUOR_ITLB, 0, \
-+		MMUTR_SG, MMUDR_SZ1M, MMUDR_IC,  MMUDR_SP, 0, 0, \
-+		MMUDR_X, 0, %d0
-+	mmu_map (2*1024*1024), (2*1024*1024), MMUOR_ITLB, 0, \
-+		MMUTR_SG, MMUDR_SZ1M, MMUDR_IC,  MMUDR_SP, 0, 0, \
-+		MMUDR_X, 0, %d0
-+	mmu_map (3*1024*1024), (3*1024*1024), MMUOR_ITLB, 0, \
-+		MMUTR_SG, MMUDR_SZ1M, MMUDR_IC,  MMUDR_SP, 0, 0, \
-+		MMUDR_X, 0, %d0
-+
-+	/* Map first 4 MB as data too */
-+	mmu_map (0*1024*1024), (0*1024*1024), 0, 0, \
-+		MMUTR_SG, MMUDR_SZ1M, MMUDR_DCB, MMUDR_SP, MMUDR_R, \
-+		MMUDR_W, 0, 0, %d0
-+	mmu_map (1*1024*1024), (1*1024*1024), 0, 0, \
-+		MMUTR_SG, MMUDR_SZ1M, MMUDR_DCB, MMUDR_SP, MMUDR_R, \
-+		MMUDR_W, 0, 0, %d0
-+	mmu_map (2*1024*1024), (2*1024*1024), 0, 0, \
-+		MMUTR_SG, MMUDR_SZ1M, MMUDR_DCB, MMUDR_SP, MMUDR_R, \
-+		MMUDR_W, 0, 0, %d0
-+	mmu_map (3*1024*1024), (3*1024*1024), 0, 0, \
-+		MMUTR_SG, MMUDR_SZ1M, MMUDR_DCB, MMUDR_SP, MMUDR_R, \
-+		MMUDR_W, 0, 0, %d0
-+#endif
- 
- 	/* Turn on MMU */
- 	movel	#(MMUCR_EN),%a0
-@@ -412,9 +530,20 @@ ENTRY(__running_high)
- 	addl	#PAGE_OFFSET,%a1
- 	movel	%a1,%a0@
- 
--	/* Unmap first 16 MB, code and data.  */
-+	/* Unmap unity mappings */
-+#if defined(CONFIG_M54455)
- 	mmu_unmap (PHYS_OFFSET+0*0x1000000), MMUOR_ITLB, %d0
- 	mmu_unmap (PHYS_OFFSET+0*0x1000000), 0, %d0
-+#elif defined(CONFIG_M547X_8X)
-+	mmu_unmap (PHYS_OFFSET+0*0x1000000), MMUOR_ITLB, %d0
-+	mmu_unmap (PHYS_OFFSET+1*0x1000000), MMUOR_ITLB, %d0
-+	mmu_unmap (PHYS_OFFSET+2*0x1000000), MMUOR_ITLB, %d0
-+	mmu_unmap (PHYS_OFFSET+3*0x1000000), MMUOR_ITLB, %d0
-+	mmu_unmap (PHYS_OFFSET+0*0x1000000), 0, %d0
-+	mmu_unmap (PHYS_OFFSET+1*0x1000000), 0, %d0
-+	mmu_unmap (PHYS_OFFSET+2*0x1000000), 0, %d0
-+	mmu_unmap (PHYS_OFFSET+3*0x1000000), 0, %d0
-+#endif
- 
- /* Setup initial stack pointer */
- 	lea	init_task,%a2 
-@@ -438,8 +567,9 @@ func_start	set_context,%d0,(1*4)
- 	movec	%d0,%asid
- func_return	set_context
- 
-+#ifdef CONFIG_M54455
- /*
-- * set_fpga(addr,val)
-+ * set_fpga(addr,val) on the M54455EVB
-  *
-  * Map in 0x00000000 -> 0x0fffffff and then do the write.
-  */
-@@ -456,6 +586,7 @@ set_fpga:
- 	nop
- 	movew	%d1,%sr
- 	rts
-+#endif
- 
- 	.data
- 	.align	4
---- a/arch/m68k/coldfire/ints.c
-+++ b/arch/m68k/coldfire/ints.c
-@@ -5,9 +5,10 @@
-  * Copyright (C) 1998  D. Jeff Dionne <jeff@lineo.ca>,
-  *                     Kenneth Albanowski <kjahds@kjahds.com>,
-  * Copyright (C) 2000  Lineo Inc. (www.lineo.com)
-- * Matt Waddel Matt.Waddel@freescale.com
-- * Copyright Freescale Semiconductor, Inc. 2007
-- * Kurt Mahan kmahan@freescale.com
-+ *
-+ * Copyright Freescale Semiconductor, Inc. 2007, 2008
-+ * 	Kurt Mahan kmahan@freescale.com
-+ * 	Matt Waddel Matt.Waddel@freescale.com
-  *
-  * Based on:
-  * linux/arch/m68k/kernel/ints.c &
-@@ -46,7 +47,7 @@ static int irq_depth[SYS_IRQS];
- /*
-  * IRQ Controller
-  */
--#ifdef CONFIG_M54455
-+#if defined(CONFIG_M54455)
- void m5445x_irq_enable(unsigned int irq);
- void m5445x_irq_disable(unsigned int irq);
- static struct irq_controller m5445x_irq_controller = {
-@@ -55,6 +56,17 @@ static struct irq_controller m5445x_irq_
- 	.enable		= m5445x_irq_enable,
- 	.disable	= m5445x_irq_disable,
- };
-+#elif defined(CONFIG_M547X_8X)
-+void m547x_8x_irq_enable(unsigned int irq);
-+void m547x_8x_irq_disable(unsigned int irq);
-+static struct irq_controller m547x_8x_irq_controller = {
-+	.name		= "M547X_8X",
-+	.lock		= SPIN_LOCK_UNLOCKED,
-+	.enable		= m547x_8x_irq_enable,
-+	.disable	= m547x_8x_irq_disable,
-+};
-+#else
-+# error No IRQ controller defined
- #endif
- 
- #define	POOL_SIZE 	SYS_IRQS
-@@ -75,9 +87,12 @@ void __init init_IRQ(void)
- {
- 	int i;
- 
--#ifdef CONFIG_M54455
-+#if defined(CONFIG_M54455)
- 	for (i = 0; i < SYS_IRQS; i++)
- 		irq_controller[i] = &m5445x_irq_controller;
-+#elif defined(CONFIG_M547X_8X)
-+	for (i = 0; i < SYS_IRQS; i++)
-+		irq_controller[i] = &m547x_8x_irq_controller;
- #endif
- }
- 
-@@ -381,4 +396,57 @@ void m5445x_irq_disable(unsigned int irq
- 		MCF_INTC1_SIMR = irq;
- 	}
- }
-+#elif defined(CONFIG_M547X_8X)
-+/*
-+ * M547X_8X Implementation
-+ */
-+void m547x_8x_irq_enable(unsigned int irq)
-+{
-+	/* enable the interrupt hardware */
-+	if (irq < 64)
-+		return;
-+
-+	/* adjust past non-hardware ints */
-+	irq -= 64;
-+
-+/* JKM -- re-add EPORT later */
-+#if 0
-+	/* check for eport */
-+	if ((irq > 0) && (irq < 8)) {
-+		/* enable eport */
-+		MCF_EPORT_EPPAR &= ~(3 << (irq*2));	/* level */
-+		MCF_EPORT_EPDDR &= ~(1 << irq);		/* input */
-+		MCF_EPORT_EPIER |= 1 << irq;		/* irq enabled */
-+	}
-+#endif
-+
-+	if (irq < 32)
-+		MCF_IMRL &= ~(1 << irq);
-+	else
-+		MCF_IMRH &= ~(1 << (irq - 32));
-+}
-+
-+void m547x_8x_irq_disable(unsigned int irq)
-+{
-+	/* disable the interrupt hardware */
-+	if (irq < 64)
-+		return;
-+
-+	/* adjust past non-hardware ints */
-+	irq -= 64;
-+
-+/* JKM -- re-add EPORT later */
-+#if 0
-+	/* check for eport */
-+	if ((irq > 0) && (irq < 8)) {
-+		/* disable eport */
-+		MCF_EPORT_EPIER &= ~(1 << irq);
-+	}
-+#endif
-+
-+	if (irq < 32)
-+		MCF_IMRL |= (1 << irq);
-+	else
-+		MCF_IMRH |= (1 << (irq - 32));
-+}
- #endif
---- /dev/null
-+++ b/arch/m68k/configs/m5485evb_defconfig
-@@ -0,0 +1,777 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.24
-+# Thu Feb 21 00:19:01 2008
-+#
-+CONFIG_M68K=y
-+CONFIG_MMU=y
-+# CONFIG_GENERIC_TIME is not set
-+# CONFIG_GENERIC_CLOCKEVENTS is not set
-+CONFIG_RWSEM_GENERIC_SPINLOCK=y
-+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_TIME_LOW_RES=y
-+CONFIG_GENERIC_IOMAP=y
-+# CONFIG_NO_IOPORT is not set
-+# CONFIG_NO_DMA is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_USER_NS is not set
-+# CONFIG_PID_NS is not set
-+# CONFIG_AUDIT is not set
-+CONFIG_IKCONFIG=y
-+CONFIG_IKCONFIG_PROC=y
-+CONFIG_LOG_BUF_SHIFT=17
-+# CONFIG_CGROUPS is not set
-+CONFIG_FAIR_GROUP_SCHED=y
-+CONFIG_FAIR_USER_SCHED=y
-+# CONFIG_FAIR_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+# CONFIG_RELAY is not set
-+# CONFIG_BLK_DEV_INITRD is not set
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+# CONFIG_EMBEDDED is not set
-+CONFIG_UID16=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_ALL is not set
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+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_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLAB=y
-+# CONFIG_SLUB is not set
-+# CONFIG_SLOB is not set
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+CONFIG_MODULE_FORCE_UNLOAD=y
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+# CONFIG_KMOD is not set
-+CONFIG_BLOCK=y
-+CONFIG_LBD=y
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+# CONFIG_DEFAULT_AS is not set
-+# CONFIG_DEFAULT_DEADLINE is not set
-+CONFIG_DEFAULT_CFQ=y
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="cfq"
-+
-+#
-+# Platform dependent setup
-+#
-+# CONFIG_SUN3 is not set
-+CONFIG_COLDFIRE=y
-+CONFIG_CFV4E=y
-+# CONFIG_AMIGA is not set
-+# CONFIG_ATARI is not set
-+# CONFIG_MAC is not set
-+# CONFIG_APOLLO is not set
-+# CONFIG_VME is not set
-+# CONFIG_HP300 is not set
-+# CONFIG_SUN3X is not set
-+# CONFIG_Q40 is not set
-+
-+#
-+# Processor type
-+#
-+# CONFIG_M68020 is not set
-+# CONFIG_M68030 is not set
-+# CONFIG_M68040 is not set
-+# CONFIG_M68060 is not set
-+# CONFIG_M54455 is not set
-+CONFIG_M547X_8X=y
-+# CONFIG_M547X is not set
-+CONFIG_M548X=y
-+# CONFIG_M5475AFE is not set
-+# CONFIG_M5475BFE is not set
-+# CONFIG_M5475CFE is not set
-+# CONFIG_M5475DFE is not set
-+# CONFIG_M5475EFE is not set
-+# CONFIG_M5475FFE is not set
-+# CONFIG_M5485AFE is not set
-+# CONFIG_M5485BFE is not set
-+CONFIG_M5485CFE=y
-+# CONFIG_M5485DFE is not set
-+# CONFIG_M5485EFE is not set
-+# CONFIG_M5485FFE is not set
-+CONFIG_MCFCLK=50000000
-+# CONFIG_MCF_USER_HALT is not set
-+CONFIG_MMU_CFV4E=y
-+CONFIG_SDRAM_BASE=0x00000000
-+CONFIG_SDRAM_SIZE=0x04000000
-+# CONFIG_M68KFPU_EMU is not set
-+CONFIG_ADVANCED=y
-+# CONFIG_RMW_INSNS is not set
-+CONFIG_SINGLE_MEMORY_CHUNK=y
-+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+CONFIG_NEED_MULTIPLE_NODES=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+
-+#
-+# General setup
-+#
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_AOUT is not set
-+# CONFIG_BINFMT_MISC is not set
-+CONFIG_PROC_HARDWARE=y
-+CONFIG_ZONE_DMA=y
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
-+
-+#
-+# Power management options
-+#
-+# CONFIG_PM is not set
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+CONFIG_NET_KEY=y
-+# CONFIG_NET_KEY_MIGRATE is not set
-+CONFIG_INET=y
-+# CONFIG_IP_MULTICAST is not set
-+CONFIG_IP_ADVANCED_ROUTER=y
-+CONFIG_ASK_IP_FIB_HASH=y
-+# CONFIG_IP_FIB_TRIE is not set
-+CONFIG_IP_FIB_HASH=y
-+# CONFIG_IP_MULTIPLE_TABLES is not set
-+# CONFIG_IP_ROUTE_MULTIPATH is not set
-+# CONFIG_IP_ROUTE_VERBOSE is not set
-+CONFIG_IP_PNP=y
-+# CONFIG_IP_PNP_DHCP is not set
-+# CONFIG_IP_PNP_BOOTP is not set
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_ARPD is not set
-+# CONFIG_SYN_COOKIES is not set
-+CONFIG_INET_AH=y
-+CONFIG_INET_ESP=y
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_BEET is not set
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+# CONFIG_STANDALONE is not set
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=y
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+# CONFIG_MTD is not set
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=64000
-+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=y
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=y
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+# CONFIG_BLK_DEV_SR is not set
-+# CONFIG_CHR_DEV_SG is not set
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+CONFIG_SCSI_MULTI_LUN=y
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+# CONFIG_SCSI_SCAN_ASYNC is not set
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+# CONFIG_SCSI_LOWLEVEL is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_B44 is not set
-+# CONFIG_NETDEV_1000 is not set
-+# CONFIG_NETDEV_10000 is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_SHAPER is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+CONFIG_INPUT_MOUSEDEV=y
-+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-+# CONFIG_INPUT_JOYDEV is not set
-+CONFIG_INPUT_EVDEV=y
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+CONFIG_INPUT_KEYBOARD=y
-+# CONFIG_KEYBOARD_ATKBD is not set
-+# CONFIG_KEYBOARD_SUNKBD is not set
-+# CONFIG_KEYBOARD_LKKBD is not set
-+# CONFIG_KEYBOARD_XTKBD is not set
-+# CONFIG_KEYBOARD_NEWTON is not set
-+# CONFIG_KEYBOARD_STOWAWAY is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+CONFIG_SERIO=y
-+CONFIG_SERIO_SERPORT=y
-+# CONFIG_SERIO_RAW is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+CONFIG_VT=y
-+CONFIG_VT_CONSOLE=y
-+CONFIG_HW_CONSOLE=y
-+# CONFIG_VT_HW_CONSOLE_BINDING is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+# CONFIG_SERIAL_8250 is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+CONFIG_SERIAL_COLDFIRE=y
-+CONFIG_UNIX98_PTYS=y
-+# CONFIG_LEGACY_PTYS is not set
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_COLDFIRE_EDMA is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Console display driver support
-+#
-+CONFIG_DUMMY_CONSOLE=y
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+CONFIG_HID_DEBUG=y
-+# CONFIG_HIDRAW is not set
-+# CONFIG_USB_SUPPORT is not set
-+# CONFIG_MMC is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_RTC_CLASS is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_SERIAL_CONSOLE is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+CONFIG_EXT3_FS_XATTR=y
-+# CONFIG_EXT3_FS_POSIX_ACL is not set
-+# CONFIG_EXT3_FS_SECURITY is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_MINIX_FS=y
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_INOTIFY is not set
-+# CONFIG_QUOTA is not set
-+CONFIG_DNOTIFY=y
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+CONFIG_FAT_FS=y
-+CONFIG_MSDOS_FS=y
-+CONFIG_VFAT_FS=y
-+CONFIG_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+CONFIG_NTFS_FS=y
-+# CONFIG_NTFS_DEBUG is not set
-+CONFIG_NTFS_RW=y
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+# CONFIG_PROC_KCORE is not set
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+# CONFIG_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+# CONFIG_NFS_V3 is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_BSD_DISKLABEL is not set
-+# CONFIG_MINIX_SUBPARTITION is not set
-+# CONFIG_SOLARIS_X86_PARTITION is not set
-+# CONFIG_UNIXWARE_DISKLABEL is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+CONFIG_NLS=y
-+CONFIG_NLS_DEFAULT="iso8859-1"
-+CONFIG_NLS_CODEPAGE_437=y
-+# CONFIG_NLS_CODEPAGE_737 is not set
-+# CONFIG_NLS_CODEPAGE_775 is not set
-+# CONFIG_NLS_CODEPAGE_850 is not set
-+# CONFIG_NLS_CODEPAGE_852 is not set
-+# CONFIG_NLS_CODEPAGE_855 is not set
-+# CONFIG_NLS_CODEPAGE_857 is not set
-+# CONFIG_NLS_CODEPAGE_860 is not set
-+# CONFIG_NLS_CODEPAGE_861 is not set
-+# CONFIG_NLS_CODEPAGE_862 is not set
-+# CONFIG_NLS_CODEPAGE_863 is not set
-+# CONFIG_NLS_CODEPAGE_864 is not set
-+# CONFIG_NLS_CODEPAGE_865 is not set
-+# CONFIG_NLS_CODEPAGE_866 is not set
-+# CONFIG_NLS_CODEPAGE_869 is not set
-+# CONFIG_NLS_CODEPAGE_936 is not set
-+# CONFIG_NLS_CODEPAGE_950 is not set
-+# CONFIG_NLS_CODEPAGE_932 is not set
-+# CONFIG_NLS_CODEPAGE_949 is not set
-+# CONFIG_NLS_CODEPAGE_874 is not set
-+# CONFIG_NLS_ISO8859_8 is not set
-+# CONFIG_NLS_CODEPAGE_1250 is not set
-+# CONFIG_NLS_CODEPAGE_1251 is not set
-+# CONFIG_NLS_ASCII is not set
-+CONFIG_NLS_ISO8859_1=y
-+# CONFIG_NLS_ISO8859_2 is not set
-+# CONFIG_NLS_ISO8859_3 is not set
-+# CONFIG_NLS_ISO8859_4 is not set
-+# CONFIG_NLS_ISO8859_5 is not set
-+# CONFIG_NLS_ISO8859_6 is not set
-+# CONFIG_NLS_ISO8859_7 is not set
-+# CONFIG_NLS_ISO8859_9 is not set
-+# CONFIG_NLS_ISO8859_13 is not set
-+# CONFIG_NLS_ISO8859_14 is not set
-+# CONFIG_NLS_ISO8859_15 is not set
-+# CONFIG_NLS_KOI8_R is not set
-+# CONFIG_NLS_KOI8_U is not set
-+CONFIG_NLS_UTF8=y
-+# CONFIG_DLM is not set
-+CONFIG_INSTRUMENTATION=y
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+# CONFIG_ENABLE_MUST_CHECK is not set
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+CONFIG_DEBUG_SLAB=y
-+# CONFIG_DEBUG_SLAB_LEAK is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+CONFIG_DEBUG_BUGVERBOSE=y
-+CONFIG_DEBUG_INFO=y
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_FRAME_POINTER is not set
-+CONFIG_FORCED_INLINING=y
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+CONFIG_BOOTPARAM=y
-+CONFIG_BOOTPARAM_STRING="root=/dev/nfs rw nfsroot=172.27.163.2:/tftpboot/ltib ip=172.27.163.3:172.27.163.2:172.27.255.254:255.255.0.0::eth0:off mtdparts=phys_mapped_flash:16m(User)"
-+
-+#
-+# CodeTEST Setup
-+#
-+# CONFIG_CODETEST is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+CONFIG_CRYPTO_HASH=y
-+CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_HMAC=y
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+CONFIG_CRYPTO_MD5=y
-+CONFIG_CRYPTO_SHA1=y
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+CONFIG_CRYPTO_CBC=y
-+# CONFIG_CRYPTO_PCBC is not set
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+CONFIG_CRYPTO_TEST=m
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_HW is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+CONFIG_CRC_CCITT=y
-+CONFIG_CRC16=y
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+CONFIG_LIBCRC32C=y
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
---- a/drivers/serial/mcfserial.c
-+++ b/drivers/serial/mcfserial.c
-@@ -45,6 +45,11 @@
- #include <asm/coldfire.h>
- #include <asm/mcfsim.h>
- #include <asm/mcfuart.h>
-+#if defined(CONFIG_M547X_8X)
-+#include <asm/m5485sim.h>
-+#include <asm/m5485psc.h>
-+#include <asm/m5485gpio.h>
-+#endif
- #ifdef CONFIG_NETtel
- #include <asm/nettel.h>
- #endif
-@@ -64,7 +69,7 @@ struct timer_list mcfrs_timer_struct;
- #define	DEFAULT_CBAUD		B38400
- #elif defined(CONFIG_MOD5272) || defined(CONFIG_M5208EVB) || \
-       defined(CONFIG_M5329EVB) || defined(CONFIG_GILBARCO) || \
--      defined(CONFIG_M54455)
-+      defined(CONFIG_M54455) || defined(CONFIG_M547X_8X)
- #define CONSOLE_BAUD_RATE 	115200
- #define DEFAULT_CBAUD		B115200
- #elif defined(CONFIG_ARNEWSH) || defined(CONFIG_FREESCALE) || \
-@@ -97,7 +102,8 @@ static struct tty_driver *mcfrs_serial_d
- #undef SERIAL_DEBUG_FLOW
- 
- #if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \
--    defined(CONFIG_M520x) || defined(CONFIG_M532x) || defined(CONFIG_M54455)
-+    defined(CONFIG_M520x) || defined(CONFIG_M532x) || defined(CONFIG_M54455) || \
-+    defined(CONFIG_M547X_8X)
- #define	IRQBASE	(MCFINT_VECBASE+MCFINT_UART0)
- #else
- #define	IRQBASE	73
-@@ -117,7 +123,11 @@ static struct mcf_serial mcfrs_table[] =
- 	{  /* ttyS1 */
- 		.magic = 0,
- 		.addr = (volatile unsigned char *) (MCF_MBAR+MCFUART_BASE2),
-+#if defined(CONFIG_M547X_8X)
-+		.irq = IRQBASE-1,
-+#else
- 		.irq = IRQBASE+1,
-+#endif
- 		.flags = ASYNC_BOOT_AUTOCONF,
- 	},
- #endif
-@@ -125,7 +135,11 @@ static struct mcf_serial mcfrs_table[] =
- 	{  /* ttyS2 */
- 		.magic = 0,
- 		.addr = (volatile unsigned char *) (MCF_MBAR+MCFUART_BASE3),
-+#if defined(CONFIG_M547X_8X)
-+		.irq = IRQBASE-2,
-+#else
- 		.irq = IRQBASE+2,
-+#endif
- 		.flags = ASYNC_BOOT_AUTOCONF,
- 	},
- #endif
-@@ -133,7 +147,11 @@ static struct mcf_serial mcfrs_table[] =
- 	{  /* ttyS3 */
- 		.magic = 0,
- 		.addr = (volatile unsigned char *) (MCF_MBAR+MCFUART_BASE4),
-+#if defined(CONFIG_M547X_8X)
-+		.irq = IRQBASE-3,
-+#else
- 		.irq = IRQBASE+3,
-+#endif
- 		.flags = ASYNC_BOOT_AUTOCONF,
- 	},
- #endif
-@@ -412,7 +430,12 @@ irqreturn_t mcfrs_interrupt(int irq, voi
- 	struct mcf_serial	*info;
- 	unsigned char		isr;
- 
-+/* JKM -- revisit! IRQ compute */
-+#if defined(CONFIG_M547X_8X)
-+	info = &mcfrs_table[(IRQBASE - irq)];
-+#else
- 	info = &mcfrs_table[(irq - IRQBASE)];
-+#endif
- 	isr = info->addr[MCFUART_UISR] & info->imr;
- 
- 	if (isr & MCFUART_UIR_RXREADY)
-@@ -1621,6 +1644,22 @@ static void mcfrs_irqinit(struct mcf_ser
- 		/* GPIOs also must be initalized, depends on board */
- 		break;
- 	}
-+#elif defined(CONFIG_M547X_8X)
-+	volatile unsigned char  *uartp;
-+	uartp = (volatile unsigned char *)info->addr;
-+
-+	if (info->line > 3) {
-+		printk("SERIAL: don't know how to handle UART %d interrupt?\n",
-+			info->line);
-+		return;
-+	}
-+
-+	/* Set GPIO port register to enable PSC(port) signals */
-+	MCF_PAR_PSCn(info->line) = (0
-+		| MCF_PAR_PSC_TXD
-+		| MCF_PAR_PSC_RXD);
-+
-+	MCF_ICR(info->irq - 64) = ILP_PSCn(info->line);
- #else
- 	volatile unsigned char	*icrp, *uartp;
- 
-@@ -1983,7 +2022,7 @@ struct console mcfrs_console = {
- 
- static int __init mcfrs_console_init(void)
- {
--#ifndef CONFIG_M54455
-+#if !(defined(CONFIG_M54455) || defined(CONFIG_M547X_8X))
- 	register_console(&mcfrs_console);
- #endif
- 	return 0;
---- a/include/asm-m68k/cf_pgalloc.h
-+++ b/include/asm-m68k/cf_pgalloc.h
-@@ -1,9 +1,14 @@
- #ifndef M68K_CF_PGALLOC_H
- #define M68K_CF_PGALLOC_H
- 
-+/* JKM -- added -- needed? */
-+#include <linux/highmem.h>
-+
- #include <asm/coldfire.h>
- #include <asm/page.h>
- #include <asm/cf_tlbflush.h>
-+/* JKM -- added -- needed? */
-+#include <asm/cf_cacheflush.h>
- 
- extern inline void pte_free_kernel(pte_t *pte)
- {
---- a/include/asm-m68k/cfcache.h
-+++ b/include/asm-m68k/cfcache.h
-@@ -70,7 +70,33 @@
- /* cache disabled for testing */
- #define CACHE_INITIAL_MODE 	(CF_CACR_EUSP)
- #endif /* CONFIG_M5445X_DISABLE_CACHE */
--#endif /* CONFIG_M54455 */
-+
-+#elif defined(CONFIG_M547X_8X)
-+/*
-+ * M547x/M548x Cache Configuration
-+ *	- cache line size is 16 bytes
-+ *	- cache is 4-way set associative
-+ *	- each cache has 512 sets (128k / 16bytes / 4way)
-+ *	- I-Cache size is 32KB
-+ *	- D-Cache size is 32KB
-+ */
-+#define ICACHE_SIZE 0x8000		/* instruction - 32k */
-+#define DCACHE_SIZE 0x8000		/* data - 32k */
-+
-+#define CACHE_LINE_SIZE 0x0010		/* 16 bytes */
-+#define CACHE_SETS 0x0200		/* 512 sets */
-+#define CACHE_WAYS 0x0004		/* 4 way */
-+
-+#define CACHE_DISABLE_MODE	(CF_CACR_DCINVA+	\
-+				 CF_CACR_BCINVA+	\
-+				 CF_CACR_ICINVA)
-+
-+#define CACHE_INITIAL_MODE 	(CF_CACR_DEC+		\
-+				 CF_CACR_BEC+		\
-+				 CF_CACR_IEC+		\
-+				 CF_CACR_DESB+		\
-+				 CF_CACR_EUSP)
-+#endif /* CONFIG_M547X_8X */
- 
- #ifndef __ASSEMBLY__
- 
---- a/include/asm-m68k/coldfire.h
-+++ b/include/asm-m68k/coldfire.h
-@@ -1,9 +1,16 @@
- #ifndef _COLDFIRE_H_
- #define _COLDFIRE_H_
- 
-+#if defined(CONFIG_M54455)
- #define MCF_MBAR	0x0
- #define MCF_RAMBAR1 	0x40000000
- #define MCF_SRAM	0x80000000
-+#elif defined(CONFIG_M547X_8X)
-+#define MCF_MBAR	0xE0000000
-+#define MCF_RAMBAR0	0xE3000000
-+#define MCF_RAMBAR1	0xE3001000
-+#endif
-+
- #define MCF_CLK     	CONFIG_MCFCLK
- #define MCF_BUSCLK	(CONFIG_MCFCLK/2)
- 
---- /dev/null
-+++ b/include/asm-m68k/m5485gpio.h
-@@ -0,0 +1,694 @@
-+/*
-+ * File:	mcf548x_gpio.h
-+ * Purpose:	Register and bit definitions for the MCF548X
-+ *
-+ * Notes:	
-+ *	
-+ */
-+
-+#ifndef _M5485GPIO_H_
-+#define _M5485GPIO_H_
-+
-+/*********************************************************************
-+*
-+* General Purpose I/O (GPIO)
-+*
-+*********************************************************************/
-+
-+/* Register read/write macros */
-+#define MCF_GPIO_PODR_FBCTL         MCF_REG08(0x000A00)
-+#define MCF_GPIO_PODR_FBCS          MCF_REG08(0x000A01)
-+#define MCF_GPIO_PODR_DMA           MCF_REG08(0x000A02)
-+#define MCF_GPIO_PODR_FEC0H         MCF_REG08(0x000A04)
-+#define MCF_GPIO_PODR_FEC0L         MCF_REG08(0x000A05)
-+#define MCF_GPIO_PODR_FEC1H         MCF_REG08(0x000A06)
-+#define MCF_GPIO_PODR_FEC1L         MCF_REG08(0x000A07)
-+#define MCF_GPIO_PODR_FECI2C        MCF_REG08(0x000A08)
-+#define MCF_GPIO_PODR_PCIBG         MCF_REG08(0x000A09)
-+#define MCF_GPIO_PODR_PCIBR         MCF_REG08(0x000A0A)
-+#define MCF_GPIO_PODR_PSC3PSC2      MCF_REG08(0x000A0C)
-+#define MCF_GPIO_PODR_PSC1PSC0      MCF_REG08(0x000A0D)
-+#define MCF_GPIO_PODR_DSPI          MCF_REG08(0x000A0E)
-+#define MCF_GPIO_PDDR_FBCTL         MCF_REG08(0x000A10)
-+#define MCF_GPIO_PDDR_FBCS          MCF_REG08(0x000A11)
-+#define MCF_GPIO_PDDR_DMA           MCF_REG08(0x000A12)
-+#define MCF_GPIO_PDDR_FEC0H         MCF_REG08(0x000A14)
-+#define MCF_GPIO_PDDR_FEC0L         MCF_REG08(0x000A15)
-+#define MCF_GPIO_PDDR_FEC1H         MCF_REG08(0x000A16)
-+#define MCF_GPIO_PDDR_FEC1L         MCF_REG08(0x000A17)
-+#define MCF_GPIO_PDDR_FECI2C        MCF_REG08(0x000A18)
-+#define MCF_GPIO_PDDR_PCIBG         MCF_REG08(0x000A19)
-+#define MCF_GPIO_PDDR_PCIBR         MCF_REG08(0x000A1A)
-+#define MCF_GPIO_PDDR_PSC3PSC2      MCF_REG08(0x000A1C)
-+#define MCF_GPIO_PDDR_PSC1PSC0      MCF_REG08(0x000A1D)
-+#define MCF_GPIO_PDDR_DSPI          MCF_REG08(0x000A1E)
-+#define MCF_GPIO_PPDSDR_FBCTL       MCF_REG08(0x000A20)
-+#define MCF_GPIO_PPDSDR_FBCS        MCF_REG08(0x000A21)
-+#define MCF_GPIO_PPDSDR_DMA         MCF_REG08(0x000A22)
-+#define MCF_GPIO_PPDSDR_FEC0H       MCF_REG08(0x000A24)
-+#define MCF_GPIO_PPDSDR_FEC0L       MCF_REG08(0x000A25)
-+#define MCF_GPIO_PPDSDR_FEC1H       MCF_REG08(0x000A26)
-+#define MCF_GPIO_PPDSDR_FEC1L       MCF_REG08(0x000A27)
-+#define MCF_GPIO_PPDSDR_FECI2C      MCF_REG08(0x000A28)
-+#define MCF_GPIO_PPDSDR_PCIBG       MCF_REG08(0x000A29)
-+#define MCF_GPIO_PPDSDR_PCIBR       MCF_REG08(0x000A2A)
-+#define MCF_GPIO_PPDSDR_PSC3PSC2    MCF_REG08(0x000A2C)
-+#define MCF_GPIO_PPDSDR_PSC1PSC0    MCF_REG08(0x000A2D)
-+#define MCF_GPIO_PPDSDR_DSPI        MCF_REG08(0x000A2E)
-+#define MCF_GPIO_PCLRR_FBCTL        MCF_REG08(0x000A30)
-+#define MCF_GPIO_PCLRR_FBCS         MCF_REG08(0x000A31)
-+#define MCF_GPIO_PCLRR_DMA          MCF_REG08(0x000A32)
-+#define MCF_GPIO_PCLRR_FEC0H        MCF_REG08(0x000A34)
-+#define MCF_GPIO_PCLRR_FEC0L        MCF_REG08(0x000A35)
-+#define MCF_GPIO_PCLRR_FEC1H        MCF_REG08(0x000A36)
-+#define MCF_GPIO_PCLRR_FEC1L        MCF_REG08(0x000A37)
-+#define MCF_GPIO_PCLRR_FECI2C       MCF_REG08(0x000A38)
-+#define MCF_GPIO_PCLRR_PCIBG        MCF_REG08(0x000A39)
-+#define MCF_GPIO_PCLRR_PCIBR        MCF_REG08(0x000A3A)
-+#define MCF_GPIO_PCLRR_PSC3PSC2     MCF_REG08(0x000A3C)
-+#define MCF_GPIO_PCLRR_PSC1PSC0     MCF_REG08(0x000A3D)
-+#define MCF_GPIO_PCLRR_DSPI         MCF_REG08(0x000A3E)
-+#define MCF_GPIO_PAR_FBCTL          MCF_REG16(0x000A40)
-+#define MCF_GPIO_PAR_FBCS           MCF_REG08(0x000A42)
-+#define MCF_GPIO_PAR_DMA            MCF_REG08(0x000A43)
-+#define MCF_GPIO_PAR_FECI2CIRQ      MCF_REG16(0x000A44)
-+#define MCF_GPIO_PAR_PCIBG          MCF_REG16(0x000A48)
-+#define MCF_GPIO_PAR_PCIBR          MCF_REG16(0x000A4A)
-+#define MCF_GPIO_PAR_PSC3           MCF_REG08(0x000A4C)
-+#define MCF_GPIO_PAR_PSC2           MCF_REG08(0x000A4D)
-+#define MCF_GPIO_PAR_PSC1           MCF_REG08(0x000A4E)
-+#define MCF_GPIO_PAR_PSC0           MCF_REG08(0x000A4F)
-+#define MCF_GPIO_PAR_DSPI           MCF_REG16(0x000A50)
-+#define MCF_GPIO_PAR_TIMER          MCF_REG08(0x000A52)
-+
-+/* Bit definitions and macros for MCF_GPIO_PODR_FBCTL */
-+#define MCF_GPIO_PODR_FBCTL_PODRFBCTL0              (0x01)
-+#define MCF_GPIO_PODR_FBCTL_PODRFBCTL1              (0x02)
-+#define MCF_GPIO_PODR_FBCTL_PODRFBCTL2              (0x04)
-+#define MCF_GPIO_PODR_FBCTL_PODRFBCTL3              (0x08)
-+#define MCF_GPIO_PODR_FBCTL_PODRFBCTL4              (0x10)
-+#define MCF_GPIO_PODR_FBCTL_PODRFBCTL5              (0x20)
-+#define MCF_GPIO_PODR_FBCTL_PODRFBCTL6              (0x40)
-+#define MCF_GPIO_PODR_FBCTL_PODRFBCTL7              (0x80)
-+
-+/* Bit definitions and macros for MCF_GPIO_PODR_FBCS */
-+#define MCF_GPIO_PODR_FBCS_PODRFBCS1                (0x02)
-+#define MCF_GPIO_PODR_FBCS_PODRFBCS2                (0x04)
-+#define MCF_GPIO_PODR_FBCS_PODRFBCS3                (0x08)
-+#define MCF_GPIO_PODR_FBCS_PODRFBCS4                (0x10)
-+#define MCF_GPIO_PODR_FBCS_PODRFBCS5                (0x20)
-+
-+/* Bit definitions and macros for MCF_GPIO_PODR_DMA */
-+#define MCF_GPIO_PODR_DMA_PODRDMA0                  (0x01)
-+#define MCF_GPIO_PODR_DMA_PODRDMA1                  (0x02)
-+#define MCF_GPIO_PODR_DMA_PODRDMA2                  (0x04)
-+#define MCF_GPIO_PODR_DMA_PODRDMA3                  (0x08)
-+
-+/* Bit definitions and macros for MCF_GPIO_PODR_FEC0H */
-+#define MCF_GPIO_PODR_FEC0H_PODRFEC0H0              (0x01)
-+#define MCF_GPIO_PODR_FEC0H_PODRFEC0H1              (0x02)
-+#define MCF_GPIO_PODR_FEC0H_PODRFEC0H2              (0x04)
-+#define MCF_GPIO_PODR_FEC0H_PODRFEC0H3              (0x08)
-+#define MCF_GPIO_PODR_FEC0H_PODRFEC0H4              (0x10)
-+#define MCF_GPIO_PODR_FEC0H_PODRFEC0H5              (0x20)
-+#define MCF_GPIO_PODR_FEC0H_PODRFEC0H6              (0x40)
-+#define MCF_GPIO_PODR_FEC0H_PODRFEC0H7              (0x80)
-+
-+/* Bit definitions and macros for MCF_GPIO_PODR_FEC0L */
-+#define MCF_GPIO_PODR_FEC0L_PODRFEC0L0              (0x01)
-+#define MCF_GPIO_PODR_FEC0L_PODRFEC0L1              (0x02)
-+#define MCF_GPIO_PODR_FEC0L_PODRFEC0L2              (0x04)
-+#define MCF_GPIO_PODR_FEC0L_PODRFEC0L3              (0x08)
-+#define MCF_GPIO_PODR_FEC0L_PODRFEC0L4              (0x10)
-+#define MCF_GPIO_PODR_FEC0L_PODRFEC0L5              (0x20)
-+#define MCF_GPIO_PODR_FEC0L_PODRFEC0L6              (0x40)
-+#define MCF_GPIO_PODR_FEC0L_PODRFEC0L7              (0x80)
-+
-+/* Bit definitions and macros for MCF_GPIO_PODR_FEC1H */
-+#define MCF_GPIO_PODR_FEC1H_PODRFEC1H0              (0x01)
-+#define MCF_GPIO_PODR_FEC1H_PODRFEC1H1              (0x02)
-+#define MCF_GPIO_PODR_FEC1H_PODRFEC1H2              (0x04)
-+#define MCF_GPIO_PODR_FEC1H_PODRFEC1H3              (0x08)
-+#define MCF_GPIO_PODR_FEC1H_PODRFEC1H4              (0x10)
-+#define MCF_GPIO_PODR_FEC1H_PODRFEC1H5              (0x20)
-+#define MCF_GPIO_PODR_FEC1H_PODRFEC1H6              (0x40)
-+#define MCF_GPIO_PODR_FEC1H_PODRFEC1H7              (0x80)
-+
-+/* Bit definitions and macros for MCF_GPIO_PODR_FEC1L */
-+#define MCF_GPIO_PODR_FEC1L_PODRFEC1L0              (0x01)
-+#define MCF_GPIO_PODR_FEC1L_PODRFEC1L1              (0x02)
-+#define MCF_GPIO_PODR_FEC1L_PODRFEC1L2              (0x04)
-+#define MCF_GPIO_PODR_FEC1L_PODRFEC1L3              (0x08)
-+#define MCF_GPIO_PODR_FEC1L_PODRFEC1L4              (0x10)
-+#define MCF_GPIO_PODR_FEC1L_PODRFEC1L5              (0x20)
-+#define MCF_GPIO_PODR_FEC1L_PODRFEC1L6              (0x40)
-+#define MCF_GPIO_PODR_FEC1L_PODRFEC1L7              (0x80)
-+
-+/* Bit definitions and macros for MCF_GPIO_PODR_FECI2C */
-+#define MCF_GPIO_PODR_FECI2C_PODRFECI2C0            (0x01)
-+#define MCF_GPIO_PODR_FECI2C_PODRFECI2C1            (0x02)
-+#define MCF_GPIO_PODR_FECI2C_PODRFECI2C2            (0x04)
-+#define MCF_GPIO_PODR_FECI2C_PODRFECI2C3            (0x08)
-+
-+/* Bit definitions and macros for MCF_GPIO_PODR_PCIBG */
-+#define MCF_GPIO_PODR_PCIBG_PODRPCIBG0              (0x01)
-+#define MCF_GPIO_PODR_PCIBG_PODRPCIBG1              (0x02)
-+#define MCF_GPIO_PODR_PCIBG_PODRPCIBG2              (0x04)
-+#define MCF_GPIO_PODR_PCIBG_PODRPCIBG3              (0x08)
-+#define MCF_GPIO_PODR_PCIBG_PODRPCIBG4              (0x10)
-+
-+/* Bit definitions and macros for MCF_GPIO_PODR_PCIBR */
-+#define MCF_GPIO_PODR_PCIBR_PODRPCIBR0              (0x01)
-+#define MCF_GPIO_PODR_PCIBR_PODRPCIBR1              (0x02)
-+#define MCF_GPIO_PODR_PCIBR_PODRPCIBR2              (0x04)
-+#define MCF_GPIO_PODR_PCIBR_PODRPCIBR3              (0x08)
-+#define MCF_GPIO_PODR_PCIBR_PODRPCIBR4              (0x10)
-+
-+/* Bit definitions and macros for MCF_GPIO_PODR_PSC3PSC2 */
-+#define MCF_GPIO_PODR_PSC3PSC2_PODRPSC3PSC20        (0x01)
-+#define MCF_GPIO_PODR_PSC3PSC2_PODRPSC3PSC21        (0x02)
-+#define MCF_GPIO_PODR_PSC3PSC2_PODRPSC3PSC22        (0x04)
-+#define MCF_GPIO_PODR_PSC3PSC2_PODRPSC3PSC23        (0x08)
-+#define MCF_GPIO_PODR_PSC3PSC2_PODRPSC3PSC24        (0x10)
-+#define MCF_GPIO_PODR_PSC3PSC2_PODRPSC3PSC25        (0x20)
-+#define MCF_GPIO_PODR_PSC3PSC2_PODRPSC3PSC26        (0x40)
-+#define MCF_GPIO_PODR_PSC3PSC2_PODRPSC3PSC27        (0x80)
-+
-+/* Bit definitions and macros for MCF_GPIO_PODR_PSC1PSC0 */
-+#define MCF_GPIO_PODR_PSC1PSC0_PODRPSC1PSC00        (0x01)
-+#define MCF_GPIO_PODR_PSC1PSC0_PODRPSC1PSC01        (0x02)
-+#define MCF_GPIO_PODR_PSC1PSC0_PODRPSC1PSC02        (0x04)
-+#define MCF_GPIO_PODR_PSC1PSC0_PODRPSC1PSC03        (0x08)
-+#define MCF_GPIO_PODR_PSC1PSC0_PODRPSC1PSC04        (0x10)
-+#define MCF_GPIO_PODR_PSC1PSC0_PODRPSC1PSC05        (0x20)
-+#define MCF_GPIO_PODR_PSC1PSC0_PODRPSC1PSC06        (0x40)
-+#define MCF_GPIO_PODR_PSC1PSC0_PODRPSC1PSC07        (0x80)
-+
-+/* Bit definitions and macros for MCF_GPIO_PODR_DSPI */
-+#define MCF_GPIO_PODR_DSPI_PODRDSPI0                (0x01)
-+#define MCF_GPIO_PODR_DSPI_PODRDSPI1                (0x02)
-+#define MCF_GPIO_PODR_DSPI_PODRDSPI2                (0x04)
-+#define MCF_GPIO_PODR_DSPI_PODRDSPI3                (0x08)
-+#define MCF_GPIO_PODR_DSPI_PODRDSPI4                (0x10)
-+#define MCF_GPIO_PODR_DSPI_PODRDSPI5                (0x20)
-+#define MCF_GPIO_PODR_DSPI_PODRDSPI6                (0x40)
-+
-+/* Bit definitions and macros for MCF_GPIO_PDDR_FBCTL */
-+#define MCF_GPIO_PDDR_FBCTL_PDDRFBCTL0              (0x01)
-+#define MCF_GPIO_PDDR_FBCTL_PDDRFBCTL1              (0x02)
-+#define MCF_GPIO_PDDR_FBCTL_PDDRFBCTL2              (0x04)
-+#define MCF_GPIO_PDDR_FBCTL_PDDRFBCTL3              (0x08)
-+#define MCF_GPIO_PDDR_FBCTL_PDDRFBCTL4              (0x10)
-+#define MCF_GPIO_PDDR_FBCTL_PDDRFBCTL5              (0x20)
-+#define MCF_GPIO_PDDR_FBCTL_PDDRFBCTL6              (0x40)
-+#define MCF_GPIO_PDDR_FBCTL_PDDRFBCTL7              (0x80)
-+
-+/* Bit definitions and macros for MCF_GPIO_PDDR_FBCS */
-+#define MCF_GPIO_PDDR_FBCS_PDDRFBCS1                (0x02)
-+#define MCF_GPIO_PDDR_FBCS_PDDRFBCS2                (0x04)
-+#define MCF_GPIO_PDDR_FBCS_PDDRFBCS3                (0x08)
-+#define MCF_GPIO_PDDR_FBCS_PDDRFBCS4                (0x10)
-+#define MCF_GPIO_PDDR_FBCS_PDDRFBCS5                (0x20)
-+
-+/* Bit definitions and macros for MCF_GPIO_PDDR_DMA */
-+#define MCF_GPIO_PDDR_DMA_PDDRDMA0                  (0x01)
-+#define MCF_GPIO_PDDR_DMA_PDDRDMA1                  (0x02)
-+#define MCF_GPIO_PDDR_DMA_PDDRDMA2                  (0x04)
-+#define MCF_GPIO_PDDR_DMA_PDDRDMA3                  (0x08)
-+
-+/* Bit definitions and macros for MCF_GPIO_PDDR_FEC0H */
-+#define MCF_GPIO_PDDR_FEC0H_PDDRFEC0H0              (0x01)
-+#define MCF_GPIO_PDDR_FEC0H_PDDRFEC0H1              (0x02)
-+#define MCF_GPIO_PDDR_FEC0H_PDDRFEC0H2              (0x04)
-+#define MCF_GPIO_PDDR_FEC0H_PDDRFEC0H3              (0x08)
-+#define MCF_GPIO_PDDR_FEC0H_PDDRFEC0H4              (0x10)
-+#define MCF_GPIO_PDDR_FEC0H_PDDRFEC0H5              (0x20)
-+#define MCF_GPIO_PDDR_FEC0H_PDDRFEC0H6              (0x40)
-+#define MCF_GPIO_PDDR_FEC0H_PDDRFEC0H7              (0x80)
-+
-+/* Bit definitions and macros for MCF_GPIO_PDDR_FEC0L */
-+#define MCF_GPIO_PDDR_FEC0L_PDDRFEC0L0              (0x01)
-+#define MCF_GPIO_PDDR_FEC0L_PDDRFEC0L1              (0x02)
-+#define MCF_GPIO_PDDR_FEC0L_PDDRFEC0L2              (0x04)
-+#define MCF_GPIO_PDDR_FEC0L_PDDRFEC0L3              (0x08)
-+#define MCF_GPIO_PDDR_FEC0L_PDDRFEC0L4              (0x10)
-+#define MCF_GPIO_PDDR_FEC0L_PDDRFEC0L5              (0x20)
-+#define MCF_GPIO_PDDR_FEC0L_PDDRFEC0L6              (0x40)
-+#define MCF_GPIO_PDDR_FEC0L_PDDRFEC0L7              (0x80)
-+
-+/* Bit definitions and macros for MCF_GPIO_PDDR_FEC1H */
-+#define MCF_GPIO_PDDR_FEC1H_PDDRFEC1H0              (0x01)
-+#define MCF_GPIO_PDDR_FEC1H_PDDRFEC1H1              (0x02)
-+#define MCF_GPIO_PDDR_FEC1H_PDDRFEC1H2              (0x04)
-+#define MCF_GPIO_PDDR_FEC1H_PDDRFEC1H3              (0x08)
-+#define MCF_GPIO_PDDR_FEC1H_PDDRFEC1H4              (0x10)
-+#define MCF_GPIO_PDDR_FEC1H_PDDRFEC1H5              (0x20)
-+#define MCF_GPIO_PDDR_FEC1H_PDDRFEC1H6              (0x40)
-+#define MCF_GPIO_PDDR_FEC1H_PDDRFEC1H7              (0x80)
-+
-+/* Bit definitions and macros for MCF_GPIO_PDDR_FEC1L */
-+#define MCF_GPIO_PDDR_FEC1L_PDDRFEC1L0              (0x01)
-+#define MCF_GPIO_PDDR_FEC1L_PDDRFEC1L1              (0x02)
-+#define MCF_GPIO_PDDR_FEC1L_PDDRFEC1L2              (0x04)
-+#define MCF_GPIO_PDDR_FEC1L_PDDRFEC1L3              (0x08)
-+#define MCF_GPIO_PDDR_FEC1L_PDDRFEC1L4              (0x10)
-+#define MCF_GPIO_PDDR_FEC1L_PDDRFEC1L5              (0x20)
-+#define MCF_GPIO_PDDR_FEC1L_PDDRFEC1L6              (0x40)
-+#define MCF_GPIO_PDDR_FEC1L_PDDRFEC1L7              (0x80)
-+
-+/* Bit definitions and macros for MCF_GPIO_PDDR_FECI2C */
-+#define MCF_GPIO_PDDR_FECI2C_PDDRFECI2C0            (0x01)
-+#define MCF_GPIO_PDDR_FECI2C_PDDRFECI2C1            (0x02)
-+#define MCF_GPIO_PDDR_FECI2C_PDDRFECI2C2            (0x04)
-+#define MCF_GPIO_PDDR_FECI2C_PDDRFECI2C3            (0x08)
-+
-+/* Bit definitions and macros for MCF_GPIO_PDDR_PCIBG */
-+#define MCF_GPIO_PDDR_PCIBG_PDDRPCIBG0              (0x01)
-+#define MCF_GPIO_PDDR_PCIBG_PDDRPCIBG1              (0x02)
-+#define MCF_GPIO_PDDR_PCIBG_PDDRPCIBG2              (0x04)
-+#define MCF_GPIO_PDDR_PCIBG_PDDRPCIBG3              (0x08)
-+#define MCF_GPIO_PDDR_PCIBG_PDDRPCIBG4              (0x10)
-+
-+/* Bit definitions and macros for MCF_GPIO_PDDR_PCIBR */
-+#define MCF_GPIO_PDDR_PCIBR_PDDRPCIBR0              (0x01)
-+#define MCF_GPIO_PDDR_PCIBR_PDDRPCIBR1              (0x02)
-+#define MCF_GPIO_PDDR_PCIBR_PDDRPCIBR2              (0x04)
-+#define MCF_GPIO_PDDR_PCIBR_PDDRPCIBR3              (0x08)
-+#define MCF_GPIO_PDDR_PCIBR_PDDRPCIBR4              (0x10)
-+
-+/* Bit definitions and macros for MCF_GPIO_PDDR_PSC3PSC2 */
-+#define MCF_GPIO_PDDR_PSC3PSC2_PDDRPSC3PSC20        (0x01)
-+#define MCF_GPIO_PDDR_PSC3PSC2_PDDRPSC3PSC21        (0x02)
-+#define MCF_GPIO_PDDR_PSC3PSC2_PDDRPSC3PSC22        (0x04)
-+#define MCF_GPIO_PDDR_PSC3PSC2_PDDRPSC3PSC23        (0x08)
-+#define MCF_GPIO_PDDR_PSC3PSC2_PDDRPSC3PSC24        (0x10)
-+#define MCF_GPIO_PDDR_PSC3PSC2_PDDRPSC3PSC25        (0x20)
-+#define MCF_GPIO_PDDR_PSC3PSC2_PDDRPSC3PSC26        (0x40)
-+#define MCF_GPIO_PDDR_PSC3PSC2_PDDRPSC3PSC27        (0x80)
-+
-+/* Bit definitions and macros for MCF_GPIO_PDDR_PSC1PSC0 */
-+#define MCF_GPIO_PDDR_PSC1PSC0_PDDRPSC1PSC00        (0x01)
-+#define MCF_GPIO_PDDR_PSC1PSC0_PDDRPSC1PSC01        (0x02)
-+#define MCF_GPIO_PDDR_PSC1PSC0_PDDRPSC1PSC02        (0x04)
-+#define MCF_GPIO_PDDR_PSC1PSC0_PDDRPSC1PSC03        (0x08)
-+#define MCF_GPIO_PDDR_PSC1PSC0_PDDRPSC1PSC04        (0x10)
-+#define MCF_GPIO_PDDR_PSC1PSC0_PDDRPSC1PSC05        (0x20)
-+#define MCF_GPIO_PDDR_PSC1PSC0_PDDRPSC1PSC06        (0x40)
-+#define MCF_GPIO_PDDR_PSC1PSC0_PDDRPSC1PSC07        (0x80)
-+
-+/* Bit definitions and macros for MCF_GPIO_PDDR_DSPI */
-+#define MCF_GPIO_PDDR_DSPI_PDDRDSPI0                (0x01)
-+#define MCF_GPIO_PDDR_DSPI_PDDRDSPI1                (0x02)
-+#define MCF_GPIO_PDDR_DSPI_PDDRDSPI2                (0x04)
-+#define MCF_GPIO_PDDR_DSPI_PDDRDSPI3                (0x08)
-+#define MCF_GPIO_PDDR_DSPI_PDDRDSPI4                (0x10)
-+#define MCF_GPIO_PDDR_DSPI_PDDRDSPI5                (0x20)
-+#define MCF_GPIO_PDDR_DSPI_PDDRDSPI6                (0x40)
-+
-+/* Bit definitions and macros for MCF_GPIO_PPDSDR_FBCTL */
-+#define MCF_GPIO_PPDSDR_FBCTL_PPDSDRFBCTL0          (0x01)
-+#define MCF_GPIO_PPDSDR_FBCTL_PPDSDRFBCTL1          (0x02)
-+#define MCF_GPIO_PPDSDR_FBCTL_PPDSDRFBCTL2          (0x04)
-+#define MCF_GPIO_PPDSDR_FBCTL_PPDSDRFBCTL3          (0x08)
-+#define MCF_GPIO_PPDSDR_FBCTL_PPDSDRFBCTL4          (0x10)
-+#define MCF_GPIO_PPDSDR_FBCTL_PPDSDRFBCTL5          (0x20)
-+#define MCF_GPIO_PPDSDR_FBCTL_PPDSDRFBCTL6          (0x40)
-+#define MCF_GPIO_PPDSDR_FBCTL_PPDSDRFBCTL7          (0x80)
-+
-+/* Bit definitions and macros for MCF_GPIO_PPDSDR_FBCS */
-+#define MCF_GPIO_PPDSDR_FBCS_PPDSDRFBCS1            (0x02)
-+#define MCF_GPIO_PPDSDR_FBCS_PPDSDRFBCS2            (0x04)
-+#define MCF_GPIO_PPDSDR_FBCS_PPDSDRFBCS3            (0x08)
-+#define MCF_GPIO_PPDSDR_FBCS_PPDSDRFBCS4            (0x10)
-+#define MCF_GPIO_PPDSDR_FBCS_PPDSDRFBCS5            (0x20)
-+
-+/* Bit definitions and macros for MCF_GPIO_PPDSDR_DMA */
-+#define MCF_GPIO_PPDSDR_DMA_PPDSDRDMA0              (0x01)
-+#define MCF_GPIO_PPDSDR_DMA_PPDSDRDMA1              (0x02)
-+#define MCF_GPIO_PPDSDR_DMA_PPDSDRDMA2              (0x04)
-+#define MCF_GPIO_PPDSDR_DMA_PPDSDRDMA3              (0x08)
-+
-+/* Bit definitions and macros for MCF_GPIO_PPDSDR_FEC0H */
-+#define MCF_GPIO_PPDSDR_FEC0H_PPDSDRFEC0H0          (0x01)
-+#define MCF_GPIO_PPDSDR_FEC0H_PPDSDRFEC0H1          (0x02)
-+#define MCF_GPIO_PPDSDR_FEC0H_PPDSDRFEC0H2          (0x04)
-+#define MCF_GPIO_PPDSDR_FEC0H_PPDSDRFEC0H3          (0x08)
-+#define MCF_GPIO_PPDSDR_FEC0H_PPDSDRFEC0H4          (0x10)
-+#define MCF_GPIO_PPDSDR_FEC0H_PPDSDRFEC0H5          (0x20)
-+#define MCF_GPIO_PPDSDR_FEC0H_PPDSDRFEC0H6          (0x40)
-+#define MCF_GPIO_PPDSDR_FEC0H_PPDSDRFEC0H7          (0x80)
-+
-+/* Bit definitions and macros for MCF_GPIO_PPDSDR_FEC0L */
-+#define MCF_GPIO_PPDSDR_FEC0L_PPDSDRFEC0L0          (0x01)
-+#define MCF_GPIO_PPDSDR_FEC0L_PPDSDRFEC0L1          (0x02)
-+#define MCF_GPIO_PPDSDR_FEC0L_PPDSDRFEC0L2          (0x04)
-+#define MCF_GPIO_PPDSDR_FEC0L_PPDSDRFEC0L3          (0x08)
-+#define MCF_GPIO_PPDSDR_FEC0L_PPDSDRFEC0L4          (0x10)
-+#define MCF_GPIO_PPDSDR_FEC0L_PPDSDRFEC0L5          (0x20)
-+#define MCF_GPIO_PPDSDR_FEC0L_PPDSDRFEC0L6          (0x40)
-+#define MCF_GPIO_PPDSDR_FEC0L_PPDSDRFEC0L7          (0x80)
-+
-+/* Bit definitions and macros for MCF_GPIO_PPDSDR_FEC1H */
-+#define MCF_GPIO_PPDSDR_FEC1H_PPDSDRFEC1H0          (0x01)
-+#define MCF_GPIO_PPDSDR_FEC1H_PPDSDRFEC1H1          (0x02)
-+#define MCF_GPIO_PPDSDR_FEC1H_PPDSDRFEC1H2          (0x04)
-+#define MCF_GPIO_PPDSDR_FEC1H_PPDSDRFEC1H3          (0x08)
-+#define MCF_GPIO_PPDSDR_FEC1H_PPDSDRFEC1H4          (0x10)
-+#define MCF_GPIO_PPDSDR_FEC1H_PPDSDRFEC1H5          (0x20)
-+#define MCF_GPIO_PPDSDR_FEC1H_PPDSDRFEC1H6          (0x40)
-+#define MCF_GPIO_PPDSDR_FEC1H_PPDSDRFEC1H7          (0x80)
-+
-+/* Bit definitions and macros for MCF_GPIO_PPDSDR_FEC1L */
-+#define MCF_GPIO_PPDSDR_FEC1L_PPDSDRFEC1L0          (0x01)
-+#define MCF_GPIO_PPDSDR_FEC1L_PPDSDRFEC1L1          (0x02)
-+#define MCF_GPIO_PPDSDR_FEC1L_PPDSDRFEC1L2          (0x04)
-+#define MCF_GPIO_PPDSDR_FEC1L_PPDSDRFEC1L3          (0x08)
-+#define MCF_GPIO_PPDSDR_FEC1L_PPDSDRFEC1L4          (0x10)
-+#define MCF_GPIO_PPDSDR_FEC1L_PPDSDRFEC1L5          (0x20)
-+#define MCF_GPIO_PPDSDR_FEC1L_PPDSDRFEC1L6          (0x40)
-+#define MCF_GPIO_PPDSDR_FEC1L_PPDSDRFEC1L7          (0x80)
-+
-+/* Bit definitions and macros for MCF_GPIO_PPDSDR_FECI2C */
-+#define MCF_GPIO_PPDSDR_FECI2C_PPDSDRFECI2C0        (0x01)
-+#define MCF_GPIO_PPDSDR_FECI2C_PPDSDRFECI2C1        (0x02)
-+#define MCF_GPIO_PPDSDR_FECI2C_PPDSDRFECI2C2        (0x04)
-+#define MCF_GPIO_PPDSDR_FECI2C_PPDSDRFECI2C3        (0x08)
-+
-+/* Bit definitions and macros for MCF_GPIO_PPDSDR_PCIBG */
-+#define MCF_GPIO_PPDSDR_PCIBG_PPDSDRPCIBG0          (0x01)
-+#define MCF_GPIO_PPDSDR_PCIBG_PPDSDRPCIBG1          (0x02)
-+#define MCF_GPIO_PPDSDR_PCIBG_PPDSDRPCIBG2          (0x04)
-+#define MCF_GPIO_PPDSDR_PCIBG_PPDSDRPCIBG3          (0x08)
-+#define MCF_GPIO_PPDSDR_PCIBG_PPDSDRPCIBG4          (0x10)
-+
-+/* Bit definitions and macros for MCF_GPIO_PPDSDR_PCIBR */
-+#define MCF_GPIO_PPDSDR_PCIBR_PPDSDRPCIBR0          (0x01)
-+#define MCF_GPIO_PPDSDR_PCIBR_PPDSDRPCIBR1          (0x02)
-+#define MCF_GPIO_PPDSDR_PCIBR_PPDSDRPCIBR2          (0x04)
-+#define MCF_GPIO_PPDSDR_PCIBR_PPDSDRPCIBR3          (0x08)
-+#define MCF_GPIO_PPDSDR_PCIBR_PPDSDRPCIBR4          (0x10)
-+
-+/* Bit definitions and macros for MCF_GPIO_PPDSDR_PSC3PSC2 */
-+#define MCF_GPIO_PPDSDR_PSC3PSC2_PPDSDRPSC3PSC20    (0x01)
-+#define MCF_GPIO_PPDSDR_PSC3PSC2_PPDSDRPSC3PSC21    (0x02)
-+#define MCF_GPIO_PPDSDR_PSC3PSC2_PPDSDRPSC3PSC22    (0x04)
-+#define MCF_GPIO_PPDSDR_PSC3PSC2_PPDSDRPSC3PSC23    (0x08)
-+#define MCF_GPIO_PPDSDR_PSC3PSC2_PDDRPSC3PSC24      (0x10)
-+#define MCF_GPIO_PPDSDR_PSC3PSC2_PDDRPSC3PSC25      (0x20)
-+#define MCF_GPIO_PPDSDR_PSC3PSC2_PPDSDRPSC3PSC26    (0x40)
-+#define MCF_GPIO_PPDSDR_PSC3PSC2_PPDSDRPSC3PSC27    (0x80)
-+
-+/* Bit definitions and macros for MCF_GPIO_PPDSDR_PSC1PSC0 */
-+#define MCF_GPIO_PPDSDR_PSC1PSC0_PPDSDRPSC1PSC00    (0x01)
-+#define MCF_GPIO_PPDSDR_PSC1PSC0_PDDRPSC1PSC01      (0x02)
-+#define MCF_GPIO_PPDSDR_PSC1PSC0_PPDSDRPSC1PSC02    (0x04)
-+#define MCF_GPIO_PPDSDR_PSC1PSC0_PDDRPSC1PSC03      (0x08)
-+#define MCF_GPIO_PPDSDR_PSC1PSC0_PPDSDRPSC1PSC04    (0x10)
-+#define MCF_GPIO_PPDSDR_PSC1PSC0_PPDSDRPSC1PSC05    (0x20)
-+#define MCF_GPIO_PPDSDR_PSC1PSC0_PPDSDRPSC1PSC06    (0x40)
-+#define MCF_GPIO_PPDSDR_PSC1PSC0_PPDSDRPSC1PSC07    (0x80)
-+
-+/* Bit definitions and macros for MCF_GPIO_PPDSDR_DSPI */
-+#define MCF_GPIO_PPDSDR_DSPI_PPDSDRDSPI0            (0x01)
-+#define MCF_GPIO_PPDSDR_DSPI_PPDSDRDSPI1            (0x02)
-+#define MCF_GPIO_PPDSDR_DSPI_PPDSDRDSPI2            (0x04)
-+#define MCF_GPIO_PPDSDR_DSPI_PPDSDRDSPI3            (0x08)
-+#define MCF_GPIO_PPDSDR_DSPI_PDDRDSPI4              (0x10)
-+#define MCF_GPIO_PPDSDR_DSPI_PPDSDRDSPI5            (0x20)
-+#define MCF_GPIO_PPDSDR_DSPI_PPDSDRDSPI6            (0x40)
-+
-+/* Bit definitions and macros for MCF_GPIO_PCLRR_FBCTL */
-+#define MCF_GPIO_PCLRR_FBCTL_PCLRRFBCTL0            (0x01)
-+#define MCF_GPIO_PCLRR_FBCTL_PCLRRFBCTL1            (0x02)
-+#define MCF_GPIO_PCLRR_FBCTL_PCLRRFBCTL2            (0x04)
-+#define MCF_GPIO_PCLRR_FBCTL_PCLRRFBCTL3            (0x08)
-+#define MCF_GPIO_PCLRR_FBCTL_PCLRRFBCTL4            (0x10)
-+#define MCF_GPIO_PCLRR_FBCTL_PCLRRFBCTL5            (0x20)
-+#define MCF_GPIO_PCLRR_FBCTL_PCLRRFBCTL6            (0x40)
-+#define MCF_GPIO_PCLRR_FBCTL_PCLRRFBCTL7            (0x80)
-+
-+/* Bit definitions and macros for MCF_GPIO_PCLRR_FBCS */
-+#define MCF_GPIO_PCLRR_FBCS_PCLRRFBCS1              (0x02)
-+#define MCF_GPIO_PCLRR_FBCS_PCLRRFBCS2              (0x04)
-+#define MCF_GPIO_PCLRR_FBCS_PCLRRFBCS3              (0x08)
-+#define MCF_GPIO_PCLRR_FBCS_PCLRRFBCS4              (0x10)
-+#define MCF_GPIO_PCLRR_FBCS_PCLRRFBCS5              (0x20)
-+
-+/* Bit definitions and macros for MCF_GPIO_PCLRR_DMA */
-+#define MCF_GPIO_PCLRR_DMA_PCLRRDMA0                (0x01)
-+#define MCF_GPIO_PCLRR_DMA_PCLRRDMA1                (0x02)
-+#define MCF_GPIO_PCLRR_DMA_PCLRRDMA2                (0x04)
-+#define MCF_GPIO_PCLRR_DMA_PCLRRDMA3                (0x08)
-+
-+/* Bit definitions and macros for MCF_GPIO_PCLRR_FEC0H */
-+#define MCF_GPIO_PCLRR_FEC0H_PCLRRFEC0H0            (0x01)
-+#define MCF_GPIO_PCLRR_FEC0H_PCLRRFEC0H1            (0x02)
-+#define MCF_GPIO_PCLRR_FEC0H_PCLRRFEC0H2            (0x04)
-+#define MCF_GPIO_PCLRR_FEC0H_PCLRRFEC0H3            (0x08)
-+#define MCF_GPIO_PCLRR_FEC0H_PCLRRFEC0H4            (0x10)
-+#define MCF_GPIO_PCLRR_FEC0H_PCLRRFEC0H5            (0x20)
-+#define MCF_GPIO_PCLRR_FEC0H_PCLRRFEC0H6            (0x40)
-+#define MCF_GPIO_PCLRR_FEC0H_PCLRRFEC0H7            (0x80)
-+
-+/* Bit definitions and macros for MCF_GPIO_PCLRR_FEC0L */
-+#define MCF_GPIO_PCLRR_FEC0L_PCLRRFEC0L0            (0x01)
-+#define MCF_GPIO_PCLRR_FEC0L_PODRFEC0L1             (0x02)
-+#define MCF_GPIO_PCLRR_FEC0L_PCLRRFEC0L2            (0x04)
-+#define MCF_GPIO_PCLRR_FEC0L_PCLRRFEC0L3            (0x08)
-+#define MCF_GPIO_PCLRR_FEC0L_PODRFEC0L4             (0x10)
-+#define MCF_GPIO_PCLRR_FEC0L_PODRFEC0L5             (0x20)
-+#define MCF_GPIO_PCLRR_FEC0L_PODRFEC0L6             (0x40)
-+#define MCF_GPIO_PCLRR_FEC0L_PCLRRFEC0L7            (0x80)
-+
-+/* Bit definitions and macros for MCF_GPIO_PCLRR_FEC1H */
-+#define MCF_GPIO_PCLRR_FEC1H_PCLRRFEC1H0            (0x01)
-+#define MCF_GPIO_PCLRR_FEC1H_PCLRRFEC1H1            (0x02)
-+#define MCF_GPIO_PCLRR_FEC1H_PCLRRFEC1H2            (0x04)
-+#define MCF_GPIO_PCLRR_FEC1H_PODRFEC1H3             (0x08)
-+#define MCF_GPIO_PCLRR_FEC1H_PODRFEC1H4             (0x10)
-+#define MCF_GPIO_PCLRR_FEC1H_PCLRRFEC1H5            (0x20)
-+#define MCF_GPIO_PCLRR_FEC1H_PCLRRFEC1H6            (0x40)
-+#define MCF_GPIO_PCLRR_FEC1H_PCLRRFEC1H7            (0x80)
-+
-+/* Bit definitions and macros for MCF_GPIO_PCLRR_FEC1L */
-+#define MCF_GPIO_PCLRR_FEC1L_PCLRRFEC1L0            (0x01)
-+#define MCF_GPIO_PCLRR_FEC1L_PCLRRFEC1L1            (0x02)
-+#define MCF_GPIO_PCLRR_FEC1L_PCLRRFEC1L2            (0x04)
-+#define MCF_GPIO_PCLRR_FEC1L_PCLRRFEC1L3            (0x08)
-+#define MCF_GPIO_PCLRR_FEC1L_PODRFEC1L4             (0x10)
-+#define MCF_GPIO_PCLRR_FEC1L_PCLRRFEC1L5            (0x20)
-+#define MCF_GPIO_PCLRR_FEC1L_PCLRRFEC1L6            (0x40)
-+#define MCF_GPIO_PCLRR_FEC1L_PCLRRFEC1L7            (0x80)
-+
-+/* Bit definitions and macros for MCF_GPIO_PCLRR_FECI2C */
-+#define MCF_GPIO_PCLRR_FECI2C_PCLRRFECI2C0          (0x01)
-+#define MCF_GPIO_PCLRR_FECI2C_PCLRRFECI2C1          (0x02)
-+#define MCF_GPIO_PCLRR_FECI2C_PODRFECI2C2           (0x04)
-+#define MCF_GPIO_PCLRR_FECI2C_PCLRRFECI2C3          (0x08)
-+
-+/* Bit definitions and macros for MCF_GPIO_PCLRR_PCIBG */
-+#define MCF_GPIO_PCLRR_PCIBG_PODRPCIBG0             (0x01)
-+#define MCF_GPIO_PCLRR_PCIBG_PODRPCIBG1             (0x02)
-+#define MCF_GPIO_PCLRR_PCIBG_PODRPCIBG2             (0x04)
-+#define MCF_GPIO_PCLRR_PCIBG_PCLRRPCIBG3            (0x08)
-+#define MCF_GPIO_PCLRR_PCIBG_PCLRRPCIBG4            (0x10)
-+
-+/* Bit definitions and macros for MCF_GPIO_PCLRR_PCIBR */
-+#define MCF_GPIO_PCLRR_PCIBR_PCLRRPCIBR0            (0x01)
-+#define MCF_GPIO_PCLRR_PCIBR_PCLRRPCIBR1            (0x02)
-+#define MCF_GPIO_PCLRR_PCIBR_PCLRRPCIBR2            (0x04)
-+#define MCF_GPIO_PCLRR_PCIBR_PODRPCIBR3             (0x08)
-+#define MCF_GPIO_PCLRR_PCIBR_PODRPCIBR4             (0x10)
-+
-+/* Bit definitions and macros for MCF_GPIO_PCLRR_PSC3PSC2 */
-+#define MCF_GPIO_PCLRR_PSC3PSC2_PODRPSC3PSC20       (0x01)
-+#define MCF_GPIO_PCLRR_PSC3PSC2_PODRPSC3PSC21       (0x02)
-+#define MCF_GPIO_PCLRR_PSC3PSC2_PCLRRPSC3PSC22      (0x04)
-+#define MCF_GPIO_PCLRR_PSC3PSC2_PCLRRPSC3PSC23      (0x08)
-+#define MCF_GPIO_PCLRR_PSC3PSC2_PCLRRPSC3PSC24      (0x10)
-+#define MCF_GPIO_PCLRR_PSC3PSC2_PODRPSC3PSC25       (0x20)
-+#define MCF_GPIO_PCLRR_PSC3PSC2_PODRPSC3PSC26       (0x40)
-+#define MCF_GPIO_PCLRR_PSC3PSC2_PCLRRPSC3PSC27      (0x80)
-+
-+/* Bit definitions and macros for MCF_GPIO_PCLRR_PSC1PSC0 */
-+#define MCF_GPIO_PCLRR_PSC1PSC0_PCLRRPSC1PSC00      (0x01)
-+#define MCF_GPIO_PCLRR_PSC1PSC0_PCLRRPSC1PSC01      (0x02)
-+#define MCF_GPIO_PCLRR_PSC1PSC0_PCLRRPSC1PSC02      (0x04)
-+#define MCF_GPIO_PCLRR_PSC1PSC0_PCLRRPSC1PSC03      (0x08)
-+#define MCF_GPIO_PCLRR_PSC1PSC0_PCLRRPSC1PSC04      (0x10)
-+#define MCF_GPIO_PCLRR_PSC1PSC0_PCLRRPSC1PSC05      (0x20)
-+#define MCF_GPIO_PCLRR_PSC1PSC0_PODRPSC1PSC06       (0x40)
-+#define MCF_GPIO_PCLRR_PSC1PSC0_PCLRRPSC1PSC07      (0x80)
-+
-+/* Bit definitions and macros for MCF_GPIO_PCLRR_DSPI */
-+#define MCF_GPIO_PCLRR_DSPI_PCLRRDSPI0              (0x01)
-+#define MCF_GPIO_PCLRR_DSPI_PCLRRDSPI1              (0x02)
-+#define MCF_GPIO_PCLRR_DSPI_PCLRRDSPI2              (0x04)
-+#define MCF_GPIO_PCLRR_DSPI_PCLRRDSPI3              (0x08)
-+#define MCF_GPIO_PCLRR_DSPI_PCLRRDSPI4              (0x10)
-+#define MCF_GPIO_PCLRR_DSPI_PCLRRDSPI5              (0x20)
-+#define MCF_GPIO_PCLRR_DSPI_PCLRRDSPI6              (0x40)
-+
-+/* Bit definitions and macros for MCF_GPIO_PAR_FBCTL */
-+#define MCF_GPIO_PAR_FBCTL_PAR_TS(x)                (((x)&0x0003)<<0)
-+#define MCF_GPIO_PAR_FBCTL_PAR_TA                   (0x0004)
-+#define MCF_GPIO_PAR_FBCTL_PAR_RWB                  (0x0010)
-+#define MCF_GPIO_PAR_FBCTL_PAR_OE                   (0x0040)
-+#define MCF_GPIO_PAR_FBCTL_PAR_BWE0                 (0x0100)
-+#define MCF_GPIO_PAR_FBCTL_PAR_BWE1                 (0x0400)
-+#define MCF_GPIO_PAR_FBCTL_PAR_BWE2                 (0x1000)
-+#define MCF_GPIO_PAR_FBCTL_PAR_BWE3                 (0x4000)
-+#define MCF_GPIO_PAR_FBCTL_PAR_TS_GPIO              (0)
-+#define MCF_GPIO_PAR_FBCTL_PAR_TS_TBST              (2)
-+#define MCF_GPIO_PAR_FBCTL_PAR_TS_TS                (3)
-+
-+/* Bit definitions and macros for MCF_GPIO_PAR_FBCS */
-+#define MCF_GPIO_PAR_FBCS_PAR_CS1                   (0x02)
-+#define MCF_GPIO_PAR_FBCS_PAR_CS2                   (0x04)
-+#define MCF_GPIO_PAR_FBCS_PAR_CS3                   (0x08)
-+#define MCF_GPIO_PAR_FBCS_PAR_CS4                   (0x10)
-+#define MCF_GPIO_PAR_FBCS_PAR_CS5                   (0x20)
-+
-+/* Bit definitions and macros for MCF_GPIO_PAR_DMA */
-+#define MCF_GPIO_PAR_DMA_PAR_DREQ0(x)               (((x)&0x03)<<0)
-+#define MCF_GPIO_PAR_DMA_PAR_DREQ1(x)               (((x)&0x03)<<2)
-+#define MCF_GPIO_PAR_DMA_PAR_DACK0(x)               (((x)&0x03)<<4)
-+#define MCF_GPIO_PAR_DMA_PAR_DACK1(x)               (((x)&0x03)<<6)
-+#define MCF_GPIO_PAR_DMA_PAR_DACKx_GPIO             (0)
-+#define MCF_GPIO_PAR_DMA_PAR_DACKx_TOUT             (2)
-+#define MCF_GPIO_PAR_DMA_PAR_DACKx_DACK             (3)
-+#define MCF_GPIO_PAR_DMA_PAR_DREQx_GPIO             (0)
-+#define MCF_GPIO_PAR_DMA_PAR_DREQx_TIN              (2)
-+#define MCF_GPIO_PAR_DMA_PAR_DREQx_DREQ             (3)
-+
-+/* Bit definitions and macros for MCF_GPIO_PAR_FECI2CIRQ */
-+#define MCF_GPIO_PAR_FECI2CIRQ_PAR_IRQ5             (0x0001)
-+#define MCF_GPIO_PAR_FECI2CIRQ_PAR_IRQ6             (0x0002)
-+#define MCF_GPIO_PAR_FECI2CIRQ_PAR_SCL              (0x0004)
-+#define MCF_GPIO_PAR_FECI2CIRQ_PAR_SDA              (0x0008)
-+#define MCF_GPIO_PAR_FECI2CIRQ_PAR_E1MDC(x)         (((x)&0x0003)<<6)
-+#define MCF_GPIO_PAR_FECI2CIRQ_PAR_E1MDIO(x)        (((x)&0x0003)<<8)
-+#define MCF_GPIO_PAR_FECI2CIRQ_PAR_E1MII            (0x0400)
-+#define MCF_GPIO_PAR_FECI2CIRQ_PAR_E17              (0x0800)
-+#define MCF_GPIO_PAR_FECI2CIRQ_PAR_E0MDC            (0x1000)
-+#define MCF_GPIO_PAR_FECI2CIRQ_PAR_E0MDIO           (0x2000)
-+#define MCF_GPIO_PAR_FECI2CIRQ_PAR_E0MII            (0x4000)
-+#define MCF_GPIO_PAR_FECI2CIRQ_PAR_E07              (0x8000)
-+#define MCF_GPIO_PAR_FECI2CIRQ_PAR_E1MDIO_CANRX     (0x0000)
-+#define MCF_GPIO_PAR_FECI2CIRQ_PAR_E1MDIO_SDA       (0x0200)
-+#define MCF_GPIO_PAR_FECI2CIRQ_PAR_E1MDIO_EMDIO     (0x0300)
-+#define MCF_GPIO_PAR_FECI2CIRQ_PAR_E1MDC_CANTX      (0x0000)
-+#define MCF_GPIO_PAR_FECI2CIRQ_PAR_E1MDC_SCL        (0x0080)
-+#define MCF_GPIO_PAR_FECI2CIRQ_PAR_E1MDC_EMDC       (0x00C0)
-+
-+/* Bit definitions and macros for MCF_GPIO_PAR_PCIBG */
-+#define MCF_GPIO_PAR_PCIBG_PAR_PCIBG0(x)            (((x)&0x0003)<<0)
-+#define MCF_GPIO_PAR_PCIBG_PAR_PCIBG1(x)            (((x)&0x0003)<<2)
-+#define MCF_GPIO_PAR_PCIBG_PAR_PCIBG2(x)            (((x)&0x0003)<<4)
-+#define MCF_GPIO_PAR_PCIBG_PAR_PCIBG3(x)            (((x)&0x0003)<<6)
-+#define MCF_GPIO_PAR_PCIBG_PAR_PCIBG4(x)            (((x)&0x0003)<<8)
-+
-+/* Bit definitions and macros for MCF_GPIO_PAR_PCIBR */
-+#define MCF_GPIO_PAR_PCIBR_PAR_PCIBG0(x)            (((x)&0x0003)<<0)
-+#define MCF_GPIO_PAR_PCIBR_PAR_PCIBG1(x)            (((x)&0x0003)<<2)
-+#define MCF_GPIO_PAR_PCIBR_PAR_PCIBG2(x)            (((x)&0x0003)<<4)
-+#define MCF_GPIO_PAR_PCIBR_PAR_PCIBG3(x)            (((x)&0x0003)<<6)
-+#define MCF_GPIO_PAR_PCIBR_PAR_PCIBR4(x)            (((x)&0x0003)<<8)
-+
-+/* Bit definitions and macros for MCF_GPIO_PAR_PSC3 */
-+#define MCF_GPIO_PAR_PSC3_PAR_TXD3                  (0x04)
-+#define MCF_GPIO_PAR_PSC3_PAR_RXD3                  (0x08)
-+#define MCF_GPIO_PAR_PSC3_PAR_RTS3(x)               (((x)&0x03)<<4)
-+#define MCF_GPIO_PAR_PSC3_PAR_CTS3(x)               (((x)&0x03)<<6)
-+#define MCF_GPIO_PAR_PSC3_PAR_CTS3_GPIO             (0x00)
-+#define MCF_GPIO_PAR_PSC3_PAR_CTS3_BCLK             (0x80)
-+#define MCF_GPIO_PAR_PSC3_PAR_CTS3_CTS              (0xC0)
-+#define MCF_GPIO_PAR_PSC3_PAR_RTS3_GPIO             (0x00)
-+#define MCF_GPIO_PAR_PSC3_PAR_RTS3_FSYNC            (0x20)
-+#define MCF_GPIO_PAR_PSC3_PAR_RTS3_RTS              (0x30)
-+#define MCF_GPIO_PAR_PSC3_PAR_CTS2_CANRX            (0x40)
-+
-+/* Bit definitions and macros for MCF_GPIO_PAR_PSC2 */
-+#define MCF_GPIO_PAR_PSC2_PAR_TXD2                  (0x04)
-+#define MCF_GPIO_PAR_PSC2_PAR_RXD2                  (0x08)
-+#define MCF_GPIO_PAR_PSC2_PAR_RTS2(x)               (((x)&0x03)<<4)
-+#define MCF_GPIO_PAR_PSC2_PAR_CTS2(x)               (((x)&0x03)<<6)
-+#define MCF_GPIO_PAR_PSC2_PAR_CTS2_GPIO             (0x00)
-+#define MCF_GPIO_PAR_PSC2_PAR_CTS2_BCLK             (0x80)
-+#define MCF_GPIO_PAR_PSC2_PAR_CTS2_CTS              (0xC0)
-+#define MCF_GPIO_PAR_PSC2_PAR_RTS2_GPIO             (0x00)
-+#define MCF_GPIO_PAR_PSC2_PAR_RTS2_CANTX            (0x10)
-+#define MCF_GPIO_PAR_PSC2_PAR_RTS2_FSYNC            (0x20)
-+#define MCF_GPIO_PAR_PSC2_PAR_RTS2_RTS              (0x30)
-+#define MCF_GPIO_PAR_PSC2_PAR_RTS2_CANRX            (0x40)
-+
-+/* Bit definitions and macros for MCF_GPIO_PAR_PSC1 */
-+#define MCF_GPIO_PAR_PSC1_PAR_TXD1                  (0x04)
-+#define MCF_GPIO_PAR_PSC1_PAR_RXD1                  (0x08)
-+#define MCF_GPIO_PAR_PSC1_PAR_RTS1(x)               (((x)&0x03)<<4)
-+#define MCF_GPIO_PAR_PSC1_PAR_CTS1(x)               (((x)&0x03)<<6)
-+#define MCF_GPIO_PAR_PSC1_PAR_CTS1_GPIO             (0x00)
-+#define MCF_GPIO_PAR_PSC1_PAR_CTS1_BCLK             (0x80)
-+#define MCF_GPIO_PAR_PSC1_PAR_CTS1_CTS              (0xC0)
-+#define MCF_GPIO_PAR_PSC1_PAR_RTS1_GPIO             (0x00)
-+#define MCF_GPIO_PAR_PSC1_PAR_RTS1_FSYNC            (0x20)
-+#define MCF_GPIO_PAR_PSC1_PAR_RTS1_RTS              (0x30)
-+
-+/* Bit definitions and macros for MCF_GPIO_PAR_PSC0 */
-+#define MCF_GPIO_PAR_PSC0_PAR_TXD0                  (0x04)
-+#define MCF_GPIO_PAR_PSC0_PAR_RXD0                  (0x08)
-+#define MCF_GPIO_PAR_PSC0_PAR_RTS0(x)               (((x)&0x03)<<4)
-+#define MCF_GPIO_PAR_PSC0_PAR_CTS0(x)               (((x)&0x03)<<6)
-+#define MCF_GPIO_PAR_PSC0_PAR_CTS0_GPIO             (0x00)
-+#define MCF_GPIO_PAR_PSC0_PAR_CTS0_BCLK             (0x80)
-+#define MCF_GPIO_PAR_PSC0_PAR_CTS0_CTS              (0xC0)
-+#define MCF_GPIO_PAR_PSC0_PAR_RTS0_GPIO             (0x00)
-+#define MCF_GPIO_PAR_PSC0_PAR_RTS0_FSYNC            (0x20)
-+#define MCF_GPIO_PAR_PSC0_PAR_RTS0_RTS              (0x30)
-+
-+/* Bit definitions and macros for MCF_GPIO_PAR_DSPI */
-+#define MCF_GPIO_PAR_DSPI_PAR_SOUT(x)               (((x)&0x0003)<<0)
-+#define MCF_GPIO_PAR_DSPI_PAR_SIN(x)                (((x)&0x0003)<<2)
-+#define MCF_GPIO_PAR_DSPI_PAR_SCK(x)                (((x)&0x0003)<<4)
-+#define MCF_GPIO_PAR_DSPI_PAR_CS0(x)                (((x)&0x0003)<<6)
-+#define MCF_GPIO_PAR_DSPI_PAR_CS2(x)                (((x)&0x0003)<<8)
-+#define MCF_GPIO_PAR_DSPI_PAR_CS3(x)                (((x)&0x0003)<<10)
-+#define MCF_GPIO_PAR_DSPI_PAR_CS5                   (0x1000)
-+#define MCF_GPIO_PAR_DSPI_PAR_CS3_GPIO              (0x0000)
-+#define MCF_GPIO_PAR_DSPI_PAR_CS3_CANTX             (0x0400)
-+#define MCF_GPIO_PAR_DSPI_PAR_CS3_TOUT              (0x0800)
-+#define MCF_GPIO_PAR_DSPI_PAR_CS3_DSPICS            (0x0C00)
-+#define MCF_GPIO_PAR_DSPI_PAR_CS2_GPIO              (0x0000)
-+#define MCF_GPIO_PAR_DSPI_PAR_CS2_CANTX             (0x0100)
-+#define MCF_GPIO_PAR_DSPI_PAR_CS2_TOUT              (0x0200)
-+#define MCF_GPIO_PAR_DSPI_PAR_CS2_DSPICS            (0x0300)
-+#define MCF_GPIO_PAR_DSPI_PAR_CS0_GPIO              (0x0000)
-+#define MCF_GPIO_PAR_DSPI_PAR_CS0_FSYNC             (0x0040)
-+#define MCF_GPIO_PAR_DSPI_PAR_CS0_RTS               (0x0080)
-+#define MCF_GPIO_PAR_DSPI_PAR_CS0_DSPICS            (0x00C0)
-+#define MCF_GPIO_PAR_DSPI_PAR_SCK_GPIO              (0x0000)
-+#define MCF_GPIO_PAR_DSPI_PAR_SCK_BCLK              (0x0010)
-+#define MCF_GPIO_PAR_DSPI_PAR_SCK_CTS               (0x0020)
-+#define MCF_GPIO_PAR_DSPI_PAR_SCK_SCK               (0x0030)
-+#define MCF_GPIO_PAR_DSPI_PAR_SIN_GPIO              (0x0000)
-+#define MCF_GPIO_PAR_DSPI_PAR_SIN_RXD               (0x0008)
-+#define MCF_GPIO_PAR_DSPI_PAR_SIN_SIN               (0x000C)
-+#define MCF_GPIO_PAR_DSPI_PAR_SOUT_GPIO             (0x0000)
-+#define MCF_GPIO_PAR_DSPI_PAR_SOUT_TXD              (0x0002)
-+#define MCF_GPIO_PAR_DSPI_PAR_SOUT_SOUT             (0x0003)
-+
-+/* Bit definitions and macros for MCF_GPIO_PAR_TIMER */
-+#define MCF_GPIO_PAR_TIMER_PAR_TOUT2                (0x01)
-+#define MCF_GPIO_PAR_TIMER_PAR_TIN2(x)              (((x)&0x03)<<1)
-+#define MCF_GPIO_PAR_TIMER_PAR_TOUT3                (0x08)
-+#define MCF_GPIO_PAR_TIMER_PAR_TIN3(x)              (((x)&0x03)<<4)
-+#define MCF_GPIO_PAR_TIMER_PAR_TIN3_CANRX           (0x00)
-+#define MCF_GPIO_PAR_TIMER_PAR_TIN3_IRQ             (0x20)
-+#define MCF_GPIO_PAR_TIMER_PAR_TIN3_TIN             (0x30)
-+#define MCF_GPIO_PAR_TIMER_PAR_TIN2_CANRX           (0x00)
-+#define MCF_GPIO_PAR_TIMER_PAR_TIN2_IRQ             (0x04)
-+#define MCF_GPIO_PAR_TIMER_PAR_TIN2_TIN             (0x06)
-+
-+/********************************************************************/
-+
-+#endif /* _M5485GPIO_H_ */
---- /dev/null
-+++ b/include/asm-m68k/m5485gpt.h
-@@ -0,0 +1,88 @@
-+/*
-+ * File:	mcf548x_gpt.h
-+ * Purpose:	Register and bit definitions for the MCF548X
-+ *
-+ * Notes:	
-+ *	
-+ */
-+
-+#ifndef __MCF548X_GPT_H__
-+#define __MCF548X_GPT_H__
-+
-+/*********************************************************************
-+*
-+* General Purpose Timers (GPT)
-+*
-+*********************************************************************/
-+
-+/* Register read/write macros */
-+#define MCF_GPT_GMS0       MCF_REG32(0x000800)
-+#define MCF_GPT_GCIR0      MCF_REG32(0x000804)
-+#define MCF_GPT_GPWM0      MCF_REG32(0x000808)
-+#define MCF_GPT_GSR0       MCF_REG32(0x00080C)
-+#define MCF_GPT_GMS1       MCF_REG32(0x000810)
-+#define MCF_GPT_GCIR1      MCF_REG32(0x000814)
-+#define MCF_GPT_GPWM1      MCF_REG32(0x000818)
-+#define MCF_GPT_GSR1       MCF_REG32(0x00081C)
-+#define MCF_GPT_GMS2       MCF_REG32(0x000820)
-+#define MCF_GPT_GCIR2      MCF_REG32(0x000824)
-+#define MCF_GPT_GPWM2      MCF_REG32(0x000828)
-+#define MCF_GPT_GSR2       MCF_REG32(0x00082C)
-+#define MCF_GPT_GMS3       MCF_REG32(0x000830)
-+#define MCF_GPT_GCIR3      MCF_REG32(0x000834)
-+#define MCF_GPT_GPWM3      MCF_REG32(0x000838)
-+#define MCF_GPT_GSR3       MCF_REG32(0x00083C)
-+#define MCF_GPT_GMS(x)     MCF_REG32(0x000800+((x)*0x010))
-+#define MCF_GPT_GCIR(x)    MCF_REG32(0x000804+((x)*0x010))
-+#define MCF_GPT_GPWM(x)    MCF_REG32(0x000808+((x)*0x010))
-+#define MCF_GPT_GSR(x)     MCF_REG32(0x00080C+((x)*0x010))
-+
-+/* Bit definitions and macros for MCF_GPT_GMS */
-+#define MCF_GPT_GMS_TMS(x)         (((x)&0x00000007)<<0)
-+#define MCF_GPT_GMS_GPIO(x)        (((x)&0x00000003)<<4)
-+#define MCF_GPT_GMS_IEN            (0x00000100)
-+#define MCF_GPT_GMS_OD             (0x00000200)
-+#define MCF_GPT_GMS_SC             (0x00000400)
-+#define MCF_GPT_GMS_CE             (0x00001000)
-+#define MCF_GPT_GMS_WDEN           (0x00008000)
-+#define MCF_GPT_GMS_ICT(x)         (((x)&0x00000003)<<16)
-+#define MCF_GPT_GMS_OCT(x)         (((x)&0x00000003)<<20)
-+#define MCF_GPT_GMS_OCPW(x)        (((x)&0x000000FF)<<24)
-+#define MCF_GPT_GMS_OCT_FRCLOW     (0x00000000)
-+#define MCF_GPT_GMS_OCT_PULSEHI    (0x00100000)
-+#define MCF_GPT_GMS_OCT_PULSELO    (0x00200000)
-+#define MCF_GPT_GMS_OCT_TOGGLE     (0x00300000)
-+#define MCF_GPT_GMS_ICT_ANY        (0x00000000)
-+#define MCF_GPT_GMS_ICT_RISE       (0x00010000)
-+#define MCF_GPT_GMS_ICT_FALL       (0x00020000)
-+#define MCF_GPT_GMS_ICT_PULSE      (0x00030000)
-+#define MCF_GPT_GMS_GPIO_INPUT     (0x00000000)
-+#define MCF_GPT_GMS_GPIO_OUTLO     (0x00000020)
-+#define MCF_GPT_GMS_GPIO_OUTHI     (0x00000030)
-+#define MCF_GPT_GMS_TMS_DISABLE    (0x00000000)
-+#define MCF_GPT_GMS_TMS_INCAPT     (0x00000001)
-+#define MCF_GPT_GMS_TMS_OUTCAPT    (0x00000002)
-+#define MCF_GPT_GMS_TMS_PWM        (0x00000003)
-+#define MCF_GPT_GMS_TMS_GPIO       (0x00000004)
-+
-+/* Bit definitions and macros for MCF_GPT_GCIR */
-+#define MCF_GPT_GCIR_CNT(x)        (((x)&0x0000FFFF)<<0)
-+#define MCF_GPT_GCIR_PRE(x)        (((x)&0x0000FFFF)<<16)
-+
-+/* Bit definitions and macros for MCF_GPT_GPWM */
-+#define MCF_GPT_GPWM_LOAD          (0x00000001)
-+#define MCF_GPT_GPWM_PWMOP         (0x00000100)
-+#define MCF_GPT_GPWM_WIDTH(x)      (((x)&0x0000FFFF)<<16)
-+
-+/* Bit definitions and macros for MCF_GPT_GSR */
-+#define MCF_GPT_GSR_CAPT           (0x00000001)
-+#define MCF_GPT_GSR_COMP           (0x00000002)
-+#define MCF_GPT_GSR_PWMP           (0x00000004)
-+#define MCF_GPT_GSR_TEXP           (0x00000008)
-+#define MCF_GPT_GSR_PIN            (0x00000100)
-+#define MCF_GPT_GSR_OVF(x)         (((x)&0x00000007)<<12)
-+#define MCF_GPT_GSR_CAPTURE(x)     (((x)&0x0000FFFF)<<16)
-+
-+/********************************************************************/
-+
-+#endif /* __MCF548X_GPT_H__ */
---- /dev/null
-+++ b/include/asm-m68k/m5485psc.h
-@@ -0,0 +1,474 @@
-+/*
-+ * File:	mcf548x_psc.h
-+ * Purpose:	Register and bit definitions for the MCF548X
-+ *
-+ * Notes:	
-+ *	
-+ */
-+
-+#ifndef __MCF548X_PSC_H__
-+#define __MCF548X_PSC_H__
-+
-+/*********************************************************************
-+*
-+* Programmable Serial Controller (PSC)
-+*
-+*********************************************************************/
-+
-+/* Register read/write macros */
-+#define MCF_PSC_MR0            (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008600))
-+#define MCF_PSC_SR0            (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008604))
-+#define MCF_PSC_CSR0           (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008604))
-+#define MCF_PSC_CR0            (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008608))
-+#define MCF_PSC_RB0            (*(volatile uint32_t*)(void*)(MCF_MBAR + 0x00860C))
-+#define MCF_PSC_TB0            (*(volatile uint32_t*)(void*)(MCF_MBAR + 0x00860C))
-+#define MCF_PSC_TB_8BIT0       (*(volatile uint32_t*)(void*)(MCF_MBAR + 0x00860C))
-+#define MCF_PSC_TB_16BIT0      (*(volatile uint32_t*)(void*)(MCF_MBAR + 0x00860C))
-+#define MCF_PSC_TB_AC970       (*(volatile uint32_t*)(void*)(MCF_MBAR + 0x00860C))
-+#define MCF_PSC_IPCR0          (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008610))
-+#define MCF_PSC_ACR0           (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008610))
-+#define MCF_PSC_ISR0           (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008614))
-+#define MCF_PSC_IMR0           (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008614))
-+#define MCF_PSC_CTUR0          (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008618))
-+#define MCF_PSC_CTLR0          (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x00861C))
-+#define MCF_PSC_IP0            (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008634))
-+#define MCF_PSC_OPSET0         (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008638))
-+#define MCF_PSC_OPRESET0       (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x00863C))
-+#define MCF_PSC_SICR0          (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008640))
-+#define MCF_PSC_IRCR10         (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008644))
-+#define MCF_PSC_IRCR20         (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008648))
-+#define MCF_PSC_IRSDR0         (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x00864C))
-+#define MCF_PSC_IRMDR0         (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008650))
-+#define MCF_PSC_IRFDR0         (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008654))
-+#define MCF_PSC_RFCNT0         (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008658))
-+#define MCF_PSC_TFCNT0         (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x00865C))
-+#define MCF_PSC_RFSR0          (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008664))
-+#define MCF_PSC_TFSR0          (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008684))
-+#define MCF_PSC_RFCR0          (*(volatile uint32_t*)(void*)(MCF_MBAR + 0x008668))
-+#define MCF_PSC_TFCR0          (*(volatile uint32_t*)(void*)(MCF_MBAR + 0x008688))
-+#define MCF_PSC_RFAR0          (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x00866E))
-+#define MCF_PSC_TFAR0          (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x00868E))
-+#define MCF_PSC_RFRP0          (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008672))
-+#define MCF_PSC_TFRP0          (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008692))
-+#define MCF_PSC_RFWP0          (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008676))
-+#define MCF_PSC_TFWP0          (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008696))
-+#define MCF_PSC_RLRFP0         (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x00867A))
-+#define MCF_PSC_TLRFP0         (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x00869A))
-+#define MCF_PSC_RLWFP0         (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x00867E))
-+#define MCF_PSC_TLWFP0         (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x00869E))
-+#define MCF_PSC_MR1            (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008700))
-+#define MCF_PSC_SR1            (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008704))
-+#define MCF_PSC_CSR1           (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008704))
-+#define MCF_PSC_CR1            (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008708))
-+#define MCF_PSC_RB1            (*(volatile uint32_t*)(void*)(MCF_MBAR + 0x00870C))
-+#define MCF_PSC_TB1            (*(volatile uint32_t*)(void*)(MCF_MBAR + 0x00870C))
-+#define MCF_PSC_TB_8BIT1       (*(volatile uint32_t*)(void*)(MCF_MBAR + 0x00870C))
-+#define MCF_PSC_TB_16BIT1      (*(volatile uint32_t*)(void*)(MCF_MBAR + 0x00870C))
-+#define MCF_PSC_TB_AC971       (*(volatile uint32_t*)(void*)(MCF_MBAR + 0x00870C))
-+#define MCF_PSC_IPCR1          (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008710))
-+#define MCF_PSC_ACR1           (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008710))
-+#define MCF_PSC_ISR1           (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008714))
-+#define MCF_PSC_IMR1           (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008714))
-+#define MCF_PSC_CTUR1          (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008718))
-+#define MCF_PSC_CTLR1          (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x00871C))
-+#define MCF_PSC_IP1            (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008734))
-+#define MCF_PSC_OPSET1         (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008738))
-+#define MCF_PSC_OPRESET1       (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x00873C))
-+#define MCF_PSC_SICR1          (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008740))
-+#define MCF_PSC_IRCR11         (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008744))
-+#define MCF_PSC_IRCR21         (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008748))
-+#define MCF_PSC_IRSDR1         (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x00874C))
-+#define MCF_PSC_IRMDR1         (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008750))
-+#define MCF_PSC_IRFDR1         (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008754))
-+#define MCF_PSC_RFCNT1         (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008758))
-+#define MCF_PSC_TFCNT1         (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x00875C))
-+#define MCF_PSC_RFSR1          (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008764))
-+#define MCF_PSC_TFSR1          (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008784))
-+#define MCF_PSC_RFCR1          (*(volatile uint32_t*)(void*)(MCF_MBAR + 0x008768))
-+#define MCF_PSC_TFCR1          (*(volatile uint32_t*)(void*)(MCF_MBAR + 0x008788))
-+#define MCF_PSC_RFAR1          (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x00876E))
-+#define MCF_PSC_TFAR1          (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x00878E))
-+#define MCF_PSC_RFRP1          (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008772))
-+#define MCF_PSC_TFRP1          (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008792))
-+#define MCF_PSC_RFWP1          (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008776))
-+#define MCF_PSC_TFWP1          (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008796))
-+#define MCF_PSC_RLRFP1         (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x00877A))
-+#define MCF_PSC_TLRFP1         (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x00879A))
-+#define MCF_PSC_RLWFP1         (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x00877E))
-+#define MCF_PSC_TLWFP1         (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x00879E))
-+#define MCF_PSC_MR2            (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008800))
-+#define MCF_PSC_SR2            (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008804))
-+#define MCF_PSC_CSR2           (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008804))
-+#define MCF_PSC_CR2            (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008808))
-+#define MCF_PSC_RB2            (*(volatile uint32_t*)(void*)(MCF_MBAR + 0x00880C))
-+#define MCF_PSC_TB2            (*(volatile uint32_t*)(void*)(MCF_MBAR + 0x00880C))
-+#define MCF_PSC_TB_8BIT2       (*(volatile uint32_t*)(void*)(MCF_MBAR + 0x00880C))
-+#define MCF_PSC_TB_16BIT2      (*(volatile uint32_t*)(void*)(MCF_MBAR + 0x00880C))
-+#define MCF_PSC_TB_AC972       (*(volatile uint32_t*)(void*)(MCF_MBAR + 0x00880C))
-+#define MCF_PSC_IPCR2          (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008810))
-+#define MCF_PSC_ACR2           (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008810))
-+#define MCF_PSC_ISR2           (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008814))
-+#define MCF_PSC_IMR2           (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008814))
-+#define MCF_PSC_CTUR2          (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008818))
-+#define MCF_PSC_CTLR2          (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x00881C))
-+#define MCF_PSC_IP2            (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008834))
-+#define MCF_PSC_OPSET2         (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008838))
-+#define MCF_PSC_OPRESET2       (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x00883C))
-+#define MCF_PSC_SICR2          (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008840))
-+#define MCF_PSC_IRCR12         (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008844))
-+#define MCF_PSC_IRCR22         (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008848))
-+#define MCF_PSC_IRSDR2         (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x00884C))
-+#define MCF_PSC_IRMDR2         (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008850))
-+#define MCF_PSC_IRFDR2         (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008854))
-+#define MCF_PSC_RFCNT2         (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008858))
-+#define MCF_PSC_TFCNT2         (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x00885C))
-+#define MCF_PSC_RFSR2          (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008864))
-+#define MCF_PSC_TFSR2          (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008884))
-+#define MCF_PSC_RFCR2          (*(volatile uint32_t*)(void*)(MCF_MBAR + 0x008868))
-+#define MCF_PSC_TFCR2          (*(volatile uint32_t*)(void*)(MCF_MBAR + 0x008888))
-+#define MCF_PSC_RFAR2          (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x00886E))
-+#define MCF_PSC_TFAR2          (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x00888E))
-+#define MCF_PSC_RFRP2          (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008872))
-+#define MCF_PSC_TFRP2          (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008892))
-+#define MCF_PSC_RFWP2          (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008876))
-+#define MCF_PSC_TFWP2          (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008896))
-+#define MCF_PSC_RLRFP2         (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x00887A))
-+#define MCF_PSC_TLRFP2         (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x00889A))
-+#define MCF_PSC_RLWFP2         (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x00887E))
-+#define MCF_PSC_TLWFP2         (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x00889E))
-+#define MCF_PSC_MR3            (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008900))
-+#define MCF_PSC_SR3            (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008904))
-+#define MCF_PSC_CSR3           (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008904))
-+#define MCF_PSC_CR3            (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008908))
-+#define MCF_PSC_RB3            (*(volatile uint32_t*)(void*)(MCF_MBAR + 0x00890C))
-+#define MCF_PSC_TB3            (*(volatile uint32_t*)(void*)(MCF_MBAR + 0x00890C))
-+#define MCF_PSC_TB_8BIT3       (*(volatile uint32_t*)(void*)(MCF_MBAR + 0x00890C))
-+#define MCF_PSC_TB_16BIT3      (*(volatile uint32_t*)(void*)(MCF_MBAR + 0x00890C))
-+#define MCF_PSC_TB_AC973       (*(volatile uint32_t*)(void*)(MCF_MBAR + 0x00890C))
-+#define MCF_PSC_IPCR3          (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008910))
-+#define MCF_PSC_ACR3           (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008910))
-+#define MCF_PSC_ISR3           (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008914))
-+#define MCF_PSC_IMR3           (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008914))
-+#define MCF_PSC_CTUR3          (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008918))
-+#define MCF_PSC_CTLR3          (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x00891C))
-+#define MCF_PSC_IP3            (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008934))
-+#define MCF_PSC_OPSET3         (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008938))
-+#define MCF_PSC_OPRESET3       (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x00893C))
-+#define MCF_PSC_SICR3          (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008940))
-+#define MCF_PSC_IRCR13         (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008944))
-+#define MCF_PSC_IRCR23         (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008948))
-+#define MCF_PSC_IRSDR3         (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x00894C))
-+#define MCF_PSC_IRMDR3         (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008950))
-+#define MCF_PSC_IRFDR3         (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008954))
-+#define MCF_PSC_RFCNT3         (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008958))
-+#define MCF_PSC_TFCNT3         (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x00895C))
-+#define MCF_PSC_RFSR3          (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008964))
-+#define MCF_PSC_TFSR3          (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008984))
-+#define MCF_PSC_RFCR3          (*(volatile uint32_t*)(void*)(MCF_MBAR + 0x008968))
-+#define MCF_PSC_TFCR3          (*(volatile uint32_t*)(void*)(MCF_MBAR + 0x008988))
-+#define MCF_PSC_RFAR3          (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x00896E))
-+#define MCF_PSC_TFAR3          (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x00898E))
-+#define MCF_PSC_RFRP3          (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008972))
-+#define MCF_PSC_TFRP3          (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008992))
-+#define MCF_PSC_RFWP3          (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008976))
-+#define MCF_PSC_TFWP3          (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008996))
-+#define MCF_PSC_RLRFP3         (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x00897A))
-+#define MCF_PSC_TLRFP3         (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x00899A))
-+#define MCF_PSC_RLWFP3         (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x00897E))
-+#define MCF_PSC_TLWFP3         (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x00899E))
-+#define MCF_PSC_MR(x)          (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008600+((x)*0x100)))
-+#define MCF_PSC_SR(x)          (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008604+((x)*0x100)))
-+#define MCF_PSC_CSR(x)         (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008604+((x)*0x100)))
-+#define MCF_PSC_CR(x)          (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008608+((x)*0x100)))
-+#define MCF_PSC_RB(x)          (*(volatile uint32_t*)(void*)(MCF_MBAR + 0x00860C+((x)*0x100)))
-+#define MCF_PSC_TB(x)          (*(volatile uint32_t*)(void*)(MCF_MBAR + 0x00860C+((x)*0x100)))
-+#define MCF_PSC_TB_8BIT(x)     (*(volatile uint32_t*)(void*)(MCF_MBAR + 0x00860C+((x)*0x100)))
-+#define MCF_PSC_TB_16BIT(x)    (*(volatile uint32_t*)(void*)(MCF_MBAR + 0x00860C+((x)*0x100)))
-+#define MCF_PSC_TB_AC97(x)     (*(volatile uint32_t*)(void*)(MCF_MBAR + 0x00860C+((x)*0x100)))
-+#define MCF_PSC_IPCR(x)        (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008610+((x)*0x100)))
-+#define MCF_PSC_ACR(x)         (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008610+((x)*0x100)))
-+#define MCF_PSC_ISR(x)         (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008614+((x)*0x100)))
-+#define MCF_PSC_IMR(x)         (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008614+((x)*0x100)))
-+#define MCF_PSC_CTUR(x)        (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008618+((x)*0x100)))
-+#define MCF_PSC_CTLR(x)        (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x00861C+((x)*0x100)))
-+#define MCF_PSC_IP(x)          (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008634+((x)*0x100)))
-+#define MCF_PSC_OPSET(x)       (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008638+((x)*0x100)))
-+#define MCF_PSC_OPRESET(x)     (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x00863C+((x)*0x100)))
-+#define MCF_PSC_SICR(x)        (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008640+((x)*0x100)))
-+#define MCF_PSC_IRCR1(x)       (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008644+((x)*0x100)))
-+#define MCF_PSC_IRCR2(x)       (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008648+((x)*0x100)))
-+#define MCF_PSC_IRSDR(x)       (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x00864C+((x)*0x100)))
-+#define MCF_PSC_IRMDR(x)       (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008650+((x)*0x100)))
-+#define MCF_PSC_IRFDR(x)       (*(volatile uint8_t *)(void*)(MCF_MBAR + 0x008654+((x)*0x100)))
-+#define MCF_PSC_RFCNT(x)       (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008658+((x)*0x100)))
-+#define MCF_PSC_TFCNT(x)       (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x00865C+((x)*0x100)))
-+#define MCF_PSC_RFSR(x)        (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008664+((x)*0x100)))
-+#define MCF_PSC_TFSR(x)        (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008684+((x)*0x100)))
-+#define MCF_PSC_RFCR(x)        (*(volatile uint32_t*)(void*)(MCF_MBAR + 0x008668+((x)*0x100)))
-+#define MCF_PSC_TFCR(x)        (*(volatile uint32_t*)(void*)(MCF_MBAR + 0x008688+((x)*0x100)))
-+#define MCF_PSC_RFAR(x)        (*(volatile uint16_t*)(void*)(MCF_MBAR + (0x00866E)+((x)*0x100)))
-+#define MCF_PSC_TFAR(x)        (*(volatile uint16_t*)(void*)(MCF_MBAR + (0x00868E)+((x)*0x100)))
-+#define MCF_PSC_RFRP(x)        (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008672+((x)*0x100)))
-+#define MCF_PSC_TFRP(x)        (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008692+((x)*0x100)))
-+#define MCF_PSC_RFWP(x)        (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008676+((x)*0x100)))
-+#define MCF_PSC_TFWP(x)        (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x008696+((x)*0x100)))
-+#define MCF_PSC_RLRFP(x)       (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x00867A+((x)*0x100)))
-+#define MCF_PSC_TLRFP(x)       (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x00869A+((x)*0x100)))
-+#define MCF_PSC_RLWFP(x)       (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x00867E+((x)*0x100)))
-+#define MCF_PSC_TLWFP(x)       (*(volatile uint16_t*)(void*)(MCF_MBAR + 0x00869E+((x)*0x100)))
-+
-+/* Bit definitions and macros for MCF_PSC_MR */
-+#define MCF_PSC_MR_BC(x)              (((x)&0x03)<<0)
-+#define MCF_PSC_MR_PT                 (0x04)
-+#define MCF_PSC_MR_PM(x)              (((x)&0x03)<<3)
-+#define MCF_PSC_MR_ERR                (0x20)
-+#define MCF_PSC_MR_RXIRQ              (0x40)
-+#define MCF_PSC_MR_RXRTS              (0x80)
-+#define MCF_PSC_MR_SB(x)              (((x)&0x0F)<<0)
-+#define MCF_PSC_MR_TXCTS              (0x10)
-+#define MCF_PSC_MR_TXRTS              (0x20)
-+#define MCF_PSC_MR_CM(x)              (((x)&0x03)<<6)
-+#define MCF_PSC_MR_PM_MULTI_ADDR      (0x1C)
-+#define MCF_PSC_MR_PM_MULTI_DATA      (0x18)
-+#define MCF_PSC_MR_PM_NONE            (0x10)
-+#define MCF_PSC_MR_PM_FORCE_HI        (0x0C)
-+#define MCF_PSC_MR_PM_FORCE_LO        (0x08)
-+#define MCF_PSC_MR_PM_ODD             (0x04)
-+#define MCF_PSC_MR_PM_EVEN            (0x00)
-+#define MCF_PSC_MR_BC_5               (0x00)
-+#define MCF_PSC_MR_BC_6               (0x01)
-+#define MCF_PSC_MR_BC_7               (0x02)
-+#define MCF_PSC_MR_BC_8               (0x03)
-+#define MCF_PSC_MR_CM_NORMAL          (0x00)
-+#define MCF_PSC_MR_CM_ECHO            (0x40)
-+#define MCF_PSC_MR_CM_LOCAL_LOOP      (0x80)
-+#define MCF_PSC_MR_CM_REMOTE_LOOP     (0xC0)
-+#define MCF_PSC_MR_SB_STOP_BITS_1     (0x07)
-+#define MCF_PSC_MR_SB_STOP_BITS_15    (0x08)
-+#define MCF_PSC_MR_SB_STOP_BITS_2     (0x0F)
-+
-+/* Bit definitions and macros for MCF_PSC_SR */
-+#define MCF_PSC_SR_ERR                (0x0040)
-+#define MCF_PSC_SR_CDE_DEOF           (0x0080)
-+#define MCF_PSC_SR_RXRDY              (0x0100)
-+#define MCF_PSC_SR_FU                 (0x0200)
-+#define MCF_PSC_SR_TXRDY              (0x0400)
-+#define MCF_PSC_SR_TXEMP_URERR        (0x0800)
-+#define MCF_PSC_SR_OE                 (0x1000)
-+#define MCF_PSC_SR_PE_CRCERR          (0x2000)
-+#define MCF_PSC_SR_FE_PHYERR          (0x4000)
-+#define MCF_PSC_SR_RB_NEOF            (0x8000)
-+
-+/* Bit definitions and macros for MCF_PSC_CSR */
-+#define MCF_PSC_CSR_TCSEL(x)          (((x)&0x0F)<<0)
-+#define MCF_PSC_CSR_RCSEL(x)          (((x)&0x0F)<<4)
-+#define MCF_PSC_CSR_RCSEL_SYS_CLK     (0xD0)
-+#define MCF_PSC_CSR_RCSEL_CTM16       (0xE0)
-+#define MCF_PSC_CSR_RCSEL_CTM         (0xF0)
-+#define MCF_PSC_CSR_TCSEL_SYS_CLK     (0x0D)
-+#define MCF_PSC_CSR_TCSEL_CTM16       (0x0E)
-+#define MCF_PSC_CSR_TCSEL_CTM         (0x0F)
-+
-+/* Bit definitions and macros for MCF_PSC_CR */
-+#define MCF_PSC_CR_RXC(x)             (((x)&0x03)<<0)
-+#define MCF_PSC_CR_TXC(x)             (((x)&0x03)<<2)
-+#define MCF_PSC_CR_MISC(x)            (((x)&0x07)<<4)
-+#define MCF_PSC_CR_NONE               (0x00)
-+#define MCF_PSC_CR_STOP_BREAK         (0x70)
-+#define MCF_PSC_CR_START_BREAK        (0x60)
-+#define MCF_PSC_CR_BKCHGINT           (0x50)
-+#define MCF_PSC_CR_RESET_ERROR        (0x40)
-+#define MCF_PSC_CR_RESET_TX           (0x30)
-+#define MCF_PSC_CR_RESET_RX           (0x20)
-+#define MCF_PSC_CR_RESET_MR           (0x10)
-+#define MCF_PSC_CR_TX_DISABLED        (0x08)
-+#define MCF_PSC_CR_TX_ENABLED         (0x04)
-+#define MCF_PSC_CR_RX_DISABLED        (0x02)
-+#define MCF_PSC_CR_RX_ENABLED         (0x01)
-+
-+/* Bit definitions and macros for MCF_PSC_TB_8BIT */
-+#define MCF_PSC_TB_8BIT_TB3(x)        (((x)&0x000000FF)<<0)
-+#define MCF_PSC_TB_8BIT_TB2(x)        (((x)&0x000000FF)<<8)
-+#define MCF_PSC_TB_8BIT_TB1(x)        (((x)&0x000000FF)<<16)
-+#define MCF_PSC_TB_8BIT_TB0(x)        (((x)&0x000000FF)<<24)
-+
-+/* Bit definitions and macros for MCF_PSC_TB_16BIT */
-+#define MCF_PSC_TB_16BIT_TB1(x)       (((x)&0x0000FFFF)<<0)
-+#define MCF_PSC_TB_16BIT_TB0(x)       (((x)&0x0000FFFF)<<16)
-+
-+/* Bit definitions and macros for MCF_PSC_TB_AC97 */
-+#define MCF_PSC_TB_AC97_SOF           (0x00000800)
-+#define MCF_PSC_TB_AC97_TB(x)         (((x)&0x000FFFFF)<<12)
-+
-+/* Bit definitions and macros for MCF_PSC_IPCR */
-+#define MCF_PSC_IPCR_RESERVED         (0x0C)
-+#define MCF_PSC_IPCR_CTS              (0x0D)
-+#define MCF_PSC_IPCR_D_CTS            (0x1C)
-+#define MCF_PSC_IPCR_SYNC             (0x8C)
-+
-+/* Bit definitions and macros for MCF_PSC_ACR */
-+#define MCF_PSC_ACR_IEC0              (0x01)
-+#define MCF_PSC_ACR_CTMS(x)           (((x)&0x07)<<4)
-+#define MCF_PSC_ACR_BRG               (0x80)
-+
-+/* Bit definitions and macros for MCF_PSC_ISR */
-+#define MCF_PSC_ISR_ERR               (0x0040)
-+#define MCF_PSC_ISR_DEOF              (0x0080)
-+#define MCF_PSC_ISR_TXRDY             (0x0100)
-+#define MCF_PSC_ISR_RXRDY_FU          (0x0200)
-+#define MCF_PSC_ISR_DB                (0x0400)
-+#define MCF_PSC_ISR_IPC               (0x8000)
-+
-+/* Bit definitions and macros for MCF_PSC_IMR */
-+#define MCF_PSC_IMR_ERR               (0x0040)
-+#define MCF_PSC_IMR_DEOF              (0x0080)
-+#define MCF_PSC_IMR_TXRDY             (0x0100)
-+#define MCF_PSC_IMR_RXRDY_FU          (0x0200)
-+#define MCF_PSC_IMR_DB                (0x0400)
-+#define MCF_PSC_IMR_IPC               (0x8000)
-+
-+/* Bit definitions and macros for MCF_PSC_IP */
-+#define MCF_PSC_IP_CTS                (0x01)
-+#define MCF_PSC_IP_TGL                (0x40)
-+#define MCF_PSC_IP_LWPR_B             (0x80)
-+
-+/* Bit definitions and macros for MCF_PSC_OPSET */
-+#define MCF_PSC_OPSET_RTS             (0x01)
-+
-+/* Bit definitions and macros for MCF_PSC_OPRESET */
-+#define MCF_PSC_OPRESET_RTS           (0x01)
-+
-+/* Bit definitions and macros for MCF_PSC_SICR */
-+#define MCF_PSC_SICR_SIM(x)           (((x)&0x07)<<0)
-+#define MCF_PSC_SICR_SHDIR            (0x10)
-+#define MCF_PSC_SICR_DTS              (0x20)
-+#define MCF_PSC_SICR_AWR              (0x40)
-+#define MCF_PSC_SICR_ACRB             (0x80)
-+#define MCF_PSC_SICR_SIM_UART         (0x00)
-+#define MCF_PSC_SICR_SIM_MODEM8       (0x01)
-+#define MCF_PSC_SICR_SIM_MODEM16      (0x02)
-+#define MCF_PSC_SICR_SIM_AC97         (0x03)
-+#define MCF_PSC_SICR_SIM_SIR          (0x04)
-+#define MCF_PSC_SICR_SIM_MIR          (0x05)
-+#define MCF_PSC_SICR_SIM_FIR          (0x06)
-+
-+/* Bit definitions and macros for MCF_PSC_IRCR1 */
-+#define MCF_PSC_IRCR1_SPUL            (0x01)
-+#define MCF_PSC_IRCR1_SIPEN           (0x02)
-+#define MCF_PSC_IRCR1_FD              (0x04)
-+
-+/* Bit definitions and macros for MCF_PSC_IRCR2 */
-+#define MCF_PSC_IRCR2_NXTEOF          (0x01)
-+#define MCF_PSC_IRCR2_ABORT           (0x02)
-+#define MCF_PSC_IRCR2_SIPREQ          (0x04)
-+
-+/* Bit definitions and macros for MCF_PSC_IRMDR */
-+#define MCF_PSC_IRMDR_M_FDIV(x)       (((x)&0x7F)<<0)
-+#define MCF_PSC_IRMDR_FREQ            (0x80)
-+
-+/* Bit definitions and macros for MCF_PSC_IRFDR */
-+#define MCF_PSC_IRFDR_F_FDIV(x)       (((x)&0x0F)<<0)
-+
-+/* Bit definitions and macros for MCF_PSC_RFCNT */
-+#define MCF_PSC_RFCNT_CNT(x)          (((x)&0x01FF)<<0)
-+
-+/* Bit definitions and macros for MCF_PSC_TFCNT */
-+#define MCF_PSC_TFCNT_CNT(x)          (((x)&0x01FF)<<0)
-+
-+/* Bit definitions and macros for MCF_PSC_RFSR */
-+#define MCF_PSC_RFSR_EMT              (0x0001)
-+#define MCF_PSC_RFSR_ALARM            (0x0002)
-+#define MCF_PSC_RFSR_FU               (0x0004)
-+#define MCF_PSC_RFSR_FRMRY            (0x0008)
-+#define MCF_PSC_RFSR_OF               (0x0010)
-+#define MCF_PSC_RFSR_UF               (0x0020)
-+#define MCF_PSC_RFSR_RXW              (0x0040)
-+#define MCF_PSC_RFSR_FAE              (0x0080)
-+#define MCF_PSC_RFSR_FRM(x)           (((x)&0x000F)<<8)
-+#define MCF_PSC_RFSR_TAG              (0x1000)
-+#define MCF_PSC_RFSR_TXW              (0x4000)
-+#define MCF_PSC_RFSR_IP               (0x8000)
-+#define MCF_PSC_RFSR_FRM_BYTE0        (0x0800)
-+#define MCF_PSC_RFSR_FRM_BYTE1        (0x0400)
-+#define MCF_PSC_RFSR_FRM_BYTE2        (0x0200)
-+#define MCF_PSC_RFSR_FRM_BYTE3        (0x0100)
-+
-+/* Bit definitions and macros for MCF_PSC_TFSR */
-+#define MCF_PSC_TFSR_EMT              (0x0001)
-+#define MCF_PSC_TFSR_ALARM            (0x0002)
-+#define MCF_PSC_TFSR_FU               (0x0004)
-+#define MCF_PSC_TFSR_FRMRY            (0x0008)
-+#define MCF_PSC_TFSR_OF               (0x0010)
-+#define MCF_PSC_TFSR_UF               (0x0020)
-+#define MCF_PSC_TFSR_RXW              (0x0040)
-+#define MCF_PSC_TFSR_FAE              (0x0080)
-+#define MCF_PSC_TFSR_FRM(x)           (((x)&0x000F)<<8)
-+#define MCF_PSC_TFSR_TAG              (0x1000)
-+#define MCF_PSC_TFSR_TXW              (0x4000)
-+#define MCF_PSC_TFSR_IP               (0x8000)
-+#define MCF_PSC_TFSR_FRM_BYTE0        (0x0800)
-+#define MCF_PSC_TFSR_FRM_BYTE1        (0x0400)
-+#define MCF_PSC_TFSR_FRM_BYTE2        (0x0200)
-+#define MCF_PSC_TFSR_FRM_BYTE3        (0x0100)
-+
-+/* Bit definitions and macros for MCF_PSC_RFCR */
-+#define MCF_PSC_RFCR_CNTR(x)          (((x)&0x0000FFFF)<<0)
-+#define MCF_PSC_RFCR_TXW_MSK          (0x00040000)
-+#define MCF_PSC_RFCR_OF_MSK           (0x00080000)
-+#define MCF_PSC_RFCR_UF_MSK           (0x00100000)
-+#define MCF_PSC_RFCR_RXW_MSK          (0x00200000)
-+#define MCF_PSC_RFCR_FAE_MSK          (0x00400000)
-+#define MCF_PSC_RFCR_IP_MSK           (0x00800000)
-+#define MCF_PSC_RFCR_GR(x)            (((x)&0x00000007)<<24)
-+#define MCF_PSC_RFCR_FRMEN            (0x08000000)
-+#define MCF_PSC_RFCR_TIMER            (0x10000000)
-+#define MCF_PSC_RFCR_WRITETAG         (0x20000000)
-+#define MCF_PSC_RFCR_SHADOW           (0x80000000)
-+
-+/* Bit definitions and macros for MCF_PSC_TFCR */
-+#define MCF_PSC_TFCR_CNTR(x)          (((x)&0x0000FFFF)<<0)
-+#define MCF_PSC_TFCR_TXW_MSK          (0x00040000)
-+#define MCF_PSC_TFCR_OF_MSK           (0x00080000)
-+#define MCF_PSC_TFCR_UF_MSK           (0x00100000)
-+#define MCF_PSC_TFCR_RXW_MSK          (0x00200000)
-+#define MCF_PSC_TFCR_FAE_MSK          (0x00400000)
-+#define MCF_PSC_TFCR_IP_MSK           (0x00800000)
-+#define MCF_PSC_TFCR_GR(x)            (((x)&0x00000007)<<24)
-+#define MCF_PSC_TFCR_FRMEN            (0x08000000)
-+#define MCF_PSC_TFCR_TIMER            (0x10000000)
-+#define MCF_PSC_TFCR_WRITETAG         (0x20000000)
-+#define MCF_PSC_TFCR_SHADOW           (0x80000000)
-+
-+/* Bit definitions and macros for MCF_PSC_RFAR */
-+#define MCF_PSC_RFAR_ALARM(x)         (((x)&0x01FF)<<0)
-+
-+/* Bit definitions and macros for MCF_PSC_TFAR */
-+#define MCF_PSC_TFAR_ALARM(x)         (((x)&0x01FF)<<0)
-+
-+/* Bit definitions and macros for MCF_PSC_RFRP */
-+#define MCF_PSC_RFRP_READ(x)          (((x)&0x01FF)<<0)
-+
-+/* Bit definitions and macros for MCF_PSC_TFRP */
-+#define MCF_PSC_TFRP_READ(x)          (((x)&0x01FF)<<0)
-+
-+/* Bit definitions and macros for MCF_PSC_RFWP */
-+#define MCF_PSC_RFWP_WRITE(x)         (((x)&0x01FF)<<0)
-+
-+/* Bit definitions and macros for MCF_PSC_TFWP */
-+#define MCF_PSC_TFWP_WRITE(x)         (((x)&0x01FF)<<0)
-+
-+/* Bit definitions and macros for MCF_PSC_RLRFP */
-+#define MCF_PSC_RLRFP_LFP(x)          (((x)&0x01FF)<<0)
-+
-+/* Bit definitions and macros for MCF_PSC_TLRFP */
-+#define MCF_PSC_TLRFP_LFP(x)          (((x)&0x01FF)<<0)
-+
-+/* Bit definitions and macros for MCF_PSC_RLWFP */
-+#define MCF_PSC_RLWFP_LFP(x)          (((x)&0x01FF)<<0)
-+
-+/* Bit definitions and macros for MCF_PSC_TLWFP */
-+#define MCF_PSC_TLWFP_LFP(x)          (((x)&0x01FF)<<0)
-+
-+/********************************************************************/
-+
-+#endif /* __MCF548X_PSC_H__ */
---- /dev/null
-+++ b/include/asm-m68k/m5485sim.h
-@@ -0,0 +1,219 @@
-+/*
-+ *	m5485sim.h -- ColdFire 547x/548x System Integration Unit support.
-+ */
-+ 
-+#ifndef	m5485sim_h
-+#define	m5485sim_h
-+
-+
-+/*
-+ *      System Integration Unit Registers
-+ */
-+#define MCF_SDRAMDS	MCF_REG32(0x000004)	/* SDRAM Drive Strength 	*/
-+#define MCF_SBCR       	MCF_REG32(0x000010)	/* System Breakpoint Control 	*/
-+#define MCF_CSnCFG(x)	MCF_REG32(0x000020+(x*4))/* SDRAM Chip Select X		*/
-+#define MCF_SECSACR     MCF_REG32(0x000038)	/* Sequential Access Control 	*/	
-+#define MCF_RSR         MCF_REG32(0x000044)	/* Reset Status 		*/
-+#define MCF_JTAGID      MCF_REG32(0x000050)	/* JTAG Device Identification 	*/
-+
-+/*
-+ *      FlexBus Chip Selects Registers
-+ */
-+#define MCF_CSARn(x)    MCF_REG32(0x000500+(x*0xC))
-+#define MCF_CSMRn(x)    MCF_REG32(0x000504+(x*0xC))
-+#define MCF_CSCRn(x)    MCF_REG32(0x000508+(x*0xC))
-+
-+/*
-+ *      Interrupt Controller Registers
-+ */
-+#define MCF_IPRH      	MCF_REG32(0x000700)
-+#define MCF_IPRL      	MCF_REG32(0x000704)
-+#define MCF_IMRH      	MCF_REG32(0x000708)
-+#define MCF_IMRL      	MCF_REG32(0x00070C)
-+#define MCF_INTFRCH   	MCF_REG32(0x000710)
-+#define MCF_INTFRCL   	MCF_REG32(0x000714)
-+#define MCF_IRLR      	MCF_REG08(0x000718)
-+#define MCF_IACKLPR   	MCF_REG08(0x000719)
-+#define MCF_SWIACK    	MCF_REG08(0x0007E0)
-+#define MCF_LnIACK(x) 	MCF_REG08(0x0007E4+((x)*0x004))
-+#define MCF_ICR(x)    	MCF_REG08(0x000740+((x)*0x001))
-+
-+/*
-+ *	Slice Timers Registers
-+ */
-+#define MCF_SLTCNT(x)   MCF_REG32(0x000900+((x)*0x010))
-+#define MCF_SCR(x)      MCF_REG32(0x000904+((x)*0x010))
-+#define MCF_SCNT(x)     MCF_REG32(0x000908+((x)*0x010))
-+#define MCF_SSR(x)      MCF_REG32(0x00090C+((x)*0x010))
-+
-+/*
-+ *	Interrupt sources
-+ */
-+#define ISC_EPORT_Fn(x)		(x) 		/* EPORT Interrupts 	*/
-+#define ISC_USB_EPn(x)		(15+(x))	/* USB Endopint 	*/
-+#define ISC_USB_ISR		(22) 		/* USB General source 	*/
-+#define ISC_USB_AISR		(22) 		/* USB core source 	*/
-+#define ISC_DSPI_OVRFW		(25)		/* DSPI overflow 	*/
-+#define ISC_DSPI_RFOF		(26)		
-+#define ISC_DSPI_RFDF		(27)		
-+#define ISC_DSPI_TFUF		(28)		
-+#define ISC_DSPI_TCF		(29)		
-+#define ISC_DSPI_TFFF		(30)		
-+#define ISC_DSPI_EOQF		(31)		
-+#define ISC_PSCn(x)		(35-(x))		
-+#define ISC_COMM_TIM		(36)		
-+#define ISC_SEC			(37)		
-+#define ISC_FEC1		(38)		
-+#define ISC_FEC0		(39)		
-+#define ISC_I2C			(40)		
-+#define ISC_PCI_ARB		(41)		
-+#define ISC_PCI_CB		(42)		
-+#define ISC_PCI_XLB		(43)		
-+#define ISC_DMA			(48)		
-+#define ISC_CANn_ERR(x)		(49+(6*(x)))		
-+#define ISC_CANn_BUSOFF(x)	(50+(6*(x)))		
-+#define ISC_CANn_MBOR(x)	(51+(6*(x)))		
-+#define ISC_CAN0_WAKEIN		(52)		
-+#define ISC_SLTn(x)		(54-(x))		
-+#define ISC_GPTn(x)		(62-(x))		
-+
-+/*
-+ *	Interrupt level and priorities
-+ */
-+#define ILP_TOP			(MCF_ICR_IL(5) | MCF_ICR_IP(3))
-+#define ILP_SLT0		(MCF_ICR_IL(5) | MCF_ICR_IP(2))
-+#define ILP_SLT1		(MCF_ICR_IL(5) | MCF_ICR_IP(1))
-+#define ILP_DMA			(MCF_ICR_IL(5) | MCF_ICR_IP(0))
-+#define ILP_SEC			(MCF_ICR_IL(4) | MCF_ICR_IP(7))
-+#define ILP_FEC0		(MCF_ICR_IL(4) | MCF_ICR_IP(6))
-+#define ILP_FEC1		(MCF_ICR_IL(4) | MCF_ICR_IP(5))
-+#define ILP_PCI_XLB		(MCF_ICR_IL(4) | MCF_ICR_IP(4))
-+#define ILP_PCI_ARB		(MCF_ICR_IL(4) | MCF_ICR_IP(3))
-+#define ILP_PCI_CB		(MCF_ICR_IL(4) | MCF_ICR_IP(2))
-+#define ILP_I2C			(MCF_ICR_IL(4) | MCF_ICR_IP(1))
-+
-+#define ILP_USB_EPn(x)		(MCF_ICR_IL(3) | MCF_ICR_IP(7-(x)))
-+#define ILP_USB_EP0		(MCF_ICR_IL(3) | MCF_ICR_IP(7))
-+#define ILP_USB_EP1		(MCF_ICR_IL(3) | MCF_ICR_IP(6))
-+#define ILP_USB_EP2		(MCF_ICR_IL(3) | MCF_ICR_IP(5))
-+#define ILP_USB_EP3		(MCF_ICR_IL(3) | MCF_ICR_IP(4))
-+#define ILP_USB_EP4		(MCF_ICR_IL(3) | MCF_ICR_IP(3))
-+#define ILP_USB_EP5		(MCF_ICR_IL(3) | MCF_ICR_IP(2))
-+#define ILP_USB_EP6		(MCF_ICR_IL(3) | MCF_ICR_IP(1))
-+#define ILP_USB_ISR		(MCF_ICR_IL(3) | MCF_ICR_IP(0))
-+
-+#define ILP_USB_AISR		(MCF_ICR_IL(2) | MCF_ICR_IP(7))
-+#define ILP_DSPI_OVRFW		(MCF_ICR_IL(2) | MCF_ICR_IP(6))
-+#define ILP_DSPI_RFOF		(MCF_ICR_IL(2) | MCF_ICR_IP(5))
-+#define ILP_DSPI_RFDF		(MCF_ICR_IL(2) | MCF_ICR_IP(4))
-+#define ILP_DSPI_TFUF		(MCF_ICR_IL(2) | MCF_ICR_IP(3))
-+#define ILP_DSPI_TCF		(MCF_ICR_IL(2) | MCF_ICR_IP(2))
-+#define ILP_DSPI_TFFF		(MCF_ICR_IL(2) | MCF_ICR_IP(1))
-+#define ILP_DSPI_EOQF		(MCF_ICR_IL(2) | MCF_ICR_IP(0))
-+
-+#define ILP_COMM_TIM		(MCF_ICR_IL(1) | MCF_ICR_IP(7))
-+#define ILP_PSCn(x)		(MCF_ICR_IL(1) | MCF_ICR_IP(3-((x)&3)))
-+#define ILP_PSC0		(MCF_ICR_IL(1) | MCF_ICR_IP(3))
-+#define ILP_PSC1		(MCF_ICR_IL(1) | MCF_ICR_IP(2))
-+#define ILP_PSC2		(MCF_ICR_IL(1) | MCF_ICR_IP(1))
-+#define ILP_PSC3		(MCF_ICR_IL(1) | MCF_ICR_IP(0))
-+
-+
-+
-+
-+
-+/********************************************************************/
-+
-+/*
-+ *      System Integration Unit Bitfields
-+ */
-+ 
-+/* SBCR */
-+#define MCF_SBCR_PIN2DSPI       (0x08000000)
-+#define MCF_SBCR_DMA2CPU        (0x10000000)
-+#define MCF_SBCR_CPU2DMA        (0x20000000)
-+#define MCF_SBCR_PIN2DMA        (0x40000000)
-+#define MCF_SBCR_PIN2CPU        (0x80000000)
-+
-+/* SECSACR */
-+#define MCF_SECSACR_SEQEN       (0x00000001)
-+
-+/* RSR */
-+#define MCF_RSR_RST             (0x00000001)
-+#define MCF_RSR_RSTWD           (0x00000002)
-+#define MCF_RSR_RSTJTG          (0x00000008)
-+
-+/* JTAGID */
-+#define MCF_JTAGID_REV          (0xF0000000)
-+#define MCF_JTAGID_PROCESSOR    (0x0FFFFFFF)
-+#define MCF_JTAGID_MCF5485      (0x0800C01D)
-+#define MCF_JTAGID_MCF5484      (0x0800D01D)
-+#define MCF_JTAGID_MCF5483      (0x0800E01D)
-+#define MCF_JTAGID_MCF5482      (0x0800F01D)
-+#define MCF_JTAGID_MCF5481      (0x0801001D)
-+#define MCF_JTAGID_MCF5480      (0x0801101D)
-+#define MCF_JTAGID_MCF5475      (0x0801201D)
-+#define MCF_JTAGID_MCF5474      (0x0801301D)
-+#define MCF_JTAGID_MCF5473      (0x0801401D)
-+#define MCF_JTAGID_MCF5472      (0x0801501D)
-+#define MCF_JTAGID_MCF5471      (0x0801601D)
-+#define MCF_JTAGID_MCF5470      (0x0801701D)
-+
-+
-+/*
-+ *      Interrupt Controller Bitfields
-+ */
-+#define MCF_IRLR_IRQ(x)         (((x)&0x7F)<<1)
-+#define MCF_IACKLPR_PRI(x)      (((x)&0x0F)<<0)
-+#define MCF_IACKLPR_LEVEL(x)    (((x)&0x07)<<4)
-+#define MCF_ICR_IP(x)           (((x)&0x07)<<0)
-+#define MCF_ICR_IL(x)           (((x)&0x07)<<3)
-+
-+/*
-+ *      Slice Timers Bitfields
-+ */
-+#define MCF_SCR_TEN    		(0x01000000)
-+#define MCF_SCR_IEN    		(0x02000000)
-+#define MCF_SCR_RUN    		(0x04000000)
-+#define MCF_SSR_ST     		(0x01000000)
-+#define MCF_SSR_BE     		(0x02000000)
-+
-+
-+/*
-+ * Some needed coldfire registers
-+ */
-+#define MCF_PAR_PCIBG 		   MCF_REG16(0x000A48)
-+#define MCF_PAR_PCIBR   	   MCF_REG16(0x000A4A)
-+#define MCF_PAR_PSCn(x)            MCF_REG08(0x000A4F-((x)&0x3))
-+#define MCF_PAR_FECI2CIRQ   	   MCF_REG16(0x000A44)
-+#define MCF_EPPAR       	   MCF_REG16(0x000F00)
-+#define MCF_EPIER       	   MCF_REG08(0x000F05)
-+#define MCF_EPFR       	   	   MCF_REG08(0x000F0C)
-+
-+/*
-+ * Some GPIO bitfields
-+ */
-+#define MCF_PAR_SDA			(0x0008)
-+#define MCF_PAR_SCL			(0x0004)
-+#define MCF_PAR_PSC_TXD             	(0x04)
-+#define MCF_PAR_PSC_RXD             	(0x08)
-+#define MCF_PAR_PSC_RTS(x)          	(((x)&0x03)<<4)
-+#define MCF_PAR_PSC_CTS(x)          	(((x)&0x03)<<6)
-+#define MCF_PAR_PSC_CTS_GPIO        	(0x00)
-+#define MCF_PAR_PSC_CTS_BCLK        	(0x80)
-+#define MCF_PAR_PSC_CTS_CTS         	(0xC0)
-+#define MCF_PAR_PSC_RTS_GPIO        	(0x00)
-+#define MCF_PAR_PSC_RTS_FSYNC       	(0x20)
-+#define MCF_PAR_PSC_RTS_RTS         	(0x30)
-+#define MCF_PAR_PSC_CANRX		(0x40)
-+
-+
-+/*
-+ * Some used coldfire values
-+ */
-+#define MCF_EPIER_EPIE(x)          (0x01 << (x))
-+#define MCF_EPPAR_EPPAx_FALLING    (2)
-+#define MCF_EPPAR_EPPA(n,x)        (((x)&0x0003) << (2*n))
-+
-+
-+#endif	/* m5485sim_h */
---- a/include/asm-m68k/mcfsim.h
-+++ b/include/asm-m68k/mcfsim.h
-@@ -20,6 +20,11 @@
- #include <asm/mcf5445x_pci.h>
- #include <asm/mcf5445x_pciarb.h>
- #include <asm/mcf5445x_eport.h>
-+#include <asm/mcf5445x_fbcs.h>
-+#include <asm/mcf5445x_xbs.h>
-+#include <asm/mcf5445x_dtim.h>
-+#elif defined(CONFIG_M547X_8X)
-+#include <asm/m5485sim.h>
- #endif
- 
- /*
---- a/include/asm-m68k/mcfuart.h
-+++ b/include/asm-m68k/mcfuart.h
-@@ -22,6 +22,15 @@
- #define MCFUART_BASE3		0xfc068000	/* Base address of UART3 */
- #define MCFINT_VECBASE		64
- #define MCFINT_UART0		26
-+
-+#elif defined(CONFIG_M547X_8X)
-+
-+#define MCFUART_BASE1		0x8600		/* Base address of UART1 */
-+#define MCFUART_BASE2		0x8700		/* Base address of UART2 */
-+#define MCFUART_BASE3		0x8800		/* Base address of UART3 */
-+#define MCFUART_BASE4		0x8900		/* Base address of UART4 */
-+#define MCFINT_VECBASE		64
-+#define MCFINT_UART0		35
- #endif
- 
- 
-@@ -97,6 +106,11 @@
- #define	MCFUART_USR_RXFULL	0x02		/* Receiver full */
- #define	MCFUART_USR_RXREADY	0x01		/* Receiver ready */
- 
-+#if defined(CONFIG_M547X_8X)
-+#define	MCFUART_USR_TXREADY_BN	0x0a
-+#define	MCFUART_USR_TXEMPTY_BN	0x0b
-+#endif
-+
- #define	MCFUART_USR_RXERR	(MCFUART_USR_RXBREAK | MCFUART_USR_RXFRAMING | \
- 				MCFUART_USR_RXPARITY | MCFUART_USR_RXOVERRUN)
- 
---- a/include/asm-m68k/mmu_context.h
-+++ b/include/asm-m68k/mmu_context.h
-@@ -152,6 +152,7 @@ static inline void activate_mm(struct mm
- 
- #else /* CONFIG_COLDFIRE */
- 
-+#include <asm/coldfire.h>
- #include <asm/atomic.h>
- #include <asm/bitops.h>
- #include <asm/mmu.h>
-@@ -227,6 +228,77 @@ static inline void activate_mm(struct mm
- #define deactivate_mm(tsk, mm) do { } while (0)
- 
- extern void mmu_context_init(void);
-+#if defined(CONFIG_M547X_8X)
-+#define prepare_arch_switch(next) load_ksp_mmu(next)
-+
-+static inline void load_ksp_mmu(struct task_struct *task)
-+{
-+	int flags;
-+	struct mm_struct *mm;
-+	int asid;
-+	pgd_t *pgd;
-+	pmd_t *pmd;
-+	pte_t *pte;
-+	unsigned long mmuar;
-+
-+	local_irq_save(flags);
-+	mmuar = task->thread.ksp;
-+
-+	/* Search for a valid TLB entry, if one is found, don't remap */
-+	*MMUAR = mmuar;
-+	*MMUOR = MMUOR_STLB | MMUOR_ADR;
-+	if ((*MMUSR) & MMUSR_HIT)
-+		goto end;
-+
-+	if (mmuar >= PAGE_OFFSET) {
-+		mm = &init_mm;
-+	} else {
-+		printk ("load_ksp_mmu: non-kernel mm found: 0x%08x\n", (unsigned int) task->mm);
-+		mm = task->mm;
-+	}
-+
-+        if (!mm)
-+	    goto bug;
-+
-+        pgd = pgd_offset(mm, mmuar);
-+        if (pgd_none(*pgd))
-+	    goto bug;
-+	    
-+    	pmd = pmd_offset(pgd, mmuar);
-+    	if (pmd_none(*pmd))
-+	    goto bug;
-+    	
-+	pte = (mmuar >= PAGE_OFFSET) ? pte_offset_kernel(pmd, mmuar)
-+	                             : pte_offset_map(pmd, mmuar);
-+    	if (pte_none(*pte) || !pte_present(*pte))
-+	    goto bug;
-+
-+        set_pte(pte, pte_mkyoung(*pte));
-+        asid = mm->context & 0xff;
-+        if (!pte_dirty(*pte) && mmuar<=PAGE_OFFSET)
-+    	    set_pte(pte, pte_wrprotect(*pte));
-+
-+        *MMUTR = (mmuar & PAGE_MASK) | (asid << CF_ASID_MMU_SHIFT)
-+               | (((int)(pte->pte) & (int)CF_PAGE_MMUTR_MASK ) >> CF_PAGE_MMUTR_SHIFT)
-+               | MMUTR_V;
-+
-+        *MMUDR = (pte_val(*pte) & PAGE_MASK) 
-+	       | ((pte->pte) & CF_PAGE_MMUDR_MASK)
-+               | MMUDR_SZ8K | MMUDR_X;
-+	    
-+	*MMUOR = MMUOR_ACC | MMUOR_UAA;
-+	asm ("nop");
-+
-+	goto end;
-+
-+bug:
-+	printk ("ksp load failed: mm=0x%08x ksp=0x%08x\n", (unsigned int) mm, (unsigned int) mmuar);
-+
-+end:
-+	local_irq_restore(flags);
-+}
-+
-+#endif /* CONFIG_M547X_8X */
- 
- #endif /* CONFIG_COLDFIRE */
- #endif
---- a/include/asm-m68k/page_offset.h
-+++ b/include/asm-m68k/page_offset.h
-@@ -5,7 +5,12 @@
- #elif defined(CONFIG_SUN3)
- #define PAGE_OFFSET_RAW		0x0E000000
- #else /* CONFIG_COLDFIRE */
-+#if defined(CONFIG_M54455)
- #define PAGE_OFFSET_RAW		0xC0000000
- #define	PHYS_OFFSET		0x40000000
-+#elif defined(CONFIG_M547X_8X)
-+#define PAGE_OFFSET_RAW		0xC0000000
-+#define	PHYS_OFFSET		0x00000000
-+#endif
- #endif
- 
diff --git a/target/linux/coldfire/patches/045-m547x_8x_fec_dma.patch b/target/linux/coldfire/patches/045-m547x_8x_fec_dma.patch
deleted file mode 100644
index ed54cbc2c..000000000
--- a/target/linux/coldfire/patches/045-m547x_8x_fec_dma.patch
+++ /dev/null
@@ -1,7283 +0,0 @@
-From b778a60aba67d29857fc7016c8c2f2d87a23de1f Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Sun, 9 Mar 2008 22:14:05 -0600
-Subject: [PATCH] Add DMA and FEC.
-
-LTIBName: m547x-8x-fec-dma
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/Kconfig            |    9 +
- arch/m68k/coldfire/Makefile  |    2 +
- arch/m68k/coldfire/dma.c     |  537 +++++++++
- drivers/Makefile             |    2 +
- drivers/dma/MCD_dma.h        |  408 +++++++
- drivers/dma/MCD_dmaApi.c     |  968 +++++++++++++++++
- drivers/dma/MCD_progCheck.h  |   33 +
- drivers/dma/MCD_tasks.c      | 2452 ++++++++++++++++++++++++++++++++++++++++++
- drivers/dma/MCD_tasksInit.c  |  284 +++++
- drivers/dma/MCD_tasksInit.h  |   73 ++
- drivers/dma/Makefile         |    2 +
- drivers/net/Kconfig          |    2 +
- drivers/net/Makefile         |    2 +
- drivers/net/fec/Kconfig      |   25 +
- drivers/net/fec/Makefile     |    7 +
- drivers/net/fec/fec.c        | 1375 +++++++++++++++++++++++
- drivers/net/fec/fec.h        |  162 +++
- drivers/net/fec/ks8721.c     |  125 +++
- drivers/net/fec/ks8721.h     |   21 +
- include/asm-m68k/MCD_dma.h   |  408 +++++++
- include/asm-m68k/coldfire.h  |    1 +
- include/asm-m68k/dma.h       |  106 ++-
- include/asm-m68k/m5485dma.h  |   97 ++
- include/asm-m68k/m5485sram.h |   12 +
- 24 files changed, 7112 insertions(+), 1 deletions(-)
- create mode 100644 arch/m68k/coldfire/dma.c
- create mode 100644 drivers/dma/MCD_dma.h
- create mode 100644 drivers/dma/MCD_dmaApi.c
- create mode 100644 drivers/dma/MCD_progCheck.h
- create mode 100644 drivers/dma/MCD_tasks.c
- create mode 100644 drivers/dma/MCD_tasksInit.c
- create mode 100644 drivers/dma/MCD_tasksInit.h
- create mode 100644 drivers/net/fec/Kconfig
- create mode 100644 drivers/net/fec/Makefile
- create mode 100755 drivers/net/fec/fec.c
- create mode 100755 drivers/net/fec/fec.h
- create mode 100644 drivers/net/fec/ks8721.c
- create mode 100644 drivers/net/fec/ks8721.h
- create mode 100644 include/asm-m68k/MCD_dma.h
- create mode 100644 include/asm-m68k/m5485dma.h
- create mode 100644 include/asm-m68k/m5485sram.h
-
---- a/arch/m68k/Kconfig
-+++ b/arch/m68k/Kconfig
-@@ -141,6 +141,15 @@ config CFV4E
- 	select MMU_CFV4E if MMU
- 	default y
- 
-+config MCD_DMA
-+	bool "ColdFire MCD DMA support"
-+	depends on CFV4E
-+	default y
-+	help
-+	  This enables support for the ColdFire 547x/548x family
-+	  multichannel DMA support.  Many drivers need it.
-+	  If you want it, say Y
-+
- config AMIGA
- 	bool "Amiga support"
- 	depends on !MMU_SUN3
---- a/arch/m68k/coldfire/Makefile
-+++ b/arch/m68k/coldfire/Makefile
-@@ -10,3 +10,5 @@ endif
- 
- obj-$(CONFIG_PCI)	+= pci.o mcf5445x-pci.o iomap.o
- obj-$(CONFIG_M54455)	+= mcf5445x-devices.o
-+
-+obj-$(CONFIG_MCD_DMA)	+= dma.o
---- /dev/null
-+++ b/arch/m68k/coldfire/dma.c
-@@ -0,0 +1,537 @@
-+#include <linux/kernel.h>
-+#include <linux/sched.h>
-+#include <linux/mm.h>
-+#include <linux/init.h>
-+#include <linux/interrupt.h>
-+#include <asm/io.h>
-+#include <asm/irq.h>
-+#include <asm/dma.h>
-+#include <asm/coldfire.h>
-+#include <asm/m5485sram.h>
-+#include <asm/mcfsim.h>
-+
-+
-+
-+void dma_interrupt_handler(int irq, void *dev_id, struct pt_regs *regs);
-+
-+/* 
-+ * This global keeps track of which initiators have been
-+ * used of the available assignments.  Initiators 0-15 are
-+ * hardwired.  Initiators 16-31 are multiplexed and controlled
-+ * via the Initiatior Mux Control Registe (IMCR).  The
-+ * assigned requestor is stored with the associated initiator
-+ * number.
-+ */
-+static int used_reqs[32] = {
-+	DMA_ALWAYS, DMA_DSPI_RX, DMA_DSPI_TX, DMA_DREQ0,
-+	DMA_PSC0_RX, DMA_PSC0_TX, DMA_USBEP0, DMA_USBEP1,
-+	DMA_USBEP2, DMA_USBEP3, DMA_PCI_TX, DMA_PCI_RX,
-+	DMA_PSC1_RX, DMA_PSC1_TX, DMA_I2C_RX, DMA_I2C_TX,
-+	0, 0, 0, 0,
-+	0, 0, 0, 0,
-+	0, 0, 0, 0,
-+	0, 0, 0, 0
-+};
-+
-+/*
-+ * This global keeps track of which channels have been assigned
-+ * to tasks.  This methology assumes that no single initiator
-+ * will be tied to more than one task/channel
-+ */
-+static char used_channel[16] = {
-+	-1, -1, -1, -1, -1, -1, -1, -1,
-+	-1, -1, -1, -1, -1, -1, -1, -1
-+};
-+
-+unsigned int connected_channel[16] = {
-+	0, 0, 0, 0, 0, 0, 0, 0,
-+	0, 0, 0, 0, 0, 0, 0, 0
-+};
-+
-+/********************************************************************/
-+/*
-+ * Attempt to enable the provided Initiator in the Initiator
-+ * Mux Control Register
-+ *
-+ * Parameters:
-+ *  initiator   Initiator identifier
-+ *
-+ * Return Value:
-+ *  1   if unable to make the assignment
-+ *  0   successful
-+ */
-+int
-+dma_set_initiator(int initiator)
-+{
-+	switch (initiator) {	/*
-+				 * These initiators are always active 
-+				 */
-+	case DMA_ALWAYS:
-+	case DMA_DSPI_RX:
-+	case DMA_DSPI_TX:
-+	case DMA_DREQ0:
-+	case DMA_PSC0_RX:
-+	case DMA_PSC0_TX:
-+	case DMA_USBEP0:
-+	case DMA_USBEP1:
-+	case DMA_USBEP2:
-+	case DMA_USBEP3:
-+	case DMA_PCI_TX:
-+	case DMA_PCI_RX:
-+	case DMA_PSC1_RX:
-+	case DMA_PSC1_TX:
-+	case DMA_I2C_RX:
-+	case DMA_I2C_TX:
-+		break;
-+
-+	case DMA_FEC0_RX:
-+		MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC16(3))
-+		    | MCF_DMA_IMCR_SRC16_FEC0RX;
-+		used_reqs[16] = DMA_FEC0_RX;
-+		break;
-+
-+	case DMA_FEC0_TX:
-+		MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC17(3))
-+		    | MCF_DMA_IMCR_SRC17_FEC0TX;
-+		used_reqs[17] = DMA_FEC0_TX;
-+		break;
-+
-+	case DMA_FEC1_RX:
-+		MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC20(3))
-+		    | MCF_DMA_IMCR_SRC20_FEC1RX;
-+		used_reqs[20] = DMA_FEC1_RX;
-+		break;
-+
-+	case DMA_FEC1_TX:
-+		if (used_reqs[21] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC21(3))
-+			    | MCF_DMA_IMCR_SRC21_FEC1TX;
-+			used_reqs[21] = DMA_FEC1_TX;
-+		} else if (used_reqs[25] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC25(3))
-+			    | MCF_DMA_IMCR_SRC25_FEC1TX;
-+			used_reqs[25] = DMA_FEC1_TX;
-+		} else if (used_reqs[31] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC31(3))
-+			    | MCF_DMA_IMCR_SRC31_FEC1TX;
-+			used_reqs[31] = DMA_FEC1_TX;
-+		} else		/* No empty slots */
-+			return 1;
-+		break;
-+
-+	case DMA_DREQ1:
-+		if (used_reqs[29] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC29(3))
-+			    | MCF_DMA_IMCR_SRC29_DREQ1;
-+			used_reqs[29] = DMA_DREQ1;
-+		} else if (used_reqs[21] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC21(3))
-+			    | MCF_DMA_IMCR_SRC21_DREQ1;
-+			used_reqs[21] = DMA_DREQ1;
-+		} else		/* No empty slots */
-+			return 1;
-+		break;
-+
-+	case DMA_CTM0:
-+		if (used_reqs[24] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC24(3))
-+			    | MCF_DMA_IMCR_SRC24_CTM0;
-+			used_reqs[24] = DMA_CTM0;
-+		} else		/* No empty slots */
-+			return 1;
-+		break;
-+
-+	case DMA_CTM1:
-+		if (used_reqs[25] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC25(3))
-+			    | MCF_DMA_IMCR_SRC25_CTM1;
-+			used_reqs[25] = DMA_CTM1;
-+		} else		/* No empty slots */
-+			return 1;
-+		break;
-+
-+	case DMA_CTM2:
-+		if (used_reqs[26] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC26(3))
-+			    | MCF_DMA_IMCR_SRC26_CTM2;
-+			used_reqs[26] = DMA_CTM2;
-+		} else		/* No empty slots */
-+			return 1;
-+		break;
-+
-+	case DMA_CTM3:
-+		if (used_reqs[27] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC27(3))
-+			    | MCF_DMA_IMCR_SRC27_CTM3;
-+			used_reqs[27] = DMA_CTM3;
-+		} else		/* No empty slots */
-+			return 1;
-+		break;
-+
-+	case DMA_CTM4:
-+		if (used_reqs[28] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC28(3))
-+			    | MCF_DMA_IMCR_SRC28_CTM4;
-+			used_reqs[28] = DMA_CTM4;
-+		} else		/* No empty slots */
-+			return 1;
-+		break;
-+
-+	case DMA_CTM5:
-+		if (used_reqs[29] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC29(3))
-+			    | MCF_DMA_IMCR_SRC29_CTM5;
-+			used_reqs[29] = DMA_CTM5;
-+		} else		/* No empty slots */
-+			return 1;
-+		break;
-+
-+	case DMA_CTM6:
-+		if (used_reqs[30] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC30(3))
-+			    | MCF_DMA_IMCR_SRC30_CTM6;
-+			used_reqs[30] = DMA_CTM6;
-+		} else		/* No empty slots */
-+			return 1;
-+		break;
-+
-+	case DMA_CTM7:
-+		if (used_reqs[31] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC31(3))
-+			    | MCF_DMA_IMCR_SRC31_CTM7;
-+			used_reqs[31] = DMA_CTM7;
-+		} else		/* No empty slots */
-+			return 1;
-+		break;
-+
-+	case DMA_USBEP4:
-+		if (used_reqs[26] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC26(3))
-+			    | MCF_DMA_IMCR_SRC26_USBEP4;
-+			used_reqs[26] = DMA_USBEP4;
-+		} else		/* No empty slots */
-+			return 1;
-+		break;
-+
-+	case DMA_USBEP5:
-+		if (used_reqs[27] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC27(3))
-+			    | MCF_DMA_IMCR_SRC27_USBEP5;
-+			used_reqs[27] = DMA_USBEP5;
-+		} else		/* No empty slots */
-+			return 1;
-+		break;
-+
-+	case DMA_USBEP6:
-+		if (used_reqs[28] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC28(3))
-+			    | MCF_DMA_IMCR_SRC28_USBEP6;
-+			used_reqs[28] = DMA_USBEP6;
-+		} else		/* No empty slots */
-+			return 1;
-+		break;
-+
-+	case DMA_PSC2_RX:
-+		if (used_reqs[28] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC28(3))
-+			    | MCF_DMA_IMCR_SRC28_PSC2RX;
-+			used_reqs[28] = DMA_PSC2_RX;
-+		} else		/* No empty slots */
-+			return 1;
-+		break;
-+
-+	case DMA_PSC2_TX:
-+		if (used_reqs[29] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC29(3))
-+			    | MCF_DMA_IMCR_SRC29_PSC2TX;
-+			used_reqs[29] = DMA_PSC2_TX;
-+		} else		/* No empty slots */
-+			return 1;
-+		break;
-+
-+	case DMA_PSC3_RX:
-+		if (used_reqs[30] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC30(3))
-+			    | MCF_DMA_IMCR_SRC30_PSC3RX;
-+			used_reqs[30] = DMA_PSC3_RX;
-+		} else		/* No empty slots */
-+			return 1;
-+		break;
-+
-+	case DMA_PSC3_TX:
-+		if (used_reqs[31] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC31(3))
-+			    | MCF_DMA_IMCR_SRC31_PSC3TX;
-+			used_reqs[31] = DMA_PSC3_TX;
-+		} else		/* No empty slots */
-+			return 1;
-+		break;
-+
-+	default:
-+		return 1;
-+	}
-+	return 0;
-+}
-+
-+/********************************************************************/
-+/*
-+ * Return the initiator number for the given requestor
-+ *
-+ * Parameters:
-+ *  requestor   Initiator/Requestor identifier
-+ *
-+ * Return Value:
-+ *  The initiator number (0-31) if initiator has been assigned
-+ *  0 (always initiator) otherwise
-+ */
-+unsigned int
-+dma_get_initiator(int requestor)
-+{
-+	u32 i;
-+
-+	for (i = 0; i < sizeof (used_reqs); ++i) {
-+		if (used_reqs[i] == requestor)
-+			return i;
-+	}
-+	return 0;
-+}
-+
-+/********************************************************************/
-+/*
-+ * Remove the given initiator from the active list
-+ *
-+ * Parameters:
-+ *  requestor   Initiator/Requestor identifier
-+ */
-+void
-+dma_remove_initiator(int requestor)
-+{
-+	u32 i;
-+
-+	for (i = 0; i < sizeof (used_reqs); ++i) {
-+		if (used_reqs[i] == requestor) {
-+			used_reqs[i] = -1;
-+			break;
-+		}
-+	}
-+}
-+
-+/********************************************************************/
-+/*
-+ * Attempt to find an available channel for FEC and mark is as used
-+ *
-+ * Parameters:
-+ *  requestor   Initiator/Requestor identifier
-+ *
-+ * Return Value:
-+ *  First available channel (from 0 to 5) or -1 if they are all occupied
-+ */
-+int
-+dma_set_channel_fec(int requestor)
-+{
-+	u32 i, t;
-+
-+#ifdef CONFIG_FEC_548x_ENABLE_FEC2
-+	t = 4;
-+#else
-+	t = 2;
-+#endif
-+
-+
-+
-+	for (i = 0; i < t ; ++i)
-+		if (used_channel[i] == -1) {
-+			used_channel[i] = requestor;
-+			return i;
-+		}
-+	/* All channels taken */
-+	return -1;
-+}
-+
-+/********************************************************************/
-+/*
-+ * Attempt to find an available channel and mark is as used
-+ *
-+ * Parameters:
-+ *  requestor   Initiator/Requestor identifier
-+ *
-+ * Return Value:
-+ *  First available channel (from 6 to 15) or -1 if they are all occupied
-+ */
-+int
-+dma_set_channel(int requestor)
-+{
-+	u32 i;
-+#ifdef CONFIG_NET_FEC2
-+	i = 4;
-+#else
-+	i = 2;
-+#endif				
-+
-+	for (; i < 16; ++i)
-+		if (used_channel[i] == -1) {
-+			used_channel[i] = requestor;
-+			return i;
-+		}
-+
-+	/* All channels taken */
-+	return -1;
-+}
-+
-+/********************************************************************/
-+/*
-+ * Return the channel being initiated by the given requestor
-+ *
-+ * Parameters:
-+ *  requestor   Initiator/Requestor identifier
-+ */
-+int
-+dma_get_channel(int requestor)
-+{
-+	u32 i;
-+
-+	for (i = 0; i < sizeof (used_channel); ++i) {
-+		if (used_channel[i] == requestor)
-+			return i;
-+	}
-+	return -1;
-+}
-+
-+/********************************************************************/
-+/*
-+ * Connects a channel with reference on your data 
-+ *
-+ * Parameters:
-+ *  channel   channel number
-+ *  reference addres of your data
-+  */
-+int
-+dma_connect(int channel, int address)
-+{
-+	if ((channel < 16) && (channel >= 0))
-+		connected_channel[channel] = address;
-+	else
-+		return -1;
-+	return 0;
-+}
-+
-+/********************************************************************/
-+/*
-+ * Disconnects a channel with reference on your data 
-+ *
-+ * Parameters:
-+ *  channel   channel number
-+*/
-+int
-+dma_disconnect(int channel)
-+{
-+	if ((channel < 16) && (channel >= 0))
-+		connected_channel[channel] = 0;
-+	else
-+		return -1;
-+	return 0;
-+}
-+
-+/********************************************************************/
-+/*
-+ * Remove the channel being initiated by the given requestor from 
-+ * the active list
-+ *
-+ * Parameters:
-+ *  requestor   Initiator/Requestor identifier
-+ */
-+void
-+dma_remove_channel(int requestor)
-+{
-+	u32 i;
-+
-+	for (i = 0; i < sizeof (used_channel); ++i) {
-+		if (used_channel[i] == requestor) {
-+			used_channel[i] = -1;
-+			break;
-+		}
-+	}
-+}
-+
-+/********************************************************************/
-+/* 
-+ * This is the catch-all interrupt handler for the mult-channel DMA 
-+ */
-+volatile u8 dma_iflag[16];
-+u32 tx = 0;
-+
-+void
-+dma_interrupt_handler(int irq, void *dev_id, struct pt_regs *regs)
-+{
-+	u32 i, interrupts/*, mask, temp*/;
-+
-+	/*
-+	 * Determine which interrupt(s) triggered by AND'ing the 
-+	 * pending interrupts with those that aren't masked.            
-+	 */
-+/*	mask = MCF_DMA_DIMR;
-+	MCF_DMA_DIMR = 0xffffffff;
-+*/
-+	interrupts = MCF_DMA_DIPR;
-+	MCF_DMA_DIPR |= interrupts;
-+//	temp = interrupts;
-+
-+	//MCF_DMA_DIPR = interrupts;
-+	for (i = 0; i < 16; ++i, interrupts >>= 1)
-+		if (interrupts & 0x1)
-+			if (connected_channel[i] != 0)
-+				((void (*)(void)) (connected_channel[i])) ();
-+
-+/*	MCF_DMA_DIPR |= temp;
-+	MCF_DMA_DIMR = mask;*/
-+}
-+
-+void
-+dma_remove_channel_by_number(int channel)
-+{
-+	if (channel < sizeof (used_channel) && channel >= 0)
-+		used_channel[channel] = -1;
-+}
-+
-+int __devinit
-+dma_init()
-+{
-+	int result;
-+	char *dma_version_str;
-+
-+	MCD_getVersion(&dma_version_str);
-+	printk("Initialize %s\n", dma_version_str);
-+
-+	if (request_irq
-+	    (64 + ISC_DMA, 
-+	     dma_interrupt_handler, 
-+	     IRQF_DISABLED, 
-+	     "MCD-DMA", 
-+	     NULL)) {
-+		printk("Cannot allocate the DMA IRQ(48)\n");
-+		return 1;
-+	}
-+
-+	MCF_DMA_DIMR = 0;
-+	MCF_DMA_DIPR = 0xFFFFFFFF;
-+
-+	MCF_ICR(ISC_DMA) = ILP_DMA;
-+#if 0
-+// JKM
-+	enable_irq( 64 + ISC_DMA );
-+#endif
-+
-+	result =
-+	    MCD_initDma((dmaRegs *) (MCF_MBAR + 0x8000),
-+			(void *) SYS_SRAM_DMA_START, MCD_RELOC_TASKS);
-+	if (result != MCD_OK) {
-+		printk("Cannot perform DMA initialization\n");
-+		free_irq(64 + ISC_DMA, NULL);
-+		return 1;
-+	}
-+
-+	return 0;
-+}
-+
-+device_initcall(dma_init);
-+
---- a/drivers/Makefile
-+++ b/drivers/Makefile
-@@ -93,3 +93,5 @@ obj-$(CONFIG_PPC_PS3)		+= ps3/
- obj-$(CONFIG_OF)		+= of/
- obj-$(CONFIG_SSB)		+= ssb/
- obj-$(CONFIG_VIRTIO)		+= virtio/
-+
-+obj-$(CONFIG_MCD_DMA)		+= dma/
---- /dev/null
-+++ b/drivers/dma/MCD_dma.h
-@@ -0,0 +1,408 @@
-+/*********************************************************************
-+ *
-+ * Copyright (C) 2004  Motorola, Inc.
-+ *  MOTOROLA, INC. All Rights Reserved.
-+ *  You are hereby granted a copyright license to use
-+ *  the SOFTWARE so long as this entire notice is
-+ *  retained without alteration in any modified and/or redistributed
-+ *  versions, and that such modified versions are clearly identified
-+ *  as such. No licenses are granted by implication, estoppel or
-+ *  otherwise under any patents or trademarks of Motorola, Inc. This
-+ *  software is provided on an "AS IS" basis and without warranty.
-+ *
-+ *  To the maximum extent permitted by applicable law, MOTOROLA
-+ *  DISCLAIMS ALL WARRANTIES WHETHER EXPRESS OR IMPLIED, INCLUDING
-+ *  IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-+ *  PURPOSE AND ANY WARRANTY AGAINST INFRINGEMENT WITH REGARD TO THE
-+ *  SOFTWARE (INCLUDING ANY MODIFIED VERSIONS THEREOF) AND ANY
-+ *  ACCOMPANYING WRITTEN MATERIALS.
-+ *
-+ *  To the maximum extent permitted by applicable law, IN NO EVENT
-+ *  SHALL MOTOROLA BE LIABLE FOR ANY DAMAGES WHATSOEVER (INCLUDING
-+ *  WITHOUT LIMITATION, DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS
-+ *  INTERRUPTION, LOSS OF BUSINESS INFORMATION, OR OTHER PECUNIARY
-+ *  LOSS) ARISING OF THE USE OR INABILITY TO USE THE SOFTWARE.
-+ *
-+ *  Motorola assumes no responsibility for the maintenance and support
-+ *  of this software
-+ ********************************************************************/
-+
-+/*
-+ * File:        MCD_dma.h
-+ * Purpose:     Main header file for multi-channel DMA API.
-+ *
-+ * Notes:
-+ *
-+ * Modifications:
-+ */
-+#ifndef _MCD_API_H
-+#define _MCD_API_H
-+
-+#include <asm/types.h>
-+
-+/*
-+ * Turn Execution Unit tasks ON (#define) or OFF (#undef)
-+ */
-+#undef MCD_INCLUDE_EU
-+
-+/*
-+ * Number of DMA channels
-+ */
-+#define NCHANNELS 16
-+
-+/*
-+ * Total number of variants
-+ */
-+#ifdef MCD_INCLUDE_EU
-+#define NUMOFVARIANTS   6
-+#else
-+#define NUMOFVARIANTS   4
-+#endif
-+
-+/*
-+ * Define sizes of the various tables
-+ */
-+#define TASK_TABLE_SIZE     (NCHANNELS*32)
-+#define VAR_TAB_SIZE        (128)
-+#define CONTEXT_SAVE_SIZE   (128)
-+#define FUNCDESC_TAB_SIZE   (256)
-+
-+#ifdef MCD_INCLUDE_EU
-+#define FUNCDESC_TAB_NUM    16
-+#else
-+#define FUNCDESC_TAB_NUM    1
-+#endif
-+
-+
-+#ifndef DEFINESONLY
-+
-+/*
-+ * Portability typedefs
-+ */
-+ /*
-+#ifndef s32
-+typedef int s32;
-+#endif
-+#ifndef u32
-+typedef unsigned int u32;
-+#endif
-+#ifndef s16
-+typedef short s16;
-+#endif
-+#ifndef u16
-+typedef unsigned short u16;
-+#endif
-+#ifndef s8
-+typedef char s8;
-+#endif
-+#ifndef u8
-+typedef unsigned char u8;
-+#endif
-+*/
-+/*
-+ * These structures represent the internal registers of the
-+ * multi-channel DMA
-+ */
-+struct dmaRegs_s {
-+   u32 taskbar;         /* task table base address register */
-+   u32 currPtr;
-+   u32 endPtr;
-+   u32 varTablePtr;
-+   u16 dma_rsvd0;
-+   u16 ptdControl;      /* ptd control */
-+   u32 intPending;      /* interrupt pending register */
-+   u32 intMask;         /* interrupt mask register */
-+   u16 taskControl[16]; /* task control registers */
-+   u8  priority[32];    /* priority registers */
-+   u32 initiatorMux;    /* initiator mux control */
-+   u32 taskSize0;       /* task size control register 0. */
-+   u32 taskSize1;       /* task size control register 1. */
-+   u32 dma_rsvd1;       /* reserved */
-+   u32 dma_rsvd2;       /* reserved */
-+   u32 debugComp1;      /* debug comparator 1 */
-+   u32 debugComp2;      /* debug comparator 2 */
-+   u32 debugControl;    /* debug control */
-+   u32 debugStatus;     /* debug status */
-+   u32 ptdDebug;        /* priority task decode debug */
-+   u32 dma_rsvd3[31];   /* reserved */
-+};
-+typedef volatile struct dmaRegs_s dmaRegs;
-+
-+#endif
-+
-+/*
-+ * PTD contrl reg bits
-+ */
-+#define PTD_CTL_TSK_PRI         0x8000
-+#define PTD_CTL_COMM_PREFETCH   0x0001
-+
-+/*
-+ * Task Control reg bits and field masks
-+ */
-+#define TASK_CTL_EN             0x8000
-+#define TASK_CTL_VALID          0x4000
-+#define TASK_CTL_ALWAYS         0x2000
-+#define TASK_CTL_INIT_MASK      0x1f00
-+#define TASK_CTL_ASTRT          0x0080
-+#define TASK_CTL_HIPRITSKEN     0x0040
-+#define TASK_CTL_HLDINITNUM     0x0020
-+#define TASK_CTL_ASTSKNUM_MASK  0x000f
-+
-+/*
-+ * Priority reg bits and field masks
-+ */
-+#define PRIORITY_HLD            0x80
-+#define PRIORITY_PRI_MASK       0x07
-+
-+/*
-+ * Debug Control reg bits and field masks
-+ */
-+#define DBG_CTL_BLOCK_TASKS_MASK    0xffff0000
-+#define DBG_CTL_AUTO_ARM            0x00008000
-+#define DBG_CTL_BREAK               0x00004000
-+#define DBG_CTL_COMP1_TYP_MASK      0x00003800
-+#define DBG_CTL_COMP2_TYP_MASK      0x00000070
-+#define DBG_CTL_EXT_BREAK           0x00000004
-+#define DBG_CTL_INT_BREAK           0x00000002
-+
-+/*
-+ * PTD Debug reg selector addresses
-+ * This reg must be written with a value to show the contents of
-+ * one of the desired internal register.
-+ */
-+#define PTD_DBG_REQ             0x00 /* shows the state of 31 initiators */
-+#define PTD_DBG_TSK_VLD_INIT    0x01 /* shows which 16 tasks are valid and
-+                                        have initiators asserted */
-+
-+
-+/*
-+ * General return values
-+ */
-+#define MCD_OK                   0
-+#define MCD_ERROR               -1
-+#define MCD_TABLE_UNALIGNED     -2
-+#define MCD_CHANNEL_INVALID     -3
-+
-+/*
-+ * MCD_initDma input flags
-+ */
-+#define MCD_RELOC_TASKS         0x00000001
-+#define MCD_NO_RELOC_TASKS      0x00000000
-+#define MCD_COMM_PREFETCH_EN    0x00000002  /* Commbus Prefetching - MCF547x/548x ONLY */
-+
-+/*
-+ * MCD_dmaStatus Status Values for each channel
-+ */
-+#define MCD_NO_DMA  1 /* No DMA has been requested since reset */
-+#define MCD_IDLE    2 /* DMA active, but the initiator is currently inactive */
-+#define MCD_RUNNING 3 /* DMA active, and the initiator is currently active */
-+#define MCD_PAUSED  4 /* DMA active but it is currently paused */
-+#define MCD_HALTED  5 /* the most recent DMA has been killed with MCD_killTask() */
-+#define MCD_DONE    6 /* the most recent DMA has completed. */
-+
-+
-+/*
-+ * MCD_startDma parameter defines
-+ */
-+
-+/*
-+ * Constants for the funcDesc parameter
-+ */
-+/* Byte swapping: */
-+#define MCD_NO_BYTE_SWAP    0x00045670  /* to disable byte swapping. */
-+#define MCD_BYTE_REVERSE    0x00076540  /* to reverse the bytes of each u32 of the DMAed data. */
-+#define MCD_U16_REVERSE     0x00067450  /* to reverse the 16-bit halves of
-+                                           each 32-bit data value being DMAed.*/
-+#define MCD_U16_BYTE_REVERSE    0x00054760 /* to reverse the byte halves of each
-+                                            16-bit half of each 32-bit data value DMAed */
-+#define MCD_NO_BIT_REV  0x00000000  /* do not reverse the bits of each byte DMAed. */
-+#define MCD_BIT_REV     0x00088880  /* reverse the bits of each byte DMAed */
-+/* CRCing: */
-+#define MCD_CRC16       0xc0100000  /* to perform CRC-16 on DMAed data. */
-+#define MCD_CRCCCITT    0xc0200000  /* to perform CRC-CCITT on DMAed data. */
-+#define MCD_CRC32       0xc0300000  /* to perform CRC-32 on DMAed data. */
-+#define MCD_CSUMINET    0xc0400000  /* to perform internet checksums on DMAed data.*/
-+#define MCD_NO_CSUM     0xa0000000  /* to perform no checksumming. */
-+
-+#define MCD_FUNC_NOEU1 (MCD_NO_BYTE_SWAP | MCD_NO_BIT_REV | MCD_NO_CSUM)
-+#define MCD_FUNC_NOEU2 (MCD_NO_BYTE_SWAP | MCD_NO_CSUM)
-+
-+/*
-+ * Constants for the flags parameter
-+ */
-+#define MCD_TT_FLAGS_RL   0x00000001 /* Read line */
-+#define MCD_TT_FLAGS_CW   0x00000002 /* Combine Writes */
-+#define MCD_TT_FLAGS_SP   0x00000004 /* Speculative prefetch(XLB) MCF547x/548x ONLY  */
-+#define MCD_TT_FLAGS_MASK 0x000000ff
-+#define MCD_TT_FLAGS_DEF  (MCD_TT_FLAGS_RL | MCD_TT_FLAGS_CW)
-+
-+#define MCD_SINGLE_DMA  0x00000100 /* Unchained DMA */
-+#define MCD_CHAIN_DMA              /* TBD */
-+#define MCD_EU_DMA                 /* TBD */
-+#define MCD_FECTX_DMA   0x00001000 /* FEC TX ring DMA */
-+#define MCD_FECRX_DMA   0x00002000 /* FEC RX ring DMA */
-+
-+
-+/* these flags are valid for MCD_startDma and the chained buffer descriptors */
-+#define MCD_BUF_READY   0x80000000 /* indicates that this buffer is now under the DMA's control */
-+#define MCD_WRAP        0x20000000 /* to tell the FEC Dmas to wrap to the first BD */
-+#define MCD_INTERRUPT   0x10000000 /* to generate an interrupt after completion of the DMA. */
-+#define MCD_END_FRAME   0x08000000 /* tell the DMA to end the frame when transferring
-+                                      last byte of data in buffer */
-+#define MCD_CRC_RESTART 0x40000000 /* to empty out the accumulated checksum
-+                                      prior to performing the DMA. */
-+
-+/* Defines for the FEC buffer descriptor control/status word*/
-+#define MCD_FEC_BUF_READY   0x8000
-+#define MCD_FEC_WRAP        0x2000
-+#define MCD_FEC_INTERRUPT   0x1000
-+#define MCD_FEC_END_FRAME   0x0800
-+
-+
-+/*
-+ * Defines for general intuitiveness
-+ */
-+
-+#define MCD_TRUE  1
-+#define MCD_FALSE 0
-+
-+/*
-+ * Three different cases for destination and source.
-+ */
-+#define MINUS1          -1
-+#define ZERO            0
-+#define PLUS1           1
-+
-+#ifndef DEFINESONLY
-+
-+/* Task Table Entry struct*/
-+typedef struct {
-+    u32 TDTstart;   /* task descriptor table start */
-+    u32 TDTend;     /* task descriptor table end */
-+    u32 varTab;     /* variable table start */
-+    u32 FDTandFlags;    /* function descriptor table start and flags */
-+    volatile u32 descAddrAndStatus;
-+    volatile u32 modifiedVarTab;
-+    u32 contextSaveSpace;   /* context save space start */
-+    u32 literalBases;
-+} TaskTableEntry;
-+
-+
-+/* Chained buffer descriptor */
-+typedef volatile struct MCD_bufDesc_struct MCD_bufDesc;
-+struct MCD_bufDesc_struct {
-+   u32 flags;         /* flags describing the DMA */
-+   u32 csumResult;    /* checksum from checksumming performed since last checksum reset */
-+   s8  *srcAddr;      /* the address to move data from */
-+   s8  *destAddr;     /* the address to move data to */
-+   s8  *lastDestAddr; /* the last address written to */
-+   u32 dmaSize;       /* the number of bytes to transfer independent of the transfer size */
-+   MCD_bufDesc *next; /* next buffer descriptor in chain */
-+   u32 info;          /* private information about this descriptor;  DMA does not affect it */
-+};
-+
-+/* Progress Query struct */
-+typedef volatile struct MCD_XferProg_struct {
-+   s8 *lastSrcAddr;         /* the most-recent or last, post-increment source address */
-+   s8 *lastDestAddr;        /* the most-recent or last, post-increment destination address */
-+   u32  dmaSize;            /* the amount of data transferred for the current buffer */
-+   MCD_bufDesc *currBufDesc;/* pointer to the current buffer descriptor being DMAed */
-+} MCD_XferProg;
-+
-+
-+/* FEC buffer descriptor */
-+typedef volatile struct MCD_bufDescFec_struct {
-+    u16 statCtrl;
-+    u16 length;
-+    u32 dataPointer;
-+} MCD_bufDescFec;
-+
-+
-+/*************************************************************************/
-+/*
-+ * API function Prototypes  - see MCD_dmaApi.c for further notes
-+ */
-+
-+/*
-+ * MCD_startDma starts a particular kind of DMA .
-+ */
-+int MCD_startDma (
-+   int channel,   /* the channel on which to run the DMA */
-+   s8  *srcAddr,  /* the address to move data from, or buffer-descriptor address */
-+   s16 srcIncr,   /* the amount to increment the source address per transfer */
-+   s8  *destAddr, /* the address to move data to */
-+   s16 destIncr,  /* the amount to increment the destination address per transfer */
-+   u32 dmaSize,   /* the number of bytes to transfer independent of the transfer size */
-+   u32 xferSize,  /* the number bytes in of each data movement (1, 2, or 4) */
-+   u32 initiator, /* what device initiates the DMA */
-+   int priority,  /* priority of the DMA */
-+   u32 flags,     /* flags describing the DMA */
-+   u32 funcDesc   /* a description of byte swapping, bit swapping, and CRC actions */
-+);
-+
-+/* 
-+ * MCD_initDma() initializes the DMA API by setting up a pointer to the DMA 
-+ * registers, relocating and creating the appropriate task structures, and 
-+ * setting up some global settings
-+ */
-+int MCD_initDma (dmaRegs *sDmaBarAddr, void *taskTableDest, u32 flags);
-+
-+/* 
-+ * MCD_dmaStatus() returns the status of the DMA on the requested channel.
-+ */
-+int MCD_dmaStatus (int channel);
-+
-+/* 
-+ * MCD_XferProgrQuery() returns progress of DMA on requested channel
-+ */
-+int MCD_XferProgrQuery (int channel, MCD_XferProg *progRep);
-+
-+/* 
-+ * MCD_killDma() halts the DMA on the requested channel, without any
-+ * intention of resuming the DMA.
-+ */
-+int MCD_killDma (int channel);
-+
-+/* 
-+ * MCD_continDma() continues a DMA which as stopped due to encountering an
-+ * unready buffer descriptor.
-+ */
-+int MCD_continDma (int channel);
-+
-+/* 
-+ * MCD_pauseDma() pauses the DMA on the given channel ( if any DMA is
-+ * running on that channel). 
-+ */
-+int MCD_pauseDma (int channel);
-+
-+/* 
-+ * MCD_resumeDma() resumes the DMA on a given channel (if any DMA is
-+ * running on that channel).
-+ */
-+int MCD_resumeDma (int channel);
-+
-+/* 
-+ * MCD_csumQuery provides the checksum/CRC after performing a non-chained DMA
-+ */
-+int MCD_csumQuery (int channel, u32 *csum);
-+
-+/* 
-+ * MCD_getCodeSize provides the packed size required by the microcoded task
-+ * and structures.
-+ */
-+int MCD_getCodeSize(void);
-+
-+/*
-+ * MCD_getVersion provides a pointer to a version string and returns a
-+ * version number.
-+ */
-+int MCD_getVersion(char **longVersion);
-+
-+/* macro for setting a location in the variable table */
-+#define MCD_SET_VAR(taskTab,idx,value) ((u32 *)(taskTab)->varTab)[idx] = value
-+   /* Note that MCD_SET_VAR() is invoked many times in firing up a DMA function,
-+      so I'm avoiding surrounding it with "do {} while(0)" */
-+
-+#endif  /* DEFINESONLY */
-+
-+#endif /* _MCD_API_H */
---- /dev/null
-+++ b/drivers/dma/MCD_dmaApi.c
-@@ -0,0 +1,968 @@
-+/*********************************************************************
-+ *
-+ * Copyright (C) 2004  Motorola, Inc.
-+ *  MOTOROLA, INC. All Rights Reserved.
-+ *  You are hereby granted a copyright license to use
-+ *  the SOFTWARE so long as this entire notice is
-+ *  retained without alteration in any modified and/or redistributed
-+ *  versions, and that such modified versions are clearly identified
-+ *  as such. No licenses are granted by implication, estoppel or
-+ *  otherwise under any patents or trademarks of Motorola, Inc. This
-+ *  software is provided on an "AS IS" basis and without warranty.
-+ *
-+ *  To the maximum extent permitted by applicable law, MOTOROLA
-+ *  DISCLAIMS ALL WARRANTIES WHETHER EXPRESS OR IMPLIED, INCLUDING
-+ *  IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-+ *  PURPOSE AND ANY WARRANTY AGAINST INFRINGEMENT WITH REGARD TO THE
-+ *  SOFTWARE (INCLUDING ANY MODIFIED VERSIONS THEREOF) AND ANY
-+ *  ACCOMPANYING WRITTEN MATERIALS.
-+ *
-+ *  To the maximum extent permitted by applicable law, IN NO EVENT
-+ *  SHALL MOTOROLA BE LIABLE FOR ANY DAMAGES WHATSOEVER (INCLUDING
-+ *  WITHOUT LIMITATION, DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS
-+ *  INTERRUPTION, LOSS OF BUSINESS INFORMATION, OR OTHER PECUNIARY
-+ *  LOSS) ARISING OF THE USE OR INABILITY TO USE THE SOFTWARE.
-+ *
-+ *  Motorola assumes no responsibility for the maintenance and support
-+ *  of this software
-+ ********************************************************************/
-+
-+/*
-+ * File:        MCD_dmaApi.c
-+ * Purpose:     Main C file for multi-channel DMA API.
-+ *
-+ * Notes:
-+ *
-+ *
-+ * Modifications:
-+ *
-+ *
-+ */
-+#include <asm/types.h>
-+#include <asm/MCD_dma.h>
-+#include <asm/virtconvert.h>
-+#include "MCD_tasksInit.h"
-+#include "MCD_progCheck.h"
-+
-+/********************************************************************/
-+/*
-+ * This is an API-internal pointer to the DMA's registers
-+ */
-+dmaRegs *MCD_dmaBar;
-+
-+/*
-+ * These are the real and model task tables as generated by the
-+ * build process
-+ */
-+extern TaskTableEntry MCD_realTaskTableSrc[NCHANNELS];
-+extern TaskTableEntry MCD_modelTaskTableSrc[NUMOFVARIANTS];
-+
-+/*
-+ * However, this (usually) gets relocated to on-chip SRAM, at which
-+ * point we access them as these tables
-+ */
-+volatile TaskTableEntry *MCD_taskTable;
-+TaskTableEntry *MCD_modelTaskTable;
-+
-+
-+/*
-+ * MCD_chStatus[] is an array of status indicators for remembering
-+ * whether a DMA has ever been attempted on each channel, pausing
-+ * status, etc.
-+ */
-+static int MCD_chStatus[NCHANNELS] =
-+{
-+    MCD_NO_DMA, MCD_NO_DMA, MCD_NO_DMA, MCD_NO_DMA,
-+    MCD_NO_DMA, MCD_NO_DMA, MCD_NO_DMA, MCD_NO_DMA,
-+    MCD_NO_DMA, MCD_NO_DMA, MCD_NO_DMA, MCD_NO_DMA,
-+    MCD_NO_DMA, MCD_NO_DMA, MCD_NO_DMA, MCD_NO_DMA
-+};
-+
-+/*
-+ * Prototypes for local functions
-+ */
-+static void MCD_memcpy (int *dest, int *src, u32 size);
-+static void MCD_resmActions (int channel);
-+
-+/*
-+ * Buffer descriptors used for storage of progress info for single Dmas
-+ * Also used as storage for the DMA for CRCs for single DMAs
-+ * Otherwise, the DMA does not parse these buffer descriptors
-+ */
-+#ifdef MCD_INCLUDE_EU
-+extern MCD_bufDesc MCD_singleBufDescs[NCHANNELS];
-+#else
-+MCD_bufDesc MCD_singleBufDescs[NCHANNELS];
-+#endif
-+MCD_bufDesc *MCD_relocBuffDesc;
-+
-+
-+/*
-+ * Defines for the debug control register's functions
-+ */
-+#define DBG_CTL_COMP1_TASK  (0x00002000) /* have comparator 1 look for a task # */
-+#define DBG_CTL_ENABLE      (DBG_CTL_AUTO_ARM    | \
-+                             DBG_CTL_BREAK       | \
-+                             DBG_CTL_INT_BREAK   | \
-+                             DBG_CTL_COMP1_TASK)
-+#define DBG_CTL_DISABLE     (DBG_CTL_AUTO_ARM    | \
-+                             DBG_CTL_INT_BREAK   | \
-+                             DBG_CTL_COMP1_TASK)
-+#define DBG_KILL_ALL_STAT   (0xFFFFFFFF)
-+
-+/*
-+ * Offset to context save area where progress info is stored
-+ */
-+#define CSAVE_OFFSET        10
-+
-+/*
-+ * Defines for Byte Swapping
-+ */
-+#define MCD_BYTE_SWAP_KILLER    0xFFF8888F
-+#define MCD_NO_BYTE_SWAP_ATALL  0x00040000
-+
-+/*
-+ * Execution Unit Identifiers
-+ */
-+#define MAC  0  /* legacy - not used */
-+#define LUAC 1  /* legacy - not used */
-+#define CRC  2  /* legacy - not used */
-+#define LURC 3  /* Logic Unit with CRC */
-+
-+/*
-+ * Task Identifiers
-+ */
-+#define TASK_CHAINNOEU  0
-+#define TASK_SINGLENOEU 1
-+#ifdef MCD_INCLUDE_EU
-+#define TASK_CHAINEU    2
-+#define TASK_SINGLEEU   3
-+#define TASK_FECRX      4
-+#define TASK_FECTX      5
-+#else
-+#define TASK_CHAINEU    0
-+#define TASK_SINGLEEU   1
-+#define TASK_FECRX      2
-+#define TASK_FECTX      3
-+#endif
-+
-+/*
-+ * Structure to remember which variant is on which channel
-+ * TBD- need this?
-+ */
-+typedef struct MCD_remVariants_struct MCD_remVariant;
-+struct MCD_remVariants_struct
-+{
-+   int remDestRsdIncr[NCHANNELS];  /* -1,0,1 */
-+   int remSrcRsdIncr[NCHANNELS];   /* -1,0,1 */
-+   s16 remDestIncr[NCHANNELS];     /* DestIncr */
-+   s16 remSrcIncr[NCHANNELS];      /* srcIncr */
-+   u32 remXferSize[NCHANNELS];     /* xferSize */
-+};
-+
-+/*
-+ * Structure to remember the startDma parameters for each channel
-+ */
-+MCD_remVariant MCD_remVariants;
-+/********************************************************************/
-+/*
-+ * Function: MCD_initDma
-+ * Purpose:  Initializes the DMA API by setting up a pointer to the DMA
-+ *           registers, relocating and creating the appropriate task
-+ *           structures, and setting up some global settings
-+ * Arguments:
-+ *  dmaBarAddr    - pointer to the multichannel DMA registers
-+ *  taskTableDest - location to move DMA task code and structs to
-+ *  flags         - operational parameters
-+ * Return Value:
-+ *  MCD_TABLE_UNALIGNED if taskTableDest is not 512-byte aligned
-+ *  MCD_OK otherwise
-+ */
-+extern u32 MCD_funcDescTab0[];
-+
-+int MCD_initDma (dmaRegs *dmaBarAddr, void *taskTableDest, u32 flags)
-+{
-+    int i;
-+    TaskTableEntry *entryPtr;
-+
-+    /* setup the local pointer to register set */
-+    MCD_dmaBar = dmaBarAddr;
-+
-+    /* do we need to move/create a task table */
-+    if ((flags & MCD_RELOC_TASKS) != 0)
-+    {
-+        int fixedSize;
-+        u32 *fixedPtr;
-+        /*int *tablePtr = taskTableDest;TBD*/
-+        int varTabsOffset, funcDescTabsOffset, contextSavesOffset;
-+        int taskDescTabsOffset;
-+        int taskTableSize, varTabsSize, funcDescTabsSize, contextSavesSize;
-+        int taskDescTabSize;
-+
-+        int i;
-+
-+        /* check if physical address is aligned on 512 byte boundary */
-+        if (((u32)taskTableDest & 0x000001ff) != 0)
-+            return(MCD_TABLE_UNALIGNED);
-+
-+        MCD_taskTable = taskTableDest; /* set up local pointer to task Table */
-+
-+        /*
-+         * Create a task table:
-+         * - compute aligned base offsets for variable tables and
-+         *   function descriptor tables, then
-+         * - loop through the task table and setup the pointers
-+         * - copy over model task table with the the actual task descriptor
-+         *   tables
-+         */
-+
-+        taskTableSize = NCHANNELS * sizeof(TaskTableEntry);
-+        /* align variable tables to size */
-+        varTabsOffset = taskTableSize + (u32)taskTableDest;
-+        if ((varTabsOffset & (VAR_TAB_SIZE - 1)) != 0)
-+            varTabsOffset = (varTabsOffset + VAR_TAB_SIZE) & (~VAR_TAB_SIZE);
-+        /* align function descriptor tables */
-+        varTabsSize = NCHANNELS * VAR_TAB_SIZE;
-+        funcDescTabsOffset = varTabsOffset + varTabsSize;
-+
-+        if ((funcDescTabsOffset & (FUNCDESC_TAB_SIZE - 1)) != 0)
-+            funcDescTabsOffset = (funcDescTabsOffset + FUNCDESC_TAB_SIZE) &
-+            (~FUNCDESC_TAB_SIZE);
-+
-+        funcDescTabsSize = FUNCDESC_TAB_NUM * FUNCDESC_TAB_SIZE;
-+        contextSavesOffset = funcDescTabsOffset + funcDescTabsSize;
-+        contextSavesSize = (NCHANNELS * CONTEXT_SAVE_SIZE);
-+        fixedSize = taskTableSize + varTabsSize + funcDescTabsSize +
-+                    contextSavesSize;
-+
-+        /* zero the thing out */
-+        fixedPtr = (u32 *)taskTableDest;
-+        for (i = 0;i<(fixedSize/4);i++)
-+            fixedPtr[i] = 0;
-+
-+        entryPtr = (TaskTableEntry*)MCD_taskTable;
-+        /* set up fixed pointers */
-+        for (i = 0; i < NCHANNELS; i++)
-+        {
-+            entryPtr[i].varTab = (u32)varTabsOffset; /* update ptr to local value */
-+            entryPtr[i].FDTandFlags = (u32)funcDescTabsOffset | MCD_TT_FLAGS_DEF;
-+            entryPtr[i].contextSaveSpace = (u32)contextSavesOffset;
-+            varTabsOffset += VAR_TAB_SIZE;
-+#ifdef MCD_INCLUDE_EU /* if not there is only one, just point to the same one */
-+            funcDescTabsOffset += FUNCDESC_TAB_SIZE;
-+#endif
-+            contextSavesOffset += CONTEXT_SAVE_SIZE;
-+        }
-+        /* copy over the function descriptor table */
-+        for ( i = 0; i < FUNCDESC_TAB_NUM; i++)
-+        {
-+            MCD_memcpy((void*)(entryPtr[i].FDTandFlags & ~MCD_TT_FLAGS_MASK),
-+                       (void*)MCD_funcDescTab0, FUNCDESC_TAB_SIZE);
-+        }
-+
-+        /* copy model task table to where the context saves stuff leaves off*/
-+        MCD_modelTaskTable = (TaskTableEntry*)contextSavesOffset;
-+
-+        MCD_memcpy ((void*)MCD_modelTaskTable, (void*)MCD_modelTaskTableSrc,
-+                    NUMOFVARIANTS * sizeof(TaskTableEntry));
-+
-+        entryPtr = MCD_modelTaskTable; /* point to local version of
-+                                                            model task table */
-+        taskDescTabsOffset = (u32)MCD_modelTaskTable +
-+                            (NUMOFVARIANTS * sizeof(TaskTableEntry));
-+
-+        /* copy actual task code and update TDT ptrs in local model task table */
-+        for (i = 0; i < NUMOFVARIANTS; i++)
-+        {
-+            taskDescTabSize = entryPtr[i].TDTend - entryPtr[i].TDTstart + 4;
-+            MCD_memcpy ((void*)taskDescTabsOffset, (void*)entryPtr[i].TDTstart, taskDescTabSize);
-+            entryPtr[i].TDTstart = (u32)taskDescTabsOffset;
-+            taskDescTabsOffset += taskDescTabSize;
-+            entryPtr[i].TDTend = (u32)taskDescTabsOffset - 4;
-+        }
-+#ifdef MCD_INCLUDE_EU /* Tack single DMA BDs onto end of code so API controls
-+                         where they are since DMA might write to them */        
-+        MCD_relocBuffDesc = (MCD_bufDesc*)(entryPtr[NUMOFVARIANTS - 1].TDTend + 4);
-+#else /* DMA does not touch them so they can be wherever and we don't need to 
-+         waste SRAM on them */
-+        MCD_relocBuffDesc = MCD_singleBufDescs;
-+#endif
-+    }
-+    else
-+    {
-+        /* point the would-be relocated task tables and the
-+        buffer descriptors to the ones the linker generated */
-+
-+        if (((u32)MCD_realTaskTableSrc & 0x000001ff) != 0)
-+            return(MCD_TABLE_UNALIGNED);
-+
-+        /* need to add code to make sure that every thing else is aligned properly TBD*/
-+        /* this is problematic if we init more than once or after running tasks,
-+            need to add variable to see if we have aleady init'd */
-+        entryPtr = MCD_realTaskTableSrc;
-+        for (i = 0; i < NCHANNELS; i++)
-+        {
-+            if (((entryPtr[i].varTab & (VAR_TAB_SIZE - 1)) != 0) ||
-+                ((entryPtr[i].FDTandFlags & (FUNCDESC_TAB_SIZE - 1)) != 0))
-+                return(MCD_TABLE_UNALIGNED);
-+        }
-+
-+        MCD_taskTable = MCD_realTaskTableSrc;
-+        MCD_modelTaskTable = MCD_modelTaskTableSrc;
-+        MCD_relocBuffDesc = MCD_singleBufDescs;
-+    }
-+
-+
-+    /* Make all channels as totally inactive, and remember them as such: */
-+
-+    MCD_dmaBar->taskbar = (u32) MCD_taskTable;
-+    for (i = 0;  i < NCHANNELS;  i++)
-+    {
-+        MCD_dmaBar->taskControl[i] = 0x0;
-+        MCD_chStatus[i] = MCD_NO_DMA;
-+    }
-+
-+   /* Set up pausing mechanism to inactive state: */
-+    MCD_dmaBar->debugComp1 = 0;  /* no particular values yet for either comparator registers */
-+    MCD_dmaBar->debugComp2 = 0;
-+    MCD_dmaBar->debugControl = DBG_CTL_DISABLE;
-+    MCD_dmaBar->debugStatus = DBG_KILL_ALL_STAT;
-+
-+    /* enable or disable commbus prefetch, really need an ifdef or
-+       something to keep from trying to set this in the 8220 */
-+    if ((flags & MCD_COMM_PREFETCH_EN) != 0)
-+        MCD_dmaBar->ptdControl &= ~PTD_CTL_COMM_PREFETCH;
-+    else
-+        MCD_dmaBar->ptdControl |= PTD_CTL_COMM_PREFETCH;
-+
-+    return(MCD_OK);
-+}
-+/*********************** End of MCD_initDma() ***********************/
-+
-+/********************************************************************/
-+/* Function:   MCD_dmaStatus
-+ * Purpose:    Returns the status of the DMA on the requested channel
-+ * Arguments:  channel - channel number
-+ * Returns:    Predefined status indicators
-+ */
-+int MCD_dmaStatus (int channel)
-+{
-+    u16 tcrValue;
-+
-+    if((channel < 0) || (channel >= NCHANNELS))
-+        return(MCD_CHANNEL_INVALID);
-+
-+    tcrValue = MCD_dmaBar->taskControl[channel];
-+    if ((tcrValue & TASK_CTL_EN) == 0)
-+    {  /* nothing running */
-+        /* if last reported with task enabled */
-+        if (   MCD_chStatus[channel] == MCD_RUNNING
-+            || MCD_chStatus[channel] == MCD_IDLE)
-+            MCD_chStatus[channel] = MCD_DONE;
-+    }
-+    else /* something is running */
-+    {
-+        /* There are three possibilities: paused, running or idle. */
-+        if (   MCD_chStatus[channel] == MCD_RUNNING
-+            || MCD_chStatus[channel] == MCD_IDLE)
-+        {
-+            MCD_dmaBar->ptdDebug = PTD_DBG_TSK_VLD_INIT;
-+            /* This register is selected to know which initiator is
-+            actually asserted. */
-+            if ((MCD_dmaBar->ptdDebug >> channel ) & 0x1 )
-+                MCD_chStatus[channel] = MCD_RUNNING;
-+            else
-+                MCD_chStatus[channel] = MCD_IDLE;
-+        /* do not change the status if it is already paused. */
-+        }
-+    }
-+    return MCD_chStatus[channel];
-+}
-+/******************** End of MCD_dmaStatus() ************************/
-+
-+/********************************************************************/
-+/* Function:    MCD_startDma
-+ * Ppurpose:    Starts a particular kind of DMA
-+ * Arguments:   see below
-+ * Returns:     MCD_CHANNEL_INVALID if channel is invalid, else MCD_OK
-+ */
-+
-+int MCD_startDma (
-+    int  channel,   /* the channel on which to run the DMA */
-+    s8   *srcAddr,  /* the address to move data from, or physical buffer-descriptor address */
-+    s16  srcIncr,   /* the amount to increment the source address per transfer */
-+    s8   *destAddr, /* the address to move data to */
-+    s16  destIncr,  /* the amount to increment the destination address per transfer */
-+    u32  dmaSize,   /* the number of bytes to transfer independent of the transfer size */
-+    u32  xferSize,  /* the number bytes in of each data movement (1, 2, or 4) */
-+    u32  initiator, /* what device initiates the DMA */
-+    int  priority,  /* priority of the DMA */
-+    u32  flags,     /* flags describing the DMA */
-+    u32  funcDesc   /* a description of byte swapping, bit swapping, and CRC actions */
-+#ifdef MCD_NEED_ADDR_TRANS
-+    s8   *srcAddrVirt /* virtual buffer descriptor address TBD*/
-+#endif
-+)
-+{
-+    int srcRsdIncr, destRsdIncr;
-+    int *cSave;
-+    short xferSizeIncr;
-+    int tcrCount = 0;
-+#ifdef MCD_INCLUDE_EU
-+    u32 *realFuncArray;
-+#endif
-+
-+    if((channel < 0) || (channel >= NCHANNELS))
-+        return(MCD_CHANNEL_INVALID);
-+        
-+    /* tbd - need to determine the proper response to a bad funcDesc when not 
-+       including EU functions, for now, assign a benign funcDesc, but maybe
-+       should return an error */
-+#ifndef MCD_INCLUDE_EU
-+    funcDesc = MCD_FUNC_NOEU1;
-+#endif
-+        
-+#ifdef MCD_DEBUG
-+printf("startDma:Setting up params\n");
-+#endif
-+   /* Set us up for task-wise priority.  We don't technically need to do this on every start, but
-+      since the register involved is in the same longword as other registers that users are in control
-+      of, setting it more than once is probably preferable.  That since the documentation doesn't seem
-+      to be completely consistent about the nature of the PTD control register. */
-+    MCD_dmaBar->ptdControl |= (u16) 0x8000;
-+#if 1 /* Not sure what we need to keep here rtm TBD */
-+    /* Calculate additional parameters to the regular DMA calls. */
-+    srcRsdIncr = srcIncr < 0 ? -1 : (srcIncr > 0 ? 1 : 0);
-+    destRsdIncr = destIncr < 0 ? -1 : (destIncr > 0 ? 1 : 0);
-+
-+    xferSizeIncr = (xferSize & 0xffff) | 0x20000000;
-+
-+    /* Remember for each channel which variant is running. */
-+    MCD_remVariants.remSrcRsdIncr[channel] = srcRsdIncr;
-+    MCD_remVariants.remDestRsdIncr[channel] = destRsdIncr;
-+    MCD_remVariants.remDestIncr[channel] = destIncr;
-+    MCD_remVariants.remSrcIncr[channel] = srcIncr;
-+    MCD_remVariants.remXferSize[channel] = xferSize;
-+#endif
-+
-+    cSave = (int*)(MCD_taskTable[channel].contextSaveSpace) + CSAVE_OFFSET + CURRBD;
-+
-+#ifdef MCD_INCLUDE_EU /* may move this to EU specific calls */
-+    realFuncArray = (u32 *) (MCD_taskTable[channel].FDTandFlags & 0xffffff00);
-+    /* Modify the LURC's normal and byte-residue-loop functions according to parameter. */
-+    realFuncArray[(LURC*16)] = xferSize == 4 ?
-+                                 funcDesc : xferSize == 2 ?
-+                                     funcDesc & 0xfffff00f : funcDesc & 0xffff000f;
-+    realFuncArray[(LURC*16+1)] = (funcDesc & MCD_BYTE_SWAP_KILLER) | MCD_NO_BYTE_SWAP_ATALL;
-+#endif
-+   /* Write the initiator field in the TCR, and also set the initiator-hold
-+      bit.  Note that,due to a hardware quirk, this could collide with an
-+      MDE access to the initiator-register file, so we have to verify that the write
-+      reads back correctly. */
-+
-+    MCD_dmaBar->taskControl[channel] =
-+        (initiator << 8) | TASK_CTL_HIPRITSKEN | TASK_CTL_HLDINITNUM;
-+
-+    while(((MCD_dmaBar->taskControl[channel] & 0x1fff) !=
-+          ((initiator << 8) | TASK_CTL_HIPRITSKEN | TASK_CTL_HLDINITNUM)) &&
-+            (tcrCount < 1000))
-+    {
-+        tcrCount++;
-+        /*MCD_dmaBar->ptd_tcr[channel] = (initiator << 8) | 0x0020;*/
-+        MCD_dmaBar->taskControl[channel] =
-+            (initiator << 8) | TASK_CTL_HIPRITSKEN | TASK_CTL_HLDINITNUM;
-+    }
-+
-+    MCD_dmaBar->priority[channel] = (u8)priority & PRIORITY_PRI_MASK;
-+    /* should be albe to handle this stuff with only one write to ts reg - tbd */
-+    if (channel < 8 && channel >= 0)
-+    {
-+        MCD_dmaBar->taskSize0 &= ~(0xf << (7-channel)*4);
-+        MCD_dmaBar->taskSize0 |= (xferSize & 3) << (((7 - channel)*4) + 2);
-+        MCD_dmaBar->taskSize0 |= (xferSize & 3) << ((7 - channel)*4);
-+    }
-+    else
-+    {
-+        MCD_dmaBar->taskSize1 &= ~(0xf << (15-channel)*4);
-+        MCD_dmaBar->taskSize1 |= (xferSize & 3) << (((15 - channel)*4) + 2);
-+        MCD_dmaBar->taskSize1 |= (xferSize & 3) << ((15 - channel)*4);
-+    }
-+
-+    /* setup task table flags/options which mostly control the line buffers */
-+    MCD_taskTable[channel].FDTandFlags &= ~MCD_TT_FLAGS_MASK;
-+    MCD_taskTable[channel].FDTandFlags |= (MCD_TT_FLAGS_MASK & flags);
-+
-+    if (flags & MCD_FECTX_DMA)
-+    {
-+        /* TDTStart and TDTEnd */
-+        MCD_taskTable[channel].TDTstart = MCD_modelTaskTable[TASK_FECTX].TDTstart;
-+        MCD_taskTable[channel].TDTend = MCD_modelTaskTable[TASK_FECTX].TDTend;
-+        MCD_startDmaENetXmit(srcAddr, srcAddr, destAddr, MCD_taskTable, channel);
-+    }
-+    else if (flags & MCD_FECRX_DMA)
-+    {
-+        /* TDTStart and TDTEnd */
-+        MCD_taskTable[channel].TDTstart = MCD_modelTaskTable[TASK_FECRX].TDTstart;
-+        MCD_taskTable[channel].TDTend = MCD_modelTaskTable[TASK_FECRX].TDTend;
-+        MCD_startDmaENetRcv(srcAddr, srcAddr, destAddr, MCD_taskTable, channel);
-+    }
-+    else if(flags & MCD_SINGLE_DMA)
-+    {
-+        /* this buffer descriptor is used for storing off initial parameters for later
-+           progress query calculation and for the DMA to write the resulting checksum
-+           The DMA does not use this to determine how to operate, that info is passed
-+           with the init routine*/
-+        MCD_relocBuffDesc[channel].srcAddr = srcAddr;
-+        MCD_relocBuffDesc[channel].destAddr = destAddr;
-+        MCD_relocBuffDesc[channel].lastDestAddr = destAddr;  /* definitely not its final value */
-+        MCD_relocBuffDesc[channel].dmaSize = dmaSize;
-+        MCD_relocBuffDesc[channel].flags = 0;       /* not used */
-+        MCD_relocBuffDesc[channel].csumResult = 0;  /* not used */
-+        MCD_relocBuffDesc[channel].next = 0;        /* not used */
-+
-+        /* Initialize the progress-querying stuff to show no progress:*/
-+        ((volatile int *)MCD_taskTable[channel].contextSaveSpace)[SRCPTR + CSAVE_OFFSET] = (int)srcAddr;
-+        ((volatile int *)MCD_taskTable[channel].contextSaveSpace)[DESTPTR + CSAVE_OFFSET] = (int)destAddr;
-+        ((volatile int *)MCD_taskTable[channel].contextSaveSpace)[DCOUNT + CSAVE_OFFSET] = 0;
-+        ((volatile int *)MCD_taskTable[channel].contextSaveSpace)[CURRBD + CSAVE_OFFSET] =
-+                                             (u32) &(MCD_relocBuffDesc[channel]);
-+        /* tbd - need to keep the user from trying to call the EU routine
-+           when MCD_INCLUDE_EU is not defined */
-+        if( funcDesc == MCD_FUNC_NOEU1 || funcDesc == MCD_FUNC_NOEU2)
-+        {
-+           /* TDTStart and TDTEnd */
-+           MCD_taskTable[channel].TDTstart = MCD_modelTaskTable[TASK_SINGLENOEU].TDTstart;
-+           MCD_taskTable[channel].TDTend = MCD_modelTaskTable[TASK_SINGLENOEU].TDTend;
-+           MCD_startDmaSingleNoEu(srcAddr, srcIncr, destAddr, destIncr, dmaSize, dmaSize,
-+                                xferSizeIncr, flags, (int *)&(MCD_relocBuffDesc[channel]), cSave,
-+                                MCD_taskTable, channel);
-+        }
-+        else
-+        {
-+           /* TDTStart and TDTEnd */
-+           MCD_taskTable[channel].TDTstart = MCD_modelTaskTable[TASK_SINGLEEU].TDTstart;
-+           MCD_taskTable[channel].TDTend = MCD_modelTaskTable[TASK_SINGLEEU].TDTend;
-+           MCD_startDmaSingleEu(srcAddr, srcIncr, destAddr, destIncr, dmaSize, dmaSize,
-+                              xferSizeIncr, flags, (int *)&(MCD_relocBuffDesc[channel]), cSave,
-+                              MCD_taskTable, channel);
-+        }
-+    }
-+    else
-+    { /* chained DMAS */
-+        /* Initialize the progress-querying stuff to show no progress:*/
-+#if 1 /* (!defined(MCD_NEED_ADDR_TRANS)) */
-+        ((volatile int *)MCD_taskTable[channel].contextSaveSpace)[SRCPTR + CSAVE_OFFSET]
-+          = (int)((MCD_bufDesc*) phys_to_virt(srcAddr))->srcAddr;
-+        ((volatile int *)MCD_taskTable[channel].contextSaveSpace)[DESTPTR + CSAVE_OFFSET]
-+          = (int)((MCD_bufDesc*) phys_to_virt(srcAddr))->destAddr;
-+#else /* if using address translation, need the virtual addr of the first buffdesc */
-+        ((volatile int *)MCD_taskTable[channel].contextSaveSpace)[SRCPTR + CSAVE_OFFSET]
-+          = (int)((MCD_bufDesc*) srcAddrVirt)->srcAddr;
-+        ((volatile int *)MCD_taskTable[channel].contextSaveSpace)[DESTPTR + CSAVE_OFFSET]
-+          = (int)((MCD_bufDesc*) srcAddrVirt)->destAddr;
-+#endif
-+        ((volatile int *)MCD_taskTable[channel].contextSaveSpace)[DCOUNT + CSAVE_OFFSET] = 0;
-+        ((volatile int *)MCD_taskTable[channel].contextSaveSpace)[CURRBD + CSAVE_OFFSET] = (u32) srcAddr;
-+
-+        if( funcDesc == MCD_FUNC_NOEU1 || funcDesc == MCD_FUNC_NOEU2)
-+        {
-+          /*TDTStart and TDTEnd*/
-+          MCD_taskTable[channel].TDTstart = MCD_modelTaskTable[TASK_CHAINNOEU].TDTstart;
-+          MCD_taskTable[channel].TDTend = MCD_modelTaskTable[TASK_CHAINNOEU].TDTend;
-+          MCD_startDmaChainNoEu((int *)srcAddr, srcIncr, destIncr, xferSize,
-+                                    xferSizeIncr, cSave, MCD_taskTable, channel);
-+        }
-+        else
-+        {
-+          /*TDTStart and TDTEnd*/
-+          MCD_taskTable[channel].TDTstart = MCD_modelTaskTable[TASK_CHAINEU].TDTstart;
-+          MCD_taskTable[channel].TDTend = MCD_modelTaskTable[TASK_CHAINEU].TDTend;
-+          MCD_startDmaChainEu((int *)srcAddr, srcIncr, destIncr, xferSize,
-+                                 xferSizeIncr, cSave, MCD_taskTable, channel);
-+        }
-+    }
-+    MCD_chStatus[channel] = MCD_IDLE;
-+    return(MCD_OK);
-+}
-+
-+/************************ End of MCD_startDma() *********************/
-+
-+/********************************************************************/
-+/* Function:    MCD_XferProgrQuery
-+ * Purpose:     Returns progress of DMA on requested channel
-+ * Arguments:   channel - channel to retrieve progress for
-+ *              progRep - pointer to user supplied MCD_XferProg struct
-+ * Returns:     MCD_CHANNEL_INVALID if channel is invalid, else MCD_OK
-+ *
-+ * Notes:
-+ *  MCD_XferProgrQuery() upon completing or after aborting a DMA, or
-+ *  while the DMA is in progress, this function returns the first
-+ *  DMA-destination address not (or not yet) used in the DMA. When 
-+ *  encountering a non-ready buffer descriptor, the information for
-+ *  the last completed descriptor is returned.
-+ *
-+ *  MCD_XferProgQuery() has to avoid the possibility of getting
-+ *  partially-updated information in the event that we should happen
-+ *  to query DMA progress just as the DMA is updating it. It does that
-+ *  by taking advantage of the fact context is not saved frequently for
-+ *  the most part. We therefore read it at least twice until we get the
-+ *  same information twice in a row.
-+ *
-+ *  Because a small, but not insignificant, amount of time is required
-+ *  to write out the progress-query information, especially upon
-+ *  completion of the DMA, it would be wise to guarantee some time lag
-+ *  between successive readings of the progress-query information.
-+ */
-+
-+/*
-+ * How many iterations of the loop below to execute to stabilize values
-+ */
-+#define STABTIME 0
-+
-+int MCD_XferProgrQuery (int channel, MCD_XferProg *progRep)
-+{
-+    MCD_XferProg prevRep;
-+    int again;  /* true if we are to try again to get consistent results */
-+    int i;  /* used as a time-waste counter */
-+    int destDiffBytes; /* Total number of bytes that we think actually got xfered. */
-+    int numIterations; /* number of iterations */
-+    int bytesNotXfered; /* bytes that did not get xfered. */
-+    s8 *LWAlignedInitDestAddr, *LWAlignedCurrDestAddr;
-+    int subModVal, addModVal; /* Mode values to added and subtracted from the
-+                                final destAddr */
-+
-+    if((channel < 0) || (channel >= NCHANNELS))
-+        return(MCD_CHANNEL_INVALID);
-+
-+    /* Read a trial value for the progress-reporting values*/
-+    prevRep.lastSrcAddr =
-+          (s8 *) ((volatile int*) MCD_taskTable[channel].contextSaveSpace)[SRCPTR + CSAVE_OFFSET];
-+    prevRep.lastDestAddr =
-+          (s8 *) ((volatile int*) MCD_taskTable[channel].contextSaveSpace)[DESTPTR + CSAVE_OFFSET];
-+    prevRep.dmaSize = ((volatile int*) MCD_taskTable[channel].contextSaveSpace)[DCOUNT + CSAVE_OFFSET];
-+    prevRep.currBufDesc =
-+          (MCD_bufDesc*) ((volatile int*) MCD_taskTable[channel].contextSaveSpace)[CURRBD + CSAVE_OFFSET];
-+    /* Repeatedly reread those values until they match previous values: */
-+    do {
-+        /* Waste a little bit of time to ensure stability: */
-+        for (i = 0;  i < STABTIME;  i++)
-+            i += i >> 2;  /* make sure this loop does something so that it doesn't get optimized out */
-+        /* Check them again: */
-+        progRep->lastSrcAddr =
-+            (s8 *) ((volatile int*) MCD_taskTable[channel].contextSaveSpace)[SRCPTR + CSAVE_OFFSET];
-+        progRep->lastDestAddr =
-+            (s8 *) ((volatile int*) MCD_taskTable[channel].contextSaveSpace)[DESTPTR + CSAVE_OFFSET];
-+        progRep->dmaSize = ((volatile int*) MCD_taskTable[channel].contextSaveSpace)[DCOUNT + CSAVE_OFFSET];
-+        progRep->currBufDesc =
-+            (MCD_bufDesc*) ((volatile int*) MCD_taskTable[channel].contextSaveSpace)[CURRBD + CSAVE_OFFSET];
-+       /* See if they match: */
-+       if (   prevRep.lastSrcAddr != progRep->lastSrcAddr
-+           || prevRep.lastDestAddr != progRep->lastDestAddr
-+           || prevRep.dmaSize != progRep->dmaSize
-+           || prevRep.currBufDesc != progRep->currBufDesc)
-+       {
-+          /* If they don't match, remember previous values and try again:*/
-+          prevRep.lastSrcAddr = progRep->lastSrcAddr;
-+          prevRep.lastDestAddr = progRep->lastDestAddr;
-+          prevRep.dmaSize = progRep->dmaSize;
-+          prevRep.currBufDesc = progRep->currBufDesc;
-+          again = MCD_TRUE;
-+       }
-+       else
-+          again = MCD_FALSE;
-+    } while (again == MCD_TRUE);
-+
-+
-+    /* Update the dCount, srcAddr and destAddr */
-+    /* To calculate dmaCount, we consider destination address. C
-+       overs M1,P1,Z for destination */
-+    switch(MCD_remVariants.remDestRsdIncr[channel]) {
-+        case MINUS1:
-+           subModVal = ((int)progRep->lastDestAddr) & ((MCD_remVariants.remXferSize[channel]) - 1);
-+           addModVal = ((int)progRep->currBufDesc->destAddr) & ((MCD_remVariants.remXferSize[channel]) - 1);
-+           LWAlignedInitDestAddr = (progRep->currBufDesc->destAddr) - addModVal;
-+           LWAlignedCurrDestAddr = (progRep->lastDestAddr) - subModVal;
-+           destDiffBytes = LWAlignedInitDestAddr - LWAlignedCurrDestAddr;
-+           bytesNotXfered = (destDiffBytes/MCD_remVariants.remDestIncr[channel]) *
-+                            ( MCD_remVariants.remDestIncr[channel]
-+                            + MCD_remVariants.remXferSize[channel]);
-+           progRep->dmaSize = destDiffBytes - bytesNotXfered + addModVal - subModVal;
-+           break;
-+        case ZERO:
-+           progRep->lastDestAddr = progRep->currBufDesc->destAddr;
-+           break;
-+        case PLUS1:
-+           /* This value has to be subtracted from the final calculated dCount. */
-+           subModVal = ((int)progRep->currBufDesc->destAddr) & ((MCD_remVariants.remXferSize[channel]) - 1);
-+           /* These bytes are already in lastDestAddr. */
-+            addModVal = ((int)progRep->lastDestAddr) & ((MCD_remVariants.remXferSize[channel]) - 1);
-+            LWAlignedInitDestAddr = (progRep->currBufDesc->destAddr) - subModVal;
-+            LWAlignedCurrDestAddr = (progRep->lastDestAddr) - addModVal;
-+            destDiffBytes = (progRep->lastDestAddr - LWAlignedInitDestAddr);
-+            numIterations = ( LWAlignedCurrDestAddr - LWAlignedInitDestAddr)/MCD_remVariants.remDestIncr[channel];
-+            bytesNotXfered =  numIterations *
-+                ( MCD_remVariants.remDestIncr[channel]
-+                  - MCD_remVariants.remXferSize[channel]);
-+           progRep->dmaSize = destDiffBytes - bytesNotXfered - subModVal;
-+           break;
-+        default:
-+           break;
-+    }
-+
-+    /* This covers M1,P1,Z for source */
-+    switch(MCD_remVariants.remSrcRsdIncr[channel]) {
-+        case MINUS1:
-+            progRep->lastSrcAddr =
-+                progRep->currBufDesc->srcAddr +
-+                 ( MCD_remVariants.remSrcIncr[channel] *
-+                   (progRep->dmaSize/MCD_remVariants.remXferSize[channel]));
-+            break;
-+        case ZERO:
-+            progRep->lastSrcAddr = progRep->currBufDesc->srcAddr;
-+            break;
-+       case PLUS1:
-+            progRep->lastSrcAddr =
-+                progRep->currBufDesc->srcAddr +
-+                 ( MCD_remVariants.remSrcIncr[channel] *
-+                   (progRep->dmaSize/MCD_remVariants.remXferSize[channel]));
-+          break;
-+       default: break;
-+    }
-+
-+    return(MCD_OK);
-+}
-+/******************* End of MCD_XferProgrQuery() ********************/
-+
-+/********************************************************************/
-+/* MCD_resmActions() does the majority of the actions of a DMA resume.
-+ * It is called from MCD_killDma() and MCD_resumeDma().  It has to be
-+ * a separate function because the kill function has to negate the task
-+ * enable before resuming it, but the resume function has to do nothing
-+ * if there is no DMA on that channel (i.e., if the enable bit is 0).
-+ */
-+static void MCD_resmActions (int channel)
-+{
-+   MCD_dmaBar->debugControl = DBG_CTL_DISABLE;
-+   MCD_dmaBar->debugStatus = MCD_dmaBar->debugStatus;
-+   MCD_dmaBar->ptdDebug = PTD_DBG_TSK_VLD_INIT; /* This register is selected to know
-+                                        which initiator is actually asserted. */
-+   if((MCD_dmaBar->ptdDebug >> channel ) & 0x1)
-+       MCD_chStatus[channel] = MCD_RUNNING;
-+   else
-+       MCD_chStatus[channel] = MCD_IDLE;
-+}
-+/********************* End of MCD_resmActions() *********************/
-+
-+/********************************************************************/
-+/* Function:    MCD_killDma
-+ * Purpose:     Halt the DMA on the requested channel, without any
-+ *              intention of resuming the DMA.
-+ * Arguments:   channel - requested channel
-+ * Returns:     MCD_CHANNEL_INVALID if channel is invalid, else MCD_OK
-+ *
-+ * Notes:
-+ *  A DMA may be killed from any state, including paused state, and it
-+ *  always goes to the MCD_HALTED state even if it is killed while in
-+ *  the MCD_NO_DMA or MCD_IDLE states.
-+ */
-+int MCD_killDma (int channel)
-+{
-+   /* MCD_XferProg progRep; */
-+
-+    if((channel < 0) || (channel >= NCHANNELS))
-+        return(MCD_CHANNEL_INVALID);
-+
-+    MCD_dmaBar->taskControl[channel] = 0x0;
-+    MCD_resumeDma (channel);
-+    /*
-+     * This must be after the write to the TCR so that the task doesn't
-+     * start up again momentarily, and before the status assignment so
-+     * as to override whatever MCD_resumeDma() may do to the channel
-+     * status.
-+     */
-+    MCD_chStatus[channel] = MCD_HALTED;
-+
-+    /*
-+     * Update the current buffer descriptor's lastDestAddr field
-+     *
-+     * MCD_XferProgrQuery (channel, &progRep);
-+     * progRep.currBufDesc->lastDestAddr = progRep.lastDestAddr;
-+     */
-+    return(MCD_OK);
-+}
-+/************************ End of MCD_killDma() **********************/
-+
-+/********************************************************************/
-+/* Function:    MCD_continDma
-+ * Purpose:     Continue a DMA which as stopped due to encountering an
-+ *              unready buffer descriptor.
-+ * Arguments:   channel - channel to continue the DMA on
-+ * Returns:     MCD_CHANNEL_INVALID if channel is invalid, else MCD_OK
-+ *
-+ * Notes:
-+ *  This routine does not check to see if there is a task which can
-+ *  be continued. Also this routine should not be used with single DMAs.
-+ */
-+int MCD_continDma (int channel)
-+{
-+    if((channel < 0) || (channel >= NCHANNELS))
-+        return(MCD_CHANNEL_INVALID);
-+
-+    MCD_dmaBar->taskControl[channel] |= TASK_CTL_EN;
-+    MCD_chStatus[channel] = MCD_RUNNING;
-+
-+    return(MCD_OK);
-+}
-+/********************** End of MCD_continDma() **********************/
-+
-+/*********************************************************************
-+ * MCD_pauseDma() and MCD_resumeDma() below use the DMA's debug unit
-+ * to freeze a task and resume it.  We freeze a task by breakpointing
-+ * on the stated task.  That is, not any specific place in the task,
-+ * but any time that task executes.  In particular, when that task
-+ * executes, we want to freeze that task and only that task.
-+ *
-+ * The bits of the debug control register influence interrupts vs.
-+ * breakpoints as follows:
-+ * - Bits 14 and 0 enable or disable debug functions.  If enabled, you
-+ *   will get the interrupt but you may or may not get a breakpoint.
-+ * - Bits 2 and 1 decide whether you also get a breakpoint in addition
-+ *   to an interrupt.
-+ *
-+ * The debug unit can do these actions in response to either internally
-+ * detected breakpoint conditions from the comparators, or in response
-+ * to the external breakpoint pin, or both.
-+ * - Bits 14 and 1 perform the above-described functions for
-+ *   internally-generated conditions, i.e., the debug comparators.
-+ * - Bits 0 and 2 perform the above-described functions for external
-+ *   conditions, i.e., the breakpoint external pin.
-+ *
-+ * Note that, although you "always" get the interrupt when you turn
-+ * the debug functions, the interrupt can nevertheless, if desired, be
-+ * masked by the corresponding bit in the PTD's IMR. Note also that
-+ * this means that bits 14 and 0 must enable debug functions before
-+ * bits 1 and 2, respectively, have any effect.
-+ *
-+ * NOTE: It's extremely important to not pause more than one DMA channel 
-+ *  at a time.
-+ ********************************************************************/
-+
-+/********************************************************************/
-+/* Function:    MCD_pauseDma
-+ * Purpose:     Pauses the DMA on a given channel (if any DMA is running
-+ *              on that channel).
-+ * Arguments:   channel
-+ * Returns:     MCD_CHANNEL_INVALID if channel is invalid, else MCD_OK
-+ */
-+int MCD_pauseDma (int channel)
-+{
-+    /* MCD_XferProg progRep; */
-+
-+    if((channel < 0) || (channel >= NCHANNELS))
-+        return(MCD_CHANNEL_INVALID);
-+
-+    if (MCD_dmaBar->taskControl[channel] & TASK_CTL_EN)
-+    {
-+        MCD_dmaBar->debugComp1 = channel;
-+        MCD_dmaBar->debugControl = DBG_CTL_ENABLE | (1 << (channel + 16));
-+        MCD_chStatus[channel] = MCD_PAUSED;
-+
-+        /*
-+         * Update the current buffer descriptor's lastDestAddr field
-+         *
-+         * MCD_XferProgrQuery (channel, &progRep);
-+         * progRep.currBufDesc->lastDestAddr = progRep.lastDestAddr;
-+         */
-+    }
-+    return(MCD_OK);
-+}
-+/************************* End of MCD_pauseDma() ********************/
-+
-+/********************************************************************/
-+/* Function:    MCD_resumeDma
-+ * Purpose:     Resumes the DMA on a given channel (if any DMA is
-+ *              running on that channel).
-+ * Arguments:   channel - channel on which to resume DMA
-+ * Returns:     MCD_CHANNEL_INVALID if channel is invalid, else MCD_OK
-+ */
-+int MCD_resumeDma (int channel)
-+{
-+    if((channel < 0) || (channel >= NCHANNELS))
-+        return(MCD_CHANNEL_INVALID);
-+
-+    if (MCD_dmaBar->taskControl[channel] & TASK_CTL_EN)
-+        MCD_resmActions (channel);
-+
-+    return(MCD_OK);
-+}
-+/************************ End of MCD_resumeDma() ********************/
-+
-+/********************************************************************/
-+/* Function:    MCD_csumQuery
-+ * Purpose:     Provide the checksum after performing a non-chained DMA
-+ * Arguments:   channel - channel to report on
-+ *              csum - pointer to where to write the checksum/CRC
-+ * Returns:     MCD_ERROR if the channel is invalid, else MCD_OK
-+ *
-+ * Notes:
-+ *
-+ */
-+int MCD_csumQuery (int channel, u32 *csum)
-+{
-+#ifdef MCD_INCLUDE_EU
-+    if((channel < 0) || (channel >= NCHANNELS))
-+        return(MCD_CHANNEL_INVALID);
-+
-+    *csum = MCD_relocBuffDesc[channel].csumResult;
-+    return(MCD_OK);
-+#else
-+    return(MCD_ERROR);
-+#endif
-+}
-+/*********************** End of MCD_resumeDma() *********************/
-+
-+/********************************************************************/
-+/* Function:    MCD_getCodeSize
-+ * Purpose:     Provide the size requirements of the microcoded tasks
-+ * Returns:     Size in bytes
-+ */
-+int MCD_getCodeSize(void)
-+{
-+#ifdef MCD_INCLUDE_EU
-+    return(0x2b5c);
-+#else
-+    return(0x173c);
-+#endif
-+}
-+/********************** End of MCD_getCodeSize() ********************/
-+
-+/********************************************************************/
-+/* Function:    MCD_getVersion
-+ * Purpose:     Provide the version string and number
-+ * Arguments:   longVersion - user supplied pointer to a pointer to a char
-+ *                    which points to the version string
-+ * Returns:     Version number and version string (by reference)
-+ */
-+char MCD_versionString[] = "Multi-channel DMA API Alpha v0.3 (2004-04-26)";
-+#define MCD_REV_MAJOR   0x00
-+#define MCD_REV_MINOR   0x03
-+
-+int MCD_getVersion(char **longVersion)
-+{
-+    *longVersion = MCD_versionString;
-+    return((MCD_REV_MAJOR << 8) | MCD_REV_MINOR);
-+}
-+/********************** End of MCD_getVersion() *********************/
-+
-+/********************************************************************/
-+/* Private version of memcpy()
-+ * Note that everything this is used for is longword-aligned.
-+ */
-+static void MCD_memcpy (int *dest, int *src, u32 size)
-+{
-+    u32 i;
-+
-+    for (i = 0;  i < size;  i += sizeof(int), dest++, src++)
-+        *dest = *src;
-+}
-+/********************************************************************/
---- /dev/null
-+++ b/drivers/dma/MCD_progCheck.h
-@@ -0,0 +1,33 @@
-+/*********************************************************************
-+ *
-+ * Copyright (C) 2004  Motorola, Inc.
-+ *  MOTOROLA, INC. All Rights Reserved.
-+ *  You are hereby granted a copyright license to use
-+ *  the SOFTWARE so long as this entire notice is
-+ *  retained without alteration in any modified and/or redistributed
-+ *  versions, and that such modified versions are clearly identified
-+ *  as such. No licenses are granted by implication, estoppel or
-+ *  otherwise under any patents or trademarks of Motorola, Inc. This
-+ *  software is provided on an "AS IS" basis and without warranty.
-+ *
-+ *  To the maximum extent permitted by applicable law, MOTOROLA
-+ *  DISCLAIMS ALL WARRANTIES WHETHER EXPRESS OR IMPLIED, INCLUDING
-+ *  IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-+ *  PURPOSE AND ANY WARRANTY AGAINST INFRINGEMENT WITH REGARD TO THE
-+ *  SOFTWARE (INCLUDING ANY MODIFIED VERSIONS THEREOF) AND ANY
-+ *  ACCOMPANYING WRITTEN MATERIALS.
-+ *
-+ *  To the maximum extent permitted by applicable law, IN NO EVENT
-+ *  SHALL MOTOROLA BE LIABLE FOR ANY DAMAGES WHATSOEVER (INCLUDING
-+ *  WITHOUT LIMITATION, DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS
-+ *  INTERRUPTION, LOSS OF BUSINESS INFORMATION, OR OTHER PECUNIARY
-+ *  LOSS) ARISING OF THE USE OR INABILITY TO USE THE SOFTWARE.
-+ *
-+ *  Motorola assumes no responsibility for the maintenance and support
-+ *  of this software
-+ ********************************************************************/
-+ /* This file is autogenerated. Do not change */
-+#define CURRBD 4
-+#define DCOUNT 6
-+#define DESTPTR 5
-+#define SRCPTR 7
---- /dev/null
-+++ b/drivers/dma/MCD_tasks.c
-@@ -0,0 +1,2452 @@
-+/*********************************************************************
-+ *
-+ * Copyright (C) 2004  Motorola, Inc.
-+ *  MOTOROLA, INC. All Rights Reserved.
-+ *  You are hereby granted a copyright license to use
-+ *  the SOFTWARE so long as this entire notice is
-+ *  retained without alteration in any modified and/or redistributed
-+ *  versions, and that such modified versions are clearly identified
-+ *  as such. No licenses are granted by implication, estoppel or
-+ *  otherwise under any patents or trademarks of Motorola, Inc. This
-+ *  software is provided on an "AS IS" basis and without warranty.
-+ *
-+ *  To the maximum extent permitted by applicable law, MOTOROLA
-+ *  DISCLAIMS ALL WARRANTIES WHETHER EXPRESS OR IMPLIED, INCLUDING
-+ *  IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-+ *  PURPOSE AND ANY WARRANTY AGAINST INFRINGEMENT WITH REGARD TO THE
-+ *  SOFTWARE (INCLUDING ANY MODIFIED VERSIONS THEREOF) AND ANY
-+ *  ACCOMPANYING WRITTEN MATERIALS.
-+ *
-+ *  To the maximum extent permitted by applicable law, IN NO EVENT
-+ *  SHALL MOTOROLA BE LIABLE FOR ANY DAMAGES WHATSOEVER (INCLUDING
-+ *  WITHOUT LIMITATION, DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS
-+ *  INTERRUPTION, LOSS OF BUSINESS INFORMATION, OR OTHER PECUNIARY
-+ *  LOSS) ARISING OF THE USE OR INABILITY TO USE THE SOFTWARE.
-+ *
-+ *  Motorola assumes no responsibility for the maintenance and support
-+ *  of this software
-+ ********************************************************************/
-+/*
-+ * File:        MCD_tasks.c
-+ * Purpose:     Contains task code and structures for Multi-channel DMA
-+ *
-+ * Notes:
-+ *
-+ *
-+ * Modifications:
-+ *
-+ *
-+ */
-+
-+#include <asm/MCD_dma.h>
-+
-+u32 MCD_varTab0[];
-+u32 MCD_varTab1[];
-+u32 MCD_varTab2[];
-+u32 MCD_varTab3[];
-+u32 MCD_varTab4[];
-+u32 MCD_varTab5[];
-+u32 MCD_varTab6[];
-+u32 MCD_varTab7[];
-+u32 MCD_varTab8[];
-+u32 MCD_varTab9[];
-+u32 MCD_varTab10[];
-+u32 MCD_varTab11[];
-+u32 MCD_varTab12[];
-+u32 MCD_varTab13[];
-+u32 MCD_varTab14[];
-+u32 MCD_varTab15[];
-+
-+u32 MCD_funcDescTab0[];
-+#ifdef MCD_INCLUDE_EU
-+u32 MCD_funcDescTab1[];
-+u32 MCD_funcDescTab2[];
-+u32 MCD_funcDescTab3[];
-+u32 MCD_funcDescTab4[];
-+u32 MCD_funcDescTab5[];
-+u32 MCD_funcDescTab6[];
-+u32 MCD_funcDescTab7[];
-+u32 MCD_funcDescTab8[];
-+u32 MCD_funcDescTab9[];
-+u32 MCD_funcDescTab10[];
-+u32 MCD_funcDescTab11[];
-+u32 MCD_funcDescTab12[];
-+u32 MCD_funcDescTab13[];
-+u32 MCD_funcDescTab14[];
-+u32 MCD_funcDescTab15[];
-+#endif
-+
-+u32 MCD_contextSave0[];
-+u32 MCD_contextSave1[];
-+u32 MCD_contextSave2[];
-+u32 MCD_contextSave3[];
-+u32 MCD_contextSave4[];
-+u32 MCD_contextSave5[];
-+u32 MCD_contextSave6[];
-+u32 MCD_contextSave7[];
-+u32 MCD_contextSave8[];
-+u32 MCD_contextSave9[];
-+u32 MCD_contextSave10[];
-+u32 MCD_contextSave11[];
-+u32 MCD_contextSave12[];
-+u32 MCD_contextSave13[];
-+u32 MCD_contextSave14[];
-+u32 MCD_contextSave15[];
-+
-+u32 MCD_realTaskTableSrc[] =
-+{
-+    0x00000000,
-+    0x00000000,
-+    (u32)MCD_varTab0,   /* Task 0 Variable Table */
-+    (u32)MCD_funcDescTab0,  /* Task 0 Function Descriptor Table & Flags */
-+    0x00000000,
-+    0x00000000,
-+    (u32)MCD_contextSave0,  /* Task 0 context save space */
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    (u32)MCD_varTab1,   /* Task 1 Variable Table */
-+#ifdef MCD_INCLUDE_EU
-+    (u32)MCD_funcDescTab1,  /* Task 1 Function Descriptor Table & Flags */
-+#else
-+    (u32)MCD_funcDescTab0,  /* Task 0 Function Descriptor Table & Flags */
-+#endif
-+    0x00000000,
-+    0x00000000,
-+    (u32)MCD_contextSave1,  /* Task 1 context save space */
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    (u32)MCD_varTab2,   /* Task 2 Variable Table */
-+#ifdef MCD_INCLUDE_EU
-+    (u32)MCD_funcDescTab2,  /* Task 2 Function Descriptor Table & Flags */
-+#else
-+    (u32)MCD_funcDescTab0,  /* Task 0 Function Descriptor Table & Flags */
-+#endif
-+    0x00000000,
-+    0x00000000,
-+    (u32)MCD_contextSave2,  /* Task 2 context save space */
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    (u32)MCD_varTab3,   /* Task 3 Variable Table */
-+#ifdef MCD_INCLUDE_EU
-+    (u32)MCD_funcDescTab3,  /* Task 3 Function Descriptor Table & Flags */
-+#else
-+    (u32)MCD_funcDescTab0,  /* Task 0 Function Descriptor Table & Flags */
-+#endif
-+    0x00000000,
-+    0x00000000,
-+    (u32)MCD_contextSave3,  /* Task 3 context save space */
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    (u32)MCD_varTab4,   /* Task 4 Variable Table */
-+#ifdef MCD_INCLUDE_EU
-+    (u32)MCD_funcDescTab4,  /* Task 4 Function Descriptor Table & Flags */
-+#else
-+    (u32)MCD_funcDescTab0,  /* Task 0 Function Descriptor Table & Flags */
-+#endif
-+    0x00000000,
-+    0x00000000,
-+    (u32)MCD_contextSave4,  /* Task 4 context save space */
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    (u32)MCD_varTab5,   /* Task 5 Variable Table */
-+#ifdef MCD_INCLUDE_EU
-+    (u32)MCD_funcDescTab5,  /* Task 5 Function Descriptor Table & Flags */
-+#else
-+    (u32)MCD_funcDescTab0,  /* Task 0 Function Descriptor Table & Flags */
-+#endif
-+    0x00000000,
-+    0x00000000,
-+    (u32)MCD_contextSave5,  /* Task 5 context save space */
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    (u32)MCD_varTab6,   /* Task 6 Variable Table */
-+#ifdef MCD_INCLUDE_EU
-+    (u32)MCD_funcDescTab6,  /* Task 6 Function Descriptor Table & Flags */
-+#else
-+    (u32)MCD_funcDescTab0,  /* Task 0 Function Descriptor Table & Flags */
-+#endif
-+    0x00000000,
-+    0x00000000,
-+    (u32)MCD_contextSave6,  /* Task 6 context save space */
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    (u32)MCD_varTab7,   /* Task 7 Variable Table */
-+#ifdef MCD_INCLUDE_EU
-+    (u32)MCD_funcDescTab7,  /* Task 7 Function Descriptor Table & Flags */
-+#else
-+    (u32)MCD_funcDescTab0,  /* Task 0 Function Descriptor Table & Flags */
-+#endif
-+    0x00000000,
-+    0x00000000,
-+    (u32)MCD_contextSave7,  /* Task 7 context save space */
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    (u32)MCD_varTab8,   /* Task 8 Variable Table */
-+#ifdef MCD_INCLUDE_EU
-+    (u32)MCD_funcDescTab8,  /* Task 8 Function Descriptor Table & Flags */
-+#else
-+    (u32)MCD_funcDescTab0,  /* Task 0 Function Descriptor Table & Flags */
-+#endif
-+    0x00000000,
-+    0x00000000,
-+    (u32)MCD_contextSave8,  /* Task 8 context save space */
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    (u32)MCD_varTab9,   /* Task 9 Variable Table */
-+#ifdef MCD_INCLUDE_EU
-+    (u32)MCD_funcDescTab9,  /* Task 9 Function Descriptor Table & Flags */
-+#else
-+    (u32)MCD_funcDescTab0,  /* Task 0 Function Descriptor Table & Flags */
-+#endif
-+    0x00000000,
-+    0x00000000,
-+    (u32)MCD_contextSave9,  /* Task 9 context save space */
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    (u32)MCD_varTab10,  /* Task 10 Variable Table */
-+#ifdef MCD_INCLUDE_EU
-+    (u32)MCD_funcDescTab10, /* Task 10 Function Descriptor Table & Flags */
-+#else
-+    (u32)MCD_funcDescTab0,  /* Task 0 Function Descriptor Table & Flags */
-+#endif
-+    0x00000000,
-+    0x00000000,
-+    (u32)MCD_contextSave10, /* Task 10 context save space */
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    (u32)MCD_varTab11,  /* Task 11 Variable Table */
-+#ifdef MCD_INCLUDE_EU
-+    (u32)MCD_funcDescTab11, /* Task 11 Function Descriptor Table & Flags */
-+#else
-+    (u32)MCD_funcDescTab0,  /* Task 0 Function Descriptor Table & Flags */
-+#endif
-+    0x00000000,
-+    0x00000000,
-+    (u32)MCD_contextSave11, /* Task 11 context save space */
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    (u32)MCD_varTab12,  /* Task 12 Variable Table */
-+#ifdef MCD_INCLUDE_EU
-+    (u32)MCD_funcDescTab12, /* Task 12 Function Descriptor Table & Flags */
-+#else
-+    (u32)MCD_funcDescTab0,  /* Task 0 Function Descriptor Table & Flags */
-+#endif
-+    0x00000000,
-+    0x00000000,
-+    (u32)MCD_contextSave12, /* Task 12 context save space */
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    (u32)MCD_varTab13,  /* Task 13 Variable Table */
-+#ifdef MCD_INCLUDE_EU
-+    (u32)MCD_funcDescTab13, /* Task 13 Function Descriptor Table & Flags */
-+#else
-+    (u32)MCD_funcDescTab0,  /* Task 0 Function Descriptor Table & Flags */
-+#endif
-+    0x00000000,
-+    0x00000000,
-+    (u32)MCD_contextSave13, /* Task 13 context save space */
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    (u32)MCD_varTab14,  /* Task 14 Variable Table */
-+#ifdef MCD_INCLUDE_EU
-+    (u32)MCD_funcDescTab14, /* Task 14 Function Descriptor Table & Flags */
-+#else
-+    (u32)MCD_funcDescTab0,  /* Task 0 Function Descriptor Table & Flags */
-+#endif
-+    0x00000000,
-+    0x00000000,
-+    (u32)MCD_contextSave14, /* Task 14 context save space */
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    (u32)MCD_varTab15,  /* Task 15 Variable Table */
-+#ifdef MCD_INCLUDE_EU
-+    (u32)MCD_funcDescTab15, /* Task 15 Function Descriptor Table & Flags */
-+#else
-+    (u32)MCD_funcDescTab0,  /* Task 0 Function Descriptor Table & Flags */
-+#endif
-+    0x00000000,
-+    0x00000000,
-+    (u32)MCD_contextSave15, /* Task 15 context save space */
-+    0x00000000,
-+};
-+
-+
-+u32 MCD_varTab0[] =
-+{   /* Task 0 Variable Table */
-+    0x00000000, /* var[0] */
-+    0x00000000, /* var[1] */
-+    0x00000000, /* var[2] */
-+    0x00000000, /* var[3] */
-+    0x00000000, /* var[4] */
-+    0x00000000, /* var[5] */
-+    0x00000000, /* var[6] */
-+    0x00000000, /* var[7] */
-+    0x00000000, /* var[8] */
-+    0x00000000, /* var[9] */
-+    0x00000000, /* var[10] */
-+    0x00000000, /* var[11] */
-+    0x00000000, /* var[12] */
-+    0x00000000, /* var[13] */
-+    0x00000000, /* var[14] */
-+    0x00000000, /* var[15] */
-+    0x00000000, /* var[16] */
-+    0x00000000, /* var[17] */
-+    0x00000000, /* var[18] */
-+    0x00000000, /* var[19] */
-+    0x00000000, /* var[20] */
-+    0x00000000, /* var[21] */
-+    0x00000000, /* var[22] */
-+    0x00000000, /* var[23] */
-+    0xe0000000, /* inc[0] */
-+    0x20000000, /* inc[1] */
-+    0x2000ffff, /* inc[2] */
-+    0x00000000, /* inc[3] */
-+    0x00000000, /* inc[4] */
-+    0x00000000, /* inc[5] */
-+    0x00000000, /* inc[6] */
-+    0x00000000, /* inc[7] */
-+};
-+
-+
-+u32 MCD_varTab1[] =
-+{   /* Task 1 Variable Table */
-+    0x00000000, /* var[0] */
-+    0x00000000, /* var[1] */
-+    0x00000000, /* var[2] */
-+    0x00000000, /* var[3] */
-+    0x00000000, /* var[4] */
-+    0x00000000, /* var[5] */
-+    0x00000000, /* var[6] */
-+    0x00000000, /* var[7] */
-+    0x00000000, /* var[8] */
-+    0x00000000, /* var[9] */
-+    0x00000000, /* var[10] */
-+    0x00000000, /* var[11] */
-+    0x00000000, /* var[12] */
-+    0x00000000, /* var[13] */
-+    0x00000000, /* var[14] */
-+    0x00000000, /* var[15] */
-+    0x00000000, /* var[16] */
-+    0x00000000, /* var[17] */
-+    0x00000000, /* var[18] */
-+    0x00000000, /* var[19] */
-+    0x00000000, /* var[20] */
-+    0x00000000, /* var[21] */
-+    0x00000000, /* var[22] */
-+    0x00000000, /* var[23] */
-+    0xe0000000, /* inc[0] */
-+    0x20000000, /* inc[1] */
-+    0x2000ffff, /* inc[2] */
-+    0x00000000, /* inc[3] */
-+    0x00000000, /* inc[4] */
-+    0x00000000, /* inc[5] */
-+    0x00000000, /* inc[6] */
-+    0x00000000, /* inc[7] */
-+};
-+
-+u32 MCD_varTab2[]=
-+{   /* Task 2 Variable Table */
-+    0x00000000, /* var[0] */
-+    0x00000000, /* var[1] */
-+    0x00000000, /* var[2] */
-+    0x00000000, /* var[3] */
-+    0x00000000, /* var[4] */
-+    0x00000000, /* var[5] */
-+    0x00000000, /* var[6] */
-+    0x00000000, /* var[7] */
-+    0x00000000, /* var[8] */
-+    0x00000000, /* var[9] */
-+    0x00000000, /* var[10] */
-+    0x00000000, /* var[11] */
-+    0x00000000, /* var[12] */
-+    0x00000000, /* var[13] */
-+    0x00000000, /* var[14] */
-+    0x00000000, /* var[15] */
-+    0x00000000, /* var[16] */
-+    0x00000000, /* var[17] */
-+    0x00000000, /* var[18] */
-+    0x00000000, /* var[19] */
-+    0x00000000, /* var[20] */
-+    0x00000000, /* var[21] */
-+    0x00000000, /* var[22] */
-+    0x00000000, /* var[23] */
-+    0xe0000000, /* inc[0] */
-+    0x20000000, /* inc[1] */
-+    0x2000ffff, /* inc[2] */
-+    0x00000000, /* inc[3] */
-+    0x00000000, /* inc[4] */
-+    0x00000000, /* inc[5] */
-+    0x00000000, /* inc[6] */
-+    0x00000000, /* inc[7] */
-+};
-+
-+u32 MCD_varTab3[]=
-+{   /* Task 3 Variable Table */
-+    0x00000000, /* var[0] */
-+    0x00000000, /* var[1] */
-+    0x00000000, /* var[2] */
-+    0x00000000, /* var[3] */
-+    0x00000000, /* var[4] */
-+    0x00000000, /* var[5] */
-+    0x00000000, /* var[6] */
-+    0x00000000, /* var[7] */
-+    0x00000000, /* var[8] */
-+    0x00000000, /* var[9] */
-+    0x00000000, /* var[10] */
-+    0x00000000, /* var[11] */
-+    0x00000000, /* var[12] */
-+    0x00000000, /* var[13] */
-+    0x00000000, /* var[14] */
-+    0x00000000, /* var[15] */
-+    0x00000000, /* var[16] */
-+    0x00000000, /* var[17] */
-+    0x00000000, /* var[18] */
-+    0x00000000, /* var[19] */
-+    0x00000000, /* var[20] */
-+    0x00000000, /* var[21] */
-+    0x00000000, /* var[22] */
-+    0x00000000, /* var[23] */
-+    0xe0000000, /* inc[0] */
-+    0x20000000, /* inc[1] */
-+    0x2000ffff, /* inc[2] */
-+    0x00000000, /* inc[3] */
-+    0x00000000, /* inc[4] */
-+    0x00000000, /* inc[5] */
-+    0x00000000, /* inc[6] */
-+    0x00000000, /* inc[7] */
-+};
-+
-+u32 MCD_varTab4[]=
-+{   /* Task 4 Variable Table */
-+    0x00000000, /* var[0] */
-+    0x00000000, /* var[1] */
-+    0x00000000, /* var[2] */
-+    0x00000000, /* var[3] */
-+    0x00000000, /* var[4] */
-+    0x00000000, /* var[5] */
-+    0x00000000, /* var[6] */
-+    0x00000000, /* var[7] */
-+    0x00000000, /* var[8] */
-+    0x00000000, /* var[9] */
-+    0x00000000, /* var[10] */
-+    0x00000000, /* var[11] */
-+    0x00000000, /* var[12] */
-+    0x00000000, /* var[13] */
-+    0x00000000, /* var[14] */
-+    0x00000000, /* var[15] */
-+    0x00000000, /* var[16] */
-+    0x00000000, /* var[17] */
-+    0x00000000, /* var[18] */
-+    0x00000000, /* var[19] */
-+    0x00000000, /* var[20] */
-+    0x00000000, /* var[21] */
-+    0x00000000, /* var[22] */
-+    0x00000000, /* var[23] */
-+    0xe0000000, /* inc[0] */
-+    0x20000000, /* inc[1] */
-+    0x2000ffff, /* inc[2] */
-+    0x00000000, /* inc[3] */
-+    0x00000000, /* inc[4] */
-+    0x00000000, /* inc[5] */
-+    0x00000000, /* inc[6] */
-+    0x00000000, /* inc[7] */
-+};
-+
-+u32 MCD_varTab5[]=
-+{   /* Task 5 Variable Table */
-+    0x00000000, /* var[0] */
-+    0x00000000, /* var[1] */
-+    0x00000000, /* var[2] */
-+    0x00000000, /* var[3] */
-+    0x00000000, /* var[4] */
-+    0x00000000, /* var[5] */
-+    0x00000000, /* var[6] */
-+    0x00000000, /* var[7] */
-+    0x00000000, /* var[8] */
-+    0x00000000, /* var[9] */
-+    0x00000000, /* var[10] */
-+    0x00000000, /* var[11] */
-+    0x00000000, /* var[12] */
-+    0x00000000, /* var[13] */
-+    0x00000000, /* var[14] */
-+    0x00000000, /* var[15] */
-+    0x00000000, /* var[16] */
-+    0x00000000, /* var[17] */
-+    0x00000000, /* var[18] */
-+    0x00000000, /* var[19] */
-+    0x00000000, /* var[20] */
-+    0x00000000, /* var[21] */
-+    0x00000000, /* var[22] */
-+    0x00000000, /* var[23] */
-+    0xe0000000, /* inc[0] */
-+    0x20000000, /* inc[1] */
-+    0x2000ffff, /* inc[2] */
-+    0x00000000, /* inc[3] */
-+    0x00000000, /* inc[4] */
-+    0x00000000, /* inc[5] */
-+    0x00000000, /* inc[6] */
-+    0x00000000, /* inc[7] */
-+};
-+
-+u32 MCD_varTab6[]=
-+{   /* Task 6 Variable Table */
-+    0x00000000, /* var[0] */
-+    0x00000000, /* var[1] */
-+    0x00000000, /* var[2] */
-+    0x00000000, /* var[3] */
-+    0x00000000, /* var[4] */
-+    0x00000000, /* var[5] */
-+    0x00000000, /* var[6] */
-+    0x00000000, /* var[7] */
-+    0x00000000, /* var[8] */
-+    0x00000000, /* var[9] */
-+    0x00000000, /* var[10] */
-+    0x00000000, /* var[11] */
-+    0x00000000, /* var[12] */
-+    0x00000000, /* var[13] */
-+    0x00000000, /* var[14] */
-+    0x00000000, /* var[15] */
-+    0x00000000, /* var[16] */
-+    0x00000000, /* var[17] */
-+    0x00000000, /* var[18] */
-+    0x00000000, /* var[19] */
-+    0x00000000, /* var[20] */
-+    0x00000000, /* var[21] */
-+    0x00000000, /* var[22] */
-+    0x00000000, /* var[23] */
-+    0xe0000000, /* inc[0] */
-+    0x20000000, /* inc[1] */
-+    0x2000ffff, /* inc[2] */
-+    0x00000000, /* inc[3] */
-+    0x00000000, /* inc[4] */
-+    0x00000000, /* inc[5] */
-+    0x00000000, /* inc[6] */
-+    0x00000000, /* inc[7] */
-+};
-+
-+u32 MCD_varTab7[]=
-+{   /* Task 7 Variable Table */
-+    0x00000000, /* var[0] */
-+    0x00000000, /* var[1] */
-+    0x00000000, /* var[2] */
-+    0x00000000, /* var[3] */
-+    0x00000000, /* var[4] */
-+    0x00000000, /* var[5] */
-+    0x00000000, /* var[6] */
-+    0x00000000, /* var[7] */
-+    0x00000000, /* var[8] */
-+    0x00000000, /* var[9] */
-+    0x00000000, /* var[10] */
-+    0x00000000, /* var[11] */
-+    0x00000000, /* var[12] */
-+    0x00000000, /* var[13] */
-+    0x00000000, /* var[14] */
-+    0x00000000, /* var[15] */
-+    0x00000000, /* var[16] */
-+    0x00000000, /* var[17] */
-+    0x00000000, /* var[18] */
-+    0x00000000, /* var[19] */
-+    0x00000000, /* var[20] */
-+    0x00000000, /* var[21] */
-+    0x00000000, /* var[22] */
-+    0x00000000, /* var[23] */
-+    0xe0000000, /* inc[0] */
-+    0x20000000, /* inc[1] */
-+    0x2000ffff, /* inc[2] */
-+    0x00000000, /* inc[3] */
-+    0x00000000, /* inc[4] */
-+    0x00000000, /* inc[5] */
-+    0x00000000, /* inc[6] */
-+    0x00000000, /* inc[7] */
-+};
-+
-+u32 MCD_varTab8[]=
-+{   /* Task 8 Variable Table */
-+    0x00000000, /* var[0] */
-+    0x00000000, /* var[1] */
-+    0x00000000, /* var[2] */
-+    0x00000000, /* var[3] */
-+    0x00000000, /* var[4] */
-+    0x00000000, /* var[5] */
-+    0x00000000, /* var[6] */
-+    0x00000000, /* var[7] */
-+    0x00000000, /* var[8] */
-+    0x00000000, /* var[9] */
-+    0x00000000, /* var[10] */
-+    0x00000000, /* var[11] */
-+    0x00000000, /* var[12] */
-+    0x00000000, /* var[13] */
-+    0x00000000, /* var[14] */
-+    0x00000000, /* var[15] */
-+    0x00000000, /* var[16] */
-+    0x00000000, /* var[17] */
-+    0x00000000, /* var[18] */
-+    0x00000000, /* var[19] */
-+    0x00000000, /* var[20] */
-+    0x00000000, /* var[21] */
-+    0x00000000, /* var[22] */
-+    0x00000000, /* var[23] */
-+    0xe0000000, /* inc[0] */
-+    0x20000000, /* inc[1] */
-+    0x2000ffff, /* inc[2] */
-+    0x00000000, /* inc[3] */
-+    0x00000000, /* inc[4] */
-+    0x00000000, /* inc[5] */
-+    0x00000000, /* inc[6] */
-+    0x00000000, /* inc[7] */
-+};
-+
-+u32 MCD_varTab9[]=
-+{   /* Task 9 Variable Table */
-+    0x00000000, /* var[0] */
-+    0x00000000, /* var[1] */
-+    0x00000000, /* var[2] */
-+    0x00000000, /* var[3] */
-+    0x00000000, /* var[4] */
-+    0x00000000, /* var[5] */
-+    0x00000000, /* var[6] */
-+    0x00000000, /* var[7] */
-+    0x00000000, /* var[8] */
-+    0x00000000, /* var[9] */
-+    0x00000000, /* var[10] */
-+    0x00000000, /* var[11] */
-+    0x00000000, /* var[12] */
-+    0x00000000, /* var[13] */
-+    0x00000000, /* var[14] */
-+    0x00000000, /* var[15] */
-+    0x00000000, /* var[16] */
-+    0x00000000, /* var[17] */
-+    0x00000000, /* var[18] */
-+    0x00000000, /* var[19] */
-+    0x00000000, /* var[20] */
-+    0x00000000, /* var[21] */
-+    0x00000000, /* var[22] */
-+    0x00000000, /* var[23] */
-+    0xe0000000, /* inc[0] */
-+    0x20000000, /* inc[1] */
-+    0x2000ffff, /* inc[2] */
-+    0x00000000, /* inc[3] */
-+    0x00000000, /* inc[4] */
-+    0x00000000, /* inc[5] */
-+    0x00000000, /* inc[6] */
-+    0x00000000, /* inc[7] */
-+};
-+
-+u32 MCD_varTab10[]=
-+{   /* Task 10 Variable Table */
-+    0x00000000, /* var[0] */
-+    0x00000000, /* var[1] */
-+    0x00000000, /* var[2] */
-+    0x00000000, /* var[3] */
-+    0x00000000, /* var[4] */
-+    0x00000000, /* var[5] */
-+    0x00000000, /* var[6] */
-+    0x00000000, /* var[7] */
-+    0x00000000, /* var[8] */
-+    0x00000000, /* var[9] */
-+    0x00000000, /* var[10] */
-+    0x00000000, /* var[11] */
-+    0x00000000, /* var[12] */
-+    0x00000000, /* var[13] */
-+    0x00000000, /* var[14] */
-+    0x00000000, /* var[15] */
-+    0x00000000, /* var[16] */
-+    0x00000000, /* var[17] */
-+    0x00000000, /* var[18] */
-+    0x00000000, /* var[19] */
-+    0x00000000, /* var[20] */
-+    0x00000000, /* var[21] */
-+    0x00000000, /* var[22] */
-+    0x00000000, /* var[23] */
-+    0xe0000000, /* inc[0] */
-+    0x20000000, /* inc[1] */
-+    0x2000ffff, /* inc[2] */
-+    0x00000000, /* inc[3] */
-+    0x00000000, /* inc[4] */
-+    0x00000000, /* inc[5] */
-+    0x00000000, /* inc[6] */
-+    0x00000000, /* inc[7] */
-+};
-+
-+u32 MCD_varTab11[]=
-+{   /* Task 11 Variable Table */
-+    0x00000000, /* var[0] */
-+    0x00000000, /* var[1] */
-+    0x00000000, /* var[2] */
-+    0x00000000, /* var[3] */
-+    0x00000000, /* var[4] */
-+    0x00000000, /* var[5] */
-+    0x00000000, /* var[6] */
-+    0x00000000, /* var[7] */
-+    0x00000000, /* var[8] */
-+    0x00000000, /* var[9] */
-+    0x00000000, /* var[10] */
-+    0x00000000, /* var[11] */
-+    0x00000000, /* var[12] */
-+    0x00000000, /* var[13] */
-+    0x00000000, /* var[14] */
-+    0x00000000, /* var[15] */
-+    0x00000000, /* var[16] */
-+    0x00000000, /* var[17] */
-+    0x00000000, /* var[18] */
-+    0x00000000, /* var[19] */
-+    0x00000000, /* var[20] */
-+    0x00000000, /* var[21] */
-+    0x00000000, /* var[22] */
-+    0x00000000, /* var[23] */
-+    0xe0000000, /* inc[0] */
-+    0x20000000, /* inc[1] */
-+    0x2000ffff, /* inc[2] */
-+    0x00000000, /* inc[3] */
-+    0x00000000, /* inc[4] */
-+    0x00000000, /* inc[5] */
-+    0x00000000, /* inc[6] */
-+    0x00000000, /* inc[7] */
-+};
-+
-+u32 MCD_varTab12[]=
-+{   /* Task 12 Variable Table */
-+    0x00000000, /* var[0] */
-+    0x00000000, /* var[1] */
-+    0x00000000, /* var[2] */
-+    0x00000000, /* var[3] */
-+    0x00000000, /* var[4] */
-+    0x00000000, /* var[5] */
-+    0x00000000, /* var[6] */
-+    0x00000000, /* var[7] */
-+    0x00000000, /* var[8] */
-+    0x00000000, /* var[9] */
-+    0x00000000, /* var[10] */
-+    0x00000000, /* var[11] */
-+    0x00000000, /* var[12] */
-+    0x00000000, /* var[13] */
-+    0x00000000, /* var[14] */
-+    0x00000000, /* var[15] */
-+    0x00000000, /* var[16] */
-+    0x00000000, /* var[17] */
-+    0x00000000, /* var[18] */
-+    0x00000000, /* var[19] */
-+    0x00000000, /* var[20] */
-+    0x00000000, /* var[21] */
-+    0x00000000, /* var[22] */
-+    0x00000000, /* var[23] */
-+    0xe0000000, /* inc[0] */
-+    0x20000000, /* inc[1] */
-+    0x2000ffff, /* inc[2] */
-+    0x00000000, /* inc[3] */
-+    0x00000000, /* inc[4] */
-+    0x00000000, /* inc[5] */
-+    0x00000000, /* inc[6] */
-+    0x00000000, /* inc[7] */
-+};
-+
-+u32 MCD_varTab13[]=
-+{   /* Task 13 Variable Table */
-+    0x00000000, /* var[0] */
-+    0x00000000, /* var[1] */
-+    0x00000000, /* var[2] */
-+    0x00000000, /* var[3] */
-+    0x00000000, /* var[4] */
-+    0x00000000, /* var[5] */
-+    0x00000000, /* var[6] */
-+    0x00000000, /* var[7] */
-+    0x00000000, /* var[8] */
-+    0x00000000, /* var[9] */
-+    0x00000000, /* var[10] */
-+    0x00000000, /* var[11] */
-+    0x00000000, /* var[12] */
-+    0x00000000, /* var[13] */
-+    0x00000000, /* var[14] */
-+    0x00000000, /* var[15] */
-+    0x00000000, /* var[16] */
-+    0x00000000, /* var[17] */
-+    0x00000000, /* var[18] */
-+    0x00000000, /* var[19] */
-+    0x00000000, /* var[20] */
-+    0x00000000, /* var[21] */
-+    0x00000000, /* var[22] */
-+    0x00000000, /* var[23] */
-+    0xe0000000, /* inc[0] */
-+    0x20000000, /* inc[1] */
-+    0x2000ffff, /* inc[2] */
-+    0x00000000, /* inc[3] */
-+    0x00000000, /* inc[4] */
-+    0x00000000, /* inc[5] */
-+    0x00000000, /* inc[6] */
-+    0x00000000, /* inc[7] */
-+};
-+
-+u32 MCD_varTab14[]=
-+{   /* Task 14 Variable Table */
-+    0x00000000, /* var[0] */
-+    0x00000000, /* var[1] */
-+    0x00000000, /* var[2] */
-+    0x00000000, /* var[3] */
-+    0x00000000, /* var[4] */
-+    0x00000000, /* var[5] */
-+    0x00000000, /* var[6] */
-+    0x00000000, /* var[7] */
-+    0x00000000, /* var[8] */
-+    0x00000000, /* var[9] */
-+    0x00000000, /* var[10] */
-+    0x00000000, /* var[11] */
-+    0x00000000, /* var[12] */
-+    0x00000000, /* var[13] */
-+    0x00000000, /* var[14] */
-+    0x00000000, /* var[15] */
-+    0x00000000, /* var[16] */
-+    0x00000000, /* var[17] */
-+    0x00000000, /* var[18] */
-+    0x00000000, /* var[19] */
-+    0x00000000, /* var[20] */
-+    0x00000000, /* var[21] */
-+    0x00000000, /* var[22] */
-+    0x00000000, /* var[23] */
-+    0xe0000000, /* inc[0] */
-+    0x20000000, /* inc[1] */
-+    0x2000ffff, /* inc[2] */
-+    0x00000000, /* inc[3] */
-+    0x00000000, /* inc[4] */
-+    0x00000000, /* inc[5] */
-+    0x00000000, /* inc[6] */
-+    0x00000000, /* inc[7] */
-+};
-+
-+u32 MCD_varTab15[]=
-+{   /* Task 15 Variable Table */
-+    0x00000000, /* var[0] */
-+    0x00000000, /* var[1] */
-+    0x00000000, /* var[2] */
-+    0x00000000, /* var[3] */
-+    0x00000000, /* var[4] */
-+    0x00000000, /* var[5] */
-+    0x00000000, /* var[6] */
-+    0x00000000, /* var[7] */
-+    0x00000000, /* var[8] */
-+    0x00000000, /* var[9] */
-+    0x00000000, /* var[10] */
-+    0x00000000, /* var[11] */
-+    0x00000000, /* var[12] */
-+    0x00000000, /* var[13] */
-+    0x00000000, /* var[14] */
-+    0x00000000, /* var[15] */
-+    0x00000000, /* var[16] */
-+    0x00000000, /* var[17] */
-+    0x00000000, /* var[18] */
-+    0x00000000, /* var[19] */
-+    0x00000000, /* var[20] */
-+    0x00000000, /* var[21] */
-+    0x00000000, /* var[22] */
-+    0x00000000, /* var[23] */
-+    0xe0000000, /* inc[0] */
-+    0x20000000, /* inc[1] */
-+    0x2000ffff, /* inc[2] */
-+    0x00000000, /* inc[3] */
-+    0x00000000, /* inc[4] */
-+    0x00000000, /* inc[5] */
-+    0x00000000, /* inc[6] */
-+    0x00000000, /* inc[7] */
-+};
-+
-+u32 MCD_funcDescTab0[]=
-+{   /* Task 0 Function Descriptor Table */
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0xa0045670, /* mainFunc(), EU# 3 */
-+    0xa0000000, /* rsduFunc(), EU# 3 */
-+    0xa0000000, /* crcAccumVal(), EU# 3 */
-+    0x20000000, /* setCrcAccum(), EU# 3 */
-+    0x21800000, /* and(), EU# 3 */
-+    0x21e00000, /* or(), EU# 3 */
-+    0x20400000, /* add(), EU# 3 */
-+    0x20500000, /* sub(), EU# 3 */
-+    0x205a0000, /* andNot(), EU# 3 */
-+    0x202fa000, /* andReadyBit(), EU# 3 */
-+    0x202f9000, /* andNotReadyBit(), EU# 3 */
-+    0x202ea000, /* andWrapBit(), EU# 3 */
-+    0x202da000, /* andEndFrameBit(), EU# 3 */
-+    0x202e2000, /* andInterruptBit(), EU# 3 */
-+    0x202f2000, /* andLoopBit(), EU# 3 */
-+    0x2020a000, /* andCrcRestartBit(), EU# 3 */
-+};
-+
-+#ifdef MCD_INCLUDE_EU
-+u32 MCD_funcDescTab1[]=
-+{   /* Task 1 Function Descriptor Table */
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0xa0045670, /* mainFunc(), EU# 3 */
-+    0xa0000000, /* rsduFunc(), EU# 3 */
-+    0xa0000000, /* crcAccumVal(), EU# 3 */
-+    0x20000000, /* setCrcAccum(), EU# 3 */
-+    0x21800000, /* and(), EU# 3 */
-+    0x21e00000, /* or(), EU# 3 */
-+    0x20400000, /* add(), EU# 3 */
-+    0x20500000, /* sub(), EU# 3 */
-+    0x205a0000, /* andNot(), EU# 3 */
-+    0x202fa000, /* andReadyBit(), EU# 3 */
-+    0x202f9000, /* andNotReadyBit(), EU# 3 */
-+    0x202ea000, /* andWrapBit(), EU# 3 */
-+    0x202da000, /* andEndFrameBit(), EU# 3 */
-+    0x202e2000, /* andInterruptBit(), EU# 3 */
-+    0x202f2000, /* andLoopBit(), EU# 3 */
-+    0x2020a000, /* andCrcRestartBit(), EU# 3 */
-+};
-+
-+u32 MCD_funcDescTab2[]=
-+{   /* Task 2 Function Descriptor Table */
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0xa0045670, /* mainFunc(), EU# 3 */
-+    0xa0000000, /* rsduFunc(), EU# 3 */
-+    0xa0000000, /* crcAccumVal(), EU# 3 */
-+    0x20000000, /* setCrcAccum(), EU# 3 */
-+    0x21800000, /* and(), EU# 3 */
-+    0x21e00000, /* or(), EU# 3 */
-+    0x20400000, /* add(), EU# 3 */
-+    0x20500000, /* sub(), EU# 3 */
-+    0x205a0000, /* andNot(), EU# 3 */
-+    0x202fa000, /* andReadyBit(), EU# 3 */
-+    0x202f9000, /* andNotReadyBit(), EU# 3 */
-+    0x202ea000, /* andWrapBit(), EU# 3 */
-+    0x202da000, /* andEndFrameBit(), EU# 3 */
-+    0x202e2000, /* andInterruptBit(), EU# 3 */
-+    0x202f2000, /* andLoopBit(), EU# 3 */
-+    0x2020a000, /* andCrcRestartBit(), EU# 3 */
-+};
-+
-+u32 MCD_funcDescTab3[]=
-+{   /* Task 3 Function Descriptor Table */
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0xa0045670, /* mainFunc(), EU# 3 */
-+    0xa0000000, /* rsduFunc(), EU# 3 */
-+    0xa0000000, /* crcAccumVal(), EU# 3 */
-+    0x20000000, /* setCrcAccum(), EU# 3 */
-+    0x21800000, /* and(), EU# 3 */
-+    0x21e00000, /* or(), EU# 3 */
-+    0x20400000, /* add(), EU# 3 */
-+    0x20500000, /* sub(), EU# 3 */
-+    0x205a0000, /* andNot(), EU# 3 */
-+    0x202fa000, /* andReadyBit(), EU# 3 */
-+    0x202f9000, /* andNotReadyBit(), EU# 3 */
-+    0x202ea000, /* andWrapBit(), EU# 3 */
-+    0x202da000, /* andEndFrameBit(), EU# 3 */
-+    0x202e2000, /* andInterruptBit(), EU# 3 */
-+    0x202f2000, /* andLoopBit(), EU# 3 */
-+    0x2020a000, /* andCrcRestartBit(), EU# 3 */
-+};
-+
-+u32 MCD_funcDescTab4[]=
-+{   /* Task 4 Function Descriptor Table */
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0xa0045670, /* mainFunc(), EU# 3 */
-+    0xa0000000, /* rsduFunc(), EU# 3 */
-+    0xa0000000, /* crcAccumVal(), EU# 3 */
-+    0x20000000, /* setCrcAccum(), EU# 3 */
-+    0x21800000, /* and(), EU# 3 */
-+    0x21e00000, /* or(), EU# 3 */
-+    0x20400000, /* add(), EU# 3 */
-+    0x20500000, /* sub(), EU# 3 */
-+    0x205a0000, /* andNot(), EU# 3 */
-+    0x202fa000, /* andReadyBit(), EU# 3 */
-+    0x202f9000, /* andNotReadyBit(), EU# 3 */
-+    0x202ea000, /* andWrapBit(), EU# 3 */
-+    0x202da000, /* andEndFrameBit(), EU# 3 */
-+    0x202e2000, /* andInterruptBit(), EU# 3 */
-+    0x202f2000, /* andLoopBit(), EU# 3 */
-+    0x2020a000, /* andCrcRestartBit(), EU# 3 */
-+};
-+
-+u32 MCD_funcDescTab5[]=
-+{   /* Task 5 Function Descriptor Table */
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0xa0045670, /* mainFunc(), EU# 3 */
-+    0xa0000000, /* rsduFunc(), EU# 3 */
-+    0xa0000000, /* crcAccumVal(), EU# 3 */
-+    0x20000000, /* setCrcAccum(), EU# 3 */
-+    0x21800000, /* and(), EU# 3 */
-+    0x21e00000, /* or(), EU# 3 */
-+    0x20400000, /* add(), EU# 3 */
-+    0x20500000, /* sub(), EU# 3 */
-+    0x205a0000, /* andNot(), EU# 3 */
-+    0x202fa000, /* andReadyBit(), EU# 3 */
-+    0x202f9000, /* andNotReadyBit(), EU# 3 */
-+    0x202ea000, /* andWrapBit(), EU# 3 */
-+    0x202da000, /* andEndFrameBit(), EU# 3 */
-+    0x202e2000, /* andInterruptBit(), EU# 3 */
-+    0x202f2000, /* andLoopBit(), EU# 3 */
-+    0x2020a000, /* andCrcRestartBit(), EU# 3 */
-+};
-+
-+u32 MCD_funcDescTab6[]=
-+{   /* Task 6 Function Descriptor Table */
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0xa0045670, /* mainFunc(), EU# 3 */
-+    0xa0000000, /* rsduFunc(), EU# 3 */
-+    0xa0000000, /* crcAccumVal(), EU# 3 */
-+    0x20000000, /* setCrcAccum(), EU# 3 */
-+    0x21800000, /* and(), EU# 3 */
-+    0x21e00000, /* or(), EU# 3 */
-+    0x20400000, /* add(), EU# 3 */
-+    0x20500000, /* sub(), EU# 3 */
-+    0x205a0000, /* andNot(), EU# 3 */
-+    0x202fa000, /* andReadyBit(), EU# 3 */
-+    0x202f9000, /* andNotReadyBit(), EU# 3 */
-+    0x202ea000, /* andWrapBit(), EU# 3 */
-+    0x202da000, /* andEndFrameBit(), EU# 3 */
-+    0x202e2000, /* andInterruptBit(), EU# 3 */
-+    0x202f2000, /* andLoopBit(), EU# 3 */
-+    0x2020a000, /* andCrcRestartBit(), EU# 3 */
-+};
-+
-+u32 MCD_funcDescTab7[]=
-+{   /* Task 7 Function Descriptor Table */
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0xa0045670, /* mainFunc(), EU# 3 */
-+    0xa0000000, /* rsduFunc(), EU# 3 */
-+    0xa0000000, /* crcAccumVal(), EU# 3 */
-+    0x20000000, /* setCrcAccum(), EU# 3 */
-+    0x21800000, /* and(), EU# 3 */
-+    0x21e00000, /* or(), EU# 3 */
-+    0x20400000, /* add(), EU# 3 */
-+    0x20500000, /* sub(), EU# 3 */
-+    0x205a0000, /* andNot(), EU# 3 */
-+    0x202fa000, /* andReadyBit(), EU# 3 */
-+    0x202f9000, /* andNotReadyBit(), EU# 3 */
-+    0x202ea000, /* andWrapBit(), EU# 3 */
-+    0x202da000, /* andEndFrameBit(), EU# 3 */
-+    0x202e2000, /* andInterruptBit(), EU# 3 */
-+    0x202f2000, /* andLoopBit(), EU# 3 */
-+    0x2020a000, /* andCrcRestartBit(), EU# 3 */
-+};
-+
-+u32 MCD_funcDescTab8[]=
-+{   /* Task 8 Function Descriptor Table */
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0xa0045670, /* mainFunc(), EU# 3 */
-+    0xa0000000, /* rsduFunc(), EU# 3 */
-+    0xa0000000, /* crcAccumVal(), EU# 3 */
-+    0x20000000, /* setCrcAccum(), EU# 3 */
-+    0x21800000, /* and(), EU# 3 */
-+    0x21e00000, /* or(), EU# 3 */
-+    0x20400000, /* add(), EU# 3 */
-+    0x20500000, /* sub(), EU# 3 */
-+    0x205a0000, /* andNot(), EU# 3 */
-+    0x202fa000, /* andReadyBit(), EU# 3 */
-+    0x202f9000, /* andNotReadyBit(), EU# 3 */
-+    0x202ea000, /* andWrapBit(), EU# 3 */
-+    0x202da000, /* andEndFrameBit(), EU# 3 */
-+    0x202e2000, /* andInterruptBit(), EU# 3 */
-+    0x202f2000, /* andLoopBit(), EU# 3 */
-+    0x2020a000, /* andCrcRestartBit(), EU# 3 */
-+};
-+
-+u32 MCD_funcDescTab9[]=
-+{   /* Task 9 Function Descriptor Table */
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0xa0045670, /* mainFunc(), EU# 3 */
-+    0xa0000000, /* rsduFunc(), EU# 3 */
-+    0xa0000000, /* crcAccumVal(), EU# 3 */
-+    0x20000000, /* setCrcAccum(), EU# 3 */
-+    0x21800000, /* and(), EU# 3 */
-+    0x21e00000, /* or(), EU# 3 */
-+    0x20400000, /* add(), EU# 3 */
-+    0x20500000, /* sub(), EU# 3 */
-+    0x205a0000, /* andNot(), EU# 3 */
-+    0x202fa000, /* andReadyBit(), EU# 3 */
-+    0x202f9000, /* andNotReadyBit(), EU# 3 */
-+    0x202ea000, /* andWrapBit(), EU# 3 */
-+    0x202da000, /* andEndFrameBit(), EU# 3 */
-+    0x202e2000, /* andInterruptBit(), EU# 3 */
-+    0x202f2000, /* andLoopBit(), EU# 3 */
-+    0x2020a000, /* andCrcRestartBit(), EU# 3 */
-+};
-+
-+u32 MCD_funcDescTab10[]=
-+{   /* Task 10 Function Descriptor Table */
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0xa0045670, /* mainFunc(), EU# 3 */
-+    0xa0000000, /* rsduFunc(), EU# 3 */
-+    0xa0000000, /* crcAccumVal(), EU# 3 */
-+    0x20000000, /* setCrcAccum(), EU# 3 */
-+    0x21800000, /* and(), EU# 3 */
-+    0x21e00000, /* or(), EU# 3 */
-+    0x20400000, /* add(), EU# 3 */
-+    0x20500000, /* sub(), EU# 3 */
-+    0x205a0000, /* andNot(), EU# 3 */
-+    0x202fa000, /* andReadyBit(), EU# 3 */
-+    0x202f9000, /* andNotReadyBit(), EU# 3 */
-+    0x202ea000, /* andWrapBit(), EU# 3 */
-+    0x202da000, /* andEndFrameBit(), EU# 3 */
-+    0x202e2000, /* andInterruptBit(), EU# 3 */
-+    0x202f2000, /* andLoopBit(), EU# 3 */
-+    0x2020a000, /* andCrcRestartBit(), EU# 3 */
-+};
-+
-+u32 MCD_funcDescTab11[]=
-+{   /* Task 11 Function Descriptor Table */
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0xa0045670, /* mainFunc(), EU# 3 */
-+    0xa0000000, /* rsduFunc(), EU# 3 */
-+    0xa0000000, /* crcAccumVal(), EU# 3 */
-+    0x20000000, /* setCrcAccum(), EU# 3 */
-+    0x21800000, /* and(), EU# 3 */
-+    0x21e00000, /* or(), EU# 3 */
-+    0x20400000, /* add(), EU# 3 */
-+    0x20500000, /* sub(), EU# 3 */
-+    0x205a0000, /* andNot(), EU# 3 */
-+    0x202fa000, /* andReadyBit(), EU# 3 */
-+    0x202f9000, /* andNotReadyBit(), EU# 3 */
-+    0x202ea000, /* andWrapBit(), EU# 3 */
-+    0x202da000, /* andEndFrameBit(), EU# 3 */
-+    0x202e2000, /* andInterruptBit(), EU# 3 */
-+    0x202f2000, /* andLoopBit(), EU# 3 */
-+    0x2020a000, /* andCrcRestartBit(), EU# 3 */
-+};
-+
-+u32 MCD_funcDescTab12[]=
-+{   /* Task 12 Function Descriptor Table */
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0xa0045670, /* mainFunc(), EU# 3 */
-+    0xa0000000, /* rsduFunc(), EU# 3 */
-+    0xa0000000, /* crcAccumVal(), EU# 3 */
-+    0x20000000, /* setCrcAccum(), EU# 3 */
-+    0x21800000, /* and(), EU# 3 */
-+    0x21e00000, /* or(), EU# 3 */
-+    0x20400000, /* add(), EU# 3 */
-+    0x20500000, /* sub(), EU# 3 */
-+    0x205a0000, /* andNot(), EU# 3 */
-+    0x202fa000, /* andReadyBit(), EU# 3 */
-+    0x202f9000, /* andNotReadyBit(), EU# 3 */
-+    0x202ea000, /* andWrapBit(), EU# 3 */
-+    0x202da000, /* andEndFrameBit(), EU# 3 */
-+    0x202e2000, /* andInterruptBit(), EU# 3 */
-+    0x202f2000, /* andLoopBit(), EU# 3 */
-+    0x2020a000, /* andCrcRestartBit(), EU# 3 */
-+};
-+
-+u32 MCD_funcDescTab13[]=
-+{   /* Task 13 Function Descriptor Table */
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0xa0045670, /* mainFunc(), EU# 3 */
-+    0xa0000000, /* rsduFunc(), EU# 3 */
-+    0xa0000000, /* crcAccumVal(), EU# 3 */
-+    0x20000000, /* setCrcAccum(), EU# 3 */
-+    0x21800000, /* and(), EU# 3 */
-+    0x21e00000, /* or(), EU# 3 */
-+    0x20400000, /* add(), EU# 3 */
-+    0x20500000, /* sub(), EU# 3 */
-+    0x205a0000, /* andNot(), EU# 3 */
-+    0x202fa000, /* andReadyBit(), EU# 3 */
-+    0x202f9000, /* andNotReadyBit(), EU# 3 */
-+    0x202ea000, /* andWrapBit(), EU# 3 */
-+    0x202da000, /* andEndFrameBit(), EU# 3 */
-+    0x202e2000, /* andInterruptBit(), EU# 3 */
-+    0x202f2000, /* andLoopBit(), EU# 3 */
-+    0x2020a000, /* andCrcRestartBit(), EU# 3 */
-+};
-+
-+u32 MCD_funcDescTab14[]=
-+{   /* Task 14 Function Descriptor Table */
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0xa0045670, /* mainFunc(), EU# 3 */
-+    0xa0000000, /* rsduFunc(), EU# 3 */
-+    0xa0000000, /* crcAccumVal(), EU# 3 */
-+    0x20000000, /* setCrcAccum(), EU# 3 */
-+    0x21800000, /* and(), EU# 3 */
-+    0x21e00000, /* or(), EU# 3 */
-+    0x20400000, /* add(), EU# 3 */
-+    0x20500000, /* sub(), EU# 3 */
-+    0x205a0000, /* andNot(), EU# 3 */
-+    0x202fa000, /* andReadyBit(), EU# 3 */
-+    0x202f9000, /* andNotReadyBit(), EU# 3 */
-+    0x202ea000, /* andWrapBit(), EU# 3 */
-+    0x202da000, /* andEndFrameBit(), EU# 3 */
-+    0x202e2000, /* andInterruptBit(), EU# 3 */
-+    0x202f2000, /* andLoopBit(), EU# 3 */
-+    0x2020a000, /* andCrcRestartBit(), EU# 3 */
-+};
-+
-+u32 MCD_funcDescTab15[]=
-+{   /* Task 15 Function Descriptor Table */
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0xa0045670, /* mainFunc(), EU# 3 */
-+    0xa0000000, /* rsduFunc(), EU# 3 */
-+    0xa0000000, /* crcAccumVal(), EU# 3 */
-+    0x20000000, /* setCrcAccum(), EU# 3 */
-+    0x21800000, /* and(), EU# 3 */
-+    0x21e00000, /* or(), EU# 3 */
-+    0x20400000, /* add(), EU# 3 */
-+    0x20500000, /* sub(), EU# 3 */
-+    0x205a0000, /* andNot(), EU# 3 */
-+    0x202fa000, /* andReadyBit(), EU# 3 */
-+    0x202f9000, /* andNotReadyBit(), EU# 3 */
-+    0x202ea000, /* andWrapBit(), EU# 3 */
-+    0x202da000, /* andEndFrameBit(), EU# 3 */
-+    0x202e2000, /* andInterruptBit(), EU# 3 */
-+    0x202f2000, /* andLoopBit(), EU# 3 */
-+    0x2020a000, /* andCrcRestartBit(), EU# 3 */
-+};
-+#endif /*MCD_INCLUDE_EU*/
-+
-+u32 MCD_contextSave0[128];  /* Task 0 context save space */
-+u32 MCD_contextSave1[128];  /* Task 1 context save space */
-+u32 MCD_contextSave2[128];  /* Task 2 context save space */
-+u32 MCD_contextSave3[128];  /* Task 3 context save space */
-+u32 MCD_contextSave4[128];  /* Task 4 context save space */
-+u32 MCD_contextSave5[128];  /* Task 5 context save space */
-+u32 MCD_contextSave6[128];  /* Task 6 context save space */
-+u32 MCD_contextSave7[128];  /* Task 7 context save space */
-+u32 MCD_contextSave8[128];  /* Task 8 context save space */
-+u32 MCD_contextSave9[128];  /* Task 9 context save space */
-+u32 MCD_contextSave10[128]; /* Task 10 context save space */
-+u32 MCD_contextSave11[128]; /* Task 11 context save space */
-+u32 MCD_contextSave12[128]; /* Task 12 context save space */
-+u32 MCD_contextSave13[128]; /* Task 13 context save space */
-+u32 MCD_contextSave14[128]; /* Task 14 context save space */
-+u32 MCD_contextSave15[128]; /* Task 15 context save space */
-+
-+/* Task Descriptor Tables - the guts */
-+u32 MCD_ChainNoEu_TDT[];
-+u32 MCD_SingleNoEu_TDT[];
-+#ifdef MCD_INCLUDE_EU
-+u32 MCD_ChainEu_TDT[];
-+u32 MCD_SingleEu_TDT[];
-+#endif
-+u32 MCD_ENetRcv_TDT[];
-+u32 MCD_ENetXmit_TDT[];
-+
-+u32 MCD_modelTaskTableSrc[]=
-+{
-+    (u32)MCD_ChainNoEu_TDT,
-+    (u32)&((u8*)MCD_ChainNoEu_TDT)[0x00000178],
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    (u32)MCD_SingleNoEu_TDT,
-+    (u32)&((u8*)MCD_SingleNoEu_TDT)[0x000000d4],
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+#ifdef MCD_INCLUDE_EU
-+    (u32)MCD_ChainEu_TDT,
-+    (u32)&((u8*)MCD_ChainEu_TDT)[0x00000180],
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    (u32)MCD_SingleEu_TDT,
-+    (u32)&((u8*)MCD_SingleEu_TDT)[0x000000dc],
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+#endif
-+    (u32)MCD_ENetRcv_TDT,
-+    (u32)&((u8*)MCD_ENetRcv_TDT)[0x0000009C],
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    (u32)MCD_ENetXmit_TDT,
-+    (u32)&((u8*)MCD_ENetXmit_TDT)[0x000000d0],
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+    0x00000000,
-+};
-+
-+u32 MCD_ChainNoEu_TDT[]=
-+{
-+    0x80004000, /* 0000(:370):  LCDEXT: idx0 = 0x00000000; ; */
-+    0x8118801b, /* 0004(:370):  LCD: idx1 = var2; idx1 once var0; idx1 += inc3 */
-+    0xb8ca0018, /* 0008(:371):    LCD: idx2 = *(idx1 + var20); idx2 once var0; idx2 += inc3 */
-+    0x10004b10, /* 000C(:372):      DRD1A: var18 = idx2; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x7000000c, /* 0010(:373):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=12 EXT MORE init=0 WS=0 RS=0 */
-+    0x024cf89f, /* 0014(:373):      DRD2B1: var9 = EU3(); EU3(idx2)  */
-+    0x60000009, /* 0018(:374):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=9 EXT init=0 WS=0 RS=0 */
-+    0x080cf89f, /* 001C(:374):      DRD2B1: idx0 = EU3(); EU3(idx2)  */
-+    0x000001f8, /* 0020(:0):    NOP */
-+    0x98180524, /* 0024(:378):  LCD: idx0 = idx0; idx0 != var20; idx0 += inc4 */
-+    0x8118801b, /* 0028(:380):    LCD: idx1 = var2; idx1 once var0; idx1 += inc3 */
-+    0xf8ca001a, /* 002C(:381):      LCDEXT: idx2 = *(idx1 + var20 + 8); idx2 once var0; idx2 += inc3 */
-+    0xb8ca601b, /* 0030(:382):      LCD: idx3 = *(idx1 + var20 + 12); ; idx3 += inc3 */
-+    0x10004310, /* 0034(:384):        DRD1A: var16 = idx2; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x00001718, /* 0038(:385):        DRD1A: var5 = idx3; FN=0 init=0 WS=0 RS=0 */
-+    0xb8ca001d, /* 003C(:387):      LCD: idx2 = *(idx1 + var20 + 20); idx2 once var0; idx2 += inc3 */
-+    0x10001f10, /* 0040(:388):        DRD1A: var7 = idx2; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x60000007, /* 0044(:389):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=7 EXT init=0 WS=0 RS=0 */
-+    0x020cf893, /* 0048(:389):        DRD2B1: var8 = EU3(); EU3(idx2,var19)  */
-+    0x98ca001c, /* 004C(:391):      LCD: idx2 = idx1 + var20 + 4; idx2 once var0; idx2 += inc3 */
-+    0x00000710, /* 0050(:392):        DRD1A: var1 = idx2; FN=0 init=0 WS=0 RS=0 */
-+    0x98ca8018, /* 0054(:393):      LCD: idx2 = idx1 + var21; idx2 once var0; idx2 += inc3 */
-+    0x10002b10, /* 0058(:394):        DRD1A: var10 = idx2; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x0000c828, /* 005C(:395):        DRD1A: *idx2 = var5; FN=0 init=0 WS=0 RS=0 */
-+    0x000001f8, /* 0060(:0):      NOP */
-+    0xc14ae018, /* 0064(:399):    LCDEXT: idx1 = var2 + var21; ; idx1 += inc3 */
-+    0xc004a51d, /* 0068(:399):    LCDEXT: idx2 = var0, idx3 = var9; idx3 == var20; idx2 += inc3, idx3 += inc5 */
-+    0x811a601b, /* 006C(:400):    LCD: idx4 = var2; ; idx4 += inc3 */
-+    0xc28a21c2, /* 0070(:403):      LCDEXT: idx5 = var5, idx6 = var20; idx6 < var7; idx5 += inc0, idx6 += inc2 */
-+    0x881be009, /* 0074(:403):      LCD: idx7 = var16; ; idx7 += inc1 */
-+    0x03fed7b8, /* 0078(:406):        DRD1A: *idx7; FN=0 init=31 WS=3 RS=3 */
-+    0xda9b001b, /* 007C(:408):      LCDEXT: idx5 = idx5, idx6 = idx6; idx5 once var0; idx5 += inc3, idx6 += inc3 */
-+    0x9b9be01b, /* 0080(:408):      LCD: idx7 = idx7; ; idx7 += inc3 */
-+    0x1000cb20, /* 0084(:409):        DRD1A: *idx2 = idx4; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x70000006, /* 0088(:410):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf896, /* 008C(:410):        DRD2B1: idx2 = EU3(); EU3(idx2,var22)  */
-+    0x1000cb28, /* 0090(:411):        DRD1A: *idx2 = idx5; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x70000006, /* 0094(:412):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf896, /* 0098(:412):        DRD2B1: idx2 = EU3(); EU3(idx2,var22)  */
-+    0x1000cb30, /* 009C(:413):        DRD1A: *idx2 = idx6; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x70000006, /* 00A0(:414):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf896, /* 00A4(:414):        DRD2B1: idx2 = EU3(); EU3(idx2,var22)  */
-+    0x1000cb38, /* 00A8(:415):        DRD1A: *idx2 = idx7; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x0000c728, /* 00AC(:416):        DRD1A: *idx1 = idx5; FN=0 init=0 WS=0 RS=0 */
-+    0x000001f8, /* 00B0(:0):      NOP */
-+    0xc14ae018, /* 00B4(:420):    LCDEXT: idx1 = var2 + var21; ; idx1 += inc3 */
-+    0xc004a5dd, /* 00B8(:420):    LCDEXT: idx2 = var0, idx3 = var9; idx3 == var23; idx2 += inc3, idx3 += inc5 */
-+    0x811a601b, /* 00BC(:421):    LCD: idx4 = var2; ; idx4 += inc3 */
-+    0xda9b001b, /* 00C0(:424):      LCDEXT: idx5 = idx5, idx6 = idx6; idx5 once var0; idx5 += inc3, idx6 += inc3 */
-+    0x9b9be01b, /* 00C4(:424):      LCD: idx7 = idx7; ; idx7 += inc3 */
-+    0x0000d3a0, /* 00C8(:425):        DRD1A: *idx4; FN=0 init=0 WS=0 RS=0 */
-+    0xc28a21c2, /* 00CC(:427):      LCDEXT: idx5 = var5, idx6 = var20; idx6 < var7; idx5 += inc0, idx6 += inc2 */
-+    0x881be009, /* 00D0(:427):      LCD: idx7 = var16; ; idx7 += inc1 */
-+    0x0bfed7b8, /* 00D4(:430):        DRD1A: *idx7; FN=0 TFD init=31 WS=3 RS=3 */
-+    0xda9b001b, /* 00D8(:432):      LCDEXT: idx5 = idx5, idx6 = idx6; idx5 once var0; idx5 += inc3, idx6 += inc3 */
-+    0x9b9be01b, /* 00DC(:432):      LCD: idx7 = idx7; ; idx7 += inc3 */
-+    0x1000cb20, /* 00E0(:433):        DRD1A: *idx2 = idx4; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x70000006, /* 00E4(:434):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf896, /* 00E8(:434):        DRD2B1: idx2 = EU3(); EU3(idx2,var22)  */
-+    0x1000cb28, /* 00EC(:435):        DRD1A: *idx2 = idx5; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x70000006, /* 00F0(:436):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf896, /* 00F4(:436):        DRD2B1: idx2 = EU3(); EU3(idx2,var22)  */
-+    0x1000cb30, /* 00F8(:437):        DRD1A: *idx2 = idx6; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x70000006, /* 00FC(:438):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf896, /* 0100(:438):        DRD2B1: idx2 = EU3(); EU3(idx2,var22)  */
-+    0x1000cb38, /* 0104(:439):        DRD1A: *idx2 = idx7; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x0000c728, /* 0108(:440):        DRD1A: *idx1 = idx5; FN=0 init=0 WS=0 RS=0 */
-+    0x000001f8, /* 010C(:0):      NOP */
-+    0x8118801b, /* 0110(:444):    LCD: idx1 = var2; idx1 once var0; idx1 += inc3 */
-+    0x8a19001b, /* 0114(:446):      LCD: idx2 = var20; idx2 once var0; idx2 += inc3 */
-+    0x6000000e, /* 0118(:447):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=14 EXT init=0 WS=0 RS=0 */
-+    0x088cf49f, /* 011C(:447):        DRD2B1: idx2 = EU3(); EU3(var18)  */
-+    0xd9190536, /* 0120(:448):      LCDEXT: idx2 = idx2; idx2 == var20; idx2 += inc6 */
-+    0x98ca0018, /* 0124(:448):      LCD: idx3 = idx1 + var20; idx3 once var0; idx3 += inc3 */
-+    0x6000000a, /* 0128(:450):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=10 EXT init=0 WS=0 RS=0 */
-+    0x0cccfcdf, /* 012C(:450):        DRD2B1: *idx3 = EU3(); EU3(*idx3)  */
-+    0x000001f8, /* 0130(:0):      NOP */
-+    0xa14a001e, /* 0134(:453):    LCD: idx1 = *(var2 + var20 + 24); idx1 once var0; idx1 += inc3 */
-+    0x10000b08, /* 0138(:454):      DRD1A: var2 = idx1; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x10002c90, /* 013C(:455):      DRD1A: var11 = var18; FN=0 MORE init=0 WS=0 RS=0 */
-+    0xb8ca0018, /* 0140(:456):      LCD: idx2 = *(idx1 + var20); idx2 once var0; idx2 += inc3 */
-+    0x10004b10, /* 0144(:457):        DRD1A: var18 = idx2; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x70000009, /* 0148(:458):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=9 EXT MORE init=0 WS=0 RS=0 */
-+    0x080cf89f, /* 014C(:458):        DRD2B1: idx0 = EU3(); EU3(idx2)  */
-+    0x6000000c, /* 0150(:459):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=12 EXT init=0 WS=0 RS=0 */
-+    0x024cf89f, /* 0154(:459):        DRD2B1: var9 = EU3(); EU3(idx2)  */
-+    0x000001f8, /* 0158(:0):      NOP */
-+    0x8a18801b, /* 015C(:465):    LCD: idx1 = var20; idx1 once var0; idx1 += inc3 */
-+    0x7000000d, /* 0160(:466):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=13 EXT MORE init=0 WS=0 RS=0 */
-+    0x084cf2df, /* 0164(:466):      DRD2B1: idx1 = EU3(); EU3(var11)  */
-+    0xd899053f, /* 0168(:467):      LCDEXT: idx2 = idx1; idx2 > var20; idx2 += inc7 */
-+    0x8019801b, /* 016C(:467):      LCD: idx3 = var0; idx3 once var0; idx3 += inc3 */
-+    0x040001f8, /* 0170(:468):        DRD1A: FN=0 INT init=0 WS=0 RS=0 */
-+    0x000001f8, /* 0174(:0):      NOP */
-+    0x000001f8, /* 0178(:0):    NOP */
-+};
-+u32 MCD_SingleNoEu_TDT[]=
-+{
-+    0x8318001b, /* 0000(:646):  LCD: idx0 = var6; idx0 once var0; idx0 += inc3 */
-+    0x7000000c, /* 0004(:647):    DRD2A: EU0=0 EU1=0 EU2=0 EU3=12 EXT MORE init=0 WS=0 RS=0 */
-+    0x080cf81f, /* 0008(:647):    DRD2B1: idx0 = EU3(); EU3(idx0)  */
-+    0x8318801b, /* 000C(:648):    LCD: idx1 = var6; idx1 once var0; idx1 += inc3 */
-+    0x6000000d, /* 0010(:649):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=13 EXT init=0 WS=0 RS=0 */
-+    0x084cf85f, /* 0014(:649):      DRD2B1: idx1 = EU3(); EU3(idx1)  */
-+    0x000001f8, /* 0018(:0):    NOP */
-+    0x8498001b, /* 001C(:653):  LCD: idx0 = var9; idx0 once var0; idx0 += inc3 */
-+    0x7000000c, /* 0020(:654):    DRD2A: EU0=0 EU1=0 EU2=0 EU3=12 EXT MORE init=0 WS=0 RS=0 */
-+    0x020cf81f, /* 0024(:654):    DRD2B1: var8 = EU3(); EU3(idx0)  */
-+    0x6000000d, /* 0028(:655):    DRD2A: EU0=0 EU1=0 EU2=0 EU3=13 EXT init=0 WS=0 RS=0 */
-+    0x028cf81f, /* 002C(:655):    DRD2B1: var10 = EU3(); EU3(idx0)  */
-+    0xc404601b, /* 0030(:658):  LCDEXT: idx0 = var8, idx1 = var8; ; idx0 += inc3, idx1 += inc3 */
-+    0xc00423dc, /* 0034(:658):  LCDEXT: idx2 = var0, idx3 = var8; idx3 == var15; idx2 += inc3, idx3 += inc4 */
-+    0x809a601b, /* 0038(:659):  LCD: idx4 = var1; ; idx4 += inc3 */
-+    0xc207a182, /* 003C(:662):    LCDEXT: idx5 = var4, idx6 = var15; idx6 < var6; idx5 += inc0, idx6 += inc2 */
-+    0x869be009, /* 0040(:662):    LCD: idx7 = var13; ; idx7 += inc1 */
-+    0x03fed7b8, /* 0044(:665):      DRD1A: *idx7; FN=0 init=31 WS=3 RS=3 */
-+    0xda9b001b, /* 0048(:667):    LCDEXT: idx5 = idx5, idx6 = idx6; idx5 once var0; idx5 += inc3, idx6 += inc3 */
-+    0x9b9be01b, /* 004C(:667):    LCD: idx7 = idx7; ; idx7 += inc3 */
-+    0x70000006, /* 0050(:669):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf890, /* 0054(:669):      DRD2B1: idx2 = EU3(); EU3(idx2,var16)  */
-+    0x1000cb28, /* 0058(:670):      DRD1A: *idx2 = idx5; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x70000006, /* 005C(:671):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf890, /* 0060(:671):      DRD2B1: idx2 = EU3(); EU3(idx2,var16)  */
-+    0x1000cb30, /* 0064(:672):      DRD1A: *idx2 = idx6; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x70000006, /* 0068(:673):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf890, /* 006C(:673):      DRD2B1: idx2 = EU3(); EU3(idx2,var16)  */
-+    0x0000cb38, /* 0070(:674):      DRD1A: *idx2 = idx7; FN=0 init=0 WS=0 RS=0 */
-+    0x000001f8, /* 0074(:0):    NOP */
-+    0xc404601b, /* 0078(:678):  LCDEXT: idx0 = var8, idx1 = var8; ; idx0 += inc3, idx1 += inc3 */
-+    0xc004245c, /* 007C(:678):  LCDEXT: idx2 = var0, idx3 = var8; idx3 == var17; idx2 += inc3, idx3 += inc4 */
-+    0x809a601b, /* 0080(:679):  LCD: idx4 = var1; ; idx4 += inc3 */
-+    0xda9b001b, /* 0084(:682):    LCDEXT: idx5 = idx5, idx6 = idx6; idx5 once var0; idx5 += inc3, idx6 += inc3 */
-+    0x9b9be01b, /* 0088(:682):    LCD: idx7 = idx7; ; idx7 += inc3 */
-+    0x0000d3a0, /* 008C(:683):      DRD1A: *idx4; FN=0 init=0 WS=0 RS=0 */
-+    0xc207a182, /* 0090(:685):    LCDEXT: idx5 = var4, idx6 = var15; idx6 < var6; idx5 += inc0, idx6 += inc2 */
-+    0x869be009, /* 0094(:685):    LCD: idx7 = var13; ; idx7 += inc1 */
-+    0x0bfed7b8, /* 0098(:688):      DRD1A: *idx7; FN=0 TFD init=31 WS=3 RS=3 */
-+    0xda9b001b, /* 009C(:690):    LCDEXT: idx5 = idx5, idx6 = idx6; idx5 once var0; idx5 += inc3, idx6 += inc3 */
-+    0x9b9be01b, /* 00A0(:690):    LCD: idx7 = idx7; ; idx7 += inc3 */
-+    0x70000006, /* 00A4(:692):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf890, /* 00A8(:692):      DRD2B1: idx2 = EU3(); EU3(idx2,var16)  */
-+    0x1000cb28, /* 00AC(:693):      DRD1A: *idx2 = idx5; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x70000006, /* 00B0(:694):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf890, /* 00B4(:694):      DRD2B1: idx2 = EU3(); EU3(idx2,var16)  */
-+    0x1000cb30, /* 00B8(:695):      DRD1A: *idx2 = idx6; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x70000006, /* 00BC(:696):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf890, /* 00C0(:696):      DRD2B1: idx2 = EU3(); EU3(idx2,var16)  */
-+    0x0000cb38, /* 00C4(:697):      DRD1A: *idx2 = idx7; FN=0 init=0 WS=0 RS=0 */
-+    0x000001f8, /* 00C8(:0):    NOP */
-+    0xc51803ed, /* 00CC(:701):  LCDEXT: idx0 = var10; idx0 > var15; idx0 += inc5 */
-+    0x8018801b, /* 00D0(:701):  LCD: idx1 = var0; idx1 once var0; idx1 += inc3 */
-+    0x040001f8, /* 00D4(:702):    DRD1A: FN=0 INT init=0 WS=0 RS=0 */
-+};
-+#ifdef MCD_INCLUDE_EU
-+u32 MCD_ChainEu_TDT[]=
-+{
-+    0x80004000, /* 0000(:928):  LCDEXT: idx0 = 0x00000000; ; */
-+    0x8118801b, /* 0004(:928):  LCD: idx1 = var2; idx1 once var0; idx1 += inc3 */
-+    0xb8ca0018, /* 0008(:929):    LCD: idx2 = *(idx1 + var20); idx2 once var0; idx2 += inc3 */
-+    0x10004b10, /* 000C(:930):      DRD1A: var18 = idx2; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x7000000c, /* 0010(:931):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=12 EXT MORE init=0 WS=0 RS=0 */
-+    0x024cf89f, /* 0014(:931):      DRD2B1: var9 = EU3(); EU3(idx2)  */
-+    0x60000009, /* 0018(:932):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=9 EXT init=0 WS=0 RS=0 */
-+    0x080cf89f, /* 001C(:932):      DRD2B1: idx0 = EU3(); EU3(idx2)  */
-+    0x000001f8, /* 0020(:0):    NOP */
-+    0x98180524, /* 0024(:936):  LCD: idx0 = idx0; idx0 != var20; idx0 += inc4 */
-+    0x8118801b, /* 0028(:938):    LCD: idx1 = var2; idx1 once var0; idx1 += inc3 */
-+    0xf8ca001a, /* 002C(:939):      LCDEXT: idx2 = *(idx1 + var20 + 8); idx2 once var0; idx2 += inc3 */
-+    0xb8ca601b, /* 0030(:940):      LCD: idx3 = *(idx1 + var20 + 12); ; idx3 += inc3 */
-+    0x10004310, /* 0034(:942):        DRD1A: var16 = idx2; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x00001718, /* 0038(:943):        DRD1A: var5 = idx3; FN=0 init=0 WS=0 RS=0 */
-+    0xb8ca001d, /* 003C(:945):      LCD: idx2 = *(idx1 + var20 + 20); idx2 once var0; idx2 += inc3 */
-+    0x10001f10, /* 0040(:946):        DRD1A: var7 = idx2; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x60000007, /* 0044(:947):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=7 EXT init=0 WS=0 RS=0 */
-+    0x020cf893, /* 0048(:947):        DRD2B1: var8 = EU3(); EU3(idx2,var19)  */
-+    0x98ca001c, /* 004C(:949):      LCD: idx2 = idx1 + var20 + 4; idx2 once var0; idx2 += inc3 */
-+    0x00000710, /* 0050(:950):        DRD1A: var1 = idx2; FN=0 init=0 WS=0 RS=0 */
-+    0x98ca8018, /* 0054(:951):      LCD: idx2 = idx1 + var21; idx2 once var0; idx2 += inc3 */
-+    0x10002b10, /* 0058(:952):        DRD1A: var10 = idx2; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x0000c828, /* 005C(:953):        DRD1A: *idx2 = var5; FN=0 init=0 WS=0 RS=0 */
-+    0x000001f8, /* 0060(:0):      NOP */
-+    0xc14ae018, /* 0064(:957):    LCDEXT: idx1 = var2 + var21; ; idx1 += inc3 */
-+    0xc004a51d, /* 0068(:957):    LCDEXT: idx2 = var0, idx3 = var9; idx3 == var20; idx2 += inc3, idx3 += inc5 */
-+    0x811a601b, /* 006C(:958):    LCD: idx4 = var2; ; idx4 += inc3 */
-+    0xc28a21c2, /* 0070(:961):      LCDEXT: idx5 = var5, idx6 = var20; idx6 < var7; idx5 += inc0, idx6 += inc2 */
-+    0x881be009, /* 0074(:961):      LCD: idx7 = var16; ; idx7 += inc1 */
-+    0x63fe0000, /* 0078(:964):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=0 EXT init=31 WS=3 RS=3 */
-+    0x0d4cfddf, /* 007C(:964):        DRD2B1: *idx5 = EU3(); EU3(*idx7)  */
-+    0xda9b001b, /* 0080(:966):      LCDEXT: idx5 = idx5, idx6 = idx6; idx5 once var0; idx5 += inc3, idx6 += inc3 */
-+    0x9b9be01b, /* 0084(:966):      LCD: idx7 = idx7; ; idx7 += inc3 */
-+    0x1000cb20, /* 0088(:967):        DRD1A: *idx2 = idx4; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x70000006, /* 008C(:968):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf896, /* 0090(:968):        DRD2B1: idx2 = EU3(); EU3(idx2,var22)  */
-+    0x1000cb28, /* 0094(:969):        DRD1A: *idx2 = idx5; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x70000006, /* 0098(:970):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf896, /* 009C(:970):        DRD2B1: idx2 = EU3(); EU3(idx2,var22)  */
-+    0x1000cb30, /* 00A0(:971):        DRD1A: *idx2 = idx6; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x70000006, /* 00A4(:972):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf896, /* 00A8(:972):        DRD2B1: idx2 = EU3(); EU3(idx2,var22)  */
-+    0x1000cb38, /* 00AC(:973):        DRD1A: *idx2 = idx7; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x0000c728, /* 00B0(:974):        DRD1A: *idx1 = idx5; FN=0 init=0 WS=0 RS=0 */
-+    0x000001f8, /* 00B4(:0):      NOP */
-+    0xc14ae018, /* 00B8(:978):    LCDEXT: idx1 = var2 + var21; ; idx1 += inc3 */
-+    0xc004a5dd, /* 00BC(:978):    LCDEXT: idx2 = var0, idx3 = var9; idx3 == var23; idx2 += inc3, idx3 += inc5 */
-+    0x811a601b, /* 00C0(:979):    LCD: idx4 = var2; ; idx4 += inc3 */
-+    0xda9b001b, /* 00C4(:982):      LCDEXT: idx5 = idx5, idx6 = idx6; idx5 once var0; idx5 += inc3, idx6 += inc3 */
-+    0x9b9be01b, /* 00C8(:982):      LCD: idx7 = idx7; ; idx7 += inc3 */
-+    0x0000d3a0, /* 00CC(:983):        DRD1A: *idx4; FN=0 init=0 WS=0 RS=0 */
-+    0xc28a21c2, /* 00D0(:985):      LCDEXT: idx5 = var5, idx6 = var20; idx6 < var7; idx5 += inc0, idx6 += inc2 */
-+    0x881be009, /* 00D4(:985):      LCD: idx7 = var16; ; idx7 += inc1 */
-+    0x6bfe0000, /* 00D8(:988):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=0 TFD EXT init=31 WS=3 RS=3 */
-+    0x0d4cfddf, /* 00DC(:988):        DRD2B1: *idx5 = EU3(); EU3(*idx7)  */
-+    0xda9b001b, /* 00E0(:990):      LCDEXT: idx5 = idx5, idx6 = idx6; idx5 once var0; idx5 += inc3, idx6 += inc3 */
-+    0x9b9be01b, /* 00E4(:990):      LCD: idx7 = idx7; ; idx7 += inc3 */
-+    0x1000cb20, /* 00E8(:991):        DRD1A: *idx2 = idx4; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x70000006, /* 00EC(:992):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf896, /* 00F0(:992):        DRD2B1: idx2 = EU3(); EU3(idx2,var22)  */
-+    0x1000cb28, /* 00F4(:993):        DRD1A: *idx2 = idx5; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x70000006, /* 00F8(:994):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf896, /* 00FC(:994):        DRD2B1: idx2 = EU3(); EU3(idx2,var22)  */
-+    0x1000cb30, /* 0100(:995):        DRD1A: *idx2 = idx6; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x70000006, /* 0104(:996):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf896, /* 0108(:996):        DRD2B1: idx2 = EU3(); EU3(idx2,var22)  */
-+    0x1000cb38, /* 010C(:997):        DRD1A: *idx2 = idx7; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x0000c728, /* 0110(:998):        DRD1A: *idx1 = idx5; FN=0 init=0 WS=0 RS=0 */
-+    0x000001f8, /* 0114(:0):      NOP */
-+    0x8118801b, /* 0118(:1002):    LCD: idx1 = var2; idx1 once var0; idx1 += inc3 */
-+    0x8a19001b, /* 011C(:1004):      LCD: idx2 = var20; idx2 once var0; idx2 += inc3 */
-+    0x6000000e, /* 0120(:1005):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=14 EXT init=0 WS=0 RS=0 */
-+    0x088cf49f, /* 0124(:1005):        DRD2B1: idx2 = EU3(); EU3(var18)  */
-+    0xd9190536, /* 0128(:1006):      LCDEXT: idx2 = idx2; idx2 == var20; idx2 += inc6 */
-+    0x98ca0018, /* 012C(:1006):      LCD: idx3 = idx1 + var20; idx3 once var0; idx3 += inc3 */
-+    0x6000000a, /* 0130(:1008):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=10 EXT init=0 WS=0 RS=0 */
-+    0x0cccfcdf, /* 0134(:1008):        DRD2B1: *idx3 = EU3(); EU3(*idx3)  */
-+    0x000001f8, /* 0138(:0):      NOP */
-+    0xa14a001e, /* 013C(:1011):    LCD: idx1 = *(var2 + var20 + 24); idx1 once var0; idx1 += inc3 */
-+    0x10000b08, /* 0140(:1012):      DRD1A: var2 = idx1; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x10002c90, /* 0144(:1013):      DRD1A: var11 = var18; FN=0 MORE init=0 WS=0 RS=0 */
-+    0xb8ca0018, /* 0148(:1014):      LCD: idx2 = *(idx1 + var20); idx2 once var0; idx2 += inc3 */
-+    0x10004b10, /* 014C(:1015):        DRD1A: var18 = idx2; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x70000009, /* 0150(:1016):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=9 EXT MORE init=0 WS=0 RS=0 */
-+    0x080cf89f, /* 0154(:1016):        DRD2B1: idx0 = EU3(); EU3(idx2)  */
-+    0x6000000c, /* 0158(:1017):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=12 EXT init=0 WS=0 RS=0 */
-+    0x024cf89f, /* 015C(:1017):        DRD2B1: var9 = EU3(); EU3(idx2)  */
-+    0x000001f8, /* 0160(:0):      NOP */
-+    0x8a18801b, /* 0164(:1023):    LCD: idx1 = var20; idx1 once var0; idx1 += inc3 */
-+    0x7000000d, /* 0168(:1024):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=13 EXT MORE init=0 WS=0 RS=0 */
-+    0x084cf2df, /* 016C(:1024):      DRD2B1: idx1 = EU3(); EU3(var11)  */
-+    0xd899053f, /* 0170(:1025):      LCDEXT: idx2 = idx1; idx2 > var20; idx2 += inc7 */
-+    0x8019801b, /* 0174(:1025):      LCD: idx3 = var0; idx3 once var0; idx3 += inc3 */
-+    0x040001f8, /* 0178(:1026):        DRD1A: FN=0 INT init=0 WS=0 RS=0 */
-+    0x000001f8, /* 017C(:0):      NOP */
-+    0x000001f8, /* 0180(:0):    NOP */
-+};
-+u32 MCD_SingleEu_TDT[]=
-+{
-+    0x8318001b, /* 0000(:1204):  LCD: idx0 = var6; idx0 once var0; idx0 += inc3 */
-+    0x7000000c, /* 0004(:1205):    DRD2A: EU0=0 EU1=0 EU2=0 EU3=12 EXT MORE init=0 WS=0 RS=0 */
-+    0x080cf81f, /* 0008(:1205):    DRD2B1: idx0 = EU3(); EU3(idx0)  */
-+    0x8318801b, /* 000C(:1206):    LCD: idx1 = var6; idx1 once var0; idx1 += inc3 */
-+    0x6000000d, /* 0010(:1207):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=13 EXT init=0 WS=0 RS=0 */
-+    0x084cf85f, /* 0014(:1207):      DRD2B1: idx1 = EU3(); EU3(idx1)  */
-+    0x000001f8, /* 0018(:0):    NOP */
-+    0x8498001b, /* 001C(:1211):  LCD: idx0 = var9; idx0 once var0; idx0 += inc3 */
-+    0x7000000c, /* 0020(:1212):    DRD2A: EU0=0 EU1=0 EU2=0 EU3=12 EXT MORE init=0 WS=0 RS=0 */
-+    0x020cf81f, /* 0024(:1212):    DRD2B1: var8 = EU3(); EU3(idx0)  */
-+    0x6000000d, /* 0028(:1213):    DRD2A: EU0=0 EU1=0 EU2=0 EU3=13 EXT init=0 WS=0 RS=0 */
-+    0x028cf81f, /* 002C(:1213):    DRD2B1: var10 = EU3(); EU3(idx0)  */
-+    0xc404601b, /* 0030(:1216):  LCDEXT: idx0 = var8, idx1 = var8; ; idx0 += inc3, idx1 += inc3 */
-+    0xc00423dc, /* 0034(:1216):  LCDEXT: idx2 = var0, idx3 = var8; idx3 == var15; idx2 += inc3, idx3 += inc4 */
-+    0x809a601b, /* 0038(:1217):  LCD: idx4 = var1; ; idx4 += inc3 */
-+    0xc207a182, /* 003C(:1220):    LCDEXT: idx5 = var4, idx6 = var15; idx6 < var6; idx5 += inc0, idx6 += inc2 */
-+    0x869be009, /* 0040(:1220):    LCD: idx7 = var13; ; idx7 += inc1 */
-+    0x63fe0000, /* 0044(:1223):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=0 EXT init=31 WS=3 RS=3 */
-+    0x0d4cfddf, /* 0048(:1223):      DRD2B1: *idx5 = EU3(); EU3(*idx7)  */
-+    0xda9b001b, /* 004C(:1225):    LCDEXT: idx5 = idx5, idx6 = idx6; idx5 once var0; idx5 += inc3, idx6 += inc3 */
-+    0x9b9be01b, /* 0050(:1225):    LCD: idx7 = idx7; ; idx7 += inc3 */
-+    0x70000006, /* 0054(:1227):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf890, /* 0058(:1227):      DRD2B1: idx2 = EU3(); EU3(idx2,var16)  */
-+    0x1000cb28, /* 005C(:1228):      DRD1A: *idx2 = idx5; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x70000006, /* 0060(:1229):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf890, /* 0064(:1229):      DRD2B1: idx2 = EU3(); EU3(idx2,var16)  */
-+    0x1000cb30, /* 0068(:1230):      DRD1A: *idx2 = idx6; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x70000006, /* 006C(:1231):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf890, /* 0070(:1231):      DRD2B1: idx2 = EU3(); EU3(idx2,var16)  */
-+    0x0000cb38, /* 0074(:1232):      DRD1A: *idx2 = idx7; FN=0 init=0 WS=0 RS=0 */
-+    0x000001f8, /* 0078(:0):    NOP */
-+    0xc404601b, /* 007C(:1236):  LCDEXT: idx0 = var8, idx1 = var8; ; idx0 += inc3, idx1 += inc3 */
-+    0xc004245c, /* 0080(:1236):  LCDEXT: idx2 = var0, idx3 = var8; idx3 == var17; idx2 += inc3, idx3 += inc4 */
-+    0x809a601b, /* 0084(:1237):  LCD: idx4 = var1; ; idx4 += inc3 */
-+    0xda9b001b, /* 0088(:1240):    LCDEXT: idx5 = idx5, idx6 = idx6; idx5 once var0; idx5 += inc3, idx6 += inc3 */
-+    0x9b9be01b, /* 008C(:1240):    LCD: idx7 = idx7; ; idx7 += inc3 */
-+    0x0000d3a0, /* 0090(:1241):      DRD1A: *idx4; FN=0 init=0 WS=0 RS=0 */
-+    0xc207a182, /* 0094(:1243):    LCDEXT: idx5 = var4, idx6 = var15; idx6 < var6; idx5 += inc0, idx6 += inc2 */
-+    0x869be009, /* 0098(:1243):    LCD: idx7 = var13; ; idx7 += inc1 */
-+    0x6bfe0000, /* 009C(:1246):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=0 TFD EXT init=31 WS=3 RS=3 */
-+    0x0d4cfddf, /* 00A0(:1246):      DRD2B1: *idx5 = EU3(); EU3(*idx7)  */
-+    0xda9b001b, /* 00A4(:1248):    LCDEXT: idx5 = idx5, idx6 = idx6; idx5 once var0; idx5 += inc3, idx6 += inc3 */
-+    0x9b9be01b, /* 00A8(:1248):    LCD: idx7 = idx7; ; idx7 += inc3 */
-+    0x70000006, /* 00AC(:1250):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf890, /* 00B0(:1250):      DRD2B1: idx2 = EU3(); EU3(idx2,var16)  */
-+    0x1000cb28, /* 00B4(:1251):      DRD1A: *idx2 = idx5; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x70000006, /* 00B8(:1252):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf890, /* 00BC(:1252):      DRD2B1: idx2 = EU3(); EU3(idx2,var16)  */
-+    0x1000cb30, /* 00C0(:1253):      DRD1A: *idx2 = idx6; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x70000006, /* 00C4(:1254):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf890, /* 00C8(:1254):      DRD2B1: idx2 = EU3(); EU3(idx2,var16)  */
-+    0x0000cb38, /* 00CC(:1255):      DRD1A: *idx2 = idx7; FN=0 init=0 WS=0 RS=0 */
-+    0x000001f8, /* 00D0(:0):    NOP */
-+    0xc51803ed, /* 00D4(:1259):  LCDEXT: idx0 = var10; idx0 > var15; idx0 += inc5 */
-+    0x8018801b, /* 00D8(:1259):  LCD: idx1 = var0; idx1 once var0; idx1 += inc3 */
-+    0x040001f8, /* 00DC(:1260):    DRD1A: FN=0 INT init=0 WS=0 RS=0 */
-+};
-+#endif
-+u32 MCD_ENetRcv_TDT[]=
-+{
-+    0x80004000, /* 0000(:1334):  LCDEXT: idx0 = 0x00000000; ; */
-+    0x82188000, /* 0004(:1334):  LCD: idx1 = var4; idx1 once var0; idx1 += inc0 */
-+    0x10000788, /* 0008(:1335):    DRD1A: var1 = *idx1; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x60000009, /* 000C(:1336):    DRD2A: EU0=0 EU1=0 EU2=0 EU3=9 EXT init=0 WS=0 RS=0 */
-+    0x080cf05f, /* 0010(:1336):    DRD2B1: idx0 = EU3(); EU3(var1)  */
-+    0x98180249, /* 0014(:1339):  LCD: idx0 = idx0; idx0 != var9; idx0 += inc1 */
-+    0x82448004, /* 0018(:1341):    LCD: idx1 = var4 + var9 + 4; idx1 once var0; idx1 += inc0 */
-+    0x7000000d, /* 001C(:1342):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=13 EXT MORE init=0 WS=0 RS=0 */
-+    0x014cf05f, /* 0020(:1342):      DRD2B1: var5 = EU3(); EU3(var1)  */
-+    0x7000000b, /* 0024(:1343):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=11 EXT MORE init=0 WS=0 RS=0 */
-+    0x020cf05f, /* 0028(:1343):      DRD2B1: var8 = EU3(); EU3(var1)  */
-+    0x70000004, /* 002C(:1344):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=4 EXT MORE init=0 WS=0 RS=0 */
-+    0x018cf04a, /* 0030(:1344):      DRD2B1: var6 = EU3(); EU3(var1,var10)  */
-+    0x70000004, /* 0034(:1345):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=4 EXT MORE init=0 WS=0 RS=0 */
-+    0x004cf04b, /* 0038(:1345):      DRD2B1: var1 = EU3(); EU3(var1,var11)  */
-+    0x00000b88, /* 003C(:1348):      DRD1A: var2 = *idx1; FN=0 init=0 WS=0 RS=0 */
-+    0xc4838190, /* 0040(:1351):    LCDEXT: idx1 = var9, idx2 = var7; idx1 < var6; idx1 += inc2, idx2 += inc0 */
-+    0x8119e012, /* 0044(:1351):    LCD: idx3 = var2; ; idx3 += inc2 */
-+    0x03e0cf90, /* 0048(:1354):      DRD1A: *idx3 = *idx2; FN=0 init=31 WS=0 RS=0 */
-+    0x81188000, /* 004C(:1357):    LCD: idx1 = var2; idx1 once var0; idx1 += inc0 */
-+    0x000ac788, /* 0050(:1358):      DRD1A: *idx1 = *idx1; FN=0 init=0 WS=1 RS=1 */
-+    0xc4838000, /* 0054(:1360):    LCDEXT: idx1 = var9, idx2 = var7; idx1 once var0; idx1 += inc0, idx2 += inc0 */
-+    0x8219e000, /* 0058(:1360):    LCD: idx3 = var4; ; idx3 += inc0 */
-+    0x70000004, /* 005C(:1368):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=4 EXT MORE init=0 WS=0 RS=0 */
-+    0x084cfc8c, /* 0060(:1368):      DRD2B1: idx1 = EU3(); EU3(*idx2,var12)  */
-+    0x60000005, /* 0064(:1371):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=5 EXT init=0 WS=0 RS=0 */
-+    0x0cccf841, /* 0068(:1371):      DRD2B1: *idx3 = EU3(); EU3(idx1,var1)  */
-+    0x82468000, /* 006C(:1377):    LCD: idx1 = var4 + var13; idx1 once var0; idx1 += inc0 */
-+    0xc419025b, /* 0070(:1379):      LCDEXT: idx2 = var8; idx2 > var9; idx2 += inc3 */
-+    0x80198000, /* 0074(:1379):      LCD: idx3 = var0; idx3 once var0; idx3 += inc0 */
-+    0x00008400, /* 0078(:1380):        DRD1A: idx1 = var0; FN=0 init=0 WS=0 RS=0 */
-+    0x00001308, /* 007C(:1381):      DRD1A: var4 = idx1; FN=0 init=0 WS=0 RS=0 */
-+    0x82188000, /* 0080(:1384):    LCD: idx1 = var4; idx1 once var0; idx1 += inc0 */
-+    0x10000788, /* 0084(:1385):      DRD1A: var1 = *idx1; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x60000009, /* 0088(:1386):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=9 EXT init=0 WS=0 RS=0 */
-+    0x080cf05f, /* 008C(:1386):      DRD2B1: idx0 = EU3(); EU3(var1)  */
-+    0xc2988249, /* 0090(:1389):    LCDEXT: idx1 = var5; idx1 != var9; idx1 += inc1 */
-+    0x80190000, /* 0094(:1389):    LCD: idx2 = var0; idx2 once var0; idx2 += inc0 */
-+    0x040001f8, /* 0098(:1390):      DRD1A: FN=0 INT init=0 WS=0 RS=0 */
-+    0x000001f8, /* 009C(:0):    NOP */
-+};
-+u32 MCD_ENetXmit_TDT[]=
-+{
-+    0x80004000, /* 0000(:1465):  LCDEXT: idx0 = 0x00000000; ; */
-+    0x81988000, /* 0004(:1465):  LCD: idx1 = var3; idx1 once var0; idx1 += inc0 */
-+    0x10000788, /* 0008(:1466):    DRD1A: var1 = *idx1; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x60000009, /* 000C(:1467):    DRD2A: EU0=0 EU1=0 EU2=0 EU3=9 EXT init=0 WS=0 RS=0 */
-+    0x080cf05f, /* 0010(:1467):    DRD2B1: idx0 = EU3(); EU3(var1)  */
-+    0x98180309, /* 0014(:1470):  LCD: idx0 = idx0; idx0 != var12; idx0 += inc1 */
-+    0x80004003, /* 0018(:1472):    LCDEXT: idx1 = 0x00000003; ; */
-+    0x81c60004, /* 001C(:1472):    LCD: idx2 = var3 + var12 + 4; idx2 once var0; idx2 += inc0 */
-+    0x7000000d, /* 0020(:1473):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=13 EXT MORE init=0 WS=0 RS=0 */
-+    0x014cf05f, /* 0024(:1473):      DRD2B1: var5 = EU3(); EU3(var1)  */
-+    0x7000000b, /* 0028(:1474):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=11 EXT MORE init=0 WS=0 RS=0 */
-+    0x028cf05f, /* 002C(:1474):      DRD2B1: var10 = EU3(); EU3(var1)  */
-+    0x7000000c, /* 0030(:1475):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=12 EXT MORE init=0 WS=0 RS=0 */
-+    0x018cf05f, /* 0034(:1475):      DRD2B1: var6 = EU3(); EU3(var1)  */
-+    0x70000004, /* 0038(:1476):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=4 EXT MORE init=0 WS=0 RS=0 */
-+    0x01ccf04d, /* 003C(:1476):      DRD2B1: var7 = EU3(); EU3(var1,var13)  */
-+    0x10000b90, /* 0040(:1477):      DRD1A: var2 = *idx2; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x60000004, /* 0044(:1478):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=4 EXT init=0 WS=0 RS=0 */
-+    0x020cf0a1, /* 0048(:1478):      DRD2B1: var8 = EU3(); EU3(var2,idx1)  */
-+    0xc3188312, /* 004C(:1481):    LCDEXT: idx1 = var6; idx1 > var12; idx1 += inc2 */
-+    0x83c70000, /* 0050(:1481):    LCD: idx2 = var7 + var14; idx2 once var0; idx2 += inc0 */
-+    0x00001f10, /* 0054(:1482):      DRD1A: var7 = idx2; FN=0 init=0 WS=0 RS=0 */
-+    0xc583a3c3, /* 0058(:1484):    LCDEXT: idx1 = var11, idx2 = var7; idx2 >= var15; idx1 += inc0, idx2 += inc3 */
-+    0x81042325, /* 005C(:1484):    LCD: idx3 = var2, idx4 = var8; idx4 == var12; idx3 += inc4, idx4 += inc5 */
-+    0x03e0c798, /* 0060(:1489):      DRD1A: *idx1 = *idx3; FN=0 init=31 WS=0 RS=0 */
-+    0xd8990000, /* 0064(:1492):    LCDEXT: idx1 = idx1, idx2 = idx2; idx1 once var0; idx1 += inc0, idx2 += inc0 */
-+    0x9999e000, /* 0068(:1492):    LCD: idx3 = idx3; ; idx3 += inc0 */
-+    0x000acf98, /* 006C(:1493):      DRD1A: *idx3 = *idx3; FN=0 init=0 WS=1 RS=1 */
-+    0xd8992306, /* 0070(:1495):    LCDEXT: idx1 = idx1, idx2 = idx2; idx2 > var12; idx1 += inc0, idx2 += inc6 */
-+    0x9999e03f, /* 0074(:1495):    LCD: idx3 = idx3; ; idx3 += inc7 */
-+    0x03eac798, /* 0078(:1498):      DRD1A: *idx1 = *idx3; FN=0 init=31 WS=1 RS=1 */
-+    0xd8990000, /* 007C(:1501):    LCDEXT: idx1 = idx1, idx2 = idx2; idx1 once var0; idx1 += inc0, idx2 += inc0 */
-+    0x9999e000, /* 0080(:1501):    LCD: idx3 = idx3; ; idx3 += inc0 */
-+    0x000acf98, /* 0084(:1502):      DRD1A: *idx3 = *idx3; FN=0 init=0 WS=1 RS=1 */
-+    0xd8990000, /* 0088(:1504):    LCDEXT: idx1 = idx1, idx2 = idx2; idx1 once var0; idx1 += inc0, idx2 += inc0 */
-+    0x99832302, /* 008C(:1504):    LCD: idx3 = idx3, idx4 = var6; idx4 > var12; idx3 += inc0, idx4 += inc2 */
-+    0x0beac798, /* 0090(:1507):      DRD1A: *idx1 = *idx3; FN=0 TFD init=31 WS=1 RS=1 */
-+    0x81988000, /* 0094(:1509):    LCD: idx1 = var3; idx1 once var0; idx1 += inc0 */
-+    0x6000000a, /* 0098(:1510):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=10 EXT init=0 WS=0 RS=0 */
-+    0x0c4cfc5f, /* 009C(:1510):      DRD2B1: *idx1 = EU3(); EU3(*idx1)  */
-+    0x81c80000, /* 00A0(:1512):    LCD: idx1 = var3 + var16; idx1 once var0; idx1 += inc0 */
-+    0xc5190312, /* 00A4(:1514):      LCDEXT: idx2 = var10; idx2 > var12; idx2 += inc2 */
-+    0x80198000, /* 00A8(:1514):      LCD: idx3 = var0; idx3 once var0; idx3 += inc0 */
-+    0x00008400, /* 00AC(:1515):        DRD1A: idx1 = var0; FN=0 init=0 WS=0 RS=0 */
-+    0x00000f08, /* 00B0(:1516):      DRD1A: var3 = idx1; FN=0 init=0 WS=0 RS=0 */
-+    0x81988000, /* 00B4(:1519):    LCD: idx1 = var3; idx1 once var0; idx1 += inc0 */
-+    0x10000788, /* 00B8(:1520):      DRD1A: var1 = *idx1; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x60000009, /* 00BC(:1521):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=9 EXT init=0 WS=0 RS=0 */
-+    0x080cf05f, /* 00C0(:1521):      DRD2B1: idx0 = EU3(); EU3(var1)  */
-+    0xc2988309, /* 00C4(:1524):    LCDEXT: idx1 = var5; idx1 != var12; idx1 += inc1 */
-+    0x80190000, /* 00C8(:1524):    LCD: idx2 = var0; idx2 once var0; idx2 += inc0 */
-+    0x040001f8, /* 00CC(:1525):      DRD1A: FN=0 INT init=0 WS=0 RS=0 */
-+    0x000001f8, /* 00D0(:0):    NOP */
-+};
-+
---- /dev/null
-+++ b/drivers/dma/MCD_tasksInit.c
-@@ -0,0 +1,284 @@
-+/*********************************************************************
-+ *
-+ * Copyright (C) 2004  Motorola, Inc.
-+ *	MOTOROLA, INC. All Rights Reserved.  
-+ *  You are hereby granted a copyright license to use
-+ *  the SOFTWARE so long as this entire notice is
-+ *  retained without alteration in any modified and/or redistributed
-+ *  versions, and that such modified versions are clearly identified
-+ *  as such. No licenses are granted by implication, estoppel or
-+ *  otherwise under any patents or trademarks of Motorola, Inc. This 
-+ *  software is provided on an "AS IS" basis and without warranty.
-+ *
-+ *  To the maximum extent permitted by applicable law, MOTOROLA 
-+ *  DISCLAIMS ALL WARRANTIES WHETHER EXPRESS OR IMPLIED, INCLUDING 
-+ *  IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-+ *  PURPOSE AND ANY WARRANTY AGAINST INFRINGEMENT WITH REGARD TO THE 
-+ *  SOFTWARE (INCLUDING ANY MODIFIED VERSIONS THEREOF) AND ANY 
-+ *  ACCOMPANYING WRITTEN MATERIALS.
-+ * 
-+ *  To the maximum extent permitted by applicable law, IN NO EVENT
-+ *  SHALL MOTOROLA BE LIABLE FOR ANY DAMAGES WHATSOEVER (INCLUDING 
-+ *  WITHOUT LIMITATION, DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS 
-+ *  INTERRUPTION, LOSS OF BUSINESS INFORMATION, OR OTHER PECUNIARY
-+ *  LOSS) ARISING OF THE USE OR INABILITY TO USE THE SOFTWARE.   
-+ * 
-+ *  Motorola assumes no responsibility for the maintenance and support
-+ *  of this software
-+ ********************************************************************/
-+/*
-+ * Do not edit!
-+ */
-+ /*
-+ * File:		MCD_tasksInit.c
-+ * Purpose:		Function for initialize variable tables of different
-+ *              types of tasks.
-+ *
-+ * Notes:
-+ *
-+ *
-+ * Modifications:
-+ *  	
-+ *
-+ */ 
-+
-+#include <asm/MCD_dma.h>
-+
-+extern dmaRegs *MCD_dmaBar;
-+
-+/*
-+ * Task 0
-+ */
-+
-+void  MCD_startDmaChainNoEu(int *currBD, short srcIncr, short destIncr, int xferSize, short xferSizeIncr, int *cSave, volatile TaskTableEntry *taskTable, int channel)
-+{
-+
-+	MCD_SET_VAR(taskTable+channel, 2, (u32)currBD);	/* var[2] */
-+	MCD_SET_VAR(taskTable+channel, 25, (u32)(0xe000 << 16) | (0xffff & srcIncr));	/* inc[1] */
-+	MCD_SET_VAR(taskTable+channel, 24, (u32)(0xe000 << 16) | (0xffff & destIncr));	/* inc[0] */
-+	MCD_SET_VAR(taskTable+channel, 19, (u32)xferSize);	/* var[19] */
-+	MCD_SET_VAR(taskTable+channel, 26, (u32)(0x2000 << 16) | (0xffff & xferSizeIncr));	/* inc[2] */
-+	MCD_SET_VAR(taskTable+channel, 0, (u32)cSave);	/* var[0] */
-+	MCD_SET_VAR(taskTable+channel, 1, (u32)0x00000000);	/* var[1] */
-+	MCD_SET_VAR(taskTable+channel, 3, (u32)0x00000000);	/* var[3] */
-+	MCD_SET_VAR(taskTable+channel, 4, (u32)0x00000000);	/* var[4] */
-+	MCD_SET_VAR(taskTable+channel, 5, (u32)0x00000000);	/* var[5] */
-+	MCD_SET_VAR(taskTable+channel, 6, (u32)0x00000000);	/* var[6] */
-+	MCD_SET_VAR(taskTable+channel, 7, (u32)0x00000000);	/* var[7] */
-+	MCD_SET_VAR(taskTable+channel, 8, (u32)0x00000000);	/* var[8] */
-+	MCD_SET_VAR(taskTable+channel, 9, (u32)0x00000000);	/* var[9] */
-+	MCD_SET_VAR(taskTable+channel, 10, (u32)0x00000000);	/* var[10] */
-+	MCD_SET_VAR(taskTable+channel, 11, (u32)0x00000000);	/* var[11] */
-+	MCD_SET_VAR(taskTable+channel, 12, (u32)0x00000000);	/* var[12] */
-+	MCD_SET_VAR(taskTable+channel, 13, (u32)0x00000000);	/* var[13] */
-+	MCD_SET_VAR(taskTable+channel, 14, (u32)0x00000000);	/* var[14] */
-+	MCD_SET_VAR(taskTable+channel, 15, (u32)0x00000000);	/* var[15] */
-+	MCD_SET_VAR(taskTable+channel, 16, (u32)0x00000000);	/* var[16] */
-+	MCD_SET_VAR(taskTable+channel, 17, (u32)0x00000000);	/* var[17] */
-+	MCD_SET_VAR(taskTable+channel, 18, (u32)0x00000000);	/* var[18] */
-+	MCD_SET_VAR(taskTable+channel, 20, (u32)0x00000000);	/* var[20] */
-+	MCD_SET_VAR(taskTable+channel, 21, (u32)0x00000010);	/* var[21] */
-+	MCD_SET_VAR(taskTable+channel, 22, (u32)0x00000004);	/* var[22] */
-+	MCD_SET_VAR(taskTable+channel, 23, (u32)0x00000080);	/* var[23] */
-+	MCD_SET_VAR(taskTable+channel, 27, (u32)0x00000000);	/* inc[3] */
-+	MCD_SET_VAR(taskTable+channel, 28, (u32)0x60000000);	/* inc[4] */
-+	MCD_SET_VAR(taskTable+channel, 29, (u32)0x80000001);	/* inc[5] */
-+	MCD_SET_VAR(taskTable+channel, 30, (u32)0x80000000);	/* inc[6] */
-+	MCD_SET_VAR(taskTable+channel, 31, (u32)0x40000000);	/* inc[7] */
-+
-+    /* Set the task's Enable bit in its Task Control Register */
-+    MCD_dmaBar->taskControl[channel] |= (u16)0x8000; /* add a MACRO HERE TBD*/
-+	
-+
-+}
-+
-+
-+/*
-+ * Task 1
-+ */
-+ 
-+void  MCD_startDmaSingleNoEu(char *srcAddr, short srcIncr, char *destAddr, short destIncr, int dmaSize, int dmaSizeMXferSize, short xferSizeIncr, int flags, int *currBD, int *cSave, volatile TaskTableEntry *taskTable, int channel)
-+{
-+	
-+	MCD_SET_VAR(taskTable+channel, 13, (u32)srcAddr);	/* var[13] */
-+	MCD_SET_VAR(taskTable+channel, 25, (u32)(0xe000 << 16) | (0xffff & srcIncr));	/* inc[1] */
-+	MCD_SET_VAR(taskTable+channel, 4, (u32)destAddr);	/* var[4] */
-+	MCD_SET_VAR(taskTable+channel, 24, (u32)(0xe000 << 16) | (0xffff & destIncr));	/* inc[0] */
-+	MCD_SET_VAR(taskTable+channel, 6, (u32)dmaSize);	/* var[6] */
-+	MCD_SET_VAR(taskTable+channel, 7, (u32)dmaSizeMXferSize);	/* var[7] */
-+	MCD_SET_VAR(taskTable+channel, 26, (u32)(0x2000 << 16) | (0xffff & xferSizeIncr));	/* inc[2] */
-+	MCD_SET_VAR(taskTable+channel, 9, (u32)flags);	/* var[9] */
-+	MCD_SET_VAR(taskTable+channel, 1, (u32)currBD);	/* var[1] */
-+	MCD_SET_VAR(taskTable+channel, 0, (u32)cSave);	/* var[0] */
-+	MCD_SET_VAR(taskTable+channel, 2, (u32)0x00000000);	/* var[2] */
-+	MCD_SET_VAR(taskTable+channel, 3, (u32)0x00000000);	/* var[3] */
-+	MCD_SET_VAR(taskTable+channel, 5, (u32)0x00000000);	/* var[5] */
-+	MCD_SET_VAR(taskTable+channel, 8, (u32)0x00000000);	/* var[8] */
-+	MCD_SET_VAR(taskTable+channel, 10, (u32)0x00000000);	/* var[10] */
-+	MCD_SET_VAR(taskTable+channel, 11, (u32)0x00000000);	/* var[11] */
-+	MCD_SET_VAR(taskTable+channel, 12, (u32)0x00000000);	/* var[12] */
-+	MCD_SET_VAR(taskTable+channel, 14, (u32)0x00000000);	/* var[14] */
-+	MCD_SET_VAR(taskTable+channel, 15, (u32)0x00000000);	/* var[15] */
-+	MCD_SET_VAR(taskTable+channel, 16, (u32)0x00000004);	/* var[16] */
-+	MCD_SET_VAR(taskTable+channel, 17, (u32)0x00000080);	/* var[17] */
-+	MCD_SET_VAR(taskTable+channel, 27, (u32)0x00000000);	/* inc[3] */
-+	MCD_SET_VAR(taskTable+channel, 28, (u32)0x80000001);	/* inc[4] */
-+	MCD_SET_VAR(taskTable+channel, 29, (u32)0x40000000);	/* inc[5] */
-+
-+
-+    /* enable the task */
-+    MCD_dmaBar->taskControl[channel] |= (u16)0x8000; /* add a MACRO HERE TBD*/
-+}
-+
-+
-+/*
-+ * Task 2
-+ */
-+ 
-+void  MCD_startDmaChainEu(int *currBD, short srcIncr, short destIncr, int xferSize, short xferSizeIncr, int *cSave, volatile TaskTableEntry *taskTable, int channel)
-+{
-+	
-+	MCD_SET_VAR(taskTable+channel, 2, (u32)currBD);	/* var[2] */
-+	MCD_SET_VAR(taskTable+channel, 25, (u32)(0xe000 << 16) | (0xffff & srcIncr));	/* inc[1] */
-+	MCD_SET_VAR(taskTable+channel, 24, (u32)(0xe000 << 16) | (0xffff & destIncr));	/* inc[0] */
-+	MCD_SET_VAR(taskTable+channel, 19, (u32)xferSize);	/* var[19] */
-+	MCD_SET_VAR(taskTable+channel, 26, (u32)(0x2000 << 16) | (0xffff & xferSizeIncr));	/* inc[2] */
-+	MCD_SET_VAR(taskTable+channel, 0, (u32)cSave);	/* var[0] */
-+	MCD_SET_VAR(taskTable+channel, 1, (u32)0x00000000);	/* var[1] */
-+	MCD_SET_VAR(taskTable+channel, 3, (u32)0x00000000);	/* var[3] */
-+	MCD_SET_VAR(taskTable+channel, 4, (u32)0x00000000);	/* var[4] */
-+	MCD_SET_VAR(taskTable+channel, 5, (u32)0x00000000);	/* var[5] */
-+	MCD_SET_VAR(taskTable+channel, 6, (u32)0x00000000);	/* var[6] */
-+	MCD_SET_VAR(taskTable+channel, 7, (u32)0x00000000);	/* var[7] */
-+	MCD_SET_VAR(taskTable+channel, 8, (u32)0x00000000);	/* var[8] */
-+	MCD_SET_VAR(taskTable+channel, 9, (u32)0x00000000);	/* var[9] */
-+	MCD_SET_VAR(taskTable+channel, 10, (u32)0x00000000);	/* var[10] */
-+	MCD_SET_VAR(taskTable+channel, 11, (u32)0x00000000);	/* var[11] */
-+	MCD_SET_VAR(taskTable+channel, 12, (u32)0x00000000);	/* var[12] */
-+	MCD_SET_VAR(taskTable+channel, 13, (u32)0x00000000);	/* var[13] */
-+	MCD_SET_VAR(taskTable+channel, 14, (u32)0x00000000);	/* var[14] */
-+	MCD_SET_VAR(taskTable+channel, 15, (u32)0x00000000);	/* var[15] */
-+	MCD_SET_VAR(taskTable+channel, 16, (u32)0x00000000);	/* var[16] */
-+	MCD_SET_VAR(taskTable+channel, 17, (u32)0x00000000);	/* var[17] */
-+	MCD_SET_VAR(taskTable+channel, 18, (u32)0x00000000);	/* var[18] */
-+	MCD_SET_VAR(taskTable+channel, 20, (u32)0x00000000);	/* var[20] */
-+	MCD_SET_VAR(taskTable+channel, 21, (u32)0x00000010);	/* var[21] */
-+	MCD_SET_VAR(taskTable+channel, 22, (u32)0x00000004);	/* var[22] */
-+	MCD_SET_VAR(taskTable+channel, 23, (u32)0x00000080);	/* var[23] */
-+	MCD_SET_VAR(taskTable+channel, 27, (u32)0x00000000);	/* inc[3] */
-+	MCD_SET_VAR(taskTable+channel, 28, (u32)0x60000000);	/* inc[4] */
-+	MCD_SET_VAR(taskTable+channel, 29, (u32)0x80000001);	/* inc[5] */
-+	MCD_SET_VAR(taskTable+channel, 30, (u32)0x80000000);	/* inc[6] */
-+	MCD_SET_VAR(taskTable+channel, 31, (u32)0x40000000);	/* inc[7] */
-+
-+    /*enable the task*/
-+    MCD_dmaBar->taskControl[channel] |= (u16)0x8000; /* add a MACRO HERE TBD*/
-+}
-+
-+
-+/*
-+ * Task 3
-+ */
-+ 
-+void  MCD_startDmaSingleEu(char *srcAddr, short srcIncr, char *destAddr, short destIncr, int dmaSize, int dmaSizeMXferSize, short xferSizeIncr, int flags, int *currBD, int *cSave, volatile TaskTableEntry *taskTable, int channel)
-+{
-+	
-+	MCD_SET_VAR(taskTable+channel, 13, (u32)srcAddr);	/* var[13] */
-+	MCD_SET_VAR(taskTable+channel, 25, (u32)(0xe000 << 16) | (0xffff & srcIncr));	/* inc[1] */
-+	MCD_SET_VAR(taskTable+channel, 4, (u32)destAddr);	/* var[4] */
-+	MCD_SET_VAR(taskTable+channel, 24, (u32)(0xe000 << 16) | (0xffff & destIncr));	/* inc[0] */
-+	MCD_SET_VAR(taskTable+channel, 6, (u32)dmaSize);	/* var[6] */
-+	MCD_SET_VAR(taskTable+channel, 7, (u32)dmaSizeMXferSize);	/* var[7] */
-+	MCD_SET_VAR(taskTable+channel, 26, (u32)(0x2000 << 16) | (0xffff & xferSizeIncr));	/* inc[2] */
-+	MCD_SET_VAR(taskTable+channel, 9, (u32)flags);	/* var[9] */
-+	MCD_SET_VAR(taskTable+channel, 1, (u32)currBD);	/* var[1] */
-+	MCD_SET_VAR(taskTable+channel, 0, (u32)cSave);	/* var[0] */
-+	MCD_SET_VAR(taskTable+channel, 2, (u32)0x00000000);	/* var[2] */
-+	MCD_SET_VAR(taskTable+channel, 3, (u32)0x00000000);	/* var[3] */
-+	MCD_SET_VAR(taskTable+channel, 5, (u32)0x00000000);	/* var[5] */
-+	MCD_SET_VAR(taskTable+channel, 8, (u32)0x00000000);	/* var[8] */
-+	MCD_SET_VAR(taskTable+channel, 10, (u32)0x00000000);	/* var[10] */
-+	MCD_SET_VAR(taskTable+channel, 11, (u32)0x00000000);	/* var[11] */
-+	MCD_SET_VAR(taskTable+channel, 12, (u32)0x00000000);	/* var[12] */
-+	MCD_SET_VAR(taskTable+channel, 14, (u32)0x00000000);	/* var[14] */
-+	MCD_SET_VAR(taskTable+channel, 15, (u32)0x00000000);	/* var[15] */
-+	MCD_SET_VAR(taskTable+channel, 16, (u32)0x00000004);	/* var[16] */
-+	MCD_SET_VAR(taskTable+channel, 17, (u32)0x00000080);	/* var[17] */
-+	MCD_SET_VAR(taskTable+channel, 27, (u32)0x00000000);	/* inc[3] */
-+	MCD_SET_VAR(taskTable+channel, 28, (u32)0x80000001);	/* inc[4] */
-+	MCD_SET_VAR(taskTable+channel, 29, (u32)0x40000000);	/* inc[5] */
-+
-+    /*enable the task*/
-+    MCD_dmaBar->taskControl[channel] |= (u16)0x8000; /* add a MACRO HERE TBD*/
-+
-+}
-+
-+
-+/*
-+ * Task 4
-+ */
-+ 
-+void  MCD_startDmaENetRcv(char *bDBase, char *currBD, char *rcvFifoPtr, volatile TaskTableEntry *taskTable, int channel)
-+{
-+	
-+	MCD_SET_VAR(taskTable+channel, 0, (u32)bDBase);	/* var[0] */
-+	MCD_SET_VAR(taskTable+channel, 4, (u32)currBD);	/* var[4] */
-+	MCD_SET_VAR(taskTable+channel, 7, (u32)rcvFifoPtr);	/* var[7] */
-+	MCD_SET_VAR(taskTable+channel, 1, (u32)0x00000000);	/* var[1] */
-+	MCD_SET_VAR(taskTable+channel, 2, (u32)0x00000000);	/* var[2] */
-+	MCD_SET_VAR(taskTable+channel, 3, (u32)0x00000000);	/* var[3] */
-+	MCD_SET_VAR(taskTable+channel, 5, (u32)0x00000000);	/* var[5] */
-+	MCD_SET_VAR(taskTable+channel, 6, (u32)0x00000000);	/* var[6] */
-+	MCD_SET_VAR(taskTable+channel, 8, (u32)0x00000000);	/* var[8] */
-+	MCD_SET_VAR(taskTable+channel, 9, (u32)0x00000000);	/* var[9] */
-+	MCD_SET_VAR(taskTable+channel, 10, (u32)0x0000ffff);	/* var[10] */
-+	MCD_SET_VAR(taskTable+channel, 11, (u32)0x30000000);	/* var[11] */
-+	MCD_SET_VAR(taskTable+channel, 12, (u32)0x0fffffff);	/* var[12] */
-+	MCD_SET_VAR(taskTable+channel, 13, (u32)0x00000008);	/* var[13] */
-+	MCD_SET_VAR(taskTable+channel, 24, (u32)0x00000000);	/* inc[0] */
-+	MCD_SET_VAR(taskTable+channel, 25, (u32)0x60000000);	/* inc[1] */
-+	MCD_SET_VAR(taskTable+channel, 26, (u32)0x20000004);	/* inc[2] */
-+	MCD_SET_VAR(taskTable+channel, 27, (u32)0x40000000);	/* inc[3] */
-+    /*enable the task*/
-+    MCD_dmaBar->taskControl[channel] |= (u16)0x8000; /* add a MACRO HERE TBD*/
-+
-+}
-+
-+
-+/*
-+ * Task 5
-+ */
-+ 
-+void  MCD_startDmaENetXmit(char *bDBase, char *currBD, char *xmitFifoPtr, volatile TaskTableEntry *taskTable, int channel)
-+{
-+	
-+	MCD_SET_VAR(taskTable+channel, 0, (u32)bDBase);	/* var[0] */
-+	MCD_SET_VAR(taskTable+channel, 3, (u32)currBD);	/* var[3] */
-+	MCD_SET_VAR(taskTable+channel, 11, (u32)xmitFifoPtr);	/* var[11] */
-+	MCD_SET_VAR(taskTable+channel, 1, (u32)0x00000000);	/* var[1] */
-+	MCD_SET_VAR(taskTable+channel, 2, (u32)0x00000000);	/* var[2] */
-+	MCD_SET_VAR(taskTable+channel, 4, (u32)0x00000000);	/* var[4] */
-+	MCD_SET_VAR(taskTable+channel, 5, (u32)0x00000000);	/* var[5] */
-+	MCD_SET_VAR(taskTable+channel, 6, (u32)0x00000000);	/* var[6] */
-+	MCD_SET_VAR(taskTable+channel, 7, (u32)0x00000000);	/* var[7] */
-+	MCD_SET_VAR(taskTable+channel, 8, (u32)0x00000000);	/* var[8] */
-+	MCD_SET_VAR(taskTable+channel, 9, (u32)0x00000000);	/* var[9] */
-+	MCD_SET_VAR(taskTable+channel, 10, (u32)0x00000000);	/* var[10] */
-+	MCD_SET_VAR(taskTable+channel, 12, (u32)0x00000000);	/* var[12] */
-+	MCD_SET_VAR(taskTable+channel, 13, (u32)0x0000ffff);	/* var[13] */
-+	MCD_SET_VAR(taskTable+channel, 14, (u32)0xffffffff);	/* var[14] */
-+	MCD_SET_VAR(taskTable+channel, 15, (u32)0x00000004);	/* var[15] */
-+	MCD_SET_VAR(taskTable+channel, 16, (u32)0x00000008);	/* var[16] */
-+	MCD_SET_VAR(taskTable+channel, 24, (u32)0x00000000);	/* inc[0] */
-+	MCD_SET_VAR(taskTable+channel, 25, (u32)0x60000000);	/* inc[1] */
-+	MCD_SET_VAR(taskTable+channel, 26, (u32)0x40000000);	/* inc[2] */
-+	MCD_SET_VAR(taskTable+channel, 27, (u32)0xc000fffc);	/* inc[3] */
-+	MCD_SET_VAR(taskTable+channel, 28, (u32)0xe0000004);	/* inc[4] */
-+	MCD_SET_VAR(taskTable+channel, 29, (u32)0x80000000);	/* inc[5] */
-+	MCD_SET_VAR(taskTable+channel, 30, (u32)0x4000ffff);	/* inc[6] */
-+	MCD_SET_VAR(taskTable+channel, 31, (u32)0xe0000001);	/* inc[7] */
-+
-+    /*enable the task*/
-+    MCD_dmaBar->taskControl[channel] |= (u16)0x8000; /* add a MACRO HERE TBD*/
-+
-+}
---- /dev/null
-+++ b/drivers/dma/MCD_tasksInit.h
-@@ -0,0 +1,73 @@
-+/*********************************************************************
-+ *
-+ * Copyright (C) 2004  Motorola, Inc.
-+ *  MOTOROLA, INC. All Rights Reserved.
-+ *  You are hereby granted a copyright license to use
-+ *  the SOFTWARE so long as this entire notice is
-+ *  retained without alteration in any modified and/or redistributed
-+ *  versions, and that such modified versions are clearly identified
-+ *  as such. No licenses are granted by implication, estoppel or
-+ *  otherwise under any patents or trademarks of Motorola, Inc. This
-+ *  software is provided on an "AS IS" basis and without warranty.
-+ *
-+ *  To the maximum extent permitted by applicable law, MOTOROLA
-+ *  DISCLAIMS ALL WARRANTIES WHETHER EXPRESS OR IMPLIED, INCLUDING
-+ *  IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-+ *  PURPOSE AND ANY WARRANTY AGAINST INFRINGEMENT WITH REGARD TO THE
-+ *  SOFTWARE (INCLUDING ANY MODIFIED VERSIONS THEREOF) AND ANY
-+ *  ACCOMPANYING WRITTEN MATERIALS.
-+ *
-+ *  To the maximum extent permitted by applicable law, IN NO EVENT
-+ *  SHALL MOTOROLA BE LIABLE FOR ANY DAMAGES WHATSOEVER (INCLUDING
-+ *  WITHOUT LIMITATION, DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS
-+ *  INTERRUPTION, LOSS OF BUSINESS INFORMATION, OR OTHER PECUNIARY
-+ *  LOSS) ARISING OF THE USE OR INABILITY TO USE THE SOFTWARE.
-+ *
-+ *  Motorola assumes no responsibility for the maintenance and support
-+ *  of this software
-+ ********************************************************************/
-+#ifndef MCD_TSK_INIT_H
-+#define MCD_TSK_INIT_H 1
-+
-+/*
-+ * Do not edit!
-+ */
-+
-+
-+
-+/*
-+ * Task 0
-+ */
-+void  MCD_startDmaChainNoEu(int *currBD, short srcIncr, short destIncr, int xferSize, short xferSizeIncr, int *cSave, volatile TaskTableEntry *taskTable, int channel);
-+
-+
-+/*
-+ * Task 1
-+ */
-+void  MCD_startDmaSingleNoEu(char *srcAddr, short srcIncr, char *destAddr, short destIncr, int dmaSize, int dmaSizeMXferSize, short xferSizeIncr, int flags, int *currBD, int *cSave, volatile TaskTableEntry *taskTable, int channel);
-+
-+
-+/*
-+ * Task 2
-+ */
-+void  MCD_startDmaChainEu(int *currBD, short srcIncr, short destIncr, int xferSize, short xferSizeIncr, int *cSave, volatile TaskTableEntry *taskTable, int channel);
-+
-+
-+/*
-+ * Task 3
-+ */
-+void  MCD_startDmaSingleEu(char *srcAddr, short srcIncr, char *destAddr, short destIncr, int dmaSize, int dmaSizeMXferSize, short xferSizeIncr, int flags, int *currBD, int *cSave, volatile TaskTableEntry *taskTable, int channel);
-+
-+
-+/*
-+ * Task 4
-+ */
-+void  MCD_startDmaENetRcv(char *bDBase, char *currBD, char *rcvFifoPtr, volatile TaskTableEntry *taskTable, int channel);
-+
-+
-+/*
-+ * Task 5
-+ */
-+void  MCD_startDmaENetXmit(char *bDBase, char *currBD, char *xmitFifoPtr, volatile TaskTableEntry *taskTable, int channel);
-+
-+#endif  /* MCD_TSK_INIT_H */
---- a/drivers/dma/Makefile
-+++ b/drivers/dma/Makefile
-@@ -4,3 +4,5 @@ obj-$(CONFIG_INTEL_IOATDMA) += ioatdma.o
- ioatdma-objs := ioat.o ioat_dma.o ioat_dca.o
- obj-$(CONFIG_INTEL_IOP_ADMA) += iop-adma.o
- obj-$(CONFIG_FSL_DMA) += fsldma.o
-+obj-$(CONFIG_MCD_DMA) += mcddma.o
-+mcddma-objs := MCD_dmaApi.o MCD_tasks.o MCD_tasksInit.o
---- a/drivers/net/Kconfig
-+++ b/drivers/net/Kconfig
-@@ -351,6 +351,8 @@ config MACB
- 
- source "drivers/net/arm/Kconfig"
- 
-+source "drivers/net/fec/Kconfig"
-+
- config AX88796
- 	tristate "ASIX AX88796 NE2000 clone support"
- 	depends on ARM || MIPS || SUPERH
---- a/drivers/net/Makefile
-+++ b/drivers/net/Makefile
-@@ -226,6 +226,8 @@ obj-$(CONFIG_ENC28J60) += enc28j60.o
- 
- obj-$(CONFIG_MACB) += macb.o
- 
-+obj-$(CONFIG_FEC_548x) += fec/
-+
- obj-$(CONFIG_ARM) += arm/
- obj-$(CONFIG_DEV_APPLETALK) += appletalk/
- obj-$(CONFIG_TR) += tokenring/
---- /dev/null
-+++ b/drivers/net/fec/Kconfig
-@@ -0,0 +1,25 @@
-+config FEC_548x
-+	tristate "MCF547x/MCF548x Fast Ethernet Controller support"
-+	depends on M547X_8X
-+ 	help
-+	  The MCF547x and MCF548x have a built-in Fast Ethernet Controller.
-+	  Saying Y here will include support for this device in the kernel.
-+
-+	  To compile this driver as a module, choose M here: the module
-+	  will be called fecm.
-+
-+config FEC_548x_AUTO_NEGOTIATION
-+	bool "Enable Auto-Negotiation"
-+	depends on FEC_548x
-+	help
-+	  This option enables the FEC to automatically detect the 
-+	  half/full duplex mode and the network speed at initialization
-+	  If you want this, say Y.
-+
-+config FEC_548x_ENABLE_FEC2
-+	bool "Enable the second FEC"
-+	depends on FEC_548x
-+	help
-+	  This enables the second FEC on the 547x/548x. If you want to use
-+	  it, say Y.
-+
---- /dev/null
-+++ b/drivers/net/fec/Makefile
-@@ -0,0 +1,7 @@
-+#
-+# Makefile for the FEC ethernet driver
-+#
-+
-+obj-$(CONFIG_FEC_548x) += fecm.o
-+
-+fecm-objs := fec.o ks8721.o
---- /dev/null
-+++ b/drivers/net/fec/fec.c
-@@ -0,0 +1,1375 @@
-+/*
-+ * Performance and stability improvements: (C) Copyright 2008,
-+ *      Daniel Krueger, SYSTEC electronic GmbH
-+ *
-+ * Code crunched to get it to work on 2.6.24 -- FEC cleanup coming
-+ * soon -- Kurt Mahan
-+ *
-+ */
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/string.h>
-+#include <linux/ptrace.h>
-+#include <linux/errno.h>
-+#include <linux/ioport.h>
-+#include <linux/slab.h>
-+#include <linux/interrupt.h>
-+#include <linux/pci.h>
-+#include <linux/init.h>
-+#include <linux/delay.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/skbuff.h>
-+#include <linux/spinlock.h>
-+#include <linux/workqueue.h>
-+#include <linux/bitops.h>
-+
-+#include <asm/coldfire.h>
-+#include <asm/mcfsim.h>
-+
-+#include <asm/dma.h>
-+#include <asm/MCD_dma.h>
-+#include <asm/m5485sram.h>
-+#include <asm/virtconvert.h>
-+#include <asm/irq.h>
-+
-+#include "fec.h"
-+#include "ks8721.h"
-+
-+#ifdef	CONFIG_FEC_548x_ENABLE_FEC2
-+#define	FEC_MAX_PORTS	2
-+#define	FEC_2
-+#else
-+#define	FEC_MAX_PORTS	1
-+#undef	FEC_2
-+#endif
-+
-+#define VERSION "0.13"
-+MODULE_DESCRIPTION( "DMA Fast Ethernet Controller driver ver " VERSION);
-+
-+// Private structure
-+struct fec_priv {
-+	struct net_device *netdev;		/* owning net device */
-+	void* fecpriv_txbuf[FEC_TX_BUF_NUMBER];	//Array of transmission buffers
-+	MCD_bufDescFec *fecpriv_txdesc;	// Array of transmission descriptors
-+	volatile unsigned int fecpriv_current_tx;	// Inex of the transmission descriptor that is used by DMA
-+	volatile unsigned int fecpriv_next_tx;	// Inex of the transmission descriptor that can be used for new data
-+	unsigned int fecpriv_current_rx;	// Index of the reception descriptor that is used by DMA
-+	MCD_bufDescFec *fecpriv_rxdesc;		// Array of reception descriptors
-+//	unsigned char *fecpriv_rxbuf;		// Address of reception buffers
-+	struct sk_buff *askb_rx[FEC_RX_BUF_NUMBER]; // Array of reception skb structure pointers
-+	unsigned int fecpriv_initiator_rx;	// Reception DMA initiator
-+	unsigned int fecpriv_initiator_tx;	// Transmission DMA initiator
-+	int fecpriv_fec_rx_channel;	// DMA reception channel
-+	int fecpriv_fec_tx_channel;	// DMA transmission channel
-+	int fecpriv_rx_requestor;	// DMA reception requestor
-+	int fecpriv_tx_requestor;	// DMA transmission requestor
-+	void *fecpriv_interrupt_fec_rx_handler;	// DMA reception handler
-+	void *fecpriv_interrupt_fec_tx_handler;	// DMA transmission handler
-+	unsigned char *fecpriv_mac_addr;	// Private copy of FEC address
-+	struct net_device_stats fecpriv_stat;	// Pointer to the statistical information
-+	spinlock_t fecpriv_lock;
-+	int fecpriv_rxflag;
-+	struct tasklet_struct fecpriv_tasklet_reinit;
-+	int index;
-+};
-+
-+struct net_device *fec_dev[FEC_MAX_PORTS];
-+
-+// FEC functions
-+int __init fec_init(void);
-+struct net_device_stats *fec_get_stat(struct net_device *dev);
-+
-+int fec_open(struct net_device *dev);
-+int fec_close(struct net_device *nd);
-+int fec_tx(struct sk_buff *skb, struct net_device *dev);
-+void fec_set_multicast_list(struct net_device *nd);
-+int fec_set_mac_address(struct net_device *dev, void *p);
-+void fec_tx_timeout(struct net_device *dev);
-+void fec_interrupt_fec_tx_handler(struct net_device *dev);
-+void fec_interrupt_fec_rx_handler(struct net_device *dev);
-+irqreturn_t fec_interrupt_handler(int irq, void *dev_id);
-+void fec_interrupt_fec_tx_handler_fec0(void);
-+void fec_interrupt_fec_rx_handler_fec0(void);
-+void fec_interrupt_fec_reinit(unsigned long data);
-+
-+unsigned char fec_mac_addr_fec0[6] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x50 };	// Default address of FEC0
-+
-+#ifdef   FEC_2
-+unsigned char fec_mac_addr_fec1[6] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x51 };	// Default address of FEC1
-+#endif
-+
-+#ifndef MODULE
-+int fec_str_to_mac( char *str_mac, unsigned char* addr);
-+int __init fec_mac_setup0 (char *s);
-+#endif
-+
-+
-+#ifdef   FEC_2
-+void fec_interrupt_fec_tx_handler_fec1(void);
-+void fec_interrupt_fec_rx_handler_fec1(void);
-+
-+#ifndef MODULE
-+int __init fec_mac_setup1 (char *s);
-+#endif
-+
-+#endif
-+int fec_read_mii(unsigned int base_addr, unsigned int pa, unsigned int ra, unsigned int *data);
-+int fec_write_mii(unsigned int base_addr, unsigned int pa, unsigned int ra, unsigned int data);
-+
-+module_init(fec_init);
-+/* module_exit(fec_cleanup); */
-+__setup("mac0=", fec_mac_setup0);
-+
-+#ifdef   FEC_2
-+__setup("mac1=", fec_mac_setup1);
-+#endif
-+
-+/*
-+ * Initialize a FEC device
-+ */
-+int fec_enet_init(struct net_device *dev)
-+{
-+	static int index = 0;
-+	struct fec_priv *fp = netdev_priv(dev);
-+	int i;
-+
-+	fp->index = index;
-+	fp->netdev = dev;
-+	fec_dev[ index ] = dev;
-+printk(KERN_INFO "FEI: index=%d\n", index);
-+
-+	if (index == 0) {
-+		/* disable fec0 */
-+		FEC_ECR(FEC_BASE_ADDR_FEC0) = FEC_ECR_DISABLE;
-+
-+		/* setup the interrupt handler */
-+		dev->irq = 64 + ISC_FEC0;
-+
-+		if (request_irq(dev->irq, fec_interrupt_handler,
-+		                IRQF_DISABLED, "ColdFire FEC 0", dev)) {
-+			dev->irq = 0;
-+			printk("Cannot allocate FEC0 IRQ\n");
-+		} else {
-+			/* interrupt priority and level */
-+			MCF_ICR(ISC_FEC0) = ILP_FEC0;
-+		}
-+
-+		/* fec base address */
-+		dev->base_addr = FEC_BASE_ADDR_FEC0;
-+
-+		/* requestor numbers */
-+		fp->fecpriv_rx_requestor = DMA_FEC0_RX;
-+		fp->fecpriv_tx_requestor = DMA_FEC0_TX;
-+
-+		/* fec0 handlers */
-+		fp->fecpriv_interrupt_fec_rx_handler = fec_interrupt_fec_rx_handler_fec0;
-+		fp->fecpriv_interrupt_fec_tx_handler = fec_interrupt_fec_tx_handler_fec0;
-+
-+		/* tx descriptors */
-+		fp->fecpriv_txdesc = (void*)FEC_TX_DESC_FEC0;
-+
-+		/* rx descriptors */
-+		fp->fecpriv_rxdesc = (void*)FEC_RX_DESC_FEC0;
-+
-+printk(KERN_INFO "FEI: txdesc=0x%p  rxdesc=0x%p\n", fp->fecpriv_txdesc, fp->fecpriv_rxdesc);
-+
-+		/* mac addr */
-+		fp->fecpriv_mac_addr = fec_mac_addr_fec0;
-+	}
-+	else {
-+		/* disable fec1 */
-+		FEC_ECR(FEC_BASE_ADDR_FEC1) = FEC_ECR_DISABLE;
-+#ifdef FEC_2
-+		/* setup the interrupt handler */
-+		dev->irq = 64 + ISC_FEC1;
-+
-+		if (request_irq(dev->irq, fec_interrupt_handler,
-+		                IRQF_DISABLED, "ColdFire FEC 1", dev)) {
-+			dev->irq = 0;
-+			printk("Cannot allocate FEC1 IRQ\n");
-+		} else {
-+			/* interrupt priority and level */
-+			MCF_ICR(ISC_FEC1) = ILP_FEC1;
-+		}
-+
-+		/* fec base address */
-+		dev->base_addr = FEC_BASE_ADDR_FEC1;
-+
-+		/* requestor numbers */
-+		fp->fecpriv_rx_requestor = DMA_FEC1_RX;
-+		fp->fecpriv_tx_requestor = DMA_FEC1_TX;
-+
-+		/* fec1 handlers */
-+		fp->fecpriv_interrupt_fec_rx_handler = fec_interrupt_fec_rx_handler_fec1;
-+		fp->fecpriv_interrupt_fec_tx_handler = fec_interrupt_fec_tx_handler_fec1;
-+
-+		/* tx descriptors */
-+		fp->fecpriv_txdesc = (void*)FEC_TX_DESC_FEC1;
-+
-+		/* rx descriptors */
-+		fp->fecpriv_rxdesc = (void*)FEC_RX_DESC_FEC1;
-+
-+		/* mac addr */
-+		fp->fecpriv_mac_addr = fec_mac_addr_fec1;
-+#endif
-+	}
-+
-+printk(KERN_INFO "FEI: index=%d base_addr=0x%lx\n", index, dev->base_addr);
-+
-+	/* clear MIB */
-+	memset((void *) (dev->base_addr + 0x200), 0, FEC_MIB_LEN);
-+
-+	/* clear the statistics structure */
-+	memset((void *) &(fp->fecpriv_stat), 0,
-+	       sizeof(struct net_device_stats));
-+
-+	/* grab the FEC initiators */
-+	dma_set_initiator(fp->fecpriv_tx_requestor);
-+	fp->fecpriv_initiator_tx = dma_get_initiator(fp->fecpriv_tx_requestor);
-+	dma_set_initiator(fp->fecpriv_rx_requestor);
-+	fp->fecpriv_initiator_rx = dma_get_initiator(fp->fecpriv_rx_requestor);
-+
-+	/* reset the DMA channels */
-+	fp->fecpriv_fec_rx_channel = -1;
-+	fp->fecpriv_fec_tx_channel = -1;
-+
-+	for (i = 0; i < FEC_RX_BUF_NUMBER; i++)
-+		fp->askb_rx[i] = NULL;
-+
-+	/* initialize the pointers to the socket buffers */
-+	for (i = 0; i < FEC_TX_BUF_NUMBER; i++)
-+		fp->fecpriv_txbuf[i] = NULL;
-+
-+	ether_setup(dev);
-+
-+	dev->open = fec_open;
-+	dev->stop = fec_close;
-+	dev->hard_start_xmit = fec_tx;
-+	dev->get_stats = fec_get_stat;
-+	dev->set_multicast_list = fec_set_multicast_list;
-+	dev->set_mac_address = fec_set_mac_address;
-+	dev->tx_timeout = fec_tx_timeout;
-+	dev->watchdog_timeo = FEC_TX_TIMEOUT * HZ;
-+
-+	memcpy(dev->dev_addr, fp->fecpriv_mac_addr, ETH_ALEN);
-+
-+	spin_lock_init(&fp->fecpriv_lock);
-+
-+	// Initialize FEC/I2C/IRQ Pin Assignment Register
-+	FEC_GPIO_PAR_FECI2CIRQ &= 0xF;
-+	FEC_GPIO_PAR_FECI2CIRQ |= FEC_FECI2CIRQ;
-+
-+	index++;
-+	return 0;
-+}
-+
-+/*
-+ * Module Initialization
-+ */
-+int __init fec_init(void)
-+{
-+	struct net_device *dev;
-+	int i;
-+	int err;
-+	DECLARE_MAC_BUF(mac);
-+
-+	printk(KERN_INFO "FEC ENET (DMA) Version .00\n");
-+
-+
-+	for (i = 0; i < FEC_MAX_PORTS; i++) {
-+		dev = alloc_etherdev(sizeof(struct fec_priv));
-+		if (!dev)
-+			return -ENOMEM;
-+		err = fec_enet_init(dev);
-+		if (err) {
-+			free_netdev(dev);
-+			continue;
-+		}
-+		if (register_netdev(dev) != 0) {
-+			free_netdev(dev);
-+			return -EIO;
-+		}
-+
-+		printk(KERN_INFO "%s: ethernet %s\n",
-+		       dev->name, print_mac(mac, dev->dev_addr));
-+	}
-+	return 0;
-+}
-+
-+/*
-+ * Stop a device
-+ */
-+void fec_stop(struct net_device *dev)
-+{
-+	struct fec_priv *fp = netdev_priv(dev);
-+
-+	dma_remove_initiator(fp->fecpriv_initiator_tx);
-+	dma_remove_initiator(fp->fecpriv_initiator_rx);
-+
-+	if (dev->irq)
-+		free_irq(dev->irq, dev);
-+}
-+
-+/************************************************************************
-+* NAME: fec_open
-+*
-+* DESCRIPTION: This function performs the initialization of
-+*				of FEC and corresponding KS8721 transiver
-+*
-+* RETURNS: If no error occurs, this function returns zero.
-+*************************************************************************/
-+
-+int fec_open(struct net_device *dev)
-+{
-+	struct fec_priv *fp = netdev_priv(dev);
-+	unsigned long base_addr = (unsigned long) dev->base_addr;
-+	int fduplex;
-+	int i;
-+	int channel;
-+	int error_code = -EBUSY;
-+
-+printk(KERN_INFO "FECOPEN: index=%d\n", fp->index);
-+
-+	//Receive the DMA channels
-+	channel = dma_set_channel_fec(fp->fecpriv_rx_requestor);
-+
-+	if (channel == -1)
-+	{
-+		printk("Dma channel cannot be reserved\n");
-+		goto ERRORS;
-+	}
-+
-+	fp->fecpriv_fec_rx_channel = channel;
-+
-+	dma_connect(channel, (int) fp->fecpriv_interrupt_fec_rx_handler);
-+
-+	channel = dma_set_channel_fec(fp->fecpriv_tx_requestor);
-+
-+	if (channel == -1)
-+	{
-+		printk("Dma channel cannot be reserved\n");
-+		goto ERRORS;
-+	}
-+printk(KERN_INFO "FECOPEN2\n");
-+
-+	fp->fecpriv_fec_tx_channel = channel;
-+
-+	dma_connect(channel, (int) fp->fecpriv_interrupt_fec_tx_handler);
-+
-+	// init tasklet for controller reinitialization
-+	tasklet_init(&fp->fecpriv_tasklet_reinit, fec_interrupt_fec_reinit, (unsigned long) dev);
-+printk(KERN_INFO "FECOPEN3\n");
-+
-+	// Reset FIFOs
-+	FEC_FECFRST(base_addr) |= FEC_SW_RST | FEC_RST_CTL;
-+	FEC_FECFRST(base_addr) &= ~FEC_SW_RST;
-+
-+	// Reset and disable FEC
-+	FEC_ECR(base_addr) = FEC_ECR_RESET;
-+
-+	// Wait
-+	udelay(10);
-+
-+	// Clear all events
-+	FEC_EIR(base_addr) = FEC_EIR_CLEAR;
-+
-+	// Reset FIFO status
-+	FEC_FECTFSR(base_addr) = FEC_FECTFSR_MSK;
-+	FEC_FECRFSR(base_addr) = FEC_FECRFSR_MSK;
-+
-+#if 0
-+/* JKM -- move into HW init */
-+	// Copy the default address to the device structure
-+	memcpy(dev->dev_addr, fp->fecpriv_mac_addr, ETH_ALEN);
-+#endif
-+
-+	// Set the default address
-+	FEC_PALR(base_addr) = (fp->fecpriv_mac_addr[0] << 24) | (fp->fecpriv_mac_addr[1] << 16) | (fp->fecpriv_mac_addr[2] << 8) | fp->fecpriv_mac_addr[3];
-+	FEC_PAUR(base_addr) = (fp->fecpriv_mac_addr[4] << 24) | (fp->fecpriv_mac_addr[5] << 16) | 0x8808;
-+
-+	// Reset the group address descriptor
-+	FEC_GALR(base_addr) = 0x00000000;
-+	FEC_GAUR(base_addr) = 0x00000000;
-+
-+	// Reset the individual address descriptor
-+	FEC_IALR(base_addr) = 0x00000000;
-+	FEC_IAUR(base_addr) = 0x00000000;
-+
-+	// Set the receive control register
-+	FEC_RCR(base_addr) = FEC_RCR_MAX_FRM_SIZE | FEC_RCR_MII;
-+
-+	// Set the receive FIFO control register
-+//	FEC_FECRFCR(base_addr) = FEC_FECRFCR_FRM | FEC_FECRFCR_GR | FEC_FECRFCR_MSK;
-+	FEC_FECRFCR(base_addr) = FEC_FECRFCR_FRM | FEC_FECRFCR_GR
-+                             | (FEC_FECRFCR_MSK     // disable all but ...
-+                                & ~FEC_FECRFCR_FAE  // enable frame accept error
-+                                & ~FEC_FECRFCR_RXW  // enable receive wait condition
-+//                                & ~FEC_FECRFCR_UF   // enable FIFO underflow
-+                             );
-+
-+	//Set the receive FIFO alarm register
-+	FEC_FECRFAR(base_addr) = FEC_FECRFAR_ALARM;
-+
-+	// Set the transmit FIFO control register
-+//	FEC_FECTFCR(base_addr) = FEC_FECTFCR_FRM | FEC_FECTFCR_GR | FEC_FECTFCR_MSK;
-+	FEC_FECTFCR(base_addr) = FEC_FECTFCR_FRM | FEC_FECTFCR_GR
-+                             | (FEC_FECTFCR_MSK     // disable all but ...
-+                                & ~FEC_FECTFCR_FAE  // enable frame accept error
-+//                                & ~FEC_FECTFCR_TXW  // enable transmit wait condition
-+//                                & ~FEC_FECTFCR_UF   // enable FIFO underflow
-+                                & ~FEC_FECTFCR_OF); // enable FIFO overflow
-+
-+	//Set the transmit FIFO alarm register
-+	FEC_FECTFAR(base_addr) = FEC_FECTFAR_ALARM;
-+
-+	// Set the Tx FIFO watermark
-+	FEC_FECTFWR(base_addr) = FEC_FECTFWR_XWMRK;
-+
-+	// Enable the transmitter to append the CRC
-+	FEC_CTCWR(base_addr) = FEC_CTCWR_TFCW_CRC;
-+
-+	// Enable the ethernet interrupts
-+//	FEC_EIMR(base_addr) = FEC_EIMR_MASK;
-+	FEC_EIMR(base_addr) = FEC_EIMR_DISABLE
-+                            | FEC_EIR_LC
-+                            | FEC_EIR_RL
-+                            | FEC_EIR_HBERR
-+                            | FEC_EIR_XFUN
-+                            | FEC_EIR_XFERR
-+                            | FEC_EIR_RFERR
-+                            ;
-+printk(KERN_INFO "FECOPEN4\n");
-+
-+#ifdef   CONFIG_FEC_548x_AUTO_NEGOTIATION
-+	if ((error_code = init_transceiver(base_addr, &fduplex)) != 0)
-+	{
-+		printk("Initialization of the transceiver is failed\n");
-+		goto ERRORS;
-+	}
-+#else
-+	fduplex = 1;
-+#endif
-+printk(KERN_INFO "FECOPEN5\n");
-+
-+	if (fduplex)
-+		// Enable the full duplex mode
-+		FEC_TCR(base_addr) = FEC_TCR_FDEN | FEC_TCR_HBC;
-+	else
-+		// Disable reception of frames while transmitting
-+		FEC_RCR(base_addr) |= FEC_RCR_DRT;
-+
-+	// Enable MIB
-+	FEC_MIBC(base_addr) = FEC_MIBC_ENABLE;
-+
-+	// Enable FEC
-+	FEC_ECR(base_addr) |= FEC_ECR_ETHEREN;
-+
-+	// Initialize transmission descriptors and start DMA for the transmission
-+	for (i = 0; i < FEC_TX_BUF_NUMBER; i++)
-+		fp->fecpriv_txdesc[i].statCtrl = MCD_FEC_INTERRUPT;
-+printk(KERN_INFO "FECOPEN6\n");
-+
-+	fp->fecpriv_txdesc[i - 1].statCtrl |= MCD_FEC_WRAP;
-+
-+	fp->fecpriv_current_tx = fp->fecpriv_next_tx = 0;
-+
-+	MCD_startDma(fp->fecpriv_fec_tx_channel, (char *) fp->fecpriv_txdesc, 0,
-+		     (unsigned char *) &(FEC_FECTFDR(base_addr)), 0,
-+		     FEC_MAX_FRM_SIZE, 0, fp->fecpriv_initiator_tx,
-+		     FEC_TX_DMA_PRI, MCD_FECTX_DMA | MCD_INTERRUPT,
-+		     MCD_NO_CSUM | MCD_NO_BYTE_SWAP);
-+
-+	// Initialize reception descriptors and start DMA for the reception
-+	for (i = 0; i < FEC_RX_BUF_NUMBER; i++)
-+	{
-+		fp->askb_rx[i] = alloc_skb(FEC_MAXBUF_SIZE + 16, GFP_DMA);
-+		if (!fp->askb_rx[i])
-+		{
-+    		fp->fecpriv_rxdesc[i].dataPointer = 0;
-+    		fp->fecpriv_rxdesc[i].statCtrl = 0;
-+	    	fp->fecpriv_rxdesc[i].length = 0;
-+		}
-+		else
-+		{
-+		    skb_reserve(fp->askb_rx[i], 16);
-+			fp->askb_rx[i]->dev = dev;
-+    		fp->fecpriv_rxdesc[i].dataPointer = (unsigned int) virt_to_phys(fp->askb_rx[i]->tail);
-+    		fp->fecpriv_rxdesc[i].statCtrl = MCD_FEC_BUF_READY | MCD_FEC_INTERRUPT;
-+	    	fp->fecpriv_rxdesc[i].length = FEC_MAXBUF_SIZE;
-+	    }
-+	}
-+printk(KERN_INFO "FECOPEN7\n");
-+
-+	fp->fecpriv_rxdesc[i - 1].statCtrl |= MCD_FEC_WRAP;
-+	fp->fecpriv_current_rx = 0;
-+
-+	// flush entire data cache before restarting the DMA
-+#if 0
-+/* JKM -- currently running with cache turned off */
-+	DcacheFlushInvalidate();
-+#endif
-+	
-+	MCD_startDma(fp->fecpriv_fec_rx_channel, (char *) fp->fecpriv_rxdesc, 0,
-+		     (unsigned char *) &(FEC_FECRFDR(base_addr)), 0,
-+		     FEC_MAX_FRM_SIZE, 0, fp->fecpriv_initiator_rx,
-+		     FEC_RX_DMA_PRI, MCD_FECRX_DMA | MCD_INTERRUPT,
-+		     MCD_NO_CSUM | MCD_NO_BYTE_SWAP);
-+
-+	netif_start_queue(dev);
-+
-+//	MOD_INC_USE_COUNT;
-+printk(KERN_INFO "FECOPEN: finished\n");
-+
-+	return 0;
-+
-+ERRORS:
-+
-+	// Remove the channels and return with the error code
-+	if (fp->fecpriv_fec_rx_channel != -1)
-+	{
-+		dma_disconnect(fp->fecpriv_fec_rx_channel);
-+		dma_remove_channel_by_number(fp->fecpriv_fec_rx_channel);
-+		fp->fecpriv_fec_rx_channel = -1;
-+	}
-+
-+	if (fp->fecpriv_fec_tx_channel != -1)
-+	{
-+		dma_disconnect(fp->fecpriv_fec_tx_channel);
-+		dma_remove_channel_by_number(fp->fecpriv_fec_tx_channel);
-+		fp->fecpriv_fec_tx_channel = -1;
-+	}
-+
-+	return error_code;
-+
-+}
-+
-+/************************************************************************
-+* NAME: fec_close
-+*
-+* DESCRIPTION: This function performs the graceful stop of the
-+*				transmission and disables FEC
-+*
-+* RETURNS: This function always returns zero.
-+*************************************************************************/
-+int fec_close(struct net_device *dev)
-+{
-+	//Receive the pointer to the private structure
-+	struct fec_priv *fp = netdev_priv(dev);
-+
-+	// Receive the base address
-+	unsigned long base_addr = (unsigned long) dev->base_addr;
-+
-+	unsigned long time;
-+
-+	int i;
-+
-+	netif_stop_queue(dev);
-+
-+	// Perform the graceful stop
-+	FEC_TCR(base_addr) |= FEC_TCR_GTS;
-+
-+	time = jiffies;
-+
-+	// Wait for the graceful stop
-+	while (!(FEC_EIR(base_addr) & FEC_EIR_GRA) && jiffies - time < FEC_GR_TIMEOUT * HZ)
-+		schedule();
-+
-+	// Disable FEC
-+	FEC_ECR(base_addr) = FEC_ECR_DISABLE;
-+
-+	// Reset the DMA channels
-+	spin_lock_irq(&fp->fecpriv_lock);
-+	MCD_killDma(fp->fecpriv_fec_tx_channel);
-+	spin_unlock_irq(&fp->fecpriv_lock);
-+	dma_remove_channel_by_number(fp->fecpriv_fec_tx_channel);
-+	dma_disconnect(fp->fecpriv_fec_tx_channel);
-+	fp->fecpriv_fec_tx_channel = -1;
-+
-+	for (i = 0; i < FEC_TX_BUF_NUMBER; i++)
-+		if (fp->fecpriv_txbuf[i])
-+		{
-+			kfree(fp->fecpriv_txbuf[i]);
-+			fp->fecpriv_txbuf[i] = NULL;
-+		}
-+
-+	spin_lock_irq(&fp->fecpriv_lock);
-+	MCD_killDma(fp->fecpriv_fec_rx_channel);
-+	spin_unlock_irq(&fp->fecpriv_lock);
-+
-+	dma_remove_channel_by_number(fp->fecpriv_fec_rx_channel);
-+	dma_disconnect(fp->fecpriv_fec_rx_channel);
-+	fp->fecpriv_fec_rx_channel = -1;
-+
-+	for (i = 0; i < FEC_RX_BUF_NUMBER; i++)
-+	{
-+		if (fp->askb_rx[i])
-+		{
-+		    kfree_skb(fp->askb_rx[i]);
-+		    fp->askb_rx[i] = NULL;
-+	    }
-+	}
-+//	MOD_DEC_USE_COUNT;
-+
-+	return 0;
-+}
-+
-+/************************************************************************
-+* +NAME: fec_get_stat
-+*
-+* RETURNS: This function returns the statistical information.
-+*************************************************************************/
-+struct net_device_stats * fec_get_stat(struct net_device *dev)
-+{
-+
-+	//Receive the pointer to the private structure
-+	struct fec_priv *fp = netdev_priv(dev);
-+
-+	// Receive the base address
-+	unsigned long base_addr = dev->base_addr;
-+
-+	// Receive the statistical information
-+	fp->fecpriv_stat.rx_packets = FECSTAT_RMON_R_PACKETS(base_addr);
-+	fp->fecpriv_stat.tx_packets = FECSTAT_RMON_T_PACKETS(base_addr);
-+	fp->fecpriv_stat.rx_bytes = FECSTAT_RMON_R_OCTETS(base_addr);
-+	fp->fecpriv_stat.tx_bytes = FECSTAT_RMON_T_OCTETS(base_addr);
-+
-+	fp->fecpriv_stat.multicast = FECSTAT_RMON_R_MC_PKT(base_addr);
-+	fp->fecpriv_stat.collisions = FECSTAT_RMON_T_COL(base_addr);
-+
-+	fp->fecpriv_stat.rx_length_errors = FECSTAT_RMON_R_UNDERSIZE(base_addr) + FECSTAT_RMON_R_OVERSIZE(base_addr) + FECSTAT_RMON_R_FRAG(base_addr) + FECSTAT_RMON_R_JAB(base_addr);
-+	fp->fecpriv_stat.rx_crc_errors = FECSTAT_IEEE_R_CRC(base_addr);
-+	fp->fecpriv_stat.rx_frame_errors = FECSTAT_IEEE_R_ALIGN(base_addr);
-+	fp->fecpriv_stat.rx_over_errors = FECSTAT_IEEE_R_MACERR(base_addr);
-+
-+	fp->fecpriv_stat.tx_carrier_errors = FECSTAT_IEEE_T_CSERR(base_addr);
-+	fp->fecpriv_stat.tx_fifo_errors = FECSTAT_IEEE_T_MACERR(base_addr);
-+	fp->fecpriv_stat.tx_window_errors = FECSTAT_IEEE_T_LCOL(base_addr);
-+
-+	// I hope that one frame doesn't have more than one error
-+	fp->fecpriv_stat.rx_errors = fp->fecpriv_stat.rx_length_errors + fp->fecpriv_stat.rx_crc_errors + fp->fecpriv_stat.rx_frame_errors + fp->fecpriv_stat.rx_over_errors + fp->fecpriv_stat.rx_dropped;
-+	fp->fecpriv_stat.tx_errors = fp->fecpriv_stat.tx_carrier_errors + fp->fecpriv_stat.tx_fifo_errors + fp->fecpriv_stat.tx_window_errors + fp->fecpriv_stat.tx_aborted_errors + fp->fecpriv_stat.tx_heartbeat_errors + fp->fecpriv_stat.tx_dropped;
-+
-+	return &fp->fecpriv_stat;
-+}
-+
-+/************************************************************************
-+* NAME: fec_set_multicast_list
-+*
-+* DESCRIPTION: This function sets the frame filtering parameters
-+*************************************************************************/
-+void fec_set_multicast_list(struct net_device *dev)
-+{
-+	// Pointer to the address list
-+	struct dev_mc_list *dmi;
-+
-+	unsigned int crc, data;
-+	int i, j, k;
-+
-+	// Receive the base address
-+	unsigned long base_addr = (unsigned long) dev->base_addr;
-+
-+	if (dev->flags & IFF_PROMISC || dev->flags & IFF_ALLMULTI)
-+	{
-+		// Allow all incoming frames
-+		FEC_GALR(base_addr) = 0xFFFFFFFF;
-+		FEC_GAUR(base_addr) = 0xFFFFFFFF;
-+		return;
-+	}
-+	// Reset the group address register
-+	FEC_GALR(base_addr) = 0x00000000;
-+	FEC_GAUR(base_addr) = 0x00000000;
-+
-+	// Process all addresses
-+	for (i = 0, dmi = dev->mc_list; i < dev->mc_count; i++, dmi = dmi->next)
-+	{
-+		// Processing must be only for the group addresses
-+		if (!(dmi->dmi_addr[0] & 1))
-+			continue;
-+
-+		// Calculate crc value for the current address
-+		crc = 0xFFFFFFFF;
-+		for (j = 0; j < dmi->dmi_addrlen; j++)
-+		{
-+
-+			for (k = 0, data = dmi->dmi_addr[j]; k < 8;  k++, data >>= 1)
-+			{
-+				if ((crc ^ data) & 1)
-+					crc = (crc >> 1) ^ FEC_CRCPOL;
-+				else
-+					crc >>= 1;
-+
-+			}
-+
-+		}
-+
-+		// Add this value
-+		crc >>= 26;
-+		crc &= 0x3F;
-+		if (crc > 31)
-+			FEC_GAUR(base_addr) |= 0x1 << (crc - 32);
-+		else
-+			FEC_GALR(base_addr) |= 0x1 << crc;
-+
-+	}
-+
-+}
-+
-+/************************************************************************
-+* NAME: fec_set_mac_address
-+*
-+* DESCRIPTION: This function sets the MAC address
-+*************************************************************************/
-+int fec_set_mac_address(struct net_device *dev, void *p)
-+{
-+	//Receive the pointer to the private structure
-+	struct fec_priv *fp = netdev_priv(dev);
-+
-+	// Receive the base address
-+	unsigned long base_addr = (unsigned long) dev->base_addr;
-+
-+	struct sockaddr *addr = p;
-+
-+	if (netif_running(dev))
-+		return -EBUSY;
-+
-+	// Copy a new address to the device structure
-+	memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
-+
-+	// Copy a new address to the private structure
-+	memcpy(fp->fecpriv_mac_addr, addr->sa_data, 6);
-+
-+	// Set the address to the registers
-+	FEC_PALR(base_addr) = (fp->fecpriv_mac_addr[0] << 24) | (fp->fecpriv_mac_addr[1] << 16) | (fp->fecpriv_mac_addr[2] << 8) | fp->fecpriv_mac_addr[3];
-+	FEC_PAUR(base_addr) = (fp->fecpriv_mac_addr[4] << 24) | (fp->fecpriv_mac_addr[5] << 16) | 0x8808;
-+
-+	return 0;
-+}
-+
-+/************************************************************************
-+* NAME: fec_tx
-+*
-+* DESCRIPTION: This function starts transmission of the frame using DMA
-+*
-+* RETURNS: This function always returns zero.
-+*************************************************************************/
-+int fec_tx(struct sk_buff *skb, struct net_device *dev)
-+{
-+
-+	//Receive the pointer to the private structure
-+	struct fec_priv *fp = netdev_priv(dev);
-+
-+	void *data, *data_aligned;
-+	int offset;
-+
-+printk(KERN_INFO "fec_tx\n");
-+	data = kmalloc(skb->len + 15, GFP_DMA | GFP_ATOMIC);
-+
-+	if (!data)
-+	{
-+		fp->fecpriv_stat.tx_dropped++;
-+		dev_kfree_skb(skb);
-+		return 0;
-+	}
-+
-+	offset = (((unsigned long)virt_to_phys(data) + 15) & 0xFFFFFFF0) - (unsigned long)virt_to_phys(data);
-+	data_aligned = (void*)((unsigned long)data + offset);
-+	memcpy(data_aligned, skb->data, skb->len);
-+
-+	// flush data cache before initializing the descriptor and starting DMA
-+#if 0
-+/* JKM -- currently running with cache turned off */
-+	DcacheFlushInvalidateCacheBlock((void*)virt_to_phys(data_aligned), skb->len);
-+#endif
-+
-+	spin_lock_irq(&fp->fecpriv_lock);
-+
-+	// Initialize the descriptor
-+	fp->fecpriv_txbuf[fp->fecpriv_next_tx] = data;
-+	fp->fecpriv_txdesc[fp->fecpriv_next_tx].dataPointer = (unsigned int) virt_to_phys(data_aligned);
-+	fp->fecpriv_txdesc[fp->fecpriv_next_tx].length = skb->len;
-+	fp->fecpriv_txdesc[fp->fecpriv_next_tx].statCtrl |= (MCD_FEC_END_FRAME | MCD_FEC_BUF_READY);
-+	fp->fecpriv_next_tx = (fp->fecpriv_next_tx + 1) & FEC_TX_INDEX_MASK;
-+
-+	if (fp->fecpriv_txbuf[fp->fecpriv_current_tx] && fp->fecpriv_current_tx == fp->fecpriv_next_tx)
-+		netif_stop_queue(dev);
-+
-+	spin_unlock_irq(&fp->fecpriv_lock);
-+
-+	// Tell the DMA to continue the transmission
-+	MCD_continDma(fp->fecpriv_fec_tx_channel);
-+
-+	dev_kfree_skb(skb);
-+
-+	dev->trans_start = jiffies;
-+
-+	return 0;
-+}
-+
-+/************************************************************************
-+* NAME: fec_tx_timeout
-+*
-+* DESCRIPTION: If the interrupt processing of received frames was lost
-+*              and DMA stopped the reception, this function clears
-+*              the transmission descriptors and starts DMA
-+*
-+*************************************************************************/
-+void fec_tx_timeout(struct net_device *dev)
-+{
-+	int i;
-+	struct fec_priv *fp = netdev_priv(dev);
-+	unsigned long base_addr = (unsigned long) dev->base_addr;
-+
-+printk(KERN_INFO "fec_tx_timeout\n");
-+	spin_lock_irq(&fp->fecpriv_lock);
-+	MCD_killDma(fp->fecpriv_fec_tx_channel);
-+	for (i = 0; i < FEC_TX_BUF_NUMBER; i++)
-+	{
-+		if (fp->fecpriv_txbuf[i])
-+		{
-+
-+			kfree(fp->fecpriv_txbuf[i]);
-+			fp->fecpriv_txbuf[i] = NULL;
-+
-+		}
-+		fp->fecpriv_txdesc[i].statCtrl = MCD_FEC_INTERRUPT;
-+	}
-+	fp->fecpriv_txdesc[i - 1].statCtrl |= MCD_FEC_WRAP;
-+
-+	fp->fecpriv_current_tx = fp->fecpriv_next_tx = 0;
-+
-+    // Reset FIFOs
-+    FEC_FECFRST(base_addr) |= FEC_SW_RST;
-+    FEC_FECFRST(base_addr) &= ~FEC_SW_RST;
-+
-+	// Reset and disable FEC
-+//	FEC_ECR(base_addr) = FEC_ECR_RESET;
-+
-+	// Enable FEC
-+	FEC_ECR(base_addr) |= FEC_ECR_ETHEREN;
-+
-+	MCD_startDma(fp->fecpriv_fec_tx_channel, (char *) fp->fecpriv_txdesc, 0,
-+		     (unsigned char *) &(FEC_FECTFDR(base_addr)), 0,
-+		     FEC_MAX_FRM_SIZE, 0, fp->fecpriv_initiator_tx,
-+		     FEC_TX_DMA_PRI, MCD_FECTX_DMA | MCD_INTERRUPT,
-+		     MCD_NO_CSUM | MCD_NO_BYTE_SWAP);
-+
-+	spin_unlock_irq(&fp->fecpriv_lock);
-+
-+	netif_wake_queue(dev);
-+
-+}
-+
-+/************************************************************************
-+* NAME: fec_read_mii
-+*
-+* DESCRIPTION: This function reads the value from the MII register
-+*
-+* RETURNS: If no error occurs, this function returns zero.
-+*************************************************************************/
-+int fec_read_mii(unsigned int base_addr, unsigned int pa, unsigned int ra, unsigned int *data)
-+{
-+	unsigned long time;
-+
-+	// Clear the MII interrupt bit
-+	FEC_EIR(base_addr) = FEC_EIR_MII;
-+
-+	// Write to the MII management frame register
-+	FEC_MMFR(base_addr) = FEC_MMFR_READ | (pa << 23) | (ra << 18);
-+
-+	time = jiffies;
-+
-+	// Wait for the reading
-+	while (!(FEC_EIR(base_addr) & FEC_EIR_MII))
-+	{
-+		if (jiffies - time > FEC_MII_TIMEOUT * HZ)
-+			return -ETIME;
-+		schedule();
-+	}
-+
-+	// Clear the MII interrupt bit
-+	FEC_EIR(base_addr) = FEC_EIR_MII;
-+
-+	*data = FEC_MMFR(base_addr) & 0x0000FFFF;
-+
-+	return 0;
-+}
-+
-+/************************************************************************
-+* NAME: fec_write_mii
-+*
-+* DESCRIPTION: This function writes the value to the MII register
-+*
-+* RETURNS: If no error occurs, this function returns zero.
-+*************************************************************************/
-+int fec_write_mii(unsigned int base_addr, unsigned int pa, unsigned int ra, unsigned int data)
-+{
-+	unsigned long time;
-+
-+	// Clear the MII interrupt bit
-+	FEC_EIR(base_addr) = FEC_EIR_MII;
-+
-+	// Write to the MII management frame register
-+	FEC_MMFR(base_addr) = FEC_MMFR_WRITE | (pa << 23) | (ra << 18) | data;
-+
-+	time = jiffies;
-+
-+	// Wait for the writing
-+
-+	while (!(FEC_EIR(base_addr) & FEC_EIR_MII))
-+	{
-+		if (jiffies - time > FEC_MII_TIMEOUT * HZ)
-+			return -ETIME;
-+
-+		schedule();
-+	}
-+
-+	// Clear the MII interrupt bit
-+	FEC_EIR(base_addr) = FEC_EIR_MII;
-+
-+	return 0;
-+}
-+
-+/************************************************************************
-+* NAME: fec_interrupt_tx_handler
-+*
-+* DESCRIPTION: This function is called when the data
-+*              transmission from the buffer to the FEC is completed.
-+*
-+*************************************************************************/
-+void fec_interrupt_fec_tx_handler(struct net_device *dev)
-+{
-+	struct fec_priv *fp = netdev_priv(dev);
-+
-+printk(KERN_INFO "fectxint\n");
-+	//Release the socket buffer
-+	if(fp->fecpriv_txbuf[fp->fecpriv_current_tx])
-+	{
-+		kfree(fp->fecpriv_txbuf[fp->fecpriv_current_tx]);
-+		fp->fecpriv_txbuf[fp->fecpriv_current_tx] = NULL;
-+	}
-+	fp->fecpriv_current_tx = (fp->fecpriv_current_tx + 1) & FEC_TX_INDEX_MASK;
-+
-+	if (MCD_dmaStatus(fp->fecpriv_fec_tx_channel) == MCD_DONE)
-+		for (; fp->fecpriv_current_tx != fp->fecpriv_next_tx; fp->fecpriv_current_tx = (fp->fecpriv_current_tx + 1) & FEC_TX_INDEX_MASK)
-+		{
-+			if(fp->fecpriv_txbuf[fp->fecpriv_current_tx])
-+			{
-+				kfree(fp->fecpriv_txbuf[fp->fecpriv_current_tx]);
-+				fp->fecpriv_txbuf[fp->fecpriv_current_tx] = NULL;
-+			}
-+		}
-+
-+	if (netif_queue_stopped(dev))
-+		netif_wake_queue(dev);
-+
-+}
-+
-+/************************************************************************
-+* NAME: fec_interrupt_rx_handler
-+*
-+* DESCRIPTION: This function is called when the data
-+*              reception from the FEC to the reception buffer is completed.
-+*
-+*************************************************************************/
-+void fec_interrupt_fec_rx_handler(struct net_device *dev)
-+{
-+	struct fec_priv *fp = netdev_priv(dev);
-+	struct sk_buff *skb;
-+
-+printk(KERN_INFO "fecrxint\n");
-+	fp->fecpriv_rxflag = 1;
-+/*
-+	// Some buffers can be missed
-+	if(!(fp->fecpriv_rxdesc[fp->fecpriv_current_rx].statCtrl & MCD_FEC_END_FRAME))
-+	{
-+		// Find a valid index
-+		for(i = 0; i < FEC_RX_BUF_NUMBER && !(fp->fecpriv_rxdesc[fp->fecpriv_current_rx].statCtrl & MCD_FEC_END_FRAME); i++, fp->fecpriv_current_rx = (fp->fecpriv_current_rx + 1) & FEC_RX_INDEX_MASK);
-+
-+		if(i == FEC_RX_BUF_NUMBER)
-+		{
-+			// There are no data to process
-+			// Tell the DMA to continue the reception
-+			MCD_continDma(fp->fecpriv_fec_rx_channel);
-+
-+			fp->fecpriv_rxflag = 0;
-+
-+			return;
-+		}
-+	}
-+*/
-+	for (; fp->fecpriv_rxdesc[fp->fecpriv_current_rx].statCtrl & MCD_FEC_END_FRAME;	fp->fecpriv_current_rx = (fp->fecpriv_current_rx + 1) & FEC_RX_INDEX_MASK)
-+	{
-+	    if( (fp->fecpriv_rxdesc[fp->fecpriv_current_rx].length <= FEC_MAXBUF_SIZE) &&
-+		    (fp->fecpriv_rxdesc[fp->fecpriv_current_rx].length > 4)) // --tym--
-+	    {
-+    		skb = fp->askb_rx[fp->fecpriv_current_rx];
-+    		if (!skb)
-+    		{
-+    		    fp->fecpriv_stat.rx_dropped++;
-+            }
-+    		else
-+    		{
-+    		    // flush data cache before initializing the descriptor and starting DMA
-+//		    DcacheFlushInvalidateCacheBlock((void*)virt_to_phys(fp->askb_rx[fp->fecpriv_current_rx]->tail), fp->askb_rx[fp->fecpriv_current_rx]->len);
-+
-+    			skb_put(skb, fp->fecpriv_rxdesc[fp->fecpriv_current_rx].length - 4);
-+//    			skb->dev = dev;
-+    			skb->protocol = eth_type_trans(skb, dev);
-+    			netif_rx(skb);
-+    		}
-+		    fp->fecpriv_rxdesc[fp->fecpriv_current_rx].statCtrl &= ~MCD_FEC_END_FRAME;
-+    		// allocate new skbuff
-+    		fp->askb_rx[fp->fecpriv_current_rx] = alloc_skb(FEC_MAXBUF_SIZE + 16, /*GFP_ATOMIC |*/ GFP_DMA);
-+		    if (!fp->askb_rx[fp->fecpriv_current_rx])
-+    	    {
-+        		fp->fecpriv_rxdesc[fp->fecpriv_current_rx].dataPointer = 0;
-+	    	    fp->fecpriv_rxdesc[fp->fecpriv_current_rx].length = 0;
-+    		    fp->fecpriv_stat.rx_dropped++;
-+		    }
-+    		else
-+    		{
-+    		    skb_reserve(fp->askb_rx[fp->fecpriv_current_rx], 16);
-+    			fp->askb_rx[fp->fecpriv_current_rx]->dev = dev;
-+
-+    		    // flush data cache before initializing the descriptor and starting DMA
-+#if 0
-+/* JKM -- currently running with cache turned off */
-+		    DcacheFlushInvalidateCacheBlock((void*)virt_to_phys(fp->askb_rx[fp->fecpriv_current_rx]->tail), FEC_MAXBUF_SIZE);
-+#endif
-+
-+    	    	fp->fecpriv_rxdesc[fp->fecpriv_current_rx].dataPointer = (unsigned int) virt_to_phys(fp->askb_rx[fp->fecpriv_current_rx]->tail);
-+    	    	fp->fecpriv_rxdesc[fp->fecpriv_current_rx].length = FEC_MAXBUF_SIZE;
-+        		fp->fecpriv_rxdesc[fp->fecpriv_current_rx].statCtrl |= MCD_FEC_BUF_READY;
-+
-+    		    // flush data cache before initializing the descriptor and starting DMA
-+//		    DcacheFlushInvalidateCacheBlock((void*)virt_to_phys(fp->askb_rx[fp->fecpriv_current_rx]->tail), FEC_MAXBUF_SIZE);
-+    	    }
-+        }
-+
-+	}
-+
-+	// Tell the DMA to continue the reception
-+	MCD_continDma(fp->fecpriv_fec_rx_channel);
-+
-+	fp->fecpriv_rxflag = 0;
-+
-+}
-+
-+/************************************************************************
-+* NAME: fec_interrupt_handler
-+*
-+* DESCRIPTION: This function is called when some special errors occur
-+*
-+*************************************************************************/
-+irqreturn_t fec_interrupt_handler(int irq, void *dev_id)
-+{
-+
-+	struct net_device *dev = (struct net_device *)dev_id;
-+	struct fec_priv *fp = netdev_priv(dev);
-+	unsigned long base_addr = (unsigned long) dev->base_addr;
-+	unsigned long events;
-+
-+printk(KERN_INFO "fecerrint\n");
-+	// Read and clear the events
-+	events = FEC_EIR(base_addr) & FEC_EIMR(base_addr);
-+
-+	if (events & FEC_EIR_HBERR)
-+	{
-+		fp->fecpriv_stat.tx_heartbeat_errors++;
-+    	FEC_EIR(base_addr) = FEC_EIR_HBERR;
-+	}
-+
-+    // receive/transmit FIFO error
-+    if (((events & FEC_EIR_RFERR) != 0) || ((events & FEC_EIR_XFERR) != 0))
-+    {
-+        // kill DMA receive channel
-+        MCD_killDma (fp->fecpriv_fec_rx_channel);
-+        // kill running transmission by DMA
-+        MCD_killDma (fp->fecpriv_fec_tx_channel);
-+
-+        // Reset FIFOs
-+        FEC_FECFRST(base_addr) |= FEC_SW_RST;
-+        FEC_FECFRST(base_addr) &= ~FEC_SW_RST;
-+
-+        // reset receive FIFO status register
-+        FEC_FECRFSR(base_addr) = FEC_FECRFSR_FAE
-+                                 | FEC_FECRFSR_RXW
-+                                 | FEC_FECRFSR_UF;
-+
-+        // reset transmit FIFO status register
-+        FEC_FECTFSR(base_addr) = FEC_FECTFSR_FAE
-+                                 | FEC_FECTFSR_TXW
-+                                 | FEC_FECTFSR_UF
-+                                 | FEC_FECTFSR_OF;
-+
-+        // reset RFERR and XFERR event
-+        FEC_EIR(base_addr) = FEC_EIR_RFERR | FEC_EIR_XFERR;
-+
-+	// stop queue
-+	netif_stop_queue(dev);
-+	
-+        // execute reinitialization as tasklet
-+    	tasklet_schedule(&fp->fecpriv_tasklet_reinit);
-+
-+        fp->fecpriv_stat.rx_dropped++;
-+
-+    }
-+
-+    // transmit FIFO underrun
-+    if ((events & FEC_EIR_XFUN) != 0)
-+    {
-+        // reset XFUN event
-+        FEC_EIR(base_addr) = FEC_EIR_XFUN;
-+		fp->fecpriv_stat.tx_aborted_errors++;
-+    }
-+
-+    // late collision
-+    if ((events & FEC_EIR_LC) != 0)
-+    {
-+        // reset LC event
-+        FEC_EIR(base_addr) = FEC_EIR_LC;
-+		fp->fecpriv_stat.tx_aborted_errors++;
-+    }
-+
-+    // collision retry limit
-+    if ((events & FEC_EIR_RL) != 0)
-+    {
-+        // reset RL event
-+        FEC_EIR(base_addr) = FEC_EIR_RL;
-+		fp->fecpriv_stat.tx_aborted_errors++;
-+    }
-+
-+    return 0;
-+}
-+
-+/************************************************************************
-+* NAME: fec_interrupt_reinit
-+*
-+* DESCRIPTION: This function is called from interrupt handler
-+*              when controller must be reinitialized.
-+*
-+*************************************************************************/
-+void fec_interrupt_fec_reinit(unsigned long data)
-+{
-+	int i;
-+	struct net_device *dev = (struct net_device*)data;
-+	struct fec_priv *fp = netdev_priv(dev);
-+	unsigned long base_addr = (unsigned long) dev->base_addr;
-+
-+printk(KERN_INFO "fecreinit\n");
-+	// Initialize reception descriptors and start DMA for the reception
-+	for (i = 0; i < FEC_RX_BUF_NUMBER; i++)
-+	{
-+		if (!fp->askb_rx[i])
-+		{
-+    		fp->askb_rx[i] = alloc_skb(FEC_MAXBUF_SIZE + 16, GFP_ATOMIC | GFP_DMA);
-+        	if (!fp->askb_rx[i])
-+		    {
-+        		fp->fecpriv_rxdesc[i].dataPointer = 0;
-+	        	fp->fecpriv_rxdesc[i].statCtrl = 0;
-+    	    	fp->fecpriv_rxdesc[i].length = 0;
-+    	    	continue;
-+	        }
-+			fp->askb_rx[i]->dev = dev;
-+    	    skb_reserve(fp->askb_rx[i], 16);
-+	    }
-+	    fp->fecpriv_rxdesc[i].dataPointer = (unsigned int) virt_to_phys(fp->askb_rx[i]->tail);
-+		fp->fecpriv_rxdesc[i].statCtrl = MCD_FEC_BUF_READY | MCD_FEC_INTERRUPT;
-+    	fp->fecpriv_rxdesc[i].length = FEC_MAXBUF_SIZE;
-+	}
-+
-+	fp->fecpriv_rxdesc[i - 1].statCtrl |= MCD_FEC_WRAP;
-+	fp->fecpriv_current_rx = 0;
-+
-+    // restart frame transmission
-+	for (i = 0; i < FEC_TX_BUF_NUMBER; i++)
-+	{
-+		if (fp->fecpriv_txbuf[i])
-+		{
-+
-+			kfree(fp->fecpriv_txbuf[i]);
-+			fp->fecpriv_txbuf[i] = NULL;
-+    		fp->fecpriv_stat.tx_dropped++;
-+		}
-+		fp->fecpriv_txdesc[i].statCtrl = MCD_FEC_INTERRUPT;
-+	}
-+	fp->fecpriv_txdesc[i - 1].statCtrl |= MCD_FEC_WRAP;
-+	fp->fecpriv_current_tx = fp->fecpriv_next_tx = 0;
-+
-+	// flush entire data cache before restarting the DMA
-+#if 0
-+/* JKM -- currently running with cache turned off */
-+	DcacheFlushInvalidate();
-+#endif
-+	
-+    // restart DMA from beginning
-+	MCD_startDma(fp->fecpriv_fec_rx_channel,
-+		     (char *) fp->fecpriv_rxdesc, 0,
-+		     (unsigned char *) &(FEC_FECRFDR(base_addr)), 0,
-+		     FEC_MAX_FRM_SIZE, 0, fp->fecpriv_initiator_rx,
-+		     FEC_RX_DMA_PRI, MCD_FECRX_DMA | MCD_INTERRUPT,
-+		     MCD_NO_CSUM | MCD_NO_BYTE_SWAP);
-+
-+	MCD_startDma(fp->fecpriv_fec_tx_channel, (char *) fp->fecpriv_txdesc, 0,
-+		     (unsigned char *) &(FEC_FECTFDR(base_addr)), 0,
-+		     FEC_MAX_FRM_SIZE, 0, fp->fecpriv_initiator_tx,
-+		     FEC_TX_DMA_PRI, MCD_FECTX_DMA | MCD_INTERRUPT,
-+		     MCD_NO_CSUM | MCD_NO_BYTE_SWAP);
-+
-+    // Enable FEC
-+    FEC_ECR(base_addr) |= FEC_ECR_ETHEREN;
-+
-+	netif_wake_queue(dev);
-+
-+}
-+
-+/************************************************************************
-+* NAME: fec_interrupt_tx_handler_fec0
-+*
-+* DESCRIPTION: This is the DMA interrupt handler using  for FEC0
-+*              transmission.
-+*
-+*************************************************************************/
-+void fec_interrupt_fec_tx_handler_fec0(void)
-+{
-+	fec_interrupt_fec_tx_handler(fec_dev[0]);
-+}
-+
-+#ifdef   FEC_2
-+/************************************************************************
-+* NAME: fec_interrupt_tx_handler_fec1
-+*
-+* DESCRIPTION: This is the DMA interrupt handler using for the FEC1
-+*              transmission.
-+*
-+*************************************************************************/
-+void fec_interrupt_fec_tx_handler_fec1(void)
-+{
-+	fec_interrupt_fec_tx_handler(fec_dev[1]);
-+}
-+#endif
-+
-+/************************************************************************
-+* NAME: fec_interrupt_rx_handler_fec0
-+*
-+* DESCRIPTION: This is the DMA interrupt handler using for the FEC0
-+*              reception.
-+*
-+*************************************************************************/
-+void fec_interrupt_fec_rx_handler_fec0(void)
-+{
-+	fec_interrupt_fec_rx_handler(fec_dev[0]);
-+}
-+
-+#ifdef   FEC_2
-+/************************************************************************
-+* NAME: fec_interrupt_rx_handler_fec1
-+*
-+* DESCRIPTION: This is the DMA interrupt handler using for the FEC1
-+*              reception.
-+*
-+*************************************************************************/
-+void fec_interrupt_fec_rx_handler_fec1(void)
-+{
-+	fec_interrupt_fec_rx_handler(fec_dev[1]);
-+}
-+
-+#endif
-+#ifndef MODULE
-+
-+/************************************************************************
-+* NAME: fec_mac_setup0
-+*
-+* DESCRIPTION: This function sets the MAC address of FEC0 from command line
-+*
-+*************************************************************************/
-+int __init fec_mac_setup0(char *s)
-+{
-+	if(!s || !*s)
-+		return 1;
-+
-+	if(fec_str_to_mac(s, fec_mac_addr_fec0))
-+		printk("The MAC address of FEC0 cannot be set from command line");
-+	return 1;
-+
-+}
-+
-+#ifdef   FEC_2
-+
-+/************************************************************************
-+* NAME: fec_mac_setup1
-+*
-+* DESCRIPTION: This function sets the MAC address of FEC1 from command line
-+*
-+*************************************************************************/
-+int __init fec_mac_setup1(char *s)
-+{
-+	if(!s || !*s)
-+		return 1;
-+
-+
-+	if(fec_str_to_mac(s, fec_mac_addr_fec1))
-+		printk("The MAC address of FEC1 cannot be set from command line");
-+	return 1;
-+
-+}
-+#endif
-+
-+/************************************************************************
-+* NAME: fec_str_to_mac
-+*
-+* DESCRIPTION: This function interprets the character string into MAC addr
-+*
-+*************************************************************************/
-+int fec_str_to_mac( char *str_mac, unsigned char* addr)
-+{
-+    unsigned long val;
-+	char c;
-+	unsigned long octet[6], *octetptr = octet;
-+	int i;
-+again:
-+
-+	val = 0;
-+	while ((c = *str_mac) != '\0')
-+	{
-+		if ((c>='0')&&(c<='9'))
-+		{
-+			val = (val * 16) + (c - '0');
-+			str_mac++;
-+			continue;
-+		}
-+		else
-+		if (((c>='a')&&(c<='f'))||((c>='A')&&(c<='F')))
-+		{
-+			val = (val << 4) + (c + 10 - (((c>='a')&&(c<='f')) ? 'a' : 'A'));
-+			str_mac++;
-+			continue;
-+		}
-+		break;
-+	}
-+	if (*str_mac == ':')
-+	{
-+		*octetptr++ = val, str_mac++;
-+		if (octetptr >= octet + 6)
-+			return 1;
-+		goto again;
-+	}
-+
-+	 //Check for trailing characters.
-+	if (*str_mac && !(*str_mac==' '))
-+		return 1;
-+	*octetptr++ = val;
-+
-+	if ((octetptr - octet)==6)
-+	{
-+	   for(i=0;i<=6;i++)
-+	      addr[i]=octet[i];
-+	}
-+    else
-+		return 1;
-+
-+	return 0;
-+
-+}
-+#endif
---- /dev/null
-+++ b/drivers/net/fec/fec.h
-@@ -0,0 +1,162 @@
-+
-+#define   FEC_BASE_ADDR_FEC0                ((unsigned int)MCF_MBAR + 0x9000)
-+#define   FEC_BASE_ADDR_FEC1                ((unsigned int)MCF_MBAR + 0x9800)
-+
-+//#define   FEC_INTC_IMRH_INT_MASK38          (0x00000040)
-+//#define   FEC_INTC_IMRH_INT_MASK39          (0x00000080)
-+//#define   FEC_INTC_ICR_FEC0                 (0x30)
-+//#define   FEC_INTC_ICR_FEC1                 (0x31)
-+#define   FEC_FECI2CIRQ                     (0xFFC0)
-+#define   FEC_GPIO_PAR_FECI2CIRQ            *(volatile unsigned short*)((unsigned int)MCF_MBAR + 0xA44)
-+//#define   FEC_INTC_ICRn(x)                  (*(volatile unsigned char *)(void*)((unsigned int) MCF_MBAR + 0x000740+((x)*0x001)))
-+//#define   FEC_INTC_IMRH                     *(volatile unsigned int*)((unsigned int)MCF_MBAR + 0x000708)
-+
-+#define   FEC_ECR_DISABLE                   (0x00000000)
-+
-+#define   FEC_ECR(x)                        *(volatile unsigned int *)(x + 0x024)
-+#define   FEC_EIR(x)                        *(volatile unsigned int*)(x + 0x004)
-+#define   FEC_PALR(x)                       *(volatile unsigned int*)(x + 0x0E4)
-+#define   FEC_PAUR(x)                       *(volatile unsigned int*)(x + 0x0E8)
-+#define   FEC_IALR(x)                       *(volatile unsigned int*)(x + 0x11C)
-+#define   FEC_IAUR(x)                       *(volatile unsigned int*)(x + 0x118)
-+#define   FEC_GALR(x)                       *(volatile unsigned int*)(x + 0x124)
-+#define   FEC_GAUR(x)                       *(volatile unsigned int*)(x + 0x120)
-+#define   FEC_RCR(x)                        *(volatile unsigned int*)(x + 0x084)
-+#define   FEC_FECRFCR(x)                    *(volatile unsigned int*)(x + 0x18C)
-+#define   FEC_FECRFAR(x)                    *(volatile unsigned int*)(x + 0x198)
-+#define   FEC_FECTFCR(x)                    *(volatile unsigned int*)(x + 0x1AC)
-+#define   FEC_FECTFAR(x)                    *(volatile unsigned int*)(x + 0x1B8)
-+#define   FEC_FECTFWR(x)                    *(volatile unsigned int*)(x + 0x144)
-+#define   FEC_CTCWR(x)                      *(volatile unsigned int*)(x + 0x1C8)
-+#define   FEC_EIMR(x)                       *(volatile unsigned int*)(x + 0x008)
-+#define   FEC_TCR(x)                        *(volatile unsigned int*)(x + 0x0C4)
-+#define   FEC_MIBC(x)                       *(volatile unsigned int*)(x + 0x064)
-+#define   FEC_MSCR(x)                       *(volatile unsigned int*)(x + 0x044)
-+#define   FEC_FECTFDR(x)                    *(volatile unsigned int*)(x + 0x1A4)
-+#define   FEC_FECRFDR(x)                    *(volatile unsigned int*)(x + 0x184)
-+#define   FEC_FECTFSR(x)                    *(volatile unsigned int*)(x + 0x1A8)
-+#define   FEC_FECRFSR(x)					*(volatile unsigned int*)(x + 0x188)
-+#define   FECSTAT_RMON_R_PACKETS(x)         *(volatile unsigned int*)(x + 0x284)
-+#define   FECSTAT_RMON_T_PACKETS(x)         *(volatile unsigned int*)(x + 0x204)
-+#define   FECSTAT_RMON_R_OCTETS(x)          *(volatile unsigned int*)(x + 0x2C4)
-+#define   FECSTAT_RMON_T_OCTETS(x)          *(volatile unsigned int*)(x + 0x244)
-+#define   FECSTAT_RMON_R_UNDERSIZE(x)       *(volatile unsigned int*)(x + 0x294)
-+#define   FECSTAT_RMON_R_OVERSIZE(x)        *(volatile unsigned int*)(x + 0x298)
-+#define   FECSTAT_RMON_R_FRAG(x)            *(volatile unsigned int*)(x + 0x29C)
-+#define   FECSTAT_RMON_R_JAB(x)             *(volatile unsigned int*)(x + 0x2A0)
-+#define   FECSTAT_RMON_R_MC_PKT(x)          *(volatile unsigned int*)(x + 0x28C)
-+#define   FECSTAT_RMON_T_COL(x)             *(volatile unsigned int*)(x + 0x224)
-+#define   FECSTAT_IEEE_R_ALIGN(x)           *(volatile unsigned int*)(x + 0x2D4)
-+#define   FECSTAT_IEEE_R_CRC(x)             *(volatile unsigned int*)(x + 0x2D0)
-+#define   FECSTAT_IEEE_R_MACERR(x)          *(volatile unsigned int*)(x + 0x2D8)
-+#define   FECSTAT_IEEE_T_CSERR(x)           *(volatile unsigned int*)(x + 0x268)
-+#define   FECSTAT_IEEE_T_MACERR(x)          *(volatile unsigned int*)(x + 0x264)
-+#define   FECSTAT_IEEE_T_LCOL(x)            *(volatile unsigned int*)(x + 0x25C)
-+#define   FECSTAT_IEEE_R_OCTETS_OK(x)       *(volatile unsigned int*)(x + 0x2E0)
-+#define   FECSTAT_IEEE_T_OCTETS_OK(x)       *(volatile unsigned int*)(x + 0x274)
-+#define   FECSTAT_IEEE_R_DROP(x)            *(volatile unsigned int*)(x + 0x2C8)
-+#define   FECSTAT_IEEE_T_DROP(x)            *(volatile unsigned int*)(x + 0x248)
-+#define   FECSTAT_IEEE_R_FRAME_OK(x)        *(volatile unsigned int*)(x + 0x2CC)
-+#define   FECSTAT_IEEE_T_FRAME_OK(x)        *(volatile unsigned int*)(x + 0x24C)
-+#define   FEC_MMFR(x)                       *(volatile unsigned int*)(x + 0x040)
-+#define   FEC_FECFRST(x)					*(volatile unsigned int*)(x + 0x1C4)
-+
-+#define   FEC_MAX_FRM_SIZE                  (1518)
-+#define   FEC_MAXBUF_SIZE                   (1520)
-+
-+// Register values
-+#define   FEC_ECR_RESET                     (0x00000001)
-+#define   FEC_EIR_CLEAR                     (0xFFFFFFFF)
-+#define   FEC_EIR_RL                        (0x00100000)
-+#define   FEC_EIR_HBERR                     (0x80000000)
-+#define   FEC_EIR_BABR						(0x40000000)   // babbling receive error
-+#define   FEC_EIR_BABT						(0x20000000)   // babbling transmit error
-+#define   FEC_EIR_TXF		              	(0x08000000)   // transmit frame interrupt
-+#define   FEC_EIR_MII						(0x00800000)   // MII interrupt
-+#define   FEC_EIR_LC						(0x00200000)   // late collision
-+#define   FEC_EIR_XFUN						(0x00080000)   // transmit FIFO underrun
-+#define   FEC_EIR_XFERR						(0x00040000)   // transmit FIFO error
-+#define   FEC_EIR_RFERR						(0x00020000)   // receive FIFO error
-+#define   FEC_RCR_MAX_FRM_SIZE              (FEC_MAX_FRM_SIZE << 16)
-+#define   FEC_RCR_MII                       (0x00000004)
-+#define   FEC_FECRFCR_FAE					(0x00400000)   // frame accept error
-+#define   FEC_FECRFCR_RXW					(0x00200000)   // receive wait condition
-+#define   FEC_FECRFCR_UF					(0x00100000)   // receive FIFO underflow
-+#define   FEC_FECRFCR_FRM                   (0x08000000)
-+#define   FEC_FECRFCR_GR                    (0x7 << 24)
-+
-+#define   FEC_EIMR_DISABLE					(0x00000000)
-+
-+#define   FEC_FECRFAR_ALARM                 (0x300)
-+#define   FEC_FECTFCR_FRM                   (0x08000000)
-+#define   FEC_FECTFCR_GR                    (0x7 << 24)
-+#define   FEC_FECTFCR_FAE					(0x00400000)   // frame accept error
-+#define   FEC_FECTFCR_TXW					(0x00040000)   // transmit wait condition
-+#define   FEC_FECTFCR_UF					(0x00100000)   // transmit FIFO underflow
-+#define   FEC_FECTFCR_OF					(0x00080000)   // transmit FIFO overflow
-+
-+#define   FEC_FECTFAR_ALARM                 (0x100)
-+#define   FEC_FECTFWR_XWMRK                 (0x00000000)
-+
-+#define   FEC_FECTFSR_MSK                   (0xC0B00000)
-+#define   FEC_FECTFSR_TXW                   (0x40000000)   // transmit wait condition
-+#define   FEC_FECTFSR_FAE                   (0x00800000)   // frame accept error
-+#define   FEC_FECTFSR_UF                    (0x00200000)   // transmit FIFO underflow
-+#define   FEC_FECTFSR_OF                    (0x00100000)   // transmit FIFO overflow
-+
-+#define   FEC_FECRFSR_MSK                   (0x80F00000)
-+#define   FEC_FECRFSR_FAE                   (0x00800000)   // frame accept error
-+#define   FEC_FECRFSR_RXW                   (0x00400000)   // receive wait condition
-+#define   FEC_FECRFSR_UF                    (0x00200000)   // receive FIFO underflow
-+
-+#define   FEC_CTCWR_TFCW_CRC                (0x03000000)
-+#define   FEC_TCR_FDEN                      (0x00000004)
-+#define   FEC_TCR_HBC                       (0x00000002)
-+#define   FEC_RCR_DRT                       (0x00000002)
-+#define   FEC_EIMR_MASK                     (FEC_EIR_RL | FEC_EIR_HBERR)
-+#define   FEC_ECR_ETHEREN                   (0x00000002)
-+#define   FEC_FECTFCR_MSK                   (0x00FC0000)
-+#define   FEC_FECRFCR_MSK                   (0x00F80000)
-+#define   FEC_EIR_GRA                       (0x10000000)
-+#define   FEC_TCR_GTS                       (0x00000001)
-+#define   FEC_MIBC_ENABLE                   (0x00000000)
-+#define   FEC_MIB_LEN                       (228)
-+#define   FEC_PHY_ADDR                      (0x01)
-+
-+#define FEC_RX_DMA_PRI                      (6)
-+#define FEC_TX_DMA_PRI                      (6)
-+
-+#define   FEC_TX_BUF_NUMBER                 (8)
-+#define   FEC_RX_BUF_NUMBER                 (64)
-+
-+#define   FEC_TX_INDEX_MASK                 (0x7)
-+#define   FEC_RX_INDEX_MASK                 (0x3f)
-+
-+#define   FEC_RX_DESC_FEC0                  SYS_SRAM_FEC_START
-+#define   FEC_TX_DESC_FEC0                  FEC_RX_DESC_FEC0 + FEC_RX_BUF_NUMBER * sizeof(MCD_bufDescFec)
-+
-+#define   FEC_RX_DESC_FEC1                  SYS_SRAM_FEC_START + SYS_SRAM_FEC_SIZE/2
-+#define   FEC_TX_DESC_FEC1                  FEC_RX_DESC_FEC1 + FEC_RX_BUF_NUMBER * sizeof(MCD_bufDescFec)
-+
-+#define   FEC_EIR_MII                       (0x00800000)
-+#define   FEC_MMFR_READ                     (0x60020000)
-+#define   FEC_MMFR_WRITE                    (0x50020000)
-+
-+#define   FEC_FLAGS_RX                      (0x00000001)
-+
-+#define   FEC_CRCPOL                        (0xEDB88320)
-+
-+#define   FEC_MII_TIMEOUT                   (2)
-+#define   FEC_GR_TIMEOUT                    (1)
-+#define   FEC_TX_TIMEOUT                    (1)
-+#define   FEC_RX_TIMEOUT                    (1)
-+
-+#define   FEC_SW_RST                        0x2000000
-+#define   FEC_RST_CTL                       0x1000000
-+
-+int fec_read_mii(unsigned int base_addr, unsigned int pa, unsigned int ra,
-+		 unsigned int *data);
-+int fec_write_mii(unsigned int base_addr, unsigned int pa, unsigned int ra,
-+		  unsigned int data);
-+
-+#define init_transceiver ks8721_init_transceiver
---- /dev/null
-+++ b/drivers/net/fec/ks8721.c
-@@ -0,0 +1,125 @@
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/string.h>
-+#include <linux/ptrace.h>
-+#include <linux/errno.h>
-+#include <linux/ioport.h>
-+#include <linux/slab.h>
-+#include <linux/interrupt.h>
-+#include <linux/pci.h>
-+#include <linux/init.h>
-+#include <linux/delay.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/skbuff.h>
-+#include <linux/spinlock.h>
-+#include <linux/workqueue.h>
-+#include <linux/bitops.h>
-+
-+#if 0
-+#include <linux/config.h>
-+#include <linux/sched.h>
-+#include <linux/errno.h>
-+#include <asm/coldfire.h>
-+#endif
-+#include <asm/coldfire.h>
-+#include <asm/mcfsim.h>
-+
-+#include   "fec.h"
-+#include   "ks8721.h"
-+
-+#ifdef   CONFIG_FEC_548x_AUTO_NEGOTIATION
-+#define   KS8721_AUTO_NEGOTIATION_ENABLE
-+#endif
-+
-+/************************************************************************
-+* +NAME: ks8721_init_transceiver
-+*
-+* DESCRIPTION: This function initializes the transceiver
-+*
-+* RETURNS: If no error occurs, this function returns zero.
-+*          Otherwise, it returns 1
-+*************************************************************************/
-+
-+int ks8721_init_transceiver(unsigned long base_addr, int *fduplex)
-+{
-+
-+	int data;
-+	unsigned long time;
-+	int flag = 1;
-+
-+	int result;
-+
-+	// Set the frequency of MII
-+	FEC_MSCR(base_addr) = FEC_MII_SPEED;
-+
-+	// Reset
-+	if ((result = fec_write_mii(base_addr, FEC_PHY_ADDR, KS8721_CTRL, KS8721_CTRL_RESET)))
-+		return result;
-+
-+	// Read back    
-+	if ((result = fec_read_mii(base_addr, FEC_PHY_ADDR, KS8721_CTRL, &data)) != 0)
-+		return result;
-+
-+	// If reset bit is set, return
-+	if (data & KS8721_CTRL_RESET)
-+		return -ETIME;
-+
-+#ifdef KS8721_AUTO_NEGOTIATION_ENABLE
-+
-+	// Disable  the auto-negotiation 
-+	if ((result = fec_write_mii(base_addr, FEC_PHY_ADDR, KS8721_CTRL, 0)) != 0)
-+		return result;
-+
-+	// Set the auto-negotiation advertisement register 
-+	if ((result = fec_write_mii(base_addr, FEC_PHY_ADDR, KS8721_ANADV, KS8721_ANADV_ADV_ALL)) != 0)
-+		return result;
-+
-+	// Enable the auto-negotiation
-+	if ((result = fec_write_mii(base_addr, FEC_PHY_ADDR, KS8721_CTRL, KS8721_CTRL_AN_ENABLE)) != 0)
-+		return result;
-+
-+	// Read PHY status register
-+	if ((result = fec_read_mii(base_addr, FEC_PHY_ADDR, KS8721_STAT, &data)) != 0)
-+		return result;
-+	// Set the current time
-+	time = jiffies;
-+
-+	// Wait for the auto-negotiation completion
-+	while (!(data & KS8721_STAT_ANCOMPLETE))
-+	{
-+
-+		if (jiffies - time > KS8721_TIMEOUT * HZ)
-+		{
-+			flag = 0;
-+			break;
-+		}
-+
-+		schedule();
-+
-+		// Read PHY status register
-+		if ((result = fec_read_mii(base_addr, FEC_PHY_ADDR, KS8721_STAT, &data)) != 0)
-+			return result;
-+	}
-+
-+	if (flag)
-+	{
-+		// Set the duplex flag     
-+		if (data & KS8721_STAT_FDUPLEX)
-+			*fduplex = 1;
-+		else
-+			*fduplex = 0;
-+
-+		return 0;
-+	}
-+
-+#endif
-+
-+	// Set the default mode (Full duplex, 100 Mbps) 
-+	if ((result = fec_write_mii(base_addr, FEC_PHY_ADDR, KS8721_CTRL, KS8721_CTRL_DEFAULT_MODE)) != 0)
-+		return result;
-+	*fduplex = KS8721_CTRL_DEFAULT_MODE & 0x100;
-+
-+	return 0;
-+
-+}
---- /dev/null
-+++ b/drivers/net/fec/ks8721.h
-@@ -0,0 +1,21 @@
-+
-+#define   FEC_MII_SPEED              (((unsigned int)(MCF_BUSCLK / 5000000)) << 1)
-+
-+// Numbers of the transceiver registers 
-+#define   KS8721_CTRL                0x00
-+#define   KS8721_ANADV               0x04
-+#define   KS8721_STAT                0x01
-+
-+// Register values
-+#define   KS8721_CTRL_RESET          0x8000
-+#define   KS8721_ANADV_ADV_ALL       0x01E1
-+#define   KS8721_CTRL_AN_ENABLE      0x1280
-+#define   KS8721_CTRL_DEFAULT_MODE   0x2100
-+#define   KS8721_STAT_ANCOMPLETE     0x0020
-+#define   KS8721_STAT_LINK           0x0004
-+#define   KS8721_STAT_FDUPLEX        0x5000
-+
-+// Timeout for the auto-negotiation mode
-+#define   KS8721_TIMEOUT             5
-+
-+int ks8721_init_transceiver(unsigned long base_addr, int *fduplex);
---- /dev/null
-+++ b/include/asm-m68k/MCD_dma.h
-@@ -0,0 +1,408 @@
-+/*********************************************************************
-+ *
-+ * Copyright (C) 2004  Motorola, Inc.
-+ *  MOTOROLA, INC. All Rights Reserved.
-+ *  You are hereby granted a copyright license to use
-+ *  the SOFTWARE so long as this entire notice is
-+ *  retained without alteration in any modified and/or redistributed
-+ *  versions, and that such modified versions are clearly identified
-+ *  as such. No licenses are granted by implication, estoppel or
-+ *  otherwise under any patents or trademarks of Motorola, Inc. This
-+ *  software is provided on an "AS IS" basis and without warranty.
-+ *
-+ *  To the maximum extent permitted by applicable law, MOTOROLA
-+ *  DISCLAIMS ALL WARRANTIES WHETHER EXPRESS OR IMPLIED, INCLUDING
-+ *  IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-+ *  PURPOSE AND ANY WARRANTY AGAINST INFRINGEMENT WITH REGARD TO THE
-+ *  SOFTWARE (INCLUDING ANY MODIFIED VERSIONS THEREOF) AND ANY
-+ *  ACCOMPANYING WRITTEN MATERIALS.
-+ *
-+ *  To the maximum extent permitted by applicable law, IN NO EVENT
-+ *  SHALL MOTOROLA BE LIABLE FOR ANY DAMAGES WHATSOEVER (INCLUDING
-+ *  WITHOUT LIMITATION, DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS
-+ *  INTERRUPTION, LOSS OF BUSINESS INFORMATION, OR OTHER PECUNIARY
-+ *  LOSS) ARISING OF THE USE OR INABILITY TO USE THE SOFTWARE.
-+ *
-+ *  Motorola assumes no responsibility for the maintenance and support
-+ *  of this software
-+ ********************************************************************/
-+
-+/*
-+ * File:        MCD_dma.h
-+ * Purpose:     Main header file for multi-channel DMA API.
-+ *
-+ * Notes:
-+ *
-+ * Modifications:
-+ */
-+#ifndef _MCD_API_H
-+#define _MCD_API_H
-+
-+#include <asm/types.h>
-+
-+/*
-+ * Turn Execution Unit tasks ON (#define) or OFF (#undef)
-+ */
-+#undef MCD_INCLUDE_EU
-+
-+/*
-+ * Number of DMA channels
-+ */
-+#define NCHANNELS 16
-+
-+/*
-+ * Total number of variants
-+ */
-+#ifdef MCD_INCLUDE_EU
-+#define NUMOFVARIANTS   6
-+#else
-+#define NUMOFVARIANTS   4
-+#endif
-+
-+/*
-+ * Define sizes of the various tables
-+ */
-+#define TASK_TABLE_SIZE     (NCHANNELS*32)
-+#define VAR_TAB_SIZE        (128)
-+#define CONTEXT_SAVE_SIZE   (128)
-+#define FUNCDESC_TAB_SIZE   (256)
-+
-+#ifdef MCD_INCLUDE_EU
-+#define FUNCDESC_TAB_NUM    16
-+#else
-+#define FUNCDESC_TAB_NUM    1
-+#endif
-+
-+
-+#ifndef DEFINESONLY
-+
-+/*
-+ * Portability typedefs
-+ */
-+ /*
-+#ifndef s32
-+typedef int s32;
-+#endif
-+#ifndef u32
-+typedef unsigned int u32;
-+#endif
-+#ifndef s16
-+typedef short s16;
-+#endif
-+#ifndef u16
-+typedef unsigned short u16;
-+#endif
-+#ifndef s8
-+typedef char s8;
-+#endif
-+#ifndef u8
-+typedef unsigned char u8;
-+#endif
-+*/
-+/*
-+ * These structures represent the internal registers of the
-+ * multi-channel DMA
-+ */
-+struct dmaRegs_s {
-+   u32 taskbar;         /* task table base address register */
-+   u32 currPtr;
-+   u32 endPtr;
-+   u32 varTablePtr;
-+   u16 dma_rsvd0;
-+   u16 ptdControl;      /* ptd control */
-+   u32 intPending;      /* interrupt pending register */
-+   u32 intMask;         /* interrupt mask register */
-+   u16 taskControl[16]; /* task control registers */
-+   u8  priority[32];    /* priority registers */
-+   u32 initiatorMux;    /* initiator mux control */
-+   u32 taskSize0;       /* task size control register 0. */
-+   u32 taskSize1;       /* task size control register 1. */
-+   u32 dma_rsvd1;       /* reserved */
-+   u32 dma_rsvd2;       /* reserved */
-+   u32 debugComp1;      /* debug comparator 1 */
-+   u32 debugComp2;      /* debug comparator 2 */
-+   u32 debugControl;    /* debug control */
-+   u32 debugStatus;     /* debug status */
-+   u32 ptdDebug;        /* priority task decode debug */
-+   u32 dma_rsvd3[31];   /* reserved */
-+};
-+typedef volatile struct dmaRegs_s dmaRegs;
-+
-+#endif
-+
-+/*
-+ * PTD contrl reg bits
-+ */
-+#define PTD_CTL_TSK_PRI         0x8000
-+#define PTD_CTL_COMM_PREFETCH   0x0001
-+
-+/*
-+ * Task Control reg bits and field masks
-+ */
-+#define TASK_CTL_EN             0x8000
-+#define TASK_CTL_VALID          0x4000
-+#define TASK_CTL_ALWAYS         0x2000
-+#define TASK_CTL_INIT_MASK      0x1f00
-+#define TASK_CTL_ASTRT          0x0080
-+#define TASK_CTL_HIPRITSKEN     0x0040
-+#define TASK_CTL_HLDINITNUM     0x0020
-+#define TASK_CTL_ASTSKNUM_MASK  0x000f
-+
-+/*
-+ * Priority reg bits and field masks
-+ */
-+#define PRIORITY_HLD            0x80
-+#define PRIORITY_PRI_MASK       0x07
-+
-+/*
-+ * Debug Control reg bits and field masks
-+ */
-+#define DBG_CTL_BLOCK_TASKS_MASK    0xffff0000
-+#define DBG_CTL_AUTO_ARM            0x00008000
-+#define DBG_CTL_BREAK               0x00004000
-+#define DBG_CTL_COMP1_TYP_MASK      0x00003800
-+#define DBG_CTL_COMP2_TYP_MASK      0x00000070
-+#define DBG_CTL_EXT_BREAK           0x00000004
-+#define DBG_CTL_INT_BREAK           0x00000002
-+
-+/*
-+ * PTD Debug reg selector addresses
-+ * This reg must be written with a value to show the contents of
-+ * one of the desired internal register.
-+ */
-+#define PTD_DBG_REQ             0x00 /* shows the state of 31 initiators */
-+#define PTD_DBG_TSK_VLD_INIT    0x01 /* shows which 16 tasks are valid and
-+                                        have initiators asserted */
-+
-+
-+/*
-+ * General return values
-+ */
-+#define MCD_OK                   0
-+#define MCD_ERROR               -1
-+#define MCD_TABLE_UNALIGNED     -2
-+#define MCD_CHANNEL_INVALID     -3
-+
-+/*
-+ * MCD_initDma input flags
-+ */
-+#define MCD_RELOC_TASKS         0x00000001
-+#define MCD_NO_RELOC_TASKS      0x00000000
-+#define MCD_COMM_PREFETCH_EN    0x00000002  /* Commbus Prefetching - MCF547x/548x ONLY */
-+
-+/*
-+ * MCD_dmaStatus Status Values for each channel
-+ */
-+#define MCD_NO_DMA  1 /* No DMA has been requested since reset */
-+#define MCD_IDLE    2 /* DMA active, but the initiator is currently inactive */
-+#define MCD_RUNNING 3 /* DMA active, and the initiator is currently active */
-+#define MCD_PAUSED  4 /* DMA active but it is currently paused */
-+#define MCD_HALTED  5 /* the most recent DMA has been killed with MCD_killTask() */
-+#define MCD_DONE    6 /* the most recent DMA has completed. */
-+
-+
-+/*
-+ * MCD_startDma parameter defines
-+ */
-+
-+/*
-+ * Constants for the funcDesc parameter
-+ */
-+/* Byte swapping: */
-+#define MCD_NO_BYTE_SWAP    0x00045670  /* to disable byte swapping. */
-+#define MCD_BYTE_REVERSE    0x00076540  /* to reverse the bytes of each u32 of the DMAed data. */
-+#define MCD_U16_REVERSE     0x00067450  /* to reverse the 16-bit halves of
-+                                           each 32-bit data value being DMAed.*/
-+#define MCD_U16_BYTE_REVERSE    0x00054760 /* to reverse the byte halves of each
-+                                            16-bit half of each 32-bit data value DMAed */
-+#define MCD_NO_BIT_REV  0x00000000  /* do not reverse the bits of each byte DMAed. */
-+#define MCD_BIT_REV     0x00088880  /* reverse the bits of each byte DMAed */
-+/* CRCing: */
-+#define MCD_CRC16       0xc0100000  /* to perform CRC-16 on DMAed data. */
-+#define MCD_CRCCCITT    0xc0200000  /* to perform CRC-CCITT on DMAed data. */
-+#define MCD_CRC32       0xc0300000  /* to perform CRC-32 on DMAed data. */
-+#define MCD_CSUMINET    0xc0400000  /* to perform internet checksums on DMAed data.*/
-+#define MCD_NO_CSUM     0xa0000000  /* to perform no checksumming. */
-+
-+#define MCD_FUNC_NOEU1 (MCD_NO_BYTE_SWAP | MCD_NO_BIT_REV | MCD_NO_CSUM)
-+#define MCD_FUNC_NOEU2 (MCD_NO_BYTE_SWAP | MCD_NO_CSUM)
-+
-+/*
-+ * Constants for the flags parameter
-+ */
-+#define MCD_TT_FLAGS_RL   0x00000001 /* Read line */
-+#define MCD_TT_FLAGS_CW   0x00000002 /* Combine Writes */
-+#define MCD_TT_FLAGS_SP   0x00000004 /* Speculative prefetch(XLB) MCF547x/548x ONLY  */
-+#define MCD_TT_FLAGS_MASK 0x000000ff
-+#define MCD_TT_FLAGS_DEF  (MCD_TT_FLAGS_RL | MCD_TT_FLAGS_CW)
-+
-+#define MCD_SINGLE_DMA  0x00000100 /* Unchained DMA */
-+#define MCD_CHAIN_DMA              /* TBD */
-+#define MCD_EU_DMA                 /* TBD */
-+#define MCD_FECTX_DMA   0x00001000 /* FEC TX ring DMA */
-+#define MCD_FECRX_DMA   0x00002000 /* FEC RX ring DMA */
-+
-+
-+/* these flags are valid for MCD_startDma and the chained buffer descriptors */
-+#define MCD_BUF_READY   0x80000000 /* indicates that this buffer is now under the DMA's control */
-+#define MCD_WRAP        0x20000000 /* to tell the FEC Dmas to wrap to the first BD */
-+#define MCD_INTERRUPT   0x10000000 /* to generate an interrupt after completion of the DMA. */
-+#define MCD_END_FRAME   0x08000000 /* tell the DMA to end the frame when transferring
-+                                      last byte of data in buffer */
-+#define MCD_CRC_RESTART 0x40000000 /* to empty out the accumulated checksum
-+                                      prior to performing the DMA. */
-+
-+/* Defines for the FEC buffer descriptor control/status word*/
-+#define MCD_FEC_BUF_READY   0x8000
-+#define MCD_FEC_WRAP        0x2000
-+#define MCD_FEC_INTERRUPT   0x1000
-+#define MCD_FEC_END_FRAME   0x0800
-+
-+
-+/*
-+ * Defines for general intuitiveness
-+ */
-+
-+#define MCD_TRUE  1
-+#define MCD_FALSE 0
-+
-+/*
-+ * Three different cases for destination and source.
-+ */
-+#define MINUS1          -1
-+#define ZERO            0
-+#define PLUS1           1
-+
-+#ifndef DEFINESONLY
-+
-+/* Task Table Entry struct*/
-+typedef struct {
-+    u32 TDTstart;   /* task descriptor table start */
-+    u32 TDTend;     /* task descriptor table end */
-+    u32 varTab;     /* variable table start */
-+    u32 FDTandFlags;    /* function descriptor table start and flags */
-+    volatile u32 descAddrAndStatus;
-+    volatile u32 modifiedVarTab;
-+    u32 contextSaveSpace;   /* context save space start */
-+    u32 literalBases;
-+} TaskTableEntry;
-+
-+
-+/* Chained buffer descriptor */
-+typedef volatile struct MCD_bufDesc_struct MCD_bufDesc;
-+struct MCD_bufDesc_struct {
-+   u32 flags;         /* flags describing the DMA */
-+   u32 csumResult;    /* checksum from checksumming performed since last checksum reset */
-+   s8  *srcAddr;      /* the address to move data from */
-+   s8  *destAddr;     /* the address to move data to */
-+   s8  *lastDestAddr; /* the last address written to */
-+   u32 dmaSize;       /* the number of bytes to transfer independent of the transfer size */
-+   MCD_bufDesc *next; /* next buffer descriptor in chain */
-+   u32 info;          /* private information about this descriptor;  DMA does not affect it */
-+};
-+
-+/* Progress Query struct */
-+typedef volatile struct MCD_XferProg_struct {
-+   s8 *lastSrcAddr;         /* the most-recent or last, post-increment source address */
-+   s8 *lastDestAddr;        /* the most-recent or last, post-increment destination address */
-+   u32  dmaSize;            /* the amount of data transferred for the current buffer */
-+   MCD_bufDesc *currBufDesc;/* pointer to the current buffer descriptor being DMAed */
-+} MCD_XferProg;
-+
-+
-+/* FEC buffer descriptor */
-+typedef volatile struct MCD_bufDescFec_struct {
-+    u16 statCtrl;
-+    u16 length;
-+    u32 dataPointer;
-+} MCD_bufDescFec;
-+
-+
-+/*************************************************************************/
-+/*
-+ * API function Prototypes  - see MCD_dmaApi.c for further notes
-+ */
-+
-+/*
-+ * MCD_startDma starts a particular kind of DMA .
-+ */
-+int MCD_startDma (
-+   int channel,   /* the channel on which to run the DMA */
-+   s8  *srcAddr,  /* the address to move data from, or buffer-descriptor address */
-+   s16 srcIncr,   /* the amount to increment the source address per transfer */
-+   s8  *destAddr, /* the address to move data to */
-+   s16 destIncr,  /* the amount to increment the destination address per transfer */
-+   u32 dmaSize,   /* the number of bytes to transfer independent of the transfer size */
-+   u32 xferSize,  /* the number bytes in of each data movement (1, 2, or 4) */
-+   u32 initiator, /* what device initiates the DMA */
-+   int priority,  /* priority of the DMA */
-+   u32 flags,     /* flags describing the DMA */
-+   u32 funcDesc   /* a description of byte swapping, bit swapping, and CRC actions */
-+);
-+
-+/* 
-+ * MCD_initDma() initializes the DMA API by setting up a pointer to the DMA 
-+ * registers, relocating and creating the appropriate task structures, and 
-+ * setting up some global settings
-+ */
-+int MCD_initDma (dmaRegs *sDmaBarAddr, void *taskTableDest, u32 flags);
-+
-+/* 
-+ * MCD_dmaStatus() returns the status of the DMA on the requested channel.
-+ */
-+int MCD_dmaStatus (int channel);
-+
-+/* 
-+ * MCD_XferProgrQuery() returns progress of DMA on requested channel
-+ */
-+int MCD_XferProgrQuery (int channel, MCD_XferProg *progRep);
-+
-+/* 
-+ * MCD_killDma() halts the DMA on the requested channel, without any
-+ * intention of resuming the DMA.
-+ */
-+int MCD_killDma (int channel);
-+
-+/* 
-+ * MCD_continDma() continues a DMA which as stopped due to encountering an
-+ * unready buffer descriptor.
-+ */
-+int MCD_continDma (int channel);
-+
-+/* 
-+ * MCD_pauseDma() pauses the DMA on the given channel ( if any DMA is
-+ * running on that channel). 
-+ */
-+int MCD_pauseDma (int channel);
-+
-+/* 
-+ * MCD_resumeDma() resumes the DMA on a given channel (if any DMA is
-+ * running on that channel).
-+ */
-+int MCD_resumeDma (int channel);
-+
-+/* 
-+ * MCD_csumQuery provides the checksum/CRC after performing a non-chained DMA
-+ */
-+int MCD_csumQuery (int channel, u32 *csum);
-+
-+/* 
-+ * MCD_getCodeSize provides the packed size required by the microcoded task
-+ * and structures.
-+ */
-+int MCD_getCodeSize(void);
-+
-+/*
-+ * MCD_getVersion provides a pointer to a version string and returns a
-+ * version number.
-+ */
-+int MCD_getVersion(char **longVersion);
-+
-+/* macro for setting a location in the variable table */
-+#define MCD_SET_VAR(taskTab,idx,value) ((u32 *)(taskTab)->varTab)[idx] = value
-+   /* Note that MCD_SET_VAR() is invoked many times in firing up a DMA function,
-+      so I'm avoiding surrounding it with "do {} while(0)" */
-+
-+#endif  /* DEFINESONLY */
-+
-+#endif /* _MCD_API_H */
---- a/include/asm-m68k/coldfire.h
-+++ b/include/asm-m68k/coldfire.h
-@@ -7,6 +7,7 @@
- #define MCF_SRAM	0x80000000
- #elif defined(CONFIG_M547X_8X)
- #define MCF_MBAR	0xE0000000
-+#define MCF_MMUBAR	0xE1000000
- #define MCF_RAMBAR0	0xE3000000
- #define MCF_RAMBAR1	0xE3001000
- #endif
---- a/include/asm-m68k/dma.h
-+++ b/include/asm-m68k/dma.h
-@@ -1,16 +1,120 @@
- #ifndef _M68K_DMA_H
- #define _M68K_DMA_H 1
- 
--
- /* it's useless on the m68k, but unfortunately needed by the new
-    bootmem allocator (but this should do it for this) */
- #define MAX_DMA_ADDRESS PAGE_OFFSET
- 
-+#ifndef CONFIG_COLDFIRE
- #define MAX_DMA_CHANNELS 8
- 
- extern int request_dma(unsigned int dmanr, const char * device_id);	/* reserve a DMA channel */
- extern void free_dma(unsigned int dmanr);	/* release it again */
- 
-+#else /* not (defined(CONFIG_MCF5474) || defined(CONFIG_MCF5484) || defined(CONFIG_MCF5475) || defined(CONFIG_MCF5485)) */
-+
-+/************************************************
-+ * 	Multichannel DMA definitions		*
-+ ************************************************/
-+#ifdef CONFIG_MCD_DMA
-+#include <asm/MCD_dma.h>
-+#include <asm/m5485dma.h>
-+
-+struct scatterlist;
-+
-+#define MAX_DMA_CHANNELS NCHANNELS
-+/*
-+ *  identifiers for each initiator/requestor
-+ */
-+#define DMA_ALWAYS      (0)
-+#define DMA_DSPI_RX     (1)
-+#define DMA_DSPI_TX     (2)
-+#define DMA_DREQ0       (3)
-+#define DMA_PSC0_RX     (4)
-+#define DMA_PSC0_TX     (5)
-+#define DMA_USBEP0      (6)
-+#define DMA_USBEP1      (7)
-+#define DMA_USBEP2      (8)
-+#define DMA_USBEP3      (9)
-+#define DMA_PCI_TX      (10)
-+#define DMA_PCI_RX      (11)
-+#define DMA_PSC1_RX     (12)
-+#define DMA_PSC1_TX     (13)
-+#define DMA_I2C_RX      (14)
-+#define DMA_I2C_TX      (15)
-+#define DMA_FEC0_RX     (16)
-+#define DMA_FEC0_TX     (17)
-+#define DMA_FEC1_RX     (18)
-+#define DMA_FEC1_TX     (19)
-+#define DMA_DREQ1       (20)
-+#define DMA_CTM0        (21)
-+#define DMA_CTM1        (22)
-+#define DMA_CTM2        (23)
-+#define DMA_CTM3        (24)
-+#define DMA_CTM4        (25)
-+#define DMA_CTM5        (26)
-+#define DMA_CTM6        (27)
-+#define DMA_CTM7        (28)
-+#define DMA_USBEP4      (29)
-+#define DMA_USBEP5      (30)
-+#define DMA_USBEP6      (31)
-+#define DMA_PSC2_RX     (32)
-+#define DMA_PSC2_TX     (33)
-+#define DMA_PSC3_RX     (34)
-+#define DMA_PSC3_TX     (35)
-+#define DMA_FEC_RX(x)   ((x == 0) ? DMA_FEC0_RX : DMA_FEC1_RX)
-+#define DMA_FEC_TX(x)   ((x == 0) ? DMA_FEC0_TX : DMA_FEC1_TX)
-+
-+int  dma_set_initiator(int);
-+unsigned int dma_get_initiator(int);
-+void dma_remove_initiator(int);
-+int dma_set_channel(int);
-+int dma_get_channel(int);
-+void dma_remove_channel(int);
-+int dma_set_channel_fec(int requestor);
-+int dma_connect(int channel, int address);
-+int dma_disconnect(int channel);
-+void dma_remove_channel_by_number(int channel);
-+int dma_init(void);
-+
-+#endif /* CONFIG_MCD_DMA */
-+
-+extern spinlock_t dma_spin_lock;
-+
-+static __inline__ unsigned long claim_dma_lock(void)
-+{
-+	unsigned long flags;
-+	spin_lock_irqsave(&dma_spin_lock, flags);
-+	return flags;
-+}
-+
-+static __inline__ void release_dma_lock(unsigned long flags)
-+{
-+	spin_unlock_irqrestore(&dma_spin_lock, flags);
-+}
-+
-+
-+/*
-+ *  Linux standard DMA stuff
-+ */
-+#if 0
-+int  request_dma(unsigned int channel, const char * device_id);
-+void free_dma(unsigned int channel);
-+void enable_dma(unsigned int channel);
-+void disable_dma(unsigned int channel);
-+int  dma_channel_active(unsigned int channel);
-+void set_dma_sg(unsigned int channel, struct scatterlist *sg, int nr_sg);
-+void set_dma_page(unsigned int channel, char pagenr);
-+void set_dma_addr(unsigned int channel, unsigned long physaddr);
-+void set_dma_count(unsigned int channel, unsigned long count);
-+void set_dma_mode(unsigned int channel, unsigned int mode);
-+void set_dma_speed(unsigned int channel, int cycle_ns);
-+int  get_dma_residue(unsigned int channel);
-+#endif
-+#define clear_dma_ff(channel)
-+
-+#endif /* not (defined(CONFIG_MCF5474) || defined(CONFIG_MCF5484) || defined(CONFIG_MCF5475) || defined(CONFIG_MCF5485)) */
-+
- #ifdef CONFIG_PCI
- extern int isa_dma_bridge_buggy;
- #else
---- /dev/null
-+++ b/include/asm-m68k/m5485dma.h
-@@ -0,0 +1,97 @@
-+/*
-+ *	m5485dma.h -- ColdFire 547x/548x DMA controller support.
-+ */
-+#ifndef __MCF548X_DMA_H__
-+#define __MCF548X_DMA_H__
-+
-+
-+/* Register read/write macros */
-+#define MCF_DMA_DIPR    (*(volatile u32*)(void*)(MCF_MBAR+0x008014))
-+#define MCF_DMA_DIMR    (*(volatile u32*)(void*)(MCF_MBAR+0x008018))
-+#define MCF_DMA_IMCR    (*(volatile u32*)(void*)(MCF_MBAR+0x00805C))
-+
-+/* Bit definitions and macros for MCF_DMA_DIPR */
-+#define MCF_DMA_DIPR_TASK0           (0x00000001)
-+#define MCF_DMA_DIPR_TASK1           (0x00000002)
-+#define MCF_DMA_DIPR_TASK2           (0x00000004)
-+#define MCF_DMA_DIPR_TASK3           (0x00000008)
-+#define MCF_DMA_DIPR_TASK4           (0x00000010)
-+#define MCF_DMA_DIPR_TASK5           (0x00000020)
-+#define MCF_DMA_DIPR_TASK6           (0x00000040)
-+#define MCF_DMA_DIPR_TASK7           (0x00000080)
-+#define MCF_DMA_DIPR_TASK8           (0x00000100)
-+#define MCF_DMA_DIPR_TASK9           (0x00000200)
-+#define MCF_DMA_DIPR_TASK10          (0x00000400)
-+#define MCF_DMA_DIPR_TASK11          (0x00000800)
-+#define MCF_DMA_DIPR_TASK12          (0x00001000)
-+#define MCF_DMA_DIPR_TASK13          (0x00002000)
-+#define MCF_DMA_DIPR_TASK14          (0x00004000)
-+#define MCF_DMA_DIPR_TASK15          (0x00008000)
-+
-+/* Bit definitions and macros for MCF_DMA_DIMR */
-+#define MCF_DMA_DIMR_TASK0           (0x00000001)
-+#define MCF_DMA_DIMR_TASK1           (0x00000002)
-+#define MCF_DMA_DIMR_TASK2           (0x00000004)
-+#define MCF_DMA_DIMR_TASK3           (0x00000008)
-+#define MCF_DMA_DIMR_TASK4           (0x00000010)
-+#define MCF_DMA_DIMR_TASK5           (0x00000020)
-+#define MCF_DMA_DIMR_TASK6           (0x00000040)
-+#define MCF_DMA_DIMR_TASK7           (0x00000080)
-+#define MCF_DMA_DIMR_TASK8           (0x00000100)
-+#define MCF_DMA_DIMR_TASK9           (0x00000200)
-+#define MCF_DMA_DIMR_TASK10          (0x00000400)
-+#define MCF_DMA_DIMR_TASK11          (0x00000800)
-+#define MCF_DMA_DIMR_TASK12          (0x00001000)
-+#define MCF_DMA_DIMR_TASK13          (0x00002000)
-+#define MCF_DMA_DIMR_TASK14          (0x00004000)
-+#define MCF_DMA_DIMR_TASK15          (0x00008000)
-+
-+/* Bit definitions and macros for MCF_DMA_IMCR */
-+#define MCF_DMA_IMCR_SRC16(x)        (((x)&0x00000003)<<0)
-+#define MCF_DMA_IMCR_SRC17(x)        (((x)&0x00000003)<<2)
-+#define MCF_DMA_IMCR_SRC18(x)        (((x)&0x00000003)<<4)
-+#define MCF_DMA_IMCR_SRC19(x)        (((x)&0x00000003)<<6)
-+#define MCF_DMA_IMCR_SRC20(x)        (((x)&0x00000003)<<8)
-+#define MCF_DMA_IMCR_SRC21(x)        (((x)&0x00000003)<<10)
-+#define MCF_DMA_IMCR_SRC22(x)        (((x)&0x00000003)<<12)
-+#define MCF_DMA_IMCR_SRC23(x)        (((x)&0x00000003)<<14)
-+#define MCF_DMA_IMCR_SRC24(x)        (((x)&0x00000003)<<16)
-+#define MCF_DMA_IMCR_SRC25(x)        (((x)&0x00000003)<<18)
-+#define MCF_DMA_IMCR_SRC26(x)        (((x)&0x00000003)<<20)
-+#define MCF_DMA_IMCR_SRC27(x)        (((x)&0x00000003)<<22)
-+#define MCF_DMA_IMCR_SRC28(x)        (((x)&0x00000003)<<24)
-+#define MCF_DMA_IMCR_SRC29(x)        (((x)&0x00000003)<<26)
-+#define MCF_DMA_IMCR_SRC30(x)        (((x)&0x00000003)<<28)
-+#define MCF_DMA_IMCR_SRC31(x)        (((x)&0x00000003)<<30)
-+#define MCF_DMA_IMCR_SRC16_FEC0RX    (0x00000000)
-+#define MCF_DMA_IMCR_SRC17_FEC0TX    (0x00000000)
-+#define MCF_DMA_IMCR_SRC18_FEC0RX    (0x00000020)
-+#define MCF_DMA_IMCR_SRC19_FEC0TX    (0x00000080)
-+#define MCF_DMA_IMCR_SRC20_FEC1RX    (0x00000100)
-+#define MCF_DMA_IMCR_SRC21_DREQ1     (0x00000000)
-+#define MCF_DMA_IMCR_SRC21_FEC1TX    (0x00000400)
-+#define MCF_DMA_IMCR_SRC22_FEC0RX    (0x00001000)
-+#define MCF_DMA_IMCR_SRC23_FEC0TX    (0x00004000)
-+#define MCF_DMA_IMCR_SRC24_CTM0      (0x00010000)
-+#define MCF_DMA_IMCR_SRC24_FEC1RX    (0x00020000)
-+#define MCF_DMA_IMCR_SRC25_CTM1      (0x00040000)
-+#define MCF_DMA_IMCR_SRC25_FEC1TX    (0x00080000)
-+#define MCF_DMA_IMCR_SRC26_USBEP4    (0x00000000)
-+#define MCF_DMA_IMCR_SRC26_CTM2      (0x00200000)
-+#define MCF_DMA_IMCR_SRC27_USBEP5    (0x00000000)
-+#define MCF_DMA_IMCR_SRC27_CTM3      (0x00800000)
-+#define MCF_DMA_IMCR_SRC28_USBEP6    (0x00000000)
-+#define MCF_DMA_IMCR_SRC28_CTM4      (0x01000000)
-+#define MCF_DMA_IMCR_SRC28_DREQ1     (0x02000000)
-+#define MCF_DMA_IMCR_SRC28_PSC2RX    (0x03000000)
-+#define MCF_DMA_IMCR_SRC29_DREQ1     (0x04000000)
-+#define MCF_DMA_IMCR_SRC29_CTM5      (0x08000000)
-+#define MCF_DMA_IMCR_SRC29_PSC2TX    (0x0C000000)
-+#define MCF_DMA_IMCR_SRC30_FEC1RX    (0x00000000)
-+#define MCF_DMA_IMCR_SRC30_CTM6      (0x10000000)
-+#define MCF_DMA_IMCR_SRC30_PSC3RX    (0x30000000)
-+#define MCF_DMA_IMCR_SRC31_FEC1TX    (0x00000000)
-+#define MCF_DMA_IMCR_SRC31_CTM7      (0x80000000)
-+#define MCF_DMA_IMCR_SRC31_PSC3TX    (0xC0000000)
-+
-+#endif /* __MCF548X_DMA_H__ */
---- /dev/null
-+++ b/include/asm-m68k/m5485sram.h
-@@ -0,0 +1,12 @@
-+#ifndef SYS_SRAM_H
-+#define SYS_SRAM_H
-+
-+
-+#define SYS_SRAM_DMA_START        MCF_MBAR + 0x10000
-+#define SYS_SRAM_DMA_SIZE         8192
-+#define SYS_SRAM_FEC_START        SYS_SRAM_DMA_START + SYS_SRAM_DMA_SIZE
-+#define SYS_SRAM_FEC_SIZE         2048
-+#define SYS_SRAM_SEC_START        SYS_SRAM_FEC_START + SYS_SRAM_FEC_SIZE
-+#define SYS_SRAM_SEC_SIZE         1280
-+
-+#endif /* SYS_SRAM_H */
diff --git a/target/linux/coldfire/patches/046-mcfv4e_kern_to_phys.patch b/target/linux/coldfire/patches/046-mcfv4e_kern_to_phys.patch
deleted file mode 100644
index b11178978..000000000
--- a/target/linux/coldfire/patches/046-mcfv4e_kern_to_phys.patch
+++ /dev/null
@@ -1,1614 +0,0 @@
-From 13fc0abf4b5da6f18dea15fd31697655615a79fc Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Wed, 12 Mar 2008 15:39:03 -0600
-Subject: [PATCH] Move kernel to physical sdram base address.
-
-Work based on the patches from Systec GMBH.  Also DMA support,
-uBoot integration, FEC fixes, and assorted cleanups.
-
-Uber patch needs to be split up.
-
-LTIBName: mcfv4e-kern-to-phys
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/coldfire/config.c           |  102 ++-----
- arch/m68k/coldfire/dma.c              |    7 +-
- arch/m68k/coldfire/entry.S            |   10 +
- arch/m68k/coldfire/head.S             |   53 +++-
- arch/m68k/coldfire/mcf5445x-devices.c |    2 +
- arch/m68k/coldfire/mcf5445x-pci.c     |    3 +
- arch/m68k/coldfire/signal.c           |    3 +
- arch/m68k/configs/m5485evb_defconfig  |   79 +++++-
- arch/m68k/mm/cache.c                  |    4 +-
- arch/m68k/mm/cf-mmu.c                 |   28 ++-
- arch/m68k/mm/memory.c                 |    8 +-
- drivers/net/fec/fec.c                 |   20 +-
- include/asm-m68k/bootinfo.h           |   59 +++-
- include/asm-m68k/cf_cacheflush.h      |  547 +++++++++++----------------------
- include/asm-m68k/cf_pgalloc.h         |    5 +-
- include/asm-m68k/cf_pgtable.h         |    2 +-
- include/asm-m68k/cfcache.h            |    6 +
- include/asm-m68k/page.h               |    8 +
- include/asm-m68k/page_offset.h        |   25 +-
- 19 files changed, 446 insertions(+), 525 deletions(-)
-
---- a/arch/m68k/coldfire/config.c
-+++ b/arch/m68k/coldfire/config.c
-@@ -23,7 +23,6 @@
- #include <asm/coldfire.h>
- #include <asm/cfcache.h>
- #include <asm/cacheflush.h>
--#include <asm/bootinfo.h>
- #include <asm/io.h>
- #include <asm/cfmmu.h>
- #include <asm/setup.h>
-@@ -36,7 +35,14 @@
- 
- #include <asm/mcfsim.h>
- 
--#if 0
-+#if defined(CONFIG_M54455)
-+#define UBOOT_EXTRA_CLOCKS
-+#elif defined(CONFIG_M547X_8X)
-+#define UBOOT_PCI
-+#endif
-+#include <asm/bootinfo.h>
-+
-+#ifdef CONFIG_M54455
- #include <asm/mcf5445x_intc.h>
- #include <asm/mcf5445x_sdramc.h>
- #include <asm/mcf5445x_fbcs.h>
-@@ -44,10 +50,6 @@
- #include <asm/mcf5445x_xbs.h>
- #endif
- 
--/* JKM -- testing */
--#include <linux/pfn.h>
--/* JKM */
--
- extern int get_irq_list(struct seq_file *p, void *v);
- extern char _text, _end;
- extern char _etext, _edata, __init_begin, __init_end;
-@@ -58,6 +60,10 @@ extern unsigned long availmem;
- static int irq_enable[NR_IRQS];
- unsigned long num_pages;
- 
-+/* ethernet mac addresses from uboot */
-+unsigned char uboot_enet0[6];
-+unsigned char uboot_enet1[6];
-+
- void coldfire_sort_memrec(void)
- {
- 	int i, j;
-@@ -87,6 +93,9 @@ void coldfire_sort_memrec(void)
- 	}
- }
- 
-+/*
-+ * UBoot Handler
-+ */
- int __init uboot_commandline(char *bootargs)
- {
- 	int len = 0, cmd_line_len;
-@@ -101,12 +110,17 @@ int __init uboot_commandline(char *boota
- 		return 0;
- 
- 	/* Add offset to get post-remapped kernel memory location */
--	uboot_info.bd_info = (*(u32 *)(uboot_info_stk)) + offset;
-+	uboot_info.bdi = (struct bd_info *)((*(u32 *)(uboot_info_stk)) + offset);
- 	uboot_info.initrd_start = (*(u32 *)(uboot_info_stk+4)) + offset;
- 	uboot_info.initrd_end = (*(u32 *)(uboot_info_stk+8)) + offset;
- 	uboot_info.cmd_line_start = (*(u32 *)(uboot_info_stk+12)) + offset;
- 	uboot_info.cmd_line_stop = (*(u32 *)(uboot_info_stk+16)) + offset;
- 
-+	/* copy over mac addresses */
-+	memcpy(uboot_enet0, uboot_info.bdi->bi_enet0addr, 6);
-+	memcpy(uboot_enet1, uboot_info.bdi->bi_enet1addr, 6);
-+
-+	/* copy command line */
- 	cmd_line_len = uboot_info.cmd_line_stop - uboot_info.cmd_line_start;
- 	if ((cmd_line_len > 0) && (cmd_line_len < CL_SIZE-1))
- 		len = (int)strncpy(bootargs, (char *)uboot_info.cmd_line_start,\
-@@ -121,7 +135,7 @@ int __init uboot_commandline(char *boota
- #if defined(CONFIG_M54455)
- #define DEFAULT_COMMAND_LINE "root=/dev/mtdblock1 rw rootfstype=jffs2 ip=none mtdparts=physmap-flash.0:5M(kernel)ro,-(jffs2)"
- #elif defined(CONFIG_M547X_8X)
--#define DEFAULT_COMMAND_LINE "debug root=/dev/nfs nfsroot=172.27.155.1:/tftpboot/rigo/rootfs/ ip=172.27.155.85:172.27.155.1"
-+#define DEFAULT_COMMAND_LINE "debug root=/dev/nfs rw nfsroot=172.27.155.1:/tftpboot/rigo/rootfs/ ip=172.27.155.85:172.27.155.1"
- #endif
- asmlinkage void __init cf_early_init(void)
- {
-@@ -142,7 +156,6 @@ asmlinkage void __init cf_early_init(voi
- 	MCF_INTC1_IMRL = 0xFFFFFFFF;
- 	MCF_INTC1_IMRH = 0xFFFFFFFF;
- #elif defined(CONFIG_M547X_8X)
--/* JKM -- ?? */
- 	MCF_IMRL = 0xFFFFFFFF;
- 	MCF_IMRH = 0xFFFFFFFF;
- #endif
-@@ -170,7 +183,6 @@ asmlinkage void __init cf_early_init(voi
- 			MCF_XBS_PRS_M6(MCF_XBS_PRI_1) |
- 			MCF_XBS_PRS_M7(MCF_XBS_PRI_7));
- #endif
--	
- 
- 	m68k_machtype = MACH_CFMMU;
- 	m68k_fputype = FPU_CFV4E;
-@@ -181,7 +193,6 @@ asmlinkage void __init cf_early_init(voi
- 	m68k_memory[m68k_num_memory].addr = CONFIG_SDRAM_BASE;
- 	m68k_memory[m68k_num_memory++].size = CONFIG_SDRAM_SIZE;
- 
--#if defined(CONFIG_M54455)
- 	if (!uboot_commandline(m68k_command_line)) {
- #if defined(CONFIG_BOOTPARAM)
- 		strncpy(m68k_command_line, CONFIG_BOOTPARAM_STRING, CL_SIZE-1);
-@@ -189,11 +200,6 @@ asmlinkage void __init cf_early_init(voi
- 		strcpy(m68k_command_line, DEFAULT_COMMAND_LINE);
- #endif
- 	}
--#else
--/* JKM -- hack until mappings get resolved */
--	strcpy(m68k_command_line, DEFAULT_COMMAND_LINE);
--#endif
--
- 
- #if defined(CONFIG_BLK_DEV_INITRD)
- 	/* add initrd image */
-@@ -372,75 +378,11 @@ void coldfire_reboot(void)
- #endif
- }
- 
--/* int coldfire_hwclk(int i, struct rtc_time *t)
--{
--	printk ("Real time clock needs porting.\n");
--	return 0;
--}*/
--
- static void coldfire_get_model(char *model)
- {
- 	sprintf(model, "Version 4 ColdFire");
- }
- 
--/* JKM -- Why do we need these? */
--void coldfire_enable_irq(unsigned int vec)
--{
--	unsigned long flags;
--
--	vec -= 64;
--
--	if (((int)vec < 0) || (vec > 63)) {
--		printk(KERN_WARNING "enable_irq %d failed\n", vec);
--		return;
--	}
--
--	local_irq_save(flags);
--	irq_enable[vec]++;
--#if defined(CONFIG_M54455)
--	if (vec < 32)
--		MCF_INTC0_IMRL &= ~(1 << vec);
--	else
--		MCF_INTC0_IMRH &= ~(1 << (vec - 32));
--#elif defined(CONFIG_M547X_8X)
--	if (vec < 32)
--		MCF_IMRL &= ~(1 << vec);
--	else
--		MCF_IMRH &= ~(1 << (vec - 32));
--#endif
--	local_irq_restore(flags);
--}
--
--/* JKM -- Why do we need these? */
--void coldfire_disable_irq(unsigned int vec)
--{
--	unsigned long flags;
--
--	vec -= 64;
--
--	if (((int)vec < 0) || (vec > 63)) {
--		printk(KERN_WARNING "disable_irq %d failed\n", vec);
--		return;
--	}
--
--	local_irq_save(flags);
--	if (--irq_enable[vec] == 0) {
--#if defined(CONFIG_M54455)
--		if (vec < 32)
--			MCF_INTC0_IMRL |= (1 << vec);
--		else
--			MCF_INTC0_IMRH |= (1 << (vec - 32));
--#elif defined(CONFIG_M547X_8X)
--		if (vec < 32)
--			MCF_IMRL |= (1 << vec);
--		else
--			MCF_IMRH |= (1 << (vec - 32));
--#endif
--
--	}
--	local_irq_restore(flags);
--}
--
- static void __init
- coldfire_bootmem_alloc(unsigned long memory_start, unsigned long memory_end)
- {
---- a/arch/m68k/coldfire/dma.c
-+++ b/arch/m68k/coldfire/dma.c
-@@ -516,13 +516,8 @@ dma_init()
- 	MCF_DMA_DIPR = 0xFFFFFFFF;
- 
- 	MCF_ICR(ISC_DMA) = ILP_DMA;
--#if 0
--// JKM
--	enable_irq( 64 + ISC_DMA );
--#endif
- 
--	result =
--	    MCD_initDma((dmaRegs *) (MCF_MBAR + 0x8000),
-+	result = MCD_initDma((dmaRegs *) (MCF_MBAR + 0x8000),
- 			(void *) SYS_SRAM_DMA_START, MCD_RELOC_TASKS);
- 	if (result != MCD_OK) {
- 		printk("Cannot perform DMA initialization\n");
---- a/arch/m68k/coldfire/entry.S
-+++ b/arch/m68k/coldfire/entry.S
-@@ -10,6 +10,8 @@
-  *  Kurt Mahan kmahan@freescale.com
-  *  Copyright Freescale Semiconductor, Inc. 2007
-  *
-+ *  Modify irq status in buserr -- (c) Copyright 2008, SYSTEM electronic Gmbh
-+ *
-  * Based on:
-  *
-  *  arch/m68knommu/platform/5307/entry.S &
-@@ -77,7 +79,15 @@ sw_usp:
- .globl inthandler
- 
- ENTRY(buserr)
-+#ifdef CONFIG_COLDFIRE_FOO
-+	movew	#0x2700,%sr		/* lock interrupts */
-+#endif
- 	SAVE_ALL_INT
-+#ifdef	CONFIG_COLDFIRE_FOO
-+	movew	PT_SR(%sp),%d3		/* get original %sr */
-+	oril	#0x2000,%d3		/* set supervisor mode in it */
-+	movew	%d3,%sr			/* recover irq state */
-+#endif
- 	GET_CURRENT(%d0)
- 	movel   %sp,%sp@-		/* stack frame pointer argument */
- 	jsr     buserr_c
---- a/arch/m68k/coldfire/head.S
-+++ b/arch/m68k/coldfire/head.S
-@@ -5,6 +5,7 @@
-  *    Matt Waddel Matt.Waddel@freescale.com
-  *    Kurt Mahan kmahan@freescale.com
-  *  Copyright Freescale Semiconductor, Inc. 2007, 2008
-+ *  Phys kernel mapping Copyright Daniel Krueger, SYSTEC electornic GmbH 2008
-  *
-  *  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
-@@ -52,7 +53,7 @@
- #define __FINIT		.previous
- #endif
- 
--/* JKM -- REVISE DOCS FOR RIGO */
-+/* JKM -- REVISE DOCS FOR RIGO and PHYS MAPPING */
- /*
-  * Setup ACR mappings to provide the following memory map:
-  *   Data
-@@ -62,10 +63,17 @@
-  *     None currently (mapped via TLBs)
-  */
- 
-+#if CONFIG_SDRAM_BASE != PAGE_BASE
- #if defined(CONFIG_M54455)
-+#if 0
- #define ACR0_DEFAULT	#0xA00FA048   /* ACR0 default value */
-+#endif
-+#define ACR0_DEFAULT	#0x400FA028   /* ACR0 default value */
- #define ACR1_DEFAULT	#0xF00FA040   /* ACR1 default value */
-+#if 0
- #define ACR2_DEFAULT	#0x00000000   /* ACR2 default value */
-+#endif
-+#define ACR2_DEFAULT	#0x400FA028   /* ACR2 default value */
- #define ACR3_DEFAULT	#0x00000000   /* ACR3 default value */
- /* ACR mapping for FPGA (maps 0) */
- #define ACR0_FPGA	#0x000FA048   /* ACR0 enable FPGA */
-@@ -76,6 +84,16 @@
- #define ACR3_DEFAULT	#0x00000000   /* ACR3 default value */
- #endif
- 
-+#else
-+#if defined(CONFIG_M54455)
-+#elif defined(CONFIG_M547X_8X)
-+#define ACR0_DEFAULT	#0xE000C040   /* ACR0 default value */
-+#define ACR1_DEFAULT	#0x000FA008   /* ACR1 default value */
-+#define ACR2_DEFAULT	#0x00000000   /* ACR2 default value */
-+#define ACR3_DEFAULT	#0x000FA008   /* ACR3 default value */
-+#endif
-+#endif
-+
- 
- /* Several macros to make the writing of subroutines easier:
-  * - func_start marks the beginning of the routine which setups the frame
-@@ -153,6 +171,7 @@ func_define	putn,1
- #endif
- .endm
- 
-+#if CONFIG_SDRAM_BASE != PAGE_OFFSET
- /*
- 	mmu_map  -  creates a new TLB entry
- 
-@@ -222,6 +241,7 @@ func_define	putn,1
- 	movew	\temp_data_reg, (MMUOR)
- 1:	
- .endm	/* mmu_unmap */
-+#endif /* CONFIG_SDRAM_BASE != PAGE_OFFSET */
- 
- /* .text */
- .section ".text.head","ax"
-@@ -235,7 +255,11 @@ ENTRY(_stext)
- 
- 	.long	BOOTINFOV_MAGIC
- 	.long	0
-+#if CONFIG_SDRAM_BASE != PAGE_OFFSET
- 1:	jmp	__start-(0xc0000000-CONFIG_SDRAM_BASE)
-+#else
-+1:	jmp	__start
-+#endif
- 
- .equ	kernel_pg_dir,_stext
- .equ	.,_stext+0x1000
-@@ -244,24 +268,13 @@ ENTRY(_start)
- 	jra	__start
- __INIT
- ENTRY(__start)
--
--/* JKM -- make sure Rigo handles UBOOT */
- /* Save the location of u-boot info - cmd line, bd_info, etc. */
- 	movel	%a7,%a4		/* Don't use %a4 before cf_early_init */
--/* JKM -- fix to use CONFIG_SDRAM_BASE) */
--#if defined(CONFIG_M54455)
--	addl	#0x80000004,%a4	/* 0x80000004= 1 stack push + high mem offset */
--#elif defined(CONFIG_M547X_8X)
--	addl	#0xc0000004,%a4	/* 0x80000004= 1 stack push + high mem offset */
--#endif
-+	addl	#0x00000004,%a4	/* offset past top */
-+	addl	#(PAGE_OFFSET-CONFIG_SDRAM_BASE),%a4	/* high mem offset */
- 
--/* JKM -- fix this to work off of CONFIG_SDRAM_BASE */
- /* Setup initial stack pointer */
--#if defined(CONFIG_M54455)
--	movel	#0x40001000,%sp	
--#elif defined(CONFIG_M547X_8X)
--	movel	#0x00001000,%sp	
--#endif
-+	movel	#CONFIG_SDRAM_BASE+0x1000,%sp
- 
- /* Setup usp */
- 	subl	%a0,%a0
-@@ -297,16 +310,21 @@ ENTRY(__start)
- /* setup ACRs */
- 	movel	ACR0_DEFAULT, %d0  		/* ACR0 (DATA) setup */
- 	movec   %d0, %acr0
-+	nop
- 	movel	ACR1_DEFAULT, %d0  		/* ACR1 (DATA) setup */
- 	movec   %d0, %acr1
-+	nop
- 	movel	ACR2_DEFAULT, %d0  		/* ACR2 (CODE) setup */
- 	movec   %d0, %acr2
-+	nop
- 	movel	ACR3_DEFAULT, %d0  		/* ACR3 (CODE) setup */
- 	movec   %d0, %acr3
-+	nop
- 
- 	/* If you change the memory size to another value make a matching 
- 	   change in paging_init(cf-mmu.c) to zones_size[]. */
- 
-+#if CONFIG_SDRAM_BASE != PAGE_OFFSET
- #if defined(CONFIG_M54455)
- 	/* Map 256MB as code */
- 	mmu_map	(PAGE_OFFSET+0*0x1000000),  (PHYS_OFFSET+0*0x1000000), \
-@@ -511,6 +529,7 @@ ENTRY(__start)
- 		MMUTR_SG, MMUDR_SZ1M, MMUDR_DCB, MMUDR_SP, MMUDR_R, \
- 		MMUDR_W, 0, 0, %d0
- #endif
-+#endif /* CONFIG_SDRAM_BASE != PAGE_OFFSET */
- 
- 	/* Turn on MMU */
- 	movel	#(MMUCR_EN),%a0
-@@ -531,6 +550,7 @@ ENTRY(__running_high)
- 	movel	%a1,%a0@
- 
- 	/* Unmap unity mappings */
-+#if CONFIG_SDRAM_BASE != PAGE_OFFSET
- #if defined(CONFIG_M54455)
- 	mmu_unmap (PHYS_OFFSET+0*0x1000000), MMUOR_ITLB, %d0
- 	mmu_unmap (PHYS_OFFSET+0*0x1000000), 0, %d0
-@@ -544,6 +564,7 @@ ENTRY(__running_high)
- 	mmu_unmap (PHYS_OFFSET+2*0x1000000), 0, %d0
- 	mmu_unmap (PHYS_OFFSET+3*0x1000000), 0, %d0
- #endif
-+#endif /* CONFIG_SDRAM_BASE != PAGE_OFFSET */
- 
- /* Setup initial stack pointer */
- 	lea	init_task,%a2 
-@@ -574,6 +595,7 @@ func_return	set_context
-  * Map in 0x00000000 -> 0x0fffffff and then do the write.
-  */
- set_fpga:
-+#if 0
- 	movew	%sr,%d1
- 	movew	#0x2700,%sr
- 	movel	ACR0_FPGA, %d0
-@@ -585,6 +607,7 @@ set_fpga:
- 	movec   %d0, %acr0
- 	nop
- 	movew	%d1,%sr
-+#endif
- 	rts
- #endif
- 
---- a/arch/m68k/coldfire/mcf5445x-devices.c
-+++ b/arch/m68k/coldfire/mcf5445x-devices.c
-@@ -127,7 +127,9 @@ static inline void mcf5445x_init_pata(vo
- static int __init mcf5445x_init_devices(void)
- {
- 	printk(KERN_INFO "MCF5445x INIT_DEVICES\n");
-+#if 0
- 	mcf5445x_init_pata();
-+#endif
- 
- 	return 0;
- }
---- a/arch/m68k/coldfire/mcf5445x-pci.c
-+++ b/arch/m68k/coldfire/mcf5445x-pci.c
-@@ -236,6 +236,8 @@ mcf5445x_pci_arb_interrupt(int irq, void
- int __init
- init_mcf5445x_pci(void)
- {
-+	return 0;
-+#if 0
- 	/*
- 	 * Initialize the PCI core
- 	 */
-@@ -331,6 +333,7 @@ init_mcf5445x_pci(void)
- 	raw_pci_ops = &mcf5445x_pci_ops;
- 
- 	return 0;
-+#endif
- }
- 
- /*
---- a/arch/m68k/coldfire/signal.c
-+++ b/arch/m68k/coldfire/signal.c
-@@ -608,7 +608,10 @@ static inline int rt_setup_ucontext(stru
- 
- static inline void push_cache(unsigned long vaddr)
- {
-+#if 0 
-+// JKM -- need to add into the old cpushl cache stuff
- 	cf_cache_push(__pa(vaddr), 8);
-+#endif
- }
- 
- static inline void __user *
---- a/arch/m68k/configs/m5485evb_defconfig
-+++ b/arch/m68k/configs/m5485evb_defconfig
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
- # Linux kernel version: 2.6.24
--# Thu Feb 21 00:19:01 2008
-+# Wed Mar  5 16:05:25 2008
- #
- CONFIG_M68K=y
- CONFIG_MMU=y
-@@ -103,6 +103,7 @@ CONFIG_DEFAULT_IOSCHED="cfq"
- # CONFIG_SUN3 is not set
- CONFIG_COLDFIRE=y
- CONFIG_CFV4E=y
-+CONFIG_MCD_DMA=y
- # CONFIG_AMIGA is not set
- # CONFIG_ATARI is not set
- # CONFIG_MAC is not set
-@@ -135,7 +136,7 @@ CONFIG_M5485CFE=y
- # CONFIG_M5485DFE is not set
- # CONFIG_M5485EFE is not set
- # CONFIG_M5485FFE is not set
--CONFIG_MCFCLK=50000000
-+CONFIG_MCFCLK=200000000
- # CONFIG_MCF_USER_HALT is not set
- CONFIG_MMU_CFV4E=y
- CONFIG_SDRAM_BASE=0x00000000
-@@ -279,7 +280,73 @@ CONFIG_FW_LOADER=y
- # CONFIG_DEBUG_DEVRES is not set
- # CONFIG_SYS_HYPERVISOR is not set
- # CONFIG_CONNECTOR is not set
--# CONFIG_MTD is not set
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+
-+#
-+# User Modules And Translation Layers
-+#
-+# CONFIG_MTD_CHAR is not set
-+CONFIG_MTD_BLKDEVS=y
-+CONFIG_MTD_BLOCK=y
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+# CONFIG_MTD_CFI is not set
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+CONFIG_MTD_RAM=y
-+CONFIG_MTD_ROM=y
-+# CONFIG_MTD_ABSENT is not set
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+# CONFIG_MTD_NAND is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
- # CONFIG_PARPORT is not set
- CONFIG_BLK_DEV=y
- # CONFIG_BLK_DEV_COW_COMMON is not set
-@@ -347,6 +414,9 @@ CONFIG_NETDEVICES=y
- # CONFIG_PHYLIB is not set
- CONFIG_NET_ETHERNET=y
- CONFIG_MII=y
-+CONFIG_FEC_548x=y
-+CONFIG_FEC_548x_AUTO_NEGOTIATION=y
-+# CONFIG_FEC_548x_ENABLE_FEC2 is not set
- # CONFIG_IBM_NEW_EMAC_ZMII is not set
- # CONFIG_IBM_NEW_EMAC_RGMII is not set
- # CONFIG_IBM_NEW_EMAC_TAH is not set
-@@ -530,7 +600,7 @@ CONFIG_FS_MBCACHE=y
- # CONFIG_GFS2_FS is not set
- # CONFIG_OCFS2_FS is not set
- CONFIG_MINIX_FS=y
--# CONFIG_ROMFS_FS is not set
-+CONFIG_ROMFS_FS=y
- # CONFIG_INOTIFY is not set
- # CONFIG_QUOTA is not set
- CONFIG_DNOTIFY=y
-@@ -578,6 +648,7 @@ CONFIG_TMPFS=y
- # CONFIG_BEFS_FS is not set
- # CONFIG_BFS_FS is not set
- # CONFIG_EFS_FS is not set
-+# CONFIG_JFFS2_FS is not set
- # CONFIG_CRAMFS is not set
- # CONFIG_VXFS_FS is not set
- # CONFIG_HPFS_FS is not set
---- a/arch/m68k/mm/cache.c
-+++ b/arch/m68k/mm/cache.c
-@@ -81,7 +81,9 @@ static unsigned long virt_to_phys_slow(u
- void flush_icache_range(unsigned long address, unsigned long endaddr)
- {
- #ifdef CONFIG_COLDFIRE
--	cf_icache_flush_range(address, endaddr);
-+// JKM -- hack until new cpushl stuff is in
-+//	cf_icache_flush_range(address, endaddr);
-+	flush_icache();
- #else /* !CONFIG_COLDFIRE */
- 
- 	if (CPU_IS_040_OR_060) {
---- a/arch/m68k/mm/cf-mmu.c
-+++ b/arch/m68k/mm/cf-mmu.c
-@@ -35,6 +35,12 @@
- #include <asm/coldfire.h>
- #include <asm/tlbflush.h>
- 
-+#if PAGE_OFFSET == CONFIG_SDRAM_BASE
-+#define	KERNRAM(x) ((x >= PAGE_OFFSET) && (x < (PAGE_OFFSET + CONFIG_SDRAM_SIZE)))
-+#else
-+#define	KERNRAM(x) (x >= PAGE_OFFSET)
-+#endif
-+
- mm_context_t next_mmu_context;
- unsigned long context_map[LAST_CONTEXT / BITS_PER_LONG + 1];
- 
-@@ -53,10 +59,16 @@ extern char __init_begin, __init_end;
- 
- void free_initmem(void)
- {
-+#if 0
- 	unsigned long addr;
- 	unsigned long start = (unsigned long)&__init_begin;
- 	unsigned long end = (unsigned long)&__init_end;
- 
-+/* 
-+ * JKM -- revisit -- the latest round of vmlinux.lds changes has caused
-+ * a little grief with how init areas are handled.  With the new toolchain
-+ * release I'll fix this.
-+ */
- 	printk(KERN_INFO "free_initmem: __init_begin = 0x%lx  __init_end = 0x%lx\n", start, end);
- 
- 	addr = (unsigned long)&__init_begin;
-@@ -67,6 +79,7 @@ void free_initmem(void)
- 		free_page(addr);
- 		totalram_pages++;
- 	}
-+#endif
- }
- 
- /* Coldfire paging_init derived from sun3 */
-@@ -149,8 +162,8 @@ int cf_tlb_miss(struct pt_regs *regs, in
- 	mmuar = ( dtlb ) ? regs->mmuar
- 			 : regs->pc + (extension_word * sizeof(long));
- 
--        mm = (!user_mode(regs) && (mmuar >= PAGE_OFFSET)) ? &init_mm
--							  : current->mm;
-+        mm = (!user_mode(regs) && KERNRAM(mmuar)) ? &init_mm : current->mm;
-+
-         if (!mm) {
- 	    local_irq_restore(flags);
- 	    return (-1);
-@@ -167,9 +180,9 @@ int cf_tlb_miss(struct pt_regs *regs, in
- 	    local_irq_restore(flags);
- 	    return (-1);
- 	}	
--    	
--	pte = (mmuar >= PAGE_OFFSET) ? pte_offset_kernel(pmd, mmuar)
--	                             : pte_offset_map(pmd, mmuar);
-+    
-+	pte = (KERNRAM(mmuar)) ? pte_offset_kernel(pmd, mmuar)
-+	                       : pte_offset_map(pmd, mmuar);
-     	if (pte_none(*pte) || !pte_present(*pte)) {
- 	    local_irq_restore(flags);
- 	    return (-1);		
-@@ -185,7 +198,7 @@ int cf_tlb_miss(struct pt_regs *regs, in
- 	
-         set_pte(pte, pte_mkyoung(*pte));
-         asid = mm->context & 0xff;
--        if (!pte_dirty(*pte) && mmuar<=PAGE_OFFSET)
-+        if (!pte_dirty(*pte) && !KERNRAM(mmuar))
-     	    set_pte(pte, pte_wrprotect(*pte));
- 
-         *MMUTR = (mmuar & PAGE_MASK) | (asid << CF_ASID_MMU_SHIFT)
-@@ -201,7 +214,8 @@ int cf_tlb_miss(struct pt_regs *regs, in
- 	else
- 	    *MMUOR = MMUOR_ITLB | MMUOR_ACC | MMUOR_UAA;
- 
--	asm ("nop");
-+	asm("nop");
-+
- 	/*printk("cf_tlb_miss: va=%lx, pa=%lx\n", (mmuar & PAGE_MASK), 
- 		  (pte_val(*pte)  & PAGE_MASK));*/
- 	local_irq_restore(flags);
---- a/arch/m68k/mm/memory.c
-+++ b/arch/m68k/mm/memory.c
-@@ -206,7 +206,9 @@ static inline void pushcl040(unsigned lo
- void cache_clear (unsigned long paddr, int len)
- {
- #ifdef CONFIG_COLDFIRE
--	cf_cache_clear(paddr, len);
-+// JKM -- revise to use proper caching
-+//	cf_cache_clear(paddr, len);
-+	flush_bcache();
- #else
-     if (CPU_IS_040_OR_060) {
- 	int tmp;
-@@ -257,7 +259,9 @@ EXPORT_SYMBOL(cache_clear);
- void cache_push (unsigned long paddr, int len)
- {
- #ifdef CONFIG_COLDFIRE
--	cf_cache_push(paddr, len);
-+// JKM -- revise to use proper caching
-+//	cf_cache_push(paddr, len);
-+	flush_bcache();
- #else
-     if (CPU_IS_040_OR_060) {
- 	int tmp = PAGE_SIZE;
---- a/drivers/net/fec/fec.c
-+++ b/drivers/net/fec/fec.c
-@@ -99,6 +99,9 @@ unsigned char fec_mac_addr_fec0[6] = { 0
- unsigned char fec_mac_addr_fec1[6] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x51 };	// Default address of FEC1
- #endif
- 
-+extern unsigned char uboot_enet0[];
-+extern unsigned char uboot_enet1[];
-+
- #ifndef MODULE
- int fec_str_to_mac( char *str_mac, unsigned char* addr);
- int __init fec_mac_setup0 (char *s);
-@@ -175,6 +178,12 @@ printk(KERN_INFO "FEI: index=%d\n", inde
- printk(KERN_INFO "FEI: txdesc=0x%p  rxdesc=0x%p\n", fp->fecpriv_txdesc, fp->fecpriv_rxdesc);
- 
- 		/* mac addr */
-+		if (uboot_enet0[0] || uboot_enet0[1] || uboot_enet0[2] ||
-+		    uboot_enet0[3] || uboot_enet0[4] || uboot_enet0[5]) {
-+			/* use uboot enet 0 addr */
-+			memcpy(fec_mac_addr_fec0, uboot_enet0, 6);
-+		}
-+
- 		fp->fecpriv_mac_addr = fec_mac_addr_fec0;
- 	}
- 	else {
-@@ -211,6 +220,11 @@ printk(KERN_INFO "FEI: txdesc=0x%p  rxde
- 		fp->fecpriv_rxdesc = (void*)FEC_RX_DESC_FEC1;
- 
- 		/* mac addr */
-+		if (uboot_enet1[0] || uboot_enet1[1] || uboot_enet1[2] ||
-+		    uboot_enet1[3] || uboot_enet1[4] || uboot_enet1[5]) {
-+			/* use uboot enet 1 addr */
-+			memcpy(fec_mac_addr_fec1, uboot_enet1, 6);
-+		}
- 		fp->fecpriv_mac_addr = fec_mac_addr_fec1;
- #endif
- 	}
-@@ -762,7 +776,6 @@ int fec_tx(struct sk_buff *skb, struct n
- 	void *data, *data_aligned;
- 	int offset;
- 
--printk(KERN_INFO "fec_tx\n");
- 	data = kmalloc(skb->len + 15, GFP_DMA | GFP_ATOMIC);
- 
- 	if (!data)
-@@ -820,7 +833,6 @@ void fec_tx_timeout(struct net_device *d
- 	struct fec_priv *fp = netdev_priv(dev);
- 	unsigned long base_addr = (unsigned long) dev->base_addr;
- 
--printk(KERN_INFO "fec_tx_timeout\n");
- 	spin_lock_irq(&fp->fecpriv_lock);
- 	MCD_killDma(fp->fecpriv_fec_tx_channel);
- 	for (i = 0; i < FEC_TX_BUF_NUMBER; i++)
-@@ -941,7 +953,6 @@ void fec_interrupt_fec_tx_handler(struct
- {
- 	struct fec_priv *fp = netdev_priv(dev);
- 
--printk(KERN_INFO "fectxint\n");
- 	//Release the socket buffer
- 	if(fp->fecpriv_txbuf[fp->fecpriv_current_tx])
- 	{
-@@ -977,7 +988,6 @@ void fec_interrupt_fec_rx_handler(struct
- 	struct fec_priv *fp = netdev_priv(dev);
- 	struct sk_buff *skb;
- 
--printk(KERN_INFO "fecrxint\n");
- 	fp->fecpriv_rxflag = 1;
- /*
- 	// Some buffers can be missed
-@@ -1070,7 +1080,6 @@ irqreturn_t fec_interrupt_handler(int ir
- 	unsigned long base_addr = (unsigned long) dev->base_addr;
- 	unsigned long events;
- 
--printk(KERN_INFO "fecerrint\n");
- 	// Read and clear the events
- 	events = FEC_EIR(base_addr) & FEC_EIMR(base_addr);
- 
-@@ -1157,7 +1166,6 @@ void fec_interrupt_fec_reinit(unsigned l
- 	struct fec_priv *fp = netdev_priv(dev);
- 	unsigned long base_addr = (unsigned long) dev->base_addr;
- 
--printk(KERN_INFO "fecreinit\n");
- 	// Initialize reception descriptors and start DMA for the reception
- 	for (i = 0; i < FEC_RX_BUF_NUMBER; i++)
- 	{
---- a/include/asm-m68k/bootinfo.h
-+++ b/include/asm-m68k/bootinfo.h
-@@ -19,11 +19,59 @@
- **   Redesign of the boot information structure; renamed to bootinfo.h again
- ** 27/11/96 Geert Uytterhoeven:
- **   Backwards compatibility with bootinfo interface version 1.0
-+** 12/03/08 Kurt Mahan
-+**   Copy the bd_info structure from uboot1.3.2/include/asm-m68k/u-boot.h
-+**   into this file.  The original author is Wolfgang Denk, 
-+**   DENX Software Engineering, wd@denx.de.
- */
- 
- #ifndef _M68K_BOOTINFO_H
- #define _M68K_BOOTINFO_H
- 
-+#ifndef __ASSEMBLY__
-+/*
-+ * UBoot Support
-+ *
-+ * bd_info structure from uboot1.3.2/include/asm-m68k/u-boot.h
-+ */
-+struct bd_info {
-+	unsigned long bi_memstart;	/* start of DRAM memory */
-+	unsigned long bi_memsize;	/* size  of DRAM memory in bytes */
-+	unsigned long bi_flashstart;	/* start of FLASH memory */
-+	unsigned long bi_flashsize;	/* size  of FLASH memory */
-+	unsigned long bi_flashoffset;	/* reserved area for startup monitor */
-+	unsigned long bi_sramstart;	/* start of SRAM memory */
-+	unsigned long bi_sramsize;	/* size  of SRAM memory */
-+	unsigned long bi_mbar_base;	/* base of internal registers */
-+	unsigned long bi_bootflags;	/* boot / reboot flag (for LynxOS) */
-+	unsigned long bi_boot_params;	/* where this board expects params */
-+	unsigned long bi_ip_addr;	/* IP Address */
-+	unsigned char bi_enet0addr[6];	/* Ethernet 0 mac address */
-+	unsigned short bi_ethspeed;	/* Ethernet speed in Mbps */
-+	unsigned long bi_intfreq;	/* Internal Freq, in MHz */
-+	unsigned long bi_busfreq;	/* Bus Freq, in MHz */
-+#ifdef UBOOT_PCI
-+	unsigned long bi_pcifreq;	/* pci Freq in MHz */
-+#endif
-+#ifdef UBOOT_EXTRA_CLOCK
-+	unsigned long bi_inpfreq;	/* input Freq in MHz */
-+	unsigned long bi_vcofreq;	/* vco Freq in MHz */
-+	unsigned long bi_flbfreq;	/* Flexbus Freq in MHz */
-+#endif
-+	unsigned long bi_baudrate;	/* Console Baudrate */
-+	unsigned char bi_enet1addr[6];	/* eth1 mac address */
-+	unsigned char bi_enet2addr[6];	/* eth2 mac address */
-+	unsigned char bi_enet3addr[6];	/* eth3 mac address */
-+};
-+
-+struct uboot_record {
-+	struct bd_info *bdi;
-+    	unsigned long initrd_start;
-+    	unsigned long initrd_end;
-+    	unsigned long cmd_line_start;
-+    	unsigned long cmd_line_stop;
-+};
-+#endif /* __ASSEMBLY__ */
- 
-     /*
-      *  Bootinfo definitions
-@@ -49,17 +97,6 @@ struct bi_record {
- #endif /* __ASSEMBLY__ */
- 
- 
--#ifndef __ASSEMBLY__
--
--struct uboot_record {
--    unsigned long bd_info;
--    unsigned long initrd_start;
--    unsigned long initrd_end;
--    unsigned long cmd_line_start;
--    unsigned long cmd_line_stop;
--};
--
--#endif /* __ASSEMBLY__ */
- 
- 
-     /*
---- a/include/asm-m68k/cf_cacheflush.h
-+++ b/include/asm-m68k/cf_cacheflush.h
-@@ -1,335 +1,92 @@
--/*
-- * include/asm-m68k/cf_cacheflush.h - Coldfire Cache
-- *
-- * Based on include/asm-m68k/cacheflush.h
-- *
-- * Coldfire pieces by:
-- *   Kurt Mahan kmahan@freescale.com
-- *
-- * Copyright Freescale Semiconductor, Inc. 2007
-- *
-- * 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.
-- */
- #ifndef M68K_CF_CACHEFLUSH_H
- #define M68K_CF_CACHEFLUSH_H
- 
- #include <asm/cfcache.h>
--
- /*
-- * Coldfire Cache Model
-- *
-- * The Coldfire processors use a Harvard architecture cache configured
-- * as four-way set associative.  The cache does not implement bus snooping
-- * so cache coherency with other masters must be maintained in software.
-- *
-- * The cache is managed via the CPUSHL instruction in conjunction with
-- * bits set in the CACR (cache control register).  Currently the code
-- * uses the CPUSHL enhancement which adds the ability to
-- * invalidate/clear/push a cacheline by physical address.  This feature
-- * is designated in the Hardware Configuration Register [D1-CPES].
-- *
-- * CACR Bits:
-- *	DPI[28]		cpushl invalidate disable for d-cache
-- *	IDPI[12]	cpushl invalidate disable for i-cache
-- *	SPA[14]		cpushl search by physical address
-- *	IVO[20]		cpushl invalidate only
-- *
-- * Random Terminology:
-- *  * invalidate = reset the cache line's valid bit
-- *  * push = generate a line-sized store of the data if its contents are marked
-- *	     as modifed (the modified flag is cleared after the store)
-- *  * clear = push + invalidate
-- */
--
--/**
-- * flush_icache - Flush all of the instruction cache
-- */
--static inline void flush_icache(void)
--{
--	asm volatile("nop\n"
--		     "moveq%.l	#0,%%d0\n"
--		     "moveq%.l	#0,%%d1\n"
--		     "move%.l	%%d0,%%a0\n"
--		     "1:\n"
--		     "cpushl	%%ic,(%%a0)\n"
--		     "add%.l	#0x0010,%%a0\n"
--		     "addq%.l	#1,%%d1\n"
--		     "cmpi%.l	%0,%%d1\n"
--		     "bne	1b\n"
--		     "moveq%.l	#0,%%d1\n"
--		     "addq%.l	#1,%%d0\n"
--		     "move%.l	%%d0,%%a0\n"
--		     "cmpi%.l	#4,%%d0\n"
--		     "bne	1b\n"
--		     : : "i" (CACHE_SETS)
--		     : "a0", "d0", "d1");
--}
--
--/**
-- * flush_dcache - Flush all of the data cache
-- */
--static inline void flush_dcache(void)
--{
--	asm volatile("nop\n"
--		     "moveq%.l	#0,%%d0\n"
--		     "moveq%.l	#0,%%d1\n"
--		     "move%.l	%%d0,%%a0\n"
--		     "1:\n"
--		     "cpushl	%%dc,(%%a0)\n"
--		     "add%.l	#0x0010,%%a0\n"
--		     "addq%.l	#1,%%d1\n"
--		     "cmpi%.l	%0,%%d1\n"
--		     "bne	1b\n"
--		     "moveq%.l	#0,%%d1\n"
--		     "addq%.l	#1,%%d0\n"
--		     "move%.l	%%d0,%%a0\n"
--		     "cmpi%.l	#4,%%d0\n"
--		     "bne	1b\n"
--		     : : "i" (CACHE_SETS)
--		     : "a0", "d0", "d1");
--}
--
--/**
-- * flush_bcache - Flush all of both caches
-+ * Cache handling functions
-  */
--static inline void flush_bcache(void)
--{
--	asm volatile("nop\n"
--		     "moveq%.l	#0,%%d0\n"
--		     "moveq%.l	#0,%%d1\n"
--		     "move%.l	%%d0,%%a0\n"
--		     "1:\n"
--		     "cpushl	%%bc,(%%a0)\n"
--		     "add%.l	#0x0010,%%a0\n"
--		     "addq%.l	#1,%%d1\n"
--		     "cmpi%.l	%0,%%d1\n"
--		     "bne	1b\n"
--		     "moveq%.l	#0,%%d1\n"
--		     "addq%.l	#1,%%d0\n"
--		     "move%.l	%%d0,%%a0\n"
--		     "cmpi%.l	#4,%%d0\n"
--		     "bne	1b\n"
--		     : : "i" (CACHE_SETS)
--		     : "a0", "d0", "d1");
--}
- 
--/**
-- * cf_cache_clear - invalidate cache
-- * @paddr: starting physical address
-- * @len: number of bytes
-- *
-- * Invalidate cache lines starting at paddr for len bytes.
-- * Those lines are not pushed.
-- */
--static inline void cf_cache_clear(unsigned long paddr, int len)
--{
--	/* number of lines */
--	len = (len + (CACHE_LINE_SIZE-1)) / CACHE_LINE_SIZE;
--	if (len == 0)
--		return;
--
--	/* align on set boundary */
--	paddr &= 0xfffffff0;
--
--	asm volatile("nop\n"
--		     "move%.l   %2,%%d0\n"
--		     "or%.l	%3,%%d0\n"
--		     "movec	%%d0,%%cacr\n"
--		     "move%.l	%0,%%a0\n"
--		     "move%.l	%1,%%d0\n"
--		     "1:\n"
--		     "cpushl	%%bc,(%%a0)\n"
--		     "lea	0x10(%%a0),%%a0\n"
--		     "subq%.l	#1,%%d0\n"
--		     "bne%.b	1b\n"
--		     "movec	%2,%%cacr\n"
--		     : : "a" (paddr), "r" (len),
--			 "r" (shadow_cacr),
--			 "i" (CF_CACR_SPA+CF_CACR_IVO)
--		     : "a0", "d0");
--}
--
--/**
-- * cf_cache_push - Push dirty cache out with no invalidate
-- * @paddr: starting physical address
-- * @len: number of bytes
-- *
-- * Push the any dirty lines starting at paddr for len bytes.
-- * Those lines are not invalidated.
-- */
--static inline void cf_cache_push(unsigned long paddr, int len)
--{
--	/* number of lines */
--	len = (len + (CACHE_LINE_SIZE-1)) / CACHE_LINE_SIZE;
--	if (len == 0)
--		return;
--
--	/* align on set boundary */
--	paddr &= 0xfffffff0;
--
--	asm volatile("nop\n"
--		     "move%.l   %2,%%d0\n"
--		     "or%.l	%3,%%d0\n"
--		     "movec	%%d0,%%cacr\n"
--		     "move%.l	%0,%%a0\n"
--		     "move%.l	%1,%%d0\n"
--		     "1:\n"
--		     "cpushl	%%bc,(%%a0)\n"
--		     "lea	0x10(%%a0),%%a0\n"
--		     "subq%.l	#1,%%d0\n"
--		     "bne.b	1b\n"
--		     "movec	%2,%%cacr\n"
--		     : : "a" (paddr), "r" (len),
--			 "r" (shadow_cacr),
--			 "i" (CF_CACR_SPA+CF_CACR_DPI+CF_CACR_IDPI)
--		     : "a0", "d0");
--}
-+#define flush_icache()						\
-+({								\
-+  unsigned long set;						\
-+  unsigned long start_set;					\
-+  unsigned long end_set;					\
-+								\
-+  start_set = 0;						\
-+  end_set = (unsigned long)LAST_DCACHE_ADDR;			\
-+    								\
-+  for (set = start_set; set <= end_set; set += (0x10 - 3)) {	\
-+    asm volatile("cpushl %%ic,(%0)\n"				\
-+                 "\taddq%.l #1,%0\n"				\
-+                 "\tcpushl %%ic,(%0)\n"				\
-+                 "\taddq%.l #1,%0\n"				\
-+                 "\tcpushl %%ic,(%0)\n"				\
-+                 "\taddq%.l #1,%0\n"				\
-+                 "\tcpushl %%ic,(%0)" : "=a" (set) : "a" (set));		\
-+  }								\
-+})
-+
-+#define flush_dcache()						\
-+({								\
-+  unsigned long set;						\
-+  unsigned long start_set;					\
-+  unsigned long end_set;					\
-+								\
-+  start_set = 0;						\
-+  end_set = (unsigned long)LAST_DCACHE_ADDR;			\
-+    								\
-+  for (set = start_set; set <= end_set; set += (0x10 - 3)) {	\
-+    asm volatile("cpushl %%dc,(%0)\n"				\
-+                 "\taddq%.l #1,%0\n"				\
-+                 "\tcpushl %%dc,(%0)\n"				\
-+                 "\taddq%.l #1,%0\n"				\
-+                 "\tcpushl %%dc,(%0)\n"				\
-+                 "\taddq%.l #1,%0\n"				\
-+                 "\tcpushl %%dc,(%0)" : "=a" (set) : "a" (set));		\
-+  }								\
-+})
-+
-+#define flush_bcache()						\
-+({								\
-+  unsigned long set;						\
-+  unsigned long start_set;					\
-+  unsigned long end_set;					\
-+								\
-+  start_set = 0;						\
-+  end_set = (unsigned long)LAST_DCACHE_ADDR;			\
-+    								\
-+  for (set = start_set; set <= end_set; set += (0x10 - 3)) {	\
-+    asm volatile("cpushl %%bc,(%0)\n"				\
-+                 "\taddq%.l #1,%0\n"				\
-+                 "\tcpushl %%bc,(%0)\n"				\
-+                 "\taddq%.l #1,%0\n"				\
-+                 "\tcpushl %%bc,(%0)\n"				\
-+                 "\taddq%.l #1,%0\n"				\
-+                 "\tcpushl %%bc,(%0)" : "=a" (set) : "a" (set));		\
-+  }								\
-+})
- 
--/**
-- * cf_cache_flush - Push dirty cache out and invalidate
-- * @paddr: starting physical address
-- * @len: number of bytes
-- *
-- * Push the any dirty lines starting at paddr for len bytes and
-- * invalidate those lines.
-+/*
-+ * invalidate the cache for the specified memory range.
-+ * It starts at the physical address specified for
-+ * the given number of bytes.
-  */
--static inline void cf_cache_flush(unsigned long paddr, int len)
--{
--	/* number of lines */
--	len = (len + (CACHE_LINE_SIZE-1)) / CACHE_LINE_SIZE;
--	if (len == 0)
--		return;
--
--	/* align on set boundary */
--	paddr &= 0xfffffff0;
--
--	asm volatile("nop\n"
--		     "move%.l   %2,%%d0\n"
--		     "or%.l	%3,%%d0\n"
--		     "movec	%%d0,%%cacr\n"
--		     "move%.l	%0,%%a0\n"
--		     "move%.l	%1,%%d0\n"
--		     "1:\n"
--		     "cpushl	%%bc,(%%a0)\n"
--		     "lea	0x10(%%a0),%%a0\n"
--		     "subq%.l	#1,%%d0\n"
--		     "bne.b	1b\n"
--		     "movec	%2,%%cacr\n"
--		     : : "a" (paddr), "r" (len),
--			 "r" (shadow_cacr),
--			 "i" (CF_CACR_SPA)
--		     : "a0", "d0");
--}
--
--/**
-- * cf_cache_flush_range - Push dirty data/inst cache in range out and invalidate
-- * @vstart - starting virtual address
-- * @vend: ending virtual address
-- *
-- * Push the any dirty data/instr lines starting at paddr for len bytes and
-- * invalidate those lines.
-+extern void cache_clear(unsigned long paddr, int len);
-+/*
-+ * push any dirty cache in the specified memory range.
-+ * It starts at the physical address specified for
-+ * the given number of bytes.
-  */
--static inline void cf_cache_flush_range(unsigned long vstart, unsigned long vend)
--{
--	int len;
--
--	/* align on set boundary */
--	vstart &= 0xfffffff0;
--	vend = PAGE_ALIGN((vend + (CACHE_LINE_SIZE-1))) & 0xfffffff0;
--	len = vend - vstart;
--	if (len == 0)
--		return;
--	vstart = __pa(vstart);
--	vend = vstart + len;
--
--	asm volatile("nop\n"
--		     "move%.l   %2,%%d0\n"
--		     "or%.l	%3,%%d0\n"
--		     "movec	%%d0,%%cacr\n"
--		     "move%.l	%0,%%a0\n"
--		     "move%.l	%1,%%a1\n"
--		     "1:\n"
--		     "cpushl	%%bc,(%%a0)\n"
--		     "lea	0x10(%%a0),%%a0\n"
--		     "cmpa%.l	%%a0,%%a1\n"
--		     "bne.b	1b\n"
--		     "movec	%2,%%cacr\n"
--		     : /* no return */
--		     : "a" (vstart), "a" (vend),
--		       "r" (shadow_cacr),
--		       "i" (CF_CACR_SPA)
--		     : "a0", "a1", "d0");
--}
-+extern void cache_push(unsigned long paddr, int len);
- 
--/**
-- * cf_dcache_flush_range - Push dirty data cache in range out and invalidate
-- * @vstart - starting virtual address
-- * @vend: ending virtual address
-- *
-- * Push the any dirty data lines starting at paddr for len bytes and
-- * invalidate those lines.
-+/*
-+ * push and invalidate pages in the specified user virtual
-+ * memory range.
-  */
--static inline void cf_dcache_flush_range(unsigned long vstart, unsigned long vend)
--{
--	/* align on set boundary */
--	vstart &= 0xfffffff0;
--	vend = (vend + (CACHE_LINE_SIZE-1)) & 0xfffffff0;
--
--	asm volatile("nop\n"
--		     "move%.l   %2,%%d0\n"
--		     "or%.l	%3,%%d0\n"
--		     "movec	%%d0,%%cacr\n"
--		     "move%.l	%0,%%a0\n"
--		     "move%.l	%1,%%a1\n"
--		     "1:\n"
--		     "cpushl	%%dc,(%%a0)\n"
--		     "lea	0x10(%%a0),%%a0\n"
--		     "cmpa%.l	%%a0,%%a1\n"
--		     "bne.b	1b\n"
--		     "movec	%2,%%cacr\n"
--		     : /* no return */
--		     : "a" (__pa(vstart)), "a" (__pa(vend)),
--		       "r" (shadow_cacr),
--		       "i" (CF_CACR_SPA)
--		     : "a0", "a1", "d0");
--}
-+extern void cache_push_v(unsigned long vaddr, int len);
- 
--/**
-- * cf_icache_flush_range - Push dirty inst cache in range out and invalidate
-- * @vstart - starting virtual address
-- * @vend: ending virtual address
-- *
-- * Push the any dirty instr lines starting at paddr for len bytes and
-- * invalidate those lines.  This should just be an invalidate since you
-- * shouldn't be able to have dirty instruction cache.
-- */
--static inline void cf_icache_flush_range(unsigned long vstart, unsigned long vend)
--{
--	/* align on set boundary */
--	vstart &= 0xfffffff0;
--	vend = (vend + (CACHE_LINE_SIZE-1)) & 0xfffffff0;
--
--	asm volatile("nop\n"
--		     "move%.l   %2,%%d0\n"
--		     "or%.l	%3,%%d0\n"
--		     "movec	%%d0,%%cacr\n"
--		     "move%.l	%0,%%a0\n"
--		     "move%.l	%1,%%a1\n"
--		     "1:\n"
--		     "cpushl	%%ic,(%%a0)\n"
--		     "lea	0x10(%%a0),%%a0\n"
--		     "cmpa%.l	%%a0,%%a1\n"
--		     "bne.b	1b\n"
--		     "movec	%2,%%cacr\n"
--		     : /* no return */
--		     : "a" (__pa(vstart)), "a" (__pa(vend)),
--		       "r" (shadow_cacr),
--		       "i" (CF_CACR_SPA)
--		     : "a0", "a1", "d0");
--}
-+/* This is needed whenever the virtual mapping of the current
-+   process changes.  */
- 
- /**
-  * flush_cache_mm - Flush an mm_struct
-@@ -343,6 +100,8 @@ static inline void flush_cache_mm(struct
- 
- #define flush_cache_dup_mm(mm)	flush_cache_mm(mm)
- 
-+#define flush_cache_all()		flush_bcache()
-+
- /**
-  * flush_cache_range - Flush a cache range
-  * @vma: vma struct
-@@ -356,7 +115,8 @@ static inline void flush_cache_range(str
- 	unsigned long start, unsigned long end)
- {
- 	if (vma->vm_mm == current->mm)
--		cf_cache_flush_range(start, end);
-+		flush_bcache();
-+//		cf_cache_flush_range(start, end);
- }
- 
- /**
-@@ -372,76 +132,113 @@ static inline void flush_cache_page(stru
- 	unsigned long vmaddr, unsigned long pfn)
- {
- 	if (vma->vm_mm == current->mm)
--		cf_cache_flush_range(vmaddr, vmaddr+PAGE_SIZE);
-+		flush_bcache();
-+//		cf_cache_flush_range(vmaddr, vmaddr+PAGE_SIZE);
- }
- 
--/**
-- * __flush_page_to_ram - Push a page out of the cache
-- * @vaddr: Virtual address at start of page
-- *
-- * Push the page at kernel virtual address *vaddr* and clear
-- * the icache.
-- */
--static inline void __flush_page_to_ram(void *vaddr)
--{
--	asm volatile("nop\n"
--		     "move%.l   %2,%%d0\n"
--		     "or%.l	%3,%%d0\n"
--		     "movec	%%d0,%%cacr\n"
--		     "move%.l	%0,%%d0\n"
--		     "and%.l	#0xfffffff0,%%d0\n"
--		     "move%.l	%%d0,%%a0\n"
--		     "move%.l	%1,%%d0\n"
--		     "1:\n"
--		     "cpushl	%%bc,(%%a0)\n"
--		     "lea	0x10(%%a0),%%a0\n"
--		     "subq%.l	#1,%%d0\n"
--		     "bne.b	1b\n"
--		     "movec	%2,%%cacr\n"
--		     : : "a" (__pa(vaddr)), "i" (PAGE_SIZE / CACHE_LINE_SIZE),
--			 "r" (shadow_cacr), "i" (CF_CACR_SPA)
--		     : "a0", "d0");
-+/* Push the page at kernel virtual address and clear the icache */
-+/* RZ: use cpush %bc instead of cpush %dc, cinv %ic */
-+#define flush_page_to_ram(page) __flush_page_to_ram((void *) page_address(page))
-+extern inline void __flush_page_to_ram(void *address)
-+{
-+  unsigned long set;
-+  unsigned long start_set;
-+  unsigned long end_set;
-+  unsigned long addr = (unsigned long) address;
-+
-+  addr &= ~(PAGE_SIZE - 1); /* round down to page start address */
-+
-+  start_set = addr & _ICACHE_SET_MASK;
-+  end_set = (addr + PAGE_SIZE-1) & _ICACHE_SET_MASK;
-+
-+  if (start_set > end_set) {
-+    /* from the begining to the lowest address */
-+    for (set = 0; set <= end_set; set += (0x10 - 3)) {
-+      asm volatile("cpushl %%bc,(%0)\n"
-+                   "\taddq%.l #1,%0\n"
-+                   "\tcpushl %%bc,(%0)\n"
-+                   "\taddq%.l #1,%0\n"
-+                   "\tcpushl %%bc,(%0)\n"
-+                   "\taddq%.l #1,%0\n"
-+                   "\tcpushl %%bc,(%0)" : "=a" (set) : "a" (set));
-+    }
-+    /* next loop will finish the cache ie pass the hole */
-+    end_set = LAST_ICACHE_ADDR;    
-+  }
-+  for (set = start_set; set <= end_set; set += (0x10 - 3)) {
-+    asm volatile("cpushl %%bc,(%0)\n"
-+                 "\taddq%.l #1,%0\n"
-+                 "\tcpushl %%bc,(%0)\n"
-+                 "\taddq%.l #1,%0\n"
-+                 "\tcpushl %%bc,(%0)\n"
-+                 "\taddq%.l #1,%0\n"
-+                 "\tcpushl %%bc,(%0)" : "=a" (set) : "a" (set));
-+  }
-+}
-+
-+/* Use __flush_page_to_ram() for flush_dcache_page all values are same - MW */
-+#define flush_dcache_page(page)			\
-+	__flush_page_to_ram((void *) page_address(page))
-+#define flush_icache_page(vma,pg)		\
-+	__flush_page_to_ram((void *) page_address(pg))
-+#define flush_icache_user_range(adr,len)	do { } while (0)
-+/* NL */
-+#define flush_icache_user_page(vma,page,addr,len)	do { } while (0)
-+
-+/* Push n pages at kernel virtual address and clear the icache */
-+/* RZ: use cpush %bc instead of cpush %dc, cinv %ic */
-+extern inline void flush_icache_range (unsigned long address,
-+				       unsigned long endaddr)
-+{
-+  unsigned long set;
-+  unsigned long start_set;
-+  unsigned long end_set;
-+
-+  start_set = address & _ICACHE_SET_MASK;
-+  end_set = endaddr & _ICACHE_SET_MASK;
-+
-+  if (start_set > end_set) {
-+    /* from the begining to the lowest address */
-+    for (set = 0; set <= end_set; set += (0x10 - 3)) {
-+      asm volatile("cpushl %%ic,(%0)\n"
-+                   "\taddq%.l #1,%0\n"
-+                   "\tcpushl %%ic,(%0)\n"
-+                   "\taddq%.l #1,%0\n"
-+                   "\tcpushl %%ic,(%0)\n"
-+                   "\taddq%.l #1,%0\n"
-+                   "\tcpushl %%ic,(%0)" : "=a" (set) : "a" (set));
-+    }
-+    /* next loop will finish the cache ie pass the hole */
-+    end_set = LAST_ICACHE_ADDR;    
-+  }
-+  for (set = start_set; set <= end_set; set += (0x10 - 3)) {
-+    asm volatile("cpushl %%ic,(%0)\n"
-+                 "\taddq%.l #1,%0\n"
-+                 "\tcpushl %%ic,(%0)\n"
-+                 "\taddq%.l #1,%0\n"
-+                 "\tcpushl %%ic,(%0)\n"
-+                 "\taddq%.l #1,%0\n"
-+                 "\tcpushl %%ic,(%0)" : "=a" (set) : "a" (set));
-+  }
- }
- 
--/*
-- * Various defines for the kernel.
-- */
--
--extern void cache_clear(unsigned long paddr, int len);
--extern void cache_push(unsigned long paddr, int len);
--extern void flush_icache_range(unsigned long address, unsigned long endaddr);
--
--#define flush_cache_all()			flush_bcache()
--#define flush_cache_vmap(start, end)		flush_bcache()
--#define flush_cache_vunmap(start, end)		flush_bcache()
--
--#define flush_dcache_range(vstart, vend)	cf_dcache_flush_range(vstart, vend)
--#define flush_dcache_page(page)			__flush_page_to_ram(page_address(page))
--#define flush_dcache_mmap_lock(mapping)		do { } while (0)
--#define flush_dcache_mmap_unlock(mapping)	do { } while (0)
--
--#define flush_icache_page(vma, page)		__flush_page_to_ram(page_address(page))
--
--/**
-- * copy_to_user_page - Copy memory to user page
-- */
- static inline void copy_to_user_page(struct vm_area_struct *vma,
- 				     struct page *page, unsigned long vaddr,
- 				     void *dst, void *src, int len)
- {
- 	memcpy(dst, src, len);
--	cf_cache_flush(page_to_phys(page), PAGE_SIZE);
-+	flush_icache_user_page(vma, page, vaddr, len);
- }
--
--/**
-- * copy_from_user_page - Copy memory from user page
-- */
- static inline void copy_from_user_page(struct vm_area_struct *vma,
- 				       struct page *page, unsigned long vaddr,
- 				       void *dst, void *src, int len)
- {
--	cf_cache_flush(page_to_phys(page), PAGE_SIZE);
- 	memcpy(dst, src, len);
- }
- 
-+#define flush_cache_vmap(start, end)		flush_cache_all()
-+#define flush_cache_vunmap(start, end)		flush_cache_all()
-+#define flush_dcache_mmap_lock(mapping)		do { } while (0)
-+#define flush_dcache_mmap_unlock(mapping)	do { } while (0)
-+
- #endif /* M68K_CF_CACHEFLUSH_H */
---- a/include/asm-m68k/cf_pgalloc.h
-+++ b/include/asm-m68k/cf_pgalloc.h
-@@ -1,13 +1,9 @@
- #ifndef M68K_CF_PGALLOC_H
- #define M68K_CF_PGALLOC_H
- 
--/* JKM -- added -- needed? */
--#include <linux/highmem.h>
--
- #include <asm/coldfire.h>
- #include <asm/page.h>
- #include <asm/cf_tlbflush.h>
--/* JKM -- added -- needed? */
- #include <asm/cf_cacheflush.h>
- 
- extern inline void pte_free_kernel(pte_t *pte)
-@@ -41,6 +37,7 @@ extern inline pmd_t *pmd_alloc_kernel(pg
- 
- #define pmd_populate(mm, pmd, page) (pmd_val(*pmd) = \
- 	(unsigned long)(page_address(page)))
-+
- #define pmd_populate_kernel(mm, pmd, pte) (pmd_val(*pmd) = (unsigned long)(pte))
- 
- static inline void __pte_free_tlb(struct mmu_gather *tlb, struct page *page)
---- a/include/asm-m68k/cf_pgtable.h
-+++ b/include/asm-m68k/cf_pgtable.h
-@@ -341,7 +341,7 @@ static inline pte_t pgoff_to_pte(unsigne
- #define __pte_to_swp_entry(pte)	((swp_entry_t) { pte_val(pte) })
- #define __swp_entry_to_pte(x)	(__pte((x).val))
- 
--#define pmd_page(pmd)		virt_to_page(__pmd_page(pmd))
-+#define pmd_page(pmd)		(pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT))
- 
- #define pte_offset_map(pmdp, address) ((pte_t *)__pmd_page(*pmdp) +	\
- 				       __pte_offset(address))
---- a/include/asm-m68k/cfcache.h
-+++ b/include/asm-m68k/cfcache.h
-@@ -87,6 +87,12 @@
- #define CACHE_SETS 0x0200		/* 512 sets */
- #define CACHE_WAYS 0x0004		/* 4 way */
- 
-+/* in for the old cpushl caching code */
-+#define _DCACHE_SET_MASK ((DCACHE_SIZE/64-1)<<CACHE_WAYS)
-+#define _ICACHE_SET_MASK ((ICACHE_SIZE/64-1)<<CACHE_WAYS)
-+#define LAST_DCACHE_ADDR _DCACHE_SET_MASK
-+#define LAST_ICACHE_ADDR _ICACHE_SET_MASK
-+
- #define CACHE_DISABLE_MODE	(CF_CACR_DCINVA+	\
- 				 CF_CACR_BCINVA+	\
- 				 CF_CACR_ICINVA)
---- a/include/asm-m68k/page.h
-+++ b/include/asm-m68k/page.h
-@@ -123,13 +123,21 @@ extern unsigned long m68k_memoffset;
- #if defined(CONFIG_COLDFIRE)
- static inline unsigned long ___pa(void *vaddr)
- {
-+#if CONFIG_SDRAM_BASE != PAGE_OFFSET
- 	return (((unsigned long)vaddr & 0x0fffffff) + CONFIG_SDRAM_BASE);
-+#else
-+	return (unsigned long)vaddr;
-+#endif
- }
- #define __pa(vaddr)	___pa((void *)(vaddr))
- 
- static inline void *__va(unsigned long paddr)
- {
-+#if CONFIG_SDRAM_BASE != PAGE_OFFSET
- 	return (void *)((paddr & 0x0fffffff) + PAGE_OFFSET);
-+#else
-+	return (void *)paddr;
-+#endif
- }
- 
- #else
---- a/include/asm-m68k/page_offset.h
-+++ b/include/asm-m68k/page_offset.h
-@@ -1,16 +1,15 @@
-+/*
-+ * Page and physical memory maps.
-+ */
-+#if defined(CONFIG_SUN3)
-+#define PAGE_OFFSET_RAW		0x0E000000
-+
-+#elif defined(CONFIG_M54455) || defined(CONFIG_M547X_8X)
-+#define	PHYS_OFFSET		CONFIG_SDRAM_BASE
-+#define PAGE_OFFSET_RAW		(PHYS_OFFSET)
-+/* #define PAGE_OFFSET_RAW		0xC0000000 */
- 
--/* This handles the memory map.. */
--#if !defined(CONFIG_SUN3) && !defined(CONFIG_COLDFIRE)
-+#else
-+/* default */
- #define PAGE_OFFSET_RAW		0x00000000
--#elif defined(CONFIG_SUN3)
--#define PAGE_OFFSET_RAW		0x0E000000
--#else /* CONFIG_COLDFIRE */
--#if defined(CONFIG_M54455)
--#define PAGE_OFFSET_RAW		0xC0000000
--#define	PHYS_OFFSET		0x40000000
--#elif defined(CONFIG_M547X_8X)
--#define PAGE_OFFSET_RAW		0xC0000000
--#define	PHYS_OFFSET		0x00000000
- #endif
--#endif
--
diff --git a/target/linux/coldfire/patches/047-m547x_8x_fec_cleanup.patch b/target/linux/coldfire/patches/047-m547x_8x_fec_cleanup.patch
deleted file mode 100644
index 9c36804e3..000000000
--- a/target/linux/coldfire/patches/047-m547x_8x_fec_cleanup.patch
+++ /dev/null
@@ -1,1223 +0,0 @@
-From 5bac5f471fb1124c51a5811757c54174f6224e7e Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Wed, 12 Mar 2008 17:13:29 -0600
-Subject: [PATCH] Clean up FEC DMA driver.
-
-LTIBName: m547x-8x-fec-cleanup
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- drivers/net/fec/fec.c |  611 +++++++++++++++++++++---------------------------
- 1 files changed, 267 insertions(+), 344 deletions(-)
-
---- a/drivers/net/fec/fec.c
-+++ b/drivers/net/fec/fec.c
-@@ -4,7 +4,6 @@
-  *
-  * Code crunched to get it to work on 2.6.24 -- FEC cleanup coming
-  * soon -- Kurt Mahan
-- *
-  */
- #include <linux/module.h>
- #include <linux/kernel.h>
-@@ -44,42 +43,40 @@
- #undef	FEC_2
- #endif
- 
--#define VERSION "0.13"
-+#define VERSION "0.20"
- MODULE_DESCRIPTION( "DMA Fast Ethernet Controller driver ver " VERSION);
- 
--// Private structure
-+/* fec private */
- struct fec_priv {
- 	struct net_device *netdev;		/* owning net device */
--	void* fecpriv_txbuf[FEC_TX_BUF_NUMBER];	//Array of transmission buffers
--	MCD_bufDescFec *fecpriv_txdesc;	// Array of transmission descriptors
--	volatile unsigned int fecpriv_current_tx;	// Inex of the transmission descriptor that is used by DMA
--	volatile unsigned int fecpriv_next_tx;	// Inex of the transmission descriptor that can be used for new data
--	unsigned int fecpriv_current_rx;	// Index of the reception descriptor that is used by DMA
--	MCD_bufDescFec *fecpriv_rxdesc;		// Array of reception descriptors
--//	unsigned char *fecpriv_rxbuf;		// Address of reception buffers
--	struct sk_buff *askb_rx[FEC_RX_BUF_NUMBER]; // Array of reception skb structure pointers
--	unsigned int fecpriv_initiator_rx;	// Reception DMA initiator
--	unsigned int fecpriv_initiator_tx;	// Transmission DMA initiator
--	int fecpriv_fec_rx_channel;	// DMA reception channel
--	int fecpriv_fec_tx_channel;	// DMA transmission channel
--	int fecpriv_rx_requestor;	// DMA reception requestor
--	int fecpriv_tx_requestor;	// DMA transmission requestor
--	void *fecpriv_interrupt_fec_rx_handler;	// DMA reception handler
--	void *fecpriv_interrupt_fec_tx_handler;	// DMA transmission handler
--	unsigned char *fecpriv_mac_addr;	// Private copy of FEC address
--	struct net_device_stats fecpriv_stat;	// Pointer to the statistical information
-+	void* fecpriv_txbuf[FEC_TX_BUF_NUMBER];	/* tx buffer ptrs */
-+	MCD_bufDescFec *fecpriv_txdesc;		/* tx descriptor ptrs */
-+	volatile unsigned int fecpriv_current_tx; /* current tx desc index */
-+	volatile unsigned int fecpriv_next_tx;	/* next tx desc index */
-+	unsigned int fecpriv_current_rx;	/* current rx desc index */
-+	MCD_bufDescFec *fecpriv_rxdesc;		/* rx descriptor ptrs */
-+	struct sk_buff *askb_rx[FEC_RX_BUF_NUMBER]; /* rx SKB ptrs */
-+	unsigned int fecpriv_initiator_rx;	/* rx dma initiator */
-+	unsigned int fecpriv_initiator_tx;	/* tx dma initiator */
-+	int fecpriv_fec_rx_channel;		/* rx dma channel */
-+	int fecpriv_fec_tx_channel;		/* tx dma channel */
-+	int fecpriv_rx_requestor;		/* rx dma requestor */
-+	int fecpriv_tx_requestor;		/* tx dma requestor */
-+	void *fecpriv_interrupt_fec_rx_handler;	/* dma rx handler */
-+	void *fecpriv_interrupt_fec_tx_handler;	/* dma tx handler */
-+	unsigned char *fecpriv_mac_addr;	/* private fec mac addr */
-+	struct net_device_stats fecpriv_stat;	/* stats ptr */
- 	spinlock_t fecpriv_lock;
- 	int fecpriv_rxflag;
- 	struct tasklet_struct fecpriv_tasklet_reinit;
--	int index;
-+	int index;				/* fec hw number */
- };
- 
- struct net_device *fec_dev[FEC_MAX_PORTS];
- 
--// FEC functions
-+/* FEC functions */
- int __init fec_init(void);
- struct net_device_stats *fec_get_stat(struct net_device *dev);
--
- int fec_open(struct net_device *dev);
- int fec_close(struct net_device *nd);
- int fec_tx(struct sk_buff *skb, struct net_device *dev);
-@@ -93,10 +90,12 @@ void fec_interrupt_fec_tx_handler_fec0(v
- void fec_interrupt_fec_rx_handler_fec0(void);
- void fec_interrupt_fec_reinit(unsigned long data);
- 
--unsigned char fec_mac_addr_fec0[6] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x50 };	// Default address of FEC0
-+/* default fec0 address */
-+unsigned char fec_mac_addr_fec0[6] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x50 };
- 
- #ifdef   FEC_2
--unsigned char fec_mac_addr_fec1[6] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x51 };	// Default address of FEC1
-+/* default fec1 address */
-+unsigned char fec_mac_addr_fec1[6] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x51 };
- #endif
- 
- extern unsigned char uboot_enet0[];
-@@ -111,17 +110,18 @@ int __init fec_mac_setup0 (char *s);
- #ifdef   FEC_2
- void fec_interrupt_fec_tx_handler_fec1(void);
- void fec_interrupt_fec_rx_handler_fec1(void);
-+#endif
- 
- #ifndef MODULE
- int __init fec_mac_setup1 (char *s);
- #endif
- 
--#endif
- int fec_read_mii(unsigned int base_addr, unsigned int pa, unsigned int ra, unsigned int *data);
- int fec_write_mii(unsigned int base_addr, unsigned int pa, unsigned int ra, unsigned int data);
- 
- module_init(fec_init);
- /* module_exit(fec_cleanup); */
-+
- __setup("mac0=", fec_mac_setup0);
- 
- #ifdef   FEC_2
-@@ -140,7 +140,6 @@ int fec_enet_init(struct net_device *dev
- 	fp->index = index;
- 	fp->netdev = dev;
- 	fec_dev[ index ] = dev;
--printk(KERN_INFO "FEI: index=%d\n", index);
- 
- 	if (index == 0) {
- 		/* disable fec0 */
-@@ -175,8 +174,6 @@ printk(KERN_INFO "FEI: index=%d\n", inde
- 		/* rx descriptors */
- 		fp->fecpriv_rxdesc = (void*)FEC_RX_DESC_FEC0;
- 
--printk(KERN_INFO "FEI: txdesc=0x%p  rxdesc=0x%p\n", fp->fecpriv_txdesc, fp->fecpriv_rxdesc);
--
- 		/* mac addr */
- 		if (uboot_enet0[0] || uboot_enet0[1] || uboot_enet0[2] ||
- 		    uboot_enet0[3] || uboot_enet0[4] || uboot_enet0[5]) {
-@@ -229,8 +226,6 @@ printk(KERN_INFO "FEI: txdesc=0x%p  rxde
- #endif
- 	}
- 
--printk(KERN_INFO "FEI: index=%d base_addr=0x%lx\n", index, dev->base_addr);
--
- 	/* clear MIB */
- 	memset((void *) (dev->base_addr + 0x200), 0, FEC_MIB_LEN);
- 
-@@ -288,8 +283,7 @@ int __init fec_init(void)
- 	int err;
- 	DECLARE_MAC_BUF(mac);
- 
--	printk(KERN_INFO "FEC ENET (DMA) Version .00\n");
--
-+	printk(KERN_INFO "FEC ENET (DMA) Version %s\n", VERSION);
- 
- 	for (i = 0; i < FEC_MAX_PORTS; i++) {
- 		dev = alloc_etherdev(sizeof(struct fec_priv));
-@@ -333,7 +327,6 @@ void fec_stop(struct net_device *dev)
- *
- * RETURNS: If no error occurs, this function returns zero.
- *************************************************************************/
--
- int fec_open(struct net_device *dev)
- {
- 	struct fec_priv *fp = netdev_priv(dev);
-@@ -343,13 +336,10 @@ int fec_open(struct net_device *dev)
- 	int channel;
- 	int error_code = -EBUSY;
- 
--printk(KERN_INFO "FECOPEN: index=%d\n", fp->index);
--
--	//Receive the DMA channels
-+	/* Receive the DMA channels */
- 	channel = dma_set_channel_fec(fp->fecpriv_rx_requestor);
- 
--	if (channel == -1)
--	{
-+	if (channel == -1) {
- 		printk("Dma channel cannot be reserved\n");
- 		goto ERRORS;
- 	}
-@@ -360,60 +350,54 @@ printk(KERN_INFO "FECOPEN: index=%d\n", 
- 
- 	channel = dma_set_channel_fec(fp->fecpriv_tx_requestor);
- 
--	if (channel == -1)
--	{
-+	if (channel == -1) {
- 		printk("Dma channel cannot be reserved\n");
- 		goto ERRORS;
- 	}
--printk(KERN_INFO "FECOPEN2\n");
- 
- 	fp->fecpriv_fec_tx_channel = channel;
- 
- 	dma_connect(channel, (int) fp->fecpriv_interrupt_fec_tx_handler);
- 
--	// init tasklet for controller reinitialization
-+	/* init tasklet for controller reinitialization */
- 	tasklet_init(&fp->fecpriv_tasklet_reinit, fec_interrupt_fec_reinit, (unsigned long) dev);
--printk(KERN_INFO "FECOPEN3\n");
- 
--	// Reset FIFOs
-+	/* Reset FIFOs */
- 	FEC_FECFRST(base_addr) |= FEC_SW_RST | FEC_RST_CTL;
- 	FEC_FECFRST(base_addr) &= ~FEC_SW_RST;
- 
--	// Reset and disable FEC
-+	/* Reset and disable FEC */
- 	FEC_ECR(base_addr) = FEC_ECR_RESET;
- 
--	// Wait
- 	udelay(10);
- 
--	// Clear all events
-+	/* Clear all events */
- 	FEC_EIR(base_addr) = FEC_EIR_CLEAR;
- 
--	// Reset FIFO status
-+	/* Reset FIFO status */
- 	FEC_FECTFSR(base_addr) = FEC_FECTFSR_MSK;
- 	FEC_FECRFSR(base_addr) = FEC_FECRFSR_MSK;
- 
--#if 0
--/* JKM -- move into HW init */
--	// Copy the default address to the device structure
--	memcpy(dev->dev_addr, fp->fecpriv_mac_addr, ETH_ALEN);
--#endif
-+	/* Set the default address */
-+	FEC_PALR(base_addr) = (fp->fecpriv_mac_addr[0] << 24) |
-+			      (fp->fecpriv_mac_addr[1] << 16) |
-+			      (fp->fecpriv_mac_addr[2] << 8) |
-+			      fp->fecpriv_mac_addr[3];
-+	FEC_PAUR(base_addr) = (fp->fecpriv_mac_addr[4] << 24) |
-+			      (fp->fecpriv_mac_addr[5] << 16) | 0x8808;
- 
--	// Set the default address
--	FEC_PALR(base_addr) = (fp->fecpriv_mac_addr[0] << 24) | (fp->fecpriv_mac_addr[1] << 16) | (fp->fecpriv_mac_addr[2] << 8) | fp->fecpriv_mac_addr[3];
--	FEC_PAUR(base_addr) = (fp->fecpriv_mac_addr[4] << 24) | (fp->fecpriv_mac_addr[5] << 16) | 0x8808;
--
--	// Reset the group address descriptor
-+	/* Reset the group address descriptor */
- 	FEC_GALR(base_addr) = 0x00000000;
- 	FEC_GAUR(base_addr) = 0x00000000;
- 
--	// Reset the individual address descriptor
-+	/* Reset the individual address descriptor */
- 	FEC_IALR(base_addr) = 0x00000000;
- 	FEC_IAUR(base_addr) = 0x00000000;
- 
--	// Set the receive control register
-+	/* Set the receive control register */
- 	FEC_RCR(base_addr) = FEC_RCR_MAX_FRM_SIZE | FEC_RCR_MII;
- 
--	// Set the receive FIFO control register
-+	/* Set the receive FIFO control register */
- //	FEC_FECRFCR(base_addr) = FEC_FECRFCR_FRM | FEC_FECRFCR_GR | FEC_FECRFCR_MSK;
- 	FEC_FECRFCR(base_addr) = FEC_FECRFCR_FRM | FEC_FECRFCR_GR
-                              | (FEC_FECRFCR_MSK     // disable all but ...
-@@ -422,10 +406,10 @@ printk(KERN_INFO "FECOPEN3\n");
- //                                & ~FEC_FECRFCR_UF   // enable FIFO underflow
-                              );
- 
--	//Set the receive FIFO alarm register
-+	/* Set the receive FIFO alarm register */
- 	FEC_FECRFAR(base_addr) = FEC_FECRFAR_ALARM;
- 
--	// Set the transmit FIFO control register
-+	/* Set the transmit FIFO control register */
- //	FEC_FECTFCR(base_addr) = FEC_FECTFCR_FRM | FEC_FECTFCR_GR | FEC_FECTFCR_MSK;
- 	FEC_FECTFCR(base_addr) = FEC_FECTFCR_FRM | FEC_FECTFCR_GR
-                              | (FEC_FECTFCR_MSK     // disable all but ...
-@@ -434,16 +418,16 @@ printk(KERN_INFO "FECOPEN3\n");
- //                                & ~FEC_FECTFCR_UF   // enable FIFO underflow
-                                 & ~FEC_FECTFCR_OF); // enable FIFO overflow
- 
--	//Set the transmit FIFO alarm register
-+	/* Set the transmit FIFO alarm register */
- 	FEC_FECTFAR(base_addr) = FEC_FECTFAR_ALARM;
- 
--	// Set the Tx FIFO watermark
-+	/* Set the Tx FIFO watermark */
- 	FEC_FECTFWR(base_addr) = FEC_FECTFWR_XWMRK;
- 
--	// Enable the transmitter to append the CRC
-+	/* Enable the transmitter to append the CRC */
- 	FEC_CTCWR(base_addr) = FEC_CTCWR_TFCW_CRC;
- 
--	// Enable the ethernet interrupts
-+	/* Enable the ethernet interrupts */
- //	FEC_EIMR(base_addr) = FEC_EIMR_MASK;
- 	FEC_EIMR(base_addr) = FEC_EIMR_DISABLE
-                             | FEC_EIR_LC
-@@ -453,9 +437,16 @@ printk(KERN_INFO "FECOPEN3\n");
-                             | FEC_EIR_XFERR
-                             | FEC_EIR_RFERR
-                             ;
--printk(KERN_INFO "FECOPEN4\n");
- 
--#ifdef   CONFIG_FEC_548x_AUTO_NEGOTIATION
-+/*
-+ * JKM --
-+ *
-+ * There's a problem with the PHY initialization code -- 
-+ * for now assume uboot left it in an initialized state.
-+ */
-+// printk(KERN_INFO "FECOPEN: starting auto-negotiation\n");
-+// #ifdef   CONFIG_FEC_548x_AUTO_NEGOTIATION
-+#if 0
- 	if ((error_code = init_transceiver(base_addr, &fduplex)) != 0)
- 	{
- 		printk("Initialization of the transceiver is failed\n");
-@@ -464,25 +455,24 @@ printk(KERN_INFO "FECOPEN4\n");
- #else
- 	fduplex = 1;
- #endif
--printk(KERN_INFO "FECOPEN5\n");
-+// printk(KERN_INFO "FECOPEN: done with auto-negotiation\n");
- 
- 	if (fduplex)
--		// Enable the full duplex mode
-+		/* Enable the full duplex mode */
- 		FEC_TCR(base_addr) = FEC_TCR_FDEN | FEC_TCR_HBC;
- 	else
--		// Disable reception of frames while transmitting
-+		/* Disable reception of frames while transmitting */
- 		FEC_RCR(base_addr) |= FEC_RCR_DRT;
- 
--	// Enable MIB
-+	/* Enable MIB */
- 	FEC_MIBC(base_addr) = FEC_MIBC_ENABLE;
- 
--	// Enable FEC
-+	/* Enable FEC */
- 	FEC_ECR(base_addr) |= FEC_ECR_ETHEREN;
- 
--	// Initialize transmission descriptors and start DMA for the transmission
-+	/* Initialize tx descriptors and start DMA for the transmission */
- 	for (i = 0; i < FEC_TX_BUF_NUMBER; i++)
- 		fp->fecpriv_txdesc[i].statCtrl = MCD_FEC_INTERRUPT;
--printk(KERN_INFO "FECOPEN6\n");
- 
- 	fp->fecpriv_txdesc[i - 1].statCtrl |= MCD_FEC_WRAP;
- 
-@@ -494,31 +484,27 @@ printk(KERN_INFO "FECOPEN6\n");
- 		     FEC_TX_DMA_PRI, MCD_FECTX_DMA | MCD_INTERRUPT,
- 		     MCD_NO_CSUM | MCD_NO_BYTE_SWAP);
- 
--	// Initialize reception descriptors and start DMA for the reception
--	for (i = 0; i < FEC_RX_BUF_NUMBER; i++)
--	{
-+	/* Initialize rx descriptors and start DMA for the reception */
-+	for (i = 0; i < FEC_RX_BUF_NUMBER; i++) {
- 		fp->askb_rx[i] = alloc_skb(FEC_MAXBUF_SIZE + 16, GFP_DMA);
--		if (!fp->askb_rx[i])
--		{
--    		fp->fecpriv_rxdesc[i].dataPointer = 0;
--    		fp->fecpriv_rxdesc[i].statCtrl = 0;
--	    	fp->fecpriv_rxdesc[i].length = 0;
-+		if (!fp->askb_rx[i]) {
-+			fp->fecpriv_rxdesc[i].dataPointer = 0;
-+			fp->fecpriv_rxdesc[i].statCtrl = 0;
-+			fp->fecpriv_rxdesc[i].length = 0;
- 		}
--		else
--		{
--		    skb_reserve(fp->askb_rx[i], 16);
-+		else {
-+			skb_reserve(fp->askb_rx[i], 16);
- 			fp->askb_rx[i]->dev = dev;
--    		fp->fecpriv_rxdesc[i].dataPointer = (unsigned int) virt_to_phys(fp->askb_rx[i]->tail);
--    		fp->fecpriv_rxdesc[i].statCtrl = MCD_FEC_BUF_READY | MCD_FEC_INTERRUPT;
--	    	fp->fecpriv_rxdesc[i].length = FEC_MAXBUF_SIZE;
--	    }
-+    			fp->fecpriv_rxdesc[i].dataPointer = (unsigned int) virt_to_phys(fp->askb_rx[i]->tail);
-+    			fp->fecpriv_rxdesc[i].statCtrl = MCD_FEC_BUF_READY | MCD_FEC_INTERRUPT;
-+	    		fp->fecpriv_rxdesc[i].length = FEC_MAXBUF_SIZE;
-+		}
- 	}
--printk(KERN_INFO "FECOPEN7\n");
- 
- 	fp->fecpriv_rxdesc[i - 1].statCtrl |= MCD_FEC_WRAP;
- 	fp->fecpriv_current_rx = 0;
- 
--	// flush entire data cache before restarting the DMA
-+	/* flush entire data cache before restarting the DMA */
- #if 0
- /* JKM -- currently running with cache turned off */
- 	DcacheFlushInvalidate();
-@@ -531,31 +517,24 @@ printk(KERN_INFO "FECOPEN7\n");
- 		     MCD_NO_CSUM | MCD_NO_BYTE_SWAP);
- 
- 	netif_start_queue(dev);
--
--//	MOD_INC_USE_COUNT;
--printk(KERN_INFO "FECOPEN: finished\n");
--
- 	return 0;
- 
- ERRORS:
- 
--	// Remove the channels and return with the error code
--	if (fp->fecpriv_fec_rx_channel != -1)
--	{
-+	/* Remove the channels and return with the error code */
-+	if (fp->fecpriv_fec_rx_channel != -1) {
- 		dma_disconnect(fp->fecpriv_fec_rx_channel);
- 		dma_remove_channel_by_number(fp->fecpriv_fec_rx_channel);
- 		fp->fecpriv_fec_rx_channel = -1;
- 	}
- 
--	if (fp->fecpriv_fec_tx_channel != -1)
--	{
-+	if (fp->fecpriv_fec_tx_channel != -1) {
- 		dma_disconnect(fp->fecpriv_fec_tx_channel);
- 		dma_remove_channel_by_number(fp->fecpriv_fec_tx_channel);
- 		fp->fecpriv_fec_tx_channel = -1;
- 	}
- 
- 	return error_code;
--
- }
- 
- /************************************************************************
-@@ -568,31 +547,26 @@ ERRORS:
- *************************************************************************/
- int fec_close(struct net_device *dev)
- {
--	//Receive the pointer to the private structure
- 	struct fec_priv *fp = netdev_priv(dev);
--
--	// Receive the base address
- 	unsigned long base_addr = (unsigned long) dev->base_addr;
--
- 	unsigned long time;
--
- 	int i;
- 
- 	netif_stop_queue(dev);
- 
--	// Perform the graceful stop
-+	/* Perform the graceful stop */
- 	FEC_TCR(base_addr) |= FEC_TCR_GTS;
- 
- 	time = jiffies;
- 
--	// Wait for the graceful stop
-+	/* Wait for the graceful stop */
- 	while (!(FEC_EIR(base_addr) & FEC_EIR_GRA) && jiffies - time < FEC_GR_TIMEOUT * HZ)
- 		schedule();
- 
--	// Disable FEC
-+	/* Disable FEC */
- 	FEC_ECR(base_addr) = FEC_ECR_DISABLE;
- 
--	// Reset the DMA channels
-+	/* Reset the DMA channels */
- 	spin_lock_irq(&fp->fecpriv_lock);
- 	MCD_killDma(fp->fecpriv_fec_tx_channel);
- 	spin_unlock_irq(&fp->fecpriv_lock);
-@@ -600,12 +574,12 @@ int fec_close(struct net_device *dev)
- 	dma_disconnect(fp->fecpriv_fec_tx_channel);
- 	fp->fecpriv_fec_tx_channel = -1;
- 
--	for (i = 0; i < FEC_TX_BUF_NUMBER; i++)
--		if (fp->fecpriv_txbuf[i])
--		{
-+	for (i = 0; i < FEC_TX_BUF_NUMBER; i++) {
-+		if (fp->fecpriv_txbuf[i]) {
- 			kfree(fp->fecpriv_txbuf[i]);
- 			fp->fecpriv_txbuf[i] = NULL;
- 		}
-+	}
- 
- 	spin_lock_irq(&fp->fecpriv_lock);
- 	MCD_killDma(fp->fecpriv_fec_rx_channel);
-@@ -615,15 +589,12 @@ int fec_close(struct net_device *dev)
- 	dma_disconnect(fp->fecpriv_fec_rx_channel);
- 	fp->fecpriv_fec_rx_channel = -1;
- 
--	for (i = 0; i < FEC_RX_BUF_NUMBER; i++)
--	{
--		if (fp->askb_rx[i])
--		{
--		    kfree_skb(fp->askb_rx[i]);
--		    fp->askb_rx[i] = NULL;
--	    }
-+	for (i = 0; i < FEC_RX_BUF_NUMBER; i++) {
-+		if (fp->askb_rx[i]) {
-+			kfree_skb(fp->askb_rx[i]);
-+			fp->askb_rx[i] = NULL;
-+		}
- 	}
--//	MOD_DEC_USE_COUNT;
- 
- 	return 0;
- }
-@@ -635,14 +606,10 @@ int fec_close(struct net_device *dev)
- *************************************************************************/
- struct net_device_stats * fec_get_stat(struct net_device *dev)
- {
--
--	//Receive the pointer to the private structure
- 	struct fec_priv *fp = netdev_priv(dev);
--
--	// Receive the base address
- 	unsigned long base_addr = dev->base_addr;
- 
--	// Receive the statistical information
-+	/* Receive the statistical information */
- 	fp->fecpriv_stat.rx_packets = FECSTAT_RMON_R_PACKETS(base_addr);
- 	fp->fecpriv_stat.tx_packets = FECSTAT_RMON_T_PACKETS(base_addr);
- 	fp->fecpriv_stat.rx_bytes = FECSTAT_RMON_R_OCTETS(base_addr);
-@@ -651,7 +618,10 @@ struct net_device_stats * fec_get_stat(s
- 	fp->fecpriv_stat.multicast = FECSTAT_RMON_R_MC_PKT(base_addr);
- 	fp->fecpriv_stat.collisions = FECSTAT_RMON_T_COL(base_addr);
- 
--	fp->fecpriv_stat.rx_length_errors = FECSTAT_RMON_R_UNDERSIZE(base_addr) + FECSTAT_RMON_R_OVERSIZE(base_addr) + FECSTAT_RMON_R_FRAG(base_addr) + FECSTAT_RMON_R_JAB(base_addr);
-+	fp->fecpriv_stat.rx_length_errors = FECSTAT_RMON_R_UNDERSIZE(base_addr) +
-+		FECSTAT_RMON_R_OVERSIZE(base_addr) +
-+		FECSTAT_RMON_R_FRAG(base_addr) +
-+		FECSTAT_RMON_R_JAB(base_addr);
- 	fp->fecpriv_stat.rx_crc_errors = FECSTAT_IEEE_R_CRC(base_addr);
- 	fp->fecpriv_stat.rx_frame_errors = FECSTAT_IEEE_R_ALIGN(base_addr);
- 	fp->fecpriv_stat.rx_over_errors = FECSTAT_IEEE_R_MACERR(base_addr);
-@@ -660,9 +630,18 @@ struct net_device_stats * fec_get_stat(s
- 	fp->fecpriv_stat.tx_fifo_errors = FECSTAT_IEEE_T_MACERR(base_addr);
- 	fp->fecpriv_stat.tx_window_errors = FECSTAT_IEEE_T_LCOL(base_addr);
- 
--	// I hope that one frame doesn't have more than one error
--	fp->fecpriv_stat.rx_errors = fp->fecpriv_stat.rx_length_errors + fp->fecpriv_stat.rx_crc_errors + fp->fecpriv_stat.rx_frame_errors + fp->fecpriv_stat.rx_over_errors + fp->fecpriv_stat.rx_dropped;
--	fp->fecpriv_stat.tx_errors = fp->fecpriv_stat.tx_carrier_errors + fp->fecpriv_stat.tx_fifo_errors + fp->fecpriv_stat.tx_window_errors + fp->fecpriv_stat.tx_aborted_errors + fp->fecpriv_stat.tx_heartbeat_errors + fp->fecpriv_stat.tx_dropped;
-+	/* I hope that one frame doesn't have more than one error */
-+	fp->fecpriv_stat.rx_errors = fp->fecpriv_stat.rx_length_errors +
-+		fp->fecpriv_stat.rx_crc_errors +
-+		fp->fecpriv_stat.rx_frame_errors +
-+		fp->fecpriv_stat.rx_over_errors +
-+		fp->fecpriv_stat.rx_dropped;
-+	fp->fecpriv_stat.tx_errors = fp->fecpriv_stat.tx_carrier_errors +
-+		fp->fecpriv_stat.tx_fifo_errors +
-+		fp->fecpriv_stat.tx_window_errors +
-+		fp->fecpriv_stat.tx_aborted_errors +
-+		fp->fecpriv_stat.tx_heartbeat_errors +
-+		fp->fecpriv_stat.tx_dropped;
- 
- 	return &fp->fecpriv_stat;
- }
-@@ -674,59 +653,47 @@ struct net_device_stats * fec_get_stat(s
- *************************************************************************/
- void fec_set_multicast_list(struct net_device *dev)
- {
--	// Pointer to the address list
- 	struct dev_mc_list *dmi;
--
- 	unsigned int crc, data;
- 	int i, j, k;
--
--	// Receive the base address
- 	unsigned long base_addr = (unsigned long) dev->base_addr;
- 
--	if (dev->flags & IFF_PROMISC || dev->flags & IFF_ALLMULTI)
--	{
--		// Allow all incoming frames
-+	if (dev->flags & IFF_PROMISC || dev->flags & IFF_ALLMULTI) {
-+		/* Allow all incoming frames */
- 		FEC_GALR(base_addr) = 0xFFFFFFFF;
- 		FEC_GAUR(base_addr) = 0xFFFFFFFF;
- 		return;
- 	}
--	// Reset the group address register
-+
-+	/* Reset the group address register */
- 	FEC_GALR(base_addr) = 0x00000000;
- 	FEC_GAUR(base_addr) = 0x00000000;
- 
--	// Process all addresses
--	for (i = 0, dmi = dev->mc_list; i < dev->mc_count; i++, dmi = dmi->next)
--	{
--		// Processing must be only for the group addresses
-+	/* Process all addresses */
-+	for (i = 0, dmi = dev->mc_list; i < dev->mc_count; i++, dmi = dmi->next) {
-+		/* Processing must be only for the group addresses */
- 		if (!(dmi->dmi_addr[0] & 1))
- 			continue;
- 
--		// Calculate crc value for the current address
-+		/* Calculate crc value for the current address */
- 		crc = 0xFFFFFFFF;
--		for (j = 0; j < dmi->dmi_addrlen; j++)
--		{
--
--			for (k = 0, data = dmi->dmi_addr[j]; k < 8;  k++, data >>= 1)
--			{
-+		for (j = 0; j < dmi->dmi_addrlen; j++) {
-+			for (k = 0, data = dmi->dmi_addr[j]; k < 8;  k++, data >>= 1) {
- 				if ((crc ^ data) & 1)
- 					crc = (crc >> 1) ^ FEC_CRCPOL;
- 				else
- 					crc >>= 1;
--
- 			}
--
- 		}
- 
--		// Add this value
-+		/* Add this value */
- 		crc >>= 26;
- 		crc &= 0x3F;
- 		if (crc > 31)
- 			FEC_GAUR(base_addr) |= 0x1 << (crc - 32);
- 		else
- 			FEC_GALR(base_addr) |= 0x1 << crc;
--
- 	}
--
- }
- 
- /************************************************************************
-@@ -736,26 +703,27 @@ void fec_set_multicast_list(struct net_d
- *************************************************************************/
- int fec_set_mac_address(struct net_device *dev, void *p)
- {
--	//Receive the pointer to the private structure
- 	struct fec_priv *fp = netdev_priv(dev);
--
--	// Receive the base address
- 	unsigned long base_addr = (unsigned long) dev->base_addr;
--
- 	struct sockaddr *addr = p;
- 
- 	if (netif_running(dev))
- 		return -EBUSY;
- 
--	// Copy a new address to the device structure
-+	/* Copy a new address to the device structure */
- 	memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
- 
--	// Copy a new address to the private structure
-+	/* Copy a new address to the private structure */
- 	memcpy(fp->fecpriv_mac_addr, addr->sa_data, 6);
- 
--	// Set the address to the registers
--	FEC_PALR(base_addr) = (fp->fecpriv_mac_addr[0] << 24) | (fp->fecpriv_mac_addr[1] << 16) | (fp->fecpriv_mac_addr[2] << 8) | fp->fecpriv_mac_addr[3];
--	FEC_PAUR(base_addr) = (fp->fecpriv_mac_addr[4] << 24) | (fp->fecpriv_mac_addr[5] << 16) | 0x8808;
-+	/* Set the address to the registers */
-+	FEC_PALR(base_addr) = (fp->fecpriv_mac_addr[0] << 24) |
-+		(fp->fecpriv_mac_addr[1] << 16) |
-+		(fp->fecpriv_mac_addr[2] << 8) |
-+		fp->fecpriv_mac_addr[3];
-+	FEC_PAUR(base_addr) = (fp->fecpriv_mac_addr[4] << 24) |
-+		(fp->fecpriv_mac_addr[5] << 16) |
-+		0x8808;
- 
- 	return 0;
- }
-@@ -769,27 +737,24 @@ int fec_set_mac_address(struct net_devic
- *************************************************************************/
- int fec_tx(struct sk_buff *skb, struct net_device *dev)
- {
--
--	//Receive the pointer to the private structure
- 	struct fec_priv *fp = netdev_priv(dev);
--
- 	void *data, *data_aligned;
- 	int offset;
- 
- 	data = kmalloc(skb->len + 15, GFP_DMA | GFP_ATOMIC);
- 
--	if (!data)
--	{
-+	if (!data) {
- 		fp->fecpriv_stat.tx_dropped++;
- 		dev_kfree_skb(skb);
- 		return 0;
- 	}
- 
--	offset = (((unsigned long)virt_to_phys(data) + 15) & 0xFFFFFFF0) - (unsigned long)virt_to_phys(data);
-+	offset = (((unsigned long)virt_to_phys(data) + 15) & 0xFFFFFFF0) -
-+		(unsigned long)virt_to_phys(data);
- 	data_aligned = (void*)((unsigned long)data + offset);
- 	memcpy(data_aligned, skb->data, skb->len);
- 
--	// flush data cache before initializing the descriptor and starting DMA
-+	/* flush data cache before initializing the descriptor and starting DMA */
- #if 0
- /* JKM -- currently running with cache turned off */
- 	DcacheFlushInvalidateCacheBlock((void*)virt_to_phys(data_aligned), skb->len);
-@@ -797,7 +762,7 @@ int fec_tx(struct sk_buff *skb, struct n
- 
- 	spin_lock_irq(&fp->fecpriv_lock);
- 
--	// Initialize the descriptor
-+	/* Initialize the descriptor */
- 	fp->fecpriv_txbuf[fp->fecpriv_next_tx] = data;
- 	fp->fecpriv_txdesc[fp->fecpriv_next_tx].dataPointer = (unsigned int) virt_to_phys(data_aligned);
- 	fp->fecpriv_txdesc[fp->fecpriv_next_tx].length = skb->len;
-@@ -809,7 +774,7 @@ int fec_tx(struct sk_buff *skb, struct n
- 
- 	spin_unlock_irq(&fp->fecpriv_lock);
- 
--	// Tell the DMA to continue the transmission
-+	/* Tell the DMA to continue the transmission */
- 	MCD_continDma(fp->fecpriv_fec_tx_channel);
- 
- 	dev_kfree_skb(skb);
-@@ -835,14 +800,10 @@ void fec_tx_timeout(struct net_device *d
- 
- 	spin_lock_irq(&fp->fecpriv_lock);
- 	MCD_killDma(fp->fecpriv_fec_tx_channel);
--	for (i = 0; i < FEC_TX_BUF_NUMBER; i++)
--	{
--		if (fp->fecpriv_txbuf[i])
--		{
--
-+	for (i = 0; i < FEC_TX_BUF_NUMBER; i++) {
-+		if (fp->fecpriv_txbuf[i]) {
- 			kfree(fp->fecpriv_txbuf[i]);
- 			fp->fecpriv_txbuf[i] = NULL;
--
- 		}
- 		fp->fecpriv_txdesc[i].statCtrl = MCD_FEC_INTERRUPT;
- 	}
-@@ -850,14 +811,14 @@ void fec_tx_timeout(struct net_device *d
- 
- 	fp->fecpriv_current_tx = fp->fecpriv_next_tx = 0;
- 
--    // Reset FIFOs
-+    /* Reset FIFOs */
-     FEC_FECFRST(base_addr) |= FEC_SW_RST;
-     FEC_FECFRST(base_addr) &= ~FEC_SW_RST;
- 
--	// Reset and disable FEC
-+	/* Reset and disable FEC */
- //	FEC_ECR(base_addr) = FEC_ECR_RESET;
- 
--	// Enable FEC
-+	/* Enable FEC */
- 	FEC_ECR(base_addr) |= FEC_ECR_ETHEREN;
- 
- 	MCD_startDma(fp->fecpriv_fec_tx_channel, (char *) fp->fecpriv_txdesc, 0,
-@@ -883,23 +844,22 @@ int fec_read_mii(unsigned int base_addr,
- {
- 	unsigned long time;
- 
--	// Clear the MII interrupt bit
-+	/* Clear the MII interrupt bit */
- 	FEC_EIR(base_addr) = FEC_EIR_MII;
- 
--	// Write to the MII management frame register
-+	/* Write to the MII management frame register */
- 	FEC_MMFR(base_addr) = FEC_MMFR_READ | (pa << 23) | (ra << 18);
- 
- 	time = jiffies;
- 
--	// Wait for the reading
--	while (!(FEC_EIR(base_addr) & FEC_EIR_MII))
--	{
-+	/* Wait for the reading */
-+	while (!(FEC_EIR(base_addr) & FEC_EIR_MII)) {
- 		if (jiffies - time > FEC_MII_TIMEOUT * HZ)
- 			return -ETIME;
- 		schedule();
- 	}
- 
--	// Clear the MII interrupt bit
-+	/* Clear the MII interrupt bit */
- 	FEC_EIR(base_addr) = FEC_EIR_MII;
- 
- 	*data = FEC_MMFR(base_addr) & 0x0000FFFF;
-@@ -918,25 +878,22 @@ int fec_write_mii(unsigned int base_addr
- {
- 	unsigned long time;
- 
--	// Clear the MII interrupt bit
-+	/* Clear the MII interrupt bit */
- 	FEC_EIR(base_addr) = FEC_EIR_MII;
- 
--	// Write to the MII management frame register
-+	/* Write to the MII management frame register */
- 	FEC_MMFR(base_addr) = FEC_MMFR_WRITE | (pa << 23) | (ra << 18) | data;
- 
- 	time = jiffies;
- 
--	// Wait for the writing
--
--	while (!(FEC_EIR(base_addr) & FEC_EIR_MII))
--	{
-+	/* Wait for the writing */
-+	while (!(FEC_EIR(base_addr) & FEC_EIR_MII)) {
- 		if (jiffies - time > FEC_MII_TIMEOUT * HZ)
- 			return -ETIME;
--
- 		schedule();
- 	}
- 
--	// Clear the MII interrupt bit
-+	/* Clear the MII interrupt bit */
- 	FEC_EIR(base_addr) = FEC_EIR_MII;
- 
- 	return 0;
-@@ -953,27 +910,24 @@ void fec_interrupt_fec_tx_handler(struct
- {
- 	struct fec_priv *fp = netdev_priv(dev);
- 
--	//Release the socket buffer
--	if(fp->fecpriv_txbuf[fp->fecpriv_current_tx])
--	{
-+	/* Release the socket buffer */
-+	if(fp->fecpriv_txbuf[fp->fecpriv_current_tx]) {
- 		kfree(fp->fecpriv_txbuf[fp->fecpriv_current_tx]);
- 		fp->fecpriv_txbuf[fp->fecpriv_current_tx] = NULL;
- 	}
- 	fp->fecpriv_current_tx = (fp->fecpriv_current_tx + 1) & FEC_TX_INDEX_MASK;
- 
--	if (MCD_dmaStatus(fp->fecpriv_fec_tx_channel) == MCD_DONE)
--		for (; fp->fecpriv_current_tx != fp->fecpriv_next_tx; fp->fecpriv_current_tx = (fp->fecpriv_current_tx + 1) & FEC_TX_INDEX_MASK)
--		{
--			if(fp->fecpriv_txbuf[fp->fecpriv_current_tx])
--			{
-+	if (MCD_dmaStatus(fp->fecpriv_fec_tx_channel) == MCD_DONE) {
-+		for (; fp->fecpriv_current_tx != fp->fecpriv_next_tx; fp->fecpriv_current_tx = (fp->fecpriv_current_tx + 1) & FEC_TX_INDEX_MASK) {
-+			if(fp->fecpriv_txbuf[fp->fecpriv_current_tx]) {
- 				kfree(fp->fecpriv_txbuf[fp->fecpriv_current_tx]);
- 				fp->fecpriv_txbuf[fp->fecpriv_current_tx] = NULL;
- 			}
- 		}
-+	}
- 
- 	if (netif_queue_stopped(dev))
- 		netif_wake_queue(dev);
--
- }
- 
- /************************************************************************
-@@ -1008,49 +962,41 @@ void fec_interrupt_fec_rx_handler(struct
- 		}
- 	}
- */
--	for (; fp->fecpriv_rxdesc[fp->fecpriv_current_rx].statCtrl & MCD_FEC_END_FRAME;	fp->fecpriv_current_rx = (fp->fecpriv_current_rx + 1) & FEC_RX_INDEX_MASK)
--	{
-+	for (; fp->fecpriv_rxdesc[fp->fecpriv_current_rx].statCtrl & MCD_FEC_END_FRAME;	fp->fecpriv_current_rx = (fp->fecpriv_current_rx + 1) & FEC_RX_INDEX_MASK) {
- 	    if( (fp->fecpriv_rxdesc[fp->fecpriv_current_rx].length <= FEC_MAXBUF_SIZE) &&
--		    (fp->fecpriv_rxdesc[fp->fecpriv_current_rx].length > 4)) // --tym--
--	    {
-+		    (fp->fecpriv_rxdesc[fp->fecpriv_current_rx].length > 4)) { /* --tym-- */
-     		skb = fp->askb_rx[fp->fecpriv_current_rx];
-     		if (!skb)
--    		{
--    		    fp->fecpriv_stat.rx_dropped++;
--            }
--    		else
--    		{
--    		    // flush data cache before initializing the descriptor and starting DMA
-+			fp->fecpriv_stat.rx_dropped++;
-+    		else {
-+    		    /* flush data cache before initializing the descriptor and starting DMA */
- //		    DcacheFlushInvalidateCacheBlock((void*)virt_to_phys(fp->askb_rx[fp->fecpriv_current_rx]->tail), fp->askb_rx[fp->fecpriv_current_rx]->len);
- 
-     			skb_put(skb, fp->fecpriv_rxdesc[fp->fecpriv_current_rx].length - 4);
--//    			skb->dev = dev;
-     			skb->protocol = eth_type_trans(skb, dev);
-     			netif_rx(skb);
--    		}
--		    fp->fecpriv_rxdesc[fp->fecpriv_current_rx].statCtrl &= ~MCD_FEC_END_FRAME;
--    		// allocate new skbuff
-+		}
-+		fp->fecpriv_rxdesc[fp->fecpriv_current_rx].statCtrl &= ~MCD_FEC_END_FRAME;
-+    		/* allocate new skbuff */
-     		fp->askb_rx[fp->fecpriv_current_rx] = alloc_skb(FEC_MAXBUF_SIZE + 16, /*GFP_ATOMIC |*/ GFP_DMA);
--		    if (!fp->askb_rx[fp->fecpriv_current_rx])
--    	    {
--        		fp->fecpriv_rxdesc[fp->fecpriv_current_rx].dataPointer = 0;
--	    	    fp->fecpriv_rxdesc[fp->fecpriv_current_rx].length = 0;
--    		    fp->fecpriv_stat.rx_dropped++;
--		    }
--    		else
--    		{
--    		    skb_reserve(fp->askb_rx[fp->fecpriv_current_rx], 16);
--    			fp->askb_rx[fp->fecpriv_current_rx]->dev = dev;
-+		if (!fp->askb_rx[fp->fecpriv_current_rx]) {
-+			fp->fecpriv_rxdesc[fp->fecpriv_current_rx].dataPointer = 0;
-+			fp->fecpriv_rxdesc[fp->fecpriv_current_rx].length = 0;
-+			fp->fecpriv_stat.rx_dropped++;
-+		}
-+    		else {
-+			skb_reserve(fp->askb_rx[fp->fecpriv_current_rx], 16);
-+			fp->askb_rx[fp->fecpriv_current_rx]->dev = dev;
- 
--    		    // flush data cache before initializing the descriptor and starting DMA
-+			/* flush data cache before initializing the descriptor and starting DMA */
- #if 0
- /* JKM -- currently running with cache turned off */
--		    DcacheFlushInvalidateCacheBlock((void*)virt_to_phys(fp->askb_rx[fp->fecpriv_current_rx]->tail), FEC_MAXBUF_SIZE);
-+			DcacheFlushInvalidateCacheBlock((void*)virt_to_phys(fp->askb_rx[fp->fecpriv_current_rx]->tail), FEC_MAXBUF_SIZE);
- #endif
- 
-     	    	fp->fecpriv_rxdesc[fp->fecpriv_current_rx].dataPointer = (unsigned int) virt_to_phys(fp->askb_rx[fp->fecpriv_current_rx]->tail);
-     	    	fp->fecpriv_rxdesc[fp->fecpriv_current_rx].length = FEC_MAXBUF_SIZE;
--        		fp->fecpriv_rxdesc[fp->fecpriv_current_rx].statCtrl |= MCD_FEC_BUF_READY;
-+		fp->fecpriv_rxdesc[fp->fecpriv_current_rx].statCtrl |= MCD_FEC_BUF_READY;
- 
-     		    // flush data cache before initializing the descriptor and starting DMA
- //		    DcacheFlushInvalidateCacheBlock((void*)virt_to_phys(fp->askb_rx[fp->fecpriv_current_rx]->tail), FEC_MAXBUF_SIZE);
-@@ -1059,11 +1005,10 @@ void fec_interrupt_fec_rx_handler(struct
- 
- 	}
- 
--	// Tell the DMA to continue the reception
-+	/* Tell the DMA to continue the reception */
- 	MCD_continDma(fp->fecpriv_fec_rx_channel);
- 
- 	fp->fecpriv_rxflag = 0;
--
- }
- 
- /************************************************************************
-@@ -1080,76 +1025,70 @@ irqreturn_t fec_interrupt_handler(int ir
- 	unsigned long base_addr = (unsigned long) dev->base_addr;
- 	unsigned long events;
- 
--	// Read and clear the events
-+	/* Read and clear the events */
- 	events = FEC_EIR(base_addr) & FEC_EIMR(base_addr);
- 
--	if (events & FEC_EIR_HBERR)
--	{
-+	if (events & FEC_EIR_HBERR) {
- 		fp->fecpriv_stat.tx_heartbeat_errors++;
--    	FEC_EIR(base_addr) = FEC_EIR_HBERR;
-+		FEC_EIR(base_addr) = FEC_EIR_HBERR;
- 	}
- 
--    // receive/transmit FIFO error
--    if (((events & FEC_EIR_RFERR) != 0) || ((events & FEC_EIR_XFERR) != 0))
--    {
--        // kill DMA receive channel
--        MCD_killDma (fp->fecpriv_fec_rx_channel);
--        // kill running transmission by DMA
--        MCD_killDma (fp->fecpriv_fec_tx_channel);
--
--        // Reset FIFOs
--        FEC_FECFRST(base_addr) |= FEC_SW_RST;
--        FEC_FECFRST(base_addr) &= ~FEC_SW_RST;
--
--        // reset receive FIFO status register
--        FEC_FECRFSR(base_addr) = FEC_FECRFSR_FAE
--                                 | FEC_FECRFSR_RXW
--                                 | FEC_FECRFSR_UF;
--
--        // reset transmit FIFO status register
--        FEC_FECTFSR(base_addr) = FEC_FECTFSR_FAE
--                                 | FEC_FECTFSR_TXW
--                                 | FEC_FECTFSR_UF
--                                 | FEC_FECTFSR_OF;
-+	/* receive/transmit FIFO error */
-+    	if (((events & FEC_EIR_RFERR) != 0) || ((events & FEC_EIR_XFERR) != 0)) {
-+        	/* kill DMA receive channel */
-+        	MCD_killDma (fp->fecpriv_fec_rx_channel);
- 
--        // reset RFERR and XFERR event
--        FEC_EIR(base_addr) = FEC_EIR_RFERR | FEC_EIR_XFERR;
-+        	/* kill running transmission by DMA */
-+        	MCD_killDma (fp->fecpriv_fec_tx_channel);
- 
--	// stop queue
--	netif_stop_queue(dev);
--	
--        // execute reinitialization as tasklet
--    	tasklet_schedule(&fp->fecpriv_tasklet_reinit);
-+		/* Reset FIFOs */
-+        	FEC_FECFRST(base_addr) |= FEC_SW_RST;
-+        	FEC_FECFRST(base_addr) &= ~FEC_SW_RST;
- 
--        fp->fecpriv_stat.rx_dropped++;
-+        	/* reset receive FIFO status register */
-+        	FEC_FECRFSR(base_addr) = FEC_FECRFSR_FAE |
-+					 FEC_FECRFSR_RXW |
-+					 FEC_FECRFSR_UF;
- 
--    }
-+		/* reset transmit FIFO status register */
-+        	FEC_FECTFSR(base_addr) = FEC_FECTFSR_FAE |
-+					 FEC_FECTFSR_TXW |
-+					 FEC_FECTFSR_UF |
-+					 FEC_FECTFSR_OF;
- 
--    // transmit FIFO underrun
--    if ((events & FEC_EIR_XFUN) != 0)
--    {
--        // reset XFUN event
--        FEC_EIR(base_addr) = FEC_EIR_XFUN;
--		fp->fecpriv_stat.tx_aborted_errors++;
--    }
-+		/* reset RFERR and XFERR event */
-+        	FEC_EIR(base_addr) = FEC_EIR_RFERR | FEC_EIR_XFERR;
-+
-+		/* stop queue */
-+		netif_stop_queue(dev);
-+	
-+		/* execute reinitialization as tasklet */
-+		tasklet_schedule(&fp->fecpriv_tasklet_reinit);
-+
-+		fp->fecpriv_stat.rx_dropped++;
-+	}
- 
--    // late collision
--    if ((events & FEC_EIR_LC) != 0)
--    {
--        // reset LC event
--        FEC_EIR(base_addr) = FEC_EIR_LC;
-+	/* transmit FIFO underrun */
-+    	if ((events & FEC_EIR_XFUN) != 0) {
-+        	/* reset XFUN event */
-+        	FEC_EIR(base_addr) = FEC_EIR_XFUN;
- 		fp->fecpriv_stat.tx_aborted_errors++;
--    }
-+    	}
- 
--    // collision retry limit
--    if ((events & FEC_EIR_RL) != 0)
--    {
--        // reset RL event
--        FEC_EIR(base_addr) = FEC_EIR_RL;
-+	/* late collision */
-+    	if ((events & FEC_EIR_LC) != 0) {
-+        	/* reset LC event */
-+		FEC_EIR(base_addr) = FEC_EIR_LC;
- 		fp->fecpriv_stat.tx_aborted_errors++;
--    }
-+    	}
- 
--    return 0;
-+	/* collision retry limit */
-+    	if ((events & FEC_EIR_RL) != 0) {
-+		/* reset RL event */
-+        	FEC_EIR(base_addr) = FEC_EIR_RL;
-+		fp->fecpriv_stat.tx_aborted_errors++;
-+    	}
-+    	return 0;
- }
- 
- /************************************************************************
-@@ -1166,52 +1105,46 @@ void fec_interrupt_fec_reinit(unsigned l
- 	struct fec_priv *fp = netdev_priv(dev);
- 	unsigned long base_addr = (unsigned long) dev->base_addr;
- 
--	// Initialize reception descriptors and start DMA for the reception
--	for (i = 0; i < FEC_RX_BUF_NUMBER; i++)
--	{
--		if (!fp->askb_rx[i])
--		{
--    		fp->askb_rx[i] = alloc_skb(FEC_MAXBUF_SIZE + 16, GFP_ATOMIC | GFP_DMA);
--        	if (!fp->askb_rx[i])
--		    {
--        		fp->fecpriv_rxdesc[i].dataPointer = 0;
--	        	fp->fecpriv_rxdesc[i].statCtrl = 0;
--    	    	fp->fecpriv_rxdesc[i].length = 0;
--    	    	continue;
--	        }
-+	/* Initialize reception descriptors and start DMA for the reception */
-+	for (i = 0; i < FEC_RX_BUF_NUMBER; i++) {
-+		if (!fp->askb_rx[i]) {
-+			fp->askb_rx[i] = alloc_skb(FEC_MAXBUF_SIZE + 16, GFP_ATOMIC | GFP_DMA);
-+			if (!fp->askb_rx[i]) {
-+				fp->fecpriv_rxdesc[i].dataPointer = 0;
-+				fp->fecpriv_rxdesc[i].statCtrl = 0;
-+				fp->fecpriv_rxdesc[i].length = 0;
-+				continue;
-+			}
- 			fp->askb_rx[i]->dev = dev;
--    	    skb_reserve(fp->askb_rx[i], 16);
--	    }
--	    fp->fecpriv_rxdesc[i].dataPointer = (unsigned int) virt_to_phys(fp->askb_rx[i]->tail);
-+			skb_reserve(fp->askb_rx[i], 16);
-+		}
-+		fp->fecpriv_rxdesc[i].dataPointer = (unsigned int) virt_to_phys(fp->askb_rx[i]->tail);
- 		fp->fecpriv_rxdesc[i].statCtrl = MCD_FEC_BUF_READY | MCD_FEC_INTERRUPT;
--    	fp->fecpriv_rxdesc[i].length = FEC_MAXBUF_SIZE;
-+		fp->fecpriv_rxdesc[i].length = FEC_MAXBUF_SIZE;
- 	}
- 
- 	fp->fecpriv_rxdesc[i - 1].statCtrl |= MCD_FEC_WRAP;
- 	fp->fecpriv_current_rx = 0;
- 
--    // restart frame transmission
--	for (i = 0; i < FEC_TX_BUF_NUMBER; i++)
--	{
--		if (fp->fecpriv_txbuf[i])
--		{
--
-+	/* restart frame transmission */
-+	for (i = 0; i < FEC_TX_BUF_NUMBER; i++) {
-+		if (fp->fecpriv_txbuf[i]) {
- 			kfree(fp->fecpriv_txbuf[i]);
- 			fp->fecpriv_txbuf[i] = NULL;
--    		fp->fecpriv_stat.tx_dropped++;
-+    			fp->fecpriv_stat.tx_dropped++;
- 		}
- 		fp->fecpriv_txdesc[i].statCtrl = MCD_FEC_INTERRUPT;
- 	}
- 	fp->fecpriv_txdesc[i - 1].statCtrl |= MCD_FEC_WRAP;
- 	fp->fecpriv_current_tx = fp->fecpriv_next_tx = 0;
- 
--	// flush entire data cache before restarting the DMA
-+	/* flush entire data cache before restarting the DMA */
- #if 0
- /* JKM -- currently running with cache turned off */
- 	DcacheFlushInvalidate();
- #endif
- 	
--    // restart DMA from beginning
-+	/* restart DMA from beginning */
- 	MCD_startDma(fp->fecpriv_fec_rx_channel,
- 		     (char *) fp->fecpriv_rxdesc, 0,
- 		     (unsigned char *) &(FEC_FECRFDR(base_addr)), 0,
-@@ -1225,11 +1158,10 @@ void fec_interrupt_fec_reinit(unsigned l
- 		     FEC_TX_DMA_PRI, MCD_FECTX_DMA | MCD_INTERRUPT,
- 		     MCD_NO_CSUM | MCD_NO_BYTE_SWAP);
- 
--    // Enable FEC
--    FEC_ECR(base_addr) |= FEC_ECR_ETHEREN;
-+	/* Enable FEC */
-+	FEC_ECR(base_addr) |= FEC_ECR_ETHEREN;
- 
- 	netif_wake_queue(dev);
--
- }
- 
- /************************************************************************
-@@ -1284,8 +1216,8 @@ void fec_interrupt_fec_rx_handler_fec1(v
- }
- 
- #endif
--#ifndef MODULE
- 
-+#ifndef MODULE
- /************************************************************************
- * NAME: fec_mac_setup0
- *
-@@ -1300,7 +1232,6 @@ int __init fec_mac_setup0(char *s)
- 	if(fec_str_to_mac(s, fec_mac_addr_fec0))
- 		printk("The MAC address of FEC0 cannot be set from command line");
- 	return 1;
--
- }
- 
- #ifdef   FEC_2
-@@ -1316,11 +1247,9 @@ int __init fec_mac_setup1(char *s)
- 	if(!s || !*s)
- 		return 1;
- 
--
- 	if(fec_str_to_mac(s, fec_mac_addr_fec1))
- 		printk("The MAC address of FEC1 cannot be set from command line");
- 	return 1;
--
- }
- #endif
- 
-@@ -1332,52 +1261,46 @@ int __init fec_mac_setup1(char *s)
- *************************************************************************/
- int fec_str_to_mac( char *str_mac, unsigned char* addr)
- {
--    unsigned long val;
-+	unsigned long val;
- 	char c;
- 	unsigned long octet[6], *octetptr = octet;
- 	int i;
--again:
- 
-+again:
- 	val = 0;
--	while ((c = *str_mac) != '\0')
--	{
--		if ((c>='0')&&(c<='9'))
--		{
-+	while ((c = *str_mac) != '\0') {
-+		if ((c>='0')&&(c<='9')) {
- 			val = (val * 16) + (c - '0');
- 			str_mac++;
- 			continue;
- 		}
--		else
--		if (((c>='a')&&(c<='f'))||((c>='A')&&(c<='F')))
--		{
-+		else if (((c>='a')&&(c<='f'))||((c>='A')&&(c<='F'))) {
- 			val = (val << 4) + (c + 10 - (((c>='a')&&(c<='f')) ? 'a' : 'A'));
- 			str_mac++;
- 			continue;
- 		}
- 		break;
- 	}
--	if (*str_mac == ':')
--	{
-+	if (*str_mac == ':') {
- 		*octetptr++ = val, str_mac++;
- 		if (octetptr >= octet + 6)
- 			return 1;
- 		goto again;
- 	}
- 
--	 //Check for trailing characters.
-+	/* Check for trailing characters */
- 	if (*str_mac && !(*str_mac==' '))
- 		return 1;
-+
- 	*octetptr++ = val;
- 
--	if ((octetptr - octet)==6)
--	{
--	   for(i=0;i<=6;i++)
--	      addr[i]=octet[i];
-+	if ((octetptr - octet)==6) {
-+		for(i=0;i<=6;i++)
-+			addr[i]=octet[i];
- 	}
--    else
-+	else
- 		return 1;
- 
- 	return 0;
--
- }
- #endif
diff --git a/target/linux/coldfire/patches/048-m547x_8x_internal_rename.patch b/target/linux/coldfire/patches/048-m547x_8x_internal_rename.patch
deleted file mode 100644
index eda1df0ae..000000000
--- a/target/linux/coldfire/patches/048-m547x_8x_internal_rename.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 62c2649ed2362a5f0478df60d56ed35414ac81ea Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Thu, 13 Mar 2008 22:06:35 -0600
-Subject: [PATCH] Change internal name rigo to m548x_7x
-
-LTIBName: m547x-8x-internal-rename
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/coldfire/head.S |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
---- a/arch/m68k/coldfire/head.S
-+++ b/arch/m68k/coldfire/head.S
-@@ -53,7 +53,7 @@
- #define __FINIT		.previous
- #endif
- 
--/* JKM -- REVISE DOCS FOR RIGO and PHYS MAPPING */
-+/* JKM -- REVISE DOCS FOR M547x_8x and PHYS MAPPING */
- /*
-  * Setup ACR mappings to provide the following memory map:
-  *   Data
diff --git a/target/linux/coldfire/patches/049-mcfv4e_linker_bss_cleanup.patch b/target/linux/coldfire/patches/049-mcfv4e_linker_bss_cleanup.patch
deleted file mode 100644
index 06a68aa58..000000000
--- a/target/linux/coldfire/patches/049-mcfv4e_linker_bss_cleanup.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 4e16f08c800d57b986217e0d39d4a06b5bdf641d Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Wed, 19 Mar 2008 17:37:44 -0600
-Subject: [PATCH] Move BSS section in linker script and zero it on boot.
-
-To work with the latest round of toolchains the bss section
-in the linker script needed to be moved to the end (due to
-the linker thinking there were overlapping sections).
-
-The BSS section needs to be manually zeroed.
-
-LTIBName: mcfv4e-linker-bss-cleanup
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/coldfire/head.S         |   11 +++++++++++
- arch/m68k/coldfire/vmlinux-cf.lds |   11 ++++++++---
- 2 files changed, 19 insertions(+), 3 deletions(-)
-
---- a/arch/m68k/coldfire/head.S
-+++ b/arch/m68k/coldfire/head.S
-@@ -321,6 +321,17 @@ ENTRY(__start)
- 	movec   %d0, %acr3
- 	nop
- 
-+#ifdef CONFIG_COLDFIRE
-+/* zero bss */
-+	lea	_sbss,%a0
-+	lea	_ebss,%a1
-+	clrl	%d0
-+_loop_bss:
-+	movel	%d0,(%a0)+
-+	cmpl	%a0,%a1
-+	bne	_loop_bss
-+#endif
-+
- 	/* If you change the memory size to another value make a matching 
- 	   change in paging_init(cf-mmu.c) to zones_size[]. */
- 
---- a/arch/m68k/coldfire/vmlinux-cf.lds
-+++ b/arch/m68k/coldfire/vmlinux-cf.lds
-@@ -51,9 +51,6 @@ SECTIONS
- 	CONSTRUCTORS
-   } :data
- 
--  .bss : AT(ADDR(.bss) - LOAD_OFFSET) {		/* BSS */
--	*(.bss)
--  }
- 
-   . = ALIGN(16);
-   .data.cacheline_aligned : AT(ADDR(.data.cacheline_aligned) - LOAD_OFFSET ) {
-@@ -62,6 +59,8 @@ SECTIONS
- 
-   _edata = .;			/* End of data section */
- 
-+  NOTES				/* support ld --build-id */
-+
-   . = ALIGN(8192);		/* Initrd */
-   .init.text : AT(ADDR(.init.text) - LOAD_OFFSET) {
-   	__init_begin = .;
-@@ -111,6 +110,12 @@ SECTIONS
- 	*(.data.init_task)	/* The initial task and kernel stack */
-   }
- 
-+  _sbss = .;
-+  .bss : AT(ADDR(.bss) - LOAD_OFFSET) {		/* BSS */
-+	*(.bss)
-+  }
-+  _ebss = .;
-+
-   _end = . ;
- 
-   /* Sections to be discarded */
diff --git a/target/linux/coldfire/patches/050-mcfv4e_irq_magic_bit.patch b/target/linux/coldfire/patches/050-mcfv4e_irq_magic_bit.patch
deleted file mode 100644
index 61d746b70..000000000
--- a/target/linux/coldfire/patches/050-mcfv4e_irq_magic_bit.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 3487b77acbb12f4174f46237f942918651b23aa7 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Tue, 15 Apr 2008 17:14:55 -0600
-Subject: [PATCH] Fix setting low 31 interrupts to deal with magic bit 0
- of the IMRL register.
-
-LTIBName: mcfv4e-irq-magic-bit
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/coldfire/ints.c |    9 ++++++---
- 1 files changed, 6 insertions(+), 3 deletions(-)
-
---- a/arch/m68k/coldfire/ints.c
-+++ b/arch/m68k/coldfire/ints.c
-@@ -420,10 +420,13 @@ void m547x_8x_irq_enable(unsigned int ir
- 	}
- #endif
- 
--	if (irq < 32)
--		MCF_IMRL &= ~(1 << irq);
--	else
-+	if (irq < 32) {
-+		/* *grumble* don't set low bit of IMRL */
-+		MCF_IMRL &= (~(1 << irq) & 0xfffffffe);
-+	}
-+	else {
- 		MCF_IMRH &= ~(1 << (irq - 32));
-+	}
- }
- 
- void m547x_8x_irq_disable(unsigned int irq)
diff --git a/target/linux/coldfire/patches/051-m547x_8x_mcdma_1.0.patch b/target/linux/coldfire/patches/051-m547x_8x_mcdma_1.0.patch
deleted file mode 100644
index 817fb1b6c..000000000
--- a/target/linux/coldfire/patches/051-m547x_8x_mcdma_1.0.patch
+++ /dev/null
@@ -1,3726 +0,0 @@
-From 6c9df5dff79b6d09d1a31681067e7fbd85285f80 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Wed, 30 Apr 2008 12:22:03 -0600
-Subject: [PATCH] Update MultiChannel DMA to code version 1.0.
-
-Changes since previous:
-- Updated FEC RX task to work around bug where it would not update
-  the RX buffer descriptors correctly and adjusted size accordingly.
-- Added flag MCD_TT_FLAGS_PI for use with DSPI on MCD547x/8x.
-- Fixed cleanup of paused tasks in MCD_killDma.
-- Cosmetic changes to cleanup MCD_dmaApi.c.
-
-LTIBName: m547x-8x-mcdma-1.0
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/coldfire/Makefile       |    3 +-
- arch/m68k/coldfire/dma.c          |  532 ----
- arch/m68k/coldfire/m547x_8x-dma.c |  516 ++++
- drivers/dma/MCD_dma.h             |  786 +++---
- drivers/dma/MCD_dmaApi.c          |  417 ++--
- drivers/dma/MCD_progCheck.h       |   45 +-
- drivers/dma/MCD_tasks.c           | 4917 +++++++++++++++++++------------------
- drivers/dma/MCD_tasksInit.c       |  402 ++--
- drivers/dma/MCD_tasksInit.h       |   49 +-
- 9 files changed, 3785 insertions(+), 3882 deletions(-)
- delete mode 100644 arch/m68k/coldfire/dma.c
- create mode 100644 arch/m68k/coldfire/m547x_8x-dma.c
-
---- a/arch/m68k/coldfire/Makefile
-+++ b/arch/m68k/coldfire/Makefile
-@@ -10,5 +10,4 @@ endif
- 
- obj-$(CONFIG_PCI)	+= pci.o mcf5445x-pci.o iomap.o
- obj-$(CONFIG_M54455)	+= mcf5445x-devices.o
--
--obj-$(CONFIG_MCD_DMA)	+= dma.o
-+obj-$(CONFIG_MCD_DMA)	+= m547x_8x-dma.o
---- a/arch/m68k/coldfire/dma.c
-+++ /dev/null
-@@ -1,532 +0,0 @@
--#include <linux/kernel.h>
--#include <linux/sched.h>
--#include <linux/mm.h>
--#include <linux/init.h>
--#include <linux/interrupt.h>
--#include <asm/io.h>
--#include <asm/irq.h>
--#include <asm/dma.h>
--#include <asm/coldfire.h>
--#include <asm/m5485sram.h>
--#include <asm/mcfsim.h>
--
--
--
--void dma_interrupt_handler(int irq, void *dev_id, struct pt_regs *regs);
--
--/* 
-- * This global keeps track of which initiators have been
-- * used of the available assignments.  Initiators 0-15 are
-- * hardwired.  Initiators 16-31 are multiplexed and controlled
-- * via the Initiatior Mux Control Registe (IMCR).  The
-- * assigned requestor is stored with the associated initiator
-- * number.
-- */
--static int used_reqs[32] = {
--	DMA_ALWAYS, DMA_DSPI_RX, DMA_DSPI_TX, DMA_DREQ0,
--	DMA_PSC0_RX, DMA_PSC0_TX, DMA_USBEP0, DMA_USBEP1,
--	DMA_USBEP2, DMA_USBEP3, DMA_PCI_TX, DMA_PCI_RX,
--	DMA_PSC1_RX, DMA_PSC1_TX, DMA_I2C_RX, DMA_I2C_TX,
--	0, 0, 0, 0,
--	0, 0, 0, 0,
--	0, 0, 0, 0,
--	0, 0, 0, 0
--};
--
--/*
-- * This global keeps track of which channels have been assigned
-- * to tasks.  This methology assumes that no single initiator
-- * will be tied to more than one task/channel
-- */
--static char used_channel[16] = {
--	-1, -1, -1, -1, -1, -1, -1, -1,
--	-1, -1, -1, -1, -1, -1, -1, -1
--};
--
--unsigned int connected_channel[16] = {
--	0, 0, 0, 0, 0, 0, 0, 0,
--	0, 0, 0, 0, 0, 0, 0, 0
--};
--
--/********************************************************************/
--/*
-- * Attempt to enable the provided Initiator in the Initiator
-- * Mux Control Register
-- *
-- * Parameters:
-- *  initiator   Initiator identifier
-- *
-- * Return Value:
-- *  1   if unable to make the assignment
-- *  0   successful
-- */
--int
--dma_set_initiator(int initiator)
--{
--	switch (initiator) {	/*
--				 * These initiators are always active 
--				 */
--	case DMA_ALWAYS:
--	case DMA_DSPI_RX:
--	case DMA_DSPI_TX:
--	case DMA_DREQ0:
--	case DMA_PSC0_RX:
--	case DMA_PSC0_TX:
--	case DMA_USBEP0:
--	case DMA_USBEP1:
--	case DMA_USBEP2:
--	case DMA_USBEP3:
--	case DMA_PCI_TX:
--	case DMA_PCI_RX:
--	case DMA_PSC1_RX:
--	case DMA_PSC1_TX:
--	case DMA_I2C_RX:
--	case DMA_I2C_TX:
--		break;
--
--	case DMA_FEC0_RX:
--		MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC16(3))
--		    | MCF_DMA_IMCR_SRC16_FEC0RX;
--		used_reqs[16] = DMA_FEC0_RX;
--		break;
--
--	case DMA_FEC0_TX:
--		MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC17(3))
--		    | MCF_DMA_IMCR_SRC17_FEC0TX;
--		used_reqs[17] = DMA_FEC0_TX;
--		break;
--
--	case DMA_FEC1_RX:
--		MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC20(3))
--		    | MCF_DMA_IMCR_SRC20_FEC1RX;
--		used_reqs[20] = DMA_FEC1_RX;
--		break;
--
--	case DMA_FEC1_TX:
--		if (used_reqs[21] == 0) {
--			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC21(3))
--			    | MCF_DMA_IMCR_SRC21_FEC1TX;
--			used_reqs[21] = DMA_FEC1_TX;
--		} else if (used_reqs[25] == 0) {
--			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC25(3))
--			    | MCF_DMA_IMCR_SRC25_FEC1TX;
--			used_reqs[25] = DMA_FEC1_TX;
--		} else if (used_reqs[31] == 0) {
--			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC31(3))
--			    | MCF_DMA_IMCR_SRC31_FEC1TX;
--			used_reqs[31] = DMA_FEC1_TX;
--		} else		/* No empty slots */
--			return 1;
--		break;
--
--	case DMA_DREQ1:
--		if (used_reqs[29] == 0) {
--			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC29(3))
--			    | MCF_DMA_IMCR_SRC29_DREQ1;
--			used_reqs[29] = DMA_DREQ1;
--		} else if (used_reqs[21] == 0) {
--			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC21(3))
--			    | MCF_DMA_IMCR_SRC21_DREQ1;
--			used_reqs[21] = DMA_DREQ1;
--		} else		/* No empty slots */
--			return 1;
--		break;
--
--	case DMA_CTM0:
--		if (used_reqs[24] == 0) {
--			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC24(3))
--			    | MCF_DMA_IMCR_SRC24_CTM0;
--			used_reqs[24] = DMA_CTM0;
--		} else		/* No empty slots */
--			return 1;
--		break;
--
--	case DMA_CTM1:
--		if (used_reqs[25] == 0) {
--			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC25(3))
--			    | MCF_DMA_IMCR_SRC25_CTM1;
--			used_reqs[25] = DMA_CTM1;
--		} else		/* No empty slots */
--			return 1;
--		break;
--
--	case DMA_CTM2:
--		if (used_reqs[26] == 0) {
--			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC26(3))
--			    | MCF_DMA_IMCR_SRC26_CTM2;
--			used_reqs[26] = DMA_CTM2;
--		} else		/* No empty slots */
--			return 1;
--		break;
--
--	case DMA_CTM3:
--		if (used_reqs[27] == 0) {
--			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC27(3))
--			    | MCF_DMA_IMCR_SRC27_CTM3;
--			used_reqs[27] = DMA_CTM3;
--		} else		/* No empty slots */
--			return 1;
--		break;
--
--	case DMA_CTM4:
--		if (used_reqs[28] == 0) {
--			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC28(3))
--			    | MCF_DMA_IMCR_SRC28_CTM4;
--			used_reqs[28] = DMA_CTM4;
--		} else		/* No empty slots */
--			return 1;
--		break;
--
--	case DMA_CTM5:
--		if (used_reqs[29] == 0) {
--			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC29(3))
--			    | MCF_DMA_IMCR_SRC29_CTM5;
--			used_reqs[29] = DMA_CTM5;
--		} else		/* No empty slots */
--			return 1;
--		break;
--
--	case DMA_CTM6:
--		if (used_reqs[30] == 0) {
--			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC30(3))
--			    | MCF_DMA_IMCR_SRC30_CTM6;
--			used_reqs[30] = DMA_CTM6;
--		} else		/* No empty slots */
--			return 1;
--		break;
--
--	case DMA_CTM7:
--		if (used_reqs[31] == 0) {
--			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC31(3))
--			    | MCF_DMA_IMCR_SRC31_CTM7;
--			used_reqs[31] = DMA_CTM7;
--		} else		/* No empty slots */
--			return 1;
--		break;
--
--	case DMA_USBEP4:
--		if (used_reqs[26] == 0) {
--			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC26(3))
--			    | MCF_DMA_IMCR_SRC26_USBEP4;
--			used_reqs[26] = DMA_USBEP4;
--		} else		/* No empty slots */
--			return 1;
--		break;
--
--	case DMA_USBEP5:
--		if (used_reqs[27] == 0) {
--			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC27(3))
--			    | MCF_DMA_IMCR_SRC27_USBEP5;
--			used_reqs[27] = DMA_USBEP5;
--		} else		/* No empty slots */
--			return 1;
--		break;
--
--	case DMA_USBEP6:
--		if (used_reqs[28] == 0) {
--			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC28(3))
--			    | MCF_DMA_IMCR_SRC28_USBEP6;
--			used_reqs[28] = DMA_USBEP6;
--		} else		/* No empty slots */
--			return 1;
--		break;
--
--	case DMA_PSC2_RX:
--		if (used_reqs[28] == 0) {
--			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC28(3))
--			    | MCF_DMA_IMCR_SRC28_PSC2RX;
--			used_reqs[28] = DMA_PSC2_RX;
--		} else		/* No empty slots */
--			return 1;
--		break;
--
--	case DMA_PSC2_TX:
--		if (used_reqs[29] == 0) {
--			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC29(3))
--			    | MCF_DMA_IMCR_SRC29_PSC2TX;
--			used_reqs[29] = DMA_PSC2_TX;
--		} else		/* No empty slots */
--			return 1;
--		break;
--
--	case DMA_PSC3_RX:
--		if (used_reqs[30] == 0) {
--			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC30(3))
--			    | MCF_DMA_IMCR_SRC30_PSC3RX;
--			used_reqs[30] = DMA_PSC3_RX;
--		} else		/* No empty slots */
--			return 1;
--		break;
--
--	case DMA_PSC3_TX:
--		if (used_reqs[31] == 0) {
--			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC31(3))
--			    | MCF_DMA_IMCR_SRC31_PSC3TX;
--			used_reqs[31] = DMA_PSC3_TX;
--		} else		/* No empty slots */
--			return 1;
--		break;
--
--	default:
--		return 1;
--	}
--	return 0;
--}
--
--/********************************************************************/
--/*
-- * Return the initiator number for the given requestor
-- *
-- * Parameters:
-- *  requestor   Initiator/Requestor identifier
-- *
-- * Return Value:
-- *  The initiator number (0-31) if initiator has been assigned
-- *  0 (always initiator) otherwise
-- */
--unsigned int
--dma_get_initiator(int requestor)
--{
--	u32 i;
--
--	for (i = 0; i < sizeof (used_reqs); ++i) {
--		if (used_reqs[i] == requestor)
--			return i;
--	}
--	return 0;
--}
--
--/********************************************************************/
--/*
-- * Remove the given initiator from the active list
-- *
-- * Parameters:
-- *  requestor   Initiator/Requestor identifier
-- */
--void
--dma_remove_initiator(int requestor)
--{
--	u32 i;
--
--	for (i = 0; i < sizeof (used_reqs); ++i) {
--		if (used_reqs[i] == requestor) {
--			used_reqs[i] = -1;
--			break;
--		}
--	}
--}
--
--/********************************************************************/
--/*
-- * Attempt to find an available channel for FEC and mark is as used
-- *
-- * Parameters:
-- *  requestor   Initiator/Requestor identifier
-- *
-- * Return Value:
-- *  First available channel (from 0 to 5) or -1 if they are all occupied
-- */
--int
--dma_set_channel_fec(int requestor)
--{
--	u32 i, t;
--
--#ifdef CONFIG_FEC_548x_ENABLE_FEC2
--	t = 4;
--#else
--	t = 2;
--#endif
--
--
--
--	for (i = 0; i < t ; ++i)
--		if (used_channel[i] == -1) {
--			used_channel[i] = requestor;
--			return i;
--		}
--	/* All channels taken */
--	return -1;
--}
--
--/********************************************************************/
--/*
-- * Attempt to find an available channel and mark is as used
-- *
-- * Parameters:
-- *  requestor   Initiator/Requestor identifier
-- *
-- * Return Value:
-- *  First available channel (from 6 to 15) or -1 if they are all occupied
-- */
--int
--dma_set_channel(int requestor)
--{
--	u32 i;
--#ifdef CONFIG_NET_FEC2
--	i = 4;
--#else
--	i = 2;
--#endif				
--
--	for (; i < 16; ++i)
--		if (used_channel[i] == -1) {
--			used_channel[i] = requestor;
--			return i;
--		}
--
--	/* All channels taken */
--	return -1;
--}
--
--/********************************************************************/
--/*
-- * Return the channel being initiated by the given requestor
-- *
-- * Parameters:
-- *  requestor   Initiator/Requestor identifier
-- */
--int
--dma_get_channel(int requestor)
--{
--	u32 i;
--
--	for (i = 0; i < sizeof (used_channel); ++i) {
--		if (used_channel[i] == requestor)
--			return i;
--	}
--	return -1;
--}
--
--/********************************************************************/
--/*
-- * Connects a channel with reference on your data 
-- *
-- * Parameters:
-- *  channel   channel number
-- *  reference addres of your data
--  */
--int
--dma_connect(int channel, int address)
--{
--	if ((channel < 16) && (channel >= 0))
--		connected_channel[channel] = address;
--	else
--		return -1;
--	return 0;
--}
--
--/********************************************************************/
--/*
-- * Disconnects a channel with reference on your data 
-- *
-- * Parameters:
-- *  channel   channel number
--*/
--int
--dma_disconnect(int channel)
--{
--	if ((channel < 16) && (channel >= 0))
--		connected_channel[channel] = 0;
--	else
--		return -1;
--	return 0;
--}
--
--/********************************************************************/
--/*
-- * Remove the channel being initiated by the given requestor from 
-- * the active list
-- *
-- * Parameters:
-- *  requestor   Initiator/Requestor identifier
-- */
--void
--dma_remove_channel(int requestor)
--{
--	u32 i;
--
--	for (i = 0; i < sizeof (used_channel); ++i) {
--		if (used_channel[i] == requestor) {
--			used_channel[i] = -1;
--			break;
--		}
--	}
--}
--
--/********************************************************************/
--/* 
-- * This is the catch-all interrupt handler for the mult-channel DMA 
-- */
--volatile u8 dma_iflag[16];
--u32 tx = 0;
--
--void
--dma_interrupt_handler(int irq, void *dev_id, struct pt_regs *regs)
--{
--	u32 i, interrupts/*, mask, temp*/;
--
--	/*
--	 * Determine which interrupt(s) triggered by AND'ing the 
--	 * pending interrupts with those that aren't masked.            
--	 */
--/*	mask = MCF_DMA_DIMR;
--	MCF_DMA_DIMR = 0xffffffff;
--*/
--	interrupts = MCF_DMA_DIPR;
--	MCF_DMA_DIPR |= interrupts;
--//	temp = interrupts;
--
--	//MCF_DMA_DIPR = interrupts;
--	for (i = 0; i < 16; ++i, interrupts >>= 1)
--		if (interrupts & 0x1)
--			if (connected_channel[i] != 0)
--				((void (*)(void)) (connected_channel[i])) ();
--
--/*	MCF_DMA_DIPR |= temp;
--	MCF_DMA_DIMR = mask;*/
--}
--
--void
--dma_remove_channel_by_number(int channel)
--{
--	if (channel < sizeof (used_channel) && channel >= 0)
--		used_channel[channel] = -1;
--}
--
--int __devinit
--dma_init()
--{
--	int result;
--	char *dma_version_str;
--
--	MCD_getVersion(&dma_version_str);
--	printk("Initialize %s\n", dma_version_str);
--
--	if (request_irq
--	    (64 + ISC_DMA, 
--	     dma_interrupt_handler, 
--	     IRQF_DISABLED, 
--	     "MCD-DMA", 
--	     NULL)) {
--		printk("Cannot allocate the DMA IRQ(48)\n");
--		return 1;
--	}
--
--	MCF_DMA_DIMR = 0;
--	MCF_DMA_DIPR = 0xFFFFFFFF;
--
--	MCF_ICR(ISC_DMA) = ILP_DMA;
--
--	result = MCD_initDma((dmaRegs *) (MCF_MBAR + 0x8000),
--			(void *) SYS_SRAM_DMA_START, MCD_RELOC_TASKS);
--	if (result != MCD_OK) {
--		printk("Cannot perform DMA initialization\n");
--		free_irq(64 + ISC_DMA, NULL);
--		return 1;
--	}
--
--	return 0;
--}
--
--device_initcall(dma_init);
--
---- /dev/null
-+++ b/arch/m68k/coldfire/m547x_8x-dma.c
-@@ -0,0 +1,516 @@
-+/*
-+ * arch/m68k/coldfire/m547x_8x-dma.c
-+ *
-+ * Coldfire M547x/M548x DMA
-+ *
-+ * Copyright (c) 2008 Freescale Semiconductor, Inc.
-+ *	Kurt Mahan <kmahan@freescale.com>
-+ *
-+ * This code is based on patches from the Freescale M547x_8x BSP
-+ * release mcf547x_8x-20070107-ltib.iso
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ */
-+#include <linux/kernel.h>
-+#include <linux/sched.h>
-+#include <linux/mm.h>
-+#include <linux/init.h>
-+#include <linux/interrupt.h>
-+#include <asm/io.h>
-+#include <asm/irq.h>
-+#include <asm/dma.h>
-+#include <asm/coldfire.h>
-+#include <asm/m5485sram.h>
-+#include <asm/mcfsim.h>
-+
-+/*
-+ * This global keeps track of which initiators have been
-+ * used of the available assignments.  Initiators 0-15 are
-+ * hardwired.  Initiators 16-31 are multiplexed and controlled
-+ * via the Initiatior Mux Control Registe (IMCR).  The
-+ * assigned requestor is stored with the associated initiator
-+ * number.
-+ */
-+static int used_reqs[32] = {
-+	DMA_ALWAYS, DMA_DSPI_RX, DMA_DSPI_TX, DMA_DREQ0,
-+	DMA_PSC0_RX, DMA_PSC0_TX, DMA_USBEP0, DMA_USBEP1,
-+	DMA_USBEP2, DMA_USBEP3, DMA_PCI_TX, DMA_PCI_RX,
-+	DMA_PSC1_RX, DMA_PSC1_TX, DMA_I2C_RX, DMA_I2C_TX,
-+	0, 0, 0, 0,
-+	0, 0, 0, 0,
-+	0, 0, 0, 0,
-+	0, 0, 0, 0
-+};
-+
-+/*
-+ * This global keeps track of which channels have been assigned
-+ * to tasks.  This methology assumes that no single initiator
-+ * will be tied to more than one task/channel
-+ */
-+static char used_channel[16] = {
-+	-1, -1, -1, -1, -1, -1, -1, -1,
-+	-1, -1, -1, -1, -1, -1, -1, -1
-+};
-+
-+unsigned int connected_channel[16] = {
-+	0, 0, 0, 0, 0, 0, 0, 0,
-+	0, 0, 0, 0, 0, 0, 0, 0
-+};
-+
-+/**
-+ * dma_set_initiator - enable initiator
-+ * @initiator: initiator identifier
-+ *
-+ * Returns 0 of successful, non-zero otherwise
-+ *
-+ * Attempt to enable the provided Initiator in the Initiator
-+ * Mux Control Register.
-+ */
-+int dma_set_initiator(int initiator)
-+{
-+	switch (initiator) {
-+	case DMA_ALWAYS:
-+	case DMA_DSPI_RX:
-+	case DMA_DSPI_TX:
-+	case DMA_DREQ0:
-+	case DMA_PSC0_RX:
-+	case DMA_PSC0_TX:
-+	case DMA_USBEP0:
-+	case DMA_USBEP1:
-+	case DMA_USBEP2:
-+	case DMA_USBEP3:
-+	case DMA_PCI_TX:
-+	case DMA_PCI_RX:
-+	case DMA_PSC1_RX:
-+	case DMA_PSC1_TX:
-+	case DMA_I2C_RX:
-+	case DMA_I2C_TX:
-+		/*
-+		 * These initiators are always active
-+		 */
-+		break;
-+
-+	case DMA_FEC0_RX:
-+		MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC16(3))
-+		    | MCF_DMA_IMCR_SRC16_FEC0RX;
-+		used_reqs[16] = DMA_FEC0_RX;
-+		break;
-+
-+	case DMA_FEC0_TX:
-+		MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC17(3))
-+		    | MCF_DMA_IMCR_SRC17_FEC0TX;
-+		used_reqs[17] = DMA_FEC0_TX;
-+		break;
-+
-+	case DMA_FEC1_RX:
-+		MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC20(3))
-+		    | MCF_DMA_IMCR_SRC20_FEC1RX;
-+		used_reqs[20] = DMA_FEC1_RX;
-+		break;
-+
-+	case DMA_FEC1_TX:
-+		if (used_reqs[21] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC21(3))
-+			    | MCF_DMA_IMCR_SRC21_FEC1TX;
-+			used_reqs[21] = DMA_FEC1_TX;
-+		} else if (used_reqs[25] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC25(3))
-+			    | MCF_DMA_IMCR_SRC25_FEC1TX;
-+			used_reqs[25] = DMA_FEC1_TX;
-+		} else if (used_reqs[31] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC31(3))
-+			    | MCF_DMA_IMCR_SRC31_FEC1TX;
-+			used_reqs[31] = DMA_FEC1_TX;
-+		} else		/* No empty slots */
-+			return 1;
-+		break;
-+
-+	case DMA_DREQ1:
-+		if (used_reqs[29] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC29(3))
-+			    | MCF_DMA_IMCR_SRC29_DREQ1;
-+			used_reqs[29] = DMA_DREQ1;
-+		} else if (used_reqs[21] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC21(3))
-+			    | MCF_DMA_IMCR_SRC21_DREQ1;
-+			used_reqs[21] = DMA_DREQ1;
-+		} else		/* No empty slots */
-+			return 1;
-+		break;
-+
-+	case DMA_CTM0:
-+		if (used_reqs[24] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC24(3))
-+			    | MCF_DMA_IMCR_SRC24_CTM0;
-+			used_reqs[24] = DMA_CTM0;
-+		} else		/* No empty slots */
-+			return 1;
-+		break;
-+
-+	case DMA_CTM1:
-+		if (used_reqs[25] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC25(3))
-+			    | MCF_DMA_IMCR_SRC25_CTM1;
-+			used_reqs[25] = DMA_CTM1;
-+		} else		/* No empty slots */
-+			return 1;
-+		break;
-+
-+	case DMA_CTM2:
-+		if (used_reqs[26] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC26(3))
-+			    | MCF_DMA_IMCR_SRC26_CTM2;
-+			used_reqs[26] = DMA_CTM2;
-+		} else		/* No empty slots */
-+			return 1;
-+		break;
-+
-+	case DMA_CTM3:
-+		if (used_reqs[27] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC27(3))
-+			    | MCF_DMA_IMCR_SRC27_CTM3;
-+			used_reqs[27] = DMA_CTM3;
-+		} else		/* No empty slots */
-+			return 1;
-+		break;
-+
-+	case DMA_CTM4:
-+		if (used_reqs[28] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC28(3))
-+			    | MCF_DMA_IMCR_SRC28_CTM4;
-+			used_reqs[28] = DMA_CTM4;
-+		} else		/* No empty slots */
-+			return 1;
-+		break;
-+
-+	case DMA_CTM5:
-+		if (used_reqs[29] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC29(3))
-+			    | MCF_DMA_IMCR_SRC29_CTM5;
-+			used_reqs[29] = DMA_CTM5;
-+		} else		/* No empty slots */
-+			return 1;
-+		break;
-+
-+	case DMA_CTM6:
-+		if (used_reqs[30] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC30(3))
-+			    | MCF_DMA_IMCR_SRC30_CTM6;
-+			used_reqs[30] = DMA_CTM6;
-+		} else		/* No empty slots */
-+			return 1;
-+		break;
-+
-+	case DMA_CTM7:
-+		if (used_reqs[31] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC31(3))
-+			    | MCF_DMA_IMCR_SRC31_CTM7;
-+			used_reqs[31] = DMA_CTM7;
-+		} else		/* No empty slots */
-+			return 1;
-+		break;
-+
-+	case DMA_USBEP4:
-+		if (used_reqs[26] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC26(3))
-+			    | MCF_DMA_IMCR_SRC26_USBEP4;
-+			used_reqs[26] = DMA_USBEP4;
-+		} else		/* No empty slots */
-+			return 1;
-+		break;
-+
-+	case DMA_USBEP5:
-+		if (used_reqs[27] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC27(3))
-+			    | MCF_DMA_IMCR_SRC27_USBEP5;
-+			used_reqs[27] = DMA_USBEP5;
-+		} else		/* No empty slots */
-+			return 1;
-+		break;
-+
-+	case DMA_USBEP6:
-+		if (used_reqs[28] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC28(3))
-+			    | MCF_DMA_IMCR_SRC28_USBEP6;
-+			used_reqs[28] = DMA_USBEP6;
-+		} else		/* No empty slots */
-+			return 1;
-+		break;
-+
-+	case DMA_PSC2_RX:
-+		if (used_reqs[28] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC28(3))
-+			    | MCF_DMA_IMCR_SRC28_PSC2RX;
-+			used_reqs[28] = DMA_PSC2_RX;
-+		} else		/* No empty slots */
-+			return 1;
-+		break;
-+
-+	case DMA_PSC2_TX:
-+		if (used_reqs[29] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC29(3))
-+			    | MCF_DMA_IMCR_SRC29_PSC2TX;
-+			used_reqs[29] = DMA_PSC2_TX;
-+		} else		/* No empty slots */
-+			return 1;
-+		break;
-+
-+	case DMA_PSC3_RX:
-+		if (used_reqs[30] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC30(3))
-+			    | MCF_DMA_IMCR_SRC30_PSC3RX;
-+			used_reqs[30] = DMA_PSC3_RX;
-+		} else		/* No empty slots */
-+			return 1;
-+		break;
-+
-+	case DMA_PSC3_TX:
-+		if (used_reqs[31] == 0) {
-+			MCF_DMA_IMCR = (MCF_DMA_IMCR & ~MCF_DMA_IMCR_SRC31(3))
-+			    | MCF_DMA_IMCR_SRC31_PSC3TX;
-+			used_reqs[31] = DMA_PSC3_TX;
-+		} else		/* No empty slots */
-+			return 1;
-+		break;
-+
-+	default:
-+		return 1;
-+	}
-+	return 0;
-+}
-+
-+/**
-+ * dma_get_initiator - get the initiator for the given requestor
-+ * @requestor: initiator identifier
-+ *
-+ * Returns initiator number (0-31) if assigned or just 0
-+ */
-+unsigned int dma_get_initiator(int requestor)
-+{
-+	u32 i;
-+
-+	for (i = 0; i < sizeof(used_reqs); ++i) {
-+		if (used_reqs[i] == requestor)
-+			return i;
-+	}
-+	return 0;
-+}
-+
-+/**
-+ * dma_remove_initiator - remove the given initiator from active list
-+ * @requestor: requestor to remove
-+ */
-+void dma_remove_initiator(int requestor)
-+{
-+	u32 i;
-+
-+	for (i = 0; i < sizeof(used_reqs); ++i) {
-+		if (used_reqs[i] == requestor) {
-+			used_reqs[i] = -1;
-+			break;
-+		}
-+	}
-+}
-+
-+/**
-+ * dma_set_channel_fec: find available channel for fec and mark
-+ * @requestor: initiator/requestor identifier
-+ *
-+ * Returns first avaialble channel (0-5) or -1 if all occupied
-+ */
-+int dma_set_channel_fec(int requestor)
-+{
-+	u32 i, t;
-+
-+#ifdef CONFIG_FEC_548x_ENABLE_FEC2
-+	t = 4;
-+#else
-+	t = 2;
-+#endif
-+
-+	for (i = 0; i < t ; ++i) {
-+		if (used_channel[i] == -1) {
-+			used_channel[i] = requestor;
-+			return i;
-+		}
-+	}
-+	/* All channels taken */
-+	return -1;
-+}
-+
-+/**
-+ * dma_set_channel - find an available channel and mark as used
-+ * @requestor: initiator/requestor identifier
-+ *
-+ * Returns first available channel (6-15) or -1 if all occupied
-+ */
-+int dma_set_channel(int requestor)
-+{
-+	u32 i;
-+#ifdef CONFIG_NET_FEC2
-+	i = 4;
-+#else
-+	i = 2;
-+#endif
-+
-+	for (; i < 16; ++i)
-+		if (used_channel[i] == -1) {
-+			used_channel[i] = requestor;
-+			return i;
-+		}
-+
-+	/* All channels taken */
-+	return -1;
-+}
-+
-+/**
-+ * dma_get_channel - get the channel being initiated by the requestor
-+ * @requestor: initiator/requestor identifier
-+ *
-+ * Returns Initiator for requestor or -1 if not found
-+ */
-+int dma_get_channel(int requestor)
-+{
-+	u32 i;
-+
-+	for (i = 0; i < sizeof(used_channel); ++i) {
-+		if (used_channel[i] == requestor)
-+			return i;
-+	}
-+	return -1;
-+}
-+
-+/**
-+ * dma_connect - connect a channel with reference on data
-+ * @channel: channel number
-+ * @address: reference address of data
-+ *
-+ * Returns 0 if success or -1 if invalid channel
-+ */
-+int dma_connect(int channel, int address)
-+{
-+	if ((channel < 16) && (channel >= 0)) {
-+		connected_channel[channel] = address;
-+		return 0;
-+	}
-+	return -1;
-+}
-+
-+/**
-+ * dma_disconnect - disconnect a channel
-+ * @channel: channel number
-+ *
-+ * Returns 0 if success or -1 if invalid channel
-+ */
-+int dma_disconnect(int channel)
-+{
-+	if ((channel < 16) && (channel >= 0)) {
-+		connected_channel[channel] = 0;
-+		return 0;
-+	}
-+	return -1;
-+}
-+
-+/**
-+ * dma_remove_channel - remove channel from the active list
-+ * @requestor: initiator/requestor identifier
-+ */
-+void dma_remove_channel(int requestor)
-+{
-+	u32 i;
-+
-+	for (i = 0; i < sizeof(used_channel); ++i) {
-+		if (used_channel[i] == requestor) {
-+			used_channel[i] = -1;
-+			break;
-+		}
-+	}
-+}
-+
-+/**
-+ * dma_interrupt_handler - dma interrupt handler
-+ * @irq: interrupt number
-+ * @dev_id: data
-+ *
-+ * Returns IRQ_HANDLED
-+ */
-+irqreturn_t dma_interrupt_handler(int irq, void *dev_id)
-+{
-+	u32 i, interrupts;
-+
-+	/*
-+	 * Determine which interrupt(s) triggered by AND'ing the
-+	 * pending interrupts with those that aren't masked.
-+	 */
-+	interrupts = MCF_DMA_DIPR;
-+	MCF_DMA_DIPR |= interrupts;
-+
-+	for (i = 0; i < 16; ++i, interrupts >>= 1) {
-+		if (interrupts & 0x1)
-+			if (connected_channel[i] != 0)
-+				((void (*)(void)) (connected_channel[i])) ();
-+	}
-+
-+	return IRQ_HANDLED;
-+}
-+
-+/**
-+ * dma_remove_channel_by_number - clear dma channel
-+ * @channel: channel number to clear
-+ */
-+void dma_remove_channel_by_number(int channel)
-+{
-+	if ((channel < sizeof(used_channel)) && (channel >= 0))
-+		used_channel[channel] = -1;
-+}
-+
-+/**
-+ * dma_init - initialize the dma subsystem
-+ *
-+ * Returns 0 if success non-zero if failure
-+ *
-+ * Handles the DMA initialization during device setup.
-+ */
-+int __devinit dma_init()
-+{
-+	int result;
-+	char *dma_version_str;
-+
-+	MCD_getVersion(&dma_version_str);
-+	printk(KERN_INFO "m547x_8x DMA: Initialize %s\n", dma_version_str);
-+
-+	/* attempt to setup dma interrupt handler */
-+	if (request_irq(64 + ISC_DMA, dma_interrupt_handler, IRQF_DISABLED,
-+			"MCD-DMA", NULL)) {
-+		printk(KERN_ERR "MCD-DMA: Cannot allocate the DMA IRQ(48)\n");
-+		return 1;
-+	}
-+
-+	MCF_DMA_DIMR = 0;
-+	MCF_DMA_DIPR = 0xFFFFFFFF;
-+
-+	MCF_ICR(ISC_DMA) = ILP_DMA;
-+
-+	result = MCD_initDma((dmaRegs *) (MCF_MBAR + 0x8000),
-+			(void *) SYS_SRAM_DMA_START, MCD_RELOC_TASKS);
-+	if (result != MCD_OK) {
-+		printk(KERN_ERR "MCD-DMA: Cannot perform DMA initialization\n");
-+		free_irq(64 + ISC_DMA, NULL);
-+		return 1;
-+	}
-+
-+	return 0;
-+}
-+device_initcall(dma_init);
---- a/drivers/dma/MCD_dma.h
-+++ b/drivers/dma/MCD_dma.h
-@@ -1,45 +1,27 @@
--/*********************************************************************
-- *
-- * Copyright (C) 2004  Motorola, Inc.
-- *  MOTOROLA, INC. All Rights Reserved.
-- *  You are hereby granted a copyright license to use
-- *  the SOFTWARE so long as this entire notice is
-- *  retained without alteration in any modified and/or redistributed
-- *  versions, and that such modified versions are clearly identified
-- *  as such. No licenses are granted by implication, estoppel or
-- *  otherwise under any patents or trademarks of Motorola, Inc. This
-- *  software is provided on an "AS IS" basis and without warranty.
-+/*
-+ * drivers/dma/MCD_dma.h
-  *
-- *  To the maximum extent permitted by applicable law, MOTOROLA
-- *  DISCLAIMS ALL WARRANTIES WHETHER EXPRESS OR IMPLIED, INCLUDING
-- *  IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-- *  PURPOSE AND ANY WARRANTY AGAINST INFRINGEMENT WITH REGARD TO THE
-- *  SOFTWARE (INCLUDING ANY MODIFIED VERSIONS THEREOF) AND ANY
-- *  ACCOMPANYING WRITTEN MATERIALS.
-+ * Copyright (C) 2004-2008 Freescale Semiconductor, Inc.
-+ *     Kurt Mahan <kmahan@freescale.com>
-  *
-- *  To the maximum extent permitted by applicable law, IN NO EVENT
-- *  SHALL MOTOROLA BE LIABLE FOR ANY DAMAGES WHATSOEVER (INCLUDING
-- *  WITHOUT LIMITATION, DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS
-- *  INTERRUPTION, LOSS OF BUSINESS INFORMATION, OR OTHER PECUNIARY
-- *  LOSS) ARISING OF THE USE OR INABILITY TO USE THE SOFTWARE.
-+ * 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.
-  *
-- *  Motorola assumes no responsibility for the maintenance and support
-- *  of this software
-- ********************************************************************/
--
--/*
-- * File:        MCD_dma.h
-- * Purpose:     Main header file for multi-channel DMA API.
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-  *
-- * Notes:
-- *
-- * Modifications:
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-  */
- #ifndef _MCD_API_H
- #define _MCD_API_H
- 
--#include <asm/types.h>
--
- /*
-  * Turn Execution Unit tasks ON (#define) or OFF (#undef)
-  */
-@@ -79,26 +61,13 @@
- /*
-  * Portability typedefs
-  */
-- /*
--#ifndef s32
- typedef int s32;
--#endif
--#ifndef u32
- typedef unsigned int u32;
--#endif
--#ifndef s16
- typedef short s16;
--#endif
--#ifndef u16
- typedef unsigned short u16;
--#endif
--#ifndef s8
- typedef char s8;
--#endif
--#ifndef u8
- typedef unsigned char u8;
--#endif
--*/
-+
- /*
-  * These structures represent the internal registers of the
-  * multi-channel DMA
-@@ -233,6 +202,7 @@ typedef volatile struct dmaRegs_s dmaReg
- #define MCD_TT_FLAGS_RL   0x00000001 /* Read line */
- #define MCD_TT_FLAGS_CW   0x00000002 /* Combine Writes */
- #define MCD_TT_FLAGS_SP   0x00000004 /* Speculative prefetch(XLB) MCF547x/548x ONLY  */
-+#define MCD_TT_FLAGS_PI   0x00000040 /* Precise Increment */
- #define MCD_TT_FLAGS_MASK 0x000000ff
- #define MCD_TT_FLAGS_DEF  (MCD_TT_FLAGS_RL | MCD_TT_FLAGS_CW)
- 
---- a/drivers/dma/MCD_dmaApi.c
-+++ b/drivers/dma/MCD_dmaApi.c
-@@ -1,46 +1,26 @@
--/*********************************************************************
-- *
-- * Copyright (C) 2004  Motorola, Inc.
-- *  MOTOROLA, INC. All Rights Reserved.
-- *  You are hereby granted a copyright license to use
-- *  the SOFTWARE so long as this entire notice is
-- *  retained without alteration in any modified and/or redistributed
-- *  versions, and that such modified versions are clearly identified
-- *  as such. No licenses are granted by implication, estoppel or
-- *  otherwise under any patents or trademarks of Motorola, Inc. This
-- *  software is provided on an "AS IS" basis and without warranty.
-- *
-- *  To the maximum extent permitted by applicable law, MOTOROLA
-- *  DISCLAIMS ALL WARRANTIES WHETHER EXPRESS OR IMPLIED, INCLUDING
-- *  IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-- *  PURPOSE AND ANY WARRANTY AGAINST INFRINGEMENT WITH REGARD TO THE
-- *  SOFTWARE (INCLUDING ANY MODIFIED VERSIONS THEREOF) AND ANY
-- *  ACCOMPANYING WRITTEN MATERIALS.
-- *
-- *  To the maximum extent permitted by applicable law, IN NO EVENT
-- *  SHALL MOTOROLA BE LIABLE FOR ANY DAMAGES WHATSOEVER (INCLUDING
-- *  WITHOUT LIMITATION, DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS
-- *  INTERRUPTION, LOSS OF BUSINESS INFORMATION, OR OTHER PECUNIARY
-- *  LOSS) ARISING OF THE USE OR INABILITY TO USE THE SOFTWARE.
-- *
-- *  Motorola assumes no responsibility for the maintenance and support
-- *  of this software
-- ********************************************************************/
--
- /*
-- * File:        MCD_dmaApi.c
-- * Purpose:     Main C file for multi-channel DMA API.
-- *
-- * Notes:
-+ * drivers/dma/MCD_dmaApi.c
-  *
-+ * Copyright (C) 2004-2008 Freescale Semiconductor, Inc.
-+ *     Kurt Mahan <kmahan@freescale.com>
-  *
-- * Modifications:
-+ * 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.
-  *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-  *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-  */
--#include <asm/types.h>
--#include <asm/MCD_dma.h>
--#include <asm/virtconvert.h>
-+
-+#include "MCD_dma.h"
- #include "MCD_tasksInit.h"
- #include "MCD_progCheck.h"
- 
-@@ -148,7 +128,6 @@ MCD_bufDesc *MCD_relocBuffDesc;
- 
- /*
-  * Structure to remember which variant is on which channel
-- * TBD- need this?
-  */
- typedef struct MCD_remVariants_struct MCD_remVariant;
- struct MCD_remVariants_struct
-@@ -164,6 +143,7 @@ struct MCD_remVariants_struct
-  * Structure to remember the startDma parameters for each channel
-  */
- MCD_remVariant MCD_remVariants;
-+
- /********************************************************************/
- /*
-  * Function: MCD_initDma
-@@ -185,15 +165,14 @@ int MCD_initDma (dmaRegs *dmaBarAddr, vo
-     int i;
-     TaskTableEntry *entryPtr;
- 
--    /* setup the local pointer to register set */
-+    /* Setup the local pointer to register set */
-     MCD_dmaBar = dmaBarAddr;
- 
--    /* do we need to move/create a task table */
-+    /* Do we need to move/create a task table */
-     if ((flags & MCD_RELOC_TASKS) != 0)
-     {
-         int fixedSize;
-         u32 *fixedPtr;
--        /*int *tablePtr = taskTableDest;TBD*/
-         int varTabsOffset, funcDescTabsOffset, contextSavesOffset;
-         int taskDescTabsOffset;
-         int taskTableSize, varTabsSize, funcDescTabsSize, contextSavesSize;
-@@ -201,7 +180,7 @@ int MCD_initDma (dmaRegs *dmaBarAddr, vo
- 
-         int i;
- 
--        /* check if physical address is aligned on 512 byte boundary */
-+        /* Check if physical address is aligned on 512 byte boundary */
-         if (((u32)taskTableDest & 0x000001ff) != 0)
-             return(MCD_TABLE_UNALIGNED);
- 
-@@ -215,13 +194,12 @@ int MCD_initDma (dmaRegs *dmaBarAddr, vo
-          * - copy over model task table with the the actual task descriptor
-          *   tables
-          */
--
-         taskTableSize = NCHANNELS * sizeof(TaskTableEntry);
--        /* align variable tables to size */
-+        /* Align variable tables to size */
-         varTabsOffset = taskTableSize + (u32)taskTableDest;
-         if ((varTabsOffset & (VAR_TAB_SIZE - 1)) != 0)
-             varTabsOffset = (varTabsOffset + VAR_TAB_SIZE) & (~VAR_TAB_SIZE);
--        /* align function descriptor tables */
-+        /* Align function descriptor tables */
-         varTabsSize = NCHANNELS * VAR_TAB_SIZE;
-         funcDescTabsOffset = varTabsOffset + varTabsSize;
- 
-@@ -235,13 +213,13 @@ int MCD_initDma (dmaRegs *dmaBarAddr, vo
-         fixedSize = taskTableSize + varTabsSize + funcDescTabsSize +
-                     contextSavesSize;
- 
--        /* zero the thing out */
-+        /* Zero the thing out */
-         fixedPtr = (u32 *)taskTableDest;
-         for (i = 0;i<(fixedSize/4);i++)
-             fixedPtr[i] = 0;
- 
-         entryPtr = (TaskTableEntry*)MCD_taskTable;
--        /* set up fixed pointers */
-+        /* Set up fixed pointers */
-         for (i = 0; i < NCHANNELS; i++)
-         {
-             entryPtr[i].varTab = (u32)varTabsOffset; /* update ptr to local value */
-@@ -253,25 +231,25 @@ int MCD_initDma (dmaRegs *dmaBarAddr, vo
- #endif
-             contextSavesOffset += CONTEXT_SAVE_SIZE;
-         }
--        /* copy over the function descriptor table */
-+        /* Copy over the function descriptor table */
-         for ( i = 0; i < FUNCDESC_TAB_NUM; i++)
-         {
-             MCD_memcpy((void*)(entryPtr[i].FDTandFlags & ~MCD_TT_FLAGS_MASK),
-                        (void*)MCD_funcDescTab0, FUNCDESC_TAB_SIZE);
-         }
- 
--        /* copy model task table to where the context saves stuff leaves off*/
-+        /* Copy model task table to where the context save stuff leaves off */
-         MCD_modelTaskTable = (TaskTableEntry*)contextSavesOffset;
- 
-         MCD_memcpy ((void*)MCD_modelTaskTable, (void*)MCD_modelTaskTableSrc,
-                     NUMOFVARIANTS * sizeof(TaskTableEntry));
- 
--        entryPtr = MCD_modelTaskTable; /* point to local version of
--                                                            model task table */
-+        /* Point to local version of model task table */
-+        entryPtr = MCD_modelTaskTable;
-         taskDescTabsOffset = (u32)MCD_modelTaskTable +
-                             (NUMOFVARIANTS * sizeof(TaskTableEntry));
- 
--        /* copy actual task code and update TDT ptrs in local model task table */
-+        /* Copy actual task code and update TDT ptrs in local model task table */
-         for (i = 0; i < NUMOFVARIANTS; i++)
-         {
-             taskDescTabSize = entryPtr[i].TDTend - entryPtr[i].TDTstart + 4;
-@@ -280,25 +258,29 @@ int MCD_initDma (dmaRegs *dmaBarAddr, vo
-             taskDescTabsOffset += taskDescTabSize;
-             entryPtr[i].TDTend = (u32)taskDescTabsOffset - 4;
-         }
--#ifdef MCD_INCLUDE_EU /* Tack single DMA BDs onto end of code so API controls
--                         where they are since DMA might write to them */        
-+#ifdef MCD_INCLUDE_EU 
-+        /* 
-+         * Tack single DMA BDs onto end of code so API controls where
-+         * they are since DMA might write to them 
-+         */
-         MCD_relocBuffDesc = (MCD_bufDesc*)(entryPtr[NUMOFVARIANTS - 1].TDTend + 4);
--#else /* DMA does not touch them so they can be wherever and we don't need to 
--         waste SRAM on them */
-+#else 
-+        /* 
-+         * DMA does not touch them so they can be wherever and we don't need to
-+         * waste SRAM on them 
-+         */
-         MCD_relocBuffDesc = MCD_singleBufDescs;
- #endif
-     }
-     else
-     {
--        /* point the would-be relocated task tables and the
--        buffer descriptors to the ones the linker generated */
--
-+        /* 
-+         * Point the would-be relocated task tables and the buffer descriptors
-+         * to the ones the linker generated
-+         */
-         if (((u32)MCD_realTaskTableSrc & 0x000001ff) != 0)
-             return(MCD_TABLE_UNALIGNED);
- 
--        /* need to add code to make sure that every thing else is aligned properly TBD*/
--        /* this is problematic if we init more than once or after running tasks,
--            need to add variable to see if we have aleady init'd */
-         entryPtr = MCD_realTaskTableSrc;
-         for (i = 0; i < NCHANNELS; i++)
-         {
-@@ -312,9 +294,7 @@ int MCD_initDma (dmaRegs *dmaBarAddr, vo
-         MCD_relocBuffDesc = MCD_singleBufDescs;
-     }
- 
--
--    /* Make all channels as totally inactive, and remember them as such: */
--
-+    /* Make all channels inactive, and remember them as such: */
-     MCD_dmaBar->taskbar = (u32) MCD_taskTable;
-     for (i = 0;  i < NCHANNELS;  i++)
-     {
-@@ -323,13 +303,12 @@ int MCD_initDma (dmaRegs *dmaBarAddr, vo
-     }
- 
-    /* Set up pausing mechanism to inactive state: */
--    MCD_dmaBar->debugComp1 = 0;  /* no particular values yet for either comparator registers */
-+    MCD_dmaBar->debugComp1 = 0;
-     MCD_dmaBar->debugComp2 = 0;
-     MCD_dmaBar->debugControl = DBG_CTL_DISABLE;
-     MCD_dmaBar->debugStatus = DBG_KILL_ALL_STAT;
- 
--    /* enable or disable commbus prefetch, really need an ifdef or
--       something to keep from trying to set this in the 8220 */
-+    /* Enable or disable commbus prefetch */
-     if ((flags & MCD_COMM_PREFETCH_EN) != 0)
-         MCD_dmaBar->ptdControl &= ~PTD_CTL_COMM_PREFETCH;
-     else
-@@ -354,8 +333,7 @@ int MCD_dmaStatus (int channel)
- 
-     tcrValue = MCD_dmaBar->taskControl[channel];
-     if ((tcrValue & TASK_CTL_EN) == 0)
--    {  /* nothing running */
--        /* if last reported with task enabled */
-+    {   /* Nothing running if last reported with task enabled */
-         if (   MCD_chStatus[channel] == MCD_RUNNING
-             || MCD_chStatus[channel] == MCD_IDLE)
-             MCD_chStatus[channel] = MCD_DONE;
-@@ -367,13 +345,12 @@ int MCD_dmaStatus (int channel)
-             || MCD_chStatus[channel] == MCD_IDLE)
-         {
-             MCD_dmaBar->ptdDebug = PTD_DBG_TSK_VLD_INIT;
--            /* This register is selected to know which initiator is
--            actually asserted. */
-+            /* Determine which initiator is asserted. */
-             if ((MCD_dmaBar->ptdDebug >> channel ) & 0x1 )
-                 MCD_chStatus[channel] = MCD_RUNNING;
-             else
-                 MCD_chStatus[channel] = MCD_IDLE;
--        /* do not change the status if it is already paused. */
-+            /* Do not change the status if it is already paused */
-         }
-     }
-     return MCD_chStatus[channel];
-@@ -414,67 +391,86 @@ int MCD_startDma (
- 
-     if((channel < 0) || (channel >= NCHANNELS))
-         return(MCD_CHANNEL_INVALID);
--        
--    /* tbd - need to determine the proper response to a bad funcDesc when not 
--       including EU functions, for now, assign a benign funcDesc, but maybe
--       should return an error */
-+
- #ifndef MCD_INCLUDE_EU
-     funcDesc = MCD_FUNC_NOEU1;
- #endif
--        
-+
- #ifdef MCD_DEBUG
- printf("startDma:Setting up params\n");
- #endif
--   /* Set us up for task-wise priority.  We don't technically need to do this on every start, but
--      since the register involved is in the same longword as other registers that users are in control
--      of, setting it more than once is probably preferable.  That since the documentation doesn't seem
--      to be completely consistent about the nature of the PTD control register. */
-+
-+   /* Enable task-wise priority */
-     MCD_dmaBar->ptdControl |= (u16) 0x8000;
--#if 1 /* Not sure what we need to keep here rtm TBD */
-+
-     /* Calculate additional parameters to the regular DMA calls. */
-     srcRsdIncr = srcIncr < 0 ? -1 : (srcIncr > 0 ? 1 : 0);
-     destRsdIncr = destIncr < 0 ? -1 : (destIncr > 0 ? 1 : 0);
--
-     xferSizeIncr = (xferSize & 0xffff) | 0x20000000;
- 
--    /* Remember for each channel which variant is running. */
-+    /* Remember which variant is running for each channel */
-     MCD_remVariants.remSrcRsdIncr[channel] = srcRsdIncr;
-     MCD_remVariants.remDestRsdIncr[channel] = destRsdIncr;
-     MCD_remVariants.remDestIncr[channel] = destIncr;
-     MCD_remVariants.remSrcIncr[channel] = srcIncr;
-     MCD_remVariants.remXferSize[channel] = xferSize;
--#endif
- 
--    cSave = (int*)(MCD_taskTable[channel].contextSaveSpace) + CSAVE_OFFSET + CURRBD;
-+    cSave = (int*)(MCD_taskTable[channel].contextSaveSpace) 
-+            + CSAVE_OFFSET 
-+            + CURRBD;
- 
--#ifdef MCD_INCLUDE_EU /* may move this to EU specific calls */
-+#ifdef MCD_INCLUDE_EU
-     realFuncArray = (u32 *) (MCD_taskTable[channel].FDTandFlags & 0xffffff00);
--    /* Modify the LURC's normal and byte-residue-loop functions according to parameter. */
--    realFuncArray[(LURC*16)] = xferSize == 4 ?
--                                 funcDesc : xferSize == 2 ?
--                                     funcDesc & 0xfffff00f : funcDesc & 0xffff000f;
--    realFuncArray[(LURC*16+1)] = (funcDesc & MCD_BYTE_SWAP_KILLER) | MCD_NO_BYTE_SWAP_ATALL;
--#endif
--   /* Write the initiator field in the TCR, and also set the initiator-hold
--      bit.  Note that,due to a hardware quirk, this could collide with an
--      MDE access to the initiator-register file, so we have to verify that the write
--      reads back correctly. */
- 
--    MCD_dmaBar->taskControl[channel] =
--        (initiator << 8) | TASK_CTL_HIPRITSKEN | TASK_CTL_HLDINITNUM;
-+    /* 
-+     * Modify the LURC's normal and byte-residue-loop functions 
-+     * according to parameter. 
-+     */
-+    switch (xferSize)
-+    {
-+        case 4:
-+            realFuncArray[(LURC*16)] = funcDesc;
-+            break;
-+        case 2:
-+            realFuncArray[(LURC*16)] = funcDesc & 0xfffff00f;
-+            break;
-+        case 1:
-+        default:
-+            realFuncArray[(LURC*16)] = funcDesc & 0xffff000f;
-+            break;
-+    }
- 
-+    realFuncArray[(LURC*16+1)] = 0
-+        | (funcDesc & MCD_BYTE_SWAP_KILLER) 
-+        | MCD_NO_BYTE_SWAP_ATALL;
-+#endif
-+
-+   /* Write the initiator field in the TCR and set the initiator-hold bit*/
-+    MCD_dmaBar->taskControl[channel] = 0
-+        | (initiator << 8)
-+        | TASK_CTL_HIPRITSKEN
-+        | TASK_CTL_HLDINITNUM;
-+
-+    /* 
-+     * Current versions of the MPC8220 MCD have a hardware quirk that could
-+     * cause the write to the TCR to collide with an MDE access to the 
-+     * initiator-register file, so we have to verify that the write occurred
-+     * correctly by reading back the value.  On MCF547x/8x devices and any
-+     * future revisions of the MPC8220, this loop will not be entered.
-+     */
-     while(((MCD_dmaBar->taskControl[channel] & 0x1fff) !=
-           ((initiator << 8) | TASK_CTL_HIPRITSKEN | TASK_CTL_HLDINITNUM)) &&
-             (tcrCount < 1000))
-     {
-         tcrCount++;
--        /*MCD_dmaBar->ptd_tcr[channel] = (initiator << 8) | 0x0020;*/
--        MCD_dmaBar->taskControl[channel] =
--            (initiator << 8) | TASK_CTL_HIPRITSKEN | TASK_CTL_HLDINITNUM;
-+        MCD_dmaBar->taskControl[channel] = 0
-+            | (initiator << 8)
-+            | TASK_CTL_HIPRITSKEN
-+            | TASK_CTL_HLDINITNUM;
-     }
- 
-     MCD_dmaBar->priority[channel] = (u8)priority & PRIORITY_PRI_MASK;
--    /* should be albe to handle this stuff with only one write to ts reg - tbd */
-+
-     if (channel < 8 && channel >= 0)
-     {
-         MCD_dmaBar->taskSize0 &= ~(0xf << (7-channel)*4);
-@@ -488,7 +484,7 @@ printf("startDma:Setting up params\n");
-         MCD_dmaBar->taskSize1 |= (xferSize & 3) << ((15 - channel)*4);
-     }
- 
--    /* setup task table flags/options which mostly control the line buffers */
-+    /* Setup task table flags/options */
-     MCD_taskTable[channel].FDTandFlags &= ~MCD_TT_FLAGS_MASK;
-     MCD_taskTable[channel].FDTandFlags |= (MCD_TT_FLAGS_MASK & flags);
- 
-@@ -508,79 +504,86 @@ printf("startDma:Setting up params\n");
-     }
-     else if(flags & MCD_SINGLE_DMA)
-     {
--        /* this buffer descriptor is used for storing off initial parameters for later
--           progress query calculation and for the DMA to write the resulting checksum
--           The DMA does not use this to determine how to operate, that info is passed
--           with the init routine*/
-+        /* 
-+         * This buffer descriptor is used for storing off initial parameters 
-+         * for later progress query calculation and for the DMA to write the 
-+         * resulting checksum. The DMA does not use this to determine how to 
-+         * operate, that info is passed with the init routine
-+         */
-         MCD_relocBuffDesc[channel].srcAddr = srcAddr;
-         MCD_relocBuffDesc[channel].destAddr = destAddr;
--        MCD_relocBuffDesc[channel].lastDestAddr = destAddr;  /* definitely not its final value */
-+        MCD_relocBuffDesc[channel].lastDestAddr = destAddr;
-         MCD_relocBuffDesc[channel].dmaSize = dmaSize;
-         MCD_relocBuffDesc[channel].flags = 0;       /* not used */
-         MCD_relocBuffDesc[channel].csumResult = 0;  /* not used */
-         MCD_relocBuffDesc[channel].next = 0;        /* not used */
- 
-         /* Initialize the progress-querying stuff to show no progress:*/
--        ((volatile int *)MCD_taskTable[channel].contextSaveSpace)[SRCPTR + CSAVE_OFFSET] = (int)srcAddr;
--        ((volatile int *)MCD_taskTable[channel].contextSaveSpace)[DESTPTR + CSAVE_OFFSET] = (int)destAddr;
--        ((volatile int *)MCD_taskTable[channel].contextSaveSpace)[DCOUNT + CSAVE_OFFSET] = 0;
--        ((volatile int *)MCD_taskTable[channel].contextSaveSpace)[CURRBD + CSAVE_OFFSET] =
--                                             (u32) &(MCD_relocBuffDesc[channel]);
--        /* tbd - need to keep the user from trying to call the EU routine
--           when MCD_INCLUDE_EU is not defined */
-+        ((volatile int *)MCD_taskTable[channel].contextSaveSpace)[SRCPTR + CSAVE_OFFSET] 
-+            = (int)srcAddr;
-+        ((volatile int *)MCD_taskTable[channel].contextSaveSpace)[DESTPTR + CSAVE_OFFSET] 
-+            = (int)destAddr;
-+        ((volatile int *)MCD_taskTable[channel].contextSaveSpace)[DCOUNT + CSAVE_OFFSET] 
-+            = 0;
-+        ((volatile int *)MCD_taskTable[channel].contextSaveSpace)[CURRBD + CSAVE_OFFSET] 
-+            = (u32) &(MCD_relocBuffDesc[channel]);
-+
-         if( funcDesc == MCD_FUNC_NOEU1 || funcDesc == MCD_FUNC_NOEU2)
-         {
--           /* TDTStart and TDTEnd */
--           MCD_taskTable[channel].TDTstart = MCD_modelTaskTable[TASK_SINGLENOEU].TDTstart;
--           MCD_taskTable[channel].TDTend = MCD_modelTaskTable[TASK_SINGLENOEU].TDTend;
--           MCD_startDmaSingleNoEu(srcAddr, srcIncr, destAddr, destIncr, dmaSize, dmaSize,
--                                xferSizeIncr, flags, (int *)&(MCD_relocBuffDesc[channel]), cSave,
--                                MCD_taskTable, channel);
-+            /* TDTStart and TDTEnd */
-+            MCD_taskTable[channel].TDTstart = MCD_modelTaskTable[TASK_SINGLENOEU].TDTstart;
-+            MCD_taskTable[channel].TDTend = MCD_modelTaskTable[TASK_SINGLENOEU].TDTend;
-+            MCD_startDmaSingleNoEu(srcAddr, srcIncr, destAddr, destIncr, dmaSize,
-+                                xferSizeIncr, flags, (int *)&(MCD_relocBuffDesc[channel]), 
-+                                cSave, MCD_taskTable, channel);
-         }
-         else
-         {
--           /* TDTStart and TDTEnd */
--           MCD_taskTable[channel].TDTstart = MCD_modelTaskTable[TASK_SINGLEEU].TDTstart;
--           MCD_taskTable[channel].TDTend = MCD_modelTaskTable[TASK_SINGLEEU].TDTend;
--           MCD_startDmaSingleEu(srcAddr, srcIncr, destAddr, destIncr, dmaSize, dmaSize,
--                              xferSizeIncr, flags, (int *)&(MCD_relocBuffDesc[channel]), cSave,
--                              MCD_taskTable, channel);
-+            /* TDTStart and TDTEnd */
-+            MCD_taskTable[channel].TDTstart = MCD_modelTaskTable[TASK_SINGLEEU].TDTstart;
-+            MCD_taskTable[channel].TDTend = MCD_modelTaskTable[TASK_SINGLEEU].TDTend;
-+            MCD_startDmaSingleEu(srcAddr, srcIncr, destAddr, destIncr, dmaSize,
-+                                xferSizeIncr, flags, (int *)&(MCD_relocBuffDesc[channel]), 
-+                                cSave, MCD_taskTable, channel);
-         }
-     }
--    else
--    { /* chained DMAS */
-+    else /* Chained DMA */
-+    {
-         /* Initialize the progress-querying stuff to show no progress:*/
- #if 1 /* (!defined(MCD_NEED_ADDR_TRANS)) */
-         ((volatile int *)MCD_taskTable[channel].contextSaveSpace)[SRCPTR + CSAVE_OFFSET]
--          = (int)((MCD_bufDesc*) phys_to_virt(srcAddr))->srcAddr;
-+            = (int)((MCD_bufDesc*) srcAddr)->srcAddr;
-         ((volatile int *)MCD_taskTable[channel].contextSaveSpace)[DESTPTR + CSAVE_OFFSET]
--          = (int)((MCD_bufDesc*) phys_to_virt(srcAddr))->destAddr;
-+            = (int)((MCD_bufDesc*) srcAddr)->destAddr;
- #else /* if using address translation, need the virtual addr of the first buffdesc */
-         ((volatile int *)MCD_taskTable[channel].contextSaveSpace)[SRCPTR + CSAVE_OFFSET]
-           = (int)((MCD_bufDesc*) srcAddrVirt)->srcAddr;
-         ((volatile int *)MCD_taskTable[channel].contextSaveSpace)[DESTPTR + CSAVE_OFFSET]
-           = (int)((MCD_bufDesc*) srcAddrVirt)->destAddr;
- #endif
--        ((volatile int *)MCD_taskTable[channel].contextSaveSpace)[DCOUNT + CSAVE_OFFSET] = 0;
--        ((volatile int *)MCD_taskTable[channel].contextSaveSpace)[CURRBD + CSAVE_OFFSET] = (u32) srcAddr;
-+        ((volatile int *)MCD_taskTable[channel].contextSaveSpace)[DCOUNT + CSAVE_OFFSET] 
-+          = 0;
-+        ((volatile int *)MCD_taskTable[channel].contextSaveSpace)[CURRBD + CSAVE_OFFSET] 
-+          = (u32) srcAddr;
- 
-         if( funcDesc == MCD_FUNC_NOEU1 || funcDesc == MCD_FUNC_NOEU2)
-         {
--          /*TDTStart and TDTEnd*/
--          MCD_taskTable[channel].TDTstart = MCD_modelTaskTable[TASK_CHAINNOEU].TDTstart;
--          MCD_taskTable[channel].TDTend = MCD_modelTaskTable[TASK_CHAINNOEU].TDTend;
--          MCD_startDmaChainNoEu((int *)srcAddr, srcIncr, destIncr, xferSize,
-+            /* TDTStart and TDTEnd */
-+            MCD_taskTable[channel].TDTstart = MCD_modelTaskTable[TASK_CHAINNOEU].TDTstart;
-+            MCD_taskTable[channel].TDTend = MCD_modelTaskTable[TASK_CHAINNOEU].TDTend;
-+            MCD_startDmaChainNoEu((int *)srcAddr, srcIncr, destIncr, xferSize,
-                                     xferSizeIncr, cSave, MCD_taskTable, channel);
-         }
-         else
-         {
--          /*TDTStart and TDTEnd*/
--          MCD_taskTable[channel].TDTstart = MCD_modelTaskTable[TASK_CHAINEU].TDTstart;
--          MCD_taskTable[channel].TDTend = MCD_modelTaskTable[TASK_CHAINEU].TDTend;
--          MCD_startDmaChainEu((int *)srcAddr, srcIncr, destIncr, xferSize,
-+            /* TDTStart and TDTEnd */
-+            MCD_taskTable[channel].TDTstart = MCD_modelTaskTable[TASK_CHAINEU].TDTstart;
-+            MCD_taskTable[channel].TDTend = MCD_modelTaskTable[TASK_CHAINEU].TDTend;
-+            MCD_startDmaChainEu((int *)srcAddr, srcIncr, destIncr, xferSize,
-                                  xferSizeIncr, cSave, MCD_taskTable, channel);
-         }
-     }
-+
-     MCD_chStatus[channel] = MCD_IDLE;
-     return(MCD_OK);
- }
-@@ -597,7 +600,7 @@ printf("startDma:Setting up params\n");
-  * Notes:
-  *  MCD_XferProgrQuery() upon completing or after aborting a DMA, or
-  *  while the DMA is in progress, this function returns the first
-- *  DMA-destination address not (or not yet) used in the DMA. When 
-+ *  DMA-destination address not (or not yet) used in the DMA. When
-  *  encountering a non-ready buffer descriptor, the information for
-  *  the last completed descriptor is returned.
-  *
-@@ -642,11 +645,13 @@ int MCD_XferProgrQuery (int channel, MCD
-     prevRep.dmaSize = ((volatile int*) MCD_taskTable[channel].contextSaveSpace)[DCOUNT + CSAVE_OFFSET];
-     prevRep.currBufDesc =
-           (MCD_bufDesc*) ((volatile int*) MCD_taskTable[channel].contextSaveSpace)[CURRBD + CSAVE_OFFSET];
-+
-     /* Repeatedly reread those values until they match previous values: */
-     do {
--        /* Waste a little bit of time to ensure stability: */
-+        /* Take a little bit of time to ensure stability: */
-         for (i = 0;  i < STABTIME;  i++)
--            i += i >> 2;  /* make sure this loop does something so that it doesn't get optimized out */
-+            i += i >> 2;  /* make sure this loop does something so that it 
-+                             doesn't get optimized out */
-         /* Check them again: */
-         progRep->lastSrcAddr =
-             (s8 *) ((volatile int*) MCD_taskTable[channel].contextSaveSpace)[SRCPTR + CSAVE_OFFSET];
-@@ -655,31 +660,33 @@ int MCD_XferProgrQuery (int channel, MCD
-         progRep->dmaSize = ((volatile int*) MCD_taskTable[channel].contextSaveSpace)[DCOUNT + CSAVE_OFFSET];
-         progRep->currBufDesc =
-             (MCD_bufDesc*) ((volatile int*) MCD_taskTable[channel].contextSaveSpace)[CURRBD + CSAVE_OFFSET];
--       /* See if they match: */
--       if (   prevRep.lastSrcAddr != progRep->lastSrcAddr
--           || prevRep.lastDestAddr != progRep->lastDestAddr
--           || prevRep.dmaSize != progRep->dmaSize
--           || prevRep.currBufDesc != progRep->currBufDesc)
--       {
--          /* If they don't match, remember previous values and try again:*/
--          prevRep.lastSrcAddr = progRep->lastSrcAddr;
--          prevRep.lastDestAddr = progRep->lastDestAddr;
--          prevRep.dmaSize = progRep->dmaSize;
--          prevRep.currBufDesc = progRep->currBufDesc;
--          again = MCD_TRUE;
--       }
--       else
-+
-+        /* See if they match: */
-+        if (   prevRep.lastSrcAddr  != progRep->lastSrcAddr
-+            || prevRep.lastDestAddr != progRep->lastDestAddr
-+            || prevRep.dmaSize      != progRep->dmaSize
-+            || prevRep.currBufDesc  != progRep->currBufDesc)
-+        {
-+            /* If they don't match, remember previous values and try again:*/
-+            prevRep.lastSrcAddr = progRep->lastSrcAddr;
-+            prevRep.lastDestAddr = progRep->lastDestAddr;
-+            prevRep.dmaSize = progRep->dmaSize;
-+            prevRep.currBufDesc = progRep->currBufDesc;
-+            again = MCD_TRUE;
-+        }
-+        else
-           again = MCD_FALSE;
-     } while (again == MCD_TRUE);
- 
- 
--    /* Update the dCount, srcAddr and destAddr */
--    /* To calculate dmaCount, we consider destination address. C
--       overs M1,P1,Z for destination */
--    switch(MCD_remVariants.remDestRsdIncr[channel]) {
-+    /* Update dmaSize and lastDestAddr */
-+    switch(MCD_remVariants.remDestRsdIncr[channel]) 
-+    {
-         case MINUS1:
--           subModVal = ((int)progRep->lastDestAddr) & ((MCD_remVariants.remXferSize[channel]) - 1);
--           addModVal = ((int)progRep->currBufDesc->destAddr) & ((MCD_remVariants.remXferSize[channel]) - 1);
-+           subModVal = ((int)progRep->lastDestAddr) 
-+                        & ((MCD_remVariants.remXferSize[channel]) - 1);
-+           addModVal = ((int)progRep->currBufDesc->destAddr) 
-+                        & ((MCD_remVariants.remXferSize[channel]) - 1);
-            LWAlignedInitDestAddr = (progRep->currBufDesc->destAddr) - addModVal;
-            LWAlignedCurrDestAddr = (progRep->lastDestAddr) - subModVal;
-            destDiffBytes = LWAlignedInitDestAddr - LWAlignedCurrDestAddr;
-@@ -692,25 +699,28 @@ int MCD_XferProgrQuery (int channel, MCD
-            progRep->lastDestAddr = progRep->currBufDesc->destAddr;
-            break;
-         case PLUS1:
--           /* This value has to be subtracted from the final calculated dCount. */
--           subModVal = ((int)progRep->currBufDesc->destAddr) & ((MCD_remVariants.remXferSize[channel]) - 1);
-+           /* This value has to be subtracted from the final calculated dmaSize. */
-+            subModVal = ((int)progRep->currBufDesc->destAddr) 
-+                        & ((MCD_remVariants.remXferSize[channel]) - 1);
-            /* These bytes are already in lastDestAddr. */
--            addModVal = ((int)progRep->lastDestAddr) & ((MCD_remVariants.remXferSize[channel]) - 1);
-+            addModVal = ((int)progRep->lastDestAddr) 
-+                        & ((MCD_remVariants.remXferSize[channel]) - 1);
-             LWAlignedInitDestAddr = (progRep->currBufDesc->destAddr) - subModVal;
-             LWAlignedCurrDestAddr = (progRep->lastDestAddr) - addModVal;
-             destDiffBytes = (progRep->lastDestAddr - LWAlignedInitDestAddr);
-             numIterations = ( LWAlignedCurrDestAddr - LWAlignedInitDestAddr)/MCD_remVariants.remDestIncr[channel];
-             bytesNotXfered =  numIterations *
--                ( MCD_remVariants.remDestIncr[channel]
--                  - MCD_remVariants.remXferSize[channel]);
--           progRep->dmaSize = destDiffBytes - bytesNotXfered - subModVal;
--           break;
-+                              (MCD_remVariants.remDestIncr[channel]
-+                             - MCD_remVariants.remXferSize[channel]);
-+            progRep->dmaSize = destDiffBytes - bytesNotXfered - subModVal;
-+            break;
-         default:
--           break;
-+            break;
-     }
- 
-     /* This covers M1,P1,Z for source */
--    switch(MCD_remVariants.remSrcRsdIncr[channel]) {
-+    switch(MCD_remVariants.remSrcRsdIncr[channel]) 
-+    {
-         case MINUS1:
-             progRep->lastSrcAddr =
-                 progRep->currBufDesc->srcAddr +
-@@ -720,13 +730,14 @@ int MCD_XferProgrQuery (int channel, MCD
-         case ZERO:
-             progRep->lastSrcAddr = progRep->currBufDesc->srcAddr;
-             break;
--       case PLUS1:
-+        case PLUS1:
-             progRep->lastSrcAddr =
-                 progRep->currBufDesc->srcAddr +
-                  ( MCD_remVariants.remSrcIncr[channel] *
-                    (progRep->dmaSize/MCD_remVariants.remXferSize[channel]));
--          break;
--       default: break;
-+            break;
-+        default: 
-+            break;
-     }
- 
-     return(MCD_OK);
-@@ -744,8 +755,10 @@ static void MCD_resmActions (int channel
- {
-    MCD_dmaBar->debugControl = DBG_CTL_DISABLE;
-    MCD_dmaBar->debugStatus = MCD_dmaBar->debugStatus;
--   MCD_dmaBar->ptdDebug = PTD_DBG_TSK_VLD_INIT; /* This register is selected to know
--                                        which initiator is actually asserted. */
-+
-+   /* Determine which initiators are asserted */
-+   MCD_dmaBar->ptdDebug = PTD_DBG_TSK_VLD_INIT; 
-+
-    if((MCD_dmaBar->ptdDebug >> channel ) & 0x1)
-        MCD_chStatus[channel] = MCD_RUNNING;
-    else
-@@ -767,27 +780,20 @@ static void MCD_resmActions (int channel
-  */
- int MCD_killDma (int channel)
- {
--   /* MCD_XferProg progRep; */
--
-     if((channel < 0) || (channel >= NCHANNELS))
-         return(MCD_CHANNEL_INVALID);
- 
-     MCD_dmaBar->taskControl[channel] = 0x0;
--    MCD_resumeDma (channel);
--    /*
--     * This must be after the write to the TCR so that the task doesn't
--     * start up again momentarily, and before the status assignment so
--     * as to override whatever MCD_resumeDma() may do to the channel
--     * status.
--     */
-+    
-+    /* Clean up after a paused task */
-+    if (MCD_chStatus[channel] == MCD_PAUSED)
-+    {
-+        MCD_dmaBar->debugControl = DBG_CTL_DISABLE;
-+        MCD_dmaBar->debugStatus = MCD_dmaBar->debugStatus;        
-+    }
-+     
-     MCD_chStatus[channel] = MCD_HALTED;
- 
--    /*
--     * Update the current buffer descriptor's lastDestAddr field
--     *
--     * MCD_XferProgrQuery (channel, &progRep);
--     * progRep.currBufDesc->lastDestAddr = progRep.lastDestAddr;
--     */
-     return(MCD_OK);
- }
- /************************ End of MCD_killDma() **********************/
-@@ -843,7 +849,7 @@ int MCD_continDma (int channel)
-  * this means that bits 14 and 0 must enable debug functions before
-  * bits 1 and 2, respectively, have any effect.
-  *
-- * NOTE: It's extremely important to not pause more than one DMA channel 
-+ * NOTE: It's extremely important to not pause more than one DMA channel
-  *  at a time.
-  ********************************************************************/
- 
-@@ -856,8 +862,6 @@ int MCD_continDma (int channel)
-  */
- int MCD_pauseDma (int channel)
- {
--    /* MCD_XferProg progRep; */
--
-     if((channel < 0) || (channel >= NCHANNELS))
-         return(MCD_CHANNEL_INVALID);
- 
-@@ -866,13 +870,6 @@ int MCD_pauseDma (int channel)
-         MCD_dmaBar->debugComp1 = channel;
-         MCD_dmaBar->debugControl = DBG_CTL_ENABLE | (1 << (channel + 16));
-         MCD_chStatus[channel] = MCD_PAUSED;
--
--        /*
--         * Update the current buffer descriptor's lastDestAddr field
--         *
--         * MCD_XferProgrQuery (channel, &progRep);
--         * progRep.currBufDesc->lastDestAddr = progRep.lastDestAddr;
--         */
-     }
-     return(MCD_OK);
- }
-@@ -929,9 +926,9 @@ int MCD_csumQuery (int channel, u32 *csu
- int MCD_getCodeSize(void)
- {
- #ifdef MCD_INCLUDE_EU
--    return(0x2b5c);
-+    return(0x2b64);
- #else
--    return(0x173c);
-+    return(0x1744);
- #endif
- }
- /********************** End of MCD_getCodeSize() ********************/
-@@ -943,9 +940,9 @@ int MCD_getCodeSize(void)
-  *                    which points to the version string
-  * Returns:     Version number and version string (by reference)
-  */
--char MCD_versionString[] = "Multi-channel DMA API Alpha v0.3 (2004-04-26)";
--#define MCD_REV_MAJOR   0x00
--#define MCD_REV_MINOR   0x03
-+char MCD_versionString[] = "Multi-channel DMA API v1.0";
-+#define MCD_REV_MAJOR   0x01
-+#define MCD_REV_MINOR   0x00
- 
- int MCD_getVersion(char **longVersion)
- {
---- a/drivers/dma/MCD_progCheck.h
-+++ b/drivers/dma/MCD_progCheck.h
-@@ -1,32 +1,27 @@
--/*********************************************************************
-+/*
-+ * drivers/dma/MCD_progCheck.h
-  *
-- * Copyright (C) 2004  Motorola, Inc.
-- *  MOTOROLA, INC. All Rights Reserved.
-- *  You are hereby granted a copyright license to use
-- *  the SOFTWARE so long as this entire notice is
-- *  retained without alteration in any modified and/or redistributed
-- *  versions, and that such modified versions are clearly identified
-- *  as such. No licenses are granted by implication, estoppel or
-- *  otherwise under any patents or trademarks of Motorola, Inc. This
-- *  software is provided on an "AS IS" basis and without warranty.
-+ * Copyright (C) 2004-2008 Freescale Semiconductor, Inc.
-+ *     Kurt Mahan <kmahan@freescale.com>
-  *
-- *  To the maximum extent permitted by applicable law, MOTOROLA
-- *  DISCLAIMS ALL WARRANTIES WHETHER EXPRESS OR IMPLIED, INCLUDING
-- *  IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-- *  PURPOSE AND ANY WARRANTY AGAINST INFRINGEMENT WITH REGARD TO THE
-- *  SOFTWARE (INCLUDING ANY MODIFIED VERSIONS THEREOF) AND ANY
-- *  ACCOMPANYING WRITTEN MATERIALS.
-+ * 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.
-  *
-- *  To the maximum extent permitted by applicable law, IN NO EVENT
-- *  SHALL MOTOROLA BE LIABLE FOR ANY DAMAGES WHATSOEVER (INCLUDING
-- *  WITHOUT LIMITATION, DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS
-- *  INTERRUPTION, LOSS OF BUSINESS INFORMATION, OR OTHER PECUNIARY
-- *  LOSS) ARISING OF THE USE OR INABILITY TO USE THE SOFTWARE.
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-  *
-- *  Motorola assumes no responsibility for the maintenance and support
-- *  of this software
-- ********************************************************************/
-- /* This file is autogenerated. Do not change */
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+/* This file is autogenerated. Do not change */
-+
- #define CURRBD 4
- #define DCOUNT 6
- #define DESTPTR 5
---- a/drivers/dma/MCD_tasks.c
-+++ b/drivers/dma/MCD_tasks.c
-@@ -1,44 +1,26 @@
--/*********************************************************************
-- *
-- * Copyright (C) 2004  Motorola, Inc.
-- *  MOTOROLA, INC. All Rights Reserved.
-- *  You are hereby granted a copyright license to use
-- *  the SOFTWARE so long as this entire notice is
-- *  retained without alteration in any modified and/or redistributed
-- *  versions, and that such modified versions are clearly identified
-- *  as such. No licenses are granted by implication, estoppel or
-- *  otherwise under any patents or trademarks of Motorola, Inc. This
-- *  software is provided on an "AS IS" basis and without warranty.
-- *
-- *  To the maximum extent permitted by applicable law, MOTOROLA
-- *  DISCLAIMS ALL WARRANTIES WHETHER EXPRESS OR IMPLIED, INCLUDING
-- *  IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-- *  PURPOSE AND ANY WARRANTY AGAINST INFRINGEMENT WITH REGARD TO THE
-- *  SOFTWARE (INCLUDING ANY MODIFIED VERSIONS THEREOF) AND ANY
-- *  ACCOMPANYING WRITTEN MATERIALS.
-- *
-- *  To the maximum extent permitted by applicable law, IN NO EVENT
-- *  SHALL MOTOROLA BE LIABLE FOR ANY DAMAGES WHATSOEVER (INCLUDING
-- *  WITHOUT LIMITATION, DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS
-- *  INTERRUPTION, LOSS OF BUSINESS INFORMATION, OR OTHER PECUNIARY
-- *  LOSS) ARISING OF THE USE OR INABILITY TO USE THE SOFTWARE.
-- *
-- *  Motorola assumes no responsibility for the maintenance and support
-- *  of this software
-- ********************************************************************/
- /*
-- * File:        MCD_tasks.c
-- * Purpose:     Contains task code and structures for Multi-channel DMA
-- *
-- * Notes:
-+ * drivers/dma/MCD_tasks.c
-  *
-+ * Copyright (C) 2004-2008 Freescale Semiconductor, Inc.
-+ *     Kurt Mahan <kmahan@freescale.com>
-  *
-- * Modifications:
-+ * 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.
-  *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-  *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-  */
- 
--#include <asm/MCD_dma.h>
-+#include "MCD_dma.h"
- 
- u32 MCD_varTab0[];
- u32 MCD_varTab1[];
-@@ -922,13 +904,13 @@ u32 MCD_funcDescTab0[]=
-     0x20400000, /* add(), EU# 3 */
-     0x20500000, /* sub(), EU# 3 */
-     0x205a0000, /* andNot(), EU# 3 */
-+    0x20a00000, /* shiftR(), EU# 3 */
-     0x202fa000, /* andReadyBit(), EU# 3 */
-     0x202f9000, /* andNotReadyBit(), EU# 3 */
-     0x202ea000, /* andWrapBit(), EU# 3 */
--    0x202da000, /* andEndFrameBit(), EU# 3 */
-+    0x202da000, /* andLastBit(), EU# 3 */
-     0x202e2000, /* andInterruptBit(), EU# 3 */
--    0x202f2000, /* andLoopBit(), EU# 3 */
--    0x2020a000, /* andCrcRestartBit(), EU# 3 */
-+    0x202f2000, /* andCrcRestartBit(), EU# 3 */
- };
- 
- #ifdef MCD_INCLUDE_EU
-@@ -991,13 +973,13 @@ u32 MCD_funcDescTab1[]=
-     0x20400000, /* add(), EU# 3 */
-     0x20500000, /* sub(), EU# 3 */
-     0x205a0000, /* andNot(), EU# 3 */
-+    0x20a00000, /* shiftR(), EU# 3 */
-     0x202fa000, /* andReadyBit(), EU# 3 */
-     0x202f9000, /* andNotReadyBit(), EU# 3 */
-     0x202ea000, /* andWrapBit(), EU# 3 */
--    0x202da000, /* andEndFrameBit(), EU# 3 */
-+    0x202da000, /* andLastBit(), EU# 3 */
-     0x202e2000, /* andInterruptBit(), EU# 3 */
--    0x202f2000, /* andLoopBit(), EU# 3 */
--    0x2020a000, /* andCrcRestartBit(), EU# 3 */
-+    0x202f2000, /* andCrcRestartBit(), EU# 3 */
- };
- 
- u32 MCD_funcDescTab2[]=
-@@ -1059,13 +1041,13 @@ u32 MCD_funcDescTab2[]=
-     0x20400000, /* add(), EU# 3 */
-     0x20500000, /* sub(), EU# 3 */
-     0x205a0000, /* andNot(), EU# 3 */
-+    0x20a00000, /* shiftR(), EU# 3 */
-     0x202fa000, /* andReadyBit(), EU# 3 */
-     0x202f9000, /* andNotReadyBit(), EU# 3 */
-     0x202ea000, /* andWrapBit(), EU# 3 */
--    0x202da000, /* andEndFrameBit(), EU# 3 */
-+    0x202da000, /* andLastBit(), EU# 3 */
-     0x202e2000, /* andInterruptBit(), EU# 3 */
--    0x202f2000, /* andLoopBit(), EU# 3 */
--    0x2020a000, /* andCrcRestartBit(), EU# 3 */
-+    0x202f2000, /* andCrcRestartBit(), EU# 3 */
- };
- 
- u32 MCD_funcDescTab3[]=
-@@ -1127,13 +1109,13 @@ u32 MCD_funcDescTab3[]=
-     0x20400000, /* add(), EU# 3 */
-     0x20500000, /* sub(), EU# 3 */
-     0x205a0000, /* andNot(), EU# 3 */
-+    0x20a00000, /* shiftR(), EU# 3 */
-     0x202fa000, /* andReadyBit(), EU# 3 */
-     0x202f9000, /* andNotReadyBit(), EU# 3 */
-     0x202ea000, /* andWrapBit(), EU# 3 */
--    0x202da000, /* andEndFrameBit(), EU# 3 */
-+    0x202da000, /* andLastBit(), EU# 3 */
-     0x202e2000, /* andInterruptBit(), EU# 3 */
--    0x202f2000, /* andLoopBit(), EU# 3 */
--    0x2020a000, /* andCrcRestartBit(), EU# 3 */
-+    0x202f2000, /* andCrcRestartBit(), EU# 3 */
- };
- 
- u32 MCD_funcDescTab4[]=
-@@ -1195,13 +1177,13 @@ u32 MCD_funcDescTab4[]=
-     0x20400000, /* add(), EU# 3 */
-     0x20500000, /* sub(), EU# 3 */
-     0x205a0000, /* andNot(), EU# 3 */
-+    0x20a00000, /* shiftR(), EU# 3 */
-     0x202fa000, /* andReadyBit(), EU# 3 */
-     0x202f9000, /* andNotReadyBit(), EU# 3 */
-     0x202ea000, /* andWrapBit(), EU# 3 */
--    0x202da000, /* andEndFrameBit(), EU# 3 */
-+    0x202da000, /* andLastBit(), EU# 3 */
-     0x202e2000, /* andInterruptBit(), EU# 3 */
--    0x202f2000, /* andLoopBit(), EU# 3 */
--    0x2020a000, /* andCrcRestartBit(), EU# 3 */
-+    0x202f2000, /* andCrcRestartBit(), EU# 3 */
- };
- 
- u32 MCD_funcDescTab5[]=
-@@ -1263,13 +1245,13 @@ u32 MCD_funcDescTab5[]=
-     0x20400000, /* add(), EU# 3 */
-     0x20500000, /* sub(), EU# 3 */
-     0x205a0000, /* andNot(), EU# 3 */
-+    0x20a00000, /* shiftR(), EU# 3 */
-     0x202fa000, /* andReadyBit(), EU# 3 */
-     0x202f9000, /* andNotReadyBit(), EU# 3 */
-     0x202ea000, /* andWrapBit(), EU# 3 */
--    0x202da000, /* andEndFrameBit(), EU# 3 */
-+    0x202da000, /* andLastBit(), EU# 3 */
-     0x202e2000, /* andInterruptBit(), EU# 3 */
--    0x202f2000, /* andLoopBit(), EU# 3 */
--    0x2020a000, /* andCrcRestartBit(), EU# 3 */
-+    0x202f2000, /* andCrcRestartBit(), EU# 3 */
- };
- 
- u32 MCD_funcDescTab6[]=
-@@ -1331,13 +1313,13 @@ u32 MCD_funcDescTab6[]=
-     0x20400000, /* add(), EU# 3 */
-     0x20500000, /* sub(), EU# 3 */
-     0x205a0000, /* andNot(), EU# 3 */
-+    0x20a00000, /* shiftR(), EU# 3 */
-     0x202fa000, /* andReadyBit(), EU# 3 */
-     0x202f9000, /* andNotReadyBit(), EU# 3 */
-     0x202ea000, /* andWrapBit(), EU# 3 */
--    0x202da000, /* andEndFrameBit(), EU# 3 */
-+    0x202da000, /* andLastBit(), EU# 3 */
-     0x202e2000, /* andInterruptBit(), EU# 3 */
--    0x202f2000, /* andLoopBit(), EU# 3 */
--    0x2020a000, /* andCrcRestartBit(), EU# 3 */
-+    0x202f2000, /* andCrcRestartBit(), EU# 3 */
- };
- 
- u32 MCD_funcDescTab7[]=
-@@ -1399,13 +1381,13 @@ u32 MCD_funcDescTab7[]=
-     0x20400000, /* add(), EU# 3 */
-     0x20500000, /* sub(), EU# 3 */
-     0x205a0000, /* andNot(), EU# 3 */
-+    0x20a00000, /* shiftR(), EU# 3 */
-     0x202fa000, /* andReadyBit(), EU# 3 */
-     0x202f9000, /* andNotReadyBit(), EU# 3 */
-     0x202ea000, /* andWrapBit(), EU# 3 */
--    0x202da000, /* andEndFrameBit(), EU# 3 */
-+    0x202da000, /* andLastBit(), EU# 3 */
-     0x202e2000, /* andInterruptBit(), EU# 3 */
--    0x202f2000, /* andLoopBit(), EU# 3 */
--    0x2020a000, /* andCrcRestartBit(), EU# 3 */
-+    0x202f2000, /* andCrcRestartBit(), EU# 3 */
- };
- 
- u32 MCD_funcDescTab8[]=
-@@ -1467,13 +1449,13 @@ u32 MCD_funcDescTab8[]=
-     0x20400000, /* add(), EU# 3 */
-     0x20500000, /* sub(), EU# 3 */
-     0x205a0000, /* andNot(), EU# 3 */
-+    0x20a00000, /* shiftR(), EU# 3 */
-     0x202fa000, /* andReadyBit(), EU# 3 */
-     0x202f9000, /* andNotReadyBit(), EU# 3 */
-     0x202ea000, /* andWrapBit(), EU# 3 */
--    0x202da000, /* andEndFrameBit(), EU# 3 */
-+    0x202da000, /* andLastBit(), EU# 3 */
-     0x202e2000, /* andInterruptBit(), EU# 3 */
--    0x202f2000, /* andLoopBit(), EU# 3 */
--    0x2020a000, /* andCrcRestartBit(), EU# 3 */
-+    0x202f2000, /* andCrcRestartBit(), EU# 3 */
- };
- 
- u32 MCD_funcDescTab9[]=
-@@ -1535,13 +1517,13 @@ u32 MCD_funcDescTab9[]=
-     0x20400000, /* add(), EU# 3 */
-     0x20500000, /* sub(), EU# 3 */
-     0x205a0000, /* andNot(), EU# 3 */
-+    0x20a00000, /* shiftR(), EU# 3 */
-     0x202fa000, /* andReadyBit(), EU# 3 */
-     0x202f9000, /* andNotReadyBit(), EU# 3 */
-     0x202ea000, /* andWrapBit(), EU# 3 */
--    0x202da000, /* andEndFrameBit(), EU# 3 */
-+    0x202da000, /* andLastBit(), EU# 3 */
-     0x202e2000, /* andInterruptBit(), EU# 3 */
--    0x202f2000, /* andLoopBit(), EU# 3 */
--    0x2020a000, /* andCrcRestartBit(), EU# 3 */
-+    0x202f2000, /* andCrcRestartBit(), EU# 3 */
- };
- 
- u32 MCD_funcDescTab10[]=
-@@ -1603,13 +1585,13 @@ u32 MCD_funcDescTab10[]=
-     0x20400000, /* add(), EU# 3 */
-     0x20500000, /* sub(), EU# 3 */
-     0x205a0000, /* andNot(), EU# 3 */
-+    0x20a00000, /* shiftR(), EU# 3 */
-     0x202fa000, /* andReadyBit(), EU# 3 */
-     0x202f9000, /* andNotReadyBit(), EU# 3 */
-     0x202ea000, /* andWrapBit(), EU# 3 */
--    0x202da000, /* andEndFrameBit(), EU# 3 */
-+    0x202da000, /* andLastBit(), EU# 3 */
-     0x202e2000, /* andInterruptBit(), EU# 3 */
--    0x202f2000, /* andLoopBit(), EU# 3 */
--    0x2020a000, /* andCrcRestartBit(), EU# 3 */
-+    0x202f2000, /* andCrcRestartBit(), EU# 3 */
- };
- 
- u32 MCD_funcDescTab11[]=
-@@ -1671,13 +1653,13 @@ u32 MCD_funcDescTab11[]=
-     0x20400000, /* add(), EU# 3 */
-     0x20500000, /* sub(), EU# 3 */
-     0x205a0000, /* andNot(), EU# 3 */
-+    0x20a00000, /* shiftR(), EU# 3 */
-     0x202fa000, /* andReadyBit(), EU# 3 */
-     0x202f9000, /* andNotReadyBit(), EU# 3 */
-     0x202ea000, /* andWrapBit(), EU# 3 */
--    0x202da000, /* andEndFrameBit(), EU# 3 */
-+    0x202da000, /* andLastBit(), EU# 3 */
-     0x202e2000, /* andInterruptBit(), EU# 3 */
--    0x202f2000, /* andLoopBit(), EU# 3 */
--    0x2020a000, /* andCrcRestartBit(), EU# 3 */
-+    0x202f2000, /* andCrcRestartBit(), EU# 3 */
- };
- 
- u32 MCD_funcDescTab12[]=
-@@ -1739,13 +1721,13 @@ u32 MCD_funcDescTab12[]=
-     0x20400000, /* add(), EU# 3 */
-     0x20500000, /* sub(), EU# 3 */
-     0x205a0000, /* andNot(), EU# 3 */
-+    0x20a00000, /* shiftR(), EU# 3 */
-     0x202fa000, /* andReadyBit(), EU# 3 */
-     0x202f9000, /* andNotReadyBit(), EU# 3 */
-     0x202ea000, /* andWrapBit(), EU# 3 */
--    0x202da000, /* andEndFrameBit(), EU# 3 */
-+    0x202da000, /* andLastBit(), EU# 3 */
-     0x202e2000, /* andInterruptBit(), EU# 3 */
--    0x202f2000, /* andLoopBit(), EU# 3 */
--    0x2020a000, /* andCrcRestartBit(), EU# 3 */
-+    0x202f2000, /* andCrcRestartBit(), EU# 3 */
- };
- 
- u32 MCD_funcDescTab13[]=
-@@ -1807,13 +1789,13 @@ u32 MCD_funcDescTab13[]=
-     0x20400000, /* add(), EU# 3 */
-     0x20500000, /* sub(), EU# 3 */
-     0x205a0000, /* andNot(), EU# 3 */
-+    0x20a00000, /* shiftR(), EU# 3 */
-     0x202fa000, /* andReadyBit(), EU# 3 */
-     0x202f9000, /* andNotReadyBit(), EU# 3 */
-     0x202ea000, /* andWrapBit(), EU# 3 */
--    0x202da000, /* andEndFrameBit(), EU# 3 */
-+    0x202da000, /* andLastBit(), EU# 3 */
-     0x202e2000, /* andInterruptBit(), EU# 3 */
--    0x202f2000, /* andLoopBit(), EU# 3 */
--    0x2020a000, /* andCrcRestartBit(), EU# 3 */
-+    0x202f2000, /* andCrcRestartBit(), EU# 3 */
- };
- 
- u32 MCD_funcDescTab14[]=
-@@ -1875,13 +1857,13 @@ u32 MCD_funcDescTab14[]=
-     0x20400000, /* add(), EU# 3 */
-     0x20500000, /* sub(), EU# 3 */
-     0x205a0000, /* andNot(), EU# 3 */
-+    0x20a00000, /* shiftR(), EU# 3 */
-     0x202fa000, /* andReadyBit(), EU# 3 */
-     0x202f9000, /* andNotReadyBit(), EU# 3 */
-     0x202ea000, /* andWrapBit(), EU# 3 */
--    0x202da000, /* andEndFrameBit(), EU# 3 */
-+    0x202da000, /* andLastBit(), EU# 3 */
-     0x202e2000, /* andInterruptBit(), EU# 3 */
--    0x202f2000, /* andLoopBit(), EU# 3 */
--    0x2020a000, /* andCrcRestartBit(), EU# 3 */
-+    0x202f2000, /* andCrcRestartBit(), EU# 3 */
- };
- 
- u32 MCD_funcDescTab15[]=
-@@ -1943,13 +1925,13 @@ u32 MCD_funcDescTab15[]=
-     0x20400000, /* add(), EU# 3 */
-     0x20500000, /* sub(), EU# 3 */
-     0x205a0000, /* andNot(), EU# 3 */
-+    0x20a00000, /* shiftR(), EU# 3 */
-     0x202fa000, /* andReadyBit(), EU# 3 */
-     0x202f9000, /* andNotReadyBit(), EU# 3 */
-     0x202ea000, /* andWrapBit(), EU# 3 */
--    0x202da000, /* andEndFrameBit(), EU# 3 */
-+    0x202da000, /* andLastBit(), EU# 3 */
-     0x202e2000, /* andInterruptBit(), EU# 3 */
--    0x202f2000, /* andLoopBit(), EU# 3 */
--    0x2020a000, /* andCrcRestartBit(), EU# 3 */
-+    0x202f2000, /* andCrcRestartBit(), EU# 3 */
- };
- #endif /*MCD_INCLUDE_EU*/
- 
-@@ -1970,7 +1952,6 @@ u32 MCD_contextSave13[128]; /* Task 13 c
- u32 MCD_contextSave14[128]; /* Task 14 context save space */
- u32 MCD_contextSave15[128]; /* Task 15 context save space */
- 
--/* Task Descriptor Tables - the guts */
- u32 MCD_ChainNoEu_TDT[];
- u32 MCD_SingleNoEu_TDT[];
- #ifdef MCD_INCLUDE_EU
-@@ -1983,7 +1964,7 @@ u32 MCD_ENetXmit_TDT[];
- u32 MCD_modelTaskTableSrc[]=
- {
-     (u32)MCD_ChainNoEu_TDT,
--    (u32)&((u8*)MCD_ChainNoEu_TDT)[0x00000178],
-+    (u32)&((u8*)MCD_ChainNoEu_TDT)[0x0000016c],
-     0x00000000,
-     0x00000000,
-     0x00000000,
-@@ -2000,7 +1981,7 @@ u32 MCD_modelTaskTableSrc[]=
-     0x00000000,
- #ifdef MCD_INCLUDE_EU
-     (u32)MCD_ChainEu_TDT,
--    (u32)&((u8*)MCD_ChainEu_TDT)[0x00000180],
-+    (u32)&((u8*)MCD_ChainEu_TDT)[0x000001b4],
-     0x00000000,
-     0x00000000,
-     0x00000000,
-@@ -2008,7 +1989,7 @@ u32 MCD_modelTaskTableSrc[]=
-     0x00000000,
-     0x00000000,
-     (u32)MCD_SingleEu_TDT,
--    (u32)&((u8*)MCD_SingleEu_TDT)[0x000000dc],
-+    (u32)&((u8*)MCD_SingleEu_TDT)[0x00000124],
-     0x00000000,
-     0x00000000,
-     0x00000000,
-@@ -2017,7 +1998,7 @@ u32 MCD_modelTaskTableSrc[]=
-     0x00000000,
- #endif
-     (u32)MCD_ENetRcv_TDT,
--    (u32)&((u8*)MCD_ENetRcv_TDT)[0x0000009C],
-+    (u32)&((u8*)MCD_ENetRcv_TDT)[0x000000a4],
-     0x00000000,
-     0x00000000,
-     0x00000000,
-@@ -2033,420 +2014,452 @@ u32 MCD_modelTaskTableSrc[]=
-     0x00000000,
-     0x00000000,
- };
--
- u32 MCD_ChainNoEu_TDT[]=
- {
-     0x80004000, /* 0000(:370):  LCDEXT: idx0 = 0x00000000; ; */
-     0x8118801b, /* 0004(:370):  LCD: idx1 = var2; idx1 once var0; idx1 += inc3 */
--    0xb8ca0018, /* 0008(:371):    LCD: idx2 = *(idx1 + var20); idx2 once var0; idx2 += inc3 */
--    0x10004b10, /* 000C(:372):      DRD1A: var18 = idx2; FN=0 MORE init=0 WS=0 RS=0 */
--    0x7000000c, /* 0010(:373):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=12 EXT MORE init=0 WS=0 RS=0 */
--    0x024cf89f, /* 0014(:373):      DRD2B1: var9 = EU3(); EU3(idx2)  */
--    0x60000009, /* 0018(:374):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=9 EXT init=0 WS=0 RS=0 */
-+    0xb8c60018, /* 0008(:371):    LCD: idx2 = *(idx1 + var12); idx2 once var0; idx2 += inc3 */
-+    0x10002b10, /* 000C(:372):      DRD1A: var10 = idx2; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x7000000d, /* 0010(:373):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=13 EXT MORE init=0 WS=0 RS=0 */
-+    0x018cf89f, /* 0014(:373):      DRD2B1: var6 = EU3(); EU3(idx2)  */
-+    0x6000000a, /* 0018(:374):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=10 EXT init=0 WS=0 RS=0 */
-     0x080cf89f, /* 001C(:374):      DRD2B1: idx0 = EU3(); EU3(idx2)  */
-     0x000001f8, /* 0020(:0):    NOP */
--    0x98180524, /* 0024(:378):  LCD: idx0 = idx0; idx0 != var20; idx0 += inc4 */
-+    0x98180364, /* 0024(:378):  LCD: idx0 = idx0; idx0 == var13; idx0 += inc4 */
-     0x8118801b, /* 0028(:380):    LCD: idx1 = var2; idx1 once var0; idx1 += inc3 */
--    0xf8ca001a, /* 002C(:381):      LCDEXT: idx2 = *(idx1 + var20 + 8); idx2 once var0; idx2 += inc3 */
--    0xb8ca601b, /* 0030(:382):      LCD: idx3 = *(idx1 + var20 + 12); ; idx3 += inc3 */
--    0x10004310, /* 0034(:384):        DRD1A: var16 = idx2; FN=0 MORE init=0 WS=0 RS=0 */
--    0x00001718, /* 0038(:385):        DRD1A: var5 = idx3; FN=0 init=0 WS=0 RS=0 */
--    0xb8ca001d, /* 003C(:387):      LCD: idx2 = *(idx1 + var20 + 20); idx2 once var0; idx2 += inc3 */
--    0x10001f10, /* 0040(:388):        DRD1A: var7 = idx2; FN=0 MORE init=0 WS=0 RS=0 */
-+    0xf8c6001a, /* 002C(:381):      LCDEXT: idx2 = *(idx1 + var12 + 8); idx2 once var0; idx2 += inc3 */
-+    0xb8c6601b, /* 0030(:382):      LCD: idx3 = *(idx1 + var12 + 12); ; idx3 += inc3 */
-+    0x10002710, /* 0034(:384):        DRD1A: var9 = idx2; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x00000f18, /* 0038(:385):        DRD1A: var3 = idx3; FN=0 init=0 WS=0 RS=0 */
-+    0xb8c6001d, /* 003C(:387):      LCD: idx2 = *(idx1 + var12 + 20); idx2 once var0; idx2 += inc3 */
-+    0x10001310, /* 0040(:388):        DRD1A: var4 = idx2; FN=0 MORE init=0 WS=0 RS=0 */
-     0x60000007, /* 0044(:389):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=7 EXT init=0 WS=0 RS=0 */
--    0x020cf893, /* 0048(:389):        DRD2B1: var8 = EU3(); EU3(idx2,var19)  */
--    0x98ca001c, /* 004C(:391):      LCD: idx2 = idx1 + var20 + 4; idx2 once var0; idx2 += inc3 */
-+    0x014cf88b, /* 0048(:389):        DRD2B1: var5 = EU3(); EU3(idx2,var11)  */
-+    0x98c6001c, /* 004C(:391):      LCD: idx2 = idx1 + var12 + 4; idx2 once var0; idx2 += inc3 */
-     0x00000710, /* 0050(:392):        DRD1A: var1 = idx2; FN=0 init=0 WS=0 RS=0 */
--    0x98ca8018, /* 0054(:393):      LCD: idx2 = idx1 + var21; idx2 once var0; idx2 += inc3 */
--    0x10002b10, /* 0058(:394):        DRD1A: var10 = idx2; FN=0 MORE init=0 WS=0 RS=0 */
--    0x0000c828, /* 005C(:395):        DRD1A: *idx2 = var5; FN=0 init=0 WS=0 RS=0 */
-+    0x98c70018, /* 0054(:393):      LCD: idx2 = idx1 + var14; idx2 once var0; idx2 += inc3 */
-+    0x10001f10, /* 0058(:394):        DRD1A: var7 = idx2; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x0000c818, /* 005C(:395):        DRD1A: *idx2 = var3; FN=0 init=0 WS=0 RS=0 */
-     0x000001f8, /* 0060(:0):      NOP */
--    0xc14ae018, /* 0064(:399):    LCDEXT: idx1 = var2 + var21; ; idx1 += inc3 */
--    0xc004a51d, /* 0068(:399):    LCDEXT: idx2 = var0, idx3 = var9; idx3 == var20; idx2 += inc3, idx3 += inc5 */
-+    0xc1476018, /* 0064(:399):    LCDEXT: idx1 = var2 + var14; ; idx1 += inc3 */
-+    0xc003231d, /* 0068(:399):    LCDEXT: idx2 = var0, idx3 = var6; idx3 == var12; idx2 += inc3, idx3 += inc5 */
-     0x811a601b, /* 006C(:400):    LCD: idx4 = var2; ; idx4 += inc3 */
--    0xc28a21c2, /* 0070(:403):      LCDEXT: idx5 = var5, idx6 = var20; idx6 < var7; idx5 += inc0, idx6 += inc2 */
--    0x881be009, /* 0074(:403):      LCD: idx7 = var16; ; idx7 += inc1 */
-+    0xc1862102, /* 0070(:403):      LCDEXT: idx5 = var3, idx6 = var12; idx6 < var4; idx5 += inc0, idx6 += inc2 */
-+    0x849be009, /* 0074(:403):      LCD: idx7 = var9; ; idx7 += inc1 */
-     0x03fed7b8, /* 0078(:406):        DRD1A: *idx7; FN=0 init=31 WS=3 RS=3 */
-     0xda9b001b, /* 007C(:408):      LCDEXT: idx5 = idx5, idx6 = idx6; idx5 once var0; idx5 += inc3, idx6 += inc3 */
-     0x9b9be01b, /* 0080(:408):      LCD: idx7 = idx7; ; idx7 += inc3 */
-     0x1000cb20, /* 0084(:409):        DRD1A: *idx2 = idx4; FN=0 MORE init=0 WS=0 RS=0 */
-     0x70000006, /* 0088(:410):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
--    0x088cf896, /* 008C(:410):        DRD2B1: idx2 = EU3(); EU3(idx2,var22)  */
-+    0x088cf88f, /* 008C(:410):        DRD2B1: idx2 = EU3(); EU3(idx2,var15)  */
-     0x1000cb28, /* 0090(:411):        DRD1A: *idx2 = idx5; FN=0 MORE init=0 WS=0 RS=0 */
-     0x70000006, /* 0094(:412):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
--    0x088cf896, /* 0098(:412):        DRD2B1: idx2 = EU3(); EU3(idx2,var22)  */
-+    0x088cf88f, /* 0098(:412):        DRD2B1: idx2 = EU3(); EU3(idx2,var15)  */
-     0x1000cb30, /* 009C(:413):        DRD1A: *idx2 = idx6; FN=0 MORE init=0 WS=0 RS=0 */
-     0x70000006, /* 00A0(:414):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
--    0x088cf896, /* 00A4(:414):        DRD2B1: idx2 = EU3(); EU3(idx2,var22)  */
-+    0x088cf88f, /* 00A4(:414):        DRD2B1: idx2 = EU3(); EU3(idx2,var15)  */
-     0x1000cb38, /* 00A8(:415):        DRD1A: *idx2 = idx7; FN=0 MORE init=0 WS=0 RS=0 */
-     0x0000c728, /* 00AC(:416):        DRD1A: *idx1 = idx5; FN=0 init=0 WS=0 RS=0 */
-     0x000001f8, /* 00B0(:0):      NOP */
--    0xc14ae018, /* 00B4(:420):    LCDEXT: idx1 = var2 + var21; ; idx1 += inc3 */
--    0xc004a5dd, /* 00B8(:420):    LCDEXT: idx2 = var0, idx3 = var9; idx3 == var23; idx2 += inc3, idx3 += inc5 */
-+    0xc1476018, /* 00B4(:420):    LCDEXT: idx1 = var2 + var14; ; idx1 += inc3 */
-+    0xc003241d, /* 00B8(:420):    LCDEXT: idx2 = var0, idx3 = var6; idx3 == var16; idx2 += inc3, idx3 += inc5 */
-     0x811a601b, /* 00BC(:421):    LCD: idx4 = var2; ; idx4 += inc3 */
-     0xda9b001b, /* 00C0(:424):      LCDEXT: idx5 = idx5, idx6 = idx6; idx5 once var0; idx5 += inc3, idx6 += inc3 */
-     0x9b9be01b, /* 00C4(:424):      LCD: idx7 = idx7; ; idx7 += inc3 */
-     0x0000d3a0, /* 00C8(:425):        DRD1A: *idx4; FN=0 init=0 WS=0 RS=0 */
--    0xc28a21c2, /* 00CC(:427):      LCDEXT: idx5 = var5, idx6 = var20; idx6 < var7; idx5 += inc0, idx6 += inc2 */
--    0x881be009, /* 00D0(:427):      LCD: idx7 = var16; ; idx7 += inc1 */
-+    0xc1862102, /* 00CC(:427):      LCDEXT: idx5 = var3, idx6 = var12; idx6 < var4; idx5 += inc0, idx6 += inc2 */
-+    0x849be009, /* 00D0(:427):      LCD: idx7 = var9; ; idx7 += inc1 */
-     0x0bfed7b8, /* 00D4(:430):        DRD1A: *idx7; FN=0 TFD init=31 WS=3 RS=3 */
-     0xda9b001b, /* 00D8(:432):      LCDEXT: idx5 = idx5, idx6 = idx6; idx5 once var0; idx5 += inc3, idx6 += inc3 */
-     0x9b9be01b, /* 00DC(:432):      LCD: idx7 = idx7; ; idx7 += inc3 */
-     0x1000cb20, /* 00E0(:433):        DRD1A: *idx2 = idx4; FN=0 MORE init=0 WS=0 RS=0 */
-     0x70000006, /* 00E4(:434):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
--    0x088cf896, /* 00E8(:434):        DRD2B1: idx2 = EU3(); EU3(idx2,var22)  */
-+    0x088cf88f, /* 00E8(:434):        DRD2B1: idx2 = EU3(); EU3(idx2,var15)  */
-     0x1000cb28, /* 00EC(:435):        DRD1A: *idx2 = idx5; FN=0 MORE init=0 WS=0 RS=0 */
-     0x70000006, /* 00F0(:436):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
--    0x088cf896, /* 00F4(:436):        DRD2B1: idx2 = EU3(); EU3(idx2,var22)  */
-+    0x088cf88f, /* 00F4(:436):        DRD2B1: idx2 = EU3(); EU3(idx2,var15)  */
-     0x1000cb30, /* 00F8(:437):        DRD1A: *idx2 = idx6; FN=0 MORE init=0 WS=0 RS=0 */
-     0x70000006, /* 00FC(:438):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
--    0x088cf896, /* 0100(:438):        DRD2B1: idx2 = EU3(); EU3(idx2,var22)  */
-+    0x088cf88f, /* 0100(:438):        DRD2B1: idx2 = EU3(); EU3(idx2,var15)  */
-     0x1000cb38, /* 0104(:439):        DRD1A: *idx2 = idx7; FN=0 MORE init=0 WS=0 RS=0 */
-     0x0000c728, /* 0108(:440):        DRD1A: *idx1 = idx5; FN=0 init=0 WS=0 RS=0 */
-     0x000001f8, /* 010C(:0):      NOP */
-     0x8118801b, /* 0110(:444):    LCD: idx1 = var2; idx1 once var0; idx1 += inc3 */
--    0x8a19001b, /* 0114(:446):      LCD: idx2 = var20; idx2 once var0; idx2 += inc3 */
--    0x6000000e, /* 0118(:447):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=14 EXT init=0 WS=0 RS=0 */
--    0x088cf49f, /* 011C(:447):        DRD2B1: idx2 = EU3(); EU3(var18)  */
--    0xd9190536, /* 0120(:448):      LCDEXT: idx2 = idx2; idx2 == var20; idx2 += inc6 */
--    0x98ca0018, /* 0124(:448):      LCD: idx3 = idx1 + var20; idx3 once var0; idx3 += inc3 */
--    0x6000000a, /* 0128(:450):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=10 EXT init=0 WS=0 RS=0 */
--    0x0cccfcdf, /* 012C(:450):        DRD2B1: *idx3 = EU3(); EU3(*idx3)  */
--    0x000001f8, /* 0130(:0):      NOP */
--    0xa14a001e, /* 0134(:453):    LCD: idx1 = *(var2 + var20 + 24); idx1 once var0; idx1 += inc3 */
--    0x10000b08, /* 0138(:454):      DRD1A: var2 = idx1; FN=0 MORE init=0 WS=0 RS=0 */
--    0x10002c90, /* 013C(:455):      DRD1A: var11 = var18; FN=0 MORE init=0 WS=0 RS=0 */
--    0xb8ca0018, /* 0140(:456):      LCD: idx2 = *(idx1 + var20); idx2 once var0; idx2 += inc3 */
--    0x10004b10, /* 0144(:457):        DRD1A: var18 = idx2; FN=0 MORE init=0 WS=0 RS=0 */
--    0x70000009, /* 0148(:458):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=9 EXT MORE init=0 WS=0 RS=0 */
--    0x080cf89f, /* 014C(:458):        DRD2B1: idx0 = EU3(); EU3(idx2)  */
--    0x6000000c, /* 0150(:459):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=12 EXT init=0 WS=0 RS=0 */
--    0x024cf89f, /* 0154(:459):        DRD2B1: var9 = EU3(); EU3(idx2)  */
--    0x000001f8, /* 0158(:0):      NOP */
--    0x8a18801b, /* 015C(:465):    LCD: idx1 = var20; idx1 once var0; idx1 += inc3 */
--    0x7000000d, /* 0160(:466):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=13 EXT MORE init=0 WS=0 RS=0 */
--    0x084cf2df, /* 0164(:466):      DRD2B1: idx1 = EU3(); EU3(var11)  */
--    0xd899053f, /* 0168(:467):      LCDEXT: idx2 = idx1; idx2 > var20; idx2 += inc7 */
--    0x8019801b, /* 016C(:467):      LCD: idx3 = var0; idx3 once var0; idx3 += inc3 */
--    0x040001f8, /* 0170(:468):        DRD1A: FN=0 INT init=0 WS=0 RS=0 */
--    0x000001f8, /* 0174(:0):      NOP */
--    0x000001f8, /* 0178(:0):    NOP */
-+    0xd8c60018, /* 0114(:446):      LCDEXT: idx2 = idx1 + var12; idx2 once var0; idx2 += inc3 */
-+    0x98c6601c, /* 0118(:446):      LCD: idx3 = idx1 + var12 + 4; ; idx3 += inc3 */
-+    0x6000000b, /* 011C(:447):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=11 EXT init=0 WS=0 RS=0 */
-+    0x0c8cfc9f, /* 0120(:447):        DRD2B1: *idx2 = EU3(); EU3(*idx2)  */
-+    0x000001f8, /* 0124(:0):      NOP */
-+    0xa146001e, /* 0128(:450):    LCD: idx1 = *(var2 + var12 + 24); idx1 once var0; idx1 += inc3 */
-+    0x10000b08, /* 012C(:451):      DRD1A: var2 = idx1; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x10002050, /* 0130(:452):      DRD1A: var8 = var10; FN=0 MORE init=0 WS=0 RS=0 */
-+    0xb8c60018, /* 0134(:453):      LCD: idx2 = *(idx1 + var12); idx2 once var0; idx2 += inc3 */
-+    0x10002b10, /* 0138(:454):        DRD1A: var10 = idx2; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x7000000a, /* 013C(:455):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=10 EXT MORE init=0 WS=0 RS=0 */
-+    0x080cf89f, /* 0140(:455):        DRD2B1: idx0 = EU3(); EU3(idx2)  */
-+    0x6000000d, /* 0144(:456):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=13 EXT init=0 WS=0 RS=0 */
-+    0x018cf89f, /* 0148(:456):        DRD2B1: var6 = EU3(); EU3(idx2)  */
-+    0x000001f8, /* 014C(:0):      NOP */
-+    0x8618801b, /* 0150(:462):    LCD: idx1 = var12; idx1 once var0; idx1 += inc3 */
-+    0x7000000e, /* 0154(:463):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=14 EXT MORE init=0 WS=0 RS=0 */
-+    0x084cf21f, /* 0158(:463):      DRD2B1: idx1 = EU3(); EU3(var8)  */
-+    0xd8990336, /* 015C(:464):      LCDEXT: idx2 = idx1; idx2 > var12; idx2 += inc6 */
-+    0x8019801b, /* 0160(:464):      LCD: idx3 = var0; idx3 once var0; idx3 += inc3 */
-+    0x040001f8, /* 0164(:465):        DRD1A: FN=0 INT init=0 WS=0 RS=0 */
-+    0x000001f8, /* 0168(:0):      NOP */
-+    0x000001f8, /* 016C(:0):    NOP */
- };
- u32 MCD_SingleNoEu_TDT[]=
- {
--    0x8318001b, /* 0000(:646):  LCD: idx0 = var6; idx0 once var0; idx0 += inc3 */
--    0x7000000c, /* 0004(:647):    DRD2A: EU0=0 EU1=0 EU2=0 EU3=12 EXT MORE init=0 WS=0 RS=0 */
--    0x080cf81f, /* 0008(:647):    DRD2B1: idx0 = EU3(); EU3(idx0)  */
--    0x8318801b, /* 000C(:648):    LCD: idx1 = var6; idx1 once var0; idx1 += inc3 */
--    0x6000000d, /* 0010(:649):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=13 EXT init=0 WS=0 RS=0 */
--    0x084cf85f, /* 0014(:649):      DRD2B1: idx1 = EU3(); EU3(idx1)  */
-+    0x8198001b, /* 0000(:657):  LCD: idx0 = var3; idx0 once var0; idx0 += inc3 */
-+    0x7000000d, /* 0004(:658):    DRD2A: EU0=0 EU1=0 EU2=0 EU3=13 EXT MORE init=0 WS=0 RS=0 */
-+    0x080cf81f, /* 0008(:658):    DRD2B1: idx0 = EU3(); EU3(idx0)  */
-+    0x8198801b, /* 000C(:659):    LCD: idx1 = var3; idx1 once var0; idx1 += inc3 */
-+    0x6000000e, /* 0010(:660):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=14 EXT init=0 WS=0 RS=0 */
-+    0x084cf85f, /* 0014(:660):      DRD2B1: idx1 = EU3(); EU3(idx1)  */
-     0x000001f8, /* 0018(:0):    NOP */
--    0x8498001b, /* 001C(:653):  LCD: idx0 = var9; idx0 once var0; idx0 += inc3 */
--    0x7000000c, /* 0020(:654):    DRD2A: EU0=0 EU1=0 EU2=0 EU3=12 EXT MORE init=0 WS=0 RS=0 */
--    0x020cf81f, /* 0024(:654):    DRD2B1: var8 = EU3(); EU3(idx0)  */
--    0x6000000d, /* 0028(:655):    DRD2A: EU0=0 EU1=0 EU2=0 EU3=13 EXT init=0 WS=0 RS=0 */
--    0x028cf81f, /* 002C(:655):    DRD2B1: var10 = EU3(); EU3(idx0)  */
--    0xc404601b, /* 0030(:658):  LCDEXT: idx0 = var8, idx1 = var8; ; idx0 += inc3, idx1 += inc3 */
--    0xc00423dc, /* 0034(:658):  LCDEXT: idx2 = var0, idx3 = var8; idx3 == var15; idx2 += inc3, idx3 += inc4 */
--    0x809a601b, /* 0038(:659):  LCD: idx4 = var1; ; idx4 += inc3 */
--    0xc207a182, /* 003C(:662):    LCDEXT: idx5 = var4, idx6 = var15; idx6 < var6; idx5 += inc0, idx6 += inc2 */
--    0x869be009, /* 0040(:662):    LCD: idx7 = var13; ; idx7 += inc1 */
--    0x03fed7b8, /* 0044(:665):      DRD1A: *idx7; FN=0 init=31 WS=3 RS=3 */
--    0xda9b001b, /* 0048(:667):    LCDEXT: idx5 = idx5, idx6 = idx6; idx5 once var0; idx5 += inc3, idx6 += inc3 */
--    0x9b9be01b, /* 004C(:667):    LCD: idx7 = idx7; ; idx7 += inc3 */
--    0x70000006, /* 0050(:669):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
--    0x088cf890, /* 0054(:669):      DRD2B1: idx2 = EU3(); EU3(idx2,var16)  */
--    0x1000cb28, /* 0058(:670):      DRD1A: *idx2 = idx5; FN=0 MORE init=0 WS=0 RS=0 */
--    0x70000006, /* 005C(:671):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
--    0x088cf890, /* 0060(:671):      DRD2B1: idx2 = EU3(); EU3(idx2,var16)  */
--    0x1000cb30, /* 0064(:672):      DRD1A: *idx2 = idx6; FN=0 MORE init=0 WS=0 RS=0 */
--    0x70000006, /* 0068(:673):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
--    0x088cf890, /* 006C(:673):      DRD2B1: idx2 = EU3(); EU3(idx2,var16)  */
--    0x0000cb38, /* 0070(:674):      DRD1A: *idx2 = idx7; FN=0 init=0 WS=0 RS=0 */
-+    0x8298001b, /* 001C(:664):  LCD: idx0 = var5; idx0 once var0; idx0 += inc3 */
-+    0x7000000d, /* 0020(:665):    DRD2A: EU0=0 EU1=0 EU2=0 EU3=13 EXT MORE init=0 WS=0 RS=0 */
-+    0x010cf81f, /* 0024(:665):    DRD2B1: var4 = EU3(); EU3(idx0)  */
-+    0x6000000e, /* 0028(:666):    DRD2A: EU0=0 EU1=0 EU2=0 EU3=14 EXT init=0 WS=0 RS=0 */
-+    0x018cf81f, /* 002C(:666):    DRD2B1: var6 = EU3(); EU3(idx0)  */
-+    0xc202601b, /* 0030(:669):  LCDEXT: idx0 = var4, idx1 = var4; ; idx0 += inc3, idx1 += inc3 */
-+    0xc002221c, /* 0034(:669):  LCDEXT: idx2 = var0, idx3 = var4; idx3 == var8; idx2 += inc3, idx3 += inc4 */
-+    0x809a601b, /* 0038(:670):  LCD: idx4 = var1; ; idx4 += inc3 */
-+    0xc10420c2, /* 003C(:673):    LCDEXT: idx5 = var2, idx6 = var8; idx6 < var3; idx5 += inc0, idx6 += inc2 */
-+    0x839be009, /* 0040(:673):    LCD: idx7 = var7; ; idx7 += inc1 */
-+    0x03fed7b8, /* 0044(:676):      DRD1A: *idx7; FN=0 init=31 WS=3 RS=3 */
-+    0xda9b001b, /* 0048(:678):    LCDEXT: idx5 = idx5, idx6 = idx6; idx5 once var0; idx5 += inc3, idx6 += inc3 */
-+    0x9b9be01b, /* 004C(:678):    LCD: idx7 = idx7; ; idx7 += inc3 */
-+    0x70000006, /* 0050(:680):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf889, /* 0054(:680):      DRD2B1: idx2 = EU3(); EU3(idx2,var9)  */
-+    0x1000cb28, /* 0058(:681):      DRD1A: *idx2 = idx5; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x70000006, /* 005C(:682):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf889, /* 0060(:682):      DRD2B1: idx2 = EU3(); EU3(idx2,var9)  */
-+    0x1000cb30, /* 0064(:683):      DRD1A: *idx2 = idx6; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x70000006, /* 0068(:684):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf889, /* 006C(:684):      DRD2B1: idx2 = EU3(); EU3(idx2,var9)  */
-+    0x0000cb38, /* 0070(:685):      DRD1A: *idx2 = idx7; FN=0 init=0 WS=0 RS=0 */
-     0x000001f8, /* 0074(:0):    NOP */
--    0xc404601b, /* 0078(:678):  LCDEXT: idx0 = var8, idx1 = var8; ; idx0 += inc3, idx1 += inc3 */
--    0xc004245c, /* 007C(:678):  LCDEXT: idx2 = var0, idx3 = var8; idx3 == var17; idx2 += inc3, idx3 += inc4 */
--    0x809a601b, /* 0080(:679):  LCD: idx4 = var1; ; idx4 += inc3 */
--    0xda9b001b, /* 0084(:682):    LCDEXT: idx5 = idx5, idx6 = idx6; idx5 once var0; idx5 += inc3, idx6 += inc3 */
--    0x9b9be01b, /* 0088(:682):    LCD: idx7 = idx7; ; idx7 += inc3 */
--    0x0000d3a0, /* 008C(:683):      DRD1A: *idx4; FN=0 init=0 WS=0 RS=0 */
--    0xc207a182, /* 0090(:685):    LCDEXT: idx5 = var4, idx6 = var15; idx6 < var6; idx5 += inc0, idx6 += inc2 */
--    0x869be009, /* 0094(:685):    LCD: idx7 = var13; ; idx7 += inc1 */
--    0x0bfed7b8, /* 0098(:688):      DRD1A: *idx7; FN=0 TFD init=31 WS=3 RS=3 */
--    0xda9b001b, /* 009C(:690):    LCDEXT: idx5 = idx5, idx6 = idx6; idx5 once var0; idx5 += inc3, idx6 += inc3 */
--    0x9b9be01b, /* 00A0(:690):    LCD: idx7 = idx7; ; idx7 += inc3 */
--    0x70000006, /* 00A4(:692):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
--    0x088cf890, /* 00A8(:692):      DRD2B1: idx2 = EU3(); EU3(idx2,var16)  */
--    0x1000cb28, /* 00AC(:693):      DRD1A: *idx2 = idx5; FN=0 MORE init=0 WS=0 RS=0 */
--    0x70000006, /* 00B0(:694):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
--    0x088cf890, /* 00B4(:694):      DRD2B1: idx2 = EU3(); EU3(idx2,var16)  */
--    0x1000cb30, /* 00B8(:695):      DRD1A: *idx2 = idx6; FN=0 MORE init=0 WS=0 RS=0 */
--    0x70000006, /* 00BC(:696):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
--    0x088cf890, /* 00C0(:696):      DRD2B1: idx2 = EU3(); EU3(idx2,var16)  */
--    0x0000cb38, /* 00C4(:697):      DRD1A: *idx2 = idx7; FN=0 init=0 WS=0 RS=0 */
-+    0xc202601b, /* 0078(:689):  LCDEXT: idx0 = var4, idx1 = var4; ; idx0 += inc3, idx1 += inc3 */
-+    0xc002229c, /* 007C(:689):  LCDEXT: idx2 = var0, idx3 = var4; idx3 == var10; idx2 += inc3, idx3 += inc4 */
-+    0x809a601b, /* 0080(:690):  LCD: idx4 = var1; ; idx4 += inc3 */
-+    0xda9b001b, /* 0084(:693):    LCDEXT: idx5 = idx5, idx6 = idx6; idx5 once var0; idx5 += inc3, idx6 += inc3 */
-+    0x9b9be01b, /* 0088(:693):    LCD: idx7 = idx7; ; idx7 += inc3 */
-+    0x0000d3a0, /* 008C(:694):      DRD1A: *idx4; FN=0 init=0 WS=0 RS=0 */
-+    0xc10420c2, /* 0090(:696):    LCDEXT: idx5 = var2, idx6 = var8; idx6 < var3; idx5 += inc0, idx6 += inc2 */
-+    0x839be009, /* 0094(:696):    LCD: idx7 = var7; ; idx7 += inc1 */
-+    0x0bfed7b8, /* 0098(:699):      DRD1A: *idx7; FN=0 TFD init=31 WS=3 RS=3 */
-+    0xda9b001b, /* 009C(:701):    LCDEXT: idx5 = idx5, idx6 = idx6; idx5 once var0; idx5 += inc3, idx6 += inc3 */
-+    0x9b9be01b, /* 00A0(:701):    LCD: idx7 = idx7; ; idx7 += inc3 */
-+    0x70000006, /* 00A4(:703):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf889, /* 00A8(:703):      DRD2B1: idx2 = EU3(); EU3(idx2,var9)  */
-+    0x1000cb28, /* 00AC(:704):      DRD1A: *idx2 = idx5; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x70000006, /* 00B0(:705):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf889, /* 00B4(:705):      DRD2B1: idx2 = EU3(); EU3(idx2,var9)  */
-+    0x1000cb30, /* 00B8(:706):      DRD1A: *idx2 = idx6; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x70000006, /* 00BC(:707):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf889, /* 00C0(:707):      DRD2B1: idx2 = EU3(); EU3(idx2,var9)  */
-+    0x0000cb38, /* 00C4(:708):      DRD1A: *idx2 = idx7; FN=0 init=0 WS=0 RS=0 */
-     0x000001f8, /* 00C8(:0):    NOP */
--    0xc51803ed, /* 00CC(:701):  LCDEXT: idx0 = var10; idx0 > var15; idx0 += inc5 */
--    0x8018801b, /* 00D0(:701):  LCD: idx1 = var0; idx1 once var0; idx1 += inc3 */
--    0x040001f8, /* 00D4(:702):    DRD1A: FN=0 INT init=0 WS=0 RS=0 */
-+    0xc318022d, /* 00CC(:712):  LCDEXT: idx0 = var6; idx0 > var8; idx0 += inc5 */
-+    0x8018801b, /* 00D0(:712):  LCD: idx1 = var0; idx1 once var0; idx1 += inc3 */
-+    0x040001f8, /* 00D4(:713):    DRD1A: FN=0 INT init=0 WS=0 RS=0 */
- };
- #ifdef MCD_INCLUDE_EU
- u32 MCD_ChainEu_TDT[]=
- {
--    0x80004000, /* 0000(:928):  LCDEXT: idx0 = 0x00000000; ; */
--    0x8118801b, /* 0004(:928):  LCD: idx1 = var2; idx1 once var0; idx1 += inc3 */
--    0xb8ca0018, /* 0008(:929):    LCD: idx2 = *(idx1 + var20); idx2 once var0; idx2 += inc3 */
--    0x10004b10, /* 000C(:930):      DRD1A: var18 = idx2; FN=0 MORE init=0 WS=0 RS=0 */
--    0x7000000c, /* 0010(:931):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=12 EXT MORE init=0 WS=0 RS=0 */
--    0x024cf89f, /* 0014(:931):      DRD2B1: var9 = EU3(); EU3(idx2)  */
--    0x60000009, /* 0018(:932):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=9 EXT init=0 WS=0 RS=0 */
--    0x080cf89f, /* 001C(:932):      DRD2B1: idx0 = EU3(); EU3(idx2)  */
-+    0x80004000, /* 0000(:947):  LCDEXT: idx0 = 0x00000000; ; */
-+    0x8198801b, /* 0004(:947):  LCD: idx1 = var3; idx1 once var0; idx1 += inc3 */
-+    0xb8c68018, /* 0008(:948):    LCD: idx2 = *(idx1 + var13); idx2 once var0; idx2 += inc3 */
-+    0x10002f10, /* 000C(:949):      DRD1A: var11 = idx2; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x7000000d, /* 0010(:950):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=13 EXT MORE init=0 WS=0 RS=0 */
-+    0x01ccf89f, /* 0014(:950):      DRD2B1: var7 = EU3(); EU3(idx2)  */
-+    0x6000000a, /* 0018(:951):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=10 EXT init=0 WS=0 RS=0 */
-+    0x080cf89f, /* 001C(:951):      DRD2B1: idx0 = EU3(); EU3(idx2)  */
-     0x000001f8, /* 0020(:0):    NOP */
--    0x98180524, /* 0024(:936):  LCD: idx0 = idx0; idx0 != var20; idx0 += inc4 */
--    0x8118801b, /* 0028(:938):    LCD: idx1 = var2; idx1 once var0; idx1 += inc3 */
--    0xf8ca001a, /* 002C(:939):      LCDEXT: idx2 = *(idx1 + var20 + 8); idx2 once var0; idx2 += inc3 */
--    0xb8ca601b, /* 0030(:940):      LCD: idx3 = *(idx1 + var20 + 12); ; idx3 += inc3 */
--    0x10004310, /* 0034(:942):        DRD1A: var16 = idx2; FN=0 MORE init=0 WS=0 RS=0 */
--    0x00001718, /* 0038(:943):        DRD1A: var5 = idx3; FN=0 init=0 WS=0 RS=0 */
--    0xb8ca001d, /* 003C(:945):      LCD: idx2 = *(idx1 + var20 + 20); idx2 once var0; idx2 += inc3 */
--    0x10001f10, /* 0040(:946):        DRD1A: var7 = idx2; FN=0 MORE init=0 WS=0 RS=0 */
--    0x60000007, /* 0044(:947):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=7 EXT init=0 WS=0 RS=0 */
--    0x020cf893, /* 0048(:947):        DRD2B1: var8 = EU3(); EU3(idx2,var19)  */
--    0x98ca001c, /* 004C(:949):      LCD: idx2 = idx1 + var20 + 4; idx2 once var0; idx2 += inc3 */
--    0x00000710, /* 0050(:950):        DRD1A: var1 = idx2; FN=0 init=0 WS=0 RS=0 */
--    0x98ca8018, /* 0054(:951):      LCD: idx2 = idx1 + var21; idx2 once var0; idx2 += inc3 */
--    0x10002b10, /* 0058(:952):        DRD1A: var10 = idx2; FN=0 MORE init=0 WS=0 RS=0 */
--    0x0000c828, /* 005C(:953):        DRD1A: *idx2 = var5; FN=0 init=0 WS=0 RS=0 */
-+    0x981803a4, /* 0024(:955):  LCD: idx0 = idx0; idx0 == var14; idx0 += inc4 */
-+    0x8198801b, /* 0028(:957):    LCD: idx1 = var3; idx1 once var0; idx1 += inc3 */
-+    0xf8c6801a, /* 002C(:958):      LCDEXT: idx2 = *(idx1 + var13 + 8); idx2 once var0; idx2 += inc3 */
-+    0xb8c6e01b, /* 0030(:959):      LCD: idx3 = *(idx1 + var13 + 12); ; idx3 += inc3 */
-+    0x10002b10, /* 0034(:961):        DRD1A: var10 = idx2; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x00001318, /* 0038(:962):        DRD1A: var4 = idx3; FN=0 init=0 WS=0 RS=0 */
-+    0xb8c6801d, /* 003C(:964):      LCD: idx2 = *(idx1 + var13 + 20); idx2 once var0; idx2 += inc3 */
-+    0x10001710, /* 0040(:965):        DRD1A: var5 = idx2; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x60000007, /* 0044(:966):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=7 EXT init=0 WS=0 RS=0 */
-+    0x018cf88c, /* 0048(:966):        DRD2B1: var6 = EU3(); EU3(idx2,var12)  */
-+    0x98c6801c, /* 004C(:968):      LCD: idx2 = idx1 + var13 + 4; idx2 once var0; idx2 += inc3 */
-+    0x00000b10, /* 0050(:969):        DRD1A: var2 = idx2; FN=0 init=0 WS=0 RS=0 */
-+    0x98c78018, /* 0054(:970):      LCD: idx2 = idx1 + var15; idx2 once var0; idx2 += inc3 */
-+    0x10002310, /* 0058(:971):        DRD1A: var8 = idx2; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x0000c820, /* 005C(:972):        DRD1A: *idx2 = var4; FN=0 init=0 WS=0 RS=0 */
-     0x000001f8, /* 0060(:0):      NOP */
--    0xc14ae018, /* 0064(:957):    LCDEXT: idx1 = var2 + var21; ; idx1 += inc3 */
--    0xc004a51d, /* 0068(:957):    LCDEXT: idx2 = var0, idx3 = var9; idx3 == var20; idx2 += inc3, idx3 += inc5 */
--    0x811a601b, /* 006C(:958):    LCD: idx4 = var2; ; idx4 += inc3 */
--    0xc28a21c2, /* 0070(:961):      LCDEXT: idx5 = var5, idx6 = var20; idx6 < var7; idx5 += inc0, idx6 += inc2 */
--    0x881be009, /* 0074(:961):      LCD: idx7 = var16; ; idx7 += inc1 */
--    0x63fe0000, /* 0078(:964):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=0 EXT init=31 WS=3 RS=3 */
--    0x0d4cfddf, /* 007C(:964):        DRD2B1: *idx5 = EU3(); EU3(*idx7)  */
--    0xda9b001b, /* 0080(:966):      LCDEXT: idx5 = idx5, idx6 = idx6; idx5 once var0; idx5 += inc3, idx6 += inc3 */
--    0x9b9be01b, /* 0084(:966):      LCD: idx7 = idx7; ; idx7 += inc3 */
--    0x1000cb20, /* 0088(:967):        DRD1A: *idx2 = idx4; FN=0 MORE init=0 WS=0 RS=0 */
--    0x70000006, /* 008C(:968):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
--    0x088cf896, /* 0090(:968):        DRD2B1: idx2 = EU3(); EU3(idx2,var22)  */
--    0x1000cb28, /* 0094(:969):        DRD1A: *idx2 = idx5; FN=0 MORE init=0 WS=0 RS=0 */
--    0x70000006, /* 0098(:970):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
--    0x088cf896, /* 009C(:970):        DRD2B1: idx2 = EU3(); EU3(idx2,var22)  */
--    0x1000cb30, /* 00A0(:971):        DRD1A: *idx2 = idx6; FN=0 MORE init=0 WS=0 RS=0 */
--    0x70000006, /* 00A4(:972):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
--    0x088cf896, /* 00A8(:972):        DRD2B1: idx2 = EU3(); EU3(idx2,var22)  */
--    0x1000cb38, /* 00AC(:973):        DRD1A: *idx2 = idx7; FN=0 MORE init=0 WS=0 RS=0 */
--    0x0000c728, /* 00B0(:974):        DRD1A: *idx1 = idx5; FN=0 init=0 WS=0 RS=0 */
--    0x000001f8, /* 00B4(:0):      NOP */
--    0xc14ae018, /* 00B8(:978):    LCDEXT: idx1 = var2 + var21; ; idx1 += inc3 */
--    0xc004a5dd, /* 00BC(:978):    LCDEXT: idx2 = var0, idx3 = var9; idx3 == var23; idx2 += inc3, idx3 += inc5 */
--    0x811a601b, /* 00C0(:979):    LCD: idx4 = var2; ; idx4 += inc3 */
--    0xda9b001b, /* 00C4(:982):      LCDEXT: idx5 = idx5, idx6 = idx6; idx5 once var0; idx5 += inc3, idx6 += inc3 */
--    0x9b9be01b, /* 00C8(:982):      LCD: idx7 = idx7; ; idx7 += inc3 */
--    0x0000d3a0, /* 00CC(:983):        DRD1A: *idx4; FN=0 init=0 WS=0 RS=0 */
--    0xc28a21c2, /* 00D0(:985):      LCDEXT: idx5 = var5, idx6 = var20; idx6 < var7; idx5 += inc0, idx6 += inc2 */
--    0x881be009, /* 00D4(:985):      LCD: idx7 = var16; ; idx7 += inc1 */
--    0x6bfe0000, /* 00D8(:988):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=0 TFD EXT init=31 WS=3 RS=3 */
--    0x0d4cfddf, /* 00DC(:988):        DRD2B1: *idx5 = EU3(); EU3(*idx7)  */
--    0xda9b001b, /* 00E0(:990):      LCDEXT: idx5 = idx5, idx6 = idx6; idx5 once var0; idx5 += inc3, idx6 += inc3 */
--    0x9b9be01b, /* 00E4(:990):      LCD: idx7 = idx7; ; idx7 += inc3 */
--    0x1000cb20, /* 00E8(:991):        DRD1A: *idx2 = idx4; FN=0 MORE init=0 WS=0 RS=0 */
--    0x70000006, /* 00EC(:992):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
--    0x088cf896, /* 00F0(:992):        DRD2B1: idx2 = EU3(); EU3(idx2,var22)  */
--    0x1000cb28, /* 00F4(:993):        DRD1A: *idx2 = idx5; FN=0 MORE init=0 WS=0 RS=0 */
--    0x70000006, /* 00F8(:994):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
--    0x088cf896, /* 00FC(:994):        DRD2B1: idx2 = EU3(); EU3(idx2,var22)  */
--    0x1000cb30, /* 0100(:995):        DRD1A: *idx2 = idx6; FN=0 MORE init=0 WS=0 RS=0 */
--    0x70000006, /* 0104(:996):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
--    0x088cf896, /* 0108(:996):        DRD2B1: idx2 = EU3(); EU3(idx2,var22)  */
--    0x1000cb38, /* 010C(:997):        DRD1A: *idx2 = idx7; FN=0 MORE init=0 WS=0 RS=0 */
--    0x0000c728, /* 0110(:998):        DRD1A: *idx1 = idx5; FN=0 init=0 WS=0 RS=0 */
--    0x000001f8, /* 0114(:0):      NOP */
--    0x8118801b, /* 0118(:1002):    LCD: idx1 = var2; idx1 once var0; idx1 += inc3 */
--    0x8a19001b, /* 011C(:1004):      LCD: idx2 = var20; idx2 once var0; idx2 += inc3 */
--    0x6000000e, /* 0120(:1005):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=14 EXT init=0 WS=0 RS=0 */
--    0x088cf49f, /* 0124(:1005):        DRD2B1: idx2 = EU3(); EU3(var18)  */
--    0xd9190536, /* 0128(:1006):      LCDEXT: idx2 = idx2; idx2 == var20; idx2 += inc6 */
--    0x98ca0018, /* 012C(:1006):      LCD: idx3 = idx1 + var20; idx3 once var0; idx3 += inc3 */
--    0x6000000a, /* 0130(:1008):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=10 EXT init=0 WS=0 RS=0 */
--    0x0cccfcdf, /* 0134(:1008):        DRD2B1: *idx3 = EU3(); EU3(*idx3)  */
--    0x000001f8, /* 0138(:0):      NOP */
--    0xa14a001e, /* 013C(:1011):    LCD: idx1 = *(var2 + var20 + 24); idx1 once var0; idx1 += inc3 */
--    0x10000b08, /* 0140(:1012):      DRD1A: var2 = idx1; FN=0 MORE init=0 WS=0 RS=0 */
--    0x10002c90, /* 0144(:1013):      DRD1A: var11 = var18; FN=0 MORE init=0 WS=0 RS=0 */
--    0xb8ca0018, /* 0148(:1014):      LCD: idx2 = *(idx1 + var20); idx2 once var0; idx2 += inc3 */
--    0x10004b10, /* 014C(:1015):        DRD1A: var18 = idx2; FN=0 MORE init=0 WS=0 RS=0 */
--    0x70000009, /* 0150(:1016):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=9 EXT MORE init=0 WS=0 RS=0 */
--    0x080cf89f, /* 0154(:1016):        DRD2B1: idx0 = EU3(); EU3(idx2)  */
--    0x6000000c, /* 0158(:1017):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=12 EXT init=0 WS=0 RS=0 */
--    0x024cf89f, /* 015C(:1017):        DRD2B1: var9 = EU3(); EU3(idx2)  */
--    0x000001f8, /* 0160(:0):      NOP */
--    0x8a18801b, /* 0164(:1023):    LCD: idx1 = var20; idx1 once var0; idx1 += inc3 */
--    0x7000000d, /* 0168(:1024):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=13 EXT MORE init=0 WS=0 RS=0 */
--    0x084cf2df, /* 016C(:1024):      DRD2B1: idx1 = EU3(); EU3(var11)  */
--    0xd899053f, /* 0170(:1025):      LCDEXT: idx2 = idx1; idx2 > var20; idx2 += inc7 */
--    0x8019801b, /* 0174(:1025):      LCD: idx3 = var0; idx3 once var0; idx3 += inc3 */
--    0x040001f8, /* 0178(:1026):        DRD1A: FN=0 INT init=0 WS=0 RS=0 */
--    0x000001f8, /* 017C(:0):      NOP */
--    0x000001f8, /* 0180(:0):    NOP */
-+    0x8698801b, /* 0064(:976):    LCD: idx1 = var13; idx1 once var0; idx1 += inc3 */
-+    0x7000000f, /* 0068(:977):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=15 EXT MORE init=0 WS=0 RS=0 */
-+    0x084cf2df, /* 006C(:977):      DRD2B1: idx1 = EU3(); EU3(var11)  */
-+    0xd899042d, /* 0070(:978):      LCDEXT: idx2 = idx1; idx2 >= var16; idx2 += inc5 */
-+    0x8019801b, /* 0074(:978):      LCD: idx3 = var0; idx3 once var0; idx3 += inc3 */
-+    0x60000003, /* 0078(:979):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=3 EXT init=0 WS=0 RS=0 */
-+    0x2cd7c7df, /* 007C(:979):        DRD2B2: EU3(var13)  */
-+    0xd8990364, /* 0080(:980):      LCDEXT: idx2 = idx1; idx2 == var13; idx2 += inc4 */
-+    0x8019801b, /* 0084(:980):      LCD: idx3 = var0; idx3 once var0; idx3 += inc3 */
-+    0x60000003, /* 0088(:981):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=3 EXT init=0 WS=0 RS=0 */
-+    0x2c17c7df, /* 008C(:981):        DRD2B2: EU3(var1)  */
-+    0x000001f8, /* 0090(:0):      NOP */
-+    0xc1c7e018, /* 0094(:984):    LCDEXT: idx1 = var3 + var15; ; idx1 += inc3 */
-+    0xc003a35e, /* 0098(:984):    LCDEXT: idx2 = var0, idx3 = var7; idx3 == var13; idx2 += inc3, idx3 += inc6 */
-+    0x819a601b, /* 009C(:985):    LCD: idx4 = var3; ; idx4 += inc3 */
-+    0xc206a142, /* 00A0(:988):      LCDEXT: idx5 = var4, idx6 = var13; idx6 < var5; idx5 += inc0, idx6 += inc2 */
-+    0x851be009, /* 00A4(:988):      LCD: idx7 = var10; ; idx7 += inc1 */
-+    0x63fe0000, /* 00A8(:991):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=0 EXT init=31 WS=3 RS=3 */
-+    0x0d4cfddf, /* 00AC(:991):        DRD2B1: *idx5 = EU3(); EU3(*idx7)  */
-+    0xda9b001b, /* 00B0(:993):      LCDEXT: idx5 = idx5, idx6 = idx6; idx5 once var0; idx5 += inc3, idx6 += inc3 */
-+    0x9b9be01b, /* 00B4(:993):      LCD: idx7 = idx7; ; idx7 += inc3 */
-+    0x70000002, /* 00B8(:994):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=2 EXT MORE init=0 WS=0 RS=0 */
-+    0x004cf81f, /* 00BC(:994):        DRD2B1: var1 = EU3(); EU3(idx0)  */
-+    0x1000cb20, /* 00C0(:995):        DRD1A: *idx2 = idx4; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x70000006, /* 00C4(:996):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf891, /* 00C8(:996):        DRD2B1: idx2 = EU3(); EU3(idx2,var17)  */
-+    0x1000cb28, /* 00CC(:997):        DRD1A: *idx2 = idx5; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x70000006, /* 00D0(:998):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf891, /* 00D4(:998):        DRD2B1: idx2 = EU3(); EU3(idx2,var17)  */
-+    0x1000cb30, /* 00D8(:999):        DRD1A: *idx2 = idx6; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x70000006, /* 00DC(:1000):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf891, /* 00E0(:1000):        DRD2B1: idx2 = EU3(); EU3(idx2,var17)  */
-+    0x1000cb38, /* 00E4(:1001):        DRD1A: *idx2 = idx7; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x0000c728, /* 00E8(:1002):        DRD1A: *idx1 = idx5; FN=0 init=0 WS=0 RS=0 */
-+    0x000001f8, /* 00EC(:0):      NOP */
-+    0xc1c7e018, /* 00F0(:1006):    LCDEXT: idx1 = var3 + var15; ; idx1 += inc3 */
-+    0xc003a49e, /* 00F4(:1006):    LCDEXT: idx2 = var0, idx3 = var7; idx3 == var18; idx2 += inc3, idx3 += inc6 */
-+    0x819a601b, /* 00F8(:1007):    LCD: idx4 = var3; ; idx4 += inc3 */
-+    0xda9b001b, /* 00FC(:1010):      LCDEXT: idx5 = idx5, idx6 = idx6; idx5 once var0; idx5 += inc3, idx6 += inc3 */
-+    0x9b9be01b, /* 0100(:1010):      LCD: idx7 = idx7; ; idx7 += inc3 */
-+    0x0000d3a0, /* 0104(:1011):        DRD1A: *idx4; FN=0 init=0 WS=0 RS=0 */
-+    0xc206a142, /* 0108(:1013):      LCDEXT: idx5 = var4, idx6 = var13; idx6 < var5; idx5 += inc0, idx6 += inc2 */
-+    0x851be009, /* 010C(:1013):      LCD: idx7 = var10; ; idx7 += inc1 */
-+    0x6bfe0000, /* 0110(:1016):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=0 TFD EXT init=31 WS=3 RS=3 */
-+    0x0d4cfddf, /* 0114(:1016):        DRD2B1: *idx5 = EU3(); EU3(*idx7)  */
-+    0xda9b001b, /* 0118(:1018):      LCDEXT: idx5 = idx5, idx6 = idx6; idx5 once var0; idx5 += inc3, idx6 += inc3 */
-+    0x9b9be01b, /* 011C(:1018):      LCD: idx7 = idx7; ; idx7 += inc3 */
-+    0x70000002, /* 0120(:1019):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=2 EXT MORE init=0 WS=0 RS=0 */
-+    0x004cf81f, /* 0124(:1019):        DRD2B1: var1 = EU3(); EU3(idx0)  */
-+    0x1000cb20, /* 0128(:1020):        DRD1A: *idx2 = idx4; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x70000006, /* 012C(:1021):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf891, /* 0130(:1021):        DRD2B1: idx2 = EU3(); EU3(idx2,var17)  */
-+    0x1000cb28, /* 0134(:1022):        DRD1A: *idx2 = idx5; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x70000006, /* 0138(:1023):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf891, /* 013C(:1023):        DRD2B1: idx2 = EU3(); EU3(idx2,var17)  */
-+    0x1000cb30, /* 0140(:1024):        DRD1A: *idx2 = idx6; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x70000006, /* 0144(:1025):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf891, /* 0148(:1025):        DRD2B1: idx2 = EU3(); EU3(idx2,var17)  */
-+    0x1000cb38, /* 014C(:1026):        DRD1A: *idx2 = idx7; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x0000c728, /* 0150(:1027):        DRD1A: *idx1 = idx5; FN=0 init=0 WS=0 RS=0 */
-+    0x000001f8, /* 0154(:0):      NOP */
-+    0x8198801b, /* 0158(:1031):    LCD: idx1 = var3; idx1 once var0; idx1 += inc3 */
-+    0xd8c68018, /* 015C(:1033):      LCDEXT: idx2 = idx1 + var13; idx2 once var0; idx2 += inc3 */
-+    0x98c6e01c, /* 0160(:1033):      LCD: idx3 = idx1 + var13 + 4; ; idx3 += inc3 */
-+    0x6000000b, /* 0164(:1034):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=11 EXT init=0 WS=0 RS=0 */
-+    0x0c8cfc9f, /* 0168(:1034):        DRD2B1: *idx2 = EU3(); EU3(*idx2)  */
-+    0x0000cc08, /* 016C(:1035):      DRD1A: *idx3 = var1; FN=0 init=0 WS=0 RS=0 */
-+    0xa1c6801e, /* 0170(:1038):    LCD: idx1 = *(var3 + var13 + 24); idx1 once var0; idx1 += inc3 */
-+    0x10000f08, /* 0174(:1039):      DRD1A: var3 = idx1; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x10002458, /* 0178(:1040):      DRD1A: var9 = var11; FN=0 MORE init=0 WS=0 RS=0 */
-+    0xb8c68018, /* 017C(:1041):      LCD: idx2 = *(idx1 + var13); idx2 once var0; idx2 += inc3 */
-+    0x10002f10, /* 0180(:1042):        DRD1A: var11 = idx2; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x7000000a, /* 0184(:1043):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=10 EXT MORE init=0 WS=0 RS=0 */
-+    0x080cf89f, /* 0188(:1043):        DRD2B1: idx0 = EU3(); EU3(idx2)  */
-+    0x6000000d, /* 018C(:1044):        DRD2A: EU0=0 EU1=0 EU2=0 EU3=13 EXT init=0 WS=0 RS=0 */
-+    0x01ccf89f, /* 0190(:1044):        DRD2B1: var7 = EU3(); EU3(idx2)  */
-+    0x000001f8, /* 0194(:0):      NOP */
-+    0x8698801b, /* 0198(:1050):    LCD: idx1 = var13; idx1 once var0; idx1 += inc3 */
-+    0x7000000e, /* 019C(:1051):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=14 EXT MORE init=0 WS=0 RS=0 */
-+    0x084cf25f, /* 01A0(:1051):      DRD2B1: idx1 = EU3(); EU3(var9)  */
-+    0xd899037f, /* 01A4(:1052):      LCDEXT: idx2 = idx1; idx2 > var13; idx2 += inc7 */
-+    0x8019801b, /* 01A8(:1052):      LCD: idx3 = var0; idx3 once var0; idx3 += inc3 */
-+    0x040001f8, /* 01AC(:1053):        DRD1A: FN=0 INT init=0 WS=0 RS=0 */
-+    0x000001f8, /* 01B0(:0):      NOP */
-+    0x000001f8, /* 01B4(:0):    NOP */
- };
- u32 MCD_SingleEu_TDT[]=
- {
--    0x8318001b, /* 0000(:1204):  LCD: idx0 = var6; idx0 once var0; idx0 += inc3 */
--    0x7000000c, /* 0004(:1205):    DRD2A: EU0=0 EU1=0 EU2=0 EU3=12 EXT MORE init=0 WS=0 RS=0 */
--    0x080cf81f, /* 0008(:1205):    DRD2B1: idx0 = EU3(); EU3(idx0)  */
--    0x8318801b, /* 000C(:1206):    LCD: idx1 = var6; idx1 once var0; idx1 += inc3 */
--    0x6000000d, /* 0010(:1207):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=13 EXT init=0 WS=0 RS=0 */
--    0x084cf85f, /* 0014(:1207):      DRD2B1: idx1 = EU3(); EU3(idx1)  */
-+    0x8218001b, /* 0000(:1248):  LCD: idx0 = var4; idx0 once var0; idx0 += inc3 */
-+    0x7000000d, /* 0004(:1249):    DRD2A: EU0=0 EU1=0 EU2=0 EU3=13 EXT MORE init=0 WS=0 RS=0 */
-+    0x080cf81f, /* 0008(:1249):    DRD2B1: idx0 = EU3(); EU3(idx0)  */
-+    0x8218801b, /* 000C(:1250):    LCD: idx1 = var4; idx1 once var0; idx1 += inc3 */
-+    0x6000000e, /* 0010(:1251):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=14 EXT init=0 WS=0 RS=0 */
-+    0x084cf85f, /* 0014(:1251):      DRD2B1: idx1 = EU3(); EU3(idx1)  */
-     0x000001f8, /* 0018(:0):    NOP */
--    0x8498001b, /* 001C(:1211):  LCD: idx0 = var9; idx0 once var0; idx0 += inc3 */
--    0x7000000c, /* 0020(:1212):    DRD2A: EU0=0 EU1=0 EU2=0 EU3=12 EXT MORE init=0 WS=0 RS=0 */
--    0x020cf81f, /* 0024(:1212):    DRD2B1: var8 = EU3(); EU3(idx0)  */
--    0x6000000d, /* 0028(:1213):    DRD2A: EU0=0 EU1=0 EU2=0 EU3=13 EXT init=0 WS=0 RS=0 */
--    0x028cf81f, /* 002C(:1213):    DRD2B1: var10 = EU3(); EU3(idx0)  */
--    0xc404601b, /* 0030(:1216):  LCDEXT: idx0 = var8, idx1 = var8; ; idx0 += inc3, idx1 += inc3 */
--    0xc00423dc, /* 0034(:1216):  LCDEXT: idx2 = var0, idx3 = var8; idx3 == var15; idx2 += inc3, idx3 += inc4 */
--    0x809a601b, /* 0038(:1217):  LCD: idx4 = var1; ; idx4 += inc3 */
--    0xc207a182, /* 003C(:1220):    LCDEXT: idx5 = var4, idx6 = var15; idx6 < var6; idx5 += inc0, idx6 += inc2 */
--    0x869be009, /* 0040(:1220):    LCD: idx7 = var13; ; idx7 += inc1 */
--    0x63fe0000, /* 0044(:1223):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=0 EXT init=31 WS=3 RS=3 */
--    0x0d4cfddf, /* 0048(:1223):      DRD2B1: *idx5 = EU3(); EU3(*idx7)  */
--    0xda9b001b, /* 004C(:1225):    LCDEXT: idx5 = idx5, idx6 = idx6; idx5 once var0; idx5 += inc3, idx6 += inc3 */
--    0x9b9be01b, /* 0050(:1225):    LCD: idx7 = idx7; ; idx7 += inc3 */
--    0x70000006, /* 0054(:1227):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
--    0x088cf890, /* 0058(:1227):      DRD2B1: idx2 = EU3(); EU3(idx2,var16)  */
--    0x1000cb28, /* 005C(:1228):      DRD1A: *idx2 = idx5; FN=0 MORE init=0 WS=0 RS=0 */
--    0x70000006, /* 0060(:1229):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
--    0x088cf890, /* 0064(:1229):      DRD2B1: idx2 = EU3(); EU3(idx2,var16)  */
--    0x1000cb30, /* 0068(:1230):      DRD1A: *idx2 = idx6; FN=0 MORE init=0 WS=0 RS=0 */
--    0x70000006, /* 006C(:1231):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
--    0x088cf890, /* 0070(:1231):      DRD2B1: idx2 = EU3(); EU3(idx2,var16)  */
--    0x0000cb38, /* 0074(:1232):      DRD1A: *idx2 = idx7; FN=0 init=0 WS=0 RS=0 */
--    0x000001f8, /* 0078(:0):    NOP */
--    0xc404601b, /* 007C(:1236):  LCDEXT: idx0 = var8, idx1 = var8; ; idx0 += inc3, idx1 += inc3 */
--    0xc004245c, /* 0080(:1236):  LCDEXT: idx2 = var0, idx3 = var8; idx3 == var17; idx2 += inc3, idx3 += inc4 */
--    0x809a601b, /* 0084(:1237):  LCD: idx4 = var1; ; idx4 += inc3 */
--    0xda9b001b, /* 0088(:1240):    LCDEXT: idx5 = idx5, idx6 = idx6; idx5 once var0; idx5 += inc3, idx6 += inc3 */
--    0x9b9be01b, /* 008C(:1240):    LCD: idx7 = idx7; ; idx7 += inc3 */
--    0x0000d3a0, /* 0090(:1241):      DRD1A: *idx4; FN=0 init=0 WS=0 RS=0 */
--    0xc207a182, /* 0094(:1243):    LCDEXT: idx5 = var4, idx6 = var15; idx6 < var6; idx5 += inc0, idx6 += inc2 */
--    0x869be009, /* 0098(:1243):    LCD: idx7 = var13; ; idx7 += inc1 */
--    0x6bfe0000, /* 009C(:1246):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=0 TFD EXT init=31 WS=3 RS=3 */
--    0x0d4cfddf, /* 00A0(:1246):      DRD2B1: *idx5 = EU3(); EU3(*idx7)  */
--    0xda9b001b, /* 00A4(:1248):    LCDEXT: idx5 = idx5, idx6 = idx6; idx5 once var0; idx5 += inc3, idx6 += inc3 */
--    0x9b9be01b, /* 00A8(:1248):    LCD: idx7 = idx7; ; idx7 += inc3 */
--    0x70000006, /* 00AC(:1250):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
--    0x088cf890, /* 00B0(:1250):      DRD2B1: idx2 = EU3(); EU3(idx2,var16)  */
--    0x1000cb28, /* 00B4(:1251):      DRD1A: *idx2 = idx5; FN=0 MORE init=0 WS=0 RS=0 */
--    0x70000006, /* 00B8(:1252):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
--    0x088cf890, /* 00BC(:1252):      DRD2B1: idx2 = EU3(); EU3(idx2,var16)  */
--    0x1000cb30, /* 00C0(:1253):      DRD1A: *idx2 = idx6; FN=0 MORE init=0 WS=0 RS=0 */
--    0x70000006, /* 00C4(:1254):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
--    0x088cf890, /* 00C8(:1254):      DRD2B1: idx2 = EU3(); EU3(idx2,var16)  */
--    0x0000cb38, /* 00CC(:1255):      DRD1A: *idx2 = idx7; FN=0 init=0 WS=0 RS=0 */
--    0x000001f8, /* 00D0(:0):    NOP */
--    0xc51803ed, /* 00D4(:1259):  LCDEXT: idx0 = var10; idx0 > var15; idx0 += inc5 */
--    0x8018801b, /* 00D8(:1259):  LCD: idx1 = var0; idx1 once var0; idx1 += inc3 */
--    0x040001f8, /* 00DC(:1260):    DRD1A: FN=0 INT init=0 WS=0 RS=0 */
-+    0x8318001b, /* 001C(:1255):  LCD: idx0 = var6; idx0 once var0; idx0 += inc3 */
-+    0x7000000d, /* 0020(:1256):    DRD2A: EU0=0 EU1=0 EU2=0 EU3=13 EXT MORE init=0 WS=0 RS=0 */
-+    0x014cf81f, /* 0024(:1256):    DRD2B1: var5 = EU3(); EU3(idx0)  */
-+    0x6000000e, /* 0028(:1257):    DRD2A: EU0=0 EU1=0 EU2=0 EU3=14 EXT init=0 WS=0 RS=0 */
-+    0x01ccf81f, /* 002C(:1257):    DRD2B1: var7 = EU3(); EU3(idx0)  */
-+    0x8498001b, /* 0030(:1260):  LCD: idx0 = var9; idx0 once var0; idx0 += inc3 */
-+    0x7000000f, /* 0034(:1261):    DRD2A: EU0=0 EU1=0 EU2=0 EU3=15 EXT MORE init=0 WS=0 RS=0 */
-+    0x080cf19f, /* 0038(:1261):    DRD2B1: idx0 = EU3(); EU3(var6)  */
-+    0xd81882a4, /* 003C(:1262):    LCDEXT: idx1 = idx0; idx1 >= var10; idx1 += inc4 */
-+    0x8019001b, /* 0040(:1262):    LCD: idx2 = var0; idx2 once var0; idx2 += inc3 */
-+    0x60000003, /* 0044(:1263):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=3 EXT init=0 WS=0 RS=0 */
-+    0x2c97c7df, /* 0048(:1263):      DRD2B2: EU3(var9)  */
-+    0xd818826d, /* 004C(:1264):    LCDEXT: idx1 = idx0; idx1 == var9; idx1 += inc5 */
-+    0x8019001b, /* 0050(:1264):    LCD: idx2 = var0; idx2 once var0; idx2 += inc3 */
-+    0x60000003, /* 0054(:1265):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=3 EXT init=0 WS=0 RS=0 */
-+    0x2c17c7df, /* 0058(:1265):      DRD2B2: EU3(var1)  */
-+    0x000001f8, /* 005C(:0):    NOP */
-+    0xc282e01b, /* 0060(:1268):  LCDEXT: idx0 = var5, idx1 = var5; ; idx0 += inc3, idx1 += inc3 */
-+    0xc002a25e, /* 0064(:1268):  LCDEXT: idx2 = var0, idx3 = var5; idx3 == var9; idx2 += inc3, idx3 += inc6 */
-+    0x811a601b, /* 0068(:1269):  LCD: idx4 = var2; ; idx4 += inc3 */
-+    0xc184a102, /* 006C(:1272):    LCDEXT: idx5 = var3, idx6 = var9; idx6 < var4; idx5 += inc0, idx6 += inc2 */
-+    0x841be009, /* 0070(:1272):    LCD: idx7 = var8; ; idx7 += inc1 */
-+    0x63fe0000, /* 0074(:1275):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=0 EXT init=31 WS=3 RS=3 */
-+    0x0d4cfddf, /* 0078(:1275):      DRD2B1: *idx5 = EU3(); EU3(*idx7)  */
-+    0xda9b001b, /* 007C(:1277):    LCDEXT: idx5 = idx5, idx6 = idx6; idx5 once var0; idx5 += inc3, idx6 += inc3 */
-+    0x9b9be01b, /* 0080(:1277):    LCD: idx7 = idx7; ; idx7 += inc3 */
-+    0x70000002, /* 0084(:1279):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=2 EXT MORE init=0 WS=0 RS=0 */
-+    0x004cf99f, /* 0088(:1279):      DRD2B1: var1 = EU3(); EU3(idx6)  */
-+    0x70000006, /* 008C(:1280):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf88b, /* 0090(:1280):      DRD2B1: idx2 = EU3(); EU3(idx2,var11)  */
-+    0x1000cb28, /* 0094(:1281):      DRD1A: *idx2 = idx5; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x70000006, /* 0098(:1282):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf88b, /* 009C(:1282):      DRD2B1: idx2 = EU3(); EU3(idx2,var11)  */
-+    0x1000cb30, /* 00A0(:1283):      DRD1A: *idx2 = idx6; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x70000006, /* 00A4(:1284):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf88b, /* 00A8(:1284):      DRD2B1: idx2 = EU3(); EU3(idx2,var11)  */
-+    0x0000cb38, /* 00AC(:1285):      DRD1A: *idx2 = idx7; FN=0 init=0 WS=0 RS=0 */
-+    0x000001f8, /* 00B0(:0):    NOP */
-+    0xc282e01b, /* 00B4(:1289):  LCDEXT: idx0 = var5, idx1 = var5; ; idx0 += inc3, idx1 += inc3 */
-+    0xc002a31e, /* 00B8(:1289):  LCDEXT: idx2 = var0, idx3 = var5; idx3 == var12; idx2 += inc3, idx3 += inc6 */
-+    0x811a601b, /* 00BC(:1290):  LCD: idx4 = var2; ; idx4 += inc3 */
-+    0xda9b001b, /* 00C0(:1293):    LCDEXT: idx5 = idx5, idx6 = idx6; idx5 once var0; idx5 += inc3, idx6 += inc3 */
-+    0x9b9be01b, /* 00C4(:1293):    LCD: idx7 = idx7; ; idx7 += inc3 */
-+    0x0000d3a0, /* 00C8(:1294):      DRD1A: *idx4; FN=0 init=0 WS=0 RS=0 */
-+    0xc184a102, /* 00CC(:1296):    LCDEXT: idx5 = var3, idx6 = var9; idx6 < var4; idx5 += inc0, idx6 += inc2 */
-+    0x841be009, /* 00D0(:1296):    LCD: idx7 = var8; ; idx7 += inc1 */
-+    0x6bfe0000, /* 00D4(:1299):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=0 TFD EXT init=31 WS=3 RS=3 */
-+    0x0d4cfddf, /* 00D8(:1299):      DRD2B1: *idx5 = EU3(); EU3(*idx7)  */
-+    0xda9b001b, /* 00DC(:1301):    LCDEXT: idx5 = idx5, idx6 = idx6; idx5 once var0; idx5 += inc3, idx6 += inc3 */
-+    0x9b9be01b, /* 00E0(:1301):    LCD: idx7 = idx7; ; idx7 += inc3 */
-+    0x70000002, /* 00E4(:1303):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=2 EXT MORE init=0 WS=0 RS=0 */
-+    0x004cf99f, /* 00E8(:1303):      DRD2B1: var1 = EU3(); EU3(idx6)  */
-+    0x70000006, /* 00EC(:1304):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf88b, /* 00F0(:1304):      DRD2B1: idx2 = EU3(); EU3(idx2,var11)  */
-+    0x1000cb28, /* 00F4(:1305):      DRD1A: *idx2 = idx5; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x70000006, /* 00F8(:1306):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf88b, /* 00FC(:1306):      DRD2B1: idx2 = EU3(); EU3(idx2,var11)  */
-+    0x1000cb30, /* 0100(:1307):      DRD1A: *idx2 = idx6; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x70000006, /* 0104(:1308):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=6 EXT MORE init=0 WS=0 RS=0 */
-+    0x088cf88b, /* 0108(:1308):      DRD2B1: idx2 = EU3(); EU3(idx2,var11)  */
-+    0x0000cb38, /* 010C(:1309):      DRD1A: *idx2 = idx7; FN=0 init=0 WS=0 RS=0 */
-+    0x000001f8, /* 0110(:0):    NOP */
-+    0x8144801c, /* 0114(:1312):  LCD: idx0 = var2 + var9 + 4; idx0 once var0; idx0 += inc3 */
-+    0x0000c008, /* 0118(:1313):    DRD1A: *idx0 = var1; FN=0 init=0 WS=0 RS=0 */
-+    0xc398027f, /* 011C(:1315):  LCDEXT: idx0 = var7; idx0 > var9; idx0 += inc7 */
-+    0x8018801b, /* 0120(:1315):  LCD: idx1 = var0; idx1 once var0; idx1 += inc3 */
-+    0x040001f8, /* 0124(:1316):    DRD1A: FN=0 INT init=0 WS=0 RS=0 */
- };
- #endif
- u32 MCD_ENetRcv_TDT[]=
- {
--    0x80004000, /* 0000(:1334):  LCDEXT: idx0 = 0x00000000; ; */
--    0x82188000, /* 0004(:1334):  LCD: idx1 = var4; idx1 once var0; idx1 += inc0 */
--    0x10000788, /* 0008(:1335):    DRD1A: var1 = *idx1; FN=0 MORE init=0 WS=0 RS=0 */
--    0x60000009, /* 000C(:1336):    DRD2A: EU0=0 EU1=0 EU2=0 EU3=9 EXT init=0 WS=0 RS=0 */
--    0x080cf05f, /* 0010(:1336):    DRD2B1: idx0 = EU3(); EU3(var1)  */
--    0x98180249, /* 0014(:1339):  LCD: idx0 = idx0; idx0 != var9; idx0 += inc1 */
--    0x82448004, /* 0018(:1341):    LCD: idx1 = var4 + var9 + 4; idx1 once var0; idx1 += inc0 */
--    0x7000000d, /* 001C(:1342):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=13 EXT MORE init=0 WS=0 RS=0 */
--    0x014cf05f, /* 0020(:1342):      DRD2B1: var5 = EU3(); EU3(var1)  */
--    0x7000000b, /* 0024(:1343):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=11 EXT MORE init=0 WS=0 RS=0 */
--    0x020cf05f, /* 0028(:1343):      DRD2B1: var8 = EU3(); EU3(var1)  */
--    0x70000004, /* 002C(:1344):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=4 EXT MORE init=0 WS=0 RS=0 */
--    0x018cf04a, /* 0030(:1344):      DRD2B1: var6 = EU3(); EU3(var1,var10)  */
--    0x70000004, /* 0034(:1345):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=4 EXT MORE init=0 WS=0 RS=0 */
--    0x004cf04b, /* 0038(:1345):      DRD2B1: var1 = EU3(); EU3(var1,var11)  */
--    0x00000b88, /* 003C(:1348):      DRD1A: var2 = *idx1; FN=0 init=0 WS=0 RS=0 */
--    0xc4838190, /* 0040(:1351):    LCDEXT: idx1 = var9, idx2 = var7; idx1 < var6; idx1 += inc2, idx2 += inc0 */
--    0x8119e012, /* 0044(:1351):    LCD: idx3 = var2; ; idx3 += inc2 */
--    0x03e0cf90, /* 0048(:1354):      DRD1A: *idx3 = *idx2; FN=0 init=31 WS=0 RS=0 */
--    0x81188000, /* 004C(:1357):    LCD: idx1 = var2; idx1 once var0; idx1 += inc0 */
--    0x000ac788, /* 0050(:1358):      DRD1A: *idx1 = *idx1; FN=0 init=0 WS=1 RS=1 */
--    0xc4838000, /* 0054(:1360):    LCDEXT: idx1 = var9, idx2 = var7; idx1 once var0; idx1 += inc0, idx2 += inc0 */
--    0x8219e000, /* 0058(:1360):    LCD: idx3 = var4; ; idx3 += inc0 */
--    0x70000004, /* 005C(:1368):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=4 EXT MORE init=0 WS=0 RS=0 */
--    0x084cfc8c, /* 0060(:1368):      DRD2B1: idx1 = EU3(); EU3(*idx2,var12)  */
--    0x60000005, /* 0064(:1371):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=5 EXT init=0 WS=0 RS=0 */
--    0x0cccf841, /* 0068(:1371):      DRD2B1: *idx3 = EU3(); EU3(idx1,var1)  */
--    0x82468000, /* 006C(:1377):    LCD: idx1 = var4 + var13; idx1 once var0; idx1 += inc0 */
--    0xc419025b, /* 0070(:1379):      LCDEXT: idx2 = var8; idx2 > var9; idx2 += inc3 */
--    0x80198000, /* 0074(:1379):      LCD: idx3 = var0; idx3 once var0; idx3 += inc0 */
--    0x00008400, /* 0078(:1380):        DRD1A: idx1 = var0; FN=0 init=0 WS=0 RS=0 */
--    0x00001308, /* 007C(:1381):      DRD1A: var4 = idx1; FN=0 init=0 WS=0 RS=0 */
--    0x82188000, /* 0080(:1384):    LCD: idx1 = var4; idx1 once var0; idx1 += inc0 */
--    0x10000788, /* 0084(:1385):      DRD1A: var1 = *idx1; FN=0 MORE init=0 WS=0 RS=0 */
--    0x60000009, /* 0088(:1386):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=9 EXT init=0 WS=0 RS=0 */
--    0x080cf05f, /* 008C(:1386):      DRD2B1: idx0 = EU3(); EU3(var1)  */
--    0xc2988249, /* 0090(:1389):    LCDEXT: idx1 = var5; idx1 != var9; idx1 += inc1 */
--    0x80190000, /* 0094(:1389):    LCD: idx2 = var0; idx2 once var0; idx2 += inc0 */
--    0x040001f8, /* 0098(:1390):      DRD1A: FN=0 INT init=0 WS=0 RS=0 */
--    0x000001f8, /* 009C(:0):    NOP */
-+    0x80004000, /* 0000(:1389):  LCDEXT: idx0 = 0x00000000; ; */
-+    0x81988000, /* 0004(:1389):  LCD: idx1 = var3; idx1 once var0; idx1 += inc0 */
-+    0x10000788, /* 0008(:1390):    DRD1A: var1 = *idx1; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x6000000a, /* 000C(:1391):    DRD2A: EU0=0 EU1=0 EU2=0 EU3=10 EXT init=0 WS=0 RS=0 */
-+    0x080cf05f, /* 0010(:1391):    DRD2B1: idx0 = EU3(); EU3(var1)  */
-+    0x98180209, /* 0014(:1394):  LCD: idx0 = idx0; idx0 != var8; idx0 += inc1 */
-+    0x81c40004, /* 0018(:1396):    LCD: idx1 = var3 + var8 + 4; idx1 once var0; idx1 += inc0 */
-+    0x7000000e, /* 001C(:1397):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=14 EXT MORE init=0 WS=0 RS=0 */
-+    0x010cf05f, /* 0020(:1397):      DRD2B1: var4 = EU3(); EU3(var1)  */
-+    0x7000000c, /* 0024(:1398):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=12 EXT MORE init=0 WS=0 RS=0 */
-+    0x01ccf05f, /* 0028(:1398):      DRD2B1: var7 = EU3(); EU3(var1)  */
-+    0x70000004, /* 002C(:1399):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=4 EXT MORE init=0 WS=0 RS=0 */
-+    0x014cf049, /* 0030(:1399):      DRD2B1: var5 = EU3(); EU3(var1,var9)  */
-+    0x70000004, /* 0034(:1400):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=4 EXT MORE init=0 WS=0 RS=0 */
-+    0x004cf04a, /* 0038(:1400):      DRD2B1: var1 = EU3(); EU3(var1,var10)  */
-+    0x00000b88, /* 003C(:1403):      DRD1A: var2 = *idx1; FN=0 init=0 WS=0 RS=0 */
-+    0xc4030150, /* 0040(:1406):    LCDEXT: idx1 = var8, idx2 = var6; idx1 < var5; idx1 += inc2, idx2 += inc0 */
-+    0x8119e012, /* 0044(:1406):    LCD: idx3 = var2; ; idx3 += inc2 */
-+    0x03e0cf90, /* 0048(:1409):      DRD1A: *idx3 = *idx2; FN=0 init=31 WS=0 RS=0 */
-+    0x81188000, /* 004C(:1412):    LCD: idx1 = var2; idx1 once var0; idx1 += inc0 */
-+    0x000ac788, /* 0050(:1413):      DRD1A: *idx1 = *idx1; FN=0 init=0 WS=1 RS=1 */
-+    0xc4030000, /* 0054(:1415):    LCDEXT: idx1 = var8, idx2 = var6; idx1 once var0; idx1 += inc0, idx2 += inc0 */
-+    0x8199e000, /* 0058(:1415):    LCD: idx3 = var3; ; idx3 += inc0 */
-+    0x63e00004, /* 005C(:1418):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=4 EXT init=31 WS=0 RS=0 */
-+    0x084cfc8b, /* 0060(:1418):      DRD2B1: idx1 = EU3(); EU3(*idx2,var11)  */
-+    0xd8990000, /* 0064(:1421):    LCDEXT: idx1 = idx1, idx2 = idx2; idx1 once var0; idx1 += inc0, idx2 += inc0 */
-+    0x9999e000, /* 0068(:1421):    LCD: idx3 = idx3; ; idx3 += inc0 */
-+    0x60000005, /* 006C(:1422):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=5 EXT init=0 WS=0 RS=0 */
-+    0x0cccf841, /* 0070(:1422):      DRD2B1: *idx3 = EU3(); EU3(idx1,var1)  */
-+    0x81c60000, /* 0074(:1427):    LCD: idx1 = var3 + var12; idx1 once var0; idx1 += inc0 */
-+    0xc399021b, /* 0078(:1429):      LCDEXT: idx2 = var7; idx2 > var8; idx2 += inc3 */
-+    0x80198000, /* 007C(:1429):      LCD: idx3 = var0; idx3 once var0; idx3 += inc0 */
-+    0x00008400, /* 0080(:1430):        DRD1A: idx1 = var0; FN=0 init=0 WS=0 RS=0 */
-+    0x00000f08, /* 0084(:1431):      DRD1A: var3 = idx1; FN=0 init=0 WS=0 RS=0 */
-+    0x81988000, /* 0088(:1434):    LCD: idx1 = var3; idx1 once var0; idx1 += inc0 */
-+    0x10000788, /* 008C(:1435):      DRD1A: var1 = *idx1; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x6000000a, /* 0090(:1436):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=10 EXT init=0 WS=0 RS=0 */
-+    0x080cf05f, /* 0094(:1436):      DRD2B1: idx0 = EU3(); EU3(var1)  */
-+    0xc2188209, /* 0098(:1439):    LCDEXT: idx1 = var4; idx1 != var8; idx1 += inc1 */
-+    0x80190000, /* 009C(:1439):    LCD: idx2 = var0; idx2 once var0; idx2 += inc0 */
-+    0x040001f8, /* 00A0(:1440):      DRD1A: FN=0 INT init=0 WS=0 RS=0 */
-+    0x000001f8, /* 00A4(:0):    NOP */
- };
- u32 MCD_ENetXmit_TDT[]=
- {
--    0x80004000, /* 0000(:1465):  LCDEXT: idx0 = 0x00000000; ; */
--    0x81988000, /* 0004(:1465):  LCD: idx1 = var3; idx1 once var0; idx1 += inc0 */
--    0x10000788, /* 0008(:1466):    DRD1A: var1 = *idx1; FN=0 MORE init=0 WS=0 RS=0 */
--    0x60000009, /* 000C(:1467):    DRD2A: EU0=0 EU1=0 EU2=0 EU3=9 EXT init=0 WS=0 RS=0 */
--    0x080cf05f, /* 0010(:1467):    DRD2B1: idx0 = EU3(); EU3(var1)  */
--    0x98180309, /* 0014(:1470):  LCD: idx0 = idx0; idx0 != var12; idx0 += inc1 */
--    0x80004003, /* 0018(:1472):    LCDEXT: idx1 = 0x00000003; ; */
--    0x81c60004, /* 001C(:1472):    LCD: idx2 = var3 + var12 + 4; idx2 once var0; idx2 += inc0 */
--    0x7000000d, /* 0020(:1473):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=13 EXT MORE init=0 WS=0 RS=0 */
--    0x014cf05f, /* 0024(:1473):      DRD2B1: var5 = EU3(); EU3(var1)  */
--    0x7000000b, /* 0028(:1474):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=11 EXT MORE init=0 WS=0 RS=0 */
--    0x028cf05f, /* 002C(:1474):      DRD2B1: var10 = EU3(); EU3(var1)  */
--    0x7000000c, /* 0030(:1475):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=12 EXT MORE init=0 WS=0 RS=0 */
--    0x018cf05f, /* 0034(:1475):      DRD2B1: var6 = EU3(); EU3(var1)  */
--    0x70000004, /* 0038(:1476):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=4 EXT MORE init=0 WS=0 RS=0 */
--    0x01ccf04d, /* 003C(:1476):      DRD2B1: var7 = EU3(); EU3(var1,var13)  */
--    0x10000b90, /* 0040(:1477):      DRD1A: var2 = *idx2; FN=0 MORE init=0 WS=0 RS=0 */
--    0x60000004, /* 0044(:1478):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=4 EXT init=0 WS=0 RS=0 */
--    0x020cf0a1, /* 0048(:1478):      DRD2B1: var8 = EU3(); EU3(var2,idx1)  */
--    0xc3188312, /* 004C(:1481):    LCDEXT: idx1 = var6; idx1 > var12; idx1 += inc2 */
--    0x83c70000, /* 0050(:1481):    LCD: idx2 = var7 + var14; idx2 once var0; idx2 += inc0 */
--    0x00001f10, /* 0054(:1482):      DRD1A: var7 = idx2; FN=0 init=0 WS=0 RS=0 */
--    0xc583a3c3, /* 0058(:1484):    LCDEXT: idx1 = var11, idx2 = var7; idx2 >= var15; idx1 += inc0, idx2 += inc3 */
--    0x81042325, /* 005C(:1484):    LCD: idx3 = var2, idx4 = var8; idx4 == var12; idx3 += inc4, idx4 += inc5 */
--    0x03e0c798, /* 0060(:1489):      DRD1A: *idx1 = *idx3; FN=0 init=31 WS=0 RS=0 */
--    0xd8990000, /* 0064(:1492):    LCDEXT: idx1 = idx1, idx2 = idx2; idx1 once var0; idx1 += inc0, idx2 += inc0 */
--    0x9999e000, /* 0068(:1492):    LCD: idx3 = idx3; ; idx3 += inc0 */
--    0x000acf98, /* 006C(:1493):      DRD1A: *idx3 = *idx3; FN=0 init=0 WS=1 RS=1 */
--    0xd8992306, /* 0070(:1495):    LCDEXT: idx1 = idx1, idx2 = idx2; idx2 > var12; idx1 += inc0, idx2 += inc6 */
--    0x9999e03f, /* 0074(:1495):    LCD: idx3 = idx3; ; idx3 += inc7 */
--    0x03eac798, /* 0078(:1498):      DRD1A: *idx1 = *idx3; FN=0 init=31 WS=1 RS=1 */
--    0xd8990000, /* 007C(:1501):    LCDEXT: idx1 = idx1, idx2 = idx2; idx1 once var0; idx1 += inc0, idx2 += inc0 */
--    0x9999e000, /* 0080(:1501):    LCD: idx3 = idx3; ; idx3 += inc0 */
--    0x000acf98, /* 0084(:1502):      DRD1A: *idx3 = *idx3; FN=0 init=0 WS=1 RS=1 */
--    0xd8990000, /* 0088(:1504):    LCDEXT: idx1 = idx1, idx2 = idx2; idx1 once var0; idx1 += inc0, idx2 += inc0 */
--    0x99832302, /* 008C(:1504):    LCD: idx3 = idx3, idx4 = var6; idx4 > var12; idx3 += inc0, idx4 += inc2 */
--    0x0beac798, /* 0090(:1507):      DRD1A: *idx1 = *idx3; FN=0 TFD init=31 WS=1 RS=1 */
--    0x81988000, /* 0094(:1509):    LCD: idx1 = var3; idx1 once var0; idx1 += inc0 */
--    0x6000000a, /* 0098(:1510):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=10 EXT init=0 WS=0 RS=0 */
--    0x0c4cfc5f, /* 009C(:1510):      DRD2B1: *idx1 = EU3(); EU3(*idx1)  */
--    0x81c80000, /* 00A0(:1512):    LCD: idx1 = var3 + var16; idx1 once var0; idx1 += inc0 */
--    0xc5190312, /* 00A4(:1514):      LCDEXT: idx2 = var10; idx2 > var12; idx2 += inc2 */
--    0x80198000, /* 00A8(:1514):      LCD: idx3 = var0; idx3 once var0; idx3 += inc0 */
--    0x00008400, /* 00AC(:1515):        DRD1A: idx1 = var0; FN=0 init=0 WS=0 RS=0 */
--    0x00000f08, /* 00B0(:1516):      DRD1A: var3 = idx1; FN=0 init=0 WS=0 RS=0 */
--    0x81988000, /* 00B4(:1519):    LCD: idx1 = var3; idx1 once var0; idx1 += inc0 */
--    0x10000788, /* 00B8(:1520):      DRD1A: var1 = *idx1; FN=0 MORE init=0 WS=0 RS=0 */
--    0x60000009, /* 00BC(:1521):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=9 EXT init=0 WS=0 RS=0 */
--    0x080cf05f, /* 00C0(:1521):      DRD2B1: idx0 = EU3(); EU3(var1)  */
--    0xc2988309, /* 00C4(:1524):    LCDEXT: idx1 = var5; idx1 != var12; idx1 += inc1 */
--    0x80190000, /* 00C8(:1524):    LCD: idx2 = var0; idx2 once var0; idx2 += inc0 */
--    0x040001f8, /* 00CC(:1525):      DRD1A: FN=0 INT init=0 WS=0 RS=0 */
-+    0x80004000, /* 0000(:1515):  LCDEXT: idx0 = 0x00000000; ; */
-+    0x81988000, /* 0004(:1515):  LCD: idx1 = var3; idx1 once var0; idx1 += inc0 */
-+    0x10000788, /* 0008(:1516):    DRD1A: var1 = *idx1; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x6000000a, /* 000C(:1517):    DRD2A: EU0=0 EU1=0 EU2=0 EU3=10 EXT init=0 WS=0 RS=0 */
-+    0x080cf05f, /* 0010(:1517):    DRD2B1: idx0 = EU3(); EU3(var1)  */
-+    0x98180309, /* 0014(:1520):  LCD: idx0 = idx0; idx0 != var12; idx0 += inc1 */
-+    0x80004003, /* 0018(:1522):    LCDEXT: idx1 = 0x00000003; ; */
-+    0x81c60004, /* 001C(:1522):    LCD: idx2 = var3 + var12 + 4; idx2 once var0; idx2 += inc0 */
-+    0x7000000e, /* 0020(:1523):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=14 EXT MORE init=0 WS=0 RS=0 */
-+    0x014cf05f, /* 0024(:1523):      DRD2B1: var5 = EU3(); EU3(var1)  */
-+    0x7000000c, /* 0028(:1524):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=12 EXT MORE init=0 WS=0 RS=0 */
-+    0x028cf05f, /* 002C(:1524):      DRD2B1: var10 = EU3(); EU3(var1)  */
-+    0x7000000d, /* 0030(:1525):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=13 EXT MORE init=0 WS=0 RS=0 */
-+    0x018cf05f, /* 0034(:1525):      DRD2B1: var6 = EU3(); EU3(var1)  */
-+    0x70000004, /* 0038(:1526):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=4 EXT MORE init=0 WS=0 RS=0 */
-+    0x01ccf04d, /* 003C(:1526):      DRD2B1: var7 = EU3(); EU3(var1,var13)  */
-+    0x10000b90, /* 0040(:1527):      DRD1A: var2 = *idx2; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x60000004, /* 0044(:1528):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=4 EXT init=0 WS=0 RS=0 */
-+    0x020cf0a1, /* 0048(:1528):      DRD2B1: var8 = EU3(); EU3(var2,idx1)  */
-+    0xc3188312, /* 004C(:1531):    LCDEXT: idx1 = var6; idx1 > var12; idx1 += inc2 */
-+    0x83c70000, /* 0050(:1531):    LCD: idx2 = var7 + var14; idx2 once var0; idx2 += inc0 */
-+    0x00001f10, /* 0054(:1532):      DRD1A: var7 = idx2; FN=0 init=0 WS=0 RS=0 */
-+    0xc583a3c3, /* 0058(:1534):    LCDEXT: idx1 = var11, idx2 = var7; idx2 >= var15; idx1 += inc0, idx2 += inc3 */
-+    0x81042325, /* 005C(:1534):    LCD: idx3 = var2, idx4 = var8; idx4 == var12; idx3 += inc4, idx4 += inc5 */
-+    0x03e0c798, /* 0060(:1539):      DRD1A: *idx1 = *idx3; FN=0 init=31 WS=0 RS=0 */
-+    0xd8990000, /* 0064(:1542):    LCDEXT: idx1 = idx1, idx2 = idx2; idx1 once var0; idx1 += inc0, idx2 += inc0 */
-+    0x9999e000, /* 0068(:1542):    LCD: idx3 = idx3; ; idx3 += inc0 */
-+    0x000acf98, /* 006C(:1543):      DRD1A: *idx3 = *idx3; FN=0 init=0 WS=1 RS=1 */
-+    0xd8992306, /* 0070(:1545):    LCDEXT: idx1 = idx1, idx2 = idx2; idx2 > var12; idx1 += inc0, idx2 += inc6 */
-+    0x9999e03f, /* 0074(:1545):    LCD: idx3 = idx3; ; idx3 += inc7 */
-+    0x03eac798, /* 0078(:1548):      DRD1A: *idx1 = *idx3; FN=0 init=31 WS=1 RS=1 */
-+    0xd8990000, /* 007C(:1551):    LCDEXT: idx1 = idx1, idx2 = idx2; idx1 once var0; idx1 += inc0, idx2 += inc0 */
-+    0x9999e000, /* 0080(:1551):    LCD: idx3 = idx3; ; idx3 += inc0 */
-+    0x000acf98, /* 0084(:1552):      DRD1A: *idx3 = *idx3; FN=0 init=0 WS=1 RS=1 */
-+    0xd8990000, /* 0088(:1554):    LCDEXT: idx1 = idx1, idx2 = idx2; idx1 once var0; idx1 += inc0, idx2 += inc0 */
-+    0x99832302, /* 008C(:1554):    LCD: idx3 = idx3, idx4 = var6; idx4 > var12; idx3 += inc0, idx4 += inc2 */
-+    0x0beac798, /* 0090(:1557):      DRD1A: *idx1 = *idx3; FN=0 TFD init=31 WS=1 RS=1 */
-+    0x81988000, /* 0094(:1559):    LCD: idx1 = var3; idx1 once var0; idx1 += inc0 */
-+    0x6000000b, /* 0098(:1560):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=11 EXT init=0 WS=0 RS=0 */
-+    0x0c4cfc5f, /* 009C(:1560):      DRD2B1: *idx1 = EU3(); EU3(*idx1)  */
-+    0x81c80000, /* 00A0(:1562):    LCD: idx1 = var3 + var16; idx1 once var0; idx1 += inc0 */
-+    0xc5190312, /* 00A4(:1564):      LCDEXT: idx2 = var10; idx2 > var12; idx2 += inc2 */
-+    0x80198000, /* 00A8(:1564):      LCD: idx3 = var0; idx3 once var0; idx3 += inc0 */
-+    0x00008400, /* 00AC(:1565):        DRD1A: idx1 = var0; FN=0 init=0 WS=0 RS=0 */
-+    0x00000f08, /* 00B0(:1566):      DRD1A: var3 = idx1; FN=0 init=0 WS=0 RS=0 */
-+    0x81988000, /* 00B4(:1569):    LCD: idx1 = var3; idx1 once var0; idx1 += inc0 */
-+    0x10000788, /* 00B8(:1570):      DRD1A: var1 = *idx1; FN=0 MORE init=0 WS=0 RS=0 */
-+    0x6000000a, /* 00BC(:1571):      DRD2A: EU0=0 EU1=0 EU2=0 EU3=10 EXT init=0 WS=0 RS=0 */
-+    0x080cf05f, /* 00C0(:1571):      DRD2B1: idx0 = EU3(); EU3(var1)  */
-+    0xc2988309, /* 00C4(:1574):    LCDEXT: idx1 = var5; idx1 != var12; idx1 += inc1 */
-+    0x80190000, /* 00C8(:1574):    LCD: idx2 = var0; idx2 once var0; idx2 += inc0 */
-+    0x040001f8, /* 00CC(:1575):      DRD1A: FN=0 INT init=0 WS=0 RS=0 */
-     0x000001f8, /* 00D0(:0):    NOP */
- };
- 
-+#ifdef MCD_INCLUDE_EU
-+MCD_bufDesc MCD_singleBufDescs[NCHANNELS];
-+#endif
---- a/drivers/dma/MCD_tasksInit.c
-+++ b/drivers/dma/MCD_tasksInit.c
-@@ -1,51 +1,34 @@
--/*********************************************************************
-- *
-- * Copyright (C) 2004  Motorola, Inc.
-- *	MOTOROLA, INC. All Rights Reserved.  
-- *  You are hereby granted a copyright license to use
-- *  the SOFTWARE so long as this entire notice is
-- *  retained without alteration in any modified and/or redistributed
-- *  versions, and that such modified versions are clearly identified
-- *  as such. No licenses are granted by implication, estoppel or
-- *  otherwise under any patents or trademarks of Motorola, Inc. This 
-- *  software is provided on an "AS IS" basis and without warranty.
-- *
-- *  To the maximum extent permitted by applicable law, MOTOROLA 
-- *  DISCLAIMS ALL WARRANTIES WHETHER EXPRESS OR IMPLIED, INCLUDING 
-- *  IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-- *  PURPOSE AND ANY WARRANTY AGAINST INFRINGEMENT WITH REGARD TO THE 
-- *  SOFTWARE (INCLUDING ANY MODIFIED VERSIONS THEREOF) AND ANY 
-- *  ACCOMPANYING WRITTEN MATERIALS.
-- * 
-- *  To the maximum extent permitted by applicable law, IN NO EVENT
-- *  SHALL MOTOROLA BE LIABLE FOR ANY DAMAGES WHATSOEVER (INCLUDING 
-- *  WITHOUT LIMITATION, DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS 
-- *  INTERRUPTION, LOSS OF BUSINESS INFORMATION, OR OTHER PECUNIARY
-- *  LOSS) ARISING OF THE USE OR INABILITY TO USE THE SOFTWARE.   
-- * 
-- *  Motorola assumes no responsibility for the maintenance and support
-- *  of this software
-- ********************************************************************/
- /*
-- * Do not edit!
-- */
-- /*
-- * File:		MCD_tasksInit.c
-- * Purpose:		Function for initialize variable tables of different
-- *              types of tasks.
-+ * drivers/dma/MCD_tasksInit.c
-  *
-- * Notes:
-+ * Copyright (C) 2004-2008 Freescale Semiconductor, Inc.
-+ *     Kurt Mahan <kmahan@freescale.com>
-  *
-+ * 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.
-  *
-- * Modifications:
-- *  	
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-  *
-- */ 
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
- 
--#include <asm/MCD_dma.h>
-+/*
-+ * Autogenerated - Do not edit!
-+ */
-+
-+#include "MCD_dma.h"
- 
- extern dmaRegs *MCD_dmaBar;
- 
-+
- /*
-  * Task 0
-  */
-@@ -53,232 +36,203 @@ extern dmaRegs *MCD_dmaBar;
- void  MCD_startDmaChainNoEu(int *currBD, short srcIncr, short destIncr, int xferSize, short xferSizeIncr, int *cSave, volatile TaskTableEntry *taskTable, int channel)
- {
- 
--	MCD_SET_VAR(taskTable+channel, 2, (u32)currBD);	/* var[2] */
--	MCD_SET_VAR(taskTable+channel, 25, (u32)(0xe000 << 16) | (0xffff & srcIncr));	/* inc[1] */
--	MCD_SET_VAR(taskTable+channel, 24, (u32)(0xe000 << 16) | (0xffff & destIncr));	/* inc[0] */
--	MCD_SET_VAR(taskTable+channel, 19, (u32)xferSize);	/* var[19] */
--	MCD_SET_VAR(taskTable+channel, 26, (u32)(0x2000 << 16) | (0xffff & xferSizeIncr));	/* inc[2] */
--	MCD_SET_VAR(taskTable+channel, 0, (u32)cSave);	/* var[0] */
--	MCD_SET_VAR(taskTable+channel, 1, (u32)0x00000000);	/* var[1] */
--	MCD_SET_VAR(taskTable+channel, 3, (u32)0x00000000);	/* var[3] */
--	MCD_SET_VAR(taskTable+channel, 4, (u32)0x00000000);	/* var[4] */
--	MCD_SET_VAR(taskTable+channel, 5, (u32)0x00000000);	/* var[5] */
--	MCD_SET_VAR(taskTable+channel, 6, (u32)0x00000000);	/* var[6] */
--	MCD_SET_VAR(taskTable+channel, 7, (u32)0x00000000);	/* var[7] */
--	MCD_SET_VAR(taskTable+channel, 8, (u32)0x00000000);	/* var[8] */
--	MCD_SET_VAR(taskTable+channel, 9, (u32)0x00000000);	/* var[9] */
--	MCD_SET_VAR(taskTable+channel, 10, (u32)0x00000000);	/* var[10] */
--	MCD_SET_VAR(taskTable+channel, 11, (u32)0x00000000);	/* var[11] */
--	MCD_SET_VAR(taskTable+channel, 12, (u32)0x00000000);	/* var[12] */
--	MCD_SET_VAR(taskTable+channel, 13, (u32)0x00000000);	/* var[13] */
--	MCD_SET_VAR(taskTable+channel, 14, (u32)0x00000000);	/* var[14] */
--	MCD_SET_VAR(taskTable+channel, 15, (u32)0x00000000);	/* var[15] */
--	MCD_SET_VAR(taskTable+channel, 16, (u32)0x00000000);	/* var[16] */
--	MCD_SET_VAR(taskTable+channel, 17, (u32)0x00000000);	/* var[17] */
--	MCD_SET_VAR(taskTable+channel, 18, (u32)0x00000000);	/* var[18] */
--	MCD_SET_VAR(taskTable+channel, 20, (u32)0x00000000);	/* var[20] */
--	MCD_SET_VAR(taskTable+channel, 21, (u32)0x00000010);	/* var[21] */
--	MCD_SET_VAR(taskTable+channel, 22, (u32)0x00000004);	/* var[22] */
--	MCD_SET_VAR(taskTable+channel, 23, (u32)0x00000080);	/* var[23] */
--	MCD_SET_VAR(taskTable+channel, 27, (u32)0x00000000);	/* inc[3] */
--	MCD_SET_VAR(taskTable+channel, 28, (u32)0x60000000);	/* inc[4] */
--	MCD_SET_VAR(taskTable+channel, 29, (u32)0x80000001);	/* inc[5] */
--	MCD_SET_VAR(taskTable+channel, 30, (u32)0x80000000);	/* inc[6] */
--	MCD_SET_VAR(taskTable+channel, 31, (u32)0x40000000);	/* inc[7] */
-+    MCD_SET_VAR(taskTable+channel, 2, (u32)currBD); /* var[2] */
-+    MCD_SET_VAR(taskTable+channel, 25, (u32)(0xe000 << 16) | (0xffff & srcIncr));   /* inc[1] */
-+    MCD_SET_VAR(taskTable+channel, 24, (u32)(0xe000 << 16) | (0xffff & destIncr));  /* inc[0] */
-+    MCD_SET_VAR(taskTable+channel, 11, (u32)xferSize);  /* var[11] */
-+    MCD_SET_VAR(taskTable+channel, 26, (u32)(0x2000 << 16) | (0xffff & xferSizeIncr));  /* inc[2] */
-+    MCD_SET_VAR(taskTable+channel, 0, (u32)cSave);  /* var[0] */
-+    MCD_SET_VAR(taskTable+channel, 1, (u32)0x00000000); /* var[1] */
-+    MCD_SET_VAR(taskTable+channel, 3, (u32)0x00000000); /* var[3] */
-+    MCD_SET_VAR(taskTable+channel, 4, (u32)0x00000000); /* var[4] */
-+    MCD_SET_VAR(taskTable+channel, 5, (u32)0x00000000); /* var[5] */
-+    MCD_SET_VAR(taskTable+channel, 6, (u32)0x00000000); /* var[6] */
-+    MCD_SET_VAR(taskTable+channel, 7, (u32)0x00000000); /* var[7] */
-+    MCD_SET_VAR(taskTable+channel, 8, (u32)0x00000000); /* var[8] */
-+    MCD_SET_VAR(taskTable+channel, 9, (u32)0x00000000); /* var[9] */
-+    MCD_SET_VAR(taskTable+channel, 10, (u32)0x00000000);    /* var[10] */
-+    MCD_SET_VAR(taskTable+channel, 12, (u32)0x00000000);    /* var[12] */
-+    MCD_SET_VAR(taskTable+channel, 13, (u32)0x80000000);    /* var[13] */
-+    MCD_SET_VAR(taskTable+channel, 14, (u32)0x00000010);    /* var[14] */
-+    MCD_SET_VAR(taskTable+channel, 15, (u32)0x00000004);    /* var[15] */
-+    MCD_SET_VAR(taskTable+channel, 16, (u32)0x08000000);    /* var[16] */
-+    MCD_SET_VAR(taskTable+channel, 27, (u32)0x00000000);    /* inc[3] */
-+    MCD_SET_VAR(taskTable+channel, 28, (u32)0x80000000);    /* inc[4] */
-+    MCD_SET_VAR(taskTable+channel, 29, (u32)0x80000001);    /* inc[5] */
-+    MCD_SET_VAR(taskTable+channel, 30, (u32)0x40000000);    /* inc[6] */
- 
-     /* Set the task's Enable bit in its Task Control Register */
--    MCD_dmaBar->taskControl[channel] |= (u16)0x8000; /* add a MACRO HERE TBD*/
--	
--
-+    MCD_dmaBar->taskControl[channel] |= (u16)0x8000;
- }
- 
- 
- /*
-  * Task 1
-  */
-- 
--void  MCD_startDmaSingleNoEu(char *srcAddr, short srcIncr, char *destAddr, short destIncr, int dmaSize, int dmaSizeMXferSize, short xferSizeIncr, int flags, int *currBD, int *cSave, volatile TaskTableEntry *taskTable, int channel)
-+
-+void  MCD_startDmaSingleNoEu(char *srcAddr, short srcIncr, char *destAddr, short destIncr, int dmaSize, short xferSizeIncr, int flags, int *currBD, int *cSave, volatile TaskTableEntry *taskTable, int channel)
- {
--	
--	MCD_SET_VAR(taskTable+channel, 13, (u32)srcAddr);	/* var[13] */
--	MCD_SET_VAR(taskTable+channel, 25, (u32)(0xe000 << 16) | (0xffff & srcIncr));	/* inc[1] */
--	MCD_SET_VAR(taskTable+channel, 4, (u32)destAddr);	/* var[4] */
--	MCD_SET_VAR(taskTable+channel, 24, (u32)(0xe000 << 16) | (0xffff & destIncr));	/* inc[0] */
--	MCD_SET_VAR(taskTable+channel, 6, (u32)dmaSize);	/* var[6] */
--	MCD_SET_VAR(taskTable+channel, 7, (u32)dmaSizeMXferSize);	/* var[7] */
--	MCD_SET_VAR(taskTable+channel, 26, (u32)(0x2000 << 16) | (0xffff & xferSizeIncr));	/* inc[2] */
--	MCD_SET_VAR(taskTable+channel, 9, (u32)flags);	/* var[9] */
--	MCD_SET_VAR(taskTable+channel, 1, (u32)currBD);	/* var[1] */
--	MCD_SET_VAR(taskTable+channel, 0, (u32)cSave);	/* var[0] */
--	MCD_SET_VAR(taskTable+channel, 2, (u32)0x00000000);	/* var[2] */
--	MCD_SET_VAR(taskTable+channel, 3, (u32)0x00000000);	/* var[3] */
--	MCD_SET_VAR(taskTable+channel, 5, (u32)0x00000000);	/* var[5] */
--	MCD_SET_VAR(taskTable+channel, 8, (u32)0x00000000);	/* var[8] */
--	MCD_SET_VAR(taskTable+channel, 10, (u32)0x00000000);	/* var[10] */
--	MCD_SET_VAR(taskTable+channel, 11, (u32)0x00000000);	/* var[11] */
--	MCD_SET_VAR(taskTable+channel, 12, (u32)0x00000000);	/* var[12] */
--	MCD_SET_VAR(taskTable+channel, 14, (u32)0x00000000);	/* var[14] */
--	MCD_SET_VAR(taskTable+channel, 15, (u32)0x00000000);	/* var[15] */
--	MCD_SET_VAR(taskTable+channel, 16, (u32)0x00000004);	/* var[16] */
--	MCD_SET_VAR(taskTable+channel, 17, (u32)0x00000080);	/* var[17] */
--	MCD_SET_VAR(taskTable+channel, 27, (u32)0x00000000);	/* inc[3] */
--	MCD_SET_VAR(taskTable+channel, 28, (u32)0x80000001);	/* inc[4] */
--	MCD_SET_VAR(taskTable+channel, 29, (u32)0x40000000);	/* inc[5] */
- 
-+    MCD_SET_VAR(taskTable+channel, 7, (u32)srcAddr);    /* var[7] */
-+    MCD_SET_VAR(taskTable+channel, 25, (u32)(0xe000 << 16) | (0xffff & srcIncr));   /* inc[1] */
-+    MCD_SET_VAR(taskTable+channel, 2, (u32)destAddr);   /* var[2] */
-+    MCD_SET_VAR(taskTable+channel, 24, (u32)(0xe000 << 16) | (0xffff & destIncr));  /* inc[0] */
-+    MCD_SET_VAR(taskTable+channel, 3, (u32)dmaSize);    /* var[3] */
-+    MCD_SET_VAR(taskTable+channel, 26, (u32)(0x2000 << 16) | (0xffff & xferSizeIncr));  /* inc[2] */
-+    MCD_SET_VAR(taskTable+channel, 5, (u32)flags);  /* var[5] */
-+    MCD_SET_VAR(taskTable+channel, 1, (u32)currBD); /* var[1] */
-+    MCD_SET_VAR(taskTable+channel, 0, (u32)cSave);  /* var[0] */
-+    MCD_SET_VAR(taskTable+channel, 4, (u32)0x00000000); /* var[4] */
-+    MCD_SET_VAR(taskTable+channel, 6, (u32)0x00000000); /* var[6] */
-+    MCD_SET_VAR(taskTable+channel, 8, (u32)0x00000000); /* var[8] */
-+    MCD_SET_VAR(taskTable+channel, 9, (u32)0x00000004); /* var[9] */
-+    MCD_SET_VAR(taskTable+channel, 10, (u32)0x08000000);    /* var[10] */
-+    MCD_SET_VAR(taskTable+channel, 27, (u32)0x00000000);    /* inc[3] */
-+    MCD_SET_VAR(taskTable+channel, 28, (u32)0x80000001);    /* inc[4] */
-+    MCD_SET_VAR(taskTable+channel, 29, (u32)0x40000000);    /* inc[5] */
- 
--    /* enable the task */
--    MCD_dmaBar->taskControl[channel] |= (u16)0x8000; /* add a MACRO HERE TBD*/
-+    /* Set the task's Enable bit in its Task Control Register */
-+    MCD_dmaBar->taskControl[channel] |= (u16)0x8000;
- }
- 
- 
- /*
-  * Task 2
-  */
-- 
-+
- void  MCD_startDmaChainEu(int *currBD, short srcIncr, short destIncr, int xferSize, short xferSizeIncr, int *cSave, volatile TaskTableEntry *taskTable, int channel)
- {
--	
--	MCD_SET_VAR(taskTable+channel, 2, (u32)currBD);	/* var[2] */
--	MCD_SET_VAR(taskTable+channel, 25, (u32)(0xe000 << 16) | (0xffff & srcIncr));	/* inc[1] */
--	MCD_SET_VAR(taskTable+channel, 24, (u32)(0xe000 << 16) | (0xffff & destIncr));	/* inc[0] */
--	MCD_SET_VAR(taskTable+channel, 19, (u32)xferSize);	/* var[19] */
--	MCD_SET_VAR(taskTable+channel, 26, (u32)(0x2000 << 16) | (0xffff & xferSizeIncr));	/* inc[2] */
--	MCD_SET_VAR(taskTable+channel, 0, (u32)cSave);	/* var[0] */
--	MCD_SET_VAR(taskTable+channel, 1, (u32)0x00000000);	/* var[1] */
--	MCD_SET_VAR(taskTable+channel, 3, (u32)0x00000000);	/* var[3] */
--	MCD_SET_VAR(taskTable+channel, 4, (u32)0x00000000);	/* var[4] */
--	MCD_SET_VAR(taskTable+channel, 5, (u32)0x00000000);	/* var[5] */
--	MCD_SET_VAR(taskTable+channel, 6, (u32)0x00000000);	/* var[6] */
--	MCD_SET_VAR(taskTable+channel, 7, (u32)0x00000000);	/* var[7] */
--	MCD_SET_VAR(taskTable+channel, 8, (u32)0x00000000);	/* var[8] */
--	MCD_SET_VAR(taskTable+channel, 9, (u32)0x00000000);	/* var[9] */
--	MCD_SET_VAR(taskTable+channel, 10, (u32)0x00000000);	/* var[10] */
--	MCD_SET_VAR(taskTable+channel, 11, (u32)0x00000000);	/* var[11] */
--	MCD_SET_VAR(taskTable+channel, 12, (u32)0x00000000);	/* var[12] */
--	MCD_SET_VAR(taskTable+channel, 13, (u32)0x00000000);	/* var[13] */
--	MCD_SET_VAR(taskTable+channel, 14, (u32)0x00000000);	/* var[14] */
--	MCD_SET_VAR(taskTable+channel, 15, (u32)0x00000000);	/* var[15] */
--	MCD_SET_VAR(taskTable+channel, 16, (u32)0x00000000);	/* var[16] */
--	MCD_SET_VAR(taskTable+channel, 17, (u32)0x00000000);	/* var[17] */
--	MCD_SET_VAR(taskTable+channel, 18, (u32)0x00000000);	/* var[18] */
--	MCD_SET_VAR(taskTable+channel, 20, (u32)0x00000000);	/* var[20] */
--	MCD_SET_VAR(taskTable+channel, 21, (u32)0x00000010);	/* var[21] */
--	MCD_SET_VAR(taskTable+channel, 22, (u32)0x00000004);	/* var[22] */
--	MCD_SET_VAR(taskTable+channel, 23, (u32)0x00000080);	/* var[23] */
--	MCD_SET_VAR(taskTable+channel, 27, (u32)0x00000000);	/* inc[3] */
--	MCD_SET_VAR(taskTable+channel, 28, (u32)0x60000000);	/* inc[4] */
--	MCD_SET_VAR(taskTable+channel, 29, (u32)0x80000001);	/* inc[5] */
--	MCD_SET_VAR(taskTable+channel, 30, (u32)0x80000000);	/* inc[6] */
--	MCD_SET_VAR(taskTable+channel, 31, (u32)0x40000000);	/* inc[7] */
- 
--    /*enable the task*/
--    MCD_dmaBar->taskControl[channel] |= (u16)0x8000; /* add a MACRO HERE TBD*/
-+    MCD_SET_VAR(taskTable+channel, 3, (u32)currBD); /* var[3] */
-+    MCD_SET_VAR(taskTable+channel, 25, (u32)(0xe000 << 16) | (0xffff & srcIncr));   /* inc[1] */
-+    MCD_SET_VAR(taskTable+channel, 24, (u32)(0xe000 << 16) | (0xffff & destIncr));  /* inc[0] */
-+    MCD_SET_VAR(taskTable+channel, 12, (u32)xferSize);  /* var[12] */
-+    MCD_SET_VAR(taskTable+channel, 26, (u32)(0x2000 << 16) | (0xffff & xferSizeIncr));  /* inc[2] */
-+    MCD_SET_VAR(taskTable+channel, 0, (u32)cSave);  /* var[0] */
-+    MCD_SET_VAR(taskTable+channel, 1, (u32)0x00000000); /* var[1] */
-+    MCD_SET_VAR(taskTable+channel, 2, (u32)0x00000000); /* var[2] */
-+    MCD_SET_VAR(taskTable+channel, 4, (u32)0x00000000); /* var[4] */
-+    MCD_SET_VAR(taskTable+channel, 5, (u32)0x00000000); /* var[5] */
-+    MCD_SET_VAR(taskTable+channel, 6, (u32)0x00000000); /* var[6] */
-+    MCD_SET_VAR(taskTable+channel, 7, (u32)0x00000000); /* var[7] */
-+    MCD_SET_VAR(taskTable+channel, 8, (u32)0x00000000); /* var[8] */
-+    MCD_SET_VAR(taskTable+channel, 9, (u32)0x00000000); /* var[9] */
-+    MCD_SET_VAR(taskTable+channel, 10, (u32)0x00000000);    /* var[10] */
-+    MCD_SET_VAR(taskTable+channel, 11, (u32)0x00000000);    /* var[11] */
-+    MCD_SET_VAR(taskTable+channel, 13, (u32)0x00000000);    /* var[13] */
-+    MCD_SET_VAR(taskTable+channel, 14, (u32)0x80000000);    /* var[14] */
-+    MCD_SET_VAR(taskTable+channel, 15, (u32)0x00000010);    /* var[15] */
-+    MCD_SET_VAR(taskTable+channel, 16, (u32)0x00000001);    /* var[16] */
-+    MCD_SET_VAR(taskTable+channel, 17, (u32)0x00000004);    /* var[17] */
-+    MCD_SET_VAR(taskTable+channel, 18, (u32)0x08000000);    /* var[18] */
-+    MCD_SET_VAR(taskTable+channel, 27, (u32)0x00000000);    /* inc[3] */
-+    MCD_SET_VAR(taskTable+channel, 28, (u32)0x80000000);    /* inc[4] */
-+    MCD_SET_VAR(taskTable+channel, 29, (u32)0xc0000000);    /* inc[5] */
-+    MCD_SET_VAR(taskTable+channel, 30, (u32)0x80000001);    /* inc[6] */
-+    MCD_SET_VAR(taskTable+channel, 31, (u32)0x40000000);    /* inc[7] */
-+
-+    /* Set the task's Enable bit in its Task Control Register */
-+    MCD_dmaBar->taskControl[channel] |= (u16)0x8000;
- }
- 
- 
- /*
-  * Task 3
-  */
-- 
--void  MCD_startDmaSingleEu(char *srcAddr, short srcIncr, char *destAddr, short destIncr, int dmaSize, int dmaSizeMXferSize, short xferSizeIncr, int flags, int *currBD, int *cSave, volatile TaskTableEntry *taskTable, int channel)
-+
-+void  MCD_startDmaSingleEu(char *srcAddr, short srcIncr, char *destAddr, short destIncr, int dmaSize, short xferSizeIncr, int flags, int *currBD, int *cSave, volatile TaskTableEntry *taskTable, int channel)
- {
--	
--	MCD_SET_VAR(taskTable+channel, 13, (u32)srcAddr);	/* var[13] */
--	MCD_SET_VAR(taskTable+channel, 25, (u32)(0xe000 << 16) | (0xffff & srcIncr));	/* inc[1] */
--	MCD_SET_VAR(taskTable+channel, 4, (u32)destAddr);	/* var[4] */
--	MCD_SET_VAR(taskTable+channel, 24, (u32)(0xe000 << 16) | (0xffff & destIncr));	/* inc[0] */
--	MCD_SET_VAR(taskTable+channel, 6, (u32)dmaSize);	/* var[6] */
--	MCD_SET_VAR(taskTable+channel, 7, (u32)dmaSizeMXferSize);	/* var[7] */
--	MCD_SET_VAR(taskTable+channel, 26, (u32)(0x2000 << 16) | (0xffff & xferSizeIncr));	/* inc[2] */
--	MCD_SET_VAR(taskTable+channel, 9, (u32)flags);	/* var[9] */
--	MCD_SET_VAR(taskTable+channel, 1, (u32)currBD);	/* var[1] */
--	MCD_SET_VAR(taskTable+channel, 0, (u32)cSave);	/* var[0] */
--	MCD_SET_VAR(taskTable+channel, 2, (u32)0x00000000);	/* var[2] */
--	MCD_SET_VAR(taskTable+channel, 3, (u32)0x00000000);	/* var[3] */
--	MCD_SET_VAR(taskTable+channel, 5, (u32)0x00000000);	/* var[5] */
--	MCD_SET_VAR(taskTable+channel, 8, (u32)0x00000000);	/* var[8] */
--	MCD_SET_VAR(taskTable+channel, 10, (u32)0x00000000);	/* var[10] */
--	MCD_SET_VAR(taskTable+channel, 11, (u32)0x00000000);	/* var[11] */
--	MCD_SET_VAR(taskTable+channel, 12, (u32)0x00000000);	/* var[12] */
--	MCD_SET_VAR(taskTable+channel, 14, (u32)0x00000000);	/* var[14] */
--	MCD_SET_VAR(taskTable+channel, 15, (u32)0x00000000);	/* var[15] */
--	MCD_SET_VAR(taskTable+channel, 16, (u32)0x00000004);	/* var[16] */
--	MCD_SET_VAR(taskTable+channel, 17, (u32)0x00000080);	/* var[17] */
--	MCD_SET_VAR(taskTable+channel, 27, (u32)0x00000000);	/* inc[3] */
--	MCD_SET_VAR(taskTable+channel, 28, (u32)0x80000001);	/* inc[4] */
--	MCD_SET_VAR(taskTable+channel, 29, (u32)0x40000000);	/* inc[5] */
- 
--    /*enable the task*/
--    MCD_dmaBar->taskControl[channel] |= (u16)0x8000; /* add a MACRO HERE TBD*/
-+    MCD_SET_VAR(taskTable+channel, 8, (u32)srcAddr);    /* var[8] */
-+    MCD_SET_VAR(taskTable+channel, 25, (u32)(0xe000 << 16) | (0xffff & srcIncr));   /* inc[1] */
-+    MCD_SET_VAR(taskTable+channel, 3, (u32)destAddr);   /* var[3] */
-+    MCD_SET_VAR(taskTable+channel, 24, (u32)(0xe000 << 16) | (0xffff & destIncr));  /* inc[0] */
-+    MCD_SET_VAR(taskTable+channel, 4, (u32)dmaSize);    /* var[4] */
-+    MCD_SET_VAR(taskTable+channel, 26, (u32)(0x2000 << 16) | (0xffff & xferSizeIncr));  /* inc[2] */
-+    MCD_SET_VAR(taskTable+channel, 6, (u32)flags);  /* var[6] */
-+    MCD_SET_VAR(taskTable+channel, 2, (u32)currBD); /* var[2] */
-+    MCD_SET_VAR(taskTable+channel, 0, (u32)cSave);  /* var[0] */
-+    MCD_SET_VAR(taskTable+channel, 1, (u32)0x00000000); /* var[1] */
-+    MCD_SET_VAR(taskTable+channel, 5, (u32)0x00000000); /* var[5] */
-+    MCD_SET_VAR(taskTable+channel, 7, (u32)0x00000000); /* var[7] */
-+    MCD_SET_VAR(taskTable+channel, 9, (u32)0x00000000); /* var[9] */
-+    MCD_SET_VAR(taskTable+channel, 10, (u32)0x00000001);    /* var[10] */
-+    MCD_SET_VAR(taskTable+channel, 11, (u32)0x00000004);    /* var[11] */
-+    MCD_SET_VAR(taskTable+channel, 12, (u32)0x08000000);    /* var[12] */
-+    MCD_SET_VAR(taskTable+channel, 27, (u32)0x00000000);    /* inc[3] */
-+    MCD_SET_VAR(taskTable+channel, 28, (u32)0xc0000000);    /* inc[4] */
-+    MCD_SET_VAR(taskTable+channel, 29, (u32)0x80000000);    /* inc[5] */
-+    MCD_SET_VAR(taskTable+channel, 30, (u32)0x80000001);    /* inc[6] */
-+    MCD_SET_VAR(taskTable+channel, 31, (u32)0x40000000);    /* inc[7] */
- 
-+    /* Set the task's Enable bit in its Task Control Register */
-+    MCD_dmaBar->taskControl[channel] |= (u16)0x8000;
- }
- 
- 
- /*
-  * Task 4
-  */
-- 
-+
- void  MCD_startDmaENetRcv(char *bDBase, char *currBD, char *rcvFifoPtr, volatile TaskTableEntry *taskTable, int channel)
- {
--	
--	MCD_SET_VAR(taskTable+channel, 0, (u32)bDBase);	/* var[0] */
--	MCD_SET_VAR(taskTable+channel, 4, (u32)currBD);	/* var[4] */
--	MCD_SET_VAR(taskTable+channel, 7, (u32)rcvFifoPtr);	/* var[7] */
--	MCD_SET_VAR(taskTable+channel, 1, (u32)0x00000000);	/* var[1] */
--	MCD_SET_VAR(taskTable+channel, 2, (u32)0x00000000);	/* var[2] */
--	MCD_SET_VAR(taskTable+channel, 3, (u32)0x00000000);	/* var[3] */
--	MCD_SET_VAR(taskTable+channel, 5, (u32)0x00000000);	/* var[5] */
--	MCD_SET_VAR(taskTable+channel, 6, (u32)0x00000000);	/* var[6] */
--	MCD_SET_VAR(taskTable+channel, 8, (u32)0x00000000);	/* var[8] */
--	MCD_SET_VAR(taskTable+channel, 9, (u32)0x00000000);	/* var[9] */
--	MCD_SET_VAR(taskTable+channel, 10, (u32)0x0000ffff);	/* var[10] */
--	MCD_SET_VAR(taskTable+channel, 11, (u32)0x30000000);	/* var[11] */
--	MCD_SET_VAR(taskTable+channel, 12, (u32)0x0fffffff);	/* var[12] */
--	MCD_SET_VAR(taskTable+channel, 13, (u32)0x00000008);	/* var[13] */
--	MCD_SET_VAR(taskTable+channel, 24, (u32)0x00000000);	/* inc[0] */
--	MCD_SET_VAR(taskTable+channel, 25, (u32)0x60000000);	/* inc[1] */
--	MCD_SET_VAR(taskTable+channel, 26, (u32)0x20000004);	/* inc[2] */
--	MCD_SET_VAR(taskTable+channel, 27, (u32)0x40000000);	/* inc[3] */
--    /*enable the task*/
--    MCD_dmaBar->taskControl[channel] |= (u16)0x8000; /* add a MACRO HERE TBD*/
- 
-+    MCD_SET_VAR(taskTable+channel, 0, (u32)bDBase); /* var[0] */
-+    MCD_SET_VAR(taskTable+channel, 3, (u32)currBD); /* var[3] */
-+    MCD_SET_VAR(taskTable+channel, 6, (u32)rcvFifoPtr); /* var[6] */
-+    MCD_SET_VAR(taskTable+channel, 1, (u32)0x00000000); /* var[1] */
-+    MCD_SET_VAR(taskTable+channel, 2, (u32)0x00000000); /* var[2] */
-+    MCD_SET_VAR(taskTable+channel, 4, (u32)0x00000000); /* var[4] */
-+    MCD_SET_VAR(taskTable+channel, 5, (u32)0x00000000); /* var[5] */
-+    MCD_SET_VAR(taskTable+channel, 7, (u32)0x00000000); /* var[7] */
-+    MCD_SET_VAR(taskTable+channel, 8, (u32)0x00000000); /* var[8] */
-+    MCD_SET_VAR(taskTable+channel, 9, (u32)0x0000ffff); /* var[9] */
-+    MCD_SET_VAR(taskTable+channel, 10, (u32)0x30000000);    /* var[10] */
-+    MCD_SET_VAR(taskTable+channel, 11, (u32)0x0fffffff);    /* var[11] */
-+    MCD_SET_VAR(taskTable+channel, 12, (u32)0x00000008);    /* var[12] */
-+    MCD_SET_VAR(taskTable+channel, 24, (u32)0x00000000);    /* inc[0] */
-+    MCD_SET_VAR(taskTable+channel, 25, (u32)0x60000000);    /* inc[1] */
-+    MCD_SET_VAR(taskTable+channel, 26, (u32)0x20000004);    /* inc[2] */
-+    MCD_SET_VAR(taskTable+channel, 27, (u32)0x40000000);    /* inc[3] */
-+
-+    /* Set the task's Enable bit in its Task Control Register */
-+    MCD_dmaBar->taskControl[channel] |= (u16)0x8000;
- }
- 
- 
- /*
-  * Task 5
-  */
-- 
-+
- void  MCD_startDmaENetXmit(char *bDBase, char *currBD, char *xmitFifoPtr, volatile TaskTableEntry *taskTable, int channel)
- {
--	
--	MCD_SET_VAR(taskTable+channel, 0, (u32)bDBase);	/* var[0] */
--	MCD_SET_VAR(taskTable+channel, 3, (u32)currBD);	/* var[3] */
--	MCD_SET_VAR(taskTable+channel, 11, (u32)xmitFifoPtr);	/* var[11] */
--	MCD_SET_VAR(taskTable+channel, 1, (u32)0x00000000);	/* var[1] */
--	MCD_SET_VAR(taskTable+channel, 2, (u32)0x00000000);	/* var[2] */
--	MCD_SET_VAR(taskTable+channel, 4, (u32)0x00000000);	/* var[4] */
--	MCD_SET_VAR(taskTable+channel, 5, (u32)0x00000000);	/* var[5] */
--	MCD_SET_VAR(taskTable+channel, 6, (u32)0x00000000);	/* var[6] */
--	MCD_SET_VAR(taskTable+channel, 7, (u32)0x00000000);	/* var[7] */
--	MCD_SET_VAR(taskTable+channel, 8, (u32)0x00000000);	/* var[8] */
--	MCD_SET_VAR(taskTable+channel, 9, (u32)0x00000000);	/* var[9] */
--	MCD_SET_VAR(taskTable+channel, 10, (u32)0x00000000);	/* var[10] */
--	MCD_SET_VAR(taskTable+channel, 12, (u32)0x00000000);	/* var[12] */
--	MCD_SET_VAR(taskTable+channel, 13, (u32)0x0000ffff);	/* var[13] */
--	MCD_SET_VAR(taskTable+channel, 14, (u32)0xffffffff);	/* var[14] */
--	MCD_SET_VAR(taskTable+channel, 15, (u32)0x00000004);	/* var[15] */
--	MCD_SET_VAR(taskTable+channel, 16, (u32)0x00000008);	/* var[16] */
--	MCD_SET_VAR(taskTable+channel, 24, (u32)0x00000000);	/* inc[0] */
--	MCD_SET_VAR(taskTable+channel, 25, (u32)0x60000000);	/* inc[1] */
--	MCD_SET_VAR(taskTable+channel, 26, (u32)0x40000000);	/* inc[2] */
--	MCD_SET_VAR(taskTable+channel, 27, (u32)0xc000fffc);	/* inc[3] */
--	MCD_SET_VAR(taskTable+channel, 28, (u32)0xe0000004);	/* inc[4] */
--	MCD_SET_VAR(taskTable+channel, 29, (u32)0x80000000);	/* inc[5] */
--	MCD_SET_VAR(taskTable+channel, 30, (u32)0x4000ffff);	/* inc[6] */
--	MCD_SET_VAR(taskTable+channel, 31, (u32)0xe0000001);	/* inc[7] */
- 
--    /*enable the task*/
--    MCD_dmaBar->taskControl[channel] |= (u16)0x8000; /* add a MACRO HERE TBD*/
-+    MCD_SET_VAR(taskTable+channel, 0, (u32)bDBase); /* var[0] */
-+    MCD_SET_VAR(taskTable+channel, 3, (u32)currBD); /* var[3] */
-+    MCD_SET_VAR(taskTable+channel, 11, (u32)xmitFifoPtr);   /* var[11] */
-+    MCD_SET_VAR(taskTable+channel, 1, (u32)0x00000000); /* var[1] */
-+    MCD_SET_VAR(taskTable+channel, 2, (u32)0x00000000); /* var[2] */
-+    MCD_SET_VAR(taskTable+channel, 4, (u32)0x00000000); /* var[4] */
-+    MCD_SET_VAR(taskTable+channel, 5, (u32)0x00000000); /* var[5] */
-+    MCD_SET_VAR(taskTable+channel, 6, (u32)0x00000000); /* var[6] */
-+    MCD_SET_VAR(taskTable+channel, 7, (u32)0x00000000); /* var[7] */
-+    MCD_SET_VAR(taskTable+channel, 8, (u32)0x00000000); /* var[8] */
-+    MCD_SET_VAR(taskTable+channel, 9, (u32)0x00000000); /* var[9] */
-+    MCD_SET_VAR(taskTable+channel, 10, (u32)0x00000000);    /* var[10] */
-+    MCD_SET_VAR(taskTable+channel, 12, (u32)0x00000000);    /* var[12] */
-+    MCD_SET_VAR(taskTable+channel, 13, (u32)0x0000ffff);    /* var[13] */
-+    MCD_SET_VAR(taskTable+channel, 14, (u32)0xffffffff);    /* var[14] */
-+    MCD_SET_VAR(taskTable+channel, 15, (u32)0x00000004);    /* var[15] */
-+    MCD_SET_VAR(taskTable+channel, 16, (u32)0x00000008);    /* var[16] */
-+    MCD_SET_VAR(taskTable+channel, 24, (u32)0x00000000);    /* inc[0] */
-+    MCD_SET_VAR(taskTable+channel, 25, (u32)0x60000000);    /* inc[1] */
-+    MCD_SET_VAR(taskTable+channel, 26, (u32)0x40000000);    /* inc[2] */
-+    MCD_SET_VAR(taskTable+channel, 27, (u32)0xc000fffc);    /* inc[3] */
-+    MCD_SET_VAR(taskTable+channel, 28, (u32)0xe0000004);    /* inc[4] */
-+    MCD_SET_VAR(taskTable+channel, 29, (u32)0x80000000);    /* inc[5] */
-+    MCD_SET_VAR(taskTable+channel, 30, (u32)0x4000ffff);    /* inc[6] */
-+    MCD_SET_VAR(taskTable+channel, 31, (u32)0xe0000001);    /* inc[7] */
- 
-+    /* Set the task's Enable bit in its Task Control Register */
-+    MCD_dmaBar->taskControl[channel] |= (u16)0x8000;
- }
---- a/drivers/dma/MCD_tasksInit.h
-+++ b/drivers/dma/MCD_tasksInit.h
-@@ -1,40 +1,31 @@
--/*********************************************************************
-+/*
-+ * drivers/dma/MCD_tasksInit.h
-  *
-- * Copyright (C) 2004  Motorola, Inc.
-- *  MOTOROLA, INC. All Rights Reserved.
-- *  You are hereby granted a copyright license to use
-- *  the SOFTWARE so long as this entire notice is
-- *  retained without alteration in any modified and/or redistributed
-- *  versions, and that such modified versions are clearly identified
-- *  as such. No licenses are granted by implication, estoppel or
-- *  otherwise under any patents or trademarks of Motorola, Inc. This
-- *  software is provided on an "AS IS" basis and without warranty.
-+ * Copyright (C) 2004-2008 Freescale Semiconductor, Inc.
-+ *     Kurt Mahan <kmahan@freescale.com>
-  *
-- *  To the maximum extent permitted by applicable law, MOTOROLA
-- *  DISCLAIMS ALL WARRANTIES WHETHER EXPRESS OR IMPLIED, INCLUDING
-- *  IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-- *  PURPOSE AND ANY WARRANTY AGAINST INFRINGEMENT WITH REGARD TO THE
-- *  SOFTWARE (INCLUDING ANY MODIFIED VERSIONS THEREOF) AND ANY
-- *  ACCOMPANYING WRITTEN MATERIALS.
-+ * 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.
-  *
-- *  To the maximum extent permitted by applicable law, IN NO EVENT
-- *  SHALL MOTOROLA BE LIABLE FOR ANY DAMAGES WHATSOEVER (INCLUDING
-- *  WITHOUT LIMITATION, DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS
-- *  INTERRUPTION, LOSS OF BUSINESS INFORMATION, OR OTHER PECUNIARY
-- *  LOSS) ARISING OF THE USE OR INABILITY TO USE THE SOFTWARE.
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-  *
-- *  Motorola assumes no responsibility for the maintenance and support
-- *  of this software
-- ********************************************************************/
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
- #ifndef MCD_TSK_INIT_H
- #define MCD_TSK_INIT_H 1
- 
- /*
-- * Do not edit!
-+ * Autogenerated - Do not edit!
-  */
- 
--
--
- /*
-  * Task 0
-  */
-@@ -44,7 +35,7 @@ void  MCD_startDmaChainNoEu(int *currBD,
- /*
-  * Task 1
-  */
--void  MCD_startDmaSingleNoEu(char *srcAddr, short srcIncr, char *destAddr, short destIncr, int dmaSize, int dmaSizeMXferSize, short xferSizeIncr, int flags, int *currBD, int *cSave, volatile TaskTableEntry *taskTable, int channel);
-+void  MCD_startDmaSingleNoEu(char *srcAddr, short srcIncr, char *destAddr, short destIncr, int dmaSize, short xferSizeIncr, int flags, int *currBD, int *cSave, volatile TaskTableEntry *taskTable, int channel);
- 
- 
- /*
-@@ -56,7 +47,7 @@ void  MCD_startDmaChainEu(int *currBD, s
- /*
-  * Task 3
-  */
--void  MCD_startDmaSingleEu(char *srcAddr, short srcIncr, char *destAddr, short destIncr, int dmaSize, int dmaSizeMXferSize, short xferSizeIncr, int flags, int *currBD, int *cSave, volatile TaskTableEntry *taskTable, int channel);
-+void  MCD_startDmaSingleEu(char *srcAddr, short srcIncr, char *destAddr, short destIncr, int dmaSize, short xferSizeIncr, int flags, int *currBD, int *cSave, volatile TaskTableEntry *taskTable, int channel);
- 
- 
- /*
diff --git a/target/linux/coldfire/patches/052-m547x_8x_dspi.patch b/target/linux/coldfire/patches/052-m547x_8x_dspi.patch
deleted file mode 100644
index c9277f8cb..000000000
--- a/target/linux/coldfire/patches/052-m547x_8x_dspi.patch
+++ /dev/null
@@ -1,1137 +0,0 @@
-From acc2bc0cd419c176820d4a384eb36498a066366d Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Wed, 30 Apr 2008 14:20:48 -0600
-Subject: [PATCH] DSPI support for M547x/M548x.
-
-LTIBName: m547x-8x-dspi
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/coldfire/Makefile           |    1 +
- arch/m68k/coldfire/m547x_8x-devices.c |  150 +++++++++++++
- drivers/spi/Makefile                  |    3 +-
- drivers/spi/spi_coldfire.c            |  382 ++++++++++++++++-----------------
- include/asm-m68k/m5485dspi.h          |  144 +++++++++++++
- include/asm-m68k/mcfqspi.h            |    1 +
- include/asm-m68k/mcfsim.h             |    1 +
- 7 files changed, 485 insertions(+), 197 deletions(-)
- create mode 100644 arch/m68k/coldfire/m547x_8x-devices.c
- create mode 100644 include/asm-m68k/m5485dspi.h
-
---- a/arch/m68k/coldfire/Makefile
-+++ b/arch/m68k/coldfire/Makefile
-@@ -10,4 +10,5 @@ endif
- 
- obj-$(CONFIG_PCI)	+= pci.o mcf5445x-pci.o iomap.o
- obj-$(CONFIG_M54455)	+= mcf5445x-devices.o
-+obj-$(CONFIG_M547X_8X)	+= m547x_8x-devices.o
- obj-$(CONFIG_MCD_DMA)	+= m547x_8x-dma.o
---- /dev/null
-+++ b/arch/m68k/coldfire/m547x_8x-devices.c
-@@ -0,0 +1,150 @@
-+/*
-+ * arch/m68k/coldfire/m547x_8x-devices.c
-+ *
-+ * Coldfire M547x/M548x Platform Device Configuration
-+ *
-+ * Copyright (c) 2008 Freescale Semiconductor, Inc.
-+ *	Kurt Mahan <kmahan@freescale.com>
-+ */
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+#include <linux/fsl_devices.h>
-+#include <linux/spi/spi.h>
-+
-+#include <asm/coldfire.h>
-+#include <asm/mcfsim.h>
-+#include <asm/mcfqspi.h>
-+
-+
-+#ifdef CONFIG_SPI
-+/*
-+ *
-+ * DSPI
-+ *
-+ */
-+
-+/* number of supported SPI selects */
-+#define SPI_NUM_CHIPSELECTS	4
-+
-+void coldfire_spi_cs_control(u8 cs, u8 command)
-+{
-+	/* nothing special required */
-+}
-+
-+static struct spi_board_info spi_board_info[] = {
-+	/* no board info */
-+};
-+
-+static int spi_irq_list[] = {
-+	/* IRQ, ICR Offset, ICR Val, Mask */
-+	64 + ISC_DSPI_OVRFW, 0, 0, 0,
-+	64 + ISC_DSPI_RFOF,  0, 0, 0,
-+	64 + ISC_DSPI_RFDF,  0, 0, 0,
-+	64 + ISC_DSPI_TFUF,  0, 0, 0,
-+	64 + ISC_DSPI_TCF,   0, 0, 0,
-+	64 + ISC_DSPI_TFFF,  0, 0, 0,
-+	64 + ISC_DSPI_EOQF,  0, 0, 0,
-+	0,0,0,0,
-+};
-+
-+static struct coldfire_spi_master coldfire_master_info = {
-+	.bus_num = 1,
-+	.num_chipselect = SPI_NUM_CHIPSELECTS,
-+	.irq_list = spi_irq_list,
-+	.irq_source = 0,	/* not used */
-+	.irq_vector = 0,	/* not used */
-+	.irq_mask = 0,		/* not used */
-+	.irq_lp = 0,		/* not used */
-+	.par_val = 0,		/* not used */
-+	.cs_control = coldfire_spi_cs_control,
-+};
-+
-+static struct resource coldfire_spi_resources[] = {
-+	[0] = {
-+		.name = "spi-par",
-+		.start = MCF_MBAR + 0x00000a50,	/* PAR_DSPI */
-+		.end = MCF_MBAR + 0x00000a50,	/* PAR_DSPI */
-+		.flags = IORESOURCE_MEM
-+	},
-+
-+	[1] = {
-+		.name = "spi-module",
-+		.start = MCF_MBAR + 0x00008a00,	/* DSPI MCR Base */
-+		.end = MCF_MBAR + 0x00008ab8,	/* DSPI mem map end */
-+		.flags = IORESOURCE_MEM
-+	},
-+
-+	[2] = {
-+		.name = "spi-int-level",
-+		.start = MCF_MBAR + 0x740,		 /* ICR start */
-+		.end = MCF_MBAR + 0x740 + ISC_DSPI_EOQF, /* ICR end */
-+		.flags = IORESOURCE_MEM
-+	},
-+
-+	[3] = {
-+		.name = "spi-int-mask",
-+		.start = MCF_MBAR + 0x70c,	/* IMRL */
-+		.end = MCF_MBAR + 0x70c,	/* IMRL */
-+		.flags = IORESOURCE_MEM
-+	}
-+};
-+
-+static struct platform_device coldfire_spi = {
-+	.name = "spi_coldfire",
-+	.id = -1,
-+	.resource = coldfire_spi_resources,
-+	.num_resources = ARRAY_SIZE(coldfire_spi_resources),
-+	.dev = {
-+		.platform_data = &coldfire_master_info,
-+	}
-+};
-+
-+/**
-+ * m547x_8x_spi_init - Initialize SPI
-+ */
-+static int __init m547x_8x_spi_init(void)
-+{
-+	int retval;
-+
-+	/* initialize the DSPI PAR */
-+	MCF_GPIO_PAR_DSPI = (MCF_GPIO_PAR_DSPI_PAR_CS5 |
-+			     MCF_GPIO_PAR_DSPI_PAR_CS3_DSPICS |
-+			     MCF_GPIO_PAR_DSPI_PAR_CS2_DSPICS |
-+			     MCF_GPIO_PAR_DSPI_PAR_CS0_DSPICS |
-+			     MCF_GPIO_PAR_DSPI_PAR_SCK_SCK |
-+			     MCF_GPIO_PAR_DSPI_PAR_SIN_SIN |
-+			     MCF_GPIO_PAR_DSPI_PAR_SOUT_SOUT);
-+
-+	/* register device */
-+	retval = platform_device_register(&coldfire_spi);
-+	if (retval < 0) {
-+		printk(KERN_ERR "SPI-m547x_8x: platform_device_register failed with code=%d\n", retval);
-+		goto out;
-+	}
-+
-+	/* register board info */
-+	if (ARRAY_SIZE(spi_board_info))
-+		retval = spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info));
-+
-+out:
-+	return retval;
-+}
-+#endif
-+
-+
-+/**
-+ * m547x_8x_init_devices - Initialize M547X_8X devices
-+ *
-+ * Returns 0 on success.
-+ */
-+static int __init m547x_8x_init_devices(void)
-+{
-+#ifdef CONFIG_SPI
-+	m547x_8x_spi_init();
-+#endif
-+
-+	return 0;
-+}
-+arch_initcall(m547x_8x_init_devices);
---- a/drivers/spi/Makefile
-+++ b/drivers/spi/Makefile
-@@ -18,7 +18,8 @@ obj-$(CONFIG_SPI_BFIN)			+= spi_bfin5xx.
- obj-$(CONFIG_SPI_BITBANG)		+= spi_bitbang.o
- obj-$(CONFIG_SPI_AU1550)		+= au1550_spi.o
- obj-$(CONFIG_SPI_BUTTERFLY)		+= spi_butterfly.o
--obj-$(CONFIG_SPI_COLDFIRE)		+= spi_coldfire.o spi-m5445x.o
-+# obj-$(CONFIG_SPI_COLDFIRE)		+= spi_coldfire.o spi-m5445x.o
-+obj-$(CONFIG_SPI_COLDFIRE)		+= spi_coldfire.o
- obj-$(CONFIG_SPI_GPIO)			+= spi_gpio.o
- obj-$(CONFIG_SPI_IMX)			+= spi_imx.o
- obj-$(CONFIG_SPI_LM70_LLP)		+= spi_lm70llp.o
---- a/drivers/spi/spi_coldfire.c
-+++ b/drivers/spi/spi_coldfire.c
-@@ -1,29 +1,39 @@
--/****************************************************************************/
--
- /*
-- *	spi_coldfire.c - Master QSPI/DSPI controller for the ColdFire processors
-+ * spi_coldfire.c - Master QSPI/DSPI controller for the ColdFire processors
-+ *
-  *
-  *	(C) Copyright 2005, Intec Automation,
-  *			    Mike Lavender (mike@steroidmicros)
-  *
-- *	(C) Copyright 2007, Freescale Inc,
-- *			    Yaroslav Vinogradov (yaroslav.vinogradov@freescale.com)
-+ *	(C) Copyright 2007-2008, Freescale Inc,
-+ *			Yaroslav Vinogradov
-+ *			Andrey Butok
-+ *			Kurt Mahan
-  *
--
--     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.
--
--     This program is distributed in the hope that it will be useful,
--     but WITHOUT ANY WARRANTY; without even the implied warranty of
--     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--     GNU General Public License for more details.
--
--     You should have received a copy of the GNU General Public License
--     along with this program; if not, write to the Free Software
--     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.		     */
--/* ------------------------------------------------------------------------- */
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ ***************************************************************************
-+ * Changes:
-+ *   v0.003	12 February 2008	Andrey Butok, Freescale Semiconductor
-+ *   		Added suport of MCF5227x DSPI module.
-+ *   v0.002	2007	Yaroslav Vinogradov, Freescale Semiconductor
-+ *   		Added suport of MCF5445x DSPI module.
-+ *   v0.001	2005		Mike Lavender, Intec Automation,
-+ *   		Intial version. Coldfire QSPI master driver.
-+ *
-+ */
- 
- 
- /****************************************************************************/
-@@ -46,41 +56,52 @@
- #include <asm/mcfsim.h>
- #include <asm/mcfqspi.h>
- #include <asm/coldfire.h>
--#include <asm/virtconvert.h>
- 
- #if defined(CONFIG_M54455)
-+	#include <asm/virtconvert.h>
-+
- 	#define SPI_DSPI
- 	#if defined(CONFIG_SPI_COLDFIRE_DSPI_EDMA)
- 		#define SPI_DSPI_EDMA
- 		#ifdef CONFIG_MMU
- 			#define SPI_USE_MMU
- 		#endif
-+		#include <asm/mcf5445x_edma.h>
- 	#endif
-+
-+	#include <asm/mcf5445x_dspi.h>
- #endif
- 
--#ifdef SPI_DSPI
--#include <asm/mcf5445x_dspi.h>
-+#if defined(CONFIG_M547X_8X)
-+	#define SPI_DSPI
-+
-+	#include <asm/virtconvert.h>
-+	#include <asm/m5485dspi.h>
-+#endif
- 
-+#ifdef CONFIG_M5227x
-+	#define SPI_DSPI
- 
-+	#if defined(CONFIG_SPI_COLDFIRE_DSPI_EDMA)
-+		#define SPI_DSPI_EDMA
-+	#endif
- #endif
- 
-+
- #if defined(SPI_DSPI_EDMA)
- 
- /* edma buffer size in transfer units (32bits) */
- #define EDMA_BUFFER_SIZE	(PAGE_SIZE/4)
--#define EDMA_BUFSIZE_KMALLOC (EDMA_BUFFER_SIZE*4)
--
--#define DSPI_DMA_RX_TCD	12
--#define DSPI_DMA_TX_TCD 13
-+#define EDMA_BUFSIZE_KMALLOC	(EDMA_BUFFER_SIZE*4)
- 
-+#define DSPI_DMA_RX_TCD		MCF_EDMA_CHAN_DSPI_RX
-+#define DSPI_DMA_TX_TCD 	MCF_EDMA_CHAN_DSPI_TX
- 
--#include <asm/coldfire_edma.h>
--#include <asm/mcf5445x_edma.h>
-+#include <asm/mcf_edma.h>
- #endif
- 
--
- MODULE_AUTHOR("Mike Lavender");
--MODULE_DESCRIPTION("ColdFire QSPI Contoller");
-+MODULE_DESCRIPTION("ColdFire SPI Contoller");
- MODULE_LICENSE("GPL");
- 
- #define DRIVER_NAME "Coldfire QSPI/DSPI"
-@@ -92,7 +113,6 @@ MODULE_LICENSE("GPL");
-  */
- 
- #define QSPI_RAM_SIZE		0x10    /* 16 word table */
--
- #define QSPI_TRANSMIT_RAM 	0x00
- #define QSPI_RECEIVE_RAM  	0x10
- #define QSPI_COMMAND_RAM  	0x20
-@@ -296,13 +316,10 @@ struct driver_data {
- 	u32 *dspi_rser;		/* DSPI RSER register */
- 	u32 *dspi_sr;		/* DSPI status register */
- 	u8	dspi_ctas;		/* DSPI CTAS value*/
--	
- #if defined(SPI_DSPI_EDMA)
- 	void*	edma_tx_buf;
- 	void*	edma_rx_buf;
- #endif
--	
--		
- #else
-  	u16 *qmr;          /* QSPI mode register      */
-  	u16 *qdlyr;        /* QSPI delay register     */
-@@ -312,7 +329,11 @@ struct driver_data {
-  	u16 *qdr;          /* QSPI data register      */
-  	u16 *qcr;	   /* QSPI command register   */
- #endif
-+#if defined(CONFIG_M532x) || defined(CONFIG_M537x)
-+ 	u16 *par;	   /* Pin assignment register */
-+#else
-  	u8  *par;	   /* Pin assignment register */
-+#endif
-  	u8  *int_icr;	   /* Interrupt level and priority register */
-  	u32 *int_mr;       /* Interrupt mask register */
-  	void (*cs_control)(u8 cs, u8 command);
-@@ -327,8 +348,6 @@ struct driver_data {
-  * SPI local functions
-  */
- 
--//#define SPI_COLDFIRE_DEBUG
--
- static void *next_transfer(struct driver_data *drv_data)
- {
- 	struct spi_message *msg = drv_data->cur_msg;
-@@ -387,11 +406,9 @@ static int write(struct driver_data *drv
-  	int tx_word;
- 
- #if defined(SPI_DSPI)
--
- #if defined(SPI_DSPI_EDMA)
- 	u32* edma_wr;
- #endif
--
-  	u16 d16;
-  	u8  d8;
-  	u32 dspi_pushr;
-@@ -400,9 +417,9 @@ static int write(struct driver_data *drv
- 
- 	tx_word = is_word_transfer(drv_data);
- 
--	// If we are in word mode, but only have a single byte to transfer
--	// then switch to byte mode temporarily.  Will switch back at the
--	// end of the transfer.
-+	/* If we are in word mode, but only have a single byte to transfer
-+	 * then switch to byte mode temporarily.  Will switch back at the
-+	 * end of the transfer. */
-  	if (tx_word && ((drv_data->tx_end - drv_data->tx) == 1)) {
-  		drv_data->flags |= TRAN_STATE_WORD_ODD_NUM;
-  		set_8bit_transfer_mode(drv_data);
-@@ -411,12 +428,10 @@ static int write(struct driver_data *drv
- 
- 
- #if defined(SPI_DSPI)
--
- #if defined(SPI_DSPI_EDMA)
- 	edma_wr = (u32*)(drv_data->edma_tx_buf);
- #endif
- 
--
- #if defined(SPI_DSPI_EDMA)
- 	while ((drv_data->tx < drv_data->tx_end) && (tx_count < EDMA_BUFFER_SIZE)) {
- #else
-@@ -432,19 +447,16 @@ static int write(struct driver_data *drv
- 			}
- 
- 			dspi_pushr = MCF_DSPI_DTFR_TXDATA(d16)
--						  | DSPI_CS(drv_data->cs)
--						 | MCF_DSPI_DTFR_CTAS(drv_data->dspi_ctas)
--						 //| MCF_DSPI_DTFR_CONT
--						 ;
--
-+					| DSPI_CS(drv_data->cs)
-+					| MCF_DSPI_DTFR_CTAS(drv_data->dspi_ctas);
- 			drv_data->tx += 2;
- 
- #if defined(SPI_DSPI_EDMA)
- 			if (drv_data->tx == drv_data->tx_end  || tx_count==EDMA_BUFFER_SIZE-1) {
--#else			
-+#else
- 			if (drv_data->tx == drv_data->tx_end  || tx_count==DSPI_FIFO_SIZE-1) {
--#endif				
--				// last transfer in queue
-+#endif
-+				/* last transfer in the queue */
- 				dspi_pushr |= MCF_DSPI_DTFR_EOQ;
- 				if (drv_data->cs_change) {
- 					dspi_pushr &= ~MCF_DSPI_DTFR_CONT;
-@@ -453,14 +465,13 @@ static int write(struct driver_data *drv
- 
- 			if (first) {
- 				first = 0;
--				dspi_pushr |= MCF_DSPI_DTFR_CTCNT; // clear counter
-+				dspi_pushr |= MCF_DSPI_DTFR_CTCNT; /* clear counter */
- 			}
- #if defined(SPI_DSPI_EDMA)
- 			*edma_wr = dspi_pushr;
--			edma_wr++;			
-+			edma_wr++;
- #else
- 			*drv_data->dspi_dtfr = dspi_pushr;
--			//MCF_DSPI_DTFR = dspi_pushr;
- #endif
- 
- 
-@@ -473,14 +484,13 @@ static int write(struct driver_data *drv
- 
- 			dspi_pushr = MCF_DSPI_DTFR_TXDATA(d8)
- 						 | DSPI_CS(drv_data->cs)
--						 /* | MCF_DSPI_DTFR_PCS5 | */
- 						 | MCF_DSPI_DTFR_CTAS(drv_data->dspi_ctas)
- 						 | MCF_DSPI_DTFR_CONT;
- 
- 			drv_data->tx++;
- 
- 			if (drv_data->tx == drv_data->tx_end  || tx_count==DSPI_FIFO_SIZE-1) {
--				// last transfer in queue
-+				/* last transfer in the queue */
- 				dspi_pushr |= MCF_DSPI_DTFR_EOQ;
- 				if (drv_data->cs_change) {
- 					dspi_pushr &= ~MCF_DSPI_DTFR_CONT;
-@@ -489,16 +499,15 @@ static int write(struct driver_data *drv
- 
- 			if (first) {
- 				first = 0;
--				dspi_pushr |= MCF_DSPI_DTFR_CTCNT; // clear counter
-+				dspi_pushr |= MCF_DSPI_DTFR_CTCNT; /* clear counter */
- 			}
- 
- #if defined(SPI_DSPI_EDMA)
- 			*edma_wr = dspi_pushr;
--			edma_wr++;			
--#else			
-+			edma_wr++;
-+#else
- 			*drv_data->dspi_dtfr = dspi_pushr;
--			//MCF_DSPI_DTFR = dspi_pushr;
--#endif			
-+#endif
- 
- 		}
- 		tx_count++;
-@@ -508,8 +517,8 @@ static int write(struct driver_data *drv
- 
- 	if (tx_count>0) {
- 
--		// TODO: initiate eDMA transfer
--		set_edma_params(DSPI_DMA_TX_TCD,
-+		/* TBD: initiate eDMA transfer */
-+		mcf_edma_set_tcd_params(DSPI_DMA_TX_TCD,
- #ifdef SPI_USE_MMU
- 					virt_to_phys(drv_data->edma_tx_buf),
- #else
-@@ -517,18 +526,18 @@ static int write(struct driver_data *drv
- #endif
- 					(u32)drv_data->dspi_dtfr,
- 					MCF_EDMA_TCD_ATTR_SSIZE_32BIT | MCF_EDMA_TCD_ATTR_DSIZE_32BIT,
--					4,  // soff
--					4,  // nbytes
--					0,  // slast
--					tx_count, // citer
--					tx_count, // biter
--					0, // doff
--					0, // dlastsga
--					0, // major_int
--					1  // disable_req
-+					4, /* soff */
-+					4, /* nbytes */
-+					0, /* slast */
-+					tx_count, /* citer */
-+					tx_count, /* biter */
-+					0, /* doff */
-+					0, /* dlastsga */
-+					0, /* major_int */
-+					1  /* disable_req */
- 					);
- 
--		set_edma_params(DSPI_DMA_RX_TCD,
-+		mcf_edma_set_tcd_params(DSPI_DMA_RX_TCD,
- 					(u32)drv_data->dspi_drfr,
- #ifdef SPI_USE_MMU
- 					virt_to_phys(drv_data->edma_rx_buf),
-@@ -536,20 +545,20 @@ static int write(struct driver_data *drv
- 					drv_data->edma_rx_buf,
- #endif
- 					MCF_EDMA_TCD_ATTR_SSIZE_32BIT | MCF_EDMA_TCD_ATTR_DSIZE_32BIT,
--					0,  // soff
--					4,  // nbytes
--					0,  // slast
--					tx_count, // citer
--					tx_count, // biter
--					4, // doff
--					0,  // dlastsga
--                    0,   // major_int
--					1	// disable_req
-+					0, /* soff */
-+					4, /* nbytes */
-+					0, /* slast */
-+					tx_count, /* citer */
-+					tx_count, /* biter */
-+					4, /* doff */
-+					0, /* dlastsga */
-+					0, /* major_int */
-+					1  /* disable_req */
- 					);
- 
- 
--		start_edma_transfer(DSPI_DMA_TX_TCD); // transmit SPI data
--		start_edma_transfer(DSPI_DMA_RX_TCD); // receive SPI data
-+		start_edma_transfer(DSPI_DMA_TX_TCD); /* transmit SPI data */
-+		start_edma_transfer(DSPI_DMA_RX_TCD); /* receive SPI data */
- 	}
- #endif
- 
-@@ -583,9 +592,9 @@ static int write(struct driver_data *drv
- 			  | QCR_CONT
- 			  | (~((0x01 << drv_data->cs) << 8) & 0x0F00);
- 
--		if ( 	   (cmd_count == tx_count - 1)
--			&& (drv_data->tx == drv_data->tx_end)
--			&& (drv_data->cs_change) ) {
-+		if ( (cmd_count == tx_count - 1)
-+		     && (drv_data->tx == drv_data->tx_end)
-+		     && (drv_data->cs_change) ) {
- 			qcr &= ~QCR_CONT;
- 		}
- 		*drv_data->qcr = qcr;
-@@ -613,7 +622,6 @@ static int read(struct driver_data *drv_
- 	rx_word = is_word_transfer(drv_data);
- 
- #if defined(SPI_DSPI)
--
- #if defined(SPI_DSPI_EDMA)
- 	rx_edma = (u32*) drv_data->edma_tx_buf;
- 	while ((drv_data->rx < drv_data->rx_end) && (rx_count < EDMA_BUFFER_SIZE)) {
-@@ -646,10 +654,7 @@ static int read(struct driver_data *drv_
- 		}
- 		rx_count++;
- 	}
--
--
- #else
--
- 	*drv_data->qar = QSPI_RECEIVE_RAM;
- 	while ((drv_data->rx < drv_data->rx_end) && (rx_count < QSPI_RAM_SIZE)) {
- 		if (rx_word) {
-@@ -680,19 +685,18 @@ static inline void qspi_setup_chip(struc
- 
- 	*drv_data->mcr = chip->mcr_val;
- 
--	// TODO: remove later
-+	/* TBD: remove later */
-+/* JKM -- validate */
- 	chip->ctar_val = 0x78560118;
- 
- 	*drv_data->ctar = chip->ctar_val;
- 	*drv_data->dspi_rser =  0
--							| MCF_DSPI_DRSER_EOQFE
-+				| MCF_DSPI_DRSER_EOQFE
- #if defined(SPI_DSPI_EDMA)
--							| MCF_DSPI_DRSER_TFFFE
--							| MCF_DSPI_DRSER_TFFFS
-+				| MCF_DSPI_DRSER_TFFFE
-+				| MCF_DSPI_DRSER_TFFFS
- #endif
--							;
--
--
-+				;
- #else
- 	*drv_data->qmr = chip->qmr_val;
- 	*drv_data->qdlyr = chip->qdlyr_val;
-@@ -770,7 +774,6 @@ static irqreturn_t qspi_interrupt(int ir
- 			 * transfer tasklet
- 			 */
- 			if (drv_data->flags & TRAN_STATE_WORD_ODD_NUM) {
--				//*drv_data->qmr &= ~QMR_BITS;
- 				set_16bit_transfer_mode(drv_data);
- 			}
- 
-@@ -857,10 +860,8 @@ static void pump_transfers(unsigned long
- 	if (message->state == START_STATE) {
- 		qspi_setup_chip(drv_data);
- 
--		if (drv_data->cs_control) {
--			//printk( "m s\n" );
--        		drv_data->cs_control(message->spi->chip_select, QSPI_CS_ASSERT);
--		}
-+		if (drv_data->cs_control)
-+			drv_data->cs_control(message->spi->chip_select, QSPI_CS_ASSERT);
- 	}
- 
- 	/* Delay if requested at end of transfer*/
-@@ -902,12 +903,12 @@ static void pump_transfers(unsigned long
- }
- 
- 
--static void pump_messages(struct work_struct * work)
-+static void pump_messages(struct work_struct *work)
- {
- 	struct driver_data *drv_data;
- 	unsigned long flags;
- 
--	drv_data = container_of(work,  struct driver_data, pump_messages);
-+	drv_data = container_of(work, struct driver_data, pump_messages);
- 
- 	/* Lock queue and check for queue work */
- 	spin_lock_irqsave(&drv_data->lock, flags);
-@@ -1002,7 +1003,7 @@ static int setup(struct spi_device *spi)
- 	chip->mcr.cont_scke = 0;
- 	chip->mcr.dconf = 0;
- 	chip->mcr.frz = 0;
--	chip->mcr.mtfe = 1;
-+	chip->mcr.mtfe = 0;
- 	chip->mcr.pcsse = 0;
- 	chip->mcr.rooe = 0;
- 	chip->mcr.pcsis = 0xFF;
-@@ -1019,7 +1020,7 @@ static int setup(struct spi_device *spi)
- 	if ((spi->bits_per_word >= 4) && (spi->bits_per_word <= 16)) {
- 		chip->ctar.fmsz = spi->bits_per_word-1;
- 	} else {
--		printk(KERN_ERR "coldfire-qspi: invalid wordsize\n");
-+		printk(KERN_ERR "coldfire-spi: invalid wordsize\n");
- 		kfree(chip);
- 		return -ENODEV;
- 	}
-@@ -1056,9 +1057,9 @@ static int setup(struct spi_device *spi)
- 
- #else
- 
--	chip->qwr.csiv = 1;    // Chip selects are active low
--	chip->qmr.master = 1;  // Must set to master mode
--	chip->qmr.dohie = 1;   // Data output high impediance enabled
-+	chip->qwr.csiv = 1;    /* Chip selects are active low */
-+	chip->qmr.master = 1;  /* Must set to master mode */
-+	chip->qmr.dohie = 1;   /* Data output high impediance enabled */
- 	chip->void_write_data = chip_info->void_write_data;
- 
- 	chip->qdlyr.qcd = chip_info->del_cs_to_clk;
-@@ -1075,8 +1076,8 @@ static int setup(struct spi_device *spi)
- 
- 	chip->qmr.baud = baud_divisor;
- 
--	//printk( "QSPI: spi->max_speed_hz %d\n", spi->max_speed_hz );
--	//printk( "QSPI: Baud set to %d\n", chip->qmr.baud );
-+	/*printk( "SPI: spi->max_speed_hz %d\n", spi->max_speed_hz );*/
-+	/*printk( "SPI: Baud set to %d\n", chip->qmr.baud );*/
- 
- 	if (spi->mode & SPI_CPHA)
- 		chip->qmr.cpha = 1;
-@@ -1089,7 +1090,7 @@ static int setup(struct spi_device *spi)
- 	} else if ((spi->bits_per_word >= 8) && (spi->bits_per_word <= 15)) {
- 		chip->qmr.bits = spi->bits_per_word;
- 	} else {
--		printk(KERN_ERR "coldfire-qspi: invalid wordsize\n");
-+		printk(KERN_ERR "coldfire-spi: invalid wordsize\n");
- 		kfree(chip);
- 		return -ENODEV;
- 	}
-@@ -1112,7 +1113,7 @@ static int init_queue(struct driver_data
- 	tasklet_init(&drv_data->pump_transfers,
- 			pump_transfers,	(unsigned long)drv_data);
- 
--	INIT_WORK(&drv_data->pump_messages, pump_messages/*, drv_data*/);
-+	INIT_WORK(&drv_data->pump_messages, pump_messages);
- 
- 	drv_data->workqueue = create_singlethread_workqueue(
- 					drv_data->master->dev.parent->bus_id);
-@@ -1185,7 +1186,7 @@ static int destroy_queue(struct driver_d
- }
- 
- 
--static void cleanup(const struct spi_device *spi)
-+static void cleanup(struct spi_device *spi)
- {
- 	struct chip_data *chip = spi_get_ctldata((struct spi_device *)spi);
- 
-@@ -1213,11 +1214,7 @@ static int coldfire_spi_probe(struct pla
- 	int status = 0;
- 	int i;
- 
--#if defined(SPI_DSPI_EDMA)
--	init_edma();
--#endif
--
-- 	platform_info = (struct coldfire_spi_master *)pdev->dev.platform_data;
-+	platform_info = (struct coldfire_spi_master *)pdev->dev.platform_data;
- 
-   	master = spi_alloc_master(dev, sizeof(struct driver_data));
-   	if (!master)
-@@ -1241,7 +1238,7 @@ static int coldfire_spi_probe(struct pla
-  			drv_data->cs_control(i, QSPI_CS_INIT | QSPI_CS_DROP);
- 
- 	/* Setup register addresses */
-- 	memory_resource = platform_get_resource_byname(pdev, IORESOURCE_MEM, "qspi-module");
-+ 	memory_resource = platform_get_resource_byname(pdev, IORESOURCE_MEM, "spi-module");
-  	if (!memory_resource) {
-  		dev_dbg(dev, "can not find platform module memory\n");
-  		goto out_error_master_alloc;
-@@ -1259,13 +1256,13 @@ static int coldfire_spi_probe(struct pla
- 	 	dev_dbg(dev, "cannot allocate eDMA RX memory\n");
- 	 	goto out_error_master_alloc;
-  	}
--#endif 	
-+#endif
-  	
- #if defined(SPI_DSPI)
- 
--	drv_data->mcr 		= (void *)(memory_resource->start + 0x00000000);
--	drv_data->ctar 		= (void *)(memory_resource->start + 0x0000000C);
--	drv_data->dspi_sr 	= (void *)(memory_resource->start + 0x0000002C);
-+	drv_data->mcr	    = (void *)(memory_resource->start + 0x00000000);
-+	drv_data->ctar	    = (void *)(memory_resource->start + 0x0000000C);
-+	drv_data->dspi_sr   = (void *)(memory_resource->start + 0x0000002C);
- 	drv_data->dspi_rser = (void *)(memory_resource->start + 0x00000030);
- 	drv_data->dspi_dtfr = (void *)(memory_resource->start + 0x00000034);
- 	drv_data->dspi_drfr = (void *)(memory_resource->start + 0x00000038);
-@@ -1283,7 +1280,7 @@ static int coldfire_spi_probe(struct pla
- #endif
- 
- 	/* Setup register addresses */
-- 	memory_resource = platform_get_resource_byname(pdev, IORESOURCE_MEM, "qspi-par");
-+ 	memory_resource = platform_get_resource_byname(pdev, IORESOURCE_MEM, "spi-par");
-  	if (!memory_resource) {
-  		dev_dbg(dev, "can not find platform par memory\n");
-  		goto out_error_master_alloc;
-@@ -1292,7 +1289,7 @@ static int coldfire_spi_probe(struct pla
-  	drv_data->par = (void *)memory_resource->start;
- 
- 	/* Setup register addresses */
-- 	memory_resource = platform_get_resource_byname(pdev, IORESOURCE_MEM, "qspi-int-level");
-+ 	memory_resource = platform_get_resource_byname(pdev, IORESOURCE_MEM, "spi-int-level");
-  	if (!memory_resource) {
-  		dev_dbg(dev, "can not find platform par memory\n");
-  		goto out_error_master_alloc;
-@@ -1301,7 +1298,7 @@ static int coldfire_spi_probe(struct pla
-  	drv_data->int_icr = (void *)memory_resource->start;
- 
- 	/* Setup register addresses */
-- 	memory_resource = platform_get_resource_byname(pdev, IORESOURCE_MEM, "qspi-int-mask");
-+ 	memory_resource = platform_get_resource_byname(pdev, IORESOURCE_MEM, "spi-int-mask");
-  	if (!memory_resource) {
-  		dev_dbg(dev, "can not find platform par memory\n");
-  		goto out_error_master_alloc;
-@@ -1309,32 +1306,52 @@ static int coldfire_spi_probe(struct pla
- 
-  	drv_data->int_mr = (void *)memory_resource->start;
- 
--	irq = platform_info->irq_vector;
-+	if (platform_info->irq_list) {
-+		/* multiple IRQs */
-+		int *irqlist = platform_info->irq_list;
-+		while ((irq = *irqlist++)) {
-+			int off = *irqlist++;
-+			int lvl = *irqlist++;
-+			int msk = *irqlist++;
-+			status = request_irq(irq, qspi_interrupt, IRQF_DISABLED,
-+					     dev->bus_id, drv_data);
-+			if (status < 0) {
-+				dev_err(&pdev->dev, 
-+					"unable to attach ColdFire DSPI interrupt\n");
-+				goto out_error_master_alloc;
-+			}
-+
-+			if (lvl)
-+				*(drv_data->int_icr + off) = lvl;
- 
--	status = request_irq(platform_info->irq_vector, qspi_interrupt, IRQF_DISABLED, dev->bus_id, drv_data);
--	if (status < 0) {
--		dev_err(&pdev->dev, "unable to attach ColdFire QSPI interrupt\n");
--		goto out_error_master_alloc;
-+			if (msk)
-+				*drv_data->int_mr &= ~msk;
-+		}
- 	}
-+	else {
-+		irq = platform_info->irq_vector;
- 
--	/* Now that we have all the addresses etc.  Let's set it up */
--	// TODO:
--	//*drv_data->par = platform_info->par_val;
-+		status = request_irq(platform_info->irq_vector, qspi_interrupt,
-+				     IRQF_DISABLED, dev->bus_id, drv_data);
-+		if (status < 0) {
-+			dev_err(&pdev->dev, "unable to attach ColdFire QSPI interrupt\n");
-+			goto out_error_master_alloc;
-+		}
- 
--	MCF_GPIO_PAR_DSPI = 0
--		| MCF_GPIO_PAR_DSPI_PCS5_PCS5
--		| MCF_GPIO_PAR_DSPI_PCS2_PCS2
--		| MCF_GPIO_PAR_DSPI_PCS1_PCS1
--		| MCF_GPIO_PAR_DSPI_PCS0_PCS0
--		| MCF_GPIO_PAR_DSPI_SIN_SIN
--		| MCF_GPIO_PAR_DSPI_SOUT_SOUT
--		| MCF_GPIO_PAR_DSPI_SCK_SCK;
-+		*drv_data->int_icr = platform_info->irq_lp;
-+		*drv_data->int_mr &= ~platform_info->irq_mask;
-+	}
-+
-+	/* Now that we have all the addresses etc.  Let's set it up */
-+	if (platform_info->par_val)
-+		*drv_data->par = platform_info->par_val;
- 
--	*drv_data->int_icr = platform_info->irq_lp;
--	*drv_data->int_mr &= ~platform_info->irq_mask;
-+#ifdef CONFIG_M5227x
-+	MCF_GPIO_PAR_IRQ = 0x04; /* Mistake in RM documentation */
-+#endif
- 
- #ifdef SPI_DSPI
--	drv_data->dspi_ctas = 0; // TODO: change later
-+	drv_data->dspi_ctas = 0; /* TBD: change later */
- #endif
- 
- 	/* Initial and start queue */
-@@ -1359,40 +1376,37 @@ static int coldfire_spi_probe(struct pla
- 	}
- 
- #if defined(SPI_DSPI_EDMA)
--	if (request_edma_channel(DSPI_DMA_TX_TCD,
--							edma_tx_handler,
--							NULL,
--							pdev,
--							NULL, /* spinlock */
--							DRIVER_NAME
--							)!=0)
--	{
-+	if (mcf_edma_request_channel(DSPI_DMA_TX_TCD,
-+				     edma_tx_handler,
-+				     NULL,
-+				     pdev,
-+				     NULL, /* spinlock */
-+				     DRIVER_NAME
-+				     )!=0) {
- 		dev_err(&pdev->dev, "problem requesting edma transmit channel\n");
- 		status = -EINVAL;
--        goto out_error_queue_alloc;
-+		goto out_error_queue_alloc;
- 	}
- 
--	if (request_edma_channel(DSPI_DMA_RX_TCD,
--							edma_rx_handler,
--							NULL,
--							pdev,
--							NULL, /* spinlock */
--							DRIVER_NAME
--							)!=0)
--	{
-+	if (mcf_edma_request_channel(DSPI_DMA_RX_TCD,
-+				     edma_rx_handler,
-+				     NULL,
-+				     pdev,
-+				     NULL, /* spinlock */
-+				     DRIVER_NAME
-+				     )!=0) {
- 		dev_err(&pdev->dev, "problem requesting edma receive channel\n");
- 		status = -EINVAL;
--        goto out_edma_transmit;
-+		goto out_edma_transmit;
- 	}
- #endif
- 
--	printk( "SPI: Coldfire master initialized\n" );
--	//dev_info(&pdev->dev, "driver initialized\n");
-+	printk(KERN_INFO "SPI: Coldfire master initialized\n" );
- 	return status;
- 
- #if defined(SPI_DSPI_EDMA)
- out_edma_transmit:
--	free_edma_channel(DSPI_DMA_TX_TCD, pdev);
-+	mcf_edma_free_channel(DSPI_DMA_TX_TCD, pdev);
- #endif
- 
- out_error_queue_alloc:
-@@ -1417,8 +1431,8 @@ static int coldfire_spi_remove(struct pl
- 		return 0;
- 
- #if defined(SPI_DSPI_EDMA)
--	free_edma_channel(DSPI_DMA_TX_TCD, pdev);
--	free_edma_channel(DSPI_DMA_RX_TCD, pdev);
-+	mcf_edma_free_channel(DSPI_DMA_TX_TCD, pdev);
-+	mcf_edma_free_channel(DSPI_DMA_RX_TCD, pdev);
- #endif	
- 
- 	/* Remove the queue */
-@@ -1426,27 +1440,8 @@ static int coldfire_spi_remove(struct pl
- 	if (status != 0)
- 		return status;
- 
--	/* Disable the SSP at the peripheral and SOC level */
--	/*write_SSCR0(0, drv_data->ioaddr);
--	pxa_set_cken(drv_data->master_info->clock_enable, 0);*/
--
--	/* Release DMA */
--	/*if (drv_data->master_info->enable_dma) {
--		if (drv_data->ioaddr == SSP1_VIRT) {
--			DRCMRRXSSDR = 0;
--			DRCMRTXSSDR = 0;
--		} else if (drv_data->ioaddr == SSP2_VIRT) {
--			DRCMRRXSS2DR = 0;
--			DRCMRTXSS2DR = 0;
--		} else if (drv_data->ioaddr == SSP3_VIRT) {
--			DRCMRRXSS3DR = 0;
--			DRCMRTXSS3DR = 0;
--		}
--		pxa_free_dma(drv_data->tx_channel);
--		pxa_free_dma(drv_data->rx_channel);
--	}*/
--
- 	/* Release IRQ */
-+/* JKM -- check for list and remove list */
- 	irq = platform_get_irq(pdev, 0);
- 	if (irq >= 0)
- 		free_irq(irq, drv_data);
-@@ -1496,8 +1491,6 @@ static int coldfire_spi_suspend(struct p
- 	status = stop_queue(drv_data);
- 	if (status != 0)
- 		return status;
--	/*write_SSCR0(0, drv_data->ioaddr);
--	pxa_set_cken(drv_data->master_info->clock_enable, 0);*/
- 
- 	return 0;
- }
-@@ -1507,9 +1500,6 @@ static int coldfire_spi_resume(struct pl
- 	struct driver_data *drv_data = platform_get_drvdata(pdev);
- 	int status = 0;
- 
--	/* Enable the SSP clock */
--	/*pxa_set_cken(drv_data->master_info->clock_enable, 1);*/
--
- 	/* Start the queue running */
- 	status = start_queue(drv_data);
- 	if (status != 0) {
---- /dev/null
-+++ b/include/asm-m68k/m5485dspi.h
-@@ -0,0 +1,144 @@
-+/*
-+ * File:	mcf548x_dspi.h
-+ * Purpose:	Register and bit definitions for the MCF548X
-+ *
-+ * Notes:
-+ *
-+ */
-+
-+#ifndef _M5485DSPI_H_
-+#define _M5485DSPI_H_
-+
-+/*
-+ *
-+ * DMA Serial Peripheral Interface (DSPI)
-+ *
-+ */
-+
-+/* Register read/write macros */
-+#define MCF_DSPI_DMCR         MCF_REG32(0x008A00)
-+#define MCF_DSPI_DTCR         MCF_REG32(0x008A08)
-+#define MCF_DSPI_DCTAR0       MCF_REG32(0x008A0C)
-+#define MCF_DSPI_DCTAR1       MCF_REG32(0x008A10)
-+#define MCF_DSPI_DCTAR2       MCF_REG32(0x008A14)
-+#define MCF_DSPI_DCTAR3       MCF_REG32(0x008A18)
-+#define MCF_DSPI_DCTAR4       MCF_REG32(0x008A1C)
-+#define MCF_DSPI_DCTAR5       MCF_REG32(0x008A20)
-+#define MCF_DSPI_DCTAR6       MCF_REG32(0x008A24)
-+#define MCF_DSPI_DCTAR7       MCF_REG32(0x008A28)
-+#define MCF_DSPI_DCTARn(x)    MCF_REG32(0x008A0C+(x*4))
-+#define MCF_DSPI_DSR          MCF_REG32(0x008A2C)
-+#define MCF_DSPI_DRSER        MCF_REG32(0x008A30)
-+#define MCF_DSPI_DTFR         MCF_REG32(0x008A34)
-+#define MCF_DSPI_DRFR         MCF_REG32(0x008A38)
-+#define MCF_DSPI_DTFDR0       MCF_REG32(0x008A3C)
-+#define MCF_DSPI_DTFDR1       MCF_REG32(0x008A40)
-+#define MCF_DSPI_DTFDR2       MCF_REG32(0x008A44)
-+#define MCF_DSPI_DTFDR3       MCF_REG32(0x008A48)
-+#define MCF_DSPI_DTFDRn(x)    MCF_REG32(0x008A3C+(x*4))
-+#define MCF_DSPI_DRFDR0       MCF_REG32(0x008A7C)
-+#define MCF_DSPI_DRFDR1       MCF_REG32(0x008A80)
-+#define MCF_DSPI_DRFDR2       MCF_REG32(0x008A84)
-+#define MCF_DSPI_DRFDR3       MCF_REG32(0x008A88)
-+#define MCF_DSPI_DRFDRn(x)    MCF_REG32(0x008A7C+(x*4))
-+
-+/* Bit definitions and macros for MCF_DSPI_DMCR */
-+#define MCF_DSPI_DMCR_HALT             (0x00000001)
-+#define MCF_DSPI_DMCR_SMPL_PT(x)       (((x)&0x00000003)<<8)
-+#define MCF_DSPI_DMCR_CRXF             (0x00000400)
-+#define MCF_DSPI_DMCR_CTXF             (0x00000800)
-+#define MCF_DSPI_DMCR_DRXF             (0x00001000)
-+#define MCF_DSPI_DMCR_DTXF             (0x00002000)
-+#define MCF_DSPI_DMCR_CSIS0            (0x00010000)
-+#define MCF_DSPI_DMCR_CSIS2            (0x00040000)
-+#define MCF_DSPI_DMCR_CSIS3            (0x00080000)
-+#define MCF_DSPI_DMCR_CSIS5            (0x00200000)
-+#define MCF_DSPI_DMCR_ROOE             (0x01000000)
-+#define MCF_DSPI_DMCR_PCSSE            (0x02000000)
-+#define MCF_DSPI_DMCR_MTFE             (0x04000000)
-+#define MCF_DSPI_DMCR_FRZ              (0x08000000)
-+#define MCF_DSPI_DMCR_DCONF(x)         (((x)&0x00000003)<<28)
-+#define MCF_DSPI_DMCR_CSCK             (0x40000000)
-+#define MCF_DSPI_DMCR_MSTR             (0x80000000)
-+
-+/* Bit definitions and macros for MCF_DSPI_DTCR */
-+#define MCF_DSPI_DTCR_SPI_TCNT(x)      (((x)&0x0000FFFF)<<16)
-+
-+/* Bit definitions and macros for MCF_DSPI_DCTARn */
-+#define MCF_DSPI_DCTAR_BR(x)          (((x)&0x0000000F)<<0)
-+#define MCF_DSPI_DCTAR_DT(x)          (((x)&0x0000000F)<<4)
-+#define MCF_DSPI_DCTAR_ASC(x)         (((x)&0x0000000F)<<8)
-+#define MCF_DSPI_DCTAR_CSSCK(x)       (((x)&0x0000000F)<<12)
-+#define MCF_DSPI_DCTAR_PBR(x)         (((x)&0x00000003)<<16)
-+#define MCF_DSPI_DCTAR_PDT(x)         (((x)&0x00000003)<<18)
-+#define MCF_DSPI_DCTAR_PASC(x)        (((x)&0x00000003)<<20)
-+#define MCF_DSPI_DCTAR_PCSSCK(x)      (((x)&0x00000003)<<22)
-+#define MCF_DSPI_DCTAR_LSBFE          (0x01000000)
-+#define MCF_DSPI_DCTAR_CPHA           (0x02000000)
-+#define MCF_DSPI_DCTAR_CPOL           (0x04000000)
-+/* #define MCF_DSPI_DCTAR_TRSZ(x)        (((x)&0x0000000F)<<27) */
-+#define MCF_DSPI_DCTAR_FMSZ(x)        (((x)&0x0000000F)<<27)
-+#define MCF_DSPI_DCTAR_PCSSCK_1CLK    (0x00000000)
-+#define MCF_DSPI_DCTAR_PCSSCK_3CLK    (0x00400000)
-+#define MCF_DSPI_DCTAR_PCSSCK_5CLK    (0x00800000)
-+#define MCF_DSPI_DCTAR_PCSSCK_7CLK    (0x00A00000)
-+#define MCF_DSPI_DCTAR_PASC_1CLK      (0x00000000)
-+#define MCF_DSPI_DCTAR_PASC_3CLK      (0x00100000)
-+#define MCF_DSPI_DCTAR_PASC_5CLK      (0x00200000)
-+#define MCF_DSPI_DCTAR_PASC_7CLK      (0x00300000)
-+#define MCF_DSPI_DCTAR_PDT_1CLK       (0x00000000)
-+#define MCF_DSPI_DCTAR_PDT_3CLK       (0x00040000)
-+#define MCF_DSPI_DCTAR_PDT_5CLK       (0x00080000)
-+#define MCF_DSPI_DCTAR_PDT_7CLK       (0x000A0000)
-+#define MCF_DSPI_DCTAR_PBR_1CLK       (0x00000000)
-+#define MCF_DSPI_DCTAR_PBR_3CLK       (0x00010000)
-+#define MCF_DSPI_DCTAR_PBR_5CLK       (0x00020000)
-+#define MCF_DSPI_DCTAR_PBR_7CLK       (0x00030000)
-+
-+/* Bit definitions and macros for MCF_DSPI_DSR */
-+#define MCF_DSPI_DSR_RXPTR(x)          (((x)&0x0000000F)<<0)
-+#define MCF_DSPI_DSR_RXCTR(x)          (((x)&0x0000000F)<<4)
-+#define MCF_DSPI_DSR_TXPTR(x)          (((x)&0x0000000F)<<8)
-+#define MCF_DSPI_DSR_TXCTR(x)          (((x)&0x0000000F)<<12)
-+#define MCF_DSPI_DSR_RFDF              (0x00020000)
-+#define MCF_DSPI_DSR_RFOF              (0x00080000)
-+#define MCF_DSPI_DSR_TFFF              (0x02000000)
-+#define MCF_DSPI_DSR_TFUF              (0x08000000)
-+#define MCF_DSPI_DSR_EOQF              (0x10000000)
-+#define MCF_DSPI_DSR_TXRXS             (0x40000000)
-+#define MCF_DSPI_DSR_TCF               (0x80000000)
-+
-+/* Bit definitions and macros for MCF_DSPI_DRSER */
-+#define MCF_DSPI_DRSER_RFDFS           (0x00010000)
-+#define MCF_DSPI_DRSER_RFDFE           (0x00020000)
-+#define MCF_DSPI_DRSER_RFOFE           (0x00080000)
-+#define MCF_DSPI_DRSER_TFFFS           (0x01000000)
-+#define MCF_DSPI_DRSER_TFFFE           (0x02000000)
-+#define MCF_DSPI_DRSER_TFUFE           (0x08000000)
-+#define MCF_DSPI_DRSER_EOQFE           (0x10000000)
-+#define MCF_DSPI_DRSER_TCFE            (0x80000000)
-+
-+/* Bit definitions and macros for MCF_DSPI_DTFR */
-+#define MCF_DSPI_DTFR_TXDATA(x)        (((x)&0x0000FFFF)<<0)
-+#define MCF_DSPI_DTFR_CS0              (0x00010000)
-+#define MCF_DSPI_DTFR_CS2              (0x00040000)
-+#define MCF_DSPI_DTFR_CS3              (0x00080000)
-+#define MCF_DSPI_DTFR_CS5              (0x00200000)
-+#define MCF_DSPI_DTFR_CTCNT            (0x04000000)
-+#define MCF_DSPI_DTFR_EOQ              (0x08000000)
-+#define MCF_DSPI_DTFR_CTAS(x)          (((x)&0x00000007)<<28)
-+#define MCF_DSPI_DTFR_CONT             (0x80000000)
-+
-+/* Bit definitions and macros for MCF_DSPI_DRFR */
-+#define MCF_DSPI_DRFR_RXDATA(x)        (((x)&0x0000FFFF)<<0)
-+
-+/* Bit definitions and macros for MCF_DSPI_DTFDRn */
-+#define MCF_DSPI_DTFDRn_TXDATA(x)      (((x)&0x0000FFFF)<<0)
-+#define MCF_DSPI_DTFDRn_TXCMD(x)       (((x)&0x0000FFFF)<<16)
-+
-+/* Bit definitions and macros for MCF_DSPI_DRFDRn */
-+#define MCF_DSPI_DRFDRn_RXDATA(x)      (((x)&0x0000FFFF)<<0)
-+
-+/********************************************************************/
-+
-+#endif /* _M5485DSPI_H_ */
---- a/include/asm-m68k/mcfqspi.h
-+++ b/include/asm-m68k/mcfqspi.h
-@@ -36,6 +36,7 @@ struct coldfire_spi_master {
- 	u32 irq_mask;
- 	u8  irq_lp;
- 	u8  par_val;
-+	u32 *irq_list;
- 	void (*cs_control)(u8 cs, u8 command);
- };
- 
---- a/include/asm-m68k/mcfsim.h
-+++ b/include/asm-m68k/mcfsim.h
-@@ -25,6 +25,7 @@
- #include <asm/mcf5445x_dtim.h>
- #elif defined(CONFIG_M547X_8X)
- #include <asm/m5485sim.h>
-+#include <asm/m5485gpio.h>
- #endif
- 
- /*
diff --git a/target/linux/coldfire/patches/053-mcfv4e_brcache_inval.patch b/target/linux/coldfire/patches/053-mcfv4e_brcache_inval.patch
deleted file mode 100644
index dc551babf..000000000
--- a/target/linux/coldfire/patches/053-mcfv4e_brcache_inval.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From eba69831e8f35174e2e15e373a66f40dc0be8929 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Wed, 14 May 2008 12:23:12 -0600
-Subject: [PATCH] Force branch-cache invalidate on task switch.
-
-When finishing a task switch make sure the branch cache
-gets invalidated to ensure no stale entries exist for
-the next user space.
-
-LTIBName: mcfv4e-brcache-inval
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- include/asm-m68k/system.h |   15 +++++++++++++++
- 1 files changed, 15 insertions(+), 0 deletions(-)
-
---- a/include/asm-m68k/system.h
-+++ b/include/asm-m68k/system.h
-@@ -5,9 +5,24 @@
- #include <linux/kernel.h>
- #include <asm/segment.h>
- #include <asm/entry.h>
-+#include <asm/cfcache.h>
- 
- #ifdef __KERNEL__
- 
-+#ifdef CONFIG_COLDFIRE
-+#define FLUSH_BC        (0x00040000)
-+
-+#define finish_arch_switch(prev) do {		\
-+	unsigned long tmpreg;			\
-+	asm volatile ( "move.l %2,%0\n"		\
-+		       "orl %1,%0\n"		\
-+		       "movec %0,%%cacr"	\
-+		       : "=&d" (tmpreg)		\
-+		       : "id" (FLUSH_BC), "m" (shadow_cacr));	\
-+	} while(0)
-+
-+#endif
-+
- /*
-  * switch_to(n) should switch tasks to task ptr, first checking that
-  * ptr isn't the current task, in which case it does nothing.  This
diff --git a/target/linux/coldfire/patches/054-mcfv4e_defconfig_upd.patch b/target/linux/coldfire/patches/054-mcfv4e_defconfig_upd.patch
deleted file mode 100644
index 374242122..000000000
--- a/target/linux/coldfire/patches/054-mcfv4e_defconfig_upd.patch
+++ /dev/null
@@ -1,2227 +0,0 @@
-From 8a089acdd2f29356883bcbd65622fda8b0a7f276 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Thu, 15 May 2008 11:51:00 -0600
-Subject: [PATCH] Defconfig updates for M54455EVB, M5475EVB and M5485EVB.
-
-LTIBName: mcfv4e-defconfig-upd
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/configs/55_defconfig        |  830 ++++++++++++++++++++++++++++
- arch/m68k/configs/m54455evb_defconfig |    2 +-
- arch/m68k/configs/m5475evb_defconfig  |  954 +++++++++++++++++++++++++++++++++
- arch/m68k/configs/m5485evb_defconfig  |  197 ++++----
- 4 files changed, 1889 insertions(+), 94 deletions(-)
- create mode 100644 arch/m68k/configs/55_defconfig
- create mode 100644 arch/m68k/configs/m5475evb_defconfig
-
---- /dev/null
-+++ b/arch/m68k/configs/55_defconfig
-@@ -0,0 +1,830 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25
-+# Thu Jun 26 16:17:41 2008
-+#
-+CONFIG_M68K=y
-+CONFIG_MMU=y
-+# CONFIG_GENERIC_TIME is not set
-+# CONFIG_GENERIC_CLOCKEVENTS is not set
-+CONFIG_RWSEM_GENERIC_SPINLOCK=y
-+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_TIME_LOW_RES=y
-+CONFIG_GENERIC_IOMAP=y
-+# CONFIG_NO_IOPORT is not set
-+# CONFIG_NO_DMA is not set
-+CONFIG_ARCH_SUPPORTS_AOUT=y
-+CONFIG_HZ=100
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+CONFIG_IKCONFIG=y
-+CONFIG_IKCONFIG_PROC=y
-+CONFIG_LOG_BUF_SHIFT=17
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+CONFIG_NAMESPACES=y
-+# CONFIG_UTS_NS is not set
-+# CONFIG_IPC_NS is not set
-+# CONFIG_USER_NS is not set
-+# CONFIG_PID_NS is not set
-+# CONFIG_BLK_DEV_INITRD is not set
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+# CONFIG_EMBEDDED is not set
-+CONFIG_UID16=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_ALL is not set
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=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_SLAB=y
-+# CONFIG_SLUB is not set
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+# CONFIG_HAVE_OPROFILE is not set
-+# CONFIG_HAVE_KPROBES is not set
-+# CONFIG_HAVE_KRETPROBES is not set
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+CONFIG_MODULE_FORCE_UNLOAD=y
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+# CONFIG_KMOD is not set
-+CONFIG_BLOCK=y
-+CONFIG_LBD=y
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+# CONFIG_DEFAULT_AS is not set
-+# CONFIG_DEFAULT_DEADLINE is not set
-+CONFIG_DEFAULT_CFQ=y
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="cfq"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform dependent setup
-+#
-+# CONFIG_SUN3 is not set
-+CONFIG_COLDFIRE=y
-+CONFIG_CFV4E=y
-+# CONFIG_AMIGA is not set
-+# CONFIG_ATARI is not set
-+# CONFIG_PCI is not set
-+# CONFIG_MAC is not set
-+# CONFIG_APOLLO is not set
-+# CONFIG_VME is not set
-+# CONFIG_HP300 is not set
-+# CONFIG_SUN3X is not set
-+# CONFIG_Q40 is not set
-+
-+#
-+# Processor type
-+#
-+# CONFIG_M68020 is not set
-+# CONFIG_M68030 is not set
-+# CONFIG_M68040 is not set
-+# CONFIG_M68060 is not set
-+CONFIG_M5445X=y
-+# CONFIG_M54451 is not set
-+CONFIG_M54455=y
-+# CONFIG_M54451EVB is not set
-+CONFIG_M54455EVB=y
-+# CONFIG_M547X_8X is not set
-+CONFIG_MCFCLK=266666666
-+# CONFIG_MCF_USER_HALT is not set
-+CONFIG_MMU_CFV4E=y
-+CONFIG_SDRAM_BASE=0x40000000
-+CONFIG_SDRAM_SIZE=0x10000000
-+CONFIG_NOR_FLASH_BASE=0x00000000
-+# CONFIG_M68KFPU_EMU is not set
-+CONFIG_ADVANCED=y
-+# CONFIG_RMW_INSNS is not set
-+CONFIG_SINGLE_MEMORY_CHUNK=y
-+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+CONFIG_NEED_MULTIPLE_NODES=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+
-+#
-+# General setup
-+#
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_AOUT is not set
-+# CONFIG_BINFMT_MISC is not set
-+CONFIG_PROC_HARDWARE=y
-+CONFIG_ZONE_DMA=y
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
-+
-+#
-+# Power management options
-+#
-+# CONFIG_PM is not set
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+CONFIG_NET_KEY=y
-+# CONFIG_NET_KEY_MIGRATE is not set
-+CONFIG_INET=y
-+# CONFIG_IP_MULTICAST is not set
-+CONFIG_IP_ADVANCED_ROUTER=y
-+CONFIG_ASK_IP_FIB_HASH=y
-+# CONFIG_IP_FIB_TRIE is not set
-+CONFIG_IP_FIB_HASH=y
-+# CONFIG_IP_MULTIPLE_TABLES is not set
-+# CONFIG_IP_ROUTE_MULTIPATH is not set
-+# CONFIG_IP_ROUTE_VERBOSE is not set
-+CONFIG_IP_PNP=y
-+# CONFIG_IP_PNP_DHCP is not set
-+# CONFIG_IP_PNP_BOOTP is not set
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_ARPD is not set
-+# CONFIG_SYN_COOKIES is not set
-+CONFIG_INET_AH=y
-+CONFIG_INET_ESP=y
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_BEET is not set
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+# CONFIG_STANDALONE is not set
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=y
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+# CONFIG_MTD is not set
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=64000
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_COLDFIRE_SEC is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=y
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=y
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+# CONFIG_BLK_DEV_SR is not set
-+# CONFIG_CHR_DEV_SG is not set
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+CONFIG_SCSI_MULTI_LUN=y
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+# CONFIG_SCSI_SCAN_ASYNC is not set
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_B44 is not set
-+CONFIG_FEC=y
-+# CONFIG_FEC2 is not set
-+# CONFIG_NETDEV_1000 is not set
-+# CONFIG_NETDEV_10000 is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+CONFIG_INPUT_MOUSEDEV=y
-+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-+# CONFIG_INPUT_JOYDEV is not set
-+CONFIG_INPUT_EVDEV=y
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+CONFIG_INPUT_KEYBOARD=y
-+# CONFIG_KEYBOARD_ATKBD is not set
-+# CONFIG_KEYBOARD_SUNKBD is not set
-+# CONFIG_KEYBOARD_LKKBD is not set
-+# CONFIG_KEYBOARD_XTKBD is not set
-+# CONFIG_KEYBOARD_NEWTON is not set
-+# CONFIG_KEYBOARD_STOWAWAY is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+CONFIG_SERIO=y
-+CONFIG_SERIO_SERPORT=y
-+# CONFIG_SERIO_RAW is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+CONFIG_VT=y
-+CONFIG_VT_CONSOLE=y
-+CONFIG_HW_CONSOLE=y
-+# CONFIG_VT_HW_CONSOLE_BINDING is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+# CONFIG_SERIAL_8250 is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+CONFIG_SERIAL_COLDFIRE=y
-+# CONFIG_SERIAL_MCF is not set
-+CONFIG_UNIX98_PTYS=y
-+# CONFIG_LEGACY_PTYS is not set
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_MCF548x is not set
-+CONFIG_I2C_MCF=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
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+# CONFIG_I2C_DEBUG_CORE is not set
-+# CONFIG_I2C_DEBUG_ALGO is not set
-+# CONFIG_I2C_DEBUG_BUS is not set
-+# CONFIG_I2C_DEBUG_CHIP is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_COLDFIRE_EDMA is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+# CONFIG_THERMAL is not set
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Console display driver support
-+#
-+CONFIG_DUMMY_CONSOLE=y
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+# CONFIG_HID_SUPPORT is not set
-+# CONFIG_USB_SUPPORT is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_RTC_CLASS is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_SERIAL_CONSOLE is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+CONFIG_EXT3_FS_XATTR=y
-+# CONFIG_EXT3_FS_POSIX_ACL is not set
-+# CONFIG_EXT3_FS_SECURITY is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+# CONFIG_INOTIFY is not set
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+CONFIG_FAT_FS=y
-+CONFIG_MSDOS_FS=y
-+CONFIG_VFAT_FS=y
-+CONFIG_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+CONFIG_NTFS_FS=y
-+# CONFIG_NTFS_DEBUG is not set
-+CONFIG_NTFS_RW=y
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+# CONFIG_PROC_KCORE is not set
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+# CONFIG_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+CONFIG_MINIX_FS=y
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+# CONFIG_NFS_V3 is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_BSD_DISKLABEL is not set
-+# CONFIG_MINIX_SUBPARTITION is not set
-+# CONFIG_SOLARIS_X86_PARTITION is not set
-+# CONFIG_UNIXWARE_DISKLABEL is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+CONFIG_NLS=y
-+CONFIG_NLS_DEFAULT="iso8859-1"
-+CONFIG_NLS_CODEPAGE_437=y
-+# CONFIG_NLS_CODEPAGE_737 is not set
-+# CONFIG_NLS_CODEPAGE_775 is not set
-+# CONFIG_NLS_CODEPAGE_850 is not set
-+# CONFIG_NLS_CODEPAGE_852 is not set
-+# CONFIG_NLS_CODEPAGE_855 is not set
-+# CONFIG_NLS_CODEPAGE_857 is not set
-+# CONFIG_NLS_CODEPAGE_860 is not set
-+# CONFIG_NLS_CODEPAGE_861 is not set
-+# CONFIG_NLS_CODEPAGE_862 is not set
-+# CONFIG_NLS_CODEPAGE_863 is not set
-+# CONFIG_NLS_CODEPAGE_864 is not set
-+# CONFIG_NLS_CODEPAGE_865 is not set
-+# CONFIG_NLS_CODEPAGE_866 is not set
-+# CONFIG_NLS_CODEPAGE_869 is not set
-+# CONFIG_NLS_CODEPAGE_936 is not set
-+# CONFIG_NLS_CODEPAGE_950 is not set
-+# CONFIG_NLS_CODEPAGE_932 is not set
-+# CONFIG_NLS_CODEPAGE_949 is not set
-+# CONFIG_NLS_CODEPAGE_874 is not set
-+# CONFIG_NLS_ISO8859_8 is not set
-+# CONFIG_NLS_CODEPAGE_1250 is not set
-+# CONFIG_NLS_CODEPAGE_1251 is not set
-+# CONFIG_NLS_ASCII is not set
-+CONFIG_NLS_ISO8859_1=y
-+# CONFIG_NLS_ISO8859_2 is not set
-+# CONFIG_NLS_ISO8859_3 is not set
-+# CONFIG_NLS_ISO8859_4 is not set
-+# CONFIG_NLS_ISO8859_5 is not set
-+# CONFIG_NLS_ISO8859_6 is not set
-+# CONFIG_NLS_ISO8859_7 is not set
-+# CONFIG_NLS_ISO8859_9 is not set
-+# CONFIG_NLS_ISO8859_13 is not set
-+# CONFIG_NLS_ISO8859_14 is not set
-+# CONFIG_NLS_ISO8859_15 is not set
-+# CONFIG_NLS_KOI8_R is not set
-+# CONFIG_NLS_KOI8_U is not set
-+CONFIG_NLS_UTF8=y
-+# CONFIG_DLM is not set
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+# CONFIG_ENABLE_MUST_CHECK is not set
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+CONFIG_DEBUG_SLAB=y
-+# CONFIG_DEBUG_SLAB_LEAK is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+CONFIG_DEBUG_BUGVERBOSE=y
-+CONFIG_DEBUG_INFO=y
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_FRAME_POINTER is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+CONFIG_BOOTPARAM=y
-+CONFIG_BOOTPARAM_STRING="root=/dev/nfs rw nfsroot=172.27.155.1:/tftpboot/redstripe ip=172.27.155.55:172.27.155.1:172.27.255.254:255.255.0.0::eth0:off mtdparts=phys_mapped_flash:16m(User)"
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_AEAD=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_HASH=y
-+CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_HMAC=y
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+CONFIG_CRYPTO_MD5=y
-+CONFIG_CRYPTO_SHA1=y
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=y
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+CONFIG_CRYPTO_TEST=m
-+CONFIG_CRYPTO_AUTHENC=y
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_MCFCAU is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+CONFIG_CRC_CCITT=y
-+CONFIG_CRC16=y
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+CONFIG_LIBCRC32C=y
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
---- a/arch/m68k/configs/m54455evb_defconfig
-+++ b/arch/m68k/configs/m54455evb_defconfig
-@@ -963,7 +963,7 @@ CONFIG_FORCED_INLINING=y
- # CONFIG_RCU_TORTURE_TEST is not set
- # CONFIG_FAULT_INJECTION is not set
- CONFIG_BOOTPARAM=y
--CONFIG_BOOTPARAM_STRING="root=/dev/nfs rw nfsroot=172.27.163.2:/tftpboot/ltib ip=172.27.163.3:172.27.163.2:172.27.255.254:255.255.0.0::eth0:off mtdparts=phys_mapped_flash:16m(User)"
-+CONFIG_BOOTPARAM_STRING="root=/dev/nfs rw nfsroot=172.27.155.1:/tftpboot/redstripe ip=172.27.155.55:172.27.155.1:172.27.255.254:255.255.0.0::eth0:off mtdparts=phys_mapped_flash:16m(User)"
- 
- #
- # CodeTEST Setup
---- /dev/null
-+++ b/arch/m68k/configs/m5475evb_defconfig
-@@ -0,0 +1,954 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25
-+# Wed Jul  9 16:09:19 2008
-+#
-+CONFIG_M68K=y
-+CONFIG_MMU=y
-+# CONFIG_GENERIC_TIME is not set
-+# CONFIG_GENERIC_CLOCKEVENTS is not set
-+CONFIG_RWSEM_GENERIC_SPINLOCK=y
-+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_TIME_LOW_RES=y
-+CONFIG_GENERIC_IOMAP=y
-+# CONFIG_NO_IOPORT is not set
-+# CONFIG_NO_DMA is not set
-+CONFIG_ARCH_SUPPORTS_AOUT=y
-+CONFIG_HZ=100
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+CONFIG_IKCONFIG=y
-+CONFIG_IKCONFIG_PROC=y
-+CONFIG_LOG_BUF_SHIFT=17
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+CONFIG_NAMESPACES=y
-+# CONFIG_UTS_NS is not set
-+# CONFIG_IPC_NS is not set
-+# CONFIG_USER_NS is not set
-+# CONFIG_PID_NS is not set
-+# CONFIG_BLK_DEV_INITRD is not set
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+# CONFIG_EMBEDDED is not set
-+CONFIG_UID16=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_ALL is not set
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=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_SLAB=y
-+# CONFIG_SLUB is not set
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+# CONFIG_HAVE_OPROFILE is not set
-+# CONFIG_HAVE_KPROBES is not set
-+# CONFIG_HAVE_KRETPROBES is not set
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+CONFIG_MODULE_FORCE_UNLOAD=y
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+# CONFIG_KMOD is not set
-+CONFIG_BLOCK=y
-+CONFIG_LBD=y
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+# CONFIG_DEFAULT_AS is not set
-+# CONFIG_DEFAULT_DEADLINE is not set
-+CONFIG_DEFAULT_CFQ=y
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="cfq"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform dependent setup
-+#
-+# CONFIG_SUN3 is not set
-+CONFIG_COLDFIRE=y
-+CONFIG_CFV4E=y
-+CONFIG_MCD_DMA=y
-+# CONFIG_AMIGA is not set
-+# CONFIG_ATARI is not set
-+CONFIG_PCI=y
-+# CONFIG_MAC is not set
-+# CONFIG_APOLLO is not set
-+# CONFIG_VME is not set
-+# CONFIG_HP300 is not set
-+# CONFIG_SUN3X is not set
-+# CONFIG_Q40 is not set
-+
-+#
-+# Processor type
-+#
-+# CONFIG_M68020 is not set
-+# CONFIG_M68030 is not set
-+# CONFIG_M68040 is not set
-+# CONFIG_M68060 is not set
-+# CONFIG_M5445X is not set
-+CONFIG_M547X_8X=y
-+CONFIG_M547X=y
-+# CONFIG_M548X is not set
-+# CONFIG_M5475AFE is not set
-+# CONFIG_M5475BFE is not set
-+CONFIG_M5475CFE=y
-+# CONFIG_M5475DFE is not set
-+# CONFIG_M5475EFE is not set
-+# CONFIG_M5475FFE is not set
-+# CONFIG_M5485AFE is not set
-+# CONFIG_M5485BFE is not set
-+# CONFIG_M5485CFE is not set
-+# CONFIG_M5485DFE is not set
-+# CONFIG_M5485EFE is not set
-+# CONFIG_M5485FFE is not set
-+CONFIG_MCFCLK=266000000
-+# CONFIG_MCF_USER_HALT is not set
-+CONFIG_MMU_CFV4E=y
-+CONFIG_SDRAM_BASE=0x00000000
-+CONFIG_SDRAM_SIZE=0x04000000
-+CONFIG_NOR_FLASH_BASE=0xE0000000
-+# CONFIG_M68KFPU_EMU is not set
-+CONFIG_ADVANCED=y
-+# CONFIG_RMW_INSNS is not set
-+CONFIG_SINGLE_MEMORY_CHUNK=y
-+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+CONFIG_NEED_MULTIPLE_NODES=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+
-+#
-+# General setup
-+#
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_AOUT is not set
-+# CONFIG_BINFMT_MISC is not set
-+CONFIG_PROC_HARDWARE=y
-+CONFIG_ZONE_DMA=y
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+
-+#
-+# Power management options
-+#
-+# CONFIG_PM is not set
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+CONFIG_NET_KEY=y
-+# CONFIG_NET_KEY_MIGRATE is not set
-+CONFIG_INET=y
-+# CONFIG_IP_MULTICAST is not set
-+CONFIG_IP_ADVANCED_ROUTER=y
-+CONFIG_ASK_IP_FIB_HASH=y
-+# CONFIG_IP_FIB_TRIE is not set
-+CONFIG_IP_FIB_HASH=y
-+# CONFIG_IP_MULTIPLE_TABLES is not set
-+# CONFIG_IP_ROUTE_MULTIPATH is not set
-+# CONFIG_IP_ROUTE_VERBOSE is not set
-+CONFIG_IP_PNP=y
-+# CONFIG_IP_PNP_DHCP is not set
-+# CONFIG_IP_PNP_BOOTP is not set
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_ARPD is not set
-+# CONFIG_SYN_COOKIES is not set
-+CONFIG_INET_AH=y
-+CONFIG_INET_ESP=y
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_BEET is not set
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+CONFIG_CAN=y
-+CONFIG_CAN_RAW=y
-+# CONFIG_CAN_BCM is not set
-+
-+#
-+# CAN Device Drivers
-+#
-+# CONFIG_CAN_VCAN is not set
-+CONFIG_CAN_FLEXCAN=y
-+CONFIG_CAN_MCF547X_8X=y
-+# CONFIG_CAN_DEBUG_DEVICES is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+# CONFIG_STANDALONE is not set
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=y
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+
-+#
-+# User Modules And Translation Layers
-+#
-+# CONFIG_MTD_CHAR is not set
-+CONFIG_MTD_BLKDEVS=y
-+CONFIG_MTD_BLOCK=y
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+# CONFIG_MTD_CFI is not set
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+CONFIG_MTD_RAM=y
-+CONFIG_MTD_ROM=y
-+# CONFIG_MTD_ABSENT is not set
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+# CONFIG_MTD_INTEL_VR_NOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_PMC551 is not set
-+# CONFIG_MTD_DATAFLASH is not set
-+# CONFIG_MTD_M25P80 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+# CONFIG_MTD_NAND is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=64000
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+CONFIG_COLDFIRE_SEC=y
-+CONFIG_SEC_DEVICE=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=y
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=y
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+# CONFIG_BLK_DEV_SR is not set
-+# CONFIG_CHR_DEV_SG is not set
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+CONFIG_SCSI_MULTI_LUN=y
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+# CONFIG_SCSI_SCAN_ASYNC is not set
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+# CONFIG_SCSI_LOWLEVEL is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+CONFIG_FEC_548x=y
-+CONFIG_FEC_548x_AUTO_NEGOTIATION=y
-+# CONFIG_FEC_548x_ENABLE_FEC2 is not set
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_ENC28J60 is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+# CONFIG_NETDEV_1000 is not set
-+# CONFIG_NETDEV_10000 is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NET_FC is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+CONFIG_INPUT_MOUSEDEV=y
-+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-+# CONFIG_INPUT_JOYDEV is not set
-+CONFIG_INPUT_EVDEV=y
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+CONFIG_INPUT_KEYBOARD=y
-+# CONFIG_KEYBOARD_ATKBD is not set
-+# CONFIG_KEYBOARD_SUNKBD is not set
-+# CONFIG_KEYBOARD_LKKBD is not set
-+# CONFIG_KEYBOARD_XTKBD is not set
-+# CONFIG_KEYBOARD_NEWTON is not set
-+# CONFIG_KEYBOARD_STOWAWAY is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+CONFIG_SERIO=y
-+CONFIG_SERIO_SERPORT=y
-+# CONFIG_SERIO_PCIPS2 is not set
-+# CONFIG_SERIO_RAW is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+CONFIG_VT=y
-+CONFIG_VT_CONSOLE=y
-+CONFIG_HW_CONSOLE=y
-+# CONFIG_VT_HW_CONSOLE_BINDING is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+# CONFIG_SERIAL_8250 is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+CONFIG_SERIAL_COLDFIRE=y
-+CONFIG_SERIAL_COLDFIRE_IRDA=y
-+# CONFIG_SERIAL_MCF is not set
-+# CONFIG_SERIAL_JSM is not set
-+CONFIG_UNIX98_PTYS=y
-+# CONFIG_LEGACY_PTYS is not set
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+CONFIG_SPI=y
-+CONFIG_SPI_DEBUG=y
-+# CONFIG_COLDFIRE_EDMA is not set
-+CONFIG_SPI_MASTER=y
-+
-+#
-+# SPI Master Controller Drivers
-+#
-+# CONFIG_SPI_BITBANG is not set
-+CONFIG_SPI_COLDFIRE=y
-+
-+#
-+# SPI Protocol Masters
-+#
-+# CONFIG_SPI_AT25 is not set
-+# CONFIG_SPI_SPIDEV is not set
-+# CONFIG_SPI_TLE62X0 is not set
-+# CONFIG_SPI_COLDFIRE_SSI_AUDIO is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+# CONFIG_THERMAL is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_COLDFIRE_WATCHDOG=m
-+
-+#
-+# PCI-based Watchdog Cards
-+#
-+# CONFIG_PCIPCWATCHDOG is not set
-+# CONFIG_WDTPCI is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Console display driver support
-+#
-+CONFIG_DUMMY_CONSOLE=y
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+CONFIG_HID_DEBUG=y
-+# CONFIG_HIDRAW is not set
-+# CONFIG_USB_SUPPORT is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_RTC_CLASS is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_SERIAL_CONSOLE is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+CONFIG_EXT3_FS_XATTR=y
-+# CONFIG_EXT3_FS_POSIX_ACL is not set
-+# CONFIG_EXT3_FS_SECURITY is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+# CONFIG_INOTIFY is not set
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+CONFIG_FAT_FS=y
-+CONFIG_MSDOS_FS=y
-+CONFIG_VFAT_FS=y
-+CONFIG_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+CONFIG_NTFS_FS=y
-+# CONFIG_NTFS_DEBUG is not set
-+CONFIG_NTFS_RW=y
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+# CONFIG_PROC_KCORE is not set
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+# CONFIG_JFFS2_FS is not set
-+# CONFIG_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+CONFIG_MINIX_FS=y
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+CONFIG_ROMFS_FS=y
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+# CONFIG_NFS_V3 is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_BSD_DISKLABEL is not set
-+# CONFIG_MINIX_SUBPARTITION is not set
-+# CONFIG_SOLARIS_X86_PARTITION is not set
-+# CONFIG_UNIXWARE_DISKLABEL is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+CONFIG_NLS=y
-+CONFIG_NLS_DEFAULT="iso8859-1"
-+CONFIG_NLS_CODEPAGE_437=y
-+# CONFIG_NLS_CODEPAGE_737 is not set
-+# CONFIG_NLS_CODEPAGE_775 is not set
-+# CONFIG_NLS_CODEPAGE_850 is not set
-+# CONFIG_NLS_CODEPAGE_852 is not set
-+# CONFIG_NLS_CODEPAGE_855 is not set
-+# CONFIG_NLS_CODEPAGE_857 is not set
-+# CONFIG_NLS_CODEPAGE_860 is not set
-+# CONFIG_NLS_CODEPAGE_861 is not set
-+# CONFIG_NLS_CODEPAGE_862 is not set
-+# CONFIG_NLS_CODEPAGE_863 is not set
-+# CONFIG_NLS_CODEPAGE_864 is not set
-+# CONFIG_NLS_CODEPAGE_865 is not set
-+# CONFIG_NLS_CODEPAGE_866 is not set
-+# CONFIG_NLS_CODEPAGE_869 is not set
-+# CONFIG_NLS_CODEPAGE_936 is not set
-+# CONFIG_NLS_CODEPAGE_950 is not set
-+# CONFIG_NLS_CODEPAGE_932 is not set
-+# CONFIG_NLS_CODEPAGE_949 is not set
-+# CONFIG_NLS_CODEPAGE_874 is not set
-+# CONFIG_NLS_ISO8859_8 is not set
-+# CONFIG_NLS_CODEPAGE_1250 is not set
-+# CONFIG_NLS_CODEPAGE_1251 is not set
-+# CONFIG_NLS_ASCII is not set
-+CONFIG_NLS_ISO8859_1=y
-+# CONFIG_NLS_ISO8859_2 is not set
-+# CONFIG_NLS_ISO8859_3 is not set
-+# CONFIG_NLS_ISO8859_4 is not set
-+# CONFIG_NLS_ISO8859_5 is not set
-+# CONFIG_NLS_ISO8859_6 is not set
-+# CONFIG_NLS_ISO8859_7 is not set
-+# CONFIG_NLS_ISO8859_9 is not set
-+# CONFIG_NLS_ISO8859_13 is not set
-+# CONFIG_NLS_ISO8859_14 is not set
-+# CONFIG_NLS_ISO8859_15 is not set
-+# CONFIG_NLS_KOI8_R is not set
-+# CONFIG_NLS_KOI8_U is not set
-+CONFIG_NLS_UTF8=y
-+# CONFIG_DLM is not set
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+# CONFIG_ENABLE_MUST_CHECK is not set
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+CONFIG_DEBUG_SLAB=y
-+# CONFIG_DEBUG_SLAB_LEAK is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+CONFIG_DEBUG_BUGVERBOSE=y
-+CONFIG_DEBUG_INFO=y
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_FRAME_POINTER is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+CONFIG_BOOTPARAM=y
-+CONFIG_BOOTPARAM_STRING="root=/dev/nfs rw nfsroot=172.27.163.2:/tftpboot/ltib ip=172.27.163.3:172.27.163.2:172.27.255.254:255.255.0.0::eth0:off mtdparts=phys_mapped_flash:16m(User)"
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_AEAD=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_HASH=y
-+CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_HMAC=y
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+CONFIG_CRYPTO_MD5=y
-+CONFIG_CRYPTO_SHA1=y
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+CONFIG_CRYPTO_CBC=y
-+# CONFIG_CRYPTO_PCBC is not set
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+CONFIG_CRYPTO_TEST=m
-+CONFIG_CRYPTO_AUTHENC=y
-+# CONFIG_CRYPTO_LZO is not set
-+# CONFIG_CRYPTO_HW is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+CONFIG_CRC_CCITT=y
-+CONFIG_CRC16=y
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+CONFIG_LIBCRC32C=y
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
---- a/arch/m68k/configs/m5485evb_defconfig
-+++ b/arch/m68k/configs/m5485evb_defconfig
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
--# Linux kernel version: 2.6.24
--# Wed Mar  5 16:05:25 2008
-+# Linux kernel version: 2.6.25
-+# Thu Jul 10 16:12:53 2008
- #
- CONFIG_M68K=y
- CONFIG_MMU=y
-@@ -16,6 +16,8 @@ CONFIG_TIME_LOW_RES=y
- CONFIG_GENERIC_IOMAP=y
- # CONFIG_NO_IOPORT is not set
- # CONFIG_NO_DMA is not set
-+CONFIG_ARCH_SUPPORTS_AOUT=y
-+CONFIG_HZ=100
- CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
- 
- #
-@@ -32,18 +34,24 @@ CONFIG_SYSVIPC_SYSCTL=y
- # CONFIG_POSIX_MQUEUE is not set
- # CONFIG_BSD_PROCESS_ACCT is not set
- # CONFIG_TASKSTATS is not set
--# CONFIG_USER_NS is not set
--# CONFIG_PID_NS is not set
- # CONFIG_AUDIT is not set
- CONFIG_IKCONFIG=y
- CONFIG_IKCONFIG_PROC=y
- CONFIG_LOG_BUF_SHIFT=17
- # CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
- CONFIG_FAIR_GROUP_SCHED=y
--CONFIG_FAIR_USER_SCHED=y
--# CONFIG_FAIR_CGROUP_SCHED is not set
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
- CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
- # CONFIG_RELAY is not set
-+CONFIG_NAMESPACES=y
-+# CONFIG_UTS_NS is not set
-+# CONFIG_IPC_NS is not set
-+# CONFIG_USER_NS is not set
-+# CONFIG_PID_NS is not set
- # CONFIG_BLK_DEV_INITRD is not set
- # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
- CONFIG_SYSCTL=y
-@@ -57,17 +65,25 @@ CONFIG_HOTPLUG=y
- CONFIG_PRINTK=y
- CONFIG_BUG=y
- CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=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_SLAB=y
- # CONFIG_SLUB is not set
- # CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+# CONFIG_HAVE_OPROFILE is not set
-+# CONFIG_HAVE_KPROBES is not set
-+# CONFIG_HAVE_KRETPROBES is not set
-+CONFIG_PROC_PAGE_MONITOR=y
- CONFIG_SLABINFO=y
- CONFIG_RT_MUTEXES=y
- # CONFIG_TINY_SHMEM is not set
-@@ -96,6 +112,7 @@ CONFIG_IOSCHED_CFQ=y
- CONFIG_DEFAULT_CFQ=y
- # CONFIG_DEFAULT_NOOP is not set
- CONFIG_DEFAULT_IOSCHED="cfq"
-+CONFIG_CLASSIC_RCU=y
- 
- #
- # Platform dependent setup
-@@ -120,7 +137,7 @@ CONFIG_MCD_DMA=y
- # CONFIG_M68030 is not set
- # CONFIG_M68040 is not set
- # CONFIG_M68060 is not set
--# CONFIG_M54455 is not set
-+# CONFIG_M5445X is not set
- CONFIG_M547X_8X=y
- # CONFIG_M547X is not set
- CONFIG_M548X=y
-@@ -141,6 +158,7 @@ CONFIG_MCFCLK=200000000
- CONFIG_MMU_CFV4E=y
- CONFIG_SDRAM_BASE=0x00000000
- CONFIG_SDRAM_SIZE=0x04000000
-+CONFIG_NOR_FLASH_BASE=0xE0000000
- # CONFIG_M68KFPU_EMU is not set
- CONFIG_ADVANCED=y
- # CONFIG_RMW_INSNS is not set
-@@ -191,6 +209,7 @@ CONFIG_XFRM=y
- # CONFIG_XFRM_USER is not set
- # CONFIG_XFRM_SUB_POLICY is not set
- # CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
- CONFIG_NET_KEY=y
- # CONFIG_NET_KEY_MIGRATE is not set
- CONFIG_INET=y
-@@ -251,6 +270,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
- #
- # CONFIG_NET_PKTGEN is not set
- # CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
- # CONFIG_IRDA is not set
- # CONFIG_BT is not set
- # CONFIG_AF_RXRPC is not set
-@@ -280,73 +300,7 @@ CONFIG_FW_LOADER=y
- # CONFIG_DEBUG_DEVRES is not set
- # CONFIG_SYS_HYPERVISOR is not set
- # CONFIG_CONNECTOR is not set
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--# CONFIG_MTD_CONCAT is not set
--CONFIG_MTD_PARTITIONS=y
--# CONFIG_MTD_REDBOOT_PARTS is not set
--CONFIG_MTD_CMDLINE_PARTS=y
--
--#
--# User Modules And Translation Layers
--#
--# CONFIG_MTD_CHAR is not set
--CONFIG_MTD_BLKDEVS=y
--CONFIG_MTD_BLOCK=y
--# CONFIG_FTL is not set
--# CONFIG_NFTL is not set
--# CONFIG_INFTL is not set
--# CONFIG_RFD_FTL is not set
--# CONFIG_SSFDC is not set
--# CONFIG_MTD_OOPS is not set
--
--#
--# RAM/ROM/Flash chip drivers
--#
--# CONFIG_MTD_CFI is not set
--# CONFIG_MTD_JEDECPROBE is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--CONFIG_MTD_MAP_BANK_WIDTH_4=y
--# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
--CONFIG_MTD_CFI_I1=y
--CONFIG_MTD_CFI_I2=y
--# CONFIG_MTD_CFI_I4 is not set
--# CONFIG_MTD_CFI_I8 is not set
--CONFIG_MTD_RAM=y
--CONFIG_MTD_ROM=y
--# CONFIG_MTD_ABSENT is not set
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--# CONFIG_MTD_PHYSMAP is not set
--# CONFIG_MTD_PLATRAM is not set
--
--#
--# Self-contained MTD device drivers
--#
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_MTDRAM is not set
--# CONFIG_MTD_BLOCK2MTD is not set
--
--#
--# Disk-On-Chip Device Drivers
--#
--# CONFIG_MTD_DOC2000 is not set
--# CONFIG_MTD_DOC2001 is not set
--# CONFIG_MTD_DOC2001PLUS is not set
--# CONFIG_MTD_NAND is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
-+# CONFIG_MTD is not set
- # CONFIG_PARPORT is not set
- CONFIG_BLK_DEV=y
- # CONFIG_BLK_DEV_COW_COMMON is not set
-@@ -356,11 +310,15 @@ CONFIG_BLK_DEV_LOOP=y
- CONFIG_BLK_DEV_RAM=y
- CONFIG_BLK_DEV_RAM_COUNT=16
- CONFIG_BLK_DEV_RAM_SIZE=64000
--CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-+# CONFIG_BLK_DEV_XIP is not set
- # CONFIG_CDROM_PKTCDVD is not set
- # CONFIG_ATA_OVER_ETH is not set
- CONFIG_MISC_DEVICES=y
-+CONFIG_COLDFIRE_SEC=y
-+CONFIG_SEC_DEVICE=y
- # CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
- # CONFIG_IDE is not set
- 
- #
-@@ -417,6 +375,7 @@ CONFIG_MII=y
- CONFIG_FEC_548x=y
- CONFIG_FEC_548x_AUTO_NEGOTIATION=y
- # CONFIG_FEC_548x_ENABLE_FEC2 is not set
-+# CONFIG_ENC28J60 is not set
- # CONFIG_IBM_NEW_EMAC_ZMII is not set
- # CONFIG_IBM_NEW_EMAC_RGMII is not set
- # CONFIG_IBM_NEW_EMAC_TAH is not set
-@@ -433,7 +392,6 @@ CONFIG_FEC_548x_AUTO_NEGOTIATION=y
- # CONFIG_WAN is not set
- # CONFIG_PPP is not set
- # CONFIG_SLIP is not set
--# CONFIG_SHAPER is not set
- # CONFIG_NETCONSOLE is not set
- # CONFIG_NETPOLL is not set
- # CONFIG_NET_POLL_CONTROLLER is not set
-@@ -500,6 +458,8 @@ CONFIG_HW_CONSOLE=y
- # Non-8250 serial port support
- #
- CONFIG_SERIAL_COLDFIRE=y
-+# CONFIG_SERIAL_COLDFIRE_IRDA is not set
-+# CONFIG_SERIAL_MCF is not set
- CONFIG_UNIX98_PTYS=y
- # CONFIG_LEGACY_PTYS is not set
- # CONFIG_IPMI_HANDLER is not set
-@@ -508,17 +468,69 @@ CONFIG_UNIX98_PTYS=y
- # CONFIG_R3964 is not set
- # CONFIG_RAW_DRIVER is not set
- # CONFIG_TCG_TPM is not set
--# CONFIG_I2C is not set
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+# CONFIG_I2C_CHARDEV is not set
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+CONFIG_I2C_MCF548x=y
-+# CONFIG_I2C_MCF is not set
-+# 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
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+# CONFIG_I2C_DEBUG_CORE is not set
-+# CONFIG_I2C_DEBUG_ALGO is not set
-+# CONFIG_I2C_DEBUG_BUS is not set
-+# CONFIG_I2C_DEBUG_CHIP is not set
- 
- #
- # SPI support
- #
--# CONFIG_SPI is not set
-+CONFIG_SPI=y
-+CONFIG_SPI_DEBUG=y
- # CONFIG_COLDFIRE_EDMA is not set
--# CONFIG_SPI_MASTER is not set
-+CONFIG_SPI_MASTER=y
-+
-+#
-+# SPI Master Controller Drivers
-+#
-+# CONFIG_SPI_BITBANG is not set
-+CONFIG_SPI_COLDFIRE=y
-+
-+#
-+# SPI Protocol Masters
-+#
-+# CONFIG_SPI_AT25 is not set
-+# CONFIG_SPI_SPIDEV is not set
-+# CONFIG_SPI_TLE62X0 is not set
-+# CONFIG_SPI_COLDFIRE_SSI_AUDIO is not set
- # CONFIG_W1 is not set
- # CONFIG_POWER_SUPPLY is not set
- # CONFIG_HWMON is not set
-+# CONFIG_THERMAL is not set
- # CONFIG_WATCHDOG is not set
- 
- #
-@@ -567,6 +579,7 @@ CONFIG_HID_DEBUG=y
- # CONFIG_HIDRAW is not set
- # CONFIG_USB_SUPPORT is not set
- # CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
- # CONFIG_NEW_LEDS is not set
- # CONFIG_RTC_CLASS is not set
- 
-@@ -599,11 +612,9 @@ CONFIG_FS_MBCACHE=y
- # CONFIG_XFS_FS is not set
- # CONFIG_GFS2_FS is not set
- # CONFIG_OCFS2_FS is not set
--CONFIG_MINIX_FS=y
--CONFIG_ROMFS_FS=y
-+CONFIG_DNOTIFY=y
- # CONFIG_INOTIFY is not set
- # CONFIG_QUOTA is not set
--CONFIG_DNOTIFY=y
- # CONFIG_AUTOFS_FS is not set
- # CONFIG_AUTOFS4_FS is not set
- # CONFIG_FUSE_FS is not set
-@@ -648,11 +659,12 @@ CONFIG_TMPFS=y
- # CONFIG_BEFS_FS is not set
- # CONFIG_BFS_FS is not set
- # CONFIG_EFS_FS is not set
--# CONFIG_JFFS2_FS is not set
- # CONFIG_CRAMFS is not set
- # CONFIG_VXFS_FS is not set
-+CONFIG_MINIX_FS=y
- # CONFIG_HPFS_FS is not set
- # CONFIG_QNX4FS_FS is not set
-+CONFIG_ROMFS_FS=y
- # CONFIG_SYSV_FS is not set
- # CONFIG_UFS_FS is not set
- CONFIG_NETWORK_FILESYSTEMS=y
-@@ -736,9 +748,6 @@ CONFIG_NLS_ISO8859_1=y
- # CONFIG_NLS_KOI8_U is not set
- CONFIG_NLS_UTF8=y
- # CONFIG_DLM is not set
--CONFIG_INSTRUMENTATION=y
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
- 
- #
- # Kernel hacking
-@@ -770,20 +779,15 @@ CONFIG_DEBUG_INFO=y
- # CONFIG_DEBUG_LIST is not set
- # CONFIG_DEBUG_SG is not set
- # CONFIG_FRAME_POINTER is not set
--CONFIG_FORCED_INLINING=y
- # CONFIG_BOOT_PRINTK_DELAY is not set
- # CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
- # CONFIG_FAULT_INJECTION is not set
- # CONFIG_SAMPLES is not set
- CONFIG_BOOTPARAM=y
- CONFIG_BOOTPARAM_STRING="root=/dev/nfs rw nfsroot=172.27.163.2:/tftpboot/ltib ip=172.27.163.3:172.27.163.2:172.27.255.254:255.255.0.0::eth0:off mtdparts=phys_mapped_flash:16m(User)"
- 
- #
--# CodeTEST Setup
--#
--# CONFIG_CODETEST is not set
--
--#
- # Security options
- #
- # CONFIG_KEYS is not set
-@@ -791,7 +795,9 @@ CONFIG_BOOTPARAM_STRING="root=/dev/nfs r
- # CONFIG_SECURITY_FILE_CAPABILITIES is not set
- CONFIG_CRYPTO=y
- CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_AEAD=y
- CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
- CONFIG_CRYPTO_HASH=y
- CONFIG_CRYPTO_MANAGER=y
- CONFIG_CRYPTO_HMAC=y
-@@ -810,6 +816,9 @@ CONFIG_CRYPTO_CBC=y
- # CONFIG_CRYPTO_PCBC is not set
- # CONFIG_CRYPTO_LRW is not set
- # CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
- # CONFIG_CRYPTO_CRYPTD is not set
- CONFIG_CRYPTO_DES=y
- # CONFIG_CRYPTO_FCRYPT is not set
-@@ -824,12 +833,14 @@ CONFIG_CRYPTO_DES=y
- # CONFIG_CRYPTO_KHAZAD is not set
- # CONFIG_CRYPTO_ANUBIS is not set
- # CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
- # CONFIG_CRYPTO_DEFLATE is not set
- # CONFIG_CRYPTO_MICHAEL_MIC is not set
- # CONFIG_CRYPTO_CRC32C is not set
- # CONFIG_CRYPTO_CAMELLIA is not set
- CONFIG_CRYPTO_TEST=m
--# CONFIG_CRYPTO_AUTHENC is not set
-+CONFIG_CRYPTO_AUTHENC=y
-+# CONFIG_CRYPTO_LZO is not set
- # CONFIG_CRYPTO_HW is not set
- 
- #
diff --git a/target/linux/coldfire/patches/055-m547x_8x_i2c.patch b/target/linux/coldfire/patches/055-m547x_8x_i2c.patch
deleted file mode 100644
index 0a2a277d3..000000000
--- a/target/linux/coldfire/patches/055-m547x_8x_i2c.patch
+++ /dev/null
@@ -1,808 +0,0 @@
-From ce57fc22543d0ee0ca33157264815a52fc8cf9a3 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Thu, 15 May 2008 13:23:27 -0600
-Subject: [PATCH] Add I2C bus driver for MCF547x and MCF548x.
-
-LTIBName: m547x-8x-i2c
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
-Signed-off-by: Shrek Wu <b16972@freescale.com>
----
- arch/m68k/coldfire/Makefile          |    1 +
- arch/m68k/coldfire/mcf548x-devices.c |   94 ++++++
- drivers/i2c/busses/Kconfig           |   12 +
- drivers/i2c/busses/Makefile          |    1 +
- drivers/i2c/busses/i2c-algo-mcf.h    |   23 ++
- drivers/i2c/busses/i2c-mcf548x.c     |  573 ++++++++++++++++++++++++++++++++++
- include/asm-m68k/m5485i2c.h          |   45 +++
- 7 files changed, 749 insertions(+), 0 deletions(-)
- create mode 100644 arch/m68k/coldfire/mcf548x-devices.c
- create mode 100644 drivers/i2c/busses/i2c-algo-mcf.h
- create mode 100644 drivers/i2c/busses/i2c-mcf548x.c
- create mode 100644 include/asm-m68k/m5485i2c.h
-
---- a/arch/m68k/coldfire/Makefile
-+++ b/arch/m68k/coldfire/Makefile
-@@ -11,4 +11,5 @@ endif
- obj-$(CONFIG_PCI)	+= pci.o mcf5445x-pci.o iomap.o
- obj-$(CONFIG_M54455)	+= mcf5445x-devices.o
- obj-$(CONFIG_M547X_8X)	+= m547x_8x-devices.o
-+obj-$(CONFIG_M547X_8X)	+= mcf548x-devices.o
- obj-$(CONFIG_MCD_DMA)	+= m547x_8x-dma.o
---- /dev/null
-+++ b/arch/m68k/coldfire/mcf548x-devices.c
-@@ -0,0 +1,94 @@
-+/*
-+ * arch/m68k/coldfire/mcf5445x-devices.c
-+ *
-+ * Coldfire M5445x Platform Device Configuration
-+ *
-+ * Based on the Freescale MXC devices.c
-+ *
-+ * Copyright (c) 2007 Freescale Semiconductor, Inc.
-+ *	Kurt Mahan <kmahan@freescale.com>
-+ */
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/mtd/physmap.h>
-+#include <linux/platform_device.h>
-+#include <linux/fsl_devices.h>
-+
-+#include <asm/coldfire.h>
-+#include <asm/mcfsim.h>
-+
-+static struct resource coldfire_i2c_resources[] = {
-+	[0] = {		/* I/O */
-+		.start		= MCF_MBAR + 0x008F00,
-+		.end		= MCF_MBAR + 0x008F20,
-+		.flags		= IORESOURCE_MEM,
-+	},
-+	[2] = {		/* IRQ */
-+		.start		= 40,
-+		.end		= 40,
-+		.flags		= IORESOURCE_IRQ,
-+	},
-+};
-+
-+static struct platform_device coldfire_i2c_device = {
-+	.name			= "MCF548X-i2c",
-+	.id			= -1,
-+	.num_resources		= ARRAY_SIZE(coldfire_i2c_resources),
-+	.resource		= coldfire_i2c_resources,
-+};
-+
-+static struct resource coldfire_sec_resources[] = {
-+	[0] = {         /* I/O */
-+		.start          = MCF_MBAR + 0x00020000,
-+		.end            = MCF_MBAR + 0x00033000,
-+		.flags          = IORESOURCE_MEM,
-+	},
-+	[2] = {         /* IRQ */
-+		.start          = ISC_SEC,
-+		.end            = ISC_SEC,
-+		.flags          = IORESOURCE_IRQ,
-+	},
-+};
-+
-+static struct platform_device coldfire_sec_device = {
-+	.name                   = "fsl-sec1",
-+	.id                     = -1,
-+	.num_resources          = ARRAY_SIZE(coldfire_sec_resources),
-+	.resource               = coldfire_sec_resources,
-+};
-+
-+#if defined(CONFIG_MTD_PHYSMAP)
-+static struct physmap_flash_data mcf5485_flash_data = {
-+	.width          = 2,
-+};
-+
-+static struct resource mcf5485_flash_resource = {
-+	.start          = 0xf8000000,
-+	.end            = 0xf80fffff,
-+	.flags          = IORESOURCE_MEM,
-+};
-+
-+static struct platform_device mcf5485_flash_device = {
-+	.name           = "physmap-flash",
-+	.id             = 0,
-+	.dev            = {
-+		.platform_data  = &mcf5485_flash_data,
-+	},
-+	.num_resources  = 1,
-+	.resource       = &mcf5485_flash_resource,
-+};
-+#endif
-+
-+static int __init mcf5485_init_devices(void)
-+{
-+	printk(KERN_INFO "MCF5485x INIT_DEVICES\n");
-+
-+	platform_device_register(&coldfire_i2c_device);
-+	platform_device_register(&coldfire_sec_device);
-+/*#if defined(CONFIG_MTD_PHYSMAP)
-+	platform_device_register(&mcf5485_flash_device);
-+#endif*/
-+	return 0;
-+}
-+arch_initcall(mcf5485_init_devices);
---- a/drivers/i2c/busses/Kconfig
-+++ b/drivers/i2c/busses/Kconfig
-@@ -4,6 +4,18 @@
- 
- menu "I2C Hardware Bus support"
- 
-+config I2C_MCF548x
-+	tristate "I2C MCF547x/548x interfaces"
-+	depends on I2C
-+	help
-+	  This allows you to use the I2C adapters found on the Freescale
-+	  MCF547x/548x microcontrollers.
-+	  Say Y if you own an I2C adapter belonging to this class and then say
-+	  Y to the specific driver for you adapter below.
-+
-+	  This support is also available as a module.  If so, the module
-+	  will be called i2c-algo-mcf.
-+
- config I2C_ALI1535
- 	tristate "ALI 1535"
- 	depends on PCI
---- a/drivers/i2c/busses/Makefile
-+++ b/drivers/i2c/busses/Makefile
-@@ -52,6 +52,7 @@ obj-$(CONFIG_I2C_VIAPRO)	+= i2c-viapro.o
- obj-$(CONFIG_I2C_VOODOO3)	+= i2c-voodoo3.o
- obj-$(CONFIG_SCx200_ACB)	+= scx200_acb.o
- obj-$(CONFIG_SCx200_I2C)	+= scx200_i2c.o
-+obj-$(CONFIG_I2C_MCF548x)       += i2c-mcf548x.o
- 
- ifeq ($(CONFIG_I2C_DEBUG_BUS),y)
- EXTRA_CFLAGS += -DDEBUG
---- /dev/null
-+++ b/drivers/i2c/busses/i2c-algo-mcf.h
-@@ -0,0 +1,23 @@
-+#ifndef I2C_ALGO_MCF_H
-+#define I2C_ALGO_MCF_H 1
-+
-+/* --- Defines for pcf-adapters ---------------------------------------	*/
-+#include <linux/i2c.h>
-+
-+struct i2c_algo_mcf_data {
-+	void *data;		/* private data for lolevel routines	*/
-+	void (*setmcf) (void *data, int ctl, int val);
-+	int (*getmcf) (void *data, int ctl);
-+	int (*getown) (void *data);
-+	int (*getclock) (void *data);
-+	void (*waitforpin) (void);
-+	/* local settings */
-+	int udelay;
-+	int mdelay;
-+	int timeout;
-+};
-+
-+int i2c_mcf_add_bus(struct i2c_adapter *);
-+int i2c_mcf_del_bus(struct i2c_adapter *);
-+
-+#endif /* I2C_ALGO_MCF_H */
---- /dev/null
-+++ b/drivers/i2c/busses/i2c-mcf548x.c
-@@ -0,0 +1,573 @@
-+/*
-+ * 	Performance and stability improvements: (C) Copyright 2008,
-+ *	Adrian Cox <adrian@humboldt.co.uk>
-+ *	ColdFire 547x/548x I2C master support
-+ * 	Shrek Wu (b16972@freescale.com )moved the code driver/i2c/alg/mcf.c
-+ *      into driver/i2c/busses.And changed the driver to a platform driver.
-+ */
-+#include <linux/i2c.h>
-+#include "i2c-algo-mcf.h"
-+
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/delay.h>
-+#include <linux/platform_device.h>
-+#include <linux/sched.h>
-+#include <linux/interrupt.h>
-+#include <asm/io.h>
-+
-+#include <asm/coldfire.h>
-+#include <asm/m5485sim.h>
-+#include <asm/m5485i2c.h>
-+
-+#define get_clock(adap) (clock)
-+#define get_own(adap) 	(own)
-+
-+static int clock = 0x3b;  /*50000 / 1024 ~ 49 KHz*/
-+module_param(clock, int, 0);
-+MODULE_PARM_DESC(clock,
-+	"Set I2C clock in kHz: 400=fast mode (default == 49khz)");
-+
-+static int own = 0x78;
-+module_param(own, int, 0);
-+MODULE_PARM_DESC(clock, "Set I2C Master controller address(0x78)");
-+
-+static struct i2c_algo_mcf_data i2c_mcf_board_data = {
-+	.timeout =	10000,
-+};
-+
-+static struct i2c_adapter i2c_mcf_board_adapter = {
-+	.owner = THIS_MODULE,
-+	.name = "MCF5485 adapter",
-+	.id = I2C_HW_MPC107,
-+	.algo_data = &i2c_mcf_board_data,
-+	.class = I2C_CLASS_HWMON,
-+	.timeout = 1,
-+	.retries = 1
-+};
-+/*
-+ *  static void i2c_start()
-+ *
-+ *  Generates START signal
-+ */
-+static void
-+i2c_start(
-+	struct i2c_algo_mcf_data *adap
-+) {
-+	MCF_I2CR |= MCF_I2CR_MSTA;
-+}
-+
-+
-+/*
-+ *  static void i2c_stop()
-+ *
-+ *  Generates STOP signal
-+ */
-+static void
-+i2c_stop(
-+	struct i2c_algo_mcf_data *adap
-+) {
-+	MCF_I2CR &= ~MCF_I2CR_MSTA;
-+}
-+
-+static int
-+i2c_getack(
-+	struct i2c_algo_mcf_data *adap
-+) {
-+	return !(MCF_I2SR & MCF_I2SR_RXAK);
-+}
-+
-+/*
-+ *  static void i2c_repstart()
-+ *
-+ *  Generates repeated start signal (without STOP while mastering the bus)
-+ */
-+static void
-+i2c_repstart(
-+	struct i2c_algo_mcf_data *adap
-+) {
-+	MCF_I2CR |= MCF_I2CR_RSTA;
-+	MCF_I2CR |= MCF_I2CR_MTX;
-+}
-+
-+
-+/*
-+ *  static void wait_for_bb()
-+ *
-+ *  Wait for bus idle state
-+ */
-+static int
-+wait_for_bb(
-+	struct i2c_algo_mcf_data *adap
-+) {
-+	int i;
-+	for (i = 0; i < adap->timeout; i++) {
-+		if (!(MCF_I2SR & MCF_I2SR_IBB))
-+			return 0;
-+		udelay(10);
-+	}
-+	printk(KERN_ERR "%s: timeout", __FUNCTION__);
-+	return -ETIMEDOUT;
-+}
-+
-+/*
-+ *  static void wait_for_not_bb()
-+ *
-+ *  Wait for bus busy state
-+ */
-+static int
-+wait_for_not_bb(
-+	struct i2c_algo_mcf_data *adap
-+) {
-+	int i;
-+	for (i = 0; i < adap->timeout; i++) {
-+		if (MCF_I2SR & MCF_I2SR_IBB)
-+			return 0;
-+		udelay(10);
-+	}
-+	printk(KERN_ERR "%s: timeout", __FUNCTION__);
-+	return -ETIMEDOUT;
-+}
-+
-+/*
-+ *  static void wait_xfer_done()
-+ *
-+ *  Wait for transfer to complete
-+ */
-+static int
-+wait_xfer_done(
-+	struct i2c_algo_mcf_data *adap
-+) {
-+	int i;
-+
-+	for (i = 0; i < adap->timeout; i++) {
-+		if (MCF_I2SR & MCF_I2SR_IIF) {
-+			MCF_I2SR &= ~MCF_I2SR_IIF;
-+			return 0;
-+		}
-+		udelay(1);
-+	}
-+	printk(KERN_ERR "%s: timeout", __FUNCTION__);
-+	return -ETIMEDOUT;
-+}
-+
-+
-+/*
-+ *  static void i2c_set_addr()
-+ *
-+ *  Sets slave address to communicate
-+ */
-+static int
-+i2c_set_addr(
-+	struct i2c_algo_mcf_data *adap,
-+	struct i2c_msg *msg,
-+	int retries
-+) {
-+	unsigned short flags = msg->flags;
-+	unsigned char addr;
-+
-+	if ((flags & I2C_M_TEN)) {
-+		/* 10 bit address not supported yet */
-+		return -EIO;
-+	} else {
-+		/* normal 7bit address */
-+		addr = (msg->addr << 1);
-+		if (flags & I2C_M_RD)
-+			addr |= 1;
-+		if (flags & I2C_M_REV_DIR_ADDR)
-+			addr ^= 1;
-+
-+		MCF_I2DR = addr;
-+	}
-+	return 0;
-+}
-+
-+
-+/*
-+ *  static void mcf_i2c_init()
-+ *
-+ *  Perform ColdFire i2c initialization
-+ */
-+static void
-+mcf_i2c_init(struct i2c_algo_mcf_data *adap)
-+{
-+	u8 dummy;
-+	/* Setup GPIO lines */
-+	MCF_PAR_FECI2CIRQ |= MCF_PAR_SDA;
-+	MCF_PAR_FECI2CIRQ |= MCF_PAR_SCL;
-+
-+	/*  Ensure slaves are in idle state */
-+	if (MCF_I2SR & MCF_I2SR_IBB) {
-+		MCF_I2ICR = 0x00;
-+		MCF_I2CR  = 0x00;
-+		MCF_I2CR  = 0x0A;
-+		dummy = MCF_I2DR;
-+		MCF_I2SR  = 0x00;
-+		MCF_I2CR  = 0x00;
-+		MCF_I2ICR = 0x01;
-+	}
-+
-+	/* setup SCL clock */
-+	MCF_I2FDR = get_clock(adap);
-+
-+	/* set slave address */
-+	MCF_I2AR = get_own(adap);
-+
-+	/* enable I2C module */
-+	MCF_I2CR = MCF_I2CR_IEN;
-+}
-+
-+static int i2c_outb(
-+	struct i2c_adapter *i2c_adap,
-+	char c
-+) {
-+
-+	struct i2c_algo_mcf_data *adap = i2c_adap->algo_data;
-+	int timeout;
-+	/* Put data to be sent */
-+	MCF_I2DR = c;
-+	/* Wait for xfer completed*/
-+	timeout = wait_xfer_done(adap);
-+	if (timeout) {
-+		i2c_stop(adap);
-+		wait_for_bb(adap);
-+		printk(KERN_ERR "i2c-algo-mcf: %s i2c_write: "
-+			"error - timeout.\n", i2c_adap->name);
-+		return -EREMOTEIO; /* got a better one ?? */
-+	}
-+
-+	return 0;
-+}
-+
-+
-+/*
-+ *  static void mcf_sendbytes()
-+ *
-+ *  Perform tx data transfer
-+ */
-+static int
-+mcf_sendbytes(
-+	struct i2c_adapter *i2c_adap,
-+	const char *buf,
-+	int count, int last
-+) {
-+	struct i2c_algo_mcf_data *adap = i2c_adap->algo_data;
-+	int ret, i;
-+
-+	/* Set master TX mode */
-+	MCF_I2CR |= MCF_I2CR_MTX;
-+
-+	for (i = 0; i < count; ++i) {
-+		printk(KERN_DEBUG "i2c-algo-mcf: %s i2c_write: writing %2.2X\n",
-+		      i2c_adap->name, buf[i]&0xff);
-+		ret = i2c_outb(i2c_adap, buf[i]);
-+		if (ret < 0)
-+			return ret;
-+	}
-+	if (last) {
-+		i2c_stop(adap);
-+		wait_for_bb(adap);
-+	} else {
-+		i2c_repstart(adap);
-+	}
-+
-+	return (i);
-+}
-+
-+
-+/*
-+ *  static void mcf_readbytes()
-+ *
-+ *  Perform rx data transfer
-+ */
-+static int
-+mcf_readbytes(
-+	struct i2c_adapter *i2c_adap,
-+	char *buf,
-+	int count, int last
-+) {
-+	int i;
-+	struct i2c_algo_mcf_data *adap = i2c_adap->algo_data;
-+	u8 dummy;
-+
-+	/* Set master RX mode */
-+	MCF_I2CR &= ~MCF_I2CR_MTX;
-+	MCF_I2CR &= ~MCF_I2CR_TXAK;
-+	dummy = MCF_I2DR;
-+
-+	for (i = 0; i < count-1; i++) {
-+		if (wait_xfer_done(adap)) {
-+			i2c_stop(adap);
-+			wait_for_bb(adap);
-+			printk(KERN_DEBUG
-+			    "i2c-algo-mcf: mcf_readbytes timed out.\n");
-+			return (-1);
-+		}
-+
-+		/* store next data byte */
-+		buf[i] = MCF_I2DR;
-+	}
-+
-+	if (wait_xfer_done(adap)) {
-+		i2c_stop(adap);
-+		wait_for_bb(adap);
-+		printk(KERN_DEBUG "i2c-algo-mcf: mcf_readbytes timed out.\n");
-+		return (-1);
-+	}
-+
-+	/* Disable acknowlege (set I2CR.TXAK) */
-+	MCF_I2CR |= MCF_I2CR_TXAK;
-+	buf[i] = MCF_I2DR;
-+	if (wait_xfer_done(adap)) {
-+		i2c_stop(adap);
-+		wait_for_bb(adap);
-+		printk(KERN_DEBUG "i2c-algo-mcf: mcf_readbytes timed out.\n");
-+		return (-1);
-+	}
-+
-+	if (last) {
-+		i2c_stop(adap);
-+		wait_for_bb(adap);
-+	} else {
-+		i2c_repstart(adap);
-+	}
-+
-+	return (i+1);
-+}
-+
-+
-+/*
-+ *  static void mcf_xfer()
-+ *
-+ *  Perform master data I/O transfer
-+ */
-+static int
-+mcf_xfer(
-+	struct i2c_adapter *i2c_adap,
-+	struct i2c_msg *msgs,
-+	int num
-+) {
-+	struct i2c_algo_mcf_data *adap = i2c_adap->algo_data;
-+	struct i2c_msg *pmsg;
-+	int i;
-+	int ret = 0, timeout;
-+
-+	/* Skip own address */
-+	if (get_own(adap) == (msgs[0].addr << 1))
-+		return -EIO;
-+
-+	/*  Ensure slaves are in idle state */
-+	if (MCF_I2SR & MCF_I2SR_IBB) {
-+		MCF_I2ICR = 0x00;
-+		MCF_I2CR  = 0x00;
-+		MCF_I2CR  = 0x0A;
-+		timeout = MCF_I2DR;
-+		MCF_I2SR  = 0x00;
-+		MCF_I2CR  = 0x00;
-+		MCF_I2ICR = 0x01;
-+	}
-+	/* setup SCL clock */
-+	MCF_I2FDR = get_clock(adap);
-+	/* set slave address */
-+	MCF_I2AR = get_own(adap);
-+	/* enable I2C module */
-+	MCF_I2CR = MCF_I2CR_IEN;
-+
-+	MCF_I2CR |= MCF_I2CR_TXAK;
-+
-+	/* Check for bus busy */
-+	wait_for_bb(adap);
-+
-+	for (i = 0; ret >= 0 && i < num; i++) {
-+		pmsg = &msgs[i];
-+
-+		printk(KERN_DEBUG "i2c-algo-mcf: Doing %s %d bytes "
-+			"to 0x%02x - %d of %d messages\n",
-+			pmsg->flags & I2C_M_RD ? "read" : "write",
-+			pmsg->len, pmsg->addr, i + 1, num);
-+
-+		/* Send START */
-+		if (i == 0)
-+			i2c_start(adap);
-+
-+		/* Wait for Bus Busy */
-+		wait_for_not_bb(adap);
-+
-+		MCF_I2CR |= MCF_I2CR_MTX;
-+
-+		ret = i2c_set_addr(adap, pmsg, i2c_adap->retries);
-+		if (ret < 0)
-+			return ret;
-+
-+		/* Wait for address transfer completion */
-+		wait_xfer_done(adap);
-+
-+		/* Check for ACK */
-+		if (!i2c_getack(adap)) {
-+			i2c_stop(adap);
-+			wait_for_bb(adap);
-+			printk(KERN_DEBUG "i2c-algo-mcf: No ack after "
-+				    "send address in mcf_xfer\n");
-+			return (-EREMOTEIO);
-+		}
-+
-+		printk(KERN_DEBUG "i2c-algo-mcf: Msg %d, "
-+				  "addr = 0x%x, flags = 0x%x, len = %d\n",
-+				i, msgs[i].addr, msgs[i].flags, msgs[i].len);
-+		/* Read */
-+		if (pmsg->flags & I2C_M_RD) {
-+			/* read bytes into buffer*/
-+			ret = mcf_readbytes(i2c_adap, pmsg->buf, pmsg->len,
-+						(i + 1 == num));
-+
-+			if (ret != pmsg->len) {
-+				printk(KERN_DEBUG "i2c-algo-mcf: fail: "
-+					    "only read %d bytes.\n", ret);
-+			} else {
-+				printk(KERN_DEBUG "i2c-algo-mcf: "
-+						  "read %d bytes.\n", ret);
-+			}
-+		} else {
-+			/* write bytes into buffer*/
-+			ret = mcf_sendbytes(i2c_adap, pmsg->buf, pmsg->len,
-+						(i + 1 == num));
-+			if (ret != pmsg->len) {
-+				printk(KERN_DEBUG "i2c-algo-mcf: fail: "
-+					    "only wrote %d bytes.\n", ret);
-+			} else {
-+				printk(KERN_DEBUG "i2c-algo-mcf: wrote"
-+					"%d bytes.\n", ret);
-+			}
-+		}
-+	}
-+
-+	/* Disable I2C module */
-+	MCF_I2CR = 0;
-+	return (i);
-+}
-+
-+
-+/*
-+ *  static void mcf_func()
-+ *
-+ *  Return algorithm funtionality
-+ */
-+static u32
-+mcf_func(
-+	struct i2c_adapter *i2c_adap
-+) {
-+	return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_I2C;
-+}
-+
-+/*
-+ *  ColdFire bus algorithm callbacks
-+ */
-+static struct i2c_algorithm mcf_algo = {
-+	.master_xfer    = mcf_xfer,
-+	.functionality  = mcf_func,
-+};
-+
-+/***********************************************************/
-+struct coldfire_i2c {
-+	void __iomem *base;
-+	struct resource *irqarea;
-+	struct resource *ioarea;
-+	u32 irq;
-+	struct i2c_adapter *adap;
-+	u32 flags;
-+};
-+
-+/*
-+ *  registering functions to load algorithms at runtime
-+ */
-+int i2c_mcf_add_bus(struct i2c_adapter *adap)
-+{
-+	struct i2c_algo_mcf_data *mcf_adap = adap->algo_data;
-+
-+	/*adap->id |= mcf_algo.id;*/
-+	adap->algo = &mcf_algo;
-+	adap->timeout = 100;
-+
-+	mcf_i2c_init(mcf_adap);
-+
-+#ifdef MODULE
-+	MOD_INC_USE_COUNT;
-+#endif
-+
-+	i2c_add_adapter(adap);
-+
-+	return 0;
-+}
-+
-+static int mcf548x_i2c_probe(struct platform_device *pdev)
-+{
-+	struct coldfire_i2c *i2c;
-+	int rc = 0;
-+
-+	/************************************************************/
-+	i2c = kzalloc(sizeof(*i2c), GFP_KERNEL);
-+	if (!i2c) {
-+		printk(KERN_ERR "%s kzalloc coldfire_i2c faile\n",
-+				__FUNCTION__);
-+		return -ENOMEM;
-+	}
-+	/****************************************************************/
-+	platform_set_drvdata(pdev, i2c);
-+
-+	i2c->adap = &i2c_mcf_board_adapter;
-+	i2c->adap->dev.parent = &pdev->dev;
-+	rc = i2c_mcf_add_bus(i2c->adap);
-+	if (rc < 0) {
-+		printk(KERN_ERR "%s - failed to add adapter\n", __FUNCTION__);
-+		rc = -ENODEV;
-+		goto fail_add;
-+	}
-+
-+	printk(KERN_INFO "i2c-algo-mcf.o: I2C ColdFire algorithm"
-+			" module is loaded.\n");
-+	return rc;
-+
-+fail_add:
-+	kfree(i2c);
-+	return rc;
-+};
-+
-+static int mcf548x_i2c_remove(struct platform_device *pdev)
-+{
-+	struct coldfire_i2c *i2c = platform_get_drvdata(pdev);
-+
-+	i2c_del_adapter(i2c->adap);
-+	platform_set_drvdata(pdev, NULL);
-+	iounmap(i2c->base);
-+	kfree(i2c);
-+	return 0;
-+};
-+
-+/* Structure for a device driver */
-+static struct platform_driver mcf548x_i2c_driver = {
-+	.probe 	= mcf548x_i2c_probe,
-+	.remove = mcf548x_i2c_remove,
-+	.driver	= {
-+		.owner = THIS_MODULE,
-+		.name = "MCF548X-i2c",
-+	},
-+};
-+
-+static int __init coldfire_i2c_init(void)
-+{
-+	return platform_driver_register(&mcf548x_i2c_driver);
-+}
-+
-+static void __exit coldfire_i2c_exit(void)
-+{
-+	platform_driver_unregister(&mcf548x_i2c_driver);
-+}
-+
-+module_init(coldfire_i2c_init);
-+module_exit(coldfire_i2c_exit);
-+
-+MODULE_AUTHOR("Adrian Cox <adrian@humboldt.co.uk>");
-+MODULE_DESCRIPTION
-+    ("I2C-Bus adapter for MCF547x and MCF548x processors");
-+MODULE_LICENSE("GPL");
---- /dev/null
-+++ b/include/asm-m68k/m5485i2c.h
-@@ -0,0 +1,45 @@
-+/*
-+ *	m5485i2c.h -- ColdFire 547x/548x i2c controller support.
-+ */
-+#ifndef M548X_I2C_H
-+#define M548X_I2C_H
-+
-+/* Register read/write macros */
-+#define MCF_I2AR     MCF_REG08(0x008F00)	/* I2C Address 		 */
-+#define MCF_I2FDR    MCF_REG08(0x008F04)	/* I2C Frequency Divider */
-+#define MCF_I2CR     MCF_REG08(0x008F08)	/* I2C Control		 */
-+#define MCF_I2SR     MCF_REG08(0x008F0C)	/* I2C Status		 */
-+#define MCF_I2DR     MCF_REG08(0x008F10)	/* I2C Data I/O		 */
-+#define MCF_I2ICR    MCF_REG08(0x008F20)	/* I2C Interrupt Control */
-+
-+/* Bit definitions and macros for MCF_I2C_I2AR */
-+#define MCF_I2AR_ADR(x)    (((x)&0x7F)<<1)
-+
-+/* Bit definitions and macros for MCF_I2C_I2FDR */
-+#define MCF_I2FDR_IC(x)    (((x)&0x3F)<<0)
-+
-+/* Bit definitions and macros for MCF_I2C_I2CR */
-+#define MCF_I2CR_RSTA      (0x04)
-+#define MCF_I2CR_TXAK      (0x08)
-+#define MCF_I2CR_MTX       (0x10)
-+#define MCF_I2CR_MSTA      (0x20)
-+#define MCF_I2CR_IIEN      (0x40)
-+#define MCF_I2CR_IEN       (0x80)
-+
-+/* Bit definitions and macros for MCF_I2C_I2SR */
-+#define MCF_I2SR_RXAK      (0x01)
-+#define MCF_I2SR_IIF       (0x02)
-+#define MCF_I2SR_SRW       (0x04)
-+#define MCF_I2SR_IAL       (0x10)
-+#define MCF_I2SR_IBB       (0x20)
-+#define MCF_I2SR_IAAS      (0x40)
-+#define MCF_I2SR_ICF       (0x80)
-+
-+/* Bit definitions and macros for MCF_I2C_I2ICR */
-+#define MCF_I2ICR_IE       (0x01)
-+#define MCF_I2ICR_RE       (0x02)
-+#define MCF_I2ICR_TE       (0x04)
-+#define MCF_I2ICR_BNBE     (0x08)
-+
-+/********************************************************************/
-+#endif
diff --git a/target/linux/coldfire/patches/056-m547x_8x_rtc_rv5c387a.patch b/target/linux/coldfire/patches/056-m547x_8x_rtc_rv5c387a.patch
deleted file mode 100644
index 4d5db0ae4..000000000
--- a/target/linux/coldfire/patches/056-m547x_8x_rtc_rv5c387a.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From 1353cd9749377dbcc8290dab5c098deec66fb956 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Thu, 15 May 2008 13:24:58 -0600
-Subject: [PATCH] Add RTC RV5C387A driver for MCF547x and MCF548x.
-
-LTIBName: m547x-8x-rtc-rv5c387a
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
-Signed-off-by: Shrek Wu <b16972@freescale.com>
----
- drivers/rtc/rtc-rs5c372.c |   67 +++++++++++++++++++++++++++++++++++++++++---
- 1 files changed, 62 insertions(+), 5 deletions(-)
-
---- a/drivers/rtc/rtc-rs5c372.c
-+++ b/drivers/rtc/rtc-rs5c372.c
-@@ -15,7 +15,6 @@
- 
- #define DRV_VERSION "0.5"
- 
--
- /*
-  * Ricoh has a family of I2C based RTCs, which differ only slightly from
-  * each other.  Differences center on pinout (e.g. how many interrupts,
-@@ -60,6 +59,15 @@
- /* to read (style 1) or write registers starting at R */
- #define RS5C_ADDR(R)		(((R) << 4) | 0)
- 
-+#ifdef CONFIG_M547X_8X
-+#define DRV_NAME "rv5c387a"
-+/* i2c configuration */
-+#define RV5C387_I2C_ADDR 0x32
-+static unsigned short normal_i2c[] = {
-+	RV5C387_I2C_ADDR, I2C_CLIENT_END
-+};
-+I2C_CLIENT_INSMOD; /* defines addr_data */
-+#endif
- 
- enum rtc_type {
- 	rtc_undef = 0,
-@@ -506,14 +514,14 @@ static int rs5c372_probe(struct i2c_clie
- 		err = -ENODEV;
- 		goto exit;
- 	}
--
--	if (!(rs5c372 = kzalloc(sizeof(struct rs5c372), GFP_KERNEL))) {
-+	rs5c372 = kzalloc(sizeof(struct rs5c372), GFP_KERNEL);
-+	if (!rs5c372) {
- 		err = -ENOMEM;
- 		goto exit;
- 	}
- 
- 	/* we read registers 0x0f then 0x00-0x0f; skip the first one */
--	rs5c372->regs=&rs5c372->buf[1];
-+	rs5c372->regs = &rs5c372->buf[1];
- 
- 	rs5c372->client = client;
- 	i2c_set_clientdata(client, rs5c372);
-@@ -605,7 +613,7 @@ static int rs5c372_probe(struct i2c_clie
- 			case rtc_rv5c386:	s = "rv5c386"; break;
- 			case rtc_rv5c387a:	s = "rv5c387a"; break;
- 			default:		s = "chip"; break;
--			}; s;}),
-+			}; s; }),
- 			rs5c372->time24 ? "24hr" : "am/pm"
- 			);
- 
-@@ -645,12 +653,61 @@ static int rs5c372_remove(struct i2c_cli
- 	return 0;
- }
- 
-+#ifdef CONFIG_M547X_8X
-+static int rv5c387_probe(struct i2c_adapter *adapter, int addr, int kind)
-+{
-+	int rc = 0;
-+	struct i2c_client *new_client = NULL;
-+
-+	if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) {
-+		rc = -ENODEV;
-+		printk(KERN_DEBUG "%s i2c_check_functionality\n", __FUNCTION__);
-+		goto failout;
-+	}
-+
-+	new_client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
-+	if (new_client == NULL) {
-+		rc = -ENOMEM;
-+		printk(KERN_DEBUG "%s kzalloc new_client\n", __FUNCTION__);
-+		goto failout;
-+	}
-+
-+	new_client->addr = addr;
-+	new_client->adapter = adapter;
-+	new_client->driver = &rs5c372_driver;
-+	new_client->flags = 0;
-+	strcpy(new_client->name, DRV_NAME);
-+
-+	rc = i2c_attach_client(new_client);
-+	if (rc < 0) {
-+		printk(KERN_DEBUG "%s i2c_attach_client\n", __FUNCTION__);
-+		goto failout;
-+	}
-+
-+	rs5c372_probe(new_client);
-+	return 0;
-+failout:
-+	kfree(new_client);
-+	return rc;
-+}
-+
-+static int
-+rv5c387_attach_adapter(struct i2c_adapter *adapter)
-+{
-+	return i2c_probe(adapter, &addr_data, rv5c387_probe);
-+}
-+#endif
-+
- static struct i2c_driver rs5c372_driver = {
- 	.driver		= {
- 		.name	= "rtc-rs5c372",
- 	},
-+#ifdef CONFIG_M547X_8X
-+	.attach_adapter = &rv5c387_attach_adapter,
-+#else
- 	.probe		= rs5c372_probe,
- 	.remove		= rs5c372_remove,
-+#endif
- };
- 
- static __init int rs5c372_init(void)
diff --git a/target/linux/coldfire/patches/057-mcfv4e_add_mm_args.patch b/target/linux/coldfire/patches/057-mcfv4e_add_mm_args.patch
deleted file mode 100644
index 483f030d9..000000000
--- a/target/linux/coldfire/patches/057-mcfv4e_add_mm_args.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From a2360b8ebb8b2b0d55f8aea3fdce51bce9b57b10 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Thu, 15 May 2008 15:48:59 -0600
-Subject: [PATCH] Add mm arg to pte/pmd/pud/pgd_free and add pmd_pgtable macro.
-
-Add mm argument to pte/pmd/pud/pgd_free as per commit
-5e5419734c8719cbc01af959ad9c0844002c0df5.
-
-LTIBName: mcfv4e-add-mm-args
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- include/asm-m68k/cf_pgalloc.h |   10 ++++++----
- 1 files changed, 6 insertions(+), 4 deletions(-)
-
---- a/include/asm-m68k/cf_pgalloc.h
-+++ b/include/asm-m68k/cf_pgalloc.h
-@@ -6,7 +6,7 @@
- #include <asm/cf_tlbflush.h>
- #include <asm/cf_cacheflush.h>
- 
--extern inline void pte_free_kernel(pte_t *pte)
-+extern inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
- {
- 	free_page((unsigned long) pte);
- }
-@@ -40,6 +40,8 @@ extern inline pmd_t *pmd_alloc_kernel(pg
- 
- #define pmd_populate_kernel(mm, pmd, pte) (pmd_val(*pmd) = (unsigned long)(pte))
- 
-+#define pmd_pgtable(pmd) pmd_page(pmd)
-+
- static inline void __pte_free_tlb(struct mmu_gather *tlb, struct page *page)
- {
- 	__free_page(page);
-@@ -68,7 +70,7 @@ static inline struct page *pte_alloc_one
- 	return page;
- }
- 
--extern inline void pte_free(struct page *page)
-+extern inline void pte_free(struct mm_struct *mm, struct page *page)
- {
- 	__free_page(page);
- }
-@@ -77,9 +79,9 @@ extern inline void pte_free(struct page 
-  * In our implementation, each pgd entry contains 1 pmd that is never allocated
-  * or freed.  pgd_present is always 1, so this should never be called. -NL
-  */
--#define pmd_free(pmd) BUG()
-+#define pmd_free(mm, pmd) BUG()
- 
--extern inline void pgd_free(pgd_t *pgd)
-+extern inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
- {
- 	free_page((unsigned long) pgd);
- }
diff --git a/target/linux/coldfire/patches/058-mcfv4e_tlsnptl_elf_reloc.patch b/target/linux/coldfire/patches/058-mcfv4e_tlsnptl_elf_reloc.patch
deleted file mode 100644
index 849e3a6ab..000000000
--- a/target/linux/coldfire/patches/058-mcfv4e_tlsnptl_elf_reloc.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From a64bac5fc75aa2872a8abe54a9f9aaa0fce31588 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Thu, 22 May 2008 09:50:31 -0600
-Subject: [PATCH] Add elf relocation types for TLS/NPTL.
-
-These relocations are from the draft TLS/NPTL ABI document v0.2
-by Joseph Myers of CodeSourcery.
-
-LTIBName: mcfv4e-tlsnptl-elf-reloc
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- include/asm-m68k/elf.h |   20 ++++++++++++++++++++
- 1 files changed, 20 insertions(+), 0 deletions(-)
-
---- a/include/asm-m68k/elf.h
-+++ b/include/asm-m68k/elf.h
-@@ -34,6 +34,26 @@
- #define R_68K_GLOB_DAT	20
- #define R_68K_JMP_SLOT	21
- #define R_68K_RELATIVE	22
-+/* TLS static relocations */
-+#define	R_68K_TLS_GD32		25
-+#define	R_68K_TLS_GD16		26
-+#define	R_68K_TLS_GD8		27
-+#define	R_68K_TLS_LDM32		28
-+#define	R_68K_TLS_LDM16		29
-+#define	R_68K_TLS_LDM8		30
-+#define	R_68K_TLS_LDO32		31
-+#define	R_68K_TLS_LDO16		32
-+#define	R_68K_TLS_LDO8		33
-+#define	R_68K_TLS_IE32		34
-+#define	R_68K_TLS_IE16		35
-+#define	R_68K_TLS_IE8		36
-+#define	R_68K_TLS_LE32		37
-+#define	R_68K_TLS_LE16		38
-+#define	R_68K_TLS_LE8		39
-+/* TLS dynamic relocations */
-+#define	R_68K_TLS_DTPMOD32	40
-+#define	R_68K_TLS_DTPREL32	41
-+#define	R_68K_TLS_TPREL32	42
- 
- typedef unsigned long elf_greg_t;
- 
diff --git a/target/linux/coldfire/patches/059-mcfv4e_vdso_headers.patch b/target/linux/coldfire/patches/059-mcfv4e_vdso_headers.patch
deleted file mode 100644
index f430ab362..000000000
--- a/target/linux/coldfire/patches/059-mcfv4e_vdso_headers.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From a05af27aec00eacf533ff111ba8eb3dec328d9af Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Thu, 22 May 2008 11:20:53 -0600
-Subject: [PATCH] Initial vDSO header changes.
-
-LTIBName: mcfv4e-vdso-headers
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- include/asm-m68k/auxvec.h |    9 +++++++++
- include/asm-m68k/elf.h    |   31 +++++++++++++++++++++++++++++++
- include/asm-m68k/page.h   |    5 +++++
- 3 files changed, 45 insertions(+), 0 deletions(-)
-
---- a/include/asm-m68k/auxvec.h
-+++ b/include/asm-m68k/auxvec.h
-@@ -1,4 +1,13 @@
- #ifndef __ASMm68k_AUXVEC_H
- #define __ASMm68k_AUXVEC_H
-+/*
-+ * Architecture-neutral AT_ values in 0-17, leave some room
-+ * for more of them.
-+ */
-+
-+#ifdef CONFIG_VSYSCALL
-+/* Entry point to the vsyscall page */
-+#define	AT_SYSINFO_EHDR		33
-+#endif
- 
- #endif
---- a/include/asm-m68k/elf.h
-+++ b/include/asm-m68k/elf.h
-@@ -136,4 +136,35 @@ typedef struct user_m68kfp_struct elf_fp
- 
- #define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX)
- 
-+/*
-+ * VDSO
-+ */
-+#ifdef CONFIG_VSYSCALL
-+extern unsigned int vdso_enabled;
-+
-+#define	VDSO_BASE		((unsigned long)current->mm->context.vdso)
-+#define	VDSO_SYM(x)		(VDSO_BASE + (unsigned long)(x))
-+
-+#define	VSYSCALL_AUX_ENT					\
-+	if (vdso_enabled)					\
-+		NEW_AUX_ENT(AT_SYSINFO_EHDR, VDSO_BASE);
-+
-+/* additional pages */
-+#define ARCH_HAS_SETUP_ADDITIONAL_PAGES	1
-+
-+struct linux_binprm;
-+extern int arch_setup_additional_pages(struct linux_binprm *bprm,
-+				       int executable_stack);
-+
-+#else
-+/* no VSYSCALL_AUX_ENT */
-+#define	VSYSCALL_AUX_ENT
-+#endif
-+
-+#define ARCH_DLINFO						\
-+do {								\
-+	/* vsyscall entry */					\
-+	VSYSCALL_AUX_ENT;					\
-+} while (0);
-+
- #endif
---- a/include/asm-m68k/page.h
-+++ b/include/asm-m68k/page.h
-@@ -252,4 +252,9 @@ static inline __attribute_const__ int __
- 
- #include <asm-generic/page.h>
- 
-+#ifdef CONFIG_VSYSCALL
-+/* vDSO support */
-+#define __HAVE_ARCH_GATE_AREA
-+#endif
-+
- #endif /* _M68K_PAGE_H */
diff --git a/target/linux/coldfire/patches/060-m547x_8x_move_memmap.patch b/target/linux/coldfire/patches/060-m547x_8x_move_memmap.patch
deleted file mode 100644
index 01d7a6ea9..000000000
--- a/target/linux/coldfire/patches/060-m547x_8x_move_memmap.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-From 961a1f1ccbb2121a4e650cd64ca1f5c15b232e18 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Thu, 29 May 2008 22:03:08 -0600
-Subject: [PATCH] Update M547x/M548x memory map.
-
-- Move internal memory
-  0xF0000000 MBAR
-  0xF1000000 MMUBAR
-  0xF3000000 RAMBAR0
-  0xF3001000 RAMBAR1
-
-- Move KMAP area
-  0xD0000000 -> 0xDFFFFFFF
-
-- Update pagefault code for KMAP area
-
-LTIBName: m547x-8x-move-memmap
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/coldfire/head.S   |    2 +-
- arch/m68k/mm/cf-mmu.c       |   20 ++++++++++----------
- arch/m68k/mm/kmap.c         |   18 +++++++++++++++---
- include/asm-m68k/coldfire.h |    8 ++++----
- include/asm-m68k/pgtable.h  |    4 ++--
- 5 files changed, 32 insertions(+), 20 deletions(-)
-
---- a/arch/m68k/coldfire/head.S
-+++ b/arch/m68k/coldfire/head.S
-@@ -87,7 +87,7 @@
- #else
- #if defined(CONFIG_M54455)
- #elif defined(CONFIG_M547X_8X)
--#define ACR0_DEFAULT	#0xE000C040   /* ACR0 default value */
-+#define ACR0_DEFAULT	#0xF00FC040   /* ACR0 default value */
- #define ACR1_DEFAULT	#0x000FA008   /* ACR1 default value */
- #define ACR2_DEFAULT	#0x00000000   /* ACR2 default value */
- #define ACR3_DEFAULT	#0x000FA008   /* ACR3 default value */
---- a/arch/m68k/mm/cf-mmu.c
-+++ b/arch/m68k/mm/cf-mmu.c
-@@ -35,11 +35,9 @@
- #include <asm/coldfire.h>
- #include <asm/tlbflush.h>
- 
--#if PAGE_OFFSET == CONFIG_SDRAM_BASE
--#define	KERNRAM(x) ((x >= PAGE_OFFSET) && (x < (PAGE_OFFSET + CONFIG_SDRAM_SIZE)))
--#else
--#define	KERNRAM(x) (x >= PAGE_OFFSET)
--#endif
-+#define KMAPAREA(x)	((x >= KMAP_START) && ( x < KMAP_END))
-+
-+#undef DEBUG
- 
- mm_context_t next_mmu_context;
- unsigned long context_map[LAST_CONTEXT / BITS_PER_LONG + 1];
-@@ -162,7 +160,7 @@ int cf_tlb_miss(struct pt_regs *regs, in
- 	mmuar = ( dtlb ) ? regs->mmuar
- 			 : regs->pc + (extension_word * sizeof(long));
- 
--        mm = (!user_mode(regs) && KERNRAM(mmuar)) ? &init_mm : current->mm;
-+        mm = (!user_mode(regs) && KMAPAREA(mmuar)) ? &init_mm : current->mm;
- 
-         if (!mm) {
- 	    local_irq_restore(flags);
-@@ -181,7 +179,7 @@ int cf_tlb_miss(struct pt_regs *regs, in
- 	    return (-1);
- 	}	
-     
--	pte = (KERNRAM(mmuar)) ? pte_offset_kernel(pmd, mmuar)
-+	pte = (KMAPAREA(mmuar)) ? pte_offset_kernel(pmd, mmuar)
- 	                       : pte_offset_map(pmd, mmuar);
-     	if (pte_none(*pte) || !pte_present(*pte)) {
- 	    local_irq_restore(flags);
-@@ -198,7 +196,7 @@ int cf_tlb_miss(struct pt_regs *regs, in
- 	
-         set_pte(pte, pte_mkyoung(*pte));
-         asid = mm->context & 0xff;
--        if (!pte_dirty(*pte) && !KERNRAM(mmuar))
-+        if (!pte_dirty(*pte) && !KMAPAREA(mmuar))
-     	    set_pte(pte, pte_wrprotect(*pte));
- 
-         *MMUTR = (mmuar & PAGE_MASK) | (asid << CF_ASID_MMU_SHIFT)
-@@ -216,8 +214,10 @@ int cf_tlb_miss(struct pt_regs *regs, in
- 
- 	asm("nop");
- 
--	/*printk("cf_tlb_miss: va=%lx, pa=%lx\n", (mmuar & PAGE_MASK), 
--		  (pte_val(*pte)  & PAGE_MASK));*/
-+#ifdef DEBUG
-+	printk("cf_tlb_miss: va=%lx, pa=%lx\n", (mmuar & PAGE_MASK), 
-+		  (pte_val(*pte)  & PAGE_MASK));
-+#endif
- 	local_irq_restore(flags);
-         return (0);
- }
---- a/arch/m68k/mm/kmap.c
-+++ b/arch/m68k/mm/kmap.c
-@@ -135,10 +135,22 @@ void __iomem *__ioremap(unsigned long ph
- 
- #ifdef CONFIG_M54455
- 	if (physaddr >= 0xf0000000) {
--		/* short circuit mappings for xf0000000 */
--#ifdef DEBUG
--		printk(KERN_INFO "ioremap: short circuiting 0x%lx mapping\n", physaddr);
-+		/*
-+	 	 * On the M5445x processors an ACR is setup to map
-+		 * the 0xF0000000 range into kernel memory as
-+		 * non-cacheable.
-+		 */
-+		return (void __iomem *)physaddr;
-+	}
- #endif
-+
-+#ifdef CONFIG_M547X_8X
-+	if (physaddr >= 0xf0000000) {
-+		/*
-+	 	 * On the M547x/M548x processors an ACR is setup to map
-+		 * the 0xF0000000 range into kernel memory as
-+		 * non-cacheable.
-+		 */
- 		return (void __iomem *)physaddr;
- 	}
- #endif
---- a/include/asm-m68k/coldfire.h
-+++ b/include/asm-m68k/coldfire.h
-@@ -6,10 +6,10 @@
- #define MCF_RAMBAR1 	0x40000000
- #define MCF_SRAM	0x80000000
- #elif defined(CONFIG_M547X_8X)
--#define MCF_MBAR	0xE0000000
--#define MCF_MMUBAR	0xE1000000
--#define MCF_RAMBAR0	0xE3000000
--#define MCF_RAMBAR1	0xE3001000
-+#define MCF_MBAR	0xF0000000
-+#define MCF_MMUBAR	0xF1000000
-+#define MCF_RAMBAR0	0xF3000000
-+#define MCF_RAMBAR1	0xF3001000
- #endif
- 
- #define MCF_CLK     	CONFIG_MCFCLK
---- a/include/asm-m68k/pgtable.h
-+++ b/include/asm-m68k/pgtable.h
-@@ -73,8 +73,8 @@
- #define KMAP_START     0x0DC00000
- #define KMAP_END       0x0E000000
- #elif defined(CONFIG_COLDFIRE)
--#define KMAP_START	0xe0000000
--#define KMAP_END	0xf0000000
-+#define KMAP_START	0xd0000000
-+#define KMAP_END	0xe0000000
- #else
- #define	KMAP_START	0xd0000000
- #define	KMAP_END	0xf0000000
diff --git a/target/linux/coldfire/patches/061-m5445x_rename_config.patch b/target/linux/coldfire/patches/061-m5445x_rename_config.patch
deleted file mode 100644
index 8f898e316..000000000
--- a/target/linux/coldfire/patches/061-m5445x_rename_config.patch
+++ /dev/null
@@ -1,791 +0,0 @@
-From 778c1668df4a4c634fae8ef99a05120121cce838 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Wed, 18 Jun 2008 15:17:31 -0600
-Subject: [PATCH] Convert CONFIG_M54455 to CONFIG_M5445X for clarity.
-
-LTIBName: m5445x-rename-config
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/Kconfig                |   50 ++++++++++++++++++++++++++++---------
- arch/m68k/Makefile               |    2 +-
- arch/m68k/coldfire/Makefile      |    2 +-
- arch/m68k/coldfire/config.c      |   33 +++++++++++++++----------
- arch/m68k/coldfire/head.S        |   23 ++++++++++-------
- arch/m68k/coldfire/ints.c        |    6 ++--
- arch/m68k/kernel/dma.c           |    4 +-
- arch/m68k/kernel/setup.c         |    2 +-
- arch/m68k/mm/kmap.c              |    2 +-
- drivers/crypto/Kconfig           |   12 ++++----
- drivers/crypto/mcfcau-aes.c      |    2 +-
- drivers/crypto/mcfcau-des.c      |    2 +-
- drivers/crypto/mcfcau-md5.c      |    2 +-
- drivers/crypto/mcfcau-sha1.c     |    2 +-
- drivers/crypto/mcfcau.c          |    2 +-
- drivers/crypto/mcfcau.h          |    2 +-
- drivers/net/Kconfig              |    2 +-
- drivers/net/fec.c                |   10 ++++----
- drivers/net/fec.h                |    2 +-
- drivers/serial/mcfserial.c       |    8 +++---
- drivers/spi/coldfire_edma.c      |    4 +-
- drivers/spi/spi_coldfire.c       |    2 +-
- drivers/spi/ssi_audio.c          |    2 +-
- include/asm-m68k/cfcache.h       |    2 +-
- include/asm-m68k/coldfire.h      |    4 +-
- include/asm-m68k/coldfire_edma.h |    4 +-
- include/asm-m68k/mcfsim.h        |    2 +-
- include/asm-m68k/mcfuart.h       |    2 +-
- include/asm-m68k/page_offset.h   |    2 +-
- include/asm-m68k/setup.h         |    2 +-
- 30 files changed, 116 insertions(+), 80 deletions(-)
-
---- a/arch/m68k/Kconfig
-+++ b/arch/m68k/Kconfig
-@@ -56,7 +56,7 @@ config ARCH_MAY_HAVE_PC_FDC
- 	default y
- 
- config NO_IOPORT
--	def_bool !(M54455 || M547X_8X)
-+	def_bool !(M5445X || M547X_8X)
- 
- config NO_DMA
- 	def_bool SUN3
-@@ -143,7 +143,7 @@ config CFV4E
- 
- config MCD_DMA
- 	bool "ColdFire MCD DMA support"
--	depends on CFV4E
-+	depends on M547X_8X
- 	default y
- 	help
- 	  This enables support for the ColdFire 547x/548x family
-@@ -177,7 +177,7 @@ config HADES
- config PCI
- 	bool
- 	depends on HADES || M54455
--	default y
-+	default n
- 	help
- 	  Find out whether you have a PCI motherboard. PCI is the name of a
- 	  bus system, i.e. the way the CPU talks to the other stuff inside
-@@ -325,11 +325,34 @@ config M68060
- 	  If you anticipate running this kernel on a computer with a MC68060
- 	  processor, say Y. Otherwise, say N.
- 
--config M54455
--	bool "MCF54455 support"
-+config M5445X
-+	bool "MCF5445x support"
- 	depends on COLDFIRE
- 	help
--          This option will add support for the MCF54455 processor with mmu.
-+          This option will add support for the MCF5445 processor with mmu.
-+
-+config M54451
-+	bool
-+	depends on M5445X
-+	default n
-+
-+config M54455
-+	bool
-+	depends on M5445X
-+	default n
-+
-+choice
-+	prompt "Model"
-+	depends on M5445X
-+	default M54451EVB
-+	config M54451EVB
-+		bool "M54451EVB"
-+		select M54451
-+	config M54455EVB
-+		bool "M54455EVB"
-+		select M54455
-+endchoice
-+
- 
- config M547X_8X
- 	bool "MCF547x/MCF548x support"
-@@ -393,7 +416,8 @@ endchoice
- 
- config MCFCLK
- 	int
--	default 266666666 if M54455
-+	default 266666666 if M54455EVB
-+	default 240000000 if M54451EVB
- 	default 266000000 if M547X
- 	default 200000000 if M548X
- 	help
-@@ -401,7 +425,7 @@ config MCFCLK
- 
- config MCF_USER_HALT
- 	bool "Coldfire User Halt Enable"
--	depends on M54455 || M547X_8X
-+	depends on M5445X || M547X_8X
- 	default n
- 	help
- 	  Enables the HALT instruction in User Mode.
-@@ -420,19 +444,21 @@ config MMU_CFV4E
- config SDRAM_BASE
- 	hex
- 	depends on COLDFIRE
--	default 0x40000000 if M54455
-+	default 0x40000000 if M5445X
- 	default 0x00000000 if M547X_8X
- 
- config SDRAM_SIZE
- 	hex
- 	depends on COLDFIRE
--	default 0x0FFFFFFF if M54455
-+	default 0x08000000 if M54451EVB
-+	default 0x10000000 if M54455EVB
- 	default 0x04000000 if M547X_8X
- 
- config NOR_FLASH_BASE
- 	hex "NOR Flash Base Address"
--	depends on M54455
--	default 0x00000000
-+	depends on COLDFIRE
-+	default 0x00000000 if M54451EVB
-+	default 0x00000000 if M54455EVB
- 
- config M68KFPU_EMU
- 	bool "Math emulation support (EXPERIMENTAL)"
---- a/arch/m68k/Makefile
-+++ b/arch/m68k/Makefile
-@@ -59,7 +59,7 @@ endif
- endif
- endif
- 
--ifdef CONFIG_M54455
-+ifdef CONFIG_M5445X
- KBUILD_CFLAGS += -march=isac -mcpu=54455 -msoft-float -g
- KBUILD_AFLAGS += -march=isac -mcpu=54455 -msoft-float  
- endif
---- a/arch/m68k/coldfire/Makefile
-+++ b/arch/m68k/coldfire/Makefile
-@@ -9,7 +9,7 @@ ifneq ($(strip $(CONFIG_USB) $(CONFIG_US
- endif
- 
- obj-$(CONFIG_PCI)	+= pci.o mcf5445x-pci.o iomap.o
--obj-$(CONFIG_M54455)	+= mcf5445x-devices.o
-+obj-$(CONFIG_M5445X)	+= mcf5445x-devices.o
- obj-$(CONFIG_M547X_8X)	+= m547x_8x-devices.o
- obj-$(CONFIG_M547X_8X)	+= mcf548x-devices.o
- obj-$(CONFIG_MCD_DMA)	+= m547x_8x-dma.o
---- a/arch/m68k/coldfire/config.c
-+++ b/arch/m68k/coldfire/config.c
-@@ -35,14 +35,14 @@
- 
- #include <asm/mcfsim.h>
- 
--#if defined(CONFIG_M54455)
-+#if defined(CONFIG_M5445X)
- #define UBOOT_EXTRA_CLOCKS
- #elif defined(CONFIG_M547X_8X)
- #define UBOOT_PCI
- #endif
- #include <asm/bootinfo.h>
- 
--#ifdef CONFIG_M54455
-+#ifdef CONFIG_M5445X
- #include <asm/mcf5445x_intc.h>
- #include <asm/mcf5445x_sdramc.h>
- #include <asm/mcf5445x_fbcs.h>
-@@ -132,8 +132,9 @@ int __init uboot_commandline(char *boota
- /*
-  * This routine does things not done in the bootloader.
-  */
--#if defined(CONFIG_M54455)
--#define DEFAULT_COMMAND_LINE "root=/dev/mtdblock1 rw rootfstype=jffs2 ip=none mtdparts=physmap-flash.0:5M(kernel)ro,-(jffs2)"
-+#if defined(CONFIG_M5445X)
-+#define FOO_DEFAULT_COMMAND_LINE "root=/dev/mtdblock1 rw rootfstype=jffs2 ip=none mtdparts=physmap-flash.0:5M(kernel)ro,-(jffs2)"
-+#define DEFAULT_COMMAND_LINE "debug root=/dev/nfs rw nfsroot=172.27.155.1:/tftpboot/redstripe/rootfs/ ip=172.27.155.51:172.27.155.1"
- #elif defined(CONFIG_M547X_8X)
- #define DEFAULT_COMMAND_LINE "debug root=/dev/nfs rw nfsroot=172.27.155.1:/tftpboot/rigo/rootfs/ ip=172.27.155.85:172.27.155.1"
- #endif
-@@ -143,14 +144,14 @@ asmlinkage void __init cf_early_init(voi
- 
- 	extern char _end;
- 
--#if defined(CONFIG_M54455)
-+#if defined(CONFIG_M5445X)
- 	SET_VBR((void *)MCF_RAMBAR1);
- #elif defined(CONFIG_M547X_8X)
- 	SET_VBR((void *)MCF_RAMBAR0);
- #endif
- 
- 	/* Mask all interrupts */
--#if defined(CONFIG_M54455)
-+#if defined(CONFIG_M5445X)
- 	MCF_INTC0_IMRL = 0xFFFFFFFF;
- 	MCF_INTC0_IMRH = 0xFFFFFFFF;
- 	MCF_INTC1_IMRL = 0xFFFFFFFF;
-@@ -160,7 +161,7 @@ asmlinkage void __init cf_early_init(voi
- 	MCF_IMRH = 0xFFFFFFFF;
- #endif
- 
--#if defined(CONFIG_M54455)
-+#if defined(CONFIG_M5445X)
- #if defined(CONFIG_NOR_FLASH_BASE)
- 	MCF_FBCS_CSAR(1) = CONFIG_NOR_FLASH_BASE;
- #else
-@@ -171,9 +172,9 @@ asmlinkage void __init cf_early_init(voi
- 	/* Init optional SDRAM chip select */
- 	MCF_SDRAMC_SDCS(1) = (256*1024*1024) | 0x1B;
- #endif
--#endif /* CONFIG_M54455 */
-+#endif /* CONFIG_M5445X */
- 
--#if defined(CONFIG_M54455)
-+#if defined(CONFIG_M5445X)
- 	/* Setup SDRAM crossbar(XBS) priorities */
- 	MCF_XBS_PRS2 = (MCF_XBS_PRS_M0(MCF_XBS_PRI_2) |
- 			MCF_XBS_PRS_M1(MCF_XBS_PRI_3) |
-@@ -193,6 +194,7 @@ asmlinkage void __init cf_early_init(voi
- 	m68k_memory[m68k_num_memory].addr = CONFIG_SDRAM_BASE;
- 	m68k_memory[m68k_num_memory++].size = CONFIG_SDRAM_SIZE;
- 
-+#if 0
- 	if (!uboot_commandline(m68k_command_line)) {
- #if defined(CONFIG_BOOTPARAM)
- 		strncpy(m68k_command_line, CONFIG_BOOTPARAM_STRING, CL_SIZE-1);
-@@ -200,6 +202,10 @@ asmlinkage void __init cf_early_init(voi
- 		strcpy(m68k_command_line, DEFAULT_COMMAND_LINE);
- #endif
- 	}
-+#endif
-+/* JKM -- temporary! */
-+strcpy(m68k_command_line, DEFAULT_COMMAND_LINE);
-+/* JKM -- temporary! */
- 
- #if defined(CONFIG_BLK_DEV_INITRD)
- 	/* add initrd image */
-@@ -223,9 +229,10 @@ asmlinkage void __init cf_early_init(voi
- 
- 	/* Turn on caches via CACR, enable EUSP */
- 	cacr_set(CACHE_INITIAL_MODE);
-+
- }
- 
--#if defined(CONFIG_M54455)
-+#if defined(CONFIG_M5445X)
- void settimericr(unsigned int timer, unsigned int level)
- {
- 	volatile unsigned char *icrp;
-@@ -256,7 +263,7 @@ void __init coldfire_trap_init(void)
- 	int i = 0;
- 	e_vector *vectors;
- 
--#if defined(CONFIG_M54455)
-+#if defined(CONFIG_M5445X)
- 	vectors = (e_vector *)MCF_RAMBAR1;
- #elif defined(CONFIG_M547X_8X)
- 	vectors = (e_vector *)MCF_RAMBAR0;
-@@ -281,7 +288,7 @@ void __init coldfire_trap_init(void)
- 	vectors[32] = system_call;
- }
- 
--#if defined(CONFIG_M54455)
-+#if defined(CONFIG_M5445X)
- 
- void coldfire_tick(void)
- {
-@@ -369,7 +376,7 @@ unsigned long coldfire_gettimeoffset(voi
- 
- void coldfire_reboot(void)
- {
--#if defined(CONFIG_M54455)
-+#if defined(CONFIG_M5445X)
- 	/* disable interrupts and do a software reset */
- 	asm("movew #0x2700, %%sr\n\t"
- 	    "moveb #0x80, %%d0\n\t"
---- a/arch/m68k/coldfire/head.S
-+++ b/arch/m68k/coldfire/head.S
-@@ -63,8 +63,8 @@
-  *     None currently (mapped via TLBs)
-  */
- 
--#if CONFIG_SDRAM_BASE != PAGE_BASE
--#if defined(CONFIG_M54455)
-+#if CONFIG_SDRAM_BASE != PAGE_OFFSET
-+#if defined(CONFIG_M5445X)
- #if 0
- #define ACR0_DEFAULT	#0xA00FA048   /* ACR0 default value */
- #endif
-@@ -85,7 +85,11 @@
- #endif
- 
- #else
--#if defined(CONFIG_M54455)
-+#if defined(CONFIG_M5445X)
-+#define ACR0_DEFAULT	#0xF00FC040   /* ACR0 default value */
-+#define ACR1_DEFAULT	#0x400FA008   /* ACR1 default value */
-+#define ACR2_DEFAULT	#0x00000000   /* ACR2 default value */
-+#define ACR3_DEFAULT	#0x400FA008   /* ACR3 default value */
- #elif defined(CONFIG_M547X_8X)
- #define ACR0_DEFAULT	#0xF00FC040   /* ACR0 default value */
- #define ACR1_DEFAULT	#0x000FA008   /* ACR1 default value */
-@@ -280,7 +284,7 @@ ENTRY(__start)
- 	subl	%a0,%a0
- 	movel	%a0,%usp
- 
--#if defined(CONFIG_M54455)
-+#if defined(CONFIG_M5445X)
- 	movel  #(MCF_RAMBAR1 + 0x221), %d0
- 	movec   %d0, %rambar1
- #elif defined(CONFIG_M547X_8X)
-@@ -331,12 +335,11 @@ _loop_bss:
- 	cmpl	%a0,%a1
- 	bne	_loop_bss
- #endif
--
- 	/* If you change the memory size to another value make a matching 
- 	   change in paging_init(cf-mmu.c) to zones_size[]. */
- 
- #if CONFIG_SDRAM_BASE != PAGE_OFFSET
--#if defined(CONFIG_M54455)
-+#if defined(CONFIG_M5445X)
- 	/* Map 256MB as code */
- 	mmu_map	(PAGE_OFFSET+0*0x1000000),  (PHYS_OFFSET+0*0x1000000), \
- 		MMUOR_ITLB, 0, MMUTR_SG, MMUDR_SZ16M, MMUDR_IC,  MMUDR_SP, \
-@@ -502,7 +505,7 @@ _loop_bss:
- 	 * enabled and we are executing in high memory.
- 	 */
- 
--#if defined(CONFIG_M54455)
-+#if defined(CONFIG_M5445X)
- 	/* Map first 16 MB as code */
- 	mmu_map	(PHYS_OFFSET+0*0x1000000), (PHYS_OFFSET+0*0x1000000), \
- 		MMUOR_ITLB, 0, MMUTR_SG, MMUDR_SZ16M, MMUDR_INC,  MMUDR_SP, 0, \
-@@ -562,7 +565,7 @@ ENTRY(__running_high)
- 
- 	/* Unmap unity mappings */
- #if CONFIG_SDRAM_BASE != PAGE_OFFSET
--#if defined(CONFIG_M54455)
-+#if defined(CONFIG_M5445X)
- 	mmu_unmap (PHYS_OFFSET+0*0x1000000), MMUOR_ITLB, %d0
- 	mmu_unmap (PHYS_OFFSET+0*0x1000000), 0, %d0
- #elif defined(CONFIG_M547X_8X)
-@@ -599,9 +602,9 @@ func_start	set_context,%d0,(1*4)
- 	movec	%d0,%asid
- func_return	set_context
- 
--#ifdef CONFIG_M54455
-+#ifdef CONFIG_M5445X
- /*
-- * set_fpga(addr,val) on the M54455EVB
-+ * set_fpga(addr,val) on the M5445X
-  *
-  * Map in 0x00000000 -> 0x0fffffff and then do the write.
-  */
---- a/arch/m68k/coldfire/ints.c
-+++ b/arch/m68k/coldfire/ints.c
-@@ -47,7 +47,7 @@ static int irq_depth[SYS_IRQS];
- /*
-  * IRQ Controller
-  */
--#if defined(CONFIG_M54455)
-+#if defined(CONFIG_M5445X)
- void m5445x_irq_enable(unsigned int irq);
- void m5445x_irq_disable(unsigned int irq);
- static struct irq_controller m5445x_irq_controller = {
-@@ -87,7 +87,7 @@ void __init init_IRQ(void)
- {
- 	int i;
- 
--#if defined(CONFIG_M54455)
-+#if defined(CONFIG_M5445X)
- 	for (i = 0; i < SYS_IRQS; i++)
- 		irq_controller[i] = &m5445x_irq_controller;
- #elif defined(CONFIG_M547X_8X)
-@@ -337,7 +337,7 @@ asmlinkage void handle_badint(struct pt_
- }
- EXPORT_SYMBOL(handle_badint);
- 
--#ifdef CONFIG_M54455
-+#ifdef CONFIG_M5445X
- /*
-  * M5445X Implementation
-  */
---- a/arch/m68k/kernel/dma.c
-+++ b/arch/m68k/kernel/dma.c
-@@ -17,7 +17,7 @@
- void *dma_alloc_coherent(struct device *dev, size_t size,
- 			 dma_addr_t *handle, gfp_t flag)
- {
--#ifndef CONFIG_M54455
-+#ifndef CONFIG_M5445X
- 	struct page *page, **map;
- 	pgprot_t pgprot;
- 	void *addr;
-@@ -75,7 +75,7 @@ void dma_free_coherent(struct device *de
- 		       void *addr, dma_addr_t handle)
- {
- 	pr_debug("dma_free_coherent: %p, %x\n", addr, handle);
--#ifndef CONFIG_M54455
-+#ifndef CONFIG_M5445X
- 	vfree(addr);
- #else
- 	kfree(addr);
---- a/arch/m68k/kernel/setup.c
-+++ b/arch/m68k/kernel/setup.c
-@@ -519,7 +519,7 @@ int get_hardware_list(char *buffer)
- 
- void check_bugs(void)
- {
--#if !defined(CONFIG_M68KFPU_EMU) && !defined(CONFIG_M54455)
-+#if !defined(CONFIG_M68KFPU_EMU) && !defined(CONFIG_M5445X)
- 	if (m68k_fputype == 0) {
- 		printk(KERN_EMERG "*** YOU DO NOT HAVE A FLOATING POINT UNIT, "
- 			"WHICH IS REQUIRED BY LINUX/M68K ***\n");
---- a/arch/m68k/mm/kmap.c
-+++ b/arch/m68k/mm/kmap.c
-@@ -133,7 +133,7 @@ void __iomem *__ioremap(unsigned long ph
- 	}
- #endif
- 
--#ifdef CONFIG_M54455
-+#ifdef CONFIG_M5445X
- 	if (physaddr >= 0xf0000000) {
- 		/*
- 	 	 * On the M5445x processors an ACR is setup to map
---- a/drivers/crypto/Kconfig
-+++ b/drivers/crypto/Kconfig
-@@ -62,15 +62,15 @@ config CRYPTO_DEV_GEODE
- 
- config CRYPTO_DEV_MCFCAU
- 	bool "Support for Freescale Coldfire Cryptographic Acceleration Unit (CAU)"
--	depends on M54455
-+	depends on M5445X
- 	select CRYPTO_ALGAPI
- 	help
- 	  The cryptographic acceleration unit (CAU) is a ColdFire coprocessor
- 	  implementing a set of specialized operations in hardware. For example, you can
--	  find it on MCF54455.
-+	  find it on MCF5445X.
- 
- config CRYPTO_DEV_MCFCAU_DES
--	tristate "DES and Triple DES cipher algorithms (MCF54455)"
-+	tristate "DES and Triple DES cipher algorithms (MCF5445X)"
- 	depends on CRYPTO_DEV_MCFCAU
- 	select CRYPTO_ALGAPI
- 	select CRYPTO_BLKCIPHER
-@@ -84,7 +84,7 @@ config CRYPTO_DEV_MCFCAU_DES
- 	  will be called mcfcau-des.
- 
- config CRYPTO_DEV_MCFCAU_AES
--	tristate "AES cipher algorithm (MCF54455)"
-+	tristate "AES cipher algorithm (MCF5445X)"
- 	depends on CRYPTO_DEV_MCFCAU
- 	select CRYPTO_ALGAPI
- 	select CRYPTO_BLKCIPHER
-@@ -98,7 +98,7 @@ config CRYPTO_DEV_MCFCAU_AES
- 	  will be called mcfcau-aes.
- 
- config CRYPTO_DEV_MCFCAU_MD5
--	tristate "MD5 digest algorithm (MCF54455)"
-+	tristate "MD5 digest algorithm (MCF5445X)"
- 	depends on CRYPTO_DEV_MCFCAU
- 	select CRYPTO_ALGAPI
- 	help
-@@ -111,7 +111,7 @@ config CRYPTO_DEV_MCFCAU_MD5
- 	  will be called mcfcau-md5.
- 
- config CRYPTO_DEV_MCFCAU_SHA1
--	tristate "SHA1 digest algorithm (MCF54455)"
-+	tristate "SHA1 digest algorithm (MCF5445X)"
- 	depends on CRYPTO_DEV_MCFCAU
- 	select CRYPTO_ALGAPI
- 	help
---- a/drivers/crypto/mcfcau-aes.c
-+++ b/drivers/crypto/mcfcau-aes.c
-@@ -5,7 +5,7 @@
-  * Author: Andrey Butok
-  * Copyright Freescale Semiconductor Inc.  2007
-  *
-- * NOTE: You can find the ColdFire CAU module on MCF54455 and MCF52235.
-+ * NOTE: You can find the ColdFire CAU module on MCF5445X and MCF52235.
-  *
-  * 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
---- a/drivers/crypto/mcfcau-des.c
-+++ b/drivers/crypto/mcfcau-des.c
-@@ -5,7 +5,7 @@
-  * Author: Andrey Butok
-  * Copyright Freescale Semiconductor Inc.  2007
-  *
-- * NOTE: You can find the ColdFire CAU module on MCF54455 and MCF52235.
-+ * NOTE: You can find the ColdFire CAU module on MCF5445X and MCF52235.
-  *
-  * 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
---- a/drivers/crypto/mcfcau-md5.c
-+++ b/drivers/crypto/mcfcau-md5.c
-@@ -5,7 +5,7 @@
-  * Author: Andrey Butok
-  * Copyright Freescale Semiconductor Inc.  2007
-  *
-- * NOTE: You can find the ColdFire CAU module on MCF54455 and MCF52235.
-+ * NOTE: You can find the ColdFire CAU module on MCF5445X and MCF52235.
-  *
-  * 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
---- a/drivers/crypto/mcfcau-sha1.c
-+++ b/drivers/crypto/mcfcau-sha1.c
-@@ -5,7 +5,7 @@
-  * Author: Andrey Butok
-  * Copyright Freescale Semiconductor Inc.  2007
-  *
-- * NOTE: You can find the ColdFire CAU module on MCF54455 and MCF52235.
-+ * NOTE: You can find the ColdFire CAU module on MCF5445X and MCF52235.
-  *
-  * 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
---- a/drivers/crypto/mcfcau.c
-+++ b/drivers/crypto/mcfcau.c
-@@ -5,7 +5,7 @@
-  * Author: Andrey Butok
-  * Copyright Freescale Semiconductor Inc.  2007
-  *
-- * NOTE: You can find the ColdFire CAU module on MCF54455 and MCF52235.
-+ * NOTE: You can find the ColdFire CAU module on MCF5445X and MCF52235.
-  *
-  * 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
---- a/drivers/crypto/mcfcau.h
-+++ b/drivers/crypto/mcfcau.h
-@@ -5,7 +5,7 @@
-  * Author: Andrey Butok
-  * Copyright Freescale Semiconductor Inc.  2007
-  *
-- * NOTE: You can find the ColdFire CAU module on MCF54455 and MCF52235.
-+ * NOTE: You can find the ColdFire CAU module on MCF5445X and MCF52235.
-  *
-  * 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
---- a/drivers/net/Kconfig
-+++ b/drivers/net/Kconfig
-@@ -1975,7 +1975,7 @@ config 68360_ENET
- 
- config FEC
- 	bool "FEC ethernet controller (of ColdFire CPUs)"
--	depends on M523x || M527x || M5272 || M528x || M520x || M54455
-+	depends on M523x || M527x || M5272 || M528x || M520x || M5445X
- 	help
- 	  Say Y here if you want to use the built-in 10/100 Fast ethernet
- 	  controller on some Motorola ColdFire processors.
---- a/drivers/net/fec.c
-+++ b/drivers/net/fec.c
-@@ -52,7 +52,7 @@
- #if defined(CONFIG_M523x) || defined(CONFIG_M527x) || \
-     defined(CONFIG_M5272) || defined(CONFIG_M528x) || \
-     defined(CONFIG_M520x) || defined(CONFIG_M532x) || \
--    defined(CONFIG_M54455)
-+    defined(CONFIG_M5445X)
- 
- #include <asm/coldfire.h>
- #include <asm/mcfsim.h>
-@@ -84,7 +84,7 @@ static unsigned int fec_hw[] = {
- 	(MCF_MBAR+0x30000),
- #elif defined(CONFIG_M532x)
- 	(MCF_MBAR+0xfc030000),
--#elif defined(CONFIG_M54455)
-+#elif defined(CONFIG_M5445X)
- 	(MCF_MBAR+0xfc030000),
- #if defined(CONFIG_FEC2)
- 	(MCF_MBAR+0xfc034000),
-@@ -179,7 +179,7 @@ typedef struct {
-  * account when setting it.
-  */
- #if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \
--    defined(CONFIG_M520x) || defined(CONFIG_M532x) || defined(CONFIG_M54455)
-+    defined(CONFIG_M520x) || defined(CONFIG_M532x) || defined(CONFIG_M5445X)
- #define	OPT_FRAME_SIZE	(PKT_MAXBUF_SIZE << 16)
- #else
- #define	OPT_FRAME_SIZE	0
-@@ -1831,9 +1831,9 @@ static void __inline__ fec_uncache(unsig
- 
- /* ------------------------------------------------------------------------- */
- 
--#elif defined(CONFIG_M54455)
-+#elif defined(CONFIG_M5445X)
- /*
-- * Code specific for M54455
-+ * Code specific for M5445X
-  */
- 
- static void __inline__ fec_request_intrs(struct net_device *dev)
---- a/drivers/net/fec.h
-+++ b/drivers/net/fec.h
-@@ -14,7 +14,7 @@
- /****************************************************************************/
- 
- #if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \
--    defined(CONFIG_M520x) || defined(CONFIG_M532x) || defined(CONFIG_M54455)
-+    defined(CONFIG_M520x) || defined(CONFIG_M532x) || defined(CONFIG_M5445X)
- /*
-  *	Just figures, Motorola would have to change the offsets for
-  *	registers in the same peripheral device on different models
---- a/drivers/serial/mcfserial.c
-+++ b/drivers/serial/mcfserial.c
-@@ -69,7 +69,7 @@ struct timer_list mcfrs_timer_struct;
- #define	DEFAULT_CBAUD		B38400
- #elif defined(CONFIG_MOD5272) || defined(CONFIG_M5208EVB) || \
-       defined(CONFIG_M5329EVB) || defined(CONFIG_GILBARCO) || \
--      defined(CONFIG_M54455) || defined(CONFIG_M547X_8X)
-+      defined(CONFIG_M5445X) || defined(CONFIG_M547X_8X)
- #define CONSOLE_BAUD_RATE 	115200
- #define DEFAULT_CBAUD		B115200
- #elif defined(CONFIG_ARNEWSH) || defined(CONFIG_FREESCALE) || \
-@@ -102,7 +102,7 @@ static struct tty_driver *mcfrs_serial_d
- #undef SERIAL_DEBUG_FLOW
- 
- #if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \
--    defined(CONFIG_M520x) || defined(CONFIG_M532x) || defined(CONFIG_M54455) || \
-+    defined(CONFIG_M520x) || defined(CONFIG_M532x) || defined(CONFIG_M5445X) || \
-     defined(CONFIG_M547X_8X)
- #define	IRQBASE	(MCFINT_VECBASE+MCFINT_UART0)
- #else
-@@ -1630,7 +1630,7 @@ static void mcfrs_irqinit(struct mcf_ser
- 		/* GPIOs also must be initalized, depends on board */
- 		break;
- 	}
--#elif defined(CONFIG_M54455)
-+#elif defined(CONFIG_M5445X)
- 	volatile unsigned char *uartp;
- 	uartp = info->addr;
- 	switch (info->line) {
-@@ -2022,7 +2022,7 @@ struct console mcfrs_console = {
- 
- static int __init mcfrs_console_init(void)
- {
--#if !(defined(CONFIG_M54455) || defined(CONFIG_M547X_8X))
-+#if !(defined(CONFIG_M5445X) || defined(CONFIG_M547X_8X))
- 	register_console(&mcfrs_console);
- #endif
- 	return 0;
---- a/drivers/spi/coldfire_edma.c
-+++ b/drivers/spi/coldfire_edma.c
-@@ -20,10 +20,10 @@
- #include <linux/cdev.h>
- #include <linux/seq_file.h>
- #include <linux/proc_fs.h>
--#ifdef CONFIG_M54455
-+#ifdef CONFIG_M5445X
- #include <asm/mcf5445x_edma.h>
- #include <asm/mcf5445x_intc.h>
--#endif /* CONFIG_M54455 */
-+#endif /* CONFIG_M5445X */
- #include <asm/coldfire_edma.h>
- 
- /*
---- a/drivers/spi/spi_coldfire.c
-+++ b/drivers/spi/spi_coldfire.c
-@@ -57,7 +57,7 @@
- #include <asm/mcfqspi.h>
- #include <asm/coldfire.h>
- 
--#if defined(CONFIG_M54455)
-+#if defined(CONFIG_M5445X)
- 	#include <asm/virtconvert.h>
- 
- 	#define SPI_DSPI
---- a/drivers/spi/ssi_audio.c
-+++ b/drivers/spi/ssi_audio.c
-@@ -25,7 +25,7 @@
- 
- #include <asm/coldfire.h>
- #include <asm/coldfire_edma.h>
--#ifdef CONFIG_M54455
-+#ifdef CONFIG_M5445X
- #include <asm/mcf5445x_ssi.h>
- #include <asm/mcf5445x_ccm.h>
- #include <asm/mcf5445x_gpio.h>
---- a/include/asm-m68k/cfcache.h
-+++ b/include/asm-m68k/cfcache.h
-@@ -40,7 +40,7 @@
- #define CF_CACR_IDSP	    (0x00000080) /* Ins default supervisor-protect   */
- #define CF_CACR_EUSP        (0x00000020) /* Switch stacks in user mode       */
- 
--#ifdef CONFIG_M54455
-+#ifdef CONFIG_M5445X
- /*
-  * M5445x Cache Configuration
-  *	- cache line size is 16 bytes
---- a/include/asm-m68k/coldfire.h
-+++ b/include/asm-m68k/coldfire.h
-@@ -1,9 +1,9 @@
- #ifndef _COLDFIRE_H_
- #define _COLDFIRE_H_
- 
--#if defined(CONFIG_M54455)
-+#if defined(CONFIG_M5445X)
- #define MCF_MBAR	0x0
--#define MCF_RAMBAR1 	0x40000000
-+#define MCF_RAMBAR1 	0x80000000
- #define MCF_SRAM	0x80000000
- #elif defined(CONFIG_M547X_8X)
- #define MCF_MBAR	0xF0000000
---- a/include/asm-m68k/coldfire_edma.h
-+++ b/include/asm-m68k/coldfire_edma.h
-@@ -20,14 +20,14 @@
- #define EDMA_DRIVER_NAME "ColdFire-eDMA"
- #define DMA_DEV_MINOR 1
- 
--#ifdef CONFIG_M54455
-+#ifdef CONFIG_M5445X
- #define EDMA_INT_CHANNEL_BASE 		8
- #define EDMA_INT_CONTROLLER_BASE 	64
- #define EDMA_INT_BASE			(EDMA_INT_CHANNEL_BASE + \
- 					 EDMA_INT_CONTROLLER_BASE)
- #define EDMA_CHANNELS			16
- #define EDMA_INT_ERR			16	/* edma error interrupt */
--#endif /* CONFIG_M54455 */
-+#endif /* CONFIG_M5445X */
-  
- typedef irqreturn_t (*edma_irq_handler)(int, void *);
- typedef void (*edma_error_handler)(int, void *);
---- a/include/asm-m68k/mcfsim.h
-+++ b/include/asm-m68k/mcfsim.h
-@@ -12,7 +12,7 @@
- #include <asm/coldfire.h>
- #endif
- 
--#if defined(CONFIG_M54455)
-+#if defined(CONFIG_M5445X)
- #include <asm/mcf5445x_intc.h>
- #include <asm/mcf5445x_gpio.h>
- #include <asm/mcf5445x_i2c.h>
---- a/include/asm-m68k/mcfuart.h
-+++ b/include/asm-m68k/mcfuart.h
-@@ -15,7 +15,7 @@
-  *	Define the base address of the UARTS within the MBAR address
-  *	space.
-  */
--#if defined(CONFIG_M54455)
-+#if defined(CONFIG_M5445X)
- #include <asm/mcf5445x_intc.h>
- #define MCFUART_BASE1		0xfc060000	/* Base address of UART1 */
- #define MCFUART_BASE2		0xfc064000	/* Base address of UART2 */
---- a/include/asm-m68k/page_offset.h
-+++ b/include/asm-m68k/page_offset.h
-@@ -4,7 +4,7 @@
- #if defined(CONFIG_SUN3)
- #define PAGE_OFFSET_RAW		0x0E000000
- 
--#elif defined(CONFIG_M54455) || defined(CONFIG_M547X_8X)
-+#elif defined(CONFIG_M5445X) || defined(CONFIG_M547X_8X)
- #define	PHYS_OFFSET		CONFIG_SDRAM_BASE
- #define PAGE_OFFSET_RAW		(PHYS_OFFSET)
- /* #define PAGE_OFFSET_RAW		0xC0000000 */
---- a/include/asm-m68k/setup.h
-+++ b/include/asm-m68k/setup.h
-@@ -240,7 +240,7 @@ extern unsigned long m68k_machtype;
- #define FPU_68040      (1<<FPUB_68040)
- #define FPU_68060      (1<<FPUB_68060)
- #define FPU_SUNFPA     (1<<FPUB_SUNFPA)
--#ifndef CONFIG_M54455
-+#ifndef CONFIG_M5445X
- #define FPU_CFV4E      (1<<FPUB_CFV4E)
- #else
- #define FPU_CFV4E      0
diff --git a/target/linux/coldfire/patches/062-mcfv4e_cache_split.patch b/target/linux/coldfire/patches/062-mcfv4e_cache_split.patch
deleted file mode 100644
index a98c334b6..000000000
--- a/target/linux/coldfire/patches/062-mcfv4e_cache_split.patch
+++ /dev/null
@@ -1,979 +0,0 @@
-From 940b4fea5ebfde3abe03c6469a57c01ee961497a Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Wed, 18 Jun 2008 15:20:21 -0600
-Subject: [PATCH] Split 547x/548x and 5445x cache routines into separate files.
-
-LTIBName: mcfv4e-cache-split
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- include/asm-m68k/cf_5445x_cacheflush.h |  447 ++++++++++++++++++++++++++++++++
- include/asm-m68k/cf_548x_cacheflush.h  |  259 ++++++++++++++++++
- include/asm-m68k/cf_cacheflush.h       |  244 +-----------------
- 3 files changed, 711 insertions(+), 239 deletions(-)
- create mode 100644 include/asm-m68k/cf_5445x_cacheflush.h
- create mode 100644 include/asm-m68k/cf_548x_cacheflush.h
-
---- /dev/null
-+++ b/include/asm-m68k/cf_5445x_cacheflush.h
-@@ -0,0 +1,447 @@
-+/*
-+ * include/asm-m68k/cf_5445x_cacheflush.h - Coldfire 5445x Cache
-+ *
-+ * Based on include/asm-m68k/cacheflush.h
-+ *
-+ * Coldfire pieces by:
-+ *   Kurt Mahan kmahan@freescale.com
-+ *
-+ * Copyright Freescale Semiconductor, Inc. 2007, 2008
-+ *
-+ * 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.
-+ */
-+#ifndef M68K_CF_5445x_CACHEFLUSH_H
-+#define M68K_CF_5445x_CACHEFLUSH_H
-+
-+#include <asm/cfcache.h>
-+
-+/*
-+ * Coldfire Cache Model
-+ *
-+ * The Coldfire processors use a Harvard architecture cache configured
-+ * as four-way set associative.  The cache does not implement bus snooping
-+ * so cache coherency with other masters must be maintained in software.
-+ *
-+ * The cache is managed via the CPUSHL instruction in conjunction with
-+ * bits set in the CACR (cache control register).  Currently the code
-+ * uses the CPUSHL enhancement which adds the ability to
-+ * invalidate/clear/push a cacheline by physical address.  This feature
-+ * is designated in the Hardware Configuration Register [D1-CPES].
-+ *
-+ * CACR Bits:
-+ *	DPI[28]		cpushl invalidate disable for d-cache
-+ *	IDPI[12]	cpushl invalidate disable for i-cache
-+ *	SPA[14]		cpushl search by physical address
-+ *	IVO[20]		cpushl invalidate only
-+ *
-+ * Random Terminology:
-+ *  * invalidate = reset the cache line's valid bit
-+ *  * push = generate a line-sized store of the data if its contents are marked
-+ *	     as modifed (the modified flag is cleared after the store)
-+ *  * clear = push + invalidate
-+ */
-+
-+/**
-+ * flush_icache - Flush all of the instruction cache
-+ */
-+static inline void flush_icache(void)
-+{
-+	asm volatile("nop\n"
-+		     "moveq%.l	#0,%%d0\n"
-+		     "moveq%.l	#0,%%d1\n"
-+		     "move%.l	%%d0,%%a0\n"
-+		     "1:\n"
-+		     "cpushl	%%ic,(%%a0)\n"
-+		     "add%.l	#0x0010,%%a0\n"
-+		     "addq%.l	#1,%%d1\n"
-+		     "cmpi%.l	%0,%%d1\n"
-+		     "bne	1b\n"
-+		     "moveq%.l	#0,%%d1\n"
-+		     "addq%.l	#1,%%d0\n"
-+		     "move%.l	%%d0,%%a0\n"
-+		     "cmpi%.l	#4,%%d0\n"
-+		     "bne	1b\n"
-+		     : : "i" (CACHE_SETS)
-+		     : "a0", "d0", "d1");
-+}
-+
-+/**
-+ * flush_dcache - Flush all of the data cache
-+ */
-+static inline void flush_dcache(void)
-+{
-+	asm volatile("nop\n"
-+		     "moveq%.l	#0,%%d0\n"
-+		     "moveq%.l	#0,%%d1\n"
-+		     "move%.l	%%d0,%%a0\n"
-+		     "1:\n"
-+		     "cpushl	%%dc,(%%a0)\n"
-+		     "add%.l	#0x0010,%%a0\n"
-+		     "addq%.l	#1,%%d1\n"
-+		     "cmpi%.l	%0,%%d1\n"
-+		     "bne	1b\n"
-+		     "moveq%.l	#0,%%d1\n"
-+		     "addq%.l	#1,%%d0\n"
-+		     "move%.l	%%d0,%%a0\n"
-+		     "cmpi%.l	#4,%%d0\n"
-+		     "bne	1b\n"
-+		     : : "i" (CACHE_SETS)
-+		     : "a0", "d0", "d1");
-+}
-+
-+/**
-+ * flush_bcache - Flush all of both caches
-+ */
-+static inline void flush_bcache(void)
-+{
-+	asm volatile("nop\n"
-+		     "moveq%.l	#0,%%d0\n"
-+		     "moveq%.l	#0,%%d1\n"
-+		     "move%.l	%%d0,%%a0\n"
-+		     "1:\n"
-+		     "cpushl	%%bc,(%%a0)\n"
-+		     "add%.l	#0x0010,%%a0\n"
-+		     "addq%.l	#1,%%d1\n"
-+		     "cmpi%.l	%0,%%d1\n"
-+		     "bne	1b\n"
-+		     "moveq%.l	#0,%%d1\n"
-+		     "addq%.l	#1,%%d0\n"
-+		     "move%.l	%%d0,%%a0\n"
-+		     "cmpi%.l	#4,%%d0\n"
-+		     "bne	1b\n"
-+		     : : "i" (CACHE_SETS)
-+		     : "a0", "d0", "d1");
-+}
-+
-+/**
-+ * cf_cache_clear - invalidate cache
-+ * @paddr: starting physical address
-+ * @len: number of bytes
-+ *
-+ * Invalidate cache lines starting at paddr for len bytes.
-+ * Those lines are not pushed.
-+ */
-+static inline void cf_cache_clear(unsigned long paddr, int len)
-+{
-+	/* number of lines */
-+	len = (len + (CACHE_LINE_SIZE-1)) / CACHE_LINE_SIZE;
-+	if (len == 0)
-+		return;
-+
-+	/* align on set boundary */
-+	paddr &= 0xfffffff0;
-+
-+	asm volatile("nop\n"
-+		     "move%.l   %2,%%d0\n"
-+		     "or%.l	%3,%%d0\n"
-+		     "movec	%%d0,%%cacr\n"
-+		     "move%.l	%0,%%a0\n"
-+		     "move%.l	%1,%%d0\n"
-+		     "1:\n"
-+		     "cpushl	%%bc,(%%a0)\n"
-+		     "lea	0x10(%%a0),%%a0\n"
-+		     "subq%.l	#1,%%d0\n"
-+		     "bne%.b	1b\n"
-+		     "movec	%2,%%cacr\n"
-+		     : : "a" (paddr), "r" (len),
-+			 "r" (shadow_cacr),
-+			 "i" (CF_CACR_SPA+CF_CACR_IVO)
-+		     : "a0", "d0");
-+}
-+
-+/**
-+ * cf_cache_push - Push dirty cache out with no invalidate
-+ * @paddr: starting physical address
-+ * @len: number of bytes
-+ *
-+ * Push the any dirty lines starting at paddr for len bytes.
-+ * Those lines are not invalidated.
-+ */
-+static inline void cf_cache_push(unsigned long paddr, int len)
-+{
-+	/* number of lines */
-+	len = (len + (CACHE_LINE_SIZE-1)) / CACHE_LINE_SIZE;
-+	if (len == 0)
-+		return;
-+
-+	/* align on set boundary */
-+	paddr &= 0xfffffff0;
-+
-+	asm volatile("nop\n"
-+		     "move%.l   %2,%%d0\n"
-+		     "or%.l	%3,%%d0\n"
-+		     "movec	%%d0,%%cacr\n"
-+		     "move%.l	%0,%%a0\n"
-+		     "move%.l	%1,%%d0\n"
-+		     "1:\n"
-+		     "cpushl	%%bc,(%%a0)\n"
-+		     "lea	0x10(%%a0),%%a0\n"
-+		     "subq%.l	#1,%%d0\n"
-+		     "bne.b	1b\n"
-+		     "movec	%2,%%cacr\n"
-+		     : : "a" (paddr), "r" (len),
-+			 "r" (shadow_cacr),
-+			 "i" (CF_CACR_SPA+CF_CACR_DPI+CF_CACR_IDPI)
-+		     : "a0", "d0");
-+}
-+
-+/**
-+ * cf_cache_flush - Push dirty cache out and invalidate
-+ * @paddr: starting physical address
-+ * @len: number of bytes
-+ *
-+ * Push the any dirty lines starting at paddr for len bytes and
-+ * invalidate those lines.
-+ */
-+static inline void cf_cache_flush(unsigned long paddr, int len)
-+{
-+	/* number of lines */
-+	len = (len + (CACHE_LINE_SIZE-1)) / CACHE_LINE_SIZE;
-+	if (len == 0)
-+		return;
-+
-+	/* align on set boundary */
-+	paddr &= 0xfffffff0;
-+
-+	asm volatile("nop\n"
-+		     "move%.l   %2,%%d0\n"
-+		     "or%.l	%3,%%d0\n"
-+		     "movec	%%d0,%%cacr\n"
-+		     "move%.l	%0,%%a0\n"
-+		     "move%.l	%1,%%d0\n"
-+		     "1:\n"
-+		     "cpushl	%%bc,(%%a0)\n"
-+		     "lea	0x10(%%a0),%%a0\n"
-+		     "subq%.l	#1,%%d0\n"
-+		     "bne.b	1b\n"
-+		     "movec	%2,%%cacr\n"
-+		     : : "a" (paddr), "r" (len),
-+			 "r" (shadow_cacr),
-+			 "i" (CF_CACR_SPA)
-+		     : "a0", "d0");
-+}
-+
-+/**
-+ * cf_cache_flush_range - Push dirty data/inst cache in range out and invalidate
-+ * @vstart - starting virtual address
-+ * @vend: ending virtual address
-+ *
-+ * Push the any dirty data/instr lines starting at paddr for len bytes and
-+ * invalidate those lines.
-+ */
-+static inline void cf_cache_flush_range(unsigned long vstart, unsigned long vend)
-+{
-+	int len;
-+
-+	/* align on set boundary */
-+	vstart &= 0xfffffff0;
-+	vend = PAGE_ALIGN((vend + (CACHE_LINE_SIZE-1))) & 0xfffffff0;
-+	len = vend - vstart;
-+	if (len == 0)
-+		return;
-+	vstart = __pa(vstart);
-+	vend = vstart + len;
-+
-+	asm volatile("nop\n"
-+		     "move%.l   %2,%%d0\n"
-+		     "or%.l	%3,%%d0\n"
-+		     "movec	%%d0,%%cacr\n"
-+		     "move%.l	%0,%%a0\n"
-+		     "move%.l	%1,%%a1\n"
-+		     "1:\n"
-+		     "cpushl	%%bc,(%%a0)\n"
-+		     "lea	0x10(%%a0),%%a0\n"
-+		     "cmpa%.l	%%a0,%%a1\n"
-+		     "bne.b	1b\n"
-+		     "movec	%2,%%cacr\n"
-+		     : /* no return */
-+		     : "a" (vstart), "a" (vend),
-+		       "r" (shadow_cacr),
-+		       "i" (CF_CACR_SPA)
-+		     : "a0", "a1", "d0");
-+}
-+
-+/**
-+ * cf_dcache_flush_range - Push dirty data cache in range out and invalidate
-+ * @vstart - starting virtual address
-+ * @vend: ending virtual address
-+ *
-+ * Push the any dirty data lines starting at paddr for len bytes and
-+ * invalidate those lines.
-+ */
-+static inline void cf_dcache_flush_range(unsigned long vstart, unsigned long vend)
-+{
-+	/* align on set boundary */
-+	vstart &= 0xfffffff0;
-+	vend = (vend + (CACHE_LINE_SIZE-1)) & 0xfffffff0;
-+
-+	asm volatile("nop\n"
-+		     "move%.l   %2,%%d0\n"
-+		     "or%.l	%3,%%d0\n"
-+		     "movec	%%d0,%%cacr\n"
-+		     "move%.l	%0,%%a0\n"
-+		     "move%.l	%1,%%a1\n"
-+		     "1:\n"
-+		     "cpushl	%%dc,(%%a0)\n"
-+		     "lea	0x10(%%a0),%%a0\n"
-+		     "cmpa%.l	%%a0,%%a1\n"
-+		     "bne.b	1b\n"
-+		     "movec	%2,%%cacr\n"
-+		     : /* no return */
-+		     : "a" (__pa(vstart)), "a" (__pa(vend)),
-+		       "r" (shadow_cacr),
-+		       "i" (CF_CACR_SPA)
-+		     : "a0", "a1", "d0");
-+}
-+
-+/**
-+ * cf_icache_flush_range - Push dirty inst cache in range out and invalidate
-+ * @vstart - starting virtual address
-+ * @vend: ending virtual address
-+ *
-+ * Push the any dirty instr lines starting at paddr for len bytes and
-+ * invalidate those lines.  This should just be an invalidate since you
-+ * shouldn't be able to have dirty instruction cache.
-+ */
-+static inline void cf_icache_flush_range(unsigned long vstart, unsigned long vend)
-+{
-+	/* align on set boundary */
-+	vstart &= 0xfffffff0;
-+	vend = (vend + (CACHE_LINE_SIZE-1)) & 0xfffffff0;
-+
-+	asm volatile("nop\n"
-+		     "move%.l   %2,%%d0\n"
-+		     "or%.l	%3,%%d0\n"
-+		     "movec	%%d0,%%cacr\n"
-+		     "move%.l	%0,%%a0\n"
-+		     "move%.l	%1,%%a1\n"
-+		     "1:\n"
-+		     "cpushl	%%ic,(%%a0)\n"
-+		     "lea	0x10(%%a0),%%a0\n"
-+		     "cmpa%.l	%%a0,%%a1\n"
-+		     "bne.b	1b\n"
-+		     "movec	%2,%%cacr\n"
-+		     : /* no return */
-+		     : "a" (__pa(vstart)), "a" (__pa(vend)),
-+		       "r" (shadow_cacr),
-+		       "i" (CF_CACR_SPA)
-+		     : "a0", "a1", "d0");
-+}
-+
-+/**
-+ * flush_cache_mm - Flush an mm_struct
-+ * @mm: mm_struct to flush
-+ */
-+static inline void flush_cache_mm(struct mm_struct *mm)
-+{
-+	if (mm == current->mm)
-+		flush_bcache();
-+}
-+
-+#define flush_cache_dup_mm(mm)	flush_cache_mm(mm)
-+
-+/**
-+ * flush_cache_range - Flush a cache range
-+ * @vma: vma struct
-+ * @start: Starting address
-+ * @end: Ending address
-+ *
-+ * flush_cache_range must be a macro to avoid a dependency on
-+ * linux/mm.h which includes this file.
-+ */
-+static inline void flush_cache_range(struct vm_area_struct *vma,
-+	unsigned long start, unsigned long end)
-+{
-+	if (vma->vm_mm == current->mm)
-+		cf_cache_flush_range(start, end);
-+}
-+
-+/**
-+ * flush_cache_page - Flush a page of the cache
-+ * @vma: vma struct
-+ * @vmaddr:
-+ * @pfn: page numer
-+ *
-+ * flush_cache_page must be a macro to avoid a dependency on
-+ * linux/mm.h which includes this file.
-+ */
-+static inline void flush_cache_page(struct vm_area_struct *vma,
-+	unsigned long vmaddr, unsigned long pfn)
-+{
-+	if (vma->vm_mm == current->mm)
-+		cf_cache_flush_range(vmaddr, vmaddr+PAGE_SIZE);
-+}
-+
-+/**
-+ * __flush_page_to_ram - Push a page out of the cache
-+ * @vaddr: Virtual address at start of page
-+ *
-+ * Push the page at kernel virtual address *vaddr* and clear
-+ * the icache.
-+ */
-+static inline void __flush_page_to_ram(void *vaddr)
-+{
-+	asm volatile("nop\n"
-+		     "move%.l   %2,%%d0\n"
-+		     "or%.l	%3,%%d0\n"
-+		     "movec	%%d0,%%cacr\n"
-+		     "move%.l	%0,%%d0\n"
-+		     "and%.l	#0xfffffff0,%%d0\n"
-+		     "move%.l	%%d0,%%a0\n"
-+		     "move%.l	%1,%%d0\n"
-+		     "1:\n"
-+		     "cpushl	%%bc,(%%a0)\n"
-+		     "lea	0x10(%%a0),%%a0\n"
-+		     "subq%.l	#1,%%d0\n"
-+		     "bne.b	1b\n"
-+		     "movec	%2,%%cacr\n"
-+		     : : "a" (__pa(vaddr)), "i" (PAGE_SIZE / CACHE_LINE_SIZE),
-+			 "r" (shadow_cacr), "i" (CF_CACR_SPA)
-+		     : "a0", "d0");
-+}
-+
-+/*
-+ * Various defines for the kernel.
-+ */
-+
-+extern void cache_clear(unsigned long paddr, int len);
-+extern void cache_push(unsigned long paddr, int len);
-+extern void flush_icache_range(unsigned long address, unsigned long endaddr);
-+
-+#define flush_cache_all()			flush_bcache()
-+#define flush_cache_vmap(start, end)		flush_bcache()
-+#define flush_cache_vunmap(start, end)		flush_bcache()
-+
-+#define flush_dcache_range(vstart, vend)	cf_dcache_flush_range(vstart, vend)
-+#define flush_dcache_page(page)			__flush_page_to_ram(page_address(page))
-+#define flush_dcache_mmap_lock(mapping)		do { } while (0)
-+#define flush_dcache_mmap_unlock(mapping)	do { } while (0)
-+
-+#define flush_icache_page(vma, page)		__flush_page_to_ram(page_address(page))
-+
-+/**
-+ * copy_to_user_page - Copy memory to user page
-+ */
-+static inline void copy_to_user_page(struct vm_area_struct *vma,
-+				     struct page *page, unsigned long vaddr,
-+				     void *dst, void *src, int len)
-+{
-+	memcpy(dst, src, len);
-+	cf_cache_flush(page_to_phys(page), PAGE_SIZE);
-+}
-+
-+/**
-+ * copy_from_user_page - Copy memory from user page
-+ */
-+static inline void copy_from_user_page(struct vm_area_struct *vma,
-+				       struct page *page, unsigned long vaddr,
-+				       void *dst, void *src, int len)
-+{
-+	cf_cache_flush(page_to_phys(page), PAGE_SIZE);
-+	memcpy(dst, src, len);
-+}
-+
-+#endif /* M68K_CF_5445x_CACHEFLUSH_H */
---- /dev/null
-+++ b/include/asm-m68k/cf_548x_cacheflush.h
-@@ -0,0 +1,259 @@
-+/*
-+ * include/asm-m68k/cf_548x_cacheflush.h - Coldfire 547x/548x Cache
-+ *
-+ * Based on include/asm-m68k/cacheflush.h
-+ *
-+ * Coldfire pieces by:
-+ *   Kurt Mahan kmahan@freescale.com
-+ *
-+ * Copyright Freescale Semiconductor, Inc. 2007, 2008
-+ *
-+ * 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.
-+ */
-+#ifndef M68K_CF_548x_CACHEFLUSH_H
-+#define M68K_CF_548x_CACHEFLUSH_H
-+
-+#include <asm/cfcache.h>
-+/*
-+ * Cache handling functions
-+ */
-+
-+#define flush_icache()						\
-+({								\
-+  unsigned long set;						\
-+  unsigned long start_set;					\
-+  unsigned long end_set;					\
-+								\
-+  start_set = 0;						\
-+  end_set = (unsigned long)LAST_DCACHE_ADDR;			\
-+    								\
-+  for (set = start_set; set <= end_set; set += (0x10 - 3)) {	\
-+    asm volatile("cpushl %%ic,(%0)\n"				\
-+                 "\taddq%.l #1,%0\n"				\
-+                 "\tcpushl %%ic,(%0)\n"				\
-+                 "\taddq%.l #1,%0\n"				\
-+                 "\tcpushl %%ic,(%0)\n"				\
-+                 "\taddq%.l #1,%0\n"				\
-+                 "\tcpushl %%ic,(%0)" : "=a" (set) : "a" (set));		\
-+  }								\
-+})
-+
-+#define flush_dcache()						\
-+({								\
-+  unsigned long set;						\
-+  unsigned long start_set;					\
-+  unsigned long end_set;					\
-+								\
-+  start_set = 0;						\
-+  end_set = (unsigned long)LAST_DCACHE_ADDR;			\
-+    								\
-+  for (set = start_set; set <= end_set; set += (0x10 - 3)) {	\
-+    asm volatile("cpushl %%dc,(%0)\n"				\
-+                 "\taddq%.l #1,%0\n"				\
-+                 "\tcpushl %%dc,(%0)\n"				\
-+                 "\taddq%.l #1,%0\n"				\
-+                 "\tcpushl %%dc,(%0)\n"				\
-+                 "\taddq%.l #1,%0\n"				\
-+                 "\tcpushl %%dc,(%0)" : "=a" (set) : "a" (set));		\
-+  }								\
-+})
-+
-+#define flush_bcache()						\
-+({								\
-+  unsigned long set;						\
-+  unsigned long start_set;					\
-+  unsigned long end_set;					\
-+								\
-+  start_set = 0;						\
-+  end_set = (unsigned long)LAST_DCACHE_ADDR;			\
-+    								\
-+  for (set = start_set; set <= end_set; set += (0x10 - 3)) {	\
-+    asm volatile("cpushl %%bc,(%0)\n"				\
-+                 "\taddq%.l #1,%0\n"				\
-+                 "\tcpushl %%bc,(%0)\n"				\
-+                 "\taddq%.l #1,%0\n"				\
-+                 "\tcpushl %%bc,(%0)\n"				\
-+                 "\taddq%.l #1,%0\n"				\
-+                 "\tcpushl %%bc,(%0)" : "=a" (set) : "a" (set));		\
-+  }								\
-+})
-+
-+/*
-+ * invalidate the cache for the specified memory range.
-+ * It starts at the physical address specified for
-+ * the given number of bytes.
-+ */
-+extern void cache_clear(unsigned long paddr, int len);
-+/*
-+ * push any dirty cache in the specified memory range.
-+ * It starts at the physical address specified for
-+ * the given number of bytes.
-+ */
-+extern void cache_push(unsigned long paddr, int len);
-+
-+/*
-+ * push and invalidate pages in the specified user virtual
-+ * memory range.
-+ */
-+extern void cache_push_v(unsigned long vaddr, int len);
-+
-+/* This is needed whenever the virtual mapping of the current
-+   process changes.  */
-+
-+/**
-+ * flush_cache_mm - Flush an mm_struct
-+ * @mm: mm_struct to flush
-+ */
-+static inline void flush_cache_mm(struct mm_struct *mm)
-+{
-+	if (mm == current->mm)
-+		flush_bcache();
-+}
-+
-+#define flush_cache_dup_mm(mm)	flush_cache_mm(mm)
-+
-+#define flush_cache_all()		flush_bcache()
-+
-+/**
-+ * flush_cache_range - Flush a cache range
-+ * @vma: vma struct
-+ * @start: Starting address
-+ * @end: Ending address
-+ *
-+ * flush_cache_range must be a macro to avoid a dependency on
-+ * linux/mm.h which includes this file.
-+ */
-+static inline void flush_cache_range(struct vm_area_struct *vma,
-+	unsigned long start, unsigned long end)
-+{
-+	if (vma->vm_mm == current->mm)
-+		flush_bcache();
-+//		cf_cache_flush_range(start, end);
-+}
-+
-+/**
-+ * flush_cache_page - Flush a page of the cache
-+ * @vma: vma struct
-+ * @vmaddr:
-+ * @pfn: page numer
-+ *
-+ * flush_cache_page must be a macro to avoid a dependency on
-+ * linux/mm.h which includes this file.
-+ */
-+static inline void flush_cache_page(struct vm_area_struct *vma,
-+	unsigned long vmaddr, unsigned long pfn)
-+{
-+	if (vma->vm_mm == current->mm)
-+		flush_bcache();
-+//		cf_cache_flush_range(vmaddr, vmaddr+PAGE_SIZE);
-+}
-+
-+/* Push the page at kernel virtual address and clear the icache */
-+/* RZ: use cpush %bc instead of cpush %dc, cinv %ic */
-+#define flush_page_to_ram(page) __flush_page_to_ram((void *) page_address(page))
-+extern inline void __flush_page_to_ram(void *address)
-+{
-+  unsigned long set;
-+  unsigned long start_set;
-+  unsigned long end_set;
-+  unsigned long addr = (unsigned long) address;
-+
-+  addr &= ~(PAGE_SIZE - 1); /* round down to page start address */
-+
-+  start_set = addr & _ICACHE_SET_MASK;
-+  end_set = (addr + PAGE_SIZE-1) & _ICACHE_SET_MASK;
-+
-+  if (start_set > end_set) {
-+    /* from the begining to the lowest address */
-+    for (set = 0; set <= end_set; set += (0x10 - 3)) {
-+      asm volatile("cpushl %%bc,(%0)\n"
-+                   "\taddq%.l #1,%0\n"
-+                   "\tcpushl %%bc,(%0)\n"
-+                   "\taddq%.l #1,%0\n"
-+                   "\tcpushl %%bc,(%0)\n"
-+                   "\taddq%.l #1,%0\n"
-+                   "\tcpushl %%bc,(%0)" : "=a" (set) : "a" (set));
-+    }
-+    /* next loop will finish the cache ie pass the hole */
-+    end_set = LAST_ICACHE_ADDR;    
-+  }
-+  for (set = start_set; set <= end_set; set += (0x10 - 3)) {
-+    asm volatile("cpushl %%bc,(%0)\n"
-+                 "\taddq%.l #1,%0\n"
-+                 "\tcpushl %%bc,(%0)\n"
-+                 "\taddq%.l #1,%0\n"
-+                 "\tcpushl %%bc,(%0)\n"
-+                 "\taddq%.l #1,%0\n"
-+                 "\tcpushl %%bc,(%0)" : "=a" (set) : "a" (set));
-+  }
-+}
-+
-+/* Use __flush_page_to_ram() for flush_dcache_page all values are same - MW */
-+#define flush_dcache_page(page)			\
-+	__flush_page_to_ram((void *) page_address(page))
-+#define flush_icache_page(vma,pg)		\
-+	__flush_page_to_ram((void *) page_address(pg))
-+#define flush_icache_user_range(adr,len)	do { } while (0)
-+/* NL */
-+#define flush_icache_user_page(vma,page,addr,len)	do { } while (0)
-+
-+/* Push n pages at kernel virtual address and clear the icache */
-+/* RZ: use cpush %bc instead of cpush %dc, cinv %ic */
-+extern inline void flush_icache_range (unsigned long address,
-+				       unsigned long endaddr)
-+{
-+  unsigned long set;
-+  unsigned long start_set;
-+  unsigned long end_set;
-+
-+  start_set = address & _ICACHE_SET_MASK;
-+  end_set = endaddr & _ICACHE_SET_MASK;
-+
-+  if (start_set > end_set) {
-+    /* from the begining to the lowest address */
-+    for (set = 0; set <= end_set; set += (0x10 - 3)) {
-+      asm volatile("cpushl %%ic,(%0)\n"
-+                   "\taddq%.l #1,%0\n"
-+                   "\tcpushl %%ic,(%0)\n"
-+                   "\taddq%.l #1,%0\n"
-+                   "\tcpushl %%ic,(%0)\n"
-+                   "\taddq%.l #1,%0\n"
-+                   "\tcpushl %%ic,(%0)" : "=a" (set) : "a" (set));
-+    }
-+    /* next loop will finish the cache ie pass the hole */
-+    end_set = LAST_ICACHE_ADDR;    
-+  }
-+  for (set = start_set; set <= end_set; set += (0x10 - 3)) {
-+    asm volatile("cpushl %%ic,(%0)\n"
-+                 "\taddq%.l #1,%0\n"
-+                 "\tcpushl %%ic,(%0)\n"
-+                 "\taddq%.l #1,%0\n"
-+                 "\tcpushl %%ic,(%0)\n"
-+                 "\taddq%.l #1,%0\n"
-+                 "\tcpushl %%ic,(%0)" : "=a" (set) : "a" (set));
-+  }
-+}
-+
-+static inline void copy_to_user_page(struct vm_area_struct *vma,
-+				     struct page *page, unsigned long vaddr,
-+				     void *dst, void *src, int len)
-+{
-+	memcpy(dst, src, len);
-+	flush_icache_user_page(vma, page, vaddr, len);
-+}
-+static inline void copy_from_user_page(struct vm_area_struct *vma,
-+				       struct page *page, unsigned long vaddr,
-+				       void *dst, void *src, int len)
-+{
-+	memcpy(dst, src, len);
-+}
-+
-+#define flush_cache_vmap(start, end)		flush_cache_all()
-+#define flush_cache_vunmap(start, end)		flush_cache_all()
-+#define flush_dcache_mmap_lock(mapping)		do { } while (0)
-+#define flush_dcache_mmap_unlock(mapping)	do { } while (0)
-+
-+#endif /* M68K_CF_548x_CACHEFLUSH_H */
---- a/include/asm-m68k/cf_cacheflush.h
-+++ b/include/asm-m68k/cf_cacheflush.h
-@@ -1,244 +1,10 @@
- #ifndef M68K_CF_CACHEFLUSH_H
- #define M68K_CF_CACHEFLUSH_H
- 
--#include <asm/cfcache.h>
--/*
-- * Cache handling functions
-- */
--
--#define flush_icache()						\
--({								\
--  unsigned long set;						\
--  unsigned long start_set;					\
--  unsigned long end_set;					\
--								\
--  start_set = 0;						\
--  end_set = (unsigned long)LAST_DCACHE_ADDR;			\
--    								\
--  for (set = start_set; set <= end_set; set += (0x10 - 3)) {	\
--    asm volatile("cpushl %%ic,(%0)\n"				\
--                 "\taddq%.l #1,%0\n"				\
--                 "\tcpushl %%ic,(%0)\n"				\
--                 "\taddq%.l #1,%0\n"				\
--                 "\tcpushl %%ic,(%0)\n"				\
--                 "\taddq%.l #1,%0\n"				\
--                 "\tcpushl %%ic,(%0)" : "=a" (set) : "a" (set));		\
--  }								\
--})
--
--#define flush_dcache()						\
--({								\
--  unsigned long set;						\
--  unsigned long start_set;					\
--  unsigned long end_set;					\
--								\
--  start_set = 0;						\
--  end_set = (unsigned long)LAST_DCACHE_ADDR;			\
--    								\
--  for (set = start_set; set <= end_set; set += (0x10 - 3)) {	\
--    asm volatile("cpushl %%dc,(%0)\n"				\
--                 "\taddq%.l #1,%0\n"				\
--                 "\tcpushl %%dc,(%0)\n"				\
--                 "\taddq%.l #1,%0\n"				\
--                 "\tcpushl %%dc,(%0)\n"				\
--                 "\taddq%.l #1,%0\n"				\
--                 "\tcpushl %%dc,(%0)" : "=a" (set) : "a" (set));		\
--  }								\
--})
--
--#define flush_bcache()						\
--({								\
--  unsigned long set;						\
--  unsigned long start_set;					\
--  unsigned long end_set;					\
--								\
--  start_set = 0;						\
--  end_set = (unsigned long)LAST_DCACHE_ADDR;			\
--    								\
--  for (set = start_set; set <= end_set; set += (0x10 - 3)) {	\
--    asm volatile("cpushl %%bc,(%0)\n"				\
--                 "\taddq%.l #1,%0\n"				\
--                 "\tcpushl %%bc,(%0)\n"				\
--                 "\taddq%.l #1,%0\n"				\
--                 "\tcpushl %%bc,(%0)\n"				\
--                 "\taddq%.l #1,%0\n"				\
--                 "\tcpushl %%bc,(%0)" : "=a" (set) : "a" (set));		\
--  }								\
--})
--
--/*
-- * invalidate the cache for the specified memory range.
-- * It starts at the physical address specified for
-- * the given number of bytes.
-- */
--extern void cache_clear(unsigned long paddr, int len);
--/*
-- * push any dirty cache in the specified memory range.
-- * It starts at the physical address specified for
-- * the given number of bytes.
-- */
--extern void cache_push(unsigned long paddr, int len);
--
--/*
-- * push and invalidate pages in the specified user virtual
-- * memory range.
-- */
--extern void cache_push_v(unsigned long vaddr, int len);
--
--/* This is needed whenever the virtual mapping of the current
--   process changes.  */
--
--/**
-- * flush_cache_mm - Flush an mm_struct
-- * @mm: mm_struct to flush
-- */
--static inline void flush_cache_mm(struct mm_struct *mm)
--{
--	if (mm == current->mm)
--		flush_bcache();
--}
--
--#define flush_cache_dup_mm(mm)	flush_cache_mm(mm)
--
--#define flush_cache_all()		flush_bcache()
--
--/**
-- * flush_cache_range - Flush a cache range
-- * @vma: vma struct
-- * @start: Starting address
-- * @end: Ending address
-- *
-- * flush_cache_range must be a macro to avoid a dependency on
-- * linux/mm.h which includes this file.
-- */
--static inline void flush_cache_range(struct vm_area_struct *vma,
--	unsigned long start, unsigned long end)
--{
--	if (vma->vm_mm == current->mm)
--		flush_bcache();
--//		cf_cache_flush_range(start, end);
--}
--
--/**
-- * flush_cache_page - Flush a page of the cache
-- * @vma: vma struct
-- * @vmaddr:
-- * @pfn: page numer
-- *
-- * flush_cache_page must be a macro to avoid a dependency on
-- * linux/mm.h which includes this file.
-- */
--static inline void flush_cache_page(struct vm_area_struct *vma,
--	unsigned long vmaddr, unsigned long pfn)
--{
--	if (vma->vm_mm == current->mm)
--		flush_bcache();
--//		cf_cache_flush_range(vmaddr, vmaddr+PAGE_SIZE);
--}
--
--/* Push the page at kernel virtual address and clear the icache */
--/* RZ: use cpush %bc instead of cpush %dc, cinv %ic */
--#define flush_page_to_ram(page) __flush_page_to_ram((void *) page_address(page))
--extern inline void __flush_page_to_ram(void *address)
--{
--  unsigned long set;
--  unsigned long start_set;
--  unsigned long end_set;
--  unsigned long addr = (unsigned long) address;
--
--  addr &= ~(PAGE_SIZE - 1); /* round down to page start address */
--
--  start_set = addr & _ICACHE_SET_MASK;
--  end_set = (addr + PAGE_SIZE-1) & _ICACHE_SET_MASK;
--
--  if (start_set > end_set) {
--    /* from the begining to the lowest address */
--    for (set = 0; set <= end_set; set += (0x10 - 3)) {
--      asm volatile("cpushl %%bc,(%0)\n"
--                   "\taddq%.l #1,%0\n"
--                   "\tcpushl %%bc,(%0)\n"
--                   "\taddq%.l #1,%0\n"
--                   "\tcpushl %%bc,(%0)\n"
--                   "\taddq%.l #1,%0\n"
--                   "\tcpushl %%bc,(%0)" : "=a" (set) : "a" (set));
--    }
--    /* next loop will finish the cache ie pass the hole */
--    end_set = LAST_ICACHE_ADDR;    
--  }
--  for (set = start_set; set <= end_set; set += (0x10 - 3)) {
--    asm volatile("cpushl %%bc,(%0)\n"
--                 "\taddq%.l #1,%0\n"
--                 "\tcpushl %%bc,(%0)\n"
--                 "\taddq%.l #1,%0\n"
--                 "\tcpushl %%bc,(%0)\n"
--                 "\taddq%.l #1,%0\n"
--                 "\tcpushl %%bc,(%0)" : "=a" (set) : "a" (set));
--  }
--}
--
--/* Use __flush_page_to_ram() for flush_dcache_page all values are same - MW */
--#define flush_dcache_page(page)			\
--	__flush_page_to_ram((void *) page_address(page))
--#define flush_icache_page(vma,pg)		\
--	__flush_page_to_ram((void *) page_address(pg))
--#define flush_icache_user_range(adr,len)	do { } while (0)
--/* NL */
--#define flush_icache_user_page(vma,page,addr,len)	do { } while (0)
--
--/* Push n pages at kernel virtual address and clear the icache */
--/* RZ: use cpush %bc instead of cpush %dc, cinv %ic */
--extern inline void flush_icache_range (unsigned long address,
--				       unsigned long endaddr)
--{
--  unsigned long set;
--  unsigned long start_set;
--  unsigned long end_set;
--
--  start_set = address & _ICACHE_SET_MASK;
--  end_set = endaddr & _ICACHE_SET_MASK;
--
--  if (start_set > end_set) {
--    /* from the begining to the lowest address */
--    for (set = 0; set <= end_set; set += (0x10 - 3)) {
--      asm volatile("cpushl %%ic,(%0)\n"
--                   "\taddq%.l #1,%0\n"
--                   "\tcpushl %%ic,(%0)\n"
--                   "\taddq%.l #1,%0\n"
--                   "\tcpushl %%ic,(%0)\n"
--                   "\taddq%.l #1,%0\n"
--                   "\tcpushl %%ic,(%0)" : "=a" (set) : "a" (set));
--    }
--    /* next loop will finish the cache ie pass the hole */
--    end_set = LAST_ICACHE_ADDR;    
--  }
--  for (set = start_set; set <= end_set; set += (0x10 - 3)) {
--    asm volatile("cpushl %%ic,(%0)\n"
--                 "\taddq%.l #1,%0\n"
--                 "\tcpushl %%ic,(%0)\n"
--                 "\taddq%.l #1,%0\n"
--                 "\tcpushl %%ic,(%0)\n"
--                 "\taddq%.l #1,%0\n"
--                 "\tcpushl %%ic,(%0)" : "=a" (set) : "a" (set));
--  }
--}
--
--static inline void copy_to_user_page(struct vm_area_struct *vma,
--				     struct page *page, unsigned long vaddr,
--				     void *dst, void *src, int len)
--{
--	memcpy(dst, src, len);
--	flush_icache_user_page(vma, page, vaddr, len);
--}
--static inline void copy_from_user_page(struct vm_area_struct *vma,
--				       struct page *page, unsigned long vaddr,
--				       void *dst, void *src, int len)
--{
--	memcpy(dst, src, len);
--}
--
--#define flush_cache_vmap(start, end)		flush_cache_all()
--#define flush_cache_vunmap(start, end)		flush_cache_all()
--#define flush_dcache_mmap_lock(mapping)		do { } while (0)
--#define flush_dcache_mmap_unlock(mapping)	do { } while (0)
-+#ifdef CONFIG_M5445X
-+#include "cf_5445x_cacheflush.h"
-+#else
-+#include "cf_548x_cacheflush.h"
-+#endif
- 
- #endif /* M68K_CF_CACHEFLUSH_H */
diff --git a/target/linux/coldfire/patches/063-m5445x_rambar_config.patch b/target/linux/coldfire/patches/063-m5445x_rambar_config.patch
deleted file mode 100644
index ba4e18e8c..000000000
--- a/target/linux/coldfire/patches/063-m5445x_rambar_config.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 6651009d31bfcb8e364e25e944618465f510bd0b Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Tue, 24 Jun 2008 21:23:58 -0600
-Subject: [PATCH] Update SRAM/RAMBAR1 configuration for M5445x.
-
-LTIBName: m5445x-rambar-config
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/coldfire/head.S   |    5 +++--
- include/asm-m68k/coldfire.h |    9 +++++++--
- 2 files changed, 10 insertions(+), 4 deletions(-)
-
---- a/arch/m68k/coldfire/head.S
-+++ b/arch/m68k/coldfire/head.S
-@@ -285,8 +285,9 @@ ENTRY(__start)
- 	movel	%a0,%usp
- 
- #if defined(CONFIG_M5445X)
--	movel  #(MCF_RAMBAR1 + 0x221), %d0
--	movec   %d0, %rambar1
-+/* JKM -- don't enable it currently -- fix 	*/
-+/*	movel  #(MCF_RAMBAR1 + 0x221), %d0	*/
-+/*	movec   %d0, %rambar1 			*/
- #elif defined(CONFIG_M547X_8X)
- 	movel   #MCF_MBAR, %d0
- 	movec   %d0, %mbar
---- a/include/asm-m68k/coldfire.h
-+++ b/include/asm-m68k/coldfire.h
-@@ -3,8 +3,13 @@
- 
- #if defined(CONFIG_M5445X)
- #define MCF_MBAR	0x0
--#define MCF_RAMBAR1 	0x80000000
--#define MCF_SRAM	0x80000000
-+/*
-+ * Even though RAMBAR1 should be in the 0x8xxxxxxx range there
-+ * is a problem that needs to be resolved.  Currently head.S
-+ * disables SRAM/RAMBAR1.
-+ */
-+#define MCF_RAMBAR1 	0x40000000
-+#define MCF_SRAM	0x40000000
- #elif defined(CONFIG_M547X_8X)
- #define MCF_MBAR	0xF0000000
- #define MCF_MMUBAR	0xF1000000
diff --git a/target/linux/coldfire/patches/064-mcfv4e_update_cmdlines.patch b/target/linux/coldfire/patches/064-mcfv4e_update_cmdlines.patch
deleted file mode 100644
index 0b382d285..000000000
--- a/target/linux/coldfire/patches/064-mcfv4e_update_cmdlines.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 7b2dd837d32050d88eadfb0c71c381f7478f55b3 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Tue, 24 Jun 2008 22:09:34 -0600
-Subject: [PATCH] Update default command lines.
-
-LTIBName: mcfv4e-update-cmdlines
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/coldfire/config.c |    8 +++++---
- 1 files changed, 5 insertions(+), 3 deletions(-)
-
---- a/arch/m68k/coldfire/config.c
-+++ b/arch/m68k/coldfire/config.c
-@@ -132,11 +132,13 @@ int __init uboot_commandline(char *boota
- /*
-  * This routine does things not done in the bootloader.
-  */
--#if defined(CONFIG_M5445X)
--#define FOO_DEFAULT_COMMAND_LINE "root=/dev/mtdblock1 rw rootfstype=jffs2 ip=none mtdparts=physmap-flash.0:5M(kernel)ro,-(jffs2)"
-+#if defined(CONFIG_M54451)
- #define DEFAULT_COMMAND_LINE "debug root=/dev/nfs rw nfsroot=172.27.155.1:/tftpboot/redstripe/rootfs/ ip=172.27.155.51:172.27.155.1"
-+#elif defined(CONFIG_M54455)
-+#define MTD_DEFAULT_COMMAND_LINE "root=/dev/mtdblock1 rw rootfstype=jffs2 ip=none mtdparts=physmap-flash.0:5M(kernel)ro,-(jffs2)"
-+#define DEFAULT_COMMAND_LINE "debug root=/dev/nfs rw nfsroot=172.27.155.1:/tftpboot/redstripe/rootfs/ ip=172.27.155.55:172.27.155.1"
- #elif defined(CONFIG_M547X_8X)
--#define DEFAULT_COMMAND_LINE "debug root=/dev/nfs rw nfsroot=172.27.155.1:/tftpboot/rigo/rootfs/ ip=172.27.155.85:172.27.155.1"
-+#define DEFAULT_COMMAND_LINE "debug root=/dev/nfs rw nfsroot=172.27.155.1:/tftpboot/rigo/rootfs/ ip=172.27.155.75:172.27.155.1"
- #endif
- asmlinkage void __init cf_early_init(void)
- {
diff --git a/target/linux/coldfire/patches/065-mcfv4e_bss_clear_move.patch b/target/linux/coldfire/patches/065-mcfv4e_bss_clear_move.patch
deleted file mode 100644
index 84a26a3e2..000000000
--- a/target/linux/coldfire/patches/065-mcfv4e_bss_clear_move.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 87ea76988875856dc1c3657b27ac792d2f0311e9 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Tue, 24 Jun 2008 22:12:17 -0600
-Subject: [PATCH] Move BSS initialization after mmu setup.
-
-LTIBName: mcfv4e-bss-clear-move
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/coldfire/head.S |   19 +++++++++----------
- 1 files changed, 9 insertions(+), 10 deletions(-)
-
---- a/arch/m68k/coldfire/head.S
-+++ b/arch/m68k/coldfire/head.S
-@@ -326,16 +326,6 @@ ENTRY(__start)
- 	movec   %d0, %acr3
- 	nop
- 
--#ifdef CONFIG_COLDFIRE
--/* zero bss */
--	lea	_sbss,%a0
--	lea	_ebss,%a1
--	clrl	%d0
--_loop_bss:
--	movel	%d0,(%a0)+
--	cmpl	%a0,%a1
--	bne	_loop_bss
--#endif
- 	/* If you change the memory size to another value make a matching 
- 	   change in paging_init(cf-mmu.c) to zones_size[]. */
- 
-@@ -564,6 +554,15 @@ ENTRY(__running_high)
- 	addl	#PAGE_OFFSET,%a1
- 	movel	%a1,%a0@
- 
-+/* zero bss */
-+	lea	_sbss,%a0
-+	lea	_ebss,%a1
-+	clrl	%d0
-+_loop_bss:
-+	movel	%d0,(%a0)+
-+	cmpl	%a0,%a1
-+	bne	_loop_bss
-+
- 	/* Unmap unity mappings */
- #if CONFIG_SDRAM_BASE != PAGE_OFFSET
- #if defined(CONFIG_M5445X)
diff --git a/target/linux/coldfire/patches/066-mcfv4e_endmem_fix.patch b/target/linux/coldfire/patches/066-mcfv4e_endmem_fix.patch
deleted file mode 100644
index e334f42ea..000000000
--- a/target/linux/coldfire/patches/066-mcfv4e_endmem_fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 601145f682eab66abca5d154a8a9fdf275acd8ba Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Tue, 24 Jun 2008 22:20:31 -0600
-Subject: [PATCH] Fix off by 1 error with endmem.
-
-LTIBName: mcfv4e-endmem-fix
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/coldfire/config.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
---- a/arch/m68k/coldfire/config.c
-+++ b/arch/m68k/coldfire/config.c
-@@ -449,7 +449,7 @@ void __init config_coldfire(void)
- /*	mach_hwclk 		= coldfire_hwclk; to be done */
- 	mach_get_model 		= coldfire_get_model;
- 
--	coldfire_bootmem_alloc(startmem, endmem);
-+	coldfire_bootmem_alloc(startmem, endmem-1);
- 
- 	/*
- 	 * initrd setup
diff --git a/target/linux/coldfire/patches/067-mcfv4e_acr_cleanup.patch b/target/linux/coldfire/patches/067-mcfv4e_acr_cleanup.patch
deleted file mode 100644
index 3a0736c8a..000000000
--- a/target/linux/coldfire/patches/067-mcfv4e_acr_cleanup.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From ddc092180bd24b34afdd6fd7cd48b77b55a5bd5e Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Tue, 24 Jun 2008 23:21:07 -0600
-Subject: [PATCH] Cleanup ACR mappings and document.
-
-LTIBName: mcfv4e-acr-cleanup
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/coldfire/head.S |   81 +++++++++++++++++++++++++-------------------
- 1 files changed, 46 insertions(+), 35 deletions(-)
-
---- a/arch/m68k/coldfire/head.S
-+++ b/arch/m68k/coldfire/head.S
-@@ -53,52 +53,63 @@
- #define __FINIT		.previous
- #endif
- 
--/* JKM -- REVISE DOCS FOR M547x_8x and PHYS MAPPING */
-+#if CONFIG_SDRAM_BASE != PAGE_OFFSET
- /*
-- * Setup ACR mappings to provide the following memory map:
-- *   Data
-- *     0xA0000000 -> 0xAFFFFFFF [0] NO CACHE / PRECISE / SUPER ONLY
-- *     0xF0000000 -> 0xFFFFFFFF [1] NO CACHE / PRECISE / SUPER ONLY
-- *   Code
-- *     None currently (mapped via TLBs)
-+ * Kernel mapped to virtual ram address.
-+ *
-+ * M5445x:
-+ *    Data[0]: 0xF0000000 -> 0xFFFFFFFF	System regs
-+ *    Data[1]: 0xA0000000 -> 0xAFFFFFFF	PCI
-+ *    Code[0]: Not Mapped
-+ *    Code[1]: Not Mapped
-+ *
-+ * M547x/M548x
-+ *    Data[0]: 0xF0000000 -> 0xFFFFFFFF	System regs
-+ *    Data[1]: Not Mapped
-+ *    Code[0]: Not Mapped
-+ *    Code[1]: Not Mapped
-  */
--
--#if CONFIG_SDRAM_BASE != PAGE_OFFSET
- #if defined(CONFIG_M5445X)
--#if 0
--#define ACR0_DEFAULT	#0xA00FA048   /* ACR0 default value */
--#endif
--#define ACR0_DEFAULT	#0x400FA028   /* ACR0 default value */
--#define ACR1_DEFAULT	#0xF00FA040   /* ACR1 default value */
--#if 0
--#define ACR2_DEFAULT	#0x00000000   /* ACR2 default value */
--#endif
--#define ACR2_DEFAULT	#0x400FA028   /* ACR2 default value */
--#define ACR3_DEFAULT	#0x00000000   /* ACR3 default value */
--/* ACR mapping for FPGA (maps 0) */
--#define ACR0_FPGA	#0x000FA048   /* ACR0 enable FPGA */
-+#define ACR0_DEFAULT	#0xF00FA048   /* System regs */
-+#define ACR1_DEFAULT	#0xA00FA048   /* PCI */
-+#define ACR2_DEFAULT	#0x00000000   /* Not Mapped */
-+#define ACR3_DEFAULT	#0x00000000   /* Not Mapped */
- #elif defined(CONFIG_M547X_8X)
--#define ACR0_DEFAULT	#0xE000C040   /* ACR0 default value */
--#define ACR1_DEFAULT	#0x00000000   /* ACR1 default value */
--#define ACR2_DEFAULT	#0x00000000   /* ACR2 default value */
--#define ACR3_DEFAULT	#0x00000000   /* ACR3 default value */
-+#define ACR0_DEFAULT	#0xF00FA048   /* System Regs */
-+#define ACR1_DEFAULT	#0x00000000   /* Not Mapped */
-+#define ACR2_DEFAULT	#0x00000000   /* Not Mapped */
-+#define ACR3_DEFAULT	#0x00000000   /* Not Mapped */
- #endif
- 
--#else
-+#else /* CONFIG_SDRAM_BASE = PAGE_OFFSET */
-+/*
-+ * Kernel mapped to physical ram address.
-+ *
-+ * M5445x:
-+ *    Data[0]: 0xF0000000 -> 0xFFFFFFFF	System regs
-+ *    Data[1]: 0x40000000 -> 0x4FFFFFFF	SDRAM - uncached
-+ *    Code[0]: Not Mapped
-+ *    Code[1]: 0x40000000 -> 0x4FFFFFFF	SDRAM - cached
-+ *
-+ * M547x/M548x
-+ *    Data[0]: 0xF0000000 -> 0xFFFFFFFF	System regs
-+ *    Data[1]: 0x00000000 -> 0x0FFFFFFF	SDRAM - uncached
-+ *    Code[0]: Not Mapped
-+ *    Code[1]: 0x00000000 -> 0x0FFFFFFF	SDRAM - cached
-+ */
- #if defined(CONFIG_M5445X)
--#define ACR0_DEFAULT	#0xF00FC040   /* ACR0 default value */
--#define ACR1_DEFAULT	#0x400FA008   /* ACR1 default value */
--#define ACR2_DEFAULT	#0x00000000   /* ACR2 default value */
--#define ACR3_DEFAULT	#0x400FA008   /* ACR3 default value */
-+#define ACR0_DEFAULT	#0xF00FA048   /* System Regs */
-+#define ACR1_DEFAULT	#0x400FA048   /* SDRAM uncached */
-+#define ACR2_DEFAULT	#0x00000000   /* Not mapped */
-+#define ACR3_DEFAULT	#0x400FA008   /* SDRAM cached */
- #elif defined(CONFIG_M547X_8X)
--#define ACR0_DEFAULT	#0xF00FC040   /* ACR0 default value */
--#define ACR1_DEFAULT	#0x000FA008   /* ACR1 default value */
--#define ACR2_DEFAULT	#0x00000000   /* ACR2 default value */
--#define ACR3_DEFAULT	#0x000FA008   /* ACR3 default value */
-+#define ACR0_DEFAULT	#0xF00FA048   /* System Regs */
-+#define ACR1_DEFAULT	#0x000FA048   /* SDRAM uncached */
-+#define ACR2_DEFAULT	#0x00000000   /* Not mapped */
-+#define ACR3_DEFAULT	#0x000FA008   /* SDRAM cached */
- #endif
- #endif
- 
--
- /* Several macros to make the writing of subroutines easier:
-  * - func_start marks the beginning of the routine which setups the frame
-  *   register and saves the registers, it also defines another macro
diff --git a/target/linux/coldfire/patches/068-m547x_8x_NOR_FLASH_baseaddr.patch b/target/linux/coldfire/patches/068-m547x_8x_NOR_FLASH_baseaddr.patch
deleted file mode 100644
index a2891de83..000000000
--- a/target/linux/coldfire/patches/068-m547x_8x_NOR_FLASH_baseaddr.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 423d67db899b8f2e20b09fac7da1f7eaaa4523cb Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Tue, 24 Jun 2008 23:24:30 -0600
-Subject: [PATCH] Add the M547x/M548x NOR_FLASH base address.
-
-LTIBName: m547x-8x-NOR-FLASH-baseaddr
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/Kconfig |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
---- a/arch/m68k/Kconfig
-+++ b/arch/m68k/Kconfig
-@@ -459,6 +459,7 @@ config NOR_FLASH_BASE
- 	depends on COLDFIRE
- 	default 0x00000000 if M54451EVB
- 	default 0x00000000 if M54455EVB
-+	default 0xE0000000 if M547X_8X
- 
- config M68KFPU_EMU
- 	bool "Math emulation support (EXPERIMENTAL)"
diff --git a/target/linux/coldfire/patches/069-m5445x_fecint_nest_1.patch b/target/linux/coldfire/patches/069-m5445x_fecint_nest_1.patch
deleted file mode 100644
index a3f14eb2f..000000000
--- a/target/linux/coldfire/patches/069-m5445x_fecint_nest_1.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 8809b176ecde425d13cab8920a66fbfd6fb4c3b7 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Tue, 24 Jun 2008 23:26:54 -0600
-Subject: [PATCH] Make sure interrupt handler calls aren't nested.
-
-LTIBName: m5445x-fecint-nest
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- drivers/net/fec.c |    5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
---- a/drivers/net/fec.c
-+++ b/drivers/net/fec.c
-@@ -23,6 +23,9 @@
-  *
-  * Bug fixes and cleanup by Philippe De Muyter (phdm@macqel.be)
-  * Copyright (c) 2004-2006 Macq Electronique SA.
-+ *
-+ * Coldfire bug fixes and cleanup by Kurt Mahan (kmahan@freescale.com)
-+ * Copyright 2007-2008 Freescale Semiconductor, Inc. All Rights Reserved.
-  */
- 
- #include <linux/module.h>
-@@ -1865,7 +1868,7 @@ static void __inline__ fec_request_intrs
- 
- 	/* Setup interrupt handlers. */
- 	for (idp = id; idp->name; idp++) {
--		if (request_irq(b+idp->irq, fec_enet_interrupt, 0,
-+		if (request_irq(b+idp->irq, fec_enet_interrupt, IRQF_DISABLED,
- 		    idp->name, dev) != 0)
- 			printk(KERN_ERR "FEC: Could not alloc %s IRQ(%d)!\n",
- 				idp->name, b+idp->irq);
diff --git a/target/linux/coldfire/patches/070-m5445x_rambar_init_1.patch b/target/linux/coldfire/patches/070-m5445x_rambar_init_1.patch
deleted file mode 100644
index e07eba3ed..000000000
--- a/target/linux/coldfire/patches/070-m5445x_rambar_init_1.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1667ce157c8cc2ffc13f1e31c64982d0af95d5a5 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Wed, 25 Jun 2008 01:34:30 -0600
-Subject: [PATCH] Disable RAMBAR1 on initialization.
-
-LTIBName: m5445x-rambar-init
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/coldfire/head.S |    5 ++---
- 1 files changed, 2 insertions(+), 3 deletions(-)
-
---- a/arch/m68k/coldfire/head.S
-+++ b/arch/m68k/coldfire/head.S
-@@ -296,9 +296,8 @@ ENTRY(__start)
- 	movel	%a0,%usp
- 
- #if defined(CONFIG_M5445X)
--/* JKM -- don't enable it currently -- fix 	*/
--/*	movel  #(MCF_RAMBAR1 + 0x221), %d0	*/
--/*	movec   %d0, %rambar1 			*/
-+	movel	#0x80000000, %d0
-+	movec	%d0, %rambar1
- #elif defined(CONFIG_M547X_8X)
- 	movel   #MCF_MBAR, %d0
- 	movec   %d0, %mbar
diff --git a/target/linux/coldfire/patches/071-m5445x_i2c.patch b/target/linux/coldfire/patches/071-m5445x_i2c.patch
deleted file mode 100644
index ecda4d6c7..000000000
--- a/target/linux/coldfire/patches/071-m5445x_i2c.patch
+++ /dev/null
@@ -1,699 +0,0 @@
-From e1618e943f60a4f8f778c4f7c389e2fa13eb0a83 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Thu, 26 Jun 2008 16:29:56 -0600
-Subject: [PATCH] Add I2C support for the M5445x platforms.
-
-LTIBName: m5445x-i2c
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- drivers/i2c/busses/Kconfig   |   10 +
- drivers/i2c/busses/Makefile  |    1 +
- drivers/i2c/busses/i2c-mcf.c |  573 ++++++++++++++++++++++++++++++++++++++++++
- drivers/i2c/busses/i2c-mcf.h |   75 ++++++
- 4 files changed, 659 insertions(+), 0 deletions(-)
- create mode 100644 drivers/i2c/busses/i2c-mcf.c
- create mode 100644 drivers/i2c/busses/i2c-mcf.h
-
---- a/drivers/i2c/busses/Kconfig
-+++ b/drivers/i2c/busses/Kconfig
-@@ -302,6 +302,16 @@ config I2C_POWERMAC
- 	  This support is also available as a module.  If so, the module
- 	  will be called i2c-powermac.
- 
-+config I2C_MCF
-+	tristate "MCF ColdFire"
-+	depends on I2C && EXPERIMENTAL
-+	help
-+	  If you say yes to this option, support will be included for the
-+	  I2C on most ColdFire CPUs
-+
-+	  This driver can also be built as a module.  If so, the module
-+	  will be called i2c-mcf.
-+ 
- config I2C_MPC
- 	tristate "MPC107/824x/85xx/52xx/86xx"
- 	depends on PPC32
---- a/drivers/i2c/busses/Makefile
-+++ b/drivers/i2c/busses/Makefile
-@@ -53,6 +53,7 @@ obj-$(CONFIG_I2C_VOODOO3)	+= i2c-voodoo3
- obj-$(CONFIG_SCx200_ACB)	+= scx200_acb.o
- obj-$(CONFIG_SCx200_I2C)	+= scx200_i2c.o
- obj-$(CONFIG_I2C_MCF548x)       += i2c-mcf548x.o
-+obj-$(CONFIG_I2C_MCF)		+= i2c-mcf.o
- 
- ifeq ($(CONFIG_I2C_DEBUG_BUS),y)
- EXTRA_CFLAGS += -DDEBUG
---- /dev/null
-+++ b/drivers/i2c/busses/i2c-mcf.c
-@@ -0,0 +1,573 @@
-+/*
-+    i2c-mcf.c - Part of lm_sensors, Linux kernel modules for hardware monitoring
-+
-+    Copyright (c) 2005, Derek CL Cheung <derek.cheung@sympatico.ca>
-+					<http://www3.sympatico.ca/derek.cheung>
-+
-+    Copyright (c) 2006-2007, emlix
-+			Sebastian Hess <sh@emlix.com>
-+
-+    Copyright (c) 2006-2007 Freescale Semiconductor, Inc
-+			Yaroslav Vinogradov <yaroslav.vinogradov@freescale.com>
-+			Matt Waddel <Matt.Waddel@freescale.com>
-+
-+    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.
-+
-+    This program is distributed in the hope that it will be useful,
-+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+    GNU General Public License for more details.
-+
-+    You should have received a copy of the GNU General Public License
-+    along with this program; if not, write to the Free Software
-+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+
-+    Changes:
-+    v0.1 	26 March 2005
-+        	Initial Release - developed on uClinux with 2.6.9 kernel
-+
-+    v0.2	29 May 2006
-+		Modified to be more generic and added support for
-+		i2c_master_xfer
-+
-+    This I2C adaptor supports the ColdFire CPU I2C module. Since most Coldfire
-+    CPUs' I2C module use the same register set (e.g., MCF5249), the code is very
-+    portable and re-usable to other Coldfire CPUs.
-+
-+    The transmission frequency is set at about 100KHz for the CPU board with
-+    8MHz crystal. If the CPU board uses different system clock frequency, you 
-+    should change the following line:
-+                static int __init i2c_coldfire_init(void)
-+                {
-+                                .........
-+                        // Set transmission frequency 0x15 = ~100kHz
-+                        *MCF_I2C_I2FDR = 0x15;
-+                                ........
-+                }
-+
-+    Remember to perform a dummy read to set the ColdFire CPU's I2C module for 
-+    read before reading the actual byte from a device
-+
-+    The I2C_SM_BUS_BLOCK_DATA function are not yet ready but most lm_senors 
-+    do not care
-+*/
-+
-+#include <linux/init.h>
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/errno.h>
-+#include <linux/i2c.h>
-+#include <linux/delay.h>
-+#include <linux/string.h>
-+#include <asm/coldfire.h>
-+#include <asm/mcfsim.h>
-+#include <asm/types.h>
-+#include <linux/platform_device.h>
-+#include "i2c-mcf.h"
-+
-+
-+static struct i2c_algorithm coldfire_algorithm = {
-+	/*.name		= "ColdFire I2C algorithm",
-+	.id		= I2C_ALGO_SMBUS,*/
-+	.smbus_xfer	= coldfire_i2c_access,
-+	.master_xfer    = coldfire_i2c_master,
-+	.functionality	= coldfire_func,
-+};
-+
-+
-+static struct i2c_adapter coldfire_adapter = {
-+	.owner		= THIS_MODULE,
-+	.class          = I2C_CLASS_HWMON,
-+	.algo		= &coldfire_algorithm,
-+	.name		= "ColdFire I2C adapter",
-+};
-+
-+
-+__u16 lastaddr;
-+__u16 lastop;
-+
-+static inline int coldfire_do_first_start(__u16 addr,__u16 flags)
-+{
-+	int err;
-+	/*
-+	 * Generate a stop and put the I2C module into slave mode
-+	 */
-+	*MCF_I2C_I2CR &= ~MCF_I2C_I2CR_MSTA;
-+
-+	/*
-+	 * Generate a new Start signal
-+	 */
-+	err = coldfire_i2c_start(flags & I2C_M_RD ? I2C_SMBUS_READ : I2C_SMBUS_WRITE,
-+				addr, FIRST_START);
-+	if(err) return err;
-+
-+	lastaddr = addr;
-+	lastop = flags & I2C_M_RD;	/* Ensure everything for new start */
-+	return 0;
-+}
-+
-+
-+/*
-+ *  read one byte data from the I2C bus
-+ */
-+static int coldfire_read_data(u8 * const rxData, const enum I2C_ACK_TYPE ackType) {
-+
-+	int timeout;
-+
-+	*MCF_I2C_I2CR &= ~MCF_I2C_I2CR_MTX;     	/* master receive mode*/
-+
-+	if (ackType == NACK)
-+		*MCF_I2C_I2CR |= MCF_I2C_I2CR_TXAK;     /* generate NA */
-+	else
-+		*MCF_I2C_I2CR &= ~MCF_I2C_I2CR_TXAK;    /* generate ACK */
-+
-+
-+	/* read data from the I2C bus */
-+	*rxData = *MCF_I2C_I2DR;
-+
-+	/* printk(">>> %s I2DR data is %.2x \n", __FUNCTION__, *rxData); */
-+
-+	/* wait for data transfer to complete */
-+	timeout = 500;
-+	while (timeout-- && !(*MCF_I2C_I2SR & MCF_I2C_I2SR_IIF))
-+		udelay(1);
-+	if (timeout <= 0)
-+		printk("%s - I2C IIF never set. Timeout is %d \n", __FUNCTION__,
-+			timeout);
-+
-+
-+	/* reset the interrupt bit */
-+	*MCF_I2C_I2SR &= ~MCF_I2C_I2SR_IIF;
-+
-+	if (timeout <= 0 )
-+		return -1;
-+	else
-+		return 0;
-+
-+};
-+
-+
-+/*
-+ *  write one byte data onto the I2C bus
-+ */
-+static int coldfire_write_data(const u8 txData) {
-+
-+	int timeout;
-+
-+	timeout = 500;
-+
-+	*MCF_I2C_I2CR |= MCF_I2C_I2CR_MTX;	/* I2C module into TX mode */
-+	*MCF_I2C_I2DR = txData;			/* send the data */
-+
-+	/* wait for data transfer to complete */
-+	/* rely on the interrupt handling bit */
-+	timeout = 500;
-+	while (timeout-- && !(*MCF_I2C_I2SR & MCF_I2C_I2SR_IIF))
-+		udelay(1);
-+	if (timeout <=0)
-+		printk("%s - I2C IIF never set. Timeout is %d \n", __FUNCTION__,
-+			timeout);
-+
-+
-+	/* reset the interrupt bit */
-+	*MCF_I2C_I2SR &= ~MCF_I2C_I2SR_IIF;
-+
-+	if (timeout <= 0 )
-+		return -1;
-+	else
-+		return 0;
-+
-+};
-+
-+
-+
-+
-+/*
-+ *  Generate I2C start or repeat start signal
-+ *  Combine the 7 bit target_address and the R/W bit and put it onto the I2C bus
-+ */
-+static int coldfire_i2c_start(const char read_write, const u16 target_address, const enum I2C_START_TYPE start_type) {
-+
-+	int timeout;
-+
-+	/* printk(">>> %s START TYPE %s \n", __FUNCTION__, 
-+		   start_type == FIRST_START ? "FIRST_START":"REPEAT_START");*/
-+
-+	*MCF_I2C_I2CR |= MCF_I2C_I2CR_IEN;
-+
-+	if (start_type == FIRST_START) {
-+		/* Make sure the I2C bus is idle */
-+		timeout = 500;		/* 500us timeout */
-+		while (timeout-- && (*MCF_I2C_I2SR & MCF_I2C_I2SR_IBB))
-+			udelay(1);
-+		if (timeout <= 0) {
-+			printk("%s - I2C bus always busy in the past 500us timeout is %d \n", __FUNCTION__, timeout);
-+			goto check_rc;
-+		}
-+		/* generate a START and put the I2C module into MASTER TX mode*/
-+		*MCF_I2C_I2CR |= (MCF_I2C_I2CR_MSTA | MCF_I2C_I2CR_MTX);
-+
-+		/* wait for bus busy to be set */
-+		timeout = 500;
-+		while (timeout-- && !(*MCF_I2C_I2SR & MCF_I2C_I2SR_IBB))
-+			udelay(1);
-+		if (timeout <= 0) {
-+			printk("%s - I2C bus is never busy after START. Timeout is %d \n", __FUNCTION__, timeout);
-+			goto check_rc;
-+		}
-+
-+	} else {
-+		/* this is repeat START */
-+		udelay(500);	/* need some delay before repeat start */
-+		*MCF_I2C_I2CR |= (MCF_I2C_I2CR_MSTA | MCF_I2C_I2CR_RSTA);
-+	}
-+
-+
-+	/* combine the R/W bit and the 7 bit target address and put it onto 
-+	   the I2C bus */
-+	*MCF_I2C_I2DR = ((target_address & 0x7F) << 1) | (read_write == I2C_SMBUS_WRITE ? 0x00 : 0x01);
-+
-+	/* wait for bus transfer to complete */
-+	/* when one byte transfer is completed, IIF set at the faling edge of 
-+	   the 9th clock */
-+	timeout = 500;
-+	while (timeout-- && !(*MCF_I2C_I2SR & MCF_I2C_I2SR_IIF))
-+		udelay(1);
-+	if (timeout <= 0)
-+		printk("%s - I2C IIF never set. Timeout is %d \n", __FUNCTION__, timeout);
-+
-+
-+check_rc:
-+	/* reset the interrupt bit */
-+	*MCF_I2C_I2SR &= ~MCF_I2C_I2SR_IIF;
-+
-+	if (timeout <= 0)
-+		return -1;
-+	else
-+		return 0;
-+};
-+
-+
-+/*
-+ *  5282 SMBUS supporting functions
-+ */
-+
-+static s32 coldfire_i2c_access(struct i2c_adapter *adap, u16 addr,
-+			      unsigned short flags, char read_write,
-+			      u8 command, int size, union i2c_smbus_data *data)
-+{
-+	int rc = 0;
-+	u8 rxData, tempRxData[2];
-+
-+	switch (size) {
-+		case I2C_SMBUS_QUICK:
-+			rc = coldfire_i2c_start(read_write, addr, FIRST_START); 	/* generate START */
-+                        break;
-+		case I2C_SMBUS_BYTE:
-+			rc = coldfire_i2c_start(read_write, addr, FIRST_START);
-+			*MCF_I2C_I2CR |= MCF_I2C_I2CR_TXAK;     /*generate NA */
-+			if (read_write == I2C_SMBUS_WRITE)
-+				rc += coldfire_write_data(command);
-+			else {
-+				coldfire_read_data(&rxData, NACK);/*dummy read*/
-+				rc += coldfire_read_data(&rxData, NACK);
-+				data->byte = rxData;
-+			}
-+			*MCF_I2C_I2CR &= ~MCF_I2C_I2CR_TXAK; /* reset ACK bit */
-+			break;
-+		case I2C_SMBUS_BYTE_DATA:
-+			rc = coldfire_i2c_start(I2C_SMBUS_WRITE, addr, FIRST_START);
-+			rc += coldfire_write_data(command);
-+			if (read_write == I2C_SMBUS_WRITE)
-+				rc += coldfire_write_data(data->byte);
-+			else {
-+				/* This is SMBus READ Byte Data Request. 
-+				   Perform REPEAT START */
-+				rc += coldfire_i2c_start(I2C_SMBUS_READ, addr, 
-+							 REPEAT_START);
-+				coldfire_read_data(&rxData, ACK);/* dummy read*/
-+				/* Disable Acknowledge, generate STOP after 
-+				   next byte transfer */
-+				rc += coldfire_read_data(&rxData, NACK);
-+				data->byte = rxData;
-+			}
-+			*MCF_I2C_I2CR &= ~MCF_I2C_I2CR_TXAK;/* reset to normal ACk */
-+			break;
-+		case I2C_SMBUS_PROC_CALL:
-+        	case I2C_SMBUS_WORD_DATA:
-+			dev_info(&adap->dev, "size = I2C_SMBUS_WORD_DATA \n");
-+			rc = coldfire_i2c_start(I2C_SMBUS_WRITE, addr, 
-+						FIRST_START);
-+			rc += coldfire_write_data(command);
-+			if (read_write == I2C_SMBUS_WRITE) {
-+				rc += coldfire_write_data(data->word & 0x00FF);
-+				rc += coldfire_write_data((data->word & 0x00FF) >> 8);
-+			} else {
-+				/* This is SMBUS READ WORD request. 
-+				   Peform REPEAT START */
-+				rc += coldfire_i2c_start(I2C_SMBUS_READ, addr, 
-+							 REPEAT_START);
-+				coldfire_read_data(&rxData, ACK);/* dummy read*/
-+				/* Disable Acknowledge, generate STOP after 
-+				   next byte transfer */
-+				/* read the MS byte from the device */
-+				rc += coldfire_read_data(&rxData, NACK);
-+				tempRxData[1] = rxData;
-+				/* read the LS byte from the device */
-+				rc += coldfire_read_data(&rxData, NACK);
-+				tempRxData[0] = rxData;
-+				/* the host driver expect little endian 
-+				   convention. Swap the byte */
-+				data->word = (tempRxData[0] << 8)|tempRxData[1];
-+			}
-+			*MCF_I2C_I2CR &= ~MCF_I2C_I2CR_TXAK;
-+			break;
-+		case I2C_SMBUS_BLOCK_DATA:
-+			/* Not done yet */
-+			break;
-+		default:
-+			printk("Unsupported I2C size \n");
-+			rc = -1;
-+			break;
-+	};
-+
-+	/* Generate a STOP and put I2C module into slave mode */
-+	*MCF_I2C_I2CR &= ~MCF_I2C_I2CR_MSTA;
-+
-+	/* restore interrupt */
-+	*MCF_I2C_I2CR |= MCF_I2C_I2CR_IIEN;
-+
-+	if (rc < 0)
-+		return -1;
-+	else
-+		return 0;
-+};
-+
-+
-+/*
-+ *  List the SMBUS functions supported by this I2C adaptor
-+ *  Also tell the I2C Subsystem that we are able of master_xfer()
-+ */
-+static u32 coldfire_func(struct i2c_adapter *adapter)
-+{
-+	return(I2C_FUNC_SMBUS_QUICK |
-+	       I2C_FUNC_SMBUS_BYTE |
-+	       I2C_FUNC_SMBUS_PROC_CALL |
-+	       I2C_FUNC_SMBUS_BYTE_DATA |
-+	       I2C_FUNC_SMBUS_WORD_DATA |
-+	       I2C_FUNC_I2C |
-+	       I2C_FUNC_SMBUS_BLOCK_DATA);
-+};
-+
-+static int coldfire_i2c_master(struct i2c_adapter *adap,struct i2c_msg *msgs,
-+	                       int num)
-+{
-+	u8 dummyRead;
-+	struct i2c_msg *p;
-+	int i, err = 0;
-+	int ic=0;
-+
-+	lastaddr = 0;
-+	lastop = 8;
-+
-+	/* disable the IRQ, we are doing polling */
-+	*MCF_I2C_I2CR &= ~MCF_I2C_I2CR_IIEN;
-+
-+	dev_dbg(&adap->dev,"Num of actions: %d\n", num);
-+
-+	for (i = 0; !err && i < num; i++) {
-+		p = &msgs[i];
-+
-+
-+		if (!p->len)
-+		{
-+			dev_dbg(&adap->dev,"p->len == 0!\n");
-+			continue;
-+		}
-+		/*
-+		 * Generate a new Start, if the target address differs from 
-+		 * the last target, generate a stop in this case first
-+		 */
-+		if(p->addr != lastaddr)
-+		{
-+			err = coldfire_do_first_start(p->addr,p->flags);
-+			if(err)
-+			{
-+				dev_dbg(&adap->dev,"First Init failed!\n");
-+				break;
-+			}
-+		}
-+
-+		else if((p->flags & I2C_M_RD)  != lastop)
-+		{
-+			/*
-+			 * If the Operational Mode changed, we need to do this 
-+			 * here ...
-+			 */
-+			dev_dbg(&adap->dev,"%s(): Direction changed, was: %d; is now: %d\n", __FUNCTION__, lastop, p->flags & I2C_M_RD);
-+
-+			/* Last op was an read, now it's write: complete stop 
-+			   and reinit */
-+			if (lastop & I2C_M_RD)
-+			{
-+				dev_dbg(&adap->dev,"%s(): The device is in read state, we must reset!\n", __FUNCTION__);
-+				if((err = coldfire_do_first_start(p->addr,p->flags)))
-+					break;
-+			}
-+			else
-+			{
-+				dev_dbg(&adap->dev,"%s(): We switchted to read mode\n",__FUNCTION__);
-+				if((err = coldfire_i2c_start((p->flags & I2C_M_RD) ? I2C_SMBUS_READ : I2C_SMBUS_WRITE,
-+				          p->addr, REPEAT_START)))
-+					break;
-+			}
-+
-+			lastop = p->flags & I2C_M_RD;	/* Save the last op */
-+		}
-+
-+		if (p->flags & I2C_M_RD)
-+		{
-+			/*
-+			 * When ever we get here, a new session was activated, 
-+			 * so read a dummy byte
-+			 */
-+			coldfire_read_data(&dummyRead, ACK);
-+			/*
-+			 * read p->len -1 bytes with ACK to the slave,
-+			 * read the last byte without the ACK, to inform him 
-+			 * about the stop afterwards
-+			 */
-+			ic = 0;
-+			while(!err && (ic < p->len-1 ))
-+			{
-+				err = coldfire_read_data(p->buf+ic, ACK );
-+				ic++;
-+			}
-+			if(!err)
-+				err = coldfire_read_data(p->buf+ic, NACK);
-+			dev_dbg(&coldfire_adapter.dev,"read: %2x\n",p->buf[ic]);
-+		}
-+		else
-+		{
-+			if(p->len == 2)
-+				dev_dbg(&coldfire_adapter.dev,"writing: 0x %2x %2x\n", p->buf[0], p->buf[1]);
-+
-+			/*
-+			 * Write data to the slave
-+			 */
-+			for(ic=0; !err && ic < p->len; ic++)
-+			{
-+				err = coldfire_write_data(p->buf[ic]);
-+				if(err)
-+				{
-+					dev_dbg(&coldfire_adapter.dev, "Failed to write data\n");
-+				}
-+			}
-+		}
-+	}
-+
-+	/*
-+	 * Put the device into slave mode to enable the STOP Generation 
-+	 * (the RTC needs this)
-+	 */
-+	*MCF_I2C_I2CR &= ~MCF_I2C_I2CR_MSTA;
-+
-+	*MCF_I2C_I2CR &= ~MCF_I2C_I2CR_TXAK;	/* reset the ACK bit */
-+
-+	/* restore interrupt */
-+	*MCF_I2C_I2CR |= MCF_I2C_I2CR_IIEN;
-+
-+	/* Return the number of messages processed, or the error code. */
-+	if (err == 0)
-+		err = num;
-+	return err;
-+}
-+
-+
-+/*
-+ *  Initalize the 5282 I2C module
-+ *  Disable the 5282 I2C interrupt capability. Just use callback
-+ */
-+
-+static int __init i2c_coldfire_init(void)
-+{
-+	int retval;
-+	u8  dummyRead;
-+
-+#if defined(CONFIG_M532x) || defined(CONFIG_M5445X)
-+	/*
-+	 * Initialize the GPIOs for I2C
-+	 */
-+	MCF_GPIO_PAR_FECI2C |= (0
-+    			    | MCF_GPIO_PAR_FECI2C_PAR_SDA(3)
-+    			    | MCF_GPIO_PAR_FECI2C_PAR_SCL(3));
-+#elif defined(CONFIG_M5253)
-+	{
-+	volatile u32 *reg;
-+	/* GPIO Bit 41 = SCL0, Bit 42 = SDA0 */
-+	reg = (volatile u32 *)(MCF_MBAR2 + MCFSIM2_GPIO1FUNC);
-+	*reg &= 0xFFFFF9FF;
-+	}
-+#else
-+	/* Initialize PASP0 and PASP1 to I2C functions, 5282 user guide 26-19 */
-+	/* Port AS Pin Assignment Register (PASPAR)		*/
-+	/*		PASPA1 = 11 = AS1 pin is I2C SDA	*/
-+	/*		PASPA0 = 11 = AS0 pin is I2C SCL	*/
-+	*MCF_GPIO_PASPAR |= 0x000F;		/* u16 declaration */
-+#endif
-+
-+
-+    	/* Set transmission frequency 0x15 = ~100kHz */
-+    	*MCF_I2C_I2FDR = 0x15;
-+
-+	/* set the 5282 I2C slave address though we never use it */
-+    	*MCF_I2C_I2ADR = 0x6A;
-+
-+    	/* Enable I2C module and if IBB is set, do the special initialzation */
-+	/* procedures as are documented at the 5282 User Guide page 24-11 */
-+    	*MCF_I2C_I2CR |= MCF_I2C_I2CR_IEN;
-+	if ((*MCF_I2C_I2SR & MCF_I2C_I2SR_IBB) == 1) {
-+		printk("%s - do special 5282 I2C init procedures \n", 
-+			__FUNCTION__);
-+		*MCF_I2C_I2CR = 0x00;
-+		*MCF_I2C_I2CR = 0xA0;
-+		dummyRead = *MCF_I2C_I2DR;
-+		*MCF_I2C_I2SR = 0x00;
-+		*MCF_I2C_I2CR = 0x00;
-+	}
-+
-+	/* default I2C mode is - slave and receive */
-+	*MCF_I2C_I2CR &= ~(MCF_I2C_I2CR_MSTA | MCF_I2C_I2CR_MTX);
-+
-+	coldfire_adapter.dev.parent = &platform_bus;
-+	retval = i2c_add_adapter(&coldfire_adapter);
-+
-+	if (retval < 0)
-+		printk("%s - return code is: %d \n", __FUNCTION__, retval);
-+
-+	return retval;
-+};
-+
-+
-+/*
-+ *  I2C module exit function
-+ */
-+
-+static void __exit i2c_coldfire_exit(void)
-+{
-+	/* disable I2C and Interrupt */
-+	*MCF_I2C_I2CR &= ~(MCF_I2C_I2CR_IEN | MCF_I2C_I2CR_IIEN);
-+	i2c_del_adapter(&coldfire_adapter);
-+
-+};
-+
-+
-+MODULE_AUTHOR("Derek CL Cheung <derek.cheung@sympatico.ca>");
-+MODULE_DESCRIPTION("MCF5282 I2C adaptor");
-+MODULE_LICENSE("GPL");
-+
-+module_init(i2c_coldfire_init);
-+module_exit(i2c_coldfire_exit);
---- /dev/null
-+++ b/drivers/i2c/busses/i2c-mcf.h
-@@ -0,0 +1,75 @@
-+/*
-+    i2c-mcf.h - header file for i2c-mcf.c
-+
-+    Copyright (c) 2005, Derek CL Cheung <derek.cheung@sympatico.ca>
-+                                        <http://www3.sympatico.ca/derek.cheung>
-+
-+    Copyright (c) 2006-2007, emlix
-+			Sebastian Hess <sh@emlix.com>
-+
-+    Copyright (c) 2006-2007 Freescale Semiconductor, Inc
-+			Yaroslav Vinogradov <yaroslav.vinogradov@freescale.com>
-+			Matt Waddel <Matt.Waddel@freescale.com>
-+
-+    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.
-+
-+    This program is distributed in the hope that it will be useful,
-+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+    GNU General Public License for more details.
-+
-+    You should have received a copy of the GNU General Public License
-+    along with this program; if not, write to the Free Software
-+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+
-+    Changes:
-+    v0.1	26 March 2005
-+        	Initial Release - developed on uClinux with 2.6.9 kernel
-+    v0.2	29 May 2006
-+		Modified to be more generic and added support for
-+		i2c_master_xfer
-+*/
-+
-+
-+#ifndef __I2C_MCF_H__
-+#define __I2C_MCF_H__
-+
-+enum I2C_START_TYPE { FIRST_START, REPEAT_START };
-+enum I2C_ACK_TYPE { ACK, NACK};
-+
-+/* Function prototypes */
-+static u32 coldfire_func(struct i2c_adapter *adapter);
-+static s32 coldfire_i2c_access(struct i2c_adapter *adap, u16 address,
-+                              unsigned short flags, char read_write,
-+                              u8 command, int size, union i2c_smbus_data *data);
-+static int coldfire_write_data(const u8 data);
-+static int coldfire_i2c_start(const char read_write, const u16 target_address, const enum I2C_START_TYPE i2c_start);
-+static int coldfire_read_data(u8 * const rxData, const enum I2C_ACK_TYPE ackType);
-+static int coldfire_i2c_master(struct i2c_adapter *adap,struct i2c_msg *msgs, int num);
-+void dumpReg(char *, u16 addr, u8 data);
-+
-+#define MCF_I2C_I2ADR_ADDR(x)	(((x)&0x7F)<<0x01)
-+#define MCF_I2C_I2FDR_IC(x)	(((x)&0x3F))
-+
-+/* I2C Control Register */
-+#define MCF_I2C_I2CR_IEN	(0x80)	/* I2C enable */
-+#define MCF_I2C_I2CR_IIEN	(0x40)	/* interrupt enable */
-+#define MCF_I2C_I2CR_MSTA	(0x20)	/* master/slave mode */
-+#define MCF_I2C_I2CR_MTX	(0x10)	/* transmit/receive mode */
-+#define MCF_I2C_I2CR_TXAK	(0x08)	/* transmit acknowledge enable */
-+#define MCF_I2C_I2CR_RSTA	(0x04)	/* repeat start */
-+
-+/* I2C Status Register */
-+#define MCF_I2C_I2SR_ICF	(0x80)	/* data transfer bit */
-+#define MCF_I2C_I2SR_IAAS	(0x40)	/* I2C addressed as a slave */
-+#define MCF_I2C_I2SR_IBB	(0x20)	/* I2C bus busy */
-+#define MCF_I2C_I2SR_IAL	(0x10)	/* aribitration lost */
-+#define MCF_I2C_I2SR_SRW	(0x04)	/* slave read/write */
-+#define MCF_I2C_I2SR_IIF	(0x02)	/* I2C interrupt */
-+#define MCF_I2C_I2SR_RXAK	(0x01)	/* received acknowledge */
-+
-+/********************************************************************/
-+#endif /*  __I2C_MCF_H__ */
diff --git a/target/linux/coldfire/patches/072-mcfv4e_disable_irq_nosync.patch b/target/linux/coldfire/patches/072-mcfv4e_disable_irq_nosync.patch
deleted file mode 100644
index c93c6f7c2..000000000
--- a/target/linux/coldfire/patches/072-mcfv4e_disable_irq_nosync.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 69446dbc7af1fddf00f3ad0629008dd6875704a7 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Wed, 2 Jul 2008 16:03:56 -0600
-Subject: [PATCH] Add disable_irq_nosync alias to disable_irq.
-
-LTIBName: mcfv4e-disable-irq-nosync
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/coldfire/ints.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
---- a/arch/m68k/coldfire/ints.c
-+++ b/arch/m68k/coldfire/ints.c
-@@ -317,6 +317,10 @@ void disable_irq(unsigned int irq)
- }
- EXPORT_SYMBOL(disable_irq);
- 
-+void disable_irq_nosync(unsigned int irq) __attribute__((alias("disable_irq")));
-+EXPORT_SYMBOL(disable_irq_nosync);
-+
-+
- unsigned long probe_irq_on(void)
- {
- 	return 0;
diff --git a/target/linux/coldfire/patches/073-mcfv4e_uboot_bootargs.patch b/target/linux/coldfire/patches/073-mcfv4e_uboot_bootargs.patch
deleted file mode 100644
index 34d1e3b30..000000000
--- a/target/linux/coldfire/patches/073-mcfv4e_uboot_bootargs.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 39929365081d5aa7c311ee8325c7f1a0ffb88a76 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Mon, 7 Jul 2008 23:37:30 -0600
-Subject: [PATCH] Enable uboot bootargs.
-
-LTIBName: mcfv4e-uboot-bootargs
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/coldfire/config.c |    5 -----
- 1 files changed, 0 insertions(+), 5 deletions(-)
-
---- a/arch/m68k/coldfire/config.c
-+++ b/arch/m68k/coldfire/config.c
-@@ -196,7 +196,6 @@ asmlinkage void __init cf_early_init(voi
- 	m68k_memory[m68k_num_memory].addr = CONFIG_SDRAM_BASE;
- 	m68k_memory[m68k_num_memory++].size = CONFIG_SDRAM_SIZE;
- 
--#if 0
- 	if (!uboot_commandline(m68k_command_line)) {
- #if defined(CONFIG_BOOTPARAM)
- 		strncpy(m68k_command_line, CONFIG_BOOTPARAM_STRING, CL_SIZE-1);
-@@ -204,10 +203,6 @@ asmlinkage void __init cf_early_init(voi
- 		strcpy(m68k_command_line, DEFAULT_COMMAND_LINE);
- #endif
- 	}
--#endif
--/* JKM -- temporary! */
--strcpy(m68k_command_line, DEFAULT_COMMAND_LINE);
--/* JKM -- temporary! */
- 
- #if defined(CONFIG_BLK_DEV_INITRD)
- 	/* add initrd image */
diff --git a/target/linux/coldfire/patches/074-mcfv4e_except_vector_fix.patch b/target/linux/coldfire/patches/074-mcfv4e_except_vector_fix.patch
deleted file mode 100644
index 9956ba71b..000000000
--- a/target/linux/coldfire/patches/074-mcfv4e_except_vector_fix.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 09895934aaddf4f08345798068b41344068c7b56 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Tue, 8 Jul 2008 00:59:38 -0600
-Subject: [PATCH] Fix exception handling to properly get vector.
-
-LTIBName: mcfv4e-except-vector-fix
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/coldfire/traps.c |   11 ++++++-----
- 1 files changed, 6 insertions(+), 5 deletions(-)
-
---- a/arch/m68k/coldfire/traps.c
-+++ b/arch/m68k/coldfire/traps.c
-@@ -7,6 +7,7 @@
-  *  68040 fixes by Martin Apel
-  *  68060 fixes by Roman Hodek
-  *  68060 fixes by Jesper Skov
-+ *  Coldfire fixes by Kurt Mahan
-  *
-  * This file is subject to the terms and conditions of the GNU General Public
-  * License.  See the file COPYING in the main directory of this archive
-@@ -288,13 +289,13 @@ void show_stack(struct task_struct *task
- void bad_super_trap(struct frame *fp)
- {
- 	console_verbose();
--	if (fp->ptregs.vector < 4*sizeof(vec_names)/sizeof(vec_names[0]))
-+	if (fp->ptregs.vector < sizeof(vec_names)/sizeof(vec_names[0]))
- 		printk(KERN_WARNING "*** %s ***   FORMAT=%X\n",
--			vec_names[(fp->ptregs.vector) >> 2],
-+			vec_names[fp->ptregs.vector],
- 			fp->ptregs.format);
- 	else
- 		printk(KERN_WARNING "*** Exception %d ***   FORMAT=%X\n",
--			(fp->ptregs.vector) >> 2,
-+			fp->ptregs.vector,
- 			fp->ptregs.format);
- 	printk(KERN_WARNING "Current process id is %d\n", current->pid);
- 	die_if_kernel("BAD KERNEL TRAP", &fp->ptregs, 0);
-@@ -306,7 +307,7 @@ asmlinkage void trap_c(struct frame *fp)
- 	siginfo_t info;
- 
- 	if (fp->ptregs.sr & PS_S) {
--		if ((fp->ptregs.vector >> 2) == VEC_TRACE) {
-+		if (fp->ptregs.vector == VEC_TRACE) {
- 			/* traced a trapping instruction */
- 			current->ptrace |= PT_DTRACE;
- 		} else
-@@ -315,7 +316,7 @@ asmlinkage void trap_c(struct frame *fp)
- 	}
- 
- 	/* send the appropriate signal to the user program */
--	switch ((fp->ptregs.vector) >> 2) {
-+	switch (fp->ptregs.vector) {
- 	case VEC_ADDRERR:
- 		info.si_code = BUS_ADRALN;
- 		sig = SIGBUS;
diff --git a/target/linux/coldfire/patches/075-mcfv4e_watchdog.patch b/target/linux/coldfire/patches/075-mcfv4e_watchdog.patch
deleted file mode 100644
index 5b865bdd3..000000000
--- a/target/linux/coldfire/patches/075-mcfv4e_watchdog.patch
+++ /dev/null
@@ -1,265 +0,0 @@
-From 3c6c80a04d6ca99c4f9fbb5e4f279bd644b2df48 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Tue, 8 Jul 2008 14:10:46 -0600
-Subject: [PATCH] Add Coldfire Watchdog support.
-
-LTIBName: mcfv4e-watchdog
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- drivers/watchdog/Kconfig   |    9 ++
- drivers/watchdog/Makefile  |    1 +
- drivers/watchdog/mcf_wdt.c |  220 ++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 230 insertions(+), 0 deletions(-)
- create mode 100644 drivers/watchdog/mcf_wdt.c
-
---- a/drivers/watchdog/Kconfig
-+++ b/drivers/watchdog/Kconfig
-@@ -672,6 +672,15 @@ config TXX9_WDT
- 
- # PARISC Architecture
- 
-+# ColdFire Architecture
-+
-+config COLDFIRE_WATCHDOG
-+	tristate "ColdFire watchdog support"
-+	depends on WATCHDOG
-+	help
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called softdog.
-+
- # POWERPC Architecture
- 
- config MPC5200_WDT
---- a/drivers/watchdog/Makefile
-+++ b/drivers/watchdog/Makefile
-@@ -86,6 +86,7 @@ obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc
- # M32R Architecture
- 
- # M68K Architecture
-+obj-$(CONFIG_COLDFIRE_WATCHDOG) += mcf_wdt.o
- 
- # M68KNOMMU Architecture
- 
---- /dev/null
-+++ b/drivers/watchdog/mcf_wdt.c
-@@ -0,0 +1,220 @@
-+/*
-+ * drivers/watchdog/mcf_wdt.c
-+ *
-+ * Watchdog driver for ColdFire processors
-+ *
-+ * Adapted from the IXP4xx watchdog driver.
-+ * The original version carries these notices:
-+ *
-+ * Author: Deepak Saxena <dsaxena@plexity.net>
-+ *
-+ * Copyright 2004 (c) MontaVista, Software, Inc.
-+ * Based on sa1100 driver, Copyright (C) 2000 Oleg Drokin <green@crimea.edu>
-+ *
-+ * This file is licensed under  the terms of the GNU General Public
-+ * License version 2. This program is licensed "as is" without any
-+ * warranty of any kind, whether express or implied.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/moduleparam.h>
-+#include <linux/types.h>
-+#include <linux/kernel.h>
-+#include <linux/fs.h>
-+#include <linux/miscdevice.h>
-+#include <linux/watchdog.h>
-+#include <linux/init.h>
-+#include <linux/bitops.h>
-+
-+#include <asm-m68k/uaccess.h>
-+#include <asm-m68k/coldfire.h>
-+#include <asm-m68k/m5485gpt.h>
-+
-+static int nowayout;
-+static unsigned int heartbeat = 30;	/* (secs) Default is 0.5 minute */
-+static unsigned long wdt_status;
-+
-+#define	WDT_IN_USE		0
-+#define	WDT_OK_TO_CLOSE		1
-+
-+static unsigned long wdt_tick_rate;
-+
-+static void
-+wdt_enable(void)
-+{
-+	MCF_GPT_GMS0 = 0;
-+	MCF_GPT_GCIR0 =  MCF_GPT_GCIR_PRE(heartbeat*wdt_tick_rate) |
-+				MCF_GPT_GCIR_CNT(0xffff);
-+	MCF_GPT_GMS0 = MCF_GPT_GMS_OCPW(0xA5) | MCF_GPT_GMS_WDEN |
-+				MCF_GPT_GMS_CE | MCF_GPT_GMS_TMS_GPIO;
-+}
-+
-+static void
-+wdt_disable(void)
-+{
-+	MCF_GPT_GMS0 = 0;
-+}
-+
-+static void
-+wdt_keepalive(void)
-+{
-+	MCF_GPT_GMS0 = MCF_GPT_GMS_OCPW(0xA5) | MCF_GPT_GMS0;
-+}
-+
-+static int
-+mcf_wdt_open(struct inode *inode, struct file *file)
-+{
-+	if (test_and_set_bit(WDT_IN_USE, &wdt_status))
-+		return -EBUSY;
-+
-+	clear_bit(WDT_OK_TO_CLOSE, &wdt_status);
-+
-+	wdt_enable();
-+
-+	return nonseekable_open(inode, file);
-+}
-+
-+static ssize_t
-+mcf_wdt_write(struct file *file, const char *data, size_t len, loff_t *ppos)
-+{
-+	if (len) {
-+		if (!nowayout) {
-+			size_t i;
-+
-+			clear_bit(WDT_OK_TO_CLOSE, &wdt_status);
-+
-+			for (i = 0; i != len; i++) {
-+				char c;
-+
-+				if (get_user(c, data + i))
-+					return -EFAULT;
-+				if (c == 'V')
-+					set_bit(WDT_OK_TO_CLOSE, &wdt_status);
-+			}
-+		}
-+		wdt_keepalive();
-+	}
-+
-+	return len;
-+}
-+
-+
-+static struct watchdog_info ident = {
-+	.options	= WDIOF_MAGICCLOSE | WDIOF_SETTIMEOUT |
-+				WDIOF_KEEPALIVEPING,
-+	.identity	= "Coldfire Watchdog",
-+};
-+
-+static int
-+mcf_wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
-+			unsigned long arg)
-+{
-+	int ret = -ENOIOCTLCMD;
-+	int time;
-+
-+	switch (cmd) {
-+	case WDIOC_GETSUPPORT:
-+		ret = copy_to_user((struct watchdog_info *)arg, &ident,
-+				   sizeof(ident)) ? -EFAULT : 0;
-+		break;
-+
-+	case WDIOC_GETSTATUS:
-+		ret = put_user(0, (int *)arg);
-+		break;
-+
-+	case WDIOC_GETBOOTSTATUS:
-+		ret = put_user(0, (int *)arg);
-+		break;
-+
-+	case WDIOC_SETTIMEOUT:
-+		ret = get_user(time, (int *)arg);
-+		if (ret)
-+			break;
-+
-+		if (time <= 0 || time > 30) {
-+			ret = -EINVAL;
-+			break;
-+		}
-+
-+		heartbeat = time;
-+		wdt_enable();
-+		/* Fall through */
-+
-+	case WDIOC_GETTIMEOUT:
-+		ret = put_user(heartbeat, (int *)arg);
-+		break;
-+
-+	case WDIOC_KEEPALIVE:
-+		wdt_keepalive();
-+		ret = 0;
-+		break;
-+	}
-+
-+	return ret;
-+}
-+
-+static int
-+mcf_wdt_release(struct inode *inode, struct file *file)
-+{
-+	if (test_bit(WDT_OK_TO_CLOSE, &wdt_status)) {
-+		wdt_disable();
-+	} else {
-+		printk(KERN_CRIT "WATCHDOG: Device closed unexpectdly - "
-+					"timer will not stop\n");
-+	}
-+
-+	clear_bit(WDT_IN_USE, &wdt_status);
-+	clear_bit(WDT_OK_TO_CLOSE, &wdt_status);
-+
-+	return 0;
-+}
-+
-+
-+static struct file_operations mcf_wdt_fops = {
-+	.owner		= THIS_MODULE,
-+	.llseek		= no_llseek,
-+	.write		= mcf_wdt_write,
-+	.ioctl		= mcf_wdt_ioctl,
-+	.open		= mcf_wdt_open,
-+	.release	= mcf_wdt_release,
-+};
-+
-+static struct miscdevice mcf_wdt_miscdev = {
-+	.minor		= WATCHDOG_MINOR,
-+	.name		= "watchdog",
-+	.fops		= &mcf_wdt_fops,
-+};
-+
-+static int __init mcf_wdt_init(void)
-+{
-+	wdt_tick_rate = MCF_BUSCLK/0xffff;
-+#ifdef CONFIG_WATCHDOG_NOWAYOUT
-+	nowayout = 1;
-+#else
-+	nowayout = 0;
-+#endif
-+	printk("ColdFire watchdog driver is loaded.\n");
-+
-+	return misc_register(&mcf_wdt_miscdev);
-+}
-+
-+static void __exit mcf_wdt_exit(void)
-+{
-+	misc_deregister(&mcf_wdt_miscdev);
-+}
-+
-+module_init(mcf_wdt_init);
-+module_exit(mcf_wdt_exit);
-+
-+MODULE_AUTHOR("Deepak Saxena");
-+MODULE_DESCRIPTION("ColdFire Watchdog");
-+
-+module_param(heartbeat, int, 0);
-+MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds (default 60s)");
-+
-+module_param(nowayout, int, 0);
-+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started");
-+
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
-+
diff --git a/target/linux/coldfire/patches/076-mcfv4e_irda.patch b/target/linux/coldfire/patches/076-mcfv4e_irda.patch
deleted file mode 100644
index 0452a47b2..000000000
--- a/target/linux/coldfire/patches/076-mcfv4e_irda.patch
+++ /dev/null
@@ -1,237 +0,0 @@
-From 5f645d0668b469c4738fe1e9d3994287a519d0f3 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Tue, 8 Jul 2008 15:57:47 -0600
-Subject: [PATCH] Add Coldfire IRDA support in serial driver.
-
-LTIBName: mcfv4e-irda
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
-Signed-off-by: Huan, Wang <b18965@freescale.com>
----
- drivers/serial/Kconfig     |    6 ++
- drivers/serial/mcfserial.c |  110 ++++++++++++++++++++++++++++++++++++++++++--
- net/irda/irlap.c           |    2 +-
- 3 files changed, 113 insertions(+), 5 deletions(-)
-
---- a/drivers/serial/Kconfig
-+++ b/drivers/serial/Kconfig
-@@ -979,6 +979,12 @@ config SERIAL_COLDFIRE
- 	  This driver supports the built-in serial ports of the Motorola ColdFire
- 	  family of CPUs.
- 
-+config SERIAL_COLDFIRE_IRDA
-+	bool "ColdFire IRDA support"
-+	depends on SERIAL_COLDFIRE
-+	help
-+	  This driver supports IRDA on the Motorola ColdFire.
-+
- config SERIAL_MCF
- 	bool "Coldfire serial support (new style driver)"
- 	depends on COLDFIRE
---- a/drivers/serial/mcfserial.c
-+++ b/drivers/serial/mcfserial.c
-@@ -109,6 +109,10 @@ static struct tty_driver *mcfrs_serial_d
- #define	IRQBASE	73
- #endif
- 
-+#ifdef CONFIG_SERIAL_COLDFIRE_IRDA
-+#define SERIAL_IRDA_LINE (2)
-+#endif
-+
- /*
-  *	Configuration table, UARTs to look for at startup.
-  */
-@@ -393,6 +397,9 @@ static inline void receive_chars(struct 
- static inline void transmit_chars(struct mcf_serial *info)
- {
- 	volatile unsigned char	*uartp;
-+#ifdef CONFIG_SERIAL_COLDFIRE_IRDA
-+	int i;
-+#endif
- 
- 	uartp = info->addr;
- 
-@@ -404,13 +411,36 @@ static inline void transmit_chars(struct
- 	}
- 
- 	if ((info->xmit_cnt <= 0) || info->tty->stopped) {
-+#ifdef CONFIG_SERIAL_COLDFIRE_IRDA
-+		if (info->line == SERIAL_IRDA_LINE) {
-+			/* Enable receiver for IRDA */
-+			uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETRX;
-+			/* reset RX */
-+			uartp[MCFUART_UCR] = MCFUART_UCR_TXENABLE | MCFUART_UCR_RXENABLE;
-+		}
-+#endif
- 		info->imr &= ~MCFUART_UIR_TXREADY;
- 		uartp[MCFUART_UIMR] = info->imr;
- 		return;
- 	}
- 
- 	while (uartp[MCFUART_USR] & MCFUART_USR_TXREADY) {
-+#ifdef CONFIG_SERIAL_COLDFIRE_IRDA
-+		if (info->line == SERIAL_IRDA_LINE) {
-+			while (!(uartp[MCFUART_USR] & MCFUART_USR_TXEMPTY));
-+			i = 0;
-+			/* delay for settle */
-+#if defined(CONFIG_M548X)
-+			udelay(1);
-+#elif defined(CONFIG_M547X)
-+			udelay(2);
-+#else
-+			while (i++ < 25000) udelay(1);
-+#endif
-+		}
-+#endif
- 		uartp[MCFUART_UTB] = info->xmit_buf[info->xmit_tail++];
-+
- 		info->xmit_tail = info->xmit_tail & (SERIAL_XMIT_SIZE-1);
- 		info->stats.tx++;
- 		if (--info->xmit_cnt <= 0)
-@@ -567,6 +597,28 @@ static int startup(struct mcf_serial * i
- 	 */
- 	mcfrs_change_speed(info);
- 
-+#ifdef CONFIG_SERIAL_COLDFIRE_IRDA
-+	if (info->line == SERIAL_IRDA_LINE) {
-+		/* Put PSC in IrDA mode */
-+		MCF_PSC_SICR(info->line) = MCF_PSC_SICR_SIM_SIR;
-+
-+		/* Set pulse width to 1.6 uS */
-+		MCF_PSC_IRSDR(info->line) = (uint8_t)
-+					    (16 * (CONFIG_MCFCLK / 10000000));
-+		MCF_PSC_IRCR1(info->line) = MCF_PSC_IRCR1_SPUL;
-+		MCF_PSC_IRCR2(info->line) = 0;
-+
-+		/* Enable RTS to send */
-+		MCF_PSC_OPSET(info->line) = MCF_PSC_OPSET_RTS;
-+
-+		/* Setup FIFO Alarms */
-+		MCF_PSC_RFAR(info->line) = MCF_PSC_RFAR_ALARM(248);
-+		MCF_PSC_TFAR(info->line) = MCF_PSC_TFAR_ALARM(248);
-+
-+		MCF_PSC_RFCR(info->line) = MCF_PSC_RFCR_FRMEN | MCF_PSC_RFCR_GR(4);
-+		MCF_PSC_TFCR(info->line) = MCF_PSC_TFCR_FRMEN | MCF_PSC_RFCR_GR(4);
-+	}
-+#endif
- 	/*
- 	 * Lastly enable the UART transmitter and receiver, and
- 	 * interrupt enables.
-@@ -588,10 +640,20 @@ static void shutdown(struct mcf_serial *
- {
- 	volatile unsigned char	*uartp;
- 	unsigned long		flags;
-+#ifdef CONFIG_SERIAL_COLDFIRE_IRDA
-+	unsigned long 		delay_counter = 0;
-+#endif
- 
- 	if (!(info->flags & ASYNC_INITIALIZED))
- 		return;
--
-+#ifdef CONFIG_SERIAL_COLDFIRE_IRDA
-+	uartp = (volatile unsigned char *) info->addr;
-+	while (!(uartp[MCFUART_USR] & MCFUART_USR_TXEMPTY)) {
-+		if(delay_counter++ > 25000)
-+			break;
-+		udelay(10);
-+	}
-+#endif
- #ifdef SERIAL_DEBUG_OPEN
- 	printk("Shutting down serial port %d (irq %d)....\n", info->line,
- 	       info->irq);
-@@ -820,10 +882,19 @@ static int mcfrs_write(struct tty_struct
- 
- 	local_irq_disable();
- 	uartp = info->addr;
-+
-+#ifdef CONFIG_SERIAL_COLDFIRE_IRDA
-+	if (info->line == SERIAL_IRDA_LINE) {
-+		/* Disable IRDA receiver*/
-+		uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETRX;    /* reset RX */
-+		uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETTX;    /* reset TX */
-+
-+		uartp[MCFUART_UCR] = MCFUART_UCR_TXENABLE;
-+	}
-+#endif
- 	info->imr |= MCFUART_UIR_TXREADY;
- 	uartp[MCFUART_UIMR] = info->imr;
- 	local_irq_restore(flags);
--
- 	return total;
- }
- 
-@@ -884,9 +955,21 @@ static void mcfrs_throttle(struct tty_st
- 
- 	if (serial_paranoia_check(info, tty->name, "mcfrs_throttle"))
- 		return;
--	
-+#ifdef CONFIG_SERIAL_COLDFIRE_IRDA
-+	if (I_IXOFF(tty)) {
-+		/* Force STOP_CHAR (xoff) out */
-+		volatile unsigned char	*uartp;
-+		unsigned long		flags;
-+		uartp = (volatile unsigned char *) info->addr;
-+		local_irq_save(flags);
-+		info->imr |= MCFUART_UIR_TXREADY;
-+		uartp[MCFUART_UIMR] = info->imr;
-+		local_irq_restore(flags);
-+	}
-+#else
- 	if (I_IXOFF(tty))
- 		info->x_char = STOP_CHAR(tty);
-+#endif
- 
- 	/* Turn off RTS line (do this atomic) */
- }
-@@ -907,8 +990,22 @@ static void mcfrs_unthrottle(struct tty_
- 	if (I_IXOFF(tty)) {
- 		if (info->x_char)
- 			info->x_char = 0;
-+#ifdef CONFIG_SERIAL_COLDFIRE_IRDA
-+		else {
-+			/* Force START_CHAR (xon) out */
-+			volatile unsigned char	*uartp;
-+			unsigned long		flags;
-+			info->x_char = START_CHAR(tty);
-+			uartp = (volatile unsigned char *) info->addr;
-+			local_irq_save(flags);
-+			info->imr |= MCFUART_UIR_TXREADY;
-+			uartp[MCFUART_UIMR] = info->imr;
-+			local_irq_restore(flags);
-+		}
-+#else
- 		else
- 			info->x_char = START_CHAR(tty);
-+#endif
- 	}
- 
- 	/* Assert RTS line (do this atomic) */
-@@ -1156,12 +1253,17 @@ static int mcfrs_ioctl(struct tty_struct
- static void mcfrs_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
- {
- 	struct mcf_serial *info = (struct mcf_serial *)tty->driver_data;
-+#ifdef CONFIG_SERIAL_COLDFIRE_IRDA
-+	int i = 0;	/* hush GCC */
-+#endif
- 
- 	if (tty->termios->c_cflag == old_termios->c_cflag)
- 		return;
- 
-+#ifdef CONFIG_SERIAL_COLDFIRE_IRDA
-+	while (i++ < 35000) udelay(1);
-+#endif
- 	mcfrs_change_speed(info);
--
- 	if ((old_termios->c_cflag & CRTSCTS) &&
- 	    !(tty->termios->c_cflag & CRTSCTS)) {
- 		tty->hw_stopped = 0;
---- a/net/irda/irlap.c
-+++ b/net/irda/irlap.c
-@@ -627,7 +627,7 @@ void irlap_status_indication(struct irla
- {
- 	switch (quality_of_link) {
- 	case STATUS_NO_ACTIVITY:
--		IRDA_MESSAGE("IrLAP, no activity on link!\n");
-+		/* IRDA_MESSAGE("IrLAP, no activity on link!\n"); */
- 		break;
- 	case STATUS_NOISY:
- 		IRDA_MESSAGE("IrLAP, noisy link!\n");
diff --git a/target/linux/coldfire/patches/077-mcfv4e_flexcan.patch b/target/linux/coldfire/patches/077-mcfv4e_flexcan.patch
deleted file mode 100644
index ae7aefd64..000000000
--- a/target/linux/coldfire/patches/077-mcfv4e_flexcan.patch
+++ /dev/null
@@ -1,1376 +0,0 @@
-From c44de58d0972d05851512ba8cbd928b7adef5187 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Tue, 8 Jul 2008 17:11:33 -0600
-Subject: [PATCH] Add FlexCAN support.
-
-LTIBName: mcfv4e-flexcan
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
-Signed-off-by: Huan Wang <b18965@freescale.com>
----
- drivers/net/can/Kconfig               |   13 ++
- drivers/net/can/Makefile              |    1 +
- drivers/net/can/flexcan/Makefile      |    5 +
- drivers/net/can/flexcan/flexcan.c     |  378 +++++++++++++++++++++++++++++++++
- drivers/net/can/flexcan/flexcan.h     |  148 +++++++++++++
- drivers/net/can/flexcan/mcf548x_can.c |  213 ++++++++++++++++++
- include/asm-m68k/m5485sim.h           |    2 +
- include/linux/can/dev.h               |   62 ++++++
- include/linux/can/ioctl.h             |  152 +++++++++++++
- include/linux/can/version.h           |   22 ++
- net/can/Makefile                      |    3 +
- net/can/dev.c                         |  292 +++++++++++++++++++++++++
- 12 files changed, 1291 insertions(+), 0 deletions(-)
- create mode 100644 drivers/net/can/flexcan/Makefile
- create mode 100644 drivers/net/can/flexcan/flexcan.c
- create mode 100644 drivers/net/can/flexcan/flexcan.h
- create mode 100644 drivers/net/can/flexcan/mcf548x_can.c
- create mode 100644 include/linux/can/dev.h
- create mode 100644 include/linux/can/ioctl.h
- create mode 100644 include/linux/can/version.h
- create mode 100644 net/can/dev.c
-
---- a/drivers/net/can/Kconfig
-+++ b/drivers/net/can/Kconfig
-@@ -12,6 +12,19 @@ config CAN_VCAN
- 	  This driver can also be built as a module.  If so, the module
- 	  will be called vcan.
- 
-+config CAN_FLEXCAN
-+	tristate "Support for Freescale FLEXCAN based chips"
-+	depends on CAN && (PPC || M68K || M68KNOMMU)
-+	---help---
-+	  Say Y here if you want to support for Freescale FlexCAN.
-+
-+config CAN_MCF547X_8X
-+	tristate "Freescale MCF547X/MCF548X onboard CAN controller"
-+	depends on CAN_FLEXCAN && (M547X || M548X)
-+	---help---
-+	  Say Y here if you want to support for Freescale MCF547x/MCF548x
-+	  onboard dualCAN controller.
-+
- config CAN_DEBUG_DEVICES
- 	bool "CAN devices debugging messages"
- 	depends on CAN
---- a/drivers/net/can/Makefile
-+++ b/drivers/net/can/Makefile
-@@ -3,3 +3,4 @@
- #
- 
- obj-$(CONFIG_CAN_VCAN)		+= vcan.o
-+obj-$(CONFIG_CAN_FLEXCAN)	+= flexcan/
---- /dev/null
-+++ b/drivers/net/can/flexcan/Makefile
-@@ -0,0 +1,5 @@
-+
-+obj-$(CONFIG_CAN_MCF547X_8X)	+= flexcan-mcf548x.o
-+
-+flexcan-mcf548x-objs	:= flexcan.o mcf548x_can.o
-+
---- /dev/null
-+++ b/drivers/net/can/flexcan/flexcan.c
-@@ -0,0 +1,378 @@
-+/*
-+ * flexcan.c
-+ *
-+ * DESCRIPTION:
-+ *  CAN bus driver for the alone generic (as possible as) FLEXCAN controller.
-+ *
-+ * AUTHOR:
-+ *  Andrey Volkov <avolkov@varma-el.com>
-+ *
-+ * COPYRIGHT:
-+ *  2005-2006, Varma Electronics Oy
-+ *
-+ * LICENCE:
-+ *  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.
-+ *
-+ *  This program is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with this program; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ *  HISTORY:
-+ *  	2008-06-23 Support for MCF548x's FlexCAN
-+ * 			Huan, Wang <b18965@freescale.com>
-+ */
-+
-+
-+
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/interrupt.h>
-+#include <linux/delay.h>
-+#include <linux/netdevice.h>
-+#include <linux/if_arp.h>
-+#include <linux/if_ether.h>
-+#include <linux/can.h>
-+#include <linux/list.h>
-+#include <linux/io.h>
-+
-+#include <linux/can/dev.h>
-+#include <linux/can/error.h>
-+#include "flexcan.h"
-+#include <asm/coldfire.h>
-+#include <asm/m5485sim.h>
-+#include <linux/can/version.h>	/* for RCSID. Removed by mkpatch script */
-+RCSID("$Id$");
-+
-+struct flexcan_priv {
-+	struct can_priv can;
-+	volatile unsigned long flags;
-+	u8 shadow_statflg;
-+	u8 shadow_canrier;
-+	u8 cur_pri;
-+	u8 tx_active;
-+
-+	struct list_head tx_head;
-+	struct napi_struct napi;
-+	struct net_device *dev;
-+};
-+
-+
-+static int flexcan_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
-+{
-+	struct can_frame *frame = (struct can_frame *)skb->data;
-+	struct flexcan_regs *regs = (struct flexcan_regs *)dev->base_addr;
-+	int i, len;
-+	int txbuf = 0;
-+	u32 can_id, can_ext, tmp, tmp1;
-+
-+	/* Transmission inactive */
-+	regs->cantxfg[txbuf].can_dlc = MB_CNT_CODE(0x08);
-+
-+	can_ext = frame->can_id;
-+	if (can_ext & CAN_EFF_FLAG) {
-+		/* Frame format is extended */
-+		regs->cantxfg[txbuf].can_dlc |= (1 << 21);
-+		regs->cantxfg[txbuf].can_dlc |= (1 << 22);
-+		can_id = frame->can_id & MB_ID_EXT;
-+		if (frame->can_id & CAN_RTR_FLAG)
-+			regs->cantxfg[txbuf].can_dlc |= (1 << 20);
-+
-+		tmp = (can_id & CAN_SFF_MASK) << 18;
-+		tmp1 = can_id >> 11;
-+		can_id = tmp | tmp1;
-+		regs->cantxfg[txbuf].can_id = can_id;
-+	} else {
-+		/* Frame format is standard */
-+		can_id = frame->can_id & MB_ID_EXT;
-+		if (frame->can_id & CAN_RTR_FLAG)
-+			regs->cantxfg[txbuf].can_dlc |= (1 << 20);
-+
-+		regs->cantxfg[txbuf].can_id = can_id << 18;
-+	}
-+
-+	len = 8;
-+	for (i = 0; i < len; i++)
-+		regs->cantxfg[txbuf].data[i] = frame->data[i];
-+
-+	regs->cantxfg[txbuf].can_dlc |= len << 16;
-+	/* Transmission active */
-+	regs->cantxfg[txbuf].can_dlc |= MB_CNT_CODE(0x0c);
-+	kfree_skb(skb);
-+	return NETDEV_TX_OK;
-+}
-+
-+static void flexcan_tx_timeout(struct net_device *dev)
-+{
-+	struct sk_buff *skb;
-+	struct flexcan_regs *regs = (struct flexcan_regs *)dev->base_addr;
-+	struct can_frame *frame;
-+	int length = 8;
-+
-+	/* Diable the interrupts */
-+	regs->imask = IMASK_BUFF_DISABLE_ALL;
-+
-+	skb = dev_alloc_skb(sizeof(struct can_frame));
-+	if (!skb) {
-+		if (printk_ratelimit())
-+			dev_notice(ND2D(dev), "TIMEOUT packet dropped.\n");
-+		return;
-+	}
-+	frame = (struct can_frame *)skb_put(skb, sizeof(struct can_frame));
-+
-+	frame->can_dlc = length;
-+
-+	skb->dev = dev;
-+	skb->protocol = __constant_htons(ETH_P_CAN);
-+	skb->pkt_type = PACKET_BROADCAST;
-+	skb->ip_summed = CHECKSUM_UNNECESSARY;
-+
-+	netif_rx(skb);
-+}
-+
-+static irqreturn_t flexcan_isr(int irq, void *dev_id)
-+{
-+	struct net_device *dev = (struct net_device *)dev_id;
-+	struct flexcan_regs *regs = (struct flexcan_regs *)dev->base_addr;
-+	struct net_device_stats *stats = dev->get_stats(dev);
-+	struct sk_buff *skb;
-+	struct can_frame *frame;
-+	u32 iflags, oflags;
-+	int i, k;
-+	int retval = 1;
-+
-+	iflags = regs->iflag;
-+	oflags = iflags;
-+	for (i = 0; i < 16; i++) {
-+		if (iflags & (0x01 << i)) {
-+			struct flexcan_mb *mb = &regs->cantxfg[i];
-+			int ctrl = mb->can_dlc;
-+			int code = (ctrl >> 24) & 0x0f;
-+			int length = (ctrl >> 16) & 0x0f;
-+			u32 tmp, tmp1;
-+
-+			if (code < 8 && (length > 0)) {
-+				/* receive frame */
-+				skb = dev_alloc_skb(sizeof(struct can_frame));
-+				if (!skb)
-+					dev_notice(ND2D(dev),
-+							"Packets dropped.\n");
-+				skb->dev = dev;
-+				frame = (struct can_frame *)skb_put(skb,
-+						sizeof(struct can_frame));
-+
-+				frame->can_id &= 0x0;
-+				frame->can_dlc = length;
-+				tmp1 = mb->can_id & MB_ID_EXT;
-+				if (ctrl & MB_CNT_IDE) {
-+					tmp = tmp1;
-+					tmp = (tmp >> 18) & CAN_SFF_MASK;
-+					frame->can_id = (tmp1 << 11) | tmp;
-+					frame->can_id &= CAN_EFF_MASK;
-+					frame->can_id |= CAN_EFF_FLAG;
-+					if (ctrl & MB_CNT_RTR)
-+						frame->can_id |= CAN_RTR_FLAG;
-+				} else {
-+					frame->can_id  = tmp1 >> 18;
-+					if (ctrl & MB_CNT_RTR)
-+						frame->can_id |= CAN_RTR_FLAG;
-+				}
-+
-+				for (k = 0; k < 8; k++)
-+					frame->data[k] = mb->data[k];
-+
-+				mb->can_dlc &= MB_CODE_MASK;
-+				mb->can_dlc |= MB_CNT_CODE(0x04);
-+
-+				stats->rx_packets++;
-+				stats->rx_bytes += frame->can_dlc;
-+				skb->dev = dev;
-+				skb->protocol = __constant_htons(ETH_P_CAN);
-+				skb->ip_summed = CHECKSUM_UNNECESSARY;
-+
-+				retval = netif_rx(skb);
-+				if (retval == NET_RX_DROP)
-+					dev_notice(ND2D(dev),
-+							"Packets dropped.\n");
-+			} else {
-+				/* transmit frame */
-+				mb->can_dlc = MB_CNT_CODE(0x04);
-+			}
-+		}
-+	}
-+	regs->iflag = oflags;
-+
-+	return IRQ_HANDLED;
-+}
-+
-+static int flexcan_do_set_bit_time(struct net_device *dev,
-+				 struct can_bittime *bt)
-+{
-+	struct flexcan_priv *priv = netdev_priv(dev);
-+	struct flexcan_regs *regs = (struct flexcan_regs *)dev->base_addr;
-+	int ret = 0;
-+	u32 reg;
-+
-+	if (bt->type != CAN_BITTIME_STD)
-+		return -EINVAL;
-+
-+	spin_lock_irq(&priv->can.irq_lock);
-+
-+	reg = CANCTRL_PRESDIV(bt->std.brp) | CANCTRL_PSEG1(bt->std.phase_seg1
-+			- 1) | CANCTRL_PSEG2(bt->std.phase_seg2 - 1);
-+	regs->canctrl &= CANCTRL_BITTIME;
-+	regs->canctrl |= (reg | CANCTRL_SAMP(bt->std.sam) |
-+		CANCTRL_PROPSEG(bt->std.prop_seg - 1));
-+
-+	spin_unlock_irq(&priv->can.irq_lock);
-+	return ret;
-+}
-+
-+
-+static int flexcan_open(struct net_device *dev)
-+{
-+	int ret, i, j;
-+	struct flexcan_regs *regs = (struct flexcan_regs *)dev->base_addr;
-+
-+#if defined(CONFIG_M547X_8X)
-+	MCF_PAR_TIMER = MCF_PAR_TIMER | 0x28;
-+	MCF_PAR_TIMER = MCF_PAR_TIMER & 0xf8;
-+	MCF_PAR_DSPI = MCF_PAR_DSPI | 0x0a00;
-+	MCF_PAR_FECI2CIRQ = MCF_PAR_FECI2CIRQ | 0x0283;
-+	MCF_PAR_PSCn(2) = MCF_PAR_PSCn(2) & 0x0f;
-+	MCF_PAR_PSCn(2) = MCF_PAR_PSCn(2) | 0x50;
-+#endif
-+
-+	regs->canmcr |= CANMCR_SOFTRST;
-+	regs->canmcr |= CANMCR_MDIS;
-+	udelay(10);
-+
-+	if ((regs->canmcr & CANMCR_SOFTRST) != 0x0) {
-+		dev_err(ND2D(dev), "Failed to softreset can module.\n");
-+		return -1;
-+	}
-+
-+	/* Enable error and bus off interrupt */
-+	regs->canctrl |= (CANCTRL_RJW(3) | CANCTRL_ERRMSK |
-+			CANCTRL_BOFFMSK);
-+
-+	/* Set lowest buffer transmitted first */
-+	regs->canctrl |= CANCTRL_LBUF;
-+
-+	for (i = 0; i < 16; i++) {
-+		regs->cantxfg[i].can_dlc = 0;
-+		regs->cantxfg[i].can_id = 0;
-+		for (j = 0; j < 8; j++)
-+			regs->cantxfg[i].data[j] = 0;
-+
-+		/* Put MB into rx queue */
-+		regs->cantxfg[i].can_dlc = MB_CNT_CODE(0x04);
-+	}
-+
-+	/* acceptance mask/acceptance code (accept everything) */
-+	regs->rxgmask = 0x00000000;
-+	regs->rx14mask = 0x00000000;
-+	regs->rx15mask = 0x00000000;
-+	/* extended frame */
-+	regs->cantxfg[14].can_dlc |= 0x600000;
-+	/* Enable flexcan module */
-+	regs->canmcr &= ~CANMCR_MDIS;
-+	/* Synchronize with the can bus */
-+	regs->canmcr &= ~CANMCR_HALT;
-+
-+#if defined(CONFIG_M547X_8X)
-+	for (i = 0; i < 2; i++) {
-+		MCF_ICR(ISC_CANn_MBOR(i)) = 0x33;
-+		MCF_ICR(ISC_CANn_ERR(i)) = 0x33;
-+		MCF_ICR(ISC_CANn_BUSOFF(i)) = 0x33;
-+	}
-+
-+	ret = request_irq(dev->irq + 64, flexcan_isr, IRQF_DISABLED,
-+			dev->name, dev);
-+	ret = request_irq(dev->irq + 1 + 64, flexcan_isr, IRQF_DISABLED,
-+			dev->name, dev);
-+	ret = request_irq(dev->irq + 2 + 64, flexcan_isr, IRQF_DISABLED,
-+			dev->name, dev);
-+	if (ret < 0) {
-+		printk(KERN_ERR "%s - failed to attach interrupt.\n",
-+		       dev->name);
-+		return ret;
-+	}
-+#endif
-+
-+	/* Enable all interrupts */
-+	regs->imask = IMASK_BUFF_ENABLE_ALL;
-+	netif_start_queue(dev);
-+	return 0;
-+}
-+
-+static int flexcan_close(struct net_device *dev)
-+{
-+	struct flexcan_regs *regs = (struct flexcan_regs *)dev->base_addr;
-+
-+	netif_stop_queue(dev);
-+
-+	/* Disable all interrupts */
-+	regs->imask = IMASK_BUFF_DISABLE_ALL;
-+	free_irq(dev->irq + 64, dev);
-+	free_irq(dev->irq + 1 + 64, dev);
-+	free_irq(dev->irq + 2 + 64, dev);
-+
-+	/* Disable module */
-+	regs->canmcr |= CANMCR_MDIS;
-+	return 0;
-+}
-+
-+int register_flexcandev(struct net_device *dev, int clock_src)
-+{
-+	struct flexcan_regs *regs = (struct flexcan_regs *)dev->base_addr;
-+
-+	regs->canmcr &= ~CANMCR_MDIS;
-+	udelay(100);
-+	regs->canmcr |= (CANMCR_FRZ | CANMCR_HALT);
-+	return register_netdev(dev);
-+}
-+EXPORT_SYMBOL(register_flexcandev);
-+
-+void unregister_flexcandev(struct net_device *dev)
-+{
-+	struct flexcan_regs *regs = (struct flexcan_regs *)dev->base_addr;
-+
-+	regs->canmcr |= (CANMCR_FRZ | CANMCR_HALT);
-+	regs->canmcr |= CANMCR_MDIS;
-+
-+	unregister_netdev(dev);
-+}
-+EXPORT_SYMBOL(unregister_flexcandev);
-+
-+struct net_device *alloc_flexcandev(void)
-+{
-+	struct net_device *dev;
-+	struct flexcan_priv *priv;
-+
-+	dev = alloc_candev(sizeof(struct flexcan_priv));
-+	if (!dev)
-+		return NULL;
-+
-+	priv = netdev_priv(dev);
-+	priv->dev = dev;
-+	dev->open = flexcan_open;
-+	dev->stop = flexcan_close;
-+	dev->hard_start_xmit = flexcan_hard_start_xmit;
-+	dev->tx_timeout = flexcan_tx_timeout;
-+	dev->flags |= IFF_NOARP;
-+	priv->can.do_set_bit_time = flexcan_do_set_bit_time;
-+	return dev;
-+}
-+EXPORT_SYMBOL(alloc_flexcandev);
-+
-+MODULE_AUTHOR("Andrey Volkov <avolkov@varma-el.com>");
-+MODULE_LICENSE("GPL v2");
-+MODULE_DESCRIPTION("CAN port driver for flexcan based chip");
---- /dev/null
-+++ b/drivers/net/can/flexcan/flexcan.h
-@@ -0,0 +1,148 @@
-+/*
-+ * flexcan.h
-+ *
-+ * DESCRIPTION:
-+ *  Definitions of consts/structs to drive the Freescale FLEXCAN.
-+ *
-+ */
-+
-+#ifndef __FLEXCAN_H__
-+#define __FLEXCAN_H__
-+
-+#include <linux/autoconf.h>
-+#include <linux/types.h>
-+
-+/* FLEXCAN module configuration register (CANMCR) bits */
-+#define CANMCR_MDIS				0x80000000
-+#define CANMCR_FRZ				0x40000000
-+#define CANMCR_HALT				0x10000000
-+#define CANMCR_SOFTRST				0x02000000
-+#define CANMCR_FRZACK				0x01000000
-+#define CANMCR_SUPV				0x00800000
-+#define CANMCR_MAXMB(x)				((x)&0x0f)
-+
-+/* FLEXCAN control register (CANCTRL) bits */
-+#define CANCTRL_PRESDIV(x)			(((x)&0xff)<<24)
-+#define CANCTRL_RJW(x)				(((x)&0x03)<<22)
-+#define CANCTRL_PSEG1(x)			(((x)&0x07)<<19)
-+#define CANCTRL_PSEG2(x)			(((x)&0x07)<<16)
-+#define CANCTRL_BOFFMSK				0x00008000
-+#define CANCTRL_ERRMSK				0x00004000
-+#define CANCTRL_LPB				0x00001000
-+#define CANCTRL_SAMP(x)				(((x)&0x1)<<7)
-+#define CANCTRL_BOFFREC				0x00000040
-+#define CANCTRL_TSYNC				0x00000020
-+#define CANCTRL_LBUF				0x00000010
-+#define CANCTRL_LOM				0x00000008
-+#define CANCTRL_PROPSEG(x)			((x)&0x07)
-+#define CANCTRL_BITTIME				0x00c0d078
-+
-+/* FLEXCAN error counter register (ERRCNT) bits */
-+#define ERRCNT_REXECTR(x)			(((x)&0xff)<<8)
-+#define ERRCNT_TXECTR(x)			((x)&0xff)
-+
-+/* FLEXCAN error and status register (ERRSTAT) bits */
-+#define ERRSTAT_BITERR(x)			(((x)&0x03)<<14)
-+#define ERRSTAT_ACKERR				0x00002000
-+#define ERRSTAT_CRCERR				0x00001000
-+#define ERRSTAT_FRMERR				0x00000800
-+#define ERRSTAT_STFERR				0x00000400
-+#define ERRSTAT_TXWRN				0x00000200
-+#define ERRSTAT_RXWRN				0x00000100
-+#define ERRSTAT_IDLE 				0x00000080
-+#define ERRSTAT_TXRX				0x00000040
-+#define ERRSTAT_FLTCONF(x)			(((x)&0x03)<<4)
-+#define ERRSTAT_BOFFINT				0x00000004
-+#define ERRSTAT_ERRINT          		0x00000002
-+
-+/* FLEXCAN interrupt mask register (IMASK) bits */
-+#define IMASK_BUF15M				0x8000
-+#define IMASK_BUF14M				0x4000
-+#define IMASK_BUF13M				0x2000
-+#define IMASK_BUF12M				0x1000
-+#define IMASK_BUF11M				0x0800
-+#define IMASK_BUF10M				0x0400
-+#define IMASK_BUF9M				0x0200
-+#define IMASK_BUF8M				0x0100
-+#define IMASK_BUF7M				0x0080
-+#define IMASK_BUF6M				0x0040
-+#define IMASK_BUF5M				0x0020
-+#define IMASK_BUF4M				0x0010
-+#define IMASK_BUF3M				0x0008
-+#define IMASK_BUF2M				0x0004
-+#define IMASK_BUF1M				0x0002
-+#define IMASK_BUF0M				0x0001
-+#define IMASK_BUFnM(x)				(0x1<<(x))
-+#define IMASK_BUFF_ENABLE_ALL			0xffff
-+#define IMASK_BUFF_DISABLE_ALL 			0x0000
-+
-+/* FLEXCAN interrupt flag register (IFLAG) bits */
-+#define IFLAG_BUF15M				0x8000
-+#define IFLAG_BUF14M				0x4000
-+#define IFLAG_BUF13M				0x2000
-+#define IFLAG_BUF12M				0x1000
-+#define IFLAG_BUF11M				0x0800
-+#define IFLAG_BUF10M				0x0400
-+#define IFLAG_BUF9M				0x0200
-+#define IFLAG_BUF8M				0x0100
-+#define IFLAG_BUF7M				0x0080
-+#define IFLAG_BUF6M				0x0040
-+#define IFLAG_BUF5M				0x0020
-+#define IFLAG_BUF4M				0x0010
-+#define IFLAG_BUF3M				0x0008
-+#define IFLAG_BUF2M				0x0004
-+#define IFLAG_BUF1M				0x0002
-+#define IFLAG_BUF0M				0x0001
-+#define IFLAG_BUFnM(x)				(0x1<<(x))
-+#define IFLAG_BUFF_SET_ALL			0xffff
-+#define IFLAG_BUFF_DISABLE_ALL 			0x0000
-+
-+/* FLEXCAN message buffers */
-+#define MB_CNT_CODE(x)				(((x)&0x0f)<<24)
-+#define MB_CNT_SRR				0x00400000
-+#define MB_CNT_IDE				0x00200000
-+#define MB_CNT_RTR				0x00100000
-+#define MB_CNT_LENGTH(x)			(((x)&0x0f)<<16)
-+#define MB_CNT_TIMESTAMP(x)			((x)&0xffff)
-+
-+#define MB_ID_STD				((0x7ff)<<18)
-+#define MB_ID_EXT				0x1fffffff
-+#define MB_CODE_MASK				0xf0ffffff
-+
-+/* Structure of the message buffer */
-+struct flexcan_mb {
-+	u32	can_dlc;
-+	u32	can_id;
-+	u8	data[8];
-+};
-+
-+/* Structure of the hardware registers */
-+struct flexcan_regs {
-+	u32	canmcr;
-+	u32	canctrl;
-+	u32	timer;
-+	u32	reserved1;
-+	u32 	rxgmask;
-+	u32 	rx14mask;
-+	u32 	rx15mask;
-+	u32	errcnt;
-+	u32 	errstat;
-+	u32	reserved2;
-+	u32	imask;
-+	u32	reserved3;
-+	u32 	iflag;
-+	u32	reserved4[19];
-+	struct	flexcan_mb cantxfg[16];
-+};
-+
-+struct flexcan_platform_data {
-+	u8 clock_src;		/* FLEXCAN clock source CRIN or SYSCLK */
-+	u32 clock_frq;		/* can ref. clock, in Hz */
-+};
-+
-+struct net_device *alloc_flexcandev(void);
-+
-+extern int register_flexcandev(struct net_device *dev, int clock_src);
-+extern void unregister_flexcandev(struct net_device *dev);
-+
-+#endif				/* __FLEXCAN_H__ */
---- /dev/null
-+++ b/drivers/net/can/flexcan/mcf548x_can.c
-@@ -0,0 +1,213 @@
-+/*
-+ * DESCRIPTION:
-+ *  CAN bus driver for the Freescale MCF548x embedded CPU.
-+ *
-+ * AUTHOR:
-+ *  Andrey Volkov <avolkov@varma-el.com>
-+ *
-+ * COPYRIGHT:
-+ *  2004-2005, Varma Electronics Oy
-+ *
-+ * LICENCE:
-+ *  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.
-+ *
-+ *  This program is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with this program; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ * HISTORY:
-+ * 	2008-06-23 support for MCF548x's FlexCAN
-+ * 		Huan, Wang  <b18965@freescale.com>
-+ * 	2005-02-03 created
-+ *
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/interrupt.h>
-+#include <linux/platform_device.h>
-+#include <linux/netdevice.h>
-+#include <linux/can.h>
-+#include <linux/can/dev.h>
-+#include <linux/io.h>
-+
-+#include "flexcan.h"
-+#include <asm/coldfire.h>
-+#include <asm/m5485sim.h>
-+#include <linux/can/version.h>	/* for RCSID. Removed by mkpatch script */
-+
-+RCSID("$Id$");
-+
-+#define PDEV_MAX 2
-+
-+struct platform_device *pdev[PDEV_MAX];
-+
-+static int __devinit mcf548x_can_probe(struct platform_device *pdev)
-+{
-+	struct resource *mem;
-+	struct net_device *dev;
-+	struct flexcan_platform_data *pdata = pdev->dev.platform_data;
-+	struct can_priv *can;
-+	u32 mem_size;
-+	int ret = -ENODEV;
-+
-+	if (!pdata)
-+		return ret;
-+
-+	dev = alloc_flexcandev();
-+	if (!dev)
-+		return -ENOMEM;
-+	can = netdev_priv(dev);
-+
-+	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+
-+	dev->irq = platform_get_irq(pdev, 0);
-+	if (!mem || !dev->irq)
-+		goto req_error;
-+
-+	mem_size = mem->end - mem->start + 1;
-+	if (!request_mem_region(mem->start, mem_size, pdev->dev.driver->name)) {
-+		dev_err(&pdev->dev, "resource unavailable\n");
-+		goto req_error;
-+	}
-+	SET_NETDEV_DEV(dev, &pdev->dev);
-+
-+	dev->base_addr = (unsigned long)ioremap_nocache(mem->start, mem_size);
-+	if (!dev->base_addr) {
-+		dev_err(&pdev->dev, "failed to map can port\n");
-+		ret = -ENOMEM;
-+		goto fail_map;
-+	}
-+	can->can_sys_clock = pdata->clock_frq;
-+	platform_set_drvdata(pdev, dev);
-+	ret = register_flexcandev(dev, pdata->clock_src);
-+	if (ret >= 0) {
-+		dev_info(&pdev->dev, "probe for port 0x%lX done\n",
-+			 dev->base_addr);
-+		return ret;
-+	}
-+
-+	iounmap((unsigned long *)dev->base_addr);
-+fail_map:
-+	release_mem_region(mem->start, mem_size);
-+req_error:
-+	free_candev(dev);
-+	dev_err(&pdev->dev, "probe failed\n");
-+	return ret;
-+}
-+
-+static int __devexit mcf548x_can_remove(struct platform_device *pdev)
-+{
-+	struct net_device *dev = platform_get_drvdata(pdev);
-+	struct resource *mem;
-+
-+	platform_set_drvdata(pdev, NULL);
-+	unregister_flexcandev(dev);
-+	iounmap((unsigned long *)dev->base_addr);
-+
-+	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	release_mem_region(mem->start, mem->end - mem->start + 1);
-+	free_candev(dev);
-+	return 0;
-+}
-+
-+static struct platform_driver mcf548x_can_driver = {
-+	.driver = {
-+		   .name = "mcf548x-flexcan",
-+		   },
-+	.probe = mcf548x_can_probe,
-+	.remove = __devexit_p(mcf548x_can_remove),
-+};
-+
-+static struct resource mcf548x_can0_resources[] = {
-+	[0] = {
-+		.start 		= MCF_MBAR + 0x0000A000,
-+		.end		= MCF_MBAR + 0x0000A7FF,
-+		.flags		= IORESOURCE_MEM,
-+	},
-+	[1] = {
-+		.start		= 49,
-+		.end		= 49,
-+		.flags		= IORESOURCE_IRQ,
-+	},
-+};
-+
-+static struct resource mcf548x_can1_resources[] = {
-+	[0] = {
-+		.start 		= MCF_MBAR + 0x0000A800,
-+		.end		= MCF_MBAR + 0x0000AFFF,
-+		.flags		= IORESOURCE_MEM,
-+	},
-+	[1] = {
-+		.start		= 55,
-+		.end		= 55,
-+		.flags		= IORESOURCE_IRQ,
-+	},
-+};
-+
-+
-+static int __init mcf548x_of_to_pdev(void)
-+{
-+	unsigned int i;
-+	int err = -ENODEV;
-+	struct flexcan_platform_data pdata;
-+
-+	pdev[0] = platform_device_register_simple("mcf548x-flexcan", 0,
-+			mcf548x_can0_resources, 2);
-+	if (IS_ERR(pdev[0])) {
-+		err = PTR_ERR(pdev[0]);
-+		return err;
-+	}
-+	pdev[1] = platform_device_register_simple("mcf548x-flexcan", 1,
-+			mcf548x_can1_resources, 2);
-+	if (IS_ERR(pdev[1])) {
-+		err = PTR_ERR(pdev[1]);
-+		return err;
-+	}
-+
-+	/* FlexCAN clock */
-+	pdata.clock_frq = 100000000;
-+
-+	for (i = 0; i < PDEV_MAX; i++) {
-+		err = platform_device_add_data(pdev[i], &pdata, sizeof(pdata));
-+		if (err)
-+			return err;
-+	}
-+	return err;
-+}
-+
-+int __init mcf548x_can_init(void)
-+{
-+	int err = mcf548x_of_to_pdev();
-+
-+	if (err) {
-+		printk(KERN_ERR "%s init failed with err=%d\n",
-+			mcf548x_can_driver.driver.name, err);
-+		return err;
-+	}
-+
-+	return platform_driver_register(&mcf548x_can_driver);
-+}
-+
-+void __exit mcf548x_can_exit(void)
-+{
-+	int i;
-+	platform_driver_unregister(&mcf548x_can_driver);
-+	for (i = 0; i < PDEV_MAX; i++)
-+		platform_device_unregister(pdev[i]);
-+}
-+
-+module_init(mcf548x_can_init);
-+module_exit(mcf548x_can_exit);
-+
-+MODULE_AUTHOR("Andrey Volkov <avolkov@varma-el.com>");
-+MODULE_DESCRIPTION("Freescale MCF548x CAN driver");
-+MODULE_LICENSE("GPL v2");
---- a/include/asm-m68k/m5485sim.h
-+++ b/include/asm-m68k/m5485sim.h
-@@ -186,6 +186,8 @@
- #define MCF_PAR_PCIBR   	   MCF_REG16(0x000A4A)
- #define MCF_PAR_PSCn(x)            MCF_REG08(0x000A4F-((x)&0x3))
- #define MCF_PAR_FECI2CIRQ   	   MCF_REG16(0x000A44)
-+#define MCF_PAR_DSPI               MCF_REG16(0x000A50)
-+#define MCF_PAR_TIMER              MCF_REG08(0X000A52)
- #define MCF_EPPAR       	   MCF_REG16(0x000F00)
- #define MCF_EPIER       	   MCF_REG08(0x000F05)
- #define MCF_EPFR       	   	   MCF_REG08(0x000F0C)
---- /dev/null
-+++ b/include/linux/can/dev.h
-@@ -0,0 +1,62 @@
-+/*
-+ * linux/can/dev.h
-+ *
-+ * Definitions for CAN controller network devices lib (work in progress)
-+ *
-+ * * * $Id$
-+ *
-+ * Author: Andrey Volkov <avolkov@varma-el.com>
-+ * Copyright (c) 2006 Varma Electronics Oy
-+ *
-+ */
-+
-+#ifndef CAN_DEVICE_H
-+#define CAN_DEVICE_H
-+
-+#include <linux/version.h>
-+#include <linux/can/error.h>
-+#include <linux/can/ioctl.h>
-+
-+struct can_priv {
-+	struct can_device_stats can_stats;
-+
-+	/* can-bus oscillator frequency, in Hz,
-+	   BE CAREFUL! SOME CONTROLLERS (LIKE SJA1000)
-+	   FOOLISH ABOUT THIS FRQ (for sja1000 as ex. this
-+	   clock must be xtal clock divided by 2). */
-+	u32	can_sys_clock;
-+
-+	/* by default max_brp is equal 64,
-+	   but for a Freescale TouCAN, as ex., it can be 255*/
-+	u32	max_brp;
-+	/* For the mostly all controllers, max_sjw is equal 4, but
-+	   some, hmm, CAN implementations hardwared it to 1 */
-+	u8	max_sjw;
-+
-+	u32	baudrate;	/* in bauds */
-+	struct can_bittime	bit_time;
-+
-+	spinlock_t irq_lock;
-+	/* Please hold this lock when touching net_stats/can_stats*/
-+	spinlock_t stats_lock;
-+
-+	can_state_t state;
-+	can_mode_t  mode;
-+	can_ctrlmode_t ctrlmode;
-+
-+	int (*do_set_bit_time)(struct net_device *dev, struct can_bittime *br);
-+	int (*do_get_state)   (struct net_device *dev, can_state_t *state);
-+	int (*do_set_mode)    (struct net_device *dev, can_mode_t mode);
-+	int (*do_set_ctrlmode)(struct net_device *dev, can_ctrlmode_t ctrlmode);
-+	int (*do_get_ctrlmode)(struct net_device *dev, can_ctrlmode_t *ctrlmode);
-+};
-+
-+#define ND2D(_ndev)		(_ndev->dev.parent)
-+
-+struct net_device *alloc_candev(int sizeof_priv);
-+void free_candev(struct net_device *dev);
-+
-+int can_calc_bit_time(struct can_priv *can, u32 baudrate,
-+		      struct can_bittime_std *bit_time);
-+
-+#endif /* CAN_DEVICE_H */
---- /dev/null
-+++ b/include/linux/can/ioctl.h
-@@ -0,0 +1,152 @@
-+/*
-+ * linux/can/ioctl.h
-+ *
-+ * Definitions for CAN controller setup (work in progress)
-+ *
-+ * $Id$
-+ *
-+ * Send feedback to <socketcan-users@lists.berlios.de>
-+ *
-+ */
-+
-+#ifndef CAN_IOCTL_H
-+#define CAN_IOCTL_H
-+
-+#include <linux/sockios.h>
-+
-+
-+/* max. 16 private ioctls */
-+
-+#define SIOCSCANBAUDRATE	(SIOCDEVPRIVATE+0)
-+#define SIOCGCANBAUDRATE	(SIOCDEVPRIVATE+1)
-+
-+#define SIOCSCANCUSTOMBITTIME   (SIOCDEVPRIVATE+2)
-+#define SIOCGCANCUSTOMBITTIME   (SIOCDEVPRIVATE+3)
-+
-+#define SIOCSCANMODE		(SIOCDEVPRIVATE+4)
-+#define SIOCGCANMODE		(SIOCDEVPRIVATE+5)
-+
-+#define SIOCSCANCTRLMODE	(SIOCDEVPRIVATE+6)
-+#define SIOCGCANCTRLMODE	(SIOCDEVPRIVATE+7)
-+
-+#define SIOCSCANFILTER		(SIOCDEVPRIVATE+8)
-+#define SIOCGCANFILTER		(SIOCDEVPRIVATE+9)
-+
-+#define SIOCGCANSTATE		(SIOCDEVPRIVATE+10)
-+#define SIOCGCANSTATS		(SIOCDEVPRIVATE+11)
-+
-+#define SIOCSCANERRORCONFIG	(SIOCDEVPRIVATE+12)
-+#define SIOCGCANERRORCONFIG	(SIOCDEVPRIVATE+13)
-+
-+/* parameters for ioctls */
-+
-+/* SIOC[SG]CANBAUDRATE */
-+/* baudrate for CAN-controller in bits per second. */
-+/* 0 = Scan for baudrate (Autobaud) */
-+
-+typedef __u32 can_baudrate_t;
-+
-+
-+/* SIOC[SG]CANCUSTOMBITTIME */
-+
-+typedef enum CAN_BITTIME_TYPE {
-+	CAN_BITTIME_STD,
-+	CAN_BITTIME_BTR
-+} can_bittime_type_t;
-+
-+/* TSEG1 of controllers usually is a sum of synch_seg (always 1),
-+ * prop_seg and phase_seg1, TSEG2 = phase_seg2 */
-+
-+struct can_bittime_std {
-+	__u32 brp;        /* baud rate prescaler */
-+	__u8  prop_seg;   /* from 1 to 8 */
-+	__u8  phase_seg1; /* from 1 to 8 */
-+	__u8  phase_seg2; /* from 1 to 8 */
-+	__u8  sjw:7;      /* from 1 to 4 */
-+	__u8  sam:1;      /* 1 - enable triple sampling */
-+};
-+
-+struct can_bittime_btr {
-+	__u8  btr0;
-+	__u8  btr1;
-+};
-+
-+struct can_bittime {
-+	can_bittime_type_t type;
-+	union {
-+		struct can_bittime_std std;
-+		struct can_bittime_btr btr;
-+	};
-+};
-+
-+#define CAN_BAUDRATE_UNCONFIGURED	((__u32) 0xFFFFFFFFU)
-+#define CAN_BAUDRATE_UNKNOWN		0
-+
-+/* SIOC[SG]CANMODE */
-+
-+typedef __u32 can_mode_t;
-+
-+#define CAN_MODE_STOP	0
-+#define CAN_MODE_START	1
-+#define CAN_MODE_SLEEP	2
-+
-+
-+/* SIOC[SG]CANCTRLMODE */
-+
-+typedef __u32 can_ctrlmode_t;
-+
-+#define CAN_CTRLMODE_LOOPBACK   0x1
-+#define CAN_CTRLMODE_LISTENONLY 0x2
-+
-+
-+/* SIOCGCANFILTER */
-+
-+typedef __u32 can_filter_t;
-+
-+/* filter modes (may vary due to controller specific capabilities) */
-+#define CAN_FILTER_CAPAB       0  /* get filter type capabilities
-+				     (32 Bit value) */
-+#define CAN_FILTER_MASK_VALUE  1  /* easy bit filter (see struct can_filter) */
-+#define CAN_FILTER_SFF_BITMASK 2  /* bitfield with 2048 bit SFF filter */
-+				  /* filters 3 - 31 currently undefined */
-+
-+#define CAN_FILTER_MAX         31 /* max. filter type value */
-+
-+
-+/* SIOCGCANSTATE */
-+
-+typedef __u32 can_state_t;
-+
-+#define CAN_STATE_ACTIVE		0
-+#define CAN_STATE_BUS_WARNING		1
-+#define CAN_STATE_BUS_PASSIVE		2
-+#define CAN_STATE_BUS_OFF		3
-+#define CAN_STATE_SCANNING_BAUDRATE	4
-+#define CAN_STATE_STOPPED		5
-+#define CAN_STATE_SLEEPING		6
-+
-+
-+/* SIOCGCANSTATS */
-+
-+struct can_device_stats {
-+	int error_warning;
-+	int data_overrun;
-+	int wakeup;
-+	int bus_error;
-+	int error_passive;
-+	int arbitration_lost;
-+	int restarts;
-+	int bus_error_at_init;
-+};
-+
-+/* SIOC[SG]CANERRORCONFIG */
-+
-+typedef enum CAN_ERRCFG_TYPE {
-+	CAN_ERRCFG_MASK,
-+	CAN_ERRCFG_BUSERR,
-+	CAN_ERRCFG_BUSOFF
-+} can_errcfg_type_t;
-+
-+/* tbd */
-+
-+#endif /* CAN_IOCTL_H */
---- /dev/null
-+++ b/include/linux/can/version.h
-@@ -0,0 +1,22 @@
-+/*
-+ * linux/can/version.h
-+ *
-+ * Version information for the CAN network layer implementation
-+
-+ * Author: Urs Thuermann   <urs.thuermann@volkswagen.de>
-+ * Copyright (c) 2002-2007 Volkswagen Group Electronic Research
-+ * All rights reserved.
-+ *
-+ * Send feedback to <socketcan-users@lists.berlios.de>
-+ *
-+ */
-+
-+#ifndef CAN_VERSION_H
-+#define CAN_VERSION_H
-+
-+#define RCSID(s) asm(".section .rodata.str1.1,\"aMS\",@progbits,1\n\t" \
-+		     ".string \"" s "\"\n\t.previous\n")
-+
-+RCSID("$Id$");
-+
-+#endif /* CAN_VERSION_H */
---- a/net/can/Makefile
-+++ b/net/can/Makefile
-@@ -10,3 +10,6 @@ can-raw-objs		:= raw.o
- 
- obj-$(CONFIG_CAN_BCM)	+= can-bcm.o
- can-bcm-objs		:= bcm.o
-+
-+obj-$(CONFIG_CAN)       += candev.o
-+candev-objs             := dev.o
---- /dev/null
-+++ b/net/can/dev.c
-@@ -0,0 +1,292 @@
-+/*
-+ * $Id$
-+ *
-+ * Copyright (C) 2005 Marc Kleine-Budde, Pengutronix
-+ * Copyright (C) 2006 Andrey Volkov, Varma Electronics
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the version 2 of the GNU General Public License
-+ * as published by the Free Software Foundation
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/netdevice.h>
-+#include <linux/if_arp.h>
-+#include <linux/can.h>
-+#include <linux/can/dev.h>
-+
-+MODULE_DESCRIPTION("CAN netdevice library");
-+MODULE_LICENSE("GPL v2");
-+MODULE_AUTHOR("Marc Kleine-Budde <mkl@pengutronix.de>, "
-+	      "Andrey Volkov <avolkov@varma-el.com>");
-+
-+/*
-+ Abstract:
-+	Baud rate calculated with next formula:
-+	baud = frq/(brp*(1 + prop_seg+ phase_seg1 + phase_seg2))
-+
-+	This calc function based on work of Florian Hartwich and Armin Bassemi
-+	"The Configuration of the CAN Bit Timing"
-+	(http://www.semiconductors.bosch.de/pdf/CiA99Paper.pdf)
-+
-+ Parameters:
-+  [in]
-+    bit_time_nsec - expected bit time in nanosecs
-+
-+  [out]
-+	bit_time	- calculated time segments, for meaning of
-+			  each field read CAN standard.
-+*/
-+
-+#define DEFAULT_MAX_BRP			64U
-+#define DEFAULT_MAX_SJW			4U
-+
-+/* All below values in tq units */
-+#define MAX_BIT_TIME	25U
-+#define MIN_BIT_TIME	8U
-+#define MAX_PROP_SEG	8U
-+#define MAX_PHASE_SEG1	8U
-+#define MAX_PHASE_SEG2	8U
-+
-+int can_calc_bit_time(struct can_priv *can, u32 baudrate,
-+		      struct can_bittime_std *bit_time)
-+{
-+	int best_error  = -1; /* Ariphmetic error */
-+	int df, best_df = -1; /* oscillator's tolerance range */
-+	u32 quanta;	      /*in tq units*/
-+	u32 brp, phase_seg1, phase_seg2, sjw, prop_seg;
-+	u32 brp_min, brp_max, brp_expected;
-+	u64 tmp;
-+
-+	/* baudrate range [1baud,1Mbaud] */
-+	if (baudrate == 0 || baudrate > 1000000UL)
-+		return -EINVAL;
-+
-+	tmp = (u64)can->can_sys_clock*1000;
-+	do_div(tmp, baudrate);
-+	brp_expected = (u32)tmp;
-+
-+	brp_min = brp_expected / (1000 * MAX_BIT_TIME);
-+	if (brp_min == 0)
-+		brp_min = 1;
-+	if (brp_min > can->max_brp)
-+		return -ERANGE;
-+
-+	brp_max = (brp_expected + 500 * MIN_BIT_TIME) / (1000 * MIN_BIT_TIME);
-+	if (brp_max == 0)
-+		brp_max = 1;
-+	if (brp_max > can->max_brp)
-+		brp_max = can->max_brp;
-+
-+	for (brp = brp_min; brp <= brp_max; brp++) {
-+		quanta = brp_expected / (brp * 1000);
-+		if (quanta < MAX_BIT_TIME && quanta * brp * 1000 !=
-+				brp_expected)
-+			quanta++;
-+		if (quanta < MIN_BIT_TIME || quanta > MAX_BIT_TIME)
-+			continue;
-+
-+		phase_seg2 = min((quanta - 3) / 2, MAX_PHASE_SEG2);
-+		for (sjw = can->max_sjw; sjw > 0; sjw--) {
-+			for (; phase_seg2 > sjw; phase_seg2--) {
-+				u32 err1, err2;
-+				phase_seg1 = phase_seg2 % 2 ?
-+					phase_seg2-1 : phase_seg2;
-+				prop_seg = quanta-1 - phase_seg2 - phase_seg1;
-+				/*
-+				 * FIXME: support of longer lines
-+				 * (i.e. bigger prop_seg) is more prefered
-+				 * than support of cheap oscillators
-+				 * (i.e. bigger df/phase_seg1/phase_seg2)
-+				 * */
-+
-+				if (prop_seg < phase_seg1)
-+						continue;
-+				if (prop_seg > MAX_PROP_SEG)
-+						goto next_brp;
-+
-+				err1 = phase_seg1 * brp * 500 * 1000 /
-+					(13 * brp_expected - phase_seg2 *
-+					 brp * 1000);
-+				err2 = sjw * brp * 50 * 1000 / brp_expected;
-+
-+				df = min(err1, err2);
-+				if (df >= best_df) {
-+					unsigned error = abs(brp_expected * 10 /
-+							(brp * (1 + prop_seg +
-+								phase_seg1 +
-+								phase_seg2)) - 10000);
-+
-+					if (error > 10 || error > best_error)
-+						continue;
-+
-+					if (error == best_error && prop_seg <
-+							bit_time->prop_seg)
-+						continue;
-+
-+					best_error = error;
-+					best_df = df;
-+					bit_time->brp = brp;
-+					bit_time->prop_seg = prop_seg;
-+					bit_time->phase_seg1 = phase_seg1;
-+					bit_time->phase_seg2 = phase_seg2;
-+					bit_time->sjw = sjw;
-+					bit_time->sam =
-+						(bit_time->phase_seg1 > 3);
-+				}
-+			}
-+		}
-+next_brp:	;
-+	}
-+
-+	if (best_error < 0)
-+		return -EDOM;
-+	return 0;
-+}
-+EXPORT_SYMBOL(can_calc_bit_time);
-+
-+static int can_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
-+{
-+	struct can_priv *can = netdev_priv(dev);
-+	struct can_bittime *bt = (struct can_bittime *)&ifr->ifr_ifru;
-+	ulong *baudrate = (ulong *)&ifr->ifr_ifru;
-+	int ret = -EOPNOTSUPP;
-+
-+	dev_dbg(ND2D(dev), "(%s) 0x%08x %p\n", __func__, cmd, &ifr->ifr_ifru);
-+
-+	switch (cmd) {
-+	case SIOCSCANBAUDRATE:
-+		if (can->do_set_bit_time) {
-+			struct can_bittime bit_time;
-+			ret = can_calc_bit_time(can, *baudrate, &bit_time.std);
-+			if (ret != 0)
-+				break;
-+			bit_time.type = CAN_BITTIME_STD;
-+			ret = can->do_set_bit_time(dev, &bit_time);
-+			if (!ret) {
-+				can->baudrate = *baudrate;
-+				can->bit_time = bit_time;
-+			}
-+		}
-+		break;
-+	case SIOCGCANBAUDRATE:
-+		*baudrate = can->baudrate;
-+		ret = 0;
-+		break;
-+	case SIOCSCANCUSTOMBITTIME:
-+		if (can->do_set_bit_time) {
-+			ret = can->do_set_bit_time(dev, bt);
-+			if (!ret) {
-+				can->bit_time = *bt;
-+				if (bt->type == CAN_BITTIME_STD && bt->std.brp) {
-+					can->baudrate = can->can_sys_clock /
-+						(bt->std.brp * (1 + bt->std.prop_seg +
-+								bt->std.phase_seg1 +
-+								bt->std.phase_seg2));
-+				} else
-+					can->baudrate = CAN_BAUDRATE_UNKNOWN;
-+			}
-+		}
-+		break;
-+	case SIOCGCANCUSTOMBITTIME:
-+		*bt = can->bit_time;
-+		ret = 0;
-+		break;
-+	case SIOCSCANMODE:
-+		if (can->do_set_mode) {
-+			can_mode_t mode =
-+				*((can_mode_t *)(&ifr->ifr_ifru));
-+			if (mode == CAN_MODE_START &&
-+			    can->baudrate == CAN_BAUDRATE_UNCONFIGURED) {
-+				dev_info(ND2D(dev), "Impossible to start \
-+						on UNKNOWN speed\n");
-+				ret = EINVAL;
-+			} else
-+				return can->do_set_mode(dev, mode);
-+		}
-+		break;
-+	case SIOCGCANMODE:
-+		*((can_mode_t *)(&ifr->ifr_ifru)) = can->mode;
-+		ret = 0;
-+		break;
-+	case SIOCSCANCTRLMODE:
-+		if (can->do_set_ctrlmode) {
-+			can_ctrlmode_t ctrlmode =
-+				*((can_ctrlmode_t *)(&ifr->ifr_ifru));
-+			return can->do_set_ctrlmode(dev, ctrlmode);
-+		}
-+		break;
-+	case SIOCGCANCTRLMODE:
-+		*((can_ctrlmode_t *)(&ifr->ifr_ifru)) = can->ctrlmode;
-+		ret = 0;
-+		break;
-+	case SIOCSCANFILTER:
-+		break;
-+	case SIOCGCANFILTER:
-+		break;
-+	case SIOCGCANSTATE:
-+		if (can->do_get_state)
-+			return can->do_get_state(dev,
-+					(can_state_t *)(&ifr->ifr_ifru));
-+		break;
-+	case SIOCGCANSTATS:
-+		*((struct can_device_stats *)(&ifr->ifr_ifru)) = can->can_stats;
-+		ret = 0;
-+		break;
-+	}
-+
-+	return ret;
-+}
-+
-+static void can_setup(struct net_device *dev)
-+{
-+	dev->type            = ARPHRD_CAN;
-+	dev->mtu             = sizeof(struct can_frame);
-+	dev->do_ioctl        = can_ioctl;
-+	dev->hard_header_len = 0;
-+	dev->addr_len        = 0;
-+	dev->tx_queue_len    = 10;
-+
-+	/* New-style flags. */
-+	dev->flags           = IFF_NOARP;
-+	dev->features        = NETIF_F_NO_CSUM;
-+}
-+
-+/*
-+ * Function  alloc_candev
-+ * 	Allocates and sets up an CAN device
-+ */
-+struct net_device *alloc_candev(int sizeof_priv)
-+{
-+	struct net_device *dev;
-+	struct can_priv *priv;
-+
-+	dev = alloc_netdev(sizeof_priv, "can%d", can_setup);
-+	if (!dev)
-+		return NULL;
-+
-+	priv = netdev_priv(dev);
-+
-+	priv->baudrate = CAN_BAUDRATE_UNCONFIGURED;
-+	priv->max_brp  = DEFAULT_MAX_BRP;
-+	priv->max_sjw  = DEFAULT_MAX_SJW;
-+	spin_lock_init(&priv->irq_lock);
-+
-+	return dev;
-+}
-+EXPORT_SYMBOL(alloc_candev);
-+
-+void free_candev(struct net_device *dev)
-+{
-+	free_netdev(dev);
-+}
-+EXPORT_SYMBOL(free_candev);
diff --git a/target/linux/coldfire/patches/078-m547x_8x_pci_initial.patch b/target/linux/coldfire/patches/078-m547x_8x_pci_initial.patch
deleted file mode 100644
index b311773c3..000000000
--- a/target/linux/coldfire/patches/078-m547x_8x_pci_initial.patch
+++ /dev/null
@@ -1,2623 +0,0 @@
-From 7f92b68c12c1891435c75f7f83a6390b4c73eaa6 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Thu, 10 Jul 2008 19:17:11 -0600
-Subject: [PATCH] Add PCI to m547x/m548x.
-
-LTIBName: m547x-8x-pci-initial
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
-Signed-off-by: Shrek Wu <b16972@freescale.com>
----
- arch/m68k/Kconfig                 |    4 +-
- arch/m68k/coldfire/Makefile       |    7 +-
- arch/m68k/coldfire/ints.c         |    8 +-
- arch/m68k/coldfire/mcf548x-pci.c  |  934 +++++++++++++++++++++++++++++++++++++
- arch/m68k/kernel/Makefile         |    3 +
- arch/m68k/kernel/bios32_mcf548x.c |  631 +++++++++++++++++++++++++
- arch/m68k/kernel/dma.c            |   32 +-
- arch/m68k/mm/kmap.c               |   11 +-
- drivers/pci/access.c              |   16 +-
- drivers/usb/host/Makefile         |    2 +-
- include/asm-m68k/5445x_pci.h      |   94 ++++
- include/asm-m68k/548x_pci.h       |   99 ++++
- include/asm-m68k/io.h             |   65 +++-
- include/asm-m68k/m5485pci.h       |  330 +++++++++++++
- include/asm-m68k/pci.h            |   96 +----
- include/asm-m68k/raw_io.h         |   26 +
- include/asm-m68k/virtconvert.h    |    5 +
- include/linux/pci.h               |    2 +
- 18 files changed, 2250 insertions(+), 115 deletions(-)
- create mode 100644 arch/m68k/coldfire/mcf548x-pci.c
- create mode 100644 arch/m68k/kernel/bios32_mcf548x.c
- create mode 100644 include/asm-m68k/5445x_pci.h
- create mode 100644 include/asm-m68k/548x_pci.h
- create mode 100644 include/asm-m68k/m5485pci.h
-
---- a/arch/m68k/Kconfig
-+++ b/arch/m68k/Kconfig
-@@ -175,8 +175,8 @@ config HADES
- 	  to use this kernel on a Hades, say Y here; otherwise say N.
- 
- config PCI
--	bool
--	depends on HADES || M54455
-+	bool "PCI bus support"
-+	depends on HADES || M54455 || M547X_8X
- 	default n
- 	help
- 	  Find out whether you have a PCI motherboard. PCI is the name of a
---- a/arch/m68k/coldfire/Makefile
-+++ b/arch/m68k/coldfire/Makefile
-@@ -3,12 +3,17 @@
- #
- 
- obj-y:= entry.o config.o cache.o signal.o muldi3.o traps.o ints.o
--
-+ifdef CONFIG_M5445X
- ifneq ($(strip $(CONFIG_USB) $(CONFIG_USB_GADGET_MCF5445X)),)
- 	obj-y	+= usb.o usb/
- endif
-+endif
- 
-+ifdef CONFIG_M547X_8X
-+obj-$(CONFIG_PCI)       += mcf548x-pci.o
-+else
- obj-$(CONFIG_PCI)	+= pci.o mcf5445x-pci.o iomap.o
-+endif
- obj-$(CONFIG_M5445X)	+= mcf5445x-devices.o
- obj-$(CONFIG_M547X_8X)	+= m547x_8x-devices.o
- obj-$(CONFIG_M547X_8X)	+= mcf548x-devices.o
---- a/arch/m68k/coldfire/ints.c
-+++ b/arch/m68k/coldfire/ints.c
-@@ -192,6 +192,8 @@ int setup_irq(unsigned int irq, struct i
- 		/* Can't share interrupts unless both agree to */
- 		if (!((*prev)->flags & node->flags & IRQF_SHARED)) {
- 			spin_unlock_irqrestore(&contr->lock, flags);
-+			printk(KERN_INFO "%s: -BUSY-Incorrect IRQ %d \n",
-+				__FUNCTION__, irq);
- 			return -EBUSY;
- 		}
- 		while (*prev)
-@@ -219,9 +221,11 @@ int request_irq(unsigned int irq,
- 	struct irq_node *node = get_irq_node();
- 	int res;
- 
--	if (!node)
-+	if (!node) {
-+		printk(KERN_INFO "%s:get_irq_node error %x\n",
-+			__FUNCTION__,(unsigned int) node);
- 		return -ENOMEM;
--
-+	}
- 	node->handler = handler;
- 	node->flags   = flags;
- 	node->dev_id  = dev_id;
---- /dev/null
-+++ b/arch/m68k/coldfire/mcf548x-pci.c
-@@ -0,0 +1,934 @@
-+/*
-+ * 	ColdFire 547x/548x PCI Host Controller functions
-+ */
-+#include <linux/kernel.h>
-+#include <linux/types.h>
-+#include <linux/init.h>
-+#include <linux/mm.h>
-+#include <linux/string.h>
-+#include <linux/pci.h>
-+#include <linux/ioport.h>
-+#include <linux/slab.h>
-+#include <linux/version.h>
-+#include <linux/interrupt.h>
-+
-+#include <linux/dma-mapping.h>
-+#include <asm/coldfire.h>
-+#include <asm/io.h>
-+#include <asm/m5485sim.h>
-+#include <asm/m5485pci.h>
-+#include <asm/irq.h>
-+#include <asm/pci.h>
-+#include <asm/virtconvert.h>
-+
-+
-+#undef DEBUG
-+//#define DEBUG
-+
-+#ifdef DEBUG
-+//#define DBG(x...) printk(KERN_DEBUG x)
-+#define DBG(x...) printk(x)
-+#else
-+#define DBG(x...)
-+#endif
-+
-+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,75))
-+# define irqreturn_t void
-+# define IRQ_HANDLED
-+# define IRQ_NONE
-+#endif
-+
-+/*
-+ *  Bridge configration dafaults
-+ */
-+#define PCI_RETRIES	0
-+#define PCI_CACHE_LINE 	8
-+#define PCI_MINGNT	1
-+#define PCI_MAXLAT	42
-+
-+
-+/*
-+ *  Initiator windows setting
-+ */
-+#define HOST_MEM_BASE    	0xD0000000	/* ColdFire Memory window base 	*/
-+#define PCI_MEM_BASE    	0xD0000000	/* PCI Memory window base	*/
-+#define PCI_MEM_SIZE    	0x08000000	/* Memory window size (128M)	*/
-+#define HOST_IO_BASE     	0xD8000000	/* ColdFire I/O window base 	*/
-+#define PCI_IO_BASE_ADDR     	0x00000000	/* PCI I/O window base 		*/
-+#define PCI_IO_SIZE     	0x00010000	/* I/O window size (64K) 	*/
-+#define HOST_CFG_BASE    	0xD8000000	/* ColdFire config window base 	*/
-+#define HOST_DMA_BASE 	 CONFIG_SDRAM_BASE	/* ColdFire PCI-DMA window base */
-+#define PCI_HDR_BASE    	(MCF_MBAR+0xB00)/* ColdFire config registers    */
-+
-+#define PCI_MEM_MASK		(PCI_MEM_SIZE-1)
-+#define PCI_IO_MASK		(PCI_IO_SIZE-1)
-+
-+/* Macro to set initiator window */
-+#define WxBAR(host_address, pci_address, size) 	\
-+	(((host_address)  & 0xff000000)      |	\
-+    	((((size)-1) & 0xff000000) >> 8)     | 	\
-+	((pci_address) & 0xff000000) >> 16)
-+
-+/*
-+ *  BIOS internal data
-+ */
-+static u8 revision;		/* controller revision */
-+
-+/*
-+ * 	Board specific setting
-+ */
-+const unsigned int irq_lines[] = { 5, 7 };
-+
-+#define N_SLOTS      	(sizeof(board_info) / sizeof(board_info[0]))
-+#define N_IRQS		(sizeof(irq_lines)  / sizeof(irq_lines[0]))
-+#define BRIDGE_SLOT  	0
-+
-+const struct slotinfo {
-+	unsigned char idsel;	/* device number     */
-+	unsigned char irq;	/* external IRQ      */
-+	unsigned char req;	/* REQ line number   */
-+	unsigned char gnt;	/* GNT line number   */
-+} board_info[] = {
-+	{0,  0, 0, 0},		/* Bridge      */
-+	{17, 5, 1, 1},		/* Slot #1     */
-+	{18, 5, 2, 2},		/* Slot #2     */	
-+	{20, 7, 3, 3},		/* Slot #3     */
-+	{21, 7, 4, 4},		/* Slot #4     */
-+};
-+
-+/************************************************************************/
-+
-+/*
-+ * static int mk_conf_addr()
-+ *
-+ * Return type0 or type1 configuration address
-+ * by the means of device address and PCI dword location
-+ * 0 - for not existing slots
-+ */
-+static int mk_conf_addr(/*struct pci_dev *dev*/struct pci_bus *bus, unsigned int devfn, int where)
-+{
-+	int slot, func, address, idsel, dev_fn;
-+
-+	if (bus->number) {
-+		address = MCF_PCICAR_E | (bus->number << 16) |
-+		    (devfn << 8) | (where & 0xfc);
-+	} else {
-+		slot = PCI_SLOT(devfn);
-+		if (slot > N_SLOTS || slot == BRIDGE_SLOT)
-+			return 0;
-+		else {
-+			func = PCI_FUNC(devfn);
-+			idsel = board_info[slot].idsel;
-+
-+			dev_fn = PCI_DEVFN(idsel, func);
-+			address = MCF_PCICAR_E | (bus->number << 16) |
-+			    (dev_fn << 8) | (where & 0xfc);
-+		}
-+	}
-+
-+	return (address);
-+}
-+
-+/*
-+ * static int read_config_byte()
-+ *
-+ * Read a byte from configuration space of specified device
-+ */
-+static int read_config_byte(/*struct pci_dev *dev*/struct pci_bus *bus, unsigned int devfn, int where, u8 *value)
-+{
-+	int slot;
-+	int address;
-+	int result;
-+
-+	*value = 0xff;
-+	result = PCIBIOS_SUCCESSFUL;
-+
-+	slot = PCI_SLOT(devfn);
-+	if (slot == BRIDGE_SLOT) {
-+		if (where <= 0x40)
-+			*value = *(volatile u8 *) (PCI_HDR_BASE + (where ^ 3));
-+		else
-+			*value = 0;
-+	} else {
-+		address = mk_conf_addr(bus, devfn, where);
-+		if (!address)
-+			result = PCIBIOS_DEVICE_NOT_FOUND;
-+		else {
-+			MCF_PCICAR = address;
-+			*value = *(volatile u8 *) (HOST_CFG_BASE + (where & 3));
-+		}
-+	}
-+	__asm__ __volatile__("nop");
-+	__asm__ __volatile__("nop");
-+	MCF_PCICAR &= ~MCF_PCICAR_E;
-+
-+	DBG("PCI: read_config_byte bus=%d, devfn=%d, addr=0x%02X, val=0x%02X, ret=%02X\n",
-+	    bus->number, devfn, where, *value, result);
-+
-+	return (result);
-+}
-+
-+/*
-+ * static int read_config_word()
-+ *
-+ * Read a word from configuration space of specified device
-+ */
-+static int read_config_word(/*struct pci_dev *dev*/struct pci_bus *bus, unsigned int devfn, int where, u16 *value)
-+{
-+	int slot;
-+	int address;
-+	int result;
-+
-+	*value = 0xffff;
-+	result = PCIBIOS_SUCCESSFUL;
-+
-+	if (where & 0x1)
-+		result = PCIBIOS_BAD_REGISTER_NUMBER;
-+	else {
-+		slot = PCI_SLOT(devfn);
-+		if (slot == BRIDGE_SLOT) {
-+			if (where <= 0x3f)
-+				*value =
-+				    *(volatile u16 *) (PCI_HDR_BASE +
-+						       (where ^ 2));
-+			else
-+				*value = 0;
-+		} else {
-+			address = mk_conf_addr(bus, devfn, where);
-+			if (!address)
-+				result = PCIBIOS_DEVICE_NOT_FOUND;
-+			else {
-+				MCF_PCICAR = address;
-+				*value = le16_to_cpu(*(volatile u16 *)
-+						     (HOST_CFG_BASE +
-+						      (where & 2)));
-+			}
-+		}
-+	}
-+        __asm__ __volatile__("nop");
-+        __asm__ __volatile__("nop");
-+	MCF_PCICAR &= ~MCF_PCICAR_E;
-+
-+	DBG("PCI: read_config_word bus=%d, devfn=%d, addr=0x%02X, val=0x%04X ret=%02X\n",
-+	    bus->number, devfn, where, *value, result);
-+
-+	return (result);
-+}
-+
-+/*
-+ * static int read_config_dword()
-+ *
-+ * Read a long word from configuration space of specified device
-+ */
-+static int read_config_dword(/*struct pci_dev *dev*/struct pci_bus *bus, unsigned int devfn, int where, u32 *value)
-+{
-+	int slot;
-+	int address;
-+	int result;
-+
-+	*value = 0xffffffff;
-+	result = PCIBIOS_SUCCESSFUL;
-+
-+	if (where & 0x3)
-+		result = PCIBIOS_BAD_REGISTER_NUMBER;
-+	else {
-+		slot = PCI_SLOT(devfn);
-+		if (slot == BRIDGE_SLOT) {
-+			if (where <= 0x3d)
-+				*value =
-+				    *(volatile u32 *) (PCI_HDR_BASE + where);
-+			else
-+				*value = 0;
-+			__asm__ __volatile__("nop");
-+        		__asm__ __volatile__("nop");
-+		} else {
-+			address = mk_conf_addr(bus, devfn, where);
-+			if (!address)
-+				result = PCIBIOS_DEVICE_NOT_FOUND;
-+			else {
-+				MCF_PCICAR = address;
-+				*value = le32_to_cpu(*(volatile u32 *)
-+						     (HOST_CFG_BASE));
-+				__asm__ __volatile__("nop");
-+				__asm__ __volatile__("nop");
-+				if (bus->number != 0 && revision < 1) {
-+					volatile u32 temp;
-+
-+					MCF_PCICAR |= 0xff0000;
-+					temp = *(volatile u32 *) (HOST_CFG_BASE);
-+				}
-+			}
-+		}
-+	}
-+
-+	MCF_PCICAR &= ~MCF_PCICAR_E;
-+
-+	DBG("PCI: read_config_dword bus=%d, devfn=%d, addr=0x%02X, value=0x%08X ret=%02X\n",
-+	     bus->number, devfn, where, *value, result);
-+
-+	return (result);
-+}
-+
-+/*
-+ * static int write_config_byte()
-+ *
-+ * Write a byte to configuration space of specified device
-+ */
-+static int write_config_byte(/*struct pci_dev *dev*/struct pci_bus *bus, unsigned int devfn, int where, u8 value)
-+{
-+	int slot;
-+	int address;
-+	int result;
-+
-+	result = PCIBIOS_SUCCESSFUL;
-+
-+	slot = PCI_SLOT(devfn);
-+	if (slot == BRIDGE_SLOT) {
-+		if (where <= 0x40)
-+			*(volatile u8 *) (PCI_HDR_BASE + (where ^ 3)) = value;
-+	} else {
-+		address = mk_conf_addr(bus, devfn, where);
-+		if (!address)
-+			result = PCIBIOS_DEVICE_NOT_FOUND;
-+		else {
-+			MCF_PCICAR = address;
-+			*(volatile u8 *) (HOST_CFG_BASE + (where & 3)) = value;
-+		}
-+	}
-+        __asm__ __volatile__("nop");
-+        __asm__ __volatile__("nop");
-+	MCF_PCICAR &= ~MCF_PCICAR_E;
-+
-+	DBG("PCI: write_config_byte bus=%d, devfn=%d, addr=0x%02X, value=0x%02X ret=%02X\n",
-+	     bus->number, devfn, where, value, result);
-+
-+	return (result);
-+}
-+
-+/*
-+ * static int write_config_word()
-+ *
-+ * Write a word to configuration space of specified device
-+ */
-+static int write_config_word(/*struct pci_dev *dev*/struct pci_bus *bus, unsigned int devfn, int where, u16 value)
-+{
-+	int slot;
-+	int address;
-+	int result;
-+
-+	result = PCIBIOS_SUCCESSFUL;
-+
-+	if (where & 0x1)
-+		result = PCIBIOS_BAD_REGISTER_NUMBER;
-+	else {
-+		slot = PCI_SLOT(devfn);
-+		if (slot == BRIDGE_SLOT) {
-+			if (where <= 0x3f)
-+				*(volatile u16 *) (PCI_HDR_BASE + (where ^ 2)) =
-+				    value;
-+		} else {
-+			address = mk_conf_addr(bus, devfn, where);
-+			if (!address)
-+				result = PCIBIOS_DEVICE_NOT_FOUND;
-+			else {
-+				MCF_PCICAR = address;
-+				*(volatile u16 *) (HOST_CFG_BASE + (where & 2)) =
-+				    cpu_to_le16(value);
-+			}
-+		}
-+	}
-+	__asm__ __volatile__("nop");
-+        __asm__ __volatile__("nop");
-+	MCF_PCICAR &= ~MCF_PCICAR_E;
-+
-+	DBG("PCI: write_config_word bus=%d, devfn=%d, addr=0x%02X, value=0x%04X ret=%02X\n",
-+	     bus->number, devfn, where, value, result);
-+
-+	return (result);
-+}
-+
-+/*
-+ * static int write_config_dword()
-+ *
-+ * Write a long word to configuration space of specified device
-+ */
-+static int write_config_dword(/*struct pci_dev *dev*/struct pci_bus *bus, unsigned int devfn, int where, u32 value)
-+{
-+	int slot;
-+	int address;
-+	int result;
-+
-+	result = PCIBIOS_SUCCESSFUL;
-+
-+	if (where & 0x3)
-+		result = PCIBIOS_BAD_REGISTER_NUMBER;
-+	else {
-+		slot = PCI_SLOT(devfn);
-+		if (slot == BRIDGE_SLOT) {
-+			if (where <= 0x3d)
-+				*(volatile u32 *) (PCI_HDR_BASE + where) =
-+				    value;
-+		} else {
-+			address = mk_conf_addr(bus, devfn, where);
-+			if (!address)
-+				result = PCIBIOS_DEVICE_NOT_FOUND;
-+			else {
-+				MCF_PCICAR = address;
-+				*(volatile u32 *) (HOST_CFG_BASE) =
-+				    cpu_to_le32(value);
-+			}
-+		}
-+	}
-+	__asm__ __volatile__("nop");
-+        __asm__ __volatile__("nop");
-+	MCF_PCICAR &= ~MCF_PCICAR_E;
-+
-+	DBG("PCI: write_config_dword dev=%d, fn=%d, addr=0x%02X, value=0x%08X ret=%02X\n",
-+	    PCI_SLOT(devfn), PCI_FUNC(devfn), where,  value, result);
-+
-+	return (result);
-+}
-+
-+static int config_read(struct pci_bus *bus, unsigned int devfn,
-+		       int where, int size, u32 * val)
-+{
-+	switch (size) {
-+	case 1:
-+		return read_config_byte(bus, devfn, where, (u8 *) val);
-+	case 2:
-+		return read_config_word(bus, devfn, where, (u16 *) val);
-+	default:
-+		return read_config_dword(bus, devfn, where, val);
-+	}
-+}
-+
-+static int config_write(struct pci_bus *bus, unsigned int devfn,
-+			int where, int size, u32 val)
-+{
-+	switch (size) {
-+	case 1:
-+		return write_config_byte(bus, devfn, where, (u8) val);
-+	case 2:
-+		return write_config_word(bus, devfn, where, (u16) val);
-+	default:
-+		return write_config_dword(bus, devfn, where, val);
-+	}
-+}
-+
-+/*
-+ *  configuration routines entry points
-+ */
-+static struct pci_ops bus_ops = {
-+      read:		config_read,
-+      write:		config_write
-+};
-+
-+/************************************************************************/
-+
-+/*
-+ * u8 pci_inb()
-+ *
-+ * Read a byte at specified address from I/O space
-+ */
-+unsigned char pci_inb(long addr)
-+{
-+	char value;
-+
-+	value = *(volatile unsigned char *) (HOST_IO_BASE | (addr & PCI_IO_MASK));
-+	DBG("PCI: inb addr=0x%08X, value=0x%02X\n", addr, value);
-+
-+	return (unsigned char) value;
-+}
-+
-+
-+/*
-+ * u16 pci_inw()
-+ *
-+ * Read a word at specified address from I/O space
-+ */
-+unsigned short pci_inw(long addr)
-+{
-+	short value;
-+	volatile unsigned short *ptr;
-+
-+	ptr = (volatile unsigned short *) (HOST_IO_BASE | (addr & PCI_IO_MASK));
-+	value = le16_to_cpu(*ptr);
-+
-+	DBG("PCI: inw addr=0x%08X, value=0x%04X\n",  addr, value);
-+	return (unsigned short) value;
-+}
-+
-+/*
-+ * u16 pci_raw_inw()
-+ *
-+ * Read a raw word at specified address from I/O space
-+ */
-+unsigned short pci_raw_inw(long addr)
-+{
-+	short value;
-+	volatile unsigned short *ptr;
-+
-+	ptr = (volatile unsigned short *) (HOST_IO_BASE | (addr & PCI_IO_MASK));
-+	value = *ptr;
-+
-+	DBG("PCI: raw_inw addr=0x%08X, value=0x%04X\n",  addr, value);
-+	return (unsigned short) value;
-+}
-+
-+/*
-+ * u32 pci_inl()
-+ *
-+ * Read a dword at specified address from I/O space
-+ */
-+unsigned long pci_inl(long addr)
-+{
-+	long value;
-+	volatile unsigned long *ptr;
-+
-+	ptr = (volatile unsigned long *) (HOST_IO_BASE | (addr & PCI_IO_MASK));
-+	value = le32_to_cpu(*ptr);
-+
-+	DBG("PCI: inl addr=0x%08X, value=0x%08X\n",  addr, value);
-+	return (unsigned long) value;
-+}
-+
-+/*
-+ * u32 pci_raw_inl()
-+ *
-+ * Read a raw dword at specified address from I/O space
-+ */
-+unsigned long pci_raw_inl(long addr)
-+{
-+	long value;
-+	volatile unsigned long *ptr;
-+
-+	ptr = (volatile unsigned long *) (HOST_IO_BASE | (addr & PCI_IO_MASK));
-+	value = *ptr;
-+
-+	DBG("PCI: raw_inl addr=0x%08X, value=0x%08X\n",  addr, value);
-+	return (unsigned long) value;
-+}
-+
-+/*
-+ * void pci_outb()
-+ *
-+ * Write a byte value at specified address to I/O space
-+ */
-+void pci_outb( unsigned char value,  long addr)
-+{
-+
-+	*(volatile unsigned char *) (HOST_IO_BASE | (addr & PCI_IO_MASK)) = value;
-+	DBG("PCI: outb addr=0x%08X, value=0x%02X\n",  addr, value);
-+}
-+
-+
-+/*
-+ * void pci_outw()
-+ *
-+ * Write a word value at specified address to I/O space
-+ */
-+void pci_outw(volatile unsigned short value, volatile  long addr)
-+{
-+	volatile unsigned short *ptr;
-+
-+	ptr = (volatile unsigned short *) (HOST_IO_BASE | (addr & PCI_IO_MASK));
-+	*ptr = cpu_to_le16(value);
-+	DBG("PCI: outw addr=0x%08X, value=0x%04X\n",  addr, value);
-+}
-+
-+/*
-+ * void pci_raw_outw()
-+ *
-+ * Write a raw word value at specified address to I/O space
-+ */
-+void pci_raw_outw(volatile unsigned short value, volatile  long addr)
-+{
-+	volatile unsigned short *ptr;
-+
-+	ptr = (volatile unsigned short *) (HOST_IO_BASE | (addr & PCI_IO_MASK));
-+	*ptr = value;
-+	DBG("PCI: raw_outw addr=0x%08X, value=0x%04X\n",  addr, value);
-+}
-+
-+/*
-+ * void pci_outl()
-+ *
-+ * Write a long word value at specified address to I/O space
-+ */
-+void pci_outl(volatile unsigned long value, volatile long addr)
-+{
-+	volatile unsigned long *ptr;
-+
-+	ptr = (volatile unsigned long *)(HOST_IO_BASE | (addr & PCI_IO_MASK));
-+	*ptr = cpu_to_le32(value);
-+	DBG("PCI: outl addr=0x%08X, value=0x%08X\n", addr, value);
-+}
-+
-+/*
-+ * void pci_raw_outl()
-+ *
-+ * Write a raw long word value at specified address to I/O space
-+ */
-+void pci_raw_outl(volatile unsigned long value, volatile long addr)
-+{
-+	volatile unsigned long *ptr;
-+
-+	ptr = (volatile unsigned long *)(HOST_IO_BASE | (addr & PCI_IO_MASK));
-+	*ptr = value;
-+	DBG("PCI: raw_outl addr=0x%08X, value=0x%08X\n", addr, value);
-+}
-+
-+/*
-+ * void pci_insb()
-+ *
-+ * Read several byte values from specified I/O port
-+ */
-+void pci_insb(volatile unsigned char *addr, unsigned char *buf, int len)
-+{
-+	for (; len--; buf++)
-+		*buf = pci_inb((unsigned long)addr);
-+	DBG("PCI: pci_insb addr=0x%08X, buf=%p, len=%d\n", addr, buf, len);
-+}
-+
-+
-+/*
-+ * void pci_insw()
-+ *
-+ * Read several word values from specified I/O port
-+ */
-+void pci_insw(volatile unsigned short *addr, unsigned short *buf, int len)
-+{
-+	for (; len--; buf++)
-+		*buf = pci_inw((unsigned long)addr);
-+	DBG("PCI: pci_insw addr=0x%08X, buf=%p, len=%d\n", addr, buf, len);
-+}
-+
-+/*
-+ * void pci_insl()
-+ *
-+ * Read several dword values from specified I/O port
-+ */
-+void pci_insl(volatile unsigned long *addr, unsigned long *buf, int len)
-+{
-+	for (; len--; buf++)
-+		*buf = pci_inl((unsigned long)addr);
-+	DBG("PCI: pci_insl addr=0x%08X, buf=%p, len=%d\n", addr, buf, len);
-+}
-+
-+/*
-+ * void pci_outsb()
-+ *
-+ * Write several byte values to specified I/O port
-+ */
-+void pci_outsb(volatile unsigned char *addr, const unsigned char *buf, int len)
-+{
-+	for (; len--; buf++)
-+		pci_outb((unsigned long)addr, *buf);
-+	DBG("PCI: pci_outsb addr=0x%08X, buf=%p, len=%d\n", addr, buf, len);
-+}
-+
-+/*
-+ * void pci_outsw()
-+ *
-+ * Write several word values to specified I/O port
-+ */
-+void pci_outsw(volatile unsigned short *addr, const unsigned short *buf, int len)
-+{
-+	for (; len--; buf++)
-+		pci_outw((unsigned long)addr, *buf);
-+	DBG("PCI: pci_outsw addr=0x%08X, buf=%p, len=%d\n", addr, buf, len);
-+}
-+
-+/*
-+ * void pci_outsl()
-+ *
-+ * Write several dword values to specified I/O port
-+ */
-+void pci_outsl(volatile unsigned long *addr, const unsigned long *buf, int len)
-+{
-+	for (; len--; buf++)
-+		pci_outl((unsigned long)addr, *buf);
-+	DBG("PCI: pci_outsl addr=0x%08X, buf=%p, len=%d\n", addr, buf, len);
-+}
-+
-+/*
-+ * void pci_xlb_handler()
-+ *
-+ * PCI XLB interrupt handler
-+ */
-+irqreturn_t xlb_interrupt(int irq, void *dev)
-+{
-+	volatile int xlb_error = MCF_PCIISR;
-+
-+	/* Acknowlege interrupt */
-+	MCF_PCIISR = xlb_error;
-+
-+	/* Dump interrupt reason */
-+	if (xlb_error & MCF_PCIISR_RE)
-+		DBG("PCI: Retry Error Received\n");
-+		
-+	if (xlb_error & MCF_PCIISR_IA)
-+		DBG("PCI: Initiator Abort Received\n");
-+		
-+	if (xlb_error & MCF_PCIISR_TA)
-+		DBG("PCI: Target Abort Received\n");
-+
-+	return IRQ_HANDLED;
-+}
-+
-+
-+/*
-+ * void pci_arbiter_handler()
-+ *
-+ * PCI arbiter interrupt handler
-+ */
-+irqreturn_t arb_interrupt(int irq, void *dev)
-+{
-+	volatile unsigned long arb_error = MCF_PCIARB_PASR;
-+
-+	/* Acknowlege interrupt */
-+	printk("%s\n",__FUNCTION__);
-+	MCF_PCIARB_PASR = arb_error;
-+
-+	if (arb_error & MCF_PCIARB_PASR_ITLMBK) {
-+		DBG("PCI: coldfire master time-out\n");				
-+				
-+		/* Set infinite  number of retries */			
-+	        MCF_PCIICR &= ~0xFF;		    		
-+	}
-+		
-+	if (arb_error & MCF_PCIARB_PASR_EXTMBK(0x1F)) {
-+		arb_error >>= 17;
-+		DBG("PCI: external master time-out (mask = 0x%X)\n", arb_error);
-+		
-+	        /* raise arbitration priority level */		
-+		MCF_PCIARB_PACR = MCF_PCIARB_PACR_EXTMPRI(arb_error);
-+	}
-+
-+	return IRQ_HANDLED;
-+}
-+
-+
-+/*
-+ * void pci_eint_handler()
-+ *
-+ * Eport interrupt handler
-+ */
-+irqreturn_t eint_handler(int irq, void *dev)
-+{
-+	/* Just acknowlege interrupt and exit */
-+	MCF_EPFR = 0x1 << (irq - 64);
-+	return IRQ_HANDLED;
-+}
-+
-+
-+/*
-+ * void __init coldfire_fixup(int pci_modify)
-+ *
-+ * Assign IRQ numbers as used by Linux to the interrupt pins
-+ * of the PCI cards.
-+ */
-+static void __init coldfire_fixup(int pci_modify)
-+{
-+	struct pci_dev *dev;
-+	unsigned char slot, pin;
-+
-+	DBG("%s\n",__FUNCTION__);
-+#ifdef NL_ORIGINAL
-+	pci_for_each_dev(dev) {
-+#else
-+	dev = NULL;
-+	while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
-+#endif
-+		if (dev->class >> 16 != PCI_BASE_CLASS_BRIDGE) {
-+			slot = PCI_SLOT(dev->devfn);
-+			dev->irq = 64 + board_info[slot].irq;
-+
-+			/* Check if device needs interrupt */
-+#ifdef NL_ORIGINAL
-+			pcibios_read_config_byte(
-+				    dev->bus->number, dev->devfn,
-+    				    PCI_INTERRUPT_PIN, &pin);
-+
-+			if ( pin ) {
-+				pcibios_write_config_byte(
-+					dev->bus->number, dev->devfn,
-+					PCI_INTERRUPT_LINE, dev->irq);
-+			}
-+#else
-+			pci_read_config_byte(dev,
-+    				    PCI_INTERRUPT_PIN, &pin);
-+
-+			if ( pin ) {
-+				pci_write_config_byte(dev,
-+					PCI_INTERRUPT_LINE, dev->irq);
-+			}
-+#endif
-+		}
-+	}
-+}
-+
-+static void __init configure_device(struct pci_dev *dev)
-+{
-+	/* TODO: This should depend from disable_pci_burst setting */
-+	DBG("%s\n",__FUNCTION__);
-+#ifdef NL_ORIGINAL
-+	pcibios_write_config_byte(bus, devfn, PCI_CACHE_LINE_SIZE, PCI_CACHE_LINE);
-+#else
-+	pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE, PCI_CACHE_LINE);
-+#endif
-+}
-+
-+struct pci_bus_info *__init init_coldfire_pci(void)
-+{
-+	static struct pci_bus_info bus;
-+	int i;
-+	int pci_mem_va;
-+	static char irq_name[N_IRQS][15];
-+
-+	/* Get controller revision */
-+	revision = MCF_PCICCRIR;
-+	printk("ColdFire PCI Host Bridge (Rev. %d) detected:"
-+		"MEMBase %x,MEMLen %x,IOBase %x,IOLen %x\n",
-+		revision, HOST_MEM_BASE, PCI_MEM_SIZE - 1, 0, PCI_IO_SIZE - 1);
-+
-+	/* Setup bus info structure. */
-+	memset(&bus, 0, sizeof (struct pci_bus_info));
-+
-+	/* Request intiator memory resource */
-+	bus.mem_space.start = PCI_MEM_BASE;//HOST_MEM_BASE;
-+	bus.mem_space.end = bus.mem_space.start + PCI_MEM_SIZE - 1;
-+	bus.mem_space.name = "PCI Bus #0";
-+	if (request_resource(&iomem_resource, &bus.mem_space) != 0)
-+	{
-+		printk("Failed to request bridge iomem resource\n");
-+		return NULL;
-+	}
-+
-+	/* Request intiator memory resource */
-+	bus.io_space.start = 0;
-+	bus.io_space.end = bus.io_space.start + PCI_IO_SIZE - 1;
-+	bus.io_space.name =  "PCI Bus #0";
-+	if (request_resource(&ioport_resource, &bus.io_space) != 0)
-+	{
-+		printk("Failed to request bridge ioport resource\n");
-+		return NULL;
-+	}
-+
-+	/* Set up the arbiter */
-+	MCF_PCIARB_PACR = 0 /*MCF_PCIARB_PACR_PKMD*/
-+			| MCF_PCIARB_PACR_INTMPRI 
-+			| MCF_PCIARB_PACR_INTMINTEN 
-+			| MCF_PCIARB_PACR_EXTMPRI(0x1F) 
-+			| MCF_PCIARB_PACR_EXTMINTEN(0x1F);
-+
-+	/* GNT and REQ */
-+	MCF_PAR_PCIBG = 0x3FF;
-+	MCF_PAR_PCIBR = 0x3FF;
-+
-+	/* Enable bus mastering, memory access and MWI */
-+	MCF_PCISCR = MCF_PCISCR_B | MCF_PCISCR_M | MCF_PCISCR_MW;
-+
-+	/* Setup burst parameters */
-+	MCF_PCICR1 = MCF_PCICR1_LATTIMER(32) |
-+	    	     MCF_PCICR1_CACHELINESIZE(PCI_CACHE_LINE);
-+
-+	MCF_PCICR2 = 0;
-+	/*MCF_PCICR2_MINGNT(PCI_MINGNT) |
-+		MCF_PCICR2_MAXLAT(PCI_MAXLAT);
-+	*/
-+	/* Turn on error signaling */
-+	MCF_PCIICR = MCF_PCIICR_TAE | MCF_PCIICR_IAE | PCI_RETRIES;
-+	MCF_PCIGSCR |= MCF_PCIGSCR_SEE;
-+	/*
-+	 * Configure Initiator Windows
-+	 * Window 0: 128M PCI Memory @ HOST_MEM_BASE, 1:1 mapping
-+	 * Window 1: 64K  I/O Memory @ HOST_IO_BASE,  1:0 mapping
-+	 */
-+	MCF_PCIIW0BTAR = WxBAR(HOST_MEM_BASE, PCI_MEM_BASE, PCI_MEM_SIZE);
-+	MCF_PCIIW1BTAR = WxBAR(HOST_IO_BASE,  PCI_IO_BASE_ADDR,  PCI_IO_SIZE);
-+
-+	MCF_PCIIWCR = MCF_PCIIWCR_WINCTRL1_IO |
-+	    	      MCF_PCIIWCR_WINCTRL0_MEMRDLINE;
-+
-+	/* Target PCI DMA Windows */
-+	MCF_PCIBAR1   = PCI_DMA_BASE;
-+	MCF_PCITBATR1 = HOST_DMA_BASE | MCF_PCITBATR1_EN;
-+        MCF_PCIBAR0   = MCF_RAMBAR0;;
-+        MCF_PCITBATR0 = MCF_RAMBAR0 | MCF_PCITBATR0_EN;
-+        DBG("PCI TCR %x,MCF_PCIBAR1 %x,MCF_PCITBATR1 %x."
-+		"MCF_PCIBAR0 %x,MCF_PCITBATR9 %x\n", MCF_PCITCR, MCF_PCIBAR1,
-+		MCF_PCITBATR1, MCF_PCIBAR0, MCF_PCITBATR0);
-+	/* Enable internal PCI controller interrupts */
-+	MCF_ICR(ISC_PCI_XLB) = ILP_PCI_XLB;
-+	/*request_irq(64+ISC_PCI_XLB, xlb_interrupt, 
-+			SA_INTERRUPT, "PCI XL Bus", (void*)-1);
-+	enable_irq (64+ISC_PCI_XLB);
-+	*/
-+        if(request_irq(64+ISC_PCI_XLB, xlb_interrupt, 
-+                         IRQF_DISABLED, "PCI XL Bus", (void*)-1)){
-+		printk("Cannot allocate ISC_PCI_XLB  IRQ\n");
-+                return (struct pci_bus_info *)-EBUSY;
-+	}
-+
-+	MCF_ICR(ISC_PCI_ARB) = ILP_PCI_ARB;
-+	/*request_irq(64+ISC_PCI_ARB, arb_interrupt, 
-+			SA_INTERRUPT, "PCI Arbiter", (void*)-1);
-+	enable_irq (64+ISC_PCI_ARB);
-+	*/
-+        if(request_irq(64+ISC_PCI_ARB, arb_interrupt,
-+                        IRQF_DISABLED, "PCI Arbiter", (void*)-1)){
-+                printk("Cannot allocate ISC_PCI_ARB  IRQ\n");
-+                return (struct pci_bus_info *)-EBUSY;
-+        }
-+
-+	/* Set slots interrupt setting */
-+	for (i = 0; i < N_IRQS; i++) 
-+	{	
-+		/* Set trailing edge for PCI interrupts */
-+		MCF_EPPAR &= ~MCF_EPPAR_EPPA(irq_lines[i], 0x3);
-+		if (irq_lines[i] == 5)
-+			MCF_EPPAR |= MCF_EPPAR_EPPA(irq_lines[i],  MCF_EPPAR_EPPAx_FALLING);
-+		else
-+                        MCF_EPPAR |= MCF_EPPAR_EPPA(irq_lines[i],  0/*MCF_EPPAR_EPPAx_FALLING*/);
-+		/* Turn on irq line in eport */
-+		MCF_EPIER |= MCF_EPIER_EPIE(irq_lines[i]);
-+
-+		/* Enable irq in gpio */
-+		if (irq_lines[i] == 5)
-+		    MCF_PAR_FECI2CIRQ |= 1;
-+		    
-+		if (irq_lines[i] == 6)
-+		    MCF_PAR_FECI2CIRQ |= 2;   
-+
-+		/* Register external interrupt handlers */
-+		sprintf(irq_name[i], "PCI IRQ%d", irq_lines[i]);
-+		/*request_irq(64 + irq_lines[i], eint_handler, 
-+			    SA_SHIRQ, irq_name[i], (void*)-1);
-+		enable_irq(64 + irq_lines[i]);*/
-+        	if(request_irq(64 + irq_lines[i], eint_handler, 
-+				IRQF_SHARED, irq_name[i], (void*)-1)){
-+                	printk("Cannot allocate irq_lines[%d] IRQ\n", irq_lines[i]);
-+                	return (struct pci_bus_info *)-EBUSY;
-+        	}
-+	}
-+
-+	/* Clear PCI Reset and wait for devices to reset */
-+	MCF_PCIGSCR &= ~MCF_PCIGSCR_PR;
-+	schedule_timeout((5 * HZ) / 10);
-+	/* Remap initiator windows (should be 1:1 to the physical memory) */
-+	pci_mem_va = (int) ioremap_nocache(HOST_MEM_BASE, PCI_MEM_SIZE + PCI_IO_SIZE);
-+#if 1
-+	printk("%s: MEMBase_phy %x, Virt %x, len %x\n",__FUNCTION__,
-+		HOST_MEM_BASE,pci_mem_va,PCI_MEM_SIZE + PCI_IO_SIZE);
-+#endif
-+	BUG_ON(pci_mem_va != HOST_MEM_BASE);
-+
-+	/* Setup bios32 and pci bus driver callbacks */
-+	bus.m68k_pci_ops = &bus_ops;
-+	bus.fixup = coldfire_fixup;
-+	bus.conf_device = configure_device;
-+
-+	return &bus;
-+}
-+
---- a/arch/m68k/kernel/Makefile
-+++ b/arch/m68k/kernel/Makefile
-@@ -12,6 +12,9 @@ ifndef CONFIG_COLDFIRE
-   obj-$(CONFIG_PCI) += bios32.o
- else   # CONFIG_COLDFIRE
-   extra-y := ../coldfire/head.o vmlinux.lds
-+ifdef CONFIG_M547X_8X
-+  obj-$(CONFIG_PCI) += bios32_mcf548x.o
-+endif
- endif
- endif
- 
---- /dev/null
-+++ b/arch/m68k/kernel/bios32_mcf548x.c
-@@ -0,0 +1,631 @@
-+/*
-+ * bios32.c - PCI BIOS functions for m68k systems.
-+ *
-+ * Written by Wout Klaren.
-+ *
-+ * Based on the DEC Alpha bios32.c by Dave Rusling and David Mosberger.
-+ */
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+
-+#if 0
-+# define DBG_DEVS(args)		printk args
-+#else
-+# define DBG_DEVS(args)
-+#endif
-+
-+#ifdef CONFIG_PCI
-+
-+/*
-+ * PCI support for Linux/m68k. Currently only the Hades is supported.
-+ *
-+ * The support for PCI bridges in the DEC Alpha version has
-+ * been removed in this version.
-+ */
-+
-+#include <linux/pci.h>
-+#include <linux/slab.h>
-+#include <linux/mm.h>
-+
-+#include <asm/io.h>
-+#include <asm/pci.h>
-+#include <asm/uaccess.h>
-+
-+#define KB		1024
-+#define MB		(1024*KB)
-+#define GB		(1024*MB)
-+
-+#define MAJOR_REV	0
-+#define MINOR_REV	5
-+
-+/*
-+ * Align VAL to ALIGN, which must be a power of two.
-+ */
-+
-+#define MAX(val1, val2)		(((val1) > (val2)) ? val1 : val2)
-+
-+/*
-+ * Offsets relative to the I/O and memory base addresses from where resources
-+ * are allocated.
-+ */
-+
-+#ifdef CONFIG_COLDFIRE
-+#define IO_ALLOC_OFFSET		0x00000100
-+#define MEM_ALLOC_OFFSET	0x00000000
-+#else /* CONFIG_COLDFIRE */
-+#define IO_ALLOC_OFFSET		0x00004000
-+#define MEM_ALLOC_OFFSET	0x04000000
-+#endif /* CONFIG_COLDFIRE */
-+
-+/*
-+ * Declarations of hardware specific initialisation functions.
-+ */
-+
-+extern struct pci_bus_info *init_hades_pci(void);
-+
-+/*
-+ * Bus info structure of the PCI bus. A pointer to this structure is
-+ * put in the sysdata member of the pci_bus structure.
-+ */
-+
-+static struct pci_bus_info *bus_info;
-+
-+static int pci_modify = 1;		/* If set, layout the PCI bus ourself. */
-+static int skip_vga;			/* If set do not modify base addresses
-+					   of vga cards.*/
-+static int disable_pci_burst;		/* If set do not allow PCI bursts. */
-+
-+static unsigned int io_base;
-+static unsigned int mem_base;
-+
-+/*
-+ * static void disable_dev(struct pci_dev *dev)
-+ *
-+ * Disable PCI device DEV so that it does not respond to I/O or memory
-+ * accesses.
-+ *
-+ * Parameters:
-+ *
-+ * dev	- device to disable.
-+ */
-+
-+static void __init disable_dev(struct pci_dev *dev)
-+{
-+	unsigned short cmd;
-+
-+	if (((dev->class >> 8 == PCI_CLASS_NOT_DEFINED_VGA) ||
-+	     (dev->class >> 8 == PCI_CLASS_DISPLAY_VGA) ||
-+	     (dev->class >> 8 == PCI_CLASS_DISPLAY_XGA)) && skip_vga)
-+		return;
-+
-+	pci_read_config_word(dev, PCI_COMMAND, &cmd);
-+
-+	cmd &= (~PCI_COMMAND_IO & ~PCI_COMMAND_MEMORY & ~PCI_COMMAND_MASTER);
-+	pci_write_config_word(dev, PCI_COMMAND, cmd);
-+}
-+
-+/* Stolen from pcibios_enable_resources/i386 */
-+int pcibios_enable_device(struct pci_dev *dev, int mask)
-+{
-+	u16 cmd, old_cmd;
-+	int idx;
-+	struct resource *r;
-+
-+	pci_read_config_word(dev, PCI_COMMAND, &cmd);
-+	old_cmd = cmd;
-+	for(idx=0; idx<6; idx++) {
-+		/* Only set up the requested stuff */
-+		if (!(mask & (1<<idx)))
-+			continue;
-+
-+		r = &dev->resource[idx];
-+		if (!r->start && r->end) {
-+			printk("PCI: Device %s not available because"
-+				" of resource collisions\n", dev->dev.bus_id);
-+			return -EINVAL;
-+		}
-+		if (r->flags & IORESOURCE_IO)
-+			cmd |= PCI_COMMAND_IO;
-+		if (r->flags & IORESOURCE_MEM)
-+			cmd |= PCI_COMMAND_MEMORY;
-+	}
-+	if (dev->resource[PCI_ROM_RESOURCE].start)
-+		cmd |= PCI_COMMAND_MEMORY;
-+	if (cmd != old_cmd) {
-+		printk("PCI: Enabling device %s (%04x -> %04x)\n", dev->dev.bus_id, old_cmd, cmd);
-+		pci_write_config_word(dev, PCI_COMMAND, cmd);
-+	}
-+	return 0;
-+}
-+
-+/*
-+ * static void layout_dev(struct pci_dev *dev)
-+ *
-+ * Layout memory and I/O for a device.
-+ *
-+ * Parameters:
-+ *
-+ * device	- device to layout memory and I/O for.
-+ */
-+
-+static void __init layout_dev(struct pci_dev *dev)
-+{
-+	unsigned short cmd;
-+	unsigned int base, mask, size, reg;
-+	unsigned int alignto;
-+	int i;
-+
-+	/*
-+	 * Skip video cards if requested.
-+	 */
-+	if (((dev->class >> 8 == PCI_CLASS_NOT_DEFINED_VGA) ||
-+	     (dev->class >> 8 == PCI_CLASS_DISPLAY_VGA) ||
-+	     (dev->class >> 8 == PCI_CLASS_DISPLAY_XGA)) && skip_vga){
-+		printk("%s: VGA\n",__FUNCTION__);
-+		return;
-+	}
-+	pci_read_config_word(dev, PCI_COMMAND, &cmd);
-+
-+	for (reg = PCI_BASE_ADDRESS_0, i = 0; reg <= PCI_BASE_ADDRESS_5; reg += 4, i++)
-+	{
-+		/*
-+		 * Figure out how much space and of what type this
-+		 * device wants.
-+		 */
-+
-+		pci_write_config_dword(dev, reg, 0xffffffff);
-+		pci_read_config_dword(dev, reg, &base);
-+		if (!base)
-+		{
-+			/* this base-address register is unused */
-+			dev->resource[i].start = 0;
-+			dev->resource[i].end = 0;
-+			dev->resource[i].flags = 0;
-+			continue;
-+		}
-+
-+		/*
-+		 * We've read the base address register back after
-+		 * writing all ones and so now we must decode it.
-+		 */
-+	
-+		if (base & PCI_BASE_ADDRESS_SPACE_IO)
-+		{
-+			/*
-+			 * I/O space base address register.
-+			 */
-+
-+			cmd |= PCI_COMMAND_IO;
-+
-+			base &= PCI_BASE_ADDRESS_IO_MASK;
-+			mask = (~base << 1) | 0x1;
-+			size = (mask & base) & 0xffffffff;
-+
-+			/*
-+			 * Align to multiple of size of minimum base.
-+			 */
-+
-+#ifdef CONFIG_COLDFIRE
-+			alignto = MAX(PAGE_SIZE, size) ;
-+#else /* CONFIG_COLDFIRE */
-+			alignto = MAX(0x040, size) ;
-+#endif /* CONFIG_COLDFIRE */
-+			base = ALIGN(io_base, alignto);
-+			io_base = base + size;
-+			pci_write_config_dword(dev, reg, base | PCI_BASE_ADDRESS_SPACE_IO);
-+
-+			dev->resource[i].start = base;
-+			dev->resource[i].end = dev->resource[i].start + size - 1;
-+			dev->resource[i].flags = IORESOURCE_IO | PCI_BASE_ADDRESS_SPACE_IO;
-+
-+			DBG_DEVS(("layout_dev: IO address: %x\n", base));
-+		}
-+		else
-+		{
-+			unsigned int type;
-+
-+			/*
-+			 * Memory space base address register.
-+			 */
-+
-+			cmd |= PCI_COMMAND_MEMORY;
-+			type = base & PCI_BASE_ADDRESS_MEM_TYPE_MASK;
-+			base &= PCI_BASE_ADDRESS_MEM_MASK;
-+			mask = (~base << 1) | 0x1;
-+			size = (mask & base) & 0xffffffff;
-+			switch (type)
-+			{
-+			case PCI_BASE_ADDRESS_MEM_TYPE_32:
-+			case PCI_BASE_ADDRESS_MEM_TYPE_64:
-+				break;
-+
-+			case PCI_BASE_ADDRESS_MEM_TYPE_1M:
-+				printk("bios32 WARNING: slot %d, function %d "
-+				       "requests memory below 1MB---don't "
-+				       "know how to do that.\n",
-+				       PCI_SLOT(dev->devfn),
-+				       PCI_FUNC(dev->devfn));
-+				continue;
-+			}
-+			DBG_DEVS(("%s MEM: base %x,type %x,mask %x,size %x\n",
-+				__FUNCTION__, base, type, mask, size));
-+			/*
-+			 * Align to multiple of size of minimum base.
-+			 */
-+
-+			alignto = max_t(unsigned int, 0x1000, size);
-+			base = ALIGN(mem_base, alignto);
-+			mem_base = base + size;
-+			pci_write_config_dword(dev, reg, base);
-+
-+			dev->resource[i].start = base;
-+			dev->resource[i].end = dev->resource[i].start + size - 1;
-+			dev->resource[i].flags = IORESOURCE_MEM;
-+			DBG_DEVS(("%s MEM :base %x,size %x\n",
-+				__FUNCTION__, base, size));
-+			if (type == PCI_BASE_ADDRESS_MEM_TYPE_64)
-+			{
-+				/*
-+				 * 64-bit address, set the highest 32 bits
-+				 * to zero.
-+				 */
-+
-+				reg += 4;
-+				pci_write_config_dword(dev, reg, 0);
-+
-+				i++;
-+				dev->resource[i].start = 0;
-+				dev->resource[i].end = 0;
-+				dev->resource[i].flags = 0;
-+				printk("%s:type == 64\n",__FUNCTION__);
-+			}
-+		}
-+	}
-+
-+	/*
-+	 * Enable device:
-+	 */
-+
-+	if (dev->class >> 8 == PCI_CLASS_NOT_DEFINED ||
-+	    dev->class >> 8 == PCI_CLASS_NOT_DEFINED_VGA ||
-+	    dev->class >> 8 == PCI_CLASS_DISPLAY_VGA ||
-+	    dev->class >> 8 == PCI_CLASS_DISPLAY_XGA)
-+	{
-+		/*
-+		 * All of these (may) have I/O scattered all around
-+		 * and may not use i/o-base address registers at all.
-+		 * So we just have to always enable I/O to these
-+		 * devices.
-+		 */
-+		cmd |= PCI_COMMAND_IO;
-+	}
-+
-+	pci_write_config_word(dev, PCI_COMMAND, cmd | PCI_COMMAND_MASTER);
-+
-+	pci_write_config_byte(dev, PCI_LATENCY_TIMER, (disable_pci_burst) ? 0 : 32);
-+
-+	if (bus_info != NULL)
-+		bus_info->conf_device(dev);	/* Machine dependent configuration. */
-+
-+	printk(KERN_INFO "layout_dev: bus %d  slot 0x%x  VID 0x%x  DID 0x%x  class 0x%x\n",
-+		dev->bus->number, PCI_SLOT(dev->devfn),
-+		dev->vendor, dev->device, dev->class);
-+}
-+
-+/*
-+ * static void layout_bus(struct pci_bus *bus)
-+ *
-+ * Layout memory and I/O for all devices on the given bus.
-+ *
-+ * Parameters:
-+ *
-+ * bus	- bus.
-+ */
-+
-+static void __init layout_bus(struct pci_bus *bus)
-+{
-+	unsigned int bio, bmem;
-+	struct pci_dev *dev;
-+
-+	DBG_DEVS(("layout_bus: starting bus %d\n", bus->number));
-+
-+	if (list_empty(&bus->devices) && list_empty(&bus->children))
-+		return;
-+
-+	/*
-+	 * Align the current bases on appropriate boundaries (4K for
-+	 * IO and 1MB for memory).
-+	 */
-+
-+	bio = io_base = ALIGN(io_base, 4*KB);
-+	bmem = mem_base = ALIGN(mem_base, 1*MB);
-+
-+	/*
-+	 * PCI devices might have been setup by a PCI BIOS emulation
-+	 * running under TOS. In these cases there is a
-+	 * window during which two devices may have an overlapping
-+	 * address range. To avoid this causing trouble, we first
-+	 * turn off the I/O and memory address decoders for all PCI
-+	 * devices.  They'll be re-enabled only once all address
-+	 * decoders are programmed consistently.
-+	 */
-+
-+	DBG_DEVS(("layout_bus: disable_dev for bus %d\n", bus->number));
-+
-+#ifdef NL_ORIGINAL
-+	for (dev = bus->devices; dev; dev = dev->sibling)
-+#else
-+	dev = NULL;
-+	while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL)
-+#endif
-+	{
-+		if ((dev->class >> 16 != PCI_BASE_CLASS_BRIDGE) ||
-+		    (dev->class >> 8 == PCI_CLASS_BRIDGE_PCMCIA))
-+			disable_dev(dev);
-+	}
-+
-+	/*
-+	 * Allocate space to each device:
-+	 */
-+
-+	DBG_DEVS(("layout_bus: starting bus %d devices\n", bus->number));
-+
-+#ifdef NL_ORIGINAL
-+	for (dev = bus->devices; dev; dev = dev->sibling)
-+#else
-+	dev = NULL;
-+	while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL)
-+#endif
-+	{
-+		if ((dev->class >> 16 != PCI_BASE_CLASS_BRIDGE) ||
-+		    (dev->class >> 8 == PCI_CLASS_BRIDGE_PCMCIA))
-+			layout_dev(dev);
-+	}
-+
-+	DBG_DEVS(("layout_bus: bus %d finished\n", bus->number));
-+}
-+
-+/*
-+ * static void pcibios_fixup(void)
-+ *
-+ * Layout memory and I/O of all devices on the PCI bus if 'pci_modify' is
-+ * true. This might be necessary because not every m68k machine with a PCI
-+ * bus has a PCI BIOS. This function should be called right after
-+ * pci_scan_bus() in pcibios_init().
-+ */
-+
-+static void __init pcibios_fixup(void)
-+{
-+	DBG_DEVS(("%s\n", __FUNCTION__));
-+	if (pci_modify)
-+	{
-+		/*
-+		 * Set base addresses for allocation of I/O and memory space.
-+		 */
-+
-+		io_base = bus_info->io_space.start + IO_ALLOC_OFFSET;
-+		mem_base = bus_info->mem_space.start + MEM_ALLOC_OFFSET;
-+
-+		/*
-+		 * Scan the tree, allocating PCI memory and I/O space.
-+		 */
-+
-+#ifdef NL_ORIGINAL
-+		layout_bus(pci_bus_b(pci_root.next));
-+#else
-+		layout_bus(pci_bus_b(pci_root_buses.next));
-+#endif
-+	}
-+
-+	/*
-+	 * Fix interrupt assignments, etc.
-+	 */
-+
-+	bus_info->fixup(pci_modify);
-+}
-+
-+/*
-+ * static void pcibios_claim_resources(struct pci_bus *bus)
-+ *
-+ * Claim all resources that are assigned to devices on the given bus.
-+ *
-+ * Parameters:
-+ *
-+ * bus	- bus.
-+ */
-+
-+static void __init pcibios_claim_resources(struct pci_bus *bus)
-+{
-+	struct pci_dev *dev;
-+	int i;
-+	DBG_DEVS(("%s\n", __FUNCTION__));
-+#ifdef NL_ORIGINAL
-+	while (bus)
-+#else
-+	while ((bus = pci_find_next_bus(bus)) != NULL)
-+#endif
-+	{
-+
-+#ifdef NL_ORIGINAL
-+		for (dev = bus->devices; (dev != NULL); dev = dev->sibling)
-+#else
-+		dev = NULL;
-+		while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL)
-+#endif
-+		{
-+			for (i = 0; i < PCI_NUM_RESOURCES; i++)
-+			{
-+				struct resource *r = &dev->resource[i];
-+				struct resource *pr;
-+				struct pci_bus_info *bus_info = 
-+					(struct pci_bus_info *) dev->sysdata;
-+
-+				if ((r->start == 0) || (r->parent != NULL))
-+					continue;
-+
-+#ifdef CONFIG_COLDFIRE
-+				if (dev->class >> 16 == PCI_BASE_CLASS_BRIDGE)
-+					continue;
-+#endif /* CONFIG_COLDFIRE */
-+#if 1
-+				if (r->flags & IORESOURCE_IO)
-+					pr = &bus_info->io_space;
-+				else
-+					pr = &bus_info->mem_space;
-+#else
-+				if (r->flags & IORESOURCE_IO)
-+					pr = &ioport_resource;
-+				else
-+					pr = &iomem_resource;
-+#endif
-+				if (request_resource(pr, r) < 0)
-+				{
-+#ifdef NL_ORIGINAL
-+					DBG_DEVS(("PCI: Address space collision on "
-+						"region %d of device %s\n", i, dev->name));
-+#else
-+					printk("PCI: Address space collision on region %d of device %s\n", i, dev->dev.bus_id);
-+#endif
-+				}
-+			}
-+		}
-+
-+#ifdef NL_ORIGINAL
-+		if (bus->children)
-+			pcibios_claim_resources(bus->children);
-+#else
-+		if (!list_empty(&bus->children))
-+			pcibios_claim_resources(pci_bus_b(bus->children.next));
-+#endif
-+
-+#ifdef NL_ORIGINAL
-+		bus = bus->next;
-+#endif
-+	}
-+}
-+
-+/*
-+ * int pcibios_assign_resource(struct pci_dev *dev, int i)
-+ *
-+ * Assign a new address to a PCI resource.
-+ *
-+ * Parameters:
-+ *
-+ * dev	- device.
-+ * i	- resource.
-+ *
-+ * Result: 0 if successful.
-+ */
-+
-+int __init pcibios_assign_resource(struct pci_dev *dev, int i)
-+{
-+	struct resource *r = &dev->resource[i];
-+	struct resource *pr = pci_find_parent_resource(dev, r);
-+	unsigned long size = r->end + 1;
-+	DBG_DEVS(("%s:IO_ALLOC_OFFSET %x\n", __FUNCTION__, IO_ALLOC_OFFSET));
-+	if (!pr)
-+		return -EINVAL;
-+
-+	if (r->flags & IORESOURCE_IO)
-+	{
-+		DBG_DEVS(("%s:IORESOURCE_IO:start %x, size %lx\n",
-+			__FUNCTION__, bus_info->io_space.start, size));
-+		if (size > 0x100)
-+			return -EFBIG;
-+
-+#ifdef NL_ORIGINAL
-+		if (allocate_resource(pr, r, size, bus_info->io_space.start +
-+				      IO_ALLOC_OFFSET,  bus_info->io_space.end, 1024))
-+#else
-+		if (allocate_resource(pr, r, size, bus_info->io_space.start +
-+				   IO_ALLOC_OFFSET,  bus_info->io_space.end, 1024, NULL, NULL))
-+#endif
-+			return -EBUSY;
-+	}
-+	else
-+	{
-+		DBG_DEVS(("%s:IORESOURCE_MEM:start %x, size %lx\n",
-+				__FUNCTION__, bus_info->mem_space.start, size));
-+#ifdef NL_ORIGINAL
-+		if (allocate_resource(pr, r, size, bus_info->mem_space.start +
-+				      MEM_ALLOC_OFFSET, bus_info->mem_space.end, size))
-+#else
-+		if (allocate_resource(pr, r, size, bus_info->io_space.start +
-+				   IO_ALLOC_OFFSET,  bus_info->io_space.end, 1024, NULL, NULL))
-+#endif
-+			return -EBUSY;
-+	}
-+
-+	if (i < 6)
-+		pci_write_config_dword(dev, PCI_BASE_ADDRESS_0 + 4 * i, r->start);
-+
-+	return 0;
-+}
-+
-+void pcibios_fixup_bus(struct pci_bus *bus)
-+{
-+	struct pci_dev *dev;
-+	void *sysdata;
-+
-+	sysdata = (bus->parent) ? bus->parent->sysdata : bus->sysdata;
-+
-+#ifdef NL_ORIGINAL
-+	for (dev = bus->devices; (dev != NULL); dev = dev->sibling)
-+#else
-+	dev = NULL;
-+	while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL)
-+#endif
-+		dev->sysdata = sysdata;
-+}
-+
-+int __init pcibios_init(void)
-+{
-+	printk("Linux/m68k PCI BIOS32 revision %x.%02x\n", MAJOR_REV, MINOR_REV);
-+
-+	bus_info = NULL;
-+#ifdef CONFIG_COLDFIRE
-+	bus_info = init_coldfire_pci();
-+#endif /* CONFIG_COLDFIRE */
-+#ifdef CONFIG_HADES
-+	if (MACH_IS_HADES)
-+		bus_info = init_hades_pci();
-+#endif
-+	if (bus_info != NULL)
-+	{
-+		printk("PCI: Probing PCI hardware\n");
-+		pci_scan_bus(0, bus_info->m68k_pci_ops, bus_info);
-+		pcibios_fixup();
-+#ifdef NL_ORIGINAL
-+		pcibios_claim_resources(pci_root);
-+#else
-+		pcibios_claim_resources(pci_bus_b(pci_root_buses.next));
-+#endif
-+	}
-+	else
-+		printk("PCI: No PCI bus detected\n");
-+	return 0;
-+}
-+
-+subsys_initcall(pcibios_init);
-+
-+char * pcibios_setup(char *str)
-+{
-+	if (!strcmp(str, "nomodify"))
-+	{
-+		pci_modify = 0;
-+		return NULL;
-+	}
-+	else if (!strcmp(str, "skipvga"))
-+	{
-+		skip_vga = 1;
-+		return NULL;
-+	}
-+	else if (!strcmp(str, "noburst"))
-+	{
-+		disable_pci_burst = 1;
-+		return NULL;
-+	}
-+
-+	return str;
-+}
-+#endif /* CONFIG_PCI */
---- a/arch/m68k/kernel/dma.c
-+++ b/arch/m68k/kernel/dma.c
-@@ -11,13 +11,24 @@
- #include <linux/kernel.h>
- #include <linux/scatterlist.h>
- #include <linux/vmalloc.h>
--
-+#include <linux/pci.h>
- #include <asm/pgalloc.h>
- 
- void *dma_alloc_coherent(struct device *dev, size_t size,
- 			 dma_addr_t *handle, gfp_t flag)
- {
--#ifndef CONFIG_M5445X
-+#if	defined(CONFIG_M547X_8X) | defined(CONFIG_M54455)
-+        /*
-+	* On the M5445x platform the memory allocated with GFP_DMA
-+	* is guaranteed to be DMA'able.
-+	*/
-+        void *addr;
-+
-+        size = PAGE_ALIGN(size);
-+        addr = kmalloc(size, GFP_DMA);
-+        *handle = virt_to_phys(addr);
-+        return addr;
-+#else
- 	struct page *page, **map;
- 	pgprot_t pgprot;
- 	void *addr;
-@@ -56,17 +67,6 @@ void *dma_alloc_coherent(struct device *
- 	kfree(map);
- 
- 	return addr;
--#else
--	/*
--	 * On the M5445x platform the memory allocated with GFP_DMA
--	 * is guaranteed to be DMA'able.
--	 */
--	void *addr;
--
--	size = PAGE_ALIGN(size);
--	addr = kmalloc(size, GFP_DMA);
--	*handle = virt_to_phys(addr);
--	return addr;
- #endif
- }
- EXPORT_SYMBOL(dma_alloc_coherent);
-@@ -75,10 +75,10 @@ void dma_free_coherent(struct device *de
- 		       void *addr, dma_addr_t handle)
- {
- 	pr_debug("dma_free_coherent: %p, %x\n", addr, handle);
--#ifndef CONFIG_M5445X
--	vfree(addr);
--#else
-+#if	defined(CONFIG_M547X_8X) | defined(CONFIG_M54455)
- 	kfree(addr);
-+#else
-+	vfree(addr);
- #endif
- }
- EXPORT_SYMBOL(dma_free_coherent);
---- a/arch/m68k/mm/kmap.c
-+++ b/arch/m68k/mm/kmap.c
-@@ -153,6 +153,10 @@ void __iomem *__ioremap(unsigned long ph
- 		 */
- 		return (void __iomem *)physaddr;
- 	}
-+        if ((physaddr >= 0xd0000000) && (physaddr + size < 0xd800ffff)) {
-+                printk("ioremap:PCI 0x%lx,0x%lx(%d) - PCI area hit\n", physaddr, size, cacheflag);
-+                return (void *)physaddr;
-+        }
- #endif
- 
- #ifdef DEBUG
-@@ -284,7 +288,12 @@ void __iounmap(void *addr, unsigned long
- 	pgd_t *pgd_dir;
- 	pmd_t *pmd_dir;
- 	pte_t *pte_dir;
--
-+#ifdef CONFIG_M547X_8X
-+        if ((addr >= (void*)0xd0000000) && (addr + size < (void*)0xd800ffff)) {
-+                printk("%s: PCI address\n",__FUNCTION__);
-+                return;
-+        }
-+#endif
- 	while ((long)size > 0) {
- 		pgd_dir = pgd_offset_k(virtaddr);
- 		if (pgd_bad(*pgd_dir)) {
---- a/drivers/pci/access.c
-+++ b/drivers/pci/access.c
-@@ -23,6 +23,7 @@ static DEFINE_SPINLOCK(pci_lock);
- #define PCI_word_BAD (pos & 1)
- #define PCI_dword_BAD (pos & 3)
- 
-+#ifdef NL_ORIGINAL
- #define PCI_OP_READ(size,type,len) \
- int pci_bus_read_config_##size \
- 	(struct pci_bus *bus, unsigned int devfn, int pos, type *value)	\
-@@ -37,7 +38,20 @@ int pci_bus_read_config_##size \
- 	spin_unlock_irqrestore(&pci_lock, flags);			\
- 	return res;							\
- }
--
-+#else /* NL_ORIGINAL */
-+#define PCI_OP_READ(size,type,len) \
-+int pci_bus_read_config_##size \
-+        (struct pci_bus *bus, unsigned int devfn, int pos, type *value) \
-+{                                                                       \
-+        int res;                                                        \
-+        unsigned long flags;                                            \
-+        if (PCI_##size##_BAD) return PCIBIOS_BAD_REGISTER_NUMBER;       \
-+        spin_lock_irqsave(&pci_lock, flags);                            \
-+        res = bus->ops->read(bus, devfn, pos, len, (u32 *)value);       \
-+        spin_unlock_irqrestore(&pci_lock, flags);                       \
-+        return res;                                                     \
-+}
-+#endif /* NL_ORIGINAL */
- #define PCI_OP_WRITE(size,type,len) \
- int pci_bus_write_config_##size \
- 	(struct pci_bus *bus, unsigned int devfn, int pos, type value)	\
---- a/drivers/usb/host/Makefile
-+++ b/drivers/usb/host/Makefile
-@@ -6,7 +6,7 @@ ifeq ($(CONFIG_USB_DEBUG),y)
- 	EXTRA_CFLAGS		+= -DDEBUG
- endif
- 
--obj-$(CONFIG_PCI)		+= pci-quirks.o
-+#obj-$(CONFIG_PCI)		+= pci-quirks.o
- 
- obj-$(CONFIG_USB_EHCI_HCD)	+= ehci-hcd.o
- obj-$(CONFIG_USB_ISP116X_HCD)	+= isp116x-hcd.o
---- /dev/null
-+++ b/include/asm-m68k/5445x_pci.h
-@@ -0,0 +1,94 @@
-+/*
-+ * asm-m68k/pci.h - m68k specific PCI declarations.
-+ *
-+ * Coldfire Implementation Copyright (c) 2007 Freescale Semiconductor, Inc.
-+ *	Kurt Mahan <kmahan@freescale.com>
-+ */
-+#ifndef _ASM_M68K_5445X_PCI_H
-+#define _ASM_M68K_5445x_PCI_H
-+
-+#ifndef CONFIG_PCI
-+/*
-+ * The PCI address space does equal the physical memory
-+ * address space.  The networking and block device layers use
-+ * this boolean for bounce buffer decisions.
-+ */
-+#define PCI_DMA_BUS_IS_PHYS		(1)
-+#else
-+#include <asm-generic/pci-dma-compat.h>
-+
-+/*
-+ * The PCI address space does equal the physical memory
-+ * address space.  The networking and block device layers use
-+ * this boolean for bounce buffer decisions.
-+ */
-+#define PCI_DMA_BUS_IS_PHYS		(1)
-+
-+#define PCIBIOS_MIN_IO			0x00004000
-+#define PCIBIOS_MIN_MEM			0x02000000
-+
-+#define pcibios_assign_all_busses()	0
-+#define pcibios_scan_all_fns(a, b)	0
-+
-+static inline void
-+pcibios_set_master(struct pci_dev *dev)
-+{
-+	/* no special bus mastering setup handling */
-+}
-+
-+static inline void
-+pcibios_penalize_isa_irq(int irq, int active)
-+{
-+	/* no dynamic PCI IRQ allocation */
-+}
-+
-+#if 0
-+static inline void
-+pcibios_add_platform_entries(struct pci_dev *dev)
-+{
-+	/* no special handling */
-+}
-+#endif
-+
-+static inline void
-+pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
-+			 struct resource *res)
-+{
-+#ifdef CONFIG_M54455
-+	if ((res->start == 0xa0000000) || (res->start == 0xa8000000)) {
-+		/* HACK!  FIX! kludge to fix bridge mapping */
-+		region->start = res->start & 0x0fffffff;
-+		region->end = res->end & 0x0fffffff;
-+	} else {
-+		region->start = res->start;
-+		region->end = res->end;
-+	}
-+#else
-+	region->start = res->start;
-+	region->end = res->end;
-+#endif
-+}
-+
-+static inline void
-+pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
-+			struct pci_bus_region *region)
-+{
-+	res->start = region->start;
-+	res->end = region->end;
-+}
-+
-+static inline struct resource *
-+pcibios_select_root(struct pci_dev *pdev, struct resource *res)
-+{
-+	struct resource *root = NULL;
-+
-+	if (res->flags & IORESOURCE_IO)
-+		root = &ioport_resource;
-+	if (res->flags & IORESOURCE_MEM)
-+		root = &iomem_resource;
-+
-+	return root;
-+}
-+
-+#endif /* CONFIG_PCI */
-+#endif /* _ASM_M68K_5445X_PCI_H */
---- /dev/null
-+++ b/include/asm-m68k/548x_pci.h
-@@ -0,0 +1,99 @@
-+#ifndef _ASM_M68K_548X_PCI_H
-+#define _ASM_M68K_548X_PCI_H
-+
-+/*
-+ * asm-m68k/pci_m68k.h - m68k specific PCI declarations.
-+ *
-+ * Written by Wout Klaren.
-+ */
-+#include <linux/mm.h>
-+#include <asm/scatterlist.h>
-+
-+#include <asm-generic/pci.h>
-+
-+struct pci_ops;
-+
-+/*
-+ * Structure with hardware dependent information and functions of the
-+ * PCI bus.
-+ */
-+
-+struct pci_bus_info
-+{
-+	/*
-+	 * Resources of the PCI bus.
-+	 */
-+
-+	struct resource mem_space;
-+	struct resource io_space;
-+
-+	/*
-+	 * System dependent functions.
-+	 */
-+
-+	struct pci_ops *m68k_pci_ops;
-+
-+	void (*fixup)(int pci_modify);
-+	void (*conf_device)(struct pci_dev *dev);
-+};
-+
-+#define pcibios_assign_all_busses()	0
-+#define pcibios_scan_all_fns(a, b)	0
-+
-+static inline void pcibios_set_master(struct pci_dev *dev)
-+{
-+	/* No special bus mastering setup handling */
-+}
-+
-+static inline void pcibios_penalize_isa_irq(int irq)
-+{
-+	/* We don't do dynamic PCI IRQ allocation */
-+}
-+
-+#ifndef CONFIG_COLDFIRE
-+/* The PCI address space does equal the physical memory
-+ * address space.  The networking and block device layers use
-+ * this boolean for bounce buffer decisions.
-+ */
-+#define PCI_DMA_BUS_IS_PHYS	(1)
-+
-+#define PCIBIOS_MIN_IO 		0x00004000
-+#define PCIBIOS_MIN_MEM 	0x04000000
-+
-+#else /* !CONFIG_COLDFIRE */
-+#include <asm-generic/pci-dma-compat.h>
-+#define PCI_DMA_BASE 		/*0x40000000*/0	/* PCI-DMA window base 		*/
-+
-+extern struct pci_bus_info *__init init_coldfire_pci(void);
-+extern void * pci_alloc_son(struct pci_dev *, size_t,
-+                            dma_addr_t *, int);
-+/*
-+ * The PCI address space equal the virtual memory
-+ * address space on m547X/m548X.
-+ */
-+#define PCI_DMA_BUS_IS_PHYS	(1)
-+
-+#define PCIBIOS_MIN_IO 		0x00000100
-+#define PCIBIOS_MIN_MEM 	0x02000000
-+
-+struct scatterlist;
-+
-+
-+/* This is always fine. */
-+#define pci_dac_dma_supported(pci_dev, mask)	(1)
-+
-+
-+/* These macros should be used after a pci_map_sg call has been done
-+ * to get bus addresses of each of the SG entries and their lengths.
-+ * You should only work with the number of sg entries pci_map_sg
-+ * returns.
-+ */
-+#define sg_dma_address(sg)	((sg)->dma_address)
-+#define sg_dma_len(sg)		((sg)->length)
-+
-+static inline void pcibios_align_resource(void *data, struct resource *res, unsigned long size, unsigned long align)
-+{
-+}
-+
-+#endif /* !CONFIG_COLDFIRE*/
-+#endif /* _ASM_M68K_548X_PCI_H */
---- a/include/asm-m68k/io.h
-+++ b/include/asm-m68k/io.h
-@@ -204,6 +204,12 @@ static inline u16 __iomem *isa_mtw(unsig
- #define isa_outw(val,port) (ISA_SEX ? out_be16(isa_itw(port),(val)) : out_le16(isa_itw(port),(val)))
- #define isa_outl(val,port) (ISA_SEX ? out_be32(isa_itl(port),(val)) : out_le32(isa_itl(port),(val)))
- 
-+#ifndef CONFIG_COLDFIRE
-+#define isa_readb(p)       in_8(isa_mtb(p))
-+#define isa_readw(p)       (ISA_SEX ? in_be16(isa_mtw(p)) : in_le16(isa_mtw(p)))
-+#define isa_writeb(val,p)  out_8(isa_mtb(p),(val))
-+#define isa_writew(val,p)  (ISA_SEX ? out_be16(isa_mtw(p),(val)) : out_le16(isa_mtw(p),(val)))
-+#else
- #define isa_readb(p)       in_8(isa_mtb((unsigned long)(p)))
- #define isa_readw(p)       \
- 	(ISA_SEX ? in_be16(isa_mtw((unsigned long)(p)))	\
-@@ -212,7 +218,7 @@ static inline u16 __iomem *isa_mtw(unsig
- #define isa_writew(val,p)  \
- 	(ISA_SEX ? out_be16(isa_mtw((unsigned long)(p)),(val))	\
- 		 : out_le16(isa_mtw((unsigned long)(p)),(val)))
--
-+#endif
- static inline void isa_delay(void)
- {
-   switch(ISA_TYPE)
-@@ -285,6 +291,29 @@ static inline void isa_delay(void)
- #endif /* CONFIG_ISA */
- 
- #if defined(CONFIG_PCI)
-+#ifdef CONFIG_COLDFIRE
-+#define inb_p   inb
-+#define inw_p   inw
-+#define inl_p   inl
-+#define outb_p  outb
-+#define outw_p  outw
-+#define outl_p  outl
-+
-+unsigned char  pci_inb(long addr);
-+unsigned short pci_inw(long addr);
-+unsigned long  pci_inl(long addr);
-+void pci_outb(unsigned char  val, long addr);
-+void pci_outw(unsigned short val, long addr);
-+void pci_outl(unsigned long  val, long addr);
-+
-+void pci_insb(volatile unsigned char* addr, unsigned char* buf, int len);
-+void pci_insw(volatile unsigned short* addr, unsigned short* buf, int len);
-+void pci_insl(volatile unsigned long* addr, unsigned long* buf, int len);
-+
-+void pci_outsb(volatile unsigned char* addr, const unsigned char* buf, int len);
-+void pci_outsw(volatile unsigned short* addr, const unsigned short* buf, int len);
-+void pci_outsl(volatile unsigned long* addr, const unsigned long* buf, int len);
-+#endif
- 
- #define readl(addr)      in_le32(addr)
- #define writel(val,addr) out_le32((addr),(val))
-@@ -300,6 +329,7 @@ static inline void isa_delay(void)
- #define readl_relaxed(addr) readl(addr)
- 
- #ifndef CONFIG_ISA
-+#ifndef CONFIG_COLDFIRE
- #define inb(port)      in_8(port)
- #define outb(val,port) out_8((port),(val))
- #define inw(port)      in_le16(port)
-@@ -319,6 +349,30 @@ static inline void isa_delay(void)
- #define outsl(port, buf, nr)	\
- 		raw_outsw_swapw((u16 *)(port), (u16 *)(buf), (nr)<<1)
- #else
-+#define inb(port)      pci_inb(port)
-+#define outb(val,port) pci_outb((val),(port))
-+#define inw(port)      pci_inw(port)
-+#define outw(val,port) pci_outw((val),(port))
-+#define insb(a,b,c)  pci_insb((volatile unsigned char*)a,(unsigned char*)b,c)
-+#define insw(a,b,c)  pci_insw((volatile unsigned short*)a,(const unsigned short*)b,c)
-+#define insl(a,b,c)  pci_insl((volatile unsigned long*)a,(const unsigned long*)b,c)
-+#define outsb(a,b,c) pci_outsb((volatile unsigned char*)a,(const unsigned char*)b,c)
-+#define outsw(a,b,c) pci_outsw((volatile unsigned short*)a,(const unsigned short*)b,c)
-+#define outsl(a,b,c) pci_outsl((volatile unsigned long*)a,(const unsigned long*)b,c)
-+#define inl(port)        pci_inl(port)
-+#define outl(val,port)   pci_outl((val),(port))
-+#endif
-+
-+#ifndef CONFIG_COLDFIRE
-+#define __raw_readb readb
-+#define __raw_readw readw
-+#define __raw_readl readl
-+#define __raw_writeb writeb
-+#define __raw_writew writew
-+#define __raw_writel writel
-+#endif
-+
-+#else
- /*
-  * kernel with both ISA and PCI compiled in, those have
-  * conflicting defs for in/out. Simply consider port < 1024
-@@ -432,6 +486,15 @@ static inline void memcpy_toio(volatile 
- #define xlate_dev_kmem_ptr(p)	p
- 
- #ifdef CONFIG_COLDFIRE
-+#define __raw_readb(addr) \
-+    ({ unsigned char __v = (*(volatile unsigned char *) (addr)); __v; })
-+#define __raw_readw(addr) \
-+    ({ unsigned short __v = (*(volatile unsigned short *) (addr)); __v; })
-+#define __raw_readl(addr) \
-+    ({ unsigned long __v = (*(volatile unsigned long *) (addr)); __v; })
-+#define __raw_writeb(b,addr) (void)((*(volatile unsigned char *) (addr)) = (b))
-+#define __raw_writew(b,addr) (void)((*(volatile unsigned short *) (addr)) = (b))
-+#define __raw_writel(b,addr) (void)((*(volatile unsigned int *) (addr)) = (b))
- 
- #define memset_io(a, b, c) memset((void *)(a), (b), (c))
- #define memcpy_fromio(a, b, c) memcpy((a), (void *)(b), (c))
---- /dev/null
-+++ b/include/asm-m68k/m5485pci.h
-@@ -0,0 +1,330 @@
-+/*
-+ *	m5485pci.h -- ColdFire 547x/548x PCI controller support.
-+ */
-+#ifndef __MCF548X_PCI_H__
-+#define __MCF548X_PCI_H__
-+
-+
-+/* PCI Type 0 Configuration Registers */
-+#define MCF_PCIIDR        MCF_REG32(0x000B00)   /* PCI Device ID/Vendor ID      */
-+#define MCF_PCISCR        MCF_REG32(0x000B04)   /* PCI Status/Command           */
-+#define MCF_PCICCRIR      MCF_REG32(0x000B08)   /* PCI Class Code / Revision ID */
-+#define MCF_PCICR1        MCF_REG32(0x000B0C)   /* PCI Configuration 1 Register */
-+#define MCF_PCIBAR0       MCF_REG32(0x000B10)   /* PCI Base Address Register 0  */
-+#define MCF_PCIBAR1       MCF_REG32(0x000B14)   /* PCI Base Address Register 1  */
-+#define MCF_PCICCPR       MCF_REG32(0x000B28)   /* PCI Cardbus CIS Pointer      */
-+#define MCF_PCISID        MCF_REG32(0x000B2C)   /* Subsystem ID/Subsystem Vendor ID*/
-+#define MCF_PCIERBAR      MCF_REG32(0x000B30)   /* PCI Expansion ROM            */
-+#define MCF_PCICPR        MCF_REG32(0x000B30)   /* PCI Capabilities Pointer     */
-+#define MCF_PCICR2        MCF_REG32(0x000B3C)   /* PCI Configuration Register 2 */
-+
-+/* General Control/Status Registers */
-+#define MCF_PCIGSCR       MCF_REG32(0x000B60)   /* Global Status/Control Register   */
-+#define MCF_PCITBATR0     MCF_REG32(0x000B64)   /* Target Base Address Translation 0*/
-+#define MCF_PCITBATR1     MCF_REG32(0x000B68)   /* Target Base Address Translation 1*/
-+#define MCF_PCITCR        MCF_REG32(0x000B6C)   /* Target Control Register          */
-+#define MCF_PCIIW0BTAR    MCF_REG32(0x000B70)   /* Initiator Window 0 Base Address  */
-+#define MCF_PCIIW1BTAR    MCF_REG32(0x000B74)   /* Initiator Window 1 Base Address  */
-+#define MCF_PCIIW2BTAR    MCF_REG32(0x000B78)   /* Initiator Window 2 Base  Address */
-+#define MCF_PCIIWCR       MCF_REG32(0x000B80)   /* Initiator Window Configuration   */
-+#define MCF_PCIICR        MCF_REG32(0x000B84)   /* Initiator Control Register       */
-+#define MCF_PCIISR        MCF_REG32(0x000B88)   /* Initiator Status Register        */
-+#define MCF_PCICAR        MCF_REG32(0x000BF8)   /* Configuration Address Register   */
-+
-+/* CommBus FIFO Transmit Interface Registers */
-+#define MCF_PCITPSR       MCF_REG32(0x008400)   /* Tx Packet Size Register      	*/
-+#define MCF_PCITSAR       MCF_REG32(0x008404)   /* Tx Start Address Register        */
-+#define MCF_PCITTCR       MCF_REG32(0x008408)   /* Tx Transaction Control Register  */
-+#define MCF_PCITER        MCF_REG32(0x00840C)   /* Tx Enables Register          	*/
-+#define MCF_PCITNAR       MCF_REG32(0x008410)   /* Tx Next Address Register         */
-+#define MCF_PCITLWR       MCF_REG32(0x008414)   /* Tx Last Word Register        	*/
-+#define MCF_PCITDCR       MCF_REG32(0x008418)   /* Tx Done Counts Register          */
-+#define MCF_PCITSR        MCF_REG32(0x00841C)   /* Tx Status Register           	*/
-+#define MCF_PCITFDR       MCF_REG32(0x008440)   /* Tx FIFO Data Register        	*/
-+#define MCF_PCITFSR       MCF_REG32(0x008444)   /* Tx FIFO Status Register          */
-+#define MCF_PCITFCR       MCF_REG32(0x008448)   /* Tx FIFO Control Register         */
-+#define MCF_PCITFAR       MCF_REG32(0x00844C)   /* Tx FIFO Alarm Register       	*/
-+#define MCF_PCITFRPR      MCF_REG32(0x008450)   /* Tx FIFO Read Pointer Register    */
-+#define MCF_PCITFWPR      MCF_REG32(0x008454)   /* Tx FIFO Write Pointer Register   */
-+
-+/* CommBus FIFO Receive Interface Registers */
-+#define MCF_PCIRPSR       MCF_REG32(0x008480)   /* Tx Packet Size Register      	*/
-+#define MCF_PCIRSAR       MCF_REG32(0x008484)   /* Tx Start Address Register        */
-+#define MCF_PCIRTCR       MCF_REG32(0x008488)   /* Tx Transaction Control Register  */
-+#define MCF_PCIRER        MCF_REG32(0x00848C)   /* Tx Enables Register          	*/
-+#define MCF_PCIRNAR       MCF_REG32(0x008490)   /* Tx Next Address Register         */
-+#define MCF_PCIRDCR       MCF_REG32(0x008498)   /* Tx Done Counts Register          */
-+#define MCF_PCIRSR        MCF_REG32(0x00849C)   /* Tx Status Register           	*/
-+#define MCF_PCIRFDR       MCF_REG32(0x0084C0)   /* Tx FIFO Data Register        	*/
-+#define MCF_PCIRFSR       MCF_REG32(0x0084C4)   /* Tx FIFO Status Register          */
-+#define MCF_PCIRFCR       MCF_REG32(0x0084C8)   /* Tx FIFO Control Register         */
-+#define MCF_PCIRFAR       MCF_REG32(0x0084CC)   /* Tx FIFO Alarm Register       	*/
-+#define MCF_PCIRFRPR      MCF_REG32(0x0084D0)   /* Tx FIFO Read Pointer Register    */
-+#define MCF_PCIRFWPR      MCF_REG32(0x0084D4)   /* Tx FIFO Write Pointer Register   */
-+
-+/* PCI Arbiter Registers */
-+#define MCF_PCIARB_PACR   MCF_REG32(0x000C00)
-+#define MCF_PCIARB_PASR   MCF_REG32(0x000C04)
-+
-+
-+/* Bit definitions and macros for MCF_PCIIDR */
-+#define MCF_PCIIDR_VENDORID(x)            (((x)&0x0000FFFF)<<0)
-+#define MCF_PCIIDR_DEVICEID(x)            (((x)&0x0000FFFF)<<16)
-+
-+/* Bit definitions and macros for MCF_PCISCR */
-+#define MCF_PCISCR_M      (0x00000002)
-+#define MCF_PCISCR_B      (0x00000004)
-+#define MCF_PCISCR_SP     (0x00000008)
-+#define MCF_PCISCR_MW     (0x00000010)
-+#define MCF_PCISCR_PER    (0x00000040)
-+#define MCF_PCISCR_S      (0x00000100)
-+#define MCF_PCISCR_F      (0x00000200)
-+#define MCF_PCISCR_C      (0x00100000)
-+#define MCF_PCISCR_66M    (0x00200000)
-+#define MCF_PCISCR_R      (0x00400000)
-+#define MCF_PCISCR_FC     (0x00800000)
-+#define MCF_PCISCR_DP     (0x01000000)
-+#define MCF_PCISCR_DT(x)  (((x)&0x00000003)<<25)
-+#define MCF_PCISCR_TS     (0x08000000)
-+#define MCF_PCISCR_TR     (0x10000000)
-+#define MCF_PCISCR_MA     (0x20000000)
-+#define MCF_PCISCR_SE     (0x40000000)
-+#define MCF_PCISCR_PE     (0x80000000)
-+
-+/* Bit definitions and macros for MCF_PCICCRIR */
-+#define MCF_PCICCRIR_REVID(x)             (((x)&0x000000FF)<<0)
-+#define MCF_PCICCRIR_CLASSCODE(x)         (((x)&0x00FFFFFF)<<8)
-+
-+/* Bit definitions and macros for MCF_PCICR1 */
-+#define MCF_PCICR1_CACHELINESIZE(x)       (((x)&0x0000000F)<<0)
-+#define MCF_PCICR1_LATTIMER(x)            (((x)&0x000000FF)<<8)
-+#define MCF_PCICR1_HEADERTYPE(x)          (((x)&0x000000FF)<<16)
-+#define MCF_PCICR1_BIST(x)                (((x)&0x000000FF)<<24)
-+
-+/* Bit definitions and macros for MCF_PCIBAR# */
-+#define MCF_PCIBAR0_ADDR(x)               (((x)&0x00003FFF)<<18)
-+#define MCF_PCIBAR1_ADDR(x)               (((x)&0x00000003)<<30)
-+
-+/* Bit definitions and macros for MCF_PCICR2 */
-+#define MCF_PCICR2_INTLINE(x)             (((x)&0x000000FF)<<0)
-+#define MCF_PCICR2_INTPIN(x)              (((x)&0x000000FF)<<8)
-+#define MCF_PCICR2_MINGNT(x)              (((x)&0x000000FF)<<16)
-+#define MCF_PCICR2_MAXLAT(x)              (((x)&0x000000FF)<<24)
-+
-+/* Bit definitions and macros for MCF_PCIGSCR */
-+#define MCF_PCIGSCR_PR                    (0x00000001)
-+#define MCF_PCIGSCR_SEE                   (0x00001000)
-+#define MCF_PCIGSCR_PEE                   (0x00002000)
-+#define MCF_PCIGSCR_SE                    (0x10000000)
-+#define MCF_PCIGSCR_PE                    (0x20000000)
-+
-+/* Bit definitions and macros for MCF_PCITBATR0 */
-+#define MCF_PCITBATR0_EN                  (0x00000001)
-+#define MCF_PCITBATR0_BAT0(x)             (((x)&0x00003FFF)<<18)
-+
-+/* Bit definitions and macros for MCF_PCITBATR1 */
-+#define MCF_PCITBATR1_EN                  (0x00000001)
-+#define MCF_PCITBATR1_BAT1(x)             (((x)&0x00000003)<<30)
-+
-+/* Bit definitions and macros for MCF_PCITCR */
-+#define MCF_PCITCR_P                      (0x00010000)
-+#define MCF_PCITCR_LD                     (0x01000000)
-+
-+/* Bit definitions and macros for MCF_PCIIW0BTAR */
-+#define MCF_PCIIW0BTAR_WTA0(x)            (((x)&0x000000FF)<<8)
-+#define MCF_PCIIW0BTAR_WAM0(x)            (((x)&0x000000FF)<<16)
-+#define MCF_PCIIW0BTAR_WBA0(x)            (((x)&0x000000FF)<<24)
-+
-+/* Bit definitions and macros for MCF_PCIIW1BTAR */
-+#define MCF_PCIIW1BTAR_WTA1(x)            (((x)&0x000000FF)<<8)
-+#define MCF_PCIIW1BTAR_WAM1(x)            (((x)&0x000000FF)<<16)
-+#define MCF_PCIIW1BTAR_WBA1(x)            (((x)&0x000000FF)<<24)
-+
-+/* Bit definitions and macros for MCF_PCIIW2BTAR */
-+#define MCF_PCIIW2BTAR_WTA2(x)            (((x)&0x000000FF)<<8)
-+#define MCF_PCIIW2BTAR_WAM2(x)            (((x)&0x000000FF)<<16)
-+#define MCF_PCIIW2BTAR_WBA2(x)            (((x)&0x000000FF)<<24)
-+
-+/* Bit definitions and macros for MCF_PCIIWCR */
-+#define MCF_PCIIWCR_WINCTRL2(x)           (((x)&0x0000000F)<<8)
-+#define MCF_PCIIWCR_WINCTRL1(x)           (((x)&0x0000000F)<<16)
-+#define MCF_PCIIWCR_WINCTRL0(x)           (((x)&0x0000000F)<<24)
-+#define MCF_PCIIWCR_WINCTRL0_MEMREAD      (0x01000000)
-+#define MCF_PCIIWCR_WINCTRL0_MEMRDLINE    (0x03000000)
-+#define MCF_PCIIWCR_WINCTRL0_MEMRDMUL     (0x05000000)
-+#define MCF_PCIIWCR_WINCTRL0_IO           (0x09000000)
-+#define MCF_PCIIWCR_WINCTRL0_E            (0x01000000)
-+#define MCF_PCIIWCR_WINCTRL1_MEMREAD      (0x00010000)
-+#define MCF_PCIIWCR_WINCTRL1_MEMRDLINE    (0x00030000)
-+#define MCF_PCIIWCR_WINCTRL1_MEMRDMUL     (0x00050000)
-+#define MCF_PCIIWCR_WINCTRL1_IO           (0x00090000)
-+#define MCF_PCIIWCR_WINCTRL1_E            (0x00010000)
-+#define MCF_PCIIWCR_WINCTRL2_MEMREAD      (0x00000100)
-+#define MCF_PCIIWCR_WINCTRL2_MEMRDLINE    (0x00000300)
-+#define MCF_PCIIWCR_WINCTRL2_MEMRDMUL     (0x00000500)
-+#define MCF_PCIIWCR_WINCTRL2_IO           (0x00000900)
-+#define MCF_PCIIWCR_WINCTRL2_E            (0x00000100)
-+
-+
-+/* Bit definitions and macros for MCF_PCIICR */
-+#define MCF_PCIICR_MAXRETRY(x)            (((x)&0x000000FF)<<0)
-+#define MCF_PCIICR_TAE                    (0x01000000)
-+#define MCF_PCIICR_IAE                    (0x02000000)
-+#define MCF_PCIICR_REE                    (0x04000000)
-+
-+/* Bit definitions and macros for MCF_PCIISR */
-+#define MCF_PCIISR_TA                     (0x01000000)
-+#define MCF_PCIISR_IA                     (0x02000000)
-+#define MCF_PCIISR_RE                     (0x04000000)
-+
-+/* Bit definitions and macros for MCF_PCICAR */
-+#define MCF_PCICAR_DWORD(x)               (((x)&0x0000003F)<<2)
-+#define MCF_PCICAR_FUNCNUM(x)             (((x)&0x00000007)<<8)
-+#define MCF_PCICAR_DEVNUM(x)              (((x)&0x0000001F)<<11)
-+#define MCF_PCICAR_BUSNUM(x)              (((x)&0x000000FF)<<16)
-+#define MCF_PCICAR_E                      (0x80000000)
-+
-+/* Bit definitions and macros for MCF_PCITPSR */
-+#define MCF_PCITPSR_PKTSIZE(x)            (((x)&0x0000FFFF)<<16)
-+
-+/* Bit definitions and macros for MCF_PCITTCR */
-+#define MCF_PCITTCR_DI                    (0x00000001)
-+#define MCF_PCITTCR_W                     (0x00000010)
-+#define MCF_PCITTCR_MAXBEATS(x)           (((x)&0x00000007)<<8)
-+#define MCF_PCITTCR_MAXRETRY(x)           (((x)&0x000000FF)<<16)
-+#define MCF_PCITTCR_PCICMD(x)             (((x)&0x0000000F)<<24)
-+
-+/* Bit definitions and macros for MCF_PCITER */
-+#define MCF_PCITER_NE                     (0x00010000)
-+#define MCF_PCITER_IAE                    (0x00020000)
-+#define MCF_PCITER_TAE                    (0x00040000)
-+#define MCF_PCITER_RE                     (0x00080000)
-+#define MCF_PCITER_SE                     (0x00100000)
-+#define MCF_PCITER_FEE                    (0x00200000)
-+#define MCF_PCITER_ME                     (0x01000000)
-+#define MCF_PCITER_BE                     (0x08000000)
-+#define MCF_PCITER_CM                     (0x10000000)
-+#define MCF_PCITER_RF                     (0x40000000)
-+#define MCF_PCITER_RC                     (0x80000000)
-+
-+/* Bit definitions and macros for MCF_PCITDCR */
-+#define MCF_PCITDCR_PKTSDONE(x)           (((x)&0x0000FFFF)<<0)
-+#define MCF_PCITDCR_BYTESDONE(x)          (((x)&0x0000FFFF)<<16)
-+
-+/* Bit definitions and macros for MCF_PCITSR */
-+#define MCF_PCITSR_IA                     (0x00010000)
-+#define MCF_PCITSR_TA                     (0x00020000)
-+#define MCF_PCITSR_RE                     (0x00040000)
-+#define MCF_PCITSR_SE                     (0x00080000)
-+#define MCF_PCITSR_FE                     (0x00100000)
-+#define MCF_PCITSR_BE1                    (0x00200000)
-+#define MCF_PCITSR_BE2                    (0x00400000)
-+#define MCF_PCITSR_BE3                    (0x00800000)
-+#define MCF_PCITSR_NT                     (0x01000000)
-+
-+/* Bit definitions and macros for MCF_PCITFSR */
-+#define MCF_PCITFSR_EMT                   (0x00010000)
-+#define MCF_PCITFSR_ALARM                 (0x00020000)
-+#define MCF_PCITFSR_FU                    (0x00040000)
-+#define MCF_PCITFSR_FR                    (0x00080000)
-+#define MCF_PCITFSR_OF                    (0x00100000)
-+#define MCF_PCITFSR_UF                    (0x00200000)
-+#define MCF_PCITFSR_RXW                   (0x00400000)
-+
-+/* Bit definitions and macros for MCF_PCITFCR */
-+#define MCF_PCITFCR_OF_MSK                (0x00080000)
-+#define MCF_PCITFCR_UF_MSK                (0x00100000)
-+#define MCF_PCITFCR_RXW_MSK               (0x00200000)
-+#define MCF_PCITFCR_FAE_MSK               (0x00400000)
-+#define MCF_PCITFCR_IP_MSK                (0x00800000)
-+#define MCF_PCITFCR_GR(x)                 (((x)&0x00000007)<<24)
-+
-+/* Bit definitions and macros for MCF_PCITFAR */
-+#define MCF_PCITFAR_ALARM(x)              (((x)&0x0000007F)<<0)
-+
-+/* Bit definitions and macros for MCF_PCITFRPR */
-+#define MCF_PCITFRPR_READ(x)              (((x)&0x00000FFF)<<0)
-+
-+/* Bit definitions and macros for MCF_PCITFWPR */
-+#define MCF_PCITFWPR_WRITE(x)             (((x)&0x00000FFF)<<0)
-+
-+/* Bit definitions and macros for MCF_PCIRPSR */
-+#define MCF_PCIRPSR_PKTSIZE(x)            (((x)&0x0000FFFF)<<16)
-+
-+/* Bit definitions and macros for MCF_PCIRTCR */
-+#define MCF_PCIRTCR_DI                    (0x00000001)
-+#define MCF_PCIRTCR_W                     (0x00000010)
-+#define MCF_PCIRTCR_MAXBEATS(x)           (((x)&0x00000007)<<8)
-+#define MCF_PCIRTCR_FB                    (0x00001000)
-+#define MCF_PCIRTCR_MAXRETRY(x)           (((x)&0x000000FF)<<16)
-+#define MCF_PCIRTCR_PCICMD(x)             (((x)&0x0000000F)<<24)
-+
-+/* Bit definitions and macros for MCF_PCIRER */
-+#define MCF_PCIRER_NE                     (0x00010000)
-+#define MCF_PCIRER_IAE                    (0x00020000)
-+#define MCF_PCIRER_TAE                    (0x00040000)
-+#define MCF_PCIRER_RE                     (0x00080000)
-+#define MCF_PCIRER_SE                     (0x00100000)
-+#define MCF_PCIRER_FEE                    (0x00200000)
-+#define MCF_PCIRER_ME                     (0x01000000)
-+#define MCF_PCIRER_BE                     (0x08000000)
-+#define MCF_PCIRER_CM                     (0x10000000)
-+#define MCF_PCIRER_FE                     (0x20000000)
-+#define MCF_PCIRER_RF                     (0x40000000)
-+#define MCF_PCIRER_RC                     (0x80000000)
-+
-+/* Bit definitions and macros for MCF_PCIRDCR */
-+#define MCF_PCIRDCR_PKTSDONE(x)           (((x)&0x0000FFFF)<<0)
-+#define MCF_PCIRDCR_BYTESDONE(x)          (((x)&0x0000FFFF)<<16)
-+
-+/* Bit definitions and macros for MCF_PCIRSR */
-+#define MCF_PCIRSR_IA                     (0x00010000)
-+#define MCF_PCIRSR_TA                     (0x00020000)
-+#define MCF_PCIRSR_RE                     (0x00040000)
-+#define MCF_PCIRSR_SE                     (0x00080000)
-+#define MCF_PCIRSR_FE                     (0x00100000)
-+#define MCF_PCIRSR_BE1                    (0x00200000)
-+#define MCF_PCIRSR_BE2                    (0x00400000)
-+#define MCF_PCIRSR_BE3                    (0x00800000)
-+#define MCF_PCIRSR_NT                     (0x01000000)
-+
-+/* Bit definitions and macros for MCF_PCIRFSR */
-+#define MCF_PCIRFSR_EMT                   (0x00010000)
-+#define MCF_PCIRFSR_ALARM                 (0x00020000)
-+#define MCF_PCIRFSR_FU                    (0x00040000)
-+#define MCF_PCIRFSR_FR                    (0x00080000)
-+#define MCF_PCIRFSR_OF                    (0x00100000)
-+#define MCF_PCIRFSR_UF                    (0x00200000)
-+#define MCF_PCIRFSR_RXW                   (0x00400000)
-+
-+/* Bit definitions and macros for MCF_PCIRFCR */
-+#define MCF_PCIRFCR_OF_MSK                (0x00080000)
-+#define MCF_PCIRFCR_UF_MSK                (0x00100000)
-+#define MCF_PCIRFCR_RXW_MSK               (0x00200000)
-+#define MCF_PCIRFCR_FAE_MSK               (0x00400000)
-+#define MCF_PCIRFCR_IP_MSK                (0x00800000)
-+#define MCF_PCIRFCR_GR(x)                 (((x)&0x00000007)<<24)
-+
-+/* Bit definitions and macros for MCF_PCIRFAR */
-+#define MCF_PCIRFAR_ALARM(x)              (((x)&0x0000007F)<<0)
-+
-+/* Bit definitions and macros for MCF_PCIRFRPR */
-+#define MCF_PCIRFRPR_READ(x)              (((x)&0x00000FFF)<<0)
-+
-+/* Bit definitions and macros for MCF_PCIRFWPR */
-+#define MCF_PCIRFWPR_WRITE(x)             (((x)&0x00000FFF)<<0)
-+
-+
-+/* Bit definitions and macros for MCF_PCIARB_PACR */
-+#define MCF_PCIARB_PACR_INTMPRI         (0x00000001)
-+#define MCF_PCIARB_PACR_EXTMPRI(x)      (((x)&0x0000001F)<<1)
-+#define MCF_PCIARB_PACR_INTMINTEN       (0x00010000)
-+#define MCF_PCIARB_PACR_EXTMINTEN(x)    (((x)&0x0000001F)<<17)
-+#define MCF_PCIARB_PACR_PKMD            (0x40000000)
-+#define MCF_PCIARB_PACR_DS              (0x80000000)
-+
-+/* Bit definitions and macros for MCF_PCIARB_PASR */
-+#define MCF_PCIARB_PASR_ITLMBK          (0x00010000)
-+#define MCF_PCIARB_PASR_EXTMBK(x)       (((x)&0x0000001F)<<17)
-+
-+#endif /* __MCF548X_PCI_H__ */
---- a/include/asm-m68k/pci.h
-+++ b/include/asm-m68k/pci.h
-@@ -1,94 +1,10 @@
--/*
-- * asm-m68k/pci.h - m68k specific PCI declarations.
-- *
-- * Coldfire Implementation Copyright (c) 2007 Freescale Semiconductor, Inc.
-- *	Kurt Mahan <kmahan@freescale.com>
-- */
--#ifndef _ASM_M68K_PCI_H
--#define _ASM_M68K_PCI_H
-+#ifndef M68K_PCI_H
-+#define M68K_PCI_H
- 
--#ifndef CONFIG_PCI
--/*
-- * The PCI address space does equal the physical memory
-- * address space.  The networking and block device layers use
-- * this boolean for bounce buffer decisions.
-- */
--#define PCI_DMA_BUS_IS_PHYS		(1)
-+#ifdef CONFIG_M5445X
-+#include "5445x_pci.h"
- #else
--#include <asm-generic/pci-dma-compat.h>
--
--/*
-- * The PCI address space does equal the physical memory
-- * address space.  The networking and block device layers use
-- * this boolean for bounce buffer decisions.
-- */
--#define PCI_DMA_BUS_IS_PHYS		(1)
--
--#define PCIBIOS_MIN_IO			0x00004000
--#define PCIBIOS_MIN_MEM			0x02000000
--
--#define pcibios_assign_all_busses()	0
--#define pcibios_scan_all_fns(a, b)	0
--
--static inline void
--pcibios_set_master(struct pci_dev *dev)
--{
--	/* no special bus mastering setup handling */
--}
--
--static inline void
--pcibios_penalize_isa_irq(int irq, int active)
--{
--	/* no dynamic PCI IRQ allocation */
--}
--
--#if 0
--static inline void
--pcibios_add_platform_entries(struct pci_dev *dev)
--{
--	/* no special handling */
--}
-+#include "548x_pci.h"
- #endif
- 
--static inline void
--pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
--			 struct resource *res)
--{
--#ifdef CONFIG_M54455
--	if ((res->start == 0xa0000000) || (res->start == 0xa8000000)) {
--		/* HACK!  FIX! kludge to fix bridge mapping */
--		region->start = res->start & 0x0fffffff;
--		region->end = res->end & 0x0fffffff;
--	} else {
--		region->start = res->start;
--		region->end = res->end;
--	}
--#else
--	region->start = res->start;
--	region->end = res->end;
--#endif
--}
--
--static inline void
--pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
--			struct pci_bus_region *region)
--{
--	res->start = region->start;
--	res->end = region->end;
--}
--
--static inline struct resource *
--pcibios_select_root(struct pci_dev *pdev, struct resource *res)
--{
--	struct resource *root = NULL;
--
--	if (res->flags & IORESOURCE_IO)
--		root = &ioport_resource;
--	if (res->flags & IORESOURCE_MEM)
--		root = &iomem_resource;
--
--	return root;
--}
--
--#endif /* CONFIG_PCI */
--#endif /* _ASM_M68K_PCI_H */
-+#endif /* M68K_PCI_H */
---- a/include/asm-m68k/raw_io.h
-+++ b/include/asm-m68k/raw_io.h
-@@ -46,6 +46,29 @@ extern void __iounmap(void *addr, unsign
- #define out_le16(addr,w) (void)((*(__force volatile __le16 *) (addr)) = cpu_to_le16(w))
- #define out_le32(addr,l) (void)((*(__force volatile __le32 *) (addr)) = cpu_to_le32(l))
- 
-+#if (defined CONFIG_COLDFIRE) && (defined CONFIG_PCI)
-+unsigned char  pci_inb(long addr);
-+unsigned short pci_inw(long addr);
-+unsigned long  pci_inl(long addr);
-+void pci_outb(unsigned char  val, long addr);
-+void pci_outw(unsigned short val, long addr);
-+void pci_outl(unsigned long  val, long addr);
-+unsigned short pci_raw_inw(long addr);
-+unsigned long  pci_raw_inl(long addr);
-+void pci_raw_outw(unsigned short val, long addr);
-+void pci_raw_outl(unsigned long  val, long addr);
-+#define raw_inb(port) pci_inb((long)((volatile unsigned char *)(port)))
-+#define raw_inw(port) pci_raw_inw((long)((volatile unsigned short *)(port)))
-+#define raw_inl(port) pci_raw_inl((long)((volatile unsigned long *)(port)))
-+
-+#define raw_outb(val,port) pci_outb((val),(long)((volatile unsigned char *)(port)))
-+#define raw_outw(val,port) pci_raw_outw((val),(long)((volatile unsigned short *)(port)))
-+#define raw_outl(val,port) pci_raw_outl((val),(long)((volatile unsigned long *)(port)))
-+
-+#define swap_inw(port) pci_inw((long)((volatile unsigned short *)(port)))
-+#define swap_outw(val,port) pci_outw((val),(long)((volatile unsigned short *)(port)))
-+
-+#else
- #define raw_inb in_8
- #define raw_inw in_be16
- #define raw_inl in_be32
-@@ -60,6 +83,9 @@ extern void __iounmap(void *addr, unsign
- #define __raw_writew(val,addr) out_be16((addr),(val))
- #define __raw_writel(val,addr) out_be32((addr),(val))
- 
-+#define swap_inw(port) in_le16((port))
-+#define swap_outw(val,port) out_le16((port),(val))
-+#endif
- static inline void raw_insb(volatile u8 __iomem *port, u8 *buf, unsigned int len)
- {
- 	unsigned int i;
---- a/include/asm-m68k/virtconvert.h
-+++ b/include/asm-m68k/virtconvert.h
-@@ -46,9 +46,14 @@ static inline void *phys_to_virt(unsigne
- #define virt_to_bus(a) (virt_to_phys(a) + (MACH_IS_HADES ? 0x80000000 : 0))
- #define bus_to_virt(a) (phys_to_virt((a) - (MACH_IS_HADES ? 0x80000000 : 0)))
- #else
-+#ifdef CONFIG_COLDFIRE
-+#define virt_to_bus(a) (a - PAGE_OFFSET + PCI_DMA_BASE)
-+#define bus_to_virt(a) (a - PCI_DMA_BASE + PAGE_OFFSET)
-+#else /* CONFIG_COLDFIRE */
- #define virt_to_bus virt_to_phys
- #define bus_to_virt phys_to_virt
- #endif
-+#endif
- 
- #endif
- #endif
---- a/include/linux/pci.h
-+++ b/include/linux/pci.h
-@@ -458,8 +458,10 @@ int __must_check pcibios_enable_device(s
- char *pcibios_setup(char *str);
- 
- /* Used only when drivers/pci/setup.c is used */
-+#ifndef CONFIG_COLDFIRE
- void pcibios_align_resource(void *, struct resource *, resource_size_t,
- 				resource_size_t);
-+#endif
- void pcibios_update_irq(struct pci_dev *, int irq);
- 
- /* Generic PCI functions used internally */
diff --git a/target/linux/coldfire/patches/079-m547x_8x_pci_video_sm712.patch b/target/linux/coldfire/patches/079-m547x_8x_pci_video_sm712.patch
deleted file mode 100644
index 7eb27ee68..000000000
--- a/target/linux/coldfire/patches/079-m547x_8x_pci_video_sm712.patch
+++ /dev/null
@@ -1,1266 +0,0 @@
-From a4c49cdc530046ded7a9fbfe9e13eab10d3973c7 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Thu, 10 Jul 2008 19:19:29 -0600
-Subject: [PATCH] Add PCI Video SM712.
-
-LTIBName: m547x-8x-pci-video-sm712
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
-Signed-off-by: Shrek Wu <b16972@freescale.com>
----
- drivers/video/Kconfig           |   10 +
- drivers/video/Makefile          |    1 +
- drivers/video/cfbimgblt.c       |    8 +-
- drivers/video/console/bitblit.c |   12 +
- drivers/video/console/fbcon.c   |    7 +-
- drivers/video/smifb.c           |  949 +++++++++++++++++++++++++++++++++++++++
- drivers/video/smifb.h           |  149 ++++++
- include/linux/fb.h              |   13 +-
- 8 files changed, 1142 insertions(+), 7 deletions(-)
- create mode 100644 drivers/video/smifb.c
- create mode 100644 drivers/video/smifb.h
-
---- a/drivers/video/Kconfig
-+++ b/drivers/video/Kconfig
-@@ -201,6 +201,16 @@ config FB_TILEBLITTING
- comment "Frame buffer hardware drivers"
- 	depends on FB
- 
-+config FB_SMI
-+	tristate "SiliconMotion Lynx support"
-+	depends on FB && PCI
-+	select FB_CFB_FILLRECT
-+	select FB_CFB_COPYAREA
-+	select FB_CFB_IMAGEBLIT
-+	---help---
-+	  This enables support for the Silicon Motion Lynx family of graphic
-+	  chips. It has been tested on ColdFire.
-+
- config FB_CIRRUS
- 	tristate "Cirrus Logic support"
- 	depends on FB && (ZORRO || PCI)
---- a/drivers/video/Makefile
-+++ b/drivers/video/Makefile
-@@ -28,6 +28,7 @@ obj-$(CONFIG_FB_DDC)           += fb_ddc
- obj-$(CONFIG_FB_DEFERRED_IO)   += fb_defio.o
- 
- # Hardware specific drivers go first
-+obj-$(CONFIG_FB_SMI)              += smifb.o
- obj-$(CONFIG_FB_AMIGA)            += amifb.o c2p.o
- obj-$(CONFIG_FB_ARC)              += arcfb.o
- obj-$(CONFIG_FB_CLPS711X)         += clps711xfb.o
---- a/drivers/video/cfbimgblt.c
-+++ b/drivers/video/cfbimgblt.c
-@@ -44,12 +44,12 @@
- #endif
- 
- static const u32 cfb_tab8[] = {
--#if defined(__BIG_ENDIAN)
-+#if defined(__BIG_ENDIAN) && !defined(CONFIG_COLDFIRE)
-     0x00000000,0x000000ff,0x0000ff00,0x0000ffff,
-     0x00ff0000,0x00ff00ff,0x00ffff00,0x00ffffff,
-     0xff000000,0xff0000ff,0xff00ff00,0xff00ffff,
-     0xffff0000,0xffff00ff,0xffffff00,0xffffffff
--#elif defined(__LITTLE_ENDIAN)
-+#elif defined(__LITTLE_ENDIAN) || defined(CONFIG_COLDFIRE)
-     0x00000000,0xff000000,0x00ff0000,0xffff0000,
-     0x0000ff00,0xff00ff00,0x00ffff00,0xffffff00,
-     0x000000ff,0xff0000ff,0x00ff00ff,0xffff00ff,
-@@ -60,9 +60,9 @@ static const u32 cfb_tab8[] = {
- };
- 
- static const u32 cfb_tab16[] = {
--#if defined(__BIG_ENDIAN)
-+#if defined(__BIG_ENDIAN) && !defined(CONFIG_COLDFIRE)
-     0x00000000, 0x0000ffff, 0xffff0000, 0xffffffff
--#elif defined(__LITTLE_ENDIAN)
-+#elif defined(__LITTLE_ENDIAN) || defined(CONFIG_COLDFIRE)
-     0x00000000, 0xffff0000, 0x0000ffff, 0xffffffff
- #else
- #error FIXME: No endianness??
---- a/drivers/video/console/bitblit.c
-+++ b/drivers/video/console/bitblit.c
-@@ -78,7 +78,11 @@ static inline void bit_putcs_aligned(str
- 				     u32 d_pitch, u32 s_pitch, u32 cellsize,
- 				     struct fb_image *image, u8 *buf, u8 *dst)
- {
-+#ifndef CONFIG_COLDFIRE
- 	u16 charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff;
-+#else
-+        u32 charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff;
-+#endif
- 	u32 idx = vc->vc_font.width >> 3;
- 	u8 *src;
- 
-@@ -111,7 +115,11 @@ static inline void bit_putcs_unaligned(s
- 				       struct fb_image *image, u8 *buf,
- 				       u8 *dst)
- {
-+#ifndef CONFIG_COLDFIRE
- 	u16 charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff;
-+#else
-+        u32 charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff;
-+#endif
- 	u32 shift_low = 0, mod = vc->vc_font.width % 8;
- 	u32 shift_high = 8;
- 	u32 idx = vc->vc_font.width >> 3;
-@@ -238,7 +246,11 @@ static void bit_cursor(struct vc_data *v
- {
- 	struct fb_cursor cursor;
- 	struct fbcon_ops *ops = info->fbcon_par;
-+#ifndef CONFIG_COLDFIRE
- 	unsigned short charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff;
-+#else
-+        unsigned long charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff;
-+#endif
- 	int w = (vc->vc_font.width + 7) >> 3, c;
- 	int y = real_y(ops->p, vc->vc_y);
- 	int attribute, use_sw = (vc->vc_cursor_type & 0x10);
---- a/drivers/video/console/fbcon.c
-+++ b/drivers/video/console/fbcon.c
-@@ -2679,8 +2679,11 @@ static int fbcon_set_palette(struct vc_d
- {
- 	struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
- 	int i, j, k, depth;
--	u8 val;
--
-+#ifndef CONFIG_COLDFIRE
-+        u8 val;
-+#else
-+        u32 val;
-+#endif
- 	if (fbcon_is_inactive(vc, info))
- 		return -EINVAL;
- 
---- /dev/null
-+++ b/drivers/video/smifb.c
-@@ -0,0 +1,949 @@
-+/***************************************************************************
-+        smifb.c  -  Silicon Motion, Inc. LynxEM+ frame buffer device
-+                             -------------------
-+    begin                : Thu Aug 9 2001
-+    copyright            : (C) 2001 by Szu-Tao Huang
-+    email                : johuang@siliconmotion.com
-+ ***************************************************************************/
-+
-+/***************************************************************************
-+ *                                                                         *
-+ *   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/kernel.h>
-+#include <linux/errno.h>
-+#include <linux/string.h>
-+#include <linux/mm.h>
-+#include <linux/tty.h>
-+#include <linux/slab.h>
-+#include <linux/delay.h>
-+#include <linux/fb.h>
-+#include <linux/pci.h>
-+#include <linux/init.h>
-+
-+#include <asm/io.h>
-+#include <asm/irq.h>
-+#include <asm/pgtable.h>
-+#include <asm/system.h>
-+#include <asm/uaccess.h>
-+
-+#include "console/fbcon.h"
-+
-+/*
-+#include <video/fbcon.h>
-+#include <video/fbcon-cfb8.h>
-+#include <video/fbcon-cfb16.h>
-+#include <video/fbcon-cfb24.h>
-+*/
-+
-+#include <linux/fb.h>
-+
-+static char *SMIRegs;		// point to virtual Memory Map IO starting address
-+static char *SMILFB;		// point to virtual video memory starting address
-+static struct par_info hw;	// used to record hardware information
-+
-+#include "smifb.h"
-+
-+struct ModeInit VGAMode[numVGAModes] =
-+{
-+	{
-+		/*  mode#0: 640 x 480  8Bpp  60Hz */
-+		640, 480, 8, 60,
-+		/*  Init_MISC */
-+		0xE3,
-+		{   /*  Init_SR0_SR4 */
-+			0x03, 0x01, 0x0F, 0x00, 0x0E,
-+		},
-+		{   /*  Init_SR10_SR24 */
-+			0xFF, 0xBE, 0xEF, 0xFF, 0x00, 0x0E, 0x17, 0x2C,
-+			0x99, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+			0xC4, 0x30, 0x02, 0x01, 0x01,
-+		},
-+		{   /*  Init_SR30_SR75 */
-+			0x32, 0x03, 0xA0, 0x09, 0xC0, 0x32, 0x32, 0x32,
-+			0x32, 0x32, 0x32, 0x32, 0x00, 0x00, 0x03, 0xFF,
-+			0x00, 0xFC, 0x00, 0x00, 0x20, 0x18, 0x00, 0xFC,
-+			0x20, 0x0C, 0x44, 0x20, 0x00, 0x32, 0x32, 0x32,
-+			0x04, 0x24, 0x63, 0x4F, 0x52, 0x0B, 0xDF, 0xEA,
-+			0x04, 0x50, 0x19, 0x32, 0x32, 0x00, 0x00, 0x32,
-+			0x01, 0x80, 0x7E, 0x1A, 0x1A, 0x00, 0x00, 0x00,
-+			0x50, 0x03, 0x74, 0x14, 0x07, 0x82, 0x07, 0x04,
-+			0x00, 0x45, 0x30, 0x30, 0x40, 0x30,
-+		},
-+		{   /*  Init_SR80_SR93 */
-+			0xFF, 0x07, 0x00, 0x6F, 0x7F, 0x7F, 0xFF, 0x32,
-+			0xF7, 0x00, 0x00, 0x00, 0xEF, 0xFF, 0x32, 0x32,
-+			0x00, 0x00, 0x00, 0x00,
-+		},
-+		{   /*  Init_SRA0_SRAF */
-+			0x00, 0xFF, 0xBF, 0xFF, 0xFF, 0xED, 0xED, 0xED,
-+			0x7B, 0xFF, 0xFF, 0xFF, 0xBF, 0xEF, 0xFF, 0xDF,
-+		},
-+		{   /*  Init_GR00_GR08 */
-+			0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0x0F,
-+			0xFF,
-+		},
-+		{   /*  Init_AR00_AR14 */
-+			0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-+			0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
-+			0x41, 0x00, 0x0F, 0x00, 0x00,
-+		},
-+		{   /*  Init_CR00_CR18 */
-+			0x5F, 0x4F, 0x4F, 0x00, 0x53, 0x1F, 0x0B, 0x3E,
-+			0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+			0xEA, 0x0C, 0xDF, 0x50, 0x40, 0xDF, 0x00, 0xE3,
-+			0xFF,
-+		},
-+		{   /*  Init_CR30_CR4D */
-+			0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x03, 0x20,
-+			0x00, 0x00, 0x00, 0x40, 0x00, 0xE7, 0xFF, 0xFD,
-+			0x5F, 0x4F, 0x00, 0x54, 0x00, 0x0B, 0xDF, 0x00,
-+			0xEA, 0x0C, 0x2E, 0x00, 0x4F, 0xDF,
-+		},
-+		{   /*  Init_CR90_CRA7 */
-+			0x56, 0xDD, 0x5E, 0xEA, 0x87, 0x44, 0x8F, 0x55,
-+			0x0A, 0x8F, 0x55, 0x0A, 0x00, 0x00, 0x18, 0x00,
-+			0x11, 0x10, 0x0B, 0x0A, 0x0A, 0x0A, 0x0A, 0x00,
-+		},
-+	},
-+	{
-+		/*  mode#1: 640 x 480  16Bpp  60Hz */
-+		640, 480, 16, 60,
-+		/*  Init_MISC */
-+		0xE3,
-+		{   /*  Init_SR0_SR4 */
-+			0x03, 0x01, 0x0F, 0x00, 0x0E,
-+		},
-+		{   /*  Init_SR10_SR24 */
-+			0xFF, 0xBE, 0xEF, 0xFF, 0x00, 0x0E, 0x17, 0x2C,
-+			0x99, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+			0xC4, 0x30, 0x02, 0x01, 0x01,
-+		},
-+		{   /*  Init_SR30_SR75 */
-+			0x32, 0x03, 0xA0, 0x09, 0xC0, 0x32, 0x32, 0x32,
-+			0x32, 0x32, 0x32, 0x32, 0x00, 0x00, 0x03, 0xFF,
-+			0x00, 0xFC, 0x00, 0x00, 0x20, 0x18, 0x00, 0xFC,
-+			0x20, 0x0C, 0x44, 0x20, 0x00, 0x32, 0x32, 0x32,
-+			0x04, 0x24, 0x63, 0x4F, 0x52, 0x0B, 0xDF, 0xEA,
-+			0x04, 0x50, 0x19, 0x32, 0x32, 0x00, 0x00, 0x32,
-+			0x01, 0x80, 0x7E, 0x1A, 0x1A, 0x00, 0x00, 0x00,
-+			0x50, 0x03, 0x74, 0x14, 0x07, 0x82, 0x07, 0x04,
-+			0x00, 0x45, 0x30, 0x30, 0x40, 0x30,
-+		},
-+		{   /*  Init_SR80_SR93 */
-+			0xFF, 0x07, 0x00, 0x6F, 0x7F, 0x7F, 0xFF, 0x32,
-+			0xF7, 0x00, 0x00, 0x00, 0xEF, 0xFF, 0x32, 0x32,
-+			0x00, 0x00, 0x00, 0x00,
-+		},
-+		{   /*  Init_SRA0_SRAF */
-+			0x00, 0xFF, 0xBF, 0xFF, 0xFF, 0xED, 0xED, 0xED,
-+			0x7B, 0xFF, 0xFF, 0xFF, 0xBF, 0xEF, 0xFF, 0xDF,
-+		},
-+		{   /*  Init_GR00_GR08 */
-+			0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0x0F,
-+			0xFF,
-+		},
-+		{   /*  Init_AR00_AR14 */
-+			0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-+			0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
-+			0x41, 0x00, 0x0F, 0x00, 0x00,
-+		},
-+		{   /*  Init_CR00_CR18 */
-+			0x5F, 0x4F, 0x4F, 0x00, 0x53, 0x1F, 0x0B, 0x3E,
-+			0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+			0xEA, 0x0C, 0xDF, 0x50, 0x40, 0xDF, 0x00, 0xE3,
-+			0xFF,
-+		},
-+		{   /*  Init_CR30_CR4D */
-+			0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x03, 0x20,
-+			0x00, 0x00, 0x00, 0x40, 0x00, 0xE7, 0xFF, 0xFD,
-+			0x5F, 0x4F, 0x00, 0x54, 0x00, 0x0B, 0xDF, 0x00,
-+			0xEA, 0x0C, 0x2E, 0x00, 0x4F, 0xDF,
-+		},
-+		{   /*  Init_CR90_CRA7 */
-+			0x56, 0xDD, 0x5E, 0xEA, 0x87, 0x44, 0x8F, 0x55,
-+			0x0A, 0x8F, 0x55, 0x0A, 0x00, 0x00, 0x18, 0x00,
-+			0x11, 0x10, 0x0B, 0x0A, 0x0A, 0x0A, 0x0A, 0x00,
-+		},
-+	},
-+	{
-+		/*  mode#2: 640 x 480  24Bpp  60Hz */
-+		640, 480, 24, 60,
-+		/*  Init_MISC */
-+		0xE3,
-+		{   /*  Init_SR0_SR4 */
-+			0x03, 0x01, 0x0F, 0x00, 0x0E,
-+		},
-+		{   /*  Init_SR10_SR24 */
-+			0xFF, 0xBE, 0xEF, 0xFF, 0x00, 0x0E, 0x17, 0x2C,
-+			0x99, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+			0xC4, 0x30, 0x02, 0x01, 0x01,
-+		},
-+		{   /*  Init_SR30_SR75 */
-+			0x32, 0x03, 0xA0, 0x09, 0xC0, 0x32, 0x32, 0x32,
-+			0x32, 0x32, 0x32, 0x32, 0x00, 0x00, 0x03, 0xFF,
-+			0x00, 0xFC, 0x00, 0x00, 0x20, 0x18, 0x00, 0xFC,
-+			0x20, 0x0C, 0x44, 0x20, 0x00, 0x32, 0x32, 0x32,
-+			0x04, 0x24, 0x63, 0x4F, 0x52, 0x0B, 0xDF, 0xEA,
-+			0x04, 0x50, 0x19, 0x32, 0x32, 0x00, 0x00, 0x32,
-+			0x01, 0x80, 0x7E, 0x1A, 0x1A, 0x00, 0x00, 0x00,
-+			0x50, 0x03, 0x74, 0x14, 0x07, 0x82, 0x07, 0x04,
-+			0x00, 0x45, 0x30, 0x30, 0x40, 0x30,
-+		},
-+		{   /*  Init_SR80_SR93 */
-+			0xFF, 0x07, 0x00, 0x6F, 0x7F, 0x7F, 0xFF, 0x32,
-+			0xF7, 0x00, 0x00, 0x00, 0xEF, 0xFF, 0x32, 0x32,
-+			0x00, 0x00, 0x00, 0x00,
-+		},
-+		{   /*  Init_SRA0_SRAF */
-+			0x00, 0xFF, 0xBF, 0xFF, 0xFF, 0xED, 0xED, 0xED,
-+			0x7B, 0xFF, 0xFF, 0xFF, 0xBF, 0xEF, 0xFF, 0xDF,
-+		},
-+		{   /*  Init_GR00_GR08 */
-+			0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0x0F,
-+			0xFF,
-+		},
-+		{   /*  Init_AR00_AR14 */
-+			0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-+			0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
-+			0x41, 0x00, 0x0F, 0x00, 0x00,
-+		},
-+		{   /*  Init_CR00_CR18 */
-+			0x5F, 0x4F, 0x4F, 0x00, 0x53, 0x1F, 0x0B, 0x3E,
-+			0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+			0xEA, 0x0C, 0xDF, 0x50, 0x40, 0xDF, 0x00, 0xE3,
-+			0xFF,
-+		},
-+		{   /*  Init_CR30_CR4D */
-+			0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x03, 0x20,
-+			0x00, 0x00, 0x00, 0x40, 0x00, 0xE7, 0xFF, 0xFD,
-+			0x5F, 0x4F, 0x00, 0x54, 0x00, 0x0B, 0xDF, 0x00,
-+			0xEA, 0x0C, 0x2E, 0x00, 0x4F, 0xDF,
-+		},
-+		{   /*  Init_CR90_CRA7 */
-+			0x56, 0xDD, 0x5E, 0xEA, 0x87, 0x44, 0x8F, 0x55,
-+			0x0A, 0x8F, 0x55, 0x0A, 0x00, 0x00, 0x18, 0x00,
-+			0x11, 0x10, 0x0B, 0x0A, 0x0A, 0x0A, 0x0A, 0x00,
-+		},
-+	},
-+	{/*  mode#3: 800 x 600  8Bpp  60Hz */
-+		800,600,8,60,
-+		0x2B,	/*  Init_MISC */
-+		{       /*  Init_SR0_SR4 */
-+			0x03, 0x01, 0x0F, 0x03, 0x0E,
-+		},
-+		{   /*  Init_SR10_SR24 */
-+			0xFF, 0xBE, 0xEE, 0xFF, 0x00, 0x0E, 0x17, 0x2C,
-+			0x99, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-+			0xC4, 0x30, 0x02, 0x01, 0x01,
-+ 		},
-+		{   /*  Init_SR30_SR75 */
-+			0x24, 0x03, 0x20, 0x09, 0xC0, 0x24, 0x24, 0x24,
-+			0x24, 0x24, 0x24, 0x24, 0x00, 0x00, 0x03, 0xFF,
-+			0x00, 0xFC, 0x00, 0x00, 0x20, 0x38, 0x00, 0xFC,
-+			0x20, 0x0C, 0x44, 0x20, 0x00, 0x24, 0x24, 0x24,
-+			0x04, 0x48, 0x83, 0x63, 0x68, 0x72, 0x57, 0x58,
-+			0x04, 0x55, 0x59, 0x24, 0x24, 0x00, 0x00, 0x24,
-+			0x01, 0x80, 0x7A, 0x1A, 0x1A, 0x00, 0x00, 0x00,
-+			0x50, 0x03, 0x74, 0x14, 0x1C, 0x85, 0x35, 0x13,
-+			0x02, 0x45, 0x30, 0x35, 0x40, 0x20,
-+		},
-+		{   /*  Init_SR80_SR93 */
-+			0xFF, 0x87, 0x00, 0x6F, 0x7F, 0x7F, 0xFF, 0x24,
-+			0x90, 0x01, 0x2C, 0x01, 0xFF, 0x00, 0x24, 0x24,
-+			0x00, 0x00, 0x00, 0x00,
-+		},
-+		{   /*  Init_SRA0_SRAF */
-+			0x00, 0xFF, 0xBF, 0xFF, 0xFF, 0xED, 0xED, 0xED,
-+			0x7B, 0xFF, 0xFF, 0xFF, 0xBF, 0xEF, 0xBF, 0xDF,
-+		},
-+		{   /*  Init_GR00_GR08 */
-+			0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0x0F,
-+			0xFF,
-+		},
-+		{   /*  Init_AR00_AR14 */
-+			0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-+			0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
-+			0x41, 0x00, 0x0F, 0x00, 0x00,
-+		},
-+		{   /*  Init_CR00_CR18 */
-+			0x7F, 0x63, 0x63, 0x00, 0x68, 0x18, 0x72, 0xF0,
-+			0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+			0x58, 0x0C, 0x57, 0x64, 0x40, 0x57, 0x00, 0xE3,
-+			0xFF,
-+ 		},
-+		{   /*  Init_CR30_CR4D */
-+			0x00, 0x00, 0x00, 0x00, 0x00, 0x33, 0x03, 0x20,
-+			0x00, 0x00, 0x00, 0x40, 0x00, 0xE7, 0xBF, 0xFD,
-+			0x7F, 0x63, 0x00, 0x69, 0x18, 0x72, 0x57, 0x00,
-+			0x58, 0x0C, 0xE0, 0x20, 0x63, 0x57,
-+		},
-+		{   /*  Init_CR90_CRA7 */
-+			0x56, 0x4B, 0x5E, 0x55, 0x86, 0x9D, 0x8E, 0xAA,
-+			0xDB, 0x2A, 0xDF, 0x33, 0x00, 0x00, 0x18, 0x00,
-+			0x20, 0x1F, 0x1A, 0x19, 0x0F, 0x0F, 0x0F, 0x00,
-+		},
-+	},
-+	{/*  mode#4: 800 x 600  16Bpp  60Hz */
-+		800, 600, 16, 60,
-+		/*  Init_MISC */
-+		0x2B,
-+		{   /*  Init_SR0_SR4 */
-+			0x03, 0x01, 0x0F, 0x03, 0x0E,
-+		},
-+		{   /*  Init_SR10_SR24 */
-+			0xFF, 0xBE, 0xEE, 0xFF, 0x00, 0x0E, 0x17, 0x2C,
-+			0x99, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-+			0xC4, 0x30, 0x02, 0x01, 0x01,
-+		},
-+		{   /*  Init_SR30_SR75 */
-+			0x24, 0x03, 0x20, 0x09, 0xC0, 0x24, 0x24, 0x24,
-+			0x24, 0x24, 0x24, 0x24, 0x00, 0x00, 0x03, 0xFF,
-+			0x00, 0xFC, 0x00, 0x00, 0x20, 0x38, 0x00, 0xFC,
-+			0x20, 0x0C, 0x44, 0x20, 0x00, 0x24, 0x24, 0x24,
-+			0x04, 0x48, 0x83, 0x63, 0x68, 0x72, 0x57, 0x58,
-+			0x04, 0x55, 0x59, 0x24, 0x24, 0x00, 0x00, 0x24,
-+			0x01, 0x80, 0x7A, 0x1A, 0x1A, 0x00, 0x00, 0x00,
-+			0x50, 0x03, 0x74, 0x14, 0x1C, 0x85, 0x35, 0x13,
-+			0x02, 0x45, 0x30, 0x35, 0x40, 0x20,
-+		},
-+		{   /*  Init_SR80_SR93 */
-+			0x00, 0x00, 0x00, 0x6F, 0x7F, 0x7F, 0xFF, 0x24,
-+			0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x24, 0x24,
-+			0x00, 0x00, 0x00, 0x00,
-+		},
-+		{   /*  Init_SRA0_SRAF */
-+			0x00, 0xFF, 0xBF, 0xFF, 0xFF, 0xED, 0xED, 0xED,
-+			0x7B, 0xFF, 0xFF, 0xFF, 0xBF, 0xEF, 0xBF, 0xDF,
-+		},
-+		{   /*  Init_GR00_GR08 */
-+			0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0x0F,
-+			0xFF,
-+		},
-+		{   /*  Init_AR00_AR14 */
-+			0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-+			0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
-+			0x41, 0x00, 0x0F, 0x00, 0x00,
-+		},
-+		{   /*  Init_CR00_CR18 */
-+			0x7F, 0x63, 0x63, 0x00, 0x68, 0x18, 0x72, 0xF0,
-+			0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+			0x58, 0x0C, 0x57, 0x64, 0x40, 0x57, 0x00, 0xE3,
-+			0xFF,
-+ 		},
-+		{   /*  Init_CR30_CR4D */
-+			0x00, 0x00, 0x00, 0x00, 0x00, 0x33, 0x03, 0x20,
-+			0x00, 0x00, 0x00, 0x40, 0x00, 0xE7, 0xBF, 0xFD,
-+			0x7F, 0x63, 0x00, 0x69, 0x18, 0x72, 0x57, 0x00,
-+			0x58, 0x0C, 0xE0, 0x20, 0x63, 0x57,
-+		},
-+		{   /*  Init_CR90_CRA7 */
-+			0x56, 0x4B, 0x5E, 0x55, 0x86, 0x9D, 0x8E, 0xAA,
-+			0xDB, 0x2A, 0xDF, 0x33, 0x00, 0x00, 0x18, 0x00,
-+			0x20, 0x1F, 0x1A, 0x19, 0x0F, 0x0F, 0x0F, 0x00,
-+		},
-+	},
-+		{/*  mode#5: 800 x 600  24Bpp  60Hz */
-+		800,600,24,60,
-+		0x2B,
-+		{   /*  Init_SR0_SR4 */
-+			0x03, 0x01, 0x0F, 0x03, 0x0E,
-+		},
-+		{   /*  Init_SR10_SR24 */
-+			0xFF, 0xBE, 0xEE, 0xFF, 0x00, 0x0E, 0x17, 0x2C,
-+			0x99, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+			0xC4, 0x30, 0x02, 0x01, 0x01,
-+		},
-+		{   /*  Init_SR30_SR75 */
-+			0x36, 0x03, 0x20, 0x09, 0xC0, 0x36, 0x36, 0x36,
-+			0x36, 0x36, 0x36, 0x36, 0x00, 0x00, 0x03, 0xFF,
-+			0x00, 0xFC, 0x00, 0x00, 0x20, 0x18, 0x00, 0xFC,
-+			0x20, 0x0C, 0x44, 0x20, 0x00, 0x36, 0x36, 0x36,
-+			0x04, 0x48, 0x83, 0x63, 0x68, 0x72, 0x57, 0x58,
-+			0x04, 0x55, 0x59, 0x36, 0x36, 0x00, 0x00, 0x36,
-+			0x01, 0x80, 0x7E, 0x1A, 0x1A, 0x00, 0x00, 0x00,
-+			0x50, 0x03, 0x74, 0x14, 0x1C, 0x85, 0x35, 0x13,
-+			0x02, 0x45, 0x30, 0x30, 0x40, 0x20,
-+		},
-+		{   /*  Init_SR80_SR93 */
-+			0xFF, 0x07, 0x00, 0x6F, 0x7F, 0x7F, 0xFF, 0x36,
-+			0xF7, 0x00, 0x00, 0x00, 0xEF, 0xFF, 0x36, 0x36,
-+			0x00, 0x00, 0x00, 0x00,
-+		},
-+		{   /*  Init_SRA0_SRAF */
-+			0x00, 0xFF, 0xBF, 0xFF, 0xFF, 0xED, 0xED, 0xED,
-+			0x7B, 0xFF, 0xFF, 0xFF, 0xBF, 0xEF, 0xBF, 0xDF,
-+		},
-+		{   /*  Init_GR00_GR08 */
-+			0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0x0F,
-+			0xFF,
-+		},
-+		{   /*  Init_AR00_AR14 */
-+			0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-+			0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
-+			0x41, 0x00, 0x0F, 0x00, 0x00,
-+		},
-+		{   /*  Init_CR00_CR18 */
-+			0x7F, 0x63, 0x63, 0x00, 0x68, 0x18, 0x72, 0xF0,
-+			0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+			0x58, 0x0C, 0x57, 0x64, 0x40, 0x57, 0x00, 0xE3,
-+			0xFF,
-+		},
-+		{   /*  Init_CR30_CR4D */
-+			0x00, 0x00, 0x00, 0x00, 0x00, 0x33, 0x03, 0x20,
-+			0x00, 0x00, 0x00, 0x40, 0x00, 0xE7, 0xBF, 0xFD,
-+			0x7F, 0x63, 0x00, 0x69, 0x18, 0x72, 0x57, 0x00,
-+			0x58, 0x0C, 0xE0, 0x20, 0x63, 0x57,
-+		},
-+		{   /*  Init_CR90_CRA7 */
-+			0x56, 0x4B, 0x5E, 0x55, 0x86, 0x9D, 0x8E, 0xAA,
-+			0xDB, 0x2A, 0xDF, 0x33, 0x00, 0x00, 0x18, 0x00,
-+			0x20, 0x1F, 0x1A, 0x19, 0x0F, 0x0F, 0x0F, 0x00,
-+		},
-+	},
-+};
-+
-+static void smi_set_timing(struct smifb_info *sfb,struct par_info *hw)
-+{
-+	int i=0,j=0;
-+        u32 m_nScreenStride;
-+
-+
-+    for (j=0;j < numVGAModes;j++) {
-+		if (VGAMode[j].mmSizeX == hw->width &&
-+			VGAMode[j].mmSizeY == hw->height &&
-+			VGAMode[j].bpp == sfb->fb.var.bits_per_pixel &&
-+			VGAMode[j].hz == hw->hz)
-+		{
-+			
-+			smi_mmiowb(0x0,0x3c6);
-+
-+			smi_seqw(0,0x1);
-+
-+			smi_mmiowb(VGAMode[j].Init_MISC,0x3c2);
-+
-+			for (i=0;i<SIZE_SR00_SR04;i++)	// init SEQ register SR00 - SR04
-+			{
-+				smi_seqw(i,VGAMode[j].Init_SR00_SR04[i]);
-+			}
-+
-+			for (i=0;i<SIZE_SR10_SR24;i++)	// init SEQ register SR10 - SR24
-+			{
-+				smi_seqw(i+0x10,VGAMode[j].Init_SR10_SR24[i]);
-+			}
-+
-+			for (i=0;i<SIZE_SR30_SR75;i++)	// init SEQ register SR30 - SR75
-+			{
-+				if (((i+0x30) != 0x62) && ((i+0x30) != 0x6a) && ((i+0x30) != 0x6b))
-+					smi_seqw(i+0x30,VGAMode[j].Init_SR30_SR75[i]);
-+			}
-+			for (i=0;i<SIZE_SR80_SR93;i++)	// init SEQ register SR80 - SR93
-+			{
-+				smi_seqw(i+0x80,VGAMode[j].Init_SR80_SR93[i]);
-+			}
-+			for (i=0;i<SIZE_SRA0_SRAF;i++)	// init SEQ register SRA0 - SRAF
-+			{
-+				smi_seqw(i+0xa0,VGAMode[j].Init_SRA0_SRAF[i]);
-+			}
-+
-+			for (i=0;i<SIZE_GR00_GR08;i++)	// init Graphic register GR00 - GR08
-+			{
-+				smi_grphw(i,VGAMode[j].Init_GR00_GR08[i]);
-+			}
-+
-+			for (i=0;i<SIZE_AR00_AR14;i++)	// init Attribute register AR00 - AR14
-+			{
-+
-+				smi_attrw(i,VGAMode[j].Init_AR00_AR14[i]);
-+			}
-+
-+			for (i=0;i<SIZE_CR00_CR18;i++)	// init CRTC register CR00 - CR18
-+			{
-+				smi_crtcw(i,VGAMode[j].Init_CR00_CR18[i]);
-+			}
-+
-+			for (i=0;i<SIZE_CR30_CR4D;i++)	// init CRTC register CR30 - CR4D
-+			{
-+				smi_crtcw(i+0x30,VGAMode[j].Init_CR30_CR4D[i]);
-+			}
-+
-+			for (i=0;i<SIZE_CR90_CRA7;i++)	// init CRTC register CR90 - CRA7
-+			{
-+				smi_crtcw(i+0x90,VGAMode[j].Init_CR90_CRA7[i]);
-+			}
-+		}
-+	}
-+	smi_mmiowb(0x67,0x3c2);
-+	// set VPR registers
-+	writel(0x0,hw->m_pVPR+0x0C);
-+	writel(0x0,hw->m_pVPR+0x40);
-+	// set data width
-+	m_nScreenStride = (hw->width * sfb->fb.var.bits_per_pixel) / 64;
-+	switch (sfb->fb.var.bits_per_pixel)
-+	{
-+		case 8:
-+			writel(0x0,hw->m_pVPR+0x0);
-+			break;
-+		case 16:
-+			writel(0x00020000,hw->m_pVPR+0x0);
-+			break;
-+		case 24:
-+			writel(0x00040000,hw->m_pVPR+0x0);
-+			break;
-+	}
-+	writel((u32)(((m_nScreenStride + 2) << 16) | m_nScreenStride),hw->m_pVPR+0x10);
-+}
-+
-+/*
-+ * Set the color palette
-+ */
-+static int
-+smifb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
-+		   u_int trans, struct fb_info *info)
-+{
-+	
-+	struct smifb_info *sfb = (struct smifbinfo *)info;
-+	u32 *pal;
-+
-+	switch (sfb->fb.fix.visual) {
-+	case FB_VISUAL_TRUECOLOR:		/* RGB 5:6:5 True Colour */
-+		pal = sfb->fb.pseudo_palette;	// System has 16 default color
-+		if (regno >= 16)
-+			return 1;
-+
-+		pal[regno] = (red & 0xf800) |
-+		    ((green & 0xfc00) >> 5) | ((blue & 0xf800) >> 11);
-+		break;
-+	}
-+
-+	return 0;
-+}
-+
-+/*
-+ *  smifb_decode_var():
-+ *    Get the video params out of 'var'. If a value doesn't fit, round it up,
-+ *    if it's too big, return -EINVAL.
-+ *
-+ *    Suggestion: Round up in the following order: bits_per_pixel, xres,
-+ *    yres, xres_virtual, yres_virtual, xoffset, yoffset, grayscale,
-+ *    bitfields, horizontal timing, vertical timing.
-+ */
-+static int smifb_decode_var(struct fb_var_screeninfo *var, struct smifb_info *sfb, struct par_info *hw)
-+{
-+    hw->width = var->xres;
-+    hw->height = var->yres;
-+    hw->hz = 60;
-+
-+	return 0;
-+}
-+
-+static int smifb_set_par (struct fb_info *info)
-+{
-+	struct smifb_info *sfb = (struct smifb_info *)info;
-+	int err, chgvar = 0;
-+	struct fb_var_screeninfo *var = &info->var;
-+	struct fb_cmap *cmap;
-+
-+
-+	/*
-+	 * Decode var contents into a par structure, adjusting any
-+	 * out of range values.
-+	 */
-+	err = smifb_decode_var(var, sfb, &hw);
-+	if (err) {
-+		return err;
-+	}
-+
-+	if (hw.width != var->xres)
-+		chgvar = 1;
-+	if (hw.height != var->yres)
-+		chgvar = 1;
-+
-+	var->activate		&= ~FB_ACTIVATE_ALL;
-+
-+	smi_set_timing(sfb, &hw);
-+
-+	sfb->palette_size = var->bits_per_pixel == 8 ? 256 : 16;
-+	cmap = fb_default_cmap(sfb->palette_size);
-+	fb_set_cmap(cmap, &sfb->fb);
-+
-+	return 0;
-+}
-+
-+static int smifb_check_var (struct fb_var_screeninfo *var, struct fb_info *info)
-+{
-+	var->bits_per_pixel += 7;
-+	var->bits_per_pixel &= ~7;
-+
-+	var->xres_virtual =
-+	    var->xres_virtual < var->xres ? var->xres : var->xres_virtual;
-+	var->yres_virtual =
-+	    var->yres_virtual < var->yres ? var->yres : var->yres_virtual;
-+
-+	switch (var->bits_per_pixel) {
-+	case 8:
-+	case 16:		/* RGB 565 */
-+    case 24:
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	switch (var->bits_per_pixel) {
-+	case 16:
-+		var->red.offset	= 11;
-+		var->red.length	= 5;
-+		var->green.offset	= 5;
-+		var->green.length	= 6;
-+		var->blue.offset	= 0;
-+		var->blue.length	= 5;
-+
-+		info->fix.visual		= FB_VISUAL_TRUECOLOR;
-+		info->fix.line_length= var->xres * 2;
-+
-+		break;
-+	default:
-+		return -EINVAL; /* We don't support anything other than 16bpp for now. --NL */
-+		break;
-+	}
-+	return 0;
-+
-+//	smifb_set_color_bitfields(var);
-+
-+    return 0;
-+}
-+
-+/*
-+ * Formal definition of the VESA spec:
-+ *  On
-+ *  	This refers to the state of the display when it is in full operation
-+ *  Stand-By
-+ *  	This defines an optional operating state of minimal power reduction with
-+ *  	the shortest recovery time
-+ *  Suspend
-+ *  	This refers to a level of power management in which substantial power
-+ *  	reduction is achieved by the display.  The display can have a longer
-+ *  	recovery time from this state than from the Stand-by state
-+ *  Off
-+ *  	This indicates that the display is consuming the lowest level of power
-+ *  	and is non-operational. Recovery from this state may optionally require
-+ *  	the user to manually power on the monitor
-+ *
-+ *  Now, the fbdev driver adds an additional state, (blank), where they
-+ *  turn off the video (maybe by colormap tricks), but don't mess with the
-+ *  video itself: think of it semantically between on and Stand-By.
-+ *
-+ *  So here's what we should do in our fbdev blank routine:
-+ *
-+ *  	VESA_NO_BLANKING (mode 0)	Video on,  front/back light on
-+ *  	VESA_VSYNC_SUSPEND (mode 1)  	Video on,  front/back light off
-+ *  	VESA_HSYNC_SUSPEND (mode 2)  	Video on,  front/back light off
-+ *  	VESA_POWERDOWN (mode 3)		Video off, front/back light off
-+ *
-+ *  This will match the matrox implementation.
-+ */
-+/*
-+ * smifb_blank():
-+ *	Blank the display by setting all palette values to zero.  Note, the
-+ * 	12 and 16 bpp modes don't really use the palette, so this will not
-+ *      blank the display in all modes.
-+ */
-+static int smifb_blank(int blank, struct fb_info *info)
-+{
-+//	struct smifb_info *sfb = (struct smifb_info *)info;
-+#if 0
-+	switch (blank) {
-+	case VESA_POWERDOWN:
-+	case VESA_VSYNC_SUSPEND:
-+	case VESA_HSYNC_SUSPEND:
-+	case VESA_NO_BLANKING:
-+	}
-+#endif
-+	return 1;
-+}
-+
-+static struct fb_ops smifb_ops = {
-+	.owner		= THIS_MODULE,
-+	.fb_check_var	= smifb_check_var,
-+	.fb_set_par 	= smifb_set_par,
-+	.fb_setcolreg	= smifb_setcolreg,
-+	.fb_blank	= smifb_blank,
-+	
-+	/* Accelerated functions, using softversions, per se */
-+	.fb_fillrect	= cfb_fillrect,
-+	.fb_copyarea	= cfb_copyarea,
-+	.fb_imageblit	= cfb_imageblit,
-+	.fb_cursor	= soft_cursor,
-+};
-+
-+/*
-+ * Alloc struct smifb_info and assign the default value
-+ */
-+static struct smifb_info * __devinit
-+smi_alloc_fb_info(struct pci_dev *dev, char *name)
-+{
-+    struct smifb_info *sfb;
-+
-+    sfb = kmalloc(sizeof(struct smifb_info) + sizeof(u32) * 16, GFP_KERNEL);
-+
-+    if (!sfb)
-+        return NULL;
-+
-+    memset(sfb, 0, sizeof(struct smifb_info));
-+
-+    sfb->currcon        = -1;
-+    sfb->dev            = dev;
-+
-+    strcpy(sfb->fb.fix.id, name);
-+
-+    sfb->fb.fix.type		= FB_TYPE_PACKED_PIXELS;
-+    sfb->fb.fix.type_aux	= 0;
-+    sfb->fb.fix.xpanstep	= 0;
-+    sfb->fb.fix.ypanstep	= 0;
-+    sfb->fb.fix.ywrapstep	= 0;
-+    sfb->fb.fix.accel		= FB_ACCEL_NONE;
-+
-+    sfb->fb.var.nonstd		= 0;
-+    sfb->fb.var.activate	= FB_ACTIVATE_NOW;
-+    sfb->fb.var.height		= -1;
-+    sfb->fb.var.width		= -1;
-+    sfb->fb.var.accel_flags	= 0;
-+    sfb->fb.var.vmode		= FB_VMODE_NONINTERLACED;
-+
-+    sfb->fb.fbops		= &smifb_ops;
-+    sfb->fb.flags		= FBINFO_FLAG_DEFAULT;
-+    sfb->fb.node		= -1;
-+    sfb->fb.pseudo_palette	= (void *)(&sfb->palette_size + 1);
-+
-+    return sfb;
-+}
-+
-+/*
-+ * Unmap in the memory mapped IO registers
-+ *
-+ */
-+
-+static void __devinit
-+smi_unmap_mmio(struct smifb_info *sfb)
-+{
-+    if (sfb && SMILFB)
-+    {
-+        iounmap(SMILFB);
-+        SMIRegs = NULL;
-+    }
-+}
-+
-+/*
-+ * Map in the screen memory
-+ *
-+ */
-+static int __devinit
-+smi_map_smem(struct smifb_info *sfb, struct pci_dev *dev, u_long smem_len)
-+{
-+
-+    sfb->fb.fix.smem_start = pci_resource_start(dev, 0);
-+    sfb->fb.fix.smem_len  = smem_len;
-+    printk("%s:smem %x,len %x\n",sfb->fb.fix.smem_start,sfb->fb.fix.smem_len);
-+    sfb->fb.screen_base = SMILFB;
-+
-+    if (!sfb->fb.screen_base)
-+    {
-+        printk("%s: unable to map screen memory\n",sfb->fb.fix.id);
-+        return -ENOMEM;
-+    }
-+
-+    return 0;
-+}
-+
-+
-+/*
-+ * Unmap in the screen memory
-+ *
-+ */
-+static void __devinit
-+smi_unmap_smem(struct smifb_info *sfb)
-+{
-+    if (sfb && sfb->fb.screen_base)
-+    {
-+        iounmap(sfb->fb.screen_base);
-+        sfb->fb.screen_base = NULL;
-+    }
-+}
-+
-+/*
-+ * We need to wake up the LynxEM+, and make sure its in linear memory mode.
-+ */
-+static inline void __devinit
-+smi_init_hw(void)
-+{
-+	/* The delays prevent the ColdFire PCI host from locking up. :/ --NL */
-+	udelay(1000);
-+    outb(0x18, 0x3c4);
-+	udelay(1000);
-+    outb(0x11, 0x3c5);
-+	udelay(1000);
-+	printk("%s: 0x3c4 =%x 0x3c5 %x\n",__FUNCTION__,inw(0x3c4),inw(0x3c5));
-+}
-+
-+static void __devinit
-+smi_free_fb_info(struct smifb_info *sfb)
-+{
-+	if (sfb) {
-+		fb_alloc_cmap(&sfb->fb.cmap, 0, 0);
-+		kfree(sfb);
-+	}
-+}
-+
-+
-+u16 SMI_ChipIDs[numChipIDs] = {0x710, 0x712, 0x720};
-+
-+int __init smifb_init(struct pci_dev *pdev, const struct pci_device_id *ent)
-+{
-+    struct smifb_info *sfb;
-+    u_long smem_size;
-+    char name[16];
-+    int err;
-+	char *m_pLAW;
-+	ulong m_pLAWPhysical;
-+
-+    printk("%s start\n",__FUNCTION__);
-+    sprintf(name, "smifb");
-+
-+    hw.chipID = pdev->device;
-+    
-+    err = -ENOMEM;
-+    sfb = smi_alloc_fb_info(pdev, name);
-+    if (!sfb) {
-+        goto failed;
-+    }
-+
-+    smi_init_hw();
-+
-+	// Map address and memory detection
-+	m_pLAWPhysical = pci_resource_start(pdev,0);
-+	printk("%s:m_pLAWPhysical %x,hw.chipID %x\n",__FUNCTION__,m_pLAWPhysical,hw.chipID);
-+	switch (hw.chipID) {
-+		case 0x710:
-+		case 0x712:
-+			sfb->fb.fix.mmio_start = m_pLAWPhysical + 0x00700000;
-+			sfb->fb.fix.mmio_len   = 0x00100000;
-+
-+    		hw.m_pLFB = SMILFB = ioremap(m_pLAWPhysical, 0x00800000);
-+		printk("%s:SMILFB%x\n",__FUNCTION__,SMILFB);
-+    		hw.m_pMMIO = SMIRegs = SMILFB + 0x00700000;
-+			hw.m_pDPR = hw.m_pLFB + 0x00408000;
-+			hw.m_pVPR = hw.m_pLFB + 0x0040c000;
-+
-+    		if (!SMIRegs)
-+    		{
-+        		printk("%s: unable to map memory mapped IO\n",sfb->fb.fix.id);
-+        		return -ENOMEM;
-+    		}
-+
-+			smi_seqw(0x62,0x7A);
-+    		smi_seqw(0x6a,0x0c);
-+    		smi_seqw(0x6b,0x02);
-+    		smem_size = 0x00400000;
-+
-+    		//LynxEM+ memory dection
-+    		*(u32 *)(SMILFB + 4) = 0xAA551133;
-+    		if (*(u32 *)(SMILFB + 4) != 0xAA551133)
-+    		{
-+    			smem_size = 0x00200000;
-+        		// Program the MCLK to 130 MHz
-+        		smi_seqw(0x6a,0x12);
-+        		smi_seqw(0x6b,0x02);
-+        		smi_seqw(0x62,0x3e);
-+     		}
-+			break;
-+		case 0x720:
-+			sfb->fb.fix.mmio_start = m_pLAWPhysical + 0x000c0000;
-+			sfb->fb.fix.mmio_len   = 0x00040000;
-+
-+			m_pLAW = ioremap(m_pLAWPhysical, 0x00a00000);
-+			hw.m_pLFB = SMILFB = m_pLAW + 0x00200000;
-+			hw.m_pMMIO = SMIRegs = m_pLAW + 0x000c0000;
-+			hw.m_pDPR = m_pLAW;
-+			hw.m_pVPR = m_pLAW + 0x800;
-+
-+			smi_seqw(0x62,0xff);
-+			smi_seqw(0x6a,0x0d);
-+			smi_seqw(0x6b,0x02);
-+			smem_size = 0x00400000;
-+
-+			break;
-+	}
-+
-+	sfb->fb.var.xres = 640;
-+	sfb->fb.var.yres = 480;
-+	sfb->fb.var.bits_per_pixel = 16;
-+
-+   	sfb->fb.var.xres_virtual = sfb->fb.var.xres;
-+
-+	sfb->fb.var.yres_virtual = sfb->fb.var.yres;
-+	
-+	sfb->fb.flags = FBINFO_FLAG_DEFAULT;
-+
-+	printk("%s:smem_size %x\n",__FUNCTION__,smem_size);
-+    err = smi_map_smem(sfb, pdev, smem_size);
-+	printk("%s:smi_map_smem error %x\n",__FUNCTION__,err);
-+    if (err) {
-+		goto failed;
-+    }
-+
-+
-+
-+	fb_set_var(&sfb->fb, &sfb->fb.var);
-+	smifb_check_var(&sfb->fb.var, &sfb->fb);
-+	smifb_set_par(sfb);
-+	printk("%s:register_framebuffer \n",__FUNCTION__);
-+	err = register_framebuffer(&sfb->fb);
-+	if (err < 0) {
-+		goto failed;
-+    }
-+
-+	printk("Silicon Motion, Inc. LynxEM+ Init complete.\n");
-+
-+	return 0;
-+
-+failed:
-+	smi_unmap_smem(sfb);
-+	smi_unmap_mmio(sfb);
-+	smi_free_fb_info(sfb);
-+	printk("Silicon Motion, Inc. LynxEM+ Init FAILED.n");
-+
-+	return err;
-+}
-+
-+struct pci_device_id smifb_pci_tbl[] = {
-+        { 0x126f, 0x710, PCI_ANY_ID, PCI_ANY_ID },
-+        { 0x126f, 0x712, PCI_ANY_ID, PCI_ANY_ID },
-+        { 0x126f, 0x720, PCI_ANY_ID, PCI_ANY_ID },
-+        { 0 }
-+};
-+
-+MODULE_DEVICE_TABLE(pci, smifb_pci_tbl);
-+
-+struct pci_driver smifb_driver = {
-+        .name =         "smifb",
-+        .id_table =     smifb_pci_tbl,
-+        .probe =        smifb_init,
-+};
-+
-+int __init smi_init(void)
-+{
-+	/*return pci_module_init(&smifb_driver);*/
-+	return pci_register_driver(&smifb_driver);
-+}
-+
-+module_init(smi_init);
-+MODULE_LICENSE("GPL");
-+
-+
-+
---- /dev/null
-+++ b/drivers/video/smifb.h
-@@ -0,0 +1,149 @@
-+/***************************************************************************
-+			smifb.h  -  SiliconMotion LynxEM+ frame buffer device
-+                             -------------------
-+    begin                : Thu Aug 9 2001
-+    copyright            : (C) 2001 by Szu-Tao Huang
-+    email                : johuang@siliconmotion.com
-+ ***************************************************************************/
-+
-+/***************************************************************************
-+ *                                                                         *
-+ *   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.                                   *
-+ *                                                                         *
-+ ***************************************************************************/
-+
-+#define smi_mmiowb(dat,reg)	writeb(dat, SMIRegs + reg)
-+#define smi_mmioww(dat,reg)	writew(dat, SMIRegs + reg)
-+#define smi_mmiowl(dat,reg)	writel(dat, SMIRegs + reg)
-+
-+#define smi_mmiorb(reg)	        readb(SMIRegs + reg)
-+#define smi_mmiorw(reg)	        readw(SMIRegs + reg)
-+#define smi_mmiorl(reg)	        readl(SMIRegs + reg)
-+
-+#define SIZE_SR00_SR04      (0x04 - 0x00 + 1)
-+#define SIZE_SR10_SR24      (0x24 - 0x10 + 1)
-+#define SIZE_SR30_SR75      (0x75 - 0x30 + 1)
-+#define SIZE_SR80_SR93      (0x93 - 0x80 + 1)
-+#define SIZE_SRA0_SRAF      (0xAF - 0xA0 + 1)
-+#define SIZE_GR00_GR08      (0x08 - 0x00 + 1)
-+#define SIZE_AR00_AR14      (0x14 - 0x00 + 1)
-+#define SIZE_CR00_CR18      (0x18 - 0x00 + 1)
-+#define SIZE_CR30_CR4D      (0x4D - 0x30 + 1)
-+#define SIZE_CR90_CRA7      (0xA7 - 0x90 + 1)
-+#define SIZE_VPR                        (0x6C + 1)
-+#define SIZE_DPR			(0x44 + 1)
-+
-+#define numVGAModes			6
-+#define numChipIDs			3
-+
-+#define NR_PALETTE	256
-+#define NR_RGB          2
-+
-+/*
-+ * Minimum X and Y resolutions
-+ */
-+#define MIN_XRES	640
-+#define MIN_YRES	480
-+
-+static inline void smi_crtcw(int reg, int val)
-+{
-+        smi_mmiowb(reg, 0x3d4);
-+        smi_mmiowb(val, 0x3d5);
-+}
-+
-+static inline unsigned int smi_crtcr(int reg)
-+{
-+        smi_mmiowb(reg, 0x3d4);
-+        return smi_mmiorb(0x3d5);
-+}
-+
-+static inline void smi_grphw(int reg, int val)
-+{
-+        smi_mmiowb(reg, 0x3ce);
-+        smi_mmiowb(val, 0x3cf);
-+}
-+
-+static inline unsigned int smi_grphr(int reg)
-+{
-+        smi_mmiowb(reg, 0x3ce);
-+        return smi_mmiorb(0x3cf);
-+}
-+
-+static inline void smi_attrw(int reg, int val)
-+{
-+        smi_mmiorb(0x3da);
-+        smi_mmiowb(reg, 0x3c0);
-+        smi_mmiorb(0x3c1);
-+        smi_mmiowb(val, 0x3c0);
-+}
-+
-+static inline void smi_seqw(int reg, int val)
-+{
-+        smi_mmiowb(reg, 0x3c4);
-+        smi_mmiowb(val, 0x3c5);
-+}
-+
-+static inline unsigned int smi_seqr(int reg)
-+{
-+        smi_mmiowb(reg, 0x3c4);
-+        return smi_mmiorb(0x3c5);
-+}
-+/*
-+* Private structure
-+*/
-+struct smifb_info {
-+        /*
-+        * The following is a pointer to be passed into the
-+        * functions below.  The modules outside the main
-+        * smifb.c driver have no knowledge as to what
-+        * is within this structure.
-+        */
-+        struct fb_info          fb;
-+        struct display_switch   *dispsw;
-+        struct pci_dev	        *dev;
-+        signed int              currcon;
-+
-+        struct {
-+                u8 red, green, blue;
-+        } palette[NR_RGB];
-+
-+        u_int                   palette_size;
-+};
-+
-+struct par_info {
-+	/*
-+	 * Hardware
-+	 */
-+	u16		chipID;
-+	char	*m_pLFB;
-+	char	*m_pMMIO;
-+	char	*m_pDPR;
-+	char	*m_pVPR;
-+
-+	u_int	width;
-+	u_int	height;
-+	u_int	hz;
-+};
-+
-+// The next structure holds all information relevant for a specific video mode.
-+struct ModeInit
-+{
-+	int			  mmSizeX;
-+	int			  mmSizeY;
-+	int			  bpp;
-+	int			  hz;
-+	unsigned char Init_MISC;
-+	unsigned char Init_SR00_SR04[SIZE_SR00_SR04];
-+	unsigned char Init_SR10_SR24[SIZE_SR10_SR24];
-+	unsigned char Init_SR30_SR75[SIZE_SR30_SR75];
-+	unsigned char Init_SR80_SR93[SIZE_SR80_SR93];
-+	unsigned char Init_SRA0_SRAF[SIZE_SRA0_SRAF];
-+	unsigned char Init_GR00_GR08[SIZE_GR00_GR08];
-+	unsigned char Init_AR00_AR14[SIZE_AR00_AR14];
-+	unsigned char Init_CR00_CR18[SIZE_CR00_CR18];
-+	unsigned char Init_CR30_CR4D[SIZE_CR30_CR4D];
-+	unsigned char Init_CR90_CRA7[SIZE_CR90_CRA7];
-+};
---- a/include/linux/fb.h
-+++ b/include/linux/fb.h
-@@ -873,6 +873,17 @@ struct fb_info {
- #define fb_writeq sbus_writeq
- #define fb_memset sbus_memset_io
- 
-+#elif defined(CONFIG_COLDFIRE)
-+#define fb_readb readb
-+#define fb_readw readw
-+#define fb_readl readl
-+#define fb_readq readq
-+#define fb_writeb writeb
-+#define fb_writew writew
-+#define fb_writel writel
-+#define fb_writeq writeq
-+#define fb_memset memset_io
-+
- #elif defined(__i386__) || defined(__alpha__) || defined(__x86_64__) || defined(__hppa__) || (defined(__sh__) && !defined(__SH5__)) || defined(__powerpc__) || defined(__avr32__)
- 
- #define fb_readb __raw_readb
-@@ -899,7 +910,7 @@ struct fb_info {
- 
- #endif
- 
--#if defined (__BIG_ENDIAN)
-+#if defined (__BIG_ENDIAN) && !defined(CONFIG_COLDFIRE)
- #define FB_LEFT_POS(bpp)          (32 - bpp)
- #define FB_SHIFT_HIGH(val, bits)  ((val) >> (bits))
- #define FB_SHIFT_LOW(val, bits)   ((val) << (bits))
diff --git a/target/linux/coldfire/patches/080-mcfv4e_dspi_update.patch b/target/linux/coldfire/patches/080-mcfv4e_dspi_update.patch
deleted file mode 100644
index a15761673..000000000
--- a/target/linux/coldfire/patches/080-mcfv4e_dspi_update.patch
+++ /dev/null
@@ -1,1378 +0,0 @@
-From 771f4741de2cd8a103d96cd1e8281926448ff56d Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Tue, 15 Jul 2008 11:44:08 -0600
-Subject: [PATCH] Fix DSPI driver.
-
-Update to latest Matt Coldfire driver.  Fix timing issues with
-M547x/M548x END-OF-QUEUE notification.
-
-LTIBName: mcfv4e-dspi-update
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/coldfire/m547x_8x-devices.c |   35 +-
- drivers/spi/Kconfig                   |    6 +
- drivers/spi/Makefile                  |    2 +-
- drivers/spi/dspi_mcf.c                | 1217 +++++++++++++++++++++++++++++++++
- include/asm-m68k/mcfdspi.h            |   48 ++
- 5 files changed, 1296 insertions(+), 12 deletions(-)
- create mode 100644 drivers/spi/dspi_mcf.c
- create mode 100644 include/asm-m68k/mcfdspi.h
-
---- a/arch/m68k/coldfire/m547x_8x-devices.c
-+++ b/arch/m68k/coldfire/m547x_8x-devices.c
-@@ -26,26 +26,40 @@
-  */
- 
- /* number of supported SPI selects */
--#define SPI_NUM_CHIPSELECTS	4
-+#define SPI_NUM_CHIPSELECTS	8
- 
- void coldfire_spi_cs_control(u8 cs, u8 command)
- {
- 	/* nothing special required */
- }
- 
-+#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)
-+static struct coldfire_spi_chip spidev_chip_info = {
-+	.bits_per_word = 8,
-+};
-+#endif
-+
- static struct spi_board_info spi_board_info[] = {
--	/* no board info */
-+#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)
-+	{
-+		.modalias = "spidev",
-+		.max_speed_hz = 16000000,  	/* max clk (SCK) speed in HZ */
-+		.bus_num = 1,
-+		.chip_select = 0,		/* CS0 */
-+		.controller_data = &spidev_chip_info,
-+ 	}
-+#endif
- };
- 
- static int spi_irq_list[] = {
--	/* IRQ, ICR Offset, ICR Val, Mask */
--	64 + ISC_DSPI_OVRFW, 0, 0, 0,
--	64 + ISC_DSPI_RFOF,  0, 0, 0,
--	64 + ISC_DSPI_RFDF,  0, 0, 0,
--	64 + ISC_DSPI_TFUF,  0, 0, 0,
--	64 + ISC_DSPI_TCF,   0, 0, 0,
--	64 + ISC_DSPI_TFFF,  0, 0, 0,
--	64 + ISC_DSPI_EOQF,  0, 0, 0,
-+	/* IRQ, 	     ICR Offset, 	ICR Val,Mask */
-+	64 + ISC_DSPI_OVRFW, ISC_DSPI_OVRFW,	0x18, 	0,
-+	64 + ISC_DSPI_RFOF,  ISC_DSPI_RFOF,	0x18, 	0,
-+	64 + ISC_DSPI_RFDF,  ISC_DSPI_RFDF,	0x18, 	0,
-+	64 + ISC_DSPI_TFUF,  ISC_DSPI_TFUF,	0x18, 	0,
-+	64 + ISC_DSPI_TCF,   ISC_DSPI_TCF,	0x18, 	0,
-+	64 + ISC_DSPI_TFFF,  ISC_DSPI_TFFF,	0x18, 	0,
-+	64 + ISC_DSPI_EOQF,  ISC_DSPI_EOQF,	0x18, 	0,
- 	0,0,0,0,
- };
- 
-@@ -120,7 +134,6 @@ static int __init m547x_8x_spi_init(void
- 	/* register device */
- 	retval = platform_device_register(&coldfire_spi);
- 	if (retval < 0) {
--		printk(KERN_ERR "SPI-m547x_8x: platform_device_register failed with code=%d\n", retval);
- 		goto out;
- 	}
- 
---- a/drivers/spi/Kconfig
-+++ b/drivers/spi/Kconfig
-@@ -130,6 +130,12 @@ config SPI_COLDFIRE
- 	  Tested with the 5282 processor, but should also work with other
- 	  Coldfire variants.
- 
-+config SPI_DSPI
-+	tristate "Coldfire DSPI"
-+	depends on SPI_MASTER && COLDFIRE
-+	help
-+	  SPI driver for Coldfire DSPI driver only.
-+
- config SPI_COLDFIRE_DSPI_EDMA	  
- 	boolean "Coldfire DSPI master driver uses eDMA"
- 	depends on SPI_MASTER && COLDFIRE && SPI_COLDFIRE && EXPERIMENTAL && COLDFIRE_EDMA
---- a/drivers/spi/Makefile
-+++ b/drivers/spi/Makefile
-@@ -19,7 +19,7 @@ obj-$(CONFIG_SPI_BITBANG)		+= spi_bitban
- obj-$(CONFIG_SPI_AU1550)		+= au1550_spi.o
- obj-$(CONFIG_SPI_BUTTERFLY)		+= spi_butterfly.o
- # obj-$(CONFIG_SPI_COLDFIRE)		+= spi_coldfire.o spi-m5445x.o
--obj-$(CONFIG_SPI_COLDFIRE)		+= spi_coldfire.o
-+obj-$(CONFIG_SPI_DSPI)			+= dspi_mcf.o
- obj-$(CONFIG_SPI_GPIO)			+= spi_gpio.o
- obj-$(CONFIG_SPI_IMX)			+= spi_imx.o
- obj-$(CONFIG_SPI_LM70_LLP)		+= spi_lm70llp.o
---- /dev/null
-+++ b/drivers/spi/dspi_mcf.c
-@@ -0,0 +1,1217 @@
-+/*
-+ * dspi_mcf.c - DSPI controller for ColdFire processors
-+ *
-+ *
-+ *      Matt Waddel Matt.Waddel@freescale.com
-+ *      Copyright Freescale Semiconductor, Inc. 2008
-+ *
-+ * 	M547x/M548x changes by Kurt Mahan kmahan@freescale.com
-+ *      Copyright Freescale Semiconductor, Inc. 2008
-+ *
-+ *      Based on spi_coldfire.c done by:
-+ *              Andrey Butok
-+ *              Yaroslav Vinogradov
-+ *              Copyright Freescale Semiconductor, Inc. 2006-2007
-+ *              Mike Lavender (mike@steroidmicros)
-+ *              (C) Copyright 2005, Intec Automation,
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ ***************************************************************************
-+ * Changes:
-+ *   v0.002	M547x/M548x support.
-+ *   v0.001	Initial version. Coldfire DSPI master driver.
-+ ****************************************************************************/
-+
-+/*
-+ * Includes
-+ */
-+
-+#include <linux/autoconf.h>
-+#include <linux/init.h>
-+#include <linux/module.h>
-+#include <linux/device.h>
-+#include <linux/interrupt.h>
-+#include <linux/platform_device.h>
-+#include <linux/spi/spi.h>
-+#include <linux/workqueue.h>
-+#include <linux/delay.h>
-+#include <asm/mcfsim.h>
-+#include <asm/mcfqspi.h>
-+#include <asm/coldfire.h>
-+#include <linux/io.h>
-+#include <asm/mcfdspi.h>
-+#include <linux/dma-mapping.h>
-+
-+#undef DSPI_COLDFIRE_DEBUG
-+
-+#ifdef DSPI_COLDFIRE_DEBUG
-+#define DBG(fmt, args...) \
-+	printk(KERN_INFO "[%s]  " fmt , __FUNCTION__, ## args)
-+#else
-+#define DBG(fmt, args...)	do {} while (0)
-+#endif
-+
-+#if defined(CONFIG_M54455)
-+#include <asm/mcf5445x_dspi.h>
-+#if defined(CONFIG_SPI_COLDFIRE_DSPI_EDMA)
-+	#include <asm/mcf5445x_edma.h>
-+#endif
-+#endif
-+
-+#if defined(CONFIG_M547X_8X)
-+#include <asm/virtconvert.h>
-+#include <asm/m5485dspi.h>
-+#endif
-+
-+#if defined(CONFIG_SPI_COLDFIRE_DSPI_EDMA)
-+#include <asm/mcf_edma.h>
-+#define SPI_DSPI_EDMA
-+#define EDMA_BUFSIZE_KMALLOC	(DSPI_FIFO_SIZE*4)
-+#define DSPI_DMA_RX_TCD		MCF_EDMA_CHAN_DSPI_RX
-+#define DSPI_DMA_TX_TCD 	MCF_EDMA_CHAN_DSPI_TX
-+#endif
-+
-+#define DSPI_BITS	MCF_DSPI_DCTAR_FMSZ(0xF)
-+#define DSPI_BITS_16	MCF_DSPI_DCTAR_FMSZ(0xF)
-+#define DSPI_BITS_8	MCF_DSPI_DCTAR_FMSZ(0x7)
-+#define DSPI_FIFO_SIZE	16
-+
-+#define DRIVER_NAME "Coldfire DSPI"
-+
-+/****************************************************************************/
-+
-+/*
-+ * Local constants and macros
-+ */
-+
-+#define START_STATE ((void *)0)
-+#define RUNNING_STATE ((void *)1)
-+#define DONE_STATE ((void *)2)
-+#define ERROR_STATE ((void *)-1)
-+
-+#define QUEUE_RUNNING 0
-+#define QUEUE_STOPPED 1
-+
-+/****************************************************************************/
-+
-+/*
-+ * Local Data Structures
-+ */
-+
-+struct DSPI_MCR {
-+	unsigned master:1;
-+	unsigned cont_scke:1;
-+	unsigned dconf:2;
-+	unsigned frz:1;
-+	unsigned mtfe:1;
-+	unsigned pcsse:1;
-+	unsigned rooe:1;
-+	unsigned pcsis:8;
-+	unsigned reserved15:1;
-+	unsigned mdis:1;
-+	unsigned dis_tx:1;
-+	unsigned dis_rxf:1;
-+	unsigned clr_tx:1;
-+	unsigned clr_rxf:1;
-+	unsigned smpl_pt:2;
-+	unsigned reserved71:7;
-+	unsigned halt:1;
-+};
-+
-+struct DSPI_CTAR {
-+	unsigned dbr:1;
-+	unsigned fmsz:4;
-+	unsigned cpol:1;
-+	unsigned cpha:1;
-+	unsigned lsbfe:1;
-+	unsigned pcssck:2;
-+	unsigned pasc:2;
-+	unsigned pdt:2;
-+	unsigned pbr:2;
-+	unsigned cssck:4;
-+	unsigned asc:4;
-+	unsigned dt:4;
-+	unsigned br:4;
-+};
-+
-+struct chip_data {
-+	/* dspi data */
-+	union {
-+		u32 mcr_val;
-+		struct DSPI_MCR mcr;
-+	};
-+	union {
-+		u32 ctar_val;
-+		struct DSPI_CTAR ctar;
-+	};
-+	u16 void_write_data;
-+};
-+
-+
-+struct driver_data {
-+	/* Driver model hookup */
-+	struct platform_device *pdev;
-+
-+	/* SPI framework hookup */
-+	struct spi_master *master;
-+
-+	/* Driver message queue */
-+	struct workqueue_struct	*workqueue;
-+	struct work_struct pump_messages;
-+	spinlock_t lock; /* lock */
-+	struct list_head queue;
-+	int busy;
-+	int run;
-+
-+	/* Message Transfer pump */
-+	struct tasklet_struct pump_transfers;
-+
-+	/* Current message transfer state info */
-+	struct spi_message *cur_msg;
-+	struct spi_transfer *cur_transfer;
-+	struct chip_data *cur_chip;
-+	size_t len;
-+	void *tx;
-+	void *tx_end;
-+	void *rx;
-+	void *rx_end;
-+	char flags;
-+#define TRAN_STATE_RX_VOID	   0x01
-+#define TRAN_STATE_TX_VOID 	   0x02
-+#define TRAN_STATE_WORD_ODD_NUM	   0x04
-+	u8 cs;
-+	u16 void_write_data;
-+	unsigned cs_change:1;
-+
-+	u32 trans_cnt;
-+	u32 wce_cnt;
-+	u32 abrt_cnt;
-+	u32 *mcr;		/* DSPI MCR register */
-+	u32 *ctar;		/* DSPI CTAR register */
-+	u32 *dspi_dtfr;		/* DSPI DTFR register */
-+	u32 *dspi_drfr;		/* DSPI DRFR register */
-+	u32 *dspi_rser;		/* DSPI RSER register */
-+	u32 *dspi_sr;		/* DSPI status register */
-+
-+#if defined(SPI_DSPI_EDMA)
-+	void *edma_tx_buf;
-+	void *edma_rx_buf;
-+#endif
-+
-+#if defined(CONFIG_M532x) || defined(CONFIG_M537x)
-+	u16 *par;	   /* Pin assignment register */
-+#else
-+	u8  *par;	   /* Pin assignment register */
-+#endif
-+	u8  *int_icr;	   /* Interrupt level and priority register */
-+	u32 *int_mr;       /* Interrupt mask register */
-+	void (*cs_control)(u8 cs, u8 command);
-+};
-+
-+#define DSPI_CS(cs) ((1<<(cs))<<16)
-+
-+/****************************************************************************/
-+
-+/*
-+ * SPI local functions
-+ */
-+
-+static void *next_transfer(struct driver_data *drv_data)
-+{
-+	struct spi_message *msg = drv_data->cur_msg;
-+	struct spi_transfer *trans = drv_data->cur_transfer;
-+
-+	DBG("\n");
-+	/* Move to next transfer */
-+	if (trans->transfer_list.next != &msg->transfers) {
-+		drv_data->cur_transfer = list_entry(trans->transfer_list.next,
-+						    struct spi_transfer,
-+						    transfer_list);
-+
-+		if (drv_data->cur_transfer->transfer_list.next
-+			== &msg->transfers) /* last transfer */
-+			drv_data->cur_transfer->cs_change = 1;
-+
-+		return RUNNING_STATE;
-+	} else
-+		return DONE_STATE;
-+}
-+
-+
-+static inline int is_word_transfer(struct driver_data *drv_data)
-+{
-+	return ((*(drv_data->ctar+drv_data->cs) & DSPI_BITS_16) ==
-+						  DSPI_BITS_8) ? 0 : 1;
-+}
-+
-+static inline void set_8bit_transfer_mode(struct driver_data *drv_data)
-+{
-+	DBG("\n");
-+	*(drv_data->ctar+drv_data->cs) =
-+		(*(drv_data->ctar + drv_data->cs) & ~DSPI_BITS) | DSPI_BITS_8;
-+}
-+
-+static inline void set_16bit_transfer_mode(struct driver_data *drv_data)
-+{
-+	DBG("\n");
-+	*(drv_data->ctar+drv_data->cs) =
-+		(*(drv_data->ctar + drv_data->cs) & ~DSPI_BITS) | DSPI_BITS_16;
-+}
-+
-+static unsigned char hz_to_spi_baud(int pbr, int dbr, int speed_hz)
-+{
-+	int pbr_tbl[4] = {2, 3, 5, 7}; /* Valid baud rate pre-scaler values */
-+	int brs[16] = {	2,	4,	6,	8,
-+			16,	32,	64,	128,
-+			256,	512,	1024,	2048,
-+			4096,	8192,	16384,	32768 };
-+	int temp, index = 0;
-+
-+	if ((pbr < 0) || (pbr > 3) ||
-+	    (dbr < 0) || (dbr > 1))
-+		return 15; /* table indexes out of range, go slow */
-+
-+	temp = ((((MCF_CLK / 2) / pbr_tbl[pbr]) * (1 + dbr)) / speed_hz);
-+
-+	while (temp >= brs[index])
-+		if (index++ >= 15)
-+			break;
-+
-+	DBG("baud rate scaler = 0x%x - %d\n", index, brs[index]);
-+	return(index);
-+}
-+
-+static int write(struct driver_data *drv_data)
-+{
-+	int tx_count = 0;
-+	int tx_word = is_word_transfer(drv_data);
-+	u16 d16;
-+	u8  d8;
-+	u32 dspi_pushr = 0;
-+	int first = 1;
-+#if defined(SPI_DSPI_EDMA)
-+	u32 *edma_wr = (u32 *)(drv_data->edma_tx_buf);
-+#endif
-+
-+	/* If we are in word mode, but only have a single byte to transfer
-+	 * then switch to byte mode temporarily.  Will switch back at the
-+	 * end of the transfer. */
-+	if (tx_word && ((drv_data->tx_end - drv_data->tx) == 1)) {
-+		drv_data->flags |= TRAN_STATE_WORD_ODD_NUM;
-+		set_8bit_transfer_mode(drv_data);
-+		tx_word = 0;
-+	}
-+
-+	while ((drv_data->tx < drv_data->tx_end) && (tx_count < DSPI_FIFO_SIZE)) {
-+// DBG("while\n");
-+		if (tx_word) {
-+			if ((drv_data->tx_end - drv_data->tx) == 1)
-+				break;
-+
-+			if (!(drv_data->flags & TRAN_STATE_TX_VOID))
-+				d16 = *(u16 *)drv_data->tx;
-+			else
-+				d16 = drv_data->void_write_data;
-+
-+			dspi_pushr = MCF_DSPI_DTFR_TXDATA(d16) |
-+				     DSPI_CS(drv_data->cs) |
-+				     MCF_DSPI_DTFR_CTAS(drv_data->cs) |
-+				     MCF_DSPI_DTFR_CONT;
-+
-+			drv_data->tx += 2;
-+		} else {
-+			if (!(drv_data->flags & TRAN_STATE_TX_VOID))
-+				d8 = *(u8 *)drv_data->tx;
-+			else
-+				d8 = *(u8 *)&drv_data->void_write_data;
-+
-+			dspi_pushr = MCF_DSPI_DTFR_TXDATA(d8) |
-+				     DSPI_CS(drv_data->cs) |
-+				     MCF_DSPI_DTFR_CTAS(drv_data->cs) |
-+				     MCF_DSPI_DTFR_CONT;
-+
-+			drv_data->tx++;
-+		}
-+
-+		if (drv_data->tx == drv_data->tx_end
-+			|| tx_count == DSPI_FIFO_SIZE-1) {
-+			/* last transfer in the queue */
-+			dspi_pushr |= MCF_DSPI_DTFR_EOQ;
-+			if ((drv_data->cs_change)
-+			 && (drv_data->tx == drv_data->tx_end))
-+				dspi_pushr &= ~MCF_DSPI_DTFR_CONT;
-+#ifdef CONFIG_M547X_8X
-+			/* EOQ gets missed if we don't delay */
-+			udelay(100);
-+#endif
-+		} else if (tx_word && ((drv_data->tx_end - drv_data->tx) == 1))
-+			dspi_pushr |= MCF_DSPI_DTFR_EOQ;
-+
-+		if (first) {
-+			first = 0;
-+			dspi_pushr |= MCF_DSPI_DTFR_CTCNT; /* clear counter */
-+		}
-+#if defined(SPI_DSPI_EDMA)
-+		*edma_wr = dspi_pushr;
-+		edma_wr++;
-+#else
-+		*drv_data->dspi_dtfr = dspi_pushr;
-+#endif
-+		tx_count++;
-+	}
-+
-+#if defined(SPI_DSPI_EDMA)
-+	if (tx_count > 0) {
-+
-+		mcf_edma_set_tcd_params(DSPI_DMA_TX_TCD,
-+			virt_to_phys(drv_data->edma_tx_buf),
-+			(u32)drv_data->dspi_dtfr,
-+			MCF_EDMA_TCD_ATTR_SSIZE_32BIT
-+			| MCF_EDMA_TCD_ATTR_DSIZE_32BIT,
-+			4,		/* soff */
-+			4 * tx_count,	/* nbytes */
-+			0,		/* slast */
-+			1,		/* citer */
-+			1,		/* biter */
-+			0,		/* doff */
-+			0,		/* dlastsga */
-+			0,		/* major_int */
-+			1);		/* disable_req */
-+
-+		mcf_edma_set_tcd_params(DSPI_DMA_RX_TCD,
-+			(u32)drv_data->dspi_drfr,
-+			virt_to_phys(drv_data->edma_rx_buf),
-+			MCF_EDMA_TCD_ATTR_SSIZE_32BIT
-+			| MCF_EDMA_TCD_ATTR_DSIZE_32BIT,
-+			0,		/* soff */
-+			4 * tx_count,	/* nbytes */
-+			0,		/* slast */
-+			1,		/* citer */
-+			1,		/* biter */
-+			4,		/* doff */
-+			0,		/* dlastsga */
-+			0,		/* major_int */
-+			1);		/* disable_req */
-+
-+		mcf_edma_start_transfer(DSPI_DMA_TX_TCD);
-+	}
-+#endif
-+	return (tx_count * (tx_word + 1));
-+}
-+
-+static int read(struct driver_data *drv_data)
-+{
-+	int rx_count = 0;
-+	int rx_word = is_word_transfer(drv_data);
-+	u16 d;
-+#if defined(SPI_DSPI_EDMA)
-+	u32 *rx_edma = (u32 *) drv_data->edma_rx_buf;
-+
-+	/* receive SPI data */
-+	mcf_edma_start_transfer(DSPI_DMA_RX_TCD);
-+#endif
-+	while ((drv_data->rx < drv_data->rx_end)
-+		&& (rx_count < DSPI_FIFO_SIZE)) {
-+
-+		if (rx_word) {
-+			if ((drv_data->rx_end - drv_data->rx) == 1)
-+				break;
-+#if defined(SPI_DSPI_EDMA)
-+			d = MCF_DSPI_DRFR_RXDATA(*rx_edma);
-+			rx_edma++;
-+#else
-+			d = MCF_DSPI_DRFR_RXDATA(*drv_data->dspi_drfr);
-+#endif
-+			if (!(drv_data->flags & TRAN_STATE_RX_VOID))
-+				*(u16 *)drv_data->rx = d;
-+			drv_data->rx += 2;
-+
-+		} else {
-+#if defined(SPI_DSPI_EDMA)
-+			d = MCF_DSPI_DRFR_RXDATA(*rx_edma);
-+			rx_edma++;
-+#else
-+			d = MCF_DSPI_DRFR_RXDATA(*drv_data->dspi_drfr);
-+#endif
-+			if (!(drv_data->flags & TRAN_STATE_RX_VOID))
-+				*(u8 *)drv_data->rx = d;
-+			drv_data->rx++;
-+		}
-+		rx_count++;
-+		DBG("rxd=0x%x\n", d);
-+	}
-+	return rx_count;
-+}
-+
-+
-+static inline void dspi_setup_chip(struct driver_data *drv_data)
-+{
-+	struct chip_data *chip = drv_data->cur_chip;
-+
-+	DBG("\n");
-+	*drv_data->mcr = chip->mcr_val;
-+	*(drv_data->ctar+drv_data->cs) = chip->ctar_val;
-+	*drv_data->dspi_rser =  MCF_DSPI_DRSER_EOQFE;
-+}
-+
-+#if defined(SPI_DSPI_EDMA)
-+static int edma_tx_handler(int channel, void *dev)
-+{
-+	DBG("\n");
-+	if (channel == DSPI_DMA_TX_TCD)
-+		mcf_edma_stop_transfer(DSPI_DMA_TX_TCD);
-+	return IRQ_HANDLED;
-+}
-+
-+static int edma_rx_handler(int channel, void *dev)
-+{
-+	DBG("\n");
-+	if (channel == DSPI_DMA_RX_TCD)
-+		mcf_edma_stop_transfer(DSPI_DMA_RX_TCD);
-+	return IRQ_HANDLED;
-+}
-+#endif
-+
-+static irqreturn_t dspi_interrupt(int irq, void *dev_id)
-+{
-+	struct driver_data *drv_data = (struct driver_data *)dev_id;
-+	struct spi_message *msg = drv_data->cur_msg;
-+
-+	/* Clear all flags immediately */
-+	*drv_data->dspi_sr = MCF_DSPI_DSR_EOQF;
-+
-+	if (!drv_data->cur_msg || !drv_data->cur_msg->state) {
-+#if !defined(SPI_DSPI_EDMA)
-+		u32 irq_status = *drv_data->dspi_sr;
-+		/* if eDMA is used it happens some time (at least once)*/
-+		printk(KERN_ERR "Bad message or transfer state handler. \
-+				 IRQ status = %x\n", irq_status);
-+#endif
-+		return IRQ_NONE;
-+	}
-+
-+	DBG("\n");
-+	/*
-+	 * Read the data into the buffer and reload and start
-+	 * queue with new data if not finished.  If finished
-+	 * then setup the next transfer
-+	 */
-+	read(drv_data);
-+
-+	if (drv_data->rx == drv_data->rx_end) {
-+		/*
-+		 * Finished now - fall through and schedule next
-+		 * transfer tasklet
-+		 */
-+		if (drv_data->flags & TRAN_STATE_WORD_ODD_NUM)
-+			set_16bit_transfer_mode(drv_data);
-+
-+		msg->state = next_transfer(drv_data);
-+	} else {
-+		/* not finished yet - keep going */
-+		msg->actual_length += write(drv_data);
-+		return IRQ_HANDLED;
-+	}
-+
-+	tasklet_schedule(&drv_data->pump_transfers);
-+
-+	return IRQ_HANDLED;
-+}
-+
-+/* caller already set message->status; dma and pio irqs are blocked */
-+static void giveback(struct driver_data *drv_data)
-+{
-+	struct spi_transfer *last_transfer;
-+	unsigned long flags;
-+	struct spi_message *msg;
-+	DBG("\n");
-+
-+	spin_lock_irqsave(&drv_data->lock, flags);
-+	msg = drv_data->cur_msg;
-+	drv_data->cur_msg = NULL;
-+	drv_data->cur_transfer = NULL;
-+	drv_data->cur_chip = NULL;
-+	queue_work(drv_data->workqueue, &drv_data->pump_messages);
-+	spin_unlock_irqrestore(&drv_data->lock, flags);
-+
-+	last_transfer = list_entry(msg->transfers.prev,
-+				   struct spi_transfer,	transfer_list);
-+
-+	if (!last_transfer->cs_change)
-+		drv_data->cs_control(drv_data->cs, QSPI_CS_DROP);
-+
-+	msg->state = NULL;
-+	if (msg->complete)
-+		msg->complete(msg->context);
-+}
-+
-+
-+static void pump_transfers(unsigned long data)
-+{
-+	struct driver_data *drv_data = (struct driver_data *)data;
-+	struct spi_message *message = NULL;
-+	struct spi_transfer *transfer = NULL;
-+	struct spi_transfer *previous = NULL;
-+	struct chip_data *chip = NULL;
-+	unsigned long flags;
-+	DBG("\n");
-+	/* Get current state information */
-+	message = drv_data->cur_msg;
-+	transfer = drv_data->cur_transfer;
-+	chip = drv_data->cur_chip;
-+
-+	/* Handle for abort */
-+	if (message->state == ERROR_STATE) {
-+		message->status = -EIO;
-+		giveback(drv_data);
-+		return;
-+	}
-+
-+	/* Handle end of message */
-+	if (message->state == DONE_STATE) {
-+		message->status = 0;
-+		giveback(drv_data);
-+		return;
-+	}
-+
-+	if (message->state == START_STATE) {
-+		dspi_setup_chip(drv_data);
-+
-+		if (drv_data->cs_control)
-+			drv_data->cs_control(message->spi->chip_select,
-+				QSPI_CS_ASSERT);
-+	}
-+
-+	/* Delay if requested at end of transfer*/
-+	if (message->state == RUNNING_STATE) {
-+		previous = list_entry(transfer->transfer_list.prev,
-+					struct spi_transfer,
-+					transfer_list);
-+
-+		if (drv_data->cs_control && transfer->cs_change)
-+			drv_data->cs_control(message->spi->chip_select,
-+				QSPI_CS_DROP);
-+
-+		if (previous->delay_usecs)
-+			udelay(previous->delay_usecs);
-+
-+		if (drv_data->cs_control && transfer->cs_change)
-+			drv_data->cs_control(message->spi->chip_select,
-+				QSPI_CS_ASSERT);
-+	}
-+
-+	drv_data->flags = 0;
-+	drv_data->tx = (void *)transfer->tx_buf;
-+	drv_data->tx_end = drv_data->tx + transfer->len;
-+	drv_data->rx = transfer->rx_buf;
-+	drv_data->rx_end = drv_data->rx + transfer->len;
-+
-+	if (!drv_data->rx)
-+		drv_data->flags |= TRAN_STATE_RX_VOID;
-+	if (!drv_data->tx)
-+		drv_data->flags |= TRAN_STATE_TX_VOID;
-+	drv_data->cs = message->spi->chip_select;
-+	drv_data->cs_change = transfer->cs_change;
-+	drv_data->void_write_data = chip->void_write_data;
-+	if (transfer->speed_hz) {
-+		*(drv_data->ctar + drv_data->cs) = \
-+			((chip->ctar_val & ~0xF) | \
-+			  hz_to_spi_baud(chip->ctar.pbr, \
-+					 chip->ctar.dbr, \
-+					 transfer->speed_hz));
-+	}
-+
-+	message->state = RUNNING_STATE;
-+	/* Go baby, go */
-+	local_irq_save(flags);
-+	message->actual_length += write(drv_data);
-+	local_irq_restore(flags);
-+}
-+
-+
-+static void pump_messages(struct work_struct *work)
-+{
-+	struct driver_data *drv_data;
-+	unsigned long flags;
-+	DBG("\n");
-+
-+	drv_data = container_of(work, struct driver_data, pump_messages);
-+
-+	/* Lock queue and check for queue work */
-+	spin_lock_irqsave(&drv_data->lock, flags);
-+	if (list_empty(&drv_data->queue)
-+		|| drv_data->run == QUEUE_STOPPED) {
-+		drv_data->busy = 0;
-+		spin_unlock_irqrestore(&drv_data->lock, flags);
-+		return;
-+	}
-+
-+	/* Make sure we are not already running a message */
-+	if (drv_data->cur_msg) {
-+		spin_unlock_irqrestore(&drv_data->lock, flags);
-+		return;
-+	}
-+
-+	/* Extract head of queue */
-+	drv_data->cur_msg = list_entry(drv_data->queue.next,
-+					struct spi_message, queue);
-+	list_del_init(&drv_data->cur_msg->queue);
-+
-+	/* Initial message state*/
-+	drv_data->cur_msg->state = START_STATE;
-+	drv_data->cur_transfer = list_entry(drv_data->cur_msg->transfers.next,
-+						struct spi_transfer,
-+						transfer_list);
-+
-+	if (drv_data->cur_transfer->transfer_list.next
-+		== &drv_data->cur_msg->transfers)
-+		drv_data->cur_transfer->cs_change = 1; /* last */
-+
-+
-+	/* Setup the SPI Registers using the per chip configuration */
-+	drv_data->cur_chip = spi_get_ctldata(drv_data->cur_msg->spi);
-+
-+	/* Mark as busy and launch transfers */
-+	tasklet_schedule(&drv_data->pump_transfers);
-+
-+	drv_data->busy = 1;
-+	spin_unlock_irqrestore(&drv_data->lock, flags);
-+}
-+
-+/****************************************************************************/
-+
-+/*
-+ * SPI master implementation
-+ */
-+
-+static int transfer(struct spi_device *spi, struct spi_message *msg)
-+{
-+	struct driver_data *drv_data = spi_master_get_devdata(spi->master);
-+	unsigned long flags;
-+
-+	DBG("\n");
-+	spin_lock_irqsave(&drv_data->lock, flags);
-+
-+	if (drv_data->run == QUEUE_STOPPED) {
-+		spin_unlock_irqrestore(&drv_data->lock, flags);
-+		return -ESHUTDOWN;
-+	}
-+
-+	msg->actual_length = 0;
-+	msg->status = -EINPROGRESS;
-+	msg->state = START_STATE;
-+
-+	list_add_tail(&msg->queue, &drv_data->queue);
-+
-+	if (drv_data->run == QUEUE_RUNNING && !drv_data->busy)
-+		queue_work(drv_data->workqueue, &drv_data->pump_messages);
-+
-+	spin_unlock_irqrestore(&drv_data->lock, flags);
-+
-+	return 0;
-+}
-+
-+
-+static int setup(struct spi_device *spi)
-+{
-+
-+	struct chip_data *chip;
-+	struct coldfire_dspi_chip *chip_info
-+		= (struct coldfire_dspi_chip *)spi->controller_data;
-+	DBG("\n");
-+
-+	/* Only alloc on first setup */
-+	chip = spi_get_ctldata(spi);
-+	if (chip == NULL) {
-+		chip = kcalloc(1, sizeof(struct chip_data), GFP_KERNEL);
-+		if (!chip)
-+			return -ENOMEM;
-+		spi->mode = chip_info->mode;
-+		spi->bits_per_word = chip_info->bits_per_word;
-+	}
-+
-+	chip->mcr.master = 1;
-+	chip->mcr.cont_scke = 0;
-+	chip->mcr.dconf = 0;
-+	chip->mcr.frz = 0;
-+	chip->mcr.mtfe = 0;
-+	chip->mcr.pcsse = 0;
-+	chip->mcr.rooe = 0;
-+	chip->mcr.pcsis = 0xFF;
-+	chip->mcr.reserved15 = 0;
-+	chip->mcr.mdis = 0;
-+	chip->mcr.dis_tx = 0;
-+	chip->mcr.dis_rxf = 0;
-+	chip->mcr.clr_tx = 1;
-+	chip->mcr.clr_rxf = 1;
-+	chip->mcr.smpl_pt = 0;
-+	chip->mcr.reserved71 = 0;
-+	chip->mcr.halt = 0;
-+
-+	if ((spi->bits_per_word >= 4) && (spi->bits_per_word <= 16)) {
-+		chip->ctar.fmsz = spi->bits_per_word-1;
-+	} else {
-+		printk(KERN_ERR "Invalid wordsize\n");
-+		kfree(chip);
-+		return -ENODEV;
-+	}
-+
-+	chip->void_write_data = chip_info->void_write_data;
-+
-+	if (spi->max_speed_hz != 0)
-+		chip_info->br = hz_to_spi_baud(chip_info->pbr, chip_info->dbr, \
-+					       spi->max_speed_hz);
-+
-+	chip->ctar.cpha = (spi->mode & SPI_CPHA) ? 1 : 0;
-+	chip->ctar.cpol = (spi->mode & SPI_CPOL) ? 1 : 0;
-+	chip->ctar.lsbfe = (spi->mode & SPI_LSB_FIRST) ? 1 : 0;
-+	chip->ctar.dbr = chip_info->dbr;
-+	chip->ctar.pbr = chip_info->pbr;
-+	chip->ctar.br = chip_info->br;
-+	chip->ctar.pcssck = chip_info->pcssck;
-+	chip->ctar.pasc = chip_info->pasc;
-+	chip->ctar.pdt = chip_info->pdt;
-+	chip->ctar.cssck = chip_info->cssck;
-+	chip->ctar.asc = chip_info->asc;
-+	chip->ctar.dt = chip_info->dt;
-+
-+	spi_set_ctldata(spi, chip);
-+
-+	return 0;
-+}
-+
-+static int init_queue(struct driver_data *drv_data)
-+{
-+	INIT_LIST_HEAD(&drv_data->queue);
-+	spin_lock_init(&drv_data->lock);
-+
-+	drv_data->run = QUEUE_STOPPED;
-+	drv_data->busy = 0;
-+
-+	tasklet_init(&drv_data->pump_transfers,
-+			pump_transfers,	(unsigned long)drv_data);
-+
-+	INIT_WORK(&drv_data->pump_messages, pump_messages);
-+
-+	drv_data->workqueue = create_singlethread_workqueue(
-+					drv_data->master->dev.parent->bus_id);
-+	if (drv_data->workqueue == NULL)
-+		return -EBUSY;
-+
-+	return 0;
-+}
-+
-+static int start_queue(struct driver_data *drv_data)
-+{
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&drv_data->lock, flags);
-+
-+	if (drv_data->run == QUEUE_RUNNING || drv_data->busy) {
-+		spin_unlock_irqrestore(&drv_data->lock, flags);
-+		return -EBUSY;
-+	}
-+
-+	drv_data->run = QUEUE_RUNNING;
-+	drv_data->cur_msg = NULL;
-+	drv_data->cur_transfer = NULL;
-+	drv_data->cur_chip = NULL;
-+	spin_unlock_irqrestore(&drv_data->lock, flags);
-+
-+	queue_work(drv_data->workqueue, &drv_data->pump_messages);
-+
-+	return 0;
-+}
-+
-+static int stop_queue(struct driver_data *drv_data)
-+{
-+	unsigned long flags;
-+	unsigned limit = 500;
-+	int status = 0;
-+
-+	spin_lock_irqsave(&drv_data->lock, flags);
-+
-+	/* This is a bit lame, but is optimized for the common execution path.
-+	 * A wait_queue on the drv_data->busy could be used, but then the common
-+	 * execution path (pump_messages) would be required to call wake_up or
-+	 * friends on every SPI message. Do this instead */
-+	drv_data->run = QUEUE_STOPPED;
-+	while (!list_empty(&drv_data->queue) && drv_data->busy && limit--) {
-+		spin_unlock_irqrestore(&drv_data->lock, flags);
-+		msleep(10);
-+		spin_lock_irqsave(&drv_data->lock, flags);
-+	}
-+
-+	if (!list_empty(&drv_data->queue) || drv_data->busy)
-+		status = -EBUSY;
-+
-+	spin_unlock_irqrestore(&drv_data->lock, flags);
-+
-+	return status;
-+}
-+
-+static int destroy_queue(struct driver_data *drv_data)
-+{
-+	int status;
-+
-+	status = stop_queue(drv_data);
-+	if (status != 0)
-+		return status;
-+
-+	destroy_workqueue(drv_data->workqueue);
-+
-+	return 0;
-+}
-+
-+
-+static void cleanup(struct spi_device *spi)
-+{
-+	struct chip_data *chip = spi_get_ctldata((struct spi_device *)spi);
-+
-+	dev_dbg(&spi->dev, "spi_device %u.%u cleanup\n",
-+		spi->master->bus_num, spi->chip_select);
-+
-+	kfree(chip);
-+}
-+
-+
-+/****************************************************************************/
-+
-+/*
-+ * Generic Device driver routines and interface implementation
-+ */
-+
-+static int coldfire_spi_probe(struct platform_device *pdev)
-+{
-+	struct device *dev = &pdev->dev;
-+	struct coldfire_spi_master *platform_info;
-+	struct spi_master *master;
-+	struct driver_data *drv_data = 0;
-+	struct resource *memory_resource;
-+	int irq;
-+	int status = 0;
-+	int i;
-+#if defined(SPI_DSPI_EDMA)
-+	dma_addr_t dma_handle;
-+#endif
-+
-+	platform_info = (struct coldfire_spi_master *)dev->platform_data;
-+
-+	master = spi_alloc_master(dev, sizeof(struct driver_data));
-+	if (!master)
-+		return -ENOMEM;
-+
-+ 	drv_data = spi_master_get_devdata(master);
-+ 	drv_data->master = master;
-+
-+	INIT_LIST_HEAD(&drv_data->queue);
-+	spin_lock_init(&drv_data->lock);
-+
-+	master->bus_num = platform_info->bus_num;
-+	master->num_chipselect = platform_info->num_chipselect;
-+	master->cleanup = cleanup;
-+	master->setup = setup;
-+	master->transfer = transfer;
-+
-+	drv_data->cs_control = platform_info->cs_control;
-+	if (drv_data->cs_control)
-+		for (i = 0; i < master->num_chipselect; i++)
-+			drv_data->cs_control(i, QSPI_CS_INIT | QSPI_CS_DROP);
-+
-+	/* Setup register addresses */
-+	memory_resource = platform_get_resource_byname(pdev,
-+				IORESOURCE_MEM, "spi-module");
-+	if (!memory_resource) {
-+		dev_dbg(dev, "can not find platform module memory\n");
-+		goto out_error_master_alloc;
-+	}
-+
-+#if defined(SPI_DSPI_EDMA)
-+	drv_data->edma_tx_buf = dma_alloc_coherent(NULL, EDMA_BUFSIZE_KMALLOC, \
-+						   &dma_handle, GFP_DMA);
-+	if (!drv_data->edma_tx_buf) {
-+		dev_dbg(dev, "cannot allocate eDMA TX memory\n");
-+		goto out_error_master_alloc;
-+	}
-+	drv_data->edma_rx_buf = dma_alloc_coherent(NULL, EDMA_BUFSIZE_KMALLOC, \
-+						   &dma_handle, GFP_DMA);
-+	if (!drv_data->edma_rx_buf) {
-+		dma_free_coherent(NULL, EDMA_BUFSIZE_KMALLOC, \
-+				  drv_data->edma_tx_buf, dma_handle);
-+		kfree(drv_data->edma_tx_buf);
-+		dev_dbg(dev, "cannot allocate eDMA RX memory\n");
-+		goto out_error_master_alloc;
-+	}
-+#endif
-+
-+	drv_data->mcr = (void *)&MCF_DSPI_DMCR;
-+	drv_data->ctar = (void *)&MCF_DSPI_DCTAR0;
-+	drv_data->dspi_sr = (void *)&MCF_DSPI_DSR;
-+	drv_data->dspi_rser = (void *)&MCF_DSPI_DRSER;
-+	drv_data->dspi_dtfr = (void *)&MCF_DSPI_DTFR;
-+	drv_data->dspi_drfr = (void *)&MCF_DSPI_DRFR;
-+
-+	memory_resource = platform_get_resource_byname(pdev, IORESOURCE_MEM,
-+						       "spi-par");
-+	if (!memory_resource) {
-+		dev_dbg(dev, "No spi-par memory\n");
-+		goto out_error_master_alloc;
-+	}
-+	drv_data->par = (void *)memory_resource->start;
-+
-+	memory_resource = platform_get_resource_byname(pdev, IORESOURCE_MEM,
-+						       "spi-int-level");
-+	if (!memory_resource) {
-+		dev_dbg(dev, "No spi-int-level memory\n");
-+		goto out_error_master_alloc;
-+	}
-+	drv_data->int_icr = (void *)memory_resource->start;
-+
-+	memory_resource = platform_get_resource_byname(pdev, IORESOURCE_MEM,
-+						       "spi-int-mask");
-+	if (!memory_resource) {
-+		dev_dbg(dev, "No spi-int-mask memory\n");
-+		goto out_error_master_alloc;
-+	}
-+	drv_data->int_mr = (void *)memory_resource->start;
-+
-+	if (platform_info->irq_list) {
-+		/* multiple IRQs */
-+		int *irqlist = platform_info->irq_list;
-+		while ((irq = *irqlist++)) {
-+			int off = *irqlist++;
-+			int lvl = *irqlist++;
-+			int msk = *irqlist++;
-+			status = request_irq(irq, dspi_interrupt, IRQF_DISABLED,
-+					     dev->bus_id, drv_data);
-+			if (status < 0) {
-+				dev_err(&pdev->dev, 
-+					"Unable to attach ColdFire DSPI interrupt\n");
-+				goto out_error_master_alloc;
-+			}
-+
-+			if (lvl)
-+				*(drv_data->int_icr + off) = lvl;
-+
-+			if (msk)
-+				*drv_data->int_mr &= ~msk;
-+		}
-+	}
-+	else {
-+		irq = platform_info->irq_vector;
-+
-+		status = request_irq(platform_info->irq_vector, dspi_interrupt,
-+				     IRQF_DISABLED, dev->bus_id, drv_data);
-+		if (status < 0) {
-+			dev_err(&pdev->dev, "Unable to attach ColdFire DSPI interrupt\n");
-+			goto out_error_master_alloc;
-+		}
-+
-+		*drv_data->int_icr = platform_info->irq_lp;
-+		*drv_data->int_mr &= ~platform_info->irq_mask;
-+	}
-+
-+	/* Now that we have all the addresses etc.  Let's set it up */
-+	if (platform_info->par_val)
-+		*drv_data->par = platform_info->par_val;
-+
-+	/* Initial and start queue */
-+	status = init_queue(drv_data);
-+	if (status != 0) {
-+		dev_err(&pdev->dev, "Problem initializing DSPI queue\n");
-+		goto out_error_irq_alloc;
-+	}
-+	status = start_queue(drv_data);
-+	if (status != 0) {
-+		dev_err(&pdev->dev, "Problem starting DSPI queue\n");
-+		goto out_error_irq_alloc;
-+	}
-+
-+	/* Register with the SPI framework */
-+	platform_set_drvdata(pdev, drv_data);
-+	status = spi_register_master(master);
-+	if (status != 0) {
-+		dev_err(&pdev->dev, "Problem registering DSPI master\n");
-+		status = -EINVAL;
-+		goto out_error_queue_alloc;
-+	}
-+
-+#if defined(SPI_DSPI_EDMA)
-+	if (mcf_edma_request_channel(DSPI_DMA_TX_TCD,
-+				     edma_tx_handler,
-+				     NULL,
-+				     0x0,
-+				     pdev,
-+				     NULL, /* spinlock */
-+				     DRIVER_NAME) < 0){
-+		dev_err(&pdev->dev, "eDMA transmit channel request\n");
-+		status = -EINVAL;
-+		goto out_error_queue_alloc;
-+	}
-+
-+	if (mcf_edma_request_channel(DSPI_DMA_RX_TCD,
-+				     edma_rx_handler,
-+				     NULL,
-+				     0x0,
-+				     pdev,
-+				     NULL, /* spinlock */
-+				     DRIVER_NAME) < 0){
-+		dev_err(&pdev->dev, "eDAM receive channel request\n");
-+		status = -EINVAL;
-+		mcf_edma_free_channel(DSPI_DMA_TX_TCD, pdev);
-+		goto out_error_queue_alloc;
-+	}
-+#endif
-+
-+	printk(KERN_INFO "DSPI: Coldfire master initialized\n");
-+	return status;
-+
-+out_error_queue_alloc:
-+	destroy_queue(drv_data);
-+
-+out_error_irq_alloc:
-+	free_irq(platform_info->irq_vector, drv_data);
-+
-+out_error_master_alloc:
-+	spi_master_put(master);
-+	return status;
-+
-+}
-+
-+static int coldfire_spi_remove(struct platform_device *pdev)
-+{
-+	struct driver_data *drv_data = platform_get_drvdata(pdev);
-+	int irq;
-+	int status = 0;
-+
-+	if (!drv_data)
-+		return 0;
-+
-+#if defined(SPI_DSPI_EDMA)
-+	mcf_edma_free_channel(DSPI_DMA_TX_TCD, pdev);
-+	mcf_edma_free_channel(DSPI_DMA_RX_TCD, pdev);
-+#endif
-+
-+	/* Remove the queue */
-+	status = destroy_queue(drv_data);
-+	if (status != 0)
-+		return status;
-+
-+	/* Release IRQ */
-+	irq = platform_get_irq(pdev, 0);
-+	if (irq >= 0)
-+		free_irq(irq, drv_data);
-+
-+	/* Disconnect from the SPI framework */
-+	spi_unregister_master(drv_data->master);
-+
-+	/* Prevent double remove */
-+	platform_set_drvdata(pdev, NULL);
-+
-+	return 0;
-+}
-+
-+static void coldfire_spi_shutdown(struct platform_device *pdev)
-+{
-+	int status = coldfire_spi_remove(pdev);
-+
-+	if (status != 0)
-+		dev_err(&pdev->dev, "shutdown failed with %d\n", status);
-+}
-+
-+
-+#ifdef CONFIG_PM
-+static int suspend_devices(struct device *dev, void *pm_message)
-+{
-+	pm_message_t *state = pm_message;
-+
-+	if (dev->power.power_state.event != state->event) {
-+		dev_warn(dev, "pm state does not match request\n");
-+		return -1;
-+	}
-+
-+	return 0;
-+}
-+
-+static int coldfire_spi_suspend(struct platform_device *pdev,
-+				pm_message_t state)
-+{
-+	struct driver_data *drv_data = platform_get_drvdata(pdev);
-+	int status = 0;
-+
-+	/* Check all childern for current power state */
-+	if (device_for_each_child(&pdev->dev,
-+		&state, suspend_devices) != 0) {
-+		dev_warn(&pdev->dev, "suspend aborted\n");
-+		return -1;
-+	}
-+
-+	status = stop_queue(drv_data);
-+	if (status != 0)
-+		return status;
-+
-+	return 0;
-+}
-+
-+static int coldfire_spi_resume(struct platform_device *pdev)
-+{
-+	struct driver_data *drv_data = platform_get_drvdata(pdev);
-+	int status = 0;
-+
-+	/* Start the queue running */
-+	status = start_queue(drv_data);
-+	if (status != 0) {
-+		dev_err(&pdev->dev, "problem starting queue (%d)\n", status);
-+		return status;
-+	}
-+
-+	return 0;
-+}
-+#else
-+#define coldfire_spi_suspend NULL
-+#define coldfire_spi_resume NULL
-+#endif /* CONFIG_PM */
-+
-+static struct platform_driver driver = {
-+	.driver = {
-+		.name = "spi_coldfire",
-+		.bus = &platform_bus_type,
-+		.owner = THIS_MODULE,
-+	},
-+	.probe = coldfire_spi_probe,
-+	.remove = __devexit_p(coldfire_spi_remove),
-+	.shutdown = coldfire_spi_shutdown,
-+	.suspend = coldfire_spi_suspend,
-+	.resume = coldfire_spi_resume,
-+};
-+
-+static int __init coldfire_spi_init(void)
-+{
-+	platform_driver_register(&driver);
-+
-+	return 0;
-+}
-+module_init(coldfire_spi_init);
-+
-+static void __exit coldfire_spi_exit(void)
-+{
-+	platform_driver_unregister(&driver);
-+}
-+module_exit(coldfire_spi_exit);
-+
-+MODULE_AUTHOR("Matt Waddel");
-+MODULE_DESCRIPTION("ColdFire DSPI Contoller");
-+MODULE_LICENSE("GPL");
---- /dev/null
-+++ b/include/asm-m68k/mcfdspi.h
-@@ -0,0 +1,48 @@
-+/*
-+ * mcfdspi.h-DSPI controller for the ColdFire processors.
-+ *
-+ * Andrey Butok
-+ * Copyright Freescale Semiconductor, Inc. 2008
-+ *
-+ *    This file is based on mcfqspi.h
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ ***************************************************************************
-+ * Changes:
-+ *   v0.001	25 March 2008		Andrey Butok
-+ *   		Initial Release - developed on uClinux with 2.6.23 kernel.
-+ *
-+ */
-+
-+#ifndef MCFDSPI_H_
-+#define MCFDSPI_H_
-+
-+struct coldfire_dspi_chip {
-+	u8 mode;
-+	u8 bits_per_word;
-+	u16 void_write_data;
-+	/* Only used in master mode */
-+	u8 dbr;		/* Double baud rate */
-+	u8 pbr;		/* Baud rate prescaler */
-+	u8 br;		/* Baud rate scaler */
-+	u8 pcssck;	/* PCS to SCK delay prescaler */
-+	u8 pasc;	/* After SCK delay prescaler */
-+	u8 pdt;		/* Delay after transfer prescaler */
-+	u8 cssck;	/* PCS to SCK delay scaler */
-+	u8 asc;		/* After SCK delay scaler */
-+	u8 dt;		/* Delay after transfer scaler */
-+};
-+#endif /*MCFDSPI_H_*/
diff --git a/target/linux/coldfire/patches/081-mcfv4e_vmalloc_fix.patch b/target/linux/coldfire/patches/081-mcfv4e_vmalloc_fix.patch
deleted file mode 100644
index 2bb2db60f..000000000
--- a/target/linux/coldfire/patches/081-mcfv4e_vmalloc_fix.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From db94c8c3ec831b5fab828487ba05041bc048fccf Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Tue, 15 Jul 2008 17:48:11 -0600
-Subject: [PATCH] Move VMALLOC region to a valid area.
-
-LTIBName: mcfv4e-vmalloc-fix
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/mm/cf-mmu.c      |    7 +------
- include/asm-m68k/pgtable.h |    6 +++++-
- 2 files changed, 6 insertions(+), 7 deletions(-)
-
---- a/arch/m68k/mm/cf-mmu.c
-+++ b/arch/m68k/mm/cf-mmu.c
-@@ -35,7 +35,7 @@
- #include <asm/coldfire.h>
- #include <asm/tlbflush.h>
- 
--#define KMAPAREA(x)	((x >= KMAP_START) && ( x < KMAP_END))
-+#define KMAPAREA(x)	((x >= VMALLOC_START) && ( x < KMAP_END))
- 
- #undef DEBUG
- 
-@@ -62,11 +62,6 @@ void free_initmem(void)
- 	unsigned long start = (unsigned long)&__init_begin;
- 	unsigned long end = (unsigned long)&__init_end;
- 
--/* 
-- * JKM -- revisit -- the latest round of vmlinux.lds changes has caused
-- * a little grief with how init areas are handled.  With the new toolchain
-- * release I'll fix this.
-- */
- 	printk(KERN_INFO "free_initmem: __init_begin = 0x%lx  __init_end = 0x%lx\n", start, end);
- 
- 	addr = (unsigned long)&__init_begin;
---- a/include/asm-m68k/pgtable.h
-+++ b/include/asm-m68k/pgtable.h
-@@ -73,7 +73,9 @@
- #define KMAP_START     0x0DC00000
- #define KMAP_END       0x0E000000
- #elif defined(CONFIG_COLDFIRE)
--#define KMAP_START	0xd0000000
-+#define	VMALLOC_START	0xc0000000
-+#define VMALLOC_END	0xcfffffff
-+#define KMAP_START	(VMALLOC_END + 1)
- #define KMAP_END	0xe0000000
- #else
- #define	KMAP_START	0xd0000000
-@@ -88,9 +90,11 @@
-  * The vmalloc() routines leaves a hole of 4kB between each vmalloced
-  * area for the same reason. ;)
-  */
-+#if !defined(CONFIG_COLDFIRE)
- #define VMALLOC_OFFSET	(8*1024*1024)
- #define VMALLOC_START (((unsigned long) high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))
- #define VMALLOC_END KMAP_START
-+#endif
- #else
- extern unsigned long vmalloc_end;
- #define VMALLOC_START 0x0f800000
diff --git a/target/linux/coldfire/patches/086-m547x_8x_dma_dipr.patch b/target/linux/coldfire/patches/086-m547x_8x_dma_dipr.patch
deleted file mode 100644
index 8ce9502e4..000000000
--- a/target/linux/coldfire/patches/086-m547x_8x_dma_dipr.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 6cf498f4cf1930950d31aff5669bdba97d12364c Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Thu, 17 Jul 2008 15:02:23 -0600
-Subject: [PATCH] Properly clear bits in DIPR.
-
-Bugzilla 1351.
-
-LTIBName: m547x-8x-dma-dipr
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/coldfire/m547x_8x-dma.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
---- a/arch/m68k/coldfire/m547x_8x-dma.c
-+++ b/arch/m68k/coldfire/m547x_8x-dma.c
-@@ -455,7 +455,7 @@ irqreturn_t dma_interrupt_handler(int ir
- 	 * pending interrupts with those that aren't masked.
- 	 */
- 	interrupts = MCF_DMA_DIPR;
--	MCF_DMA_DIPR |= interrupts;
-+	MCF_DMA_DIPR = interrupts;
- 
- 	for (i = 0; i < 16; ++i, interrupts >>= 1) {
- 		if (interrupts & 0x1)
diff --git a/target/linux/coldfire/patches/087-m547x_8x_reboot_wd.patch b/target/linux/coldfire/patches/087-m547x_8x_reboot_wd.patch
deleted file mode 100644
index 3316cbfee..000000000
--- a/target/linux/coldfire/patches/087-m547x_8x_reboot_wd.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From b3a11478f28a24b719ff6426f52216c37c3331d7 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Thu, 17 Jul 2008 17:02:29 -0600
-Subject: [PATCH] Enable watchdog to reboot the processor.
-
-LTIBName: m547x-8x-reboot-wd
-Signed-off-by: Kurt Mahan <kmahan@freescale.com>
----
- arch/m68k/coldfire/config.c |    9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
---- a/arch/m68k/coldfire/config.c
-+++ b/arch/m68k/coldfire/config.c
-@@ -50,6 +50,10 @@
- #include <asm/mcf5445x_xbs.h>
- #endif
- 
-+#ifdef CONFIG_M547X_8X
-+#include <asm/m5485gpt.h>
-+#endif
-+
- extern int get_irq_list(struct seq_file *p, void *v);
- extern char _text, _end;
- extern char _etext, _edata, __init_begin, __init_end;
-@@ -379,6 +383,11 @@ void coldfire_reboot(void)
- 	    "moveb #0x80, %%d0\n\t"
- 	    "moveb %%d0, 0xfc0a0000\n\t"
- 	    : : : "%d0");
-+#elif defined(CONFIG_M547X_8X)
-+	/* disable interrupts and enable the watchdog */
-+	printk(KERN_INFO "Rebooting\n");
-+	asm("movew #0x2700, %sr\n");
-+	MCF_GPT_GMS0 = MCF_GPT_GMS_WDEN | MCF_GPT_GMS_CE | MCF_GPT_GMS_TMS(4);
- #endif
- }
- 
diff --git a/target/linux/coldfire/patches/088-m547x_8x_i2c_timeout_fix.patch b/target/linux/coldfire/patches/088-m547x_8x_i2c_timeout_fix.patch
deleted file mode 100644
index dbc3c994b..000000000
--- a/target/linux/coldfire/patches/088-m547x_8x_i2c_timeout_fix.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From b9607c9083b767eac26df1d39a030f3cba5d3ae3 Mon Sep 17 00:00:00 2001
-From: Kurt Mahan <kmahan@freescale.com>
-Date: Fri, 18 Jul 2008 12:40:04 -0600
-Subject: [PATCH] Increase timeouts on I2C bus.
-
-LTIBName: m547x-8x-i2c-timeout-fix
-Signed-off-by: Shrek Wu <b16972@freescale.com>
----
- drivers/i2c/busses/i2c-mcf548x.c |   40 +++++++++++++++++++++++++++++--------
- 1 files changed, 31 insertions(+), 9 deletions(-)
-
---- a/drivers/i2c/busses/i2c-mcf548x.c
-+++ b/drivers/i2c/busses/i2c-mcf548x.c
-@@ -43,8 +43,8 @@ static struct i2c_adapter i2c_mcf_board_
- 	.id = I2C_HW_MPC107,
- 	.algo_data = &i2c_mcf_board_data,
- 	.class = I2C_CLASS_HWMON,
--	.timeout = 1,
--	.retries = 1
-+	.timeout = 100,
-+	.retries = 2
- };
- /*
-  *  static void i2c_start()
-@@ -105,7 +105,7 @@ wait_for_bb(
- 	for (i = 0; i < adap->timeout; i++) {
- 		if (!(MCF_I2SR & MCF_I2SR_IBB))
- 			return 0;
--		udelay(10);
-+		udelay(100);
- 	}
- 	printk(KERN_ERR "%s: timeout", __FUNCTION__);
- 	return -ETIMEDOUT;
-@@ -124,7 +124,7 @@ wait_for_not_bb(
- 	for (i = 0; i < adap->timeout; i++) {
- 		if (MCF_I2SR & MCF_I2SR_IBB)
- 			return 0;
--		udelay(10);
-+		udelay(100);
- 	}
- 	printk(KERN_ERR "%s: timeout", __FUNCTION__);
- 	return -ETIMEDOUT;
-@@ -146,7 +146,7 @@ wait_xfer_done(
- 			MCF_I2SR &= ~MCF_I2SR_IIF;
- 			return 0;
- 		}
--		udelay(1);
-+		udelay(10);
- 	}
- 	printk(KERN_ERR "%s: timeout", __FUNCTION__);
- 	return -ETIMEDOUT;
-@@ -166,7 +166,7 @@ i2c_set_addr(
- ) {
- 	unsigned short flags = msg->flags;
- 	unsigned char addr;
--
-+	MCF_I2CR |= MCF_I2CR_MTX;
- 	if ((flags & I2C_M_TEN)) {
- 		/* 10 bit address not supported yet */
- 		return -EIO;
-@@ -269,7 +269,7 @@ mcf_sendbytes(
- 		i2c_stop(adap);
- 		wait_for_bb(adap);
- 	} else {
--		i2c_repstart(adap);
-+	/*	i2c_repstart(adap);*/
- 	}
- 
- 	return (i);
-@@ -330,7 +330,7 @@ mcf_readbytes(
- 		i2c_stop(adap);
- 		wait_for_bb(adap);
- 	} else {
--		i2c_repstart(adap);
-+	/*	i2c_repstart(adap);*/
- 	}
- 
- 	return (i+1);
-@@ -380,6 +380,27 @@ mcf_xfer(
- 	wait_for_bb(adap);
- 
- 	for (i = 0; ret >= 0 && i < num; i++) {
-+		if (MCF_I2SR & MCF_I2SR_IBB) {
-+			MCF_I2ICR = 0x00;
-+			MCF_I2CR  = 0x00;
-+                	MCF_I2CR  = 0x0A;
-+                	timeout = MCF_I2DR;
-+                	MCF_I2SR  = 0x00;
-+                	MCF_I2CR  = 0x00;
-+			MCF_I2ICR = 0x01;
-+		}
-+		/* setup SCL clock */
-+		MCF_I2FDR = get_clock(adap);
-+		/* set slave address */
-+		MCF_I2AR = get_own(adap);
-+		/* enable I2C module */
-+		MCF_I2CR = MCF_I2CR_IEN;
-+
-+		MCF_I2CR |= MCF_I2CR_TXAK;
-+
-+		/* Check for bus busy */
-+		wait_for_bb(adap);
-+
- 		pmsg = &msgs[i];
- 
- 		printk(KERN_DEBUG "i2c-algo-mcf: Doing %s %d bytes "
-@@ -388,7 +409,7 @@ mcf_xfer(
- 			pmsg->len, pmsg->addr, i + 1, num);
- 
- 		/* Send START */
--		if (i == 0)
-+		/*if (i == 0)*/
- 			i2c_start(adap);
- 
- 		/* Wait for Bus Busy */
-@@ -440,6 +461,7 @@ mcf_xfer(
- 					"%d bytes.\n", ret);
- 			}
- 		}
-+	MCF_I2CR = 0;
- 	}
- 
- 	/* Disable I2C module */
diff --git a/target/linux/coldfire/patches/089-m547x_8x_pci_reset_usb_fix.patch b/target/linux/coldfire/patches/089-m547x_8x_pci_reset_usb_fix.patch
deleted file mode 100644
index 79a1e3930..000000000
--- a/target/linux/coldfire/patches/089-m547x_8x_pci_reset_usb_fix.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Bugzilla 1647. This patch resets PCI which fixes the USB problem on mcf5475.
-
-Set PCI registers MCF_PCIGSCR and MCF_PCITCR to their reset defaults. 
-This fixes the USB problem and enables other PCI cards, such as PCI
-network to function properly.
-
-Original work of Matt Waddel
-Signed-off-by: Ross Wille
-
---- a/arch/m68k/coldfire/mcf548x-pci.c
-+++ b/arch/m68k/coldfire/mcf548x-pci.c
-@@ -1,5 +1,23 @@
- /*
-  * 	ColdFire 547x/548x PCI Host Controller functions
-+ *
-+ * Copyright (c) 2005-2008 Freescale Semiconductor, Inc.
-+ *
-+ * This code is based on the 2.6.10 version of pci.c
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  */
- #include <linux/kernel.h>
- #include <linux/types.h>
-@@ -815,6 +833,13 @@ struct pci_bus_info *__init init_coldfir
- 		return NULL;
- 	}
- 
-+	/* Must Reset!!! If bootloader has PCI enabled, it will cause
-+	 * problem in linux when it tries to configure/find resources
-+	 * for the pci devices.  Both registers need to be reset.
-+	 */
-+	MCF_PCIGSCR = 0x1;
-+	MCF_PCITCR = 0x00000000;
-+
- 	/* Set up the arbiter */
- 	MCF_PCIARB_PACR = 0 /*MCF_PCIARB_PACR_PKMD*/
- 			| MCF_PCIARB_PACR_INTMPRI 
diff --git a/target/linux/coldfire/patches/090-m547x_8x_fec_rxfifo_check.patch b/target/linux/coldfire/patches/090-m547x_8x_fec_rxfifo_check.patch
deleted file mode 100644
index 85f89c16d..000000000
--- a/target/linux/coldfire/patches/090-m547x_8x_fec_rxfifo_check.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Re-enable rx fifo buffer checks.
-
-LTIBName: linux-2.6.25-m547x-8x-fec-rxfifo-check
-Acked-by: Kurt Mahan <kmahan@freescale.com>
-Signed-off-by: Shrek Wu <b16972@freescale.com>
---- a/drivers/net/fec/fec.c
-+++ b/drivers/net/fec/fec.c
-@@ -941,9 +941,9 @@ void fec_interrupt_fec_rx_handler(struct
- {
- 	struct fec_priv *fp = netdev_priv(dev);
- 	struct sk_buff *skb;
-+	int i;
- 
- 	fp->fecpriv_rxflag = 1;
--/*
- 	// Some buffers can be missed
- 	if(!(fp->fecpriv_rxdesc[fp->fecpriv_current_rx].statCtrl & MCD_FEC_END_FRAME))
- 	{
-@@ -961,7 +961,7 @@ void fec_interrupt_fec_rx_handler(struct
- 			return;
- 		}
- 	}
--*/
-+
- 	for (; fp->fecpriv_rxdesc[fp->fecpriv_current_rx].statCtrl & MCD_FEC_END_FRAME;	fp->fecpriv_current_rx = (fp->fecpriv_current_rx + 1) & FEC_RX_INDEX_MASK) {
- 	    if( (fp->fecpriv_rxdesc[fp->fecpriv_current_rx].length <= FEC_MAXBUF_SIZE) &&
- 		    (fp->fecpriv_rxdesc[fp->fecpriv_current_rx].length > 4)) { /* --tym-- */
diff --git a/target/linux/coldfire/patches/100-compile_fixes.patch b/target/linux/coldfire/patches/100-compile_fixes.patch
deleted file mode 100644
index 0f0694e2f..000000000
--- a/target/linux/coldfire/patches/100-compile_fixes.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/include/asm-m68k/cf_pgtable.h
-+++ b/include/asm-m68k/cf_pgtable.h
-@@ -176,7 +176,7 @@ extern inline pte_t pte_modify(pte_t pte
- 
- #define pmd_set(pmdp, ptep) do {} while (0)
- 
--extern inline void pgd_set(pgd_t *pgdp, pmd_t *pmdp)
-+static inline void pgd_set(pgd_t *pgdp, pmd_t *pmdp)
- {
- 	pgd_val(*pgdp) = virt_to_phys(pmdp);
- }
---- a/arch/m68k/mm/cf-mmu.c
-+++ b/arch/m68k/mm/cf-mmu.c
-@@ -21,6 +21,7 @@
- #include <linux/blkdev.h>
- #endif
- #include <linux/bootmem.h>
-+#include <linux/highmem.h>
- 
- #include <asm/setup.h>
- #include <asm/uaccess.h>
diff --git a/target/linux/ep93xx/Makefile b/target/linux/ep93xx/Makefile
deleted file mode 100644
index dae98ad7c..000000000
--- a/target/linux/ep93xx/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Copyright (C) 2009 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-ARCH:=arm
-BOARD:=ep93xx
-BOARDNAME:=Cirrus Logic EP93xx SoC
-FEATURES:=squashfs jffs2 ext2 tgz usb
-CFLAGS:=-Os -pipe -march=armv4t -funit-at-a-time
-
-LINUX_VERSION:=2.6.30.10
-
-include $(INCLUDE_DIR)/target.mk
-
-KERNELNAME:="uImage"
-
-$(eval $(call BuildTarget))
diff --git a/target/linux/ep93xx/base-files/etc/inittab b/target/linux/ep93xx/base-files/etc/inittab
deleted file mode 100644
index ea83e79cc..000000000
--- a/target/linux/ep93xx/base-files/etc/inittab
+++ /dev/null
@@ -1,5 +0,0 @@
-::sysinit:/etc/init.d/rcS S boot
-::shutdown:/etc/init.d/rcS K stop
-tts/0::askfirst:/bin/ash --login
-ttyAM0::askfirst:/bin/ash --login
-tty1::askfirst:/bin/ash --login
diff --git a/target/linux/ep93xx/config-2.6.30 b/target/linux/ep93xx/config-2.6.30
deleted file mode 100644
index 496fd61a3..000000000
--- a/target/linux/ep93xx/config-2.6.30
+++ /dev/null
@@ -1,208 +0,0 @@
-CONFIG_AEABI=y
-CONFIG_ALIGNMENT_TRAP=y
-CONFIG_ARCH_EP93XX=y
-CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_ARCH_REQUIRE_GPIOLIB=y
-# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
-# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARM_AMBA=y
-CONFIG_ARM_THUMB=y
-CONFIG_ARM_VIC=y
-CONFIG_ARM=y
-# CONFIG_ARPD is not set
-# CONFIG_BINARY_PRINTF is not set
-CONFIG_BITREVERSE=y
-# CONFIG_BLK_DEV_INITRD is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CMDLINE="console=ttyAM0,57600 init=/etc/preinit"
-CONFIG_COMMON_CLKDEV=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_CPU_32v4T=y
-CONFIG_CPU_32=y
-CONFIG_CPU_ABRT_EV4T=y
-CONFIG_CPU_ARM920T=y
-CONFIG_CPU_CACHE_V4WT=y
-CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_COPY_V4WB=y
-CONFIG_CPU_CP15_MMU=y
-CONFIG_CPU_CP15=y
-# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
-# CONFIG_CPU_ICACHE_DISABLE is not set
-CONFIG_CPU_PABRT_NOIFAR=y
-CONFIG_CPU_TLB_V4WBI=y
-CONFIG_CRC7=y
-CONFIG_CRC_ITU_T=y
-CONFIG_CRUNCH=y
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_ARC4=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_DES=y
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_MICHAEL_MIC=y
-CONFIG_CRYPTO_PCBC=y
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_WORKQUEUE=y
-CONFIG_DEBUG_USER=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_DM9000 is not set
-CONFIG_DNOTIFY=y
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_ELF_CORE=y
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-CONFIG_EP93XX_EARLY_UART1=y
-# CONFIG_EP93XX_EARLY_UART2 is not set
-# CONFIG_EP93XX_EARLY_UART3 is not set
-CONFIG_EP93XX_ETH=y
-CONFIG_EP93XX_WATCHDOG=y
-# CONFIG_FB_ARMCLCD is not set
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_EP93XX_MONO is not set
-CONFIG_FB_EP93XX=y
-CONFIG_FB=y
-# CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FONT_10x18 is not set
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-CONFIG_FONT_8x16=y
-CONFIG_FONT_8x8=y
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_SUN8x16 is not set
-CONFIG_FONTS=y
-# CONFIG_FPE_FASTFPE is not set
-CONFIG_FPE_NWFPE_XP=y
-CONFIG_FPE_NWFPE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAME_POINTER=y
-# CONFIG_FW_LOADER is not set
-# CONFIG_GENERIC_CLOCKEVENTS is not set
-CONFIG_GENERIC_FIND_LAST_BIT=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-# CONFIG_GENERIC_TIME is not set
-CONFIG_GPIOLIB=y
-# CONFIG_HAMRADIO is not set
-CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAVE_AOUT=y
-CONFIG_HAVE_ARCH_KGDB=y
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_HAVE_IDE=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_HAVE_MLOCK=y
-CONFIG_HAVE_OPROFILE=y
-CONFIG_HW_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C_ALGOBIT=y
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_EP93XX=y
-CONFIG_I2C=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_IKCONFIG=y
-CONFIG_INOTIFY_USER=y
-CONFIG_INOTIFY=y
-# CONFIG_INPUT_MISC is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_INPUT=y
-CONFIG_LCD_HD44780=m
-CONFIG_LCD_LINUX=m
-CONFIG_LOG_BUF_SHIFT=16
-CONFIG_LOGO_LINUX_CLUT224=y
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LOGO=y
-# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set
-# CONFIG_MAC80211_RC_DEFAULT_PID is not set
-# CONFIG_MACH_ADSSPHERE is not set
-# CONFIG_MACH_EDB9302A is not set
-# CONFIG_MACH_EDB9302 is not set
-# CONFIG_MACH_EDB9307A is not set
-# CONFIG_MACH_EDB9307 is not set
-# CONFIG_MACH_EDB9312 is not set
-# CONFIG_MACH_EDB9315A is not set
-# CONFIG_MACH_EDB9315 is not set
-# CONFIG_MACH_GESBC9312 is not set
-# CONFIG_MACH_MICRO9H is not set
-# CONFIG_MACH_MICRO9 is not set
-# CONFIG_MACH_MICRO9L is not set
-# CONFIG_MACH_MICRO9M is not set
-CONFIG_MACH_SIM_ONE=y
-# CONFIG_MACH_TS72XX is not set
-# CONFIG_MFD_T7L66XB is not set
-# CONFIG_MISC_DEVICES is not set
-CONFIG_MMC_BLOCK=y
-CONFIG_MMC_SPI=y
-CONFIG_MMC=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-# CONFIG_MTD_CFI_GEOMETRY is not set
-CONFIG_MTD_CFI_STAA=y
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_RAM=y
-# CONFIG_NO_IOPORT is not set
-CONFIG_OABI_COMPAT=y
-# CONFIG_OUTER_CACHE is not set
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PAGE_OFFSET=0xC0000000
-# CONFIG_PCI_SYSCALL is not set
-CONFIG_PREEMPT=y
-# CONFIG_SCSI_DMA is not set
-# CONFIG_SDIO_UART is not set
-# CONFIG_SERIAL_8250 is not set
-CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
-CONFIG_SERIAL_AMBA_PL010=y
-# CONFIG_SERIAL_AMBA_PL011 is not set
-# CONFIG_SLOW_WORK is not set
-CONFIG_SPI_BITBANG=y
-CONFIG_SPI_EP93XX=y
-# CONFIG_SPI_GPIO is not set
-CONFIG_SPI_MASTER=y
-# CONFIG_SPI_SPIDEV is not set
-CONFIG_SPI=y
-CONFIG_SPLIT_PTLOCK_CPUS=4096
-CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_TOUCHSCREEN_EP93XX=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_UID16=y
-# CONFIG_USB_ARCH_HAS_EHCI is not set
-CONFIG_USB_SUPPORT=y
-CONFIG_VECTORS_BASE=0xffff0000
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_VIDEO_OUTPUT_CONTROL=y
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_VT_CONSOLE=y
-# CONFIG_VT_HW_CONSOLE_BINDING is not set
-CONFIG_VT=y
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/ep93xx/image/Makefile b/target/linux/ep93xx/image/Makefile
deleted file mode 100644
index 4394a6a04..000000000
--- a/target/linux/ep93xx/image/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Copyright (C) 2009-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/image.mk
-
-define Image/Prepare
-	cp $(LINUX_DIR)/arch/arm/boot/uImage $(KDIR)/uImage
-endef
-
-define Image/BuildKernel
-endef
-
-define Image/Build/jffs2-64k
-	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(1).img bs=64k conv=sync
-endef
-
-define Image/Build/jffs2-128k
-	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(1).img bs=128k conv=sync
-endef
-
-define Image/Build/squashfs
-	$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
-	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(1).img bs=128k conv=sync
-endef
-
-define Image/Build
-	cp $(KDIR)/uImage $(BIN_DIR)/uImage-$(board)
-	$(call Image/Build/$(1),$(1))
-endef
-
-$(eval $(call BuildImage))
diff --git a/target/linux/ep93xx/patches-2.6.30/001-ep93xx-regs.patch b/target/linux/ep93xx/patches-2.6.30/001-ep93xx-regs.patch
deleted file mode 100644
index 9b3128bfc..000000000
--- a/target/linux/ep93xx/patches-2.6.30/001-ep93xx-regs.patch
+++ /dev/null
@@ -1,479 +0,0 @@
---- a/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
-+++ b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
-@@ -57,6 +57,33 @@
- #define EP93XX_APB_SIZE			0x00200000
- 
- 
-+/* 8081_0000 - 8081_ffff: Timers */
-+#define TIMERS_OFFSET           0x010000
-+#define TIMERS_BASE             (EP93XX_APB_VIRT_BASE|TIMERS_OFFSET)
-+
-+#define TIMER1LOAD              (TIMERS_BASE+0x00)
-+#define TIMER1VALUE             (TIMERS_BASE+0x04)
-+#define TIMER1CONTROL           (TIMERS_BASE+0x08)
-+#define TIMER1CLEAR             (TIMERS_BASE+0x0C)
-+#define TIMER1TEST              (TIMERS_BASE+0x10)
-+
-+#define TIMER2LOAD              (TIMERS_BASE+0x20)
-+#define TIMER2VALUE             (TIMERS_BASE+0x24)
-+#define TIMER2CONTROL           (TIMERS_BASE+0x28)
-+#define TIMER2CLEAR             (TIMERS_BASE+0x2C)
-+#define TIMER2TEST              (TIMERS_BASE+0x30)
-+
-+#define TIMER3LOAD              (TIMERS_BASE+0x80)
-+#define TIMER3VALUE             (TIMERS_BASE+0x84)
-+#define TIMER3CONTROL           (TIMERS_BASE+0x88)
-+#define TIMER3CLEAR             (TIMERS_BASE+0x8C)
-+#define TIMER3TEST              (TIMERS_BASE+0x90)
-+
-+#define TTIMERBZCONT            (TIMERS_BASE+0x40)
-+
-+#define TIMER4VALUELOW          (TIMERS_BASE+0x60)
-+#define TIMER4VALUEHIGH         (TIMERS_BASE+0x64)
-+
- /* AHB peripherals */
- #define EP93XX_DMA_BASE			((void __iomem *)		\
- 					 (EP93XX_AHB_VIRT_BASE + 0x00000000))
-@@ -105,6 +132,8 @@
- #define EP93XX_I2S_BASE			(EP93XX_APB_VIRT_BASE + 0x00020000)
- 
- #define EP93XX_SECURITY_BASE		(EP93XX_APB_VIRT_BASE + 0x00030000)
-+#define EP93XX_SECURITY_REG(x)		(EP93XX_SECURITY_BASE + (x))
-+#define EP93XX_SECURITY_UNIQID		EP93XX_SECURITY_REG(0x2440)
- 
- #define EP93XX_GPIO_BASE		(EP93XX_APB_VIRT_BASE + 0x00040000)
- #define EP93XX_GPIO_REG(x)		(EP93XX_GPIO_BASE + (x))
-@@ -127,6 +156,7 @@
- #define EP93XX_AAC_BASE			(EP93XX_APB_VIRT_BASE + 0x00080000)
- 
- #define EP93XX_SPI_BASE			(EP93XX_APB_VIRT_BASE + 0x000a0000)
-+#define EP93XX_SPI_BASE_PHYS	(EP93XX_APB_PHYS_BASE + 0x000a0000)
- 
- #define EP93XX_IRDA_BASE		(EP93XX_APB_VIRT_BASE + 0x000b0000)
- 
-@@ -164,8 +194,425 @@
- #define EP93XX_SYSCON_DEVICE_CONFIG_U2EN		(1<<20)
- #define EP93XX_SYSCON_DEVICE_CONFIG_U1EN		(1<<18)
- #define EP93XX_SYSCON_SWLOCK		EP93XX_SYSCON_REG(0xc0)
-+#define EP93XX_SYSCON_CHIP_ID		EP93XX_SYSCON_REG(0x94)
-+#define EP93XX_SYSCON_BMAR              EP93XX_SYSCON_REG(0x54)
-+#define EP93XX_SYSCON_I2SDIV            EP93XX_SYSCON_REG(0x8C)
-+#define EP93XX_SYSCON_DEVCFG_CONFIG_Mong   	0x02000000
-+#define EP93XX_SYSCON_DEVCFG_CONFIG_Tong   	0x04000000
-+#define EP93XX_SYSCON_DEVCFG_CONFIG_I2SONSSP   	0x00000080
-+#define EP93XX_SYSCON_DEVCFG_CONFIG_I2SONAC97  	0x00000040
-+#define EP93XX_SYSCON_DEVCFG_RasOnP3            0x00000010
-+#define EP93XX_SYSCON_DEVCFG_A1onG              0x00200000
-+#define EP93XX_SYSCON_DEVCFG_A2onG              0x00400000
-+#define EP93XX_SYSCON_DEVCFG_U1EN               0x00040000
-+#define EP93XX_SYSCON_DEVCFG_TIN                0x00020000
- 
- #define EP93XX_WATCHDOG_BASE		(EP93XX_APB_VIRT_BASE + 0x00140000)
- 
- 
-+#define SYSCON_PWRCNT           (EP93XX_SYSCON_BASE+0x0004)
-+#define SYSCON_VIDDIV           (EP93XX_SYSCON_BASE+0x0084)
-+#define SYSCON_MIRDIV           (EP93XX_SYSCON_BASE+0x0088)
-+#define SYSCON_KTDIV            (EP93XX_SYSCON_BASE+0x0090)
-+#define SYSCON_KTDIV_TSEN       0x80000000
-+//-----------------------------------------------------------------------------
-+// SYSCON_CLKSET1
-+//-----------------------------------------------------------------------------
-+#define SYSCON_CLKSET1_PLL1_X2IPD_SHIFT     0
-+#define SYSCON_CLKSET1_PLL1_X2IPD_MASK      0x0000001f
-+#define SYSCON_CLKSET1_PLL1_X2FBD2_SHIFT    5
-+#define SYSCON_CLKSET1_PLL1_X2FBD2_MASK     0x000007e0
-+#define SYSCON_CLKSET1_PLL1_X1FBD1_SHIFT    11
-+#define SYSCON_CLKSET1_PLL1_X1FBD1_MASK     0x0000f800
-+#define SYSCON_CLKSET1_PLL1_PS_SHIFT        16
-+#define SYSCON_CLKSET1_PLL1_PS_MASK         0x00030000
-+#define SYSCON_CLKSET1_PCLKDIV_SHIFT        18
-+#define SYSCON_CLKSET1_PCLKDIV_MASK         0x000c0000
-+#define SYSCON_CLKSET1_HCLKDIV_SHIFT        20
-+#define SYSCON_CLKSET1_HCLKDIV_MASK         0x00700000
-+#define SYSCON_CLKSET1_nBYP1                0x00800000
-+#define SYSCON_CLKSET1_SMCROM               0x01000000
-+#define SYSCON_CLKSET1_FCLKDIV_SHIFT        25
-+#define SYSCON_CLKSET1_FCLKDIV_MASK         0x0e000000
-+
-+#define SYSCON_CLKSET1_HSEL                 0x00000001
-+#define SYSCON_CLKSET1_PLL1_EXCLKSEL        0x00000002
-+
-+#define SYSCON_CLKSET1_PLL1_P_MASK          0x0000007C
-+#define SYSCON_CLKSET1_PLL1_P_SHIFT         2
-+
-+#define SYSCON_CLKSET1_PLL1_M1_MASK         0x00000780
-+#define SYSCON_CLKSET1_PLL1_M1_SHIFT        7
-+#define SYSCON_CLKSET1_PLL1_M2_MASK         0x0000F800
-+#define SYSCON_CLKSET1_PLL1_M2_SHIFT        11
-+#define SYSCON_CLKSET1_PLL1_PS_MASK         0x00030000
-+#define SYSCON_CLKSET1_PLL1_PS_SHIFT        16
-+#define SYSCON_CLKSET1_PCLK_DIV_MASK        0x000C0000
-+#define SYSCON_CLKSET1_PCLK_DIV_SHIFT       18
-+#define SYSCON_CLKSET1_HCLK_DIV_MASK        0x00700000
-+#define SYSCON_CLKSET1_HCLK_DIV_SHIFT       20
-+#define SYSCON_CLKSET1_SMCROM               0x01000000
-+#define SYSCON_CLKSET1_FCLK_DIV_MASK        0x0E000000
-+#define SYSCON_CLKSET1_FCLK_DIV_SHIFT       25
-+
-+#define SYSCON_CLKSET2_PLL2_EN              0x00000001
-+#define SYSCON_CLKSET2_PLL2EXCLKSEL         0x00000002
-+#define SYSCON_CLKSET2_PLL2_P_MASK          0x0000007C
-+#define SYSCON_CLKSET2_PLL2_P_SHIFT         2
-+#define SYSCON_CLKSET2_PLL2_M2_MASK         0x00000F80
-+#define SYSCON_CLKSET2_PLL2_M2_SHIFT        7
-+#define SYSCON_CLKSET2_PLL2_M1_MASK         0x0001F000
-+#define SYSCON_CLKSET2_PLL2_M1              12
-+#define SYSCON_CLKSET2_PLL2_PS_MASK         0x000C0000
-+#define SYSCON_CLKSET2_PLL2_PS_SHIFT        18
-+#define SYSCON_CLKSET2_USBDIV_MASK          0xF0000000
-+#define SYSCON_CLKSET2_USBDIV_SHIFT         28
-+
-+//-----------------------------------------------------------------------------
-+// I2SDIV Register Defines
-+//-----------------------------------------------------------------------------
-+#define SYSCON_I2SDIV_MDIV_MASK         0x0000007f
-+#define SYSCON_I2SDIV_MDIV_SHIFT        0
-+#define SYSCON_I2SDIV_PDIV_MASK         0x00000300
-+#define SYSCON_I2SDIV_PDIV_SHIFT        8
-+#define SYSCON_I2SDIV_PSEL              0x00002000
-+#define SYSCON_I2SDIV_ESEL              0x00004000
-+#define SYSCON_I2SDIV_MENA              0x00008000
-+#define SYSCON_I2SDIV_SDIV              0x00010000
-+#define SYSCON_I2SDIV_LRDIV_MASK        0x00060000
-+#define SYSCON_I2SDIV_LRDIV_SHIFT       17
-+#define SYSCON_I2SDIV_SPOL              0x00080000
-+#define SYSCON_I2SDIV_DROP              0x00100000
-+#define SYSCON_I2SDIV_ORIDE             0x20000000
-+#define SYSCON_I2SDIV_SLAVE             0x40000000
-+#define SYSCON_I2SDIV_SENA              0x80000000
-+
-+#define SYSCON_I2SDIV_PDIV_OFF          0x00000000
-+#define SYSCON_I2SDIV_PDIV_2            0x00000100
-+#define SYSCON_I2SDIV_PDIV_25           0x00000200
-+#define SYSCON_I2SDIV_PDIV_3            0x00000300
-+
-+#define SYSCON_I2SDIV_LRDIV_32          0x00000000
-+#define SYSCON_I2SDIV_LRDIV_64          0x00020000
-+#define SYSCON_I2SDIV_LRDIV_128         0x00040000
-+
-+//-----------------------------------------------------------------------------
-+// VIDDIV Register Defines
-+//-----------------------------------------------------------------------------
-+#define SYSCON_VIDDIV_VDIV_MASK         0x0000007f
-+#define SYSCON_VIDDIV_VDIV_SHIFT        0
-+#define SYSCON_VIDDIV_PDIV_MASK         0x00000300
-+#define SYSCON_VIDDIV_PDIV_SHIFT        8
-+#define SYSCON_VIDDIV_PSEL              0x00002000
-+#define SYSCON_VIDDIV_ESEL              0x00004000
-+#define SYSCON_VIDDIV_VENA              0x00008000
-+
-+//-----------------------------------------------------------------------------
-+// MIRDIV Register Defines
-+//-----------------------------------------------------------------------------
-+#define SYSCON_MIRDIV_MDIV_MASK         0x0000003f
-+#define SYSCON_MIRDIV_MDIV_SHIFT        0
-+#define SYSCON_MIRDIV_PDIV_MASK         0x00000300
-+#define SYSCON_MIRDIV_PDIV_SHIFT        8
-+#define SYSCON_MIRDIV_PSEL              0x00002000
-+#define SYSCON_MIRDIV_ESEL              0x00004000
-+#define SYSCON_MIRDIV_MENA              0x00008000
-+
-+/* 8082_0000 - 8082_ffff: I2S */
-+#define I2S_OFFSET            0x020000
-+#define I2S_BASE              (EP93XX_APB_VIRT_BASE|I2S_OFFSET)
-+#define I2S_PHYS_BASE         (EP93XX_APB_PHYS_BASE + I2S_OFFSET)
-+
-+
-+
-+#define I2STxClkCfg           (I2S_BASE+0x00) /* 8082.0000 R/W Transmitter clock config register  */
-+#define I2SRxClkCfg           (I2S_BASE+0x04) /* 8082.0004 R/W Receiver clock config register     */
-+#define I2SGlSts              (I2S_BASE+0x08) /* 8082.0008 R/W SAI Global Status register.        */
-+#define I2SGlCtrl             (I2S_BASE+0x0C) /* 8082.000C R/W SAI Global Control register        */
-+
-+#define I2STX0Lft             (I2S_BASE+0x10) /* 8082.0010 R/W Left  TX data reg for channel 0    */
-+#define I2STX0Rt              (I2S_BASE+0x14) /* 8082.0014 R/W Right TX data reg for channel 0    */
-+#define I2STX1Lft             (I2S_BASE+0x18) /* 8082.0018 R/W Left  TX data reg for channel 1    */
-+#define I2STX1Rt              (I2S_BASE+0x1C) /* 8082.001C R/W Right TX data reg for channel 1    */
-+#define I2STX2Lft             (I2S_BASE+0x20) /* 8082.0020 R/W Left  TX data reg for channel 2    */
-+#define I2STX2Rt              (I2S_BASE+0x24) /* 8082.0024 R/W Right TX data reg for channel 2    */
-+
-+#define I2STXLinCtrlData      (I2S_BASE+0x28) /* 8082.0028 R/W TX Line Control data register      */
-+#define I2STXCtrl             (I2S_BASE+0x2C) /* 8082.002C R/W TX Control register                */
-+#define I2STXWrdLen           (I2S_BASE+0x30) /* 8082.0030 R/W TX Word Length                     */
-+#define I2STX0En              (I2S_BASE+0x34) /* 8082.0034 R/W TX0 Channel Enable                 */
-+#define I2STX1En              (I2S_BASE+0x38) /* 8082.0038 R/W TX1 Channel Enable                 */
-+#define I2STX2En              (I2S_BASE+0x3C) /* 8082.003C R/W TX2 Channel Enable                 */
-+
-+#define I2SRX0Lft             (I2S_BASE+0x40) /* 8082.0040 R   Left  RX data reg for channel 0    */
-+#define I2SRX0Rt              (I2S_BASE+0x44) /* 8082.0044 R   Right RX data reg for channel 0    */
-+#define I2SRX1Lft             (I2S_BASE+0x48) /* 8082.0048 R   Left  RX data reg for channel 1    */
-+#define I2SRX1Rt              (I2S_BASE+0x4C) /* 8082.004c R   Right RX data reg for channel 1    */
-+#define I2SRX2Lft             (I2S_BASE+0x50) /* 8082.0050 R   Left  RX data reg for channel 2    */
-+#define I2SRX2Rt              (I2S_BASE+0x54) /* 8082.0054 R   Right RX data reg for channel 2    */
-+
-+#define I2SRXLinCtrlData      (I2S_BASE+0x58) /* 8082.0058 R/W RX Line Control data register      */
-+#define I2SRXCtrl             (I2S_BASE+0x5C) /* 8082.005C R/W RX Control register                */
-+#define I2SRXWrdLen           (I2S_BASE+0x60) /* 8082.0060 R/W RX Word Length                     */
-+#define I2SRX0En              (I2S_BASE+0x64) /* 8082.0064 R/W RX0 Channel Enable                 */
-+#define I2SRX1En              (I2S_BASE+0x68) /* 8082.0068 R/W RX1 Channel Enable                 */
-+#define I2SRX2En              (I2S_BASE+0x6C) /* 8082.006C R/W RX2 Channel Enable                 */
-+
-+/* 8084_0000 - 8084_ffff: GPIO */
-+#define GPIO_OFFSET              0x040000
-+#define GPIO_BASE                (EP93XX_APB_VIRT_BASE|GPIO_OFFSET)
-+#define GPIO_PADR                (GPIO_BASE+0x00)
-+#define GPIO_PBDR                (GPIO_BASE+0x04)
-+#define GPIO_PCDR                (GPIO_BASE+0x08)
-+#define GPIO_PDDR                (GPIO_BASE+0x0C)
-+#define GPIO_PADDR               (GPIO_BASE+0x10)
-+#define GPIO_PBDDR               (GPIO_BASE+0x14)
-+#define GPIO_PCDDR               (GPIO_BASE+0x18)
-+#define GPIO_PDDDR               (GPIO_BASE+0x1C)
-+#define GPIO_PEDR                (GPIO_BASE+0x20)
-+#define GPIO_PEDDR               (GPIO_BASE+0x24)
-+// #define 0x8084.0028 Reserved
-+// #define 0x8084.002C Reserved
-+#define GPIO_PFDR                (GPIO_BASE+0x30)
-+#define GPIO_PFDDR               (GPIO_BASE+0x34)
-+#define GPIO_PGDR                (GPIO_BASE+0x38)
-+#define GPIO_PGDDR               (GPIO_BASE+0x3C)
-+#define GPIO_PHDR                (GPIO_BASE+0x40)
-+#define GPIO_PHDDR               (GPIO_BASE+0x44)
-+// #define 0x8084.0048 RAZ RAZ
-+#define GPIO_FINTTYPE1           (GPIO_BASE+0x4C)
-+#define GPIO_FINTTYPE2           (GPIO_BASE+0x50)
-+#define GPIO_FEOI                (GPIO_BASE+0x54) /* WRITE ONLY - READ UNDEFINED */
-+#define GPIO_FINTEN              (GPIO_BASE+0x58)
-+#define GPIO_INTSTATUSF          (GPIO_BASE+0x5C)
-+#define GPIO_RAWINTSTASUSF       (GPIO_BASE+0x60)
-+#define GPIO_FDB                 (GPIO_BASE+0x64)
-+#define GPIO_PAPINDR             (GPIO_BASE+0x68)
-+#define GPIO_PBPINDR             (GPIO_BASE+0x6C)
-+#define GPIO_PCPINDR             (GPIO_BASE+0x70)
-+#define GPIO_PDPINDR             (GPIO_BASE+0x74)
-+#define GPIO_PEPINDR             (GPIO_BASE+0x78)
-+#define GPIO_PFPINDR             (GPIO_BASE+0x7C)
-+#define GPIO_PGPINDR             (GPIO_BASE+0x80)
-+#define GPIO_PHPINDR             (GPIO_BASE+0x84)
-+#define GPIO_AINTTYPE1           (GPIO_BASE+0x90)
-+#define GPIO_AINTTYPE2           (GPIO_BASE+0x94)
-+#define GPIO_AEOI                (GPIO_BASE+0x98) /* WRITE ONLY - READ UNDEFINED */
-+#define GPIO_AINTEN              (GPIO_BASE+0x9C)
-+#define GPIO_INTSTATUSA          (GPIO_BASE+0xA0)
-+#define GPIO_RAWINTSTSTISA       (GPIO_BASE+0xA4)
-+#define GPIO_ADB                 (GPIO_BASE+0xA8)
-+#define GPIO_BINTTYPE1           (GPIO_BASE+0xAC)
-+#define GPIO_BINTTYPE2           (GPIO_BASE+0xB0)
-+#define GPIO_BEOI                (GPIO_BASE+0xB4) /* WRITE ONLY - READ UNDEFINED */
-+#define GPIO_BINTEN              (GPIO_BASE+0xB8)
-+#define GPIO_INTSTATUSB          (GPIO_BASE+0xBC)
-+#define GPIO_RAWINTSTSTISB       (GPIO_BASE+0xC0)
-+#define GPIO_BDB                 (GPIO_BASE+0xC4)
-+#define GPIO_EEDRIVE             (GPIO_BASE+0xC8)
-+//#define Reserved               (GPIO_BASE+0xCC)
-+#define GPIO_TCR                 (GPIO_BASE+0xD0) /* Test Registers */
-+#define GPIO_TISRA               (GPIO_BASE+0xD4) /* Test Registers */
-+#define GPIO_TISRB               (GPIO_BASE+0xD8) /* Test Registers */
-+#define GPIO_TISRC               (GPIO_BASE+0xDC) /* Test Registers */
-+#define GPIO_TISRD               (GPIO_BASE+0xE0) /* Test Registers */
-+#define GPIO_TISRE               (GPIO_BASE+0xE4) /* Test Registers */
-+#define GPIO_TISRF               (GPIO_BASE+0xE8) /* Test Registers */
-+#define GPIO_TISRG               (GPIO_BASE+0xEC) /* Test Registers */
-+#define GPIO_TISRH               (GPIO_BASE+0xF0) /* Test Registers */
-+#define GPIO_TCER                (GPIO_BASE+0xF4) /* Test Registers */
-+
-+
-+/* 8088_0000 - 8088_ffff: Ac97 Controller (AAC) */
-+#define AC97_OFFSET             0x080000
-+#define AC97_BASE               (EP93XX_APB_VIRT_BASE|AC97_OFFSET)
-+#define EP93XX_AC97_PHY_BASE    (EP93XX_APB_PHYS_BASE|AC97_OFFSET)
-+#define AC97DR1                 (AC97_BASE+0x00) /* 8088.0000 R/W Data read or written from/to FIFO1  */
-+#define AC97RXCR1               (AC97_BASE+0x04) /* 8088.0004 R/W Control register for receive        */
-+#define AC97TXCR1               (AC97_BASE+0x08) /* 8088.0008 R/W Control register for transmit       */
-+#define AC97SR1                 (AC97_BASE+0x0C) /* 8088.000C R   Status register                     */
-+#define AC97RISR1               (AC97_BASE+0x10) /* 8088.0010 R   Raw interrupt status register       */
-+#define AC97ISR1                (AC97_BASE+0x14) /* 8088.0014 R   Interrupt Status                    */
-+#define AC97IE1                 (AC97_BASE+0x18) /* 8088.0018 R/W Interrupt Enable                    */
-+                                                               /* 8088.001C Reserved - RAZ                          */
-+#define AC97DR2                 (AC97_BASE+0x20) /* 8088.0020 R/W Data read or written from/to FIFO2  */
-+#define AC97RXCR2               (AC97_BASE+0x24) /* 8088.0024 R/W Control register for receive        */
-+#define AC97TXCR2               (AC97_BASE+0x28) /* 8088.0028 R/W Control register for transmit       */
-+#define AC97SR2                 (AC97_BASE+0x2C) /* 8088.002C R   Status register                     */
-+#define AC97RISR2               (AC97_BASE+0x30) /* 8088.0030 R   Raw interrupt status register       */
-+#define AC97ISR2                (AC97_BASE+0x34) /* 8088.0034 R   Interrupt Status                    */
-+#define AC97IE2                 (AC97_BASE+0x38) /* 8088.0038 R/W Interrupt Enable                    */
-+                                                               /* 8088.003C Reserved - RAZ                          */
-+#define AC97DR3                 (AC97_BASE+0x40) /* 8088.0040 R/W Data read or written from/to FIFO3. */
-+#define AC97RXCR3               (AC97_BASE+0x44) /* 8088.0044 R/W Control register for receive        */
-+#define AC97TXCR3               (AC97_BASE+0x48) /* 8088.0048 R/W Control register for transmit       */
-+#define AC97SR3                 (AC97_BASE+0x4C) /* 8088.004C R   Status register                     */
-+#define AC97RISR3               (AC97_BASE+0x50) /* 8088.0050 R   Raw interrupt status register       */
-+#define AC97ISR3                (AC97_BASE+0x54) /* 8088.0054 R   Interrupt Status                    */
-+#define AC97IE3                 (AC97_BASE+0x58) /* 8088.0058 R/W Interrupt Enable                    */
-+                                                               /* 8088.005C Reserved - RAZ                          */
-+#define AC97DR2                 (AC97_BASE+0x20) /* 8088.0020 R/W Data read or written from/to FIFO2  */
-+#define AC97RXCR2               (AC97_BASE+0x24) /* 8088.0024 R/W Control register for receive        */
-+#define AC97TXCR2               (AC97_BASE+0x28) /* 8088.0028 R/W Control register for transmit       */
-+#define AC97SR2                 (AC97_BASE+0x2C) /* 8088.002C R   Status register                     */
-+#define AC97RISR2               (AC97_BASE+0x30) /* 8088.0030 R   Raw interrupt status register       */
-+#define AC97ISR2                (AC97_BASE+0x34) /* 8088.0034 R   Interrupt Status                    */
-+#define AC97IE2                 (AC97_BASE+0x38) /* 8088.0038 R/W Interrupt Enable                    */
-+                                                               /* 8088.003C Reserved - RAZ                          */
-+#define AC97DR3                 (AC97_BASE+0x40) /* 8088.0040 R/W Data read or written from/to FIFO3. */
-+#define AC97RXCR3               (AC97_BASE+0x44) /* 8088.0044 R/W Control register for receive        */
-+#define AC97TXCR3               (AC97_BASE+0x48) /* 8088.0048 R/W Control register for transmit       */
-+#define AC97SR3                 (AC97_BASE+0x4C) /* 8088.004C R   Status register                     */
-+#define AC97RISR3               (AC97_BASE+0x50) /* 8088.0050 R   Raw interrupt status register       */
-+#define AC97ISR3                (AC97_BASE+0x54) /* 8088.0054 R   Interrupt Status                    */
-+#define AC97IE3                 (AC97_BASE+0x58) /* 8088.0058 R/W Interrupt Enable                    */
-+                                                               /* 8088.005C Reserved - RAZ                          */
-+#define AC97DR4                 (AC97_BASE+0x60) /* 8088.0060 R/W Data read or written from/to FIFO4. */
-+#define AC97RXCR4               (AC97_BASE+0x64) /* 8088.0064 R/W Control register for receive        */
-+#define AC97TXCR4               (AC97_BASE+0x68) /* 8088.0068 R/W Control register for transmit       */
-+#define AC97SR4                 (AC97_BASE+0x6C) /* 8088.006C R   Status register                     */
-+#define AC97RISR4               (AC97_BASE+0x70) /* 8088.0070 R   Raw interrupt status register       */
-+#define AC97ISR4                (AC97_BASE+0x74) /* 8088.0074 R   Interrupt Status                    */
-+#define AC97IE4                 (AC97_BASE+0x78) /* 8088.0078 R/W Interrupt Enable                    */
-+                                                               /* 8088.007C Reserved - RAZ                          */
-+#define AC97S1DATA              (AC97_BASE+0x80) /* 8088.0080 R/W Data received/transmitted on SLOT1  */
-+#define AC97S2DATA              (AC97_BASE+0x84) /* 8088.0084 R/W Data received/transmitted on SLOT2  */
-+#define AC97S12DATA             (AC97_BASE+0x88) /* 8088.0088 R/W Data received/transmitted on SLOT12 */
-+#define AC97RGIS                (AC97_BASE+0x8C) /* 8088.008C R/W Raw Global interrupt status register*/
-+#define AC97GIS                 (AC97_BASE+0x90) /* 8088.0090 R   Global interrupt status register    */
-+#define AC97IM                  (AC97_BASE+0x94) /* 8088.0094 R/W Interrupt mask register             */
-+#define AC97EOI                 (AC97_BASE+0x98) /* 8088.0098 W   Interrupt clear register            */
-+#define AC97GCR                 (AC97_BASE+0x9C) /* 8088.009C R/W Main Control register               */
-+#define AC97RESET               (AC97_BASE+0xA0) /* 8088.00A0 R/W RESET control register.             */
-+#define AC97SYNC                (AC97_BASE+0xA4) /* 8088.00A4 R/W SYNC control register.              */
-+#define AC97GCIS                (AC97_BASE+0xA8) /* 8088.00A8 R  Global chan FIFO int status register */
-+
-+
-+/* 800B_0000 - 800B_FFFF: VIC 0 */
-+#define VIC0_OFFSET              0x0B0000
-+#define VIC0_BASE                (EP93XX_AHB_VIRT_BASE|VIC0_OFFSET)
-+#define VIC0                     (VIC0_BASE+0x000)
-+#define VIC0IRQSTATUS            (VIC0_BASE+0x000) /* R   IRQ status register               */
-+#define VIC0FIQSTATUS            (VIC0_BASE+0x004) /* R   FIQ status register               */
-+#define VIC0RAWINTR              (VIC0_BASE+0x008) /* R   Raw interrupt status register     */
-+#define VIC0INTSELECT            (VIC0_BASE+0x00C) /* R/W Interrupt select register         */
-+#define VIC0INTENABLE            (VIC0_BASE+0x010) /* R/W Interrupt enable register         */
-+#define VIC0INTENCLEAR           (VIC0_BASE+0x014) /* W   Interrupt enable clear register   */
-+
-+/* 8003_0000 - 8003_ffff: Raster */
-+#define RASTER_OFFSET           0x030000
-+#define RASTER_BASE             (EP93XX_AHB_VIRT_BASE|RASTER_OFFSET)
-+#define VLINESTOTAL             (RASTER_BASE+0x00)
-+#define VSYNCSTRTSTOP           (RASTER_BASE+0x04)
-+#define VACTIVESTRTSTOP         (RASTER_BASE+0x08)
-+#define VCLKSTRTSTOP            (RASTER_BASE+0x0C)
-+#define HCLKSTOTAL              (RASTER_BASE+0x10)
-+#define HSYNCSTRTSTOP           (RASTER_BASE+0x14)
-+#define HACTIVESTRTSTOP         (RASTER_BASE+0x18)
-+#define HCLKSTRTSTOP            (RASTER_BASE+0x1C)
-+#define BRIGHTNESS              (RASTER_BASE+0x20)
-+#define VIDEOATTRIBS            (RASTER_BASE+0x24)
-+#define VIDSCRNPAGE             (RASTER_BASE+0x28)
-+#define VIDSCRNHPG              (RASTER_BASE+0x2C)
-+#define SCRNLINES               (RASTER_BASE+0x30)
-+#define LINELENGTH              (RASTER_BASE+0x34)
-+#define VLINESTEP               (RASTER_BASE+0x38)
-+#define LINECARRY               (RASTER_BASE+0x3C)
-+#define BLINKRATE               (RASTER_BASE+0x40)
-+#define BLINKMASK               (RASTER_BASE+0x44)
-+#define BLINKPATTRN             (RASTER_BASE+0x48)
-+#define PATTRNMASK              (RASTER_BASE+0x4C)
-+#define BG_OFFSET               (RASTER_BASE+0x50)
-+#define PIXELMODE               (RASTER_BASE+0x54)
-+#define PARLLIFOUT              (RASTER_BASE+0x58)
-+#define PARLLIFIN               (RASTER_BASE+0x5C)
-+#define CURSOR_ADR_START        (RASTER_BASE+0x60)
-+#define CURSOR_ADR_RESET        (RASTER_BASE+0x64)
-+#define CURSORSIZE              (RASTER_BASE+0x68)
-+#define CURSORCOLOR1            (RASTER_BASE+0x6C)
-+#define CURSORCOLOR2            (RASTER_BASE+0x70)
-+#define CURSORXYLOC             (RASTER_BASE+0x74)
-+#define CURSOR_DHSCAN_LH_YLOC   (RASTER_BASE+0x78)
-+#define RASTER_SWLOCK           (RASTER_BASE+0x7C)
-+#define GS_LUT                  (RASTER_BASE+0x80)
-+#define RASTER_TCR              (RASTER_BASE+0x100)
-+#define RASTER_TISRA            (RASTER_BASE+0x104)
-+#define RASTER_TISRB            (RASTER_BASE+0x108)
-+#define CURSOR_TISR             (RASTER_BASE+0x10C)
-+#define RASTER_TOCRA            (RASTER_BASE+0x110)
-+#define RASTER_TOCRB            (RASTER_BASE+0x114)
-+#define FIFO_TOCRA              (RASTER_BASE+0x118)
-+#define FIFO_TOCRB              (RASTER_BASE+0x11C)
-+#define BLINK_TISR              (RASTER_BASE+0x120)
-+#define DAC_TISRA               (RASTER_BASE+0x124)
-+#define DAC_TISRB               (RASTER_BASE+0x128)
-+#define SHIFT_TISR              (RASTER_BASE+0x12C)
-+#define DACMUX_TOCRA            (RASTER_BASE+0x130)
-+#define DACMUX_TOCRB            (RASTER_BASE+0x134)
-+#define PELMUX_TOCR             (RASTER_BASE+0x138)
-+#define VIDEO_TOCRA             (RASTER_BASE+0x13C)
-+#define VIDEO_TOCRB             (RASTER_BASE+0x140)
-+#define YCRCB_TOCR              (RASTER_BASE+0x144)
-+#define CURSOR_TOCR             (RASTER_BASE+0x148)
-+#define VIDEO_TOCRC             (RASTER_BASE+0x14C)
-+#define SHIFT_TOCR              (RASTER_BASE+0x150)
-+#define BLINK_TOCR              (RASTER_BASE+0x154)
-+#define RASTER_TCER             (RASTER_BASE+0x180)
-+#define SIGVAL                  (RASTER_BASE+0x200)
-+#define SIGCTL                  (RASTER_BASE+0x204)
-+#define VSIGSTRTSTOP            (RASTER_BASE+0x208)
-+#define HSIGSTRTSTOP            (RASTER_BASE+0x20C)
-+#define SIGCLR                  (RASTER_BASE+0x210)
-+#define ACRATE                  (RASTER_BASE+0x214)
-+#define LUTCONT                 (RASTER_BASE+0x218)
-+#define VBLANKSTRTSTOP          (RASTER_BASE+0x228)
-+#define HBLANKSTRTSTOP          (RASTER_BASE+0x22C)
-+#define LUT                     (RASTER_BASE+0x400)
-+#define CURSORBLINK1            (RASTER_BASE+0x21C)
-+#define CURSORBLINK2            (RASTER_BASE+0x220)
-+#define CURSORBLINK             (RASTER_BASE+0x224)
-+#define EOLOFFSET               (RASTER_BASE+0x230)
-+#define FIFOLEVEL               (RASTER_BASE+0x234)
-+#define GS_LUT2                 (RASTER_BASE+0x280)
-+#define GS_LUT3                 (RASTER_BASE+0x300)
-+#define COLOR_LUT               (RASTER_BASE+0x400)
-+
-+/* 8004_0000 - 8004_ffff: Graphics */
-+#define GRAPHICS_OFFSET         0x040000
-+#define GRAPHICS_BASE           (EP93XX_AHB_VIRT_BASE|GRAPHICS_OFFSET)
-+#define SRCPIXELSTRT            (GRAPHICS_BASE+0x00)
-+#define DESTPIXELSTRT           (GRAPHICS_BASE+0x04)
-+#define BLKSRCSTRT              (GRAPHICS_BASE+0x08)
-+#define BLKDSTSTRT              (GRAPHICS_BASE+0x0C)
-+#define BLKSRCWIDTH             (GRAPHICS_BASE+0x10)
-+#define SRCLINELENGTH           (GRAPHICS_BASE+0x14)
-+#define BLKDESTWIDTH            (GRAPHICS_BASE+0x18)
-+#define BLKDESTHEIGHT           (GRAPHICS_BASE+0x1C)
-+#define DESTLINELENGTH          (GRAPHICS_BASE+0x20)
-+#define BLOCKCTRL               (GRAPHICS_BASE+0x24)
-+#define TRANSPATTRN             (GRAPHICS_BASE+0x28)
-+#define BLOCKMASK               (GRAPHICS_BASE+0x2C)
-+#define BACKGROUND              (GRAPHICS_BASE+0x30)
-+#define LINEINC                 (GRAPHICS_BASE+0x34)
-+#define LINEINIT                (GRAPHICS_BASE+0x38)
-+#define LINEPATTRN              (GRAPHICS_BASE+0x3C)
-+
-+#define EP93XX_RASTER_BASE		(EP93XX_AHB_VIRT_BASE + 0x00030000)
-+#define EP93XX_RASTER_PHYS_BASE         (EP93XX_AHB_PHYS_BASE + 0x00030000)
-+
-+#define EP93XX_GRAPHICS_ACCEL_BASE	(EP93XX_AHB_VIRT_BASE + 0x00040000)
-+#define EP93XX_GRAPHICS_ACCEL_PHYS_BASE (EP93XX_AHB_PHYS_BASE + 0x00040000)
-+
-+#ifndef __ASSEMBLY__
-+
-+#define SysconSetLocked(registername,value)     \
-+    {                                           \
-+        local_irq_disable();			\
-+	outl( 0xAA, EP93XX_SYSCON_SWLOCK);             \
-+        outl( value, registername);             \
-+	local_irq_enable();                    \
-+    }
-+
-+#endif /* Not __ASSEMBLY__ */
-+
- #endif
diff --git a/target/linux/ep93xx/patches-2.6.30/002-lcd-linux-hd44780.patch b/target/linux/ep93xx/patches-2.6.30/002-lcd-linux-hd44780.patch
deleted file mode 100644
index 7480b2811..000000000
--- a/target/linux/ep93xx/patches-2.6.30/002-lcd-linux-hd44780.patch
+++ /dev/null
@@ -1,4342 +0,0 @@
-Index: linux-2.6.30.9/arch/arm/Kconfig
-===================================================================
---- linux-2.6.30.9.orig/arch/arm/Kconfig	2009-10-05 17:38:08.000000000 +0200
-+++ linux-2.6.30.9/arch/arm/Kconfig	2009-11-24 02:01:42.000000000 +0100
-@@ -1407,6 +1407,8 @@
- 
- source "drivers/accessibility/Kconfig"
- 
-+source "drivers/lcd-linux/Kconfig"
-+
- source "drivers/leds/Kconfig"
- 
- source "drivers/rtc/Kconfig"
-Index: linux-2.6.30.9/drivers/Makefile
-===================================================================
---- linux-2.6.30.9.orig/drivers/Makefile	2009-10-05 17:38:08.000000000 +0200
-+++ linux-2.6.30.9/drivers/Makefile	2009-11-24 02:01:42.000000000 +0100
-@@ -106,4 +106,5 @@
- obj-$(CONFIG_SSB)		+= ssb/
- obj-$(CONFIG_VIRTIO)		+= virtio/
- obj-$(CONFIG_STAGING)		+= staging/
-+obj-$(CONFIG_LCD_LINUX)		+= lcd-linux/
- obj-y				+= platform/
-Index: linux-2.6.30.9/drivers/lcd-linux/Config.in
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.30.9/drivers/lcd-linux/Config.in	2009-11-24 02:01:42.000000000 +0100
-@@ -0,0 +1,8 @@
-+if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-+   mainmenu_option next_comment
-+   comment 'LCD support'
-+
-+   tristate 'LCD-Linux layer' CONFIG_LCD_LINUX
-+   dep_tristate '  HD44780 controller' CONFIG_LCD_HD44780 $CONFIG_LCD_LINUX
-+   endmenu
-+fi
-Index: linux-2.6.30.9/drivers/lcd-linux/Kconfig
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.30.9/drivers/lcd-linux/Kconfig	2009-11-24 02:01:42.000000000 +0100
-@@ -0,0 +1,33 @@
-+menu "LCD-Linux support"
-+	depends on EXPERIMENTAL
-+
-+config LCD_LINUX
-+	tristate "LCD-Linux layer"
-+	default m
-+	help
-+	  LCD-Linux provides an easy way to drive LCD displays under
-+	  Linux by creating a character which can be read or written.
-+	  It features complete VT102 emulation and recognizes
-+	  many escape sequences. If you want to use it you must also
-+	  choose an appropriate driver, otherwise it will not be
-+	  very useful. For more information see
-+	  http://lcd-linux.sourceforge.net/
-+
-+	  To compile LCD-Linux as a module, choose M here:
-+	  the module will be called lcd-linux.
-+
-+config LCD_HD44780
-+	tristate "HD44780 controller"
-+	depends on LCD_LINUX && MACH_SIM_ONE
-+	default m
-+	help
-+	  This is a LCD-Linux driver for LCD displays based on the
-+	  Hitachi HD44780 (and compatible) controllers connected
-+	  to the SimOne LCD port.
-+
-+	  To compile this driver as a module, choose M here:
-+	  the module will be called hd44780.
-+
-+	  If unsure, say N.
-+
-+endmenu
-Index: linux-2.6.30.9/drivers/lcd-linux/Makefile
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.30.9/drivers/lcd-linux/Makefile	2009-11-24 02:01:42.000000000 +0100
-@@ -0,0 +1,8 @@
-+#
-+#
-+# Standard Makefile to statically compile LCD-Linux into the kernel
-+# Linux 2.6
-+
-+obj-$(CONFIG_LCD_LINUX)		+= lcd-linux.o
-+obj-$(CONFIG_LCD_HD44780)	+= hd44780.o
-+
-Index: linux-2.6.30.9/drivers/lcd-linux/cgram/default.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.30.9/drivers/lcd-linux/cgram/default.h	2009-11-24 02:01:42.000000000 +0100
-@@ -0,0 +1,37 @@
-+/* default.h
-+ *
-+ *
-+ *
-+ * Default user defined characters for lcdmod.
-+ *
-+ * Copyright (C) by Michael McLellan (mikey@cs.auckland.ac.nz)
-+ *
-+ *  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.
-+ *
-+ *  This program is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with this program; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ *
-+ */
-+
-+static void init_charmap(void)
-+{
-+}
-+
-+static unsigned char cg0[] = { 0x1f, 0x1f, 0x11, 0x0f, 0x11, 0x1e, 0x01, 0x1f };
-+static unsigned char cg1[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f };
-+static unsigned char cg2[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x1f };
-+static unsigned char cg3[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x1f };
-+static unsigned char cg4[] = { 0x00, 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x1f, 0x1f };
-+static unsigned char cg5[] = { 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f };
-+static unsigned char cg6[] = { 0x00, 0x00, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f };
-+static unsigned char cg7[] = { 0x00, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f };
-Index: linux-2.6.30.9/drivers/lcd-linux/charmap.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.30.9/drivers/lcd-linux/charmap.h	2009-11-24 02:01:42.000000000 +0100
-@@ -0,0 +1,79 @@
-+/* charmap.h
-+ *
-+ *
-+ *
-+ * Character mapping for HD44780 devices by Mark Haemmerling <mail@markh.de>.
-+ *
-+ * Translates ISO 8859-1 to HD44780 charset.
-+ * HD44780 charset reference: http://markh.de/hd44780-charset.png
-+ *
-+ * Initial table taken from lcd.o Linux kernel driver by
-+ * Nils Faerber <nilsf@users.sourceforge.net>. Thanks!
-+ *
-+ * This file is released under the GNU General Public License. Refer to the
-+ * COPYING file distributed with this package.
-+ *
-+ * Following translations are being performed:
-+ * - maps umlaut accent characters to the corresponding umlaut characters
-+ * - maps other accent characters to the characters without accents
-+ * - maps beta (=ringel-S), micro and Yen
-+ *
-+ * Alternative mappings:
-+ * - #112 ("p") -> #240 (large "p"), orig. mapped -> #112
-+ * - #113 ("q") -> #241 (large "q"), orig. mapped -> #113
-+ *
-+ * HD44780 misses backslash
-+ *
-+ */
-+
-+static unsigned char charmap[] = {
-+
-+/* 0 - 31 */
-+  0,   1,   2,   3,   4,   5,   6,   7,
-+  8,   9,  10,  11,  12,  13,  14,  15,
-+ 16,  17,  18,  19,  20,  21,  22,  23,
-+ 24,  25,  26,  27,  28,  29,  30,  31,
-+
-+/* 32 - 63 */
-+ 32,  33,  34,  35,  36,  37,  38,  39,
-+ 40,  41,  42,  43,  44,  45,  46,  47,
-+ 48,  49,  50,  51,  52,  53,  54,  55,
-+ 56,  57,  58,  59,  60,  61,  62,  63,
-+
-+/* 64 - 95 */
-+ 64,  65,  66,  67,  68,  69,  70,  71,
-+ 72,  73,  74,  75,  76,  77,  78,  79,
-+ 80,  81,  82,  83,  84,  85,  86,  87,
-+ 88,  89,  90,  91,  47,  93,  94,  95,
-+
-+/* 96 - 127 */
-+ 96,  97,  98,  99, 100, 101, 102, 103,
-+104, 105, 106, 107, 108, 109, 110, 111,
-+112, 113, 114, 115, 116, 117, 118, 119,
-+120, 121, 122, 123, 124, 125, 126, 127,
-+
-+/* 128 - 159 */
-+128, 129, 130, 131, 132, 133, 134, 135,
-+136, 137, 138, 139, 140, 141, 142, 143,
-+144, 145, 146, 147, 148, 149, 150, 151,
-+152, 153, 154, 155, 156, 157, 158, 159,
-+
-+/* 160 - 191 */
-+160,  33, 236, 237, 164,  92, 124, 167,
-+ 34, 169, 170, 171, 172, 173, 174, 175,
-+223, 177, 178, 179,  39, 249, 247, 165,
-+ 44, 185, 186, 187, 188, 189, 190,  63,
-+
-+/* 192 - 223 */
-+ 65,  65,  65,  65, 225,  65,  65,  67,
-+ 69,  69,  69,  69,  73,  73,  73,  73,
-+ 68,  78,  79,  79,  79,  79, 239, 120,
-+ 48,  85,  85,  85, 245,  89, 240, 226,
-+
-+/* 224 - 255 */
-+ 97,  97,  97,  97, 225,  97,  97,  99,
-+101, 101, 101, 101, 105, 105, 105, 105,
-+111, 110, 111, 111, 111, 111, 239, 253,
-+ 48, 117, 117, 117, 245, 121, 240, 255
-+
-+};
-Index: linux-2.6.30.9/drivers/lcd-linux/commands.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.30.9/drivers/lcd-linux/commands.h	2009-11-24 02:01:42.000000000 +0100
-@@ -0,0 +1,77 @@
-+/* commands.h
-+ *
-+ *
-+ *
-+ * LCD-Linux:
-+ * Driver for HD44780 compatible displays connected to the parallel port.
-+ *
-+ * HD44780 commands.
-+ *
-+ * Copyright (C) 2004 - 2007  Mattia Jona-Lasinio (mjona@users.sourceforge.net)
-+ *
-+ *  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.
-+ *
-+ *  This program is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with this program; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#ifndef HD44780_COMMANDS_H
-+#define HD44780_COMMANDS_H
-+
-+/*** HD44780 Command Set ***/
-+
-+/* Clear Display*/
-+#define CLR_DISP	0x01	/* Clear entire display; cursor at row 0, column 0 */
-+
-+/* Return Home */
-+#define	RET_HOME	0x02	/* Cursor at row 0, column 0; display content doesn't change */
-+
-+/* Entry Mode Set */
-+#define ENTRY_MODE_SET	0x04
-+#define DISP_SHIFT_ON	(ENTRY_MODE_SET | 0x01)		/* Shift display, not cursor after data write */
-+#define DISP_SHIFT_OFF	(ENTRY_MODE_SET | 0x00)		/* Shift cursor, not display after data write */
-+#define CURS_INC	(ENTRY_MODE_SET | 0x02)		/* Shift on the right after data read/write */
-+#define CURS_DEC	(ENTRY_MODE_SET | 0x00)		/* Shift on the left after data read/write */
-+
-+/* Display on/off Control */
-+#define DISP_ONOFF_CNTR	0x08
-+#define BLINK_ON	(DISP_ONOFF_CNTR | 0x01)	/* Cursor blinking on */
-+#define BLINK_OFF	(DISP_ONOFF_CNTR | 0x00)	/* Cursor blinking off */
-+#define CURS_ON		(DISP_ONOFF_CNTR | 0x02)	/* Display Cursor */
-+#define CURS_OFF	(DISP_ONOFF_CNTR | 0x00)	/* Hide Cursor */
-+#define DISP_ON		(DISP_ONOFF_CNTR | 0x04)	/* Turn on display updating */
-+#define DISP_OFF	(DISP_ONOFF_CNTR | 0x00)	/* Freeze display content */
-+
-+/* Cursor or Display Shift */
-+#define CURS_DISP_SHIFT	0x10
-+#define SHIFT_RIGHT	(CURS_DISP_SHIFT | 0x04)	/* Shift on the right */
-+#define SHIFT_LEFT	(CURS_DISP_SHIFT | 0x00)	/* Shift on the left */
-+#define SHIFT_DISP	(CURS_DISP_SHIFT | 0x08)	/* Shift display */
-+#define SHIFT_CURS	(CURS_DISP_SHIFT | 0x00)	/* Shift cursor */
-+
-+/* Function Set */
-+#define FUNC_SET	0x20
-+#define FONT_5X10	(FUNC_SET | 0x04)	/* Select 5x10 dots font */
-+#define FONT_5X8	(FUNC_SET | 0x00)	/* Select 5x8 dots font */
-+#define DISP_2_LINES	(FUNC_SET | 0x08)	/* Select 2 lines display (only 5x8 font allowed) */
-+#define DISP_1_LINE	(FUNC_SET | 0x00)	/* Select 1 line display */
-+#define BUS_8_BITS	(FUNC_SET | 0x10)	/* Set 8 data bits */
-+#define BUS_4_BITS	(FUNC_SET | 0x00)	/* Set 4 data bits */
-+
-+/* Set CGRAM Address */
-+#define CGRAM_IO	0x40	/* Base CGRAM address */
-+
-+/* Set DDRAM Address */
-+#define DDRAM_IO	0x80	/* Base DDRAM address */
-+
-+#endif /* commands included */
-Index: linux-2.6.30.9/drivers/lcd-linux/config.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.30.9/drivers/lcd-linux/config.h	2009-11-24 02:01:42.000000000 +0100
-@@ -0,0 +1,73 @@
-+/* config.h
-+ *
-+ *
-+ *
-+ * Configure file for LCD-Linux. Here you must specify your hardware setup and
-+ * timings constants. The default values will probably be right for you.
-+ *
-+ * Copyright (C) 2005 - 2007  Mattia Jona-Lasinio (mjona@users.sourceforge.net)
-+ *
-+ *  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.
-+ *
-+ *  This program is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with this program; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ *
-+ */
-+
-+/* Setup the default user defined characters in CGRAM */
-+#include "cgram/default.h"
-+
-+/* Don't modify the default timing constants
-+ * unless you know what you are doing.
-+ */
-+
-+/* Execution times (in microseconds) */
-+#define T_READ			60	/* Read execution time (min 43 us) */
-+#define T_WRITE			60	/* Write execution time (min 43 us) */
-+#define T_BF			2	/* Busy flag polling time (min 1 us) */
-+
-+/* Timings in nanoseconds */
-+#define T_AS			200	/* Address set-up time (min 140 ns) */
-+#define T_EH			500	/* Enable high time (min 450 ns) */
-+#define T_EL			600	/* Enable low time (min 500 ns) */
-+
-+/* Various constants */
-+#define DFLT_NUM_CNTR		1	/* Default number of controllers the display has */
-+#define DFLT_CNTR_ROWS		2	/* Default number of rows per controller */
-+#define DFLT_CNTR_COLS		16	/* Default number of columns the display has */
-+#define DFLT_VS_ROWS		25	/* Default number of rows for the virtual screen */
-+#define DFLT_VS_COLS		80	/* Default number of columns for the virtual screen */
-+#define DFLT_TABSTOP		3	/* Default length of tabs */
-+#define DFLT_FLAGS		(HD44780_CHECK_BF | HD44780_4BITS_BUS ) /* Default flags */
-+
-+#define MAX_CNTR_ROWS		4	/* The HD44780 supports up to 4 lines as a fake 2 lines mode */
-+#define MAX_CNTR_COLS		80	/* The HD44780 supports up to 80 characters (1*80; 2*40; etc) */
-+
-+#define SETUP			4
-+#define HIGH_NIBBLE_WRITE(x)	(((x) >> (4-SETUP)) & (0x0f << SETUP))
-+#define LOW_NIBBLE_WRITE(x)	(((x) << SETUP) & (0x0f << SETUP))
-+#define HIGH_NIBBLE_READ(x)	(((x) & (0x0f << SETUP)) << (4-SETUP))
-+#define LOW_NIBBLE_READ(x)	(((x) & (0x0f << SETUP)) >> SETUP)
-+
-+
-+#define SIMONE_LCD_RS           EP93XX_GPIO_LINE_A(2) /* OUT */
-+#define SIMONE_LCD_RD           EP93XX_GPIO_LINE_A(3) /* OUT */
-+#define SIMONE_LCD_EN           EP93XX_GPIO_LINE_B(4) /* EGPIO12 OUT */
-+#define SIMONE_LCD_BCKLIGHT     EP93XX_GPIO_LINE_B(5) /* EGPIO13 OUT */
-+
-+#define SIMONE_LCD_DATA0        EP93XX_GPIO_LINE_A(4)
-+#define SIMONE_LCD_DATA1        EP93XX_GPIO_LINE_A(5)
-+#define SIMONE_LCD_DATA2        EP93XX_GPIO_LINE_A(6)
-+#define SIMONE_LCD_DATA3        EP93XX_GPIO_LINE_A(7)
-+
-+
-Index: linux-2.6.30.9/drivers/lcd-linux/hd44780.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.30.9/drivers/lcd-linux/hd44780.c	2009-11-24 02:05:29.000000000 +0100
-@@ -0,0 +1,860 @@
-+/* hd44780.c
-+ *
-+ *
-+ *
-+ * LCD-Linux:
-+ * Driver for HD44780 compatible displays connected to the parallel port.
-+ *
-+ * Copyright (C) 2005 - 2007  Mattia Jona-Lasinio (mjona@users.sourceforge.net)
-+ * Adapted to Sim.One Hardware by Nuccio Raciti (raciti.nuccio@gmail.com)
-+ *
-+ *  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.
-+ *
-+ *  This program is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with this program; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+
-+#include <linux/autoconf.h>
-+
-+
-+#ifdef CONFIG_PROC_FS
-+#define USE_PROC
-+#else
-+#undef USE_PROC
-+#endif
-+
-+#include <linux/bitops.h>
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+
-+#include <linux/delay.h>
-+#include <linux/fs.h>
-+
-+#include <asm/uaccess.h>
-+#include <linux/init.h>
-+
-+#include <asm/io.h>
-+#include <linux/ioport.h>
-+#include <asm/gpio.h>
-+
-+#ifdef USE_PROC
-+#include <linux/proc_fs.h>
-+#endif
-+
-+#define LCD_LINUX_MAIN
-+#include <linux/hd44780.h>
-+
-+#include "charmap.h"
-+#include "commands.h"
-+#include "config.h"
-+
-+/** Function prototypes **/
-+static void read_display(unsigned char *byte, unsigned char bitmask);
-+static void write_display(unsigned char byte, unsigned char bitmask);
-+
-+/* Initialization */
-+static int hd44780_validate_driver(void);
-+static int hd44780_init_port(void);
-+static int hd44780_cleanup_port(void);
-+static int hd44780_init_display(void);
-+static int hd44780_cleanup_display(void);
-+
-+/* Write */
-+static void hd44780_address_mode(int);
-+static void hd44780_clear_display(void);
-+static void hd44780_write_char(unsigned int, unsigned short);
-+static void hd44780_write_cgram_char(unsigned char, unsigned char *);
-+
-+/* Read */
-+static void check_bf(unsigned char);
-+static void hd44780_read_char(unsigned int, unsigned short *);
-+static void hd44780_read_cgram_char(unsigned char, unsigned char *);
-+
-+/* Input handling */
-+static int hd44780_handle_custom_char(unsigned int);
-+static int hd44780_handle_custom_ioctl(unsigned int,unsigned long , unsigned int);
-+
-+/* Proc operations */
-+#ifdef USE_PROC
-+static void create_proc_entries(void);
-+static void remove_proc_entries(void);
-+#endif
-+
-+/* hd44780 access */
-+#define ACCESS_TO_READ    0
-+#define ACCESS_TO_WRITE   1
-+#define ACCESS_TO_DATA    2
-+
-+/* hd44780_flags */
-+#define _CHECK_BF	0	/* Do busy-flag checking */
-+#define _4BITS_BUS	1	/* The bus is 4 bits long */
-+#define _5X10_FONT	2	/* Use 5x10 font */
-+#define CURSOR_BLINK	3	/* Make the cursor blinking */
-+#define SHOW_CURSOR	4	/* Make the cursor visible */
-+#define DISPLAY_ON	5	/* Display status: on or off */
-+#define INC_ADDR	6	/* Increment address after data read/write */
-+#define BACKLIGHT	7	/* Display backlight: on or off */
-+#define CGRAM_STATE	9	/* Controller status bitmask (bits 9->15): DDRAM or CGRAM access */
-+#define ESC_MASK	0x00ff0000
-+#define PROC_MASK	0x0f000000
-+
-+#define SET_STATE(state, mask)	(hd44780_flags = (hd44780_flags & ~(mask)) | ((state) & (mask)))
-+#define SET_ESC_STATE(state)	SET_STATE((state) << 16, ESC_MASK)
-+#define SET_PROC_LEVEL(level)	SET_STATE((level) << 24, PROC_MASK)
-+#define ESC_STATE		((hd44780_flags & ESC_MASK) >> 16)
-+#define PROC_LEVEL		((hd44780_flags & PROC_MASK) >> 24)
-+
-+/* globals */
-+static unsigned int disp_size;			/* Display size (rows*columns) */
-+static unsigned int disp_offset[1];	/* Physical cursor position on the display */
-+static unsigned long hd44780_flags;		/* Driver flags for internal use only */
-+
-+static struct lcd_parameters par = {
-+	.name		= HD44780_STRING,
-+	.minor		= HD44780_MINOR,
-+	.flags		= DFLT_FLAGS,
-+	.tabstop	= DFLT_TABSTOP,
-+	.num_cntr	= 1,
-+	.cntr_rows	= DFLT_CNTR_ROWS,
-+	.cntr_cols	= DFLT_CNTR_COLS,
-+	.vs_rows	= DFLT_VS_ROWS,
-+	.vs_cols	= DFLT_VS_COLS,
-+	.cgram_chars	= 8,
-+	.cgram_bytes	= 8,
-+	.cgram_char0	= 0,
-+};
-+/* End of globals */
-+
-+#ifdef MODULE
-+#include <linux/device.h>
-+MODULE_ALIAS_CHARDEV(LCD_MAJOR, HD44780_MINOR);
-+#include <linux/kmod.h>
-+
-+static unsigned short flags	= DFLT_FLAGS;
-+static unsigned short tabstop	= DFLT_TABSTOP;
-+static unsigned short cntr_rows	= DFLT_CNTR_ROWS;
-+static unsigned short cntr_cols	= DFLT_CNTR_COLS;
-+static unsigned short vs_rows	= DFLT_VS_ROWS;
-+static unsigned short vs_cols	= DFLT_VS_COLS;
-+static unsigned short minor	= HD44780_MINOR;
-+
-+MODULE_DESCRIPTION("LCD SimOne driver for HD44780 compatible controllers.");
-+MODULE_AUTHOR("Nuccio Raciti (raciti.nuccio@gmail.com)");
-+#ifdef MODULE_LICENSE
-+MODULE_LICENSE("GPL");
-+#endif
-+module_param(flags,	ushort, 0444);
-+module_param(cntr_rows,	ushort, 0444);
-+module_param(cntr_cols,	ushort, 0444);
-+module_param(vs_rows,	ushort, 0444);
-+module_param(vs_cols,	ushort, 0444);
-+module_param(tabstop,	ushort, 0444);
-+module_param(minor,	ushort, 0444);
-+
-+MODULE_PARM_DESC(flags,		"Various flags (see Documentation)");
-+MODULE_PARM_DESC(cntr_rows,	"Number of rows per controller on the LCD: 1, 2, 4 (default: " string(DFLT_CNTR_ROWS) ")");
-+MODULE_PARM_DESC(cntr_cols,	"Number of columns on the LCD (default: " string(DFLT_CNTR_COLS) ", max: " string(MAX_CNTR_COLS) ")");
-+MODULE_PARM_DESC(vs_rows,	"Number of rows of the virtual screen (default: " string(DFLT_VS_ROWS) ")");
-+MODULE_PARM_DESC(vs_cols,	"Number of columns of the virtual screen (default: " string(DFLT_VS_COLS) ")");
-+MODULE_PARM_DESC(tabstop,	"Tab character length (default: " string(DFLT_TABSTOP) ")");
-+MODULE_PARM_DESC(minor,		"Assigned minor number (default: " string(HD44780_MINOR) ")");
-+#else
-+
-+/*
-+ * Parse boot command line
-+ *
-+ * hd44780=cntr_rows,cntr_cols,vs_rows,vs_cols,flags,minor,tabstop
-+ */
-+static int __init hd44780_boot_init(char *cmdline)
-+{
-+	char *str = cmdline;
-+	int idx = 0;
-+	unsigned short *args[] = {
-+		&par.cntr_rows,
-+		&par.cntr_cols,
-+		&par.vs_rows,
-+		&par.vs_cols,
-+		&par.flags,
-+		&par.num_cntr,
-+		&par.minor,
-+		&par.tabstop,
-+	};
-+
-+	while (*cmdline && idx < (sizeof(args)/sizeof(unsigned short *))) {
-+		switch (*str) {
-+		case ',':
-+			*str++ = 0;
-+		case 0:
-+			if (strlen(cmdline))
-+				*args[idx] = simple_strtoul(cmdline, NULL, 0);
-+			++idx;
-+			cmdline = str;
-+			break;
-+		default:
-+			++str;
-+			break;
-+		}
-+	}
-+
-+	return (1);
-+}
-+
-+__setup("hd44780=", hd44780_boot_init);
-+#endif /* MODULE */
-+
-+/* Macros for iterator handling */
-+static inline unsigned int iterator_inc_(unsigned int iterator, const unsigned int module)
-+{
-+    return ((++iterator)%module);
-+}
-+
-+static inline unsigned int iterator_dec_(unsigned int iterator, const unsigned int module)
-+{
-+    return (iterator ? --iterator : module-1);
-+}
-+
-+#define iterator_inc(iterator, module)		(iterator = iterator_inc_(iterator, module))
-+#define iterator_dec(iterator, module)		(iterator = iterator_dec_(iterator, module))
-+
-+static inline void set_lines(unsigned char bitmask)
-+{
-+    gpio_set_value(SIMONE_LCD_EN, 0);  /* Disable */
-+
-+    if(bitmask & ACCESS_TO_WRITE ) {
-+        gpio_direction_output (SIMONE_LCD_DATA0   , 0);
-+        gpio_direction_output (SIMONE_LCD_DATA1   , 0);
-+        gpio_direction_output (SIMONE_LCD_DATA2   , 0);
-+        gpio_direction_output (SIMONE_LCD_DATA3   , 0);
-+        gpio_set_value(SIMONE_LCD_RD, 0);  /* Write */
-+    } else {
-+
-+        gpio_direction_input (SIMONE_LCD_DATA0);
-+        gpio_direction_input (SIMONE_LCD_DATA1);
-+        gpio_direction_input (SIMONE_LCD_DATA2);
-+        gpio_direction_input (SIMONE_LCD_DATA3);
-+        gpio_set_value(SIMONE_LCD_RD, 1);  /* Read */
-+    }
-+
-+    if(bitmask & ACCESS_TO_DATA )
-+        gpio_set_value(SIMONE_LCD_RS, 1);  /* Data */
-+    else
-+        gpio_set_value(SIMONE_LCD_RS, 0);  /* Cmds*/
-+
-+    if(test_bit(BACKLIGHT, &hd44780_flags))
-+        gpio_set_value(SIMONE_LCD_BCKLIGHT, 1);
-+    else
-+        gpio_set_value(SIMONE_LCD_BCKLIGHT, 0);
-+}
-+
-+
-+/* Low level read from the display */
-+static inline unsigned char __read_display(unsigned char bitmask)
-+{
-+    unsigned char byte;
-+
-+    set_lines (bitmask);
-+
-+    ndelay(T_AS); /* Address set-up time */
-+    gpio_set_value(SIMONE_LCD_EN, 1); /* Enable */
-+    ndelay(T_EH);/* Enable high time */
-+
-+    byte  = (gpio_get_value(SIMONE_LCD_DATA0) << 4);
-+    byte |= (gpio_get_value(SIMONE_LCD_DATA1) << 5);
-+    byte |= (gpio_get_value(SIMONE_LCD_DATA2) << 6);
-+    byte |= (gpio_get_value(SIMONE_LCD_DATA3) << 7);
-+
-+    gpio_set_value(SIMONE_LCD_EN, 0); /* Disable */
-+
-+    ndelay(T_EL); /* Enable low time */
-+
-+
-+   return (byte);
-+
-+}
-+
-+/* Low level write to the display */
-+static inline void __write_display(unsigned char data, unsigned char bitmask)
-+{
-+    set_lines(bitmask);
-+
-+    if(data & 0x10)
-+        gpio_set_value(SIMONE_LCD_DATA0, 1);
-+    else
-+        gpio_set_value(SIMONE_LCD_DATA0, 0);
-+
-+    if(data & 0x20)
-+        gpio_set_value(SIMONE_LCD_DATA1, 1);
-+    else
-+        gpio_set_value(SIMONE_LCD_DATA1, 0);
-+
-+    if(data & 0x40)
-+        gpio_set_value(SIMONE_LCD_DATA2, 1);
-+    else
-+        gpio_set_value(SIMONE_LCD_DATA2, 0);
-+
-+    if(data & 0x80)
-+        gpio_set_value(SIMONE_LCD_DATA3, 1);
-+    else
-+        gpio_set_value(SIMONE_LCD_DATA3, 0);
-+
-+    ndelay(T_AS); /* Address set-up time */
-+    gpio_set_value(SIMONE_LCD_EN, 1);
-+    ndelay(T_EH); /* Enable high time */
-+
-+    gpio_set_value(SIMONE_LCD_EN, 0); /* Disable */
-+    ndelay(T_EL);  /* Enable low time */
-+}
-+
-+
-+/* Read data from the display (4 bit bus, check busy flag) */
-+static void read_display (unsigned char *byte,unsigned char bitmask)
-+{
-+    if(bitmask) check_bf(bitmask);
-+    *byte = HIGH_NIBBLE_READ(__read_display(bitmask));
-+    if(bitmask) check_bf(bitmask);
-+    *byte |= LOW_NIBBLE_READ(__read_display(bitmask));
-+}
-+
-+
-+/* Output commands or data to the display (4 bit bus, check busy flag) */
-+static void write_display(unsigned char byte,unsigned char bitmask)
-+{
-+    check_bf(bitmask);
-+    __write_display(HIGH_NIBBLE_WRITE(byte),bitmask);
-+     check_bf(bitmask);
-+    __write_display(LOW_NIBBLE_WRITE(byte),bitmask);
-+}
-+
-+
-+/* Read Address Counter AC from the display */
-+static unsigned char read_ac(unsigned char bitmask)
-+{
-+    unsigned char byte;
-+
-+    read_display(&byte, bitmask);
-+
-+    return (byte);
-+}
-+
-+
-+/* Do busy-flag check */
-+static void  check_bf(unsigned char bitmask)
-+{
-+    unsigned int timeout = 20;
-+    static unsigned char do_check_bf = 5;
-+    gpio_set_value(SIMONE_LCD_EN, 0);  /* Disable */
-+
-+    gpio_direction_input (SIMONE_LCD_DATA0);
-+    gpio_direction_input (SIMONE_LCD_DATA1);
-+    gpio_direction_input (SIMONE_LCD_DATA2);
-+    gpio_direction_input (SIMONE_LCD_DATA3);
-+
-+    gpio_set_value(SIMONE_LCD_RD, 1);  /* Read */
-+    gpio_set_value(SIMONE_LCD_RS, 0);  /* Instru */
-+
-+    ndelay(T_AS); /* Address set-up time */
-+    gpio_set_value(SIMONE_LCD_EN, 1); /* Enable */
-+    ndelay(T_EH);/* Enable high time */
-+
-+    do{
-+       udelay(T_BF);
-+    } while (gpio_get_value(SIMONE_LCD_DATA3) && --timeout);
-+
-+    if (! timeout) {
-+        if (! --do_check_bf) {
-+            printk(KERN_NOTICE "hd44780 error: is the LCD connected?\n");
-+	}
-+    }
-+
-+    gpio_set_value(SIMONE_LCD_EN, 0); /* Disable */
-+
-+    ndelay(T_EL); /* Enable low time */
-+}
-+
-+/* Send commands to the display */
-+static void write_command(unsigned char command)
-+{
-+    write_display(command, ACCESS_TO_WRITE);
-+
-+    if (command <= 0x03)
-+        mdelay(2);
-+}
-+
-+static inline void set_cursor(unsigned int offset)
-+{
-+    unsigned int disp_number = offset/disp_size;
-+    unsigned int local_offset = offset%disp_size;
-+
-+    if (disp_offset[disp_number] != local_offset || test_bit(CGRAM_STATE+disp_number, &hd44780_flags)) {
-+        unsigned int disp_row = local_offset/par.cntr_cols;
-+        unsigned int disp_column = local_offset%par.cntr_cols;
-+
-+        write_command(DDRAM_IO | ((disp_row%2)*0x40) | (((disp_row >= 2)*par.cntr_cols)+disp_column));
-+        clear_bit(CGRAM_STATE+disp_number, &hd44780_flags);
-+		disp_offset[disp_number] = local_offset;
-+	}
-+}
-+
-+/* HD44780 DDRAM addresses are consecutive only when
-+ * the cursor moves on the same row of the display.
-+ * Every time the row of the cursor changes we invalidate
-+ * the cursor position to force hardware cursor repositioning.
-+ */
-+static inline void mov_cursor(unsigned int disp_number)
-+{
-+    if (test_bit(INC_ADDR, &hd44780_flags)) {
-+        iterator_inc(disp_offset[disp_number], disp_size);
-+        if (disp_offset[disp_number]%par.cntr_cols == 0)
-+			disp_offset[disp_number] = disp_size;
-+	} else {
-+		iterator_dec(disp_offset[disp_number], disp_size);
-+		if (disp_offset[disp_number]%par.cntr_cols == par.cntr_cols-1)
-+			disp_offset[disp_number] = disp_size;
-+    }
-+}
-+
-+static struct lcd_driver hd44780 = {
-+	.read_char		= hd44780_read_char,
-+	.read_cgram_char	= hd44780_read_cgram_char,
-+	.write_char		= hd44780_write_char,
-+	.write_cgram_char	= hd44780_write_cgram_char,
-+	.address_mode		= hd44780_address_mode,
-+	.clear_display		= hd44780_clear_display,
-+	.validate_driver	= hd44780_validate_driver,
-+	.init_display		= hd44780_init_display,
-+	.cleanup_display	= hd44780_cleanup_display,
-+	.init_port		= hd44780_init_port,
-+	.cleanup_port		= hd44780_cleanup_port,
-+	.handle_custom_char	= hd44780_handle_custom_char,
-+	.handle_custom_ioctl	= hd44780_handle_custom_ioctl,
-+
-+	.charmap		= charmap,
-+};
-+
-+static void hd44780_read_char(unsigned int offset, unsigned short *data)
-+{
-+    unsigned int disp_number = offset/disp_size;
-+    unsigned char tmp;
-+
-+    set_cursor(offset);
-+    read_display(&tmp, ACCESS_TO_DATA);
-+    *data = tmp;
-+    mov_cursor(disp_number);
-+}
-+
-+static void hd44780_read_cgram_char(unsigned char index, unsigned char *pixels)
-+{
-+    unsigned int i;
-+
-+    write_command(CGRAM_IO | (index << 3));
-+    set_bit(CGRAM_STATE+0, &hd44780_flags);
-+
-+    for (i = 0; i < 8; ++i) {
-+		read_display(pixels+i, ACCESS_TO_DATA );
-+		pixels[i] &= 0x1f;
-+    }
-+}
-+
-+static void hd44780_write_char(unsigned int offset, unsigned short data)
-+{
-+    unsigned int disp_number = offset/disp_size;
-+
-+    set_cursor(offset);
-+    write_display(data & 0xff, ACCESS_TO_WRITE | ACCESS_TO_DATA );
-+    mov_cursor(disp_number);
-+}
-+
-+static void hd44780_write_cgram_char(unsigned char index, unsigned char *pixels)
-+{
-+	unsigned int i;
-+
-+	/* Move address pointer to index in CGRAM */
-+	write_command(CGRAM_IO | (index << 3));
-+
-+	set_bit(CGRAM_STATE+0, &hd44780_flags);
-+
-+	for (i = 0; i < 8; ++i) {
-+		pixels[i] &= 0x1f;
-+		write_display(pixels[i], ACCESS_TO_WRITE | ACCESS_TO_DATA );
-+	}
-+}
-+
-+/* Increment/decrement address mode after a data read/write */
-+static void hd44780_address_mode(int mode)
-+{
-+	if (mode > 0 && ! test_bit(INC_ADDR, &hd44780_flags)) {
-+		write_command(CURS_INC | DISP_SHIFT_OFF);
-+		set_bit(INC_ADDR, &hd44780_flags);
-+	} else if (mode < 0 && test_bit(INC_ADDR, &hd44780_flags)) {
-+		write_command(CURS_DEC | DISP_SHIFT_OFF);
-+		clear_bit(INC_ADDR, &hd44780_flags);
-+	}
-+}
-+
-+static void hd44780_clear_display(void)
-+{
-+	write_command(CLR_DISP);
-+	if (! test_bit(INC_ADDR, &hd44780_flags))
-+		write_command(CURS_DEC | DISP_SHIFT_OFF);
-+	memset(disp_offset, 0, sizeof(disp_offset));
-+}
-+
-+static int hd44780_validate_driver(void)
-+{
-+	if (par.cntr_rows != 1 && par.cntr_rows != 2 && par.cntr_rows != 4)
-+		par.cntr_rows = DFLT_CNTR_ROWS;
-+
-+	if (par.cntr_rows != 1)
-+		par.flags &= ~HD44780_5X10_FONT;
-+
-+
-+	if (! par.cntr_cols || par.cntr_cols > MAX_CNTR_COLS/par.cntr_rows)
-+		par.cntr_cols = MAX_CNTR_COLS/par.cntr_rows;
-+
-+	disp_size = par.cntr_rows*par.cntr_cols;
-+
-+	/* These parameters depend on the hardware and cannot be changed */
-+	par.cgram_chars = 8;
-+	par.cgram_bytes = 8;
-+	par.cgram_char0 = 0;
-+
-+	return (0);
-+}
-+
-+/* Send init commands to the display */
-+static void write_init_command(void)
-+{
-+    unsigned char command = 0x30;
-+
-+    __write_display(HIGH_NIBBLE_WRITE(command), ACCESS_TO_WRITE);
-+    mdelay(20);	/* Wait more than 4.1 ms */
-+    __write_display(HIGH_NIBBLE_WRITE(command), ACCESS_TO_WRITE);
-+    udelay(200);	/* Wait more than 100 us */
-+    __write_display(HIGH_NIBBLE_WRITE(command), ACCESS_TO_WRITE);
-+    udelay(200);	/* Wait more than 100 us */
-+    command = BUS_4_BITS;
-+    command |= ((par.cntr_rows == 1) ? DISP_1_LINE : DISP_2_LINES);
-+    command |= (test_bit(_5X10_FONT, &hd44780_flags) ? FONT_5X10 : FONT_5X8);
-+    write_command(command);
-+    /* set_bit(BACKLIGHT, &hd44780_flags); */
-+}
-+
-+static int hd44780_init_display(void)
-+{
-+	if (par.flags & HD44780_CHECK_BF)
-+		set_bit(_CHECK_BF, &hd44780_flags);
-+	else
-+		clear_bit(_CHECK_BF, &hd44780_flags);
-+
-+	if (par.flags & HD44780_4BITS_BUS)
-+		set_bit(_4BITS_BUS, &hd44780_flags);
-+	else
-+		clear_bit(_4BITS_BUS, &hd44780_flags);
-+
-+	if (par.flags & HD44780_5X10_FONT)
-+		set_bit(_5X10_FONT, &hd44780_flags);
-+	else
-+		clear_bit(_5X10_FONT, &hd44780_flags);
-+
-+	write_init_command();
-+
-+	hd44780_clear_display();
-+	hd44780_address_mode(1);
-+	write_command(DISP_ON | CURS_OFF | BLINK_OFF);
-+	set_bit(DISPLAY_ON, &hd44780_flags);
-+	clear_bit(SHOW_CURSOR, &hd44780_flags);
-+	clear_bit(CURSOR_BLINK, &hd44780_flags);
-+
-+	/* Set the CGRAM to default values */
-+	hd44780_write_cgram_char(0, cg0);
-+	hd44780_write_cgram_char(1, cg1);
-+	hd44780_write_cgram_char(2, cg2);
-+	hd44780_write_cgram_char(3, cg3);
-+	hd44780_write_cgram_char(4, cg4);
-+	hd44780_write_cgram_char(5, cg5);
-+	hd44780_write_cgram_char(6, cg6);
-+	hd44780_write_cgram_char(7, cg7);
-+	init_charmap();
-+
-+	return (0);
-+}
-+
-+static int hd44780_cleanup_display(void)
-+{
-+    hd44780_clear_display();
-+
-+    return (0);
-+}
-+
-+static int hd44780_init_port(void)
-+{
-+    gpio_direction_output (SIMONE_LCD_BCKLIGHT, 0);
-+    gpio_direction_output (SIMONE_LCD_RD      , 0);
-+    gpio_direction_output (SIMONE_LCD_RS      , 0);
-+    gpio_direction_output (SIMONE_LCD_EN      , 0);
-+    gpio_set_value(SIMONE_LCD_EN, 0);           /* Disable */
-+
-+    return (0);
-+}
-+
-+static int hd44780_cleanup_port(void)
-+{
-+
-+    gpio_direction_input (SIMONE_LCD_BCKLIGHT);
-+    gpio_direction_input (SIMONE_LCD_RD);
-+    gpio_direction_input (SIMONE_LCD_RS);
-+    gpio_direction_input (SIMONE_LCD_EN);
-+    gpio_direction_input (SIMONE_LCD_DATA0);
-+    gpio_direction_input (SIMONE_LCD_DATA1);
-+    gpio_direction_input (SIMONE_LCD_DATA2);
-+    gpio_direction_input (SIMONE_LCD_DATA3);
-+    return (0);
-+}
-+
-+static void display_attr(unsigned char input)
-+{
-+	unsigned char command;
-+
-+	switch (ESC_STATE) {
-+	case 'a':	/* Turn on/off the display cursor */
-+		if (input == '1')
-+			set_bit(SHOW_CURSOR, &hd44780_flags);
-+		else if (input == '0')
-+			clear_bit(SHOW_CURSOR, &hd44780_flags);
-+		break;
-+	case 'b':	/* Turn on/off the display cursor blinking */
-+		if (input == '1')
-+			set_bit(CURSOR_BLINK, &hd44780_flags);
-+		else if (input == '0')
-+			clear_bit(CURSOR_BLINK, &hd44780_flags);
-+		break;
-+	case 'h':	/* Turn on/off the display */
-+		if (input == '1')
-+			set_bit(DISPLAY_ON, &hd44780_flags);
-+		else if (input == '0')
-+			clear_bit(DISPLAY_ON, &hd44780_flags);
-+		break;
-+	}
-+
-+        command = (test_bit(DISPLAY_ON, &hd44780_flags) ? DISP_ON : DISP_OFF);
-+        command |= (test_bit(SHOW_CURSOR, &hd44780_flags) ? CURS_ON : CURS_OFF);
-+	command |= (test_bit(CURSOR_BLINK, &hd44780_flags) ? BLINK_ON : BLINK_OFF);
-+
-+	if (ESC_STATE == 'h')
-+		write_command(command);
-+}
-+
-+static int hd44780_handle_custom_char(unsigned int _input)
-+{
-+	unsigned char input = _input & 0xff;
-+
-+	if (_input & (~0xff)) {
-+		switch (ESC_STATE) {
-+		case 'a':	/* Turn on/off the display cursor */
-+		case 'b':	/* Turn on/off the display cursor blinking */
-+		case 'h':	/* Turn on/off the the display */
-+			display_attr(input);
-+			return (0);
-+		case 'l':	/* Turn on/off the backlight */
-+			if (input == '1')
-+				set_bit(BACKLIGHT, &hd44780_flags);
-+			else if (input == '0')
-+				clear_bit(BACKLIGHT, &hd44780_flags);
-+			read_ac(ACCESS_TO_READ);
-+			return (0);
-+		}
-+	}
-+
-+	switch (input) {
-+	case 'a':	/* Turn on/off the display cursor */
-+	case 'b':	/* Turn on/off the display cursor blinking */
-+	case 'h':	/* Turn on/off the display */
-+	case 'l':	/* Turn on/off the backlight */
-+		SET_ESC_STATE(input);
-+		return (1);
-+	case 'd':	/* Shift display cursor Right */
-+		write_command(SHIFT_CURS | SHIFT_RIGHT);
-+		return (0);
-+	case 'e':	/* Shift display cursor Left */
-+		write_command(SHIFT_CURS | SHIFT_LEFT);
-+		return (0);
-+	case 'f':	/* Shift display Right */
-+		write_command(SHIFT_DISP | SHIFT_RIGHT);
-+		return (0);
-+	case 'g':	/* Shift display Left */
-+		write_command(SHIFT_DISP | SHIFT_LEFT);
-+		return (0);
-+	}
-+
-+	return (-1);
-+}
-+
-+static int hd44780_handle_custom_ioctl(unsigned int num, unsigned long arg, unsigned int user_space)
-+{
-+	unsigned char *buffer = (unsigned char *)arg;
-+
-+	if (num != HD44780_READ_AC)
-+		return (-ENOIOCTLCMD);
-+
-+	if (user_space)
-+		put_user(read_ac(ACCESS_TO_READ), buffer);
-+	else
-+		buffer[0] = read_ac(ACCESS_TO_READ);
-+
-+	return (0);
-+}
-+
-+#ifdef USE_PROC
-+static int hd44780_proc_status(char *buffer, char **start, off_t offset, int size, int *eof, void *data)
-+{
-+	char *temp = buffer;
-+
-+	/* Print display configuration */
-+	temp += sprintf(temp,
-+			"Interface:\t%u bits\n"
-+			"Display rows:\t%d\n"
-+			"Display cols:\t%d\n"
-+			"Screen rows:\t%d\n"
-+			"Screen cols:\t%d\n"
-+			"Read:\t\t%sabled\n"
-+			"Busy flag chk:\t%sabled\n"
-+			"Assigned minor:\t%u\n",
-+			(test_bit(_4BITS_BUS, &hd44780_flags) ? 4 : 8),
-+			par.cntr_rows, par.cntr_cols,
-+			par.vs_rows, par.vs_cols,
-+			(hd44780.read_char ? "En" : "Dis"),
-+			(test_bit(_CHECK_BF, &hd44780_flags) ? "En" : "Dis"),
-+			par.minor);
-+
-+	return (temp-buffer);
-+}
-+
-+static int hd44780_proc_cgram(char *buffer, char **start, off_t offset, int size, int *eof, void *data)
-+{
-+	char *temp = buffer;
-+	unsigned int i;
-+
-+	temp += sprintf(temp,	"static void init_charmap(void)\n{\n"
-+				"\t/*\n"
-+				"\t * charmap[char mapped to cg0] = 0;\n"
-+				"\t * charmap[char mapped to cg1] = 1;\n"
-+				"\t * charmap[char mapped to cg2] = 2;\n"
-+				"\t * charmap[char mapped to cg3] = 3;\n"
-+				"\t * charmap[char mapped to cg4] = 4;\n"
-+				"\t * charmap[char mapped to cg5] = 5;\n"
-+				"\t * charmap[char mapped to cg6] = 6;\n"
-+				"\t * charmap[char mapped to cg7] = 7;\n"
-+				"\t */\n"
-+				"}\n\n");
-+
-+	for (i = 0; i < 8; ++i) {
-+		unsigned char cgram_buffer[8];
-+		unsigned int j;
-+
-+		temp += sprintf(temp, "static unsigned char cg%u[] = { ", i);
-+		hd44780_read_cgram_char(i, cgram_buffer);
-+		for (j = 0; j < 8; ++j)
-+			temp += sprintf(temp, "0x%.2x%s", cgram_buffer[j], (j == 7 ? " };\n" : ", "));
-+	}
-+
-+	return (temp-buffer);
-+}
-+
-+static void create_proc_entries(void)
-+{
-+	int count = 0;
-+
-+	SET_PROC_LEVEL(count);
-+	if (create_proc_read_entry("status", 0, hd44780.driver_proc_root, hd44780_proc_status, NULL) == NULL) {
-+		printk(KERN_ERR "hd44780: cannot create /proc/lcd/%s/status\n", par.name);
-+		return;
-+	}
-+	SET_PROC_LEVEL(++count);
-+	if (hd44780.read_cgram_char) {
-+		if (create_proc_read_entry("cgram.h", 0, hd44780.driver_proc_root, hd44780_proc_cgram, NULL) == NULL) {
-+			printk(KERN_ERR "hd44780: cannot create /proc/lcd/%s/cgram.h\n", par.name);
-+			return;
-+		}
-+		SET_PROC_LEVEL(++count);
-+	}
-+}
-+
-+static void remove_proc_entries(void)
-+{
-+	switch (PROC_LEVEL) {
-+	case 2:
-+		remove_proc_entry("cgram.h", hd44780.driver_proc_root);
-+	case 1:
-+		remove_proc_entry("status", hd44780.driver_proc_root);
-+	}
-+	SET_PROC_LEVEL(0);
-+}
-+#endif
-+
-+/* Initialization */
-+static int __init hd44780_init_module(void)
-+{
-+	int ret;
-+
-+#ifdef MODULE
-+#ifdef NOT_DEF
-+	if ((ret = request_module("lcd-linux"))) {
-+		if (ret != -ENOSYS) {
-+			printk(KERN_ERR "hd44780: failure while loading module lcd-linux\n");
-+			return (ret);
-+		}
-+		printk(KERN_ERR "hd44780: your kernel does not have kmod or kerneld support;\n");
-+		printk(KERN_ERR "hd44780: remember to load the lcd-linux module before\n");
-+		printk(KERN_ERR "hd44780: loading the hd44780 module\n");
-+	}
-+#endif
-+	if (flags	!= DFLT_FLAGS)		par.flags	= flags;
-+	if (tabstop	!= DFLT_TABSTOP)	par.tabstop	= tabstop;
-+	if (cntr_rows	!= DFLT_CNTR_ROWS)	par.cntr_rows	= cntr_rows;
-+	if (cntr_cols	!= DFLT_CNTR_COLS)	par.cntr_cols	= cntr_cols;
-+	if (vs_rows	!= DFLT_VS_ROWS)	par.vs_rows	= vs_rows;
-+	if (vs_cols	!= DFLT_VS_COLS)	par.vs_cols	= vs_cols;
-+	if (minor	!= HD44780_MINOR)	par.minor	= minor;
-+#endif
-+
-+	lcd_driver_setup(&hd44780);
-+	if ((ret = lcd_register_driver(&hd44780, &par)))
-+		return (ret);
-+
-+#ifdef USE_PROC
-+	if (hd44780.driver_proc_root)
-+		create_proc_entries();
-+#endif
-+
-+	printk(KERN_INFO "HD44780 driver (LCD-Linux" HD44780_VERSION ")\n");
-+	printk(KERN_INFO "Nuccio Raciti <raciti.nuccio@gmail.com>\n");
-+
-+
-+	return (0);
-+}
-+
-+/* Cleanup */
-+
-+static void __exit hd44780_cleanup_module(void)
-+{
-+#ifdef USE_PROC
-+	if (hd44780.driver_proc_root)
-+		remove_proc_entries();
-+#endif
-+
-+	lcd_unregister_driver(&hd44780, &par);
-+}
-+
-+module_init(hd44780_init_module)
-+module_exit(hd44780_cleanup_module)
-Index: linux-2.6.30.9/drivers/lcd-linux/lcd-linux.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.30.9/drivers/lcd-linux/lcd-linux.c	2009-11-24 02:01:42.000000000 +0100
-@@ -0,0 +1,2892 @@
-+/* lcd-linux.c
-+ *
-+ *
-+ *
-+ * Software layer to drive LCD displays under Linux.
-+ *
-+ * Copyright (C) 2005 - 2007  Mattia Jona-Lasinio (mjona@users.sourceforge.net)
-+ *
-+ *  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.
-+ *
-+ *  This program is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with this program; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#include <linux/version.h>
-+
-+#ifndef KERNEL_VERSION
-+#define KERNEL_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c))
-+#endif
-+
-+#ifndef LINUX_VERSION_CODE
-+#error - LINUX_VERSION_CODE undefined in 'linux/version.h'
-+#endif
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
-+#include <linux/autoconf.h>
-+#else
-+#include <linux/config.h>
-+#endif
-+#ifdef CONFIG_PROC_FS
-+#define USE_PROC
-+#else
-+#undef USE_PROC
-+#endif
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
-+#include <linux/semaphore.h>
-+#else
-+#include <asm/semaphore.h>
-+#endif
-+#include <linux/bitops.h>
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/sched.h>
-+
-+#include <linux/fs.h>
-+
-+#include <asm/uaccess.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
-+#include <linux/device.h>
-+#endif
-+#include <linux/init.h>
-+#include <linux/list.h>
-+#include <linux/slab.h>
-+#include <linux/selection.h>
-+#include <linux/vmalloc.h>
-+
-+#ifdef USE_PROC
-+#include <linux/proc_fs.h>
-+#endif
-+
-+#define LCD_LINUX_MAIN
-+#include <linux/lcd-linux.h>
-+
-+/*** struct_flags ***/
-+#define NEED_WRAP	0		/* Next char will trigger a newline */
-+#define DECIM		1		/* Insert mode */
-+#define DECAWM		2		/* Autowrap */
-+#define DECSCNM		3		/* Inverted screen */
-+#define CRLF		4		/* Follow lf, vt, ff, with a cr */
-+#define INC_CURS_POS	5		/* Increment cursor position after data read/write */
-+#define QUES		6		/* CSI Esc sequence contains a question mark */
-+#define USER_SPACE	7		/* If set, the buffer pointed by arg in do_lcd_ioctl() is
-+					 * assumed to be in user space otherwise it is in kernel space */
-+#define NULL_CHARMAP	8		/* The driver doesn't provide a charmap so the
-+					 * lcd-linux layer provides one*/
-+#define CAN_DO_COLOR	9		/* The display is color capable */
-+#define WITH_ATTR	10		/* If set, the void * buffer in do_lcd_read/write() contains
-+					 * attributes and therefore is an unsigned short * otherwise it
-+					 * is an unsigned char *
-+					 */
-+
-+/*** attributes ***/
-+#define I_MASK		0x03		/* Intensity (0 = low, 1 = normal, 2 = bright) */
-+#define ULINE		0x04		/* Underlined text */
-+#define	REVERSE		0x08		/* Reversed video text */
-+#define BLINK		0x80		/* Blinking text */
-+
-+/*** Color attributes ***/
-+#define FG_MASK		0x0f		/* Foreground color */
-+#define BG_MASK		0xf0		/* Background color */
-+
-+/* input states */
-+#define NORMAL		0x00001000	/* Normal mode */
-+#define RAW		0x00002000	/* Raw mode (console emulation disabled) */
-+#define SYN		0x00003000	/* Synchronous Idle mode */
-+#define ESC		0x00004000	/* Escape mode */
-+#define CSI		0x00005000	/* CSI escape mode */
-+#define ESC_G0		0x00006000	/* G0 character set */
-+#define ESC_G1		0x00007000	/* G1 character set */
-+#define ESC_HASH	0x00008000	/* ESC # escape sequence */
-+#define ESC_PERCENT	0x00009000	/* ESC % escape sequence */
-+#define ARG		0x0000a000	/* Waiting for arguments for the lcd-linux layer */
-+#define ARG_DRIVER 	0x0000b000	/* Waiting for arguments for the display driver */
-+#define INPUT_MASK	0x0000f000
-+#define ESC_MASK	0x00ff0000
-+#define INIT_MASK	0x0f000000
-+#define PROC_MASK	0xf0000000
-+
-+#define SET_STATE(p, state, mask)	((p)->struct_flags = ((p)->struct_flags & ~(mask)) | ((state) & (mask)))
-+#define SET_INPUT_STATE(p, state)	SET_STATE(p, state, INPUT_MASK)
-+#define SET_ESC_STATE(p, state)		SET_STATE(p, (state) << 16, ESC_MASK)
-+#define SET_INIT_LEVEL(p, level)	SET_STATE(p, (level) << 24, INIT_MASK)
-+#define SET_PROC_LEVEL(p, level)	SET_STATE(p, (level) << 28, PROC_MASK)
-+#define INPUT_STATE(p)			((p)->struct_flags & INPUT_MASK)
-+#define ESC_STATE(p)			(((p)->struct_flags & ESC_MASK) >> 16)
-+#define INIT_LEVEL(p)			(((p)->struct_flags & INIT_MASK) >> 24)
-+#define PROC_LEVEL(p)			(((p)->struct_flags & PROC_MASK) >> 28)
-+
-+#define NPAR	16			/* Max number of parameters in CSI escape sequence */
-+#define FLIP_BUF_SIZE	(1 << 6)	/* Flip buffer size (64 bytes) */
-+
-+struct lcd_struct {
-+	struct list_head	lcd_list;		/* Doubly linked list */
-+	struct semaphore	lcd_sem;		/* Locks this structure */
-+	struct lcd_driver	*driver;		/* The driver associated to this struct */
-+	struct lcd_parameters	*par;			/* The parameters associated to this struct */
-+	unsigned long		struct_flags;		/* Flags for internal use only */
-+	unsigned int		refcount;		/* Number of references to this struct */
-+
-+	unsigned short		*display;		/* The display buffer */
-+
-+	unsigned short		*fb;			/* The virtual screen framebuffer */
-+	unsigned int		fb_size;		/* Size of the framebuffer */
-+	unsigned int		frame_base;		/* Offset of row 0, column 0 of a frame in fb */
-+	unsigned int		frame_size;		/* Size of the frame */
-+
-+	unsigned int		row;			/* Current row in virtual screen */
-+	unsigned int		col;			/* Current column in virtual screen */
-+	unsigned int		s_offset;		/* Saved cursor position in virtual screen */
-+
-+	unsigned int		top;			/* Top scroll row in virtual screen */
-+	unsigned int		bot;			/* Bottom scroll row in virtual screen */
-+
-+	int			esc_args;		/* Number of arguments for a normal escape sequence */
-+	unsigned int		csi_args[NPAR];		/* CSI parameters */
-+	unsigned int		index;			/* Index in csi_args and counter for cgram characters generation */
-+	unsigned char		cgram_index;		/* Index of the cgram character to be created */
-+	unsigned char		*cgram_buffer;		/* Buffer for cgram operations in this driver */
-+
-+	unsigned short		erase_char;		/* Character to be used when erasing */
-+	unsigned char		attr;			/* Current attributes */
-+	unsigned char		color;			/* Color for normal intensity mode */
-+	unsigned char		s_color;		/* Saved color for normal intensity mode */
-+	unsigned char		defcolor;		/* Default color for normal intensity mode */
-+	unsigned char		ulcolor;		/* Color for underline mode */
-+	unsigned char		halfcolor;		/* Color for low intensity mode */
-+	unsigned char		attributes;		/* Packed attributes */
-+	unsigned char		s_attributes;		/* Saved packed attributes */
-+
-+	unsigned char		*s_charmap;		/* Saved character map for this driver */
-+	unsigned char		*flip_buf;		/* High speed flip buffer */
-+};
-+
-+/** Function prototypes **/
-+
-+/* Init/Cleanup the driver */
-+static int init_driver(struct lcd_struct *);
-+static int cleanup_driver(struct lcd_struct *);
-+
-+/* Read from/Write to the driver */
-+static void read_data(struct lcd_struct *, unsigned short *);
-+static void read_cgram(struct lcd_struct *, unsigned char, unsigned char *);
-+static void write_data(struct lcd_struct *, unsigned short);
-+static void write_cgram(struct lcd_struct *, unsigned char, unsigned char *);
-+
-+/* Input handlers */
-+static void cr(struct lcd_struct *);
-+static void lf(struct lcd_struct *);
-+static void control_char(struct lcd_struct *, unsigned char);
-+static void handle_csi(struct lcd_struct *, unsigned char);
-+static int handle_custom_esc(struct lcd_struct *, unsigned int);
-+static int handle_esc(struct lcd_struct *, unsigned char);
-+static void handle_input(struct lcd_struct *, unsigned short);
-+
-+/* Low level file operations */
-+static ssize_t do_lcd_read(struct lcd_struct *, void *, size_t);
-+static ssize_t do_lcd_write(struct lcd_struct *, const void *, size_t);
-+static int do_lcd_open(struct lcd_struct *);
-+static int do_lcd_release(struct lcd_struct *);
-+static int do_lcd_ioctl(struct lcd_struct *, unsigned int, unsigned long);
-+
-+/* Proc functions */
-+#ifdef USE_PROC
-+static void create_driver_proc_entries(struct lcd_struct *);
-+static void remove_driver_proc_entries(struct lcd_struct *);
-+#endif
-+
-+/* globals */
-+static unsigned int major	= LCD_MAJOR;		/* Major number for LCD-Linux device */
-+static unsigned short minors	= LCD_MINORS;		/* Minor numbers allocated for LCD-Linux */
-+static LIST_HEAD(lcd_drivers);				/* Registered lcd drivers */
-+static struct semaphore drivers_sem;			/* Locks the lcd_drivers list */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
-+static struct class *lcd_linux_class;
-+#endif
-+#ifdef USE_PROC
-+static struct proc_dir_entry *lcd_proc_root;
-+#endif
-+/* End of globals */
-+
-+#ifdef MODULE
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
-+#include <linux/device.h>
-+MODULE_ALIAS_CHARDEV_MAJOR(LCD_MAJOR);
-+#endif
-+MODULE_DESCRIPTION("Software layer to drive LCD displays under Linux.");
-+MODULE_AUTHOR("Mattia Jona-Lasinio <mjona@users.sourceforge.net>");
-+#ifdef MODULE_LICENSE
-+MODULE_LICENSE("GPL");
-+#endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
-+module_param(minors, ushort, 0444);
-+#else
-+MODULE_PARM(minors, "h");
-+#endif
-+MODULE_PARM_DESC(minors, "Minor numbers allocated for LCD-Linux (default: " string(LCD_MINORS) ")");
-+#else
-+
-+/*
-+ * Parse boot command line
-+ *
-+ * lcd=minors
-+ */
-+static int __init lcd_linux_boot_init(char *cmdline)
-+{
-+	unsigned short args;
-+
-+	if ((args = simple_strtoul(cmdline, NULL, 0)))
-+		minors = args;
-+
-+	return (1);
-+}
-+
-+__setup("lcd=", lcd_linux_boot_init);
-+#endif /* MODULE */
-+
-+/* Macros for iterator handling */
-+static inline unsigned int iterator_inc_(unsigned int iterator, const unsigned int module)
-+{
-+	return ((++iterator)%module);
-+}
-+
-+static inline unsigned int iterator_dec_(unsigned int iterator, const unsigned int module)
-+{
-+	return (iterator ? --iterator : module-1);
-+}
-+
-+#define iterator_inc(iterator, module)		(iterator = iterator_inc_(iterator, module))
-+#define iterator_dec(iterator, module)		(iterator = iterator_dec_(iterator, module))
-+
-+/* Uncomment the following two lines
-+ * for non-atomic set_bit and clear_bit
-+#define set_bit		__set_bit
-+#define clear_bit	__clear_bit
-+*/
-+
-+/************************************
-+ * Low level routines and utilities *
-+ ************************************/
-+/*
-+ * Set whether the address counter should be incremented
-+ * or decremented after a Read/Write
-+ */
-+static void address_mode(struct lcd_struct *p, int mode)
-+{
-+	struct lcd_driver *driver = p->driver;
-+
-+	if (mode > 0 && ! test_bit(INC_CURS_POS, &p->struct_flags)) {
-+		if (driver->address_mode)
-+			driver->address_mode(mode);
-+		set_bit(INC_CURS_POS, &p->struct_flags);
-+	} else if (mode < 0 && test_bit(INC_CURS_POS, &p->struct_flags)) {
-+		if (driver->address_mode)
-+			driver->address_mode(mode);
-+		clear_bit(INC_CURS_POS, &p->struct_flags);
-+	}
-+}
-+
-+/* WARNING!! This function returns an int because if iterator is not
-+ * within the visible area of the frame it returns -1
-+ */
-+static inline int vs_to_frame_(struct lcd_struct *p, unsigned int iterator)
-+{
-+	unsigned int vs_cols = p->par->vs_cols;
-+	unsigned int row = iterator/vs_cols;
-+	unsigned int col = iterator%vs_cols;
-+	unsigned int frame_base_row = p->frame_base/vs_cols;
-+	unsigned int frame_base_col = p->frame_base%vs_cols;
-+	unsigned int frame_rows = p->par->cntr_rows*p->par->num_cntr;
-+	unsigned int frame_cols = p->par->cntr_cols;
-+
-+	if (row < frame_base_row || row >= frame_base_row+frame_rows)
-+		return (-1);
-+	if (col < frame_base_col || col >= frame_base_col+frame_cols)
-+		return (-1);
-+
-+	return ((row-frame_base_row)*frame_cols+(col-frame_base_col));
-+}
-+
-+/* Given 'iterator' in vs, returns the offset in vs corresponding to the nearest
-+ * visible offset in vs, or returns 'iterator' if it is already visible.
-+ */
-+static unsigned int round_vs_(struct lcd_struct *p, unsigned int iterator)
-+{
-+	unsigned int vs_cols = p->par->vs_cols;
-+	unsigned int row = iterator/vs_cols;
-+	unsigned int col = iterator%vs_cols;
-+	unsigned int frame_base_row = p->frame_base/vs_cols;
-+	unsigned int frame_base_col = p->frame_base%vs_cols;
-+	unsigned int frame_rows = p->par->cntr_rows*p->par->num_cntr;
-+	unsigned int frame_cols = p->par->cntr_cols;
-+
-+	if (row < frame_base_row)
-+		row = frame_base_row;
-+	else if (row >= frame_base_row+frame_rows)
-+		row = frame_base_row+(frame_rows-1);
-+
-+	if (col < frame_base_col)
-+		col = frame_base_col;
-+	else if (col >= frame_base_col+frame_cols)
-+		col = frame_base_col+(frame_cols-1);
-+
-+	return ((row*vs_cols)+col);
-+}
-+
-+#define round_vs(p, iterator)			(iterator = round_vs_(p, iterator))
-+
-+/*
-+ * Sync the frame area starting at offset s, ending at offset e with fb content.
-+ */
-+static void redraw_screen(struct lcd_struct *p, unsigned int s, unsigned int e)
-+{
-+	unsigned int len;
-+	unsigned int row = p->row, col = p->col;
-+	unsigned int inc_set = test_bit(INC_CURS_POS, &p->struct_flags);
-+	unsigned int frame_cols = p->par->cntr_cols;
-+	unsigned int vs_cols = p->par->vs_cols;
-+	unsigned long flags;
-+
-+	if (s >= p->fb_size || e >= p->fb_size || e < s || e < p->frame_base)
-+		return;
-+
-+	round_vs(p, s);
-+	round_vs(p, e);
-+
-+	len = 1+e-s;
-+
-+	if (! inc_set)
-+		s = e;
-+
-+	p->row = s/vs_cols;
-+	p->col = s%vs_cols;
-+
-+	flags = p->struct_flags;
-+	clear_bit(NEED_WRAP, &p->struct_flags);
-+	clear_bit(DECIM, &p->struct_flags);
-+	set_bit(DECAWM, &p->struct_flags);
-+	SET_INPUT_STATE(p, RAW);
-+	if (inc_set)
-+		while (len--)
-+			if (vs_to_frame_(p, (p->row*vs_cols)+p->col) < 0) {
-+				s += vs_cols-frame_cols;
-+				len -= vs_cols-frame_cols-1;
-+				p->row = s/vs_cols;
-+				p->col = s%vs_cols;
-+			} else {
-+				write_data(p, p->fb[s++]);
-+				if (test_bit(NEED_WRAP, &p->struct_flags)) {
-+					cr(p);
-+					lf(p);
-+				}
-+			}
-+	else
-+		while (len--)
-+			if (vs_to_frame_(p, (p->row*vs_cols)+p->col) < 0) {
-+				s -= vs_cols-frame_cols;
-+				len -= vs_cols-frame_cols-1;
-+				p->row = s/vs_cols;
-+				p->col = s%vs_cols;
-+			} else {
-+				write_data(p, p->fb[s--]);
-+				if (test_bit(NEED_WRAP, &p->struct_flags)) {
-+					cr(p);
-+					lf(p);
-+				}
-+			}
-+	p->struct_flags = flags;
-+
-+	p->row = row; p->col = col;
-+}
-+
-+static int make_cursor_visible(struct lcd_struct *p)
-+{
-+	unsigned int vs_rows = p->par->vs_rows;
-+	unsigned int vs_cols = p->par->vs_cols;
-+	unsigned int frame_base, frame_base_row, frame_base_col;
-+	unsigned int frame_rows = p->par->cntr_rows*p->par->num_cntr;
-+	unsigned int frame_cols = p->par->cntr_cols;
-+	unsigned int tmp = frame_cols/2;
-+
-+	if (test_bit(INC_CURS_POS, &p->struct_flags)) {
-+	/* cursor always on the lowest row of the display */
-+		frame_base_row = 0;
-+		frame_base_col = 0;
-+		if (p->row >= frame_rows)
-+			frame_base_row = p->row-(frame_rows-1);
-+		if (p->col >= frame_cols) {
-+			frame_base_col = p->col-(frame_cols-1);
-+			if (tmp) {
-+				tmp = (tmp-(frame_base_col%tmp))%tmp;
-+				if (frame_base_col+tmp <= vs_cols-frame_cols)
-+					frame_base_col += tmp;
-+			}
-+		}
-+	} else {
-+	/* cursor always on the uppermost row of the display */
-+		frame_base_row = vs_rows-frame_rows;
-+		frame_base_col = vs_cols-frame_cols;
-+		if (p->row < vs_rows-frame_rows)
-+			frame_base_row = p->row;
-+		if (p->col < vs_cols-frame_cols) {
-+			frame_base_col = p->col;
-+			if (tmp) {
-+				tmp = frame_base_col%tmp;
-+				if (frame_base_col >= tmp)
-+					frame_base_col -= tmp;
-+			}
-+		}
-+	}
-+
-+	frame_base = p->frame_base;
-+	p->frame_base = (frame_base_row*vs_cols)+frame_base_col;
-+
-+	return (frame_base != p->frame_base);
-+}
-+
-+/*
-+ * Move the visible screen area at user's wish
-+ */
-+static void browse_screen(struct lcd_struct *p, unsigned char dir)
-+{
-+	unsigned int vs_rows = p->par->vs_rows;
-+	unsigned int vs_cols = p->par->vs_cols;
-+	unsigned int frame_base_row = p->frame_base/vs_cols;
-+	unsigned int frame_base_col = p->frame_base%vs_cols;
-+	unsigned int frame_rows = p->par->cntr_rows*p->par->num_cntr;
-+	unsigned int frame_cols = p->par->cntr_cols;
-+
-+	switch (dir) {
-+	case '1':	/* Up */
-+		if (! frame_base_row)
-+			return;
-+		--frame_base_row;
-+		break;
-+	case '2':	/* Down */
-+		if (frame_base_row >= vs_rows-frame_rows)
-+			return;
-+		++frame_base_row;
-+		break;
-+	case '3':	/* Left */
-+		if (! frame_base_col)
-+			return;
-+		--frame_base_col;
-+		break;
-+	case '4':	/* Right */
-+		if (frame_base_col >= vs_cols-frame_cols)
-+			return;
-+		++frame_base_col;
-+		break;
-+	default:
-+		return;
-+	}
-+
-+	p->frame_base = (frame_base_row*vs_cols)+frame_base_col;
-+	redraw_screen(p, 0, p->fb_size-1);
-+}
-+
-+static inline void __memset_short(unsigned short *buf, unsigned short c, unsigned int len)
-+{
-+	while (len--)
-+		*buf++ = c;
-+}
-+
-+/*
-+ * A memset implementation writing to LCD instead of memory locations.
-+ */
-+static void lcd_memset(struct lcd_struct *p, unsigned int d, unsigned short c, unsigned int len)
-+{
-+	unsigned int inc_set = test_bit(INC_CURS_POS, &p->struct_flags);
-+
-+	if (! len || d >= p->fb_size)
-+		return;
-+
-+	if (inc_set && d+len > p->fb_size)
-+		len = p->fb_size-d;
-+	else if (! inc_set && len > d+1)
-+		len = d+1;
-+
-+	if (! inc_set)
-+		d -= len-1;
-+	__memset_short(p->fb+d, c, len);
-+
-+	if (make_cursor_visible(p))
-+		redraw_screen(p, 0, p->fb_size-1);
-+	else
-+		redraw_screen(p, d, d+(len-1));
-+}
-+
-+static inline void __memcpy_short(unsigned short *d, unsigned short *s, unsigned int len, int dir)
-+{
-+	if (dir > 0)
-+		while (len--)
-+			*d++ = *s++;
-+	else
-+		while (len--)
-+			*d-- = *s--;
-+}
-+
-+/*
-+ * A memmove implementation writing to LCD instead of memory locations.
-+ * Copy is done in a non destructive way. Display regions may overlap.
-+ */
-+static void lcd_memmove(struct lcd_struct *p, unsigned int d, unsigned int s, unsigned int len)
-+{
-+	if (! len || d == s || d >= p->fb_size || s >= p->fb_size)
-+		return;
-+
-+	if (d < s) {
-+		if (test_bit(INC_CURS_POS, &p->struct_flags)) {
-+			if (s+len > p->fb_size)
-+				len = p->fb_size-s;
-+		} else {
-+			if (len > d+1)
-+				len = d+1;
-+			d -= len-1;
-+			s -= len-1;
-+		}
-+		__memcpy_short(p->fb+d, p->fb+s, len, 1);
-+		if (make_cursor_visible(p))
-+			redraw_screen(p, 0, p->fb_size-1);
-+		else
-+			redraw_screen(p, d, d+(len-1));
-+	} else {
-+		if (test_bit(INC_CURS_POS, &p->struct_flags)) {
-+			if (d+len > p->fb_size)
-+				len = p->fb_size-d;
-+			d += len-1;
-+			s += len-1;
-+		} else {
-+			if (len > s+1)
-+				len = s+1;
-+		}
-+		__memcpy_short(p->fb+d, p->fb+s, len, -1);
-+		if (make_cursor_visible(p))
-+			redraw_screen(p, 0, p->fb_size-1);
-+		else
-+			redraw_screen(p, d-(len-1), d);
-+	}
-+}
-+
-+static void scrup(struct lcd_struct *p, unsigned int t, unsigned int b, unsigned int nr)
-+{
-+	unsigned int vs_rows = p->par->vs_rows;
-+	unsigned int vs_cols = p->par->vs_cols;
-+	unsigned int d, s;
-+
-+	if (t+nr >= b)
-+		nr = b-t-1;
-+	if (b > vs_rows || t >= b || nr < 1)
-+		return;
-+	d = t*vs_cols;
-+	s = (t+nr)*vs_cols;
-+	if (test_bit(INC_CURS_POS, &p->struct_flags)) {
-+		lcd_memmove(p, d, s, (b-t-nr)*vs_cols);
-+		lcd_memset(p, d+(b-t-nr)*vs_cols, p->erase_char, nr*vs_cols);
-+	} else {
-+		lcd_memmove(p, d+(b-t-nr)*vs_cols-1, s+(b-t-nr)*vs_cols-1, (b-t-nr)*vs_cols);
-+		lcd_memset(p, d+(b-t)*vs_cols-1, p->erase_char, nr*vs_cols);
-+	}
-+}
-+
-+static void scrdown(struct lcd_struct *p, unsigned int t, unsigned int b, unsigned int nr)
-+{
-+	unsigned int vs_rows = p->par->vs_rows;
-+	unsigned int vs_cols = p->par->vs_cols;
-+	unsigned int d, s;
-+
-+	if (t+nr >= b)
-+		nr = b-t-1;
-+	if (b > vs_rows || t >= b || nr < 1)
-+		return;
-+	s = t*vs_cols;
-+	d = (t+nr)*vs_cols;
-+	if (test_bit(INC_CURS_POS, &p->struct_flags)) {
-+		lcd_memmove(p, d, s, (b-t-nr)*vs_cols);
-+		lcd_memset(p, s, p->erase_char, nr*vs_cols);
-+	} else {
-+		lcd_memmove(p, d+(b-t-nr)*vs_cols-1, s+(b-t-nr)*vs_cols-1, (b-t-nr)*vs_cols);
-+		lcd_memset(p, s+nr*vs_cols-1, p->erase_char, nr*vs_cols);
-+	}
-+}
-+
-+static void lcd_insert_char(struct lcd_struct *p, unsigned int nr)
-+{
-+	unsigned int vs_cols = p->par->vs_cols;
-+	unsigned int pos = (p->row*vs_cols)+p->col;
-+
-+	clear_bit(NEED_WRAP, &p->struct_flags);
-+	if (test_bit(INC_CURS_POS, &p->struct_flags))
-+		lcd_memmove(p, pos+nr, pos, vs_cols-p->col-nr);
-+	else
-+		lcd_memmove(p, pos-nr, pos, p->col-(nr-1));
-+	lcd_memset(p, pos, p->erase_char, nr);
-+}
-+
-+static void lcd_delete_char(struct lcd_struct *p, unsigned int nr)
-+{
-+	unsigned int vs_cols = p->par->vs_cols;
-+	unsigned int pos = (p->row*vs_cols)+p->col;
-+
-+	clear_bit(NEED_WRAP, &p->struct_flags);
-+	if (test_bit(INC_CURS_POS, &p->struct_flags)) {
-+		lcd_memmove(p, pos, pos+nr, vs_cols-(p->col+nr));
-+		lcd_memset(p, (p->row+1)*vs_cols-nr, p->erase_char, nr);
-+	} else {
-+		lcd_memmove(p, pos, pos-nr, p->col-(nr-1));
-+		lcd_memset(p, (p->row*vs_cols)+(nr-1), p->erase_char, nr);
-+	}
-+}
-+
-+
-+
-+
-+
-+/******************************************************************************
-+ *************************      VT 102 Emulation      *************************
-+ ******************************************************************************/
-+
-+/**********************
-+ * Control characters *
-+ **********************/
-+static void bs(struct lcd_struct *p)
-+{
-+	clear_bit(NEED_WRAP, &p->struct_flags);
-+	if (test_bit(INC_CURS_POS, &p->struct_flags)) {
-+		if (p->col)
-+			--p->col;
-+	} else {
-+		if (p->col+1 < p->par->vs_cols)
-+			++p->col;
-+	}
-+}
-+
-+static void cr(struct lcd_struct *p)
-+{
-+	clear_bit(NEED_WRAP, &p->struct_flags);
-+	p->col = (test_bit(INC_CURS_POS, &p->struct_flags) ? 0 : p->par->vs_cols-1);
-+}
-+
-+static void lf(struct lcd_struct *p)
-+{
-+	clear_bit(NEED_WRAP, &p->struct_flags);
-+	if (test_bit(INC_CURS_POS, &p->struct_flags)) {
-+		if (p->row+1 == p->bot && INPUT_STATE(p) != RAW) {
-+			make_cursor_visible(p);
-+			scrup(p, p->top, p->bot, 1);
-+		} else if (p->row+1 < p->par->vs_rows)
-+			++p->row;
-+	} else {
-+		if (p->row == p->top && INPUT_STATE(p) != RAW) {
-+			make_cursor_visible(p);
-+			scrdown(p, p->top, p->bot, 1);
-+		} else if (p->row)
-+			--p->row;
-+	}
-+}
-+
-+static void ri(struct lcd_struct *p)
-+{
-+	clear_bit(NEED_WRAP, &p->struct_flags);
-+	if (test_bit(INC_CURS_POS, &p->struct_flags)) {
-+		if (p->row == p->top) {
-+			make_cursor_visible(p);
-+			scrdown(p, p->top, p->bot, 1);
-+		} else if (p->row)
-+			--p->row;
-+	} else {
-+		if (p->row+1 == p->bot) {
-+			make_cursor_visible(p);
-+			scrup(p, p->top, p->bot, 1);
-+		} else if (p->row+1 < p->par->vs_rows)
-+			++p->row;
-+	}
-+}
-+
-+static void ff(struct lcd_struct *p)
-+{
-+	unsigned int vs_rows = p->par->vs_rows;
-+	unsigned int vs_cols = p->par->vs_cols;
-+
-+	clear_bit(NEED_WRAP, &p->struct_flags);
-+	if (p->driver->clear_display) {
-+		p->driver->clear_display();
-+		__memset_short(p->fb, p->erase_char, p->fb_size);
-+		__memset_short(p->display, p->erase_char, p->frame_size);
-+		p->frame_base = 0;
-+	} else if (test_bit(INC_CURS_POS, &p->struct_flags))
-+		lcd_memset(p, 0, p->erase_char, p->fb_size);
-+	else
-+		lcd_memset(p, p->fb_size-1, p->erase_char, p->fb_size);
-+
-+	if (test_bit(INC_CURS_POS, &p->struct_flags))
-+		p->row = p->col = 0;
-+	else {
-+		p->row = vs_rows-1;
-+		p->col = vs_cols-1;
-+	}
-+}
-+
-+static void tab(struct lcd_struct *p)
-+{
-+	struct lcd_parameters *par = p->par;
-+	unsigned int i, vs_cols = par->vs_cols;
-+
-+	clear_bit(NEED_WRAP, &p->struct_flags);
-+
-+	if (! par->tabstop)
-+		return;
-+
-+	if (test_bit(INC_CURS_POS, &p->struct_flags)) {
-+		i = par->tabstop-(p->col%par->tabstop);
-+		if (p->col+i < vs_cols)
-+			p->col += i;
-+	} else {
-+		i = p->col%par->tabstop;
-+		i = (i == 0 ? par->tabstop : i);
-+		if (p->col >= i)
-+			p->col -= i;
-+	}
-+}
-+
-+/*
-+ * Control character handler.
-+ */
-+static void control_char(struct lcd_struct *p, unsigned char val)
-+{
-+	switch (val) {
-+	case 0x08: 	/* BS: Back Space (^H) */
-+	case 0x7f:	/* DEL: Delete */
-+		bs(p);
-+		return;
-+
-+	case 0x09: 	/* HT: Horizontal Tab (^I) */
-+		tab(p);
-+		return;
-+
-+	case 0x0c: 	/* FF: Form Feed (^L) */
-+		ff(p);
-+		return;
-+
-+	case 0x0a: 	/* LF: Line Feed (^J) */
-+	case 0x0b: 	/* VT: Vertical Tab (^K) */
-+		lf(p);
-+		if (! test_bit(CRLF, &p->struct_flags))
-+			return;
-+
-+	case 0x0d: 	/* CR: Carriage Return (^M) */
-+		cr(p);
-+		return;
-+
-+	case 0x16: 	/* SYN: Synchronous Idle (^V) */
-+		SET_INPUT_STATE(p, SYN);
-+		return;
-+
-+	case 0x1b: 	/* ESC: Start of escape sequence */
-+		SET_INPUT_STATE(p, ESC);
-+		return;
-+
-+	case 0x9b: 	/* CSI: Start of CSI escape sequence */
-+		memset(p->csi_args, 0, sizeof(p->csi_args));
-+		p->index = 0;
-+		SET_INPUT_STATE(p, CSI);
-+		return;
-+	}
-+}
-+
-+static void gotoxy(struct lcd_struct *p, int new_col, int new_row)
-+{
-+	unsigned int vs_rows = p->par->vs_rows;
-+	unsigned int vs_cols = p->par->vs_cols;
-+
-+	clear_bit(NEED_WRAP, &p->struct_flags);
-+	if (new_row < 0)
-+		p->row = 0;
-+	else if (new_row >= vs_rows)
-+		p->row = vs_rows-1;
-+	else
-+		p->row = new_row;
-+
-+	if (new_col < 0)
-+		p->col = 0;
-+	else if (new_col >= vs_cols)
-+		p->col = vs_cols-1;
-+	else
-+		p->col = new_col;
-+
-+	if (make_cursor_visible(p))
-+		redraw_screen(p, 0, p->fb_size-1);
-+}
-+
-+
-+/******************************
-+ * ECMA-48 CSI ESC- sequences *
-+ ******************************/
-+static void csi_at(struct lcd_struct *p, unsigned int nr)
-+{
-+	unsigned int vs_cols = p->par->vs_cols;
-+
-+	if (p->col+nr > vs_cols)
-+		nr = vs_cols-p->col;
-+	else if (! nr)
-+		++nr;
-+	lcd_insert_char(p, nr);
-+}
-+
-+static void csi_J(struct lcd_struct *p, unsigned int action)
-+{
-+	unsigned int vs_cols = p->par->vs_cols;
-+	unsigned int pos = (p->row*vs_cols)+p->col;
-+
-+	clear_bit(NEED_WRAP, &p->struct_flags);
-+	switch (action) {
-+	case 0:		/* From cursor to end of display */
-+		lcd_memset(p, pos, p->erase_char, p->fb_size-pos);
-+		return;
-+
-+	case 1:		/* From start of display to cursor */
-+		lcd_memset(p, 0, p->erase_char, pos+1);
-+		return;
-+
-+	case 2:		/* Whole display */
-+		lcd_memset(p, 0, p->erase_char, p->fb_size);
-+		return;
-+	}
-+}
-+
-+static void csi_K(struct lcd_struct *p, unsigned int action)
-+{
-+	unsigned int vs_cols = p->par->vs_cols;
-+	unsigned int row_start = p->row*vs_cols;
-+
-+	clear_bit(NEED_WRAP, &p->struct_flags);
-+	switch (action) {
-+	case 0:		/* From cursor to end of line */
-+		lcd_memset(p, row_start+p->col, p->erase_char, vs_cols-p->col);
-+		return;
-+
-+	case 1:		/* From start of line to cursor */
-+		lcd_memset(p, row_start, p->erase_char, p->col+1);
-+		return;
-+
-+	case 2:		/* Whole line */
-+		lcd_memset(p, row_start, p->erase_char, vs_cols);
-+		return;
-+	}
-+}
-+
-+static void csi_L(struct lcd_struct *p, unsigned int nr)
-+{
-+	unsigned int vs_rows = p->par->vs_rows;
-+	unsigned int vs_cols = p->par->vs_cols;
-+
-+	clear_bit(NEED_WRAP, &p->struct_flags);
-+	if (p->row+nr > vs_rows)
-+		nr = vs_rows-p->row;
-+	else if (! nr)
-+		++nr;;
-+	lcd_memmove(p, (p->row+nr)*vs_cols, p->row*vs_cols, (vs_rows-p->row-nr)*vs_cols);
-+	lcd_memset(p, p->row*vs_cols, p->erase_char, nr*vs_cols);
-+}
-+
-+static void csi_M(struct lcd_struct *p, unsigned int nr)
-+{
-+	unsigned int vs_rows = p->par->vs_rows;
-+	unsigned int vs_cols = p->par->vs_cols;
-+
-+	clear_bit(NEED_WRAP, &p->struct_flags);
-+	if (p->row+nr > vs_rows)
-+		nr = vs_rows-p->row;
-+	else if (! nr)
-+		++nr;;
-+	lcd_memmove(p, p->row*vs_cols, (p->row+nr)*vs_cols, (vs_rows-p->row-nr)*vs_cols);
-+	lcd_memset(p, (vs_rows-nr)*vs_cols, p->erase_char, nr*vs_cols);
-+}
-+
-+static void csi_P(struct lcd_struct *p, unsigned int nr)
-+{
-+	unsigned int vs_cols = p->par->vs_cols;
-+
-+	if (p->col+nr > vs_cols)
-+		nr = vs_cols-p->col;
-+	else if (! nr)
-+		++nr;
-+	lcd_delete_char(p, nr);
-+}
-+
-+static void csi_X(struct lcd_struct *p, unsigned int nr)
-+{
-+	unsigned int vs_cols = p->par->vs_cols;
-+
-+	clear_bit(NEED_WRAP, &p->struct_flags);
-+	if (p->col+nr > vs_cols)
-+		nr = vs_cols-p->col;
-+	else if (! nr)
-+		++nr;
-+	lcd_memset(p, (p->row*vs_cols)+p->col, p->erase_char, nr);
-+}
-+
-+static void csi_su(struct lcd_struct *p, unsigned char input)
-+{
-+	unsigned int vs_cols = p->par->vs_cols;
-+
-+	clear_bit(NEED_WRAP, &p->struct_flags);
-+	if (input == 'u') {
-+		p->row = p->s_offset/vs_cols;
-+		p->col = p->s_offset%vs_cols;
-+		p->color = p->s_color;
-+		p->attributes = p->s_attributes;
-+		return;
-+	}
-+	p->s_offset = (p->row*vs_cols)+p->col;
-+	p->s_color = p->color;
-+	p->s_attributes = p->attributes;
-+}
-+
-+static unsigned char build_attr(struct lcd_struct *p, unsigned char color, unsigned char intensity,
-+				unsigned char blink, unsigned char underline, unsigned char reverse)
-+{
-+	unsigned char attr;
-+
-+	if (test_bit(CAN_DO_COLOR, &p->struct_flags)) {
-+		attr = color;
-+		if (underline)
-+			attr = (attr & BG_MASK) | p->ulcolor;
-+		else if (intensity == 0)
-+			attr = (attr & BG_MASK) | p->halfcolor;
-+		if (reverse)
-+			attr = (attr & 0x88) | ((attr & 0x70) >> 4) | ((attr & 0x07) << 4);
-+		if (blink)
-+			attr ^= 0x80;
-+		if (intensity == 2)
-+			attr ^= 0x08;
-+	} else {
-+		attr = intensity;
-+		attr |= (underline ? ULINE : 0x00);
-+		attr |= (reverse ? REVERSE : 0x00);
-+		attr |= (blink ? BLINK : 0x00);
-+	}
-+
-+	return (attr);
-+}
-+
-+static void update_attr(struct lcd_struct *p)
-+{
-+	unsigned char intensity = p->attributes & 0x03;
-+	unsigned char underline = (p->attributes >> 2) & 0x01;
-+	unsigned char reverse = (p->attributes >> 3) & 0x01;
-+	unsigned char blink = (p->attributes >> 7) & 0x01;
-+	unsigned char decscnm = (p->struct_flags >> DECSCNM) & 0x01;
-+
-+	p->attr = build_attr(p, p->color, intensity, blink, underline, reverse^decscnm);
-+	p->erase_char = (build_attr(p, p->color, 1, blink, 0, decscnm) << 8) | ' ';
-+}
-+
-+static void default_attr(struct lcd_struct *p)
-+{
-+	p->attributes = 0x01;
-+	p->color = p->defcolor;
-+}
-+
-+static void lcd_invert_screen(struct lcd_struct *p, unsigned int offset, unsigned int len)
-+{
-+	if (test_bit(CAN_DO_COLOR, &p->struct_flags))
-+		while (len--) {
-+			p->fb[offset] = (p->fb[offset] & 0x88ff) | ((p->fb[offset] & 0x7000) >> 4) | ((p->fb[offset] & 0x0700) << 4);
-+			++offset;
-+		}
-+	else
-+		while (len--) {
-+			p->fb[offset] ^= 0x0800;
-+			++offset;
-+		}
-+}
-+
-+static void csi_m(struct lcd_struct *p, unsigned int n)
-+{
-+	int i, arg;
-+
-+	for (i = 0; i <= n; ++i)
-+		switch ((arg = p->csi_args[i]))
-+		{
-+			case 0:
-+				default_attr(p);
-+				break;
-+
-+			case 1:
-+				p->attributes = (p->attributes & ~I_MASK) | 2;
-+				break;
-+
-+			case 2:
-+				p->attributes = (p->attributes & ~I_MASK) | 0;
-+				break;
-+
-+			case 4:
-+				p->attributes |= ULINE;
-+				break;
-+
-+			case 5:
-+				p->attributes |= BLINK;
-+				break;
-+
-+			case 7:
-+				p->attributes |= REVERSE;
-+				break;
-+
-+			case 21: case 22:
-+				p->attributes = (p->attributes & ~I_MASK) | 1;
-+				break;
-+
-+			case 24:
-+				p->attributes &= ~ULINE;
-+				break;
-+
-+			case 25:
-+				p->attributes &= ~BLINK;
-+				break;
-+
-+			case 27:
-+				p->attributes &= ~REVERSE;
-+				break;
-+
-+			case 38:
-+				p->attributes |= ULINE;
-+				p->color = (p->color & BG_MASK) | (p->defcolor & FG_MASK);
-+				break;
-+
-+			case 39:
-+				p->attributes &= ~ULINE;
-+				p->color = (p->color & BG_MASK) | (p->defcolor & FG_MASK);
-+				break;
-+
-+			case 49:
-+				p->color = (p->defcolor & BG_MASK) | (p->color & FG_MASK);
-+				break;
-+
-+			default:
-+				if (arg >= 30 && arg <= 37)
-+					p->color = (p->color & BG_MASK) | color_table[arg-30];
-+				else if (arg >= 40 && arg <= 47)
-+					p->color = (p->color & FG_MASK) | (color_table[arg-40] << 4);
-+				break;
-+		}
-+
-+	update_attr(p);
-+}
-+
-+static void csi_h(struct lcd_struct *p, unsigned char n)
-+{
-+	switch (n) {
-+		case 4:		/* Set insert mode */
-+			set_bit(DECIM, &p->struct_flags);
-+			return;
-+
-+		case 5:		/* Inverted screen mode */
-+			if (test_bit(QUES, &p->struct_flags) && ! test_bit(DECSCNM, &p->struct_flags)) {
-+				set_bit(DECSCNM, &p->struct_flags);
-+				lcd_invert_screen(p, 0, p->fb_size);
-+				update_attr(p);
-+				redraw_screen(p, 0, p->fb_size-1);
-+			}
-+			return;
-+
-+		case 7:		/* Set autowrap */
-+			if (test_bit(QUES, &p->struct_flags))
-+				set_bit(DECAWM, &p->struct_flags);
-+			return;
-+
-+		case 20:	/* Set cr lf */
-+			set_bit(CRLF, &p->struct_flags);
-+			return;
-+	}
-+}
-+
-+static void csi_l(struct lcd_struct *p, unsigned char n)
-+{
-+	switch (n) {
-+		case 4:		/* Reset insert mode */
-+			clear_bit(DECIM, &p->struct_flags);
-+			return;
-+
-+		case 5:		/* Normal screen mode */
-+			if (test_bit(QUES, &p->struct_flags) && test_bit(DECSCNM, &p->struct_flags)) {
-+				clear_bit(DECSCNM, &p->struct_flags);
-+				lcd_invert_screen(p, 0, p->fb_size);
-+				update_attr(p);
-+				redraw_screen(p, 0, p->fb_size-1);
-+			}
-+			return;
-+
-+		case 7:		/* Reset autowrap */
-+			if (test_bit(QUES, &p->struct_flags))
-+				clear_bit(DECAWM, &p->struct_flags);
-+			return;
-+
-+		case 20:	/* Reset cr lf */
-+			clear_bit(CRLF, &p->struct_flags);
-+			return;
-+	}
-+}
-+
-+static void csi_linux(struct lcd_struct *p)
-+{
-+	switch (p->csi_args[0]) {
-+	case 1:
-+		if (test_bit(CAN_DO_COLOR, &p->struct_flags) && p->csi_args[1] < 16) {
-+			p->ulcolor = color_table[p->csi_args[1]];
-+			if (p->attributes & ULINE)
-+				update_attr(p);
-+		}
-+		return;
-+
-+	case 2:
-+		if (test_bit(CAN_DO_COLOR, &p->struct_flags) && p->csi_args[1] < 16) {
-+			p->halfcolor = color_table[p->csi_args[1]];
-+			if ((p->attributes & I_MASK) == 0)
-+				update_attr(p);
-+		}
-+		return;
-+
-+	case 8:
-+		p->defcolor = p->color;
-+		default_attr(p);
-+		update_attr(p);
-+		return;
-+	}
-+}
-+
-+static void csi_r(struct lcd_struct *p, unsigned int top, unsigned int bot)
-+{
-+	/* Minimum allowed region is 2 lines */
-+	if (top < bot) {
-+		p->top = top-1;
-+		p->bot = bot;
-+		gotoxy(p, 0, 0);
-+	}
-+}
-+
-+/*
-+ * ECMA-48 CSI ESC- sequence handler.
-+ */
-+static void handle_csi(struct lcd_struct *p, unsigned char input)
-+{
-+	if (p->index >= NPAR) {
-+		SET_INPUT_STATE(p, NORMAL);
-+		printk(KERN_NOTICE "LCD: too many parameters in CSI escape sequence\n");
-+	} else if (input == '?') {
-+		set_bit(QUES, &p->struct_flags);
-+	} else if (input == ';') {
-+		++p->index;
-+	} else if (input >= '0' && input <= '9') {
-+		p->csi_args[p->index] = (p->csi_args[p->index]*10)+(input-'0');
-+	} else {
-+		SET_INPUT_STATE(p, NORMAL);
-+		if (! test_bit(INC_CURS_POS, &p->struct_flags))
-+			return;
-+		switch (input) {
-+		case 'h':		/* DECSET sequences and mode switches */
-+			csi_h(p, p->csi_args[0]);
-+			clear_bit(QUES, &p->struct_flags);
-+			return;
-+
-+		case 'l':		/* DECRST sequences and mode switches */
-+			csi_l(p, p->csi_args[0]);
-+			clear_bit(QUES, &p->struct_flags);
-+			return;
-+		}
-+		clear_bit(QUES, &p->struct_flags);
-+		switch (input) {
-+		case '@':		/* Insert # Blank character */
-+			csi_at(p, p->csi_args[0]);
-+			return;
-+
-+		case 'G': case '`':	/* Cursor to indicated column in current row */
-+			if (p->csi_args[0])
-+				--p->csi_args[0];
-+			gotoxy(p, p->csi_args[0], p->row);
-+			return;
-+
-+		case 'A':		/* Cursor # rows Up */
-+			if (! p->csi_args[0])
-+				++p->csi_args[0];
-+			gotoxy(p, p->col, p->row-p->csi_args[0]);
-+			return;
-+
-+		case 'B': case 'e':	/* Cursor # rows Down */
-+			if (! p->csi_args[0])
-+				++p->csi_args[0];
-+			gotoxy(p, p->col, p->row+p->csi_args[0]);
-+			return;
-+
-+		case 'C': case 'a':	/* Cursor # columns Right */
-+			if (! p->csi_args[0])
-+				++p->csi_args[0];
-+			gotoxy(p, p->col+p->csi_args[0], p->row);
-+			return;
-+
-+		case 'D':		/* Cursor # columns Left */
-+			if (! p->csi_args[0])
-+				++p->csi_args[0];
-+			gotoxy(p, p->col-p->csi_args[0], p->row);
-+			return;
-+
-+		case 'E':		/* Cursor # rows Down, column 1 */
-+			if (! p->csi_args[0])
-+				++p->csi_args[0];
-+			gotoxy(p, 0, p->row+p->csi_args[0]);
-+			return;
-+
-+		case 'F':		/* Cursor # rows Up, column 1 */
-+			if (! p->csi_args[0])
-+				++p->csi_args[0];
-+			gotoxy(p, 0, p->row-p->csi_args[0]);
-+			return;
-+
-+		case 'd':		/* Cursor to indicated row in current column */
-+			if (p->csi_args[0])
-+				--p->csi_args[0];
-+			gotoxy(p, p->col, p->csi_args[0]);
-+			return;
-+
-+		case 'H': case 'f':	/* Cursor to indicated row, column (origin 1, 1) */
-+			if (p->csi_args[0])
-+				--p->csi_args[0];
-+			if (p->csi_args[1])
-+				--p->csi_args[1];
-+			gotoxy(p, p->csi_args[1], p->csi_args[0]);
-+			return;
-+
-+		case 'J':		/* Erase display */
-+			csi_J(p, p->csi_args[0]);
-+			return;
-+
-+		case 'K':		/* Erase line */
-+			csi_K(p, p->csi_args[0]);
-+			return;
-+
-+		case 'L':		/* Insert # blank lines */
-+			csi_L(p, p->csi_args[0]);
-+			return;
-+
-+		case 'M':		/* Delete # blank lines */
-+			csi_M(p, p->csi_args[0]);
-+			return;
-+
-+		case 'P':		/* Delete # characters on the current line */
-+			csi_P(p, p->csi_args[0]);
-+			return;
-+
-+		case 'X':		/* Erase # characters on the current line */
-+			csi_X(p, p->csi_args[0]);
-+			return;
-+
-+		case 'm':		/* Set video attributes */
-+			csi_m(p, p->index);
-+			return;
-+
-+		case 's':		/* Save cursor position */
-+		case 'u':		/* Restore cursor position */
-+			csi_su(p, input);
-+			return;
-+
-+		case ']':		/* Linux private ESC [ ] sequence */
-+			csi_linux(p);
-+			return;
-+
-+		case 'r':		/* Set the scrolling region */
-+			if (! p->csi_args[0])
-+				++p->csi_args[0];
-+			if (! p->csi_args[1] || p->csi_args[1] > p->par->vs_rows)
-+		 		p->csi_args[1] = p->par->vs_rows;
-+			csi_r(p, p->csi_args[0], p->csi_args[1]);
-+			return;
-+
-+					/* Ignored escape sequences */
-+		case 'c':
-+		case 'g':
-+		case 'n':
-+		case 'q':
-+			return;
-+
-+		default:
-+			printk(KERN_NOTICE "LCD: unrecognized CSI escape sequence: ESC [ %u\n", input);
-+			return;
-+		}
-+	}
-+}
-+
-+/*
-+ * Custom ESC- sequence handler.
-+ */
-+static int handle_custom_esc(struct lcd_struct *p, unsigned int _input)
-+{
-+	unsigned char input = _input & 0xff;
-+	struct lcd_parameters *par = p->par;
-+
-+	if (_input & (~0xff)) {
-+		switch (ESC_STATE(p)) {
-+		case 's':
-+			if (p->index++) {
-+				unsigned char *buf = p->cgram_buffer+(p->cgram_index-par->cgram_char0)*par->cgram_bytes;
-+
-+				buf[p->index-2] = input;
-+				if (p->index == par->cgram_bytes+1)
-+					write_cgram(p, p->cgram_index, buf);
-+			} else {
-+				if (! p->driver->write_cgram_char) {
-+					printk(KERN_ERR "LCD: %s: missing function to write to CGRAM\n", p->par->name);
-+					return (-1);
-+				}
-+				if (input >= par->cgram_char0 && input < par->cgram_char0+par->cgram_chars)
-+					p->cgram_index = input;
-+				else {
-+					printk(KERN_NOTICE "LCD: bad CGRAM index\n");
-+					return (-1);
-+				}
-+			}
-+			return (0);
-+
-+		case 'G':
-+			if (input >= par->cgram_char0 && input < par->cgram_char0+par->cgram_chars)
-+				write_data(p, (p->attr << 8) | p->driver->charmap[input]);
-+			else {
-+				SET_INPUT_STATE(p, NORMAL);
-+				handle_input(p, (p->attr << 8) | input);
-+			}
-+			return (0);
-+
-+		case 'r':
-+			if (input == '1')
-+				address_mode(p, -1);
-+			else if (input == '0')
-+				address_mode(p, 1);
-+			return (0);
-+
-+		case 'A':
-+			scrup(p, p->top, p->bot, input);
-+			return (0);
-+
-+		case 'B':
-+			scrdown(p, p->top, p->bot, input);
-+			return (0);
-+
-+		case 'C':
-+			browse_screen(p, input);
-+			return (0);
-+		}
-+	}
-+
-+	/* These are the custom ESC- sequences */
-+	switch (input) {
-+	case 's':	/* CGRAM select */
-+		if (p->cgram_buffer) {
-+			SET_ESC_STATE(p, input);
-+			p->index = 0;
-+			return (par->cgram_bytes+1);
-+		} else {
-+			printk(KERN_NOTICE "LCD: driver %s does not support CGRAM chars\n", par->name);
-+			return (0);
-+		}
-+
-+	case 'A':	/* Scroll up */
-+	case 'B':	/* Scroll down */
-+	case 'C':	/* Browse screen */
-+	case 'G':	/* Enter cgram mode */
-+	case 'r':	/* Decrement counter after data read/write */
-+		SET_ESC_STATE(p, input);
-+		return (1);
-+	}
-+
-+	return (-1);
-+}
-+
-+/*
-+ * ESC- but not CSI sequence handler.
-+ */
-+static int handle_esc(struct lcd_struct *p, unsigned char input)
-+{
-+	int ret;
-+
-+	SET_INPUT_STATE(p, NORMAL);
-+	switch (input) {
-+	case 'c':	/* Reset */
-+		set_bit(DECAWM, &p->struct_flags);
-+		set_bit(INC_CURS_POS, &p->struct_flags);
-+		ff(p);
-+		return (0);
-+
-+	case 'D':	/* Line Feed */
-+		lf(p);
-+		return (0);
-+
-+	case 'E':	/* New Line */
-+		cr(p);
-+		lf(p);
-+		return (0);
-+
-+	case 'M':	/* Reverse Line Feed */
-+		ri(p);
-+		return (0);
-+
-+	case '7':
-+	case '8':
-+		csi_su(p, (input == '7' ? 's' : 'u'));
-+		return (0);
-+
-+	/* CSI: Start of CSI escape sequence */
-+	case '[':
-+		memset(p->csi_args, 0, sizeof(p->csi_args));
-+		p->index = 0;
-+		SET_INPUT_STATE(p, CSI);
-+		return (0);
-+
-+	/* Ignored escape sequences */
-+	case '(':
-+		SET_INPUT_STATE(p, ESC_G0);
-+		return (1);
-+
-+	case ')':
-+		SET_INPUT_STATE(p, ESC_G1);
-+		return (1);
-+
-+	case '#':
-+		SET_INPUT_STATE(p, ESC_HASH);
-+		return (1);
-+
-+	case '%':
-+		SET_INPUT_STATE(p, ESC_PERCENT);
-+		return (1);
-+
-+	case 'H':
-+	case 'Z':
-+	case '>':
-+	case '=':
-+	case ']':
-+		return (0);
-+	}
-+
-+	/* These are the custom ESC- sequences */
-+	if ((ret = handle_custom_esc(p, input)) > 0) {
-+		SET_INPUT_STATE(p, ARG);
-+		return (ret);
-+	}
-+
-+	if (ret < 0 && p->driver->handle_custom_char)
-+		if ((ret = p->driver->handle_custom_char(input)) > 0) {
-+			SET_INPUT_STATE(p, ARG_DRIVER);
-+			return (ret);
-+		}
-+
-+	if (ret < 0)
-+		printk(KERN_NOTICE "LCD: unrecognized escape sequence: ESC %u\n", input);
-+
-+	return (0);
-+}
-+
-+/*
-+ * Main input handler.
-+ */
-+static void handle_input(struct lcd_struct *p, unsigned short _input)
-+{
-+	unsigned char input = _input & 0xff;
-+	struct lcd_driver *driver = p->driver;
-+
-+	switch (INPUT_STATE(p)) {
-+	case NORMAL:
-+		if (input < 0x20 || input == 0x9b)
-+			control_char(p, input);
-+		else
-+			write_data(p, (_input & 0xff00) | driver->charmap[input]);
-+		return;
-+
-+	case RAW:
-+		write_data(p, (_input & 0xff00) | driver->charmap[input]);
-+		return;
-+
-+	case SYN:
-+		write_data(p, _input);
-+		SET_INPUT_STATE(p, NORMAL);
-+		return;
-+
-+	case ESC:
-+		p->esc_args = handle_esc(p, input);
-+		return;
-+
-+	case ESC_G0:
-+	case ESC_G1:
-+	case ESC_HASH:
-+	case ESC_PERCENT:
-+		if (! --p->esc_args)
-+			SET_INPUT_STATE(p, NORMAL);
-+		return;
-+
-+	case CSI:
-+		handle_csi(p, input);
-+		return;
-+
-+	case ARG:
-+		if (handle_custom_esc(p, 0x100 | input) || ! --p->esc_args)
-+			SET_INPUT_STATE(p, NORMAL);
-+		return;
-+
-+	case ARG_DRIVER:
-+		if (driver->handle_custom_char(0x100 | input) || ! --p->esc_args)
-+			SET_INPUT_STATE(p, NORMAL);
-+		return;
-+	}
-+}
-+
-+
-+
-+
-+
-+/***************************************
-+ * Read from/Write to display routines *
-+ ***************************************/
-+
-+/*
-+ * Write character data to the display.
-+ */
-+static void write_data(struct lcd_struct *p, unsigned short data)
-+{
-+	unsigned int vs_cols = p->par->vs_cols;
-+	unsigned int pos;
-+	int frame_pos;
-+
-+	if (test_bit(NEED_WRAP, &p->struct_flags)) {
-+		cr(p);
-+		lf(p);
-+	}
-+
-+	if (test_bit(DECIM, &p->struct_flags))
-+		lcd_insert_char(p, 1);
-+
-+	pos = (p->row*vs_cols)+p->col;
-+	if ((frame_pos = vs_to_frame_(p, pos)) < 0) {
-+		make_cursor_visible(p);
-+		redraw_screen(p, 0, p->fb_size-1);
-+		frame_pos = vs_to_frame_(p, pos);
-+	}
-+
-+	if (p->display[frame_pos] != data) {
-+		p->driver->write_char(frame_pos, data);
-+		p->display[frame_pos] = data;
-+	}
-+
-+	p->fb[pos] = data;
-+
-+	if (test_bit(INC_CURS_POS, &p->struct_flags)) {
-+		if (p->col+1 < vs_cols)
-+			iterator_inc(p->col, vs_cols);
-+		else if (test_bit(DECAWM, &p->struct_flags))
-+			set_bit(NEED_WRAP, &p->struct_flags);
-+	} else {
-+		if (p->col)
-+			iterator_dec(p->col, vs_cols);
-+		else if (test_bit(DECAWM, &p->struct_flags))
-+			set_bit(NEED_WRAP, &p->struct_flags);
-+	}
-+}
-+
-+/*
-+ * Write an entire CGRAM character to the display.
-+ */
-+static void write_cgram(struct lcd_struct *p, unsigned char index, unsigned char *pixels)
-+{
-+	unsigned int inc_set = test_bit(INC_CURS_POS, &p->struct_flags);
-+
-+	if (! inc_set)
-+		address_mode(p, 1);
-+
-+	p->driver->write_cgram_char(index, pixels);
-+
-+	if (! inc_set)
-+		address_mode(p, -1);
-+}
-+
-+/*
-+ * Read character data from the display.
-+ */
-+static void read_data(struct lcd_struct *p, unsigned short *data)
-+{
-+	unsigned int vs_rows = p->par->vs_rows;
-+	unsigned int vs_cols = p->par->vs_cols;
-+	unsigned int pos = (p->row*vs_cols)+p->col;
-+	int frame_pos;
-+
-+	if ((frame_pos = vs_to_frame_(p, pos)) < 0) {
-+		make_cursor_visible(p);
-+		redraw_screen(p, 0, p->fb_size-1);
-+		frame_pos = vs_to_frame_(p, pos);
-+	}
-+
-+	p->driver->read_char(frame_pos, data);
-+
-+	if (test_bit(INC_CURS_POS, &p->struct_flags)) {
-+		iterator_inc(p->col, vs_cols);
-+		if (! p->col) {
-+			if (p->row+1 < vs_rows)
-+				++p->row;
-+		}
-+	} else {
-+		iterator_dec(p->col, vs_cols);
-+		if (p->col+1 == vs_cols) {
-+			if (p->row)
-+				--p->row;
-+		}
-+	}
-+}
-+
-+/*
-+ * Read an entire CGRAM character from the display.
-+ */
-+static void read_cgram(struct lcd_struct *p, unsigned char index, unsigned char *pixels)
-+{
-+	unsigned int inc_set = test_bit(INC_CURS_POS, &p->struct_flags);
-+
-+	if (! inc_set)
-+		address_mode(p, 1);
-+
-+	p->driver->read_cgram_char(index, pixels);
-+
-+	if (! inc_set)
-+		address_mode(p, -1);
-+}
-+
-+
-+
-+
-+
-+/****************************
-+ * Proc filesystem routines *
-+ ****************************/
-+#ifdef USE_PROC
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 0)
-+/* create_proc_read_entry is missing in 2.2.x kernels */
-+static struct proc_dir_entry *create_proc_read_entry(const char *name, mode_t mode,
-+			struct proc_dir_entry *parent, read_proc_t *read_proc, void *data)
-+{
-+	struct proc_dir_entry *res = create_proc_entry(name, mode, parent);
-+
-+	if (res) {
-+		res->read_proc = read_proc;
-+		res->data = data;
-+	}
-+
-+	return (res);
-+}
-+#endif
-+
-+static int proc_fb_read(char *buffer, char **start, off_t offset, int size, int *eof, void *data)
-+{
-+	char *temp = buffer;
-+	struct lcd_struct *p = (struct lcd_struct *)data;
-+	unsigned int vs_cols;
-+	static unsigned int nr, need_wrap;
-+	static off_t _offset;
-+
-+	down(&p->lcd_sem);
-+	if (! offset)
-+		_offset = 0;
-+	if ((*eof = (_offset >= p->fb_size))) {
-+		up(&p->lcd_sem);
-+		return (0);
-+	}
-+	vs_cols = p->par->vs_cols;
-+	if (size && need_wrap) {
-+		need_wrap = 0;
-+		temp += sprintf(temp, "\n");
-+		--size;
-+	}
-+	if (! nr)
-+		nr = vs_cols;
-+	*start = (char *)0;
-+	while (size && nr) {
-+		unsigned char c = (p->fb[_offset] & 0xff);
-+
-+		temp += sprintf(temp, "%c", (c < 0x20 ? '·' : c));
-+		--size;
-+		--nr;
-+		++*start;
-+		++_offset;
-+	}
-+	if (! nr) {
-+		if (size) {
-+			temp += sprintf(temp, "\n");
-+			--size;
-+		} else
-+			need_wrap = 1;
-+	}
-+	up(&p->lcd_sem);
-+
-+	return (temp-buffer);
-+}
-+
-+static int proc_display_read(char *buffer, char **start, off_t offset, int size, int *eof, void *data)
-+{
-+	char *temp = buffer;
-+	struct lcd_struct *p = (struct lcd_struct *)data;
-+	unsigned int i, frame_cols;
-+	int frame_pos;
-+
-+	down(&p->lcd_sem);
-+	frame_cols = p->par->cntr_cols;
-+	frame_pos = vs_to_frame_(p, (p->row*p->par->vs_cols)+p->col);
-+	temp += sprintf(temp, "    ");
-+	for (i = 2; i <= frame_cols; i += 2)
-+		temp += sprintf(temp, " %d", i%10);
-+	temp += sprintf(temp, "\n");
-+
-+	temp += sprintf(temp, "   +");
-+	for (i = 0; i < frame_cols; ++i)
-+		temp += sprintf(temp, "-");
-+	temp += sprintf(temp, "+\n");
-+
-+	for (i = 0; i < p->frame_size; ++i) {
-+		unsigned char c = (p->display[i] & 0xff);
-+
-+		if (! (i%frame_cols))
-+			temp += sprintf(temp, "%2d |", 1+i/frame_cols);
-+		if (frame_pos--)
-+			temp += sprintf(temp, "%c", (c < 0x20 ? '·' : c));
-+		else
-+			temp += sprintf(temp, "_");
-+		if (! ((i+1)%frame_cols))
-+			temp += sprintf(temp, "|\n");
-+	}
-+
-+	temp += sprintf(temp, "   +");
-+	for (i = 0; i < frame_cols; ++i)
-+		temp += sprintf(temp, "-");
-+	temp += sprintf(temp, "+\n");
-+	up(&p->lcd_sem);
-+
-+	return (temp-buffer);
-+}
-+
-+static int proc_charmap_read(char *buffer, char **start, off_t offset, int size, int *eof, void *data)
-+{
-+	char *temp = buffer;
-+	struct lcd_struct *p = (struct lcd_struct *)data;
-+	unsigned char *charmap;
-+	unsigned int i;
-+
-+	down(&p->lcd_sem);
-+	charmap = p->driver->charmap;
-+	temp += sprintf(temp,	"static unsigned char charmap[] = {");
-+	for (i = 0; i < 255; ++i) {
-+		if (! (i & 7)) {
-+			temp += sprintf(temp, "\n");
-+			if (! (i & 31))
-+				temp += sprintf(temp, "\n/* %d - %d */\n", i, i+31);
-+		}
-+		temp += sprintf(temp, "0x%.2x, ", *charmap++);
-+	}
-+	temp += sprintf(temp, "0x%.2x\n\n};\n", *charmap);
-+	up(&p->lcd_sem);
-+
-+	return (temp-buffer);
-+}
-+
-+static int proc_registered_drivers(char *buffer, char **start, off_t offset, int size, int *eof, void *data)
-+{
-+	char *temp = buffer;
-+	struct list_head *entry;
-+
-+	down(&drivers_sem);
-+	temp += sprintf(temp, "Registered drivers:\n");
-+	list_for_each(entry, &lcd_drivers) {
-+		struct lcd_struct *p = list_entry(entry, struct lcd_struct, lcd_list);
-+
-+		down(&p->lcd_sem);
-+		temp += sprintf(temp, "%3d %s\n", p->par->minor, p->par->name);
-+		up(&p->lcd_sem);
-+	}
-+	up(&drivers_sem);
-+
-+	return (temp-buffer);
-+}
-+
-+static void create_driver_proc_entries(struct lcd_struct *p)
-+{
-+	struct proc_dir_entry *driver_proc_root = p->driver->driver_proc_root;
-+	int proc_level = 0;
-+
-+	SET_PROC_LEVEL(p, proc_level);
-+	if (create_proc_read_entry("framebuffer", 0, driver_proc_root, proc_fb_read, p) == NULL) {
-+		printk(KERN_ERR "LCD: cannot create /proc/lcd/%s/framebuffer\n", p->par->name);
-+		return;
-+	}
-+	SET_PROC_LEVEL(p, ++proc_level);
-+	if (create_proc_read_entry("display", 0, driver_proc_root, proc_display_read, p) == NULL) {
-+		printk(KERN_ERR "LCD: cannot create /proc/lcd/%s/display\n", p->par->name);
-+		return;
-+	}
-+	SET_PROC_LEVEL(p, ++proc_level);
-+	if (create_proc_read_entry("charmap.h", 0, driver_proc_root, proc_charmap_read, p) == NULL) {
-+		printk(KERN_ERR "LCD: cannot create /proc/lcd/%s/charmap.h\n", p->par->name);
-+		return;
-+	}
-+	SET_PROC_LEVEL(p, ++proc_level);
-+}
-+
-+static void remove_driver_proc_entries(struct lcd_struct *p)
-+{
-+	struct proc_dir_entry *driver_proc_root = p->driver->driver_proc_root;
-+
-+	switch (PROC_LEVEL(p)) {
-+	case 3:
-+		remove_proc_entry("charmap.h", driver_proc_root);
-+	case 2:
-+		remove_proc_entry("display", driver_proc_root);
-+	case 1:
-+		remove_proc_entry("framebuffer", driver_proc_root);
-+	}
-+	SET_PROC_LEVEL(p, 0);
-+}
-+#endif
-+
-+
-+
-+
-+
-+/*****************************
-+ * Low level file operations *
-+ *****************************/
-+static ssize_t do_lcd_read(struct lcd_struct *p, void *buffer, size_t length)
-+{
-+	unsigned int i;
-+	unsigned short tmp;
-+
-+	if (! p->refcount)
-+		return (-ENXIO);
-+
-+	if (! p->driver->read_char) {
-+		printk(KERN_NOTICE "LCD: driver %s doesn't support reading\n", p->par->name);
-+		return (-ENOSYS);
-+	}
-+
-+	if (test_bit(WITH_ATTR, &p->struct_flags))
-+		for (i = 0; i < length; ++i) {
-+			read_data(p, &tmp);
-+			((unsigned short *)buffer)[i] = tmp;
-+		}
-+	else
-+		for (i = 0; i < length; ++i) {
-+			read_data(p, &tmp);
-+			((unsigned char *)buffer)[i] = tmp & 0xff;
-+		}
-+
-+	return (length);
-+}
-+
-+static ssize_t do_lcd_write(struct lcd_struct *p, const void *buffer, size_t length)
-+{
-+	unsigned int i;
-+
-+	if (! p->refcount)
-+		return (-ENXIO);
-+
-+	if (test_bit(WITH_ATTR, &p->struct_flags))
-+		for (i = 0; i < length; ++i)
-+			handle_input(p, ((const unsigned short *)buffer)[i]);
-+	else
-+		for (i = 0; i < length; ++i)
-+			handle_input(p, (p->attr << 8) | ((const unsigned char *)buffer)[i]);
-+
-+	return (length);
-+}
-+
-+static int do_lcd_open(struct lcd_struct *p)
-+{
-+	if (! p->refcount) {
-+		if (p->driver->driver_module) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
-+			if (! try_module_get(p->driver->driver_module))
-+				return (-EBUSY);
-+#else
-+			if (__MOD_IN_USE(p->driver->driver_module))
-+				return (-EBUSY);
-+
-+			__MOD_INC_USE_COUNT(p->driver->driver_module);
-+#endif
-+		}
-+	}
-+
-+	++p->refcount;
-+
-+	return (0);
-+}
-+
-+static int do_lcd_release(struct lcd_struct *p)
-+{
-+	if (! p->refcount)
-+		return (0);
-+
-+	if (p->refcount == 1) {
-+		if (p->driver->driver_module)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
-+			module_put(p->driver->driver_module);
-+#else
-+			__MOD_DEC_USE_COUNT(p->driver->driver_module);
-+#endif
-+	}
-+
-+	--p->refcount;
-+
-+	return (0);
-+}
-+
-+static int cgram_ioctl(struct lcd_struct *p, unsigned int cmd, unsigned char *argp)
-+{
-+	struct lcd_parameters *par = p->par;
-+	unsigned int length = par->cgram_bytes;
-+	unsigned char index = argp[0];
-+	unsigned char *buffer = argp+1;
-+	unsigned char *cgram_buffer = p->cgram_buffer+(index-par->cgram_char0)*length;
-+
-+	if (index < par->cgram_char0 || index >= par->cgram_char0+par->cgram_chars)
-+		return (-EINVAL);
-+
-+	if (cmd == LCDL_SET_CGRAM_CHAR) {
-+		if (! p->driver->write_cgram_char) {
-+			printk(KERN_ERR "LCD: %s: missing function to write to CGRAM\n", p->par->name);
-+			return (-ENOSYS);
-+		}
-+		if (test_bit(USER_SPACE, &p->struct_flags)) {
-+			if (copy_from_user(cgram_buffer, buffer, length))
-+				return (-EFAULT);
-+		} else
-+			memcpy(cgram_buffer, buffer, length);
-+		write_cgram(p, index, cgram_buffer);
-+	} else {
-+		if (! p->driver->read_cgram_char) {
-+			printk(KERN_ERR "LCD: %s: missing function to read from CGRAM or unable to read\n", p->par->name);
-+			return (-ENOSYS);
-+		}
-+		read_cgram(p, index, cgram_buffer);
-+		if (test_bit(USER_SPACE, &p->struct_flags)) {
-+			if (copy_to_user(buffer, cgram_buffer, length))
-+				return (-EFAULT);
-+		} else
-+			memcpy(buffer, cgram_buffer, length);
-+	}
-+
-+	return (0);
-+}
-+
-+static int do_lcd_ioctl(struct lcd_struct *p, unsigned int cmd, unsigned long arg)
-+{
-+	int i;
-+	struct lcd_driver *driver = p->driver;
-+	struct lcd_parameters *par = p->par;
-+	unsigned char *argp = (unsigned char *)arg;
-+
-+	if (! p->refcount)
-+		return (-ENXIO);
-+
-+	switch (cmd) {
-+	case LCDL_SET_PARAM:
-+		if ((i = cleanup_driver(p)))
-+			return (i);
-+		i = par->minor;
-+		if (test_bit(USER_SPACE, &p->struct_flags)) {
-+			if (copy_from_user(par, argp, sizeof(struct lcd_parameters)))
-+				return (-EFAULT);
-+		} else
-+			memcpy(par, argp, sizeof(struct lcd_parameters));
-+		par->minor = i;
-+		return (init_driver(p));
-+
-+	case LCDL_GET_PARAM:
-+		if (test_bit(USER_SPACE, &p->struct_flags)) {
-+			if (copy_to_user(argp, par, sizeof(struct lcd_parameters)))
-+				return (-EFAULT);
-+		} else
-+			memcpy(argp, par, sizeof(struct lcd_parameters));
-+		return (0);
-+
-+	case LCDL_RESET_CHARMAP:
-+		for (i = 0; i < 256; ++i)
-+			driver->charmap[i] = i;
-+		return (0);
-+
-+	case LCDL_CHARSUBST:
-+		if (test_bit(USER_SPACE, &p->struct_flags)) {
-+			get_user(i, argp);
-+			get_user(driver->charmap[i], argp+1);
-+		} else {
-+			i = argp[0];
-+			driver->charmap[i] = argp[1];
-+		}
-+		return (0);
-+
-+	case LCDL_SAVE_CHARMAP:
-+		memcpy(p->s_charmap, driver->charmap, 256);
-+		return (0);
-+
-+	case LCDL_RESTORE_CHARMAP:
-+		memcpy(driver->charmap, p->s_charmap, 256);
-+		return (0);
-+
-+	case LCDL_SWAP_CHARMAP:
-+		{
-+			unsigned char *tmp;
-+
-+			tmp = driver->charmap;
-+			driver->charmap = p->s_charmap;
-+			p->s_charmap = tmp;
-+		}
-+		return (0);
-+
-+	case LCDL_RAW_MODE:
-+		if (arg) {
-+			clear_bit(NEED_WRAP, &p->struct_flags);
-+			clear_bit(DECIM, &p->struct_flags);
-+			clear_bit(DECAWM, &p->struct_flags);
-+			SET_INPUT_STATE(p, RAW);
-+		} else {
-+			set_bit(DECAWM, &p->struct_flags);
-+			SET_INPUT_STATE(p, NORMAL);
-+		}
-+		return (0);
-+
-+	case LCDL_CLEAR_DISP:
-+		ff(p);
-+		return (0);
-+
-+	case LCDL_SET_CGRAM_CHAR:
-+	case LCDL_GET_CGRAM_CHAR:
-+		if (p->cgram_buffer)
-+			return (cgram_ioctl(p, cmd, argp));
-+		else
-+			printk(KERN_NOTICE "LCD: driver %s does not support CGRAM chars\n", par->name);
-+		return (0);
-+
-+	case LCDL_SET_CHARMAP:
-+		if (test_bit(USER_SPACE, &p->struct_flags)) {
-+			if (copy_from_user(driver->charmap, argp, 256))
-+				return (-EFAULT);
-+		} else
-+			memcpy(driver->charmap, argp, 256);
-+		return (0);
-+
-+	case LCDL_GET_CHARMAP:
-+		if (test_bit(USER_SPACE, &p->struct_flags)) {
-+			if (copy_to_user(argp, driver->charmap, 256))
-+				return (-EFAULT);
-+		} else
-+			memcpy(argp, driver->charmap, 256);
-+		return (0);
-+
-+	case LCDL_MEMSET:
-+	case LCDL_MEMMOVE:
-+	{
-+		int buf[3];
-+
-+		if (test_bit(USER_SPACE, &p->struct_flags)) {
-+			if (copy_from_user(buf, argp, sizeof(buf)))
-+				return (-EFAULT);
-+		} else
-+			memcpy(buf, argp, sizeof(buf));
-+
-+		if (cmd == LCDL_MEMSET)
-+			lcd_memset(p, buf[0], buf[1], buf[2]);
-+		else
-+			lcd_memmove(p, buf[0], buf[1], buf[2]);
-+
-+		return (0);
-+	}
-+
-+	default:
-+		if (driver->handle_custom_ioctl)
-+			return (driver->handle_custom_ioctl(cmd, arg, test_bit(USER_SPACE, &p->struct_flags)));
-+	}
-+
-+	return (-ENOIOCTLCMD);
-+}
-+
-+
-+
-+
-+
-+/**************************************************
-+ * Kernel register/unregister lcd driver routines *
-+ **************************************************/
-+/*
-+ * Find a driver in lcd_drivers linked list
-+ */
-+static struct lcd_struct *find_lcd_struct(unsigned short minor)
-+{
-+	struct list_head *entry;
-+
-+	list_for_each(entry, &lcd_drivers) {
-+		struct lcd_struct *p = list_entry(entry, struct lcd_struct, lcd_list);
-+
-+		if (p->par->minor == minor)
-+			return (p);
-+	}
-+
-+	return (NULL);
-+}
-+
-+static void list_add_sorted(struct list_head *new)
-+{
-+	struct list_head *entry;
-+	unsigned short new_minor = (list_entry(new, struct lcd_struct, lcd_list))->par->minor;
-+
-+	list_for_each(entry, &lcd_drivers) {
-+		struct lcd_struct *p = list_entry(entry, struct lcd_struct, lcd_list);
-+
-+		if (p->par->minor > new_minor)
-+			break;
-+	}
-+	list_add_tail(new, entry);
-+}
-+
-+/* Exported function */
-+int lcd_register_driver(struct lcd_driver *driver, struct lcd_parameters *par)
-+{
-+	int ret;
-+	struct lcd_struct *p;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19)
-+	struct device *lcd_device;
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
-+	struct class_device *lcd_class_device;
-+#endif
-+
-+	if (! driver || ! par || par->minor >= minors)
-+		return (-EINVAL);
-+	if (! driver->write_char || ! driver->init_port || ! driver->cleanup_port) {
-+		printk(KERN_ERR "LCD: missing functions\n");
-+		return (-EINVAL);
-+	}
-+
-+	down(&drivers_sem);
-+
-+	if (find_lcd_struct(par->minor)) {
-+		up(&drivers_sem);
-+		return (-EBUSY);
-+	}
-+
-+	if ((p = (struct lcd_struct *)kmalloc(sizeof(struct lcd_struct), GFP_KERNEL)) == NULL) {
-+		printk(KERN_ERR "LCD: memory allocation failed (kmalloc)\n");
-+		up(&drivers_sem);
-+		return (-ENOMEM);
-+	}
-+	memset(p, 0, sizeof(struct lcd_struct));
-+
-+	p->driver = driver;
-+	p->par = par;
-+	p->refcount = 0;
-+	SET_INIT_LEVEL(p, 0);
-+	SET_INPUT_STATE(p, NORMAL);
-+	set_bit(DECAWM, &p->struct_flags);
-+	set_bit(INC_CURS_POS, &p->struct_flags);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19)
-+	lcd_device = device_create(lcd_linux_class, NULL, MKDEV(major, par->minor), "%s", par->name);
-+	if (IS_ERR(lcd_device)) {
-+		kfree(p);
-+		up(&drivers_sem);
-+		return (PTR_ERR(lcd_device));
-+	}
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 15)
-+	lcd_class_device = class_device_create(lcd_linux_class, NULL, MKDEV(major, par->minor), NULL, "%s", par->name);
-+	if (IS_ERR(lcd_class_device)) {
-+		kfree(p);
-+		up(&drivers_sem);
-+		return (PTR_ERR(lcd_class_device));
-+	}
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
-+	lcd_class_device = class_device_create(lcd_linux_class, MKDEV(major, par->minor), NULL, "%s", par->name);
-+	if (IS_ERR(lcd_class_device)) {
-+		kfree(p);
-+		up(&drivers_sem);
-+		return (PTR_ERR(lcd_class_device));
-+	}
-+#endif
-+
-+#ifdef USE_PROC
-+	if (lcd_proc_root && (driver->driver_proc_root = proc_mkdir(par->name, lcd_proc_root)) == NULL)
-+		printk(KERN_ERR "LCD: cannot create /proc/lcd/%s/\n", par->name);
-+#endif
-+
-+	if ((ret = init_driver(p))) {
-+#ifdef USE_PROC
-+		if (driver->driver_proc_root)
-+			remove_proc_entry(p->par->name, lcd_proc_root);
-+#endif
-+		kfree(p);
-+		up(&drivers_sem);
-+		return (ret);
-+	}
-+
-+	init_MUTEX(&p->lcd_sem);
-+
-+	list_add_sorted(&p->lcd_list);
-+
-+	up(&drivers_sem);
-+
-+#ifdef MODULE
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
-+	try_module_get(THIS_MODULE);
-+#else
-+	MOD_INC_USE_COUNT;
-+#endif
-+#endif
-+
-+	return (0);
-+}
-+EXPORT_SYMBOL(lcd_register_driver);
-+
-+/* Exported function */
-+int lcd_unregister_driver(struct lcd_driver *driver, struct lcd_parameters *par)
-+{
-+	int ret;
-+	struct lcd_struct *p;
-+
-+	if (! driver || ! par || par->minor >= minors)
-+		return (-EINVAL);
-+
-+	down(&drivers_sem);
-+
-+	if ((p = find_lcd_struct(par->minor)) == NULL || p->driver != driver) {
-+		printk(KERN_ERR "LCD: driver not found; lcd_unregister_driver failed\n");
-+		up(&drivers_sem);
-+		return (-ENODEV);
-+	}
-+
-+	down(&p->lcd_sem);
-+
-+	if (p->refcount) {
-+		printk(KERN_ERR "LCD: driver busy; lcd_unregister_driver failed\n");
-+		up(&p->lcd_sem);
-+		up(&drivers_sem);
-+		return (-EBUSY);
-+	}
-+
-+	if ((ret = cleanup_driver(p))) {
-+		up(&p->lcd_sem);
-+		up(&drivers_sem);
-+		return (ret);
-+	}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19)
-+	device_destroy(lcd_linux_class, MKDEV(major, par->minor));
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
-+	class_device_destroy(lcd_linux_class, MKDEV(major, par->minor));
-+#endif
-+
-+#ifdef USE_PROC
-+	if (p->driver->driver_proc_root)
-+		remove_proc_entry(p->par->name, lcd_proc_root);
-+#endif
-+
-+	list_del(&p->lcd_list);
-+	kfree(p);
-+
-+	up(&drivers_sem);
-+
-+#ifdef MODULE
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
-+	module_put(THIS_MODULE);
-+#else
-+	MOD_DEC_USE_COUNT;
-+#endif
-+#endif
-+
-+	return (0);
-+}
-+EXPORT_SYMBOL(lcd_unregister_driver);
-+
-+
-+
-+
-+
-+/************************
-+ * Kernel I/O interface *
-+ ************************/
-+/* Exported function */
-+int lcd_open(unsigned short minor, struct lcd_struct **pp)
-+{
-+	int ret;
-+	struct lcd_struct *p;
-+
-+	down(&drivers_sem);
-+
-+	if (minor >= minors || (*pp = p = find_lcd_struct(minor)) == NULL) {
-+		printk(KERN_ERR "LCD: lcd_open failed. Device not found.\n");
-+		up(&drivers_sem);
-+		return (-ENODEV);
-+	}
-+
-+	down(&p->lcd_sem);
-+	up(&drivers_sem);
-+
-+	ret = do_lcd_open(p);
-+
-+	up(&p->lcd_sem);
-+
-+	return (ret);
-+}
-+EXPORT_SYMBOL(lcd_open);
-+
-+/* Exported function */
-+int lcd_close(struct lcd_struct **pp)
-+{
-+	int ret;
-+	struct lcd_struct *p;
-+
-+	if (! pp || ! (p = *pp)) {
-+		printk(KERN_ERR "LCD: NULL pointer in lcd_close\n");
-+		return (-ENODEV);
-+	}
-+
-+	down(&p->lcd_sem);
-+
-+	if (! (ret = do_lcd_release(p)))
-+		*pp = NULL;
-+
-+	up(&p->lcd_sem);
-+
-+	return (ret);
-+}
-+EXPORT_SYMBOL(lcd_close);
-+
-+static inline loff_t offset_to_row_col(struct lcd_struct *p, loff_t offset)
-+{
-+	unsigned long _offset = offset;
-+	unsigned int vs_cols = p->par->vs_cols;
-+
-+	gotoxy(p, _offset%vs_cols, _offset/vs_cols);
-+
-+	return ((p->row*vs_cols)+p->col);
-+}
-+
-+/* Exported function */
-+ssize_t lcd_read(struct lcd_struct *p, void *bufp, size_t length, loff_t offset, unsigned int with_attr)
-+{
-+	ssize_t ret = 0;
-+
-+	if (! p) {
-+		printk(KERN_ERR "LCD: NULL pointer in lcd_read\n");
-+		return (-ENODEV);
-+	}
-+	if (! bufp)
-+		return (-EFAULT);
-+	if (offset < 0 || offset >= p->fb_size)
-+		return (-EINVAL);
-+
-+	if (length+offset > p->fb_size)
-+		length = p->fb_size-offset;
-+
-+	if (with_attr)
-+		set_bit(WITH_ATTR, &p->struct_flags);
-+
-+	offset_to_row_col(p, offset);
-+	ret = do_lcd_read(p, bufp, length);
-+
-+	if (with_attr)
-+		clear_bit(WITH_ATTR, &p->struct_flags);
-+
-+	return (ret);
-+}
-+EXPORT_SYMBOL(lcd_read);
-+
-+/* Exported function */
-+ssize_t lcd_write(struct lcd_struct *p, const void *bufp, size_t length, loff_t offset, unsigned int with_attr)
-+{
-+	ssize_t ret;
-+
-+	if (! p) {
-+		printk(KERN_ERR "LCD: NULL pointer in lcd_write\n");
-+		return (-ENODEV);
-+	}
-+	if (! bufp)
-+		return (-EFAULT);
-+	if (offset < 0 || offset >= p->fb_size)
-+		return (-EINVAL);
-+
-+	if (with_attr)
-+		set_bit(WITH_ATTR, &p->struct_flags);
-+
-+	offset_to_row_col(p, offset);
-+	ret = do_lcd_write(p, bufp, length);
-+
-+	if (with_attr)
-+		clear_bit(WITH_ATTR, &p->struct_flags);
-+
-+	return (ret);
-+}
-+EXPORT_SYMBOL(lcd_write);
-+
-+/* Exported function */
-+int lcd_ioctl(struct lcd_struct *p, unsigned int cmd, ...)
-+{
-+	int ret;
-+	unsigned long arg;
-+	va_list ap;
-+
-+	if (! p) {
-+		printk(KERN_ERR "LCD: NULL pointer in lcd_ioctl\n");
-+		return (-ENODEV);
-+	}
-+
-+	down(&p->lcd_sem);
-+	va_start(ap, cmd);
-+	arg = va_arg(ap, unsigned long);
-+	ret = do_lcd_ioctl(p, cmd, arg);
-+	va_end(ap);
-+	up(&p->lcd_sem);
-+
-+	return (ret);
-+}
-+EXPORT_SYMBOL(lcd_ioctl);
-+
-+
-+
-+
-+
-+/*******************
-+ * File operations *
-+ *******************/
-+static loff_t lcd_fops_llseek(struct file *filp, loff_t offset, int orig)
-+{
-+	struct lcd_struct *p;
-+
-+	if (! (p = filp->private_data))
-+		return (-ENODEV);
-+
-+	down(&p->lcd_sem);
-+
-+	switch (orig) {
-+	case 0:
-+		filp->f_pos = offset;
-+		break;
-+
-+	case 1:
-+		filp->f_pos += offset;
-+		break;
-+
-+	default:
-+		up(&p->lcd_sem);
-+		return (-EINVAL);     /* SEEK_END not supported */
-+	}
-+
-+	filp->f_pos = offset_to_row_col(p, filp->f_pos);
-+
-+	up(&p->lcd_sem);
-+
-+	return (filp->f_pos);
-+}
-+
-+static ssize_t lcd_fops_read(struct file *filp, char *buffer, size_t length, loff_t *offp)
-+{
-+	ssize_t ret = 0;
-+	char *bufp = buffer;
-+	struct lcd_struct *p;
-+
-+	if (! bufp)
-+		return (-EFAULT);
-+	if (! (p = filp->private_data))
-+		return (-ENODEV);
-+
-+	down(&p->lcd_sem);
-+
-+	if (*offp < 0 || *offp >= p->fb_size) {
-+		up(&p->lcd_sem);
-+		return (-EINVAL);
-+	}
-+
-+	if (length+(*offp) > p->fb_size)
-+		length = p->fb_size-(*offp);
-+
-+	while (length) {
-+		ret = (length > FLIP_BUF_SIZE ? FLIP_BUF_SIZE : length);
-+		if ((ret = do_lcd_read(p, p->flip_buf, ret)) < 0)
-+			break;
-+		*offp = (p->row*p->par->vs_cols)+p->col;
-+		if (copy_to_user(bufp, p->flip_buf, ret)) {
-+			ret = -EFAULT;
-+			break;
-+		}
-+		length -= ret;
-+		bufp += ret;
-+		ret = bufp-buffer;
-+		if (length)
-+			schedule();
-+	}
-+
-+	up(&p->lcd_sem);
-+
-+	return (ret);
-+}
-+
-+static ssize_t lcd_fops_write(struct file *filp, const char *buffer, size_t length, loff_t *offp)
-+{
-+	ssize_t ret = 0;
-+	const char *bufp = buffer;
-+	struct lcd_struct *p;
-+
-+	if (! bufp)
-+		return (-EFAULT);
-+	if (! (p = filp->private_data))
-+		return (-ENODEV);
-+
-+	down(&p->lcd_sem);
-+
-+	if (*offp < 0 || *offp >= p->fb_size) {
-+		up(&p->lcd_sem);
-+		return (-EINVAL);
-+	}
-+
-+	while (length) {
-+		ret = (length > FLIP_BUF_SIZE ? FLIP_BUF_SIZE : length);
-+		if (copy_from_user(p->flip_buf, bufp, ret)) {
-+			ret = -EFAULT;
-+			break;
-+		}
-+		if ((ret = do_lcd_write(p, p->flip_buf, ret)) < 0)
-+			break;
-+		*offp = (p->row*p->par->vs_cols)+p->col;
-+		length -= ret;
-+		bufp += ret;
-+		ret = bufp-buffer;
-+		if (length)
-+			schedule();
-+	}
-+
-+	up(&p->lcd_sem);
-+
-+	return (ret);
-+}
-+
-+static int lcd_fops_open(struct inode *inop, struct file *filp)
-+{
-+	unsigned short minor;
-+	int ret;
-+	struct lcd_struct *p;
-+
-+	down(&drivers_sem);
-+
-+	if ((minor = MINOR(inop->i_rdev)) >= minors || (filp->private_data = p = find_lcd_struct(minor)) == NULL) {
-+		up(&drivers_sem);
-+		return (-ENODEV);
-+	}
-+
-+	down(&p->lcd_sem);
-+	up(&drivers_sem);
-+
-+	ret = do_lcd_open(p);
-+
-+	up(&p->lcd_sem);
-+
-+	return (ret);
-+}
-+
-+static int lcd_fops_release(struct inode *inop, struct file *filp)
-+{
-+	struct lcd_struct *p;
-+	int ret;
-+
-+	if (! (p = filp->private_data))
-+		return (-ENODEV);
-+
-+	down(&p->lcd_sem);
-+
-+	if (! (ret = do_lcd_release(p)))
-+		filp->private_data = NULL;
-+
-+	up(&p->lcd_sem);
-+
-+	return (ret);
-+}
-+
-+static int lcd_fops_ioctl(struct inode *inop, struct file *filp, unsigned int cmd, unsigned long arg)
-+{
-+	struct lcd_struct *p;
-+	int ret;
-+
-+	if (! (p = filp->private_data))
-+		return (-ENODEV);
-+
-+	down(&p->lcd_sem);
-+
-+	set_bit(USER_SPACE, &p->struct_flags);
-+	ret = do_lcd_ioctl(p, cmd, arg);
-+	clear_bit(USER_SPACE, &p->struct_flags);
-+
-+	up(&p->lcd_sem);
-+
-+	return (ret);
-+}
-+
-+static struct file_operations lcd_linux_fops = {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0)
-+	.owner		= THIS_MODULE,
-+#endif
-+	.llseek		= lcd_fops_llseek,
-+	.read		= lcd_fops_read,
-+	.write		= lcd_fops_write,
-+	.open		= lcd_fops_open,
-+	.release	= lcd_fops_release,
-+	.ioctl		= lcd_fops_ioctl,
-+};
-+
-+
-+
-+
-+
-+/********************************
-+ * Init/Cleanup driver routines *
-+ ********************************/
-+static int do_init_driver(struct lcd_struct *p)
-+{
-+	int ret, init_level;
-+	struct lcd_driver *driver = p->driver;
-+	struct lcd_parameters *par = p->par;
-+	unsigned int frame_rows = par->cntr_rows*par->num_cntr;
-+	unsigned int frame_cols = par->cntr_cols;
-+
-+	switch ((init_level = INIT_LEVEL(p))) {
-+	case 0:
-+		if (frame_rows == 0 || frame_cols == 0 || ! par->name) {
-+			printk(KERN_ERR "LCD: wrong lcd parameters\n");
-+			return (-EINVAL);
-+		}
-+		if (driver->validate_driver) {
-+			if ((ret = driver->validate_driver()) < 0) {
-+				printk(KERN_ERR "LCD: validate_driver failed\n");
-+				return (-EINVAL);
-+			} else if (ret > 0) {
-+				set_bit(CAN_DO_COLOR, &p->struct_flags);
-+				p->defcolor = 0x07;
-+				p->ulcolor = 0x0f;
-+				p->halfcolor = 0x08;
-+			}
-+		}
-+		default_attr(p);
-+		update_attr(p);
-+		p->frame_size = frame_rows*frame_cols;
-+		if (par->vs_rows < frame_rows)
-+			par->vs_rows = frame_rows;
-+		if (par->vs_cols < frame_cols)
-+			par->vs_cols = frame_cols;
-+		p->fb_size = par->vs_rows*par->vs_cols;
-+
-+		ret = sizeof(short)*p->fb_size;
-+		ret += sizeof(short)*p->frame_size;
-+		ret += FLIP_BUF_SIZE;
-+		ret += (p->driver->charmap ? 256 : 512);
-+		ret += par->cgram_chars*par->cgram_bytes;
-+		if ((p->fb = (unsigned short *)vmalloc(ret)) == NULL) {
-+			printk(KERN_ERR "LCD: memory allocation failed (vmalloc)\n");
-+			return (-ENOMEM);
-+		}
-+		__memset_short(p->fb, p->erase_char, p->fb_size+p->frame_size);
-+
-+		p->display = p->fb+p->fb_size;
-+		p->flip_buf = (unsigned char *)(p->display+p->frame_size);
-+
-+		if (! p->driver->charmap) {
-+			set_bit(NULL_CHARMAP, &p->struct_flags);
-+			p->driver->charmap = p->flip_buf+FLIP_BUF_SIZE;
-+			for (ret = 0; ret < 256; ++ret)
-+				p->driver->charmap[ret] = ret;
-+			p->s_charmap = p->driver->charmap+256;
-+		} else
-+			p->s_charmap = p->flip_buf+FLIP_BUF_SIZE;
-+		memset(p->s_charmap, 0, 256);
-+
-+		if (par->cgram_chars*par->cgram_bytes) {
-+			p->cgram_buffer = p->s_charmap+256;
-+			memset(p->cgram_buffer, 0, par->cgram_chars*par->cgram_bytes);
-+		} else
-+			p->cgram_buffer = NULL;
-+
-+		p->frame_base = 0;
-+		p->row = p->col = 0;
-+		p->top = 0;
-+		p->bot = par->vs_rows;
-+		SET_INIT_LEVEL(p, ++init_level);
-+
-+	case 1:
-+		/* Initialize the communication port */
-+		if ((ret = driver->init_port())) {
-+			printk(KERN_ERR "LCD: failure while initializing the communication port\n");
-+			return (ret);
-+		}
-+		SET_INIT_LEVEL(p, ++init_level);
-+
-+	case 2:
-+		/* Initialize LCD display */
-+		if (driver->init_display && (ret = driver->init_display())) {
-+			printk(KERN_ERR "LCD: failure while initializing the display\n");
-+			return (ret);
-+		}
-+
-+#ifdef USE_PROC
-+		/* Create entries in /proc/lcd/"driver" */
-+		if (driver->driver_proc_root)
-+			create_driver_proc_entries(p);
-+#endif
-+		SET_INIT_LEVEL(p, ++init_level);
-+	}
-+
-+	return (0);
-+}
-+
-+static int do_cleanup_driver(struct lcd_struct *p)
-+{
-+	int ret, init_level;
-+	struct lcd_driver *driver = p->driver;
-+
-+	switch ((init_level = INIT_LEVEL(p))) {
-+	case 3:
-+#ifdef USE_PROC
-+		if (driver->driver_proc_root)
-+			remove_driver_proc_entries(p);
-+#endif
-+		if (driver->cleanup_display && (ret = driver->cleanup_display())) {
-+			printk(KERN_ERR "LCD: failure while cleaning the display\n");
-+			return (ret);
-+		}
-+		SET_INIT_LEVEL(p, --init_level);
-+
-+	case 2:
-+		if ((ret = driver->cleanup_port())) {
-+			printk(KERN_ERR "LCD: failure while cleaning the communication port\n");
-+			return (ret);
-+		}
-+		SET_INIT_LEVEL(p, --init_level);
-+
-+	case 1:
-+		if (test_bit(NULL_CHARMAP, &p->struct_flags)) {
-+			p->driver->charmap = NULL;
-+			clear_bit(NULL_CHARMAP, &p->struct_flags);
-+		}
-+		vfree(p->fb);
-+		p->fb = NULL;
-+		SET_INIT_LEVEL(p, --init_level);
-+	}
-+
-+	return (0);
-+}
-+
-+static int init_driver(struct lcd_struct *p)
-+{
-+	int ret;
-+
-+	if ((ret = do_init_driver(p))) {
-+		do_cleanup_driver(p);
-+		printk(KERN_ERR "LCD: init_driver failed\n");
-+	}
-+
-+	return (ret);
-+}
-+
-+static int cleanup_driver(struct lcd_struct *p)
-+{
-+	int ret;
-+
-+	if ((ret = do_cleanup_driver(p))) {
-+		do_init_driver(p);
-+		printk(KERN_ERR "LCD: cleanup_driver failed\n");
-+	}
-+
-+	return (ret);
-+}
-+
-+
-+
-+
-+
-+/********************************
-+ * Init/Cleanup module routines *
-+ ********************************/
-+static int __init lcd_linux_init_module(void)
-+{
-+	int ret;
-+
-+	if (! minors || minors > 256)
-+		minors = LCD_MINORS;
-+
-+	init_MUTEX(&drivers_sem);
-+
-+	if ((ret = register_chrdev(major, LCD_LINUX_STRING, &lcd_linux_fops)) < 0) {
-+		printk(KERN_ERR "LCD: register_chrdev failed\n");
-+		return (ret);
-+	}
-+	if (major == 0)
-+		major = ret;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
-+	if (IS_ERR((lcd_linux_class = class_create(THIS_MODULE, "lcd")))) {
-+		ret = PTR_ERR(lcd_linux_class);
-+		unregister_chrdev(major, LCD_LINUX_STRING);
-+		return (ret);
-+	}
-+#endif
-+
-+#ifdef USE_PROC
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
-+	if ((lcd_proc_root = proc_mkdir("lcd", NULL)) == NULL)
-+#else
-+	if ((lcd_proc_root = proc_mkdir("lcd", &proc_root)) == NULL)
-+#endif
-+		printk(KERN_ERR "LCD: cannot create /proc/lcd/\n");
-+	else if (create_proc_read_entry("drivers", 0, lcd_proc_root, proc_registered_drivers, NULL) == NULL)
-+		printk(KERN_ERR "LCD: cannot create /proc/lcd/drivers\n");
-+#endif
-+
-+	printk(KERN_INFO "LCD: --> LCD-Linux " LCD_LINUX_VERSION " <--\n");
-+	printk(KERN_INFO "LCD: --> Mattia Jona-Lasinio <mjona@users.sourceforge.net> <--\n" );
-+
-+
-+	return (0);
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0)
-+static void __exit lcd_linux_cleanup_module(void)
-+#else
-+/* __exit is not defined in 2.2.x kernels */
-+static void lcd_linux_cleanup_module(void)
-+#endif
-+{
-+#ifdef USE_PROC
-+	if (lcd_proc_root) {
-+		remove_proc_entry("drivers", lcd_proc_root);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
-+		remove_proc_entry("lcd", NULL);
-+#else
-+		remove_proc_entry("lcd", &proc_root);
-+#endif
-+	}
-+#endif
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
-+	class_destroy(lcd_linux_class);
-+#endif
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 23)
-+	unregister_chrdev(major, LCD_LINUX_STRING);
-+#else
-+	if (unregister_chrdev(major, LCD_LINUX_STRING))
-+		printk(KERN_ERR "LCD: unregister_chrdev failed\n");
-+#endif
-+}
-+
-+module_init(lcd_linux_init_module)
-+module_exit(lcd_linux_cleanup_module)
-Index: linux-2.6.30.9/include/linux/hd44780.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.30.9/include/linux/hd44780.h	2009-11-24 02:01:42.000000000 +0100
-@@ -0,0 +1,46 @@
-+/* hd44780.h
-+ *
-+ *
-+ * LCD-Linux:
-+ * Driver for HD44780 compatible displays connected to the parallel port.
-+ *
-+ * HD44780 header file.
-+ *
-+ * Copyright (C) 2004 - 2007  Mattia Jona-Lasinio (mjona@users.sourceforge.net)
-+ *
-+ *  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.
-+ *
-+ *  This program is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with this program; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#ifndef HD44780_H
-+#define HD44780_H
-+
-+#include <linux/lcd-linux.h>
-+
-+#define HD44780_VERSION		LCD_LINUX_VERSION	/* Version number */
-+#define HD44780_STRING		"hd44780"
-+
-+#define HD44780_MINOR		0	/* Minor number for the hd44780 driver */
-+
-+
-+/* flags */
-+#define HD44780_CHECK_BF	0x00000001	/* Do busy flag checking */
-+#define HD44780_4BITS_BUS	0x00000002	/* Set the bus length to 4 bits */
-+#define HD44780_5X10_FONT	0x00000004	/* Use 5x10 dots fonts */
-+
-+/* IOCTLs */
-+#define HD44780_READ_AC		_IOR(LCD_MAJOR, 0x00, unsigned char *)
-+
-+#endif /* HD44780 included */
-Index: linux-2.6.30.9/include/linux/lcd-linux.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.30.9/include/linux/lcd-linux.h	2009-11-24 02:01:42.000000000 +0100
-@@ -0,0 +1,151 @@
-+/* lcd-linux.h
-+ *
-+ *
-+ * Software layer to drive LCD displays under Linux.
-+ *
-+ * External interface header file.
-+ *
-+ * Copyright (C) 2005 - 2007  Mattia Jona-Lasinio (mjona@users.sourceforge.net)
-+ *
-+ *  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.
-+ *
-+ *  This program is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with this program; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#ifndef LCD_LINUX_H
-+#define LCD_LINUX_H
-+
-+#ifndef LCD_LINUX_MAIN
-+#warning
-+#warning LCD-Linux is still in development stage and
-+#warning aims at speed and optimization. For these
-+#warning reasons there is no guarantee of backward
-+#warning compatibility between different LCD-Linux
-+#warning versions. Be sure to use the lcd-linux.h
-+#warning file of the same version as the module.
-+#warning "http://lcd-linux.sourceforge.net/"
-+#warning
-+#endif
-+
-+#define LCD_LINUX_VERSION	"0.13.6"	/* Version number */
-+#define LCD_LINUX_STRING	"lcd"
-+
-+#define LCD_MAJOR		120	/* Major number for this device
-+					 * Set this to 0 for dynamic allocation
-+					 */
-+#define LCD_MINORS		8	/* Minors allocated for LCD-Linux*/
-+
-+#include <linux/types.h>
-+
-+#define	str(s) #s
-+#define	string(s) str(s)
-+
-+struct lcd_parameters {
-+	const char	*name;		/* Driver's name */
-+	unsigned long	flags;		/* Flags (see documentation) */
-+	unsigned short	minor;		/* Minor number of the char device */
-+	unsigned short	tabstop;	/* Tab character length */
-+	unsigned short	num_cntr;	/* Controllers to drive */
-+	unsigned short	cntr_rows;	/* Rows per controller */
-+	unsigned short	cntr_cols;	/* Display columns */
-+	unsigned short	vs_rows;	/* Virtual screen rows */
-+	unsigned short	vs_cols;	/* Virtual screen columns */
-+	unsigned short	cgram_chars;	/* Number of user definable characters */
-+	unsigned short	cgram_bytes;	/* Number of bytes required to define a
-+					 * user definable character */
-+	unsigned char	cgram_char0;	/* Ascii of first user definable character */
-+};
-+
-+/* IOCTLs */
-+#include <asm/ioctl.h>
-+#define LCDL_SET_PARAM		_IOW(LCD_MAJOR, 0x80, struct lcd_parameters *)
-+#define LCDL_GET_PARAM		_IOR(LCD_MAJOR, 0x81, struct lcd_parameters *)
-+#define LCDL_CHARSUBST		_IOW(LCD_MAJOR, 0x82, unsigned char *)
-+#define LCDL_RAW_MODE		_IOW(LCD_MAJOR, 0x83, unsigned int)
-+#define LCDL_RESET_CHARMAP	_IO(LCD_MAJOR, 0x84)
-+#define LCDL_SAVE_CHARMAP	_IO(LCD_MAJOR, 0x85)
-+#define LCDL_RESTORE_CHARMAP	_IO(LCD_MAJOR, 0x86)
-+#define LCDL_SWAP_CHARMAP	_IO(LCD_MAJOR, 0x87)
-+#define LCDL_CLEAR_DISP		_IO(LCD_MAJOR, 0x88)
-+#define LCDL_SET_CGRAM_CHAR	_IOW(LCD_MAJOR, 0x89, unsigned char *)
-+#define LCDL_GET_CGRAM_CHAR	_IOR(LCD_MAJOR, 0x8a, unsigned char *)
-+#define LCDL_SET_CHARMAP	_IOW(LCD_MAJOR, 0x8b, unsigned char *)
-+#define LCDL_GET_CHARMAP	_IOR(LCD_MAJOR, 0x8c, unsigned char *)
-+#define LCDL_MEMSET		_IOW(LCD_MAJOR, 0x8d, unsigned int *)
-+#define LCDL_MEMMOVE		_IOW(LCD_MAJOR, 0x8e, unsigned int *)
-+
-+
-+
-+#ifdef __KERNEL__ /* The rest is for kernel only */
-+
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+
-+
-+struct lcd_driver {
-+	void	(*read_char)(unsigned int offset, unsigned short *data);
-+	void	(*read_cgram_char)(unsigned char index, unsigned char *pixmap);
-+	void	(*write_char)(unsigned int offset, unsigned short data);
-+	void	(*write_cgram_char)(unsigned char index, unsigned char *pixmap);
-+	void	(*clear_display)(void);
-+	void	(*address_mode)(int mode);
-+	int	(*validate_driver)(void);
-+	int	(*init_display)(void);
-+	int	(*cleanup_display)(void);
-+	int	(*init_port)(void);
-+	int	(*cleanup_port)(void);
-+	int	(*handle_custom_char)(unsigned int data);
-+	int	(*handle_custom_ioctl)(unsigned int cmd, unsigned long arg, unsigned int arg_in_userspace);
-+
-+	/* The character map to be used */
-+	unsigned char *charmap;
-+
-+	/* The root where the driver can create its own proc files.
-+	 * Will be filled by the lcd-linux layer.
-+	 */
-+	struct proc_dir_entry *driver_proc_root;
-+
-+	/* Set this field to 'driver_module_init' or call lcd_driver_setup
-+	 * just before registering the driver with lcd_register_driver.
-+	 */
-+	struct module *driver_module;
-+};
-+
-+#ifdef MODULE
-+#define driver_module_init	THIS_MODULE
-+#else
-+#define driver_module_init	NULL
-+#endif
-+
-+/* Always call lcd_driver_setup just before registering the driver
-+ * with lcd_register_driver.
-+ */
-+static inline void lcd_driver_setup(struct lcd_driver *p)
-+{
-+	p->driver_module = driver_module_init;
-+}
-+
-+/* External interface */
-+struct lcd_struct;
-+int lcd_register_driver(struct lcd_driver *drv, struct lcd_parameters *par);
-+int lcd_unregister_driver(struct lcd_driver *drv, struct lcd_parameters *par);
-+int lcd_open(unsigned short minor, struct lcd_struct **lcd);
-+int lcd_close(struct lcd_struct **lcd);
-+int lcd_ioctl(struct lcd_struct *lcd, unsigned int cmd, ...);
-+ssize_t lcd_write(struct lcd_struct *lcd, const void *buffer, size_t length, loff_t offset, unsigned int);
-+ssize_t lcd_read(struct lcd_struct *lcd, void *buffer, size_t length, loff_t offset, unsigned int);
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* External interface included */
diff --git a/target/linux/ep93xx/patches-2.6.30/003-ep93xx-i2c.patch b/target/linux/ep93xx/patches-2.6.30/003-ep93xx-i2c.patch
deleted file mode 100644
index aaf4d3ca8..000000000
--- a/target/linux/ep93xx/patches-2.6.30/003-ep93xx-i2c.patch
+++ /dev/null
@@ -1,225 +0,0 @@
-Index: linux-2.6.30.9/drivers/i2c/busses/Kconfig
-===================================================================
---- linux-2.6.30.9.orig/drivers/i2c/busses/Kconfig	2009-11-24 21:00:21.000000000 +0100
-+++ linux-2.6.30.9/drivers/i2c/busses/Kconfig	2009-11-24 21:00:23.000000000 +0100
-@@ -326,6 +326,10 @@
- 	  devices such as DaVinci NIC.
- 	  For details please see http://www.ti.com/davinci
- 
-+config I2C_EP93XX
-+	tristate "EP93XX I2C"
-+	depends on I2C && ARCH_EP93XX
-+
- config I2C_GPIO
- 	tristate "GPIO-based bitbanging I2C"
- 	depends on GENERIC_GPIO
-Index: linux-2.6.30.9/drivers/i2c/busses/Makefile
-===================================================================
---- linux-2.6.30.9.orig/drivers/i2c/busses/Makefile	2009-11-24 21:00:21.000000000 +0100
-+++ linux-2.6.30.9/drivers/i2c/busses/Makefile	2009-11-24 21:00:23.000000000 +0100
-@@ -30,6 +30,7 @@
- obj-$(CONFIG_I2C_BLACKFIN_TWI)	+= i2c-bfin-twi.o
- obj-$(CONFIG_I2C_CPM)		+= i2c-cpm.o
- obj-$(CONFIG_I2C_DAVINCI)	+= i2c-davinci.o
-+obj-$(CONFIG_I2C_EP93XX)	+= i2c-ep93xx.o
- obj-$(CONFIG_I2C_GPIO)		+= i2c-gpio.o
- obj-$(CONFIG_I2C_HIGHLANDER)	+= i2c-highlander.o
- obj-$(CONFIG_I2C_IBM_IIC)	+= i2c-ibm_iic.o
-Index: linux-2.6.30.9/drivers/i2c/busses/i2c-ep93xx.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.30.9/drivers/i2c/busses/i2c-ep93xx.c	2009-11-24 21:00:38.000000000 +0100
-@@ -0,0 +1,193 @@
-+/* ------------------------------------------------------------------------ *
-+ * i2c-ep933xx.c I2C bus glue for Cirrus EP93xx                             *
-+ * ------------------------------------------------------------------------ *
-+
-+   Copyright (C) 2004 Michael Burian
-+
-+   Based on i2c-parport-light.c
-+   Copyright (C) 2003-2004 Jean Delvare <khali@linux-fr.org>
-+
-+   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.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ * ------------------------------------------------------------------------ */
-+
-+
-+//#include <linux/config.h>
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/ioport.h>
-+#include <linux/delay.h>
-+#include <linux/i2c.h>
-+#include <linux/i2c-algo-bit.h>
-+#include <asm/io.h>
-+#include <mach/hardware.h>
-+
-+//1/(2*clockfrequency)
-+#define EE_DELAY_USEC       50
-+#define GPIOG_EECLK 1
-+#define GPIOG_EEDAT 2
-+
-+/* ----- I2C algorithm call-back functions and structures ----------------- */
-+
-+// TODO: optimize
-+static void ep93xx_setscl(void *data, int state)
-+{
-+	unsigned int uiPGDR, uiPGDDR;
-+
-+	uiPGDR = inl(GPIO_PGDR);
-+	uiPGDDR = inl(GPIO_PGDDR);
-+
-+	/* Configure the clock line as output. */
-+	uiPGDDR |= GPIOG_EECLK;
-+	outl(uiPGDDR, GPIO_PGDDR);
-+
-+	/* Set clock line to state */
-+	if(state)
-+		uiPGDR |= GPIOG_EECLK;
-+	else
-+		uiPGDR &= ~GPIOG_EECLK;
-+
-+	outl(uiPGDR, GPIO_PGDR);
-+}
-+
-+static void ep93xx_setsda(void *data, int state)
-+{
-+	unsigned int uiPGDR, uiPGDDR;
-+
-+	uiPGDR = inl(GPIO_PGDR);
-+	uiPGDDR = inl(GPIO_PGDDR);
-+
-+	/* Configure the data line as output. */
-+	uiPGDDR |= GPIOG_EEDAT;
-+	outl(uiPGDDR, GPIO_PGDDR);
-+
-+	/* Set data line to state */
-+	if(state)
-+		uiPGDR |= GPIOG_EEDAT;
-+	else
-+		uiPGDR &= ~GPIOG_EEDAT;
-+
-+	outl(uiPGDR, GPIO_PGDR);
-+}
-+
-+static int ep93xx_getscl(void *data)
-+{
-+	unsigned int uiPGDR, uiPGDDR;
-+
-+	uiPGDR = inl(GPIO_PGDR);
-+	uiPGDDR = inl(GPIO_PGDDR);
-+
-+	/* Configure the clock line as input */
-+	uiPGDDR &= ~GPIOG_EECLK;
-+	outl(uiPGDDR, GPIO_PGDDR);
-+
-+	/* Return state of the clock line */
-+	return (inl(GPIO_PGDR) & GPIOG_EECLK) ? 1 : 0;
-+}
-+
-+static int ep93xx_getsda(void *data)
-+{
-+	unsigned int uiPGDR, uiPGDDR;
-+	uiPGDR = inl(GPIO_PGDR);
-+	uiPGDDR = inl(GPIO_PGDDR);
-+
-+	/* Configure the data line as input */
-+	uiPGDDR &= ~GPIOG_EEDAT;
-+	outl(uiPGDDR, GPIO_PGDDR);
-+
-+	/* Return state of the data line */
-+	return (inl(GPIO_PGDR) & GPIOG_EEDAT) ? 1 : 0;
-+}
-+
-+/* ------------------------------------------------------------------------
-+ * Encapsulate the above functions in the correct operations structure.
-+ * This is only done when more than one hardware adapter is supported.
-+ */
-+
-+/* last line (us, ms, timeout)
-+ * us dominates the bit rate: 10us  means: 100Kbit/sec(25 means 40kbps)
-+ *                            10ms  not known
-+ *                            100ms timeout
-+ */
-+static struct i2c_algo_bit_data ep93xx_data = {
-+	.setsda		= ep93xx_setsda,
-+	.setscl		= ep93xx_setscl,
-+	.getsda		= ep93xx_getsda,
-+	.getscl		= ep93xx_getscl,
-+	.udelay		= 10,
-+	//.mdelay		= 10,
-+	.timeout	= HZ,
-+};
-+
-+/* ----- I2c structure ---------------------------------------------------- */
-+static struct i2c_adapter ep93xx_adapter = {
-+	.owner		= THIS_MODULE,
-+	.class		= I2C_CLASS_HWMON,
-+	.algo_data	= &ep93xx_data,
-+	.name		= "EP93XX I2C bit-bang interface",
-+};
-+
-+/* ----- Module loading, unloading and information ------------------------ */
-+
-+static int __init i2c_ep93xx_init(void)
-+{
-+	unsigned long uiPGDR, uiPGDDR;
-+
-+	/* Read the current value of the GPIO data and data direction registers. */
-+	uiPGDR = inl(GPIO_PGDR);
-+	uiPGDDR = inl(GPIO_PGDDR);
-+
-+	/* If the GPIO pins have not been configured since reset, the data
-+	 * and clock lines will be set as inputs and with data value of 0.
-+	 * External pullup resisters are pulling them high.
-+	 * Set them both high before configuring them as outputs. */
-+	uiPGDR |= (GPIOG_EEDAT | GPIOG_EECLK);
-+	outl(uiPGDR, GPIO_PGDR);
-+
-+	/* Delay to meet the EE Interface timing specification. */
-+	udelay(EE_DELAY_USEC);
-+
-+
-+	/* Configure the EE data and clock lines as outputs. */
-+	uiPGDDR |= (GPIOG_EEDAT | GPIOG_EECLK);
-+	outl(uiPGDDR, GPIO_PGDDR);
-+
-+	/* Delay to meet the EE Interface timing specification. */
-+	udelay(EE_DELAY_USEC);
-+
-+	/* Reset hardware to a sane state (SCL and SDA high) */
-+	ep93xx_setsda(NULL, 1);
-+	ep93xx_setscl(NULL, 1);
-+
-+	if (i2c_bit_add_bus(&ep93xx_adapter) > 0) {
-+		printk(KERN_ERR "i2c-ep93xx: Unable to register with I2C\n");
-+		return -ENODEV;
-+	}
-+
-+	return 0;
-+}
-+
-+static void __exit i2c_ep93xx_exit(void)
-+{
-+	//i2c_bit_del_bus(&ep93xx_adapter);
-+	i2c_del_adapter(&ep93xx_adapter);
-+}
-+
-+MODULE_AUTHOR("Michael Burian");
-+MODULE_DESCRIPTION("I2C bus glue for Cirrus EP93xx processors");
-+MODULE_LICENSE("GPL");
-+
-+module_init(i2c_ep93xx_init);
-+module_exit(i2c_ep93xx_exit);
diff --git a/target/linux/ep93xx/patches-2.6.30/004-simone-rtc.patch b/target/linux/ep93xx/patches-2.6.30/004-simone-rtc.patch
deleted file mode 100644
index 69f2c5a9b..000000000
--- a/target/linux/ep93xx/patches-2.6.30/004-simone-rtc.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- a/drivers/rtc/rtc-ds1307.c
-+++ b/drivers/rtc/rtc-ds1307.c
-@@ -661,6 +661,13 @@ static int __devinit ds1307_probe(struct
- 			goto exit_free;
- 		}
- 
-+#if (defined(CONFIG_MACH_SIM_ONE))
-+		/* SIM.ONE board needs 32khz clock on SQW/INTB pin */
-+		i2c_smbus_write_byte_data(client, DS1337_REG_CONTROL,
-+					ds1307->regs[0] & ~DS1337_BIT_INTCN);
-+		i2c_smbus_write_byte_data(client, DS1337_REG_CONTROL,
-+					ds1307->regs[0] | (DS1337_BIT_RS1 | DS1337_BIT_RS2));
-+#endif
- 		/* oscillator off?  turn it on, so clock can tick. */
- 		if (ds1307->regs[0] & DS1337_BIT_nEOSC)
- 			ds1307->regs[0] &= ~DS1337_BIT_nEOSC;
---- a/drivers/rtc/Kconfig
-+++ b/drivers/rtc/Kconfig
-@@ -570,6 +570,14 @@ config RTC_DRV_EP93XX
- 	  This driver can also be built as a module. If so, the module
- 	  will be called rtc-ep93xx.
- 
-+config RTC_DRV_EP93XX_DS1337
-+	bool "Cirrus Logic EP93XX using DS1337 chip"
-+	depends on RTC_DRV_EP93XX && I2C && MACH_SIM_ONE
-+	help
-+	  If you say yes here, the EP93XX driver will use the
-+	  battery-backed-up DS1337 RTC chip on the SIM.ONE board.
-+	  You almost certainly want this.
-+
- config RTC_DRV_SA1100
- 	tristate "SA11x0/PXA2xx"
- 	depends on ARCH_SA1100 || ARCH_PXA
---- a/drivers/rtc/rtc-ep93xx.c
-+++ b/drivers/rtc/rtc-ep93xx.c
-@@ -13,6 +13,13 @@
- #include <linux/rtc.h>
- #include <linux/platform_device.h>
- #include <mach/hardware.h>
-+#include <asm/io.h>
-+
-+#if defined(CONFIG_RTC_DRV_EP93XX_DS1337)
-+extern int ds1337_do_command(int id, int cmd, void *arg);
-+#define DS1337_GET_DATE         0
-+#define DS1337_SET_DATE         1
-+#endif
- 
- #define EP93XX_RTC_REG(x)	(EP93XX_RTC_BASE + (x))
- #define EP93XX_RTC_DATA		EP93XX_RTC_REG(0x0000)
-@@ -37,16 +44,28 @@ static int ep93xx_get_swcomp(struct devi
- 
- static int ep93xx_rtc_read_time(struct device *dev, struct rtc_time *tm)
- {
-+#if defined(CONFIG_RTC_DRV_EP93XX_DS1337)
-+	/* Reroute the internal device to the DS1337 */
-+	return ds1337_do_command(0, DS1337_GET_DATE, (void *)tm);
-+#else
- 	unsigned long time = __raw_readl(EP93XX_RTC_DATA);
- 
- 	rtc_time_to_tm(time, tm);
- 	return 0;
-+#endif
- }
- 
- static int ep93xx_rtc_set_mmss(struct device *dev, unsigned long secs)
- {
-+#if defined(CONFIG_RTC_DRV_EP93XX_DS1337)
-+	struct rtc_time tm;
-+
-+	rtc_time_to_tm(secs, &tm);
-+	return ds1337_do_command(0, DS1337_SET_DATE, (void *)&tm);
-+#else
- 	__raw_writel(secs + 1, EP93XX_RTC_LOAD);
- 	return 0;
-+#endif
- }
- 
- static int ep93xx_rtc_proc(struct device *dev, struct seq_file *seq)
diff --git a/target/linux/ep93xx/patches-2.6.30/005-ep93xx-dma.patch b/target/linux/ep93xx/patches-2.6.30/005-ep93xx-dma.patch
deleted file mode 100644
index 366413202..000000000
--- a/target/linux/ep93xx/patches-2.6.30/005-ep93xx-dma.patch
+++ /dev/null
@@ -1,3622 +0,0 @@
---- /dev/null
-+++ b/arch/arm/mach-ep93xx/dma_ep93xx.c
-@@ -0,0 +1,2940 @@
-+/******************************************************************************
-+ * arch/arm/mach-ep9312/dma_ep93xx.c
-+ *
-+ * Support functions for the ep93xx internal DMA channels.
-+ * (see also Documentation/arm/ep93xx/dma.txt)
-+ *
-+ * Copyright (C) 2003  Cirrus Logic
-+ *
-+ * A large portion of this file is based on the dma api implemented by
-+ * Nicolas Pitre, dma-sa1100.c, copyrighted 2000.
-+ *
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ ****************************************************************************/
-+#include <linux/autoconf.h>
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/sched.h>
-+#include <linux/spinlock.h>
-+#include <linux/slab.h>
-+#include <linux/errno.h>
-+#include <linux/delay.h>
-+#include <linux/interrupt.h>
-+
-+#include <asm/system.h>
-+#include <asm/irq.h>
-+#include <asm/hardware.h>
-+#include <asm/io.h>
-+#include <asm/dma.h>
-+#include <asm/mach/dma.h>
-+#include "dma_ep93xx.h"
-+
-+/*****************************************************************************
-+ *
-+ * Debugging macros
-+ *
-+ ****************************************************************************/
-+#undef DEBUG
-+//#define DEBUG   1
-+#ifdef DEBUG
-+#define DPRINTK( fmt, arg... )  printk( fmt, ##arg )
-+#else
-+#define DPRINTK( fmt, arg... )
-+#endif
-+
-+/*****************************************************************************
-+ *
-+ * static global variables
-+ *
-+ ****************************************************************************/
-+ep93xx_dma_t dma_chan[MAX_EP93XX_DMA_CHANNELS];
-+
-+/*
-+ *  lock used to protect the list of dma channels while searching for a free
-+ *  channel during dma_request.
-+ */
-+//static spinlock_t dma_list_lock;
-+static spinlock_t dma_list_lock = SPIN_LOCK_UNLOCKED;
-+
-+/*****************************************************************************
-+ *
-+ *  Internal DMA processing functions.
-+ *
-+ ****************************************************************************/
-+/*****************************************************************************
-+ *
-+ *  get_dma_channel_from_handle()
-+ *
-+ *  If Handle is valid, returns the DMA channel # (0 to 9 for channels 1-10)
-+ *  If Handle is not valid, returns -1.
-+ *
-+ ****************************************************************************/
-+static int
-+dma_get_channel_from_handle(int handle)
-+{
-+	int channel;
-+
-+	/*
-+	 *  Get the DMA channel # from the handle.
-+	 */
-+	channel = ((int)handle & DMA_HANDLE_SPECIFIER_MASK) >> 28;
-+
-+	/*
-+	 *  See if this is a valid handle.
-+	 */
-+	if (dma_chan[channel].last_valid_handle != (int)handle) {
-+		DPRINTK("DMA ERROR - invalid handle 0x%x \n", handle);
-+		return(-1);
-+	}
-+
-+	/*
-+	 *  See if this instance is still open
-+	 */
-+	if (!dma_chan[channel].ref_count )
-+		return(-1);
-+
-+	return(channel);
-+}
-+
-+static void dma_m2m_transfer_done(ep93xx_dma_t *dma)
-+{
-+	unsigned int uiCONTROL;
-+	unsigned int M2M_reg_base = dma->reg_base;
-+	unsigned int read_back;
-+
-+	DPRINTK("1  ");
-+
-+	outl( 0, M2M_reg_base+M2M_OFFSET_INTERRUPT );
-+
-+	if (dma->total_buffers) {
-+		/*
-+		 * The current_buffer has already been tranfered, so add the
-+		 * byte count to the total_bytes field.
-+		 */
-+		dma->total_bytes = dma->total_bytes +
-+			dma->buffer_queue[dma->current_buffer].size;
-+
-+		/*
-+		 * Mark the current_buffer as used.
-+		 */
-+		dma->buffer_queue[dma->current_buffer].used = TRUE;
-+
-+		/*
-+		 * Increment the used buffer counter
-+		 */
-+		dma->used_buffers++;
-+
-+		DPRINTK("#%d", dma->current_buffer);
-+
-+		/*
-+		 * Increment the current_buffer
-+		 */
-+		dma->current_buffer = (dma->current_buffer + 1) %
-+				      MAX_EP93XX_DMA_BUFFERS;
-+
-+		/*
-+		 * check if there's a new buffer to transfer.
-+		 */
-+		if (dma->new_buffers && dma->xfer_enable) {
-+			/*
-+			 * We have a new buffer to transfer so program in the
-+			 * buffer values.  Since a STALL interrupt was
-+			 * triggered, we program the buffer descriptor 0
-+			 *
-+			 * Set the SAR_BASE/DAR_BASE/BCR registers with values
-+			 * from the next buffer in the queue.
-+			 */
-+			outl( dma->buffer_queue[dma->current_buffer].source,
-+			      M2M_reg_base + M2M_OFFSET_SAR_BASE0 );
-+
-+			outl( dma->buffer_queue[dma->current_buffer].dest,
-+			      M2M_reg_base + M2M_OFFSET_DAR_BASE0 );
-+
-+			outl( dma->buffer_queue[dma->current_buffer].size,
-+			      M2M_reg_base + M2M_OFFSET_BCR0 );
-+
-+			DPRINTK("SAR_BASE0 - 0x%x\n", dma->buffer_queue[dma->current_buffer].source);
-+			DPRINTK("DAR_BASE0 - 0x%x\n", dma->buffer_queue[dma->current_buffer].dest);
-+			DPRINTK("BCR0 - 0x%x\n", dma->buffer_queue[dma->current_buffer].size);
-+
-+			/*
-+			 * Decrement the new buffer counter
-+			 */
-+			dma->new_buffers--;
-+
-+			/*
-+			 * If there's a second new buffer, we program the
-+			 * second buffer descriptor.
-+			 */
-+			if (dma->new_buffers) {
-+				outl( dma->buffer_queue[(dma->current_buffer + 1) %
-+							MAX_EP93XX_DMA_BUFFERS].source,
-+				      M2M_reg_base+M2M_OFFSET_SAR_BASE1 );
-+
-+				outl( dma->buffer_queue[(dma->current_buffer + 1) %
-+							MAX_EP93XX_DMA_BUFFERS].dest,
-+				      M2M_reg_base+M2M_OFFSET_DAR_BASE1 );
-+
-+				outl( dma->buffer_queue[(dma->current_buffer + 1) %
-+							MAX_EP93XX_DMA_BUFFERS].size,
-+				      M2M_reg_base+M2M_OFFSET_BCR1 );
-+
-+				uiCONTROL = inl(M2M_reg_base+M2M_OFFSET_CONTROL);
-+				uiCONTROL |= CONTROL_M2M_NFBINTEN;
-+				outl( uiCONTROL, M2M_reg_base+M2M_OFFSET_CONTROL );
-+
-+				dma->new_buffers--;
-+			}
-+		} else {
-+			DPRINTK("2 \n");
-+			/*
-+			 * There's a chance we setup both buffer descriptors,
-+			 * but didn't service the NFB quickly enough, causing
-+			 * the channel to transfer both buffers, then enter the
-+			 * stall state.  So, we need to be able to process the
-+			 * second buffer.
-+			 */
-+			if ((dma->used_buffers + dma->new_buffers) < dma->total_buffers)
-+			{
-+				DPRINTK("3 ");
-+
-+				/*
-+				 * The current_buffer has already been
-+				 * tranferred, so add the byte count to the
-+				 * total_bytes field.
-+				 */
-+				dma->total_bytes = dma->total_bytes +
-+					dma->buffer_queue[dma->current_buffer].size;
-+
-+				/*
-+				 * Mark the current_buffer as used.
-+				 */
-+				dma->buffer_queue[dma->current_buffer].used = TRUE;
-+
-+				/*
-+				 * Increment the used buffer counter
-+				 */
-+				dma->used_buffers++;
-+
-+				DPRINTK("#%d", dma->current_buffer);
-+
-+				/*
-+				 * Increment the current buffer pointer.
-+				 */
-+				dma->current_buffer = (dma->current_buffer + 1) %
-+						      MAX_EP93XX_DMA_BUFFERS;
-+
-+			}
-+
-+			/*
-+			 * No new buffers to transfer, so disable the channel.
-+			 */
-+			uiCONTROL = inl(M2M_reg_base+M2M_OFFSET_CONTROL);
-+			uiCONTROL &= ~CONTROL_M2M_ENABLE;
-+			outl( uiCONTROL, M2M_reg_base+M2M_OFFSET_CONTROL );
-+
-+			/*
-+			 * Indicate that this channel is in the pause by
-+			 * starvation state by setting the pause bit to true.
-+			 */
-+			dma->pause = TRUE;
-+		}
-+	} else {
-+		/*
-+		 * No buffers to transfer, or old buffers to mark as used,
-+		 * so disable the channel
-+		 */
-+		uiCONTROL = inl(M2M_reg_base+M2M_OFFSET_CONTROL);
-+		uiCONTROL &= ~CONTROL_M2M_ENABLE;
-+		outl( uiCONTROL, M2M_reg_base+M2M_OFFSET_CONTROL );
-+
-+		/*
-+		 * Must read the control register back after a write.
-+		 */
-+		read_back = inl(M2M_reg_base+M2M_OFFSET_CONTROL);
-+
-+		/*
-+		 * Indicate that this channel is in the pause by
-+		 * starvation state by setting the pause bit to true.
-+		 */
-+		dma->pause = TRUE;
-+	}
-+}
-+
-+static void dma_m2m_next_frame_buffer(ep93xx_dma_t *dma)
-+{
-+	int loop;
-+	unsigned int uiCONTROL;
-+	unsigned int M2M_reg_base = dma->reg_base;
-+
-+	DPRINTK("5  ");
-+
-+	if (dma->total_buffers) {
-+		DPRINTK("6  ");
-+		/*
-+		 * The iCurrentBuffer has already been transfered.  so add the
-+		 * byte count from the current buffer to the total byte count.
-+		 */
-+		dma->total_bytes = dma->total_bytes +
-+			dma->buffer_queue[dma->current_buffer].size;
-+
-+		/*
-+		 * Mark the Current Buffer as used.
-+		 */
-+		dma->buffer_queue[dma->current_buffer].used = TRUE;
-+
-+		/*
-+		 * Increment the used buffer counter
-+		 */
-+		dma->used_buffers++;
-+
-+		DPRINTK("#%d", dma->current_buffer);
-+
-+		if ((dma->buffer_queue[
-+		    (dma->current_buffer + 1) % MAX_EP93XX_DMA_BUFFERS].last) ||
-+		    (dma->new_buffers == 0) || (dma->xfer_enable == FALSE)) {
-+			DPRINTK("7  ");
-+
-+			/*
-+			 * This is the last Buffer in this transaction, so
-+			 * disable the NFB interrupt.  We shouldn't get an NFB
-+			 * int when the FSM moves to the ON state where it
-+			 * would typically get the NFB int indicating a new
-+			 * buffer can be programmed.  Instead, once in the ON
-+			 * state, the DMA will just proceed to complete the
-+			 * transfer of the current buffer, move the FSB
-+			 * directly to the STALL state where a STALL interrupt
-+			 * will be generated.
-+			 */
-+			uiCONTROL = inl(M2M_reg_base+M2M_OFFSET_CONTROL);
-+			uiCONTROL &= ~CONTROL_M2M_NFBINTEN ;
-+			outl( uiCONTROL, M2M_reg_base+M2M_OFFSET_CONTROL );
-+
-+			/*
-+			 * The current buffer has been transferred, so
-+			 * increment the current buffer counter to reflect
-+			 * this.
-+			 */
-+			dma->current_buffer = (dma->current_buffer + 1) %
-+					      MAX_EP93XX_DMA_BUFFERS;
-+
-+			DPRINTK("End of NFB handling. \n");
-+			DPRINTK("CONTROL - 0x%x \n",
-+                                inl(M2M_reg_base+M2M_OFFSET_CONTROL) );
-+			DPRINTK("STATUS - 0x%x \n",
-+                                inl(M2M_reg_base+M2M_OFFSET_STATUS) );
-+			DPRINTK("SAR_BASE0 - 0x%x \n",
-+                                inl(M2M_reg_base+M2M_OFFSET_SAR_BASE0) );
-+			DPRINTK("SAR_CUR0 - 0x%x \n",
-+                                inl(M2M_reg_base+M2M_OFFSET_SAR_CURRENT0) );
-+			DPRINTK("DAR_BASE0 - 0x%x \n",
-+                                inl(M2M_reg_base+M2M_OFFSET_DAR_BASE0) );
-+			DPRINTK("DAR_CUR0 - 0x%x \n",
-+                                inl(M2M_reg_base+M2M_OFFSET_DAR_CURRENT0) );
-+
-+			DPRINTK("Buffer	buf_id	 source	   size	   last	   used \n");
-+			for (loop = 0; loop < 32; loop ++)
-+				DPRINTK("%d		0x%x		0x%x		 0x%x		%d		 %d \n",
-+					loop, dma->buffer_queue[loop].buf_id,
-+					dma->buffer_queue[loop].source,
-+					dma->buffer_queue[loop].size,
-+					dma->buffer_queue[loop].last,
-+					dma->buffer_queue[loop].used);
-+			DPRINTK("pause	 0x%x		0x%x		 0x%x		%d		 %d \n",
-+				dma->pause_buf.buf_id, dma->pause_buf.source,
-+				dma->pause_buf.size, dma->pause_buf.last,
-+				dma->pause_buf.used);
-+
-+			DPRINTK("Pause - %d \n", dma->pause);
-+			DPRINTK("xfer_enable - %d \n", dma->xfer_enable);
-+			DPRINTK("total bytes - 0x%x \n", dma->total_bytes);
-+			DPRINTK("total buffer - %d \n", dma->total_buffers);
-+			DPRINTK("new buffers - %d \n", dma->new_buffers);
-+			DPRINTK("current buffer - %d \n", dma->current_buffer);
-+			DPRINTK("last buffer - %d \n", dma->last_buffer);
-+			DPRINTK("used buffers - %d \n", dma->used_buffers);
-+			DPRINTK("callback addr - 0x%p \n", dma->callback);
-+
-+		} else if (dma->new_buffers) {
-+			DPRINTK("8  ");
-+			/*
-+			 * We have a new buffer, so increment the current
-+			 * buffer to point to the next buffer, which is already
-+			 * programmed into the DMA. Next time around, it'll be
-+			 * pointing to the current buffer.
-+			 */
-+			dma->current_buffer = (dma->current_buffer + 1) %
-+					      MAX_EP93XX_DMA_BUFFERS;
-+
-+			/*
-+			 * We know we have a new buffer to program as the next
-+			 * buffer, so check which set of SAR_BASE/DAR_BASE/BCR
-+			 * registers to program.
-+			 */
-+			if ( inl(M2M_reg_base+M2M_OFFSET_STATUS) & STATUS_M2M_NB ) {
-+				/*
-+				 * Set the SAR_BASE1/DAR_BASE1/BCR1 registers
-+				 * with values from the next buffer in the
-+				 * queue.
-+				 */
-+				outl( dma->buffer_queue[(dma->current_buffer + 1) %
-+							MAX_EP93XX_DMA_BUFFERS].source,
-+				      M2M_reg_base+M2M_OFFSET_SAR_BASE1 );
-+
-+				outl( dma->buffer_queue[(dma->current_buffer + 1) %
-+							MAX_EP93XX_DMA_BUFFERS].dest,
-+				      M2M_reg_base+M2M_OFFSET_DAR_BASE1 );
-+
-+				outl( dma->buffer_queue[(dma->current_buffer + 1) %
-+							MAX_EP93XX_DMA_BUFFERS].size,
-+				      M2M_reg_base+M2M_OFFSET_BCR1 );
-+			} else {
-+				/*
-+				 * Set the SAR_BASE0/DAR_BASE0/BCR0 registers
-+				 * with values from the next buffer in the
-+				 * queue.
-+				 */
-+				outl( dma->buffer_queue[(dma->current_buffer + 1) %
-+							MAX_EP93XX_DMA_BUFFERS].source,
-+				      M2M_reg_base+M2M_OFFSET_SAR_BASE0 );
-+
-+				outl( dma->buffer_queue[(dma->current_buffer + 1) %
-+							MAX_EP93XX_DMA_BUFFERS].dest,
-+				      M2M_reg_base+M2M_OFFSET_DAR_BASE0 );
-+
-+				outl( dma->buffer_queue[(dma->current_buffer + 1) %
-+							MAX_EP93XX_DMA_BUFFERS].size,
-+				      M2M_reg_base+M2M_OFFSET_BCR0 );
-+			}
-+
-+			/*
-+			 *  Decrement the new buffers counter
-+			 */
-+			dma->new_buffers--;
-+		}
-+	} else {
-+		/*
-+		 * Total number of buffers is 0 - really we should never get
-+		 * here, but just in case.
-+		 */
-+		DPRINTK("9 \n");
-+
-+		/*
-+		 *  No new buffers to transfer, so Disable the channel
-+		 */
-+		uiCONTROL = inl(M2M_reg_base+M2M_OFFSET_CONTROL);
-+		uiCONTROL &= ~CONTROL_M2M_ENABLE;
-+		outl( uiCONTROL, M2M_reg_base+M2M_OFFSET_CONTROL );
-+
-+		/*
-+		 *  Indicate that the channel is paused by starvation.
-+		 */
-+		dma->pause = 1;
-+	}
-+}
-+
-+/*****************************************************************************
-+ *
-+ * dma_m2m_irq_handler
-+ *
-+ ****************************************************************************/
-+static irqreturn_t
-+dma_m2m_irq_handler(int irq, void *dev_id)
-+{
-+	ep93xx_dma_t *dma = (ep93xx_dma_t *)dev_id;
-+	unsigned int M2M_reg_base = dma->reg_base;
-+	ep93xx_dma_dev_t dma_int = UNDEF_INT;
-+	int status;
-+
-+//	printk("+m2m irq=%d\n", irq);
-+
-+	/*
-+	 *  Determine what kind of dma interrupt this is.
-+	 */
-+	status = inl(M2M_reg_base + M2M_OFFSET_INTERRUPT);
-+	if ( status & INTERRUPT_M2M_DONEINT )
-+		dma_int = DONE; // we're done with a requested dma
-+	else if ( status & INTERRUPT_M2M_NFBINT )
-+		dma_int = NFB;  // we're done with one dma buffer
-+
-+	DPRINTK("IRQ: b=%#x st=%#x\n", (int)dma->current_buffer, dma_int);
-+
-+	switch (dma_int) {
-+	/*
-+	 *  Next Frame Buffer Interrupt.  If there's a new buffer program it
-+	 *  Check if this is the last buffer in the transfer,
-+	 *  and if it is, disable the NFB int to prevent being
-+	 *  interrupted for another buffer when we know there won't be
-+	 *  another.
-+	 */
-+	case NFB:
-+		dma_m2m_next_frame_buffer(dma);
-+		break;
-+	/*
-+	 *  Done interrupt generated, indicating that the transfer is complete.
-+	 */
-+	case DONE:
-+		dma_m2m_transfer_done(dma);
-+		break;
-+
-+	default:
-+		break;
-+	}
-+
-+	if ((dma_int != UNDEF_INT) && dma->callback)
-+		dma->callback(dma_int, dma->device, dma->user_data);
-+
-+	return IRQ_HANDLED;
-+}
-+
-+/*****************************************************************************
-+ *
-+ * dma_m2p_irq_handler
-+ *
-+ *
-+ *
-+ ****************************************************************************/
-+static irqreturn_t
-+dma_m2p_irq_handler(int irq, void *dev_id)
-+{
-+	ep93xx_dma_t *dma = (ep93xx_dma_t *) dev_id;
-+	unsigned int M2P_reg_base = dma->reg_base;
-+	unsigned int read_back;
-+	ep93xx_dma_dev_t dma_int = UNDEF_INT;
-+	unsigned int loop, uiCONTROL, uiINTERRUPT;
-+
-+	/*
-+	 *  Determine what kind of dma interrupt this is.
-+	 */
-+	if ( inl(M2P_reg_base+M2P_OFFSET_INTERRUPT) & INTERRUPT_M2P_STALLINT )
-+		dma_int = STALL;
-+	else if ( inl(M2P_reg_base+M2P_OFFSET_INTERRUPT) & INTERRUPT_M2P_NFBINT )
-+		dma_int = NFB;
-+	else if ( inl(M2P_reg_base+M2P_OFFSET_INTERRUPT) & INTERRUPT_M2P_CHERRORINT )
-+		dma_int = CHERROR;
-+
-+	/*
-+	 *  Stall Interrupt: The Channel is stalled, meaning nothing is
-+	 *  programmed to transfer right now.  So, we're back to the
-+	 *  beginnning.  If there's a buffer to transfer, program it into
-+	 *  max and base 0 registers.
-+	 */
-+	if (dma_int == STALL) {
-+		DPRINTK("1  ");
-+
-+		if (dma->total_buffers) {
-+			/*
-+			 * The current_buffer has already been tranfered, so
-+			 * add the byte count to the total_bytes field.
-+			 */
-+			dma->total_bytes = dma->total_bytes +
-+				dma->buffer_queue[dma->current_buffer].size;
-+
-+			/*
-+			 *  Mark the current_buffer as used.
-+			 */
-+			dma->buffer_queue[dma->current_buffer].used = TRUE;
-+
-+			/*
-+			 *  Increment the used buffer counter
-+			 */
-+			dma->used_buffers++;
-+
-+			DPRINTK("#%d", dma->current_buffer);
-+
-+			/*
-+			 *  Increment the current_buffer
-+			 */
-+			dma->current_buffer = (dma->current_buffer + 1) %
-+					      MAX_EP93XX_DMA_BUFFERS;
-+
-+			/*
-+			 *  check if there's a new buffer to transfer.
-+			 */
-+			if (dma->new_buffers && dma->xfer_enable) {
-+				/*
-+				 * We have a new buffer to transfer so program
-+				 * in the buffer values.  Since a STALL
-+				 * interrupt was triggered, we program the
-+				 * base0 and maxcnt0
-+				 *
-+				 * Set the MAXCNT0 register with the buffer
-+				 * size
-+				 */
-+				outl( dma->buffer_queue[dma->current_buffer].size,
-+					  M2P_reg_base+M2P_OFFSET_MAXCNT0 );
-+
-+				/*
-+				 * Set the BASE0 register with the buffer base
-+				 * address
-+				 */
-+				outl( dma->buffer_queue[dma->current_buffer].source,
-+					  M2P_reg_base+M2P_OFFSET_BASE0 );
-+
-+				/*
-+				 *  Decrement the new buffer counter
-+				 */
-+				dma->new_buffers--;
-+
-+				if (dma->new_buffers) {
-+					DPRINTK("A  ");
-+					/*
-+					 * Set the MAXCNT1 register with the
-+					 * buffer size
-+					 */
-+					outl( dma->buffer_queue[(dma->current_buffer + 1) %
-+											MAX_EP93XX_DMA_BUFFERS].size,
-+						  M2P_reg_base+M2P_OFFSET_MAXCNT1 );
-+
-+					/*
-+					 * Set the BASE1 register with the
-+					 * buffer base address
-+					 */
-+					outl( dma->buffer_queue[dma->current_buffer + 1 %
-+											MAX_EP93XX_DMA_BUFFERS].source,
-+						  M2P_reg_base+M2P_OFFSET_BASE1 );
-+
-+					/*
-+					 *  Decrement the new buffer counter
-+					 */
-+					dma->new_buffers--;
-+
-+					/*
-+					 *  Enable the NFB Interrupt.
-+					 */
-+					uiCONTROL = inl(M2P_reg_base+M2P_OFFSET_CONTROL);
-+					uiCONTROL |= CONTROL_M2P_NFBINTEN;
-+					outl( uiCONTROL, M2P_reg_base+M2P_OFFSET_CONTROL );
-+				}
-+			} else {
-+				/*
-+				 *  No new buffers.
-+				 */
-+				DPRINTK("2 \n");
-+
-+				/*
-+				 *  There's a chance we setup both buffer descriptors, but
-+				 *  didn't service the NFB quickly enough, causing the channel
-+				 *  to transfer both buffers, then enter the stall state.
-+				 *  So, we need to be able to process the second buffer.
-+				 */
-+				if ((dma->used_buffers + dma->new_buffers) < dma->total_buffers) {
-+					DPRINTK("3 ");
-+
-+					/*
-+					 *  The current_buffer has already been tranfered, so add the
-+					 *  byte count to the total_bytes field.
-+					 */
-+					dma->total_bytes = dma->total_bytes +
-+						dma->buffer_queue[dma->current_buffer].size;
-+
-+					/*
-+					 *  Mark the current_buffer as used.
-+					 */
-+					dma->buffer_queue[dma->current_buffer].used = TRUE;
-+
-+					/*
-+					 *  Increment the used buffer counter
-+					 */
-+					dma->used_buffers++;
-+
-+					DPRINTK("#%d", dma->current_buffer);
-+
-+					/*
-+					 *  Increment the current buffer pointer.
-+					 */
-+					dma->current_buffer = (dma->current_buffer + 1) %
-+						MAX_EP93XX_DMA_BUFFERS;
-+
-+				}
-+
-+				/*
-+				 *  No new buffers to transfer, so disable the channel.
-+				 */
-+				uiCONTROL = inl(M2P_reg_base+M2P_OFFSET_CONTROL);
-+				uiCONTROL &= ~CONTROL_M2P_ENABLE;
-+				outl( uiCONTROL, M2P_reg_base+M2P_OFFSET_CONTROL );
-+
-+				/*
-+				 *  Indicate that this channel is in the pause by starvation
-+				 *  state by setting the pause bit to true.
-+				 */
-+				dma->pause = TRUE;
-+
-+				DPRINTK("STATUS - 0x%x \n",	 inl(M2P_reg_base+M2P_OFFSET_STATUS) );
-+				DPRINTK("CONTROL - 0x%x \n",	inl(M2P_reg_base+M2P_OFFSET_CONTROL) );
-+				DPRINTK("REMAIN - 0x%x \n",	 inl(M2P_reg_base+M2P_OFFSET_REMAIN) );
-+				DPRINTK("PPALLOC - 0x%x \n",	inl(M2P_reg_base+M2P_OFFSET_PPALLOC) );
-+				DPRINTK("BASE0 - 0x%x \n",	  inl(M2P_reg_base+M2P_OFFSET_BASE0) );
-+				DPRINTK("MAXCNT0 - 0x%x \n",	inl(M2P_reg_base+M2P_OFFSET_MAXCNT0) );
-+				DPRINTK("CURRENT0 - 0x%x \n",   inl(M2P_reg_base+M2P_OFFSET_CURRENT0) );
-+				DPRINTK("BASE1 - 0x%x \n",	  inl(M2P_reg_base+M2P_OFFSET_BASE1) );
-+				DPRINTK("MAXCNT1 - 0x%x \n",	inl(M2P_reg_base+M2P_OFFSET_MAXCNT1) );
-+				DPRINTK("CURRENT1 - 0x%x \n",   inl(M2P_reg_base+M2P_OFFSET_CURRENT1) );
-+
-+				DPRINTK("Buffer	buf_id	 source	   size	   last	   used \n");
-+				for (loop = 0; loop < 32; loop ++)
-+					DPRINTK("%d		0x%x		0x%x		 0x%x		%d		 %d \n",
-+							loop, dma->buffer_queue[loop].buf_id, dma->buffer_queue[loop].source,
-+							dma->buffer_queue[loop].size,
-+							dma->buffer_queue[loop].last, dma->buffer_queue[loop].used);
-+				DPRINTK("pause	 0x%x		0x%x		 0x%x		%d		 %d \n",
-+						dma->pause_buf.buf_id, dma->pause_buf.source, dma->pause_buf.size,
-+						dma->pause_buf.last, dma->pause_buf.used);
-+
-+				DPRINTK("Pause - %d \n", dma->pause);
-+				DPRINTK("xfer_enable - %d \n", dma->xfer_enable);
-+				DPRINTK("total bytes - 0x%x \n", dma->total_bytes);
-+				DPRINTK("total buffer - %d \n", dma->total_buffers);
-+				DPRINTK("new buffers - %d \n", dma->new_buffers);
-+				DPRINTK("current buffer - %d \n", dma->current_buffer);
-+				DPRINTK("last buffer - %d \n", dma->last_buffer);
-+				DPRINTK("used buffers - %d \n", dma->used_buffers);
-+				DPRINTK("callback addr - 0x%p \n", dma->callback);
-+			}
-+		} else {
-+			/*
-+			 *  No buffers to transfer, or old buffers to mark as used,
-+			 *  so Disable the channel
-+			 */
-+			uiCONTROL = inl(M2P_reg_base+M2P_OFFSET_CONTROL);
-+			uiCONTROL &= ~CONTROL_M2P_ENABLE;
-+			outl( uiCONTROL, M2P_reg_base+M2P_OFFSET_CONTROL );
-+
-+			/*
-+			 *  Must read the control register back after a write.
-+			 */
-+			read_back = inl(M2P_reg_base+M2P_OFFSET_CONTROL);
-+
-+			/*
-+			 *  Indicate that this channel is in the pause by
-+			 *  starvation state by setting the pause bit to true.
-+			 */
-+			dma->pause = TRUE;
-+		}
-+	}
-+
-+	/*
-+	 *  Next Frame Buffer Interrupt.  If there's a new buffer program it
-+	 *  Check if this is the last buffer in the transfer,
-+	 *  and if it is, disable the NFB int to prevent being
-+	 *  interrupted for another buffer when we know there won't be
-+	 *  another.
-+	 */
-+	if (dma_int == NFB) {
-+		DPRINTK("5  ");
-+
-+		if (dma->total_buffers) {
-+			DPRINTK("6  ");
-+			/*
-+			 *  The iCurrentBuffer has already been transfered.  so add the
-+			 *  byte count from the current buffer to the total byte count.
-+			 */
-+			dma->total_bytes = dma->total_bytes +
-+				dma->buffer_queue[dma->current_buffer].size;
-+
-+			/*
-+			 *  Mark the Current Buffer as used.
-+			 */
-+			dma->buffer_queue[dma->current_buffer].used = TRUE;
-+
-+			/*
-+			 *  Increment the used buffer counter
-+			 */
-+			dma->used_buffers++;
-+
-+			DPRINTK("#%d", dma->current_buffer);
-+
-+			if ((dma->buffer_queue[
-+			    (dma->current_buffer + 1) % MAX_EP93XX_DMA_BUFFERS].last) ||
-+			    (dma->new_buffers == 0) || (dma->xfer_enable == FALSE)) {
-+				DPRINTK("7  ");
-+
-+				/*
-+				 *  This is the last Buffer in this transaction, so disable
-+				 *  the NFB interrupt.  We shouldn't get an NFB int when the
-+				 *  FSM moves to the ON state where it would typically get the
-+				 *  NFB int indicating a new buffer can be programmed.
-+				 *  Instead, once in the ON state, the DMA will just proceed
-+				 *  to complet the transfer of the current buffer, move the
-+				 *  FSB directly to the STALL state where a STALL interrupt
-+				 *  will be generated.
-+				 */
-+				uiCONTROL = inl(M2P_reg_base+M2P_OFFSET_CONTROL);
-+				uiCONTROL &= ~CONTROL_M2P_NFBINTEN;
-+				outl( uiCONTROL, M2P_reg_base+M2P_OFFSET_CONTROL );
-+
-+				/*
-+				 *  The current buffer has been transferred, so increment
-+				 *  the current buffer counter to reflect this.
-+				 */
-+				dma->current_buffer = (dma->current_buffer + 1) % MAX_EP93XX_DMA_BUFFERS;
-+
-+				DPRINTK("End of NFB handling. \n");
-+				DPRINTK("STATUS - 0x%x \n",	 inl(M2P_reg_base+M2P_OFFSET_STATUS) );
-+				DPRINTK("CONTROL - 0x%x \n",	inl(M2P_reg_base+M2P_OFFSET_CONTROL) );
-+				DPRINTK("REMAIN - 0x%x \n",	 inl(M2P_reg_base+M2P_OFFSET_REMAIN) );
-+				DPRINTK("PPALLOC - 0x%x \n",	inl(M2P_reg_base+M2P_OFFSET_PPALLOC) );
-+				DPRINTK("BASE0 - 0x%x \n",	  inl(M2P_reg_base+M2P_OFFSET_BASE0) );
-+				DPRINTK("MAXCNT0 - 0x%x \n",	inl(M2P_reg_base+M2P_OFFSET_MAXCNT0) );
-+				DPRINTK("CURRENT0 - 0x%x \n",   inl(M2P_reg_base+M2P_OFFSET_CURRENT0) );
-+				DPRINTK("BASE1 - 0x%x \n",	  inl(M2P_reg_base+M2P_OFFSET_BASE1) );
-+				DPRINTK("MAXCNT1 - 0x%x \n",	inl(M2P_reg_base+M2P_OFFSET_MAXCNT1) );
-+				DPRINTK("CURRENT1 - 0x%x \n",   inl(M2P_reg_base+M2P_OFFSET_CURRENT1) );
-+
-+				DPRINTK("Buffer	buf_id	 source	   size	   last	   used \n");
-+				for (loop = 0; loop < 32; loop ++)
-+					DPRINTK("%d		0x%x		0x%x		 0x%x		%d		 %d \n",
-+							loop, dma->buffer_queue[loop].buf_id, dma->buffer_queue[loop].source,
-+							dma->buffer_queue[loop].size,
-+							dma->buffer_queue[loop].last, dma->buffer_queue[loop].used);
-+				DPRINTK("pause	 0x%x		0x%x		 0x%x		%d		 %d \n",
-+						dma->pause_buf.buf_id, dma->pause_buf.source, dma->pause_buf.size,
-+						dma->pause_buf.last, dma->pause_buf.used);
-+
-+				DPRINTK("Pause - %d \n", dma->pause);
-+				DPRINTK("xfer_enable - %d \n", dma->xfer_enable);
-+				DPRINTK("total bytes - 0x%x \n", dma->total_bytes);
-+				DPRINTK("total buffer - %d \n", dma->total_buffers);
-+				DPRINTK("new buffers - %d \n", dma->new_buffers);
-+				DPRINTK("current buffer - %d \n", dma->current_buffer);
-+				DPRINTK("last buffer - %d \n", dma->last_buffer);
-+				DPRINTK("used buffers - %d \n", dma->used_buffers);
-+				DPRINTK("callback addr - 0x%p \n", dma->callback);
-+
-+			} else if (dma->new_buffers) {
-+				DPRINTK("8  ");
-+				/*
-+				 *  we have a new buffer, so increment the current buffer to
-+				 *  point to the next buffer, which is already programmed into
-+				 *  the DMA. Next time around, it'll be pointing to the
-+				 *  current buffer.
-+				 */
-+				dma->current_buffer = (dma->current_buffer + 1) % MAX_EP93XX_DMA_BUFFERS;
-+
-+				/*
-+				 *  we know we have a new buffer to program as the next
-+				 *  buffer, so check which set of MAXCNT and BASE registers
-+				 *  to program.
-+				 */
-+				if ( inl(M2P_reg_base+M2P_OFFSET_STATUS) & STATUS_M2P_NEXTBUFFER ) {
-+					/*
-+					 *  Set the MAXCNT1 register with the buffer size
-+					 */
-+					outl( dma->buffer_queue[
-+					      (dma->current_buffer + 1) % MAX_EP93XX_DMA_BUFFERS].size,
-+					      M2P_reg_base+M2P_OFFSET_MAXCNT1 );
-+
-+					/*
-+					 *  Set the BASE1 register with the buffer base address
-+					 */
-+					outl( dma->buffer_queue[
-+					      (dma->current_buffer + 1) % MAX_EP93XX_DMA_BUFFERS].source,
-+					      M2P_reg_base+M2P_OFFSET_BASE1 );
-+				} else {
-+					/*
-+					 *  Set the MAXCNT0 register with the buffer size
-+					 */
-+					outl( dma->buffer_queue[
-+					      (dma->current_buffer + 1) % MAX_EP93XX_DMA_BUFFERS].size,
-+					       M2P_reg_base+M2P_OFFSET_MAXCNT0 );
-+
-+					/*
-+					 *  Set the BASE0 register with the buffer base address
-+					 */
-+					outl( dma->buffer_queue[
-+					      (dma->current_buffer + 1) % MAX_EP93XX_DMA_BUFFERS].source,
-+					      M2P_reg_base+M2P_OFFSET_BASE0 );
-+				}
-+
-+				/*
-+				 *  Decrement the new buffers counter
-+				 */
-+				dma->new_buffers--;
-+			}
-+		} else {
-+			/*
-+			 *  Total number of buffers is 0 - really we should never get here,
-+			 *  but just in case.
-+			 */
-+			DPRINTK("9 \n");
-+
-+			/*
-+			 *  No new buffers to transfer, so Disable the channel
-+			 */
-+			uiCONTROL = inl(M2P_reg_base+M2P_OFFSET_CONTROL);
-+			uiCONTROL &= ~CONTROL_M2P_ENABLE;
-+			outl( uiCONTROL, M2P_reg_base+M2P_OFFSET_CONTROL );
-+		}
-+	}
-+
-+	/*
-+	 *  Channel Error Interrupt, or perhipheral interrupt, specific to the
-+	 *  memory to/from peripheral channels.
-+	 */
-+	if (dma_int == CHERROR) {
-+		/*
-+		 *  just clear the interrupt, it's really up to the peripheral
-+		 *  driver to determine if any further action is necessary.
-+		 */
-+		uiINTERRUPT = inl(M2P_reg_base+M2P_OFFSET_INTERRUPT);
-+		uiINTERRUPT &= ~INTERRUPT_M2P_CHERRORINT;
-+		outl( uiINTERRUPT, M2P_reg_base+M2P_OFFSET_INTERRUPT );
-+	}
-+
-+	/*
-+	 *  Make sure the interrupt was valid, and if it was, then check
-+	 *  if a callback function was installed for this DMA channel.  If a
-+	 *  callback was installed call it.
-+	 */
-+	if ((dma_int != UNDEF_INT) && dma->callback)
-+		dma->callback(dma_int, dma->device, dma->user_data);
-+
-+	return IRQ_HANDLED;
-+}
-+
-+/*****************************************************************************
-+ *
-+ * ep9312_dma_open_m2p(int device)
-+ *
-+ * Description: This function will attempt to open a M2P/P2M DMA channel.
-+ *			  If the open is successful, the channel number is returned,
-+ *			  otherwise a negative number is returned.
-+ *
-+ * Parameters:
-+ *  device:	 device for which the dma channel is requested.
-+ *
-+ ****************************************************************************/
-+static int
-+dma_open_m2p(int device)
-+{
-+	int channel = -1;
-+	unsigned int loop;
-+	unsigned int M2P_reg_base;
-+	unsigned int uiPWRCNT;
-+	/*unsigned long flags;*/
-+
-+	DPRINTK("DMA Open M2P with hw dev %d\n", device);
-+
-+	/*
-+	 *  Lock the dma channel list.
-+	 */
-+	//spin_lock_irqsave(&dma_list_lock, flags);
-+	spin_lock(&dma_list_lock);
-+
-+	/*
-+	 * Verify that the device requesting DMA isn't already using a DMA channel
-+	 */
-+	if (device >= 10)
-+		loop = 1;		 // Rx transfer requested
-+	else
-+		loop = 0;		 // Tx transfer requested
-+
-+	for (; loop < 10; loop = loop + 2)
-+		/*
-+		 *  Before checking for a matching device, check that the
-+		 *  channel is in use, otherwise the device field is
-+		 *  invalid.
-+		 */
-+		if (dma_chan[loop].ref_count)
-+			if (device == dma_chan[loop].device) {
-+				DPRINTK("DMA Open M2P - Error\n");
-+				return(-1);
-+			}
-+
-+	/*
-+	 *  Get a DMA channel instance for the given hardware device.
-+	 *  If this is a TX look for even numbered channels, else look for
-+	 *  odd numbered channels
-+	 */
-+	if (device >= 10)
-+		loop = 1;		 /* Rx transfer requested */
-+	else
-+		loop = 0;		 /* Tx transfer requested */
-+
-+	for (; loop < 10; loop = loop + 2)
-+		if (!dma_chan[loop].ref_count) {
-+			/*
-+			 *  Capture the channel and increment the reference count.
-+			 */
-+			channel = loop;
-+			dma_chan[channel].ref_count++;
-+			break;
-+		}
-+
-+	/*
-+	 *  Unlock the dma channel list.
-+	 */
-+	//spin_unlock_irqrestore(&dma_list_lock, flags);
-+	spin_unlock(&dma_list_lock);
-+	/*
-+	 *  See if we got a valid channel.
-+	 */
-+	if (channel < 0)
-+		return(-1);
-+
-+	/*
-+	 *  Point regs to the correct dma channel register base.
-+	 */
-+	M2P_reg_base = dma_chan[channel].reg_base;
-+
-+	/*
-+	 *  Turn on the clock for the specified DMA channel
-+	 *  TODO: need to use the correct register name for the
-+	 *  power control register.
-+	 */
-+	uiPWRCNT = inl(/*SYSCON_PWRCNT*/EP93XX_SYSCON_CLOCK_CONTROL);
-+	switch (channel) {
-+	case 0:
-+		uiPWRCNT |= SYSCON_PWRCNT_DMA_M2PCH0;
-+		break;
-+
-+	case 1:
-+		uiPWRCNT |= SYSCON_PWRCNT_DMA_M2PCH1;
-+		break;
-+
-+	case 2:
-+		uiPWRCNT |= SYSCON_PWRCNT_DMA_M2PCH2;
-+		break;
-+
-+	case 3:
-+		uiPWRCNT |= SYSCON_PWRCNT_DMA_M2PCH3;
-+		break;
-+
-+	case 4:
-+		uiPWRCNT |= SYSCON_PWRCNT_DMA_M2PCH4;
-+		break;
-+
-+	case 5:
-+		uiPWRCNT |= SYSCON_PWRCNT_DMA_M2PCH5;
-+		break;
-+
-+	case 6:
-+		uiPWRCNT |= SYSCON_PWRCNT_DMA_M2PCH6;
-+		break;
-+
-+	case 7:
-+		uiPWRCNT |= SYSCON_PWRCNT_DMA_M2PCH7;
-+		break;
-+
-+	case 8:
-+		uiPWRCNT |= SYSCON_PWRCNT_DMA_M2PCH8;
-+		break;
-+
-+	case 9:
-+		uiPWRCNT |= SYSCON_PWRCNT_DMA_M2PCH9;
-+		break;
-+
-+	default:
-+		return(-1);
-+	}
-+	outl( uiPWRCNT, /*SYSCON_PWRCNT*/EP93XX_SYSCON_CLOCK_CONTROL );
-+
-+	/*
-+	 *  Clear out the control register before any further setup.
-+	 */
-+	outl( 0, M2P_reg_base+M2P_OFFSET_CONTROL );
-+
-+	/*
-+	 *  Setup the peripheral port value in the DMA channel registers.
-+	 */
-+	if (device < 10)
-+		outl( (unsigned int)device, M2P_reg_base+M2P_OFFSET_PPALLOC );
-+	else
-+		outl( (unsigned int)(device - 10), M2P_reg_base+M2P_OFFSET_PPALLOC );
-+
-+	/*
-+	 *  Let's hold on to the value of the Hw device for comparison later.
-+	 */
-+	dma_chan[channel].device = device;
-+
-+	/*
-+	 *  Success.
-+	 */
-+	return(channel);
-+}
-+
-+/*****************************************************************************
-+ *
-+ * dma_open_m2m(int device)
-+ *
-+ * Description: This function will attempt to open a M2M DMA channel.
-+ *			  If the open is successful, the channel number is returned,
-+ *			  otherwise a negative number is returned.
-+ *
-+ * Parameters:
-+ *  device:	 device for which the dma channel is requested.
-+ *
-+ ****************************************************************************/
-+static int
-+dma_open_m2m(int device)
-+{
-+	int channel = -1;
-+	unsigned int loop;
-+	unsigned int M2M_reg_base;
-+	unsigned int uiPWRCNT, uiCONTROL;
-+	/*unsigned long flags;*/
-+
-+	DPRINTK("DMA Open M2M with hw dev %d\n", device);
-+
-+	/*
-+	 *  Lock the dma channel list.
-+	 */
-+	//spin_lock_irqsave(&dma_list_lock, flags);
-+	spin_lock(&dma_list_lock);
-+
-+
-+	/*
-+	 *  Check if this device is already allocated a channel.
-+	 *  TODO: can one M2M device be allocated multiple channels?
-+	 */
-+	for (loop = 10; loop < 12; loop++)
-+		/*
-+		 *  Before checking for a matching device, check that the
-+		 *  channel is in use, otherwise the device field is
-+		 *  invalid.
-+		 */
-+		if (dma_chan[loop].ref_count)
-+			if (device == dma_chan[loop].device) {
-+				DPRINTK("Error - dma_open_m2m - already allocated channel\n");
-+
-+				/*
-+				 *  Unlock the dma channel list.
-+				 */
-+				//spin_unlock_irqrestore(&dma_list_lock, flags);
-+				spin_unlock(&dma_list_lock);
-+				/*
-+				 *  Fail.
-+				 */
-+				return(-1);
-+			}
-+
-+	/*
-+	 *  Get a DMA channel instance for the given hardware device.
-+	 */
-+	for (loop = 10; loop < 12; loop++)
-+		if (!dma_chan[loop].ref_count) {
-+			/*
-+			 *  Capture the channel and increment the reference count.
-+			 */
-+			channel = loop;
-+			dma_chan[channel].ref_count++;
-+			break;
-+		}
-+
-+	/*
-+	 *  Unlock the dma channel list.
-+	 */
-+	//spin_unlock(dma_list_lock);
-+	spin_unlock(&dma_list_lock);
-+	//spin_unlock_irqrestore(&dma_list_lock, flags);
-+
-+	/*
-+	 *  See if we got a valid channel.
-+	 */
-+	if (channel < 0)
-+		return(-1);
-+
-+	/*
-+	 *  Point regs to the correct dma channel register base.
-+	 */
-+	M2M_reg_base = dma_chan[channel].reg_base;
-+
-+	/*
-+	 *  Turn on the clock for the specified DMA channel
-+	 *  TODO: need to use the correct register name for the
-+	 *  power control register.
-+	 */
-+	uiPWRCNT = inl(/*SYSCON_PWRCNT*/EP93XX_SYSCON_CLOCK_CONTROL);
-+	switch (channel) {
-+	case 10:
-+		uiPWRCNT |= SYSCON_PWRCNT_DMA_M2MCH0;
-+		break;
-+
-+	case 11:
-+		uiPWRCNT |= SYSCON_PWRCNT_DMA_M2MCH1;
-+		break;
-+
-+	default:
-+		return(-1);
-+	}
-+	outl( uiPWRCNT, /*SYSCON_PWRCNT*/EP93XX_SYSCON_CLOCK_CONTROL);
-+
-+	DPRINTK("DMA Open - power control: 0x%x \n", inl(SYSCON_PWRCNT) );
-+
-+	/*
-+	 *  Clear out the control register before any further setup.
-+	 */
-+	outl( 0, M2M_reg_base+M2M_OFFSET_CONTROL );
-+
-+	/*
-+	 *  Setup the transfer mode and the request source selection within
-+	 *  the DMA M2M channel registers.
-+	 */
-+	switch (device) {
-+	case DMA_MEMORY:
-+		/*
-+		 * Clear TM field, set RSS field to 0
-+		 */
-+		uiCONTROL = inl(M2M_reg_base+M2M_OFFSET_CONTROL);
-+		uiCONTROL &= ~(CONTROL_M2M_TM_MASK | CONTROL_M2M_RSS_MASK);
-+		outl( uiCONTROL, M2M_reg_base+M2M_OFFSET_CONTROL );
-+		break;
-+
-+	case DMA_IDE:
-+		/*
-+		 * Set RSS field to 3, Set NO_HDSK, Set PW field to 1
-+		 */
-+		uiCONTROL = inl(M2M_reg_base+M2M_OFFSET_CONTROL);
-+		uiCONTROL &= ~(CONTROL_M2M_RSS_MASK|CONTROL_M2M_PW_MASK);
-+		uiCONTROL |= (3<<CONTROL_M2M_RSS_SHIFT) |
-+			CONTROL_M2M_NO_HDSK |
-+			(2<<CONTROL_M2M_PW_SHIFT);
-+
-+		uiCONTROL &= ~(CONTROL_M2M_ETDP_MASK);
-+		uiCONTROL &= ~(CONTROL_M2M_DACKP);
-+		uiCONTROL &= ~(CONTROL_M2M_DREQP_MASK);
-+
-+		outl( uiCONTROL, M2M_reg_base+M2M_OFFSET_CONTROL );
-+		inl(M2M_reg_base+M2M_OFFSET_CONTROL);
-+		break;
-+
-+	case DMARx_SSP:
-+		/*
-+		 * Set RSS field to 1, Set NO_HDSK, Set TM field to 2
-+		 */
-+		uiCONTROL = inl(M2M_reg_base+M2M_OFFSET_CONTROL);
-+		uiCONTROL &= ~(CONTROL_M2M_RSS_MASK|CONTROL_M2M_TM_MASK);
-+		uiCONTROL |= (1<<CONTROL_M2M_RSS_SHIFT) |
-+			CONTROL_M2M_NO_HDSK |
-+			(2<<CONTROL_M2M_TM_SHIFT);
-+		outl( uiCONTROL, M2M_reg_base+M2M_OFFSET_CONTROL );
-+		break;
-+
-+	case DMATx_SSP:
-+		/*
-+		 * Set RSS field to 2, Set NO_HDSK, Set TM field to 1
-+		 */
-+		uiCONTROL = inl(M2M_reg_base+M2M_OFFSET_CONTROL);
-+		uiCONTROL &= ~(CONTROL_M2M_RSS_MASK|CONTROL_M2M_TM_MASK);
-+		uiCONTROL |= (2<<CONTROL_M2M_RSS_SHIFT) |
-+			CONTROL_M2M_NO_HDSK |
-+			(1<<CONTROL_M2M_TM_SHIFT);
-+		outl( uiCONTROL, M2M_reg_base+M2M_OFFSET_CONTROL );
-+		break;
-+
-+	case DMATx_EXT_DREQ:
-+		/*
-+		 * Set TM field to 2, set RSS field to 0
-+		 */
-+		uiCONTROL = inl(M2M_reg_base+M2M_OFFSET_CONTROL);
-+		uiCONTROL &= ~(CONTROL_M2M_RSS_MASK|CONTROL_M2M_TM_MASK);
-+		uiCONTROL |= 1<<CONTROL_M2M_TM_SHIFT;
-+		outl( uiCONTROL, M2M_reg_base+M2M_OFFSET_CONTROL );
-+		break;
-+
-+	case DMARx_EXT_DREQ:
-+		/*
-+		 * Set TM field to 2, set RSS field to 0
-+		 */
-+		uiCONTROL = inl(M2M_reg_base+M2M_OFFSET_CONTROL);
-+		uiCONTROL &= ~(CONTROL_M2M_RSS_MASK|CONTROL_M2M_TM_MASK);
-+		uiCONTROL |= 2<<CONTROL_M2M_TM_SHIFT;
-+		outl( uiCONTROL, M2M_reg_base+M2M_OFFSET_CONTROL );
-+		break;
-+
-+	default:
-+		return -1;
-+	}
-+
-+	/*
-+	 *  Let's hold on to the value of the Hw device for comparison later.
-+	 */
-+	dma_chan[channel].device = device;
-+
-+	/*
-+	 *  Success.
-+	 */
-+	return(channel);
-+}
-+
-+/*****************************************************************************
-+ *
-+ *  int dma_config_m2m(ep93xx_dma_t * dma, unsigned int flags_m2m,
-+ *			   dma_callback callback, unsigned int user_data)
-+ *
-+ *  Description: Configure the DMA channel and install a callback function.
-+ *			   This function will have to be called for every transfer
-+ *
-+ *  dma:		Pointer to the dma instance data for the M2M channel to
-+ *			  configure.
-+ *  flags_m2m   Flags used to configure an M2M dma channel and determine
-+ *			  if a callback function and user_data information are included
-+ *			  in this call.
-+ *  callback	function pointer which is called near the end of the
-+ *			  dma channel's irq handler.
-+ *  user_data   defined by the calling driver.
-+ *
-+ ****************************************************************************/
-+static int
-+dma_config_m2m(ep93xx_dma_t * dma, unsigned int flags_m2m,
-+			   dma_callback callback, unsigned int user_data)
-+{
-+	unsigned long flags;
-+	unsigned int M2M_reg_base, uiCONTROL;
-+
-+	/*
-+	 *  Make sure the channel is disabled before configuring the channel.
-+	 *
-+	 *  TODO: Is this correct??   Making a big change here...
-+	 */
-+	/* if (!dma->pause || (!dma->pause && dma->xfer_enable)) */
-+	if (dma->xfer_enable) {
-+		/*
-+		 *  DMA channel is not paused, so we can't configure it.
-+		 */
-+		DPRINTK("DMA channel not paused, so can't configure! \n");
-+		return(-1);
-+	}
-+
-+	/*
-+	 *  Mask interrupts.
-+	 */
-+	local_irq_save(flags);
-+
-+	/*
-+	 *  Setup a pointer into the dma channel's register set.
-+	 */
-+	M2M_reg_base = dma->reg_base;
-+
-+	uiCONTROL = inl(M2M_reg_base + M2M_OFFSET_CONTROL);
-+	outl(0, M2M_reg_base + M2M_OFFSET_CONTROL);
-+	inl(M2M_reg_base + M2M_OFFSET_CONTROL);
-+	outl(uiCONTROL, M2M_reg_base + M2M_OFFSET_CONTROL);
-+
-+	/*
-+	 *  By default we disable the stall interrupt.
-+	 */
-+	uiCONTROL = inl(M2M_reg_base+M2M_OFFSET_CONTROL);
-+	uiCONTROL &= ~CONTROL_M2M_STALLINTEN;
-+	outl( uiCONTROL, M2M_reg_base+M2M_OFFSET_CONTROL );
-+
-+	/*
-+	 *  By default we disable the done interrupt.
-+	 */
-+	uiCONTROL = inl(M2M_reg_base+M2M_OFFSET_CONTROL);
-+	uiCONTROL &= ~CONTROL_M2M_DONEINTEN;
-+	outl( uiCONTROL, M2M_reg_base+M2M_OFFSET_CONTROL );
-+
-+	/*
-+	 *  Set up the transfer control fields based on values passed in
-+	 *  the flags_m2m field.
-+	 */
-+	uiCONTROL = inl(M2M_reg_base+M2M_OFFSET_CONTROL);
-+
-+	if ( flags_m2m & DESTINATION_HOLD )
-+		uiCONTROL |= CONTROL_M2M_DAH;
-+	else
-+		uiCONTROL &= ~CONTROL_M2M_DAH;
-+
-+	if ( flags_m2m & SOURCE_HOLD )
-+		uiCONTROL |= CONTROL_M2M_SAH;
-+	else
-+		uiCONTROL &= ~CONTROL_M2M_SAH;
-+
-+	uiCONTROL &= ~CONTROL_M2M_TM_MASK;
-+	uiCONTROL |= (((flags_m2m & TRANSFER_MODE_MASK) >> TRANSFER_MODE_SHIFT) <<
-+				  CONTROL_M2M_TM_SHIFT) & CONTROL_M2M_TM_MASK;
-+
-+	uiCONTROL &= ~CONTROL_M2M_PWSC_MASK;
-+	uiCONTROL |= (((flags_m2m & WAIT_STATES_MASK) >> WAIT_STATES_SHIFT) <<
-+				  CONTROL_M2M_PWSC_SHIFT) & CONTROL_M2M_PWSC_MASK;
-+
-+	outl( uiCONTROL, M2M_reg_base+M2M_OFFSET_CONTROL );
-+	inl(M2M_reg_base + M2M_OFFSET_CONTROL);
-+
-+	/*
-+	 *  Save the callback function in the dma instance for this channel.
-+	 */
-+	dma->callback = callback;
-+
-+	/*
-+	 *  Save the user data in the the dma instance for this channel.
-+	 */
-+	dma->user_data = user_data;
-+
-+	/*
-+	 *  Put the dma instance into the pause state by setting the
-+	 *  pause bit to true.
-+	 */
-+	dma->pause = TRUE;
-+
-+	local_irq_restore(flags);
-+
-+	/*
-+	 *  Success.
-+	 */
-+	return(0);
-+}
-+
-+/*****************************************************************************
-+ *
-+ *  int dma_start(int handle, unsigned int channels, unsigned int * handles)
-+ *
-+ *  Description: Initiate a transfer on up to 3 channels.
-+ *
-+ *  handle:	 handle for the channel to initiate transfer on.
-+ *  channels:   number of channels to initiate transfers on.
-+ *  handles:	pointer to an array of handles, one for each channel which
-+ *			   is to be started.
-+ *
-+ ****************************************************************************/
-+static int
-+dma_start_m2m(int channel, ep93xx_dma_t * dma)
-+{
-+	unsigned long flags;
-+	unsigned int M2M_reg_base = dma->reg_base;
-+	unsigned int uiCONTROL;
-+
-+	/*
-+	 *  Mask interrupts while we get this started.
-+	 */
-+	local_irq_save(flags);
-+
-+	/*
-+	 *  Make sure the channel has at least one buffer in the queue.
-+	 */
-+	if (dma->new_buffers < 1) {
-+		/*
-+		 *  Unmask irqs
-+		 */
-+		local_irq_restore(flags);
-+
-+		DPRINTK("DMA Start: Channel starved.\n");
-+
-+		/*
-+		 *  This channel does not have enough buffers queued up,
-+		 *  so enter the pause by starvation state.
-+		 */
-+		dma->xfer_enable = TRUE;
-+		dma->pause = TRUE;
-+
-+		/*
-+		 *  Success.
-+		 */
-+		return(0);
-+	}
-+
-+	/*
-+	 *  Clear any pending interrupts.
-+	 */
-+	outl(0x0, M2M_reg_base+M2M_OFFSET_INTERRUPT);
-+
-+	/*
-+	 *  Set up one or both buffer descriptors with values from the next one or
-+	 *  two buffers in the queue.  By default disable the next frame buffer
-+	 *  interrupt on the channel.
-+	 */
-+	uiCONTROL = inl(M2M_reg_base+M2M_OFFSET_CONTROL);
-+	uiCONTROL &= ~CONTROL_M2M_NFBINTEN;
-+	outl( uiCONTROL, M2M_reg_base+M2M_OFFSET_CONTROL );
-+
-+	/*
-+	 * enable the done interrupt.
-+	 */
-+	uiCONTROL = inl(M2M_reg_base+M2M_OFFSET_CONTROL);
-+	uiCONTROL |= CONTROL_M2M_DONEINTEN;
-+	outl( uiCONTROL, M2M_reg_base+M2M_OFFSET_CONTROL );
-+
-+	/*
-+	 *  Update the dma channel instance transfer state.
-+	 */
-+	dma->xfer_enable = TRUE;
-+	dma->pause = FALSE;
-+
-+	/*
-+	 *  Program up the first buffer descriptor with a source and destination
-+	 *  and a byte count.
-+	 */
-+	outl( dma->buffer_queue[dma->current_buffer].source,
-+	      M2M_reg_base+M2M_OFFSET_SAR_BASE0 );
-+
-+	outl( dma->buffer_queue[dma->current_buffer].dest,
-+	      M2M_reg_base+M2M_OFFSET_DAR_BASE0 );
-+
-+	outl( dma->buffer_queue[dma->current_buffer].size,
-+	      M2M_reg_base+M2M_OFFSET_BCR0 );
-+
-+	/*
-+	 *  Decrement the new buffers counter.
-+	 */
-+	dma->new_buffers--;
-+
-+	/*
-+	 * Set up the second buffer descriptor with a second buffer if we have
-+	 * a second buffer.
-+	 */
-+	if (dma->new_buffers) {
-+		outl( dma->buffer_queue[(dma->current_buffer + 1) %
-+					MAX_EP93XX_DMA_BUFFERS].source,
-+		      M2M_reg_base+M2M_OFFSET_SAR_BASE1 );
-+
-+		outl( dma->buffer_queue[(dma->current_buffer + 1) %
-+					MAX_EP93XX_DMA_BUFFERS].dest,
-+		      M2M_reg_base+M2M_OFFSET_DAR_BASE1 );
-+
-+		outl( dma->buffer_queue[(dma->current_buffer + 1) %
-+					MAX_EP93XX_DMA_BUFFERS].size,
-+		      M2M_reg_base+M2M_OFFSET_BCR1 );
-+
-+		uiCONTROL = inl(M2M_reg_base+M2M_OFFSET_CONTROL);
-+		uiCONTROL |= CONTROL_M2M_NFBINTEN;
-+		outl( uiCONTROL, M2M_reg_base+M2M_OFFSET_CONTROL );
-+
-+		dma->new_buffers--;
-+	}
-+
-+	/*
-+	 *  Now we enable the channel.  This initiates the transfer.
-+	 */
-+	uiCONTROL = inl(M2M_reg_base+M2M_OFFSET_CONTROL);
-+	uiCONTROL |= CONTROL_M2M_ENABLE;
-+	outl( uiCONTROL, M2M_reg_base+M2M_OFFSET_CONTROL );
-+	inl(M2M_reg_base + M2M_OFFSET_CONTROL);
-+
-+	/*
-+	 *  If this is a memory to memory transfer, we need to s/w trigger the
-+	 *  transfer by setting the start bit within the control register.
-+	 */
-+	if (dma->device == DMA_MEMORY) {
-+		uiCONTROL = inl(M2M_reg_base+M2M_OFFSET_CONTROL);
-+		uiCONTROL |= CONTROL_M2M_START;
-+		outl( uiCONTROL, M2M_reg_base+M2M_OFFSET_CONTROL );
-+	}
-+
-+	DPRINTK("DMA - It's been started!!");
-+	DPRINTK("CONTROL - 0x%x \n",	inl(M2M_reg_base+M2M_OFFSET_CONTROL) );
-+	DPRINTK("STATUS - 0x%x \n",	 inl(M2M_reg_base+M2M_OFFSET_STATUS) );
-+	DPRINTK("BCR0 - 0x%x \n",	   dma->buffer_queue[dma->current_buffer].size);
-+	DPRINTK("SAR_BASE0 - 0x%x \n",  inl(M2M_reg_base+M2M_OFFSET_SAR_BASE0) );
-+	DPRINTK("SAR_CUR0 - 0x%x \n",   inl(M2M_reg_base+M2M_OFFSET_SAR_CURRENT0) );
-+	DPRINTK("DAR_BASE0 - 0x%x \n",  inl(M2M_reg_base+M2M_OFFSET_DAR_BASE0) );
-+	DPRINTK("DAR_CUR0 - 0x%x \n",   inl(M2M_reg_base+M2M_OFFSET_DAR_CURRENT0) );
-+
-+	/*
-+	 *  Unmask irqs
-+	 */
-+	local_irq_restore(flags);
-+
-+	/*
-+	 *  Success.
-+	 */
-+	return(0);
-+}
-+
-+/*****************************************************************************
-+ *
-+ *  DMA interface functions
-+ *
-+ ****************************************************************************/
-+
-+/*****************************************************************************
-+ *
-+ *  int dma_init(int handle, unsigned int flags_m2p, unsigned int flags_m2m,
-+ *			   dma_callback callback, unsigned int user_data)
-+ *
-+ *  Description: Configure the DMA channel and install a callback function.
-+ *
-+ *  handle:	 Handle unique the each instance of the dma interface, used
-+ *			  to verify this call.
-+ *  flags_m2p   Flags used to configure an M2P/P2M dma channel and determine
-+ *			  if a callback function and user_data information are included
-+ *			  in this call. This field should be NULL if handle represents
-+ *			  an M2M channel.
-+ *  flags_m2m   Flags used to configure an M2M dma channel and determine
-+ *			  if a callback function and user_data information are included
-+ *			  in this call. This field should be NULL if handle represents
-+ *			  an M2P/P2M channel.
-+ *  callback	function pointer which is called near the end of the
-+ *			  dma channel's irq handler.
-+ *  user_data   defined by the calling driver.
-+ *
-+ ****************************************************************************/
-+int
-+ep93xx_dma_config(int handle, unsigned int flags_m2p, unsigned int flags_m2m,
-+		  dma_callback callback, unsigned int user_data)
-+{
-+	int  channel;
-+	ep93xx_dma_t * dma;
-+	unsigned long flags;
-+	unsigned int M2P_reg_base, uiCONTROL;
-+
-+	/*
-+	 *  Get the DMA hw channel # from the handle.
-+	 */
-+	channel = dma_get_channel_from_handle(handle);
-+
-+	/*
-+	 *  See if this is a valid handle.
-+	 */
-+	if (channel < 0) {
-+		printk(KERN_ERR
-+			   "DMA Config: Invalid dma handle.\n");
-+		return(-EINVAL);
-+	}
-+
-+	DPRINTK("DMA Config \n");
-+
-+	dma = &dma_chan[channel];
-+
-+	local_irq_save(flags);
-+
-+	/*
-+	 *  Check if the channel is currently transferring.
-+	 */
-+	if (dma->xfer_enable) {
-+		local_irq_restore(flags);
-+		return(-EINVAL);
-+	}
-+
-+	/*
-+	 *  Check if this is an m2m function.
-+	 */
-+	if (channel >= 10) {
-+		local_irq_restore(flags);
-+
-+		/*
-+		 *  Call another function to handle m2m config.
-+		 */
-+		return(dma_config_m2m(dma, flags_m2m, callback, user_data));
-+	}
-+
-+	/*
-+	 *  Setup a pointer into the dma channel's register set.
-+	 */
-+	M2P_reg_base = dma->reg_base;
-+
-+	/*
-+	 *  By default we enable the stall interrupt.
-+	 */
-+	uiCONTROL = inl(M2P_reg_base+M2P_OFFSET_CONTROL);
-+	uiCONTROL |= CONTROL_M2P_STALLINTEN;
-+	outl( uiCONTROL, M2P_reg_base+M2P_OFFSET_CONTROL );
-+
-+	/*
-+	 *  Configure the channel for an error from the peripheral.
-+	 */
-+	uiCONTROL = inl(M2P_reg_base+M2P_OFFSET_CONTROL);
-+	if ( flags_m2p && CHANNEL_ERROR_INT_ENABLE )
-+		uiCONTROL |= CONTROL_M2P_CHERRORINTEN;
-+	else
-+		uiCONTROL &= ~CONTROL_M2P_CHERRORINTEN;
-+	outl( uiCONTROL, M2P_reg_base+M2P_OFFSET_CONTROL );
-+
-+	uiCONTROL = inl(M2P_reg_base+M2P_OFFSET_CONTROL);
-+	if ( flags_m2p && CHANNEL_ABORT )
-+		uiCONTROL |= CONTROL_M2P_ABRT;
-+	else
-+		uiCONTROL &= ~CONTROL_M2P_ABRT;
-+	outl( uiCONTROL, M2P_reg_base+M2P_OFFSET_CONTROL );
-+
-+	uiCONTROL = inl(M2P_reg_base+M2P_OFFSET_CONTROL);
-+	if ( flags_m2p && IGNORE_CHANNEL_ERROR )
-+		uiCONTROL |= CONTROL_M2P_ICE;
-+	else
-+		uiCONTROL &= ~CONTROL_M2P_ICE;
-+	outl( uiCONTROL, M2P_reg_base+M2P_OFFSET_CONTROL );
-+
-+	/*
-+	 *  Save the callback function in the dma instance for this channel.
-+	 */
-+	dma->callback = callback;
-+
-+	/*
-+	 *  Save the user data in the the dma instance for this channel.
-+	 */
-+	dma->user_data = user_data;
-+
-+	/*
-+	 *  Put the dma instance into the pause state by setting the
-+	 *  pause bit to true.
-+	 */
-+	dma->pause = TRUE;
-+
-+	local_irq_restore(flags);
-+
-+	/*
-+	 *  Success.
-+	 */
-+	return(0);
-+}
-+
-+/*****************************************************************************
-+ *
-+ *  int dma_start(int handle, unsigned int channels, unsigned int * handles)
-+ *
-+ *  Description: Initiate a transfer on up to 3 channels.
-+ *
-+ *  handle:	 handle for the channel to initiate transfer on.
-+ *  channels:   number of channels to initiate transfers on.
-+ *  handles:	pointer to an array of handles, one for each channel which
-+ *			   is to be started.
-+ *
-+ ****************************************************************************/
-+int
-+ep93xx_dma_start(int handle, unsigned int channels, unsigned int * handles)
-+{
-+	ep93xx_dma_t * dma_pointers[3];
-+	unsigned int M2P_reg_bases[3];
-+	unsigned int loop, uiCONTROL;
-+	unsigned long flags;
-+	int  channel;
-+
-+	/*
-+	 *  Get the DMA hw channel # from the handle.
-+	 */
-+	channel = dma_get_channel_from_handle(handle);
-+
-+	/*
-+	 *  See if this is a valid handle.
-+	 */
-+	if (channel < 0) {
-+		printk(KERN_ERR "DMA Start: Invalid dma handle.\n");
-+		return(-EINVAL);
-+	}
-+
-+	if (channels < 1) {
-+		printk(KERN_ERR "DMA Start: Invalid parameter.\n");
-+		return(-EINVAL);
-+	}
-+
-+	DPRINTK("DMA Start \n");
-+
-+	/*
-+	 *  Mask off registers.
-+	 */
-+	local_irq_save(flags);
-+
-+	/*
-+	 *  Check if this is a start multiple.
-+	 */
-+	if (channels > 1) {
-+		DPRINTK("DMA ERROR: Start, multiple start not supported yet \n");
-+		return(-1);
-+	} else {
-+		/*
-+		 *  Check if this channel is already transferring.
-+		 */
-+		if (dma_chan[channel].xfer_enable && !dma_chan[channel].pause) {
-+			printk(KERN_ERR
-+				   "DMA Start: Invalid command for channel %d.\n", channel);
-+
-+			/*
-+			 *  Unmask irqs
-+			 */
-+			local_irq_restore(flags);
-+
-+			/*
-+			 *  This channel is already transferring, so return an error.
-+			 */
-+			return(-EINVAL);
-+		}
-+
-+		/*
-+		 *  If this is an M2M channel, call a different function.
-+		 */
-+		if (channel >= 10) {
-+			/*
-+			 *  Unmask irqs
-+			 */
-+			local_irq_restore(flags);
-+
-+			/*
-+			 *  Call the m2m start function.  Only start one channel.
-+			 */
-+			return(dma_start_m2m(channel, &dma_chan[channel]));
-+		}
-+
-+		/*
-+		 *  Make sure the channel has at least one buffer in the queue.
-+		 */
-+		if (dma_chan[channel].new_buffers < 1) {
-+			DPRINTK("DMA Start: Channel starved.\n");
-+
-+			/*
-+			 *  This channel does not have enough buffers queued up,
-+			 *  so enter the pause by starvation state.
-+			 */
-+			dma_chan[channel].xfer_enable = TRUE;
-+			dma_chan[channel].pause = TRUE;
-+
-+			/*
-+			 *  Unmask irqs
-+			 */
-+			local_irq_restore(flags);
-+
-+			/*
-+			 *  Success.
-+			 */
-+			return(0);
-+		}
-+
-+		/*
-+		 *  Set up a dma instance pointer for this dma channel.
-+		 */
-+		dma_pointers[0] = &dma_chan[channel];
-+
-+		/*
-+		 * Set up a pointer to the register set for this channel.
-+		 */
-+		M2P_reg_bases[0] = dma_pointers[0]->reg_base;
-+	}
-+
-+	/*
-+	 *  Setup both MAXCNT registers with values from the next two buffers
-+	 *  in the queue, and enable the next frame buffer interrupt on the channel.
-+	 */
-+	for (loop = 0; loop < channels; loop++) {
-+		/*
-+		 *  Check if we need to restore a paused transfer.
-+		 */
-+		if (dma_pointers[loop]->pause_buf.buf_id != -1)
-+			outl( dma_pointers[loop]->pause_buf.size,
-+			      M2P_reg_bases[loop]+M2P_OFFSET_MAXCNT0 );
-+		else
-+			outl( dma_pointers[loop]->buffer_queue[dma_pointers[loop]->current_buffer].size,
-+			      M2P_reg_bases[loop]+M2P_OFFSET_MAXCNT0 );
-+	}
-+
-+	for (loop = 0; loop < channels; loop++) {
-+		/*
-+		 *  Enable the specified dma channels.
-+		 */
-+		uiCONTROL = inl(M2P_reg_bases[loop]+M2P_OFFSET_CONTROL);
-+		uiCONTROL |= CONTROL_M2P_ENABLE;
-+		outl( uiCONTROL, M2P_reg_bases[loop]+M2P_OFFSET_CONTROL );
-+
-+		/*
-+		 *  Update the dma channel instance transfer state.
-+		 */
-+		dma_pointers[loop]->xfer_enable = TRUE;
-+		dma_pointers[loop]->pause = FALSE;
-+	}
-+
-+	/*
-+	 *  Program up the BASE0 registers for all specified channels, this
-+	 *  will initiate transfers on all specified channels.
-+	 */
-+	for (loop = 0; loop < channels; loop++)
-+		/*
-+		 *  Check if we need to restore a paused transfer.
-+		 */
-+		if (dma_pointers[loop]->pause_buf.buf_id != -1) {
-+			outl( dma_pointers[loop]->pause_buf.source,
-+			      M2P_reg_bases[loop]+M2P_OFFSET_BASE0 );
-+
-+			/*
-+			 *  Set the pause buffer to NULL
-+			 */
-+			dma_pointers[loop]->pause_buf.buf_id = -1;
-+			dma_pointers[loop]->pause_buf.size = 0;
-+		} else if(dma_pointers[loop]->new_buffers){
-+			outl( dma_pointers[loop]->buffer_queue[
-+				  dma_pointers[loop]->current_buffer].source,
-+			      M2P_reg_bases[loop]+M2P_OFFSET_BASE0 );
-+            dma_pointers[loop]->new_buffers--;
-+
-+          }
-+
-+	/*
-+	 *  Before restoring irqs setup the second MAXCNT/BASE
-+	 *  register with a second buffer.
-+	 */
-+	for (loop = 0; loop < channels; loop++)
-+		if (dma_pointers[loop]->new_buffers) {
-+        	/*
-+        	 *  By default we enable the next frame buffer interrupt.
-+        	 */
-+        	uiCONTROL = inl(M2P_reg_bases[loop]+M2P_OFFSET_CONTROL);
-+        	uiCONTROL |= CONTROL_M2P_NFBINTEN;
-+        	outl( uiCONTROL, M2P_reg_bases[loop]+M2P_OFFSET_CONTROL );
-+
-+			outl( dma_pointers[loop]->buffer_queue[
-+				  (dma_pointers[loop]->current_buffer + 1) %
-+				  MAX_EP93XX_DMA_BUFFERS].size,
-+			      M2P_reg_bases[loop]+M2P_OFFSET_MAXCNT1 );
-+
-+			outl( dma_pointers[loop]->buffer_queue[
-+				  (dma_pointers[loop]->current_buffer + 1) %
-+				  MAX_EP93XX_DMA_BUFFERS].source,
-+			      M2P_reg_bases[loop]+M2P_OFFSET_BASE1 );
-+            dma_pointers[loop]->new_buffers--;
-+		}
-+
-+	/*
-+	  DPRINTK("DMA - It's been started!!");
-+	  DPRINTK("STATUS - 0x%x \n",	 inl(M2P_reg_base+M2P_OFFSET_STATUS) );
-+	  DPRINTK("CONTROL - 0x%x \n",	inl(M2P_reg_base+M2P_OFFSET_CONTROL) );
-+	  DPRINTK("REMAIN - 0x%x \n",	 inl(M2P_reg_base+M2P_OFFSET_REMAIN) );
-+	  DPRINTK("PPALLOC - 0x%x \n",	inl(M2P_reg_base+M2P_OFFSET_PPALLOC) );
-+	  DPRINTK("BASE0 - 0x%x \n",	  inl(M2P_reg_base+M2P_OFFSET_BASE0) );
-+	  DPRINTK("MAXCNT0 - 0x%x \n",	inl(M2P_reg_base+M2P_OFFSET_MAXCNT0) );
-+	  DPRINTK("CURRENT0 - 0x%x \n",   inl(M2P_reg_base+M2P_OFFSET_CURRENT0) );
-+	  DPRINTK("BASE1 - 0x%x \n",	  inl(M2P_reg_base+M2P_OFFSET_BASE1) );
-+	  DPRINTK("MAXCNT1 - 0x%x \n",	inl(M2P_reg_base+M2P_OFFSET_MAXCNT1) );
-+	  DPRINTK("CURRENT1 - 0x%x \n",   inl(M2P_reg_base+M2P_OFFSET_CURRENT1) );
-+
-+	  DPRINTK("Pause - %d \n", dma_pointers[0]->pause);
-+	  DPRINTK("xfer_enable - %d \n", dma_pointers[0]->xfer_enable);
-+	  DPRINTK("total bytes - 0x%x \n", dma_pointers[0]->total_bytes);
-+	  DPRINTK("total buffer - %d \n", dma_pointers[0]->total_buffers);
-+	  DPRINTK("new buffers - %d \n", dma_pointers[0]->new_buffers);
-+	  DPRINTK("current buffer - %d \n", dma_pointers[0]->current_buffer);
-+	  DPRINTK("last buffer - %d \n", dma_pointers[0]->last_buffer);
-+	  DPRINTK("used buffers - %d \n", dma_pointers[0]->used_buffers);
-+	*/
-+	/*
-+	 *  Unmask irqs
-+	 */
-+	local_irq_restore(flags);
-+
-+	/*
-+	 *  Success.
-+	 */
-+	return(0);
-+}
-+
-+/*****************************************************************************
-+ *
-+ *  int ep93xx_dma_add_buffer(int handle, unsigned int * address,
-+ *						 unsigned int size, unsigned int last)
-+ *
-+ *  Description: Add a buffer entry to the DMA buffer queue.
-+ *
-+ *  handle:	 handle for the channel to add this buffer to.
-+ *  address:	Pointer to an integer which is the start address of the
-+ *			  buffer which is to be added to the queue.
-+ *  size:	   size of the buffer in bytes.
-+ *  last:	   1 if this is the last buffer in this stream, 0 otherwise.
-+ *
-+ ****************************************************************************/
-+int
-+ep93xx_dma_add_buffer(int handle, unsigned int source, unsigned int dest,
-+		      unsigned int size, unsigned int last,
-+		      unsigned int buf_id)
-+{
-+	unsigned long flags;
-+	ep93xx_dma_t * dma;
-+	int  channel;
-+#if 0
-+	static int peak_total_buffers=0;
-+#endif
-+	/*
-+	 *  Get the DMA hw channel # from the handle.
-+	 */
-+	channel = dma_get_channel_from_handle(handle);
-+
-+	/*
-+	 *  See if this is a valid handle.
-+	 */
-+	if (channel < 0) {
-+		printk(KERN_ERR
-+			   "DMA Add Buffer: Invalid dma handle.\n");
-+		return(-EINVAL);
-+	}
-+
-+	/*
-+	 *  Get a pointer to the dma instance.
-+	 */
-+	dma = &dma_chan[channel];
-+
-+#if 0
-+	if( dma->total_buffers > peak_total_buffers )
-+	{
-+	    peak_total_buffers=dma->total_buffers;
-+	    printk("peak_total_buffers=%d\n", peak_total_buffers );
-+	}
-+#endif
-+	/*
-+	 *  Mask interrupts and hold on to the original state.
-+	 */
-+	local_irq_save(flags);
-+
-+	/*
-+	 *  If the buffer queue is full, last_buffer is the same as current_buffer and
-+	 *  we're not tranfering, or last_buffer is pointing to a used buffer, then exit.
-+	 *  TODO: do I need to do any more checks?
-+	 */
-+	if (dma->total_buffers >= MAX_EP93XX_DMA_BUFFERS)
-+	{
-+		DPRINTK("too many dma buffers: MAX_EP93XX_DMA_BUFFERS set to low ?\n");
-+		/*
-+		 *  Restore the state of the irqs
-+		 */
-+		local_irq_restore(flags);
-+
-+		/*
-+		 *  Fail.
-+		 */
-+		return(-1);
-+	}
-+
-+	/*
-+	 *  Add this buffer to the queue
-+	 */
-+	dma->buffer_queue[dma->last_buffer].source = source;
-+	dma->buffer_queue[dma->last_buffer].dest = dest;
-+	dma->buffer_queue[dma->last_buffer].size = size;
-+	dma->buffer_queue[dma->last_buffer].last = last;
-+	dma->buffer_queue[dma->last_buffer].buf_id = buf_id;
-+
-+	/*
-+	 *  Reset the used field of the buffer structure.
-+	 */
-+	dma->buffer_queue[dma->last_buffer].used = FALSE;
-+
-+	/*
-+	 *  Increment the End Item Pointer.
-+	 */
-+	dma->last_buffer = (dma->last_buffer + 1) % MAX_EP93XX_DMA_BUFFERS;
-+
-+	/*
-+	 *  Increment the new buffers counter and the total buffers counter
-+	 */
-+	dma->new_buffers++;
-+	dma->total_buffers++;
-+
-+	/*
-+	 *  restore the interrupt state.
-+	 */
-+	local_irq_restore(flags);
-+
-+	/*
-+	 *  Check if the channel was starved into a stopped state.
-+	 */
-+	if (dma->pause && dma->xfer_enable) {
-+		if (dma->new_buffers >= 1) {
-+			DPRINTK("DMA - calling start from add after starve. \n");
-+
-+			/*
-+			 *  The channel was starved into a stopped state, and we've got
-+			 *  2 new buffers, so start tranferring again.
-+			 */
-+			ep93xx_dma_start(handle, 1, 0);
-+		}
-+	}
-+
-+	/*
-+	 *  Success.
-+	 */
-+	return(0);
-+}
-+
-+/*****************************************************************************
-+ *
-+ *  int ep93xx_dma_remove_buffer(int handle, unsigned int * address,
-+ *								unsigned int * size)
-+ *
-+ *  Description: Remove a buffer entry from the DMA buffer queue. If
-+ *			   buffer was removed successfully, return 0, otherwise
-+ *			   return -1.
-+ *
-+ *  handle:	 handle for the channel to remove a buffer from.
-+ *  address:	Pointer to an integer which is filled in with the start
-+ *			  address of the removed buffer.
-+ *  size:	   Pointer to an integer which is filled in with the size in
-+ *			  bytes of the removed buffer.
-+ *
-+ ****************************************************************************/
-+int
-+ep93xx_dma_remove_buffer(int handle, unsigned int * buf_id)
-+{
-+	unsigned int test;
-+	unsigned int loop;
-+	int return_val = -1;
-+	unsigned long flags;
-+	ep93xx_dma_t *dma;
-+	int  channel;
-+
-+	/*
-+	 *  Get the DMA hw channel # from the handle.
-+	 */
-+	channel = dma_get_channel_from_handle(handle);
-+
-+	/*
-+	 *  See if this is a valid handle.
-+	 */
-+	if (channel < 0) {
-+		printk(KERN_ERR
-+			   "DMA Remove Buffer: Invalid dma handle.\n");
-+		return(-EINVAL);
-+	}
-+
-+	dma = &dma_chan[channel];
-+
-+	/*
-+	 *  Mask interrupts and hold on to the original state.
-+	 */
-+	local_irq_save(flags);
-+
-+	/*
-+	 *  Make sure there are used buffers to be returned.
-+	 */
-+	if (dma->used_buffers) {
-+		test = dma->last_buffer;
-+
-+		for (loop = 0; loop < MAX_EP93XX_DMA_BUFFERS; loop++) {
-+			if (dma->buffer_queue[test].used && (dma->buffer_queue[test].buf_id != -1)) {
-+				/*DPRINTK("buffer %d used \n", test); */
-+
-+				/*
-+				 *  This is a used buffer, fill in the buf_id pointer
-+				 *  with the buf_id for this buffer.
-+				 */
-+				*buf_id = dma->buffer_queue[test].buf_id;
-+
-+				/*
-+				 *  Reset this buffer structure
-+				 */
-+				dma->buffer_queue[test].buf_id = -1;
-+
-+				/*
-+				 *  Decrement the used buffer counter, and the total buffer counter.
-+				 */
-+				dma->used_buffers--;
-+				dma->total_buffers--;
-+
-+				/*
-+				 *  Successful removal of a buffer, so set the return
-+				 *  value to 0, then exit this loop.
-+				 */
-+				return_val = 0;
-+				break;
-+			}
-+
-+			/*
-+			 *  This buffer isn't used, let's see if the next one is.
-+			 */
-+			test = (test + 1) % MAX_EP93XX_DMA_BUFFERS;
-+		}
-+	}
-+
-+	/*
-+	 *  Restore interrupts.
-+	 */
-+	local_irq_restore(flags);
-+
-+	/*
-+	 *  Success.
-+	 */
-+	return(return_val);
-+}
-+
-+/*****************************************************************************
-+ *
-+ *  int ep93xx_dma_pause(int handle, unsigned int channels,
-+ *					   unsigned int * handles)
-+ *
-+ *  Description: Disable any ongoing transfer for the given channel, retaining
-+ *			   the state of the current buffer transaction so that upon
-+ *			   resume, the dma will continue where it left off.
-+ *
-+ *  handle:	 Handle for the channel to be paused.  If this is a pause for
-+ *			  for multiple channels, handle is a valid handle for one of
-+ *			  the channels to be paused.
-+ *  channels:   number of channel to pause transfers on.
-+ *  handles:	Pointer to an array of handles, one for each channel which
-+ *			  to be paused.  If this pause is intended only for one
-+ *			  channel, this field should be set to NULL.
-+ *
-+ ****************************************************************************/
-+int
-+ep93xx_dma_pause(int handle, unsigned int channels, unsigned int * handles)
-+{
-+	unsigned long flags;
-+	ep93xx_dma_t * dma;
-+	int channel;
-+
-+	DPRINTK("ep93xx_dma_pause \n");
-+
-+	/*
-+	 *  Mask interrupts and hold on to the original state.
-+	 */
-+	local_irq_save(flags);
-+
-+	/*
-+	 *  Get the DMA hw channel # from the handle.
-+	 */
-+	channel = dma_get_channel_from_handle(handle);
-+
-+	/*
-+	 *  See if this is a valid handle.
-+	 */
-+	if (channel < 0) {
-+		/*
-+		 *  restore interrupts.
-+		 */
-+		local_irq_restore(flags);
-+
-+		printk(KERN_ERR
-+			   "DMA Pause: Invalid dma handle.\n");
-+
-+		/*
-+		 *  Fail.
-+		 */
-+		return(-EINVAL);
-+	}
-+
-+	DPRINTK("DMA %d: pause \n", channel);
-+
-+	/*
-+	 *  Set up a pointer to the dma instance data.
-+	 */
-+	dma = &dma_chan[channel];
-+
-+	/*
-+	 *  Check if we're already paused.
-+	 */
-+	if (dma->pause) {
-+		/*
-+		 *  We're paused, but are we stopped?
-+		 */
-+		if (dma->xfer_enable)
-+			/*
-+			 *  Put the channel in the stopped state.
-+			 */
-+			dma->xfer_enable = FALSE;
-+
-+		DPRINTK("DMA Pause - already paused.");
-+	} else {
-+		/*
-+		 *  Put the channel into the stopped state.
-+		 */
-+		dma->xfer_enable = FALSE;
-+		dma->pause = TRUE;
-+	}
-+
-+	/*
-+	 *  restore interrupts.
-+	 */
-+	local_irq_restore(flags);
-+
-+	/*
-+	 *  Already paused, so exit.
-+	 */
-+	return(0);
-+}
-+
-+/*****************************************************************************
-+ *
-+ *  void ep93xx_dma_flush(int handle)
-+ *
-+ *  Description: Flushes all queued buffers and transfers in progress
-+ *			   for the given channel.  Return the buffer entries
-+ *			   to the calling function.
-+ *
-+ *  handle:	 handle for the channel for which the flush is intended.
-+ *
-+ ****************************************************************************/
-+int
-+ep93xx_dma_flush(int handle)
-+{
-+	unsigned int loop;
-+	unsigned long flags;
-+	ep93xx_dma_t * dma;
-+	int  channel;
-+	unsigned int M2P_reg_base,uiCONTROL;
-+
-+	/*
-+	 *  Get the DMA hw channel # from the handle.
-+	 */
-+	channel = dma_get_channel_from_handle(handle);
-+
-+	/*
-+	 *  See if this is a valid handle.
-+	 */
-+	if (channel < 0) {
-+		printk(KERN_ERR "DMA Flush: Invalid dma handle.\n");
-+		return(-EINVAL);
-+	}
-+
-+	DPRINTK("DMA %d: flush \n", channel);
-+
-+	/*
-+	 *  Set up a pointer to the dma instance data for this channel
-+	 */
-+	dma = &dma_chan[channel];
-+
-+	/*
-+	 *  Mask interrupts and hold on to the original state.
-+	 */
-+	local_irq_save(flags);
-+
-+	/*
-+	 *  Disable the dma channel
-+	 */
-+	if (channel < 10) {
-+		/*
-+		 *  M2P channel
-+		 */
-+		uiCONTROL = inl(dma->reg_base+M2P_OFFSET_CONTROL);
-+		uiCONTROL &= ~CONTROL_M2P_ENABLE;
-+		outl( uiCONTROL, dma->reg_base+M2P_OFFSET_CONTROL );
-+	} else {
-+		/*
-+		 *  M2M channel
-+		 */
-+		uiCONTROL = inl(dma->reg_base+M2M_OFFSET_CONTROL);
-+		uiCONTROL &= ~CONTROL_M2M_ENABLE;
-+		outl( uiCONTROL, dma->reg_base+M2M_OFFSET_CONTROL );
-+	}
-+
-+	for (loop = 0; loop < MAX_EP93XX_DMA_BUFFERS; loop++)
-+	{
-+		dma->buffer_queue[loop].buf_id = -1;
-+		dma->buffer_queue[loop].last = 0;
-+	}
-+
-+	/*
-+	 *  Set the Current and Last item to zero.
-+	 */
-+	dma->current_buffer = 0;
-+	dma->last_buffer = 0;
-+
-+	/*
-+	 *  Reset the Buffer counters
-+	 */
-+	dma->used_buffers = 0;
-+	dma->new_buffers = 0;
-+	dma->total_buffers = 0;
-+
-+	/*
-+	 *  reset the Total bytes counter.
-+	 */
-+	dma->total_bytes = 0;
-+
-+    /*
-+     * Reset the paused buffer.
-+     */
-+     dma->pause_buf.last = 0;
-+     dma->pause_buf.buf_id = -1;
-+
-+	M2P_reg_base = dma_chan[channel].reg_base;
-+
-+	/*
-+	 *  restore interrupts.
-+	 */
-+	local_irq_restore(flags);
-+
-+	/*
-+	 *  Success.
-+	 */
-+	return(0);
-+}
-+
-+/*****************************************************************************
-+ *
-+ *  int ep93xx_dma_queue_full(int handle)
-+ *
-+ *  Description: Query to determine if the DMA queue of buffers for
-+ *			  a given channel is full.
-+ *			  0 = queue is full
-+ *			  1 = queue is not full
-+ *
-+ *  handle:	 handle for the channel to query.
-+ *
-+ ****************************************************************************/
-+int
-+ep93xx_dma_queue_full(int handle)
-+{
-+	int list_full = 0;
-+	unsigned long flags;
-+	int  channel;
-+
-+	/*
-+	 *  Get the DMA hw channel # from the handle.
-+	 */
-+	channel = dma_get_channel_from_handle(handle);
-+
-+	/*
-+	 *  See if this is a valid handle.
-+	 */
-+	if (channel < 0) {
-+		printk(KERN_ERR "DMA Queue Full: Invalid dma handle.\n");
-+		return(-EINVAL);
-+	}
-+
-+	DPRINTK("DMA %d: queue full \n", channel);
-+
-+	/*
-+	 *  Mask interrupts and hold on to the original state.
-+	 */
-+	local_irq_save(flags);
-+
-+	/*
-+	 *  If the last item is equal to the used item then
-+	 *  the queue is full.
-+	 */
-+	if (dma_chan[channel].total_buffers < MAX_EP93XX_DMA_BUFFERS)
-+		list_full =  FALSE;
-+	else
-+		list_full = TRUE;
-+
-+	/*
-+	 *  restore interrupts.
-+	 */
-+	local_irq_restore(flags);
-+
-+	return(list_full);
-+}
-+
-+/*****************************************************************************
-+ *
-+ *  int ep93xx_dma_get_position()
-+ *
-+ *  Description:  Takes two integer pointers and fills them with the start
-+ *                and current address of the buffer currently transferring
-+ *                on the specified DMA channel.
-+ *
-+ *  handle         handle for the channel to query.
-+ *  *buf_id        buffer id for the current buffer transferring on the
-+ *                 dma channel.
-+ *  *total         total bytes transferred on the channel.  Only counts
-+ *                 whole buffers transferred.
-+ *  *current_frac  number of bytes transferred so far in the current buffer.
-+ ****************************************************************************/
-+int
-+ep93xx_dma_get_position(int handle, unsigned int * buf_id,
-+                        unsigned int * total, unsigned int * current_frac )
-+{
-+	int  channel;
-+	ep93xx_dma_t * dma;
-+	unsigned int buf_id1, total1, current_frac1, buf_id2, total2;
-+	unsigned int Status, NextBuffer, StateIsBufNext, M2P_reg_base=0;
-+	unsigned int pause1, pause2;
-+
-+	/*
-+	 *  Get the DMA hw channel # from the handle.  See if this is a
-+	 *  valid handle.
-+	 */
-+	channel = dma_get_channel_from_handle(handle);
-+	if (channel < 0) {
-+		printk(KERN_ERR "DMA Get Position: Invalid dma handle.\n");
-+		return(-EINVAL);
-+	}
-+
-+	dma = &dma_chan[channel];
-+
-+	/*
-+	 * If DMA moves to a new buffer in the middle of us grabbing the
-+	 * buffer info, then do it over again.
-+	 */
-+	do{
-+		buf_id1 = dma->buffer_queue[dma->current_buffer].buf_id;
-+		total1  = dma->total_bytes;
-+		pause1  = dma->pause;
-+
-+		if (channel < 10) {
-+			// M2P
-+			M2P_reg_base = dma->reg_base;
-+
-+			Status = inl(M2P_reg_base+M2P_OFFSET_STATUS);
-+
-+			NextBuffer = ((Status & STATUS_M2P_NEXTBUFFER) != 0);
-+
-+			StateIsBufNext = ((Status & STATUS_M2P_CURRENT_MASK) ==
-+			                  STATUS_M2P_DMA_BUF_NEXT);
-+
-+			if( NextBuffer ^ StateIsBufNext )
-+				current_frac1 = inl(M2P_reg_base+M2P_OFFSET_CURRENT1) -
-+				                inl(M2P_reg_base+M2P_OFFSET_BASE1);
-+			else
-+				current_frac1 = inl(M2P_reg_base+M2P_OFFSET_CURRENT0) -
-+				                inl(M2P_reg_base+M2P_OFFSET_BASE0);
-+
-+		} else {
-+			// M2M - TODO implement this for M2M
-+			current_frac1 = 0;
-+		}
-+
-+		buf_id2 = dma->buffer_queue[dma->current_buffer].buf_id;
-+		total2 = dma->total_bytes;
-+		pause2  = dma->pause;
-+
-+	} while ( (buf_id1 != buf_id2) || (total1 != total2) || (pause1 != pause2) );
-+
-+	if (pause1)
-+		current_frac1 = 0;
-+
-+	if (buf_id)
-+		*buf_id = buf_id1;
-+
-+	if (total)
-+		*total  = total1;
-+
-+	if (current_frac)
-+		*current_frac = current_frac1;
-+
-+//	DPRINTK("DMA buf_id %d, total %d, frac %d\n", buf_id1, total1, current_frac1);
-+
-+	/*
-+	 *  Success.
-+	 */
-+	return(0);
-+}
-+
-+/*****************************************************************************
-+ *
-+ *  int ep93xx_dma_get_total(int handle)
-+ *
-+ *  Description:	Returns the total number of bytes transferred on the
-+ *			specified channel since the channel was requested.
-+ *
-+ *  handle:	 handle for the channel to query.
-+ *
-+ ****************************************************************************/
-+int
-+ep93xx_dma_get_total(int handle)
-+{
-+	int  channel;
-+
-+	/*
-+	 *  Get the DMA hw channel # from the handle.
-+	 */
-+	channel = dma_get_channel_from_handle(handle);
-+
-+	/*
-+	 *  See if this is a valid handle.
-+	 */
-+	if (channel < 0) {
-+		printk(KERN_ERR "DMA Get Total: Invalid dma handle.\n");
-+		return(-EINVAL);
-+	}
-+
-+	DPRINTK("DMA %d: total: %d \n", channel, dma_chan[channel].total_bytes);
-+
-+	/*
-+	 *  Return the total number of bytes transferred on this channel since
-+	 *  it was requested.
-+	 */
-+	return(dma_chan[channel].total_bytes);
-+}
-+
-+/*****************************************************************************
-+ *
-+ *  int ep93xx_dma_is_done(int handle)
-+ *
-+ *  Description:	Determines if the specified channel is done
-+ *			transferring the requested data.
-+ *
-+ *  handle:	 handle for the channel to query.
-+ *
-+ ****************************************************************************/
-+int
-+ep93xx_dma_is_done(int handle)
-+{
-+	ep93xx_dma_t *dma;
-+	int channel;
-+
-+	/*
-+	 *  Get the DMA hw channel # from the handle.
-+	 */
-+	channel = dma_get_channel_from_handle(handle);
-+
-+	/*
-+	 *  See if this is a valid handle.
-+	 */
-+	if (channel < 0) {
-+		printk(KERN_ERR "ep93xx_dma_is_done: Invalid dma handle.\n");
-+		return(-EINVAL);
-+	}
-+
-+        /*
-+         * Get a pointer to the DMA channel state structure.
-+         */
-+        dma = &dma_chan[channel];
-+
-+        /*
-+         * See if there are any buffers remaining to be provided to the HW.
-+         */
-+        if (dma->new_buffers)
-+            return 0;
-+
-+        /*
-+         * See if this is a M2P or M2M channel.
-+         */
-+        if (channel < 10) {
-+            /*
-+             * If the bytes remaining register of the HW is not zero, then
-+             * there is more work to be done.
-+             */
-+            if (inl(dma->reg_base + M2P_OFFSET_REMAIN) != 0)
-+                return 0;
-+        } else {
-+            /*
-+             * If either byte count register in the HW is not zero, then there
-+             * is more work to be done.
-+             */
-+            if ((inl(dma->reg_base + M2M_OFFSET_BCR0) != 0) ||
-+                (inl(dma->reg_base + M2M_OFFSET_BCR1) != 0))
-+                return 0;
-+        }
-+
-+        /*
-+         * The DMA is complete.
-+         */
-+        return 1;
-+}
-+
-+/*****************************************************************************
-+ * ep93xx_dma_request
-+ *
-+ * Description: This function will allocate a DMA channel for a particular
-+ * hardware peripheral.  Before initiating a transfer on the allocated
-+ * channel, the channel must be set up and buffers have to queued up.
-+ *
-+ *  handle:	 pointer to an integer which is filled in with a unique
-+ *			  handle for this instance of the dma interface.
-+ *  device_id   string with the device name, primarily used by /proc.
-+ *  device	  hardware device ID for which the requested dma channel will
-+ *			  transfer data.
-+ *
-+ ****************************************************************************/
-+int
-+ep93xx_dma_request(int * handle, const char *device_id,
-+				   ep93xx_dma_dev_t device)
-+{
-+	ep93xx_dma_t *dma = NULL;
-+	int channel;
-+	unsigned int error = 0;
-+	unsigned int loop;
-+	unsigned int M2P_reg_base;
-+
-+	/*
-+	 *  Check if the device requesting a DMA channel is a valid device.
-+	 */
-+	if ((device >= UNDEF_DMA) || (device < 0))
-+		return(-ENODEV);
-+
-+	/*
-+	 *  We've got a valid hardware device requesting a DMA channel.
-+	 *  Now check if the device should open an M2P or M2M channel
-+	 */
-+	if (device < 20)
-+		channel = dma_open_m2p(device);
-+	else
-+		channel = dma_open_m2m(device);
-+
-+	/*
-+	 *  Check if we successfully opened a DMA channel
-+	 */
-+	if (channel < 0) {
-+		printk(KERN_ERR "%s: Could not open dma channel for this device.\n",
-+			   device_id);
-+		return(-EBUSY);
-+	}
-+
-+	dma = &dma_chan[channel];
-+
-+        if(dma->terminated==1) {
-+           free_irq(dma->irq, (void *) dma);
-+           dma->terminated=0;
-+        }
-+
-+	/*
-+	 *  Request the appropriate IRQ for the specified channel
-+	 */
-+	if (channel < 10)
-+		error = request_irq(dma->irq, dma_m2p_irq_handler,
-+				    IRQF_DISABLED, device_id, (void *) dma);
-+	else
-+		error = request_irq(dma->irq, &dma_m2m_irq_handler,
-+				    IRQF_DISABLED, device_id, (void *) dma);
-+
-+	/*
-+	 *  Check for any errors during the irq request
-+	 */
-+	if (error) {
-+		printk(KERN_ERR "%s: unable to request IRQ %d for DMA channel\n",
-+			   device_id, dma->irq);
-+		return(error);
-+	}
-+
-+	/*
-+	 *  Generate a valid handle and exit.
-+	 *
-+	 *  Increment the last valid handle.
-+	 *  Check for wraparound (unlikely, but we like to be complete).
-+	 */
-+	dma->last_valid_handle++;
-+
-+	if ( (dma->last_valid_handle & DMA_HANDLE_SPECIFIER_MASK) !=
-+	     (channel << 28) )
-+		dma->last_valid_handle = (channel << 28) + 1;
-+
-+	/*
-+	 *  Fill in the handle pointer with a valid handle for
-+	 *  this dma channel instance.
-+	 */
-+	*handle = dma->last_valid_handle;
-+
-+	DPRINTK("Handle for channel %d: 0x%x\n", channel, *handle);
-+
-+	/*
-+	 * Save the device ID and device name.
-+	 */
-+	dma->device = device;
-+	dma->device_id = device_id;
-+
-+	/*
-+	 *  Init all fields within the dma instance.
-+	 */
-+	for (loop = 0; loop < MAX_EP93XX_DMA_BUFFERS; loop++)
-+		dma->buffer_queue[loop].buf_id = -1;
-+
-+	/*
-+	 *  Initialize all buffer queue variables.
-+	 */
-+	dma->current_buffer = 0;
-+	dma->last_buffer = 0;
-+
-+	dma->new_buffers = 0;
-+	dma->used_buffers = 0;
-+	dma->total_buffers = 0;
-+
-+	/*
-+	 *  Initialize the total bytes variable
-+	 */
-+	dma->total_bytes = 0;
-+
-+	/*
-+	 *  Initialize the transfer and pause state variables to 0.
-+	 */
-+	dma->xfer_enable = 0;
-+
-+	dma->pause = 0;
-+
-+	/*
-+	 *  Initialize the pause buffer structure.
-+	 */
-+	dma->pause_buf.buf_id = -1;
-+
-+	/*
-+	 *  Initialize the callback function and user data fields.
-+	 */
-+	dma->callback = NULL;
-+
-+	/*
-+	 * User data used as a parameter for the Callback function.  The user
-+	 * sets up the data and sends it with the callback function.
-+	 */
-+	dma->user_data = 0;
-+
-+	M2P_reg_base = dma_chan[channel].reg_base;
-+
-+	/*
-+	 *  Debugging message.
-+	 */
-+	DPRINTK("Successfully requested dma channel %d\n", channel);
-+	DPRINTK("STATUS - 0x%x \n",	 inl(M2P_reg_base+M2P_OFFSET_STATUS) );
-+	DPRINTK("CONTROL - 0x%x \n",	inl(M2P_reg_base+M2P_OFFSET_CONTROL) );
-+	DPRINTK("REMAIN - 0x%x \n",	 inl(M2P_reg_base+M2P_OFFSET_REMAIN) );
-+	DPRINTK("PPALLOC - 0x%x \n",	inl(M2P_reg_base+M2P_OFFSET_PPALLOC) );
-+	DPRINTK("BASE0 - 0x%x \n",	  inl(M2P_reg_base+M2P_OFFSET_BASE0) );
-+	DPRINTK("MAXCNT0 - 0x%x \n",	inl(M2P_reg_base+M2P_OFFSET_MAXCNT0) );
-+	DPRINTK("CURRENT0 - 0x%x \n",   inl(M2P_reg_base+M2P_OFFSET_CURRENT0) );
-+	DPRINTK("BASE1 - 0x%x \n",	  inl(M2P_reg_base+M2P_OFFSET_BASE1) );
-+	DPRINTK("MAXCNT1 - 0x%x \n",	inl(M2P_reg_base+M2P_OFFSET_MAXCNT1) );
-+	DPRINTK("CURRENT1 - 0x%x \n",   inl(M2P_reg_base+M2P_OFFSET_CURRENT1) );
-+
-+	DPRINTK("Buffer	source	   size	   last	   used \n");
-+	for (loop = 0; loop < 5; loop ++)
-+		DPRINTK("%d		0x%x		 0x%x		%d		 %d \n",
-+			loop, dma->buffer_queue[loop].source, dma->buffer_queue[loop].size,
-+			dma->buffer_queue[loop].last, dma->buffer_queue[loop].used);
-+	DPRINTK("pause	 0x%x		 0x%x		%d		 %d \n",
-+		dma->pause_buf.source, dma->pause_buf.size,
-+		dma->pause_buf.last, dma->pause_buf.used);
-+
-+	DPRINTK("Pause - %d \n", dma->pause);
-+	DPRINTK("xfer_enable - %d \n", dma->xfer_enable);
-+	DPRINTK("total bytes - 0x%x \n", dma->total_bytes);
-+	DPRINTK("total buffer - %d \n", dma->total_buffers);
-+	DPRINTK("new buffers - %d \n", dma->new_buffers);
-+	DPRINTK("current buffer - %d \n", dma->current_buffer);
-+	DPRINTK("last buffer - %d \n", dma->last_buffer);
-+	DPRINTK("used buffers - %d \n", dma->used_buffers);
-+
-+	DPRINTK("CURRENT1 - 0x%x \n",   inl(M2P_reg_base+M2P_OFFSET_CURRENT1) );
-+	DPRINTK("VIC0IRQSTATUS - 0x%x, VIC0INTENABLE - 0x%x \n",
-+		*(unsigned int *)(VIC0IRQSTATUS),
-+		*(unsigned int *)(VIC0INTENABLE));
-+
-+	/*
-+	 *  Success.
-+	 */
-+	return(0);
-+}
-+
-+/*****************************************************************************
-+ *
-+ * ep93xx_dma_free
-+ *
-+ * Description: This function will free the dma channel for future requests.
-+ *
-+ *  handle:	 handle for the channel to be freed.
-+ *
-+ ****************************************************************************/
-+int
-+ep93xx_dma_free(int handle)
-+{
-+	ep93xx_dma_t *dma;
-+	unsigned int M2M_reg_base, M2P_reg_base, uiCONTROL;
-+	int channel;
-+
-+	/*
-+	 *  Get the DMA hw channel # from the handle.
-+	 */
-+	channel = dma_get_channel_from_handle(handle);
-+
-+	/*
-+	 *  See if this is a valid handle.
-+	 */
-+	if (channel < 0) {
-+		printk(KERN_ERR "DMA Free: Invalid dma handle.\n");
-+		return(-EINVAL);
-+	}
-+
-+	/*
-+	 *  Get a pointer to the dma instance.
-+	 */
-+	dma = &dma_chan[channel];
-+
-+	/*
-+	 *  Disable the dma channel
-+	 */
-+	if (channel < 10) {
-+		/*
-+		 *  M2P channel
-+		 */
-+		M2P_reg_base = dma->reg_base;
-+
-+		uiCONTROL = inl(M2P_reg_base+M2P_OFFSET_CONTROL);
-+		uiCONTROL &= ~CONTROL_M2P_ENABLE;
-+		outl( uiCONTROL, M2P_reg_base+M2P_OFFSET_CONTROL );
-+	} else {
-+		/*
-+		 *  M2M channel
-+		 */
-+		M2M_reg_base = dma->reg_base;
-+
-+		uiCONTROL = inl(M2M_reg_base+M2M_OFFSET_CONTROL);
-+		uiCONTROL &= ~CONTROL_M2M_ENABLE;
-+		outl( uiCONTROL, M2M_reg_base+M2M_OFFSET_CONTROL );
-+	}
-+
-+	/*
-+	 *  Free the interrupt servicing this dma channel
-+	 */
-+	//free_irq(dma->irq, (void *) dma);
-+        dma->terminated=1;
-+
-+	/*
-+	 *  Decrement the reference count for this instance of the dma interface
-+	 */
-+	dma->ref_count--;
-+
-+	/*
-+	 *  Set the transfer and pause state variables to 0
-+	 *  (unititialized state).
-+	 */
-+	dma->xfer_enable = 0;
-+	dma->pause = 0;
-+
-+	/*
-+	 *  Debugging message.
-+	 */
-+	DPRINTK("Successfully freed dma channel %d\n", channel);
-+	/*
-+	 *  Success.
-+	 */
-+	return(0);
-+}
-+
-+/*****************************************************************************
-+ *
-+ * ep93xx_dma_init(void)
-+ *
-+ * Description: This function is called during system initialization to
-+ * setup the interrupt number and register set base address for each DMA
-+ * channel.
-+ *
-+ ****************************************************************************/
-+static int __init
-+ep93xx_dma_init(void)
-+{
-+	int channel;
-+
-+	/*
-+	 * Init some values in each dma instance.
-+	 */
-+	for (channel = 0; channel < MAX_EP93XX_DMA_CHANNELS; channel++) {
-+		/*
-+		 *  IRQ for the specified dma channel.
-+		 */
-+		dma_chan[channel].irq = IRQ_EP93XX_DMAM2P0 + channel;
-+
-+                 dma_chan[channel].terminated = 0;
-+
-+		/*
-+		 *  Initial value of the dma channel handle.
-+		 */
-+		dma_chan[channel].last_valid_handle = channel << 28;
-+
-+		/*
-+		 *  Give the instance a pointer to the dma channel register
-+		 *  base.
-+		 */
-+		if (channel < 10)
-+			dma_chan[channel].reg_base = DMAM2PChannelBase[channel];
-+		else
-+			dma_chan[channel].reg_base = DMAM2MChannelBase[channel - 10];
-+
-+		/*
-+		 *  Initialize the reference count for this channel.
-+		 */
-+		dma_chan[channel].ref_count = 0;
-+	}
-+
-+	DPRINTK("DMA Interface intitialization complete\n");
-+
-+	/*
-+	 * Success
-+	 */
-+	return 0;
-+}
-+
-+arch_initcall(ep93xx_dma_init);
-+
-+EXPORT_SYMBOL(ep93xx_dma_free);
-+EXPORT_SYMBOL(ep93xx_dma_request);
-+EXPORT_SYMBOL(ep93xx_dma_flush);
-+EXPORT_SYMBOL(ep93xx_dma_pause);
-+EXPORT_SYMBOL(ep93xx_dma_remove_buffer);
-+EXPORT_SYMBOL(ep93xx_dma_add_buffer);
-+EXPORT_SYMBOL(ep93xx_dma_start);
-+EXPORT_SYMBOL(ep93xx_dma_config);
---- /dev/null
-+++ b/arch/arm/mach-ep93xx/dma_ep93xx.h
-@@ -0,0 +1,676 @@
-+/*****************************************************************************
-+ *
-+ * arch/arm/mach-ep93xx/dma_ep93xx.h
-+ *
-+ * DESCRIPTION:    93XX DMA controller API private defintions.
-+ *
-+ * Copyright Cirrus Logic Corporation, 2003.  All rights reserved
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ ****************************************************************************/
-+#ifndef _EP93XX_DMA_H_
-+#define _EP93XX_DMA_H_
-+
-+// as it turns out the ide dma is the biggest dma buffer hog so far
-+// in case the HDD is "thinking" (seek/buffer flush)
-+// the continueing r/w DMAs to the HDD will be queued up to up to PRD_ENTRIES entries...
-+#include <linux/ide.h>
-+#define MAX_EP93XX_DMA_BUFFERS      PRD_ENTRIES
-+
-+#ifndef TRUE
-+#define TRUE                        1
-+#endif
-+
-+#ifndef FALSE
-+#define FALSE                       0
-+#endif
-+
-+#ifndef NULL
-+#define NULL                        0
-+#endif
-+
-+#define EP93XX_DMA_BASE			(EP93XX_AHB_VIRT_BASE + 0x00000000)
-+
-+/*****************************************************************************
-+ * 0x8000.0000 -> 0x8000.003C M2P Channel 0 Registers (Tx)
-+ * 0x8000.0040 -> 0x8000.007C M2P Channel 1 Registers (Rx)
-+ * 0x8000.0080 -> 0x8000.00BC M2P Channel 2 Registers (Tx)
-+ * 0x8000.00C0 -> 0x8000.00FC M2P Channel 3 Registers (Rx)
-+ * 0x8000.0100 -> 0x8000.013C M2M Channel 0 Registers
-+ * 0x8000.0140 -> 0x8000.017C M2M Channel 1 Registers
-+ * 0x8000.0180 -> 0x8000.01BC Not Used
-+ * 0x8000.01C0 -> 0x8000.01FC Not Used
-+ * 0x8000.0200 -> 0x8000.023C M2P Channel 5 Registers (Rx)
-+ * 0x8000.0240 -> 0x8000.027C M2P Channel 4 Registers (Tx)
-+ * 0x8000.0280 -> 0x8000.02BC M2P Channel 7 Registers (Rx)
-+ * 0x8000.02C0 -> 0x8000.02FC M2P Channel 6 Registers (Tx)
-+ * 0x8000.0300 -> 0x8000.033C M2P Channel 9 Registers (Rx)
-+ * 0x8000.0340 -> 0x8000.037C M2P Channel 8 Registers (Tx)
-+ * 0x8000.0380 DMA Channel Arbitration register
-+ * 0x8000.03C0 DMA Global Interrupt register
-+ * 0x8000.03C4 -> 0x8000.03FC Not Used
-+ *
-+ *
-+ * Internal M2P/P2M Channel Register Map
-+ *
-+ * Offset Name      Access  Bits Reset Value
-+ * 0x00   CONTROL   R/W     6    0
-+ * 0x04   INTERRUPT R/W TC* 3    0
-+ * 0x08   PPALLOC   R/W     4    channel dependant
-+ *                               (see reg description)
-+ * 0x0C   STATUS    RO      8    0
-+ * 0x10   reserved
-+ * 0x14   REMAIN    RO      16   0
-+ * 0X18   Reserved
-+ * 0X1C   Reserved
-+ * 0x20   MAXCNT0   R/W     16   0
-+ * 0x24   BASE0     R/W     32   0
-+ * 0x28   CURRENT0  RO      32   0
-+ * 0x2C   Reserved
-+ * 0x30   MAXCNT1   R/W     16   0
-+ * 0x34   BASE1     R/W     32   0
-+ * 0X38   CURRENT1  RO      32   0
-+ * 0X3C   Reserved
-+ *
-+ * M2M Channel Register Map
-+ * Offset Name         Access   Bits Reset Value
-+ *
-+ * 0x00   CONTROL      R/W      22   0
-+ * 0x04   INTERRUPT    R/W TC*  3    0
-+ * 0x08   Reserved
-+ * 0x0C   STATUS       R/W TC*  14   0
-+ * 0x10   BCR0         R/W      16   0
-+ * 0x14   BCR1         R/W      16   0
-+ * 0x18   SAR_BASE0    R/W      32   0
-+ * 0x1C   SAR_BASE1    R/W      32   0
-+ * 0x20   Reserved
-+ * 0x24   SAR_CURRENT0 RO       32   0
-+ * 0x28   SAR_CURRENT1 RO       32   0
-+ * 0x2C   DAR_BASE0    R/W      32   0
-+ * 0x30   DAR_BASE1    R/W      32   0
-+ * 0x34   DAR_CURRENT0 RO       32   0
-+ * 0X38   Reserved
-+ * 0X3C   DAR_CURRENT1 RO       32   0
-+ * * Write this location once to clear the bit (see
-+ * Interrupt/Status register description for which bits
-+ * this rule applies to).
-+ *
-+ ****************************************************************************/
-+
-+
-+/*----------------------------------------------------------------------------------*/
-+/* M2P Registers                                                                    */
-+/*----------------------------------------------------------------------------------*/
-+/*
-+ * M2P CONTROL register bit defines
-+ */
-+#define CONTROL_M2P_STALLINTEN      0x00000001	    /* Enables the STALL interrupt  */
-+#define CONTROL_M2P_NFBINTEN        0x00000002	    /* Enables the NFB interrupt    */
-+#define CONTROL_M2P_CHERRORINTEN    0x00000008      /* Enables the ChError interrupt*/
-+#define CONTROL_M2P_ENABLE		    0x00000010      /* Enables the channel          */
-+#define CONTROL_M2P_ABRT		    0x00000020      /* Determines how DMA behaves in*/
-+			                                        /* NEXT state with peripheral   */
-+                                                    /* error                        */
-+			                                        /* 0: NEXT -> ON, ignore error  */
-+			                                        /* 1: NEXT -> STALL, disable ch.*/
-+#define CONTROL_M2P_ICE			    0x00000040      /* Ignore Channel Error         */
-+
-+/*
-+ * M2P INTERRUPT register bit defines
-+ */
-+#define INTERRUPT_M2P_STALLINT      0x00000001	    /* Indicates channel stalled.   */
-+#define INTERRUPT_M2P_NFBINT        0x00000002		/* Indicates channel is hungry. */
-+#define INTERRUPT_M2P_CHERRORINT    0x00000008	    /* Peripheral detects error     */
-+
-+
-+/*
-+ * STATUS register bit defines
-+ */
-+#define STATUS_M2P_STALL            0x00000001		/* A '1' indicates channel is       */
-+                                                    /* stalled                          */
-+#define STATUS_M2P_NFB			    0x00000002      /* A '1' indicates channel has moved*/
-+			                                        /* from NEXT state to ON state, but */
-+			                                        /* waiting for next buffer to be    */
-+                                                    /* programmed.                      */
-+#define STATUS_M2P_CHERROR		    0x00000008      /* Enables the ChError interrupt    */
-+#define STATUS_M2P_CURRENT_MASK     0x00000030      /* Current state of the FSM         */
-+#define STATUS_M2P_CURRENT_SHIFT    4
-+#define STATUS_M2P_NEXTBUFFER	    0x00000040      /* Informs the int handler after an */
-+			                                        /* NFB int which pair of maxcnt and */
-+                                                    /* base regs to update.             */
-+#define STATUS_M2P_BYTES_MASK       0x0000f800 		/* number of valid DMA data         */
-+#define STATUS_M2P_BYTES_SHIFT      7               /* currently in                     */
-+								        		    /* packer/unpacker                  */
-+
-+#define STATUS_M2P_DMA_NO_BUF		0x00000000
-+#define STATUS_M2P_DMA_BUF_ON		0x00000010
-+#define STATUS_M2P_DMA_BUF_NEXT		0x00000020
-+
-+/*
-+ * Register masks to mask off reserved bits after reading register.
-+ */
-+#define M2P_MASK_PPALLOC            0x0000000f
-+#define M2P_MASK_REMAIN             0x0000ffff
-+#define M2P_MASK_MAXCNT0            0x0000ffff
-+#define M2P_MASK_BASE0              0xffffffff
-+#define M2P_MASK_CURRENT0           0xffffffff
-+#define M2P_MASK_MAXCNT1            0x0000ffff
-+#define M2P_MASK_BASE1              0xffffffff
-+#define M2P_MASK_CURRENT1           0xffffffff
-+
-+
-+/*----------------------------------------------------------------------------------*/
-+/* M2M Registers                                                                    */
-+/*----------------------------------------------------------------------------------*/
-+
-+#define CONTROL_M2M_STALLINTEN	0x00000001  /* Enables the STALL interrupt                     */
-+#define CONTROL_M2M_SCT			0x00000002  /* Source Copy Transfer. Setup a                   */
-+										    /* block transfer from 1 memory source             */
-+										    /* location.                                       */
-+#define CONTROL_M2M_DONEINTEN	0x00000004  /* Enables the DONE interrupt which                */
-+										    /* indicates if the xfer completed                 */
-+										    /* successfully                                    */
-+#define CONTROL_M2M_ENABLE		0x00000008  /* Enables the channel                             */
-+#define CONTROL_M2M_START		0x00000010  /* Initiates the xfer. 'software trigger'          */
-+#define CONTROL_M2M_BWC_MASK	0x000001e0  /* Bandwidth control. Indicate number of           */
-+#define CONTROL_M2M_BWC_SHIFT   5			/* bytes in a transfer.                            */
-+#define CONTROL_M2M_PW_MASK		0x00000600  /* Peripheral width. Used for xfers                */
-+#define CONTROL_M2M_PW_SHIFT    9			/* between memory and external peripheral.         */
-+										    /* 00: byte, 01: halfword, 10: word.               */
-+#define CONTROL_M2M_DAH			0x00000800  /* Destination Address Hold                        */
-+#define CONTROL_M2M_SAH			0x00001000  /* Source Address Hold                             */
-+#define CONTROL_M2M_TM_MASK     0x00006000  /* Transfer Mode. 00: sw triggered,                */
-+#define CONTROL_M2M_TM_SHIFT    13			/* 01: hw initiated M2P, 01: hw initiated P2M      */
-+#define CONTROL_M2M_ETDP_MASK	0x00018000  /* End-of-Transfer/Terminal Count pin              */
-+#define CONTROL_M2M_ETDP_SHIFT  15		    /* direction and polarity.                         */
-+#define CONTROL_M2M_DACKP		0x00020000  /* DMA acknowledge pin polarity                    */
-+
-+#define CONTROL_M2M_DREQP_MASK  0x00180000	/* DMA request pin polarity. must be set           */
-+#define CONTROL_M2M_DREQP_SHIFT 19			/* before enable bit.                              */
-+#define CONTROL_M2M_NFBINTEN	0x00200000  /* Enables generation of the NFB interrupt.        */
-+#define CONTROL_M2M_RSS_MASK    0x00c00000	/* Request source selection:                       */
-+#define CONTROL_M2M_RSS_SHIFT	22			/*		000 - External DReq[0]                     */
-+										    /*		001 - External DReq[1]                     */
-+										    /*		01X - Internal SSPRx                       */
-+										    /*		10X - Internal SSPTx                       */
-+										    /*		11X - Internal IDE                         */
-+#define CONTROL_M2M_NO_HDSK		0x01000000  /* No handshake.  When set the peripheral doesn't  */
-+										    /* require the regular handshake protocal. Must    */
-+									    	/* be set for SSP and IDE operations, optional     */
-+										    /* for external peripherals.                       */
-+#define CONTROL_M2M_PWSC_MASK   0xfe000000	/* Peripheral wait states count. Gives the latency */
-+#define CONTROL_M2M_PWSC_SHIFT	25			/* (in PCLK cycles) needed by the peripheral to    */
-+								    		/* deassert its' request once the M2M xfer w/ DMA  */
-+									    	/* is complete.                                    */
-+
-+/*
-+ * M2M INTERRUPT register bit defines
-+ */
-+#define INTERRUPT_M2M_STALLINT	0x00000001	/* Stall interrupt indicates channel stalled. */
-+#define INTERRUPT_M2M_DONEINT	0x00000002	/* Transaction done.                          */
-+#define INTERRUPT_M2M_NFBINT	0x00000004	/* Next frame buffer interrupt indicates      */
-+											/* channel requires a new buffer              */
-+
-+
-+
-+/*
-+ * M2M STATUS register bit defines
-+ */
-+#define STATUS_M2M_STALL		0x00000001  /* A '1' indicates channel is stalled           */
-+#define STATUS_M2M_CURRENTSTATE_MASK  0x0000003e  /* Indicates state of M2M Channel control       */
-+#define STATUS_M2M_CURRENTSTATE_SHIFT 1		/* FSM (0-2):                                   */
-+										    /*	000 - IDLE, 001 - STALL, 010 - MEM_RD,      */
-+										    /*  011 - MEM_WR, 100 - BWC_WAIT                */
-+										    /* and M2M buffer FSM (3-2):                    */
-+										    /* 	00 - NO_BUF, 01 - BUF_ON, 10 - BUF_NEXT     */
-+#define STATUS_M2M_DONE		    0x00000040  /* Transfer completed successfully if 1.        */
-+#define STATUS_M2M_TCS_MASK		0x00000180  /* Terminal Count status. Indicates whether or  */
-+#define STATUS_M2M_TCS_SHIFT    7			/* or not the actual byte count reached         */
-+								    		/* programmed limit for buffer descriptor       */
-+#define STATUS_M2M_EOTS_MASK    0x00000600  /* End-of-Transfer status for buffer            */
-+#define STATUS_M2M_EOTS_SHIFT   9
-+#define STATUS_M2M_NFB			0x00000800  /* A '1' indicates channel has moved            */
-+										    /* from NEXT state to ON state, but	the next    */
-+										    /* byte count reg for next buffer has not been  */
-+										    /* programmed yet.                              */
-+#define STATUS_M2M_NB			0x00001000  /* NextBuffer status. Informs NFB service       */
-+										    /* routine, after NFB int, which pair of buffer */
-+										    /* descriptor registers is free to update.      */
-+#define STATUS_M2M_DREQS		0x00002000  /* DREQ status.  Reflects the status of the     */
-+										    /* synchronized external peripherals DMA        */
-+										    /* request signal.                              */
-+
-+/*
-+ * Register masks to mask off reserved bits after reading register.
-+ */
-+#define M2M_MASK_BCR0             0x0000ffff
-+#define M2M_MASK_BCR1             0x0000ffff
-+#define M2M_MASK_SAR_BASE0        0xffffffff
-+#define M2M_MASK_SAR_BASE1        0xffffffff
-+#define M2M_MASK_SAR_CURRENT0     0xffffffff
-+#define M2M_MASK_SAR_CURRENT1     0xffffffff
-+#define M2M_MASK_DAR_BASE0        0xffffffff
-+#define M2M_MASK_DAR_BASE1        0xffffffff
-+#define M2M_MASK_DAR_CURRENT0     0xffffffff
-+#define M2M_MASK_DAR_CURRENT1     0xffffffff
-+
-+
-+//
-+/* 8000_0000 - 8000_ffff: DMA  */
-+#define DMA_OFFSET              0x000000
-+#define DMA_BASE                (EP93XX_DMA_BASE)
-+#define DMAMP_TX_0_CONTROL      (DMA_BASE+0x0000)
-+#define DMAMP_TX_0_INTERRUPT    (DMA_BASE+0x0004)
-+#define DMAMP_TX_0_PPALLOC      (DMA_BASE+0x0008)
-+#define DMAMP_TX_0_STATUS       (DMA_BASE+0x000C)
-+#define DMAMP_TX_0_REMAIN       (DMA_BASE+0x0014)
-+#define DMAMP_TX_0_MAXCNT0      (DMA_BASE+0x0020)
-+#define DMAMP_TX_0_BASE0        (DMA_BASE+0x0024)
-+#define DMAMP_TX_0_CURRENT0     (DMA_BASE+0x0028)
-+#define DMAMP_TX_0_MAXCNT1      (DMA_BASE+0x0030)
-+#define DMAMP_TX_0_BASE1        (DMA_BASE+0x0034)
-+#define DMAMP_TX_0_CURRENT1     (DMA_BASE+0x0038)
-+
-+#define DMAMP_RX_1_CONTROL      (DMA_BASE+0x0040)
-+#define DMAMP_RX_1_INTERRUPT    (DMA_BASE+0x0044)
-+#define DMAMP_RX_1_PPALLOC      (DMA_BASE+0x0048)
-+#define DMAMP_RX_1_STATUS       (DMA_BASE+0x004C)
-+#define DMAMP_RX_1_REMAIN       (DMA_BASE+0x0054)
-+#define DMAMP_RX_1_MAXCNT0      (DMA_BASE+0x0060)
-+#define DMAMP_RX_1_BASE0        (DMA_BASE+0x0064)
-+#define DMAMP_RX_1_CURRENT0     (DMA_BASE+0x0068)
-+#define DMAMP_RX_1_MAXCNT1      (DMA_BASE+0x0070)
-+#define DMAMP_RX_1_BASE1        (DMA_BASE+0x0074)
-+#define DMAMP_RX_1_CURRENT1     (DMA_BASE+0x0078)
-+
-+#define DMAMP_TX_2_CONTROL      (DMA_BASE+0x0080)
-+#define DMAMP_TX_2_INTERRUPT    (DMA_BASE+0x0084)
-+#define DMAMP_TX_2_PPALLOC      (DMA_BASE+0x0088)
-+#define DMAMP_TX_2_STATUS       (DMA_BASE+0x008C)
-+#define DMAMP_TX_2_REMAIN       (DMA_BASE+0x0094)
-+#define DMAMP_TX_2_MAXCNT0      (DMA_BASE+0x00A0)
-+#define DMAMP_TX_2_BASE0        (DMA_BASE+0x00A4)
-+#define DMAMP_TX_2_CURRENT0     (DMA_BASE+0x00A8)
-+#define DMAMP_TX_2_MAXCNT1      (DMA_BASE+0x00B0)
-+#define DMAMP_TX_2_BASE1        (DMA_BASE+0x00B4)
-+#define DMAMP_TX_2_CURRENT1     (DMA_BASE+0x00B8)
-+
-+#define DMAMP_RX_3_CONTROL      (DMA_BASE+0x00C0)
-+#define DMAMP_RX_3_INTERRUPT    (DMA_BASE+0x00C4)
-+#define DMAMP_RX_3_PPALLOC      (DMA_BASE+0x00C8)
-+#define DMAMP_RX_3_STATUS       (DMA_BASE+0x00CC)
-+#define DMAMP_RX_3_REMAIN       (DMA_BASE+0x00D4)
-+#define DMAMP_RX_3_MAXCNT0      (DMA_BASE+0x00E0)
-+#define DMAMP_RX_3_BASE0        (DMA_BASE+0x00E4)
-+#define DMAMP_RX_3_CURRENT0     (DMA_BASE+0x00E8)
-+#define DMAMP_RX_3_MAXCNT1      (DMA_BASE+0x00F0)
-+#define DMAMP_RX_3_BASE1        (DMA_BASE+0x00F4)
-+#define DMAMP_RX_3_CURRENT1     (DMA_BASE+0x00F8)
-+
-+#define DMAMM_0_CONTROL         (DMA_BASE+0x0100)
-+#define DMAMM_0_INTERRUPT       (DMA_BASE+0x0104)
-+#define DMAMM_0_STATUS          (DMA_BASE+0x010C)
-+#define DMAMM_0_BCR0            (DMA_BASE+0x0110)
-+#define DMAMM_0_BCR1            (DMA_BASE+0x0114)
-+#define DMAMM_0_SAR_BASE0       (DMA_BASE+0x0118)
-+#define DMAMM_0_SAR_BASE1       (DMA_BASE+0x011C)
-+#define DMAMM_0_SAR_CURRENT0    (DMA_BASE+0x0124)
-+#define DMAMM_0_SAR_CURRENT1    (DMA_BASE+0x0128)
-+#define DMAMM_0_DAR_BASE0       (DMA_BASE+0x012C)
-+#define DMAMM_0_DAR_BASE1       (DMA_BASE+0x0130)
-+#define DMAMM_0_DAR_CURRENT0    (DMA_BASE+0x0134)
-+#define DMAMM_0_DAR_CURRENT1    (DMA_BASE+0x013C)
-+
-+#define DMAMM_1_CONTROL         (DMA_BASE+0x0140)
-+#define DMAMM_1_INTERRUPT       (DMA_BASE+0x0144)
-+#define DMAMM_1_STATUS          (DMA_BASE+0x014C)
-+#define DMAMM_1_BCR0            (DMA_BASE+0x0150)
-+#define DMAMM_1_BCR1            (DMA_BASE+0x0154)
-+#define DMAMM_1_SAR_BASE0       (DMA_BASE+0x0158)
-+#define DMAMM_1_SAR_BASE1       (DMA_BASE+0x015C)
-+#define DMAMM_1_SAR_CURRENT0    (DMA_BASE+0x0164)
-+#define DMAMM_1_SAR_CURRENT1    (DMA_BASE+0x0168)
-+#define DMAMM_1_DAR_BASE0       (DMA_BASE+0x016C)
-+#define DMAMM_1_DAR_BASE1       (DMA_BASE+0x0170)
-+#define DMAMM_1_DAR_CURRENT0    (DMA_BASE+0x0174)
-+#define DMAMM_1_DAR_CURRENT1    (DMA_BASE+0x017C)
-+
-+#define DMAMP_RX_5_CONTROL      (DMA_BASE+0x0200)
-+#define DMAMP_RX_5_INTERRUPT    (DMA_BASE+0x0204)
-+#define DMAMP_RX_5_PPALLOC      (DMA_BASE+0x0208)
-+#define DMAMP_RX_5_STATUS       (DMA_BASE+0x020C)
-+#define DMAMP_RX_5_REMAIN       (DMA_BASE+0x0214)
-+#define DMAMP_RX_5_MAXCNT0      (DMA_BASE+0x0220)
-+#define DMAMP_RX_5_BASE0        (DMA_BASE+0x0224)
-+#define DMAMP_RX_5_CURRENT0     (DMA_BASE+0x0228)
-+#define DMAMP_RX_5_MAXCNT1      (DMA_BASE+0x0230)
-+#define DMAMP_RX_5_BASE1        (DMA_BASE+0x0234)
-+#define DMAMP_RX_5_CURRENT1     (DMA_BASE+0x0238)
-+
-+#define DMAMP_TX_4_CONTROL      (DMA_BASE+0x0240)
-+#define DMAMP_TX_4_INTERRUPT    (DMA_BASE+0x0244)
-+#define DMAMP_TX_4_PPALLOC      (DMA_BASE+0x0248)
-+#define DMAMP_TX_4_STATUS       (DMA_BASE+0x024C)
-+#define DMAMP_TX_4_REMAIN       (DMA_BASE+0x0254)
-+#define DMAMP_TX_4_MAXCNT0      (DMA_BASE+0x0260)
-+#define DMAMP_TX_4_BASE0        (DMA_BASE+0x0264)
-+#define DMAMP_TX_4_CURRENT0     (DMA_BASE+0x0268)
-+#define DMAMP_TX_4_MAXCNT1      (DMA_BASE+0x0270)
-+#define DMAMP_TX_4_BASE1        (DMA_BASE+0x0274)
-+#define DMAMP_TX_4_CURRENT1     (DMA_BASE+0x0278)
-+
-+#define DMAMP_RX_7_CONTROL      (DMA_BASE+0x0280)
-+#define DMAMP_RX_7_INTERRUPT    (DMA_BASE+0x0284)
-+#define DMAMP_RX_7_PPALLOC      (DMA_BASE+0x0288)
-+#define DMAMP_RX_7_STATUS       (DMA_BASE+0x028C)
-+#define DMAMP_RX_7_REMAIN       (DMA_BASE+0x0294)
-+#define DMAMP_RX_7_MAXCNT0      (DMA_BASE+0x02A0)
-+#define DMAMP_RX_7_BASE0        (DMA_BASE+0x02A4)
-+#define DMAMP_RX_7_CURRENT0     (DMA_BASE+0x02A8)
-+#define DMAMP_RX_7_MAXCNT1      (DMA_BASE+0x02B0)
-+#define DMAMP_RX_7_BASE1        (DMA_BASE+0x02B4)
-+#define DMAMP_RX_7_CURRENT1     (DMA_BASE+0x02B8)
-+
-+#define DMAMP_TX_6_CONTROL      (DMA_BASE+0x02C0)
-+#define DMAMP_TX_6_INTERRUPT    (DMA_BASE+0x02C4)
-+#define DMAMP_TX_6_PPALLOC      (DMA_BASE+0x02C8)
-+#define DMAMP_TX_6_STATUS       (DMA_BASE+0x02CC)
-+#define DMAMP_TX_6_REMAIN       (DMA_BASE+0x02D4)
-+#define DMAMP_TX_6_MAXCNT0      (DMA_BASE+0x02E0)
-+#define DMAMP_TX_6_BASE0        (DMA_BASE+0x02E4)
-+#define DMAMP_TX_6_CURRENT0     (DMA_BASE+0x02E8)
-+#define DMAMP_TX_6_MAXCNT1      (DMA_BASE+0x02F0)
-+#define DMAMP_TX_6_BASE1        (DMA_BASE+0x02F4)
-+#define DMAMP_TX_6_CURRENT1     (DMA_BASE+0x02F8)
-+
-+#define DMAMP_RX_9_CONTROL      (DMA_BASE+0x0300)
-+#define DMAMP_RX_9_INTERRUPT    (DMA_BASE+0x0304)
-+#define DMAMP_RX_9_PPALLOC      (DMA_BASE+0x0308)
-+#define DMAMP_RX_9_STATUS       (DMA_BASE+0x030C)
-+#define DMAMP_RX_9_REMAIN       (DMA_BASE+0x0314)
-+#define DMAMP_RX_9_MAXCNT0      (DMA_BASE+0x0320)
-+#define DMAMP_RX_9_BASE0        (DMA_BASE+0x0324)
-+#define DMAMP_RX_9_CURRENT0     (DMA_BASE+0x0328)
-+#define DMAMP_RX_9_MAXCNT1      (DMA_BASE+0x0330)
-+#define DMAMP_RX_9_BASE1        (DMA_BASE+0x0334)
-+#define DMAMP_RX_9_CURRENT1     (DMA_BASE+0x0338)
-+
-+#define DMAMP_TX_8_CONTROL      (DMA_BASE+0x0340)
-+#define DMAMP_TX_8_INTERRUPT    (DMA_BASE+0x0344)
-+#define DMAMP_TX_8_PPALLOC      (DMA_BASE+0x0348)
-+#define DMAMP_TX_8_STATUS       (DMA_BASE+0x034C)
-+#define DMAMP_TX_8_REMAIN       (DMA_BASE+0x0354)
-+#define DMAMP_TX_8_MAXCNT0      (DMA_BASE+0x0360)
-+#define DMAMP_TX_8_BASE0        (DMA_BASE+0x0364)
-+#define DMAMP_TX_8_CURRENT0     (DMA_BASE+0x0368)
-+#define DMAMP_TX_8_MAXCNT1      (DMA_BASE+0x0370)
-+#define DMAMP_TX_8_BASE1        (DMA_BASE+0x0374)
-+#define DMAMP_TX_8_CURRENT1     (DMA_BASE+0x0378)
-+
-+#define DMA_ARBITRATION         (DMA_BASE+0x0380)
-+#define DMA_INTERRUPT           (DMA_BASE+0x03C0)
-+
-+
-+/*
-+ * DMA Register Base addresses and Offsets
-+ */
-+#define DMA_M2P_TX_0_BASE       DMAMP_TX_0_CONTROL
-+#define DMA_M2P_RX_1_BASE       DMAMP_RX_1_CONTROL
-+#define DMA_M2P_TX_2_BASE       DMAMP_TX_2_CONTROL
-+#define DMA_M2P_RX_3_BASE       DMAMP_RX_3_CONTROL
-+#define DMA_M2M_0_BASE          DMAMM_0_CONTROL
-+#define DMA_M2M_1_BASE          DMAMM_1_CONTROL
-+#define DMA_M2P_RX_5_BASE       DMAMP_RX_5_CONTROL
-+#define DMA_M2P_TX_4_BASE       DMAMP_TX_4_CONTROL
-+#define DMA_M2P_RX_7_BASE       DMAMP_RX_7_CONTROL
-+#define DMA_M2P_TX_6_BASE       DMAMP_TX_6_CONTROL
-+#define DMA_M2P_RX_9_BASE       DMAMP_RX_9_CONTROL
-+#define DMA_M2P_TX_8_BASE       DMAMP_TX_8_CONTROL
-+
-+#define M2P_OFFSET_CONTROL          0x0000
-+#define M2P_OFFSET_INTERRUPT        0x0004
-+#define M2P_OFFSET_PPALLOC          0x0008
-+#define M2P_OFFSET_STATUS           0x000C
-+#define M2P_OFFSET_REMAIN           0x0014
-+#define M2P_OFFSET_MAXCNT0          0x0020
-+#define M2P_OFFSET_BASE0            0x0024
-+#define M2P_OFFSET_CURRENT0         0x0028
-+#define M2P_OFFSET_MAXCNT1          0x0030
-+#define M2P_OFFSET_BASE1            0x0034
-+#define M2P_OFFSET_CURRENT1         0x0038
-+
-+#define M2M_OFFSET_CONTROL          0x0000
-+#define M2M_OFFSET_INTERRUPT        0x0004
-+#define M2M_OFFSET_STATUS           0x000C
-+#define M2M_OFFSET_BCR0             0x0010
-+#define M2M_OFFSET_BCR1             0x0014
-+#define M2M_OFFSET_SAR_BASE0        0x0018
-+#define M2M_OFFSET_SAR_BASE1        0x001C
-+#define M2M_OFFSET_SAR_CURRENT0     0x0024
-+#define M2M_OFFSET_SAR_CURRENT1     0x0028
-+#define M2M_OFFSET_DAR_BASE0        0x002C
-+#define M2M_OFFSET_DAR_BASE1        0x0030
-+#define M2M_OFFSET_DAR_CURRENT0     0x0034
-+#define M2M_OFFSET_DAR_CURRENT1     0x003C
-+
-+
-+
-+//-----------------------------------------------------------------------------
-+// PWRCNT Register Defines
-+//-----------------------------------------------------------------------------
-+#define SYSCON_PWRCNT_FIREN             0x80000000
-+#define SYSCON_PWRCNT_UARTBAUD          0x20000000
-+#define SYSCON_PWRCNT_USHEN             0x10000000
-+#define SYSCON_PWRCNT_DMA_M2MCH1        0x08000000
-+#define SYSCON_PWRCNT_DMA_M2MCH0        0x04000000
-+#define SYSCON_PWRCNT_DMA_M2PCH8        0x02000000
-+#define SYSCON_PWRCNT_DMA_M2PCH9        0x01000000
-+#define SYSCON_PWRCNT_DMA_M2PCH6        0x00800000
-+#define SYSCON_PWRCNT_DMA_M2PCH7        0x00400000
-+#define SYSCON_PWRCNT_DMA_M2PCH4        0x00200000
-+#define SYSCON_PWRCNT_DMA_M2PCH5        0x00100000
-+#define SYSCON_PWRCNT_DMA_M2PCH2        0x00080000
-+#define SYSCON_PWRCNT_DMA_M2PCH3        0x00040000
-+#define SYSCON_PWRCNT_DMA_M2PCH0        0x00020000
-+#define SYSCON_PWRCNT_DMA_M2PCH1        0x00010000
-+
-+#ifndef __ASSEMBLY__
-+/*
-+ * DMA Register Base addresses
-+ */
-+static unsigned int const DMAM2PChannelBase[10] =
-+{
-+    DMA_M2P_TX_0_BASE,
-+    DMA_M2P_RX_1_BASE,
-+    DMA_M2P_TX_2_BASE,
-+    DMA_M2P_RX_3_BASE,
-+    DMA_M2P_TX_4_BASE,
-+    DMA_M2P_RX_5_BASE,
-+    DMA_M2P_TX_6_BASE,
-+    DMA_M2P_RX_7_BASE,
-+    DMA_M2P_TX_8_BASE,
-+    DMA_M2P_RX_9_BASE
-+};
-+
-+static unsigned int const DMAM2MChannelBase[2] =
-+{
-+    DMA_M2M_0_BASE,
-+    DMA_M2M_1_BASE
-+};
-+
-+#endif /* __ASSEMBLY__ */
-+
-+/*****************************************************************************
-+ *
-+ * DMA buffer structure type.
-+ *
-+ ****************************************************************************/
-+typedef struct ep93xx_dma_buffer_s
-+{
-+    unsigned int    source;     /* buffer physical source address.          */
-+    unsigned int    dest;       /* buffer physical destination address,     */
-+                                /* only used with the 2 M2M channels.       */
-+    unsigned int    size;       /* buffer size in bytes                     */
-+    unsigned int    last;       /* 1 if this is the last buffer             */
-+                                /* in this transaction.  If 1,              */
-+                                /* disable the NFBint so we aren't          */
-+                                /* interrupted for another buffer           */
-+                                /* when we know there won't be another.     */
-+    unsigned int    used;       /* This field is set to 1 by the DMA        */
-+                                /* interface after the buffer is transferred*/
-+    int    buf_id;              /* unique identifyer specified by the       */
-+                                /* the driver which requested the dma       */
-+} ep93xx_dma_buffer_t;
-+
-+typedef ep93xx_dma_buffer_t * ep93xx_dma_buffer_p;
-+
-+/*****************************************************************************
-+ *
-+ * Instance definition for the DMA interface.
-+ *
-+ ****************************************************************************/
-+typedef struct ep9312_dma_s
-+{
-+    /*
-+     *  This 1 when the instance is in use, and 0 when it's not.
-+     */
-+    unsigned int ref_count;
-+
-+    /*
-+     * This is the last valid handle for this instance.  When giving out a
-+     * new handle this will be incremented and given out.
-+     */
-+    int last_valid_handle;
-+
-+    /*
-+     * device specifies one of the 20 DMA hardware ports this
-+     * DMA channel will service.
-+     */
-+    ep93xx_dma_dev_t device;
-+
-+    /*
-+     * DMABufferQueue is the queue of buffer structure pointers which the
-+     * dma channel will use to setup transfers.
-+     */
-+    ep93xx_dma_buffer_t buffer_queue[MAX_EP93XX_DMA_BUFFERS];
-+
-+    /*
-+     * currnt_buffer : This is the buffer currently being transfered on
-+     *                 this channel.
-+     * last_buffer : This is the last buffer for this transfer.
-+     * Note: current_buffer + 1 is already programmed into the dma
-+     *       channel as the next buffer to transfer. Don't write
-+     *       over either entry.
-+     */
-+    int current_buffer;
-+    int last_buffer;
-+
-+    /*
-+     * The following 3 fields are buffer counters.
-+     *
-+     * iNewBuffers: Buffers in the queue which have not been transfered.
-+     * iUsedBuffers: Buffers in the queue which have have been tranferred,
-+     *               and are waiting to be returned.
-+     * iTotalBuffers: Total number of buffers in the queue.
-+     */
-+    int new_buffers;
-+    int used_buffers;
-+    int total_buffers;
-+
-+    /*
-+     * uiTotalBytes has the total bytes transfered on the channel since the
-+     * last flush.  This value does not include the bytes tranfered in the
-+     * current buffer.  A byte count is only added after a complete buffer
-+     * is tranfered.
-+     */
-+    unsigned int total_bytes;
-+
-+    /*
-+     *  Interrupt number for this channel
-+     */
-+    unsigned int irq;
-+
-+    /*
-+     * Indicates whether or not the channel is currently enabled to transfer
-+     * data.
-+     */
-+    unsigned int xfer_enable;
-+
-+    /*
-+     * pause indicates if the dma channel was paused by calling the pause
-+     * ioctl.
-+     */
-+    unsigned int pause;
-+
-+    /*
-+     *  buffer structure used during a pause to capture the current
-+     *  address and remaining bytes for the buffer actively being transferred
-+     *  on the channel. This buffer will be used to reprogram the dma
-+     *  channel upon a resume.
-+     */
-+    ep93xx_dma_buffer_t pause_buf;
-+
-+    /*
-+     * DMACallback is a function pointer which the calling application can
-+     * use install a function to.  this fuction can be used to notify the
-+     * calling application of an interrupt.
-+     */
-+    dma_callback callback;
-+
-+    /*
-+     * User data used as a parameter for the Callback function.  The user
-+     * sets up the data and sends it with the callback function.
-+     */
-+    unsigned int user_data;
-+
-+    /*
-+     * A string representation of the device attached to the channel.
-+     */
-+    const char * device_id;
-+
-+    /*
-+     * The register base address for this dma channel.
-+     */
-+    unsigned int reg_base;
-+
-+    /*
-+     * terminated indicates
-+     */
-+    unsigned int terminated;
-+
-+
-+} ep93xx_dma_t;
-+
-+/*****************************************************************************
-+ *
-+ * DMA macros
-+ *
-+ ****************************************************************************/
-+#define DMA_HANDLE_SPECIFIER_MASK   0xF0000000
-+#define DMA_CH0_HANDLE_SPECIFIER    0x00000000
-+#define DMA_CH1_HANDLE_SPECIFIER    0x10000000
-+#define DMA_CH2_HANDLE_SPECIFIER    0x20000000
-+#define DMA_CH3_HANDLE_SPECIFIER    0x30000000
-+#define DMA_CH4_HANDLE_SPECIFIER    0x40000000
-+#define DMA_CH5_HANDLE_SPECIFIER    0x50000000
-+#define DMA_CH6_HANDLE_SPECIFIER    0x60000000
-+#define DMA_CH7_HANDLE_SPECIFIER    0x70000000
-+#define DMA_CH8_HANDLE_SPECIFIER    0x80000000
-+#define DMA_CH9_HANDLE_SPECIFIER    0x90000000
-+#define DMA_CH10_HANDLE_SPECIFIER   0xA0000000
-+#define DMA_CH11_HANDLE_SPECIFIER   0xB0000000
-+
-+#endif // _DMADRV_H_
diff --git a/target/linux/ep93xx/patches-2.6.30/006-ep93xx-touchscreen.patch b/target/linux/ep93xx/patches-2.6.30/006-ep93xx-touchscreen.patch
deleted file mode 100644
index 6a0d5dbfd..000000000
--- a/target/linux/ep93xx/patches-2.6.30/006-ep93xx-touchscreen.patch
+++ /dev/null
@@ -1,1319 +0,0 @@
-Index: linux-2.6.30.9/drivers/input/touchscreen/Kconfig
-===================================================================
---- linux-2.6.30.9.orig/drivers/input/touchscreen/Kconfig	2009-11-24 21:00:18.000000000 +0100
-+++ linux-2.6.30.9/drivers/input/touchscreen/Kconfig	2009-11-24 21:00:45.000000000 +0100
-@@ -161,6 +161,10 @@
- 	  module will be called wacom_w8001.
- 
- 
-+config TOUCHSCREEN_EP93XX
-+	tristate "EP93xx Touchscreen"
-+	depends on ARM && INPUT && ARCH_EP93XX
-+
- config TOUCHSCREEN_MTOUCH
- 	tristate "MicroTouch serial touchscreens"
- 	select SERIO
-Index: linux-2.6.30.9/drivers/input/touchscreen/Makefile
-===================================================================
---- linux-2.6.30.9.orig/drivers/input/touchscreen/Makefile	2009-11-24 21:00:18.000000000 +0100
-+++ linux-2.6.30.9/drivers/input/touchscreen/Makefile	2009-11-24 21:00:45.000000000 +0100
-@@ -14,6 +14,7 @@
- obj-$(CONFIG_TOUCHSCREEN_CORGI)		+= corgi_ts.o
- obj-$(CONFIG_TOUCHSCREEN_GUNZE)		+= gunze.o
- obj-$(CONFIG_TOUCHSCREEN_ELO)		+= elo.o
-+obj-$(CONFIG_TOUCHSCREEN_EP93XX)	+= ep93xx_ts.o
- obj-$(CONFIG_TOUCHSCREEN_FUJITSU)	+= fujitsu_ts.o
- obj-$(CONFIG_TOUCHSCREEN_INEXIO)	+= inexio.o
- obj-$(CONFIG_TOUCHSCREEN_MIGOR)		+= migor_ts.o
-Index: linux-2.6.30.9/drivers/input/touchscreen/ep93xx_ts.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.30.9/drivers/input/touchscreen/ep93xx_ts.c	2009-11-24 21:09:48.000000000 +0100
-@@ -0,0 +1,1117 @@
-+/*
-+ *  linux/drivers/input/touchscreen/ep93xx_ts.c
-+ *
-+ *  Copyright (C) 2003-2004 Cirrus Corp.
-+ *
-+ * 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.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/types.h>
-+#include <linux/delay.h>
-+#include <linux/wait.h>
-+#include <linux/fs.h>
-+#include <linux/sched.h>
-+#include <linux/poll.h>
-+#include <linux/miscdevice.h>
-+#include <linux/init.h>
-+#include <linux/compiler.h>
-+#include <linux/timer.h>
-+#include <linux/interrupt.h>
-+#include <linux/syscalls.h>
-+#include <linux/input.h>
-+#include <asm/irq.h>
-+#include <mach/hardware.h>
-+#include <asm/io.h>
-+
-+#define TOUCH_OFFSET            0x100000
-+#define TOUCH_BASE              (EP93XX_APB_VIRT_BASE|TOUCH_OFFSET)
-+#define TSSetup                 (TOUCH_BASE+0x00) /* R/W touchscreen controller setup control register.     */
-+#define TSXYMaxMin              (TOUCH_BASE+0x04) /* R/W touchscreen controller max/min register.           */
-+#define TSXYResult              (TOUCH_BASE+0x08) /* R   touchscreen controller result register.            */
-+#define TSDischarge             (TOUCH_BASE+0x0C) /* LOCKED R/W touchscreen Switch Matrix control register. */
-+#define TSXSample               (TOUCH_BASE+0x10) /* LOCKED R/W touchscreen Switch Matrix control register. */
-+#define TSYSample               (TOUCH_BASE+0x14) /* LOCKED R/W touchscreen Switch Matrix control register. */
-+#define TSDirect                (TOUCH_BASE+0x18) /* LOCKED R/W touchscreen Switch Matrix control register. */
-+#define TSDetect                (TOUCH_BASE+0x1C) /* LOCKED R/W touchscreen Switch Matrix control register. */
-+#define TSSWLock                (TOUCH_BASE+0x20) /*  NA    R/W touchscreen software lock register.         */
-+#define TSSetup2                (TOUCH_BASE+0x24) /* R/W touchscreen setup control register #2.             */
-+
-+//
-+// To customize for a new touchscreen, there are various macros that
-+// have to be set.  If you allow UART_HACK_DEBUG to be defined, you
-+// will get real time ts data scrolling up your serial terminal
-+// screen that will help you empirically determine good values for these.
-+//
-+
-+//
-+// These are used as trigger levels to know when we have pen up/down
-+//
-+// The rules:
-+// 1.  TS_HEAVY_INV_PRESSURE < TS_LIGHT_INV_PRESSURE because these
-+//    are Inverse pressure.
-+// 2.  Any touch lighter than TS_LIGHT_INV_PRESSURE is a pen up.
-+// 3.  Any touch heavier than TS_HEAVY_INV_PRESSURE is a pen down.
-+//
-+#define   TS_HEAVY_INV_PRESSURE 0xFE0 //C00
-+#define   TS_LIGHT_INV_PRESSURE 0xFFF //e00
-+
-+//
-+// If the x, y, or inverse pressure changes more than these values
-+// between two succeeding points, the point is not reported.
-+//
-+#define   TS_MAX_VALID_XY_CHANGE 0x300
-+#define   TS_MAX_VALID_PRESSURE_CHANGE  0x100
-+
-+//
-+// This is the minimum Z1 Value that is valid.
-+//
-+#define     MIN_Z1_VALUE                    0x50
-+
-+//
-+// Settling delay for taking each ADC measurement.  Increase this
-+// if ts is jittery.
-+//
-+#define EP93XX_TS_ADC_DELAY_USEC 2000
-+
-+//
-+// Delay between TS points.
-+//
-+#define EP93XX_TS_PER_POINT_DELAY_USEC 10000
-+
-+//-----------------------------------------------------------------------------
-+// Debug messaging thru the UARTs
-+//-----------------------------------------------------------------------------
-+/*
-+ *  Hello there!  Are you trying to get this driver to work with a new
-+ *  touschscreen?  Turn this on and you will get useful info coming
-+ *  out of your serial port.
-+ */
-+/* #define PRINT_CALIBRATION_FACTORS */
-+#ifdef PRINT_CALIBRATION_FACTORS
-+#define UART_HACK_DEBUG 1
-+int iMaxX=0, iMaxY=0, iMinX = 0xfff, iMinY = 0xfff;
-+#endif
-+
-+/*
-+ * For debugging, let's spew messages out serial port 1 or 3 at 57,600 baud.
-+ */
-+/* #define UART_HACK_DEBUG 1 */
-+#if 0
-+#ifdef UART_HACK_DEBUG
-+static char szBuf[256];
-+void UARTWriteString(char * msg);
-+#define DPRINTK( x... )   \
-+    sprintf( szBuf, ##x ); \
-+    UARTWriteString( szBuf );
-+#else
-+static char szBuf[256];
-+#define DPRINTK( x... )  \
-+    sprintf( szBuf, ##x ); \
-+    printk( szBuf );
-+#endif
-+#endif // 0
-+#define DPRINTK( x... )
-+
-+//-----------------------------------------------------------------------------
-+// A few more macros...
-+//-----------------------------------------------------------------------------
-+#define TSSETUP_DEFAULT  ( TSSETUP_NSMP_32 | TSSETUP_DEV_64 |  \
-+                           ((128<<TSSETUP_SDLY_SHIFT) & TSSETUP_SDLY_MASK) | \
-+                           ((128<<TSSETUP_DLY_SHIFT)  & TSSETUP_DLY_MASK) )
-+
-+#define TSSETUP2_DEFAULT (TSSETUP2_NSIGND)
-+
-+//
-+// For now, we use one of the minor numbers from the local/experimental
-+// range.
-+//
-+#define EP93XX_TS_MINOR 240
-+
-+//-----------------------------------------------------------------------------
-+// Static Declarations
-+//-----------------------------------------------------------------------------
-+static unsigned int   guiLastX, guiLastY;
-+static unsigned int   guiLastInvPressure;
-+
-+struct TouchScreenSample
-+{
-+    int     currentX;
-+    int     currentY;
-+    int     currentButton;
-+    int     currentPressure;
-+    struct timeval currentTime;
-+};
-+
-+//
-+// This must match the structure in tslib.
-+//
-+struct ts_sample {
-+    int     x;
-+    int     y;
-+    unsigned int    pressure;
-+    struct timeval  tv;
-+};
-+
-+
-+static struct TouchScreenSample gSample;
-+
-+// static int currentX, currentY, currentButton;
-+// static int gPressure;
-+// static struct timeval  gtime;
-+
-+static int bFreshTouchData;
-+static int bCurrentPenDown;
-+
-+
-+
-+static DECLARE_WAIT_QUEUE_HEAD(queue);
-+static DECLARE_MUTEX(open_sem);
-+static spinlock_t event_buffer_lock = SPIN_LOCK_UNLOCKED;
-+static struct fasync_struct *ep93xx_fasync;
-+
-+//-----------------------------------------------------------------------------
-+// Typedef Declarations
-+//-----------------------------------------------------------------------------
-+typedef enum {
-+    TS_MODE_UN_INITIALIZED,
-+    TS_MODE_HARDWARE_SCAN,
-+    TS_MODE_SOFT_SCAN
-+} ts_mode_t;
-+
-+static ts_mode_t      gScanningMode;
-+
-+typedef enum{
-+    TS_STATE_STOPPED = 0,
-+    TS_STATE_Z1,
-+    TS_STATE_Z2,
-+    TS_STATE_Y,
-+    TS_STATE_X,
-+    TS_STATE_DONE
-+} ts_states_t;
-+
-+typedef struct
-+{
-+    unsigned int   uiX;
-+    unsigned int   uiY;
-+    unsigned int   uiZ1;
-+    unsigned int   uiZ2;
-+    ts_states_t    state;
-+} ts_struct_t;
-+
-+static ts_struct_t sTouch;
-+
-+/*
-+ * From the spec, here's how to set up the touch screen's switch registers.
-+ */
-+typedef struct
-+{
-+    unsigned int uiDetect;
-+    unsigned int uiDischarge;
-+    unsigned int uiXSample;
-+    unsigned int uiYSample;
-+    unsigned int uiSwitchZ1;
-+    unsigned int uiSwitchZ2;
-+}SwitchStructType;
-+
-+//
-+// Here's the switch settings for a 4-wire touchscreen.  See the spec
-+// for how to handle a 4, 7, or 8-wire.
-+//
-+const static SwitchStructType sSwitchSettings =
-+/*     s28en=0
-+ *   TSDetect    TSDischarge  TSXSample  TSYSample    SwitchZ1   SwitchZ2
-+ */
-+    {0x00403604, 0x0007fe04, 0x00081604, 0x00104601, 0x00101601, 0x00101608};
-+
-+
-+//-----------------------------------------------------------------------------
-+// Function Declarations
-+//-----------------------------------------------------------------------------
-+static void ep93xx_ts_set_direct( unsigned int uiADCSwitch );
-+static irqreturn_t ep93xx_ts_isr(int irq, void *dev_id);
-+static irqreturn_t ep93xx_timer2_isr(int irq, void *dev_id);
-+static void ee93xx_ts_evt_add( int button, int dX, int dY, int Pressure );
-+static ssize_t ep93xx_ts_read(struct file *filp, char *buf,
-+        size_t count, loff_t *l);
-+static unsigned int ep93xx_ts_poll(struct file *filp, poll_table *wait);
-+static int ep93xx_ts_open(struct inode *inode, struct file *filp);
-+static int ep93xx_ts_fasync(int fd, struct file *filp, int on);
-+static int ep93xx_ts_release(struct inode *inode, struct file *filp);
-+static ssize_t ep93xx_ts_write(struct file *file, const char *buffer,
-+                size_t count, loff_t *ppos);
-+static void ep93xx_ts_setup(void);
-+static void ep93xx_ts_shutdown(void);
-+int __init ep93xx_ts_init(void);
-+void __exit ep93xx_ts_exit(void);
-+static unsigned int CalculateInvPressure( void );
-+static unsigned int ADCGetData( unsigned int uiSamples, unsigned int uiMaxDiff);
-+static void TS_Soft_Scan_Mode(void);
-+static void TS_Hardware_Scan_Mode(void);
-+static void ProcessPointData(void);
-+static void Set_Timer2_uSec( unsigned int Delay_mSec );
-+static void Stop_Timer2(void);
-+
-+
-+
-+//-----------------------------------------------------------------------------
-+//  Debug stuff...
-+//-----------------------------------------------------------------------------
-+
-+#ifdef UART_HACK_DEBUG
-+
-+// This "array" is a cheap-n-easy way of getting access to the UART registers.
-+static unsigned int * const pDebugUART=(unsigned int *)IO_ADDRESS(UART1_BASE);
-+//static unsigned int * const pDebugUART=(unsigned int *)IO_ADDRESS(UART3_BASE);
-+static int bUartInitialized = 0;
-+
-+void SendChar(char value)
-+{
-+    // wait for Tx fifo full flag to clear.
-+    while (pDebugUART[0x18>>2] & 0x20);
-+
-+    // send a char to the uart
-+    pDebugUART[0] = value;
-+}
-+
-+void UARTWriteString(char * msg)
-+{
-+    int index = 0;
-+    unsigned int uiTemp;
-+
-+    //if((pDebugUART[0x14>>2] & 0x1) == 0)
-+    if( bUartInitialized == 0 )
-+    {
-+        uiTemp = inl(EP93XX_SYSCON_DEVICE_CONFIG);
-+        uiTemp |= EP93XX_SYSCON_DEVCFG_U1E;
-+        //uiTemp |= EP93XX_SYSCON_DEVCFG_U3E;
-+        SysconSetLocked(EP93XX_SYSCON_DEVICE_CONFIG, uiTemp);
-+        pDebugUART[0x10>>2] = 0xf;
-+        pDebugUART[0xc>>2] = 0;
-+        pDebugUART[0x8>>2] = 0x70;
-+        pDebugUART[0x14>>2] = 0x1;
-+        bUartInitialized = 1;
-+    }
-+    while (msg[index] != 0)
-+    {
-+        if (msg[index] == '\n')
-+        {
-+            SendChar('\r');
-+            SendChar('\n');
-+        }
-+        else
-+        {
-+            SendChar(msg[index]);
-+        }
-+        index++;
-+    }
-+}
-+#endif // UART_HACK_DEBUG
-+
-+/*
-+ *  ep93xx_ts_isr
-+ */
-+static irqreturn_t ep93xx_ts_isr(int irq, void *dev_id)
-+{
-+    DPRINTK("isr\n");
-+
-+    //
-+    // Note that we don't clear the interrupt here.  The interrupt
-+    // gets cleared in TS_Soft_Scan_Mode when the TS ENABLE
-+    // bit is cleared.
-+    //
-+
-+    //
-+    // Set the ts to manual polling mode and schedule a callback.
-+    // That way we can return from the isr in a reasonable amount of
-+    // time and process the touch in the callback after a brief delay.
-+    //
-+    TS_Soft_Scan_Mode();
-+
-+    return(IRQ_HANDLED);
-+}
-+
-+/*
-+ * Save the current ts 'event' in an atomic fashion.
-+ */
-+static void ee93xx_ts_evt_add( int buttons, int iX, int iY, int iPressure )
-+{
-+#ifdef PRINT_CALIBRATION_FACTORS
-+    if( iX > iMaxX ) iMaxX = iX;
-+    if( iX < iMinX ) iMinX = iX;
-+    if( iY > iMaxY ) iMaxY = iY;
-+    if( iY < iMinY ) iMinY = iY;
-+#endif
-+
-+
-+    // printk("ee93xx_ts_evt_add\n");
-+    //DPRINTK("cb\n");
-+    /*
-+     * Note the event, but use spinlocks to keep it from getting
-+     * halfway read if we get interrupted.
-+     */
-+
-+    spin_lock(&event_buffer_lock);
-+    gSample.currentX        = iX;
-+    gSample.currentY        = iY;
-+    gSample.currentButton   = buttons;
-+    gSample.currentPressure = iPressure;
-+    bFreshTouchData         = 1;
-+    do_gettimeofday(&gSample.currentTime);
-+
-+
-+    spin_unlock(&event_buffer_lock);
-+
-+    kill_fasync(&ep93xx_fasync, SIGIO, POLL_IN);
-+    wake_up_interruptible(&queue);
-+
-+}
-+
-+
-+static ssize_t ep93xx_ts_read(struct file *filp, char *buf, size_t count, loff_t *l)
-+{
-+
-+    unsigned short data[3];
-+    struct  ts_sample   ts_data;
-+    int     iReturn = -EFAULT;
-+    // printk("ep93xx_ts_read\n");
-+
-+#ifdef PRINT_CALIBRATION_FACTORS
-+    static int lala=0;
-+    if( bFreshTouchData && (lala++ > 9) )
-+    {
-+        DPRINTK("%4d, %4d - range [%4d to %4d],[%4d to %4d]\n",
-+            f, currentY, iMinX, iMaxX, iMinY, iMaxY );
-+        lala = 0;
-+    }
-+#endif
-+    if( !bFreshTouchData)
-+    {
-+        iReturn = 0;
-+    }
-+    else if( (count == sizeof(data)) )
-+    {
-+        spin_lock_irq(&event_buffer_lock);
-+        bFreshTouchData = 0;
-+        data[0] = gSample.currentX;
-+        data[1] = gSample.currentY;
-+        data[2] = gSample.currentButton;
-+
-+        spin_unlock_irq(&event_buffer_lock);
-+
-+        if (copy_to_user(buf, data, sizeof data))
-+            return -EFAULT;
-+
-+        count -= sizeof(data);
-+
-+        /* return the # of bytes that got read */
-+        iReturn = sizeof(data) ;
-+    }
-+    else if (count == sizeof(struct ts_sample) )
-+    {
-+        spin_lock_irq(&event_buffer_lock);
-+        bFreshTouchData = 0;
-+        ts_data.x           = gSample.currentX;
-+        ts_data.y           = gSample.currentY;
-+        ts_data.pressure    = gSample.currentPressure;
-+        ts_data.tv          = gSample.currentTime;
-+        spin_unlock_irq(&event_buffer_lock);
-+
-+        if (copy_to_user(buf, &ts_data, sizeof(struct ts_sample)))
-+        {
-+            iReturn = -EFAULT;
-+        }
-+        else
-+        {
-+            count -= sizeof(ts_data);
-+            iReturn = sizeof(ts_data);
-+        }
-+
-+    }
-+
-+    return iReturn;
-+}
-+
-+static unsigned int ep93xx_ts_poll(struct file *filp, poll_table *wait)
-+{
-+    // printk("ep93xx_ts_poll\n");
-+    poll_wait(filp, &queue, wait);
-+
-+    if( bFreshTouchData )
-+    {
-+        return POLLIN | POLLRDNORM;
-+    }
-+
-+    return 0;
-+}
-+
-+static int ep93xx_ts_open(struct inode *inode, struct file *filp)
-+{
-+     printk("ep93xx_ts_open");
-+
-+    if( down_trylock(&open_sem) )
-+    {
-+        return -EBUSY;
-+    }
-+
-+    ep93xx_ts_setup();
-+
-+    return 0;
-+}
-+
-+/*
-+ * Asynchronous I/O support.
-+ */
-+static int ep93xx_ts_fasync(int fd, struct file *filp, int on)
-+{
-+    int retval;
-+
-+    retval = fasync_helper(fd, filp, on, &ep93xx_fasync);
-+    if (retval < 0)
-+    {
-+        return retval;
-+    }
-+
-+    return 0;
-+}
-+
-+static int ep93xx_ts_release(struct inode *inode, struct file *filp)
-+{
-+    Stop_Timer2();
-+
-+    /*
-+     * Call our async I/O support to request that this file
-+     * cease to be used for async I/O.
-+     */
-+    ep93xx_ts_fasync(-1, filp, 0);
-+
-+    ep93xx_ts_shutdown();
-+
-+    up(&open_sem);
-+
-+    return 0;
-+}
-+
-+static ssize_t ep93xx_ts_write(struct file *file, const char *buffer, size_t count,
-+               loff_t *ppos)
-+{
-+    return -EINVAL;
-+}
-+
-+
-+static int ep93xx_ts_ioctl(struct inode *inode, struct file *file, uint command, ulong u)
-+{
-+    static const int         version = EV_VERSION;
-+    static const u_int32_t   bit =(1 << EV_ABS);
-+    static const u_int32_t   absbit = (1 << ABS_X) | (1 << ABS_Y) | (1 << ABS_PRESSURE);
-+    int         iReturn ;
-+    int         i = 0;
-+
-+    switch(command)
-+    {
-+        case EVIOCGVERSION:
-+            DPRINTK("ep93xx_ts_ioctl command = EVIOCGVERSION\r\n");
-+            i = copy_to_user((void __user *)u, (void *)version, sizeof(version));
-+            iReturn = i ? -EFAULT : 0;
-+            break;
-+
-+        case EVIOCGBIT(0,sizeof(u_int32_t) * 8) :
-+            DPRINTK("ep93xx_ts_ioctl command = EVIOCGBIT(0,sizeof(uint32) * 8)\r\n");
-+            i = copy_to_user((void __user *)u, (void *)bit, sizeof(bit));
-+            iReturn = i ? -EFAULT : 0;
-+            break;
-+
-+        case EVIOCGBIT(EV_ABS, sizeof(absbit) * 8):
-+            DPRINTK("ep93xx_ts_ioctl command = EVIOCGBIT(0,sizeof(uint32) * 8)\r\n");
-+            copy_to_user((void __user *)u, (void *)absbit, sizeof(absbit));
-+            iReturn = i ? -EFAULT : 0;
-+            break;
-+        default:
-+            DPRINTK(" ep93xx_ts_ioctl unknown command = %d\n",u);
-+            iReturn = -1;
-+            break;
-+    }
-+
-+    return iReturn;
-+}
-+
-+static struct file_operations ep93xx_ts_fops = {
-+    owner:      THIS_MODULE,
-+    read:       ep93xx_ts_read,
-+    write:      ep93xx_ts_write,
-+    poll:       ep93xx_ts_poll,
-+    open:       ep93xx_ts_open,
-+    ioctl:      ep93xx_ts_ioctl,
-+    release:    ep93xx_ts_release,
-+    fasync:     ep93xx_ts_fasync,
-+};
-+
-+static struct miscdevice ep93xx_ts_miscdev =
-+{
-+        EP93XX_TS_MINOR,
-+        "ep93xx_ts",
-+        &ep93xx_ts_fops
-+};
-+
-+void ep93xx_ts_setup(void)
-+{
-+    unsigned int uiKTDIV, uiTSXYMaxMin;
-+    // printk("ep93xx_hw_setup\n");
-+
-+    /*
-+     * Set the TSEN bit in KTDIV so that we are enabling the clock
-+     * for the touchscreen.
-+     */
-+    uiKTDIV = inl(SYSCON_KTDIV);
-+    uiKTDIV |= SYSCON_KTDIV_TSEN;
-+    SysconSetLocked( SYSCON_KTDIV, uiKTDIV );
-+
-+    //
-+    // Program the TSSetup and TSSetup2 registers.
-+    //
-+    outl( TSSETUP_DEFAULT, TSSetup );
-+    outl( TSSETUP2_DEFAULT, TSSetup2 );
-+
-+    //
-+    // Set the the touch settings.
-+    //
-+    outl( 0xaa, TSSWLock );
-+    outl( sSwitchSettings.uiDischarge, TSDirect );
-+
-+    outl( 0xaa, TSSWLock );
-+    outl( sSwitchSettings.uiDischarge, TSDischarge );
-+
-+    outl( 0xaa, TSSWLock );
-+    outl( sSwitchSettings.uiSwitchZ1, TSXSample );
-+
-+    outl( 0xaa, TSSWLock );
-+    outl( sSwitchSettings.uiSwitchZ2, TSYSample );
-+
-+    outl( 0xaa, TSSWLock );
-+    outl( sSwitchSettings.uiDetect, TSDetect );
-+
-+    //
-+    // X,YMin set to 0x40 = have to drag that many pixels for a new irq.
-+    // X,YMax set to 0x40 = 1024 pixels is the maximum movement within the
-+    // time scan limit.
-+    //
-+    uiTSXYMaxMin =  (50   << TSMAXMIN_XMIN_SHIFT) & TSMAXMIN_XMIN_MASK;
-+    uiTSXYMaxMin |= (50   << TSMAXMIN_YMIN_SHIFT) & TSMAXMIN_YMIN_MASK;
-+    uiTSXYMaxMin |= (0xff << TSMAXMIN_XMAX_SHIFT) & TSMAXMIN_XMAX_MASK;
-+    uiTSXYMaxMin |= (0xff << TSMAXMIN_YMAX_SHIFT) & TSMAXMIN_YMAX_MASK;
-+    outl( uiTSXYMaxMin, TSXYMaxMin );
-+
-+    bCurrentPenDown = 0;
-+    bFreshTouchData = 0;
-+    guiLastX = 0;
-+    guiLastY = 0;
-+    guiLastInvPressure = 0xffffff;
-+
-+    //
-+    // Enable the touch screen scanning engine.
-+    //
-+    TS_Hardware_Scan_Mode();
-+}
-+
-+/*
-+ * ep93xx_ts_shutdown
-+ *
-+ */
-+static void
-+ep93xx_ts_shutdown(void)
-+{
-+    unsigned int uiKTDIV;
-+
-+    DPRINTK("ep93xx_ts_shutdown\n");
-+
-+    sTouch.state = TS_STATE_STOPPED;
-+    Stop_Timer2();
-+
-+    /*
-+     * Disable the scanning engine.
-+     */
-+    outl( 0, TSSetup );
-+    outl( 0, TSSetup2 );
-+
-+    /*
-+     * Clear the TSEN bit in KTDIV so that we are disabling the clock
-+     * for the touchscreen.
-+     */
-+    uiKTDIV = inl(SYSCON_KTDIV);
-+    uiKTDIV &= ~SYSCON_KTDIV_TSEN;
-+    SysconSetLocked( SYSCON_KTDIV, uiKTDIV );
-+
-+} /* ep93xx_ts_shutdown */
-+
-+static irqreturn_t ep93xx_timer2_isr(int irq, void *dev_id)
-+{
-+    DPRINTK("%d", (int)sTouch.state );
-+
-+    switch( sTouch.state )
-+    {
-+        case TS_STATE_STOPPED:
-+            TS_Hardware_Scan_Mode();
-+            break;
-+
-+        //
-+        // Get the Z1 value for pressure measurement and set up
-+        // the switch register for getting the Z2 measurement.
-+        //
-+        case TS_STATE_Z1:
-+            Set_Timer2_uSec( EP93XX_TS_ADC_DELAY_USEC );
-+            sTouch.uiZ1 = ADCGetData( 2, 200 );
-+            ep93xx_ts_set_direct( sSwitchSettings.uiSwitchZ2 );
-+            sTouch.state = TS_STATE_Z2;
-+            break;
-+
-+        //
-+        // Get the Z2 value for pressure measurement and set up
-+        // the switch register for getting the Y measurement.
-+        //
-+        case TS_STATE_Z2:
-+            sTouch.uiZ2 = ADCGetData( 2, 200 );
-+            ep93xx_ts_set_direct( sSwitchSettings.uiYSample );
-+            sTouch.state = TS_STATE_Y;
-+            break;
-+
-+        //
-+        // Get the Y value and set up the switch register for
-+        // getting the X measurement.
-+        //
-+        case TS_STATE_Y:
-+            sTouch.uiY = ADCGetData( 4, 20 );
-+            ep93xx_ts_set_direct( sSwitchSettings.uiXSample );
-+            sTouch.state = TS_STATE_X;
-+            break;
-+
-+        //
-+        // Read the X value.  This is the last of the 4 adc values
-+        // we need so we continue on to process the data.
-+        //
-+        case TS_STATE_X:
-+            Stop_Timer2();
-+
-+            sTouch.uiX = ADCGetData( 4, 20 );
-+
-+            outl( 0xaa, TSSWLock );
-+            outl( sSwitchSettings.uiDischarge, TSDirect );
-+
-+            sTouch.state = TS_STATE_DONE;
-+
-+            /*
-+             * Process this set of ADC readings.
-+             */
-+            ProcessPointData();
-+
-+            break;
-+
-+
-+        //
-+        // Shouldn't get here.  But if we do, we can recover...
-+        //
-+        case TS_STATE_DONE:
-+            TS_Hardware_Scan_Mode();
-+            break;
-+    }
-+
-+    //
-+    // Clear the timer2 interrupt.
-+    //
-+    outl( 1, TIMER2CLEAR );
-+    return(IRQ_HANDLED);
-+}
-+
-+/*---------------------------------------------------------------------
-+ * ProcessPointData
-+ *
-+ * This routine processes the ADC data into usable point data and then
-+ * puts the driver into hw or sw scanning mode before returning.
-+ *
-+ * We calculate inverse pressure (lower number = more pressure) then
-+ * do a hystheresis with the two pressure values 'light' and 'heavy'.
-+ *
-+ * If we are above the light, we have pen up.
-+ * If we are below the heavy we have pen down.
-+ * As long as the pressure stays below the light, pen stays down.
-+ * When we get above the light again, pen goes back up.
-+ *
-+ */
-+static void ProcessPointData(void)
-+{
-+    int  bValidPoint = 0;
-+    unsigned int   uiXDiff, uiYDiff, uiInvPressureDiff;
-+    unsigned int   uiInvPressure;
-+
-+    //
-+    // Calculate the current pressure.
-+    //
-+    uiInvPressure = CalculateInvPressure();
-+
-+    DPRINTK(" X=0x%x, Y=0x%x, Z1=0x%x, Z2=0x%x, InvPressure=0x%x",
-+            sTouch.uiX, sTouch.uiY, sTouch.uiZ1, sTouch.uiZ2, uiInvPressure );
-+
-+    //
-+    // If pen pressure is so light that it is greater than the 'max' setting
-+    // then we consider this to be a pen up.
-+    //
-+    if( uiInvPressure >= TS_LIGHT_INV_PRESSURE )
-+    {
-+        DPRINTK(" -- up \n");
-+        bCurrentPenDown = 0;
-+                ee93xx_ts_evt_add( 0, guiLastX, guiLastY, 0 );
-+        TS_Hardware_Scan_Mode();
-+        return;
-+    }
-+
-+    //
-+    // Hystheresis:
-+    // If the pen pressure is hard enough to be less than the 'min' OR
-+    // the pen is already down and is still less than the 'max'...
-+    //
-+    if( (uiInvPressure < TS_HEAVY_INV_PRESSURE) ||
-+        ( bCurrentPenDown && (uiInvPressure < TS_LIGHT_INV_PRESSURE) )  )
-+    {
-+        if( bCurrentPenDown )
-+        {
-+            //
-+            // If pen was previously down, check the difference between
-+            // the last sample and this one... if the difference between
-+            // samples is too great, ignore the sample.
-+            //
-+            uiXDiff = abs(guiLastX - sTouch.uiX);
-+            uiYDiff = abs(guiLastY - sTouch.uiY);
-+            uiInvPressureDiff = abs(guiLastInvPressure - uiInvPressure);
-+
-+            if( (uiXDiff < TS_MAX_VALID_XY_CHANGE) && (uiYDiff < TS_MAX_VALID_XY_CHANGE) &&
-+                (uiInvPressureDiff < TS_MAX_VALID_PRESSURE_CHANGE) )
-+            {
-+                DPRINTK(" -- valid(two) \n");
-+                bValidPoint = 1;
-+            }
-+            else
-+            {
-+                DPRINTK(" -- INvalid(two) \n");
-+            }
-+        }
-+        else
-+        {
-+            DPRINTK(" -- valid \n");
-+            bValidPoint = 1;
-+        }
-+
-+        /*
-+         * If either the pen was put down or dragged make a note of it.
-+         */
-+        if( bValidPoint )
-+        {
-+            guiLastX = sTouch.uiX;
-+            guiLastY = sTouch.uiY;
-+            guiLastInvPressure = uiInvPressure;
-+            bCurrentPenDown = 1;
-+            ee93xx_ts_evt_add( 1, sTouch.uiX, sTouch.uiY, (0x7000000 /uiInvPressure) );
-+        }
-+
-+        TS_Soft_Scan_Mode();
-+        return;
-+    }
-+
-+    DPRINTK(" -- fallout \n");
-+    TS_Hardware_Scan_Mode();
-+}
-+
-+static void ep93xx_ts_set_direct( unsigned int uiADCSwitch )
-+{
-+    unsigned int uiResult;
-+
-+    //
-+    // Set the switch settings in the direct register.
-+    //
-+    outl( 0xaa, TSSWLock );
-+    outl( uiADCSwitch, TSDirect );
-+
-+    //
-+    // Read and throw away the first sample.
-+    //
-+    do {
-+        uiResult = inl(TSXYResult);
-+    } while( !(uiResult & TSXYRESULT_SDR) );
-+
-+}
-+
-+static unsigned int ADCGetData
-+(
-+    unsigned int uiSamples,
-+    unsigned int uiMaxDiff
-+)
-+{
-+    unsigned int   uiResult, uiValue, uiCount, uiLowest, uiHighest, uiSum, uiAve;
-+
-+    do
-+    {
-+        //
-+        //Initialize our values.
-+        //
-+        uiLowest        = 0xfffffff;
-+        uiHighest       = 0;
-+        uiSum           = 0;
-+
-+        for( uiCount = 0 ; uiCount < uiSamples ; uiCount++ )
-+        {
-+            //
-+            // Read the touch screen four more times and average.
-+            //
-+            do {
-+                uiResult = inl(TSXYResult);
-+            } while( !(uiResult & TSXYRESULT_SDR) );
-+
-+            uiValue = (uiResult & TSXYRESULT_AD_MASK) >> TSXYRESULT_AD_SHIFT;
-+            uiValue = ((uiValue >> 4) + ((1 + TSXYRESULT_X_MASK)>>1))  & TSXYRESULT_X_MASK;
-+
-+            //
-+            // Add up the values.
-+            //
-+            uiSum += uiValue;
-+
-+            //
-+            // Get the lowest and highest values.
-+            //
-+            if( uiValue < uiLowest )
-+            {
-+                uiLowest = uiValue;
-+            }
-+            if( uiValue > uiHighest )
-+            {
-+                uiHighest = uiValue;
-+            }
-+        }
-+
-+    } while( (uiHighest - uiLowest) > uiMaxDiff );
-+
-+    //
-+    // Calculate the Average value.
-+    //
-+    uiAve = uiSum / uiSamples;
-+
-+    return uiAve;
-+}
-+
-+//****************************************************************************
-+// CalculateInvPressure
-+//****************************************************************************
-+// Is the Touch Valid.  Touch is not valid if the X or Y value is not
-+// in range and the pressure is not  enough.
-+//
-+// Touch resistance can be measured by the following formula:
-+//
-+//          Rx * X *     Z2
-+// Rtouch = --------- * (-- - 1)
-+//           4096        Z1
-+//
-+// This is simplified in the ration of Rtouch to Rx.  The lower the value, the
-+// higher the pressure.
-+//
-+//                     Z2
-+// InvPressure =  X * (-- - 1)
-+//                     Z1
-+//
-+static unsigned int CalculateInvPressure(void)
-+{
-+    unsigned int   uiInvPressure;
-+
-+    //
-+    // Check to see if the point is valid.
-+    //
-+    if( sTouch.uiZ1 < MIN_Z1_VALUE )
-+    {
-+        uiInvPressure = 0x10000;
-+    }
-+
-+    //
-+    // Can omit the pressure calculation if you need to get rid of the division.
-+    //
-+    else
-+    {
-+        uiInvPressure = ((sTouch.uiX * sTouch.uiZ2) / sTouch.uiZ1) - sTouch.uiX;
-+    }
-+
-+    return uiInvPressure;
-+}
-+
-+
-+
-+//****************************************************************************
-+// TS_Hardware_Scan_Mode
-+//****************************************************************************
-+// Enables the ep93xx ts scanning engine so that when the pen goes down
-+// we will get an interrupt.
-+//
-+//
-+static void TS_Hardware_Scan_Mode(void)
-+{
-+    unsigned int   uiDevCfg;
-+
-+    DPRINTK("S\n");
-+
-+    //
-+    // Disable the soft scanning engine.
-+    //
-+    sTouch.state = TS_STATE_STOPPED;
-+    Stop_Timer2();
-+
-+    //
-+    // Clear the TIN (Touchscreen INactive) bit so we can go to
-+    // automatic scanning mode.
-+    //
-+    uiDevCfg = inl( EP93XX_SYSCON_DEVICE_CONFIG );
-+    SysconSetLocked( EP93XX_SYSCON_DEVICE_CONFIG, (uiDevCfg & ~EP93XX_SYSCON_DEVCFG_TIN) );
-+
-+    //
-+    // Enable the touch screen scanning state machine by setting
-+    // the ENABLE bit.
-+    //
-+    outl( (TSSETUP_DEFAULT | TSSETUP_ENABLE), TSSetup );
-+
-+    //
-+    // Set the flag to show that we are in interrupt mode.
-+    //
-+    gScanningMode = TS_MODE_HARDWARE_SCAN;
-+
-+    //
-+    // Initialize TSSetup2 register.
-+    //
-+    outl( TSSETUP2_DEFAULT, TSSetup2 );
-+
-+}
-+
-+//****************************************************************************
-+// TS_Soft_Scan_Mode
-+//****************************************************************************
-+// Sets the touch screen to manual polling mode.
-+//
-+//
-+static void TS_Soft_Scan_Mode(void)
-+{
-+    unsigned int   uiDevCfg;
-+
-+    DPRINTK("M\n");
-+
-+    if( gScanningMode != TS_MODE_SOFT_SCAN )
-+    {
-+        //
-+        // Disable the touch screen scanning state machine by clearing
-+        // the ENABLE bit.
-+        //
-+        outl( TSSETUP_DEFAULT, TSSetup );
-+
-+        //
-+        // Set the TIN bit so we can do manual touchscreen polling.
-+        //
-+        uiDevCfg = inl(EP93XX_SYSCON_DEVICE_CONFIG );
-+        SysconSetLocked( EP93XX_SYSCON_DEVICE_CONFIG, (uiDevCfg | EP93XX_SYSCON_DEVCFG_TIN) );
-+    }
-+
-+    //
-+    // Set the switch register up for the first ADC reading
-+    //
-+    ep93xx_ts_set_direct( sSwitchSettings.uiSwitchZ1 );
-+
-+    //
-+    // Initialize our software state machine to know which ADC
-+    // reading to take
-+    //
-+    sTouch.state = TS_STATE_Z1;
-+
-+    //
-+    // Set the timer so after a mSec or two settling delay it will
-+    // take the first ADC reading.
-+    //
-+    Set_Timer2_uSec( EP93XX_TS_PER_POINT_DELAY_USEC );
-+
-+    //
-+    // Note that we are in sw scanning mode not hw scanning mode.
-+    //
-+    gScanningMode = TS_MODE_SOFT_SCAN;
-+
-+}
-+
-+static void Set_Timer2_uSec( unsigned int uiDelay_uSec )
-+{
-+    unsigned int uiClockTicks;
-+
-+    /*
-+     * Stop timer 2
-+     */
-+    outl( 0, TIMER2CONTROL );
-+
-+    uiClockTicks = ((uiDelay_uSec * 508) + 999) / 1000;
-+    outl( uiClockTicks, TIMER2LOAD );
-+    outl( uiClockTicks, TIMER2VALUE );
-+
-+    /*
-+     * Set up Timer 2 for 508 kHz clock and periodic mode.
-+     */
-+    outl( 0xC8, TIMER2CONTROL );
-+
-+}
-+
-+static void Stop_Timer2(void)
-+{
-+    outl( 0, TIMER2CONTROL );
-+}
-+
-+/*
-+ * Initialization and exit routines
-+ */
-+int __init ep93xx_ts_init(void)
-+{
-+    int retval;
-+
-+    //printk("ep93xx_ts_init\n");
-+
-+    // printk("request Touchscreen interrupt.\n");
-+    retval = request_irq( IRQ_EP93XX_TOUCH, ep93xx_ts_isr, IRQF_DISABLED, "ep93xx_ts", 0);
-+    if( retval )
-+    {
-+        printk(KERN_WARNING "ep93xx_ts: failed to get touchscreen IRQ\n");
-+        return retval;
-+    }
-+
-+    // printk("Request Timer interrupt.\n");
-+    retval = request_irq( IRQ_EP93XX_TIMER2, ep93xx_timer2_isr,
-+                        IRQF_DISABLED, "ep93xx_timer2", 0);
-+    if( retval )
-+    {
-+        printk(KERN_WARNING "ep93xx_ts: failed to get timer2 IRQ\n");
-+        return retval;
-+    }
-+
-+    // printk("Register Touchscreen Driver\n");
-+    misc_register(&ep93xx_ts_miscdev);
-+
-+    sTouch.state = TS_STATE_STOPPED;
-+    gScanningMode = TS_MODE_UN_INITIALIZED;
-+
-+    printk(KERN_NOTICE "ep93xx touchscreen driver configured for 4-wire operation\n");
-+
-+    return 0;
-+}
-+void __exit
-+ep93xx_ts_exit(void)
-+{
-+    DPRINTK("ep93xx_ts_exit\n");
-+
-+    Stop_Timer2();
-+
-+    free_irq(IRQ_EP93XX_TOUCH, 0);
-+    free_irq(IRQ_EP93XX_TIMER2, 0);
-+
-+    misc_deregister(&ep93xx_ts_miscdev);
-+}
-+
-+module_init(ep93xx_ts_init);
-+module_exit(ep93xx_ts_exit);
-+
-+MODULE_DESCRIPTION("Cirrus EP93xx touchscreen driver");
-+MODULE_SUPPORTED_DEVICE("touchscreen/ep93xx");
-Index: linux-2.6.30.9/drivers/input/touchscreen/ep93xx_ts.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.30.9/drivers/input/touchscreen/ep93xx_ts.h	2009-11-24 21:00:45.000000000 +0100
-@@ -0,0 +1,53 @@
-+/*
-+ * ep93xx_ts.h
-+ *
-+ * The contents of this file are subject to the Mozilla Public License
-+ * Version 1.1 (the "License"); you may not use this file except in
-+ * compliance with the License. You may obtain a copy of the License
-+ * at http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS"
-+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-+ * the License for the specific language governing rights and
-+ * limitations under the License.
-+ *
-+ * The initial developer of the original code is David A. Hinds
-+ * <dahinds@users.sourceforge.net>.  Portions created by David A. Hinds
-+ * are Copyright (C) 1999 David A. Hinds.  All Rights Reserved.
-+ *
-+ * Alternatively, the contents of this file may be used under the
-+ * terms of the GNU General Public License version 2 (the "GPL"), in
-+ * which case the provisions of the GPL are applicable instead of the
-+ * above.  If you wish to allow the use of your version of this file
-+ * only under the terms of the GPL and not to allow others to use
-+ * your version of this file under the MPL, indicate your decision by
-+ * deleting the provisions above and replace them with the notice and
-+ * other provisions required by the GPL.  If you do not delete the
-+ * provisions above, a recipient may use your version of this file
-+ * under either the MPL or the GPL.
-+ */
-+
-+#ifndef _LINUX_EP93XX_TS_H
-+#define _LINUX_EP93XX_TS_H
-+
-+/*touchscreen register defines*/
-+#define SYSCON_KTDIV 	EP93XX_SYSCON_KEY_TOUCH_CLOCK_DIV
-+#define SYSCON_SWLOCK	EP93XX_SYSCON_SWLOCK
-+#define TSSetup 	EP93XX_TOUCHSCREEN_TSSetup
-+#define TSXYMaxMin	EP93XX_TOUCHSCREEN_TSXYMaxMin
-+#define TSXYResult	EP93XX_TOUCHSCREEN_TSDischarge
-+#define TSDischarge	EP93XX_TOUCHSCREEN_TSDischarge
-+#define TSXSample	EP93XX_TOUCHSCREEN_TSXSample
-+#define TSYSample	EP93XX_TOUCHSCREEN_TSYSample
-+#define TSDirect	EP93XX_TOUCHSCREEN_TSDirect
-+#define TSDetect	EP93XX_TOUCHSCREEN_TSDetect
-+#define TSSWLock	EP93XX_TOUCHSCREEN_TSSWLock
-+#define TSSetup2	EP93XX_TOUCHSCREEN_TSSetup2
-+
-+
-+//#define SYSCON_DEVCFG	EP93XX_SYSCON_DEVICE_CONFIG
-+#define TIMER2CONTROL	EP93XX_TIMER2_CONTROL
-+#define TIMER2LOAD	EP93XX_TIMER2_LOAD
-+#define TIMER2VALUE	EP93XX_TIMER2_VALUE
-+#define TIMER2CLEAR  	EP93XX_TIMER2_CLEAR
-+#endif
-Index: linux-2.6.30.9/arch/arm/mach-ep93xx/include/mach/hardware.h
-===================================================================
---- linux-2.6.30.9.orig/arch/arm/mach-ep93xx/include/mach/hardware.h	2009-11-24 21:00:18.000000000 +0100
-+++ linux-2.6.30.9/arch/arm/mach-ep93xx/include/mach/hardware.h	2009-11-24 21:09:21.000000000 +0100
-@@ -7,6 +7,7 @@
- #include "ep93xx-regs.h"
- 
- #define pcibios_assign_all_busses()	0
-+#include "regs_touch.h"
- 
- #include "platform.h"
- 
-Index: linux-2.6.30.9/arch/arm/mach-ep93xx/include/mach/regs_touch.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.30.9/arch/arm/mach-ep93xx/include/mach/regs_touch.h	2009-11-24 21:00:45.000000000 +0100
-@@ -0,0 +1,95 @@
-+/*=============================================================================
-+ *
-+ *  FILE:       regs_touch.h
-+ *
-+ *  DESCRIPTION:    Analog Touchscreen Register Definition
-+ *
-+ *  Copyright Cirrus Logic, 2001-2003
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *=============================================================================
-+ */
-+#ifndef _REGS_TOUCH_H_
-+#define _REGS_TOUCH_H_
-+
-+/*
-+ *-----------------------------------------------------------------------------
-+ * Individual bit #defines
-+ *-----------------------------------------------------------------------------
-+ */
-+#define TSSETUP_SDLY_MASK           0x000003FF
-+#define TSSETUP_SDLY_SHIFT          0
-+#define TSSETUP_NSMP_4              0x00000000
-+#define TSSETUP_NSMP_8              0x00000400
-+#define TSSETUP_NSMP_16             0x00000800
-+#define TSSETUP_NSMP_32             0x00000C00
-+#define TSSETUP_NSMP_MASK           0x00000C00
-+#define TSSETUP_DEV_4               0x00000000
-+#define TSSETUP_DEV_8               0x00001000
-+#define TSSETUP_DEV_12              0x00002000
-+#define TSSETUP_DEV_16              0x00003000
-+#define TSSETUP_DEV_24              0x00004000
-+#define TSSETUP_DEV_32              0x00005000
-+#define TSSETUP_DEV_64              0x00006000
-+#define TSSETUP_DEV_128             0x00007000
-+#define TSSETUP_ENABLE              0x00008000
-+#define TSSETUP_DLY_MASK            0x03FF0000
-+#define TSSETUP_DLY_SHIFT           16
-+#define TSSETUP_TDTCT               0x80000000
-+
-+#define TSMAXMIN_XMIN_MASK          0x000000FF
-+#define TSMAXMIN_XMIN_SHIFT         0
-+#define TSMAXMIN_YMIN_MASK          0x0000FF00
-+#define TSMAXMIN_YMIN_SHIFT         8
-+#define TSMAXMIN_XMAX_MASK          0x00FF0000
-+#define TSMAXMIN_XMAX_SHIFT         16
-+#define TSMAXMIN_YMAX_MASK          0xFF000000
-+#define TSMAXMIN_YMAX_SHIFT         24
-+
-+#define TSXYRESULT_X_MASK           0x00000FFF
-+#define TSXYRESULT_X_SHIFT          0
-+#define TSXYRESULT_AD_MASK          0x0000FFFF
-+#define TSXYRESULT_AD_SHIFT         0
-+#define TSXYRESULT_Y_MASK           0x0FFF0000
-+#define TSXYRESULT_Y_SHIFT          16
-+#define TSXYRESULT_SDR              0x80000000
-+
-+#define TSX_SAMPLE_MASK             0x00003FFF
-+#define TSX_SAMPLE_SHIFT            0x00
-+#define TSY_SAMPLE_MASK             0x3FFF0000
-+#define TSY_SAMPLE_SHIFT            0x10
-+
-+#define TSSETUP2_TINT               0x00000001
-+#define TSSETUP2_NICOR              0x00000002
-+#define TSSETUP2_PINT               0x00000004
-+#define TSSETUP2_PENSTS             0x00000008
-+#define TSSETUP2_PINTEN             0x00000010
-+#define TSSETUP2_DEVINT             0x00000020
-+#define TSSETUP2_DINTEN             0x00000040
-+#define TSSETUP2_DTMEN              0x00000080
-+#define TSSETUP2_DISDEV             0x00000100
-+#define TSSETUP2_NSIGND             0x00000200
-+#define TSSETUP2_S28EN              0x00000400
-+#define TSSETUP2_RINTEN             0x00000800
-+
-+#define TSXYRESULT_SDR     	    0x80000000
-+
-+/*
-+ *-----------------------------------------------------------------------------
-+ *-----------------------------------------------------------------------------
-+ */
-+
-+
-+#endif /* _REGS_TOUCH_H_ */
diff --git a/target/linux/ep93xx/patches-2.6.30/007-ep93xx-eth.patch b/target/linux/ep93xx/patches-2.6.30/007-ep93xx-eth.patch
deleted file mode 100644
index cd715bfaf..000000000
--- a/target/linux/ep93xx/patches-2.6.30/007-ep93xx-eth.patch
+++ /dev/null
@@ -1,405 +0,0 @@
---- /dev/null
-+++ b/drivers/net/arm/ep93xx_eth.h
-@@ -0,0 +1,402 @@
-+/*------------------------------------------------------------------------
-+ * ep93xx_eth.h
-+ * : header file of Ethernet Device Driver for Cirrus Logic EP93xx.
-+ *
-+ * Copyright (C) 2003 by Cirrus Logic www.cirrus.com
-+ * This software may be used and distributed according to the terms
-+ * of the GNU Public License.
-+ *
-+ * This file contains device related information like register info
-+ * and register access method macros for the Ethernet device
-+ * embedded within Cirrus Logic's EP93xx SOC chip.
-+ *
-+ * Information contained in this file was obtained from
-+ * the EP9312 Manual Revision 0.12 and 0.14 from Cirrus Logic.
-+ *
-+ * History
-+ * 05/18/01  Sungwook Kim  Initial release
-+ * 03/25/2003  Melody Modified for EP92xx
-+ *--------------------------------------------------------------------------*/
-+
-+
-+#ifndef _EP9213_ETH_H_
-+#define _EP9213_ETH_H_
-+
-+
-+/*---------------------------------------------------------------
-+ *  Definition of H/W Defects and Their Workarounds
-+ *-------------------------------------------------------------*/
-+
-+
-+
-+/*---------------------------------------------------------------
-+ *  Data types used in this driver
-+ *-------------------------------------------------------------*/
-+typedef  unsigned char   U8;
-+typedef  unsigned short  U16;
-+typedef  unsigned long   U32;
-+typedef  unsigned int    UINT;
-+
-+
-+
-+/*---------------------------------------------------------------
-+ * Definition of the registers.
-+ * For details, refer to the datasheet  .
-+ *
-+ * Basically, most registers are 32 bits width register.
-+ * But some are 16 bits and some are 6 or 8 bytes long.
-+ *-------------------------------------------------------------*/
-+
-+#define  REG_RxCTL  0x0000  /*offset to Receiver Control Reg*/
-+#define  RxCTL_PauseA  (1<<20)
-+#define  RxCTL_RxFCE1  (1<<19)
-+#define  RxCTL_RxFCE0  (1<<18)
-+#define  RxCTL_BCRC    (1<<17)
-+#define  RxCTL_SRxON   (1<<16)
-+#define  RxCTL_RCRCA   (1<<13)
-+#define  RxCTL_RA      (1<<12)
-+#define  RxCTL_PA      (1<<11)
-+#define  RxCTL_BA      (1<<10)
-+#define  RxCTL_MA      (1<<9)
-+#define  RxCTL_IAHA    (1<<8)
-+#define  RxCTL_IA3     (1<<3)
-+#define  RxCTL_IA2     (1<<2)
-+#define  RxCTL_IA1     (1<<1)
-+#define  RxCTL_IA0     (1<<0)
-+
-+#define  REG_TxCTL  0x0004  /*offset to Transmit Control Reg*/
-+#define  TxCTL_DefDis  (1<<7)
-+#define  TxCTL_MBE     (1<<6)
-+#define  TxCTL_ICRC    (1<<5)
-+#define  TxCTL_TxPD    (1<<5)
-+#define  TxCTL_OColl   (1<<3)
-+#define  TxCTL_SP      (1<<2)
-+#define  TxCTL_PB      (1<<1)
-+#define  TxCTL_STxON   (1<<0)
-+
-+#define  REG_TestCTL   0x0008  /*Test Control Reg, R/W*/
-+#define  TestCTL_MACF  (1<<7)
-+#define  TestCTL_MFDX  (1<<6)
-+#define  TestCTL_DB    (1<<5)
-+#define  TestCTL_MIIF  (1<<4)
-+
-+#define  REG_MIICmd  0x0010  /*offset to MII Command Reg, R/W*/
-+#define  MIICmd_OP     (0x03<<14)
-+#define  MIICmd_OP_RD  (2<<14)
-+#define  MIICmd_OP_WR  (1<<14)
-+#define  MIICmd_PHYAD  (0x1f<<5)
-+#define  MIICmd_REGAD  (0x1f<<0)
-+
-+#define  REG_MIIData  0x0014  /*offset to MII Data Reg, R/W*/
-+#define  MIIData_MIIData  (0xffff<<0)
-+
-+#define  REG_MIISts  0x0018  /*offset to MII Status Reg, R*/
-+#define  MIISts_Busy  (1<<0)
-+
-+#define  REG_SelfCTL  0x0020  /*offset to Self Control Reg*/
-+#define  SelfCTL_RWP    (1<<7)    /*Remote Wake Pin*/
-+#define  SelfCTL_GPO0   (1<<5)
-+#define  SelfCTL_PUWE   (1<<4)
-+#define  SelfCTL_PDWE   (1<<3)
-+#define  SelfCTL_MIIL   (1<<2)
-+#define  SelfCTL_RESET  (1<<0)
-+
-+#define  REG_IntEn   0x0024  /*Interrupt Enable Reg, R/W*/
-+#define  IntEn_RWIE    (1<<30)
-+#define  IntEn_RxMIE   (1<<29)
-+#define  IntEn_RxBIE   (1<<28)
-+#define  IntEn_RxSQIE  (1<<27)
-+#define  IntEn_TxLEIE  (1<<26)
-+#define  IntEn_ECIE    (1<<25)
-+#define  IntEn_TxUHIE  (1<<24)
-+#define  IntEn_MOIE    (1<<18)
-+#define  IntEn_TxCOIE  (1<<17)
-+#define  IntEn_RxROIE  (1<<16)
-+#define  IntEn_MIIIE   (1<<12)
-+#define  IntEn_PHYSIE  (1<<11)
-+#define  IntEn_TIE     (1<<10)
-+#define  IntEn_SWIE    (1<<8)
-+#define  IntEn_TxSQIE   (1<<3)
-+#define  IntEn_RxEOFIE  (1<<2)
-+#define  IntEn_RxEOBIE  (1<<1)
-+#define  IntEn_RxHDRIE  (1<<0)
-+
-+#define  REG_IntStsP  0x0028  /*offset to Interrupt Status Preserve Reg, R/W*/
-+#define  REG_IntStsC  0x002c  /*offset to Interrupt Status Clear Reg, R*/
-+#define  IntSts_RWI    (1<<30)
-+#define  IntSts_RxMI   (1<<29)
-+#define  IntSts_RxBI   (1<<28)
-+#define  IntSts_RxSQI  (1<<27)
-+#define  IntSts_TxLEI  (1<<26)
-+#define  IntSts_ECI    (1<<25)
-+#define  IntSts_TxUHI  (1<<24)
-+#define  IntSts_MOI    (1<<18)
-+#define  IntSts_TxCOI  (1<<17)
-+#define  IntSts_RxROI  (1<<16)
-+#define  IntSts_MIII   (1<<12)
-+#define  IntSts_PHYSI  (1<<11)
-+#define  IntSts_TI     (1<<10)
-+#define  IntSts_AHBE   (1<<9)
-+#define  IntSts_SWI    (1<<8)
-+#define  IntSts_OTHER  (1<<4)
-+#define  IntSts_TxSQ   (1<<3)
-+#define  IntSts_RxSQ   (1<<2)
-+
-+#define  REG_GT  0x0040  /*offset to General Timer Reg*/
-+#define  GT_GTC  (0xffff<<16)
-+#define  GT_GTP  (0xffff<<0)
-+
-+#define  REG_FCT  0x0044  /*offset to Flow Control Timer Reg*/
-+#define  FCT_FCT  (0x00ffffff<<0)
-+
-+#define  REG_FCF  0x0048  /*offset to Flow Control Format Reg*/
-+#define  FCF_MACCT  (0xffff<<16)
-+#define  FCF_TPT    (0xffff<<0)
-+
-+#define  REG_AFP  0x004c  /*offset to Address Filter Pointer Reg*/
-+#define  AFP_AFP  (0x07<<0)  /*Address Filter Pointer (bank control for REG_IndAD)*/
-+#define  AFP_AFP_IA0   0       /*Primary Individual Address (MAC Addr)*/
-+#define  AFP_AFP_IA1   1       /*Individual Address 1*/
-+#define  AFP_AFP_IA2   2       /*Individual Address 2*/
-+#define  AFP_AFP_IA3   3       /*Individual Address 3*/
-+#define  AFP_AFP_DTxP  6       /*Destination Address of Tx Pause Frame*/
-+#define  AFP_AFP_HASH  7       /*Hash Table*/
-+
-+#define  REG_IndAD      0x0050  /*offset to Individual Address Reg, n bytes, R/W*/
-+
-+#define  REG_GIntSts    0x0060  /*offset to Global Interrupt Status Reg (writing 1 will clear)*/
-+#define  REG_GIntROS    0x0068  /*offset to Global Interrupt Status Read Only Reg*/
-+#define  GIntSts_INT  (1<<15)     /*Global Interrupt Request Status*/
-+
-+#define  REG_GIntMsk    0x0064  /*offset to Global Interrupt Mask Reg*/
-+#define  GIntMsk_IntEn  (1<<15)   /*Global Interrupt Enable*/
-+
-+#define  REG_GIntFrc    0x006c  /*offset to Global Interrupt Force Reg*/
-+#define  GIntFrc_INT  (1<<15)     /*Force to set GIntSts*/
-+
-+#define  REG_TxCollCnt  0x0070  /*Transmit Collision Count Reg, R*/
-+#define  REG_RxMissCnt  0x0074  /*Receive Miss Count Reg, R*/
-+#define  REG_RxRntCnt   0x0078  /*Receive Runt Count Reg, R*/
-+
-+#define  REG_BMCtl  0x0080  /*offset to Bus Master Control Reg, R/W*/
-+#define  BMCtl_MT     (1<<13)
-+#define  BMCtl_TT     (1<<12)
-+#define  BMCtl_UnH    (1<<11)
-+#define  BMCtl_TxChR  (1<<10)
-+#define  BMCtl_TxDis  (1<<9)
-+#define  BMCtl_TxEn   (1<<8)
-+#define  BMCtl_EH2    (1<<6)
-+#define  BMCtl_EH1    (1<<5)
-+#define  BMCtl_EEOB   (1<<4)
-+#define  BMCtl_RxChR  (1<<2)
-+#define  BMCtl_RxDis  (1<<1)
-+#define  BMCtl_RxEn   (1<<0)
-+
-+#define  REG_BMSts  0x0084  /*offset to Bus Master Status Reg, R*/
-+#define  BMSts_TxAct  (1<<7)
-+#define  BMSts_TP     (1<<4)
-+#define  BMSts_RxAct  (1<<3)
-+#define  BMSts_QID    (0x07<<0)
-+#define  BMSts_QID_RxDt   (0<<0)
-+#define  BMSts_QID_TxDt   (1<<0)
-+#define  BMSts_QID_RxSts  (2<<0)
-+#define  BMSts_QID_TxSts  (3<<0)
-+#define  BMSts_QID_RxDesc (4<<0)
-+#define  BMSts_QID_TxDesc (5<<0)
-+
-+#define  REG_RBCA   0x0088  /*offset to Receive Buffer Current Address Reg, R*/
-+#define  REG_TBCA   0x008c  /*offset to Transmit Buffer Current Address Reg, R*/
-+
-+#define  REG_RxDBA  0x0090  /*offset to Receive Descriptor Queue Base Address Reg, R/W*/
-+#define  REG_RxDBL  0x0094  /*offset to Receive Descriptor Queue Base Length Reg, R/W, 16bits*/
-+#define  REG_RxDCL  0x0096  /*offset to Receive Descriptor Queue Current Length Reg, R/W, 16bits*/
-+#define  REG_RxDCA  0x0098  /*offset to Receive Descriptor Queue Current Address Reg, R/W*/
-+
-+#define  REG_RxDEQ  0x009c  /*offset to Receive Descriptor Enqueue Reg, R/W*/
-+#define  RxDEQ_RDV  (0xffff<<16)  /*R 16bit; Receive Descriptor Value*/
-+#define  RxDEQ_RDI  (0xff<<0)     /*W 8bit; Receive Descriptor Increment*/
-+
-+#define  REG_RxSBA  0x00a0  /*offset to Receive Status Queue Base Address Reg, R/W*/
-+#define  REG_RxSBL  0x00a4  /*offset to Receive Status Queue Base Length Reg, R/W, 16bits*/
-+#define  REG_RxSCL  0x00a6  /*offset to Receive Status Queue Current Length Reg, R/W, 16bits*/
-+#define  REG_RxSCA  0x00a8  /*offset to Receive Status Queue Current Address Reg, R/W*/
-+
-+#define  REG_RxSEQ  0x00ac  /*offset to Receive Status Queue Current Address Reg, R/W*/
-+#define  RxSEQ_RSV  (0xffff<<16)
-+#define  RxSEQ_RSI  (0xff<<0)
-+
-+#define  REG_TxDBA  0x00b0  /*offset to Transmit Descriptor Queue Base Address Reg, R/W*/
-+#define  REG_TxDBL  0x00b4  /*offset to Transmit Descriptor Queue Base Length Reg, R/W, 16bits*/
-+#define  REG_TxDCL  0x00b6  /*offset to Transmit Descriptor Queue Current Length Reg, R/W, 16bits*/
-+#define  REG_TxDCA  0x00b8  /*offset to Transmit Descriptor Queue Current Address Reg, R/W*/
-+
-+#define  REG_TxDEQ  0x00bc  /*offset to Transmit Descriptor Queue Current Address Reg, R/W*/
-+#define  TxDEQ_TDV  (0xffff<<16)
-+#define  TxDEQ_TDI  (0xff<<0)
-+
-+#define  REG_TxSBA  0x00c0  /*offset to Transmit Status Queue Base Address Reg, R/W*/
-+#define  REG_TxSBL  0x00c4  /*offset to Transmit Status Queue Base Length Reg, R/W, 16bits*/
-+#define  REG_TxSCL  0x00c6  /*offset to Transmit Status Queue Current Length Reg, R/W, 16bits*/
-+#define  REG_TxSCA  0x00c8  /*offset to Transmit Status Queue Current Address Reg, R/W*/
-+
-+#define  REG_RxBTH  0x00d0  /*offset to Receive Buffer Threshold Reg, R/W*/
-+#define  RxBTH_RDHT  (0x03ff<<16)
-+#define  RxBTH_RDST  (0x03ff<<0)
-+
-+#define  REG_TxBTH  0x00d4  /*offset to Transmit Buffer Threshold Reg, R/W*/
-+#define  TxBTH_TDHT  (0x03ff<<16)
-+#define  TxBTH_TDST  (0x03ff<<0)
-+
-+#define  REG_RxSTH  0x00d8  /*offset to Receive Status Threshold Reg, R/W*/
-+#define  RxSTH_RSHT  (0x003f<<16)
-+#define  RxSTH_RSST  (0x003f<<0)
-+
-+#define  REG_TxSTH  0x00dc  /*offset to Transmit Status Threshold Reg, R/W*/
-+#define  TxSTH_TSHT  (0x003f<<16)
-+#define  TxSTH_TSST  (0x003f<<0)
-+
-+#define  REG_RxDTH  0x00e0  /*offset to Receive Descriptor Threshold Reg, R/W*/
-+#define  RxDTH_RDHT  (0x003f<<16)
-+#define  RxDTH_RDST  (0x003f<<0)
-+
-+#define  REG_TxDTH  0x00e4  /*offset to Transmit Descriptor Threshold Reg, R/W*/
-+#define  TxDTH_TDHT  (0x003f<<16)
-+#define  TxDTH_TDST  (0x003f<<0)
-+
-+#define  REG_MaxFL  0x00e8  /*offset to Max Frame Length Reg, R/W*/
-+#define  MaxFL_MFL  (0x07ff<<16)
-+#define  MaxFL_TST  (0x07ff<<0)
-+
-+#define  REG_RxHL  0x00ec  /*offset to Receive Header Length Reg, R/W*/
-+#define  RxHL_RHL2  (0x07ff<<16)
-+#define  RxHL_RHL1  (0x03ff<<0)
-+
-+#define  REG_MACCFG0  0x0100  /*offset to Test Reg #0, R/W*/
-+#define  MACCFG0_DbgSel  (1<<7)
-+#define  MACCFG0_LCKEN   (1<<6)
-+#define  MACCFG0_LRATE   (1<<5)
-+#define  MACCFG0_RXERR   (1<<4)
-+#define  MACCFG0_BIT33   (1<<2)
-+#define  MACCFG0_PMEEN   (1<<1)
-+#define  MACCFG0_PMEST   (1<<0)
-+
-+#define  REG_MACCFG1  0x0104  /*offset to Test Reg #1, R/W*/
-+#define  REG_MACCFG2  0x0108  /*offset to Test Reg #2, R*/
-+#define  REG_MACCFG3  0x010c  /*offset to Test Reg #3, R*/
-+
-+
-+
-+/*---------------------------------------------------------------
-+ * Definition of Descriptor/Status Queue Entry
-+ *-------------------------------------------------------------*/
-+
-+typedef  union receiveDescriptor  {  /*data structure of Receive Descriptor Queue Entry*/
-+    struct {        /*whole value*/
-+        U32  e0,      /*1st dword entry*/
-+             e1;      /*2nd dword entry*/
-+    }  w;
-+    struct {        /*bit field definitions*/
-+        U32  ba:32,   /*Buffer Address (keep in mind this is physical address)*/
-+             bl:16,   /*b15-0; Buffer Length*/
-+             bi:15,   /*b30-16; Buffer Index*/
-+             nsof:1;  /*b31; Not Start Of Frame*/
-+    }  f;
-+}  receiveDescriptor;
-+
-+
-+typedef  union receiveStatus  {  /*data structure of Receive Status Queue Entry*/
-+    struct {         /*whole word*/
-+        U32  e0,       /*1st dword entry*/
-+             e1;       /*2nd dword entry*/
-+    }  w;
-+    struct {         /*bit field*/
-+        U32  rsrv1:8,  /*b7-0: reserved*/
-+             hti:6,    /*b13-8: Hash Table Index*/
-+             rsrv2:1,  /*b14: reserved*/
-+             crci:1,   /*b15: CRC Included*/
-+             crce:1,   /*b16: CRC Error*/
-+             edata:1,  /*b17: Extra Data*/
-+             runt:1,   /*b18: Runt Frame*/
-+             fe:1,     /*b19: Framing Error*/
-+             oe:1,     /*b20: Overrun Error*/
-+             rxerr:1,  /*b21: Rx Error*/
-+             am:2,     /*b23-22: Address Match*/
-+             rsrv3:4,  /*b27-24: reserved*/
-+             eob:1,    /*b28: End Of Buffer*/
-+             eof:1,    /*b29: End Of Frame*/
-+             rwe:1,    /*b30: Received Without Error*/
-+             rfp:1,    /*b31: Receive Frame Processed*/
-+             fl:16,    /*b15-0: frame length*/
-+             bi:15,    /*b30-16: Buffer Index*/
-+             rfp2:1;   /*b31: Receive Frame Processed at 2nd word*/
-+    }  f;
-+}  receiveStatus;
-+
-+
-+typedef  union transmitDescriptor  {  /*data structure of Transmit Descriptor Queue Entry*/
-+    struct {         /*whole value*/
-+        U32  e0,       /*1st dword entry*/
-+             e1;       /*2nd dword entry*/
-+    }  w;
-+    struct {         /*bit field*/
-+        U32  ba:32,    /*b31-0: Buffer Address (keep in mind this is physical address)*/
-+             bl:12,    /*b11-0: Buffer Length*/
-+             rsrv1:3,  /*b14-12: reserved*/
-+             af:1,     /*b15: Abort Frame*/
-+             bi:15,    /*b30-16: Buffer Index*/
-+             eof:1;    /*b31: End Of Frame*/
-+
-+    }  f;
-+}  transmitDescriptor;
-+
-+
-+typedef  union transmitStatus  {  /*data structure of Transmit Status Queue Entry*/
-+    struct {         /*whole word*/
-+        U32  e0;       /*1st dword entry*/
-+    }  w;
-+    struct {         /*bit field*/
-+        U32  bi:15,    /*b14-0: Buffer Index*/
-+             rsrv3:1,  /*b15: reserved*/
-+             ncoll:5,  /*b20-16: Number of Collisions*/
-+             rsrv2:3,  /*b23-21: reserved*/
-+             ecoll:1,  /*b24: Excess Collisions*/
-+             txu:1,    /*b25: Tx Underrun*/
-+             ow:1,     /*b26: Out of Window*/
-+             rsrv1:1,  /*b27: reserved*/
-+             lcrs:1,   /*b28: Loss of CRS*/
-+             fa:1,     /*b29: Frame Abort*/
-+             txwe:1,   /*b30: Transmitted Without Error*/
-+             txfp:1;   /*b31: Transmit Frame Processed*/
-+    }  f;
-+}  transmitStatus;
-+
-+
-+
-+/*---------------------------------------------------------------
-+ *  Size of device registers occupied in memory/IO address map
-+ *-------------------------------------------------------------*/
-+#define  DEV_REG_SPACE  0x00010000
-+
-+/*
-+#define U8 unsigned char
-+#define U16 unsigned short
-+#define U32 unsigned long
-+*/
-+
-+/*---------------------------------------------------------------
-+ * A definition of register access macros
-+ *-------------------------------------------------------------*/
-+#define  _RegRd(type,ofs)     (*(volatile type*)(ofs))
-+#define  _RegWr(type,ofs,dt)  *(volatile type*)(ofs)=((type)(dt))
-+
-+#define  RegRd8(ofs)   _RegRd(U8,(char*)pD->base_addr+(ofs))
-+#define  RegRd16(ofs)  _RegRd(U16,(char*)pD->base_addr+(ofs))
-+#define  RegRd32(ofs)  _RegRd(U32,(char*)pD->base_addr+(ofs))
-+#define  RegWr8(ofs,dt)   _RegWr(U8,(char*)pD->base_addr+(ofs),(dt))
-+#define  RegWr16(ofs,dt)  _RegWr(U16,(char*)pD->base_addr+(ofs),(dt))
-+#define  RegWr32(ofs,dt)  _RegWr(U32,(char*)pD->base_addr+(ofs),(dt))
-+
-+
-+
-+#endif  /* _EP9213_ETH_H_ */
-+
diff --git a/target/linux/ep93xx/patches-2.6.30/008-ep93xx-spi.patch b/target/linux/ep93xx/patches-2.6.30/008-ep93xx-spi.patch
deleted file mode 100644
index 8292bbcf1..000000000
--- a/target/linux/ep93xx/patches-2.6.30/008-ep93xx-spi.patch
+++ /dev/null
@@ -1,714 +0,0 @@
-Index: linux-2.6.30.9/drivers/spi/Kconfig
-===================================================================
---- linux-2.6.30.9.orig/drivers/spi/Kconfig	2009-11-24 21:09:23.000000000 +0100
-+++ linux-2.6.30.9/drivers/spi/Kconfig	2009-11-24 21:09:53.000000000 +0100
-@@ -125,6 +125,12 @@
- 
- 	  If unsure, say N.
- 
-+config SPI_EP93XX
-+	tristate "EP93xx SSP SPI master"
-+	depends on SPI_MASTER && ARCH_EP93XX && EXPERIMENTAL
-+	help
-+	  This enables the EP93xx SPI master controller.
-+
- config SPI_IMX
- 	tristate "Freescale iMX SPI controller"
- 	depends on ARCH_IMX && EXPERIMENTAL
-Index: linux-2.6.30.9/drivers/spi/Makefile
-===================================================================
---- linux-2.6.30.9.orig/drivers/spi/Makefile	2009-11-24 21:09:23.000000000 +0100
-+++ linux-2.6.30.9/drivers/spi/Makefile	2009-11-24 21:09:53.000000000 +0100
-@@ -16,6 +16,7 @@
- obj-$(CONFIG_SPI_BITBANG)		+= spi_bitbang.o
- obj-$(CONFIG_SPI_AU1550)		+= au1550_spi.o
- obj-$(CONFIG_SPI_BUTTERFLY)		+= spi_butterfly.o
-+obj-$(CONFIG_SPI_EP93XX)		+= spi_ep93xx.o
- obj-$(CONFIG_SPI_GPIO)			+= spi_gpio.o
- obj-$(CONFIG_SPI_GPIO_OLD)		+= spi_gpio_old.o
- obj-$(CONFIG_SPI_IMX)			+= spi_imx.o
-Index: linux-2.6.30.9/drivers/spi/spi_ep93xx.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.30.9/drivers/spi/spi_ep93xx.c	2009-11-24 21:21:25.000000000 +0100
-@@ -0,0 +1,680 @@
-+/*
-+ * linux/drivers/spi/spi_ep93xx.c
-+ *
-+ * Copyright (C) 2007 Manfred Gruber <m.gruber@tirol.com>
-+ * Small changes by Peter Ivanov <ivanovp@gmail.com> to support MMC over SPI, 2008
-+ * SIM.ONE changes by Nuccio Raciti Simplemachine <nuccio.raciti@gmail.com>
-+ *
-+ * Based on pxa2xx_spi.c/spi_imx.c and bitbang.c driver
-+ *
-+ * 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.
-+ *
-+ */
-+
-+#include <linux/blkdev.h>
-+#include <linux/clk.h>
-+#include <linux/delay.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/err.h>
-+#include <linux/errno.h>
-+#include <linux/init.h>
-+#include <linux/io.h>
-+#include <linux/interrupt.h>
-+#include <linux/platform_device.h>
-+#include <linux/spinlock.h>
-+#include <linux/workqueue.h>
-+
-+#include <linux/spi/spi.h>
-+
-+#include <mach/hardware.h>
-+#include <mach/ep93xx-regs.h>
-+#include <asm/gpio.h>
-+
-+/* #define SPI_EP93XX_DEBUG */
-+
-+#define DEFINE_SSP_REG(reg, off)			\
-+	static inline u32 read_##reg(void *p)		\
-+		{ return __raw_readl(p + (off)); }	\
-+	static inline void write_##reg(u32 v, void *p)	\
-+		{ __raw_writel(v, p + (off)); }
-+
-+DEFINE_SSP_REG(SSPCR0, 0x00)
-+DEFINE_SSP_REG(SSPCR1, 0x04)
-+DEFINE_SSP_REG(SSPDR, 0x08)
-+DEFINE_SSP_REG(SSPSR, 0x0c)
-+DEFINE_SSP_REG(SSPCPSR, 0x10)
-+DEFINE_SSP_REG(SSPIIR, 0x14)
-+DEFINE_SSP_REG(SSPICR, 0x14)
-+
-+/* Bits in SSPCR0 */
-+#define SSPCR0_DSS_MASK		0x0000000f
-+#define SSPCR0_FRF_MASK		0x00000030
-+#define SSPCR0_FRF_SHIFT	4
-+#define SSPCR0_FRF_MOTOROLA	(0 << SSPCR0_FRF_SHIFT)
-+#define SSPCR0_FRF_TI		(1 << SSPCR0_FRF_SHIFT)
-+#define SSPCR0_FRF_NI		(2 << SSPCR0_FRF_SHIFT)
-+#define SSPCR0_SPO		0x00000040
-+#define SSPCR0_SPH		0x00000080
-+#define SSPCR0_SCR_MASK		0x0000ff00
-+#define SSPCR0_SCR_SHIFT	8
-+
-+/* Bits in SSPCR1 */
-+#define SSPC1_RIE		0x00000001
-+#define SSPC1_TIE		0x00000002
-+#define SSPC1_RORIE		0x00000004
-+#define SSPC1_LBM		0x00000008
-+#define SSPC1_SSE		0x00000010
-+#define SSPC1_MS		0x00000020
-+#define SSPC1_SOD		0x00000040
-+
-+/* Bits in SSPSR */
-+#define SSPSR_TFE		0x00000001	/* TX FIFO is empty */
-+#define SSPSR_TNF		0x00000002	/* TX FIFO is not full */
-+#define SSPSR_RNE		0x00000004	/* RX FIFO is not empty */
-+#define SSPSR_RFF		0x00000008	/* RX FIFO is full */
-+#define SSPSR_BSY		0x00000010	/* SSP is busy */
-+#define SSPSR_MASK		0x0000001F	/* SSP is busy */
-+
-+/* Bits in SSPCPSR */
-+#define SSPCPSR_SCR_MASK	0x000000ff
-+
-+/* Bits in SSPIIR */
-+#define SSPIIR_RIS		0x00000001	/* RX FIFO IRQ status */
-+#define SSPIIR_TIS		0x00000002	/* TX FIFO is not full */
-+#define SSPIIR_RORIS		0x00000004	/* RX FIFO is full */
-+
-+#define SPI_SSPCLK		7.4e6
-+#define SPI_SSPCLK_REV_E2	14.8e6		/* only for chip Rev E2 */
-+#define SPI_MAX_SPEED		3.7e6
-+#define SPI_MAX_SPEED_REV_E2	7.4e6		/* only for chip Rev E2 */
-+#define SPI_CPSDVR_DIV_MIN	2
-+#define SPI_CPSDVR_DIV_MAX	254
-+#define SPI_SCR_DIV_MIN		0
-+#define SPI_SCR_DIV_MAX		255
-+#define SPI_DATARATE_OK		0
-+#define SPI_DATARATE_NOK	-1
-+
-+struct driver_data {
-+	/* Driver model hookup */
-+	struct platform_device *pdev;
-+
-+	/* SPI framework hookup */
-+	struct spi_master *master;
-+
-+	/* SSP register addresses */
-+	void *ioaddr;
-+
-+	/* SSP irq */
-+	int irq;
-+
-+	struct list_head queue;
-+
-+	/* SSP spinlock */
-+	spinlock_t lock;
-+
-+	struct workqueue_struct *workqueue;
-+	struct work_struct      work;
-+
-+	u8 busy;
-+	u8 use_dma;
-+};
-+
-+static unsigned ep93xx_txrx_8(struct spi_device *spi, struct spi_transfer *t)
-+{
-+	struct driver_data *drv_data;
-+	const u8 *tx = t->tx_buf;
-+	u8 *rx = t->rx_buf;
-+	unsigned count = t->len;
-+	u8 byte;
-+	int busy;
-+
-+	drv_data = spi_master_get_devdata(spi->master);
-+
-+#ifdef SPI_EP93XX_DEBUG
-+	dev_info(&spi->dev,
-+		"ep93xx_txrx_8: t->len %u \n", t->len);
-+#endif
-+
-+	while (likely(count > 0)) {
-+		byte = 0;
-+		if (tx) {
-+			byte = *tx++;
-+#ifdef SPI_EP93XX_DEBUG
-+			dev_info(&spi->dev,
-+				"ep93xx_txrx_8: write 0x%x \n", byte);
-+#endif
-+		}
-+
-+		write_SSPDR(byte, drv_data->ioaddr);
-+		busy = read_SSPSR(drv_data->ioaddr);
-+		while (busy & SSPSR_BSY) {
-+			cpu_relax();
-+			busy = read_SSPSR(drv_data->ioaddr);
-+#ifdef SPI_EP93XX_DEBUG
-+			dev_info(&spi->dev,
-+				"ep93xx_txrx_8: delay. SSPSR: 0x%X\n", busy);
-+#endif
-+		}
-+		byte = read_SSPDR(drv_data->ioaddr);
-+
-+		if (rx) {
-+			*rx++ = byte;
-+#ifdef SPI_EP93XX_DEBUG
-+			dev_info(&spi->dev,
-+				"ep93xx_txrx_8: read 0x%x \n", byte);
-+#endif
-+		}
-+		count -= 1;
-+	}
-+	return t->len - count;
-+}
-+
-+
-+static unsigned ep93xx_txrx_16(struct spi_device *spi, struct spi_transfer *t)
-+{
-+
-+	struct driver_data *drv_data;
-+	const u16 *tx = t->tx_buf;
-+	u16 *rx = t->rx_buf;
-+	unsigned count = t->len;
-+	u16 word;
-+	int busy;
-+
-+	drv_data = spi_master_get_devdata(spi->master);
-+
-+#ifdef SPI_EP93XX_DEBUG
-+	dev_info(&spi->dev,
-+		"ep93xx_txrx_16: t->len %u \n", t->len);
-+#endif
-+	while (likely(count > 0)) {
-+		word = 0;
-+		if (tx) {
-+			word = *tx++;
-+#ifdef SPI_EP93XX_DEBUG
-+			dev_info(&spi->dev,
-+				"ep93xx_txrx_16: write 0x%x \n", word);
-+#endif
-+		}
-+
-+		write_SSPDR(word, drv_data->ioaddr);
-+		busy = read_SSPSR(drv_data->ioaddr);
-+		while (busy & SSPSR_BSY) {
-+			cpu_relax();
-+			busy = read_SSPSR(drv_data->ioaddr);
-+#ifdef SPI_EP93XX_DEBUG
-+			dev_info(&spi->dev,
-+				"ep93xx_txrx_8: delay.\n");
-+#endif
-+		}
-+
-+		word = read_SSPDR(drv_data->ioaddr);
-+
-+		if (rx) {
-+			*rx++ = word;
-+#ifdef SPI_EP93XX_DEBUG
-+			dev_info(&spi->dev,
-+				"ep93xx_txrx_16: read 0x%x \n", word);
-+#endif
-+		}
-+		count -= 2;
-+	}
-+	return t->len - count;
-+}
-+
-+static u32 spi_data_rate(u32 speed_hz, u32 *div_cpsdvr, u32 *div_scr,
-+	struct driver_data *drv_data, struct spi_device *spi)
-+{
-+	unsigned int spi_sspclk = SPI_SSPCLK;
-+	unsigned int bus_speed_max = SPI_MAX_SPEED;
-+	unsigned int bus_hz_tmp = 0;
-+	u32 div_cpsdvr_tmp;
-+	u32 div_scr_tmp;
-+	u32 rv = SPI_DATARATE_NOK;
-+	int chip_rev;
-+
-+	/* Checking CHIP_ID */
-+	chip_rev = (__raw_readl (EP93XX_SYSCON_CHIP_ID) >> 28) & 0xF;
-+	if (chip_rev == 7)
-+	{
-+		/* Chip version: Rev E2 */
-+		/* This device has double speed SSP clock */
-+		spi_sspclk = SPI_SSPCLK_REV_E2;
-+		bus_speed_max = SPI_MAX_SPEED_REV_E2;
-+#ifdef SPI_EP93XX_DEBUG
-+		dev_info(&spi->dev,
-+				"Chip Rev E2 detected! This device has double speed SSP clock.\n");
-+#endif
-+	}
-+
-+	*div_cpsdvr = SPI_CPSDVR_DIV_MAX;
-+	*div_scr = SPI_SCR_DIV_MAX;
-+
-+	for (div_cpsdvr_tmp = SPI_CPSDVR_DIV_MIN;
-+			div_cpsdvr_tmp <= SPI_CPSDVR_DIV_MAX && rv; div_cpsdvr_tmp++) {
-+		for (div_scr_tmp = SPI_SCR_DIV_MIN;
-+				div_scr_tmp <= SPI_SCR_DIV_MAX && rv; div_scr_tmp++) {
-+			bus_hz_tmp = spi_sspclk / (div_cpsdvr_tmp * (1 + div_scr_tmp));
-+			if (bus_hz_tmp <= speed_hz && bus_hz_tmp <= bus_speed_max) {
-+				*div_cpsdvr = div_cpsdvr_tmp;
-+				*div_scr = div_scr_tmp;
-+				rv = SPI_DATARATE_OK;
-+			}
-+		}
-+	}
-+#ifdef SPI_EP93XX_DEBUG
-+	dev_info(&spi->dev,
-+			"Needed SPI bus frequency: %i Hz\n", speed_hz);
-+	dev_info(&spi->dev,
-+			"Actual SPI bus frequency: %i Hz\n", bus_hz_tmp);
-+#endif
-+	return rv;
-+}
-+
-+/* Supported modes (returns -EINVAL if not supported mode requested) */
-+#define MODEBITS (SPI_CPOL | SPI_CPHA | SPI_CS_HIGH)
-+
-+static int ep93xx_spi_setup(struct spi_device *spi)
-+{
-+	struct driver_data *drv_data;
-+	u16 val;
-+	u32 div_scr;
-+	u32 div_cpsdvr;
-+	unsigned int bits = spi->bits_per_word;
-+	unsigned long speed_hz = spi->max_speed_hz;
-+
-+	drv_data = spi_master_get_devdata(spi->master);
-+
-+	/* enable SSP */
-+	write_SSPCR1(SSPC1_SSE, drv_data->ioaddr);
-+	/* Enable SSP and loopback mode (only for testing!) */
-+	/* write_SSPCR1(SSPC1_SSE | SSPC1_LBM, drv_data->ioaddr);  */
-+
-+	if (bits == 0)
-+		bits = 8;
-+	if (bits < 4 || bits > 16) {
-+		dev_err(&spi->dev,
-+			"setup invalid bits_per_word %u (4 to 16)\n", bits);
-+		return -EINVAL;
-+	} else {
-+		val = read_SSPCR0(drv_data->ioaddr);
-+		val = val & ~SSPCR0_DSS_MASK ;
-+		val = val | (bits-1);
-+		write_SSPCR0(val, drv_data->ioaddr);
-+#ifdef SPI_EP93XX_DEBUG
-+		dev_info (&spi->dev, "Bits per word: %i\n", bits);
-+#endif
-+	}
-+
-+	if (spi->mode & ~MODEBITS) {
-+		dev_err(&spi->dev, "unsupported mode bits: %x\n",
-+			spi->mode & ~MODEBITS);
-+		return -EINVAL;
-+	} else {
-+		val = read_SSPCR0(drv_data->ioaddr);
-+		val = val & ~SSPCR0_SPO;
-+		val = val & ~SSPCR0_SPH;
-+		if (spi->mode & SPI_CPOL)
-+		{
-+			val = val | SSPCR0_SPO;
-+		}
-+#ifdef SPI_EP93XX_DEBUG
-+		dev_info (&spi->dev, "Clock polarity (CPOL): %s\n", (spi->mode & SPI_CPHA) ? "1" : "0");
-+#endif
-+		if (spi->mode & SPI_CPHA)
-+		{
-+			val = val | SSPCR0_SPH;
-+		}
-+#ifdef SPI_EP93XX_DEBUG
-+		dev_info (&spi->dev, "Clock phase (CPHA): %s\n", (spi->mode & SPI_CPHA) ? "1" : "0");
-+#endif
-+		write_SSPCR0(val, drv_data->ioaddr);
-+	}
-+
-+	if (SPI_DATARATE_OK == (spi_data_rate(speed_hz, &div_cpsdvr,
-+		&div_scr, drv_data, spi))) {
-+
-+		val = read_SSPCPSR(drv_data->ioaddr);
-+		val = val & ~SSPCPSR_SCR_MASK;
-+		val = val | div_cpsdvr;
-+#ifdef SPI_EP93XX_DEBUG
-+		dev_info (&spi->dev, "SSPCPSR: 0x%X\n", val);
-+#endif
-+		write_SSPCPSR(val, drv_data->ioaddr);
-+
-+		val = read_SSPCR0(drv_data->ioaddr);
-+		val = val & ~SSPCR0_SCR_MASK;
-+		val = val | (div_scr << SSPCR0_SCR_SHIFT);
-+#ifdef SPI_EP93XX_DEBUG
-+		dev_info (&spi->dev, "SSPCR0: 0x%X (div_scr: 0x%X)\n", val, div_scr);
-+#endif
-+		write_SSPCR0(val, drv_data->ioaddr);
-+	} else
-+		return -EINVAL;
-+
-+	/* reenable */
-+	val = read_SSPCR1(drv_data->ioaddr);
-+	val = val & ~SSPC1_SSE;
-+	write_SSPCR1(val, drv_data->ioaddr);
-+	val = read_SSPCR1(drv_data->ioaddr);
-+	val = val | SSPC1_SSE;
-+	write_SSPCR1(val, drv_data->ioaddr);
-+#ifdef SPI_EP93XX_DEBUG
-+	dev_info (&spi->dev, "Loopback mode: %s\n", (val & SSPC1_LBM) ? "On" : "Off");
-+#endif
-+
-+	return 0;
-+}
-+
-+static int ep93xx_spi_transfer(struct spi_device *spi, struct spi_message *m)
-+{
-+	struct driver_data *drv_data;
-+	unsigned long flags;
-+	int status = 0;
-+
-+	m->actual_length = 0;
-+	m->status = -EINPROGRESS;
-+
-+	drv_data = spi_master_get_devdata(spi->master);
-+
-+	spin_lock_irqsave(&drv_data->lock, flags);
-+	if (!spi->max_speed_hz)
-+		status = -ENETDOWN;
-+	else {
-+		list_add_tail(&m->queue, &drv_data->queue);
-+		queue_work(drv_data->workqueue, &drv_data->work);
-+	}
-+	spin_unlock_irqrestore(&drv_data->lock, flags);
-+	return status;
-+}
-+
-+static void ep93xx_work(struct work_struct *work)
-+{
-+	struct driver_data *drv_data =
-+		container_of(work, struct driver_data, work);
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&drv_data->lock, flags);
-+	drv_data->busy = 1;
-+
-+	while (!list_empty(&drv_data->queue)) {
-+		struct spi_message *m;
-+		struct spi_device *spi;
-+		struct spi_transfer *t = NULL;
-+		int status;
-+
-+		m = container_of(drv_data->queue.next, struct spi_message,
-+			queue);
-+		list_del_init(&m->queue);
-+		spin_unlock_irqrestore(&drv_data->lock, flags);
-+
-+		spi = m->spi;
-+		status = 0;
-+
-+		list_for_each_entry(t, &m->transfers, transfer_list) {
-+
-+			if (!t->tx_buf && !t->rx_buf && t->len) {
-+				status = -EINVAL;
-+				break;
-+			}
-+
-+			if (t->len) {
-+				if (!m->is_dma_mapped) {
-+					t->rx_dma = 0;
-+					t->tx_dma = 0;
-+				}
-+				if (t->bits_per_word <= 8)
-+					status = ep93xx_txrx_8(spi, t);
-+				else
-+					status = ep93xx_txrx_16(spi, t);
-+			}
-+
-+			if (status != t->len) {
-+				if (status > 0)
-+					status = -EMSGSIZE;
-+				break;
-+			}
-+			m->actual_length += status;
-+			status = 0;
-+
-+			/* protocol tweaks before next transfer */
-+			if (t->delay_usecs)
-+				udelay(t->delay_usecs);
-+
-+			if (t->transfer_list.next == &m->transfers)
-+				break;
-+		}
-+
-+		m->status = status;
-+		m->complete(m->context);
-+
-+		spin_lock_irqsave(&drv_data->lock, flags);
-+	}
-+	drv_data->busy = 0;
-+	spin_unlock_irqrestore(&drv_data->lock, flags);
-+}
-+
-+static irqreturn_t ssp_int(int irq, void *dev_id)
-+{
-+	struct driver_data *drv_data = dev_id;
-+	u8 status;
-+	status = read_SSPIIR(drv_data->ioaddr);
-+
-+	if (status & SSPIIR_RORIS) {
-+		dev_err(&drv_data->pdev->dev, "SPI rx overrun.\n");
-+
-+		/* We clear the overrun here ! */
-+		write_SSPICR(0, drv_data->ioaddr);
-+	}
-+
-+	/* RX interrupt */
-+	if (status & SSPIIR_RIS)
-+		dev_info(&drv_data->pdev->dev, "SPI RX interrupt\n");
-+
-+	/* TX interrupt */
-+	if (status & SSPIIR_TIS)
-+		dev_info(&drv_data->pdev->dev, "SPI TX interrupt\n");
-+
-+	write_SSPICR(0, drv_data->ioaddr);
-+	return IRQ_HANDLED;
-+}
-+
-+static int __init ep93xx_spi_probe(struct platform_device *pdev)
-+{
-+	struct device *dev = &pdev->dev;
-+	struct spi_master *master;
-+	struct driver_data *drv_data = 0;
-+	struct resource *memory_resource;
-+	int status = 0;
-+	u16 val;
-+
-+	/* Allocate master with space for drv_data and null dma buffer */
-+	master = spi_alloc_master(dev, sizeof(struct driver_data));
-+	if (!master) {
-+		dev_err(&pdev->dev, "cannot alloc spi_master\n");
-+		return -ENOMEM;
-+	}
-+	drv_data = spi_master_get_devdata(master);
-+	drv_data->master = master;
-+	drv_data->pdev = pdev;
-+
-+        master->num_chipselect = EP93XX_GPIO_LINE_H(7) + 1;
-+	master->bus_num = pdev->id;
-+	master->setup = ep93xx_spi_setup;
-+	master->transfer = ep93xx_spi_transfer;
-+
-+	spin_lock_init(&drv_data->lock);
-+	INIT_LIST_HEAD(&drv_data->queue);
-+
-+	/* Setup register addresses */
-+	memory_resource = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if (!memory_resource) {
-+	    dev_err(&pdev->dev, "memory resources not defined\n");
-+	    status = -EIO;
-+	    goto out_error_master_alloc;
-+	} else {
-+	    drv_data->ioaddr = ioremap(memory_resource->start,
-+				memory_resource->end - memory_resource->start);
-+	    if (drv_data->ioaddr == NULL) {
-+		    dev_err(&pdev->dev, "ioremap failed\n");
-+		    status = -EIO;
-+		    goto out_error_master_alloc;
-+	    }
-+	}
-+
-+	/* Attach to IRQ */
-+	drv_data->irq = platform_get_irq(pdev, 0);
-+	if (drv_data->irq < 0)
-+		return drv_data->irq;
-+
-+	if (drv_data->irq <= 0) {
-+		dev_err(&pdev->dev, "IRQ resource not defined\n");
-+		status = -ENODEV;
-+		goto out_error_master_alloc;
-+	}
-+
-+	status = request_irq(drv_data->irq, ssp_int, 0, "ep93xx-spi", drv_data);
-+	if (status < 0) {
-+		dev_err(&pdev->dev, "cannot get SPI IRQ 0\n");
-+		goto out_error_master_alloc;
-+	}
-+
-+	/* SSP default configuration, enable */
-+	write_SSPCR1(SSPC1_SSE, drv_data->ioaddr);
-+
-+	/* run as master */
-+	val = read_SSPCR1(drv_data->ioaddr);
-+	val = val & ~SSPC1_MS;
-+	write_SSPCR1(val, drv_data->ioaddr);
-+
-+	/* frame format to Motorola SPI Format */
-+	val = read_SSPCR0(drv_data->ioaddr);
-+	val = val & ~SSPCR0_FRF_MASK ;
-+	val = val | SSPCR0_FRF_MOTOROLA;
-+	write_SSPCR0(val, drv_data->ioaddr);
-+
-+	/* enable interrupts */
-+	val = read_SSPCR1(drv_data->ioaddr);
-+	/* for now only overrun is handled */
-+	/* val = val | SSPC1_RIE | SSPC1_TIE | SSPC1_RORIE; */
-+	val = val | SSPC1_RORIE;
-+	write_SSPCR1(val, drv_data->ioaddr);
-+
-+	/* SSP default configuration, re enable */
-+	val = read_SSPCR1(drv_data->ioaddr);
-+	val = val & ~SSPC1_SSE;
-+	write_SSPCR1(val, drv_data->ioaddr);
-+	val = read_SSPCR1(drv_data->ioaddr);
-+	val = val | SSPC1_SSE;
-+	write_SSPCR1(val, drv_data->ioaddr);
-+
-+	/* Register with the SPI framework */
-+	platform_set_drvdata(pdev, drv_data);
-+	status = spi_register_master(master);
-+	if (status != 0) {
-+		dev_err(&pdev->dev, "cannot register SPI master\n");
-+		goto out_error_master_alloc;
-+	} else
-+		dev_info(&pdev->dev, "SPI Controller initalized\n");
-+
-+	INIT_WORK(&drv_data->work, ep93xx_work);
-+	spin_lock_init(&drv_data->lock);
-+	INIT_LIST_HEAD(&drv_data->queue);
-+
-+	/* this task is the only thing to touch the SPI bits */
-+	drv_data->busy = 0;
-+	drv_data->workqueue = create_singlethread_workqueue(
-+		dev_name(drv_data->master->dev.parent));
-+/*              drv_data->master->cdev.dev->bus_id); */
-+	if (drv_data->workqueue == NULL) {
-+		status = -EBUSY;
-+		goto out_error_free_irq;
-+	}
-+
-+	return status;
-+
-+out_error_free_irq:
-+	free_irq(drv_data->irq, master);
-+out_error_master_alloc:
-+	if (drv_data->ioaddr != NULL)
-+		iounmap(drv_data->ioaddr);
-+	spi_master_put(master);
-+	return status;
-+}
-+
-+static int __exit ep93xx_spi_remove(struct platform_device *pdev)
-+{
-+	struct driver_data *drv_data = platform_get_drvdata(pdev);
-+	u8 val;
-+
-+	WARN_ON(!list_empty(&drv_data->queue));
-+
-+	destroy_workqueue(drv_data->workqueue);
-+
-+	/* switch off SSP*/
-+	val = read_SSPCR1(drv_data->ioaddr);
-+	val = val & ~SSPC1_SSE;
-+	write_SSPCR1(val, drv_data->ioaddr);
-+
-+	/* release irqs */
-+	if (drv_data->irq > 0)
-+		free_irq(drv_data->irq, drv_data);
-+
-+	/* Disconnect from the SPI framework */
-+	spi_unregister_master(drv_data->master);
-+	spi_master_put(drv_data->master);
-+
-+	if (drv_data->ioaddr != NULL)
-+		iounmap(drv_data->ioaddr);
-+
-+	/* Prevent double remove */
-+	platform_set_drvdata(pdev, NULL);
-+	return 0;
-+}
-+
-+#ifdef CONFIG_PM
-+static int ep93xx_spi_suspend(struct platform_device *pdev, pm_message_t msg)
-+{
-+	return 0;
-+}
-+
-+static int ep93xx_spi_resume(struct platform_device *pdev)
-+{
-+	return 0;
-+}
-+
-+#else
-+#define ep93xx_spi_suspend NULL
-+#define ep93xx_spi_resume  NULL
-+#endif
-+
-+struct platform_driver ep93xx_spi_device = {
-+	.remove		= __exit_p(ep93xx_spi_remove),
-+#ifdef CONFIG_PM
-+	.suspend	= ep93xx_spi_suspend,
-+	.resume		= ep93xx_spi_resume,
-+#endif
-+	.driver		= {
-+		.name	= "ep93xx-spi",
-+		.bus	= &spi_bus_type,
-+		.owner	= THIS_MODULE,
-+	},
-+};
-+
-+int __init ep93xx_spi_init(void)
-+{
-+	return platform_driver_probe(&ep93xx_spi_device, ep93xx_spi_probe);
-+}
-+
-+void __exit ep93xx_spi_exit(void)
-+{
-+	platform_driver_unregister(&ep93xx_spi_device);
-+}
-+
-+module_init(ep93xx_spi_init);
-+module_exit(ep93xx_spi_exit);
-+
-+MODULE_DESCRIPTION("EP93XX SPI Driver");
-+MODULE_AUTHOR("Manfred Gruber, <m.gruber@tirol.com>");
-+MODULE_LICENSE("GPL");
diff --git a/target/linux/ep93xx/patches-2.6.30/009-ep93xx-fb.patch b/target/linux/ep93xx/patches-2.6.30/009-ep93xx-fb.patch
deleted file mode 100644
index d7816bd72..000000000
--- a/target/linux/ep93xx/patches-2.6.30/009-ep93xx-fb.patch
+++ /dev/null
@@ -1,3565 +0,0 @@
---- a/drivers/video/Kconfig
-+++ b/drivers/video/Kconfig
-@@ -255,6 +255,25 @@ config FB_CIRRUS
- 	  Say N unless you have such a graphics board or plan to get one
- 	  before you next recompile the kernel.
- 
-+config FB_EP93XX
-+	tristate "EP93xx frame buffer support"
-+	depends on FB
-+	select FB_CFB_FILLRECT
-+	select FB_CFB_COPYAREA
-+	select FB_CFB_IMAGEBLIT
-+	help
-+	  This is the frame buffer device driver for the internal raster engine
-+	  on certain members of the EP93xx family.  For VGA and LCD output.
-+
-+config FB_EP93XX_MONO
-+	tristate "EP93xx Mono frame buffer support"
-+	depends on FB
-+	select FB_CFB_FILLRECT
-+	select FB_CFB_COPYAREA
-+	help
-+	  This is the frame buffer device driver for the internal raster engine
-+	  on certain members of the EP93xx family. For LCD output.
-+
- config FB_PM2
- 	tristate "Permedia2 support"
- 	depends on FB && ((AMIGA && BROKEN) || PCI)
---- a/drivers/video/Makefile
-+++ b/drivers/video/Makefile
-@@ -95,6 +95,8 @@ obj-$(CONFIG_FB_ARMCLCD)	  += amba-clcd.
- obj-$(CONFIG_FB_68328)            += 68328fb.o
- obj-$(CONFIG_FB_GBE)              += gbefb.o
- obj-$(CONFIG_FB_CIRRUS)		  += cirrusfb.o
-+obj-$(CONFIG_FB_EP93XX)		  += ep93xxfb.o
-+obj-$(CONFIG_FB_EP93XX_MONO)	  += ep93xxfb_mono.o
- obj-$(CONFIG_FB_ASILIANT)	  += asiliantfb.o
- obj-$(CONFIG_FB_PXA)		  += pxafb.o
- obj-$(CONFIG_FB_W100)		  += w100fb.o
---- /dev/null
-+++ b/drivers/video/ep93xxfb.c
-@@ -0,0 +1,1628 @@
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/reboot.h>
-+#include <linux/errno.h>
-+#include <linux/string.h>
-+#include <linux/mm.h>
-+#include <linux/delay.h>
-+#include <linux/fb.h>
-+#include <linux/init.h>
-+#include <linux/ioport.h>
-+#include <linux/interrupt.h>
-+#include <linux/dma-mapping.h>
-+#include <asm/io.h>
-+#include <asm/uaccess.h>
-+#include "ep93xxfb.h"
-+#include <mach/hardware.h>
-+#include <linux/platform_device.h>
-+
-+#include "console/fbcon.h"
-+
-+
-+#if defined(CONFIG_MACH_EDB9312) || defined(CONFIG_MACH_EDB9315) || defined(CONFIG_MACH_EDB9307) || defined(CONFIG_MACH_EDB9301) || defined(CONFIG_MACH_EDB9302)
-+#define CONFIG_EP93XX_SDCS3
-+#else
-+#define CONFIG_EP93XX_SDCS0
-+#endif
-+
-+//#define DEBUG 1
-+#ifdef DEBUG
-+#define DPRINTK( fmt, arg... )  printk( fmt, ##arg )
-+#else
-+#define DPRINTK( fmt, arg... )
-+#endif
-+
-+#define FBDEV_NAME "ep93xxfb"
-+
-+#define ep93xxfb_outl(value, reg)              \
-+{                                              \
-+    outl(RASTER_SWLOCK_VALUE, RASTER_SWLOCK);  \
-+    outl(value, reg);                          \
-+}
-+
-+#define DEFAULT_OUT   CRT_OUT
-+#define DEFAULT_MODE	7
-+#define DEFAULT_BPP 	24
-+
-+static DECLARE_WAIT_QUEUE_HEAD(ep93xxfb_wait_in);
-+
-+static unsigned int pseudo_palette[256];
-+static unsigned long *cursor_data = NULL;
-+static struct ep93xxfb_info epinfo;
-+
-+static int vout =  DEFAULT_OUT;
-+static int vmode = DEFAULT_MODE;
-+static int depth = DEFAULT_BPP;
-+
-+
-+static int ep93xxfb_setcol(struct fb_info *info, int bpp);
-+
-+
-+static struct ep93xxfb_videomodes ep93xxfb_vmods[] = {
-+    {
-+	"Philips-LB064V02-640x480x60",
-+        640, 24, 96, 40, 480, 10, 2, 33, 60,
-+        CLK_INTERNAL, EDGE_FALLING, POL_LOW, POL_LOW, POL_LOW,
-+    },
-+    { // 1
-+        "CRT-640x480-60",
-+        640, 24, 96, 40, 480, 11, 2, 32, 60,
-+        CLK_INTERNAL, EDGE_RISING, POL_LOW, POL_LOW, POL_LOW,
-+    },
-+    { // 2
-+        "CRT-640x480-72",
-+        640, 40, 40, 144, 480, 8, 3, 30, 72,
-+        CLK_INTERNAL, EDGE_RISING, POL_LOW, POL_LOW, POL_LOW,
-+    },
-+    { // 3
-+        "CRT-640x480-75",
-+	640, 16, 76, 120, 480, 1, 3, 16, 75,
-+        CLK_INTERNAL, EDGE_RISING, POL_LOW, POL_LOW, POL_LOW,
-+    },
-+    { // 4
-+	"CRT-640x480-85",
-+	640, 56, 56, 80, 480, 1, 3, 25, 85,
-+	CLK_INTERNAL, EDGE_RISING, POL_LOW, POL_LOW, POL_LOW,
-+    },
-+    { // 5
-+	"CTR-640x480-100",
-+	640, 32, 96, 96, 480, 8, 6, 36, 100,
-+        CLK_INTERNAL, EDGE_RISING, POL_LOW, POL_LOW, POL_LOW,
-+    },
-+    { // 6
-+	"CRT-800x600-56",
-+	800, 24, 72, 128, 600, 1, 2, 22, 56,
-+        CLK_INTERNAL, EDGE_RISING, POL_LOW, POL_LOW, POL_LOW,
-+    },
-+    { // 7
-+        "CRT-800x600-60",
-+        800, 40, 128, 88, 600, 1, 4, 23, 60,
-+        CLK_INTERNAL, EDGE_RISING, POL_LOW, POL_HIGH, POL_HIGH,
-+    },
-+    { // 8
-+	"CRT-800x600-72",
-+	800, 56, 120, 64, 600, 37, 6, 23, 72,
-+        CLK_INTERNAL, EDGE_RISING, POL_LOW, POL_LOW, POL_LOW,
-+    },
-+    { // 9
-+	"CRT-800x600-85",
-+	800, 64, 64, 160, 600, 16, 5, 36, 85,
-+        CLK_INTERNAL, EDGE_RISING, POL_LOW, POL_LOW, POL_LOW,
-+    },
-+    { // 10
-+        "CRT-800x600-100",
-+	800, 64, 64, 160, 600, 4, 6, 30, 100,
-+	CLK_INTERNAL, EDGE_RISING, POL_LOW, POL_LOW, POL_LOW,
-+    },
-+    { // 11
-+        "CRT-1024x768-60",
-+	1024, 8, 144, 168, 768, 3, 6, 29, 60,
-+	CLK_INTERNAL, EDGE_RISING, POL_LOW, POL_LOW, POL_LOW,
-+    },
-+    { // 12
-+	"CRT-1024x768-70",
-+	1024, 24, 136, 144, 768, 3, 6, 29, 70,
-+        CLK_INTERNAL, EDGE_RISING, POL_LOW, POL_LOW, POL_LOW,
-+    },
-+    { // 13
-+	"CRT-1024x768-75",
-+	1024, 16, 96, 176, 768, 1, 3, 28, 75,
-+	CLK_INTERNAL, EDGE_RISING, POL_LOW, POL_HIGH, POL_HIGH,
-+    },
-+    { // 14
-+	"CRT-1024x768-85",
-+	1024, 48, 96, 208, 768, 1, 3, 36, 85,
-+	CLK_INTERNAL, EDGE_RISING, POL_LOW, POL_HIGH, POL_HIGH,
-+    },
-+    { // 15
-+        "CRT-1280x720-60",
-+	1280, 48, 112, 248, 720, 1, 3, 38, 60,
-+        CLK_INTERNAL, EDGE_RISING, POL_LOW, POL_HIGH, POL_HIGH,
-+    }
-+};
-+
-+static void philips_lb064v02_on(unsigned char value)
-+{
-+    DPRINTK("philips_lb064v02_on \n");
-+    outl(inl(GPIO_PADDR) | 2, GPIO_PADDR);
-+    outl(inl(GPIO_PADR) | 2, GPIO_PADR);
-+}
-+
-+static void philips_lb064v02_off(unsigned char value)
-+{
-+    DPRINTK("philips_lb064v02_off \n");
-+    outl(inl(GPIO_PADR) & ~2, GPIO_PADR);
-+}
-+
-+static irqreturn_t ep93xxfb_irq_handler(int i, void *blah)
-+{
-+    outl(0x00000000, BLOCKCTRL);
-+    wake_up(&ep93xxfb_wait_in);
-+    return IRQ_HANDLED;
-+}
-+
-+static void ep93xxfb_wait(void)
-+{
-+    DECLARE_WAITQUEUE(wait, current);
-+    add_wait_queue(&ep93xxfb_wait_in, &wait);
-+    set_current_state(TASK_UNINTERRUPTIBLE);
-+
-+    while (inl(BLOCKCTRL) & 0x00000001){
-+	if(/*(pls_proba==1)&&*/(!in_atomic()))
-+	    schedule();
-+    }
-+
-+    remove_wait_queue(&ep93xxfb_wait_in, &wait);
-+    set_current_state(TASK_RUNNING);
-+
-+}
-+
-+void ep93xxfb_fillrect(struct fb_info *p, const struct fb_fillrect *fill)
-+{
-+    unsigned long blkdestwidth,tmp;
-+
-+    if (!fill->width || !fill->height ||
-+	(fill->dx >= p->var.xres) ||
-+	(fill->dy >= p->var.yres) ||
-+        ((fill->dx + fill->width - 1) >= p->var.xres) ||
-+        ((fill->dy + fill->height - 1) >= p->var.yres))
-+        return;
-+
-+    tmp =  (( fill->dx + fill->width ) * epinfo.bpp );
-+    blkdestwidth = tmp / 32;
-+    if(blkdestwidth > 0 && (tmp % 32 == 0))
-+	blkdestwidth--;
-+    blkdestwidth = blkdestwidth - (fill->dx * epinfo.bpp) / 32;
-+
-+    outl(fill->color, BLOCKMASK);
-+    outl( ((fill->dx * epinfo.bpp) & 0x1F) |
-+	  ((((fill->dx + fill->width - 1) * epinfo.bpp ) & 0x1F) << 16),
-+	  DESTPIXELSTRT);
-+    outl( ((epinfo.xres * epinfo.bpp) / 32), DESTLINELENGTH);
-+    outl( blkdestwidth, BLKDESTWIDTH );
-+    outl(fill->height - 1, BLKDESTHEIGHT);
-+    outl((epinfo.fb_phys + (fill->dy * epinfo.xres * epinfo.bpp ) / 8 +
-+	 (fill->dx * epinfo.bpp ) / 8 )
-+	 , BLKDSTSTRT);
-+    outl( epinfo.pixformat | 0x0000000B, BLOCKCTRL);
-+    ep93xxfb_wait();
-+
-+}
-+
-+void ep93xxfb_copyarea(struct fb_info *p, const struct fb_copyarea *area)
-+{
-+    unsigned long startsx,stopsx,startdx,stopdx,startsy,startdy;
-+    unsigned long blksrcwidth,blkdestwidth,tmp;
-+    unsigned long val = 0;
-+
-+    if( !area->width || !area->width ||
-+	(area->sx >= p->var.xres) || (area->sy >= p->var.yres) ||
-+        (area->dx >= p->var.xres) || (area->dy >= p->var.yres) ||
-+        ((area->dx + area->width - 1) >= p->var.xres) ||
-+        ((area->dy + area->height - 1) >= p->var.yres))
-+	return;
-+
-+    if(area->sx == area->dx && area->sy == area->dy)
-+	return;
-+
-+    if ((area->dy == area->sy) && (area->dx > area->sx) &&
-+	(area->dx < (area->sx + area->width - 1))) {
-+	startdx = area->dx + area->width - 1;
-+        stopdx = area->dx;
-+        startsx = area->sx + area->width - 1;
-+        stopsx = area->sx;
-+        val |= 0x000000A0;
-+    }
-+    else {
-+	startdx = area->dx;
-+        stopdx = area->dx + area->width - 1;
-+        startsx = area->sx;
-+        stopsx = area->sx + area->width - 1;
-+    }
-+
-+    if (area->dy <= area->sy) {
-+        startdy = area->dy;
-+        startsy = area->sy;
-+    }
-+    else {
-+	startdy = area->dy + area->height -1;
-+	startsy = area->sy + area->height -1;
-+	val |= 0x00000140;
-+    }
-+
-+    tmp =  (( area->sx + area->width ) * epinfo.bpp );
-+    blksrcwidth = tmp / 32;
-+    if(blksrcwidth > 0 && (tmp % 32 == 0))
-+	blksrcwidth--;
-+    blksrcwidth = blksrcwidth - (area->sx * epinfo.bpp) / 32;
-+
-+    tmp =  (( area->dx + area->width ) * epinfo.bpp );
-+    blkdestwidth = tmp / 32;
-+    if(blkdestwidth > 0 && (tmp % 32 == 0))
-+        blkdestwidth--;
-+    blkdestwidth = blkdestwidth - (area->dx * epinfo.bpp) / 32;
-+
-+    outl( 0x00000000 , BLOCKCTRL);
-+
-+    /*** src ***/
-+    outl((((startsx * epinfo.bpp) & 0x1F) |
-+         (((stopsx * epinfo.bpp ) & 0x1F) << 16))
-+	 , SRCPIXELSTRT);
-+    outl((epinfo.fb_phys + (startsy * epinfo.xres * epinfo.bpp ) / 8 +
-+         (startsx * epinfo.bpp ) / 8 )
-+	 , BLKSRCSTRT);
-+    outl(((epinfo.xres * epinfo.bpp) / 32), SRCLINELENGTH);
-+    outl( blksrcwidth, BLKSRCWIDTH );
-+
-+    /*** dest ***/
-+    outl((((startdx * epinfo.bpp) & 0x1F) |
-+	 (((stopdx * epinfo.bpp ) & 0x1F) << 16))
-+	 , DESTPIXELSTRT);
-+    outl((epinfo.fb_phys + (startdy * epinfo.xres * epinfo.bpp ) / 8 +
-+         (startdx * epinfo.bpp ) / 8 )
-+	 , BLKDSTSTRT);
-+    outl( ((epinfo.xres * epinfo.bpp) / 32), DESTLINELENGTH);
-+    outl( blkdestwidth, BLKDESTWIDTH);
-+    outl( area->height - 1 , BLKDESTHEIGHT);
-+    outl( epinfo.pixformat | val | 0x00000003, BLOCKCTRL);
-+    ep93xxfb_wait();
-+}
-+
-+void ep93xxfb_imageblit(struct fb_info *p, const struct fb_image *image)
-+{
-+//    unsigned long blkdestwidth,tmp;
-+//    void * pucBlitBuf;
-+    cfb_imageblit( p , image );
-+    return;
-+/*
-+    if ((image->dx >= p->var.xres) ||
-+        (image->dy >= p->var.yres) ||
-+        ((image->dx + image->width - 1) >= p->var.xres) ||
-+        ((image->dy + image->height - 1) >= p->var.yres))
-+        return;
-+    if (epinfo.bpp != image->depth )
-+	return;
-+
-+    tmp =  (( image->dx + image->width ) * epinfo.bpp );
-+    blkdestwidth = tmp / 32;
-+    if(blkdestwidth > 0 && (tmp % 32 == 0))
-+	blkdestwidth--;
-+    blkdestwidth = blkdestwidth - (image->dx * epinfo.bpp) / 32;
-+
-+    pucBlitBuf = kmalloc(1024*8,GFP_KERNEL);
-+    copy_from_user(pucBlitBuf, image->data, 5000);
-+
-+    outl( 0x00000000 , BLOCKCTRL);
-+
-+    outl( 0x00000000, SRCPIXELSTRT);
-+    outl( virt_to_phys(pucBlitBuf), BLKSRCSTRT);
-+    outl( (image->width * epinfo.bpp) / 32 , SRCLINELENGTH);
-+    outl(((image->width - 1) * epinfo.bpp) / 32, BLKSRCWIDTH );
-+
-+    outl(((image->dx * epinfo.bpp) & 0x1F) |
-+         ((((image->dx + image->width - 1) * epinfo.bpp ) & 0x1F) << 16)
-+         , DESTPIXELSTRT);
-+    outl((epinfo.fb_phys + (image->dy * epinfo.xres * epinfo.bpp ) / 8 +
-+         (image->dx * epinfo.bpp ) / 8 )
-+         , BLKDSTSTRT);
-+    outl( ((epinfo.xres * epinfo.bpp) / 32), DESTLINELENGTH );
-+    outl( blkdestwidth, BLKDESTWIDTH );
-+    outl( image->height - 1 , BLKDESTHEIGHT);
-+    outl(image->fg_color, BLOCKMASK);
-+    outl(image->bg_color, BACKGROUND);
-+    outl( epinfo.pixformat | 0x00000003, BLOCKCTRL );
-+    ep93xxfb_wait();
-+*/
-+}
-+
-+
-+static unsigned long isqrt(unsigned long a)
-+{
-+    unsigned long rem = 0;
-+    unsigned long root = 0;
-+    int i;
-+
-+    for (i = 0; i < 16; i++) {
-+        root <<= 1;
-+        rem = ((rem << 2) + (a >> 30));
-+        a <<= 2;
-+        root++;
-+        if (root <= rem) {
-+            rem -= root;
-+            root++;
-+        }
-+	else
-+            root--;
-+    }
-+    return root >> 1;
-+}
-+
-+int ep93xxfb_line(struct fb_info *info,  struct ep93xx_line *line)
-+{
-+    unsigned long value = 0;
-+    long x, y, dx, dy, count, xinc, yinc, xval, yval, incr;
-+
-+    if ((line->x1 > info->var.xres) ||
-+        (line->x2 > info->var.xres) ||
-+        (line->y1 > info->var.yres) ||
-+        (line->y2 > info->var.yres))
-+	return -EFAULT;
-+    x = line->x1;
-+    y = line->y1;
-+    dx = line->x2 - line->x1;
-+    dy = line->y2 - line->y1;
-+
-+    if ( !dx || !dy )
-+    	return -EFAULT;
-+
-+    if ( dx < 0 && dy < 0 ) {
-+	x = line->x2;
-+	y = line->y2;
-+	dx *= -1;
-+	dy *= -1;
-+    }
-+    else if ( dx < 0 && dy > 0 ){
-+        dx *= -1;
-+	value = 0x000000A0;
-+    }
-+    else if( dy < 0 && dx > 0 ){
-+	dy *= -1;
-+        value = 0x00000140;
-+    }
-+
-+    if (line->flags & LINE_PRECISE) {
-+	count = isqrt(((dy * dy) + (dx * dx)) * 4096);
-+	xinc = (4095 * 64 * dx) / count;
-+	yinc = (4095 * 64 * dy) / count;
-+	xval = 2048;
-+	yval = 2048;
-+	count = 0;
-+	while (dx || dy) {
-+	    incr = 0;
-+	    xval -= xinc;
-+	    if (xval <= 0) {
-+		xval += 4096;
-+		dx--;
-+		incr = 1;
-+	    }
-+	    yval -= yinc;
-+	    if (yval <= 0) {
-+		yval += 4096;
-+		dy--;
-+		incr = 1;
-+	    }
-+	    count += incr;
-+	}
-+    }
-+    else {
-+        if ( dx == dy ) {
-+            xinc = 4095;
-+            yinc = 4095;
-+            count = dx;
-+
-+        }
-+	else if ( dx < dy ) {
-+            xinc = ( dx * 4095 ) / dy;
-+            yinc = 4095;
-+	    count = dy;
-+
-+	}
-+	else {
-+            xinc = 4095;
-+            yinc = ( dy * 4095 ) / dx;
-+            count = dx;
-+        }
-+    }
-+
-+    outl(0x08000800, LINEINIT);
-+    if (line->flags & LINE_PATTERN)
-+        outl(line->pattern, LINEPATTRN);
-+    else
-+        outl(0x000fffff, LINEPATTRN);
-+    outl(epinfo.fb_phys + ((y * epinfo.xres * epinfo.bpp) / 8) +
-+         ((x * epinfo.bpp ) / 8 ), BLKDSTSTRT);
-+
-+    outl(((x * epinfo.bpp) & 0x1F) |
-+         ((((x + dx - 1) * epinfo.bpp) & 0x1F ) << 16),
-+	  DESTPIXELSTRT);
-+    outl((epinfo.xres * epinfo.bpp) / 32, DESTLINELENGTH);
-+    outl(line->fgcolor, BLOCKMASK);
-+    outl(line->bgcolor, BACKGROUND);
-+    outl((yinc << 16) | xinc, LINEINC);
-+    outl( count & 0xFFF, BLKDESTWIDTH);
-+    outl( 0  , BLKDESTHEIGHT);
-+    value |= (line->flags & LINE_BACKGROUND) ? 0x00004000 : 0;
-+    outl(epinfo.pixformat | value | 0x00000013, BLOCKCTRL);
-+    ep93xxfb_wait();
-+    return 0;
-+}
-+
-+int ioctl_cursor=0;
-+
-+int ep93xxfb_cursor(struct fb_info *info, struct ep93xx_cursor *cursor)
-+{
-+    unsigned long x,y,save;
-+
-+    if((cursor->width ==0)  || (cursor->height ==0) )
-+    {
-+	struct fb_cursor *fbcon_cursor =(struct fb_cursor *)cursor;
-+	struct fbcon_ops *ops = (struct fbcon_ops *)info->fbcon_par;
-+	unsigned int scan_align = info->pixmap.scan_align - 1;
-+	unsigned int buf_align = info->pixmap.buf_align - 1;
-+	unsigned int i, size, dsize, s_pitch, d_pitch;
-+	struct fb_image *image;
-+	u8 *src, *dst;
-+
-+	if(ioctl_cursor==1 ){
-+		DPRINTK("softcursor error return\n");
-+		return 0;
-+	}
-+
-+
-+        if (info->state != FBINFO_STATE_RUNNING)
-+                return 0;
-+
-+        s_pitch = (fbcon_cursor->image.width + 7) >> 3;
-+        dsize = s_pitch * fbcon_cursor->image.height;
-+
-+        if (dsize + sizeof(struct fb_image) != ops->cursor_size) {
-+                if (ops->cursor_src != NULL)
-+                        kfree(ops->cursor_src);
-+                ops->cursor_size = dsize + sizeof(struct fb_image);
-+
-+                ops->cursor_src = kmalloc(ops->cursor_size, GFP_ATOMIC);
-+                if (!ops->cursor_src) {
-+                        ops->cursor_size = 0;
-+                        return -ENOMEM;
-+                }
-+        }
-+        src = ops->cursor_src + sizeof(struct fb_image);
-+        image = (struct fb_image *)ops->cursor_src;
-+        *image = fbcon_cursor->image;
-+        d_pitch = (s_pitch + scan_align) & ~scan_align;
-+
-+        size = d_pitch * image->height + buf_align;
-+        size &= ~buf_align;
-+        dst = fb_get_buffer_offset(info, &info->pixmap, size);
-+
-+        if (fbcon_cursor->enable) {
-+                switch (fbcon_cursor->rop) {
-+                case ROP_XOR:
-+                        for (i = 0; i < dsize; i++)
-+                                src[i] = image->data[i] ^ fbcon_cursor->mask[i];
-+                        break;
-+                case ROP_COPY:
-+                default:
-+                        for (i = 0; i < dsize; i++)
-+                                src[i] = image->data[i] & fbcon_cursor->mask[i];
-+                        break;
-+                }
-+        } else
-+                memcpy(src, image->data, dsize);
-+
-+        fb_pad_aligned_buffer(dst, d_pitch, src, s_pitch, image->height);
-+        image->data = dst;
-+        info->fbops->fb_imageblit(info, image);
-+        return 0;
-+
-+    }
-+    else{
-+	ioctl_cursor = 1;
-+
-+    	/*if (cursor->width > 16 || cursor->height > 16){
-+	DPRINTK("%s width %d or heright %d error\n",__FUNCTION__,cursor->width,cursor->height);
-+	return -ENXIO;
-+    	}*/
-+
-+    	if (cursor->flags & CURSOR_OFF)
-+        	outl(inl(CURSORXYLOC) & ~0x00008000, CURSORXYLOC);
-+
-+    	if (cursor->flags & CURSOR_SETSHAPE) {
-+        	copy_from_user(cursor_data, cursor->data,
-+	    		cursor->width * cursor->height / 4);
-+		save = inl(CURSORXYLOC);
-+		outl(save & ~0x00008000, CURSORXYLOC);
-+
-+        	outl(virt_to_phys(cursor_data), CURSOR_ADR_START);
-+        	outl(virt_to_phys(cursor_data), CURSOR_ADR_RESET);
-+		outl(((cursor->width - 1) & 0x30) << 4 | ((cursor->height - 1) << 2) |
-+	     		((cursor->width - 1) >> 4), CURSORSIZE);
-+		outl(save, CURSORXYLOC);
-+
-+    	}
-+
-+    	if (cursor->flags & CURSOR_SETCOLOR) {
-+		outl(cursor->color1, CURSORCOLOR1);
-+		outl(cursor->color2, CURSORCOLOR2);
-+		outl(cursor->blinkcolor1, CURSORBLINK1);
-+		outl(cursor->blinkcolor2, CURSORBLINK2);
-+    	}
-+
-+    	if (cursor->flags & CURSOR_BLINK) {
-+        	if (cursor->blinkrate)
-+            		outl(0x00000100 | cursor->blinkrate, CURSORBLINK);
-+        	else
-+	    		outl(0x0000000FF, CURSORBLINK);
-+    	}
-+
-+    	if (cursor->flags & CURSOR_MOVE) {
-+       		x = (inl(HACTIVESTRTSTOP) & 0x000007ff) - cursor->dx - 2;
-+        	y = (inl(VACTIVESTRTSTOP) & 0x000007ff) - cursor->dy;
-+        	outl((inl(CURSORXYLOC) & 0x8000) | (y << 16) | x, CURSORXYLOC);
-+    	}
-+
-+    	if(cursor->flags & CURSOR_ON)
-+		outl(inl(CURSORXYLOC) | 0x00008000, CURSORXYLOC);
-+
-+	return 0;
-+    }
-+}
-+
-+
-+
-+static inline void
-+ep93xxfb_palette_write(u_int regno, u_int red, u_int green,
-+                       u_int blue, u_int trans)
-+{
-+    unsigned int cont, i, pal;
-+    DPRINTK("ep93xxfb_palette_write - enter\n");
-+    pal = ((red & 0xFF00) << 8) | (green & 0xFF00) | ((blue & 0xFF00) >> 8);
-+    pseudo_palette[regno] = pal;
-+    outl( pal, ( COLOR_LUT + ( regno << 2 )));
-+    cont = inl( LUTCONT );
-+
-+    if (( cont & LUTCONT_STAT && cont & LUTCONT_RAM1 ) ||
-+        ( !( cont & LUTCONT_STAT ) && !( cont&LUTCONT_RAM1 ))) {
-+	for ( i = 0; i < 256; i++ ) {
-+	    outl( pseudo_palette[i], ( COLOR_LUT + ( i << 2 )) );
-+	}
-+        outl( cont ^ LUTCONT_RAM1, LUTCONT );
-+    }
-+}
-+
-+int ep93xxfb_setcolreg(unsigned regno, unsigned red, unsigned green,
-+			   unsigned blue, unsigned transp,
-+			   struct fb_info *info)
-+{
-+
-+#define CNVT_TOHW(val,width) ((((val)<<(width))+0x7FFF-(val))>>16)
-+
-+    switch ( info->fix.visual )
-+    {
-+	case FB_VISUAL_PSEUDOCOLOR:
-+	    ep93xxfb_palette_write(regno, red, green, blue, transp);
-+	    break;
-+	case FB_VISUAL_TRUECOLOR:
-+	    if (regno >= 16)
-+	        return 1;
-+            red = CNVT_TOHW(red, info->var.red.length);
-+            green = CNVT_TOHW(green, info->var.green.length);
-+            blue = CNVT_TOHW(blue, info->var.blue.length);
-+            transp = CNVT_TOHW(transp, info->var.transp.length);
-+            ((u32 *)(info->pseudo_palette))[regno] =
-+                    (red << info->var.red.offset) |
-+                    (green << info->var.green.offset) |
-+                    (blue << info->var.blue.offset) |
-+                    (transp << info->var.transp.offset);
-+      	    break;
-+        case FB_VISUAL_DIRECTCOLOR:
-+            red = CNVT_TOHW(red, 8);
-+	    green = CNVT_TOHW(green, 8);
-+	    blue = CNVT_TOHW(blue, 8);
-+	    transp = CNVT_TOHW(transp, 8);
-+	    break;
-+    }
-+#undef CNVT_TOHW
-+    return 0;
-+}
-+
-+static int ep93xx_pan_display(struct fb_var_screeninfo *var,
-+			 struct fb_info *info)
-+{
-+    DPRINTK("ep93xx_pan_display - enter\n");
-+
-+    if (var->yoffset < 0
-+        || var->yoffset + var->yres > info->var.yres_virtual
-+        || var->xoffset)
-+	    return -EINVAL;
-+
-+    outl(epinfo.fb_phys + info->fix.line_length * var->yoffset
-+	 , VIDSCRNPAGE);
-+
-+    info->var.xoffset = var->xoffset;
-+    info->var.yoffset = var->yoffset;
-+
-+    DPRINTK("ep93xx_pan_display - exit\n");
-+    return 0;
-+}
-+
-+
-+static int
-+ep93xxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
-+{
-+    struct fb_var_screeninfo tmp_var;
-+    unsigned long pclk;
-+    DPRINTK("ep93xxfb_check_var - enter\n");
-+
-+    if( vout != 0) {
-+  printk("  ep93xxfb_check_var - vout != 0\n");
-+	return -EINVAL;
-+    }
-+
-+    memcpy (&tmp_var, var, sizeof (tmp_var));
-+
-+    if( (tmp_var.vmode & FB_VMODE_MASK) != FB_VMODE_NONINTERLACED ) {
-+	printk("  ep93xxfb_check_var - unsupported video mode\n");
-+	return -EINVAL;
-+    }
-+
-+    if( ((tmp_var.xres * tmp_var.yres * tmp_var.bits_per_pixel) / 8) >
-+	  MAX_FBMEM_SIZE ) {
-+	printk("  ep93xxfb_check_var - memory error \n");
-+	return -ENOMEM;
-+    }
-+
-+    if( ((tmp_var.xres_virtual * tmp_var.yres_virtual * tmp_var.bits_per_pixel) / 8) >
-+          MAX_FBMEM_SIZE ) {
-+	printk("  ep93xxfb_check_var - memory error \n");
-+        return -ENOMEM;
-+    }
-+
-+    pclk = 1000 * (1000000000 / tmp_var.pixclock);
-+
-+    if( pclk > ep93xx_get_max_video_clk() ) {
-+        printk("  ep93xxfb_check_var - pixel clock error %lu\n",pclk);
-+	return -EINVAL;
-+    }
-+
-+    if (var->xres_virtual != var->xres)
-+	var->xres_virtual = var->xres;
-+    if (var->yres_virtual < var->yres)
-+        var->yres_virtual = var->yres;
-+
-+    if (var->xoffset < 0)
-+        var->xoffset = 0;
-+    if (var->yoffset < 0)
-+        var->yoffset = 0;
-+
-+    switch (tmp_var.bits_per_pixel) {
-+	case 8:
-+	    break;
-+        case 16:
-+	    break;
-+        case 24:
-+            break;
-+        case 32:
-+	    break;
-+	default:
-+	    return -EINVAL;
-+    }
-+
-+    DPRINTK("ep93xxfb_check_var - exit\n");
-+    return 0;
-+}
-+
-+
-+static int ep93xxfb_set_par(struct fb_info *info)
-+{
-+    struct fb_var_screeninfo tmp_var;
-+    unsigned long attribs;
-+
-+    DPRINTK("ep93xxfb_set_par - enter\n");
-+
-+    if( ep93xxfb_check_var(&info->var,info) < 0 )
-+        return -EINVAL;
-+
-+    if( !ep93xxfb_setcol(info,info->var.bits_per_pixel) )
-+	return -EINVAL;
-+
-+
-+	info->fix.line_length = (info->var.xres * info->var.bits_per_pixel) / 8;
-+
-+    ep93xxfb_blank( 1 , info );
-+
-+    memcpy(&tmp_var,&info->var,sizeof(tmp_var));
-+
-+    epinfo.xres = tmp_var.xres;
-+    epinfo.xsync = tmp_var.hsync_len;
-+    epinfo.xfp = tmp_var.right_margin;
-+    epinfo.xbp = tmp_var.left_margin;
-+    epinfo.xtotal = epinfo.xres + epinfo.xsync +
-+                    epinfo.xfp + epinfo.xbp;
-+
-+    epinfo.yres = tmp_var.yres;
-+    epinfo.ysync = tmp_var.vsync_len;
-+    epinfo.yfp = tmp_var.lower_margin;
-+    epinfo.ybp = tmp_var.upper_margin;
-+    epinfo.ytotal = epinfo.yres + epinfo.ysync +
-+		    epinfo.yfp + epinfo.ybp;
-+
-+    epinfo.pixclock = tmp_var.pixclock ;
-+    epinfo.refresh = 1000 * (1000000000 / tmp_var.pixclock) ;
-+
-+    if( epinfo.refresh > ep93xx_get_max_video_clk())
-+	epinfo.refresh = ep93xx_get_max_video_clk();
-+    epinfo.bpp = tmp_var.bits_per_pixel;
-+
-+    ep93xxfb_setclk();
-+    ep93xxfb_timing_signal_generation();
-+
-+    // set video memory parameters
-+    outl(epinfo.fb_phys, VIDSCRNPAGE);
-+    outl(epinfo.yres , SCRNLINES);
-+    outl(((epinfo.xres * epinfo.bpp) / 32) - 1, LINELENGTH);
-+    outl((epinfo.xres * epinfo.bpp) / 32, VLINESTEP);
-+
-+    // set pixel mode
-+    ep93xxfb_pixelmod(epinfo.bpp);
-+
-+    attribs = 0;
-+#ifdef CONFIG_EP93XX_SDCS0
-+    attribs |= 0 << VIDEOATTRIBS_SDSEL_SHIFT;
-+#endif
-+#ifdef CONFIG_EP93XX_SDCS1
-+    attribs |= 1 << VIDEOATTRIBS_SDSEL_SHIFT;
-+#endif
-+#ifdef CONFIG_EP93XX_SDCS2
-+    attribs |= 2 << VIDEOATTRIBS_SDSEL_SHIFT;
-+#endif
-+#ifdef CONFIG_EP93XX_SDCS3
-+    attribs |= 3 << VIDEOATTRIBS_SDSEL_SHIFT;
-+#endif
-+
-+    attribs |= VIDEOATTRIBS_INVCLK;
-+    if( tmp_var.sync & FB_SYNC_HOR_HIGH_ACT )
-+        attribs |= VIDEOATTRIBS_HSPOL;
-+    if( tmp_var.sync & FB_SYNC_VERT_HIGH_ACT )
-+        attribs |= VIDEOATTRIBS_VCPOL;
-+
-+    ep93xxfb_outl(attribs, VIDEOATTRIBS);
-+    ep93xxfb_blank( 0 , info );
-+
-+    DPRINTK("ep93xxfb_set_par - exit\n");
-+
-+    return 0;
-+}
-+
-+
-+static int ep93xxfb_blank(int blank_mode,struct fb_info *info)
-+{
-+    unsigned long attribs;
-+    DPRINTK("ep93xxfb_blank - enter\n");
-+    attribs = inl(VIDEOATTRIBS);
-+
-+#ifdef CONFIG_EP93XX_SDCS0
-+    attribs |= 0 << VIDEOATTRIBS_SDSEL_SHIFT;
-+#endif
-+#ifdef CONFIG_EP93XX_SDCS1
-+    attribs |= 1 << VIDEOATTRIBS_SDSEL_SHIFT;
-+#endif
-+#ifdef CONFIG_EP93XX_SDCS2
-+    attribs |= 2 << VIDEOATTRIBS_SDSEL_SHIFT;
-+#endif
-+#ifdef CONFIG_EP93XX_SDCS3
-+    attribs |= 3 << VIDEOATTRIBS_SDSEL_SHIFT;
-+#endif
-+
-+    if (blank_mode) {
-+	if (epinfo.off)
-+            (epinfo.off)( 0 );
-+
-+	ep93xxfb_outl(attribs & ~(VIDEOATTRIBS_DATAEN |
-+                 VIDEOATTRIBS_SYNCEN | VIDEOATTRIBS_PCLKEN |
-+		 VIDEOATTRIBS_EN), VIDEOATTRIBS);
-+    }
-+    else {
-+	if (epinfo.clk_src == CLK_INTERNAL)
-+	    attribs |= VIDEOATTRIBS_PCLKEN;
-+	else
-+	    attribs &= ~VIDEOATTRIBS_PCLKEN;
-+
-+	ep93xxfb_outl(attribs | VIDEOATTRIBS_DATAEN |
-+	         VIDEOATTRIBS_SYNCEN | VIDEOATTRIBS_EN,
-+	         VIDEOATTRIBS);
-+
-+	if (epinfo.configure)
-+		(epinfo.configure)( epinfo.automods );
-+	if (epinfo.on)
-+	       (epinfo.on)( 0 );
-+    }
-+    return 0;
-+}
-+
-+static int ep93xxfb_mmap(struct fb_info *info,struct vm_area_struct *vma)
-+{
-+    unsigned long off, start, len;
-+
-+    DPRINTK("ep93xxfb_mmap - enter\n");
-+
-+    off = vma->vm_pgoff << PAGE_SHIFT;
-+    start = info->fix.smem_start;
-+    len = PAGE_ALIGN(start & ~PAGE_MASK) + info->fix.smem_len;
-+    start &= PAGE_MASK;
-+    if ((vma->vm_end - vma->vm_start + off) > len)
-+	return -EINVAL;
-+
-+    off += start;
-+    vma->vm_pgoff = off >> PAGE_SHIFT;
-+
-+    vma->vm_flags |= VM_IO;
-+    vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
-+
-+    if (io_remap_pfn_range(vma, vma->vm_start, off >> PAGE_SHIFT,
-+	vma->vm_end - vma->vm_start, vma->vm_page_prot)) {
-+	DPRINTK("ep93xxfb_mmap error\n");
-+	return -EAGAIN;
-+    }
-+
-+    DPRINTK("ep93xxfb_mmap - exit\n");
-+    return 0;
-+}
-+
-+static unsigned long ep93xx_get_pll_frequency(unsigned long pll)
-+{
-+    unsigned long fb1, fb2, ipd, ps, freq;
-+
-+    if (pll == 1)
-+	pll = inl(EP93XX_SYSCON_CLOCK_SET1);
-+    else if (pll == 2)
-+	pll = inl(EP93XX_SYSCON_CLOCK_SET2);
-+    else
-+	return 0;
-+
-+    ps = (pll & SYSCON_CLKSET1_PLL1_PS_MASK) >>	SYSCON_CLKSET1_PLL1_PS_SHIFT;
-+    fb1 = ((pll & SYSCON_CLKSET1_PLL1_X1FBD1_MASK) >> SYSCON_CLKSET1_PLL1_X1FBD1_SHIFT);
-+    fb2 = ((pll & SYSCON_CLKSET1_PLL1_X2FBD2_MASK) >> SYSCON_CLKSET1_PLL1_X2FBD2_SHIFT);
-+    ipd = ((pll & SYSCON_CLKSET1_PLL1_X2IPD_MASK) >> SYSCON_CLKSET1_PLL1_X2IPD_SHIFT);
-+
-+    freq = (((0x00e10000 * (fb1+1)) / (ipd+1)) * (fb2+1)) >> ps;
-+    return freq;
-+}
-+
-+static int ep93xx_get_max_video_clk()
-+{
-+    unsigned long f,freq = 0;
-+
-+    freq = 14745600 / 4;
-+    f = ep93xx_get_pll_frequency(1) / 4;
-+    if ( f > freq )
-+	freq = f;
-+    f = ep93xx_get_pll_frequency(2) / 4;
-+    if ( f > freq )
-+	freq = f;
-+
-+    return freq;
-+}
-+
-+static int ep93xx_set_video_div(unsigned long freq)
-+{
-+    unsigned long pdiv = 0, div = 0, psel = 0, esel = 0;
-+    unsigned long err, f, i, j, k;
-+
-+    err = -1;
-+
-+    for (i = 0; i < 3; i++) {
-+	if (i == 0)
-+	    f = 14745600 * 2;
-+	else if (i == 1)
-+	    f = ep93xx_get_pll_frequency(1) * 2;
-+	else
-+	    f = ep93xx_get_pll_frequency(2) * 2;
-+
-+	for (j = 4; j <= 6; j++) {
-+	    k = f / (freq * j);
-+	    if (k < 2)
-+		continue;
-+
-+	    if (abs(((f / (j * k))) - freq ) < err ) {
-+		pdiv = j - 3;
-+		div = k;
-+		psel = (i == 2) ? 1 : 0;
-+		esel = (i == 0) ? 0 : 1;
-+		err = (f / (j * k)) - freq;
-+	    }
-+	}
-+    }
-+
-+    if (err == -1)
-+	return -1;
-+
-+    SysconSetLocked(SYSCON_VIDDIV,SYSCON_VIDDIV_VENA | (esel ? SYSCON_VIDDIV_ESEL : 0) |
-+                       (psel ? SYSCON_VIDDIV_PSEL : 0) |
-+                       (pdiv << SYSCON_VIDDIV_PDIV_SHIFT) |
-+                       (div << SYSCON_VIDDIV_VDIV_SHIFT)
-+                  );
-+
-+    return freq + err;
-+}
-+
-+static void ep93xxfb_pixelmod(int bpp)
-+{
-+    unsigned long tmpdata = 0;
-+
-+    DPRINTK("ep93xxfb_pixelmod %dbpp -enter\n",bpp);
-+    switch(bpp) {
-+	case 8:
-+            tmpdata = PIXELMODE_P_8BPP |
-+		      PIXELMODE_S_1PPCMAPPED |
-+                      PIXELMODE_C_LUT;
-+	    epinfo.pixformat = PIXEL_FORMAT_8;
-+	    break;
-+	case 16:
-+	    tmpdata = PIXELMODE_P_16BPP |
-+		      PIXELMODE_S_1PPCMAPPED |
-+		      PIXELMODE_C_565;
-+            epinfo.pixformat = PIXEL_FORMAT_16;
-+	    break;
-+	case 24:
-+            tmpdata = PIXELMODE_P_24BPP |
-+	              PIXELMODE_S_1PPC |
-+		      PIXELMODE_C_888;
-+            epinfo.pixformat = PIXEL_FORMAT_24;
-+	    break;
-+        case 32:
-+            tmpdata = PIXELMODE_P_32BPP |
-+		      PIXELMODE_S_1PPC |
-+		      PIXELMODE_C_888;
-+            epinfo.pixformat = PIXEL_FORMAT_32;
-+	    break;
-+	default:
-+	    break;
-+    }
-+    outl(tmpdata,PIXELMODE);
-+}
-+
-+static void ep93xxfb_timing_signal_generation(void)
-+{
-+    unsigned long vlinestotal,vsyncstart,vsyncstop,
-+		  vactivestart,vactivestop,
-+		  vblankstart,vblankstop,
-+		  vclkstart,vclkstop;
-+
-+    unsigned long hclkstotal,hsyncstart,hsyncstop,
-+                  hactivestart,hactivestop,
-+		  hblankstart,hblankstop,
-+		  hclkstart,hclkstop;
-+
-+    DPRINTK("ep93xxfb_timing_signal_generation - enter\n");
-+
-+    vlinestotal = epinfo.ytotal - 1;
-+    vsyncstart = vlinestotal;
-+    vsyncstop = vlinestotal - epinfo.ysync;
-+    vblankstart = vlinestotal - epinfo.ysync - epinfo.ybp;
-+    vblankstop = epinfo.yfp - 1;
-+    vactivestart = vblankstart;
-+    vactivestop = vblankstop;
-+    vclkstart = vlinestotal;
-+    vclkstop = vlinestotal + 1;
-+
-+    hclkstotal = epinfo.xtotal - 1;
-+    hsyncstart = hclkstotal;
-+    hsyncstop = hclkstotal - epinfo.xsync;
-+    hblankstart = hclkstotal - epinfo.xsync - epinfo.xbp;
-+    hblankstop = epinfo.xfp - 1;
-+    hactivestart = hblankstart;
-+    hactivestop = hblankstop;
-+    hclkstart = hclkstotal ;
-+    hclkstop = hclkstotal ;
-+
-+    ep93xxfb_outl(0, VIDEOATTRIBS);
-+
-+    ep93xxfb_outl( vlinestotal , VLINESTOTAL );
-+    ep93xxfb_outl( vsyncstart + (vsyncstop << 16), VSYNCSTRTSTOP );
-+    ep93xxfb_outl( vactivestart + (vactivestop << 16), VACTIVESTRTSTOP );
-+    ep93xxfb_outl( vblankstart + (vblankstop << 16), VBLANKSTRTSTOP );
-+    ep93xxfb_outl( vclkstart + (vclkstop << 16), VCLKSTRTSTOP );
-+
-+    ep93xxfb_outl( hclkstotal , HCLKSTOTAL );
-+    ep93xxfb_outl( hsyncstart + (hsyncstop << 16), HSYNCSTRTSTOP );
-+    ep93xxfb_outl( hactivestart + (hactivestop << 16) , HACTIVESTRTSTOP );
-+    ep93xxfb_outl( hblankstart + (hblankstop << 16) , HBLANKSTRTSTOP );
-+    ep93xxfb_outl( hclkstart + (hclkstop << 16) , HCLKSTRTSTOP );
-+
-+    ep93xxfb_outl(0, LINECARRY);
-+
-+}
-+
-+static int ep93xxfb_setcol(struct fb_info *info, int bpp)
-+{
-+
-+    DPRINTK("ep93xxfb_setcol %dbpp\n",bpp);
-+    switch(bpp) {
-+	case 8:
-+            info->var.bits_per_pixel = 8;
-+	    info->var.red.length = 8;
-+	    info->var.green.length = 8;
-+	    info->var.blue.length = 8;
-+    	    info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
-+	    break;
-+	case 16:
-+            info->var.bits_per_pixel = 16;
-+	    info->var.red.offset = 11;
-+	    info->var.red.length = 5;
-+	    info->var.green.offset = 5;
-+	    info->var.green.length = 6;
-+	    info->var.blue.offset = 0;
-+	    info->var.blue.length = 5;
-+    	    info->fix.visual = FB_VISUAL_TRUECOLOR;
-+	    break;
-+	case 24:
-+	    info->var.bits_per_pixel = 24;
-+	    info->var.red.length = 8;
-+	    info->var.blue.length = 8;
-+	    info->var.green.length = 8;
-+	    info->var.red.offset = 16;
-+	    info->var.green.offset = 8;
-+	    info->var.blue.offset = 0;
-+	    info->fix.visual = FB_VISUAL_TRUECOLOR;
-+	    break;
-+	case 32:
-+            info->var.bits_per_pixel = 32;
-+	    info->var.red.length = 8;
-+	    info->var.blue.length = 8;
-+	    info->var.green.length = 8;
-+	    info->var.transp.length = 0;
-+	    info->var.red.offset = 16;
-+	    info->var.green.offset = 8;
-+	    info->var.blue.offset = 0;
-+	    info->var.transp.offset = 0;
-+	    info->fix.visual = FB_VISUAL_TRUECOLOR;
-+	    break;
-+	default:
-+	    return 0;
-+    }
-+    return 1;
-+}
-+
-+static int ep93xxfb_setclk()
-+{
-+    unsigned long calc_clk,act_clk;
-+
-+    if ( epinfo.clk_src == CLK_INTERNAL ) {
-+	SysconSetLocked(EP93XX_SYSCON_DEVICE_CONFIG,inl(EP93XX_SYSCON_DEVICE_CONFIG) & ~EP93XX_SYSCON_DEVICE_CONFIG_CRUNCH_ENABLE);
-+        calc_clk = epinfo.refresh;
-+        act_clk = ep93xx_set_video_div( calc_clk );
-+	if ( act_clk == -1 )
-+               return -ENODEV;
-+
-+	epinfo.refresh = act_clk;
-+	epinfo.pixclock = 1000000000 / (act_clk / 1000);
-+    }
-+    else {
-+	SysconSetLocked(SYSCON_VIDDIV,0);
-+	SysconSetLocked(EP93XX_SYSCON_DEVICE_CONFIG,inl(EP93XX_SYSCON_DEVICE_CONFIG) | EP93XX_SYSCON_DEVICE_CONFIG_CRUNCH_ENABLE);
-+
-+    }
-+
-+    return 0;
-+}
-+
-+
-+static void ep93xxfb_get_par(struct fb_info *info)
-+{
-+
-+    DPRINTK("ep93xxfb_get_par - enter\n");
-+    epinfo.configure = NULL;
-+    epinfo.on = NULL;
-+    epinfo.off = NULL;
-+
-+    switch( vout ) {
-+	case LCD_OUT:
-+            epinfo.on = philips_lb064v02_on;
-+	    epinfo.off = philips_lb064v02_off;
-+
-+	case CRT_OUT:
-+    	    epinfo.xres = ep93xxfb_vmods[vmode].hres;
-+    	    epinfo.xsync = ep93xxfb_vmods[vmode].hsync;
-+    	    epinfo.xfp = ep93xxfb_vmods[vmode].hfp;
-+    	    epinfo.xbp = ep93xxfb_vmods[vmode].hbp;
-+    	    epinfo.xtotal = epinfo.xres + epinfo.xsync +
-+			    epinfo.xfp + epinfo.xbp;
-+
-+    	    epinfo.yres = ep93xxfb_vmods[vmode].vres;
-+    	    epinfo.ysync = ep93xxfb_vmods[vmode].vsync;
-+    	    epinfo.yfp = ep93xxfb_vmods[vmode].vfp;
-+    	    epinfo.ybp = ep93xxfb_vmods[vmode].vbp;
-+    	    epinfo.ytotal = epinfo.yres + epinfo.ysync +
-+        	        epinfo.yfp + epinfo.ybp;
-+
-+	    epinfo.refresh = ep93xxfb_vmods[vmode].refresh;
-+    	    epinfo.refresh = epinfo.xtotal * epinfo.ytotal * epinfo.refresh;
-+	    epinfo.pixclock = 1000000000 / ( epinfo.refresh / 1000);
-+	    epinfo.bpp = depth;
-+
-+    	    epinfo.clk_src = ep93xxfb_vmods[vmode].clk_src;
-+    	    epinfo.clk_edge = ep93xxfb_vmods[vmode].clk_edge;
-+    	    epinfo.pol_blank = ep93xxfb_vmods[vmode].pol_blank;
-+    	    epinfo.pol_xsync = ep93xxfb_vmods[vmode].pol_hsync;
-+    	    epinfo.pol_ysync = ep93xxfb_vmods[vmode].pol_vsync;
-+	    break;
-+
-+    }
-+}
-+
-+static int ep93xxfb_alloc_videomem(void)
-+{
-+    unsigned long adr,size,pgsize;
-+    int order;
-+
-+    DPRINTK("ep93xxfb_alloc_videomem - enter \n");
-+
-+    epinfo.fb_log = NULL;
-+    epinfo.fb_size = PAGE_ALIGN( MAX_FBMEM_SIZE/*ep93xxfb_vmods[vmode].hres * ep93xxfb_vmods[vmode].vres * (depth / 8)*/ );
-+    order = get_order( epinfo.fb_size );
-+    epinfo.fb_log = (void*) __get_free_pages( GFP_KERNEL, order );
-+
-+    if (epinfo.fb_log) {
-+	epinfo.fb_phys = __virt_to_phys((int) epinfo.fb_log );
-+        adr = (unsigned long)epinfo.fb_log;
-+	size = epinfo.fb_size;
-+	pgsize = 1 << order;
-+        do {
-+            adr += pgsize;
-+            SetPageReserved(virt_to_page(adr));
-+	} while(size -= pgsize);
-+    }
-+    else{
-+        printk("%s memory fail \n",__FUNCTION__);
-+        return -ENOMEM;
-+    }
-+
-+    memset(epinfo.fb_log,0x00,epinfo.fb_size);
-+    DPRINTK("   fb_log_addres = 0x%x\n",epinfo.fb_log);
-+    DPRINTK("   fb_phys_address = 0x%x\n",epinfo.fb_phys);
-+    DPRINTK("   fb_size = %lu\n",epinfo.fb_size);
-+    DPRINTK("   fb_page_order = %d\n",order);
-+    DPRINTK("ep93xxfb_alloc_videomem - exit \n");
-+    return 0;
-+}
-+
-+static void ep93xxfb_release_videomem(void)
-+{
-+    unsigned long adr,size,psize;
-+    int order;
-+
-+    DPRINTK("ep93xxfb_release_videomem - enter \n");
-+
-+    if (epinfo.fb_log) {
-+	order = get_order(epinfo.fb_size);
-+        adr = (unsigned long)epinfo.fb_log;
-+        size = epinfo.fb_size;
-+	psize = 1 << order ;
-+        do {
-+            adr += psize;
-+            ClearPageReserved(virt_to_page(adr));
-+	} while(size -= psize);
-+	free_pages((unsigned long)epinfo.fb_log, order );
-+    }
-+
-+
-+    DPRINTK("ep93xxfb_release_videomem - exit \n");
-+}
-+
-+static void ep93xxfb_setinfo(struct fb_info *info)
-+{
-+
-+    info->pseudo_palette = pseudo_palette;
-+    info->var.xres = epinfo.xres;
-+    info->var.yres = epinfo.yres;
-+    info->var.xres_virtual = epinfo.xres;
-+    info->var.yres_virtual = epinfo.yres;
-+
-+    ep93xxfb_setcol( info, depth );
-+
-+    info->var.activate = FB_ACTIVATE_NOW;
-+    info->var.left_margin = epinfo.xbp;
-+    info->var.right_margin = epinfo.xfp;
-+    info->var.upper_margin = epinfo.ybp;
-+    info->var.lower_margin = epinfo.yfp;
-+    info->var.hsync_len = epinfo.xsync;
-+    info->var.vsync_len = epinfo.ysync;
-+
-+    if( epinfo.pol_xsync == POL_HIGH )
-+        info->var.sync |= FB_SYNC_HOR_HIGH_ACT;
-+    if( epinfo.pol_ysync == POL_HIGH )
-+        info->var.sync |= FB_SYNC_VERT_HIGH_ACT;
-+
-+    info->var.vmode = FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP;
-+    info->fix.smem_start = epinfo.fb_phys;
-+    info->fix.smem_len = epinfo.fb_size;
-+    info->fix.type = FB_TYPE_PACKED_PIXELS;
-+    info->fix.line_length = epinfo.xres * (epinfo.bpp / 8);
-+    info->screen_base = epinfo.fb_log;
-+    info->var.pixclock = epinfo.pixclock;
-+    info->fix.ypanstep = 1;
-+    info->fix.ywrapstep = 1;
-+
-+}
-+
-+static int ep93xxfb_config(struct fb_info *info)
-+{
-+    unsigned long attribs;
-+
-+    DPRINTK("ep93xxfb_config - enter\n");
-+
-+    ep93xxfb_get_par( info );
-+    if( ep93xxfb_alloc_videomem() != 0 ) {
-+        printk("Unable to allocate video memory\n");
-+        return -ENOMEM;
-+    }
-+
-+    if( ep93xxfb_setclk() != 0 ) {
-+	printk("Unable to set pixel clock\n");
-+        ep93xxfb_release_videomem();
-+	return -ENODEV;
-+    }
-+
-+    SysconSetLocked(EP93XX_SYSCON_DEVICE_CONFIG, inl(EP93XX_SYSCON_DEVICE_CONFIG)  |EP93XX_SYSCON_DEVCFG_RasOnP3);
-+    ep93xxfb_timing_signal_generation();
-+
-+    /* set video memory parameters */
-+    outl(epinfo.fb_phys, VIDSCRNPAGE);
-+    outl(epinfo.yres , SCRNLINES);
-+    outl(((epinfo.xres * epinfo.bpp) / 32) - 1, LINELENGTH);
-+    outl((epinfo.xres * epinfo.bpp) / 32, VLINESTEP);
-+
-+
-+    /* set pixel mode */
-+    ep93xxfb_pixelmod(depth);
-+
-+    attribs = 0;
-+
-+#ifdef CONFIG_EP93XX_SDCS0
-+    attribs |= 0 << VIDEOATTRIBS_SDSEL_SHIFT;
-+#endif
-+#ifdef CONFIG_EP93XX_SDCS1
-+    attribs |= 1 << VIDEOATTRIBS_SDSEL_SHIFT;
-+#endif
-+#ifdef CONFIG_EP93XX_SDCS2
-+    attribs |= 2 << VIDEOATTRIBS_SDSEL_SHIFT;
-+#endif
-+#ifdef CONFIG_EP93XX_SDCS3
-+    attribs |= 3 << VIDEOATTRIBS_SDSEL_SHIFT;
-+#endif
-+
-+    if(epinfo.clk_edge == EDGE_RISING)
-+	attribs |= VIDEOATTRIBS_INVCLK;
-+    if(epinfo.pol_blank == POL_HIGH)
-+	attribs |= VIDEOATTRIBS_BLKPOL;
-+    if(epinfo.pol_xsync == POL_HIGH)
-+	attribs |= VIDEOATTRIBS_HSPOL;
-+    if(epinfo.pol_ysync == POL_HIGH)
-+	attribs |= VIDEOATTRIBS_VCPOL;
-+
-+    ep93xxfb_outl(attribs, VIDEOATTRIBS);
-+    ep93xxfb_setinfo( info );
-+
-+    if(epinfo.configure)
-+	(epinfo.configure)( epinfo.automods );
-+
-+    ep93xxfb_blank( 0 , info );
-+
-+    DPRINTK("ep93xxfb_config - exit\n");
-+    return 0;
-+}
-+
-+int ep93xxfb_ioctl(struct fb_info *info,unsigned int cmd, unsigned long arg)
-+{
-+    struct fb_fillrect fill;
-+    struct fb_copyarea cparea;
-+    struct fb_image img;
-+    struct ep93xx_line line;
-+    struct ep93xx_cursor cursor;
-+
-+    switch (cmd) {
-+        case FBIO_EP93XX_CURSOR:
-+            copy_from_user(&cursor, (void *)arg, sizeof(struct ep93xx_cursor));
-+	    ep93xxfb_cursor(info,&cursor);
-+	    break;
-+	case FBIO_EP93XX_LINE:
-+            copy_from_user(&line, (void *)arg, sizeof(struct ep93xx_line));
-+	    ep93xxfb_line(info,&line);
-+	    break;
-+	case FBIO_EP93XX_FILL:
-+	    copy_from_user(&fill, (void *)arg, sizeof(struct fb_fillrect));
-+	    ep93xxfb_fillrect(info,&fill);
-+	    break;
-+	case FBIO_EP93XX_BLIT:
-+            copy_from_user(&img, (void *)arg, sizeof(struct fb_image));
-+	    ep93xxfb_imageblit(info, &img);
-+	    break;
-+        case FBIO_EP93XX_COPY:
-+	    copy_from_user(&cparea, (void *)arg, sizeof(struct fb_copyarea));
-+	    ep93xxfb_copyarea(info,&cparea);
-+	    break;
-+        default:
-+	    return -EFAULT;
-+    }
-+    return 0;
-+}
-+
-+
-+static struct fb_ops ep93xxfb_ops = {
-+    .owner          = THIS_MODULE,
-+    .fb_setcolreg   = ep93xxfb_setcolreg,
-+    .fb_check_var   = ep93xxfb_check_var,
-+    .fb_set_par     = ep93xxfb_set_par,
-+    .fb_blank       = ep93xxfb_blank,
-+    .fb_pan_display = ep93xx_pan_display,
-+    .fb_fillrect    = ep93xxfb_fillrect,
-+    .fb_copyarea    = ep93xxfb_copyarea,
-+    .fb_imageblit   = cfb_imageblit,
-+    .fb_cursor      = ep93xxfb_cursor,
-+    .fb_ioctl       = ep93xxfb_ioctl,
-+    .fb_mmap        = ep93xxfb_mmap,
-+};
-+
-+
-+static struct resource ep93xxfb_raster_resources = {
-+    .start          = EP93XX_RASTER_PHYS_BASE,
-+    .end            = EP93XX_RASTER_PHYS_BASE + 0x1ffff,
-+    .flags          = IORESOURCE_MEM,
-+};
-+
-+
-+static int __init ep93xxfb_probe(struct platform_device *device)
-+{
-+    struct fb_info *info = NULL;
-+    struct resource *res = NULL;
-+    int ret = 0;
-+    int arb = 0;
-+
-+    DPRINTK("ep93xxfb_probe - enter \n");
-+
-+
-+    if(!device) {
-+	printk("error : to_platform_device\n");
-+        return -ENODEV;
-+    }
-+    res = platform_get_resource( device, IORESOURCE_MEM, 0);
-+    if(!res) {
-+        printk("error : platform_get_resource \n");
-+        return -ENODEV;
-+    }
-+    cursor_data = kmalloc( 64 * 64 * 2, GFP_KERNEL );
-+    memset( cursor_data, 0x00, 64 * 64 * 2 );
-+    if(!cursor_data) {
-+        printk("Unable to allocate memory for hw_cursor\n");
-+	return -ENOMEM;
-+    }
-+    if (!request_mem_region(res->start,res->end - res->start + 1, FBDEV_NAME ))
-+	return -EBUSY;
-+
-+    info = framebuffer_alloc(sizeof(u32) * 256, &device->dev);
-+
-+    if(!info) {
-+	printk("Unable to allocate memory for frame buffer\n");
-+	return -ENOMEM;
-+    }
-+
-+    info->flags = FBINFO_DEFAULT;
-+    strncpy(info->fix.id, FBDEV_NAME, sizeof(info->fix.id));
-+    info->fix.mmio_start = res->start;
-+    info->fix.mmio_len = res->end - res->start + 1;
-+    info->fbops = &ep93xxfb_ops;
-+    info->pseudo_palette = info->par;
-+    info->state = FBINFO_STATE_RUNNING;
-+
-+    if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
-+	ret = -ENOMEM;
-+	goto fbuff;
-+    }
-+
-+    if ((ret = ep93xxfb_config(info)) < 0)
-+	goto clmap;
-+
-+    if (register_framebuffer(info) < 0) {
-+	printk(KERN_ERR "Unable to register ep93xxfb frame buffer\n");
-+	ret = -EINVAL;
-+	goto clmap;
-+    }
-+    platform_set_drvdata(device, info);
-+    printk(KERN_INFO "fb%d: EP93xx frame buffer at %dx%dx%dbpp\n", info->node,
-+		info->var.xres, info->var.yres, info->var.bits_per_pixel);
-+
-+    /*change the raster arb to the highest one--Bo*/
-+    arb = inl(EP93XX_SYSCON_BMAR);
-+    arb = (arb & 0x3f8) | 0x01;
-+    outl(arb,EP93XX_SYSCON_BMAR);
-+
-+    DPRINTK("ep93xxfb_probe - exit \n");
-+    return 0;
-+
-+clmap:
-+    fb_dealloc_cmap(&info->cmap);
-+
-+fbuff:
-+    framebuffer_release(info);
-+    return ret;
-+}
-+
-+static int ep93xxfb_remove(struct platform_device *device)
-+{
-+    struct resource *res;
-+    struct fb_info *info;
-+    struct ep93xx_cursor cursor;
-+
-+    DPRINTK("ep93xxfb_remove - enter \n");
-+
-+    info = platform_get_drvdata(device);
-+
-+    ep93xxfb_release_videomem();
-+
-+    res = platform_get_resource( device, IORESOURCE_MEM, 0);
-+    release_mem_region(res->start, res->end - res->start + 1);
-+
-+    platform_set_drvdata(device, NULL);
-+    unregister_framebuffer(info);
-+
-+    fb_dealloc_cmap(&info->cmap);
-+    framebuffer_release(info);
-+
-+    cursor.flags = CURSOR_OFF;
-+    ep93xxfb_cursor(info,&cursor);
-+    if(cursor_data!=NULL)
-+	kfree(cursor_data);
-+
-+    ep93xxfb_blank( 1, info );
-+
-+    DPRINTK("ep93xxfb_remove - exit \n");
-+    return 0;
-+}
-+
-+static void ep93xxfb_platform_release(struct device *device)
-+{
-+    DPRINTK("ep93xxfb_platform_release - enter\n");
-+}
-+
-+static int ep93xxfb_check_param(void)
-+{
-+
-+    switch(vout) {
-+	case CRT_OUT:
-+	    if( vmode >=(sizeof(ep93xxfb_vmods)/sizeof(ep93xxfb_vmods[0]))){
-+        	vmode = 1;
-+        	depth = DEFAULT_BPP;
-+	    	return 0;
-+	    }
-+	    break;
-+        case LCD_OUT:
-+	    if( vmode != 0 || depth != 16 ) {
-+        	vmode = 0;
-+        	depth = DEFAULT_BPP;
-+	    	return 0;
-+	    }
-+	    break;
-+	default:
-+	    vmode = DEFAULT_MODE;
-+	    depth = DEFAULT_BPP;
-+	    vout = DEFAULT_OUT;
-+	    return 0;
-+	    break;
-+    }
-+
-+    if(!((depth == 8) || (depth == 16) || (depth == 24) || (depth == 32)))
-+	depth = DEFAULT_BPP;
-+
-+    return 1;
-+}
-+
-+int __init ep93xxfb_setup(char *options)
-+{
-+    char *opt;
-+
-+    DPRINTK("ep93xxfb_setup - %s\n",options);
-+
-+    if (!options || !*options)
-+	return 0;
-+
-+    while ((opt = strsep(&options, ",")) != NULL) {
-+	if (!strncmp(opt, "vout=", 5))
-+	    vout = simple_strtoul(opt + 5, NULL, 0);
-+	else if (!strncmp(opt, "vmode=", 6))
-+	    vmode = simple_strtoul(opt + 6, NULL, 0);
-+	else if (!strncmp(opt, "depth=", 6))
-+	    depth = simple_strtoul(opt + 6, NULL, 0);
-+    }
-+    ep93xxfb_check_param();
-+    return 0;
-+}
-+
-+
-+static struct platform_driver ep93xxfb_driver = {
-+    .probe  = ep93xxfb_probe,
-+    .remove = ep93xxfb_remove,
-+    .driver = {
-+		 .name   = FBDEV_NAME,
-+	      },
-+};
-+
-+static struct platform_device ep93xxfb_device = {
-+    .name      = FBDEV_NAME,
-+    .id        = -1,
-+    .dev    = {
-+		.release = ep93xxfb_platform_release,
-+	      },
-+    .num_resources  = 1,
-+    .resource       = &ep93xxfb_raster_resources,
-+};
-+
-+int __init ep93xxfb_init(void)
-+{
-+    int ret = 0;
-+    char *option = NULL;
-+
-+    DPRINTK("ep93xxfb_init - enter\n");
-+
-+    if (fb_get_options("ep93xxfb", &option))
-+            return -ENODEV;
-+    ep93xxfb_setup(option);
-+
-+
-+    if( !ep93xxfb_check_param() ) {
-+	printk("Unsupported format \n");
-+	return -1;
-+    }
-+    /*Add the Hardware accel irq */
-+    outl(0x00000000, BLOCKCTRL);
-+    ret = request_irq(IRQ_EP93XX_GRAPHICS, ep93xxfb_irq_handler, IRQF_DISABLED,"graphics",NULL);
-+
-+    if (ret != 0) {
-+    	printk("%s: can't get irq %i, err %d\n",__FUNCTION__, IRQ_EP93XX_GRAPHICS, ret);
-+                return -EBUSY;
-+    }
-+
-+    /*-------------------------------*/
-+    ret = platform_driver_register(&ep93xxfb_driver);
-+
-+    if (!ret) {
-+	ret = platform_device_register(&ep93xxfb_device);
-+	if (ret)
-+	    platform_driver_unregister(&ep93xxfb_driver);
-+    }
-+
-+    DPRINTK("ep93xxfb_init - exit\n");
-+    return ret;
-+}
-+
-+
-+
-+static void __exit ep93xxfb_exit(void)
-+{
-+    DPRINTK("ep93xxfb_exit - enter\n");
-+    platform_driver_unregister(&ep93xxfb_driver);
-+    platform_device_unregister(&ep93xxfb_device);
-+    DPRINTK("ep93xxfb_exit - exit\n");
-+}
-+
-+module_init(ep93xxfb_init);
-+module_exit(ep93xxfb_exit);
-+
-+
-+module_param( vmode, int,  S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
-+MODULE_PARM_DESC(vmode, "Specify the video mode number that should be used");
-+module_param( vout , int ,  S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP );
-+MODULE_PARM_DESC(vout ,"Specify video output (0 = CRT ,1 = LCD )");
-+module_param( depth , int,  S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
-+MODULE_PARM_DESC(depth ,"Color depth (8,16,24,32)");
-+MODULE_LICENSE("GPL");
---- /dev/null
-+++ b/drivers/video/ep93xxfb.h
-@@ -0,0 +1,236 @@
-+#ifndef __EP93XXFB_H__
-+#define __EP93XXFB_H__
-+
-+
-+#define POL_HIGH		1
-+#define POL_LOW        		0
-+#define EDGE_RISING     	1
-+#define EDGE_FALLING    	0
-+#define CLK_INTERNAL    	1
-+#define CLK_EXTERNAL    	0
-+
-+#define CRT_OUT         	0
-+#define LCD_OUT         	1
-+#define TV_OUT          	2
-+
-+#define MAX_XRES                1280
-+#define MAX_YRES                1024
-+#define MAX_BPP                 16
-+#define MAX_FBMEM_SIZE          3686400/*1920000*/
-+
-+#define MAX_XRES_CRT            MAX_XRES
-+#define MAX_YRES_CRT            MAX_YRES
-+#define MAX_XRES_SVIDEO         1024
-+#define MAX_YRES_SVIDEO         768
-+
-+#define PIXEL_FORMAT_SHIFT      17
-+#define PIXEL_FORMAT_4          ( 1 << PIXEL_FORMAT_SHIFT )
-+#define PIXEL_FORMAT_8          ( 2 << PIXEL_FORMAT_SHIFT )
-+#define PIXEL_FORMAT_16         ( 4 << PIXEL_FORMAT_SHIFT )
-+#define PIXEL_FORMAT_24         ( 6 << PIXEL_FORMAT_SHIFT )
-+#define PIXEL_FORMAT_32         ( 7 << PIXEL_FORMAT_SHIFT )
-+
-+
-+struct ep93xxfb_videomodes
-+{
-+    const char *name;
-+
-+    unsigned long hres; 	// Horizontal Valid
-+    unsigned long hfp;		// Horizontal Front Porch
-+    unsigned long hsync;	// Horizontal Sync Width
-+    unsigned long hbp;		// Horizontal Back Porch
-+
-+    unsigned long vres;		// Vertical Valid
-+    unsigned long vfp;		// Vertical Front Porch
-+    unsigned long vsync;	// Vertical Sync Width
-+    unsigned long vbp;		// Vertical Back Porch
-+
-+    unsigned long refresh;	// Vertical Sync Frequency
-+
-+    unsigned long clk_src;
-+    unsigned long clk_edge;
-+    unsigned long pol_blank;
-+    unsigned long pol_hsync;
-+    unsigned long pol_vsync;
-+};
-+
-+
-+struct ep93xxfb_info
-+{
-+
-+
-+    dma_addr_t                  fb_phys;
-+    void	               *fb_log;
-+    unsigned long               fb_size;
-+    unsigned long		fb_actsize;
-+
-+    unsigned long               xtotal;
-+    unsigned long               ytotal;
-+
-+    unsigned int                xres;
-+    unsigned int		xfp;
-+    unsigned int		xsync;
-+    unsigned int		xbp;
-+
-+    unsigned int                yres;
-+    unsigned int		yfp;
-+    unsigned int		ysync;
-+    unsigned int		ybp;
-+    unsigned int                bpp;
-+
-+    unsigned long 		refresh;
-+    unsigned long		pixclock;
-+    unsigned long               pixformat;
-+
-+    unsigned int clk_src;
-+    unsigned int clk_edge;
-+    unsigned int pol_blank;
-+    unsigned int pol_xsync;
-+    unsigned int pol_ysync;
-+
-+    unsigned char automods;
-+
-+    void (*configure)(unsigned char value);
-+    void (*on)(unsigned char value);
-+    void (*off)(unsigned char value);
-+};
-+
-+static int  ep93xxfb_setclk(void);
-+static int  ep93xx_get_max_video_clk(void);
-+static void ep93xxfb_pixelmod(int bpp);
-+static void ep93xxfb_timing_signal_generation(void);
-+static int  ep93xxfb_blank(int blank_mode,struct fb_info *info);
-+
-+#define EE_DELAY_USEC                   2
-+#define EE_READ_TIMEOUT                 100
-+#define CX25871_DEV_ADDRESS             0x88
-+#define GPIOG_EEDAT   			2
-+#define GPIOG_EECLK     		1
-+#define CXMODES_COUNT   		24
-+
-+struct cx25871_vmodes
-+{
-+
-+    const char          *name;
-+    unsigned char       automode;
-+    unsigned int        hres;
-+    unsigned int        vres;
-+    unsigned int        hclktotal;
-+    unsigned int        vclktotal;
-+    unsigned int        hblank;
-+    unsigned int        vblank;
-+    unsigned long       clkfrequency;
-+
-+};
-+
-+
-+int write_reg(unsigned char ucRegAddr, unsigned char ucRegValue);
-+void cx25871_on(unsigned char value);
-+void cx25871_off(unsigned char value);
-+void cx25871_config(unsigned char value);
-+
-+static void philips_lb064v02_on(unsigned char value);
-+static void philips_lb064v02_off(unsigned char value);
-+
-+
-+#define FBIO_EP93XX_CURSOR      0x000046c1
-+#define FBIO_EP93XX_LINE        0x000046c2
-+#define FBIO_EP93XX_FILL        0x000046c3
-+#define FBIO_EP93XX_BLIT        0x000046c4
-+#define FBIO_EP93XX_COPY        0x000046c5
-+
-+
-+#define CURSOR_BLINK            0x00000001
-+#define CURSOR_MOVE             0x00000002
-+#define CURSOR_SETSHAPE         0x00000004
-+#define CURSOR_SETCOLOR         0x00000008
-+#define CURSOR_ON               0x00000010
-+#define CURSOR_OFF              0x00000020
-+
-+
-+/*
-+* ioctl(fd, FBIO_EP93XX_CURSOR, ep93xx_cursor *)
-+*
-+* "data" points to an array of pixels that define the cursor; each row should
-+* be a multiple of 32-bit values (i.e. 16 pixels).  Each pixel is two bits,
-+* where the values are:
-+*
-+*     00 => transparent    01 => invert    10 => color1    11 => color2
-+*
-+* The data is arranged as follows (per word):
-+*
-+*    bits: |31-30|29-28|27-26|25-24|23-22|21-20|19-18|17-16|
-+*   pixel: | 12  | 13  | 14  | 15  |  8  |  9  | 10  | 11  |
-+*    bits: |15-14|13-12|11-10| 9-8 | 7-6 | 5-4 | 3-2 | 1-0 |
-+*   pixel: |  4  |  5  |  6  |  7  |  0  |  1  |  2  |  3  |
-+*
-+* Regardless of the frame buffer color depth, "color1", "color2",
-+* "blinkcolor1", and "blinkcolor2" are 24-bit colors since the cursor is
-+* injected into the data stream right before the video DAC.
-+*
-+* When "blinkrate" is not zero, pixel value 10 will alternate between "color1"
-+* and "blinkcolor1" (similar for pixel value 11 and "color2"/"blinkcolor2").
-+*
-+* "blinkrate" ranges between 0 and 255.  When 0, blinking is disabled.  255 is
-+* the fastest blink rate and 1 is the slowest.
-+*
-+* Both "width" and "height" must be between 1 and 64; it is preferable to have
-+* "width" a multiple of 16.
-+*/
-+struct ep93xx_cursor {
-+    unsigned long flags;
-+    unsigned long dx;           // Only used if CURSOR_MOVE is set
-+    unsigned long dy;           // Only used if CURSOR_MOVE is set
-+    unsigned long width;        // Only used if CURSOR_SETSHAPE is set
-+    unsigned long height;       // Only used if CURSOR_SETSHAPE is set
-+    const char *data;   // Only used if CURSOR_SETSHAPE is set
-+    unsigned long blinkrate;    // Only used if CURSOR_BLINK is set
-+    unsigned long color1;       // Only used if CURSOR_SETCOLOR is set
-+    unsigned long color2;       // Only used if CURSOR_SETCOLOR is set
-+    unsigned long blinkcolor1;  // Only used if CURSOR_SETCOLOR is set
-+    unsigned long blinkcolor2;  // Only used if CURSOR_SETCOLOR is set
-+};
-+
-+
-+/*
-+ * The bits in the flags field of ep93xx_line.
-+*/
-+/*
-+* ioctl(fd, FBIO_EP93XX_LINE, ep93xx_line *)
-+*
-+* The line starts at ("x1","y1") and ends at ("x2","y2").  This means that
-+* when using a pattern, the two coordinates are not transitive (i.e. swapping
-+* ("x1","y1") with ("x2","y2") will not necessarily draw the exact same line,
-+* pattern-wise).
-+*
-+* "pattern" is a 2 to 16 bit pattern (since a 1 bit pattern isn't much of a
-+* pattern).  The lower 16 bits define the pattern (1 being foreground, 0 being
-+* background or transparent), and bits 19-16 define the length of the pattern
-+* (as pattern length - 1).  So, for example, "0xf00ff" defines a 16 bit
-+* with the first 8 pixels in the foreground color and the next 8 pixels in the
-+* background color or transparent.
-+*
-+* LINE_PRECISE is used to apply angularly corrected patterns to line.  It
-+* should only be used when LINE_PATTERN is also set.  The pattern will be
-+* applied along the length of the line, instead of along the length of the
-+* major axis.  This may result in the loss of fine details in the pattern, and
-+* will take more time to draw the line in most cases.
-+*/
-+
-+#define LINE_PATTERN            0x00000001
-+#define LINE_PRECISE            0x00000002
-+#define LINE_BACKGROUND         0x00000004
-+
-+struct ep93xx_line {
-+    unsigned long flags;
-+    unsigned long x1;
-+    unsigned long y1;
-+    unsigned long x2;
-+    unsigned long y2;
-+    unsigned long fgcolor;
-+    unsigned long bgcolor;      // Only used if LINE_BACKGROUND is set
-+    unsigned long pattern;      // Only used if LINE_PATTERN is set
-+};
-+
-+#endif /* __EP93XXFB_H__ */
-+
---- /dev/null
-+++ b/drivers/video/ep93xxfb_mono.c
-@@ -0,0 +1,1281 @@
-+/*
-+ *  drivers/video/ep93xxfb_mono.c -- grayscale on mono LCD driver for
-+ *  Cirrus Logic EP93xx.
-+ *
-+ *  Copyright (C) 2007 Cirrus Logic
-+ *
-+ *  This file is subject to the terms and conditions of the GNU General Public
-+ *  License. See the file COPYING in the main directory of this archive for
-+ *  more details.
-+ *
-+ *  This driver works for the following two LCD:
-+ *  SHARP LM121VB1T01   -   A dual scan 640x480 monochrome LCD.
-+ *  HOSIDEN HLM6323     -   A single scan 320x240 monochrome LCD.
-+ *
-+ *  And support two gray modes:
-+ *  8 levels of gray    -   Actually is 7 levels of gray. Two of the levels
-+ *                          have the same gray.
-+ *  16 levels of gray   -   Extending the gray levels by switching the LUT
-+ *                          for each frame.
-+ *
-+ *  HW connection for SHARP LM121VB1T01:
-+ *      P12 <------> LCD_U0
-+ *      P8  <------> LCD_U1
-+ *      P4  <------> LCD_U2
-+ *      P0  <------> LCD_U3
-+ *      P14 <------> LCD_L0
-+ *      P10 <------> LCD_L1
-+ *      P6  <------> LCD_L2
-+ *      P2  <------> LCD_L3
-+ *  HW connection for HOSIDEN HLM6323:
-+ *      P12 <------> LCD_0
-+ *      P8  <------> LCD_1
-+ *      P4  <------> LCD_2
-+ *      P0  <------> LCD_3
-+ *
-+ */
-+
-+#include <linux/version.h>
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/reboot.h>
-+#include <linux/errno.h>
-+#include <linux/string.h>
-+#include <linux/mm.h>
-+#include <linux/delay.h>
-+#include <linux/fb.h>
-+#include <linux/init.h>
-+#include <linux/ioport.h>
-+#include <linux/interrupt.h>
-+#include <linux/dma-mapping.h>
-+#include <asm/io.h>
-+#include <asm/uaccess.h>
-+#include <mach/hardware.h>
-+
-+
-+#include <linux/platform_device.h>
-+
-+#define CONFIG_EP93XX_SDCS0
-+
-+#undef DEBUG
-+#ifdef DEBUG
-+#define DPRINTK( fmt, arg... )  printk( fmt, ##arg )
-+#else
-+#define DPRINTK( fmt, arg... )
-+#endif
-+
-+#define FBDEV_NAME "ep93xxfb"
-+
-+#define ep93xxfb_lock_outl(value, reg)              \
-+{                                              \
-+    outl(RASTER_SWLOCK_VALUE, RASTER_SWLOCK);  \
-+    outl(value, reg);                          \
-+    DPRINTK(#reg"=0x%08x\n", (unsigned int)(value));         \
-+}
-+
-+#define ep93xxfb_outl(value, reg)              \
-+{                                              \
-+    outl(value, reg);                          \
-+    DPRINTK(#reg"=0x%08x\n", (unsigned int)(value));         \
-+}
-+
-+static unsigned int pseudo_palette[256];
-+
-+struct ep93xxfb_mono_videomodes
-+{
-+    const char *name;
-+
-+    unsigned long hres; 	// Horizontal Valid
-+    unsigned long vres;		// Vertical Valid
-+    unsigned int  freq;
-+    unsigned int  dualscan;
-+    unsigned int  bpp;
-+    unsigned int  graylevel;
-+
-+    void (*configure)(unsigned char value);
-+    void (*on)(unsigned char value);
-+    void (*off)(unsigned char value);
-+};
-+
-+struct ep93xxfb_mono_info
-+{
-+    dma_addr_t          fb_phys;
-+    void	            *fb_log;
-+    unsigned long       fb_size;
-+    unsigned long		fb_actsize;
-+
-+    unsigned int        xres;
-+    unsigned int        yres;
-+
-+    unsigned int        freq;
-+    unsigned int        dualscan;
-+    unsigned int        bpp;
-+    unsigned int        graylevel;
-+
-+    void (*configure)(unsigned char value);
-+    void (*on)(unsigned char value);
-+    void (*off)(unsigned char value);
-+};
-+
-+
-+void LM121VB1T01_configure(unsigned char value);
-+void HOSIDEN_HLM6323_configure(unsigned char value);
-+
-+static int vmode = 1;
-+
-+static struct ep93xxfb_mono_info epinfo;
-+static struct ep93xxfb_mono_videomodes ep93xxfb_vmods[] =
-+{
-+    {
-+        "SHARP-LM121VB1T01-8GRAY",
-+        640, 480, 100,
-+        1,  //dual scan
-+        4,  //4bpp
-+        8,  //8-level grayscale
-+        LM121VB1T01_configure,
-+        NULL,
-+        NULL,
-+    },
-+    {
-+        "SHARP-LM121VB1T01-16GRAY",
-+        640, 480, 120,
-+        1,  //dual scan
-+        4,  //4bpp
-+        16, //16-level grayscale
-+        LM121VB1T01_configure,
-+        NULL,
-+        NULL,
-+    },
-+    {
-+        "HOSIDEN HLM6323",
-+        320, 240, 115,
-+        0,  //single scan
-+        4,  //4bpp
-+        8,  //8-level grayscale
-+        HOSIDEN_HLM6323_configure,
-+        NULL,
-+        NULL,
-+    },
-+    {
-+        "HOSIDEN HLM6323",
-+        320, 240, 115,
-+        0,  //single scan
-+        4,  //4bpp
-+        16, //16-level grayscale
-+        HOSIDEN_HLM6323_configure,
-+        NULL,
-+        NULL,
-+    },
-+};
-+
-+
-+#define EP93XX_GS_OFFSET(lut, frame, pixel) ( (lut) + ( (pixel) << 2) + ((frame) << 5 ))
-+
-+static unsigned long DY_LUT[2][16];
-+
-+static unsigned long GSLUT[32] =
-+{
-+    0x00070000, 0x00070000, 0x00070000, 0x00070000,     /*0%*/
-+    0x00078241, 0x00074182, 0x00071428, 0x00072814,     /*25%*/
-+    0x00000412, 0x00000241, 0x00000124, 0x00000000,     /*33%*/
-+    0x0007aa55, 0x000755aa, 0x000755aa, 0x0007aa55,     /*50%*/
-+    0x00000bed, 0x00000dbe, 0x00000edb, 0x00000000,     /*66%*/
-+    0x00077dbe, 0x0007be7d, 0x0007ebd7, 0x0007d7eb,     /*75%*/
-+    0x0007ffff, 0x0007ffff, 0x0007ffff, 0x0007ffff,     /*100%*/
-+    0x0007ffff, 0x0007ffff, 0x0007ffff, 0x0007ffff,
-+};
-+
-+static void ep93xxfb_8gray_palette_init(void)
-+{
-+    unsigned int cont, i, n;
-+    unsigned int frame, pixval, gslut;
-+    cont = inl(LUTCONT);
-+    for (i=0; i< 16; i++)
-+    {
-+        n = (i & 0xe) << 4;
-+        outl( n, (COLOR_LUT+(i<<2)) );
-+    }
-+    for (pixval=0; pixval < 8; pixval++)
-+    {
-+        for (frame=0; frame < 4; frame++)
-+        {
-+            gslut = GSLUT[pixval*4 + frame];
-+            outl(gslut,EP93XX_GS_OFFSET(GS_LUT,  frame, pixval));
-+        }
-+    }
-+    outl( cont ^ LUTCONT_RAM1, LUTCONT );
-+}
-+
-+static void ep93xxfb_16gray_palette_switch(int index)
-+{
-+    unsigned int cont, i, n;
-+    cont = inl(LUTCONT);
-+    n = index & 0x1;
-+    for (i=0; i< 16; i++)
-+    {
-+        outl( DY_LUT[n][i], (COLOR_LUT+(i<<2)) );
-+    }
-+    outl( cont ^ LUTCONT_RAM1, LUTCONT );
-+}
-+
-+static void ep93xxfb_16gray_palette_init(void)
-+{
-+    int i;
-+    unsigned int cont;
-+    unsigned int frame, pixval, gslut;
-+    int split_table[16][2] =
-+    {
-+        {0,  0 },
-+        {0,  2 },
-+        {1,  1 },
-+        {3,  0 },
-+
-+        {2,  2 },
-+        {4,  0 },
-+        {3,  2 },
-+        {4,  2 },
-+
-+        {3,  3 },       //  {6,  0 },
-+        {3,  4 },
-+        {4,  4 },
-+        {6,  2 },
-+
-+        {5,  5 },
-+        {3,  6 },
-+        {4,  6 },
-+        {6,  6 },
-+    };
-+
-+    cont = inl(LUTCONT);
-+    for (i=0; i< 16; i++)
-+    {
-+        DY_LUT[0][i]=split_table[i][0] << 5;
-+        DY_LUT[1][i]=split_table[i][1] << 5;
-+
-+        outl( DY_LUT[0][i], (COLOR_LUT+(i<<2)) );
-+    }
-+
-+    for (pixval=0; pixval < 8; pixval++)
-+    {
-+        for (frame=0; frame < 4; frame++)
-+        {
-+            gslut = GSLUT[pixval*4 + frame];
-+            outl(gslut,EP93XX_GS_OFFSET(GS_LUT,  frame, pixval));
-+            outl(gslut,EP93XX_GS_OFFSET(GS_LUT2,  frame, pixval));
-+            outl(gslut,EP93XX_GS_OFFSET(GS_LUT3,  frame, pixval));
-+        }
-+    }
-+    outl( cont ^ LUTCONT_RAM1, LUTCONT );
-+}
-+
-+static int ep93xxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
-+{
-+    struct fb_var_screeninfo tmp_var;
-+    DPRINTK("ep93xxfb_check_var - enter\n");
-+
-+    memcpy (&tmp_var, var, sizeof (tmp_var));
-+
-+    if (var->xres_virtual != var->xres)
-+        var->xres_virtual = var->xres;
-+    if (var->yres_virtual < var->yres)
-+        var->yres_virtual = var->yres;
-+
-+    if (var->xoffset < 0)
-+        var->xoffset = 0;
-+    if (var->yoffset < 0)
-+        var->yoffset = 0;
-+
-+    switch (tmp_var.bits_per_pixel)
-+    {
-+        case 4:
-+            break;
-+        default:
-+            return -EINVAL;
-+    }
-+
-+    DPRINTK("ep93xxfb_check_var - exit\n");
-+    return 0;
-+}
-+
-+static int ep93xxfb_set_par(struct fb_info *info)
-+{
-+    DPRINTK("ep93xxfb_set_par\n");
-+    switch (info->var.bits_per_pixel) {
-+        case 4:
-+            info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
-+            break;
-+
-+        default:
-+            return -EINVAL;
-+    }
-+
-+    return 0;
-+}
-+
-+
-+static int ep93xxfb_blank(int blank_mode,struct fb_info *info)
-+{
-+    unsigned long attribs;
-+    DPRINTK("ep93xxfb_blank - enter\n");
-+    attribs = inl(VIDEOATTRIBS);
-+
-+    if (blank_mode) {
-+        if (epinfo.off)
-+            (epinfo.off)( 0 );
-+
-+        ep93xxfb_lock_outl(attribs & ~(VIDEOATTRIBS_DATAEN |
-+                    VIDEOATTRIBS_SYNCEN | VIDEOATTRIBS_PCLKEN |
-+                    VIDEOATTRIBS_EN), VIDEOATTRIBS);
-+    }
-+    else {
-+
-+        if (epinfo.configure)
-+            (epinfo.configure)( (unsigned char) epinfo.graylevel );
-+        if (epinfo.on)
-+            (epinfo.on)( 0 );
-+    }
-+    return 0;
-+}
-+
-+static void ep93xxfb_get_par(struct fb_info *info)
-+{
-+
-+    DPRINTK("ep93xxfb_get_par - enter\n");
-+
-+    epinfo.configure = ep93xxfb_vmods[vmode].configure;
-+    epinfo.on = ep93xxfb_vmods[vmode].on;
-+    epinfo.off = ep93xxfb_vmods[vmode].off;
-+
-+    epinfo.freq = ep93xxfb_vmods[vmode].freq;
-+    epinfo.dualscan = ep93xxfb_vmods[vmode].dualscan;
-+    epinfo.bpp = ep93xxfb_vmods[vmode].bpp;
-+    epinfo.graylevel = ep93xxfb_vmods[vmode].graylevel;
-+
-+    epinfo.xres = ep93xxfb_vmods[vmode].hres;
-+    epinfo.yres = ep93xxfb_vmods[vmode].vres;
-+
-+}
-+
-+static int ep93xxfb_alloc_videomem(void)
-+{
-+    unsigned long adr,size,pgsize;
-+    int order;
-+
-+    DPRINTK("ep93xxfb_alloc_videomem - enter \n");
-+
-+    epinfo.fb_log = NULL;
-+    epinfo.fb_size = epinfo.xres*epinfo.yres*epinfo.bpp/8;
-+    order = get_order( epinfo.fb_size );
-+    epinfo.fb_log = (void*) __get_free_pages( GFP_KERNEL, order );
-+
-+    if (epinfo.fb_log) {
-+        epinfo.fb_phys = __virt_to_phys((int) epinfo.fb_log );
-+        adr = (unsigned long)epinfo.fb_log;
-+        size = epinfo.fb_size;
-+        pgsize = 1 << order;
-+        do {
-+            adr += pgsize;
-+            SetPageReserved(virt_to_page(adr));
-+        } while(size -= pgsize);
-+    }
-+    else
-+        return -ENOMEM;
-+
-+    memset(epinfo.fb_log,0x00,epinfo.fb_size);
-+
-+    DPRINTK("   fb_log_addres = 0x%x\n",    (unsigned int)epinfo.fb_log);
-+    DPRINTK("   fb_phys_address = 0x%x\n",  (unsigned int)epinfo.fb_phys);
-+    DPRINTK("   fb_size = %lu\n",           (unsigned long)epinfo.fb_size);
-+    DPRINTK("   fb_page_order = %d\n",      (unsigned int)order);
-+    DPRINTK("ep93xxfb_alloc_videomem - exit \n");
-+    return 0;
-+}
-+
-+static void ep93xxfb_release_videomem(void)
-+{
-+    unsigned long adr,size,psize;
-+    int order;
-+
-+    DPRINTK("ep93xxfb_release_videomem - enter \n");
-+    if (epinfo.fb_log) {
-+        order = get_order(epinfo.fb_size);
-+        adr = (unsigned long)epinfo.fb_log;
-+        size = epinfo.fb_size;
-+        psize = 1 << order ;
-+        do {
-+            adr += psize;
-+            ClearPageReserved(virt_to_page(adr));
-+        } while(size -= psize);
-+        free_pages((unsigned long)epinfo.fb_log, order );
-+    }
-+    DPRINTK("ep93xxfb_release_videomem - exit \n");
-+}
-+
-+static void ep93xxfb_setinfo(struct fb_info *info)
-+{
-+
-+    DPRINTK("ep93xxfb_setinfo - enter \n");
-+    info->pseudo_palette = pseudo_palette;
-+    info->var.xres = epinfo.xres;
-+    info->var.yres = epinfo.yres;
-+    info->var.xres_virtual = epinfo.xres;
-+    info->var.yres_virtual = epinfo.yres;
-+
-+    info->var.bits_per_pixel = epinfo.bpp;
-+    info->var.red.length = epinfo.bpp;
-+    info->var.green.length = epinfo.bpp;
-+    info->var.blue.length = epinfo.bpp;
-+    info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
-+    info->var.red.offset = 0;
-+    info->var.green.offset =0;
-+    info->var.blue.offset = 0;
-+
-+    info->fix.smem_start = epinfo.fb_phys;
-+    info->fix.smem_len = epinfo.fb_size;
-+    info->fix.type = FB_TYPE_PACKED_PIXELS;
-+    info->fix.line_length = (epinfo.xres * epinfo.bpp) / 8;
-+    info->fix.accel = FB_ACCEL_NONE;
-+    info->screen_base = epinfo.fb_log;
-+    info->fix.ypanstep = 1;
-+    info->fix.ywrapstep = 1;
-+
-+    DPRINTK("ep93xxfb_setinfo - exit \n");
-+}
-+
-+static int ep93xxfb_config(struct fb_info *info)
-+{
-+    DPRINTK("ep93xxfb_config - enter\n");
-+
-+    ep93xxfb_get_par( info );
-+    if( ep93xxfb_alloc_videomem() != 0 ) {
-+        printk("Unable to allocate video memory\n");
-+        return -ENOMEM;
-+    }
-+
-+    /* set video memory parameters */
-+    ep93xxfb_outl(epinfo.fb_phys, VIDSCRNPAGE);
-+    if(epinfo.dualscan)
-+    {
-+        ep93xxfb_outl(epinfo.fb_phys + (epinfo.bpp*epinfo.xres*epinfo.yres/16)
-+                , VIDSCRNHPG);
-+    }
-+
-+    DPRINTK("   fb_phys = 0x%x\n",  inl(VIDSCRNPAGE) );
-+    DPRINTK("   fb_phys_hpg = 0x%x\n",  inl(VIDSCRNHPG));
-+
-+    ep93xxfb_outl(epinfo.yres , SCRNLINES);
-+    ep93xxfb_outl(((epinfo.xres * epinfo.bpp) / 32) - 1, LINELENGTH);
-+    ep93xxfb_outl((epinfo.xres * epinfo.bpp) / 32, VLINESTEP);
-+
-+    if(epinfo.configure)
-+        (epinfo.configure)( (unsigned char) epinfo.graylevel );
-+
-+    ep93xxfb_setinfo( info );
-+
-+
-+    DPRINTK("ep93xxfb_config - exit\n");
-+    return 0;
-+}
-+
-+static unsigned long ep93xx_get_pll_frequency(unsigned long pll)
-+{
-+    unsigned long fb1, fb2, ipd, ps, freq;
-+
-+    if (pll == 1)
-+        pll = inl(EP93XX_SYSCON_CLOCK_SET1);
-+    else if (pll == 2)
-+        pll = inl(EP93XX_SYSCON_CLOCK_SET2);
-+    else
-+        return 0;
-+
-+    ps = (pll & SYSCON_CLKSET1_PLL1_PS_MASK) >>	SYSCON_CLKSET1_PLL1_PS_SHIFT;
-+    fb1 = ((pll & SYSCON_CLKSET1_PLL1_X1FBD1_MASK) >> SYSCON_CLKSET1_PLL1_X1FBD1_SHIFT);
-+    fb2 = ((pll & SYSCON_CLKSET1_PLL1_X2FBD2_MASK) >> SYSCON_CLKSET1_PLL1_X2FBD2_SHIFT);
-+    ipd = ((pll & SYSCON_CLKSET1_PLL1_X2IPD_MASK) >> SYSCON_CLKSET1_PLL1_X2IPD_SHIFT);
-+
-+    freq = (((0x00e10000 * (fb1+1)) / (ipd+1)) * (fb2+1)) >> ps;
-+    return freq;
-+}
-+
-+static int ep93xx_set_video_div(unsigned long freq)
-+{
-+    unsigned long pdiv = 0, div = 0, psel = 0, esel = 0;
-+    unsigned long err, f, i, j, k;
-+
-+    err = -1;
-+
-+    for (i = 0; i < 3; i++) {
-+        if (i == 0)
-+            f = 14745600 * 2;
-+        else if (i == 1)
-+            f = ep93xx_get_pll_frequency(1) * 2;
-+        else
-+            f = ep93xx_get_pll_frequency(2) * 2;
-+
-+        for (j = 4; j <= 6; j++) {
-+            k = f / (freq * j);
-+            if (k < 2)
-+                continue;
-+
-+            if (abs(((f / (j * k))) - freq ) < err ) {
-+                pdiv = j - 3;
-+                div = k;
-+                psel = (i == 2) ? 1 : 0;
-+                esel = (i == 0) ? 0 : 1;
-+                err = (f / (j * k)) - freq;
-+            }
-+        }
-+    }
-+
-+    if (err == -1)
-+        return -1;
-+
-+    f = SYSCON_VIDDIV_VENA | (esel ? SYSCON_VIDDIV_ESEL : 0) |
-+        (psel ? SYSCON_VIDDIV_PSEL : 0) |
-+        (pdiv << SYSCON_VIDDIV_PDIV_SHIFT) |
-+        (div << SYSCON_VIDDIV_VDIV_SHIFT);
-+    outl(0xaa, EP93XX_SYSCON_SWLOCK);
-+    outl(f, SYSCON_VIDDIV);
-+
-+    return freq + err;
-+}
-+
-+static int interrupt_hooked = 0;
-+static int vs_counter = 0;
-+
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17)
-+static irqreturn_t ep93xxfb_irq_handler(int i, void *blah)
-+#else
-+static irqreturn_t ep93xxfb_irq_handler(int i, void *blah, struct pt_regs *regs)
-+#endif
-+{
-+
-+    outl(RASTER_SWLOCK_VALUE, RASTER_SWLOCK);
-+    outl(
-+#ifdef CONFIG_EP93XX_SDCS0
-+            (0 << VIDEOATTRIBS_SDSEL_SHIFT) |
-+#endif
-+#ifdef CONFIG_EP93XX_SDCS1
-+            (1 << VIDEOATTRIBS_SDSEL_SHIFT) |
-+#endif
-+#ifdef CONFIG_EP93XX_SDCS2
-+            (2 << VIDEOATTRIBS_SDSEL_SHIFT) |
-+#endif
-+#ifdef CONFIG_EP93XX_SDCS3
-+            (3 << VIDEOATTRIBS_SDSEL_SHIFT) |
-+#endif
-+            VIDEOATTRIBS_VCPOL | VIDEOATTRIBS_HSPOL |
-+            VIDEOATTRIBS_DATAEN | VIDEOATTRIBS_SYNCEN | VIDEOATTRIBS_INVCLK |
-+            VIDEOATTRIBS_PCLKEN | VIDEOATTRIBS_EN | VIDEOATTRIBS_INTEN ,
-+            VIDEOATTRIBS       );
-+
-+    ep93xxfb_16gray_palette_switch(vs_counter++);
-+
-+    return IRQ_HANDLED;
-+}
-+
-+void LM121VB1T01_configure(unsigned char value)
-+{
-+
-+    int n;
-+    unsigned long attribs;
-+    printk("LM121VB1T01_configure\n");
-+
-+    switch(value)
-+    {
-+        case 8:
-+            ep93xxfb_8gray_palette_init();
-+            break;
-+        case 16:
-+            ep93xxfb_16gray_palette_init();
-+            break;
-+        default:
-+            return;
-+    }
-+
-+    SysconSetLocked(EP93XX_SYSCON_DEVICE_CONFIG, (inl(EP93XX_SYSCON_DEVICE_CONFIG) & ~EP93XX_SYSCON_DEVICE_CONFIG_CRUNCH_ENABLE) | EP93XX_SYSCON_DEVCFG_RasOnP3);
-+
-+    ep93xx_set_video_div(epinfo.freq*240*1280);
-+
-+    ep93xxfb_lock_outl( 0x00000000   ,   VIDEOATTRIBS       );
-+
-+    n = 240;
-+    ep93xxfb_lock_outl( n + 3  ,   VLINESTOTAL        );
-+    ep93xxfb_lock_outl( ((n)<<16) + n+1   ,   VSYNCSTRTSTOP      );
-+    ep93xxfb_lock_outl( ((2)<<16) + n+2   ,   VACTIVESTRTSTOP    );
-+    ep93xxfb_lock_outl( ((3)<<16) + n+3   ,   VBLANKSTRTSTOP     );
-+    ep93xxfb_lock_outl( ((n+3)<<16) + n+3    ,   VCLKSTRTSTOP       );
-+
-+    n = 1280;
-+    ep93xxfb_lock_outl( n + 15  ,   HCLKSTOTAL         );
-+    ep93xxfb_lock_outl( ((n+5)<<16) + n+ 14    ,   HSYNCSTRTSTOP      );
-+    ep93xxfb_lock_outl( ((15)<<16) + n + 15   ,   HACTIVESTRTSTOP    );
-+    ep93xxfb_lock_outl( ((n+15)<<16) + 15 ,   HBLANKSTRTSTOP       );
-+    ep93xxfb_lock_outl( ((n)<<16) + n   ,   HCLKSTRTSTOP       );
-+
-+    ep93xxfb_lock_outl( 14   ,   LINECARRY          );
-+
-+    attribs = 0;
-+
-+#ifdef CONFIG_EP93XX_SDCS0
-+    attribs |= 0 << VIDEOATTRIBS_SDSEL_SHIFT;
-+#endif
-+#ifdef CONFIG_EP93XX_SDCS1
-+    attribs |= 1 << VIDEOATTRIBS_SDSEL_SHIFT;
-+#endif
-+#ifdef CONFIG_EP93XX_SDCS2
-+    attribs |= 2 << VIDEOATTRIBS_SDSEL_SHIFT;
-+#endif
-+#ifdef CONFIG_EP93XX_SDCS3
-+    attribs |= 3 << VIDEOATTRIBS_SDSEL_SHIFT;
-+#endif
-+
-+    switch(value)
-+    {
-+        case 8:
-+            ep93xxfb_lock_outl( PIXELMODE_DSCAN |
-+                PIXELMODE_S_8PPC | PIXELMODE_P_4BPP |
-+                PIXELMODE_C_GSLUT   ,   PIXELMODE          );
-+
-+            ep93xxfb_lock_outl(
-+                    attribs | VIDEOATTRIBS_VCPOL | VIDEOATTRIBS_HSPOL |
-+                    VIDEOATTRIBS_DATAEN | VIDEOATTRIBS_SYNCEN | VIDEOATTRIBS_INVCLK |
-+                    VIDEOATTRIBS_PCLKEN | VIDEOATTRIBS_EN ,
-+                    VIDEOATTRIBS       );
-+            break;
-+        case 16:
-+            if(!interrupt_hooked)
-+            {
-+                request_irq(IRQ_EP93XX_VSYNC, ep93xxfb_irq_handler, IRQF_DISABLED, "lut switch interrupt", NULL);
-+                interrupt_hooked = 1;
-+            }
-+            ep93xxfb_lock_outl( PIXELMODE_DSCAN |
-+                PIXELMODE_S_8PPC | PIXELMODE_P_4BPP | PIXELMODE_C_GSLUT, PIXELMODE );
-+
-+            ep93xxfb_lock_outl(
-+                    attribs | VIDEOATTRIBS_VCPOL | VIDEOATTRIBS_HSPOL |
-+                    VIDEOATTRIBS_DATAEN | VIDEOATTRIBS_SYNCEN | VIDEOATTRIBS_INVCLK |
-+                    VIDEOATTRIBS_PCLKEN | VIDEOATTRIBS_EN | VIDEOATTRIBS_INTEN,
-+                    VIDEOATTRIBS       );
-+            break;
-+        default:
-+            return;
-+    }
-+
-+}
-+
-+void HOSIDEN_HLM6323_configure(unsigned char value)
-+{
-+    int n;
-+    unsigned long attribs;
-+
-+    printk("HOSIDEN_HLM6323_configure\n");
-+
-+    switch(value)
-+    {
-+        case 8:
-+            ep93xxfb_8gray_palette_init();
-+            break;
-+        case 16:
-+            ep93xxfb_16gray_palette_init();
-+            break;
-+        default:
-+            return;
-+    }
-+
-+    SysconSetLocked(EP93XX_SYSCON_DEVICE_CONFIG, inl(EP93XX_SYSCON_DEVICE_CONFIG)  |EP93XX_SYSCON_DEVCFG_RasOnP3);
-+
-+    ep93xxfb_lock_outl( 0x00000000   ,   VIDEOATTRIBS       );
-+
-+    ep93xx_set_video_div(epinfo.freq*320*240);
-+    mdelay(10);
-+
-+    n = 240;
-+    ep93xxfb_lock_outl( n + 3 ,   VLINESTOTAL        );
-+    ep93xxfb_lock_outl( ((n+1)<<16) + n +2   ,   VSYNCSTRTSTOP      );
-+    ep93xxfb_lock_outl( ((3)<<16) + n +3 ,   VACTIVESTRTSTOP    );
-+    ep93xxfb_lock_outl( ((3)<<16) + n +3 ,   VBLANKSTRTSTOP     );
-+    ep93xxfb_lock_outl( ((n+3)<<16) + n +3,   VCLKSTRTSTOP       );
-+
-+    n = 320;
-+    ep93xxfb_lock_outl( n + 3,   HCLKSTOTAL         );
-+    ep93xxfb_lock_outl( ((n+1)<<16) + n+2    ,   HSYNCSTRTSTOP      );
-+    ep93xxfb_lock_outl( ((3)<<16) + n+3  ,   HACTIVESTRTSTOP    );
-+    ep93xxfb_lock_outl( ((3)<<16) + n+3 ,   HBLANKSTRTSTOP       );
-+    ep93xxfb_lock_outl( ((n+3)<<16) + n+3  ,   HCLKSTRTSTOP       );
-+
-+    ep93xxfb_lock_outl( 3   ,   LINECARRY          );
-+
-+    attribs = 0;
-+
-+#ifdef CONFIG_EP93XX_SDCS0
-+    attribs |= 0 << VIDEOATTRIBS_SDSEL_SHIFT;
-+#endif
-+#ifdef CONFIG_EP93XX_SDCS1
-+    attribs |= 1 << VIDEOATTRIBS_SDSEL_SHIFT;
-+#endif
-+#ifdef CONFIG_EP93XX_SDCS2
-+    attribs |= 2 << VIDEOATTRIBS_SDSEL_SHIFT;
-+#endif
-+#ifdef CONFIG_EP93XX_SDCS3
-+    attribs |= 3 << VIDEOATTRIBS_SDSEL_SHIFT;
-+#endif
-+
-+    switch(value)
-+    {
-+        case 8:
-+            ep93xxfb_lock_outl(
-+                PIXELMODE_S_4PPC | PIXELMODE_P_4BPP | PIXELMODE_C_GSLUT,   PIXELMODE );
-+            ep93xxfb_lock_outl(
-+                    attribs | VIDEOATTRIBS_VCPOL | VIDEOATTRIBS_HSPOL |
-+                    VIDEOATTRIBS_DATAEN | VIDEOATTRIBS_SYNCEN | VIDEOATTRIBS_INVCLK |
-+                    VIDEOATTRIBS_PCLKEN | VIDEOATTRIBS_EN ,
-+                    VIDEOATTRIBS       );
-+            break;
-+        case 16:
-+            ep93xxfb_lock_outl(
-+                PIXELMODE_S_4PPC | PIXELMODE_P_4BPP | PIXELMODE_C_GSLUT,   PIXELMODE );
-+            if(!interrupt_hooked)
-+            {
-+                request_irq(IRQ_EP93XX_VSYNC, ep93xxfb_irq_handler, IRQF_DISABLED, "lut switch interrupt", NULL);
-+                interrupt_hooked = 1;
-+            }
-+            ep93xxfb_lock_outl(
-+                    attribs | VIDEOATTRIBS_VCPOL | VIDEOATTRIBS_HSPOL |
-+                    VIDEOATTRIBS_DATAEN | VIDEOATTRIBS_SYNCEN | VIDEOATTRIBS_INVCLK |
-+                    VIDEOATTRIBS_PCLKEN | VIDEOATTRIBS_EN | VIDEOATTRIBS_INTEN,
-+                    VIDEOATTRIBS       );
-+            break;
-+        default:
-+            return;
-+    }
-+}
-+
-+#define FB_WRITEL fb_writel
-+#define FB_READL  fb_readl
-+#define LEFT_POS(bpp)          (0)
-+#define SHIFT_HIGH(val, bits)  ((val) << (bits))
-+#define SHIFT_LOW(val, bits)   ((val) >> (bits))
-+static inline void color_imageblit(const struct fb_image *image,
-+        struct fb_info *p, u8 *dst1,
-+        u32 start_index,
-+        u32 pitch_index)
-+{
-+    /* Draw the penguin */
-+    u32 *dst, *dst2;
-+    u32 color = 0, val, shift;
-+    int i, n, bpp = p->var.bits_per_pixel;
-+    u32 null_bits = 32 - bpp;
-+    u32 *palette = (u32 *) p->pseudo_palette;
-+    const u8 *src = image->data;
-+
-+    dst2 = (u32 *) dst1;
-+    for (i = image->height; i--; ) {
-+        n = image->width;
-+        dst = (u32 *) dst1;
-+        shift = 0;
-+        val = 0;
-+
-+        if (start_index) {
-+            u32 start_mask = ~(SHIFT_HIGH(~(u32)0, start_index));
-+            val = FB_READL(dst) & start_mask;
-+            shift = start_index;
-+        }
-+        while (n--) {
-+            if (p->fix.visual == FB_VISUAL_TRUECOLOR ||
-+                    p->fix.visual == FB_VISUAL_DIRECTCOLOR )
-+                color = palette[*src];
-+            else
-+                color = *src;
-+            color <<= LEFT_POS(bpp);
-+            val |= SHIFT_HIGH(color, shift);
-+            if (shift >= null_bits) {
-+                FB_WRITEL(val, dst++);
-+
-+                val = (shift == null_bits) ? 0 :
-+                    SHIFT_LOW(color, 32 - shift);
-+            }
-+            shift += bpp;
-+            shift &= (32 - 1);
-+            src++;
-+        }
-+        if (shift) {
-+            u32 end_mask = SHIFT_HIGH(~(u32)0, shift);
-+
-+            FB_WRITEL((FB_READL(dst) & end_mask) | val, dst);
-+        }
-+        dst1 += p->fix.line_length;
-+        if (pitch_index) {
-+            dst2 += p->fix.line_length;
-+            dst1 = (u8 *)((long __force)dst2 & ~(sizeof(u32) - 1));
-+
-+            start_index += pitch_index;
-+            start_index &= 32 - 1;
-+        }
-+    }
-+}
-+
-+static const int reversebit[]=
-+{
-+    7, 6, 5, 4, 3, 2, 1, 0,
-+    15,14,13,12,11,10, 9, 8,
-+    23,22,21,20,19,18,17,16,
-+    31,30,29,28,27,26,25,24,
-+};
-+static inline void slow_imageblit(const struct fb_image *image, struct fb_info *p,
-+        u8 *dst1, u32 fgcolor,
-+        u32 bgcolor,
-+        u32 start_index,
-+        u32 pitch_index)
-+{
-+    u32 shift, color = 0, bpp = p->var.bits_per_pixel;
-+    u32 *dst, *dst2;
-+    u32 val, pitch = p->fix.line_length;
-+    u32 null_bits = 32 - bpp;
-+    u32 spitch = (image->width+7)/8;
-+    const u8 *src = image->data, *s;
-+    u32 i, j, l;
-+
-+    dst2 = (u32 *) dst1;
-+    fgcolor <<= LEFT_POS(bpp);
-+    bgcolor <<= LEFT_POS(bpp);
-+    for (i = image->height; i--; ) {
-+        shift = val = 0;
-+        l = 8;
-+        j = image->width;
-+        dst = (u32 *) dst1;
-+        s = src;
-+
-+        /* write leading bits */
-+        if (start_index) {
-+            u32 start_mask = ~(SHIFT_HIGH(~(u32)0,start_index));
-+            val = FB_READL(dst) & start_mask;
-+            shift = start_index;
-+        }
-+
-+        while (j--) {
-+            l--;
-+            color = (*s & (1 << l)) ? fgcolor : bgcolor;
-+            val |= SHIFT_HIGH(color, reversebit[shift]);
-+            /* Did the bitshift spill bits to the next long? */
-+            if (shift >= null_bits) {
-+                FB_WRITEL(val, dst++);
-+                val = (shift == null_bits) ? 0 :
-+                    SHIFT_LOW(color, 32 - reversebit[shift]);
-+            }
-+            shift += bpp;
-+            shift &= (32 - 1);
-+            if (!l) { l = 8; s++; };
-+        }
-+
-+        /* write trailing bits */
-+        if (shift) {
-+            u32 end_mask = SHIFT_HIGH(~(u32)0, shift);
-+
-+            FB_WRITEL((FB_READL(dst) & end_mask) | val, dst);
-+        }
-+
-+        dst1 += pitch;
-+        src += spitch;
-+        if (pitch_index) {
-+            dst2 += pitch;
-+            dst1 = (u8 *)((long __force)dst2 & ~(sizeof(u32) - 1));
-+            start_index += pitch_index;
-+            start_index &= 32 - 1;
-+        }
-+
-+    }
-+}
-+
-+static void ep93xx_imageblit(struct fb_info *p, const struct fb_image *image)
-+{
-+    u32 fgcolor, bgcolor, start_index, bitstart, pitch_index = 0;
-+    u32 bpl = sizeof(u32), bpp = p->var.bits_per_pixel;
-+    u32 dx = image->dx, dy = image->dy;
-+    u8 *dst1;
-+
-+    if (p->state != FBINFO_STATE_RUNNING)
-+        return;
-+
-+    bitstart = (dy * p->fix.line_length * 8) + (dx * bpp);
-+    start_index = bitstart & (32 - 1);
-+    pitch_index = (p->fix.line_length & (bpl - 1)) * 8;
-+
-+    bitstart /= 8;
-+    bitstart &= ~(bpl - 1);
-+    dst1 = p->screen_base + bitstart;
-+
-+    if (p->fbops->fb_sync)
-+        p->fbops->fb_sync(p);
-+
-+    if (image->depth == 1) {
-+        if (p->fix.visual == FB_VISUAL_TRUECOLOR ||
-+                p->fix.visual == FB_VISUAL_DIRECTCOLOR) {
-+            fgcolor = ((u32*)(p->pseudo_palette))[image->fg_color];
-+            bgcolor = ((u32*)(p->pseudo_palette))[image->bg_color];
-+        } else {
-+            fgcolor = image->fg_color;
-+            bgcolor = image->bg_color;
-+        }
-+        slow_imageblit(image, p, dst1, fgcolor, bgcolor,
-+                start_index, pitch_index);
-+    } else
-+        color_imageblit(image, p, dst1, start_index, pitch_index);
-+}
-+
-+
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)
-+
-+int ep93xxfb_ioctl(struct fb_info *info,unsigned int cmd, unsigned long arg)
-+{
-+    return 0;
-+}
-+
-+static int ep93xxfb_mmap(struct fb_info *info,struct vm_area_struct *vma)
-+{
-+    unsigned long off, start, len;
-+
-+    DPRINTK("ep93xxfb_mmap - enter\n");
-+
-+    off = vma->vm_pgoff << PAGE_SHIFT;
-+    start = info->fix.smem_start;
-+    len = PAGE_ALIGN(start & ~PAGE_MASK) + info->fix.smem_len;
-+    start &= PAGE_MASK;
-+    if ((vma->vm_end - vma->vm_start + off) > len)
-+        return -EINVAL;
-+
-+    off += start;
-+    vma->vm_pgoff = off >> PAGE_SHIFT;
-+
-+    vma->vm_flags |= VM_IO;
-+    vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
-+
-+    if (io_remap_pfn_range(vma, vma->vm_start, off >> PAGE_SHIFT,
-+                vma->vm_end - vma->vm_start, vma->vm_page_prot)) {
-+        DPRINTK("ep93xxfb_mmap error\n");
-+        return -EAGAIN;
-+    }
-+
-+    DPRINTK("ep93xxfb_mmap - exit\n");
-+    return 0;
-+}
-+
-+
-+static struct fb_ops ep93xxfb_ops = {
-+    .owner          = THIS_MODULE,
-+    .fb_check_var   = ep93xxfb_check_var,
-+    .fb_set_par     = ep93xxfb_set_par,
-+    .fb_blank       = ep93xxfb_blank,
-+    .fb_fillrect    = cfb_fillrect,
-+    .fb_copyarea    = cfb_copyarea,
-+    //    .fb_imageblit   = cfb_imageblit,
-+    .fb_imageblit   = ep93xx_imageblit,
-+    .fb_ioctl       = ep93xxfb_ioctl,
-+    .fb_mmap        = ep93xxfb_mmap,
-+};
-+
-+
-+static struct resource ep93xxfb_raster_resources = {
-+    .start          = EP93XX_RASTER_PHYS_BASE,
-+    .end            = EP93XX_RASTER_PHYS_BASE + 0x1ffff,
-+    .flags          = IORESOURCE_MEM,
-+};
-+
-+
-+static int __init ep93xxfb_probe(struct platform_device *device)
-+{
-+    struct fb_info *info = NULL;
-+    struct resource *res = NULL;
-+    int ret = 0;
-+    int arb = 0;
-+
-+    DPRINTK("ep93xxfb_probe - enter \n");
-+
-+    if(!device) {
-+        printk("error : to_platform_device\n");
-+        return -ENODEV;
-+    }
-+    res = platform_get_resource( device, IORESOURCE_MEM, 0);
-+    if(!res) {
-+        printk("error : platform_get_resource \n");
-+        return -ENODEV;
-+    }
-+    if (!request_mem_region(res->start,res->end - res->start + 1, FBDEV_NAME ))
-+        return -EBUSY;
-+
-+    info = framebuffer_alloc(sizeof(u32) * 256, &device->dev);
-+
-+    if(!info) {
-+        printk("Unable to allocate memory for frame buffer\n");
-+        return -ENOMEM;
-+    }
-+
-+    info->flags = FBINFO_DEFAULT;
-+    strncpy(info->fix.id, FBDEV_NAME, sizeof(info->fix.id));
-+    info->fix.mmio_start = res->start;
-+    info->fix.mmio_len = res->end - res->start + 1;
-+    info->fbops = &ep93xxfb_ops;
-+    info->pseudo_palette = info->par;
-+    info->state = FBINFO_STATE_RUNNING;
-+
-+    printk("mmio_start = 0x%08x\n", res->start);
-+    printk("mmio_len = 0x%08x\n", res->end - res->start + 1);
-+
-+    if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
-+        ret = -ENOMEM;
-+        goto fbuff;
-+    }
-+
-+    if ((ret = ep93xxfb_config(info)) < 0)
-+        goto clmap;
-+
-+    if (register_framebuffer(info) < 0) {
-+        printk(KERN_ERR "Unable to register ep93xxfb frame buffer\n");
-+        ret = -EINVAL;
-+        goto clmap;
-+    }
-+    platform_set_drvdata(device, info);
-+    printk(KERN_INFO "fb%d: EP93xx frame buffer at %dx%dx%dbpp\n", info->node,
-+            info->var.xres, info->var.yres, info->var.bits_per_pixel);
-+
-+    /*change the raster arb to the highest one--Bo*/
-+    arb = inl(EP93XX_SYSCON_BMAR);
-+    arb = (arb & 0x3f8) | 0x01;
-+    ep93xxfb_outl(arb,EP93XX_SYSCON_BMAR);
-+
-+    DPRINTK("ep93xxfb_probe - exit \n");
-+    return 0;
-+
-+clmap:
-+    fb_dealloc_cmap(&info->cmap);
-+
-+fbuff:
-+    framebuffer_release(info);
-+    return ret;
-+}
-+
-+static int ep93xxfb_remove(struct platform_device *device)
-+{
-+    struct resource *res;
-+    struct fb_info *info;
-+
-+    DPRINTK("ep93xxfb_remove - enter \n");
-+
-+    info = platform_get_drvdata(device);
-+
-+    ep93xxfb_release_videomem();
-+
-+    res = platform_get_resource( device, IORESOURCE_MEM, 0);
-+    release_mem_region(res->start, res->end - res->start + 1);
-+
-+    platform_set_drvdata(device, NULL);
-+    unregister_framebuffer(info);
-+
-+    fb_dealloc_cmap(&info->cmap);
-+    framebuffer_release(info);
-+
-+    ep93xxfb_blank( 1, info );
-+
-+    DPRINTK("ep93xxfb_remove - exit \n");
-+    return 0;
-+}
-+
-+static void ep93xxfb_platform_release(struct device *device)
-+{
-+    DPRINTK("ep93xxfb_platform_release - enter\n");
-+}
-+
-+
-+static struct platform_driver ep93xxfb_driver = {
-+    .probe  = ep93xxfb_probe,
-+    .remove = ep93xxfb_remove,
-+    .driver = {
-+        .name   = FBDEV_NAME,
-+    },
-+};
-+
-+static struct platform_device ep93xxfb_device = {
-+    .name      = FBDEV_NAME,
-+    .id        = -1,
-+    .dev    = {
-+        .release = ep93xxfb_platform_release,
-+    },
-+    .num_resources  = 1,
-+    .resource       = &ep93xxfb_raster_resources,
-+};
-+
-+int __init ep93xxfb_init(void)
-+{
-+    int ret = 0;
-+
-+    DPRINTK("ep93xxfb_init - enter\n");
-+
-+    ret = platform_driver_register(&ep93xxfb_driver);
-+
-+    if (!ret) {
-+        ret = platform_device_register(&ep93xxfb_device);
-+        if (ret)
-+            platform_driver_unregister(&ep93xxfb_driver);
-+    }
-+    DPRINTK("ep93xxfb_init - exit\n");
-+    return ret;
-+}
-+
-+static void __exit ep93xxfb_exit(void)
-+{
-+    DPRINTK("ep93xxfb_exit - enter\n");
-+    platform_driver_unregister(&ep93xxfb_driver);
-+    platform_device_unregister(&ep93xxfb_device);
-+    DPRINTK("ep93xxfb_exit - exit\n");
-+}
-+
-+#else  //  LINUX_VERSION_CODE
-+
-+
-+int ep93xxfb_setcolreg(unsigned regno, unsigned red, unsigned green,
-+        unsigned blue, unsigned transp,
-+        struct fb_info *info)
-+{
-+    return 0;
-+}
-+static struct fb_ops ep93xxfb_ops = {
-+    .owner          = THIS_MODULE,
-+    .fb_setcolreg   = ep93xxfb_setcolreg,
-+    .fb_check_var   = ep93xxfb_check_var,
-+    .fb_set_par     = ep93xxfb_set_par,
-+    .fb_blank       = ep93xxfb_blank,
-+    .fb_fillrect    = cfb_fillrect,
-+    .fb_copyarea    = cfb_copyarea,
-+    .fb_imageblit   = ep93xx_imageblit,
-+    .fb_cursor	= soft_cursor,
-+};
-+
-+static int __init ep93xxfb_probe(struct device *device)
-+{
-+    struct platform_device *pdev = to_platform_device(device);
-+    struct fb_info *info = NULL;
-+    struct resource *res = NULL;
-+    int ret = 0;
-+    int arb = 0;
-+
-+    DPRINTK("ep93xxfb_probe - enter \n");
-+
-+
-+    if(!device) {
-+        printk("error : to_platform_device\n");
-+        return -ENODEV;
-+    }
-+    res = platform_get_resource( pdev, IORESOURCE_MEM, 0);
-+    if(!res) {
-+        printk("error : platform_get_resource \n");
-+        return -ENODEV;
-+    }
-+    if (!request_mem_region(res->start,res->end - res->start + 1, FBDEV_NAME ))
-+        return -EBUSY;
-+
-+    info = framebuffer_alloc(sizeof(u32) * 256, &pdev->dev);
-+
-+    if(!info) {
-+        printk("Unable to allocate memory for frame buffer\n");
-+        return -ENOMEM;
-+    }
-+
-+    info->flags = FBINFO_DEFAULT;
-+    strncpy(info->fix.id, FBDEV_NAME, sizeof(info->fix.id));
-+    info->fix.mmio_start = res->start;
-+    info->fix.mmio_len = res->end - res->start + 1;
-+    info->fbops = &ep93xxfb_ops;
-+    info->pseudo_palette = info->par;
-+    info->state = FBINFO_STATE_RUNNING;
-+
-+    if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
-+        ret = -ENOMEM;
-+        goto fbuff;
-+    }
-+
-+    if ((ret = ep93xxfb_config(info)) < 0)
-+        goto clmap;
-+
-+    if (register_framebuffer(info) < 0) {
-+        printk(KERN_ERR "Unable to register ep93xxfb frame buffer\n");
-+        ret = -EINVAL;
-+        goto clmap;
-+    }
-+    dev_set_drvdata(device, info);
-+    printk(KERN_INFO "fb%d: EP93xx frame buffer at %dx%dx%dbpp\n", info->node,
-+            info->var.xres, info->var.yres, info->var.bits_per_pixel);
-+
-+    /*change the raster arb to the highest one--Bo*/
-+    arb = inl(EP93XX_SYSCON_BMAR);
-+    arb = (arb & 0x3f8) | 0x01;
-+    ep93xxfb_outl(arb,EP93XX_SYSCON_BMAR);
-+
-+    DPRINTK("ep93xxfb_probe - exit \n");
-+    return 0;
-+
-+clmap:
-+    fb_dealloc_cmap(&info->cmap);
-+
-+fbuff:
-+    framebuffer_release(info);
-+    return ret;
-+}
-+
-+static int ep93xxfb_remove(struct device *device)
-+{
-+    struct platform_device *pdev = to_platform_device(device);
-+    struct resource *res;
-+    struct fb_info *info;
-+
-+    DPRINTK("ep93xxfb_remove - enter \n");
-+
-+    info = dev_get_drvdata(device);
-+
-+    ep93xxfb_release_videomem();
-+
-+    res = platform_get_resource( pdev, IORESOURCE_MEM, 0);
-+    release_mem_region(res->start, res->end - res->start + 1);
-+
-+    dev_set_drvdata(device, NULL);
-+    unregister_framebuffer(info);
-+
-+    fb_dealloc_cmap(&info->cmap);
-+    framebuffer_release(info);
-+
-+    ep93xxfb_blank( 1, info );
-+
-+    DPRINTK("ep93xxfb_remove - exit \n");
-+    return 0;
-+}
-+static struct device_driver ep93xxfb_driver = {
-+    .name		= FBDEV_NAME,
-+    .bus		= &platform_bus_type,
-+    .probe		= ep93xxfb_probe,
-+    .remove		= ep93xxfb_remove,
-+};
-+int __init ep93xxfb_init(void)
-+{
-+    DPRINTK("ep93xxfb_init\n");
-+    return driver_register(&ep93xxfb_driver);
-+}
-+
-+static void __exit ep93xxfb_exit(void)
-+{
-+    DPRINTK("ep93xxfb_exit\n");
-+    return driver_unregister(&ep93xxfb_driver);
-+}
-+
-+int __init ep93xxfb_setup(char *options)
-+{
-+    DPRINTK("ep93xxfb_setup\n");
-+    return 0;
-+}
-+
-+#endif  //  LINUX_VERSION_CODE
-+
-+
-+module_init(ep93xxfb_init);
-+module_exit(ep93xxfb_exit);
-+MODULE_AUTHOR("John Zheng <yujiang.zheng@cirrus.com>");
-+MODULE_LICENSE("GPL");
-+
---- a/arch/arm/mach-ep93xx/include/mach/hardware.h
-+++ b/arch/arm/mach-ep93xx/include/mach/hardware.h
-@@ -7,6 +7,7 @@
- #include "ep93xx-regs.h"
- 
- #define pcibios_assign_all_busses()	0
-+#include "regs_raster.h"
- #include "regs_touch.h"
- 
- #include "platform.h"
---- a/arch/arm/mach-ep93xx/include/mach/irqs.h
-+++ b/arch/arm/mach-ep93xx/include/mach/irqs.h
-@@ -34,7 +34,8 @@
- #define IRQ_EP93XX_UART3TX		28
- #define IRQ_EP93XX_KEY			29
- #define IRQ_EP93XX_TOUCH		30
--#define EP93XX_VIC1_VALID_IRQ_MASK	0x7ffffffc
-+#define IRQ_EP93XX_GRAPHICS		31
-+#define EP93XX_VIC1_VALID_IRQ_MASK	0xfffffffc
- 
- #define IRQ_EP93XX_EXT0			32
- #define IRQ_EP93XX_EXT1			33
---- /dev/null
-+++ b/arch/arm/mach-ep93xx/include/mach/regs_raster.h
-@@ -0,0 +1,347 @@
-+/*=============================================================================
-+ *
-+ *  FILE:       	regs_raster.h
-+ *
-+ *  DESCRIPTION:    ep93xx Raster Engine Register Definition
-+ *
-+ *  Copyright Cirrus Logic, 2001-2003
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ *=============================================================================
-+ */
-+#ifndef _REGS_RASTER_H_
-+#define _REGS_RASTER_H_
-+
-+//-----------------------------------------------------------------------------
-+// VLINESTOTAL Register Definitions
-+//-----------------------------------------------------------------------------
-+#define VLINESTOTAL_MASK            0x000007ff
-+
-+//-----------------------------------------------------------------------------
-+// VSYNCSTRTSTOP Register Definitions
-+//-----------------------------------------------------------------------------
-+#define VSYNCSTRTSTOP_STRT_MASK     0x07ff0000
-+#define VSYNCSTRTSTOP_STRT_SHIFT    0
-+#define VSYNCSTRTSTOP_STOP_MASK     0x000007ff
-+#define VSYNCSTRTSTOP_STOP_SHIFT    16
-+
-+//-----------------------------------------------------------------------------
-+// VACTIVESTRTSTOP Register Definitions
-+//-----------------------------------------------------------------------------
-+#define VACTIVESTRTSTOP_STRT_MASK   0x07ff0000
-+#define VACTIVESTRTSTOP_STRT_SHIFT  0
-+#define VACTIVESTRTSTOP_STOP_MASK   0x000007ff
-+#define VACTIVESTRTSTOP_STOP_SHIFT  16
-+
-+//-----------------------------------------------------------------------------
-+// VCLKSTRTSTOP Register Definitions
-+//-----------------------------------------------------------------------------
-+#define VCLKSTRTSTOP_STRT_MASK      0x07ff0000
-+#define VCLKSTRTSTOP_STRT_SHIFT     0
-+#define VCLKSTRTSTOP_STOP_MASK      0x000007ff
-+#define VCLKSTRTSTOP_STOP_SHIFT     16
-+
-+//-----------------------------------------------------------------------------
-+// VBLANKSTRTSTOP Register Definitions
-+//-----------------------------------------------------------------------------
-+#define VBLANKSTRTSTOP_STRT_MASK  0x07ff0000
-+#define VBLANKSTRTSTOP_STRT_SHIFT 0
-+#define VBLANKSTRTSTOP_STOP_MASK  0x000007ff
-+#define VBLANKSTRTSTOP_STOP_SHIFT 16
-+
-+//-----------------------------------------------------------------------------
-+// HSYNCSTRTSTOP Register Definitions
-+//-----------------------------------------------------------------------------
-+#define HSYNCSTRTSTOP_STRT_MASK      0x07ff0000
-+#define HSYNCSTRTSTOP_STRT_SHIFT     0
-+#define HSYNCSTRTSTOP_STOP_MASK      0x000007ff
-+#define HSYNCSTRTSTOP_STOP_SHIFT     16
-+
-+//-----------------------------------------------------------------------------
-+// HACTIVESTRTSTOP Register Definitions
-+//-----------------------------------------------------------------------------
-+#define HACTIVESTRTSTOP_STRT_MASK    0x07ff0000
-+#define HACTIVESTRTSTOP_STRT_SHIFT   0
-+#define HACTIVESTRTSTOP_STOP_MASK    0x000007ff
-+#define HACTIVESTRTSTOP_STOP_SHIFT   16
-+
-+//-----------------------------------------------------------------------------
-+// HCLKSTRTSTOP Register Definitions
-+//-----------------------------------------------------------------------------
-+#define HCLKSTRTSTOP_STRT_MASK      0x07ff0000
-+#define HCLKSTRTSTOP_STRT_SHIFT     0
-+#define HCLKSTRTSTOP_STOP_MASK      0x000007ff
-+#define HCLKSTRTSTOP_STOP_SHIFT     16
-+
-+//-----------------------------------------------------------------------------
-+// BRIGHTNESS Register Definitions
-+//-----------------------------------------------------------------------------
-+#define BRIGHTNESS_MASK             0x0000ffff
-+#define BRIGHTNESS_CNT_MASK         0x000000ff
-+#define BRIGHTNESS_CNT_SHIFT        0
-+#define BRIGHTNESS_CMP_MASK         0x0000ff00
-+#define BRIGHTNESS_CMP_SHIFT        8
-+
-+//-----------------------------------------------------------------------------
-+// VIDEOATTRIBS Register Definitions
-+//-----------------------------------------------------------------------------
-+#define VIDEOATTRIBS_MASK           0x001fffff
-+#define VIDEOATTRIBS_EN             0x00000001
-+#define VIDEOATTRIBS_PCLKEN         0x00000002
-+#define VIDEOATTRIBS_SYNCEN         0x00000004
-+#define VIDEOATTRIBS_DATAEN         0x00000008
-+#define VIDEOATTRIBS_CSYNC          0x00000010
-+#define VIDEOATTRIBS_VCPOL          0x00000020
-+#define VIDEOATTRIBS_HSPOL          0x00000040
-+#define VIDEOATTRIBS_BLKPOL         0x00000080
-+#define VIDEOATTRIBS_INVCLK         0x00000100
-+#define VIDEOATTRIBS_ACEN           0x00000200
-+#define VIDEOATTRIBS_LCDEN          0x00000400
-+#define VIDEOATTRIBS_CCIREN         0x00001000
-+#define VIDEOATTRIBS_PIFEN          0x00002000
-+#define VIDEOATTRIBS_INTEN          0x00004000
-+#define VIDEOATTRIBS_INT            0x00008000
-+#define VIDEOATTRIBS_INTRLC         0x00010000
-+#define VIDEOATTRIBS_EQUSER         0x00020000
-+#define VIDEOATTRIBS_DHORZ          0x00040000
-+#define VIDEOATTRIBS_DVERT          0x00080000
-+#define VIDEOATTRIBS_BKPXD          0x00100000
-+
-+#define VIDEOATTRIBS_SDSEL_MASK     0x00600000
-+#define VIDEOATTRIBS_SDSEL_SHIFT    21
-+
-+//-----------------------------------------------------------------------------
-+// HBLANKSTRTSTOP Register Definitions
-+//-----------------------------------------------------------------------------
-+#define HBLANKSTRTSTOP_STRT_MASK    0x07ff0000
-+#define HBLANKSTRTSTOP_STRT_SHIFT   0
-+#define HBLANKSTRTSTOP_STOP_MASK    0x000007ff
-+#define HBLANKSTRTSTOP_STOP_SHIFT   16
-+
-+//-----------------------------------------------------------------------------
-+// LINECARRY Register Definitions
-+//-----------------------------------------------------------------------------
-+#define LINECARRY_LCARY_MASK        0x000007ff
-+#define LINECARRY_LCARY_SHIFT       0
-+
-+//-----------------------------------------------------------------------------
-+// BLINKRATE Register Definitons
-+//-----------------------------------------------------------------------------
-+#define BLINKRATE_MASK              0x000000ff
-+
-+//-----------------------------------------------------------------------------
-+// BLINKMASK Register Definitons
-+//-----------------------------------------------------------------------------
-+#define BLINKMASK_MASK              0x00ffffff
-+
-+//-----------------------------------------------------------------------------
-+// VIDSCRNPAGE Register Definitons
-+//-----------------------------------------------------------------------------
-+#define VIDSCRNPAGE_PAGE_MASK       0x0ffffffc
-+
-+//-----------------------------------------------------------------------------
-+// VIDSCRNHPG Register Definitons
-+//-----------------------------------------------------------------------------
-+#define VIDSCRNHPG_MASK             0x0ffffffc
-+
-+//-----------------------------------------------------------------------------
-+// SCRNLINES Register Definitons
-+//-----------------------------------------------------------------------------
-+#define SCRNLINES_MASK              0x000007ff
-+
-+//-----------------------------------------------------------------------------
-+// LINELENGTH Register Definitons
-+//-----------------------------------------------------------------------------
-+#define LINELENGTH_MASK             0x000007ff
-+
-+//-----------------------------------------------------------------------------
-+// VLINESTEP Register Definitons
-+//-----------------------------------------------------------------------------
-+#define VLINESTEP_MASK              0x00000fff
-+
-+//-----------------------------------------------------------------------------
-+// RASTER_SWLOCK Register Definitons
-+//-----------------------------------------------------------------------------
-+#define RASTER_SWLOCK_MASK_WR      0xff
-+#define RASTER_SWLOCK_MASK_R       0x1
-+#define RASTER_SWLOCK_VALUE        0xaa
-+
-+//-----------------------------------------------------------------------------
-+// LUTCONT Register Definitions
-+//-----------------------------------------------------------------------------
-+#define LUTCONT_MASK                0x00000003
-+#define LUTCONT_SWTCH               0x00000001
-+#define LUTCONT_STAT                0x00000002
-+#define LUTCONT_RAM0                0
-+#define LUTCONT_RAM1                1
-+
-+//-----------------------------------------------------------------------------
-+// CURSORBLINK1 Register Definitions
-+//-----------------------------------------------------------------------------
-+#define CURSORBLINK1_MASK           0x00ffffff
-+//-----------------------------------------------------------------------------
-+// CURSORBLINK2 Register Definitions
-+//-----------------------------------------------------------------------------
-+#define CURSORBLINK2_MASK           0x00ffffff
-+
-+//-----------------------------------------------------------------------------
-+// CURSORBLINK Register Definitions
-+//-----------------------------------------------------------------------------
-+#define CURSORBLINK_MASK            0x000001ff
-+#define CURSORBLINK_RATE_MASK       0x000000ff
-+#define CURSORBLINK_RATE_SHIFT      0
-+#define CURSORBLINK_EN              0x00000100
-+
-+//-----------------------------------------------------------------------------
-+// BLINKPATRN Register Definitions
-+//-----------------------------------------------------------------------------
-+#define BLINKPATRN_MASK             0x00ffffff
-+
-+//-----------------------------------------------------------------------------
-+// PATRNMASK Register Definitions
-+//-----------------------------------------------------------------------------
-+#define PATRNMASK_MASK              0x00ffffff
-+
-+//-----------------------------------------------------------------------------
-+// BG_OFFSET Register Definitions
-+//-----------------------------------------------------------------------------
-+#define BG_OFFSET_MASK              0x00ffffff
-+
-+//-----------------------------------------------------------------------------
-+// PIXELMODE Register Definitions
-+//-----------------------------------------------------------------------------
-+#define PIXELMODE_P_MASK            0x00000007
-+#define PIXELMODE_P_MUX_DISABLE     0x00000000
-+#define PIXELMODE_P_4BPP            0x00000001
-+#define PIXELMODE_P_8BPP            0x00000002
-+#define PIXELMODE_P_16BPP           0x00000004
-+#define PIXELMODE_P_24BPP           0x00000006
-+#define PIXELMODE_P_32BPP           0x00000007
-+
-+#define PIXELMODE_S_MASK            0x00000038
-+#define PIXELMODE_S_1PPC            0x00000000
-+#define PIXELMODE_S_1PPCMAPPED      0x00000008
-+#define PIXELMODE_S_2PPC            0x00000010
-+#define PIXELMODE_S_4PPC            0x00000018
-+#define PIXELMODE_S_8PPC            0x00000020
-+#define PIXELMODE_S_223PPC          0x00000028
-+#define PIXELMODE_S_DS223PPC        0x00000030
-+#define PIXELMODE_S_UNDEF           0x00000038
-+
-+#define PIXELMODE_M_MASK            0x000003c0
-+#define PIXELMODE_M_NOBLINK         0x00000000
-+#define PIXELMODE_M_ANDBLINK        0x00000040
-+#define PIXELMODE_M_ORBLINK         0x00000080
-+#define PIXELMODE_M_XORBLINK        0x000000c0
-+#define PIXELMODE_M_BGBLINK         0x00000100
-+#define PIXELMODE_M_OFFSINGBLINK    0x00000140
-+#define PIXELMODE_M_OFF888BLINK     0x00000180
-+#define PIXELMODE_M_DIMBLINK        0x00000300
-+#define PIXELMODE_M_BRTBLINK        0x00000340
-+#define PIXELMODE_M_DIM888BLINK     0x00000380
-+#define PIXELMODE_M_BRT888BLINK     0x000003c0
-+
-+#define PIXELMODE_C_MASK            0x00003c00
-+#define PIXELMODE_C_LUT             0x00000000
-+#define PIXELMODE_C_888             0x00001000
-+#define PIXELMODE_C_565             0x00001400
-+#define PIXELMODE_C_555             0x00001800
-+#define PIXELMODE_C_GSLUT           0x00002000
-+
-+#define PIXELMODE_DSCAN             0x00004000
-+#define PIXELMODE_TRBSW             0x00008000
-+
-+//-----------------------------------------------------------------------------
-+//PARLLIFOUT Register Defintions
-+//-----------------------------------------------------------------------------
-+#define PARLLIFOUT_DAT_MASK         0x0000000f
-+#define PARLLIFOUT_DAT_SHIFT        0
-+#define PARLLIFOUT_RD               0x00000010
-+
-+//-----------------------------------------------------------------------------
-+//PARLLIFIN Register Defintions
-+//-----------------------------------------------------------------------------
-+#define PARLLIFIN_DAT_MASK          0x0000000f
-+#define PARLLIFIN_DAT_SHIFT         0
-+#define PARLLIFIN_CNT_MASK          0x000f0000
-+#define PARLLIFIN_CNT_SHIFT         16
-+#define PARLLIFIN_ESTRT_MASK        0x00f00000
-+#define PARLLIFIN_ESTRT_SHIFT       20
-+
-+//-----------------------------------------------------------------------------
-+// CURSORADRSTART Register Defintions
-+//-----------------------------------------------------------------------------
-+#define CURSOR_ADR_START_MASK         0xfffffffc
-+
-+//-----------------------------------------------------------------------------
-+// CURSORADRSTART Register Defintions
-+//-----------------------------------------------------------------------------
-+#define CURSOR_ADR_RESET_MASK         0xfffffffc
-+
-+//-----------------------------------------------------------------------------
-+// CURSORCOLOR1 Register Definitions
-+//-----------------------------------------------------------------------------
-+#define CURSORCOLOR1_MASK               0x00ffffff
-+//-----------------------------------------------------------------------------
-+// CURSORCOLOR2 Register Definitions
-+//-----------------------------------------------------------------------------
-+#define CURSORCOLOR2_MASK               0x00ffffff
-+
-+//-----------------------------------------------------------------------------
-+// CURSORXYLOC Register Definitions
-+//-----------------------------------------------------------------------------
-+#define CURSORXYLOC_MASK                0x07ff87ff
-+#define CURSORXYLOC_XLOC_MASK           0x000007ff
-+#define CURSORXYLOC_XLOC_SHIFT          0
-+#define CURSORXYLOC_CEN                 0x00008000
-+#define CURSORXYLOC_YLOC_MASK           0x07ff0000
-+#define CURSORXYLOC_YLOC_SHIFT          16
-+
-+//-----------------------------------------------------------------------------
-+// CURSOR_DSCAN_LH_YLOC Register Definitions
-+//-----------------------------------------------------------------------------
-+#define CURSOR_DSCAN_LH_YLOC_MASK       0x000087ff
-+
-+#define CURSOR_DSCAN_LH_YLOC_YLOC_MASK  0x000007ff
-+#define CURSOR_DSCAN_LH_YLOC_YLOC_SHIFT 0
-+#define CURSOR_DSCAN_LH_YLOC_CLHEN      0x00008000
-+
-+//-----------------------------------------------------------------------------
-+// CURSORSIZE Register Definitions
-+//-----------------------------------------------------------------------------
-+#define CURSORSIZE_MASK                 0x0000ffff
-+
-+#define CURSORSIZE_CWID_MASK            0x00000003
-+#define CURSORSIZE_CWID_SHIFT           0
-+#define CURSORSIZE_CWID_1_WORD          0
-+#define CURSORSIZE_CWID_2_WORD          1
-+#define CURSORSIZE_CWID_3_WORD          2
-+#define CURSORSIZE_CWID_4_WORD          3
-+
-+#define CURSORSIZE_CLINS_MASK           0x000000fc
-+#define CURSORSIZE_CLINS_SHIFT          2
-+
-+#define CURSORSIZE_CSTEP_MASK           0x00000300
-+#define CURSORSIZE_CSTEP_SHIFT          8
-+#define CURSORSIZE_CSTEP_1_WORD         0
-+#define CURSORSIZE_CSTEP_2_WORD         1
-+#define CURSORSIZE_CSTEP_3_WORD         2
-+#define CURSORSIZE_CSTEP_4_WORD         3
-+
-+#define CURSORSIZE_DLNS_MASK            0x0000fc00
-+#define CURSORSIZE_DLNS_SHIFT           10
-+
-+#endif /* _REGS_RASTER_H_ */
diff --git a/target/linux/ep93xx/patches-2.6.30/010-ep93xx-snd-ac97.patch b/target/linux/ep93xx/patches-2.6.30/010-ep93xx-snd-ac97.patch
deleted file mode 100644
index 36f316be1..000000000
--- a/target/linux/ep93xx/patches-2.6.30/010-ep93xx-snd-ac97.patch
+++ /dev/null
@@ -1,3808 +0,0 @@
---- a/arch/arm/mach-ep93xx/include/mach/hardware.h
-+++ b/arch/arm/mach-ep93xx/include/mach/hardware.h
-@@ -5,6 +5,7 @@
- #define __ASM_ARCH_HARDWARE_H
- 
- #include "ep93xx-regs.h"
-+#include "regs_ac97.h"
- 
- #define pcibios_assign_all_busses()	0
- #include "regs_raster.h"
---- /dev/null
-+++ b/arch/arm/mach-ep93xx/include/mach/regs_ac97.h
-@@ -0,0 +1,180 @@
-+/*=============================================================================
-+ *  FILE:           regs_ac97.h
-+ *
-+ *  DESCRIPTION:    Ac'97 Register Definition
-+ *
-+ *  Copyright Cirrus Logic, 2001-2003
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *=============================================================================
-+ */
-+#ifndef _REGS_AC97_H_
-+#define _REGS_AC97_H_
-+
-+//-----------------------------------------------------------------------------
-+// Bit definitionses
-+//-----------------------------------------------------------------------------
-+#define AC97ISR_RIS                     8
-+#define AC97ISR_TIS                     4
-+#define AC97ISR_RTIS                    2
-+#define AC97ISR_TCIS                    1
-+
-+#define AC97RGIS_SLOT1TXCOMPLETE     0x01
-+#define AC97RGIS_SLOT2RXVALID        0x02
-+#define AC97RGIS_GPIOTXCOMPLETE      0x04
-+#define AC97RGIS_GPIOINTRX           0x08
-+#define AC97RGIS_RWIS                0x10
-+#define AC97RGIS_CODECREADY          0x20
-+#define AC97RGIS_SLOT2TXCOMPLETE     0x40
-+
-+#define AC97SR_RXFE                 0x0001
-+#define AC97SR_TXFE                 0x0002
-+#define AC97SR_RXFF                 0x0004
-+#define AC97SR_TXFF                 0x0008
-+#define AC97SR_TXBUSY               0x0010
-+#define AC97SR_RXOE                 0x0020
-+#define AC97SR_TXUE                 0x0040
-+
-+#define AC97GSR_IFE                     0x1
-+#define AC97GSR_LOOP                    0x2
-+#define AC97GSR_OVERRIDECODECREADY      0x4
-+
-+#define AC97RESET_TIMEDRESET            0x1
-+#define AC97RESET_FORCEDRESET           0x2
-+#define AC97RESET_EFORCER               0x4
-+
-+#define AC97RXCR_REN                    0x1
-+
-+#define AC97TXCR_TEN                    0x1
-+
-+
-+//****************************************************************************
-+//
-+// The Ac97 Codec registers, accessable through the Ac-link.
-+// These are not controller registers and are not memory mapped.
-+// Includes registers specific to CS4202 (Beavis).
-+//
-+//****************************************************************************
-+#define AC97_REG_OFFSET_MASK                0x0000007E
-+
-+#define AC97_00_RESET                          0x00000000
-+#define AC97_02_MASTER_VOL                     0x00000002
-+#define AC97_04_HEADPHONE_VOL                  0x00000004
-+#define AC97_06_MONO_VOL                       0x00000006
-+#define AC97_08_TONE                           0x00000008
-+#define AC97_0A_PC_BEEP_VOL                    0x0000000A
-+#define AC97_0C_PHONE_VOL                      0x0000000C
-+#define AC97_0E_MIC_VOL                        0x0000000E
-+#define AC97_10_LINE_IN_VOL                    0x00000010
-+#define AC97_12_CD_VOL                         0x00000012
-+#define AC97_14_VIDEO_VOL                      0x00000014
-+#define AC97_16_AUX_VOL                        0x00000016
-+#define AC97_18_PCM_OUT_VOL                    0x00000018
-+#define AC97_1A_RECORD_SELECT                  0x0000001A
-+#define AC97_1C_RECORD_GAIN                    0x0000001C
-+#define AC97_1E_RESERVED_1E                    0x0000001E
-+#define AC97_20_GENERAL_PURPOSE                0x00000020
-+#define AC97_22_3D_CONTROL                     0x00000022
-+#define AC97_24_MODEM_RATE                     0x00000024
-+#define AC97_26_POWERDOWN                      0x00000026
-+#define AC97_28_EXT_AUDIO_ID                   0x00000028
-+#define AC97_2A_EXT_AUDIO_POWER                0x0000002A
-+#define AC97_2C_PCM_FRONT_DAC_RATE             0x0000002C
-+#define AC97_2E_PCM_SURR_DAC_RATE              0x0000002E
-+#define AC97_30_PCM_LFE_DAC_RATE               0x00000030
-+#define AC97_32_PCM_LR_ADC_RATE                0x00000032
-+#define AC97_34_MIC_ADC_RATE                   0x00000034
-+#define AC97_36_6CH_VOL_C_LFE                  0x00000036
-+#define AC97_38_6CH_VOL_SURROUND               0x00000038
-+#define AC97_3A_SPDIF_CONTROL                  0x0000003A
-+#define AC97_3C_EXT_MODEM_ID                   0x0000003C
-+#define AC97_3E_EXT_MODEM_POWER                0x0000003E
-+#define AC97_40_LINE1_CODEC_RATE               0x00000040
-+#define AC97_42_LINE2_CODEC_RATE               0x00000042
-+#define AC97_44_HANDSET_CODEC_RATE             0x00000044
-+#define AC97_46_LINE1_CODEC_LEVEL              0x00000046
-+#define AC97_48_LINE2_CODEC_LEVEL              0x00000048
-+#define AC97_4A_HANDSET_CODEC_LEVEL            0x0000004A
-+#define AC97_4C_GPIO_PIN_CONFIG                0x0000004C
-+#define AC97_4E_GPIO_PIN_TYPE                  0x0000004E
-+#define AC97_50_GPIO_PIN_STICKY                0x00000050
-+#define AC97_52_GPIO_PIN_WAKEUP                0x00000052
-+#define AC97_54_GPIO_PIN_STATUS                0x00000054
-+#define AC97_56_RESERVED                       0x00000056
-+#define AC97_58_RESERVED                       0x00000058
-+#define AC97_5A_CRYSTAL_REV_N_FAB_ID           0x0000005A
-+#define AC97_5C_TEST_AND_MISC_CTRL             0x0000005C
-+#define AC97_5E_AC_MODE                        0x0000005E
-+#define AC97_60_MISC_CRYSTAL_CONTROL           0x00000060
-+#define AC97_62_VENDOR_RESERVED                0x00000062
-+#define AC97_64_DAC_SRC_PHASE_INCR             0x00000064
-+#define AC97_66_ADC_SRC_PHASE_INCR             0x00000066
-+#define AC97_68_RESERVED_68                    0x00000068
-+#define AC97_6A_SERIAL_PORT_CONTROL            0x0000006A
-+#define AC97_6C_VENDOR_RESERVED                0x0000006C
-+#define AC97_6E_VENDOR_RESERVED                0x0000006E
-+#define AC97_70_BDI_CONFIG                     0x00000070
-+#define AC97_72_BDI_WAKEUP                     0x00000072
-+#define AC97_74_VENDOR_RESERVED                0x00000074
-+#define AC97_76_CAL_ADDRESS                    0x00000076
-+#define AC97_78_CAL_DATA                       0x00000078
-+#define AC97_7A_VENDOR_RESERVED                0x0000007A
-+#define AC97_7C_VENDOR_ID1                     0x0000007C
-+#define AC97_7E_VENDOR_ID2                     0x0000007E
-+
-+
-+#ifndef __ASSEMBLY__
-+
-+//
-+// enum type for use with reg AC97_RECORD_SELECT
-+//
-+typedef enum{
-+    RECORD_MIC          = 0x0000,
-+    RECORD_CD           = 0x0101,
-+    RECORD_VIDEO_IN     = 0x0202,
-+    RECORD_AUX_IN       = 0x0303,
-+    RECORD_LINE_IN      = 0x0404,
-+    RECORD_STEREO_MIX   = 0x0505,
-+    RECORD_MONO_MIX     = 0x0606,
-+    RECORD_PHONE_IN     = 0x0707
-+} Ac97RecordSources;
-+
-+#endif /* __ASSEMBLY__ */
-+
-+//
-+// Sample rates supported directly in AC97_PCM_FRONT_DAC_RATE and
-+// AC97_PCM_LR_ADC_RATE.
-+//
-+#define Ac97_Fs_8000        0x1f40
-+#define Ac97_Fs_11025       0x2b11
-+#define Ac97_Fs_16000       0x3e80
-+#define Ac97_Fs_22050       0x5622
-+#define Ac97_Fs_32000       0x7d00
-+#define Ac97_Fs_44100       0xac44
-+#define Ac97_Fs_48000       0xbb80
-+
-+//
-+// RSIZE and TSIZE in AC97RXCR and AC97TXCR
-+//
-+#define Ac97_SIZE_20            2
-+#define Ac97_SIZE_18            1
-+#define Ac97_SIZE_16            0
-+#define Ac97_SIZE_12            3
-+
-+//=============================================================================
-+//=============================================================================
-+
-+
-+#endif /* _REGS_AC97_H_ */
---- a/sound/arm/Kconfig
-+++ b/sound/arm/Kconfig
-@@ -11,6 +11,23 @@ menuconfig SND_ARM
- 
- if SND_ARM
- 
-+config SND_EP93XX_AC97
-+	tristate "AC97 driver for the Cirrus EP93xx chip"
-+	depends on ARCH_EP93XX && SND
-+	select SND_EP93XX_PCM
-+	select SND_AC97_CODEC
-+	help
-+	  Say Y here to use AC'97 audio with a Cirrus Logic EP93xx chip.
-+
-+	  To compile this driver as a module, choose M here: the module
-+	  will be called snd-ep93xx-ac97.
-+
-+config SND_EP93XX_PCM
-+	tristate
-+	select SND_PCM
-+	help
-+	 Generic PCM module for EP93xx
-+
- config SND_ARMAACI
- 	tristate "ARM PrimeCell PL041 AC Link support"
- 	depends on ARM_AMBA
---- a/sound/arm/Makefile
-+++ b/sound/arm/Makefile
-@@ -5,6 +5,9 @@
- obj-$(CONFIG_SND_ARMAACI)	+= snd-aaci.o
- snd-aaci-objs			:= aaci.o devdma.o
- 
-+obj-$(CONFIG_SND_EP93XX_AC97)	+= snd-ep93xx-ac97.o
-+snd-ep93xx-ac97-objs		:= ep93xx-ac97.o
-+
- obj-$(CONFIG_SND_PXA2XX_PCM)	+= snd-pxa2xx-pcm.o
- snd-pxa2xx-pcm-objs		:= pxa2xx-pcm.o
- 
---- /dev/null
-+++ b/sound/arm/ep93xx-ac97.c
-@@ -0,0 +1,3482 @@
-+/*
-+ * linux/sound/arm/ep93xx-ac97.c -- ALSA PCM interface for the edb93xx ac97 audio
-+ */
-+
-+#include <linux/autoconf.h>
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+#include <linux/delay.h>
-+#include <linux/soundcard.h>
-+
-+#include <sound/driver.h>
-+#include <sound/core.h>
-+#include <sound/pcm.h>
-+#include <sound/pcm_params.h>
-+#include <sound/control.h>
-+#include <sound/initval.h>
-+#include <sound/ac97_codec.h>
-+
-+#include <asm/irq.h>
-+#include <asm/semaphore.h>
-+#include <asm/hardware.h>
-+#include <asm/io.h>
-+#include <asm/arch/dma.h>
-+#include "ep93xx-ac97.h"
-+
-+#define	DRIVER_VERSION	"01/05/2009"
-+#define	DRIVER_DESC	"EP93xx AC97 Audio driver"
-+static int ac_link_enabled = 0;
-+static int codec_supported_mixers;
-+
-+//#define DEBUG 1
-+#ifdef DEBUG
-+#define DPRINTK( fmt, arg... )  printk( fmt, ##arg )
-+#else
-+#define DPRINTK( fmt, arg... )
-+#endif
-+
-+#define WL16 	0
-+#define WL24	1
-+
-+#define AUDIO_NAME              	"ep93xx-ac97"
-+#define AUDIO_SAMPLE_RATE_DEFAULT       44100
-+#define AUDIO_DEFAULT_VOLUME            0
-+#define AUDIO_MAX_VOLUME	        181
-+#define AUDIO_DEFAULT_DMACHANNELS       3
-+#define PLAYBACK_DEFAULT_DMACHANNELS    3
-+#define CAPTURE_DEFAULT_DMACHANNELS     3
-+
-+#define CHANNEL_FRONT			(1<<0)
-+#define CHANNEL_REAR                   	(1<<1)
-+#define CHANNEL_CENTER_LFE              (1<<2)
-+
-+static void snd_ep93xx_dma_tx_callback( ep93xx_dma_int_t DMAInt,
-+					ep93xx_dma_dev_t device,
-+					unsigned int user_data);
-+static void snd_ep93xx_dma_rx_callback( ep93xx_dma_int_t DMAInt,
-+					ep93xx_dma_dev_t device,
-+					unsigned int user_data);
-+
-+static const struct snd_pcm_hardware ep93xx_ac97_pcm_hardware = {
-+
-+
-+    .info		= ( SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_PAUSE  ),
-+    .formats		= ( SNDRV_PCM_FMTBIT_U8     | SNDRV_PCM_FMTBIT_S8     |
-+			    SNDRV_PCM_FMTBIT_U16_LE | SNDRV_PCM_FMTBIT_S16_LE |
-+			    SNDRV_PCM_FMTBIT_U16_BE | SNDRV_PCM_FMTBIT_S16_BE |
-+			    SNDRV_PCM_FMTBIT_U32_LE | SNDRV_PCM_FMTBIT_S32_LE |
-+			    SNDRV_PCM_FMTBIT_U32_BE | SNDRV_PCM_FMTBIT_S32_BE ),
-+    .rates		= ( SNDRV_PCM_RATE_8000  | SNDRV_PCM_RATE_11025 |
-+			    SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |
-+			    SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |
-+			    SNDRV_PCM_RATE_48000 ),
-+    .rate_min		= 8000,
-+    .rate_max		= 48000,
-+    .channels_min	= 1,/*2,*/
-+    .channels_max	= 2,
-+
-+    .period_bytes_min	= 1 * 1024,
-+    .period_bytes_max	= 32 * 1024,
-+    .periods_min	= 1,
-+    .periods_max	= 32,
-+    .buffer_bytes_max	= 32 * 1024,
-+    .fifo_size		= 0,
-+};
-+
-+static audio_stream_t output_stream;
-+static audio_stream_t input_stream;
-+
-+static audio_state_t audio_state =
-+{
-+    .output_stream      	=&output_stream,
-+    .output_dma[0]        	=DMATx_AAC1,
-+    .output_id[0]          	="Ac97 out",
-+
-+    .input_stream       	=&input_stream,
-+    .input_dma[0]          	=DMARx_AAC1,
-+    .input_id[0]           	="Ac97 in",
-+
-+    .sem                    = __SEMAPHORE_INIT(audio_state.sem,1),
-+    .codec_set_by_playback  = 0,
-+    .codec_set_by_capture   = 0,
-+    .DAC_bit_width		 =16,
-+    .bCompactMode		 =0,
-+};
-+
-+
-+
-+/*
-+ * peek
-+ *
-+ * Reads an AC97 codec register.  Returns -1 if there was an error.
-+ */
-+static int peek(unsigned int uiAddress)
-+{
-+	unsigned int uiAC97RGIS;
-+
-+	if( !ac_link_enabled )
-+	{
-+		printk("ep93xx ac97 peek: attempt to peek before enabling ac-link.\n");
-+		return -1;
-+	}
-+
-+	/*
-+	 * Check to make sure that the address is aligned on a word boundary
-+	 * and is 7E or less.
-+	 */
-+	if( ((uiAddress & 0x1)!=0) || (uiAddress > 0x007e))
-+	{
-+		return -1;
-+	}
-+
-+	/*
-+	 * How it is supposed to work is:
-+	 *  - The ac97 controller sends out a read addr in slot 1.
-+	 *  - In the next frame, the codec will echo that address back in slot 1
-+	 *    and send the data in slot 2.  SLOT2RXVALID will be set to 1.
-+	 *
-+	 * Read until SLOT2RXVALID goes to 1.  Reading the data in AC97S2DATA
-+	 * clears SLOT2RXVALID.
-+	 */
-+
-+	/*
-+	 * First, delay one frame in case of back to back peeks/pokes.
-+	 */
-+	mdelay( 1 );
-+
-+	/*
-+	 * Write the address to AC97S1DATA, delay 1 frame, read the flags.
-+	 */
-+	outl( uiAddress, AC97S1DATA);
-+	udelay( 21 * 4 );
-+	uiAC97RGIS = inl( AC97RGIS );
-+
-+	/*
-+	 * Return error if we timed out.
-+	 */
-+	if( ((uiAC97RGIS & AC97RGIS_SLOT1TXCOMPLETE) == 0 ) &&
-+		((uiAC97RGIS & AC97RGIS_SLOT2RXVALID) == 0 ) )
-+	{
-+		printk( "ep93xx-ac97 - peek failed reading reg 0x%02x.\n", uiAddress );
-+		return -1;
-+	}
-+
-+	return ( inl(AC97S2DATA) & 0x000fffff);
-+}
-+
-+/*
-+ * poke
-+ *
-+ * Writes an AC97 codec Register.  Return -1 if error.
-+ */
-+static int poke(unsigned int uiAddress, unsigned int uiValue)
-+{
-+	unsigned int uiAC97RGIS;
-+
-+	if( !ac_link_enabled )
-+	{
-+		printk("ep93xx ac97 poke: attempt to poke before enabling ac-link.\n");
-+		return -1;
-+	}
-+
-+	/*
-+	 * Check to make sure that the address is align on a word boundary and
-+	 * is 7E or less.  And that the value is a 16 bit value.
-+	 */
-+	if( ((uiAddress & 0x1)!=0) || (uiAddress > 0x007e))
-+	{
-+		printk("ep93xx ac97 poke: address error.\n");
-+		return -1;
-+	}
-+
-+	/*stop the audio loop from the input to the output directly*/
-+
-+	if((uiAddress==AC97_0E_MIC_VOL)||(uiAddress==AC97_10_LINE_IN_VOL))
-+	{
-+		uiValue = (uiValue | 0x8000);
-+
-+	}
-+
-+	/*
-+	 * First, delay one frame in case of back to back peeks/pokes.
-+	 */
-+	mdelay( 1 );
-+
-+	/*
-+	 * Write the data to AC97S2DATA, then the address to AC97S1DATA.
-+	 */
-+	outl( uiValue, AC97S2DATA );
-+	outl( uiAddress, AC97S1DATA );
-+
-+	/*
-+	 * Wait for the tx to complete, get status.
-+	 */
-+	udelay( 30 );/*21*/
-+	uiAC97RGIS = inl(AC97RGIS);
-+
-+	/*
-+	 * Return error if we timed out.
-+	 */
-+	if( !(inl(AC97RGIS) & AC97RGIS_SLOT1TXCOMPLETE) )
-+	{
-+		printk( "ep93xx-ac97: poke failed writing reg 0x%02x  value 0x%02x.\n", uiAddress, uiValue );
-+		return -1;
-+	}
-+
-+	return 0;
-+}
-+
-+
-+/*
-+ * When we get to the multichannel case the pre-fill and enable code
-+ * will go to the dma driver's start routine.
-+ */
-+static void ep93xx_audio_enable( int input_or_output_stream )
-+{
-+	unsigned int uiTemp;
-+
-+	DPRINTK("ep93xx_audio_enable :%x\n",input_or_output_stream);
-+
-+	/*
-+	 * Enable the rx or tx channel depending on the value of
-+	 * input_or_output_stream
-+	 */
-+	if( input_or_output_stream )
-+	{
-+		uiTemp = inl(AC97TXCR1);
-+		outl( (uiTemp | AC97TXCR_TEN), AC97TXCR1 );
-+	}
-+	else
-+	{
-+		uiTemp = inl(AC97RXCR1);
-+		outl( (uiTemp | AC97RXCR_REN), AC97RXCR1 );
-+	}
-+
-+
-+	//DDEBUG("ep93xx_audio_enable - EXIT\n");
-+}
-+
-+static void ep93xx_audio_disable( int input_or_output_stream )
-+{
-+	unsigned int uiTemp;
-+
-+	DPRINTK("ep93xx_audio_disable\n");
-+
-+	/*
-+	 * Disable the rx or tx channel depending on the value of
-+	 * input_or_output_stream
-+	 */
-+	if( input_or_output_stream )
-+	{
-+		uiTemp = inl(AC97TXCR1);
-+		outl( (uiTemp & ~AC97TXCR_TEN), AC97TXCR1 );
-+	}
-+	else
-+	{
-+		uiTemp = inl(AC97RXCR1);
-+		outl( (uiTemp & ~AC97RXCR_REN), AC97RXCR1 );
-+	}
-+
-+	//DDEBUG("ep93xx_audio_disable - EXIT\n");
-+}
-+
-+
-+
-+/*=======================================================================================*/
-+/*
-+ * ep93xx_setup_src
-+ *
-+ * Once the ac-link is up and all is good, we want to set the codec to a
-+ * usable mode.
-+ */
-+static void ep93xx_setup_src(void)
-+{
-+	int iTemp;
-+
-+	/*
-+	 * Set the VRA bit to enable the SRC.
-+	 */
-+	iTemp = peek( AC97_2A_EXT_AUDIO_POWER );
-+	poke( AC97_2A_EXT_AUDIO_POWER,  (iTemp | 0x1) );
-+
-+	/*
-+	 * Set the DSRC/ASRC bits to enable the variable rate SRC.
-+	 */
-+	iTemp = peek( AC97_60_MISC_CRYSTAL_CONTROL  );
-+	poke( AC97_60_MISC_CRYSTAL_CONTROL, (iTemp  | 0x0300) );
-+}
-+
-+/*
-+ * ep93xx_set_samplerate
-+ *
-+ *   lFrequency       - Sample Rate in Hz
-+ *   bCapture       - 0 to set Tx sample rate; 1 to set Rx sample rate
-+ */
-+static void ep93xx_set_samplerate( long lSampleRate, int bCapture )
-+{
-+	unsigned short usDivider, usPhase;
-+
-+	DPRINTK( "ep93xx_set_samplerate - Fs = %d\n", (int)lSampleRate );
-+
-+	if( (lSampleRate <  7200) || (lSampleRate > 48000)  )
-+	{
-+		printk( "ep93xx_set_samplerate - invalid Fs = %d\n",
-+				 (int)lSampleRate );
-+		return;
-+	}
-+
-+	/*
-+	 * Calculate divider and phase increment.
-+	 *
-+	 * divider = round( 0x1770000 / lSampleRate )
-+	 *  Note that usually rounding is done by adding 0.5 to a floating
-+	 *  value and then truncating.  To do this without using floating
-+	 *  point, I multiply the fraction by two, do the division, then add one,
-+	 *  then divide the whole by 2 and then truncate.
-+	 *  Same effect, no floating point math.
-+	 *
-+	 * Ph incr = trunc( (0x1000000 / usDivider) + 1 )
-+	 */
-+
-+	usDivider = (unsigned short)( ((2 * 0x1770000 / lSampleRate) +  1) / 2 );
-+
-+	usPhase = (0x1000000 / usDivider) + 1;
-+
-+	/*
-+	 * Write them in the registers.  Spec says divider must be
-+	 * written after phase incr.
-+	 */
-+	if(!bCapture)
-+	{
-+		poke( AC97_2C_PCM_FRONT_DAC_RATE, usDivider);
-+		poke( AC97_64_DAC_SRC_PHASE_INCR, usPhase);
-+	}
-+	else
-+	{
-+
-+		poke( AC97_32_PCM_LR_ADC_RATE,  usDivider);
-+		poke( AC97_66_ADC_SRC_PHASE_INCR, usPhase);
-+	}
-+
-+	DPRINTK( "ep93xx_set_samplerate - phase = %d,  divider = %d\n",
-+				(unsigned int)usPhase, (unsigned int)usDivider );
-+
-+	/*
-+	 * We sorta should report the actual samplerate back to the calling
-+	 * application.  But some applications freak out if they don't get
-+	 * exactly what they asked for.  So we fudge and tell them what
-+	 * they want to hear.
-+	 */
-+	//audio_samplerate = lSampleRate;
-+
-+	DPRINTK( "ep93xx_set_samplerate - EXIT\n" );
-+}
-+
-+/*
-+ * ep93xx_set_hw_format
-+ *
-+ * Sets up whether the controller is expecting 20 bit data in 32 bit words
-+ * or 16 bit data compacted to have a stereo sample in each 32 bit word.
-+ */
-+static void ep93xx_set_hw_format( long format,long channel )
-+{
-+	int bCompactMode;
-+
-+	switch( format )
-+	{
-+		/*
-+		 * Here's all the <=16 bit formats.  We can squeeze both L and R
-+		 * into one 32 bit sample so use compact mode.
-+		 */
-+		case SNDRV_PCM_FORMAT_U8:
-+		case SNDRV_PCM_FORMAT_S8:
-+		case SNDRV_PCM_FORMAT_S16_LE:
-+		case SNDRV_PCM_FORMAT_U16_LE:
-+			bCompactMode = 1;
-+			break;
-+
-+		/*
-+		 * Add any other >16 bit formats here...
-+		 */
-+		case SNDRV_PCM_FORMAT_S32_LE:
-+		default:
-+			bCompactMode = 0;
-+			break;
-+	}
-+
-+	if( bCompactMode )
-+	{
-+		DPRINTK("ep93xx_set_hw_format - Setting serial mode to 16 bit compact.\n");
-+
-+		/*
-+		 * Turn on Compact Mode so we can fit each stereo sample into
-+		 * a 32 bit word.  Twice as efficent for DMA and FIFOs.
-+		 */
-+		if(channel==2){
-+			outl( 0x00008018, AC97RXCR1 );
-+			outl( 0x00008018, AC97TXCR1 );
-+		}
-+		else {
-+		        outl( 0x00008018, AC97RXCR1 );
-+                        outl( 0x00008018, AC97TXCR1 );
-+                }
-+
-+
-+		audio_state.DAC_bit_width = 16;
-+		audio_state.bCompactMode = 1;
-+	}
-+	else
-+	{
-+		DPRINTK("ep93xx_set_hw_format - Setting serial mode to 20 bit non-CM.\n");
-+
-+		/*
-+		 * Turn off Compact Mode so we can do > 16 bits per channel
-+		 */
-+		if(channel==2){
-+			outl( 0x00004018, AC97RXCR1 );
-+			outl( 0x00004018, AC97TXCR1 );
-+		}
-+		else{
-+                        outl( 0x00004018, AC97RXCR1 );
-+                        outl( 0x00004018, AC97TXCR1 );
-+		}
-+
-+		audio_state.DAC_bit_width = 20;
-+		audio_state.bCompactMode = 0;
-+	}
-+
-+}
-+
-+/*
-+ * ep93xx_stop_loop
-+ *
-+ * Once the ac-link is up and all is good, we want to set the codec to a
-+ * usable mode.
-+ */
-+static void ep93xx_stop_loop(void)
-+{
-+        int iTemp;
-+
-+        /*
-+         * Set the AC97_0E_MIC_VOL MUTE bit to enable the LOOP.
-+         */
-+        iTemp = peek( AC97_0E_MIC_VOL );
-+        poke( AC97_0E_MIC_VOL,  (iTemp | 0x8000) );
-+
-+        /*
-+         * Set the AC97_10_LINE_IN_VOL MUTE bit to enable the LOOP.
-+         */
-+        iTemp = peek( AC97_10_LINE_IN_VOL  );
-+        poke( AC97_10_LINE_IN_VOL, (iTemp  | 0x8000) );
-+}
-+
-+/*
-+ * ep93xx_init_ac97_controller
-+ *
-+ * This routine sets up the Ac'97 Controller.
-+ */
-+static void ep93xx_init_ac97_controller(void)
-+{
-+	unsigned int uiDEVCFG, uiTemp;
-+
-+	DPRINTK("ep93xx_init_ac97_controller - enter\n");
-+
-+	/*
-+	 * Configure the multiplexed Ac'97 pins to be Ac97 not I2s.
-+	 * Configure the EGPIO4 and EGPIO6 to be GPIOS, not to be
-+	 * SDOUT's for the second and third I2S controller channels.
-+	 */
-+	uiDEVCFG = inl(EP93XX_SYSCON_DEVICE_CONFIG);
-+
-+	uiDEVCFG &= ~(EP93XX_SYSCON_DEVCFG_CONFIG_I2SONAC97 |
-+				  EP93XX_SYSCON_DEVCFG_A1onG |
-+				  EP93XX_SYSCON_DEVCFG_A2onG);
-+
-+	SysconSetLocked(EP93XX_SYSCON_DEVICE_CONFIG, uiDEVCFG);
-+
-+	/*
-+	 * Disable the AC97 controller internal loopback.
-+	 * Disable Override codec ready.
-+	 */
-+	outl( 0, AC97GCR );
-+
-+	/*
-+	 * Enable the AC97 Link.
-+	 */
-+	uiTemp = inl(AC97GCR);
-+	outl( (uiTemp | AC97GSR_IFE), AC97GCR );
-+
-+	/*
-+	 * Set the TIMEDRESET bit.  Will cause a > 1uSec reset of the ac-link.
-+	 * This bit is self resetting.
-+	 */
-+	outl( AC97RESET_TIMEDRESET, AC97RESET );
-+
-+	/*
-+	 *  Delay briefly, but let's not hog the processor.
-+	 */
-+	set_current_state(TASK_INTERRUPTIBLE);
-+	schedule_timeout( 5 ); /* 50 mSec */
-+
-+	/*
-+	 * Read the AC97 status register to see if we've seen a CODECREADY
-+	 * signal from the AC97 codec.
-+	 */
-+	if( !(inl(AC97RGIS) & AC97RGIS_CODECREADY))
-+	{
-+		printk( "ep93xx-ac97 - FAIL: CODECREADY still low!\n");
-+		return;
-+	}
-+
-+	/*
-+	 *  Delay for a second, not hogging the processor
-+	 */
-+	set_current_state(TASK_INTERRUPTIBLE);
-+	schedule_timeout( HZ ); /* 1 Sec */
-+
-+	/*
-+	 * Now the Ac-link is up.  We can read and write codec registers.
-+	 */
-+	ac_link_enabled = 1;
-+
-+	/*
-+	 * Set up the rx and tx channels
-+	 * Set the CM bit, data size=16 bits, enable tx slots 3 & 4.
-+	 */
-+	ep93xx_set_hw_format( EP93XX_DEFAULT_FORMAT,EP93XX_DEFAULT_NUM_CHANNELS );
-+
-+	DPRINTK( "ep93xx-ac97 -- AC97RXCR1:  %08x\n", inl(AC97RXCR1) );
-+	DPRINTK( "ep93xx-ac97 -- AC97TXCR1:  %08x\n", inl(AC97TXCR1) );
-+
-+	DPRINTK("ep93xx_init_ac97_controller - EXIT - success\n");
-+
-+}
-+
-+#ifdef alsa_ac97_debug
-+static void ep93xx_dump_ac97_regs(void)
-+{
-+	int i;
-+	unsigned int reg0, reg1, reg2, reg3, reg4, reg5, reg6, reg7;
-+
-+	DPRINTK( "---------------------------------------------\n");
-+	DPRINTK( "   :   0    2    4    6    8    A    C    E\n" );
-+
-+	for( i=0 ; i < 0x80 ; i+=0x10 )
-+	{
-+		reg0 = 0xffff & (unsigned int)peek( i );
-+		reg1 = 0xffff & (unsigned int)peek( i + 0x2 );
-+		reg2 = 0xffff & (unsigned int)peek( i + 0x4 );
-+		reg3 = 0xffff & (unsigned int)peek( i + 0x6 );
-+		reg4 = 0xffff & (unsigned int)peek( i + 0x8 );
-+		reg5 = 0xffff & (unsigned int)peek( i + 0xa );
-+		reg6 = 0xffff & (unsigned int)peek( i + 0xc );
-+		reg7 = 0xffff & (unsigned int)peek( i + 0xe );
-+
-+		DPRINTK( " %02x : %04x %04x %04x %04x %04x %04x %04x %04x\n",
-+				 i, reg0, reg1, reg2, reg3, reg4, reg5, reg6, reg7);
-+	}
-+
-+	DPRINTK( "---------------------------------------------\n");
-+}
-+#endif
-+
-+
-+#define supported_mixer(FOO) \
-+        ( (FOO >= 0) && \
-+        (FOO < SOUND_MIXER_NRDEVICES) && \
-+        codec_supported_mixers & (1<<FOO) )
-+
-+/*
-+ * Available record sources.
-+ * LINE1 refers to AUX in.
-+ * IGAIN refers to input gain which means stereo mix.
-+ */
-+#define AC97_RECORD_MASK \
-+        (SOUND_MASK_MIC | SOUND_MASK_CD | SOUND_MASK_IGAIN | SOUND_MASK_VIDEO |\
-+        SOUND_MASK_LINE1 | SOUND_MASK_LINE | SOUND_MASK_PHONEIN)
-+
-+#define AC97_STEREO_MASK \
-+        (SOUND_MASK_VOLUME | SOUND_MASK_PCM | SOUND_MASK_LINE | SOUND_MASK_CD | \
-+        SOUND_MASK_ALTPCM | SOUND_MASK_IGAIN | SOUND_MASK_LINE1 | SOUND_MASK_VIDEO)
-+
-+#define AC97_SUPPORTED_MASK \
-+        (AC97_STEREO_MASK | SOUND_MASK_BASS | SOUND_MASK_TREBLE | \
-+        SOUND_MASK_SPEAKER | SOUND_MASK_MIC | \
-+        SOUND_MASK_PHONEIN | SOUND_MASK_PHONEOUT)
-+
-+
-+
-+
-+/* this table has default mixer values for all OSS mixers. */
-+typedef struct  {
-+	int mixer;
-+	unsigned int value;
-+} mixer_defaults_t;
-+
-+/*
-+ * Default mixer settings that are set up during boot.
-+ *
-+ * These values are 16 bit numbers in which the upper byte is right volume
-+ * and the lower byte is left volume or mono volume for mono controls.
-+ *
-+ * OSS Range for each of left and right volumes is 0 to 100 (0x00 to 0x64).
-+ *
-+ */
-+static mixer_defaults_t mixer_defaults[SOUND_MIXER_NRDEVICES] =
-+{
-+	/* Outputs */
-+	{SOUND_MIXER_VOLUME,	0x6464},   /* 0 dB */  /* -46.5dB to  0 dB */
-+	{SOUND_MIXER_ALTPCM,	0x6464},   /* 0 dB */  /* -46.5dB to  0 dB */
-+	{SOUND_MIXER_PHONEOUT,	0x6464},   /* 0 dB */  /* -46.5dB to  0 dB */
-+
-+	/* PCM playback gain */
-+	{SOUND_MIXER_PCM,		0x4b4b},   /* 0 dB */  /* -34.5dB to +12dB */
-+
-+	/* Record gain */
-+	{SOUND_MIXER_IGAIN,		0x0000},   /* 0 dB */  /* -34.5dB to +12dB */
-+
-+	/* Inputs */
-+	{SOUND_MIXER_MIC,		0x0000},   /* mute */  /* -34.5dB to +12dB */
-+	{SOUND_MIXER_LINE,		0x4b4b},   /* 0 dB */  /* -34.5dB to +12dB */
-+
-+	/* Inputs that are not connected. */
-+	{SOUND_MIXER_SPEAKER,	0x0000},   /* mute */  /* -45dB   to   0dB */
-+	{SOUND_MIXER_PHONEIN,	0x0000},   /* mute */  /* -34.5dB to +12dB */
-+	{SOUND_MIXER_CD,		0x0000},   /* mute */  /* -34.5dB to +12dB */
-+	{SOUND_MIXER_VIDEO,		0x0000},   /* mute */  /* -34.5dB to +12dB */
-+	{SOUND_MIXER_LINE1,		0x0000},   /* mute */  /* -34.5dB to +12dB */
-+
-+	{-1,0} /* last entry */
-+};
-+
-+/* table to scale scale from OSS mixer value to AC97 mixer register value */
-+typedef struct {
-+	unsigned int offset;
-+	int scale;
-+} ac97_mixer_hw_t;
-+
-+static ac97_mixer_hw_t ac97_hw[SOUND_MIXER_NRDEVICES] =
-+{
-+	[SOUND_MIXER_VOLUME]		=  	{AC97_02_MASTER_VOL,	64},
-+	[SOUND_MIXER_BASS]			=	{0, 0},
-+	[SOUND_MIXER_TREBLE]		=	{0, 0},
-+	[SOUND_MIXER_SYNTH]			=  	{0,	0},
-+	[SOUND_MIXER_PCM]			=  	{AC97_18_PCM_OUT_VOL,	32},
-+	[SOUND_MIXER_SPEAKER]		=  	{AC97_0A_PC_BEEP_VOL,	32},
-+	[SOUND_MIXER_LINE]			=  	{AC97_10_LINE_IN_VOL,	32},
-+	[SOUND_MIXER_MIC]			=  	{AC97_0E_MIC_VOL,		32},
-+	[SOUND_MIXER_CD]			=  	{AC97_12_CD_VOL,		32},
-+	[SOUND_MIXER_IMIX]			=  	{0,	0},
-+	[SOUND_MIXER_ALTPCM]		=  	{AC97_04_HEADPHONE_VOL,	64},
-+	[SOUND_MIXER_RECLEV]		=  	{0,	0},
-+	[SOUND_MIXER_IGAIN]			=  	{AC97_1C_RECORD_GAIN,	16},
-+	[SOUND_MIXER_OGAIN]			=  	{0,	0},
-+	[SOUND_MIXER_LINE1]			=  	{AC97_16_AUX_VOL,		32},
-+	[SOUND_MIXER_LINE2]			=  	{0,	0},
-+	[SOUND_MIXER_LINE3]			=  	{0,	0},
-+	[SOUND_MIXER_DIGITAL1]		=  	{0,	0},
-+	[SOUND_MIXER_DIGITAL2]		=  	{0,	0},
-+	[SOUND_MIXER_DIGITAL3]		=  	{0,	0},
-+	[SOUND_MIXER_PHONEIN]		=  	{AC97_0C_PHONE_VOL,		32},
-+	[SOUND_MIXER_PHONEOUT]		=  	{AC97_06_MONO_VOL,		64},
-+	[SOUND_MIXER_VIDEO]			=  	{AC97_14_VIDEO_VOL,		32},
-+	[SOUND_MIXER_RADIO]			=  	{0,	0},
-+	[SOUND_MIXER_MONITOR]		=  	{0,	0},
-+};
-+
-+
-+/* the following tables allow us to go from OSS <-> ac97 quickly. */
-+enum ac97_recsettings
-+{
-+	AC97_REC_MIC=0,
-+	AC97_REC_CD,
-+	AC97_REC_VIDEO,
-+	AC97_REC_AUX,
-+	AC97_REC_LINE,
-+	AC97_REC_STEREO, /* combination of all enabled outputs..  */
-+	AC97_REC_MONO,	      /*.. or the mono equivalent */
-+	AC97_REC_PHONE
-+};
-+
-+static const unsigned int ac97_rm2oss[] =
-+{
-+	[AC97_REC_MIC] 	 = SOUND_MIXER_MIC,
-+	[AC97_REC_CD] 	 = SOUND_MIXER_CD,
-+	[AC97_REC_VIDEO] = SOUND_MIXER_VIDEO,
-+	[AC97_REC_AUX] 	 = SOUND_MIXER_LINE1,
-+	[AC97_REC_LINE]  = SOUND_MIXER_LINE,
-+	[AC97_REC_STEREO]= SOUND_MIXER_IGAIN,
-+	[AC97_REC_PHONE] = SOUND_MIXER_PHONEIN
-+};
-+
-+/* indexed by bit position */
-+static const unsigned int ac97_oss_rm[] =
-+{
-+	[SOUND_MIXER_MIC] 	= AC97_REC_MIC,
-+	[SOUND_MIXER_CD] 	= AC97_REC_CD,
-+	[SOUND_MIXER_VIDEO] = AC97_REC_VIDEO,
-+	[SOUND_MIXER_LINE1] = AC97_REC_AUX,
-+	[SOUND_MIXER_LINE] 	= AC97_REC_LINE,
-+	[SOUND_MIXER_IGAIN]	= AC97_REC_STEREO,
-+	[SOUND_MIXER_PHONEIN] 	= AC97_REC_PHONE
-+};
-+
-+
-+/*
-+ * ep93xx_write_mixer
-+ *
-+ */
-+static void ep93xx_write_mixer
-+(
-+	int oss_channel,
-+	unsigned int left,
-+	unsigned int right
-+)
-+{
-+	u16 val = 0;
-+	ac97_mixer_hw_t * mh = &ac97_hw[oss_channel];
-+
-+	DPRINTK("ac97_codec: wrote OSS %2d (ac97 0x%02x), "
-+	       "l:%2d, r:%2d:",
-+	       oss_channel, mh->offset, left, right);
-+
-+	if( !mh->scale )
-+	{
-+		printk( "ep93xx-ac97.c: ep93xx_write_mixer - not a valid OSS channel\n");
-+		return;
-+	}
-+
-+	if( AC97_STEREO_MASK & (1 << oss_channel) )
-+	{
-+		/* stereo mixers */
-+		if (left == 0 && right == 0)
-+		{
-+			val = 0x8000;
-+		}
-+		else
-+		{
-+			if (oss_channel == SOUND_MIXER_IGAIN)
-+			{
-+				right = (right * mh->scale) / 100;
-+				left = (left * mh->scale) / 100;
-+				if (right >= mh->scale)
-+					right = mh->scale-1;
-+				if (left >= mh->scale)
-+					left = mh->scale-1;
-+			}
-+			else
-+			{
-+				right = ((100 - right) * mh->scale) / 100;
-+				left = ((100 - left) * mh->scale) / 100;
-+				if (right >= mh->scale)
-+					right = mh->scale-1;
-+				if (left >= mh->scale)
-+					left = mh->scale-1;
-+			}
-+			val = (left << 8) | right;
-+		}
-+	}
-+	else if(left == 0)
-+	{
-+		val = 0x8000;
-+	}
-+	else if( (oss_channel == SOUND_MIXER_SPEAKER) ||
-+			(oss_channel == SOUND_MIXER_PHONEIN) ||
-+			(oss_channel == SOUND_MIXER_PHONEOUT) )
-+	{
-+		left = ((100 - left) * mh->scale) / 100;
-+		if (left >= mh->scale)
-+			left = mh->scale-1;
-+		val = left;
-+	}
-+	else if (oss_channel == SOUND_MIXER_MIC)
-+	{
-+		val = peek( mh->offset) & ~0x801f;
-+		left = ((100 - left) * mh->scale) / 100;
-+		if (left >= mh->scale)
-+			left = mh->scale-1;
-+		val |= left;
-+	}
-+	/*
-+	 * For bass and treble, the low bit is optional.  Masking it
-+	 * lets us avoid the 0xf 'bypass'.
-+	 * Do a read, modify, write as we have two contols in one reg.
-+	 */
-+	else if (oss_channel == SOUND_MIXER_BASS)
-+	{
-+		val = peek( mh->offset) & ~0x0f00;
-+		left = ((100 - left) * mh->scale) / 100;
-+		if (left >= mh->scale)
-+			left = mh->scale-1;
-+		val |= (left << 8) & 0x0e00;
-+	}
-+	else if (oss_channel == SOUND_MIXER_TREBLE)
-+	{
-+		val = peek( mh->offset) & ~0x000f;
-+		left = ((100 - left) * mh->scale) / 100;
-+		if (left >= mh->scale)
-+			left = mh->scale-1;
-+		val |= left & 0x000e;
-+	}
-+
-+	DPRINTK(" 0x%04x", val);
-+
-+	poke( mh->offset, val );
-+
-+#ifdef alsa_ac97_debug
-+	val = peek( mh->offset );
-+	DEBUG(" -> 0x%04x\n", val);
-+#endif
-+
-+}
-+
-+/* a thin wrapper for write_mixer */
-+static void ep93xx_set_mixer
-+(
-+	unsigned int oss_mixer,
-+	unsigned int val
-+)
-+{
-+	unsigned int left,right;
-+
-+	/* cleanse input a little */
-+	right = ((val >> 8)  & 0xff) ;
-+	left = (val  & 0xff) ;
-+
-+	if (right > 100) right = 100;
-+	if (left > 100) left = 100;
-+
-+	/*mixer_state[oss_mixer] = (right << 8) | left;*/
-+	ep93xx_write_mixer( oss_mixer, left, right);
-+}
-+
-+static void ep93xx_init_mixer(void)
-+{
-+	u16 cap;
-+	int i;
-+
-+	/* mixer masks */
-+	codec_supported_mixers 	= AC97_SUPPORTED_MASK;
-+
-+	cap = peek( AC97_00_RESET );
-+	if( !(cap & 0x04) )
-+	{
-+		codec_supported_mixers &= ~(SOUND_MASK_BASS|SOUND_MASK_TREBLE);
-+	}
-+	if( !(cap & 0x10) )
-+	{
-+		codec_supported_mixers &= ~SOUND_MASK_ALTPCM;
-+	}
-+
-+	/*
-+	 * Detect bit resolution of output volume controls by writing to the
-+	 * 6th bit (not unmuting yet)
-+	 */
-+	poke( AC97_02_MASTER_VOL, 0xa020 );
-+	if( peek( AC97_02_MASTER_VOL) != 0xa020 )
-+	{
-+		ac97_hw[SOUND_MIXER_VOLUME].scale = 32;
-+	}
-+
-+	poke( AC97_04_HEADPHONE_VOL, 0xa020 );
-+	if( peek( AC97_04_HEADPHONE_VOL) != 0xa020 )
-+	{
-+		ac97_hw[AC97_04_HEADPHONE_VOL].scale = 32;
-+	}
-+
-+	poke( AC97_06_MONO_VOL, 0x8020 );
-+	if( peek( AC97_06_MONO_VOL) != 0x8020 )
-+	{
-+		ac97_hw[AC97_06_MONO_VOL].scale = 32;
-+	}
-+
-+	/* initialize mixer channel volumes */
-+	for( i = 0;
-+		(i < SOUND_MIXER_NRDEVICES) && (mixer_defaults[i].mixer != -1) ;
-+		i++ )
-+	{
-+		if( !supported_mixer( mixer_defaults[i].mixer) )
-+		{
-+			continue;
-+		}
-+
-+		ep93xx_set_mixer( mixer_defaults[i].mixer, mixer_defaults[i].value);
-+	}
-+
-+}
-+
-+static int ep93xx_set_recsource( int mask )
-+{
-+	unsigned int val;
-+
-+	/* Arg contains a bit for each recording source */
-+	if( mask == 0 )
-+	{
-+		return 0;
-+	}
-+
-+	mask &= AC97_RECORD_MASK;
-+
-+	if( mask == 0 )
-+	{
-+		return -EINVAL;
-+	}
-+
-+	/*
-+	 * May have more than one bit set.  So clear out currently selected
-+	 * record source value first (AC97 supports only 1 input)
-+	 */
-+	val = (1 << ac97_rm2oss[peek( AC97_1A_RECORD_SELECT ) & 0x07]);
-+	if (mask != val)
-+	    mask &= ~val;
-+
-+	val = ffs(mask);
-+	val = ac97_oss_rm[val-1];
-+	val |= val << 8;  /* set both channels */
-+
-+	/*
-+	 *
-+	 */
-+        val = peek( AC97_1A_RECORD_SELECT ) & 0x0707;
-+        if ((val&0x0404)!=0)
-+          val=0x0404;
-+        else if((val&0x0000)!=0)
-+          val=0x0101;
-+
-+
-+	DPRINTK("ac97_codec: setting ac97 recmask to 0x%04x\n", val);
-+
-+	poke( AC97_1A_RECORD_SELECT, val);
-+
-+	return 0;
-+}
-+
-+/*
-+ * ep93xx_init_ac97_codec
-+ *
-+ * Program up the external Ac97 codec.
-+ *
-+ */
-+static void ep93xx_init_ac97_codec( void )
-+{
-+	DPRINTK("ep93xx_init_ac97_codec - enter\n");
-+
-+	ep93xx_setup_src();
-+	ep93xx_set_samplerate( AUDIO_SAMPLE_RATE_DEFAULT, 0 );
-+	ep93xx_set_samplerate( AUDIO_SAMPLE_RATE_DEFAULT, 1 );
-+	ep93xx_init_mixer();
-+
-+	DPRINTK("ep93xx_init_ac97_codec - EXIT\n");
-+
-+}
-+
-+
-+/*
-+ * ep93xx_audio_init
-+ * Audio interface
-+ */
-+static void ep93xx_audio_init(void)
-+{
-+	DPRINTK("ep93xx_audio_init - enter\n");
-+	/*
-+	 * Init the controller, enable the ac-link.
-+	 * Initialize the codec.
-+	 */
-+	ep93xx_init_ac97_controller();
-+	ep93xx_init_ac97_codec();
-+	/*stop the audio loop from the input to the output directly*/
-+	ep93xx_stop_loop();
-+
-+#ifdef alsa_ac97_debug
-+	ep93xx_dump_ac97_regs();
-+#endif
-+	DPRINTK("ep93xx_audio_init - EXIT\n");
-+}
-+
-+/*====================================================================================*/
-+
-+
-+static void print_audio_format( long format )
-+{
-+    switch( format ){
-+	case SNDRV_PCM_FORMAT_S8:
-+		DPRINTK( "AFMT_S8\n" );
-+		break;
-+
-+	case SNDRV_PCM_FORMAT_U8:
-+		DPRINTK( "AFMT_U8\n" );
-+		break;
-+
-+	case SNDRV_PCM_FORMAT_S16_LE:
-+		DPRINTK( "AFMT_S16_LE\n" );
-+		break;
-+
-+	case SNDRV_PCM_FORMAT_S16_BE:
-+		DPRINTK( "AFMT_S16_BE\n" );
-+		break;
-+
-+	case SNDRV_PCM_FORMAT_U16_LE:
-+		DPRINTK( "AFMT_U16_LE\n" );
-+		break;
-+	case SNDRV_PCM_FORMAT_U16_BE:
-+		DPRINTK( "AFMT_U16_BE\n" );
-+		break;
-+
-+	case SNDRV_PCM_FORMAT_S24_LE:
-+		DPRINTK( "AFMT_S24_LE\n" );
-+		break;
-+
-+	case SNDRV_PCM_FORMAT_S24_BE:
-+		DPRINTK( "AFMT_S24_BE\n" );
-+		break;
-+
-+	case SNDRV_PCM_FORMAT_U24_LE:
-+		DPRINTK( "AFMT_U24_LE\n" );
-+		break;
-+
-+	case SNDRV_PCM_FORMAT_U24_BE:
-+		DPRINTK( "AFMT_U24_BE\n" );
-+		break;
-+	case SNDRV_PCM_FORMAT_S32_LE:
-+		DPRINTK( "AFMT_S24_LE\n" );
-+		break;
-+
-+	case SNDRV_PCM_FORMAT_S32_BE:
-+		DPRINTK( "AFMT_S24_BE\n" );
-+		break;
-+
-+	case SNDRV_PCM_FORMAT_U32_LE:
-+		DPRINTK( "AFMT_U24_LE\n" );
-+		break;
-+
-+	case SNDRV_PCM_FORMAT_U32_BE:
-+		DPRINTK( "AFMT_U24_BE\n" );
-+		break;
-+	default:
-+		DPRINTK( "ep93xx_i2s_Unsupported Audio Format\n" );
-+		break;
-+    }
-+}
-+
-+static void audio_set_format( audio_stream_t * s, long val )
-+{
-+    DPRINTK( "ep93xx_i2s_audio_set_format enter.  Format requested (%d) %d ",
-+				(int)val,SNDRV_PCM_FORMAT_S16_LE);
-+    print_audio_format( val );
-+
-+    switch( val ){
-+	case SNDRV_PCM_FORMAT_S8:
-+		s->audio_format = SNDRV_PCM_FORMAT_S8;
-+		s->audio_stream_bitwidth = 8;
-+		break;
-+
-+	case SNDRV_PCM_FORMAT_U8:
-+		s->audio_format = SNDRV_PCM_FORMAT_U8;
-+		s->audio_stream_bitwidth = 8;
-+		break;
-+
-+	case SNDRV_PCM_FORMAT_S16_LE:
-+	case SNDRV_PCM_FORMAT_S16_BE:
-+		s->audio_format = SNDRV_PCM_FORMAT_S16_LE;
-+		s->audio_stream_bitwidth = 16;
-+		break;
-+
-+	case SNDRV_PCM_FORMAT_U16_LE:
-+	case SNDRV_PCM_FORMAT_U16_BE:
-+		s->audio_format = SNDRV_PCM_FORMAT_U16_LE;
-+		s->audio_stream_bitwidth = 16;
-+		break;
-+
-+	case SNDRV_PCM_FORMAT_S24_LE:
-+	case SNDRV_PCM_FORMAT_S24_BE:
-+		s->audio_format = SNDRV_PCM_FORMAT_S24_LE;
-+		s->audio_stream_bitwidth = 24;
-+		break;
-+
-+	case SNDRV_PCM_FORMAT_U24_LE:
-+	case SNDRV_PCM_FORMAT_U24_BE:
-+        	s->audio_format = SNDRV_PCM_FORMAT_U24_LE;
-+		s->audio_stream_bitwidth = 24;
-+		break;
-+
-+	case SNDRV_PCM_FORMAT_U32_LE:
-+	case SNDRV_PCM_FORMAT_U32_BE:
-+	case SNDRV_PCM_FORMAT_S32_LE:
-+	case SNDRV_PCM_FORMAT_S32_BE:
-+        	s->audio_format = SNDRV_PCM_FORMAT_S32_LE;
-+		s->audio_stream_bitwidth = 32;
-+		break;
-+	default:
-+		DPRINTK( "ep93xx_i2s_Unsupported Audio Format\n" );
-+		break;
-+    }
-+
-+    DPRINTK( "ep93xx_i2s_audio_set_format EXIT format set to be (%d) ", (int)s->audio_format );
-+    print_audio_format( (long)s->audio_format );
-+}
-+
-+static __inline__ unsigned long copy_to_user_S24_LE
-+(
-+    audio_stream_t *stream,
-+    const char *to,
-+    unsigned long to_count
-+)
-+{
-+    int *dma_buffer_0 = (int *)stream->hwbuf[0];
-+    int *dma_buffer_1 = (int *)stream->hwbuf[1];
-+    int *dma_buffer_2 = (int *)stream->hwbuf[2];
-+
-+    int total_to_count = to_count;
-+    int *user_ptr = (int *)to;	/* 32 bit user buffer */
-+    int count;
-+
-+    count = 8 * stream->dma_num_channels;
-+
-+    while (to_count > 0){
-+
-+	__put_user( (int)( *dma_buffer_0++ ), user_ptr++ );
-+	__put_user( (int)( *dma_buffer_0++ ), user_ptr++ );
-+
-+        if(stream->audio_channels_flag & CHANNEL_REAR ){
-+	    __put_user( (int)( *dma_buffer_1++ ), user_ptr++ );
-+	    __put_user( (int)( *dma_buffer_1++ ), user_ptr++ );
-+	}
-+
-+        if(stream->audio_channels_flag & CHANNEL_CENTER_LFE ){
-+	    __put_user( (int)( *dma_buffer_2++ ), user_ptr++ );
-+	    __put_user( (int)( *dma_buffer_2++ ), user_ptr++ );
-+	}
-+	to_count -= count;
-+    }
-+    return total_to_count;
-+}
-+
-+static __inline__ unsigned long copy_to_user_U24_LE
-+(
-+    audio_stream_t *stream,
-+    const char *to,
-+    unsigned long to_count
-+)
-+{
-+    int *dma_buffer_0 = (int *)stream->hwbuf[0];
-+    int *dma_buffer_1 = (int *)stream->hwbuf[1];
-+    int *dma_buffer_2 = (int *)stream->hwbuf[2];
-+
-+    int total_to_count = to_count;
-+    unsigned int * user_ptr = (unsigned int *)to;	/* 32 bit user buffer */
-+    int count;
-+
-+    count = 8 * stream->dma_num_channels;
-+
-+    while (to_count > 0){
-+	__put_user( ((unsigned int)( *dma_buffer_0++ )) ^ 0x8000, user_ptr++ );
-+	__put_user( ((unsigned int)( *dma_buffer_0++ )) ^ 0x8000, user_ptr++ );
-+
-+        if(stream->audio_channels_flag & CHANNEL_REAR ){
-+	    __put_user( ((unsigned int)( *dma_buffer_1++ )) ^ 0x8000, user_ptr++ );
-+	    __put_user( ((unsigned int)( *dma_buffer_1++ )) ^ 0x8000, user_ptr++ );
-+	}
-+
-+        if(stream->audio_channels_flag & CHANNEL_CENTER_LFE ){
-+	    __put_user( ((unsigned int)( *dma_buffer_2++ )) ^ 0x8000, user_ptr++ );
-+	    __put_user( ((unsigned int)( *dma_buffer_2++ )) ^ 0x8000, user_ptr++ );
-+	}
-+	to_count -= count;
-+    }
-+    return total_to_count;
-+}
-+
-+static __inline__ unsigned long copy_to_user_S16_LE
-+(
-+    audio_stream_t *stream,
-+    const char *to,
-+    unsigned long to_count
-+)
-+{
-+    int *dma_buffer_0 = (int *)stream->hwbuf[0];
-+    int *dma_buffer_1 = (int *)stream->hwbuf[1];
-+    int *dma_buffer_2 = (int *)stream->hwbuf[2];
-+    int total_to_count = to_count;
-+    short * user_ptr = (short *)to;	/* 16 bit user buffer */
-+    int count;
-+
-+    count = 4 * stream->dma_num_channels;
-+
-+    while (to_count > 0){
-+
-+	__put_user( (short)( *dma_buffer_0++ ), user_ptr++ );
-+	__put_user( (short)( *dma_buffer_0++ ), user_ptr++ );
-+
-+        if( stream->audio_channels_flag & CHANNEL_REAR ){
-+	    __put_user( (short)( *dma_buffer_1++ ), user_ptr++ );
-+	    __put_user( (short)( *dma_buffer_1++ ), user_ptr++ );
-+	}
-+
-+        if( stream->audio_channels_flag  & CHANNEL_CENTER_LFE ){
-+	    __put_user( (short)( *dma_buffer_2++ ), user_ptr++ );
-+	    __put_user( (short)( *dma_buffer_2++ ), user_ptr++ );
-+	}
-+	to_count -= count;
-+    }
-+    return total_to_count;
-+}
-+
-+static __inline__ unsigned long copy_to_user_U16_LE
-+(
-+    audio_stream_t *stream,
-+    const char *to,
-+    unsigned long to_count
-+)
-+{
-+    int *dma_buffer_0 = (int *)stream->hwbuf[0];
-+    int *dma_buffer_1 = (int *)stream->hwbuf[1];
-+    int *dma_buffer_2 = (int *)stream->hwbuf[2];
-+    int count;
-+    int total_to_count = to_count;
-+    short * user_ptr = (short *)to;	/* 16 bit user buffer */
-+
-+    count = 4 * stream->dma_num_channels;
-+
-+    while (to_count > 0){
-+
-+	__put_user( ((unsigned short)( *dma_buffer_0++ )) ^ 0x8000, user_ptr++ );
-+	__put_user( ((unsigned short)( *dma_buffer_0++ )) ^ 0x8000, user_ptr++ );
-+
-+        if(stream->audio_channels_flag & CHANNEL_REAR ){
-+	    __put_user( ((unsigned short)( *dma_buffer_1++ )) ^ 0x8000, user_ptr++ );
-+	    __put_user( ((unsigned short)( *dma_buffer_1++ )) ^ 0x8000, user_ptr++ );
-+	}
-+
-+        if(stream->audio_channels_flag & CHANNEL_CENTER_LFE ){
-+	    __put_user( ((unsigned short)( *dma_buffer_2++ )) ^ 0x8000, user_ptr++ );
-+	    __put_user( ((unsigned short)( *dma_buffer_2++ )) ^ 0x8000, user_ptr++ );
-+	}
-+	to_count -= count;
-+    }
-+    return total_to_count;
-+}
-+
-+static __inline__ unsigned long copy_to_user_S8
-+(
-+    audio_stream_t *stream,
-+    const char *to,
-+    unsigned long to_count
-+)
-+{
-+    char *dma_buffer_0 = (char *)stream->hwbuf[0];
-+    char *dma_buffer_1 = (char *)stream->hwbuf[1];
-+    char *dma_buffer_2 = (char *)stream->hwbuf[2];
-+    int count;
-+    int total_to_count = to_count;
-+    char * user_ptr = (char *)to;  /*  8 bit user buffer */
-+
-+    count = 2 * stream->dma_num_channels;
-+
-+    dma_buffer_0++;
-+    dma_buffer_1++;
-+    dma_buffer_2++;
-+
-+    while (to_count > 0){
-+
-+	__put_user( (char)( *dma_buffer_0 ), user_ptr++ );
-+	dma_buffer_0 += 4;
-+	__put_user( (char)( *dma_buffer_0 ), user_ptr++ );
-+	dma_buffer_0 += 4;
-+
-+        if(stream->audio_channels_flag & CHANNEL_REAR ){
-+	    __put_user( (char)( *dma_buffer_1 ), user_ptr++ );
-+            dma_buffer_1 += 4;
-+	    __put_user( (char)( *dma_buffer_1 ), user_ptr++ );
-+	    dma_buffer_1 += 4;
-+	}
-+
-+        if(stream->audio_channels_flag & CHANNEL_CENTER_LFE ){
-+	    __put_user( (char)( *dma_buffer_2 ), user_ptr++ );
-+	    dma_buffer_2 += 4;
-+	    __put_user( (char)( *dma_buffer_2 ), user_ptr++ );
-+	    dma_buffer_2 += 4;
-+	}
-+	to_count -= count;
-+    }
-+    return total_to_count;
-+}
-+
-+static __inline__ unsigned long copy_to_user_U8
-+(
-+    audio_stream_t *stream,
-+    const char *to,
-+    unsigned long to_count
-+)
-+{
-+    char *dma_buffer_0 = (char *)stream->hwbuf[0];
-+    char *dma_buffer_1 = (char *)stream->hwbuf[1];
-+    char *dma_buffer_2 = (char *)stream->hwbuf[2];
-+    int count;
-+    int total_to_count = to_count;
-+    char * user_ptr = (char *)to;  /*  8 bit user buffer */
-+
-+    count = 2 * stream->dma_num_channels;
-+
-+    dma_buffer_0++;
-+    dma_buffer_1++;
-+    dma_buffer_2++;
-+
-+    while (to_count > 0){
-+
-+	__put_user( (char)( *dma_buffer_0 ) ^ 0x80, user_ptr++ );
-+	dma_buffer_0 += 4;
-+	__put_user( (char)( *dma_buffer_0 ) ^ 0x80, user_ptr++ );
-+	dma_buffer_0 += 4;
-+
-+        if(stream->audio_channels_flag & CHANNEL_REAR ){
-+	    __put_user( (char)( *dma_buffer_1 ) ^ 0x80, user_ptr++ );
-+	    dma_buffer_1 += 4;
-+	    __put_user( (char)( *dma_buffer_1 ) ^ 0x80, user_ptr++ );
-+	    dma_buffer_1 += 4;
-+	}
-+
-+        if(stream->audio_channels_flag & CHANNEL_CENTER_LFE ){
-+	    __put_user( (char)( *dma_buffer_2 ) ^ 0x80, user_ptr++ );
-+	    dma_buffer_2 += 4;
-+	    __put_user( (char)( *dma_buffer_2 ) ^ 0x80, user_ptr++ );
-+	    dma_buffer_2 += 4;
-+	}
-+	to_count -= count;
-+    }
-+    return total_to_count;
-+}
-+
-+
-+
-+
-+static __inline__ unsigned long copy_to_user_S16_LE_CM
-+(
-+    audio_stream_t *stream,
-+    const char *to,
-+    unsigned long to_count
-+)
-+{
-+    short *dma_buffer_0 = (short *)stream->hwbuf[0];
-+    int *dma_buffer_1 = (int *)stream->hwbuf[1];
-+    int *dma_buffer_2 = (int *)stream->hwbuf[2];
-+    int total_to_count = to_count;
-+    short * user_ptr = (short *)to;	/* 16 bit user buffer */
-+    int count;
-+
-+
-+    count = 4 * stream->dma_num_channels;
-+
-+    while (to_count > 0){
-+    	if(stream->audio_num_channels == 2){
-+		__put_user( (short)( *dma_buffer_0++ ), user_ptr++ );
-+		__put_user( (short)( *dma_buffer_0++ ), user_ptr++ );
-+		to_count -= count;
-+	}
-+	else{
-+		dma_buffer_0++;
-+		__put_user( (short)( *dma_buffer_0++ ), user_ptr++ );
-+		to_count -= 2;
-+	}
-+
-+        if( stream->audio_channels_flag & CHANNEL_REAR ){
-+	    __put_user( (short)( *dma_buffer_1++ ), user_ptr++ );
-+	    __put_user( (short)( *dma_buffer_1++ ), user_ptr++ );
-+	}
-+
-+        if( stream->audio_channels_flag  & CHANNEL_CENTER_LFE ){
-+	    __put_user( (short)( *dma_buffer_2++ ), user_ptr++ );
-+	    __put_user( (short)( *dma_buffer_2++ ), user_ptr++ );
-+	}
-+	//to_count -= count;
-+    }
-+    return total_to_count;
-+}
-+
-+static __inline__ unsigned long copy_to_user_U16_LE_CM
-+(
-+    audio_stream_t *stream,
-+    const char *to,
-+    unsigned long to_count
-+)
-+{
-+    unsigned short *dma_buffer_0 = (unsigned short *)stream->hwbuf[0];
-+    int *dma_buffer_1 = (int *)stream->hwbuf[1];
-+    int *dma_buffer_2 = (int *)stream->hwbuf[2];
-+    int count;
-+    int total_to_count = to_count;
-+    unsigned short * user_ptr = (unsigned short *)to;	/* 16 bit user buffer */
-+
-+    count = 4 * stream->dma_num_channels;
-+
-+    while (to_count > 0){
-+
-+	if(stream->audio_num_channels == 2){
-+		__put_user( ((unsigned short)( *dma_buffer_0++ )) ^ 0x8000, user_ptr++ );
-+		__put_user( ((unsigned short)( *dma_buffer_0++ )) ^ 0x8000, user_ptr++ );
-+		to_count -= count;
-+	}
-+	else{
-+		dma_buffer_0++;
-+		__put_user( ((unsigned short)( *dma_buffer_0++ )) ^ 0x8000, user_ptr++ );
-+		to_count -= 2;
-+	}
-+
-+        if(stream->audio_channels_flag & CHANNEL_REAR ){
-+	    __put_user( ((unsigned short)( *dma_buffer_1++ )) ^ 0x8000, user_ptr++ );
-+	    __put_user( ((unsigned short)( *dma_buffer_1++ )) ^ 0x8000, user_ptr++ );
-+	}
-+
-+        if(stream->audio_channels_flag & CHANNEL_CENTER_LFE ){
-+	    __put_user( ((unsigned short)( *dma_buffer_2++ )) ^ 0x8000, user_ptr++ );
-+	    __put_user( ((unsigned short)( *dma_buffer_2++ )) ^ 0x8000, user_ptr++ );
-+	}
-+	//to_count -= count;
-+    }
-+    return total_to_count;
-+}
-+
-+static __inline__ unsigned long copy_to_user_S8_CM
-+(
-+    audio_stream_t *stream,
-+    const char *to,
-+    unsigned long to_count
-+)
-+{
-+    unsigned short *dma_buffer_0 = (unsigned short *)stream->hwbuf[0];
-+    char *dma_buffer_1 = (char *)stream->hwbuf[1];
-+    char *dma_buffer_2 = (char *)stream->hwbuf[2];
-+    int count;
-+    int total_to_count = to_count;
-+    char * user_ptr = (char *)to;  /*  8 bit user buffer */
-+
-+    count = 2 * stream->dma_num_channels;
-+
-+    dma_buffer_0++;
-+    dma_buffer_1++;
-+    dma_buffer_2++;
-+
-+    while (to_count > 0){
-+	if(stream->audio_num_channels == 2){
-+		__put_user( (char)( *dma_buffer_0++ >> 8), user_ptr++ );
-+		//dma_buffer_0 += 4;
-+		__put_user( (char)( *dma_buffer_0++ >> 8), user_ptr++ );
-+		//dma_buffer_0 += 4;
-+		to_count -= count;
-+	}
-+	else{
-+		dma_buffer_0++ ;
-+		__put_user( (char)( *dma_buffer_0++ >> 8), user_ptr++ );
-+
-+		to_count -= 1;
-+	}
-+        if(stream->audio_channels_flag & CHANNEL_REAR ){
-+	    __put_user( (char)( *dma_buffer_1 ), user_ptr++ );
-+            dma_buffer_1 += 4;
-+	    __put_user( (char)( *dma_buffer_1 ), user_ptr++ );
-+	    dma_buffer_1 += 4;
-+	}
-+
-+        if(stream->audio_channels_flag & CHANNEL_CENTER_LFE ){
-+	    __put_user( (char)( *dma_buffer_2 ), user_ptr++ );
-+	    dma_buffer_2 += 4;
-+	    __put_user( (char)( *dma_buffer_2 ), user_ptr++ );
-+	    dma_buffer_2 += 4;
-+	}
-+	//to_count -= count;
-+    }
-+    return total_to_count;
-+}
-+
-+static __inline__ unsigned long copy_to_user_U8_CM
-+(
-+    audio_stream_t *stream,
-+    const char *to,
-+    unsigned long to_count
-+)
-+{
-+    unsigned short *dma_buffer_0 = (unsigned short *)stream->hwbuf[0];
-+    char *dma_buffer_1 = (char *)stream->hwbuf[1];
-+    char *dma_buffer_2 = (char *)stream->hwbuf[2];
-+    int count;
-+    int total_to_count = to_count;
-+    char * user_ptr = (char *)to;  /*  8 bit user buffer */
-+
-+    count = 2 * stream->dma_num_channels;
-+
-+    dma_buffer_0++;
-+    dma_buffer_1++;
-+    dma_buffer_2++;
-+
-+    while (to_count > 0){
-+	if(stream->audio_num_channels == 2){
-+		__put_user( (char)( *dma_buffer_0++  >>8) ^ 0x80, user_ptr++ );
-+		//dma_buffer_0 += 4;
-+		__put_user( (char)( *dma_buffer_0++  >>8) ^ 0x80, user_ptr++ );
-+		//dma_buffer_0 += 4;
-+		to_count -= count;
-+	}
-+	else{
-+		dma_buffer_0++;
-+		__put_user( (char)( *dma_buffer_0++  >>8) ^ 0x80, user_ptr++ );
-+		//dma_buffer_0 += 4;
-+		to_count--;
-+	}
-+
-+        if(stream->audio_channels_flag & CHANNEL_REAR ){
-+	    __put_user( (char)( *dma_buffer_1 ) ^ 0x80, user_ptr++ );
-+	    dma_buffer_1 += 4;
-+	    __put_user( (char)( *dma_buffer_1 ) ^ 0x80, user_ptr++ );
-+	    dma_buffer_1 += 4;
-+	}
-+
-+        if(stream->audio_channels_flag & CHANNEL_CENTER_LFE ){
-+	    __put_user( (char)( *dma_buffer_2 ) ^ 0x80, user_ptr++ );
-+	    dma_buffer_2 += 4;
-+	    __put_user( (char)( *dma_buffer_2 ) ^ 0x80, user_ptr++ );
-+	    dma_buffer_2 += 4;
-+	}
-+	//to_count -= count;
-+    }
-+    return total_to_count;
-+}
-+
-+static __inline__ unsigned long copy_to_user_U32
-+(
-+    audio_stream_t *stream,
-+    const char *to,
-+    unsigned long to_count
-+)
-+{
-+    char *dma_buffer_0 = (char *)stream->hwbuf[0];
-+
-+    if(__copy_to_user( (char *)to, dma_buffer_0, to_count))
-+    {
-+	return -EFAULT;
-+    }
-+    return to_count;
-+}
-+
-+static __inline__ int copy_to_user_with_conversion
-+(
-+    audio_stream_t *stream,
-+    const char *to,
-+    int toCount,
-+    int bCompactMode
-+)
-+{
-+    int ret = 0;
-+
-+    if( toCount == 0 ){
-+	DPRINTK("ep93xx_i2s_copy_to_user_with_conversion - nothing to copy!\n");
-+    }
-+
-+    if( bCompactMode == 1 ){
-+
-+        switch( stream->audio_format ){
-+
-+	case SNDRV_PCM_FORMAT_S8:
-+		ret = copy_to_user_S8_CM( stream, to, toCount );
-+		break;
-+
-+	case SNDRV_PCM_FORMAT_U8:
-+		ret = copy_to_user_U8_CM( stream, to, toCount );
-+		break;
-+
-+	case SNDRV_PCM_FORMAT_S16_LE:
-+		ret = copy_to_user_S16_LE_CM( stream, to, toCount );
-+		break;
-+
-+	case SNDRV_PCM_FORMAT_U16_LE:
-+		ret = copy_to_user_U16_LE_CM( stream, to, toCount );
-+		break;
-+
-+	case SNDRV_PCM_FORMAT_S24_LE:
-+		//ret = copy_to_user_S24_LE( stream, to, toCount );
-+		//break;
-+
-+	case SNDRV_PCM_FORMAT_U24_LE:
-+		//ret = copy_to_user_U24_LE( stream, to, toCount );
-+		//break;
-+
-+	case SNDRV_PCM_FORMAT_S32_LE:
-+        default:
-+                DPRINTK( "ep93xx_i2s copy to user unsupported audio format %x\n",stream->audio_format );
-+		break;
-+        }
-+
-+    }
-+    else{
-+
-+        switch( stream->audio_format ){
-+
-+	case SNDRV_PCM_FORMAT_S8:
-+		ret = copy_to_user_S8( stream, to, toCount );
-+		break;
-+
-+	case SNDRV_PCM_FORMAT_U8:
-+		ret = copy_to_user_U8( stream, to, toCount );
-+		break;
-+
-+	case SNDRV_PCM_FORMAT_S16_LE:
-+		ret = copy_to_user_S16_LE( stream, to, toCount );
-+		break;
-+
-+	case SNDRV_PCM_FORMAT_U16_LE:
-+		ret = copy_to_user_U16_LE( stream, to, toCount );
-+		break;
-+
-+	case SNDRV_PCM_FORMAT_S24_LE:
-+		//ret = copy_to_user_S24_LE( stream, to, toCount );
-+		//break;
-+
-+	case SNDRV_PCM_FORMAT_U24_LE:
-+		//ret = copy_to_user_U24_LE( stream, to, toCount );
-+		//break;
-+		DPRINTK( "ep93xx_i2s copy to user unsupported audio format %x\n",stream->audio_format );
-+		break;
-+
-+	case SNDRV_PCM_FORMAT_S32_LE:
-+
-+		//__copy_to_user( (char *)to, from, toCount);
-+		ret = copy_to_user_U32( stream, to, toCount );
-+		break;
-+        default:
-+                DPRINTK( "ep93xx_i2s copy to user unsupported audio format\n" );
-+		break;
-+        }
-+
-+    }
-+    return ret;
-+}
-+
-+static __inline__ int copy_from_user_S24_LE
-+(
-+    audio_stream_t *stream,
-+    const char *from,
-+    int toCount
-+)
-+{
-+    int *dma_buffer_0 = (int *)stream->hwbuf[0];
-+    int *dma_buffer_1 = (int *)stream->hwbuf[1];
-+    int *dma_buffer_2 = (int *)stream->hwbuf[2];
-+    int count;
-+
-+    unsigned int * user_buffer = (unsigned int *)from;
-+    unsigned int data;
-+
-+    int toCount0 = toCount;
-+    count = 8 * stream->dma_num_channels;
-+
-+    while (toCount > 0){
-+
-+	__get_user(data, user_buffer++);
-+	*dma_buffer_0++ = (unsigned int)data;
-+	__get_user(data, user_buffer++);
-+	*dma_buffer_0++ = (unsigned int)data;
-+
-+        if(stream->audio_channels_flag & CHANNEL_REAR ){
-+	    __get_user(data, user_buffer++);
-+	    *dma_buffer_1++ = (unsigned int)data;
-+	    __get_user(data, user_buffer++);
-+	    *dma_buffer_1++ = (unsigned int)data;
-+	}
-+
-+        if(stream->audio_channels_flag & CHANNEL_CENTER_LFE ){
-+	    __get_user(data, user_buffer++);
-+	    *dma_buffer_2++ = (unsigned int)data;
-+	    __get_user(data, user_buffer++);
-+	    *dma_buffer_2++ = (unsigned int)data;
-+        }
-+	toCount -= count;
-+    }
-+    return toCount0 / 2;
-+}
-+
-+static __inline__ int copy_from_user_U24_LE
-+(
-+    audio_stream_t *stream,
-+    const char *from,
-+    int toCount
-+)
-+{
-+    int *dma_buffer_0 = (int *)stream->hwbuf[0];
-+    int *dma_buffer_1 = (int *)stream->hwbuf[1];
-+    int *dma_buffer_2 = (int *)stream->hwbuf[2];
-+    int count;
-+    unsigned int * user_buffer = (unsigned int *)from;
-+    unsigned int data;
-+
-+    int toCount0 = toCount;
-+    count = 8 * stream->dma_num_channels;
-+
-+    while (toCount > 0){
-+
-+	__get_user(data, user_buffer++);
-+	*dma_buffer_0++ = ((unsigned int)data ^ 0x8000);
-+	__get_user(data, user_buffer++);
-+	*dma_buffer_0++ = ((unsigned int)data ^ 0x8000);
-+
-+        if(stream->audio_channels_flag & CHANNEL_REAR ){
-+	    __get_user(data, user_buffer++);
-+	    *dma_buffer_1++ = ((unsigned int)data ^ 0x8000);
-+	    __get_user(data, user_buffer++);
-+	    *dma_buffer_1++ = ((unsigned int)data ^ 0x8000);
-+	}
-+
-+        if(stream->audio_channels_flag & CHANNEL_CENTER_LFE ){
-+	    __get_user(data, user_buffer++);
-+	    *dma_buffer_2++ = ((unsigned int)data ^ 0x8000);
-+	    __get_user(data, user_buffer++);
-+	    *dma_buffer_2++ = ((unsigned int)data ^ 0x8000);
-+	}
-+	toCount -= count;
-+    }
-+    return toCount0 / 2;
-+}
-+
-+static __inline__ int copy_from_user_S16_LE
-+(
-+	audio_stream_t *stream,
-+	const char *from,
-+	int toCount
-+)
-+{
-+    int *dma_buffer_0 = (int *)stream->hwbuf[0];
-+    int *dma_buffer_1 = (int *)stream->hwbuf[1];
-+    int *dma_buffer_2 = (int *)stream->hwbuf[2];
-+    unsigned short *user_buffer = (unsigned short *)from;
-+    unsigned short data;
-+
-+    int toCount0 = toCount;
-+    int count;
-+    count = 8 * stream->dma_num_channels;
-+
-+    while (toCount > 0){
-+
-+	__get_user(data, user_buffer++);
-+	*dma_buffer_0++ = data;
-+	if(stream->audio_num_channels == 2){
-+	    __get_user(data, user_buffer++);
-+	}
-+	*dma_buffer_0++ = data;
-+
-+        if(stream->audio_channels_flag & CHANNEL_REAR ){
-+    	    __get_user(data, user_buffer++);
-+	    *dma_buffer_1++ = data;
-+    	    __get_user(data, user_buffer++);
-+	    *dma_buffer_1++ = data;
-+	}
-+
-+        if(stream->audio_channels_flag & CHANNEL_CENTER_LFE ){
-+	    __get_user(data, user_buffer++);
-+	    *dma_buffer_2++ = data;
-+	    __get_user(data, user_buffer++);
-+	    *dma_buffer_2++ = data;
-+	}
-+	toCount -= count;
-+    }
-+
-+    if(stream->audio_num_channels == 1){
-+    	return toCount0 / 4;
-+    }
-+    return toCount0 / 2;
-+}
-+
-+static __inline__ int copy_from_user_U16_LE
-+(
-+    audio_stream_t *stream,
-+    const char *from,
-+    int toCount
-+)
-+{
-+    int *dma_buffer_0 = (int *)stream->hwbuf[0];
-+    int *dma_buffer_1 = (int *)stream->hwbuf[1];
-+    int *dma_buffer_2 = (int *)stream->hwbuf[2];
-+    int count;
-+    unsigned short * user_buffer = (unsigned short *)from;
-+    unsigned short data;
-+
-+    int toCount0 = toCount;
-+    count = 8 * stream->dma_num_channels;
-+
-+    while (toCount > 0){
-+
-+	__get_user(data, user_buffer++);
-+	*dma_buffer_0++ = ((unsigned int)data ^ 0x8000);
-+	if(stream->audio_num_channels == 2){
-+	    __get_user(data, user_buffer++);
-+	}
-+	*dma_buffer_0++ = ((unsigned int)data ^ 0x8000);
-+
-+        if(stream->audio_channels_flag & CHANNEL_REAR ){
-+	    __get_user(data, user_buffer++);
-+	    *dma_buffer_1++ = ((unsigned int)data ^ 0x8000);
-+    	    __get_user(data, user_buffer++);
-+            *dma_buffer_1++ = ((unsigned int)data ^ 0x8000);
-+	}
-+
-+        if(stream->audio_channels_flag & CHANNEL_CENTER_LFE ){
-+	    __get_user(data, user_buffer++);
-+	    *dma_buffer_2++ = ((unsigned int)data ^ 0x8000);
-+	    __get_user(data, user_buffer++);
-+    	    *dma_buffer_2++ = ((unsigned int)data ^ 0x8000);
-+	}
-+	toCount -= count;
-+    }
-+
-+    if(stream->audio_num_channels == 1){
-+        return toCount0 / 4;
-+    }
-+    return toCount0 / 2;
-+}
-+
-+static __inline__ int copy_from_user_S8
-+(
-+    audio_stream_t *stream,
-+    const char *from,
-+    int toCount
-+)
-+{
-+    char *dma_buffer_0 = (char *)stream->hwbuf[0];
-+    char *dma_buffer_1 = (char *)stream->hwbuf[1];
-+    char *dma_buffer_2 = (char *)stream->hwbuf[2];
-+    int count;
-+    unsigned char * user_buffer = (unsigned char *)from;
-+    unsigned char data;
-+
-+    int toCount0 = toCount;
-+    count = 8 * stream->dma_num_channels;
-+
-+    dma_buffer_0++;
-+    dma_buffer_1++;
-+    dma_buffer_2++;
-+
-+    while (toCount > 0){
-+	__get_user(data, user_buffer++);
-+	*dma_buffer_0 = data;
-+	dma_buffer_0 += 4;
-+	if(stream->audio_num_channels == 2){
-+	    __get_user(data, user_buffer++);
-+	}
-+	*dma_buffer_0 = data;
-+	dma_buffer_0 += 4;
-+
-+        if(stream->audio_channels_flag & CHANNEL_REAR ){
-+	    __get_user(data, user_buffer++);
-+	    *dma_buffer_1 = data;
-+            dma_buffer_1 += 4;
-+	    __get_user(data, user_buffer++);
-+            *dma_buffer_1 = data;
-+	    dma_buffer_1 += 4;
-+	}
-+
-+        if(stream->audio_channels_flag & CHANNEL_CENTER_LFE ){
-+	    __get_user(data, user_buffer++);
-+	    *dma_buffer_2 = data;
-+	    dma_buffer_2 += 4;
-+	    __get_user(data, user_buffer++);
-+    	    *dma_buffer_2 = data;
-+            dma_buffer_2 += 4;
-+	}
-+	toCount -= count;
-+    }
-+
-+    if(stream->audio_num_channels == 1){
-+    	return toCount0 / 8;
-+    }
-+    return toCount0 / 4;
-+}
-+
-+static __inline__ int copy_from_user_U8
-+(
-+    audio_stream_t *stream,
-+    const char *from,
-+    int toCount
-+)
-+{
-+    char *dma_buffer_0 = (char *)stream->hwbuf[0];
-+    char *dma_buffer_1 = (char *)stream->hwbuf[1];
-+    char *dma_buffer_2 = (char *)stream->hwbuf[2];
-+    int count;
-+    unsigned char *user_buffer = (unsigned char *)from;
-+    unsigned char data;
-+
-+    int toCount0 = toCount;
-+    count = 8 * stream->dma_num_channels;
-+
-+    dma_buffer_0 ++;
-+    dma_buffer_1 ++;
-+    dma_buffer_2 ++;
-+
-+    while (toCount > 0){
-+
-+	__get_user(data, user_buffer++);
-+	*dma_buffer_0 = ((unsigned char)data ^ 0x80);
-+	dma_buffer_0 += 4;
-+	if(stream->audio_num_channels == 2){
-+	    __get_user(data, user_buffer++);
-+	}
-+	*dma_buffer_0 = ((unsigned char)data ^ 0x80);
-+	dma_buffer_0 += 4;
-+
-+        if(stream->audio_channels_flag & CHANNEL_REAR ){
-+	    __get_user(data, user_buffer++);
-+	    *dma_buffer_1 = ((unsigned char)data ^ 0x80);
-+            dma_buffer_1 += 4;
-+	    __get_user(data, user_buffer++);
-+            *dma_buffer_1 = ((unsigned char)data ^ 0x80);
-+            dma_buffer_1 += 4;
-+	}
-+
-+        if(stream->audio_channels_flag & CHANNEL_CENTER_LFE ){
-+	    __get_user(data, user_buffer++);
-+	    *dma_buffer_2 = ((unsigned char)data ^ 0x80);
-+    	    dma_buffer_2 += 4;
-+	    __get_user(data, user_buffer++);
-+    	    *dma_buffer_2 = ((unsigned char)data ^ 0x80);
-+            dma_buffer_2 += 4;
-+	}
-+	toCount -= count;
-+    }
-+
-+    if(stream->audio_num_channels == 1){
-+    	return toCount0 / 8;
-+    }
-+    return toCount0 / 4;
-+}
-+
-+static __inline__ int copy_from_user_S16_LE_CM
-+(
-+	audio_stream_t *stream,
-+	const char *from,
-+	int toCount
-+)
-+{
-+    unsigned int *dma_buffer_0 = (int *)stream->hwbuf[0];
-+    unsigned int *dma_buffer_1 = (int *)stream->hwbuf[1];
-+    unsigned int *dma_buffer_2 = (int *)stream->hwbuf[2];
-+    unsigned short *user_buffer = (unsigned short *)from;
-+    short data;
-+    unsigned int val;
-+    int toCount0 = toCount;
-+    int count;
-+    count = 4 * stream->dma_num_channels;
-+
-+	//printk("count=%x tocount\n",count,toCount);
-+    while (toCount > 0){
-+
-+	__get_user(data, user_buffer++);
-+	//*dma_buffer_0++ = data;
-+	val = (unsigned int)data & 0x0000ffff;
-+	if(stream->audio_num_channels == 2){
-+	    __get_user(data, user_buffer++);
-+        }
-+	*dma_buffer_0++ = ((unsigned int)data << 16) | val;
-+
-+        if(stream->audio_channels_flag & CHANNEL_REAR ){
-+    	    __get_user(data, user_buffer++);
-+	    //*dma_buffer_1++ = data;
-+	    val = (unsigned int)data & 0x0000ffff;
-+    	    __get_user(data, user_buffer++);
-+	    *dma_buffer_1++ = ((unsigned int)data << 16) | val;
-+	}
-+
-+        if(stream->audio_channels_flag & CHANNEL_CENTER_LFE ){
-+	    __get_user(data, user_buffer++);
-+	    //*dma_buffer_2++ = data;
-+	    val = (unsigned int)data & 0x0000ffff;
-+	    __get_user(data, user_buffer++);
-+	    *dma_buffer_2++ = ((unsigned int)data << 16) | val;
-+	}
-+	toCount -= count;
-+    }
-+
-+    if(stream->audio_num_channels == 1){
-+        return toCount0 /2 ;
-+    }
-+
-+    return toCount0 ;
-+}
-+
-+static __inline__ int copy_from_user_U16_LE_CM
-+(
-+    audio_stream_t *stream,
-+    const char *from,
-+    int toCount
-+)
-+{
-+    int *dma_buffer_0 = (int *)stream->hwbuf[0];
-+    int *dma_buffer_1 = (int *)stream->hwbuf[1];
-+    int *dma_buffer_2 = (int *)stream->hwbuf[2];
-+    int count;
-+    unsigned short * user_buffer = (unsigned short *)from;
-+    unsigned short data;
-+    unsigned int val;
-+    int toCount0 = toCount;
-+    count = 4 * stream->dma_num_channels;
-+
-+    while (toCount > 0){
-+
-+	__get_user(data, user_buffer++);
-+	//*dma_buffer_0++ = ((unsigned int)data ^ 0x8000);
-+	val = (unsigned int)data & 0x0000ffff;
-+	if(stream->audio_num_channels == 2){
-+	    __get_user(data, user_buffer++);
-+        }
-+	//*dma_buffer_0++ = ((unsigned int)data ^ 0x8000);
-+        *dma_buffer_0++ = (((unsigned int)data << 16) | val) ^ 0x80008000;
-+
-+        if(stream->audio_channels_flag & CHANNEL_REAR ){
-+	    __get_user(data, user_buffer++);
-+	    //*dma_buffer_1++ = ((unsigned int)data ^ 0x8000);
-+	    val = (unsigned int)data & 0x0000ffff;
-+    	    __get_user(data, user_buffer++);
-+            //*dma_buffer_1++ = ((unsigned int)data ^ 0x8000);
-+            *dma_buffer_1++ = (((unsigned int)data << 16) | val) ^ 0x80008000;
-+	}
-+
-+        if(stream->audio_channels_flag & CHANNEL_CENTER_LFE ){
-+	    __get_user(data, user_buffer++);
-+	    //*dma_buffer_2++ = ((unsigned int)data ^ 0x8000);
-+	    val = (unsigned int)data & 0x0000ffff;
-+	    __get_user(data, user_buffer++);
-+    	    //*dma_buffer_2++ = ((unsigned int)data ^ 0x8000);
-+    	    *dma_buffer_2++ = (((unsigned int)data << 16) | val) ^ 0x80008000;
-+	}
-+	toCount -= count;
-+    }
-+
-+    if(stream->audio_num_channels == 1){
-+        return toCount0/2;
-+    }
-+    return toCount0 ;
-+}
-+
-+static __inline__ int copy_from_user_S8_CM
-+(
-+    audio_stream_t *stream,
-+    const char *from,
-+    int toCount
-+)
-+{
-+    char *dma_buffer_0 = (char *)stream->hwbuf[0];
-+    char *dma_buffer_1 = (char *)stream->hwbuf[1];
-+    char *dma_buffer_2 = (char *)stream->hwbuf[2];
-+    int count;
-+    unsigned char * user_buffer = (unsigned char *)from;
-+    unsigned char data;
-+    int toCount0 = toCount;
-+    count = 4 * stream->dma_num_channels;
-+
-+    dma_buffer_0++;
-+    dma_buffer_1++;
-+    dma_buffer_2++;
-+
-+    while (toCount > 0){
-+	__get_user(data, user_buffer++);
-+	*dma_buffer_0 = data;
-+	*(dma_buffer_0 +1 ) = 0;
-+	dma_buffer_0 += 2;
-+
-+	if(stream->audio_num_channels == 2){
-+	    __get_user(data, user_buffer++);
-+	}
-+	*dma_buffer_0 = data;
-+	*(dma_buffer_0 +1 ) = 0;
-+	dma_buffer_0 += 2;
-+
-+        if(stream->audio_channels_flag & CHANNEL_REAR ){
-+	    __get_user(data, user_buffer++);
-+	    *dma_buffer_1 = data;
-+	    dma_buffer_1 += 2;
-+	    __get_user(data, user_buffer++);
-+            *dma_buffer_1 = data;
-+            dma_buffer_1 += 2;
-+	}
-+
-+        if(stream->audio_channels_flag & CHANNEL_CENTER_LFE ){
-+	    __get_user(data, user_buffer++);
-+	    *dma_buffer_2 = data;
-+	    dma_buffer_2 += 2;
-+	    __get_user(data, user_buffer++);
-+    	    *dma_buffer_2 = data;
-+    	    dma_buffer_2 += 2;
-+	}
-+	toCount -= count;
-+    }
-+
-+    if(stream->audio_num_channels == 1){
-+        return toCount0 / 4;
-+    }
-+
-+    return toCount0 / 2;
-+}
-+
-+static __inline__ int copy_from_user_U8_CM
-+(
-+    audio_stream_t *stream,
-+    const char *from,
-+    int toCount
-+)
-+{
-+    unsigned char *dma_buffer_0 = (unsigned char *)stream->hwbuf[0];
-+    unsigned char *dma_buffer_1 = (unsigned char *)stream->hwbuf[1];
-+    unsigned char *dma_buffer_2 = (unsigned char *)stream->hwbuf[2];
-+    int count;
-+    unsigned char *user_buffer = (unsigned char *)from;
-+    unsigned char data;
-+
-+    int toCount0 = toCount;
-+    count = 4 * stream->dma_num_channels;
-+
-+    dma_buffer_0 ++;
-+    dma_buffer_1 ++;
-+    dma_buffer_2 ++;
-+
-+    while (toCount > 0){
-+
-+	__get_user(data, user_buffer++);
-+	*dma_buffer_0 = ((unsigned char)data ^ 0x80);
-+	*(dma_buffer_0 +1 ) = 0;
-+	dma_buffer_0 += 2;
-+
-+	if(stream->audio_num_channels == 2){
-+	    __get_user(data, user_buffer++);
-+	}
-+	*dma_buffer_0 = ((unsigned char)data ^ 0x80);
-+	*(dma_buffer_0 +1 ) = 0;
-+	dma_buffer_0 += 2;
-+
-+
-+        if(stream->audio_channels_flag & CHANNEL_REAR ){
-+	    __get_user(data, user_buffer++);
-+	    *dma_buffer_1 = ((unsigned char)data ^ 0x80);
-+	    dma_buffer_1 += 2;
-+	    __get_user(data, user_buffer++);
-+            *dma_buffer_1 = ((unsigned char)data ^ 0x80);
-+            dma_buffer_1 += 2;
-+	}
-+
-+        if(stream->audio_channels_flag & CHANNEL_CENTER_LFE ){
-+	    __get_user(data, user_buffer++);
-+	    *dma_buffer_2 = ((unsigned char)data ^ 0x80);
-+    	    dma_buffer_2 += 2;
-+	    __get_user(data, user_buffer++);
-+    	    *dma_buffer_2 = ((unsigned char)data ^ 0x80);
-+            dma_buffer_2 += 2;
-+	}
-+	toCount -= count;
-+    }
-+
-+    if(stream->audio_num_channels == 1){
-+        return toCount0 / 4;
-+    }
-+
-+    return toCount0 / 2;
-+}
-+
-+static int copy_from_user_U32
-+(
-+	audio_stream_t *stream,
-+	const char *from,
-+	int toCount
-+)
-+{
-+    char *dma_buffer_0 = (char *)stream->hwbuf[0];
-+
-+    if (copy_from_user( (char *)dma_buffer_0, from, toCount))
-+    {
-+	return -EFAULT;
-+    }
-+
-+    return toCount;
-+
-+}
-+
-+/*
-+ * Returns negative for error
-+ * Returns # of bytes transferred out of the from buffer
-+ * for success.
-+ */
-+static __inline__ int copy_from_user_with_conversion
-+(
-+    audio_stream_t *stream,
-+    const char *from,
-+    int toCount,
-+    int bCompactMode
-+)
-+{
-+    int ret = 0;
-+//    DPRINTK("copy_from_user_with_conversion\n");
-+    if( toCount == 0 ){
-+    	DPRINTK("ep93xx_i2s_copy_from_user_with_conversion - nothing to copy!\n");
-+    }
-+
-+    if( bCompactMode == 1){
-+
-+    	switch( stream->audio_format ){
-+
-+		case SNDRV_PCM_FORMAT_S8:
-+			DPRINTK("SNDRV_PCM_FORMAT_S8 CM\n");
-+			ret = copy_from_user_S8_CM( stream, from, toCount );
-+			break;
-+
-+		case SNDRV_PCM_FORMAT_U8:
-+			DPRINTK("SNDRV_PCM_FORMAT_U8 CM\n");
-+			ret = copy_from_user_U8_CM( stream, from, toCount );
-+			break;
-+
-+		case SNDRV_PCM_FORMAT_S16_LE:
-+			DPRINTK("SNDRV_PCM_FORMAT_S16_LE CM\n");
-+			ret = copy_from_user_S16_LE_CM( stream, from, toCount );
-+			break;
-+
-+		case SNDRV_PCM_FORMAT_U16_LE:
-+			DPRINTK("SNDRV_PCM_FORMAT_U16_LE CM\n");
-+			ret = copy_from_user_U16_LE_CM( stream, from, toCount );
-+			break;
-+
-+		case SNDRV_PCM_FORMAT_S24_LE:
-+			DPRINTK("SNDRV_PCM_FORMAT_S24_LE CM\n");
-+			//ret = copy_from_user_S24_LE( stream, from, toCount );
-+			//break;
-+
-+		case SNDRV_PCM_FORMAT_U24_LE:
-+			DPRINTK("SNDRV_PCM_FORMAT_U24_LE CM\n");
-+			//ret = copy_from_user_U24_LE( stream, from, toCount );
-+			//break;
-+		case SNDRV_PCM_FORMAT_S32_LE:
-+			DPRINTK("SNDRV_PCM_FORMAT_S32_LE CM\n");
-+			//break;
-+        	default:
-+                	DPRINTK( "ep93xx_i2s copy from user unsupported audio format\n" );
-+			break;
-+    	}
-+    }
-+    else{
-+        switch( stream->audio_format ){
-+
-+	case SNDRV_PCM_FORMAT_S8:
-+		DPRINTK("SNDRV_PCM_FORMAT_S8\n");
-+		ret = copy_from_user_S8( stream, from, toCount );
-+		break;
-+
-+	case SNDRV_PCM_FORMAT_U8:
-+		DPRINTK("SNDRV_PCM_FORMAT_U8\n");
-+		ret = copy_from_user_U8( stream, from, toCount );
-+		break;
-+
-+	case SNDRV_PCM_FORMAT_S16_LE:
-+		DPRINTK("SNDRV_PCM_FORMAT_S16_LE\n");
-+		ret = copy_from_user_S16_LE( stream, from, toCount );
-+		break;
-+
-+	case SNDRV_PCM_FORMAT_U16_LE:
-+		DPRINTK("SNDRV_PCM_FORMAT_U16_LE\n");
-+		ret = copy_from_user_U16_LE( stream, from, toCount );
-+		break;
-+
-+	case SNDRV_PCM_FORMAT_S24_LE:
-+		DPRINTK("SNDRV_PCM_FORMAT_S24_LE\n");
-+		//ret = copy_from_user_S24_LE( stream, from, toCount );
-+		//break;
-+
-+	case SNDRV_PCM_FORMAT_U24_LE:
-+		DPRINTK("SNDRV_PCM_FORMAT_U24_LE\n");
-+		//ret = copy_from_user_U24_LE( stream, from, toCount );
-+		//break;
-+		DPRINTK( "ep93xx_i2s copy from user unsupported audio format\n" );
-+		break;
-+	case SNDRV_PCM_FORMAT_S32_LE:
-+		DPRINTK("SNDRV_PCM_FORMAT_S32_LE\n");
-+		ret = copy_from_user_U32( stream, from, toCount );
-+		break;
-+        default:
-+                DPRINTK( "ep93xx_i2s copy from user unsupported audio format\n" );
-+		break;
-+    	}
-+    }
-+
-+    return ret;
-+}
-+
-+
-+
-+/*
-+ *  For audio playback, we convert samples of arbitrary format to be 32 bit
-+ *  for our hardware. We're scaling a user buffer to a dma buffer.  So when
-+ *  report byte counts, we scale them acording to the ratio of DMA sample
-+ *  size to user buffer sample size.  When we report # of DMA fragments,
-+ *  we don't scale that.  So:
-+ *
-+ *  Also adjust the size and number of dma fragments if sample size changed.
-+ *
-+ *  Input format       Input sample     Output sample size    ratio (out:in)
-+ *  bits   channels    size (bytes)       CM   non-CM          CM   non-CM
-+ *   8      stereo         2		   4      8            2:1   4:1
-+ *   16     stereo         4		   4      8            1:1   2:1
-+ *   24     stereo         6		   4      8             X    8:6 not a real case
-+ *
-+ */
-+static void snd_ep93xx_dma2usr_ratio( audio_stream_t * stream,int bCompactMode )
-+{
-+    unsigned int dma_sample_size, user_sample_size;
-+
-+    if(bCompactMode == 1){
-+	dma_sample_size = 4;	/* each stereo sample is 2 * 32 bits */
-+    }
-+    else{
-+    	dma_sample_size = 8;
-+    }
-+
-+    // If stereo 16 bit, user sample is 4 bytes.
-+    // If stereo  8 bit, user sample is 2 bytes.
-+    if(stream->audio_num_channels == 1){
-+    	user_sample_size = stream->audio_stream_bitwidth / 8;
-+    }
-+    else{
-+    	user_sample_size = stream->audio_stream_bitwidth / 4;
-+    }
-+
-+    stream->dma2usr_ratio = dma_sample_size / user_sample_size;
-+}
-+
-+/*---------------------------------------------------------------------------------------------*/
-+
-+static int snd_ep93xx_dma_free(struct snd_pcm_substream *substream ){
-+
-+
-+    audio_state_t *state = substream->private_data;
-+    audio_stream_t *stream = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ?
-+                              state->output_stream:state->input_stream;
-+    int i;
-+
-+
-+    DPRINTK("snd_ep93xx_dma_free - enter\n");
-+    for( i = 0 ; i < stream->dma_num_channels ;i++ ){
-+	ep93xx_dma_free( stream->dmahandles[i] );
-+    }
-+    DPRINTK("snd_ep93xx_dma_free - exit\n");
-+    return 0;
-+}
-+
-+static int snd_ep93xx_dma_config(struct snd_pcm_substream *substream ){
-+
-+    audio_state_t *state = substream->private_data;
-+    audio_stream_t *stream = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ?
-+                               state->output_stream:state->input_stream;
-+    int i,err = 0;
-+
-+    DPRINTK("snd_ep93xx_dma_config - enter\n");
-+
-+    for( i = 0 ; i < stream->dma_num_channels ;i++ ){
-+
-+        err = ep93xx_dma_request(&stream->dmahandles[i],
-+	                        stream->devicename,
-+	                        (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ?
-+				state->output_dma[i]:state->input_dma[i] );
-+        if (err){
-+	    printk("snd_ep93xx_dma_config - exit ERROR dma request failed\n");
-+	    return err;
-+        }
-+	err = ep93xx_dma_config( stream->dmahandles[i],
-+    				IGNORE_CHANNEL_ERROR,
-+				0,
-+				(substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ?
-+				snd_ep93xx_dma_tx_callback:snd_ep93xx_dma_rx_callback,
-+				(unsigned int)substream );
-+        if (err){
-+	    printk("snd_ep93xx_dma_config - exit ERROR dma request failed\n");
-+	    return err;
-+	}
-+    }
-+
-+    DPRINTK("snd_ep93xx_dma_config - enter\n");
-+    return err;
-+}
-+
-+static void snd_ep93xx_dma_start( audio_state_t * state, audio_stream_t * stream )
-+{
-+    int err,i;
-+
-+    DPRINTK("snd_ep93xx_dma_start - enter\n");
-+
-+    for(i = 0 ;i < stream->dma_num_channels;i++)
-+	err = ep93xx_dma_start( stream->dmahandles[i], 1,(unsigned int *) stream->dmahandles );
-+
-+    stream->active = 1;
-+
-+    DPRINTK("snd_ep93xx_dma_start - exit\n");
-+}
-+
-+static void snd_ep93xx_dma_pause( audio_state_t * state, audio_stream_t * stream )
-+{
-+    int i;
-+
-+    DPRINTK("snd_ep93xx_dma_pause - enter\n");
-+
-+    for(i = 0 ;i < stream->dma_num_channels;i++)
-+	ep93xx_dma_pause( stream->dmahandles[i], 1,(unsigned int *)stream->dmahandles );
-+
-+    stream->active = 0;
-+    DPRINTK("snd_ep93xx_dma_pause - exit\n");
-+
-+}
-+
-+static void snd_ep93xx_dma_flush( audio_state_t * state, audio_stream_t * stream ){
-+
-+    int i;
-+
-+    DPRINTK("snd_ep93xx_dma_flush - enter\n");
-+
-+    for( i = 0 ; i < stream->dma_num_channels ; i++ )
-+	ep93xx_dma_flush( stream->dmahandles[i] );
-+
-+    DPRINTK("snd_ep93xx_dma_flush - exit\n");
-+}
-+
-+static void snd_ep93xx_deallocate_buffers( struct snd_pcm_substream *substream, audio_stream_t *stream )
-+{
-+    int i;
-+    audio_channel_t *dma_chan;
-+
-+    DPRINTK("snd_ep93xx_deallocate_buffers - enter\n");
-+
-+    if( stream->dma_channels ){
-+
-+        for(i = 0;i < stream->dma_num_channels;i++){
-+
-+	    dma_chan = &stream->dma_channels[i];
-+
-+	    if( dma_chan->area ){
-+
-+		if( dma_chan->audio_buffers ){
-+
-+		    kfree(dma_chan->audio_buffers);
-+		    dma_chan->audio_buffers = NULL;
-+
-+		}
-+
-+		kfree(dma_chan->area);
-+		dma_chan->area = NULL;
-+	    }
-+	}
-+	kfree(stream->dma_channels);
-+	stream->dma_channels = NULL;
-+    }
-+    DPRINTK("snd_ep93xx_deallocate_buffers - exit\n");
-+}
-+
-+static int snd_ep93xx_allocate_buffers(struct snd_pcm_substream *substream, audio_stream_t *stream)
-+{
-+    audio_channel_t *channel;
-+    unsigned int size,tmpsize,bufsize,bufextsize;
-+    int i,j;
-+
-+
-+    DPRINTK("snd_ep93xx_allocate_buffers - enter\n" );
-+
-+    if (stream->dma_channels){
-+	printk("ep93xx_i2s  %s BUSY\n",__FUNCTION__);
-+        return -EBUSY;
-+    }
-+
-+    stream->dma_channels = (audio_channel_t *)kmalloc(sizeof(audio_channel_t) * stream->dma_num_channels , GFP_KERNEL);
-+
-+    if (!stream->dma_channels){
-+	printk(AUDIO_NAME ": unable to allocate dma_channels memory\n");
-+	return - ENOMEM;
-+    }
-+
-+    size = ( stream->dmasize / stream->dma_num_channels ) * stream->dma2usr_ratio;
-+
-+    for( i = 0; i < stream->dma_num_channels;i++){
-+	channel = &stream->dma_channels[i];
-+
-+	channel->area = kmalloc( size, GFP_DMA );
-+
-+	if(!channel->area){
-+	    printk(AUDIO_NAME ": unable to allocate audio memory\n");
-+	    return -ENOMEM;
-+	}
-+	channel->bytes = size;
-+	channel->addr = __virt_to_phys((int) channel->area);
-+        memset( channel->area, 0, channel->bytes );
-+
-+	bufsize = ( stream->fragsize / stream->dma_num_channels ) * stream->dma2usr_ratio;
-+	channel->audio_buff_count = size / bufsize;
-+	bufextsize = size % bufsize;
-+
-+	if( bufextsize > 0 ){
-+	    channel->audio_buff_count++;
-+	}
-+
-+	channel->audio_buffers = (audio_buf_t *)kmalloc(sizeof(audio_buf_t) * channel->audio_buff_count , GFP_KERNEL);
-+
-+	if (!channel->audio_buffers){
-+	    printk(AUDIO_NAME ": unable to allocate audio memory\n ");
-+	    return -ENOMEM;
-+	}
-+
-+	tmpsize = size;
-+
-+	for( j = 0; j < channel->audio_buff_count; j++){
-+
-+	    channel->audio_buffers[j].dma_addr = channel->addr + j * bufsize;
-+
-+	    if( tmpsize >= bufsize ){
-+		tmpsize -= bufsize;
-+		channel->audio_buffers[j].bytes = bufsize;
-+		channel->audio_buffers[j].reportedbytes = bufsize / stream->dma2usr_ratio;
-+	    }
-+	    else{
-+                channel->audio_buffers[j].bytes = bufextsize;
-+                channel->audio_buffers[j].reportedbytes = bufextsize / stream->dma2usr_ratio;
-+	    }
-+	}
-+    }
-+
-+    DPRINTK("snd_ep93xx_allocate_buffers -- exit SUCCESS\n" );
-+    return 0;
-+}
-+
-+/*
-+ * DMA callback functions
-+ */
-+
-+static void snd_ep93xx_dma_tx_callback
-+(
-+	ep93xx_dma_int_t DMAInt,
-+	ep93xx_dma_dev_t device,
-+	unsigned int user_data
-+)
-+{
-+    int handle;
-+    int i,chan;
-+    unsigned int buf_id;
-+
-+    struct snd_pcm_substream *substream = (struct snd_pcm_substream *)user_data;
-+    audio_state_t *state = (audio_state_t *)(substream->private_data);
-+    audio_stream_t *stream = state->output_stream;
-+    audio_buf_t *buf;
-+
-+    switch( device )
-+    {
-+	case DMATx_I2S3:
-+	    DPRINTK( "snd_ep93xx_dma_tx_callback - DMATx_I2S3\n");
-+	    i = 2;
-+	    break;
-+    	case DMATx_I2S2:
-+	    DPRINTK( "snd_ep93xx_dma_tx_callback - DMATx_I2S2\n");
-+       	    i = 1;
-+	    break;
-+	case DMATx_I2S1:
-+	    default:
-+	    DPRINTK( "snd_ep93xx_dma_tx_callback - DMATx_I2S1\n");
-+       	    i = 0;
-+	    break;
-+    }
-+
-+    if(stream->audio_num_channels == 1){
-+    	chan = 0;
-+    }
-+    else{
-+        chan = stream->audio_num_channels / 2 - 1;
-+    }
-+    handle = stream->dmahandles[i];
-+
-+    if(stream->stopped == 0){
-+
-+	if( ep93xx_dma_remove_buffer( handle, &buf_id ) >= 0 ){
-+
-+	    buf = (audio_buf_t *)buf_id;
-+            stream->bytecount += buf->reportedbytes;
-+	    ep93xx_dma_add_buffer( stream->dmahandles[i],
-+				    (unsigned int)buf->dma_addr,
-+				    0,
-+				    buf->bytes,
-+				    0,
-+				    (unsigned int) buf );
-+            if(chan == i)
-+	        snd_pcm_period_elapsed(substream);
-+	}
-+    }
-+}
-+
-+static void snd_ep93xx_dma_rx_callback
-+(
-+	ep93xx_dma_int_t DMAInt,
-+	ep93xx_dma_dev_t device,
-+	unsigned int user_data
-+)
-+{
-+    int handle,i,chan;
-+    unsigned int buf_id;
-+    audio_buf_t *buf;
-+
-+    struct snd_pcm_substream *substream = (struct snd_pcm_substream *)user_data;
-+    audio_state_t *state = (audio_state_t *)(substream->private_data);
-+    audio_stream_t *stream = state->input_stream;
-+
-+    switch( device ){
-+
-+	case DMARx_I2S3:
-+    	    DPRINTK( "snd_ep93xx_dma_rx_callback - DMARx_I2S3\n");
-+	    i = 2;
-+	    break;
-+    	case DMARx_I2S2:
-+          DPRINTK( "snd_ep93xx_dma_rx_callback - DMARx_I2S2\n");
-+	    i = 1;
-+	    break;
-+	case DMARx_I2S1:
-+	    default:
-+	    DPRINTK( "snd_ep93xx_dma_rx_callback - DMARx_I2S1\n");
-+	    i = 0;
-+	    break;
-+    }
-+
-+    if(stream->audio_num_channels == 1){
-+    	chan = 0;
-+    }
-+    else{
-+        chan = stream->audio_num_channels / 2 - 1;
-+    }
-+    handle = stream->dmahandles[i];
-+
-+    if( stream->stopped == 0 ){
-+
-+        if( ep93xx_dma_remove_buffer( handle, &buf_id ) >= 0 ){
-+
-+    	    buf = (audio_buf_t *)buf_id;
-+	    stream->bytecount += buf->reportedbytes;
-+	    ep93xx_dma_add_buffer( stream->dmahandles[i],
-+				    (unsigned int)buf->dma_addr,
-+				    0,
-+				    buf->bytes,
-+				    0,
-+				    (unsigned int) buf );
-+            if( i == chan )
-+                snd_pcm_period_elapsed(substream);
-+	}
-+    }
-+}
-+
-+static int snd_ep93xx_release(struct snd_pcm_substream *substream)
-+{
-+    audio_state_t *state = (audio_state_t *)substream->private_data;
-+    audio_stream_t *stream = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ?
-+                             state->output_stream : state->input_stream;
-+
-+    DPRINTK("snd_ep93xx_release - enter\n");
-+
-+    down(&state->sem);
-+    stream->active = 0;
-+    stream->stopped = 0;
-+    snd_ep93xx_deallocate_buffers(substream, stream);
-+    up(&state->sem);
-+
-+    DPRINTK("snd_ep93xx_release - exit\n");
-+
-+    return 0;
-+}
-+
-+static int ep93xx_ac97_pcm_startup(struct snd_pcm_substream *substream)
-+{
-+	struct snd_pcm_runtime *runtime = substream->runtime;
-+	int r;
-+	int iTempMasterVol,iTempHeadphoneVol,iTempMonoVol,iTempRecordSelect;
-+        /*save the old mixer*/
-+      	iTempRecordSelect 	= peek(AC97_1A_RECORD_SELECT);
-+        iTempMasterVol		= peek( AC97_02_MASTER_VOL);
-+        iTempHeadphoneVol	= peek( AC97_04_HEADPHONE_VOL);
-+        iTempMonoVol		= peek( AC97_06_MONO_VOL);
-+
-+	runtime->hw.channels_min = 1;
-+	runtime->hw.channels_max = 2;
-+
-+ 	ep93xx_audio_init();
-+	/*ep93xx_init_ac97_controller();*/
-+
-+        /*reset the old output mixer*/
-+        poke( AC97_02_MASTER_VOL, iTempMasterVol);
-+        poke( AC97_04_HEADPHONE_VOL,iTempHeadphoneVol );
-+        poke( AC97_06_MONO_VOL, iTempMonoVol);
-+	poke( AC97_1A_RECORD_SELECT,iTempRecordSelect);
-+
-+	r = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ?
-+	    AC97_RATES_FRONT_DAC : AC97_RATES_ADC;
-+
-+	DPRINTK(" ep93xx_ac97_pcm_startup=%x\n",r);
-+
-+		return 0;
-+}
-+
-+
-+static int snd_ep93xx_pcm_hw_params(struct snd_pcm_substream *substream,
-+				struct snd_pcm_hw_params *params)
-+{
-+        DPRINTK("snd_ep93xx_pcm_hw_params - enter\n");
-+	return snd_pcm_lib_malloc_pages(substream,params_buffer_bytes(params));
-+}
-+
-+static int snd_ep93xx_pcm_hw_free(struct snd_pcm_substream *substream)
-+{
-+
-+	DPRINTK("snd_ep93xx_pcm_hw_free - enter\n");
-+	return snd_pcm_lib_free_pages(substream);
-+}
-+
-+/*
-+ *snd_ep93xx_pcm_prepare: need to finish these functions as lower
-+ *chip_set_sample_format
-+ *chip_set_sample_rate
-+ *chip_set_channels
-+ *chip_set_dma_setup
-+ */
-+
-+static int snd_ep93xx_pcm_prepare_playback( struct snd_pcm_substream *substream)
-+{
-+    audio_state_t *state = (audio_state_t *) substream->private_data;
-+    struct snd_pcm_runtime *runtime = substream->runtime;
-+    audio_stream_t *stream = state->output_stream;
-+
-+    DPRINTK("snd_ep93xx_pcm_prepare_playback - enter\n");
-+
-+    ep93xx_audio_disable(1);
-+    ep93xx_ac97_pcm_startup(substream);
-+
-+    snd_ep93xx_deallocate_buffers(substream,stream);
-+
-+    //if(runtime->channels % 2 != 0)
-+    //	return -1;
-+
-+    DPRINTK("The runtime item : \n");
-+    DPRINTK("runtime->dma_addr    = 0x%x\n", runtime->dma_addr);
-+    DPRINTK("runtime->dma_area    = 0x%x\n", runtime->dma_area);
-+    DPRINTK("runtime->dma_bytes   = %d\n",   runtime->dma_bytes);
-+    DPRINTK("runtime->frame_bits  = %d\n",   runtime->frame_bits);
-+    DPRINTK("runtime->buffer_size = %d\n",   runtime->buffer_size);
-+    DPRINTK("runtime->period_size = %d\n",   runtime->period_size);
-+    DPRINTK("runtime->periods     = %d\n",   runtime->periods);
-+    DPRINTK("runtime->rate        = %d\n",   runtime->rate);
-+    DPRINTK("runtime->format      = %d\n",   runtime->format);
-+    DPRINTK("runtime->channels    = %d\n",   runtime->channels);
-+
-+    /* set requestd format when available */
-+    stream->audio_num_channels = runtime->channels;
-+    if(stream->audio_num_channels == 1){
-+    	stream->dma_num_channels = 1;
-+    }
-+    else{
-+    	stream->dma_num_channels = runtime->channels / 2;
-+    }
-+
-+    stream->audio_channels_flag = CHANNEL_FRONT;
-+    if(stream->dma_num_channels == 2)
-+        stream->audio_channels_flag |= CHANNEL_REAR;
-+    if(stream->dma_num_channels == 3)
-+        stream->audio_channels_flag |= CHANNEL_REAR | CHANNEL_CENTER_LFE;
-+
-+    stream->dmasize = runtime->dma_bytes;
-+    stream->nbfrags = runtime->periods;
-+    stream->fragsize = frames_to_bytes (runtime, runtime->period_size);
-+    stream->bytecount = 0;
-+
-+    if( !state->codec_set_by_capture ){
-+	state->codec_set_by_playback = 1;
-+
-+	if( stream->audio_rate != runtime->rate ){
-+	    ep93xx_set_samplerate( runtime->rate,0 );
-+	}
-+	//if( stream->audio_format != runtime->format ){
-+    	//    snd_ep93xx_i2s_init((stream->audio_stream_bitwidth == 24));
-+	//}
-+    }
-+    else{
-+        audio_stream_t *s = state->input_stream;
-+        if( runtime->format != s->audio_format)
-+    	    return -1;
-+	if( runtime->rate != s->audio_rate )
-+	    return -1;
-+    }
-+
-+    stream->audio_format = runtime->format ;
-+    ep93xx_set_hw_format(stream->audio_format,stream->audio_num_channels);
-+
-+
-+    stream->audio_rate = runtime->rate;
-+    audio_set_format( stream, runtime->format );
-+    snd_ep93xx_dma2usr_ratio( stream,state->bCompactMode );
-+
-+    if( snd_ep93xx_allocate_buffers( substream, stream ) != 0 ){
-+        snd_ep93xx_deallocate_buffers( substream, stream );
-+        return -1;
-+    }
-+
-+    ep93xx_audio_enable(1);
-+
-+    DPRINTK("snd_ep93xx_pcm_prepare_playback - exit\n");
-+    return 0;
-+}
-+
-+static int snd_ep93xx_pcm_prepare_capture( struct snd_pcm_substream *substream)
-+{
-+    audio_state_t *state = (audio_state_t *) substream->private_data;
-+    struct snd_pcm_runtime *runtime = substream->runtime;
-+    audio_stream_t *stream = state->input_stream;
-+
-+    ep93xx_audio_disable(0);
-+    ep93xx_ac97_pcm_startup(substream);
-+
-+    snd_ep93xx_deallocate_buffers(substream,stream);
-+
-+    //if(runtime->channels % 2 != 0)
-+	//return -1;
-+
-+    DPRINTK("snd_ep93xx_pcm_prepare_capture - enter\n");
-+
-+//    printk("The runtime item : \n");
-+//    printk("runtime->dma_addr    = 0x%x\n", runtime->dma_addr);
-+//    printk("runtime->dma_area    = 0x%x\n", runtime->dma_area);
-+//    printk("runtime->dma_bytes   = %d\n",   runtime->dma_bytes);
-+//    printk("runtime->frame_bits  = %d\n",   runtime->frame_bits);
-+//    printk("runtime->buffer_size = %d\n",   runtime->buffer_size);
-+//    printk("runtime->period_size = %d\n",   runtime->period_size);
-+//    printk("runtime->periods     = %d\n",   runtime->periods);
-+//    printk("runtime->rate        = %d\n",   runtime->rate);
-+//    printk("runtime->format      = %d\n",   runtime->format);
-+//    printk("runtime->channels    = %d\n",   runtime->channels);
-+
-+    /* set requestd format when available */
-+    stream->audio_num_channels = runtime->channels;
-+    if(stream->audio_num_channels == 1){
-+    	stream->dma_num_channels = 1;
-+    }
-+    else{
-+    	stream->dma_num_channels = runtime->channels / 2;
-+    }
-+
-+    stream->audio_channels_flag = CHANNEL_FRONT;
-+    if(stream->dma_num_channels == 2)
-+	stream->audio_channels_flag |= CHANNEL_REAR;
-+    if(stream->dma_num_channels == 3)
-+	stream->audio_channels_flag |= CHANNEL_REAR | CHANNEL_CENTER_LFE;
-+
-+    stream->dmasize = runtime->dma_bytes;
-+    stream->nbfrags = runtime->periods;
-+    stream->fragsize = frames_to_bytes (runtime, runtime->period_size);
-+    stream->bytecount = 0;
-+
-+    if( !state->codec_set_by_playback ){
-+	state->codec_set_by_capture = 1;
-+
-+	/*rate*/
-+	if( stream->audio_rate != runtime->rate ){
-+    	    ep93xx_set_samplerate( runtime->rate,1 );
-+	}
-+
-+	/*mixer*/
-+	ep93xx_set_recsource(SOUND_MASK_MIC|SOUND_MASK_LINE1 | SOUND_MASK_LINE);
-+	poke( AC97_1C_RECORD_GAIN, 0);
-+
-+	/*format*/
-+        //if( stream->audio_format != runtime->format ){
-+    	//    snd_ep93xx_i2s_init((stream->audio_stream_bitwidth == 24));
-+	//}
-+    }
-+    else{
-+        audio_stream_t *s = state->output_stream;
-+        if( runtime->format != s->audio_format)
-+    	    return -1;
-+	if( runtime->rate != s->audio_rate )
-+    	    return -1;
-+    }
-+
-+    stream->audio_format = runtime->format ;
-+    ep93xx_set_hw_format(stream->audio_format,stream->audio_num_channels);
-+
-+
-+    stream->audio_rate = runtime->rate;
-+    audio_set_format( stream, runtime->format );
-+    snd_ep93xx_dma2usr_ratio( stream,state->bCompactMode );
-+
-+    if( snd_ep93xx_allocate_buffers( substream, stream ) != 0 ){
-+        snd_ep93xx_deallocate_buffers( substream, stream );
-+	return -1;
-+    }
-+
-+    ep93xx_audio_enable(0);
-+
-+    DPRINTK("snd_ep93xx_pcm_prepare_capture - exit\n");
-+    return 0;
-+}
-+/*
-+ *start/stop/pause dma translate
-+ */
-+static int snd_ep93xx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
-+{
-+    audio_state_t  *state = (audio_state_t *)substream->private_data;
-+    audio_stream_t *stream = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ?
-+				state->output_stream:state->input_stream;
-+    audio_buf_t *buf;
-+    audio_channel_t *dma_channel;
-+    int i,count,ret = 0;
-+    unsigned long flags;
-+
-+    DPRINTK("snd_ep93xx_pcm_triger %d - enter \n",cmd);
-+
-+    switch (cmd){
-+
-+	case SNDRV_PCM_TRIGGER_START:
-+
-+	    snd_ep93xx_dma_config( substream );
-+
-+            stream->stopped = 0;
-+
-+            if( !stream->active && !stream->stopped ){
-+	        stream->active = 1;
-+    		snd_ep93xx_dma_start( state, stream );
-+            }
-+
-+            local_irq_save(flags);
-+
-+	    for (i = 0; i < stream->dma_num_channels; i++){
-+		dma_channel = &stream->dma_channels[i];
-+
-+		for(count = 0 ;count < dma_channel->audio_buff_count; count++){
-+
-+		    buf = &dma_channel->audio_buffers[count];
-+    		    ep93xx_dma_add_buffer( stream->dmahandles[i],
-+					    (unsigned int)buf->dma_addr,
-+		            		    0,
-+		                	    buf->bytes,
-+					    0,
-+					    (unsigned int) buf );
-+		}
-+	    }
-+
-+	    local_irq_restore(flags);
-+	    break;
-+
-+	case SNDRV_PCM_TRIGGER_STOP:
-+	    stream->stopped = 1;
-+	    snd_ep93xx_dma_pause( state, stream );
-+	    snd_ep93xx_dma_flush( state, stream );
-+	    snd_ep93xx_dma_free( substream );
-+	    break;
-+
-+	case SNDRV_PCM_TRIGGER_SUSPEND:
-+	    break;
-+	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-+	    break;
-+	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-+	    break;
-+
-+	    default:
-+	    ret = -EINVAL;
-+    }
-+    DPRINTK("snd_ep93xx_pcm_triger %d - exit \n",cmd);
-+    return ret;
-+}
-+
-+static snd_pcm_uframes_t snd_ep93xx_pcm_pointer_playback(struct snd_pcm_substream *substream)
-+{
-+    audio_state_t *state = (audio_state_t *)(substream->private_data);
-+    struct snd_pcm_runtime *runtime = substream->runtime;
-+    audio_stream_t *stream = state->output_stream;
-+    snd_pcm_uframes_t pointer = 0;
-+
-+    pointer = bytes_to_frames( runtime,stream->bytecount );
-+
-+    if (pointer >= runtime->buffer_size){
-+	pointer = 0;
-+	stream->bytecount = 0;
-+    }
-+
-+    DPRINTK("snd_ep93xx_pcm_pointer_playback - exit\n");
-+    return pointer;
-+}
-+
-+static snd_pcm_uframes_t snd_ep93xx_pcm_pointer_capture(struct snd_pcm_substream *substream)
-+{
-+    audio_state_t *state = (audio_state_t *)(substream->private_data);
-+    struct snd_pcm_runtime *runtime = substream->runtime;
-+    audio_stream_t *stream = state->input_stream;
-+    snd_pcm_uframes_t pointer = 0;
-+
-+    pointer = bytes_to_frames( runtime,stream->bytecount );
-+
-+    if (pointer >= runtime->buffer_size){
-+	pointer = 0;
-+	stream->bytecount = 0;
-+    }
-+
-+    DPRINTK("snd_ep93xx_pcm_pointer_capture - exit\n");
-+    return pointer;
-+}
-+
-+static int snd_ep93xx_pcm_open(struct snd_pcm_substream *substream)
-+{
-+    audio_state_t *state = substream->private_data;
-+    struct snd_pcm_runtime *runtime = substream->runtime;
-+    audio_stream_t *stream = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ?
-+                                state->output_stream:state->input_stream;
-+
-+    DPRINTK("snd_ep93xx_pcm_open - enter\n");
-+
-+    down(&state->sem);
-+
-+    runtime->hw = ep93xx_ac97_pcm_hardware;
-+
-+    stream->dma_num_channels = AUDIO_DEFAULT_DMACHANNELS;
-+    stream->dma_channels = NULL;
-+    stream->audio_rate = 0;
-+    stream->audio_stream_bitwidth = 0;
-+
-+    up(&state->sem);
-+
-+    DPRINTK("snd_ep93xx_pcm_open - exit\n");
-+    return 0;
-+}
-+
-+/*
-+ *free the HW dma channel
-+ *free the HW dma buffer
-+ *free the Hw dma decrotion using function :kfree
-+ */
-+static int snd_ep93xx_pcm_close(struct snd_pcm_substream *substream)
-+{
-+    audio_state_t *state = (audio_state_t *)(substream->private_data);
-+
-+    DPRINTK("snd_ep93xx_pcm_close - enter\n");
-+
-+    snd_ep93xx_release(substream);
-+
-+    if(substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-+	state->codec_set_by_playback = 0;
-+    else
-+	state->codec_set_by_capture = 0;
-+
-+    DPRINTK("snd_ep93xx_pcm_close - exit\n");
-+    return 0;
-+}
-+
-+static int snd_ep93xx_pcm_copy_playback(struct snd_pcm_substream * substream,int channel,
-+				snd_pcm_uframes_t pos,void __user *src, snd_pcm_uframes_t count)
-+{
-+
-+    audio_state_t *state = (audio_state_t *)substream->private_data;
-+    struct snd_pcm_runtime *runtime = substream->runtime;
-+    audio_stream_t *stream = state->output_stream ;
-+    audio_channel_t *dma_channel;
-+    int i;
-+    int tocount = frames_to_bytes(runtime,count);
-+
-+    for( i = 0; i < stream->dma_num_channels; i++ ){
-+
-+	dma_channel = &stream->dma_channels[i];
-+	stream->hwbuf[i] = dma_channel->area + ( frames_to_bytes(runtime,pos) * stream->dma2usr_ratio / stream->dma_num_channels );
-+
-+    }
-+
-+    if(copy_from_user_with_conversion(stream ,(const char*)src,(tocount * stream->dma2usr_ratio),state->bCompactMode) <=0 ){
-+	DPRINTK(KERN_ERR "copy_from_user_with_conversion() failed\n");
-+	return -EFAULT;
-+    }
-+
-+    DPRINTK("snd_ep93xx_pcm_copy_playback - exit\n");
-+    return 0;
-+}
-+
-+
-+static int snd_ep93xx_pcm_copy_capture(struct snd_pcm_substream * substream,int channel,
-+				snd_pcm_uframes_t pos,void __user *src, snd_pcm_uframes_t count)
-+{
-+    audio_state_t *state = (audio_state_t *)substream->private_data;
-+    struct snd_pcm_runtime *runtime = substream->runtime;
-+    audio_stream_t *stream = state->input_stream ;
-+    audio_channel_t *dma_channel;
-+    int i;
-+
-+    int tocount = frames_to_bytes(runtime,count);
-+
-+    for( i = 0; i < stream->dma_num_channels; i++ ){
-+
-+	dma_channel = &stream->dma_channels[i];
-+	stream->hwbuf[i] = dma_channel->area + ( frames_to_bytes(runtime,pos) * stream->dma2usr_ratio / stream->dma_num_channels );
-+
-+    }
-+
-+    if(copy_to_user_with_conversion(stream,(const char*)src,tocount,state->bCompactMode) <=0 ){
-+
-+	DPRINTK(KERN_ERR "copy_to_user_with_conversion() failed\n");
-+	return -EFAULT;
-+    }
-+
-+    DPRINTK("snd_ep93xx_pcm_copy_capture - exit\n");
-+    return 0;
-+}
-+
-+/*----------------------------------------------------------------------------------*/
-+static unsigned short ep93xx_ac97_read(struct snd_ac97 *ac97, unsigned short reg)
-+{
-+	int val = -1;
-+	/*volatile u32 *reg_addr;*/
-+
-+	DPRINTK(" number of codec:%x reg=%x\n",ac97->num,reg);
-+	val=peek(reg);
-+	if(val==-1){
-+		printk(KERN_ERR "%s: read error (ac97_reg=%d )val=%x\n",
-+				__FUNCTION__, reg, val);
-+		return 0;
-+	}
-+
-+	return val;
-+}
-+
-+static void ep93xx_ac97_write(struct snd_ac97 *ac97, unsigned short reg, unsigned short val)
-+{
-+	/*volatile u32 *reg_addr;*/
-+	int ret;
-+
-+	DPRINTK(" number of codec:%x rge=%x val=%x\n",ac97->num,reg,val);
-+	ret=poke(reg, val);
-+	if(ret!=0){
-+		printk(KERN_ERR "%s: write error (ac97_reg=%d val=%x)\n",
-+				__FUNCTION__, reg, val);
-+	}
-+
-+}
-+
-+static void ep93xx_ac97_reset(struct snd_ac97 *ac97)
-+{
-+
-+	DPRINTK(" ep93xx_ac97_reset\n");
-+	ep93xx_audio_init();
-+
-+}
-+
-+static struct snd_ac97_bus_ops ep93xx_ac97_ops = {
-+	.read	= ep93xx_ac97_read,
-+	.write	= ep93xx_ac97_write,
-+	.reset	= ep93xx_ac97_reset,
-+};
-+
-+static struct snd_pcm *ep93xx_ac97_pcm;
-+static struct snd_ac97 *ep93xx_ac97_ac97;
-+
-+static struct snd_pcm_ops snd_ep93xx_pcm_playback_ops = {
-+	.open		= snd_ep93xx_pcm_open,
-+	.close		= snd_ep93xx_pcm_close,
-+	.ioctl		= snd_pcm_lib_ioctl,
-+	.hw_params	= snd_ep93xx_pcm_hw_params,
-+	.hw_free	= snd_ep93xx_pcm_hw_free,
-+	.prepare	= snd_ep93xx_pcm_prepare_playback,
-+	.trigger	= snd_ep93xx_pcm_trigger,
-+	.pointer	= snd_ep93xx_pcm_pointer_playback,
-+	.copy		= snd_ep93xx_pcm_copy_playback,
-+
-+};
-+
-+static struct snd_pcm_ops snd_ep93xx_pcm_capture_ops = {
-+	.open		= snd_ep93xx_pcm_open,
-+	.close		= snd_ep93xx_pcm_close,
-+	.ioctl		= snd_pcm_lib_ioctl,
-+	.hw_params	= snd_ep93xx_pcm_hw_params,
-+	.hw_free	= snd_ep93xx_pcm_hw_free,
-+	.prepare	= snd_ep93xx_pcm_prepare_capture,
-+	.trigger	= snd_ep93xx_pcm_trigger,
-+	.pointer	= snd_ep93xx_pcm_pointer_capture,
-+	.copy 		= snd_ep93xx_pcm_copy_capture,
-+};
-+
-+/*--------------------------------------------------------------------------*/
-+
-+
-+static int snd_ep93xx_pcm_new(struct snd_card *card, audio_state_t *state, struct snd_pcm **rpcm)
-+{
-+    struct snd_pcm *pcm;
-+    int play = state->output_stream? 1 : 0;/*SNDRV_PCM_STREAM_PLAYBACK*/
-+    int capt = state->input_stream ? 1 : 0;/*SNDRV_PCM_STREAM_CAPTURE*/
-+    int ret = 0;
-+
-+    DPRINTK("snd_ep93xx_pcm_new - enter\n");
-+
-+    /* Register the new pcm device interface */
-+    ret = snd_pcm_new(card, "EP93xx-AC97-PCM", 0, play, capt, &pcm);
-+
-+    if (ret){
-+	DPRINTK("%s--%x:card=%x,play=%x,capt=%x,&pcm=%x\n",__FUNCTION__,ret,(int)card,play,capt,(int)pcm);
-+	goto out;
-+    }
-+
-+    /* allocate the pcm(DMA) memory */
-+    ret = snd_pcm_lib_preallocate_pages_for_all(pcm, /*SNDRV_DMA_TYPE_DEV,0,*/SNDRV_DMA_TYPE_CONTINUOUS,snd_dma_continuous_data(GFP_KERNEL),128*1024,128*1024);
-+
-+    DPRINTK("The substream item : \n");
-+    DPRINTK("pcm->streams[0].substream->dma_buffer.addr  = 0x%x\n", pcm->streams[0].substream->dma_buffer.addr);
-+    DPRINTK("pcm->streams[0].substream->dma_buffer.area  = 0x%x\n", pcm->streams[0].substream->dma_buffer.area);
-+    DPRINTK("pcm->streams[0].substream->dma_buffer.bytes = 0x%x\n", pcm->streams[0].substream->dma_buffer.bytes);
-+    DPRINTK("pcm->streams[1].substream->dma_buffer.addr  = 0x%x\n", pcm->streams[1].substream->dma_buffer.addr);
-+    DPRINTK("pcm->streams[1].substream->dma_buffer.area  = 0x%x\n", pcm->streams[1].substream->dma_buffer.area);
-+    DPRINTK("pcm->streams[1].substream->dma_buffer.bytes = 0x%x\n", pcm->streams[1].substream->dma_buffer.bytes);
-+
-+    pcm->private_data = state;
-+
-+    /* seem to free the pcm data struct-->self dma buffer */
-+    pcm->private_free = (void*) snd_pcm_lib_preallocate_free_for_all;
-+
-+    /* alsa pcm ops setting for SNDRV_PCM_STREAM_PLAYBACK */
-+    if (play) {
-+	int stream = SNDRV_PCM_STREAM_PLAYBACK;
-+	snd_pcm_set_ops(pcm, stream, &snd_ep93xx_pcm_playback_ops);
-+    }
-+
-+    /* alsa pcm ops setting for SNDRV_PCM_STREAM_CAPTURE */
-+    if (capt) {
-+	int stream = SNDRV_PCM_STREAM_CAPTURE;
-+	snd_pcm_set_ops(pcm, stream, &snd_ep93xx_pcm_capture_ops);
-+    }
-+
-+    if (rpcm)
-+	*rpcm = pcm;
-+    DPRINTK("snd_ep93xx_pcm_new - exit\n");
-+out:
-+    return ret;
-+}
-+
-+#ifdef CONFIG_PM
-+
-+int ep93xx_ac97_do_suspend(struct snd_card *card, unsigned int state)
-+{
-+	if (card->power_state != SNDRV_CTL_POWER_D3cold) {
-+		snd_pcm_suspend_all(ep93xx_ac97_pcm);
-+		snd_ac97_suspend(ep93xx_ac97_ac97);
-+		snd_power_change_state(card, SNDRV_CTL_POWER_D3cold);
-+	}
-+
-+	return 0;
-+}
-+
-+int ep93xx_ac97_do_resume(struct snd_card *card, unsigned int state)
-+{
-+	if (card->power_state != SNDRV_CTL_POWER_D0) {
-+
-+		snd_ac97_resume(ep93xx_ac97_ac97);
-+		snd_power_change_state(card, SNDRV_CTL_POWER_D0);
-+	}
-+
-+	return 0;
-+}
-+
-+int ep93xx_ac97_suspend(struct platform_device *_dev, u32 state, u32 level)
-+{
-+	struct snd_card *card = platform_get_drvdata(_dev);
-+	int ret = 0;
-+
-+	if (card && level == SUSPEND_DISABLE)
-+		ret = ep93xx_ac97_do_suspend(card, SNDRV_CTL_POWER_D3cold);
-+
-+	return ret;
-+}
-+
-+int ep93xx_ac97_resume(struct platform_device *_dev, u32 level)
-+{
-+	struct snd_card *card = platform_get_drvdata(_dev);
-+	int ret = 0;
-+
-+	if (card && level == RESUME_ENABLE)
-+		ret = ep93xx_ac97_do_resume(card, SNDRV_CTL_POWER_D0);
-+
-+	return ret;
-+}
-+
-+#else
-+/*
-+#define ep93xx_ac97_do_suspend		NULL
-+#define ep93xx_ac97_do_resume		NULL
-+#define ep93xx_ac97_suspend		NULL
-+#define ep93xx_ac97_resume		NULL
-+*/
-+
-+int ep93xx_ac97_do_suspend(struct snd_card *card, unsigned int state)
-+{
-+        return 0;
-+}
-+
-+int ep93xx_ac97_do_resume(struct snd_card *card, unsigned int state)
-+{
-+        return 0;
-+}
-+
-+int ep93xx_ac97_resume(struct platform_device *_dev, u32 level)
-+{
-+        struct snd_card *card = platform_get_drvdata(_dev);
-+        int ret = 0;
-+
-+        //if (card && level == RESUME_ENABLE)
-+                ret = ep93xx_ac97_do_resume(card, SNDRV_CTL_POWER_D0);
-+
-+        return ret;
-+}
-+
-+int ep93xx_ac97_suspend(struct platform_device *_dev, u32 state, u32 level)
-+{
-+        struct snd_card *card = platform_get_drvdata(_dev);
-+        int ret = 0;
-+
-+        //if (card && level == SUSPEND_DISABLE)
-+                ret = ep93xx_ac97_do_suspend(card, SNDRV_CTL_POWER_D3cold);
-+
-+        return ret;
-+}
-+
-+#endif
-+
-+
-+
-+/* module init & exit */
-+static int __devinit ep93xx_ac97_probe(struct platform_device *dev)
-+{
-+    struct snd_card *card;
-+    struct snd_ac97_bus *ac97_bus;
-+    struct snd_ac97_template ac97_template;
-+    int err = -ENOMEM;
-+    struct resource *res = NULL;
-+
-+    DPRINTK("snd_ep93xx_probe - enter\n");
-+
-+    /* Enable audio early on, give the DAC time to come up. */
-+    res = platform_get_resource( dev, IORESOURCE_MEM, 0);
-+
-+    if(!res) {
-+	printk("error : platform_get_resource \n");
-+        return -ENODEV;
-+    }
-+
-+    if (!request_mem_region(res->start,res->end - res->start + 1, "snd-ac97-cs4202" )){
-+    	printk("error : request_mem_region\n");
-+        return -EBUSY;
-+    }
-+
-+    /*enable ac97 codec*/
-+    ep93xx_audio_init();
-+
-+    /* register the soundcard */
-+    card = snd_card_new(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,
-+			    THIS_MODULE, 0);
-+    if (!card){
-+	printk("AC97: snd_card_new error\n");
-+	goto error;
-+    }
-+
-+    card->dev = &dev->dev;
-+    /*regist the new pcm device*/
-+    err = snd_ep93xx_pcm_new(card, &audio_state, &ep93xx_ac97_pcm);
-+    if (err){
-+	printk("AC97: ep93xx_ac97_pcm_new error\n");
-+	goto error;
-+    }
-+    if (card == NULL) {
-+	DPRINTK(KERN_ERR "snd_card_new() failed\n");
-+	goto error;
-+    }
-+
-+    /*driver name*/
-+    strcpy(card->driver, "CS4202A");
-+    strcpy(card->shortname, "Cirrus Logic AC97 Audio ");
-+    strcpy(card->longname, "Cirrus Logic AC97 Audio with CS4202A");
-+
-+    /*regist the new ac97 device*/
-+    err = snd_ac97_bus(card, 0, &ep93xx_ac97_ops, NULL, &ac97_bus);
-+    if (err){
-+	printk("AC97: snd_ac97_bus error\n");
-+	goto error;
-+    }
-+
-+    memset(&ac97_template, 0, sizeof(ac97_template));
-+    err = snd_ac97_mixer(ac97_bus, &ac97_template, &ep93xx_ac97_ac97);
-+    if (err){
-+	printk("AC97: snd_ac97_mixer error\n");
-+	goto error;
-+    }
-+
-+    /**/
-+    ep93xx_audio_init();
-+    /*setting the card device callback*/
-+    //err = snd_card_set_pm_callback(card, ep93xx_ac97_do_suspend,ep93xx_ac97_do_resume, (void*)NULL);
-+    //if(err != 0){
-+    //	printk("snd_card_set_pm_callback error\n");
-+    //}
-+
-+    /*regist the new CARD device*/
-+    err = snd_card_register(card);
-+    if (err == 0) {
-+	printk( KERN_INFO "Cirrus Logic ep93xx ac97 audio initialized\n" );
-+	platform_set_drvdata(dev,card);
-+	DPRINTK("snd_ep93xx_probe - exit\n");
-+    	return 0;
-+    }
-+
-+error:
-+    snd_card_free(card);
-+    printk("snd_ep93xx_probe - error\n");
-+    return err;
-+
-+return 0;
-+}
-+
-+static int __devexit ep93xx_ac97_remove(struct platform_device *dev)
-+{
-+    struct resource *res;
-+    struct snd_card *card = platform_get_drvdata(dev);
-+
-+    res = platform_get_resource( dev, IORESOURCE_MEM, 0);
-+    release_mem_region(res->start, res->end - res->start + 1);
-+
-+    DPRINTK("snd_ep93xx_ac97_remove - enter\n");
-+
-+    if (card) {
-+	snd_card_free(card);
-+	platform_set_drvdata(dev, NULL);
-+    }
-+    DPRINTK("snd_ep93xx_remove - exit\n");
-+
-+return 0;
-+}
-+
-+
-+static struct platform_driver ep93xx_ac97_driver = {
-+	.probe		= ep93xx_ac97_probe,
-+	.remove		= __devexit_p (ep93xx_ac97_remove),
-+	.suspend	= ep93xx_ac97_suspend,
-+	.resume		= ep93xx_ac97_resume,
-+	.driver		= {
-+		.name	= "ep93xx-ac97",
-+	},
-+};
-+
-+
-+static int __init ep93xx_ac97_init(void)
-+{
-+    int ret;
-+
-+    DPRINTK(KERN_INFO "%s: version %s\n", DRIVER_DESC, DRIVER_VERSION);
-+    DPRINTK("snd_ep93xx_AC97_init - enter\n");
-+    ret = platform_driver_register(&ep93xx_ac97_driver);
-+    DPRINTK("snd_ep93xx_AC97_init - exit\n");
-+    return ret;
-+}
-+
-+static void __exit ep93xx_ac97_exit(void)
-+{
-+    DPRINTK("ep93xx_ac97_exit  - enter\n");
-+    return platform_driver_unregister(&ep93xx_ac97_driver);
-+}
-+
-+module_init(ep93xx_ac97_init);
-+module_exit(ep93xx_ac97_exit);
-+
-+MODULE_DESCRIPTION("Cirrus Logic audio module");
-+MODULE_LICENSE("GPL");
---- /dev/null
-+++ b/sound/arm/ep93xx-ac97.h
-@@ -0,0 +1,89 @@
-+/*
-+ * linux/sound/arm/ep93xx-ac97.h -- ALSA PCM interface for the edb93xx ac97 audio
-+ *
-+ * Author:      Fred Wei
-+ * Created:     July 19, 2005
-+ * Copyright:   Cirrus Logic, Inc.
-+ *
-+ * 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.
-+ */
-+
-+#define EP93XX_DEFAULT_NUM_CHANNELS     2
-+#define EP93XX_DEFAULT_FORMAT           SNDRV_PCM_FORMAT_S16_LE
-+#define EP93XX_DEFAULT_BIT_WIDTH        16
-+#define MAX_DEVICE_NAME 		20
-+
-+/*
-+ * Buffer Management
-+ */
-+
-+typedef struct {
-+
-+    unsigned char	*area;    	/* virtual pointer */
-+    dma_addr_t 		dma_addr;       /* physical address */
-+    size_t 		bytes;
-+    size_t 		reportedbytes;	/* buffer size */
-+    int 		sent;		/* indicates that dma has the buf */
-+    char		*start;		/* points to actual buffer */
-+
-+} audio_buf_t;
-+
-+
-+typedef struct {
-+
-+    unsigned char	*area;  		/* virtual pointer */
-+    dma_addr_t 		addr;        		/* physical address */
-+    size_t 		bytes;          	/* buffer size in bytes */
-+    unsigned char      	*buff_pos;              /* virtual pointer */
-+    audio_buf_t        	*audio_buffers; 	/* array of audio buffer structures */
-+    int 		audio_buff_count;
-+
-+
-+} audio_channel_t;
-+
-+typedef struct audio_stream_s {
-+
-+    /* dma stuff */
-+    int			dmahandles[3];		/* handles for dma driver instances */
-+    char		devicename[MAX_DEVICE_NAME]; /* string - name of device */
-+    int			dma_num_channels;		/* 1, 2, or 3 DMA channels */
-+    audio_channel_t	*dma_channels;
-+    u_int 		nbfrags;		/* nbr of fragments i.e. buffers */
-+    u_int		fragsize;		/* fragment i.e. buffer size */
-+    u_int		dmasize;
-+    int 		bytecount;		/* nbr of processed bytes */
-+    int 		externedbytecount;	/* nbr of processed bytes */
-+    volatile int        active;                 /* actually in progress                 */
-+    volatile int        stopped;                /* might be active but stopped          */
-+    char 		*hwbuf[3];
-+    long		audio_rate;
-+    long 		audio_num_channels;		/* Range: 1 to 6 */
-+    int			audio_channels_flag;
-+    long 		audio_format;
-+    long 		audio_stream_bitwidth;		/* Range: 8, 16, 24 */
-+    int			dma2usr_ratio;
-+
-+} audio_stream_t;
-+
-+
-+/*
-+ * State structure for one instance
-+ */
-+typedef struct {
-+
-+    audio_stream_t 	*output_stream;
-+    audio_stream_t 	*input_stream;
-+    ep93xx_dma_dev_t	output_dma[3];
-+    ep93xx_dma_dev_t	input_dma[3];
-+    char 		*output_id[3];
-+    char 		*input_id[3];
-+    struct              semaphore sem;          /* to protect against races in attach() */
-+    int			codec_set_by_playback;
-+    int                 codec_set_by_capture;
-+    int                 DAC_bit_width;          /* 16, 20, 24 bits */
-+    int                 bCompactMode;           /* set if 32bits = a stereo sample */
-+
-+} audio_state_t;
-+
diff --git a/target/linux/ep93xx/patches-2.6.30/011-simone-board-def.patch b/target/linux/ep93xx/patches-2.6.30/011-simone-board-def.patch
deleted file mode 100644
index d499259ad..000000000
--- a/target/linux/ep93xx/patches-2.6.30/011-simone-board-def.patch
+++ /dev/null
@@ -1,1658 +0,0 @@
-Index: linux-2.6.30.9/arch/arm/mach-ep93xx/Kconfig
-===================================================================
---- linux-2.6.30.9.orig/arch/arm/mach-ep93xx/Kconfig	2009-11-26 00:13:04.000000000 +0100
-+++ linux-2.6.30.9/arch/arm/mach-ep93xx/Kconfig	2009-11-26 00:13:15.000000000 +0100
-@@ -88,6 +88,12 @@
-          Say 'Y' here if you want your kernel to support the
-          Contec Hypercontrol Micro9-L board.
- 
-+config MACH_SIM_ONE
-+	bool "Support SIM.ONE board "
-+	help
-+	  Say 'Y' here if you want your kernel to support the
-+	  Simplemachines SIM.ONE board.
-+
- config MACH_TS72XX
- 	bool "Support Technologic Systems TS-72xx SBC"
- 	help
-Index: linux-2.6.30.9/arch/arm/mach-ep93xx/Makefile
-===================================================================
---- linux-2.6.30.9.orig/arch/arm/mach-ep93xx/Makefile	2009-11-26 00:13:04.000000000 +0100
-+++ linux-2.6.30.9/arch/arm/mach-ep93xx/Makefile	2009-11-26 00:13:15.000000000 +0100
-@@ -16,4 +16,5 @@
- obj-$(CONFIG_MACH_EDB9315A)	+= edb9315a.o
- obj-$(CONFIG_MACH_GESBC9312)	+= gesbc9312.o
- obj-$(CONFIG_MACH_MICRO9)	+= micro9.o
-+obj-$(CONFIG_MACH_SIM_ONE)	+= simone.o
- obj-$(CONFIG_MACH_TS72XX)	+= ts72xx.o
-Index: linux-2.6.30.9/arch/arm/mach-ep93xx/Makefile.boot
-===================================================================
---- linux-2.6.30.9.orig/arch/arm/mach-ep93xx/Makefile.boot	2009-11-26 00:13:04.000000000 +0100
-+++ linux-2.6.30.9/arch/arm/mach-ep93xx/Makefile.boot	2009-11-26 00:13:15.000000000 +0100
-@@ -1,2 +1,4 @@
-    zreladdr-y	:= 0x00008000
- params_phys-y	:= 0x00000100
-+   zreladdr-$(CONFIG_MACH_SIM_ONE)	:= 0xc0008000
-+params_phys-$(CONFIG_MACH_SIM_ONE)	:= 0xc0000100
-Index: linux-2.6.30.9/arch/arm/mach-ep93xx/simone.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.30.9/arch/arm/mach-ep93xx/simone.c	2009-11-26 00:14:09.000000000 +0100
-@@ -0,0 +1,217 @@
-+/*
-+ * arch/arm/mach-ep93xx/simone.c
-+ * Simplemachines SIM.ONE support.
-+ *
-+ * Copyright (C) 2009 Simplemachines
-+ * MMC support by Peter Ivanov <ivanovp@gmail.com>, 2007
-+ *
-+ * 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/kernel.h>
-+#include <linux/init.h>
-+#include <linux/mm.h>
-+#include <linux/sched.h>
-+#include <linux/interrupt.h>
-+#include <linux/ioport.h>
-+#include <linux/mtd/physmap.h>
-+#include <linux/platform_device.h>
-+#include <linux/spi/spi.h>
-+#include <linux/spi/mmc_spi.h>
-+#include <linux/mmc/host.h>
-+#include <linux/jiffies.h>
-+#include <linux/irq.h>
-+
-+#include <asm/io.h>
-+#include <mach/hardware.h>
-+#include <asm/mach-types.h>
-+#include <asm/mach/arch.h>
-+#include <asm/gpio.h>
-+
-+static struct physmap_flash_data simone_flash_data = {
-+	.width		= 2,
-+};
-+
-+static struct resource simone_flash_resource = {
-+	.start		= 0x60000000,
-+	.end		= 0x60000000+ SZ_8M - 1,
-+	.flags		= IORESOURCE_MEM,
-+};
-+
-+static struct platform_device simone_flash = {
-+	.name		= "physmap-flash",
-+	.id		= 0,
-+	.dev		= {
-+		.platform_data	= &simone_flash_data,
-+	},
-+	.num_resources	= 1,
-+	.resource	= &simone_flash_resource,
-+};
-+
-+
-+static struct resource ep93xx_ac97_resources[] = {
-+	[0] = {
-+                .start          = EP93XX_AC97_PHY_BASE,
-+                .end            = EP93XX_AC97_PHY_BASE + 0x6C,
-+		.flags	= IORESOURCE_MEM,
-+	},
-+	[1] = {
-+                .start          = NO_IRQ,
-+                .end            = NO_IRQ,
-+                .flags          = IORESOURCE_IRQ,
-+        },
-+};
-+
-+static u64 ep93xx_ac97_dma_mask = 0xffffffffUL;
-+
-+static struct platform_device ep93xx_ac97_device = {
-+        .name           = "ep93xx-ac97",
-+        .id             = 0,
-+        .num_resources  = 2,
-+        .resource       = ep93xx_ac97_resources,
-+        .dev = {
-+                .dma_mask               = &ep93xx_ac97_dma_mask,
-+                .coherent_dma_mask      = 0xffffffffUL,
-+        },
-+};
-+
-+
-+#ifdef CONFIG_SPI
-+static struct resource ep93xx_spi_resources[] = {
-+      [0] = {
-+              .start  = EP93XX_SPI_BASE_PHYS,
-+              .end    = EP93XX_SPI_BASE_PHYS + 0x0fff,
-+              .flags  = IORESOURCE_MEM,
-+      },
-+      [1] = {
-+              .start  = IRQ_EP93XX_SSP,
-+              .end    = IRQ_EP93XX_SSP,
-+              .flags  = IORESOURCE_IRQ,
-+      },
-+};
-+
-+static struct platform_device ep93xx_spi_device = {
-+      .name           = "ep93xx-spi",
-+      .id             = 0,
-+      .resource       = ep93xx_spi_resources,
-+      .num_resources  = ARRAY_SIZE(ep93xx_spi_resources),
-+};
-+
-+
-+#define EP93XX_MMC_SPI_CARD_PRESENT	EP93XX_GPIO_LINE_A(0)
-+
-+/*
-+ * Initializes SPI system to communicate with MMC/SD card
-+ */
-+int ep93xx_mmc_spi_init (struct device *pdev, irqreturn_t (*card_det_irq_handler)(int, void *),
-+		void *mmc)
-+{
-+	int rv;
-+
-+	rv = gpio_request(EP93XX_MMC_SPI_CARD_PRESENT, "ep93xx-mmc-spi");
-+	if (rv) {
-+		dev_info(pdev, "failed to request MMC/SD gpio pin\n");
-+		return rv;
-+	}
-+
-+	gpio_direction_input (EP93XX_MMC_SPI_CARD_PRESENT);
-+
-+	if ((rv = request_irq (gpio_to_irq( EP93XX_MMC_SPI_CARD_PRESENT),
-+					card_det_irq_handler,
-+					IRQF_DISABLED | IRQ_TYPE_EDGE_FALLING, /* flags */
-+					"ep93xx-mmc-spi", 	/* devname */
-+					mmc 			/* void *devid */
-+			      )) == 0)
-+	{
-+		dev_info (pdev, "MMC/SD card detection IRQ %i assigned.\n",
-+				gpio_to_irq(EP93XX_MMC_SPI_CARD_PRESENT));
-+	}
-+	else
-+	{
-+		dev_err (pdev, "Cannot assign MMC/SD card detection IRQ (%i)!\n",
-+				gpio_to_irq(EP93XX_MMC_SPI_CARD_PRESENT));
-+		return rv;
-+	}
-+	return 0;
-+}
-+
-+void ep93xx_mmc_spi_exit (struct device *pdev, void *mmc)
-+{
-+	free_irq (EP93XX_MMC_SPI_CARD_PRESENT, mmc);
-+}
-+
-+static struct mmc_spi_platform_data ep93xx_spi_pdata = {
-+	.init = &ep93xx_mmc_spi_init,
-+	.exit = &ep93xx_mmc_spi_exit,
-+	.get_ro = NULL,
-+	.detect_delay = 500,			/* card detection delay in msec */
-+	.ocr_mask = MMC_VDD_33_34,
-+};
-+
-+static struct spi_board_info ep93xx_spi_board_info[] __initdata = {
-+	{
-+		.modalias = "mmc_spi",
-+		.max_speed_hz = 7.4E6,				/* max spi clock (SCK) speed in HZ */
-+		.bus_num = 0,
-+		.chip_select = 0,
-+		.platform_data = (void*) &ep93xx_spi_pdata,
-+		.controller_data = NULL,
-+		.mode = SPI_MODE_0,
-+	}
-+};
-+#endif
-+static struct ep93xx_eth_data ep93xx_eth_data = {
-+	.dev_addr	= { 0x00, 0xba, 0xd0, 0x0b, 0xad, 0x00 },
-+};
-+
-+static struct resource ep93xx_eth_resource[] = {
-+	{
-+		.start	= EP93XX_ETHERNET_PHYS_BASE,
-+		.end	= EP93XX_ETHERNET_PHYS_BASE + 0xffff,
-+		.flags	= IORESOURCE_MEM,
-+	}, {
-+		.start	= IRQ_EP93XX_ETHERNET,
-+		.end	= IRQ_EP93XX_ETHERNET,
-+		.flags	= IORESOURCE_IRQ,
-+	}
-+};
-+
-+static struct platform_device ep93xx_eth_device = {
-+	.name		= "ep93xx-eth",
-+	.id		= -1,
-+	.dev		= {
-+		.platform_data	= &ep93xx_eth_data,
-+	},
-+	.num_resources	= ARRAY_SIZE(ep93xx_eth_resource),
-+	.resource	= ep93xx_eth_resource,
-+};
-+
-+static void __init simone_init_machine(void)
-+{
-+	ep93xx_init_devices();
-+        /* Switch off the LCD backlight*/
-+	gpio_request(EP93XX_GPIO_LINE_B(5), "lcd");
-+        gpio_direction_output (EP93XX_GPIO_LINE_B(5), 0);
-+	platform_device_register(&simone_flash);
-+        platform_device_register(&ep93xx_ac97_device);
-+	platform_device_register(&ep93xx_eth_device);
-+#if defined(CONFIG_SPI_EP93XX) || defined(CONFIG_SPI_EP93XX_MODULE)
-+	dev_set_name(&ep93xx_spi_device.dev, "apb:spi");
-+	platform_device_register(&ep93xx_spi_device);
-+	spi_register_board_info(ep93xx_spi_board_info,ARRAY_SIZE(ep93xx_spi_board_info));
-+#endif
-+}
-+
-+MACHINE_START(SIM_ONE, "Simplemachine SimONE Board")
-+	/* Maintainer: Nuccio Raciti Simplemachine <nuccio.raciti@gmail.com>*/
-+	.phys_io	= EP93XX_APB_PHYS_BASE,
-+	.io_pg_offst	= ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,
-+	.boot_params	= 0x00000100,
-+	.map_io		= ep93xx_map_io,
-+	.init_irq	= ep93xx_init_irq,
-+	.timer		= &ep93xx_timer,
-+	.init_machine	= simone_init_machine,
-+MACHINE_END
-Index: linux-2.6.30.9/arch/arm/mach-ep93xx/include/mach/memory.h
-===================================================================
---- linux-2.6.30.9.orig/arch/arm/mach-ep93xx/include/mach/memory.h	2009-11-26 00:13:04.000000000 +0100
-+++ linux-2.6.30.9/arch/arm/mach-ep93xx/include/mach/memory.h	2009-11-26 00:13:15.000000000 +0100
-@@ -5,6 +5,10 @@
- #ifndef __ASM_ARCH_MEMORY_H
- #define __ASM_ARCH_MEMORY_H
- 
-+#if defined(CONFIG_MACH_SIM_ONE)
-+#define PHYS_OFFSET		UL(0xc0000000)
-+#else
- #define PHYS_OFFSET		UL(0x00000000)
-+#endif
- 
- #endif
-Index: linux-2.6.30.9/arch/arm/configs/simone_defconfig
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.30.9/arch/arm/configs/simone_defconfig	2009-11-26 00:13:15.000000000 +0100
-@@ -0,0 +1,1380 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.24.7
-+# Tue May 12 17:49:25 2009
-+#
-+CONFIG_ARM=y
-+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-+# CONFIG_GENERIC_GPIO is not set
-+# CONFIG_GENERIC_TIME is not set
-+# CONFIG_GENERIC_CLOCKEVENTS is not set
-+CONFIG_MMU=y
-+# CONFIG_NO_IOPORT is not set
-+CONFIG_GENERIC_HARDIRQS=y
-+CONFIG_STACKTRACE_SUPPORT=y
-+CONFIG_LOCKDEP_SUPPORT=y
-+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-+CONFIG_HARDIRQS_SW_RESEND=y
-+CONFIG_GENERIC_IRQ_PROBE=y
-+CONFIG_RWSEM_GENERIC_SPINLOCK=y
-+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_ZONE_DMA=y
-+CONFIG_VECTORS_BASE=0xffff0000
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_LOCK_KERNEL=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_USER_NS is not set
-+# CONFIG_PID_NS is not set
-+# CONFIG_AUDIT is not set
-+CONFIG_IKCONFIG=y
-+CONFIG_IKCONFIG_PROC=y
-+CONFIG_LOG_BUF_SHIFT=16
-+# CONFIG_CGROUPS is not set
-+CONFIG_FAIR_GROUP_SCHED=y
-+CONFIG_FAIR_USER_SCHED=y
-+# CONFIG_FAIR_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+# CONFIG_RELAY is not set
-+# CONFIG_BLK_DEV_INITRD is not set
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_UID16=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+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_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLAB=y
-+# CONFIG_SLUB is not set
-+# CONFIG_SLOB is not set
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+CONFIG_MODULE_FORCE_UNLOAD=y
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+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
-+#
-+CONFIG_IOSCHED_NOOP=y
-+# CONFIG_IOSCHED_AS is not set
-+CONFIG_IOSCHED_DEADLINE=y
-+# CONFIG_IOSCHED_CFQ is not set
-+# CONFIG_DEFAULT_AS is not set
-+CONFIG_DEFAULT_DEADLINE=y
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="deadline"
-+
-+#
-+# System Type
-+#
-+# CONFIG_ARCH_AAEC2000 is not set
-+# CONFIG_ARCH_INTEGRATOR is not set
-+# CONFIG_ARCH_REALVIEW is not set
-+# CONFIG_ARCH_VERSATILE is not set
-+# CONFIG_ARCH_AT91 is not set
-+# CONFIG_ARCH_CLPS7500 is not set
-+# CONFIG_ARCH_CLPS711X is not set
-+# CONFIG_ARCH_CO285 is not set
-+# CONFIG_ARCH_EBSA110 is not set
-+CONFIG_ARCH_EP93XX=y
-+# CONFIG_ARCH_FOOTBRIDGE is not set
-+# 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_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
-+# CONFIG_ARCH_SA1100 is not set
-+# CONFIG_ARCH_S3C2410 is not set
-+# CONFIG_ARCH_SHARK is not set
-+# CONFIG_ARCH_LH7A40X is not set
-+# CONFIG_ARCH_DAVINCI is not set
-+# CONFIG_ARCH_OMAP is not set
-+
-+#
-+# Cirrus EP93xx Implementation Options
-+#
-+CONFIG_CRUNCH=y
-+
-+#
-+# EP93xx Platforms
-+#
-+# CONFIG_MACH_ADSSPHERE is not set
-+# CONFIG_MACH_EDB9302 is not set
-+# CONFIG_MACH_EDB9302A is not set
-+# CONFIG_MACH_EDB9307 is not set
-+# CONFIG_MACH_EDB9312 is not set
-+# CONFIG_MACH_EDB9315 is not set
-+# CONFIG_MACH_EDB9315A is not set
-+# CONFIG_MACH_GESBC9312 is not set
-+# CONFIG_MACH_MICRO9 is not set
-+# CONFIG_MACH_MICRO9H is not set
-+# CONFIG_MACH_MICRO9M is not set
-+# CONFIG_MACH_MICRO9L is not set
-+CONFIG_MACH_SIM_ONE=y
-+# CONFIG_MACH_TS72XX is not set
-+
-+#
-+# Boot options
-+#
-+
-+#
-+# Power management
-+#
-+
-+#
-+# Processor Type
-+#
-+CONFIG_CPU_32=y
-+CONFIG_CPU_ARM920T=y
-+CONFIG_CPU_32v4T=y
-+CONFIG_CPU_ABRT_EV4T=y
-+CONFIG_CPU_CACHE_V4WT=y
-+CONFIG_CPU_CACHE_VIVT=y
-+CONFIG_CPU_COPY_V4WB=y
-+CONFIG_CPU_TLB_V4WBI=y
-+CONFIG_CPU_CP15=y
-+CONFIG_CPU_CP15_MMU=y
-+
-+#
-+# Processor Features
-+#
-+CONFIG_ARM_THUMB=y
-+# CONFIG_CPU_ICACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
-+# CONFIG_OUTER_CACHE is not set
-+CONFIG_ARM_VIC=y
-+
-+#
-+# Bus support
-+#
-+CONFIG_ARM_AMBA=y
-+# CONFIG_PCI_SYSCALL is not set
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
-+# CONFIG_PCCARD is not set
-+
-+#
-+# Kernel Features
-+#
-+# CONFIG_TICK_ONESHOT is not set
-+CONFIG_PREEMPT=y
-+# CONFIG_NO_IDLE_HZ is not set
-+CONFIG_HZ=100
-+CONFIG_AEABI=y
-+CONFIG_OABI_COMPAT=y
-+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+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_ALIGNMENT_TRAP=y
-+
-+#
-+# Boot options
-+#
-+CONFIG_ZBOOT_ROM_TEXT=0x0
-+CONFIG_ZBOOT_ROM_BSS=0x0
-+CONFIG_CMDLINE="console=ttyAM0,115200 root=/dev/ram"
-+# CONFIG_XIP_KERNEL is not set
-+# CONFIG_KEXEC is not set
-+
-+#
-+# Floating point emulation
-+#
-+
-+#
-+# At least one emulation must be selected
-+#
-+CONFIG_FPE_NWFPE=y
-+CONFIG_FPE_NWFPE_XP=y
-+# CONFIG_FPE_FASTFPE is not set
-+
-+#
-+# Userspace binary formats
-+#
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_AOUT is not set
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_ARTHUR is not set
-+
-+#
-+# Power management options
-+#
-+# CONFIG_PM is not set
-+CONFIG_SUSPEND_UP_POSSIBLE=y
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+CONFIG_PACKET_MMAP=y
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+CONFIG_NET_KEY=y
-+# CONFIG_NET_KEY_MIGRATE is not set
-+CONFIG_INET=y
-+# CONFIG_IP_MULTICAST is not set
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+CONFIG_INET_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+CONFIG_IPV6=y
-+# CONFIG_IPV6_PRIVACY is not set
-+# CONFIG_IPV6_ROUTER_PREF is not set
-+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-+# CONFIG_INET6_AH is not set
-+# CONFIG_INET6_ESP is not set
-+# CONFIG_INET6_IPCOMP is not set
-+# CONFIG_IPV6_MIP6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
-+# CONFIG_INET6_XFRM_MODE_BEET is not set
-+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-+# CONFIG_IPV6_SIT is not set
-+# CONFIG_IPV6_TUNNEL is not set
-+# CONFIG_IPV6_MULTIPLE_TABLES is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+CONFIG_NET_SCH_FIFO=y
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+CONFIG_CFG80211=y
-+CONFIG_NL80211=y
-+CONFIG_WIRELESS_EXT=y
-+CONFIG_MAC80211=m
-+CONFIG_MAC80211_RCSIMPLE=y
-+# CONFIG_MAC80211_DEBUG is not set
-+CONFIG_IEEE80211=m
-+# CONFIG_IEEE80211_DEBUG is not set
-+CONFIG_IEEE80211_CRYPT_WEP=m
-+CONFIG_IEEE80211_CRYPT_CCMP=m
-+CONFIG_IEEE80211_CRYPT_TKIP=m
-+# CONFIG_IEEE80211_SOFTMAC is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+# CONFIG_MTD_CMDLINE_PARTS is not set
-+# CONFIG_MTD_AFS_PARTS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+CONFIG_MTD_BLOCK=y
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+CONFIG_MTD_CFI_ADV_OPTIONS=y
-+CONFIG_MTD_CFI_NOSWAP=y
-+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-+# CONFIG_MTD_CFI_GEOMETRY is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+# CONFIG_MTD_OTP is not set
-+CONFIG_MTD_CFI_INTELEXT=y
-+CONFIG_MTD_CFI_AMDSTD=y
-+CONFIG_MTD_CFI_STAA=y
-+CONFIG_MTD_CFI_UTIL=y
-+CONFIG_MTD_RAM=y
-+# CONFIG_MTD_ROM is not set
-+# CONFIG_MTD_ABSENT is not set
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+CONFIG_MTD_PHYSMAP=y
-+CONFIG_MTD_PHYSMAP_START=0x0
-+CONFIG_MTD_PHYSMAP_LEN=0x0
-+CONFIG_MTD_PHYSMAP_BANKWIDTH=1
-+# CONFIG_MTD_ARM_INTEGRATOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_DATAFLASH is not set
-+# CONFIG_MTD_M25P80 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+# CONFIG_MTD_NAND is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+CONFIG_BLK_DEV_NBD=y
-+# CONFIG_BLK_DEV_UB is not set
-+# CONFIG_BLK_DEV_RAM is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+# CONFIG_MISC_DEVICES is not set
-+CONFIG_EEPROM_93CX6=m
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=y
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_SCSI_PROC_FS is not set
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=y
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+# CONFIG_BLK_DEV_SR is not set
-+# CONFIG_CHR_DEV_SG is not set
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+# CONFIG_SCSI_SCAN_ASYNC is not set
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+CONFIG_EP93XX_ETH=y
-+# CONFIG_AX88796 is not set
-+# CONFIG_SMC91X is not set
-+# CONFIG_DM9000 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_B44 is not set
-+# CONFIG_NETDEV_1000 is not set
-+# CONFIG_NETDEV_10000 is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+CONFIG_WLAN_80211=y
-+# CONFIG_LIBERTAS is not set
-+# CONFIG_USB_ZD1201 is not set
-+CONFIG_RTL8187=m
-+# CONFIG_HOSTAP is not set
-+# CONFIG_B43 is not set
-+# CONFIG_B43LEGACY is not set
-+# CONFIG_RT2X00 is not set
-+
-+#
-+# USB Network Adapters
-+#
-+CONFIG_USB_CATC=y
-+# CONFIG_USB_KAWETH is not set
-+# CONFIG_USB_PEGASUS is not set
-+CONFIG_USB_RTL8150=y
-+# CONFIG_USB_USBNET is not set
-+# CONFIG_WAN is not set
-+CONFIG_PPP=m
-+# CONFIG_PPP_MULTILINK is not set
-+# CONFIG_PPP_FILTER is not set
-+# CONFIG_PPP_ASYNC is not set
-+CONFIG_PPP_SYNC_TTY=m
-+# CONFIG_PPP_DEFLATE is not set
-+CONFIG_PPP_BSDCOMP=m
-+# CONFIG_PPP_MPPE is not set
-+CONFIG_PPPOE=m
-+# CONFIG_PPPOL2TP is not set
-+# CONFIG_SLIP is not set
-+CONFIG_SLHC=m
-+# CONFIG_SHAPER is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+CONFIG_INPUT_MOUSEDEV=y
-+CONFIG_INPUT_MOUSEDEV_PSAUX=y
-+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-+# CONFIG_INPUT_JOYDEV is not set
-+CONFIG_INPUT_EVDEV=y
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+CONFIG_INPUT_KEYBOARD=y
-+CONFIG_KEYBOARD_ATKBD=y
-+# CONFIG_KEYBOARD_SUNKBD is not set
-+# CONFIG_KEYBOARD_LKKBD is not set
-+# CONFIG_KEYBOARD_XTKBD is not set
-+# CONFIG_KEYBOARD_NEWTON is not set
-+# CONFIG_KEYBOARD_STOWAWAY is not set
-+CONFIG_INPUT_MOUSE=y
-+CONFIG_MOUSE_PS2=y
-+CONFIG_MOUSE_PS2_ALPS=y
-+# CONFIG_MOUSE_PS2_LOGIPS2PP is not set
-+# CONFIG_MOUSE_PS2_SYNAPTICS is not set
-+# CONFIG_MOUSE_PS2_LIFEBOOK is not set
-+# CONFIG_MOUSE_PS2_TRACKPOINT is not set
-+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
-+# CONFIG_MOUSE_SERIAL is not set
-+# CONFIG_MOUSE_APPLETOUCH is not set
-+# CONFIG_MOUSE_VSXXXAA is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+CONFIG_INPUT_TOUCHSCREEN=y
-+# CONFIG_TOUCHSCREEN_ADS7846 is not set
-+# CONFIG_TOUCHSCREEN_FUJITSU is not set
-+# CONFIG_TOUCHSCREEN_GUNZE is not set
-+# CONFIG_TOUCHSCREEN_ELO is not set
-+# CONFIG_TOUCHSCREEN_MTOUCH is not set
-+# CONFIG_TOUCHSCREEN_MK712 is not set
-+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-+# CONFIG_TOUCHSCREEN_UCB1400 is not set
-+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-+CONFIG_TOUCHSCREEN_EP93XX=y
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+CONFIG_SERIO=y
-+# CONFIG_SERIO_SERPORT is not set
-+# CONFIG_SERIO_AMBAKMI is not set
-+CONFIG_SERIO_LIBPS2=y
-+# CONFIG_SERIO_RAW is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+CONFIG_VT=y
-+CONFIG_VT_CONSOLE=y
-+CONFIG_HW_CONSOLE=y
-+# CONFIG_VT_HW_CONSOLE_BINDING is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+# CONFIG_SERIAL_8250 is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+CONFIG_SERIAL_AMBA_PL010=y
-+CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
-+# CONFIG_SERIAL_AMBA_PL011 is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+CONFIG_UNIX98_PTYS=y
-+# CONFIG_LEGACY_PTYS is not set
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+CONFIG_I2C_ALGOBIT=y
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+CONFIG_I2C_EP93XX=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
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+CONFIG_SENSORS_DS1337=y
-+# 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_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+# CONFIG_I2C_DEBUG_CORE is not set
-+# CONFIG_I2C_DEBUG_ALGO is not set
-+# CONFIG_I2C_DEBUG_BUS is not set
-+# CONFIG_I2C_DEBUG_CHIP is not set
-+
-+#
-+# SPI support
-+#
-+CONFIG_SPI=y
-+CONFIG_SPI_MASTER=y
-+
-+#
-+# SPI Master Controller Drivers
-+#
-+CONFIG_SPI_BITBANG=y
-+CONFIG_SPI_EP93XX=y
-+
-+#
-+# SPI Protocol Masters
-+#
-+# CONFIG_SPI_AT25 is not set
-+# CONFIG_SPI_SPIDEV is not set
-+# CONFIG_SPI_TLE62X0 is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_EP93XX_WATCHDOG=y
-+
-+#
-+# USB-based Watchdog Cards
-+#
-+# CONFIG_USBPCWATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+# CONFIG_DAB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=y
-+CONFIG_FB=y
-+# CONFIG_FIRMWARE_EDID is not set
-+# CONFIG_FB_DDC is not set
-+CONFIG_FB_CFB_FILLRECT=y
-+CONFIG_FB_CFB_COPYAREA=y
-+CONFIG_FB_CFB_IMAGEBLIT=y
-+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-+# CONFIG_FB_SYS_FILLRECT is not set
-+# CONFIG_FB_SYS_COPYAREA is not set
-+# CONFIG_FB_SYS_IMAGEBLIT is not set
-+# CONFIG_FB_SYS_FOPS is not set
-+CONFIG_FB_DEFERRED_IO=y
-+# CONFIG_FB_SVGALIB is not set
-+# CONFIG_FB_MACMODES is not set
-+# CONFIG_FB_BACKLIGHT is not set
-+# CONFIG_FB_MODE_HELPERS is not set
-+# CONFIG_FB_TILEBLITTING is not set
-+
-+#
-+# Frame buffer hardware drivers
-+#
-+CONFIG_FB_EP93XX=y
-+# CONFIG_FB_EP93XX_MONO is not set
-+# CONFIG_FB_ARMCLCD is not set
-+# CONFIG_FB_S1D13XXX is not set
-+# CONFIG_FB_VIRTUAL is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Console display driver support
-+#
-+# 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=y
-+CONFIG_FONT_8x8=y
-+CONFIG_FONT_8x16=y
-+# CONFIG_FONT_6x11 is not set
-+# CONFIG_FONT_7x14 is not set
-+# CONFIG_FONT_PEARL_8x8 is not set
-+# CONFIG_FONT_ACORN_8x8 is not set
-+# CONFIG_FONT_MINI_4x6 is not set
-+# CONFIG_FONT_SUN8x16 is not set
-+# CONFIG_FONT_SUN12x22 is not set
-+# CONFIG_FONT_10x18 is not set
-+CONFIG_LOGO=y
-+CONFIG_LOGO_LINUX_MONO=y
-+CONFIG_LOGO_LINUX_VGA16=y
-+CONFIG_LOGO_LINUX_CLUT224=y
-+
-+#
-+# Sound
-+#
-+CONFIG_SOUND=y
-+
-+#
-+# Advanced Linux Sound Architecture
-+#
-+CONFIG_SND=y
-+CONFIG_SND_TIMER=y
-+CONFIG_SND_PCM=y
-+# CONFIG_SND_SEQUENCER is not set
-+CONFIG_SND_OSSEMUL=y
-+CONFIG_SND_MIXER_OSS=y
-+CONFIG_SND_PCM_OSS=y
-+CONFIG_SND_PCM_OSS_PLUGINS=y
-+# CONFIG_SND_DYNAMIC_MINORS is not set
-+# CONFIG_SND_SUPPORT_OLD_API is not set
-+# CONFIG_SND_VERBOSE_PROCFS is not set
-+# CONFIG_SND_VERBOSE_PRINTK is not set
-+# CONFIG_SND_DEBUG is not set
-+
-+#
-+# Generic devices
-+#
-+CONFIG_SND_AC97_CODEC=y
-+# CONFIG_SND_DUMMY is not set
-+# CONFIG_SND_MTPAV is not set
-+# CONFIG_SND_SERIAL_U16550 is not set
-+# CONFIG_SND_MPU401 is not set
-+
-+#
-+# ALSA ARM devices
-+#
-+CONFIG_SND_EP93XX_AC97=y
-+CONFIG_SND_EP93XX_PCM=y
-+# CONFIG_SND_ARMAACI is not set
-+
-+#
-+# SPI devices
-+#
-+
-+#
-+# USB devices
-+#
-+# CONFIG_SND_USB_AUDIO is not set
-+# CONFIG_SND_USB_CAIAQ is not set
-+
-+#
-+# System on Chip audio support
-+#
-+# CONFIG_SND_SOC is not set
-+
-+#
-+# SoC Audio support for SuperH
-+#
-+
-+#
-+# Open Sound System
-+#
-+# CONFIG_SOUND_PRIME is not set
-+CONFIG_AC97_BUS=y
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+
-+#
-+# USB Input Devices
-+#
-+CONFIG_USB_HID=y
-+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-+# CONFIG_HID_FF is not set
-+# CONFIG_USB_HIDDEV is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+# CONFIG_USB_ARCH_HAS_EHCI is not set
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+
-+#
-+# Miscellaneous USB options
-+#
-+CONFIG_USB_DEVICEFS=y
-+CONFIG_USB_DEVICE_CLASS=y
-+CONFIG_USB_DYNAMIC_MINORS=y
-+# CONFIG_USB_OTG is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+# CONFIG_USB_ISP116X_HCD is not set
-+CONFIG_USB_OHCI_HCD=y
-+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-+# CONFIG_USB_SL811_HCD is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+
-+#
-+# USB Device Class drivers
-+#
-+CONFIG_USB_ACM=m
-+CONFIG_USB_PRINTER=m
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+
-+#
-+# may also be needed; see USB_STORAGE Help for more information
-+#
-+CONFIG_USB_STORAGE=y
-+# CONFIG_USB_STORAGE_DEBUG is not set
-+# CONFIG_USB_STORAGE_DATAFAB is not set
-+# CONFIG_USB_STORAGE_FREECOM is not set
-+# CONFIG_USB_STORAGE_ISD200 is not set
-+# CONFIG_USB_STORAGE_DPCM is not set
-+# CONFIG_USB_STORAGE_USBAT is not set
-+# CONFIG_USB_STORAGE_SDDR09 is not set
-+# CONFIG_USB_STORAGE_SDDR55 is not set
-+# CONFIG_USB_STORAGE_JUMPSHOT is not set
-+# CONFIG_USB_STORAGE_ALAUDA is not set
-+# CONFIG_USB_STORAGE_ONETOUCH is not set
-+# CONFIG_USB_STORAGE_KARMA is not set
-+# CONFIG_USB_LIBUSUAL is not set
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
-+# CONFIG_USB_MON is not set
-+
-+#
-+# USB port drivers
-+#
-+
-+#
-+# USB Serial Converter support
-+#
-+CONFIG_USB_SERIAL=y
-+CONFIG_USB_SERIAL_CONSOLE=y
-+# CONFIG_USB_SERIAL_GENERIC is not set
-+# CONFIG_USB_SERIAL_AIRCABLE is not set
-+# CONFIG_USB_SERIAL_AIRPRIME is not set
-+# CONFIG_USB_SERIAL_ARK3116 is not set
-+# CONFIG_USB_SERIAL_BELKIN is not set
-+# CONFIG_USB_SERIAL_CH341 is not set
-+# CONFIG_USB_SERIAL_WHITEHEAT is not set
-+# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
-+# CONFIG_USB_SERIAL_CP2101 is not set
-+# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
-+# CONFIG_USB_SERIAL_EMPEG is not set
-+# CONFIG_USB_SERIAL_FTDI_SIO is not set
-+# CONFIG_USB_SERIAL_FUNSOFT is not set
-+# CONFIG_USB_SERIAL_VISOR is not set
-+# CONFIG_USB_SERIAL_IPAQ is not set
-+# CONFIG_USB_SERIAL_IR is not set
-+# CONFIG_USB_SERIAL_EDGEPORT is not set
-+# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
-+# CONFIG_USB_SERIAL_GARMIN is not set
-+# CONFIG_USB_SERIAL_IPW is not set
-+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
-+# CONFIG_USB_SERIAL_KEYSPAN is not set
-+# CONFIG_USB_SERIAL_KLSI is not set
-+# CONFIG_USB_SERIAL_KOBIL_SCT is not set
-+# CONFIG_USB_SERIAL_MCT_U232 is not set
-+# CONFIG_USB_SERIAL_MOS7720 is not set
-+# CONFIG_USB_SERIAL_MOS7840 is not set
-+# CONFIG_USB_SERIAL_NAVMAN is not set
-+CONFIG_USB_SERIAL_PL2303=y
-+# CONFIG_USB_SERIAL_OTI6858 is not set
-+# CONFIG_USB_SERIAL_HP4X is not set
-+# CONFIG_USB_SERIAL_SAFE is not set
-+# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
-+# CONFIG_USB_SERIAL_TI is not set
-+# CONFIG_USB_SERIAL_CYBERJACK is not set
-+# CONFIG_USB_SERIAL_XIRCOM is not set
-+# CONFIG_USB_SERIAL_OPTION is not set
-+# CONFIG_USB_SERIAL_OMNINET is not set
-+# CONFIG_USB_SERIAL_DEBUG is not set
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+# CONFIG_USB_EMI62 is not set
-+# CONFIG_USB_EMI26 is not set
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_AUERSWALD is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+# CONFIG_USB_BERRY_CHARGE is not set
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_PHIDGET is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+# CONFIG_USB_LD is not set
-+# CONFIG_USB_TRANCEVIBRATOR is not set
-+# CONFIG_USB_IOWARRIOR is not set
-+# CONFIG_USB_TEST is not set
-+
-+#
-+# USB DSL modem support
-+#
-+
-+#
-+# USB Gadget Support
-+#
-+# CONFIG_USB_GADGET is not set
-+CONFIG_MMC=y
-+# CONFIG_MMC_DEBUG is not set
-+# CONFIG_MMC_UNSAFE_RESUME is not set
-+
-+#
-+# MMC/SD Card Drivers
-+#
-+CONFIG_MMC_BLOCK=y
-+CONFIG_MMC_BLOCK_BOUNCE=y
-+# CONFIG_SDIO_UART is not set
-+
-+#
-+# MMC/SD Host Controller Drivers
-+#
-+# CONFIG_MMC_ARMMMCI is not set
-+CONFIG_MMC_SPI=y
-+#
-+# SimOne LCD support
-+#
-+CONFIG_LCD_LINUX=m
-+CONFIG_LCD_HD44780=m
-+#
-+# CONFIG_NEW_LEDS is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+# CONFIG_RTC_DEBUG is not set
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# I2C RTC drivers
-+#
-+CONFIG_RTC_DRV_DS1307=y
-+# CONFIG_RTC_DRV_DS1374 is not set
-+# CONFIG_RTC_DRV_DS1672 is not set
-+# CONFIG_RTC_DRV_MAX6900 is not set
-+# CONFIG_RTC_DRV_RS5C372 is not set
-+# CONFIG_RTC_DRV_ISL1208 is not set
-+# CONFIG_RTC_DRV_X1205 is not set
-+# CONFIG_RTC_DRV_PCF8563 is not set
-+# CONFIG_RTC_DRV_PCF8583 is not set
-+# CONFIG_RTC_DRV_M41T80 is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+# CONFIG_RTC_DRV_RS5C348 is not set
-+# CONFIG_RTC_DRV_MAX6902 is not set
-+
-+#
-+# Platform RTC drivers
-+#
-+# CONFIG_RTC_DRV_CMOS is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_M48T59 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+CONFIG_RTC_DRV_EP93XX=y
-+CONFIG_RTC_DRV_EP93XX_DS1337=y
-+# CONFIG_RTC_DRV_PL031 is not set
-+
-+#
-+# File systems
-+#
-+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_XATTR is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+CONFIG_FS_POSIX_ACL=y
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+# CONFIG_MINIX_FS is not set
-+CONFIG_ROMFS_FS=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+CONFIG_DNOTIFY=y
-+# CONFIG_AUTOFS_FS is not set
-+CONFIG_AUTOFS4_FS=y
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+CONFIG_ISO9660_FS=y
-+CONFIG_JOLIET=y
-+# CONFIG_ZISOFS is not set
-+CONFIG_UDF_FS=y
-+CONFIG_UDF_NLS=y
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+CONFIG_FAT_FS=y
-+CONFIG_MSDOS_FS=y
-+CONFIG_VFAT_FS=y
-+CONFIG_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+CONFIG_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-+# CONFIG_JFFS2_SUMMARY is not set
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+# CONFIG_JFFS2_LZO is not set
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+# CONFIG_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_BSD_DISKLABEL is not set
-+# CONFIG_MINIX_SUBPARTITION is not set
-+# CONFIG_SOLARIS_X86_PARTITION is not set
-+# CONFIG_UNIXWARE_DISKLABEL is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+CONFIG_NLS=y
-+CONFIG_NLS_DEFAULT="iso8859-1"
-+CONFIG_NLS_CODEPAGE_437=y
-+# CONFIG_NLS_CODEPAGE_737 is not set
-+# CONFIG_NLS_CODEPAGE_775 is not set
-+# CONFIG_NLS_CODEPAGE_850 is not set
-+# CONFIG_NLS_CODEPAGE_852 is not set
-+# CONFIG_NLS_CODEPAGE_855 is not set
-+# CONFIG_NLS_CODEPAGE_857 is not set
-+# CONFIG_NLS_CODEPAGE_860 is not set
-+# CONFIG_NLS_CODEPAGE_861 is not set
-+# CONFIG_NLS_CODEPAGE_862 is not set
-+# CONFIG_NLS_CODEPAGE_863 is not set
-+# CONFIG_NLS_CODEPAGE_864 is not set
-+# CONFIG_NLS_CODEPAGE_865 is not set
-+# CONFIG_NLS_CODEPAGE_866 is not set
-+# CONFIG_NLS_CODEPAGE_869 is not set
-+# CONFIG_NLS_CODEPAGE_936 is not set
-+# CONFIG_NLS_CODEPAGE_950 is not set
-+# CONFIG_NLS_CODEPAGE_932 is not set
-+# CONFIG_NLS_CODEPAGE_949 is not set
-+# CONFIG_NLS_CODEPAGE_874 is not set
-+# CONFIG_NLS_ISO8859_8 is not set
-+# CONFIG_NLS_CODEPAGE_1250 is not set
-+# CONFIG_NLS_CODEPAGE_1251 is not set
-+# CONFIG_NLS_ASCII is not set
-+CONFIG_NLS_ISO8859_1=y
-+# CONFIG_NLS_ISO8859_2 is not set
-+# CONFIG_NLS_ISO8859_3 is not set
-+# CONFIG_NLS_ISO8859_4 is not set
-+# CONFIG_NLS_ISO8859_5 is not set
-+# CONFIG_NLS_ISO8859_6 is not set
-+# CONFIG_NLS_ISO8859_7 is not set
-+# CONFIG_NLS_ISO8859_9 is not set
-+# CONFIG_NLS_ISO8859_13 is not set
-+# CONFIG_NLS_ISO8859_14 is not set
-+# CONFIG_NLS_ISO8859_15 is not set
-+# CONFIG_NLS_KOI8_R is not set
-+# CONFIG_NLS_KOI8_U is not set
-+# CONFIG_NLS_UTF8 is not set
-+# CONFIG_DLM is not set
-+# CONFIG_INSTRUMENTATION is not set
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+# CONFIG_ENABLE_WARN_DEPRECATED is not set
-+# CONFIG_ENABLE_MUST_CHECK is not set
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+# CONFIG_DEBUG_KERNEL is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+CONFIG_FRAME_POINTER=y
-+# CONFIG_SAMPLES is not set
-+CONFIG_DEBUG_USER=y
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+CONFIG_CRYPTO_MD5=y
-+CONFIG_CRYPTO_SHA1=y
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_CBC=m
-+CONFIG_CRYPTO_PCBC=y
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+CONFIG_CRYPTO_AES=y
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+CONFIG_CRYPTO_ARC4=y
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+CONFIG_CRYPTO_MICHAEL_MIC=y
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_HW is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+CONFIG_CRC_ITU_T=y
-+CONFIG_CRC32=y
-+CONFIG_CRC7=y
-+CONFIG_LIBCRC32C=y
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_ZLIB_DEFLATE=y
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
diff --git a/target/linux/ep93xx/patches-2.6.30/012-ep93xx-cpuinfo.patch b/target/linux/ep93xx/patches-2.6.30/012-ep93xx-cpuinfo.patch
deleted file mode 100644
index d2845c910..000000000
--- a/target/linux/ep93xx/patches-2.6.30/012-ep93xx-cpuinfo.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: linux-2.6.30.9/arch/arm/kernel/setup.c
-===================================================================
---- linux-2.6.30.9.orig/arch/arm/kernel/setup.c	2009-11-24 21:00:10.000000000 +0100
-+++ linux-2.6.30.9/arch/arm/kernel/setup.c	2009-11-24 21:00:46.000000000 +0100
-@@ -42,6 +42,10 @@
- #include <asm/traps.h>
- #include <asm/unwind.h>
- 
-+#if defined(CONFIG_ARCH_EP93XX)
-+#include <mach/ep93xx-regs.h>
-+#endif
-+
- #include "compat.h"
- #include "atags.h"
- 
-@@ -844,9 +848,16 @@
- 	seq_puts(m, "\n");
- 
- 	seq_printf(m, "Hardware\t: %s\n", machine_name);
-+#if defined(CONFIG_ARCH_EP93XX)
-+	seq_printf(m, "Revision\t: %04x\n",
-+	     *((unsigned int *)EP93XX_SYSCON_CHIP_ID) >> 28);
-+	seq_printf(m, "Serial\t\t: %016x\n",
-+	     *((unsigned int *)EP93XX_SECURITY_UNIQID));
-+#else
- 	seq_printf(m, "Revision\t: %04x\n", system_rev);
- 	seq_printf(m, "Serial\t\t: %08x%08x\n",
- 		   system_serial_high, system_serial_low);
-+#endif
- 
- 	return 0;
- }
diff --git a/target/linux/etrax/Makefile b/target/linux/etrax/Makefile
deleted file mode 100644
index 875034cb6..000000000
--- a/target/linux/etrax/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Copyright (C) 2006-2009 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-ARCH:=cris
-BOARD:=etrax
-BOARDNAME:=Foxboard (ETRAX 100LX)
-FEATURES:=squashfs jffs2
-LINUX_VERSION:=2.6.32.10
-DEVICE_TYPE=
-
-include $(INCLUDE_DIR)/target.mk
-
-KERNELNAME:="zImage"
-
-define Target/Description
-	Build firmware images for the FOXBOARD made by acmesystems.it
-endef
-
-define Kernel/Prepare
-	$(call Kernel/Prepare/Default)
-	mkdir -p $(LINUX_DIR)/include/asm-cris
-	$(CP) $(LINUX_DIR)/arch/cris/include/asm/*.h $(LINUX_DIR)/include/asm-cris
-	mkdir -p $(LINUX_DIR)/include/asm-cris/arch
-	$(CP) $(LINUX_DIR)/arch/cris/include/arch-v10/arch/*.h $(LINUX_DIR)/include/asm-cris/arch
-endef
-
-$(eval $(call BuildTarget))
diff --git a/target/linux/etrax/base-files/etc/config/firewall b/target/linux/etrax/base-files/etc/config/firewall
deleted file mode 100644
index f9c860e3d..000000000
--- a/target/linux/etrax/base-files/etc/config/firewall
+++ /dev/null
@@ -1,6 +0,0 @@
-config defaults
-	option syn_flood	1
-	option input		ACCEPT
-	option output		ACCEPT 
-	option forward		REJECT
-
diff --git a/target/linux/etrax/base-files/etc/config/network b/target/linux/etrax/base-files/etc/config/network
deleted file mode 100644
index ed97da998..000000000
--- a/target/linux/etrax/base-files/etc/config/network
+++ /dev/null
@@ -1,18 +0,0 @@
-
-# Copyright (C) 2009 OpenWrt.org
-
-config interface loopback
-	option ifname	lo
-	option proto	static
-	option ipaddr	127.0.0.1
-	option netmask	255.0.0.0
-
-config interface lan
-	option ifname	eth0
-	option type 	none
-	option proto	static
-	option ipaddr	192.168.1.1
-	option netmask	255.255.255.0
-#	option macaddr  00:40:8c:cd:xx:xx
-
-
diff --git a/target/linux/etrax/config-default b/target/linux/etrax/config-default
deleted file mode 100644
index d41db6a3e..000000000
--- a/target/linux/etrax/config-default
+++ /dev/null
@@ -1,170 +0,0 @@
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_BITREVERSE=y
-# CONFIG_BLK_DEV_INITRD is not set
-CONFIG_BOUNCE=y
-# CONFIG_BRIDGE is not set
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CFG80211_DEFAULT_PS_VALUE=0
-# CONFIG_CRIS_MACH_ARTPEC3 is not set
-CONFIG_CRIS=y
-CONFIG_DECOMPRESS_LZMA=y
-# CONFIG_ETRAX100LX is not set
-CONFIG_ETRAX100LX_V2=y
-CONFIG_ETRAX_ARCH_V10=y
-# CONFIG_ETRAX_ARCH_V32 is not set
-CONFIG_ETRAX_AXISFLASHMAP=y
-CONFIG_ETRAX_CMDLINE="root=/dev/mtdblock1 rootfstype=jffs2 noinitrd console=ttyS0,115200"
-# CONFIG_ETRAX_CSP0_LEDS is not set
-# CONFIG_ETRAX_DEBUG_PORT0 is not set
-# CONFIG_ETRAX_DEBUG_PORT1 is not set
-# CONFIG_ETRAX_DEBUG_PORT2 is not set
-# CONFIG_ETRAX_DEBUG_PORT3 is not set
-CONFIG_ETRAX_DEBUG_PORT_NULL=y
-CONFIG_ETRAX_DEF_R_BUS_CONFIG=0x4
-CONFIG_ETRAX_DEF_R_PORT_PA_DATA=0xf0
-CONFIG_ETRAX_DEF_R_PORT_PA_DIR=0x1c
-CONFIG_ETRAX_DEF_R_PORT_PB_CONFIG=0x00
-CONFIG_ETRAX_DEF_R_PORT_PB_DATA=0x03
-CONFIG_ETRAX_DEF_R_PORT_PB_DIR=0xce
-CONFIG_ETRAX_DEF_R_SDRAM_CONFIG=0x09603737
-CONFIG_ETRAX_DEF_R_SDRAM_TIMING=0x80008002
-CONFIG_ETRAX_DEF_R_WAITSTATES=0x95f8
-CONFIG_ETRAX_DRAM_SIZE=32
-CONFIG_ETRAX_DRAM_VIRTUAL_BASE=c0000000
-CONFIG_ETRAX_ETHERNET=y
-CONFIG_ETRAX_FAST_TIMER=y
-CONFIG_ETRAX_FLASH1_SIZE=0
-CONFIG_ETRAX_FLASH_BUSWIDTH=2
-# CONFIG_ETRAXFS is not set
-CONFIG_ETRAX_GPIO=y
-# CONFIG_ETRAX_I2C_GVC is not set
-# CONFIG_ETRAX_I2C is not set
-# CONFIG_ETRAX_KMALLOCED_MODULES is not set
-CONFIG_ETRAX_LED1G=2
-CONFIG_ETRAX_LED1R=2
-CONFIG_ETRAX_LED2G=3
-CONFIG_ETRAX_LED2R=3
-CONFIG_ETRAX_LED3G=2
-CONFIG_ETRAX_LED3R=2
-CONFIG_ETRAX_NANDFLASH_BUSWIDTH=1
-CONFIG_ETRAX_NETWORK_LED_ON_WHEN_ACTIVITY=y
-# CONFIG_ETRAX_NETWORK_LED_ON_WHEN_LINK is not set
-# CONFIG_ETRAX_NO_LEDS is not set
-CONFIG_ETRAX_PA_BUTTON_BITMASK=02
-CONFIG_ETRAX_PA_CHANGEABLE_BITS=0xFF
-CONFIG_ETRAX_PA_CHANGEABLE_DIR=0xFF
-CONFIG_ETRAX_PA_LEDS=y
-CONFIG_ETRAX_PB_CHANGEABLE_BITS=0xFF
-CONFIG_ETRAX_PB_CHANGEABLE_DIR=0xFF
-# CONFIG_ETRAX_PB_LEDS is not set
-CONFIG_ETRAX_PTABLE_SECTOR=0
-CONFIG_ETRAX_RESCUE_SER0=y
-# CONFIG_ETRAX_RESCUE_SER1 is not set
-# CONFIG_ETRAX_RESCUE_SER2 is not set
-# CONFIG_ETRAX_RESCUE_SER3 is not set
-# CONFIG_ETRAX_RS485 is not set
-CONFIG_ETRAX_SDRAM=y
-CONFIG_ETRAX_SER0_CD_ON_PA_BIT=-1
-CONFIG_ETRAX_SER0_CD_ON_PB_BIT=-1
-CONFIG_ETRAX_SER0_DSR_ON_PA_BIT=-1
-CONFIG_ETRAX_SER0_DSR_ON_PB_BIT=-1
-CONFIG_ETRAX_SER0_DTR_ON_PA_BIT=-1
-CONFIG_ETRAX_SER0_DTR_ON_PB_BIT=-1
-# CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED is not set
-CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_ON_NONE=y
-# CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_ON_PA is not set
-# CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_ON_PB is not set
-CONFIG_ETRAX_SER0_RI_ON_PA_BIT=-1
-CONFIG_ETRAX_SER0_RI_ON_PB_BIT=-1
-CONFIG_ETRAX_SER2_CD_ON_PA_BIT=-1
-CONFIG_ETRAX_SER2_CD_ON_PB_BIT=-1
-CONFIG_ETRAX_SER2_DSR_ON_PA_BIT=-1
-CONFIG_ETRAX_SER2_DSR_ON_PB_BIT=-1
-CONFIG_ETRAX_SER2_DTR_ON_PA_BIT=-1
-CONFIG_ETRAX_SER2_DTR_ON_PB_BIT=-1
-# CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED is not set
-CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_ON_NONE=y
-# CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_ON_PA is not set
-# CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_ON_PB is not set
-CONFIG_ETRAX_SER2_RI_ON_PA_BIT=-1
-CONFIG_ETRAX_SER2_RI_ON_PB_BIT=-1
-CONFIG_ETRAX_SER3_CD_ON_PA_BIT=-1
-CONFIG_ETRAX_SER3_CD_ON_PB_BIT=-1
-CONFIG_ETRAX_SER3_DSR_ON_PA_BIT=-1
-CONFIG_ETRAX_SER3_DSR_ON_PB_BIT=-1
-CONFIG_ETRAX_SER3_DTR_ON_PA_BIT=-1
-CONFIG_ETRAX_SER3_DTR_ON_PB_BIT=-1
-# CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED is not set
-CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_ON_NONE=y
-# CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_ON_PA is not set
-# CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_ON_PB is not set
-CONFIG_ETRAX_SER3_RI_ON_PA_BIT=-1
-CONFIG_ETRAX_SER3_RI_ON_PB_BIT=-1
-# CONFIG_ETRAX_SERIAL_FAST_TIMER is not set
-# CONFIG_ETRAX_SERIAL_FLUSH_DMA_FAST is not set
-# CONFIG_ETRAX_SERIAL_PORT0_DMA0_OUT is not set
-# CONFIG_ETRAX_SERIAL_PORT0_DMA1_IN is not set
-# CONFIG_ETRAX_SERIAL_PORT0_DMA6_OUT is not set
-# CONFIG_ETRAX_SERIAL_PORT0_DMA7_IN is not set
-CONFIG_ETRAX_SERIAL_PORT0_NO_DMA_IN=y
-CONFIG_ETRAX_SERIAL_PORT0_NO_DMA_OUT=y
-CONFIG_ETRAX_SERIAL_PORT0=y
-# CONFIG_ETRAX_SERIAL_PORT1 is not set
-CONFIG_ETRAX_SERIAL_PORT2_DMA2_OUT=y
-CONFIG_ETRAX_SERIAL_PORT2_DMA3_IN=y
-# CONFIG_ETRAX_SERIAL_PORT2_DMA6_OUT is not set
-# CONFIG_ETRAX_SERIAL_PORT2_DMA7_IN is not set
-# CONFIG_ETRAX_SERIAL_PORT2_NO_DMA_IN is not set
-# CONFIG_ETRAX_SERIAL_PORT2_NO_DMA_OUT is not set
-CONFIG_ETRAX_SERIAL_PORT2=y
-# CONFIG_ETRAX_SERIAL_PORT3_DMA2_OUT is not set
-# CONFIG_ETRAX_SERIAL_PORT3_DMA3_IN is not set
-CONFIG_ETRAX_SERIAL_PORT3_DMA4_OUT=y
-CONFIG_ETRAX_SERIAL_PORT3_DMA5_IN=y
-# CONFIG_ETRAX_SERIAL_PORT3_DMA8_OUT is not set
-# CONFIG_ETRAX_SERIAL_PORT3_DMA9_IN is not set
-# CONFIG_ETRAX_SERIAL_PORT3_NO_DMA_IN is not set
-# CONFIG_ETRAX_SERIAL_PORT3_NO_DMA_OUT is not set
-CONFIG_ETRAX_SERIAL_PORT3=y
-CONFIG_ETRAX_SERIAL_RX_TIMEOUT_TICKS=5
-CONFIG_ETRAX_SERIAL=y
-# CONFIG_ETRAX_SOFT_SHUTDOWN is not set
-# CONFIG_ETRAX_SYNCHRONOUS_SERIAL is not set
-# CONFIG_ETRAX_USB_HOST is not set
-# CONFIG_ETRAX_VCS_SIM is not set
-# CONFIG_ETRAX_WATCHDOG is not set
-CONFIG_FORCE_MAX_ZONEORDER=6
-# CONFIG_FSNOTIFY is not set
-CONFIG_GENERIC_FIND_LAST_BIT=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_IOMAP=y
-# CONFIG_GEN_RTC is not set
-# CONFIG_HAMRADIO is not set
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
-CONFIG_HAVE_IDE=y
-# CONFIG_HW_RANDOM is not set
-# CONFIG_MTD_CFI_INTELEXT is not set
-CONFIG_MTD_CONCAT=y
-CONFIG_MTD_MTDRAM=y
-CONFIG_MTDRAM_ABS_POS=0
-CONFIG_MTDRAM_ERASE_SIZE=128
-CONFIG_MTDRAM_TOTAL_SIZE=0
-# CONFIG_NETDEV_1000 is not set
-CONFIG_NO_IOPORT=y
-# CONFIG_OOM_REBOOT is not set
-CONFIG_PAGEFLAGS_EXTENDED=y
-# CONFIG_RTC is not set
-# CONFIG_SCSI_DMA is not set
-# CONFIG_SERIAL_8250 is not set
-# CONFIG_SVINTO_SIM is not set
-# CONFIG_SYSTEM_PROFILER is not set
-# CONFIG_TREE_PREEMPT_RCU is not set
-CONFIG_TREE_RCU=y
-CONFIG_UID16=y
-# CONFIG_USB_ARCH_HAS_EHCI is not set
-# CONFIG_USB_ARCH_HAS_HCD is not set
-# CONFIG_USB_ARCH_HAS_OHCI is not set
-CONFIG_USB_SUPPORT=y
diff --git a/target/linux/etrax/files/arch/cris/arch-v10/drivers/etraxi2c.h b/target/linux/etrax/files/arch/cris/arch-v10/drivers/etraxi2c.h
deleted file mode 100644
index 4235086d5..000000000
--- a/target/linux/etrax/files/arch/cris/arch-v10/drivers/etraxi2c.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef _LINUX_ETRAXI2C_H
-#define _LINUX_ETRAXI2C_H
-
-/* etraxi2c _IOC_TYPE, bits 8 to 15 in ioctl cmd */
-
-#define ETRAXI2C_IOCTYPE 44
-
-/* supported ioctl _IOC_NR's */
-
-/* in write operations, the argument contains both i2c
- * slave, register and value.
- */
-
-#define I2C_WRITEARG(slave, reg, value) (((slave) << 16) | ((reg) << 8) | (value))
-#define I2C_READARG(slave, reg) (((slave) << 16) | ((reg) << 8))
-
-#define I2C_ARGSLAVE(arg) ((arg) >> 16)
-#define I2C_ARGREG(arg) (((arg) >> 8) & 0xff)
-#define I2C_ARGVALUE(arg) ((arg) & 0xff)
-
-#define I2C_WRITEREG    0x1   /* write to an I2C register */
-#define I2C_READREG     0x2   /* read from an I2C register */
-
-/*
-EXAMPLE usage:
-
-    i2c_arg = I2C_WRITEARG(STA013_WRITE_ADDR, reg, val);
-    ioctl(fd, _IO(ETRAXI2C_IOCTYPE, I2C_WRITEREG), i2c_arg);
-
-    i2c_arg = I2C_READARG(STA013_READ_ADDR, reg);
-    val = ioctl(fd, _IO(ETRAXI2C_IOCTYPE, I2C_READREG), i2c_arg);
-
-*/
-
-/* Extended part */
-#define I2C_READ        0x4     /* reads from I2C device */
-#define I2C_WRITE       0x3     /* writes to I2C device */
-#define I2C_WRITEREAD   0x5	    /* writes to I2C device where to start reading */
-
-typedef struct _I2C_DATA 
-{
-    unsigned char slave;        /* I2C address (8-bit representation) of slave device */
-    unsigned char wbuf[256];    /* Write buffer (length = 256 bytes) */
-	unsigned int  wlen;         /* Number of bytes to write from wbuf[] */   
-	unsigned char rbuf[256];    /* Read buffer (length = 256 bytes) */
-    unsigned int  rlen;         /* Number of bytes to read into rbuf[] */
-} I2C_DATA;
-
-#endif
diff --git a/target/linux/etrax/files/arch/cris/arch-v10/drivers/i2c_errno.h b/target/linux/etrax/files/arch/cris/arch-v10/drivers/i2c_errno.h
deleted file mode 100644
index 7de4ad62c..000000000
--- a/target/linux/etrax/files/arch/cris/arch-v10/drivers/i2c_errno.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _I2C_ERRNO_H
-#define _I2C_ERRNO_H
-
-#define EI2CNOERRORS  0     /* All fine */
-#define EI2CBUSNFREE  1     /* I2C bus not free */
-#define EI2CWADDRESS  2     /* Address write failed */
-#define EI2CRADDRESS  3     /* Address read failed */
-#define EI2CSENDDATA  4     /* Sending data failed */
-#define EI2CRECVDATA  5     /* Receiving data failed */
-#define EI2CSTRTCOND  6     /* Start condition failed */
-#define EI2CRSTACOND  7     /* Repeated start condition failed */
-#define EI2CSTOPCOND  8     /* Stop condition failed */
-#define EI2CNOSNDBYT  9     /* Number of send bytes is 0, while there's a send buffer defined */ 
-#define EI2CNOSNDBUF  10    /* No send buffer defined, while number of send bytes is not 0 */
-#define EI2CNORCVBYT  11    /* Number of receive bytes is 0, while there's a receive buffer defined */
-#define EI2CNORCVBUF  12    /* No receive buffer defined, while number of receive bytes is not 0 */
-#define EI2CNOACKNLD  13    /* No acknowledge received from slave */
-#define EI2CNOMNUMBR  14    /* No MAJOR number received from kernel while registering the device */
-
-#endif /* _I2C_ERRNO_H */
diff --git a/target/linux/etrax/files/arch/cris/arch-v10/drivers/i2c_gvc.c b/target/linux/etrax/files/arch/cris/arch-v10/drivers/i2c_gvc.c
deleted file mode 100644
index e47bc6459..000000000
--- a/target/linux/etrax/files/arch/cris/arch-v10/drivers/i2c_gvc.c
+++ /dev/null
@@ -1,1404 +0,0 @@
-/*!***************************************************************************
-*!
-*! FILE NAME  : i2c.c
-*!
-*!
-*! ---------------------------------------------------------------------------
-*!
-*! ( C ) Copyright 1999-2002 Axis Communications AB, LUND, SWEDEN
-*!
-*!***************************************************************************/
-
-/******************** INCLUDE FILES SECTION ****************************/
-
-#include <linux/module.h>
-#include <linux/fs.h>
-
-#ifdef CONFIG_ETRAX_I2C_DYN_ALLOC
-#include <linux/types.h> /* for dev_t */
-#include <linux/cdev.h>  /* for struct cdev */
-#endif
-
-#include <linux/device.h>
-
-#include "etraxi2c.h"
-
-#include "i2c_errno.h"
-
-#include <asm/io.h>
-#include <asm/delay.h>
-#include <asm/arch/io_interface_mux.h>
-#include <asm/uaccess.h>
-
-#include "i2c_gvc.h"
-
-MODULE_DESCRIPTION( "I2C Device Driver - 2.3" );
-
-/*!*********************************************************************
- *!History I2C driver Geert Vancompernolle
- *!---------------------------------------
- *!
- *! - v1.0:
- *!     First official version.
- *!
- *! - v1.1:
- *!     Changes to remove unwanted spikes at ACK/NACK time.
- *!
- *!*********************************************************************/
-
-MODULE_LICENSE( "GPL" );
-
-/******************            MACRO's            **********************/
-
-#define D( x )
-
-#ifndef CONFIG_ETRAX_I2C_DYN_ALLOC
-#define I2C_MAJOR 123  				/* LOCAL/EXPERIMENTAL */
-#endif
-
-#define WAITONEUS                 1
-/* Following are abbreviations taken from Philips I2C standard */
-/* Values are representing time in us and are rounded to next whole number, if relevant */
-#define THDSTA                    4     /* Hold delay time for (repeated) START condition */
-#define TLOW                      5     /* LOW period of the SCL clock */
-#define THDDAT	                  1     /* Hold delay time for DATA: value of 0 is allowed but 1 taken to be sure */
-#define TSUDAT                    1     /* Set-up time for DATA */
-#define THIGH                     4     /* HIGH period of the SCL clock */
-#define TSUSTA                    5     /* Set-up time for a repeated START condition */
-#define TSUSTO                    4     /* Set-up time for STOP condition */
-#define TBUF                      5     /* Bus-free time between STOP and START condition */
-
-#ifdef CONFIG_ETRAX_I2C_SLAVE_DELAY
-#define MAXSCLRETRIES		  100
-#endif
-
-#define MAXBUSFREERETRIES         5
-#define MAXRETRIES                3
-#define WRITEADDRESS_MASK         ( 0xFE )
-#define READADDRESS_MASK          ( 0x01 )
-
-#define SCL_HIGH                  1
-#define SCL_LOW                   0
-#define SDA_HIGH                  1
-#define SDA_LOW                   0
-
-#ifdef CONFIG_ETRAX_I2C_USES_PB_NOT_PB_I2C
-/* Use PB and not PB_I2C */
-#ifndef CONFIG_ETRAX_I2C_DATA_PORT
-#define CONFIG_ETRAX_I2C_DATA_PORT 0
-#endif
-#ifndef CONFIG_ETRAX_I2C_CLK_PORT
-#define CONFIG_ETRAX_I2C_CLK_PORT 1
-#endif
-
-#define SDABIT CONFIG_ETRAX_I2C_DATA_PORT
-#define SCLBIT CONFIG_ETRAX_I2C_CLK_PORT
-#define i2c_enable()
-#define i2c_disable()
-
-/* enable or disable output-enable, to select output or input on the i2c bus */
-#define i2c_sda_dir_out() \
-  REG_SHADOW_SET( R_PORT_PB_DIR, port_pb_dir_shadow, SDABIT, 1 )
-#define i2c_sda_dir_in()  \
-  REG_SHADOW_SET( R_PORT_PB_DIR, port_pb_dir_shadow, SDABIT, 0 )
-
-#ifdef CONFIG_ETRAX_I2C_SLAVE_DELAY
-#define i2c_scl_dir_out() \
-  REG_SHADOW_SET( R_PORT_PB_DIR, port_pb_dir_shadow, SCLBIT, 1 )
-#define i2c_scl_dir_in()  \
-  REG_SHADOW_SET( R_PORT_PB_DIR, port_pb_dir_shadow, SCLBIT, 0 )
-#endif
-
-/* control the i2c clock and data signals */
-#define i2c_set_scl( x ) \
-  REG_SHADOW_SET( R_PORT_PB_DATA, port_pb_data_shadow, SCLBIT, x )
-#define i2c_set_sda( x ) \
-  REG_SHADOW_SET( R_PORT_PB_DATA, port_pb_data_shadow, SDABIT, x )
-
-/* read status of SDA bit from the i2c interface */
-#define i2c_sda_is_high() ( ( ( *R_PORT_PB_READ & ( 1 << SDABIT ) ) ) >> SDABIT )
-
-/* read status of SCL bit from the i2c interface */
-#define i2c_scl_is_high() ( ( ( *R_PORT_PB_READ & ( 1 << SCLBIT ) ) ) >> SCLBIT )
-
-#else
-/* enable or disable the i2c interface */
-#define i2c_enable() *R_PORT_PB_I2C = ( port_pb_i2c_shadow |= IO_MASK( R_PORT_PB_I2C, i2c_en ) )
-#define i2c_disable() *R_PORT_PB_I2C = ( port_pb_i2c_shadow &= ~IO_MASK( R_PORT_PB_I2C, i2c_en ) )
-
-/* enable or disable output-enable, to select output or input on the i2c bus */
-#define i2c_sda_dir_out() \
-	*R_PORT_PB_I2C = ( port_pb_i2c_shadow &= ~IO_MASK( R_PORT_PB_I2C, i2c_oe_ ) ); \
-	REG_SHADOW_SET( R_PORT_PB_DIR, port_pb_dir_shadow, 0, 1 );
-#define i2c_sda_dir_in() \
-	*R_PORT_PB_I2C = ( port_pb_i2c_shadow |= IO_MASK( R_PORT_PB_I2C, i2c_oe_ ) ); \
-	REG_SHADOW_SET( R_PORT_PB_DIR, port_pb_dir_shadow, 0, 0 );
-
-/* control the i2c clock and data signals */
-#define i2c_set_scl( x ) \
-	*R_PORT_PB_I2C = ( port_pb_i2c_shadow = ( port_pb_i2c_shadow & \
-       ~IO_MASK( R_PORT_PB_I2C, i2c_set_scl ) ) | IO_FIELD( R_PORT_PB_I2C, i2c_set_scl, ( x ) ) ); \
-       REG_SHADOW_SET( R_PORT_PB_DATA, port_pb_data_shadow, 1, x );
-
-#define i2c_set_sda( x ) \
-	*R_PORT_PB_I2C = ( port_pb_i2c_shadow = ( port_pb_i2c_shadow & \
-	   ~IO_MASK( R_PORT_PB_I2C, i2c_d ) ) | IO_FIELD( R_PORT_PB_I2C, i2c_d, ( x ) ) ); \
-	REG_SHADOW_SET( R_PORT_PB_DATA, port_pb_data_shadow, 0, x );
-
-/* read a bit from the i2c interface */
-#define i2c_sda_is_high() ( *R_PORT_PB_READ & 0x1 )
-#endif
-
-/* use the kernels delay routine */
-#define i2c_delay( usecs ) udelay( usecs )
-
-
-/******************           TYPEDEF's           **********************/
-
-
-/****************** STATIC (file scope) VARIABLES **********************/
-static DEFINE_SPINLOCK( i2c_lock ); /* Protect directions etc */
-static const char i2c_name[] = "i2c";
-
-
-
-/******************     PROTOTYPING SECTION     *************************/
-static int  i2c_open( struct inode *inode, struct file *filp );
-static int  i2c_release( struct inode *inode, struct file *filp );
-static int  i2c_command( unsigned char  slave
-                       , unsigned char* wbuf
-                       , unsigned char  wlen
-                       , unsigned char* rbuf
-                       , unsigned char  rlen
-                       );
-static int  i2c_bus_free_check( unsigned char maxretries );
-static void i2c_finalise( const char* text, unsigned long irqflags );
-
-
-/************************************************************************/
-/******************         AUXILIARIES         *************************/
-/************************************************************************/
-
-/*#---------------------------------------------------------------------------
- *#
- *# FUNCTION NAME: i2c_open
- *#
- *# DESCRIPTION  : opens an I2C device
- *#
- *# PARAMETERS   : *inode: reference to inode
- *#                *filp : reference to file pointer
- *#
- *#---------------------------------------------------------------------------
- */
-static int i2c_open( struct inode *inode, struct file *filp )
-{
-    return 0;
-}   /* i2c_open */
-
-
-/*#---------------------------------------------------------------------------
- *#
- *# FUNCTION NAME: i2c_release
- *#
- *# DESCRIPTION  : Releases the I2C device
- *#
- *# PARAMETERS   : *inode: reference to inode
- *#                *filp : reference to file pointer
- *#
- *#---------------------------------------------------------------------------
- */
-static int i2c_release( struct inode *inode, struct file *filp )
-{
-    return 0;
-}   /* i2c_release */
-
-
-/*#---------------------------------------------------------------------------
- *#
- *# FUNCTION NAME: i2c_ioctl
- *#
- *# DESCRIPTION  : Main device API: ioctl's to write/read
- *#                to/from i2c registers
- *#
- *# PARAMETERS   : *inode: reference to inode
- *#                *filp : reference to file pointer
- *#                cmd   : command to be executed during the ioctl call
- *#                arg   : pointer to a structure with the data???
- *#
- *# RETURN       : result of the ioctl call
- *#
- *#---------------------------------------------------------------------------
- */
-static int i2c_ioctl( struct inode *inode
-                    , struct file *file
-                    , unsigned int cmd
-                    , unsigned long arg
-                    )
-{
-    /* the acme ioctls */
-    I2C_DATA i2cdata;
-    int RetVal = EI2CNOERRORS;
-
-    if ( _IOC_TYPE( cmd ) != ETRAXI2C_IOCTYPE )
-    {
-        return ( -EINVAL );
-    }
-
-    switch ( _IOC_NR( cmd ) )
-    {
-    case I2C_WRITEREG:
-        /* write to an i2c slave */
-        RetVal = i2c_writereg( I2C_ARGSLAVE( arg )
-                             , I2C_ARGREG( arg )
-                             , I2C_ARGVALUE( arg )
-                             );
-        break;
-
-    case I2C_READREG:
-        RetVal = i2c_readreg( I2C_ARGSLAVE( arg ), I2C_ARGREG( arg ) );
-        break;
-
-    /* New functions added by GVC */
-    case I2C_READ:
-        copy_from_user( (char*)&i2cdata, (char*)arg, sizeof( I2C_DATA ) );
-        {
-            int RetryCntr = MAXRETRIES;
-
-            do
-            {
-                RetVal = i2c_command( i2cdata.slave
-                                    , NULL
-                                    , 0
-                                    , i2cdata.rbuf
-                                    , i2cdata.rlen
-                                    );
-             } while ( ( EI2CNOERRORS != RetVal )
-                     &&( --RetryCntr )
-                     );
-        }
-        copy_to_user( (char*)arg, (char*)&i2cdata, sizeof( I2C_DATA ) );
-        break;
-
-    case I2C_WRITE:
-        copy_from_user( (char*)&i2cdata, (char*)arg, sizeof( I2C_DATA ) );
-        {
-            int RetryCntr = MAXRETRIES;
-
-            do
-            {
-                RetVal = i2c_command( i2cdata.slave
-                                    , i2cdata.wbuf
-                                    , i2cdata.wlen
-                                    , NULL
-                                    , 0
-                                    );
-             } while ( ( EI2CNOERRORS != RetVal )
-                     &&( --RetryCntr )
-                     );
-        }
-        break;
-
-    case I2C_WRITEREAD:
-        copy_from_user( (char*)&i2cdata, (char*)arg, sizeof( I2C_DATA ) );
-        {
-            int RetryCntr = MAXRETRIES;
-
-            do
-            {
-                RetVal = i2c_command( i2cdata.slave
-                                    , i2cdata.wbuf
-                                    , i2cdata.wlen
-                                    , i2cdata.rbuf
-                                    , i2cdata.rlen
-                                    );
-             } while ( ( EI2CNOERRORS != RetVal )
-                     &&( --RetryCntr )
-                     );
-        }
-        copy_to_user( (char*)arg, (char*)&i2cdata, sizeof( I2C_DATA ) );
-        break;
-
-    default:
-        RetVal = -EINVAL;
-    }
-
-    return ( -RetVal );
-}   /* i2c_ioctl */
-
-
-/*#---------------------------------------------------------------------------
- *#
- *# FUNCTION NAME: i2c_command
- *#
- *# DESCRIPTION  : general routine to read/write bytes from an I2C device
- *#
- *#                'i2c_command()' sends wlen bytes to the I2c bus and receives
- *#                rlen bytes from the I2c bus.
- *#                The data to be send must be placed in wbuf[ 0 ] upto wbuf[ wlen - 1 ).
- *#                The data to be received is assembled in rbuf[ 0 ] upto rbuf[ rlen - 1 ].
- *#
- *#                If no data is to be sent or received, put appropriate buffer parameter
- *#                to "NULL" and appropriate length parameter to "0".
- *#
- *# PARAMETERS   : slave = slave address of the I2C device
- *#                wbuf  = address of first element of write buffer (wbuf)
- *#                wlen  = number of bytes to be written to slave
- *#                rbuf  = address of first element of read buffer (rbuf)
- *#                rlen  = number of bytes to be read from slave
- *#
- *# RETURN       :
- *#    EI2CNOERRORS: I2C communication went fine
- *#    EI2CBUSNFREE: I2C bus is not free
- *#    EI2CWADDRESS: I2C write address failed
- *#    EI2CRADDRESS: I2C read address failed
- *#    EI2CSENDDATA: I2C send data failed
- *#    EI2CRECVDATA: I2C receive data failed
- *#    EI2CSTRTCOND: I2C start condition failed
- *#    EI2CRSTACOND: I2C repeated start condition failed
- *#    EI2CSTOPCOND: I2C stop condition failed
- *#    EI2CNOSNDBYT: I2C no bytes to be sent
- *#    EI2CNOSNDBUF: I2C no send buffer defined
- *#    EI2CNORCVBYT: I2C no bytes to be received
- *#    EI2CNORCVBUF: I2C no receive buffer defined
- *#    EI2CNOACKNLD: I2C no acknowledge received
- *#
- *# REMARK       :
- *#   First, the send part is completed.
- *#   In the send routine, there is no stop generated.  This is because maybe
- *#   a repeated start condition must be generated.
- *#   This happens when we want to receive some data from the I2c bus.  If not,
- *#   at the end of the general I2c loop the stopcondition is generated.
- *#   If, on the contrary, there are a number of bytes to be received, a new
- *#   startcondition is generated in the 'if' part of the main I2c routine,
- *#   which controls the receiving part.
- *#   Only when the receiving of data is finished, a final stopcondition is
- *#   generated.
- *#
- *#---------------------------------------------------------------------------
- */
-static int i2c_command( unsigned char  slave
-                      , unsigned char* wbuf
-                      , unsigned char  wlen
-                      , unsigned char* rbuf
-                      , unsigned char  rlen
-                      )
-{
-    /* Check arguments and report error if relevant... */
-    if ( ( wlen > 0 ) && ( wbuf == NULL ) )
-    {
-        printk( KERN_DEBUG "I2C: EI2CNOSNDBUF\n" );
-        return ( EI2CNOSNDBUF );
-    }
-    else if ( ( wlen == 0 ) && ( wbuf != NULL ) )
-    {
-        printk( KERN_DEBUG "I2C: EI2CNOSNDBYT\n" );
-        return ( EI2CNOSNDBYT );
-    }
-    else if ( ( rlen > 0 ) && ( rbuf == NULL ) )
-    {
-        printk( KERN_DEBUG "I2C: EI2CNORCVBUF\n" );
-        return ( EI2CNORCVBUF );
-    }
-    else if ( ( rlen == 0 ) && ( rbuf != NULL ) )
-    {
-        printk( KERN_DEBUG "I2C: EI2CNORCVBYT\n" );
-        return ( EI2CNORCVBYT );
-    }
-    else if ( EI2CBUSNFREE == i2c_bus_free_check( MAXBUSFREERETRIES ) )
-    {
-        /* There's no need to try more, since we weren't even
-         * able to start the I2C communication.
-         * So, no IRQ flags are stored yet, no changes to any other
-         * stuff like START, STOP, SENDBYTES...
-         * Result, simply write down the error and return the correct error code.
-         */
-        printk( KERN_DEBUG "I2C: EI2CBUSNFREE\n" );
-        return ( EI2CBUSNFREE );
-    }
-    else
-    {
-        /* Finally... We made it... */
-        unsigned long irqflags = 0;
-
-        /* we don't like to be interrupted */
-        local_irq_save( irqflags );
-
-        /* Check if there are bytes to be send,
-         * or if you immediately want to receive data.
-         */
-        if ( 0 < wlen )
-        {
-            /* start I2C communication */
-            if ( EI2CNOERRORS != i2c_start() )
-            {
-                return ( i2c_finalise( "I2C: EI2CSTRTCOND\n", irqflags  )
-                       , EI2CSTRTCOND
-                       );
-            }
-
-            /* send slave address: xxxxxxx0B (last bit must be zero) */
-            if ( EI2CNOERRORS != i2c_outbyte( slave & WRITEADDRESS_MASK ) )
-            {
-                return ( i2c_finalise( "I2C: EI2CWADDRESS\n", irqflags  )
-                       , EI2CWADDRESS
-                       );
-            }
-
-            while ( wlen-- )
-            {
-                /* send register data */
-                if ( EI2CNOERRORS != i2c_outbyte( *wbuf ) && wlen )
-                {
-                    return ( i2c_finalise( "I2C: EI2CSENDDATA\n", irqflags  )
-                           , EI2CSENDDATA
-                           );
-                }
-
-                wbuf++;
-            };
-
-            i2c_delay( TLOW );
-        }
-
-        /*
-         * Receiving data from I2c_bus
-         * If there are bytes to be received, a new start condition is
-         * generated => Repeated Startcondition.
-         * A final stopcondition is generated at the end of the main I2c
-         * routine.
-         */
-        if ( 0 < rlen )
-        {
-            /*
-             * Generate start condition if wlen == 0
-             * or repeated start condition if wlen != 0...
-             */
-            if ( EI2CNOERRORS != i2c_start() )
-            {
-                return ( i2c_finalise( ( ( 0 < wlen )
-                                       ? "I2C: EI2CRSTACOND\n"
-                                       : "I2C: EI2CSTRTCOND\n"
-                                       )
-                                     , irqflags
-                                     )
-                       , ( ( 0 < wlen ) ? EI2CRSTACOND : EI2CSTRTCOND )
-                       );
-            }
-
-            /* Send ReadAddress: xxxxxxx1B (last bit must be one) */
-            if ( EI2CNOERRORS != i2c_outbyte( slave | READADDRESS_MASK ) )
-            {
-                return ( i2c_finalise( "I2C: EI2CRADDRESS\n", irqflags )
-                       , EI2CRADDRESS
-                       );
-            }
-
-            while ( rlen-- )
-            {
-                /* fetch register */
-                *rbuf = i2c_inbyte();
-                rbuf++;
-
-                /* last received byte needs to be NACK-ed instead of ACK-ed */
-                if ( rlen )
-                {
-                    i2c_sendack();
-                }
-                else
-                {
-                    i2c_sendnack();
-                }
-            };
-        }
-
-        /* Generate final stop condition */
-        if ( EI2CNOERRORS != i2c_stop() )
-        {
-            return ( i2c_finalise( "I2C CMD: EI2CSTOPCOND\n", irqflags )
-                   , EI2CSTOPCOND
-                   );
-        }
-
-        /* enable interrupt again */
-        local_irq_restore( irqflags );
-    }
-
-    return ( EI2CNOERRORS );
-} /*  i2c_command */
-
-
-/*#---------------------------------------------------------------------------
- *#
- *# FUNCTION NAME: i2c_bus_free_check
- *#
- *# DESCRIPTION  : checks if the I2C bus is free before starting
- *#                an I2C communication
- *#
- *# PARAMETERS   : maxretries, the number of times we will try to release
- *#                the I2C bus
- *#
- *# RETURN       : I2cStatus_I2cBusNotFreeError in case the bus is not free,
- *#                I2cStatus_I2cNoError otherwise
- *#
- *#---------------------------------------------------------------------------
- */
-static int i2c_bus_free_check( unsigned char maxretries )
-{
-    i2c_sda_dir_in();        /* Release SDA line */
-    i2c_set_scl( SCL_HIGH ); /* put SCL line high */
-
-    i2c_delay( WAITONEUS );
-
-    while ( ( !i2c_sda_is_high() || !i2c_scl_is_high() )
-          &&( maxretries-- )
-          )
-    {
-        /* Try to release I2C bus by generating STOP conditions */
-        i2c_stop();
-    }
-
-    if ( 0 == maxretries )
-    {
-        printk( KERN_DEBUG "I2C: EI2CBUSNFREE\n" );
-        return ( EI2CBUSNFREE );
-    }
-    else
-    {
-        return ( EI2CNOERRORS );
-    }
-} /* i2c_bus_free_check */
-
-
-static void i2c_finalise( const char* errortxt
-                        , unsigned long irqflags
-                        )
-{
-    printk( KERN_DEBUG "%s", errortxt );
-    local_irq_restore( irqflags );
-    /* The least we can do when things go terribly wrong,
-     * is to try to release the bus.
-     * If this fails, well, then I don't know
-     * what I can do more for the moment...
-     */
-    (void)i2c_bus_free_check( MAXBUSFREERETRIES );
-}   /* i2c_finalise */
-
-
-static struct file_operations i2c_fops =
-{
-    .owner    = THIS_MODULE
-,   .ioctl    = i2c_ioctl
-,   .open     = i2c_open
-,   .release  = i2c_release
-};
-
-
-/***********************************************************************/
-/************* EXTERNAL FUNCTION DEFINITION SECTION ********************/
-/***********************************************************************/
-
-/*#---------------------------------------------------------------------------
- *#
- *# FUNCTION NAME: i2c_init
- *#
- *# DESCRIPTION  : initialises the I2C device driver
- *#
- *# PARAMETERS   :
- *#
- *#---------------------------------------------------------------------------
- */
-int __init i2c_init( void )
-{
-    static int res = 0;
-    static int first = 1;
-
-    if ( !first )
-    {
-        return res;
-    }
-
-    first = 0;
-
-    /* Setup and enable the Port B I2C interface */
-
-#ifndef CONFIG_ETRAX_I2C_USES_PB_NOT_PB_I2C
-    /* here, we're using the dedicated I2C pins of FoxBoard */
-    if ( ( res = cris_request_io_interface( if_i2c, "I2C" ) ) )
-    {
-        printk( KERN_CRIT "i2c_init: Failed to get IO interface\n" );
-        return res;
-    }
-
-    *R_PORT_PB_I2C = port_pb_i2c_shadow |=
-        IO_STATE( R_PORT_PB_I2C, i2c_en,  on ) |
-        IO_FIELD( R_PORT_PB_I2C, i2c_d,   1 )  |
-        IO_FIELD( R_PORT_PB_I2C, i2c_set_scl, 1 )  |
-        IO_STATE( R_PORT_PB_I2C, i2c_oe_, enable );
-
-    port_pb_dir_shadow &= ~IO_MASK( R_PORT_PB_DIR, dir0 );
-    port_pb_dir_shadow &= ~IO_MASK( R_PORT_PB_DIR, dir1 );
-
-    *R_PORT_PB_DIR = ( port_pb_dir_shadow |=
-              IO_STATE( R_PORT_PB_DIR, dir0, input )  |
-              IO_STATE( R_PORT_PB_DIR, dir1, output ) );
-#else
-        /* If everything goes fine, res = 0, meaning "if" fails =>
-         * will do the "else" too and as such initialise the clock port...
-         * Clever trick!
-         */
-        if ( ( res = cris_io_interface_allocate_pins( if_i2c
-                                                    , 'b'
-                                                    , CONFIG_ETRAX_I2C_DATA_PORT
-                                                    , CONFIG_ETRAX_I2C_DATA_PORT
-                                                    )
-             )
-           )
-        {
-            printk( KERN_WARNING "i2c_init: Failed to get IO pin for I2C data port\n" );
-            return ( res );
-        }
-        /* Same here...*/
-        else if ( ( res = cris_io_interface_allocate_pins( if_i2c
-                                                         , 'b'
-                                                         , CONFIG_ETRAX_I2C_CLK_PORT
-                                                         , CONFIG_ETRAX_I2C_CLK_PORT
-                                                         )
-                  )
-                )
-        {
-            cris_io_interface_free_pins( if_i2c
-                                       , 'b'
-                                       , CONFIG_ETRAX_I2C_DATA_PORT
-                                       , CONFIG_ETRAX_I2C_DATA_PORT
-                                       );
-            printk( KERN_WARNING "i2c_init: Failed to get IO pin for I2C clk port\n" );
-        }
-#endif
-
-    return ( res );
-}   /* i2c_init */
-
-
-/*#---------------------------------------------------------------------------
- *#
- *# FUNCTION NAME: i2c_register
- *#
- *# DESCRIPTION  : this registers the i2c driver as a character device
- *#
- *# PARAMETERS   :
- *#
- *#---------------------------------------------------------------------------
- */
-
-static struct class *i2c_class;
-
-static int __init i2c_register( void )
-{
-    int res;
-#ifdef CONFIG_ETRAX_I2C_DYN_ALLOC
-    dev_t devt;
-    struct cdev *my_i2cdev = NULL;
-#endif
-
-    res = i2c_init();
-
-    if ( res < 0 )
-    {
-        return res;
-    }
-
-#ifdef CONFIG_ETRAX_I2C_DYN_ALLOC
-    res = alloc_chrdev_region( &devt, 0, 1, i2c_name );
-
-    if ( res < 0 )
-    {
-        printk( KERN_DEBUG "I2C: EI2CNOMNUMBR\n" );
-        return ( res );
-    }
-
-    my_i2cdev = cdev_alloc();
-    my_i2cdev->ops = &i2c_fops;
-    my_i2cdev->owner = THIS_MODULE;
-
-    /* make device "alive" */
-    res = cdev_add( my_i2cdev, devt, 1 );
-
-    if ( res < 0 )
-    {
-        printk( KERN_DEBUG "I2C: EI2CDADDFAIL\n" );
-        return ( res );
-    }
-
-    int i2c_major = MAJOR( devt );
-#else
-    res = register_chrdev( I2C_MAJOR, i2c_name, &i2c_fops );
-
-    if ( res < 0 )
-    {
-        printk( KERN_ERR "i2c: couldn't get a major number.\n" );
-        return res;
-    }
-   
-    int i2c_major = I2C_MAJOR;
-#endif
-
-    printk( KERN_INFO "I2C: driver v2.3, (c) 1999-2004 Axis Communications AB\n" );
-    printk( KERN_INFO "I2C: Improvements by Geert Vancompernolle, Positive Going, BK srl\n" );
-
-#ifdef CONFIG_ETRAX_I2C_SLAVE_DELAY
-    printk( KERN_INFO "I2C: with master/slave delay patch\n" );
-#endif
-
-    i2c_class = class_create (THIS_MODULE, "i2c_etrax");
-    device_create (i2c_class, NULL,
-		   MKDEV(i2c_major,0), NULL, i2c_name);
-
-    return ( 0 );
-}   /* i2c_register */
-
-
-/*#---------------------------------------------------------------------------
- *#
- *# FUNCTION NAME: i2c_start
- *#
- *# DESCRIPTION  : generate i2c start condition
- *#
- *# PARAMETERS   : none
- *#
- *# RETURN       : EI2CNOERRORS if OK, EI2CSTRTCOND otherwise
- *#
- *#---------------------------------------------------------------------------
- */
-int i2c_start( void )
-{
-  /* Set SCL=1, SDA=1 */
-  i2c_sda_dir_out();
-  i2c_set_sda( SDA_HIGH );
-  i2c_delay( WAITONEUS );
-  i2c_set_scl( SCL_HIGH );
-  i2c_delay( WAITONEUS );
-  
-  /* Set SCL=1, SDA=0 */
-  i2c_set_sda( SDA_LOW );
-  i2c_delay( THDSTA );
-  
-  /* Set SCL=0, SDA=0 */
-  i2c_set_scl( SCL_LOW );
-  /* We can take 1 us less than defined in spec (5 us), since the next action
-   * will be to set the dataline high or low and this action is 1 us
-   * before the clock is put high, so that makes our 5 us.
-   */
-  i2c_delay( TLOW - WAITONEUS );
-  
-  if ( i2c_sda_is_high() || i2c_scl_is_high() )
-    {
-      printk( KERN_DEBUG "I2C: EI2CSTRTCOND\n" );
-      return ( EI2CSTRTCOND );
-    }
-  
-  return ( EI2CNOERRORS );
-}   /* i2c_start */
-
-
-/*#---------------------------------------------------------------------------
- *#
- *# FUNCTION NAME: i2c_stop
- *#
- *# DESCRIPTION  : generate i2c stop condition
- *#
- *# PARAMETERS   : none
- *#
- *# RETURN       : none
- *#
- *#---------------------------------------------------------------------------
- */
-int i2c_stop( void )
-{
-#ifdef CONFIG_ETRAX_I2C_SLAVE_DELAY
-    int n=MAXSCLRETRIES;
-#endif
-    i2c_sda_dir_out();
-    
-    /* Set SCL=0, SDA=0 */
-    /* Don't change order, otherwise you might generate a start condition! */
-    i2c_set_scl( SCL_LOW );
-    i2c_delay( WAITONEUS );
-    i2c_set_sda( SDA_LOW );
-    i2c_delay( WAITONEUS );
-    
-    /* Set SCL=1, SDA=0 */
-    
-#ifdef CONFIG_ETRAX_I2C_SLAVE_DELAY
-    i2c_set_scl( SCL_HIGH );
-    i2c_scl_dir_in();
-    for( ; n>0; n-- )
-      {
-	if( i2c_scl_is_high() )
-	  break;
-	i2c_delay( TSUSTO );
-      }
-    
-    i2c_scl_dir_out();
-#else
-    i2c_set_scl( SCL_HIGH );
-#endif
-    i2c_delay( TSUSTO );
-    
-    /* Set SCL=1, SDA=1 */
-    i2c_set_sda( SDA_HIGH );
-    i2c_delay( TBUF );
-    
-    i2c_sda_dir_in();
-    
-    if ( !i2c_sda_is_high() || !i2c_scl_is_high() )
-      {
-	return ( EI2CSTOPCOND );
-      }
-    
-    return ( EI2CNOERRORS );
-}   /* i2c_stop */
-
-
-/*#---------------------------------------------------------------------------
- *#
- *# FUNCTION NAME: i2c_outbyte
- *#
- *# DESCRIPTION  : write a byte to the i2c interface
- *#
- *# PARAMETERS   : x: byte to be sent on the I2C bus
- *#
- *# RETURN       : none
- *#
- *#---------------------------------------------------------------------------
- */
-int i2c_outbyte( unsigned char x )
-{
-    int i;
-
-    i2c_sda_dir_out();
-
-    for ( i = 0; i < 8; i++ )
-    {
-        if ( x & 0x80 )
-        {
-            i2c_set_sda( SDA_HIGH );
-        }
-        else
-        {
-            i2c_set_sda( SDA_LOW );
-        }
-
-        i2c_delay( TSUDAT );
-        i2c_set_scl( SCL_HIGH );
-        i2c_delay( THIGH );
-        i2c_set_scl( SCL_LOW );
-        i2c_delay( TSUDAT );
-        i2c_set_sda( SDA_LOW );
-        /* There should be only 5 us between falling edge and new rising
-         * edge of clock pulse.
-         * Since we spend already 1 us since clock edge was low, there are
-         * only ( TLOW - TSUDAT ) us left.
-         * Next to this, since the data line will be set up 1 us before the
-         * clock line is set up, we can reduce the delay with another us.
-         */
-        i2c_delay( TLOW - TSUDAT - WAITONEUS );
-        x <<= 1;
-    }
-
-    /* enable input */
-    i2c_sda_dir_in();
-
-    if ( !i2c_getack() )
-      {
-        return( EI2CNOACKNLD );
-      }
-
-    return ( EI2CNOERRORS );
-}   /* i2c_outbyte */
-
-
-/*#---------------------------------------------------------------------------
- *#
- *# FUNCTION NAME: i2c_inbyte
- *#
- *# DESCRIPTION  : read a byte from the i2c interface
- *#
- *# PARAMETERS   : none
- *#
- *# RETURN       : returns the byte read from the I2C device
- *#
- *#---------------------------------------------------------------------------
- */
-unsigned char i2c_inbyte( void )
-{
-#ifdef CONFIG_ETRAX_I2C_SLAVE_DELAY
-    int n=MAXSCLRETRIES;
-#endif
-    unsigned char aBitByte = 0;
-    unsigned char Mask     = 0x80;    /* !!! ATTENTION: do NOT use 'char', otherwise shifting is wrong!!! */
-                                      /* Must be UNSIGNED, not SIGNED! */
-
-
-    /* Switch off I2C to get bit */
-    i2c_disable();
-    i2c_sda_dir_in();
-
-    while ( Mask != 0 )
-    {
-#ifdef CONFIG_ETRAX_I2C_SLAVE_DELAY
-	i2c_scl_dir_in();
-	for( ; n>0; n-- )
-	{	
-		if( i2c_scl_is_high() )
-			break;
-		i2c_delay( THIGH );
-	}
-
-        i2c_set_scl( SCL_HIGH );
-	i2c_scl_dir_out();
-#else
-        i2c_set_scl( SCL_HIGH );
-#endif
-        i2c_delay( THIGH );
-
-        if ( i2c_sda_is_high() )
-        {
-            aBitByte |= Mask;
-        }
-
-        i2c_set_scl( SCL_LOW );
-
-        Mask >>= 1;
-
-        i2c_delay( TLOW );
-    }
-
-    /*
-     * we leave the clock low, getbyte is usually followed
-     * by sendack/nack, they assume the clock to be low
-     */
-    return ( aBitByte );
-}   /* i2c_inbyte */
-
-
-/*#---------------------------------------------------------------------------
- *#
- *# FUNCTION NAME: i2c_getack
- *#
- *# DESCRIPTION  : checks if ack was received from ic2
- *#
- *# PARAMETERS   : none
- *#
- *# RETURN       : returns the ack state of the I2C device
- *#
- *#---------------------------------------------------------------------------
- */
-int i2c_getack( void )
-{
-    int ack = 1;
-#ifdef CONFIG_ETRAX_I2C_SLAVE_DELAY
-    int n=MAXSCLRETRIES;
-#endif
-
-    /* generate ACK clock pulse */
-    i2c_set_scl( SCL_HIGH );
-
-    /* switch off I2C */
-    i2c_disable();
-
-#ifdef CONFIG_ETRAX_I2C_SLAVE_DELAY
-    /* set clock low */
-    i2c_set_scl( SCL_LOW );
-
-    /* now wait for ack */
-    i2c_delay( THIGH );
-
-    /* set clock as input */
-    i2c_scl_dir_in();
-
-    /* wait for clock to rise (n=MAXSCLRETRIES) */
-    for( ; n>0; n-- )
-    {
-	if( i2c_scl_is_high() )
-            break;
-	i2c_delay( THIGH );
-    }
-
-    i2c_set_scl( SCL_HIGH );
-
-    i2c_scl_dir_out();
-
-    i2c_delay( THIGH );
-#else
-    /* now wait for ack */
-    i2c_delay( THIGH );
-#endif
-
-    /* check for ack: if SDA is high, then NACK, else ACK */
-    if ( i2c_sda_is_high() )
-    {
-        ack = 0;
-    }
-    else
-    {
-        ack = 1;
-    }
-
-    /* end clock pulse */
-    i2c_enable();
-    i2c_set_scl( SCL_LOW );
-    i2c_sda_dir_out();
-    i2c_set_sda( SDA_LOW );
-
-    /* Since we "lost" already THDDAT time, we can subtract it here... */
-    i2c_delay( TLOW  - THDDAT );
-
-    return ( ack );
-}   /* i2c_getack */
-
-
-/*#---------------------------------------------------------------------------
- *#
- *# FUNCTION NAME: i2c_sendack
- *#
- *# DESCRIPTION  : sends ACK on received data
- *#
- *# PARAMETERS   : none
- *#
- *# RETURN       : none
- *#
- *#---------------------------------------------------------------------------
- */
-void i2c_sendack( void )
-{
-#ifdef CONFIG_ETRAX_I2C_SLAVE_DELAY
-    int n=MAXSCLRETRIES;
-#endif
-
-    /* enable output */
-    /* Clock has been set to TLOW already at end of i2c_inbyte()
-     * and i2c_outbyte(), so no need to do it again.
-     */
-    i2c_sda_dir_out();
-    /* set ack pulse low */
-    i2c_set_sda( SDA_LOW );
-    /* generate clock pulse */
-    i2c_delay( TSUDAT );
-
-#ifdef CONFIG_ETRAX_I2C_SLAVE_DELAY
-    i2c_scl_dir_in();
-    /* wait for clock to rise (n=MAXSCLRETRIES) */
-    for( ; n>0; n-- )
-    {
-	if( i2c_scl_is_high() )
-            break;
-	i2c_delay( THIGH );
-    }
-
-    i2c_set_scl( SCL_HIGH );
-    i2c_scl_dir_out();
-    i2c_delay( THIGH );
-#else
-    i2c_set_scl( SCL_HIGH );
-
-    i2c_delay( THIGH );
-#endif
-    i2c_set_scl( SCL_LOW );
-    i2c_delay( THDDAT );
-    /* reset data out */
-    i2c_set_sda( SDA_HIGH );
-    /* Subtract time spend already when waited to put SDA high */
-    i2c_delay( TLOW - THDDAT );
-
-    /* release the SDA line */
-    i2c_sda_dir_in();
-}   /* i2c_sendack */
-
-
-/*#---------------------------------------------------------------------------
- *#
- *# FUNCTION NAME: i2c_sendnack
- *#
- *# DESCRIPTION  : sends NACK on received data
- *#
- *# PARAMETERS   : none
- *#
- *# RETURN       : none
- *#
- *#---------------------------------------------------------------------------
- */
-void i2c_sendnack( void )
-{
-#ifdef CONFIG_ETRAX_I2C_SLAVE_DELAY
-    int n=MAXSCLRETRIES;
-#endif
-
-    /* make sure the SDA line is set high prior to activation of the output.
-     * this way, you avoid an unnecessary peak to ground when a NACK has to
-     * be created.
-     */
-    /* set data high */
-    i2c_set_sda( SDA_HIGH );
-    /* enable output */
-    i2c_sda_dir_out();
-
-    /* generate clock pulse */
-    i2c_delay( TSUDAT );
-
-#ifdef CONFIG_ETRAX_I2C_SLAVE_DELAY
-    i2c_scl_dir_in();
-    /* wait for clock to rise (n=MAXSCLRETRIES) */
-    for( ; n>0; n-- )
-    {
-	if( i2c_scl_is_high() )
-            break;
-	i2c_delay( THIGH );
-    }
-
-    i2c_set_scl( SCL_HIGH );
-    i2c_scl_dir_out();
-    i2c_delay( THIGH );
-#else
-    i2c_set_scl( SCL_HIGH );
-
-    i2c_delay( THIGH );
-#endif
-    i2c_set_scl( SCL_LOW );
-    i2c_delay( TSUDAT );
-    i2c_set_sda( SDA_LOW );
-    i2c_delay( TLOW - TSUDAT );
-
-    /* There's no need to change the direction of SDA to "in" again,
-     * since a NACK is always followed by a stop condition.
-     * A STOP condition will put the direction of SDA back to "out"
-     * resulting in a useless SDA "dip" on the line...
-     */
-    /* i2c_sda_dir_in(); */
-}   /* i2c_sendnack */
-
-
-/*#---------------------------------------------------------------------------
- *#
- *# FUNCTION NAME: i2c_writereg
- *#
- *# DESCRIPTION  : writes a value to a register of an I2C device
- *#
- *# PARAMETERS   : theSlave = slave address of the I2C device
- *#                theReg   = register of the I2C device that needs to be written
- *#                theValue = value to be written to the register
- *#
- *# RETURN       : returns OR-ed result of the write action:
- *#                  0 = Ok
- *#                  1 = Slave_NoAck
- *#                  2 = Reg_NoAck
- *#                  4 = Val_NoAck
- *#
- *#---------------------------------------------------------------------------
- */
-int i2c_writereg( unsigned char theSlave
-                , unsigned char theReg
-                , unsigned char theValue
-                )
-{
-    int error, cntr = 3;
-    unsigned long flags;
-
-    spin_lock( &i2c_lock );
-
-    do
-    {
-        error = 0;
-        /* we don't like to be interrupted */
-        local_irq_save( flags );
-
-        i2c_start();
-        /* send slave address */
-        if ( EI2CNOACKNLD == i2c_outbyte( theSlave & 0xfe ) )
-        {
-            error = 1;
-        }
-
-        /* now select register */
-        if ( EI2CNOACKNLD == i2c_outbyte( theReg ) )
-        {
-            error |= 2;
-        }
-
-        /* send register register data */
-        if ( EI2CNOACKNLD == i2c_outbyte( theValue ) )
-        {
-            error |= 4;
-        }
-
-        /* end byte stream */
-        i2c_stop();
-        /* enable interrupt again */
-        local_irq_restore( flags );
-
-    } while ( error && cntr-- );
-
-    i2c_delay( TLOW );
-
-    spin_unlock( &i2c_lock );
-
-    return ( -error );
-}   /* i2c_writereg */
-
-
-/*#---------------------------------------------------------------------------
- *#
- *# FUNCTION NAME: i2c_readreg
- *#
- *# DESCRIPTION  : reads the value from a certain register of an I2C device.
- *#                Function first writes the register that it wants to read
- *#                later on.
- *#
- *# PARAMETERS   : theSlave = slave address of the I2C device
- *#                theReg   = register of the I2C device that needs to be written
- *#
- *# RETURN       : returns OR-ed result of the write action:
- *#                  0 = Ok
- *#                  1 = Slave_NoAck
- *#                  2 = Reg_NoAck
- *#                  4 = Val_NoAck
- *#
- *#---------------------------------------------------------------------------
- */
-unsigned char i2c_readreg( unsigned char theSlave
-                         , unsigned char theReg
-                         )
-{
-    unsigned char b = 0;
-    int error, cntr = 3;
-    unsigned long flags;
-
-    spin_lock( &i2c_lock );
-
-    do
-    {
-        error = 0;
-
-        /* we don't like to be interrupted */
-        local_irq_save( flags );
-
-        /* generate start condition */
-        i2c_start();
-
-        /* send slave address */
-        if ( EI2CNOACKNLD == i2c_outbyte( theSlave & 0xfe ) )
-        {
-            error = 1;
-        }
-
-        /* now select register */
-        i2c_sda_dir_out();
-
-        if ( EI2CNOACKNLD == i2c_outbyte( theReg ) )
-        {
-            error |= 2;
-        }
-
-        /* repeat start condition */
-        i2c_delay( TLOW );
-        i2c_start();
-
-        /* send slave address */
-        if ( EI2CNOACKNLD == i2c_outbyte( theSlave | 0x01 ) )
-        {
-            error |= 1;
-        }
-
-        /* fetch register */
-        b = i2c_inbyte();
-        /*
-         * last received byte needs to be nacked
-         * instead of acked
-         */
-        i2c_sendnack();
-
-        /* end sequence */
-        i2c_stop();
-
-        /* enable interrupt again */
-        local_irq_restore( flags );
-
-    } while ( error && cntr-- );
-
-    spin_unlock( &i2c_lock );
-
-    return ( b );
-}   /* i2c_readreg */
-
-
-/*#---------------------------------------------------------------------------
- *#
- *# FUNCTION NAME: i2c_read
- *#
- *# DESCRIPTION  :
- *#
- *# PARAMETERS   :
- *#
- *# RETURN       :
- *#
- *#---------------------------------------------------------------------------
- */
-int i2c_read( unsigned char slave, unsigned char* rbuf, unsigned char rlen )
-{
-    return ( i2c_command( slave, NULL, 0, rbuf, rlen ) );
-}   /* i2c_read */
-
-
-/*#---------------------------------------------------------------------------
- *#
- *# FUNCTION NAME: i2c_write
- *#
- *# DESCRIPTION  :
- *#
- *# PARAMETERS   :
- *#
- *# RETURN       :
- *#
- *#---------------------------------------------------------------------------
- */
-int i2c_write( unsigned char slave, unsigned char* wbuf, unsigned char wlen )
-{
-    return ( i2c_command( slave, wbuf, wlen, NULL, 0 ) );
-}   /* i2c_write */
-
-
-/*#---------------------------------------------------------------------------
- *#
- *# FUNCTION NAME: i2c_writeread
- *#
- *# DESCRIPTION  :
- *#
- *# PARAMETERS   :
- *#
- *# RETURN       :
- *#
- *#---------------------------------------------------------------------------
- */
-int i2c_writeread( unsigned char  slave
-                 , unsigned char* wbuf
-                 , unsigned char  wlen
-                 , unsigned char* rbuf
-                 , unsigned char  rlen
-                 )
-{
-    return ( i2c_command( slave, wbuf, wlen, rbuf, rlen ) );
-}   /* i2c_writeread */
-
-
-/*#---------------------------------------------------------------------------
- *#
- *# FUNCTION NAME: module_init
- *#
- *# DESCRIPTION  : this makes sure that i2c_register is called during boot
- *#
- *# PARAMETERS   :
- *#
- *#---------------------------------------------------------------------------
- */
-module_init( i2c_register );
-
-/****************** END OF FILE i2c.c ********************************/
diff --git a/target/linux/etrax/files/arch/cris/arch-v10/drivers/i2c_gvc.h b/target/linux/etrax/files/arch/cris/arch-v10/drivers/i2c_gvc.h
deleted file mode 100644
index e4d4d2c7f..000000000
--- a/target/linux/etrax/files/arch/cris/arch-v10/drivers/i2c_gvc.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef _I2C_H
-#define _I2C_H
-
-int i2c_init(void);
-
-/* High level I2C actions */
-int i2c_writereg(unsigned char theSlave, unsigned char theReg, unsigned char theValue);
-unsigned char i2c_readreg(unsigned char theSlave, unsigned char theReg);
-
-/* Low level I2C */
-int i2c_start(void);
-int i2c_stop(void);
-int i2c_outbyte(unsigned char x);
-unsigned char i2c_inbyte(void);
-int i2c_getack(void);
-void i2c_sendack(void);
-void i2c_sendnack(void);
-
-/**GVC**/
-/* New low level I2C functions */
-int i2c_read( unsigned char slave, unsigned char* rbuf, unsigned char rlen );
-int i2c_write( unsigned char slave, unsigned char* wbuf, unsigned char wlen );
-int i2c_writeread( unsigned char  slave
-                 , unsigned char* wbuf
-                 , unsigned char  wlen
-                 , unsigned char* rbuf
-                 , unsigned char  rlen
-                 );
-/**END GVC**/
-#endif /* _I2C_H */
diff --git a/target/linux/etrax/files/drivers/usb/host/hc-cris-dbg.h b/target/linux/etrax/files/drivers/usb/host/hc-cris-dbg.h
deleted file mode 100644
index 6a3696ff5..000000000
--- a/target/linux/etrax/files/drivers/usb/host/hc-cris-dbg.h
+++ /dev/null
@@ -1,142 +0,0 @@
-
-/* macros for debug output */
-
-#define hcd_dbg(hcd, fmt, args...) \
-	dev_info(hcd->self.controller, fmt, ## args)
-#define hcd_err(hcd, fmt, args...) \
-	dev_err(hcd->self.controller, fmt, ## args)
-#define hcd_info(hcd, fmt, args...) \
-	dev_info(hcd->self.controller, fmt, ## args)
-#define hcd_warn(hcd, fmt, args...) \
-	dev_warn(hcd->self.controller, fmt, ## args)
-
-/*
-#define devdrv_dbg(fmt, args...) \
-        printk(KERN_INFO "usb_devdrv dbg: ");printk(fmt, ## args)
-*/
-#define devdrv_dbg(fmt, args...) {}
-
-#define devdrv_err(fmt, args...) \
-        printk(KERN_ERR "usb_devdrv error: ");printk(fmt, ## args)
-#define devdrv_info(fmt, args...) \
-        printk(KERN_INFO "usb_devdrv: ");printk(fmt, ## args)
-
-#define irq_dbg(fmt, args...) \
-        printk(KERN_INFO "crisv10_irq dbg: ");printk(fmt, ## args)
-#define irq_err(fmt, args...) \
-        printk(KERN_ERR "crisv10_irq error: ");printk(fmt, ## args)
-#define irq_warn(fmt, args...) \
-        printk(KERN_INFO "crisv10_irq warn: ");printk(fmt, ## args)
-#define irq_info(fmt, args...) \
-        printk(KERN_INFO "crisv10_hcd: ");printk(fmt, ## args)
-
-/*
-#define rh_dbg(fmt, args...) \
-  printk(KERN_DEBUG "crisv10_rh dbg: ");printk(fmt, ## args)
-*/
-#define rh_dbg(fmt, args...) {}
-
-#define rh_err(fmt, args...) \
-        printk(KERN_ERR "crisv10_rh error: ");printk(fmt, ## args)
-#define rh_warn(fmt, args...) \
-        printk(KERN_INFO "crisv10_rh warning: ");printk(fmt, ## args)
-#define rh_info(fmt, args...) \
-        printk(KERN_INFO "crisv10_rh: ");printk(fmt, ## args)
-
-/*
-#define tc_dbg(fmt, args...) \
-        printk(KERN_INFO "crisv10_tc dbg: ");printk(fmt, ## args)
-*/
-#define tc_dbg(fmt, args...) {while(0){}}
-
-#define tc_err(fmt, args...) \
-        printk(KERN_ERR "crisv10_tc error: ");printk(fmt, ## args)
-/*
-#define tc_warn(fmt, args...) \
-        printk(KERN_INFO "crisv10_tc warning: ");printk(fmt, ## args)
-*/
-#define tc_warn(fmt, args...) {while(0){}}
-
-#define tc_info(fmt, args...) \
-        printk(KERN_INFO "crisv10_tc: ");printk(fmt, ## args)
-
-
-/* Debug print-outs for various traffic types */
-
-#define intr_warn(fmt, args...) \
-        printk(KERN_INFO "crisv10_intr warning: ");printk(fmt, ## args)
-/*
-#define intr_dbg(fmt, args...) \
-        printk(KERN_DEBUG "crisv10_intr dbg: ");printk(fmt, ## args)
-*/
-#define intr_dbg(fmt, args...) {while(0){}}
-
-
-#define isoc_err(fmt, args...) \
-        printk(KERN_ERR "crisv10_isoc error: ");printk(fmt, ## args)
-/*
-#define isoc_warn(fmt, args...) \
-        printk(KERN_INFO "crisv10_isoc warning: ");printk(fmt, ## args)
-*/
-#define isoc_warn(fmt, args...) {while(0){}}
-
-/*
-#define isoc_dbg(fmt, args...) \
-        printk(KERN_INFO "crisv10_isoc dbg: ");printk(fmt, ## args)
-*/
-#define isoc_dbg(fmt, args...) {while(0){}}
-
-/*
-#define timer_warn(fmt, args...) \
-        printk(KERN_INFO "crisv10_timer warning: ");printk(fmt, ## args)
-*/
-#define timer_warn(fmt, args...) {while(0){}}
-
-/*
-#define timer_dbg(fmt, args...) \
-        printk(KERN_INFO "crisv10_timer dbg: ");printk(fmt, ## args)
-*/
-#define timer_dbg(fmt, args...) {while(0){}}
-
-
-/* Debug printouts for events related to late finishing of URBs */
-/*
-#define late_dbg(fmt, args...) \
-        printk(KERN_INFO "crisv10_late dbg: ");printk(fmt, ## args)
-*/
-#define late_dbg(fmt, args...) {while(0){}}
-
-#define late_warn(fmt, args...) \
-        printk(KERN_INFO "crisv10_late warning: ");printk(fmt, ## args)
-/*
-#define errno_dbg(fmt, args...) \
-        printk(KERN_INFO "crisv10_errno dbg: ");printk(fmt, ## args)
-*/
-#define errno_dbg(fmt, args...) {while(0){}}
-
-
-#define dma_dbg(fmt, args...) \
-        printk(KERN_INFO "crisv10_dma dbg: ");printk(fmt, ## args)
-#define dma_err(fmt, args...) \
-        printk(KERN_ERR "crisv10_dma error: ");printk(fmt, ## args)
-#define dma_warn(fmt, args...) \
-        printk(KERN_INFO "crisv10_dma warning: ");printk(fmt, ## args)
-#define dma_info(fmt, args...) \
-        printk(KERN_INFO "crisv10_dma: ");printk(fmt, ## args)
-
-
-
-#define str_dir(pipe) \
-	(usb_pipeout(pipe) ? "out" : "in")
-#define str_type(pipe) \
-	({								\
-		char *s = "?";						\
-		switch (usb_pipetype(pipe)) {				\
-		case PIPE_ISOCHRONOUS:	s = "iso";  break;		\
-		case PIPE_INTERRUPT:	s = "intr"; break;		\
-		case PIPE_CONTROL:	s = "ctrl"; break;		\
-		case PIPE_BULK:		s = "bulk"; break;		\
-		};							\
-		s;							\
-	})
-
diff --git a/target/linux/etrax/files/drivers/usb/host/hc-crisv10.c b/target/linux/etrax/files/drivers/usb/host/hc-crisv10.c
deleted file mode 100644
index 817e19e50..000000000
--- a/target/linux/etrax/files/drivers/usb/host/hc-crisv10.c
+++ /dev/null
@@ -1,4960 +0,0 @@
-/*
- *
- * ETRAX 100LX USB Host Controller Driver
- *
- * Copyright (C) 2005 - 2008  Axis Communications AB
- *
- * Author: Konrad Eriksson <konrad.eriksson@axis.se>
- *
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/moduleparam.h>
-#include <linux/spinlock.h>
-#include <linux/usb.h>
-#include <linux/platform_device.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/arch/dma.h>
-#include <asm/arch/io_interface_mux.h>
-
-#include "../core/hcd.h"
-#include "../core/hub.h"
-#include "hc-crisv10.h"
-#include "hc-cris-dbg.h"
-
-
-/***************************************************************************/
-/***************************************************************************/
-/* Host Controller settings                                                */
-/***************************************************************************/
-/***************************************************************************/
-
-#define VERSION			"1.00-openwrt_diff"
-#define COPYRIGHT		"(c) 2005, 2006 Axis Communications AB"
-#define DESCRIPTION             "ETRAX 100LX USB Host Controller"
-
-#define ETRAX_USB_HC_IRQ USB_HC_IRQ_NBR
-#define ETRAX_USB_RX_IRQ USB_DMA_RX_IRQ_NBR
-#define ETRAX_USB_TX_IRQ USB_DMA_TX_IRQ_NBR
-
-/* Number of physical ports in Etrax 100LX */
-#define USB_ROOT_HUB_PORTS 2
-
-const char hc_name[] = "hc-crisv10";
-const char product_desc[] = DESCRIPTION;
-
-/* The number of epids is, among other things, used for pre-allocating
-   ctrl, bulk and isoc EP descriptors (one for each epid).
-   Assumed to be > 1 when initiating the DMA lists. */
-#define NBR_OF_EPIDS       32
-
-/* Support interrupt traffic intervals up to 128 ms. */
-#define MAX_INTR_INTERVAL  128
-
-/* If periodic traffic (intr or isoc) is to be used, then one entry in the EP
-   table must be "invalid". By this we mean that we shouldn't care about epid
-   attentions for this epid, or at least handle them differently from epid
-   attentions for "valid" epids. This define determines which one to use
-   (don't change it). */
-#define INVALID_EPID       31
-/* A special epid for the bulk dummys. */
-#define DUMMY_EPID         30
-
-/* Module settings */
-
-MODULE_DESCRIPTION(DESCRIPTION);
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Konrad Eriksson <konrad.eriksson@axis.se>");
-
-
-/* Module parameters */
-
-/* 0 = No ports enabled
-   1 = Only port 1 enabled (on board ethernet on devboard)
-   2 = Only port 2 enabled (external connector on devboard)
-   3 = Both ports enabled
-*/
-static unsigned int ports = 3;
-module_param(ports, uint, S_IRUGO);
-MODULE_PARM_DESC(ports, "Bitmask indicating USB ports to use");
-
-
-/***************************************************************************/
-/***************************************************************************/
-/* Shared global variables for this module                                 */
-/***************************************************************************/
-/***************************************************************************/
-
-/* EP descriptor lists for non period transfers. Must be 32-bit aligned. */
-static volatile struct USB_EP_Desc TxBulkEPList[NBR_OF_EPIDS] __attribute__ ((aligned (4)));
-
-static volatile struct USB_EP_Desc TxCtrlEPList[NBR_OF_EPIDS] __attribute__ ((aligned (4)));
-
-/* EP descriptor lists for period transfers. Must be 32-bit aligned. */
-static volatile struct USB_EP_Desc TxIntrEPList[MAX_INTR_INTERVAL] __attribute__ ((aligned (4)));
-static volatile struct USB_SB_Desc TxIntrSB_zout __attribute__ ((aligned (4)));
-
-static volatile struct USB_EP_Desc TxIsocEPList[NBR_OF_EPIDS] __attribute__ ((aligned (4)));
-static volatile struct USB_SB_Desc TxIsocSB_zout __attribute__ ((aligned (4)));
-
-static volatile struct USB_SB_Desc TxIsocSBList[NBR_OF_EPIDS] __attribute__ ((aligned (4))); 
-
-/* After each enabled bulk EP IN we put two disabled EP descriptors with the eol flag set,
-   causing the DMA to stop the DMA channel. The first of these two has the intr flag set, which
-   gives us a dma8_sub0_descr interrupt. When we receive this, we advance the DMA one step in the
-   EP list and then restart the bulk channel, thus forcing a switch between bulk EP descriptors
-   in each frame. */
-static volatile struct USB_EP_Desc TxBulkDummyEPList[NBR_OF_EPIDS][2] __attribute__ ((aligned (4)));
-
-/* List of URB pointers, where each points to the active URB for a epid.
-   For Bulk, Ctrl and Intr this means which URB that currently is added to
-   DMA lists (Isoc URBs are all directly added to DMA lists). As soon as
-   URB has completed is the queue examined and the first URB in queue is
-   removed and moved to the activeUrbList while its state change to STARTED and
-   its transfer(s) gets added to DMA list (exception Isoc where URBs enter
-   state STARTED directly and added transfers added to DMA lists). */
-static struct urb *activeUrbList[NBR_OF_EPIDS];
-
-/* Additional software state info for each epid */
-static struct etrax_epid epid_state[NBR_OF_EPIDS];
-
-/* Timer handles for bulk traffic timer used to avoid DMA bug where DMA stops
-   even if there is new data waiting to be processed */
-static struct timer_list bulk_start_timer = TIMER_INITIALIZER(NULL, 0, 0);
-static struct timer_list bulk_eot_timer = TIMER_INITIALIZER(NULL, 0, 0);
-
-/* We want the start timer to expire before the eot timer, because the former
-   might start traffic, thus making it unnecessary for the latter to time
-   out. */
-#define BULK_START_TIMER_INTERVAL (HZ/50) /* 20 ms */
-#define BULK_EOT_TIMER_INTERVAL (HZ/16) /* 60 ms */
-
-/* Delay before a URB completion happen when it's scheduled to be delayed */
-#define LATER_TIMER_DELAY (HZ/50) /* 20 ms */
-
-/* Simplifying macros for checking software state info of a epid */
-/* ----------------------------------------------------------------------- */
-#define epid_inuse(epid)       epid_state[epid].inuse
-#define epid_out_traffic(epid) epid_state[epid].out_traffic
-#define epid_isoc(epid)   (epid_state[epid].type == PIPE_ISOCHRONOUS ? 1 : 0)
-#define epid_intr(epid)   (epid_state[epid].type == PIPE_INTERRUPT ? 1 : 0)
-
-
-/***************************************************************************/
-/***************************************************************************/
-/* DEBUG FUNCTIONS                                                         */
-/***************************************************************************/
-/***************************************************************************/
-/* Note that these functions are always available in their "__" variants,
-   for use in error situations. The "__" missing variants are controlled by
-   the USB_DEBUG_DESC/USB_DEBUG_URB macros. */
-static void __dump_urb(struct urb* purb)
-{
-  struct crisv10_urb_priv *urb_priv = purb->hcpriv;
-  int urb_num = -1;
-  if(urb_priv) {
-    urb_num = urb_priv->urb_num;
-  }
-  printk("\nURB:0x%x[%d]\n", (unsigned int)purb, urb_num);
-  printk("dev                   :0x%08lx\n", (unsigned long)purb->dev);
-  printk("pipe                  :0x%08x\n", purb->pipe);
-  printk("status                :%d\n", purb->status);
-  printk("transfer_flags        :0x%08x\n", purb->transfer_flags);
-  printk("transfer_buffer       :0x%08lx\n", (unsigned long)purb->transfer_buffer);
-  printk("transfer_buffer_length:%d\n", purb->transfer_buffer_length);
-  printk("actual_length         :%d\n", purb->actual_length);
-  printk("setup_packet          :0x%08lx\n", (unsigned long)purb->setup_packet);
-  printk("start_frame           :%d\n", purb->start_frame);
-  printk("number_of_packets     :%d\n", purb->number_of_packets);
-  printk("interval              :%d\n", purb->interval);
-  printk("error_count           :%d\n", purb->error_count);
-  printk("context               :0x%08lx\n", (unsigned long)purb->context);
-  printk("complete              :0x%08lx\n\n", (unsigned long)purb->complete);
-}
-
-static void __dump_in_desc(volatile struct USB_IN_Desc *in)
-{
-  printk("\nUSB_IN_Desc at 0x%08lx\n", (unsigned long)in);
-  printk("  sw_len  : 0x%04x (%d)\n", in->sw_len, in->sw_len);
-  printk("  command : 0x%04x\n", in->command);
-  printk("  next    : 0x%08lx\n", in->next);
-  printk("  buf     : 0x%08lx\n", in->buf);
-  printk("  hw_len  : 0x%04x (%d)\n", in->hw_len, in->hw_len);
-  printk("  status  : 0x%04x\n\n", in->status);
-}
-
-static void __dump_sb_desc(volatile struct USB_SB_Desc *sb)
-{
-  char tt = (sb->command & 0x30) >> 4;
-  char *tt_string;
-
-  switch (tt) {
-  case 0:
-    tt_string = "zout";
-    break;
-  case 1:
-    tt_string = "in";
-    break;
-  case 2:
-    tt_string = "out";
-    break;
-  case 3:
-    tt_string = "setup";
-    break;
-  default:
-    tt_string = "unknown (weird)";
-  }
-
-  printk(" USB_SB_Desc at 0x%08lx ", (unsigned long)sb);
-  printk(" command:0x%04x (", sb->command);
-  printk("rem:%d ", (sb->command & 0x3f00) >> 8);
-  printk("full:%d ", (sb->command & 0x40) >> 6);
-  printk("tt:%d(%s) ", tt, tt_string);
-  printk("intr:%d ", (sb->command & 0x8) >> 3);
-  printk("eot:%d ", (sb->command & 0x2) >> 1);
-  printk("eol:%d)", sb->command & 0x1);
-  printk(" sw_len:0x%04x(%d)", sb->sw_len, sb->sw_len);
-  printk(" next:0x%08lx", sb->next);
-  printk(" buf:0x%08lx\n", sb->buf);
-}
-
-
-static void __dump_ep_desc(volatile struct USB_EP_Desc *ep)
-{
-  printk("USB_EP_Desc at 0x%08lx ", (unsigned long)ep);
-  printk(" command:0x%04x (", ep->command);
-  printk("ep_id:%d ", (ep->command & 0x1f00) >> 8);
-  printk("enable:%d ", (ep->command & 0x10) >> 4);
-  printk("intr:%d ", (ep->command & 0x8) >> 3);
-  printk("eof:%d ", (ep->command & 0x2) >> 1);
-  printk("eol:%d)", ep->command & 0x1);
-  printk(" hw_len:0x%04x(%d)", ep->hw_len, ep->hw_len);
-  printk(" next:0x%08lx", ep->next);
-  printk(" sub:0x%08lx\n", ep->sub);
-}
-
-static inline void __dump_ep_list(int pipe_type)
-{
-  volatile struct USB_EP_Desc *ep;
-  volatile struct USB_EP_Desc *first_ep;
-  volatile struct USB_SB_Desc *sb;
-
-  switch (pipe_type)
-    {
-    case PIPE_BULK:
-      first_ep = &TxBulkEPList[0];
-      break;
-    case PIPE_CONTROL:
-      first_ep = &TxCtrlEPList[0];
-      break;
-    case PIPE_INTERRUPT:
-      first_ep = &TxIntrEPList[0];
-      break;
-    case PIPE_ISOCHRONOUS:
-      first_ep = &TxIsocEPList[0];
-      break;
-    default:
-      return;
-    }
-  ep = first_ep;
-
-  printk("\n\nDumping EP list...\n\n");
-
-  do {
-    __dump_ep_desc(ep);
-    /* Cannot phys_to_virt on 0 as it turns into 80000000, which is != 0. */
-    sb = ep->sub ? phys_to_virt(ep->sub) : 0;
-    while (sb) {
-      __dump_sb_desc(sb);
-      sb = sb->next ? phys_to_virt(sb->next) : 0;
-    }
-    ep = (volatile struct USB_EP_Desc *)(phys_to_virt(ep->next));
-
-  } while (ep != first_ep);
-}
-
-static inline void __dump_ept_data(int epid)
-{
-  unsigned long flags;
-  __u32 r_usb_ept_data;
-
-  if (epid < 0 || epid > 31) {
-    printk("Cannot dump ept data for invalid epid %d\n", epid);
-    return;
-  }
-
-  local_irq_save(flags);
-  *R_USB_EPT_INDEX = IO_FIELD(R_USB_EPT_INDEX, value, epid);
-  nop();
-  r_usb_ept_data = *R_USB_EPT_DATA;
-  local_irq_restore(flags);
-
-  printk(" R_USB_EPT_DATA = 0x%x for epid %d :\n", r_usb_ept_data, epid);
-  if (r_usb_ept_data == 0) {
-    /* No need for more detailed printing. */
-    return;
-  }
-  printk("  valid           : %d\n", (r_usb_ept_data & 0x80000000) >> 31);
-  printk("  hold            : %d\n", (r_usb_ept_data & 0x40000000) >> 30);
-  printk("  error_count_in  : %d\n", (r_usb_ept_data & 0x30000000) >> 28);
-  printk("  t_in            : %d\n", (r_usb_ept_data & 0x08000000) >> 27);
-  printk("  low_speed       : %d\n", (r_usb_ept_data & 0x04000000) >> 26);
-  printk("  port            : %d\n", (r_usb_ept_data & 0x03000000) >> 24);
-  printk("  error_code      : %d\n", (r_usb_ept_data & 0x00c00000) >> 22);
-  printk("  t_out           : %d\n", (r_usb_ept_data & 0x00200000) >> 21);
-  printk("  error_count_out : %d\n", (r_usb_ept_data & 0x00180000) >> 19);
-  printk("  max_len         : %d\n", (r_usb_ept_data & 0x0003f800) >> 11);
-  printk("  ep              : %d\n", (r_usb_ept_data & 0x00000780) >> 7);
-  printk("  dev             : %d\n", (r_usb_ept_data & 0x0000003f));
-}
-
-static inline void __dump_ept_data_iso(int epid)
-{
-  unsigned long flags;
-  __u32 ept_data;
-
-  if (epid < 0 || epid > 31) {
-    printk("Cannot dump ept data for invalid epid %d\n", epid);
-    return;
-  }
-
-  local_irq_save(flags);
-  *R_USB_EPT_INDEX = IO_FIELD(R_USB_EPT_INDEX, value, epid);
-  nop();
-  ept_data = *R_USB_EPT_DATA_ISO;
-  local_irq_restore(flags);
-
-  printk(" R_USB_EPT_DATA = 0x%x for epid %d :\n", ept_data, epid);
-  if (ept_data == 0) {
-    /* No need for more detailed printing. */
-    return;
-  }
-  printk("  valid           : %d\n", IO_EXTRACT(R_USB_EPT_DATA_ISO, valid,
-						ept_data));
-  printk("  port            : %d\n", IO_EXTRACT(R_USB_EPT_DATA_ISO, port,
-						ept_data));
-  printk("  error_code      : %d\n", IO_EXTRACT(R_USB_EPT_DATA_ISO, error_code,
-						ept_data));
-  printk("  max_len         : %d\n", IO_EXTRACT(R_USB_EPT_DATA_ISO, max_len,
-						ept_data));
-  printk("  ep              : %d\n", IO_EXTRACT(R_USB_EPT_DATA_ISO, ep,
-						ept_data));
-  printk("  dev             : %d\n", IO_EXTRACT(R_USB_EPT_DATA_ISO, dev,
-						ept_data));
-}
-
-static inline void __dump_ept_data_list(void)
-{
-  int i;
-
-  printk("Dumping the whole R_USB_EPT_DATA list\n");
-
-  for (i = 0; i < 32; i++) {
-    __dump_ept_data(i);
-  }
-}
-
-static void debug_epid(int epid) {
-  int i;
-  
-  if(epid_isoc(epid)) {
-    __dump_ept_data_iso(epid);
-  } else {
-    __dump_ept_data(epid);
-  }
-
-  printk("Bulk:\n");
-  for(i = 0; i < 32; i++) {
-    if(IO_EXTRACT(USB_EP_command, epid, TxBulkEPList[i].command) ==
-       epid) {
-      printk("%d: ", i); __dump_ep_desc(&(TxBulkEPList[i]));
-    }
-  }
-
-  printk("Ctrl:\n");
-  for(i = 0; i < 32; i++) {
-    if(IO_EXTRACT(USB_EP_command, epid, TxCtrlEPList[i].command) ==
-       epid) {
-      printk("%d: ", i); __dump_ep_desc(&(TxCtrlEPList[i]));
-    }
-  }
-
-  printk("Intr:\n");
-  for(i = 0; i < MAX_INTR_INTERVAL; i++) {
-    if(IO_EXTRACT(USB_EP_command, epid, TxIntrEPList[i].command) ==
-       epid) {
-      printk("%d: ", i); __dump_ep_desc(&(TxIntrEPList[i]));
-    }
-  }
-  
-  printk("Isoc:\n");
-  for(i = 0; i < 32; i++) {
-    if(IO_EXTRACT(USB_EP_command, epid, TxIsocEPList[i].command) ==
-       epid) {
-      printk("%d: ", i); __dump_ep_desc(&(TxIsocEPList[i]));
-    }
-  }
-
-  __dump_ept_data_list();
-  __dump_ep_list(PIPE_INTERRUPT);
-  printk("\n\n");
-}
-
-
-
-char* hcd_status_to_str(__u8 bUsbStatus) {
-  static char hcd_status_str[128];
-  hcd_status_str[0] = '\0';
-  if(bUsbStatus & IO_STATE(R_USB_STATUS, ourun, yes)) {
-    strcat(hcd_status_str, "ourun ");
-  }
-  if(bUsbStatus & IO_STATE(R_USB_STATUS, perror, yes)) {
-    strcat(hcd_status_str, "perror ");
-  }
-  if(bUsbStatus & IO_STATE(R_USB_STATUS, device_mode, yes)) {
-    strcat(hcd_status_str, "device_mode ");
-  }
-  if(bUsbStatus & IO_STATE(R_USB_STATUS, host_mode, yes)) {
-    strcat(hcd_status_str, "host_mode ");
-  }
-  if(bUsbStatus & IO_STATE(R_USB_STATUS, started, yes)) {
-    strcat(hcd_status_str, "started ");
-  }
-  if(bUsbStatus & IO_STATE(R_USB_STATUS, running, yes)) {
-    strcat(hcd_status_str, "running ");
-  }
-  return hcd_status_str;
-}
-
-
-char* sblist_to_str(struct USB_SB_Desc* sb_desc) {
-  static char sblist_to_str_buff[128];
-  char tmp[32], tmp2[32];
-  sblist_to_str_buff[0] = '\0';
-  while(sb_desc != NULL) {
-    switch(IO_EXTRACT(USB_SB_command, tt, sb_desc->command)) {
-    case 0: sprintf(tmp, "zout");  break;
-    case 1: sprintf(tmp, "in");    break;
-    case 2: sprintf(tmp, "out");   break;
-    case 3: sprintf(tmp, "setup"); break;
-    }
-    sprintf(tmp2, "(%s %d)", tmp, sb_desc->sw_len);
-    strcat(sblist_to_str_buff, tmp2);
-    if(sb_desc->next != 0) {
-      sb_desc = phys_to_virt(sb_desc->next);
-    } else {
-      sb_desc = NULL;
-    }
-  }
-  return sblist_to_str_buff;
-}
-
-char* port_status_to_str(__u16 wPortStatus) {
-  static char port_status_str[128];
-  port_status_str[0] = '\0';
-  if(wPortStatus & IO_STATE(R_USB_RH_PORT_STATUS_1, connected, yes)) {
-    strcat(port_status_str, "connected ");
-  }
-  if(wPortStatus & IO_STATE(R_USB_RH_PORT_STATUS_1, enabled, yes)) {
-    strcat(port_status_str, "enabled ");
-  }
-  if(wPortStatus & IO_STATE(R_USB_RH_PORT_STATUS_1, suspended, yes)) {
-    strcat(port_status_str, "suspended ");
-  }
-  if(wPortStatus & IO_STATE(R_USB_RH_PORT_STATUS_1, reset, yes)) {
-    strcat(port_status_str, "reset ");
-  }
-  if(wPortStatus & IO_STATE(R_USB_RH_PORT_STATUS_1, speed, full)) {
-    strcat(port_status_str, "full-speed ");
-  } else {
-    strcat(port_status_str, "low-speed ");
-  }
-  return port_status_str;
-}
-
-
-char* endpoint_to_str(struct usb_endpoint_descriptor *ed) {
-  static char endpoint_to_str_buff[128];
-  char tmp[32];
-  int epnum = ed->bEndpointAddress & 0x0F;
-  int dir = ed->bEndpointAddress & 0x80;
-  int type = ed->bmAttributes & 0x03;
-  endpoint_to_str_buff[0] = '\0';
-  sprintf(endpoint_to_str_buff, "ep:%d ", epnum);
-  switch(type) {
-  case 0:
-    sprintf(tmp, " ctrl");
-    break;
-  case 1:
-    sprintf(tmp, " isoc");
-    break;
-  case 2:
-    sprintf(tmp, " bulk");
-    break;
-  case 3:
-    sprintf(tmp, " intr");
-    break;
-  }
-  strcat(endpoint_to_str_buff, tmp);
-  if(dir) {
-    sprintf(tmp, " in");
-  } else {
-    sprintf(tmp, " out");
-  }
-  strcat(endpoint_to_str_buff, tmp);
-
-  return endpoint_to_str_buff;
-}
-
-/* Debug helper functions for Transfer Controller */
-char* pipe_to_str(unsigned int pipe) {
-  static char pipe_to_str_buff[128];
-  char tmp[64];
-  sprintf(pipe_to_str_buff, "dir:%s", str_dir(pipe));
-  sprintf(tmp, " type:%s", str_type(pipe));
-  strcat(pipe_to_str_buff, tmp);
-
-  sprintf(tmp, " dev:%d", usb_pipedevice(pipe));
-  strcat(pipe_to_str_buff, tmp);
-  sprintf(tmp, " ep:%d", usb_pipeendpoint(pipe));
-  strcat(pipe_to_str_buff, tmp);
-  return pipe_to_str_buff;
-}
-
-
-#define USB_DEBUG_DESC 1
-
-#ifdef USB_DEBUG_DESC
-#define dump_in_desc(x) __dump_in_desc(x)
-#define dump_sb_desc(...) __dump_sb_desc(...)
-#define dump_ep_desc(x) __dump_ep_desc(x)
-#define dump_ept_data(x) __dump_ept_data(x)
-#else
-#define dump_in_desc(...) do {} while (0)
-#define dump_sb_desc(...) do {} while (0)
-#define dump_ep_desc(...) do {} while (0)
-#endif
-
-
-/* Uncomment this to enable massive function call trace
-   #define USB_DEBUG_TRACE */
-
-#ifdef USB_DEBUG_TRACE
-#define DBFENTER (printk(": Entering: %s\n", __FUNCTION__))
-#define DBFEXIT  (printk(": Exiting:  %s\n", __FUNCTION__))
-#else
-#define DBFENTER do {} while (0)
-#define DBFEXIT  do {} while (0)
-#endif
-
-#define CHECK_ALIGN(x) if (((__u32)(x)) & 0x00000003) \
-{panic("Alignment check (DWORD) failed at %s:%s:%d\n", __FILE__, __FUNCTION__, __LINE__);}
-
-/* Most helpful debugging aid */
-#define ASSERT(expr) ((void) ((expr) ? 0 : (err("assert failed at: %s %d",__FUNCTION__, __LINE__))))
-
-
-/***************************************************************************/
-/***************************************************************************/
-/* Forward declarations                                                    */
-/***************************************************************************/
-/***************************************************************************/
-void crisv10_hcd_epid_attn_irq(struct crisv10_irq_reg *reg);
-void crisv10_hcd_port_status_irq(struct crisv10_irq_reg *reg);
-void crisv10_hcd_ctl_status_irq(struct crisv10_irq_reg *reg);
-void crisv10_hcd_isoc_eof_irq(struct crisv10_irq_reg *reg);
-
-void rh_port_status_change(__u16[]);
-int  rh_clear_port_feature(__u8, __u16);
-int  rh_set_port_feature(__u8, __u16);
-static void rh_disable_port(unsigned int port);
-
-static void check_finished_bulk_tx_epids(struct usb_hcd *hcd,
-					 int timer);
-
-static int  tc_setup_epid(struct usb_host_endpoint *ep, struct urb *urb,
-			 int mem_flags);
-static void tc_free_epid(struct usb_host_endpoint *ep);
-static int  tc_allocate_epid(void);
-static void tc_finish_urb(struct usb_hcd *hcd, struct urb *urb, int status);
-static void tc_finish_urb_later(struct usb_hcd *hcd, struct urb *urb,
-				int status);
-
-static int  urb_priv_create(struct usb_hcd *hcd, struct urb *urb, int epid,
-			   int mem_flags);
-static void urb_priv_free(struct usb_hcd *hcd, struct urb *urb);
-
-static int crisv10_usb_check_bandwidth(struct usb_device *dev,struct urb *urb);
-static void crisv10_usb_claim_bandwidth(
-	struct usb_device *dev, struct urb *urb, int bustime, int isoc);
-static void crisv10_usb_release_bandwidth(
-	struct usb_hcd *hcd, int isoc, int bandwidth);
-
-static inline struct urb *urb_list_first(int epid);
-static inline void        urb_list_add(struct urb *urb, int epid,
-				      int mem_flags);
-static inline urb_entry_t *urb_list_entry(struct urb *urb, int epid);
-static inline void        urb_list_del(struct urb *urb, int epid);
-static inline void        urb_list_move_last(struct urb *urb, int epid);
-static inline struct urb *urb_list_next(struct urb *urb, int epid);
-
-int create_sb_for_urb(struct urb *urb, int mem_flags);
-int init_intr_urb(struct urb *urb, int mem_flags);
-
-static inline void  etrax_epid_set(__u8 index, __u32 data);
-static inline void  etrax_epid_clear_error(__u8 index);
-static inline void  etrax_epid_set_toggle(__u8 index, __u8 dirout,
-					      __u8 toggle);
-static inline __u8  etrax_epid_get_toggle(__u8 index, __u8 dirout);
-static inline __u32 etrax_epid_get(__u8 index);
-
-/* We're accessing the same register position in Etrax so
-   when we do full access the internal difference doesn't matter */
-#define etrax_epid_iso_set(index, data) etrax_epid_set(index, data)
-#define etrax_epid_iso_get(index) etrax_epid_get(index)
-
-
-static void        tc_dma_process_isoc_urb(struct urb *urb);
-static void        tc_dma_process_queue(int epid);
-static void        tc_dma_unlink_intr_urb(struct urb *urb);
-static irqreturn_t tc_dma_tx_interrupt(int irq, void *vhc);
-static irqreturn_t tc_dma_rx_interrupt(int irq, void *vhc);
-
-static void tc_bulk_start_timer_func(unsigned long dummy);
-static void tc_bulk_eot_timer_func(unsigned long dummy);
-
-
-/*************************************************************/
-/*************************************************************/
-/* Host Controler Driver block                               */
-/*************************************************************/
-/*************************************************************/
-
-/* HCD operations */
-static irqreturn_t crisv10_hcd_top_irq(int irq, void*);
-static int crisv10_hcd_reset(struct usb_hcd *);
-static int crisv10_hcd_start(struct usb_hcd *);
-static void crisv10_hcd_stop(struct usb_hcd *);
-#ifdef CONFIG_PM
-static int crisv10_hcd_suspend(struct device *, u32, u32);
-static int crisv10_hcd_resume(struct device *, u32);
-#endif /* CONFIG_PM */
-static int crisv10_hcd_get_frame(struct usb_hcd *);
-
-static int  tc_urb_enqueue(struct usb_hcd *, struct urb *, gfp_t mem_flags);
-static int  tc_urb_dequeue(struct usb_hcd *, struct urb *, int);
-static void tc_endpoint_disable(struct usb_hcd *, struct usb_host_endpoint *ep);
-
-static int rh_status_data_request(struct usb_hcd *, char *);
-static int rh_control_request(struct usb_hcd *, u16, u16, u16, char*, u16);
-
-#ifdef CONFIG_PM
-static int crisv10_hcd_hub_suspend(struct usb_hcd *);
-static int crisv10_hcd_hub_resume(struct usb_hcd *);
-#endif /* CONFIG_PM */
-#ifdef CONFIG_USB_OTG
-static int crisv10_hcd_start_port_reset(struct usb_hcd *, unsigned);
-#endif /* CONFIG_USB_OTG */
-
-/* host controller driver interface */
-static const struct hc_driver crisv10_hc_driver = 
-  {
-    .description =	hc_name,
-    .product_desc =	product_desc,
-    .hcd_priv_size =	sizeof(struct crisv10_hcd),
-
-    /* Attaching IRQ handler manualy in probe() */
-    /* .irq =		crisv10_hcd_irq, */
-
-    .flags =		HCD_USB11,
-
-    /* called to init HCD and root hub */
-    .reset =		crisv10_hcd_reset,
-    .start =		crisv10_hcd_start,	
-
-    /* cleanly make HCD stop writing memory and doing I/O */
-    .stop =		crisv10_hcd_stop,
-
-    /* return current frame number */
-    .get_frame_number =	crisv10_hcd_get_frame,
-
-
-    /* Manage i/o requests via the Transfer Controller */
-    .urb_enqueue =	tc_urb_enqueue,
-    .urb_dequeue =	tc_urb_dequeue,
-
-    /* hw synch, freeing endpoint resources that urb_dequeue can't */
-    .endpoint_disable = tc_endpoint_disable,
-
-
-    /* Root Hub support */
-    .hub_status_data =	rh_status_data_request,
-    .hub_control =	rh_control_request,
-#ifdef CONFIG_PM
-    .hub_suspend =	rh_suspend_request,
-    .hub_resume =	rh_resume_request,
-#endif /* CONFIG_PM */
-#ifdef	CONFIG_USB_OTG
-    .start_port_reset =	crisv10_hcd_start_port_reset,
-#endif /* CONFIG_USB_OTG */
-  };
-
-
-/*
- * conversion between pointers to a hcd and the corresponding
- * crisv10_hcd 
- */
-
-static inline struct crisv10_hcd *hcd_to_crisv10_hcd(struct usb_hcd *hcd)
-{
-	return (struct crisv10_hcd *) hcd->hcd_priv;
-}
-
-static inline struct usb_hcd *crisv10_hcd_to_hcd(struct crisv10_hcd *hcd)
-{
-	return container_of((void *) hcd, struct usb_hcd, hcd_priv);
-}
-
-/* check if specified port is in use */
-static inline int port_in_use(unsigned int port)
-{
-	return ports & (1 << port);
-}
-
-/* number of ports in use */
-static inline unsigned int num_ports(void)
-{
-	unsigned int i, num = 0;
-	for (i = 0; i < USB_ROOT_HUB_PORTS; i++)
-		if (port_in_use(i))
-			num++;
-	return num;
-}
-
-/* map hub port number to the port number used internally by the HC */
-static inline unsigned int map_port(unsigned int port)
-{
-  unsigned int i, num = 0;
-  for (i = 0; i < USB_ROOT_HUB_PORTS; i++)
-    if (port_in_use(i))
-      if (++num == port)
-	return i;
-  return -1;
-}
-
-/* size of descriptors in slab cache */
-#ifndef MAX
-#define MAX(x, y)		((x) > (y) ? (x) : (y))
-#endif
-
-
-/******************************************************************/
-/* Hardware Interrupt functions                                   */
-/******************************************************************/
-
-/* Fast interrupt handler for HC */
-static irqreturn_t crisv10_hcd_top_irq(int irq, void *vcd)
-{
-  struct usb_hcd *hcd = vcd;
-  struct crisv10_irq_reg reg;
-  __u32 irq_mask;
-  unsigned long flags;
-
-  DBFENTER;
-
-  ASSERT(hcd != NULL);
-  reg.hcd = hcd;
-
-  /* Turn of other interrupts while handling these sensitive cases */
-  local_irq_save(flags);
-  
-  /* Read out which interrupts that are flaged */
-  irq_mask = *R_USB_IRQ_MASK_READ;
-  reg.r_usb_irq_mask_read = irq_mask;
-
-  /* Reading R_USB_STATUS clears the ctl_status interrupt. Note that
-     R_USB_STATUS must be read before R_USB_EPID_ATTN since reading the latter
-     clears the ourun and perror fields of R_USB_STATUS. */
-  reg.r_usb_status = *R_USB_STATUS;
-  
-  /* Reading R_USB_EPID_ATTN clears the iso_eof, bulk_eot and epid_attn
-     interrupts. */
-  reg.r_usb_epid_attn = *R_USB_EPID_ATTN;
-  
-  /* Reading R_USB_RH_PORT_STATUS_1 and R_USB_RH_PORT_STATUS_2 clears the
-     port_status interrupt. */
-  reg.r_usb_rh_port_status_1 = *R_USB_RH_PORT_STATUS_1;
-  reg.r_usb_rh_port_status_2 = *R_USB_RH_PORT_STATUS_2;
-  
-  /* Reading R_USB_FM_NUMBER clears the sof interrupt. */
-  /* Note: the lower 11 bits contain the actual frame number, sent with each
-     sof. */
-  reg.r_usb_fm_number = *R_USB_FM_NUMBER;
-
-  /* Interrupts are handled in order of priority. */
-  if (irq_mask & IO_MASK(R_USB_IRQ_MASK_READ, port_status)) {
-    crisv10_hcd_port_status_irq(&reg);
-  }
-  if (irq_mask & IO_MASK(R_USB_IRQ_MASK_READ, epid_attn)) {
-    crisv10_hcd_epid_attn_irq(&reg);
-  }
-  if (irq_mask & IO_MASK(R_USB_IRQ_MASK_READ, ctl_status)) {
-    crisv10_hcd_ctl_status_irq(&reg);
-  }
-  if (irq_mask & IO_MASK(R_USB_IRQ_MASK_READ, iso_eof)) {
-    crisv10_hcd_isoc_eof_irq(&reg);
-  }
-  if (irq_mask & IO_MASK(R_USB_IRQ_MASK_READ, bulk_eot)) {
-    /* Update/restart the bulk start timer since obviously the channel is
-       running. */
-    mod_timer(&bulk_start_timer, jiffies + BULK_START_TIMER_INTERVAL);
-    /* Update/restart the bulk eot timer since we just received an bulk eot
-       interrupt. */
-    mod_timer(&bulk_eot_timer, jiffies + BULK_EOT_TIMER_INTERVAL);
-
-    /* Check for finished bulk transfers on epids */
-    check_finished_bulk_tx_epids(hcd, 0);
-  }
-  local_irq_restore(flags);
-
-  DBFEXIT;
-  return IRQ_HANDLED;
-}
-
-
-void crisv10_hcd_epid_attn_irq(struct crisv10_irq_reg *reg) {
-  struct usb_hcd *hcd = reg->hcd;
-  struct crisv10_urb_priv *urb_priv;
-  int epid;
-  DBFENTER;
-
-  for (epid = 0; epid < NBR_OF_EPIDS; epid++) {
-    if (test_bit(epid, (void *)&reg->r_usb_epid_attn)) {
-      struct urb *urb;
-      __u32 ept_data;
-      int error_code;
-
-      if (epid == DUMMY_EPID || epid == INVALID_EPID) {
-	/* We definitely don't care about these ones. Besides, they are
-	   always disabled, so any possible disabling caused by the
-	   epid attention interrupt is irrelevant. */
-	continue;
-      }
-
-      if(!epid_inuse(epid)) {
-	irq_err("Epid attention on epid:%d that isn't in use\n", epid);
-	printk("R_USB_STATUS: 0x%x\n", reg->r_usb_status);
-	debug_epid(epid);
-	continue;
-      }
-
-      /* Note that although there are separate R_USB_EPT_DATA and
-	 R_USB_EPT_DATA_ISO registers, they are located at the same address and
-	 are of the same size. In other words, this read should be ok for isoc
-	 also. */
-      ept_data = etrax_epid_get(epid);
-      error_code = IO_EXTRACT(R_USB_EPT_DATA, error_code, ept_data);
-
-      /* Get the active URB for this epid. We blatantly assume
-	 that only this URB could have caused the epid attention. */
-      urb = activeUrbList[epid];
-      if (urb == NULL) {
-	irq_err("Attention on epid:%d error:%d with no active URB.\n",
-		epid, error_code);
-	printk("R_USB_STATUS: 0x%x\n", reg->r_usb_status);
-	debug_epid(epid);
-	continue;
-      }
-
-      urb_priv = (struct crisv10_urb_priv *)urb->hcpriv;
-      ASSERT(urb_priv);
-
-      /* Using IO_STATE_VALUE on R_USB_EPT_DATA should be ok for isoc also. */
-      if (error_code == IO_STATE_VALUE(R_USB_EPT_DATA, error_code, no_error)) {
-
-	/* Isoc traffic doesn't have error_count_in/error_count_out. */
-	if ((usb_pipetype(urb->pipe) != PIPE_ISOCHRONOUS) &&
-	    (IO_EXTRACT(R_USB_EPT_DATA, error_count_in, ept_data) == 3 ||
-	     IO_EXTRACT(R_USB_EPT_DATA, error_count_out, ept_data) == 3)) {
-	  /* Check if URB allready is marked for late-finish, we can get
-	     several 3rd error for Intr traffic when a device is unplugged */
-	  if(urb_priv->later_data == NULL) {
-	    /* 3rd error. */
-	    irq_warn("3rd error for epid:%d (%s %s) URB:0x%x[%d]\n", epid,
-		     str_dir(urb->pipe), str_type(urb->pipe),
-		     (unsigned int)urb, urb_priv->urb_num);
-	  
-	    tc_finish_urb_later(hcd, urb, -EPROTO);
-	  }
-
-	} else if (reg->r_usb_status & IO_MASK(R_USB_STATUS, perror)) {
-	  irq_warn("Perror for epid:%d\n", epid);
-	  printk("FM_NUMBER: %d\n", reg->r_usb_fm_number & 0x7ff);
-	  printk("R_USB_STATUS: 0x%x\n", reg->r_usb_status);
-	  __dump_urb(urb);
-	  debug_epid(epid);
-
-	  if (!(ept_data & IO_MASK(R_USB_EPT_DATA, valid))) {
-	    /* invalid ep_id */
-	    panic("Perror because of invalid epid."
-		  " Deconfigured too early?");
-	  } else {
-	    /* past eof1, near eof, zout transfer, setup transfer */
-	    /* Dump the urb and the relevant EP descriptor. */
-	    panic("Something wrong with DMA descriptor contents."
-		  " Too much traffic inserted?");
-	  }
-	} else if (reg->r_usb_status & IO_MASK(R_USB_STATUS, ourun)) {
-	  /* buffer ourun */
-	  printk("FM_NUMBER: %d\n", reg->r_usb_fm_number & 0x7ff);
-	  printk("R_USB_STATUS: 0x%x\n", reg->r_usb_status);
-	  __dump_urb(urb);
-	  debug_epid(epid);
-
-	  panic("Buffer overrun/underrun for epid:%d. DMA too busy?", epid);
-	} else {
-	  irq_warn("Attention on epid:%d (%s %s) with no error code\n", epid,
-		   str_dir(urb->pipe), str_type(urb->pipe));
-	  printk("R_USB_STATUS: 0x%x\n", reg->r_usb_status);
-	  __dump_urb(urb);
-	  debug_epid(epid);
-	}
-
-      } else if (error_code == IO_STATE_VALUE(R_USB_EPT_DATA, error_code,
-					      stall)) {
-	/* Not really a protocol error, just says that the endpoint gave
-	   a stall response. Note that error_code cannot be stall for isoc. */
-	if (usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS) {
-	  panic("Isoc traffic cannot stall");
-	}
-
-	tc_dbg("Stall for epid:%d (%s %s) URB:0x%x\n", epid,
-	       str_dir(urb->pipe), str_type(urb->pipe), (unsigned int)urb);
-	tc_finish_urb(hcd, urb, -EPIPE);
-
-      } else if (error_code == IO_STATE_VALUE(R_USB_EPT_DATA, error_code,
-					      bus_error)) {
-	/* Two devices responded to a transaction request. Must be resolved
-	   by software. FIXME: Reset ports? */
-	panic("Bus error for epid %d."
-	      " Two devices responded to transaction request\n",
-	      epid);
-
-      } else if (error_code == IO_STATE_VALUE(R_USB_EPT_DATA, error_code,
-					      buffer_error)) {
-	/* DMA overrun or underrun. */
-	irq_warn("Buffer overrun/underrun for epid:%d (%s %s)\n", epid,
-		 str_dir(urb->pipe), str_type(urb->pipe));
-
-	/* It seems that error_code = buffer_error in
-	   R_USB_EPT_DATA/R_USB_EPT_DATA_ISO and ourun = yes in R_USB_STATUS
-	   are the same error. */
-	tc_finish_urb(hcd, urb, -EPROTO);
-      } else {
-	  irq_warn("Unknown attention on epid:%d (%s %s)\n", epid,
-		   str_dir(urb->pipe), str_type(urb->pipe));
-	  dump_ept_data(epid);
-      }
-    }
-  }
-  DBFEXIT;
-}
-
-void crisv10_hcd_port_status_irq(struct crisv10_irq_reg *reg)
-{
-  __u16 port_reg[USB_ROOT_HUB_PORTS];
-  DBFENTER;
-  port_reg[0] = reg->r_usb_rh_port_status_1;
-  port_reg[1] = reg->r_usb_rh_port_status_2;
-  rh_port_status_change(port_reg);
-  DBFEXIT;
-}
-
-void crisv10_hcd_isoc_eof_irq(struct crisv10_irq_reg *reg)
-{
-  int epid;
-  struct urb *urb;
-  struct crisv10_urb_priv *urb_priv;
-
-  DBFENTER;
-
-  for (epid = 0; epid < NBR_OF_EPIDS - 1; epid++) {
-
-    /* Only check epids that are in use, is valid and has SB list */
-    if (!epid_inuse(epid) || epid == INVALID_EPID ||
-	TxIsocEPList[epid].sub == 0 || epid == DUMMY_EPID) {
-      /* Nothing here to see. */
-      continue;
-    }
-    ASSERT(epid_isoc(epid));
-
-    /* Get the active URB for this epid (if any). */
-    urb = activeUrbList[epid];
-    if (urb == 0) {
-      isoc_warn("Ignoring NULL urb for epid:%d\n", epid);
-      continue;
-    }
-    if(!epid_out_traffic(epid)) {
-      /* Sanity check. */
-      ASSERT(usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS);
-
-      urb_priv = (struct crisv10_urb_priv *)urb->hcpriv;
-      ASSERT(urb_priv);
-
-      if (urb_priv->urb_state == NOT_STARTED) {
-	/* If ASAP is not set and urb->start_frame is the current frame,
-	   start the transfer. */
-	if (!(urb->transfer_flags & URB_ISO_ASAP) &&
-	    (urb->start_frame == (*R_USB_FM_NUMBER & 0x7ff))) {
-	  /* EP should not be enabled if we're waiting for start_frame */
-	  ASSERT((TxIsocEPList[epid].command &
-		  IO_STATE(USB_EP_command, enable, yes)) == 0);
-
-	  isoc_warn("Enabling isoc IN EP descr for epid %d\n", epid);
-	  TxIsocEPList[epid].command |= IO_STATE(USB_EP_command, enable, yes);
-
-	  /* This urb is now active. */
-	  urb_priv->urb_state = STARTED;
-	  continue;
-	}
-      }
-    }
-  }
-
-  DBFEXIT;
-}
-
-void crisv10_hcd_ctl_status_irq(struct crisv10_irq_reg *reg)
-{
-  struct crisv10_hcd* crisv10_hcd = hcd_to_crisv10_hcd(reg->hcd);
-
-  DBFENTER;
-  ASSERT(crisv10_hcd);
-
-/*  irq_dbg("ctr_status_irq, controller status: %s\n",
-	  hcd_status_to_str(reg->r_usb_status));*/
-  
-  /* FIXME: What should we do if we get ourun or perror? Dump the EP and SB
-     list for the corresponding epid? */
-  if (reg->r_usb_status & IO_MASK(R_USB_STATUS, ourun)) {
-    panic("USB controller got ourun.");
-  }
-  if (reg->r_usb_status & IO_MASK(R_USB_STATUS, perror)) {
-    
-    /* Before, etrax_usb_do_intr_recover was called on this epid if it was
-       an interrupt pipe. I don't see how re-enabling all EP descriptors
-       will help if there was a programming error. */
-    panic("USB controller got perror.");
-  }
-
-  /* Keep track of USB Controller, if it's running or not */
-  if(reg->r_usb_status & IO_STATE(R_USB_STATUS, running, yes)) {
-    crisv10_hcd->running = 1;
-  } else {
-    crisv10_hcd->running = 0;
-  }
-  
-  if (reg->r_usb_status & IO_MASK(R_USB_STATUS, device_mode)) {
-    /* We should never operate in device mode. */
-    panic("USB controller in device mode.");
-  }
-
-  /* Set the flag to avoid getting "Unlink after no-IRQ? Controller is probably
-     using the wrong IRQ" from hcd_unlink_urb() in drivers/usb/core/hcd.c */
-  set_bit(HCD_FLAG_SAW_IRQ, &reg->hcd->flags);
-  
-  DBFEXIT;
-}
-
-
-/******************************************************************/
-/* Host Controller interface functions                            */
-/******************************************************************/
-
-static inline void crisv10_ready_wait(void) {
-  volatile int timeout = 10000;
-  /* Check the busy bit of USB controller in Etrax */
-  while((*R_USB_COMMAND & IO_MASK(R_USB_COMMAND, busy)) &&
-	(timeout-- > 0));
-}
-
-/* reset host controller */
-static int crisv10_hcd_reset(struct usb_hcd *hcd)
-{
-  DBFENTER;
-  hcd_dbg(hcd, "reset\n");
-
-
-  /* Reset the USB interface. */
-  /*
-  *R_USB_COMMAND =
-    IO_STATE(R_USB_COMMAND, port_sel, nop) |
-    IO_STATE(R_USB_COMMAND, port_cmd, reset) |
-    IO_STATE(R_USB_COMMAND, ctrl_cmd, reset);
-  nop();
-  */
-  DBFEXIT;
-  return 0;
-}
-
-/* start host controller */
-static int crisv10_hcd_start(struct usb_hcd *hcd)
-{
-  DBFENTER;
-  hcd_dbg(hcd, "start\n");
-
-  crisv10_ready_wait();
-
-  /* Start processing of USB traffic. */
-  *R_USB_COMMAND =
-    IO_STATE(R_USB_COMMAND, port_sel, nop) |
-    IO_STATE(R_USB_COMMAND, port_cmd, reset) |
-    IO_STATE(R_USB_COMMAND, ctrl_cmd, host_run);
-
-  nop();
-
-  hcd->state = HC_STATE_RUNNING;
-
-  DBFEXIT;
-  return 0;
-}
-
-/* stop host controller */
-static void crisv10_hcd_stop(struct usb_hcd *hcd)
-{
-  DBFENTER;
-  hcd_dbg(hcd, "stop\n");
-  crisv10_hcd_reset(hcd);
-  DBFEXIT;
-}
-
-/* return the current frame number */
-static int crisv10_hcd_get_frame(struct usb_hcd *hcd)
-{
-  DBFENTER;
-  DBFEXIT;
-  return (*R_USB_FM_NUMBER & 0x7ff);
-}
-
-#ifdef	CONFIG_USB_OTG
-
-static int crisv10_hcd_start_port_reset(struct usb_hcd *hcd, unsigned port)
-{
-  return 0; /* no-op for now */
-}
-
-#endif /* CONFIG_USB_OTG */
-
-
-/******************************************************************/
-/* Root Hub functions                                             */
-/******************************************************************/
-
-/* root hub status */
-static const struct usb_hub_status rh_hub_status = 
-  {
-    .wHubStatus =		0,
-    .wHubChange =		0,
-  };
-
-/* root hub descriptor */
-static const u8 rh_hub_descr[] =
-  {
-    0x09,			/* bDescLength	       */
-    0x29,			/* bDescriptorType     */
-    USB_ROOT_HUB_PORTS,         /* bNbrPorts	       */
-    0x00,			/* wHubCharacteristics */
-    0x00,		 
-    0x01,			/* bPwrOn2pwrGood      */
-    0x00,			/* bHubContrCurrent    */
-    0x00,			/* DeviceRemovable     */
-    0xff			/* PortPwrCtrlMask     */
-  };
-
-/* Actual holder of root hub status*/
-struct crisv10_rh rh;
-
-/* Initialize root hub data structures (called from dvdrv_hcd_probe()) */
-int rh_init(void) {
-  int i;
-  /* Reset port status flags */
-  for (i = 0; i < USB_ROOT_HUB_PORTS; i++) {
-    rh.wPortChange[i] = 0;
-    rh.wPortStatusPrev[i] = 0;
-  }
-  return 0;
-}
-
-#define RH_FEAT_MASK ((1<<USB_PORT_FEAT_CONNECTION)|\
-		      (1<<USB_PORT_FEAT_ENABLE)|\
-		      (1<<USB_PORT_FEAT_SUSPEND)|\
-		      (1<<USB_PORT_FEAT_RESET))
-
-/* Handle port status change interrupt (called from bottom part interrupt) */
-void rh_port_status_change(__u16 port_reg[]) {
-  int i;
-  __u16 wChange;
-
-  for(i = 0; i < USB_ROOT_HUB_PORTS; i++) {
-    /* Xor out changes since last read, masked for important flags */
-    wChange = (port_reg[i] & RH_FEAT_MASK) ^ rh.wPortStatusPrev[i];
-    /* Or changes together with (if any) saved changes */
-    rh.wPortChange[i] |= wChange;
-    /* Save new status */
-    rh.wPortStatusPrev[i] = port_reg[i];
-
-    if(wChange) {
-      rh_dbg("Interrupt port_status change port%d: %s  Current-status:%s\n", i+1,
-	     port_status_to_str(wChange),
-	     port_status_to_str(port_reg[i]));
-    }
-  }
-}
-
-/* Construct port status change bitmap for the root hub */
-static int rh_status_data_request(struct usb_hcd *hcd, char *buf)
-{
-  struct crisv10_hcd* crisv10_hcd = hcd_to_crisv10_hcd(hcd);
-  unsigned int i;
-
-  DBFENTER;
-  /*
-   * corresponds to hub status change EP (USB 2.0 spec section 11.13.4)
-   * return bitmap indicating ports with status change
-   */
-  *buf = 0;
-  spin_lock(&crisv10_hcd->lock);
-  for (i = 1; i <= crisv10_hcd->num_ports; i++) {
-    if (rh.wPortChange[map_port(i)]) {
-      *buf |= (1 << i);
-      rh_dbg("rh_status_data_request, change on port %d: %s  Current Status: %s\n", i,
-	     port_status_to_str(rh.wPortChange[map_port(i)]),
-	     port_status_to_str(rh.wPortStatusPrev[map_port(i)]));
-    }
-  }
-  spin_unlock(&crisv10_hcd->lock);
-  DBFEXIT;
-  return *buf == 0 ? 0 : 1;
-}
-
-/* Handle a control request for the root hub (called from hcd_driver) */
-static int rh_control_request(struct usb_hcd *hcd, 
-			      u16 typeReq, 
-			      u16 wValue, 
-			      u16 wIndex,
-			      char *buf, 
-			      u16 wLength) {
-
-  struct crisv10_hcd *crisv10_hcd = hcd_to_crisv10_hcd(hcd);
-  int retval = 0;
-  int len;
-  DBFENTER;
-
-  switch (typeReq) {
-  case GetHubDescriptor:
-    rh_dbg("GetHubDescriptor\n");
-    len = min_t(unsigned int, sizeof rh_hub_descr, wLength);
-    memcpy(buf, rh_hub_descr, len);
-    buf[2] = crisv10_hcd->num_ports;
-    break;
-  case GetHubStatus:
-    rh_dbg("GetHubStatus\n");
-    len = min_t(unsigned int, sizeof rh_hub_status, wLength);
-    memcpy(buf, &rh_hub_status, len);
-    break;
-  case GetPortStatus:
-    if (!wIndex || wIndex > crisv10_hcd->num_ports)
-      goto error;
-    rh_dbg("GetportStatus, port:%d change:%s  status:%s\n", wIndex,
-	   port_status_to_str(rh.wPortChange[map_port(wIndex)]),
-	   port_status_to_str(rh.wPortStatusPrev[map_port(wIndex)]));
-    *(u16 *) buf = cpu_to_le16(rh.wPortStatusPrev[map_port(wIndex)]);
-    *(u16 *) (buf + 2) = cpu_to_le16(rh.wPortChange[map_port(wIndex)]);
-    break;
-  case SetHubFeature:
-    rh_dbg("SetHubFeature\n");
-  case ClearHubFeature:
-    rh_dbg("ClearHubFeature\n");
-    switch (wValue) {
-    case C_HUB_OVER_CURRENT:
-    case C_HUB_LOCAL_POWER:
-      rh_warn("Not implemented hub request:%d \n", typeReq);
-      /* not implemented */
-      break;
-    default:
-      goto error;
-    }
-    break;
-  case SetPortFeature:
-    if (!wIndex || wIndex > crisv10_hcd->num_ports)
-      goto error;
-    if(rh_set_port_feature(map_port(wIndex), wValue))
-      goto error;
-    break;
-  case ClearPortFeature:
-    if (!wIndex || wIndex > crisv10_hcd->num_ports)
-      goto error;
-    if(rh_clear_port_feature(map_port(wIndex), wValue))
-      goto error;
-    break;
-  default:
-    rh_warn("Unknown hub request: %d\n", typeReq);
-  error:
-    retval = -EPIPE;
-  }
-  DBFEXIT;
-  return retval;
-}
-
-int rh_set_port_feature(__u8 bPort, __u16 wFeature) {
-  __u8 bUsbCommand = 0;
-  __u8 reset_cnt;
-  switch(wFeature) {
-  case USB_PORT_FEAT_RESET:
-    rh_dbg("SetPortFeature: reset\n");
-
-    if (rh.wPortStatusPrev[bPort] &
-        IO_STATE(R_USB_RH_PORT_STATUS_1, enabled, yes))
-    {
-      __u8 restart_controller = 0;
-
-      if ( (rh.wPortStatusPrev[0] &
-            IO_STATE(R_USB_RH_PORT_STATUS_1, enabled, yes)) &&
-           (rh.wPortStatusPrev[1] &
-            IO_STATE(R_USB_RH_PORT_STATUS_2, enabled, yes)) )
-      {
-        /* Both ports is enabled. The USB controller will not change state. */
-        restart_controller = 0;
-      }
-      else
-      {
-        /* Only ports is enabled. The USB controller will change state and
-           must be restarted. */
-        restart_controller = 1;
-      }
-      /*
-        In ETRAX 100LX it's not possible to reset an enabled root hub port.
-        The workaround is to disable and enable the port before resetting it.
-        Disabling the port can, if both ports are disabled at once, cause the
-        USB controller to change state to HOST_MODE state. 
-        The USB controller state transition causes a lot of unwanted
-        interrupts that must be avoided.
-        Disabling the USB controller status and port status interrupts before
-        disabling/resetting the port stops these interrupts.
-
-        These actions are performed:
-        1. Disable USB controller status and port status interrupts.
-        2. Disable the port
-        3. Wait for the port to be disabled.
-        4. Enable the port.
-        5. Wait for the port to be enabled.
-        6. Reset the port.
-        7. Wait for for the reset to end.
-        8. Wait for the USB controller entering started state.
-        9. Order the USB controller to running state.
-        10. Wait for the USB controller reaching running state.
-        11. Clear all interrupts generated during the disable/enable/reset
-            procedure.
-        12. Enable the USB controller status and port status interrupts.
-      */
-
-      /* 1. Disable USB controller status and USB port status interrupts. */
-      *R_USB_IRQ_MASK_CLR = IO_STATE(R_USB_IRQ_MASK_CLR, ctl_status, clr);
-      __asm__ __volatile__ ("  nop");
-      *R_USB_IRQ_MASK_CLR = IO_STATE(R_USB_IRQ_MASK_CLR, port_status, clr);
-      __asm__ __volatile__ ("  nop");
-      
-      {
-
-        /* Since an root hub port reset shall be 50 ms and the ETRAX 100LX
-           root hub port reset is 10 ms we must perform 5 port resets to
-           achieve a proper root hub port reset. */
-        for (reset_cnt = 0; reset_cnt < 5; reset_cnt ++)
-        {
-          rh_dbg("Disable Port %d\n", bPort + 1);
-
-          /* 2. Disable the port*/
-          if (bPort == 0)
-          {
-            *R_USB_PORT1_DISABLE = IO_STATE(R_USB_PORT1_DISABLE, disable, yes);
-          }
-          else
-          {
-            *R_USB_PORT2_DISABLE = IO_STATE(R_USB_PORT2_DISABLE, disable, yes);
-          }
-
-          /* 3. Wait for the port to be disabled. */
-          while ( (bPort == 0) ?
-                  *R_USB_RH_PORT_STATUS_1 &
-                    IO_STATE(R_USB_RH_PORT_STATUS_1, enabled, yes) :
-                  *R_USB_RH_PORT_STATUS_2 &
-                    IO_STATE(R_USB_RH_PORT_STATUS_2, enabled, yes) ) {}
-
-          rh_dbg("Port %d is disabled. Enable it!\n", bPort + 1);
-
-          /* 4. Enable the port. */
-          if (bPort == 0)
-          {
-            *R_USB_PORT1_DISABLE = IO_STATE(R_USB_PORT1_DISABLE, disable, no);
-          }
-          else
-          {
-            *R_USB_PORT2_DISABLE = IO_STATE(R_USB_PORT2_DISABLE, disable, no);
-          }
-
-          /* 5. Wait for the port to be enabled again.  */
-          while (!( (bPort == 0) ?
-                    *R_USB_RH_PORT_STATUS_1 &
-                      IO_STATE(R_USB_RH_PORT_STATUS_1, connected, yes) :
-                    *R_USB_RH_PORT_STATUS_2 &
-                      IO_STATE(R_USB_RH_PORT_STATUS_2, connected, yes) ) ) {}
-
-          rh_dbg("Port %d is enabled.\n", bPort + 1);
-
-          /* 6. Reset the port */
-          crisv10_ready_wait();
-          *R_USB_COMMAND =
-            ( (bPort == 0) ?
-              IO_STATE(R_USB_COMMAND, port_sel, port1):
-              IO_STATE(R_USB_COMMAND, port_sel, port2) ) |
-            IO_STATE(R_USB_COMMAND, port_cmd, reset) |
-            IO_STATE(R_USB_COMMAND, busy,     no) |
-            IO_STATE(R_USB_COMMAND, ctrl_cmd, nop);
-          rh_dbg("Port %d is resetting.\n", bPort + 1);
-
-          /* 7. The USB specification says that we should wait for at least
-             10ms for device recover */
-          udelay(10500); /* 10,5ms blocking wait */
-    
-          crisv10_ready_wait();
-        }
-      }
-
-
-      /* Check if the USB controller needs to be restarted. */
-      if (restart_controller)
-      {
-        /* 8. Wait for the USB controller entering started state. */
-        while (!(*R_USB_STATUS & IO_STATE(R_USB_STATUS, started, yes))) {}
-
-        /* 9. Order the USB controller to running state. */
-        crisv10_ready_wait();
-        *R_USB_COMMAND =
-          IO_STATE(R_USB_COMMAND, port_sel, nop) |
-          IO_STATE(R_USB_COMMAND, port_cmd, reset) |
-          IO_STATE(R_USB_COMMAND, busy,     no) |
-          IO_STATE(R_USB_COMMAND, ctrl_cmd, host_run);
-
-        /* 10. Wait for the USB controller reaching running state. */
-        while (!(*R_USB_STATUS & IO_STATE(R_USB_STATUS, running, yes))) {}
-      }
-
-      /* 11. Clear any controller or port satus interrupts before enabling
-             the interrupts. */
-      {
-        u16 dummy;
-
-        /* Clear the port status interrupt of the reset port. */
-        if (bPort == 0)
-        {
-          rh_dbg("Clearing port 1 interrupts\n");
-          dummy = *R_USB_RH_PORT_STATUS_1;
-        }
-        else
-        {
-          rh_dbg("Clearing port 2 interrupts\n");
-          dummy = *R_USB_RH_PORT_STATUS_2;
-        }
-
-        if (restart_controller)
-        {
-          /* The USB controller is restarted. Clear all interupts. */
-          rh_dbg("Clearing all interrupts\n");
-          dummy = *R_USB_STATUS;
-          dummy = *R_USB_RH_PORT_STATUS_1;
-          dummy = *R_USB_RH_PORT_STATUS_2;
-        }
-      }
-
-      /* 12. Enable USB controller status and USB port status interrupts.  */
-      *R_USB_IRQ_MASK_SET = IO_STATE(R_USB_IRQ_MASK_SET, ctl_status, set);
-      __asm__ __volatile__ ("  nop");
-      *R_USB_IRQ_MASK_SET = IO_STATE(R_USB_IRQ_MASK_SET, port_status, set);
-      __asm__ __volatile__ ("  nop");
-
-    }
-    else
-    {
-
-      bUsbCommand |= IO_STATE(R_USB_COMMAND, port_cmd, reset);
-      /* Select which port via the port_sel field */
-      bUsbCommand |= IO_FIELD(R_USB_COMMAND, port_sel, bPort+1);
-
-      /* Make sure the controller isn't busy. */
-      crisv10_ready_wait();
-      /* Send out the actual command to the USB controller */
-      *R_USB_COMMAND = bUsbCommand;
-
-      /* Wait a while for controller to first become started after port reset */
-      udelay(12000); /* 12ms blocking wait */
-      
-      /* Make sure the controller isn't busy. */
-      crisv10_ready_wait();
-
-      /* If all enabled ports were disabled the host controller goes down into
-         started mode, so we need to bring it back into the running state.
-         (This is safe even if it's already in the running state.) */
-      *R_USB_COMMAND =
-        IO_STATE(R_USB_COMMAND, port_sel, nop) |
-        IO_STATE(R_USB_COMMAND, port_cmd, reset) |
-        IO_STATE(R_USB_COMMAND, ctrl_cmd, host_run);
-    }
-
-    break;
-  case USB_PORT_FEAT_SUSPEND:
-    rh_dbg("SetPortFeature: suspend\n");
-    bUsbCommand |= IO_STATE(R_USB_COMMAND, port_cmd, suspend);
-    goto set;
-    break;
-  case USB_PORT_FEAT_POWER:
-    rh_dbg("SetPortFeature: power\n");
-    break;
-  case USB_PORT_FEAT_C_CONNECTION:
-    rh_dbg("SetPortFeature: c_connection\n");
-    break;
-  case USB_PORT_FEAT_C_RESET:
-    rh_dbg("SetPortFeature: c_reset\n");
-    break;
-  case USB_PORT_FEAT_C_OVER_CURRENT:
-    rh_dbg("SetPortFeature: c_over_current\n");
-    break;
-
-  set:
-    /* Select which port via the port_sel field */
-    bUsbCommand |= IO_FIELD(R_USB_COMMAND, port_sel, bPort+1);
-
-    /* Make sure the controller isn't busy. */
-    crisv10_ready_wait();
-    /* Send out the actual command to the USB controller */
-    *R_USB_COMMAND = bUsbCommand;
-    break;
-  default:
-    rh_dbg("SetPortFeature: unknown feature\n");
-    return -1;
-  }
-  return 0;
-}
-
-int rh_clear_port_feature(__u8 bPort, __u16 wFeature) {
-  switch(wFeature) {
-  case USB_PORT_FEAT_ENABLE:
-    rh_dbg("ClearPortFeature: enable\n");
-    rh_disable_port(bPort);
-    break;
-  case USB_PORT_FEAT_SUSPEND:
-    rh_dbg("ClearPortFeature: suspend\n");
-    break;
-  case USB_PORT_FEAT_POWER:
-    rh_dbg("ClearPortFeature: power\n");
-    break;
-
-  case USB_PORT_FEAT_C_ENABLE:
-    rh_dbg("ClearPortFeature: c_enable\n");
-    goto clear;
-  case USB_PORT_FEAT_C_SUSPEND:
-    rh_dbg("ClearPortFeature: c_suspend\n");
-    goto clear;
-  case USB_PORT_FEAT_C_CONNECTION:
-    rh_dbg("ClearPortFeature: c_connection\n");
-    goto clear;
-  case USB_PORT_FEAT_C_OVER_CURRENT:
-    rh_dbg("ClearPortFeature: c_over_current\n");
-    goto clear;
-  case USB_PORT_FEAT_C_RESET:
-    rh_dbg("ClearPortFeature: c_reset\n");
-    goto clear;
-  clear:
-    rh.wPortChange[bPort] &= ~(1 << (wFeature - 16));
-    break;
-  default:
-    rh_dbg("ClearPortFeature: unknown feature\n");
-    return -1;
-  }
-  return 0;
-}
-
-
-#ifdef	CONFIG_PM
-/* Handle a suspend request for the root hub (called from hcd_driver) */
-static int rh_suspend_request(struct usb_hcd *hcd)
-{
-  return 0; /* no-op for now */
-}
-
-/* Handle a resume request for the root hub (called from hcd_driver) */
-static int rh_resume_request(struct usb_hcd *hcd)
-{
-  return 0; /* no-op for now */
-}
-#endif /* CONFIG_PM */
-
-
-
-/* Wrapper function for workaround port disable registers in USB controller  */
-static void rh_disable_port(unsigned int port) {
-  volatile int timeout = 10000;
-  volatile char* usb_portx_disable;
-  switch(port) {
-  case 0:
-    usb_portx_disable = R_USB_PORT1_DISABLE;
-    break;
-  case 1:
-    usb_portx_disable = R_USB_PORT2_DISABLE;
-    break;
-  default:
-    /* Invalid port index */
-    return;
-  }
-  /* Set disable flag in special register  */
-  *usb_portx_disable = IO_STATE(R_USB_PORT1_DISABLE, disable, yes);
-  /* Wait until not enabled anymore */
-  while((rh.wPortStatusPrev[port] &
-	IO_STATE(R_USB_RH_PORT_STATUS_1, enabled, yes)) &&
-	(timeout-- > 0));
-
-  /* clear disable flag in special register  */
-  *usb_portx_disable = IO_STATE(R_USB_PORT1_DISABLE, disable, no);
-  rh_info("Physical port %d disabled\n", port+1);
-}
-
-
-/******************************************************************/
-/* Transfer Controller (TC) functions                             */
-/******************************************************************/
-
-/* FIXME: Should RX_BUF_SIZE be a config option, or maybe we should adjust it
-   dynamically?
-   To adjust it dynamically we would have to get an interrupt when we reach
-   the end of the rx descriptor list, or when we get close to the end, and
-   then allocate more descriptors. */
-#define NBR_OF_RX_DESC     512
-#define RX_DESC_BUF_SIZE   1024
-#define RX_BUF_SIZE        (NBR_OF_RX_DESC * RX_DESC_BUF_SIZE)
-
-
-/* Local variables for Transfer Controller */
-/* --------------------------------------- */
-
-/* This is a circular (double-linked) list of the active urbs for each epid.
-   The head is never removed, and new urbs are linked onto the list as
-   urb_entry_t elements. Don't reference urb_list directly; use the wrapper
-   functions instead (which includes spin_locks) */
-static struct list_head urb_list[NBR_OF_EPIDS];
-
-/* Read about the need and usage of this lock in submit_ctrl_urb. */
-/* Lock for URB lists for each EPID */
-static spinlock_t urb_list_lock;
-
-/* Lock for EPID array register (R_USB_EPT_x) in Etrax */
-static spinlock_t etrax_epid_lock;
-
-/* Lock for dma8 sub0 handling */
-static spinlock_t etrax_dma8_sub0_lock;
-
-/* DMA IN cache bug. Align the DMA IN buffers to 32 bytes, i.e. a cache line.
-   Since RX_DESC_BUF_SIZE is 1024 is a multiple of 32, all rx buffers will be
-   cache aligned. */
-static volatile unsigned char RxBuf[RX_BUF_SIZE] __attribute__ ((aligned (32)));
-static volatile struct USB_IN_Desc RxDescList[NBR_OF_RX_DESC] __attribute__ ((aligned (4)));
-
-/* Pointers into RxDescList. */
-static volatile struct USB_IN_Desc *myNextRxDesc;
-static volatile struct USB_IN_Desc *myLastRxDesc;
-
-/* A zout transfer makes a memory access at the address of its buf pointer,
-   which means that setting this buf pointer to 0 will cause an access to the
-   flash. In addition to this, setting sw_len to 0 results in a 16/32 bytes
-   (depending on DMA burst size) transfer.
-   Instead, we set it to 1, and point it to this buffer. */
-static int zout_buffer[4] __attribute__ ((aligned (4)));
-
-/* Cache for allocating new EP and SB descriptors. */
-static struct kmem_cache *usb_desc_cache;
-
-/* Cache for the data allocated in the isoc descr top half. */
-static struct kmem_cache *isoc_compl_cache;
-
-/* Cache for the data allocated when delayed finishing of URBs */
-static struct kmem_cache *later_data_cache;
-
-
-/* Counter to keep track of how many Isoc EP we have sat up. Used to enable
-   and disable iso_eof interrupt. We only need these interrupts when we have
-   Isoc data endpoints (consumes CPU cycles).
-   FIXME: This could be more fine granular, so this interrupt is only enabled
-   when we have a In Isoc URB not URB_ISO_ASAP flaged queued. */
-static int isoc_epid_counter;
-
-/* Protecting wrapper functions for R_USB_EPT_x */
-/* -------------------------------------------- */
-static inline void etrax_epid_set(__u8 index, __u32 data) {
-  unsigned long flags;
-  spin_lock_irqsave(&etrax_epid_lock, flags);
-  *R_USB_EPT_INDEX = IO_FIELD(R_USB_EPT_INDEX, value, index);
-  nop();
-  *R_USB_EPT_DATA = data;
-  spin_unlock_irqrestore(&etrax_epid_lock, flags);
-}
-
-static inline void etrax_epid_clear_error(__u8 index) {
-  unsigned long flags;
-  spin_lock_irqsave(&etrax_epid_lock, flags);
-  *R_USB_EPT_INDEX = IO_FIELD(R_USB_EPT_INDEX, value, index);
-  nop();
-  *R_USB_EPT_DATA &=
-    ~(IO_MASK(R_USB_EPT_DATA, error_count_in) |
-      IO_MASK(R_USB_EPT_DATA, error_count_out) |
-      IO_MASK(R_USB_EPT_DATA, error_code));
-  spin_unlock_irqrestore(&etrax_epid_lock, flags);
-}
-
-static inline void etrax_epid_set_toggle(__u8 index, __u8 dirout,
-                                             __u8 toggle) {
-  unsigned long flags;
-  spin_lock_irqsave(&etrax_epid_lock, flags);
-  *R_USB_EPT_INDEX = IO_FIELD(R_USB_EPT_INDEX, value, index);
-  nop();
-  if(dirout) {
-    *R_USB_EPT_DATA &= ~IO_MASK(R_USB_EPT_DATA, t_out);
-    *R_USB_EPT_DATA |= IO_FIELD(R_USB_EPT_DATA, t_out, toggle);
-  } else {
-    *R_USB_EPT_DATA &= ~IO_MASK(R_USB_EPT_DATA, t_in);
-    *R_USB_EPT_DATA |= IO_FIELD(R_USB_EPT_DATA, t_in, toggle);
-  }
-  spin_unlock_irqrestore(&etrax_epid_lock, flags);
-}
-
-static inline __u8 etrax_epid_get_toggle(__u8 index, __u8 dirout) {
-  unsigned long flags;
-  __u8 toggle;
-  spin_lock_irqsave(&etrax_epid_lock, flags);
-  *R_USB_EPT_INDEX = IO_FIELD(R_USB_EPT_INDEX, value, index);
-  nop();
-  if (dirout) {
-    toggle = IO_EXTRACT(R_USB_EPT_DATA, t_out, *R_USB_EPT_DATA);
-  } else {
-    toggle = IO_EXTRACT(R_USB_EPT_DATA, t_in, *R_USB_EPT_DATA);
-  }
-  spin_unlock_irqrestore(&etrax_epid_lock, flags);
-  return toggle;
-}
-
-
-static inline __u32 etrax_epid_get(__u8 index) {
-  unsigned long flags;
-  __u32 data;
-  spin_lock_irqsave(&etrax_epid_lock, flags);
-  *R_USB_EPT_INDEX = IO_FIELD(R_USB_EPT_INDEX, value, index);
-  nop();
-  data = *R_USB_EPT_DATA;
-  spin_unlock_irqrestore(&etrax_epid_lock, flags);
-  return data;
-}
-
-
-
-
-/* Main functions for Transfer Controller */
-/* -------------------------------------- */
-
-/* Init structs, memories and lists used by Transfer Controller */
-int tc_init(struct usb_hcd *hcd) {
-  int i;
-  /* Clear software state info for all epids */
-  memset(epid_state, 0, sizeof(struct etrax_epid) * NBR_OF_EPIDS);
-
-  /* Set Invalid and Dummy as being in use and disabled */
-  epid_state[INVALID_EPID].inuse = 1;
-  epid_state[DUMMY_EPID].inuse = 1;
-  epid_state[INVALID_EPID].disabled = 1;
-  epid_state[DUMMY_EPID].disabled = 1;
-
-  /* Clear counter for how many Isoc epids we have sat up */
-  isoc_epid_counter = 0;
-
-  /* Initialize the urb list by initiating a head for each list.
-     Also reset list hodling active URB for each epid */
-  for (i = 0; i < NBR_OF_EPIDS; i++) {
-    INIT_LIST_HEAD(&urb_list[i]);
-    activeUrbList[i] = NULL;
-  }
-
-  /* Init lock for URB lists */
-  spin_lock_init(&urb_list_lock);
-  /* Init lock for Etrax R_USB_EPT register */
-  spin_lock_init(&etrax_epid_lock);
-  /* Init lock for Etrax dma8 sub0 handling */
-  spin_lock_init(&etrax_dma8_sub0_lock);
-
-  /* We use kmem_cache_* to make sure that all DMA desc. are dword aligned */
-
-  /* Note that we specify sizeof(struct USB_EP_Desc) as the size, but also
-     allocate SB descriptors from this cache. This is ok since
-     sizeof(struct USB_EP_Desc) == sizeof(struct USB_SB_Desc). */
-  usb_desc_cache = kmem_cache_create("usb_desc_cache",
-				     sizeof(struct USB_EP_Desc), 0,
-				     SLAB_HWCACHE_ALIGN, 0);
-  if(usb_desc_cache == NULL) {
-    return -ENOMEM;
-  }
-
-  /* Create slab cache for speedy allocation of memory for isoc bottom-half
-     interrupt handling */
-  isoc_compl_cache =
-    kmem_cache_create("isoc_compl_cache",
-		      sizeof(struct crisv10_isoc_complete_data),
-		      0, SLAB_HWCACHE_ALIGN, 0);
-  if(isoc_compl_cache == NULL) {
-    return -ENOMEM;
-  }
-
-  /* Create slab cache for speedy allocation of memory for later URB finish
-     struct */
-  later_data_cache =
-    kmem_cache_create("later_data_cache",
-		      sizeof(struct urb_later_data),
-		      0, SLAB_HWCACHE_ALIGN, 0);
-  if(later_data_cache == NULL) {
-    return -ENOMEM;
-  }
-
-
-  /* Initiate the bulk start timer. */
-  init_timer(&bulk_start_timer);
-  bulk_start_timer.expires = jiffies + BULK_START_TIMER_INTERVAL;
-  bulk_start_timer.function = tc_bulk_start_timer_func;
-  add_timer(&bulk_start_timer);
-
-
-  /* Initiate the bulk eot timer. */
-  init_timer(&bulk_eot_timer);
-  bulk_eot_timer.expires = jiffies + BULK_EOT_TIMER_INTERVAL;
-  bulk_eot_timer.function = tc_bulk_eot_timer_func;
-  bulk_eot_timer.data = (unsigned long)hcd;
-  add_timer(&bulk_eot_timer);
-
-  return 0;
-}
-
-/* Uninitialize all resources used by Transfer Controller */
-void tc_destroy(void) {
-
-  /* Destroy all slab cache */
-  kmem_cache_destroy(usb_desc_cache);
-  kmem_cache_destroy(isoc_compl_cache);
-  kmem_cache_destroy(later_data_cache);
-
-  /* Remove timers */
-  del_timer(&bulk_start_timer);
-  del_timer(&bulk_eot_timer);
-}
-
-static void restart_dma8_sub0(void) {
-  unsigned long flags;
-  spin_lock_irqsave(&etrax_dma8_sub0_lock, flags);
-  /* Verify that the dma is not running */
-  if ((*R_DMA_CH8_SUB0_CMD & IO_MASK(R_DMA_CH8_SUB0_CMD, cmd)) == 0) {
-    struct USB_EP_Desc *ep = (struct USB_EP_Desc *)phys_to_virt(*R_DMA_CH8_SUB0_EP);
-    while (DUMMY_EPID == IO_EXTRACT(USB_EP_command, epid, ep->command)) {
-      ep = (struct USB_EP_Desc *)phys_to_virt(ep->next);
-    }
-    /* Advance the DMA to the next EP descriptor that is not a DUMMY_EPID. */
-    *R_DMA_CH8_SUB0_EP = virt_to_phys(ep);
-    /* Restart the DMA */
-    *R_DMA_CH8_SUB0_CMD = IO_STATE(R_DMA_CH8_SUB0_CMD, cmd, start);
-  }
-  spin_unlock_irqrestore(&etrax_dma8_sub0_lock, flags);
-}
-
-/* queue an URB with the transfer controller (called from hcd_driver) */
-static int tc_urb_enqueue(struct usb_hcd *hcd, 
-			  struct urb *urb, 
-			  gfp_t mem_flags) {
-  int epid;
-  int retval;
-  int bustime = 0;
-  int maxpacket;
-  unsigned long flags;
-  struct crisv10_urb_priv *urb_priv;
-  struct crisv10_hcd* crisv10_hcd = hcd_to_crisv10_hcd(hcd);
-  DBFENTER;
-
-  if(!(crisv10_hcd->running)) {
-    /* The USB Controller is not running, probably because no device is 
-       attached. No idea to enqueue URBs then */
-    tc_warn("Rejected enqueueing of URB:0x%x because no dev attached\n",
-	    (unsigned int)urb);
-    return -ENOENT;
-  }
-
-  maxpacket = usb_maxpacket(urb->dev, urb->pipe, usb_pipeout(urb->pipe));
-  /* Special case check for In Isoc transfers. Specification states that each
-     In Isoc transfer consists of one packet and therefore it should fit into
-     the transfer-buffer of an URB.
-     We do the check here to be sure (an invalid scenario can be produced with
-     parameters to the usbtest suite) */
-  if(usb_pipeisoc(urb->pipe) && usb_pipein(urb->pipe) &&
-     (urb->transfer_buffer_length < maxpacket)) {
-    tc_err("Submit In Isoc URB with buffer length:%d to pipe with maxpacketlen: %d\n", urb->transfer_buffer_length, maxpacket);
-    return -EMSGSIZE;
-  }
-
-  /* Check if there is a epid for URBs destination, if not this function
-     set up one. */
-  epid = tc_setup_epid(urb->ep, urb, mem_flags);
-  if (epid < 0) {
-    tc_err("Failed setup epid:%d for URB:0x%x\n", epid, (unsigned int)urb);
-    DBFEXIT;
-    return -ENOMEM;
-  }
-
-  if(urb == activeUrbList[epid]) {
-    tc_err("Resubmition of allready active URB:0x%x\n", (unsigned int)urb);
-    return -ENXIO;
-  }
-
-  if(urb_list_entry(urb, epid)) {
-    tc_err("Resubmition of allready queued URB:0x%x\n", (unsigned int)urb);
-    return -ENXIO;
-  }
-
-  /* If we actively have flaged endpoint as disabled then refuse submition */
-  if(epid_state[epid].disabled) {
-    return -ENOENT;
-  }
-
-  /* Allocate and init HC-private data for URB */
-  if(urb_priv_create(hcd, urb, epid, mem_flags) != 0) {
-    DBFEXIT;
-    return -ENOMEM;
-  }
-  urb_priv = urb->hcpriv;
-
-  /* Check if there is enough bandwidth for periodic transfer  */
-  if(usb_pipeint(urb->pipe) || usb_pipeisoc(urb->pipe)) {
-    /* only check (and later claim) if not already claimed */
-    if (urb_priv->bandwidth == 0) {
-      bustime = crisv10_usb_check_bandwidth(urb->dev, urb);
-      if (bustime < 0) {
-        tc_err("Not enough periodic bandwidth\n");
-        urb_priv_free(hcd, urb);
-        DBFEXIT;
-        return -ENOSPC;
-      }
-    }
-  }
-
-  tc_dbg("Enqueue URB:0x%x[%d] epid:%d (%s) bufflen:%d\n",
-	 (unsigned int)urb, urb_priv->urb_num, epid,
-	 pipe_to_str(urb->pipe), urb->transfer_buffer_length);
-
-  /* Create and link SBs required for this URB */
-  retval = create_sb_for_urb(urb, mem_flags);
-  if(retval != 0) {
-    tc_err("Failed to create SBs for URB:0x%x[%d]\n", (unsigned int)urb,
-	   urb_priv->urb_num);
-    urb_priv_free(hcd, urb);
-    DBFEXIT;
-    return retval;
-  }
-
-  /* Init intr EP pool if this URB is a INTR transfer. This pool is later
-     used when inserting EPs in the TxIntrEPList. We do the alloc here
-     so we can't run out of memory later */
-  if(usb_pipeint(urb->pipe)) {
-    retval = init_intr_urb(urb, mem_flags);
-    if(retval != 0) {
-      tc_warn("Failed to init Intr URB\n");
-      urb_priv_free(hcd, urb);
-      DBFEXIT;
-      return retval;
-    }
-  }
-
-  /* Disable other access when inserting USB */
-  local_irq_save(flags);
-
-  /* Claim bandwidth, if needed */
-  if(bustime) {
-    crisv10_usb_claim_bandwidth(urb->dev,
-                                urb,
-                                bustime,
-                                (usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS));
-  }
-  
-  /* Add URB to EP queue */
-  urb_list_add(urb, epid, mem_flags);
-
-  if(usb_pipeisoc(urb->pipe)) {
-    /* Special processing of Isoc URBs. */
-    tc_dma_process_isoc_urb(urb);
-  } else {
-    /* Process EP queue for rest of the URB types (Bulk, Ctrl, Intr) */
-    tc_dma_process_queue(epid);
-  }
-
-  local_irq_restore(flags);
-
-  DBFEXIT;
-  return 0;
-}
-
-/* remove an URB from the transfer controller queues (called from hcd_driver)*/
-static int tc_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status) {
-  struct crisv10_urb_priv *urb_priv;
-  unsigned long flags;
-  int epid;
-
-  DBFENTER;
-  /* Disable interrupts here since a descriptor interrupt for the isoc epid
-     will modify the sb list.  This could possibly be done more granular, but
-     urb_dequeue should not be used frequently anyway.
-  */
-  local_irq_save(flags);
-
-  urb->status = status;
-  urb_priv = urb->hcpriv;
-
-  if (!urb_priv) {
-    /* This happens if a device driver calls unlink on an urb that
-       was never submitted (lazy driver) or if the urb was completed
-       while dequeue was being called. */
-    tc_warn("Dequeing of not enqueued URB:0x%x\n", (unsigned int)urb);
-    local_irq_restore(flags);
-    return 0;
-  }
-  epid = urb_priv->epid;
-
-  tc_warn("Dequeing %s URB:0x%x[%d] (%s %s epid:%d) status:%d %s\n",
-	  (urb == activeUrbList[epid]) ? "active" : "queued",
-	  (unsigned int)urb, urb_priv->urb_num, str_dir(urb->pipe),
-	  str_type(urb->pipe), epid, urb->status,
-	  (urb_priv->later_data) ? "later-sched" : "");
-
-  /* For Bulk, Ctrl and Intr are only one URB active at a time. So any URB
-     that isn't active can be dequeued by just removing it from the queue */
-  if(usb_pipebulk(urb->pipe) || usb_pipecontrol(urb->pipe) ||
-     usb_pipeint(urb->pipe)) {
-
-    /* Check if URB haven't gone further than the queue */
-    if(urb != activeUrbList[epid]) {
-      ASSERT(urb_priv->later_data == NULL);
-      tc_warn("Dequeing URB:0x%x[%d] (%s %s epid:%d) from queue"
-	      " (not active)\n", (unsigned int)urb, urb_priv->urb_num,
-	      str_dir(urb->pipe), str_type(urb->pipe), epid);
-      
-      /* Finish the URB with error status from USB core */
-      tc_finish_urb(hcd, urb, urb->status);
-      local_irq_restore(flags);
-      return 0;
-    }
-  }
-
-  /* Set URB status to Unlink for handling when interrupt comes. */
-  urb_priv->urb_state = UNLINK;
-
-  /* Differentiate dequeing of Bulk and Ctrl from Isoc and Intr */
-  switch(usb_pipetype(urb->pipe)) {
-  case PIPE_BULK:
-    /* Check if EP still is enabled */
-    if (TxBulkEPList[epid].command & IO_MASK(USB_EP_command, enable)) {
-      /* The EP was enabled, disable it. */
-      TxBulkEPList[epid].command &= ~IO_MASK(USB_EP_command, enable);
-    }
-    /* Kicking dummy list out of the party. */
-    TxBulkEPList[epid].next = virt_to_phys(&TxBulkEPList[(epid + 1) % NBR_OF_EPIDS]);
-    break;
-  case PIPE_CONTROL:
-    /* Check if EP still is enabled */
-    if (TxCtrlEPList[epid].command & IO_MASK(USB_EP_command, enable)) {
-      /* The EP was enabled, disable it. */
-      TxCtrlEPList[epid].command &= ~IO_MASK(USB_EP_command, enable);
-    }
-    break;
-  case PIPE_ISOCHRONOUS:
-    /* Disabling, busy-wait and unlinking of Isoc SBs will be done in
-       finish_isoc_urb(). Because there might the case when URB is dequeued
-       but there are other valid URBs waiting */
-
-    /* Check if In Isoc EP still is enabled */
-    if (TxIsocEPList[epid].command & IO_MASK(USB_EP_command, enable)) {
-      /* The EP was enabled, disable it. */
-      TxIsocEPList[epid].command &= ~IO_MASK(USB_EP_command, enable);
-    }
-    break;
-  case PIPE_INTERRUPT:
-    /* Special care is taken for interrupt URBs. EPs are unlinked in
-       tc_finish_urb */
-    break;
-  default:
-    break;
-  }
-
-  /* Asynchronous unlink, finish the URB later from scheduled or other
-     event (data finished, error) */
-  tc_finish_urb_later(hcd, urb, urb->status);
-
-  local_irq_restore(flags);
-  DBFEXIT;
-  return 0;
-}
-
-
-static void tc_sync_finish_epid(struct usb_hcd *hcd, int epid) {
-  volatile int timeout = 10000;
-  struct urb* urb;
-  struct crisv10_urb_priv* urb_priv;
-  unsigned long flags;
-  
-  volatile struct USB_EP_Desc *first_ep;  /* First EP in the list. */
-  volatile struct USB_EP_Desc *curr_ep;   /* Current EP, the iterator. */
-  volatile struct USB_EP_Desc *next_ep;   /* The EP after current. */
-
-  int type = epid_state[epid].type;
-
-  /* Setting this flag will cause enqueue() to return -ENOENT for new
-     submitions on this endpoint and finish_urb() wont process queue further */
-  epid_state[epid].disabled = 1;
-
-  switch(type) {
-  case PIPE_BULK:
-    /* Check if EP still is enabled */
-    if (TxBulkEPList[epid].command & IO_MASK(USB_EP_command, enable)) {
-      /* The EP was enabled, disable it. */
-      TxBulkEPList[epid].command &= ~IO_MASK(USB_EP_command, enable);
-      tc_warn("sync_finish: Disabling EP for epid:%d\n", epid);
-
-      /* Do busy-wait until DMA not using this EP descriptor anymore */
-      while((*R_DMA_CH8_SUB0_EP ==
-	     virt_to_phys(&TxBulkEPList[epid])) &&
-	    (timeout-- > 0));
-
-    }
-    break;
-
-  case PIPE_CONTROL:
-    /* Check if EP still is enabled */
-    if (TxCtrlEPList[epid].command & IO_MASK(USB_EP_command, enable)) {
-      /* The EP was enabled, disable it. */
-      TxCtrlEPList[epid].command &= ~IO_MASK(USB_EP_command, enable);
-      tc_warn("sync_finish: Disabling EP for epid:%d\n", epid);
-
-      /* Do busy-wait until DMA not using this EP descriptor anymore */
-      while((*R_DMA_CH8_SUB1_EP ==
-	     virt_to_phys(&TxCtrlEPList[epid])) &&
-	    (timeout-- > 0));
-    }
-    break;
-
-  case PIPE_INTERRUPT:
-    local_irq_save(flags);
-    /* Disable all Intr EPs belonging to epid */
-    first_ep = &TxIntrEPList[0];
-    curr_ep = first_ep;
-    do {
-      next_ep = (struct USB_EP_Desc *)phys_to_virt(curr_ep->next);
-      if (IO_EXTRACT(USB_EP_command, epid, next_ep->command) == epid) {
-	/* Disable EP */
-	next_ep->command &= ~IO_MASK(USB_EP_command, enable);
-      }
-      curr_ep = phys_to_virt(curr_ep->next);
-    } while (curr_ep != first_ep);
-
-    local_irq_restore(flags);
-    break;
-
-  case PIPE_ISOCHRONOUS:
-    /* Check if EP still is enabled */
-    if (TxIsocEPList[epid].command & IO_MASK(USB_EP_command, enable)) {
-      tc_warn("sync_finish: Disabling Isoc EP for epid:%d\n", epid);
-      /* The EP was enabled, disable it. */
-      TxIsocEPList[epid].command &= ~IO_MASK(USB_EP_command, enable);
-      
-      while((*R_DMA_CH8_SUB3_EP == virt_to_phys(&TxIsocEPList[epid])) &&
-	    (timeout-- > 0));
-    }
-    break;
-  }
-
-  local_irq_save(flags);
-
-  /* Finish if there is active URB for this endpoint */
-  if(activeUrbList[epid] != NULL) {
-    urb = activeUrbList[epid];
-    urb_priv = urb->hcpriv;
-    ASSERT(urb_priv);
-    tc_warn("Sync finish %s URB:0x%x[%d] (%s %s epid:%d) status:%d %s\n",
-	    (urb == activeUrbList[epid]) ? "active" : "queued",
-	    (unsigned int)urb, urb_priv->urb_num, str_dir(urb->pipe),
-	    str_type(urb->pipe), epid, urb->status,
-	    (urb_priv->later_data) ? "later-sched" : "");
-
-    tc_finish_urb(hcd, activeUrbList[epid], -ENOENT);
-    ASSERT(activeUrbList[epid] == NULL);
-  }
-
-  /* Finish any queued URBs for this endpoint. There won't be any resubmitions
-     because epid_disabled causes enqueue() to fail for this endpoint */
-  while((urb = urb_list_first(epid)) != NULL) {
-    urb_priv = urb->hcpriv;
-    ASSERT(urb_priv);
-
-    tc_warn("Sync finish %s URB:0x%x[%d] (%s %s epid:%d) status:%d %s\n",
-	    (urb == activeUrbList[epid]) ? "active" : "queued",
-	    (unsigned int)urb, urb_priv->urb_num, str_dir(urb->pipe),
-	    str_type(urb->pipe), epid, urb->status,
-	    (urb_priv->later_data) ? "later-sched" : "");
-
-    tc_finish_urb(hcd, urb, -ENOENT);
-  }
-  epid_state[epid].disabled = 0;
-  local_irq_restore(flags);
-}
-
-/* free resources associated with an endpoint (called from hcd_driver) */
-static void tc_endpoint_disable(struct usb_hcd *hcd, 
-				struct usb_host_endpoint *ep) {
-  DBFENTER;
-  /* Only free epid if it has been allocated. We get two endpoint_disable
-     requests for ctrl endpoints so ignore the second one */
-  if(ep->hcpriv != NULL) {
-    struct crisv10_ep_priv *ep_priv = ep->hcpriv;
-    int epid = ep_priv->epid;
-    tc_warn("endpoint_disable ep:0x%x ep-priv:0x%x (%s) (epid:%d freed)\n",
-	   (unsigned int)ep, (unsigned int)ep->hcpriv,
-	   endpoint_to_str(&(ep->desc)), epid);
-
-    tc_sync_finish_epid(hcd, epid);
-
-    ASSERT(activeUrbList[epid] == NULL);
-    ASSERT(list_empty(&urb_list[epid]));
-
-    tc_free_epid(ep);
-  } else {
-    tc_dbg("endpoint_disable ep:0x%x ep-priv:0x%x (%s)\n", (unsigned int)ep,
-	   (unsigned int)ep->hcpriv, endpoint_to_str(&(ep->desc)));
-  }
-  DBFEXIT;
-}
-
-static void tc_finish_urb_later_proc(struct work_struct* work) {
-  unsigned long flags;
-  struct urb_later_data* uld;
-
-  local_irq_save(flags);
-  uld = container_of(work, struct urb_later_data, dws.work);
-  if(uld->urb == NULL) {
-    late_dbg("Later finish of URB = NULL (allready finished)\n");
-  } else {
-    struct crisv10_urb_priv* urb_priv = uld->urb->hcpriv;
-    ASSERT(urb_priv);
-    if(urb_priv->urb_num == uld->urb_num) {
-      late_dbg("Later finish of URB:0x%x[%d]\n", (unsigned int)(uld->urb),
-	       urb_priv->urb_num);
-      if(uld->status != uld->urb->status) {
-	errno_dbg("Later-finish URB with status:%d, later-status:%d\n",
-		  uld->urb->status, uld->status);
-      }
-      if(uld != urb_priv->later_data) {
-	panic("Scheduled uld not same as URBs uld\n");
-      }
-      tc_finish_urb(uld->hcd, uld->urb, uld->status);
-    } else {
-      late_warn("Ignoring later finish of URB:0x%x[%d]"
-		", urb_num doesn't match current URB:0x%x[%d]",
-		(unsigned int)(uld->urb), uld->urb_num,
-		(unsigned int)(uld->urb), urb_priv->urb_num);
-    }
-  }
-  local_irq_restore(flags);
-  kmem_cache_free(later_data_cache, uld);
-}
-
-static void tc_finish_urb_later(struct usb_hcd *hcd, struct urb *urb,
-				int status) {
-  struct crisv10_urb_priv *urb_priv = urb->hcpriv;
-  struct urb_later_data* uld;
-
-  ASSERT(urb_priv);
-
-  if(urb_priv->later_data != NULL) {
-    /* Later-finish allready scheduled for this URB, just update status to
-       return when finishing later */
-    errno_dbg("Later-finish schedule change URB status:%d with new"
-	      " status:%d\n", urb_priv->later_data->status, status);
-    
-    urb_priv->later_data->status = status;
-    return;
-  }
-
-  uld = kmem_cache_alloc(later_data_cache, GFP_ATOMIC);
-  ASSERT(uld);
-
-  uld->hcd = hcd;
-  uld->urb = urb;
-  uld->urb_num = urb_priv->urb_num;
-  uld->status = status;
-
-  INIT_DELAYED_WORK(&uld->dws, tc_finish_urb_later_proc);
-  urb_priv->later_data = uld;
-
-  /* Schedule the finishing of the URB to happen later */
-  schedule_delayed_work(&uld->dws, LATER_TIMER_DELAY);
-}
-
-static void tc_finish_isoc_urb(struct usb_hcd *hcd, struct urb *urb,
-			       int status);
-
-static void tc_finish_urb(struct usb_hcd *hcd, struct urb *urb, int status) {
-  struct crisv10_hcd* crisv10_hcd = hcd_to_crisv10_hcd(hcd);
-  struct crisv10_urb_priv *urb_priv = urb->hcpriv;
-  int epid;
-  char toggle;
-  int urb_num;
-
-  DBFENTER;
-  ASSERT(urb_priv != NULL);
-  epid = urb_priv->epid;
-  urb_num = urb_priv->urb_num;
-
-  if(urb != activeUrbList[epid]) {
-    if(urb_list_entry(urb, epid)) {
-      /* Remove this URB from the list. Only happens when URB are finished
-	 before having been processed (dequeing) */
-      urb_list_del(urb, epid);
-    } else {
-      tc_warn("Finishing of URB:0x%x[%d] neither active or in queue for"
-	      " epid:%d\n", (unsigned int)urb, urb_num, epid);
-    }
-  }
-
-  /* Cancel any pending later-finish of this URB */
-  if(urb_priv->later_data) {
-    urb_priv->later_data->urb = NULL;
-  }
-
-  /* For an IN pipe, we always set the actual length, regardless of whether
-     there was an error or not (which means the device driver can use the data
-     if it wants to). */
-  if(usb_pipein(urb->pipe)) {
-    urb->actual_length = urb_priv->rx_offset;
-  } else {
-    /* Set actual_length for OUT urbs also; the USB mass storage driver seems
-       to want that. */
-    if (status == 0 && urb->status == -EINPROGRESS) {
-      urb->actual_length = urb->transfer_buffer_length;
-    } else {
-      /*  We wouldn't know of any partial writes if there was an error. */
-      urb->actual_length = 0;
-    }
-  }
-
-
-  /* URB status mangling */
-  if(urb->status == -EINPROGRESS) {
-    /* The USB core hasn't changed the status, let's set our finish status */
-    urb->status = status;
-
-    if ((status == 0) && (urb->transfer_flags & URB_SHORT_NOT_OK) &&
-	usb_pipein(urb->pipe) &&
-	(urb->actual_length != urb->transfer_buffer_length)) {
-      /* URB_SHORT_NOT_OK means that short reads (shorter than the endpoint's
-	 max length) is to be treated as an error. */
-      errno_dbg("Finishing URB:0x%x[%d] with SHORT_NOT_OK flag and short"
-		" data:%d\n", (unsigned int)urb, urb_num,
-		urb->actual_length);
-      urb->status = -EREMOTEIO;
-    }
-
-    if(urb_priv->urb_state == UNLINK) {
-      /* URB has been requested to be unlinked asynchronously */
-      urb->status = -ECONNRESET;
-      errno_dbg("Fixing unlink status of URB:0x%x[%d] to:%d\n",
-		(unsigned int)urb, urb_num, urb->status);
-    }
-  } else {
-    /* The USB Core wants to signal some error via the URB, pass it through */
-  }
-
-  /* use completely different finish function for Isoc URBs */
-  if(usb_pipeisoc(urb->pipe)) {
-    tc_finish_isoc_urb(hcd, urb, status);
-    return;
-  }
-
-  /* Do special unlinking of EPs for Intr traffic */
-  if(usb_pipeint(urb->pipe)) {
-    tc_dma_unlink_intr_urb(urb);
-  }
-
-  /* Release allocated bandwidth for periodic transfers */
-  if(usb_pipeint(urb->pipe) || usb_pipeisoc(urb->pipe))
-    crisv10_usb_release_bandwidth(hcd,
-                                  usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS,
-                                  urb_priv->bandwidth);
-
-  /* This URB is active on EP */
-  if(urb == activeUrbList[epid]) {
-    /* We need to fiddle with the toggle bits because the hardware doesn't do
-       it for us. */
-    toggle = etrax_epid_get_toggle(epid, usb_pipeout(urb->pipe));
-    usb_settoggle(urb->dev, usb_pipeendpoint(urb->pipe),
-		  usb_pipeout(urb->pipe), toggle);
-
-    /* Checks for Ctrl and Bulk EPs */
-    switch(usb_pipetype(urb->pipe)) {
-    case PIPE_BULK:
-      /* Check so Bulk EP realy is disabled before finishing active URB  */
-      ASSERT((TxBulkEPList[epid].command & IO_MASK(USB_EP_command, enable)) ==
-	     IO_STATE(USB_EP_command, enable, no));
-      /* Disable sub-pointer for EP to avoid next tx_interrupt() to
-	 process Bulk EP. */
-      TxBulkEPList[epid].sub = 0;
-      /* No need to wait for the DMA before changing the next pointer.
-	 The modulo NBR_OF_EPIDS isn't actually necessary, since we will never use
-	 the last one (INVALID_EPID) for actual traffic. */
-      TxBulkEPList[epid].next = 
-	virt_to_phys(&TxBulkEPList[(epid + 1) % NBR_OF_EPIDS]);
-      break;
-    case PIPE_CONTROL:
-      /* Check so Ctrl EP realy is disabled before finishing active URB  */
-      ASSERT((TxCtrlEPList[epid].command & IO_MASK(USB_EP_command, enable)) ==
-	     IO_STATE(USB_EP_command, enable, no));
-      /* Disable sub-pointer for EP to avoid next tx_interrupt() to
-	 process Ctrl EP. */
-      TxCtrlEPList[epid].sub = 0;
-      break;
-    }
-  }
-
-  /* Free HC-private URB data*/
-  urb_priv_free(hcd, urb);
-
-  if(urb->status) {
-    errno_dbg("finish_urb (URB:0x%x[%d] %s %s) (data:%d) status:%d\n",
-	      (unsigned int)urb, urb_num, str_dir(urb->pipe),
-	      str_type(urb->pipe), urb->actual_length, urb->status);
-  } else {
-    tc_dbg("finish_urb (URB:0x%x[%d] %s %s) (data:%d) status:%d\n",
-	   (unsigned int)urb, urb_num, str_dir(urb->pipe),
-	   str_type(urb->pipe), urb->actual_length, urb->status);
-  }
-
-  /* If we just finished an active URB, clear active pointer. */
-  if (urb == activeUrbList[epid]) {
-    /* Make URB not active on EP anymore */
-    activeUrbList[epid] = NULL;
-
-    if(urb->status == 0) {
-      /* URB finished sucessfully, process queue to see if there are any more
-	 URBs waiting before we call completion function.*/
-      if(crisv10_hcd->running) {
-	/* Only process queue if USB controller is running */
-	tc_dma_process_queue(epid);
-      } else {
-	tc_warn("No processing of queue for epid:%d, USB Controller not"
-		" running\n", epid);
-      }
-    }
-  }
-
-  /*  Hand the URB from HCD to its USB device driver, using its completion
-      functions */
-  usb_hcd_giveback_urb (hcd, urb, status);
-
-  /* Check the queue once more if the URB returned with error, because we
-     didn't do it before the completion function because the specification
-     states that the queue should not restart until all it's unlinked
-     URBs have been fully retired, with the completion functions run */
-  if(crisv10_hcd->running) {
-    /* Only process queue if USB controller is running */
-    tc_dma_process_queue(epid);
-  } else {
-    tc_warn("No processing of queue for epid:%d, USB Controller not running\n",
-	    epid);
-  }
-
-  DBFEXIT;
-}
-
-static void tc_finish_isoc_urb(struct usb_hcd *hcd, struct urb *urb,
-			       int status) {
-  struct crisv10_urb_priv *urb_priv = urb->hcpriv;
-  int epid, i;
-  volatile int timeout = 10000;
-  int bandwidth = 0;
-
-  ASSERT(urb_priv);
-  epid = urb_priv->epid;
-
-  ASSERT(usb_pipeisoc(urb->pipe));
-
-  /* Set that all isoc packets have status and length set before
-     completing the urb. */
-  for (i = urb_priv->isoc_packet_counter; i < urb->number_of_packets; i++){
-    urb->iso_frame_desc[i].actual_length = 0;
-    urb->iso_frame_desc[i].status = -EPROTO;
-  }
-
-  /* Check if the URB is currently active (done or error) */
-  if(urb == activeUrbList[epid]) {
-    /* Check if there are another In Isoc URB queued for this epid */
-    if (!list_empty(&urb_list[epid])&& !epid_state[epid].disabled) {
-      /* Move it from queue to active and mark it started so Isoc transfers
-	 won't be interrupted.
-	 All Isoc URBs data transfers are already added to DMA lists so we
-	 don't have to insert anything in DMA lists here. */
-      activeUrbList[epid] = urb_list_first(epid);
-      ((struct crisv10_urb_priv *)(activeUrbList[epid]->hcpriv))->urb_state =
-	STARTED;
-      urb_list_del(activeUrbList[epid], epid);
-
-      if(urb->status) {
-	errno_dbg("finish_isoc_urb (URB:0x%x[%d] %s %s) (%d of %d packets)"
-		  " status:%d, new waiting URB:0x%x[%d]\n",
-		  (unsigned int)urb, urb_priv->urb_num, str_dir(urb->pipe),
-		  str_type(urb->pipe), urb_priv->isoc_packet_counter,
-		  urb->number_of_packets, urb->status,
-		  (unsigned int)activeUrbList[epid],
-		  ((struct crisv10_urb_priv *)(activeUrbList[epid]->hcpriv))->urb_num);
-      }
-
-    } else { /* No other URB queued for this epid */
-      if(urb->status) {
-	errno_dbg("finish_isoc_urb (URB:0x%x[%d] %s %s) (%d of %d packets)"
-		  " status:%d, no new URB waiting\n",
-		  (unsigned int)urb, urb_priv->urb_num, str_dir(urb->pipe),
-		  str_type(urb->pipe), urb_priv->isoc_packet_counter,
-		  urb->number_of_packets, urb->status);
-      }
-
-      /* Check if EP is still enabled, then shut it down. */
-      if (TxIsocEPList[epid].command & IO_MASK(USB_EP_command, enable)) {
-	isoc_dbg("Isoc EP enabled for epid:%d, disabling it\n", epid);
-
-	/* Should only occur for In Isoc EPs where SB isn't consumed. */
-	ASSERT(usb_pipein(urb->pipe));
-
-	/* Disable it and wait for it to stop */
-	TxIsocEPList[epid].command &= ~IO_MASK(USB_EP_command, enable);
-	
-	/* Ah, the luxury of busy-wait. */
-	while((*R_DMA_CH8_SUB3_EP == virt_to_phys(&TxIsocEPList[epid])) &&
-	      (timeout-- > 0));
-      }
-
-      /* Unlink SB to say that epid is finished. */
-      TxIsocEPList[epid].sub = 0;
-      TxIsocEPList[epid].hw_len = 0;
-
-      /* No URB active for EP anymore */
-      activeUrbList[epid] = NULL;
-    }
-  } else { /* Finishing of not active URB (queued up with SBs thought) */
-    isoc_warn("finish_isoc_urb (URB:0x%x %s) (%d of %d packets) status:%d,"
-	      " SB queued but not active\n",
-	      (unsigned int)urb, str_dir(urb->pipe),
-	      urb_priv->isoc_packet_counter, urb->number_of_packets,
-	      urb->status);
-    if(usb_pipeout(urb->pipe)) {
-      /* Finishing of not yet active Out Isoc URB needs unlinking of SBs. */
-      struct USB_SB_Desc *iter_sb, *prev_sb, *next_sb;
-
-      iter_sb = TxIsocEPList[epid].sub ?
-	phys_to_virt(TxIsocEPList[epid].sub) : 0;
-      prev_sb = 0;
-
-      /* SB that is linked before this URBs first SB */
-      while (iter_sb && (iter_sb != urb_priv->first_sb)) {
-	prev_sb = iter_sb;
-	iter_sb = iter_sb->next ? phys_to_virt(iter_sb->next) : 0;
-      }
-
-      if (iter_sb == 0) {
-	/* Unlink of the URB currently being transmitted. */
-	prev_sb = 0;
-	iter_sb = TxIsocEPList[epid].sub ? phys_to_virt(TxIsocEPList[epid].sub) : 0;
-      }
-
-      while (iter_sb && (iter_sb != urb_priv->last_sb)) {
-	iter_sb = iter_sb->next ? phys_to_virt(iter_sb->next) : 0;
-      }
-
-      if (iter_sb) {
-	next_sb = iter_sb->next ? phys_to_virt(iter_sb->next) : 0;
-      } else {
-	/* This should only happen if the DMA has completed
-	   processing the SB list for this EP while interrupts
-	   are disabled. */
-	isoc_dbg("Isoc urb not found, already sent?\n");
-	next_sb = 0;
-      }
-      if (prev_sb) {
-	prev_sb->next = next_sb ? virt_to_phys(next_sb) : 0;
-      } else {
-	TxIsocEPList[epid].sub = next_sb ? virt_to_phys(next_sb) : 0;
-      }
-    }
-  }
-
-  /* Free HC-private URB data*/
-  bandwidth = urb_priv->bandwidth;
-  urb_priv_free(hcd, urb);
-
-  crisv10_usb_release_bandwidth(hcd, usb_pipeisoc(urb->pipe), bandwidth);
-
-  /*  Hand the URB from HCD to its USB device driver, using its completion
-      functions */
-  usb_hcd_giveback_urb (hcd, urb, status);
-}
-
-static __u32 urb_num = 0;
-
-/* allocate and initialize URB private data */
-static int urb_priv_create(struct usb_hcd *hcd, struct urb *urb, int epid,
-			   int mem_flags) {
-  struct crisv10_urb_priv *urb_priv;
-  
-  urb_priv = kmalloc(sizeof *urb_priv, mem_flags);
-  if (!urb_priv)
-    return -ENOMEM;
-  memset(urb_priv, 0, sizeof *urb_priv);
-
-  urb_priv->epid = epid;
-  urb_priv->urb_state = NOT_STARTED;
-
-  urb->hcpriv = urb_priv;
-  /* Assign URB a sequence number, and increment counter */
-  urb_priv->urb_num = urb_num;
-  urb_num++;
-  urb_priv->bandwidth = 0;
-  return 0;
-}
-
-/* free URB private data */
-static void urb_priv_free(struct usb_hcd *hcd, struct urb *urb) {
-  int i;
-  struct crisv10_urb_priv *urb_priv = urb->hcpriv;
-  ASSERT(urb_priv != 0);
-
-  /* Check it has any SBs linked that needs to be freed*/
-  if(urb_priv->first_sb != NULL) {
-    struct USB_SB_Desc *next_sb, *first_sb, *last_sb;
-    int i = 0;
-    first_sb = urb_priv->first_sb;
-    last_sb = urb_priv->last_sb;
-    ASSERT(last_sb);
-    while(first_sb != last_sb) {
-      next_sb = (struct USB_SB_Desc *)phys_to_virt(first_sb->next);
-      kmem_cache_free(usb_desc_cache, first_sb);
-      first_sb = next_sb;
-      i++;
-    }
-    kmem_cache_free(usb_desc_cache, last_sb);
-    i++;
-  }
-
-  /* Check if it has any EPs in its Intr pool that also needs to be freed */
-  if(urb_priv->intr_ep_pool_length > 0) {
-    for(i = 0; i < urb_priv->intr_ep_pool_length; i++) {
-      kfree(urb_priv->intr_ep_pool[i]);
-    }
-    /*
-    tc_dbg("Freed %d EPs from URB:0x%x EP pool\n",
-	     urb_priv->intr_ep_pool_length, (unsigned int)urb);
-    */
-  }
-
-  kfree(urb_priv);
-  urb->hcpriv = NULL;
-}
-
-static int ep_priv_create(struct usb_host_endpoint *ep, int mem_flags) {
-  struct crisv10_ep_priv *ep_priv;
-  
-  ep_priv = kmalloc(sizeof *ep_priv, mem_flags);
-  if (!ep_priv)
-    return -ENOMEM;
-  memset(ep_priv, 0, sizeof *ep_priv);
-
-  ep->hcpriv = ep_priv;
-  return 0;
-}
-
-static void ep_priv_free(struct usb_host_endpoint *ep) {
-  struct crisv10_ep_priv *ep_priv = ep->hcpriv;
-  ASSERT(ep_priv);
-  kfree(ep_priv);
-  ep->hcpriv = NULL;
-}
-
-/*
- * usb_check_bandwidth():
- *
- * old_alloc is from host_controller->bandwidth_allocated in microseconds;
- * bustime is from calc_bus_time(), but converted to microseconds.
- *
- * returns <bustime in us> if successful,
- * or -ENOSPC if bandwidth request fails.
- *
- * FIXME:
- * This initial implementation does not use Endpoint.bInterval
- * in managing bandwidth allocation.
- * It probably needs to be expanded to use Endpoint.bInterval.
- * This can be done as a later enhancement (correction).
- *
- * This will also probably require some kind of
- * frame allocation tracking...meaning, for example,
- * that if multiple drivers request interrupts every 10 USB frames,
- * they don't all have to be allocated at
- * frame numbers N, N+10, N+20, etc.  Some of them could be at
- * N+11, N+21, N+31, etc., and others at
- * N+12, N+22, N+32, etc.
- *
- * Similarly for isochronous transfers...
- *
- * Individual HCDs can schedule more directly ... this logic
- * is not correct for high speed transfers.
- */
-static int crisv10_usb_check_bandwidth(
-  struct usb_device *dev,
-  struct urb *urb)
-{
-  unsigned int	pipe = urb->pipe;
-  long					bustime;
-  int						is_in = usb_pipein (pipe);
-  int						is_iso = usb_pipeisoc (pipe);
-  int						old_alloc = dev->bus->bandwidth_allocated;
-  int						new_alloc;
-
-  bustime = NS_TO_US (usb_calc_bus_time (dev->speed, is_in, is_iso,
-                                         usb_maxpacket (dev, pipe, !is_in)));
-  if (is_iso)
-    bustime /= urb->number_of_packets;
-
-  new_alloc = old_alloc + (int) bustime;
-  if (new_alloc > FRAME_TIME_MAX_USECS_ALLOC) {
-    dev_dbg (&dev->dev, "usb_check_bandwidth FAILED: %d + %ld = %d usec\n",
-             old_alloc, bustime, new_alloc);
-    bustime = -ENOSPC;      /* report error */
-  }
-
-  return bustime;
-}
-
-/**
- * usb_claim_bandwidth - records bandwidth for a periodic transfer
- * @dev: source/target of request
- * @urb: request (urb->dev == dev)
- * @bustime: bandwidth consumed, in (average) microseconds per frame
- * @isoc: true iff the request is isochronous
- *
- * HCDs are expected not to overcommit periodic bandwidth, and to record such
- * reservations whenever endpoints are added to the periodic schedule.
- *
- * FIXME averaging per-frame is suboptimal.  Better to sum over the HCD's
- * entire periodic schedule ... 32 frames for OHCI, 1024 for UHCI, settable
- * for EHCI (256/512/1024 frames, default 1024) and have the bus expose how
- * large its periodic schedule is.
- */
-static void crisv10_usb_claim_bandwidth(
-  struct usb_device *dev,
-  struct urb *urb, int bustime, int isoc)
-{
-  dev->bus->bandwidth_allocated += bustime;
-  if (isoc)
-    dev->bus->bandwidth_isoc_reqs++;
-  else
-    dev->bus->bandwidth_int_reqs++;
-  struct crisv10_urb_priv *urb_priv;
-  urb_priv = urb->hcpriv;
-  urb_priv->bandwidth = bustime;
-}
-
-/**
- * usb_release_bandwidth - reverses effect of usb_claim_bandwidth()
- * @hcd: host controller
- * @isoc: true iff the request is isochronous
- * @bandwidth: bandwidth returned
- *
- * This records that previously allocated bandwidth has been released.
- * Bandwidth is released when endpoints are removed from the host controller's
- * periodic schedule.
- */
-static void crisv10_usb_release_bandwidth(
-  struct usb_hcd *hcd,
-  int isoc,
-  int bandwidth)
-{
-  hcd_to_bus(hcd)->bandwidth_allocated -= bandwidth;
-  if (isoc)
-    hcd_to_bus(hcd)->bandwidth_isoc_reqs--;
-  else
-    hcd_to_bus(hcd)->bandwidth_int_reqs--;
-}
-
-
-/* EPID handling functions, managing EP-list in Etrax through wrappers */
-/* ------------------------------------------------------------------- */
-
-/* Sets up a new EPID for an endpoint or returns existing if found */
-static int tc_setup_epid(struct usb_host_endpoint *ep, struct urb *urb,
-			 int mem_flags) {
-  int epid;
-  char devnum, endpoint, out_traffic, slow;
-  int maxlen;
-  __u32 epid_data;
-  struct crisv10_ep_priv *ep_priv = ep->hcpriv;
-  
-  DBFENTER;
-  
-  /* Check if a valid epid already is setup for this endpoint */
-  if(ep_priv != NULL) {
-    return ep_priv->epid;
-  }
-
-  /* We must find and initiate a new epid for this urb. */
-  epid = tc_allocate_epid();
-  
-  if (epid == -1) {
-    /* Failed to allocate a new epid. */
-    DBFEXIT;
-    return epid;
-  }
-  
-  /* We now have a new epid to use. Claim it. */
-  epid_state[epid].inuse = 1;
-  
-  /* Init private data for new endpoint */
-  if(ep_priv_create(ep, mem_flags) != 0) {
-    return -ENOMEM;
-  }
-  ep_priv = ep->hcpriv;
-  ep_priv->epid = epid;
-
-  devnum = usb_pipedevice(urb->pipe);
-  endpoint = usb_pipeendpoint(urb->pipe);
-  slow = (urb->dev->speed == USB_SPEED_LOW);
-  maxlen = usb_maxpacket(urb->dev, urb->pipe, usb_pipeout(urb->pipe));
-
-  if (usb_pipetype(urb->pipe) == PIPE_CONTROL) {
-    /* We want both IN and OUT control traffic to be put on the same
-       EP/SB list. */
-    out_traffic = 1;
-  } else {
-    out_traffic = usb_pipeout(urb->pipe);
-  }
-    
-  if (usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS) {
-    epid_data = IO_STATE(R_USB_EPT_DATA_ISO, valid, yes) |
-      /* FIXME: Change any to the actual port? */
-      IO_STATE(R_USB_EPT_DATA_ISO, port, any) |
-      IO_FIELD(R_USB_EPT_DATA_ISO, max_len, maxlen) |
-      IO_FIELD(R_USB_EPT_DATA_ISO, ep, endpoint) |
-      IO_FIELD(R_USB_EPT_DATA_ISO, dev, devnum);
-    etrax_epid_iso_set(epid, epid_data);
-  } else {
-    epid_data = IO_STATE(R_USB_EPT_DATA, valid, yes) |
-      IO_FIELD(R_USB_EPT_DATA, low_speed, slow) |
-      /* FIXME: Change any to the actual port? */
-      IO_STATE(R_USB_EPT_DATA, port, any) |
-      IO_FIELD(R_USB_EPT_DATA, max_len, maxlen) |
-      IO_FIELD(R_USB_EPT_DATA, ep, endpoint) |
-      IO_FIELD(R_USB_EPT_DATA, dev, devnum);
-    etrax_epid_set(epid, epid_data);
-  }
-  
-  epid_state[epid].out_traffic = out_traffic;
-  epid_state[epid].type = usb_pipetype(urb->pipe);
-
-  tc_warn("Setting up ep:0x%x epid:%d (addr:%d endp:%d max_len:%d %s %s %s)\n",
-	  (unsigned int)ep, epid, devnum, endpoint, maxlen,
-	  str_type(urb->pipe), out_traffic ? "out" : "in",
-	  slow ? "low" : "full");
-
-  /* Enable Isoc eof interrupt if we set up the first Isoc epid */
-  if(usb_pipeisoc(urb->pipe)) {
-    isoc_epid_counter++;
-    if(isoc_epid_counter == 1) {
-      isoc_warn("Enabled Isoc eof interrupt\n");
-      *R_USB_IRQ_MASK_SET = IO_STATE(R_USB_IRQ_MASK_SET, iso_eof, set);
-    }
-  }
-
-  DBFEXIT;
-  return epid;
-}
-
-static void tc_free_epid(struct usb_host_endpoint *ep) {
-  unsigned long flags;
-  struct crisv10_ep_priv *ep_priv = ep->hcpriv;
-  int epid;
-  volatile int timeout = 10000;
-
-  DBFENTER;
-
-  if (ep_priv == NULL) {
-    tc_warn("Trying to free unused epid on ep:0x%x\n", (unsigned int)ep);
-    DBFEXIT;
-    return;
-  }
-
-  epid = ep_priv->epid;
-
-  /* Disable Isoc eof interrupt if we free the last Isoc epid */
-  if(epid_isoc(epid)) {
-    ASSERT(isoc_epid_counter > 0);
-    isoc_epid_counter--;
-    if(isoc_epid_counter == 0) {
-      *R_USB_IRQ_MASK_CLR = IO_STATE(R_USB_IRQ_MASK_CLR, iso_eof, clr);
-      isoc_warn("Disabled Isoc eof interrupt\n");
-    }
-  }
-
-  /* Take lock manualy instead of in epid_x_x wrappers,
-     because we need to be polling here */
-  spin_lock_irqsave(&etrax_epid_lock, flags);
-  
-  *R_USB_EPT_INDEX = IO_FIELD(R_USB_EPT_INDEX, value, epid);
-  nop();
-  while((*R_USB_EPT_DATA & IO_MASK(R_USB_EPT_DATA, hold)) &&
-	(timeout-- > 0));
-  /* This will, among other things, set the valid field to 0. */
-  *R_USB_EPT_DATA = 0;
-  spin_unlock_irqrestore(&etrax_epid_lock, flags);
-  
-  /* Free resource in software state info list */
-  epid_state[epid].inuse = 0;
-
-  /* Free private endpoint data */
-  ep_priv_free(ep);
-  
-  DBFEXIT;
-}
-
-static int tc_allocate_epid(void) {
-  int i;
-  DBFENTER;
-  for (i = 0; i < NBR_OF_EPIDS; i++) {
-    if (!epid_inuse(i)) {
-      DBFEXIT;
-      return i;
-    }
-  }
-  
-  tc_warn("Found no free epids\n");
-  DBFEXIT;
-  return -1;
-}
-
-
-/* Wrappers around the list functions (include/linux/list.h). */
-/* ---------------------------------------------------------- */
-static inline int __urb_list_empty(int epid) {
-  int retval;
-  retval = list_empty(&urb_list[epid]);
-  return retval;
-}
-
-/* Returns first urb for this epid, or NULL if list is empty. */
-static inline struct urb *urb_list_first(int epid) {
-  unsigned long flags;
-  struct urb *first_urb = 0;
-  spin_lock_irqsave(&urb_list_lock, flags);
-  if (!__urb_list_empty(epid)) {
-    /* Get the first urb (i.e. head->next). */
-    urb_entry_t *urb_entry = list_entry((&urb_list[epid])->next, urb_entry_t, list);
-    first_urb = urb_entry->urb;
-  }
-  spin_unlock_irqrestore(&urb_list_lock, flags);
-  return first_urb;
-}
-
-/* Adds an urb_entry last in the list for this epid. */
-static inline void urb_list_add(struct urb *urb, int epid, int mem_flags) {
-  unsigned long flags;
-  urb_entry_t *urb_entry = (urb_entry_t *)kmalloc(sizeof(urb_entry_t), mem_flags);
-  ASSERT(urb_entry);
-  
-  urb_entry->urb = urb;
-  spin_lock_irqsave(&urb_list_lock, flags);
-  list_add_tail(&urb_entry->list, &urb_list[epid]);
-  spin_unlock_irqrestore(&urb_list_lock, flags);
-}
-
-/* Search through the list for an element that contains this urb. (The list
-   is expected to be short and the one we are about to delete will often be
-   the first in the list.)
-   Should be protected by spin_locks in calling function */
-static inline urb_entry_t *__urb_list_entry(struct urb *urb, int epid) {
-  struct list_head *entry;
-  struct list_head *tmp;
-  urb_entry_t *urb_entry;
-  
-  list_for_each_safe(entry, tmp, &urb_list[epid]) {
-    urb_entry = list_entry(entry, urb_entry_t, list);
-    ASSERT(urb_entry);
-    ASSERT(urb_entry->urb);
-    
-    if (urb_entry->urb == urb) {
-      return urb_entry;
-    }
-  }
-  return 0;
-}
-
-/* Same function as above but for global use. Protects list by spinlock */
-static inline urb_entry_t *urb_list_entry(struct urb *urb, int epid) {
-  unsigned long flags;
-  urb_entry_t *urb_entry;
-  spin_lock_irqsave(&urb_list_lock, flags);
-  urb_entry = __urb_list_entry(urb, epid);
-  spin_unlock_irqrestore(&urb_list_lock, flags);
-  return (urb_entry);
-}
-
-/* Delete an urb from the list. */
-static inline void urb_list_del(struct urb *urb, int epid) {
-  unsigned long flags;
-  urb_entry_t *urb_entry;
-
-  /* Delete entry and free. */
-  spin_lock_irqsave(&urb_list_lock, flags);
-  urb_entry = __urb_list_entry(urb, epid);
-  ASSERT(urb_entry);
-
-  list_del(&urb_entry->list);
-  spin_unlock_irqrestore(&urb_list_lock, flags);
-  kfree(urb_entry);
-}
-
-/* Move an urb to the end of the list. */
-static inline void urb_list_move_last(struct urb *urb, int epid) {
-  unsigned long flags;
-  urb_entry_t *urb_entry;
-  
-  spin_lock_irqsave(&urb_list_lock, flags);
-  urb_entry = __urb_list_entry(urb, epid);
-  ASSERT(urb_entry);
-
-  list_del(&urb_entry->list);
-  list_add_tail(&urb_entry->list, &urb_list[epid]);
-  spin_unlock_irqrestore(&urb_list_lock, flags);
-}
-
-/* Get the next urb in the list. */
-static inline struct urb *urb_list_next(struct urb *urb, int epid) {
-  unsigned long flags;
-  urb_entry_t *urb_entry;
-
-  spin_lock_irqsave(&urb_list_lock, flags);
-  urb_entry = __urb_list_entry(urb, epid);
-  ASSERT(urb_entry);
-
-  if (urb_entry->list.next != &urb_list[epid]) {
-    struct list_head *elem = urb_entry->list.next;
-    urb_entry = list_entry(elem, urb_entry_t, list);
-    spin_unlock_irqrestore(&urb_list_lock, flags);
-    return urb_entry->urb;
-  } else {
-    spin_unlock_irqrestore(&urb_list_lock, flags);
-    return NULL;
-  }
-}
-
-struct USB_EP_Desc* create_ep(int epid, struct USB_SB_Desc* sb_desc,
-			      int mem_flags) {
-  struct USB_EP_Desc *ep_desc;
-  ep_desc = (struct USB_EP_Desc *) kmem_cache_alloc(usb_desc_cache, mem_flags);
-  if(ep_desc == NULL)
-    return NULL;
-  memset(ep_desc, 0, sizeof(struct USB_EP_Desc));
-
-  ep_desc->hw_len = 0;
-  ep_desc->command = (IO_FIELD(USB_EP_command, epid, epid) |
-		      IO_STATE(USB_EP_command, enable, yes));
-  if(sb_desc == NULL) {
-    ep_desc->sub = 0;
-  } else {
-    ep_desc->sub = virt_to_phys(sb_desc);
-  }
-  return ep_desc;
-}
-
-#define TT_ZOUT  0
-#define TT_IN    1
-#define TT_OUT   2
-#define TT_SETUP 3
-
-#define CMD_EOL  IO_STATE(USB_SB_command, eol, yes)
-#define CMD_INTR IO_STATE(USB_SB_command, intr, yes)
-#define CMD_FULL IO_STATE(USB_SB_command, full, yes)
-
-/* Allocation and setup of a generic SB. Used to create SETUP, OUT and ZOUT
-   SBs. Also used by create_sb_in() to avoid same allocation procedure at two
-   places */
-struct USB_SB_Desc* create_sb(struct USB_SB_Desc* sb_prev, int tt, void* data,
-			      int datalen, int mem_flags) {
-  struct USB_SB_Desc *sb_desc;
-  sb_desc = (struct USB_SB_Desc*)kmem_cache_alloc(usb_desc_cache, mem_flags);
-  if(sb_desc == NULL)
-    return NULL;
-  memset(sb_desc, 0, sizeof(struct USB_SB_Desc));
-
-  sb_desc->command = IO_FIELD(USB_SB_command, tt, tt) |
-                     IO_STATE(USB_SB_command, eot, yes);
-
-  sb_desc->sw_len = datalen;
-  if(data != NULL) {
-    sb_desc->buf = virt_to_phys(data);
-  } else {
-    sb_desc->buf = 0;
-  }
-  if(sb_prev != NULL) {
-    sb_prev->next = virt_to_phys(sb_desc);
-  }
-  return sb_desc;
-}
-
-/* Creates a copy of an existing SB by allocation space for it and copy
-   settings */
-struct USB_SB_Desc* create_sb_copy(struct USB_SB_Desc* sb_orig, int mem_flags) {
-  struct USB_SB_Desc *sb_desc;
-  sb_desc = (struct USB_SB_Desc*)kmem_cache_alloc(usb_desc_cache, mem_flags);
-  if(sb_desc == NULL)
-    return NULL;
-
-  memcpy(sb_desc, sb_orig, sizeof(struct USB_SB_Desc));
-  return sb_desc;
-}
-
-/* A specific create_sb function for creation of in SBs. This is due to
-   that datalen in In SBs shows how many packets we are expecting. It also
-   sets up the rem field to show if how many bytes we expect in last packet
-   if it's not a full one */
-struct USB_SB_Desc* create_sb_in(struct USB_SB_Desc* sb_prev, int datalen,
-				 int maxlen, int mem_flags) {
-  struct USB_SB_Desc *sb_desc;
-  sb_desc = create_sb(sb_prev, TT_IN, NULL,
-		      datalen ? (datalen - 1) / maxlen + 1 : 0, mem_flags);
-  if(sb_desc == NULL)
-    return NULL;
-  sb_desc->command |= IO_FIELD(USB_SB_command, rem, datalen % maxlen);
-  return sb_desc;
-}
-
-void set_sb_cmds(struct USB_SB_Desc *sb_desc, __u16 flags) {
-  sb_desc->command |= flags;
-}
-
-int create_sb_for_urb(struct urb *urb, int mem_flags) {
-  int is_out = !usb_pipein(urb->pipe);
-  int type = usb_pipetype(urb->pipe);
-  int maxlen = usb_maxpacket(urb->dev, urb->pipe, is_out);
-  int buf_len = urb->transfer_buffer_length;
-  void *buf = buf_len > 0 ? urb->transfer_buffer : NULL;
-  struct USB_SB_Desc *sb_desc = NULL;
-
-  struct crisv10_urb_priv *urb_priv = (struct crisv10_urb_priv *)urb->hcpriv;
-  ASSERT(urb_priv != NULL);
-
-  switch(type) {
-  case PIPE_CONTROL:
-    /* Setup stage */
-    sb_desc = create_sb(NULL, TT_SETUP, urb->setup_packet, 8, mem_flags);
-    if(sb_desc == NULL)
-      return -ENOMEM;
-    set_sb_cmds(sb_desc, CMD_FULL);
-
-    /* Attach first SB to URB */
-    urb_priv->first_sb = sb_desc;    
-
-    if (is_out) { /* Out Control URB */
-      /* If this Control OUT transfer has an optional data stage we add
-	 an OUT token before the mandatory IN (status) token */
-      if ((buf_len > 0) && buf) {
-	sb_desc = create_sb(sb_desc, TT_OUT, buf, buf_len, mem_flags);
-	if(sb_desc == NULL)
-	  return -ENOMEM;
-	set_sb_cmds(sb_desc, CMD_FULL);
-      }
-
-      /* Status stage */
-      /* The data length has to be exactly 1. This is due to a requirement
-         of the USB specification that a host must be prepared to receive
-         data in the status phase */
-      sb_desc = create_sb(sb_desc, TT_IN, NULL, 1, mem_flags);
-      if(sb_desc == NULL)
-	return -ENOMEM;
-    } else { /* In control URB */
-      /* Data stage */
-      sb_desc = create_sb_in(sb_desc, buf_len, maxlen, mem_flags);
-      if(sb_desc == NULL)
-	return -ENOMEM;
-
-      /* Status stage */
-      /* Read comment at zout_buffer declaration for an explanation to this. */
-      sb_desc = create_sb(sb_desc, TT_ZOUT, &zout_buffer[0], 1, mem_flags);
-      if(sb_desc == NULL)
-	return -ENOMEM;
-      /* Set descriptor interrupt flag for in URBs so we can finish URB after
-         zout-packet has been sent */
-      set_sb_cmds(sb_desc, CMD_INTR | CMD_FULL);
-    }
-    /* Set end-of-list flag in last SB */
-    set_sb_cmds(sb_desc, CMD_EOL);
-    /* Attach last SB to URB */
-    urb_priv->last_sb = sb_desc;
-    break;
-
-  case PIPE_BULK:
-    if (is_out) { /* Out Bulk URB */
-      sb_desc = create_sb(NULL, TT_OUT, buf, buf_len, mem_flags);
-      if(sb_desc == NULL)
-	return -ENOMEM;
-      /* The full field is set to yes, even if we don't actually check that
-	 this is a full-length transfer (i.e., that transfer_buffer_length %
-	 maxlen = 0).
-	 Setting full prevents the USB controller from sending an empty packet
-	 in that case.  However, if URB_ZERO_PACKET was set we want that. */
-      if (!(urb->transfer_flags & URB_ZERO_PACKET)) {
-	set_sb_cmds(sb_desc, CMD_FULL);
-      }
-    } else { /* In Bulk URB */
-      sb_desc = create_sb_in(NULL, buf_len, maxlen, mem_flags);
-      if(sb_desc == NULL)
-	return -ENOMEM;
-    }
-    /* Set end-of-list flag for last SB */
-    set_sb_cmds(sb_desc, CMD_EOL);
-
-    /* Attach SB to URB */
-    urb_priv->first_sb = sb_desc;
-    urb_priv->last_sb = sb_desc;
-    break;
-
-  case PIPE_INTERRUPT:
-    if(is_out) { /* Out Intr URB */
-      sb_desc = create_sb(NULL, TT_OUT, buf, buf_len, mem_flags);
-      if(sb_desc == NULL)
-	return -ENOMEM;
-
-      /* The full field is set to yes, even if we don't actually check that
-	 this is a full-length transfer (i.e., that transfer_buffer_length %
-	 maxlen = 0).
-	 Setting full prevents the USB controller from sending an empty packet
-	 in that case.  However, if URB_ZERO_PACKET was set we want that. */
-      if (!(urb->transfer_flags & URB_ZERO_PACKET)) {
-	set_sb_cmds(sb_desc, CMD_FULL);
-      }
-      /* Only generate TX interrupt if it's a Out URB*/
-      set_sb_cmds(sb_desc, CMD_INTR);
-
-    } else { /* In Intr URB */
-      sb_desc = create_sb_in(NULL, buf_len, maxlen, mem_flags);
-      if(sb_desc == NULL)
-	return -ENOMEM;
-    }
-    /* Set end-of-list flag for last SB */
-    set_sb_cmds(sb_desc, CMD_EOL);
-
-    /* Attach SB to URB */
-    urb_priv->first_sb = sb_desc;
-    urb_priv->last_sb = sb_desc;
-
-    break;
-  case PIPE_ISOCHRONOUS:
-    if(is_out) { /* Out Isoc URB */
-      int i;
-      if(urb->number_of_packets == 0) {
-	tc_err("Can't create SBs for Isoc URB with zero packets\n");
-	return -EPIPE;
-      }
-      /* Create one SB descriptor for each packet and link them together. */
-      for(i = 0; i < urb->number_of_packets; i++) {
-	if (urb->iso_frame_desc[i].length > 0) {
-
-	  sb_desc = create_sb(sb_desc, TT_OUT, urb->transfer_buffer +
-			      urb->iso_frame_desc[i].offset,
-			      urb->iso_frame_desc[i].length, mem_flags);
-	  if(sb_desc == NULL)
-	    return -ENOMEM;
-
-	  /* Check if it's a full length packet */
-	  if (urb->iso_frame_desc[i].length ==
-	      usb_maxpacket(urb->dev, urb->pipe, usb_pipeout(urb->pipe))) {
-	    set_sb_cmds(sb_desc, CMD_FULL);
-	  }
-	  
-	} else { /* zero length packet */
-	  sb_desc = create_sb(sb_desc, TT_ZOUT, &zout_buffer[0], 1, mem_flags);
-	  if(sb_desc == NULL)
-	    return -ENOMEM;
-	  set_sb_cmds(sb_desc, CMD_FULL);
-	}
-	/* Attach first SB descriptor to URB */
-	if (i == 0) {
-	  urb_priv->first_sb = sb_desc;
-	}
-      }
-      /* Set interrupt and end-of-list flags in last SB */
-      set_sb_cmds(sb_desc, CMD_INTR | CMD_EOL);
-      /* Attach last SB descriptor to URB */
-      urb_priv->last_sb = sb_desc;
-      tc_dbg("Created %d out SBs for Isoc URB:0x%x\n",
-	       urb->number_of_packets, (unsigned int)urb);
-    } else { /* In Isoc URB */
-      /* Actual number of packets is not relevant for periodic in traffic as
-	 long as it is more than zero.  Set to 1 always. */
-      sb_desc = create_sb(sb_desc, TT_IN, NULL, 1, mem_flags);
-      if(sb_desc == NULL)
-	return -ENOMEM;
-      /* Set end-of-list flags for SB */
-      set_sb_cmds(sb_desc, CMD_EOL);
-
-      /* Attach SB to URB */
-      urb_priv->first_sb = sb_desc;
-      urb_priv->last_sb = sb_desc;
-    }
-    break;
-  default:
-    tc_err("Unknown pipe-type\n");
-    return -EPIPE;
-    break;
-  }
-  return 0;
-}
-
-int init_intr_urb(struct urb *urb, int mem_flags) {
-  struct crisv10_urb_priv *urb_priv = (struct crisv10_urb_priv *)urb->hcpriv;
-  struct USB_EP_Desc* ep_desc;
-  int interval;
-  int i;
-  int ep_count;
-
-  ASSERT(urb_priv != NULL);
-  ASSERT(usb_pipeint(urb->pipe));
-  /* We can't support interval longer than amount of eof descriptors in
-     TxIntrEPList */
-  if(urb->interval > MAX_INTR_INTERVAL) {
-    tc_err("Interrupt interval %dms too big (max: %dms)\n", urb->interval,
-	   MAX_INTR_INTERVAL);
-    return -EINVAL;
-  }
-
-  /* We assume that the SB descriptors already have been setup */
-  ASSERT(urb_priv->first_sb != NULL);
-
-  /* Round of the interval to 2^n, it is obvious that this code favours
-     smaller numbers, but that is actually a good thing */
-  /* FIXME: The "rounding error" for larger intervals will be quite
-     large. For in traffic this shouldn't be a problem since it will only
-     mean that we "poll" more often. */
-  interval = urb->interval;
-  for (i = 0; interval; i++) {
-    interval = interval >> 1;
-  }
-  urb_priv->interval = 1 << (i - 1);
-
-  /* We can only have max interval for Out Interrupt due to that we can only
-     handle one linked in EP for a certain epid in the Intr descr array at the
-     time. The USB Controller in the Etrax 100LX continues to process Intr EPs
-     so we have no way of knowing which one that caused the actual transfer if
-     we have several linked in. */
-  if(usb_pipeout(urb->pipe)) {
-    urb_priv->interval = MAX_INTR_INTERVAL;
-  }
-
-  /* Calculate amount of EPs needed */
-  ep_count = MAX_INTR_INTERVAL / urb_priv->interval;
-
-  for(i = 0; i < ep_count; i++) {
-    ep_desc = create_ep(urb_priv->epid, urb_priv->first_sb, mem_flags);
-    if(ep_desc == NULL) {
-      /* Free any descriptors that we may have allocated before failure */
-      while(i > 0) {
-	i--;
-	kfree(urb_priv->intr_ep_pool[i]);
-      }
-      return -ENOMEM;
-    }
-    urb_priv->intr_ep_pool[i] = ep_desc;
-  }
-  urb_priv->intr_ep_pool_length = ep_count;
-  return 0;
-}
-
-/* DMA RX/TX functions */
-/* ----------------------- */
-
-static void tc_dma_init_rx_list(void) {
-  int i;
-
-  /* Setup descriptor list except last one */
-  for (i = 0; i < (NBR_OF_RX_DESC - 1); i++) {
-    RxDescList[i].sw_len = RX_DESC_BUF_SIZE;
-    RxDescList[i].command = 0;
-    RxDescList[i].next = virt_to_phys(&RxDescList[i + 1]);
-    RxDescList[i].buf = virt_to_phys(RxBuf + (i * RX_DESC_BUF_SIZE));
-    RxDescList[i].hw_len = 0;
-    RxDescList[i].status = 0;
-    
-    /* DMA IN cache bug. (struct etrax_dma_descr has the same layout as
-       USB_IN_Desc for the relevant fields.) */
-    prepare_rx_descriptor((struct etrax_dma_descr*)&RxDescList[i]);
-    
-  }
-  /* Special handling of last descriptor */
-  RxDescList[i].sw_len = RX_DESC_BUF_SIZE;
-  RxDescList[i].command = IO_STATE(USB_IN_command, eol, yes);
-  RxDescList[i].next = virt_to_phys(&RxDescList[0]);
-  RxDescList[i].buf = virt_to_phys(RxBuf + (i * RX_DESC_BUF_SIZE));
-  RxDescList[i].hw_len = 0;
-  RxDescList[i].status = 0;
-  
-  /* Setup list pointers that show progress in list */
-  myNextRxDesc = &RxDescList[0];
-  myLastRxDesc = &RxDescList[NBR_OF_RX_DESC - 1];
-  
-  flush_etrax_cache();
-  /* Point DMA to first descriptor in list and start it */
-  *R_DMA_CH9_FIRST = virt_to_phys(myNextRxDesc);
-  *R_DMA_CH9_CMD = IO_STATE(R_DMA_CH9_CMD, cmd, start);
-}
-
-
-static void tc_dma_init_tx_bulk_list(void) {
-  int i;
-  volatile struct USB_EP_Desc *epDescr;
-
-  for (i = 0; i < (NBR_OF_EPIDS - 1); i++) {
-    epDescr = &(TxBulkEPList[i]);
-    CHECK_ALIGN(epDescr);
-    epDescr->hw_len = 0;
-    epDescr->command = IO_FIELD(USB_EP_command, epid, i);
-    epDescr->sub = 0;
-    epDescr->next = virt_to_phys(&TxBulkEPList[i + 1]);
-
-    /* Initiate two EPs, disabled and with the eol flag set. No need for any
-       preserved epid. */
-    
-    /* The first one has the intr flag set so we get an interrupt when the DMA
-       channel is about to become disabled. */
-    CHECK_ALIGN(&TxBulkDummyEPList[i][0]);
-    TxBulkDummyEPList[i][0].hw_len = 0;
-    TxBulkDummyEPList[i][0].command = (IO_FIELD(USB_EP_command, epid, DUMMY_EPID) |
-				       IO_STATE(USB_EP_command, eol, yes) |
-				       IO_STATE(USB_EP_command, intr, yes));
-    TxBulkDummyEPList[i][0].sub = 0;
-    TxBulkDummyEPList[i][0].next = virt_to_phys(&TxBulkDummyEPList[i][1]);
-    
-    /* The second one. */
-    CHECK_ALIGN(&TxBulkDummyEPList[i][1]);
-    TxBulkDummyEPList[i][1].hw_len = 0;
-    TxBulkDummyEPList[i][1].command = (IO_FIELD(USB_EP_command, epid, DUMMY_EPID) |
-				       IO_STATE(USB_EP_command, eol, yes));
-    TxBulkDummyEPList[i][1].sub = 0;
-    /* The last dummy's next pointer is the same as the current EP's next pointer. */
-    TxBulkDummyEPList[i][1].next = virt_to_phys(&TxBulkEPList[i + 1]);
-  }
-
-  /* Special handling of last descr in list, make list circular */
-  epDescr = &TxBulkEPList[i];
-  CHECK_ALIGN(epDescr);
-  epDescr->hw_len = 0;
-  epDescr->command = IO_STATE(USB_EP_command, eol, yes) |
-    IO_FIELD(USB_EP_command, epid, i);
-  epDescr->sub = 0;
-  epDescr->next = virt_to_phys(&TxBulkEPList[0]);
-  
-  /* Init DMA sub-channel pointers to last item in each list */
-  *R_DMA_CH8_SUB0_EP = virt_to_phys(&TxBulkEPList[i]);
-  /* No point in starting the bulk channel yet.
-   *R_DMA_CH8_SUB0_CMD = IO_STATE(R_DMA_CH8_SUB0_CMD, cmd, start); */
-}
-
-static void tc_dma_init_tx_ctrl_list(void) {
-  int i;
-  volatile struct USB_EP_Desc *epDescr;
-
-  for (i = 0; i < (NBR_OF_EPIDS - 1); i++) {
-    epDescr = &(TxCtrlEPList[i]);
-    CHECK_ALIGN(epDescr);
-    epDescr->hw_len = 0;
-    epDescr->command = IO_FIELD(USB_EP_command, epid, i);
-    epDescr->sub = 0;
-    epDescr->next = virt_to_phys(&TxCtrlEPList[i + 1]);
-  }
-  /* Special handling of last descr in list, make list circular */
-  epDescr = &TxCtrlEPList[i];
-  CHECK_ALIGN(epDescr);
-  epDescr->hw_len = 0;
-  epDescr->command = IO_STATE(USB_EP_command, eol, yes) |
-    IO_FIELD(USB_EP_command, epid, i);
-  epDescr->sub = 0;
-  epDescr->next = virt_to_phys(&TxCtrlEPList[0]);
-  
-  /* Init DMA sub-channel pointers to last item in each list */
-  *R_DMA_CH8_SUB1_EP = virt_to_phys(&TxCtrlEPList[i]);
-  /* No point in starting the ctrl channel yet.
-   *R_DMA_CH8_SUB1_CMD = IO_STATE(R_DMA_CH8_SUB0_CMD, cmd, start); */
-}
-
-
-static void tc_dma_init_tx_intr_list(void) {
-  int i;
-
-  TxIntrSB_zout.sw_len = 1;
-  TxIntrSB_zout.next = 0;
-  TxIntrSB_zout.buf = virt_to_phys(&zout_buffer[0]);
-  TxIntrSB_zout.command = (IO_FIELD(USB_SB_command, rem, 0) |
-			   IO_STATE(USB_SB_command, tt, zout) |
-			   IO_STATE(USB_SB_command, full, yes) |
-			   IO_STATE(USB_SB_command, eot, yes) |
-			   IO_STATE(USB_SB_command, eol, yes));
-  
-  for (i = 0; i < (MAX_INTR_INTERVAL - 1); i++) {
-    CHECK_ALIGN(&TxIntrEPList[i]);
-    TxIntrEPList[i].hw_len = 0;
-    TxIntrEPList[i].command =
-      (IO_STATE(USB_EP_command, eof, yes) |
-       IO_STATE(USB_EP_command, enable, yes) |
-       IO_FIELD(USB_EP_command, epid, INVALID_EPID));
-    TxIntrEPList[i].sub = virt_to_phys(&TxIntrSB_zout);
-    TxIntrEPList[i].next = virt_to_phys(&TxIntrEPList[i + 1]);
-  }
-
-  /* Special handling of last descr in list, make list circular */
-  CHECK_ALIGN(&TxIntrEPList[i]);
-  TxIntrEPList[i].hw_len = 0;
-  TxIntrEPList[i].command =
-    (IO_STATE(USB_EP_command, eof, yes) |
-     IO_STATE(USB_EP_command, eol, yes) |
-     IO_STATE(USB_EP_command, enable, yes) |
-     IO_FIELD(USB_EP_command, epid, INVALID_EPID));
-  TxIntrEPList[i].sub = virt_to_phys(&TxIntrSB_zout);
-  TxIntrEPList[i].next = virt_to_phys(&TxIntrEPList[0]);
-
-  intr_dbg("Initiated Intr EP descriptor list\n");
-
-
-  /* Connect DMA 8 sub-channel 2 to first in list */
-  *R_DMA_CH8_SUB2_EP = virt_to_phys(&TxIntrEPList[0]);
-}
-
-static void tc_dma_init_tx_isoc_list(void) {
-  int i;
-
-  DBFENTER;
-
-  /* Read comment at zout_buffer declaration for an explanation to this. */
-  TxIsocSB_zout.sw_len = 1;
-  TxIsocSB_zout.next = 0;
-  TxIsocSB_zout.buf = virt_to_phys(&zout_buffer[0]);
-  TxIsocSB_zout.command = (IO_FIELD(USB_SB_command, rem, 0) |
-			   IO_STATE(USB_SB_command, tt, zout) |
-			   IO_STATE(USB_SB_command, full, yes) |
-			   IO_STATE(USB_SB_command, eot, yes) |
-			   IO_STATE(USB_SB_command, eol, yes));
-
-  /* The last isochronous EP descriptor is a dummy. */
-  for (i = 0; i < (NBR_OF_EPIDS - 1); i++) {
-    CHECK_ALIGN(&TxIsocEPList[i]);
-    TxIsocEPList[i].hw_len = 0;
-    TxIsocEPList[i].command = IO_FIELD(USB_EP_command, epid, i);
-    TxIsocEPList[i].sub = 0;
-    TxIsocEPList[i].next = virt_to_phys(&TxIsocEPList[i + 1]);
-  }
-
-  CHECK_ALIGN(&TxIsocEPList[i]);
-  TxIsocEPList[i].hw_len = 0;
-
-  /* Must enable the last EP descr to get eof interrupt. */
-  TxIsocEPList[i].command = (IO_STATE(USB_EP_command, enable, yes) |
-			     IO_STATE(USB_EP_command, eof, yes) |
-			     IO_STATE(USB_EP_command, eol, yes) |
-			     IO_FIELD(USB_EP_command, epid, INVALID_EPID));
-  TxIsocEPList[i].sub = virt_to_phys(&TxIsocSB_zout);
-  TxIsocEPList[i].next = virt_to_phys(&TxIsocEPList[0]);
-
-  *R_DMA_CH8_SUB3_EP = virt_to_phys(&TxIsocEPList[0]);
-  *R_DMA_CH8_SUB3_CMD = IO_STATE(R_DMA_CH8_SUB3_CMD, cmd, start);
-}
-
-static int tc_dma_init(struct usb_hcd *hcd) {
-  tc_dma_init_rx_list();
-  tc_dma_init_tx_bulk_list();
-  tc_dma_init_tx_ctrl_list();
-  tc_dma_init_tx_intr_list();
-  tc_dma_init_tx_isoc_list();
-
-  if (cris_request_dma(USB_TX_DMA_NBR,
-		       "ETRAX 100LX built-in USB (Tx)",
-		       DMA_VERBOSE_ON_ERROR,
-		       dma_usb)) {
-    err("Could not allocate DMA ch 8 for USB");
-    return -EBUSY;
-  }
- 	
-  if (cris_request_dma(USB_RX_DMA_NBR,
-		       "ETRAX 100LX built-in USB (Rx)",
-		       DMA_VERBOSE_ON_ERROR,
-		       dma_usb)) {
-    err("Could not allocate DMA ch 9 for USB");
-    return -EBUSY;
-  }
-
-  *R_IRQ_MASK2_SET =
-    /* Note that these interrupts are not used. */
-    IO_STATE(R_IRQ_MASK2_SET, dma8_sub0_descr, set) |
-    /* Sub channel 1 (ctrl) descr. interrupts are used. */
-    IO_STATE(R_IRQ_MASK2_SET, dma8_sub1_descr, set) |
-    IO_STATE(R_IRQ_MASK2_SET, dma8_sub2_descr, set) |
-    /* Sub channel 3 (isoc) descr. interrupts are used. */
-    IO_STATE(R_IRQ_MASK2_SET, dma8_sub3_descr, set);
-  
-  /* Note that the dma9_descr interrupt is not used. */
-  *R_IRQ_MASK2_SET =
-    IO_STATE(R_IRQ_MASK2_SET, dma9_eop, set) |
-    IO_STATE(R_IRQ_MASK2_SET, dma9_descr, set);
-
-  if (request_irq(ETRAX_USB_RX_IRQ, tc_dma_rx_interrupt, 0,
-		  "ETRAX 100LX built-in USB (Rx)", hcd)) {
-    err("Could not allocate IRQ %d for USB", ETRAX_USB_RX_IRQ);
-    return -EBUSY;
-  }
-  
-  if (request_irq(ETRAX_USB_TX_IRQ, tc_dma_tx_interrupt, 0,
-		  "ETRAX 100LX built-in USB (Tx)", hcd)) {
-    err("Could not allocate IRQ %d for USB", ETRAX_USB_TX_IRQ);
-    return -EBUSY;
-  }
-
-  return 0;
-}
-
-static void tc_dma_destroy(void) {
-  free_irq(ETRAX_USB_RX_IRQ, NULL);
-  free_irq(ETRAX_USB_TX_IRQ, NULL);
-
-  cris_free_dma(USB_TX_DMA_NBR, "ETRAX 100LX built-in USB (Tx)");
-  cris_free_dma(USB_RX_DMA_NBR, "ETRAX 100LX built-in USB (Rx)");
-
-}
-
-static void tc_dma_link_intr_urb(struct urb *urb);
-
-/* Handle processing of Bulk, Ctrl and Intr queues */
-static void tc_dma_process_queue(int epid) {
-  struct urb *urb;
-  struct crisv10_urb_priv *urb_priv;
-  unsigned long flags;
-  char toggle;
-
-  if(epid_state[epid].disabled) {
-    /* Don't process any URBs on a disabled endpoint */
-    return;
-  }
-
-  /* Do not disturb us while fiddling with EPs and epids */
-  local_irq_save(flags);
-
-  /* For bulk, Ctrl and Intr can we only have one URB active at a time for
-     a specific EP. */
-  if(activeUrbList[epid] != NULL) {
-    /* An URB is already active on EP, skip checking queue */
-    local_irq_restore(flags);
-    return;
-  }
-
-  urb = urb_list_first(epid);
-  if(urb == NULL) {
-    /* No URB waiting in EP queue. Nothing do to */
-    local_irq_restore(flags);
-    return;
-  }
-
-  urb_priv = urb->hcpriv;
-  ASSERT(urb_priv != NULL);
-  ASSERT(urb_priv->urb_state == NOT_STARTED);
-  ASSERT(!usb_pipeisoc(urb->pipe));
-
-  /* Remove this URB from the queue and move it to active */
-  activeUrbList[epid] = urb;
-  urb_list_del(urb, epid);
-
-  urb_priv->urb_state = STARTED;
-
-  /* Reset error counters (regardless of which direction this traffic is). */
-  etrax_epid_clear_error(epid);
-
-  /* Special handling of Intr EP lists */
-  if(usb_pipeint(urb->pipe)) {
-    tc_dma_link_intr_urb(urb);
-    local_irq_restore(flags);
-    return;
-  }
-
-  /* Software must preset the toggle bits for Bulk and Ctrl */
-  if(usb_pipecontrol(urb->pipe)) {
-    /* Toggle bits are initialized only during setup transaction in a
-       CTRL transfer */
-    etrax_epid_set_toggle(epid, 0, 0);
-    etrax_epid_set_toggle(epid, 1, 0);
-  } else {
-    toggle = usb_gettoggle(urb->dev, usb_pipeendpoint(urb->pipe),
-			   usb_pipeout(urb->pipe));
-    etrax_epid_set_toggle(epid, usb_pipeout(urb->pipe), toggle);
-  }
-
-  tc_dbg("Added SBs from (URB:0x%x %s %s) to epid %d: %s\n",
-	 (unsigned int)urb, str_dir(urb->pipe), str_type(urb->pipe), epid,
-	 sblist_to_str(urb_priv->first_sb));
-
-  /* We start the DMA sub channel without checking if it's running or not,
-     because:
-     1) If it's already running, issuing the start command is a nop.
-     2) We avoid a test-and-set race condition. */
-  switch(usb_pipetype(urb->pipe)) {
-  case PIPE_BULK:
-    /* Assert that the EP descriptor is disabled. */
-    ASSERT(!(TxBulkEPList[epid].command & IO_MASK(USB_EP_command, enable)));
-
-    /* Set up and enable the EP descriptor. */
-    TxBulkEPList[epid].sub = virt_to_phys(urb_priv->first_sb);
-    TxBulkEPList[epid].hw_len = 0;
-    TxBulkEPList[epid].command |= IO_STATE(USB_EP_command, enable, yes);
-
-    /* Check if the dummy list is already with us (if several urbs were queued). */
-    if (usb_pipein(urb->pipe) && (TxBulkEPList[epid].next != virt_to_phys(&TxBulkDummyEPList[epid][0]))) {
-      tc_dbg("Inviting dummy list to the party for urb 0x%lx, epid %d", 
-	     (unsigned long)urb, epid);
-      
-      /* We don't need to check if the DMA is at this EP or not before changing the
-	 next pointer, since we will do it in one 32-bit write (EP descriptors are
-	 32-bit aligned). */
-      TxBulkEPList[epid].next = virt_to_phys(&TxBulkDummyEPList[epid][0]);
-    }
-
-    restart_dma8_sub0();
-
-    /* Update/restart the bulk start timer since we just started the channel.*/
-    mod_timer(&bulk_start_timer, jiffies + BULK_START_TIMER_INTERVAL);
-    /* Update/restart the bulk eot timer since we just inserted traffic. */
-    mod_timer(&bulk_eot_timer, jiffies + BULK_EOT_TIMER_INTERVAL);
-    break;
-  case PIPE_CONTROL:
-    /* Assert that the EP descriptor is disabled. */
-    ASSERT(!(TxCtrlEPList[epid].command & IO_MASK(USB_EP_command, enable)));
-
-    /* Set up and enable the EP descriptor. */
-    TxCtrlEPList[epid].sub = virt_to_phys(urb_priv->first_sb);
-    TxCtrlEPList[epid].hw_len = 0;
-    TxCtrlEPList[epid].command |= IO_STATE(USB_EP_command, enable, yes);
-
-    *R_DMA_CH8_SUB1_CMD = IO_STATE(R_DMA_CH8_SUB1_CMD, cmd, start);
-    break;
-  }
-  local_irq_restore(flags);
-}
-
-static void tc_dma_link_intr_urb(struct urb *urb) {
-  struct crisv10_urb_priv *urb_priv = urb->hcpriv;
-  volatile struct USB_EP_Desc *tmp_ep;
-  struct USB_EP_Desc *ep_desc;
-  int i = 0, epid;
-  int pool_idx = 0;
-
-  ASSERT(urb_priv != NULL);
-  epid = urb_priv->epid;
-  ASSERT(urb_priv->interval > 0);
-  ASSERT(urb_priv->intr_ep_pool_length > 0);
-
-  tmp_ep = &TxIntrEPList[0];
-
-  /* Only insert one EP descriptor in list for Out Intr URBs.
-     We can only handle Out Intr with interval of 128ms because
-     it's not possible to insert several Out Intr EPs because they
-     are not consumed by the DMA. */
-  if(usb_pipeout(urb->pipe)) {
-    ep_desc = urb_priv->intr_ep_pool[0];
-    ASSERT(ep_desc);
-    ep_desc->next = tmp_ep->next;
-    tmp_ep->next = virt_to_phys(ep_desc);
-    i++;
-  } else {
-    /* Loop through Intr EP descriptor list and insert EP for URB at
-       specified interval */
-    do {
-      /* Each EP descriptor with eof flag sat signals a new frame */
-      if (tmp_ep->command & IO_MASK(USB_EP_command, eof)) {
-	/* Insert a EP from URBs EP pool at correct interval */
-	if ((i % urb_priv->interval) == 0) {
-	  ep_desc = urb_priv->intr_ep_pool[pool_idx];
-	  ASSERT(ep_desc);
-	  ep_desc->next = tmp_ep->next;
-	  tmp_ep->next = virt_to_phys(ep_desc);
-	  pool_idx++;
-	  ASSERT(pool_idx <= urb_priv->intr_ep_pool_length);
-	}
-	i++;
-      }
-      tmp_ep = (struct USB_EP_Desc *)phys_to_virt(tmp_ep->next);
-    } while(tmp_ep != &TxIntrEPList[0]);
-  }
-
-  intr_dbg("Added SBs to intr epid %d: %s interval:%d (%d EP)\n", epid,
-	   sblist_to_str(urb_priv->first_sb), urb_priv->interval, pool_idx);
-
-  /* We start the DMA sub channel without checking if it's running or not,
-     because:
-     1) If it's already running, issuing the start command is a nop.
-     2) We avoid a test-and-set race condition. */
-  *R_DMA_CH8_SUB2_CMD = IO_STATE(R_DMA_CH8_SUB2_CMD, cmd, start);
-}
-
-static void tc_dma_process_isoc_urb(struct urb *urb) {
-  unsigned long flags;
-  struct crisv10_urb_priv *urb_priv = urb->hcpriv;
-  int epid;
-
-  /* Do not disturb us while fiddling with EPs and epids */
-  local_irq_save(flags);
-
-  ASSERT(urb_priv);
-  ASSERT(urb_priv->first_sb);
-  epid = urb_priv->epid;
-
-  if(activeUrbList[epid] == NULL) {
-    /* EP is idle, so make this URB active */
-    activeUrbList[epid] = urb;
-    urb_list_del(urb, epid);
-    ASSERT(TxIsocEPList[epid].sub == 0);
-    ASSERT(!(TxIsocEPList[epid].command &
-	     IO_STATE(USB_EP_command, enable, yes)));
-
-    /* Differentiate between In and Out Isoc. Because In SBs are not consumed*/
-    if(usb_pipein(urb->pipe)) {
-    /* Each EP for In Isoc will have only one SB descriptor, setup when
-       submitting the first active urb. We do it here by copying from URBs
-       pre-allocated SB. */
-      memcpy((void *)&(TxIsocSBList[epid]), urb_priv->first_sb,
-	     sizeof(TxIsocSBList[epid]));
-      TxIsocEPList[epid].hw_len = 0;
-      TxIsocEPList[epid].sub = virt_to_phys(&(TxIsocSBList[epid]));
-    } else {
-      /* For Out Isoc we attach the pre-allocated list of SBs for the URB */
-      TxIsocEPList[epid].hw_len = 0;
-      TxIsocEPList[epid].sub = virt_to_phys(urb_priv->first_sb);
-
-      isoc_dbg("Attached first URB:0x%x[%d] to epid:%d first_sb:0x%x"
-	       " last_sb::0x%x\n",
-	       (unsigned int)urb, urb_priv->urb_num, epid,
-	       (unsigned int)(urb_priv->first_sb),
-	       (unsigned int)(urb_priv->last_sb));
-    }
-
-    if (urb->transfer_flags & URB_ISO_ASAP) {
-      /* The isoc transfer should be started as soon as possible. The
-	 start_frame field is a return value if URB_ISO_ASAP was set. Comparing
-	 R_USB_FM_NUMBER with a USB Chief trace shows that the first isoc IN
-	 token is sent 2 frames later. I'm not sure how this affects usage of
-	 the start_frame field by the device driver, or how it affects things
-	 when USB_ISO_ASAP is not set, so therefore there's no compensation for
-	 the 2 frame "lag" here. */
-      urb->start_frame = (*R_USB_FM_NUMBER & 0x7ff);
-      TxIsocEPList[epid].command |= IO_STATE(USB_EP_command, enable, yes);
-      urb_priv->urb_state = STARTED;
-      isoc_dbg("URB_ISO_ASAP set, urb->start_frame set to %d\n",
-	       urb->start_frame);
-    } else {
-      /* Not started yet. */
-      urb_priv->urb_state = NOT_STARTED;
-      isoc_warn("urb_priv->urb_state set to NOT_STARTED for URB:0x%x\n",
-		(unsigned int)urb);
-    }
-
-  } else {
-    /* An URB is already active on the EP. Leave URB in queue and let
-       finish_isoc_urb process it after current active URB */
-    ASSERT(TxIsocEPList[epid].sub != 0);
-
-    if(usb_pipein(urb->pipe)) {
-      /* Because there already is a active In URB on this epid we do nothing
-         and the finish_isoc_urb() function will handle switching to next URB*/
-
-    } else { /* For Out Isoc, insert new URBs traffic last in SB-list. */
-      struct USB_SB_Desc *temp_sb_desc;
-
-      /* Set state STARTED to all Out Isoc URBs added to SB list because we
-         don't know how many of them that are finished before descr interrupt*/
-      urb_priv->urb_state = STARTED;
-
-      /* Find end of current SB list by looking for SB with eol flag sat */
-      temp_sb_desc = phys_to_virt(TxIsocEPList[epid].sub);
-      while ((temp_sb_desc->command & IO_MASK(USB_SB_command, eol)) !=
-	     IO_STATE(USB_SB_command, eol, yes)) {
-	ASSERT(temp_sb_desc->next);
-	temp_sb_desc = phys_to_virt(temp_sb_desc->next);
-      }
-
-      isoc_dbg("Appended URB:0x%x[%d] (first:0x%x last:0x%x) to epid:%d"
-	       " sub:0x%x eol:0x%x\n",
-	       (unsigned int)urb, urb_priv->urb_num,
-	       (unsigned int)(urb_priv->first_sb),
-	       (unsigned int)(urb_priv->last_sb), epid,
-	       (unsigned int)phys_to_virt(TxIsocEPList[epid].sub),
-	       (unsigned int)temp_sb_desc);
-
-      /* Next pointer must be set before eol is removed. */
-      temp_sb_desc->next = virt_to_phys(urb_priv->first_sb);
-      /* Clear the previous end of list flag since there is a new in the
-	 added SB descriptor list. */
-      temp_sb_desc->command &= ~IO_MASK(USB_SB_command, eol);
-
-      if (!(TxIsocEPList[epid].command & IO_MASK(USB_EP_command, enable))) {
-	__u32 epid_data;
-	/* 8.8.5 in Designer's Reference says we should check for and correct
-	   any errors in the EP here.  That should not be necessary if
-	   epid_attn is handled correctly, so we assume all is ok. */
-	epid_data = etrax_epid_iso_get(epid);
-	if (IO_EXTRACT(R_USB_EPT_DATA, error_code, epid_data) !=
-	    IO_STATE_VALUE(R_USB_EPT_DATA, error_code, no_error)) {
-	  isoc_err("Disabled Isoc EP with error:%d on epid:%d when appending"
-		   " URB:0x%x[%d]\n",
-		   IO_EXTRACT(R_USB_EPT_DATA, error_code, epid_data), epid,
-		   (unsigned int)urb, urb_priv->urb_num);
-	}
-
-	/* The SB list was exhausted. */
-	if (virt_to_phys(urb_priv->last_sb) != TxIsocEPList[epid].sub) {
-	  /* The new sublist did not get processed before the EP was
-	     disabled.  Setup the EP again. */
-
-	  if(virt_to_phys(temp_sb_desc) == TxIsocEPList[epid].sub) {
-	    isoc_dbg("EP for epid:%d stoped at SB:0x%x before newly inserted"
-		     ", restarting from this URBs SB:0x%x\n",
-		     epid, (unsigned int)temp_sb_desc,
-		     (unsigned int)(urb_priv->first_sb));
-	    TxIsocEPList[epid].hw_len = 0;
-	    TxIsocEPList[epid].sub = virt_to_phys(urb_priv->first_sb);
-	    urb->start_frame = (*R_USB_FM_NUMBER & 0x7ff);
-	    /* Enable the EP again so data gets processed this time */
-	    TxIsocEPList[epid].command |=
-	      IO_STATE(USB_EP_command, enable, yes);
-
-	  } else {
-	    /* The EP has been disabled but not at end this URB (god knows
-	       where). This should generate an epid_attn so we should not be
-	       here */
-	    isoc_warn("EP was disabled on sb:0x%x before SB list for"
-		     " URB:0x%x[%d] got processed\n",
-		     (unsigned int)phys_to_virt(TxIsocEPList[epid].sub),
-		     (unsigned int)urb, urb_priv->urb_num);
-	  }
-	} else {
-	  /* This might happend if we are slow on this function and isn't
-	     an error. */
-	  isoc_dbg("EP was disabled and finished with SBs from appended"
-		   " URB:0x%x[%d]\n", (unsigned int)urb, urb_priv->urb_num);
-	}
-      }
-    }
-  }
-  
-  /* Start the DMA sub channel */
-  *R_DMA_CH8_SUB3_CMD = IO_STATE(R_DMA_CH8_SUB3_CMD, cmd, start);
-
-  local_irq_restore(flags);
-}
-
-static void tc_dma_unlink_intr_urb(struct urb *urb) {
-  struct crisv10_urb_priv *urb_priv = urb->hcpriv;
-  volatile struct USB_EP_Desc *first_ep;  /* First EP in the list. */
-  volatile struct USB_EP_Desc *curr_ep;   /* Current EP, the iterator. */
-  volatile struct USB_EP_Desc *next_ep;   /* The EP after current. */
-  volatile struct USB_EP_Desc *unlink_ep; /* The one we should remove from
-					     the list. */
-  int count = 0;
-  volatile int timeout = 10000;
-  int epid;
-
-  /* Read 8.8.4 in Designer's Reference, "Removing an EP Descriptor from the
-     List". */
-  ASSERT(urb_priv);
-  ASSERT(urb_priv->intr_ep_pool_length > 0);
-  epid = urb_priv->epid;
-
-  /* First disable all Intr EPs belonging to epid for this URB */
-  first_ep = &TxIntrEPList[0];
-  curr_ep = first_ep;
-  do {
-    next_ep = (struct USB_EP_Desc *)phys_to_virt(curr_ep->next);
-    if (IO_EXTRACT(USB_EP_command, epid, next_ep->command) == epid) {
-      /* Disable EP */
-      next_ep->command &= ~IO_MASK(USB_EP_command, enable);
-    }
-    curr_ep = phys_to_virt(curr_ep->next);
-  } while (curr_ep != first_ep);
-
-
-  /* Now unlink all EPs belonging to this epid from Descr list */
-  first_ep = &TxIntrEPList[0];
-  curr_ep = first_ep;
-  do {
-    next_ep = (struct USB_EP_Desc *)phys_to_virt(curr_ep->next);
-    if (IO_EXTRACT(USB_EP_command, epid, next_ep->command) == epid) {
-      /* This is the one we should unlink. */
-      unlink_ep = next_ep;
-
-      /* Actually unlink the EP from the DMA list. */
-      curr_ep->next = unlink_ep->next;
-
-      /* Wait until the DMA is no longer at this descriptor. */
-      while((*R_DMA_CH8_SUB2_EP == virt_to_phys(unlink_ep)) &&
-	    (timeout-- > 0));
-
-      count++;
-    }
-    curr_ep = phys_to_virt(curr_ep->next);
-  } while (curr_ep != first_ep);
-
-  if(count != urb_priv->intr_ep_pool_length) {
-    intr_warn("Unlinked %d of %d Intr EPs for URB:0x%x[%d]\n", count,
-	      urb_priv->intr_ep_pool_length, (unsigned int)urb,
-	      urb_priv->urb_num);
-  } else {
-    intr_dbg("Unlinked %d of %d interrupt EPs for URB:0x%x\n", count,
-	     urb_priv->intr_ep_pool_length, (unsigned int)urb);
-  }
-}
-
-static void check_finished_bulk_tx_epids(struct usb_hcd *hcd,
-						    int timer) {
-  unsigned long flags;
-  int epid;
-  struct urb *urb;
-  struct crisv10_urb_priv * urb_priv;
-  __u32 epid_data;
-
-  /* Protect TxEPList */
-  local_irq_save(flags);
-
-  for (epid = 0; epid < NBR_OF_EPIDS; epid++) {
-    /* A finished EP descriptor is disabled and has a valid sub pointer */
-    if (!(TxBulkEPList[epid].command & IO_MASK(USB_EP_command, enable)) &&
-	(TxBulkEPList[epid].sub != 0)) {
-
-      /* Get the active URB for this epid */
-      urb = activeUrbList[epid];
-      /* Sanity checks */
-      ASSERT(urb);
-      urb_priv = (struct crisv10_urb_priv *)urb->hcpriv;
-      ASSERT(urb_priv);
-      
-      /* Only handle finished out Bulk EPs here,
-	 and let RX interrupt take care of the rest */
-      if(!epid_out_traffic(epid)) {
-	continue;
-      }
-
-      if(timer) {
-	tc_warn("Found finished %s Bulk epid:%d URB:0x%x[%d] from timeout\n",
-		epid_out_traffic(epid) ? "Out" : "In", epid, (unsigned int)urb,
-		urb_priv->urb_num);
-      } else {
-	tc_dbg("Found finished %s Bulk epid:%d URB:0x%x[%d] from interrupt\n",
-	       epid_out_traffic(epid) ? "Out" : "In", epid, (unsigned int)urb,
-	       urb_priv->urb_num);
-      }
-
-      if(urb_priv->urb_state == UNLINK) {
-	/* This Bulk URB is requested to be unlinked, that means that the EP
-	   has been disabled and we might not have sent all data */
-	tc_finish_urb(hcd, urb, urb->status);
-	continue;
-      }
-
-      ASSERT(urb_priv->urb_state == STARTED);
-      if (phys_to_virt(TxBulkEPList[epid].sub) != urb_priv->last_sb) {
-	tc_err("Endpoint got disabled before reaching last sb\n");
-      }
-	
-      epid_data = etrax_epid_get(epid);
-      if (IO_EXTRACT(R_USB_EPT_DATA, error_code, epid_data) ==
-	  IO_STATE_VALUE(R_USB_EPT_DATA, error_code, no_error)) {
-	/* This means that the endpoint has no error, is disabled
-	   and had inserted traffic, i.e. transfer successfully completed. */
-	tc_finish_urb(hcd, urb, 0);
-      } else {
-	/* Shouldn't happen. We expect errors to be caught by epid
-	   attention. */
-	tc_err("Found disabled bulk EP desc (epid:%d error:%d)\n",
-	       epid, IO_EXTRACT(R_USB_EPT_DATA, error_code, epid_data));
-      }
-    } else {
-      tc_dbg("Ignoring In Bulk epid:%d, let RX interrupt handle it\n", epid);
-    }
-  }
-
-  local_irq_restore(flags);
-}
-
-static void check_finished_ctrl_tx_epids(struct usb_hcd *hcd) {
-  unsigned long flags;
-  int epid;
-  struct urb *urb;
-  struct crisv10_urb_priv * urb_priv;
-  __u32 epid_data;
-
-  /* Protect TxEPList */
-  local_irq_save(flags);
-
-  for (epid = 0; epid < NBR_OF_EPIDS; epid++) {
-    if(epid == DUMMY_EPID)
-      continue;
-
-    /* A finished EP descriptor is disabled and has a valid sub pointer */
-    if (!(TxCtrlEPList[epid].command & IO_MASK(USB_EP_command, enable)) &&
-	(TxCtrlEPList[epid].sub != 0)) {
-      
-      /* Get the active URB for this epid */
-      urb = activeUrbList[epid];
-
-      if(urb == NULL) {
-	tc_warn("Found finished Ctrl epid:%d with no active URB\n", epid);
-	continue;
-      }
-      
-      /* Sanity checks */
-      ASSERT(usb_pipein(urb->pipe));
-      urb_priv = (struct crisv10_urb_priv *)urb->hcpriv;
-      ASSERT(urb_priv);
-      if (phys_to_virt(TxCtrlEPList[epid].sub) != urb_priv->last_sb) {
-	tc_err("Endpoint got disabled before reaching last sb\n");
-      }
-
-      epid_data = etrax_epid_get(epid);
-      if (IO_EXTRACT(R_USB_EPT_DATA, error_code, epid_data) ==
-	  IO_STATE_VALUE(R_USB_EPT_DATA, error_code, no_error)) {
-	/* This means that the endpoint has no error, is disabled
-	   and had inserted traffic, i.e. transfer successfully completed. */
-
-	/* Check if RX-interrupt for In Ctrl has been processed before
-	   finishing the URB */
-	if(urb_priv->ctrl_rx_done) {
-	  tc_dbg("Finishing In Ctrl URB:0x%x[%d] in tx_interrupt\n",
-		 (unsigned int)urb, urb_priv->urb_num);
-	  tc_finish_urb(hcd, urb, 0);
-	} else {
-	  /* If we get zout descriptor interrupt before RX was done for a
-	     In Ctrl transfer, then we flag that and it will be finished
-	     in the RX-Interrupt */
-	  urb_priv->ctrl_zout_done = 1;
-	  tc_dbg("Got zout descr interrupt before RX interrupt\n");
-	}
-      } else {
-	/* Shouldn't happen. We expect errors to be caught by epid
-	   attention. */
-	tc_err("Found disabled Ctrl EP desc (epid:%d URB:0x%x[%d]) error_code:%d\n", epid, (unsigned int)urb, urb_priv->urb_num, IO_EXTRACT(R_USB_EPT_DATA, error_code, epid_data));
-	__dump_ep_desc(&(TxCtrlEPList[epid]));
-	__dump_ept_data(epid);
-      }      
-    }
-  }
-  local_irq_restore(flags);
-}
-
-/* This function goes through all epids that are setup for Out Isoc transfers
-   and marks (isoc_out_done) all queued URBs that the DMA has finished
-   transfer for.
-   No URB completetion is done here to make interrupt routine return quickly.
-   URBs are completed later with help of complete_isoc_bottom_half() that
-   becomes schedules when this functions is finished. */
-static void check_finished_isoc_tx_epids(void) {
-  unsigned long flags;
-  int epid;
-  struct urb *urb;
-  struct crisv10_urb_priv * urb_priv;
-  struct USB_SB_Desc* sb_desc;
-  int epid_done;
-
-  /* Protect TxIsocEPList */
-  local_irq_save(flags);
-
-  for (epid = 0; epid < NBR_OF_EPIDS; epid++) {
-    if (TxIsocEPList[epid].sub == 0 || epid == INVALID_EPID ||
-	!epid_out_traffic(epid)) {
-      /* Nothing here to see. */
-      continue;
-    }
-    ASSERT(epid_inuse(epid));
-    ASSERT(epid_isoc(epid));
-
-    sb_desc = phys_to_virt(TxIsocEPList[epid].sub);
-    /* Find the last descriptor of the currently active URB for this ep.
-       This is the first descriptor in the sub list marked for a descriptor
-       interrupt. */
-    while (sb_desc && !IO_EXTRACT(USB_SB_command, intr, sb_desc->command)) {
-      sb_desc = sb_desc->next ? phys_to_virt(sb_desc->next) : 0;
-    }
-    ASSERT(sb_desc);
-
-    isoc_dbg("Descr IRQ checking epid:%d sub:0x%x intr:0x%x\n",
-	     epid, (unsigned int)phys_to_virt(TxIsocEPList[epid].sub),
-	     (unsigned int)sb_desc);
-
-    urb = activeUrbList[epid];
-    if(urb == NULL) {
-      isoc_err("Isoc Descr irq on epid:%d with no active URB\n", epid);
-      continue;
-    }
-
-    epid_done = 0;
-    while(urb && !epid_done) {
-      /* Sanity check. */
-      ASSERT(usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS);
-      ASSERT(usb_pipeout(urb->pipe));
-      
-      urb_priv = (struct crisv10_urb_priv *)urb->hcpriv;
-      ASSERT(urb_priv);
-      ASSERT(urb_priv->urb_state == STARTED ||
-	     urb_priv->urb_state == UNLINK);
-      
-      if (sb_desc != urb_priv->last_sb) {
-	/* This urb has been sent. */
-	urb_priv->isoc_out_done = 1;
-
-      } else { /* Found URB that has last_sb as the interrupt reason */
-
-	/* Check if EP has been disabled, meaning that all transfers are done*/
-	if(!(TxIsocEPList[epid].command & IO_MASK(USB_EP_command, enable))) {
-	  ASSERT((sb_desc->command & IO_MASK(USB_SB_command, eol)) ==
-		 IO_STATE(USB_SB_command, eol, yes));
-	  ASSERT(sb_desc->next == 0);
-	  urb_priv->isoc_out_done = 1;
-	} else {
-	  isoc_dbg("Skipping URB:0x%x[%d] because EP not disabled yet\n",
-		   (unsigned int)urb, urb_priv->urb_num);
-	}
-	/* Stop looking any further in queue */
-	epid_done = 1;	
-      }
-
-      if (!epid_done) {
-	if(urb == activeUrbList[epid]) {
-	  urb = urb_list_first(epid);
-	} else {
-	  urb = urb_list_next(urb, epid);
-	}
-      }
-    } /* END: while(urb && !epid_done) */
-  }
-
-  local_irq_restore(flags);
-}
-
-
-/* This is where the Out Isoc URBs are realy completed. This function is
-   scheduled from tc_dma_tx_interrupt() when one or more Out Isoc transfers
-   are done. This functions completes all URBs earlier marked with
-   isoc_out_done by fast interrupt routine check_finished_isoc_tx_epids() */
-
-static void complete_isoc_bottom_half(struct work_struct* work) {
-  struct crisv10_isoc_complete_data *comp_data;
-  struct usb_iso_packet_descriptor *packet;
-  struct crisv10_urb_priv * urb_priv;
-  unsigned long flags;
-  struct urb* urb;
-  int epid_done;
-  int epid;
-  int i;
-
-  comp_data = container_of(work, struct crisv10_isoc_complete_data, usb_bh);
-
-  local_irq_save(flags);
-
-  for (epid = 0; epid < NBR_OF_EPIDS - 1; epid++) {
-    if(!epid_inuse(epid) || !epid_isoc(epid) || !epid_out_traffic(epid) || epid == DUMMY_EPID) {
-      /* Only check valid Out Isoc epids */
-      continue;
-    }
-
-    isoc_dbg("Isoc bottom-half checking epid:%d, sub:0x%x\n", epid,
-	     (unsigned int)phys_to_virt(TxIsocEPList[epid].sub));
-
-    /* The descriptor interrupt handler has marked all transmitted Out Isoc
-       URBs with isoc_out_done.  Now we traverse all epids and for all that
-       have out Isoc traffic we traverse its URB list and complete the
-       transmitted URBs. */
-    epid_done = 0;
-    while (!epid_done) {
-
-      /* Get the active urb (if any) */
-      urb = activeUrbList[epid];
-      if (urb == 0) {
-	isoc_dbg("No active URB on epid:%d anymore\n", epid);
-	epid_done = 1;
-	continue;
-      }
-
-      /* Sanity check. */
-      ASSERT(usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS);
-      ASSERT(usb_pipeout(urb->pipe));
-
-      urb_priv = (struct crisv10_urb_priv *)urb->hcpriv;
-      ASSERT(urb_priv);
-
-      if (!(urb_priv->isoc_out_done)) {
-	/* We have reached URB that isn't flaged done yet, stop traversing. */
-	isoc_dbg("Stoped traversing Out Isoc URBs on epid:%d"
-		 " before not yet flaged URB:0x%x[%d]\n",
-		 epid, (unsigned int)urb, urb_priv->urb_num);
-	epid_done = 1;
-	continue;
-      }
-
-      /* This urb has been sent. */
-      isoc_dbg("Found URB:0x%x[%d] that is flaged isoc_out_done\n",
-	       (unsigned int)urb, urb_priv->urb_num);
-
-      /* Set ok on transfered packets for this URB and finish it */
-      for (i = 0; i < urb->number_of_packets; i++) {
-	packet = &urb->iso_frame_desc[i];
-	packet->status = 0;
-	packet->actual_length = packet->length;
-      }
-      urb_priv->isoc_packet_counter = urb->number_of_packets;
-      tc_finish_urb(comp_data->hcd, urb, 0);
-
-    } /* END: while(!epid_done) */
-  } /* END: for(epid...) */
-
-  local_irq_restore(flags);
-  kmem_cache_free(isoc_compl_cache, comp_data);
-}
-
-
-static void check_finished_intr_tx_epids(struct usb_hcd *hcd) {
-  unsigned long flags;
-  int epid;
-  struct urb *urb;
-  struct crisv10_urb_priv * urb_priv;
-  volatile struct USB_EP_Desc *curr_ep;   /* Current EP, the iterator. */
-  volatile struct USB_EP_Desc *next_ep;   /* The EP after current. */
-
-  /* Protect TxintrEPList */
-  local_irq_save(flags);
-
-  for (epid = 0; epid < NBR_OF_EPIDS; epid++) {
-    if(!epid_inuse(epid) || !epid_intr(epid) || !epid_out_traffic(epid)) {
-      /* Nothing to see on this epid. Only check valid Out Intr epids */
-      continue;
-    }
-
-    urb = activeUrbList[epid];
-    if(urb == 0) {
-      intr_warn("Found Out Intr epid:%d with no active URB\n", epid);
-      continue;
-    }
-
-    /* Sanity check. */
-    ASSERT(usb_pipetype(urb->pipe) == PIPE_INTERRUPT);
-    ASSERT(usb_pipeout(urb->pipe));
-    
-    urb_priv = (struct crisv10_urb_priv *)urb->hcpriv;
-    ASSERT(urb_priv);
-
-    /* Go through EPs between first and second sof-EP. It's here Out Intr EPs
-       are inserted.*/
-    curr_ep = &TxIntrEPList[0];
-    do {
-      next_ep = (struct USB_EP_Desc *)phys_to_virt(curr_ep->next);
-      if(next_ep == urb_priv->intr_ep_pool[0]) {
-	/* We found the Out Intr EP for this epid */
-	
-	/* Disable it so it doesn't get processed again */
-	next_ep->command &= ~IO_MASK(USB_EP_command, enable);
-
-	/* Finish the active Out Intr URB with status OK */
-	tc_finish_urb(hcd, urb, 0);
-      }
-      curr_ep = phys_to_virt(curr_ep->next);
-    } while (curr_ep != &TxIntrEPList[1]);
-
-  }
-  local_irq_restore(flags);
-}
-
-/* Interrupt handler for DMA8/IRQ24 with subchannels (called from hardware intr) */
-static irqreturn_t tc_dma_tx_interrupt(int irq, void *vhc) {
-  struct usb_hcd *hcd = (struct usb_hcd*)vhc;
-  ASSERT(hcd);
-
-  if (*R_IRQ_READ2 & IO_MASK(R_IRQ_READ2, dma8_sub0_descr)) {
-    /* Clear this interrupt */
-    *R_DMA_CH8_SUB0_CLR_INTR = IO_STATE(R_DMA_CH8_SUB0_CLR_INTR, clr_descr, do);
-    restart_dma8_sub0();
-  }
-
-  if (*R_IRQ_READ2 & IO_MASK(R_IRQ_READ2, dma8_sub1_descr)) {
-    /* Clear this interrupt */
-    *R_DMA_CH8_SUB1_CLR_INTR = IO_STATE(R_DMA_CH8_SUB1_CLR_INTR, clr_descr, do);
-    check_finished_ctrl_tx_epids(hcd);
-  }
-
-  if (*R_IRQ_READ2 & IO_MASK(R_IRQ_READ2, dma8_sub2_descr)) {
-    /* Clear this interrupt */
-    *R_DMA_CH8_SUB2_CLR_INTR = IO_STATE(R_DMA_CH8_SUB2_CLR_INTR, clr_descr, do);
-    check_finished_intr_tx_epids(hcd);
-  }
-
-  if (*R_IRQ_READ2 & IO_MASK(R_IRQ_READ2, dma8_sub3_descr)) {
-    struct crisv10_isoc_complete_data* comp_data;
-
-    /* Flag done Out Isoc for later completion */
-    check_finished_isoc_tx_epids();
-
-    /* Clear this interrupt */
-    *R_DMA_CH8_SUB3_CLR_INTR = IO_STATE(R_DMA_CH8_SUB3_CLR_INTR, clr_descr, do);
-    /* Schedule bottom half of Out Isoc completion function. This function
-       finishes the URBs marked with isoc_out_done */
-    comp_data = (struct crisv10_isoc_complete_data*)
-      kmem_cache_alloc(isoc_compl_cache, GFP_ATOMIC);
-    ASSERT(comp_data != NULL);
-    comp_data ->hcd = hcd;
-
-    INIT_WORK(&comp_data->usb_bh, complete_isoc_bottom_half);
-    schedule_work(&comp_data->usb_bh);
-  }
-
-  return IRQ_HANDLED;
-}
-
-/* Interrupt handler for DMA9/IRQ25 (called from hardware intr) */
-static irqreturn_t tc_dma_rx_interrupt(int irq, void *vhc) {
-  unsigned long flags;
-  struct urb *urb;
-  struct usb_hcd *hcd = (struct usb_hcd*)vhc;
-  struct crisv10_urb_priv *urb_priv;
-  int epid = 0;
-  int real_error;
-
-  ASSERT(hcd);
-
-  /* Clear this interrupt. */
-  *R_DMA_CH9_CLR_INTR = IO_STATE(R_DMA_CH9_CLR_INTR, clr_eop, do);
-
-  /* Custom clear interrupt for this interrupt */
-  /* The reason we cli here is that we call the driver's callback functions. */
-  local_irq_save(flags);
-
-  /* Note that this while loop assumes that all packets span only
-     one rx descriptor. */
-  while(myNextRxDesc->status & IO_MASK(USB_IN_status, eop)) {
-    epid = IO_EXTRACT(USB_IN_status, epid, myNextRxDesc->status);
-    /* Get the active URB for this epid */
-    urb = activeUrbList[epid];
-
-    ASSERT(epid_inuse(epid));
-    if (!urb) {
-      dma_err("No urb for epid %d in rx interrupt\n", epid);
-      goto skip_out;
-    }
-
-    /* Check if any errors on epid */
-    real_error = 0;
-    if (myNextRxDesc->status & IO_MASK(USB_IN_status, error)) {
-      __u32 r_usb_ept_data;
-
-      if (usb_pipeisoc(urb->pipe)) {
-	r_usb_ept_data = etrax_epid_iso_get(epid);
-	if((r_usb_ept_data & IO_MASK(R_USB_EPT_DATA_ISO, valid)) &&
-	   (IO_EXTRACT(R_USB_EPT_DATA_ISO, error_code, r_usb_ept_data) == 0) &&
-	   (myNextRxDesc->status & IO_MASK(USB_IN_status, nodata))) {
-	  /* Not an error, just a failure to receive an expected iso
-	     in packet in this frame.  This is not documented
-	     in the designers reference. Continue processing.
-	  */
-	} else real_error = 1;
-      } else real_error = 1;
-    }
-
-    if(real_error) {
-      dma_err("Error in RX descr on epid:%d for URB 0x%x",
-	      epid, (unsigned int)urb);
-      dump_ept_data(epid);
-      dump_in_desc(myNextRxDesc);
-      goto skip_out;
-    }
-
-    urb_priv = (struct crisv10_urb_priv *)urb->hcpriv;
-    ASSERT(urb_priv);
-    ASSERT(urb_priv->urb_state == STARTED ||
-	   urb_priv->urb_state == UNLINK);
-
-    if ((usb_pipetype(urb->pipe) == PIPE_BULK) ||
-	(usb_pipetype(urb->pipe) == PIPE_CONTROL) ||
-	(usb_pipetype(urb->pipe) == PIPE_INTERRUPT)) {
-
-      /* We get nodata for empty data transactions, and the rx descriptor's
-	 hw_len field is not valid in that case. No data to copy in other
-	 words. */
-      if (myNextRxDesc->status & IO_MASK(USB_IN_status, nodata)) {
-	/* No data to copy */
-      } else {
-	/*
-	dma_dbg("Processing RX for URB:0x%x epid:%d (data:%d ofs:%d)\n",
-		(unsigned int)urb, epid, myNextRxDesc->hw_len,
-		urb_priv->rx_offset);
-	*/
-	/* Only copy data if URB isn't flaged to be unlinked*/
-	if(urb_priv->urb_state != UNLINK) {
-	  /* Make sure the data fits in the buffer. */
-	  if(urb_priv->rx_offset + myNextRxDesc->hw_len
-	     <= urb->transfer_buffer_length) {
-
-	    /* Copy the data to URBs buffer */
-	    memcpy(urb->transfer_buffer + urb_priv->rx_offset,
-		   phys_to_virt(myNextRxDesc->buf), myNextRxDesc->hw_len);
-	    urb_priv->rx_offset += myNextRxDesc->hw_len;
-	  } else {
-	    /* Signal overflow when returning URB */
-	    urb->status = -EOVERFLOW;
-	    tc_finish_urb_later(hcd, urb, urb->status);
-	  }
-	}
-      }
-
-      /* Check if it was the last packet in the transfer */
-      if (myNextRxDesc->status & IO_MASK(USB_IN_status, eot)) {
-	/* Special handling for In Ctrl URBs. */
-	if(usb_pipecontrol(urb->pipe) && usb_pipein(urb->pipe) &&
-	   !(urb_priv->ctrl_zout_done)) {
-	  /* Flag that RX part of Ctrl transfer is done. Because zout descr
-	     interrupt hasn't happend yet will the URB be finished in the
-	     TX-Interrupt. */
-	  urb_priv->ctrl_rx_done = 1;
-	  tc_dbg("Not finishing In Ctrl URB:0x%x from rx_interrupt, waiting"
-		 " for zout\n", (unsigned int)urb);
-	} else {
-	  tc_finish_urb(hcd, urb, 0);
-	}
-      }
-    } else { /* ISOC RX */
-      /*
-      isoc_dbg("Processing RX for epid:%d (URB:0x%x) ISOC pipe\n",
-	       epid, (unsigned int)urb);
-      */
-
-      struct usb_iso_packet_descriptor *packet;
-
-      if (urb_priv->urb_state == UNLINK) {
-	isoc_warn("Ignoring Isoc Rx data for urb being unlinked.\n");
-	goto skip_out;
-      } else if (urb_priv->urb_state == NOT_STARTED) {
-	isoc_err("What? Got Rx data for Isoc urb that isn't started?\n");
-	goto skip_out;
-      }
-
-      packet = &urb->iso_frame_desc[urb_priv->isoc_packet_counter];
-      ASSERT(packet);
-      packet->status = 0;
-
-      if (myNextRxDesc->status & IO_MASK(USB_IN_status, nodata)) {
-	/* We get nodata for empty data transactions, and the rx descriptor's
-	   hw_len field is not valid in that case. We copy 0 bytes however to
-	   stay in synch. */
-	packet->actual_length = 0;
-      } else {
-	packet->actual_length = myNextRxDesc->hw_len;
-	/* Make sure the data fits in the buffer. */
-	ASSERT(packet->actual_length <= packet->length);
-	memcpy(urb->transfer_buffer + packet->offset,
-	       phys_to_virt(myNextRxDesc->buf), packet->actual_length);
-	if(packet->actual_length > 0)
-	  isoc_dbg("Copied %d bytes, packet %d for URB:0x%x[%d]\n",
-		   packet->actual_length, urb_priv->isoc_packet_counter,
-		   (unsigned int)urb, urb_priv->urb_num);
-      }
-
-      /* Increment the packet counter. */
-      urb_priv->isoc_packet_counter++;
-
-      /* Note that we don't care about the eot field in the rx descriptor's
-	 status. It will always be set for isoc traffic. */
-      if (urb->number_of_packets == urb_priv->isoc_packet_counter) {
-	/* Complete the urb with status OK. */
-	tc_finish_urb(hcd, urb, 0);
-      }
-    }
-
-  skip_out:
-    myNextRxDesc->status = 0;
-    myNextRxDesc->command |= IO_MASK(USB_IN_command, eol);
-    myLastRxDesc->command &= ~IO_MASK(USB_IN_command, eol);
-    myLastRxDesc = myNextRxDesc;
-    myNextRxDesc = phys_to_virt(myNextRxDesc->next);
-    flush_etrax_cache();
-    *R_DMA_CH9_CMD = IO_STATE(R_DMA_CH9_CMD, cmd, restart);
-  }
-
-  local_irq_restore(flags);
-
-  return IRQ_HANDLED;
-}
-
-static void tc_bulk_start_timer_func(unsigned long dummy) {
-  /* We might enable an EP descriptor behind the current DMA position when
-     it's about to decide that there are no more bulk traffic and it should
-     stop the bulk channel.
-     Therefore we periodically check if the bulk channel is stopped and there
-     is an enabled bulk EP descriptor, in which case we start the bulk
-     channel. */
-  
-  if (!(*R_DMA_CH8_SUB0_CMD & IO_MASK(R_DMA_CH8_SUB0_CMD, cmd))) {
-    int epid;
-
-    timer_dbg("bulk_start_timer: Bulk DMA channel not running.\n");
-
-    for (epid = 0; epid < NBR_OF_EPIDS; epid++) {
-      if (TxBulkEPList[epid].command & IO_MASK(USB_EP_command, enable)) {
-	timer_warn("Found enabled EP for epid %d, starting bulk channel.\n",
-		   epid);
-	restart_dma8_sub0();
-
-	/* Restart the bulk eot timer since we just started the bulk channel.*/
-	mod_timer(&bulk_eot_timer, jiffies + BULK_EOT_TIMER_INTERVAL);
-
-	/* No need to search any further. */
-	break;
-      }
-    }
-  } else {
-    timer_dbg("bulk_start_timer: Bulk DMA channel running.\n");
-  }
-}
-
-static void tc_bulk_eot_timer_func(unsigned long dummy) {
-  struct usb_hcd *hcd = (struct usb_hcd*)dummy;
-  ASSERT(hcd);
-  /* Because of a race condition in the top half, we might miss a bulk eot.
-     This timer "simulates" a bulk eot if we don't get one for a while,
-     hopefully correcting the situation. */
-  timer_dbg("bulk_eot_timer timed out.\n");
-  check_finished_bulk_tx_epids(hcd, 1);
-}
-
-
-/*************************************************************/
-/*************************************************************/
-/* Device driver block                                       */
-/*************************************************************/
-/*************************************************************/
-
-/* Forward declarations for device driver functions */
-static int devdrv_hcd_probe(struct device *);
-static int devdrv_hcd_remove(struct device *);
-#ifdef CONFIG_PM
-static int devdrv_hcd_suspend(struct device *, u32, u32);
-static int devdrv_hcd_resume(struct device *, u32);
-#endif /* CONFIG_PM */
-
-/* the device */
-static struct platform_device *devdrv_hc_platform_device;
-
-/* device driver interface */
-static struct device_driver devdrv_hc_device_driver = {
-  .name =			(char *) hc_name,
-  .bus =			&platform_bus_type,
-
-  .probe =		devdrv_hcd_probe,
-  .remove =		devdrv_hcd_remove,
-
-#ifdef CONFIG_PM
-  .suspend =		devdrv_hcd_suspend,
-  .resume =		devdrv_hcd_resume,
-#endif /* CONFIG_PM */
-};
-
-/* initialize the host controller and driver  */
-static int __init_or_module devdrv_hcd_probe(struct device *dev)
-{
-  struct usb_hcd *hcd;
-  struct crisv10_hcd *crisv10_hcd;
-  int retval;
-
-  /* Check DMA burst length */
-  if(IO_EXTRACT(R_BUS_CONFIG, dma_burst, *R_BUS_CONFIG) !=
-     IO_STATE(R_BUS_CONFIG, dma_burst, burst32)) {
-    devdrv_err("Invalid DMA burst length in Etrax 100LX,"
-	       " needs to be 32\n");
-    return -EPERM;
-  }
-  
-  //XXX: dev->usb_id don't exist, using "" instread? - claudio
-  hcd = usb_create_hcd(&crisv10_hc_driver, dev, "");
-  if (!hcd)
-    return -ENOMEM;
-
-  crisv10_hcd = hcd_to_crisv10_hcd(hcd);
-  spin_lock_init(&crisv10_hcd->lock);
-  crisv10_hcd->num_ports = num_ports();
-  crisv10_hcd->running = 0;
-
-  dev_set_drvdata(dev, crisv10_hcd);
-
-  devdrv_dbg("ETRAX USB IRQs HC:%d  RX:%d  TX:%d\n", ETRAX_USB_HC_IRQ,
-	  ETRAX_USB_RX_IRQ, ETRAX_USB_TX_IRQ);
-
-  /* Print out chip version read from registers */
-  int rev_maj = *R_USB_REVISION & IO_MASK(R_USB_REVISION, major);
-  int rev_min = *R_USB_REVISION & IO_MASK(R_USB_REVISION, minor);
-  if(rev_min == 0) {
-    devdrv_info("Etrax 100LX USB Revision %d v1,2\n", rev_maj);
-  } else {
-    devdrv_info("Etrax 100LX USB Revision %d v%d\n", rev_maj, rev_min);
-  }
-
-  devdrv_info("Bulk timer interval, start:%d eot:%d\n",
-	      BULK_START_TIMER_INTERVAL,
-	      BULK_EOT_TIMER_INTERVAL);
-
-
-  /* Init root hub data structures */
-  if(rh_init()) {
-    devdrv_err("Failed init data for Root Hub\n");
-    retval = -ENOMEM;
-  }
-
-  if(port_in_use(0)) {
-    if (cris_request_io_interface(if_usb_1, "ETRAX100LX USB-HCD")) {
-      printk(KERN_CRIT "usb-host: request IO interface usb1 failed");
-      retval = -EBUSY;
-      goto out;
-    }
-    devdrv_info("Claimed interface for USB physical port 1\n");
-  }
-  if(port_in_use(1)) {
-    if (cris_request_io_interface(if_usb_2, "ETRAX100LX USB-HCD")) {
-      /* Free first interface if second failed to be claimed */
-      if(port_in_use(0)) {
-	cris_free_io_interface(if_usb_1);
-      }
-      printk(KERN_CRIT "usb-host: request IO interface usb2 failed");
-      retval = -EBUSY;
-      goto out;
-    }
-    devdrv_info("Claimed interface for USB physical port 2\n");
-  }
-  
-  /* Init transfer controller structs and locks */
-  if((retval = tc_init(hcd)) != 0) {
-    goto out;
-  }
-
-  /* Attach interrupt functions for DMA and init DMA controller */
-  if((retval = tc_dma_init(hcd)) != 0) {
-    goto out;
-  }
-
-  /* Attach the top IRQ handler for USB controller interrupts */
-  if (request_irq(ETRAX_USB_HC_IRQ, crisv10_hcd_top_irq, 0,
-		  "ETRAX 100LX built-in USB (HC)", hcd)) {
-    err("Could not allocate IRQ %d for USB", ETRAX_USB_HC_IRQ);
-    retval = -EBUSY;
-    goto out;
-  }
-
-  /* iso_eof is only enabled when isoc traffic is running. */
-  *R_USB_IRQ_MASK_SET =
-    /* IO_STATE(R_USB_IRQ_MASK_SET, iso_eof, set) | */
-    IO_STATE(R_USB_IRQ_MASK_SET, bulk_eot, set) |
-    IO_STATE(R_USB_IRQ_MASK_SET, epid_attn, set) |
-    IO_STATE(R_USB_IRQ_MASK_SET, port_status, set) |
-    IO_STATE(R_USB_IRQ_MASK_SET, ctl_status, set);
-
-
-  crisv10_ready_wait();
-  /* Reset the USB interface. */
-  *R_USB_COMMAND =
-    IO_STATE(R_USB_COMMAND, port_sel, nop) |
-    IO_STATE(R_USB_COMMAND, port_cmd, reset) |
-    IO_STATE(R_USB_COMMAND, ctrl_cmd, reset);
-
-  /* Designer's Reference, p. 8 - 10 says we should Initate R_USB_FM_PSTART to
-     0x2A30 (10800), to guarantee that control traffic gets 10% of the
-     bandwidth, and periodic transfer may allocate the rest (90%).
-     This doesn't work though.
-     The value 11960 is chosen to be just after the SOF token, with a couple
-     of bit times extra for possible bit stuffing. */
-  *R_USB_FM_PSTART = IO_FIELD(R_USB_FM_PSTART, value, 11960);
-
-  crisv10_ready_wait();
-  /* Configure the USB interface as a host controller. */
-  *R_USB_COMMAND =
-    IO_STATE(R_USB_COMMAND, port_sel, nop) |
-    IO_STATE(R_USB_COMMAND, port_cmd, reset) |
-    IO_STATE(R_USB_COMMAND, ctrl_cmd, host_config);
-
-
-  /* Check so controller not busy before enabling ports */
-  crisv10_ready_wait();
-
-  /* Enable selected USB ports */
-  if(port_in_use(0)) {
-    *R_USB_PORT1_DISABLE = IO_STATE(R_USB_PORT1_DISABLE, disable, no);
-  } else {
-    *R_USB_PORT1_DISABLE = IO_STATE(R_USB_PORT1_DISABLE, disable, yes);
-  }
-  if(port_in_use(1)) {
-    *R_USB_PORT2_DISABLE = IO_STATE(R_USB_PORT2_DISABLE, disable, no);
-  } else {
-    *R_USB_PORT2_DISABLE = IO_STATE(R_USB_PORT2_DISABLE, disable, yes);
-  }
-
-  crisv10_ready_wait();
-  /* Start processing of USB traffic. */
-  *R_USB_COMMAND =
-    IO_STATE(R_USB_COMMAND, port_sel, nop) |
-    IO_STATE(R_USB_COMMAND, port_cmd, reset) |
-    IO_STATE(R_USB_COMMAND, ctrl_cmd, host_run);
-
-  /* Do not continue probing initialization before USB interface is done */
-  crisv10_ready_wait();
-
-  /* Register our Host Controller to USB Core
-   * Finish the remaining parts of generic HCD initialization: allocate the
-   * buffers of consistent memory, register the bus
-   * and call the driver's reset() and start() routines. */
-  retval = usb_add_hcd(hcd, ETRAX_USB_HC_IRQ, IRQF_DISABLED);
-  if (retval != 0) {
-    devdrv_err("Failed registering HCD driver\n");
-    goto out;
-  }
-
-  return 0;
-
- out:
-  devdrv_hcd_remove(dev);
-  return retval;
-}
-
-
-/* cleanup after the host controller and driver */
-static int __init_or_module devdrv_hcd_remove(struct device *dev)
-{
-  struct crisv10_hcd *crisv10_hcd = dev_get_drvdata(dev);
-  struct usb_hcd *hcd;
-
-  if (!crisv10_hcd)
-    return 0;
-  hcd = crisv10_hcd_to_hcd(crisv10_hcd);
-
-
-  /* Stop USB Controller in Etrax 100LX */
-  crisv10_hcd_reset(hcd);
-
-  usb_remove_hcd(hcd);
-  devdrv_dbg("Removed HCD from USB Core\n");
-
-  /* Free USB Controller IRQ */
-  free_irq(ETRAX_USB_HC_IRQ, NULL);
-
-  /* Free resources */
-  tc_dma_destroy();
-  tc_destroy();
-
-
-  if(port_in_use(0)) {
-    cris_free_io_interface(if_usb_1);
-  }
-  if(port_in_use(1)) {
-    cris_free_io_interface(if_usb_2);
-  }
-
-  devdrv_dbg("Freed all claimed resources\n");
-
-  return 0;
-}
-
-
-#ifdef	CONFIG_PM
-
-static int devdrv_hcd_suspend(struct usb_hcd *hcd, u32 state, u32 level)
-{
-  return 0; /* no-op for now */
-}
-
-static int devdrv_hcd_resume(struct usb_hcd *hcd, u32 level)
-{
-  return 0; /* no-op for now */
-}
-
-#endif /* CONFIG_PM */
-
-
-/*************************************************************/
-/*************************************************************/
-/* Module block                                              */
-/*************************************************************/
-/*************************************************************/
- 
-/* register driver */
-static int __init module_hcd_init(void) 
-{
-  
-  if (usb_disabled())
-    return -ENODEV;
-
-  /* Here we select enabled ports by following defines created from
-     menuconfig */
-#ifndef CONFIG_ETRAX_USB_HOST_PORT1
-  ports &= ~(1<<0);
-#endif
-#ifndef CONFIG_ETRAX_USB_HOST_PORT2
-  ports &= ~(1<<1);
-#endif
-
-  printk(KERN_INFO "%s version "VERSION" "COPYRIGHT"\n", product_desc);
-
-  devdrv_hc_platform_device =
-    platform_device_register_simple((char *) hc_name, 0, NULL, 0);
-
-  if (IS_ERR(devdrv_hc_platform_device))
-    return PTR_ERR(devdrv_hc_platform_device);
-  return driver_register(&devdrv_hc_device_driver);
-  /* 
-   * Note that we do not set the DMA mask for the device,
-   * i.e. we pretend that we will use PIO, since no specific
-   * allocation routines are needed for DMA buffers. This will
-   * cause the HCD buffer allocation routines to fall back to
-   * kmalloc().
-   */
-}
-
-/* unregister driver */
-static void __exit module_hcd_exit(void) 
-{	
-  driver_unregister(&devdrv_hc_device_driver);
-}
-
-
-/* Module hooks */
-module_init(module_hcd_init);
-module_exit(module_hcd_exit);
-
diff --git a/target/linux/etrax/files/drivers/usb/host/hc-crisv10.h b/target/linux/etrax/files/drivers/usb/host/hc-crisv10.h
deleted file mode 100644
index 36a1f839a..000000000
--- a/target/linux/etrax/files/drivers/usb/host/hc-crisv10.h
+++ /dev/null
@@ -1,334 +0,0 @@
-#ifndef __LINUX_ETRAX_USB_H
-#define __LINUX_ETRAX_USB_H
-
-#include <linux/types.h>
-#include <linux/list.h>
-
-struct USB_IN_Desc {
-  volatile __u16 sw_len;
-  volatile __u16 command;
-  volatile unsigned long next;
-  volatile unsigned long buf;
-  volatile __u16 hw_len;
-  volatile __u16 status;
-};
-
-struct USB_SB_Desc {
-  volatile __u16 sw_len;
-  volatile __u16 command;
-  volatile unsigned long next;
-  volatile unsigned long buf;
-};
-
-struct USB_EP_Desc {
-  volatile __u16 hw_len;
-  volatile __u16 command;
-  volatile unsigned long sub;
-  volatile unsigned long next;
-};
-
-
-/* Root Hub port status struct */
-struct crisv10_rh {
-  volatile __u16 wPortChange[2];
-  volatile __u16 wPortStatusPrev[2];
-};
-
-/* HCD description */
-struct crisv10_hcd {
-  spinlock_t		lock;
-  __u8			num_ports;
-  __u8                  running;
-};
-
-
-/* Endpoint HC private data description */
-struct crisv10_ep_priv {
-  int epid;
-};
-
-/* Additional software state info for a USB Controller epid */
-struct etrax_epid {
-  __u8 inuse;       /* !0 = setup in Etrax and used for a endpoint */
-  __u8 disabled;    /* !0 = Temporarly disabled to avoid resubmission */
-  __u8 type;        /* Setup as: PIPE_BULK, PIPE_CONTROL ... */
-  __u8 out_traffic; /* !0 = This epid is for out traffic */
-};
-
-/* Struct to hold information of scheduled later URB completion */
-struct urb_later_data {
-  struct delayed_work dws;
-  struct usb_hcd *hcd;
-  struct urb *urb;
-  int urb_num;
-  int status;
-};
-
-
-typedef enum {
-  STARTED,
-  NOT_STARTED,
-  UNLINK,
-} crisv10_urb_state_t;
-
-
-struct crisv10_urb_priv {
-  /* Sequence number for this URB. Every new submited URB gets this from
-     a incrementing counter. Used when a URB is scheduled for later finish to
-     be sure that the intended URB hasn't already been completed (device
-     drivers has a tendency to reuse URBs once they are completed, causing us
-     to not be able to single old ones out only based on the URB pointer.) */
-  __u32 urb_num;
-
-  /* The first_sb field is used for freeing all SB descriptors belonging
-     to an urb. The corresponding ep descriptor's sub pointer cannot be
-     used for this since the DMA advances the sub pointer as it processes
-     the sb list. */
-  struct USB_SB_Desc *first_sb;
-
-  /* The last_sb field referes to the last SB descriptor that belongs to
-     this urb. This is important to know so we can free the SB descriptors
-     that ranges between first_sb and last_sb. */
-  struct USB_SB_Desc *last_sb;
-  
-  /* The rx_offset field is used in ctrl and bulk traffic to keep track
-     of the offset in the urb's transfer_buffer where incoming data should be
-     copied to. */
-  __u32 rx_offset;
-  
-  /* Counter used in isochronous transfers to keep track of the
-     number of packets received/transmitted.  */
-  __u32 isoc_packet_counter;
-
-  /* Flag that marks if this Isoc Out URB has finished it's transfer. Used
-     because several URBs can be finished before list is processed */
-  __u8  isoc_out_done;
-  
-  /* This field is used to pass information about the urb's current state
-     between the various interrupt handlers (thus marked volatile). */
-  volatile crisv10_urb_state_t urb_state;
-  
-  /* In Ctrl transfers consist of (at least) 3 packets: SETUP, IN and ZOUT.
-     When DMA8 sub-channel 2 has processed the SB list for this sequence we
-     get a interrupt. We also get a interrupt for In transfers and which
-     one of these interrupts that comes first depends of data size and device.
-     To be sure that we have got both interrupts before we complete the URB
-     we have these to flags that shows which part that has completed.
-     We can then check when we get one of the interrupts that if the other has
-     occured it's safe for us to complete the URB, otherwise we set appropriate
-     flag and do the completion when we get the other interrupt. */
-  volatile unsigned char ctrl_zout_done;
-  volatile unsigned char ctrl_rx_done;
-
-  /* Connection between the submitted urb and ETRAX epid number */
-  __u8 epid;
-  
-  /* The rx_data_list field is used for periodic traffic, to hold
-     received data for later processing in the the complete_urb functions,
-     where the data us copied to the urb's transfer_buffer. Basically, we
-     use this intermediate storage because we don't know when it's safe to
-     reuse the transfer_buffer (FIXME?). */
-  struct list_head rx_data_list;
-
-
-  /* The interval time rounded up to closest 2^N */
-  int interval;
-
-  /* Pool of EP descriptors needed if it's a INTR transfer.
-     Amount of EPs in pool correspons to how many INTR that should
-     be inserted in TxIntrEPList (max 128, defined by MAX_INTR_INTERVAL) */
-  struct USB_EP_Desc* intr_ep_pool[128];
-
-  /* The mount of EPs allocated for this INTR URB */
-  int intr_ep_pool_length;
-
-  /* Pointer to info struct if URB is scheduled to be finished later */
-  struct urb_later_data* later_data;
-
-  /* Allocated bandwidth for isochronous and interrupt traffic */
-  int bandwidth;
-};
-
-
-/* This struct is for passing data from the top half to the bottom half irq
-   handlers */
-struct crisv10_irq_reg {
-  struct usb_hcd* hcd;
-  __u32 r_usb_epid_attn;
-  __u8 r_usb_status;
-  __u16 r_usb_rh_port_status_1;
-  __u16 r_usb_rh_port_status_2;
-  __u32 r_usb_irq_mask_read;
-  __u32 r_usb_fm_number;
-  struct work_struct usb_bh;
-};
-
-
-/* This struct is for passing data from the isoc top half to the isoc bottom
-   half. */
-struct crisv10_isoc_complete_data {
-  struct usb_hcd *hcd;
-  struct urb *urb;
-  struct work_struct usb_bh;
-};
-
-/* Entry item for URB lists for each endpint */
-typedef struct urb_entry
-{
-	struct urb *urb;
-	struct list_head list;
-} urb_entry_t;
-
-/* ---------------------------------------------------------------------------
-   Virtual Root HUB
-   ------------------------------------------------------------------------- */
-/* destination of request */
-#define RH_INTERFACE               0x01
-#define RH_ENDPOINT                0x02
-#define RH_OTHER                   0x03
-
-#define RH_CLASS                   0x20
-#define RH_VENDOR                  0x40
-
-/* Requests: bRequest << 8 | bmRequestType */
-#define RH_GET_STATUS           0x0080
-#define RH_CLEAR_FEATURE        0x0100
-#define RH_SET_FEATURE          0x0300
-#define RH_SET_ADDRESS		0x0500
-#define RH_GET_DESCRIPTOR	0x0680
-#define RH_SET_DESCRIPTOR       0x0700
-#define RH_GET_CONFIGURATION	0x0880
-#define RH_SET_CONFIGURATION	0x0900
-#define RH_GET_STATE            0x0280
-#define RH_GET_INTERFACE        0x0A80
-#define RH_SET_INTERFACE        0x0B00
-#define RH_SYNC_FRAME           0x0C80
-/* Our Vendor Specific Request */
-#define RH_SET_EP               0x2000
-
-
-/* Hub port features */
-#define RH_PORT_CONNECTION         0x00
-#define RH_PORT_ENABLE             0x01
-#define RH_PORT_SUSPEND            0x02
-#define RH_PORT_OVER_CURRENT       0x03
-#define RH_PORT_RESET              0x04
-#define RH_PORT_POWER              0x08
-#define RH_PORT_LOW_SPEED          0x09
-#define RH_C_PORT_CONNECTION       0x10
-#define RH_C_PORT_ENABLE           0x11
-#define RH_C_PORT_SUSPEND          0x12
-#define RH_C_PORT_OVER_CURRENT     0x13
-#define RH_C_PORT_RESET            0x14
-
-/* Hub features */
-#define RH_C_HUB_LOCAL_POWER       0x00
-#define RH_C_HUB_OVER_CURRENT      0x01
-
-#define RH_DEVICE_REMOTE_WAKEUP    0x00
-#define RH_ENDPOINT_STALL          0x01
-
-/* Our Vendor Specific feature */
-#define RH_REMOVE_EP               0x00
-
-
-#define RH_ACK                     0x01
-#define RH_REQ_ERR                 -1
-#define RH_NACK                    0x00
-
-/* Field definitions for */
-
-#define USB_IN_command__eol__BITNR      0 /* command macros */
-#define USB_IN_command__eol__WIDTH      1
-#define USB_IN_command__eol__no         0
-#define USB_IN_command__eol__yes        1
-
-#define USB_IN_command__intr__BITNR     3
-#define USB_IN_command__intr__WIDTH     1
-#define USB_IN_command__intr__no        0
-#define USB_IN_command__intr__yes       1
-
-#define USB_IN_status__eop__BITNR       1 /* status macros. */
-#define USB_IN_status__eop__WIDTH       1
-#define USB_IN_status__eop__no          0
-#define USB_IN_status__eop__yes         1
-
-#define USB_IN_status__eot__BITNR       5
-#define USB_IN_status__eot__WIDTH       1
-#define USB_IN_status__eot__no          0
-#define USB_IN_status__eot__yes         1
-
-#define USB_IN_status__error__BITNR     6
-#define USB_IN_status__error__WIDTH     1
-#define USB_IN_status__error__no        0
-#define USB_IN_status__error__yes       1
-
-#define USB_IN_status__nodata__BITNR    7
-#define USB_IN_status__nodata__WIDTH    1
-#define USB_IN_status__nodata__no       0
-#define USB_IN_status__nodata__yes      1
-
-#define USB_IN_status__epid__BITNR      8
-#define USB_IN_status__epid__WIDTH      5
-
-#define USB_EP_command__eol__BITNR      0
-#define USB_EP_command__eol__WIDTH      1
-#define USB_EP_command__eol__no         0
-#define USB_EP_command__eol__yes        1
-
-#define USB_EP_command__eof__BITNR      1
-#define USB_EP_command__eof__WIDTH      1
-#define USB_EP_command__eof__no         0
-#define USB_EP_command__eof__yes        1
-
-#define USB_EP_command__intr__BITNR     3
-#define USB_EP_command__intr__WIDTH     1
-#define USB_EP_command__intr__no        0
-#define USB_EP_command__intr__yes       1
-
-#define USB_EP_command__enable__BITNR   4
-#define USB_EP_command__enable__WIDTH   1
-#define USB_EP_command__enable__no      0
-#define USB_EP_command__enable__yes     1
-
-#define USB_EP_command__hw_valid__BITNR 5
-#define USB_EP_command__hw_valid__WIDTH 1
-#define USB_EP_command__hw_valid__no    0
-#define USB_EP_command__hw_valid__yes   1
-
-#define USB_EP_command__epid__BITNR     8
-#define USB_EP_command__epid__WIDTH     5
-
-#define USB_SB_command__eol__BITNR      0 /* command macros. */
-#define USB_SB_command__eol__WIDTH      1
-#define USB_SB_command__eol__no         0
-#define USB_SB_command__eol__yes        1
-
-#define USB_SB_command__eot__BITNR      1
-#define USB_SB_command__eot__WIDTH      1
-#define USB_SB_command__eot__no         0
-#define USB_SB_command__eot__yes        1
-
-#define USB_SB_command__intr__BITNR     3
-#define USB_SB_command__intr__WIDTH     1
-#define USB_SB_command__intr__no        0
-#define USB_SB_command__intr__yes       1
-
-#define USB_SB_command__tt__BITNR       4
-#define USB_SB_command__tt__WIDTH       2
-#define USB_SB_command__tt__zout        0
-#define USB_SB_command__tt__in          1
-#define USB_SB_command__tt__out         2
-#define USB_SB_command__tt__setup       3
-
-
-#define USB_SB_command__rem__BITNR      8
-#define USB_SB_command__rem__WIDTH      6
-
-#define USB_SB_command__full__BITNR     6
-#define USB_SB_command__full__WIDTH     1
-#define USB_SB_command__full__no        0
-#define USB_SB_command__full__yes       1
-
-#endif
-
diff --git a/target/linux/etrax/image/Config.in b/target/linux/etrax/image/Config.in
deleted file mode 100644
index 4a01de7ec..000000000
--- a/target/linux/etrax/image/Config.in
+++ /dev/null
@@ -1,5 +0,0 @@
-config AXIS_FIMAGE
-	bool "Build fimage"
-	depends TARGET_etrax
-	default y
-
diff --git a/target/linux/etrax/image/Makefile b/target/linux/etrax/image/Makefile
deleted file mode 100644
index 22931d6c8..000000000
--- a/target/linux/etrax/image/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (C) 2006-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/image.mk
-
-define Image/BuildKernel
-	cp $(KDIR)/vmlinuz $(BIN_DIR)/$(IMG_PREFIX)-zImage
-endef
-
-define Image/Prepare
-	cp $(LINUX_DIR)/arch/cris/boot/zImage $(KDIR)/vmlinuz
-	$(MAKE) -C e100boot compile
-	$(MAKE) -C mkfimage compile
-	$(INSTALL_BIN) ./boot_linux $(BIN_DIR)
-endef
-
-define Image/Build/generic
-	mkfimage $(KDIR)/vmlinuz $(KDIR)/vmlinuz.tmp
-	cat $(KDIR)/vmlinuz.tmp $(KDIR)/root.$(1) > $(KDIR)/fimage.$(1).tmp
-	dd if=$(KDIR)/fimage.$(1).tmp of=$(KDIR)/fimage.$(1) bs=$(2) conv=sync
-	cp $(KDIR)/fimage.$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(1)-fimage
-endef
-
-define Image/Build/jffs2-64k
-	$(call prepare_generic_jffs-64k,$(KDIR)/root.jff2-64k)
-	$(call Image/Build/generic,$(1),4194304)
-endef
-
-define Image/Build/squashfs
-	$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
-	$(call Image/Build/generic,$(1),4194304)
-endef
-
-define Image/Build
-	$(call Image/Build/$(1),$(1))
-endef
-
-$(eval $(call BuildImage))
diff --git a/target/linux/etrax/image/boot_linux b/target/linux/etrax/image/boot_linux
deleted file mode 100755
index f7da261e2..000000000
--- a/target/linux/etrax/image/boot_linux
+++ /dev/null
@@ -1,511 +0,0 @@
-#!/usr/bin/perl -w
-
-#*****************************************************************************
-#!
-#! FILE NAME  : boot_linux
-#!
-#! PARAMETERS : -b <bootimage>     the name of the boot image to use
-#!              -d <device>        the interface to use, e.g., eth1
-#!                                 (defaults is eth0)
-#!              -f                 save it in flash memory at address 0x10000
-#!              -F                 save it in flash memory at address 0
-#!              -h                 show some help
-#!              -i <image>         name of the image to use (default is fimage)
-#!              -o <offset>        the offset in the flash where the flashing
-#!                                 starts
-#!              -O <offset>        the offset in the image file where the
-#!                                 flashing starts from
-#!              -p                 print the resulting etrax100boot command
-#!                                 instead of executing it
-#!              -s <size>          how much to flash (default is the size of
-#!                                 the flash minus the offset specified using
-#!                                 -o or -f)
-#!              -S <size>          the size of the flash
-#!
-#!              All sizes and offsets above can be specified as decimal
-#!              numbers, or as hexadecimal numbers by prefixing them with 0x.
-#!              It is also possible to use the suffixes k and M to specify
-#!              kilo (1024) or mega (1048576).
-#!
-#! DESCRIPTION: Extract the start of the image and any registers that should
-#!              be set from the kimage or fimage file, and then boot it.
-#!
-#! FUNCTIONS  : convert_size
-#!              extract_hw_settings
-#!              get_dword
-#!              calculate_sdram_init
-#!              sdram_command
-#!              print_help
-#!
-#!----------------------------------------------------------------------------
-#! HISTORY
-#!
-#! $Log: boot_linux,v $
-#! Revision 1.16  2004/11/01 16:32:27  starvik
-#! Corrected help text to avoid confusion
-#!
-#! Revision 1.15  2003/01/29 11:48:57  pkj
-#! Calculate a flash size large enough for the given image if the
-#! -S option is not specified.
-#!
-#! Revision 1.14  2002/11/18 14:40:09  pkj
-#! Make use of the --loop option to etrax100boot when initialising
-#! SDRAM memories. This requires a lot fewer options to be passed
-#! to the boot loader.
-#!
-#! Revision 1.13  2002/08/15 16:29:02  pkj
-#! * The -S option now accepts the size in bytes (just like the -s option).
-#!   For backwards compatibility it still assumes sizes of 16 and less to
-#!   be specified in MB.
-#! * The suffixes k and M can now be used with all sizes and offsets to
-#!   specify them in kilo or mega.
-#!
-#! Revision 1.12  2002/08/15 15:27:34  pkj
-#! Use $opts{'x'} instead of $opt_x.
-#!
-#! Revision 1.11  2002/07/04 17:06:39  pkj
-#! * No longer specifies a bootfile by default (not needed any longer).
-#! * Implemented option -b to specify a bootfile.
-#! * Removed references to option -l (it was never implemented).
-#!
-#! Revision 1.10  2002/06/04 11:50:23  starvik
-#! Check if mrs_data is specified in kernelconfig (necessary for MCM)
-#!
-#! Revision 1.9  2002/01/29 10:38:26  pkj
-#! Change illegal to invalid.
-#!
-#! Revision 1.8  2001/09/13 12:32:10  pkj
-#! * Added option -S to specify the size of the flash (in MB),  as -s
-#!   is used to specify how much to flash nowadays.
-#! * Made the default size of the flash depend on the size of the image
-#!   file. If it is bigger than 0x200100 then the flash is assumed to
-#!   be 4 MB, otherwise it is assumed to be 2 MB.
-#! * Added verification of various options.
-#!
-#! Revision 1.7  2001/09/13 10:25:11  pkj
-#! Minor clean-up.
-#!
-#! Revision 1.6  2001/06/29 10:05:16  pkj
-#! Corrected check for SDRAM.
-#!
-#! Revision 1.5  2001/06/29 09:11:55  pkj
-#! Synchronised boot_elinux and boot_linux.
-#!
-#!----------------------------------------------------------------------------
-#! (C) Copyright 2001, Axis Communications AB, LUND, SWEDEN
-#!****************************************************************************
-
-#****************** INCLUDE FILES SECTION ************************************
-
-use strict;
-
-use Getopt::Std;
-use File::Basename;
-
-#****************** VARIABLE DECLARATION SECTION *****************************
-
-use vars qw($my_name %opts);
-use vars qw($text_start $cmd);
-use vars qw($image_name $image_size);
-use vars qw($offset $source_offset $flash_size $flashing_size);
-use vars qw($sdram_timing_address $sdram_config_address);
-use vars qw($sdram_precharge $sdram_nop $sdram_refresh $sdram_mrs);
-
-#****************** CONSTANT SECTION *****************************************
-
-# Register addresses
-$sdram_timing_address = "b0000008";
-$sdram_config_address = "b000000c";
-
-# SDRAM commands
-$sdram_precharge = 3;
-$sdram_nop = 0;
-$sdram_refresh = 2;
-$sdram_mrs = 1;
-
-#****************** MAIN PROGRAM SECTION *************************************
-
-# The name of this program.
-$my_name = basename($0);
-
-# Get options
-getopts('b:d:fFhi:o:O:ps:S:', \%opts);
-
-&print_help if ($opts{'h'});
-
-# Name and existance of the image
-$image_name = ($opts{'i'} ? $opts{'i'} : 'fimage');
-die "Could not find the image $image_name!\n" unless (-s $image_name);
-
-if ($opts{'f'} || $opts{'F'})
-{
-  $image_size = -s $image_name;
-
-  $offset = ($opts{'f'} ? 0x10000 : 0);
-
-  $offset = &convert_size($opts{'o'}) if (defined($opts{'o'}));
-
-  die("$my_name: Invalid destination offset\n") if ($offset !~ /^\d+$/);
-
-  my $base_name = basename($image_name);
-  if ($base_name eq 'timage' || $base_name eq 'flash1.img')
-  {
-    $source_offset = 0;
-  }
-  else
-  {
-    $source_offset = $offset;
-  }
-
-  $source_offset = &convert_size($opts{'O'}) if (defined($opts{'O'}));
-
-  die("$my_name: Invalid source offset\n") if ($source_offset !~ /^\d+$/);
-  die("$my_name: Source offset > image size\n") if ($source_offset > $image_size);
-
-  if (defined($opts{'S'}))
-  {
-    # Backwards compatibility to allow specifying the flash size in MB
-    # without using an M suffix
-    $opts{'S'} .= 'M' if ($opts{'S'} =~ /^\d+$/ && $opts{'S'} <= 16);
-
-    $flash_size = &convert_size($opts{'S'});
-  }
-  else
-  {
-    # Calculate a flash size large enough for the image without the checksum
-    # and HWID.
-    $flash_size = ($image_size - $source_offset + $offset) & 0xFFFF0000;
-  }
-
-  die("$my_name: Invalid flash size\n") if ($flash_size !~ /^\d+$/);
-  die("$my_name: Destination offset > flash size\n") if ($offset > $flash_size);
-  if (defined($opts{'s'}))
-  {
-    $flashing_size = &convert_size($opts{'s'});
-  }
-  else
-  {
-    $flashing_size = $flash_size - $offset;
-  }
-
-  die("$my_name: Invalid size to flash\n") if ($flashing_size !~ /^\d+$/);
-
-  if ($flashing_size > $flash_size - $offset)
-  {
-    $flashing_size = $flash_size - $offset;
-    printf("Warning: Flashing size limited to 0x%lx due to the offset (0x%lx) and flash size (0x%lx).\n", $flashing_size, $offset, $flash_size);
-  }
-
-  if ($flashing_size > $image_size - $source_offset)
-  {
-    $flashing_size = $image_size - $source_offset;
-    printf("Warning: Flashing size limited to 0x%lx due to the offset (0x%lx) and image size (0x%lx).\n", $flashing_size, $source_offset, $image_size);
-  }
-}
-
-# Create the command line to boot the image
-if (system('./etrax100boot --help > /dev/null') == 0)
-{
-  $cmd = './etrax100boot';
-}
-elsif (system('svinto_boot --help > /dev/null') == 0)
-{
-  $cmd = 'svinto_boot';
-}
-else
-{
-  die("Cannot find e100boot program in your PATH!\n");
-}
-
-$cmd .= " --device $opts{'d'}" if ($opts{'d'});
-
-$cmd .= &extract_hw_settings;
-
-$cmd .= " --bootfile $opts{'b'}" if ($opts{'b'});
-$cmd .= " --file $image_name $text_start";
-
-if ($opts{'f'} || $opts{'F'})
-{
-  $cmd .= sprintf(" --flash %lx %lx %lx --jump 0",
-		  hex($text_start) + $source_offset, $offset, $flashing_size);
-}
-else
-{
-  $cmd .= " --jump $text_start";
-}
-
-if ($opts{'p'})
-{
-  print "Command:\n$cmd\n";
-}
-else
-{
-  system($cmd);
-}
-
-exit 0;
-
-#****************** FUNCTION DEFINITION SECTION ******************************
-
-#*****************************************************************************
-##
-## FUNCTION NAME: convert_size
-##
-##****************************************************************************
-
-sub convert_size
-{
-  my($arg) = @_;
-  my $size;
-
-  if ($arg =~ /^0x([\da-fA-F]+)([kM])?$/)
-  {
-    $size = hex($1);
-  }
-  elsif ($arg =~ /^(\d+)([kM])?$/)
-  {
-    $size = $1;
-  }
-  else
-  {
-    return -1;
-  }
-
-  if (!defined($2))
-  {
-    return $size;
-  }
-  elsif ($2 eq 'k')
-  {
-    return $size * 1024;
-  }
-  elsif ($2 eq 'M')
-  {
-    return $size * 1048576;
-  }
-}
-
-#*****************************************************************************
-##
-## FUNCTION NAME: extract_hw_settings
-##
-##****************************************************************************
-
-sub extract_hw_settings
-{
-  my $data;
-  my $dbg_port;
-  my $sdram_enabled;
-  my $return_value = "";
-  my $sdram_config;
-
-  # The hw information table has the following format
-  #
-  # "HW_PARAM_MAGIC"
-  # text_start (dword)
-  # serial debg port (dword)
-  # sdram enabled (dword)
-  # register address (dword)
-  # register value (dword)
-  # ...
-  # 0
-
-  open(FILE, "$image_name") || die("Could not open '$image_name'");
-
-  while (<FILE>)
-  {
-    if (m/HW_PARAM_MAGIC/g)
-    {
-      # Seek to first byte after magic
-      seek(FILE, -length($_) + pos($_), 1);
-      last;
-    }
-  }
-
-  $text_start = &get_dword;
-  $dbg_port = &get_dword;
-  $sdram_enabled = int(&get_dword);
-
-  while (1)
-  {
-    my $register = &get_dword;
-    my $value = &get_dword;
-
-    last if ($register eq "00000000");
-
-    if ($sdram_enabled)
-    {
-      if ($register eq $sdram_config_address)
-      {
-	$sdram_config = $value;
-      }
-      elsif ($register eq $sdram_timing_address)
-      {
-	$return_value .= &calculate_sdram_init($value, $sdram_config);
-	next;
-      }
-    }
-
-    $return_value .= " --setreg $register $value";
-  }
-
-  close(FILE);
-
-  return $return_value;
-}
-
-#*****************************************************************************
-##
-## FUNCTION NAME: get_dword
-##
-##****************************************************************************
-
-sub get_dword
-{
-  my $data;
-
-  read(FILE, $data, 4);
-  return unpack("H8", pack("V", unpack("N", $data)));
-}
-
-#*****************************************************************************
-##
-## FUNCTION NAME: calculate_sdram_init
-##
-##****************************************************************************
-
-sub calculate_sdram_init
-{
-  # Refer to ETRAX 100LX Designers Reference for a description of SDRAM
-  # initialization
-  my $sdram_init_val = hex($_[0]);
-  my $sdram_config_val = hex($_[1]);
-  my $bus_width = $sdram_config_val & 0x00800000;
-  my $speed;
-  my $cas_latency;
-  my $mrs_data;
-  my $temp;
-  my $return_value;
-  my $value;
-
-  $mrs_data = ($sdram_init_val & 0x00ff0000) >> 16;
-  $sdram_init_val &= 0x8000ffff; # Make sure mrs data is 0
-  $sdram_init_val |= 0x80000000; # Make sure sdram is enabled
-  $speed = $sdram_init_val & 0x1000;
-  $cas_latency = $sdram_init_val & 0x3;
-  if ($speed) # 100 MHz
-  {
-    $cas_latency += 2;
-  }
-  else # 50 MHz
-  {
-    $cas_latency += 1;
-  }
-
-  # Calculate value of mrs_data
-  # CAS latency = 2 && bus_width = 32 => 0x40
-  # CAS latency = 3 && bus_width = 32 => 0x60
-  # CAS latency = 2 && bus_width = 16 => 0x20
-  # CAS latency = 3 && bus_width = 16 => 0x30
-  if ($mrs_data == 0)
-  {
-    if ($bus_width == 0) # 16 bits
-    {
-      $mrs_data = $cas_latency == 2 ? 0x20 : 0x30;
-    }
-    else # 32 bits
-    {
-      $mrs_data = $cas_latency == 2 ? 0x40 : 0x60;
-    }
-  }
-
-  $temp = $sdram_init_val | 0x0000c000; # Disable refresh
-  $return_value .= &sdram_command($temp);
-  $return_value .= " --pause 20000";
-
-  $return_value .= &sdram_command($temp, $sdram_precharge);
-  $return_value .= &sdram_command($temp, $sdram_nop);
-
-  $return_value .= " --setreg +0 7";
-  $return_value .= " --label label1";
-  $return_value .= &sdram_command($temp, $sdram_refresh);
-  $return_value .= &sdram_command($temp, $sdram_nop);
-  $return_value .= " --loop +0 label1";
-
-  $return_value .= &sdram_command($temp, $sdram_mrs, $mrs_data);
-  $return_value .= &sdram_command($temp, $sdram_nop);
-
-  $return_value .= &sdram_command($sdram_init_val);
-
-  return $return_value;
-}
-
-#*****************************************************************************
-##
-## FUNCTION NAME: sdram_command
-##
-##****************************************************************************
-
-sub sdram_command
-{
-  my($temp, $value, $mrs_data) = @_;
-
-  $value ||= 0;
-  if ($value == $sdram_mrs)
-  {
-    $value = sprintf("%lx", $temp | ($value << 9) | ($mrs_data << 16));
-  }
-  else
-  {
-    $value = sprintf("%lx", $temp | ($value << 9));
-  }
-
-  return " --setreg $sdram_timing_address $value";
-}
-
-#*****************************************************************************
-##
-## FUNCTION NAME: print_help
-##
-##****************************************************************************
-
-sub print_help
-{
-  print "\nAXIS $my_name, ", '$Revision: 1.16 $ $Date: 2004/11/01 16:32:27 $ ', "\n";
-  die <<EOT;
-Copyright (C) 2001-2002 Axis Communications AB
-
-DESCRIPTION:
-  This program is used to boot (and flash) a linux image to a box.
-  It tries to extract the required ETRAX 100 settings from the image file.
-
-SYNTAX:
-  $my_name [options]
-
-OPTIONS:
-  -b <bootfile>           : The boot image to use.
-  -d <device>             : The network interface to use, default is eth0.
-  -f                      : Save the image in the flash memory starting at
-                            address 0x10000.
-  -F                      : Save the image in the flash memory starting at
-                            address 0.
-  -h                      : Print this help text.
-  -i <image>              : The path and name of the image to use, default
-                            is fimage.
-  -o <offset>             : The offset in the flash where the flashing starts.
-  -O <offset>             : The offset in the image file where the flashing
-                            starts from.
-  -p                      : Print the resulting etrax100boot command instead
-                            of executing it.
-  -s <size>               : How much to flash (default is the size of the
-			    flash minus the offset specified using -o or -f).
-  -S <size>               : The size of the flash.
-
-  All sizes and offsets above can be specified as decimal numbers, or as
-  hexadecimal numbers by prefixing them with 0x. It is also possible to use
-  the suffixes k and M to specify kilo (1024) or mega (1048576).
-
-EOT
-}
-
-#****************** END OF FILE boot_linux ***********************************
diff --git a/target/linux/etrax/image/e100boot/Makefile b/target/linux/etrax/image/e100boot/Makefile
deleted file mode 100644
index 4a30caf72..000000000
--- a/target/linux/etrax/image/e100boot/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=e100boot
-PKG_VERSION:=0.1
-PKG_RELEASE:=1
-
-PKG_SOURCE:=e100boot.tar.bz2
-PKG_SOURCE_URL:=http://www.acmesystems.it/download/owrt \
-http://download.tuxfamily.org/crisos/repository/source/
-PKG_MD5SUM:=11fd53e7824dc550e4cffbc4cd114c3e
-
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)
-
-CRLF_WORKAROUND=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Build/Compile
-	make -C $(PKG_BUILD_DIR) STRIP=true 
-endef
-
-define Build/InstallDev
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/sbl/e100boot $(BIN_DIR)/etrax100boot
-endef
-
-$(eval $(call Build/DefaultTargets))
diff --git a/target/linux/etrax/image/mkfimage/Makefile b/target/linux/etrax/image/mkfimage/Makefile
deleted file mode 100644
index 77d1cb151..000000000
--- a/target/linux/etrax/image/mkfimage/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=mkfimage
-PKG_VERSION:=0.1
-PKG_RELEASE:=1
-
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Build/Compile
-	mkdir -p $(PKG_BUILD_DIR)
-	cp -r ./src/* $(PKG_BUILD_DIR)
-	make -C $(PKG_BUILD_DIR)
-endef
-
-define Build/InstallDev
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mkfimage $(STAGING_DIR_HOST)/bin/mkfimage
-endef
-
-$(eval $(call Build/DefaultTargets))
diff --git a/target/linux/etrax/image/mkfimage/src/Makefile b/target/linux/etrax/image/mkfimage/src/Makefile
deleted file mode 100644
index 3e0b79c66..000000000
--- a/target/linux/etrax/image/mkfimage/src/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-
-all: mkfimage 
-	gcc mkfimage.c -o mkfimage
-
diff --git a/target/linux/etrax/image/mkfimage/src/mkfimage.c b/target/linux/etrax/image/mkfimage/src/mkfimage.c
deleted file mode 100644
index 6904170cf..000000000
--- a/target/linux/etrax/image/mkfimage/src/mkfimage.c
+++ /dev/null
@@ -1,72 +0,0 @@
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-
-int main(int argc, char **argv){
-	unsigned char *buffer = malloc(64 * 1024);
-	struct stat s;
-	unsigned int size_vmlinux = 0, real_size_vmlinux = 0;
-	const unsigned char *magic_str = "ACME_PART_MAGIC";
-	unsigned int loop;
-	unsigned char *magic;
-
-	if(argc != 3){
-		printf("%s in out\n", argv[0]);
-		return 1;
-	}
-
-	printf("Generating image\n");
-
-	FILE *vmlinux = fopen(argv[1], "r");
-	FILE *vmlinux_out = fopen(argv[2], "w");
-	if((!vmlinux) || (!vmlinux_out)){
-		printf("Error opening a file\n");
-		return 1;
-	}
-
-	stat(argv[1], &s);
-	size_vmlinux = s.st_size;
-	real_size_vmlinux = (size_vmlinux & 0xffff0000) + 0x10000;
-
-	printf("vmlinux = 0x%.08X / 0x%.08X\n", size_vmlinux, real_size_vmlinux);
-
-	unsigned int t = fread(buffer, 1, 64 * 1024, vmlinux);
-	for(loop = 0; loop < (64 * 1024) - sizeof(magic_str); loop++){
-		if(buffer[loop] == magic_str[0]){
-			if((magic = strstr(&buffer[loop], magic_str))){
-				printf("Magic at 0x%.08X %p %p\n", magic - buffer, magic, buffer);
-				printf("Found Magic %X%X%X%X\n",
-					buffer[loop + strlen(magic_str)],
-					buffer[loop + strlen(magic_str) + 2],
-					buffer[loop + strlen(magic_str) + 1],
-					buffer[loop + strlen(magic_str) + 3]);
-
-				buffer[loop + strlen(magic_str)] = real_size_vmlinux >> 24;
-				buffer[loop + strlen(magic_str) + 2] = (real_size_vmlinux >> 16) & 0xff;
-				buffer[loop + strlen(magic_str) + 1] = (real_size_vmlinux >> 8) & 0xff;
-				buffer[loop + strlen(magic_str) + 3] = (real_size_vmlinux) & 0xff;
-
-				printf("Replaced with %.02X%.02X%.02X%.02X\n",
-					buffer[loop + strlen(magic_str)],
-					buffer[loop + strlen(magic_str) + 2],
-					buffer[loop + strlen(magic_str) + 1],
-					buffer[loop + strlen(magic_str) + 3]);
-
-			}
-		}
-	}
-
-	fwrite(buffer, 1, 64 * 1024, vmlinux_out);
-	real_size_vmlinux -= 64 * 1024;
-	do {
-		real_size_vmlinux -= 64 * 1024;
-		memset(buffer, 0, 64 * 1024);
-		fread(buffer, 1, 64 * 1024, vmlinux);
-		fwrite(buffer, 1, 64 * 1024, vmlinux_out);
-	} while (real_size_vmlinux);
-
-	return 0;
-}
diff --git a/target/linux/etrax/patches-2.6.32/100-cris-makefiles.patch b/target/linux/etrax/patches-2.6.32/100-cris-makefiles.patch
deleted file mode 100644
index fbcb7fa05..000000000
--- a/target/linux/etrax/patches-2.6.32/100-cris-makefiles.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/arch/cris/boot/compressed/Makefile
-+++ b/arch/cris/boot/compressed/Makefile
-@@ -18,7 +18,7 @@ ldflags-y += -T $(srctree)/$(src)/decomp
- OBJECTS-$(CONFIG_ETRAX_ARCH_V32) = $(obj)/head_v32.o
- OBJECTS-$(CONFIG_ETRAX_ARCH_V10) = $(obj)/head_v10.o
- OBJECTS= $(OBJECTS-y) $(obj)/misc.o
--OBJCOPYFLAGS = -O binary --remove-section=.bss
-+#OBJCOPYFLAGS = -O binary --remove-section=.bss
- 
- quiet_cmd_image = BUILD   $@
- cmd_image = cat $(obj)/decompress.bin $(obj)/piggy.gz > $@
---- a/arch/cris/boot/Makefile
-+++ b/arch/cris/boot/Makefile
-@@ -5,7 +5,7 @@
- objcopyflags-$(CONFIG_ETRAX_ARCH_V10) += -R .note -R .comment
- objcopyflags-$(CONFIG_ETRAX_ARCH_V32) += --remove-section=.bss
- 
--OBJCOPYFLAGS = -O binary $(objcopyflags-y)
-+#OBJCOPYFLAGS = -O binary $(objcopyflags-y)
- 
- 
- subdir- := compressed rescue
-@@ -17,7 +17,7 @@ $(obj)/Image: vmlinux FORCE
- 
- $(obj)/compressed/vmlinux: $(obj)/Image FORCE
- 	$(Q)$(MAKE) $(build)=$(obj)/compressed $@
--	$(Q)$(MAKE) $(build)=$(obj)/rescue $(obj)/rescue/rescue.bin
-+#	$(Q)$(MAKE) $(build)=$(obj)/rescue $(obj)/rescue/rescue.bin
- 
- $(obj)/zImage:  $(obj)/compressed/vmlinux
- 	@cp $< $@
---- a/arch/cris/boot/rescue/Makefile
-+++ b/arch/cris/boot/rescue/Makefile
-@@ -14,7 +14,7 @@ arch-$(CONFIG_ETRAX_ARCH_V10) = v10
- arch-$(CONFIG_ETRAX_ARCH_V32) = v32
- 
- ldflags-y += -T $(srctree)/$(src)/rescue_$(arch-y).lds
--OBJCOPYFLAGS = -O binary --remove-section=.bss
-+#OBJCOPYFLAGS = -O binary --remove-section=.bss
- obj-$(CONFIG_ETRAX_ARCH_V32) = $(obj)/head_v32.o
- obj-$(CONFIG_ETRAX_ARCH_V10) = $(obj)/head_v10.o
- OBJECTS := $(obj-y)
---- a/arch/cris/Makefile
-+++ b/arch/cris/Makefile
-@@ -40,7 +40,7 @@ endif
- 
- LD = $(CROSS_COMPILE)ld -mcrislinux
- 
--OBJCOPYFLAGS := -O binary -R .note -R .comment -S
-+OBJCOPYFLAGS := -O binary -R .bss -R .note -R .note.gnu.build-id -R .comment -S
- 
- KBUILD_AFLAGS += -mlinux -march=$(arch-y) $(inc)
- KBUILD_CFLAGS += -mlinux -march=$(arch-y) -pipe $(inc)
diff --git a/target/linux/etrax/patches-2.6.32/200-samsung_flash.patch b/target/linux/etrax/patches-2.6.32/200-samsung_flash.patch
deleted file mode 100644
index eab03db50..000000000
--- a/target/linux/etrax/patches-2.6.32/200-samsung_flash.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -374,7 +374,7 @@ struct mtd_info *cfi_cmdset_0002(struct 
- 
- 		cfi_fixup_major_minor(cfi, extp);
- 
--		if (extp->MajorVersion != '1' ||
-+		if (extp->MajorVersion < '0' || extp->MajorVersion > '3' ||
- 		    (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
- 		        if (cfi->mfr == MANUFACTURER_SAMSUNG &&
- 			    (extp->MajorVersion == '3' && extp->MinorVersion == '3')) {
diff --git a/target/linux/etrax/patches-2.6.32/201-flashsize.patch b/target/linux/etrax/patches-2.6.32/201-flashsize.patch
deleted file mode 100644
index 42a467f74..000000000
--- a/target/linux/etrax/patches-2.6.32/201-flashsize.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- a/arch/cris/arch-v10/drivers/axisflashmap.c
-+++ b/arch/cris/arch-v10/drivers/axisflashmap.c
-@@ -113,7 +113,7 @@ static struct map_info map_cse1 = {
- 
- /* If no partition-table was found, we use this default-set. */
- #define MAX_PARTITIONS         7
--#define NUM_DEFAULT_PARTITIONS 3
-+#define NUM_DEFAULT_PARTITIONS 2
- 
- /*
-  * Default flash size is 2MB. CONFIG_ETRAX_PTABLE_SECTOR is most likely the
-@@ -122,19 +122,14 @@ static struct map_info map_cse1 = {
-  */
- static struct mtd_partition axis_default_partitions[NUM_DEFAULT_PARTITIONS] = {
- 	{
--		.name = "boot firmware",
--		.size = CONFIG_ETRAX_PTABLE_SECTOR,
--		.offset = 0
--	},
--	{
- 		.name = "kernel",
--		.size = 0x200000 - (6 * CONFIG_ETRAX_PTABLE_SECTOR),
--		.offset = CONFIG_ETRAX_PTABLE_SECTOR
-+		.size = 0x00,
-+		.offset = 0
- 	},
- 	{
--		.name = "filesystem",
--		.size = 5 * CONFIG_ETRAX_PTABLE_SECTOR,
--		.offset = 0x200000 - (5 * CONFIG_ETRAX_PTABLE_SECTOR)
-+		.name = "rootfs",
-+		.size = 0x200000,
-+		.offset = 0x200000
- 	}
- };
- 
-@@ -281,6 +276,11 @@ static int __init init_axis_flash(void)
- 	struct partitiontable_entry *ptable;
- 	int use_default_ptable = 1; /* Until proven otherwise. */
- 	const char pmsg[] = "  /dev/flash%d at 0x%08x, size 0x%08x\n";
-+	unsigned int kernel_part_size = 0;
-+	unsigned char *flash_mem = (unsigned char*)(FLASH_CACHED_ADDR);
-+	unsigned int flash_scan_count = 0;
-+	const char *part_magic = "ACME_PART_MAGIC";
-+	unsigned int magic_len = strlen(part_magic);
- 
- 	if (!(mymtd = flash_probe())) {
- 		/* There's no reason to use this module if no flash chip can
-@@ -293,6 +293,31 @@ static int __init init_axis_flash(void)
- 		axisflash_mtd = mymtd;
- 	}
- 
-+	/* scan flash to findout where out partition starts */
-+	
-+	printk(KERN_INFO "Scanning flash for end of kernel magic\n");
-+	for(flash_scan_count = 0; flash_scan_count < 100000; flash_scan_count++) {
-+		if(strncmp(&flash_mem[flash_scan_count], part_magic, magic_len - 1) == 0) {
-+			kernel_part_size = flash_mem[flash_scan_count + magic_len ];
-+			kernel_part_size <<= 8;
-+			kernel_part_size += flash_mem[flash_scan_count + magic_len + 2];
-+			kernel_part_size <<= 8;
-+			kernel_part_size += flash_mem[flash_scan_count + magic_len + 1];
-+			kernel_part_size <<= 8;
-+			kernel_part_size += flash_mem[flash_scan_count + magic_len + 3];
-+			printk(KERN_INFO "Kernel ends at 0x%.08X\n", kernel_part_size);
-+			flash_scan_count = 1100000;
-+		}
-+	}
-+	
-+	
-+	if(kernel_part_size){
-+		kernel_part_size = (kernel_part_size & 0xffff0000);
-+		axis_default_partitions[0].size = kernel_part_size;
-+		axis_default_partitions[1].size =  mymtd->size - axis_default_partitions[0].size;
-+		axis_default_partitions[1].offset = axis_default_partitions[0].size;
-+	}
-+
- 	if (mymtd) {
- 		mymtd->owner = THIS_MODULE;
- 		ptable_head = (struct partitiontable_head *)(FLASH_CACHED_ADDR +
---- a/arch/cris/arch-v10/lib/hw_settings.S
-+++ b/arch/cris/arch-v10/lib/hw_settings.S
-@@ -60,3 +60,5 @@
- 	.dword R_PORT_PB_SET
- 	.dword PB_SET_VALUE
- 	.dword 0 ; No more register values
-+	.ascii "ACME_PART_MAGIC" 
-+	.dword 0xdeadc0de
diff --git a/target/linux/etrax/patches-2.6.32/300-usb_support.patch b/target/linux/etrax/patches-2.6.32/300-usb_support.patch
deleted file mode 100644
index 0a0f81f98..000000000
--- a/target/linux/etrax/patches-2.6.32/300-usb_support.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/drivers/usb/host/Makefile
-+++ b/drivers/usb/host/Makefile
-@@ -28,6 +28,7 @@ obj-$(CONFIG_USB_FHCI_HCD)	+= fhci.o
- obj-$(CONFIG_USB_XHCI_HCD)	+= xhci.o
- obj-$(CONFIG_USB_SL811_HCD)	+= sl811-hcd.o
- obj-$(CONFIG_USB_SL811_CS)	+= sl811_cs.o
-+obj-$(CONFIG_ETRAX_USB_HOST)	+= hc-crisv10.o
- obj-$(CONFIG_USB_U132_HCD)	+= u132-hcd.o
- obj-$(CONFIG_USB_R8A66597_HCD)	+= r8a66597-hcd.o
- obj-$(CONFIG_USB_ISP1760_HCD)	+= isp1760.o
---- a/drivers/usb/Makefile
-+++ b/drivers/usb/Makefile
-@@ -21,6 +21,7 @@ obj-$(CONFIG_USB_U132_HCD)	+= host/
- obj-$(CONFIG_USB_R8A66597_HCD)	+= host/
- obj-$(CONFIG_USB_HWA_HCD)	+= host/
- obj-$(CONFIG_USB_ISP1760_HCD)	+= host/
-+obj-$(CONFIG_ETRAX_USB_HOST)	+= host/
- 
- obj-$(CONFIG_USB_C67X00_HCD)	+= c67x00/
- 
---- a/arch/cris/arch-v10/drivers/Kconfig
-+++ b/arch/cris/arch-v10/drivers/Kconfig
-@@ -410,7 +410,7 @@ config ETRAX_RS485_DISABLE_RECEIVER
- 	  Axis 2400/2401 must disable receiver.
- 
- config ETRAX_USB_HOST
--	bool "USB host"
-+	tristate "ETRAX USB host"
- 	select USB
- 	help
- 	   This option enables the host functionality of the ETRAX 100LX
diff --git a/target/linux/etrax/patches-2.6.32/400-Kconfig_source.patch b/target/linux/etrax/patches-2.6.32/400-Kconfig_source.patch
deleted file mode 100644
index 16f87e84d..000000000
--- a/target/linux/etrax/patches-2.6.32/400-Kconfig_source.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- a/arch/cris/Kconfig
-+++ b/arch/cris/Kconfig
-@@ -649,6 +649,8 @@ endchoice
- 
- endmenu
- 
-+menu "Device Drivers"
-+
- source "drivers/base/Kconfig"
- 
- # standard linux drivers
-@@ -660,13 +662,19 @@ source "drivers/pnp/Kconfig"
- 
- source "drivers/block/Kconfig"
- 
-+# misc before ide - BLK_DEV_SGIIOC4 depends on SGI_IOC4
-+
-+source "drivers/misc/Kconfig"
-+
- source "drivers/ide/Kconfig"
- 
--source "drivers/net/Kconfig"
-+source "drivers/scsi/Kconfig"
- 
--source "drivers/i2c/Kconfig"
-+source "drivers/ata/Kconfig"
- 
--source "drivers/rtc/Kconfig"
-+source "drivers/net/Kconfig"
-+
-+source "drivers/isdn/Kconfig"
- 
- #
- # input before char - char/joystick depends on it. As does USB.
-@@ -675,14 +683,50 @@ source "drivers/input/Kconfig"
- 
- source "drivers/char/Kconfig"
- 
--source "fs/Kconfig"
-+source "drivers/i2c/Kconfig"
-+
-+#source "drivers/spi/Kconfig"
-+
-+source "drivers/gpio/Kconfig"
-+
-+source "drivers/w1/Kconfig"
-+
-+source "drivers/power/Kconfig"
-+
-+source "drivers/hwmon/Kconfig"
-+
-+source "drivers/thermal/Kconfig"
-+
-+source "drivers/watchdog/Kconfig"
-+
-+source "drivers/ssb/Kconfig"
-+
-+#source "drivers/l3/Kconfig"
-+
-+source "drivers/mfd/Kconfig"
-+
-+source "drivers/media/Kconfig"
-+
-+source "drivers/video/Kconfig"
-+
-+source "sound/Kconfig"
-+
-+source "drivers/hid/Kconfig"
- 
- source "drivers/usb/Kconfig"
- 
- source "drivers/uwb/Kconfig"
- 
-+source "drivers/leds/Kconfig"
-+
-+source "drivers/rtc/Kconfig"
-+
- source "drivers/staging/Kconfig"
- 
-+endmenu
-+ 
-+source "fs/Kconfig"
-+
- source "arch/cris/Kconfig.debug"
- 
- source "security/Kconfig"
diff --git a/target/linux/etrax/patches-2.6.32/500-i2c_gvc.patch b/target/linux/etrax/patches-2.6.32/500-i2c_gvc.patch
deleted file mode 100644
index 16f9b93a0..000000000
--- a/target/linux/etrax/patches-2.6.32/500-i2c_gvc.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/arch/cris/arch-v10/drivers/Kconfig
-+++ b/arch/cris/arch-v10/drivers/Kconfig
-@@ -450,11 +450,31 @@ config ETRAX_I2C
- 	  i2c_arg = I2C_READARG(STA013_READ_ADDR, reg);
- 	  val = ioctl(fd, _IO(ETRAXI2C_IOCTYPE, I2C_READREG), i2c_arg);
- 
-+config ETRAX_I2C_GVC
-+	bool "I2C GVC support"
-+	depends on ETRAX_ARCH_V10 && !ETRAX_I2C
-+	select ETRAX_I2C_USES_PB_NOT_PB_I2C
-+	help
-+	  Enables an I2C driver with Geert Vancompernolle improvement.
-+
-+config ETRAX_I2C_SLAVE_DELAY
-+	bool "I2C Slave delay support"
-+	depends on ETRAX_I2C_GVC  && EXPERIMENTAL
-+	help
-+	  Enable this to enhanced master/slave dialog
-+	  Improvement by Positive Going (www.positivegoing.it) and BK srl (www.b-k.it)
-+
-+config ETRAX_I2C_DYN_ALLOC
-+	bool "I2C major device dynamic alloc"
-+	depends on ETRAX_I2C_GVC && EXPERIMENTAL
-+	help
-+	  Enable this to dynamicaly alloc major i2c device number
-+
- # this is true for most products since PB-I2C seems to be somewhat
- # flawed..
- config ETRAX_I2C_USES_PB_NOT_PB_I2C
- 	bool "I2C uses PB not PB-I2C"
--	depends on ETRAX_I2C
-+	depends on ETRAX_I2C || ETRAX_I2C_GVC
- 	help
- 	  Select whether to use the special I2C mode in the PB I/O register or
- 	  not.  This option needs to be selected in order to use some drivers
-@@ -478,7 +498,7 @@ config ETRAX_I2C_CLK_PORT
- 
- config ETRAX_I2C_EEPROM
- 	bool "I2C EEPROM (non-volatile RAM) support"
--	depends on ETRAX_I2C
-+	depends on ETRAX_I2C || ETRAX_I2C_GVC
- 	help
- 	  Enables I2C EEPROM (non-volatile RAM) on PB0 and PB1 using the I2C
- 	  driver.  Select size option: Probed, 2k, 8k, 16k.
---- a/arch/cris/arch-v10/drivers/Makefile
-+++ b/arch/cris/arch-v10/drivers/Makefile
-@@ -4,6 +4,7 @@
- 
- obj-$(CONFIG_ETRAX_AXISFLASHMAP)	+= axisflashmap.o
- obj-$(CONFIG_ETRAX_I2C)			+= i2c.o
-+obj-$(CONFIG_ETRAX_I2C_GVC)		+= i2c_gvc.o
- obj-$(CONFIG_ETRAX_I2C_EEPROM)		+= eeprom.o
- obj-$(CONFIG_ETRAX_GPIO)		+= gpio.o
- obj-$(CONFIG_ETRAX_DS1302)		+= ds1302.o
diff --git a/target/linux/etrax/patches-2.6.32/600-create-device-serial.patch b/target/linux/etrax/patches-2.6.32/600-create-device-serial.patch
deleted file mode 100644
index 58817e0de..000000000
--- a/target/linux/etrax/patches-2.6.32/600-create-device-serial.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/drivers/serial/crisv10.c
-+++ b/drivers/serial/crisv10.c
-@@ -32,6 +32,7 @@ static char *serial_version = "$Revision
- #include <linux/module.h>
- #include <linux/uaccess.h>
- #include <linux/io.h>
-+#include <linux/device.h>
- 
- #include <asm/irq.h>
- #include <asm/dma.h>
-@@ -4415,6 +4416,8 @@ static const struct tty_operations rs_op
- #endif
- };
- 
-+static struct class *rs_class;
-+
- static int __init rs_init(void)
- {
- 	int i;
-@@ -4548,6 +4551,24 @@ static int __init rs_init(void)
- #endif
- #endif /* CONFIG_SVINTO_SIM */
- 
-+	rs_class = class_create(THIS_MODULE, "rs_tty");
-+#ifdef CONFIG_ETRAX_SERIAL_PORT0 
-+	device_create(rs_class, NULL,
-+		MKDEV(TTY_MAJOR, 64), NULL, "ttyS0");
-+#endif
-+#ifdef CONFIG_ETRAX_SERIAL_PORT1 
-+	device_create(rs_class, NULL,
-+		MKDEV(TTY_MAJOR, 65), NULL, "ttyS1");
-+#endif
-+#ifdef CONFIG_ETRAX_SERIAL_PORT2 
-+	device_create(rs_class, NULL,
-+		MKDEV(TTY_MAJOR, 66), NULL, "ttyS2");
-+#endif
-+#ifdef CONFIG_ETRAX_SERIAL_PORT3 
-+	device_create(rs_class, NULL,
-+		MKDEV(TTY_MAJOR, 67), NULL, "ttyS3");
-+#endif
-+
- 	return 0;
- }
- 
diff --git a/target/linux/etrax/patches-2.6.32/610-create-the-gpio-devices.patch b/target/linux/etrax/patches-2.6.32/610-create-the-gpio-devices.patch
deleted file mode 100644
index 27e13c2ba..000000000
--- a/target/linux/etrax/patches-2.6.32/610-create-the-gpio-devices.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/arch/cris/arch-v10/drivers/gpio.c
-+++ b/arch/cris/arch-v10/drivers/gpio.c
-@@ -21,6 +21,7 @@
- #include <linux/poll.h>
- #include <linux/init.h>
- #include <linux/interrupt.h>
-+#include <linux/device.h>
- 
- #include <asm/etraxgpio.h>
- #include <arch/svinto.h>
-@@ -771,6 +772,8 @@ static void ioif_watcher(const unsigned 
- 
- /* main driver initialization routine, called from mem.c */
- 
-+static struct class *gp_class;
-+
- static int __init gpio_init(void)
- {
- 	int res;
-@@ -784,6 +787,8 @@ static int __init gpio_init(void)
- 		return res;
- 	}
- 
-+	gp_class = class_create(THIS_MODULE, "gpio_etrax");
-+
- 	/* Clear all leds */
- #if defined (CONFIG_ETRAX_CSP0_LEDS) ||  defined (CONFIG_ETRAX_PA_LEDS) || defined (CONFIG_ETRAX_PB_LEDS)
- 	CRIS_LED_NETWORK_SET(0);
-@@ -796,6 +801,8 @@ static int __init gpio_init(void)
- 		CRIS_LED_BIT_SET(i);
- #endif
- 
-+	device_create(gp_class, NULL,
-+		MKDEV(GPIO_MAJOR, 2), NULL, "leds");
- #endif
- 	/* The I/O interface allocation watcher will be called when
- 	 * registering it. */
-@@ -822,6 +829,12 @@ static int __init gpio_init(void)
- 	if (res)
- 		printk(KERN_CRIT "err: PA irq for gpio\n");
- 
-+	device_create(gp_class, NULL,
-+		MKDEV(GPIO_MAJOR, 0), NULL, "gpioa");
-+	device_create(gp_class, NULL,
-+		MKDEV(GPIO_MAJOR, 1), NULL, "gpiob");
-+	device_create(gp_class, NULL,
-+		MKDEV(GPIO_MAJOR, 3), NULL, "gpiog");
- 	return res;
- }
- 
diff --git a/target/linux/etrax/patches-2.6.32/620-create-the-i2c-devices.patch b/target/linux/etrax/patches-2.6.32/620-create-the-i2c-devices.patch
deleted file mode 100644
index 9c2e37ae9..000000000
--- a/target/linux/etrax/patches-2.6.32/620-create-the-i2c-devices.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/arch/cris/arch-v10/drivers/i2c.c
-+++ b/arch/cris/arch-v10/drivers/i2c.c
-@@ -21,6 +21,7 @@
- #include <linux/fs.h>
- #include <linux/string.h>
- #include <linux/init.h>
-+#include <linux/device.h>
- 
- #include <asm/etraxi2c.h>
- 
-@@ -678,6 +679,8 @@ i2c_init(void)
- 	return res;
- }
- 
-+static struct class *i2c_class;
-+
- static int __init
- i2c_register(void)
- {
-@@ -693,7 +696,11 @@ i2c_register(void)
- 	}
- 
- 	printk(KERN_INFO "I2C driver v2.2, (c) 1999-2004 Axis Communications AB\n");
--	
-+
-+	i2c_class = class_create(THIS_MODULE, "i2c_etrax");
-+	device_create(i2c_class, NULL,
-+		MKDEV(I2C_MAJOR, 0), NULL, "i2c");
-+
- 	return 0;
- }
- 
diff --git a/target/linux/etrax/profiles/100-generic.mk b/target/linux/etrax/profiles/100-generic.mk
deleted file mode 100644
index a3a044d6e..000000000
--- a/target/linux/etrax/profiles/100-generic.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/default
-  NAME:=Normal (default)
-endef
-
-define Profile/default/Description
-	Normal Foxboard setup
-endef
-$(eval $(call Profile,default))
-
diff --git a/target/linux/etrax/profiles/101-vhdl-nofb.mk b/target/linux/etrax/profiles/101-vhdl-nofb.mk
deleted file mode 100644
index 620db4209..000000000
--- a/target/linux/etrax/profiles/101-vhdl-nofb.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/vhdl_no_fb
-  NAME:=FOXVHDL no fb
-#  PACKAGES:=kmod-madwifi
-endef
-
-define Profile/vhdl_no_fb/Description
-	Setup the Foxboard for FOXVHDL support with no framebuffer
-endef
-$(eval $(call Profile,vhdl_no_fb))
-
diff --git a/target/linux/gemini/Makefile b/target/linux/gemini/Makefile
deleted file mode 100644
index 0b1d8896a..000000000
--- a/target/linux/gemini/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2009-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-ARCH:=arm
-BOARD:=gemini
-BOARDNAME:=Cortina Systems CS351x
-FEATURES:=squashfs
-CFLAGS:=-Os -pipe -march=armv4 -mtune=arm9tdmi -funit-at-a-time
-
-LINUX_VERSION:=2.6.32.10
-
-include $(INCLUDE_DIR)/target.mk
-
-$(eval $(call BuildTarget))
diff --git a/target/linux/gemini/base-files/lib/preinit/05_set_ether_mac_gemini b/target/linux/gemini/base-files/lib/preinit/05_set_ether_mac_gemini
deleted file mode 100644
index 499608120..000000000
--- a/target/linux/gemini/base-files/lib/preinit/05_set_ether_mac_gemini
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set_ether_mac() {
-	CONFIG_PARTITION="$(grep "VCTL" /proc/mtd | cut -d: -f1)"
-	MAC1="$(strings /dev/$CONFIG_PARTITION |grep MAC|cut -d: -f2|cut -c3-14|sed -e 's,\(..\),:\1,g' -e 's,^:,,')"
-	MAC2="$(strings /dev/$CONFIG_PARTITION |grep MAC|cut -d: -f8|cut -c3-14|sed -e 's,\(..\),:\1,g' -e 's,^:,,')"
-
-	ifconfig eth0 hw ether $MAC1 2>/dev/null
-	ifconfig eth1 hw ether $MAC2 2>/dev/null
-}
-
-boot_hook_add preinit_main set_ether_mac
-
diff --git a/target/linux/gemini/config-default b/target/linux/gemini/config-default
deleted file mode 100644
index 9404cd400..000000000
--- a/target/linux/gemini/config-default
+++ /dev/null
@@ -1,124 +0,0 @@
-# CONFIG_AEABI is not set
-CONFIG_ALIGNMENT_TRAP=y
-CONFIG_ARCH_FLATMEM_HAS_HOLES=y
-CONFIG_ARCH_GEMINI=y
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_ARCH_REQUIRE_GPIOLIB=y
-# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
-# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARM=y
-# CONFIG_ARPD is not set
-CONFIG_ATA=m
-# CONFIG_BINARY_PRINTF is not set
-CONFIG_BITREVERSE=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,19200 mem=32M"
-CONFIG_CPU_32v4=y
-CONFIG_CPU_32=y
-CONFIG_CPU_ABRT_EV4=y
-# CONFIG_CPU_BPREDICT_DISABLE is not set
-CONFIG_CPU_CACHE_FA=y
-CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_COPY_FA=y
-CONFIG_CPU_CP15_MMU=y
-CONFIG_CPU_CP15=y
-# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
-CONFIG_CPU_FA526=y
-# CONFIG_CPU_ICACHE_DISABLE is not set
-CONFIG_CPU_PABRT_NOIFAR=y
-CONFIG_CPU_TLB_FA=y
-CONFIG_CRC16=y
-# CONFIG_DEBUG_USER is not set
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DEVPORT=y
-CONFIG_DLCI=m
-CONFIG_DLCI_MAX=8
-# CONFIG_DM9000 is not set
-CONFIG_DMADEVICES=y
-CONFIG_DNOTIFY=y
-# CONFIG_DSCC4 is not set
-# CONFIG_FARSYNC is not set
-# CONFIG_FPE_FASTFPE is not set
-# CONFIG_FPE_NWFPE is not set
-CONFIG_FRAME_POINTER=y
-CONFIG_GEMINI_MEM_SWAP=y
-CONFIG_GEMINI_NET_ENGINE_GMAC=y
-CONFIG_GEMINI_WATCHDOG=y
-# CONFIG_GENERIC_CLOCKEVENTS is not set
-CONFIG_GENERIC_FIND_LAST_BIT=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-# CONFIG_GENERIC_TIME is not set
-CONFIG_GPIOLIB=y
-# CONFIG_HAMRADIO is not set
-CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAVE_AOUT=y
-CONFIG_HAVE_ARCH_KGDB=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_HAVE_IDE=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_HAVE_MLOCK=y
-CONFIG_HAVE_OPROFILE=y
-CONFIG_HDLC_CISCO=m
-CONFIG_HDLC_FR=m
-CONFIG_HDLC=m
-CONFIG_HDLC_PPP=m
-CONFIG_HDLC_RAW=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
-CONFIG_HWMON=y
-CONFIG_HW_RANDOM=y
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C=y
-CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_MROUTE=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-# CONFIG_LEDS_GPIO is not set
-CONFIG_LEGACY_PTY_COUNT=256
-CONFIG_LEGACY_PTYS=y
-# CONFIG_LIB80211 is not set
-# CONFIG_MACH_NAS4220B is not set
-# CONFIG_MACH_RUT100 is not set
-CONFIG_MACH_WBD111=y
-CONFIG_MDIO_BITBANG=y
-CONFIG_MDIO_GPIO=y
-# CONFIG_MG_DISK is not set
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_REDBOOT_PARTS=y
-CONFIG_NLATTR=y
-# CONFIG_NO_IOPORT is not set
-# CONFIG_OUTER_CACHE is not set
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_PCI=y
-# CONFIG_PCI_STUB is not set
-CONFIG_PHYLIB=y
-CONFIG_SCSI=m
-# CONFIG_SCSI_MULTI_LUN is not set
-# CONFIG_SERIAL_8250_EXTENDED is not set
-# CONFIG_SLOW_WORK is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4096
-CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_UID16=y
-# CONFIG_USB_EHCI_HCD is not set
-CONFIG_USB=m
-CONFIG_USB_SUPPORT=y
-# CONFIG_USB_UHCI_HCD is not set
-CONFIG_VECTORS_BASE=0xffff0000
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_WAN=y
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/gemini/image/Makefile b/target/linux/gemini/image/Makefile
deleted file mode 100644
index 9ebcbcf9f..000000000
--- a/target/linux/gemini/image/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2009-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/image.mk
-
-define Image/Prepare
-# WBD111: mach id 1690 (0x69a)
-	echo -en "\x06\x1c\xa0\xe3\x9a\x10\x81\xe3" > $(KDIR)/$(IMG_PREFIX)-wbd111-zImage
-	cat $(LINUX_DIR)/arch/arm/boot/zImage >> $(KDIR)/$(IMG_PREFIX)-wbd111-zImage
-endef
-
-define Image/BuildKernel
-# workaround the bootloader's bug with extra nops
-	echo -en "\x00\x00\xa0\xe1\x00\x00\xa0\xe1\x00\x00\xa0\xe1\x00\x00\xa0\xe1" > $(BIN_DIR)/$(IMG_PREFIX)-wbd111-zImage
-	cat $(KDIR)/$(IMG_PREFIX)-wbd111-zImage >> $(BIN_DIR)/$(IMG_PREFIX)-wbd111-zImage
-endef
-
-define Image/Build/jffs2-64k
-	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(1).img bs=64k conv=sync
-endef
-
-define Image/Build/jffs2-128k
-	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(1).img bs=128k conv=sync
-endef
-
-define Image/Build/squashfs
-	$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
-	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(1).img bs=128k conv=sync
-endef
-
-define Image/Build
-	$(call Image/Build/$(1),$(1))
-
-	-$(STAGING_DIR_HOST)/bin/mkfwimage2 \
-		-m GEOS -f 0x30000000 -z \
-		-v WILI-S.WILIBOARD.v5.00.SL3512.OpenWrt.00000.000000.000000 \
-		-o $(BIN_DIR)/$(IMG_PREFIX)-wbd111-$(1).bin \
-		-p Kernel:0x020000:0x100000:0:0:$(BIN_DIR)/$(IMG_PREFIX)-wbd111-zImage \
-		-p Ramdisk:0x120000:0x500000:0:0:$(BIN_DIR)/$(IMG_PREFIX)-$(1).img
-endef
-
-$(eval $(call BuildImage))
diff --git a/target/linux/gemini/patches/001-git_sync.patch b/target/linux/gemini/patches/001-git_sync.patch
deleted file mode 100644
index 5d48cf0e6..000000000
--- a/target/linux/gemini/patches/001-git_sync.patch
+++ /dev/null
@@ -1,5157 +0,0 @@
---- a/arch/arm/boot/compressed/head.S
-+++ b/arch/arm/boot/compressed/head.S
-@@ -9,6 +9,7 @@
-  * published by the Free Software Foundation.
-  */
- #include <linux/linkage.h>
-+#include <asm/cache.h>
- 
- /*
-  * Debugging stuff
-@@ -337,7 +338,7 @@ params:		ldr	r0, =params_phys
-  * This routine must preserve:
-  *  r4, r5, r6, r7, r8
-  */
--		.align	5
-+		.align	L1_CACHE_SHIFT
- cache_on:	mov	r3, #8			@ cache_on function
- 		b	call_cache_fn
- 
-@@ -519,7 +520,7 @@ __common_mmu_cache_on:
- 		mcr	p15, 0, r3, c2, c0, 0	@ load page table pointer
- 		mcr	p15, 0, r1, c3, c0, 0	@ load domain access control
- 		b	1f
--		.align	5			@ cache line aligned
-+		.align	L1_CACHE_SHIFT		@ cache line aligned
- 1:		mcr	p15, 0, r0, c1, c0, 0	@ load control register
- 		mrc	p15, 0, r0, c1, c0, 0	@ and read it back to
- 		sub	pc, lr, r0, lsr #32	@ properly flush pipeline
-@@ -539,7 +540,7 @@ __common_mmu_cache_on:
-  * r8     = atags pointer
-  * r9-r12,r14 = corrupted
-  */
--		.align	5
-+		.align	L1_CACHE_SHIFT
- reloc_start:	add	r9, r5, r0
- 		sub	r9, r9, #128		@ do not copy the stack
- 		debug_reloc_start
-@@ -768,7 +769,7 @@ proc_types:
-  * On exit,   r0, r1, r2, r3, r12 corrupted
-  * This routine must preserve: r4, r6, r7
-  */
--		.align	5
-+		.align	L1_CACHE_SHIFT
- cache_off:	mov	r3, #12			@ cache_off function
- 		b	call_cache_fn
- 
-@@ -845,7 +846,7 @@ __armv3_mmu_cache_off:
-  * This routine must preserve:
-  *  r0, r4, r5, r6, r7
-  */
--		.align	5
-+		.align	L1_CACHE_SHIFT
- cache_clean_flush:
- 		mov	r3, #16
- 		b	call_cache_fn
---- a/arch/arm/include/asm/dma-mapping.h
-+++ b/arch/arm/include/asm/dma-mapping.h
-@@ -98,7 +98,7 @@ static inline int dma_set_mask(struct de
- 
- static inline int dma_get_cache_alignment(void)
- {
--	return 32;
-+	return L1_CACHE_BYTES;
- }
- 
- static inline int dma_is_consistent(struct device *dev, dma_addr_t handle)
---- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -923,7 +923,7 @@ config ISA_DMA_API
- 	bool
- 
- config PCI
--	bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX || ARCH_KS8695 || MACH_ARMCORE
-+	bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX || ARCH_KS8695 || MACH_ARMCORE || ARCH_GEMINI
- 	help
- 	  Find out whether you have a PCI motherboard. PCI is the name of a
- 	  bus system, i.e. the way the CPU talks to the other stuff inside
---- a/arch/arm/kernel/entry-armv.S
-+++ b/arch/arm/kernel/entry-armv.S
-@@ -22,6 +22,7 @@
- #include <asm/thread_notify.h>
- #include <asm/unwind.h>
- #include <asm/unistd.h>
-+#include <asm/cache.h>
- 
- #include "entry-header.S"
- 
-@@ -166,7 +167,7 @@ ENDPROC(__und_invalid)
- 	asm_trace_hardirqs_off
- 	.endm
- 
--	.align	5
-+	.align	L1_CACHE_SHIFT
- __dabt_svc:
- 	svc_entry
- 
-@@ -214,7 +215,7 @@ __dabt_svc:
-  UNWIND(.fnend		)
- ENDPROC(__dabt_svc)
- 
--	.align	5
-+	.align	L1_CACHE_SHIFT
- __irq_svc:
- 	svc_entry
- 
-@@ -255,7 +256,7 @@ svc_preempt:
- 	b	1b
- #endif
- 
--	.align	5
-+	.align	L1_CACHE_SHIFT
- __und_svc:
- #ifdef CONFIG_KPROBES
- 	@ If a kprobe is about to simulate a "stmdb sp..." instruction,
-@@ -301,7 +302,7 @@ __und_svc:
-  UNWIND(.fnend		)
- ENDPROC(__und_svc)
- 
--	.align	5
-+	.align	L1_CACHE_SHIFT
- __pabt_svc:
- 	svc_entry
- 
-@@ -337,7 +338,7 @@ __pabt_svc:
-  UNWIND(.fnend		)
- ENDPROC(__pabt_svc)
- 
--	.align	5
-+	.align	L1_CACHE_SHIFT
- .LCcralign:
- 	.word	cr_alignment
- #ifdef MULTI_DABORT
-@@ -412,7 +413,7 @@ ENDPROC(__pabt_svc)
- #endif
- 	.endm
- 
--	.align	5
-+	.align	L1_CACHE_SHIFT
- __dabt_usr:
- 	usr_entry
- 	kuser_cmpxchg_check
-@@ -444,7 +445,7 @@ __dabt_usr:
-  UNWIND(.fnend		)
- ENDPROC(__dabt_usr)
- 
--	.align	5
-+	.align	L1_CACHE_SHIFT
- __irq_usr:
- 	usr_entry
- 	kuser_cmpxchg_check
-@@ -476,7 +477,7 @@ ENDPROC(__irq_usr)
- 
- 	.ltorg
- 
--	.align	5
-+	.align	L1_CACHE_SHIFT
- __und_usr:
- 	usr_entry
- 
-@@ -692,7 +693,7 @@ __und_usr_unknown:
- 	b	do_undefinstr
- ENDPROC(__und_usr_unknown)
- 
--	.align	5
-+	.align	L1_CACHE_SHIFT
- __pabt_usr:
- 	usr_entry
- 
-@@ -803,7 +804,7 @@ ENDPROC(__switch_to)
- #endif
- 	.endm
- 
--	.align	5
-+	.align	L1_CACHE_SHIFT
- 	.globl	__kuser_helper_start
- __kuser_helper_start:
- 
-@@ -843,7 +844,7 @@ __kuser_memory_barrier:				@ 0xffff0fa0
- 	smp_dmb
- 	usr_ret	lr
- 
--	.align	5
-+	.align	L1_CACHE_SHIFT
- 
- /*
-  * Reference prototype:
-@@ -975,7 +976,7 @@ kuser_cmpxchg_fixup:
- 
- #endif
- 
--	.align	5
-+	.align	L1_CACHE_SHIFT
- 
- /*
-  * Reference prototype:
-@@ -1058,7 +1059,7 @@ __kuser_helper_end:
-  * of which is copied into r0 for the mode specific abort handler.
-  */
- 	.macro	vector_stub, name, mode, correction=0
--	.align	5
-+	.align	L1_CACHE_SHIFT
- 
- vector_\name:
- 	.if \correction
-@@ -1189,7 +1190,7 @@ __stubs_start:
- 	.long	__und_invalid			@  e
- 	.long	__und_invalid			@  f
- 
--	.align	5
-+	.align	L1_CACHE_SHIFT
- 
- /*=============================================================================
-  * Undefined FIQs
-@@ -1219,7 +1220,7 @@ vector_addrexcptn:
-  * We group all the following data together to optimise
-  * for CPUs with separate I & D caches.
-  */
--	.align	5
-+	.align	L1_CACHE_SHIFT
- 
- .LCvswi:
- 	.word	vector_swi
---- a/arch/arm/kernel/entry-common.S
-+++ b/arch/arm/kernel/entry-common.S
-@@ -10,13 +10,14 @@
- 
- #include <asm/unistd.h>
- #include <asm/ftrace.h>
-+#include <asm/cache.h>
- #include <mach/entry-macro.S>
- #include <asm/unwind.h>
- 
- #include "entry-header.S"
- 
- 
--	.align	5
-+	.align	L1_CACHE_SHIFT
- /*
-  * This is the fast syscall return path.  We do as little as
-  * possible here, and this includes saving r0 back into the SVC
-@@ -183,7 +184,7 @@ ftrace_stub:
- #define A710(code...)
- #endif
- 
--	.align	5
-+	.align	L1_CACHE_SHIFT
- ENTRY(vector_swi)
- 	sub	sp, sp, #S_FRAME_SIZE
- 	stmia	sp, {r0 - r12}			@ Calling r0 - r12
-@@ -316,7 +317,7 @@ __sys_trace_return:
- 	bl	syscall_trace
- 	b	ret_slow_syscall
- 
--	.align	5
-+	.align	L1_CACHE_SHIFT
- #ifdef CONFIG_ALIGNMENT_TRAP
- 	.type	__cr_alignment, #object
- __cr_alignment:
---- a/arch/arm/kernel/head.S
-+++ b/arch/arm/kernel/head.S
-@@ -21,6 +21,7 @@
- #include <asm/memory.h>
- #include <asm/thread_info.h>
- #include <asm/system.h>
-+#include <asm/cache.h>
- 
- #if (PHYS_OFFSET & 0x001fffff)
- #error "PHYS_OFFSET must be at an even 2MiB boundary!"
-@@ -192,7 +193,7 @@ ENDPROC(__enable_mmu)
-  *
-  * other registers depend on the function called upon completion
-  */
--	.align	5
-+	.align	L1_CACHE_SHIFT
- __turn_mmu_on:
- 	mov	r0, r0
- 	mcr	p15, 0, r0, c1, c0, 0		@ write control reg
---- a/arch/arm/kernel/vmlinux.lds.S
-+++ b/arch/arm/kernel/vmlinux.lds.S
-@@ -7,6 +7,7 @@
- #include <asm/thread_info.h>
- #include <asm/memory.h>
- #include <asm/page.h>
-+#include <asm/cache.h>
- 	
- OUTPUT_ARCH(arm)
- ENTRY(stext)
-@@ -59,7 +60,7 @@ SECTIONS
- 			*(.security_initcall.init)
- 		__security_initcall_end = .;
- #ifdef CONFIG_BLK_DEV_INITRD
--		. = ALIGN(32);
-+		. = ALIGN(L1_CACHE_BYTES);
- 		__initramfs_start = .;
- 			usr/built-in.o(.init.ramfs)
- 		__initramfs_end = .;
-@@ -176,13 +177,13 @@ SECTIONS
- 		/*
- 		 * then the cacheline aligned data
- 		 */
--		. = ALIGN(32);
-+		. = ALIGN(L1_CACHE_BYTES);
- 		*(.data.cacheline_aligned)
- 
- 		/*
- 		 * The exception fixup table (might need resorting at runtime)
- 		 */
--		. = ALIGN(32);
-+		. = ALIGN(L1_CACHE_BYTES);
- 		__start___ex_table = .;
- #ifdef CONFIG_MMU
- 		*(__ex_table)
---- a/arch/arm/lib/memchr.S
-+++ b/arch/arm/lib/memchr.S
-@@ -11,9 +11,10 @@
-  */
- #include <linux/linkage.h>
- #include <asm/assembler.h>
-+#include <asm/cache.h>
- 
- 	.text
--	.align	5
-+	.align	L1_CACHE_SHIFT
- ENTRY(memchr)
- 1:	subs	r2, r2, #1
- 	bmi	2f
---- a/arch/arm/lib/memset.S
-+++ b/arch/arm/lib/memset.S
-@@ -11,9 +11,10 @@
-  */
- #include <linux/linkage.h>
- #include <asm/assembler.h>
-+#include <asm/cache.h>
- 
- 	.text
--	.align	5
-+	.align	L1_CACHE_SHIFT
- 	.word	0
- 
- 1:	subs	r2, r2, #4		@ 1 do we have enough
---- a/arch/arm/lib/memzero.S
-+++ b/arch/arm/lib/memzero.S
-@@ -9,9 +9,10 @@
-  */
- #include <linux/linkage.h>
- #include <asm/assembler.h>
-+#include <asm/cache.h>
- 
- 	.text
--	.align	5
-+	.align	L1_CACHE_SHIFT
- 	.word	0
- /*
-  * Align the pointer in r0.  r3 contains the number of bytes that we are
---- a/arch/arm/lib/strchr.S
-+++ b/arch/arm/lib/strchr.S
-@@ -11,9 +11,10 @@
-  */
- #include <linux/linkage.h>
- #include <asm/assembler.h>
-+#include <asm/cache.h>
- 
- 		.text
--		.align	5
-+		.align	L1_CACHE_SHIFT
- ENTRY(strchr)
- 		and	r1, r1, #0xff
- 1:		ldrb	r2, [r0], #1
---- a/arch/arm/lib/strncpy_from_user.S
-+++ b/arch/arm/lib/strncpy_from_user.S
-@@ -10,9 +10,10 @@
- #include <linux/linkage.h>
- #include <asm/assembler.h>
- #include <asm/errno.h>
-+#include <asm/cache.h>
- 
- 	.text
--	.align	5
-+	.align	L1_CACHE_SHIFT
- 
- /*
-  * Copy a string from user space to kernel space.
---- a/arch/arm/lib/strnlen_user.S
-+++ b/arch/arm/lib/strnlen_user.S
-@@ -10,9 +10,10 @@
- #include <linux/linkage.h>
- #include <asm/assembler.h>
- #include <asm/errno.h>
-+#include <asm/cache.h>
- 
- 	.text
--	.align	5
-+	.align	L1_CACHE_SHIFT
- 
- /* Prototype: unsigned long __strnlen_user(const char *str, long n)
-  * Purpose  : get length of a string in user memory
---- a/arch/arm/lib/strrchr.S
-+++ b/arch/arm/lib/strrchr.S
-@@ -11,9 +11,10 @@
-  */
- #include <linux/linkage.h>
- #include <asm/assembler.h>
-+#include <asm/cache.h>
- 
- 		.text
--		.align	5
-+		.align	L1_CACHE_SHIFT
- ENTRY(strrchr)
- 		mov	r3, #0
- 1:		ldrb	r2, [r0], #1
---- /dev/null
-+++ b/arch/arm/mach-gemini/board-nas4220b.c
-@@ -0,0 +1,160 @@
-+/*
-+ *  Support for Raidsonic NAS-4220-B
-+ *
-+ *  Copyright (C) 2009 Janos Laube <janos.dev@gmail.com>
-+ *
-+ * based on rut1xx.c
-+ *  Copyright (C) 2008 Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
-+ *
-+ * 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/kernel.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+#include <linux/leds.h>
-+#include <linux/input.h>
-+#include <linux/gpio_keys.h>
-+#include <linux/mdio-gpio.h>
-+#include <linux/io.h>
-+
-+#include <asm/setup.h>
-+#include <asm/mach-types.h>
-+#include <asm/mach/arch.h>
-+#include <asm/mach/time.h>
-+
-+#include <mach/gmac.h>
-+#include <mach/hardware.h>
-+#include <mach/global_reg.h>
-+
-+#include "common.h"
-+
-+static struct sys_timer ib4220b_timer = {
-+	.init	= gemini_timer_init,
-+};
-+
-+static struct gpio_led ib4220b_leds[] = {
-+	{
-+		.name			= "nas4220b:orange:hdd",
-+		.default_trigger	= "ide-disk",
-+		.gpio			= 60,
-+	},
-+	{
-+		.name			= "nas4220b:green:os",
-+		.default_trigger	= "heartbeat",
-+		.gpio			= 62,
-+	},
-+};
-+
-+static struct gpio_led_platform_data ib4220b_leds_data = {
-+	.num_leds	= ARRAY_SIZE(ib4220b_leds),
-+	.leds		= ib4220b_leds,
-+};
-+
-+static struct platform_device ib4220b_led_device = {
-+	.name	= "leds-gpio",
-+	.id	= -1,
-+	.dev	= {
-+		.platform_data = &ib4220b_leds_data,
-+	},
-+};
-+
-+static struct gpio_keys_button ib4220b_keys[] = {
-+	{
-+		.code		= KEY_SETUP,
-+		.gpio		= 61,
-+		.active_low	= 1,
-+		.desc		= "Backup Button",
-+		.type		= EV_KEY,
-+	},
-+	{
-+		.code		= KEY_RESTART,
-+		.gpio		= 63,
-+		.active_low	= 1,
-+		.desc		= "Softreset Button",
-+		.type		= EV_KEY,
-+	},
-+};
-+
-+static struct gpio_keys_platform_data ib4220b_keys_data = {
-+	.buttons	= ib4220b_keys,
-+	.nbuttons	= ARRAY_SIZE(ib4220b_keys),
-+};
-+
-+static struct platform_device ib4220b_key_device = {
-+	.name	= "gpio-keys",
-+	.id	= -1,
-+	.dev	= {
-+		.platform_data = &ib4220b_keys_data,
-+	},
-+};
-+
-+static struct mdio_gpio_platform_data ib4220b_mdio = {
-+	.mdc		= 22,
-+	.mdio		= 21,
-+	.phy_mask	= ~(1 << 1),
-+};
-+
-+static struct platform_device ib4220b_phy_device = {
-+	.name	= "mdio-gpio",
-+	.id	= 0,
-+	.dev	= {
-+		.platform_data = &ib4220b_mdio,
-+	},
-+};
-+
-+static struct gemini_gmac_platform_data ib4220b_gmac_data = {
-+	.bus_id[0] = "0:01",
-+	.interface[0] = PHY_INTERFACE_MODE_RGMII,
-+};
-+
-+static void __init gmac_ib4220b_init(void)
-+{
-+	unsigned int val;
-+
-+	val = __raw_readl(IO_ADDRESS(GEMINI_GLOBAL_BASE) +
-+		GLOBAL_IO_DRIVING_CTRL);
-+	val |= (0x3 << GMAC0_PADS_SHIFT) | (0x3 << GMAC1_PADS_SHIFT);
-+	__raw_writel(val, IO_ADDRESS(GEMINI_GLOBAL_BASE) +
-+		GLOBAL_IO_DRIVING_CTRL);
-+
-+	val = (0x0 << GMAC0_RXDV_SKEW_SHIFT) | (0xf << GMAC0_RXC_SKEW_SHIFT) |
-+		(0x7 << GMAC0_TXEN_SKEW_SHIFT) | (0xa << GMAC0_TXC_SKEW_SHIFT) |
-+		(0x0 << GMAC1_RXDV_SKEW_SHIFT) | (0xf << GMAC1_RXC_SKEW_SHIFT) |
-+		(0x7 << GMAC1_TXEN_SKEW_SHIFT) | (0xa << GMAC1_TXC_SKEW_SHIFT);
-+	__raw_writel(val, IO_ADDRESS(GEMINI_GLOBAL_BASE) +
-+		GLOBAL_GMAC_CTRL_SKEW_CTRL);
-+
-+	val = __raw_readl(IO_ADDRESS(GEMINI_GLOBAL_BASE) +
-+		GLOBAL_ARBITRATION1_CTRL);
-+	val |= (0x20 << BURST_LENGTH_SHIFT);
-+	__raw_writel(val, IO_ADDRESS(GEMINI_GLOBAL_BASE) +
-+		GLOBAL_ARBITRATION1_CTRL);
-+}
-+
-+static void __init ib4220b_init(void)
-+{
-+	gemini_gpio_init();
-+	gmac_ib4220b_init();
-+	platform_register_uart();
-+	platform_register_usb(0);
-+	platform_register_usb(1);
-+	platform_register_pflash(SZ_16M, NULL, 0);
-+	platform_device_register(&ib4220b_led_device);
-+	platform_device_register(&ib4220b_key_device);
-+	platform_device_register(&ib4220b_phy_device);
-+	platform_register_ethernet(&ib4220b_gmac_data);
-+}
-+
-+MACHINE_START(NAS4220B, "Raidsonic NAS IB-4220-B")
-+	.phys_io	= 0x7fffc000,
-+	.io_pg_offst	= ((0xffffc000) >> 18) & 0xfffc,
-+	.boot_params	= 0x100,
-+	.map_io		= gemini_map_io,
-+	.init_irq	= gemini_init_irq,
-+	.timer		= &ib4220b_timer,
-+	.init_machine	= ib4220b_init,
-+MACHINE_END
---- a/arch/arm/mach-gemini/board-rut1xx.c
-+++ b/arch/arm/mach-gemini/board-rut1xx.c
-@@ -14,13 +14,35 @@
- #include <linux/leds.h>
- #include <linux/input.h>
- #include <linux/gpio_keys.h>
-+#include <linux/mdio-gpio.h>
- 
- #include <asm/mach-types.h>
- #include <asm/mach/arch.h>
- #include <asm/mach/time.h>
- 
-+#include <mach/gmac.h>
-+
- #include "common.h"
- 
-+static struct mdio_gpio_platform_data rut1xx_mdio = {
-+	.mdc		= 22,
-+	.mdio		= 21,
-+	.phy_mask	= ~(1 << 1),
-+};
-+
-+static struct platform_device rut1xx_phy_device = {
-+	.name	= "mdio-gpio",
-+	.id	= 0,
-+	.dev	= {
-+		.platform_data = &rut1xx_mdio,
-+	},
-+};
-+
-+static struct gemini_gmac_platform_data gmac_data = {
-+	.bus_id[0] = "0:01",
-+	.interface[0] = PHY_INTERFACE_MODE_MII,
-+};
-+
- static struct gpio_keys_button rut1xx_keys[] = {
- 	{
- 		.code		= KEY_SETUP,
-@@ -79,9 +101,13 @@ static void __init rut1xx_init(void)
- {
- 	gemini_gpio_init();
- 	platform_register_uart();
-+	platform_register_watchdog();
-+	platform_register_usb(0);
- 	platform_register_pflash(SZ_8M, NULL, 0);
- 	platform_device_register(&rut1xx_leds);
- 	platform_device_register(&rut1xx_keys_device);
-+	platform_device_register(&rut1xx_phy_device);
-+	platform_register_ethernet(&gmac_data);
- }
- 
- MACHINE_START(RUT100, "Teltonika RUT100")
---- a/arch/arm/mach-gemini/common.h
-+++ b/arch/arm/mach-gemini/common.h
-@@ -13,6 +13,7 @@
- #define __GEMINI_COMMON_H__
- 
- struct mtd_partition;
-+struct gemini_gmac_platform_data;
- 
- extern void gemini_map_io(void);
- extern void gemini_init_irq(void);
-@@ -21,8 +22,11 @@ extern void gemini_gpio_init(void);
- 
- /* Common platform devices registration functions */
- extern int platform_register_uart(void);
-+extern int platform_register_ethernet(struct gemini_gmac_platform_data *pdata);
- extern int platform_register_pflash(unsigned int size,
- 				    struct mtd_partition *parts,
- 				    unsigned int nr_parts);
-+extern int platform_register_usb(unsigned int i);
-+extern int platform_register_watchdog(void);
- 
- #endif /* __GEMINI_COMMON_H__ */
---- a/arch/arm/mach-gemini/devices.c
-+++ b/arch/arm/mach-gemini/devices.c
-@@ -17,6 +17,7 @@
- #include <mach/irqs.h>
- #include <mach/hardware.h>
- #include <mach/global_reg.h>
-+#include <mach/gmac.h>
- 
- static struct plat_serial8250_port serial_platform_data[] = {
- 	{
-@@ -45,6 +46,116 @@ int platform_register_uart(void)
- 	return platform_device_register(&serial_device);
- }
- 
-+static struct resource usb0_resources[] = {
-+	{
-+		.start	= 0x68000000,
-+		.end	= 0x68000fff,
-+		.flags	= IORESOURCE_MEM,
-+	},
-+	{
-+		.start	= IRQ_USB0,
-+		.end	= IRQ_USB0,
-+		.flags	= IORESOURCE_IRQ,
-+	},
-+};
-+
-+static struct resource usb1_resources[] = {
-+	{
-+		.start	= 0x69000000,
-+		.end	= 0x69000fff,
-+		.flags	= IORESOURCE_MEM,
-+	},
-+	{
-+		.start	= IRQ_USB1,
-+		.end	= IRQ_USB1,
-+		.flags	= IORESOURCE_IRQ,
-+	},
-+};
-+
-+static u64 usb0_dmamask = 0xffffffffUL;
-+
-+static u64 usb1_dmamask = 0xffffffffUL;
-+
-+static struct platform_device usb_device[] = {
-+	{
-+		.name	= "ehci-fotg2xx",
-+		.id	= 0,
-+		.dev	= {
-+			.dma_mask = &usb0_dmamask,
-+			.coherent_dma_mask = 0xffffffff,
-+		},
-+		.num_resources	= ARRAY_SIZE(usb0_resources),
-+		.resource	= usb0_resources,
-+	},
-+	{
-+		.name	= "ehci-fotg2xx",
-+		.id	= 1,
-+		.dev	= {
-+			.dma_mask = &usb1_dmamask,
-+			.coherent_dma_mask = 0xffffffff,
-+		},
-+		.num_resources	= ARRAY_SIZE(usb1_resources),
-+		.resource	= usb1_resources,
-+	},
-+};
-+
-+int platform_register_usb(unsigned int i)
-+{
-+	if (i > 1)
-+		return -EINVAL;
-+
-+	return platform_device_register(&usb_device[i]);
-+}
-+
-+static struct resource gmac_resources[] = {
-+	{
-+		.start	= 0x60000000,
-+		.end	= 0x6000ffff,
-+		.flags	= IORESOURCE_MEM,
-+	},
-+	{
-+		.start	= IRQ_GMAC0,
-+		.end	= IRQ_GMAC0,
-+		.flags	= IORESOURCE_IRQ,
-+	},
-+	{
-+		.start	= IRQ_GMAC1,
-+		.end	= IRQ_GMAC1,
-+		.flags	= IORESOURCE_IRQ,
-+	},
-+};
-+
-+static u64 gmac_dmamask = 0xffffffffUL;
-+
-+static struct platform_device ethernet_device = {
-+	.name	= "gemini-gmac",
-+	.id	= 0,
-+	.dev	= {
-+		.dma_mask = &gmac_dmamask,
-+		.coherent_dma_mask = 0xffffffff,
-+	},
-+	.num_resources	= ARRAY_SIZE(gmac_resources),
-+	.resource	= gmac_resources,
-+};
-+
-+int platform_register_ethernet(struct gemini_gmac_platform_data *pdata)
-+{
-+	unsigned int reg = __raw_readl(IO_ADDRESS(GEMINI_GLOBAL_BASE) + GLOBAL_MISC_CTRL);
-+
-+	reg &= ~(GMAC_GMII | GMAC_1_ENABLE);
-+
-+	if (pdata->bus_id[1])
-+		reg |= GMAC_1_ENABLE;
-+	else if (pdata->interface[0] == PHY_INTERFACE_MODE_GMII)
-+		reg |= GMAC_GMII;		
-+
-+	__raw_writel(reg, IO_ADDRESS(GEMINI_GLOBAL_BASE) + GLOBAL_MISC_CTRL);
-+
-+	ethernet_device.dev.platform_data = pdata;
-+
-+	return platform_device_register(&ethernet_device);
-+}
-+
- static struct resource flash_resource = {
- 	.start	= GEMINI_FLASH_BASE,
- 	.flags	= IORESOURCE_MEM,
-@@ -90,3 +201,21 @@ int platform_register_pflash(unsigned in
- 
- 	return platform_device_register(&pflash_device);
- }
-+
-+static struct resource wdt_resource = {
-+	.start	= GEMINI_WAQTCHDOG_BASE,
-+	.end	= GEMINI_WAQTCHDOG_BASE + 0x18,
-+	.flags  = IORESOURCE_MEM,
-+};
-+
-+static struct platform_device wdt_device = {
-+	.name		= "gemini-wdt",
-+	.id		= 0,
-+	.resource	= &wdt_resource,
-+	.num_resources	= 1,
-+};
-+
-+int platform_register_watchdog(void)
-+{
-+	return platform_device_register(&wdt_device);
-+}
---- /dev/null
-+++ b/arch/arm/mach-gemini/include/mach/gmac.h
-@@ -0,0 +1,21 @@
-+/*
-+ * Gemini GMAC specific defines
-+ *
-+ * Copyright (C) 2008, Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
-+ *
-+ * 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.
-+ */
-+#ifndef __MACH_GMAC_H__
-+#define __MACH_GMAC_H__
-+
-+#include <linux/phy.h>
-+
-+struct gemini_gmac_platform_data {
-+	char *bus_id[2]; /* NULL means that this port is not used */
-+	phy_interface_t interface[2];
-+};
-+
-+#endif /* __MACH_GMAC_H__ */
---- a/arch/arm/mach-gemini/include/mach/hardware.h
-+++ b/arch/arm/mach-gemini/include/mach/hardware.h
-@@ -71,4 +71,12 @@
-  */
- #define IO_ADDRESS(x)	((((x) & 0xFFF00000) >> 4) | ((x) & 0x000FFFFF) | 0xF0000000)
- 
-+/*
-+ * PCI subsystem macros
-+ */
-+#define PCIBIOS_MIN_IO		0x00000100
-+#define PCIBIOS_MIN_MEM		0x00000000
-+
-+#define pcibios_assign_all_busses()	1
-+
- #endif
---- a/arch/arm/mach-gemini/include/mach/irqs.h
-+++ b/arch/arm/mach-gemini/include/mach/irqs.h
-@@ -43,11 +43,14 @@
- 
- #define NORMAL_IRQ_NUM	32
- 
--#define GPIO_IRQ_BASE	NORMAL_IRQ_NUM
-+#define PCI_IRQ_BASE	NORMAL_IRQ_NUM
-+#define PCI_IRQ_NUM	4
-+
-+#define GPIO_IRQ_BASE	(NORMAL_IRQ_NUM + PCI_IRQ_NUM)
- #define GPIO_IRQ_NUM	(3 * 32)
- 
- #define ARCH_TIMER_IRQ	IRQ_TIMER2
- 
--#define NR_IRQS		(NORMAL_IRQ_NUM + GPIO_IRQ_NUM)
-+#define NR_IRQS		(NORMAL_IRQ_NUM + PCI_IRQ_NUM + GPIO_IRQ_NUM)
- 
- #endif /* __MACH_IRQS_H__ */
---- a/arch/arm/mach-gemini/Kconfig
-+++ b/arch/arm/mach-gemini/Kconfig
-@@ -2,6 +2,13 @@ if ARCH_GEMINI
- 
- menu "Cortina Systems Gemini Implementations"
- 
-+config MACH_NAS4220B
-+	bool "Raidsonic NAS-4220-B"
-+	select GEMINI_MEM_SWAP
-+	help
-+	  Say Y here if you intend to run this kernel on a
-+	  Raidsonic NAS-4220-B.
-+
- config MACH_RUT100
- 	bool "Teltonika RUT100"
- 	select GEMINI_MEM_SWAP
---- a/arch/arm/mach-gemini/Makefile
-+++ b/arch/arm/mach-gemini/Makefile
-@@ -6,5 +6,8 @@
- 
- obj-y			:= irq.o mm.o time.o devices.o gpio.o
- 
-+obj-$(CONFIG_PCI)	+= pci.o
-+
- # Board-specific support
-+obj-$(CONFIG_MACH_NAS4220B)	+= board-nas4220b.o
- obj-$(CONFIG_MACH_RUT100)	+= board-rut1xx.o
---- a/arch/arm/mach-gemini/mm.c
-+++ b/arch/arm/mach-gemini/mm.c
-@@ -59,6 +59,11 @@ static struct map_desc gemini_io_desc[] 
- 		.length		= SZ_512K,
- 		.type 		= MT_DEVICE,
- 	}, {
-+		.virtual	= IO_ADDRESS(GEMINI_PCI_IO_BASE),
-+		.pfn		= __phys_to_pfn(GEMINI_PCI_IO_BASE),
-+		.length		= SZ_512K,
-+		.type 		= MT_DEVICE,
-+	}, {
- 		.virtual	= IO_ADDRESS(GEMINI_FLASH_CTRL_BASE),
- 		.pfn		= __phys_to_pfn(GEMINI_FLASH_CTRL_BASE),
- 		.length		= SZ_512K,
---- /dev/null
-+++ b/arch/arm/mach-gemini/pci.c
-@@ -0,0 +1,315 @@
-+/*
-+ *  Support for Gemini PCI Controller
-+ *
-+ *  Copyright (C) 2009 Janos Laube <janos.dev@gmail.com>
-+ *  Copyright (C) 2009 Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
-+ *
-+ * based on SL2312 PCI controller code
-+ *   Storlink (C) 2003
-+ *
-+ * 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/kernel.h>
-+#include <linux/pci.h>
-+#include <linux/irq.h>
-+
-+#include <asm/mach/pci.h>
-+#include <asm/gpio.h>
-+
-+#include <mach/irqs.h>
-+
-+#define GEMINI_PCI_IOSIZE_1M		0x0000
-+
-+#define GEMINI_PCI_PMC			0x40
-+#define GEMINI_PCI_PMCSR		0x44
-+#define GEMINI_PCI_CTRL1		0x48
-+#define GEMINI_PCI_CTRL2		0x4C
-+#define GEMINI_PCI_MEM1_BASE_SIZE	0x50
-+#define GEMINI_PCI_MEM2_BASE_SIZE	0x54
-+#define GEMINI_PCI_MEM3_BASE_SIZE	0x58
-+
-+#define PCI_CTRL2_INTSTS_OFFSET		28
-+#define PCI_CTRL2_INTMASK_OFFSET	22
-+
-+#define GEMINI_PCI_DMA_MASK		0xFFF00000
-+#define GEMINI_PCI_DMA_MEM1_BASE	0x00000000
-+#define GEMINI_PCI_DMA_MEM2_BASE	0x00000000
-+#define GEMINI_PCI_DMA_MEM3_BASE	0x00000000
-+#define GEMINI_PCI_DMA_MEM1_SIZE	7
-+#define GEMINI_PCI_DMA_MEM2_SIZE	6
-+#define GEMINI_PCI_DMA_MEM3_SIZE	6
-+
-+#define PCI_CONF_ENABLE		(1 << 31)
-+#define PCI_CONF_WHERE(r)	((r) & 0xFC)
-+#define PCI_CONF_BUS(b)		(((b) & 0xFF) << 16)
-+#define PCI_CONF_DEVICE(d)	(((d) & 0x1F) << 11)
-+#define PCI_CONF_FUNCTION(f)	(((f) & 0x07) << 8)
-+
-+#define PCI_IOSIZE_REG	(IO_ADDRESS(GEMINI_PCI_IO_BASE))
-+#define PCI_PROT_REG	(IO_ADDRESS(GEMINI_PCI_IO_BASE) + 0x04)
-+#define PCI_CTRL_REG	(IO_ADDRESS(GEMINI_PCI_IO_BASE) + 0x08)
-+#define PCI_SOFTRST_REG	(IO_ADDRESS(GEMINI_PCI_IO_BASE) + 0x10)
-+#define PCI_CONFIG_REG	(IO_ADDRESS(GEMINI_PCI_IO_BASE) + 0x28)
-+#define PCI_DATA_REG	(IO_ADDRESS(GEMINI_PCI_IO_BASE) + 0x2C)
-+
-+
-+static DEFINE_SPINLOCK(gemini_pci_lock);
-+
-+static struct resource gemini_pci_resource_io = {
-+	.name	= "PCI I/O Space",
-+	.start	= IO_ADDRESS(GEMINI_PCI_IO_BASE),
-+	.end	= IO_ADDRESS(GEMINI_PCI_IO_BASE) + SZ_1M - 1,
-+	.flags	= IORESOURCE_IO,
-+};
-+
-+static struct resource gemini_pci_resource_mem = {
-+	.name	= "PCI Memory Space",
-+	.start	= GEMINI_PCI_MEM_BASE,
-+	.end	= GEMINI_PCI_MEM_BASE + SZ_128M - 1,
-+	.flags	= IORESOURCE_MEM,
-+};
-+
-+static int gemini_pci_read_config(struct pci_bus* bus, unsigned int fn,
-+				  int config, int size, u32* value)
-+{
-+	unsigned long irq_flags;
-+
-+	spin_lock_irqsave(&gemini_pci_lock, irq_flags);
-+
-+	__raw_writel(PCI_CONF_BUS(bus->number) |
-+			PCI_CONF_DEVICE(PCI_SLOT(fn)) |
-+			PCI_CONF_FUNCTION(PCI_FUNC(fn)) |
-+			PCI_CONF_WHERE(config) |
-+			PCI_CONF_ENABLE,
-+			PCI_CONFIG_REG);
-+
-+	*value = __raw_readl(PCI_DATA_REG);
-+
-+	if (size == 1)
-+		*value = (*value >> (8 * (config & 3))) & 0xFF;
-+	else if (size == 2)
-+		*value = (*value >> (8 * (config & 3))) & 0xFFFF;
-+
-+	spin_unlock_irqrestore(&gemini_pci_lock, irq_flags);
-+
-+	dev_dbg(&bus->dev,
-+		"[read]  slt: %.2d, fnc: %d, cnf: 0x%.2X, val (%d bytes): 0x%.8X\n",
-+		PCI_SLOT(fn), PCI_FUNC(fn), config, size, *value);
-+
-+	return PCIBIOS_SUCCESSFUL;
-+}
-+
-+static int gemini_pci_write_config(struct pci_bus* bus, unsigned int fn,
-+				   int config, int size, u32 value)
-+{
-+	unsigned long irq_flags = 0;
-+	int ret = PCIBIOS_SUCCESSFUL;
-+
-+	dev_dbg(&bus->dev,
-+		"[write] slt: %.2d, fnc: %d, cnf: 0x%.2X, val (%d bytes): 0x%.8X\n",
-+		PCI_SLOT(fn), PCI_FUNC(fn), config, size, value);
-+
-+	spin_lock_irqsave(&gemini_pci_lock, irq_flags);
-+
-+	__raw_writel(PCI_CONF_BUS(bus->number) |
-+			PCI_CONF_DEVICE(PCI_SLOT(fn)) |
-+			PCI_CONF_FUNCTION(PCI_FUNC(fn)) |
-+			PCI_CONF_WHERE(config) |
-+			PCI_CONF_ENABLE,
-+			PCI_CONFIG_REG);
-+
-+	switch(size) {
-+	case 4:
-+		__raw_writel(value, PCI_DATA_REG);
-+		break;
-+	case 2:
-+		__raw_writew(value, PCI_DATA_REG + (config & 3));
-+		break;
-+	case 1:
-+		__raw_writeb(value, PCI_DATA_REG + (config & 3));
-+		break;
-+	default:
-+		ret = PCIBIOS_BAD_REGISTER_NUMBER;
-+	}
-+
-+	spin_unlock_irqrestore(&gemini_pci_lock, irq_flags);
-+
-+	return ret;
-+}
-+
-+static struct pci_ops gemini_pci_ops = {
-+	.read	= gemini_pci_read_config,
-+	.write	= gemini_pci_write_config,
-+};
-+
-+static int __init gemini_pci_request_resources(struct pci_sys_data *sys)
-+{
-+	if (request_resource(&ioport_resource, &gemini_pci_resource_io))
-+		goto bad_resources;
-+	if (request_resource(&iomem_resource, &gemini_pci_resource_mem))
-+		goto bad_resources;
-+
-+	sys->resource[0] = &gemini_pci_resource_io;
-+	sys->resource[1] = &gemini_pci_resource_mem;
-+	sys->resource[2] = 0;
-+
-+	return 0;
-+
-+bad_resources:
-+	pr_err("Gemini PCI: request_resource() failed. "
-+			"Abort PCI bus enumeration.\n");
-+	return -1;
-+}
-+
-+static int __init gemini_pci_setup(int nr, struct pci_sys_data *sys)
-+{
-+	unsigned int cmd;
-+
-+	if ((nr > 0) || gemini_pci_request_resources(sys))
-+		return 0;
-+
-+	/* setup I/O space to 1MB size */
-+	__raw_writel(GEMINI_PCI_IOSIZE_1M, PCI_IOSIZE_REG);
-+
-+	/* setup hostbridge */
-+	cmd = __raw_readl(PCI_CTRL_REG);
-+	cmd |= PCI_COMMAND_IO;
-+	cmd |= PCI_COMMAND_MEMORY;
-+	cmd |= PCI_COMMAND_MASTER;
-+	__raw_writel(cmd, PCI_CTRL_REG);
-+
-+	return 1;
-+}
-+
-+static struct pci_bus* __init gemini_pci_scan_bus(int nr, struct pci_sys_data* sys)
-+{
-+	unsigned int reg = 0;
-+	struct pci_bus* bus = 0;
-+
-+	bus = pci_scan_bus(nr, &gemini_pci_ops, sys);
-+	if (bus) {
-+		dev_dbg(&bus->dev, "setting up PCI DMA\n");
-+		reg = (GEMINI_PCI_DMA_MEM1_BASE & GEMINI_PCI_DMA_MASK)
-+			| (GEMINI_PCI_DMA_MEM1_SIZE << 16);
-+		gemini_pci_write_config(bus, 0, GEMINI_PCI_MEM1_BASE_SIZE, 4, reg);
-+		reg =	(GEMINI_PCI_DMA_MEM2_BASE & GEMINI_PCI_DMA_MASK)
-+			| (GEMINI_PCI_DMA_MEM2_SIZE << 16);
-+		gemini_pci_write_config(bus, 0, GEMINI_PCI_MEM2_BASE_SIZE, 4, reg);
-+		reg = (GEMINI_PCI_DMA_MEM3_BASE & GEMINI_PCI_DMA_MASK)
-+			| (GEMINI_PCI_DMA_MEM3_SIZE << 16);
-+		gemini_pci_write_config(bus, 0, GEMINI_PCI_MEM3_BASE_SIZE, 4, reg);
-+	}
-+
-+	return bus;
-+}
-+
-+/* Should work with all boards based on original Storlink EVB */
-+static int __init gemini_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
-+{
-+	if (slot < 9 || slot > 12)
-+		return -1;
-+
-+	return PCI_IRQ_BASE + (((slot - 9) + (pin - 1)) & 0x3);
-+}
-+
-+static struct hw_pci gemini_hw_pci __initdata = {
-+	.nr_controllers	= 1,
-+	.setup		= gemini_pci_setup,
-+	.scan           = gemini_pci_scan_bus,
-+	.swizzle	= pci_std_swizzle,
-+	.map_irq	= gemini_pci_map_irq,
-+};
-+
-+/* we need this for muxed PCI interrupts handling */
-+static struct pci_bus bogus_pci_bus;
-+
-+static void gemini_pci_ack_irq(unsigned int irq)
-+{
-+	unsigned int reg;
-+
-+	gemini_pci_read_config(&bogus_pci_bus, 0, GEMINI_PCI_CTRL2, 4, &reg);
-+	reg &= ~(0xF << PCI_CTRL2_INTSTS_OFFSET);
-+	reg |= 1 << (irq - PCI_IRQ_BASE + PCI_CTRL2_INTSTS_OFFSET);
-+	gemini_pci_write_config(&bogus_pci_bus, 0, GEMINI_PCI_CTRL2, 4, reg);
-+}
-+
-+static void gemini_pci_mask_irq(unsigned int irq)
-+{
-+	unsigned int reg;
-+
-+	gemini_pci_read_config(&bogus_pci_bus, 0, GEMINI_PCI_CTRL2, 4, &reg);
-+	reg &= ~((0xF << PCI_CTRL2_INTSTS_OFFSET)
-+		| (1 << (irq - PCI_IRQ_BASE + PCI_CTRL2_INTMASK_OFFSET)));
-+	gemini_pci_write_config(&bogus_pci_bus, 0, GEMINI_PCI_CTRL2, 4, reg);
-+}
-+
-+static void gemini_pci_unmask_irq(unsigned int irq)
-+{
-+	unsigned int reg;
-+
-+	gemini_pci_read_config(&bogus_pci_bus, 0, GEMINI_PCI_CTRL2, 4, &reg);
-+	reg &= ~(0xF << PCI_CTRL2_INTSTS_OFFSET);
-+	reg |= 1 << (irq - PCI_IRQ_BASE + PCI_CTRL2_INTMASK_OFFSET);
-+	gemini_pci_write_config(&bogus_pci_bus, 0, GEMINI_PCI_CTRL2, 4, reg);
-+}
-+
-+static void gemini_pci_irq_handler(unsigned int irq, struct irq_desc *desc)
-+{
-+	unsigned int pci_irq_no, irq_stat, reg, i;
-+
-+	gemini_pci_read_config(&bogus_pci_bus, 0, GEMINI_PCI_CTRL2, 4, &reg);
-+	irq_stat = reg >> PCI_CTRL2_INTSTS_OFFSET;
-+
-+	for (i = 0; i < 4; i++) {
-+
-+		if ((irq_stat & (1 << i)) == 0)
-+			continue;
-+
-+		pci_irq_no = PCI_IRQ_BASE + i;
-+
-+		BUG_ON(!(irq_desc[pci_irq_no].handle_irq));
-+		irq_desc[pci_irq_no].handle_irq(pci_irq_no,
-+				&irq_desc[pci_irq_no]);
-+	}
-+}
-+
-+static struct irq_chip gemini_pci_irq_chip = {
-+	.name = "PCI",
-+	.ack = gemini_pci_ack_irq,
-+	.mask = gemini_pci_mask_irq,
-+	.unmask = gemini_pci_unmask_irq,
-+};
-+
-+static int __init gemini_pci_init(void)
-+{
-+	int i;
-+
-+	for (i = 72; i <= 95; i++)
-+		gpio_request(i, "PCI");
-+
-+	/* initialize our bogus bus */
-+	dev_set_name(&bogus_pci_bus.dev, "PCI IRQ handler");
-+	bogus_pci_bus.number = 0;
-+
-+	/* mask and clear all interrupts */
-+	gemini_pci_write_config(&bogus_pci_bus, 0, GEMINI_PCI_CTRL2 + 2, 2,
-+				0xF000);
-+
-+	for (i = PCI_IRQ_BASE; i < PCI_IRQ_BASE + 4; i++) {
-+		set_irq_chip(i, &gemini_pci_irq_chip);
-+		set_irq_handler(i, handle_level_irq);
-+		set_irq_flags(i, IRQF_VALID);
-+	}
-+
-+	set_irq_chained_handler(IRQ_PCI, gemini_pci_irq_handler);
-+
-+	pci_common_init(&gemini_hw_pci);
-+
-+	return 0;
-+}
-+
-+subsys_initcall(gemini_pci_init);
---- a/arch/arm/mm/abort-ev4.S
-+++ b/arch/arm/mm/abort-ev4.S
-@@ -1,5 +1,6 @@
- #include <linux/linkage.h>
- #include <asm/assembler.h>
-+#include <asm/cache.h>
- /*
-  * Function: v4_early_abort
-  *
-@@ -17,7 +18,7 @@
-  * abort here if the I-TLB and D-TLB aren't seeing the same
-  * picture.  Unfortunately, this does happen.  We live with it.
-  */
--	.align	5
-+	.align	L1_CACHE_SHIFT
- ENTRY(v4_early_abort)
- 	mrc	p15, 0, r1, c5, c0, 0		@ get FSR
- 	mrc	p15, 0, r0, c6, c0, 0		@ get FAR
---- a/arch/arm/mm/abort-nommu.S
-+++ b/arch/arm/mm/abort-nommu.S
-@@ -1,5 +1,6 @@
- #include <linux/linkage.h>
- #include <asm/assembler.h>
-+#include <asm/cache.h>
- /*
-  * Function: nommu_early_abort
-  *
-@@ -12,7 +13,7 @@
-  * Note: There is no FSR/FAR on !CPU_CP15_MMU cores.
-  *       Just fill zero into the registers.
-  */
--	.align	5
-+	.align	L1_CACHE_SHIFT
- ENTRY(nommu_early_abort)
- 	mov	r0, #0				@ clear r0, r1 (no FSR/FAR)
- 	mov	r1, #0
---- /dev/null
-+++ b/drivers/net/gemini_negmac/gm_gmac.c
-@@ -0,0 +1,1350 @@
-+/*
-+ *  Ethernet device driver for Gemini SoC.
-+ *
-+ *  Copyright (C) 2006, Storlink, Corp.
-+ *  Copyright (C) 2008-2009, Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
-+ *
-+ * 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/kernel.h>
-+#include <linux/platform_device.h>
-+#include <linux/slab.h>
-+#include <linux/mm.h>
-+#include <linux/compiler.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/init.h>
-+#include <linux/ioport.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/rtnetlink.h>
-+#include <linux/delay.h>
-+#include <linux/ethtool.h>
-+#include <linux/mii.h>
-+#include <linux/phy.h>
-+#include <linux/completion.h>
-+#include <linux/kthread.h>
-+#include <linux/io.h>
-+#include <mach/hardware.h>
-+#include <asm/irq.h>
-+#include <linux/semaphore.h>
-+#include <mach/irqs.h>
-+#include <linux/skbuff.h>
-+#include <linux/in.h>
-+#include <linux/ip.h>
-+#include <linux/tcp.h>
-+#include <linux/udp.h>
-+#include <mach/gmac.h>
-+
-+#include "gm_gmac.h"
-+
-+/* #define GMAX_TX_INTR_DISABLED */
-+#define DO_HW_CHKSUM
-+/* #define ENABLE_TSO */
-+#define GMAC_USE_TXQ0
-+/* #define GMAC_LEN_1_2_ISSUE */
-+
-+#define DEFAULT_RXQ_MAX_CNT			256
-+
-+/* define chip information */
-+#define DRV_VERSION			"0.2"
-+#define SL351x_DRIVER_NAME		"Gemini Ethernet driver " DRV_VERSION
-+
-+#ifdef GMAC_LEN_1_2_ISSUE
-+	#define _DEBUG_PREFETCH_NUM	256
-+static	int	_debug_prefetch_cnt;
-+static	char _debug_prefetch_buf[_DEBUG_PREFETCH_NUM][4] __attribute__((aligned(4)));
-+#endif
-+
-+static inline void gmac_write_reg(unsigned int base, unsigned int offset, unsigned int data, unsigned int bit_mask)
-+{
-+	unsigned int reg_val;
-+
-+	reg_val = (__raw_readl(base + offset) & (~bit_mask)) | (data & bit_mask);
-+	__raw_writel(reg_val, base + offset);
-+}
-+
-+/*----------------------------------------------------------------------
-+*	toe_init_free_queue
-+*	(1) Initialize the Free Queue Descriptor Base Address & size
-+*		Register: TOE_GLOBAL_BASE + 0x0004
-+*	(2) Initialize DMA Read/Write pointer for
-+*		SW Free Queue and HW Free Queue
-+*	(3)	Initialize DMA Descriptors for
-+*		SW Free Queue and HW Free Queue,
-+*----------------------------------------------------------------------*/
-+static void toe_init_free_queue(struct toe_private *toe)
-+{
-+	int			i;
-+	DMA_RWPTR_T		rwptr_reg;
-+	void			*desc_buf;
-+	GMAC_RXDESC_T		*sw_desc_ptr;
-+	struct sk_buff		*skb;
-+
-+	desc_buf = dma_alloc_coherent(toe->dev, TOE_SW_FREEQ_DESC_NUM * sizeof(GMAC_RXDESC_T),
-+				      &toe->sw_freeq_desc_base_dma, GFP_KERNEL);
-+	sw_desc_ptr = (GMAC_RXDESC_T *)desc_buf;
-+	if (!desc_buf) {
-+		dev_err(toe->dev, "%s::DMA ALLOC fail\n", __func__);
-+		return;
-+	}
-+	memset(desc_buf, 0, TOE_SW_FREEQ_DESC_NUM * sizeof(GMAC_RXDESC_T));
-+
-+	/* DMA Queue Base & Size */
-+	__raw_writel((toe->sw_freeq_desc_base_dma & DMA_Q_BASE_MASK) | TOE_SW_FREEQ_DESC_POWER,
-+			toe->global_base + GLOBAL_SW_FREEQ_BASE_SIZE_REG);
-+
-+	/* init descriptor base */
-+	toe->swfq_desc_base = (unsigned int)desc_buf;
-+
-+	/* SW Free Queue Descriptors */
-+	for (i = 0; i < TOE_SW_FREEQ_DESC_NUM; i++) {
-+		sw_desc_ptr->word0.bits.buffer_size = SW_RX_BUF_SIZE;
-+		skb = dev_alloc_skb(SW_RX_BUF_SIZE);	/* allocate socket buffer */
-+		if (!skb) {
-+			dev_err(toe->dev, "%s::skb buffer allocation fail\n", __func__);
-+			return;
-+		}
-+		REG32(skb->data) = (unsigned int)skb;
-+		skb_reserve(skb, SKB_RESERVE_BYTES);
-+		sw_desc_ptr->word2.buf_adr = dma_map_single(toe->dev, skb->data,
-+					SW_RX_BUF_SIZE - SKB_RESERVE_BYTES,
-+					DMA_FROM_DEVICE);
-+		sw_desc_ptr++;
-+	}
-+
-+	dma_sync_single_for_device(toe->dev, toe->sw_freeq_desc_base_dma,
-+				TOE_SW_FREEQ_DESC_NUM * sizeof(GMAC_RXDESC_T),
-+				DMA_TO_DEVICE);
-+
-+	/* SW Free Queue Read/Write Pointer */
-+	rwptr_reg.bits.wptr = TOE_SW_FREEQ_DESC_NUM - 1;
-+	rwptr_reg.bits.rptr = 0;
-+	__raw_writel(rwptr_reg.bits32, toe->global_base + GLOBAL_SWFQ_RWPTR_REG);
-+
-+	/* DMA Queue Base & Size */
-+	__raw_writel(TOE_HW_FREEQ_DESC_POWER,
-+		toe->global_base + GLOBAL_HW_FREEQ_BASE_SIZE_REG);
-+	rwptr_reg.bits.wptr = TOE_HW_FREEQ_DESC_NUM - 1;
-+	rwptr_reg.bits.rptr = 0;
-+	__raw_writel(rwptr_reg.bits32, toe->global_base + GLOBAL_HWFQ_RWPTR_REG);
-+}
-+
-+/*----------------------------------------------------------------------
-+*	toe_init_swtx_queue
-+*	(2) Initialize the GMAC 0/1 SW TXQ Queue Descriptor Base Address & sizeup
-+*		GMAC_SW_TX_QUEUE_BASE_REG(0x0050)
-+*	(2) Initialize DMA Read/Write pointer for
-+*		GMAC 0/1 SW TX Q0-5
-+*----------------------------------------------------------------------*/
-+static void toe_init_swtx_queue(struct net_device *dev)
-+{
-+	int			i;
-+	struct gmac_private	*gmac = netdev_priv(dev);
-+	struct toe_private	*toe = dev->ml_priv;
-+	DMA_RWPTR_T		rwptr_reg;
-+	unsigned int		rwptr_addr;
-+	void			*desc_buf;
-+	unsigned int		offset;
-+
-+	desc_buf = dma_alloc_coherent(toe->dev, TOE_GMAC_SWTXQ_DESC_NUM * TOE_SW_TXQ_NUM * sizeof(GMAC_TXDESC_T),
-+				      &gmac->swtxq_desc_base_dma, GFP_KERNEL);
-+	gmac->swtxq_desc_base = (unsigned int)desc_buf;
-+	if (!desc_buf) {
-+		dev_err(toe->dev, "%s::DMA ALLOC fail\n", __func__);
-+		return;
-+	}
-+	memset(desc_buf, 0, TOE_GMAC_SWTXQ_DESC_NUM * TOE_SW_TXQ_NUM * sizeof(GMAC_TXDESC_T));
-+	dma_sync_single_for_device(toe->dev, gmac->swtxq_desc_base_dma,
-+				TOE_GMAC_SWTXQ_DESC_NUM * TOE_SW_TXQ_NUM * sizeof(GMAC_TXDESC_T),
-+				DMA_TO_DEVICE);
-+	__raw_writel((gmac->swtxq_desc_base_dma & DMA_Q_BASE_MASK) | TOE_GMAC_SWTXQ_DESC_POWER,
-+			gmac->dma_base_addr + GMAC_SW_TX_QUEUE_BASE_REG);
-+
-+	/* GMAC0 SW TX Q0-Q5 */
-+	offset = 0;
-+	rwptr_reg.bits.wptr = 0;
-+	rwptr_reg.bits.rptr = 0;
-+	rwptr_addr = gmac->dma_base_addr + GMAC_SW_TX_QUEUE0_PTR_REG;
-+	for (i = 0; i < TOE_SW_TXQ_NUM; i++) {
-+		gmac->swtxq[i].rwptr_reg = rwptr_addr;
-+		gmac->swtxq[i].desc_base_dma = (unsigned int)gmac->swtxq_desc_base_dma + offset;
-+		gmac->swtxq[i].desc_base = (unsigned int)desc_buf + offset;
-+		offset += TOE_GMAC_SWTXQ_DESC_NUM * sizeof(GMAC_TXDESC_T);
-+		__raw_writel(rwptr_reg.bits32, rwptr_addr);
-+		rwptr_addr += 4;
-+	}
-+}
-+
-+/*----------------------------------------------------------------------
-+*	toe_init_default_queue
-+*	(1) Initialize the default 0/1 Queue Header
-+*		Register: TOE_DEFAULT_Q0_HDR_BASE (0x60002000)
-+*			  TOE_DEFAULT_Q1_HDR_BASE (0x60002008)
-+*	(2)	Initialize Descriptors of Default Queue 0/1
-+*----------------------------------------------------------------------*/
-+static void toe_init_default_queue(struct net_device *dev)
-+{
-+	struct gmac_private	*gmac = netdev_priv(dev);
-+	struct toe_private	*toe = dev->ml_priv;
-+	volatile NONTOE_QHDR_T	*qhdr;
-+	GMAC_RXDESC_T		*desc_ptr;
-+
-+	desc_ptr = dma_alloc_coherent(toe->dev, TOE_DEFAULT_Q_DESC_NUM * sizeof(GMAC_RXDESC_T),
-+				      &gmac->default_desc_base_dma, GFP_KERNEL);
-+	if (!desc_ptr) {
-+		dev_err(toe->dev, "%s::DMA ALLOC fail\n", __func__);
-+		return;
-+	}
-+	memset(desc_ptr, 0, TOE_DEFAULT_Q_DESC_NUM * sizeof(GMAC_RXDESC_T));
-+	dma_sync_single_for_device(toe->dev, gmac->default_desc_base_dma,
-+			TOE_DEFAULT_Q_DESC_NUM * sizeof(GMAC_RXDESC_T),
-+			DMA_TO_DEVICE);
-+	gmac->default_desc_base = (unsigned int)desc_ptr;
-+	qhdr = (volatile NONTOE_QHDR_T *)(toe->global_base + TOE_DEFAULT_Q_HDR_BASE(gmac->port_id));
-+	qhdr->word0.base_size = ((unsigned int)gmac->default_desc_base_dma & NONTOE_QHDR0_BASE_MASK) | TOE_DEFAULT_Q_DESC_POWER;
-+	qhdr->word1.bits32 = 0;
-+	gmac->default_qhdr = (NONTOE_QHDR_T *)qhdr;
-+}
-+
-+/*----------------------------------------------------------------------
-+*	toe_init_interrupt_config
-+*	Interrupt Select Registers are used to map interrupt to int0 or int1
-+*	Int0 and int1 are wired to CPU 0/1 GMAC 0/1
-+*	Interrupt Device Inteface data are used to pass device info to
-+*		upper device driver or store status/statistics
-+*	ISR handler
-+*		(1) If status bit ON but masked, the prinf error message (bug issue)
-+*		(2) If select bits are for me, handle it, else skip to let
-+*			the other ISR handles it.
-+*  Notes:
-+*		GMACx init routine (for eCOS) or open routine (for Linux)
-+*		enable the interrupt bits only which are selected for it.
-+*
-+*	Default Setting:
-+*		GMAC0 intr bits ------>	int0 ----> eth0
-+*		GMAC1 intr bits ------> int1 ----> eth1
-+*		TOE intr -------------> int0 ----> eth0
-+*		Classification Intr --> int0 ----> eth0
-+*		Default Q0 -----------> int0 ----> eth0
-+*		Default Q1 -----------> int1 ----> eth1
-+*----------------------------------------------------------------------*/
-+static void toe_init_interrupt_config(struct toe_private *toe)
-+{
-+	/* clear all status bits */
-+	__raw_writel(0xffffffff, toe->global_base + GLOBAL_INTERRUPT_STATUS_0_REG);
-+	__raw_writel(0xffffffff, toe->global_base + GLOBAL_INTERRUPT_STATUS_1_REG);
-+	__raw_writel(0xffffffff, toe->global_base + GLOBAL_INTERRUPT_STATUS_2_REG);
-+	__raw_writel(0xffffffff, toe->global_base + GLOBAL_INTERRUPT_STATUS_3_REG);
-+	__raw_writel(0xffffffff, toe->global_base + GLOBAL_INTERRUPT_STATUS_4_REG);
-+
-+	/* Init select registers */
-+	__raw_writel(0, toe->global_base + GLOBAL_INTERRUPT_SELECT_0_REG);
-+	__raw_writel(0, toe->global_base + GLOBAL_INTERRUPT_SELECT_1_REG);
-+	__raw_writel(0, toe->global_base + GLOBAL_INTERRUPT_SELECT_2_REG);
-+	__raw_writel(0, toe->global_base + GLOBAL_INTERRUPT_SELECT_3_REG);
-+	__raw_writel(0, toe->global_base + GLOBAL_INTERRUPT_SELECT_4_REG);
-+
-+	/* disable all interrupt */
-+	__raw_writel(0, toe->global_base + GLOBAL_INTERRUPT_ENABLE_0_REG);
-+	__raw_writel(0, toe->global_base + GLOBAL_INTERRUPT_ENABLE_1_REG);
-+	__raw_writel(0, toe->global_base + GLOBAL_INTERRUPT_ENABLE_2_REG);
-+	__raw_writel(0, toe->global_base + GLOBAL_INTERRUPT_ENABLE_3_REG);
-+	__raw_writel(0, toe->global_base + GLOBAL_INTERRUPT_ENABLE_4_REG);
-+}
-+
-+static void toe_gmac_hw_start(struct gmac_private *gmac)
-+{
-+	GMAC_DMA_CTRL_T	dma_ctrl;
-+
-+	/* program dma control register */
-+	dma_ctrl.bits32 = __raw_readl(gmac->dma_base_addr + GMAC_DMA_CTRL_REG);
-+	dma_ctrl.bits.rd_enable = 1;
-+	dma_ctrl.bits.td_enable = 1;
-+	dma_ctrl.bits.loopback = 0;
-+	dma_ctrl.bits.drop_small_ack = 0;
-+	dma_ctrl.bits.rd_prot = 0;
-+	dma_ctrl.bits.rd_burst_size = 3;
-+	dma_ctrl.bits.rd_insert_bytes = RX_INSERT_BYTES;
-+	dma_ctrl.bits.rd_bus = 3;
-+	dma_ctrl.bits.td_prot = 0;
-+	dma_ctrl.bits.td_burst_size = 3;
-+	dma_ctrl.bits.td_bus = 3;
-+
-+	__raw_writel(dma_ctrl.bits32, gmac->dma_base_addr + GMAC_DMA_CTRL_REG);
-+}
-+
-+static void toe_gmac_hw_stop(struct gmac_private *gmac)
-+{
-+	GMAC_DMA_CTRL_T	dma_ctrl;
-+
-+	/* program dma control register */
-+	dma_ctrl.bits32 = __raw_readl(gmac->dma_base_addr + GMAC_DMA_CTRL_REG);
-+	dma_ctrl.bits.rd_enable = 0;
-+	dma_ctrl.bits.td_enable = 0;
-+	__raw_writel(dma_ctrl.bits32, gmac->dma_base_addr + GMAC_DMA_CTRL_REG);
-+}
-+
-+static void toe_gmac_init_chip(struct net_device *dev)
-+{
-+	struct gmac_private	*gmac = netdev_priv(dev);
-+	GMAC_CONFIG2_T	config2_val;
-+	GMAC_CONFIG0_T	config0;
-+	GMAC_CONFIG1_T	config1;
-+	GMAC_STATUS_T	status;
-+	GMAC_TX_WCR0_T	hw_weigh;
-+	GMAC_TX_WCR1_T	sw_weigh;
-+	GMAC_RX_FLTR_T	rx_filter;
-+
-+	/* set RX_FLTR register to receive all multicast packet */
-+	rx_filter.bits32 = __raw_readl(dev->base_addr + GMAC_RX_FLTR);
-+	rx_filter.bits.unicast = 1;
-+	rx_filter.bits.multicast = 1;
-+	rx_filter.bits.broadcast = 1;
-+	__raw_writel(rx_filter.bits32, dev->base_addr + GMAC_RX_FLTR);
-+
-+	/* set flow control threshold */
-+	config1.bits32 = 0;
-+	config1.bits.set_threshold = 32 / 2;
-+	config1.bits.rel_threshold = 32 / 4 * 3;
-+	__raw_writel(config1.bits32, dev->base_addr + GMAC_CONFIG1);
-+
-+	/* set flow control threshold */
-+	config2_val.bits32 = 0;
-+	config2_val.bits.set_threshold = TOE_SW_FREEQ_DESC_NUM / 4;
-+	config2_val.bits.rel_threshold = TOE_SW_FREEQ_DESC_NUM / 2;
-+	__raw_writel(config2_val.bits32, dev->base_addr + GMAC_CONFIG2);
-+
-+	/* disable TX/RX and disable internal loop back */
-+	config0.bits32 = __raw_readl(dev->base_addr + GMAC_CONFIG0);
-+
-+	config0.bits.max_len = 2;
-+
-+	gmac->flow_control_enable = 0;
-+
-+	config0.bits.tx_fc_en = 0;	/* disable tx flow control */
-+	config0.bits.rx_fc_en = 0;	/* disable rx flow control */
-+	config0.bits.dis_rx = 1;	/* disable rx */
-+	config0.bits.dis_tx = 1;	/* disable tx */
-+	config0.bits.loop_back = 0;	/* enable/disable GMAC loopback */
-+	config0.bits.rx_err_detect = 1;
-+	config0.bits.rgmii_en = 0;
-+	config0.bits.rgmm_edge = 1;
-+	config0.bits.rxc_inv = 0;
-+	config0.bits.ipv4_rx_chksum = 1;	/* enable H/W to check ip checksum */
-+	config0.bits.ipv6_rx_chksum = 1;	/* enable H/W to check ip checksum */
-+	config0.bits.port0_chk_hwq = 1;
-+	config0.bits.port1_chk_hwq = 1;
-+	config0.bits.port0_chk_toeq = 1;
-+	config0.bits.port1_chk_toeq = 1;
-+	config0.bits.port0_chk_classq = 1;
-+	config0.bits.port1_chk_classq = 1;
-+
-+	__raw_writel(config0.bits32, dev->base_addr + GMAC_CONFIG0);
-+
-+	hw_weigh.bits32 = 0;
-+	hw_weigh.bits.hw_tq3 = 1;
-+	hw_weigh.bits.hw_tq2 = 1;
-+	hw_weigh.bits.hw_tq1 = 1;
-+	hw_weigh.bits.hw_tq0 = 1;
-+	__raw_writel(hw_weigh.bits32, gmac->dma_base_addr + GMAC_TX_WEIGHTING_CTRL_0_REG);
-+
-+	sw_weigh.bits32 = 0;
-+	sw_weigh.bits.sw_tq5 = 1;
-+	sw_weigh.bits.sw_tq4 = 1;
-+	sw_weigh.bits.sw_tq3 = 1;
-+	sw_weigh.bits.sw_tq2 = 1;
-+	sw_weigh.bits.sw_tq1 = 1;
-+	sw_weigh.bits.sw_tq0 = 1;
-+	__raw_writel(sw_weigh.bits32, gmac->dma_base_addr + GMAC_TX_WEIGHTING_CTRL_1_REG);
-+
-+	/* set interface type */
-+	status.bits32 = __raw_readl(dev->base_addr + GMAC_STATUS);
-+
-+	switch (gmac->phydev->interface) {
-+	case PHY_INTERFACE_MODE_MII:
-+		status.bits.mii_rmii = GMAC_PHY_MII;
-+		break;
-+	case PHY_INTERFACE_MODE_GMII:
-+		status.bits.mii_rmii = GMAC_PHY_GMII;
-+		break;
-+	case PHY_INTERFACE_MODE_RGMII:
-+		status.bits.mii_rmii = GMAC_PHY_RGMII_100_10;
-+		break;
-+	default:
-+		dev_err(&dev->dev, "Unsupported MII interface\n");
-+		return;
-+	}
-+
-+	__raw_writel(status.bits32, dev->base_addr + GMAC_STATUS);
-+}
-+
-+static void toe_init_gmac(struct net_device *dev)
-+{
-+	struct gmac_private	*gmac = netdev_priv(dev);
-+	struct toe_private	*toe = dev->ml_priv;
-+	u32			data;
-+
-+	/* GMAC initialization */
-+	toe_gmac_init_chip(dev);
-+
-+	/* -----------------------------------------------------------
-+	Enable GMAC interrupt & disable loopback
-+	Notes:
-+		GMACx init routine (for eCOS) or open routine (for Linux)
-+		enable the interrupt bits only which are selected for him.
-+	--------------------------------------------------------------*/
-+
-+	/* Enable Interrupt Bits */
-+	if (gmac->port_id == 0) {
-+		gmac->intr0_selected =	GMAC0_TXDERR_INT_BIT | GMAC0_TXPERR_INT_BIT	|
-+					GMAC0_RXDERR_INT_BIT | GMAC0_RXPERR_INT_BIT	|
-+					GMAC0_SWTQ05_FIN_INT_BIT | GMAC0_SWTQ05_EOF_INT_BIT |
-+					GMAC0_SWTQ04_FIN_INT_BIT | GMAC0_SWTQ04_EOF_INT_BIT |
-+					GMAC0_SWTQ03_FIN_INT_BIT | GMAC0_SWTQ03_EOF_INT_BIT |
-+					GMAC0_SWTQ02_FIN_INT_BIT | GMAC0_SWTQ02_EOF_INT_BIT |
-+					GMAC0_SWTQ01_FIN_INT_BIT | GMAC0_SWTQ01_EOF_INT_BIT |
-+					GMAC0_SWTQ00_FIN_INT_BIT | GMAC0_SWTQ00_EOF_INT_BIT;
-+
-+#ifdef GMAX_TX_INTR_DISABLED
-+		gmac->intr0_enabled = 0;
-+#else
-+		gmac->intr0_enabled = GMAC0_SWTQ00_FIN_INT_BIT | GMAC0_SWTQ00_EOF_INT_BIT;
-+#endif
-+
-+		gmac->intr1_selected = TOE_IQ_ALL_BITS | TOE_CLASS_RX_INT_BITS |
-+					GMAC0_HWTQ03_EOF_INT_BIT | GMAC0_HWTQ02_EOF_INT_BIT |
-+					GMAC0_HWTQ01_EOF_INT_BIT | GMAC0_HWTQ00_EOF_INT_BIT |
-+					DEFAULT_Q0_INT_BIT;
-+		gmac->intr1_enabled =	DEFAULT_Q0_INT_BIT | TOE_IQ_ALL_BITS;
-+		gmac->intr2_selected =	0xffffffff;	 /* TOE Queue 32-63 FUUL Intr */
-+		gmac->intr2_enabled =	0xffffffff;
-+		gmac->intr3_selected =	0xffffffff;	 /* TOE Queue 0-31 FUUL Intr */
-+		gmac->intr3_enabled =	0xffffffff;
-+		gmac->intr4_selected =	GMAC0_INT_BITS | CLASS_RX_FULL_INT_BITS |
-+							HWFQ_EMPTY_INT_BIT | SWFQ_EMPTY_INT_BIT;
-+		gmac->intr4_enabled =	GMAC0_INT_BITS | SWFQ_EMPTY_INT_BIT;
-+
-+		data = __raw_readl(toe->global_base + GLOBAL_INTERRUPT_SELECT_0_REG) & ~gmac->intr0_selected;
-+		__raw_writel(data, toe->global_base + GLOBAL_INTERRUPT_SELECT_0_REG);
-+		data = __raw_readl(toe->global_base + GLOBAL_INTERRUPT_SELECT_1_REG) & ~gmac->intr1_selected;
-+		__raw_writel(data, toe->global_base + GLOBAL_INTERRUPT_SELECT_1_REG);
-+		data = __raw_readl(toe->global_base + GLOBAL_INTERRUPT_SELECT_2_REG) & ~gmac->intr2_selected;
-+		__raw_writel(data, toe->global_base + GLOBAL_INTERRUPT_SELECT_2_REG);
-+		data = __raw_readl(toe->global_base + GLOBAL_INTERRUPT_SELECT_3_REG) & ~gmac->intr3_selected;
-+		__raw_writel(data, toe->global_base + GLOBAL_INTERRUPT_SELECT_3_REG);
-+		data = __raw_readl(toe->global_base + GLOBAL_INTERRUPT_SELECT_4_REG) & ~gmac->intr4_selected;
-+		__raw_writel(data, toe->global_base + GLOBAL_INTERRUPT_SELECT_4_REG);
-+	} else {
-+		gmac->intr0_selected =	GMAC1_TXDERR_INT_BIT | GMAC1_TXPERR_INT_BIT	|
-+					GMAC1_RXDERR_INT_BIT | GMAC1_RXPERR_INT_BIT	|
-+					GMAC1_SWTQ15_FIN_INT_BIT | GMAC1_SWTQ15_EOF_INT_BIT |
-+					GMAC1_SWTQ14_FIN_INT_BIT | GMAC1_SWTQ14_EOF_INT_BIT |
-+					GMAC1_SWTQ13_FIN_INT_BIT | GMAC1_SWTQ13_EOF_INT_BIT |
-+					GMAC1_SWTQ12_FIN_INT_BIT | GMAC1_SWTQ12_EOF_INT_BIT |
-+					GMAC1_SWTQ11_FIN_INT_BIT | GMAC1_SWTQ11_EOF_INT_BIT |
-+					GMAC1_SWTQ10_FIN_INT_BIT | GMAC1_SWTQ10_EOF_INT_BIT;
-+#ifdef GMAX_TX_INTR_DISABLED
-+		gmac->intr0_enabled =		0;
-+#else
-+		gmac->intr0_enabled =		GMAC1_SWTQ10_FIN_INT_BIT | GMAC1_SWTQ10_EOF_INT_BIT;
-+#endif
-+
-+		gmac->intr1_selected =	DEFAULT_Q1_INT_BIT;
-+		gmac->intr1_enabled =	DEFAULT_Q1_INT_BIT | TOE_IQ_ALL_BITS;
-+		gmac->intr2_selected =	0;	 /* TOE Queue 32-63 FUUL Intr */
-+		gmac->intr2_enabled =	0;
-+		gmac->intr3_selected =	0;	 /* TOE Queue 0-31 FUUL Intr */
-+		gmac->intr3_enabled =	0;
-+		gmac->intr4_selected =	GMAC1_INT_BITS;
-+		gmac->intr4_enabled =	GMAC1_INT_BITS;
-+
-+		data = __raw_readl(toe->global_base + GLOBAL_INTERRUPT_SELECT_0_REG) | gmac->intr0_selected;
-+		__raw_writel(data, toe->global_base + GLOBAL_INTERRUPT_SELECT_0_REG);
-+		data = __raw_readl(toe->global_base + GLOBAL_INTERRUPT_SELECT_1_REG) | gmac->intr1_selected;
-+		__raw_writel(data, toe->global_base + GLOBAL_INTERRUPT_SELECT_1_REG);
-+		data = __raw_readl(toe->global_base + GLOBAL_INTERRUPT_SELECT_2_REG) | gmac->intr2_selected;
-+		__raw_writel(data, toe->global_base + GLOBAL_INTERRUPT_SELECT_2_REG);
-+		data = __raw_readl(toe->global_base + GLOBAL_INTERRUPT_SELECT_3_REG) | gmac->intr3_selected;
-+		__raw_writel(data, toe->global_base + GLOBAL_INTERRUPT_SELECT_3_REG);
-+		data = __raw_readl(toe->global_base + GLOBAL_INTERRUPT_SELECT_4_REG) | gmac->intr4_selected;
-+		__raw_writel(data, toe->global_base + GLOBAL_INTERRUPT_SELECT_4_REG);
-+	}
-+
-+	/* enable only selected bits */
-+	gmac_write_reg(toe->global_base, GLOBAL_INTERRUPT_ENABLE_0_REG,
-+					gmac->intr0_enabled, gmac->intr0_selected);
-+	gmac_write_reg(toe->global_base, GLOBAL_INTERRUPT_ENABLE_1_REG,
-+					gmac->intr1_enabled, gmac->intr1_selected);
-+	gmac_write_reg(toe->global_base, GLOBAL_INTERRUPT_ENABLE_2_REG,
-+					gmac->intr2_enabled, gmac->intr2_selected);
-+	gmac_write_reg(toe->global_base, GLOBAL_INTERRUPT_ENABLE_3_REG,
-+					gmac->intr3_enabled, gmac->intr3_selected);
-+	gmac_write_reg(toe->global_base, GLOBAL_INTERRUPT_ENABLE_4_REG,
-+					gmac->intr4_enabled, gmac->intr4_selected);
-+
-+	/* start DMA process */
-+	toe_gmac_hw_start(gmac);
-+}
-+
-+static void toe_gmac_enable_tx_rx(struct net_device *dev)
-+{
-+	GMAC_CONFIG0_T	config0;
-+
-+	/* enable TX/RX */
-+	config0.bits32 = __raw_readl(dev->base_addr + GMAC_CONFIG0);
-+	config0.bits.dis_rx = 0;	/* enable rx */
-+	config0.bits.dis_tx = 0;	/* enable tx */
-+	__raw_writel(config0.bits32, dev->base_addr + GMAC_CONFIG0);
-+}
-+
-+static void toe_gmac_disable_tx_rx(struct net_device *dev)
-+{
-+	GMAC_CONFIG0_T	config0;
-+
-+	/* enable TX/RX */
-+	config0.bits32 = __raw_readl(dev->base_addr + GMAC_CONFIG0);
-+	config0.bits.dis_rx = 1;	/* disable rx */
-+	config0.bits.dis_tx = 1;	/* disable tx */
-+	__raw_writel(config0.bits32, dev->base_addr + GMAC_CONFIG0);
-+}
-+
-+static void toe_gmac_tx_complete(struct net_device *dev, unsigned int tx_qid)
-+{
-+	struct gmac_private		*gmac = netdev_priv(dev);
-+	struct toe_private		*toe = dev->ml_priv;
-+	GMAC_TXDESC_T			*curr_desc;
-+	GMAC_TXDESC_0_T			word0;
-+	GMAC_TXDESC_1_T			word1;
-+	unsigned int			desc_count;
-+	GMAC_SWTXQ_T			*swtxq;
-+	DMA_RWPTR_T			rwptr;
-+
-+	/* get tx H/W completed descriptor virtual address */
-+	/* check tx status and accumulate tx statistics */
-+	swtxq = &gmac->swtxq[tx_qid];
-+	for (;;) {
-+		rwptr.bits32 = __raw_readl(swtxq->rwptr_reg);
-+		if (rwptr.bits.rptr == swtxq->finished_idx)
-+			break;
-+		curr_desc = (GMAC_TXDESC_T *)swtxq->desc_base + swtxq->finished_idx;
-+		dma_sync_single_range_for_device(toe->dev, swtxq->desc_base_dma,
-+						swtxq->finished_idx * sizeof(GMAC_TXDESC_T),
-+						sizeof(GMAC_TXDESC_T),
-+						DMA_FROM_DEVICE);
-+		word0.bits32 = curr_desc->word0.bits32;
-+		word1.bits32 = curr_desc->word1.bits32;
-+
-+		if (word0.bits.status_tx_ok) {
-+			dev->stats.tx_bytes += word1.bits.byte_count;
-+			desc_count = word0.bits.desc_count;
-+			if (desc_count == 0) {
-+				dev_err(&dev->dev, "%s::Desc 0x%x = 0x%x, desc_count=%d\n", __func__, (u32)curr_desc, word0.bits32, desc_count);
-+				BUG();
-+			}
-+			while (--desc_count) {
-+				word0.bits.status_tx_ok = 0;
-+				curr_desc->word0.bits32 = word0.bits32;
-+				dma_sync_single_range_for_device(toe->dev, swtxq->desc_base_dma,
-+								swtxq->finished_idx * sizeof(GMAC_TXDESC_T),
-+								sizeof(GMAC_TXDESC_T),
-+								DMA_TO_DEVICE);
-+				swtxq->finished_idx = RWPTR_ADVANCE_ONE(swtxq->finished_idx, TOE_GMAC_SWTXQ_DESC_NUM);
-+				curr_desc = (GMAC_TXDESC_T *)swtxq->desc_base + swtxq->finished_idx;
-+				dma_sync_single_range_for_device(toe->dev, swtxq->desc_base_dma,
-+								swtxq->finished_idx * sizeof(GMAC_TXDESC_T),
-+								sizeof(GMAC_TXDESC_T),
-+								DMA_FROM_DEVICE);
-+				word0.bits32 = curr_desc->word0.bits32;
-+			}
-+
-+			word0.bits.status_tx_ok = 0;
-+			dev_kfree_skb_any(swtxq->tx_skb[swtxq->finished_idx]);
-+			swtxq->tx_skb[swtxq->finished_idx] = NULL;
-+
-+			curr_desc->word0.bits32 = word0.bits32;
-+			dma_sync_single_range_for_device(toe->dev, swtxq->desc_base_dma,
-+							swtxq->finished_idx * sizeof(GMAC_TXDESC_T),
-+							sizeof(GMAC_TXDESC_T),
-+							DMA_TO_DEVICE);
-+			dev->stats.tx_packets++;
-+			swtxq->finished_idx = RWPTR_ADVANCE_ONE(swtxq->finished_idx, TOE_GMAC_SWTXQ_DESC_NUM);
-+		} else {
-+			break;
-+		}
-+	}
-+
-+	if (netif_queue_stopped(dev))
-+		netif_wake_queue(dev);
-+}
-+
-+static int gmac_start_xmit(struct sk_buff *skb, struct net_device *dev)
-+{
-+	struct gmac_private	*gmac = netdev_priv(dev);
-+	struct toe_private	*toe = dev->ml_priv;
-+	DMA_RWPTR_T		rwptr;
-+	GMAC_TXDESC_T		*curr_desc;
-+	int			snd_pages = skb_shinfo(skb)->nr_frags + 1;	/* get number of descriptor */
-+	int			frag_id = 0;
-+	int			len, total_len = skb->len;
-+	struct net_device_stats	*isPtr = &dev->stats;
-+	unsigned int		free_desc;
-+	GMAC_SWTXQ_T		*swtxq;
-+	register unsigned long	word0, word1, word2, word3;
-+	unsigned short		wptr, rptr;
-+
-+#ifdef GMAC_LEN_1_2_ISSUE
-+	int			total_pages;
-+	total_pages = snd_pages;
-+#endif
-+
-+	if (skb->len >= 0x10000) {
-+		isPtr->tx_dropped++;
-+		dev_err(&dev->dev, "%s::skb->len %d >= 64K\n", __func__, skb->len);
-+		netif_stop_queue(dev);
-+		return 1;
-+	}
-+
-+#ifdef GMAC_USE_TXQ0
-+	#define tx_qid	0
-+#endif
-+
-+	swtxq = &gmac->swtxq[tx_qid];
-+
-+	rwptr.bits32 = __raw_readl(swtxq->rwptr_reg);
-+	wptr = rwptr.bits.wptr;
-+	rptr = rwptr.bits.rptr;
-+
-+	/*
-+	 * check finished desc or empty BD
-+	 * cannot check by read ptr of RW PTR register,
-+	 * because the HW complete to send but the SW may NOT handle it
-+	 */
-+#ifdef	GMAX_TX_INTR_DISABLED
-+	toe_gmac_tx_complete(dev, tx_qid);
-+#endif
-+	if (wptr >= swtxq->finished_idx)
-+		free_desc = TOE_GMAC_SWTXQ_DESC_NUM - wptr + swtxq->finished_idx;
-+	else
-+		free_desc = swtxq->finished_idx - wptr;
-+
-+	if (free_desc < snd_pages) {
-+		isPtr->tx_dropped++;
-+		netif_stop_queue(dev);
-+		return 1;
-+	}
-+
-+	while (snd_pages) {
-+		char *pkt_datap;
-+
-+		curr_desc = (GMAC_TXDESC_T *)swtxq->desc_base + wptr;
-+		if (frag_id == 0) {
-+			len = skb_headlen(skb);
-+			pkt_datap = dma_map_single(toe->dev, skb->data, len, DMA_TO_DEVICE);
-+		} else {
-+			skb_frag_t *frag = &skb_shinfo(skb)->frags[frag_id - 1];
-+			len = frag->size;
-+			pkt_datap = dma_map_page(toe->dev, frag->page, frag->page_offset, len, DMA_TO_DEVICE);
-+		}
-+
-+		/* set TX descriptor */
-+		word0 = len;
-+		word3 = (dev->mtu + 14) | EOFIE_BIT;
-+
-+#ifdef DO_HW_CHKSUM
-+		if (total_len <= 1514 && ip_hdr(skb) && (ip_hdr(skb)->frag_off & __constant_htons(0x3fff)))
-+			word1  = total_len |
-+					TSS_IP_CHKSUM_BIT  |
-+					TSS_IPV6_ENABLE_BIT |
-+					TSS_MTU_ENABLE_BIT;
-+		else
-+			word1 = total_len |
-+					TSS_UDP_CHKSUM_BIT |
-+					TSS_TCP_CHKSUM_BIT |
-+					TSS_IP_CHKSUM_BIT  |
-+					TSS_IPV6_ENABLE_BIT |
-+					TSS_MTU_ENABLE_BIT;
-+#else
-+		word1 = total_len | TSS_MTU_ENABLE_BIT;
-+#endif
-+		word2 = pkt_datap;
-+
-+		if (frag_id == 0)
-+			word3 |= SOF_BIT;
-+
-+		if (snd_pages == 1) {
-+			word3 |= EOF_BIT;
-+			swtxq->tx_skb[wptr] = skb;
-+		} else
-+			swtxq->tx_skb[wptr] = NULL;
-+
-+#ifdef GMAC_LEN_1_2_ISSUE
-+		if ((total_pages != snd_pages) && (len == 1 || len == 2) && ((u32)pkt_datap & 0x03)) {
-+			memcpy((void *)&_debug_prefetch_buf[_debug_prefetch_cnt][0], pkt_datap, len);
-+			pkt_datap = (char *)&_debug_prefetch_buf[_debug_prefetch_cnt][0];
-+			word2 = (unsigned long)__pa(pkt_datap);
-+			_debug_prefetch_cnt++;
-+			if (_debug_prefetch_cnt >= _DEBUG_PREFETCH_NUM)
-+				_debug_prefetch_cnt = 0;
-+		}
-+#endif
-+		curr_desc->word0.bits32 = word0;
-+		curr_desc->word1.bits32 = word1;
-+		curr_desc->word2.bits32 = word2;
-+		curr_desc->word3.bits32 = word3;
-+		free_desc--;
-+		dma_sync_single_range_for_device(toe->dev, swtxq->desc_base_dma,
-+						wptr * sizeof(GMAC_TXDESC_T),
-+						sizeof(GMAC_TXDESC_T),
-+						DMA_TO_DEVICE);
-+		wptr = RWPTR_ADVANCE_ONE(wptr, TOE_GMAC_SWTXQ_DESC_NUM);
-+		frag_id++;
-+		snd_pages--;
-+	}
-+
-+	SET_WPTR(swtxq->rwptr_reg, wptr);
-+	dev->trans_start = jiffies;
-+
-+	return 0;
-+}
-+
-+static void __gmac_set_mac_address(struct net_device *dev)
-+{
-+	unsigned int    reg_val;
-+
-+	reg_val = dev->dev_addr[0] + (dev->dev_addr[1] << 8) +
-+		  (dev->dev_addr[2] << 16) + (dev->dev_addr[3] << 24);
-+	__raw_writel(reg_val, dev->base_addr + GMAC_STA_ADD0);
-+	reg_val = (__raw_readl(dev->base_addr + GMAC_STA_ADD1) & 0xFFFF0000) +
-+		  dev->dev_addr[4] + (dev->dev_addr[5] << 8);
-+	__raw_writel(reg_val, dev->base_addr + GMAC_STA_ADD1);
-+}
-+
-+static int gmac_set_mac_address(struct net_device *dev, void *addr)
-+{
-+	struct sockaddr *sa = addr;
-+
-+	memcpy(dev->dev_addr, sa->sa_data, dev->addr_len);
-+
-+	__gmac_set_mac_address(dev);
-+
-+	return 0;
-+}
-+
-+static void gmac_get_mac_address(struct net_device *dev)
-+{
-+	unsigned int reg_val;
-+
-+	reg_val = __raw_readl(dev->base_addr + GMAC_STA_ADD0);
-+	dev->dev_addr[0] = reg_val & 0xFF;
-+	dev->dev_addr[1] = (reg_val >> 8) & 0xFF;
-+	dev->dev_addr[2] = (reg_val >> 16) & 0xFF;
-+	dev->dev_addr[3] = (reg_val >> 24) & 0xFF;
-+	reg_val = __raw_readl(dev->base_addr + GMAC_STA_ADD1);
-+	dev->dev_addr[4] = reg_val & 0xFF;
-+	dev->dev_addr[5] = (reg_val >> 8) & 0xFF;
-+
-+	if (!is_valid_ether_addr(dev->dev_addr)) {
-+		random_ether_addr(dev->dev_addr);
-+		__gmac_set_mac_address(dev);
-+	}
-+}
-+
-+struct net_device_stats *gmac_get_stats(struct net_device *dev)
-+{
-+	if (netif_running(dev)) {
-+		unsigned short multicast;
-+
-+		multicast = __raw_readw(dev->base_addr + GMAC_IN_MCAST) +
-+				__raw_readw(dev->base_addr + GMAC_IN_BCAST);
-+
-+		dev->stats.rx_dropped += __raw_readw(dev->base_addr + GMAC_IN_DISCARDS);
-+		dev->stats.rx_errors += __raw_readw(dev->base_addr + GMAC_IN_ERRORS);
-+		dev->stats.rx_packets += __raw_readl(dev->base_addr + GMAC_IN_MAC1) + multicast;
-+		dev->stats.multicast += multicast;
-+	}
-+
-+	return &dev->stats;
-+}
-+
-+/* TODO: If possible use crc32 from kernel lib */
-+static unsigned const ethernet_polynomial = 0x04c11db7U;
-+static unsigned int ether_crc(int length, unsigned char *data)
-+{
-+	int crc = -1;
-+	unsigned int i;
-+	unsigned int crc_val = 0;
-+
-+	while (--length >= 0) {
-+		unsigned char current_octet = *data++;
-+		int bit;
-+		for (bit = 0; bit < 8; bit++, current_octet >>= 1)
-+			crc = (crc << 1) ^ ((crc < 0) ^ (current_octet & 1) ?
-+				ethernet_polynomial : 0);
-+	}
-+	crc = ~crc;
-+	for (i = 0; i < 32; i++)
-+		crc_val = crc_val + (((crc << i) & 0x80000000) >> (31 - i));
-+
-+	return crc_val;
-+}
-+
-+/*----------------------------------------------------------------------
-+* toe_gmac_fill_free_q
-+* allocate buffers for free queue.
-+*----------------------------------------------------------------------*/
-+static void toe_gmac_fill_free_q(struct toe_private *toe)
-+{
-+	struct sk_buff	*skb;
-+	DMA_RWPTR_T	fq_rwptr;
-+	GMAC_RXDESC_T	*fq_desc;
-+	unsigned long	flags;
-+
-+	spin_lock_irqsave(&toe->freeq_lock, flags);
-+	fq_rwptr.bits32 = __raw_readl(toe->global_base + GLOBAL_SWFQ_RWPTR_REG);
-+	while ((unsigned short)RWPTR_ADVANCE_ONE(fq_rwptr.bits.wptr,
-+		TOE_SW_FREEQ_DESC_NUM) != fq_rwptr.bits.rptr) {
-+		skb = dev_alloc_skb(SW_RX_BUF_SIZE);
-+		if (skb == NULL) {
-+			dev_err(toe->dev, "%s::skb allocation fail\n", __func__);
-+			break;
-+		}
-+		REG32(skb->data) = (unsigned int)skb;
-+		skb_reserve(skb, SKB_RESERVE_BYTES);
-+		fq_rwptr.bits.wptr = RWPTR_ADVANCE_ONE(fq_rwptr.bits.wptr,
-+			TOE_SW_FREEQ_DESC_NUM);
-+		fq_desc = (GMAC_RXDESC_T *)toe->swfq_desc_base + fq_rwptr.bits.wptr;
-+		fq_desc->word2.buf_adr = dma_map_single(toe->dev, skb->data,
-+					SW_RX_BUF_SIZE - SKB_RESERVE_BYTES,
-+					DMA_FROM_DEVICE);
-+		dma_sync_single_range_for_device(toe->dev,
-+				toe->sw_freeq_desc_base_dma,
-+				fq_rwptr.bits.wptr * sizeof(GMAC_RXDESC_T),
-+				sizeof(GMAC_RXDESC_T),
-+				DMA_TO_DEVICE);
-+		SET_WPTR(toe->global_base + GLOBAL_SWFQ_RWPTR_REG, fq_rwptr.bits.wptr);
-+	}
-+	spin_unlock_irqrestore(&toe->freeq_lock, flags);
-+}
-+
-+static void fill_free_q_worker(struct work_struct *work)
-+{
-+	struct toe_private *toe = container_of(work, struct toe_private, freq_work);
-+
-+	toe_gmac_fill_free_q(toe);
-+}
-+
-+/*----------------------------------------------------------------------
-+*	toe_gmac_handle_default_rxq
-+*	(1) Get rx Buffer for default Rx queue
-+*	(2) notify or call upper-routine to handle it
-+*	(3) get a new buffer and insert it into SW free queue
-+*	(4) Note: The SW free queue Read-Write Pointer should be locked when accessing
-+*----------------------------------------------------------------------*/
-+static void toe_gmac_handle_default_rxq(struct net_device *dev)
-+{
-+	struct gmac_private *gmac = netdev_priv(dev);
-+	struct toe_private *toe = dev->ml_priv;
-+	GMAC_RXDESC_T	*curr_desc;
-+	struct sk_buff	*skb;
-+	DMA_RWPTR_T	rwptr;
-+	unsigned int	pkt_size;
-+	int		max_cnt;
-+	unsigned int	desc_count;
-+	unsigned int	chksum_status, rx_status;
-+	struct net_device_stats *isPtr = &dev->stats;
-+
-+	rwptr.bits32 = __raw_readl(&gmac->default_qhdr->word1);
-+	max_cnt = DEFAULT_RXQ_MAX_CNT;
-+	while ((--max_cnt) && rwptr.bits.rptr != rwptr.bits.wptr) {
-+		curr_desc = (GMAC_RXDESC_T *)gmac->default_desc_base + rwptr.bits.rptr;
-+		dma_sync_single_range_for_device(toe->dev,
-+				gmac->default_desc_base_dma,
-+				rwptr.bits.rptr * sizeof(GMAC_RXDESC_T),
-+				sizeof(GMAC_RXDESC_T),
-+				DMA_FROM_DEVICE);
-+		rx_status = curr_desc->word0.bits.status;
-+		chksum_status = curr_desc->word0.bits.chksum_status;
-+		pkt_size = curr_desc->word1.bits.byte_count;	/* total byte count in a frame */
-+		desc_count = curr_desc->word0.bits.desc_count;	/* get descriptor count per frame */
-+		skb = (struct sk_buff *)(REG32(__va(curr_desc->word2.buf_adr) - SKB_RESERVE_BYTES));
-+
-+		if ((curr_desc->word0.bits32 & (GMAC_RXDESC_0_T_derr | GMAC_RXDESC_0_T_perr))
-+			|| (pkt_size < 60) || (chksum_status & 0x4) || rx_status) {
-+			if (curr_desc->word0.bits32 & GMAC_RXDESC_0_T_derr)
-+				dev_err(&dev->dev, "%s::derr\n", __func__);
-+			if (curr_desc->word0.bits32 & GMAC_RXDESC_0_T_perr)
-+				dev_err(&dev->dev, "%s::perr\n", __func__);
-+			if (rx_status && (rx_status == 4 || rx_status == 7))
-+				isPtr->rx_crc_errors++;
-+
-+			dev_kfree_skb_irq(skb);
-+			goto bad_frame;
-+		}
-+
-+		if (curr_desc->word0.bits.drop)
-+			dev_warn(&dev->dev, "%s::Drop\n", __func__);
-+
-+		/* get frame information from the first descriptor of the frame */
-+		skb_reserve(skb, RX_INSERT_BYTES);	/* 16 byte align the IP fields. */
-+		skb_put(skb, pkt_size);
-+		skb->dev = dev;
-+		skb->protocol = eth_type_trans(skb, dev);
-+		if (chksum_status == RX_CHKSUM_IP_UDP_TCP_OK || chksum_status == RX_CHKSUM_IP_OK_ONLY)
-+			skb->ip_summed = CHECKSUM_UNNECESSARY;
-+
-+		netif_rx(skb);	/* socket rx */
-+		dev->last_rx = jiffies;
-+
-+		isPtr->rx_bytes += pkt_size;
-+
-+bad_frame:
-+		/* advance one for Rx default Q 0/1 */
-+		rwptr.bits.rptr = RWPTR_ADVANCE_ONE(rwptr.bits.rptr, TOE_DEFAULT_Q_DESC_NUM);
-+		SET_RPTR(&gmac->default_qhdr->word1, rwptr.bits.rptr);
-+	}
-+
-+	schedule_work(&toe->freq_work);
-+}
-+
-+static irqreturn_t toe_gmac_interrupt(int irq, void *dev_instance)
-+{
-+	struct net_device	*dev = dev_instance;
-+	struct gmac_private	*gmac = netdev_priv(dev);
-+	struct toe_private	*toe = dev->ml_priv;
-+	unsigned int		status0;
-+	unsigned int		status1;
-+	unsigned int		status2;
-+	unsigned int		status3;
-+	unsigned int		status4;
-+	int			handled = 0;
-+
-+	/* read Interrupt status */
-+	status0 = __raw_readl(toe->global_base + GLOBAL_INTERRUPT_STATUS_0_REG);
-+	status1 = __raw_readl(toe->global_base + GLOBAL_INTERRUPT_STATUS_1_REG);
-+	status2 = __raw_readl(toe->global_base + GLOBAL_INTERRUPT_STATUS_2_REG);
-+	status3 = __raw_readl(toe->global_base + GLOBAL_INTERRUPT_STATUS_3_REG);
-+	status4 = __raw_readl(toe->global_base + GLOBAL_INTERRUPT_STATUS_4_REG);
-+
-+	/* clear interrupts */
-+	if (status0)
-+		__raw_writel(status0, toe->global_base + GLOBAL_INTERRUPT_STATUS_0_REG);
-+	if (status1)
-+		__raw_writel(status1, toe->global_base + GLOBAL_INTERRUPT_STATUS_1_REG);
-+	if (status2)
-+		__raw_writel(status2, toe->global_base + GLOBAL_INTERRUPT_STATUS_2_REG);
-+	if (status3)
-+		__raw_writel(status3, toe->global_base + GLOBAL_INTERRUPT_STATUS_3_REG);
-+	if (status4)
-+		__raw_writel(status4, toe->global_base + GLOBAL_INTERRUPT_STATUS_4_REG);
-+
-+	/* handle freeq interrupt first */
-+	if (status4 & gmac->intr4_enabled) {
-+		if ((status4 & SWFQ_EMPTY_INT_BIT) && (gmac->intr4_enabled & SWFQ_EMPTY_INT_BIT)) {
-+			toe_gmac_fill_free_q(toe);
-+			handled = 1;
-+		}
-+	}
-+
-+	/* Interrupt Status 1 */
-+	if (status1 & gmac->intr1_enabled) {
-+		/*
-+		 * Handle GMAC 0/1 HW Tx queue 0-3 EOF events
-+		 * Only count
-+		 * TOE, Classification, and default queues interrupts are handled by ISR
-+		 * because they should pass packets to upper layer
-+		 */
-+		if (gmac->port_id == 0) {
-+			if (netif_running(dev) && (status1 & DEFAULT_Q0_INT_BIT) && (gmac->intr1_enabled & DEFAULT_Q0_INT_BIT)) {
-+				toe_gmac_handle_default_rxq(dev);
-+				handled = 1;
-+			}
-+		} else if (gmac->port_id == 1) {
-+			if (netif_running(dev) && (status1 & DEFAULT_Q1_INT_BIT) && (gmac->intr1_enabled & DEFAULT_Q1_INT_BIT)) {
-+				toe_gmac_handle_default_rxq(dev);
-+				handled = 1;
-+			}
-+		}
-+	}
-+
-+	/* Interrupt Status 0 */
-+	if (status0 & gmac->intr0_enabled) {
-+#ifndef	GMAX_TX_INTR_DISABLED
-+		if (gmac->port_id == 1 && netif_running(dev) &&
-+			(((status0 & GMAC1_SWTQ10_FIN_INT_BIT) && (gmac->intr0_enabled & GMAC1_SWTQ10_FIN_INT_BIT))
-+			||
-+			((status0 & GMAC1_SWTQ10_EOF_INT_BIT) && (gmac->intr0_enabled & GMAC1_SWTQ10_EOF_INT_BIT)))) {
-+			toe_gmac_tx_complete(dev, 0);
-+			handled = 1;
-+		}
-+
-+		if (gmac->port_id == 0 && netif_running(dev) &&
-+			(((status0 & GMAC0_SWTQ00_FIN_INT_BIT) && (gmac->intr0_enabled & GMAC0_SWTQ00_FIN_INT_BIT))
-+			||
-+			((status0 & GMAC0_SWTQ00_EOF_INT_BIT) && (gmac->intr0_enabled & GMAC0_SWTQ00_EOF_INT_BIT)))) {
-+			toe_gmac_tx_complete(dev, 0);
-+			handled = 1;
-+		}
-+#endif
-+	}
-+
-+	return IRQ_RETVAL(handled);
-+}
-+
-+static int gmac_open(struct net_device *dev)
-+{
-+	struct gmac_private	*gmac = netdev_priv(dev);
-+	int			retval;
-+
-+	/* hook ISR */
-+	retval = request_irq(dev->irq, toe_gmac_interrupt, 0, dev->name, dev);
-+	if (retval)
-+		return retval;
-+
-+	toe_init_gmac(dev);
-+
-+	netif_carrier_off(dev);
-+	phy_start(gmac->phydev);
-+
-+	netif_start_queue(dev);
-+
-+	return 0;
-+}
-+
-+static int gmac_close(struct net_device *dev)
-+{
-+	struct gmac_private	*gmac = netdev_priv(dev);
-+
-+	netif_stop_queue(dev);
-+	mdelay(20);
-+
-+	if (gmac->phydev)
-+		phy_stop(gmac->phydev);
-+
-+	/* stop tx/rx packet */
-+	toe_gmac_disable_tx_rx(dev);
-+	mdelay(20);
-+
-+	/* stop the chip's Tx and Rx DMA processes */
-+	toe_gmac_hw_stop(gmac);
-+
-+	disable_irq(dev->irq);
-+	free_irq(dev->irq, dev);
-+
-+	return 0;
-+}
-+
-+static void gmac_get_phy_status(struct net_device *dev)
-+{
-+	struct gmac_private *gmac = netdev_priv(dev);
-+	GMAC_CONFIG0_T	config0;
-+	GMAC_STATUS_T	status, old_status;
-+	struct phy_device *phydev = gmac->phydev;
-+
-+	old_status.bits32 = status.bits32 = __raw_readl(dev->base_addr + GMAC_STATUS);
-+
-+	status.bits.link = phydev->link;
-+	status.bits.duplex = phydev->duplex;
-+
-+	switch (phydev->speed) {
-+	case 1000:
-+		status.bits.speed = GMAC_SPEED_1000;
-+		if (phydev->interface == PHY_INTERFACE_MODE_RGMII)
-+			status.bits.mii_rmii = GMAC_PHY_RGMII_1000;
-+		break;
-+	case 100:
-+		status.bits.speed = GMAC_SPEED_100;
-+		if (phydev->interface == PHY_INTERFACE_MODE_RGMII)
-+			status.bits.mii_rmii = GMAC_PHY_RGMII_100_10;
-+		break;
-+	case 10:
-+		status.bits.speed = GMAC_SPEED_10;
-+		if (phydev->interface == PHY_INTERFACE_MODE_RGMII)
-+			status.bits.mii_rmii = GMAC_PHY_RGMII_100_10;
-+		break;
-+	default:
-+		dev_warn(&dev->dev, "Not supported PHY speed (%d)\n", phydev->speed);
-+	}
-+
-+	if (phydev->pause) {
-+		if (gmac->flow_control_enable == 0) {
-+			config0.bits32 = __raw_readl(dev->base_addr + GMAC_CONFIG0);
-+			config0.bits.tx_fc_en = 1;	/* enable tx flow control */
-+			config0.bits.rx_fc_en = 1;	/* enable rx flow control */
-+			__raw_writel(config0.bits32, dev->base_addr + GMAC_CONFIG0);
-+			dev_info(&dev->dev, "MII flow control enabled\n");
-+		}
-+		gmac->flow_control_enable = 1;
-+	} else {
-+		if (gmac->flow_control_enable == 1) {
-+			config0.bits32 = __raw_readl(dev->base_addr + GMAC_CONFIG0);
-+			config0.bits.tx_fc_en = 0;	/* disable tx flow control */
-+			config0.bits.rx_fc_en = 0;	/* disable rx flow control */
-+			__raw_writel(config0.bits32, dev->base_addr + GMAC_CONFIG0);
-+			dev_info(&dev->dev, "MII flow control disabled\n");
-+		}
-+		gmac->flow_control_enable = 0;
-+	}
-+
-+	if (old_status.bits32 != status.bits32) {
-+		toe_gmac_disable_tx_rx(dev);
-+		phy_print_status(phydev);
-+		mdelay(10);	/* let GMAC consume packet */
-+		__raw_writel(status.bits32, dev->base_addr + GMAC_STATUS);
-+		if (status.bits.link)
-+			toe_gmac_enable_tx_rx(dev);
-+	}
-+}
-+
-+static void gmac_set_rx_mode(struct net_device *dev)
-+{
-+	GMAC_RX_FLTR_T	filter;
-+	unsigned int	mc_filter[2];	/* Multicast hash filter */
-+	int		bit_nr;
-+	unsigned int	i;
-+
-+	filter.bits32 = 0;
-+	filter.bits.error = 0;
-+	if (dev->flags & IFF_PROMISC) {
-+		filter.bits.error = 1;
-+		filter.bits.promiscuous = 1;
-+		filter.bits.broadcast = 1;
-+		filter.bits.multicast = 1;
-+		filter.bits.unicast = 1;
-+		mc_filter[1] = mc_filter[0] = 0xffffffff;
-+	} else if (dev->flags & IFF_ALLMULTI) {
-+		filter.bits.broadcast = 1;
-+		filter.bits.multicast = 1;
-+		filter.bits.unicast = 1;
-+		mc_filter[1] = mc_filter[0] = 0xffffffff;
-+	} else {
-+		struct dev_mc_list *mclist;
-+
-+		filter.bits.broadcast = 1;
-+		filter.bits.multicast = 1;
-+		filter.bits.unicast = 1;
-+		mc_filter[1] = mc_filter[0] = 0;
-+		for (i = 0, mclist = dev->mc_list; mclist && i < dev->mc_count; i++, mclist = mclist->next) {
-+			bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) & 0x3f;
-+			if (bit_nr <= 32)
-+				mc_filter[0] = mc_filter[0] | (1 << bit_nr);
-+			else
-+				mc_filter[1] = mc_filter[1] | (1 << (bit_nr - 32));
-+		}
-+	}
-+	__raw_writel(filter.bits32, dev->base_addr + GMAC_RX_FLTR);
-+	__raw_writel(mc_filter[0], dev->base_addr + GMAC_MCAST_FIL0);
-+	__raw_writel(mc_filter[1], dev->base_addr + GMAC_MCAST_FIL1);
-+}
-+
-+static void gmac_tx_timeout(struct net_device *dev)
-+{
-+	if (!netif_queue_stopped(dev))
-+		netif_wake_queue(dev);
-+
-+	dev_warn(&dev->dev, "TX timeout\n");
-+}
-+
-+const static struct net_device_ops gemini_gmac_ops = {
-+	.ndo_open		= gmac_open,
-+	.ndo_stop		= gmac_close,
-+	.ndo_start_xmit		= gmac_start_xmit,
-+	.ndo_get_stats		= gmac_get_stats,
-+	.ndo_set_multicast_list	= gmac_set_rx_mode,
-+	.ndo_set_mac_address	= gmac_set_mac_address,
-+	.ndo_tx_timeout		= gmac_tx_timeout,
-+};
-+
-+static void __init mac_init_drv(struct toe_private *toe)
-+{
-+	QUEUE_THRESHOLD_T	threshold;
-+	DMA_SKB_SIZE_T		skb_size;
-+
-+	/* clear non TOE Queue Header Area */
-+	memset(toe->global_base + TOE_NONTOE_QUE_HDR_BASE, 0,
-+		NONTOE_Q_HDR_AREA_END - TOE_NONTOE_QUE_HDR_BASE);
-+
-+	/* clear TOE Queue Header Area */
-+	memset(toe->global_base + TOE_TOE_QUE_HDR_BASE, 0,
-+		TOE_Q_HDR_AREA_END - TOE_TOE_QUE_HDR_BASE);
-+
-+	/* Write GLOBAL_QUEUE_THRESHOLD_REG */
-+	threshold.bits32 = 0;
-+	threshold.bits.swfq_empty = (TOE_SW_FREEQ_DESC_NUM > 256) ? 255 :
-+					TOE_SW_FREEQ_DESC_NUM / 2;
-+	threshold.bits.hwfq_empty = (TOE_HW_FREEQ_DESC_NUM > 256) ? 256 / 4 :
-+					TOE_HW_FREEQ_DESC_NUM / 4;
-+	threshold.bits.toe_class = (TOE_TOE_DESC_NUM > 256) ? 256 / 4 :
-+					TOE_TOE_DESC_NUM / 4;
-+	threshold.bits.intrq = (TOE_INTR_DESC_NUM > 256) ? 256 / 4 :
-+					TOE_INTR_DESC_NUM / 4;
-+	__raw_writel(threshold.bits32, toe->global_base + GLOBAL_QUEUE_THRESHOLD_REG);
-+
-+	/* Init skb size */
-+	skb_size.bits.hw_skb_size = HW_RX_BUF_SIZE;
-+	skb_size.bits.sw_skb_size = SW_RX_BUF_SIZE;
-+	__raw_writel(skb_size.bits32, toe->global_base + GLOBAL_DMA_SKB_SIZE_REG);
-+
-+	toe_init_free_queue(toe);
-+	toe_init_interrupt_config(toe);
-+}
-+
-+static int __init gmac_init_eth(struct platform_device *pdev, unsigned int num)
-+{
-+	struct gmac_private	*gmac;
-+	struct net_device	*dev;
-+	struct toe_private	*toe = platform_get_drvdata(pdev);
-+	struct gemini_gmac_platform_data *pdata = pdev->dev.platform_data;
-+
-+	if (!pdata->bus_id[num])
-+		return 0;
-+
-+	dev = alloc_etherdev(sizeof(*gmac));
-+	if (dev == NULL) {
-+		dev_err(&pdev->dev, "Can't allocate ethernet device #%d\n", num);
-+		return -ENOMEM;
-+	}
-+
-+	gmac = netdev_priv(dev);
-+	dev->ml_priv = toe;
-+	toe->net_dev[num] = dev;
-+
-+	gmac->dma_base_addr = toe->global_base + TOE_GMAC_DMA_BASE(num);
-+	gmac->port_id = num;
-+
-+	dev->base_addr = toe->global_base + TOE_GMAC_BASE(num);
-+	dev->irq = platform_get_irq(pdev, num);
-+	dev->netdev_ops = &gemini_gmac_ops;
-+	dev->watchdog_timeo = GMAC_DEV_TX_TIMEOUT;
-+	dev->tx_queue_len = TOE_GMAC_SWTXQ_DESC_NUM;
-+
-+#ifdef DO_HW_CHKSUM
-+	dev->features = NETIF_F_SG | NETIF_F_HW_CSUM;
-+#ifdef ENABLE_TSO
-+	dev->features |= NETIF_F_TSO;
-+#endif
-+#endif
-+
-+	toe_init_swtx_queue(dev);
-+	toe_init_default_queue(dev);
-+
-+	gmac_get_mac_address(dev);
-+
-+	/* TODO: Do we need this? */
-+	__raw_writel(0x55aa55aa, dev->base_addr + GMAC_STA_ADD2);
-+
-+	if (register_netdev(dev))
-+		return -1;
-+
-+	gmac->phydev = phy_connect(dev, pdata->bus_id[num], &gmac_get_phy_status, 0,
-+				 pdata->interface[num]);
-+	if (IS_ERR(gmac->phydev))
-+		return PTR_ERR(gmac->phydev);
-+
-+	gmac->phydev->supported &= PHY_GBIT_FEATURES | SUPPORTED_Pause;
-+	gmac->phydev->advertising = gmac->phydev->supported;
-+
-+	return 0;
-+}
-+
-+static int __init gmac_probe(struct platform_device *pdev)
-+{
-+	struct resource				*res;
-+	struct toe_private			*toe;
-+	int					retval;
-+
-+	if (!pdev->dev.platform_data)
-+		return -EINVAL;
-+
-+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if (!res) {
-+		dev_err(&pdev->dev, "can't get device resources\n");
-+		return -ENODEV;
-+	}
-+
-+	toe = kzalloc(sizeof(struct toe_private), GFP_KERNEL);
-+	if (!toe)
-+		return -ENOMEM;
-+
-+	toe->dev = &pdev->dev;
-+
-+	toe->global_base = ioremap(res->start, resource_size(res));
-+	if (!toe->global_base) {
-+		dev_err(toe->dev, "ioremap failed\n");
-+		retval = -EIO;
-+		goto err_data;
-+	}
-+
-+	platform_set_drvdata(pdev, toe);
-+
-+	mac_init_drv(toe);
-+
-+	INIT_WORK(&toe->freq_work, fill_free_q_worker);
-+	spin_lock_init(&toe->freeq_lock);
-+
-+	retval = gmac_init_eth(pdev, GMAC_PORT0);
-+	if (retval)
-+		goto err_unmap;
-+	retval = gmac_init_eth(pdev, GMAC_PORT1);
-+	if (retval)
-+		goto err_unmap;
-+
-+	dev_info(&pdev->dev, SL351x_DRIVER_NAME "\n");
-+
-+	return 0;
-+
-+err_unmap:
-+	iounmap(toe->global_base);
-+err_data:
-+	kfree(toe);
-+	return retval;
-+}
-+
-+static int __exit gmac_remove(struct platform_device *pdev)
-+{
-+	struct toe_private *toe = platform_get_drvdata(pdev);
-+	int i;
-+
-+	for (i = 0; i < 2; i++)
-+		if (toe->net_dev[i]) {
-+			unregister_netdev(toe->net_dev[i]);
-+			kfree(toe->net_dev[i]);
-+		}
-+
-+	iounmap(toe->global_base);
-+
-+	kfree(toe);
-+
-+	return 0;
-+}
-+
-+static struct platform_driver gemini_gmac_driver = {
-+	.probe		= gmac_probe,
-+	.remove		= __exit_p(gmac_remove),
-+
-+	.driver		= {
-+		.name	= "gemini-gmac",
-+		.owner	= THIS_MODULE,
-+	},
-+};
-+
-+static int __init gemini_gmac_init(void)
-+{
-+	return platform_driver_register(&gemini_gmac_driver);
-+}
-+
-+static void __exit gemini_gmac_exit(void)
-+{
-+	platform_driver_unregister(&gemini_gmac_driver);
-+}
-+
-+module_init(gemini_gmac_init);
-+module_exit(gemini_gmac_exit);
-+
-+MODULE_AUTHOR("Paulius Zaleckas");
-+MODULE_DESCRIPTION("Ethernet device driver for Gemini SoC");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS("platform:gemini-gmac");
---- /dev/null
-+++ b/drivers/net/gemini_negmac/gm_gmac.h
-@@ -0,0 +1,1488 @@
-+/*
-+ *  Register definitions for Gemini Ethernet device driver.
-+ *
-+ *  Copyright (C) 2006, Storlink, Corp.
-+ *  Copyright (C) 2008-2009, Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
-+ *
-+ * 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.
-+ */
-+#ifndef _GMAC_SL351x_H
-+#define _GMAC_SL351x_H
-+#include <linux/skbuff.h>
-+
-+#define _PACKED_			__attribute__ ((aligned(1), packed))
-+
-+#ifndef BIT
-+#define BIT(x)				(1 << (x))
-+#endif
-+
-+#define REG32(addr)     		(*(volatile unsigned long  * const)(addr))
-+
-+/* Define frame size */
-+#define GMAC_MAX_ETH_FRAME_SIZE		1514
-+#define GMAC_TX_BUF_SIZE		((GMAC_MAX_ETH_FRAME_SIZE + 31) & (~31))
-+
-+#define SW_RX_BUF_SIZE			1536
-+#define HW_RX_BUF_SIZE			1536
-+
-+#define GMAC_DEV_TX_TIMEOUT  		(10*HZ)
-+#define	SKB_RESERVE_BYTES		16
-+
-+/*
-+ * Base Registers
-+ */
-+#define TOE_NONTOE_QUE_HDR_BASE		0x2000
-+#define TOE_TOE_QUE_HDR_BASE		0x3000
-+#define TOE_V_BIT_BASE			0x4000
-+#define TOE_A_BIT_BASE			0x6000
-+#define TOE_GMAC_DMA_BASE(x)		(0x8000 + 0x4000 * (x))
-+#define TOE_GMAC_BASE(x)		(0xA000 + 0x4000 * (x))
-+
-+/*
-+ * Queue ID
-+ */
-+#define TOE_SW_FREE_QID			0x00
-+#define TOE_HW_FREE_QID			0x01
-+#define TOE_GMAC0_SW_TXQ0_QID		0x02
-+#define TOE_GMAC0_SW_TXQ1_QID		0x03
-+#define TOE_GMAC0_SW_TXQ2_QID		0x04
-+#define TOE_GMAC0_SW_TXQ3_QID		0x05
-+#define TOE_GMAC0_SW_TXQ4_QID		0x06
-+#define TOE_GMAC0_SW_TXQ5_QID		0x07
-+#define TOE_GMAC0_HW_TXQ0_QID		0x08
-+#define TOE_GMAC0_HW_TXQ1_QID		0x09
-+#define TOE_GMAC0_HW_TXQ2_QID		0x0A
-+#define TOE_GMAC0_HW_TXQ3_QID		0x0B
-+#define TOE_GMAC1_SW_TXQ0_QID		0x12
-+#define TOE_GMAC1_SW_TXQ1_QID		0x13
-+#define TOE_GMAC1_SW_TXQ2_QID		0x14
-+#define TOE_GMAC1_SW_TXQ3_QID		0x15
-+#define TOE_GMAC1_SW_TXQ4_QID		0x16
-+#define TOE_GMAC1_SW_TXQ5_QID		0x17
-+#define TOE_GMAC1_HW_TXQ0_QID		0x18
-+#define TOE_GMAC1_HW_TXQ1_QID		0x19
-+#define TOE_GMAC1_HW_TXQ2_QID		0x1A
-+#define TOE_GMAC1_HW_TXQ3_QID		0x1B
-+#define TOE_GMAC0_DEFAULT_QID		0x20
-+#define TOE_GMAC1_DEFAULT_QID		0x21
-+#define TOE_CLASSIFICATION_QID(x)	(0x22 + x)	// 0x22 ~ 0x2F
-+#define TOE_TOE_QID(x)			(0x40 + x)	// 0x40 ~ 0x7F
-+
-+/*
-+ * TOE DMA Queue Number should be 2^n, n = 6...12
-+ * TOE DMA Queues are the following queue types:
-+ *		SW Free Queue, HW Free Queue,
-+ *		GMAC 0/1 SW TX Q0-5, and GMAC 0/1 HW TX Q0-5
-+ * They have same descriptor numbers.
-+ * The base address and descriptor number are configured at
-+ * DMA Queues Descriptor Ring Base Address/Size Register (offset 0x0004)
-+ */
-+#define TOE_SW_FREEQ_DESC_POWER		8
-+#define TOE_SW_FREEQ_DESC_NUM		(1<<TOE_SW_FREEQ_DESC_POWER)
-+#define TOE_HW_FREEQ_DESC_POWER		8
-+#define TOE_HW_FREEQ_DESC_NUM		(1<<TOE_HW_FREEQ_DESC_POWER)
-+#define TOE_GMAC_SWTXQ_DESC_POWER	8
-+#define TOE_GMAC_SWTXQ_DESC_NUM		(1<<TOE_GMAC_SWTXQ_DESC_POWER)
-+#define TOE_GMAC_HWTXQ_DESC_POWER	8
-+#define TOE_GMAC_HWTXQ_DESC_NUM		(1<<TOE_GMAC_HWTXQ_DESC_POWER)
-+#define TOE_DEFAULT_Q_DESC_POWER	8
-+#define TOE_DEFAULT_Q_DESC_NUM		(1<<TOE_DEFAULT_Q_DESC_POWER)
-+#define TOE_TOE_DESC_POWER		8
-+#define TOE_TOE_DESC_NUM		(1<<TOE_TOE_DESC_POWER)
-+#define TOE_CLASS_DESC_POWER		8
-+#define TOE_CLASS_DESC_NUM		(1<<TOE_CLASS_DESC_POWER)
-+#define TOE_INTR_DESC_POWER		8
-+#define TOE_INTR_DESC_NUM		(1<<TOE_INTR_DESC_POWER)
-+
-+#define TOE_TOE_QUEUE_MAX	64
-+#define TOE_TOE_QUEUE_NUM	64
-+#define TOE_CLASS_QUEUE_MAX	14
-+#define TOE_CLASS_QUEUE_NUM	14
-+#define TOE_INTR_QUEUE_MAX	4
-+#define TOE_INTR_QUEUE_NUM	4
-+#define TOE_SW_TXQ_MAX		6
-+#define TOE_SW_TXQ_NUM		1
-+#define TOE_HW_TXQ_MAX		4
-+#define TOE_HW_TXQ_NUM		4
-+
-+#define RWPTR_ADVANCE_ONE(x, max)	((x == (max -1)) ? 0 : x+1)
-+#define RWPTR_RECEDE_ONE(x, max)	((x == 0) ? (max -1) : x-1)
-+#define SET_WPTR(addr, data)		(*(volatile u16 * const)((u32)(addr) + 2) = (u16)data)
-+#define SET_RPTR(addr, data)		(*(volatile u16 * const)((u32)(addr)) = (u16)data)
-+
-+/*
-+ * Global registers
-+ * #define TOE_GLOBAL_BASE			(TOE_BASE + 0x0000)
-+ * Base 0x60000000
-+ */
-+#define GLOBAL_TOE_VERSION_REG		0x0000
-+#define GLOBAL_SW_FREEQ_BASE_SIZE_REG	0x0004
-+#define GLOBAL_HW_FREEQ_BASE_SIZE_REG	0x0008
-+#define GLOBAL_DMA_SKB_SIZE_REG		0x0010
-+#define GLOBAL_SWFQ_RWPTR_REG		0x0014
-+#define GLOBAL_HWFQ_RWPTR_REG		0x0018
-+#define GLOBAL_INTERRUPT_STATUS_0_REG	0x0020
-+#define GLOBAL_INTERRUPT_ENABLE_0_REG	0x0024
-+#define GLOBAL_INTERRUPT_SELECT_0_REG	0x0028
-+#define GLOBAL_INTERRUPT_STATUS_1_REG	0x0030
-+#define GLOBAL_INTERRUPT_ENABLE_1_REG	0x0034
-+#define GLOBAL_INTERRUPT_SELECT_1_REG	0x0038
-+#define GLOBAL_INTERRUPT_STATUS_2_REG	0x0040
-+#define GLOBAL_INTERRUPT_ENABLE_2_REG	0x0044
-+#define GLOBAL_INTERRUPT_SELECT_2_REG	0x0048
-+#define GLOBAL_INTERRUPT_STATUS_3_REG	0x0050
-+#define GLOBAL_INTERRUPT_ENABLE_3_REG	0x0054
-+#define GLOBAL_INTERRUPT_SELECT_3_REG	0x0058
-+#define GLOBAL_INTERRUPT_STATUS_4_REG	0x0060
-+#define GLOBAL_INTERRUPT_ENABLE_4_REG	0x0064
-+#define GLOBAL_INTERRUPT_SELECT_4_REG	0x0068
-+#define GLOBAL_HASH_TABLE_BASE_REG	0x006C
-+#define GLOBAL_QUEUE_THRESHOLD_REG	0x0070
-+
-+/*
-+ * GMAC 0/1 DMA/TOE register
-+ * #define TOE_GMAC0_DMA_BASE		(TOE_BASE + 0x8000)
-+ * #define TOE_GMAC1_DMA_BASE		(TOE_BASE + 0xC000)
-+ * Base 0x60008000 or 0x6000C000
-+ */
-+#define GMAC_DMA_CTRL_REG		0x0000
-+#define GMAC_TX_WEIGHTING_CTRL_0_REG	0x0004
-+#define GMAC_TX_WEIGHTING_CTRL_1_REG	0x0008
-+#define GMAC_SW_TX_QUEUE0_PTR_REG	0x000C
-+#define GMAC_SW_TX_QUEUE1_PTR_REG	0x0010
-+#define GMAC_SW_TX_QUEUE2_PTR_REG	0x0014
-+#define GMAC_SW_TX_QUEUE3_PTR_REG	0x0018
-+#define GMAC_SW_TX_QUEUE4_PTR_REG	0x001C
-+#define GMAC_SW_TX_QUEUE5_PTR_REG	0x0020
-+#define GMAC_HW_TX_QUEUE0_PTR_REG	0x0024
-+#define GMAC_HW_TX_QUEUE1_PTR_REG	0x0028
-+#define GMAC_HW_TX_QUEUE2_PTR_REG	0x002C
-+#define GMAC_HW_TX_QUEUE3_PTR_REG	0x0030
-+#define GMAC_DMA_TX_FIRST_DESC_REG	0x0038
-+#define GMAC_DMA_TX_CURR_DESC_REG	0x003C
-+#define GMAC_DMA_TX_DESC_WORD0_REG	0x0040
-+#define GMAC_DMA_TX_DESC_WORD1_REG	0x0044
-+#define GMAC_DMA_TX_DESC_WORD2_REG	0x0048
-+#define GMAC_DMA_TX_DESC_WORD3_REG	0x004C
-+#define GMAC_SW_TX_QUEUE_BASE_REG	0x0050
-+#define GMAC_HW_TX_QUEUE_BASE_REG	0x0054
-+#define GMAC_DMA_RX_FIRST_DESC_REG	0x0058
-+#define GMAC_DMA_RX_CURR_DESC_REG	0x005C
-+#define GMAC_DMA_RX_DESC_WORD0_REG	0x0060
-+#define GMAC_DMA_RX_DESC_WORD1_REG	0x0064
-+#define GMAC_DMA_RX_DESC_WORD2_REG	0x0068
-+#define GMAC_DMA_RX_DESC_WORD3_REG	0x006C
-+#define GMAC_HASH_ENGINE_REG0		0x0070
-+#define GMAC_HASH_ENGINE_REG1		0x0074
-+/* matching rule 0 Control register 0 */
-+#define GMAC_MR0CR0			0x0078
-+#define GMAC_MR0CR1			0x007C
-+#define GMAC_MR0CR2			0x0080
-+#define GMAC_MR1CR0			0x0084
-+#define GMAC_MR1CR1			0x0088
-+#define GMAC_MR1CR2			0x008C
-+#define GMAC_MR2CR0			0x0090
-+#define GMAC_MR2CR1			0x0094
-+#define GMAC_MR2CR2			0x0098
-+#define GMAC_MR3CR0			0x009C
-+#define GMAC_MR3CR1			0x00A0
-+#define GMAC_MR3CR2			0x00A4
-+/* Support Protocol Regsister 0 */
-+#define GMAC_SPR0			0x00A8
-+#define GMAC_SPR1			0x00AC
-+#define GMAC_SPR2			0x00B0
-+#define GMAC_SPR3			0x00B4
-+#define GMAC_SPR4			0x00B8
-+#define GMAC_SPR5			0x00BC
-+#define GMAC_SPR6			0x00C0
-+#define GMAC_SPR7			0x00C4
-+/* GMAC Hash/Rx/Tx AHB Weighting register */
-+#define GMAC_AHB_WEIGHT_REG		0x00C8
-+
-+/*
-+ * TOE GMAC 0/1 register
-+ * #define TOE_GMAC0_BASE				(TOE_BASE + 0xA000)
-+ * #define TOE_GMAC1_BASE				(TOE_BASE + 0xE000)
-+ * Base 0x6000A000 or 0x6000E000
-+ */
-+enum GMAC_REGISTER {
-+	GMAC_STA_ADD0 	= 0x0000,
-+	GMAC_STA_ADD1	= 0x0004,
-+	GMAC_STA_ADD2	= 0x0008,
-+	GMAC_RX_FLTR	= 0x000c,
-+	GMAC_MCAST_FIL0 = 0x0010,
-+	GMAC_MCAST_FIL1 = 0x0014,
-+	GMAC_CONFIG0	= 0x0018,
-+	GMAC_CONFIG1	= 0x001c,
-+	GMAC_CONFIG2	= 0x0020,
-+	GMAC_CONFIG3	= 0x0024,
-+	GMAC_RESERVED	= 0x0028,
-+	GMAC_STATUS	= 0x002c,
-+	GMAC_IN_DISCARDS= 0x0030,
-+	GMAC_IN_ERRORS  = 0x0034,
-+	GMAC_IN_MCAST   = 0x0038,
-+	GMAC_IN_BCAST   = 0x003c,
-+	GMAC_IN_MAC1    = 0x0040,	/* for STA 1 MAC Address */
-+	GMAC_IN_MAC2    = 0x0044	/* for STA 2 MAC Address */
-+};
-+
-+/*
-+ * DMA Queues description Ring Base Address/Size Register (offset 0x0004)
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	unsigned int base_size;
-+} DMA_Q_BASE_SIZE_T;
-+#define DMA_Q_BASE_MASK 	(~0x0f)
-+
-+/*
-+ * DMA SKB Buffer register (offset 0x0008)
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit_0008 {
-+		unsigned int sw_skb_size : 16;	/* SW Free poll SKB Size */
-+		unsigned int hw_skb_size : 16;	/* HW Free poll SKB Size */
-+	} bits;
-+} DMA_SKB_SIZE_T;
-+
-+/*
-+ * DMA SW Free Queue Read/Write Pointer Register (offset 0x000C)
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit_000c {
-+		unsigned int rptr	: 16;	/* Read Ptr, RO */
-+		unsigned int wptr	: 16;	/* Write Ptr, RW */
-+	} bits;
-+} DMA_RWPTR_T;
-+
-+/*
-+ * DMA HW Free Queue Read/Write Pointer Register (offset 0x0010)
-+ * see DMA_RWPTR_T structure
-+ */
-+
-+/*
-+ * Interrupt Status Register 0 	(offset 0x0020)
-+ * Interrupt Mask Register 0 	(offset 0x0024)
-+ * Interrupt Select Register 0 	(offset 0x0028)
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit_0020 {
-+		/* GMAC0 SW Tx Queue 0 EOF Interrupt */
-+		unsigned int swtq00_eof	: 1;
-+		unsigned int swtq01_eof	: 1;
-+		unsigned int swtq02_eof	: 1;
-+		unsigned int swtq03_eof	: 1;
-+		unsigned int swtq04_eof	: 1;
-+		unsigned int swtq05_eof	: 1;
-+		/* GMAC1 SW Tx Queue 0 EOF Interrupt */
-+		unsigned int swtq10_eof	: 1;
-+		unsigned int swtq11_eof	: 1;
-+		unsigned int swtq12_eof	: 1;
-+		unsigned int swtq13_eof	: 1;
-+		unsigned int swtq14_eof	: 1;
-+		unsigned int swtq15_eof	: 1;
-+		/* GMAC0 SW Tx Queue 0 Finish Interrupt */
-+		unsigned int swtq00_fin	: 1;
-+		unsigned int swtq01_fin	: 1;
-+		unsigned int swtq02_fin	: 1;
-+		unsigned int swtq03_fin	: 1;
-+		unsigned int swtq04_fin	: 1;
-+		unsigned int swtq05_fin	: 1;
-+		/* GMAC1 SW Tx Queue 0 Finish Interrupt */
-+		unsigned int swtq10_fin	: 1;
-+		unsigned int swtq11_fin	: 1;
-+		unsigned int swtq12_fin	: 1;
-+		unsigned int swtq13_fin	: 1;
-+		unsigned int swtq14_fin	: 1;
-+		unsigned int swtq15_fin	: 1;
-+		/* GMAC0 Rx Descriptor Protocol Error */
-+		unsigned int rxPerr0	: 1;
-+		/* GMAC0 AHB Bus Error while Rx */
-+		unsigned int rxDerr0	: 1;
-+		/* GMAC1 Rx Descriptor Protocol Error */
-+		unsigned int rxPerr1	: 1;
-+		/* GMAC1 AHB Bus Error while Rx */
-+		unsigned int rxDerr1	: 1;
-+		/* GMAC0 Tx Descriptor Protocol Error */
-+		unsigned int txPerr0	: 1;
-+		/* GMAC0 AHB Bus Error while Tx */
-+		unsigned int txDerr0	: 1;
-+		/* GMAC1 Tx Descriptor Protocol Error */
-+		unsigned int txPerr1	: 1;
-+		/* GMAC1 AHB Bus Error while Tx */
-+		unsigned int txDerr1	: 1;
-+	} bits;
-+} INTR_REG0_T;
-+
-+#define GMAC1_TXDERR_INT_BIT		BIT(31)
-+#define GMAC1_TXPERR_INT_BIT		BIT(30)
-+#define GMAC0_TXDERR_INT_BIT		BIT(29)
-+#define GMAC0_TXPERR_INT_BIT		BIT(28)
-+#define GMAC1_RXDERR_INT_BIT		BIT(27)
-+#define GMAC1_RXPERR_INT_BIT		BIT(26)
-+#define GMAC0_RXDERR_INT_BIT		BIT(25)
-+#define GMAC0_RXPERR_INT_BIT		BIT(24)
-+#define GMAC1_SWTQ15_FIN_INT_BIT	BIT(23)
-+#define GMAC1_SWTQ14_FIN_INT_BIT	BIT(22)
-+#define GMAC1_SWTQ13_FIN_INT_BIT	BIT(21)
-+#define GMAC1_SWTQ12_FIN_INT_BIT	BIT(20)
-+#define GMAC1_SWTQ11_FIN_INT_BIT	BIT(19)
-+#define GMAC1_SWTQ10_FIN_INT_BIT	BIT(18)
-+#define GMAC0_SWTQ05_FIN_INT_BIT	BIT(17)
-+#define GMAC0_SWTQ04_FIN_INT_BIT	BIT(16)
-+#define GMAC0_SWTQ03_FIN_INT_BIT	BIT(15)
-+#define GMAC0_SWTQ02_FIN_INT_BIT	BIT(14)
-+#define GMAC0_SWTQ01_FIN_INT_BIT	BIT(13)
-+#define GMAC0_SWTQ00_FIN_INT_BIT	BIT(12)
-+#define GMAC1_SWTQ15_EOF_INT_BIT	BIT(11)
-+#define GMAC1_SWTQ14_EOF_INT_BIT	BIT(10)
-+#define GMAC1_SWTQ13_EOF_INT_BIT	BIT(9)
-+#define GMAC1_SWTQ12_EOF_INT_BIT	BIT(8)
-+#define GMAC1_SWTQ11_EOF_INT_BIT	BIT(7)
-+#define GMAC1_SWTQ10_EOF_INT_BIT	BIT(6)
-+#define GMAC0_SWTQ05_EOF_INT_BIT	BIT(5)
-+#define GMAC0_SWTQ04_EOF_INT_BIT	BIT(4)
-+#define GMAC0_SWTQ03_EOF_INT_BIT	BIT(3)
-+#define GMAC0_SWTQ02_EOF_INT_BIT	BIT(2)
-+#define GMAC0_SWTQ01_EOF_INT_BIT	BIT(1)
-+#define GMAC0_SWTQ00_EOF_INT_BIT	BIT(0)
-+
-+/*
-+ * Interrupt Status Register 1 	(offset 0x0030)
-+ * Interrupt Mask Register 1 	(offset 0x0034)
-+ * Interrupt Select Register 1 	(offset 0x0038)
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit_0030 {
-+		unsigned int default_q0_eof	: 1;	/* Default Queue 0 EOF Interrupt */
-+		unsigned int default_q1_eof	: 1;	/* Default Queue 1 EOF Interrupt */
-+		unsigned int class_rx		: 14;	/* Classification Queue Rx Interrupt */
-+		unsigned int hwtq00_eof		: 1;	/* GMAC0 HW Tx Queue0 EOF Interrupt */
-+		unsigned int hwtq01_eof		: 1;	/* GMAC0 HW Tx Queue1 EOF Interrupt */
-+		unsigned int hwtq02_eof		: 1;	/* GMAC0 HW Tx Queue2 EOF Interrupt */
-+		unsigned int hwtq03_eof		: 1;	/* GMAC0 HW Tx Queue3 EOF Interrupt */
-+		unsigned int hwtq10_eof		: 1;	/* GMAC1 HW Tx Queue0 EOF Interrupt */
-+		unsigned int hwtq11_eof		: 1;	/* GMAC1 HW Tx Queue1 EOF Interrupt */
-+		unsigned int hwtq12_eof		: 1;	/* GMAC1 HW Tx Queue2 EOF Interrupt */
-+		unsigned int hwtq13_eof		: 1;	/* GMAC1 HW Tx Queue3 EOF Interrupt */
-+		unsigned int toe_iq0_intr	: 1;	/* TOE Interrupt Queue 0 with Interrupts */
-+		unsigned int toe_iq1_intr	: 1;	/* TOE Interrupt Queue 1 with Interrupts */
-+		unsigned int toe_iq2_intr	: 1;	/* TOE Interrupt Queue 2 with Interrupts */
-+		unsigned int toe_iq3_intr	: 1;	/* TOE Interrupt Queue 3 with Interrupts */
-+		unsigned int toe_iq0_full	: 1;	/* TOE Interrupt Queue 0 Full Interrupt */
-+		unsigned int toe_iq1_full	: 1;	/* TOE Interrupt Queue 1 Full Interrupt */
-+		unsigned int toe_iq2_full	: 1;	/* TOE Interrupt Queue 2 Full Interrupt */
-+		unsigned int toe_iq3_full	: 1;	/* TOE Interrupt Queue 3 Full Interrupt */
-+	} bits;
-+} INTR_REG1_T;
-+
-+#define TOE_IQ3_FULL_INT_BIT		BIT(31)
-+#define TOE_IQ2_FULL_INT_BIT		BIT(30)
-+#define TOE_IQ1_FULL_INT_BIT		BIT(29)
-+#define TOE_IQ0_FULL_INT_BIT		BIT(28)
-+#define TOE_IQ3_INT_BIT			BIT(27)
-+#define TOE_IQ2_INT_BIT			BIT(26)
-+#define TOE_IQ1_INT_BIT			BIT(25)
-+#define TOE_IQ0_INT_BIT			BIT(24)
-+#define GMAC1_HWTQ13_EOF_INT_BIT	BIT(23)
-+#define GMAC1_HWTQ12_EOF_INT_BIT	BIT(22)
-+#define GMAC1_HWTQ11_EOF_INT_BIT	BIT(21)
-+#define GMAC1_HWTQ10_EOF_INT_BIT	BIT(20)
-+#define GMAC0_HWTQ03_EOF_INT_BIT	BIT(19)
-+#define GMAC0_HWTQ02_EOF_INT_BIT	BIT(18)
-+#define GMAC0_HWTQ01_EOF_INT_BIT	BIT(17)
-+#define GMAC0_HWTQ00_EOF_INT_BIT	BIT(16)
-+#define CLASS_RX_INT_BIT(x)		BIT((x + 2))
-+#define DEFAULT_Q1_INT_BIT		BIT(1)
-+#define DEFAULT_Q0_INT_BIT		BIT(0)
-+
-+#define TOE_IQ_INT_BITS		(TOE_IQ0_INT_BIT | TOE_IQ1_INT_BIT | \
-+		               	 TOE_IQ2_INT_BIT | TOE_IQ3_INT_BIT)
-+#define	TOE_IQ_FULL_BITS	(TOE_IQ0_FULL_INT_BIT | TOE_IQ1_FULL_INT_BIT | \
-+		                 TOE_IQ2_FULL_INT_BIT | TOE_IQ3_FULL_INT_BIT)
-+#define	TOE_IQ_ALL_BITS		(TOE_IQ_INT_BITS | TOE_IQ_FULL_BITS)
-+#define TOE_CLASS_RX_INT_BITS	0xfffc
-+
-+/*
-+ * Interrupt Status Register 2 	(offset 0x0040)
-+ * Interrupt Mask Register 2 	(offset 0x0044)
-+ * Interrupt Select Register 2 	(offset 0x0048)
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit_0040 {
-+		unsigned int toe_q0_full	: 1;	// bit 0	TOE Queue 0 Full Interrupt
-+		unsigned int toe_q1_full	: 1;	// bit 1	TOE Queue 1 Full Interrupt
-+		unsigned int toe_q2_full	: 1;	// bit 2	TOE Queue 2 Full Interrupt
-+		unsigned int toe_q3_full	: 1;	// bit 3	TOE Queue 3 Full Interrupt
-+		unsigned int toe_q4_full	: 1;	// bit 4	TOE Queue 4 Full Interrupt
-+		unsigned int toe_q5_full	: 1;	// bit 5	TOE Queue 5 Full Interrupt
-+		unsigned int toe_q6_full	: 1;	// bit 6	TOE Queue 6 Full Interrupt
-+		unsigned int toe_q7_full	: 1;	// bit 7	TOE Queue 7 Full Interrupt
-+		unsigned int toe_q8_full	: 1;	// bit 8	TOE Queue 8 Full Interrupt
-+		unsigned int toe_q9_full	: 1;	// bit 9	TOE Queue 9 Full Interrupt
-+		unsigned int toe_q10_full	: 1;	// bit 10	TOE Queue 10 Full Interrupt
-+		unsigned int toe_q11_full	: 1;	// bit 11	TOE Queue 11 Full Interrupt
-+		unsigned int toe_q12_full	: 1;	// bit 12	TOE Queue 12 Full Interrupt
-+		unsigned int toe_q13_full	: 1;	// bit 13	TOE Queue 13 Full Interrupt
-+		unsigned int toe_q14_full	: 1;	// bit 14	TOE Queue 14 Full Interrupt
-+		unsigned int toe_q15_full	: 1;	// bit 15	TOE Queue 15 Full Interrupt
-+		unsigned int toe_q16_full	: 1;	// bit 16	TOE Queue 16 Full Interrupt
-+		unsigned int toe_q17_full	: 1;	// bit 17	TOE Queue 17 Full Interrupt
-+		unsigned int toe_q18_full	: 1;	// bit 18	TOE Queue 18 Full Interrupt
-+		unsigned int toe_q19_full	: 1;	// bit 19	TOE Queue 19 Full Interrupt
-+		unsigned int toe_q20_full	: 1;	// bit 20	TOE Queue 20 Full Interrupt
-+		unsigned int toe_q21_full	: 1;	// bit 21	TOE Queue 21 Full Interrupt
-+		unsigned int toe_q22_full	: 1;	// bit 22	TOE Queue 22 Full Interrupt
-+		unsigned int toe_q23_full	: 1;	// bit 23	TOE Queue 23 Full Interrupt
-+		unsigned int toe_q24_full	: 1;	// bit 24	TOE Queue 24 Full Interrupt
-+		unsigned int toe_q25_full	: 1;	// bit 25	TOE Queue 25 Full Interrupt
-+		unsigned int toe_q26_full	: 1;	// bit 26	TOE Queue 26 Full Interrupt
-+		unsigned int toe_q27_full	: 1;	// bit 27	TOE Queue 27 Full Interrupt
-+		unsigned int toe_q28_full	: 1;	// bit 28	TOE Queue 28 Full Interrupt
-+		unsigned int toe_q29_full	: 1;	// bit 29	TOE Queue 29 Full Interrupt
-+		unsigned int toe_q30_full	: 1;	// bit 30	TOE Queue 30 Full Interrupt
-+		unsigned int toe_q31_full	: 1;	// bit 31	TOE Queue 31 Full Interrupt
-+	} bits;
-+} INTR_REG2_T;
-+
-+#define TOE_QL_FULL_INT_BIT(x)		BIT(x)
-+
-+/*
-+ * Interrupt Status Register 3 	(offset 0x0050)
-+ * Interrupt Mask Register 3 	(offset 0x0054)
-+ * Interrupt Select Register 3 	(offset 0x0058)
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit_0050 {
-+		unsigned int toe_q32_full	: 1;	// bit 32	TOE Queue 32 Full Interrupt
-+		unsigned int toe_q33_full	: 1;	// bit 33	TOE Queue 33 Full Interrupt
-+		unsigned int toe_q34_full	: 1;	// bit 34	TOE Queue 34 Full Interrupt
-+		unsigned int toe_q35_full	: 1;	// bit 35	TOE Queue 35 Full Interrupt
-+		unsigned int toe_q36_full	: 1;	// bit 36	TOE Queue 36 Full Interrupt
-+		unsigned int toe_q37_full	: 1;	// bit 37	TOE Queue 37 Full Interrupt
-+		unsigned int toe_q38_full	: 1;	// bit 38	TOE Queue 38 Full Interrupt
-+		unsigned int toe_q39_full	: 1;	// bit 39	TOE Queue 39 Full Interrupt
-+		unsigned int toe_q40_full	: 1;	// bit 40	TOE Queue 40 Full Interrupt
-+		unsigned int toe_q41_full	: 1;	// bit 41	TOE Queue 41 Full Interrupt
-+		unsigned int toe_q42_full	: 1;	// bit 42	TOE Queue 42 Full Interrupt
-+		unsigned int toe_q43_full	: 1;	// bit 43	TOE Queue 43 Full Interrupt
-+		unsigned int toe_q44_full	: 1;	// bit 44	TOE Queue 44 Full Interrupt
-+		unsigned int toe_q45_full	: 1;	// bit 45	TOE Queue 45 Full Interrupt
-+		unsigned int toe_q46_full	: 1;	// bit 46	TOE Queue 46 Full Interrupt
-+		unsigned int toe_q47_full	: 1;	// bit 47	TOE Queue 47 Full Interrupt
-+		unsigned int toe_q48_full	: 1;	// bit 48	TOE Queue 48 Full Interrupt
-+		unsigned int toe_q49_full	: 1;	// bit 49	TOE Queue 49 Full Interrupt
-+		unsigned int toe_q50_full	: 1;	// bit 50	TOE Queue 50 Full Interrupt
-+		unsigned int toe_q51_full	: 1;	// bit 51	TOE Queue 51 Full Interrupt
-+		unsigned int toe_q52_full	: 1;	// bit 52	TOE Queue 52 Full Interrupt
-+		unsigned int toe_q53_full	: 1;	// bit 53	TOE Queue 53 Full Interrupt
-+		unsigned int toe_q54_full	: 1;	// bit 54	TOE Queue 54 Full Interrupt
-+		unsigned int toe_q55_full	: 1;	// bit 55	TOE Queue 55 Full Interrupt
-+		unsigned int toe_q56_full	: 1;	// bit 56	TOE Queue 56 Full Interrupt
-+		unsigned int toe_q57_full	: 1;	// bit 57	TOE Queue 57 Full Interrupt
-+		unsigned int toe_q58_full	: 1;	// bit 58	TOE Queue 58 Full Interrupt
-+		unsigned int toe_q59_full	: 1;	// bit 59	TOE Queue 59 Full Interrupt
-+		unsigned int toe_q60_full	: 1;	// bit 60	TOE Queue 60 Full Interrupt
-+		unsigned int toe_q61_full	: 1;	// bit 61	TOE Queue 61 Full Interrupt
-+		unsigned int toe_q62_full	: 1;	// bit 62	TOE Queue 62 Full Interrupt
-+		unsigned int toe_q63_full	: 1;	// bit 63	TOE Queue 63 Full Interrupt
-+	} bits;
-+} INTR_REG3_T;
-+
-+#define TOE_QH_FULL_INT_BIT(x)		BIT(x-32)
-+
-+/*
-+ * Interrupt Status Register 4 	(offset 0x0060)
-+ * Interrupt Mask Register 4 	(offset 0x0064)
-+ * Interrupt Select Register 4 	(offset 0x0068)
-+ */
-+typedef union {
-+	unsigned char byte;
-+	struct bit_0060 {
-+		unsigned char status_changed	: 1;	// Status Changed Intr for RGMII Mode
-+		unsigned char rx_overrun	: 1;   // GMAC Rx FIFO overrun interrupt
-+		unsigned char tx_pause_off	: 1;	// received pause off frame interrupt
-+		unsigned char rx_pause_off	: 1;	// received pause off frame interrupt
-+		unsigned char tx_pause_on	: 1;	// transmit pause on frame interrupt
-+		unsigned char rx_pause_on	: 1;	// received pause on frame interrupt
-+		unsigned char cnt_full 		: 1;	// MIB counters half full interrupt
-+		unsigned char reserved		: 1;	//
-+	} _PACKED_ bits;
-+} _PACKED_ GMAC_INTR_T;
-+
-+typedef union {
-+	unsigned int bits32;
-+	struct bit_0060_2 {
-+		unsigned int    swfq_empty	: 1;	// bit 0	Software Free Queue Empty Intr.
-+		unsigned int    hwfq_empty	: 1;	// bit 1	Hardware Free Queue Empty Intr.
-+		unsigned int	class_qf_int	: 14;	// bit 15:2 Classification Rx Queue13-0 Full Intr.
-+		GMAC_INTR_T	gmac0;
-+		GMAC_INTR_T	gmac1;
-+	} bits;
-+} INTR_REG4_T;
-+
-+#define GMAC1_RESERVED_INT_BIT		BIT(31)
-+#define GMAC1_MIB_INT_BIT		BIT(30)
-+#define GMAC1_RX_PAUSE_ON_INT_BIT	BIT(29)
-+#define GMAC1_TX_PAUSE_ON_INT_BIT	BIT(28)
-+#define GMAC1_RX_PAUSE_OFF_INT_BIT	BIT(27)
-+#define GMAC1_TX_PAUSE_OFF_INT_BIT	BIT(26)
-+#define GMAC1_RX_OVERRUN_INT_BIT	BIT(25)
-+#define GMAC1_STATUS_CHANGE_INT_BIT	BIT(24)
-+#define GMAC0_RESERVED_INT_BIT		BIT(23)
-+#define GMAC0_MIB_INT_BIT		BIT(22)
-+#define GMAC0_RX_PAUSE_ON_INT_BIT	BIT(21)
-+#define GMAC0_TX_PAUSE_ON_INT_BIT	BIT(20)
-+#define GMAC0_RX_PAUSE_OFF_INT_BIT	BIT(19)
-+#define GMAC0_TX_PAUSE_OFF_INT_BIT	BIT(18)
-+#define GMAC0_RX_OVERRUN_INT_BIT	BIT(17)
-+#define GMAC0_STATUS_CHANGE_INT_BIT	BIT(16)
-+#define CLASS_RX_FULL_INT_BIT(x)	BIT((x+2))
-+#define HWFQ_EMPTY_INT_BIT		BIT(1)
-+#define SWFQ_EMPTY_INT_BIT		BIT(0)
-+
-+#if 1
-+#define GMAC0_INT_BITS		(GMAC0_MIB_INT_BIT)
-+#define GMAC1_INT_BITS		(GMAC1_MIB_INT_BIT)
-+#else
-+#define GMAC0_INT_BITS		(GMAC0_RESERVED_INT_BIT | GMAC0_MIB_INT_BIT | \
-+				 GMAC0_RX_PAUSE_ON_INT_BIT | GMAC0_TX_PAUSE_ON_INT_BIT |	\
-+				 GMAC0_RX_PAUSE_OFF_INT_BIT | GMAC0_TX_PAUSE_OFF_INT_BIT | 	\
-+				 GMAC0_RX_OVERRUN_INT_BIT | GMAC0_STATUS_CHANGE_INT_BIT)
-+#define GMAC1_INT_BITS		(GMAC1_RESERVED_INT_BIT | GMAC1_MIB_INT_BIT | \
-+				 GMAC1_RX_PAUSE_ON_INT_BIT | GMAC1_TX_PAUSE_ON_INT_BIT |	\
-+				 GMAC1_RX_PAUSE_OFF_INT_BIT | GMAC1_TX_PAUSE_OFF_INT_BIT | 	\
-+				 GMAC1_RX_OVERRUN_INT_BIT | GMAC1_STATUS_CHANGE_INT_BIT)
-+#endif
-+
-+#define CLASS_RX_FULL_INT_BITS		0xfffc
-+
-+/*
-+ * GLOBAL_QUEUE_THRESHOLD_REG 	(offset 0x0070)
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit_0070_2 {
-+		unsigned int    swfq_empty	: 8;	//  7:0  	Software Free Queue Empty Threshold
-+		unsigned int    hwfq_empty	: 8;	// 15:8		Hardware Free Queue Empty Threshold
-+		unsigned int	intrq		: 8;	// 23:16
-+		unsigned int	toe_class	: 8;	// 31:24
-+	} bits;
-+} QUEUE_THRESHOLD_T;
-+
-+
-+/*
-+ * GMAC DMA Control Register
-+ * GMAC0 offset 0x8000
-+ * GMAC1 offset 0xC000
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit_8000 {
-+		unsigned int	td_bus		: 2;	// bit 1:0	Peripheral Bus Width
-+		unsigned int	td_burst_size	: 2;	// bit 3:2	TxDMA max burst size for every AHB request
-+		unsigned int	td_prot		: 4;	// bit 7:4	TxDMA protection control
-+		unsigned int	rd_bus		: 2;	// bit 9:8 	Peripheral Bus Width
-+		unsigned int	rd_burst_size	: 2;	// bit 11:10	DMA max burst size for every AHB request
-+		unsigned int	rd_prot		: 4;	// bit 15:12	DMA Protection Control
-+		unsigned int	rd_insert_bytes	: 2;	// bit 17:16
-+		unsigned int	reserved	: 10;	// bit 27:18
-+		unsigned int    drop_small_ack	: 1;	// bit 28	1: Drop, 0: Accept
-+		unsigned int    loopback	: 1;	// bit 29	Loopback TxDMA to RxDMA
-+		unsigned int    td_enable	: 1;	// bit 30	Tx DMA Enable
-+		unsigned int    rd_enable	: 1;	// bit 31	Rx DMA Enable
-+	} bits;
-+} GMAC_DMA_CTRL_T;
-+
-+/*
-+ * GMAC Tx Weighting Control Register 0
-+ * GMAC0 offset 0x8004
-+ * GMAC1 offset 0xC004
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit_8004 {
-+		unsigned int    hw_tq0		: 6;	// bit 5:0	HW TX Queue 3
-+		unsigned int    hw_tq1		: 6;	// bit 11:6	HW TX Queue 2
-+		unsigned int    hw_tq2		: 6;	// bit 17:12	HW TX Queue 1
-+		unsigned int    hw_tq3		: 6;	// bit 23:18	HW TX Queue 0
-+		unsigned int    reserved	: 8;	// bit 31:24
-+	} bits;
-+} GMAC_TX_WCR0_T;	/* Weighting Control Register 0 */
-+
-+/*
-+ * GMAC Tx Weighting Control Register 1
-+ * GMAC0 offset 0x8008
-+ * GMAC1 offset 0xC008
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit_8008 {
-+		unsigned int    sw_tq0		: 5;	// bit 4:0	SW TX Queue 0
-+		unsigned int    sw_tq1		: 5;	// bit 9:5	SW TX Queue 1
-+		unsigned int    sw_tq2		: 5;	// bit 14:10	SW TX Queue 2
-+		unsigned int    sw_tq3		: 5;	// bit 19:15	SW TX Queue 3
-+		unsigned int    sw_tq4		: 5;	// bit 24:20	SW TX Queue 4
-+		unsigned int    sw_tq5		: 5;	// bit 29:25	SW TX Queue 5
-+		unsigned int    reserved	: 2;	// bit 31:30
-+	} bits;
-+} GMAC_TX_WCR1_T;	/* Weighting Control Register 1 */
-+
-+/*
-+ * Queue Read/Write Pointer
-+ * GMAC SW TX Queue 0~5 Read/Write Pointer register
-+ * GMAC0 offset 0x800C ~ 0x8020
-+ * GMAC1 offset 0xC00C ~ 0xC020
-+ * GMAC HW TX Queue 0~3 Read/Write Pointer register
-+ * GMAC0 offset 0x8024 ~ 0x8030
-+ * GMAC1 offset 0xC024 ~ 0xC030
-+ *
-+ * see DMA_RWPTR_T structure
-+ */
-+
-+/*
-+ * GMAC DMA Tx First Description Address Register
-+ * GMAC0 offset 0x8038
-+ * GMAC1 offset 0xC038
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit_8038 {
-+		unsigned int reserved		:  3;
-+		unsigned int td_busy		:  1;	// bit 3	1: TxDMA busy; 0: TxDMA idle
-+		unsigned int td_first_des_ptr	: 28;	// bit 31:4	first descriptor address
-+	} bits;
-+} GMAC_TXDMA_FIRST_DESC_T;
-+
-+/*
-+ * GMAC DMA Tx Current Description Address Register
-+ * GMAC0 offset 0x803C
-+ * GMAC1 offset 0xC03C
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit_803C {
-+		unsigned int reserved		:  4;
-+		unsigned int td_curr_desc_ptr	: 28;	// bit 31:4	current descriptor address
-+	} bits;
-+} GMAC_TXDMA_CURR_DESC_T;
-+
-+/*
-+ * GMAC DMA Tx Description Word 0 Register
-+ * GMAC0 offset 0x8040
-+ * GMAC1 offset 0xC040
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit_8040 {
-+		unsigned int buffer_size 	: 16;	// bit 15:0	Transfer size
-+		unsigned int desc_count 	: 6;	// bit 21:16	number of descriptors used for the current frame
-+		unsigned int status_tx_ok	: 1;	// bit 22	Tx Status, 1: Successful 0: Failed
-+		unsigned int status_rvd		: 6;	// bit 28:23	Tx Status, Reserved bits
-+		unsigned int perr		: 1;	// bit 29	protocol error during processing this descriptor
-+		unsigned int derr		: 1;	// bit 30	data error during processing this descriptor
-+		unsigned int reserved		: 1;	// bit 31
-+	} bits;
-+} GMAC_TXDESC_0_T;
-+
-+/*
-+ * GMAC DMA Tx Description Word 1 Register
-+ * GMAC0 offset 0x8044
-+ * GMAC1 offset 0xC044
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct txdesc_word1 {
-+		unsigned int	byte_count	: 16;	// bit 15: 0	Tx Frame Byte Count
-+		unsigned int	mtu_enable	: 1;	// bit 16	TSS segmentation use MTU setting
-+		unsigned int	ip_chksum	: 1;	// bit 17	IPV4 Header Checksum Enable
-+		unsigned int	ipv6_enable	: 1;	// bit 18	IPV6 Tx Enable
-+		unsigned int	tcp_chksum	: 1;	// bit 19	TCP Checksum Enable
-+		unsigned int	udp_chksum	: 1;	// bit 20	UDP Checksum Enable
-+		unsigned int	bypass_tss	: 1;	// bit 21
-+		unsigned int	ip_fixed_len	: 1;	// bit 22
-+		unsigned int	reserved	: 9;	// bit 31:23 	Tx Flag, Reserved
-+	} bits;
-+} GMAC_TXDESC_1_T;
-+
-+#define TSS_IP_FIXED_LEN_BIT	BIT(22)
-+#define TSS_UDP_CHKSUM_BIT	BIT(20)
-+#define TSS_TCP_CHKSUM_BIT	BIT(19)
-+#define TSS_IPV6_ENABLE_BIT	BIT(18)
-+#define TSS_IP_CHKSUM_BIT	BIT(17)
-+#define TSS_MTU_ENABLE_BIT	BIT(16)
-+
-+/*
-+ * GMAC DMA Tx Description Word 2 Register
-+ * GMAC0 offset 0x8048
-+ * GMAC1 offset 0xC048
-+ */
-+typedef union {
-+	unsigned int	bits32;
-+	unsigned int 	buf_adr;
-+} GMAC_TXDESC_2_T;
-+
-+/*
-+ * GMAC DMA Tx Description Word 3 Register
-+ * GMAC0 offset 0x804C
-+ * GMAC1 offset 0xC04C
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct txdesc_word3 {
-+		unsigned int	mtu_size	: 11;	// bit 10: 0	Tx Frame Byte Count
-+		unsigned int	reserved	: 18;	// bit 28:11
-+		unsigned int	eofie		: 1;	// bit 29	End of frame interrupt enable
-+		unsigned int	sof_eof		: 2;	// bit 31:30 	11: only one, 10: first, 01: last, 00: linking
-+	} bits;
-+} GMAC_TXDESC_3_T;
-+#define SOF_EOF_BIT_MASK	0x3fffffff
-+#define SOF_BIT			0x80000000
-+#define EOF_BIT			0x40000000
-+#define EOFIE_BIT		BIT(29)
-+#define MTU_SIZE_BIT_MASK	0x7ff
-+
-+/*
-+ * GMAC Tx Descriptor
-+ */
-+typedef struct {
-+	GMAC_TXDESC_0_T	word0;
-+	GMAC_TXDESC_1_T	word1;
-+	GMAC_TXDESC_2_T	word2;
-+	GMAC_TXDESC_3_T	word3;
-+} GMAC_TXDESC_T;
-+
-+/*
-+ * GMAC DMA Rx First Description Address Register
-+ * GMAC0 offset 0x8058
-+ * GMAC1 offset 0xC058
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit_8058 {
-+		unsigned int reserved		:  3;	// bit 2:0
-+		unsigned int rd_busy		:  1;	// bit 3	1-RxDMA busy; 0-RxDMA idle
-+		unsigned int rd_first_des_ptr	: 28;	// bit 31:4 first descriptor address
-+	} bits;
-+} GMAC_RXDMA_FIRST_DESC_T;
-+
-+/*
-+ * GMAC DMA Rx Current Description Address Register
-+ * GMAC0 offset 0x805C
-+ * GMAC1 offset 0xC05C
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit_805C {
-+		unsigned int reserved		:  4;	// bit 3:0
-+		unsigned int rd_curr_des_ptr	: 28;	// bit 31:4 current descriptor address
-+	} bits;
-+} GMAC_RXDMA_CURR_DESC_T;
-+
-+/*
-+ * GMAC DMA Rx Description Word 0 Register
-+ * GMAC0 offset 0x8060
-+ * GMAC1 offset 0xC060
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit_8060 {
-+		unsigned int buffer_size 	: 16;	// bit 15:0  number of descriptors used for the current frame
-+		unsigned int desc_count 	: 6;	// bit 21:16 number of descriptors used for the current frame
-+		unsigned int status		: 4;	// bit 24:22 Status of rx frame
-+		unsigned int chksum_status	: 3;	// bit 28:26 Check Sum Status
-+		unsigned int perr		: 1;	// bit 29	 protocol error during processing this descriptor
-+		unsigned int derr		: 1;	// bit 30	 data error during processing this descriptor
-+		unsigned int drop		: 1;	// bit 31	 TOE/CIS Queue Full dropped packet to default queue
-+	} bits;
-+} GMAC_RXDESC_0_T;
-+
-+#define		GMAC_RXDESC_0_T_derr			BIT(30)
-+#define		GMAC_RXDESC_0_T_perr			BIT(29)
-+#define		GMAC_RXDESC_0_T_chksum_status(x)	BIT((x+26))
-+#define		GMAC_RXDESC_0_T_status(x)		BIT((x+22))
-+#define		GMAC_RXDESC_0_T_desc_count(x)		BIT((x+16))
-+
-+#define	RX_CHKSUM_IP_UDP_TCP_OK			0
-+#define	RX_CHKSUM_IP_OK_ONLY			1
-+#define	RX_CHKSUM_NONE				2
-+#define	RX_CHKSUM_IP_ERR_UNKNOWN		4
-+#define	RX_CHKSUM_IP_ERR			5
-+#define	RX_CHKSUM_TCP_UDP_ERR			6
-+#define RX_CHKSUM_NUM				8
-+
-+#define RX_STATUS_GOOD_FRAME			0
-+#define RX_STATUS_TOO_LONG_GOOD_CRC		1
-+#define RX_STATUS_RUNT_FRAME			2
-+#define RX_STATUS_SFD_NOT_FOUND			3
-+#define RX_STATUS_CRC_ERROR			4
-+#define RX_STATUS_TOO_LONG_BAD_CRC		5
-+#define RX_STATUS_ALIGNMENT_ERROR		6
-+#define RX_STATUS_TOO_LONG_BAD_ALIGN		7
-+#define RX_STATUS_RX_ERR			8
-+#define RX_STATUS_DA_FILTERED			9
-+#define RX_STATUS_BUFFER_FULL			10
-+#define RX_STATUS_NUM				16
-+
-+
-+/*
-+ * GMAC DMA Rx Description Word 1 Register
-+ * GMAC0 offset 0x8064
-+ * GMAC1 offset 0xC064
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct rxdesc_word1 {
-+		unsigned int	byte_count	: 16;	// bit 15: 0	Rx Frame Byte Count
-+		unsigned int	sw_id		: 16;	// bit 31:16	Software ID
-+	} bits;
-+} GMAC_RXDESC_1_T;
-+
-+/*
-+ * GMAC DMA Rx Description Word 2 Register
-+ * GMAC0 offset 0x8068
-+ * GMAC1 offset 0xC068
-+ */
-+typedef union {
-+	unsigned int	bits32;
-+	unsigned int	buf_adr;
-+} GMAC_RXDESC_2_T;
-+
-+#define RX_INSERT_NONE		0
-+#define RX_INSERT_1_BYTE	1
-+#define RX_INSERT_2_BYTE	2
-+#define RX_INSERT_3_BYTE	3
-+
-+#define RX_INSERT_BYTES		RX_INSERT_2_BYTE
-+/*
-+ * GMAC DMA Rx Description Word 3 Register
-+ * GMAC0 offset 0x806C
-+ * GMAC1 offset 0xC06C
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct rxdesc_word3 {
-+		unsigned int	l3_offset	: 8;	// bit 7: 0	L3 data offset
-+		unsigned int	l4_offset	: 8;	// bit 15: 8	L4 data offset
-+		unsigned int	l7_offset	: 8;	// bit 23: 16	L7 data offset
-+		unsigned int	dup_ack		: 1;	// bit 24	Duplicated ACK detected
-+		unsigned int	abnormal	: 1;	// bit 25	abnormal case found
-+		unsigned int	option		: 1;	// bit 26	IPV4 option or IPV6 extension header
-+		unsigned int	out_of_seq	: 1;	// bit 27	Out of Sequence packet
-+		unsigned int	ctrl_flag	: 1;	// bit 28 	Control Flag is present
-+		unsigned int	eofie		: 1;	// bit 29	End of frame interrupt enable
-+		unsigned int	sof_eof		: 2;	// bit 31:30 	11: only one, 10: first, 01: last, 00: linking
-+	} bits;
-+} GMAC_RXDESC_3_T;
-+
-+/*
-+ * GMAC Rx Descriptor
-+ */
-+typedef struct {
-+	GMAC_RXDESC_0_T	word0;
-+	GMAC_RXDESC_1_T	word1;
-+	GMAC_RXDESC_2_T	word2;
-+	GMAC_RXDESC_3_T	word3;
-+} GMAC_RXDESC_T;
-+
-+/*
-+ * GMAC Hash Engine Enable/Action Register 0 Offset Register
-+ * GMAC0 offset 0x8070
-+ * GMAC1 offset 0xC070
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit_8070 {
-+		unsigned int	mr0hel		: 6;	// bit 5:0	match rule 0 hash entry size
-+		unsigned int	mr0_action	: 5;	// bit 10:6	Matching Rule 0 action offset
-+		unsigned int	reserved0	: 4;	// bit 14:11
-+		unsigned int	mr0en		: 1;	// bit 15	Enable Matching Rule 0
-+		unsigned int	mr1hel		: 6;	// bit 21:16	match rule 1 hash entry size
-+		unsigned int	mr1_action	: 5;	// bit 26:22	Matching Rule 1 action offset
-+		unsigned int	timing		: 3;	// bit 29:27
-+		unsigned int	reserved1	: 1;	// bit 30
-+		unsigned int	mr1en		: 1;	// bit 31	Enable Matching Rule 1
-+	} bits;
-+} GMAC_HASH_ENABLE_REG0_T;
-+
-+/*
-+ * GMAC Hash Engine Enable/Action Register 1 Offset Register
-+ * GMAC0 offset 0x8074
-+ * GMAC1 offset 0xC074
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit_8074 {
-+		unsigned int	mr2hel		: 6;	// bit 5:0	match rule 2 hash entry size
-+		unsigned int	mr2_action	: 5;	// bit 10:6	Matching Rule 2 action offset
-+		unsigned int	reserved2	: 4;	// bit 14:11
-+		unsigned int	mr2en		: 1;	// bit 15	Enable Matching Rule 2
-+		unsigned int	mr3hel		: 6;	// bit 21:16	match rule 3 hash entry size
-+		unsigned int	mr3_action	: 5;	// bit 26:22	Matching Rule 3 action offset
-+		unsigned int	reserved1	: 4;	// bit 30:27
-+		unsigned int	mr3en		: 1;	// bit 31	Enable Matching Rule 3
-+	} bits;
-+} GMAC_HASH_ENABLE_REG1_T;
-+
-+/*
-+ * GMAC Matching Rule Control Register 0
-+ * GMAC0 offset 0x8078
-+ * GMAC1 offset 0xC078
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit_8078 {
-+		unsigned int	sprx		: 8;	// bit 7:0	Support Protocol Register 7:0
-+		unsigned int	reserved2	: 4;	// bit 11:8
-+		unsigned int	tos_traffic	: 1;	// bit 12	IPV4 TOS or IPV6 Traffice Class
-+		unsigned int	flow_lable	: 1;	// bit 13	IPV6 Flow label
-+		unsigned int	ip_hdr_len	: 1;	// bit 14	IPV4 Header length
-+		unsigned int	ip_version	: 1;	// bit 15	0: IPV4, 1: IPV6
-+		unsigned int	reserved1	: 3;	// bit 18:16
-+		unsigned int	pppoe		: 1;	// bit 19	PPPoE Session ID enable
-+		unsigned int	vlan		: 1;	// bit 20	VLAN ID enable
-+		unsigned int	ether_type	: 1;	// bit 21	Ethernet type enable
-+		unsigned int	sa		: 1;	// bit 22	MAC SA enable
-+		unsigned int	da		: 1;	// bit 23	MAC DA enable
-+		unsigned int	priority	: 3;	// bit 26:24	priority if multi-rules matched
-+		unsigned int	port		: 1;	// bit 27	PORT ID matching enable
-+		unsigned int	l7		: 1;	// bit 28	L7 matching enable
-+		unsigned int	l4		: 1;	// bit 29	L4 matching enable
-+		unsigned int	l3		: 1;	// bit 30	L3 matching enable
-+		unsigned int	l2		: 1;	// bit 31	L2 matching enable
-+	} bits;
-+} GMAC_MRxCR0_T;
-+
-+#define MR_L2_BIT		BIT(31)
-+#define MR_L3_BIT		BIT(30)
-+#define MR_L4_BIT		BIT(29)
-+#define MR_L7_BIT		BIT(28)
-+#define MR_PORT_BIT		BIT(27)
-+#define MR_PRIORITY_BIT		BIT(26)
-+#define MR_DA_BIT		BIT(23)
-+#define MR_SA_BIT		BIT(22)
-+#define MR_ETHER_TYPE_BIT	BIT(21)
-+#define MR_VLAN_BIT		BIT(20)
-+#define MR_PPPOE_BIT		BIT(19)
-+#define MR_IP_VER_BIT		BIT(15)
-+#define MR_IP_HDR_LEN_BIT	BIT(14)
-+#define MR_FLOW_LABLE_BIT	BIT(13)
-+#define MR_TOS_TRAFFIC_BIT	BIT(12)
-+#define MR_SPR_BIT(x)		BIT(x)
-+#define MR_SPR_BITS		0xff
-+
-+/*
-+ * GMAC Matching Rule Control Register 1
-+ * GMAC0 offset 0x807C
-+ * GMAC1 offset 0xC07C
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit_807C {
-+		unsigned int    l4_byte0_15	: 16;	// bit 15: 0
-+		unsigned int	dip_netmask	: 7;	// bit 22:16	Dest IP net mask, number of mask bits
-+		unsigned int	dip		: 1;	// bit 23		Dest IP
-+		unsigned int	sip_netmask	: 7;	// bit 30:24	Srce IP net mask, number of mask bits
-+		unsigned int	sip		: 1;	// bit 31		Srce IP
-+	} bits;
-+} GMAC_MRxCR1_T;
-+
-+/*
-+ * GMAC Matching Rule Control Register 2
-+ * GMAC0 offset 0x8080
-+ * GMAC1 offset 0xC080
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit_8080 {
-+		unsigned int    l7_byte0_23	: 24;	// bit 23:0
-+		unsigned int    l4_byte16_24	: 8;	// bit 31: 24
-+	} bits;
-+} GMAC_MRxCR2_T;
-+
-+/*
-+ * GMAC Support registers
-+ * GMAC0 offset 0x80A8
-+ * GMAC1 offset 0xC0A8
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit_80A8 {
-+		unsigned int    protocol	: 8;	// bit 7:0		Supported protocol
-+		unsigned int    swap		: 3;	// bit 10:8		Swap
-+		unsigned int    reserved	: 21;	// bit 31:11
-+	} bits;
-+} GMAC_SPR_T;
-+
-+/*
-+ * GMAC_AHB_WEIGHT registers
-+ * GMAC0 offset 0x80C8
-+ * GMAC1 offset 0xC0C8
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit_80C8 {
-+		unsigned int    hash_weight	: 5;	// 4:0
-+		unsigned int    rx_weight	: 5;	// 9:5
-+		unsigned int    tx_weight	: 5;	// 14:10
-+		unsigned int    pre_req		: 5;	// 19:15 Rx Data Pre Request FIFO Threshold
-+		unsigned int    tqDV_threshold	: 5;	// 24:20 DMA TqCtrl to Start tqDV FIFO Threshold
-+		unsigned int    reserved	: 7;	// 31:25
-+	} bits;
-+} GMAC_AHB_WEIGHT_T;
-+
-+/*
-+ * the register structure of GMAC
-+ */
-+
-+/*
-+ * GMAC RX FLTR
-+ * GMAC0 Offset 0xA00C
-+ * GMAC1 Offset 0xE00C
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit1_000c {
-+		unsigned int unicast		:  1;	/* enable receive of unicast frames that are sent to STA address */
-+		unsigned int multicast		:  1;	/* enable receive of multicast frames that pass multicast filter */
-+		unsigned int broadcast		:  1;	/* enable receive of broadcast frames */
-+		unsigned int promiscuous	:  1;   /* enable receive of all frames */
-+		unsigned int error		:  1;	/* enable receive of all error frames */
-+		unsigned int 			: 27;
-+	} bits;
-+} GMAC_RX_FLTR_T;
-+
-+/*
-+ * GMAC Configuration 0
-+ * GMAC0 Offset 0xA018
-+ * GMAC1 Offset 0xE018
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit1_0018 {
-+		unsigned int dis_tx		:  1;	/* 0: disable transmit */
-+		unsigned int dis_rx		:  1;	/* 1: disable receive */
-+		unsigned int loop_back		:  1;	/* 2: transmit data loopback enable */
-+		unsigned int flow_ctrl		:  1;   /* 3: flow control also trigged by Rx queues */
-+		unsigned int adj_ifg		:  4;	/* 4-7: adjust IFG from 96+/-56 */
-+		unsigned int max_len		:  3;	/* 8-10 maximum receive frame length allowed */
-+		unsigned int dis_bkoff		:  1;	/* 11: disable back-off function */
-+		unsigned int dis_col		:  1;	/* 12: disable 16 collisions abort function */
-+		unsigned int sim_test		:  1;	/* 13: speed up timers in simulation */
-+		unsigned int rx_fc_en		:  1;	/* 14: RX flow control enable */
-+		unsigned int tx_fc_en		:  1;	/* 15: TX flow control enable */
-+		unsigned int rgmii_en		:  1;   /* 16: RGMII in-band status enable */
-+		unsigned int ipv4_rx_chksum	:  1;   /* 17: IPv4 RX Checksum enable */
-+		unsigned int ipv6_rx_chksum	:  1;   /* 18: IPv6 RX Checksum enable */
-+		unsigned int rx_tag_remove	:  1;   /* 19: Remove Rx VLAN tag */
-+		unsigned int rgmm_edge		:  1;	// 20
-+		unsigned int rxc_inv		:  1;	// 21
-+		unsigned int ipv6_exthdr_order	:  1;	// 22
-+		unsigned int rx_err_detect	:  1;	// 23
-+		unsigned int port0_chk_hwq	:  1;	// 24
-+		unsigned int port1_chk_hwq	:  1;	// 25
-+		unsigned int port0_chk_toeq	:  1;	// 26
-+		unsigned int port1_chk_toeq	:  1;	// 27
-+		unsigned int port0_chk_classq	:  1;	// 28
-+		unsigned int port1_chk_classq	:  1;	// 29
-+		unsigned int reserved		:  2;	// 31
-+	} bits;
-+} GMAC_CONFIG0_T;
-+
-+/*
-+ * GMAC Configuration 1
-+ * GMAC0 Offset 0xA01C
-+ * GMAC1 Offset 0xE01C
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit1_001c {
-+		unsigned int set_threshold	: 8; 	/* flow control set threshold */
-+		unsigned int rel_threshold	: 8;	/* flow control release threshold */
-+		unsigned int reserved		: 16;
-+	} bits;
-+} GMAC_CONFIG1_T;
-+
-+#define GMAC_FLOWCTRL_SET_MAX		32
-+#define GMAC_FLOWCTRL_SET_MIN		0
-+#define GMAC_FLOWCTRL_RELEASE_MAX	32
-+#define GMAC_FLOWCTRL_RELEASE_MIN	0
-+
-+/*
-+ * GMAC Configuration 2
-+ * GMAC0 Offset 0xA020
-+ * GMAC1 Offset 0xE020
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit1_0020 {
-+		unsigned int set_threshold	: 16; 	/* flow control set threshold */
-+		unsigned int rel_threshold	: 16;	/* flow control release threshold */
-+	} bits;
-+} GMAC_CONFIG2_T;
-+
-+/*
-+ * GMAC Configuration 3
-+ * GMAC0 Offset 0xA024
-+ * GMAC1 Offset 0xE024
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit1_0024 {
-+		unsigned int set_threshold	: 16; 	/* flow control set threshold */
-+		unsigned int rel_threshold	: 16;	/* flow control release threshold */
-+	} bits;
-+} GMAC_CONFIG3_T;
-+
-+
-+/*
-+ * GMAC STATUS
-+ * GMAC0 Offset 0xA02C
-+ * GMAC1 Offset 0xE02C
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit1_002c {
-+		unsigned int link		:  1;	/* link status */
-+		unsigned int speed		:  2;	/* link speed(00->2.5M 01->25M 10->125M) */
-+		unsigned int duplex		:  1;	/* duplex mode */
-+		unsigned int reserved		:  1;
-+		unsigned int mii_rmii		:  2;   /* PHY interface type */
-+		unsigned int 			: 25;
-+	} bits;
-+} GMAC_STATUS_T;
-+
-+#define GMAC_SPEED_10			0
-+#define GMAC_SPEED_100			1
-+#define GMAC_SPEED_1000			2
-+
-+#define GMAC_PHY_MII			0
-+#define GMAC_PHY_GMII			1
-+#define GMAC_PHY_RGMII_100_10		2
-+#define GMAC_PHY_RGMII_1000		3
-+
-+/*
-+ * Queue Header
-+ *	(1) TOE Queue Header
-+ *	(2) Non-TOE Queue Header
-+ *	(3) Interrupt Queue Header
-+ *
-+ * memory Layout
-+ *	TOE Queue Header
-+ *	 0x60003000 +---------------------------+ 0x0000
-+ *				|     TOE Queue 0 Header	|
-+ *				|         8 * 4 Bytes	    |
-+ *				+---------------------------+ 0x0020
-+ *				|     TOE Queue 1 Header  	|
-+ *				|         8 * 4 Bytes		|
-+ *				+---------------------------+ 0x0040
-+ *				|   	......  			|
-+ *				|      						|
-+ *				+---------------------------+
-+ *
-+ *	Non TOE Queue Header
-+ *	 0x60002000 +---------------------------+ 0x0000
-+ *				|   Default Queue 0 Header  |
-+ *				|         2 * 4 Bytes		|
-+ *				+---------------------------+ 0x0008
-+ *				|   Default Queue 1 Header	|
-+ *				|         2 * 4 Bytes		|
-+ *				+---------------------------+ 0x0010
-+ *				|   Classification Queue 0	|
-+ *				|      	  2 * 4 Bytes		|
-+ *				+---------------------------+
-+ *				|   Classification Queue 1	|
-+ *				|      	  2 * 4 Bytes		|
-+ *				+---------------------------+ (n * 8 + 0x10)
-+ *				|   		...				|
-+ *				|      	  2 * 4 Bytes		|
-+ *				+---------------------------+ (13 * 8 + 0x10)
-+ *				|   Classification Queue 13	|
-+ *				|      	  2 * 4 Bytes		|
-+ *				+---------------------------+ 0x80
-+ * 				|      Interrupt Queue 0	|
-+ *				|      	  2 * 4 Bytes		|
-+ *				+---------------------------+
-+ * 				|      Interrupt Queue 1	|
-+ *				|      	  2 * 4 Bytes		|
-+ *				+---------------------------+
-+ * 				|      Interrupt Queue 2	|
-+ *				|      	  2 * 4 Bytes		|
-+ *				+---------------------------+
-+ * 				|      Interrupt Queue 3	|
-+ *				|      	  2 * 4 Bytes		|
-+ *				+---------------------------+
-+ *
-+ */
-+#define TOE_QUEUE_HDR_ADDR(n)		(TOE_TOE_QUE_HDR_BASE + n * 32)
-+#define TOE_Q_HDR_AREA_END		(TOE_QUEUE_HDR_ADDR(TOE_TOE_QUEUE_MAX + 1))
-+#define TOE_DEFAULT_Q_HDR_BASE(x)	(TOE_NONTOE_QUE_HDR_BASE + 0x08 * (x))
-+#define TOE_CLASS_Q_HDR_BASE		(TOE_NONTOE_QUE_HDR_BASE + 0x10)
-+#define TOE_INTR_Q_HDR_BASE		(TOE_NONTOE_QUE_HDR_BASE + 0x80)
-+#define INTERRUPT_QUEUE_HDR_ADDR(n)	(TOE_INTR_Q_HDR_BASE + n * 8)
-+#define NONTOE_Q_HDR_AREA_END		(INTERRUPT_QUEUE_HDR_ADDR(TOE_INTR_QUEUE_MAX + 1))
-+/*
-+ * TOE Queue Header Word 0
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	unsigned int base_size;
-+} TOE_QHDR0_T;
-+
-+#define TOE_QHDR0_BASE_MASK 	(~0x0f)
-+
-+/*
-+ * TOE Queue Header Word 1
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit_qhdr1 {
-+		unsigned int rptr	: 16;	// bit 15:0
-+		unsigned int wptr	: 16;	// bit 31:16
-+	} bits;
-+} TOE_QHDR1_T;
-+
-+/*
-+ * TOE Queue Header Word 2
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit_qhdr2 {
-+		unsigned int TotalPktSize	: 17;	// bit 16: 0	Total packet size
-+		unsigned int reserved		: 7;	// bit 23:17
-+		unsigned int dack		: 1;	// bit 24	1: Duplicated ACK
-+		unsigned int abn		: 1;	// bit 25	1: Abnormal case Found
-+		unsigned int tcp_opt		: 1;	// bit 26	1: Have TCP option
-+		unsigned int ip_opt		: 1;	// bit 27	1: have IPV4 option or IPV6 Extension header
-+		unsigned int sat		: 1;	// bit 28	1: SeqCnt > SeqThreshold, or AckCnt > AckThreshold
-+		unsigned int osq		: 1;	// bit 29	1: out of sequence
-+		unsigned int ctl		: 1;	// bit 30	1: have control flag bits (except ack)
-+		unsigned int usd		: 1;	// bit 31	0: if no data assembled yet
-+	} bits;
-+} TOE_QHDR2_T;
-+
-+/*
-+ * TOE Queue Header Word 3
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	unsigned int seq_num;
-+} TOE_QHDR3_T;
-+
-+/*
-+ * TOE Queue Header Word 4
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	unsigned int ack_num;
-+} TOE_QHDR4_T;
-+
-+/*
-+ * TOE Queue Header Word 5
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit_qhdr5 {
-+		unsigned int AckCnt	: 16;	// bit 15:0
-+		unsigned int SeqCnt	: 16;	// bit 31:16
-+	} bits;
-+} TOE_QHDR5_T;
-+
-+/*
-+ * TOE Queue Header Word 6
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit_qhdr6 {
-+		unsigned int WinSize	: 16;	// bit 15:0
-+		unsigned int iq_num	: 2;	// bit 17:16
-+		unsigned int MaxPktSize	: 14;	// bit 31:18
-+	} bits;
-+} TOE_QHDR6_T;
-+
-+/*
-+ * TOE Queue Header Word 7
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit_qhdr7 {
-+		unsigned int AckThreshold	: 16;	// bit 15:0
-+		unsigned int SeqThreshold	: 16;	// bit 31:16
-+	} bits;
-+} TOE_QHDR7_T;
-+
-+/*
-+ * TOE Queue Header
-+ */
-+typedef struct {
-+	TOE_QHDR0_T		word0;
-+	TOE_QHDR1_T		word1;
-+	TOE_QHDR2_T		word2;
-+	TOE_QHDR3_T		word3;
-+	TOE_QHDR4_T		word4;
-+	TOE_QHDR5_T		word5;
-+	TOE_QHDR6_T		word6;
-+	TOE_QHDR7_T		word7;
-+} TOE_QHDR_T;
-+
-+/*
-+ * NONTOE Queue Header Word 0
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	unsigned int base_size;
-+} NONTOE_QHDR0_T;
-+
-+#define NONTOE_QHDR0_BASE_MASK 	(~0x0f)
-+
-+/*
-+ * NONTOE Queue Header Word 1
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit_nonqhdr1 {
-+		unsigned int rptr	: 16;	// bit 15:0
-+		unsigned int wptr	: 16;	// bit 31:16
-+	} bits;
-+} NONTOE_QHDR1_T;
-+
-+/*
-+ * Non-TOE Queue Header
-+ */
-+typedef struct {
-+	NONTOE_QHDR0_T		word0;
-+	NONTOE_QHDR1_T		word1;
-+} NONTOE_QHDR_T;
-+
-+/*
-+ * Interrupt Queue Header Word 0
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit_intrqhdr0 {
-+		unsigned int win_size	: 16;	// bit 15:0 	Descriptor Ring Size
-+		unsigned int wptr	: 16;	// bit 31:16	Write Pointer where hw stopped
-+	} bits;
-+} INTR_QHDR0_T;
-+
-+/*
-+ * Interrupt Queue Header Word 1
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit_intrqhdr1 {
-+		unsigned int TotalPktSize	: 17;	// bit 16: 0	Total packet size
-+		unsigned int tcp_qid		: 8;	// bit 24:17	TCP Queue ID
-+		unsigned int dack		: 1;	// bit 25	1: Duplicated ACK
-+		unsigned int abn		: 1;	// bit 26	1: Abnormal case Found
-+		unsigned int tcp_opt		: 1;	// bit 27	1: Have TCP option
-+		unsigned int ip_opt		: 1;	// bit 28	1: have IPV4 option or IPV6 Extension header
-+		unsigned int sat		: 1;	// bit 29	1: SeqCnt > SeqThreshold, or AckCnt > AckThreshold
-+		unsigned int osq		: 1;	// bit 30	1: out of sequence
-+		unsigned int ctl		: 1;	// bit 31	1: have control flag bits (except ack)
-+	} bits;
-+} INTR_QHDR1_T;
-+
-+/*
-+ * Interrupt Queue Header Word 2
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	unsigned int seq_num;
-+} INTR_QHDR2_T;
-+
-+/*
-+ * Interrupt Queue Header Word 3
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	unsigned int ack_num;
-+} INTR_QHDR3_T;
-+
-+/*
-+ * Interrupt Queue Header Word 4
-+ */
-+typedef union {
-+	unsigned int bits32;
-+	struct bit_intrqhdr4 {
-+		unsigned int AckCnt		: 16;	// bit 15:0	Ack# change since last ack# intr.
-+		unsigned int SeqCnt		: 16;	// bit 31:16	Seq# change since last seq# intr.
-+	} bits;
-+} INTR_QHDR4_T;
-+
-+/*
-+ * Interrupt Queue Header
-+ */
-+typedef struct {
-+	INTR_QHDR0_T		word0;
-+	INTR_QHDR1_T		word1;
-+	INTR_QHDR2_T		word2;
-+	INTR_QHDR3_T		word3;
-+	INTR_QHDR4_T		word4;
-+	unsigned int		word5;
-+	unsigned int		word6;
-+	unsigned int		word7;
-+} INTR_QHDR_T;
-+
-+/*
-+ * GMAC private data
-+ */
-+typedef struct {
-+	unsigned int		rwptr_reg;
-+	unsigned int		desc_base;
-+	unsigned int		desc_base_dma;
-+	unsigned short		finished_idx;
-+	struct sk_buff		*tx_skb[TOE_GMAC_SWTXQ_DESC_NUM];
-+} GMAC_SWTXQ_T;
-+
-+struct gmac_private {
-+	struct phy_device	*phydev;
-+	unsigned int		port_id;
-+	unsigned int		dma_base_addr;
-+	unsigned int		swtxq_desc_base;
-+	GMAC_SWTXQ_T		swtxq[TOE_SW_TXQ_NUM];
-+	NONTOE_QHDR_T		*default_qhdr;
-+	unsigned int		default_desc_base;
-+	dma_addr_t		default_desc_base_dma;
-+	dma_addr_t		swtxq_desc_base_dma;
-+	unsigned int		flow_control_enable;
-+	unsigned int		intr0_enabled;
-+	unsigned int		intr1_enabled;
-+	unsigned int		intr2_enabled;
-+	unsigned int		intr3_enabled;
-+	unsigned int		intr4_enabled;
-+	unsigned int		intr0_selected;
-+	unsigned int		intr1_selected;
-+	unsigned int		intr2_selected;
-+	unsigned int		intr3_selected;
-+	unsigned int		intr4_selected;
-+};
-+
-+struct toe_private {
-+	void __iomem 		*global_base;
-+	struct net_device	*net_dev[2];
-+	struct device		*dev;
-+	struct work_struct	freq_work;
-+	spinlock_t		freeq_lock;
-+	unsigned int		swfq_desc_base;
-+	unsigned int		hwfq_desc_base;
-+	unsigned int		hwfq_buf_base;
-+	dma_addr_t		sw_freeq_desc_base_dma;
-+	dma_addr_t		hw_freeq_desc_base_dma;
-+	dma_addr_t		hwfq_buf_base_dma;
-+	dma_addr_t		hwfq_buf_end_dma;
-+};
-+
-+#define GMAC_PORT0	0
-+#define GMAC_PORT1	1
-+
-+#endif /* _GMAC_SL351x_H */
---- /dev/null
-+++ b/drivers/net/gemini_negmac/Makefile
-@@ -0,0 +1,3 @@
-+obj-$(CONFIG_GEMINI_NET_ENGINE_GMAC)+= gemini_negmac.o
-+
-+gemini_negmac-objs := gm_gmac.o
---- a/drivers/net/Kconfig
-+++ b/drivers/net/Kconfig
-@@ -2126,6 +2126,13 @@ config ACENIC_OMIT_TIGON_I
- 
- 	  The safe and default value for this is N.
- 
-+config GEMINI_NET_ENGINE_GMAC
-+	tristate "Gemini Gigabit Ethernet support"
-+	depends on ARCH_GEMINI
-+	select PHYLIB
-+	help
-+	  This driver supports Gemini TOE and NAT dual Gigabit Ethernet.
-+
- config DL2K
- 	tristate "DL2000/TC902x-based Gigabit Ethernet support"
- 	depends on PCI
---- a/drivers/net/Makefile
-+++ b/drivers/net/Makefile
-@@ -247,6 +247,7 @@ pasemi_mac_driver-objs := pasemi_mac.o p
- obj-$(CONFIG_MLX4_CORE) += mlx4/
- obj-$(CONFIG_ENC28J60) += enc28j60.o
- obj-$(CONFIG_ETHOC) += ethoc.o
-+obj-$(CONFIG_GEMINI_NET_ENGINE_GMAC) += gemini_negmac/
- 
- obj-$(CONFIG_XTENSA_XT2000_SONIC) += xtsonic.o
- 
---- /dev/null
-+++ b/drivers/usb/host/ehci-fotg2xx.c
-@@ -0,0 +1,459 @@
-+/*
-+ *  EHCI Host Controller driver
-+ *
-+ *  Copyright (C) 2006 Sony Computer Entertainment Inc.
-+ *  Copyright 2006 Sony Corp.
-+ *
-+ *  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; version 2 of the License.
-+ */
-+
-+#include <linux/platform_device.h>
-+#include <mach/hardware.h>
-+
-+#define otg_set(port, bits) writel(readl(hcd->regs + port) | bits, hcd->regs + port)
-+
-+#define otg_clear(port, bits) writel(readl(hcd->regs + port) & ~bits, hcd->regs + port)
-+
-+#define GLOBAL_ISR			0xC0
-+#define GLOBAL_ICR			0xC4
-+
-+#define HCD_MISC			0x40
-+
-+#define OTGC_SCR			0x80
-+#define OTGC_INT_EN			0x88
-+
-+#define GLOBAL_INT_POLARITY		(1 << 3)
-+#define GLOBAL_INT_MASK_HC		(1 << 2)
-+#define GLOBAL_INT_MASK_OTG		(1 << 1)
-+#define GLOBAL_INT_MASK_DEV		(1 << 0)
-+
-+#define OTGC_SCR_ID			(1 << 21)
-+#define OTGC_SCR_CROLE			(1 << 20)
-+#define OTGC_SCR_VBUS_VLD		(1 << 19)
-+#define OTGC_SCR_A_SRP_RESP_TYPE	(1 << 8)
-+#define OTGC_SCR_A_SRP_DET_EN		(1 << 7)
-+#define OTGC_SCR_A_SET_B_HNP_EN		(1 << 6)
-+#define OTGC_SCR_A_BUS_DROP		(1 << 5)
-+#define OTGC_SCR_A_BUS_REQ		(1 << 4)
-+
-+#define OTGC_INT_APLGRMV		(1 << 12)
-+#define OTGC_INT_BPLGRMV		(1 << 11)
-+#define OTGC_INT_OVC			(1 << 10)
-+#define OTGC_INT_IDCHG			(1 << 9)
-+#define OTGC_INT_RLCHG			(1 << 8)
-+#define OTGC_INT_AVBUSERR		(1 << 5)
-+#define OTGC_INT_ASRPDET		(1 << 4)
-+#define OTGC_INT_BSRPDN			(1 << 0)
-+
-+#define OTGC_INT_A_TYPE		(OTGC_INT_ASRPDET|OTGC_INT_AVBUSERR|OTGC_INT_OVC|OTGC_INT_RLCHG|OTGC_INT_IDCHG|OTGC_INT_APLGRMV)
-+#define OTGC_INT_B_TYPE		(OTGC_INT_AVBUSERR|OTGC_INT_OVC|OTGC_INT_RLCHG|OTGC_INT_IDCHG)
-+
-+static void fotg2xx_otgc_role_change(struct usb_hcd *hcd);
-+
-+static void fotg2xx_otgc_init(struct usb_hcd *hcd)
-+{
-+	struct ehci_hcd *ehci = hcd_to_ehci(hcd);
-+	unsigned int reg;
-+
-+	reg = __raw_readl(hcd->regs + OTGC_SCR);
-+	ehci_info(ehci, "role detected: %s, ",
-+		  (reg & OTGC_SCR_CROLE) ? "Peripheral" : "Host");
-+
-+	if (reg & OTGC_SCR_ID)
-+		ehci_info(ehci, "B-Device (may be unsupported!)\n");
-+	else
-+		ehci_info(ehci, "A-Device\n");
-+
-+	/* Enable the SRP detect */
-+	reg &= ~OTGC_SCR_A_SRP_RESP_TYPE;
-+	__raw_writel(reg, hcd->regs + OTGC_SCR);
-+
-+	reg = __raw_readl(hcd->regs + OTGC_INT_EN);
-+	/* clear INT B: bits AVBUSERR | OVC | RLCHG | IDCHG */
-+	reg &= ~OTGC_INT_B_TYPE;
-+	/* set INT A: bits ASRPDET | AVBUSERR | OVC | RLCHG | IDCHG | APLGRMV */
-+	reg |= OTGC_INT_A_TYPE;
-+	__raw_writel(reg, hcd->regs + OTGC_INT_EN);
-+
-+	reg = __raw_readl(hcd->regs + GLOBAL_ICR);
-+	reg &= ~GLOBAL_INT_MASK_OTG;
-+	__raw_writel(reg, hcd->regs + GLOBAL_ICR);
-+
-+	/* setup MISC register, fixes timing problems */
-+	reg = __raw_readl(hcd->regs + HCD_MISC);
-+	reg |= 0xD;
-+	__raw_writel(reg, hcd->regs + HCD_MISC);
-+
-+	fotg2xx_otgc_role_change(hcd);
-+}
-+
-+static void fotg2xx_otgh_close(struct usb_hcd *hcd)
-+{
-+	unsigned int reg;
-+
-+	/* <1>.Enable Interrupt Mask */
-+	reg = __raw_readl(hcd->regs + GLOBAL_ICR);
-+	reg |= GLOBAL_INT_MASK_HC;
-+	__raw_writel(reg, hcd->regs + GLOBAL_ICR);
-+
-+	/* <2>.Clear the Interrupt status */
-+	reg = __raw_readl(hcd->regs + 0x18);
-+	reg &= 0x0000003F;
-+	__raw_writel(reg, hcd->regs + 0x14);
-+}
-+
-+static void fotg2xx_otgh_open(struct usb_hcd *hcd)
-+{
-+	unsigned int reg;
-+
-+	reg = __raw_readl(hcd->regs + OTGC_SCR);
-+	reg &= ~OTGC_SCR_A_SRP_DET_EN;
-+	__raw_writel(reg, hcd->regs + OTGC_SCR);
-+
-+	reg = __raw_readl(hcd->regs + GLOBAL_ICR);
-+	reg &= ~GLOBAL_INT_MASK_HC;
-+	__raw_writel(reg, hcd->regs + GLOBAL_ICR);
-+}
-+
-+/* change to host role */
-+static void fotg2xx_otgc_role_change(struct usb_hcd *hcd)
-+{
-+
-+	/* clear A_SET_B_HNP_EN */
-+	otg_clear(0x80, BIT(6));
-+
-+	/*** Enable VBUS driving */
-+	if (readl(hcd->regs + 0x80) & BIT(19))
-+		printk(KERN_INFO "VBUS already enabled\n");
-+	else {
-+		int cnt = 0;
-+
-+		/* clear A_BUS_DROP */
-+		otg_clear(0x80, BIT(5));
-+
-+		/* set A_BUS_REQ */
-+		otg_set(0x80, BIT(4));
-+
-+		/* set global bus reg to VBUS on */
-+		writel(readl(IO_ADDRESS(0x40000000) + 0x30) | ((BIT(21)|BIT(22))),
-+			IO_ADDRESS(0x40000000) + 0x30);
-+
-+		if (readl(hcd->regs + 0x80) & (1<<19)) {
-+			printk(KERN_INFO "Waiting for VBus");
-+			while (!(readl(hcd->regs + 0x80) & (1<<19)) && (cnt < 80)) {
-+				printk(KERN_CONT ".");
-+				cnt++;
-+			}
-+			printk(KERN_CONT "\n");
-+		} else
-+			printk(KERN_INFO "VBUS enabled.\n");
-+
-+		mdelay(1);
-+	}
-+	fotg2xx_otgh_open(hcd);
-+}
-+
-+static int fotg2xx_ehci_hc_reset(struct usb_hcd *hcd)
-+{
-+	int result;
-+	struct ehci_hcd *ehci = hcd_to_ehci(hcd);
-+
-+	ehci->caps = hcd->regs;
-+	ehci->regs = hcd->regs + HC_LENGTH(ehci_readl(ehci, &ehci->caps->hc_capbase));
-+
-+	dbg_hcs_params(ehci, "reset");
-+	dbg_hcc_params(ehci, "reset");
-+
-+	ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);
-+	hcd->has_tt = 1;
-+
-+	result = ehci_halt(ehci);
-+	if (result)
-+		return result;
-+
-+	result = ehci_init(hcd);
-+	if (result)
-+		return result;
-+
-+	ehci_port_power(ehci, 0);
-+
-+	return result;
-+}
-+
-+/*
-+ * Name: OTGC_INT_ISR
-+ * Description:This interrupt service routine belongs to the OTG-Controller
-+ *           <1>.Check for ID_Change
-+ *           <2>.Check for RL_Change
-+ *           <3>.Error Detect
-+ * Input: wINTStatus
-+ * Output:void
-+ */
-+void fotg2xx_int_isr(struct usb_hcd *hcd, u32 wINTStatus)
-+{
-+	/* <1>.Check for ID_Change */
-+	if (wINTStatus&OTGC_INT_IDCHG) {
-+		if ((readl(hcd->regs + 0x80) & BIT(21)) != 0)
-+			fotg2xx_otgc_init(hcd); /* Change to B Type */
-+		else
-+			fotg2xx_otgc_init(hcd); /* Change to A Type */
-+
-+		return;
-+	}
-+
-+	/* <2>.Check for RL_Change */
-+	if (wINTStatus&OTGC_INT_RLCHG)
-+		fotg2xx_otgc_role_change(hcd);
-+
-+	/* <3>.Error Detect */
-+	if (wINTStatus&OTGC_INT_AVBUSERR)
-+		printk(KERN_ERR "VBus error!\n");
-+
-+	if (wINTStatus&OTGC_INT_OVC)
-+		printk(KERN_WARNING "Overcurrent detected!\n");
-+
-+	/* <3>.Check for Type-A/Type-B Interrupt */
-+	if ((readl(hcd->regs + 0x80) & BIT(21)) == 0) { /*For Type-A Interrupt*/
-+		if (wINTStatus & (OTGC_INT_A_TYPE | OTGC_INT_ASRPDET)) {
-+			/* <1>.SRP detected => then set global variable */
-+			printk(KERN_WARNING "SRP detected, but not implemented!\n");
-+
-+#if 0
-+			u32 wTempCounter;
-+			/* <2>.Turn on the V Bus */
-+			pFTC_OTG->otg.state = OTG_STATE_A_WAIT_VRISE;
-+			OTGC_enable_vbus_draw_storlink(1);
-+			pFTC_OTG->otg.state = OTG_STATE_A_HOST;
-+			/* <3>.Should waiting for Device-Connect Wait 300ms */
-+			INFO(pFTC_OTG, ">>> OTG-A Waiting for OTG-B Connect,\n");
-+			wTempCounter = 0;
-+			while (mwHost20_PORTSC_ConnectStatus_Rd() == 0) {
-+				mdelay(1);
-+				wTempCounter++;
-+				/* Waiting for 300 ms */
-+				if (wTempCounter > 300) {
-+					mdwOTGC_Control_A_SRP_DET_EN_Clr();
-+					INFO(pFTC_OTG, ">>> OTG-B do not connect under 300 ms...\n");
-+					break;
-+				}
-+			}
-+			/* <4>.If Connect => issue quick Reset */
-+			if (mwHost20_PORTSC_ConnectStatus_Rd() > 0) {
-+				mdelay(300); /* For OPT-A Test */
-+				OTGH_host_quick_Reset();
-+				OTGH_Open();
-+				pFTC_OTG->otg.host->A_Disable_Set_Feature_HNP = 0;
-+			}
-+#endif
-+		}
-+	} else { /* For Type-B Interrupt */
-+		BUG();
-+	}
-+}
-+
-+static irqreturn_t fotg2xx_ehci_irq(int irq, void *devid)
-+{
-+	struct usb_hcd *hcd = devid;
-+	u32 val;
-+
-+	/* OTG Interrupt Status Register */
-+	val = readl(hcd->regs + 0x84);
-+
-+	/* OTG stuff */
-+	if (val) {
-+		/* supposed to do "INT STS Clr" - XXX */
-+		writel(readl(hcd->regs + 0x84) | val, hcd->regs + 0x84);
-+
-+		fotg2xx_int_isr(hcd, val);
-+
-+		/* supposed to do "INT STS Clr" - XXX */
-+		writel(readl(hcd->regs + 0x84) | val, hcd->regs + 0x84);
-+
-+		return IRQ_HANDLED;
-+	}
-+
-+	if ((readl(hcd->regs + 0x80) & BIT(20)) == 0) { /* Role is HOST */
-+		if (readl(hcd->regs + 0xC0) & BIT(2)) { /* INT STS HOST */
-+			/* leave this for ehci irq handler */
-+			return IRQ_NONE;
-+		}
-+	} else
-+		printk(KERN_WARNING
-+		      "received irq for peripheral - don't know what to do!\n");
-+
-+	/* do not call the ehci irq handler */
-+	return IRQ_HANDLED;
-+}
-+
-+static int fotg2xx_ehci_run(struct usb_hcd *hcd)
-+{
-+	int retval;
-+
-+	retval = ehci_run(hcd);
-+
-+	fotg2xx_otgh_close(hcd);
-+	fotg2xx_otgc_init(hcd);
-+
-+	return retval;
-+}
-+
-+static const struct hc_driver fotg2xx_ehci_hc_driver = {
-+	.description		= hcd_name,
-+	.product_desc		= "FOTG2XX EHCI Host Controller",
-+	.hcd_priv_size		= sizeof(struct ehci_hcd),
-+	.irq			= ehci_irq,
-+	.flags			= HCD_MEMORY | HCD_USB2,
-+	.reset			= fotg2xx_ehci_hc_reset,
-+	.start			= fotg2xx_ehci_run,
-+	.stop			= ehci_stop,
-+	.shutdown		= ehci_shutdown,
-+	.urb_enqueue		= ehci_urb_enqueue,
-+	.urb_dequeue		= ehci_urb_dequeue,
-+	.endpoint_disable	= ehci_endpoint_disable,
-+	.get_frame_number	= ehci_get_frame,
-+	.hub_status_data	= ehci_hub_status_data,
-+	.hub_control		= ehci_hub_control,
-+#if defined(CONFIG_PM)
-+	.bus_suspend		= ehci_bus_suspend,
-+	.bus_resume		= ehci_bus_resume,
-+#endif
-+	.relinquish_port	= ehci_relinquish_port,
-+	.port_handed_over	= ehci_port_handed_over,
-+};
-+
-+static int fotg2xx_ehci_probe(struct platform_device *pdev)
-+{
-+	const struct hc_driver *driver = &fotg2xx_ehci_hc_driver;
-+	struct usb_hcd *hcd;
-+	struct resource *res;
-+	int irq;
-+	int retval;
-+
-+	pr_debug("initializing FOTG2XX-SOC USB Controller\n");
-+
-+	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-+	if (!res) {
-+		dev_err(&pdev->dev,
-+			"Found HC with no IRQ. Check %s setup!\n",
-+			dev_name(&pdev->dev));
-+		return -ENODEV;
-+	}
-+
-+	irq = res->start;
-+
-+	hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));
-+	if (!hcd) {
-+		retval = -ENOMEM;
-+		goto err1;
-+	}
-+
-+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if (!res) {
-+		dev_err(&pdev->dev,
-+			"Found HC with no register addr. Check %s setup!\n",
-+			dev_name(&pdev->dev));
-+		retval = -ENODEV;
-+		goto err2;
-+	}
-+
-+	hcd->rsrc_start = res->start;
-+	hcd->rsrc_len = res->end - res->start + 1;
-+	if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len,
-+				driver->description)) {
-+		dev_dbg(&pdev->dev, "controller already in use\n");
-+		retval = -EBUSY;
-+		goto err2;
-+	}
-+
-+	hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
-+	if (hcd->regs == NULL) {
-+		dev_dbg(&pdev->dev, "error mapping memory\n");
-+		retval = -EFAULT;
-+		goto err3;
-+	}
-+
-+
-+	/* set global reg to mini-A host */
-+	writel(readl(IO_ADDRESS(0x40000000) + 0x30) & ~(BIT(30)|BIT(29)),
-+		IO_ADDRESS(0x40000000) + 0x30);
-+
-+	/* USB0&USB1 - VBUS off */
-+	writel(readl(IO_ADDRESS(0x40000000) + 0x30) & ~(BIT(21)|BIT(22)),
-+		IO_ADDRESS(0x40000000) + 0x30);
-+
-+	if ((readl(hcd->regs) == 0x01000010) &&
-+		(readl(hcd->regs + 4) == 0x00000001) &&
-+		(readl(hcd->regs + 8) == 0x00000006)) {
-+		dev_info(&pdev->dev,
-+			"Found Faraday OTG 2XX controller (base = 0x%08lX)\n",
-+			(unsigned long) hcd->rsrc_start);
-+	} else {
-+		dev_err(&pdev->dev, "fotg2xx id mismatch: found %d.%d.%d\n",
-+			readl(hcd->regs + 0x00),
-+			readl(hcd->regs + 0x04),
-+			readl(hcd->regs + 0x08));
-+		retval = -ENODEV;
-+		goto err4;
-+	}
-+
-+	platform_set_drvdata(pdev, hcd);
-+
-+	/* mask interrupts - peripheral, otg, host, hi-active (bits 0,1,2,3) */
-+	otg_set(0xc4, BIT(3)); /* hi active */
-+
-+	otg_set(0xc4, BIT(2)); /* host */
-+	otg_set(0xc4, BIT(1)); /* otg */
-+	otg_set(0xc4, BIT(0)); /* peripheral */
-+
-+	/* register additional interrupt - here we check otg status */
-+	if ((request_irq(irq, &fotg2xx_ehci_irq, IRQF_SHARED | IRQF_DISABLED,
-+		hcd->irq_descr, hcd)) != 0) {
-+		dev_dbg(&pdev->dev, "error requesting irq %d\n", irq);
-+		retval = -EFAULT;
-+		goto err4;
-+	}
-+
-+	retval = usb_add_hcd(hcd, irq, IRQF_SHARED);
-+	if (retval != 0)
-+		goto err4;
-+	return retval;
-+
-+err4:
-+	iounmap(hcd->regs);
-+err3:
-+	release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
-+err2:
-+	usb_put_hcd(hcd);
-+err1:
-+	dev_err(&pdev->dev, "init %s fail, %d\n", dev_name(&pdev->dev), retval);
-+	return retval;
-+}
-+
-+/* may be called without controller electrically present */
-+/* may be called with controller, bus, and devices active */
-+
-+int fotg2xx_ehci_remove(struct platform_device *pdev)
-+{
-+	struct usb_hcd *hcd =
-+		(struct usb_hcd *)platform_get_drvdata(pdev);
-+
-+	usb_remove_hcd(hcd);
-+	release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
-+	iounmap(hcd->regs);
-+	usb_put_hcd(hcd);
-+	platform_set_drvdata(pdev, NULL);
-+
-+	return 0;
-+}
-+
-+MODULE_ALIAS("platform:ehci-fotg2xx");
-+
-+static struct platform_driver fotg2xx_ehci_driver = {
-+	.probe = fotg2xx_ehci_probe,
-+	.remove = fotg2xx_ehci_remove,
-+	.driver = {
-+		.name = "ehci-fotg2xx",
-+	},
-+};
---- a/drivers/usb/host/ehci.h
-+++ b/drivers/usb/host/ehci.h
-@@ -552,7 +552,12 @@ static inline unsigned int
- ehci_port_speed(struct ehci_hcd *ehci, unsigned int portsc)
- {
- 	if (ehci_is_TDI(ehci)) {
-+#ifdef CONFIG_ARCH_GEMINI
-+		portsc = readl(ehci_to_hcd(ehci)->regs + 0x80);
-+		switch ((portsc>>22)&3) {
-+#else
- 		switch ((portsc >> (ehci->has_hostpc ? 25 : 26)) & 3) {
-+#endif
- 		case 0:
- 			return 0;
- 		case 1:
---- a/drivers/usb/host/ehci-hcd.c
-+++ b/drivers/usb/host/ehci-hcd.c
-@@ -194,9 +194,11 @@ static int ehci_halt (struct ehci_hcd *e
- 	if ((temp & STS_HALT) != 0)
- 		return 0;
- 
-+#ifndef CONFIG_ARCH_GEMINI
- 	temp = ehci_readl(ehci, &ehci->regs->command);
- 	temp &= ~CMD_RUN;
- 	ehci_writel(ehci, temp, &ehci->regs->command);
-+#endif
- 	return handshake (ehci, &ehci->regs->status,
- 			  STS_HALT, STS_HALT, 16 * 125);
- }
-@@ -263,8 +265,8 @@ static int ehci_reset (struct ehci_hcd *
- 	if (retval)
- 		return retval;
- 
--	if (ehci_is_TDI(ehci))
--		tdi_reset (ehci);
-+//	if (ehci_is_TDI(ehci))
-+//		tdi_reset (ehci);
- 
- 	if (ehci->debug)
- 		dbgp_external_startup();
-@@ -397,12 +399,13 @@ static void ehci_silence_controller(stru
- {
- 	ehci_halt(ehci);
- 	ehci_turn_off_all_ports(ehci);
--
-+#ifndef CONFIG_ARCH_GEMINI
- 	/* make BIOS/etc use companion controller during reboot */
- 	ehci_writel(ehci, 0, &ehci->regs->configured_flag);
- 
- 	/* unblock posted writes */
- 	ehci_readl(ehci, &ehci->regs->configured_flag);
-+#endif
- }
- 
- /* ehci_shutdown kick in for silicon on any bus (not just pci, etc).
-@@ -653,7 +656,9 @@ static int ehci_run (struct usb_hcd *hcd
- 	// Philips, Intel, and maybe others need CMD_RUN before the
- 	// root hub will detect new devices (why?); NEC doesn't
- 	ehci->command &= ~(CMD_LRESET|CMD_IAAD|CMD_PSE|CMD_ASE|CMD_RESET);
-+#ifndef CONFIG_ARCH_GEMINI
- 	ehci->command |= CMD_RUN;
-+#endif
- 	ehci_writel(ehci, ehci->command, &ehci->regs->command);
- 	dbg_cmd (ehci, "init", ehci->command);
- 
-@@ -673,9 +678,11 @@ static int ehci_run (struct usb_hcd *hcd
- 	 */
- 	down_write(&ehci_cf_port_reset_rwsem);
- 	hcd->state = HC_STATE_RUNNING;
-+#ifndef CONFIG_ARCH_GEMINI
- 	ehci_writel(ehci, FLAG_CF, &ehci->regs->configured_flag);
- 	ehci_readl(ehci, &ehci->regs->command);	/* unblock posted writes */
- 	msleep(5);
-+#endif
- 	up_write(&ehci_cf_port_reset_rwsem);
- 	ehci->last_periodic_enable = ktime_get_real();
- 
-@@ -767,9 +774,10 @@ static irqreturn_t ehci_irq (struct usb_
- 		pcd_status = status;
- 
- 		/* resume root hub? */
-+#ifndef CONFIG_ARCH_GEMINI
- 		if (!(cmd & CMD_RUN))
- 			usb_hcd_resume_root_hub(hcd);
--
-+#endif
- 		while (i--) {
- 			int pstatus = ehci_readl(ehci,
- 						 &ehci->regs->port_status [i]);
-@@ -802,7 +810,9 @@ static irqreturn_t ehci_irq (struct usb_
- 		ehci_halt(ehci);
- dead:
- 		ehci_reset(ehci);
-+#ifndef CONFIG_ARCH_GEMINI
- 		ehci_writel(ehci, 0, &ehci->regs->configured_flag);
-+#endif
- 		/* generic layer kills/unlinks all urbs, then
- 		 * uses ehci_stop to clean up the rest
- 		 */
-@@ -1101,6 +1111,11 @@ MODULE_LICENSE ("GPL");
- #define	PCI_DRIVER		ehci_pci_driver
- #endif
- 
-+#ifdef CONFIG_ARCH_GEMINI
-+#include "ehci-fotg2xx.c"
-+#define PLATFORM_DRIVER		fotg2xx_ehci_driver
-+#endif
-+
- #ifdef CONFIG_USB_EHCI_FSL
- #include "ehci-fsl.c"
- #define	PLATFORM_DRIVER		ehci_fsl_driver
---- a/drivers/usb/host/ehci-hub.c
-+++ b/drivers/usb/host/ehci-hub.c
-@@ -809,6 +809,12 @@ static int ehci_hub_control (
- 			/* see what we found out */
- 			temp = check_reset_complete (ehci, wIndex, status_reg,
- 					ehci_readl(ehci, status_reg));
-+#ifdef CONFIG_ARCH_GEMINI
-+			/* restart schedule */
-+			ehci_writel(ehci, ehci_readl(ehci, &ehci->regs->command) | CMD_RUN, &ehci->regs->command);
-+
-+//			hcd->state = HC_STATE_RUNNING;
-+#endif
- 		}
- 
- 		if (!(temp & (PORT_RESUME|PORT_RESET)))
---- a/drivers/usb/Kconfig
-+++ b/drivers/usb/Kconfig
-@@ -60,6 +60,7 @@ config USB_ARCH_HAS_EHCI
- 	default y if ARCH_IXP4XX
- 	default y if ARCH_W90X900
- 	default y if ARCH_AT91SAM9G45
-+	default y if ARCH_GEMINI
- 	default PCI
- 
- # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.
---- /dev/null
-+++ b/drivers/watchdog/gemini_wdt.c
-@@ -0,0 +1,368 @@
-+/*
-+ *  Watchdog driver for Cortina Systems Gemini SoC
-+ *
-+ *  Copyright (C) 2009 Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
-+ *
-+ * 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.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/io.h>
-+#include <linux/fs.h>
-+#include <linux/uaccess.h>
-+#include <linux/miscdevice.h>
-+#include <linux/platform_device.h>
-+#include <linux/watchdog.h>
-+
-+#define GEMINI_WDCOUNTER	0x0
-+#define GEMINI_WDLOAD		0x4
-+#define GEMINI_WDRESTART	0x8
-+
-+#define WDRESTART_MAGIC		0x5AB9
-+
-+#define GEMINI_WDCR		0xC
-+
-+#define WDCR_CLOCK_5MHZ		(1 << 4)
-+#define WDCR_SYS_RST		(1 << 1)
-+#define WDCR_ENABLE		(1 << 0)
-+
-+#define WDT_CLOCK		5000000		/* 5 MHz */
-+#define WDT_DEFAULT_TIMEOUT	13
-+#define WDT_MAX_TIMEOUT		(0xFFFFFFFF / WDT_CLOCK)
-+
-+/* status bits */
-+#define WDT_ACTIVE		0
-+#define WDT_OK_TO_CLOSE		1
-+
-+static unsigned int timeout = WDT_DEFAULT_TIMEOUT;
-+static int nowayout = WATCHDOG_NOWAYOUT;
-+
-+static DEFINE_SPINLOCK(gemini_wdt_lock);
-+
-+static struct platform_device *gemini_wdt_dev;
-+
-+struct gemini_wdt_struct {
-+	struct resource		*res;
-+	struct device		*dev;
-+	void __iomem		*base;
-+	unsigned long		status;
-+};
-+
-+static struct watchdog_info gemini_wdt_info = {
-+	.identity	= "Gemini watchdog",
-+	.options	= WDIOF_MAGICCLOSE | WDIOF_KEEPALIVEPING |
-+			  WDIOF_SETTIMEOUT,
-+};
-+
-+/* Disable the watchdog. */
-+static void gemini_wdt_stop(struct gemini_wdt_struct *gemini_wdt)
-+{
-+	spin_lock(&gemini_wdt_lock);
-+
-+	__raw_writel(0, gemini_wdt->base + GEMINI_WDCR);
-+
-+	clear_bit(WDT_ACTIVE, &gemini_wdt->status);
-+
-+	spin_unlock(&gemini_wdt_lock);
-+}
-+
-+/* Service the watchdog */
-+static void gemini_wdt_service(struct gemini_wdt_struct *gemini_wdt)
-+{
-+	__raw_writel(WDRESTART_MAGIC, gemini_wdt->base + GEMINI_WDRESTART);
-+}
-+
-+/* Enable and reset the watchdog. */
-+static void gemini_wdt_start(struct gemini_wdt_struct *gemini_wdt)
-+{
-+	spin_lock(&gemini_wdt_lock);
-+
-+	__raw_writel(timeout * WDT_CLOCK, gemini_wdt->base + GEMINI_WDLOAD);
-+
-+	gemini_wdt_service(gemini_wdt);
-+
-+	/* set clock before enabling */
-+	__raw_writel(WDCR_CLOCK_5MHZ | WDCR_SYS_RST,
-+			gemini_wdt->base + GEMINI_WDCR);
-+
-+	__raw_writel(WDCR_CLOCK_5MHZ | WDCR_SYS_RST | WDCR_ENABLE,
-+			gemini_wdt->base + GEMINI_WDCR);
-+
-+	set_bit(WDT_ACTIVE, &gemini_wdt->status);
-+
-+	spin_unlock(&gemini_wdt_lock);
-+}
-+
-+/* Watchdog device is opened, and watchdog starts running. */
-+static int gemini_wdt_open(struct inode *inode, struct file *file)
-+{
-+	struct gemini_wdt_struct *gemini_wdt = platform_get_drvdata(gemini_wdt_dev);
-+
-+	if (test_bit(WDT_ACTIVE, &gemini_wdt->status))
-+		return -EBUSY;
-+
-+	file->private_data = gemini_wdt;
-+
-+	gemini_wdt_start(gemini_wdt);
-+
-+	return nonseekable_open(inode, file);
-+}
-+
-+/* Close the watchdog device. */
-+static int gemini_wdt_close(struct inode *inode, struct file *file)
-+{
-+	struct gemini_wdt_struct *gemini_wdt = file->private_data;
-+
-+	/* Disable the watchdog if possible */
-+	if (test_bit(WDT_OK_TO_CLOSE, &gemini_wdt->status))
-+		gemini_wdt_stop(gemini_wdt);
-+	else
-+		dev_warn(gemini_wdt->dev, "Device closed unexpectedly - timer will not stop\n");
-+
-+	return 0;
-+}
-+
-+/* Handle commands from user-space. */
-+static int gemini_wdt_ioctl(struct inode *inode, struct file *file,
-+		unsigned int cmd, unsigned long arg)
-+{
-+	struct gemini_wdt_struct *gemini_wdt = file->private_data;
-+
-+	int value;
-+
-+	switch (cmd) {
-+	case WDIOC_KEEPALIVE:
-+		gemini_wdt_service(gemini_wdt);
-+		return 0;
-+
-+	case WDIOC_GETSUPPORT:
-+		return copy_to_user((struct watchdog_info *)arg, &gemini_wdt_info,
-+			sizeof(gemini_wdt_info)) ? -EFAULT : 0;
-+
-+	case WDIOC_SETTIMEOUT:
-+		if (get_user(value, (int *)arg))
-+			return -EFAULT;
-+
-+		if ((value < 1) || (value > WDT_MAX_TIMEOUT))
-+			return -EINVAL;
-+
-+		timeout = value;
-+
-+		/* restart wdt to use new timeout */
-+		gemini_wdt_stop(gemini_wdt);
-+		gemini_wdt_start(gemini_wdt);
-+
-+		/* Fall through */
-+	case WDIOC_GETTIMEOUT:
-+		return put_user(timeout, (int *)arg);
-+
-+	case WDIOC_GETTIMELEFT:
-+		value = __raw_readl(gemini_wdt->base + GEMINI_WDCOUNTER);
-+		return put_user(value / WDT_CLOCK, (int *)arg);
-+
-+	default:
-+		return -ENOTTY;
-+	}
-+}
-+
-+/* Refresh the watchdog whenever device is written to. */
-+static ssize_t gemini_wdt_write(struct file *file, const char *data,
-+						size_t len, loff_t *ppos)
-+{
-+	struct gemini_wdt_struct *gemini_wdt = file->private_data;
-+
-+	if (len) {
-+		if (!nowayout) {
-+			size_t i;
-+
-+			clear_bit(WDT_OK_TO_CLOSE, &gemini_wdt->status);
-+			for (i = 0; i != len; i++) {
-+				char c;
-+
-+				if (get_user(c, data + i))
-+					return -EFAULT;
-+				if (c == 'V')
-+					set_bit(WDT_OK_TO_CLOSE,
-+						&gemini_wdt->status);
-+			}
-+		}
-+		gemini_wdt_service(gemini_wdt);
-+	}
-+
-+	return len;
-+}
-+
-+static const struct file_operations gemini_wdt_fops = {
-+	.owner		= THIS_MODULE,
-+	.llseek		= no_llseek,
-+	.ioctl		= gemini_wdt_ioctl,
-+	.open		= gemini_wdt_open,
-+	.release	= gemini_wdt_close,
-+	.write		= gemini_wdt_write,
-+};
-+
-+static struct miscdevice gemini_wdt_miscdev = {
-+	.minor		= WATCHDOG_MINOR,
-+	.name		= "watchdog",
-+	.fops		= &gemini_wdt_fops,
-+};
-+
-+static void gemini_wdt_shutdown(struct platform_device *pdev)
-+{
-+	struct gemini_wdt_struct *gemini_wdt = platform_get_drvdata(pdev);
-+
-+	gemini_wdt_stop(gemini_wdt);
-+}
-+
-+static int __init gemini_wdt_probe(struct platform_device *pdev)
-+{
-+	int ret;
-+	int res_size;
-+	struct resource *res;
-+	void __iomem *base;
-+	struct gemini_wdt_struct *gemini_wdt;
-+
-+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if (!res) {
-+		dev_err(&pdev->dev, "can't get device resources\n");
-+		return -ENODEV;
-+	}
-+
-+	res_size = resource_size(res);
-+	if (!request_mem_region(res->start, res_size, res->name)) {
-+		dev_err(&pdev->dev, "can't allocate %d bytes at %d address\n",
-+			res_size, res->start);
-+		return -ENOMEM;
-+	}
-+
-+	base = ioremap(res->start, res_size);
-+	if (!base) {
-+		dev_err(&pdev->dev, "ioremap failed\n");
-+		ret = -EIO;
-+		goto fail0;
-+	}
-+
-+	gemini_wdt = kzalloc(sizeof(struct gemini_wdt_struct), GFP_KERNEL);
-+	if (!gemini_wdt) {
-+		dev_err(&pdev->dev, "can't allocate interface\n");
-+		ret = -ENOMEM;
-+		goto fail1;
-+	}
-+
-+	/* Setup gemini_wdt driver structure */
-+	gemini_wdt->base = base;
-+	gemini_wdt->res = res;
-+
-+	/* Set up platform driver data */
-+	platform_set_drvdata(pdev, gemini_wdt);
-+	gemini_wdt_dev = pdev;
-+
-+	if (gemini_wdt_miscdev.parent) {
-+		ret = -EBUSY;
-+		goto fail2;
-+	}
-+
-+	gemini_wdt_miscdev.parent = &pdev->dev;
-+
-+	ret = misc_register(&gemini_wdt_miscdev);
-+	if (ret)
-+		goto fail2;
-+
-+	return 0;
-+
-+fail2:
-+	platform_set_drvdata(pdev, NULL);
-+	kfree(gemini_wdt);
-+fail1:
-+	iounmap(base);
-+fail0:
-+	release_mem_region(res->start, res_size);
-+
-+	return ret;
-+}
-+
-+static int __exit gemini_wdt_remove(struct platform_device *pdev)
-+{
-+	struct gemini_wdt_struct *gemini_wdt = platform_get_drvdata(pdev);
-+
-+	platform_set_drvdata(pdev, NULL);
-+	misc_deregister(&gemini_wdt_miscdev);
-+	gemini_wdt_dev = NULL;
-+	iounmap(gemini_wdt->base);
-+	release_mem_region(gemini_wdt->res->start, resource_size(gemini_wdt->res));
-+
-+	kfree(gemini_wdt);
-+
-+	return 0;
-+}
-+
-+#ifdef CONFIG_PM
-+static int gemini_wdt_suspend(struct platform_device *pdev, pm_message_t message)
-+{
-+	struct gemini_wdt_struct *gemini_wdt = platform_get_drvdata(pdev);
-+	unsigned int reg;
-+
-+	reg = __raw_readw(gemini_wdt->base + GEMINI_WDCR);
-+	reg &= ~(WDCR_WDENABLE);
-+	__raw_writel(reg, gemini_wdt->base + GEMINI_WDCR);
-+
-+	return 0;
-+}
-+
-+static int gemini_wdt_resume(struct platform_device *pdev)
-+{
-+	struct gemini_wdt_struct *gemini_wdt = platform_get_drvdata(pdev);
-+	unsigned int reg;
-+
-+	if (gemini_wdt->status) {
-+		reg = __raw_readw(gemini_wdt->base + GEMINI_WDCR);
-+		reg |= WDCR_WDENABLE;
-+		__raw_writel(reg, gemini_wdt->base + GEMINI_WDCR);
-+	}
-+
-+	return 0;
-+}
-+#else
-+#define gemini_wdt_suspend	NULL
-+#define gemini_wdt_resume	NULL
-+#endif
-+
-+static struct platform_driver gemini_wdt_driver = {
-+	.probe		= gemini_wdt_probe,
-+	.remove		= __exit_p(gemini_wdt_remove),
-+	.shutdown	= gemini_wdt_shutdown,
-+	.suspend	= gemini_wdt_suspend,
-+	.resume		= gemini_wdt_resume,
-+	.driver		= {
-+		.name	= "gemini-wdt",
-+		.owner	= THIS_MODULE,
-+	},
-+};
-+
-+static int __init gemini_wdt_init(void)
-+{
-+	return platform_driver_probe(&gemini_wdt_driver, gemini_wdt_probe);
-+}
-+
-+static void __exit gemini_wdt_exit(void)
-+{
-+	platform_driver_unregister(&gemini_wdt_driver);
-+}
-+
-+module_init(gemini_wdt_init);
-+module_exit(gemini_wdt_exit);
-+
-+module_param(timeout, uint, 0);
-+MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds");
-+
-+module_param(nowayout, int, 0);
-+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started");
-+
-+MODULE_AUTHOR("Paulius Zaleckas");
-+MODULE_DESCRIPTION("Watchdog driver for Gemini");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
-+MODULE_ALIAS("platform:gemini-wdt");
---- a/drivers/watchdog/Kconfig
-+++ b/drivers/watchdog/Kconfig
-@@ -111,6 +111,16 @@ config 977_WATCHDOG
- 
- 	  Not sure? It's safe to say N.
- 
-+config GEMINI_WATCHDOG
-+	tristate "Gemini watchdog"
-+	depends on ARCH_GEMINI
-+	help
-+	  Say Y here if to include support for the watchdog timer
-+	  embedded in the Cortina Systems Gemini family of devices.
-+
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called gemini_wdt.
-+
- config IXP2000_WATCHDOG
- 	tristate "IXP2000 Watchdog"
- 	depends on ARCH_IXP2000
---- a/drivers/watchdog/Makefile
-+++ b/drivers/watchdog/Makefile
-@@ -31,6 +31,7 @@ obj-$(CONFIG_OMAP_WATCHDOG) += omap_wdt.
- obj-$(CONFIG_TWL4030_WATCHDOG) += twl4030_wdt.o
- obj-$(CONFIG_21285_WATCHDOG) += wdt285.o
- obj-$(CONFIG_977_WATCHDOG) += wdt977.o
-+obj-$(CONFIG_GEMINI_WATCHDOG) += gemini_wdt.o
- obj-$(CONFIG_IXP2000_WATCHDOG) += ixp2000_wdt.o
- obj-$(CONFIG_IXP4XX_WATCHDOG) += ixp4xx_wdt.o
- obj-$(CONFIG_KS8695_WATCHDOG) += ks8695_wdt.o
---- a/include/linux/usb/ehci_def.h
-+++ b/include/linux/usb/ehci_def.h
-@@ -91,9 +91,9 @@ struct ehci_regs {
- 	u32		frame_list;	/* points to periodic list */
- 	/* ASYNCLISTADDR: offset 0x18 */
- 	u32		async_next;	/* address of next async queue head */
--
-+#ifndef CONFIG_ARCH_GEMINI
- 	u32		reserved [9];
--
-+#endif
- 	/* CONFIGFLAG: offset 0x40 */
- 	u32		configured_flag;
- #define FLAG_CF		(1<<0)		/* true: we'll support "high speed" */
---- a/arch/arm/mm/Kconfig
-+++ b/arch/arm/mm/Kconfig
-@@ -774,5 +774,6 @@ config CACHE_XSC3L2
- 
- config ARM_L1_CACHE_SHIFT
- 	int
-+	default 4 if CPU_FA526
- 	default 6 if ARCH_OMAP3
- 	default 5
---- a/arch/arm/lib/copy_page.S
-+++ b/arch/arm/lib/copy_page.S
-@@ -17,7 +17,7 @@
- #define COPY_COUNT (PAGE_SZ / (2 * L1_CACHE_BYTES) PLD( -1 ))
- 
- 		.text
--		.align	5
-+		.align	L1_CACHE_SHIFT
- /*
-  * StrongARM optimised copy_page routine
-  * now 1.78bytes/cycle, was 1.60 bytes/cycle (50MHz bus -> 89MB/s)
diff --git a/target/linux/gemini/patches/002-wbd111_support.patch b/target/linux/gemini/patches/002-wbd111_support.patch
deleted file mode 100644
index 059006d0d..000000000
--- a/target/linux/gemini/patches/002-wbd111_support.patch
+++ /dev/null
@@ -1,151 +0,0 @@
---- /dev/null
-+++ b/arch/arm/mach-gemini/board-wbd111.c
-@@ -0,0 +1,125 @@
-+/*
-+ *  Support for Wiliboard WBD-111
-+ *
-+ *  Copyright (C) 2009 Imre Kaloz <kaloz@openwrt.org>
-+ *
-+ * 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/kernel.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+#include <linux/leds.h>
-+#include <linux/input.h>
-+#include <linux/skbuff.h>
-+#include <linux/gpio_keys.h>
-+#include <linux/mdio-gpio.h>
-+#include <asm/mach-types.h>
-+#include <asm/mach/arch.h>
-+#include <asm/mach/time.h>
-+
-+#include <mach/gmac.h>
-+
-+#include "common.h"
-+
-+static struct mdio_gpio_platform_data wbd111_mdio = {
-+	.mdc		= 22,
-+	.mdio		= 21,
-+	.phy_mask	= ~(1 << 1),
-+};
-+
-+static struct platform_device wbd111_phy_device = {
-+	.name	= "mdio-gpio",
-+	.id	= 0,
-+	.dev	= {
-+		.platform_data = &wbd111_mdio,
-+	},
-+};
-+
-+static struct gemini_gmac_platform_data gmac_data = {
-+	.bus_id[0] = "0:01",
-+	.interface[0] = PHY_INTERFACE_MODE_MII,
-+};
-+
-+static struct gpio_keys_button wbd111_keys[] = {
-+	{
-+		.code		= KEY_SETUP,
-+		.gpio		= 5,
-+		.active_low	= 1,
-+		.desc		= "reset",
-+		.type		= EV_KEY,
-+	},
-+};
-+
-+static struct gpio_keys_platform_data wbd111_keys_data = {
-+	.buttons	= wbd111_keys,
-+	.nbuttons	= ARRAY_SIZE(wbd111_keys),
-+};
-+
-+static struct platform_device wbd111_keys_device = {
-+	.name	= "gpio-keys",
-+	.id	= -1,
-+	.dev	= {
-+		.platform_data = &wbd111_keys_data,
-+	},
-+};
-+
-+static struct gpio_led wbd111_leds[] = {
-+	{
-+		.name			= "L3red",
-+		.gpio			= 1,
-+	},
-+	{
-+		.name			= "L4green",
-+		.gpio			= 2,
-+	},
-+	{
-+		.name			= "L4red",
-+		.gpio			= 3,
-+	},
-+	{
-+		.name			= "L3green",
-+		.gpio			= 5,
-+	},
-+};
-+
-+static struct gpio_led_platform_data wbd111_leds_data = {
-+	.num_leds	= ARRAY_SIZE(wbd111_leds),
-+	.leds		= wbd111_leds,
-+};
-+
-+static struct platform_device wbd111_leds_device = {
-+	.name	= "leds-gpio",
-+	.id	= -1,
-+	.dev	= {
-+		.platform_data = &wbd111_leds_data,
-+	},
-+};
-+
-+static struct sys_timer wbd111_timer = {
-+	.init	= gemini_timer_init,
-+};
-+
-+static void __init wbd111_init(void)
-+{
-+	gemini_gpio_init();
-+	platform_register_uart();
-+	platform_register_watchdog();
-+	platform_register_pflash(SZ_8M, NULL, 0);
-+	platform_device_register(&wbd111_leds_device);
-+	platform_device_register(&wbd111_keys_device);
-+	platform_device_register(&wbd111_phy_device);
-+	platform_register_ethernet(&gmac_data);
-+}
-+
-+MACHINE_START(WBD111, "Wiliboard WBD-111")
-+	.phys_io	= 0x7fffc000,
-+	.io_pg_offst	= ((0xffffc000) >> 18) & 0xfffc,
-+	.boot_params	= 0x100,
-+	.map_io		= gemini_map_io,
-+	.init_irq	= gemini_init_irq,
-+	.timer		= &wbd111_timer,
-+	.init_machine	= wbd111_init,
-+MACHINE_END
---- a/arch/arm/mach-gemini/Kconfig
-+++ b/arch/arm/mach-gemini/Kconfig
-@@ -16,6 +16,13 @@ config MACH_RUT100
- 	  Say Y here if you intend to run this kernel on a
- 	  Teltonika 3G Router RUT100.
- 
-+config MACH_WBD111
-+	bool "Wiliboard WBD-111"
-+	select GEMINI_MEM_SWAP
-+	help
-+	  Say Y here if you intend to run this kernel on a
-+	  Wiliboard WBD-111.
-+
- endmenu
- 
- config GEMINI_MEM_SWAP
---- a/arch/arm/mach-gemini/Makefile
-+++ b/arch/arm/mach-gemini/Makefile
-@@ -11,3 +11,4 @@ obj-$(CONFIG_PCI)	+= pci.o
- # Board-specific support
- obj-$(CONFIG_MACH_NAS4220B)	+= board-nas4220b.o
- obj-$(CONFIG_MACH_RUT100)	+= board-rut1xx.o
-+obj-$(CONFIG_MACH_WBD111)	+= board-wbd111.o
diff --git a/target/linux/gemini/patches/003-wbd111-static-flash-map.patch b/target/linux/gemini/patches/003-wbd111-static-flash-map.patch
deleted file mode 100644
index 1b9debb62..000000000
--- a/target/linux/gemini/patches/003-wbd111-static-flash-map.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- a/arch/arm/mach-gemini/board-wbd111.c
-+++ b/arch/arm/mach-gemini/board-wbd111.c
-@@ -16,6 +16,8 @@
- #include <linux/skbuff.h>
- #include <linux/gpio_keys.h>
- #include <linux/mdio-gpio.h>
-+#include <linux/mtd/mtd.h>
-+#include <linux/mtd/partitions.h>
- #include <asm/mach-types.h>
- #include <asm/mach/arch.h>
- #include <asm/mach/time.h>
-@@ -102,12 +104,51 @@ static struct sys_timer wbd111_timer = {
- 	.init	= gemini_timer_init,
- };
- 
-+#ifdef CONFIG_MTD_PARTITIONS
-+static struct mtd_partition wbd111_partitions[] = {
-+	{
-+		.name		= "RedBoot",
-+		.offset		= 0,
-+		.size		= 0x020000,
-+		.mask_flags	= MTD_WRITEABLE,
-+	} , {
-+		.name		= "kernel",
-+		.offset		= 0x020000,
-+		.size		= 0x100000,
-+	} , {
-+		.name		= "rootfs",
-+		.offset		= 0x120000,
-+		.size		= 0x6a0000,
-+	} , {
-+		.name		= "VCTL",
-+		.offset		= 0x7c0000,
-+		.size		= 0x010000,
-+		.mask_flags	= MTD_WRITEABLE,
-+	} , {
-+		.name		= "cfg",
-+		.offset		= 0x7d0000,
-+		.size		= 0x010000,
-+		.mask_flags	= MTD_WRITEABLE,
-+	} , {
-+		.name		= "FIS",
-+		.offset		= 0x7e0000,
-+		.size		= 0x010000,
-+		.mask_flags	= MTD_WRITEABLE,
-+	}
-+};
-+#define wbd111_num_partitions	ARRAY_SIZE(wbd111_partitions)
-+#else
-+#define wbd111_partitions	NULL
-+#define wbd111_num_partitions	0
-+#endif /* CONFIG_MTD_PARTITIONS */
-+
- static void __init wbd111_init(void)
- {
- 	gemini_gpio_init();
- 	platform_register_uart();
- 	platform_register_watchdog();
--	platform_register_pflash(SZ_8M, NULL, 0);
-+	platform_register_pflash(SZ_8M, wbd111_partitions,
-+				 wbd111_num_partitions);
- 	platform_device_register(&wbd111_leds_device);
- 	platform_device_register(&wbd111_keys_device);
- 	platform_device_register(&wbd111_phy_device);
diff --git a/target/linux/gemini/patches/004-gemini-disable-watchdog-in-probe.patch b/target/linux/gemini/patches/004-gemini-disable-watchdog-in-probe.patch
deleted file mode 100644
index d1f5c340d..000000000
--- a/target/linux/gemini/patches/004-gemini-disable-watchdog-in-probe.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/drivers/watchdog/gemini_wdt.c
-+++ b/drivers/watchdog/gemini_wdt.c
-@@ -224,6 +224,7 @@ static int __init gemini_wdt_probe(struc
- 	struct resource *res;
- 	void __iomem *base;
- 	struct gemini_wdt_struct *gemini_wdt;
-+	unsigned int reg;
- 
- 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- 	if (!res) {
-@@ -267,6 +268,13 @@ static int __init gemini_wdt_probe(struc
- 
- 	gemini_wdt_miscdev.parent = &pdev->dev;
- 
-+	reg = __raw_readw(gemini_wdt->base + GEMINI_WDCR);
-+	if (reg & WDCR_ENABLE) {
-+		/* Watchdog was enabled by the bootloader, disable it. */
-+		reg &= ~(WDCR_ENABLE);
-+		__raw_writel(reg, gemini_wdt->base + GEMINI_WDCR);
-+	}
-+
- 	ret = misc_register(&gemini_wdt_miscdev);
- 	if (ret)
- 		goto fail2;
diff --git a/target/linux/gemini/patches/005-gemini-add-missing-skbuff-include.patch b/target/linux/gemini/patches/005-gemini-add-missing-skbuff-include.patch
deleted file mode 100644
index 6d0f4a246..000000000
--- a/target/linux/gemini/patches/005-gemini-add-missing-skbuff-include.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/arch/arm/mach-gemini/devices.c
-+++ b/arch/arm/mach-gemini/devices.c
-@@ -13,6 +13,7 @@
- #include <linux/platform_device.h>
- #include <linux/serial_8250.h>
- #include <linux/mtd/physmap.h>
-+#include <linux/skbuff.h>
- 
- #include <mach/irqs.h>
- #include <mach/hardware.h>
-@@ -147,7 +148,7 @@ int platform_register_ethernet(struct ge
- 	if (pdata->bus_id[1])
- 		reg |= GMAC_1_ENABLE;
- 	else if (pdata->interface[0] == PHY_INTERFACE_MODE_GMII)
--		reg |= GMAC_GMII;		
-+		reg |= GMAC_GMII;
- 
- 	__raw_writel(reg, IO_ADDRESS(GEMINI_GLOBAL_BASE) + GLOBAL_MISC_CTRL);
- 
---- a/drivers/net/phy/mdio-bitbang.c
-+++ b/drivers/net/phy/mdio-bitbang.c
-@@ -18,6 +18,7 @@
-  */
- 
- #include <linux/module.h>
-+#include <linux/skbuff.h>
- #include <linux/mdio-bitbang.h>
- #include <linux/slab.h>
- #include <linux/types.h>
---- a/drivers/net/phy/mdio-gpio.c
-+++ b/drivers/net/phy/mdio-gpio.c
-@@ -25,6 +25,7 @@
- #include <linux/init.h>
- #include <linux/interrupt.h>
- #include <linux/platform_device.h>
-+#include <linux/skbuff.h>
- #include <linux/gpio.h>
- #include <linux/mdio-gpio.h>
- 
diff --git a/target/linux/gemini/patches/100-mtd-physmap-try-static-partitions-first.patch b/target/linux/gemini/patches/100-mtd-physmap-try-static-partitions-first.patch
deleted file mode 100644
index 887dab0b7..000000000
--- a/target/linux/gemini/patches/100-mtd-physmap-try-static-partitions-first.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/drivers/mtd/maps/physmap.c
-+++ b/drivers/mtd/maps/physmap.c
-@@ -170,6 +170,13 @@ static int physmap_flash_probe(struct pl
- 		goto err_out;
- 
- #ifdef CONFIG_MTD_PARTITIONS
-+	if (physmap_data->nr_parts) {
-+		printk(KERN_NOTICE "Using physmap partition information\n");
-+		add_mtd_partitions(info->cmtd, physmap_data->parts,
-+				   physmap_data->nr_parts);
-+		return 0;
-+	}
-+
- 	err = parse_mtd_partitions(info->cmtd, part_probe_types,
- 				&info->parts, 0);
- 	if (err > 0) {
-@@ -177,13 +184,6 @@ static int physmap_flash_probe(struct pl
- 		info->nr_parts = err;
- 		return 0;
- 	}
--
--	if (physmap_data->nr_parts) {
--		printk(KERN_NOTICE "Using physmap partition information\n");
--		add_mtd_partitions(info->cmtd, physmap_data->parts,
--				   physmap_data->nr_parts);
--		return 0;
--	}
- #endif
- 
- 	add_mtd_device(info->cmtd);
diff --git a/target/linux/generic-2.6/config-2.6.25 b/target/linux/generic-2.6/config-2.6.25
deleted file mode 100644
index 23128911b..000000000
--- a/target/linux/generic-2.6/config-2.6.25
+++ /dev/null
@@ -1,2031 +0,0 @@
-# CONFIG_6PACK is not set
-# CONFIG_8139CP is not set
-# CONFIG_9P_FS is not set
-# CONFIG_ACENIC is not set
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_ADAPTEC_STARFIRE is not set
-# CONFIG_ADFS_FS is not set
-# CONFIG_ADM6996_PHY is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AFS_FS is not set
-# CONFIG_AIRO_CS is not set
-# CONFIG_AIRO is not set
-# CONFIG_AMD8111_ETH is not set
-# CONFIG_AMIGA_PARTITION is not set
-CONFIG_ANON_INODES=y
-# CONFIG_APPLICOM is not set
-# CONFIG_ARCH_AAEC2000 is not set
-# CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_CLPS7500 is not set
-# CONFIG_ARCH_CO285 is not set
-# CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_EP93XX is not set
-CONFIG_ARCH_FLATMEM_ENABLE=y
-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_GEMINI is not set
-# CONFIG_ARCH_H720X is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP13XX is not set
-# CONFIG_ARCH_IOP32X is not set
-# CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IXP2000 is not set
-# CONFIG_ARCH_IXP23XX is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_KIRKWOOD is not set
-# CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_L7200 is not set
-# CONFIG_ARCH_LH7A40X is not set
-# CONFIG_ARCH_LOKI is not set
-# CONFIG_ARCH_MMP is not set
-# CONFIG_ARCH_MSM7X00A is not set
-# CONFIG_ARCH_MV78XX0 is not set
-# CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_NS9XXX is not set
-# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_ORION is not set
-# CONFIG_ARCH_PNX4008 is not set
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_RPC is not set
-# CONFIG_ARCH_S3C2410 is not set
-# CONFIG_ARCH_S3C64XX is not set
-# CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCNET is not set
-CONFIG_ARPD=y
-CONFIG_ASK_IP_FIB_HASH=y
-# CONFIG_ATA_GENERIC is not set
-# CONFIG_ATA is not set
-# CONFIG_ATALK is not set
-# CONFIG_ATA_NONSTANDARD is not set
-# CONFIG_ATA_OVER_ETH is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_ATA_SFF=y
-# CONFIG_ATL1 is not set
-# CONFIG_ATM_AMBASSADOR is not set
-CONFIG_ATM_BR2684_IPFILTER=y
-# CONFIG_ATM_BR2684 is not set
-# CONFIG_ATM_CLIP is not set
-CONFIG_ATM_CLIP_NO_ICMP=y
-# CONFIG_ATM_DRIVERS is not set
-# CONFIG_ATM_DUMMY is not set
-# CONFIG_ATMEL is not set
-# CONFIG_ATM_ENI is not set
-# CONFIG_ATM_FIRESTREAM is not set
-# CONFIG_ATM_FORE200E_MAYBE is not set
-# CONFIG_ATM_HE is not set
-# CONFIG_ATM_HORIZON is not set
-# CONFIG_ATM_IA is not set
-# CONFIG_ATM_IDT77252 is not set
-# CONFIG_ATM is not set
-# CONFIG_ATM_LANAI is not set
-# CONFIG_ATM_LANE is not set
-# CONFIG_ATM_MPOA is not set
-# CONFIG_ATM_NICSTAR is not set
-# CONFIG_ATM_TCP is not set
-# CONFIG_ATM_ZATM is not set
-# CONFIG_AUDIT is not set
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AX25_DAMA_SLAVE is not set
-# CONFIG_AX25 is not set
-# CONFIG_AX88796 is not set
-# CONFIG_B44 is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-CONFIG_BASE_FULL=y
-CONFIG_BASE_SMALL=0
-# CONFIG_BASLER_EXCITE is not set
-# CONFIG_BAYCOM_EPP is not set
-# CONFIG_BAYCOM_PAR is not set
-# CONFIG_BAYCOM_SER_FDX is not set
-# CONFIG_BAYCOM_SER_HDX is not set
-CONFIG_BCM43XX_DEBUG=y
-CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
-# CONFIG_BCM43XX_DMA_MODE is not set
-CONFIG_BCM43XX_DMA=y
-# CONFIG_BCM43XX is not set
-# CONFIG_BCM43XX_PIO_MODE is not set
-CONFIG_BCM43XX_PIO=y
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-# CONFIG_BLINK is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
-# CONFIG_BLK_CPQ_DA is not set
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_BLK_DEV_AEC62XX is not set
-# CONFIG_BLK_DEV_ALI15X3 is not set
-# CONFIG_BLK_DEV_AMD74XX is not set
-# CONFIG_BLK_DEV_ATIIXP is not set
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_BLK_DEV_CMD640 is not set
-# CONFIG_BLK_DEV_CMD64X is not set
-# CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_CS5520 is not set
-# CONFIG_BLK_DEV_CS5530 is not set
-# CONFIG_BLK_DEV_CS5535 is not set
-# CONFIG_BLK_DEV_CY82C693 is not set
-# CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_DELKIN is not set
-# CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_DEV_GENERIC is not set
-# CONFIG_BLK_DEV_HD_IDE is not set
-# CONFIG_BLK_DEV_HD is not set
-# CONFIG_BLK_DEV_HPT34X is not set
-# CONFIG_BLK_DEV_HPT366 is not set
-# CONFIG_BLK_DEV_IDECD is not set
-# CONFIG_BLK_DEV_IDECS is not set
-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-# CONFIG_BLK_DEV_IDEFLOPPY is not set
-# CONFIG_BLK_DEV_IDEPCI is not set
-# CONFIG_BLK_DEV_IDEPNP is not set
-# CONFIG_BLK_DEV_IDE_SATA is not set
-# CONFIG_BLK_DEV_IDESCSI is not set
-# CONFIG_BLK_DEV_IDETAPE is not set
-CONFIG_BLK_DEV_INITRD=y
-# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_BLK_DEV_IT8213 is not set
-# CONFIG_BLK_DEV_IT821X is not set
-# CONFIG_BLK_DEV_JMICRON is not set
-# CONFIG_BLK_DEV_LOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_NS87415 is not set
-# CONFIG_BLK_DEV_OFFBOARD is not set
-# CONFIG_BLK_DEV_OPTI621 is not set
-# CONFIG_BLK_DEV_PDC202XX_NEW is not set
-# CONFIG_BLK_DEV_PDC202XX_OLD is not set
-# CONFIG_BLK_DEV_PIIX is not set
-# CONFIG_BLK_DEV_PLATFORM is not set
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_RZ1000 is not set
-# CONFIG_BLK_DEV_SC1200 is not set
-# CONFIG_BLK_DEV_SD is not set
-# CONFIG_BLK_DEV_SIIMAGE is not set
-# CONFIG_BLK_DEV_SIS5513 is not set
-# CONFIG_BLK_DEV_SL82C105 is not set
-# CONFIG_BLK_DEV_SLC90E66 is not set
-# CONFIG_BLK_DEV_SR is not set
-# CONFIG_BLK_DEV_SVWKS is not set
-# CONFIG_BLK_DEV_SX8 is not set
-# CONFIG_BLK_DEV_TC86C001 is not set
-# CONFIG_BLK_DEV_TRIFLEX is not set
-# CONFIG_BLK_DEV_TRM290 is not set
-# CONFIG_BLK_DEV_UB is not set
-# CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_VIA82CXXX is not set
-CONFIG_BLK_DEV=y
-CONFIG_BLOCK=y
-# CONFIG_BNX2 is not set
-# CONFIG_BONDING is not set
-# CONFIG_BPQETHER is not set
-# CONFIG_BRIDGE_EBT_802_3 is not set
-# CONFIG_BRIDGE_EBT_AMONG is not set
-# CONFIG_BRIDGE_EBT_ARP is not set
-# CONFIG_BRIDGE_EBT_ARPREPLY is not set
-# CONFIG_BRIDGE_EBT_BROUTE is not set
-# CONFIG_BRIDGE_EBT_DNAT is not set
-# CONFIG_BRIDGE_EBT_IP is not set
-# CONFIG_BRIDGE_EBT_LIMIT is not set
-# CONFIG_BRIDGE_EBT_LOG is not set
-# CONFIG_BRIDGE_EBT_MARK is not set
-# CONFIG_BRIDGE_EBT_MARK_T is not set
-# CONFIG_BRIDGE_EBT_NFLOG is not set
-# CONFIG_BRIDGE_EBT_PKTTYPE is not set
-# CONFIG_BRIDGE_EBT_REDIRECT is not set
-# CONFIG_BRIDGE_EBT_SNAT is not set
-# CONFIG_BRIDGE_EBT_STP is not set
-# CONFIG_BRIDGE_EBT_T_FILTER is not set
-# CONFIG_BRIDGE_EBT_T_NAT is not set
-# CONFIG_BRIDGE_EBT_ULOG is not set
-# CONFIG_BRIDGE_EBT_VLAN is not set
-# CONFIG_BRIDGE_NETFILTER is not set
-# CONFIG_BRIDGE_NF_EBTABLES is not set
-CONFIG_BRIDGE=y
-# CONFIG_BROADCOM_PHY is not set
-CONFIG_BROKEN_ON_SMP=y
-CONFIG_BSD_DISKLABEL=y
-# CONFIG_BSD_PROCESS_ACCT_V3 is not set
-CONFIG_BSD_PROCESS_ACCT=y
-# CONFIG_BT_BNEP is not set
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-# CONFIG_BT_CMTP is not set
-# CONFIG_BT_HCIBCM203X is not set
-# CONFIG_BT_HCIBFUSB is not set
-# CONFIG_BT_HCIBLUECARD is not set
-# CONFIG_BT_HCIBPA10X is not set
-# CONFIG_BT_HCIBT3C is not set
-# CONFIG_BT_HCIBTSDIO is not set
-# CONFIG_BT_HCIBTUART is not set
-# CONFIG_BT_HCIDTL1 is not set
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_H4=y
-# CONFIG_BT_HCIUART is not set
-# CONFIG_BT_HCIUART_LL is not set
-# CONFIG_BT_HCIUSB is not set
-CONFIG_BT_HCIUSB_SCO=y
-# CONFIG_BT_HCIVHCI is not set
-# CONFIG_BT_HIDP is not set
-# CONFIG_BT is not set
-# CONFIG_BT_L2CAP is not set
-# CONFIG_BT_RFCOMM is not set
-CONFIG_BT_RFCOMM_TTY=y
-# CONFIG_BT_SCO is not set
-CONFIG_BUG=y
-# CONFIG_CAN is not set
-# CONFIG_CAPI_AVM is not set
-# CONFIG_CAPI_EICON is not set
-# CONFIG_CAPI_TRACE is not set
-CONFIG_CARDBUS=y
-# CONFIG_CARDMAN_4000 is not set
-# CONFIG_CARDMAN_4040 is not set
-# CONFIG_CASSINI is not set
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_CFG80211 is not set
-# CONFIG_CGROUPS is not set
-# CONFIG_CHELSIO_T1 is not set
-# CONFIG_CHELSIO_T3 is not set
-# CONFIG_CHR_DEV_OSST is not set
-# CONFIG_CHR_DEV_SCH is not set
-# CONFIG_CHR_DEV_SG is not set
-# CONFIG_CHR_DEV_ST is not set
-# CONFIG_CICADA_PHY is not set
-# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
-# CONFIG_CIFS is not set
-CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_STATS2 is not set
-CONFIG_CIFS_STATS=y
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-# CONFIG_CIFS_XATTR is not set
-CONFIG_CLS_U32_MARK=y
-CONFIG_CLS_U32_PERF=y
-CONFIG_CMDLINE=""
-# CONFIG_CODA_FS is not set
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_CONFIGFS_FS is not set
-# CONFIG_CONNECTOR is not set
-# CONFIG_CPU_FREQ is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_CRC16 is not set
-CONFIG_CRC32=y
-# CONFIG_CRC7 is not set
-# CONFIG_CRC_CCITT is not set
-# CONFIG_CRC_ITU_T is not set
-CONFIG_CROSSCOMPILE=y
-# CONFIG_CRYPTO_AES is not set
-# CONFIG_CRYPTO_ALGAPI is not set
-# CONFIG_CRYPTO_ANUBIS is not set
-# CONFIG_CRYPTO_ARC4 is not set
-# CONFIG_CRYPTO_AUTHENC is not set
-# CONFIG_CRYPTO_BLKCIPHER is not set
-# CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_CAST5 is not set
-# CONFIG_CRYPTO_CAST6 is not set
-# CONFIG_CRYPTO_CBC is not set
-# CONFIG_CRYPTO_CCM is not set
-# CONFIG_CRYPTO_CRC32C is not set
-# CONFIG_CRYPTO_CRYPTD is not set
-# CONFIG_CRYPTO_CTR is not set
-# CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_DES is not set
-# CONFIG_CRYPTO_ECB is not set
-# CONFIG_CRYPTO_FCRYPT is not set
-# CONFIG_CRYPTO_GCM is not set
-# CONFIG_CRYPTO_GF128MUL is not set
-# CONFIG_CRYPTO_HASH is not set
-# CONFIG_CRYPTO_HMAC is not set
-# CONFIG_CRYPTO_HW is not set
-# CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_LZO is not set
-# CONFIG_CRYPTO_MANAGER is not set
-# CONFIG_CRYPTO_MD4 is not set
-# CONFIG_CRYPTO_MD5 is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_NULL is not set
-# CONFIG_CRYPTO_PCBC is not set
-# CONFIG_CRYPTO_SALSA20 is not set
-# CONFIG_CRYPTO_SEED is not set
-# CONFIG_CRYPTO_SEQIV is not set
-# CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_SHA1 is not set
-# CONFIG_CRYPTO_SHA256 is not set
-# CONFIG_CRYPTO_SHA512 is not set
-# CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_TEST is not set
-# CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_TWOFISH_COMMON is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-# CONFIG_CRYPTO_WP512 is not set
-# CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_XTS is not set
-CONFIG_CRYPTO=y
-# CONFIG_DAB is not set
-# CONFIG_DAVICOM_PHY is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_DEBUG_KERNEL is not set
-# CONFIG_DECNET is not set
-# CONFIG_DEFAULT_AS is not set
-# CONFIG_DEFAULT_BIC is not set
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_CUBIC is not set
-CONFIG_DEFAULT_DEADLINE=y
-# CONFIG_DEFAULT_HTCP is not set
-CONFIG_DEFAULT_IOSCHED="deadline"
-# CONFIG_DEFAULT_NOOP is not set
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="westwood"
-# CONFIG_DEFAULT_VEGAS is not set
-CONFIG_DEFAULT_WESTWOOD=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-# CONFIG_DEVFS_DEBUG is not set
-CONFIG_DEVFS_FS=y
-CONFIG_DEVFS_MOUNT=y
-# CONFIG_DGRS is not set
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_DISPLAY_SUPPORT is not set
-# CONFIG_DL2K is not set
-# CONFIG_DLM is not set
-# CONFIG_DMA_ENGINE is not set
-# CONFIG_DNOTIFY is not set
-# CONFIG_DRM is not set
-# CONFIG_DS1682 is not set
-# CONFIG_DTLK is not set
-# CONFIG_DUMMY is not set
-# CONFIG_DVB_CORE is not set
-# CONFIG_DVB is not set
-# CONFIG_E1000E is not set
-# CONFIG_E1000 is not set
-# CONFIG_E100 is not set
-# CONFIG_ECONET is not set
-# CONFIG_EEPRO100 is not set
-# CONFIG_EEPROM_93CX6 is not set
-# CONFIG_EFI_PARTITION is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_ELF_CORE is not set
-CONFIG_EMBEDDED=y
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_ENABLE_WARN_DEPRECATED=y
-# CONFIG_ENC28J60 is not set
-# CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_EPIC100 is not set
-CONFIG_EPOLL=y
-# CONFIG_EQUALIZER is not set
-CONFIG_EVENTFD=y
-CONFIG_EXPERIMENTAL=y
-# CONFIG_EXPORTFS is not set
-# CONFIG_EXT2_FS is not set
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_EXT3_FS_XATTR is not set
-# CONFIG_EXT4DEV_FS is not set
-# CONFIG_FAIR_GROUP_SCHED is not set
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-# CONFIG_FAT_FS is not set
-# CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_FB is not set
-# CONFIG_FB_PXA is not set
-# CONFIG_FDDI is not set
-# CONFIG_FEALNX is not set
-CONFIG_FIB_RULES=y
-# CONFIG_FIREWIRE is not set
-# CONFIG_FIXED_PHY is not set
-CONFIG_FLATMEM_MANUAL=y
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_FORCEDETH is not set
-# CONFIG_FS_POSIX_ACL is not set
-# CONFIG_FTL is not set
-# CONFIG_FUSE_FS is not set
-# CONFIG_FUSION_FC is not set
-# CONFIG_FUSION is not set
-# CONFIG_FUSION_SAS is not set
-# CONFIG_FUSION_SPI is not set
-CONFIG_FUTEX=y
-CONFIG_FW_LOADER=y
-CONFIG_GACT_PROB=y
-# CONFIG_GAMEPORT is not set
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_TIME=y
-# CONFIG_GFS2_FS is not set
-# CONFIG_GPIO_DEVICE is not set
-# CONFIG_GROUP_SCHED is not set
-# CONFIG_HAMACHI is not set
-CONFIG_HAMRADIO=y
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_HERMES is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_HID_DEBUG is not set
-# CONFIG_HID_FF is not set
-# CONFIG_HID is not set
-# CONFIG_HIDRAW is not set
-# CONFIG_HID_SUPPORT is not set
-CONFIG_HIGH_RES_TIMERS=y
-# CONFIG_HIPPI is not set
-# CONFIG_HOSTAP_CS is not set
-# CONFIG_HOSTAP is not set
-# CONFIG_HOSTAP_PCI is not set
-# CONFIG_HOSTAP_PLX is not set
-# CONFIG_HOTPLUG_CPU is not set
-# CONFIG_HOTPLUG_PCI is not set
-CONFIG_HOTPLUG=y
-# CONFIG_HP100 is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_HUGETLB_PAGE is not set
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
-CONFIG_HZ=100
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ_100=y
-# CONFIG_HZ_1024 is not set
-# CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_256 is not set
-# CONFIG_HZ_300 is not set
-# CONFIG_HZ_48 is not set
-# CONFIG_I2C_ALGOPCA is not set
-# CONFIG_I2C_ALGOPCF is not set
-# CONFIG_I2C_ALI1535 is not set
-# CONFIG_I2C_ALI1563 is not set
-# CONFIG_I2C_ALI15X3 is not set
-# CONFIG_I2C_AMD756 is not set
-# CONFIG_I2C_AMD8111 is not set
-# CONFIG_I2C_CHARDEV is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_ELEKTOR is not set
-# CONFIG_I2C_GPIO is not set
-# CONFIG_I2C_I801 is not set
-# CONFIG_I2C_I810 is not set
-# CONFIG_I2C_IBM_IIC is not set
-# CONFIG_I2C is not set
-# CONFIG_I2C_MPC is not set
-# CONFIG_I2C_NFORCE2 is not set
-# CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_PCA_ISA is not set
-# CONFIG_I2C_PCA is not set
-# CONFIG_I2C_PIIX4 is not set
-# CONFIG_I2C_PROSAVAGE is not set
-# CONFIG_I2C_SAVAGE4 is not set
-# CONFIG_I2C_SIMTEC is not set
-# CONFIG_I2C_SIS5595 is not set
-# CONFIG_I2C_SIS630 is not set
-# CONFIG_I2C_SIS96X is not set
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_TAOS_EVM is not set
-# CONFIG_I2C_TINY_USB is not set
-# CONFIG_I2C_VIA is not set
-# CONFIG_I2C_VIAPRO is not set
-# CONFIG_I2C_VOODOO3 is not set
-# CONFIG_I2O is not set
-# CONFIG_I82092 is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_ICPLUS_PHY is not set
-# CONFIG_IDEDISK_MULTI_MODE is not set
-# CONFIG_IDEDMA_IVB is not set
-# CONFIG_IDEDMA_ONLYDISK is not set
-CONFIG_IDE_MAX_HWIFS=4
-# CONFIG_IDEPCI_SHARE_IRQ is not set
-CONFIG_IDE_PROC_FS=y
-# CONFIG_IDE_TASK_IOCTL is not set
-# CONFIG_IEEE1394_DV1394 is not set
-# CONFIG_IEEE1394_ETH1394 is not set
-# CONFIG_IEEE1394 is not set
-# CONFIG_IEEE1394_OHCI1394 is not set
-# CONFIG_IEEE1394_PCILYNX is not set
-# CONFIG_IEEE1394_RAWIO is not set
-# CONFIG_IEEE1394_VERBOSEDEBUG is not set
-# CONFIG_IEEE1394_VIDEO1394 is not set
-# CONFIG_IEEE80211_CRYPT_CCMP is not set
-# CONFIG_IEEE80211_CRYPT_TKIP is not set
-# CONFIG_IEEE80211_CRYPT_WEP is not set
-# CONFIG_IEEE80211_DEBUG is not set
-# CONFIG_IEEE80211 is not set
-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
-# CONFIG_IEEE80211_SOFTMAC is not set
-# CONFIG_IFB is not set
-# CONFIG_IGB is not set
-# CONFIG_IKCONFIG is not set
-# CONFIG_IKCONFIG_PROC is not set
-# CONFIG_IMQ_BEHAVIOR_AA is not set
-# CONFIG_IMQ_BEHAVIOR_AB is not set
-CONFIG_IMQ_BEHAVIOR_BA=y
-# CONFIG_IMQ_BEHAVIOR_BB is not set
-# CONFIG_IMQ is not set
-CONFIG_IMQ_NUM_DEVS=2
-# CONFIG_INET6_AH is not set
-# CONFIG_INET6_ESP is not set
-# CONFIG_INET6_IPCOMP is not set
-# CONFIG_INET6_TUNNEL is not set
-# CONFIG_INET6_XFRM_MODE_BEET is not set
-# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_TCP_DIAG is not set
-# CONFIG_INET_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_TUNNEL is not set
-CONFIG_INET=y
-# CONFIG_INFINIBAND is not set
-# CONFIG_INFTL is not set
-CONFIG_INIT_ENV_ARG_LIMIT=32
-# CONFIG_INOTIFY is not set
-# CONFIG_INOTIFY_USER is not set
-# CONFIG_INPUT_ATI_REMOTE2 is not set
-# CONFIG_INPUT_ATI_REMOTE is not set
-# CONFIG_INPUT_EVBUG is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT is not set
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_KEYSPAN_REMOTE is not set
-CONFIG_INPUT_MISC=y
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_PCSPKR is not set
-# CONFIG_INPUT_POLLDEV is not set
-# CONFIG_INPUT_POWERMATE is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_TSDEV is not set
-# CONFIG_INPUT_UINPUT is not set
-# CONFIG_INPUT_WISTRON_BTNS is not set
-# CONFIG_INSTRUMENTATION is not set
-# CONFIG_IOSCHED_AS is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_NOOP=y
-# CONFIG_IP1000 is not set
-# CONFIG_IP6_NF_FILTER is not set
-# CONFIG_IP6_NF_IPTABLES is not set
-# CONFIG_IP6_NF_MANGLE is not set
-# CONFIG_IP6_NF_MATCH_AH is not set
-# CONFIG_IP6_NF_MATCH_EUI64 is not set
-# CONFIG_IP6_NF_MATCH_FRAG is not set
-# CONFIG_IP6_NF_MATCH_HL is not set
-# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
-# CONFIG_IP6_NF_MATCH_LIMIT is not set
-# CONFIG_IP6_NF_MATCH_MH is not set
-# CONFIG_IP6_NF_MATCH_OPTS is not set
-# CONFIG_IP6_NF_MATCH_OWNER is not set
-# CONFIG_IP6_NF_MATCH_RT is not set
-# CONFIG_IP6_NF_QUEUE is not set
-# CONFIG_IP6_NF_RAW is not set
-# CONFIG_IP6_NF_TARGET_HL is not set
-# CONFIG_IP6_NF_TARGET_IMQ is not set
-# CONFIG_IP6_NF_TARGET_LOG is not set
-# CONFIG_IP6_NF_TARGET_REJECT is not set
-# CONFIG_IP6_NF_TARGET_ROUTE is not set
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IPC_NS is not set
-# CONFIG_IP_DCCP is not set
-CONFIG_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
-# CONFIG_IPMI_HANDLER is not set
-CONFIG_IP_MROUTE=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_MULTIPLE_TABLES=y
-# CONFIG_IP_NF_AMANDA is not set
-# CONFIG_IP_NF_ARPFILTER is not set
-# CONFIG_IP_NF_ARP_MANGLE is not set
-# CONFIG_IP_NF_ARPTABLES is not set
-# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
-CONFIG_IP_NF_CONNTRACK_MARK=y
-CONFIG_IP_NF_CONNTRACK=y
-CONFIG_IP_NF_CT_ACCT=y
-# CONFIG_IP_NF_CT_PROTO_SCTP is not set
-# CONFIG_IP_NF_FILTER is not set
-# CONFIG_IP_NF_FTP is not set
-# CONFIG_IP_NF_H323 is not set
-# CONFIG_IP_NF_IPTABLES is not set
-# CONFIG_IP_NF_IRC is not set
-# CONFIG_IP_NF_MANGLE is not set
-# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
-# CONFIG_IP_NF_MATCH_AH is not set
-# CONFIG_IP_NF_MATCH_ECN is not set
-# CONFIG_IP_NF_MATCH_HASHLIMIT is not set
-# CONFIG_IP_NF_MATCH_IPP2P is not set
-# CONFIG_IP_NF_MATCH_OWNER is not set
-# CONFIG_IP_NF_MATCH_RECENT is not set
-# CONFIG_IP_NF_MATCH_SET is not set
-# CONFIG_IP_NF_MATCH_TIME is not set
-# CONFIG_IP_NF_MATCH_TOS is not set
-# CONFIG_IP_NF_MATCH_TTL is not set
-# CONFIG_IP_NF_NAT_AMANDA is not set
-# CONFIG_IP_NF_NAT_FTP is not set
-# CONFIG_IP_NF_NAT_H323 is not set
-# CONFIG_IP_NF_NAT_IRC is not set
-CONFIG_IP_NF_NAT_NEEDED=y
-# CONFIG_IP_NF_NAT_PPTP is not set
-# CONFIG_IP_NF_NAT_SIP is not set
-# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
-# CONFIG_IP_NF_NAT_TFTP is not set
-CONFIG_IP_NF_NAT=y
-# CONFIG_IP_NF_NETBIOS_NS is not set
-# CONFIG_IP_NF_PPTP is not set
-# CONFIG_IP_NF_QUEUE is not set
-# CONFIG_IP_NF_RAW is not set
-CONFIG_IP_NF_SET_HASHSIZE=1024
-# CONFIG_IP_NF_SET_IPHASH is not set
-# CONFIG_IP_NF_SET_IPMAP is not set
-# CONFIG_IP_NF_SET_IPPORTHASH is not set
-# CONFIG_IP_NF_SET_IPTREE is not set
-# CONFIG_IP_NF_SET_IPTREEMAP is not set
-# CONFIG_IP_NF_SET is not set
-# CONFIG_IP_NF_SET_MACIPMAP is not set
-CONFIG_IP_NF_SET_MAX=256
-# CONFIG_IP_NF_SET_NETHASH is not set
-# CONFIG_IP_NF_SET_PORTMAP is not set
-# CONFIG_IP_NF_SIP is not set
-# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
-# CONFIG_IP_NF_TARGET_ECN is not set
-# CONFIG_IP_NF_TARGET_IMQ is not set
-# CONFIG_IP_NF_TARGET_LOG is not set
-# CONFIG_IP_NF_TARGET_MASQUERADE is not set
-# CONFIG_IP_NF_TARGET_NETMAP is not set
-# CONFIG_IP_NF_TARGET_REDIRECT is not set
-# CONFIG_IP_NF_TARGET_REJECT is not set
-# CONFIG_IP_NF_TARGET_ROUTE is not set
-# CONFIG_IP_NF_TARGET_SAME is not set
-# CONFIG_IP_NF_TARGET_SET is not set
-# CONFIG_IP_NF_TARGET_TOS is not set
-# CONFIG_IP_NF_TARGET_TTL is not set
-# CONFIG_IP_NF_TARGET_ULOG is not set
-# CONFIG_IP_NF_TFTP is not set
-# CONFIG_IP_PIMSM_V1 is not set
-# CONFIG_IP_PIMSM_V2 is not set
-# CONFIG_IP_PNP is not set
-CONFIG_IP_ROUTE_FWMARK=y
-CONFIG_IP_ROUTE_MULTIPATH_CACHED=y
-# CONFIG_IP_ROUTE_MULTIPATH_DRR is not set
-# CONFIG_IP_ROUTE_MULTIPATH_RANDOM is not set
-# CONFIG_IP_ROUTE_MULTIPATH_RR is not set
-# CONFIG_IP_ROUTE_MULTIPATH_WRANDOM is not set
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-# CONFIG_IP_SCTP is not set
-CONFIG_IPSEC_NAT_TRAVERSAL=y
-# CONFIG_IPV6 is not set
-# CONFIG_IPV6_MIP6 is not set
-# CONFIG_IPV6_MROUTE is not set
-# CONFIG_IPV6_MULTIPLE_TABLES is not set
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-# CONFIG_IPV6_PRIVACY is not set
-# CONFIG_IPV6_ROUTE_INFO is not set
-CONFIG_IPV6_ROUTER_PREF=y
-# CONFIG_IPV6_SIT is not set
-# CONFIG_IPV6_TUNNEL is not set
-# CONFIG_IP_VS is not set
-# CONFIG_IPW2100_DEBUG is not set
-# CONFIG_IPW2100 is not set
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2200_DEBUG is not set
-# CONFIG_IPW2200 is not set
-CONFIG_IPW2200_MONITOR=y
-# CONFIG_IPW2200_PROMISCUOUS is not set
-# CONFIG_IPW2200_QOS is not set
-# CONFIG_IPW2200_RADIOTAP is not set
-# CONFIG_IPX is not set
-# CONFIG_IRDA is not set
-# CONFIG_ISCSI_TCP is not set
-# CONFIG_ISDN is not set
-# CONFIG_ISO9660_FS is not set
-# CONFIG_IXGB is not set
-# CONFIG_JBD_DEBUG is not set
-# CONFIG_JBD is not set
-# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
-# CONFIG_JFFS2_CMODE_NONE is not set
-CONFIG_JFFS2_CMODE_PRIORITY=y
-# CONFIG_JFFS2_CMODE_SIZE is not set
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_FS_DEBUG=0
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_XATTR is not set
-CONFIG_JFFS2_FS=y
-# CONFIG_JFFS2_LZO is not set
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
-CONFIG_JFFS2_SUMMARY=y
-CONFIG_JFFS2_ZLIB=y
-# CONFIG_JFFS_FS is not set
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_JFS_POSIX_ACL is not set
-# CONFIG_JFS_SECURITY is not set
-# CONFIG_JFS_STATISTICS is not set
-CONFIG_JOLIET=y
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-# CONFIG_KALLSYMS is not set
-# CONFIG_KARMA_PARTITION is not set
-# CONFIG_KEXEC is not set
-# CONFIG_KEYS is not set
-CONFIG_KMOD=y
-# CONFIG_LAPB is not set
-# CONFIG_LASAT is not set
-CONFIG_LBD=y
-# CONFIG_LDM_PARTITION is not set
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-# CONFIG_LEDS_TRIGGER_IDE_DISK is not set
-# CONFIG_LEDS_TRIGGER_MORSE is not set
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_LIBCRC32C is not set
-# CONFIG_LIBERTAS is not set
-# CONFIG_LIBERTAS_USB is not set
-# CONFIG_LLC2 is not set
-CONFIG_LLC=y
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_LOCKDEP_SUPPORT=y
-# CONFIG_LOCKD is not set
-CONFIG_LOCKD_V4=y
-CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_LSF is not set
-# CONFIG_LXT_PHY is not set
-# CONFIG_MAC80211_DEBUG is not set
-# CONFIG_MAC80211 is not set
-# CONFIG_MAC80211_LEDS is not set
-# CONFIG_MAC_EMUMOUSEBTN is not set
-# CONFIG_MAC_PARTITION is not set
-# CONFIG_MACVLAN is not set
-# CONFIG_MAGIC_SYSRQ is not set
-# CONFIG_MARKEINS is not set
-# CONFIG_MARKERS is not set
-# CONFIG_MARVELL_PHY is not set
-# CONFIG_MDIO_BITBANG is not set
-# CONFIG_MD is not set
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_SAS is not set
-# CONFIG_MFD_ASIC3 is not set
-# CONFIG_MFD_SM501 is not set
-CONFIG_MII=y
-CONFIG_MINI_FO=y
-# CONFIG_MINIX_FS is not set
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_MIPS_FPU_EMU is not set
-CONFIG_MISC_DEVICES=y
-# CONFIG_MKISS is not set
-# CONFIG_MMC_ARMMMCI is not set
-# CONFIG_MMC_AT91 is not set
-CONFIG_MMC_BLOCK_BOUNCE=y
-# CONFIG_MMC_BLOCK is not set
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-CONFIG_MMU=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MOUSE_APPLETOUCH is not set
-# CONFIG_MOUSE_INPORT is not set
-# CONFIG_MOUSE_LOGIBM is not set
-# CONFIG_MOUSE_PC110PAD is not set
-# CONFIG_MSDOS_FS is not set
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_AFS_PARTS is not set
-# CONFIG_MTD_ARM_INTEGRATOR is not set
-CONFIG_MTD_BLKDEVS=y
-# CONFIG_MTD_BLOCK2MTD is not set
-CONFIG_MTD_BLOCK=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_CFI_AMDSTD=y
-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CFI_INTELEXT=y
-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_NOSWAP=y
-# CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI_UTIL=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CHAR=y
-# CONFIG_MTD_CMDLINE_PARTS is not set
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-# CONFIG_MTD_CONCAT is not set
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_INTEL_VR_NOR is not set
-# CONFIG_MTD_JEDECPROBE is not set
-# CONFIG_MTD_LPDDR is not set
-# CONFIG_MTD_M25P80 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_NAND_CAFE is not set
-# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_ECC_SMC is not set
-CONFIG_MTD_NAND_IDS=y
-# CONFIG_MTD_NAND is not set
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
-# CONFIG_MTD_NAND_PLATFORM is not set
-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
-# CONFIG_MTD_ONENAND is not set
-# CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_OTP is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_PCI is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_RAM is not set
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
-# CONFIG_MTD_REDBOOT_PARTS is not set
-CONFIG_MTD_REDBOOT_PARTS_READONLY=y
-# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
-# CONFIG_MTD_ROM is not set
-CONFIG_MTD_ROOTFS_ROOT_DEV=y
-CONFIG_MTD_ROOTFS_SPLIT=y
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_UBI is not set
-CONFIG_MTD=y
-# CONFIG_MVSWITCH_PHY is not set
-# CONFIG_MWAVE is not set
-# CONFIG_MYRI10GE is not set
-# CONFIG_NAMESPACES is not set
-# CONFIG_NATSEMI is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_NET_9P is not set
-# CONFIG_NET_ACT_GACT is not set
-# CONFIG_NET_ACT_IPT is not set
-# CONFIG_NET_ACT_MIRRED is not set
-# CONFIG_NET_ACT_NAT is not set
-# CONFIG_NET_ACT_PEDIT is not set
-CONFIG_NET_ACT_POLICE=y
-# CONFIG_NET_ACT_SIMP is not set
-CONFIG_NET_CLS_ACT=y
-# CONFIG_NET_CLS_BASIC is not set
-# CONFIG_NET_CLS_FLOW is not set
-# CONFIG_NET_CLS_FW is not set
-CONFIG_NET_CLS_IND=y
-CONFIG_NET_CLS_POLICE=y
-# CONFIG_NET_CLS_ROUTE4 is not set
-CONFIG_NET_CLS_ROUTE=y
-# CONFIG_NET_CLS_RSVP6 is not set
-# CONFIG_NET_CLS_RSVP is not set
-# CONFIG_NET_CLS_TCINDEX is not set
-# CONFIG_NET_CLS_U32 is not set
-CONFIG_NET_CLS=y
-# CONFIG_NETCONSOLE is not set
-# CONFIG_NETDEBUG is not set
-# CONFIG_NETDEV_10000 is not set
-CONFIG_NETDEV_1000=y
-# CONFIG_NETDEVICES_MULTIQUEUE is not set
-CONFIG_NETDEVICES=y
-# CONFIG_NET_EMATCH_CMP is not set
-# CONFIG_NET_EMATCH_META is not set
-# CONFIG_NET_EMATCH_NBYTE is not set
-CONFIG_NET_EMATCH_STACK=32
-# CONFIG_NET_EMATCH_TEXT is not set
-# CONFIG_NET_EMATCH_U32 is not set
-CONFIG_NET_EMATCH=y
-CONFIG_NET_ESTIMATOR=y
-CONFIG_NET_ETHERNET=y
-# CONFIG_NET_FC is not set
-CONFIG_NETFILTER_ADVANCED=y
-# CONFIG_NETFILTER_DEBUG is not set
-# CONFIG_NETFILTER_NETLINK is not set
-# CONFIG_NETFILTER_NETLINK_LOG is not set
-# CONFIG_NETFILTER_NETLINK_QUEUE is not set
-# CONFIG_NETFILTER_XTABLES is not set
-# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
-# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
-# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
-# CONFIG_NETFILTER_XT_MATCH_ESP is not set
-# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
-# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
-# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set
-# CONFIG_NETFILTER_XT_MATCH_LAYER7 is not set
-# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
-# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_MAC is not set
-# CONFIG_NETFILTER_XT_MATCH_MARK is not set
-# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
-# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
-# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
-# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
-# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
-# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
-# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
-# CONFIG_NETFILTER_XT_MATCH_REALM is not set
-# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
-# CONFIG_NETFILTER_XT_MATCH_STATE is not set
-# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
-# CONFIG_NETFILTER_XT_MATCH_STRING is not set
-# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
-# CONFIG_NETFILTER_XT_MATCH_TIME is not set
-# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
-# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
-# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
-# CONFIG_NETFILTER_XT_TARGET_MARK is not set
-# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
-# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
-# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
-# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
-# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
-CONFIG_NETFILTER=y
-CONFIG_NET_IPGRE_BROADCAST=y
-# CONFIG_NET_IPGRE is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_ISA is not set
-# CONFIG_NET_KEY is not set
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_NET_PCI=y
-# CONFIG_NET_PCMCIA is not set
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_NETPOLL is not set
-CONFIG_NET_RADIO=y
-# CONFIG_NETROM is not set
-# CONFIG_NET_SB1000 is not set
-# CONFIG_NET_SCH_ATM is not set
-# CONFIG_NET_SCH_CBQ is not set
-# CONFIG_NET_SCH_CLK_CPU is not set
-# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
-CONFIG_NET_SCH_CLK_JIFFIES=y
-# CONFIG_NET_SCH_DSMARK is not set
-CONFIG_NET_SCHED=y
-# CONFIG_NET_SCH_ESFQ is not set
-CONFIG_NET_SCH_ESFQ_NFCT=y
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_NET_SCH_GRED is not set
-# CONFIG_NET_SCH_HFSC is not set
-# CONFIG_NET_SCH_HTB is not set
-# CONFIG_NET_SCH_INGRESS is not set
-# CONFIG_NET_SCH_NETEM is not set
-# CONFIG_NET_SCH_PRIO is not set
-# CONFIG_NET_SCH_RED is not set
-# CONFIG_NET_SCH_RR is not set
-# CONFIG_NET_SCH_SFQ is not set
-# CONFIG_NET_SCH_TBF is not set
-# CONFIG_NET_SCH_TEQL is not set
-# CONFIG_NET_TULIP is not set
-CONFIG_NET_WIRELESS_RTNETLINK=y
-CONFIG_NET_WIRELESS=y
-CONFIG_NETWORK_FILESYSTEMS=y
-# CONFIG_NETWORK_SECMARK is not set
-# CONFIG_NETXEN_NIC is not set
-CONFIG_NET=y
-# CONFIG_NEW_GPIO is not set
-CONFIG_NEW_LEDS=y
-# CONFIG_NF_CONNTRACK_AMANDA is not set
-CONFIG_NF_CONNTRACK_ENABLED=y
-# CONFIG_NF_CONNTRACK_EVENTS is not set
-# CONFIG_NF_CONNTRACK_FTP is not set
-# CONFIG_NF_CONNTRACK_H323 is not set
-# CONFIG_NF_CONNTRACK_IPV4 is not set
-# CONFIG_NF_CONNTRACK_IPV6 is not set
-# CONFIG_NF_CONNTRACK_IRC is not set
-# CONFIG_NF_CONNTRACK is not set
-CONFIG_NF_CONNTRACK_MARK=y
-# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
-# CONFIG_NF_CONNTRACK_PPTP is not set
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-# CONFIG_NF_CONNTRACK_RTSP is not set
-# CONFIG_NF_CONNTRACK_SANE is not set
-# CONFIG_NF_CONNTRACK_SIP is not set
-CONFIG_NF_CONNTRACK_SUPPORT=y
-# CONFIG_NF_CONNTRACK_TFTP is not set
-CONFIG_NF_CT_ACCT=y
-# CONFIG_NF_CT_NETLINK is not set
-# CONFIG_NF_CT_PROTO_GRE is not set
-# CONFIG_NF_CT_PROTO_SCTP is not set
-# CONFIG_NF_CT_PROTO_UDPLITE is not set
-# CONFIG_NF_NAT_AMANDA is not set
-# CONFIG_NF_NAT_FTP is not set
-# CONFIG_NF_NAT_H323 is not set
-# CONFIG_NF_NAT_IRC is not set
-# CONFIG_NF_NAT is not set
-CONFIG_NF_NAT_NEEDED=y
-# CONFIG_NF_NAT_PPTP is not set
-# CONFIG_NF_NAT_PROTO_GRE is not set
-# CONFIG_NF_NAT_RTSP is not set
-# CONFIG_NF_NAT_SIP is not set
-# CONFIG_NF_NAT_SNMP_BASIC is not set
-# CONFIG_NF_NAT_TFTP is not set
-# CONFIG_NFS_ACL_SUPPORT is not set
-CONFIG_NFS_COMMON=y
-# CONFIG_NFS_DIRECTIO is not set
-# CONFIG_NFSD is not set
-CONFIG_NFSD_TCP=y
-# CONFIG_NFSD_V2_ACL is not set
-# CONFIG_NFSD_V3_ACL is not set
-CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V4 is not set
-# CONFIG_NFS_FS is not set
-# CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V3=y
-# CONFIG_NFS_V4 is not set
-# CONFIG_NFTL is not set
-# CONFIG_NLS_ASCII is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_CODEPAGE_437 is not set
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-# CONFIG_NLS_CODEPAGE_850 is not set
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-CONFIG_NLS_DEFAULT="iso8859-1"
-# CONFIG_NLS is not set
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-# CONFIG_NLS_ISO8859_15 is not set
-# CONFIG_NLS_ISO8859_1 is not set
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_UTF8 is not set
-# CONFIG_NO_HZ is not set
-# CONFIG_NORTEL_HERMES is not set
-# CONFIG_NOZOMI is not set
-# CONFIG_NS83820 is not set
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
-# CONFIG_NVRAM is not set
-# CONFIG_OCF_BENCH is not set
-# CONFIG_OCF_EP80579 is not set
-# CONFIG_OCF_HIFNHIPP is not set
-# CONFIG_OCF_HIFN is not set
-# CONFIG_OCF_IXP4XX is not set
-# CONFIG_OCF_OCF is not set
-# CONFIG_OCF_OCFNULL is not set
-# CONFIG_OCFS2_FS is not set
-# CONFIG_OCF_SAFE is not set
-# CONFIG_OCF_TALITOS is not set
-# CONFIG_OSF_PARTITION is not set
-CONFIG_PACKET_MMAP=y
-CONFIG_PACKET=y
-# CONFIG_PAGE_SIZE_16KB is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_64KB is not set
-# CONFIG_PAGE_SIZE_8KB is not set
-# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_PC is not set
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_PATA_ALI is not set
-# CONFIG_PATA_AMD is not set
-# CONFIG_PATA_ARTOP is not set
-# CONFIG_PATA_ATIIXP is not set
-# CONFIG_PATA_CMD640_PCI is not set
-# CONFIG_PATA_CMD64X is not set
-# CONFIG_PATA_CS5520 is not set
-# CONFIG_PATA_CS5530 is not set
-# CONFIG_PATA_CS5535 is not set
-# CONFIG_PATA_CYPRESS is not set
-# CONFIG_PATA_EFAR is not set
-# CONFIG_PATA_HPT366 is not set
-# CONFIG_PATA_HPT37X is not set
-# CONFIG_PATA_HPT3X2N is not set
-# CONFIG_PATA_HPT3X3 is not set
-# CONFIG_PATA_ISAPNP is not set
-# CONFIG_PATA_IT8213 is not set
-# CONFIG_PATA_IT821X is not set
-# CONFIG_PATA_JMICRON is not set
-# CONFIG_PATA_LEGACY is not set
-# CONFIG_PATA_MARVELL is not set
-# CONFIG_PATA_MPIIX is not set
-# CONFIG_PATA_NETCELL is not set
-# CONFIG_PATA_NINJA32 is not set
-# CONFIG_PATA_NS87410 is not set
-# CONFIG_PATA_NS87415 is not set
-# CONFIG_PATA_OLDPIIX is not set
-# CONFIG_PATA_OPTIDMA is not set
-# CONFIG_PATA_OPTI is not set
-# CONFIG_PATA_PCMCIA is not set
-# CONFIG_PATA_PDC2027X is not set
-# CONFIG_PATA_PDC_OLD is not set
-# CONFIG_PATA_PLATFORM is not set
-# CONFIG_PATA_QDI is not set
-# CONFIG_PATA_RADISYS is not set
-# CONFIG_PATA_RZ1000 is not set
-# CONFIG_PATA_SC1200 is not set
-# CONFIG_PATA_SERVERWORKS is not set
-# CONFIG_PATA_SIL680 is not set
-# CONFIG_PATA_SIS is not set
-# CONFIG_PATA_TRIFLEX is not set
-# CONFIG_PATA_VIA is not set
-# CONFIG_PATA_WINBOND is not set
-# CONFIG_PATA_WINBOND_VLB is not set
-# CONFIG_PC300TOO is not set
-# CONFIG_PCCARD is not set
-# CONFIG_PCF8575 is not set
-# CONFIG_PCI is not set
-# CONFIG_PCI_ATMEL is not set
-# CONFIG_PCI_HERMES is not set
-# CONFIG_PCI_LEGACY is not set
-# CONFIG_PCI_MSI is not set
-CONFIG_PCI_SYSCALL=y
-# CONFIG_PCMCIA_AHA152X is not set
-# CONFIG_PCMCIA_ATMEL is not set
-# CONFIG_PCMCIA_DEBUG is not set
-# CONFIG_PCMCIA_FDOMAIN is not set
-# CONFIG_PCMCIA_HERMES is not set
-# CONFIG_PCMCIA_IOCTL is not set
-# CONFIG_PCMCIA is not set
-# CONFIG_PCMCIA_LOAD_CIS is not set
-# CONFIG_PCMCIA_NETWAVE is not set
-# CONFIG_PCMCIA_NINJA_SCSI is not set
-# CONFIG_PCMCIA_QLOGIC is not set
-# CONFIG_PCMCIA_RAYCS is not set
-# CONFIG_PCMCIA_SPECTRUM is not set
-# CONFIG_PCMCIA_SYM53C500 is not set
-# CONFIG_PCMCIA_WAVELAN is not set
-# CONFIG_PCMCIA_WL3501 is not set
-# CONFIG_PCNET32 is not set
-# CONFIG_PCSPKR_PLATFORM is not set
-# CONFIG_PD6729 is not set
-# CONFIG_PDC_ADMA is not set
-# CONFIG_PHANTOM is not set
-# CONFIG_PHONE is not set
-# CONFIG_PHYLIB is not set
-# CONFIG_PID_NS is not set
-CONFIG_PLIST=y
-# CONFIG_PLX_HERMES is not set
-# CONFIG_PM is not set
-# CONFIG_POSIX_MQUEUE is not set
-# CONFIG_POWER_SUPPLY is not set
-# CONFIG_PPP_ASYNC is not set
-# CONFIG_PPP_BSDCOMP is not set
-# CONFIG_PPP_DEFLATE is not set
-CONFIG_PPP_FILTER=y
-# CONFIG_PPP is not set
-# CONFIG_PPP_MPPE is not set
-CONFIG_PPP_MULTILINK=y
-# CONFIG_PPPOATM is not set
-# CONFIG_PPPOE is not set
-# CONFIG_PPPOL2TP is not set
-# CONFIG_PPP_SYNC_TTY is not set
-# CONFIG_PREEMPT is not set
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_PRINTK_TIME is not set
-CONFIG_PRINTK=y
-# CONFIG_PRISM54 is not set
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-# CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_PROC_SYSCTL=y
-# CONFIG_PROFILING is not set
-# CONFIG_QEMU is not set
-# CONFIG_QLA3XXX is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QSEMI_PHY is not set
-# CONFIG_QUOTA is not set
-# CONFIG_R3964 is not set
-# CONFIG_R8169 is not set
-# CONFIG_RADIO_ADAPTERS is not set
-# CONFIG_RADIO_AZTECH is not set
-# CONFIG_RADIO_CADET is not set
-# CONFIG_RADIO_GEMTEK is not set
-# CONFIG_RADIO_GEMTEK_PCI is not set
-# CONFIG_RADIO_MAESTRO is not set
-# CONFIG_RADIO_MAXIRADIO is not set
-# CONFIG_RADIO_RTRACK2 is not set
-# CONFIG_RADIO_RTRACK is not set
-# CONFIG_RADIO_SF16FMI is not set
-# CONFIG_RADIO_SF16FMR2 is not set
-# CONFIG_RADIO_TERRATEC is not set
-# CONFIG_RADIO_TRUST is not set
-# CONFIG_RADIO_TYPHOON is not set
-# CONFIG_RADIO_ZOLTRIX is not set
-# CONFIG_RAID_ATTRS is not set
-CONFIG_RAMFS=y
-# CONFIG_RAW_DRIVER is not set
-# CONFIG_REALTEK_PHY is not set
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_REISERFS_FS_XATTR is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-# CONFIG_RELAY is not set
-# CONFIG_RESOURCES_64BIT is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_RFKILL is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_ROSE is not set
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
-# CONFIG_RTC_CLASS is not set
-# CONFIG_RTC_DEBUG is not set
-CONFIG_RTC_DRV_CMOS=y
-# CONFIG_RTC_DRV_DS1307 is not set
-# CONFIG_RTC_DRV_DS1374 is not set
-# CONFIG_RTC_DRV_DS1511 is not set
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_DS1742 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
-# CONFIG_RTC_DRV_M41T80 is not set
-# CONFIG_RTC_DRV_M48T59 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_MAX6900 is not set
-# CONFIG_RTC_DRV_MAX6902 is not set
-# CONFIG_RTC_DRV_PCF50606 is not set
-# CONFIG_RTC_DRV_PCF8563 is not set
-# CONFIG_RTC_DRV_PCF8583 is not set
-# CONFIG_RTC_DRV_R9701 is not set
-# CONFIG_RTC_DRV_RS5C348 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set
-# CONFIG_RTC_DRV_S35390A is not set
-# CONFIG_RTC_DRV_STK17TA8 is not set
-# CONFIG_RTC_DRV_TEST is not set
-# CONFIG_RTC_DRV_V3020 is not set
-# CONFIG_RTC_DRV_X1205 is not set
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_HCTOSYS=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_LIB=y
-# CONFIG_RTL8187 is not set
-CONFIG_RT_MUTEXES=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_S2IO is not set
-# CONFIG_SAMPLES is not set
-# CONFIG_SATA_AHCI is not set
-# CONFIG_SATA_INIC162X is not set
-# CONFIG_SATA_MV is not set
-# CONFIG_SATA_NV is not set
-# CONFIG_SATA_PROMISE is not set
-# CONFIG_SATA_QSTOR is not set
-# CONFIG_SATA_SIL24 is not set
-# CONFIG_SATA_SIL is not set
-# CONFIG_SATA_SIS is not set
-# CONFIG_SATA_SVW is not set
-# CONFIG_SATA_SX4 is not set
-# CONFIG_SATA_ULI is not set
-# CONFIG_SATA_VIA is not set
-# CONFIG_SATA_VITESSE is not set
-# CONFIG_SC92031 is not set
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_7000FASST is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_AHA152X is not set
-# CONFIG_SCSI_AHA1542 is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-# CONFIG_SCSI_AIC94XX is not set
-# CONFIG_SCSI_ARCMSR is not set
-# CONFIG_SCSI_BUSLOGIC is not set
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_DC390T is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_DEBUG is not set
-CONFIG_SCSI_DMA=y
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_DPT_I2O is not set
-# CONFIG_SCSI_DTC3280 is not set
-# CONFIG_SCSI_EATA is not set
-# CONFIG_SCSI_ESP_CORE is not set
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
-# CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_IN2000 is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_IPR is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI is not set
-# CONFIG_SCSI_LOGGING is not set
-CONFIG_SCSI_LOWLEVEL=y
-# CONFIG_SCSI_LPFC is not set
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_MVSAS is not set
-# CONFIG_SCSI_NCR53C406A is not set
-# CONFIG_SCSI_NETLINK is not set
-# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_PAS16 is not set
-CONFIG_SCSI_PROC_FS=y
-# CONFIG_SCSI_PSI240I is not set
-# CONFIG_SCSI_QLA_FC is not set
-# CONFIG_SCSI_QLA_ISCSI is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLOGIC_FAS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
-# CONFIG_SCSI_SAS_LIBSAS is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-# CONFIG_SCSI_SEAGATE is not set
-# CONFIG_SCSI_SPI_ATTRS is not set
-# CONFIG_SCSI_SRP_ATTRS is not set
-# CONFIG_SCSI_SRP is not set
-# CONFIG_SCSI_STEX is not set
-# CONFIG_SCSI_SYM53C416 is not set
-# CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_T128 is not set
-# CONFIG_SCSI_TGT is not set
-# CONFIG_SCSI_U14_34F is not set
-# CONFIG_SCSI_ULTRASTOR is not set
-CONFIG_SCSI_WAIT_SCAN=m
-# CONFIG_SECCOMP is not set
-# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-# CONFIG_SECURITY is not set
-CONFIG_SELECT_MEMORY_MODEL=y
-# CONFIG_SENSORS_ABITUGURU3 is not set
-# CONFIG_SENSORS_ABITUGURU is not set
-# CONFIG_SENSORS_AD7418 is not set
-# CONFIG_SENSORS_ADM1021 is not set
-# CONFIG_SENSORS_ADM1025 is not set
-# CONFIG_SENSORS_ADM1026 is not set
-# CONFIG_SENSORS_ADM1029 is not set
-# CONFIG_SENSORS_ADM1031 is not set
-# CONFIG_SENSORS_ADM9240 is not set
-# CONFIG_SENSORS_ADS7828 is not set
-# CONFIG_SENSORS_ADT7470 is not set
-# CONFIG_SENSORS_ADT7473 is not set
-# CONFIG_SENSORS_APPLESMC is not set
-# CONFIG_SENSORS_ASB100 is not set
-# CONFIG_SENSORS_ATXP1 is not set
-# CONFIG_SENSORS_CORETEMP is not set
-# CONFIG_SENSORS_DME1737 is not set
-# CONFIG_SENSORS_DS1337 is not set
-# CONFIG_SENSORS_DS1374 is not set
-# CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_EEPROM is not set
-# CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_F71882FG is not set
-# CONFIG_SENSORS_F75375S is not set
-# CONFIG_SENSORS_FSCHER is not set
-# CONFIG_SENSORS_FSCHMD is not set
-# CONFIG_SENSORS_FSCPOS is not set
-# CONFIG_SENSORS_GL518SM is not set
-# CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_HDAPS is not set
-# CONFIG_SENSORS_I5K_AMB is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_K8TEMP is not set
-# CONFIG_SENSORS_LM63 is not set
-# CONFIG_SENSORS_LM70 is not set
-# CONFIG_SENSORS_LM75 is not set
-# CONFIG_SENSORS_LM77 is not set
-# CONFIG_SENSORS_LM78 is not set
-# CONFIG_SENSORS_LM80 is not set
-# CONFIG_SENSORS_LM83 is not set
-# CONFIG_SENSORS_LM85 is not set
-# 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_M41T00 is not set
-# CONFIG_SENSORS_MAX1619 is not set
-# CONFIG_SENSORS_MAX6650 is not set
-# CONFIG_SENSORS_MAX6875 is not set
-# CONFIG_SENSORS_PC87427 is not set
-# CONFIG_SENSORS_PCA9539 is not set
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_SENSORS_SIS5595 is not set
-# CONFIG_SENSORS_SMSC47B397 is not set
-# CONFIG_SENSORS_SMSC47M192 is not set
-# CONFIG_SENSORS_SMSC47M1 is not set
-# CONFIG_SENSORS_THMC50 is not set
-# CONFIG_SENSORS_TSL2550 is not set
-# CONFIG_SENSORS_VIA686A is not set
-# CONFIG_SENSORS_VT1211 is not set
-# CONFIG_SENSORS_VT8231 is not set
-# CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83781D is not set
-# CONFIG_SENSORS_W83791D is not set
-# CONFIG_SENSORS_W83792D is not set
-# CONFIG_SENSORS_W83793 is not set
-# CONFIG_SENSORS_W83L785TS is not set
-# CONFIG_SENSORS_W83L786NG is not set
-CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_SERIAL_8250_CS is not set
-CONFIG_SERIAL_8250_NR_UARTS=2
-# CONFIG_SERIAL_8250_PCI is not set
-CONFIG_SERIAL_8250_RUNTIME_UARTS=2
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_CORE=y
-# CONFIG_SERIAL_JSM is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-# CONFIG_SERIAL_UARTLITE is not set
-# CONFIG_SERIO is not set
-# CONFIG_SGI_IOC4 is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_SHAPER is not set
-CONFIG_SHMEM=y
-CONFIG_SIGNALFD=y
-# CONFIG_SIS190 is not set
-# CONFIG_SIS900 is not set
-# CONFIG_SK98LIN is not set
-# CONFIG_SKGE is not set
-# CONFIG_SKY2 is not set
-CONFIG_SLAB=y
-# CONFIG_SLHC is not set
-# CONFIG_SLIP is not set
-# CONFIG_SLOB is not set
-# CONFIG_SLUB is not set
-# CONFIG_SMB_FS is not set
-# CONFIG_SMB_NLS_DEFAULT is not set
-# CONFIG_SMP is not set
-# CONFIG_SMSC_PHY is not set
-# CONFIG_SND_AC97_POWER_SAVE is not set
-# CONFIG_SND_AD1816A is not set
-# CONFIG_SND_AD1848 is not set
-# CONFIG_SND_AD1889 is not set
-# CONFIG_SND_ADLIB is not set
-# CONFIG_SND_ALI5451 is not set
-# CONFIG_SND_ALS100 is not set
-# CONFIG_SND_ALS300 is not set
-# CONFIG_SND_ALS4000 is not set
-# CONFIG_SND_ATIIXP is not set
-# CONFIG_SND_ATIIXP_MODEM is not set
-# CONFIG_SND_AU8810 is not set
-# CONFIG_SND_AU8820 is not set
-# CONFIG_SND_AU8830 is not set
-# CONFIG_SND_AZT2320 is not set
-# CONFIG_SND_AZT3328 is not set
-# CONFIG_SND_BT87X is not set
-# CONFIG_SND_CA0106 is not set
-# CONFIG_SND_CMI8330 is not set
-# CONFIG_SND_CMIPCI is not set
-# CONFIG_SND_CS4231 is not set
-# CONFIG_SND_CS4232 is not set
-# CONFIG_SND_CS4236 is not set
-# CONFIG_SND_CS4281 is not set
-# CONFIG_SND_CS46XX is not set
-# CONFIG_SND_CS5530 is not set
-# CONFIG_SND_CS5535AUDIO is not set
-# CONFIG_SND_DARLA20 is not set
-# CONFIG_SND_DARLA24 is not set
-# CONFIG_SND_DEBUG is not set
-# CONFIG_SND_DT019X is not set
-# CONFIG_SND_DUMMY is not set
-# CONFIG_SND_DYNAMIC_MINORS is not set
-# CONFIG_SND_ECHO3G is not set
-# CONFIG_SND_EMU10K1 is not set
-# CONFIG_SND_EMU10K1X is not set
-# CONFIG_SND_ENS1370 is not set
-# CONFIG_SND_ENS1371 is not set
-# CONFIG_SND_ES1688 is not set
-# CONFIG_SND_ES18XX is not set
-# CONFIG_SND_ES1938 is not set
-# CONFIG_SND_ES1968 is not set
-# CONFIG_SND_ES968 is not set
-# CONFIG_SND_FM801 is not set
-# CONFIG_SND_GINA20 is not set
-# CONFIG_SND_GINA24 is not set
-# CONFIG_SND_GUSCLASSIC is not set
-# CONFIG_SND_GUSEXTREME is not set
-# CONFIG_SND_GUSMAX is not set
-# CONFIG_SND_HDA_INTEL is not set
-# CONFIG_SND_HDSP is not set
-# CONFIG_SND_HDSPM is not set
-# CONFIG_SND_HIFIER is not set
-# CONFIG_SND_HWDEP is not set
-# CONFIG_SND_ICE1712 is not set
-# CONFIG_SND_ICE1724 is not set
-# CONFIG_SND_INDIGODJ is not set
-# CONFIG_SND_INDIGOIO is not set
-# CONFIG_SND_INDIGO is not set
-# CONFIG_SND_INTEL8X0 is not set
-# CONFIG_SND_INTEL8X0M is not set
-# CONFIG_SND_INTERWAVE is not set
-# CONFIG_SND_INTERWAVE_STB is not set
-# CONFIG_SND is not set
-# CONFIG_SND_KORG1212 is not set
-# CONFIG_SND_LAYLA20 is not set
-# CONFIG_SND_LAYLA24 is not set
-# CONFIG_SND_MAESTRO3 is not set
-# CONFIG_SND_MIA is not set
-# CONFIG_SND_MIRO is not set
-# CONFIG_SND_MIXART is not set
-# CONFIG_SND_MIXER_OSS is not set
-# CONFIG_SND_MONA is not set
-# CONFIG_SND_MPU401 is not set
-# CONFIG_SND_MTPAV is not set
-# CONFIG_SND_NM256 is not set
-# CONFIG_SND_OPL3SA2 is not set
-# CONFIG_SND_OPTI92X_AD1848 is not set
-# CONFIG_SND_OPTI92X_CS4231 is not set
-# CONFIG_SND_OPTI93X is not set
-CONFIG_SND_OSSEMUL=y
-# CONFIG_SND_OXYGEN is not set
-# CONFIG_SND_PCM is not set
-# CONFIG_SND_PCM_OSS is not set
-CONFIG_SND_PCM_OSS_PLUGINS=y
-# CONFIG_SND_PCXHR is not set
-# CONFIG_SND_PDAUDIOCF is not set
-# CONFIG_SND_RAWMIDI is not set
-# CONFIG_SND_RIPTIDE is not set
-# CONFIG_SND_RME32 is not set
-# CONFIG_SND_RME9652 is not set
-# CONFIG_SND_RME96 is not set
-# CONFIG_SND_RTCTIMER is not set
-# CONFIG_SND_SB16 is not set
-# CONFIG_SND_SB8 is not set
-# CONFIG_SND_SBAWE is not set
-# CONFIG_SND_SEQUENCER is not set
-# CONFIG_SND_SERIAL_U16550 is not set
-# CONFIG_SND_SGALAXY is not set
-# CONFIG_SND_SOC is not set
-# CONFIG_SND_SONICVIBES is not set
-# CONFIG_SND_SSCAPE is not set
-# CONFIG_SND_SUPPORT_OLD_API is not set
-# CONFIG_SND_TIMER is not set
-# CONFIG_SND_TRIDENT is not set
-# CONFIG_SND_USB_AUDIO is not set
-# CONFIG_SND_USB_CAIAQ is not set
-# CONFIG_SND_USB_USX2Y is not set
-# CONFIG_SND_VERBOSE_PRINTK is not set
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VIA82XX is not set
-# CONFIG_SND_VIA82XX_MODEM is not set
-# CONFIG_SND_VIRTUOSO is not set
-# CONFIG_SND_VX222 is not set
-# CONFIG_SND_VXPOCKET is not set
-# CONFIG_SND_WAVEFRONT is not set
-# CONFIG_SND_YMFPCI is not set
-# CONFIG_SNI_RM is not set
-# CONFIG_SOFT_WATCHDOG is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_SOUND is not set
-# CONFIG_SOUND_PRIME is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-# CONFIG_SPI_AT25 is not set
-# CONFIG_SPI_DEBUG is not set
-# CONFIG_SPI is not set
-# CONFIG_SPI_MASTER is not set
-# CONFIG_SPI_TLE62X0 is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_SQUASHFS_VMALLOC is not set
-CONFIG_SQUASHFS=y
-# CONFIG_SSB_DEBUG is not set
-# CONFIG_SSB_DRIVER_MIPS is not set
-# CONFIG_SSB is not set
-# CONFIG_SSB_PCMCIAHOST is not set
-CONFIG_SSB_POSSIBLE=y
-# CONFIG_SSB_SILENT is not set
-# CONFIG_SSFDC is not set
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_STANDALONE=y
-# CONFIG_STRIP is not set
-# CONFIG_SUNDANCE is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_SUNRPC_BIND34 is not set
-# CONFIG_SUNRPC_GSS is not set
-# CONFIG_SUNRPC is not set
-CONFIG_SUSPEND_UP_POSSIBLE=y
-CONFIG_SWAP=y
-# CONFIG_SYNCLINK_CS is not set
-CONFIG_SYN_COOKIES=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_SYSCTL=y
-# CONFIG_SYSFS_DEPRECATED is not set
-# CONFIG_SYSFS_DEPRECATED_V2 is not set
-CONFIG_SYSFS=y
-# CONFIG_SYS_HYPERVISOR is not set
-# CONFIG_SYSV68_PARTITION is not set
-# CONFIG_SYSV_FS is not set
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_SYSVIPC=y
-# CONFIG_TASKSTATS is not set
-# CONFIG_TCG_TPM is not set
-CONFIG_TCP_CONG_ADVANCED=y
-# CONFIG_TCP_CONG_BIC is not set
-# CONFIG_TCP_CONG_CUBIC is not set
-# CONFIG_TCP_CONG_HSTCP is not set
-# CONFIG_TCP_CONG_HTCP is not set
-# CONFIG_TCP_CONG_HYBLA is not set
-# CONFIG_TCP_CONG_ILLINOIS is not set
-# CONFIG_TCP_CONG_LP is not set
-# CONFIG_TCP_CONG_SCALABLE is not set
-# CONFIG_TCP_CONG_VEGAS is not set
-# CONFIG_TCP_CONG_VENO is not set
-CONFIG_TCP_CONG_WESTWOOD=y
-# CONFIG_TCP_CONG_YEAH is not set
-# CONFIG_TCP_MD5SIG is not set
-# CONFIG_TEXTSEARCH_BM is not set
-# CONFIG_TEXTSEARCH_FSM is not set
-# CONFIG_TEXTSEARCH_KMP is not set
-CONFIG_TEXTSEARCH=y
-# CONFIG_THERMAL is not set
-CONFIG_TICK_ONESHOT=y
-# CONFIG_TIFM_CORE is not set
-# CONFIG_TIGON3 is not set
-CONFIG_TIMERFD=y
-# CONFIG_TINY_SHMEM is not set
-# CONFIG_TIPC is not set
-# CONFIG_TLAN is not set
-# CONFIG_TMD_HERMES is not set
-# CONFIG_TMPFS_POSIX_ACL is not set
-CONFIG_TMPFS=y
-# CONFIG_TPS65010 is not set
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_TR is not set
-# CONFIG_TUNER_3036 is not set
-# CONFIG_TUNER_TEA5761 is not set
-# CONFIG_TUN is not set
-# CONFIG_UDF_FS is not set
-CONFIG_UDF_NLS=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_UFS_FS is not set
-# CONFIG_UIO is not set
-# CONFIG_ULTRIX_PARTITION is not set
-CONFIG_UNIX98_PTYS=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_UNIX=y
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_USB_ACECAD is not set
-# CONFIG_USB_ACM is not set
-# CONFIG_USB_ADUTUX is not set
-# CONFIG_USB_AIPTEK is not set
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-# CONFIG_USB_APPLEDISPLAY is not set
-# CONFIG_USB_APPLETOUCH is not set
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARMLINUX=y
-# CONFIG_USB_ATI_REMOTE2 is not set
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_ATM is not set
-# CONFIG_USB_AUERSWALD is not set
-# CONFIG_USB_BANDWIDTH is not set
-CONFIG_USB_BELKIN=y
-# CONFIG_USB_BERRY_CHARGE is not set
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_CXACRU is not set
-# CONFIG_USB_CYPRESS_CY7C63 is not set
-# CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_DABUSB is not set
-# CONFIG_USB_DEBUG is not set
-# CONFIG_USB_DEVICE_CLASS is not set
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DSBR is not set
-# CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
-# CONFIG_USB_EHCI_SPLIT_ISO is not set
-# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-# CONFIG_USB_EMI26 is not set
-# CONFIG_USB_EMI62 is not set
-# CONFIG_USB_EPSON2888 is not set
-# CONFIG_USB_ET61X251 is not set
-CONFIG_USB_EZUSB=y
-# CONFIG_USB_FTDI_ELAN is not set
-# CONFIG_USB_GADGET is not set
-# CONFIG_USB_HIDDEV is not set
-# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-CONFIG_USB_HIDINPUT=y
-# CONFIG_USB_HID is not set
-# CONFIG_USB_IBMCAM is not set
-# CONFIG_USB_IDMOUSE is not set
-# CONFIG_USB_IOWARRIOR is not set
-# CONFIG_USB is not set
-# CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_KC2190 is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-# CONFIG_USB_KONICAWC is not set
-# CONFIG_USB_LCD is not set
-# CONFIG_USB_LD is not set
-# CONFIG_USB_LED is not set
-# CONFIG_USB_LEGOTOWER is not set
-# CONFIG_USB_LIBUSUAL is not set
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_MICROTEK is not set
-# CONFIG_USB_MON is not set
-# CONFIG_USB_MOUSE is not set
-# CONFIG_USB_NET_AX8817X is not set
-# CONFIG_USB_NET_CDCETHER is not set
-# CONFIG_USB_NET_CDC_SUBSET is not set
-# CONFIG_USB_NET_DM9601 is not set
-# CONFIG_USB_NET_GL620A is not set
-# CONFIG_USB_NET_MCS7830 is not set
-# CONFIG_USB_NET_NET1080 is not set
-# CONFIG_USB_NET_PLUSB is not set
-# CONFIG_USB_NET_RNDIS_HOST is not set
-# CONFIG_USB_NET_RNDIS_WLAN is not set
-# CONFIG_USB_NET_ZAURUS is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN is not set
-# CONFIG_USB_OHCI_HCD is not set
-# CONFIG_USB_OHCI_HCD_SSB is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-# CONFIG_USB_OTG is not set
-# CONFIG_USB_OV511 is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_PHIDGET is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_QUICKCAM_MESSENGER is not set
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_RIO500 is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_SE401 is not set
-# CONFIG_USB_SERIAL_AIRCABLE is not set
-# CONFIG_USB_SERIAL_AIRPRIME is not set
-# CONFIG_USB_SERIAL_ARK3116 is not set
-# CONFIG_USB_SERIAL_BELKIN is not set
-# CONFIG_USB_SERIAL_CH341 is not set
-# CONFIG_USB_SERIAL_CP2101 is not set
-# CONFIG_USB_SERIAL_CYBERJACK is not set
-# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
-# CONFIG_USB_SERIAL_DEBUG is not set
-# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
-# CONFIG_USB_SERIAL_EDGEPORT is not set
-# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
-# CONFIG_USB_SERIAL_EMPEG is not set
-# CONFIG_USB_SERIAL_FTDI_SIO is not set
-# CONFIG_USB_SERIAL_FUNSOFT is not set
-# CONFIG_USB_SERIAL_GARMIN is not set
-CONFIG_USB_SERIAL_GENERIC=y
-# CONFIG_USB_SERIAL_HP4X is not set
-# CONFIG_USB_SERIAL_IPAQ is not set
-# CONFIG_USB_SERIAL_IPW is not set
-# CONFIG_USB_SERIAL_IR is not set
-# CONFIG_USB_SERIAL is not set
-# CONFIG_USB_SERIAL_IUU is not set
-# CONFIG_USB_SERIAL_KEYSPAN is not set
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-# CONFIG_USB_SERIAL_KLSI is not set
-# CONFIG_USB_SERIAL_KOBIL_SCT is not set
-# CONFIG_USB_SERIAL_MCT_U232 is not set
-# CONFIG_USB_SERIAL_MOS7720 is not set
-# CONFIG_USB_SERIAL_MOS7840 is not set
-# CONFIG_USB_SERIAL_NAVMAN is not set
-# CONFIG_USB_SERIAL_OMNINET is not set
-# CONFIG_USB_SERIAL_OPTION is not set
-# CONFIG_USB_SERIAL_OTI6858 is not set
-# CONFIG_USB_SERIAL_PL2303 is not set
-# CONFIG_USB_SERIAL_SAFE is not set
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
-# CONFIG_USB_SERIAL_TI is not set
-# CONFIG_USB_SERIAL_VISOR is not set
-# CONFIG_USB_SERIAL_WHITEHEAT is not set
-# CONFIG_USB_SERIAL_XIRCOM is not set
-# CONFIG_USB_SISUSBVGA is not set
-# CONFIG_USB_SL811_HCD is not set
-# CONFIG_USB_SN9C102 is not set
-# CONFIG_USB_SPEEDTOUCH is not set
-# CONFIG_USB_STKWEBCAM is not set
-CONFIG_USB_STORAGE_ALAUDA=y
-CONFIG_USB_STORAGE_DATAFAB=y
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_DPCM=y
-CONFIG_USB_STORAGE_FREECOM=y
-# CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE is not set
-CONFIG_USB_STORAGE_JUMPSHOT=y
-CONFIG_USB_STORAGE_KARMA=y
-# CONFIG_USB_STORAGE_ONETOUCH is not set
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_USBAT=y
-# CONFIG_USB_STV680 is not set
-# CONFIG_USB_SUPPORT is not set
-# CONFIG_USB_SUSPEND is not set
-# CONFIG_USB_TEST is not set
-# CONFIG_USB_TOUCHSCREEN is not set
-# CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_UEAGLEATM is not set
-# CONFIG_USB_USBNET is not set
-# CONFIG_USB_USBNET_MII is not set
-# CONFIG_USB_VICAM is not set
-# CONFIG_USB_W9968CF is not set
-# CONFIG_USB_WACOM is not set
-# CONFIG_USB_XPAD is not set
-# CONFIG_USB_XUSBATM is not set
-# CONFIG_USB_YEALINK is not set
-# CONFIG_USB_ZC0301 is not set
-# CONFIG_USB_ZD1201 is not set
-# CONFIG_USB_ZR364XX is not set
-# CONFIG_UTS_NS is not set
-# CONFIG_VETH is not set
-# CONFIG_VFAT_FS is not set
-# CONFIG_VIA_VELOCITY is not set
-# CONFIG_VIDEO_ADV7170 is not set
-# CONFIG_VIDEO_ADV7175 is not set
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_BT819 is not set
-# CONFIG_VIDEO_BT848 is not set
-# CONFIG_VIDEO_BT856 is not set
-# CONFIG_VIDEO_BT866 is not set
-# CONFIG_VIDEO_CAFE_CCIC is not set
-# CONFIG_VIDEO_CAPTURE_DRIVERS is not set
-# CONFIG_VIDEO_CPIA is not set
-# CONFIG_VIDEO_CS5345 is not set
-# CONFIG_VIDEO_CS53L32A is not set
-# CONFIG_VIDEO_CX2341X is not set
-# CONFIG_VIDEO_CX25840 is not set
-# CONFIG_VIDEO_CX88 is not set
-# CONFIG_VIDEO_DEV is not set
-# CONFIG_VIDEO_DPC is not set
-# CONFIG_VIDEO_EM28XX is not set
-# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-# CONFIG_VIDEO_HEXIUM_GEMINI is not set
-# CONFIG_VIDEO_HEXIUM_ORION is not set
-# CONFIG_VIDEO_IVTV is not set
-# CONFIG_VIDEO_KS0127 is not set
-# CONFIG_VIDEO_M52790 is not set
-# CONFIG_VIDEO_MSP3400 is not set
-# CONFIG_VIDEO_MXB is not set
-# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-# CONFIG_VIDEO_OV7670 is not set
-# CONFIG_VIDEO_OVCAMCHIP is not set
-# CONFIG_VIDEO_PMS is not set
-# CONFIG_VIDEO_PVRUSB2 is not set
-# CONFIG_VIDEO_SAA5246A is not set
-# CONFIG_VIDEO_SAA5249 is not set
-# CONFIG_VIDEO_SAA7110 is not set
-# CONFIG_VIDEO_SAA7111 is not set
-# CONFIG_VIDEO_SAA7114 is not set
-# CONFIG_VIDEO_SAA711X is not set
-# CONFIG_VIDEO_SAA7127 is not set
-# CONFIG_VIDEO_SAA7134 is not set
-# CONFIG_VIDEO_SAA7185 is not set
-# CONFIG_VIDEO_SAA7191 is not set
-# CONFIG_VIDEO_STRADIS is not set
-# CONFIG_VIDEO_TCM825X is not set
-# CONFIG_VIDEO_TDA7432 is not set
-# CONFIG_VIDEO_TDA9840 is not set
-# CONFIG_VIDEO_TDA9875 is not set
-# CONFIG_VIDEO_TEA6415C is not set
-# CONFIG_VIDEO_TEA6420 is not set
-# CONFIG_VIDEO_TLV320AIC23B is not set
-# CONFIG_VIDEO_TVAUDIO is not set
-# CONFIG_VIDEO_TVP5150 is not set
-# CONFIG_VIDEO_UPD64031A is not set
-# CONFIG_VIDEO_UPD64083 is not set
-# CONFIG_VIDEO_USBVISION is not set
-CONFIG_VIDEO_V4L1_COMPAT=y
-# CONFIG_VIDEO_V4L1 is not set
-CONFIG_VIDEO_V4L2=y
-# CONFIG_VIDEO_VIVI is not set
-# CONFIG_VIDEO_VP27SMPX is not set
-# CONFIG_VIDEO_VPX3220 is not set
-# CONFIG_VIDEO_WM8739 is not set
-# CONFIG_VIDEO_WM8775 is not set
-# CONFIG_VIDEO_ZORAN is not set
-CONFIG_VIRT_TO_BUS=y
-# CONFIG_VITESSE_PHY is not set
-CONFIG_VLAN_8021Q=y
-# CONFIG_VM_EVENT_COUNTERS is not set
-# CONFIG_VT is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_W1 is not set
-# CONFIG_W1_MASTER_DS1WM is not set
-# CONFIG_W1_MASTER_DS2482 is not set
-# CONFIG_W1_MASTER_DS2490 is not set
-# CONFIG_W1_MASTER_GPIO is not set
-# CONFIG_W1_MASTER_MATROX is not set
-# CONFIG_W1_SLAVE_DS2433 is not set
-# CONFIG_W1_SLAVE_DS2760 is not set
-# CONFIG_W1_SLAVE_SMEM is not set
-# CONFIG_W1_SLAVE_THERM is not set
-# CONFIG_W83627HF_WDT is not set
-# CONFIG_W83697HF_WDT is not set
-# CONFIG_W83877F_WDT is not set
-# CONFIG_W83977F_WDT is not set
-# CONFIG_WAN is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-CONFIG_WATCHDOG=y
-# CONFIG_WDTPCI is not set
-CONFIG_WIRELESS_EXT=y
-CONFIG_WLAN_80211=y
-# CONFIG_WLAN_PRE80211 is not set
-# CONFIG_WR_PPMC is not set
-# CONFIG_X25 is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_USER is not set
-CONFIG_XFRM=y
-# CONFIG_XFS_FS is not set
-# CONFIG_XFS_POSIX_ACL is not set
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_SECURITY is not set
-# CONFIG_YAFFS_FS is not set
-# CONFIG_YAM is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_YENTA is not set
-# CONFIG_YENTA_O2 is not set
-# CONFIG_YENTA_RICOH is not set
-# CONFIG_YENTA_TI is not set
-# CONFIG_YENTA_TOSHIBA is not set
-# CONFIG_ZD1211RW_DEBUG is not set
-# CONFIG_ZD1211RW is not set
-# CONFIG_ZISOFS_FS is not set
-CONFIG_ZISOFS=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZONE_DMA_FLAG=1
-CONFIG_ZONE_DMA=y
diff --git a/target/linux/generic-2.6/config-2.6.31 b/target/linux/generic-2.6/config-2.6.31
deleted file mode 100644
index 585f2a506..000000000
--- a/target/linux/generic-2.6/config-2.6.31
+++ /dev/null
@@ -1,2711 +0,0 @@
-# CONFIG_6PACK is not set
-# CONFIG_8139CP is not set
-# CONFIG_8139TOO is not set
-# CONFIG_9P_FS is not set
-# CONFIG_AB3100_CORE is not set
-# CONFIG_ACCESSIBILITY is not set
-# CONFIG_ACENIC is not set
-# CONFIG_ACER_WMI is not set
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_ADAPTEC_STARFIRE is not set
-# CONFIG_ADFS_FS is not set
-# CONFIG_ADM6996_PHY is not set
-# CONFIG_ADM8211 is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AFS_FS is not set
-# CONFIG_AGP is not set
-CONFIG_AIO=y
-# CONFIG_AIRO_CS is not set
-# CONFIG_AIRO is not set
-# CONFIG_ALIM7101_WDT is not set
-# CONFIG_ALTERA_PCIE_CHDMA is not set
-# CONFIG_AMD8111_ETH is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ANDROID is not set
-CONFIG_ANON_INODES=y
-# CONFIG_APPLICOM is not set
-# CONFIG_AR8216_PHY is not set
-# CONFIG_AR9170_USB is not set
-# CONFIG_ARCH_AAEC2000 is not set
-# CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_EP93XX is not set
-CONFIG_ARCH_FLATMEM_ENABLE=y
-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_GEMINI is not set
-# CONFIG_ARCH_H720X is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP13XX is not set
-# CONFIG_ARCH_IOP32X is not set
-# CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IXP2000 is not set
-# CONFIG_ARCH_IXP23XX is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_KIRKWOOD is not set
-# CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_L7200 is not set
-# CONFIG_ARCH_LH7A40X is not set
-# CONFIG_ARCH_LOKI is not set
-# CONFIG_ARCH_MMP is not set
-# CONFIG_ARCH_MSM is not set
-# CONFIG_ARCH_MV78XX0 is not set
-# CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_NS9XXX is not set
-# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_ORION5X is not set
-# CONFIG_ARCH_PNX4008 is not set
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_RPC is not set
-# CONFIG_ARCH_S3C2410 is not set
-# CONFIG_ARCH_S3C64XX is not set
-# CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_STMP3XXX is not set
-# CONFIG_ARCH_U300 is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_W90X900 is not set
-# CONFIG_ARCNET is not set
-# CONFIG_ARM_UNWIND is not set
-CONFIG_ARPD=y
-# CONFIG_ARTHUR is not set
-CONFIG_ASK_IP_FIB_HASH=y
-# CONFIG_ASUS_OLED is not set
-# CONFIG_ASYNC_TX_DMA is not set
-# CONFIG_AT24 is not set
-# CONFIG_AT76C50X_USB is not set
-# CONFIG_ATA_ACPI is not set
-# CONFIG_ATA_GENERIC is not set
-# CONFIG_ATA is not set
-# CONFIG_ATALK is not set
-# CONFIG_ATA_NONSTANDARD is not set
-# CONFIG_ATA_OVER_ETH is not set
-# CONFIG_ATA_PIIX is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_ATA_SFF=y
-# CONFIG_ATH5K is not set
-# CONFIG_ATH9K is not set
-# CONFIG_ATL1C is not set
-# CONFIG_ATL1E is not set
-# CONFIG_ATL1 is not set
-# CONFIG_ATL2 is not set
-# CONFIG_ATM_AMBASSADOR is not set
-CONFIG_ATM_BR2684_IPFILTER=y
-# CONFIG_ATM_BR2684 is not set
-# CONFIG_ATM_CLIP is not set
-CONFIG_ATM_CLIP_NO_ICMP=y
-# CONFIG_ATM_DRIVERS is not set
-# CONFIG_ATM_DUMMY is not set
-# CONFIG_ATMEL is not set
-# CONFIG_ATM_ENI is not set
-# CONFIG_ATM_FIRESTREAM is not set
-# CONFIG_ATM_FORE200E is not set
-# CONFIG_ATM_FORE200E_MAYBE is not set
-# CONFIG_ATM_HE is not set
-# CONFIG_ATM_HORIZON is not set
-# CONFIG_ATM_IA is not set
-# CONFIG_ATM_IDT77252 is not set
-# CONFIG_ATM is not set
-# CONFIG_ATM_LANAI is not set
-# CONFIG_ATM_LANE is not set
-# CONFIG_ATM_MPOA is not set
-# CONFIG_ATM_NICSTAR is not set
-# CONFIG_ATM_SOLOS is not set
-# CONFIG_ATM_TCP is not set
-# CONFIG_ATM_ZATM is not set
-# CONFIG_AUDIT is not set
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUXDISPLAY is not set
-# CONFIG_AX25_DAMA_SLAVE is not set
-# CONFIG_AX25 is not set
-# CONFIG_AX88796 is not set
-# CONFIG_B3DFG is not set
-# CONFIG_B43 is not set
-# CONFIG_B43LEGACY is not set
-# CONFIG_B44 is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-CONFIG_BASE_FULL=y
-CONFIG_BASE_SMALL=0
-# CONFIG_BASLER_EXCITE is not set
-# CONFIG_BATTERY_BQ27000_HDQ is not set
-# CONFIG_BATTERY_BQ27x00 is not set
-# CONFIG_BATTERY_DS2760 is not set
-# CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_MAX17040 is not set
-# CONFIG_BAYCOM_EPP is not set
-# CONFIG_BAYCOM_PAR is not set
-# CONFIG_BAYCOM_SER_FDX is not set
-# CONFIG_BAYCOM_SER_HDX is not set
-CONFIG_BCM43XX_DEBUG=y
-CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
-# CONFIG_BCM43XX_DMA_MODE is not set
-CONFIG_BCM43XX_DMA=y
-# CONFIG_BCM43XX is not set
-# CONFIG_BCM43XX_PIO_MODE is not set
-CONFIG_BCM43XX_PIO=y
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_BINARY_PRINTF is not set
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-# CONFIG_BLINK is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
-# CONFIG_BLK_CPQ_DA is not set
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_BLK_DEV_4DRIVES is not set
-# CONFIG_BLK_DEV_AEC62XX is not set
-# CONFIG_BLK_DEV_ALI14XX is not set
-# CONFIG_BLK_DEV_ALI15X3 is not set
-# CONFIG_BLK_DEV_AMD74XX is not set
-# CONFIG_BLK_DEV_ATIIXP is not set
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_BLK_DEV_CMD640 is not set
-# CONFIG_BLK_DEV_CMD64X is not set
-# CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_CS5520 is not set
-# CONFIG_BLK_DEV_CS5530 is not set
-# CONFIG_BLK_DEV_CS5535 is not set
-# CONFIG_BLK_DEV_CS5536 is not set
-# CONFIG_BLK_DEV_CY82C693 is not set
-# CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_DELKIN is not set
-# CONFIG_BLK_DEV_DTC2278 is not set
-# CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_DEV_GENERIC is not set
-# CONFIG_BLK_DEV_HD_IDE is not set
-# CONFIG_BLK_DEV_HD is not set
-# CONFIG_BLK_DEV_HD_ONLY is not set
-# CONFIG_BLK_DEV_HPT34X is not set
-# CONFIG_BLK_DEV_HPT366 is not set
-# CONFIG_BLK_DEV_HT6560B is not set
-# CONFIG_BLK_DEV_IDEACPI is not set
-# CONFIG_BLK_DEV_IDECD is not set
-# CONFIG_BLK_DEV_IDECS is not set
-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-# CONFIG_BLK_DEV_IDEFLOPPY is not set
-# CONFIG_BLK_DEV_IDEPCI is not set
-# CONFIG_BLK_DEV_IDEPNP is not set
-# CONFIG_BLK_DEV_IDE_SATA is not set
-# CONFIG_BLK_DEV_IDESCSI is not set
-# CONFIG_BLK_DEV_IDETAPE is not set
-CONFIG_BLK_DEV_INITRD=y
-# CONFIG_BLK_DEV_INTEGRITY is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_BLK_DEV_IT8172 is not set
-# CONFIG_BLK_DEV_IT8213 is not set
-# CONFIG_BLK_DEV_IT821X is not set
-# CONFIG_BLK_DEV_JMICRON is not set
-# CONFIG_BLK_DEV_LOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_NS87415 is not set
-# CONFIG_BLK_DEV_OFFBOARD is not set
-# CONFIG_BLK_DEV_OPTI621 is not set
-# CONFIG_BLK_DEV_PDC202XX_NEW is not set
-# CONFIG_BLK_DEV_PDC202XX_OLD is not set
-# CONFIG_BLK_DEV_PIIX is not set
-# CONFIG_BLK_DEV_PLATFORM is not set
-# CONFIG_BLK_DEV_QD65XX is not set
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_RZ1000 is not set
-# CONFIG_BLK_DEV_SC1200 is not set
-# CONFIG_BLK_DEV_SD is not set
-# CONFIG_BLK_DEV_SIIMAGE is not set
-# CONFIG_BLK_DEV_SIS5513 is not set
-# CONFIG_BLK_DEV_SL82C105 is not set
-# CONFIG_BLK_DEV_SLC90E66 is not set
-# CONFIG_BLK_DEV_SR is not set
-# CONFIG_BLK_DEV_SVWKS is not set
-# CONFIG_BLK_DEV_SX8 is not set
-# CONFIG_BLK_DEV_TC86C001 is not set
-# CONFIG_BLK_DEV_TRIFLEX is not set
-# CONFIG_BLK_DEV_TRM290 is not set
-# CONFIG_BLK_DEV_UB is not set
-# CONFIG_BLK_DEV_UMC8672 is not set
-# CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_VIA82CXXX is not set
-# CONFIG_BLK_DEV_XIP is not set
-CONFIG_BLK_DEV=y
-CONFIG_BLOCK=y
-# CONFIG_BNX2 is not set
-# CONFIG_BONDING is not set
-# CONFIG_BOOT_TRACER is not set
-# CONFIG_BPQETHER is not set
-# CONFIG_BRIDGE_EBT_802_3 is not set
-# CONFIG_BRIDGE_EBT_AMONG is not set
-# CONFIG_BRIDGE_EBT_ARP is not set
-# CONFIG_BRIDGE_EBT_ARPREPLY is not set
-# CONFIG_BRIDGE_EBT_BROUTE is not set
-# CONFIG_BRIDGE_EBT_DNAT is not set
-# CONFIG_BRIDGE_EBT_IP6 is not set
-# CONFIG_BRIDGE_EBT_IP is not set
-# CONFIG_BRIDGE_EBT_LIMIT is not set
-# CONFIG_BRIDGE_EBT_LOG is not set
-# CONFIG_BRIDGE_EBT_MARK is not set
-# CONFIG_BRIDGE_EBT_MARK_T is not set
-# CONFIG_BRIDGE_EBT_NFLOG is not set
-# CONFIG_BRIDGE_EBT_PKTTYPE is not set
-# CONFIG_BRIDGE_EBT_REDIRECT is not set
-# CONFIG_BRIDGE_EBT_SNAT is not set
-# CONFIG_BRIDGE_EBT_STP is not set
-# CONFIG_BRIDGE_EBT_T_FILTER is not set
-# CONFIG_BRIDGE_EBT_T_NAT is not set
-# CONFIG_BRIDGE_EBT_ULOG is not set
-# CONFIG_BRIDGE_EBT_VLAN is not set
-# CONFIG_BRIDGE_NETFILTER is not set
-# CONFIG_BRIDGE_NF_EBTABLES is not set
-CONFIG_BRIDGE=y
-# CONFIG_BROADCOM_PHY is not set
-CONFIG_BROKEN_ON_SMP=y
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_BSD_PROCESS_ACCT_V3 is not set
-CONFIG_BSD_PROCESS_ACCT=y
-# CONFIG_BT_BNEP is not set
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-# CONFIG_BT_CMTP is not set
-# CONFIG_BT_HCIBCM203X is not set
-# CONFIG_BT_HCIBFUSB is not set
-# CONFIG_BT_HCIBLUECARD is not set
-# CONFIG_BT_HCIBPA10X is not set
-# CONFIG_BT_HCIBT3C is not set
-# CONFIG_BT_HCIBTSDIO is not set
-# CONFIG_BT_HCIBTUART is not set
-# CONFIG_BT_HCIBTUSB is not set
-# CONFIG_BT_HCIDTL1 is not set
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_H4=y
-# CONFIG_BT_HCIUART is not set
-# CONFIG_BT_HCIUART_LL is not set
-# CONFIG_BT_HCIUSB is not set
-CONFIG_BT_HCIUSB_SCO=y
-# CONFIG_BT_HCIVHCI is not set
-# CONFIG_BT_HIDP is not set
-# CONFIG_BT is not set
-# CONFIG_BT_L2CAP is not set
-# CONFIG_BT_RFCOMM is not set
-CONFIG_BT_RFCOMM_TTY=y
-# CONFIG_BTRFS_FS is not set
-# CONFIG_BT_SCO is not set
-CONFIG_BUG=y
-# CONFIG_C2PORT is not set
-# CONFIG_CAN is not set
-# CONFIG_CAPI_AVM is not set
-# CONFIG_CAPI_EICON is not set
-# CONFIG_CAPI_TRACE is not set
-CONFIG_CARDBUS=y
-# CONFIG_CARDMAN_4000 is not set
-# CONFIG_CARDMAN_4040 is not set
-# CONFIG_CASSINI is not set
-# CONFIG_CB710_CORE is not set
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_CFG80211 is not set
-# CONFIG_CGROUPS is not set
-# CONFIG_CHELSIO_T1 is not set
-# CONFIG_CHELSIO_T3 is not set
-# CONFIG_CHR_DEV_OSST is not set
-# CONFIG_CHR_DEV_SCH is not set
-# CONFIG_CHR_DEV_SG is not set
-# CONFIG_CHR_DEV_ST is not set
-# CONFIG_CICADA_PHY is not set
-# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
-# CONFIG_CIFS is not set
-CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_STATS2 is not set
-CONFIG_CIFS_STATS=y
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-# CONFIG_CIFS_XATTR is not set
-CONFIG_CLASSIC_RCU=y
-CONFIG_CLS_U32_MARK=y
-CONFIG_CLS_U32_PERF=y
-CONFIG_CMDLINE=""
-# CONFIG_CNIC is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_COMEDI is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_COMPAT_NET_DEV_OPS=y
-# CONFIG_CONFIGFS_FS is not set
-# CONFIG_CONNECTOR is not set
-CONFIG_CONSTRUCTORS=y
-# CONFIG_CONTEXT_SWITCH_TRACER is not set
-# CONFIG_COPS is not set
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-# CONFIG_CPU_DCACHE_DISABLE is not set
-# CONFIG_CPU_FREQ is not set
-# CONFIG_CPU_IDLE is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_CRASH_DUMP is not set
-# CONFIG_CRC16 is not set
-CONFIG_CRC32=y
-# CONFIG_CRC7 is not set
-# CONFIG_CRC_CCITT is not set
-# CONFIG_CRC_ITU_T is not set
-# CONFIG_CRC_T10DIF is not set
-CONFIG_CROSSCOMPILE=y
-# CONFIG_CRYPTO_AEAD is not set
-# CONFIG_CRYPTO_AES_586 is not set
-# CONFIG_CRYPTO_AES is not set
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_ALGAPI=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_ANUBIS is not set
-# CONFIG_CRYPTO_ARC4 is not set
-# CONFIG_CRYPTO_AUTHENC is not set
-# CONFIG_CRYPTO_BLKCIPHER is not set
-# CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_CAST5 is not set
-# CONFIG_CRYPTO_CAST6 is not set
-# CONFIG_CRYPTO_CBC is not set
-# CONFIG_CRYPTO_CCM is not set
-# CONFIG_CRYPTO_CRC32C_INTEL is not set
-# CONFIG_CRYPTO_CRC32C is not set
-# CONFIG_CRYPTO_CRYPTD is not set
-# CONFIG_CRYPTO_CTR is not set
-# CONFIG_CRYPTO_CTS is not set
-# CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_DES is not set
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_CRYPTO_ECB is not set
-# CONFIG_CRYPTO_FCRYPT is not set
-# CONFIG_CRYPTO_FIPS is not set
-# CONFIG_CRYPTO_GCM is not set
-# CONFIG_CRYPTO_GF128MUL is not set
-# CONFIG_CRYPTO_HASH is not set
-# CONFIG_CRYPTO_HMAC is not set
-# CONFIG_CRYPTO_HW is not set
-# CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_LZO is not set
-# CONFIG_CRYPTO_MANAGER2 is not set
-# CONFIG_CRYPTO_MANAGER is not set
-# CONFIG_CRYPTO_MD4 is not set
-# CONFIG_CRYPTO_MD5 is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_NULL is not set
-# CONFIG_CRYPTO_PCBC is not set
-CONFIG_CRYPTO_PCOMP=y
-# CONFIG_CRYPTO_PRNG is not set
-# CONFIG_CRYPTO_RMD128 is not set
-# CONFIG_CRYPTO_RMD160 is not set
-# CONFIG_CRYPTO_RMD256 is not set
-# CONFIG_CRYPTO_RMD320 is not set
-# CONFIG_CRYPTO_RNG is not set
-# CONFIG_CRYPTO_SALSA20_586 is not set
-# CONFIG_CRYPTO_SALSA20 is not set
-# CONFIG_CRYPTO_SEED is not set
-# CONFIG_CRYPTO_SEQIV is not set
-# CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_SHA1 is not set
-# CONFIG_CRYPTO_SHA256 is not set
-# CONFIG_CRYPTO_SHA512 is not set
-# CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_TEST is not set
-# CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_TWOFISH_586 is not set
-# CONFIG_CRYPTO_TWOFISH_COMMON is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-CONFIG_CRYPTO_UNLZMA=y
-# CONFIG_CRYPTO_WP512 is not set
-# CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_XTS is not set
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_ZLIB=y
-# CONFIG_CUSE is not set
-# CONFIG_DAB is not set
-# CONFIG_DAVICOM_PHY is not set
-# CONFIG_DCB is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
-CONFIG_DEBUG_FS=y
-# CONFIG_DEBUG_KERNEL is not set
-# CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_DECNET is not set
-CONFIG_DECOMPRESS_LZMA_NEEDED=y
-# CONFIG_DEFAULT_AS is not set
-# CONFIG_DEFAULT_BIC is not set
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_CUBIC is not set
-CONFIG_DEFAULT_DEADLINE=y
-# CONFIG_DEFAULT_HTCP is not set
-CONFIG_DEFAULT_IOSCHED="deadline"
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-# CONFIG_DEFAULT_NOOP is not set
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="westwood"
-# CONFIG_DEFAULT_VEGAS is not set
-CONFIG_DEFAULT_WESTWOOD=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-# CONFIG_DEVKMEM is not set
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
-# CONFIG_DGRS is not set
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_DISPLAY_SUPPORT is not set
-# CONFIG_DL2K is not set
-# CONFIG_DLM is not set
-# CONFIG_DMADEVICES is not set
-# CONFIG_DMA_ENGINE is not set
-# CONFIG_DMASCC is not set
-# CONFIG_DMATEST is not set
-# CONFIG_DNET is not set
-# CONFIG_DNOTIFY is not set
-# CONFIG_DRAGONRISE_FF is not set
-# CONFIG_DRM is not set
-# CONFIG_DS1682 is not set
-# CONFIG_DST is not set
-# CONFIG_DTLK is not set
-# CONFIG_DUMMY is not set
-# CONFIG_DVB_CORE is not set
-# CONFIG_DVB is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
-# CONFIG_E1000E is not set
-# CONFIG_E1000 is not set
-# CONFIG_E100 is not set
-# CONFIG_ECHO is not set
-# CONFIG_ECONET is not set
-# CONFIG_EDAC is not set
-# CONFIG_EEPRO100 is not set
-# CONFIG_EEPROM_93CX6 is not set
-# CONFIG_EEPROM_AT24 is not set
-# CONFIG_EEPROM_AT25 is not set
-# CONFIG_EEPROM_LEGACY is not set
-# CONFIG_EEPROM_MAX6875 is not set
-# CONFIG_EFI_PARTITION is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_ELF_CORE is not set
-CONFIG_EMBEDDED=y
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_ENABLE_WARN_DEPRECATED=y
-# CONFIG_ENC28J60 is not set
-# CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_EPIC100 is not set
-CONFIG_EPOLL=y
-# CONFIG_EQUALIZER is not set
-# CONFIG_ET131X is not set
-# CONFIG_ETHOC is not set
-CONFIG_EVENTFD=y
-# CONFIG_EVENT_TRACER is not set
-CONFIG_EXPERIMENTAL=y
-# CONFIG_EXPORTFS is not set
-# CONFIG_EXT2_FS is not set
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_EXT3_FS_XATTR is not set
-# CONFIG_EXT4DEV_FS is not set
-# CONFIG_EXT4_FS is not set
-CONFIG_EXTRA_FIRMWARE=""
-CONFIG_EXTRA_TARGETS=""
-# CONFIG_EZX_PCAP is not set
-# CONFIG_FAIR_GROUP_SCHED is not set
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-# CONFIG_FAT_FS is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_ARC is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_BACKLIGHT is not set
-# CONFIG_FB_BOOT_VESA_SUPPORT is not set
-# CONFIG_FB_BROADSHEET is not set
-# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_CFB_COPYAREA is not set
-# CONFIG_FB_CFB_FILLRECT is not set
-# CONFIG_FB_CFB_IMAGEBLIT is not set
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_DDC is not set
-# CONFIG_FB_EARLYSUSPEND is not set
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_GOLDFISH is not set
-# CONFIG_FB_HGA is not set
-# CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_LE80578 is not set
-# CONFIG_FB_MACMODES is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_MB862XX is not set
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_N411 is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_OF is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_PS3 is not set
-# CONFIG_FB_PXA is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_FOPS is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
-# CONFIG_FB_TILEBLITTING is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_VGA16 is not set
-# CONFIG_FB_VIA is not set
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_VT8623 is not set
-# CONFIG_FCOE_FNIC is not set
-# CONFIG_FCOE is not set
-# CONFIG_FDDI is not set
-# CONFIG_FEALNX is not set
-CONFIG_FIB_RULES=y
-CONFIG_FILE_LOCKING=y
-# CONFIG_FIREWIRE is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
-# CONFIG_FIXED_PHY is not set
-CONFIG_FLATMEM_MANUAL=y
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_FORCEDETH is not set
-CONFIG_FRAME_WARN=1024
-# CONFIG_FRAMEBUFFER_CONSOLE is not set
-# CONFIG_FREEZER is not set
-# CONFIG_FSCACHE is not set
-CONFIG_FSNOTIFY=y
-# CONFIG_FS_POSIX_ACL is not set
-# CONFIG_FTL is not set
-# CONFIG_FTRACE is not set
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_FUNCTION_TRACER is not set
-# CONFIG_FUSE_FS is not set
-# CONFIG_FUSION_FC is not set
-# CONFIG_FUSION is not set
-# CONFIG_FUSION_SAS is not set
-# CONFIG_FUSION_SPI is not set
-CONFIG_FUTEX=y
-CONFIG_FW_LOADER=y
-CONFIG_GACT_PROB=y
-# CONFIG_GAMEPORT is not set
-# CONFIG_GCOV_KERNEL is not set
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_TIME=y
-# CONFIG_GIGASET_DEBUG is not set
-# CONFIG_GFS2_FS is not set
-# CONFIG_GPIO_BT8XX is not set
-# CONFIG_GPIO_DEVICE is not set
-# CONFIG_GPIOLIB is not set
-# CONFIG_GPIO_MAX7301 is not set
-# CONFIG_GPIO_MAX732X is not set
-# CONFIG_GPIO_MCP23S08 is not set
-# CONFIG_GPIO_PCA953X is not set
-# CONFIG_GPIO_PCF857X is not set
-# CONFIG_GPIO_SYSFS is not set
-# CONFIG_GPIO_XILINX is not set
-# CONFIG_GREENASIA_FF is not set
-# CONFIG_GROUP_SCHED is not set
-# CONFIG_HAMACHI is not set
-CONFIG_HAMRADIO=y
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_HAVE_AOUT is not set
-CONFIG_HAVE_MLOCKED_PAGE_BIT=y
-CONFIG_HAVE_MLOCK=y
-# CONFIG_HCALL_STATS is not set
-# CONFIG_HDLC_CISCO is not set
-# CONFIG_HDLC_FR is not set
-# CONFIG_HDLC is not set
-# CONFIG_HDLC_PPP is not set
-# CONFIG_HDLC_RAW_ETH is not set
-# CONFIG_HDLC_RAW is not set
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_HECI is not set
-# CONFIG_HERMES is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_HID_A4TECH is not set
-# CONFIG_HID_APPLE is not set
-# CONFIG_HID_BELKIN is not set
-# CONFIG_HID_BRIGHT is not set
-# CONFIG_HID_CHERRY is not set
-# CONFIG_HID_CHICONY is not set
-# CONFIG_HID_COMPAT is not set
-# CONFIG_HID_CYPRESS is not set
-# CONFIG_HID_DEBUG is not set
-# CONFIG_HID_DELL is not set
-# CONFIG_HID_DRAGONRISE is not set
-# CONFIG_HID_EZKEY is not set
-# CONFIG_HID_FF is not set
-# CONFIG_HID_GREENASIA is not set
-# CONFIG_HID_GYRATION is not set
-# CONFIG_HID is not set
-# CONFIG_HID_KENSINGTON is not set
-# CONFIG_HID_KYE is not set
-# CONFIG_HID_LOGITECH is not set
-# CONFIG_HID_MICROSOFT is not set
-# CONFIG_HID_MONTEREY is not set
-# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_PANTHERLORD is not set
-# CONFIG_HID_PETALYNX is not set
-# CONFIG_HID_PID is not set
-# CONFIG_HIDRAW is not set
-# CONFIG_HID_SAMSUNG is not set
-# CONFIG_HID_SMARTJOYPLUS is not set
-# CONFIG_HID_SONY is not set
-# CONFIG_HID_SUNPLUS is not set
-# CONFIG_HID_SUPPORT is not set
-# CONFIG_HID_THRUSTMASTER is not set
-# CONFIG_HID_TOPSEED is not set
-# CONFIG_HID_WACOM is not set
-# CONFIG_HID_ZEROPLUS is not set
-# CONFIG_HIGHMEM is not set
-CONFIG_HIGH_RES_TIMERS=y
-# CONFIG_HIPPI is not set
-# CONFIG_HOSTAP_CS is not set
-# CONFIG_HOSTAP is not set
-# CONFIG_HOSTAP_PCI is not set
-# CONFIG_HOSTAP_PLX is not set
-# CONFIG_HOTPLUG_CPU is not set
-# CONFIG_HOTPLUG_PCI is not set
-CONFIG_HOTPLUG=y
-# CONFIG_HP100 is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_HP_ILO is not set
-# CONFIG_HTC_EGPIO is not set
-# CONFIG_HTC_PASIC3 is not set
-# CONFIG_HUGETLB_PAGE is not set
-# CONFIG_HVC_UDBG is not set
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
-# CONFIG_HW_RANDOM_AMD is not set
-# CONFIG_HW_RANDOM_GEODE is not set
-# CONFIG_HW_RANDOM_INTEL is not set
-# CONFIG_HW_RANDOM_TIMERIOMEM is not set
-# CONFIG_HW_RANDOM_VIA is not set
-# CONFIG_HYSDN is not set
-CONFIG_HZ=100
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ_100=y
-# CONFIG_HZ_1024 is not set
-# CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_256 is not set
-# CONFIG_HZ_300 is not set
-# CONFIG_HZ_48 is not set
-# CONFIG_I2C_ALGOBIT is not set
-# CONFIG_I2C_ALGOPCA is not set
-# CONFIG_I2C_ALGOPCF is not set
-# CONFIG_I2C_ALI1535 is not set
-# CONFIG_I2C_ALI1563 is not set
-# CONFIG_I2C_ALI15X3 is not set
-# CONFIG_I2C_AMD756 is not set
-# CONFIG_I2C_AMD8111 is not set
-# CONFIG_I2C_CHARDEV is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_ELEKTOR is not set
-# CONFIG_I2C_GPIO is not set
-# CONFIG_I2C_HELPER_AUTO is not set
-# CONFIG_I2C_I801 is not set
-# CONFIG_I2C_I810 is not set
-# CONFIG_I2C_IBM_IIC is not set
-# CONFIG_I2C_ISCH is not set
-# CONFIG_I2C is not set
-# CONFIG_I2C_MPC is not set
-# CONFIG_I2C_NFORCE2 is not set
-# CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_PCA_ISA is not set
-# CONFIG_I2C_PCA_PLATFORM is not set
-# CONFIG_I2C_PIIX4 is not set
-# CONFIG_I2C_PROSAVAGE is not set
-# CONFIG_I2C_SAVAGE4 is not set
-# CONFIG_I2C_SIMTEC is not set
-# CONFIG_I2C_SIS5595 is not set
-# CONFIG_I2C_SIS630 is not set
-# CONFIG_I2C_SIS96X is not set
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_TAOS_EVM is not set
-# CONFIG_I2C_TINY_USB is not set
-# CONFIG_I2C_VIA is not set
-# CONFIG_I2C_VIAPRO is not set
-# CONFIG_I2C_VOODOO3 is not set
-# CONFIG_I2O is not set
-# CONFIG_I82092 is not set
-# CONFIG_I82365 is not set
-# CONFIG_IBM_ASM is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
-# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
-# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_ICPLUS_PHY is not set
-# CONFIG_ICS932S401 is not set
-# CONFIG_IDEDISK_MULTI_MODE is not set
-# CONFIG_IDEDMA_IVB is not set
-# CONFIG_IDEDMA_ONLYDISK is not set
-# CONFIG_IDE_GD is not set
-# CONFIG_IDE is not set
-CONFIG_IDE_MAX_HWIFS=4
-# CONFIG_IDEPCI_SHARE_IRQ is not set
-# CONFIG_IDE_PHISON is not set
-CONFIG_IDE_PROC_FS=y
-# CONFIG_IDE_TASK_IOCTL is not set
-# CONFIG_IEEE1394_DV1394 is not set
-# CONFIG_IEEE1394_ETH1394 is not set
-# CONFIG_IEEE1394 is not set
-# CONFIG_IEEE1394_OHCI1394 is not set
-# CONFIG_IEEE1394_PCILYNX is not set
-# CONFIG_IEEE1394_RAWIO is not set
-# CONFIG_IEEE1394_VERBOSEDEBUG is not set
-# CONFIG_IEEE1394_VIDEO1394 is not set
-# CONFIG_IEEE80211_CRYPT_CCMP is not set
-# CONFIG_IEEE80211_CRYPT_TKIP is not set
-# CONFIG_IEEE80211_CRYPT_WEP is not set
-# CONFIG_IEEE80211_DEBUG is not set
-# CONFIG_IEEE80211 is not set
-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
-# CONFIG_IEEE80211_SOFTMAC is not set
-# CONFIG_IEEE802154 is not set
-# CONFIG_IFB is not set
-# CONFIG_IGB is not set
-# CONFIG_IGBVF is not set
-# CONFIG_IKCONFIG is not set
-# CONFIG_IKCONFIG_PROC is not set
-# CONFIG_IMAGE_CMDLINE_HACK is not set
-# CONFIG_IMQ_BEHAVIOR_AA is not set
-# CONFIG_IMQ_BEHAVIOR_AB is not set
-# CONFIG_IMQ_BEHAVIOR_BA is not set
-# CONFIG_IMQ_BEHAVIOR_BB is not set
-# CONFIG_IMQ is not set
-CONFIG_IMQ_NUM_DEVS=2
-# CONFIG_INET6_AH is not set
-# CONFIG_INET6_ESP is not set
-# CONFIG_INET6_IPCOMP is not set
-# CONFIG_INET6_TUNNEL is not set
-# CONFIG_INET6_XFRM_MODE_BEET is not set
-# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_TCP_DIAG is not set
-# CONFIG_INET_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_TUNNEL is not set
-CONFIG_INET=y
-# CONFIG_INFINIBAND is not set
-# CONFIG_INFTL is not set
-CONFIG_INIT_ENV_ARG_LIMIT=32
-# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set
-# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set
-# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set
-CONFIG_INITRAMFS_COMPRESSION_NONE=y
-# CONFIG_INOTIFY is not set
-# CONFIG_INOTIFY_USER is not set
-# CONFIG_INPUT_APANEL is not set
-# CONFIG_INPUT_ATI_REMOTE2 is not set
-# CONFIG_INPUT_ATI_REMOTE is not set
-# CONFIG_INPUT_ATLAS_BTNS is not set
-# CONFIG_INPUT_CM109 is not set
-# CONFIG_INPUT_EVBUG is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
-# CONFIG_INPUT is not set
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_KEYSPAN_REMOTE is not set
-# CONFIG_INPUT_MIMIO is not set
-CONFIG_INPUT_MISC=y
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_PCSPKR is not set
-# CONFIG_INPUT_POLLDEV is not set
-# CONFIG_INPUT_POWERMATE is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_TSDEV is not set
-# CONFIG_INPUT_UINPUT is not set
-# CONFIG_INPUT_WISTRON_BTNS is not set
-# CONFIG_INSTRUMENTATION is not set
-# CONFIG_IOSCHED_AS is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_NOOP=y
-# CONFIG_IP1000 is not set
-# CONFIG_IP175C_PHY is not set
-# CONFIG_IP6_NF_FILTER is not set
-# CONFIG_IP6_NF_IPTABLES is not set
-# CONFIG_IP6_NF_MANGLE is not set
-# CONFIG_IP6_NF_MATCH_AH is not set
-# CONFIG_IP6_NF_MATCH_EUI64 is not set
-# CONFIG_IP6_NF_MATCH_FRAG is not set
-# CONFIG_IP6_NF_MATCH_HL is not set
-# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
-# CONFIG_IP6_NF_MATCH_LIMIT is not set
-# CONFIG_IP6_NF_MATCH_MH is not set
-# CONFIG_IP6_NF_MATCH_OPTS is not set
-# CONFIG_IP6_NF_MATCH_OWNER is not set
-# CONFIG_IP6_NF_MATCH_RT is not set
-# CONFIG_IP6_NF_QUEUE is not set
-# CONFIG_IP6_NF_RAW is not set
-# CONFIG_IP6_NF_TARGET_HL is not set
-# CONFIG_IP6_NF_TARGET_IMQ is not set
-# CONFIG_IP6_NF_TARGET_LOG is not set
-# CONFIG_IP6_NF_TARGET_REJECT is not set
-# CONFIG_IP6_NF_TARGET_ROUTE is not set
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IPC_NS is not set
-# CONFIG_IP_DCCP is not set
-CONFIG_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
-# CONFIG_IPMI_HANDLER is not set
-CONFIG_IP_MROUTE=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_MULTIPLE_TABLES=y
-# CONFIG_IP_NF_AMANDA is not set
-# CONFIG_IP_NF_ARPFILTER is not set
-# CONFIG_IP_NF_ARP_MANGLE is not set
-# CONFIG_IP_NF_ARPTABLES is not set
-# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
-CONFIG_IP_NF_CONNTRACK_MARK=y
-CONFIG_IP_NF_CONNTRACK=y
-CONFIG_IP_NF_CT_ACCT=y
-# CONFIG_IP_NF_CT_PROTO_SCTP is not set
-# CONFIG_IP_NF_FILTER is not set
-# CONFIG_IP_NF_FTP is not set
-# CONFIG_IP_NF_H323 is not set
-# CONFIG_IP_NF_IPTABLES is not set
-# CONFIG_IP_NF_IRC is not set
-# CONFIG_IP_NF_MANGLE is not set
-# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
-# CONFIG_IP_NF_MATCH_AH is not set
-# CONFIG_IP_NF_MATCH_ECN is not set
-# CONFIG_IP_NF_MATCH_HASHLIMIT is not set
-# CONFIG_IP_NF_MATCH_IPP2P is not set
-# CONFIG_IP_NF_MATCH_OWNER is not set
-# CONFIG_IP_NF_MATCH_RECENT is not set
-# CONFIG_IP_NF_MATCH_SET is not set
-# CONFIG_IP_NF_MATCH_TIME is not set
-# CONFIG_IP_NF_MATCH_TOS is not set
-# CONFIG_IP_NF_MATCH_TTL is not set
-# CONFIG_IP_NF_NAT_AMANDA is not set
-# CONFIG_IP_NF_NAT_FTP is not set
-# CONFIG_IP_NF_NAT_H323 is not set
-# CONFIG_IP_NF_NAT_IRC is not set
-CONFIG_IP_NF_NAT_NEEDED=y
-# CONFIG_IP_NF_NAT_PPTP is not set
-# CONFIG_IP_NF_NAT_SIP is not set
-# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
-# CONFIG_IP_NF_NAT_TFTP is not set
-CONFIG_IP_NF_NAT=y
-# CONFIG_IP_NF_NETBIOS_NS is not set
-# CONFIG_IP_NF_PPTP is not set
-# CONFIG_IP_NF_QUEUE is not set
-# CONFIG_IP_NF_RAW is not set
-# CONFIG_IP_NF_SECURITY is not set
-CONFIG_IP_NF_SET_HASHSIZE=1024
-# CONFIG_IP_NF_SET_IPHASH is not set
-# CONFIG_IP_NF_SET_IPMAP is not set
-# CONFIG_IP_NF_SET_IPPORTHASH is not set
-# CONFIG_IP_NF_SET_IPTREE is not set
-# CONFIG_IP_NF_SET_IPTREEMAP is not set
-# CONFIG_IP_NF_SET is not set
-# CONFIG_IP_NF_SET_MACIPMAP is not set
-CONFIG_IP_NF_SET_MAX=256
-# CONFIG_IP_NF_SET_NETHASH is not set
-# CONFIG_IP_NF_SET_PORTMAP is not set
-# CONFIG_IP_NF_SIP is not set
-# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
-# CONFIG_IP_NF_TARGET_ECN is not set
-# CONFIG_IP_NF_TARGET_IMQ is not set
-# CONFIG_IP_NF_TARGET_LOG is not set
-# CONFIG_IP_NF_TARGET_MASQUERADE is not set
-# CONFIG_IP_NF_TARGET_NETMAP is not set
-# CONFIG_IP_NF_TARGET_REDIRECT is not set
-# CONFIG_IP_NF_TARGET_REJECT is not set
-# CONFIG_IP_NF_TARGET_ROUTE is not set
-# CONFIG_IP_NF_TARGET_SAME is not set
-# CONFIG_IP_NF_TARGET_SET is not set
-# CONFIG_IP_NF_TARGET_TOS is not set
-# CONFIG_IP_NF_TARGET_TTL is not set
-# CONFIG_IP_NF_TARGET_ULOG is not set
-# CONFIG_IP_NF_TFTP is not set
-# CONFIG_IP_PIMSM_V1 is not set
-# CONFIG_IP_PIMSM_V2 is not set
-# CONFIG_IP_PNP is not set
-CONFIG_IP_ROUTE_FWMARK=y
-CONFIG_IP_ROUTE_MULTIPATH_CACHED=y
-# CONFIG_IP_ROUTE_MULTIPATH_DRR is not set
-# CONFIG_IP_ROUTE_MULTIPATH_RANDOM is not set
-# CONFIG_IP_ROUTE_MULTIPATH_RR is not set
-# CONFIG_IP_ROUTE_MULTIPATH_WRANDOM is not set
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-# CONFIG_IP_SCTP is not set
-CONFIG_IPSEC_NAT_TRAVERSAL=y
-# CONFIG_IPV6 is not set
-# CONFIG_IPV6_MIP6 is not set
-# CONFIG_IPV6_MROUTE is not set
-# CONFIG_IPV6_MULTIPLE_TABLES is not set
-CONFIG_IPV6_NDISC_NODETYPE=y
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-# CONFIG_IPV6_PRIVACY is not set
-# CONFIG_IPV6_ROUTE_INFO is not set
-# CONFIG_IPV6_ROUTER_PREF is not set
-# CONFIG_IPV6_SIT is not set
-# CONFIG_IPV6_TUNNEL is not set
-# CONFIG_IP_VS is not set
-# CONFIG_IPW2100_DEBUG is not set
-# CONFIG_IPW2100 is not set
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2200_DEBUG is not set
-# CONFIG_IPW2200 is not set
-CONFIG_IPW2200_MONITOR=y
-# CONFIG_IPW2200_PROMISCUOUS is not set
-# CONFIG_IPW2200_QOS is not set
-# CONFIG_IPW2200_RADIOTAP is not set
-# CONFIG_IPWIRELESS is not set
-# CONFIG_IPX is not set
-# CONFIG_IRDA is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_ISCSI_TCP is not set
-CONFIG_ISDN=y
-# CONFIG_ISDN_AUDIO is not set
-# CONFIG_ISDN_CAPI_CAPIDRV is not set
-# CONFIG_ISDN_DIVERSION is not set
-# CONFIG_ISDN_DRV_ACT2000 is not set
-# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
-# CONFIG_ISDN_DRV_EICON is not set
-# CONFIG_ISDN_DRV_HISAX is not set
-# CONFIG_ISDN_DRV_ICN is not set
-# CONFIG_ISDN_DRV_LOOP is not set
-# CONFIG_ISDN_DRV_PCBIT is not set
-# CONFIG_ISDN_DRV_SC is not set
-# CONFIG_ISDN_DRV_TPAM is not set
-# CONFIG_ISDN_WITH_ABC is not set
-# CONFIG_ISL29003 is not set
-# CONFIG_ISO9660_FS is not set
-# CONFIG_IWL3945 is not set
-# CONFIG_IWLAGN is not set
-# CONFIG_IWLCORE is not set
-# CONFIG_IWLWIFI is not set
-# CONFIG_IWLWIFI_LEDS is not set
-# CONFIG_IXGB is not set
-# CONFIG_JBD2_DEBUG is not set
-# CONFIG_JBD_DEBUG is not set
-# CONFIG_JBD is not set
-# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
-# CONFIG_JFFS2_CMODE_NONE is not set
-CONFIG_JFFS2_CMODE_PRIORITY=y
-# CONFIG_JFFS2_CMODE_SIZE is not set
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_FS_DEBUG=0
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_XATTR is not set
-CONFIG_JFFS2_FS=y
-# CONFIG_JFFS2_LZO is not set
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
-CONFIG_JFFS2_SUMMARY=y
-CONFIG_JFFS2_ZLIB=y
-# CONFIG_JFFS_FS is not set
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_JFS_POSIX_ACL is not set
-# CONFIG_JFS_SECURITY is not set
-# CONFIG_JFS_STATISTICS is not set
-# CONFIG_JME is not set
-CONFIG_JOLIET=y
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-# CONFIG_KALLSYMS is not set
-# CONFIG_KARMA_PARTITION is not set
-# CONFIG_KERNEL_BZIP2 is not set
-# CONFIG_KERNEL_GZIP is not set
-CONFIG_KERNEL_LZMA=y
-# CONFIG_KERNEL_LZO is not set
-# CONFIG_KEXEC is not set
-# CONFIG_KEYBOARD_LM8323 is not set
-# CONFIG_KEYS is not set
-# CONFIG_KMEMTRACE is not set
-CONFIG_KMOD=y
-# CONFIG_KPROBES is not set
-# CONFIG_KS8842 is not set
-# CONFIG_KS8851 is not set
-# CONFIG_LANMEDIA is not set
-# CONFIG_LAPB is not set
-# CONFIG_LASAT is not set
-# CONFIG_LATENCYTOP is not set
-CONFIG_LBDAF=y
-# CONFIG_LCD_LTV350QV is not set
-# CONFIG_LCD_TDO24M is not set
-# CONFIG_LCD_VGG2432A4 is not set
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_LEDS_ALIX is not set
-# CONFIG_LEDS_BD2802 is not set
-CONFIG_LEDS_CLASS=y
-# CONFIG_LEDS_DAC124S085 is not set
-CONFIG_LEDS_GPIO_PLATFORM=y
-# CONFIG_LEDS_LP3944 is not set
-# CONFIG_LEDS_LP5521 is not set
-# CONFIG_LEDS_PCA9532 is not set
-# CONFIG_LEDS_PCA955X is not set
-# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-# CONFIG_LEDS_TRIGGER_GPIO is not set
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-# CONFIG_LEDS_TRIGGER_IDE_DISK is not set
-# CONFIG_LEDS_TRIGGER_MORSE is not set
-CONFIG_LEDS_TRIGGER_NETDEV=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_LIB80211_CRYPT_CCMP is not set
-# CONFIG_LIB80211_CRYPT_TKIP is not set
-# CONFIG_LIB80211_CRYPT_WEP is not set
-# CONFIG_LIB80211_DEBUG is not set
-# CONFIG_LIB80211 is not set
-# CONFIG_LIBCRC32C is not set
-# CONFIG_LIBERTAS is not set
-# CONFIG_LIBERTAS_THINFIRM is not set
-# CONFIG_LIBERTAS_USB is not set
-# CONFIG_LIBFC is not set
-# CONFIG_LIBFCOE is not set
-# CONFIG_LIBIPW_DEBUG is not set
-# CONFIG_LINE6_USB is not set
-# CONFIG_LLC2 is not set
-CONFIG_LLC=y
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_LOCKDEP_SUPPORT=y
-# CONFIG_LOCKD is not set
-CONFIG_LOCKD_V4=y
-CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_LOGIRUMBLEPAD2_FF is not set
-# CONFIG_LOGITECH_FF is not set
-# CONFIG_LOGO is not set
-# CONFIG_LSF is not set
-# CONFIG_LSI_ET1011C_PHY is not set
-# CONFIG_LTPC is not set
-# CONFIG_LXT_PHY is not set
-CONFIG_MAC80211_DEFAULT_PS_VALUE=1
-CONFIG_MAC80211_DEFAULT_PS=y
-# CONFIG_MAC80211 is not set
-# CONFIG_MAC_EMUMOUSEBTN is not set
-# CONFIG_MACINTOSH_DRIVERS is not set
-# CONFIG_MAC_PARTITION is not set
-# CONFIG_MACVLAN is not set
-# CONFIG_MAGIC_SYSRQ is not set
-# CONFIG_MARKEINS is not set
-# CONFIG_MARKERS is not set
-# CONFIG_MARVELL_PHY is not set
-# CONFIG_MDIO_BITBANG is not set
-# CONFIG_MD is not set
-# CONFIG_ME4000 is not set
-# CONFIG_MEDIA_ATTACH is not set
-# CONFIG_MEDIA_SUPPORT is not set
-# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_SAS is not set
-# CONFIG_MEILHAUS is not set
-# CONFIG_MEMSTICK is not set
-# CONFIG_MFD_ASIC3 is not set
-# CONFIG_MFD_CORE is not set
-# CONFIG_MFD_PCF50633 is not set
-# CONFIG_MFD_SM501 is not set
-# CONFIG_MFD_TC6387XB is not set
-# CONFIG_MFD_TC6393XB is not set
-# CONFIG_MFD_TMIO is not set
-# CONFIG_MFD_WM8350_I2C is not set
-# CONFIG_MFD_WM8400 is not set
-# CONFIG_MG_DISK is not set
-# CONFIG_MIGRATION is not set
-CONFIG_MII=y
-CONFIG_MINI_FO=y
-# CONFIG_MINIX_FS is not set
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_MIPS_FPU_EMU is not set
-CONFIG_MISC_DEVICES=y
-CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_MISDN_HFCPCI is not set
-# CONFIG_MISDN_HFCUSB is not set
-# CONFIG_MISDN is not set
-# CONFIG_MKISS is not set
-# CONFIG_MMC_ARMMMCI is not set
-CONFIG_MMC_BLOCK_BOUNCE=y
-# CONFIG_MMC_BLOCK is not set
-# CONFIG_MMC_CB710 is not set
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC is not set
-# CONFIG_MMC_S3C is not set
-# CONFIG_MMC_SDHCI is not set
-# CONFIG_MMC_SDRICOH_CS is not set
-# CONFIG_MMC_SPI is not set
-# CONFIG_MMC_TEST is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-# CONFIG_MMC_VIA_SDMMC is not set
-CONFIG_MMU=y
-# CONFIG_MODULE_FORCE_LOAD is not set
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MOUSE_APPLETOUCH is not set
-# CONFIG_MOUSE_INPORT is not set
-# CONFIG_MOUSE_LOGIBM is not set
-# CONFIG_MOUSE_PC110PAD is not set
-# CONFIG_MOUSE_SYNAPTICS_I2C is not set
-# CONFIG_MSDOS_FS is not set
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_AFS_PARTS is not set
-# CONFIG_MTD_ALAUDA is not set
-# CONFIG_MTD_AR7_PARTS is not set
-# CONFIG_MTD_ARM_INTEGRATOR is not set
-CONFIG_MTD_BLKDEVS=y
-# CONFIG_MTD_BLOCK2MTD is not set
-CONFIG_MTD_BLOCK=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_CFI_AMDSTD=y
-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CFI_INTELEXT=y
-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_NOSWAP=y
-# CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI_UTIL=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CHAR=y
-# CONFIG_MTD_CMDLINE_PARTS is not set
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-# CONFIG_MTD_CONCAT is not set
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_INTEL_VR_NOR is not set
-# CONFIG_MTD_JEDECPROBE is not set
-# CONFIG_MTD_LPDDR is not set
-# CONFIG_MTD_M25P80 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_MYLOADER_PARTS is not set
-# CONFIG_MTD_NAND_CAFE is not set
-# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_ECC_SMC is not set
-# CONFIG_MTD_NAND_GPIO is not set
-CONFIG_MTD_NAND_IDS=y
-# CONFIG_MTD_NAND is not set
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
-# CONFIG_MTD_NAND_PLATFORM is not set
-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
-# CONFIG_MTD_ONENAND is not set
-# CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_OTP is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_PCI is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_PHYSMAP_COMPAT is not set
-# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_RAM is not set
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
-# CONFIG_MTD_ROM is not set
-CONFIG_MTD_ROOTFS_ROOT_DEV=y
-CONFIG_MTD_ROOTFS_SPLIT=y
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_TESTS is not set
-# CONFIG_MTD_UBI is not set
-CONFIG_MTD=y
-# CONFIG_MVSWITCH_PHY is not set
-# CONFIG_MWAVE is not set
-# CONFIG_MWL8K is not set
-# CONFIG_MYRI10GE is not set
-# CONFIG_NAMESPACES is not set
-# CONFIG_NATIONAL_PHY is not set
-# CONFIG_NATSEMI is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_NE2K_PCI is not set
-# CONFIG_NEC_MARKEINS is not set
-# CONFIG_NET_9P is not set
-# CONFIG_NET_ACT_GACT is not set
-# CONFIG_NET_ACT_IPT is not set
-# CONFIG_NET_ACT_MIRRED is not set
-# CONFIG_NET_ACT_NAT is not set
-# CONFIG_NET_ACT_PEDIT is not set
-# CONFIG_NET_ACT_POLICE is not set
-# CONFIG_NET_ACT_SIMP is not set
-CONFIG_NET_ACT_SKBEDIT=y
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_CLS_BASIC=y
-# CONFIG_NET_CLS_FLOW is not set
-# CONFIG_NET_CLS_FW is not set
-CONFIG_NET_CLS_IND=y
-# CONFIG_NET_CLS_ROUTE4 is not set
-# CONFIG_NET_CLS_RSVP6 is not set
-# CONFIG_NET_CLS_RSVP is not set
-# CONFIG_NET_CLS_TCINDEX is not set
-# CONFIG_NET_CLS_U32 is not set
-CONFIG_NET_CLS=y
-# CONFIG_NETCONSOLE is not set
-# CONFIG_NETDEBUG is not set
-# CONFIG_NETDEV_10000 is not set
-CONFIG_NETDEV_1000=y
-CONFIG_NETDEVICES_MULTIQUEUE=y
-CONFIG_NETDEVICES=y
-# CONFIG_NET_DROP_MONITOR is not set
-# CONFIG_NET_DSA is not set
-# CONFIG_NET_EMATCH_CMP is not set
-# CONFIG_NET_EMATCH is not set
-# CONFIG_NET_EMATCH_META is not set
-# CONFIG_NET_EMATCH_NBYTE is not set
-CONFIG_NET_EMATCH_STACK=32
-# CONFIG_NET_EMATCH_TEXT is not set
-# CONFIG_NET_EMATCH_U32 is not set
-CONFIG_NET_ESTIMATOR=y
-CONFIG_NET_ETHERNET=y
-# CONFIG_NET_FC is not set
-CONFIG_NETFILTER_ADVANCED=y
-# CONFIG_NETFILTER_DEBUG is not set
-# CONFIG_NETFILTER_NETLINK is not set
-# CONFIG_NETFILTER_NETLINK_LOG is not set
-# CONFIG_NETFILTER_NETLINK_QUEUE is not set
-# CONFIG_NETFILTER_TPROXY is not set
-# CONFIG_NETFILTER_XTABLES is not set
-# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
-# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
-# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
-# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
-# CONFIG_NETFILTER_XT_MATCH_ESP is not set
-# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
-# CONFIG_NETFILTER_XT_MATCH_HL is not set
-# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
-# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set
-# CONFIG_NETFILTER_XT_MATCH_LAYER7 is not set
-# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
-# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_MAC is not set
-# CONFIG_NETFILTER_XT_MATCH_MARK is not set
-# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
-# CONFIG_NETFILTER_XT_MATCH_OSF is not set
-# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
-# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
-# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
-# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
-# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
-# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
-# CONFIG_NETFILTER_XT_MATCH_REALM is not set
-# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
-# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
-# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
-# CONFIG_NETFILTER_XT_MATCH_STATE is not set
-# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
-# CONFIG_NETFILTER_XT_MATCH_STRING is not set
-# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
-# CONFIG_NETFILTER_XT_MATCH_TIME is not set
-# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
-# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
-# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
-# CONFIG_NETFILTER_XT_TARGET_HL is not set
-# CONFIG_NETFILTER_XT_TARGET_IMQ is not set
-# CONFIG_NETFILTER_XT_TARGET_LED is not set
-# CONFIG_NETFILTER_XT_TARGET_MARK is not set
-# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
-# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
-# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
-# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
-# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
-CONFIG_NETFILTER=y
-CONFIG_NET_IPGRE_BROADCAST=y
-# CONFIG_NET_IPGRE is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_ISA is not set
-# CONFIG_NET_KEY is not set
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_NET_PCI=y
-# CONFIG_NET_PCMCIA is not set
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_NETPOLL is not set
-CONFIG_NET_RADIO=y
-# CONFIG_NETROM is not set
-# CONFIG_NET_SB1000 is not set
-# CONFIG_NET_SCH_ATM is not set
-# CONFIG_NET_SCH_CBQ is not set
-# CONFIG_NET_SCH_CLK_CPU is not set
-# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
-CONFIG_NET_SCH_CLK_JIFFIES=y
-# CONFIG_NET_SCH_DRR is not set
-# CONFIG_NET_SCH_DSMARK is not set
-CONFIG_NET_SCHED=y
-# CONFIG_NET_SCH_ESFQ is not set
-CONFIG_NET_SCH_ESFQ_NFCT=y
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_NET_SCH_GRED is not set
-# CONFIG_NET_SCH_HFSC is not set
-# CONFIG_NET_SCH_HTB is not set
-# CONFIG_NET_SCH_INGRESS is not set
-# CONFIG_NET_SCH_MULTIQ is not set
-# CONFIG_NET_SCH_NETEM is not set
-# CONFIG_NET_SCH_PRIO is not set
-# CONFIG_NET_SCH_RED is not set
-# CONFIG_NET_SCH_RR is not set
-# CONFIG_NET_SCH_SFQ is not set
-# CONFIG_NET_SCH_TBF is not set
-# CONFIG_NET_SCH_TEQL is not set
-# CONFIG_NET_TULIP is not set
-# CONFIG_NET_VENDOR_3COM is not set
-CONFIG_NET_WIRELESS_RTNETLINK=y
-CONFIG_NET_WIRELESS=y
-CONFIG_NETWORK_FILESYSTEMS=y
-# CONFIG_NETWORK_SECMARK is not set
-# CONFIG_NETXEN_NIC is not set
-CONFIG_NET=y
-# CONFIG_NEW_GPIO is not set
-CONFIG_NEW_LEDS=y
-# CONFIG_NF_CONNTRACK_AMANDA is not set
-CONFIG_NF_CONNTRACK_ENABLED=y
-# CONFIG_NF_CONNTRACK_EVENTS is not set
-# CONFIG_NF_CONNTRACK_FTP is not set
-# CONFIG_NF_CONNTRACK_H323 is not set
-# CONFIG_NF_CONNTRACK_IPV4 is not set
-# CONFIG_NF_CONNTRACK_IPV6 is not set
-# CONFIG_NF_CONNTRACK_IRC is not set
-# CONFIG_NF_CONNTRACK is not set
-CONFIG_NF_CONNTRACK_MARK=y
-# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
-# CONFIG_NF_CONNTRACK_PPTP is not set
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-# CONFIG_NF_CONNTRACK_RTSP is not set
-# CONFIG_NF_CONNTRACK_SANE is not set
-# CONFIG_NF_CONNTRACK_SIP is not set
-CONFIG_NF_CONNTRACK_SUPPORT=y
-# CONFIG_NF_CONNTRACK_TFTP is not set
-# CONFIG_NF_CT_ACCT is not set
-# CONFIG_NF_CT_NETLINK is not set
-# CONFIG_NF_CT_PROTO_DCCP is not set
-# CONFIG_NF_CT_PROTO_GRE is not set
-# CONFIG_NF_CT_PROTO_SCTP is not set
-# CONFIG_NF_CT_PROTO_UDPLITE is not set
-# CONFIG_NF_DEFRAG_IPV4 is not set
-# CONFIG_NF_NAT_AMANDA is not set
-# CONFIG_NF_NAT_FTP is not set
-# CONFIG_NF_NAT_H323 is not set
-# CONFIG_NF_NAT_IRC is not set
-# CONFIG_NF_NAT is not set
-CONFIG_NF_NAT_NEEDED=y
-# CONFIG_NF_NAT_PPTP is not set
-# CONFIG_NF_NAT_PROTO_GRE is not set
-# CONFIG_NF_NAT_RTSP is not set
-# CONFIG_NF_NAT_SIP is not set
-# CONFIG_NF_NAT_SNMP_BASIC is not set
-# CONFIG_NF_NAT_TFTP is not set
-# CONFIG_NFS_ACL_SUPPORT is not set
-CONFIG_NFS_COMMON=y
-# CONFIG_NFS_DIRECTIO is not set
-# CONFIG_NFSD is not set
-CONFIG_NFSD_TCP=y
-# CONFIG_NFSD_V2_ACL is not set
-# CONFIG_NFSD_V3_ACL is not set
-CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V4 is not set
-# CONFIG_NFS_FS is not set
-# CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V3=y
-# CONFIG_NFS_V4_1 is not set
-# CONFIG_NFS_V4 is not set
-# CONFIG_NFTL is not set
-# CONFIG_NILFS2_FS is not set
-CONFIG_NL80211=y
-CONFIG_NLATTR=y
-# CONFIG_NLS_ASCII is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_CODEPAGE_437 is not set
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-# CONFIG_NLS_CODEPAGE_850 is not set
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-CONFIG_NLS_DEFAULT="iso8859-1"
-# CONFIG_NLS is not set
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-# CONFIG_NLS_ISO8859_15 is not set
-# CONFIG_NLS_ISO8859_1 is not set
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_UTF8 is not set
-# CONFIG_NO_HZ is not set
-# CONFIG_NOP_USB_XCEIV is not set
-# CONFIG_NORTEL_HERMES is not set
-# CONFIG_NOZOMI is not set
-# CONFIG_NS83820 is not set
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
-# CONFIG_NVRAM is not set
-# CONFIG_OCF_BENCH is not set
-# CONFIG_OCF_EP80579 is not set
-# CONFIG_OCF_HIFNHIPP is not set
-# CONFIG_OCF_HIFN is not set
-# CONFIG_OCF_IXP4XX is not set
-# CONFIG_OCF_OCF is not set
-# CONFIG_OCF_OCFNULL is not set
-# CONFIG_OCFS2_FS is not set
-# CONFIG_OCF_SAFE is not set
-# CONFIG_OCF_TALITOS is not set
-# CONFIG_OMFS_FS is not set
-# CONFIG_OPROFILE is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_P54_COMMON is not set
-CONFIG_PACKET_MMAP=y
-CONFIG_PACKET=y
-# CONFIG_PAGE_SIZE_16KB is not set
-# CONFIG_PAGE_SIZE_32KB is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_64KB is not set
-# CONFIG_PAGE_SIZE_8KB is not set
-# CONFIG_PANTHERLORD_FF is not set
-# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_PC is not set
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_PATA_ALI is not set
-# CONFIG_PATA_AMD is not set
-# CONFIG_PATA_ARTOP is not set
-# CONFIG_PATA_ATIIXP is not set
-# CONFIG_PATA_CMD640_PCI is not set
-# CONFIG_PATA_CMD64X is not set
-# CONFIG_PATA_CS5520 is not set
-# CONFIG_PATA_CS5530 is not set
-# CONFIG_PATA_CS5535 is not set
-# CONFIG_PATA_CS5536 is not set
-# CONFIG_PATA_CYPRESS is not set
-# CONFIG_PATA_EFAR is not set
-# CONFIG_PATA_HPT366 is not set
-# CONFIG_PATA_HPT37X is not set
-# CONFIG_PATA_HPT3X2N is not set
-# CONFIG_PATA_HPT3X3 is not set
-# CONFIG_PATA_ISAPNP is not set
-# CONFIG_PATA_IT8213 is not set
-# CONFIG_PATA_IT821X is not set
-# CONFIG_PATA_JMICRON is not set
-# CONFIG_PATA_LEGACY is not set
-# CONFIG_PATA_MARVELL is not set
-# CONFIG_PATA_MPIIX is not set
-# CONFIG_PATA_NETCELL is not set
-# CONFIG_PATA_NINJA32 is not set
-# CONFIG_PATA_NS87410 is not set
-# CONFIG_PATA_NS87415 is not set
-# CONFIG_PATA_OLDPIIX is not set
-# CONFIG_PATA_OPTIDMA is not set
-# CONFIG_PATA_OPTI is not set
-# CONFIG_PATA_PCMCIA is not set
-# CONFIG_PATA_PDC2027X is not set
-# CONFIG_PATA_PDC_OLD is not set
-# CONFIG_PATA_PLATFORM is not set
-# CONFIG_PATA_QDI is not set
-# CONFIG_PATA_RADISYS is not set
-# CONFIG_PATA_RZ1000 is not set
-# CONFIG_PATA_SC1200 is not set
-# CONFIG_PATA_SCH is not set
-# CONFIG_PATA_SERVERWORKS is not set
-# CONFIG_PATA_SIL680 is not set
-# CONFIG_PATA_SIS is not set
-# CONFIG_PATA_TRIFLEX is not set
-# CONFIG_PATA_VIA is not set
-# CONFIG_PATA_WINBOND is not set
-# CONFIG_PATA_WINBOND_VLB is not set
-# CONFIG_PC300TOO is not set
-# CONFIG_PCCARD is not set
-# CONFIG_PCF8575 is not set
-# CONFIG_PCI is not set
-# CONFIG_PCI200SYN is not set
-# CONFIG_PCI_ATMEL is not set
-# CONFIG_PCI_DISABLE_COMMON_QUIRKS is not set
-# CONFIG_PCIEASPM is not set
-# CONFIG_PCI_HERMES is not set
-# CONFIG_PCI_IOV is not set
-# CONFIG_PCI_LEGACY is not set
-# CONFIG_PCI_MSI is not set
-# CONFIG_PCIPCWATCHDOG is not set
-CONFIG_PCI_QUIRKS=y
-# CONFIG_PCI_STUB is not set
-CONFIG_PCI_SYSCALL=y
-# CONFIG_PCMCIA_AHA152X is not set
-# CONFIG_PCMCIA_ATMEL is not set
-# CONFIG_PCMCIA_DEBUG is not set
-# CONFIG_PCMCIA_FDOMAIN is not set
-# CONFIG_PCMCIA_HERMES is not set
-# CONFIG_PCMCIA_IOCTL is not set
-# CONFIG_PCMCIA is not set
-# CONFIG_PCMCIA_LOAD_CIS is not set
-# CONFIG_PCMCIA_NETWAVE is not set
-# CONFIG_PCMCIA_NINJA_SCSI is not set
-# CONFIG_PCMCIA_QLOGIC is not set
-# CONFIG_PCMCIA_RAYCS is not set
-# CONFIG_PCMCIA_SPECTRUM is not set
-# CONFIG_PCMCIA_SYM53C500 is not set
-# CONFIG_PCMCIA_WAVELAN is not set
-# CONFIG_PCMCIA_WL3501 is not set
-# CONFIG_PCNET32 is not set
-# CONFIG_PCSPKR_PLATFORM is not set
-# CONFIG_PD6729 is not set
-# CONFIG_PDC_ADMA is not set
-# CONFIG_PHANTOM is not set
-# CONFIG_PHONE is not set
-# CONFIG_PHONET is not set
-# CONFIG_PHYLIB is not set
-# CONFIG_PHYS_ADDR_T_64BIT is not set
-# CONFIG_PID_NS is not set
-# CONFIG_PLAN9AUTH is not set
-CONFIG_PLIST=y
-# CONFIG_PLX_HERMES is not set
-# CONFIG_PMIC_DA903X is not set
-# CONFIG_PM is not set
-# CONFIG_POHMELFS is not set
-# CONFIG_POSIX_MQUEUE is not set
-# CONFIG_POWER_SUPPLY is not set
-# CONFIG_PPC_16K_PAGES is not set
-# CONFIG_PPC_256K_PAGES is not set
-CONFIG_PPC_4K_PAGES=y
-CONFIG_PPC4xx_GPIO=y
-# CONFIG_PPC_64K_PAGES is not set
-# CONFIG_PPC_EMULATED_STATS is not set
-# CONFIG_PPP_ASYNC is not set
-# CONFIG_PPP_BSDCOMP is not set
-# CONFIG_PPP_DEFLATE is not set
-CONFIG_PPP_FILTER=y
-# CONFIG_PPP is not set
-# CONFIG_PPP_MPPE is not set
-CONFIG_PPP_MULTILINK=y
-# CONFIG_PPPOATM is not set
-# CONFIG_PPPOE is not set
-# CONFIG_PPPOL2TP is not set
-# CONFIG_PPP_SYNC_TTY is not set
-# CONFIG_PPS is not set
-# CONFIG_PREEMPT is not set
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_RCU is not set
-# CONFIG_PREEMPT_RCU_TRACE is not set
-# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_PRINTK_TIME is not set
-CONFIG_PRINTK=y
-# CONFIG_PRISM2_USB is not set
-# CONFIG_PRISM54 is not set
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-# CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_PROC_SYSCTL=y
-# CONFIG_PROFILING is not set
-# CONFIG_QEMU is not set
-# CONFIG_QLA3XXX is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QSEMI_PHY is not set
-# CONFIG_QUOTA is not set
-# CONFIG_R3964 is not set
-# CONFIG_R6040 is not set
-# CONFIG_R8169 is not set
-# CONFIG_RADIO_ADAPTERS is not set
-# CONFIG_RADIO_AZTECH is not set
-# CONFIG_RADIO_CADET is not set
-# CONFIG_RADIO_GEMTEK is not set
-# CONFIG_RADIO_GEMTEK_PCI is not set
-# CONFIG_RADIO_MAESTRO is not set
-# CONFIG_RADIO_MAXIRADIO is not set
-# CONFIG_RADIO_RTRACK2 is not set
-# CONFIG_RADIO_RTRACK is not set
-# CONFIG_RADIO_SF16FMI is not set
-# CONFIG_RADIO_SF16FMR2 is not set
-# CONFIG_RADIO_TERRATEC is not set
-# CONFIG_RADIO_TRUST is not set
-# CONFIG_RADIO_TYPHOON is not set
-# CONFIG_RADIO_ZOLTRIX is not set
-# CONFIG_RAID_ATTRS is not set
-CONFIG_RAMFS=y
-# CONFIG_RAW_DRIVER is not set
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-# CONFIG_RD_BZIP2 is not set
-# CONFIG_RDC_17F3101X is not set
-# CONFIG_RD_GZIP is not set
-CONFIG_RD_LZMA=y
-# CONFIG_RD_LZO is not set
-# CONFIG_REALTEK_PHY is not set
-# CONFIG_REDWOOD is not set
-# CONFIG_REGULATOR_BQ24022 is not set
-# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
-# CONFIG_REGULATOR is not set
-# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_REISERFS_FS_XATTR is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-# CONFIG_RELAY is not set
-# CONFIG_RESOURCES_64BIT is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_RFKILL_INPUT is not set
-# CONFIG_RFKILL is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_ROSE is not set
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
-# CONFIG_RT2860 is not set
-# CONFIG_RT2870 is not set
-# CONFIG_RT2X00 is not set
-# CONFIG_RT3070 is not set
-# CONFIG_RTC_CLASS is not set
-# CONFIG_RTC_DEBUG is not set
-# CONFIG_RTC_DRV_BQ4802 is not set
-CONFIG_RTC_DRV_CMOS=y
-# CONFIG_RTC_DRV_DS1286 is not set
-# CONFIG_RTC_DRV_DS1305 is not set
-# CONFIG_RTC_DRV_DS1307 is not set
-# CONFIG_RTC_DRV_DS1374 is not set
-# CONFIG_RTC_DRV_DS1390 is not set
-# CONFIG_RTC_DRV_DS1511 is not set
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_DS1742 is not set
-# CONFIG_RTC_DRV_DS3234 is not set
-# CONFIG_RTC_DRV_FM3130 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
-# CONFIG_RTC_DRV_M41T80 is not set
-# CONFIG_RTC_DRV_M41T94 is not set
-# CONFIG_RTC_DRV_M48T35 is not set
-# CONFIG_RTC_DRV_M48T59 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_MAX6900 is not set
-# CONFIG_RTC_DRV_MAX6902 is not set
-# CONFIG_RTC_DRV_PCF50606 is not set
-# CONFIG_RTC_DRV_PCF8563 is not set
-# CONFIG_RTC_DRV_PCF8583 is not set
-# CONFIG_RTC_DRV_R9701 is not set
-# CONFIG_RTC_DRV_RS5C348 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set
-# CONFIG_RTC_DRV_RTC7301 is not set
-# CONFIG_RTC_DRV_RX8025 is not set
-# CONFIG_RTC_DRV_RX8581 is not set
-# CONFIG_RTC_DRV_S35390A is not set
-# CONFIG_RTC_DRV_STK17TA8 is not set
-# CONFIG_RTC_DRV_TEST is not set
-# CONFIG_RTC_DRV_V3020 is not set
-# CONFIG_RTC_DRV_X1205 is not set
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_HCTOSYS=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_LIB=y
-# CONFIG_RTL8180 is not set
-# CONFIG_RTL8187 is not set
-# CONFIG_RTL8187SE is not set
-# CONFIG_RTL8192SU is not set
-# CONFIG_RTL8306_PHY is not set
-# CONFIG_RTL8366_SMI is not set
-# CONFIG_RTL8366S_PHY_DEBUG_FS is not set
-# CONFIG_RTL8366S_PHY is not set
-# CONFIG_RTL8366RB_PHY is not set
-CONFIG_RT_MUTEXES=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_S2IO is not set
-# CONFIG_SAMPLES is not set
-# CONFIG_SATA_AHCI is not set
-# CONFIG_SATA_INIC162X is not set
-# CONFIG_SATA_MV is not set
-# CONFIG_SATA_NV is not set
-# CONFIG_SATA_PMP is not set
-# CONFIG_SATA_PROMISE is not set
-# CONFIG_SATA_QSTOR is not set
-# CONFIG_SATA_SIL24 is not set
-# CONFIG_SATA_SIL is not set
-# CONFIG_SATA_SIS is not set
-# CONFIG_SATA_SVW is not set
-# CONFIG_SATA_SX4 is not set
-# CONFIG_SATA_ULI is not set
-# CONFIG_SATA_VIA is not set
-# CONFIG_SATA_VITESSE is not set
-# CONFIG_SC92031 is not set
-# CONFIG_SCC is not set
-# CONFIG_SCHED_BFS is not set
-CONFIG_SCHED_CFS=y
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_7000FASST is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_AHA152X is not set
-# CONFIG_SCSI_AHA1542 is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-# CONFIG_SCSI_AIC94XX is not set
-# CONFIG_SCSI_ARCMSR is not set
-# CONFIG_SCSI_BNX2_ISCSI is not set
-# CONFIG_SCSI_BUSLOGIC is not set
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_DC390T is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_DH is not set
-CONFIG_SCSI_DMA=y
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_DPT_I2O is not set
-# CONFIG_SCSI_DTC3280 is not set
-# CONFIG_SCSI_EATA is not set
-# CONFIG_SCSI_ESP_CORE is not set
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
-# CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_IN2000 is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_IPR is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
-CONFIG_SCSI_LOWLEVEL=y
-# CONFIG_SCSI_LPFC is not set
-# CONFIG_SCSI_MPT2SAS is not set
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_MVSAS is not set
-# CONFIG_SCSI_MVSAS_DEBUG is not set
-# CONFIG_SCSI_NCR53C406A is not set
-# CONFIG_SCSI_NETLINK is not set
-# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_OSD_INITIATOR is not set
-# CONFIG_SCSI_PAS16 is not set
-CONFIG_SCSI_PROC_FS=y
-# CONFIG_SCSI_PSI240I is not set
-# CONFIG_SCSI_QLA_FC is not set
-# CONFIG_SCSI_QLA_ISCSI is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLOGIC_FAS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
-# CONFIG_SCSI_SAS_LIBSAS is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-# CONFIG_SCSI_SEAGATE is not set
-# CONFIG_SCSI_SPI_ATTRS is not set
-# CONFIG_SCSI_SRP_ATTRS is not set
-# CONFIG_SCSI_SRP is not set
-# CONFIG_SCSI_STEX is not set
-# CONFIG_SCSI_SYM53C416 is not set
-# CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_T128 is not set
-# CONFIG_SCSI_TGT is not set
-# CONFIG_SCSI_U14_34F is not set
-# CONFIG_SCSI_ULTRASTOR is not set
-CONFIG_SCSI_WAIT_SCAN=m
-# CONFIG_SECCOMP is not set
-# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-# CONFIG_SECURITYFS is not set
-# CONFIG_SECURITY is not set
-CONFIG_SELECT_MEMORY_MODEL=y
-# CONFIG_SENSORS_ABITUGURU3 is not set
-# CONFIG_SENSORS_ABITUGURU is not set
-# CONFIG_SENSORS_AD7414 is not set
-# CONFIG_SENSORS_AD7418 is not set
-# CONFIG_SENSORS_ADCXX is not set
-# CONFIG_SENSORS_ADM1021 is not set
-# CONFIG_SENSORS_ADM1025 is not set
-# CONFIG_SENSORS_ADM1026 is not set
-# CONFIG_SENSORS_ADM1029 is not set
-# CONFIG_SENSORS_ADM1031 is not set
-# CONFIG_SENSORS_ADM9240 is not set
-# CONFIG_SENSORS_ADS7828 is not set
-# CONFIG_SENSORS_ADT7462 is not set
-# CONFIG_SENSORS_ADT7470 is not set
-# CONFIG_SENSORS_ADT7473 is not set
-# CONFIG_SENSORS_ADT7475 is not set
-# CONFIG_SENSORS_APPLESMC is not set
-# CONFIG_SENSORS_ASB100 is not set
-# CONFIG_SENSORS_ATK0110 is not set
-# CONFIG_SENSORS_ATXP1 is not set
-# CONFIG_SENSORS_CORETEMP is not set
-# CONFIG_SENSORS_DME1737 is not set
-# CONFIG_SENSORS_DS1337 is not set
-# CONFIG_SENSORS_DS1374 is not set
-# CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_EEPROM is not set
-# CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_F71882FG is not set
-# CONFIG_SENSORS_F75375S is not set
-# CONFIG_SENSORS_FSCHER is not set
-# CONFIG_SENSORS_FSCHMD is not set
-# CONFIG_SENSORS_FSCPOS is not set
-# CONFIG_SENSORS_G760A is not set
-# CONFIG_SENSORS_GL518SM is not set
-# CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_HDAPS is not set
-# CONFIG_SENSORS_I5K_AMB is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_K8TEMP is not set
-# CONFIG_SENSORS_LIS3LV02D is not set
-# CONFIG_SENSORS_LIS3_SPI is not set
-# CONFIG_SENSORS_LM63 is not set
-# CONFIG_SENSORS_LM70 is not set
-# CONFIG_SENSORS_LM75 is not set
-# CONFIG_SENSORS_LM77 is not set
-# CONFIG_SENSORS_LM78 is not set
-# CONFIG_SENSORS_LM80 is not set
-# CONFIG_SENSORS_LM83 is not set
-# CONFIG_SENSORS_LM85 is not set
-# 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_LM95241 is not set
-# CONFIG_SENSORS_LTC4215 is not set
-# CONFIG_SENSORS_LTC4245 is not set
-# CONFIG_SENSORS_M41T00 is not set
-# CONFIG_SENSORS_MAX1111 is not set
-# CONFIG_SENSORS_MAX1619 is not set
-# CONFIG_SENSORS_MAX6650 is not set
-# CONFIG_SENSORS_MAX6875 is not set
-# CONFIG_SENSORS_PC87360 is not set
-# CONFIG_SENSORS_PC87427 is not set
-# CONFIG_SENSORS_PCA9539 is not set
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_SENSORS_SHT15 is not set
-# CONFIG_SENSORS_SIS5595 is not set
-# CONFIG_SENSORS_SMSC47B397 is not set
-# CONFIG_SENSORS_SMSC47M192 is not set
-# CONFIG_SENSORS_SMSC47M1 is not set
-# CONFIG_SENSORS_THMC50 is not set
-# CONFIG_SENSORS_TMP401 is not set
-# CONFIG_SENSORS_TSL2550 is not set
-# CONFIG_SENSORS_VIA686A is not set
-# CONFIG_SENSORS_VT1211 is not set
-# CONFIG_SENSORS_VT8231 is not set
-# CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83781D is not set
-# CONFIG_SENSORS_W83791D is not set
-# CONFIG_SENSORS_W83792D is not set
-# CONFIG_SENSORS_W83793 is not set
-# CONFIG_SENSORS_W83L785TS is not set
-# CONFIG_SENSORS_W83L786NG is not set
-CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_SERIAL_8250_CS is not set
-CONFIG_SERIAL_8250_NR_UARTS=2
-# CONFIG_SERIAL_8250_PCI is not set
-CONFIG_SERIAL_8250_RUNTIME_UARTS=2
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_CORE=y
-# CONFIG_SERIAL_JSM is not set
-# CONFIG_SERIAL_MAX3100 is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
-# CONFIG_SERIAL_UARTLITE is not set
-# CONFIG_SERIO is not set
-# CONFIG_SGI_IOC4 is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_SHAPER is not set
-CONFIG_SHMEM=y
-CONFIG_SIGNALFD=y
-# CONFIG_SIMPLE_GPIO is not set
-# CONFIG_SIS190 is not set
-# CONFIG_SIS900 is not set
-# CONFIG_SK98LIN is not set
-# CONFIG_SKGE is not set
-# CONFIG_SKY2_DEBUG is not set
-# CONFIG_SKY2 is not set
-CONFIG_SLABINFO=y
-CONFIG_SLAB=y
-# CONFIG_SLHC is not set
-# CONFIG_SLICOSS is not set
-# CONFIG_SLIP is not set
-# CONFIG_SLOB is not set
-# CONFIG_SLOW_WORK is not set
-# CONFIG_SLUB_DEBUG is not set
-# CONFIG_SLUB is not set
-# CONFIG_SMARTJOYPLUS_FF is not set
-# CONFIG_SMB_FS is not set
-# CONFIG_SMB_NLS_DEFAULT is not set
-# CONFIG_SMC911X is not set
-# CONFIG_SMC91X is not set
-# CONFIG_SMP is not set
-# CONFIG_SMSC911X is not set
-# CONFIG_SMSC9420 is not set
-# CONFIG_SMSC_PHY is not set
-# CONFIG_SND_AC97_POWER_SAVE is not set
-# CONFIG_SND_AD1816A is not set
-# CONFIG_SND_AD1848 is not set
-# CONFIG_SND_AD1889 is not set
-# CONFIG_SND_ADLIB is not set
-# CONFIG_SND_ALI5451 is not set
-# CONFIG_SND_ALS100 is not set
-# CONFIG_SND_ALS300 is not set
-# CONFIG_SND_ALS4000 is not set
-# CONFIG_SND_ARM is not set
-# CONFIG_SND_ATIIXP is not set
-# CONFIG_SND_ATIIXP_MODEM is not set
-# CONFIG_SND_AU8810 is not set
-# CONFIG_SND_AU8820 is not set
-# CONFIG_SND_AU8830 is not set
-# CONFIG_SND_AW2 is not set
-# CONFIG_SND_AZT2320 is not set
-# CONFIG_SND_AZT3328 is not set
-# CONFIG_SND_BT87X is not set
-# CONFIG_SND_CA0106 is not set
-# CONFIG_SND_CMI8330 is not set
-# CONFIG_SND_CMIPCI is not set
-# CONFIG_SND_CS4231 is not set
-# CONFIG_SND_CS4232 is not set
-# CONFIG_SND_CS4236 is not set
-# CONFIG_SND_CS4281 is not set
-# CONFIG_SND_CS46XX is not set
-# CONFIG_SND_CS5530 is not set
-# CONFIG_SND_CS5535AUDIO is not set
-# CONFIG_SND_CTXFI is not set
-# CONFIG_SND_DARLA20 is not set
-# CONFIG_SND_DARLA24 is not set
-# CONFIG_SND_DEBUG is not set
-CONFIG_SND_DRIVERS=y
-# CONFIG_SND_DT019X is not set
-# CONFIG_SND_DUMMY is not set
-# CONFIG_SND_DYNAMIC_MINORS is not set
-# CONFIG_SND_ECHO3G is not set
-# CONFIG_SND_EMU10K1 is not set
-# CONFIG_SND_EMU10K1X is not set
-# CONFIG_SND_ENS1370 is not set
-# CONFIG_SND_ENS1371 is not set
-# CONFIG_SND_ES1688 is not set
-# CONFIG_SND_ES18XX is not set
-# CONFIG_SND_ES1938 is not set
-# CONFIG_SND_ES1968 is not set
-# CONFIG_SND_ES968 is not set
-# CONFIG_SND_FM801 is not set
-# CONFIG_SND_GINA20 is not set
-# CONFIG_SND_GINA24 is not set
-# CONFIG_SND_GUSCLASSIC is not set
-# CONFIG_SND_GUSEXTREME is not set
-# CONFIG_SND_GUSMAX is not set
-# CONFIG_SND_HDA_INTEL is not set
-# CONFIG_SND_HDSP is not set
-# CONFIG_SND_HDSPM is not set
-# CONFIG_SND_HIFIER is not set
-# CONFIG_SND_HRTIMER is not set
-# CONFIG_SND_HWDEP is not set
-# CONFIG_SND_ICE1712 is not set
-# CONFIG_SND_ICE1724 is not set
-# CONFIG_SND_INDIGODJ is not set
-# CONFIG_SND_INDIGODJX is not set
-# CONFIG_SND_INDIGOIO is not set
-# CONFIG_SND_INDIGOIOX is not set
-# CONFIG_SND_INDIGO is not set
-# CONFIG_SND_INTEL8X0 is not set
-# CONFIG_SND_INTEL8X0M is not set
-# CONFIG_SND_INTERWAVE is not set
-# CONFIG_SND_INTERWAVE_STB is not set
-# CONFIG_SND_ISA is not set
-# CONFIG_SND is not set
-# CONFIG_SND_KORG1212 is not set
-# CONFIG_SND_LAYLA20 is not set
-# CONFIG_SND_LAYLA24 is not set
-# CONFIG_SND_LX6464ES is not set
-# CONFIG_SND_MAESTRO3 is not set
-# CONFIG_SND_MIA is not set
-# CONFIG_SND_MIPS is not set
-# CONFIG_SND_MIRO is not set
-# CONFIG_SND_MIXART is not set
-# CONFIG_SND_MIXER_OSS is not set
-# CONFIG_SND_MONA is not set
-# CONFIG_SND_MPU401 is not set
-# CONFIG_SND_MTPAV is not set
-# CONFIG_SND_NM256 is not set
-# CONFIG_SND_OPL3SA2 is not set
-# CONFIG_SND_OPTI92X_AD1848 is not set
-# CONFIG_SND_OPTI92X_CS4231 is not set
-# CONFIG_SND_OPTI93X is not set
-CONFIG_SND_OSSEMUL=y
-# CONFIG_SND_OXYGEN is not set
-CONFIG_SND_PCI=y
-# CONFIG_SND_PCMCIA is not set
-# CONFIG_SND_PCM is not set
-# CONFIG_SND_PCM_OSS is not set
-CONFIG_SND_PCM_OSS_PLUGINS=y
-# CONFIG_SND_PCXHR is not set
-# CONFIG_SND_PDAUDIOCF is not set
-# CONFIG_SND_RAWMIDI is not set
-# CONFIG_SND_RIPTIDE is not set
-# CONFIG_SND_RME32 is not set
-# CONFIG_SND_RME9652 is not set
-# CONFIG_SND_RME96 is not set
-# CONFIG_SND_RTCTIMER is not set
-# CONFIG_SND_SB16 is not set
-# CONFIG_SND_SB8 is not set
-# CONFIG_SND_SBAWE is not set
-# CONFIG_SND_SEQUENCER is not set
-# CONFIG_SND_SERIAL_U16550 is not set
-# CONFIG_SND_SIS7019 is not set
-# CONFIG_SND_SGALAXY is not set
-# CONFIG_SND_SOC is not set
-# CONFIG_SND_SONICVIBES is not set
-# CONFIG_SND_SPI is not set
-# CONFIG_SND_SSCAPE is not set
-# CONFIG_SND_SUPPORT_OLD_API is not set
-# CONFIG_SND_TIMER is not set
-# CONFIG_SND_TRIDENT is not set
-# CONFIG_SND_USB_AUDIO is not set
-# CONFIG_SND_USB_CAIAQ is not set
-# CONFIG_SND_USB_US122L is not set
-# CONFIG_SND_USB_USX2Y is not set
-CONFIG_SND_USB=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VIA82XX is not set
-# CONFIG_SND_VIA82XX_MODEM is not set
-# CONFIG_SND_VIRTUOSO is not set
-# CONFIG_SND_VX222 is not set
-# CONFIG_SND_VXPOCKET is not set
-# CONFIG_SND_WAVEFRONT is not set
-# CONFIG_SND_YMFPCI is not set
-# CONFIG_SNI_RM is not set
-# CONFIG_SOC_CAMERA is not set
-# CONFIG_SOFT_WATCHDOG is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_SONY_LAPTOP is not set
-# CONFIG_SONYPI is not set
-# CONFIG_SOUND is not set
-# CONFIG_SOUND_PRIME is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-# CONFIG_SPI_AT25 is not set
-# CONFIG_SPI_DEBUG is not set
-# CONFIG_SPI_GPIO_OLD is not set
-# CONFIG_SPI is not set
-# CONFIG_SPI_MASTER is not set
-# CONFIG_SPI_ORION is not set
-# CONFIG_SPI_TLE62X0 is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-CONFIG_SQUASHFS_LZMA=y
-CONFIG_SQUASHFS_SUPPORT_ZLIB=y
-# CONFIG_SQUASHFS_VMALLOC is not set
-CONFIG_SQUASHFS=y
-# CONFIG_SSB_BLOCKIO is not set
-# CONFIG_SSB_DEBUG is not set
-# CONFIG_SSB is not set
-# CONFIG_SSB_PCMCIAHOST is not set
-CONFIG_SSB_POSSIBLE=y
-# CONFIG_SSB_SILENT is not set
-# CONFIG_SSFDC is not set
-# CONFIG_STACK_TRACER is not set
-CONFIG_STACKTRACE_SUPPORT=y
-# CONFIG_STAGING_EXCLUDE_BUILD is not set
-CONFIG_STAGING=y
-CONFIG_STANDALONE=y
-CONFIG_STDBINUTILS=y
-# CONFIG_STE10XP is not set
-CONFIG_STP=y
-CONFIG_STRIP_ASM_SYMS=y
-# CONFIG_STRIP is not set
-# CONFIG_SUNDANCE is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_SUNRPC_BIND34 is not set
-# CONFIG_SUNRPC_GSS is not set
-# CONFIG_SUNRPC is not set
-# CONFIG_SUNRPC_REGISTER_V4 is not set
-CONFIG_SUSPEND_UP_POSSIBLE=y
-CONFIG_SWAP=y
-# CONFIG_SWCONFIG is not set
-# CONFIG_SYNCLINK_CS is not set
-CONFIG_SYN_COOKIES=y
-CONFIG_SYSCTL_SYSCALL_CHECK=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_SYSCTL=y
-# CONFIG_SYSFS_DEPRECATED is not set
-# CONFIG_SYSFS_DEPRECATED_V2 is not set
-CONFIG_SYSFS=y
-# CONFIG_SYS_HYPERVISOR is not set
-# CONFIG_SYSV68_PARTITION is not set
-# CONFIG_SYSV_FS is not set
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_SYSVIPC=y
-# CONFIG_TASKSTATS is not set
-# CONFIG_TCG_TPM is not set
-# CONFIG_TCIC is not set
-CONFIG_TCP_CONG_ADVANCED=y
-# CONFIG_TCP_CONG_BIC is not set
-# CONFIG_TCP_CONG_CUBIC is not set
-# CONFIG_TCP_CONG_HSTCP is not set
-# CONFIG_TCP_CONG_HTCP is not set
-# CONFIG_TCP_CONG_HYBLA is not set
-# CONFIG_TCP_CONG_ILLINOIS is not set
-# CONFIG_TCP_CONG_LP is not set
-# CONFIG_TCP_CONG_SCALABLE is not set
-# CONFIG_TCP_CONG_VEGAS is not set
-# CONFIG_TCP_CONG_VENO is not set
-CONFIG_TCP_CONG_WESTWOOD=y
-# CONFIG_TCP_CONG_YEAH is not set
-# CONFIG_TCP_MD5SIG is not set
-# CONFIG_TEXTSEARCH_BM is not set
-# CONFIG_TEXTSEARCH_FSM is not set
-# CONFIG_TEXTSEARCH_KMP is not set
-CONFIG_TEXTSEARCH=y
-# CONFIG_THERMAL_HWMON is not set
-# CONFIG_THERMAL is not set
-# CONFIG_THRUSTMASTER_FF is not set
-CONFIG_TICK_ONESHOT=y
-# CONFIG_TIFM_CORE is not set
-# CONFIG_TIGON3 is not set
-CONFIG_TIMERFD=y
-# CONFIG_TINY_SHMEM is not set
-# CONFIG_TIPC is not set
-# CONFIG_TLAN is not set
-# CONFIG_TMD_HERMES is not set
-# CONFIG_TMPFS_POSIX_ACL is not set
-CONFIG_TMPFS=y
-# CONFIG_TOUCHSCREEN_AD7877 is not set
-# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
-# CONFIG_TOUCHSCREEN_AD7879 is not set
-# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
-# CONFIG_TOUCHSCREEN_ADS7846 is not set
-# CONFIG_TOUCHSCREEN_EETI is not set
-# CONFIG_TOUCHSCREEN_ELO is not set
-# CONFIG_TOUCHSCREEN_FILTER is not set
-# CONFIG_TOUCHSCREEN_FUJITSU is not set
-# CONFIG_TOUCHSCREEN_GUNZE is not set
-# CONFIG_TOUCHSCREEN_INEXIO is not set
-# CONFIG_TOUCHSCREEN_MK712 is not set
-# CONFIG_TOUCHSCREEN_MTOUCH is not set
-# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-# CONFIG_TOUCHSCREEN_S3C2410 is not set
-# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
-# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-# CONFIG_TOUCHSCREEN_TSC2007 is not set
-# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-# CONFIG_TOUCHSCREEN_W90X900 is not set
-# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
-# CONFIG_TPS65010 is not set
-# CONFIG_TRACE_BRANCH_PROFILING is not set
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_TRACING_SUPPORT=y
-# CONFIG_TRANZPORT is not set
-# CONFIG_TREE_RCU is not set
-# CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_TR is not set
-# CONFIG_TUNER_3036 is not set
-# CONFIG_TUNER_TEA5761 is not set
-# CONFIG_TUN is not set
-# CONFIG_TWL4030_CORE is not set
-# CONFIG_UACCESS_WITH_MEMCPY is not set
-# CONFIG_UCB1400_CORE is not set
-# CONFIG_UDF_FS is not set
-CONFIG_UDF_NLS=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_UFS_FS is not set
-# CONFIG_UIO is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_UNEVICTABLE_LRU is not set
-# CONFIG_UNION_MOUNT is not set
-CONFIG_UNIX98_PTYS=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_UNIX=y
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_USB_ACECAD is not set
-# CONFIG_USB_ACM is not set
-# CONFIG_USB_ADUTUX is not set
-# CONFIG_USB_AIPTEK is not set
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-# CONFIG_USB_APPLEDISPLAY is not set
-# CONFIG_USB_APPLETOUCH is not set
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARMLINUX=y
-# CONFIG_USB_ATI_REMOTE2 is not set
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_ATMEL is not set
-# CONFIG_USB_ATM is not set
-# CONFIG_USB_AUERSWALD is not set
-# CONFIG_USB_BANDWIDTH is not set
-CONFIG_USB_BELKIN=y
-# CONFIG_USB_BERRY_CHARGE is not set
-# CONFIG_USB_C67X00_HCD is not set
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_CPC is not set
-# CONFIG_USB_CXACRU is not set
-# CONFIG_USB_CYPRESS_CY7C63 is not set
-# CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_DABUSB is not set
-# CONFIG_USB_DEBUG is not set
-# CONFIG_USB_DEVICE_CLASS is not set
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DSBR is not set
-# CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_EHCI_HCD_PPC_OF is not set
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-# CONFIG_USB_EHCI_SPLIT_ISO is not set
-# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-# CONFIG_USB_EMI26 is not set
-# CONFIG_USB_EMI62 is not set
-# CONFIG_USB_EPSON2888 is not set
-# CONFIG_USB_ET61X251 is not set
-CONFIG_USB_EZUSB=y
-# CONFIG_USB_FTDI_ELAN is not set
-# CONFIG_USB_GADGET is not set
-# CONFIG_USB_GPIO_VBUS is not set
-# CONFIG_USB_GSPCA_CONEX is not set
-# CONFIG_USB_GSPCA_ETOMS is not set
-# CONFIG_USB_GSPCA_FINEPIX is not set
-# CONFIG_USB_GSPCA is not set
-# CONFIG_USB_GSPCA_MARS is not set
-# CONFIG_USB_GSPCA_MR97310A is not set
-# CONFIG_USB_GSPCA_OV519 is not set
-# CONFIG_USB_GSPCA_OV534 is not set
-# CONFIG_USB_GSPCA_PAC207 is not set
-# CONFIG_USB_GSPCA_PAC7311 is not set
-CONFIG_USB_GSPCA_SN9C20X_EVDEV=y
-# CONFIG_USB_GSPCA_SN9C20X is not set
-# CONFIG_USB_GSPCA_SONIXB is not set
-# CONFIG_USB_GSPCA_SONIXJ is not set
-# CONFIG_USB_GSPCA_SPCA500 is not set
-# CONFIG_USB_GSPCA_SPCA501 is not set
-# CONFIG_USB_GSPCA_SPCA505 is not set
-# CONFIG_USB_GSPCA_SPCA506 is not set
-# CONFIG_USB_GSPCA_SPCA508 is not set
-# CONFIG_USB_GSPCA_SPCA561 is not set
-# CONFIG_USB_GSPCA_SQ905C is not set
-# CONFIG_USB_GSPCA_SQ905 is not set
-# CONFIG_USB_GSPCA_STK014 is not set
-# CONFIG_USB_GSPCA_SUNPLUS is not set
-# CONFIG_USB_GSPCA_T613 is not set
-# CONFIG_USB_GSPCA_TV8532 is not set
-# CONFIG_USB_GSPCA_VC032X is not set
-# CONFIG_USB_GSPCA_ZC3XX is not set
-# CONFIG_USB_HIDDEV is not set
-# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-CONFIG_USB_HIDINPUT=y
-# CONFIG_USB_HID is not set
-# CONFIG_USB_HSO is not set
-# CONFIG_USB_HWA_HCD is not set
-# CONFIG_USB_IBMCAM is not set
-# CONFIG_USB_IDMOUSE is not set
-# CONFIG_USB_IOWARRIOR is not set
-# CONFIG_USB_IP_COMMON is not set
-# CONFIG_USB_ISIGHTFW is not set
-# CONFIG_USB is not set
-# CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_ISP1760_HCD is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_KC2190 is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-# CONFIG_USB_KONICAWC is not set
-# CONFIG_USB_LCD is not set
-# CONFIG_USB_LD is not set
-# CONFIG_USB_LED is not set
-# CONFIG_USB_LEGOTOWER is not set
-# CONFIG_USB_LIBUSUAL is not set
-# CONFIG_USB_M5602 is not set
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_MICROTEK is not set
-# CONFIG_USB_MON is not set
-# CONFIG_USB_MOUSE is not set
-# CONFIG_USB_MUSB_HDRC is not set
-# CONFIG_USB_NET_AX8817X is not set
-# CONFIG_USB_NET_CDC_EEM is not set
-# CONFIG_USB_NET_CDCETHER is not set
-# CONFIG_USB_NET_CDC_SUBSET is not set
-# CONFIG_USB_NET_DM9601 is not set
-# CONFIG_USB_NET_GL620A is not set
-# CONFIG_USB_NET_INT51X1 is not set
-# CONFIG_USB_NET_MCS7830 is not set
-# CONFIG_USB_NET_NET1080 is not set
-# CONFIG_USB_NET_PLUSB is not set
-# CONFIG_USB_NET_RNDIS_HOST is not set
-# CONFIG_USB_NET_RNDIS_WLAN is not set
-# CONFIG_USB_NET_SMSC95XX is not set
-# CONFIG_USB_NET_ZAURUS is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN is not set
-# CONFIG_USB_OHCI_HCD is not set
-# CONFIG_USB_OHCI_HCD_PCI is not set
-# CONFIG_USB_OHCI_HCD_PPC_OF is not set
-# CONFIG_USB_OHCI_HCD_PPC_SOC is not set
-# CONFIG_USB_OHCI_HCD_SSB is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-# CONFIG_USB_OTG is not set
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OV511 is not set
-# CONFIG_USB_OXU210HP_HCD is not set
-# CONFIG_USBPCWATCHDOG is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_PHIDGET is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_PWC_INPUT_EVDEV is not set
-# CONFIG_USB_QUICKCAM_MESSENGER is not set
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_RIO500 is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_S2255 is not set
-# CONFIG_USB_SE401 is not set
-# CONFIG_USB_SERIAL_AIRCABLE is not set
-# CONFIG_USB_SERIAL_AIRPRIME is not set
-# CONFIG_USB_SERIAL_ARK3116 is not set
-# CONFIG_USB_SERIAL_BELKIN is not set
-# CONFIG_USB_SERIAL_CH341 is not set
-# CONFIG_USB_SERIAL_CP2101 is not set
-# CONFIG_USB_SERIAL_CP210X is not set
-# CONFIG_USB_SERIAL_CYBERJACK is not set
-# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
-# CONFIG_USB_SERIAL_DEBUG is not set
-# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
-# CONFIG_USB_SERIAL_EDGEPORT is not set
-# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
-# CONFIG_USB_SERIAL_EMPEG is not set
-# CONFIG_USB_SERIAL_FTDI_SIO is not set
-# CONFIG_USB_SERIAL_FUNSOFT is not set
-# CONFIG_USB_SERIAL_GARMIN is not set
-CONFIG_USB_SERIAL_GENERIC=y
-# CONFIG_USB_SERIAL_HP4X is not set
-# CONFIG_USB_SERIAL_IPAQ is not set
-# CONFIG_USB_SERIAL_IPW is not set
-# CONFIG_USB_SERIAL_IR is not set
-# CONFIG_USB_SERIAL is not set
-# CONFIG_USB_SERIAL_IUU is not set
-# CONFIG_USB_SERIAL_KEYSPAN is not set
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-# CONFIG_USB_SERIAL_KLSI is not set
-# CONFIG_USB_SERIAL_KOBIL_SCT is not set
-# CONFIG_USB_SERIAL_MCT_U232 is not set
-# CONFIG_USB_SERIAL_MOS7720 is not set
-# CONFIG_USB_SERIAL_MOS7840 is not set
-# CONFIG_USB_SERIAL_MOTOROLA is not set
-# CONFIG_USB_SERIAL_NAVMAN is not set
-# CONFIG_USB_SERIAL_OMNINET is not set
-# CONFIG_USB_SERIAL_OPTICON is not set
-# CONFIG_USB_SERIAL_OPTION is not set
-# CONFIG_USB_SERIAL_OTI6858 is not set
-# CONFIG_USB_SERIAL_PL2303 is not set
-# CONFIG_USB_SERIAL_QUALCOMM is not set
-# CONFIG_USB_SERIAL_QUATECH2 is not set
-# CONFIG_USB_SERIAL_SAFE is not set
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
-# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
-# CONFIG_USB_SERIAL_SPCP8X5 is not set
-# CONFIG_USB_SERIAL_SYMBOL is not set
-# CONFIG_USB_SERIAL_TI is not set
-# CONFIG_USB_SERIAL_VISOR is not set
-# CONFIG_USB_SERIAL_WHITEHEAT is not set
-# CONFIG_USB_SERIAL_XIRCOM is not set
-# CONFIG_USB_SEVSEG is not set
-# CONFIG_USB_SISUSBVGA is not set
-# CONFIG_USB_SL811_HCD is not set
-# CONFIG_USB_SN9C102 is not set
-# CONFIG_USB_SPEEDTOUCH is not set
-# CONFIG_USB_STKWEBCAM is not set
-CONFIG_USB_STORAGE_ALAUDA=y
-# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
-CONFIG_USB_STORAGE_DATAFAB=y
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_DPCM=y
-CONFIG_USB_STORAGE_FREECOM=y
-# CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE is not set
-CONFIG_USB_STORAGE_JUMPSHOT=y
-CONFIG_USB_STORAGE_KARMA=y
-# CONFIG_USB_STORAGE_ONETOUCH is not set
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-# CONFIG_USB_STORAGE_SIERRA is not set
-CONFIG_USB_STORAGE_USBAT=y
-# CONFIG_USB_STV06XX is not set
-# CONFIG_USB_STV680 is not set
-# CONFIG_USB_SUPPORT is not set
-# CONFIG_USB_SUSPEND is not set
-# CONFIG_USB_TEST is not set
-# CONFIG_USB_TMC is not set
-# CONFIG_USB_TOUCHSCREEN is not set
-# CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_UEAGLEATM is not set
-# CONFIG_USB_USBNET is not set
-# CONFIG_USB_USBNET_MII is not set
-# CONFIG_USB_VICAM is not set
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-# CONFIG_USB_VIDEO_CLASS is not set
-# CONFIG_USB_VST is not set
-# CONFIG_USB_W9968CF is not set
-# CONFIG_USB_WACOM is not set
-# CONFIG_USB_WDM is not set
-# CONFIG_USB_WHCI_HCD is not set
-# CONFIG_USB_WUSB_CBAF is not set
-# CONFIG_USB_WUSB is not set
-# CONFIG_USB_XHCI_HCD is not set
-# CONFIG_USB_XPAD is not set
-# CONFIG_USB_XUSBATM is not set
-# CONFIG_USB_YEALINK is not set
-# CONFIG_USB_ZC0301 is not set
-# CONFIG_USB_ZD1201 is not set
-# CONFIG_USB_ZR364XX is not set
-# CONFIG_USE_GENERIC_SMP_HELPERS is not set
-# CONFIG_UTS_NS is not set
-# CONFIG_UWB is not set
-# CONFIG_VETH is not set
-# CONFIG_VFAT_FS is not set
-# CONFIG_VGASTATE is not set
-# CONFIG_VIA_RHINE is not set
-# CONFIG_VIA_VELOCITY is not set
-# CONFIG_VIDEO_ADV7170 is not set
-# CONFIG_VIDEO_ADV7175 is not set
-# CONFIG_VIDEO_ADV7343 is not set
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_ALLOW_V4L1 is not set
-# CONFIG_VIDEO_BT819 is not set
-# CONFIG_VIDEO_BT848 is not set
-# CONFIG_VIDEO_BT856 is not set
-# CONFIG_VIDEO_BT866 is not set
-# CONFIG_VIDEO_CAFE_CCIC is not set
-# CONFIG_VIDEO_CAPTURE_DRIVERS is not set
-# CONFIG_VIDEO_CPIA is not set
-# CONFIG_VIDEO_CS5345 is not set
-# CONFIG_VIDEO_CS53L32A is not set
-# CONFIG_VIDEO_CX231XX is not set
-# CONFIG_VIDEO_CX2341X is not set
-# CONFIG_VIDEO_CX25840 is not set
-# CONFIG_VIDEO_CX88 is not set
-# CONFIG_VIDEO_DEV is not set
-# CONFIG_VIDEO_DPC is not set
-# CONFIG_VIDEO_EM28XX is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIDEO_GO7007 is not set
-# CONFIG_VIDEO_HDPVR is not set
-# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-# CONFIG_VIDEO_HEXIUM_GEMINI is not set
-# CONFIG_VIDEO_HEXIUM_ORION is not set
-# CONFIG_VIDEO_IVTV is not set
-# CONFIG_VIDEO_KS0127 is not set
-# CONFIG_VIDEO_M52790 is not set
-# CONFIG_VIDEO_MEDIA is not set
-# CONFIG_VIDEO_MSP3400 is not set
-# CONFIG_VIDEO_MT9V011 is not set
-# CONFIG_VIDEO_MXB is not set
-# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-# CONFIG_VIDEO_OV7670 is not set
-# CONFIG_VIDEO_OVCAMCHIP is not set
-# CONFIG_VIDEO_PMS is not set
-# CONFIG_VIDEO_PVRUSB2 is not set
-# CONFIG_VIDEO_SAA5246A is not set
-# CONFIG_VIDEO_SAA5249 is not set
-# CONFIG_VIDEO_SAA6588 is not set
-# CONFIG_VIDEO_SAA7110 is not set
-# CONFIG_VIDEO_SAA7111 is not set
-# CONFIG_VIDEO_SAA7114 is not set
-# CONFIG_VIDEO_SAA711X is not set
-# CONFIG_VIDEO_SAA7127 is not set
-# CONFIG_VIDEO_SAA7134 is not set
-# CONFIG_VIDEO_SAA717X is not set
-# CONFIG_VIDEO_SAA7185 is not set
-# CONFIG_VIDEO_SAA7191 is not set
-# CONFIG_VIDEO_SH_MOBILE_CEU is not set
-# CONFIG_VIDEO_STRADIS is not set
-# CONFIG_VIDEO_TCM825X is not set
-# CONFIG_VIDEO_TDA7432 is not set
-# CONFIG_VIDEO_TDA9840 is not set
-# CONFIG_VIDEO_TDA9875 is not set
-# CONFIG_VIDEO_TEA6415C is not set
-# CONFIG_VIDEO_TEA6420 is not set
-# CONFIG_VIDEO_THS7303 is not set
-# CONFIG_VIDEO_TLV320AIC23B is not set
-# CONFIG_VIDEO_TVAUDIO is not set
-# CONFIG_VIDEO_TVP514X is not set
-# CONFIG_VIDEO_TVP5150 is not set
-# CONFIG_VIDEO_UPD64031A is not set
-# CONFIG_VIDEO_UPD64083 is not set
-# CONFIG_VIDEO_USBVISION is not set
-CONFIG_VIDEO_V4L1_COMPAT=y
-# CONFIG_VIDEO_V4L1 is not set
-# CONFIG_VIDEO_V4L2_COMMON is not set
-# CONFIG_VIDEO_V4L2 is not set
-# CONFIG_VIDEO_VIVI is not set
-# CONFIG_VIDEO_VP27SMPX is not set
-# CONFIG_VIDEO_VPX3220 is not set
-# CONFIG_VIDEO_WM8739 is not set
-# CONFIG_VIDEO_WM8775 is not set
-# CONFIG_VIDEO_ZORAN is not set
-# CONFIG_VIRQ_DEBUG is not set
-CONFIG_VIRT_TO_BUS=y
-# CONFIG_VIRTUALIZATION is not set
-# CONFIG_VITESSE_PHY is not set
-# CONFIG_VLAN_8021Q_GVRP is not set
-CONFIG_VLAN_8021Q=y
-# CONFIG_VM_EVENT_COUNTERS is not set
-# CONFIG_VMSPLIT_1G is not set
-# CONFIG_VMSPLIT_2G is not set
-# CONFIG_VMSPLIT_2G_OPT is not set
-# CONFIG_VMSPLIT_3G_OPT is not set
-CONFIG_VMSPLIT_3G=y
-# CONFIG_VT6655 is not set
-# CONFIG_VT is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_W1_CON is not set
-# CONFIG_W1 is not set
-# CONFIG_W1_MASTER_DS1WM is not set
-# CONFIG_W1_MASTER_DS2482 is not set
-# CONFIG_W1_MASTER_DS2490 is not set
-# CONFIG_W1_MASTER_GPIO is not set
-# CONFIG_W1_MASTER_MATROX is not set
-# CONFIG_W1_SLAVE_BQ27000 is not set
-# CONFIG_W1_SLAVE_DS2431 is not set
-# CONFIG_W1_SLAVE_DS2433 is not set
-# CONFIG_W1_SLAVE_DS2760 is not set
-# CONFIG_W1_SLAVE_SMEM is not set
-# CONFIG_W1_SLAVE_THERM is not set
-# CONFIG_W83627HF_WDT is not set
-# CONFIG_W83697HF_WDT is not set
-# CONFIG_W83877F_WDT is not set
-# CONFIG_W83977F_WDT is not set
-# CONFIG_WAN is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_WANXL is not set
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-CONFIG_WATCHDOG=y
-# CONFIG_WDTPCI is not set
-# CONFIG_WIMAX is not set
-CONFIG_WIRELESS_EXT_SYSFS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WIRELESS_OLD_REGULATORY=y
-CONFIG_WIRELESS=y
-CONFIG_WLAN_80211=y
-# CONFIG_WLAN_PRE80211 is not set
-# CONFIG_WORKQUEUE_TRACER is not set
-# CONFIG_WR_PPMC is not set
-# CONFIG_X25 is not set
-# CONFIG_XFRM_IPCOMP is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_USER is not set
-CONFIG_XFRM=y
-# CONFIG_XFS_DEBUG is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_XFS_POSIX_ACL is not set
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_SECURITY is not set
-# CONFIG_XIP_KERNEL is not set
-# CONFIG_YAFFS_FS is not set
-# CONFIG_YAM is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_YENTA is not set
-# CONFIG_YENTA_O2 is not set
-# CONFIG_YENTA_RICOH is not set
-# CONFIG_YENTA_TI is not set
-# CONFIG_YENTA_TOSHIBA is not set
-# CONFIG_ZD1211RW_DEBUG is not set
-# CONFIG_ZD1211RW is not set
-# CONFIG_ZEROPLUS_FF is not set
-# CONFIG_ZISOFS_FS is not set
-CONFIG_ZISOFS=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZONE_DMA_FLAG=1
-CONFIG_ZONE_DMA=y
diff --git a/target/linux/generic-2.6/config-2.6.33 b/target/linux/generic-2.6/config-2.6.33
deleted file mode 100644
index ae80b202a..000000000
--- a/target/linux/generic-2.6/config-2.6.33
+++ /dev/null
@@ -1,2873 +0,0 @@
-# CONFIG_6PACK is not set
-# CONFIG_8139CP is not set
-# CONFIG_8139TOO is not set
-# CONFIG_9P_FS is not set
-# CONFIG_AB3100_CORE is not set
-# CONFIG_AB4500_CORE is not set
-# CONFIG_ACCESSIBILITY is not set
-# CONFIG_ACENIC is not set
-# CONFIG_ACPI_POWER_METER is not set
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_AD525X_DPOT is not set
-# CONFIG_ADAPTEC_STARFIRE is not set
-# CONFIG_ADFS_FS is not set
-# CONFIG_ADM6996_PHY is not set
-# CONFIG_ADM8211 is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AFS_FS is not set
-# CONFIG_AGP is not set
-CONFIG_AIO=y
-# CONFIG_AIRO_CS is not set
-# CONFIG_AIRO is not set
-# CONFIG_ALIM7101_WDT is not set
-# CONFIG_ALTERA_PCIE_CHDMA is not set
-# CONFIG_R8187SE is not set
-# CONFIG_AMD8111_ETH is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ANDROID is not set
-CONFIG_ANON_INODES=y
-# CONFIG_APPLICOM is not set
-# CONFIG_AR8216_PHY is not set
-# CONFIG_AR9170_USB is not set
-# CONFIG_ARCH_AAEC2000 is not set
-# CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_BCMRING is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_DOVE is not set
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_EP93XX is not set
-CONFIG_ARCH_FLATMEM_ENABLE=y
-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_GEMINI is not set
-# CONFIG_ARCH_H720X is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP13XX is not set
-# CONFIG_ARCH_IOP32X is not set
-# CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IXP2000 is not set
-# CONFIG_ARCH_IXP23XX is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_KIRKWOOD is not set
-# CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_L7200 is not set
-# CONFIG_ARCH_LH7A40X is not set
-# CONFIG_ARCH_LOKI is not set
-# CONFIG_ARCH_MMP is not set
-# CONFIG_ARCH_MSM is not set
-# CONFIG_ARCH_MV78XX0 is not set
-# CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_NOMADIK is not set
-# CONFIG_ARCH_NS9XXX is not set
-# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_ORION5X is not set
-# CONFIG_ARCH_PNX4008 is not set
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_RPC is not set
-# CONFIG_ARCH_S3C2410 is not set
-# CONFIG_ARCH_S3C64XX is not set
-# CONFIG_ARCH_S5PC1XX is not set
-# CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_STMP3XXX is not set
-# CONFIG_ARCH_U300 is not set
-# CONFIG_ARCH_U8500 is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_W90X900 is not set
-# CONFIG_ARCNET is not set
-# CONFIG_ARM_UNWIND is not set
-CONFIG_ARPD=y
-# CONFIG_ARTHUR is not set
-CONFIG_ASK_IP_FIB_HASH=y
-# CONFIG_ASUS_OLED is not set
-# CONFIG_ASYNC_TX_DMA is not set
-# CONFIG_AT24 is not set
-# CONFIG_AT76C50X_USB is not set
-# CONFIG_ATA_ACPI is not set
-# CONFIG_ATA_GENERIC is not set
-# CONFIG_ATA is not set
-# CONFIG_ATALK is not set
-# CONFIG_ATA_NONSTANDARD is not set
-# CONFIG_ATA_OVER_ETH is not set
-# CONFIG_ATA_PIIX is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_ATA_SFF=y
-# CONFIG_ATA_VERBOSE_ERROR is not set
-# CONFIG_ATH5K is not set
-# CONFIG_ATH9K is not set
-# CONFIG_ATL1C is not set
-# CONFIG_ATL1E is not set
-# CONFIG_ATL1 is not set
-# CONFIG_ATL2 is not set
-# CONFIG_ATM_AMBASSADOR is not set
-CONFIG_ATM_BR2684_IPFILTER=y
-# CONFIG_ATM_BR2684 is not set
-# CONFIG_ATM_CLIP is not set
-CONFIG_ATM_CLIP_NO_ICMP=y
-# CONFIG_ATM_DRIVERS is not set
-# CONFIG_ATM_DUMMY is not set
-# CONFIG_ATMEL is not set
-# CONFIG_ATM_ENI is not set
-# CONFIG_ATM_FIRESTREAM is not set
-# CONFIG_ATM_FORE200E is not set
-# CONFIG_ATM_FORE200E_MAYBE is not set
-# CONFIG_ATM_HE is not set
-# CONFIG_ATM_HORIZON is not set
-# CONFIG_ATM_IA is not set
-# CONFIG_ATM_IDT77252 is not set
-# CONFIG_ATM is not set
-# CONFIG_ATM_LANAI is not set
-# CONFIG_ATM_LANE is not set
-# CONFIG_ATM_MPOA is not set
-# CONFIG_ATM_NICSTAR is not set
-# CONFIG_ATM_SOLOS is not set
-# CONFIG_ATM_TCP is not set
-# CONFIG_ATM_ZATM is not set
-# CONFIG_AUDIT is not set
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUXDISPLAY is not set
-# CONFIG_AX25_DAMA_SLAVE is not set
-# CONFIG_AX25 is not set
-# CONFIG_AX88796 is not set
-# CONFIG_B3DFG is not set
-# CONFIG_B43 is not set
-# CONFIG_B43LEGACY is not set
-# CONFIG_B44 is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-CONFIG_BASE_FULL=y
-CONFIG_BASE_SMALL=0
-# CONFIG_BASLER_EXCITE is not set
-# CONFIG_BATTERY_BQ27000_HDQ is not set
-# CONFIG_BATTERY_BQ27x00 is not set
-# CONFIG_BATTERY_DS2760 is not set
-# CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_MAX17040 is not set
-# CONFIG_BAYCOM_EPP is not set
-# CONFIG_BAYCOM_PAR is not set
-# CONFIG_BAYCOM_SER_FDX is not set
-# CONFIG_BAYCOM_SER_HDX is not set
-CONFIG_BCM43XX_DEBUG=y
-CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
-# CONFIG_BCM43XX_DMA_MODE is not set
-CONFIG_BCM43XX_DMA=y
-# CONFIG_BCM43XX is not set
-# CONFIG_BCM43XX_PIO_MODE is not set
-CONFIG_BCM43XX_PIO=y
-# CONFIG_BE2ISCSI is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_BINARY_PRINTF is not set
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-# CONFIG_BLINK is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
-# CONFIG_BLK_CPQ_DA is not set
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_BLK_DEV_4DRIVES is not set
-# CONFIG_BLK_DEV_AEC62XX is not set
-# CONFIG_BLK_DEV_ALI14XX is not set
-# CONFIG_BLK_DEV_ALI15X3 is not set
-# CONFIG_BLK_DEV_AMD74XX is not set
-# CONFIG_BLK_DEV_ATIIXP is not set
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_BLK_DEV_CMD640 is not set
-# CONFIG_BLK_DEV_CMD64X is not set
-# CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_CS5520 is not set
-# CONFIG_BLK_DEV_CS5530 is not set
-# CONFIG_BLK_DEV_CS5535 is not set
-# CONFIG_BLK_DEV_CS5536 is not set
-# CONFIG_BLK_DEV_CY82C693 is not set
-# CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_DELKIN is not set
-# CONFIG_BLK_DEV_DTC2278 is not set
-# CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_DEV_GENERIC is not set
-# CONFIG_BLK_DEV_HD_IDE is not set
-# CONFIG_BLK_DEV_HD is not set
-# CONFIG_BLK_DEV_HD_ONLY is not set
-# CONFIG_BLK_DEV_HPT34X is not set
-# CONFIG_BLK_DEV_HPT366 is not set
-# CONFIG_BLK_DEV_HT6560B is not set
-# CONFIG_BLK_DEV_IDEACPI is not set
-# CONFIG_BLK_DEV_IDECD is not set
-# CONFIG_BLK_DEV_IDECS is not set
-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-# CONFIG_BLK_DEV_IDEFLOPPY is not set
-# CONFIG_BLK_DEV_IDEPCI is not set
-# CONFIG_BLK_DEV_IDEPNP is not set
-# CONFIG_BLK_DEV_IDE_SATA is not set
-# CONFIG_BLK_DEV_IDESCSI is not set
-# CONFIG_BLK_DEV_IDETAPE is not set
-CONFIG_BLK_DEV_INITRD=y
-# CONFIG_BLK_DEV_INTEGRITY is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_BLK_DEV_IT8172 is not set
-# CONFIG_BLK_DEV_IT8213 is not set
-# CONFIG_BLK_DEV_IT821X is not set
-# CONFIG_BLK_DEV_JMICRON is not set
-# CONFIG_BLK_DEV_LOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_NS87415 is not set
-# CONFIG_BLK_DEV_OFFBOARD is not set
-# CONFIG_BLK_DEV_OPTI621 is not set
-# CONFIG_BLK_DEV_PDC202XX_NEW is not set
-# CONFIG_BLK_DEV_PDC202XX_OLD is not set
-# CONFIG_BLK_DEV_PIIX is not set
-# CONFIG_BLK_DEV_PLATFORM is not set
-# CONFIG_BLK_DEV_QD65XX is not set
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_RZ1000 is not set
-# CONFIG_BLK_DEV_SC1200 is not set
-# CONFIG_BLK_DEV_SD is not set
-# CONFIG_BLK_DEV_SIIMAGE is not set
-# CONFIG_BLK_DEV_SIS5513 is not set
-# CONFIG_BLK_DEV_SL82C105 is not set
-# CONFIG_BLK_DEV_SLC90E66 is not set
-# CONFIG_BLK_DEV_SR is not set
-# CONFIG_BLK_DEV_SVWKS is not set
-# CONFIG_BLK_DEV_SX8 is not set
-# CONFIG_BLK_DEV_TC86C001 is not set
-# CONFIG_BLK_DEV_TRIFLEX is not set
-# CONFIG_BLK_DEV_TRM290 is not set
-# CONFIG_BLK_DEV_UB is not set
-# CONFIG_BLK_DEV_UMC8672 is not set
-# CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_VIA82CXXX is not set
-# CONFIG_BLK_DEV_XIP is not set
-CONFIG_BLK_DEV=y
-CONFIG_BLOCK=y
-# CONFIG_BNX2 is not set
-# CONFIG_BONDING is not set
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_BOOT_TRACER is not set
-# CONFIG_BPQETHER is not set
-# CONFIG_BRIDGE_EBT_802_3 is not set
-# CONFIG_BRIDGE_EBT_AMONG is not set
-# CONFIG_BRIDGE_EBT_ARP is not set
-# CONFIG_BRIDGE_EBT_ARPREPLY is not set
-# CONFIG_BRIDGE_EBT_BROUTE is not set
-# CONFIG_BRIDGE_EBT_DNAT is not set
-# CONFIG_BRIDGE_EBT_IP6 is not set
-# CONFIG_BRIDGE_EBT_IP is not set
-# CONFIG_BRIDGE_EBT_LIMIT is not set
-# CONFIG_BRIDGE_EBT_LOG is not set
-# CONFIG_BRIDGE_EBT_MARK is not set
-# CONFIG_BRIDGE_EBT_MARK_T is not set
-# CONFIG_BRIDGE_EBT_NFLOG is not set
-# CONFIG_BRIDGE_EBT_PKTTYPE is not set
-# CONFIG_BRIDGE_EBT_REDIRECT is not set
-# CONFIG_BRIDGE_EBT_SNAT is not set
-# CONFIG_BRIDGE_EBT_STP is not set
-# CONFIG_BRIDGE_EBT_T_FILTER is not set
-# CONFIG_BRIDGE_EBT_T_NAT is not set
-# CONFIG_BRIDGE_EBT_ULOG is not set
-# CONFIG_BRIDGE_EBT_VLAN is not set
-# CONFIG_BRIDGE_NETFILTER is not set
-# CONFIG_BRIDGE_NF_EBTABLES is not set
-CONFIG_BRIDGE=y
-# CONFIG_BROADCOM_PHY is not set
-CONFIG_BROKEN_ON_SMP=y
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_BSD_PROCESS_ACCT_V3 is not set
-CONFIG_BSD_PROCESS_ACCT=y
-# CONFIG_BT_ATH3K is not set
-# CONFIG_BT_BNEP is not set
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-# CONFIG_BT_CMTP is not set
-# CONFIG_BT_HCIBCM203X is not set
-# CONFIG_BT_HCIBFUSB is not set
-# CONFIG_BT_HCIBLUECARD is not set
-# CONFIG_BT_HCIBPA10X is not set
-# CONFIG_BT_HCIBT3C is not set
-# CONFIG_BT_HCIBTSDIO is not set
-# CONFIG_BT_HCIBTUART is not set
-# CONFIG_BT_HCIBTUSB is not set
-# CONFIG_BT_HCIDTL1 is not set
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_H4=y
-# CONFIG_BT_HCIUART is not set
-# CONFIG_BT_HCIUART_LL is not set
-# CONFIG_BT_HCIUSB is not set
-CONFIG_BT_HCIUSB_SCO=y
-# CONFIG_BT_HCIVHCI is not set
-# CONFIG_BT_HIDP is not set
-# CONFIG_BT is not set
-# CONFIG_BT_L2CAP is not set
-# CONFIG_BT_MRVL is not set
-# CONFIG_BT_RFCOMM is not set
-CONFIG_BT_RFCOMM_TTY=y
-# CONFIG_BTRFS_FS is not set
-# CONFIG_BT_SCO is not set
-CONFIG_BUG=y
-# CONFIG_C2PORT is not set
-# CONFIG_CAN is not set
-# CONFIG_CAPI_AVM is not set
-# CONFIG_CAPI_EICON is not set
-# CONFIG_CAPI_TRACE is not set
-CONFIG_CARDBUS=y
-# CONFIG_CARDMAN_4000 is not set
-# CONFIG_CARDMAN_4040 is not set
-# CONFIG_CASSINI is not set
-# CONFIG_CB710_CORE is not set
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_CFG80211 is not set
-# CONFIG_CGROUPS is not set
-# CONFIG_CHELSIO_T1 is not set
-# CONFIG_CHELSIO_T3 is not set
-# CONFIG_CHR_DEV_OSST is not set
-# CONFIG_CHR_DEV_SCH is not set
-# CONFIG_CHR_DEV_SG is not set
-# CONFIG_CHR_DEV_ST is not set
-# CONFIG_CICADA_PHY is not set
-# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
-# CONFIG_CIFS is not set
-CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_STATS2 is not set
-CONFIG_CIFS_STATS=y
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-# CONFIG_CIFS_XATTR is not set
-# CONFIG_CLASSIC_RCU=y
-CONFIG_CLS_U32_MARK=y
-CONFIG_CLS_U32_PERF=y
-CONFIG_CMDLINE=""
-# CONFIG_CNIC is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_COMEDI is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_COMPAT_NET_DEV_OPS=y
-# CONFIG_CONFIGFS_FS is not set
-# CONFIG_CONNECTOR is not set
-CONFIG_CONSTRUCTORS=y
-# CONFIG_CONTEXT_SWITCH_TRACER is not set
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-# CONFIG_CPU_DCACHE_DISABLE is not set
-# CONFIG_CPU_FREQ is not set
-# CONFIG_CPU_IDLE is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_CRASH_DUMP is not set
-# CONFIG_CRC16 is not set
-CONFIG_CRC32=y
-# CONFIG_CRC7 is not set
-# CONFIG_CRC_CCITT is not set
-# CONFIG_CRC_ITU_T is not set
-# CONFIG_CRC_T10DIF is not set
-CONFIG_CROSSCOMPILE=y
-# CONFIG_CRYPTO_AEAD is not set
-# CONFIG_CRYPTO_AES_586 is not set
-# CONFIG_CRYPTO_AES is not set
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_ALGAPI=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_ANUBIS is not set
-# CONFIG_CRYPTO_ARC4 is not set
-# CONFIG_CRYPTO_AUTHENC is not set
-# CONFIG_CRYPTO_BLKCIPHER is not set
-# CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_CAST5 is not set
-# CONFIG_CRYPTO_CAST6 is not set
-# CONFIG_CRYPTO_CBC is not set
-# CONFIG_CRYPTO_CCM is not set
-# CONFIG_CRYPTO_CRC32C_INTEL is not set
-# CONFIG_CRYPTO_CRC32C is not set
-# CONFIG_CRYPTO_CRYPTD is not set
-# CONFIG_CRYPTO_CTR is not set
-# CONFIG_CRYPTO_CTS is not set
-# CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_DES is not set
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_CRYPTO_ECB is not set
-# CONFIG_CRYPTO_FCRYPT is not set
-# CONFIG_CRYPTO_FIPS is not set
-# CONFIG_CRYPTO_GCM is not set
-# CONFIG_CRYPTO_GF128MUL is not set
-# CONFIG_CRYPTO_GHASH is not set
-# CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set
-# CONFIG_CRYPTO_HASH is not set
-# CONFIG_CRYPTO_HMAC is not set
-# CONFIG_CRYPTO_HW is not set
-# CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_LZO is not set
-# CONFIG_CRYPTO_MANAGER2 is not set
-# CONFIG_CRYPTO_MANAGER is not set
-CONFIG_CRYPTO_MANAGER_NO_TESTS=y
-# CONFIG_CRYPTO_MD4 is not set
-# CONFIG_CRYPTO_MD5 is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_NULL is not set
-# CONFIG_CRYPTO_PCBC is not set
-CONFIG_CRYPTO_PCOMP=y
-# CONFIG_CRYPTO_PRNG is not set
-# CONFIG_CRYPTO_RMD128 is not set
-# CONFIG_CRYPTO_RMD160 is not set
-# CONFIG_CRYPTO_RMD256 is not set
-# CONFIG_CRYPTO_RMD320 is not set
-# CONFIG_CRYPTO_RNG is not set
-# CONFIG_CRYPTO_SALSA20_586 is not set
-# CONFIG_CRYPTO_SALSA20 is not set
-# CONFIG_CRYPTO_SEED is not set
-# CONFIG_CRYPTO_SEQIV is not set
-# CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_SHA1 is not set
-# CONFIG_CRYPTO_SHA256 is not set
-# CONFIG_CRYPTO_SHA512 is not set
-# CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_TEST is not set
-# CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_TWOFISH_586 is not set
-# CONFIG_CRYPTO_TWOFISH_COMMON is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-CONFIG_CRYPTO_UNLZMA=y
-# CONFIG_CRYPTO_VMAC is not set
-# CONFIG_CRYPTO_WP512 is not set
-# CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_XTS is not set
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_ZLIB=y
-# CONFIG_CUSE is not set
-# CONFIG_DAB is not set
-# CONFIG_DAVICOM_PHY is not set
-# CONFIG_DCB is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_DEBUG_ERRORS is not set
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-CONFIG_DEBUG_FS=y
-# CONFIG_DEBUG_GPIO is not set
-# CONFIG_DEBUG_KERNEL is not set
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_LL is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_SHIRQ is not set
-# CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_PREEMPT is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_WRITECOUNT is not set
-# CONFIG_DECNET is not set
-CONFIG_DECOMPRESS_LZMA_NEEDED=y
-# CONFIG_DEFAULT_AS is not set
-# CONFIG_DEFAULT_BIC is not set
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_CUBIC is not set
-CONFIG_DEFAULT_DEADLINE=y
-# CONFIG_DEFAULT_HTCP is not set
-CONFIG_DEFAULT_IOSCHED="deadline"
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-# CONFIG_DEFAULT_NOOP is not set
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="westwood"
-# CONFIG_DEFAULT_VEGAS is not set
-CONFIG_DEFAULT_WESTWOOD=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-# CONFIG_DETECT_HUNG_TASK is not set
-# CONFIG_DETECT_SOFTLOCKUP is not set
-# CONFIG_DEVKMEM is not set
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
-# CONFIG_DEVTMPFS_MOUNT is not set
-# CONFIG_DEVTMPFS is not set
-# CONFIG_DGRS is not set
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_DISPLAY_SUPPORT is not set
-# CONFIG_DL2K is not set
-# CONFIG_DLM is not set
-# CONFIG_DMA_API_DEBUG is not set
-# CONFIG_DMADEVICES is not set
-# CONFIG_DMA_ENGINE is not set
-# CONFIG_DMASCC is not set
-# CONFIG_DMATEST is not set
-# CONFIG_DM_LOG_USERSPACE is not set
-# CONFIG_DNET is not set
-# CONFIG_DNOTIFY is not set
-# CONFIG_DRAGONRISE_FF is not set
-# CONFIG_DRM is not set
-# CONFIG_DS1682 is not set
-# CONFIG_DST is not set
-# CONFIG_DTLK is not set
-# CONFIG_DUMMY is not set
-# CONFIG_DVB_CORE is not set
-# CONFIG_DVB is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
-# CONFIG_E1000E is not set
-# CONFIG_E1000 is not set
-# CONFIG_E100 is not set
-# CONFIG_ECHO is not set
-# CONFIG_ECONET is not set
-# CONFIG_EDAC is not set
-# CONFIG_EEPRO100 is not set
-# CONFIG_EEPROM_93CX6 is not set
-# CONFIG_EEPROM_AT24 is not set
-# CONFIG_EEPROM_AT25 is not set
-# CONFIG_EEPROM_LEGACY is not set
-# CONFIG_EEPROM_MAX6875 is not set
-# CONFIG_EFI_PARTITION is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_ELF_CORE is not set
-CONFIG_EMBEDDED=y
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_ENABLE_WARN_DEPRECATED=y
-# CONFIG_ENC28J60 is not set
-# CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_EPIC100 is not set
-CONFIG_EPOLL=y
-# CONFIG_EQUALIZER is not set
-# CONFIG_ET131X is not set
-# CONFIG_ETHOC is not set
-CONFIG_EVENTFD=y
-# CONFIG_EVENT_TRACER is not set
-CONFIG_EXPERIMENTAL=y
-# CONFIG_EXPORTFS is not set
-# CONFIG_EXT2_FS is not set
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_EXT3_FS_XATTR is not set
-# CONFIG_EXT4_DEBUG is not set
-# CONFIG_EXT4DEV_FS is not set
-# CONFIG_EXT4_FS is not set
-# CONFIG_EXT4_USE_FOR_EXT23 is not set
-CONFIG_EXTRA_FIRMWARE=""
-CONFIG_EXTRA_TARGETS=""
-# CONFIG_EZX_PCAP is not set
-# CONFIG_FAIR_GROUP_SCHED is not set
-# CONFIG_FAULT_INJECTION is not set
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-# CONFIG_FAT_FS is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_ARC is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_BACKLIGHT is not set
-# CONFIG_FB_BOOT_VESA_SUPPORT is not set
-# CONFIG_FB_BROADSHEET is not set
-# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_CFB_COPYAREA is not set
-# CONFIG_FB_CFB_FILLRECT is not set
-# CONFIG_FB_CFB_IMAGEBLIT is not set
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_DDC is not set
-# CONFIG_FB_EARLYSUSPEND is not set
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_GOLDFISH is not set
-# CONFIG_FB_HGA is not set
-# CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_LE80578 is not set
-# CONFIG_FB_MACMODES is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_MB862XX is not set
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_N411 is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_OF is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_PS3 is not set
-# CONFIG_FB_PXA is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_FOPS is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
-# CONFIG_FB_TILEBLITTING is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_UDL is not set
-# CONFIG_FB_VGA16 is not set
-# CONFIG_FB_VIA is not set
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_VT8623 is not set
-# CONFIG_FCOE_FNIC is not set
-# CONFIG_FCOE is not set
-# CONFIG_FDDI is not set
-# CONFIG_FEALNX is not set
-CONFIG_FIB_RULES=y
-CONFIG_FILE_LOCKING=y
-# CONFIG_FIREWIRE is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
-# CONFIG_FIXED_PHY is not set
-CONFIG_FLATMEM_MANUAL=y
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_FORCEDETH is not set
-CONFIG_FRAME_WARN=1024
-# CONFIG_FRAMEBUFFER_CONSOLE is not set
-# CONFIG_FREEZER is not set
-# CONFIG_FSCACHE is not set
-CONFIG_FSNOTIFY=y
-# CONFIG_FS_POSIX_ACL is not set
-# CONFIG_FTL is not set
-# CONFIG_FTRACE is not set
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_FUNCTION_TRACER is not set
-# CONFIG_FUSE_FS is not set
-# CONFIG_FUSION_FC is not set
-# CONFIG_FUSION is not set
-# CONFIG_FUSION_SAS is not set
-# CONFIG_FUSION_SPI is not set
-CONFIG_FUTEX=y
-CONFIG_FW_LOADER=y
-CONFIG_GACT_PROB=y
-# CONFIG_GAMEPORT is not set
-# CONFIG_GCOV_KERNEL is not set
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_TIME=y
-# CONFIG_GIGASET_CAPI is not set 
-# CONFIG_GIGASET_DEBUG is not set
-# CONFIG_GFS2_FS is not set
-# CONFIG_GPIO_ADP5588 is not set
-# CONFIG_GPIO_BT8XX is not set
-# CONFIG_GPIO_CS5535 is not set
-# CONFIG_GPIO_DEVICE is not set
-# CONFIG_GPIO_LANGWELL is not set
-# CONFIG_GPIOLIB is not set
-# CONFIG_GPIO_MAX7301 is not set
-# CONFIG_GPIO_MAX732X is not set
-# CONFIG_GPIO_MC33880 is not set
-# CONFIG_GPIO_MCP23S08 is not set
-# CONFIG_GPIO_PCA953X is not set
-# CONFIG_GPIO_PCF857X is not set
-# CONFIG_GPIO_SYSFS is not set
-# CONFIG_GPIO_XILINX is not set
-# CONFIG_GREENASIA_FF is not set
-# CONFIG_GROUP_SCHED is not set
-# CONFIG_HAMACHI is not set
-CONFIG_HAMRADIO=y
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_HAVE_AOUT is not set
-CONFIG_HAVE_MLOCKED_PAGE_BIT=y
-CONFIG_HAVE_MLOCK=y
-# CONFIG_HCALL_STATS is not set
-# CONFIG_HDLC_CISCO is not set
-# CONFIG_HDLC_FR is not set
-# CONFIG_HDLC is not set
-# CONFIG_HDLC_PPP is not set
-# CONFIG_HDLC_RAW_ETH is not set
-# CONFIG_HDLC_RAW is not set
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_HECI is not set
-# CONFIG_HERMES is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_HID_A4TECH is not set
-# CONFIG_HID_APPLE is not set
-# CONFIG_HID_BELKIN is not set
-# CONFIG_HID_BRIGHT is not set
-# CONFIG_HID_CHERRY is not set
-# CONFIG_HID_CHICONY is not set
-# CONFIG_HID_COMPAT is not set
-# CONFIG_HID_CYPRESS is not set
-# CONFIG_HID_DEBUG is not set
-# CONFIG_HID_DELL is not set
-# CONFIG_HID_DRAGONRISE is not set
-# CONFIG_HID_EZKEY is not set
-# CONFIG_HID_FF is not set
-# CONFIG_HID_GREENASIA is not set
-# CONFIG_HID_GYRATION is not set
-# CONFIG_HID is not set
-# CONFIG_HID_KENSINGTON is not set
-# CONFIG_HID_KYE is not set
-# CONFIG_HID_LOGITECH is not set
-# CONFIG_HID_MICROSOFT is not set
-# CONFIG_HID_MONTEREY is not set
-# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_PANTHERLORD is not set
-# CONFIG_HID_PETALYNX is not set
-# CONFIG_HID_PID is not set
-# CONFIG_HIDRAW is not set
-# CONFIG_HID_SAMSUNG is not set
-# CONFIG_HID_SMARTJOYPLUS is not set
-# CONFIG_HID_SONY is not set
-# CONFIG_HID_SUNPLUS is not set
-# CONFIG_HID_SUPPORT is not set
-# CONFIG_HID_THRUSTMASTER is not set
-# CONFIG_HID_TOPSEED is not set
-# CONFIG_HID_TWINHAN is not set
-# CONFIG_HID_WACOM is not set
-# CONFIG_HID_ZEROPLUS is not set
-# CONFIG_HIGHMEM is not set
-CONFIG_HIGH_RES_TIMERS=y
-# CONFIG_HIPPI is not set
-# CONFIG_HOSTAP_CS is not set
-# CONFIG_HOSTAP is not set
-# CONFIG_HOSTAP_PCI is not set
-# CONFIG_HOSTAP_PLX is not set
-# CONFIG_HOTPLUG_CPU is not set
-# CONFIG_HOTPLUG_PCI is not set
-CONFIG_HOTPLUG=y
-# CONFIG_HP100 is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_HP_ILO is not set
-# CONFIG_HTC_EGPIO is not set
-# CONFIG_HTC_PASIC3 is not set
-# CONFIG_HUGETLB_PAGE is not set
-# CONFIG_HVC_UDBG is not set
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
-# CONFIG_HW_RANDOM_AMD is not set
-# CONFIG_HW_RANDOM_GEODE is not set
-# CONFIG_HW_RANDOM_INTEL is not set
-# CONFIG_HW_RANDOM_TIMERIOMEM is not set
-# CONFIG_HW_RANDOM_VIA is not set
-# CONFIG_HYPERV is not set
-# CONFIG_HYSDN is not set
-CONFIG_HZ=100
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ_100=y
-# CONFIG_HZ_1024 is not set
-# CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_256 is not set
-# CONFIG_HZ_300 is not set
-# CONFIG_HZ_48 is not set
-# CONFIG_I2C_ALGOBIT is not set
-# CONFIG_I2C_ALGOPCA is not set
-# CONFIG_I2C_ALGOPCF is not set
-# CONFIG_I2C_ALI1535 is not set
-# CONFIG_I2C_ALI1563 is not set
-# CONFIG_I2C_ALI15X3 is not set
-# CONFIG_I2C_AMD756 is not set
-# CONFIG_I2C_AMD8111 is not set
-# CONFIG_I2C_CHARDEV is not set
-# CONFIG_I2C_COMPAT is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_ELEKTOR is not set
-# CONFIG_I2C_GPIO is not set
-# CONFIG_I2C_HELPER_AUTO is not set
-# CONFIG_I2C_I801 is not set
-# CONFIG_I2C_I810 is not set
-# CONFIG_I2C_IBM_IIC is not set
-# CONFIG_I2C_ISCH is not set
-# CONFIG_I2C is not set
-# CONFIG_I2C_MPC is not set
-# CONFIG_I2C_NFORCE2 is not set
-# CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_PCA_ISA is not set
-# CONFIG_I2C_PCA_PLATFORM is not set
-# CONFIG_I2C_PIIX4 is not set
-# CONFIG_I2C_PROSAVAGE is not set
-# CONFIG_I2C_SAVAGE4 is not set
-# CONFIG_I2C_SIMTEC is not set
-# CONFIG_I2C_SIS5595 is not set
-# CONFIG_I2C_SIS630 is not set
-# CONFIG_I2C_SIS96X is not set
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_TAOS_EVM is not set
-# CONFIG_I2C_TINY_USB is not set
-# CONFIG_I2C_VIA is not set
-# CONFIG_I2C_VIAPRO is not set
-# CONFIG_I2C_VOODOO3 is not set
-# CONFIG_I2O is not set
-# CONFIG_I82092 is not set
-# CONFIG_I82365 is not set
-# CONFIG_IBM_ASM is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
-# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
-# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_ICPLUS_PHY is not set
-# CONFIG_ICS932S401 is not set
-# CONFIG_IDEDISK_MULTI_MODE is not set
-# CONFIG_IDEDMA_IVB is not set
-# CONFIG_IDEDMA_ONLYDISK is not set
-# CONFIG_IDE_GD is not set
-# CONFIG_IDE is not set
-CONFIG_IDE_MAX_HWIFS=4
-# CONFIG_IDEPCI_SHARE_IRQ is not set
-# CONFIG_IDE_PHISON is not set
-CONFIG_IDE_PROC_FS=y
-# CONFIG_IDE_TASK_IOCTL is not set
-# CONFIG_IEEE1394_DV1394 is not set
-# CONFIG_IEEE1394_ETH1394 is not set
-# CONFIG_IEEE1394 is not set
-# CONFIG_IEEE1394_OHCI1394 is not set
-# CONFIG_IEEE1394_PCILYNX is not set
-# CONFIG_IEEE1394_RAWIO is not set
-# CONFIG_IEEE1394_VERBOSEDEBUG is not set
-# CONFIG_IEEE1394_VIDEO1394 is not set
-# CONFIG_IEEE80211_CRYPT_CCMP is not set
-# CONFIG_IEEE80211_CRYPT_TKIP is not set
-# CONFIG_IEEE80211_CRYPT_WEP is not set
-# CONFIG_IEEE80211_DEBUG is not set
-# CONFIG_IEEE80211 is not set
-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
-# CONFIG_IEEE80211_SOFTMAC is not set
-# CONFIG_IEEE802154 is not set
-# CONFIG_IFB is not set
-# CONFIG_IGB is not set
-# CONFIG_IGBVF is not set
-# CONFIG_IIO is not set
-# CONFIG_RAMZSWAP is not set
-# CONFIG_BATMAN_ADV is not set
-# CONFIG_IKCONFIG is not set
-# CONFIG_IKCONFIG_PROC is not set
-# CONFIG_IMAGE_CMDLINE_HACK is not set
-# CONFIG_IMQ_BEHAVIOR_AA is not set
-# CONFIG_IMQ_BEHAVIOR_AB is not set
-# CONFIG_IMQ_BEHAVIOR_BA is not set
-# CONFIG_IMQ_BEHAVIOR_BB is not set
-# CONFIG_IMQ is not set
-CONFIG_IMQ_NUM_DEVS=2
-# CONFIG_INET6_AH is not set
-# CONFIG_INET6_ESP is not set
-# CONFIG_INET6_IPCOMP is not set
-# CONFIG_INET6_TUNNEL is not set
-# CONFIG_INET6_XFRM_MODE_BEET is not set
-# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_TCP_DIAG is not set
-# CONFIG_INET_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_TUNNEL is not set
-CONFIG_INET=y
-# CONFIG_INFINIBAND is not set
-# CONFIG_INFTL is not set
-CONFIG_INIT_ENV_ARG_LIMIT=32
-# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set
-# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set
-# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set
-CONFIG_INITRAMFS_COMPRESSION_NONE=y
-# CONFIG_INOTIFY is not set
-# CONFIG_INOTIFY_USER is not set
-# CONFIG_INPUT_APANEL is not set
-# CONFIG_INPUT_ATI_REMOTE2 is not set
-# CONFIG_INPUT_ATI_REMOTE is not set
-# CONFIG_INPUT_ATLAS_BTNS is not set
-# CONFIG_INPUT_CM109 is not set
-# CONFIG_INPUT_EVBUG is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT_GPIO is not set
-# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
-# CONFIG_INPUT is not set
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_KEYSPAN_REMOTE is not set
-# CONFIG_INPUT_MIMIO is not set
-CONFIG_INPUT_MISC=y
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_PCSPKR is not set
-# CONFIG_INPUT_POLLDEV is not set
-# CONFIG_INPUT_POWERMATE is not set
-# CONFIG_INPUT_SPARSEKMAP is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_TSDEV is not set
-# CONFIG_INPUT_UINPUT is not set
-# CONFIG_INPUT_WINBOND_CIR is not set
-# CONFIG_INPUT_WISTRON_BTNS is not set
-# CONFIG_INSTRUMENTATION is not set
-# CONFIG_IOSCHED_AS is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_NOOP=y
-# CONFIG_IP1000 is not set
-# CONFIG_IP175C_PHY is not set
-# CONFIG_IP6_NF_FILTER is not set
-# CONFIG_IP6_NF_IPTABLES is not set
-# CONFIG_IP6_NF_MANGLE is not set
-# CONFIG_IP6_NF_MATCH_AH is not set
-# CONFIG_IP6_NF_MATCH_EUI64 is not set
-# CONFIG_IP6_NF_MATCH_FRAG is not set
-# CONFIG_IP6_NF_MATCH_HL is not set
-# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
-# CONFIG_IP6_NF_MATCH_LIMIT is not set
-# CONFIG_IP6_NF_MATCH_MH is not set
-# CONFIG_IP6_NF_MATCH_OPTS is not set
-# CONFIG_IP6_NF_MATCH_OWNER is not set
-# CONFIG_IP6_NF_MATCH_RT is not set
-# CONFIG_IP6_NF_QUEUE is not set
-# CONFIG_IP6_NF_RAW is not set
-# CONFIG_IP6_NF_TARGET_HL is not set
-# CONFIG_IP6_NF_TARGET_IMQ is not set
-# CONFIG_IP6_NF_TARGET_LOG is not set
-# CONFIG_IP6_NF_TARGET_REJECT is not set
-# CONFIG_IP6_NF_TARGET_ROUTE is not set
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IPC_NS is not set
-# CONFIG_IP_DCCP is not set
-CONFIG_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
-# CONFIG_IPMI_HANDLER is not set
-CONFIG_IP_MROUTE=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_MULTIPLE_TABLES=y
-# CONFIG_IP_NF_AMANDA is not set
-# CONFIG_IP_NF_ARPFILTER is not set
-# CONFIG_IP_NF_ARP_MANGLE is not set
-# CONFIG_IP_NF_ARPTABLES is not set
-# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
-CONFIG_IP_NF_CONNTRACK_MARK=y
-CONFIG_IP_NF_CONNTRACK=y
-CONFIG_IP_NF_CT_ACCT=y
-# CONFIG_IP_NF_CT_PROTO_SCTP is not set
-# CONFIG_IP_NF_FILTER is not set
-# CONFIG_IP_NF_FTP is not set
-# CONFIG_IP_NF_H323 is not set
-# CONFIG_IP_NF_IPTABLES is not set
-# CONFIG_IP_NF_IRC is not set
-# CONFIG_IP_NF_MANGLE is not set
-# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
-# CONFIG_IP_NF_MATCH_AH is not set
-# CONFIG_IP_NF_MATCH_ECN is not set
-# CONFIG_IP_NF_MATCH_HASHLIMIT is not set
-# CONFIG_IP_NF_MATCH_IPP2P is not set
-# CONFIG_IP_NF_MATCH_OWNER is not set
-# CONFIG_IP_NF_MATCH_RECENT is not set
-# CONFIG_IP_NF_MATCH_SET is not set
-# CONFIG_IP_NF_MATCH_TIME is not set
-# CONFIG_IP_NF_MATCH_TOS is not set
-# CONFIG_IP_NF_MATCH_TTL is not set
-# CONFIG_IP_NF_NAT_AMANDA is not set
-# CONFIG_IP_NF_NAT_FTP is not set
-# CONFIG_IP_NF_NAT_H323 is not set
-# CONFIG_IP_NF_NAT_IRC is not set
-CONFIG_IP_NF_NAT_NEEDED=y
-# CONFIG_IP_NF_NAT_PPTP is not set
-# CONFIG_IP_NF_NAT_SIP is not set
-# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
-# CONFIG_IP_NF_NAT_TFTP is not set
-CONFIG_IP_NF_NAT=y
-# CONFIG_IP_NF_NETBIOS_NS is not set
-# CONFIG_IP_NF_PPTP is not set
-# CONFIG_IP_NF_QUEUE is not set
-# CONFIG_IP_NF_RAW is not set
-# CONFIG_IP_NF_SECURITY is not set
-CONFIG_IP_NF_SET_HASHSIZE=1024
-# CONFIG_IP_NF_SET_IPHASH is not set
-# CONFIG_IP_NF_SET_IPMAP is not set
-# CONFIG_IP_NF_SET_IPPORTHASH is not set
-# CONFIG_IP_NF_SET_IPTREE is not set
-# CONFIG_IP_NF_SET_IPTREEMAP is not set
-# CONFIG_IP_NF_SET is not set
-# CONFIG_IP_NF_SET_MACIPMAP is not set
-CONFIG_IP_NF_SET_MAX=256
-# CONFIG_IP_NF_SET_NETHASH is not set
-# CONFIG_IP_NF_SET_PORTMAP is not set
-# CONFIG_IP_NF_SIP is not set
-# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
-# CONFIG_IP_NF_TARGET_ECN is not set
-# CONFIG_IP_NF_TARGET_IMQ is not set
-# CONFIG_IP_NF_TARGET_LOG is not set
-# CONFIG_IP_NF_TARGET_MASQUERADE is not set
-# CONFIG_IP_NF_TARGET_NETMAP is not set
-# CONFIG_IP_NF_TARGET_REDIRECT is not set
-# CONFIG_IP_NF_TARGET_REJECT is not set
-# CONFIG_IP_NF_TARGET_ROUTE is not set
-# CONFIG_IP_NF_TARGET_SAME is not set
-# CONFIG_IP_NF_TARGET_SET is not set
-# CONFIG_IP_NF_TARGET_TOS is not set
-# CONFIG_IP_NF_TARGET_TTL is not set
-# CONFIG_IP_NF_TARGET_ULOG is not set
-# CONFIG_IP_NF_TFTP is not set
-# CONFIG_IP_PIMSM_V1 is not set
-# CONFIG_IP_PIMSM_V2 is not set
-# CONFIG_IP_PNP is not set
-CONFIG_IP_ROUTE_FWMARK=y
-CONFIG_IP_ROUTE_MULTIPATH_CACHED=y
-# CONFIG_IP_ROUTE_MULTIPATH_DRR is not set
-# CONFIG_IP_ROUTE_MULTIPATH_RANDOM is not set
-# CONFIG_IP_ROUTE_MULTIPATH_RR is not set
-# CONFIG_IP_ROUTE_MULTIPATH_WRANDOM is not set
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-# CONFIG_IP_SCTP is not set
-CONFIG_IPSEC_NAT_TRAVERSAL=y
-# CONFIG_IPV6 is not set
-# CONFIG_IPV6_MIP6 is not set
-# CONFIG_IPV6_MROUTE is not set
-# CONFIG_IPV6_MULTIPLE_TABLES is not set
-CONFIG_IPV6_NDISC_NODETYPE=y
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-# CONFIG_IPV6_PRIVACY is not set
-# CONFIG_IPV6_ROUTE_INFO is not set
-# CONFIG_IPV6_ROUTER_PREF is not set
-# CONFIG_IPV6_SIT is not set
-# CONFIG_IPV6_SIT_6RD is not set
-# CONFIG_IPV6_TUNNEL is not set
-# CONFIG_IP_VS is not set
-# CONFIG_IPW2100_DEBUG is not set
-# CONFIG_IPW2100 is not set
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2200_DEBUG is not set
-# CONFIG_IPW2200 is not set
-CONFIG_IPW2200_MONITOR=y
-# CONFIG_IPW2200_PROMISCUOUS is not set
-# CONFIG_IPW2200_QOS is not set
-# CONFIG_IPW2200_RADIOTAP is not set
-# CONFIG_IPWIRELESS is not set
-# CONFIG_IPX is not set
-# CONFIG_IRDA is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_ISCSI_TCP is not set
-CONFIG_ISDN=y
-# CONFIG_ISDN_AUDIO is not set
-# CONFIG_ISDN_CAPI_CAPIDRV is not set
-# CONFIG_ISDN_DIVERSION is not set
-# CONFIG_ISDN_DRV_ACT2000 is not set
-# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
-# CONFIG_ISDN_DRV_EICON is not set
-# CONFIG_ISDN_DRV_HISAX is not set
-# CONFIG_ISDN_DRV_ICN is not set
-# CONFIG_ISDN_DRV_LOOP is not set
-# CONFIG_ISDN_DRV_PCBIT is not set
-# CONFIG_ISDN_DRV_SC is not set
-# CONFIG_ISDN_DRV_TPAM is not set
-# CONFIG_ISDN_WITH_ABC is not set
-# CONFIG_ISL29003 is not set
-# CONFIG_ISO9660_FS is not set
-# CONFIG_IWL3945 is not set
-# CONFIG_IWLAGN is not set
-# CONFIG_IWLCORE is not set
-# CONFIG_IWLWIFI is not set
-# CONFIG_IWLWIFI_LEDS is not set
-# CONFIG_IWMC3200TOP is not set
-# CONFIG_IXGB is not set
-# CONFIG_JBD2_DEBUG is not set
-# CONFIG_JBD_DEBUG is not set
-# CONFIG_JBD is not set
-# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
-# CONFIG_JFFS2_CMODE_NONE is not set
-CONFIG_JFFS2_CMODE_PRIORITY=y
-# CONFIG_JFFS2_CMODE_SIZE is not set
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_FS_DEBUG=0
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_XATTR is not set
-CONFIG_JFFS2_FS=y
-# CONFIG_JFFS2_LZO is not set
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
-CONFIG_JFFS2_SUMMARY=y
-#CONFIG_JFFS2_ZLIB is not set
-CONFIG_JFFS2_LZMA=y
-# CONFIG_JFFS_FS is not set
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_JFS_POSIX_ACL is not set
-# CONFIG_JFS_SECURITY is not set
-# CONFIG_JFS_STATISTICS is not set
-# CONFIG_JME is not set
-CONFIG_JOLIET=y
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-# CONFIG_KALLSYMS is not set
-# CONFIG_KARMA_PARTITION is not set
-# CONFIG_KERNEL_BZIP2 is not set
-# CONFIG_KERNEL_GZIP is not set
-CONFIG_KERNEL_LZMA=y
-# CONFIG_KERNEL_LZO is not set
-# CONFIG_KEXEC is not set
-# CONFIG_KEYBOARD_ADP5588 is not set
-# CONFIG_KEYBOARD_LM8323 is not set
-# CONFIG_KEYBOARD_MAX7359 is not set
-# CONFIG_KEYBOARD_OPENCORES is not set
-# CONFIG_KEYS is not set
-# CONFIG_KGDB is not set
-# CONFIG_KMEMTRACE is not set
-CONFIG_KMOD=y
-# CONFIG_KPROBES is not set
-# CONFIG_KS8842 is not set
-# CONFIG_KS8851 is not set
-# CONFIG_KS8851_MLL is not set
-# CONFIG_KSM is not set
-# CONFIG_LANMEDIA is not set
-# CONFIG_LAPB is not set
-# CONFIG_LASAT is not set
-# CONFIG_LATENCYTOP is not set
-CONFIG_LBDAF=y
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_LEDS_ALIX is not set
-# CONFIG_LEDS_BD2802 is not set
-CONFIG_LEDS_CLASS=y
-# CONFIG_LEDS_DAC124S085 is not set
-CONFIG_LEDS_GPIO_PLATFORM=y
-# CONFIG_LEDS_LT3593 is not set
-# CONFIG_LEDS_LP3944 is not set
-# CONFIG_LEDS_LP5521 is not set
-# CONFIG_LEDS_PCA9532 is not set
-# CONFIG_LEDS_PCA955X is not set
-# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-# CONFIG_LEDS_TRIGGER_GPIO is not set
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-# CONFIG_LEDS_TRIGGER_IDE_DISK is not set
-# CONFIG_LEDS_TRIGGER_MORSE is not set
-CONFIG_LEDS_TRIGGER_NETDEV=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_LIB80211_CRYPT_CCMP is not set
-# CONFIG_LIB80211_CRYPT_TKIP is not set
-# CONFIG_LIB80211_CRYPT_WEP is not set
-# CONFIG_LIB80211_DEBUG is not set
-# CONFIG_LIB80211 is not set
-# CONFIG_LIBCRC32C is not set
-# CONFIG_LIBERTAS is not set
-# CONFIG_LIBERTAS_THINFIRM is not set
-# CONFIG_LIBERTAS_USB is not set
-# CONFIG_LIBFC is not set
-# CONFIG_LIBFCOE is not set
-# CONFIG_LIBIPW_DEBUG is not set
-# CONFIG_LINE6_USB is not set
-# CONFIG_LLC2 is not set
-CONFIG_LLC=y
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_LOCKDEP_SUPPORT=y
-# CONFIG_LOCKD is not set
-CONFIG_LOCKD_V4=y
-# CONFIG_LOCK_STAT is not set
-CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_LOGIRUMBLEPAD2_FF is not set
-# CONFIG_LOGITECH_FF is not set
-# CONFIG_LOGO is not set
-# CONFIG_LSF is not set
-# CONFIG_LSI_ET1011C_PHY is not set
-# CONFIG_LTPC is not set
-# CONFIG_LXT_PHY is not set
-CONFIG_MAC80211_DEFAULT_PS_VALUE=1
-CONFIG_MAC80211_DEFAULT_PS=y
-# CONFIG_MAC80211 is not set
-# CONFIG_MAC_EMUMOUSEBTN is not set
-# CONFIG_MACINTOSH_DRIVERS is not set
-# CONFIG_MAC_PARTITION is not set
-# CONFIG_MACVLAN is not set
-# CONFIG_MAGIC_SYSRQ is not set
-# CONFIG_MARKEINS is not set
-# CONFIG_MARKERS is not set
-# CONFIG_MARVELL_PHY is not set
-# CONFIG_MDIO_BITBANG is not set
-# CONFIG_MD is not set
-# CONFIG_ME4000 is not set
-# CONFIG_MEDIA_ATTACH is not set
-# CONFIG_MEDIA_SUPPORT is not set
-# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_SAS is not set
-# CONFIG_MEILHAUS is not set
-# CONFIG_MEMORY_FAILURE is not set
-# CONFIG_MEMSTICK is not set
-# CONFIG_MFD_88PM8607 is not set
-# CONFIG_MFD_ASIC3 is not set
-# CONFIG_MFD_CORE is not set
-# CONFIG_MFD_MC13783 is not set
-# CONFIG_MFD_PCF50633 is not set
-# CONFIG_MFD_SM501 is not set
-# CONFIG_MFD_TC6387XB is not set
-# CONFIG_MFD_TC6393XB is not set
-# CONFIG_MFD_TMIO is not set
-# CONFIG_MFD_WM831X is not set
-# CONFIG_MFD_WM8350_I2C is not set
-# CONFIG_MFD_WM8400 is not set
-# CONFIG_MG_DISK is not set
-# CONFIG_MIGRATION is not set
-CONFIG_MII=y
-CONFIG_MINI_FO=y
-# CONFIG_MINIX_FS is not set
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_MIPS_FPU_EMU is not set
-CONFIG_MISC_DEVICES=y
-CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_MISDN_AVMFRITZ is not set
-# CONFIG_MISDN_HFCPCI is not set
-# CONFIG_MISDN_HFCUSB is not set
-# CONFIG_MISDN_INFINEON is not set
-# CONFIG_MISDN is not set
-# CONFIG_MISDN_NETJET is not set
-# CONFIG_MISDN_SPEEDFAX is not set
-# CONFIG_MISDN_W6692 is not set
-# CONFIG_MKISS is not set
-# CONFIG_MMC_ARMMMCI is not set
-CONFIG_MMC_BLOCK_BOUNCE=y
-# CONFIG_MMC_BLOCK is not set
-# CONFIG_MMC_CB710 is not set
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC is not set
-# CONFIG_MMC_MVSDIO is not set
-# CONFIG_MMC_S3C is not set
-# CONFIG_MMC_SDHCI is not set
-# CONFIG_MMC_SDRICOH_CS is not set
-# CONFIG_MMC_SPI is not set
-# CONFIG_MMC_TEST is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-# CONFIG_MMC_VIA_SDMMC is not set
-CONFIG_MMU=y
-# CONFIG_MODULE_FORCE_LOAD is not set
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MOUSE_APPLETOUCH is not set
-# CONFIG_MOUSE_INPORT is not set
-# CONFIG_MOUSE_LOGIBM is not set
-# CONFIG_MOUSE_PC110PAD is not set
-# CONFIG_MOUSE_PS2_SENTELIC is not set
-# CONFIG_MOUSE_SYNAPTICS_I2C is not set
-# CONFIG_MSDOS_FS is not set
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_AFS_PARTS is not set
-# CONFIG_MTD_ALAUDA is not set
-# CONFIG_MTD_AR7_PARTS is not set
-# CONFIG_MTD_ARM_INTEGRATOR is not set
-CONFIG_MTD_BLKDEVS=y
-# CONFIG_MTD_BLOCK2MTD is not set
-CONFIG_MTD_BLOCK=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_CFI_AMDSTD=y
-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CFI_INTELEXT=y
-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_NOSWAP=y
-# CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI_UTIL=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CHAR=y
-# CONFIG_MTD_CMDLINE_PARTS is not set
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-# CONFIG_MTD_CONCAT is not set
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_GPIO_ADDR is not set
-# CONFIG_MTD_INTEL_VR_NOR is not set
-# CONFIG_MTD_JEDECPROBE is not set
-# CONFIG_MTD_LPDDR is not set
-# CONFIG_MTD_M25P80 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_MYLOADER_PARTS is not set
-# CONFIG_MTD_NAND_CAFE is not set
-# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_ECC_SMC is not set
-# CONFIG_MTD_NAND_GPIO is not set
-CONFIG_MTD_NAND_IDS=y
-# CONFIG_MTD_NAND is not set
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
-# CONFIG_MTD_NAND_PLATFORM is not set
-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
-# CONFIG_MTD_ONENAND is not set
-# CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_OTP is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_PCI is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_PHYSMAP_COMPAT is not set
-# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_RAM is not set
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
-# CONFIG_MTD_ROM is not set
-CONFIG_MTD_ROOTFS_ROOT_DEV=y
-CONFIG_MTD_ROOTFS_SPLIT=y
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_SST25L is not set
-# CONFIG_MTD_TESTS is not set
-# CONFIG_MTD_UBI is not set
-CONFIG_MTD=y
-# CONFIG_MV643XX_ETH is not set
-# CONFIG_MVSWITCH_PHY is not set
-# CONFIG_MWAVE is not set
-# CONFIG_MWL8K is not set
-# CONFIG_MYRI10GE is not set
-# CONFIG_NAMESPACES is not set
-# CONFIG_NATIONAL_PHY is not set
-# CONFIG_NATSEMI is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_NE2K_PCI is not set
-# CONFIG_NEC_MARKEINS is not set
-# CONFIG_NET_9P is not set
-# CONFIG_NET_ACT_GACT is not set
-# CONFIG_NET_ACT_IPT is not set
-# CONFIG_NET_ACT_MIRRED is not set
-# CONFIG_NET_ACT_NAT is not set
-# CONFIG_NET_ACT_PEDIT is not set
-# CONFIG_NET_ACT_POLICE is not set
-# CONFIG_NET_ACT_SIMP is not set
-CONFIG_NET_ACT_SKBEDIT=y
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_CLS_BASIC=y
-# CONFIG_NET_CLS_FLOW is not set
-# CONFIG_NET_CLS_FW is not set
-CONFIG_NET_CLS_IND=y
-# CONFIG_NET_CLS_ROUTE4 is not set
-# CONFIG_NET_CLS_RSVP6 is not set
-# CONFIG_NET_CLS_RSVP is not set
-# CONFIG_NET_CLS_TCINDEX is not set
-# CONFIG_NET_CLS_U32 is not set
-CONFIG_NET_CLS=y
-# CONFIG_NETCONSOLE is not set
-# CONFIG_NETDEBUG is not set
-# CONFIG_NETDEV_10000 is not set
-CONFIG_NETDEV_1000=y
-CONFIG_NETDEVICES_MULTIQUEUE=y
-CONFIG_NETDEVICES=y
-# CONFIG_NET_DROP_MONITOR is not set
-# CONFIG_NET_DSA is not set
-# CONFIG_NET_EMATCH_CMP is not set
-# CONFIG_NET_EMATCH is not set
-# CONFIG_NET_EMATCH_META is not set
-# CONFIG_NET_EMATCH_NBYTE is not set
-CONFIG_NET_EMATCH_STACK=32
-# CONFIG_NET_EMATCH_TEXT is not set
-# CONFIG_NET_EMATCH_U32 is not set
-CONFIG_NET_ESTIMATOR=y
-CONFIG_NET_ETHERNET=y
-# CONFIG_NET_FC is not set
-CONFIG_NETFILTER_ADVANCED=y
-# CONFIG_NETFILTER_DEBUG is not set
-# CONFIG_NETFILTER_NETLINK is not set
-# CONFIG_NETFILTER_NETLINK_LOG is not set
-# CONFIG_NETFILTER_NETLINK_QUEUE is not set
-# CONFIG_NETFILTER_TPROXY is not set
-# CONFIG_NETFILTER_XTABLES is not set
-# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
-# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
-# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
-# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
-# CONFIG_NETFILTER_XT_MATCH_ESP is not set
-# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
-# CONFIG_NETFILTER_XT_MATCH_HL is not set
-# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
-# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set
-# CONFIG_NETFILTER_XT_MATCH_LAYER7 is not set
-# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
-# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_MAC is not set
-# CONFIG_NETFILTER_XT_MATCH_MARK is not set
-# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
-# CONFIG_NETFILTER_XT_MATCH_OSF is not set
-# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
-# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
-# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
-# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
-# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
-# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
-# CONFIG_NETFILTER_XT_MATCH_REALM is not set
-# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
-# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
-# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
-# CONFIG_NETFILTER_XT_MATCH_STATE is not set
-# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
-# CONFIG_NETFILTER_XT_MATCH_STRING is not set
-# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
-# CONFIG_NETFILTER_XT_MATCH_TIME is not set
-# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
-# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
-# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
-# CONFIG_NETFILTER_XT_TARGET_HL is not set
-# CONFIG_NETFILTER_XT_TARGET_IMQ is not set
-# CONFIG_NETFILTER_XT_TARGET_LED is not set
-# CONFIG_NETFILTER_XT_TARGET_MARK is not set
-# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
-# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
-# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
-# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
-# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
-CONFIG_NETFILTER=y
-CONFIG_NET_IPGRE_BROADCAST=y
-# CONFIG_NET_IPGRE is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_ISA is not set
-# CONFIG_NET_KEY is not set
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_NET_PCI=y
-# CONFIG_NET_PCMCIA is not set
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_NETPOLL is not set
-CONFIG_NET_RADIO=y
-# CONFIG_NETROM is not set
-# CONFIG_NET_SB1000 is not set
-# CONFIG_NET_SCH_ATM is not set
-# CONFIG_NET_SCH_CBQ is not set
-# CONFIG_NET_SCH_CLK_CPU is not set
-# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
-CONFIG_NET_SCH_CLK_JIFFIES=y
-# CONFIG_NET_SCH_DRR is not set
-# CONFIG_NET_SCH_DSMARK is not set
-CONFIG_NET_SCHED=y
-# CONFIG_NET_SCH_ESFQ is not set
-CONFIG_NET_SCH_ESFQ_NFCT=y
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_NET_SCH_GRED is not set
-# CONFIG_NET_SCH_HFSC is not set
-# CONFIG_NET_SCH_HTB is not set
-# CONFIG_NET_SCH_INGRESS is not set
-# CONFIG_NET_SCH_MULTIQ is not set
-# CONFIG_NET_SCH_NETEM is not set
-# CONFIG_NET_SCH_PRIO is not set
-# CONFIG_NET_SCH_RED is not set
-# CONFIG_NET_SCH_RR is not set
-# CONFIG_NET_SCH_SFQ is not set
-# CONFIG_NET_SCH_TBF is not set
-# CONFIG_NET_SCH_TEQL is not set
-# CONFIG_NET_TULIP is not set
-# CONFIG_NET_VENDOR_3COM is not set
-CONFIG_NET_WIRELESS_RTNETLINK=y
-CONFIG_NET_WIRELESS=y
-CONFIG_NETWORK_FILESYSTEMS=y
-# CONFIG_NETWORK_SECMARK is not set
-# CONFIG_NETXEN_NIC is not set
-CONFIG_NET=y
-# CONFIG_NEW_GPIO is not set
-CONFIG_NEW_LEDS=y
-# CONFIG_NF_CONNTRACK_AMANDA is not set
-CONFIG_NF_CONNTRACK_ENABLED=y
-# CONFIG_NF_CONNTRACK_EVENTS is not set
-# CONFIG_NF_CONNTRACK_FTP is not set
-# CONFIG_NF_CONNTRACK_H323 is not set
-# CONFIG_NF_CONNTRACK_IPV4 is not set
-# CONFIG_NF_CONNTRACK_IPV6 is not set
-# CONFIG_NF_CONNTRACK_IRC is not set
-# CONFIG_NF_CONNTRACK is not set
-CONFIG_NF_CONNTRACK_MARK=y
-# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
-# CONFIG_NF_CONNTRACK_PPTP is not set
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-# CONFIG_NF_CONNTRACK_RTSP is not set
-# CONFIG_NF_CONNTRACK_SANE is not set
-# CONFIG_NF_CONNTRACK_SIP is not set
-CONFIG_NF_CONNTRACK_SUPPORT=y
-# CONFIG_NF_CONNTRACK_TFTP is not set
-# CONFIG_NF_CT_ACCT is not set
-# CONFIG_NF_CT_NETLINK is not set
-# CONFIG_NF_CT_PROTO_DCCP is not set
-# CONFIG_NF_CT_PROTO_GRE is not set
-# CONFIG_NF_CT_PROTO_SCTP is not set
-# CONFIG_NF_CT_PROTO_UDPLITE is not set
-# CONFIG_NF_DEFRAG_IPV4 is not set
-# CONFIG_NF_NAT_AMANDA is not set
-# CONFIG_NF_NAT_FTP is not set
-# CONFIG_NF_NAT_H323 is not set
-# CONFIG_NF_NAT_IRC is not set
-# CONFIG_NF_NAT is not set
-CONFIG_NF_NAT_NEEDED=y
-# CONFIG_NF_NAT_PPTP is not set
-# CONFIG_NF_NAT_PROTO_GRE is not set
-# CONFIG_NF_NAT_RTSP is not set
-# CONFIG_NF_NAT_SIP is not set
-# CONFIG_NF_NAT_SNMP_BASIC is not set
-# CONFIG_NF_NAT_TFTP is not set
-# CONFIG_NFS_ACL_SUPPORT is not set
-CONFIG_NFS_COMMON=y
-# CONFIG_NFS_DIRECTIO is not set
-# CONFIG_NFSD is not set
-CONFIG_NFSD_TCP=y
-# CONFIG_NFSD_V2_ACL is not set
-# CONFIG_NFSD_V3_ACL is not set
-CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V4 is not set
-# CONFIG_NFS_FS is not set
-# CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V3=y
-# CONFIG_NFS_V4_1 is not set
-# CONFIG_NFS_V4 is not set
-# CONFIG_NFTL is not set
-# CONFIG_NILFS2_FS is not set
-CONFIG_NL80211=y
-CONFIG_NLATTR=y
-# CONFIG_NLS_ASCII is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_CODEPAGE_437 is not set
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-# CONFIG_NLS_CODEPAGE_850 is not set
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-CONFIG_NLS_DEFAULT="iso8859-1"
-# CONFIG_NLS is not set
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-# CONFIG_NLS_ISO8859_15 is not set
-# CONFIG_NLS_ISO8859_1 is not set
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_UTF8 is not set
-# CONFIG_NO_HZ is not set
-# CONFIG_NOP_USB_XCEIV is not set
-# CONFIG_NORTEL_HERMES is not set
-# CONFIG_NOZOMI is not set
-# CONFIG_NS83820 is not set
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
-# CONFIG_NVRAM is not set
-# CONFIG_OC_ETM is not set
-# CONFIG_OCF_BENCH is not set
-# CONFIG_OCF_EP80579 is not set
-# CONFIG_OCF_HIFNHIPP is not set
-# CONFIG_OCF_HIFN is not set
-# CONFIG_OCF_IXP4XX is not set
-# CONFIG_OCF_OCF is not set
-# CONFIG_OCF_OCFNULL is not set
-# CONFIG_OCFS2_FS is not set
-# CONFIG_OCF_SAFE is not set
-# CONFIG_OCF_TALITOS is not set
-# CONFIG_OMFS_FS is not set
-# CONFIG_ORION_WATCHDOG is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_P54_COMMON is not set
-CONFIG_PACKET_MMAP=y
-CONFIG_PACKET=y
-# CONFIG_PAGE_POISONING is not set
-# CONFIG_PAGE_SIZE_16KB is not set
-# CONFIG_PAGE_SIZE_32KB is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_64KB is not set
-# CONFIG_PAGE_SIZE_8KB is not set
-# CONFIG_PANTHERLORD_FF is not set
-# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_PC is not set
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_PATA_ALI is not set
-# CONFIG_PATA_AMD is not set
-# CONFIG_PATA_ARTOP is not set
-# CONFIG_PATA_ATIIXP is not set
-# CONFIG_PATA_ATP867X is not set
-# CONFIG_PATA_CMD640_PCI is not set
-# CONFIG_PATA_CMD64X is not set
-# CONFIG_PATA_CS5520 is not set
-# CONFIG_PATA_CS5530 is not set
-# CONFIG_PATA_CS5535 is not set
-# CONFIG_PATA_CS5536 is not set
-# CONFIG_PATA_CYPRESS is not set
-# CONFIG_PATA_EFAR is not set
-# CONFIG_PATA_HPT366 is not set
-# CONFIG_PATA_HPT37X is not set
-# CONFIG_PATA_HPT3X2N is not set
-# CONFIG_PATA_HPT3X3 is not set
-# CONFIG_PATA_ISAPNP is not set
-# CONFIG_PATA_IT8213 is not set
-# CONFIG_PATA_IT821X is not set
-# CONFIG_PATA_JMICRON is not set
-# CONFIG_PATA_LEGACY is not set
-# CONFIG_PATA_MARVELL is not set
-# CONFIG_PATA_MPIIX is not set
-# CONFIG_PATA_NETCELL is not set
-# CONFIG_PATA_NINJA32 is not set
-# CONFIG_PATA_NS87410 is not set
-# CONFIG_PATA_NS87415 is not set
-# CONFIG_PATA_OLDPIIX is not set
-# CONFIG_PATA_OPTIDMA is not set
-# CONFIG_PATA_OPTI is not set
-# CONFIG_PATA_PCMCIA is not set
-# CONFIG_PATA_PDC2027X is not set
-# CONFIG_PATA_PDC_OLD is not set
-# CONFIG_PATA_PLATFORM is not set
-# CONFIG_PATA_QDI is not set
-# CONFIG_PATA_RADISYS is not set
-# CONFIG_PATA_RDC is not set
-# CONFIG_PATA_RZ1000 is not set
-# CONFIG_PATA_SC1200 is not set
-# CONFIG_PATA_SCH is not set
-# CONFIG_PATA_SERVERWORKS is not set
-# CONFIG_PATA_SIL680 is not set
-# CONFIG_PATA_SIS is not set
-# CONFIG_PATA_TOSHIBA is not set
-# CONFIG_PATA_TRIFLEX is not set
-# CONFIG_PATA_VIA is not set
-# CONFIG_PATA_WINBOND is not set
-# CONFIG_PATA_WINBOND_VLB is not set
-# CONFIG_PC300TOO is not set
-# CONFIG_PCCARD is not set
-# CONFIG_PCF8575 is not set
-# CONFIG_PCI is not set
-# CONFIG_PCI200SYN is not set
-# CONFIG_PCI_ATMEL is not set
-# CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_DISABLE_COMMON_QUIRKS is not set
-# CONFIG_PCIEAER_INJECT is not set
-# CONFIG_PCIEASPM is not set
-# CONFIG_PCIE_ECRC is not set
-# CONFIG_PCI_HERMES is not set
-# CONFIG_PCI_IOV is not set
-# CONFIG_PCI_LEGACY is not set
-# CONFIG_PCI_MSI is not set
-# CONFIG_PCIPCWATCHDOG is not set
-CONFIG_PCI_QUIRKS=y
-# CONFIG_PCI_STUB is not set
-CONFIG_PCI_SYSCALL=y
-# CONFIG_PCMCIA_AHA152X is not set
-# CONFIG_PCMCIA_ATMEL is not set
-# CONFIG_PCMCIA_DEBUG is not set
-# CONFIG_PCMCIA_FDOMAIN is not set
-# CONFIG_PCMCIA_HERMES is not set
-# CONFIG_PCMCIA_IOCTL is not set
-# CONFIG_PCMCIA is not set
-# CONFIG_PCMCIA_LOAD_CIS is not set
-# CONFIG_PCMCIA_NETWAVE is not set
-# CONFIG_PCMCIA_NINJA_SCSI is not set
-# CONFIG_PCMCIA_QLOGIC is not set
-# CONFIG_PCMCIA_RAYCS is not set
-# CONFIG_PCMCIA_SPECTRUM is not set
-# CONFIG_PCMCIA_SYM53C500 is not set
-# CONFIG_PCMCIA_WAVELAN is not set
-# CONFIG_PCMCIA_WL3501 is not set
-# CONFIG_PCNET32 is not set
-# CONFIG_PCSPKR_PLATFORM is not set
-# CONFIG_PD6729 is not set
-# CONFIG_PDC_ADMA is not set
-# CONFIG_PERF_COUNTERS is not set
-# CONFIG_PERF_EVENTS is not set
-# CONFIG_PHANTOM is not set
-# CONFIG_PHONE is not set
-# CONFIG_PHONET is not set
-# CONFIG_PHYLIB is not set
-# CONFIG_PHYS_ADDR_T_64BIT is not set
-# CONFIG_PID_NS is not set
-# CONFIG_PLAN9AUTH is not set
-CONFIG_PLIST=y
-# CONFIG_PLX_HERMES is not set
-# CONFIG_PMIC_ADP5520 is not set
-# CONFIG_PMIC_DA903X is not set
-# CONFIG_PM is not set
-# CONFIG_POHMELFS is not set
-# CONFIG_POSIX_MQUEUE is not set
-# CONFIG_POWER_SUPPLY is not set
-# CONFIG_PPC_16K_PAGES is not set
-# CONFIG_PPC_256K_PAGES is not set
-CONFIG_PPC_4K_PAGES=y
-CONFIG_PPC4xx_GPIO=y
-# CONFIG_PPC_64K_PAGES is not set
-# CONFIG_PPC_DISABLE_WERROR is not set
-# CONFIG_PPC_EMULATED_STATS is not set
-# CONFIG_PPP_ASYNC is not set
-# CONFIG_PPP_BSDCOMP is not set
-# CONFIG_PPP_DEFLATE is not set
-CONFIG_PPP_FILTER=y
-# CONFIG_PPP is not set
-# CONFIG_PPP_MPPE is not set
-CONFIG_PPP_MULTILINK=y
-# CONFIG_PPPOATM is not set
-# CONFIG_PPPOE is not set
-# CONFIG_PPPOL2TP is not set
-# CONFIG_PPP_SYNC_TTY is not set
-# CONFIG_PPS is not set
-# CONFIG_PREEMPT is not set
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_RCU is not set
-# CONFIG_PREEMPT_RCU_TRACE is not set
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_TI_DAC7512 is not set
-CONFIG_TINY_RCU=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_PRINTK_TIME is not set
-CONFIG_PRINTK=y
-# CONFIG_PRISM2_USB is not set
-# CONFIG_PRISM54 is not set
-# CONFIG_PROBE_INITRD_HEADER is not set
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-# CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_PROC_SYSCTL=y
-# CONFIG_PROFILING is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_QEMU is not set
-# CONFIG_QLA3XXX is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QSEMI_PHY is not set
-# CONFIG_QT2160 is not set
-# CONFIG_QUOTA is not set
-# CONFIG_R3964 is not set
-# CONFIG_R6040 is not set
-# CONFIG_R8169 is not set
-# CONFIG_RADIO_ADAPTERS is not set
-# CONFIG_RADIO_AZTECH is not set
-# CONFIG_RADIO_CADET is not set
-# CONFIG_RADIO_GEMTEK is not set
-# CONFIG_RADIO_GEMTEK_PCI is not set
-# CONFIG_RADIO_MAESTRO is not set
-# CONFIG_RADIO_MAXIRADIO is not set
-# CONFIG_RADIO_RTRACK2 is not set
-# CONFIG_RADIO_RTRACK is not set
-# CONFIG_RADIO_SF16FMI is not set
-# CONFIG_RADIO_SF16FMR2 is not set
-# CONFIG_RADIO_TERRATEC is not set
-# CONFIG_RADIO_TRUST is not set
-# CONFIG_RADIO_TYPHOON is not set
-# CONFIG_RADIO_ZOLTRIX is not set
-# CONFIG_RAID_ATTRS is not set
-CONFIG_RAMFS=y
-# CONFIG_RAR_REGISTER is not set
-# CONFIG_RAW_DRIVER is not set
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-CONFIG_RCU_FANOUT=32
-# CONFIG_RCU_FANOUT_EXACT is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-# CONFIG_RCU_TRACE is not set
-# CONFIG_RD_BZIP2 is not set
-# CONFIG_RDC_17F3101X is not set
-# CONFIG_RD_GZIP is not set
-CONFIG_RD_LZMA=y
-# CONFIG_RD_LZO is not set
-# CONFIG_RDS is not set
-# CONFIG_REALTEK_PHY is not set
-# CONFIG_REDWOOD is not set
-# CONFIG_REGULATOR_BQ24022 is not set
-# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
-# CONFIG_REGULATOR is not set
-# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_REISERFS_FS_XATTR is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-# CONFIG_RELAY is not set
-# CONFIG_RESOURCES_64BIT is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_RFKILL_INPUT is not set
-# CONFIG_RFKILL is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_ROSE is not set
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
-# CONFIG_RT2860 is not set
-# CONFIG_RT2870 is not set
-# CONFIG_RT2X00 is not set
-# CONFIG_RT3070 is not set
-# CONFIG_RT3090 is not set
-# CONFIG_RTC_CLASS is not set
-# CONFIG_RTC_DEBUG is not set
-# CONFIG_RTC_DRV_BQ32K is not set
-# CONFIG_RTC_DRV_BQ4802 is not set
-CONFIG_RTC_DRV_CMOS=y
-# CONFIG_RTC_DRV_DS1286 is not set
-# CONFIG_RTC_DRV_DS1305 is not set
-# CONFIG_RTC_DRV_DS1307 is not set
-# CONFIG_RTC_DRV_DS1374 is not set
-# CONFIG_RTC_DRV_DS1390 is not set
-# CONFIG_RTC_DRV_DS1511 is not set
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_DS1742 is not set
-# CONFIG_RTC_DRV_DS3234 is not set
-# CONFIG_RTC_DRV_FM3130 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
-# CONFIG_RTC_DRV_M41T80 is not set
-# CONFIG_RTC_DRV_M41T94 is not set
-# CONFIG_RTC_DRV_M48T35 is not set
-# CONFIG_RTC_DRV_M48T59 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_MAX6900 is not set
-# CONFIG_RTC_DRV_MAX6902 is not set
-# CONFIG_RTC_DRV_MSM6242 is not set
-# CONFIG_RTC_DRV_PCF2123 is not set
-# CONFIG_RTC_DRV_PCF50606 is not set
-# CONFIG_RTC_DRV_PCF8563 is not set
-# CONFIG_RTC_DRV_PCF8583 is not set
-# CONFIG_RTC_DRV_R9701 is not set
-# CONFIG_RTC_DRV_RP5C01 is not set
-# CONFIG_RTC_DRV_RS5C348 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set
-# CONFIG_RTC_DRV_RTC7301 is not set
-# CONFIG_RTC_DRV_RX8025 is not set
-# CONFIG_RTC_DRV_RX8581 is not set
-# CONFIG_RTC_DRV_S35390A is not set
-# CONFIG_RTC_DRV_STK17TA8 is not set
-# CONFIG_RTC_DRV_TEST is not set
-# CONFIG_RTC_DRV_V3020 is not set
-# CONFIG_RTC_DRV_X1205 is not set
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_HCTOSYS=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_LIB=y
-# CONFIG_RTL8180 is not set
-# CONFIG_RTL8187 is not set
-# CONFIG_RTL8187SE is not set
-# CONFIG_RTL8192E is not set
-# CONFIG_RTL8192U is not set
-# CONFIG_RTL8192SU is not set
-# CONFIG_RTL8306_PHY is not set
-# CONFIG_RTL8366_SMI is not set
-# CONFIG_RTL8366S_PHY_DEBUG_FS is not set
-# CONFIG_RTL8366S_PHY is not set
-# CONFIG_RTL8366RB_PHY is not set
-CONFIG_RT_MUTEXES=y
-# CONFIG_RT_MUTEX_TESTER is not set
-# CONFIG_RUNTIME_DEBUG is not set
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_S2IO is not set
-# CONFIG_SAMPLES is not set
-# CONFIG_SATA_AHCI is not set
-# CONFIG_SATA_INIC162X is not set
-# CONFIG_SATA_MV is not set
-# CONFIG_SATA_NV is not set
-# CONFIG_SATA_PMP is not set
-# CONFIG_SATA_PROMISE is not set
-# CONFIG_SATA_QSTOR is not set
-# CONFIG_SATA_SIL24 is not set
-# CONFIG_SATA_SIL is not set
-# CONFIG_SATA_SIS is not set
-# CONFIG_SATA_SVW is not set
-# CONFIG_SATA_SX4 is not set
-# CONFIG_SATA_ULI is not set
-# CONFIG_SATA_VIA is not set
-# CONFIG_SATA_VITESSE is not set
-# CONFIG_SBC_FITPC2_WATCHDOG is not set
-# CONFIG_SC92031 is not set
-# CONFIG_SCC is not set
-# CONFIG_SCHED_BFS is not set
-CONFIG_SCHED_CFS=y
-# CONFIG_SCHED_DEBUG is not set
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_3W_SAS is not set
-# CONFIG_SCSI_7000FASST is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_AHA152X is not set
-# CONFIG_SCSI_AHA1542 is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-# CONFIG_SCSI_AIC94XX is not set
-# CONFIG_SCSI_ARCMSR is not set
-# CONFIG_SCSI_BFA_FC is not set
-# CONFIG_SCSI_BNX2_ISCSI is not set
-# CONFIG_SCSI_BUSLOGIC is not set
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_DC390T is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_DH is not set
-CONFIG_SCSI_DMA=y
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_DPT_I2O is not set
-# CONFIG_SCSI_DTC3280 is not set
-# CONFIG_SCSI_EATA is not set
-# CONFIG_SCSI_ESP_CORE is not set
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
-# CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_HPSA is not set
-# CONFIG_SCSI_IN2000 is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_IPR is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
-CONFIG_SCSI_LOWLEVEL=y
-# CONFIG_SCSI_LPFC is not set
-# CONFIG_SCSI_MPT2SAS is not set
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_MVSAS is not set
-# CONFIG_SCSI_MVSAS_DEBUG is not set
-# CONFIG_SCSI_NCR53C406A is not set
-# CONFIG_SCSI_NETLINK is not set
-# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_OSD_INITIATOR is not set
-# CONFIG_SCSI_PAS16 is not set
-# CONFIG_SCSI_PM8001 is not set
-# CONFIG_SCSI_PMCRAID is not set
-CONFIG_SCSI_PROC_FS=y
-# CONFIG_SCSI_PSI240I is not set
-# CONFIG_SCSI_QLA_FC is not set
-# CONFIG_SCSI_QLA_ISCSI is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLOGIC_FAS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
-# CONFIG_SCSI_SAS_LIBSAS is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-# CONFIG_SCSI_SEAGATE is not set
-# CONFIG_SCSI_SPI_ATTRS is not set
-# CONFIG_SCSI_SRP_ATTRS is not set
-# CONFIG_SCSI_SRP is not set
-# CONFIG_SCSI_STEX is not set
-# CONFIG_SCSI_SYM53C416 is not set
-# CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_T128 is not set
-# CONFIG_SCSI_TGT is not set
-# CONFIG_SCSI_U14_34F is not set
-# CONFIG_SCSI_ULTRASTOR is not set
-CONFIG_SCSI_WAIT_SCAN=m
-# CONFIG_SECCOMP is not set
-# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-# CONFIG_SECURITYFS is not set
-# CONFIG_SECURITY is not set
-CONFIG_SELECT_MEMORY_MODEL=y
-# CONFIG_SENSORS_ABITUGURU3 is not set
-# CONFIG_SENSORS_ABITUGURU is not set
-# CONFIG_SENSORS_AD7414 is not set
-# CONFIG_SENSORS_AD7418 is not set
-# CONFIG_SENSORS_ADCXX is not set
-# CONFIG_SENSORS_ADM1021 is not set
-# CONFIG_SENSORS_ADM1025 is not set
-# CONFIG_SENSORS_ADM1026 is not set
-# CONFIG_SENSORS_ADM1029 is not set
-# CONFIG_SENSORS_ADM1031 is not set
-# CONFIG_SENSORS_ADM9240 is not set
-# CONFIG_SENSORS_ADS7828 is not set
-# CONFIG_SENSORS_ADT7462 is not set
-# CONFIG_SENSORS_ADT7470 is not set
-# CONFIG_SENSORS_ADT7473 is not set
-# CONFIG_SENSORS_ADT7475 is not set
-# CONFIG_SENSORS_AMC6821 is not set
-# CONFIG_SENSORS_APPLESMC is not set
-# CONFIG_SENSORS_ASB100 is not set
-# CONFIG_SENSORS_ATK0110 is not set
-# CONFIG_SENSORS_ATXP1 is not set
-# CONFIG_SENSORS_CORETEMP is not set
-# CONFIG_SENSORS_DME1737 is not set
-# CONFIG_SENSORS_DS1337 is not set
-# CONFIG_SENSORS_DS1374 is not set
-# CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_EEPROM is not set
-# CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_F71882FG is not set
-# CONFIG_SENSORS_F75375S is not set
-# CONFIG_SENSORS_FSCHER is not set
-# CONFIG_SENSORS_FSCHMD is not set
-# CONFIG_SENSORS_FSCPOS is not set
-# CONFIG_SENSORS_G760A is not set
-# CONFIG_SENSORS_GL518SM is not set
-# CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_HDAPS is not set
-# CONFIG_SENSORS_I5K_AMB is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_K8TEMP is not set
-# CONFIG_SENSORS_LIS3LV02D is not set
-# CONFIG_SENSORS_LIS3_I2C is not set
-# CONFIG_SENSORS_LIS3_SPI is not set
-# CONFIG_SENSORS_LM63 is not set
-# CONFIG_SENSORS_LM70 is not set
-# CONFIG_SENSORS_LM73 is not set
-# CONFIG_SENSORS_LM75 is not set
-# CONFIG_SENSORS_LM77 is not set
-# CONFIG_SENSORS_LM78 is not set
-# CONFIG_SENSORS_LM80 is not set
-# CONFIG_SENSORS_LM83 is not set
-# CONFIG_SENSORS_LM85 is not set
-# 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_LM95241 is not set
-# CONFIG_SENSORS_LTC4215 is not set
-# CONFIG_SENSORS_LTC4245 is not set
-# CONFIG_SENSORS_M41T00 is not set
-# CONFIG_SENSORS_MAX1111 is not set
-# CONFIG_SENSORS_MAX1619 is not set
-# CONFIG_SENSORS_MAX6650 is not set
-# CONFIG_SENSORS_MAX6875 is not set
-# CONFIG_SENSORS_PC87360 is not set
-# CONFIG_SENSORS_PC87427 is not set
-# CONFIG_SENSORS_PCA9539 is not set
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_SENSORS_SHT15 is not set
-# CONFIG_SENSORS_SIS5595 is not set
-# CONFIG_SENSORS_SMSC47B397 is not set
-# CONFIG_SENSORS_SMSC47M192 is not set
-# CONFIG_SENSORS_SMSC47M1 is not set
-# CONFIG_SENSORS_THMC50 is not set
-# CONFIG_SENSORS_TMP401 is not set
-# CONFIG_SENSORS_TMP421 is not set
-# CONFIG_SENSORS_TSL2550 is not set
-# CONFIG_SENSORS_VIA686A is not set
-# CONFIG_SENSORS_VT1211 is not set
-# CONFIG_SENSORS_VT8231 is not set
-# CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83781D is not set
-# CONFIG_SENSORS_W83791D is not set
-# CONFIG_SENSORS_W83792D is not set
-# CONFIG_SENSORS_W83793 is not set
-# CONFIG_SENSORS_W83L785TS is not set
-# CONFIG_SENSORS_W83L786NG is not set
-CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_SERIAL_8250_CS is not set
-CONFIG_SERIAL_8250_NR_UARTS=2
-# CONFIG_SERIAL_8250_PCI is not set
-CONFIG_SERIAL_8250_RUNTIME_UARTS=2
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_CORE=y
-# CONFIG_SERIAL_JSM is not set
-# CONFIG_SERIAL_MAX3100 is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
-# CONFIG_SERIAL_UARTLITE is not set
-# CONFIG_SERIO is not set
-# CONFIG_SFI is not set
-# CONFIG_SGI_IOC4 is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_SHAPER is not set
-CONFIG_SHMEM=y
-CONFIG_SIGNALFD=y
-# CONFIG_SIMPLE_GPIO is not set
-# CONFIG_SIS190 is not set
-# CONFIG_SIS900 is not set
-# CONFIG_SK98LIN is not set
-# CONFIG_SKGE is not set
-# CONFIG_SKY2_DEBUG is not set
-# CONFIG_SKY2 is not set
-CONFIG_SLABINFO=y
-CONFIG_SLAB=y
-# CONFIG_SLHC is not set
-# CONFIG_SLICOSS is not set
-# CONFIG_SLIP is not set
-# CONFIG_SLOB is not set
-# CONFIG_SLOW_WORK_DEBUG is not set
-# CONFIG_SLOW_WORK is not set
-# CONFIG_SLUB_DEBUG is not set
-# CONFIG_SLUB is not set
-# CONFIG_SMARTJOYPLUS_FF is not set
-# CONFIG_SMB_FS is not set
-# CONFIG_SMB_NLS_DEFAULT is not set
-# CONFIG_SMC911X is not set
-# CONFIG_SMC91X is not set
-# CONFIG_SMP is not set
-# CONFIG_SMSC911X is not set
-# CONFIG_SMSC9420 is not set
-# CONFIG_SMSC_PHY is not set
-# CONFIG_SND_AC97_POWER_SAVE is not set
-# CONFIG_SND_AD1816A is not set
-# CONFIG_SND_AD1848 is not set
-# CONFIG_SND_AD1889 is not set
-# CONFIG_SND_ADLIB is not set
-# CONFIG_SND_ALI5451 is not set
-# CONFIG_SND_ALS100 is not set
-# CONFIG_SND_ALS300 is not set
-# CONFIG_SND_ALS4000 is not set
-# CONFIG_SND_ARM is not set
-# CONFIG_SND_ATIIXP is not set
-# CONFIG_SND_ATIIXP_MODEM is not set
-# CONFIG_SND_AU8810 is not set
-# CONFIG_SND_AU8820 is not set
-# CONFIG_SND_AU8830 is not set
-# CONFIG_SND_AW2 is not set
-# CONFIG_SND_AZT2320 is not set
-# CONFIG_SND_AZT3328 is not set
-# CONFIG_SND_BT87X is not set
-# CONFIG_SND_CA0106 is not set
-# CONFIG_SND_CMI8330 is not set
-# CONFIG_SND_CMIPCI is not set
-# CONFIG_SND_CS4231 is not set
-# CONFIG_SND_CS4232 is not set
-# CONFIG_SND_CS4236 is not set
-# CONFIG_SND_CS4281 is not set
-# CONFIG_SND_CS46XX is not set
-# CONFIG_SND_CS5530 is not set
-# CONFIG_SND_CS5535AUDIO is not set
-# CONFIG_SND_CTXFI is not set
-# CONFIG_SND_DARLA20 is not set
-# CONFIG_SND_DARLA24 is not set
-# CONFIG_SND_DEBUG is not set
-CONFIG_SND_DRIVERS=y
-# CONFIG_SND_DT019X is not set
-# CONFIG_SND_DUMMY is not set
-# CONFIG_SND_DYNAMIC_MINORS is not set
-# CONFIG_SND_ECHO3G is not set
-# CONFIG_SND_EMU10K1 is not set
-# CONFIG_SND_EMU10K1X is not set
-# CONFIG_SND_ENS1370 is not set
-# CONFIG_SND_ENS1371 is not set
-# CONFIG_SND_ES1688 is not set
-# CONFIG_SND_ES18XX is not set
-# CONFIG_SND_ES1938 is not set
-# CONFIG_SND_ES1968 is not set
-# CONFIG_SND_ES968 is not set
-# CONFIG_SND_FM801 is not set
-# CONFIG_SND_GINA20 is not set
-# CONFIG_SND_GINA24 is not set
-# CONFIG_SND_GUSCLASSIC is not set
-# CONFIG_SND_GUSEXTREME is not set
-# CONFIG_SND_GUSMAX is not set
-# CONFIG_SND_HDA_INTEL is not set
-# CONFIG_SND_HDSP is not set
-# CONFIG_SND_HDSPM is not set
-# CONFIG_SND_HIFIER is not set
-# CONFIG_SND_HRTIMER is not set
-# CONFIG_SND_HWDEP is not set
-# CONFIG_SND_ICE1712 is not set
-# CONFIG_SND_ICE1724 is not set
-# CONFIG_SND_INDIGODJ is not set
-# CONFIG_SND_INDIGODJX is not set
-# CONFIG_SND_INDIGOIO is not set
-# CONFIG_SND_INDIGOIOX is not set
-# CONFIG_SND_INDIGO is not set
-# CONFIG_SND_INTEL8X0 is not set
-# CONFIG_SND_INTEL8X0M is not set
-# CONFIG_SND_INTERWAVE is not set
-# CONFIG_SND_INTERWAVE_STB is not set
-# CONFIG_SND_ISA is not set
-# CONFIG_SND is not set
-# CONFIG_SND_KORG1212 is not set
-# CONFIG_SND_LAYLA20 is not set
-# CONFIG_SND_LAYLA24 is not set
-# CONFIG_SND_LX6464ES is not set
-# CONFIG_SND_MAESTRO3 is not set
-# CONFIG_SND_MIA is not set
-# CONFIG_SND_MIPS is not set
-# CONFIG_SND_MIRO is not set
-# CONFIG_SND_MIXART is not set
-# CONFIG_SND_MIXER_OSS is not set
-# CONFIG_SND_MONA is not set
-# CONFIG_SND_MPU401 is not set
-# CONFIG_SND_MTPAV is not set
-# CONFIG_SND_NM256 is not set
-# CONFIG_SND_OPL3SA2 is not set
-# CONFIG_SND_OPTI92X_AD1848 is not set
-# CONFIG_SND_OPTI92X_CS4231 is not set
-# CONFIG_SND_OPTI93X is not set
-CONFIG_SND_OSSEMUL=y
-# CONFIG_SND_OXYGEN is not set
-CONFIG_SND_PCI=y
-# CONFIG_SND_PCMCIA is not set
-# CONFIG_SND_PCM is not set
-# CONFIG_SND_PCM_OSS is not set
-CONFIG_SND_PCM_OSS_PLUGINS=y
-# CONFIG_SND_PCXHR is not set
-# CONFIG_SND_PDAUDIOCF is not set
-# CONFIG_SND_RAWMIDI is not set
-# CONFIG_SND_RIPTIDE is not set
-# CONFIG_SND_RME32 is not set
-# CONFIG_SND_RME9652 is not set
-# CONFIG_SND_RME96 is not set
-# CONFIG_SND_RTCTIMER is not set
-# CONFIG_SND_SB16 is not set
-# CONFIG_SND_SB8 is not set
-# CONFIG_SND_SBAWE is not set
-# CONFIG_SND_SEQUENCER is not set
-# CONFIG_SND_SERIAL_U16550 is not set
-# CONFIG_SND_SIS7019 is not set
-# CONFIG_SND_SGALAXY is not set
-# CONFIG_SND_SOC is not set
-# CONFIG_SND_SONICVIBES is not set
-# CONFIG_SND_SPI is not set
-# CONFIG_SND_SSCAPE is not set
-# CONFIG_SND_SUPPORT_OLD_API is not set
-# CONFIG_SND_TIMER is not set
-# CONFIG_SND_TRIDENT is not set
-# CONFIG_SND_USB_AUDIO is not set
-# CONFIG_SND_USB_CAIAQ is not set
-# CONFIG_SND_USB_US122L is not set
-# CONFIG_SND_USB_USX2Y is not set
-CONFIG_SND_USB=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VIA82XX is not set
-# CONFIG_SND_VIA82XX_MODEM is not set
-# CONFIG_SND_VIRTUOSO is not set
-# CONFIG_SND_VX222 is not set
-# CONFIG_SND_VXPOCKET is not set
-# CONFIG_SND_WAVEFRONT is not set
-# CONFIG_SND_YMFPCI is not set
-# CONFIG_SNI_RM is not set
-# CONFIG_SOC_CAMERA is not set
-# CONFIG_SOFT_WATCHDOG is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_SONYPI is not set
-# CONFIG_SONY_LAPTOP is not set
-# CONFIG_SOUND is not set
-# CONFIG_SOUND_PRIME is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-# CONFIG_SPI_AT25 is not set
-# CONFIG_SPI_DEBUG is not set
-# CONFIG_SPI_DESIGNWARE is not set
-# CONFIG_SPI_GPIO_OLD is not set
-# CONFIG_SPI is not set
-# CONFIG_SPI_MASTER is not set
-# CONFIG_SPI_ORION is not set
-# CONFIG_SPI_TLE62X0 is not set
-# CONFIG_SPI_XILINX is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-CONFIG_SQUASHFS_LZMA=y
-CONFIG_SQUASHFS_SUPPORT_ZLIB=y
-# CONFIG_SQUASHFS_VMALLOC is not set
-CONFIG_SQUASHFS=y
-# CONFIG_SSB_BLOCKIO is not set
-# CONFIG_SSB_DEBUG is not set
-# CONFIG_SSB is not set
-# CONFIG_SSB_PCMCIAHOST is not set
-CONFIG_SSB_POSSIBLE=y
-# CONFIG_SSB_SDIOHOST is not set
-# CONFIG_SSB_SILENT is not set
-# CONFIG_SSFDC is not set
-# CONFIG_STACK_TRACER is not set
-CONFIG_STACKTRACE_SUPPORT=y
-# CONFIG_STAGING_EXCLUDE_BUILD is not set
-CONFIG_STAGING=y
-CONFIG_STANDALONE=y
-CONFIG_STDBINUTILS=y
-# CONFIG_STE10XP is not set
-CONFIG_STP=y
-CONFIG_STRIP_ASM_SYMS=y
-# CONFIG_STRIP is not set
-# CONFIG_SUNDANCE is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_SUNRPC_BIND34 is not set
-# CONFIG_SUNRPC_GSS is not set
-# CONFIG_SUNRPC is not set
-# CONFIG_SUNRPC_REGISTER_V4 is not set
-CONFIG_SUSPEND_UP_POSSIBLE=y
-CONFIG_SWAP=y
-# CONFIG_SWCONFIG is not set
-# CONFIG_SYNCLINK_CS is not set
-CONFIG_SYN_COOKIES=y
-CONFIG_SYSCTL_SYSCALL_CHECK=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_SYSCTL=y
-# CONFIG_SYSFS_DEPRECATED is not set
-# CONFIG_SYSFS_DEPRECATED_V2 is not set
-CONFIG_SYSFS=y
-# CONFIG_SYS_HYPERVISOR is not set
-# CONFIG_SYSV68_PARTITION is not set
-# CONFIG_SYSV_FS is not set
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_SYSVIPC=y
-# CONFIG_TASKSTATS is not set
-# CONFIG_TCG_TPM is not set
-# CONFIG_TCIC is not set
-CONFIG_TCP_CONG_ADVANCED=y
-# CONFIG_TCP_CONG_BIC is not set
-# CONFIG_TCP_CONG_CUBIC is not set
-# CONFIG_TCP_CONG_HSTCP is not set
-# CONFIG_TCP_CONG_HTCP is not set
-# CONFIG_TCP_CONG_HYBLA is not set
-# CONFIG_TCP_CONG_ILLINOIS is not set
-# CONFIG_TCP_CONG_LP is not set
-# CONFIG_TCP_CONG_SCALABLE is not set
-# CONFIG_TCP_CONG_VEGAS is not set
-# CONFIG_TCP_CONG_VENO is not set
-CONFIG_TCP_CONG_WESTWOOD=y
-# CONFIG_TCP_CONG_YEAH is not set
-# CONFIG_TCP_MD5SIG is not set
-# CONFIG_TEXTSEARCH_BM is not set
-# CONFIG_TEXTSEARCH_FSM is not set
-# CONFIG_TEXTSEARCH_KMP is not set
-CONFIG_TEXTSEARCH=y
-# CONFIG_THERMAL_HWMON is not set
-# CONFIG_THERMAL is not set
-# CONFIG_THRUSTMASTER_FF is not set
-CONFIG_TICK_ONESHOT=y
-# CONFIG_TIFM_CORE is not set
-# CONFIG_TIGON3 is not set
-CONFIG_TIMERFD=y
-# CONFIG_TINY_SHMEM is not set
-# CONFIG_TIPC is not set
-# CONFIG_TLAN is not set
-# CONFIG_TMD_HERMES is not set
-# CONFIG_TMPFS_POSIX_ACL is not set
-CONFIG_TMPFS=y
-# CONFIG_TOUCHSCREEN_AD7877 is not set
-# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
-# CONFIG_TOUCHSCREEN_AD7879 is not set
-# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
-# CONFIG_TOUCHSCREEN_ADS7846 is not set
-# CONFIG_TOUCHSCREEN_EETI is not set
-# CONFIG_TOUCHSCREEN_ELO is not set
-# CONFIG_TOUCHSCREEN_FILTER is not set
-# CONFIG_TOUCHSCREEN_FUJITSU is not set
-# CONFIG_TOUCHSCREEN_GUNZE is not set
-# CONFIG_TOUCHSCREEN_INEXIO is not set
-# CONFIG_TOUCHSCREEN_MK712 is not set
-# CONFIG_TOUCHSCREEN_MTOUCH is not set
-# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-# CONFIG_TOUCHSCREEN_S3C2410 is not set
-# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
-# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-# CONFIG_TOUCHSCREEN_TSC2007 is not set
-# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-# CONFIG_TOUCHSCREEN_W90X900 is not set
-# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
-# CONFIG_TPS65010 is not set
-# CONFIG_TRACE_BRANCH_PROFILING is not set
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_TRACING_SUPPORT=y
-# CONFIG_TRANZPORT is not set
-# CONFIG_TREE_RCU is not set
-# CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_TR is not set
-# CONFIG_TUNER_3036 is not set
-# CONFIG_TUNER_TEA5761 is not set
-# CONFIG_TUN is not set
-# CONFIG_TWL4030_CORE is not set
-# CONFIG_UACCESS_WITH_MEMCPY is not set
-# CONFIG_UCB1400_CORE is not set 
-# CONFIG_UDF_FS is not set
-CONFIG_UDF_NLS=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_UFS_FS is not set
-# CONFIG_UIO is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_UNEVICTABLE_LRU is not set
-# CONFIG_UNION_MOUNT is not set
-CONFIG_UNIX98_PTYS=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_UNIX=y
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_USB_ACECAD is not set
-# CONFIG_USB_ACM is not set
-# CONFIG_USB_ADUTUX is not set
-# CONFIG_USB_AIPTEK is not set
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-# CONFIG_USB_APPLEDISPLAY is not set
-# CONFIG_USB_APPLETOUCH is not set
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARMLINUX=y
-# CONFIG_USB_ATI_REMOTE2 is not set
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_ATMEL is not set
-# CONFIG_USB_ATM is not set
-# CONFIG_USB_AUERSWALD is not set
-# CONFIG_USB_BANDWIDTH is not set
-CONFIG_USB_BELKIN=y
-# CONFIG_USB_BERRY_CHARGE is not set
-# CONFIG_USB_C67X00_HCD is not set
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_CPC is not set
-# CONFIG_USB_CXACRU is not set
-# CONFIG_USB_CYPRESS_CY7C63 is not set
-# CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_DABUSB is not set
-# CONFIG_USB_DEBUG is not set
-# CONFIG_USB_DEVICE_CLASS is not set
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DSBR is not set
-# CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_EHCI_HCD_PPC_OF is not set
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-# CONFIG_USB_EHCI_SPLIT_ISO is not set
-# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-# CONFIG_USB_EMI26 is not set
-# CONFIG_USB_EMI62 is not set
-# CONFIG_USB_EPSON2888 is not set
-# CONFIG_USB_ET61X251 is not set
-CONFIG_USB_EZUSB=y
-# CONFIG_USB_FTDI_ELAN is not set
-# CONFIG_USB_GADGET is not set
-# CONFIG_USB_GADGET_DEBUG is not set
-# CONFIG_USB_GL860 is not set
-# CONFIG_USB_GPIO_VBUS is not set
-# CONFIG_USB_GSPCA_CONEX is not set
-# CONFIG_USB_GSPCA_ETOMS is not set
-# CONFIG_USB_GSPCA_FINEPIX is not set
-# CONFIG_USB_GSPCA is not set
-# CONFIG_USB_GSPCA_JEILINJ is not set
-# CONFIG_USB_GSPCA_MARS is not set
-# CONFIG_USB_GSPCA_MR97310A is not set
-# CONFIG_USB_GSPCA_OV519 is not set
-# CONFIG_USB_GSPCA_OV534 is not set
-# CONFIG_USB_GSPCA_PAC207 is not set
-# CONFIG_USB_GSPCA_PAC7302 is not set
-# CONFIG_USB_GSPCA_PAC7311 is not set
-CONFIG_USB_GSPCA_SN9C20X_EVDEV=y
-# CONFIG_USB_GSPCA_SN9C20X is not set
-# CONFIG_USB_GSPCA_SONIXB is not set
-# CONFIG_USB_GSPCA_SONIXJ is not set
-# CONFIG_USB_GSPCA_SPCA500 is not set
-# CONFIG_USB_GSPCA_SPCA501 is not set
-# CONFIG_USB_GSPCA_SPCA505 is not set
-# CONFIG_USB_GSPCA_SPCA506 is not set
-# CONFIG_USB_GSPCA_SPCA508 is not set
-# CONFIG_USB_GSPCA_SPCA561 is not set
-# CONFIG_USB_GSPCA_SQ905C is not set
-# CONFIG_USB_GSPCA_SQ905 is not set
-# CONFIG_USB_GSPCA_STK014 is not set
-# CONFIG_USB_GSPCA_STV0680 is not set
-# CONFIG_USB_GSPCA_SUNPLUS is not set
-# CONFIG_USB_GSPCA_T613 is not set
-# CONFIG_USB_GSPCA_TV8532 is not set
-# CONFIG_USB_GSPCA_VC032X is not set
-# CONFIG_USB_GSPCA_ZC3XX is not set
-# CONFIG_USB_HIDDEV is not set
-# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-CONFIG_USB_HIDINPUT=y
-# CONFIG_USB_HID is not set
-# CONFIG_USB_HSO is not set
-# CONFIG_USB_HWA_HCD is not set
-# CONFIG_USB_IBMCAM is not set
-# CONFIG_USB_IDMOUSE is not set
-# CONFIG_USB_IOWARRIOR is not set
-# CONFIG_USB_IP_COMMON is not set
-# CONFIG_USB_ISIGHTFW is not set
-# CONFIG_USB is not set
-# CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_ISP1362_HCD is not set
-# CONFIG_USB_ISP1760_HCD is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_KC2190 is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-# CONFIG_USB_KONICAWC is not set
-# CONFIG_USB_LCD is not set
-# CONFIG_USB_LD is not set
-# CONFIG_USB_LED is not set
-# CONFIG_USB_LEGOTOWER is not set
-# CONFIG_USB_LIBUSUAL is not set
-# CONFIG_USB_M5602 is not set
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_MICROTEK is not set
-# CONFIG_USB_MON is not set
-# CONFIG_USB_MOUSE is not set
-# CONFIG_USB_MUSB_HDRC is not set
-# CONFIG_USB_NET_AX8817X is not set
-# CONFIG_USB_NET_CDC_EEM is not set
-# CONFIG_USB_NET_CDCETHER is not set
-# CONFIG_USB_NET_CDC_SUBSET is not set
-# CONFIG_USB_NET_DM9601 is not set
-# CONFIG_USB_NET_GL620A is not set
-# CONFIG_USB_NET_INT51X1 is not set
-# CONFIG_USB_NET_MCS7830 is not set
-# CONFIG_USB_NET_NET1080 is not set
-# CONFIG_USB_NET_PLUSB is not set
-# CONFIG_USB_NET_RNDIS_HOST is not set
-# CONFIG_USB_NET_RNDIS_WLAN is not set
-# CONFIG_USB_NET_SMSC95XX is not set
-# CONFIG_USB_NET_ZAURUS is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN is not set
-# CONFIG_USB_OHCI_HCD is not set
-# CONFIG_USB_OHCI_HCD_PCI is not set
-# CONFIG_USB_OHCI_HCD_PPC_OF is not set
-# CONFIG_USB_OHCI_HCD_PPC_SOC is not set
-# CONFIG_USB_OHCI_HCD_SSB is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-# CONFIG_USB_OTG is not set
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OV511 is not set
-# CONFIG_USB_OXU210HP_HCD is not set
-# CONFIG_USBPCWATCHDOG is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_PHIDGET is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_PWC_INPUT_EVDEV is not set
-# CONFIG_USB_QUICKCAM_MESSENGER is not set
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_RIO500 is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_S2255 is not set
-# CONFIG_USB_SE401 is not set
-# CONFIG_USB_SERIAL_AIRCABLE is not set
-# CONFIG_USB_SERIAL_AIRPRIME is not set
-# CONFIG_USB_SERIAL_ARK3116 is not set
-# CONFIG_USB_SERIAL_BELKIN is not set
-# CONFIG_USB_SERIAL_CH341 is not set
-# CONFIG_USB_SERIAL_CP2101 is not set
-# CONFIG_USB_SERIAL_CP210X is not set
-# CONFIG_USB_SERIAL_CYBERJACK is not set
-# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
-# CONFIG_USB_SERIAL_DEBUG is not set
-# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
-# CONFIG_USB_SERIAL_EDGEPORT is not set
-# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
-# CONFIG_USB_SERIAL_EMPEG is not set
-# CONFIG_USB_SERIAL_FTDI_SIO is not set
-# CONFIG_USB_SERIAL_FUNSOFT is not set
-# CONFIG_USB_SERIAL_GARMIN is not set
-CONFIG_USB_SERIAL_GENERIC=y
-# CONFIG_USB_SERIAL_HP4X is not set
-# CONFIG_USB_SERIAL_IPAQ is not set
-# CONFIG_USB_SERIAL_IPW is not set
-# CONFIG_USB_SERIAL_IR is not set
-# CONFIG_USB_SERIAL is not set
-# CONFIG_USB_SERIAL_IUU is not set
-# CONFIG_USB_SERIAL_KEYSPAN is not set
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-# CONFIG_USB_SERIAL_KLSI is not set
-# CONFIG_USB_SERIAL_KOBIL_SCT is not set
-# CONFIG_USB_SERIAL_MCT_U232 is not set
-# CONFIG_USB_SERIAL_MOS7720 is not set
-# CONFIG_USB_SERIAL_MOS7840 is not set
-# CONFIG_USB_SERIAL_MOTOROLA is not set
-# CONFIG_USB_SERIAL_NAVMAN is not set
-# CONFIG_USB_SERIAL_OMNINET is not set
-# CONFIG_USB_SERIAL_OPTICON is not set
-# CONFIG_USB_SERIAL_OPTION is not set
-# CONFIG_USB_SERIAL_OTI6858 is not set
-# CONFIG_USB_SERIAL_PL2303 is not set
-# CONFIG_USB_SERIAL_QUALCOMM is not set
-# CONFIG_USB_SERIAL_QUATECH2 is not set
-# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
-# CONFIG_USB_SERIAL_SAFE is not set
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
-# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
-# CONFIG_USB_SERIAL_SPCP8X5 is not set
-# CONFIG_USB_SERIAL_SYMBOL is not set
-# CONFIG_USB_SERIAL_TI is not set
-# CONFIG_USB_SERIAL_VISOR is not set
-# CONFIG_USB_SERIAL_WHITEHEAT is not set
-# CONFIG_USB_SERIAL_XIRCOM is not set
-# CONFIG_USB_SEVSEG is not set
-# CONFIG_USB_SISUSBVGA is not set
-# CONFIG_USB_SL811_HCD is not set
-# CONFIG_USB_SN9C102 is not set
-# CONFIG_USB_SPEEDTOUCH is not set
-# CONFIG_USB_STKWEBCAM is not set
-CONFIG_USB_STORAGE_ALAUDA=y
-# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
-CONFIG_USB_STORAGE_DATAFAB=y
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_DPCM=y
-CONFIG_USB_STORAGE_FREECOM=y
-# CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE is not set
-CONFIG_USB_STORAGE_JUMPSHOT=y
-CONFIG_USB_STORAGE_KARMA=y
-# CONFIG_USB_STORAGE_ONETOUCH is not set
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-# CONFIG_USB_STORAGE_SIERRA is not set
-CONFIG_USB_STORAGE_USBAT=y
-# CONFIG_USB_STV06XX is not set
-# CONFIG_USB_STV680 is not set
-# CONFIG_USB_SUPPORT is not set
-# CONFIG_USB_SUSPEND is not set
-# CONFIG_USB_TEST is not set
-# CONFIG_USB_TMC is not set
-# CONFIG_USB_TOUCHSCREEN is not set
-# CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_UEAGLEATM is not set
-# CONFIG_USB_ULPI is not set
-# CONFIG_USB_USBNET is not set
-# CONFIG_USB_USBNET_MII is not set
-# CONFIG_USB_VICAM is not set
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-# CONFIG_USB_VIDEO_CLASS is not set
-# CONFIG_USB_VST is not set
-# CONFIG_USB_W9968CF is not set
-# CONFIG_USB_WACOM is not set
-# CONFIG_USB_WDM is not set
-# CONFIG_USB_WHCI_HCD is not set
-# CONFIG_USB_WUSB_CBAF is not set
-# CONFIG_USB_WUSB is not set
-# CONFIG_USB_XHCI_HCD is not set
-# CONFIG_USB_XPAD is not set
-# CONFIG_USB_XUSBATM is not set
-# CONFIG_USB_YEALINK is not set
-# CONFIG_USB_ZC0301 is not set
-# CONFIG_USB_ZD1201 is not set
-# CONFIG_USB_ZR364XX is not set
-# CONFIG_USE_GENERIC_SMP_HELPERS is not set
-# CONFIG_UTS_NS is not set
-# CONFIG_UWB is not set
-# CONFIG_VETH is not set
-# CONFIG_VFAT_FS is not set
-# CONFIG_VGA_ARB is not set
-# CONFIG_VGASTATE is not set
-# CONFIG_VIA_RHINE is not set
-# CONFIG_VIA_VELOCITY is not set
-# CONFIG_VIDEO_ADV7170 is not set
-# CONFIG_VIDEO_ADV7175 is not set
-# CONFIG_VIDEO_ADV7180 is not set
-# CONFIG_VIDEO_ADV7343 is not set
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_ALLOW_V4L1 is not set
-# CONFIG_VIDEO_BT819 is not set
-# CONFIG_VIDEO_BT848 is not set
-# CONFIG_VIDEO_BT856 is not set
-# CONFIG_VIDEO_BT866 is not set
-# CONFIG_VIDEO_CAFE_CCIC is not set
-# CONFIG_VIDEO_CAPTURE_DRIVERS is not set
-# CONFIG_VIDEO_CPIA is not set
-# CONFIG_VIDEO_CS5345 is not set
-# CONFIG_VIDEO_CS53L32A is not set
-# CONFIG_VIDEO_CX231XX is not set
-# CONFIG_VIDEO_CX2341X is not set
-# CONFIG_VIDEO_CX25840 is not set
-# CONFIG_VIDEO_CX88 is not set
-# CONFIG_VIDEO_DEV is not set
-# CONFIG_VIDEO_DPC is not set
-# CONFIG_VIDEO_EM28XX is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIDEO_GO7007 is not set
-# CONFIG_VIDEO_HDPVR is not set
-# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-# CONFIG_VIDEO_HEXIUM_GEMINI is not set
-# CONFIG_VIDEO_HEXIUM_ORION is not set
-# CONFIG_VIDEO_IR_I2C is not set
-# CONFIG_VIDEO_IVTV is not set
-# CONFIG_VIDEO_KS0127 is not set
-# CONFIG_VIDEO_M52790 is not set
-# CONFIG_VIDEO_MEDIA is not set
-# CONFIG_VIDEO_MSP3400 is not set
-# CONFIG_VIDEO_MT9V011 is not set
-# CONFIG_VIDEO_MXB is not set
-# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-# CONFIG_VIDEO_OV7670 is not set
-# CONFIG_VIDEO_OVCAMCHIP is not set
-# CONFIG_VIDEO_PMS is not set
-# CONFIG_VIDEO_PVRUSB2 is not set
-# CONFIG_VIDEO_SAA5246A is not set
-# CONFIG_VIDEO_SAA5249 is not set
-# CONFIG_VIDEO_SAA6588 is not set
-# CONFIG_VIDEO_SAA7110 is not set
-# CONFIG_VIDEO_SAA7111 is not set
-# CONFIG_VIDEO_SAA7114 is not set
-# CONFIG_VIDEO_SAA711X is not set
-# CONFIG_VIDEO_SAA7127 is not set
-# CONFIG_VIDEO_SAA7134 is not set
-# CONFIG_VIDEO_SAA717X is not set
-# CONFIG_VIDEO_SAA7185 is not set
-# CONFIG_VIDEO_SAA7191 is not set
-# CONFIG_VIDEO_SH_MOBILE_CEU is not set
-# CONFIG_VIDEO_STRADIS is not set
-# CONFIG_VIDEO_TCM825X is not set
-# CONFIG_VIDEO_TDA7432 is not set
-# CONFIG_VIDEO_TDA9840 is not set
-# CONFIG_VIDEO_TDA9875 is not set
-# CONFIG_VIDEO_TEA6415C is not set
-# CONFIG_VIDEO_TEA6420 is not set
-# CONFIG_VIDEO_THS7303 is not set
-# CONFIG_VIDEO_TLV320AIC23B is not set
-# CONFIG_VIDEO_TVAUDIO is not set
-# CONFIG_VIDEO_TVP514X is not set
-# CONFIG_VIDEO_TVP5150 is not set
-# CONFIG_VIDEO_UPD64031A is not set
-# CONFIG_VIDEO_UPD64083 is not set
-# CONFIG_VIDEO_USBVISION is not set
-CONFIG_VIDEO_V4L1_COMPAT=y
-# CONFIG_VIDEO_V4L1 is not set
-# CONFIG_VIDEO_V4L2_COMMON is not set
-# CONFIG_VIDEO_V4L2 is not set
-# CONFIG_VIDEO_VIVI is not set
-# CONFIG_VIDEO_VP27SMPX is not set
-# CONFIG_VIDEO_VPX3220 is not set
-# CONFIG_VIDEO_WM8739 is not set
-# CONFIG_VIDEO_WM8775 is not set
-# CONFIG_VIDEO_ZORAN is not set
-# CONFIG_VIRQ_DEBUG is not set
-CONFIG_VIRT_TO_BUS=y
-# CONFIG_VIRTUALIZATION is not set
-# CONFIG_VITESSE_PHY is not set
-# CONFIG_VLAN_8021Q_GVRP is not set
-CONFIG_VLAN_8021Q=y
-# CONFIG_VME_BUS is not set
-# CONFIG_VM_EVENT_COUNTERS is not set
-# CONFIG_VMSPLIT_1G is not set
-# CONFIG_VMSPLIT_2G is not set
-# CONFIG_VMSPLIT_2G_OPT is not set
-# CONFIG_VMSPLIT_3G_OPT is not set
-CONFIG_VMSPLIT_3G=y
-# CONFIG_VMXNET3 is not set
-# CONFIG_VT6655 is not set
-# CONFIG_VT6656 is not set
-# CONFIG_VT is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_W1_CON is not set
-# CONFIG_W1 is not set
-# CONFIG_W1_MASTER_DS1WM is not set
-# CONFIG_W1_MASTER_DS2482 is not set
-# CONFIG_W1_MASTER_DS2490 is not set
-# CONFIG_W1_MASTER_GPIO is not set
-# CONFIG_W1_MASTER_MATROX is not set
-# CONFIG_W1_SLAVE_BQ27000 is not set
-# CONFIG_W1_SLAVE_DS2431 is not set
-# CONFIG_W1_SLAVE_DS2433 is not set
-# CONFIG_W1_SLAVE_DS2760 is not set
-# CONFIG_W1_SLAVE_SMEM is not set
-# CONFIG_W1_SLAVE_THERM is not set
-# CONFIG_W83627HF_WDT is not set
-# CONFIG_W83697HF_WDT is not set
-# CONFIG_W83877F_WDT is not set
-# CONFIG_W83977F_WDT is not set
-# CONFIG_WAN is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_WANXL is not set
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-CONFIG_WATCHDOG=y
-# CONFIG_WDTPCI is not set
-# CONFIG_WIMAX is not set
-CONFIG_WIRELESS_EXT_SYSFS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WIRELESS_OLD_REGULATORY=y
-CONFIG_WIRELESS=y
-CONFIG_WLAN_80211=y
-# CONFIG_WLAN_PRE80211 is not set
-CONFIG_WLAN=y
-# CONFIG_WORKQUEUE_TRACER is not set
-# CONFIG_WR_PPMC is not set
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_PRIV=y
-CONFIG_WEXT_SPY=y
-# CONFIG_X25 is not set
-# CONFIG_XFRM_IPCOMP is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_USER is not set
-CONFIG_XFRM=y
-# CONFIG_XFS_DEBUG is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_XFS_POSIX_ACL is not set
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_SECURITY is not set
-# CONFIG_XILINX_EMACLITE is not set
-# CONFIG_XILINX_LL_TEMAC is not set
-# CONFIG_XIP_KERNEL is not set
-# CONFIG_YAFFS_FS is not set
-# CONFIG_YAM is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_YENTA is not set
-# CONFIG_YENTA_O2 is not set
-# CONFIG_YENTA_RICOH is not set
-# CONFIG_YENTA_TI is not set
-# CONFIG_YENTA_TOSHIBA is not set
-# CONFIG_ZD1211RW_DEBUG is not set
-# CONFIG_ZD1211RW is not set
-# CONFIG_ZEROPLUS_FF is not set
-# CONFIG_ZISOFS_FS is not set
-CONFIG_ZISOFS=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZONE_DMA_FLAG=1
-CONFIG_ZONE_DMA=y
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DEFAULT_SECURITY=""
diff --git a/target/linux/generic-2.6/config-2.6.34 b/target/linux/generic-2.6/config-2.6.34
deleted file mode 100644
index 53cb190d8..000000000
--- a/target/linux/generic-2.6/config-2.6.34
+++ /dev/null
@@ -1,2881 +0,0 @@
-# CONFIG_6PACK is not set
-# CONFIG_8139CP is not set
-# CONFIG_8139TOO is not set
-# CONFIG_9P_FS is not set
-# CONFIG_AB3100_CORE is not set
-# CONFIG_AB4500_CORE is not set
-# CONFIG_ACCESSIBILITY is not set
-# CONFIG_ACENIC is not set
-# CONFIG_ACPI_POWER_METER is not set
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_AD525X_DPOT is not set
-# CONFIG_ADAPTEC_STARFIRE is not set
-# CONFIG_ADFS_FS is not set
-# CONFIG_ADM6996_PHY is not set
-# CONFIG_ADM8211 is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AFS_FS is not set
-# CONFIG_AGP is not set
-CONFIG_AIO=y
-# CONFIG_AIRO_CS is not set
-# CONFIG_AIRO is not set
-# CONFIG_ALIM7101_WDT is not set
-# CONFIG_ALTERA_PCIE_CHDMA is not set
-# CONFIG_R8187SE is not set
-# CONFIG_AMD8111_ETH is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ANDROID is not set
-CONFIG_ANON_INODES=y
-# CONFIG_APPLICOM is not set
-# CONFIG_AR8216_PHY is not set
-# CONFIG_AR9170_USB is not set
-# CONFIG_ARCH_AAEC2000 is not set
-# CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_BCMRING is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_DOVE is not set
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_EP93XX is not set
-CONFIG_ARCH_FLATMEM_ENABLE=y
-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_GEMINI is not set
-# CONFIG_ARCH_H720X is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP13XX is not set
-# CONFIG_ARCH_IOP32X is not set
-# CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IXP2000 is not set
-# CONFIG_ARCH_IXP23XX is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_KIRKWOOD is not set
-# CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_L7200 is not set
-# CONFIG_ARCH_LH7A40X is not set
-# CONFIG_ARCH_LOKI is not set
-# CONFIG_ARCH_MMP is not set
-# CONFIG_ARCH_MSM is not set
-# CONFIG_ARCH_MV78XX0 is not set
-# CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_NOMADIK is not set
-# CONFIG_ARCH_NS9XXX is not set
-# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_ORION5X is not set
-# CONFIG_ARCH_PNX4008 is not set
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_RPC is not set
-# CONFIG_ARCH_S3C2410 is not set
-# CONFIG_ARCH_S3C64XX is not set
-# CONFIG_ARCH_S5PC1XX is not set
-# CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_STMP3XXX is not set
-# CONFIG_ARCH_U300 is not set
-# CONFIG_ARCH_U8500 is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_W90X900 is not set
-# CONFIG_ARCNET is not set
-# CONFIG_ARM_UNWIND is not set
-CONFIG_ARPD=y
-# CONFIG_ARTHUR is not set
-CONFIG_ASK_IP_FIB_HASH=y
-# CONFIG_ASUS_OLED is not set
-# CONFIG_ASYNC_TX_DMA is not set
-# CONFIG_AT24 is not set
-# CONFIG_AT76C50X_USB is not set
-# CONFIG_ATA_ACPI is not set
-# CONFIG_ATA_GENERIC is not set
-# CONFIG_ATA is not set
-# CONFIG_ATALK is not set
-# CONFIG_ATA_NONSTANDARD is not set
-# CONFIG_ATA_OVER_ETH is not set
-# CONFIG_ATA_PIIX is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_ATA_SFF=y
-# CONFIG_ATA_VERBOSE_ERROR is not set
-# CONFIG_ATH5K is not set
-# CONFIG_ATH9K is not set
-# CONFIG_ATL1C is not set
-# CONFIG_ATL1E is not set
-# CONFIG_ATL1 is not set
-# CONFIG_ATL2 is not set
-# CONFIG_ATM_AMBASSADOR is not set
-CONFIG_ATM_BR2684_IPFILTER=y
-# CONFIG_ATM_BR2684 is not set
-# CONFIG_ATM_CLIP is not set
-CONFIG_ATM_CLIP_NO_ICMP=y
-# CONFIG_ATM_DRIVERS is not set
-# CONFIG_ATM_DUMMY is not set
-# CONFIG_ATMEL is not set
-# CONFIG_ATM_ENI is not set
-# CONFIG_ATM_FIRESTREAM is not set
-# CONFIG_ATM_FORE200E is not set
-# CONFIG_ATM_FORE200E_MAYBE is not set
-# CONFIG_ATM_HE is not set
-# CONFIG_ATM_HORIZON is not set
-# CONFIG_ATM_IA is not set
-# CONFIG_ATM_IDT77252 is not set
-# CONFIG_ATM is not set
-# CONFIG_ATM_LANAI is not set
-# CONFIG_ATM_LANE is not set
-# CONFIG_ATM_MPOA is not set
-# CONFIG_ATM_NICSTAR is not set
-# CONFIG_ATM_SOLOS is not set
-# CONFIG_ATM_TCP is not set
-# CONFIG_ATM_ZATM is not set
-# CONFIG_AUDIT is not set
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUXDISPLAY is not set
-# CONFIG_AX25_DAMA_SLAVE is not set
-# CONFIG_AX25 is not set
-# CONFIG_AX88796 is not set
-# CONFIG_B3DFG is not set
-# CONFIG_B43 is not set
-# CONFIG_B43LEGACY is not set
-# CONFIG_B44 is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-CONFIG_BASE_FULL=y
-CONFIG_BASE_SMALL=0
-# CONFIG_BASLER_EXCITE is not set
-# CONFIG_BATTERY_BQ27000_HDQ is not set
-# CONFIG_BATTERY_BQ27x00 is not set
-# CONFIG_BATTERY_DS2760 is not set
-# CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_MAX17040 is not set
-# CONFIG_BAYCOM_EPP is not set
-# CONFIG_BAYCOM_PAR is not set
-# CONFIG_BAYCOM_SER_FDX is not set
-# CONFIG_BAYCOM_SER_HDX is not set
-CONFIG_BCM43XX_DEBUG=y
-CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
-# CONFIG_BCM43XX_DMA_MODE is not set
-CONFIG_BCM43XX_DMA=y
-# CONFIG_BCM43XX is not set
-# CONFIG_BCM43XX_PIO_MODE is not set
-CONFIG_BCM43XX_PIO=y
-# CONFIG_BE2ISCSI is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_BINARY_PRINTF is not set
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-# CONFIG_BLINK is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
-# CONFIG_BLK_CPQ_DA is not set
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_BLK_DEV_4DRIVES is not set
-# CONFIG_BLK_DEV_AEC62XX is not set
-# CONFIG_BLK_DEV_ALI14XX is not set
-# CONFIG_BLK_DEV_ALI15X3 is not set
-# CONFIG_BLK_DEV_AMD74XX is not set
-# CONFIG_BLK_DEV_ATIIXP is not set
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_BLK_DEV_CMD640 is not set
-# CONFIG_BLK_DEV_CMD64X is not set
-# CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_CS5520 is not set
-# CONFIG_BLK_DEV_CS5530 is not set
-# CONFIG_BLK_DEV_CS5535 is not set
-# CONFIG_BLK_DEV_CS5536 is not set
-# CONFIG_BLK_DEV_CY82C693 is not set
-# CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_DELKIN is not set
-# CONFIG_BLK_DEV_DTC2278 is not set
-# CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_DEV_GENERIC is not set
-# CONFIG_BLK_DEV_HD_IDE is not set
-# CONFIG_BLK_DEV_HD is not set
-# CONFIG_BLK_DEV_HD_ONLY is not set
-# CONFIG_BLK_DEV_HPT34X is not set
-# CONFIG_BLK_DEV_HPT366 is not set
-# CONFIG_BLK_DEV_HT6560B is not set
-# CONFIG_BLK_DEV_IDEACPI is not set
-# CONFIG_BLK_DEV_IDECD is not set
-# CONFIG_BLK_DEV_IDECS is not set
-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-# CONFIG_BLK_DEV_IDEFLOPPY is not set
-# CONFIG_BLK_DEV_IDEPCI is not set
-# CONFIG_BLK_DEV_IDEPNP is not set
-# CONFIG_BLK_DEV_IDE_SATA is not set
-# CONFIG_BLK_DEV_IDESCSI is not set
-# CONFIG_BLK_DEV_IDETAPE is not set
-CONFIG_BLK_DEV_INITRD=y
-# CONFIG_BLK_DEV_INTEGRITY is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_BLK_DEV_IT8172 is not set
-# CONFIG_BLK_DEV_IT8213 is not set
-# CONFIG_BLK_DEV_IT821X is not set
-# CONFIG_BLK_DEV_JMICRON is not set
-# CONFIG_BLK_DEV_LOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_NS87415 is not set
-# CONFIG_BLK_DEV_OFFBOARD is not set
-# CONFIG_BLK_DEV_OPTI621 is not set
-# CONFIG_BLK_DEV_PDC202XX_NEW is not set
-# CONFIG_BLK_DEV_PDC202XX_OLD is not set
-# CONFIG_BLK_DEV_PIIX is not set
-# CONFIG_BLK_DEV_PLATFORM is not set
-# CONFIG_BLK_DEV_QD65XX is not set
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_RZ1000 is not set
-# CONFIG_BLK_DEV_SC1200 is not set
-# CONFIG_BLK_DEV_SD is not set
-# CONFIG_BLK_DEV_SIIMAGE is not set
-# CONFIG_BLK_DEV_SIS5513 is not set
-# CONFIG_BLK_DEV_SL82C105 is not set
-# CONFIG_BLK_DEV_SLC90E66 is not set
-# CONFIG_BLK_DEV_SR is not set
-# CONFIG_BLK_DEV_SVWKS is not set
-# CONFIG_BLK_DEV_SX8 is not set
-# CONFIG_BLK_DEV_TC86C001 is not set
-# CONFIG_BLK_DEV_TRIFLEX is not set
-# CONFIG_BLK_DEV_TRM290 is not set
-# CONFIG_BLK_DEV_UB is not set
-# CONFIG_BLK_DEV_UMC8672 is not set
-# CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_VIA82CXXX is not set
-# CONFIG_BLK_DEV_XIP is not set
-CONFIG_BLK_DEV=y
-CONFIG_BLOCK=y
-# CONFIG_BNX2 is not set
-# CONFIG_BONDING is not set
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_BOOT_TRACER is not set
-# CONFIG_BPQETHER is not set
-# CONFIG_BRIDGE_EBT_802_3 is not set
-# CONFIG_BRIDGE_EBT_AMONG is not set
-# CONFIG_BRIDGE_EBT_ARP is not set
-# CONFIG_BRIDGE_EBT_ARPREPLY is not set
-# CONFIG_BRIDGE_EBT_BROUTE is not set
-# CONFIG_BRIDGE_EBT_DNAT is not set
-# CONFIG_BRIDGE_EBT_IP6 is not set
-# CONFIG_BRIDGE_EBT_IP is not set
-# CONFIG_BRIDGE_EBT_LIMIT is not set
-# CONFIG_BRIDGE_EBT_LOG is not set
-# CONFIG_BRIDGE_EBT_MARK is not set
-# CONFIG_BRIDGE_EBT_MARK_T is not set
-# CONFIG_BRIDGE_EBT_NFLOG is not set
-# CONFIG_BRIDGE_EBT_PKTTYPE is not set
-# CONFIG_BRIDGE_EBT_REDIRECT is not set
-# CONFIG_BRIDGE_EBT_SNAT is not set
-# CONFIG_BRIDGE_EBT_STP is not set
-# CONFIG_BRIDGE_EBT_T_FILTER is not set
-# CONFIG_BRIDGE_EBT_T_NAT is not set
-# CONFIG_BRIDGE_EBT_ULOG is not set
-# CONFIG_BRIDGE_EBT_VLAN is not set
-# CONFIG_BRIDGE_NETFILTER is not set
-# CONFIG_BRIDGE_NF_EBTABLES is not set
-CONFIG_BRIDGE=y
-# CONFIG_BROADCOM_PHY is not set
-CONFIG_BROKEN_ON_SMP=y
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_BSD_PROCESS_ACCT_V3 is not set
-CONFIG_BSD_PROCESS_ACCT=y
-# CONFIG_BT_ATH3K is not set
-# CONFIG_BT_BNEP is not set
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-# CONFIG_BT_CMTP is not set
-# CONFIG_BT_HCIBCM203X is not set
-# CONFIG_BT_HCIBFUSB is not set
-# CONFIG_BT_HCIBLUECARD is not set
-# CONFIG_BT_HCIBPA10X is not set
-# CONFIG_BT_HCIBT3C is not set
-# CONFIG_BT_HCIBTSDIO is not set
-# CONFIG_BT_HCIBTUART is not set
-# CONFIG_BT_HCIBTUSB is not set
-# CONFIG_BT_HCIDTL1 is not set
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_H4=y
-# CONFIG_BT_HCIUART is not set
-# CONFIG_BT_HCIUART_LL is not set
-# CONFIG_BT_HCIUSB is not set
-CONFIG_BT_HCIUSB_SCO=y
-# CONFIG_BT_HCIVHCI is not set
-# CONFIG_BT_HIDP is not set
-# CONFIG_BT is not set
-# CONFIG_BT_L2CAP is not set
-# CONFIG_BT_MRVL is not set
-# CONFIG_BT_RFCOMM is not set
-CONFIG_BT_RFCOMM_TTY=y
-# CONFIG_BTRFS_FS is not set
-# CONFIG_BT_SCO is not set
-CONFIG_BUG=y
-# CONFIG_C2PORT is not set
-# CONFIG_CAN is not set
-# CONFIG_CAPI_AVM is not set
-# CONFIG_CAPI_EICON is not set
-# CONFIG_CAPI_TRACE is not set
-CONFIG_CARDBUS=y
-# CONFIG_CARDMAN_4000 is not set
-# CONFIG_CARDMAN_4040 is not set
-# CONFIG_CASSINI is not set
-# CONFIG_CB710_CORE is not set
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_CFG80211 is not set
-# CONFIG_CGROUPS is not set
-# CONFIG_CHELSIO_T1 is not set
-# CONFIG_CHELSIO_T3 is not set
-# CONFIG_CHR_DEV_OSST is not set
-# CONFIG_CHR_DEV_SCH is not set
-# CONFIG_CHR_DEV_SG is not set
-# CONFIG_CHR_DEV_ST is not set
-# CONFIG_CICADA_PHY is not set
-# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
-# CONFIG_CIFS is not set
-CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_STATS2 is not set
-CONFIG_CIFS_STATS=y
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-# CONFIG_CIFS_XATTR is not set
-# CONFIG_CLASSIC_RCU=y
-CONFIG_CLS_U32_MARK=y
-CONFIG_CLS_U32_PERF=y
-CONFIG_CMDLINE=""
-# CONFIG_CNIC is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_COMEDI is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_COMPAT_NET_DEV_OPS=y
-# CONFIG_CONFIGFS_FS is not set
-# CONFIG_CONNECTOR is not set
-CONFIG_CONSTRUCTORS=y
-# CONFIG_CONTEXT_SWITCH_TRACER is not set
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-# CONFIG_CPU_DCACHE_DISABLE is not set
-# CONFIG_CPU_FREQ is not set
-# CONFIG_CPU_IDLE is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_CRASH_DUMP is not set
-# CONFIG_CRC16 is not set
-CONFIG_CRC32=y
-# CONFIG_CRC7 is not set
-# CONFIG_CRC_CCITT is not set
-# CONFIG_CRC_ITU_T is not set
-# CONFIG_CRC_T10DIF is not set
-CONFIG_CROSSCOMPILE=y
-# CONFIG_CRYPTO_AEAD is not set
-# CONFIG_CRYPTO_AES_586 is not set
-# CONFIG_CRYPTO_AES is not set
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_ALGAPI=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_ANUBIS is not set
-# CONFIG_CRYPTO_ARC4 is not set
-# CONFIG_CRYPTO_AUTHENC is not set
-# CONFIG_CRYPTO_BLKCIPHER is not set
-# CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_CAST5 is not set
-# CONFIG_CRYPTO_CAST6 is not set
-# CONFIG_CRYPTO_CBC is not set
-# CONFIG_CRYPTO_CCM is not set
-# CONFIG_CRYPTO_CRC32C_INTEL is not set
-# CONFIG_CRYPTO_CRC32C is not set
-# CONFIG_CRYPTO_CRYPTD is not set
-# CONFIG_CRYPTO_CTR is not set
-# CONFIG_CRYPTO_CTS is not set
-# CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_DES is not set
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_CRYPTO_ECB is not set
-# CONFIG_CRYPTO_FCRYPT is not set
-# CONFIG_CRYPTO_FIPS is not set
-# CONFIG_CRYPTO_GCM is not set
-# CONFIG_CRYPTO_GF128MUL is not set
-# CONFIG_CRYPTO_GHASH is not set
-# CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set
-# CONFIG_CRYPTO_HASH is not set
-# CONFIG_CRYPTO_HMAC is not set
-# CONFIG_CRYPTO_HW is not set
-# CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_LZO is not set
-# CONFIG_CRYPTO_MANAGER2 is not set
-# CONFIG_CRYPTO_MANAGER is not set
-CONFIG_CRYPTO_MANAGER_NO_TESTS=y
-# CONFIG_CRYPTO_MD4 is not set
-# CONFIG_CRYPTO_MD5 is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_NULL is not set
-# CONFIG_CRYPTO_PCBC is not set
-CONFIG_CRYPTO_PCOMP=y
-# CONFIG_CRYPTO_PRNG is not set
-# CONFIG_CRYPTO_RMD128 is not set
-# CONFIG_CRYPTO_RMD160 is not set
-# CONFIG_CRYPTO_RMD256 is not set
-# CONFIG_CRYPTO_RMD320 is not set
-# CONFIG_CRYPTO_RNG is not set
-# CONFIG_CRYPTO_SALSA20_586 is not set
-# CONFIG_CRYPTO_SALSA20 is not set
-# CONFIG_CRYPTO_SEED is not set
-# CONFIG_CRYPTO_SEQIV is not set
-# CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_SHA1 is not set
-# CONFIG_CRYPTO_SHA256 is not set
-# CONFIG_CRYPTO_SHA512 is not set
-# CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_TEST is not set
-# CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_TWOFISH_586 is not set
-# CONFIG_CRYPTO_TWOFISH_COMMON is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-CONFIG_CRYPTO_UNLZMA=y
-# CONFIG_CRYPTO_VMAC is not set
-# CONFIG_CRYPTO_WP512 is not set
-# CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_XTS is not set
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_ZLIB=y
-# CONFIG_CUSE is not set
-# CONFIG_DAB is not set
-# CONFIG_DAVICOM_PHY is not set
-# CONFIG_DCB is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_DEBUG_ERRORS is not set
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-CONFIG_DEBUG_FS=y
-# CONFIG_DEBUG_GPIO is not set
-# CONFIG_DEBUG_KERNEL is not set
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_LL is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_SHIRQ is not set
-# CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_PREEMPT is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_WRITECOUNT is not set
-# CONFIG_DECNET is not set
-CONFIG_DECOMPRESS_LZMA_NEEDED=y
-# CONFIG_DEFAULT_AS is not set
-# CONFIG_DEFAULT_BIC is not set
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_CUBIC is not set
-CONFIG_DEFAULT_DEADLINE=y
-# CONFIG_DEFAULT_HTCP is not set
-CONFIG_DEFAULT_IOSCHED="deadline"
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-# CONFIG_DEFAULT_NOOP is not set
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="westwood"
-# CONFIG_DEFAULT_VEGAS is not set
-CONFIG_DEFAULT_WESTWOOD=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-# CONFIG_DETECT_HUNG_TASK is not set
-# CONFIG_DETECT_SOFTLOCKUP is not set
-# CONFIG_DEVKMEM is not set
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
-# CONFIG_DEVTMPFS_MOUNT is not set
-# CONFIG_DEVTMPFS is not set
-# CONFIG_DGRS is not set
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_DISPLAY_SUPPORT is not set
-# CONFIG_DL2K is not set
-# CONFIG_DLM is not set
-# CONFIG_DMA_API_DEBUG is not set
-# CONFIG_DMADEVICES is not set
-# CONFIG_DMA_ENGINE is not set
-# CONFIG_DMASCC is not set
-# CONFIG_DMATEST is not set
-# CONFIG_DM_LOG_USERSPACE is not set
-# CONFIG_DNET is not set
-# CONFIG_DNOTIFY is not set
-# CONFIG_DRAGONRISE_FF is not set
-# CONFIG_DRM is not set
-# CONFIG_DS1682 is not set
-# CONFIG_DST is not set
-# CONFIG_DTLK is not set
-# CONFIG_DUMMY is not set
-# CONFIG_DVB_CORE is not set
-# CONFIG_DVB is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
-# CONFIG_E1000E is not set
-# CONFIG_E1000 is not set
-# CONFIG_E100 is not set
-# CONFIG_ECHO is not set
-# CONFIG_ECONET is not set
-# CONFIG_EDAC is not set
-# CONFIG_EEPRO100 is not set
-# CONFIG_EEPROM_93CX6 is not set
-# CONFIG_EEPROM_AT24 is not set
-# CONFIG_EEPROM_AT25 is not set
-# CONFIG_EEPROM_LEGACY is not set
-# CONFIG_EEPROM_MAX6875 is not set
-# CONFIG_EFI_PARTITION is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_ELF_CORE is not set
-CONFIG_EMBEDDED=y
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_ENABLE_WARN_DEPRECATED=y
-# CONFIG_ENC28J60 is not set
-# CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_EPIC100 is not set
-CONFIG_EPOLL=y
-# CONFIG_EQUALIZER is not set
-# CONFIG_ET131X is not set
-# CONFIG_ETHOC is not set
-CONFIG_EVENTFD=y
-# CONFIG_EVENT_TRACER is not set
-CONFIG_EXPERIMENTAL=y
-# CONFIG_EXPORTFS is not set
-# CONFIG_EXT2_FS is not set
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_EXT3_FS_XATTR is not set
-# CONFIG_EXT4_DEBUG is not set
-# CONFIG_EXT4DEV_FS is not set
-# CONFIG_EXT4_FS is not set
-# CONFIG_EXT4_USE_FOR_EXT23 is not set
-CONFIG_EXTRA_FIRMWARE=""
-CONFIG_EXTRA_TARGETS=""
-# CONFIG_EZX_PCAP is not set
-# CONFIG_FAIR_GROUP_SCHED is not set
-# CONFIG_FAULT_INJECTION is not set
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-# CONFIG_FAT_FS is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_ARC is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_BACKLIGHT is not set
-# CONFIG_FB_BOOT_VESA_SUPPORT is not set
-# CONFIG_FB_BROADSHEET is not set
-# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_CFB_COPYAREA is not set
-# CONFIG_FB_CFB_FILLRECT is not set
-# CONFIG_FB_CFB_IMAGEBLIT is not set
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_DDC is not set
-# CONFIG_FB_EARLYSUSPEND is not set
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_GOLDFISH is not set
-# CONFIG_FB_HGA is not set
-# CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_LE80578 is not set
-# CONFIG_FB_MACMODES is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_MB862XX is not set
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_N411 is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_OF is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_PS3 is not set
-# CONFIG_FB_PXA is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_FOPS is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
-# CONFIG_FB_TILEBLITTING is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_UDL is not set
-# CONFIG_FB_VGA16 is not set
-# CONFIG_FB_VIA is not set
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_VT8623 is not set
-# CONFIG_FCOE_FNIC is not set
-# CONFIG_FCOE is not set
-# CONFIG_FDDI is not set
-# CONFIG_FEALNX is not set
-CONFIG_FIB_RULES=y
-CONFIG_FILE_LOCKING=y
-# CONFIG_FIREWIRE is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
-# CONFIG_FIXED_PHY is not set
-CONFIG_FLATMEM_MANUAL=y
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_FORCEDETH is not set
-CONFIG_FRAME_WARN=1024
-# CONFIG_FRAMEBUFFER_CONSOLE is not set
-# CONFIG_FREEZER is not set
-# CONFIG_FSCACHE is not set
-CONFIG_FSNOTIFY=y
-# CONFIG_FS_POSIX_ACL is not set
-# CONFIG_FTL is not set
-# CONFIG_FTRACE is not set
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_FUNCTION_TRACER is not set
-# CONFIG_FUSE_FS is not set
-# CONFIG_FUSION_FC is not set
-# CONFIG_FUSION is not set
-# CONFIG_FUSION_SAS is not set
-# CONFIG_FUSION_SPI is not set
-CONFIG_FUTEX=y
-CONFIG_FW_LOADER=y
-CONFIG_GACT_PROB=y
-# CONFIG_GAMEPORT is not set
-# CONFIG_GCOV_KERNEL is not set
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_TIME=y
-# CONFIG_GIGASET_DEBUG is not set
-# CONFIG_GFS2_FS is not set
-# CONFIG_GPIO_ADP5588 is not set
-# CONFIG_GPIO_BT8XX is not set
-# CONFIG_GPIO_CS5535 is not set
-# CONFIG_GPIO_DEVICE is not set
-# CONFIG_GPIO_LANGWELL is not set
-# CONFIG_GPIOLIB is not set
-# CONFIG_GPIO_MAX7300 is not set
-# CONFIG_GPIO_MAX7301 is not set
-# CONFIG_GPIO_MAX732X is not set
-# CONFIG_GPIO_MC33880 is not set
-# CONFIG_GPIO_MCP23S08 is not set
-# CONFIG_GPIO_PCA953X is not set
-# CONFIG_GPIO_PCF857X is not set
-# CONFIG_GPIO_SYSFS is not set
-# CONFIG_GPIO_XILINX is not set
-# CONFIG_GREENASIA_FF is not set
-# CONFIG_GROUP_SCHED is not set
-# CONFIG_HAMACHI is not set
-CONFIG_HAMRADIO=y
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_HAVE_AOUT is not set
-CONFIG_HAVE_MLOCKED_PAGE_BIT=y
-CONFIG_HAVE_MLOCK=y
-# CONFIG_HCALL_STATS is not set
-# CONFIG_HDLC_CISCO is not set
-# CONFIG_HDLC_FR is not set
-# CONFIG_HDLC is not set
-# CONFIG_HDLC_PPP is not set
-# CONFIG_HDLC_RAW_ETH is not set
-# CONFIG_HDLC_RAW is not set
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_HECI is not set
-# CONFIG_HERMES is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_HID_A4TECH is not set
-# CONFIG_HID_APPLE is not set
-# CONFIG_HID_BELKIN is not set
-# CONFIG_HID_BRIGHT is not set
-# CONFIG_HID_CHERRY is not set
-# CONFIG_HID_CHICONY is not set
-# CONFIG_HID_COMPAT is not set
-# CONFIG_HID_CYPRESS is not set
-# CONFIG_HID_DEBUG is not set
-# CONFIG_HID_DELL is not set
-# CONFIG_HID_DRAGONRISE is not set
-# CONFIG_HID_EZKEY is not set
-# CONFIG_HID_FF is not set
-# CONFIG_HID_GREENASIA is not set
-# CONFIG_HID_GYRATION is not set
-# CONFIG_HID is not set
-# CONFIG_HID_KENSINGTON is not set
-# CONFIG_HID_KYE is not set
-# CONFIG_HID_LOGITECH is not set
-# CONFIG_HID_MICROSOFT is not set
-# CONFIG_HID_MONTEREY is not set
-# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_PANTHERLORD is not set
-# CONFIG_HID_PETALYNX is not set
-# CONFIG_HID_PID is not set
-# CONFIG_HIDRAW is not set
-# CONFIG_HID_SAMSUNG is not set
-# CONFIG_HID_SMARTJOYPLUS is not set
-# CONFIG_HID_SONY is not set
-# CONFIG_HID_SUNPLUS is not set
-# CONFIG_HID_SUPPORT is not set
-# CONFIG_HID_THRUSTMASTER is not set
-# CONFIG_HID_TOPSEED is not set
-# CONFIG_HID_TWINHAN is not set
-# CONFIG_HID_WACOM is not set
-# CONFIG_HID_ZEROPLUS is not set
-# CONFIG_HIGHMEM is not set
-CONFIG_HIGH_RES_TIMERS=y
-# CONFIG_HIPPI is not set
-# CONFIG_HOSTAP_CS is not set
-# CONFIG_HOSTAP is not set
-# CONFIG_HOSTAP_PCI is not set
-# CONFIG_HOSTAP_PLX is not set
-# CONFIG_HOTPLUG_CPU is not set
-# CONFIG_HOTPLUG_PCI is not set
-CONFIG_HOTPLUG=y
-# CONFIG_HP100 is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_HP_ILO is not set
-# CONFIG_HTC_EGPIO is not set
-# CONFIG_HTC_PASIC3 is not set
-# CONFIG_HUGETLB_PAGE is not set
-# CONFIG_HVC_UDBG is not set
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
-# CONFIG_HW_RANDOM_AMD is not set
-# CONFIG_HW_RANDOM_GEODE is not set
-# CONFIG_HW_RANDOM_INTEL is not set
-# CONFIG_HW_RANDOM_TIMERIOMEM is not set
-# CONFIG_HW_RANDOM_VIA is not set
-# CONFIG_HYPERV is not set
-# CONFIG_HYSDN is not set
-CONFIG_HZ=100
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ_100=y
-# CONFIG_HZ_1024 is not set
-# CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_256 is not set
-# CONFIG_HZ_300 is not set
-# CONFIG_HZ_48 is not set
-# CONFIG_I2C_ALGOBIT is not set
-# CONFIG_I2C_ALGOPCA is not set
-# CONFIG_I2C_ALGOPCF is not set
-# CONFIG_I2C_ALI1535 is not set
-# CONFIG_I2C_ALI1563 is not set
-# CONFIG_I2C_ALI15X3 is not set
-# CONFIG_I2C_AMD756 is not set
-# CONFIG_I2C_AMD8111 is not set
-# CONFIG_I2C_CHARDEV is not set
-# CONFIG_I2C_COMPAT is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DESIGNWARE is not set
-# CONFIG_I2C_ELEKTOR is not set
-# CONFIG_I2C_GPIO is not set
-# CONFIG_I2C_HELPER_AUTO is not set
-# CONFIG_I2C_I801 is not set
-# CONFIG_I2C_I810 is not set
-# CONFIG_I2C_IBM_IIC is not set
-# CONFIG_I2C_ISCH is not set
-# CONFIG_I2C is not set
-# CONFIG_I2C_MPC is not set
-# CONFIG_I2C_NFORCE2 is not set
-# CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_PCA_ISA is not set
-# CONFIG_I2C_PCA_PLATFORM is not set
-# CONFIG_I2C_PIIX4 is not set
-# CONFIG_I2C_PROSAVAGE is not set
-# CONFIG_I2C_SAVAGE4 is not set
-# CONFIG_I2C_SIMTEC is not set
-# CONFIG_I2C_SIS5595 is not set
-# CONFIG_I2C_SIS630 is not set
-# CONFIG_I2C_SIS96X is not set
-# CONFIG_I2C_SMBUS is not set
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_TAOS_EVM is not set
-# CONFIG_I2C_TINY_USB is not set
-# CONFIG_I2C_VIA is not set
-# CONFIG_I2C_VIAPRO is not set
-# CONFIG_I2C_VOODOO3 is not set
-# CONFIG_I2C_XILINX is not set
-# CONFIG_I2O is not set
-# CONFIG_I82092 is not set
-# CONFIG_I82365 is not set
-# CONFIG_IBM_ASM is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
-# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
-# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_ICPLUS_PHY is not set
-# CONFIG_ICS932S401 is not set
-# CONFIG_IDEDISK_MULTI_MODE is not set
-# CONFIG_IDEDMA_IVB is not set
-# CONFIG_IDEDMA_ONLYDISK is not set
-# CONFIG_IDE_GD is not set
-# CONFIG_IDE is not set
-CONFIG_IDE_MAX_HWIFS=4
-# CONFIG_IDEPCI_SHARE_IRQ is not set
-# CONFIG_IDE_PHISON is not set
-CONFIG_IDE_PROC_FS=y
-# CONFIG_IDE_TASK_IOCTL is not set
-# CONFIG_IEEE1394_DV1394 is not set
-# CONFIG_IEEE1394_ETH1394 is not set
-# CONFIG_IEEE1394 is not set
-# CONFIG_IEEE1394_OHCI1394 is not set
-# CONFIG_IEEE1394_PCILYNX is not set
-# CONFIG_IEEE1394_RAWIO is not set
-# CONFIG_IEEE1394_VERBOSEDEBUG is not set
-# CONFIG_IEEE1394_VIDEO1394 is not set
-# CONFIG_IEEE80211_CRYPT_CCMP is not set
-# CONFIG_IEEE80211_CRYPT_TKIP is not set
-# CONFIG_IEEE80211_CRYPT_WEP is not set
-# CONFIG_IEEE80211_DEBUG is not set
-# CONFIG_IEEE80211 is not set
-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
-# CONFIG_IEEE80211_SOFTMAC is not set
-# CONFIG_IEEE802154 is not set
-# CONFIG_IFB is not set
-# CONFIG_IGB is not set
-# CONFIG_IGBVF is not set
-# CONFIG_IIO is not set
-# CONFIG_RAMZSWAP is not set
-# CONFIG_BATMAN_ADV is not set
-# CONFIG_IKCONFIG is not set
-# CONFIG_IKCONFIG_PROC is not set
-# CONFIG_IMAGE_CMDLINE_HACK is not set
-# CONFIG_IMQ_BEHAVIOR_AA is not set
-# CONFIG_IMQ_BEHAVIOR_AB is not set
-# CONFIG_IMQ_BEHAVIOR_BA is not set
-# CONFIG_IMQ_BEHAVIOR_BB is not set
-# CONFIG_IMQ is not set
-CONFIG_IMQ_NUM_DEVS=2
-# CONFIG_INET6_AH is not set
-# CONFIG_INET6_ESP is not set
-# CONFIG_INET6_IPCOMP is not set
-# CONFIG_INET6_TUNNEL is not set
-# CONFIG_INET6_XFRM_MODE_BEET is not set
-# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_TCP_DIAG is not set
-# CONFIG_INET_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_TUNNEL is not set
-CONFIG_INET=y
-# CONFIG_INFINIBAND is not set
-# CONFIG_INFTL is not set
-CONFIG_INIT_ENV_ARG_LIMIT=32
-# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set
-# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set
-# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set
-CONFIG_INITRAMFS_COMPRESSION_NONE=y
-# CONFIG_INOTIFY is not set
-# CONFIG_INOTIFY_USER is not set
-# CONFIG_INPUT_APANEL is not set
-# CONFIG_INPUT_ATI_REMOTE2 is not set
-# CONFIG_INPUT_ATI_REMOTE is not set
-# CONFIG_INPUT_ATLAS_BTNS is not set
-# CONFIG_INPUT_CM109 is not set
-# CONFIG_INPUT_EVBUG is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT_GPIO is not set
-# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
-# CONFIG_INPUT is not set
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_KEYSPAN_REMOTE is not set
-# CONFIG_INPUT_MIMIO is not set
-CONFIG_INPUT_MISC=y
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_PCSPKR is not set
-# CONFIG_INPUT_POLLDEV is not set
-# CONFIG_INPUT_POWERMATE is not set
-# CONFIG_INPUT_SPARSEKMAP is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_TSDEV is not set
-# CONFIG_INPUT_UINPUT is not set
-# CONFIG_INPUT_WINBOND_CIR is not set
-# CONFIG_INPUT_WISTRON_BTNS is not set
-# CONFIG_INSTRUMENTATION is not set
-# CONFIG_IOSCHED_AS is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_NOOP=y
-# CONFIG_IP1000 is not set
-# CONFIG_IP175C_PHY is not set
-# CONFIG_IP6_NF_FILTER is not set
-# CONFIG_IP6_NF_IPTABLES is not set
-# CONFIG_IP6_NF_MANGLE is not set
-# CONFIG_IP6_NF_MATCH_AH is not set
-# CONFIG_IP6_NF_MATCH_EUI64 is not set
-# CONFIG_IP6_NF_MATCH_FRAG is not set
-# CONFIG_IP6_NF_MATCH_HL is not set
-# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
-# CONFIG_IP6_NF_MATCH_LIMIT is not set
-# CONFIG_IP6_NF_MATCH_MH is not set
-# CONFIG_IP6_NF_MATCH_OPTS is not set
-# CONFIG_IP6_NF_MATCH_OWNER is not set
-# CONFIG_IP6_NF_MATCH_RT is not set
-# CONFIG_IP6_NF_QUEUE is not set
-# CONFIG_IP6_NF_RAW is not set
-# CONFIG_IP6_NF_TARGET_HL is not set
-# CONFIG_IP6_NF_TARGET_IMQ is not set
-# CONFIG_IP6_NF_TARGET_LOG is not set
-# CONFIG_IP6_NF_TARGET_REJECT is not set
-# CONFIG_IP6_NF_TARGET_ROUTE is not set
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IPC_NS is not set
-# CONFIG_IP_DCCP is not set
-CONFIG_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
-# CONFIG_IPMI_HANDLER is not set
-CONFIG_IP_MROUTE=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_MULTIPLE_TABLES=y
-# CONFIG_IP_NF_AMANDA is not set
-# CONFIG_IP_NF_ARPFILTER is not set
-# CONFIG_IP_NF_ARP_MANGLE is not set
-# CONFIG_IP_NF_ARPTABLES is not set
-# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
-CONFIG_IP_NF_CONNTRACK_MARK=y
-CONFIG_IP_NF_CONNTRACK=y
-CONFIG_IP_NF_CT_ACCT=y
-# CONFIG_IP_NF_CT_PROTO_SCTP is not set
-# CONFIG_IP_NF_FILTER is not set
-# CONFIG_IP_NF_FTP is not set
-# CONFIG_IP_NF_H323 is not set
-# CONFIG_IP_NF_IPTABLES is not set
-# CONFIG_IP_NF_IRC is not set
-# CONFIG_IP_NF_MANGLE is not set
-# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
-# CONFIG_IP_NF_MATCH_AH is not set
-# CONFIG_IP_NF_MATCH_ECN is not set
-# CONFIG_IP_NF_MATCH_HASHLIMIT is not set
-# CONFIG_IP_NF_MATCH_IPP2P is not set
-# CONFIG_IP_NF_MATCH_OWNER is not set
-# CONFIG_IP_NF_MATCH_RECENT is not set
-# CONFIG_IP_NF_MATCH_SET is not set
-# CONFIG_IP_NF_MATCH_TIME is not set
-# CONFIG_IP_NF_MATCH_TOS is not set
-# CONFIG_IP_NF_MATCH_TTL is not set
-# CONFIG_IP_NF_NAT_AMANDA is not set
-# CONFIG_IP_NF_NAT_FTP is not set
-# CONFIG_IP_NF_NAT_H323 is not set
-# CONFIG_IP_NF_NAT_IRC is not set
-CONFIG_IP_NF_NAT_NEEDED=y
-# CONFIG_IP_NF_NAT_PPTP is not set
-# CONFIG_IP_NF_NAT_SIP is not set
-# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
-# CONFIG_IP_NF_NAT_TFTP is not set
-CONFIG_IP_NF_NAT=y
-# CONFIG_IP_NF_NETBIOS_NS is not set
-# CONFIG_IP_NF_PPTP is not set
-# CONFIG_IP_NF_QUEUE is not set
-# CONFIG_IP_NF_RAW is not set
-# CONFIG_IP_NF_SECURITY is not set
-CONFIG_IP_NF_SET_HASHSIZE=1024
-# CONFIG_IP_NF_SET_IPHASH is not set
-# CONFIG_IP_NF_SET_IPMAP is not set
-# CONFIG_IP_NF_SET_IPPORTHASH is not set
-# CONFIG_IP_NF_SET_IPTREE is not set
-# CONFIG_IP_NF_SET_IPTREEMAP is not set
-# CONFIG_IP_NF_SET is not set
-# CONFIG_IP_NF_SET_MACIPMAP is not set
-CONFIG_IP_NF_SET_MAX=256
-# CONFIG_IP_NF_SET_NETHASH is not set
-# CONFIG_IP_NF_SET_PORTMAP is not set
-# CONFIG_IP_NF_SIP is not set
-# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
-# CONFIG_IP_NF_TARGET_ECN is not set
-# CONFIG_IP_NF_TARGET_IMQ is not set
-# CONFIG_IP_NF_TARGET_LOG is not set
-# CONFIG_IP_NF_TARGET_MASQUERADE is not set
-# CONFIG_IP_NF_TARGET_NETMAP is not set
-# CONFIG_IP_NF_TARGET_REDIRECT is not set
-# CONFIG_IP_NF_TARGET_REJECT is not set
-# CONFIG_IP_NF_TARGET_ROUTE is not set
-# CONFIG_IP_NF_TARGET_SAME is not set
-# CONFIG_IP_NF_TARGET_SET is not set
-# CONFIG_IP_NF_TARGET_TOS is not set
-# CONFIG_IP_NF_TARGET_TTL is not set
-# CONFIG_IP_NF_TARGET_ULOG is not set
-# CONFIG_IP_NF_TFTP is not set
-# CONFIG_IP_PIMSM_V1 is not set
-# CONFIG_IP_PIMSM_V2 is not set
-# CONFIG_IP_PNP is not set
-CONFIG_IP_ROUTE_FWMARK=y
-CONFIG_IP_ROUTE_MULTIPATH_CACHED=y
-# CONFIG_IP_ROUTE_MULTIPATH_DRR is not set
-# CONFIG_IP_ROUTE_MULTIPATH_RANDOM is not set
-# CONFIG_IP_ROUTE_MULTIPATH_RR is not set
-# CONFIG_IP_ROUTE_MULTIPATH_WRANDOM is not set
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-# CONFIG_IP_SCTP is not set
-CONFIG_IPSEC_NAT_TRAVERSAL=y
-# CONFIG_IPV6 is not set
-# CONFIG_IPV6_MIP6 is not set
-# CONFIG_IPV6_MROUTE is not set
-# CONFIG_IPV6_MULTIPLE_TABLES is not set
-CONFIG_IPV6_NDISC_NODETYPE=y
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-# CONFIG_IPV6_PRIVACY is not set
-# CONFIG_IPV6_ROUTE_INFO is not set
-# CONFIG_IPV6_ROUTER_PREF is not set
-# CONFIG_IPV6_SIT is not set
-# CONFIG_IPV6_SIT_6RD is not set
-# CONFIG_IPV6_TUNNEL is not set
-# CONFIG_IP_VS is not set
-# CONFIG_IPW2100_DEBUG is not set
-# CONFIG_IPW2100 is not set
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2200_DEBUG is not set
-# CONFIG_IPW2200 is not set
-CONFIG_IPW2200_MONITOR=y
-# CONFIG_IPW2200_PROMISCUOUS is not set
-# CONFIG_IPW2200_QOS is not set
-# CONFIG_IPW2200_RADIOTAP is not set
-# CONFIG_IPWIRELESS is not set
-# CONFIG_IPX is not set
-# CONFIG_IRDA is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_ISCSI_TCP is not set
-CONFIG_ISDN=y
-# CONFIG_ISDN_AUDIO is not set
-# CONFIG_ISDN_CAPI_CAPIDRV is not set
-# CONFIG_ISDN_DIVERSION is not set
-# CONFIG_ISDN_DRV_ACT2000 is not set
-# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
-# CONFIG_ISDN_DRV_EICON is not set
-# CONFIG_ISDN_DRV_HISAX is not set
-# CONFIG_ISDN_DRV_ICN is not set
-# CONFIG_ISDN_DRV_LOOP is not set
-# CONFIG_ISDN_DRV_PCBIT is not set
-# CONFIG_ISDN_DRV_SC is not set
-# CONFIG_ISDN_DRV_TPAM is not set
-# CONFIG_ISDN_WITH_ABC is not set
-# CONFIG_ISL29003 is not set
-# CONFIG_ISO9660_FS is not set
-# CONFIG_IWL3945 is not set
-# CONFIG_IWLAGN is not set
-# CONFIG_IWLCORE is not set
-# CONFIG_IWLWIFI is not set
-# CONFIG_IWLWIFI_LEDS is not set
-# CONFIG_IWMC3200TOP is not set
-# CONFIG_IXGB is not set
-# CONFIG_JBD2_DEBUG is not set
-# CONFIG_JBD_DEBUG is not set
-# CONFIG_JBD is not set
-# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
-# CONFIG_JFFS2_CMODE_NONE is not set
-CONFIG_JFFS2_CMODE_PRIORITY=y
-# CONFIG_JFFS2_CMODE_SIZE is not set
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_FS_DEBUG=0
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_XATTR is not set
-CONFIG_JFFS2_FS=y
-# CONFIG_JFFS2_LZO is not set
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
-CONFIG_JFFS2_SUMMARY=y
-#CONFIG_JFFS2_ZLIB is not set
-CONFIG_JFFS2_LZMA=y
-# CONFIG_JFFS_FS is not set
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_JFS_POSIX_ACL is not set
-# CONFIG_JFS_SECURITY is not set
-# CONFIG_JFS_STATISTICS is not set
-# CONFIG_JME is not set
-CONFIG_JOLIET=y
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-# CONFIG_KALLSYMS is not set
-# CONFIG_KARMA_PARTITION is not set
-# CONFIG_KERNEL_BZIP2 is not set
-# CONFIG_KERNEL_GZIP is not set
-CONFIG_KERNEL_LZMA=y
-# CONFIG_KERNEL_LZO is not set
-# CONFIG_KEXEC is not set
-# CONFIG_KEYBOARD_ADP5588 is not set
-# CONFIG_KEYBOARD_LM8323 is not set
-# CONFIG_KEYBOARD_MAX7359 is not set
-# CONFIG_KEYBOARD_OPENCORES is not set
-# CONFIG_KEYS is not set
-# CONFIG_KGDB is not set
-# CONFIG_KMEMTRACE is not set
-CONFIG_KMOD=y
-# CONFIG_KPROBES is not set
-# CONFIG_KS8842 is not set
-# CONFIG_KS8851 is not set
-# CONFIG_KS8851_MLL is not set
-# CONFIG_KSM is not set
-# CONFIG_LANMEDIA is not set
-# CONFIG_LAPB is not set
-# CONFIG_LASAT is not set
-# CONFIG_LATENCYTOP is not set
-CONFIG_LBDAF=y
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_LEDS_ALIX is not set
-# CONFIG_LEDS_BD2802 is not set
-CONFIG_LEDS_CLASS=y
-# CONFIG_LEDS_DAC124S085 is not set
-CONFIG_LEDS_GPIO_PLATFORM=y
-# CONFIG_LEDS_LT3593 is not set
-# CONFIG_LEDS_LP3944 is not set
-# CONFIG_LEDS_LP5521 is not set
-# CONFIG_LEDS_PCA9532 is not set
-# CONFIG_LEDS_PCA955X is not set
-# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-# CONFIG_LEDS_TRIGGER_GPIO is not set
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-# CONFIG_LEDS_TRIGGER_IDE_DISK is not set
-# CONFIG_LEDS_TRIGGER_MORSE is not set
-CONFIG_LEDS_TRIGGER_NETDEV=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_LIB80211_CRYPT_CCMP is not set
-# CONFIG_LIB80211_CRYPT_TKIP is not set
-# CONFIG_LIB80211_CRYPT_WEP is not set
-# CONFIG_LIB80211_DEBUG is not set
-# CONFIG_LIB80211 is not set
-# CONFIG_LIBCRC32C is not set
-# CONFIG_LIBERTAS is not set
-# CONFIG_LIBERTAS_THINFIRM is not set
-# CONFIG_LIBERTAS_USB is not set
-# CONFIG_LIBFC is not set
-# CONFIG_LIBFCOE is not set
-# CONFIG_LIBIPW_DEBUG is not set
-# CONFIG_LINE6_USB is not set
-# CONFIG_LLC2 is not set
-CONFIG_LLC=y
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_LOCKDEP_SUPPORT=y
-# CONFIG_LOCKD is not set
-CONFIG_LOCKD_V4=y
-# CONFIG_LOCK_STAT is not set
-CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_LOGIRUMBLEPAD2_FF is not set
-# CONFIG_LOGITECH_FF is not set
-# CONFIG_LOGO is not set
-# CONFIG_LSF is not set
-# CONFIG_LSI_ET1011C_PHY is not set
-# CONFIG_LTPC is not set
-# CONFIG_LXT_PHY is not set
-CONFIG_MAC80211_DEFAULT_PS_VALUE=1
-CONFIG_MAC80211_DEFAULT_PS=y
-# CONFIG_MAC80211 is not set
-# CONFIG_MAC_EMUMOUSEBTN is not set
-# CONFIG_MACINTOSH_DRIVERS is not set
-# CONFIG_MAC_PARTITION is not set
-# CONFIG_MACVLAN is not set
-# CONFIG_MACVTAP is not set
-# CONFIG_MAGIC_SYSRQ is not set
-# CONFIG_MARKEINS is not set
-# CONFIG_MARKERS is not set
-# CONFIG_MARVELL_PHY is not set
-# CONFIG_MDIO_BITBANG is not set
-# CONFIG_MD is not set
-# CONFIG_ME4000 is not set
-# CONFIG_MEDIA_ATTACH is not set
-# CONFIG_MEDIA_SUPPORT is not set
-# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_SAS is not set
-# CONFIG_MEILHAUS is not set
-# CONFIG_MEMORY_FAILURE is not set
-# CONFIG_MEMSTICK is not set
-# CONFIG_MFD_88PM8607 is not set
-# CONFIG_MFD_ASIC3 is not set
-# CONFIG_MFD_CORE is not set
-# CONFIG_MFD_MC13783 is not set
-# CONFIG_MFD_PCF50633 is not set
-# CONFIG_MFD_SM501 is not set
-# CONFIG_MFD_TC6387XB is not set
-# CONFIG_MFD_TC6393XB is not set
-# CONFIG_MFD_TMIO is not set
-# CONFIG_MFD_WM831X is not set
-# CONFIG_MFD_WM8350_I2C is not set
-# CONFIG_MFD_WM8400 is not set
-# CONFIG_MFD_WM8994 is not set
-# CONFIG_MG_DISK is not set
-# CONFIG_MIGRATION is not set
-CONFIG_MII=y
-CONFIG_MINI_FO=y
-# CONFIG_MINIX_FS is not set
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_MIPS_FPU_EMU is not set
-CONFIG_MISC_DEVICES=y
-CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_MISDN_AVMFRITZ is not set
-# CONFIG_MISDN_HFCPCI is not set
-# CONFIG_MISDN_HFCUSB is not set
-# CONFIG_MISDN_INFINEON is not set
-# CONFIG_MISDN is not set
-# CONFIG_MISDN_NETJET is not set
-# CONFIG_MISDN_SPEEDFAX is not set
-# CONFIG_MISDN_W6692 is not set
-# CONFIG_MKISS is not set
-# CONFIG_MMC_ARMMMCI is not set
-CONFIG_MMC_BLOCK_BOUNCE=y
-# CONFIG_MMC_BLOCK is not set
-# CONFIG_MMC_CB710 is not set
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC is not set
-# CONFIG_MMC_MVSDIO is not set
-# CONFIG_MMC_S3C is not set
-# CONFIG_MMC_SDHCI is not set
-# CONFIG_MMC_SDRICOH_CS is not set
-# CONFIG_MMC_SPI is not set
-# CONFIG_MMC_TEST is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-# CONFIG_MMC_VIA_SDMMC is not set
-CONFIG_MMU=y
-# CONFIG_MODULE_FORCE_LOAD is not set
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MOUSE_APPLETOUCH is not set
-# CONFIG_MOUSE_INPORT is not set
-# CONFIG_MOUSE_LOGIBM is not set
-# CONFIG_MOUSE_PC110PAD is not set
-# CONFIG_MOUSE_PS2_SENTELIC is not set
-# CONFIG_MOUSE_SYNAPTICS_I2C is not set
-# CONFIG_MSDOS_FS is not set
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_AFS_PARTS is not set
-# CONFIG_MTD_ALAUDA is not set
-# CONFIG_MTD_AR7_PARTS is not set
-# CONFIG_MTD_ARM_INTEGRATOR is not set
-CONFIG_MTD_BLKDEVS=y
-# CONFIG_MTD_BLOCK2MTD is not set
-CONFIG_MTD_BLOCK=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_CFI_AMDSTD=y
-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CFI_INTELEXT=y
-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_NOSWAP=y
-# CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI_UTIL=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CHAR=y
-# CONFIG_MTD_CMDLINE_PARTS is not set
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-# CONFIG_MTD_CONCAT is not set
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_GPIO_ADDR is not set
-# CONFIG_MTD_INTEL_VR_NOR is not set
-# CONFIG_MTD_JEDECPROBE is not set
-# CONFIG_MTD_LPDDR is not set
-# CONFIG_MTD_M25P80 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_MYLOADER_PARTS is not set
-# CONFIG_MTD_NAND_CAFE is not set
-# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_ECC_SMC is not set
-# CONFIG_MTD_NAND_GPIO is not set
-CONFIG_MTD_NAND_IDS=y
-# CONFIG_MTD_NAND is not set
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
-# CONFIG_MTD_NAND_PLATFORM is not set
-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
-# CONFIG_MTD_ONENAND is not set
-# CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_OTP is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_PCI is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_PHYSMAP_COMPAT is not set
-# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_RAM is not set
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
-# CONFIG_MTD_ROM is not set
-CONFIG_MTD_ROOTFS_ROOT_DEV=y
-CONFIG_MTD_ROOTFS_SPLIT=y
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_SST25L is not set
-# CONFIG_MTD_TESTS is not set
-# CONFIG_MTD_UBI is not set
-CONFIG_MTD=y
-# CONFIG_MV643XX_ETH is not set
-# CONFIG_MVSWITCH_PHY is not set
-# CONFIG_MWAVE is not set
-# CONFIG_MWL8K is not set
-# CONFIG_MYRI10GE is not set
-# CONFIG_NAMESPACES is not set
-# CONFIG_NATIONAL_PHY is not set
-# CONFIG_NATSEMI is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_NE2K_PCI is not set
-# CONFIG_NEC_MARKEINS is not set
-# CONFIG_NET_9P is not set
-# CONFIG_NET_ACT_GACT is not set
-# CONFIG_NET_ACT_IPT is not set
-# CONFIG_NET_ACT_MIRRED is not set
-# CONFIG_NET_ACT_NAT is not set
-# CONFIG_NET_ACT_PEDIT is not set
-# CONFIG_NET_ACT_POLICE is not set
-# CONFIG_NET_ACT_SIMP is not set
-CONFIG_NET_ACT_SKBEDIT=y
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_CLS_BASIC=y
-# CONFIG_NET_CLS_FLOW is not set
-# CONFIG_NET_CLS_FW is not set
-CONFIG_NET_CLS_IND=y
-# CONFIG_NET_CLS_ROUTE4 is not set
-# CONFIG_NET_CLS_RSVP6 is not set
-# CONFIG_NET_CLS_RSVP is not set
-# CONFIG_NET_CLS_TCINDEX is not set
-# CONFIG_NET_CLS_U32 is not set
-CONFIG_NET_CLS=y
-# CONFIG_NETCONSOLE is not set
-# CONFIG_NETDEBUG is not set
-# CONFIG_NETDEV_10000 is not set
-CONFIG_NETDEV_1000=y
-CONFIG_NETDEVICES_MULTIQUEUE=y
-CONFIG_NETDEVICES=y
-# CONFIG_NET_DROP_MONITOR is not set
-# CONFIG_NET_DSA is not set
-# CONFIG_NET_EMATCH_CMP is not set
-# CONFIG_NET_EMATCH is not set
-# CONFIG_NET_EMATCH_META is not set
-# CONFIG_NET_EMATCH_NBYTE is not set
-CONFIG_NET_EMATCH_STACK=32
-# CONFIG_NET_EMATCH_TEXT is not set
-# CONFIG_NET_EMATCH_U32 is not set
-CONFIG_NET_ESTIMATOR=y
-CONFIG_NET_ETHERNET=y
-# CONFIG_NET_FC is not set
-CONFIG_NETFILTER_ADVANCED=y
-# CONFIG_NETFILTER_DEBUG is not set
-# CONFIG_NETFILTER_NETLINK is not set
-# CONFIG_NETFILTER_NETLINK_LOG is not set
-# CONFIG_NETFILTER_NETLINK_QUEUE is not set
-# CONFIG_NETFILTER_TPROXY is not set
-# CONFIG_NETFILTER_XTABLES is not set
-# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
-# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
-# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
-# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
-# CONFIG_NETFILTER_XT_MATCH_ESP is not set
-# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
-# CONFIG_NETFILTER_XT_MATCH_HL is not set
-# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
-# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set
-# CONFIG_NETFILTER_XT_MATCH_LAYER7 is not set
-# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
-# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_MAC is not set
-# CONFIG_NETFILTER_XT_MATCH_MARK is not set
-# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
-# CONFIG_NETFILTER_XT_MATCH_OSF is not set
-# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
-# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
-# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
-# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
-# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
-# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
-# CONFIG_NETFILTER_XT_MATCH_REALM is not set
-# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
-# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
-# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
-# CONFIG_NETFILTER_XT_MATCH_STATE is not set
-# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
-# CONFIG_NETFILTER_XT_MATCH_STRING is not set
-# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
-# CONFIG_NETFILTER_XT_MATCH_TIME is not set
-# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
-# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
-# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
-# CONFIG_NETFILTER_XT_TARGET_HL is not set
-# CONFIG_NETFILTER_XT_TARGET_IMQ is not set
-# CONFIG_NETFILTER_XT_TARGET_LED is not set
-# CONFIG_NETFILTER_XT_TARGET_MARK is not set
-# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
-# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
-# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
-# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
-# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
-CONFIG_NETFILTER=y
-CONFIG_NET_IPGRE_BROADCAST=y
-# CONFIG_NET_IPGRE is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_ISA is not set
-# CONFIG_NET_KEY is not set
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_NET_PCI=y
-# CONFIG_NET_PCMCIA is not set
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_NETPOLL is not set
-CONFIG_NET_RADIO=y
-# CONFIG_NETROM is not set
-# CONFIG_NET_SB1000 is not set
-# CONFIG_NET_SCH_ATM is not set
-# CONFIG_NET_SCH_CBQ is not set
-# CONFIG_NET_SCH_CLK_CPU is not set
-# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
-CONFIG_NET_SCH_CLK_JIFFIES=y
-# CONFIG_NET_SCH_DRR is not set
-# CONFIG_NET_SCH_DSMARK is not set
-CONFIG_NET_SCHED=y
-# CONFIG_NET_SCH_ESFQ is not set
-CONFIG_NET_SCH_ESFQ_NFCT=y
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_NET_SCH_GRED is not set
-# CONFIG_NET_SCH_HFSC is not set
-# CONFIG_NET_SCH_HTB is not set
-# CONFIG_NET_SCH_INGRESS is not set
-# CONFIG_NET_SCH_MULTIQ is not set
-# CONFIG_NET_SCH_NETEM is not set
-# CONFIG_NET_SCH_PRIO is not set
-# CONFIG_NET_SCH_RED is not set
-# CONFIG_NET_SCH_RR is not set
-# CONFIG_NET_SCH_SFQ is not set
-# CONFIG_NET_SCH_TBF is not set
-# CONFIG_NET_SCH_TEQL is not set
-# CONFIG_NET_TULIP is not set
-# CONFIG_NET_VENDOR_3COM is not set
-CONFIG_NET_WIRELESS_RTNETLINK=y
-CONFIG_NET_WIRELESS=y
-CONFIG_NETWORK_FILESYSTEMS=y
-# CONFIG_NETWORK_SECMARK is not set
-# CONFIG_NETXEN_NIC is not set
-CONFIG_NET=y
-# CONFIG_NEW_GPIO is not set
-CONFIG_NEW_LEDS=y
-# CONFIG_NF_CONNTRACK_AMANDA is not set
-CONFIG_NF_CONNTRACK_ENABLED=y
-# CONFIG_NF_CONNTRACK_EVENTS is not set
-# CONFIG_NF_CONNTRACK_FTP is not set
-# CONFIG_NF_CONNTRACK_H323 is not set
-# CONFIG_NF_CONNTRACK_IPV4 is not set
-# CONFIG_NF_CONNTRACK_IPV6 is not set
-# CONFIG_NF_CONNTRACK_IRC is not set
-# CONFIG_NF_CONNTRACK is not set
-CONFIG_NF_CONNTRACK_MARK=y
-# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
-# CONFIG_NF_CONNTRACK_PPTP is not set
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-# CONFIG_NF_CONNTRACK_RTSP is not set
-# CONFIG_NF_CONNTRACK_SANE is not set
-# CONFIG_NF_CONNTRACK_SIP is not set
-CONFIG_NF_CONNTRACK_SUPPORT=y
-# CONFIG_NF_CONNTRACK_TFTP is not set
-# CONFIG_NF_CT_ACCT is not set
-# CONFIG_NF_CT_NETLINK is not set
-# CONFIG_NF_CT_PROTO_DCCP is not set
-# CONFIG_NF_CT_PROTO_GRE is not set
-# CONFIG_NF_CT_PROTO_SCTP is not set
-# CONFIG_NF_CT_PROTO_UDPLITE is not set
-# CONFIG_NF_DEFRAG_IPV4 is not set
-# CONFIG_NF_NAT_AMANDA is not set
-# CONFIG_NF_NAT_FTP is not set
-# CONFIG_NF_NAT_H323 is not set
-# CONFIG_NF_NAT_IRC is not set
-# CONFIG_NF_NAT is not set
-CONFIG_NF_NAT_NEEDED=y
-# CONFIG_NF_NAT_PPTP is not set
-# CONFIG_NF_NAT_PROTO_GRE is not set
-# CONFIG_NF_NAT_RTSP is not set
-# CONFIG_NF_NAT_SIP is not set
-# CONFIG_NF_NAT_SNMP_BASIC is not set
-# CONFIG_NF_NAT_TFTP is not set
-# CONFIG_NFS_ACL_SUPPORT is not set
-CONFIG_NFS_COMMON=y
-# CONFIG_NFS_DIRECTIO is not set
-# CONFIG_NFSD is not set
-CONFIG_NFSD_TCP=y
-# CONFIG_NFSD_V2_ACL is not set
-# CONFIG_NFSD_V3_ACL is not set
-CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V4 is not set
-# CONFIG_NFS_FS is not set
-# CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V3=y
-# CONFIG_NFS_V4_1 is not set
-# CONFIG_NFS_V4 is not set
-# CONFIG_NFTL is not set
-# CONFIG_NILFS2_FS is not set
-CONFIG_NL80211=y
-CONFIG_NLATTR=y
-# CONFIG_NLS_ASCII is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_CODEPAGE_437 is not set
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-# CONFIG_NLS_CODEPAGE_850 is not set
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-CONFIG_NLS_DEFAULT="iso8859-1"
-# CONFIG_NLS is not set
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-# CONFIG_NLS_ISO8859_15 is not set
-# CONFIG_NLS_ISO8859_1 is not set
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_UTF8 is not set
-# CONFIG_NO_HZ is not set
-# CONFIG_NOP_USB_XCEIV is not set
-# CONFIG_NORTEL_HERMES is not set
-# CONFIG_NOZOMI is not set
-# CONFIG_NS83820 is not set
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
-# CONFIG_NVRAM is not set
-# CONFIG_OC_ETM is not set
-# CONFIG_OCF_BENCH is not set
-# CONFIG_OCF_EP80579 is not set
-# CONFIG_OCF_HIFNHIPP is not set
-# CONFIG_OCF_HIFN is not set
-# CONFIG_OCF_IXP4XX is not set
-# CONFIG_OCF_OCF is not set
-# CONFIG_OCF_OCFNULL is not set
-# CONFIG_OCFS2_FS is not set
-# CONFIG_OCF_SAFE is not set
-# CONFIG_OCF_TALITOS is not set
-# CONFIG_OMFS_FS is not set
-# CONFIG_ORION_WATCHDOG is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_P54_COMMON is not set
-CONFIG_PACKET_MMAP=y
-CONFIG_PACKET=y
-# CONFIG_PAGE_POISONING is not set
-# CONFIG_PAGE_SIZE_16KB is not set
-# CONFIG_PAGE_SIZE_32KB is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_64KB is not set
-# CONFIG_PAGE_SIZE_8KB is not set
-# CONFIG_PANTHERLORD_FF is not set
-# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_PC is not set
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_PATA_ALI is not set
-# CONFIG_PATA_AMD is not set
-# CONFIG_PATA_ARTOP is not set
-# CONFIG_PATA_ATIIXP is not set
-# CONFIG_PATA_ATP867X is not set
-# CONFIG_PATA_CMD640_PCI is not set
-# CONFIG_PATA_CMD64X is not set
-# CONFIG_PATA_CS5520 is not set
-# CONFIG_PATA_CS5530 is not set
-# CONFIG_PATA_CS5535 is not set
-# CONFIG_PATA_CS5536 is not set
-# CONFIG_PATA_CYPRESS is not set
-# CONFIG_PATA_EFAR is not set
-# CONFIG_PATA_HPT366 is not set
-# CONFIG_PATA_HPT37X is not set
-# CONFIG_PATA_HPT3X2N is not set
-# CONFIG_PATA_HPT3X3 is not set
-# CONFIG_PATA_ISAPNP is not set
-# CONFIG_PATA_IT8213 is not set
-# CONFIG_PATA_IT821X is not set
-# CONFIG_PATA_JMICRON is not set
-# CONFIG_PATA_LEGACY is not set
-# CONFIG_PATA_MARVELL is not set
-# CONFIG_PATA_MPIIX is not set
-# CONFIG_PATA_NETCELL is not set
-# CONFIG_PATA_NINJA32 is not set
-# CONFIG_PATA_NS87410 is not set
-# CONFIG_PATA_NS87415 is not set
-# CONFIG_PATA_OLDPIIX is not set
-# CONFIG_PATA_OPTIDMA is not set
-# CONFIG_PATA_OPTI is not set
-# CONFIG_PATA_PCMCIA is not set
-# CONFIG_PATA_PDC2027X is not set
-# CONFIG_PATA_PDC_OLD is not set
-# CONFIG_PATA_PLATFORM is not set
-# CONFIG_PATA_QDI is not set
-# CONFIG_PATA_RADISYS is not set
-# CONFIG_PATA_RDC is not set
-# CONFIG_PATA_RZ1000 is not set
-# CONFIG_PATA_SC1200 is not set
-# CONFIG_PATA_SCH is not set
-# CONFIG_PATA_SERVERWORKS is not set
-# CONFIG_PATA_SIL680 is not set
-# CONFIG_PATA_SIS is not set
-# CONFIG_PATA_TOSHIBA is not set
-# CONFIG_PATA_TRIFLEX is not set
-# CONFIG_PATA_VIA is not set
-# CONFIG_PATA_WINBOND is not set
-# CONFIG_PATA_WINBOND_VLB is not set
-# CONFIG_PC300TOO is not set
-# CONFIG_PCCARD is not set
-# CONFIG_PCF8575 is not set
-# CONFIG_PCI200SYN is not set
-# CONFIG_PCI_ATMEL is not set
-# CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_DISABLE_COMMON_QUIRKS is not set
-# CONFIG_PCIEAER_INJECT is not set
-# CONFIG_PCIEASPM is not set
-# CONFIG_PCIE_ECRC is not set
-# CONFIG_PCI_HERMES is not set
-# CONFIG_PCI_IOV is not set
-# CONFIG_PCI_LEGACY is not set
-# CONFIG_PCI_MSI is not set
-# CONFIG_PCIPCWATCHDOG is not set
-CONFIG_PCI_QUIRKS=y
-# CONFIG_PCI_STUB is not set
-CONFIG_PCI_SYSCALL=y
-CONFIG_PCI=y
-# CONFIG_PCMCIA_AHA152X is not set
-# CONFIG_PCMCIA_ATMEL is not set
-# CONFIG_PCMCIA_DEBUG is not set
-# CONFIG_PCMCIA_FDOMAIN is not set
-# CONFIG_PCMCIA_HERMES is not set
-# CONFIG_PCMCIA_IOCTL is not set
-# CONFIG_PCMCIA is not set
-# CONFIG_PCMCIA_LOAD_CIS is not set
-# CONFIG_PCMCIA_NETWAVE is not set
-# CONFIG_PCMCIA_NINJA_SCSI is not set
-# CONFIG_PCMCIA_QLOGIC is not set
-# CONFIG_PCMCIA_RAYCS is not set
-# CONFIG_PCMCIA_SPECTRUM is not set
-# CONFIG_PCMCIA_SYM53C500 is not set
-# CONFIG_PCMCIA_WAVELAN is not set
-# CONFIG_PCMCIA_WL3501 is not set
-# CONFIG_PCNET32 is not set
-# CONFIG_PCSPKR_PLATFORM is not set
-# CONFIG_PD6729 is not set
-# CONFIG_PDC_ADMA is not set
-# CONFIG_PERF_COUNTERS is not set
-# CONFIG_PERF_EVENTS is not set
-# CONFIG_PHANTOM is not set
-# CONFIG_PHONE is not set
-# CONFIG_PHONET is not set
-# CONFIG_PHYLIB is not set
-# CONFIG_PHYS_ADDR_T_64BIT is not set
-# CONFIG_PID_NS is not set
-# CONFIG_PLAN9AUTH is not set
-CONFIG_PLIST=y
-# CONFIG_PLX_HERMES is not set
-# CONFIG_PMIC_ADP5520 is not set
-# CONFIG_PMIC_DA903X is not set
-# CONFIG_PM is not set
-# CONFIG_POHMELFS is not set
-# CONFIG_POSIX_MQUEUE is not set
-# CONFIG_POWER_SUPPLY is not set
-# CONFIG_PPC_16K_PAGES is not set
-# CONFIG_PPC_256K_PAGES is not set
-CONFIG_PPC_4K_PAGES=y
-CONFIG_PPC4xx_GPIO=y
-# CONFIG_PPC_64K_PAGES is not set
-# CONFIG_PPC_DISABLE_WERROR is not set
-# CONFIG_PPC_EMULATED_STATS is not set
-# CONFIG_PPP_ASYNC is not set
-# CONFIG_PPP_BSDCOMP is not set
-# CONFIG_PPP_DEFLATE is not set
-CONFIG_PPP_FILTER=y
-# CONFIG_PPP is not set
-# CONFIG_PPP_MPPE is not set
-CONFIG_PPP_MULTILINK=y
-# CONFIG_PPPOATM is not set
-# CONFIG_PPPOE is not set
-# CONFIG_PPPOL2TP is not set
-# CONFIG_PPP_SYNC_TTY is not set
-# CONFIG_PPS is not set
-# CONFIG_PREEMPT is not set
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_RCU is not set
-# CONFIG_PREEMPT_RCU_TRACE is not set
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_TI_DAC7512 is not set
-CONFIG_TINY_RCU=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_PRINTK_TIME is not set
-CONFIG_PRINTK=y
-# CONFIG_PRISM2_USB is not set
-# CONFIG_PRISM54 is not set
-# CONFIG_PROBE_INITRD_HEADER is not set
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-# CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_PROC_SYSCTL=y
-# CONFIG_PROFILING is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_QEMU is not set
-# CONFIG_QLA3XXX is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QSEMI_PHY is not set
-# CONFIG_QT2160 is not set
-# CONFIG_QUOTA is not set
-# CONFIG_R3964 is not set
-# CONFIG_R6040 is not set
-# CONFIG_R8169 is not set
-# CONFIG_RADIO_ADAPTERS is not set
-# CONFIG_RADIO_AZTECH is not set
-# CONFIG_RADIO_CADET is not set
-# CONFIG_RADIO_GEMTEK is not set
-# CONFIG_RADIO_GEMTEK_PCI is not set
-# CONFIG_RADIO_MAESTRO is not set
-# CONFIG_RADIO_MAXIRADIO is not set
-# CONFIG_RADIO_RTRACK2 is not set
-# CONFIG_RADIO_RTRACK is not set
-# CONFIG_RADIO_SF16FMI is not set
-# CONFIG_RADIO_SF16FMR2 is not set
-# CONFIG_RADIO_TERRATEC is not set
-# CONFIG_RADIO_TRUST is not set
-# CONFIG_RADIO_TYPHOON is not set
-# CONFIG_RADIO_ZOLTRIX is not set
-# CONFIG_RAID_ATTRS is not set
-CONFIG_RAMFS=y
-# CONFIG_RAR_REGISTER is not set
-# CONFIG_RAW_DRIVER is not set
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-CONFIG_RCU_FANOUT=32
-# CONFIG_RCU_FANOUT_EXACT is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-# CONFIG_RCU_TRACE is not set
-# CONFIG_RD_BZIP2 is not set
-# CONFIG_RDC_17F3101X is not set
-# CONFIG_RD_GZIP is not set
-CONFIG_RD_LZMA=y
-# CONFIG_RD_LZO is not set
-# CONFIG_RDS is not set
-# CONFIG_REALTEK_PHY is not set
-# CONFIG_REDWOOD is not set
-# CONFIG_REGULATOR_BQ24022 is not set
-# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
-# CONFIG_REGULATOR is not set
-# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_REISERFS_FS_XATTR is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-# CONFIG_RELAY is not set
-# CONFIG_RESOURCES_64BIT is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_RFKILL_INPUT is not set
-# CONFIG_RFKILL is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_ROSE is not set
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
-# CONFIG_RT2860 is not set
-# CONFIG_RT2870 is not set
-# CONFIG_RT2X00 is not set
-# CONFIG_RT3070 is not set
-# CONFIG_RT3090 is not set
-# CONFIG_RTC_CLASS is not set
-# CONFIG_RTC_DEBUG is not set
-# CONFIG_RTC_DRV_BQ32K is not set
-# CONFIG_RTC_DRV_BQ4802 is not set
-CONFIG_RTC_DRV_CMOS=y
-# CONFIG_RTC_DRV_DS1286 is not set
-# CONFIG_RTC_DRV_DS1305 is not set
-# CONFIG_RTC_DRV_DS1307 is not set
-# CONFIG_RTC_DRV_DS1374 is not set
-# CONFIG_RTC_DRV_DS1390 is not set
-# CONFIG_RTC_DRV_DS1511 is not set
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_DS1742 is not set
-# CONFIG_RTC_DRV_DS3234 is not set
-# CONFIG_RTC_DRV_FM3130 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
-# CONFIG_RTC_DRV_M41T80 is not set
-# CONFIG_RTC_DRV_M41T94 is not set
-# CONFIG_RTC_DRV_M48T35 is not set
-# CONFIG_RTC_DRV_M48T59 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_MAX6900 is not set
-# CONFIG_RTC_DRV_MAX6902 is not set
-# CONFIG_RTC_DRV_MSM6242 is not set
-# CONFIG_RTC_DRV_PCF2123 is not set
-# CONFIG_RTC_DRV_PCF50606 is not set
-# CONFIG_RTC_DRV_PCF8563 is not set
-# CONFIG_RTC_DRV_PCF8583 is not set
-# CONFIG_RTC_DRV_R9701 is not set
-# CONFIG_RTC_DRV_RP5C01 is not set
-# CONFIG_RTC_DRV_RS5C348 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set
-# CONFIG_RTC_DRV_RTC7301 is not set
-# CONFIG_RTC_DRV_RX8025 is not set
-# CONFIG_RTC_DRV_RX8581 is not set
-# CONFIG_RTC_DRV_S35390A is not set
-# CONFIG_RTC_DRV_STK17TA8 is not set
-# CONFIG_RTC_DRV_TEST is not set
-# CONFIG_RTC_DRV_V3020 is not set
-# CONFIG_RTC_DRV_X1205 is not set
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_HCTOSYS=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_LIB=y
-# CONFIG_RTL8180 is not set
-# CONFIG_RTL8187 is not set
-# CONFIG_RTL8187SE is not set
-# CONFIG_RTL8192E is not set
-# CONFIG_RTL8192U is not set
-# CONFIG_RTL8192SU is not set
-# CONFIG_RTL8306_PHY is not set
-# CONFIG_RTL8366_SMI is not set
-# CONFIG_RTL8366S_PHY_DEBUG_FS is not set
-# CONFIG_RTL8366S_PHY is not set
-# CONFIG_RTL8366RB_PHY is not set
-CONFIG_RT_MUTEXES=y
-# CONFIG_RT_MUTEX_TESTER is not set
-# CONFIG_RUNTIME_DEBUG is not set
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_S2IO is not set
-# CONFIG_SAMPLES is not set
-# CONFIG_SATA_AHCI is not set
-# CONFIG_SATA_INIC162X is not set
-# CONFIG_SATA_MV is not set
-# CONFIG_SATA_NV is not set
-# CONFIG_SATA_PMP is not set
-# CONFIG_SATA_PROMISE is not set
-# CONFIG_SATA_QSTOR is not set
-# CONFIG_SATA_SIL24 is not set
-# CONFIG_SATA_SIL is not set
-# CONFIG_SATA_SIS is not set
-# CONFIG_SATA_SVW is not set
-# CONFIG_SATA_SX4 is not set
-# CONFIG_SATA_ULI is not set
-# CONFIG_SATA_VIA is not set
-# CONFIG_SATA_VITESSE is not set
-# CONFIG_SBC_FITPC2_WATCHDOG is not set
-# CONFIG_SC92031 is not set
-# CONFIG_SCC is not set
-# CONFIG_SCHED_BFS is not set
-CONFIG_SCHED_CFS=y
-# CONFIG_SCHED_DEBUG is not set
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_3W_SAS is not set
-# CONFIG_SCSI_7000FASST is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_AHA152X is not set
-# CONFIG_SCSI_AHA1542 is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-# CONFIG_SCSI_AIC94XX is not set
-# CONFIG_SCSI_ARCMSR is not set
-# CONFIG_SCSI_BFA_FC is not set
-# CONFIG_SCSI_BNX2_ISCSI is not set
-# CONFIG_SCSI_BUSLOGIC is not set
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_DC390T is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_DH is not set
-CONFIG_SCSI_DMA=y
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_DPT_I2O is not set
-# CONFIG_SCSI_DTC3280 is not set
-# CONFIG_SCSI_EATA is not set
-# CONFIG_SCSI_ESP_CORE is not set
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
-# CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_HPSA is not set
-# CONFIG_SCSI_IN2000 is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_IPR is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
-CONFIG_SCSI_LOWLEVEL=y
-# CONFIG_SCSI_LPFC is not set
-# CONFIG_SCSI_MPT2SAS is not set
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_MVSAS is not set
-# CONFIG_SCSI_MVSAS_DEBUG is not set
-# CONFIG_SCSI_NCR53C406A is not set
-# CONFIG_SCSI_NETLINK is not set
-# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_OSD_INITIATOR is not set
-# CONFIG_SCSI_PAS16 is not set
-# CONFIG_SCSI_PM8001 is not set
-# CONFIG_SCSI_PMCRAID is not set
-CONFIG_SCSI_PROC_FS=y
-# CONFIG_SCSI_PSI240I is not set
-# CONFIG_SCSI_QLA_FC is not set
-# CONFIG_SCSI_QLA_ISCSI is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLOGIC_FAS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
-# CONFIG_SCSI_SAS_LIBSAS is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-# CONFIG_SCSI_SEAGATE is not set
-# CONFIG_SCSI_SPI_ATTRS is not set
-# CONFIG_SCSI_SRP_ATTRS is not set
-# CONFIG_SCSI_SRP is not set
-# CONFIG_SCSI_STEX is not set
-# CONFIG_SCSI_SYM53C416 is not set
-# CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_T128 is not set
-# CONFIG_SCSI_TGT is not set
-# CONFIG_SCSI_U14_34F is not set
-# CONFIG_SCSI_ULTRASTOR is not set
-CONFIG_SCSI_WAIT_SCAN=m
-# CONFIG_SECCOMP is not set
-# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-# CONFIG_SECURITYFS is not set
-# CONFIG_SECURITY is not set
-CONFIG_SELECT_MEMORY_MODEL=y
-# CONFIG_SENSORS_ABITUGURU3 is not set
-# CONFIG_SENSORS_ABITUGURU is not set
-# CONFIG_SENSORS_AD7414 is not set
-# CONFIG_SENSORS_AD7418 is not set
-# CONFIG_SENSORS_ADCXX is not set
-# CONFIG_SENSORS_ADM1021 is not set
-# CONFIG_SENSORS_ADM1025 is not set
-# CONFIG_SENSORS_ADM1026 is not set
-# CONFIG_SENSORS_ADM1029 is not set
-# CONFIG_SENSORS_ADM1031 is not set
-# CONFIG_SENSORS_ADM9240 is not set
-# CONFIG_SENSORS_ADS7828 is not set
-# CONFIG_SENSORS_ADT7411 is not set
-# CONFIG_SENSORS_ADT7462 is not set
-# CONFIG_SENSORS_ADT7470 is not set
-# CONFIG_SENSORS_ADT7473 is not set
-# CONFIG_SENSORS_ADT7475 is not set
-# CONFIG_SENSORS_AMC6821 is not set
-# CONFIG_SENSORS_APPLESMC is not set
-# CONFIG_SENSORS_ASB100 is not set
-# CONFIG_SENSORS_ASC7621 is not set
-# CONFIG_SENSORS_ATK0110 is not set
-# CONFIG_SENSORS_ATXP1 is not set
-# CONFIG_SENSORS_CORETEMP is not set
-# CONFIG_SENSORS_DME1737 is not set
-# CONFIG_SENSORS_DS1337 is not set
-# CONFIG_SENSORS_DS1374 is not set
-# CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_EEPROM is not set
-# CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_F71882FG is not set
-# CONFIG_SENSORS_F75375S is not set
-# CONFIG_SENSORS_FSCHER is not set
-# CONFIG_SENSORS_FSCHMD is not set
-# CONFIG_SENSORS_FSCPOS is not set
-# CONFIG_SENSORS_G760A is not set
-# CONFIG_SENSORS_GL518SM is not set
-# CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_HDAPS is not set
-# CONFIG_SENSORS_I5K_AMB is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_K8TEMP is not set
-# CONFIG_SENSORS_LIS3LV02D is not set
-# CONFIG_SENSORS_LIS3_I2C is not set
-# CONFIG_SENSORS_LIS3_SPI is not set
-# CONFIG_SENSORS_LM63 is not set
-# CONFIG_SENSORS_LM70 is not set
-# CONFIG_SENSORS_LM73 is not set
-# CONFIG_SENSORS_LM75 is not set
-# CONFIG_SENSORS_LM77 is not set
-# CONFIG_SENSORS_LM78 is not set
-# CONFIG_SENSORS_LM80 is not set
-# CONFIG_SENSORS_LM83 is not set
-# CONFIG_SENSORS_LM85 is not set
-# 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_LM95241 is not set
-# CONFIG_SENSORS_LTC4215 is not set
-# CONFIG_SENSORS_LTC4245 is not set
-# CONFIG_SENSORS_M41T00 is not set
-# CONFIG_SENSORS_MAX1111 is not set
-# CONFIG_SENSORS_MAX1619 is not set
-# CONFIG_SENSORS_MAX6650 is not set
-# CONFIG_SENSORS_MAX6875 is not set
-# CONFIG_SENSORS_PC87360 is not set
-# CONFIG_SENSORS_PC87427 is not set
-# CONFIG_SENSORS_PCA9539 is not set
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_SENSORS_SHT15 is not set
-# CONFIG_SENSORS_SIS5595 is not set
-# CONFIG_SENSORS_SMSC47B397 is not set
-# CONFIG_SENSORS_SMSC47M192 is not set
-# CONFIG_SENSORS_SMSC47M1 is not set
-# CONFIG_SENSORS_THMC50 is not set
-# CONFIG_SENSORS_TMP401 is not set
-# CONFIG_SENSORS_TMP421 is not set
-# CONFIG_SENSORS_TSL2550 is not set
-# CONFIG_SENSORS_VIA686A is not set
-# CONFIG_SENSORS_VT1211 is not set
-# CONFIG_SENSORS_VT8231 is not set
-# CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83781D is not set
-# CONFIG_SENSORS_W83791D is not set
-# CONFIG_SENSORS_W83792D is not set
-# CONFIG_SENSORS_W83793 is not set
-# CONFIG_SENSORS_W83L785TS is not set
-# CONFIG_SENSORS_W83L786NG is not set
-CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_SERIAL_8250_CS is not set
-CONFIG_SERIAL_8250_NR_UARTS=2
-# CONFIG_SERIAL_8250_PCI is not set
-CONFIG_SERIAL_8250_RUNTIME_UARTS=2
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_CORE=y
-# CONFIG_SERIAL_JSM is not set
-# CONFIG_SERIAL_MAX3100 is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
-# CONFIG_SERIAL_UARTLITE is not set
-# CONFIG_SERIO is not set
-# CONFIG_SFI is not set
-# CONFIG_SGI_IOC4 is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_SHAPER is not set
-CONFIG_SHMEM=y
-CONFIG_SIGNALFD=y
-# CONFIG_SIMPLE_GPIO is not set
-# CONFIG_SIS190 is not set
-# CONFIG_SIS900 is not set
-# CONFIG_SK98LIN is not set
-# CONFIG_SKGE is not set
-# CONFIG_SKY2_DEBUG is not set
-# CONFIG_SKY2 is not set
-CONFIG_SLABINFO=y
-CONFIG_SLAB=y
-# CONFIG_SLHC is not set
-# CONFIG_SLICOSS is not set
-# CONFIG_SLIP is not set
-# CONFIG_SLOB is not set
-# CONFIG_SLOW_WORK_DEBUG is not set
-# CONFIG_SLOW_WORK is not set
-# CONFIG_SLUB_DEBUG is not set
-# CONFIG_SLUB is not set
-# CONFIG_SMARTJOYPLUS_FF is not set
-# CONFIG_SMB_FS is not set
-# CONFIG_SMB_NLS_DEFAULT is not set
-# CONFIG_SMC911X is not set
-# CONFIG_SMC91X is not set
-# CONFIG_SMP is not set
-# CONFIG_SMSC911X is not set
-# CONFIG_SMSC9420 is not set
-# CONFIG_SMSC_PHY is not set
-# CONFIG_SND_AC97_POWER_SAVE is not set
-# CONFIG_SND_AD1816A is not set
-# CONFIG_SND_AD1848 is not set
-# CONFIG_SND_AD1889 is not set
-# CONFIG_SND_ADLIB is not set
-# CONFIG_SND_ALI5451 is not set
-# CONFIG_SND_ALS100 is not set
-# CONFIG_SND_ALS300 is not set
-# CONFIG_SND_ALS4000 is not set
-# CONFIG_SND_ARM is not set
-# CONFIG_SND_ATIIXP is not set
-# CONFIG_SND_ATIIXP_MODEM is not set
-# CONFIG_SND_AU8810 is not set
-# CONFIG_SND_AU8820 is not set
-# CONFIG_SND_AU8830 is not set
-# CONFIG_SND_AW2 is not set
-# CONFIG_SND_AZT2320 is not set
-# CONFIG_SND_AZT3328 is not set
-# CONFIG_SND_BT87X is not set
-# CONFIG_SND_CA0106 is not set
-# CONFIG_SND_CMI8330 is not set
-# CONFIG_SND_CMIPCI is not set
-# CONFIG_SND_CS4231 is not set
-# CONFIG_SND_CS4232 is not set
-# CONFIG_SND_CS4236 is not set
-# CONFIG_SND_CS4281 is not set
-# CONFIG_SND_CS46XX is not set
-# CONFIG_SND_CS5530 is not set
-# CONFIG_SND_CS5535AUDIO is not set
-# CONFIG_SND_CTXFI is not set
-# CONFIG_SND_DARLA20 is not set
-# CONFIG_SND_DARLA24 is not set
-# CONFIG_SND_DEBUG is not set
-CONFIG_SND_DRIVERS=y
-# CONFIG_SND_DT019X is not set
-# CONFIG_SND_DUMMY is not set
-# CONFIG_SND_DYNAMIC_MINORS is not set
-# CONFIG_SND_ECHO3G is not set
-# CONFIG_SND_EMU10K1 is not set
-# CONFIG_SND_EMU10K1X is not set
-# CONFIG_SND_ENS1370 is not set
-# CONFIG_SND_ENS1371 is not set
-# CONFIG_SND_ES1688 is not set
-# CONFIG_SND_ES18XX is not set
-# CONFIG_SND_ES1938 is not set
-# CONFIG_SND_ES1968 is not set
-# CONFIG_SND_ES968 is not set
-# CONFIG_SND_FM801 is not set
-# CONFIG_SND_GINA20 is not set
-# CONFIG_SND_GINA24 is not set
-# CONFIG_SND_GUSCLASSIC is not set
-# CONFIG_SND_GUSEXTREME is not set
-# CONFIG_SND_GUSMAX is not set
-# CONFIG_SND_HDA_INTEL is not set
-# CONFIG_SND_HDSP is not set
-# CONFIG_SND_HDSPM is not set
-# CONFIG_SND_HIFIER is not set
-# CONFIG_SND_HRTIMER is not set
-# CONFIG_SND_HWDEP is not set
-# CONFIG_SND_ICE1712 is not set
-# CONFIG_SND_ICE1724 is not set
-# CONFIG_SND_INDIGODJ is not set
-# CONFIG_SND_INDIGODJX is not set
-# CONFIG_SND_INDIGOIO is not set
-# CONFIG_SND_INDIGOIOX is not set
-# CONFIG_SND_INDIGO is not set
-# CONFIG_SND_INTEL8X0 is not set
-# CONFIG_SND_INTEL8X0M is not set
-# CONFIG_SND_INTERWAVE is not set
-# CONFIG_SND_INTERWAVE_STB is not set
-# CONFIG_SND_ISA is not set
-# CONFIG_SND is not set
-# CONFIG_SND_KORG1212 is not set
-# CONFIG_SND_LAYLA20 is not set
-# CONFIG_SND_LAYLA24 is not set
-# CONFIG_SND_LX6464ES is not set
-# CONFIG_SND_MAESTRO3 is not set
-# CONFIG_SND_MIA is not set
-# CONFIG_SND_MIPS is not set
-# CONFIG_SND_MIRO is not set
-# CONFIG_SND_MIXART is not set
-# CONFIG_SND_MIXER_OSS is not set
-# CONFIG_SND_MONA is not set
-# CONFIG_SND_MPU401 is not set
-# CONFIG_SND_MTPAV is not set
-# CONFIG_SND_NM256 is not set
-# CONFIG_SND_OPL3SA2 is not set
-# CONFIG_SND_OPTI92X_AD1848 is not set
-# CONFIG_SND_OPTI92X_CS4231 is not set
-# CONFIG_SND_OPTI93X is not set
-CONFIG_SND_OSSEMUL=y
-# CONFIG_SND_OXYGEN is not set
-CONFIG_SND_PCI=y
-# CONFIG_SND_PCMCIA is not set
-# CONFIG_SND_PCM is not set
-# CONFIG_SND_PCM_OSS is not set
-CONFIG_SND_PCM_OSS_PLUGINS=y
-# CONFIG_SND_PCXHR is not set
-# CONFIG_SND_PDAUDIOCF is not set
-# CONFIG_SND_RAWMIDI is not set
-# CONFIG_SND_RIPTIDE is not set
-# CONFIG_SND_RME32 is not set
-# CONFIG_SND_RME9652 is not set
-# CONFIG_SND_RME96 is not set
-# CONFIG_SND_RTCTIMER is not set
-# CONFIG_SND_SB16 is not set
-# CONFIG_SND_SB8 is not set
-# CONFIG_SND_SBAWE is not set
-# CONFIG_SND_SEQUENCER is not set
-# CONFIG_SND_SERIAL_U16550 is not set
-# CONFIG_SND_SIS7019 is not set
-# CONFIG_SND_SGALAXY is not set
-# CONFIG_SND_SOC is not set
-# CONFIG_SND_SONICVIBES is not set
-# CONFIG_SND_SPI is not set
-# CONFIG_SND_SSCAPE is not set
-# CONFIG_SND_SUPPORT_OLD_API is not set
-# CONFIG_SND_TIMER is not set
-# CONFIG_SND_TRIDENT is not set
-# CONFIG_SND_USB_AUDIO is not set
-# CONFIG_SND_USB_CAIAQ is not set
-# CONFIG_SND_USB_US122L is not set
-# CONFIG_SND_USB_USX2Y is not set
-CONFIG_SND_USB=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VIA82XX is not set
-# CONFIG_SND_VIA82XX_MODEM is not set
-# CONFIG_SND_VIRTUOSO is not set
-# CONFIG_SND_VX222 is not set
-# CONFIG_SND_VXPOCKET is not set
-# CONFIG_SND_WAVEFRONT is not set
-# CONFIG_SND_YMFPCI is not set
-# CONFIG_SNI_RM is not set
-# CONFIG_SOC_CAMERA is not set
-# CONFIG_SOFT_WATCHDOG is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_SONYPI is not set
-# CONFIG_SONY_LAPTOP is not set
-# CONFIG_SOUND is not set
-# CONFIG_SOUND_PRIME is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-# CONFIG_SPI_AT25 is not set
-# CONFIG_SPI_DEBUG is not set
-# CONFIG_SPI_DESIGNWARE is not set
-# CONFIG_SPI_GPIO_OLD is not set
-# CONFIG_SPI is not set
-# CONFIG_SPI_MASTER is not set
-# CONFIG_SPI_ORION is not set
-# CONFIG_SPI_TLE62X0 is not set
-# CONFIG_SPI_XILINX is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-CONFIG_SQUASHFS_LZMA=y
-CONFIG_SQUASHFS_SUPPORT_ZLIB=y
-# CONFIG_SQUASHFS_VMALLOC is not set
-CONFIG_SQUASHFS=y
-# CONFIG_SSB_BLOCKIO is not set
-# CONFIG_SSB_DEBUG is not set
-# CONFIG_SSB is not set
-# CONFIG_SSB_PCMCIAHOST is not set
-CONFIG_SSB_POSSIBLE=y
-# CONFIG_SSB_SDIOHOST is not set
-# CONFIG_SSB_SILENT is not set
-# CONFIG_SSFDC is not set
-# CONFIG_STACK_TRACER is not set
-CONFIG_STACKTRACE_SUPPORT=y
-# CONFIG_STAGING_EXCLUDE_BUILD is not set
-CONFIG_STAGING=y
-CONFIG_STANDALONE=y
-CONFIG_STDBINUTILS=y
-# CONFIG_STE10XP is not set
-CONFIG_STP=y
-CONFIG_STRIP_ASM_SYMS=y
-# CONFIG_STRIP is not set
-# CONFIG_SUNDANCE is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_SUNRPC_BIND34 is not set
-# CONFIG_SUNRPC_GSS is not set
-# CONFIG_SUNRPC is not set
-# CONFIG_SUNRPC_REGISTER_V4 is not set
-CONFIG_SUSPEND_UP_POSSIBLE=y
-CONFIG_SWAP=y
-# CONFIG_SWCONFIG is not set
-# CONFIG_SYNCLINK_CS is not set
-CONFIG_SYN_COOKIES=y
-CONFIG_SYSCTL_SYSCALL_CHECK=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_SYSCTL=y
-# CONFIG_SYSFS_DEPRECATED is not set
-# CONFIG_SYSFS_DEPRECATED_V2 is not set
-CONFIG_SYSFS=y
-# CONFIG_SYS_HYPERVISOR is not set
-# CONFIG_SYSV68_PARTITION is not set
-# CONFIG_SYSV_FS is not set
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_SYSVIPC=y
-# CONFIG_TASKSTATS is not set
-# CONFIG_TCG_TPM is not set
-# CONFIG_TCIC is not set
-CONFIG_TCP_CONG_ADVANCED=y
-# CONFIG_TCP_CONG_BIC is not set
-# CONFIG_TCP_CONG_CUBIC is not set
-# CONFIG_TCP_CONG_HSTCP is not set
-# CONFIG_TCP_CONG_HTCP is not set
-# CONFIG_TCP_CONG_HYBLA is not set
-# CONFIG_TCP_CONG_ILLINOIS is not set
-# CONFIG_TCP_CONG_LP is not set
-# CONFIG_TCP_CONG_SCALABLE is not set
-# CONFIG_TCP_CONG_VEGAS is not set
-# CONFIG_TCP_CONG_VENO is not set
-CONFIG_TCP_CONG_WESTWOOD=y
-# CONFIG_TCP_CONG_YEAH is not set
-# CONFIG_TCP_MD5SIG is not set
-# CONFIG_TEXTSEARCH_BM is not set
-# CONFIG_TEXTSEARCH_FSM is not set
-# CONFIG_TEXTSEARCH_KMP is not set
-CONFIG_TEXTSEARCH=y
-# CONFIG_THERMAL_HWMON is not set
-# CONFIG_THERMAL is not set
-# CONFIG_THRUSTMASTER_FF is not set
-CONFIG_TICK_ONESHOT=y
-# CONFIG_TIFM_CORE is not set
-# CONFIG_TIGON3 is not set
-CONFIG_TIMERFD=y
-# CONFIG_TINY_SHMEM is not set
-# CONFIG_TIPC is not set
-# CONFIG_TLAN is not set
-# CONFIG_TMD_HERMES is not set
-# CONFIG_TMPFS_POSIX_ACL is not set
-CONFIG_TMPFS=y
-# CONFIG_TOUCHSCREEN_AD7877 is not set
-# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
-# CONFIG_TOUCHSCREEN_AD7879 is not set
-# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
-# CONFIG_TOUCHSCREEN_ADS7846 is not set
-# CONFIG_TOUCHSCREEN_EETI is not set
-# CONFIG_TOUCHSCREEN_ELO is not set
-# CONFIG_TOUCHSCREEN_FILTER is not set
-# CONFIG_TOUCHSCREEN_FUJITSU is not set
-# CONFIG_TOUCHSCREEN_GUNZE is not set
-# CONFIG_TOUCHSCREEN_INEXIO is not set
-# CONFIG_TOUCHSCREEN_MK712 is not set
-# CONFIG_TOUCHSCREEN_MTOUCH is not set
-# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-# CONFIG_TOUCHSCREEN_S3C2410 is not set
-# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
-# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-# CONFIG_TOUCHSCREEN_TSC2007 is not set
-# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-# CONFIG_TOUCHSCREEN_W90X900 is not set
-# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
-# CONFIG_TPS65010 is not set
-# CONFIG_TRACE_BRANCH_PROFILING is not set
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_TRACING_SUPPORT=y
-# CONFIG_TRANZPORT is not set
-# CONFIG_TREE_RCU is not set
-# CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_TR is not set
-# CONFIG_TUNER_3036 is not set
-# CONFIG_TUNER_TEA5761 is not set
-# CONFIG_TUN is not set
-# CONFIG_TWL4030_CORE is not set
-# CONFIG_UACCESS_WITH_MEMCPY is not set
-# CONFIG_UDF_FS is not set
-CONFIG_UDF_NLS=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_UFS_FS is not set
-# CONFIG_UIO is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_UNEVICTABLE_LRU is not set
-# CONFIG_UNION_MOUNT is not set
-CONFIG_UNIX98_PTYS=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_UNIX=y
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_USB_ACECAD is not set
-# CONFIG_USB_ACM is not set
-# CONFIG_USB_ADUTUX is not set
-# CONFIG_USB_AIPTEK is not set
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-# CONFIG_USB_APPLEDISPLAY is not set
-# CONFIG_USB_APPLETOUCH is not set
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARMLINUX=y
-# CONFIG_USB_ATI_REMOTE2 is not set
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_ATMEL is not set
-# CONFIG_USB_ATM is not set
-# CONFIG_USB_AUERSWALD is not set
-# CONFIG_USB_BANDWIDTH is not set
-CONFIG_USB_BELKIN=y
-# CONFIG_USB_BERRY_CHARGE is not set
-# CONFIG_USB_C67X00_HCD is not set
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_CPC is not set
-# CONFIG_USB_CXACRU is not set
-# CONFIG_USB_CYPRESS_CY7C63 is not set
-# CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_DABUSB is not set
-# CONFIG_USB_DEBUG is not set
-# CONFIG_USB_DEVICE_CLASS is not set
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DSBR is not set
-# CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_EHCI_HCD_PPC_OF is not set
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-# CONFIG_USB_EHCI_SPLIT_ISO is not set
-# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-# CONFIG_USB_EMI26 is not set
-# CONFIG_USB_EMI62 is not set
-# CONFIG_USB_EPSON2888 is not set
-# CONFIG_USB_ET61X251 is not set
-CONFIG_USB_EZUSB=y
-# CONFIG_USB_FTDI_ELAN is not set
-# CONFIG_USB_GADGET is not set
-# CONFIG_USB_GADGET_DEBUG is not set
-# CONFIG_USB_GL860 is not set
-# CONFIG_USB_GPIO_VBUS is not set
-# CONFIG_USB_GSPCA_CONEX is not set
-# CONFIG_USB_GSPCA_ETOMS is not set
-# CONFIG_USB_GSPCA_FINEPIX is not set
-# CONFIG_USB_GSPCA is not set
-# CONFIG_USB_GSPCA_JEILINJ is not set
-# CONFIG_USB_GSPCA_MARS is not set
-# CONFIG_USB_GSPCA_MR97310A is not set
-# CONFIG_USB_GSPCA_OV519 is not set
-# CONFIG_USB_GSPCA_OV534 is not set
-# CONFIG_USB_GSPCA_PAC207 is not set
-# CONFIG_USB_GSPCA_PAC7302 is not set
-# CONFIG_USB_GSPCA_PAC7311 is not set
-CONFIG_USB_GSPCA_SN9C20X_EVDEV=y
-# CONFIG_USB_GSPCA_SN9C20X is not set
-# CONFIG_USB_GSPCA_SONIXB is not set
-# CONFIG_USB_GSPCA_SONIXJ is not set
-# CONFIG_USB_GSPCA_SPCA500 is not set
-# CONFIG_USB_GSPCA_SPCA501 is not set
-# CONFIG_USB_GSPCA_SPCA505 is not set
-# CONFIG_USB_GSPCA_SPCA506 is not set
-# CONFIG_USB_GSPCA_SPCA508 is not set
-# CONFIG_USB_GSPCA_SPCA561 is not set
-# CONFIG_USB_GSPCA_SQ905C is not set
-# CONFIG_USB_GSPCA_SQ905 is not set
-# CONFIG_USB_GSPCA_STK014 is not set
-# CONFIG_USB_GSPCA_STV0680 is not set
-# CONFIG_USB_GSPCA_SUNPLUS is not set
-# CONFIG_USB_GSPCA_T613 is not set
-# CONFIG_USB_GSPCA_TV8532 is not set
-# CONFIG_USB_GSPCA_VC032X is not set
-# CONFIG_USB_GSPCA_ZC3XX is not set
-# CONFIG_USB_HIDDEV is not set
-# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-CONFIG_USB_HIDINPUT=y
-# CONFIG_USB_HID is not set
-# CONFIG_USB_HSO is not set
-# CONFIG_USB_HWA_HCD is not set
-# CONFIG_USB_IBMCAM is not set
-# CONFIG_USB_IDMOUSE is not set
-# CONFIG_USB_IOWARRIOR is not set
-# CONFIG_USB_IP_COMMON is not set
-# CONFIG_USB_ISIGHTFW is not set
-# CONFIG_USB is not set
-# CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_ISP1362_HCD is not set
-# CONFIG_USB_ISP1760_HCD is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_KC2190 is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-# CONFIG_USB_KONICAWC is not set
-# CONFIG_USB_LCD is not set
-# CONFIG_USB_LD is not set
-# CONFIG_USB_LED is not set
-# CONFIG_USB_LEGOTOWER is not set
-# CONFIG_USB_LIBUSUAL is not set
-# CONFIG_USB_M5602 is not set
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_MICROTEK is not set
-# CONFIG_USB_MON is not set
-# CONFIG_USB_MOUSE is not set
-# CONFIG_USB_MUSB_HDRC is not set
-# CONFIG_USB_NET_AX8817X is not set
-# CONFIG_USB_NET_CDC_EEM is not set
-# CONFIG_USB_NET_CDCETHER is not set
-# CONFIG_USB_NET_CDC_SUBSET is not set
-# CONFIG_USB_NET_DM9601 is not set
-# CONFIG_USB_NET_GL620A is not set
-# CONFIG_USB_NET_INT51X1 is not set
-# CONFIG_USB_NET_MCS7830 is not set
-# CONFIG_USB_NET_NET1080 is not set
-# CONFIG_USB_NET_PLUSB is not set
-# CONFIG_USB_NET_RNDIS_HOST is not set
-# CONFIG_USB_NET_RNDIS_WLAN is not set
-# CONFIG_USB_NET_SMSC95XX is not set
-# CONFIG_USB_NET_ZAURUS is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN is not set
-# CONFIG_USB_OHCI_HCD is not set
-# CONFIG_USB_OHCI_HCD_PCI is not set
-# CONFIG_USB_OHCI_HCD_PPC_OF is not set
-# CONFIG_USB_OHCI_HCD_PPC_SOC is not set
-# CONFIG_USB_OHCI_HCD_SSB is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-# CONFIG_USB_OTG is not set
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OV511 is not set
-# CONFIG_USB_OXU210HP_HCD is not set
-# CONFIG_USBPCWATCHDOG is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_PHIDGET is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_PWC_INPUT_EVDEV is not set
-# CONFIG_USB_QUICKCAM_MESSENGER is not set
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_RIO500 is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_S2255 is not set
-# CONFIG_USB_SE401 is not set
-# CONFIG_USB_SERIAL_AIRCABLE is not set
-# CONFIG_USB_SERIAL_AIRPRIME is not set
-# CONFIG_USB_SERIAL_ARK3116 is not set
-# CONFIG_USB_SERIAL_BELKIN is not set
-# CONFIG_USB_SERIAL_CH341 is not set
-# CONFIG_USB_SERIAL_CP2101 is not set
-# CONFIG_USB_SERIAL_CP210X is not set
-# CONFIG_USB_SERIAL_CYBERJACK is not set
-# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
-# CONFIG_USB_SERIAL_DEBUG is not set
-# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
-# CONFIG_USB_SERIAL_EDGEPORT is not set
-# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
-# CONFIG_USB_SERIAL_EMPEG is not set
-# CONFIG_USB_SERIAL_FTDI_SIO is not set
-# CONFIG_USB_SERIAL_FUNSOFT is not set
-# CONFIG_USB_SERIAL_GARMIN is not set
-CONFIG_USB_SERIAL_GENERIC=y
-# CONFIG_USB_SERIAL_HP4X is not set
-# CONFIG_USB_SERIAL_IPAQ is not set
-# CONFIG_USB_SERIAL_IPW is not set
-# CONFIG_USB_SERIAL_IR is not set
-# CONFIG_USB_SERIAL is not set
-# CONFIG_USB_SERIAL_IUU is not set
-# CONFIG_USB_SERIAL_KEYSPAN is not set
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-# CONFIG_USB_SERIAL_KLSI is not set
-# CONFIG_USB_SERIAL_KOBIL_SCT is not set
-# CONFIG_USB_SERIAL_MCT_U232 is not set
-# CONFIG_USB_SERIAL_MOS7720 is not set
-# CONFIG_USB_SERIAL_MOS7840 is not set
-# CONFIG_USB_SERIAL_MOTOROLA is not set
-# CONFIG_USB_SERIAL_NAVMAN is not set
-# CONFIG_USB_SERIAL_OMNINET is not set
-# CONFIG_USB_SERIAL_OPTICON is not set
-# CONFIG_USB_SERIAL_OPTION is not set
-# CONFIG_USB_SERIAL_OTI6858 is not set
-# CONFIG_USB_SERIAL_PL2303 is not set
-# CONFIG_USB_SERIAL_QUALCOMM is not set
-# CONFIG_USB_SERIAL_QUATECH2 is not set
-# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
-# CONFIG_USB_SERIAL_SAFE is not set
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
-# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
-# CONFIG_USB_SERIAL_SPCP8X5 is not set
-# CONFIG_USB_SERIAL_SYMBOL is not set
-# CONFIG_USB_SERIAL_TI is not set
-# CONFIG_USB_SERIAL_VISOR is not set
-# CONFIG_USB_SERIAL_WHITEHEAT is not set
-# CONFIG_USB_SERIAL_XIRCOM is not set
-# CONFIG_USB_SEVSEG is not set
-# CONFIG_USB_SISUSBVGA is not set
-# CONFIG_USB_SL811_HCD is not set
-# CONFIG_USB_SN9C102 is not set
-# CONFIG_USB_SPEEDTOUCH is not set
-# CONFIG_USB_STKWEBCAM is not set
-CONFIG_USB_STORAGE_ALAUDA=y
-# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
-CONFIG_USB_STORAGE_DATAFAB=y
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_DPCM=y
-CONFIG_USB_STORAGE_FREECOM=y
-# CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE is not set
-CONFIG_USB_STORAGE_JUMPSHOT=y
-CONFIG_USB_STORAGE_KARMA=y
-# CONFIG_USB_STORAGE_ONETOUCH is not set
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-# CONFIG_USB_STORAGE_SIERRA is not set
-CONFIG_USB_STORAGE_USBAT=y
-# CONFIG_USB_STV06XX is not set
-# CONFIG_USB_STV680 is not set
-# CONFIG_USB_SUPPORT is not set
-# CONFIG_USB_SUSPEND is not set
-# CONFIG_USB_TEST is not set
-# CONFIG_USB_TMC is not set
-# CONFIG_USB_TOUCHSCREEN is not set
-# CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_UEAGLEATM is not set
-# CONFIG_USB_ULPI is not set
-# CONFIG_USB_USBNET is not set
-# CONFIG_USB_USBNET_MII is not set
-# CONFIG_USB_VICAM is not set
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-# CONFIG_USB_VIDEO_CLASS is not set
-# CONFIG_USB_VST is not set
-# CONFIG_USB_W9968CF is not set
-# CONFIG_USB_WACOM is not set
-# CONFIG_USB_WDM is not set
-# CONFIG_USB_WHCI_HCD is not set
-# CONFIG_USB_WUSB_CBAF is not set
-# CONFIG_USB_WUSB is not set
-# CONFIG_USB_XHCI_HCD is not set
-# CONFIG_USB_XPAD is not set
-# CONFIG_USB_XUSBATM is not set
-# CONFIG_USB_YEALINK is not set
-# CONFIG_USB_ZC0301 is not set
-# CONFIG_USB_ZD1201 is not set
-# CONFIG_USB_ZR364XX is not set
-# CONFIG_USE_GENERIC_SMP_HELPERS is not set
-# CONFIG_UTS_NS is not set
-# CONFIG_UWB is not set
-# CONFIG_VETH is not set
-# CONFIG_VFAT_FS is not set
-# CONFIG_VGA_ARB is not set
-# CONFIG_VGASTATE is not set
-# CONFIG_VIA_RHINE is not set
-# CONFIG_VIA_VELOCITY is not set
-# CONFIG_VIDEO_ADV7170 is not set
-# CONFIG_VIDEO_ADV7175 is not set
-# CONFIG_VIDEO_ADV7180 is not set
-# CONFIG_VIDEO_ADV7343 is not set
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_ALLOW_V4L1 is not set
-# CONFIG_VIDEO_BT819 is not set
-# CONFIG_VIDEO_BT848 is not set
-# CONFIG_VIDEO_BT856 is not set
-# CONFIG_VIDEO_BT866 is not set
-# CONFIG_VIDEO_CAFE_CCIC is not set
-# CONFIG_VIDEO_CAPTURE_DRIVERS is not set
-# CONFIG_VIDEO_CPIA is not set
-# CONFIG_VIDEO_CS5345 is not set
-# CONFIG_VIDEO_CS53L32A is not set
-# CONFIG_VIDEO_CX231XX is not set
-# CONFIG_VIDEO_CX2341X is not set
-# CONFIG_VIDEO_CX25840 is not set
-# CONFIG_VIDEO_CX88 is not set
-# CONFIG_VIDEO_DEV is not set
-# CONFIG_VIDEO_DPC is not set
-# CONFIG_VIDEO_EM28XX is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIDEO_GO7007 is not set
-# CONFIG_VIDEO_HDPVR is not set
-# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-# CONFIG_VIDEO_HEXIUM_GEMINI is not set
-# CONFIG_VIDEO_HEXIUM_ORION is not set
-# CONFIG_VIDEO_IR_I2C is not set
-# CONFIG_VIDEO_IVTV is not set
-# CONFIG_VIDEO_KS0127 is not set
-# CONFIG_VIDEO_M52790 is not set
-# CONFIG_VIDEO_MEDIA is not set
-# CONFIG_VIDEO_MSP3400 is not set
-# CONFIG_VIDEO_MT9V011 is not set
-# CONFIG_VIDEO_MXB is not set
-# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-# CONFIG_VIDEO_OV7670 is not set
-# CONFIG_VIDEO_OVCAMCHIP is not set
-# CONFIG_VIDEO_PMS is not set
-# CONFIG_VIDEO_PVRUSB2 is not set
-# CONFIG_VIDEO_SAA5246A is not set
-# CONFIG_VIDEO_SAA5249 is not set
-# CONFIG_VIDEO_SAA6588 is not set
-# CONFIG_VIDEO_SAA7110 is not set
-# CONFIG_VIDEO_SAA7111 is not set
-# CONFIG_VIDEO_SAA7114 is not set
-# CONFIG_VIDEO_SAA711X is not set
-# CONFIG_VIDEO_SAA7127 is not set
-# CONFIG_VIDEO_SAA7134 is not set
-# CONFIG_VIDEO_SAA717X is not set
-# CONFIG_VIDEO_SAA7185 is not set
-# CONFIG_VIDEO_SAA7191 is not set
-# CONFIG_VIDEO_SH_MOBILE_CEU is not set
-# CONFIG_VIDEO_STRADIS is not set
-# CONFIG_VIDEO_TCM825X is not set
-# CONFIG_VIDEO_TDA7432 is not set
-# CONFIG_VIDEO_TDA9840 is not set
-# CONFIG_VIDEO_TDA9875 is not set
-# CONFIG_VIDEO_TEA6415C is not set
-# CONFIG_VIDEO_TEA6420 is not set
-# CONFIG_VIDEO_THS7303 is not set
-# CONFIG_VIDEO_TLV320AIC23B is not set
-# CONFIG_VIDEO_TVAUDIO is not set
-# CONFIG_VIDEO_TVP514X is not set
-# CONFIG_VIDEO_TVP5150 is not set
-# CONFIG_VIDEO_TVP7002 is not set
-# CONFIG_VIDEO_UPD64031A is not set
-# CONFIG_VIDEO_UPD64083 is not set
-# CONFIG_VIDEO_USBVISION is not set
-CONFIG_VIDEO_V4L1_COMPAT=y
-# CONFIG_VIDEO_V4L1 is not set
-# CONFIG_VIDEO_V4L2_COMMON is not set
-# CONFIG_VIDEO_V4L2 is not set
-# CONFIG_VIDEO_VIVI is not set
-# CONFIG_VIDEO_VP27SMPX is not set
-# CONFIG_VIDEO_VPX3220 is not set
-# CONFIG_VIDEO_WM8739 is not set
-# CONFIG_VIDEO_WM8775 is not set
-# CONFIG_VIDEO_ZORAN is not set
-# CONFIG_VIRQ_DEBUG is not set
-CONFIG_VIRT_TO_BUS=y
-# CONFIG_VIRTUALIZATION is not set
-# CONFIG_VITESSE_PHY is not set
-# CONFIG_VLAN_8021Q_GVRP is not set
-CONFIG_VLAN_8021Q=y
-# CONFIG_VME_BUS is not set
-# CONFIG_VM_EVENT_COUNTERS is not set
-# CONFIG_VMSPLIT_1G is not set
-# CONFIG_VMSPLIT_2G is not set
-# CONFIG_VMSPLIT_2G_OPT is not set
-# CONFIG_VMSPLIT_3G_OPT is not set
-CONFIG_VMSPLIT_3G=y
-# CONFIG_VMXNET3 is not set
-# CONFIG_VT6655 is not set
-# CONFIG_VT6656 is not set
-# CONFIG_VT is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_W1_CON is not set
-# CONFIG_W1 is not set
-# CONFIG_W1_MASTER_DS1WM is not set
-# CONFIG_W1_MASTER_DS2482 is not set
-# CONFIG_W1_MASTER_DS2490 is not set
-# CONFIG_W1_MASTER_GPIO is not set
-# CONFIG_W1_MASTER_MATROX is not set
-# CONFIG_W1_SLAVE_BQ27000 is not set
-# CONFIG_W1_SLAVE_DS2431 is not set
-# CONFIG_W1_SLAVE_DS2433 is not set
-# CONFIG_W1_SLAVE_DS2760 is not set
-# CONFIG_W1_SLAVE_SMEM is not set
-# CONFIG_W1_SLAVE_THERM is not set
-# CONFIG_W83627HF_WDT is not set
-# CONFIG_W83697HF_WDT is not set
-# CONFIG_W83877F_WDT is not set
-# CONFIG_W83977F_WDT is not set
-# CONFIG_WAN is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_WANXL is not set
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-CONFIG_WATCHDOG=y
-# CONFIG_WDTPCI is not set
-# CONFIG_WIMAX is not set
-CONFIG_WIRELESS_EXT_SYSFS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WIRELESS_OLD_REGULATORY=y
-CONFIG_WIRELESS=y
-CONFIG_WLAN_80211=y
-# CONFIG_WLAN_PRE80211 is not set
-CONFIG_WLAN=y
-# CONFIG_WORKQUEUE_TRACER is not set
-# CONFIG_WR_PPMC is not set
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_PRIV=y
-CONFIG_WEXT_SPY=y
-# CONFIG_X25 is not set
-# CONFIG_XFRM_IPCOMP is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_USER is not set
-CONFIG_XFRM=y
-# CONFIG_XFS_DEBUG is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_XFS_POSIX_ACL is not set
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_SECURITY is not set
-# CONFIG_XILINX_EMACLITE is not set
-# CONFIG_XILINX_LL_TEMAC is not set
-# CONFIG_XIP_KERNEL is not set
-# CONFIG_YAFFS_FS is not set
-# CONFIG_YAM is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_YENTA is not set
-# CONFIG_YENTA_O2 is not set
-# CONFIG_YENTA_RICOH is not set
-# CONFIG_YENTA_TI is not set
-# CONFIG_YENTA_TOSHIBA is not set
-# CONFIG_ZD1211RW_DEBUG is not set
-# CONFIG_ZD1211RW is not set
-# CONFIG_ZEROPLUS_FF is not set
-# CONFIG_ZISOFS_FS is not set
-CONFIG_ZISOFS=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZONE_DMA_FLAG=1
-CONFIG_ZONE_DMA=y
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DEFAULT_SECURITY=""
-# CONFIG_NETFILTER_XT_TARGET_CT is not set
diff --git a/target/linux/generic-2.6/files-2.6.25/drivers/char/gpio_dev.c b/target/linux/generic-2.6/files-2.6.25/drivers/char/gpio_dev.c
deleted file mode 100644
index 4dc637471..000000000
--- a/target/linux/generic-2.6/files-2.6.25/drivers/char/gpio_dev.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * character device wrapper for generic gpio layer
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA02111-1307USA
- *
- * Feedback, Bugs...  blogic@openwrt.org
- *
- */
-
-#include <linux/module.h>
-#include <linux/errno.h>
-#include <linux/init.h>
-#include <asm/uaccess.h>
-#include <asm/io.h>
-#include <asm/gpio.h>
-#include <asm/atomic.h>
-#include <linux/init.h>
-#include <linux/genhd.h>
-#include <linux/device.h>
-#include <linux/platform_device.h>
-#include <linux/gpio_dev.h>
-
-#define DRVNAME		"gpiodev"
-#define DEVNAME		"gpio"
-
-static int dev_major;
-static unsigned int gpio_access_mask;
-static struct class *gpiodev_class;
-
-/* Counter is 1, if the device is not opened and zero (or less) if opened. */
-static atomic_t gpio_open_cnt = ATOMIC_INIT(1);
-
-static int
-gpio_ioctl(struct inode * inode, struct file * file, unsigned int cmd, unsigned long arg)
-{
-	int retval = 0;
-
-	if (((1 << arg) & gpio_access_mask) != (1 << arg))
-	{
-		retval = -EINVAL;
-		goto out;
-	}
-
-	switch (cmd)
-	{
-	case GPIO_GET:
-		retval = gpio_get_value(arg);
-		break;
-
-	case GPIO_SET:
-		gpio_set_value(arg, 1);
-		break;
-
-	case GPIO_CLEAR:
-		gpio_set_value(arg, 0);
-		break;
-
-	case GPIO_DIR_IN:
-		gpio_direction_input(arg);
-		break;
-
-	case GPIO_DIR_OUT:
-		gpio_direction_output(arg, 0);
-		break;
-
-	default:
-		retval = -EINVAL;
-		break;
-	}
-
-out:
-	return retval;
-}
-
-static int
-gpio_open(struct inode *inode, struct file *file)
-{
-	int result = 0;
-	unsigned int dev_minor = MINOR(inode->i_rdev);
-
-	if (dev_minor != 0)
-	{
-		printk(KERN_ERR DRVNAME ": trying to access unknown minor device -> %d\n", dev_minor);
-		result = -ENODEV;
-		goto out;
-	}
-
-	/* FIXME: We should really allow multiple applications to open the device
-	 *        at the same time, as long as the apps access different IO pins.
-	 *        The generic gpio-registration functions can be used for that.
-	 *        Two new IOCTLs have to be introduced for that. Need to check userspace
-	 *        compatibility first. --mb */
-	if (!atomic_dec_and_test(&gpio_open_cnt)) {
-		atomic_inc(&gpio_open_cnt);
-		printk(KERN_ERR DRVNAME ": Device with minor ID %d already in use\n", dev_minor);
-		result = -EBUSY;
-		goto out;
-	}
-
-out:
-	return result;
-}
-
-static int
-gpio_close(struct inode * inode, struct file * file)
-{
-	smp_mb__before_atomic_inc();
-	atomic_inc(&gpio_open_cnt);
-
-	return 0;
-}
-
-struct file_operations gpio_fops = {
-	ioctl:		gpio_ioctl,
-	open:		gpio_open,
-	release:	gpio_close
-};
-
-static int
-gpio_probe(struct platform_device *dev)
-{
-	int result = 0;
-
-	dev_major = register_chrdev(0, DEVNAME, &gpio_fops);
-	if (!dev_major)
-	{
-		printk(KERN_ERR DRVNAME ": Error whilst opening %s \n", DEVNAME);
-		result = -ENODEV;
-		goto out;
-	}
-
-	gpiodev_class = class_create(THIS_MODULE, DRVNAME);
-	class_device_create(gpiodev_class, NULL, MKDEV(dev_major, 0), NULL, DEVNAME);
-
-	printk(KERN_INFO DRVNAME ": gpio device registered with major %d\n", dev_major);
-
-	if (dev->num_resources != 1)
-	{
-		printk(KERN_ERR DRVNAME ": device may only have 1 resource\n");
-		result = -ENODEV;
-		goto out;
-	}
-
-	gpio_access_mask = dev->resource[0].start;
-
-	printk(KERN_INFO DRVNAME ": gpio platform device registered with access mask %08X\n", gpio_access_mask);
-out:
-	return result;
-}
-
-static int
-gpio_remove(struct platform_device *dev)
-{
-	unregister_chrdev(dev_major, DEVNAME);
-	return 0;
-}
-
-static struct
-platform_driver gpio_driver = {
-	.probe = gpio_probe,
-	.remove = gpio_remove,
-	.driver = {
-		.name = "GPIODEV",
-		.owner = THIS_MODULE,
-	},
-};
-
-static int __init
-gpio_mod_init(void)
-{
-	int ret = platform_driver_register(&gpio_driver);
-	if (ret)
-		printk(KERN_INFO DRVNAME ": Error registering platfom driver!");
-
-	return ret;
-}
-
-static void __exit
-gpio_mod_exit(void)
-{
-	platform_driver_unregister(&gpio_driver);
-}
-
-module_init (gpio_mod_init);
-module_exit (gpio_mod_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("John Crispin / OpenWrt");
-MODULE_DESCRIPTION("Character device for for generic gpio api");
diff --git a/target/linux/generic-2.6/files-2.6.25/drivers/input/misc/gpio_buttons.c b/target/linux/generic-2.6/files-2.6.25/drivers/input/misc/gpio_buttons.c
deleted file mode 100644
index 83a817834..000000000
--- a/target/linux/generic-2.6/files-2.6.25/drivers/input/misc/gpio_buttons.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- *  Driver for buttons on GPIO lines not capable of generating interrupts
- *
- *  Copyright (C) 2007,2008 Gabor Juhos <juhosg at openwrt.org>
- *
- *  This file was based on: /drivers/input/misc/cobalt_btns.c
- *	Copyright (C) 2007 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
- *
- *  also was based on: /drivers/input/keyboard/gpio_keys.c
- *	Copyright 2005 Phil Blundell
- *
- *  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.
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-
-#include <linux/input.h>
-#include <linux/input-polldev.h>
-#include <linux/ioport.h>
-#include <linux/platform_device.h>
-
-#include <linux/gpio_buttons.h>
-
-#include <asm/gpio.h>
-
-#define DRV_NAME	"gpio-buttons"
-#define DRV_VERSION	"0.1.1"
-#define PFX		DRV_NAME ": "
-
-struct gpio_buttons_dev {
-	struct input_polled_dev *poll_dev;
-	struct gpio_buttons_platform_data *pdata;
-};
-
-static void gpio_buttons_poll(struct input_polled_dev *dev)
-{
-	struct gpio_buttons_dev *bdev = dev->private;
-	struct gpio_buttons_platform_data *pdata = bdev->pdata;
-	struct input_dev *input = dev->input;
-	int i;
-
-	for (i = 0; i < bdev->pdata->nbuttons; i++) {
-		struct gpio_button *button = &pdata->buttons[i];
-		unsigned int type = button->type ?: EV_KEY;
-		int state;
-
-		state = gpio_get_value(button->gpio) ? 1 : 0;
-		state ^= button->active_low;
-
-		if (state) {
-			button->count++;
-		} else {
-			if (button->count >= button->threshold) {
-				input_event(input, type, button->code, 1);
-				input_sync(input);
-			}
-			button->count = 0;
-		}
-
-		if (button->count == button->threshold) {
-			input_event(input, type, button->code, 0);
-			input_sync(input);
-		}
-	}
-}
-
-static int __devinit gpio_buttons_probe(struct platform_device *pdev)
-{
-	struct gpio_buttons_platform_data *pdata = pdev->dev.platform_data;
-	struct gpio_buttons_dev *bdev;
-	struct input_polled_dev *poll_dev;
-	struct input_dev *input;
-	int error, i;
-
-
-	if (!pdata)
-		return -ENXIO;
-
-	bdev = kzalloc(sizeof(*bdev), GFP_KERNEL);
-	if (!bdev) {
-		printk(KERN_ERR DRV_NAME "no memory for device\n");
-		return -ENOMEM;
-	}
-
-	poll_dev = input_allocate_polled_device();
-	if (!poll_dev) {
-		printk(KERN_ERR DRV_NAME "no memory for polled device\n");
-		error = -ENOMEM;
-		goto err_free_bdev;
-	}
-
-	poll_dev->private = bdev;
-	poll_dev->poll = gpio_buttons_poll;
-	poll_dev->poll_interval = pdata->poll_interval;
-
-	input = poll_dev->input;
-
-	input->evbit[0] = BIT(EV_KEY);
-	input->name = pdev->name;
-	input->phys = "gpio-buttons/input0";
-	input->dev.parent = &pdev->dev;
-
-	input->id.bustype = BUS_HOST;
-	input->id.vendor = 0x0001;
-	input->id.product = 0x0001;
-	input->id.version = 0x0100;
-
-	for (i = 0; i < pdata->nbuttons; i++) {
-		struct gpio_button *button = &pdata->buttons[i];
-		unsigned int gpio = button->gpio;
-		unsigned int type = button->type ?: EV_KEY;
-
-		error = gpio_request(gpio, button->desc ?
-				button->desc : DRV_NAME);
-		if (error) {
-			printk(KERN_ERR PFX "unable to claim gpio %u, "
-				"error %d\n", gpio, error);
-			goto err_free_gpio;
-		}
-
-		error = gpio_direction_input(gpio);
-		if (error) {
-			printk(KERN_ERR PFX "unable to set direction on "
-				"gpio %u, error %d\n", gpio, error);
-			goto err_free_gpio;
-		}
-
-		input_set_capability(input, type, button->code);
-		button->count = 0;
-	}
-
-	bdev->poll_dev = poll_dev;
-	bdev->pdata = pdata;
-	platform_set_drvdata(pdev, bdev);
-
-	error = input_register_polled_device(poll_dev);
-	if (error) {
-		printk(KERN_ERR PFX "unable to register polled device, "
-			"error %d\n", error);
-		goto err_free_gpio;
-	}
-
-	return 0;
-
-err_free_gpio:
-	for (i = i - 1; i >= 0; i--)
-		gpio_free(pdata->buttons[i].gpio);
-
-	input_free_polled_device(poll_dev);
-
-err_free_bdev:
-	kfree(bdev);
-
-	platform_set_drvdata(pdev, NULL);
-	return error;
-}
-
-static int __devexit gpio_buttons_remove(struct platform_device *pdev)
-{
-	struct gpio_buttons_dev *bdev = platform_get_drvdata(pdev);
-	struct gpio_buttons_platform_data *pdata = bdev->pdata;
-	int i;
-
-	input_unregister_polled_device(bdev->poll_dev);
-
-	for (i = 0; i < pdata->nbuttons; i++)
-		gpio_free(pdata->buttons[i].gpio);
-
-	input_free_polled_device(bdev->poll_dev);
-
-	kfree(bdev);
-	platform_set_drvdata(pdev, NULL);
-
-	return 0;
-}
-
-static struct platform_driver gpio_buttons_driver = {
-	.probe	= gpio_buttons_probe,
-	.remove	= __devexit_p(gpio_buttons_remove),
-	.driver	= {
-		.name	= DRV_NAME,
-		.owner	= THIS_MODULE,
-	},
-};
-
-static int __init gpio_buttons_init(void)
-{
-	printk(KERN_INFO DRV_NAME " driver version " DRV_VERSION "\n");
-	return platform_driver_register(&gpio_buttons_driver);
-}
-
-static void __exit gpio_buttons_exit(void)
-{
-	platform_driver_unregister(&gpio_buttons_driver);
-}
-
-module_init(gpio_buttons_init);
-module_exit(gpio_buttons_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Gabor Juhos <juhosg at openwrt.org>");
-MODULE_VERSION(DRV_VERSION);
-MODULE_DESCRIPTION("Polled buttons driver for CPU GPIOs");
-
diff --git a/target/linux/generic-2.6/files-2.6.25/drivers/leds/ledtrig-default-on.c b/target/linux/generic-2.6/files-2.6.25/drivers/leds/ledtrig-default-on.c
deleted file mode 100644
index 92995e40c..000000000
--- a/target/linux/generic-2.6/files-2.6.25/drivers/leds/ledtrig-default-on.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * LED Kernel Default ON Trigger
- *
- * Copyright 2008 Nick Forbes <nick.forbes@incepta.com>
- *
- * Based on Richard Purdie's ledtrig-timer.c.
- *
- * 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.
- *
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/leds.h>
-#include "leds.h"
-
-static void defon_trig_activate(struct led_classdev *led_cdev)
-{
-	led_set_brightness(led_cdev, LED_FULL);
-}
-
-static struct led_trigger defon_led_trigger = {
-	.name     = "default-on",
-	.activate = defon_trig_activate,
-};
-
-static int __init defon_trig_init(void)
-{
-	return led_trigger_register(&defon_led_trigger);
-}
-
-static void __exit defon_trig_exit(void)
-{
-	led_trigger_unregister(&defon_led_trigger);
-}
-
-module_init(defon_trig_init);
-module_exit(defon_trig_exit);
-
-MODULE_AUTHOR("Nick Forbes <nick.forbes@incepta.com>");
-MODULE_DESCRIPTION("Default-ON LED trigger");
-MODULE_LICENSE("GPL");
diff --git a/target/linux/generic-2.6/files-2.6.25/drivers/leds/ledtrig-morse.c b/target/linux/generic-2.6/files-2.6.25/drivers/leds/ledtrig-morse.c
deleted file mode 100644
index cb47480a3..000000000
--- a/target/linux/generic-2.6/files-2.6.25/drivers/leds/ledtrig-morse.c
+++ /dev/null
@@ -1,365 +0,0 @@
-/*
- *  LED Morse Trigger
- *
- *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org>
- *
- *  This file was based on: drivers/led/ledtrig-timer.c
- *	Copyright 2005-2006 Openedhand Ltd.
- *	Author: Richard Purdie <rpurdie@openedhand.com>
- *
- *  also based on the patch '[PATCH] 2.5.59 morse code panics' posted
- *  in the LKML by Tomas Szepe at Thu, 30 Jan 2003
- *	Copyright (C) 2002 Andrew Rodland <arodland@noln.com>
- *	Copyright (C) 2003 Tomas Szepe <szepe@pinerecords.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.
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/version.h>
-#include <linux/module.h>
-#include <linux/jiffies.h>
-#include <linux/init.h>
-#include <linux/list.h>
-#include <linux/spinlock.h>
-#include <linux/device.h>
-#include <linux/sysdev.h>
-#include <linux/timer.h>
-#include <linux/ctype.h>
-#include <linux/leds.h>
-
-#include "leds.h"
-
-#define MORSE_DELAY_BASE	(HZ/2)
-
-#define MORSE_STATE_BLINK_START	0
-#define MORSE_STATE_BLINK_STOP	1
-
-#define MORSE_DIT_LEN	1
-#define MORSE_DAH_LEN	3
-#define MORSE_SPACE_LEN	7
-
-struct morse_trig_data {
-	unsigned long delay;
-	char *msg;
-
-	unsigned char morse;
-	unsigned char state;
-	char *msgpos;
-	struct timer_list timer;
-};
-
-const unsigned char morsetable[] = {
-	0122, 0, 0310, 0, 0, 0163,				/* "#$%&' */
-	055, 0155, 0, 0, 0163, 0141, 0152, 0051, 		/* ()*+,-./ */
-	077, 076, 074, 070, 060, 040, 041, 043, 047, 057,	/* 0-9 */
-	0107, 0125, 0, 0061, 0, 0114, 0, 			/* :;<=>?@ */
-	006, 021, 025, 011, 002, 024, 013, 020, 004,		/* A-I */
-	036, 015, 022, 007, 005, 017, 026, 033, 012,		/* J-R */
-	010, 003, 014, 030, 016, 031, 035, 023,			/* S-Z */
-	0, 0, 0, 0, 0154					/* [\]^_ */
-};
-
-static inline unsigned char tomorse(char c) {
-	if (c >= 'a' && c <= 'z')
-		c = c - 'a' + 'A';
-	if (c >= '"' && c <= '_') {
-		return morsetable[c - '"'];
-	} else
-		return 0;
-}
-
-static inline unsigned long dit_len(struct morse_trig_data *morse_data)
-{
-	return MORSE_DIT_LEN*morse_data->delay;
-}
-
-static inline unsigned long dah_len(struct morse_trig_data *morse_data)
-{
-	return MORSE_DAH_LEN*morse_data->delay;
-}
-
-static inline unsigned long space_len(struct morse_trig_data *morse_data)
-{
-	return MORSE_SPACE_LEN*morse_data->delay;
-}
-
-static void morse_timer_function(unsigned long data)
-{
-	struct led_classdev *led_cdev = (struct led_classdev *)data;
-	struct morse_trig_data *morse_data = led_cdev->trigger_data;
-	unsigned long brightness = LED_OFF;
-	unsigned long delay = 0;
-
-	if (!morse_data->msg)
-		goto set_led;
-
-	switch (morse_data->state) {
-	case MORSE_STATE_BLINK_START:
-		/* Starting a new blink.  We have a valid code in morse. */
-		delay = (morse_data->morse & 001) ? dah_len(morse_data):
-			dit_len(morse_data);
-		brightness = LED_FULL;
-		morse_data->state = MORSE_STATE_BLINK_STOP;
-		morse_data->morse >>= 1;
-		break;
-	case MORSE_STATE_BLINK_STOP:
-		/* Coming off of a blink. */
-		morse_data->state = MORSE_STATE_BLINK_START;
-
-		if (morse_data->morse > 1) {
-			/* Not done yet, just a one-dit pause. */
-			delay = dit_len(morse_data);
-			break;
-		}
-
-		/* Get a new char, figure out how much space. */
-		/* First time through */
-		if (!morse_data->msgpos)
-			morse_data->msgpos = (char *)morse_data->msg;
-
-		if (!*morse_data->msgpos) {
-			/* Repeating */
-			morse_data->msgpos = (char *)morse_data->msg;
-			delay = space_len(morse_data);
-		} else {
-			/* Inter-letter space */
-			delay = dah_len(morse_data);
-		}
-
-		if (!(morse_data->morse = tomorse(*morse_data->msgpos))) {
-			delay = space_len(morse_data);
-			/* And get us back here */
-			morse_data->state = MORSE_STATE_BLINK_STOP;
-		}
-		morse_data->msgpos++;
-		break;
-	}
-
-	mod_timer(&morse_data->timer, jiffies + msecs_to_jiffies(delay));
-
-set_led:
-	led_set_brightness(led_cdev, brightness);
-}
-
-static ssize_t _morse_delay_show(struct led_classdev *led_cdev, char *buf)
-{
-	struct morse_trig_data *morse_data = led_cdev->trigger_data;
-
-	sprintf(buf, "%lu\n", morse_data->delay);
-
-	return strlen(buf) + 1;
-}
-
-static ssize_t _morse_delay_store(struct led_classdev *led_cdev,
-		const char *buf, size_t size)
-{
-	struct morse_trig_data *morse_data = led_cdev->trigger_data;
-	char *after;
-	unsigned long state = simple_strtoul(buf, &after, 10);
-	size_t count = after - buf;
-	int ret = -EINVAL;
-
-	if (*after && isspace(*after))
-		count++;
-
-	if (count == size) {
-		morse_data->delay = state;
-		mod_timer(&morse_data->timer, jiffies + 1);
-		ret = count;
-	}
-
-	return ret;
-}
-
-static ssize_t _morse_msg_show(struct led_classdev *led_cdev, char *buf)
-{
-	struct morse_trig_data *morse_data = led_cdev->trigger_data;
-
-	if (!morse_data->msg)
-		sprintf(buf, "<none>\n");
-	else
-		sprintf(buf, "%s\n", morse_data->msg);
-
-	return strlen(buf) + 1;
-}
-
-static ssize_t _morse_msg_store(struct led_classdev *led_cdev,
-		const char *buf, size_t size)
-{
-	struct morse_trig_data *morse_data = led_cdev->trigger_data;
-	char *m;
-
-	m = kmalloc(size, GFP_KERNEL);
-	if (!m)
-		return -ENOMEM;
-
-	memcpy(m,buf,size);
-	m[size]='\0';
-
-	if (morse_data->msg)
-		kfree(morse_data->msg);
-
-	morse_data->msg = m;
-	morse_data->msgpos = NULL;
-	morse_data->state = MORSE_STATE_BLINK_STOP;
-
-	mod_timer(&morse_data->timer, jiffies + 1);
-
-	return size;
-}
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
-static ssize_t morse_delay_show(struct device *dev,
-		struct device_attribute *attr, char *buf)
-{
-	struct led_classdev *led_cdev = dev_get_drvdata(dev);
-
-	return _morse_delay_show(led_cdev, buf);
-}
-
-static ssize_t morse_delay_store(struct device *dev,
-		struct device_attribute *attr, const char *buf, size_t size)
-{
-	struct led_classdev *led_cdev = dev_get_drvdata(dev);
-
-	return _morse_delay_store(led_cdev, buf, size);
-}
-
-static ssize_t morse_msg_show(struct device *dev,
-		struct device_attribute *attr, char *buf)
-{
-	struct led_classdev *led_cdev = dev_get_drvdata(dev);
-
-	return _morse_msg_show(led_cdev, buf);
-}
-
-static ssize_t morse_msg_store(struct device *dev,
-		struct device_attribute *attr, const char *buf, size_t size)
-{
-	struct led_classdev *led_cdev = dev_get_drvdata(dev);
-
-	return _morse_msg_store(led_cdev, buf, size);
-}
-
-static DEVICE_ATTR(delay, 0644, morse_delay_show, morse_delay_store);
-static DEVICE_ATTR(message, 0644, morse_msg_show, morse_msg_store);
-
-#define led_device_create_file(leddev, attr) \
-	device_create_file(leddev->dev, &dev_attr_ ## attr)
-#define led_device_remove_file(leddev, attr) \
-	device_remove_file(leddev->dev, &dev_attr_ ## attr)
-
-#else
-static ssize_t morse_delay_show(struct class_device *dev, char *buf)
-{
-	struct led_classdev *led_cdev = class_get_devdata(dev);
-
-	return _morse_delay_show(led_cdev, buf);
-}
-
-static ssize_t morse_delay_store(struct class_device *dev, const char *buf,
-		size_t size)
-{
-	struct led_classdev *led_cdev = class_get_devdata(dev);
-
-	return _morse_delay_store(led_cdev, buf, size);
-}
-
-static ssize_t morse_msg_show(struct class_device *dev, char *buf)
-{
-	struct led_classdev *led_cdev = class_get_devdata(dev);
-
-	return _morse_msg_show(led_cdev, buf);
-}
-
-static ssize_t morse_msg_store(struct class_device *dev, const char *buf,
-				size_t size)
-{
-	struct led_classdev *led_cdev = class_get_devdata(dev);
-
-	return _morse_msg_store(led_cdev, buf, size);
-}
-
-static CLASS_DEVICE_ATTR(delay, 0644, morse_delay_show, morse_delay_store);
-static CLASS_DEVICE_ATTR(message, 0644, morse_msg_show, morse_msg_store);
-
-#define led_device_create_file(leddev, attr) \
-	class_device_create_file(leddev->class_dev, &class_device_attr_ ## attr)
-#define led_device_remove_file(leddev, attr) \
-	class_device_remove_file(leddev->class_dev, &class_device_attr_ ## attr)
-
-#endif
-
-static void morse_trig_activate(struct led_classdev *led_cdev)
-{
-	struct morse_trig_data *morse_data;
-	int rc;
-
-	morse_data = kzalloc(sizeof(*morse_data), GFP_KERNEL);
-	if (!morse_data)
-		return;
-
-	morse_data->delay = MORSE_DELAY_BASE;
-	init_timer(&morse_data->timer);
-	morse_data->timer.function = morse_timer_function;
-	morse_data->timer.data = (unsigned long)led_cdev;
-
-	rc = led_device_create_file(led_cdev, delay);
-	if (rc) goto err;
-
-	rc = led_device_create_file(led_cdev, message);
-	if (rc) goto err_delay;
-
-	led_cdev->trigger_data = morse_data;
-
-	return;
-
-err_delay:
-	led_device_remove_file(led_cdev, delay);
-err:
-	kfree(morse_data);
-}
-
-static void morse_trig_deactivate(struct led_classdev *led_cdev)
-{
-	struct morse_trig_data *morse_data = led_cdev->trigger_data;
-
-	if (!morse_data)
-		return;
-
-	led_device_remove_file(led_cdev, message);
-	led_device_remove_file(led_cdev, delay);
-
-	del_timer_sync(&morse_data->timer);
-	if (morse_data->msg)
-		kfree(morse_data->msg);
-
-	kfree(morse_data);
-}
-
-static struct led_trigger morse_led_trigger = {
-	.name		= "morse",
-	.activate	= morse_trig_activate,
-	.deactivate	= morse_trig_deactivate,
-};
-
-static int __init morse_trig_init(void)
-{
-	return led_trigger_register(&morse_led_trigger);
-}
-
-static void __exit morse_trig_exit(void)
-{
-	led_trigger_unregister(&morse_led_trigger);
-}
-
-module_init(morse_trig_init);
-module_exit(morse_trig_exit);
-
-MODULE_AUTHOR("Gabor Juhos <juhosg at openwrt.org>");
-MODULE_DESCRIPTION("Morse LED trigger");
-MODULE_LICENSE("GPL");
diff --git a/target/linux/generic-2.6/files-2.6.25/drivers/leds/ledtrig-netdev.c b/target/linux/generic-2.6/files-2.6.25/drivers/leds/ledtrig-netdev.c
deleted file mode 100644
index 285d0f795..000000000
--- a/target/linux/generic-2.6/files-2.6.25/drivers/leds/ledtrig-netdev.c
+++ /dev/null
@@ -1,437 +0,0 @@
-/*
- * LED Kernel Netdev Trigger
- *
- * Toggles the LED to reflect the link and traffic state of a named net device
- *
- * Copyright 2007 Oliver Jowett <oliver@opencloud.com>
- *
- * Derived from ledtrig-timer.c which is:
- *  Copyright 2005-2006 Openedhand Ltd.
- *  Author: Richard Purdie <rpurdie@openedhand.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.
- *
- */
-
-#include <linux/module.h>
-#include <linux/jiffies.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/list.h>
-#include <linux/spinlock.h>
-#include <linux/device.h>
-#include <linux/sysdev.h>
-#include <linux/netdevice.h>
-#include <linux/timer.h>
-#include <linux/ctype.h>
-#include <linux/leds.h>
-#include "leds.h"
-
-/*
- * Configurable sysfs attributes:
- *
- * device_name - network device name to monitor
- *
- * interval - duration of LED blink, in milliseconds
- *
- * mode - either "none" (LED is off) or a space separated list of one or more of:
- *   link: LED's normal state reflects whether the link is up (has carrier) or not
- *   tx:   LED blinks on transmitted data
- *   rx:   LED blinks on receive data
- * 
- * Some suggestions:
- *
- *  Simple link status LED:
- *  $ echo netdev >someled/trigger
- *  $ echo eth0 >someled/device_name
- *  $ echo link >someled/mode
- *
- *  Ethernet-style link/activity LED:
- *  $ echo netdev >someled/trigger
- *  $ echo eth0 >someled/device_name
- *  $ echo "link tx rx" >someled/mode
- *
- *  Modem-style tx/rx LEDs:
- *  $ echo netdev >led1/trigger
- *  $ echo ppp0 >led1/device_name
- *  $ echo tx >led1/mode
- *  $ echo netdev >led2/trigger
- *  $ echo ppp0 >led2/device_name
- *  $ echo rx >led2/mode
- *
- */
-
-#define MODE_LINK 1
-#define MODE_TX   2
-#define MODE_RX   4
-
-struct led_netdev_data {
-	rwlock_t lock;
-	
-	struct timer_list timer;
-	struct notifier_block notifier;	
-	
-	struct led_classdev *led_cdev;
-	struct net_device *net_dev;
-	
-	char device_name[IFNAMSIZ];
-	unsigned interval;
-	unsigned mode;
-	unsigned link_up;
-	unsigned last_activity;
-};
-
-static void set_baseline_state(struct led_netdev_data *trigger_data)
-{  
-	if ((trigger_data->mode & MODE_LINK) != 0 && trigger_data->link_up)
-		led_set_brightness(trigger_data->led_cdev, LED_FULL);
-	else
-		led_set_brightness(trigger_data->led_cdev, LED_OFF);
-	
-	if ((trigger_data->mode & (MODE_TX | MODE_RX)) != 0 && trigger_data->link_up)
-		mod_timer(&trigger_data->timer, jiffies + trigger_data->interval);
-	else
-		del_timer(&trigger_data->timer);    
-}  
-
-static ssize_t led_device_name_show(struct device *dev,
-				    struct device_attribute *attr, char *buf)
-{
-	struct led_classdev *led_cdev = dev_get_drvdata(dev);
-	struct led_netdev_data *trigger_data = led_cdev->trigger_data;
-	
-	read_lock(&trigger_data->lock);
-	sprintf(buf, "%s\n", trigger_data->device_name);
-	read_unlock(&trigger_data->lock);
-	
-	return strlen(buf) + 1;
-}
-  
-static ssize_t led_device_name_store(struct device *dev, 
-				     struct device_attribute *attr, const char *buf, size_t size)
-{
-	struct led_classdev *led_cdev = dev_get_drvdata(dev);
-	struct led_netdev_data *trigger_data = led_cdev->trigger_data;
-	
-	if (size < 0 || size >= IFNAMSIZ)
-		return -EINVAL;
-	
-	write_lock(&trigger_data->lock);
-
-	strcpy(trigger_data->device_name, buf);
-	if (size > 0 && trigger_data->device_name[size-1] == '\n')
-		trigger_data->device_name[size-1] = 0;
-	
-	if (trigger_data->device_name[0] != 0) {
-		/* check for existing device to update from */
-		trigger_data->net_dev = dev_get_by_name(trigger_data->device_name);
-		if (trigger_data->net_dev != NULL)
-			trigger_data->link_up = (dev_get_flags(trigger_data->net_dev) & IFF_LOWER_UP) != 0;
-		set_baseline_state(trigger_data); /* updates LEDs, may start timers */
-	}
-	
-	write_unlock(&trigger_data->lock);	
-	return size;
-}
-
-static DEVICE_ATTR(device_name, 0644, led_device_name_show, led_device_name_store);
-
-static ssize_t led_mode_show(struct device *dev,
-			     struct device_attribute *attr, char *buf)
-{
-	struct led_classdev *led_cdev = dev_get_drvdata(dev);
-	struct led_netdev_data *trigger_data = led_cdev->trigger_data;
-	
-	read_lock(&trigger_data->lock);
-	
-	if (trigger_data->mode == 0) {
-		strcpy(buf, "none\n");
-	} else {
-		if (trigger_data->mode & MODE_LINK) 
-			strcat(buf, "link ");
-		if (trigger_data->mode & MODE_TX)
-			strcat(buf, "tx ");
-		if (trigger_data->mode & MODE_RX)
-			strcat(buf, "rx ");
-		strcat(buf, "\n");
-	}
-	
-	read_unlock(&trigger_data->lock);	
-
-	return strlen(buf)+1;
-}
-
-static ssize_t led_mode_store(struct device *dev, 
-			      struct device_attribute *attr, const char *buf, size_t size)
-{
-	struct led_classdev *led_cdev = dev_get_drvdata(dev);
-	struct led_netdev_data *trigger_data = led_cdev->trigger_data;	
-	char copybuf[1024];
-	int new_mode = -1;
-	char *p, *token;
-
-	/* take a copy since we don't want to trash the inbound buffer when using strsep */
-	strncpy(copybuf, buf, sizeof(copybuf));
-	copybuf[1023] = 0;
-	p = copybuf;
-	
-	while ((token = strsep(&p, " \t\n")) != NULL) {
-		if (!*token)
-			continue;
-		
-		if (new_mode == -1)
-			new_mode = 0;
-		
-		if (!strcmp(token, "none"))
-			new_mode = 0;
-		else if (!strcmp(token, "tx"))
-			new_mode |= MODE_TX;
-		else if (!strcmp(token, "rx"))
-			new_mode |= MODE_RX;
-		else if (!strcmp(token, "link"))
-			new_mode |= MODE_LINK;
-		else
-			return -EINVAL;
-	}
-	
-	if (new_mode == -1)
-		return -EINVAL;
-	
-	write_lock(&trigger_data->lock);	
-	trigger_data->mode = new_mode;  
-	set_baseline_state(trigger_data);
-	write_unlock(&trigger_data->lock);
-	
-	return size;
-}
-
-static DEVICE_ATTR(mode, 0644, led_mode_show, led_mode_store);
-
-static ssize_t led_interval_show(struct device *dev, 
-				 struct device_attribute *attr, char *buf)
-{
-	struct led_classdev *led_cdev = dev_get_drvdata(dev);
-	struct led_netdev_data *trigger_data = led_cdev->trigger_data;
-	
-	read_lock(&trigger_data->lock);
-	sprintf(buf, "%u\n", jiffies_to_msecs(trigger_data->interval));
-	read_unlock(&trigger_data->lock);
-	
-	return strlen(buf) + 1;
-}
-
-static ssize_t led_interval_store(struct device *dev, 
-				  struct device_attribute *attr, const char *buf, size_t size)
-{
-	struct led_classdev *led_cdev = dev_get_drvdata(dev);
-	struct led_netdev_data *trigger_data = led_cdev->trigger_data;
-	int ret = -EINVAL;
-	char *after;
-	unsigned long value = simple_strtoul(buf, &after, 10);
-	size_t count = after - buf;
-
-	if (*after && isspace(*after))
-		count++;
-
-	/* impose some basic bounds on the timer interval */
-	if (count == size && value >= 5 && value <= 10000) {
-		write_lock(&trigger_data->lock);
-		trigger_data->interval = msecs_to_jiffies(value);
-		set_baseline_state(trigger_data); // resets timer
-		write_unlock(&trigger_data->lock);
-		ret = count;
-	}
-	
-	return ret;
-}
-
-static DEVICE_ATTR(interval, 0644, led_interval_show, led_interval_store);
-
-static int netdev_trig_notify(struct notifier_block *nb,
-			      unsigned long evt,
-			      void *dv)
-{
-	struct net_device *dev = dv;
-	struct led_netdev_data *trigger_data = container_of(nb, struct led_netdev_data, notifier);
-	
-	if (evt != NETDEV_UP && evt != NETDEV_DOWN && evt != NETDEV_CHANGE && evt != NETDEV_REGISTER && evt != NETDEV_UNREGISTER)
-		return NOTIFY_DONE;
-	
-	write_lock(&trigger_data->lock);
-
-	if (strcmp(dev->name, trigger_data->device_name))
-		goto done;
-	
-	if (evt == NETDEV_REGISTER) {
-		if (trigger_data->net_dev != NULL)
-			dev_put(trigger_data->net_dev);
-		dev_hold(dev);
-		trigger_data->net_dev = dev;
-		trigger_data->link_up = 0;
-		goto done;
-	}
-	
-	if (evt == NETDEV_UNREGISTER && trigger_data->net_dev != NULL) {
-		dev_put(trigger_data->net_dev);
-		trigger_data->net_dev = NULL;
-		goto done;
-	}
-	
-	/* UP / DOWN / CHANGE */
-	
-	trigger_data->link_up = (evt != NETDEV_DOWN && netif_carrier_ok(dev));
-	set_baseline_state(trigger_data);
-
-done:
-	write_unlock(&trigger_data->lock);  
-	return NOTIFY_DONE;
-}
-
-/* here's the real work! */
-static void netdev_trig_timer(unsigned long arg)
-{
-	struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg;
-	struct net_device_stats *dev_stats;
-	unsigned new_activity;
-	
-	write_lock(&trigger_data->lock);
-    
-	if (!trigger_data->link_up || !trigger_data->net_dev || (trigger_data->mode & (MODE_TX | MODE_RX)) == 0) {
-		/* we don't need to do timer work, just reflect link state. */
-		led_set_brightness(trigger_data->led_cdev, ((trigger_data->mode & MODE_LINK) != 0 && trigger_data->link_up) ? LED_FULL : LED_OFF);
-		goto no_restart;
-	}
-	
-	dev_stats = trigger_data->net_dev->get_stats(trigger_data->net_dev);
-	new_activity =
-		((trigger_data->mode & MODE_TX) ? dev_stats->tx_packets : 0) +
-		((trigger_data->mode & MODE_RX) ? dev_stats->rx_packets : 0);
-      
-	if (trigger_data->mode & MODE_LINK) {
-		/* base state is ON (link present) */
-		/* if there's no link, we don't get this far and the LED is off */
-		
-		/* OFF -> ON always */
-		/* ON -> OFF on activity */
-		if (trigger_data->led_cdev->brightness == LED_OFF) {
-			led_set_brightness(trigger_data->led_cdev, LED_FULL);
-		} else if (trigger_data->last_activity != new_activity) {
-			led_set_brightness(trigger_data->led_cdev, LED_OFF);
-		}
-	} else {
-		/* base state is OFF */
-		/* ON -> OFF always */
-		/* OFF -> ON on activity */
-		if (trigger_data->led_cdev->brightness == LED_FULL) {
-			led_set_brightness(trigger_data->led_cdev, LED_OFF);
-		} else if (trigger_data->last_activity != new_activity) {
-			led_set_brightness(trigger_data->led_cdev, LED_FULL);
-		}
-	}
-	
-	trigger_data->last_activity = new_activity;
-	mod_timer(&trigger_data->timer, jiffies + trigger_data->interval);
-
-no_restart:
-	write_unlock(&trigger_data->lock);
-}
-
-static void netdev_trig_activate(struct led_classdev *led_cdev)
-{
-	struct led_netdev_data *trigger_data;
-	int rc;
-
-	trigger_data = kzalloc(sizeof(struct led_netdev_data), GFP_KERNEL);
-	if (!trigger_data)
-		return;
-
-	rwlock_init(&trigger_data->lock);
-
-	trigger_data->notifier.notifier_call = netdev_trig_notify;
-	trigger_data->notifier.priority = 10;
-
-	setup_timer(&trigger_data->timer, netdev_trig_timer, (unsigned long) trigger_data);
-
-	trigger_data->led_cdev = led_cdev;
-	trigger_data->net_dev = NULL;
-	trigger_data->device_name[0] = 0;
-	
-	trigger_data->mode = 0;
-	trigger_data->interval = msecs_to_jiffies(50);
-	trigger_data->link_up = 0;
-	trigger_data->last_activity = 0;
-	
-	led_cdev->trigger_data = trigger_data;
-
-	rc = device_create_file(led_cdev->dev, &dev_attr_device_name);
-	if (rc)
-		goto err_out;
-	rc = device_create_file(led_cdev->dev, &dev_attr_mode);
-	if (rc)
-		goto err_out_device_name;
-	rc = device_create_file(led_cdev->dev, &dev_attr_interval);
-	if (rc)
-		goto err_out_mode;
-
-	register_netdevice_notifier(&trigger_data->notifier);	
-	return;
-
-err_out_mode:
-	device_remove_file(led_cdev->dev, &dev_attr_mode);
-err_out_device_name:
-	device_remove_file(led_cdev->dev, &dev_attr_device_name);
-err_out:
-	led_cdev->trigger_data = NULL;
-	kfree(trigger_data);
-}
-
-static void netdev_trig_deactivate(struct led_classdev *led_cdev)
-{
-	struct led_netdev_data *trigger_data = led_cdev->trigger_data;
-
-	if (trigger_data) {	  
-		unregister_netdevice_notifier(&trigger_data->notifier);
-
-		device_remove_file(led_cdev->dev, &dev_attr_device_name);
-		device_remove_file(led_cdev->dev, &dev_attr_mode);
-		device_remove_file(led_cdev->dev, &dev_attr_interval);
-
-		write_lock(&trigger_data->lock);
-		
-		if (trigger_data->net_dev) {
-			dev_put(trigger_data->net_dev);
-			trigger_data->net_dev = NULL;
-		}
-		
-		write_unlock(&trigger_data->lock);
-
-		del_timer_sync(&trigger_data->timer);
-
-		kfree(trigger_data);
-	}
-}
-
-static struct led_trigger netdev_led_trigger = {
-	.name     = "netdev",
-	.activate = netdev_trig_activate,
-	.deactivate = netdev_trig_deactivate,
-};
-
-static int __init netdev_trig_init(void)
-{
-	return led_trigger_register(&netdev_led_trigger);
-}
-
-static void __exit netdev_trig_exit(void)
-{
-	led_trigger_unregister(&netdev_led_trigger);
-}
-
-module_init(netdev_trig_init);
-module_exit(netdev_trig_exit);
-
-MODULE_AUTHOR("Oliver Jowett <oliver@opencloud.com>");
-MODULE_DESCRIPTION("Netdev LED trigger");
-MODULE_LICENSE("GPL");
diff --git a/target/linux/generic-2.6/files/drivers/net/phy/swconfig.c b/target/linux/generic-2.6/files/drivers/net/phy/swconfig.c
index bb49df83e..376dec16f 100644
--- a/target/linux/generic-2.6/files/drivers/net/phy/swconfig.c
+++ b/target/linux/generic-2.6/files/drivers/net/phy/swconfig.c
@@ -761,6 +761,7 @@ swconfig_send_switch(struct sk_buff *msg, u32 pid, u32 seq, int flags,
 	NLA_PUT_STRING(msg, SWITCH_ATTR_DEV_NAME, dev->devname);
 	NLA_PUT_U32(msg, SWITCH_ATTR_VLANS, dev->vlans);
 	NLA_PUT_U32(msg, SWITCH_ATTR_PORTS, dev->ports);
+	NLA_PUT_U32(msg, SWITCH_ATTR_CPU_PORT, dev->cpu_port);
 
 	return genlmsg_end(msg, hdr);
 nla_put_failure:
diff --git a/target/linux/generic-2.6/files/include/linux/switch.h b/target/linux/generic-2.6/files/include/linux/switch.h
index 98b86e851..25aedb83b 100644
--- a/target/linux/generic-2.6/files/include/linux/switch.h
+++ b/target/linux/generic-2.6/files/include/linux/switch.h
@@ -40,6 +40,7 @@ enum {
 	SWITCH_ATTR_DEV_NAME,
 	SWITCH_ATTR_VLANS,
 	SWITCH_ATTR_PORTS,
+	SWITCH_ATTR_CPU_PORT,
 	/* attributes */
 	SWITCH_ATTR_OP_ID,
 	SWITCH_ATTR_OP_TYPE,
diff --git a/target/linux/generic-2.6/patches-2.6.25/001-squashfs.patch b/target/linux/generic-2.6/patches-2.6.25/001-squashfs.patch
deleted file mode 100644
index b2be83183..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/001-squashfs.patch
+++ /dev/null
@@ -1,4170 +0,0 @@
---- a/fs/Kconfig
-+++ b/fs/Kconfig
-@@ -1367,6 +1367,71 @@ config CRAMFS
- 
- 	  If unsure, say N.
- 
-+config SQUASHFS
-+	tristate "SquashFS 3.0 - Squashed file system support"
-+	select ZLIB_INFLATE
-+	help
-+	  Saying Y here includes support for SquashFS 3.0 (a Compressed Read-Only File
-+	  System).  Squashfs is a highly compressed read-only filesystem for Linux.
-+	  It uses zlib compression to compress both files, inodes and directories.
-+	  Inodes in the system are very small and all blocks are packed to minimise
-+	  data overhead. Block sizes greater than 4K are supported up to a maximum of 64K.
-+	  SquashFS 3.0 supports 64 bit filesystems and files (larger than 4GB), full
-+	  uid/gid information, hard links and timestamps.
-+
-+	  Squashfs is intended for general read-only filesystem use, for archival
-+	  use (i.e. in cases where a .tar.gz file may be used), and in embedded
-+	  systems where low overhead is needed.  Further information and filesystem tools
-+	  are available from http://squashfs.sourceforge.net.
-+
-+	  If you want to compile this as a module ( = code which can be
-+	  inserted in and removed from the running kernel whenever you want),
-+	  say M here and read <file:Documentation/modules.txt>.  The module
-+	  will be called squashfs.  Note that the root file system (the one
-+	  containing the directory /) cannot be compiled as a module.
-+
-+	  If unsure, say N.
-+
-+config SQUASHFS_EMBEDDED
-+
-+	bool "Additional options for memory-constrained systems"
-+	depends on SQUASHFS
-+	default n
-+	help
-+	  Saying Y here allows you to specify cache sizes and how Squashfs
-+	  allocates memory.  This is only intended for memory constrained
-+	  systems.
-+
-+	  If unsure, say N.
-+
-+config SQUASHFS_FRAGMENT_CACHE_SIZE
-+	int "Number of fragments cached" if SQUASHFS_EMBEDDED
-+	depends on SQUASHFS
-+	default "3"
-+	help
-+	  By default SquashFS caches the last 3 fragments read from
-+	  the filesystem.  Increasing this amount may mean SquashFS
-+	  has to re-read fragments less often from disk, at the expense
-+	  of extra system memory.  Decreasing this amount will mean
-+	  SquashFS uses less memory at the expense of extra reads from disk.
-+
-+	  Note there must be at least one cached fragment.  Anything
-+	  much more than three will probably not make much difference.
-+
-+config SQUASHFS_VMALLOC
-+	bool "Use Vmalloc rather than Kmalloc" if SQUASHFS_EMBEDDED
-+	depends on SQUASHFS
-+	default n
-+	help
-+	  By default SquashFS uses kmalloc to obtain fragment cache memory.
-+	  Kmalloc memory is the standard kernel allocator, but it can fail
-+	  on memory constrained systems.  Because of the way Vmalloc works,
-+	  Vmalloc can succeed when kmalloc fails.  Specifying this option
-+	  will make SquashFS always use Vmalloc to allocate the
-+	  fragment cache memory.
-+
-+	  If unsure, say N.
-+
- config VXFS_FS
- 	tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)"
- 	depends on BLOCK
---- a/fs/Makefile
-+++ b/fs/Makefile
-@@ -73,6 +73,7 @@ obj-$(CONFIG_JBD)		+= jbd/
- obj-$(CONFIG_JBD2)		+= jbd2/
- obj-$(CONFIG_EXT2_FS)		+= ext2/
- obj-$(CONFIG_CRAMFS)		+= cramfs/
-+obj-$(CONFIG_SQUASHFS)		+= squashfs/
- obj-y				+= ramfs/
- obj-$(CONFIG_HUGETLBFS)		+= hugetlbfs/
- obj-$(CONFIG_CODA_FS)		+= coda/
---- /dev/null
-+++ b/fs/squashfs/inode.c
-@@ -0,0 +1,2122 @@
-+/*
-+ * Squashfs - a compressed read only filesystem for Linux
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006
-+ * Phillip Lougher <phillip@lougher.org.uk>
-+ *
-+ * 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,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ *
-+ * inode.c
-+ */
-+
-+#include <linux/types.h>
-+#include <linux/squashfs_fs.h>
-+#include <linux/module.h>
-+#include <linux/errno.h>
-+#include <linux/slab.h>
-+#include <linux/fs.h>
-+#include <linux/smp_lock.h>
-+#include <linux/slab.h>
-+#include <linux/squashfs_fs_sb.h>
-+#include <linux/squashfs_fs_i.h>
-+#include <linux/buffer_head.h>
-+#include <linux/vfs.h>
-+#include <linux/init.h>
-+#include <linux/dcache.h>
-+#include <linux/wait.h>
-+#include <linux/zlib.h>
-+#include <linux/blkdev.h>
-+#include <linux/vmalloc.h>
-+#include <asm/uaccess.h>
-+#include <asm/semaphore.h>
-+
-+#include "squashfs.h"
-+
-+static void squashfs_put_super(struct super_block *);
-+static int squashfs_statfs(struct dentry *, struct kstatfs *);
-+static int squashfs_symlink_readpage(struct file *file, struct page *page);
-+static int squashfs_readpage(struct file *file, struct page *page);
-+static int squashfs_readpage4K(struct file *file, struct page *page);
-+static int squashfs_readdir(struct file *, void *, filldir_t);
-+static struct inode *squashfs_alloc_inode(struct super_block *sb);
-+static void squashfs_destroy_inode(struct inode *inode);
-+static int init_inodecache(void);
-+static void destroy_inodecache(void);
-+static struct dentry *squashfs_lookup(struct inode *, struct dentry *,
-+				struct nameidata *);
-+static struct inode *squashfs_iget(struct super_block *s, squashfs_inode_t inode);
-+static long long read_blocklist(struct inode *inode, int index,
-+				int readahead_blks, char *block_list,
-+				unsigned short **block_p, unsigned int *bsize);
-+static int squashfs_get_sb(struct file_system_type *, int,
-+			const char *, void *, struct vfsmount *);
-+
-+
-+static z_stream stream;
-+
-+static struct file_system_type squashfs_fs_type = {
-+	.owner = THIS_MODULE,
-+	.name = "squashfs",
-+	.get_sb = squashfs_get_sb,
-+	.kill_sb = kill_block_super,
-+	.fs_flags = FS_REQUIRES_DEV
-+};
-+
-+static unsigned char squashfs_filetype_table[] = {
-+	DT_UNKNOWN, DT_DIR, DT_REG, DT_LNK, DT_BLK, DT_CHR, DT_FIFO, DT_SOCK
-+};
-+
-+static struct super_operations squashfs_ops = {
-+	.alloc_inode = squashfs_alloc_inode,
-+	.destroy_inode = squashfs_destroy_inode,
-+	.statfs = squashfs_statfs,
-+	.put_super = squashfs_put_super,
-+};
-+
-+SQSH_EXTERN struct address_space_operations squashfs_symlink_aops = {
-+	.readpage = squashfs_symlink_readpage
-+};
-+
-+SQSH_EXTERN struct address_space_operations squashfs_aops = {
-+	.readpage = squashfs_readpage
-+};
-+
-+SQSH_EXTERN struct address_space_operations squashfs_aops_4K = {
-+	.readpage = squashfs_readpage4K
-+};
-+
-+static struct file_operations squashfs_dir_ops = {
-+	.read = generic_read_dir,
-+	.readdir = squashfs_readdir
-+};
-+
-+SQSH_EXTERN struct inode_operations squashfs_dir_inode_ops = {
-+	.lookup = squashfs_lookup
-+};
-+
-+
-+static struct buffer_head *get_block_length(struct super_block *s,
-+				int *cur_index, int *offset, int *c_byte)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	unsigned short temp;
-+	struct buffer_head *bh;
-+
-+	if (!(bh = sb_bread(s, *cur_index)))
-+		goto out;
-+
-+	if (msblk->devblksize - *offset == 1) {
-+		if (msblk->swap)
-+			((unsigned char *) &temp)[1] = *((unsigned char *)
-+				(bh->b_data + *offset));
-+		else
-+			((unsigned char *) &temp)[0] = *((unsigned char *)
-+				(bh->b_data + *offset));
-+		brelse(bh);
-+		if (!(bh = sb_bread(s, ++(*cur_index))))
-+			goto out;
-+		if (msblk->swap)
-+			((unsigned char *) &temp)[0] = *((unsigned char *)
-+				bh->b_data);
-+		else
-+			((unsigned char *) &temp)[1] = *((unsigned char *)
-+				bh->b_data);
-+		*c_byte = temp;
-+		*offset = 1;
-+	} else {
-+		if (msblk->swap) {
-+			((unsigned char *) &temp)[1] = *((unsigned char *)
-+				(bh->b_data + *offset));
-+			((unsigned char *) &temp)[0] = *((unsigned char *)
-+				(bh->b_data + *offset + 1));
-+		} else {
-+			((unsigned char *) &temp)[0] = *((unsigned char *)
-+				(bh->b_data + *offset));
-+			((unsigned char *) &temp)[1] = *((unsigned char *)
-+				(bh->b_data + *offset + 1));
-+		}
-+		*c_byte = temp;
-+		*offset += 2;
-+	}
-+
-+	if (SQUASHFS_CHECK_DATA(msblk->sblk.flags)) {
-+		if (*offset == msblk->devblksize) {
-+			brelse(bh);
-+			if (!(bh = sb_bread(s, ++(*cur_index))))
-+				goto out;
-+			*offset = 0;
-+		}
-+		if (*((unsigned char *) (bh->b_data + *offset)) !=
-+						SQUASHFS_MARKER_BYTE) {
-+			ERROR("Metadata block marker corrupt @ %x\n",
-+						*cur_index);
-+			brelse(bh);
-+			goto out;
-+		}
-+		(*offset)++;
-+	}
-+	return bh;
-+
-+out:
-+	return NULL;
-+}
-+
-+
-+SQSH_EXTERN unsigned int squashfs_read_data(struct super_block *s, char *buffer,
-+			long long index, unsigned int length,
-+			long long *next_index)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	struct buffer_head *bh[((SQUASHFS_FILE_MAX_SIZE - 1) >>
-+			msblk->devblksize_log2) + 2];
-+	unsigned int offset = index & ((1 << msblk->devblksize_log2) - 1);
-+	unsigned int cur_index = index >> msblk->devblksize_log2;
-+	int bytes, avail_bytes, b = 0, k;
-+	char *c_buffer;
-+	unsigned int compressed;
-+	unsigned int c_byte = length;
-+
-+	if (c_byte) {
-+		bytes = msblk->devblksize - offset;
-+		compressed = SQUASHFS_COMPRESSED_BLOCK(c_byte);
-+		c_buffer = compressed ? msblk->read_data : buffer;
-+		c_byte = SQUASHFS_COMPRESSED_SIZE_BLOCK(c_byte);
-+
-+		TRACE("Block @ 0x%llx, %scompressed size %d\n", index, compressed
-+					? "" : "un", (unsigned int) c_byte);
-+
-+		if (!(bh[0] = sb_getblk(s, cur_index)))
-+			goto block_release;
-+
-+		for (b = 1; bytes < c_byte; b++) {
-+			if (!(bh[b] = sb_getblk(s, ++cur_index)))
-+				goto block_release;
-+			bytes += msblk->devblksize;
-+		}
-+		ll_rw_block(READ, b, bh);
-+	} else {
-+		if (!(bh[0] = get_block_length(s, &cur_index, &offset,
-+								&c_byte)))
-+			goto read_failure;
-+
-+		bytes = msblk->devblksize - offset;
-+		compressed = SQUASHFS_COMPRESSED(c_byte);
-+		c_buffer = compressed ? msblk->read_data : buffer;
-+		c_byte = SQUASHFS_COMPRESSED_SIZE(c_byte);
-+
-+		TRACE("Block @ 0x%llx, %scompressed size %d\n", index, compressed
-+					? "" : "un", (unsigned int) c_byte);
-+
-+		for (b = 1; bytes < c_byte; b++) {
-+			if (!(bh[b] = sb_getblk(s, ++cur_index)))
-+				goto block_release;
-+			bytes += msblk->devblksize;
-+		}
-+		ll_rw_block(READ, b - 1, bh + 1);
-+	}
-+
-+	if (compressed)
-+		down(&msblk->read_data_mutex);
-+
-+	for (bytes = 0, k = 0; k < b; k++) {
-+		avail_bytes = (c_byte - bytes) > (msblk->devblksize - offset) ?
-+					msblk->devblksize - offset :
-+					c_byte - bytes;
-+		wait_on_buffer(bh[k]);
-+		if (!buffer_uptodate(bh[k]))
-+			goto block_release;
-+		memcpy(c_buffer + bytes, bh[k]->b_data + offset, avail_bytes);
-+		bytes += avail_bytes;
-+		offset = 0;
-+		brelse(bh[k]);
-+	}
-+
-+	/*
-+	 * uncompress block
-+	 */
-+	if (compressed) {
-+		int zlib_err;
-+
-+		stream.next_in = c_buffer;
-+		stream.avail_in = c_byte;
-+		stream.next_out = buffer;
-+		stream.avail_out = msblk->read_size;
-+
-+		if (((zlib_err = zlib_inflateInit(&stream)) != Z_OK) ||
-+				((zlib_err = zlib_inflate(&stream, Z_FINISH))
-+				 != Z_STREAM_END) || ((zlib_err =
-+				zlib_inflateEnd(&stream)) != Z_OK)) {
-+			ERROR("zlib_fs returned unexpected result 0x%x\n",
-+				zlib_err);
-+			bytes = 0;
-+		} else
-+			bytes = stream.total_out;
-+
-+		up(&msblk->read_data_mutex);
-+	}
-+
-+	if (next_index)
-+		*next_index = index + c_byte + (length ? 0 :
-+				(SQUASHFS_CHECK_DATA(msblk->sblk.flags)
-+				 ? 3 : 2));
-+	return bytes;
-+
-+block_release:
-+	while (--b >= 0)
-+		brelse(bh[b]);
-+
-+read_failure:
-+	ERROR("sb_bread failed reading block 0x%x\n", cur_index);
-+	return 0;
-+}
-+
-+
-+SQSH_EXTERN int squashfs_get_cached_block(struct super_block *s, char *buffer,
-+				long long block, unsigned int offset,
-+				int length, long long *next_block,
-+				unsigned int *next_offset)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	int n, i, bytes, return_length = length;
-+	long long next_index;
-+
-+	TRACE("Entered squashfs_get_cached_block [%llx:%x]\n", block, offset);
-+
-+	while ( 1 ) {
-+		for (i = 0; i < SQUASHFS_CACHED_BLKS; i++)
-+			if (msblk->block_cache[i].block == block)
-+				break;
-+
-+		down(&msblk->block_cache_mutex);
-+
-+		if (i == SQUASHFS_CACHED_BLKS) {
-+			/* read inode header block */
-+			for (i = msblk->next_cache, n = SQUASHFS_CACHED_BLKS;
-+					n ; n --, i = (i + 1) %
-+					SQUASHFS_CACHED_BLKS)
-+				if (msblk->block_cache[i].block !=
-+							SQUASHFS_USED_BLK)
-+					break;
-+
-+			if (n == 0) {
-+				wait_queue_t wait;
-+
-+				init_waitqueue_entry(&wait, current);
-+				add_wait_queue(&msblk->waitq, &wait);
-+				set_current_state(TASK_UNINTERRUPTIBLE);
-+ 				up(&msblk->block_cache_mutex);
-+				schedule();
-+				set_current_state(TASK_RUNNING);
-+				remove_wait_queue(&msblk->waitq, &wait);
-+				continue;
-+			}
-+			msblk->next_cache = (i + 1) % SQUASHFS_CACHED_BLKS;
-+
-+			if (msblk->block_cache[i].block ==
-+							SQUASHFS_INVALID_BLK) {
-+				if (!(msblk->block_cache[i].data =
-+						kmalloc(SQUASHFS_METADATA_SIZE,
-+						GFP_KERNEL))) {
-+					ERROR("Failed to allocate cache"
-+							"block\n");
-+					up(&msblk->block_cache_mutex);
-+					goto out;
-+				}
-+			}
-+
-+			msblk->block_cache[i].block = SQUASHFS_USED_BLK;
-+			up(&msblk->block_cache_mutex);
-+
-+			if (!(msblk->block_cache[i].length =
-+						squashfs_read_data(s,
-+						msblk->block_cache[i].data,
-+						block, 0, &next_index))) {
-+				ERROR("Unable to read cache block [%llx:%x]\n",
-+						block, offset);
-+				goto out;
-+			}
-+
-+			down(&msblk->block_cache_mutex);
-+			wake_up(&msblk->waitq);
-+			msblk->block_cache[i].block = block;
-+			msblk->block_cache[i].next_index = next_index;
-+			TRACE("Read cache block [%llx:%x]\n", block, offset);
-+		}
-+
-+		if (msblk->block_cache[i].block != block) {
-+			up(&msblk->block_cache_mutex);
-+			continue;
-+		}
-+
-+		if ((bytes = msblk->block_cache[i].length - offset) >= length) {
-+			if (buffer)
-+				memcpy(buffer, msblk->block_cache[i].data +
-+						offset, length);
-+			if (msblk->block_cache[i].length - offset == length) {
-+				*next_block = msblk->block_cache[i].next_index;
-+				*next_offset = 0;
-+			} else {
-+				*next_block = block;
-+				*next_offset = offset + length;
-+			}
-+			up(&msblk->block_cache_mutex);
-+			goto finish;
-+		} else {
-+			if (buffer) {
-+				memcpy(buffer, msblk->block_cache[i].data +
-+						offset, bytes);
-+				buffer += bytes;
-+			}
-+			block = msblk->block_cache[i].next_index;
-+			up(&msblk->block_cache_mutex);
-+			length -= bytes;
-+			offset = 0;
-+		}
-+	}
-+
-+finish:
-+	return return_length;
-+out:
-+	return 0;
-+}
-+
-+
-+static int get_fragment_location(struct super_block *s, unsigned int fragment,
-+				long long *fragment_start_block,
-+				unsigned int *fragment_size)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	long long start_block =
-+		msblk->fragment_index[SQUASHFS_FRAGMENT_INDEX(fragment)];
-+	int offset = SQUASHFS_FRAGMENT_INDEX_OFFSET(fragment);
-+	struct squashfs_fragment_entry fragment_entry;
-+
-+	if (msblk->swap) {
-+		struct squashfs_fragment_entry sfragment_entry;
-+
-+		if (!squashfs_get_cached_block(s, (char *) &sfragment_entry,
-+					start_block, offset,
-+					sizeof(sfragment_entry), &start_block,
-+					&offset))
-+			goto out;
-+		SQUASHFS_SWAP_FRAGMENT_ENTRY(&fragment_entry, &sfragment_entry);
-+	} else
-+		if (!squashfs_get_cached_block(s, (char *) &fragment_entry,
-+					start_block, offset,
-+					sizeof(fragment_entry), &start_block,
-+					&offset))
-+			goto out;
-+
-+	*fragment_start_block = fragment_entry.start_block;
-+	*fragment_size = fragment_entry.size;
-+
-+	return 1;
-+
-+out:
-+	return 0;
-+}
-+
-+
-+SQSH_EXTERN void release_cached_fragment(struct squashfs_sb_info *msblk, struct
-+					squashfs_fragment_cache *fragment)
-+{
-+	down(&msblk->fragment_mutex);
-+	fragment->locked --;
-+	wake_up(&msblk->fragment_wait_queue);
-+	up(&msblk->fragment_mutex);
-+}
-+
-+
-+SQSH_EXTERN struct squashfs_fragment_cache *get_cached_fragment(struct super_block
-+					*s, long long start_block,
-+					int length)
-+{
-+	int i, n;
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+
-+	while ( 1 ) {
-+		down(&msblk->fragment_mutex);
-+
-+		for (i = 0; i < SQUASHFS_CACHED_FRAGMENTS &&
-+				msblk->fragment[i].block != start_block; i++);
-+
-+		if (i == SQUASHFS_CACHED_FRAGMENTS) {
-+			for (i = msblk->next_fragment, n =
-+				SQUASHFS_CACHED_FRAGMENTS; n &&
-+				msblk->fragment[i].locked; n--, i = (i + 1) %
-+				SQUASHFS_CACHED_FRAGMENTS);
-+
-+			if (n == 0) {
-+				wait_queue_t wait;
-+
-+				init_waitqueue_entry(&wait, current);
-+				add_wait_queue(&msblk->fragment_wait_queue,
-+									&wait);
-+				set_current_state(TASK_UNINTERRUPTIBLE);
-+				up(&msblk->fragment_mutex);
-+				schedule();
-+				set_current_state(TASK_RUNNING);
-+				remove_wait_queue(&msblk->fragment_wait_queue,
-+									&wait);
-+				continue;
-+			}
-+			msblk->next_fragment = (msblk->next_fragment + 1) %
-+				SQUASHFS_CACHED_FRAGMENTS;
-+
-+			if (msblk->fragment[i].data == NULL)
-+				if (!(msblk->fragment[i].data = SQUASHFS_ALLOC
-+						(SQUASHFS_FILE_MAX_SIZE))) {
-+					ERROR("Failed to allocate fragment "
-+							"cache block\n");
-+					up(&msblk->fragment_mutex);
-+					goto out;
-+				}
-+
-+			msblk->fragment[i].block = SQUASHFS_INVALID_BLK;
-+			msblk->fragment[i].locked = 1;
-+			up(&msblk->fragment_mutex);
-+
-+			if (!(msblk->fragment[i].length = squashfs_read_data(s,
-+						msblk->fragment[i].data,
-+						start_block, length, NULL))) {
-+				ERROR("Unable to read fragment cache block "
-+							"[%llx]\n", start_block);
-+				msblk->fragment[i].locked = 0;
-+				goto out;
-+			}
-+
-+			msblk->fragment[i].block = start_block;
-+			TRACE("New fragment %d, start block %lld, locked %d\n",
-+						i, msblk->fragment[i].block,
-+						msblk->fragment[i].locked);
-+			break;
-+		}
-+
-+		msblk->fragment[i].locked++;
-+		up(&msblk->fragment_mutex);
-+		TRACE("Got fragment %d, start block %lld, locked %d\n", i,
-+						msblk->fragment[i].block,
-+						msblk->fragment[i].locked);
-+		break;
-+	}
-+
-+	return &msblk->fragment[i];
-+
-+out:
-+	return NULL;
-+}
-+
-+
-+static struct inode *squashfs_new_inode(struct super_block *s,
-+		struct squashfs_base_inode_header *inodeb)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	struct inode *i = new_inode(s);
-+
-+	if (i) {
-+		i->i_ino = inodeb->inode_number;
-+		i->i_mtime.tv_sec = inodeb->mtime;
-+		i->i_atime.tv_sec = inodeb->mtime;
-+		i->i_ctime.tv_sec = inodeb->mtime;
-+		i->i_uid = msblk->uid[inodeb->uid];
-+		i->i_mode = inodeb->mode;
-+		i->i_size = 0;
-+		if (inodeb->guid == SQUASHFS_GUIDS)
-+			i->i_gid = i->i_uid;
-+		else
-+			i->i_gid = msblk->guid[inodeb->guid];
-+	}
-+
-+	return i;
-+}
-+
-+
-+static struct inode *squashfs_iget(struct super_block *s, squashfs_inode_t inode)
-+{
-+	struct inode *i;
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	long long block = SQUASHFS_INODE_BLK(inode) +
-+		sblk->inode_table_start;
-+	unsigned int offset = SQUASHFS_INODE_OFFSET(inode);
-+	long long next_block;
-+	unsigned int next_offset;
-+	union squashfs_inode_header id, sid;
-+	struct squashfs_base_inode_header *inodeb = &id.base,
-+					  *sinodeb = &sid.base;
-+
-+	TRACE("Entered squashfs_iget\n");
-+
-+	if (msblk->swap) {
-+		if (!squashfs_get_cached_block(s, (char *) sinodeb, block,
-+					offset, sizeof(*sinodeb), &next_block,
-+					&next_offset))
-+			goto failed_read;
-+		SQUASHFS_SWAP_BASE_INODE_HEADER(inodeb, sinodeb,
-+					sizeof(*sinodeb));
-+	} else
-+		if (!squashfs_get_cached_block(s, (char *) inodeb, block,
-+					offset, sizeof(*inodeb), &next_block,
-+					&next_offset))
-+			goto failed_read;
-+
-+	switch(inodeb->inode_type) {
-+		case SQUASHFS_FILE_TYPE: {
-+			unsigned int frag_size;
-+			long long frag_blk;
-+			struct squashfs_reg_inode_header *inodep = &id.reg;
-+			struct squashfs_reg_inode_header *sinodep = &sid.reg;
-+
-+			if (msblk->swap) {
-+				if (!squashfs_get_cached_block(s, (char *)
-+						sinodep, block, offset,
-+						sizeof(*sinodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+				SQUASHFS_SWAP_REG_INODE_HEADER(inodep, sinodep);
-+			} else
-+				if (!squashfs_get_cached_block(s, (char *)
-+						inodep, block, offset,
-+						sizeof(*inodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+			frag_blk = SQUASHFS_INVALID_BLK;
-+			if (inodep->fragment != SQUASHFS_INVALID_FRAG &&
-+					!get_fragment_location(s,
-+					inodep->fragment, &frag_blk, &frag_size))
-+				goto failed_read;
-+
-+			if((i = squashfs_new_inode(s, inodeb)) == NULL)
-+				goto failed_read1;
-+
-+			i->i_nlink = 1;
-+			i->i_size = inodep->file_size;
-+			i->i_fop = &generic_ro_fops;
-+			i->i_mode |= S_IFREG;
-+			i->i_blocks = ((i->i_size - 1) >> 9) + 1;
-+			SQUASHFS_I(i)->u.s1.fragment_start_block = frag_blk;
-+			SQUASHFS_I(i)->u.s1.fragment_size = frag_size;
-+			SQUASHFS_I(i)->u.s1.fragment_offset = inodep->offset;
-+			SQUASHFS_I(i)->start_block = inodep->start_block;
-+			SQUASHFS_I(i)->u.s1.block_list_start = next_block;
-+			SQUASHFS_I(i)->offset = next_offset;
-+			if (sblk->block_size > 4096)
-+				i->i_data.a_ops = &squashfs_aops;
-+			else
-+				i->i_data.a_ops = &squashfs_aops_4K;
-+
-+			TRACE("File inode %x:%x, start_block %llx, "
-+					"block_list_start %llx, offset %x\n",
-+					SQUASHFS_INODE_BLK(inode), offset,
-+					inodep->start_block, next_block,
-+					next_offset);
-+			break;
-+		}
-+		case SQUASHFS_LREG_TYPE: {
-+			unsigned int frag_size;
-+			long long frag_blk;
-+			struct squashfs_lreg_inode_header *inodep = &id.lreg;
-+			struct squashfs_lreg_inode_header *sinodep = &sid.lreg;
-+
-+			if (msblk->swap) {
-+				if (!squashfs_get_cached_block(s, (char *)
-+						sinodep, block, offset,
-+						sizeof(*sinodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+				SQUASHFS_SWAP_LREG_INODE_HEADER(inodep, sinodep);
-+			} else
-+				if (!squashfs_get_cached_block(s, (char *)
-+						inodep, block, offset,
-+						sizeof(*inodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+			frag_blk = SQUASHFS_INVALID_BLK;
-+			if (inodep->fragment != SQUASHFS_INVALID_FRAG &&
-+					!get_fragment_location(s,
-+					inodep->fragment, &frag_blk, &frag_size))
-+				goto failed_read;
-+
-+			if((i = squashfs_new_inode(s, inodeb)) == NULL)
-+				goto failed_read1;
-+
-+			i->i_nlink = inodep->nlink;
-+			i->i_size = inodep->file_size;
-+			i->i_fop = &generic_ro_fops;
-+			i->i_mode |= S_IFREG;
-+			i->i_blocks = ((i->i_size - 1) >> 9) + 1;
-+			SQUASHFS_I(i)->u.s1.fragment_start_block = frag_blk;
-+			SQUASHFS_I(i)->u.s1.fragment_size = frag_size;
-+			SQUASHFS_I(i)->u.s1.fragment_offset = inodep->offset;
-+			SQUASHFS_I(i)->start_block = inodep->start_block;
-+			SQUASHFS_I(i)->u.s1.block_list_start = next_block;
-+			SQUASHFS_I(i)->offset = next_offset;
-+			if (sblk->block_size > 4096)
-+				i->i_data.a_ops = &squashfs_aops;
-+			else
-+				i->i_data.a_ops = &squashfs_aops_4K;
-+
-+			TRACE("File inode %x:%x, start_block %llx, "
-+					"block_list_start %llx, offset %x\n",
-+					SQUASHFS_INODE_BLK(inode), offset,
-+					inodep->start_block, next_block,
-+					next_offset);
-+			break;
-+		}
-+		case SQUASHFS_DIR_TYPE: {
-+			struct squashfs_dir_inode_header *inodep = &id.dir;
-+			struct squashfs_dir_inode_header *sinodep = &sid.dir;
-+
-+			if (msblk->swap) {
-+				if (!squashfs_get_cached_block(s, (char *)
-+						sinodep, block, offset,
-+						sizeof(*sinodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+				SQUASHFS_SWAP_DIR_INODE_HEADER(inodep, sinodep);
-+			} else
-+				if (!squashfs_get_cached_block(s, (char *)
-+						inodep, block, offset,
-+						sizeof(*inodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+			if((i = squashfs_new_inode(s, inodeb)) == NULL)
-+				goto failed_read1;
-+
-+			i->i_nlink = inodep->nlink;
-+			i->i_size = inodep->file_size;
-+			i->i_op = &squashfs_dir_inode_ops;
-+			i->i_fop = &squashfs_dir_ops;
-+			i->i_mode |= S_IFDIR;
-+			SQUASHFS_I(i)->start_block = inodep->start_block;
-+			SQUASHFS_I(i)->offset = inodep->offset;
-+			SQUASHFS_I(i)->u.s2.directory_index_count = 0;
-+			SQUASHFS_I(i)->u.s2.parent_inode = inodep->parent_inode;
-+
-+			TRACE("Directory inode %x:%x, start_block %x, offset "
-+					"%x\n", SQUASHFS_INODE_BLK(inode),
-+					offset, inodep->start_block,
-+					inodep->offset);
-+			break;
-+		}
-+		case SQUASHFS_LDIR_TYPE: {
-+			struct squashfs_ldir_inode_header *inodep = &id.ldir;
-+			struct squashfs_ldir_inode_header *sinodep = &sid.ldir;
-+
-+			if (msblk->swap) {
-+				if (!squashfs_get_cached_block(s, (char *)
-+						sinodep, block, offset,
-+						sizeof(*sinodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+				SQUASHFS_SWAP_LDIR_INODE_HEADER(inodep,
-+						sinodep);
-+			} else
-+				if (!squashfs_get_cached_block(s, (char *)
-+						inodep, block, offset,
-+						sizeof(*inodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+			if((i = squashfs_new_inode(s, inodeb)) == NULL)
-+				goto failed_read1;
-+
-+			i->i_nlink = inodep->nlink;
-+			i->i_size = inodep->file_size;
-+			i->i_op = &squashfs_dir_inode_ops;
-+			i->i_fop = &squashfs_dir_ops;
-+			i->i_mode |= S_IFDIR;
-+			SQUASHFS_I(i)->start_block = inodep->start_block;
-+			SQUASHFS_I(i)->offset = inodep->offset;
-+			SQUASHFS_I(i)->u.s2.directory_index_start = next_block;
-+			SQUASHFS_I(i)->u.s2.directory_index_offset =
-+								next_offset;
-+			SQUASHFS_I(i)->u.s2.directory_index_count =
-+								inodep->i_count;
-+			SQUASHFS_I(i)->u.s2.parent_inode = inodep->parent_inode;
-+
-+			TRACE("Long directory inode %x:%x, start_block %x, "
-+					"offset %x\n",
-+					SQUASHFS_INODE_BLK(inode), offset,
-+					inodep->start_block, inodep->offset);
-+			break;
-+		}
-+		case SQUASHFS_SYMLINK_TYPE: {
-+			struct squashfs_symlink_inode_header *inodep =
-+								&id.symlink;
-+			struct squashfs_symlink_inode_header *sinodep =
-+								&sid.symlink;
-+
-+			if (msblk->swap) {
-+				if (!squashfs_get_cached_block(s, (char *)
-+						sinodep, block, offset,
-+						sizeof(*sinodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+				SQUASHFS_SWAP_SYMLINK_INODE_HEADER(inodep,
-+								sinodep);
-+			} else
-+				if (!squashfs_get_cached_block(s, (char *)
-+						inodep, block, offset,
-+						sizeof(*inodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+			if((i = squashfs_new_inode(s, inodeb)) == NULL)
-+				goto failed_read1;
-+
-+			i->i_nlink = inodep->nlink;
-+			i->i_size = inodep->symlink_size;
-+			i->i_op = &page_symlink_inode_operations;
-+			i->i_data.a_ops = &squashfs_symlink_aops;
-+			i->i_mode |= S_IFLNK;
-+			SQUASHFS_I(i)->start_block = next_block;
-+			SQUASHFS_I(i)->offset = next_offset;
-+
-+			TRACE("Symbolic link inode %x:%x, start_block %llx, "
-+					"offset %x\n",
-+					SQUASHFS_INODE_BLK(inode), offset,
-+					next_block, next_offset);
-+			break;
-+		 }
-+		 case SQUASHFS_BLKDEV_TYPE:
-+		 case SQUASHFS_CHRDEV_TYPE: {
-+			struct squashfs_dev_inode_header *inodep = &id.dev;
-+			struct squashfs_dev_inode_header *sinodep = &sid.dev;
-+
-+			if (msblk->swap) {
-+				if (!squashfs_get_cached_block(s, (char *)
-+						sinodep, block, offset,
-+						sizeof(*sinodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+				SQUASHFS_SWAP_DEV_INODE_HEADER(inodep, sinodep);
-+			} else
-+				if (!squashfs_get_cached_block(s, (char *)
-+						inodep, block, offset,
-+						sizeof(*inodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+			if ((i = squashfs_new_inode(s, inodeb)) == NULL)
-+				goto failed_read1;
-+
-+			i->i_nlink = inodep->nlink;
-+			i->i_mode |= (inodeb->inode_type ==
-+					SQUASHFS_CHRDEV_TYPE) ?  S_IFCHR :
-+					S_IFBLK;
-+			init_special_inode(i, i->i_mode,
-+					old_decode_dev(inodep->rdev));
-+
-+			TRACE("Device inode %x:%x, rdev %x\n",
-+					SQUASHFS_INODE_BLK(inode), offset,
-+					inodep->rdev);
-+			break;
-+		 }
-+		 case SQUASHFS_FIFO_TYPE:
-+		 case SQUASHFS_SOCKET_TYPE: {
-+			struct squashfs_ipc_inode_header *inodep = &id.ipc;
-+			struct squashfs_ipc_inode_header *sinodep = &sid.ipc;
-+
-+			if (msblk->swap) {
-+				if (!squashfs_get_cached_block(s, (char *)
-+						sinodep, block, offset,
-+						sizeof(*sinodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+				SQUASHFS_SWAP_IPC_INODE_HEADER(inodep, sinodep);
-+			} else
-+				if (!squashfs_get_cached_block(s, (char *)
-+						inodep, block, offset,
-+						sizeof(*inodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+			if ((i = squashfs_new_inode(s, inodeb)) == NULL)
-+				goto failed_read1;
-+
-+			i->i_nlink = inodep->nlink;
-+			i->i_mode |= (inodeb->inode_type == SQUASHFS_FIFO_TYPE)
-+							? S_IFIFO : S_IFSOCK;
-+			init_special_inode(i, i->i_mode, 0);
-+			break;
-+		 }
-+		 default:
-+			ERROR("Unknown inode type %d in squashfs_iget!\n",
-+					inodeb->inode_type);
-+			goto failed_read1;
-+	}
-+
-+	insert_inode_hash(i);
-+	return i;
-+
-+failed_read:
-+	ERROR("Unable to read inode [%llx:%x]\n", block, offset);
-+
-+failed_read1:
-+	return NULL;
-+}
-+
-+
-+static int read_fragment_index_table(struct super_block *s)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+
-+	/* Allocate fragment index table */
-+	if (!(msblk->fragment_index = kmalloc(SQUASHFS_FRAGMENT_INDEX_BYTES
-+					(sblk->fragments), GFP_KERNEL))) {
-+		ERROR("Failed to allocate uid/gid table\n");
-+		return 0;
-+	}
-+
-+	if (SQUASHFS_FRAGMENT_INDEX_BYTES(sblk->fragments) &&
-+					!squashfs_read_data(s, (char *)
-+					msblk->fragment_index,
-+					sblk->fragment_table_start,
-+					SQUASHFS_FRAGMENT_INDEX_BYTES
-+					(sblk->fragments) |
-+					SQUASHFS_COMPRESSED_BIT_BLOCK, NULL)) {
-+		ERROR("unable to read fragment index table\n");
-+		return 0;
-+	}
-+
-+	if (msblk->swap) {
-+		int i;
-+		long long fragment;
-+
-+		for (i = 0; i < SQUASHFS_FRAGMENT_INDEXES(sblk->fragments);
-+									i++) {
-+			SQUASHFS_SWAP_FRAGMENT_INDEXES((&fragment),
-+						&msblk->fragment_index[i], 1);
-+			msblk->fragment_index[i] = fragment;
-+		}
-+	}
-+
-+	return 1;
-+}
-+
-+
-+static int supported_squashfs_filesystem(struct squashfs_sb_info *msblk, int silent)
-+{
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+
-+	msblk->iget = squashfs_iget;
-+	msblk->read_blocklist = read_blocklist;
-+	msblk->read_fragment_index_table = read_fragment_index_table;
-+
-+	if (sblk->s_major == 1) {
-+		if (!squashfs_1_0_supported(msblk)) {
-+			SERROR("Major/Minor mismatch, Squashfs 1.0 filesystems "
-+				"are unsupported\n");
-+			SERROR("Please recompile with "
-+				"Squashfs 1.0 support enabled\n");
-+			return 0;
-+		}
-+	} else if (sblk->s_major == 2) {
-+		if (!squashfs_2_0_supported(msblk)) {
-+			SERROR("Major/Minor mismatch, Squashfs 2.0 filesystems "
-+				"are unsupported\n");
-+			SERROR("Please recompile with "
-+				"Squashfs 2.0 support enabled\n");
-+			return 0;
-+		}
-+	} else if(sblk->s_major != SQUASHFS_MAJOR || sblk->s_minor >
-+			SQUASHFS_MINOR) {
-+		SERROR("Major/Minor mismatch, trying to mount newer %d.%d "
-+				"filesystem\n", sblk->s_major, sblk->s_minor);
-+		SERROR("Please update your kernel\n");
-+		return 0;
-+	}
-+
-+	return 1;
-+}
-+
-+
-+static int squashfs_fill_super(struct super_block *s, void *data, int silent)
-+{
-+	struct squashfs_sb_info *msblk;
-+	struct squashfs_super_block *sblk;
-+	int i;
-+	char b[BDEVNAME_SIZE];
-+	struct inode *root;
-+
-+	TRACE("Entered squashfs_read_superblock\n");
-+
-+	if (!(s->s_fs_info = kmalloc(sizeof(struct squashfs_sb_info),
-+						GFP_KERNEL))) {
-+		ERROR("Failed to allocate superblock\n");
-+		goto failure;
-+	}
-+	memset(s->s_fs_info, 0, sizeof(struct squashfs_sb_info));
-+	msblk = s->s_fs_info;
-+	sblk = &msblk->sblk;
-+
-+	msblk->devblksize = sb_min_blocksize(s, BLOCK_SIZE);
-+	msblk->devblksize_log2 = ffz(~msblk->devblksize);
-+
-+	init_MUTEX(&msblk->read_data_mutex);
-+	init_MUTEX(&msblk->read_page_mutex);
-+	init_MUTEX(&msblk->block_cache_mutex);
-+	init_MUTEX(&msblk->fragment_mutex);
-+	init_MUTEX(&msblk->meta_index_mutex);
-+
-+	init_waitqueue_head(&msblk->waitq);
-+	init_waitqueue_head(&msblk->fragment_wait_queue);
-+
-+	if (!squashfs_read_data(s, (char *) sblk, SQUASHFS_START,
-+					sizeof(struct squashfs_super_block) |
-+					SQUASHFS_COMPRESSED_BIT_BLOCK, NULL)) {
-+		SERROR("unable to read superblock\n");
-+		goto failed_mount;
-+	}
-+
-+	/* Check it is a SQUASHFS superblock */
-+	msblk->swap = 0;
-+	if ((s->s_magic = sblk->s_magic) != SQUASHFS_MAGIC) {
-+		if (sblk->s_magic == SQUASHFS_MAGIC_SWAP) {
-+			struct squashfs_super_block ssblk;
-+
-+			WARNING("Mounting a different endian SQUASHFS "
-+				"filesystem on %s\n", bdevname(s->s_bdev, b));
-+
-+			SQUASHFS_SWAP_SUPER_BLOCK(&ssblk, sblk);
-+			memcpy(sblk, &ssblk, sizeof(struct squashfs_super_block));
-+			msblk->swap = 1;
-+		} else  {
-+			SERROR("Can't find a SQUASHFS superblock on %s\n",
-+							bdevname(s->s_bdev, b));
-+			goto failed_mount;
-+		}
-+	}
-+
-+	/* Check the MAJOR & MINOR versions */
-+	if(!supported_squashfs_filesystem(msblk, silent))
-+		goto failed_mount;
-+
-+	TRACE("Found valid superblock on %s\n", bdevname(s->s_bdev, b));
-+	TRACE("Inodes are %scompressed\n",
-+					SQUASHFS_UNCOMPRESSED_INODES
-+					(sblk->flags) ? "un" : "");
-+	TRACE("Data is %scompressed\n",
-+					SQUASHFS_UNCOMPRESSED_DATA(sblk->flags)
-+					? "un" : "");
-+	TRACE("Check data is %s present in the filesystem\n",
-+					SQUASHFS_CHECK_DATA(sblk->flags) ?
-+					"" : "not");
-+	TRACE("Filesystem size %lld bytes\n", sblk->bytes_used);
-+	TRACE("Block size %d\n", sblk->block_size);
-+	TRACE("Number of inodes %d\n", sblk->inodes);
-+	if (sblk->s_major > 1)
-+		TRACE("Number of fragments %d\n", sblk->fragments);
-+	TRACE("Number of uids %d\n", sblk->no_uids);
-+	TRACE("Number of gids %d\n", sblk->no_guids);
-+	TRACE("sblk->inode_table_start %llx\n", sblk->inode_table_start);
-+	TRACE("sblk->directory_table_start %llx\n", sblk->directory_table_start);
-+	if (sblk->s_major > 1)
-+		TRACE("sblk->fragment_table_start %llx\n",
-+					sblk->fragment_table_start);
-+	TRACE("sblk->uid_start %llx\n", sblk->uid_start);
-+
-+	s->s_flags |= MS_RDONLY;
-+	s->s_op = &squashfs_ops;
-+
-+	/* Init inode_table block pointer array */
-+	if (!(msblk->block_cache = kmalloc(sizeof(struct squashfs_cache) *
-+					SQUASHFS_CACHED_BLKS, GFP_KERNEL))) {
-+		ERROR("Failed to allocate block cache\n");
-+		goto failed_mount;
-+	}
-+
-+	for (i = 0; i < SQUASHFS_CACHED_BLKS; i++)
-+		msblk->block_cache[i].block = SQUASHFS_INVALID_BLK;
-+
-+	msblk->next_cache = 0;
-+
-+	/* Allocate read_data block */
-+	msblk->read_size = (sblk->block_size < SQUASHFS_METADATA_SIZE) ?
-+					SQUASHFS_METADATA_SIZE :
-+					sblk->block_size;
-+
-+	if (!(msblk->read_data = kmalloc(msblk->read_size, GFP_KERNEL))) {
-+		ERROR("Failed to allocate read_data block\n");
-+		goto failed_mount;
-+	}
-+
-+	/* Allocate read_page block */
-+	if (!(msblk->read_page = kmalloc(sblk->block_size, GFP_KERNEL))) {
-+		ERROR("Failed to allocate read_page block\n");
-+		goto failed_mount;
-+	}
-+
-+	/* Allocate uid and gid tables */
-+	if (!(msblk->uid = kmalloc((sblk->no_uids + sblk->no_guids) *
-+					sizeof(unsigned int), GFP_KERNEL))) {
-+		ERROR("Failed to allocate uid/gid table\n");
-+		goto failed_mount;
-+	}
-+	msblk->guid = msblk->uid + sblk->no_uids;
-+
-+	if (msblk->swap) {
-+		unsigned int suid[sblk->no_uids + sblk->no_guids];
-+
-+		if (!squashfs_read_data(s, (char *) &suid, sblk->uid_start,
-+					((sblk->no_uids + sblk->no_guids) *
-+					 sizeof(unsigned int)) |
-+					SQUASHFS_COMPRESSED_BIT_BLOCK, NULL)) {
-+			ERROR("unable to read uid/gid table\n");
-+			goto failed_mount;
-+		}
-+
-+		SQUASHFS_SWAP_DATA(msblk->uid, suid, (sblk->no_uids +
-+			sblk->no_guids), (sizeof(unsigned int) * 8));
-+	} else
-+		if (!squashfs_read_data(s, (char *) msblk->uid, sblk->uid_start,
-+					((sblk->no_uids + sblk->no_guids) *
-+					 sizeof(unsigned int)) |
-+					SQUASHFS_COMPRESSED_BIT_BLOCK, NULL)) {
-+			ERROR("unable to read uid/gid table\n");
-+			goto failed_mount;
-+		}
-+
-+
-+	if (sblk->s_major == 1 && squashfs_1_0_supported(msblk))
-+		goto allocate_root;
-+
-+	if (!(msblk->fragment = kmalloc(sizeof(struct squashfs_fragment_cache) *
-+				SQUASHFS_CACHED_FRAGMENTS, GFP_KERNEL))) {
-+		ERROR("Failed to allocate fragment block cache\n");
-+		goto failed_mount;
-+	}
-+
-+	for (i = 0; i < SQUASHFS_CACHED_FRAGMENTS; i++) {
-+		msblk->fragment[i].locked = 0;
-+		msblk->fragment[i].block = SQUASHFS_INVALID_BLK;
-+		msblk->fragment[i].data = NULL;
-+	}
-+
-+	msblk->next_fragment = 0;
-+
-+	/* Allocate fragment index table */
-+	if (msblk->read_fragment_index_table(s) == 0)
-+		goto failed_mount;
-+
-+allocate_root:
-+	if ((root = (msblk->iget)(s, sblk->root_inode)) == NULL)
-+		goto failed_mount;
-+
-+	if ((s->s_root = d_alloc_root(root)) == NULL) {
-+		ERROR("Root inode create failed\n");
-+		iput(root);
-+		goto failed_mount;
-+	}
-+
-+	TRACE("Leaving squashfs_read_super\n");
-+	return 0;
-+
-+failed_mount:
-+	kfree(msblk->fragment_index);
-+	kfree(msblk->fragment);
-+	kfree(msblk->uid);
-+	kfree(msblk->read_page);
-+	kfree(msblk->read_data);
-+	kfree(msblk->block_cache);
-+	kfree(msblk->fragment_index_2);
-+	kfree(s->s_fs_info);
-+	s->s_fs_info = NULL;
-+	return -EINVAL;
-+
-+failure:
-+	return -ENOMEM;
-+}
-+
-+
-+static int squashfs_statfs(struct dentry *dentry, struct kstatfs *buf)
-+{
-+	struct squashfs_sb_info *msblk = dentry->d_inode->i_sb->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+
-+	TRACE("Entered squashfs_statfs\n");
-+
-+	buf->f_type = SQUASHFS_MAGIC;
-+	buf->f_bsize = sblk->block_size;
-+	buf->f_blocks = ((sblk->bytes_used - 1) >> sblk->block_log) + 1;
-+	buf->f_bfree = buf->f_bavail = 0;
-+	buf->f_files = sblk->inodes;
-+	buf->f_ffree = 0;
-+	buf->f_namelen = SQUASHFS_NAME_LEN;
-+
-+	return 0;
-+}
-+
-+
-+static int squashfs_symlink_readpage(struct file *file, struct page *page)
-+{
-+	struct inode *inode = page->mapping->host;
-+	int index = page->index << PAGE_CACHE_SHIFT, length, bytes;
-+	long long block = SQUASHFS_I(inode)->start_block;
-+	int offset = SQUASHFS_I(inode)->offset;
-+	void *pageaddr = kmap(page);
-+
-+	TRACE("Entered squashfs_symlink_readpage, page index %ld, start block "
-+				"%llx, offset %x\n", page->index,
-+				SQUASHFS_I(inode)->start_block,
-+				SQUASHFS_I(inode)->offset);
-+
-+	for (length = 0; length < index; length += bytes) {
-+		if (!(bytes = squashfs_get_cached_block(inode->i_sb, NULL,
-+				block, offset, PAGE_CACHE_SIZE, &block,
-+				&offset))) {
-+			ERROR("Unable to read symbolic link [%llx:%x]\n", block,
-+					offset);
-+			goto skip_read;
-+		}
-+	}
-+
-+	if (length != index) {
-+		ERROR("(squashfs_symlink_readpage) length != index\n");
-+		bytes = 0;
-+		goto skip_read;
-+	}
-+
-+	bytes = (i_size_read(inode) - length) > PAGE_CACHE_SIZE ? PAGE_CACHE_SIZE :
-+					i_size_read(inode) - length;
-+
-+	if (!(bytes = squashfs_get_cached_block(inode->i_sb, pageaddr, block,
-+					offset, bytes, &block, &offset)))
-+		ERROR("Unable to read symbolic link [%llx:%x]\n", block, offset);
-+
-+skip_read:
-+	memset(pageaddr + bytes, 0, PAGE_CACHE_SIZE - bytes);
-+	kunmap(page);
-+	SetPageUptodate(page);
-+	unlock_page(page);
-+
-+	return 0;
-+}
-+
-+
-+struct meta_index *locate_meta_index(struct inode *inode, int index, int offset)
-+{
-+	struct meta_index *meta = NULL;
-+	struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info;
-+	int i;
-+
-+	down(&msblk->meta_index_mutex);
-+
-+	TRACE("locate_meta_index: index %d, offset %d\n", index, offset);
-+
-+	if(msblk->meta_index == NULL)
-+		goto not_allocated;
-+
-+	for (i = 0; i < SQUASHFS_META_NUMBER; i ++)
-+		if (msblk->meta_index[i].inode_number == inode->i_ino &&
-+				msblk->meta_index[i].offset >= offset &&
-+				msblk->meta_index[i].offset <= index &&
-+				msblk->meta_index[i].locked == 0) {
-+			TRACE("locate_meta_index: entry %d, offset %d\n", i,
-+					msblk->meta_index[i].offset);
-+			meta = &msblk->meta_index[i];
-+			offset = meta->offset;
-+		}
-+
-+	if (meta)
-+		meta->locked = 1;
-+
-+not_allocated:
-+	up(&msblk->meta_index_mutex);
-+
-+	return meta;
-+}
-+
-+
-+struct meta_index *empty_meta_index(struct inode *inode, int offset, int skip)
-+{
-+	struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info;
-+	struct meta_index *meta = NULL;
-+	int i;
-+
-+	down(&msblk->meta_index_mutex);
-+
-+	TRACE("empty_meta_index: offset %d, skip %d\n", offset, skip);
-+
-+	if(msblk->meta_index == NULL) {
-+		if (!(msblk->meta_index = kmalloc(sizeof(struct meta_index) *
-+					SQUASHFS_META_NUMBER, GFP_KERNEL))) {
-+			ERROR("Failed to allocate meta_index\n");
-+			goto failed;
-+		}
-+		for(i = 0; i < SQUASHFS_META_NUMBER; i++) {
-+			msblk->meta_index[i].inode_number = 0;
-+			msblk->meta_index[i].locked = 0;
-+		}
-+		msblk->next_meta_index = 0;
-+	}
-+
-+	for(i = SQUASHFS_META_NUMBER; i &&
-+			msblk->meta_index[msblk->next_meta_index].locked; i --)
-+		msblk->next_meta_index = (msblk->next_meta_index + 1) %
-+			SQUASHFS_META_NUMBER;
-+
-+	if(i == 0) {
-+		TRACE("empty_meta_index: failed!\n");
-+		goto failed;
-+	}
-+
-+	TRACE("empty_meta_index: returned meta entry %d, %p\n",
-+			msblk->next_meta_index,
-+			&msblk->meta_index[msblk->next_meta_index]);
-+
-+	meta = &msblk->meta_index[msblk->next_meta_index];
-+	msblk->next_meta_index = (msblk->next_meta_index + 1) %
-+			SQUASHFS_META_NUMBER;
-+
-+	meta->inode_number = inode->i_ino;
-+	meta->offset = offset;
-+	meta->skip = skip;
-+	meta->entries = 0;
-+	meta->locked = 1;
-+
-+failed:
-+	up(&msblk->meta_index_mutex);
-+	return meta;
-+}
-+
-+
-+void release_meta_index(struct inode *inode, struct meta_index *meta)
-+{
-+	meta->locked = 0;
-+}
-+
-+
-+static int read_block_index(struct super_block *s, int blocks, char *block_list,
-+		long long *start_block, int *offset)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	unsigned int *block_listp;
-+	int block = 0;
-+
-+	if (msblk->swap) {
-+		char sblock_list[blocks << 2];
-+
-+		if (!squashfs_get_cached_block(s, sblock_list, *start_block,
-+				*offset, blocks << 2, start_block, offset)) {
-+			ERROR("Unable to read block list [%llx:%x]\n",
-+				*start_block, *offset);
-+			goto failure;
-+		}
-+		SQUASHFS_SWAP_INTS(((unsigned int *)block_list),
-+				((unsigned int *)sblock_list), blocks);
-+	} else
-+		if (!squashfs_get_cached_block(s, block_list, *start_block,
-+				*offset, blocks << 2, start_block, offset)) {
-+			ERROR("Unable to read block list [%llx:%x]\n",
-+				*start_block, *offset);
-+			goto failure;
-+		}
-+
-+	for (block_listp = (unsigned int *) block_list; blocks;
-+				block_listp++, blocks --)
-+		block += SQUASHFS_COMPRESSED_SIZE_BLOCK(*block_listp);
-+
-+	return block;
-+
-+failure:
-+	return -1;
-+}
-+
-+
-+#define SIZE 256
-+
-+static inline int calculate_skip(int blocks) {
-+	int skip = (blocks - 1) / ((SQUASHFS_SLOTS * SQUASHFS_META_ENTRIES + 1) * SQUASHFS_META_INDEXES);
-+	return skip >= 7 ? 7 : skip + 1;
-+}
-+
-+
-+static int get_meta_index(struct inode *inode, int index,
-+		long long *index_block, int *index_offset,
-+		long long *data_block, char *block_list)
-+{
-+	struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	int skip = calculate_skip(i_size_read(inode) >> sblk->block_log);
-+	int offset = 0;
-+	struct meta_index *meta;
-+	struct meta_entry *meta_entry;
-+	long long cur_index_block = SQUASHFS_I(inode)->u.s1.block_list_start;
-+	int cur_offset = SQUASHFS_I(inode)->offset;
-+	long long cur_data_block = SQUASHFS_I(inode)->start_block;
-+	int i;
-+
-+	index /= SQUASHFS_META_INDEXES * skip;
-+
-+	while ( offset < index ) {
-+		meta = locate_meta_index(inode, index, offset + 1);
-+
-+		if (meta == NULL) {
-+			if ((meta = empty_meta_index(inode, offset + 1,
-+							skip)) == NULL)
-+				goto all_done;
-+		} else {
-+			offset = index < meta->offset + meta->entries ? index :
-+				meta->offset + meta->entries - 1;
-+			meta_entry = &meta->meta_entry[offset - meta->offset];
-+			cur_index_block = meta_entry->index_block + sblk->inode_table_start;
-+			cur_offset = meta_entry->offset;
-+			cur_data_block = meta_entry->data_block;
-+			TRACE("get_meta_index: offset %d, meta->offset %d, "
-+				"meta->entries %d\n", offset, meta->offset,
-+				meta->entries);
-+			TRACE("get_meta_index: index_block 0x%llx, offset 0x%x"
-+				" data_block 0x%llx\n", cur_index_block,
-+				cur_offset, cur_data_block);
-+		}
-+
-+		for (i = meta->offset + meta->entries; i <= index &&
-+				i < meta->offset + SQUASHFS_META_ENTRIES; i++) {
-+			int blocks = skip * SQUASHFS_META_INDEXES;
-+
-+			while (blocks) {
-+				int block = blocks > (SIZE >> 2) ? (SIZE >> 2) :
-+					blocks;
-+				int res = read_block_index(inode->i_sb, block,
-+					block_list, &cur_index_block,
-+					&cur_offset);
-+
-+				if (res == -1)
-+					goto failed;
-+
-+				cur_data_block += res;
-+				blocks -= block;
-+			}
-+
-+			meta_entry = &meta->meta_entry[i - meta->offset];
-+			meta_entry->index_block = cur_index_block - sblk->inode_table_start;
-+			meta_entry->offset = cur_offset;
-+			meta_entry->data_block = cur_data_block;
-+			meta->entries ++;
-+			offset ++;
-+		}
-+
-+		TRACE("get_meta_index: meta->offset %d, meta->entries %d\n",
-+				meta->offset, meta->entries);
-+
-+		release_meta_index(inode, meta);
-+	}
-+
-+all_done:
-+	*index_block = cur_index_block;
-+	*index_offset = cur_offset;
-+	*data_block = cur_data_block;
-+
-+	return offset * SQUASHFS_META_INDEXES * skip;
-+
-+failed:
-+	release_meta_index(inode, meta);
-+	return -1;
-+}
-+
-+
-+static long long read_blocklist(struct inode *inode, int index,
-+				int readahead_blks, char *block_list,
-+				unsigned short **block_p, unsigned int *bsize)
-+{
-+	long long block_ptr;
-+	int offset;
-+	long long block;
-+	int res = get_meta_index(inode, index, &block_ptr, &offset, &block,
-+		block_list);
-+
-+	TRACE("read_blocklist: res %d, index %d, block_ptr 0x%llx, offset"
-+		       " 0x%x, block 0x%llx\n", res, index, block_ptr, offset,
-+		       block);
-+
-+	if(res == -1)
-+		goto failure;
-+
-+	index -= res;
-+
-+	while ( index ) {
-+		int blocks = index > (SIZE >> 2) ? (SIZE >> 2) : index;
-+		int res = read_block_index(inode->i_sb, blocks, block_list,
-+			&block_ptr, &offset);
-+		if (res == -1)
-+			goto failure;
-+		block += res;
-+		index -= blocks;
-+	}
-+
-+	if (read_block_index(inode->i_sb, 1, block_list,
-+			&block_ptr, &offset) == -1)
-+		goto failure;
-+	*bsize = *((unsigned int *) block_list);
-+
-+	return block;
-+
-+failure:
-+	return 0;
-+}
-+
-+
-+static int squashfs_readpage(struct file *file, struct page *page)
-+{
-+	struct inode *inode = page->mapping->host;
-+	struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	unsigned char block_list[SIZE];
-+	long long block;
-+	unsigned int bsize, i = 0, bytes = 0, byte_offset = 0;
-+	int index = page->index >> (sblk->block_log - PAGE_CACHE_SHIFT);
-+ 	void *pageaddr;
-+	struct squashfs_fragment_cache *fragment = NULL;
-+	char *data_ptr = msblk->read_page;
-+
-+	int mask = (1 << (sblk->block_log - PAGE_CACHE_SHIFT)) - 1;
-+	int start_index = page->index & ~mask;
-+	int end_index = start_index | mask;
-+
-+	TRACE("Entered squashfs_readpage, page index %lx, start block %llx\n",
-+					page->index,
-+					SQUASHFS_I(inode)->start_block);
-+
-+	if (page->index >= ((i_size_read(inode) + PAGE_CACHE_SIZE - 1) >>
-+					PAGE_CACHE_SHIFT))
-+		goto skip_read;
-+
-+	if (SQUASHFS_I(inode)->u.s1.fragment_start_block == SQUASHFS_INVALID_BLK
-+					|| index < (i_size_read(inode) >>
-+					sblk->block_log)) {
-+		if ((block = (msblk->read_blocklist)(inode, index, 1,
-+					block_list, NULL, &bsize)) == 0)
-+			goto skip_read;
-+
-+		down(&msblk->read_page_mutex);
-+
-+		if (!(bytes = squashfs_read_data(inode->i_sb, msblk->read_page,
-+					block, bsize, NULL))) {
-+			ERROR("Unable to read page, block %llx, size %x\n", block,
-+					bsize);
-+			up(&msblk->read_page_mutex);
-+			goto skip_read;
-+		}
-+	} else {
-+		if ((fragment = get_cached_fragment(inode->i_sb,
-+					SQUASHFS_I(inode)->
-+					u.s1.fragment_start_block,
-+					SQUASHFS_I(inode)->u.s1.fragment_size))
-+					== NULL) {
-+			ERROR("Unable to read page, block %llx, size %x\n",
-+					SQUASHFS_I(inode)->
-+					u.s1.fragment_start_block,
-+					(int) SQUASHFS_I(inode)->
-+					u.s1.fragment_size);
-+			goto skip_read;
-+		}
-+		bytes = SQUASHFS_I(inode)->u.s1.fragment_offset +
-+					(i_size_read(inode) & (sblk->block_size
-+					- 1));
-+		byte_offset = SQUASHFS_I(inode)->u.s1.fragment_offset;
-+		data_ptr = fragment->data;
-+	}
-+
-+	for (i = start_index; i <= end_index && byte_offset < bytes;
-+					i++, byte_offset += PAGE_CACHE_SIZE) {
-+		struct page *push_page;
-+		int available_bytes = (bytes - byte_offset) > PAGE_CACHE_SIZE ?
-+					PAGE_CACHE_SIZE : bytes - byte_offset;
-+
-+		TRACE("bytes %d, i %d, byte_offset %d, available_bytes %d\n",
-+					bytes, i, byte_offset, available_bytes);
-+
-+		if (i == page->index)  {
-+			pageaddr = kmap_atomic(page, KM_USER0);
-+			memcpy(pageaddr, data_ptr + byte_offset,
-+					available_bytes);
-+			memset(pageaddr + available_bytes, 0,
-+					PAGE_CACHE_SIZE - available_bytes);
-+			kunmap_atomic(pageaddr, KM_USER0);
-+			flush_dcache_page(page);
-+			SetPageUptodate(page);
-+			unlock_page(page);
-+		} else if ((push_page =
-+				grab_cache_page_nowait(page->mapping, i))) {
-+ 			pageaddr = kmap_atomic(push_page, KM_USER0);
-+
-+			memcpy(pageaddr, data_ptr + byte_offset,
-+					available_bytes);
-+			memset(pageaddr + available_bytes, 0,
-+					PAGE_CACHE_SIZE - available_bytes);
-+			kunmap_atomic(pageaddr, KM_USER0);
-+			flush_dcache_page(push_page);
-+			SetPageUptodate(push_page);
-+			unlock_page(push_page);
-+			page_cache_release(push_page);
-+		}
-+	}
-+
-+	if (SQUASHFS_I(inode)->u.s1.fragment_start_block == SQUASHFS_INVALID_BLK
-+					|| index < (i_size_read(inode) >>
-+					sblk->block_log))
-+		up(&msblk->read_page_mutex);
-+	else
-+		release_cached_fragment(msblk, fragment);
-+
-+	return 0;
-+
-+skip_read:
-+	pageaddr = kmap_atomic(page, KM_USER0);
-+	memset(pageaddr + bytes, 0, PAGE_CACHE_SIZE - bytes);
-+	kunmap_atomic(pageaddr, KM_USER0);
-+	flush_dcache_page(page);
-+	SetPageUptodate(page);
-+	unlock_page(page);
-+
-+	return 0;
-+}
-+
-+
-+static int squashfs_readpage4K(struct file *file, struct page *page)
-+{
-+	struct inode *inode = page->mapping->host;
-+	struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	unsigned char block_list[SIZE];
-+	long long block;
-+	unsigned int bsize, bytes = 0;
-+ 	void *pageaddr;
-+
-+	TRACE("Entered squashfs_readpage4K, page index %lx, start block %llx\n",
-+					page->index,
-+					SQUASHFS_I(inode)->start_block);
-+
-+	if (page->index >= ((i_size_read(inode) + PAGE_CACHE_SIZE - 1) >>
-+					PAGE_CACHE_SHIFT)) {
-+		pageaddr = kmap_atomic(page, KM_USER0);
-+		goto skip_read;
-+	}
-+
-+	if (SQUASHFS_I(inode)->u.s1.fragment_start_block == SQUASHFS_INVALID_BLK
-+					|| page->index < (i_size_read(inode) >>
-+					sblk->block_log)) {
-+		block = (msblk->read_blocklist)(inode, page->index, 1,
-+					block_list, NULL, &bsize);
-+
-+		down(&msblk->read_page_mutex);
-+		bytes = squashfs_read_data(inode->i_sb, msblk->read_page, block,
-+					bsize, NULL);
-+		pageaddr = kmap_atomic(page, KM_USER0);
-+		if (bytes)
-+			memcpy(pageaddr, msblk->read_page, bytes);
-+		else
-+			ERROR("Unable to read page, block %llx, size %x\n",
-+					block, bsize);
-+		up(&msblk->read_page_mutex);
-+	} else {
-+		struct squashfs_fragment_cache *fragment =
-+			get_cached_fragment(inode->i_sb,
-+					SQUASHFS_I(inode)->
-+					u.s1.fragment_start_block,
-+					SQUASHFS_I(inode)-> u.s1.fragment_size);
-+		pageaddr = kmap_atomic(page, KM_USER0);
-+		if (fragment) {
-+			bytes = i_size_read(inode) & (sblk->block_size - 1);
-+			memcpy(pageaddr, fragment->data + SQUASHFS_I(inode)->
-+					u.s1.fragment_offset, bytes);
-+			release_cached_fragment(msblk, fragment);
-+		} else
-+			ERROR("Unable to read page, block %llx, size %x\n",
-+					SQUASHFS_I(inode)->
-+					u.s1.fragment_start_block, (int)
-+					SQUASHFS_I(inode)-> u.s1.fragment_size);
-+	}
-+
-+skip_read:
-+	memset(pageaddr + bytes, 0, PAGE_CACHE_SIZE - bytes);
-+	kunmap_atomic(pageaddr, KM_USER0);
-+	flush_dcache_page(page);
-+	SetPageUptodate(page);
-+	unlock_page(page);
-+
-+	return 0;
-+}
-+
-+
-+static int get_dir_index_using_offset(struct super_block *s, long long
-+				*next_block, unsigned int *next_offset,
-+				long long index_start,
-+				unsigned int index_offset, int i_count,
-+				long long f_pos)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	int i, length = 0;
-+	struct squashfs_dir_index index;
-+
-+	TRACE("Entered get_dir_index_using_offset, i_count %d, f_pos %d\n",
-+					i_count, (unsigned int) f_pos);
-+
-+	f_pos =- 3;
-+	if (f_pos == 0)
-+		goto finish;
-+
-+	for (i = 0; i < i_count; i++) {
-+		if (msblk->swap) {
-+			struct squashfs_dir_index sindex;
-+			squashfs_get_cached_block(s, (char *) &sindex,
-+					index_start, index_offset,
-+					sizeof(sindex), &index_start,
-+					&index_offset);
-+			SQUASHFS_SWAP_DIR_INDEX(&index, &sindex);
-+		} else
-+			squashfs_get_cached_block(s, (char *) &index,
-+					index_start, index_offset,
-+					sizeof(index), &index_start,
-+					&index_offset);
-+
-+		if (index.index > f_pos)
-+			break;
-+
-+		squashfs_get_cached_block(s, NULL, index_start, index_offset,
-+					index.size + 1, &index_start,
-+					&index_offset);
-+
-+		length = index.index;
-+		*next_block = index.start_block + sblk->directory_table_start;
-+	}
-+
-+	*next_offset = (length + *next_offset) % SQUASHFS_METADATA_SIZE;
-+
-+finish:
-+	return length + 3;
-+}
-+
-+
-+static int get_dir_index_using_name(struct super_block *s, long long
-+				*next_block, unsigned int *next_offset,
-+				long long index_start,
-+				unsigned int index_offset, int i_count,
-+				const char *name, int size)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	int i, length = 0;
-+	char buffer[sizeof(struct squashfs_dir_index) + SQUASHFS_NAME_LEN + 1];
-+	struct squashfs_dir_index *index = (struct squashfs_dir_index *) buffer;
-+	char str[SQUASHFS_NAME_LEN + 1];
-+
-+	TRACE("Entered get_dir_index_using_name, i_count %d\n", i_count);
-+
-+	strncpy(str, name, size);
-+	str[size] = '\0';
-+
-+	for (i = 0; i < i_count; i++) {
-+		if (msblk->swap) {
-+			struct squashfs_dir_index sindex;
-+			squashfs_get_cached_block(s, (char *) &sindex,
-+					index_start, index_offset,
-+					sizeof(sindex), &index_start,
-+					&index_offset);
-+			SQUASHFS_SWAP_DIR_INDEX(index, &sindex);
-+		} else
-+			squashfs_get_cached_block(s, (char *) index,
-+					index_start, index_offset,
-+					sizeof(struct squashfs_dir_index),
-+					&index_start, &index_offset);
-+
-+		squashfs_get_cached_block(s, index->name, index_start,
-+					index_offset, index->size + 1,
-+					&index_start, &index_offset);
-+
-+		index->name[index->size + 1] = '\0';
-+
-+		if (strcmp(index->name, str) > 0)
-+			break;
-+
-+		length = index->index;
-+		*next_block = index->start_block + sblk->directory_table_start;
-+	}
-+
-+	*next_offset = (length + *next_offset) % SQUASHFS_METADATA_SIZE;
-+	return length + 3;
-+}
-+
-+
-+static int squashfs_readdir(struct file *file, void *dirent, filldir_t filldir)
-+{
-+	struct inode *i = file->f_dentry->d_inode;
-+	struct squashfs_sb_info *msblk = i->i_sb->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	long long next_block = SQUASHFS_I(i)->start_block +
-+		sblk->directory_table_start;
-+	int next_offset = SQUASHFS_I(i)->offset, length = 0, dirs_read = 0,
-+		dir_count;
-+	struct squashfs_dir_header dirh;
-+	char buffer[sizeof(struct squashfs_dir_entry) + SQUASHFS_NAME_LEN + 1];
-+	struct squashfs_dir_entry *dire = (struct squashfs_dir_entry *) buffer;
-+
-+	TRACE("Entered squashfs_readdir [%llx:%x]\n", next_block, next_offset);
-+
-+	while(file->f_pos < 3) {
-+		char *name;
-+		int size, i_ino;
-+
-+		if(file->f_pos == 0) {
-+			name = ".";
-+			size = 1;
-+			i_ino = i->i_ino;
-+		} else {
-+			name = "..";
-+			size = 2;
-+			i_ino = SQUASHFS_I(i)->u.s2.parent_inode;
-+		}
-+		TRACE("Calling filldir(%x, %s, %d, %d, %d, %d)\n",
-+				(unsigned int) dirent, name, size, (int)
-+				file->f_pos, i_ino,
-+				squashfs_filetype_table[1]);
-+
-+		if (filldir(dirent, name, size,
-+				file->f_pos, i_ino,
-+				squashfs_filetype_table[1]) < 0) {
-+				TRACE("Filldir returned less than 0\n");
-+				goto finish;
-+		}
-+		file->f_pos += size;
-+		dirs_read++;
-+	}
-+
-+	length = get_dir_index_using_offset(i->i_sb, &next_block, &next_offset,
-+				SQUASHFS_I(i)->u.s2.directory_index_start,
-+				SQUASHFS_I(i)->u.s2.directory_index_offset,
-+				SQUASHFS_I(i)->u.s2.directory_index_count,
-+				file->f_pos);
-+
-+	while (length < i_size_read(i)) {
-+		/* read directory header */
-+		if (msblk->swap) {
-+			struct squashfs_dir_header sdirh;
-+
-+			if (!squashfs_get_cached_block(i->i_sb, (char *) &sdirh,
-+					next_block, next_offset, sizeof(sdirh),
-+					&next_block, &next_offset))
-+				goto failed_read;
-+
-+			length += sizeof(sdirh);
-+			SQUASHFS_SWAP_DIR_HEADER(&dirh, &sdirh);
-+		} else {
-+			if (!squashfs_get_cached_block(i->i_sb, (char *) &dirh,
-+					next_block, next_offset, sizeof(dirh),
-+					&next_block, &next_offset))
-+				goto failed_read;
-+
-+			length += sizeof(dirh);
-+		}
-+
-+		dir_count = dirh.count + 1;
-+		while (dir_count--) {
-+			if (msblk->swap) {
-+				struct squashfs_dir_entry sdire;
-+				if (!squashfs_get_cached_block(i->i_sb, (char *)
-+						&sdire, next_block, next_offset,
-+						sizeof(sdire), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+				length += sizeof(sdire);
-+				SQUASHFS_SWAP_DIR_ENTRY(dire, &sdire);
-+			} else {
-+				if (!squashfs_get_cached_block(i->i_sb, (char *)
-+						dire, next_block, next_offset,
-+						sizeof(*dire), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+				length += sizeof(*dire);
-+			}
-+
-+			if (!squashfs_get_cached_block(i->i_sb, dire->name,
-+						next_block, next_offset,
-+						dire->size + 1, &next_block,
-+						&next_offset))
-+				goto failed_read;
-+
-+			length += dire->size + 1;
-+
-+			if (file->f_pos >= length)
-+				continue;
-+
-+			dire->name[dire->size + 1] = '\0';
-+
-+			TRACE("Calling filldir(%x, %s, %d, %d, %x:%x, %d, %d)\n",
-+					(unsigned int) dirent, dire->name,
-+					dire->size + 1, (int) file->f_pos,
-+					dirh.start_block, dire->offset,
-+					dirh.inode_number + dire->inode_number,
-+					squashfs_filetype_table[dire->type]);
-+
-+			if (filldir(dirent, dire->name, dire->size + 1,
-+					file->f_pos,
-+					dirh.inode_number + dire->inode_number,
-+					squashfs_filetype_table[dire->type])
-+					< 0) {
-+				TRACE("Filldir returned less than 0\n");
-+				goto finish;
-+			}
-+			file->f_pos = length;
-+			dirs_read++;
-+		}
-+	}
-+
-+finish:
-+	return dirs_read;
-+
-+failed_read:
-+	ERROR("Unable to read directory block [%llx:%x]\n", next_block,
-+		next_offset);
-+	return 0;
-+}
-+
-+
-+static struct dentry *squashfs_lookup(struct inode *i, struct dentry *dentry,
-+				struct nameidata *nd)
-+{
-+	const unsigned char *name = dentry->d_name.name;
-+	int len = dentry->d_name.len;
-+	struct inode *inode = NULL;
-+	struct squashfs_sb_info *msblk = i->i_sb->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	long long next_block = SQUASHFS_I(i)->start_block +
-+				sblk->directory_table_start;
-+	int next_offset = SQUASHFS_I(i)->offset, length = 0,
-+				dir_count;
-+	struct squashfs_dir_header dirh;
-+	char buffer[sizeof(struct squashfs_dir_entry) + SQUASHFS_NAME_LEN];
-+	struct squashfs_dir_entry *dire = (struct squashfs_dir_entry *) buffer;
-+
-+	TRACE("Entered squashfs_lookup [%llx:%x]\n", next_block, next_offset);
-+
-+	if (len > SQUASHFS_NAME_LEN)
-+		goto exit_loop;
-+
-+	length = get_dir_index_using_name(i->i_sb, &next_block, &next_offset,
-+				SQUASHFS_I(i)->u.s2.directory_index_start,
-+				SQUASHFS_I(i)->u.s2.directory_index_offset,
-+				SQUASHFS_I(i)->u.s2.directory_index_count, name,
-+				len);
-+
-+	while (length < i_size_read(i)) {
-+		/* read directory header */
-+		if (msblk->swap) {
-+			struct squashfs_dir_header sdirh;
-+			if (!squashfs_get_cached_block(i->i_sb, (char *) &sdirh,
-+					next_block, next_offset, sizeof(sdirh),
-+					&next_block, &next_offset))
-+				goto failed_read;
-+
-+			length += sizeof(sdirh);
-+			SQUASHFS_SWAP_DIR_HEADER(&dirh, &sdirh);
-+		} else {
-+			if (!squashfs_get_cached_block(i->i_sb, (char *) &dirh,
-+					next_block, next_offset, sizeof(dirh),
-+					&next_block, &next_offset))
-+				goto failed_read;
-+
-+			length += sizeof(dirh);
-+		}
-+
-+		dir_count = dirh.count + 1;
-+		while (dir_count--) {
-+			if (msblk->swap) {
-+				struct squashfs_dir_entry sdire;
-+				if (!squashfs_get_cached_block(i->i_sb, (char *)
-+						&sdire, next_block,next_offset,
-+						sizeof(sdire), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+				length += sizeof(sdire);
-+				SQUASHFS_SWAP_DIR_ENTRY(dire, &sdire);
-+			} else {
-+				if (!squashfs_get_cached_block(i->i_sb, (char *)
-+						dire, next_block,next_offset,
-+						sizeof(*dire), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+				length += sizeof(*dire);
-+			}
-+
-+			if (!squashfs_get_cached_block(i->i_sb, dire->name,
-+					next_block, next_offset, dire->size + 1,
-+					&next_block, &next_offset))
-+				goto failed_read;
-+
-+			length += dire->size + 1;
-+
-+			if (name[0] < dire->name[0])
-+				goto exit_loop;
-+
-+			if ((len == dire->size + 1) && !strncmp(name,
-+						dire->name, len)) {
-+				squashfs_inode_t ino =
-+					SQUASHFS_MKINODE(dirh.start_block,
-+					dire->offset);
-+
-+				TRACE("calling squashfs_iget for directory "
-+					"entry %s, inode %x:%x, %d\n", name,
-+					dirh.start_block, dire->offset,
-+					dirh.inode_number + dire->inode_number);
-+
-+				inode = (msblk->iget)(i->i_sb, ino);
-+
-+				goto exit_loop;
-+			}
-+		}
-+	}
-+
-+exit_loop:
-+	d_add(dentry, inode);
-+	return ERR_PTR(0);
-+
-+failed_read:
-+	ERROR("Unable to read directory block [%llx:%x]\n", next_block,
-+		next_offset);
-+	goto exit_loop;
-+}
-+
-+
-+static void squashfs_put_super(struct super_block *s)
-+{
-+	int i;
-+
-+	if (s->s_fs_info) {
-+		struct squashfs_sb_info *sbi = s->s_fs_info;
-+		if (sbi->block_cache)
-+			for (i = 0; i < SQUASHFS_CACHED_BLKS; i++)
-+				if (sbi->block_cache[i].block !=
-+							SQUASHFS_INVALID_BLK)
-+					kfree(sbi->block_cache[i].data);
-+		if (sbi->fragment)
-+			for (i = 0; i < SQUASHFS_CACHED_FRAGMENTS; i++)
-+				SQUASHFS_FREE(sbi->fragment[i].data);
-+		kfree(sbi->fragment);
-+		kfree(sbi->block_cache);
-+		kfree(sbi->read_data);
-+		kfree(sbi->read_page);
-+		kfree(sbi->uid);
-+		kfree(sbi->fragment_index);
-+		kfree(sbi->fragment_index_2);
-+		kfree(sbi->meta_index);
-+		kfree(s->s_fs_info);
-+		s->s_fs_info = NULL;
-+	}
-+}
-+
-+
-+static int squashfs_get_sb(struct file_system_type *fs_type,
-+			int flags, const char *dev_name, void *data,
-+			struct vfsmount *mnt)
-+{
-+	return get_sb_bdev(fs_type, flags, dev_name, data, squashfs_fill_super, mnt);
-+}
-+
-+
-+static int __init init_squashfs_fs(void)
-+{
-+	int err = init_inodecache();
-+	if (err)
-+		goto out;
-+
-+	printk(KERN_INFO "squashfs: version 3.0 (2006/03/15) "
-+		"Phillip Lougher\n");
-+
-+	if (!(stream.workspace = vmalloc(zlib_inflate_workspacesize()))) {
-+		ERROR("Failed to allocate zlib workspace\n");
-+		destroy_inodecache();
-+		err = -ENOMEM;
-+		goto out;
-+	}
-+
-+	if ((err = register_filesystem(&squashfs_fs_type))) {
-+		vfree(stream.workspace);
-+		destroy_inodecache();
-+	}
-+
-+out:
-+	return err;
-+}
-+
-+
-+static void __exit exit_squashfs_fs(void)
-+{
-+	vfree(stream.workspace);
-+	unregister_filesystem(&squashfs_fs_type);
-+	destroy_inodecache();
-+}
-+
-+
-+static struct kmem_cache * squashfs_inode_cachep;
-+
-+
-+static struct inode *squashfs_alloc_inode(struct super_block *sb)
-+{
-+	struct squashfs_inode_info *ei;
-+	ei = kmem_cache_alloc(squashfs_inode_cachep, GFP_KERNEL);
-+	if (!ei)
-+		return NULL;
-+	return &ei->vfs_inode;
-+}
-+
-+
-+static void squashfs_destroy_inode(struct inode *inode)
-+{
-+	kmem_cache_free(squashfs_inode_cachep, SQUASHFS_I(inode));
-+}
-+
-+
-+static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flags)
-+{
-+	struct squashfs_inode_info *ei = foo;
-+
-+	inode_init_once(&ei->vfs_inode);
-+}
-+
-+
-+static int __init init_inodecache(void)
-+{
-+	squashfs_inode_cachep = kmem_cache_create("squashfs_inode_cache",
-+	     sizeof(struct squashfs_inode_info),
-+	     0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT,
-+	     init_once);
-+	if (squashfs_inode_cachep == NULL)
-+		return -ENOMEM;
-+	return 0;
-+}
-+
-+
-+static void destroy_inodecache(void)
-+{
-+	kmem_cache_destroy(squashfs_inode_cachep);
-+}
-+
-+
-+module_init(init_squashfs_fs);
-+module_exit(exit_squashfs_fs);
-+MODULE_DESCRIPTION("squashfs, a compressed read-only filesystem");
-+MODULE_AUTHOR("Phillip Lougher <phillip@lougher.org.uk>");
-+MODULE_LICENSE("GPL");
---- /dev/null
-+++ b/fs/squashfs/Makefile
-@@ -0,0 +1,7 @@
-+#
-+# Makefile for the linux squashfs routines.
-+#
-+
-+obj-$(CONFIG_SQUASHFS) += squashfs.o
-+squashfs-y += inode.o
-+squashfs-y += squashfs2_0.o
---- /dev/null
-+++ b/fs/squashfs/squashfs2_0.c
-@@ -0,0 +1,758 @@
-+/*
-+ * Squashfs - a compressed read only filesystem for Linux
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006
-+ * Phillip Lougher <phillip@lougher.org.uk>
-+ *
-+ * 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,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ *
-+ * squashfs2_0.c
-+ */
-+
-+#include <linux/types.h>
-+#include <linux/squashfs_fs.h>
-+#include <linux/module.h>
-+#include <linux/errno.h>
-+#include <linux/slab.h>
-+#include <linux/fs.h>
-+#include <linux/smp_lock.h>
-+#include <linux/slab.h>
-+#include <linux/squashfs_fs_sb.h>
-+#include <linux/squashfs_fs_i.h>
-+#include <linux/buffer_head.h>
-+#include <linux/vfs.h>
-+#include <linux/init.h>
-+#include <linux/dcache.h>
-+#include <linux/wait.h>
-+#include <linux/zlib.h>
-+#include <linux/blkdev.h>
-+#include <linux/vmalloc.h>
-+#include <asm/uaccess.h>
-+#include <asm/semaphore.h>
-+
-+#include "squashfs.h"
-+static int squashfs_readdir_2(struct file *file, void *dirent, filldir_t filldir);
-+static struct dentry *squashfs_lookup_2(struct inode *, struct dentry *,
-+				struct nameidata *);
-+
-+static struct file_operations squashfs_dir_ops_2 = {
-+	.read = generic_read_dir,
-+	.readdir = squashfs_readdir_2
-+};
-+
-+static struct inode_operations squashfs_dir_inode_ops_2 = {
-+	.lookup = squashfs_lookup_2
-+};
-+
-+static unsigned char squashfs_filetype_table[] = {
-+	DT_UNKNOWN, DT_DIR, DT_REG, DT_LNK, DT_BLK, DT_CHR, DT_FIFO, DT_SOCK
-+};
-+
-+static int read_fragment_index_table_2(struct super_block *s)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+
-+	if (!(msblk->fragment_index_2 = kmalloc(SQUASHFS_FRAGMENT_INDEX_BYTES_2
-+					(sblk->fragments), GFP_KERNEL))) {
-+		ERROR("Failed to allocate uid/gid table\n");
-+		return 0;
-+	}
-+
-+	if (SQUASHFS_FRAGMENT_INDEX_BYTES_2(sblk->fragments) &&
-+					!squashfs_read_data(s, (char *)
-+					msblk->fragment_index_2,
-+					sblk->fragment_table_start,
-+					SQUASHFS_FRAGMENT_INDEX_BYTES_2
-+					(sblk->fragments) |
-+					SQUASHFS_COMPRESSED_BIT_BLOCK, NULL)) {
-+		ERROR("unable to read fragment index table\n");
-+		return 0;
-+	}
-+
-+	if (msblk->swap) {
-+		int i;
-+		unsigned int fragment;
-+
-+		for (i = 0; i < SQUASHFS_FRAGMENT_INDEXES_2(sblk->fragments);
-+									i++) {
-+			SQUASHFS_SWAP_FRAGMENT_INDEXES_2((&fragment),
-+						&msblk->fragment_index_2[i], 1);
-+			msblk->fragment_index_2[i] = fragment;
-+		}
-+	}
-+
-+	return 1;
-+}
-+
-+
-+static int get_fragment_location_2(struct super_block *s, unsigned int fragment,
-+				long long *fragment_start_block,
-+				unsigned int *fragment_size)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	long long start_block =
-+		msblk->fragment_index_2[SQUASHFS_FRAGMENT_INDEX_2(fragment)];
-+	int offset = SQUASHFS_FRAGMENT_INDEX_OFFSET_2(fragment);
-+	struct squashfs_fragment_entry_2 fragment_entry;
-+
-+	if (msblk->swap) {
-+		struct squashfs_fragment_entry_2 sfragment_entry;
-+
-+		if (!squashfs_get_cached_block(s, (char *) &sfragment_entry,
-+					start_block, offset,
-+					sizeof(sfragment_entry), &start_block,
-+					&offset))
-+			goto out;
-+		SQUASHFS_SWAP_FRAGMENT_ENTRY_2(&fragment_entry, &sfragment_entry);
-+	} else
-+		if (!squashfs_get_cached_block(s, (char *) &fragment_entry,
-+					start_block, offset,
-+					sizeof(fragment_entry), &start_block,
-+					&offset))
-+			goto out;
-+
-+	*fragment_start_block = fragment_entry.start_block;
-+	*fragment_size = fragment_entry.size;
-+
-+	return 1;
-+
-+out:
-+	return 0;
-+}
-+
-+
-+static struct inode *squashfs_new_inode(struct super_block *s,
-+		struct squashfs_base_inode_header_2 *inodeb, unsigned int ino)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	struct inode *i = new_inode(s);
-+
-+	if (i) {
-+		i->i_ino = ino;
-+		i->i_mtime.tv_sec = sblk->mkfs_time;
-+		i->i_atime.tv_sec = sblk->mkfs_time;
-+		i->i_ctime.tv_sec = sblk->mkfs_time;
-+		i->i_uid = msblk->uid[inodeb->uid];
-+		i->i_mode = inodeb->mode;
-+		i->i_nlink = 1;
-+		i->i_size = 0;
-+		if (inodeb->guid == SQUASHFS_GUIDS)
-+			i->i_gid = i->i_uid;
-+		else
-+			i->i_gid = msblk->guid[inodeb->guid];
-+	}
-+
-+	return i;
-+}
-+
-+
-+static struct inode *squashfs_iget_2(struct super_block *s, squashfs_inode_t inode)
-+{
-+	struct inode *i;
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	unsigned int block = SQUASHFS_INODE_BLK(inode) +
-+		sblk->inode_table_start;
-+	unsigned int offset = SQUASHFS_INODE_OFFSET(inode);
-+	unsigned int ino = SQUASHFS_MK_VFS_INODE(block
-+		- sblk->inode_table_start, offset);
-+	long long next_block;
-+	unsigned int next_offset;
-+	union squashfs_inode_header_2 id, sid;
-+	struct squashfs_base_inode_header_2 *inodeb = &id.base,
-+					  *sinodeb = &sid.base;
-+
-+	TRACE("Entered squashfs_iget\n");
-+
-+	if (msblk->swap) {
-+		if (!squashfs_get_cached_block(s, (char *) sinodeb, block,
-+					offset, sizeof(*sinodeb), &next_block,
-+					&next_offset))
-+			goto failed_read;
-+		SQUASHFS_SWAP_BASE_INODE_HEADER_2(inodeb, sinodeb,
-+					sizeof(*sinodeb));
-+	} else
-+		if (!squashfs_get_cached_block(s, (char *) inodeb, block,
-+					offset, sizeof(*inodeb), &next_block,
-+					&next_offset))
-+			goto failed_read;
-+
-+	switch(inodeb->inode_type) {
-+		case SQUASHFS_FILE_TYPE: {
-+			struct squashfs_reg_inode_header_2 *inodep = &id.reg;
-+			struct squashfs_reg_inode_header_2 *sinodep = &sid.reg;
-+			long long frag_blk;
-+			unsigned int frag_size;
-+
-+			if (msblk->swap) {
-+				if (!squashfs_get_cached_block(s, (char *)
-+						sinodep, block, offset,
-+						sizeof(*sinodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+				SQUASHFS_SWAP_REG_INODE_HEADER_2(inodep, sinodep);
-+			} else
-+				if (!squashfs_get_cached_block(s, (char *)
-+						inodep, block, offset,
-+						sizeof(*inodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+			frag_blk = SQUASHFS_INVALID_BLK;
-+			if (inodep->fragment != SQUASHFS_INVALID_FRAG &&
-+					!get_fragment_location_2(s,
-+					inodep->fragment, &frag_blk, &frag_size))
-+				goto failed_read;
-+
-+			if((i = squashfs_new_inode(s, inodeb, ino)) == NULL)
-+				goto failed_read1;
-+
-+			i->i_size = inodep->file_size;
-+			i->i_fop = &generic_ro_fops;
-+			i->i_mode |= S_IFREG;
-+			i->i_mtime.tv_sec = inodep->mtime;
-+			i->i_atime.tv_sec = inodep->mtime;
-+			i->i_ctime.tv_sec = inodep->mtime;
-+			i->i_blocks = ((i->i_size - 1) >> 9) + 1;
-+			i->i_blksize = PAGE_CACHE_SIZE;
-+			SQUASHFS_I(i)->u.s1.fragment_start_block = frag_blk;
-+			SQUASHFS_I(i)->u.s1.fragment_size = frag_size;
-+			SQUASHFS_I(i)->u.s1.fragment_offset = inodep->offset;
-+			SQUASHFS_I(i)->start_block = inodep->start_block;
-+			SQUASHFS_I(i)->u.s1.block_list_start = next_block;
-+			SQUASHFS_I(i)->offset = next_offset;
-+			if (sblk->block_size > 4096)
-+				i->i_data.a_ops = &squashfs_aops;
-+			else
-+				i->i_data.a_ops = &squashfs_aops_4K;
-+
-+			TRACE("File inode %x:%x, start_block %x, "
-+					"block_list_start %llx, offset %x\n",
-+					SQUASHFS_INODE_BLK(inode), offset,
-+					inodep->start_block, next_block,
-+					next_offset);
-+			break;
-+		}
-+		case SQUASHFS_DIR_TYPE: {
-+			struct squashfs_dir_inode_header_2 *inodep = &id.dir;
-+			struct squashfs_dir_inode_header_2 *sinodep = &sid.dir;
-+
-+			if (msblk->swap) {
-+				if (!squashfs_get_cached_block(s, (char *)
-+						sinodep, block, offset,
-+						sizeof(*sinodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+				SQUASHFS_SWAP_DIR_INODE_HEADER_2(inodep, sinodep);
-+			} else
-+				if (!squashfs_get_cached_block(s, (char *)
-+						inodep, block, offset,
-+						sizeof(*inodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+			if((i = squashfs_new_inode(s, inodeb, ino)) == NULL)
-+				goto failed_read1;
-+
-+			i->i_size = inodep->file_size;
-+			i->i_op = &squashfs_dir_inode_ops_2;
-+			i->i_fop = &squashfs_dir_ops_2;
-+			i->i_mode |= S_IFDIR;
-+			i->i_mtime.tv_sec = inodep->mtime;
-+			i->i_atime.tv_sec = inodep->mtime;
-+			i->i_ctime.tv_sec = inodep->mtime;
-+			SQUASHFS_I(i)->start_block = inodep->start_block;
-+			SQUASHFS_I(i)->offset = inodep->offset;
-+			SQUASHFS_I(i)->u.s2.directory_index_count = 0;
-+			SQUASHFS_I(i)->u.s2.parent_inode = 0;
-+
-+			TRACE("Directory inode %x:%x, start_block %x, offset "
-+					"%x\n", SQUASHFS_INODE_BLK(inode),
-+					offset, inodep->start_block,
-+					inodep->offset);
-+			break;
-+		}
-+		case SQUASHFS_LDIR_TYPE: {
-+			struct squashfs_ldir_inode_header_2 *inodep = &id.ldir;
-+			struct squashfs_ldir_inode_header_2 *sinodep = &sid.ldir;
-+
-+			if (msblk->swap) {
-+				if (!squashfs_get_cached_block(s, (char *)
-+						sinodep, block, offset,
-+						sizeof(*sinodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+				SQUASHFS_SWAP_LDIR_INODE_HEADER_2(inodep,
-+						sinodep);
-+			} else
-+				if (!squashfs_get_cached_block(s, (char *)
-+						inodep, block, offset,
-+						sizeof(*inodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+			if((i = squashfs_new_inode(s, inodeb, ino)) == NULL)
-+				goto failed_read1;
-+
-+			i->i_size = inodep->file_size;
-+			i->i_op = &squashfs_dir_inode_ops_2;
-+			i->i_fop = &squashfs_dir_ops_2;
-+			i->i_mode |= S_IFDIR;
-+			i->i_mtime.tv_sec = inodep->mtime;
-+			i->i_atime.tv_sec = inodep->mtime;
-+			i->i_ctime.tv_sec = inodep->mtime;
-+			SQUASHFS_I(i)->start_block = inodep->start_block;
-+			SQUASHFS_I(i)->offset = inodep->offset;
-+			SQUASHFS_I(i)->u.s2.directory_index_start = next_block;
-+			SQUASHFS_I(i)->u.s2.directory_index_offset =
-+								next_offset;
-+			SQUASHFS_I(i)->u.s2.directory_index_count =
-+								inodep->i_count;
-+			SQUASHFS_I(i)->u.s2.parent_inode = 0;
-+
-+			TRACE("Long directory inode %x:%x, start_block %x, "
-+					"offset %x\n",
-+					SQUASHFS_INODE_BLK(inode), offset,
-+					inodep->start_block, inodep->offset);
-+			break;
-+		}
-+		case SQUASHFS_SYMLINK_TYPE: {
-+			struct squashfs_symlink_inode_header_2 *inodep =
-+								&id.symlink;
-+			struct squashfs_symlink_inode_header_2 *sinodep =
-+								&sid.symlink;
-+
-+			if (msblk->swap) {
-+				if (!squashfs_get_cached_block(s, (char *)
-+						sinodep, block, offset,
-+						sizeof(*sinodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+				SQUASHFS_SWAP_SYMLINK_INODE_HEADER_2(inodep,
-+								sinodep);
-+			} else
-+				if (!squashfs_get_cached_block(s, (char *)
-+						inodep, block, offset,
-+						sizeof(*inodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+			if((i = squashfs_new_inode(s, inodeb, ino)) == NULL)
-+				goto failed_read1;
-+
-+			i->i_size = inodep->symlink_size;
-+			i->i_op = &page_symlink_inode_operations;
-+			i->i_data.a_ops = &squashfs_symlink_aops;
-+			i->i_mode |= S_IFLNK;
-+			SQUASHFS_I(i)->start_block = next_block;
-+			SQUASHFS_I(i)->offset = next_offset;
-+
-+			TRACE("Symbolic link inode %x:%x, start_block %llx, "
-+					"offset %x\n",
-+					SQUASHFS_INODE_BLK(inode), offset,
-+					next_block, next_offset);
-+			break;
-+		 }
-+		 case SQUASHFS_BLKDEV_TYPE:
-+		 case SQUASHFS_CHRDEV_TYPE: {
-+			struct squashfs_dev_inode_header_2 *inodep = &id.dev;
-+			struct squashfs_dev_inode_header_2 *sinodep = &sid.dev;
-+
-+			if (msblk->swap) {
-+				if (!squashfs_get_cached_block(s, (char *)
-+						sinodep, block, offset,
-+						sizeof(*sinodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+				SQUASHFS_SWAP_DEV_INODE_HEADER_2(inodep, sinodep);
-+			} else
-+				if (!squashfs_get_cached_block(s, (char *)
-+						inodep, block, offset,
-+						sizeof(*inodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+			if ((i = squashfs_new_inode(s, inodeb, ino)) == NULL)
-+				goto failed_read1;
-+
-+			i->i_mode |= (inodeb->inode_type ==
-+					SQUASHFS_CHRDEV_TYPE) ?  S_IFCHR :
-+					S_IFBLK;
-+			init_special_inode(i, i->i_mode,
-+					old_decode_dev(inodep->rdev));
-+
-+			TRACE("Device inode %x:%x, rdev %x\n",
-+					SQUASHFS_INODE_BLK(inode), offset,
-+					inodep->rdev);
-+			break;
-+		 }
-+		 case SQUASHFS_FIFO_TYPE:
-+		 case SQUASHFS_SOCKET_TYPE: {
-+			if ((i = squashfs_new_inode(s, inodeb, ino)) == NULL)
-+				goto failed_read1;
-+
-+			i->i_mode |= (inodeb->inode_type == SQUASHFS_FIFO_TYPE)
-+							? S_IFIFO : S_IFSOCK;
-+			init_special_inode(i, i->i_mode, 0);
-+			break;
-+		 }
-+		 default:
-+			ERROR("Unknown inode type %d in squashfs_iget!\n",
-+					inodeb->inode_type);
-+			goto failed_read1;
-+	}
-+
-+	insert_inode_hash(i);
-+	return i;
-+
-+failed_read:
-+	ERROR("Unable to read inode [%x:%x]\n", block, offset);
-+
-+failed_read1:
-+	return NULL;
-+}
-+
-+
-+static int get_dir_index_using_offset(struct super_block *s, long long
-+				*next_block, unsigned int *next_offset,
-+				long long index_start,
-+				unsigned int index_offset, int i_count,
-+				long long f_pos)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	int i, length = 0;
-+	struct squashfs_dir_index_2 index;
-+
-+	TRACE("Entered get_dir_index_using_offset, i_count %d, f_pos %d\n",
-+					i_count, (unsigned int) f_pos);
-+
-+	if (f_pos == 0)
-+		goto finish;
-+
-+	for (i = 0; i < i_count; i++) {
-+		if (msblk->swap) {
-+			struct squashfs_dir_index_2 sindex;
-+			squashfs_get_cached_block(s, (char *) &sindex,
-+					index_start, index_offset,
-+					sizeof(sindex), &index_start,
-+					&index_offset);
-+			SQUASHFS_SWAP_DIR_INDEX_2(&index, &sindex);
-+		} else
-+			squashfs_get_cached_block(s, (char *) &index,
-+					index_start, index_offset,
-+					sizeof(index), &index_start,
-+					&index_offset);
-+
-+		if (index.index > f_pos)
-+			break;
-+
-+		squashfs_get_cached_block(s, NULL, index_start, index_offset,
-+					index.size + 1, &index_start,
-+					&index_offset);
-+
-+		length = index.index;
-+		*next_block = index.start_block + sblk->directory_table_start;
-+	}
-+
-+	*next_offset = (length + *next_offset) % SQUASHFS_METADATA_SIZE;
-+
-+finish:
-+	return length;
-+}
-+
-+
-+static int get_dir_index_using_name(struct super_block *s, long long
-+				*next_block, unsigned int *next_offset,
-+				long long index_start,
-+				unsigned int index_offset, int i_count,
-+				const char *name, int size)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	int i, length = 0;
-+	char buffer[sizeof(struct squashfs_dir_index_2) + SQUASHFS_NAME_LEN + 1];
-+	struct squashfs_dir_index_2 *index = (struct squashfs_dir_index_2 *) buffer;
-+	char str[SQUASHFS_NAME_LEN + 1];
-+
-+	TRACE("Entered get_dir_index_using_name, i_count %d\n", i_count);
-+
-+	strncpy(str, name, size);
-+	str[size] = '\0';
-+
-+	for (i = 0; i < i_count; i++) {
-+		if (msblk->swap) {
-+			struct squashfs_dir_index_2 sindex;
-+			squashfs_get_cached_block(s, (char *) &sindex,
-+					index_start, index_offset,
-+					sizeof(sindex), &index_start,
-+					&index_offset);
-+			SQUASHFS_SWAP_DIR_INDEX_2(index, &sindex);
-+		} else
-+			squashfs_get_cached_block(s, (char *) index,
-+					index_start, index_offset,
-+					sizeof(struct squashfs_dir_index_2),
-+					&index_start, &index_offset);
-+
-+		squashfs_get_cached_block(s, index->name, index_start,
-+					index_offset, index->size + 1,
-+					&index_start, &index_offset);
-+
-+		index->name[index->size + 1] = '\0';
-+
-+		if (strcmp(index->name, str) > 0)
-+			break;
-+
-+		length = index->index;
-+		*next_block = index->start_block + sblk->directory_table_start;
-+	}
-+
-+	*next_offset = (length + *next_offset) % SQUASHFS_METADATA_SIZE;
-+	return length;
-+}
-+
-+
-+static int squashfs_readdir_2(struct file *file, void *dirent, filldir_t filldir)
-+{
-+	struct inode *i = file->f_dentry->d_inode;
-+	struct squashfs_sb_info *msblk = i->i_sb->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	long long next_block = SQUASHFS_I(i)->start_block +
-+		sblk->directory_table_start;
-+	int next_offset = SQUASHFS_I(i)->offset, length = 0, dirs_read = 0,
-+		dir_count;
-+	struct squashfs_dir_header_2 dirh;
-+	char buffer[sizeof(struct squashfs_dir_entry_2) + SQUASHFS_NAME_LEN + 1];
-+	struct squashfs_dir_entry_2 *dire = (struct squashfs_dir_entry_2 *) buffer;
-+
-+	TRACE("Entered squashfs_readdir_2 [%llx:%x]\n", next_block, next_offset);
-+
-+	length = get_dir_index_using_offset(i->i_sb, &next_block, &next_offset,
-+				SQUASHFS_I(i)->u.s2.directory_index_start,
-+				SQUASHFS_I(i)->u.s2.directory_index_offset,
-+				SQUASHFS_I(i)->u.s2.directory_index_count,
-+				file->f_pos);
-+
-+	while (length < i_size_read(i)) {
-+		/* read directory header */
-+		if (msblk->swap) {
-+			struct squashfs_dir_header_2 sdirh;
-+
-+			if (!squashfs_get_cached_block(i->i_sb, (char *) &sdirh,
-+					next_block, next_offset, sizeof(sdirh),
-+					&next_block, &next_offset))
-+				goto failed_read;
-+
-+			length += sizeof(sdirh);
-+			SQUASHFS_SWAP_DIR_HEADER_2(&dirh, &sdirh);
-+		} else {
-+			if (!squashfs_get_cached_block(i->i_sb, (char *) &dirh,
-+					next_block, next_offset, sizeof(dirh),
-+					&next_block, &next_offset))
-+				goto failed_read;
-+
-+			length += sizeof(dirh);
-+		}
-+
-+		dir_count = dirh.count + 1;
-+		while (dir_count--) {
-+			if (msblk->swap) {
-+				struct squashfs_dir_entry_2 sdire;
-+				if (!squashfs_get_cached_block(i->i_sb, (char *)
-+						&sdire, next_block, next_offset,
-+						sizeof(sdire), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+				length += sizeof(sdire);
-+				SQUASHFS_SWAP_DIR_ENTRY_2(dire, &sdire);
-+			} else {
-+				if (!squashfs_get_cached_block(i->i_sb, (char *)
-+						dire, next_block, next_offset,
-+						sizeof(*dire), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+				length += sizeof(*dire);
-+			}
-+
-+			if (!squashfs_get_cached_block(i->i_sb, dire->name,
-+						next_block, next_offset,
-+						dire->size + 1, &next_block,
-+						&next_offset))
-+				goto failed_read;
-+
-+			length += dire->size + 1;
-+
-+			if (file->f_pos >= length)
-+				continue;
-+
-+			dire->name[dire->size + 1] = '\0';
-+
-+			TRACE("Calling filldir(%x, %s, %d, %d, %x:%x, %d)\n",
-+					(unsigned int) dirent, dire->name,
-+					dire->size + 1, (int) file->f_pos,
-+					dirh.start_block, dire->offset,
-+					squashfs_filetype_table[dire->type]);
-+
-+			if (filldir(dirent, dire->name, dire->size + 1,
-+					file->f_pos, SQUASHFS_MK_VFS_INODE(
-+					dirh.start_block, dire->offset),
-+					squashfs_filetype_table[dire->type])
-+					< 0) {
-+				TRACE("Filldir returned less than 0\n");
-+				goto finish;
-+			}
-+			file->f_pos = length;
-+			dirs_read++;
-+		}
-+	}
-+
-+finish:
-+	return dirs_read;
-+
-+failed_read:
-+	ERROR("Unable to read directory block [%llx:%x]\n", next_block,
-+		next_offset);
-+	return 0;
-+}
-+
-+
-+static struct dentry *squashfs_lookup_2(struct inode *i, struct dentry *dentry,
-+				struct nameidata *nd)
-+{
-+	const unsigned char *name = dentry->d_name.name;
-+	int len = dentry->d_name.len;
-+	struct inode *inode = NULL;
-+	struct squashfs_sb_info *msblk = i->i_sb->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	long long next_block = SQUASHFS_I(i)->start_block +
-+				sblk->directory_table_start;
-+	int next_offset = SQUASHFS_I(i)->offset, length = 0,
-+				dir_count;
-+	struct squashfs_dir_header_2 dirh;
-+	char buffer[sizeof(struct squashfs_dir_entry_2) + SQUASHFS_NAME_LEN];
-+	struct squashfs_dir_entry_2 *dire = (struct squashfs_dir_entry_2 *) buffer;
-+	int sorted = sblk->s_major == 2 && sblk->s_minor >= 1;
-+
-+	TRACE("Entered squashfs_lookup [%llx:%x]\n", next_block, next_offset);
-+
-+	if (len > SQUASHFS_NAME_LEN)
-+		goto exit_loop;
-+
-+	length = get_dir_index_using_name(i->i_sb, &next_block, &next_offset,
-+				SQUASHFS_I(i)->u.s2.directory_index_start,
-+				SQUASHFS_I(i)->u.s2.directory_index_offset,
-+				SQUASHFS_I(i)->u.s2.directory_index_count, name,
-+				len);
-+
-+	while (length < i_size_read(i)) {
-+		/* read directory header */
-+		if (msblk->swap) {
-+			struct squashfs_dir_header_2 sdirh;
-+			if (!squashfs_get_cached_block(i->i_sb, (char *) &sdirh,
-+					next_block, next_offset, sizeof(sdirh),
-+					&next_block, &next_offset))
-+				goto failed_read;
-+
-+			length += sizeof(sdirh);
-+			SQUASHFS_SWAP_DIR_HEADER_2(&dirh, &sdirh);
-+		} else {
-+			if (!squashfs_get_cached_block(i->i_sb, (char *) &dirh,
-+					next_block, next_offset, sizeof(dirh),
-+					&next_block, &next_offset))
-+				goto failed_read;
-+
-+			length += sizeof(dirh);
-+		}
-+
-+		dir_count = dirh.count + 1;
-+		while (dir_count--) {
-+			if (msblk->swap) {
-+				struct squashfs_dir_entry_2 sdire;
-+				if (!squashfs_get_cached_block(i->i_sb, (char *)
-+						&sdire, next_block,next_offset,
-+						sizeof(sdire), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+				length += sizeof(sdire);
-+				SQUASHFS_SWAP_DIR_ENTRY_2(dire, &sdire);
-+			} else {
-+				if (!squashfs_get_cached_block(i->i_sb, (char *)
-+						dire, next_block,next_offset,
-+						sizeof(*dire), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+				length += sizeof(*dire);
-+			}
-+
-+			if (!squashfs_get_cached_block(i->i_sb, dire->name,
-+					next_block, next_offset, dire->size + 1,
-+					&next_block, &next_offset))
-+				goto failed_read;
-+
-+			length += dire->size + 1;
-+
-+			if (sorted && name[0] < dire->name[0])
-+				goto exit_loop;
-+
-+			if ((len == dire->size + 1) && !strncmp(name,
-+						dire->name, len)) {
-+				squashfs_inode_t ino =
-+					SQUASHFS_MKINODE(dirh.start_block,
-+					dire->offset);
-+
-+				TRACE("calling squashfs_iget for directory "
-+					"entry %s, inode %x:%x, %lld\n", name,
-+					dirh.start_block, dire->offset, ino);
-+
-+				inode = (msblk->iget)(i->i_sb, ino);
-+
-+				goto exit_loop;
-+			}
-+		}
-+	}
-+
-+exit_loop:
-+	d_add(dentry, inode);
-+	return ERR_PTR(0);
-+
-+failed_read:
-+	ERROR("Unable to read directory block [%llx:%x]\n", next_block,
-+		next_offset);
-+	goto exit_loop;
-+}
-+
-+
-+int squashfs_2_0_supported(struct squashfs_sb_info *msblk)
-+{
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+
-+	msblk->iget = squashfs_iget_2;
-+	msblk->read_fragment_index_table = read_fragment_index_table_2;
-+
-+	sblk->bytes_used = sblk->bytes_used_2;
-+	sblk->uid_start = sblk->uid_start_2;
-+	sblk->guid_start = sblk->guid_start_2;
-+	sblk->inode_table_start = sblk->inode_table_start_2;
-+	sblk->directory_table_start = sblk->directory_table_start_2;
-+	sblk->fragment_table_start = sblk->fragment_table_start_2;
-+
-+	return 1;
-+}
---- /dev/null
-+++ b/fs/squashfs/squashfs.h
-@@ -0,0 +1,86 @@
-+/*
-+ * Squashfs - a compressed read only filesystem for Linux
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006
-+ * Phillip Lougher <phillip@lougher.org.uk>
-+ *
-+ * 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,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ *
-+ * squashfs.h
-+ */
-+
-+#ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY
-+#undef CONFIG_SQUASHFS_1_0_COMPATIBILITY
-+#endif
-+
-+#ifdef SQUASHFS_TRACE
-+#define TRACE(s, args...)	printk(KERN_NOTICE "SQUASHFS: "s, ## args)
-+#else
-+#define TRACE(s, args...)	{}
-+#endif
-+
-+#define ERROR(s, args...)	printk(KERN_ERR "SQUASHFS error: "s, ## args)
-+
-+#define SERROR(s, args...)	do { \
-+				if (!silent) \
-+				printk(KERN_ERR "SQUASHFS error: "s, ## args);\
-+				} while(0)
-+
-+#define WARNING(s, args...)	printk(KERN_WARNING "SQUASHFS: "s, ## args)
-+
-+static inline struct squashfs_inode_info *SQUASHFS_I(struct inode *inode)
-+{
-+	return list_entry(inode, struct squashfs_inode_info, vfs_inode);
-+}
-+
-+#if defined(CONFIG_SQUASHFS_1_0_COMPATIBILITY ) || defined(CONFIG_SQUASHFS_2_0_COMPATIBILITY)
-+#define SQSH_EXTERN
-+extern unsigned int squashfs_read_data(struct super_block *s, char *buffer,
-+				long long index, unsigned int length,
-+				long long *next_index);
-+extern int squashfs_get_cached_block(struct super_block *s, char *buffer,
-+				long long block, unsigned int offset,
-+				int length, long long *next_block,
-+				unsigned int *next_offset);
-+extern void release_cached_fragment(struct squashfs_sb_info *msblk, struct
-+					squashfs_fragment_cache *fragment);
-+extern struct squashfs_fragment_cache *get_cached_fragment(struct super_block
-+					*s, long long start_block,
-+					int length);
-+extern struct address_space_operations squashfs_symlink_aops;
-+extern struct address_space_operations squashfs_aops;
-+extern struct address_space_operations squashfs_aops_4K;
-+extern struct inode_operations squashfs_dir_inode_ops;
-+#else
-+#define SQSH_EXTERN static
-+#endif
-+
-+#ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY
-+extern int squashfs_1_0_supported(struct squashfs_sb_info *msblk);
-+#else
-+static inline int squashfs_1_0_supported(struct squashfs_sb_info *msblk)
-+{
-+	return 0;
-+}
-+#endif
-+
-+#ifdef CONFIG_SQUASHFS_2_0_COMPATIBILITY
-+extern int squashfs_2_0_supported(struct squashfs_sb_info *msblk);
-+#else
-+static inline int squashfs_2_0_supported(struct squashfs_sb_info *msblk)
-+{
-+	return 0;
-+}
-+#endif
---- a/include/linux/magic.h
-+++ b/include/linux/magic.h
-@@ -35,6 +35,9 @@
- #define REISER2FS_SUPER_MAGIC_STRING	"ReIsEr2Fs"
- #define REISER2FS_JR_SUPER_MAGIC_STRING	"ReIsEr3Fs"
- 
-+#define SQUASHFS_MAGIC			0x73717368
-+#define SQUASHFS_MAGIC_SWAP		0x68737173
-+
- #define SMB_SUPER_MAGIC		0x517B
- #define USBDEVICE_SUPER_MAGIC	0x9fa2
- #define CGROUP_SUPER_MAGIC	0x27e0eb
---- /dev/null
-+++ b/include/linux/squashfs_fs.h
-@@ -0,0 +1,911 @@
-+#ifndef SQUASHFS_FS
-+#define SQUASHFS_FS
-+
-+/*
-+ * Squashfs
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006
-+ * Phillip Lougher <phillip@lougher.org.uk>
-+ *
-+ * 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,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ *
-+ * squashfs_fs.h
-+ */
-+
-+#ifndef CONFIG_SQUASHFS_2_0_COMPATIBILITY
-+#define CONFIG_SQUASHFS_2_0_COMPATIBILITY
-+#endif
-+
-+#ifdef	CONFIG_SQUASHFS_VMALLOC
-+#define SQUASHFS_ALLOC(a)		vmalloc(a)
-+#define SQUASHFS_FREE(a)		vfree(a)
-+#else
-+#define SQUASHFS_ALLOC(a)		kmalloc(a, GFP_KERNEL)
-+#define SQUASHFS_FREE(a)		kfree(a)
-+#endif
-+#define SQUASHFS_CACHED_FRAGMENTS	CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE
-+#define SQUASHFS_MAJOR			3
-+#define SQUASHFS_MINOR			0
-+#define SQUASHFS_START			0
-+
-+/* size of metadata (inode and directory) blocks */
-+#define SQUASHFS_METADATA_SIZE		8192
-+#define SQUASHFS_METADATA_LOG		13
-+
-+/* default size of data blocks */
-+#define SQUASHFS_FILE_SIZE		65536
-+#define SQUASHFS_FILE_LOG		16
-+
-+#define SQUASHFS_FILE_MAX_SIZE		65536
-+
-+/* Max number of uids and gids */
-+#define SQUASHFS_UIDS			256
-+#define SQUASHFS_GUIDS			255
-+
-+/* Max length of filename (not 255) */
-+#define SQUASHFS_NAME_LEN		256
-+
-+#define SQUASHFS_INVALID		((long long) 0xffffffffffff)
-+#define SQUASHFS_INVALID_FRAG		((unsigned int) 0xffffffff)
-+#define SQUASHFS_INVALID_BLK		((long long) -1)
-+#define SQUASHFS_USED_BLK		((long long) -2)
-+
-+/* Filesystem flags */
-+#define SQUASHFS_NOI			0
-+#define SQUASHFS_NOD			1
-+#define SQUASHFS_CHECK			2
-+#define SQUASHFS_NOF			3
-+#define SQUASHFS_NO_FRAG		4
-+#define SQUASHFS_ALWAYS_FRAG		5
-+#define SQUASHFS_DUPLICATE		6
-+
-+#define SQUASHFS_BIT(flag, bit)		((flag >> bit) & 1)
-+
-+#define SQUASHFS_UNCOMPRESSED_INODES(flags)	SQUASHFS_BIT(flags, \
-+						SQUASHFS_NOI)
-+
-+#define SQUASHFS_UNCOMPRESSED_DATA(flags)	SQUASHFS_BIT(flags, \
-+						SQUASHFS_NOD)
-+
-+#define SQUASHFS_UNCOMPRESSED_FRAGMENTS(flags)	SQUASHFS_BIT(flags, \
-+						SQUASHFS_NOF)
-+
-+#define SQUASHFS_NO_FRAGMENTS(flags)		SQUASHFS_BIT(flags, \
-+						SQUASHFS_NO_FRAG)
-+
-+#define SQUASHFS_ALWAYS_FRAGMENTS(flags)	SQUASHFS_BIT(flags, \
-+						SQUASHFS_ALWAYS_FRAG)
-+
-+#define SQUASHFS_DUPLICATES(flags)		SQUASHFS_BIT(flags, \
-+						SQUASHFS_DUPLICATE)
-+
-+#define SQUASHFS_CHECK_DATA(flags)		SQUASHFS_BIT(flags, \
-+						SQUASHFS_CHECK)
-+
-+#define SQUASHFS_MKFLAGS(noi, nod, check_data, nof, no_frag, always_frag, \
-+		duplicate_checking)	(noi | (nod << 1) | (check_data << 2) \
-+		| (nof << 3) | (no_frag << 4) | (always_frag << 5) | \
-+		(duplicate_checking << 6))
-+
-+/* Max number of types and file types */
-+#define SQUASHFS_DIR_TYPE		1
-+#define SQUASHFS_FILE_TYPE		2
-+#define SQUASHFS_SYMLINK_TYPE		3
-+#define SQUASHFS_BLKDEV_TYPE		4
-+#define SQUASHFS_CHRDEV_TYPE		5
-+#define SQUASHFS_FIFO_TYPE		6
-+#define SQUASHFS_SOCKET_TYPE		7
-+#define SQUASHFS_LDIR_TYPE		8
-+#define SQUASHFS_LREG_TYPE		9
-+
-+/* 1.0 filesystem type definitions */
-+#define SQUASHFS_TYPES			5
-+#define SQUASHFS_IPC_TYPE		0
-+
-+/* Flag whether block is compressed or uncompressed, bit is set if block is
-+ * uncompressed */
-+#define SQUASHFS_COMPRESSED_BIT		(1 << 15)
-+
-+#define SQUASHFS_COMPRESSED_SIZE(B)	(((B) & ~SQUASHFS_COMPRESSED_BIT) ? \
-+		(B) & ~SQUASHFS_COMPRESSED_BIT :  SQUASHFS_COMPRESSED_BIT)
-+
-+#define SQUASHFS_COMPRESSED(B)		(!((B) & SQUASHFS_COMPRESSED_BIT))
-+
-+#define SQUASHFS_COMPRESSED_BIT_BLOCK		(1 << 24)
-+
-+#define SQUASHFS_COMPRESSED_SIZE_BLOCK(B)	(((B) & \
-+	~SQUASHFS_COMPRESSED_BIT_BLOCK) ? (B) & \
-+	~SQUASHFS_COMPRESSED_BIT_BLOCK : SQUASHFS_COMPRESSED_BIT_BLOCK)
-+
-+#define SQUASHFS_COMPRESSED_BLOCK(B)	(!((B) & SQUASHFS_COMPRESSED_BIT_BLOCK))
-+
-+/*
-+ * Inode number ops.  Inodes consist of a compressed block number, and an
-+ * uncompressed  offset within that block
-+ */
-+#define SQUASHFS_INODE_BLK(a)		((unsigned int) ((a) >> 16))
-+
-+#define SQUASHFS_INODE_OFFSET(a)	((unsigned int) ((a) & 0xffff))
-+
-+#define SQUASHFS_MKINODE(A, B)		((squashfs_inode_t)(((squashfs_inode_t) (A)\
-+					<< 16) + (B)))
-+
-+/* Compute 32 bit VFS inode number from squashfs inode number */
-+#define SQUASHFS_MK_VFS_INODE(a, b)	((unsigned int) (((a) << 8) + \
-+					((b) >> 2) + 1))
-+/* XXX */
-+
-+/* Translate between VFS mode and squashfs mode */
-+#define SQUASHFS_MODE(a)		((a) & 0xfff)
-+
-+/* fragment and fragment table defines */
-+#define SQUASHFS_FRAGMENT_BYTES(A)	(A * sizeof(struct squashfs_fragment_entry))
-+
-+#define SQUASHFS_FRAGMENT_INDEX(A)	(SQUASHFS_FRAGMENT_BYTES(A) / \
-+					SQUASHFS_METADATA_SIZE)
-+
-+#define SQUASHFS_FRAGMENT_INDEX_OFFSET(A)	(SQUASHFS_FRAGMENT_BYTES(A) % \
-+						SQUASHFS_METADATA_SIZE)
-+
-+#define SQUASHFS_FRAGMENT_INDEXES(A)	((SQUASHFS_FRAGMENT_BYTES(A) + \
-+					SQUASHFS_METADATA_SIZE - 1) / \
-+					SQUASHFS_METADATA_SIZE)
-+
-+#define SQUASHFS_FRAGMENT_INDEX_BYTES(A)	(SQUASHFS_FRAGMENT_INDEXES(A) *\
-+						sizeof(long long))
-+
-+/* cached data constants for filesystem */
-+#define SQUASHFS_CACHED_BLKS		8
-+
-+#define SQUASHFS_MAX_FILE_SIZE_LOG	64
-+
-+#define SQUASHFS_MAX_FILE_SIZE		((long long) 1 << \
-+					(SQUASHFS_MAX_FILE_SIZE_LOG - 2))
-+
-+#define SQUASHFS_MARKER_BYTE		0xff
-+
-+/* meta index cache */
-+#define SQUASHFS_META_INDEXES	(SQUASHFS_METADATA_SIZE / sizeof(unsigned int))
-+#define SQUASHFS_META_ENTRIES	31
-+#define SQUASHFS_META_NUMBER	8
-+#define SQUASHFS_SLOTS		4
-+
-+#include <linux/magic.h>
-+
-+struct meta_entry {
-+	long long		data_block;
-+	unsigned int		index_block;
-+	unsigned short		offset;
-+	unsigned short		pad;
-+};
-+
-+struct meta_index {
-+	unsigned int		inode_number;
-+	unsigned int		offset;
-+	unsigned short		entries;
-+	unsigned short		skip;
-+	unsigned short		locked;
-+	unsigned short		pad;
-+	struct meta_entry	meta_entry[SQUASHFS_META_ENTRIES];
-+};
-+
-+
-+/*
-+ * definitions for structures on disk
-+ */
-+
-+typedef long long		squashfs_block_t;
-+typedef long long		squashfs_inode_t;
-+
-+struct squashfs_super_block {
-+	unsigned int		s_magic;
-+	unsigned int		inodes;
-+	unsigned int		bytes_used_2;
-+	unsigned int		uid_start_2;
-+	unsigned int		guid_start_2;
-+	unsigned int		inode_table_start_2;
-+	unsigned int		directory_table_start_2;
-+	unsigned int		s_major:16;
-+	unsigned int		s_minor:16;
-+	unsigned int		block_size_1:16;
-+	unsigned int		block_log:16;
-+	unsigned int		flags:8;
-+	unsigned int		no_uids:8;
-+	unsigned int		no_guids:8;
-+	unsigned int		mkfs_time /* time of filesystem creation */;
-+	squashfs_inode_t	root_inode;
-+	unsigned int		block_size;
-+	unsigned int		fragments;
-+	unsigned int		fragment_table_start_2;
-+	long long		bytes_used;
-+	long long		uid_start;
-+	long long		guid_start;
-+	long long		inode_table_start;
-+	long long		directory_table_start;
-+	long long		fragment_table_start;
-+	long long		unused;
-+} __attribute__ ((packed));
-+
-+struct squashfs_dir_index {
-+	unsigned int		index;
-+	unsigned int		start_block;
-+	unsigned char		size;
-+	unsigned char		name[0];
-+} __attribute__ ((packed));
-+
-+#define SQUASHFS_BASE_INODE_HEADER		\
-+	unsigned int		inode_type:4;	\
-+	unsigned int		mode:12;	\
-+	unsigned int		uid:8;		\
-+	unsigned int		guid:8;		\
-+	unsigned int		mtime;		\
-+	unsigned int 		inode_number;
-+
-+struct squashfs_base_inode_header {
-+	SQUASHFS_BASE_INODE_HEADER;
-+} __attribute__ ((packed));
-+
-+struct squashfs_ipc_inode_header {
-+	SQUASHFS_BASE_INODE_HEADER;
-+	unsigned int		nlink;
-+} __attribute__ ((packed));
-+
-+struct squashfs_dev_inode_header {
-+	SQUASHFS_BASE_INODE_HEADER;
-+	unsigned int		nlink;
-+	unsigned short		rdev;
-+} __attribute__ ((packed));
-+
-+struct squashfs_symlink_inode_header {
-+	SQUASHFS_BASE_INODE_HEADER;
-+	unsigned int		nlink;
-+	unsigned short		symlink_size;
-+	char			symlink[0];
-+} __attribute__ ((packed));
-+
-+struct squashfs_reg_inode_header {
-+	SQUASHFS_BASE_INODE_HEADER;
-+	squashfs_block_t	start_block;
-+	unsigned int		fragment;
-+	unsigned int		offset;
-+	unsigned int		file_size;
-+	unsigned short		block_list[0];
-+} __attribute__ ((packed));
-+
-+struct squashfs_lreg_inode_header {
-+	SQUASHFS_BASE_INODE_HEADER;
-+	unsigned int		nlink;
-+	squashfs_block_t	start_block;
-+	unsigned int		fragment;
-+	unsigned int		offset;
-+	long long		file_size;
-+	unsigned short		block_list[0];
-+} __attribute__ ((packed));
-+
-+struct squashfs_dir_inode_header {
-+	SQUASHFS_BASE_INODE_HEADER;
-+	unsigned int		nlink;
-+	unsigned int		file_size:19;
-+	unsigned int		offset:13;
-+	unsigned int		start_block;
-+	unsigned int		parent_inode;
-+} __attribute__  ((packed));
-+
-+struct squashfs_ldir_inode_header {
-+	SQUASHFS_BASE_INODE_HEADER;
-+	unsigned int		nlink;
-+	unsigned int		file_size:27;
-+	unsigned int		offset:13;
-+	unsigned int		start_block;
-+	unsigned int		i_count:16;
-+	unsigned int		parent_inode;
-+	struct squashfs_dir_index	index[0];
-+} __attribute__  ((packed));
-+
-+union squashfs_inode_header {
-+	struct squashfs_base_inode_header	base;
-+	struct squashfs_dev_inode_header	dev;
-+	struct squashfs_symlink_inode_header	symlink;
-+	struct squashfs_reg_inode_header	reg;
-+	struct squashfs_lreg_inode_header	lreg;
-+	struct squashfs_dir_inode_header	dir;
-+	struct squashfs_ldir_inode_header	ldir;
-+	struct squashfs_ipc_inode_header	ipc;
-+};
-+
-+struct squashfs_dir_entry {
-+	unsigned int		offset:13;
-+	unsigned int		type:3;
-+	unsigned int		size:8;
-+	int			inode_number:16;
-+	char			name[0];
-+} __attribute__ ((packed));
-+
-+struct squashfs_dir_header {
-+	unsigned int		count:8;
-+	unsigned int		start_block;
-+	unsigned int		inode_number;
-+} __attribute__ ((packed));
-+
-+struct squashfs_fragment_entry {
-+	long long		start_block;
-+	unsigned int		size;
-+	unsigned int		unused;
-+} __attribute__ ((packed));
-+
-+extern int squashfs_uncompress_block(void *d, int dstlen, void *s, int srclen);
-+extern int squashfs_uncompress_init(void);
-+extern int squashfs_uncompress_exit(void);
-+
-+/*
-+ * macros to convert each packed bitfield structure from little endian to big
-+ * endian and vice versa.  These are needed when creating or using a filesystem
-+ * on a machine with different byte ordering to the target architecture.
-+ *
-+ */
-+
-+#define SQUASHFS_SWAP_START \
-+	int bits;\
-+	int b_pos;\
-+	unsigned long long val;\
-+	unsigned char *s;\
-+	unsigned char *d;
-+
-+#define SQUASHFS_SWAP_SUPER_BLOCK(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_MEMSET(s, d, sizeof(struct squashfs_super_block));\
-+	SQUASHFS_SWAP((s)->s_magic, d, 0, 32);\
-+	SQUASHFS_SWAP((s)->inodes, d, 32, 32);\
-+	SQUASHFS_SWAP((s)->bytes_used_2, d, 64, 32);\
-+	SQUASHFS_SWAP((s)->uid_start_2, d, 96, 32);\
-+	SQUASHFS_SWAP((s)->guid_start_2, d, 128, 32);\
-+	SQUASHFS_SWAP((s)->inode_table_start_2, d, 160, 32);\
-+	SQUASHFS_SWAP((s)->directory_table_start_2, d, 192, 32);\
-+	SQUASHFS_SWAP((s)->s_major, d, 224, 16);\
-+	SQUASHFS_SWAP((s)->s_minor, d, 240, 16);\
-+	SQUASHFS_SWAP((s)->block_size_1, d, 256, 16);\
-+	SQUASHFS_SWAP((s)->block_log, d, 272, 16);\
-+	SQUASHFS_SWAP((s)->flags, d, 288, 8);\
-+	SQUASHFS_SWAP((s)->no_uids, d, 296, 8);\
-+	SQUASHFS_SWAP((s)->no_guids, d, 304, 8);\
-+	SQUASHFS_SWAP((s)->mkfs_time, d, 312, 32);\
-+	SQUASHFS_SWAP((s)->root_inode, d, 344, 64);\
-+	SQUASHFS_SWAP((s)->block_size, d, 408, 32);\
-+	SQUASHFS_SWAP((s)->fragments, d, 440, 32);\
-+	SQUASHFS_SWAP((s)->fragment_table_start_2, d, 472, 32);\
-+	SQUASHFS_SWAP((s)->bytes_used, d, 504, 64);\
-+	SQUASHFS_SWAP((s)->uid_start, d, 568, 64);\
-+	SQUASHFS_SWAP((s)->guid_start, d, 632, 64);\
-+	SQUASHFS_SWAP((s)->inode_table_start, d, 696, 64);\
-+	SQUASHFS_SWAP((s)->directory_table_start, d, 760, 64);\
-+	SQUASHFS_SWAP((s)->fragment_table_start, d, 824, 64);\
-+	SQUASHFS_SWAP((s)->unused, d, 888, 64);\
-+}
-+
-+#define SQUASHFS_SWAP_BASE_INODE_CORE(s, d, n)\
-+	SQUASHFS_MEMSET(s, d, n);\
-+	SQUASHFS_SWAP((s)->inode_type, d, 0, 4);\
-+	SQUASHFS_SWAP((s)->mode, d, 4, 12);\
-+	SQUASHFS_SWAP((s)->uid, d, 16, 8);\
-+	SQUASHFS_SWAP((s)->guid, d, 24, 8);\
-+	SQUASHFS_SWAP((s)->mtime, d, 32, 32);\
-+	SQUASHFS_SWAP((s)->inode_number, d, 64, 32);
-+
-+#define SQUASHFS_SWAP_BASE_INODE_HEADER(s, d, n) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE(s, d, n)\
-+}
-+
-+#define SQUASHFS_SWAP_IPC_INODE_HEADER(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE(s, d, \
-+			sizeof(struct squashfs_ipc_inode_header))\
-+	SQUASHFS_SWAP((s)->nlink, d, 96, 32);\
-+}
-+
-+#define SQUASHFS_SWAP_DEV_INODE_HEADER(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE(s, d, \
-+			sizeof(struct squashfs_dev_inode_header)); \
-+	SQUASHFS_SWAP((s)->nlink, d, 96, 32);\
-+	SQUASHFS_SWAP((s)->rdev, d, 128, 16);\
-+}
-+
-+#define SQUASHFS_SWAP_SYMLINK_INODE_HEADER(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE(s, d, \
-+			sizeof(struct squashfs_symlink_inode_header));\
-+	SQUASHFS_SWAP((s)->nlink, d, 96, 32);\
-+	SQUASHFS_SWAP((s)->symlink_size, d, 128, 16);\
-+}
-+
-+#define SQUASHFS_SWAP_REG_INODE_HEADER(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE(s, d, \
-+			sizeof(struct squashfs_reg_inode_header));\
-+	SQUASHFS_SWAP((s)->start_block, d, 96, 64);\
-+	SQUASHFS_SWAP((s)->fragment, d, 160, 32);\
-+	SQUASHFS_SWAP((s)->offset, d, 192, 32);\
-+	SQUASHFS_SWAP((s)->file_size, d, 224, 32);\
-+}
-+
-+#define SQUASHFS_SWAP_LREG_INODE_HEADER(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE(s, d, \
-+			sizeof(struct squashfs_lreg_inode_header));\
-+	SQUASHFS_SWAP((s)->nlink, d, 96, 32);\
-+	SQUASHFS_SWAP((s)->start_block, d, 128, 64);\
-+	SQUASHFS_SWAP((s)->fragment, d, 192, 32);\
-+	SQUASHFS_SWAP((s)->offset, d, 224, 32);\
-+	SQUASHFS_SWAP((s)->file_size, d, 256, 64);\
-+}
-+
-+#define SQUASHFS_SWAP_DIR_INODE_HEADER(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE(s, d, \
-+			sizeof(struct squashfs_dir_inode_header));\
-+	SQUASHFS_SWAP((s)->nlink, d, 96, 32);\
-+	SQUASHFS_SWAP((s)->file_size, d, 128, 19);\
-+	SQUASHFS_SWAP((s)->offset, d, 147, 13);\
-+	SQUASHFS_SWAP((s)->start_block, d, 160, 32);\
-+	SQUASHFS_SWAP((s)->parent_inode, d, 192, 32);\
-+}
-+
-+#define SQUASHFS_SWAP_LDIR_INODE_HEADER(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE(s, d, \
-+			sizeof(struct squashfs_ldir_inode_header));\
-+	SQUASHFS_SWAP((s)->nlink, d, 96, 32);\
-+	SQUASHFS_SWAP((s)->file_size, d, 128, 27);\
-+	SQUASHFS_SWAP((s)->offset, d, 155, 13);\
-+	SQUASHFS_SWAP((s)->start_block, d, 168, 32);\
-+	SQUASHFS_SWAP((s)->i_count, d, 200, 16);\
-+	SQUASHFS_SWAP((s)->parent_inode, d, 216, 32);\
-+}
-+
-+#define SQUASHFS_SWAP_DIR_INDEX(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_MEMSET(s, d, sizeof(struct squashfs_dir_index));\
-+	SQUASHFS_SWAP((s)->index, d, 0, 32);\
-+	SQUASHFS_SWAP((s)->start_block, d, 32, 32);\
-+	SQUASHFS_SWAP((s)->size, d, 64, 8);\
-+}
-+
-+#define SQUASHFS_SWAP_DIR_HEADER(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_MEMSET(s, d, sizeof(struct squashfs_dir_header));\
-+	SQUASHFS_SWAP((s)->count, d, 0, 8);\
-+	SQUASHFS_SWAP((s)->start_block, d, 8, 32);\
-+	SQUASHFS_SWAP((s)->inode_number, d, 40, 32);\
-+}
-+
-+#define SQUASHFS_SWAP_DIR_ENTRY(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_MEMSET(s, d, sizeof(struct squashfs_dir_entry));\
-+	SQUASHFS_SWAP((s)->offset, d, 0, 13);\
-+	SQUASHFS_SWAP((s)->type, d, 13, 3);\
-+	SQUASHFS_SWAP((s)->size, d, 16, 8);\
-+	SQUASHFS_SWAP((s)->inode_number, d, 24, 16);\
-+}
-+
-+#define SQUASHFS_SWAP_FRAGMENT_ENTRY(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_MEMSET(s, d, sizeof(struct squashfs_fragment_entry));\
-+	SQUASHFS_SWAP((s)->start_block, d, 0, 64);\
-+	SQUASHFS_SWAP((s)->size, d, 64, 32);\
-+}
-+
-+#define SQUASHFS_SWAP_SHORTS(s, d, n) {\
-+	int entry;\
-+	int bit_position;\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_MEMSET(s, d, n * 2);\
-+	for(entry = 0, bit_position = 0; entry < n; entry++, bit_position += \
-+			16)\
-+		SQUASHFS_SWAP(s[entry], d, bit_position, 16);\
-+}
-+
-+#define SQUASHFS_SWAP_INTS(s, d, n) {\
-+	int entry;\
-+	int bit_position;\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_MEMSET(s, d, n * 4);\
-+	for(entry = 0, bit_position = 0; entry < n; entry++, bit_position += \
-+			32)\
-+		SQUASHFS_SWAP(s[entry], d, bit_position, 32);\
-+}
-+
-+#define SQUASHFS_SWAP_LONG_LONGS(s, d, n) {\
-+	int entry;\
-+	int bit_position;\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_MEMSET(s, d, n * 8);\
-+	for(entry = 0, bit_position = 0; entry < n; entry++, bit_position += \
-+			64)\
-+		SQUASHFS_SWAP(s[entry], d, bit_position, 64);\
-+}
-+
-+#define SQUASHFS_SWAP_DATA(s, d, n, bits) {\
-+	int entry;\
-+	int bit_position;\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_MEMSET(s, d, n * bits / 8);\
-+	for(entry = 0, bit_position = 0; entry < n; entry++, bit_position += \
-+			bits)\
-+		SQUASHFS_SWAP(s[entry], d, bit_position, bits);\
-+}
-+
-+#define SQUASHFS_SWAP_FRAGMENT_INDEXES(s, d, n) SQUASHFS_SWAP_LONG_LONGS(s, d, n)
-+
-+#ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY
-+
-+struct squashfs_base_inode_header_1 {
-+	unsigned int		inode_type:4;
-+	unsigned int		mode:12; /* protection */
-+	unsigned int		uid:4; /* index into uid table */
-+	unsigned int		guid:4; /* index into guid table */
-+} __attribute__ ((packed));
-+
-+struct squashfs_ipc_inode_header_1 {
-+	unsigned int		inode_type:4;
-+	unsigned int		mode:12; /* protection */
-+	unsigned int		uid:4; /* index into uid table */
-+	unsigned int		guid:4; /* index into guid table */
-+	unsigned int		type:4;
-+	unsigned int		offset:4;
-+} __attribute__ ((packed));
-+
-+struct squashfs_dev_inode_header_1 {
-+	unsigned int		inode_type:4;
-+	unsigned int		mode:12; /* protection */
-+	unsigned int		uid:4; /* index into uid table */
-+	unsigned int		guid:4; /* index into guid table */
-+	unsigned short		rdev;
-+} __attribute__ ((packed));
-+
-+struct squashfs_symlink_inode_header_1 {
-+	unsigned int		inode_type:4;
-+	unsigned int		mode:12; /* protection */
-+	unsigned int		uid:4; /* index into uid table */
-+	unsigned int		guid:4; /* index into guid table */
-+	unsigned short		symlink_size;
-+	char			symlink[0];
-+} __attribute__ ((packed));
-+
-+struct squashfs_reg_inode_header_1 {
-+	unsigned int		inode_type:4;
-+	unsigned int		mode:12; /* protection */
-+	unsigned int		uid:4; /* index into uid table */
-+	unsigned int		guid:4; /* index into guid table */
-+	unsigned int		mtime;
-+	unsigned int		start_block;
-+	unsigned int		file_size:32;
-+	unsigned short		block_list[0];
-+} __attribute__ ((packed));
-+
-+struct squashfs_dir_inode_header_1 {
-+	unsigned int		inode_type:4;
-+	unsigned int		mode:12; /* protection */
-+	unsigned int		uid:4; /* index into uid table */
-+	unsigned int		guid:4; /* index into guid table */
-+	unsigned int		file_size:19;
-+	unsigned int		offset:13;
-+	unsigned int		mtime;
-+	unsigned int		start_block:24;
-+} __attribute__  ((packed));
-+
-+#define SQUASHFS_SWAP_BASE_INODE_CORE_1(s, d, n) \
-+	SQUASHFS_MEMSET(s, d, n);\
-+	SQUASHFS_SWAP((s)->inode_type, d, 0, 4);\
-+	SQUASHFS_SWAP((s)->mode, d, 4, 12);\
-+	SQUASHFS_SWAP((s)->uid, d, 16, 4);\
-+	SQUASHFS_SWAP((s)->guid, d, 20, 4);
-+
-+#define SQUASHFS_SWAP_BASE_INODE_HEADER_1(s, d, n) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE_1(s, d, n)\
-+}
-+
-+#define SQUASHFS_SWAP_IPC_INODE_HEADER_1(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE_1(s, d, \
-+			sizeof(struct squashfs_ipc_inode_header_1));\
-+	SQUASHFS_SWAP((s)->type, d, 24, 4);\
-+	SQUASHFS_SWAP((s)->offset, d, 28, 4);\
-+}
-+
-+#define SQUASHFS_SWAP_DEV_INODE_HEADER_1(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE_1(s, d, \
-+			sizeof(struct squashfs_dev_inode_header_1));\
-+	SQUASHFS_SWAP((s)->rdev, d, 24, 16);\
-+}
-+
-+#define SQUASHFS_SWAP_SYMLINK_INODE_HEADER_1(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE_1(s, d, \
-+			sizeof(struct squashfs_symlink_inode_header_1));\
-+	SQUASHFS_SWAP((s)->symlink_size, d, 24, 16);\
-+}
-+
-+#define SQUASHFS_SWAP_REG_INODE_HEADER_1(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE_1(s, d, \
-+			sizeof(struct squashfs_reg_inode_header_1));\
-+	SQUASHFS_SWAP((s)->mtime, d, 24, 32);\
-+	SQUASHFS_SWAP((s)->start_block, d, 56, 32);\
-+	SQUASHFS_SWAP((s)->file_size, d, 88, 32);\
-+}
-+
-+#define SQUASHFS_SWAP_DIR_INODE_HEADER_1(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE_1(s, d, \
-+			sizeof(struct squashfs_dir_inode_header_1));\
-+	SQUASHFS_SWAP((s)->file_size, d, 24, 19);\
-+	SQUASHFS_SWAP((s)->offset, d, 43, 13);\
-+	SQUASHFS_SWAP((s)->mtime, d, 56, 32);\
-+	SQUASHFS_SWAP((s)->start_block, d, 88, 24);\
-+}
-+
-+#endif
-+
-+#ifdef CONFIG_SQUASHFS_2_0_COMPATIBILITY
-+
-+struct squashfs_dir_index_2 {
-+	unsigned int		index:27;
-+	unsigned int		start_block:29;
-+	unsigned char		size;
-+	unsigned char		name[0];
-+} __attribute__ ((packed));
-+
-+struct squashfs_base_inode_header_2 {
-+	unsigned int		inode_type:4;
-+	unsigned int		mode:12; /* protection */
-+	unsigned int		uid:8; /* index into uid table */
-+	unsigned int		guid:8; /* index into guid table */
-+} __attribute__ ((packed));
-+
-+struct squashfs_ipc_inode_header_2 {
-+	unsigned int		inode_type:4;
-+	unsigned int		mode:12; /* protection */
-+	unsigned int		uid:8; /* index into uid table */
-+	unsigned int		guid:8; /* index into guid table */
-+} __attribute__ ((packed));
-+
-+struct squashfs_dev_inode_header_2 {
-+	unsigned int		inode_type:4;
-+	unsigned int		mode:12; /* protection */
-+	unsigned int		uid:8; /* index into uid table */
-+	unsigned int		guid:8; /* index into guid table */
-+	unsigned short		rdev;
-+} __attribute__ ((packed));
-+
-+struct squashfs_symlink_inode_header_2 {
-+	unsigned int		inode_type:4;
-+	unsigned int		mode:12; /* protection */
-+	unsigned int		uid:8; /* index into uid table */
-+	unsigned int		guid:8; /* index into guid table */
-+	unsigned short		symlink_size;
-+	char			symlink[0];
-+} __attribute__ ((packed));
-+
-+struct squashfs_reg_inode_header_2 {
-+	unsigned int		inode_type:4;
-+	unsigned int		mode:12; /* protection */
-+	unsigned int		uid:8; /* index into uid table */
-+	unsigned int		guid:8; /* index into guid table */
-+	unsigned int		mtime;
-+	unsigned int		start_block;
-+	unsigned int		fragment;
-+	unsigned int		offset;
-+	unsigned int		file_size:32;
-+	unsigned short		block_list[0];
-+} __attribute__ ((packed));
-+
-+struct squashfs_dir_inode_header_2 {
-+	unsigned int		inode_type:4;
-+	unsigned int		mode:12; /* protection */
-+	unsigned int		uid:8; /* index into uid table */
-+	unsigned int		guid:8; /* index into guid table */
-+	unsigned int		file_size:19;
-+	unsigned int		offset:13;
-+	unsigned int		mtime;
-+	unsigned int		start_block:24;
-+} __attribute__  ((packed));
-+
-+struct squashfs_ldir_inode_header_2 {
-+	unsigned int		inode_type:4;
-+	unsigned int		mode:12; /* protection */
-+	unsigned int		uid:8; /* index into uid table */
-+	unsigned int		guid:8; /* index into guid table */
-+	unsigned int		file_size:27;
-+	unsigned int		offset:13;
-+	unsigned int		mtime;
-+	unsigned int		start_block:24;
-+	unsigned int		i_count:16;
-+	struct squashfs_dir_index_2	index[0];
-+} __attribute__  ((packed));
-+
-+union squashfs_inode_header_2 {
-+	struct squashfs_base_inode_header_2	base;
-+	struct squashfs_dev_inode_header_2	dev;
-+	struct squashfs_symlink_inode_header_2	symlink;
-+	struct squashfs_reg_inode_header_2	reg;
-+	struct squashfs_dir_inode_header_2	dir;
-+	struct squashfs_ldir_inode_header_2	ldir;
-+	struct squashfs_ipc_inode_header_2	ipc;
-+};
-+
-+struct squashfs_dir_header_2 {
-+	unsigned int		count:8;
-+	unsigned int		start_block:24;
-+} __attribute__ ((packed));
-+
-+struct squashfs_dir_entry_2 {
-+	unsigned int		offset:13;
-+	unsigned int		type:3;
-+	unsigned int		size:8;
-+	char			name[0];
-+} __attribute__ ((packed));
-+
-+struct squashfs_fragment_entry_2 {
-+	unsigned int		start_block;
-+	unsigned int		size;
-+} __attribute__ ((packed));
-+
-+#define SQUASHFS_SWAP_BASE_INODE_CORE_2(s, d, n)\
-+	SQUASHFS_MEMSET(s, d, n);\
-+	SQUASHFS_SWAP((s)->inode_type, d, 0, 4);\
-+	SQUASHFS_SWAP((s)->mode, d, 4, 12);\
-+	SQUASHFS_SWAP((s)->uid, d, 16, 8);\
-+	SQUASHFS_SWAP((s)->guid, d, 24, 8);\
-+
-+#define SQUASHFS_SWAP_BASE_INODE_HEADER_2(s, d, n) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE_2(s, d, n)\
-+}
-+
-+#define SQUASHFS_SWAP_IPC_INODE_HEADER_2(s, d) \
-+	SQUASHFS_SWAP_BASE_INODE_HEADER_2(s, d, sizeof(struct squashfs_ipc_inode_header_2))
-+
-+#define SQUASHFS_SWAP_DEV_INODE_HEADER_2(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE_2(s, d, \
-+			sizeof(struct squashfs_dev_inode_header_2)); \
-+	SQUASHFS_SWAP((s)->rdev, d, 32, 16);\
-+}
-+
-+#define SQUASHFS_SWAP_SYMLINK_INODE_HEADER_2(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE_2(s, d, \
-+			sizeof(struct squashfs_symlink_inode_header_2));\
-+	SQUASHFS_SWAP((s)->symlink_size, d, 32, 16);\
-+}
-+
-+#define SQUASHFS_SWAP_REG_INODE_HEADER_2(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE_2(s, d, \
-+			sizeof(struct squashfs_reg_inode_header_2));\
-+	SQUASHFS_SWAP((s)->mtime, d, 32, 32);\
-+	SQUASHFS_SWAP((s)->start_block, d, 64, 32);\
-+	SQUASHFS_SWAP((s)->fragment, d, 96, 32);\
-+	SQUASHFS_SWAP((s)->offset, d, 128, 32);\
-+	SQUASHFS_SWAP((s)->file_size, d, 160, 32);\
-+}
-+
-+#define SQUASHFS_SWAP_DIR_INODE_HEADER_2(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE_2(s, d, \
-+			sizeof(struct squashfs_dir_inode_header_2));\
-+	SQUASHFS_SWAP((s)->file_size, d, 32, 19);\
-+	SQUASHFS_SWAP((s)->offset, d, 51, 13);\
-+	SQUASHFS_SWAP((s)->mtime, d, 64, 32);\
-+	SQUASHFS_SWAP((s)->start_block, d, 96, 24);\
-+}
-+
-+#define SQUASHFS_SWAP_LDIR_INODE_HEADER_2(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE_2(s, d, \
-+			sizeof(struct squashfs_ldir_inode_header_2));\
-+	SQUASHFS_SWAP((s)->file_size, d, 32, 27);\
-+	SQUASHFS_SWAP((s)->offset, d, 59, 13);\
-+	SQUASHFS_SWAP((s)->mtime, d, 72, 32);\
-+	SQUASHFS_SWAP((s)->start_block, d, 104, 24);\
-+	SQUASHFS_SWAP((s)->i_count, d, 128, 16);\
-+}
-+
-+#define SQUASHFS_SWAP_DIR_INDEX_2(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_MEMSET(s, d, sizeof(struct squashfs_dir_index_2));\
-+	SQUASHFS_SWAP((s)->index, d, 0, 27);\
-+	SQUASHFS_SWAP((s)->start_block, d, 27, 29);\
-+	SQUASHFS_SWAP((s)->size, d, 56, 8);\
-+}
-+#define SQUASHFS_SWAP_DIR_HEADER_2(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_MEMSET(s, d, sizeof(struct squashfs_dir_header_2));\
-+	SQUASHFS_SWAP((s)->count, d, 0, 8);\
-+	SQUASHFS_SWAP((s)->start_block, d, 8, 24);\
-+}
-+
-+#define SQUASHFS_SWAP_DIR_ENTRY_2(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_MEMSET(s, d, sizeof(struct squashfs_dir_entry_2));\
-+	SQUASHFS_SWAP((s)->offset, d, 0, 13);\
-+	SQUASHFS_SWAP((s)->type, d, 13, 3);\
-+	SQUASHFS_SWAP((s)->size, d, 16, 8);\
-+}
-+
-+#define SQUASHFS_SWAP_FRAGMENT_ENTRY_2(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_MEMSET(s, d, sizeof(struct squashfs_fragment_entry_2));\
-+	SQUASHFS_SWAP((s)->start_block, d, 0, 32);\
-+	SQUASHFS_SWAP((s)->size, d, 32, 32);\
-+}
-+
-+#define SQUASHFS_SWAP_FRAGMENT_INDEXES_2(s, d, n) SQUASHFS_SWAP_INTS(s, d, n)
-+
-+/* fragment and fragment table defines */
-+#define SQUASHFS_FRAGMENT_BYTES_2(A)	(A * sizeof(struct squashfs_fragment_entry_2))
-+
-+#define SQUASHFS_FRAGMENT_INDEX_2(A)	(SQUASHFS_FRAGMENT_BYTES_2(A) / \
-+					SQUASHFS_METADATA_SIZE)
-+
-+#define SQUASHFS_FRAGMENT_INDEX_OFFSET_2(A)	(SQUASHFS_FRAGMENT_BYTES_2(A) % \
-+						SQUASHFS_METADATA_SIZE)
-+
-+#define SQUASHFS_FRAGMENT_INDEXES_2(A)	((SQUASHFS_FRAGMENT_BYTES_2(A) + \
-+					SQUASHFS_METADATA_SIZE - 1) / \
-+					SQUASHFS_METADATA_SIZE)
-+
-+#define SQUASHFS_FRAGMENT_INDEX_BYTES_2(A)	(SQUASHFS_FRAGMENT_INDEXES_2(A) *\
-+						sizeof(int))
-+
-+#endif
-+
-+#ifdef __KERNEL__
-+
-+/*
-+ * macros used to swap each structure entry, taking into account
-+ * bitfields and different bitfield placing conventions on differing
-+ * architectures
-+ */
-+
-+#include <asm/byteorder.h>
-+
-+#ifdef __BIG_ENDIAN
-+	/* convert from little endian to big endian */
-+#define SQUASHFS_SWAP(value, p, pos, tbits) _SQUASHFS_SWAP(value, p, pos, \
-+		tbits, b_pos)
-+#else
-+	/* convert from big endian to little endian */
-+#define SQUASHFS_SWAP(value, p, pos, tbits) _SQUASHFS_SWAP(value, p, pos, \
-+		tbits, 64 - tbits - b_pos)
-+#endif
-+
-+#define _SQUASHFS_SWAP(value, p, pos, tbits, SHIFT) {\
-+	b_pos = pos % 8;\
-+	val = 0;\
-+	s = (unsigned char *)p + (pos / 8);\
-+	d = ((unsigned char *) &val) + 7;\
-+	for(bits = 0; bits < (tbits + b_pos); bits += 8) \
-+		*d-- = *s++;\
-+	value = (val >> (SHIFT))/* & ((1 << tbits) - 1)*/;\
-+}
-+
-+#define SQUASHFS_MEMSET(s, d, n)	memset(s, 0, n);
-+
-+#endif
-+#endif
---- /dev/null
-+++ b/include/linux/squashfs_fs_i.h
-@@ -0,0 +1,45 @@
-+#ifndef SQUASHFS_FS_I
-+#define SQUASHFS_FS_I
-+/*
-+ * Squashfs
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006
-+ * Phillip Lougher <phillip@lougher.org.uk>
-+ *
-+ * 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,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ *
-+ * squashfs_fs_i.h
-+ */
-+
-+struct squashfs_inode_info {
-+	long long	start_block;
-+	unsigned int	offset;
-+	union {
-+		struct {
-+			long long	fragment_start_block;
-+			unsigned int	fragment_size;
-+			unsigned int	fragment_offset;
-+			long long	block_list_start;
-+		} s1;
-+		struct {
-+			long long	directory_index_start;
-+			unsigned int	directory_index_offset;
-+			unsigned int	directory_index_count;
-+			unsigned int	parent_inode;
-+		} s2;
-+	} u;
-+	struct inode	vfs_inode;
-+};
-+#endif
---- /dev/null
-+++ b/include/linux/squashfs_fs_sb.h
-@@ -0,0 +1,74 @@
-+#ifndef SQUASHFS_FS_SB
-+#define SQUASHFS_FS_SB
-+/*
-+ * Squashfs
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006
-+ * Phillip Lougher <phillip@lougher.org.uk>
-+ *
-+ * 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,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ *
-+ * squashfs_fs_sb.h
-+ */
-+
-+#include <linux/squashfs_fs.h>
-+
-+struct squashfs_cache {
-+	long long	block;
-+	int		length;
-+	long long	next_index;
-+	char		*data;
-+};
-+
-+struct squashfs_fragment_cache {
-+	long long	block;
-+	int		length;
-+	unsigned int	locked;
-+	char		*data;
-+};
-+
-+struct squashfs_sb_info {
-+	struct squashfs_super_block	sblk;
-+	int			devblksize;
-+	int			devblksize_log2;
-+	int			swap;
-+	struct squashfs_cache	*block_cache;
-+	struct squashfs_fragment_cache	*fragment;
-+	int			next_cache;
-+	int			next_fragment;
-+	int			next_meta_index;
-+	unsigned int		*uid;
-+	unsigned int		*guid;
-+	long long		*fragment_index;
-+	unsigned int		*fragment_index_2;
-+	unsigned int		read_size;
-+	char			*read_data;
-+	char			*read_page;
-+	struct semaphore	read_data_mutex;
-+	struct semaphore	read_page_mutex;
-+	struct semaphore	block_cache_mutex;
-+	struct semaphore	fragment_mutex;
-+	struct semaphore	meta_index_mutex;
-+	wait_queue_head_t	waitq;
-+	wait_queue_head_t	fragment_wait_queue;
-+	struct meta_index	*meta_index;
-+	struct inode		*(*iget)(struct super_block *s,  squashfs_inode_t \
-+				inode);
-+	long long		(*read_blocklist)(struct inode *inode, int \
-+				index, int readahead_blks, char *block_list, \
-+				unsigned short **block_p, unsigned int *bsize);
-+	int			(*read_fragment_index_table)(struct super_block *s);
-+};
-+#endif
---- a/init/do_mounts_rd.c
-+++ b/init/do_mounts_rd.c
-@@ -5,6 +5,7 @@
- #include <linux/ext2_fs.h>
- #include <linux/romfs_fs.h>
- #include <linux/cramfs_fs.h>
-+#include <linux/squashfs_fs.h>
- #include <linux/initrd.h>
- #include <linux/string.h>
- 
-@@ -39,6 +40,7 @@ static int __init crd_load(int in_fd, in
-  * numbers could not be found.
-  *
-  * We currently check for the following magic numbers:
-+ *      squashfs
-  * 	minix
-  * 	ext2
-  *	romfs
-@@ -53,6 +55,7 @@ identify_ramdisk_image(int fd, int start
- 	struct ext2_super_block *ext2sb;
- 	struct romfs_super_block *romfsb;
- 	struct cramfs_super *cramfsb;
-+	struct squashfs_super_block *squashfsb;
- 	int nblocks = -1;
- 	unsigned char *buf;
- 
-@@ -64,6 +67,7 @@ identify_ramdisk_image(int fd, int start
- 	ext2sb = (struct ext2_super_block *) buf;
- 	romfsb = (struct romfs_super_block *) buf;
- 	cramfsb = (struct cramfs_super *) buf;
-+	squashfsb = (struct squashfs_super_block *) buf;
- 	memset(buf, 0xe5, size);
- 
- 	/*
-@@ -101,6 +105,15 @@ identify_ramdisk_image(int fd, int start
- 		goto done;
- 	}
- 
-+	/* squashfs is at block zero too */
-+	if (squashfsb->s_magic == SQUASHFS_MAGIC) {
-+		printk(KERN_NOTICE
-+		       "RAMDISK: squashfs filesystem found at block %d\n",
-+		       start_block);
-+		nblocks = (squashfsb->bytes_used+BLOCK_SIZE-1)>>BLOCK_SIZE_BITS;
-+		goto done;
-+	}
-+
- 	/*
- 	 * Read block 1 to test for minix and ext2 superblock
- 	 */
diff --git a/target/linux/generic-2.6/patches-2.6.25/002-lzma_decompress.patch b/target/linux/generic-2.6/patches-2.6.25/002-lzma_decompress.patch
deleted file mode 100644
index 939e0a9e3..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/002-lzma_decompress.patch
+++ /dev/null
@@ -1,780 +0,0 @@
---- /dev/null
-+++ b/include/linux/LzmaDecode.h
-@@ -0,0 +1,100 @@
-+/*
-+  LzmaDecode.h
-+  LZMA Decoder interface
-+
-+  LZMA SDK 4.05 Copyright (c) 1999-2004 Igor Pavlov (2004-08-25)
-+  http://www.7-zip.org/
-+
-+  LZMA SDK is licensed under two licenses:
-+  1) GNU Lesser General Public License (GNU LGPL)
-+  2) Common Public License (CPL)
-+  It means that you can select one of these two licenses and
-+  follow rules of that license.
-+
-+  SPECIAL EXCEPTION:
-+  Igor Pavlov, as the author of this code, expressly permits you to
-+  statically or dynamically link your code (or bind by name) to the
-+  interfaces of this file without subjecting your linked code to the
-+  terms of the CPL or GNU LGPL. Any modifications or additions
-+  to this file, however, are subject to the LGPL or CPL terms.
-+*/
-+
-+#ifndef __LZMADECODE_H
-+#define __LZMADECODE_H
-+
-+/* #define _LZMA_IN_CB */
-+/* Use callback for input data */
-+
-+/* #define _LZMA_OUT_READ */
-+/* Use read function for output data */
-+
-+/* #define _LZMA_PROB32 */
-+/* It can increase speed on some 32-bit CPUs,
-+   but memory usage will be doubled in that case */
-+
-+/* #define _LZMA_LOC_OPT */
-+/* Enable local speed optimizations inside code */
-+
-+#ifndef UInt32
-+#ifdef _LZMA_UINT32_IS_ULONG
-+#define UInt32 unsigned long
-+#else
-+#define UInt32 unsigned int
-+#endif
-+#endif
-+
-+#ifdef _LZMA_PROB32
-+#define CProb UInt32
-+#else
-+#define CProb unsigned short
-+#endif
-+
-+#define LZMA_RESULT_OK 0
-+#define LZMA_RESULT_DATA_ERROR 1
-+#define LZMA_RESULT_NOT_ENOUGH_MEM 2
-+
-+#ifdef _LZMA_IN_CB
-+typedef struct _ILzmaInCallback
-+{
-+  int (*Read)(void *object, unsigned char **buffer, UInt32 *bufferSize);
-+} ILzmaInCallback;
-+#endif
-+
-+#define LZMA_BASE_SIZE 1846
-+#define LZMA_LIT_SIZE 768
-+
-+/*
-+bufferSize = (LZMA_BASE_SIZE + (LZMA_LIT_SIZE << (lc + lp)))* sizeof(CProb)
-+bufferSize += 100 in case of _LZMA_OUT_READ
-+by default CProb is unsigned short,
-+but if specify _LZMA_PROB_32, CProb will be UInt32(unsigned int)
-+*/
-+
-+#ifdef _LZMA_OUT_READ
-+int LzmaDecoderInit(
-+    unsigned char *buffer, UInt32 bufferSize,
-+    int lc, int lp, int pb,
-+    unsigned char *dictionary, UInt32 dictionarySize,
-+  #ifdef _LZMA_IN_CB
-+    ILzmaInCallback *inCallback
-+  #else
-+    unsigned char *inStream, UInt32 inSize
-+  #endif
-+);
-+#endif
-+
-+int LzmaDecode(
-+    unsigned char *buffer,
-+  #ifndef _LZMA_OUT_READ
-+    UInt32 bufferSize,
-+    int lc, int lp, int pb,
-+  #ifdef _LZMA_IN_CB
-+    ILzmaInCallback *inCallback,
-+  #else
-+    unsigned char *inStream, UInt32 inSize,
-+  #endif
-+  #endif
-+    unsigned char *outStream, UInt32 outSize,
-+    UInt32 *outSizeProcessed);
-+
-+#endif
---- /dev/null
-+++ b/lib/LzmaDecode.c
-@@ -0,0 +1,663 @@
-+/*
-+  LzmaDecode.c
-+  LZMA Decoder
-+
-+  LZMA SDK 4.05 Copyright (c) 1999-2004 Igor Pavlov (2004-08-25)
-+  http://www.7-zip.org/
-+
-+  LZMA SDK is licensed under two licenses:
-+  1) GNU Lesser General Public License (GNU LGPL)
-+  2) Common Public License (CPL)
-+  It means that you can select one of these two licenses and
-+  follow rules of that license.
-+
-+  SPECIAL EXCEPTION:
-+  Igor Pavlov, as the author of this code, expressly permits you to
-+  statically or dynamically link your code (or bind by name) to the
-+  interfaces of this file without subjecting your linked code to the
-+  terms of the CPL or GNU LGPL. Any modifications or additions
-+  to this file, however, are subject to the LGPL or CPL terms.
-+*/
-+
-+#include <linux/LzmaDecode.h>
-+
-+#ifndef Byte
-+#define Byte unsigned char
-+#endif
-+
-+#define kNumTopBits 24
-+#define kTopValue ((UInt32)1 << kNumTopBits)
-+
-+#define kNumBitModelTotalBits 11
-+#define kBitModelTotal (1 << kNumBitModelTotalBits)
-+#define kNumMoveBits 5
-+
-+typedef struct _CRangeDecoder
-+{
-+  Byte *Buffer;
-+  Byte *BufferLim;
-+  UInt32 Range;
-+  UInt32 Code;
-+  #ifdef _LZMA_IN_CB
-+  ILzmaInCallback *InCallback;
-+  int Result;
-+  #endif
-+  int ExtraBytes;
-+} CRangeDecoder;
-+
-+Byte RangeDecoderReadByte(CRangeDecoder *rd)
-+{
-+  if (rd->Buffer == rd->BufferLim)
-+  {
-+    #ifdef _LZMA_IN_CB
-+    UInt32 size;
-+    rd->Result = rd->InCallback->Read(rd->InCallback, &rd->Buffer, &size);
-+    rd->BufferLim = rd->Buffer + size;
-+    if (size == 0)
-+    #endif
-+    {
-+      rd->ExtraBytes = 1;
-+      return 0xFF;
-+    }
-+  }
-+  return (*rd->Buffer++);
-+}
-+
-+/* #define ReadByte (*rd->Buffer++) */
-+#define ReadByte (RangeDecoderReadByte(rd))
-+
-+void RangeDecoderInit(CRangeDecoder *rd,
-+  #ifdef _LZMA_IN_CB
-+    ILzmaInCallback *inCallback
-+  #else
-+    Byte *stream, UInt32 bufferSize
-+  #endif
-+    )
-+{
-+  int i;
-+  #ifdef _LZMA_IN_CB
-+  rd->InCallback = inCallback;
-+  rd->Buffer = rd->BufferLim = 0;
-+  #else
-+  rd->Buffer = stream;
-+  rd->BufferLim = stream + bufferSize;
-+  #endif
-+  rd->ExtraBytes = 0;
-+  rd->Code = 0;
-+  rd->Range = (0xFFFFFFFF);
-+  for(i = 0; i < 5; i++)
-+    rd->Code = (rd->Code << 8) | ReadByte;
-+}
-+
-+#define RC_INIT_VAR UInt32 range = rd->Range; UInt32 code = rd->Code;
-+#define RC_FLUSH_VAR rd->Range = range; rd->Code = code;
-+#define RC_NORMALIZE if (range < kTopValue) { range <<= 8; code = (code << 8) | ReadByte; }
-+
-+UInt32 RangeDecoderDecodeDirectBits(CRangeDecoder *rd, int numTotalBits)
-+{
-+  RC_INIT_VAR
-+  UInt32 result = 0;
-+  int i;
-+  for (i = numTotalBits; i > 0; i--)
-+  {
-+    /* UInt32 t; */
-+    range >>= 1;
-+
-+    result <<= 1;
-+    if (code >= range)
-+    {
-+      code -= range;
-+      result |= 1;
-+    }
-+    /*
-+    t = (code - range) >> 31;
-+    t &= 1;
-+    code -= range & (t - 1);
-+    result = (result + result) | (1 - t);
-+    */
-+    RC_NORMALIZE
-+  }
-+  RC_FLUSH_VAR
-+  return result;
-+}
-+
-+int RangeDecoderBitDecode(CProb *prob, CRangeDecoder *rd)
-+{
-+  UInt32 bound = (rd->Range >> kNumBitModelTotalBits) * *prob;
-+  if (rd->Code < bound)
-+  {
-+    rd->Range = bound;
-+    *prob += (kBitModelTotal - *prob) >> kNumMoveBits;
-+    if (rd->Range < kTopValue)
-+    {
-+      rd->Code = (rd->Code << 8) | ReadByte;
-+      rd->Range <<= 8;
-+    }
-+    return 0;
-+  }
-+  else
-+  {
-+    rd->Range -= bound;
-+    rd->Code -= bound;
-+    *prob -= (*prob) >> kNumMoveBits;
-+    if (rd->Range < kTopValue)
-+    {
-+      rd->Code = (rd->Code << 8) | ReadByte;
-+      rd->Range <<= 8;
-+    }
-+    return 1;
-+  }
-+}
-+
-+#define RC_GET_BIT2(prob, mi, A0, A1) \
-+  UInt32 bound = (range >> kNumBitModelTotalBits) * *prob; \
-+  if (code < bound) \
-+    { A0; range = bound; *prob += (kBitModelTotal - *prob) >> kNumMoveBits; mi <<= 1; } \
-+  else \
-+    { A1; range -= bound; code -= bound; *prob -= (*prob) >> kNumMoveBits; mi = (mi + mi) + 1; } \
-+  RC_NORMALIZE
-+
-+#define RC_GET_BIT(prob, mi) RC_GET_BIT2(prob, mi, ; , ;)
-+
-+int RangeDecoderBitTreeDecode(CProb *probs, int numLevels, CRangeDecoder *rd)
-+{
-+  int mi = 1;
-+  int i;
-+  #ifdef _LZMA_LOC_OPT
-+  RC_INIT_VAR
-+  #endif
-+  for(i = numLevels; i > 0; i--)
-+  {
-+    #ifdef _LZMA_LOC_OPT
-+    CProb *prob = probs + mi;
-+    RC_GET_BIT(prob, mi)
-+    #else
-+    mi = (mi + mi) + RangeDecoderBitDecode(probs + mi, rd);
-+    #endif
-+  }
-+  #ifdef _LZMA_LOC_OPT
-+  RC_FLUSH_VAR
-+  #endif
-+  return mi - (1 << numLevels);
-+}
-+
-+int RangeDecoderReverseBitTreeDecode(CProb *probs, int numLevels, CRangeDecoder *rd)
-+{
-+  int mi = 1;
-+  int i;
-+  int symbol = 0;
-+  #ifdef _LZMA_LOC_OPT
-+  RC_INIT_VAR
-+  #endif
-+  for(i = 0; i < numLevels; i++)
-+  {
-+    #ifdef _LZMA_LOC_OPT
-+    CProb *prob = probs + mi;
-+    RC_GET_BIT2(prob, mi, ; , symbol |= (1 << i))
-+    #else
-+    int bit = RangeDecoderBitDecode(probs + mi, rd);
-+    mi = mi + mi + bit;
-+    symbol |= (bit << i);
-+    #endif
-+  }
-+  #ifdef _LZMA_LOC_OPT
-+  RC_FLUSH_VAR
-+  #endif
-+  return symbol;
-+}
-+
-+Byte LzmaLiteralDecode(CProb *probs, CRangeDecoder *rd)
-+{
-+  int symbol = 1;
-+  #ifdef _LZMA_LOC_OPT
-+  RC_INIT_VAR
-+  #endif
-+  do
-+  {
-+    #ifdef _LZMA_LOC_OPT
-+    CProb *prob = probs + symbol;
-+    RC_GET_BIT(prob, symbol)
-+    #else
-+    symbol = (symbol + symbol) | RangeDecoderBitDecode(probs + symbol, rd);
-+    #endif
-+  }
-+  while (symbol < 0x100);
-+  #ifdef _LZMA_LOC_OPT
-+  RC_FLUSH_VAR
-+  #endif
-+  return symbol;
-+}
-+
-+Byte LzmaLiteralDecodeMatch(CProb *probs, CRangeDecoder *rd, Byte matchByte)
-+{
-+  int symbol = 1;
-+  #ifdef _LZMA_LOC_OPT
-+  RC_INIT_VAR
-+  #endif
-+  do
-+  {
-+    int bit;
-+    int matchBit = (matchByte >> 7) & 1;
-+    matchByte <<= 1;
-+    #ifdef _LZMA_LOC_OPT
-+    {
-+      CProb *prob = probs + ((1 + matchBit) << 8) + symbol;
-+      RC_GET_BIT2(prob, symbol, bit = 0, bit = 1)
-+    }
-+    #else
-+    bit = RangeDecoderBitDecode(probs + ((1 + matchBit) << 8) + symbol, rd);
-+    symbol = (symbol << 1) | bit;
-+    #endif
-+    if (matchBit != bit)
-+    {
-+      while (symbol < 0x100)
-+      {
-+        #ifdef _LZMA_LOC_OPT
-+        CProb *prob = probs + symbol;
-+        RC_GET_BIT(prob, symbol)
-+        #else
-+        symbol = (symbol + symbol) | RangeDecoderBitDecode(probs + symbol, rd);
-+        #endif
-+      }
-+      break;
-+    }
-+  }
-+  while (symbol < 0x100);
-+  #ifdef _LZMA_LOC_OPT
-+  RC_FLUSH_VAR
-+  #endif
-+  return symbol;
-+}
-+
-+#define kNumPosBitsMax 4
-+#define kNumPosStatesMax (1 << kNumPosBitsMax)
-+
-+#define kLenNumLowBits 3
-+#define kLenNumLowSymbols (1 << kLenNumLowBits)
-+#define kLenNumMidBits 3
-+#define kLenNumMidSymbols (1 << kLenNumMidBits)
-+#define kLenNumHighBits 8
-+#define kLenNumHighSymbols (1 << kLenNumHighBits)
-+
-+#define LenChoice 0
-+#define LenChoice2 (LenChoice + 1)
-+#define LenLow (LenChoice2 + 1)
-+#define LenMid (LenLow + (kNumPosStatesMax << kLenNumLowBits))
-+#define LenHigh (LenMid + (kNumPosStatesMax << kLenNumMidBits))
-+#define kNumLenProbs (LenHigh + kLenNumHighSymbols)
-+
-+int LzmaLenDecode(CProb *p, CRangeDecoder *rd, int posState)
-+{
-+  if(RangeDecoderBitDecode(p + LenChoice, rd) == 0)
-+    return RangeDecoderBitTreeDecode(p + LenLow +
-+        (posState << kLenNumLowBits), kLenNumLowBits, rd);
-+  if(RangeDecoderBitDecode(p + LenChoice2, rd) == 0)
-+    return kLenNumLowSymbols + RangeDecoderBitTreeDecode(p + LenMid +
-+        (posState << kLenNumMidBits), kLenNumMidBits, rd);
-+  return kLenNumLowSymbols + kLenNumMidSymbols +
-+      RangeDecoderBitTreeDecode(p + LenHigh, kLenNumHighBits, rd);
-+}
-+
-+#define kNumStates 12
-+
-+#define kStartPosModelIndex 4
-+#define kEndPosModelIndex 14
-+#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
-+
-+#define kNumPosSlotBits 6
-+#define kNumLenToPosStates 4
-+
-+#define kNumAlignBits 4
-+#define kAlignTableSize (1 << kNumAlignBits)
-+
-+#define kMatchMinLen 2
-+
-+#define IsMatch 0
-+#define IsRep (IsMatch + (kNumStates << kNumPosBitsMax))
-+#define IsRepG0 (IsRep + kNumStates)
-+#define IsRepG1 (IsRepG0 + kNumStates)
-+#define IsRepG2 (IsRepG1 + kNumStates)
-+#define IsRep0Long (IsRepG2 + kNumStates)
-+#define PosSlot (IsRep0Long + (kNumStates << kNumPosBitsMax))
-+#define SpecPos (PosSlot + (kNumLenToPosStates << kNumPosSlotBits))
-+#define Align (SpecPos + kNumFullDistances - kEndPosModelIndex)
-+#define LenCoder (Align + kAlignTableSize)
-+#define RepLenCoder (LenCoder + kNumLenProbs)
-+#define Literal (RepLenCoder + kNumLenProbs)
-+
-+#if Literal != LZMA_BASE_SIZE
-+StopCompilingDueBUG
-+#endif
-+
-+#ifdef _LZMA_OUT_READ
-+
-+typedef struct _LzmaVarState
-+{
-+  CRangeDecoder RangeDecoder;
-+  Byte *Dictionary;
-+  UInt32 DictionarySize;
-+  UInt32 DictionaryPos;
-+  UInt32 GlobalPos;
-+  UInt32 Reps[4];
-+  int lc;
-+  int lp;
-+  int pb;
-+  int State;
-+  int PreviousIsMatch;
-+  int RemainLen;
-+} LzmaVarState;
-+
-+int LzmaDecoderInit(
-+    unsigned char *buffer, UInt32 bufferSize,
-+    int lc, int lp, int pb,
-+    unsigned char *dictionary, UInt32 dictionarySize,
-+    #ifdef _LZMA_IN_CB
-+    ILzmaInCallback *inCallback
-+    #else
-+    unsigned char *inStream, UInt32 inSize
-+    #endif
-+    )
-+{
-+  LzmaVarState *vs = (LzmaVarState *)buffer;
-+  CProb *p = (CProb *)(buffer + sizeof(LzmaVarState));
-+  UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (lc + lp));
-+  UInt32 i;
-+  if (bufferSize < numProbs * sizeof(CProb) + sizeof(LzmaVarState))
-+    return LZMA_RESULT_NOT_ENOUGH_MEM;
-+  vs->Dictionary = dictionary;
-+  vs->DictionarySize = dictionarySize;
-+  vs->DictionaryPos = 0;
-+  vs->GlobalPos = 0;
-+  vs->Reps[0] = vs->Reps[1] = vs->Reps[2] = vs->Reps[3] = 1;
-+  vs->lc = lc;
-+  vs->lp = lp;
-+  vs->pb = pb;
-+  vs->State = 0;
-+  vs->PreviousIsMatch = 0;
-+  vs->RemainLen = 0;
-+  dictionary[dictionarySize - 1] = 0;
-+  for (i = 0; i < numProbs; i++)
-+    p[i] = kBitModelTotal >> 1;
-+  RangeDecoderInit(&vs->RangeDecoder,
-+      #ifdef _LZMA_IN_CB
-+      inCallback
-+      #else
-+      inStream, inSize
-+      #endif
-+  );
-+  return LZMA_RESULT_OK;
-+}
-+
-+int LzmaDecode(unsigned char *buffer,
-+    unsigned char *outStream, UInt32 outSize,
-+    UInt32 *outSizeProcessed)
-+{
-+  LzmaVarState *vs = (LzmaVarState *)buffer;
-+  CProb *p = (CProb *)(buffer + sizeof(LzmaVarState));
-+  CRangeDecoder rd = vs->RangeDecoder;
-+  int state = vs->State;
-+  int previousIsMatch = vs->PreviousIsMatch;
-+  Byte previousByte;
-+  UInt32 rep0 = vs->Reps[0], rep1 = vs->Reps[1], rep2 = vs->Reps[2], rep3 = vs->Reps[3];
-+  UInt32 nowPos = 0;
-+  UInt32 posStateMask = (1 << (vs->pb)) - 1;
-+  UInt32 literalPosMask = (1 << (vs->lp)) - 1;
-+  int lc = vs->lc;
-+  int len = vs->RemainLen;
-+  UInt32 globalPos = vs->GlobalPos;
-+
-+  Byte *dictionary = vs->Dictionary;
-+  UInt32 dictionarySize = vs->DictionarySize;
-+  UInt32 dictionaryPos = vs->DictionaryPos;
-+
-+  if (len == -1)
-+  {
-+    *outSizeProcessed = 0;
-+    return LZMA_RESULT_OK;
-+  }
-+
-+  while(len > 0 && nowPos < outSize)
-+  {
-+    UInt32 pos = dictionaryPos - rep0;
-+    if (pos >= dictionarySize)
-+      pos += dictionarySize;
-+    outStream[nowPos++] = dictionary[dictionaryPos] = dictionary[pos];
-+    if (++dictionaryPos == dictionarySize)
-+      dictionaryPos = 0;
-+    len--;
-+  }
-+  if (dictionaryPos == 0)
-+    previousByte = dictionary[dictionarySize - 1];
-+  else
-+    previousByte = dictionary[dictionaryPos - 1];
-+#else
-+
-+int LzmaDecode(
-+    Byte *buffer, UInt32 bufferSize,
-+    int lc, int lp, int pb,
-+    #ifdef _LZMA_IN_CB
-+    ILzmaInCallback *inCallback,
-+    #else
-+    unsigned char *inStream, UInt32 inSize,
-+    #endif
-+    unsigned char *outStream, UInt32 outSize,
-+    UInt32 *outSizeProcessed)
-+{
-+  UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (lc + lp));
-+  CProb *p = (CProb *)buffer;
-+  CRangeDecoder rd;
-+  UInt32 i;
-+  int state = 0;
-+  int previousIsMatch = 0;
-+  Byte previousByte = 0;
-+  UInt32 rep0 = 1, rep1 = 1, rep2 = 1, rep3 = 1;
-+  UInt32 nowPos = 0;
-+  UInt32 posStateMask = (1 << pb) - 1;
-+  UInt32 literalPosMask = (1 << lp) - 1;
-+  int len = 0;
-+  if (bufferSize < numProbs * sizeof(CProb))
-+    return LZMA_RESULT_NOT_ENOUGH_MEM;
-+  for (i = 0; i < numProbs; i++)
-+    p[i] = kBitModelTotal >> 1;
-+  RangeDecoderInit(&rd,
-+      #ifdef _LZMA_IN_CB
-+      inCallback
-+      #else
-+      inStream, inSize
-+      #endif
-+      );
-+#endif
-+
-+  *outSizeProcessed = 0;
-+  while(nowPos < outSize)
-+  {
-+    int posState = (int)(
-+        (nowPos
-+        #ifdef _LZMA_OUT_READ
-+        + globalPos
-+        #endif
-+        )
-+        & posStateMask);
-+    #ifdef _LZMA_IN_CB
-+    if (rd.Result != LZMA_RESULT_OK)
-+      return rd.Result;
-+    #endif
-+    if (rd.ExtraBytes != 0)
-+      return LZMA_RESULT_DATA_ERROR;
-+    if (RangeDecoderBitDecode(p + IsMatch + (state << kNumPosBitsMax) + posState, &rd) == 0)
-+    {
-+      CProb *probs = p + Literal + (LZMA_LIT_SIZE *
-+        (((
-+        (nowPos
-+        #ifdef _LZMA_OUT_READ
-+        + globalPos
-+        #endif
-+        )
-+        & literalPosMask) << lc) + (previousByte >> (8 - lc))));
-+
-+      if (state < 4) state = 0;
-+      else if (state < 10) state -= 3;
-+      else state -= 6;
-+      if (previousIsMatch)
-+      {
-+        Byte matchByte;
-+        #ifdef _LZMA_OUT_READ
-+        UInt32 pos = dictionaryPos - rep0;
-+        if (pos >= dictionarySize)
-+          pos += dictionarySize;
-+        matchByte = dictionary[pos];
-+        #else
-+        matchByte = outStream[nowPos - rep0];
-+        #endif
-+        previousByte = LzmaLiteralDecodeMatch(probs, &rd, matchByte);
-+        previousIsMatch = 0;
-+      }
-+      else
-+        previousByte = LzmaLiteralDecode(probs, &rd);
-+      outStream[nowPos++] = previousByte;
-+      #ifdef _LZMA_OUT_READ
-+      dictionary[dictionaryPos] = previousByte;
-+      if (++dictionaryPos == dictionarySize)
-+        dictionaryPos = 0;
-+      #endif
-+    }
-+    else
-+    {
-+      previousIsMatch = 1;
-+      if (RangeDecoderBitDecode(p + IsRep + state, &rd) == 1)
-+      {
-+        if (RangeDecoderBitDecode(p + IsRepG0 + state, &rd) == 0)
-+        {
-+          if (RangeDecoderBitDecode(p + IsRep0Long + (state << kNumPosBitsMax) + posState, &rd) == 0)
-+          {
-+            #ifdef _LZMA_OUT_READ
-+            UInt32 pos;
-+            #endif
-+            if (
-+               (nowPos
-+                #ifdef _LZMA_OUT_READ
-+                + globalPos
-+                #endif
-+               )
-+               == 0)
-+              return LZMA_RESULT_DATA_ERROR;
-+            state = state < 7 ? 9 : 11;
-+            #ifdef _LZMA_OUT_READ
-+            pos = dictionaryPos - rep0;
-+            if (pos >= dictionarySize)
-+              pos += dictionarySize;
-+            previousByte = dictionary[pos];
-+            dictionary[dictionaryPos] = previousByte;
-+            if (++dictionaryPos == dictionarySize)
-+              dictionaryPos = 0;
-+            #else
-+            previousByte = outStream[nowPos - rep0];
-+            #endif
-+            outStream[nowPos++] = previousByte;
-+            continue;
-+          }
-+        }
-+        else
-+        {
-+          UInt32 distance;
-+          if(RangeDecoderBitDecode(p + IsRepG1 + state, &rd) == 0)
-+            distance = rep1;
-+          else
-+          {
-+            if(RangeDecoderBitDecode(p + IsRepG2 + state, &rd) == 0)
-+              distance = rep2;
-+            else
-+            {
-+              distance = rep3;
-+              rep3 = rep2;
-+            }
-+            rep2 = rep1;
-+          }
-+          rep1 = rep0;
-+          rep0 = distance;
-+        }
-+        len = LzmaLenDecode(p + RepLenCoder, &rd, posState);
-+        state = state < 7 ? 8 : 11;
-+      }
-+      else
-+      {
-+        int posSlot;
-+        rep3 = rep2;
-+        rep2 = rep1;
-+        rep1 = rep0;
-+        state = state < 7 ? 7 : 10;
-+        len = LzmaLenDecode(p + LenCoder, &rd, posState);
-+        posSlot = RangeDecoderBitTreeDecode(p + PosSlot +
-+            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) <<
-+            kNumPosSlotBits), kNumPosSlotBits, &rd);
-+        if (posSlot >= kStartPosModelIndex)
-+        {
-+          int numDirectBits = ((posSlot >> 1) - 1);
-+          rep0 = ((2 | ((UInt32)posSlot & 1)) << numDirectBits);
-+          if (posSlot < kEndPosModelIndex)
-+          {
-+            rep0 += RangeDecoderReverseBitTreeDecode(
-+                p + SpecPos + rep0 - posSlot - 1, numDirectBits, &rd);
-+          }
-+          else
-+          {
-+            rep0 += RangeDecoderDecodeDirectBits(&rd,
-+                numDirectBits - kNumAlignBits) << kNumAlignBits;
-+            rep0 += RangeDecoderReverseBitTreeDecode(p + Align, kNumAlignBits, &rd);
-+          }
-+        }
-+        else
-+          rep0 = posSlot;
-+        rep0++;
-+      }
-+      if (rep0 == (UInt32)(0))
-+      {
-+        /* it's for stream version */
-+        len = -1;
-+        break;
-+      }
-+      if (rep0 > nowPos
-+        #ifdef _LZMA_OUT_READ
-+        + globalPos
-+        #endif
-+        )
-+      {
-+        return LZMA_RESULT_DATA_ERROR;
-+      }
-+      len += kMatchMinLen;
-+      do
-+      {
-+        #ifdef _LZMA_OUT_READ
-+        UInt32 pos = dictionaryPos - rep0;
-+        if (pos >= dictionarySize)
-+          pos += dictionarySize;
-+        previousByte = dictionary[pos];
-+        dictionary[dictionaryPos] = previousByte;
-+        if (++dictionaryPos == dictionarySize)
-+          dictionaryPos = 0;
-+        #else
-+        previousByte = outStream[nowPos - rep0];
-+        #endif
-+        outStream[nowPos++] = previousByte;
-+        len--;
-+      }
-+      while(len > 0 && nowPos < outSize);
-+    }
-+  }
-+
-+  #ifdef _LZMA_OUT_READ
-+  vs->RangeDecoder = rd;
-+  vs->DictionaryPos = dictionaryPos;
-+  vs->GlobalPos = globalPos + nowPos;
-+  vs->Reps[0] = rep0;
-+  vs->Reps[1] = rep1;
-+  vs->Reps[2] = rep2;
-+  vs->Reps[3] = rep3;
-+  vs->State = state;
-+  vs->PreviousIsMatch = previousIsMatch;
-+  vs->RemainLen = len;
-+  #endif
-+
-+  *outSizeProcessed = nowPos;
-+  return LZMA_RESULT_OK;
-+}
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -14,7 +14,7 @@ lib-$(CONFIG_SMP) += cpumask.o
- lib-y	+= kobject.o kref.o klist.o
- 
- obj-y += div64.o sort.o parser.o halfmd4.o debug_locks.o random32.o \
--	 bust_spinlocks.o hexdump.o kasprintf.o bitmap.o scatterlist.o
-+	 bust_spinlocks.o hexdump.o kasprintf.o bitmap.o scatterlist.o LzmaDecode.o
- 
- ifeq ($(CONFIG_DEBUG_KOBJECT),y)
- CFLAGS_kobject.o += -DDEBUG
diff --git a/target/linux/generic-2.6/patches-2.6.25/003-squashfs_lzma.patch b/target/linux/generic-2.6/patches-2.6.25/003-squashfs_lzma.patch
deleted file mode 100644
index 9050e370c..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/003-squashfs_lzma.patch
+++ /dev/null
@@ -1,107 +0,0 @@
---- a/fs/squashfs/inode.c
-+++ b/fs/squashfs/inode.c
-@@ -4,6 +4,9 @@
-  * Copyright (c) 2002, 2003, 2004, 2005, 2006
-  * Phillip Lougher <phillip@lougher.org.uk>
-  *
-+ * LZMA decompressor support added by Oleg I. Vdovikin
-+ * Copyright (c) 2005 Oleg I.Vdovikin <oleg@cs.msu.su>
-+ *
-  * 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,
-@@ -21,6 +24,7 @@
-  * inode.c
-  */
- 
-+#define SQUASHFS_LZMA
- #include <linux/types.h>
- #include <linux/squashfs_fs.h>
- #include <linux/module.h>
-@@ -44,6 +48,19 @@
- 
- #include "squashfs.h"
- 
-+#ifdef SQUASHFS_LZMA
-+#include <linux/LzmaDecode.h>
-+
-+/* default LZMA settings, should be in sync with mksquashfs */
-+#define LZMA_LC 3
-+#define LZMA_LP 0
-+#define LZMA_PB 2
-+
-+#define LZMA_WORKSPACE_SIZE ((LZMA_BASE_SIZE + \
-+      (LZMA_LIT_SIZE << (LZMA_LC + LZMA_LP))) * sizeof(CProb))
-+
-+#endif
-+
- static void squashfs_put_super(struct super_block *);
- static int squashfs_statfs(struct dentry *, struct kstatfs *);
- static int squashfs_symlink_readpage(struct file *file, struct page *page);
-@@ -64,7 +81,11 @@ static int squashfs_get_sb(struct file_s
- 			const char *, void *, struct vfsmount *);
- 
- 
-+#ifdef SQUASHFS_LZMA
-+static unsigned char lzma_workspace[LZMA_WORKSPACE_SIZE];
-+#else
- static z_stream stream;
-+#endif
- 
- static struct file_system_type squashfs_fs_type = {
- 	.owner = THIS_MODULE,
-@@ -249,6 +270,15 @@ SQSH_EXTERN unsigned int squashfs_read_d
- 	if (compressed) {
- 		int zlib_err;
- 
-+#ifdef SQUASHFS_LZMA
-+		if ((zlib_err = LzmaDecode(lzma_workspace,
-+			LZMA_WORKSPACE_SIZE, LZMA_LC, LZMA_LP, LZMA_PB,
-+			c_buffer, c_byte, buffer, msblk->read_size, &bytes)) != LZMA_RESULT_OK)
-+		{
-+			ERROR("lzma returned unexpected result 0x%x\n", zlib_err);
-+			bytes = 0;
-+		}
-+#else
- 		stream.next_in = c_buffer;
- 		stream.avail_in = c_byte;
- 		stream.next_out = buffer;
-@@ -263,7 +293,7 @@ SQSH_EXTERN unsigned int squashfs_read_d
- 			bytes = 0;
- 		} else
- 			bytes = stream.total_out;
--
-+#endif
- 		up(&msblk->read_data_mutex);
- 	}
- 
-@@ -2045,15 +2075,19 @@ static int __init init_squashfs_fs(void)
- 	printk(KERN_INFO "squashfs: version 3.0 (2006/03/15) "
- 		"Phillip Lougher\n");
- 
-+#ifndef SQUASHFS_LZMA
- 	if (!(stream.workspace = vmalloc(zlib_inflate_workspacesize()))) {
- 		ERROR("Failed to allocate zlib workspace\n");
- 		destroy_inodecache();
- 		err = -ENOMEM;
- 		goto out;
- 	}
-+#endif
- 
- 	if ((err = register_filesystem(&squashfs_fs_type))) {
-+#ifndef SQUASHFS_LZMA
- 		vfree(stream.workspace);
-+#endif
- 		destroy_inodecache();
- 	}
- 
-@@ -2064,7 +2098,9 @@ out:
- 
- static void __exit exit_squashfs_fs(void)
- {
-+#ifndef SQUASHFS_LZMA
- 	vfree(stream.workspace);
-+#endif
- 	unregister_filesystem(&squashfs_fs_type);
- 	destroy_inodecache();
- }
diff --git a/target/linux/generic-2.6/patches-2.6.25/004-extra_optimization.patch b/target/linux/generic-2.6/patches-2.6.25/004-extra_optimization.patch
deleted file mode 100644
index ba1b71c61..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/004-extra_optimization.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -533,6 +533,9 @@ endif
- NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
- CHECKFLAGS     += $(NOSTDINC_FLAGS)
- 
-+# improve gcc optimization
-+CFLAGS += $(call cc-option,-funit-at-a-time,)
-+
- # warn about C99 declaration after statement
- KBUILD_CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)
- 
diff --git a/target/linux/generic-2.6/patches-2.6.25/005-squashfs_fix.patch b/target/linux/generic-2.6/patches-2.6.25/005-squashfs_fix.patch
deleted file mode 100644
index 56b7fc2c4..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/005-squashfs_fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/fs/squashfs/inode.c
-+++ b/fs/squashfs/inode.c
-@@ -33,6 +33,7 @@
- #include <linux/fs.h>
- #include <linux/smp_lock.h>
- #include <linux/slab.h>
-+#include <linux/exportfs.h>
- #include <linux/squashfs_fs_sb.h>
- #include <linux/squashfs_fs_i.h>
- #include <linux/buffer_head.h>
-@@ -2125,7 +2126,7 @@ static void squashfs_destroy_inode(struc
- }
- 
- 
--static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flags)
-+static void init_once(struct kmem_cache * cachep, void *foo)
- {
- 	struct squashfs_inode_info *ei = foo;
- 
diff --git a/target/linux/generic-2.6/patches-2.6.25/006-gcc4_inline_fix.patch b/target/linux/generic-2.6/patches-2.6.25/006-gcc4_inline_fix.patch
deleted file mode 100644
index cd62e9c25..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/006-gcc4_inline_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/include/asm-mips/system.h
-+++ b/include/asm-mips/system.h
-@@ -185,7 +185,7 @@ extern __u64 __xchg_u64_unsupported_on_3
-    if something tries to do an invalid xchg().  */
- extern void __xchg_called_with_bad_pointer(void);
- 
--static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
-+static __always_inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
- {
- 	switch (size) {
- 	case 4:
diff --git a/target/linux/generic-2.6/patches-2.6.25/007-samsung_flash.patch b/target/linux/generic-2.6/patches-2.6.25/007-samsung_flash.patch
deleted file mode 100644
index 557736f7a..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/007-samsung_flash.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -51,6 +51,7 @@
- #define SST49LF040B	        0x0050
- #define SST49LF008A		0x005a
- #define AT49BV6416		0x00d6
-+#define MANUFACTURER_SAMSUNG	0x00ec
- 
- static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
- static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
-@@ -298,12 +299,19 @@ struct mtd_info *cfi_cmdset_0002(struct 
- 
- 		if (extp->MajorVersion != '1' ||
- 		    (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
--			printk(KERN_ERR "  Unknown Amd/Fujitsu Extended Query "
--			       "version %c.%c.\n",  extp->MajorVersion,
--			       extp->MinorVersion);
--			kfree(extp);
--			kfree(mtd);
--			return NULL;
-+		        if (cfi->mfr == MANUFACTURER_SAMSUNG &&
-+			    (extp->MajorVersion == '3' && extp->MinorVersion == '3')) {
-+			    printk(KERN_NOTICE "  Newer Samsung flash detected, "
-+			           "should be compatibile with Amd/Fujitsu.\n");
-+		        }
-+		        else {
-+			    printk(KERN_ERR "  Unknown Amd/Fujitsu Extended Query "
-+			           "version %c.%c.\n",  extp->MajorVersion,
-+			           extp->MinorVersion);
-+			    kfree(extp);
-+			    kfree(mtd);
-+			    return NULL;
-+		        }
- 		}
- 
- 		/* Install our own private info structure */
diff --git a/target/linux/generic-2.6/patches-2.6.25/009-revert_intel_flash_breakage.patch b/target/linux/generic-2.6/patches-2.6.25/009-revert_intel_flash_breakage.patch
deleted file mode 100644
index 072900786..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/009-revert_intel_flash_breakage.patch
+++ /dev/null
@@ -1,169 +0,0 @@
---- a/drivers/mtd/chips/cfi_cmdset_0001.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
-@@ -1008,7 +1008,7 @@ static void __xipram xip_enable(struct m
- 
- static int __xipram xip_wait_for_operation(
- 		struct map_info *map, struct flchip *chip,
--		unsigned long adr, unsigned int chip_op_time )
-+		unsigned long adr, int *chip_op_time )
- {
- 	struct cfi_private *cfi = map->fldrv_priv;
- 	struct cfi_pri_intelext *cfip = cfi->cmdset_priv;
-@@ -1017,7 +1017,7 @@ static int __xipram xip_wait_for_operati
- 	flstate_t oldstate, newstate;
- 
-        	start = xip_currtime();
--	usec = chip_op_time * 8;
-+	usec = *chip_op_time * 8;
- 	if (usec == 0)
- 		usec = 500000;
- 	done = 0;
-@@ -1127,8 +1127,8 @@ static int __xipram xip_wait_for_operati
- #define XIP_INVAL_CACHED_RANGE(map, from, size)  \
- 	INVALIDATE_CACHED_RANGE(map, from, size)
- 
--#define INVAL_CACHE_AND_WAIT(map, chip, cmd_adr, inval_adr, inval_len, usec) \
--	xip_wait_for_operation(map, chip, cmd_adr, usec)
-+#define INVAL_CACHE_AND_WAIT(map, chip, cmd_adr, inval_adr, inval_len, p_usec) \
-+	xip_wait_for_operation(map, chip, cmd_adr, p_usec)
- 
- #else
- 
-@@ -1140,65 +1140,65 @@ static int __xipram xip_wait_for_operati
- static int inval_cache_and_wait_for_operation(
- 		struct map_info *map, struct flchip *chip,
- 		unsigned long cmd_adr, unsigned long inval_adr, int inval_len,
--		unsigned int chip_op_time)
-+		int *chip_op_time )
- {
- 	struct cfi_private *cfi = map->fldrv_priv;
- 	map_word status, status_OK = CMD(0x80);
--	int chip_state = chip->state;
--	unsigned int timeo, sleep_time;
-+	int z, chip_state = chip->state;
-+	unsigned long timeo;
- 
- 	spin_unlock(chip->mutex);
- 	if (inval_len)
- 		INVALIDATE_CACHED_RANGE(map, inval_adr, inval_len);
-+	if (*chip_op_time)
-+		cfi_udelay(*chip_op_time);
- 	spin_lock(chip->mutex);
- 
--	/* set our timeout to 8 times the expected delay */
--	timeo = chip_op_time * 8;
--	if (!timeo)
--		timeo = 500000;
--	sleep_time = chip_op_time / 2;
-+	timeo = *chip_op_time * 8 * HZ / 1000000;
-+	if (timeo < HZ/2)
-+		timeo = HZ/2;
-+	timeo += jiffies;
- 
-+	z = 0;
- 	for (;;) {
-+		if (chip->state != chip_state) {
-+			/* Someone's suspended the operation: sleep */
-+			DECLARE_WAITQUEUE(wait, current);
-+
-+			set_current_state(TASK_UNINTERRUPTIBLE);
-+			add_wait_queue(&chip->wq, &wait);
-+			spin_unlock(chip->mutex);
-+			schedule();
-+			remove_wait_queue(&chip->wq, &wait);
-+			timeo = jiffies + (HZ / 2); /* FIXME */
-+			spin_lock(chip->mutex);
-+			continue;
-+		}
-+
- 		status = map_read(map, cmd_adr);
- 		if (map_word_andequal(map, status, status_OK, status_OK))
- 			break;
- 
--		if (!timeo) {
-+		/* OK Still waiting */
-+		if (time_after(jiffies, timeo)) {
- 			map_write(map, CMD(0x70), cmd_adr);
- 			chip->state = FL_STATUS;
- 			return -ETIME;
- 		}
- 
--		/* OK Still waiting. Drop the lock, wait a while and retry. */
-+		/* Latency issues. Drop the lock, wait a while and retry */
-+		z++;
- 		spin_unlock(chip->mutex);
--		if (sleep_time >= 1000000/HZ) {
--			/*
--			 * Half of the normal delay still remaining
--			 * can be performed with a sleeping delay instead
--			 * of busy waiting.
--			 */
--			msleep(sleep_time/1000);
--			timeo -= sleep_time;
--			sleep_time = 1000000/HZ;
--		} else {
--			udelay(1);
--			cond_resched();
--			timeo--;
--		}
-+		cfi_udelay(1);
- 		spin_lock(chip->mutex);
--
--		while (chip->state != chip_state) {
--			/* Someone's suspended the operation: sleep */
--			DECLARE_WAITQUEUE(wait, current);
--			set_current_state(TASK_UNINTERRUPTIBLE);
--			add_wait_queue(&chip->wq, &wait);
--			spin_unlock(chip->mutex);
--			schedule();
--			remove_wait_queue(&chip->wq, &wait);
--			spin_lock(chip->mutex);
--		}
- 	}
- 
-+	if (!z) {
-+		if (!--(*chip_op_time))
-+			*chip_op_time = 1;
-+	} else if (z > 1)
-+		++(*chip_op_time);
-+
- 	/* Done and happy. */
-  	chip->state = FL_STATUS;
- 	return 0;
-@@ -1207,7 +1207,8 @@ static int inval_cache_and_wait_for_oper
- #endif
- 
- #define WAIT_TIMEOUT(map, chip, adr, udelay) \
--	INVAL_CACHE_AND_WAIT(map, chip, adr, 0, 0, udelay);
-+	({ int __udelay = (udelay); \
-+	   INVAL_CACHE_AND_WAIT(map, chip, adr, 0, 0, &__udelay); })
- 
- 
- static int do_point_onechip (struct map_info *map, struct flchip *chip, loff_t adr, size_t len)
-@@ -1438,7 +1439,7 @@ static int __xipram do_write_oneword(str
- 
- 	ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
- 				   adr, map_bankwidth(map),
--				   chip->word_write_time);
-+				   &chip->word_write_time);
- 	if (ret) {
- 		xip_enable(map, chip, adr);
- 		printk(KERN_ERR "%s: word write error (status timeout)\n", map->name);
-@@ -1678,7 +1679,7 @@ static int __xipram do_write_buffer(stru
- 
- 	ret = INVAL_CACHE_AND_WAIT(map, chip, cmd_adr,
- 				   initial_adr, initial_len,
--				   chip->buffer_write_time);
-+				   &chip->buffer_write_time);
- 	if (ret) {
- 		map_write(map, CMD(0x70), cmd_adr);
- 		chip->state = FL_STATUS;
-@@ -1813,7 +1814,7 @@ static int __xipram do_erase_oneblock(st
- 
- 	ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
- 				   adr, len,
--				   chip->erase_time);
-+				   &chip->erase_time);
- 	if (ret) {
- 		map_write(map, CMD(0x70), adr);
- 		chip->state = FL_STATUS;
diff --git a/target/linux/generic-2.6/patches-2.6.25/010-disable_old_squashfs_compatibility.patch b/target/linux/generic-2.6/patches-2.6.25/010-disable_old_squashfs_compatibility.patch
deleted file mode 100644
index 01e27573b..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/010-disable_old_squashfs_compatibility.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/fs/squashfs/Makefile
-+++ b/fs/squashfs/Makefile
-@@ -4,4 +4,3 @@
- 
- obj-$(CONFIG_SQUASHFS) += squashfs.o
- squashfs-y += inode.o
--squashfs-y += squashfs2_0.o
---- a/fs/squashfs/squashfs.h
-+++ b/fs/squashfs/squashfs.h
-@@ -24,6 +24,9 @@
- #ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY
- #undef CONFIG_SQUASHFS_1_0_COMPATIBILITY
- #endif
-+#ifdef CONFIG_SQUASHFS_2_0_COMPATIBILITY
-+#undef CONFIG_SQUASHFS_2_0_COMPATIBILITY
-+#endif
- 
- #ifdef SQUASHFS_TRACE
- #define TRACE(s, args...)	printk(KERN_NOTICE "SQUASHFS: "s, ## args)
diff --git a/target/linux/generic-2.6/patches-2.6.25/011-mips_boot.patch b/target/linux/generic-2.6/patches-2.6.25/011-mips_boot.patch
deleted file mode 100644
index 4eba9095c..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/011-mips_boot.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/mips/kernel/head.S
-+++ b/arch/mips/kernel/head.S
-@@ -120,6 +120,8 @@
- #endif
- 	.endm
- 
-+	j kernel_entry
-+	nop
- #ifndef CONFIG_NO_EXCEPT_FILL
- 	/*
- 	 * Reserved space for exception handlers.
diff --git a/target/linux/generic-2.6/patches-2.6.25/024-mips_disable_fpu.patch b/target/linux/generic-2.6/patches-2.6.25/024-mips_disable_fpu.patch
deleted file mode 100644
index 3dfbec792..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/024-mips_disable_fpu.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-MIPS: allow disabling the kernel FPU emulator
-
-This patch allows turning off the in-kernel Algorithmics
-FPU emulator support, which allows one to save a couple of
-precious blocks on an embedded system.
-
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -831,6 +831,17 @@ config I8259
- config MIPS_BONITO64
- 	bool
- 
-+config MIPS_FPU_EMU
-+	bool "Enable FPU emulation"
-+	default y
-+	help
-+	   This option allows building a kernel with or without the Algorithmics
-+	   FPU emulator enabled. Turning off this option results in a kernel which
-+	   does not catch floating operations exceptions. Make sure that your toolchain
-+	   is configured to enable software floating point emulation in that case.
-+		
-+	   If unsure say Y here.
-+
- config MIPS_MSC
- 	bool
- 
---- a/arch/mips/math-emu/Makefile
-+++ b/arch/mips/math-emu/Makefile
-@@ -2,12 +2,14 @@
- # Makefile for the Linux/MIPS kernel FPU emulation.
- #
- 
--obj-y	:= cp1emu.o ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
-+obj-y	:=	kernel_linkage.o dsemul.o cp1emu.o
-+
-+obj-$(CONFIG_MIPS_FPU_EMU)	+= ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
- 	   ieee754xcpt.o dp_frexp.o dp_modf.o dp_div.o dp_mul.o dp_sub.o \
- 	   dp_add.o dp_fsp.o dp_cmp.o dp_logb.o dp_scalb.o dp_simple.o \
- 	   dp_tint.o dp_fint.o dp_tlong.o dp_flong.o sp_frexp.o sp_modf.o \
- 	   sp_div.o sp_mul.o sp_sub.o sp_add.o sp_fdp.o sp_cmp.o sp_logb.o \
- 	   sp_scalb.o sp_simple.o sp_tint.o sp_fint.o sp_tlong.o sp_flong.o \
--	   dp_sqrt.o sp_sqrt.o kernel_linkage.o dsemul.o
-+	   dp_sqrt.o sp_sqrt.o
- 
- EXTRA_CFLAGS += -Werror
---- a/arch/mips/math-emu/cp1emu.c
-+++ b/arch/mips/math-emu/cp1emu.c
-@@ -57,6 +57,12 @@
- #endif
- #define __mips 4
- 
-+/* Further private data for which no space exists in mips_fpu_struct */
-+
-+struct mips_fpu_emulator_stats fpuemustats;
-+
-+#ifdef CONFIG_MIPS_FPU_EMU
-+
- /* Function which emulates a floating point instruction. */
- 
- static int fpu_emu(struct pt_regs *, struct mips_fpu_struct *,
-@@ -67,10 +73,6 @@ static int fpux_emu(struct pt_regs *,
- 	struct mips_fpu_struct *, mips_instruction);
- #endif
- 
--/* Further private data for which no space exists in mips_fpu_struct */
--
--struct mips_fpu_emulator_stats fpuemustats;
--
- /* Control registers */
- 
- #define FPCREG_RID	0	/* $0  = revision id */
-@@ -1277,6 +1279,13 @@ int fpu_emulator_cop1Handler(struct pt_r
- 
- 	return sig;
- }
-+#else
-+int fpu_emulator_cop1Handler(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
-+        int has_fpu)
-+{
-+	return 0;
-+}
-+#endif /* CONFIG_MIPS_FPU_EMU */
- 
- #ifdef CONFIG_DEBUG_FS
- extern struct dentry *mips_debugfs_dir;
---- a/arch/mips/math-emu/dsemul.c
-+++ b/arch/mips/math-emu/dsemul.c
-@@ -110,6 +110,7 @@ int mips_dsemul(struct pt_regs *regs, mi
- 	return SIGILL;		/* force out of emulation loop */
- }
- 
-+#ifdef CONFIG_MIPS_FPU_EMU
- int do_dsemulret(struct pt_regs *xcp)
- {
- 	struct emuframe __user *fr;
-@@ -166,3 +167,9 @@ int do_dsemulret(struct pt_regs *xcp)
- 
- 	return 1;
- }
-+#else
-+int do_dsemulret(struct pt_regs *xcp)
-+{
-+	return 0;
-+}
-+#endif /* CONFIG_MIPS_FPU_EMU */
---- a/arch/mips/math-emu/kernel_linkage.c
-+++ b/arch/mips/math-emu/kernel_linkage.c
-@@ -28,6 +28,7 @@
- 
- #define SIGNALLING_NAN 0x7ff800007ff80000LL
- 
-+#ifdef CONFIG_MIPS_FPU_EMU
- void fpu_emulator_init_fpu(void)
- {
- 	static int first = 1;
-@@ -111,4 +112,36 @@ int fpu_emulator_restore_context32(struc
- 
- 	return err;
- }
--#endif
-+#endif	/* CONFIG_64BIT */
-+#else
-+
-+void fpu_emulator_init_fpu(void)
-+{
-+	printk(KERN_INFO "FPU emulator disabled, make sure your toolchain"
-+		"was compiled with software floating point support (soft-float)\n");
-+	return;
-+}
-+
-+int fpu_emulator_save_context(struct sigcontext __user *sc)
-+{
-+	return 0;
-+}
-+
-+int fpu_emulator_restore_context(struct sigcontext __user *sc)
-+{
-+	return 0;
-+}
-+
-+#ifdef CONFIG_64BIT
-+int fpu_emulator_save_context32(struct sigcontext32 __user *sc)
-+{
-+	return 0;
-+}
-+
-+int fpu_emulator_restore_context32(struct sigcontext32 __user *sc)
-+{
-+	return 0;
-+}
-+
-+#endif	/* CONFIG_64BIT */
-+#endif /* CONFIG_MIPS_FPU_EMU */
diff --git a/target/linux/generic-2.6/patches-2.6.25/060-block2mtd_init.patch b/target/linux/generic-2.6/patches-2.6.25/060-block2mtd_init.patch
deleted file mode 100644
index f5d9b0ca8..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/060-block2mtd_init.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- a/drivers/mtd/devices/block2mtd.c
-+++ b/drivers/mtd/devices/block2mtd.c
-@@ -16,6 +16,7 @@
- #include <linux/list.h>
- #include <linux/init.h>
- #include <linux/mtd/mtd.h>
-+#include <linux/mtd/partitions.h>
- #include <linux/buffer_head.h>
- #include <linux/mutex.h>
- #include <linux/mount.h>
-@@ -237,10 +238,11 @@ static void block2mtd_free_device(struct
- 
- 
- /* FIXME: ensure that mtd->size % erase_size == 0 */
--static struct block2mtd_dev *add_device(char *devname, int erase_size)
-+static struct block2mtd_dev *add_device(char *devname, int erase_size, char *mtdname)
- {
- 	struct block_device *bdev;
- 	struct block2mtd_dev *dev;
-+	struct mtd_partition *part;
- 
- 	if (!devname)
- 		return NULL;
-@@ -279,14 +281,18 @@ static struct block2mtd_dev *add_device(
- 
- 	/* Setup the MTD structure */
- 	/* make the name contain the block device in */
--	dev->mtd.name = kmalloc(sizeof("block2mtd: ") + strlen(devname),
--			GFP_KERNEL);
-+
-+	if (!mtdname)
-+		mtdname = devname;
-+
-+	dev->mtd.name = kmalloc(strlen(mtdname) + 1, GFP_KERNEL);
-+
- 	if (!dev->mtd.name)
- 		goto devinit_err;
-+	
-+	strcpy(dev->mtd.name, mtdname);
- 
--	sprintf(dev->mtd.name, "block2mtd: %s", devname);
--
--	dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK;
-+	dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK & ~(erase_size - 1);
- 	dev->mtd.erasesize = erase_size;
- 	dev->mtd.writesize = 1;
- 	dev->mtd.type = MTD_RAM;
-@@ -298,15 +304,18 @@ static struct block2mtd_dev *add_device(
- 	dev->mtd.read = block2mtd_read;
- 	dev->mtd.priv = dev;
- 	dev->mtd.owner = THIS_MODULE;
--
--	if (add_mtd_device(&dev->mtd)) {
-+	
-+	part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
-+	part->name = dev->mtd.name;
-+	part->offset = 0;
-+	part->size = dev->mtd.size;
-+	if (add_mtd_partitions(&dev->mtd, part, 1)) {
- 		/* Device didnt get added, so free the entry */
- 		goto devinit_err;
- 	}
- 	list_add(&dev->list, &blkmtd_device_list);
- 	INFO("mtd%d: [%s] erase_size = %dKiB [%d]", dev->mtd.index,
--			dev->mtd.name + strlen("blkmtd: "),
--			dev->mtd.erasesize >> 10, dev->mtd.erasesize);
-+			mtdname, dev->mtd.erasesize >> 10, dev->mtd.erasesize);
- 	return dev;
- 
- devinit_err:
-@@ -379,9 +388,9 @@ static char block2mtd_paramline[80 + 12]
- 
- static int block2mtd_setup2(const char *val)
- {
--	char buf[80 + 12]; /* 80 for device, 12 for erase size */
-+	char buf[80 + 12 + 80]; /* 80 for device, 12 for erase size, 80 for name */
- 	char *str = buf;
--	char *token[2];
-+	char *token[3];
- 	char *name;
- 	size_t erase_size = PAGE_SIZE;
- 	int i, ret;
-@@ -392,7 +401,7 @@ static int block2mtd_setup2(const char *
- 	strcpy(str, val);
- 	kill_final_newline(str);
- 
--	for (i = 0; i < 2; i++)
-+	for (i = 0; i < 3; i++)
- 		token[i] = strsep(&str, ",");
- 
- 	if (str)
-@@ -411,8 +420,10 @@ static int block2mtd_setup2(const char *
- 			parse_err("illegal erase size");
- 		}
- 	}
-+	if (token[2] && (strlen(token[2]) + 1 > 80))
-+		parse_err("mtd device name too long");
- 
--	add_device(name, erase_size);
-+	add_device(name, erase_size, token[2]);
- 
- 	return 0;
- }
-@@ -446,7 +457,7 @@ static int block2mtd_setup(const char *v
- 
- 
- module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
--MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>]\"");
-+MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>]]\"");
- 
- static int __init block2mtd_init(void)
- {
diff --git a/target/linux/generic-2.6/patches-2.6.25/065-rootfs_split.patch b/target/linux/generic-2.6/patches-2.6.25/065-rootfs_split.patch
deleted file mode 100644
index 5b882c606..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/065-rootfs_split.patch
+++ /dev/null
@@ -1,951 +0,0 @@
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -47,6 +47,16 @@ config MTD_PARTITIONS
- 	  devices. Partitioning on NFTL 'devices' is a different - that's the
- 	  'normal' form of partitioning used on a block device.
- 
-+config MTD_ROOTFS_ROOT_DEV
-+	bool "Automatically set 'rootfs' partition to be root filesystem"
-+	depends on MTD_PARTITIONS
-+	default y
-+
-+config MTD_ROOTFS_SPLIT
-+	bool "Automatically split 'rootfs' partition for squashfs"
-+	depends on MTD_PARTITIONS
-+	default y
-+
- config MTD_REDBOOT_PARTS
- 	tristate "RedBoot partition table parsing"
- 	depends on MTD_PARTITIONS
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -20,6 +20,8 @@
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
- #include <linux/mtd/compatmac.h>
-+#include <linux/squashfs_fs.h>
-+#include <linux/root_dev.h>
- 
- /* Our partition linked list */
- static LIST_HEAD(mtd_partitions);
-@@ -39,7 +41,7 @@ struct mtd_part {
-  * the pointer to that structure with this macro.
-  */
- #define PART(x)  ((struct mtd_part *)(x))
--
-+#define IS_PART(mtd) (mtd->read == part_read)
- 
- /*
-  * MTD methods which simply translate the effective address and pass through
-@@ -322,6 +324,316 @@ int del_mtd_partitions(struct mtd_info *
- 	return 0;
- }
- 
-+static u_int32_t cur_offset = 0;
-+static int add_one_partition(struct mtd_info *master, const struct mtd_partition *part,
-+		int i, struct mtd_part **slp)
-+{
-+	struct mtd_part *slave;
-+
-+	/* allocate the partition structure */
-+	slave = kzalloc (sizeof(*slave), GFP_KERNEL);
-+	if (!slave) {
-+		printk ("memory allocation error while creating partitions for \"%s\"\n",
-+			master->name);
-+		del_mtd_partitions(master);
-+		return -ENOMEM;
-+	}
-+	list_add(&slave->list, &mtd_partitions);
-+
-+	/* set up the MTD object for this partition */
-+	slave->mtd.type = master->type;
-+	slave->mtd.flags = master->flags & ~part->mask_flags;
-+	slave->mtd.size = part->size;
-+	slave->mtd.writesize = master->writesize;
-+	slave->mtd.oobsize = master->oobsize;
-+	slave->mtd.oobavail = master->oobavail;
-+	slave->mtd.subpage_sft = master->subpage_sft;
-+
-+	slave->mtd.name = part->name;
-+	slave->mtd.owner = master->owner;
-+
-+	slave->mtd.read = part_read;
-+	slave->mtd.write = part_write;
-+
-+	if (master->panic_write)
-+		slave->mtd.panic_write = part_panic_write;
-+
-+	slave->mtd.refresh_device = part->refresh_partition;
-+
-+	if(master->point && master->unpoint){
-+		slave->mtd.point = part_point;
-+		slave->mtd.unpoint = part_unpoint;
-+	}
-+
-+	if (master->read_oob)
-+		slave->mtd.read_oob = part_read_oob;
-+	if (master->write_oob)
-+		slave->mtd.write_oob = part_write_oob;
-+	if(master->read_user_prot_reg)
-+		slave->mtd.read_user_prot_reg = part_read_user_prot_reg;
-+	if(master->read_fact_prot_reg)
-+		slave->mtd.read_fact_prot_reg = part_read_fact_prot_reg;
-+	if(master->write_user_prot_reg)
-+		slave->mtd.write_user_prot_reg = part_write_user_prot_reg;
-+	if(master->lock_user_prot_reg)
-+		slave->mtd.lock_user_prot_reg = part_lock_user_prot_reg;
-+	if(master->get_user_prot_info)
-+		slave->mtd.get_user_prot_info = part_get_user_prot_info;
-+	if(master->get_fact_prot_info)
-+		slave->mtd.get_fact_prot_info = part_get_fact_prot_info;
-+	if (master->sync)
-+		slave->mtd.sync = part_sync;
-+	if (!i && master->suspend && master->resume) {
-+			slave->mtd.suspend = part_suspend;
-+			slave->mtd.resume = part_resume;
-+	}
-+	if (master->writev)
-+		slave->mtd.writev = part_writev;
-+	if (master->lock)
-+		slave->mtd.lock = part_lock;
-+	if (master->unlock)
-+		slave->mtd.unlock = part_unlock;
-+	if (master->block_isbad)
-+		slave->mtd.block_isbad = part_block_isbad;
-+	if (master->block_markbad)
-+		slave->mtd.block_markbad = part_block_markbad;
-+	slave->mtd.erase = part_erase;
-+	slave->master = master;
-+	slave->offset = part->offset;
-+	slave->index = i;
-+
-+	if (slave->offset == MTDPART_OFS_APPEND)
-+		slave->offset = cur_offset;
-+	if (slave->offset == MTDPART_OFS_NXTBLK) {
-+		slave->offset = cur_offset;
-+		if ((cur_offset % master->erasesize) != 0) {
-+			/* Round up to next erasesize */
-+			slave->offset = ((cur_offset / master->erasesize) + 1) * master->erasesize;
-+			printk(KERN_NOTICE "Moving partition %d: "
-+			       "0x%08x -> 0x%08x\n", i,
-+			       cur_offset, slave->offset);
-+		}
-+	}
-+	if (slave->mtd.size == MTDPART_SIZ_FULL)
-+		slave->mtd.size = master->size - slave->offset;
-+	cur_offset = slave->offset + slave->mtd.size;
-+
-+	printk (KERN_NOTICE "0x%08x-0x%08x : \"%s\"\n", slave->offset,
-+		slave->offset + slave->mtd.size, slave->mtd.name);
-+
-+	/* let's do some sanity checks */
-+	if (slave->offset >= master->size) {
-+			/* let's register it anyway to preserve ordering */
-+		slave->offset = 0;
-+		slave->mtd.size = 0;
-+		printk ("mtd: partition \"%s\" is out of reach -- disabled\n",
-+			part->name);
-+	}
-+	if (slave->offset + slave->mtd.size > master->size) {
-+		slave->mtd.size = master->size - slave->offset;
-+		printk ("mtd: partition \"%s\" extends beyond the end of device \"%s\" -- size truncated to %#x\n",
-+			part->name, master->name, slave->mtd.size);
-+	}
-+	if (master->numeraseregions>1) {
-+		/* Deal with variable erase size stuff */
-+		int i;
-+		struct mtd_erase_region_info *regions = master->eraseregions;
-+
-+		/* Find the first erase regions which is part of this partition. */
-+		for (i=0; i < master->numeraseregions && slave->offset >= regions[i].offset; i++)
-+			;
-+
-+		for (i--; i < master->numeraseregions && slave->offset + slave->mtd.size > regions[i].offset; i++) {
-+			if (slave->mtd.erasesize < regions[i].erasesize) {
-+				slave->mtd.erasesize = regions[i].erasesize;
-+			}
-+		}
-+	} else {
-+		/* Single erase size */
-+		slave->mtd.erasesize = master->erasesize;
-+	}
-+
-+	if ((slave->mtd.flags & MTD_WRITEABLE) &&
-+	    (slave->offset % slave->mtd.erasesize)) {
-+		/* Doesn't start on a boundary of major erase size */
-+		/* FIXME: Let it be writable if it is on a boundary of _minor_ erase size though */
-+		slave->mtd.flags &= ~MTD_WRITEABLE;
-+		printk ("mtd: partition \"%s\" doesn't start on an erase block boundary -- force read-only\n",
-+			part->name);
-+	}
-+	if ((slave->mtd.flags & MTD_WRITEABLE) &&
-+	    (slave->mtd.size % slave->mtd.erasesize)) {
-+		slave->mtd.flags &= ~MTD_WRITEABLE;
-+		printk ("mtd: partition \"%s\" doesn't end on an erase block -- force read-only\n",
-+			part->name);
-+	}
-+
-+	slave->mtd.ecclayout = master->ecclayout;
-+	if (master->block_isbad) {
-+		uint32_t offs = 0;
-+
-+		while(offs < slave->mtd.size) {
-+			if (master->block_isbad(master,
-+						offs + slave->offset))
-+				slave->mtd.ecc_stats.badblocks++;
-+			offs += slave->mtd.erasesize;
-+		}
-+	}
-+
-+	if(part->mtdp)
-+	{	/* store the object pointer (caller may or may not register it */
-+		*part->mtdp = &slave->mtd;
-+		slave->registered = 0;
-+	}
-+	else
-+	{
-+		/* register our partition */
-+		add_mtd_device(&slave->mtd);
-+		slave->registered = 1;
-+	}
-+
-+	if (slp)
-+		*slp = slave;
-+
-+	return 0;
-+}
-+
-+#ifdef CONFIG_MTD_ROOTFS_SPLIT
-+#define ROOTFS_SPLIT_NAME "rootfs_data"
-+#define ROOTFS_REMOVED_NAME "<removed>"
-+static int split_squashfs(struct mtd_info *master, int offset, int *split_offset)
-+{
-+	char buf[512];
-+	struct squashfs_super_block *sb = (struct squashfs_super_block *) buf;
-+	int len, ret;
-+
-+	ret = master->read(master, offset, sizeof(*sb), &len, buf);
-+	if (ret || (len != sizeof(*sb))) {
-+		printk(KERN_ALERT "split_squashfs: error occured while reading "
-+			"from \"%s\"\n", master->name);
-+		return -EINVAL;
-+	}
-+
-+	if (*((u32 *) buf) != SQUASHFS_MAGIC) {
-+		printk(KERN_ALERT "split_squashfs: no squashfs found in \"%s\"\n",
-+			master->name);
-+		*split_offset = 0;
-+		return 0;
-+	}
-+
-+	if (sb->bytes_used <= 0) {
-+		printk(KERN_ALERT "split_squashfs: squashfs is empty in \"%s\"\n",
-+			master->name);
-+		*split_offset = 0;
-+		return 0;
-+	}
-+
-+	len = (u32) sb->bytes_used;
-+	len += (offset & 0x000fffff);
-+	len +=  (master->erasesize - 1);
-+	len &= ~(master->erasesize - 1);
-+	len -= (offset & 0x000fffff);
-+	*split_offset = offset + len;
-+
-+	return 0;
-+}
-+
-+static int split_rootfs_data(struct mtd_info *master, struct mtd_info *rpart, struct mtd_partition *part,
-+		int index)
-+{
-+	struct mtd_partition *dpart;
-+	struct mtd_part *slave = NULL;
-+	int split_offset = 0;
-+	int ret;
-+
-+	ret = split_squashfs(master, part->offset, &split_offset);
-+	if (ret)
-+		return ret;
-+
-+	if (split_offset <= 0)
-+		return 0;
-+
-+	dpart = kmalloc(sizeof(*part)+sizeof(ROOTFS_SPLIT_NAME)+1, GFP_KERNEL);
-+	if (dpart == NULL) {
-+		printk(KERN_INFO "split_squashfs: no memory for partition \"%s\"\n",
-+			ROOTFS_SPLIT_NAME);
-+		return -ENOMEM;
-+	}
-+
-+	memcpy(dpart, part, sizeof(*part));
-+	dpart->name = (unsigned char *)&dpart[1];
-+	strcpy(dpart->name, ROOTFS_SPLIT_NAME);
-+
-+	dpart->size -= split_offset - dpart->offset;
-+	dpart->offset = split_offset;
-+
-+	if (dpart == NULL)
-+		return 1;
-+
-+	printk(KERN_INFO "mtd: partition \"%s\" created automatically, ofs=%X, len=%X \n",
-+		ROOTFS_SPLIT_NAME, dpart->offset, dpart->size);
-+
-+	ret = add_one_partition(master, dpart, index, &slave);
-+	if (ret)
-+		kfree(dpart);
-+	else if (slave)
-+		rpart->split = &slave->mtd;
-+
-+	return ret;
-+}
-+
-+static int refresh_rootfs_split(struct mtd_info *mtd)
-+{
-+	struct mtd_partition tpart;
-+	struct mtd_part *part;
-+	int index = 0;
-+	int offset, size;
-+	int ret;
-+
-+	part = PART(mtd);
-+
-+	/* check for the new squashfs offset first */
-+	ret = split_squashfs(part->master, part->offset, &offset);
-+	if (ret)
-+		return ret;
-+
-+	if ((offset > 0) && !mtd->split) {
-+		printk(KERN_INFO "%s: creating new split partition for \"%s\"\n", __func__, mtd->name);
-+		/* if we don't have a rootfs split partition, create a new one */
-+		tpart.name = mtd->name;
-+		tpart.size = mtd->size;
-+		tpart.offset = part->offset;
-+
-+		/* find the index of the last partition */
-+		if (!list_empty(&mtd_partitions))
-+			index = list_first_entry(&mtd_partitions, struct mtd_part, list)->index + 1;
-+
-+		return split_rootfs_data(part->master, &part->mtd, &tpart, index);
-+	} else if ((offset > 0) && mtd->split) {
-+		/* update the offsets of the existing partition */
-+		size = mtd->size + part->offset - offset;
-+
-+		part = PART(mtd->split);
-+		part->offset = offset;
-+		part->mtd.size = size;
-+		printk(KERN_INFO "%s: %s partition \"" ROOTFS_SPLIT_NAME "\", offset: 0x%06x (0x%06x)\n",
-+			__func__, (!strcmp(part->mtd.name, ROOTFS_SPLIT_NAME) ? "updating" : "creating"),
-+			part->offset, part->mtd.size);
-+		strcpy(part->mtd.name, ROOTFS_SPLIT_NAME);
-+	} else if ((offset <= 0) && mtd->split) {
-+		printk(KERN_INFO "%s: removing partition \"%s\"\n", __func__, mtd->split->name);
-+
-+		/* mark existing partition as removed */
-+		part = PART(mtd->split);
-+		strcpy(part->mtd.name, ROOTFS_REMOVED_NAME);
-+		part->offset = 0;
-+		part->mtd.size = 0;
-+	}
-+
-+	return 0;
-+}
-+#endif /* CONFIG_MTD_ROOTFS_SPLIT */
-+
- /*
-  * This function, given a master MTD object and a partition table, creates
-  * and registers slave MTD objects which are bound to the master according to
-@@ -334,171 +646,31 @@ int add_mtd_partitions(struct mtd_info *
- 		       int nbparts)
- {
- 	struct mtd_part *slave;
--	u_int32_t cur_offset = 0;
--	int i;
-+	struct mtd_partition *part;
-+	int i, j, ret = 0;
- 
- 	printk (KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
- 
--	for (i = 0; i < nbparts; i++) {
--
--		/* allocate the partition structure */
--		slave = kzalloc (sizeof(*slave), GFP_KERNEL);
--		if (!slave) {
--			printk ("memory allocation error while creating partitions for \"%s\"\n",
--				master->name);
--			del_mtd_partitions(master);
--			return -ENOMEM;
--		}
--		list_add(&slave->list, &mtd_partitions);
--
--		/* set up the MTD object for this partition */
--		slave->mtd.type = master->type;
--		slave->mtd.flags = master->flags & ~parts[i].mask_flags;
--		slave->mtd.size = parts[i].size;
--		slave->mtd.writesize = master->writesize;
--		slave->mtd.oobsize = master->oobsize;
--		slave->mtd.oobavail = master->oobavail;
--		slave->mtd.subpage_sft = master->subpage_sft;
--
--		slave->mtd.name = parts[i].name;
--		slave->mtd.owner = master->owner;
--
--		slave->mtd.read = part_read;
--		slave->mtd.write = part_write;
--
--		if (master->panic_write)
--			slave->mtd.panic_write = part_panic_write;
--
--		if(master->point && master->unpoint){
--			slave->mtd.point = part_point;
--			slave->mtd.unpoint = part_unpoint;
--		}
--
--		if (master->read_oob)
--			slave->mtd.read_oob = part_read_oob;
--		if (master->write_oob)
--			slave->mtd.write_oob = part_write_oob;
--		if(master->read_user_prot_reg)
--			slave->mtd.read_user_prot_reg = part_read_user_prot_reg;
--		if(master->read_fact_prot_reg)
--			slave->mtd.read_fact_prot_reg = part_read_fact_prot_reg;
--		if(master->write_user_prot_reg)
--			slave->mtd.write_user_prot_reg = part_write_user_prot_reg;
--		if(master->lock_user_prot_reg)
--			slave->mtd.lock_user_prot_reg = part_lock_user_prot_reg;
--		if(master->get_user_prot_info)
--			slave->mtd.get_user_prot_info = part_get_user_prot_info;
--		if(master->get_fact_prot_info)
--			slave->mtd.get_fact_prot_info = part_get_fact_prot_info;
--		if (master->sync)
--			slave->mtd.sync = part_sync;
--		if (!i && master->suspend && master->resume) {
--				slave->mtd.suspend = part_suspend;
--				slave->mtd.resume = part_resume;
--		}
--		if (master->writev)
--			slave->mtd.writev = part_writev;
--		if (master->lock)
--			slave->mtd.lock = part_lock;
--		if (master->unlock)
--			slave->mtd.unlock = part_unlock;
--		if (master->block_isbad)
--			slave->mtd.block_isbad = part_block_isbad;
--		if (master->block_markbad)
--			slave->mtd.block_markbad = part_block_markbad;
--		slave->mtd.erase = part_erase;
--		slave->master = master;
--		slave->offset = parts[i].offset;
--		slave->index = i;
--
--		if (slave->offset == MTDPART_OFS_APPEND)
--			slave->offset = cur_offset;
--		if (slave->offset == MTDPART_OFS_NXTBLK) {
--			slave->offset = cur_offset;
--			if ((cur_offset % master->erasesize) != 0) {
--				/* Round up to next erasesize */
--				slave->offset = ((cur_offset / master->erasesize) + 1) * master->erasesize;
--				printk(KERN_NOTICE "Moving partition %d: "
--				       "0x%08x -> 0x%08x\n", i,
--				       cur_offset, slave->offset);
--			}
--		}
--		if (slave->mtd.size == MTDPART_SIZ_FULL)
--			slave->mtd.size = master->size - slave->offset;
--		cur_offset = slave->offset + slave->mtd.size;
--
--		printk (KERN_NOTICE "0x%08x-0x%08x : \"%s\"\n", slave->offset,
--			slave->offset + slave->mtd.size, slave->mtd.name);
--
--		/* let's do some sanity checks */
--		if (slave->offset >= master->size) {
--				/* let's register it anyway to preserve ordering */
--			slave->offset = 0;
--			slave->mtd.size = 0;
--			printk ("mtd: partition \"%s\" is out of reach -- disabled\n",
--				parts[i].name);
--		}
--		if (slave->offset + slave->mtd.size > master->size) {
--			slave->mtd.size = master->size - slave->offset;
--			printk ("mtd: partition \"%s\" extends beyond the end of device \"%s\" -- size truncated to %#x\n",
--				parts[i].name, master->name, slave->mtd.size);
--		}
--		if (master->numeraseregions>1) {
--			/* Deal with variable erase size stuff */
--			int i;
--			struct mtd_erase_region_info *regions = master->eraseregions;
--
--			/* Find the first erase regions which is part of this partition. */
--			for (i=0; i < master->numeraseregions && slave->offset >= regions[i].offset; i++)
--				;
--
--			for (i--; i < master->numeraseregions && slave->offset + slave->mtd.size > regions[i].offset; i++) {
--				if (slave->mtd.erasesize < regions[i].erasesize) {
--					slave->mtd.erasesize = regions[i].erasesize;
--				}
-+	for (i = 0, j = 0; i < nbparts; i++) {
-+		part = (struct mtd_partition *) &parts[i];
-+		ret = add_one_partition(master, part, j, &slave);
-+		if (ret)
-+			return ret;
-+		j++;
-+
-+		if (strcmp(part->name, "rootfs") == 0 && slave->registered) {
-+#ifdef CONFIG_MTD_ROOTFS_ROOT_DEV
-+			if (ROOT_DEV == 0) {
-+				printk(KERN_NOTICE "mtd: partition \"rootfs\" "
-+					"set to be root filesystem\n");
-+				ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, slave->mtd.index);
- 			}
--		} else {
--			/* Single erase size */
--			slave->mtd.erasesize = master->erasesize;
--		}
--
--		if ((slave->mtd.flags & MTD_WRITEABLE) &&
--		    (slave->offset % slave->mtd.erasesize)) {
--			/* Doesn't start on a boundary of major erase size */
--			/* FIXME: Let it be writable if it is on a boundary of _minor_ erase size though */
--			slave->mtd.flags &= ~MTD_WRITEABLE;
--			printk ("mtd: partition \"%s\" doesn't start on an erase block boundary -- force read-only\n",
--				parts[i].name);
--		}
--		if ((slave->mtd.flags & MTD_WRITEABLE) &&
--		    (slave->mtd.size % slave->mtd.erasesize)) {
--			slave->mtd.flags &= ~MTD_WRITEABLE;
--			printk ("mtd: partition \"%s\" doesn't end on an erase block -- force read-only\n",
--				parts[i].name);
--		}
--
--		slave->mtd.ecclayout = master->ecclayout;
--		if (master->block_isbad) {
--			uint32_t offs = 0;
--
--			while(offs < slave->mtd.size) {
--				if (master->block_isbad(master,
--							offs + slave->offset))
--					slave->mtd.ecc_stats.badblocks++;
--				offs += slave->mtd.erasesize;
--			}
--		}
--
--		if(parts[i].mtdp)
--		{	/* store the object pointer (caller may or may not register it */
--			*parts[i].mtdp = &slave->mtd;
--			slave->registered = 0;
--		}
--		else
--		{
--			/* register our partition */
--			add_mtd_device(&slave->mtd);
--			slave->registered = 1;
-+#endif
-+#ifdef CONFIG_MTD_ROOTFS_SPLIT
-+			ret = split_rootfs_data(master, &slave->mtd, part, j);
-+			if (ret == 0)
-+				j++;
-+#endif
- 		}
- 	}
- 
-@@ -574,6 +746,32 @@ int parse_mtd_partitions(struct mtd_info
- 	return ret;
- }
- 
-+int refresh_mtd_partitions(struct mtd_info *mtd)
-+{
-+	int ret = 0;
-+
-+	if (IS_PART(mtd)) {
-+		struct mtd_part *part;
-+		struct mtd_info *master;
-+
-+		part = PART(mtd);
-+		master = part->master;
-+		if (master->refresh_device)
-+			ret = master->refresh_device(master);
-+	}
-+
-+	if (!ret && mtd->refresh_device)
-+		ret = mtd->refresh_device(mtd);
-+
-+#ifdef CONFIG_MTD_ROOTFS_SPLIT
-+	if (!ret && IS_PART(mtd) && !strcmp(mtd->name, "rootfs"))
-+		refresh_rootfs_split(mtd);
-+#endif
-+
-+	return 0;
-+}
-+
- EXPORT_SYMBOL_GPL(parse_mtd_partitions);
-+EXPORT_SYMBOL_GPL(refresh_mtd_partitions);
- EXPORT_SYMBOL_GPL(register_mtd_parser);
- EXPORT_SYMBOL_GPL(deregister_mtd_parser);
---- a/drivers/mtd/devices/block2mtd.c
-+++ b/drivers/mtd/devices/block2mtd.c
-@@ -34,6 +34,8 @@ struct block2mtd_dev {
- 	struct block_device *blkdev;
- 	struct mtd_info mtd;
- 	struct mutex write_mutex;
-+	rwlock_t bdev_mutex;
-+	char devname[0];
- };
- 
- 
-@@ -86,6 +88,12 @@ static int block2mtd_erase(struct mtd_in
- 	size_t len = instr->len;
- 	int err;
- 
-+	read_lock(&dev->bdev_mutex);
-+	if (!dev->blkdev) {
-+		err = -EINVAL;
-+		goto done;
-+	}
-+
- 	instr->state = MTD_ERASING;
- 	mutex_lock(&dev->write_mutex);
- 	err = _block2mtd_erase(dev, from, len);
-@@ -98,6 +106,10 @@ static int block2mtd_erase(struct mtd_in
- 
- 	instr->state = MTD_ERASE_DONE;
- 	mtd_erase_callback(instr);
-+
-+done:
-+	read_unlock(&dev->bdev_mutex);
-+
- 	return err;
- }
- 
-@@ -109,10 +121,14 @@ static int block2mtd_read(struct mtd_inf
- 	struct page *page;
- 	int index = from >> PAGE_SHIFT;
- 	int offset = from & (PAGE_SIZE-1);
--	int cpylen;
-+	int cpylen, err = 0;
-+
-+	read_lock(&dev->bdev_mutex);
-+	if (!dev->blkdev || (from > mtd->size)) {
-+		err = -EINVAL;
-+		goto done;
-+	}
- 
--	if (from > mtd->size)
--		return -EINVAL;
- 	if (from + len > mtd->size)
- 		len = mtd->size - from;
- 
-@@ -127,10 +143,14 @@ static int block2mtd_read(struct mtd_inf
- 		len = len - cpylen;
- 
- 		page = page_read(dev->blkdev->bd_inode->i_mapping, index);
--		if (!page)
--			return -ENOMEM;
--		if (IS_ERR(page))
--			return PTR_ERR(page);
-+		if (!page) {
-+			err = -ENOMEM;
-+			goto done;
-+		}
-+		if (IS_ERR(page)) {
-+			err = PTR_ERR(page);
-+			goto done;
-+		}
- 
- 		memcpy(buf, page_address(page) + offset, cpylen);
- 		page_cache_release(page);
-@@ -141,7 +161,10 @@ static int block2mtd_read(struct mtd_inf
- 		offset = 0;
- 		index++;
- 	}
--	return 0;
-+
-+done:
-+	read_unlock(&dev->bdev_mutex);
-+	return err;
- }
- 
- 
-@@ -193,12 +216,22 @@ static int block2mtd_write(struct mtd_in
- 		size_t *retlen, const u_char *buf)
- {
- 	struct block2mtd_dev *dev = mtd->priv;
--	int err;
-+	int err = 0;
-+
-+	read_lock(&dev->bdev_mutex);
-+	if (!dev->blkdev) {
-+		err = -EINVAL;
-+		goto done;
-+	}
- 
- 	if (!len)
--		return 0;
--	if (to >= mtd->size)
--		return -ENOSPC;
-+		goto done;
-+
-+	if (to >= mtd->size) {
-+		err = -ENOSPC;
-+		goto done;
-+	}
-+
- 	if (to + len > mtd->size)
- 		len = mtd->size - to;
- 
-@@ -207,6 +240,9 @@ static int block2mtd_write(struct mtd_in
- 	mutex_unlock(&dev->write_mutex);
- 	if (err > 0)
- 		err = 0;
-+
-+done:
-+	read_unlock(&dev->bdev_mutex);
- 	return err;
- }
- 
-@@ -215,51 +251,29 @@ static int block2mtd_write(struct mtd_in
- static void block2mtd_sync(struct mtd_info *mtd)
- {
- 	struct block2mtd_dev *dev = mtd->priv;
--	sync_blockdev(dev->blkdev);
--	return;
--}
--
--
--static void block2mtd_free_device(struct block2mtd_dev *dev)
--{
--	if (!dev)
--		return;
--
--	kfree(dev->mtd.name);
- 
--	if (dev->blkdev) {
--		invalidate_mapping_pages(dev->blkdev->bd_inode->i_mapping,
--					0, -1);
--		close_bdev_excl(dev->blkdev);
--	}
-+	read_lock(&dev->bdev_mutex);
-+	if (dev->blkdev)
-+		sync_blockdev(dev->blkdev);
-+	read_unlock(&dev->bdev_mutex);
- 
--	kfree(dev);
-+	return;
- }
- 
- 
--/* FIXME: ensure that mtd->size % erase_size == 0 */
--static struct block2mtd_dev *add_device(char *devname, int erase_size, char *mtdname)
-+static int _open_bdev(struct block2mtd_dev *dev)
- {
- 	struct block_device *bdev;
--	struct block2mtd_dev *dev;
--	struct mtd_partition *part;
--
--	if (!devname)
--		return NULL;
--
--	dev = kzalloc(sizeof(struct block2mtd_dev), GFP_KERNEL);
--	if (!dev)
--		return NULL;
- 
- 	/* Get a handle on the device */
--	bdev = open_bdev_excl(devname, O_RDWR, NULL);
-+	bdev = open_bdev_excl(dev->devname, O_RDWR, NULL);
- #ifndef MODULE
- 	if (IS_ERR(bdev)) {
- 
- 		/* We might not have rootfs mounted at this point. Try
- 		   to resolve the device name by other means. */
- 
--		dev_t devt = name_to_dev_t(devname);
-+		dev_t devt = name_to_dev_t(dev->devname);
- 		if (devt) {
- 			bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
- 		}
-@@ -267,17 +281,96 @@ static struct block2mtd_dev *add_device(
- #endif
- 
- 	if (IS_ERR(bdev)) {
--		ERROR("error: cannot open device %s", devname);
--		goto devinit_err;
-+		ERROR("error: cannot open device %s", dev->devname);
-+		return 1;
- 	}
- 	dev->blkdev = bdev;
- 
- 	if (MAJOR(bdev->bd_dev) == MTD_BLOCK_MAJOR) {
- 		ERROR("attempting to use an MTD device as a block device");
--		goto devinit_err;
-+		return 1;
- 	}
- 
-+	return 0;
-+}
-+
-+static void _close_bdev(struct block2mtd_dev *dev)
-+{
-+	struct block_device *bdev;
-+
-+	if (!dev->blkdev)
-+		return;
-+
-+	bdev = dev->blkdev;
-+	invalidate_mapping_pages(dev->blkdev->bd_inode->i_mapping, 0, -1);
-+	close_bdev_excl(dev->blkdev);
-+	dev->blkdev = NULL;
-+}
-+
-+static void block2mtd_free_device(struct block2mtd_dev *dev)
-+{
-+	if (!dev)
-+		return;
-+
-+	kfree(dev->mtd.name);
-+	_close_bdev(dev);
-+	kfree(dev);
-+}
-+
-+
-+static int block2mtd_refresh(struct mtd_info *mtd)
-+{
-+	struct block2mtd_dev *dev = mtd->priv;
-+	struct block_device *bdev;
-+	dev_t devt;
-+	int err = 0;
-+
-+	/* no other mtd function can run at this point */
-+	write_lock(&dev->bdev_mutex);
-+
-+	/* get the device number for the whole disk */
-+	devt = MKDEV(MAJOR(dev->blkdev->bd_dev), 0);
-+
-+	/* close the old block device */
-+	_close_bdev(dev);
-+
-+	/* open the whole disk, issue a partition rescan, then */
-+	bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
-+	if (!bdev || !bdev->bd_disk)
-+		err = -EINVAL;
-+	else {
-+		err = rescan_partitions(bdev->bd_disk, bdev);
-+	}
-+	if (bdev)
-+		close_bdev_excl(bdev);
-+
-+	/* try to open the partition block device again */
-+	_open_bdev(dev);
-+	write_unlock(&dev->bdev_mutex);
-+
-+	return err;
-+}
-+
-+/* FIXME: ensure that mtd->size % erase_size == 0 */
-+static struct block2mtd_dev *add_device(char *devname, int erase_size, char *mtdname)
-+{
-+	struct block2mtd_dev *dev;
-+	struct mtd_partition *part;
-+
-+	if (!devname)
-+		return NULL;
-+
-+	dev = kzalloc(sizeof(struct block2mtd_dev) + strlen(devname) + 1, GFP_KERNEL);
-+	if (!dev)
-+		return NULL;
-+
-+	strcpy(dev->devname, devname);
-+
-+	if (_open_bdev(dev))
-+		goto devinit_err;
-+
- 	mutex_init(&dev->write_mutex);
-+	rwlock_init(&dev->bdev_mutex);
- 
- 	/* Setup the MTD structure */
- 	/* make the name contain the block device in */
-@@ -304,6 +397,7 @@ static struct block2mtd_dev *add_device(
- 	dev->mtd.read = block2mtd_read;
- 	dev->mtd.priv = dev;
- 	dev->mtd.owner = THIS_MODULE;
-+	dev->mtd.refresh_device = block2mtd_refresh;
- 	
- 	part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
- 	part->name = dev->mtd.name;
---- a/drivers/mtd/mtdchar.c
-+++ b/drivers/mtd/mtdchar.c
-@@ -17,6 +17,7 @@
- 
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/compatmac.h>
-+#include <linux/mtd/partitions.h>
- 
- #include <asm/uaccess.h>
- 
-@@ -756,6 +757,13 @@ static int mtd_ioctl(struct inode *inode
- 		file->f_pos = 0;
- 		break;
- 	}
-+#ifdef CONFIG_MTD_PARTITIONS
-+	case MTDREFRESH:
-+	{
-+		ret = refresh_mtd_partitions(mtd);
-+		break;
-+	}
-+#endif
- 
- 	default:
- 		ret = -ENOTTY;
---- a/include/linux/mtd/mtd.h
-+++ b/include/linux/mtd/mtd.h
-@@ -98,6 +98,7 @@ struct mtd_oob_ops {
- 	uint8_t		*oobbuf;
- };
- 
-+struct mtd_info;
- struct mtd_info {
- 	u_char type;
- 	u_int32_t flags;
-@@ -211,6 +212,9 @@ struct mtd_info {
- 	struct module *owner;
- 	int usecount;
- 
-+	int (*refresh_device)(struct mtd_info *mtd);
-+	struct mtd_info *split;
-+
- 	/* If the driver is something smart, like UBI, it may need to maintain
- 	 * its own reference counting. The below functions are only for driver.
- 	 * The driver may register its callbacks. These callbacks are not
---- a/include/linux/mtd/partitions.h
-+++ b/include/linux/mtd/partitions.h
-@@ -36,6 +36,7 @@
-  * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
-  */
- 
-+struct mtd_partition;
- struct mtd_partition {
- 	char *name;			/* identifier string */
- 	u_int32_t size;			/* partition size */
-@@ -43,6 +44,7 @@ struct mtd_partition {
- 	u_int32_t mask_flags;		/* master MTD flags to mask out for this partition */
- 	struct nand_ecclayout *ecclayout;	/* out of band layout for this partition (NAND only)*/
- 	struct mtd_info **mtdp;		/* pointer to store the MTD object */
-+	int (*refresh_partition)(struct mtd_info *);
- };
- 
- #define MTDPART_OFS_NXTBLK	(-2)
-@@ -52,6 +54,7 @@ struct mtd_partition {
- 
- int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int);
- int del_mtd_partitions(struct mtd_info *);
-+int refresh_mtd_partitions(struct mtd_info *);
- 
- /*
-  * Functions dealing with the various ways of partitioning the space
---- a/include/mtd/mtd-abi.h
-+++ b/include/mtd/mtd-abi.h
-@@ -95,6 +95,7 @@ struct otp_info {
- #define ECCGETLAYOUT		_IOR('M', 17, struct nand_ecclayout)
- #define ECCGETSTATS		_IOR('M', 18, struct mtd_ecc_stats)
- #define MTDFILEMODE		_IO('M', 19)
-+#define MTDREFRESH		_IO('M', 23)
- 
- /*
-  * Obsolete legacy interface. Keep it in order not to break userspace
diff --git a/target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch b/target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch
deleted file mode 100644
index 784fba1b7..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/drivers/mtd/redboot.c
-+++ b/drivers/mtd/redboot.c
-@@ -251,14 +251,21 @@ static int parse_redboot_partitions(stru
- #endif
- 		names += strlen(names)+1;
- 
--#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
- 		if(fl->next && fl->img->flash_base + fl->img->size + master->erasesize <= fl->next->img->flash_base) {
--			i++;
--			parts[i].offset = parts[i-1].size + parts[i-1].offset;
--			parts[i].size = fl->next->img->flash_base - parts[i].offset;
--			parts[i].name = nullname;
--		}
-+			if (!strcmp(parts[i].name, "rootfs")) {
-+				parts[i].size = fl->next->img->flash_base;
-+				parts[i].size &= ~(master->erasesize - 1);
-+				parts[i].size -= parts[i].offset;
-+#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
-+				nrparts--;
-+			} else {
-+				i++;
-+				parts[i].offset = parts[i-1].size + parts[i-1].offset;
-+				parts[i].size = fl->next->img->flash_base - parts[i].offset;
-+				parts[i].name = nullname;
- #endif
-+			}
-+		}
- 		tmp_fl = fl;
- 		fl = fl->next;
- 		kfree(tmp_fl);
diff --git a/target/linux/generic-2.6/patches-2.6.25/080-mtd_plat_nand_chip_fixup.patch b/target/linux/generic-2.6/patches-2.6.25/080-mtd_plat_nand_chip_fixup.patch
deleted file mode 100644
index 61f2806bd..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/080-mtd_plat_nand_chip_fixup.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/include/linux/mtd/nand.h
-+++ b/include/linux/mtd/nand.h
-@@ -573,6 +573,7 @@ struct platform_nand_chip {
- 	int			chip_delay;
- 	unsigned int		options;
- 	const char		**part_probe_types;
-+	int			(*chip_fixup)(struct mtd_info *mtd);
- 	void			*priv;
- };
- 
---- a/drivers/mtd/nand/plat_nand.c
-+++ b/drivers/mtd/nand/plat_nand.c
-@@ -70,7 +70,18 @@ static int __init plat_nand_probe(struct
- 	platform_set_drvdata(pdev, data);
- 
- 	/* Scan to find existance of the device */
--	if (nand_scan(&data->mtd, 1)) {
-+	if (nand_scan_ident(&data->mtd, 1)) {
-+		res = -ENXIO;
-+		goto out;
-+	}
-+
-+	if (pdata->chip.chip_fixup) {
-+		res = pdata->chip.chip_fixup(&data->mtd);
-+		if (res)
-+			goto out;
-+	}
-+
-+	if (nand_scan_tail(&data->mtd)) {
- 		res = -ENXIO;
- 		goto out;
- 	}
diff --git a/target/linux/generic-2.6/patches-2.6.25/100-netfilter_layer7_2.21.patch b/target/linux/generic-2.6/patches-2.6.25/100-netfilter_layer7_2.21.patch
deleted file mode 100644
index 307f08860..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/100-netfilter_layer7_2.21.patch
+++ /dev/null
@@ -1,2132 +0,0 @@
---- /dev/null
-+++ b/include/linux/netfilter/xt_layer7.h
-@@ -0,0 +1,13 @@
-+#ifndef _XT_LAYER7_H
-+#define _XT_LAYER7_H
-+
-+#define MAX_PATTERN_LEN 8192
-+#define MAX_PROTOCOL_LEN 256
-+
-+struct xt_layer7_info {
-+    char protocol[MAX_PROTOCOL_LEN];
-+    char pattern[MAX_PATTERN_LEN];
-+    u_int8_t invert;
-+};
-+
-+#endif /* _XT_LAYER7_H */
---- a/include/net/netfilter/nf_conntrack.h
-+++ b/include/net/netfilter/nf_conntrack.h
-@@ -124,6 +124,22 @@ struct nf_conn
- 	u_int32_t secmark;
- #endif
- 
-+#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || \
-+    defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
-+	struct {
-+		/*
-+		 * e.g. "http". NULL before decision. "unknown" after decision
-+		 * if no match.
-+		 */
-+		char *app_proto;
-+		/*
-+		 * application layer data so far. NULL after match decision.
-+		 */
-+		char *app_data;
-+		unsigned int app_data_len;
-+	} layer7;
-+#endif
-+
- 	/* Storage reserved for other modules: */
- 	union nf_conntrack_proto proto;
- 
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -735,6 +735,27 @@ config NETFILTER_XT_MATCH_STATE
- 
- 	  To compile it as a module, choose M here.  If unsure, say N.
- 
-+config NETFILTER_XT_MATCH_LAYER7
-+	tristate '"layer7" match support'
-+	depends on NETFILTER_XTABLES
-+	depends on EXPERIMENTAL && (IP_NF_CONNTRACK || NF_CONNTRACK)
-+       depends on NF_CT_ACCT
-+	help
-+	  Say Y if you want to be able to classify connections (and their
-+	  packets) based on regular expression matching of their application
-+	  layer data.   This is one way to classify applications such as
-+	  peer-to-peer filesharing systems that do not always use the same
-+	  port.
-+
-+	  To compile it as a module, choose M here.  If unsure, say N.
-+
-+config NETFILTER_XT_MATCH_LAYER7_DEBUG
-+        bool 'Layer 7 debugging output'
-+        depends on NETFILTER_XT_MATCH_LAYER7
-+        help
-+          Say Y to get lots of debugging output.
-+
-+
- config NETFILTER_XT_MATCH_STATISTIC
- 	tristate '"statistic" match support'
- 	depends on NETFILTER_XTABLES
---- a/net/netfilter/Makefile
-+++ b/net/netfilter/Makefile
-@@ -77,6 +77,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RATEEST)
- obj-$(CONFIG_NETFILTER_XT_MATCH_REALM) += xt_realm.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
-+obj-$(CONFIG_NETFILTER_XT_MATCH_LAYER7) += xt_layer7.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_STATISTIC) += xt_statistic.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) += xt_string.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
---- a/net/netfilter/nf_conntrack_core.c
-+++ b/net/netfilter/nf_conntrack_core.c
-@@ -208,6 +208,14 @@ destroy_conntrack(struct nf_conntrack *n
- 	 * too. */
- 	nf_ct_remove_expectations(ct);
- 
-+	#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
-+	if(ct->layer7.app_proto)
-+		kfree(ct->layer7.app_proto);
-+	if(ct->layer7.app_data)
-+	kfree(ct->layer7.app_data);
-+	#endif
-+
-+
- 	/* We overload first tuple to link into unconfirmed list. */
- 	if (!nf_ct_is_confirmed(ct)) {
- 		BUG_ON(hlist_unhashed(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnode));
---- a/net/netfilter/nf_conntrack_standalone.c
-+++ b/net/netfilter/nf_conntrack_standalone.c
-@@ -181,6 +181,12 @@ static int ct_seq_show(struct seq_file *
- 		return -ENOSPC;
- #endif
- 
-+#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
-+	if(ct->layer7.app_proto &&
-+           seq_printf(s, "l7proto=%s ", ct->layer7.app_proto))
-+		return -ENOSPC;
-+#endif
-+
- 	if (seq_printf(s, "use=%u\n", atomic_read(&ct->ct_general.use)))
- 		return -ENOSPC;
- 
---- /dev/null
-+++ b/net/netfilter/regexp/regexp.c
-@@ -0,0 +1,1197 @@
-+/*
-+ * regcomp and regexec -- regsub and regerror are elsewhere
-+ * @(#)regexp.c	1.3 of 18 April 87
-+ *
-+ *	Copyright (c) 1986 by University of Toronto.
-+ *	Written by Henry Spencer.  Not derived from licensed software.
-+ *
-+ *	Permission is granted to anyone to use this software for any
-+ *	purpose on any computer system, and to redistribute it freely,
-+ *	subject to the following restrictions:
-+ *
-+ *	1. The author is not responsible for the consequences of use of
-+ *		this software, no matter how awful, even if they arise
-+ *		from defects in it.
-+ *
-+ *	2. The origin of this software must not be misrepresented, either
-+ *		by explicit claim or by omission.
-+ *
-+ *	3. Altered versions must be plainly marked as such, and must not
-+ *		be misrepresented as being the original software.
-+ *
-+ * Beware that some of this code is subtly aware of the way operator
-+ * precedence is structured in regular expressions.  Serious changes in
-+ * regular-expression syntax might require a total rethink.
-+ *
-+ * This code was modified by Ethan Sommer to work within the kernel
-+ * (it now uses kmalloc etc..)
-+ *
-+ * Modified slightly by Matthew Strait to use more modern C.
-+ */
-+
-+#include "regexp.h"
-+#include "regmagic.h"
-+
-+/* added by ethan and matt.  Lets it work in both kernel and user space.
-+(So iptables can use it, for instance.)  Yea, it goes both ways... */
-+#if __KERNEL__
-+  #define malloc(foo) kmalloc(foo,GFP_ATOMIC)
-+#else
-+  #define printk(format,args...) printf(format,##args)
-+#endif
-+
-+void regerror(char * s)
-+{
-+        printk("<3>Regexp: %s\n", s);
-+        /* NOTREACHED */
-+}
-+
-+/*
-+ * The "internal use only" fields in regexp.h are present to pass info from
-+ * compile to execute that permits the execute phase to run lots faster on
-+ * simple cases.  They are:
-+ *
-+ * regstart	char that must begin a match; '\0' if none obvious
-+ * reganch	is the match anchored (at beginning-of-line only)?
-+ * regmust	string (pointer into program) that match must include, or NULL
-+ * regmlen	length of regmust string
-+ *
-+ * Regstart and reganch permit very fast decisions on suitable starting points
-+ * for a match, cutting down the work a lot.  Regmust permits fast rejection
-+ * of lines that cannot possibly match.  The regmust tests are costly enough
-+ * that regcomp() supplies a regmust only if the r.e. contains something
-+ * potentially expensive (at present, the only such thing detected is * or +
-+ * at the start of the r.e., which can involve a lot of backup).  Regmlen is
-+ * supplied because the test in regexec() needs it and regcomp() is computing
-+ * it anyway.
-+ */
-+
-+/*
-+ * Structure for regexp "program".  This is essentially a linear encoding
-+ * of a nondeterministic finite-state machine (aka syntax charts or
-+ * "railroad normal form" in parsing technology).  Each node is an opcode
-+ * plus a "next" pointer, possibly plus an operand.  "Next" pointers of
-+ * all nodes except BRANCH implement concatenation; a "next" pointer with
-+ * a BRANCH on both ends of it is connecting two alternatives.  (Here we
-+ * have one of the subtle syntax dependencies:  an individual BRANCH (as
-+ * opposed to a collection of them) is never concatenated with anything
-+ * because of operator precedence.)  The operand of some types of node is
-+ * a literal string; for others, it is a node leading into a sub-FSM.  In
-+ * particular, the operand of a BRANCH node is the first node of the branch.
-+ * (NB this is *not* a tree structure:  the tail of the branch connects
-+ * to the thing following the set of BRANCHes.)  The opcodes are:
-+ */
-+
-+/* definition	number	opnd?	meaning */
-+#define	END	0	/* no	End of program. */
-+#define	BOL	1	/* no	Match "" at beginning of line. */
-+#define	EOL	2	/* no	Match "" at end of line. */
-+#define	ANY	3	/* no	Match any one character. */
-+#define	ANYOF	4	/* str	Match any character in this string. */
-+#define	ANYBUT	5	/* str	Match any character not in this string. */
-+#define	BRANCH	6	/* node	Match this alternative, or the next... */
-+#define	BACK	7	/* no	Match "", "next" ptr points backward. */
-+#define	EXACTLY	8	/* str	Match this string. */
-+#define	NOTHING	9	/* no	Match empty string. */
-+#define	STAR	10	/* node	Match this (simple) thing 0 or more times. */
-+#define	PLUS	11	/* node	Match this (simple) thing 1 or more times. */
-+#define	OPEN	20	/* no	Mark this point in input as start of #n. */
-+			/*	OPEN+1 is number 1, etc. */
-+#define	CLOSE	30	/* no	Analogous to OPEN. */
-+
-+/*
-+ * Opcode notes:
-+ *
-+ * BRANCH	The set of branches constituting a single choice are hooked
-+ *		together with their "next" pointers, since precedence prevents
-+ *		anything being concatenated to any individual branch.  The
-+ *		"next" pointer of the last BRANCH in a choice points to the
-+ *		thing following the whole choice.  This is also where the
-+ *		final "next" pointer of each individual branch points; each
-+ *		branch starts with the operand node of a BRANCH node.
-+ *
-+ * BACK		Normal "next" pointers all implicitly point forward; BACK
-+ *		exists to make loop structures possible.
-+ *
-+ * STAR,PLUS	'?', and complex '*' and '+', are implemented as circular
-+ *		BRANCH structures using BACK.  Simple cases (one character
-+ *		per match) are implemented with STAR and PLUS for speed
-+ *		and to minimize recursive plunges.
-+ *
-+ * OPEN,CLOSE	...are numbered at compile time.
-+ */
-+
-+/*
-+ * A node is one char of opcode followed by two chars of "next" pointer.
-+ * "Next" pointers are stored as two 8-bit pieces, high order first.  The
-+ * value is a positive offset from the opcode of the node containing it.
-+ * An operand, if any, simply follows the node.  (Note that much of the
-+ * code generation knows about this implicit relationship.)
-+ *
-+ * Using two bytes for the "next" pointer is vast overkill for most things,
-+ * but allows patterns to get big without disasters.
-+ */
-+#define	OP(p)	(*(p))
-+#define	NEXT(p)	(((*((p)+1)&0377)<<8) + (*((p)+2)&0377))
-+#define	OPERAND(p)	((p) + 3)
-+
-+/*
-+ * See regmagic.h for one further detail of program structure.
-+ */
-+
-+
-+/*
-+ * Utility definitions.
-+ */
-+#ifndef CHARBITS
-+#define	UCHARAT(p)	((int)*(unsigned char *)(p))
-+#else
-+#define	UCHARAT(p)	((int)*(p)&CHARBITS)
-+#endif
-+
-+#define	FAIL(m)	{ regerror(m); return(NULL); }
-+#define	ISMULT(c)	((c) == '*' || (c) == '+' || (c) == '?')
-+#define	META	"^$.[()|?+*\\"
-+
-+/*
-+ * Flags to be passed up and down.
-+ */
-+#define	HASWIDTH	01	/* Known never to match null string. */
-+#define	SIMPLE		02	/* Simple enough to be STAR/PLUS operand. */
-+#define	SPSTART		04	/* Starts with * or +. */
-+#define	WORST		0	/* Worst case. */
-+
-+/*
-+ * Global work variables for regcomp().
-+ */
-+struct match_globals {
-+char *reginput;		/* String-input pointer. */
-+char *regbol;		/* Beginning of input, for ^ check. */
-+char **regstartp;	/* Pointer to startp array. */
-+char **regendp;		/* Ditto for endp. */
-+char *regparse;		/* Input-scan pointer. */
-+int regnpar;		/* () count. */
-+char regdummy;
-+char *regcode;		/* Code-emit pointer; &regdummy = don't. */
-+long regsize;		/* Code size. */
-+};
-+
-+/*
-+ * Forward declarations for regcomp()'s friends.
-+ */
-+#ifndef STATIC
-+#define	STATIC	static
-+#endif
-+STATIC char *reg(struct match_globals *g, int paren,int *flagp);
-+STATIC char *regbranch(struct match_globals *g, int *flagp);
-+STATIC char *regpiece(struct match_globals *g, int *flagp);
-+STATIC char *regatom(struct match_globals *g, int *flagp);
-+STATIC char *regnode(struct match_globals *g, char op);
-+STATIC char *regnext(struct match_globals *g, char *p);
-+STATIC void regc(struct match_globals *g, char b);
-+STATIC void reginsert(struct match_globals *g, char op, char *opnd);
-+STATIC void regtail(struct match_globals *g, char *p, char *val);
-+STATIC void regoptail(struct match_globals *g, char *p, char *val);
-+
-+
-+__kernel_size_t my_strcspn(const char *s1,const char *s2)
-+{
-+        char *scan1;
-+        char *scan2;
-+        int count;
-+
-+        count = 0;
-+        for (scan1 = (char *)s1; *scan1 != '\0'; scan1++) {
-+                for (scan2 = (char *)s2; *scan2 != '\0';)       /* ++ moved down. */
-+                        if (*scan1 == *scan2++)
-+                                return(count);
-+                count++;
-+        }
-+        return(count);
-+}
-+
-+/*
-+ - regcomp - compile a regular expression into internal code
-+ *
-+ * We can't allocate space until we know how big the compiled form will be,
-+ * but we can't compile it (and thus know how big it is) until we've got a
-+ * place to put the code.  So we cheat:  we compile it twice, once with code
-+ * generation turned off and size counting turned on, and once "for real".
-+ * This also means that we don't allocate space until we are sure that the
-+ * thing really will compile successfully, and we never have to move the
-+ * code and thus invalidate pointers into it.  (Note that it has to be in
-+ * one piece because free() must be able to free it all.)
-+ *
-+ * Beware that the optimization-preparation code in here knows about some
-+ * of the structure of the compiled regexp.
-+ */
-+regexp *
-+regcomp(char *exp,int *patternsize)
-+{
-+	register regexp *r;
-+	register char *scan;
-+	register char *longest;
-+	register int len;
-+	int flags;
-+	struct match_globals g;
-+	
-+	/* commented out by ethan
-+	   extern char *malloc();
-+	*/
-+
-+	if (exp == NULL)
-+		FAIL("NULL argument");
-+
-+	/* First pass: determine size, legality. */
-+	g.regparse = exp;
-+	g.regnpar = 1;
-+	g.regsize = 0L;
-+	g.regcode = &g.regdummy;
-+	regc(&g, MAGIC);
-+	if (reg(&g, 0, &flags) == NULL)
-+		return(NULL);
-+
-+	/* Small enough for pointer-storage convention? */
-+	if (g.regsize >= 32767L)		/* Probably could be 65535L. */
-+		FAIL("regexp too big");
-+
-+	/* Allocate space. */
-+	*patternsize=sizeof(regexp) + (unsigned)g.regsize;
-+	r = (regexp *)malloc(sizeof(regexp) + (unsigned)g.regsize);
-+	if (r == NULL)
-+		FAIL("out of space");
-+
-+	/* Second pass: emit code. */
-+	g.regparse = exp;
-+	g.regnpar = 1;
-+	g.regcode = r->program;
-+	regc(&g, MAGIC);
-+	if (reg(&g, 0, &flags) == NULL)
-+		return(NULL);
-+
-+	/* Dig out information for optimizations. */
-+	r->regstart = '\0';	/* Worst-case defaults. */
-+	r->reganch = 0;
-+	r->regmust = NULL;
-+	r->regmlen = 0;
-+	scan = r->program+1;			/* First BRANCH. */
-+	if (OP(regnext(&g, scan)) == END) {		/* Only one top-level choice. */
-+		scan = OPERAND(scan);
-+
-+		/* Starting-point info. */
-+		if (OP(scan) == EXACTLY)
-+			r->regstart = *OPERAND(scan);
-+		else if (OP(scan) == BOL)
-+			r->reganch++;
-+
-+		/*
-+		 * If there's something expensive in the r.e., find the
-+		 * longest literal string that must appear and make it the
-+		 * regmust.  Resolve ties in favor of later strings, since
-+		 * the regstart check works with the beginning of the r.e.
-+		 * and avoiding duplication strengthens checking.  Not a
-+		 * strong reason, but sufficient in the absence of others.
-+		 */
-+		if (flags&SPSTART) {
-+			longest = NULL;
-+			len = 0;
-+			for (; scan != NULL; scan = regnext(&g, scan))
-+				if (OP(scan) == EXACTLY && strlen(OPERAND(scan)) >= len) {
-+					longest = OPERAND(scan);
-+					len = strlen(OPERAND(scan));
-+				}
-+			r->regmust = longest;
-+			r->regmlen = len;
-+		}
-+	}
-+
-+	return(r);
-+}
-+
-+/*
-+ - reg - regular expression, i.e. main body or parenthesized thing
-+ *
-+ * Caller must absorb opening parenthesis.
-+ *
-+ * Combining parenthesis handling with the base level of regular expression
-+ * is a trifle forced, but the need to tie the tails of the branches to what
-+ * follows makes it hard to avoid.
-+ */
-+static char *
-+reg(struct match_globals *g, int paren, int *flagp /* Parenthesized? */ )
-+{
-+	register char *ret;
-+	register char *br;
-+	register char *ender;
-+	register int parno = 0; /* 0 makes gcc happy */
-+	int flags;
-+
-+	*flagp = HASWIDTH;	/* Tentatively. */
-+
-+	/* Make an OPEN node, if parenthesized. */
-+	if (paren) {
-+		if (g->regnpar >= NSUBEXP)
-+			FAIL("too many ()");
-+		parno = g->regnpar;
-+		g->regnpar++;
-+		ret = regnode(g, OPEN+parno);
-+	} else
-+		ret = NULL;
-+
-+	/* Pick up the branches, linking them together. */
-+	br = regbranch(g, &flags);
-+	if (br == NULL)
-+		return(NULL);
-+	if (ret != NULL)
-+		regtail(g, ret, br);	/* OPEN -> first. */
-+	else
-+		ret = br;
-+	if (!(flags&HASWIDTH))
-+		*flagp &= ~HASWIDTH;
-+	*flagp |= flags&SPSTART;
-+	while (*g->regparse == '|') {
-+		g->regparse++;
-+		br = regbranch(g, &flags);
-+		if (br == NULL)
-+			return(NULL);
-+		regtail(g, ret, br);	/* BRANCH -> BRANCH. */
-+		if (!(flags&HASWIDTH))
-+			*flagp &= ~HASWIDTH;
-+		*flagp |= flags&SPSTART;
-+	}
-+
-+	/* Make a closing node, and hook it on the end. */
-+	ender = regnode(g, (paren) ? CLOSE+parno : END);	
-+	regtail(g, ret, ender);
-+
-+	/* Hook the tails of the branches to the closing node. */
-+	for (br = ret; br != NULL; br = regnext(g, br))
-+		regoptail(g, br, ender);
-+
-+	/* Check for proper termination. */
-+	if (paren && *g->regparse++ != ')') {
-+		FAIL("unmatched ()");
-+	} else if (!paren && *g->regparse != '\0') {
-+		if (*g->regparse == ')') {
-+			FAIL("unmatched ()");
-+		} else
-+			FAIL("junk on end");	/* "Can't happen". */
-+		/* NOTREACHED */
-+	}
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regbranch - one alternative of an | operator
-+ *
-+ * Implements the concatenation operator.
-+ */
-+static char *
-+regbranch(struct match_globals *g, int *flagp)
-+{
-+	register char *ret;
-+	register char *chain;
-+	register char *latest;
-+	int flags;
-+
-+	*flagp = WORST;		/* Tentatively. */
-+
-+	ret = regnode(g, BRANCH);
-+	chain = NULL;
-+	while (*g->regparse != '\0' && *g->regparse != '|' && *g->regparse != ')') {
-+		latest = regpiece(g, &flags);
-+		if (latest == NULL)
-+			return(NULL);
-+		*flagp |= flags&HASWIDTH;
-+		if (chain == NULL)	/* First piece. */
-+			*flagp |= flags&SPSTART;
-+		else
-+			regtail(g, chain, latest);
-+		chain = latest;
-+	}
-+	if (chain == NULL)	/* Loop ran zero times. */
-+		(void) regnode(g, NOTHING);
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regpiece - something followed by possible [*+?]
-+ *
-+ * Note that the branching code sequences used for ? and the general cases
-+ * of * and + are somewhat optimized:  they use the same NOTHING node as
-+ * both the endmarker for their branch list and the body of the last branch.
-+ * It might seem that this node could be dispensed with entirely, but the
-+ * endmarker role is not redundant.
-+ */
-+static char *
-+regpiece(struct match_globals *g, int *flagp)
-+{
-+	register char *ret;
-+	register char op;
-+	register char *next;
-+	int flags;
-+
-+	ret = regatom(g, &flags);
-+	if (ret == NULL)
-+		return(NULL);
-+
-+	op = *g->regparse;
-+	if (!ISMULT(op)) {
-+		*flagp = flags;
-+		return(ret);
-+	}
-+
-+	if (!(flags&HASWIDTH) && op != '?')
-+		FAIL("*+ operand could be empty");
-+	*flagp = (op != '+') ? (WORST|SPSTART) : (WORST|HASWIDTH);
-+
-+	if (op == '*' && (flags&SIMPLE))
-+		reginsert(g, STAR, ret);
-+	else if (op == '*') {
-+		/* Emit x* as (x&|), where & means "self". */
-+		reginsert(g, BRANCH, ret);			/* Either x */
-+		regoptail(g, ret, regnode(g, BACK));		/* and loop */
-+		regoptail(g, ret, ret);			/* back */
-+		regtail(g, ret, regnode(g, BRANCH));		/* or */
-+		regtail(g, ret, regnode(g, NOTHING));		/* null. */
-+	} else if (op == '+' && (flags&SIMPLE))
-+		reginsert(g, PLUS, ret);
-+	else if (op == '+') {
-+		/* Emit x+ as x(&|), where & means "self". */
-+		next = regnode(g, BRANCH);			/* Either */
-+		regtail(g, ret, next);
-+		regtail(g, regnode(g, BACK), ret);		/* loop back */
-+		regtail(g, next, regnode(g, BRANCH));		/* or */
-+		regtail(g, ret, regnode(g, NOTHING));		/* null. */
-+	} else if (op == '?') {
-+		/* Emit x? as (x|) */
-+		reginsert(g, BRANCH, ret);			/* Either x */
-+		regtail(g, ret, regnode(g, BRANCH));		/* or */
-+		next = regnode(g, NOTHING);		/* null. */
-+		regtail(g, ret, next);
-+		regoptail(g, ret, next);
-+	}
-+	g->regparse++;
-+	if (ISMULT(*g->regparse))
-+		FAIL("nested *?+");
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regatom - the lowest level
-+ *
-+ * Optimization:  gobbles an entire sequence of ordinary characters so that
-+ * it can turn them into a single node, which is smaller to store and
-+ * faster to run.  Backslashed characters are exceptions, each becoming a
-+ * separate node; the code is simpler that way and it's not worth fixing.
-+ */
-+static char *
-+regatom(struct match_globals *g, int *flagp)
-+{
-+	register char *ret;
-+	int flags;
-+
-+	*flagp = WORST;		/* Tentatively. */
-+
-+	switch (*g->regparse++) {
-+	case '^':
-+		ret = regnode(g, BOL);
-+		break;
-+	case '$':
-+		ret = regnode(g, EOL);
-+		break;
-+	case '.':
-+		ret = regnode(g, ANY);
-+		*flagp |= HASWIDTH|SIMPLE;
-+		break;
-+	case '[': {
-+			register int class;
-+			register int classend;
-+
-+			if (*g->regparse == '^') {	/* Complement of range. */
-+				ret = regnode(g, ANYBUT);
-+				g->regparse++;
-+			} else
-+				ret = regnode(g, ANYOF);
-+			if (*g->regparse == ']' || *g->regparse == '-')
-+				regc(g, *g->regparse++);
-+			while (*g->regparse != '\0' && *g->regparse != ']') {
-+				if (*g->regparse == '-') {
-+					g->regparse++;
-+					if (*g->regparse == ']' || *g->regparse == '\0')
-+						regc(g, '-');
-+					else {
-+						class = UCHARAT(g->regparse-2)+1;
-+						classend = UCHARAT(g->regparse);
-+						if (class > classend+1)
-+							FAIL("invalid [] range");
-+						for (; class <= classend; class++)
-+							regc(g, class);
-+						g->regparse++;
-+					}
-+				} else
-+					regc(g, *g->regparse++);
-+			}
-+			regc(g, '\0');
-+			if (*g->regparse != ']')
-+				FAIL("unmatched []");
-+			g->regparse++;
-+			*flagp |= HASWIDTH|SIMPLE;
-+		}
-+		break;
-+	case '(':
-+		ret = reg(g, 1, &flags);
-+		if (ret == NULL)
-+			return(NULL);
-+		*flagp |= flags&(HASWIDTH|SPSTART);
-+		break;
-+	case '\0':
-+	case '|':
-+	case ')':
-+		FAIL("internal urp");	/* Supposed to be caught earlier. */
-+		break;
-+	case '?':
-+	case '+':
-+	case '*':
-+		FAIL("?+* follows nothing");
-+		break;
-+	case '\\':
-+		if (*g->regparse == '\0')
-+			FAIL("trailing \\");
-+		ret = regnode(g, EXACTLY);
-+		regc(g, *g->regparse++);
-+		regc(g, '\0');
-+		*flagp |= HASWIDTH|SIMPLE;
-+		break;
-+	default: {
-+			register int len;
-+			register char ender;
-+
-+			g->regparse--;
-+			len = my_strcspn((const char *)g->regparse, (const char *)META);
-+			if (len <= 0)
-+				FAIL("internal disaster");
-+			ender = *(g->regparse+len);
-+			if (len > 1 && ISMULT(ender))
-+				len--;		/* Back off clear of ?+* operand. */
-+			*flagp |= HASWIDTH;
-+			if (len == 1)
-+				*flagp |= SIMPLE;
-+			ret = regnode(g, EXACTLY);
-+			while (len > 0) {
-+				regc(g, *g->regparse++);
-+				len--;
-+			}
-+			regc(g, '\0');
-+		}
-+		break;
-+	}
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regnode - emit a node
-+ */
-+static char *			/* Location. */
-+regnode(struct match_globals *g, char op)
-+{
-+	register char *ret;
-+	register char *ptr;
-+
-+	ret = g->regcode;
-+	if (ret == &g->regdummy) {
-+		g->regsize += 3;
-+		return(ret);
-+	}
-+
-+	ptr = ret;
-+	*ptr++ = op;
-+	*ptr++ = '\0';		/* Null "next" pointer. */
-+	*ptr++ = '\0';
-+	g->regcode = ptr;
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regc - emit (if appropriate) a byte of code
-+ */
-+static void
-+regc(struct match_globals *g, char b)
-+{
-+	if (g->regcode != &g->regdummy)
-+		*g->regcode++ = b;
-+	else
-+		g->regsize++;
-+}
-+
-+/*
-+ - reginsert - insert an operator in front of already-emitted operand
-+ *
-+ * Means relocating the operand.
-+ */
-+static void
-+reginsert(struct match_globals *g, char op, char* opnd)
-+{
-+	register char *src;
-+	register char *dst;
-+	register char *place;
-+
-+	if (g->regcode == &g->regdummy) {
-+		g->regsize += 3;
-+		return;
-+	}
-+
-+	src = g->regcode;
-+	g->regcode += 3;
-+	dst = g->regcode;
-+	while (src > opnd)
-+		*--dst = *--src;
-+
-+	place = opnd;		/* Op node, where operand used to be. */
-+	*place++ = op;
-+	*place++ = '\0';
-+	*place++ = '\0';
-+}
-+
-+/*
-+ - regtail - set the next-pointer at the end of a node chain
-+ */
-+static void
-+regtail(struct match_globals *g, char *p, char *val)
-+{
-+	register char *scan;
-+	register char *temp;
-+	register int offset;
-+
-+	if (p == &g->regdummy)
-+		return;
-+
-+	/* Find last node. */
-+	scan = p;
-+	for (;;) {
-+		temp = regnext(g, scan);
-+		if (temp == NULL)
-+			break;
-+		scan = temp;
-+	}
-+
-+	if (OP(scan) == BACK)
-+		offset = scan - val;
-+	else
-+		offset = val - scan;
-+	*(scan+1) = (offset>>8)&0377;
-+	*(scan+2) = offset&0377;
-+}
-+
-+/*
-+ - regoptail - regtail on operand of first argument; nop if operandless
-+ */
-+static void
-+regoptail(struct match_globals *g, char *p, char *val)
-+{
-+	/* "Operandless" and "op != BRANCH" are synonymous in practice. */
-+	if (p == NULL || p == &g->regdummy || OP(p) != BRANCH)
-+		return;
-+	regtail(g, OPERAND(p), val);
-+}
-+
-+/*
-+ * regexec and friends
-+ */
-+
-+
-+/*
-+ * Forwards.
-+ */
-+STATIC int regtry(struct match_globals *g, regexp *prog, char *string);
-+STATIC int regmatch(struct match_globals *g, char *prog);
-+STATIC int regrepeat(struct match_globals *g, char *p);
-+
-+#ifdef DEBUG
-+int regnarrate = 0;
-+void regdump();
-+STATIC char *regprop(char *op);
-+#endif
-+
-+/*
-+ - regexec - match a regexp against a string
-+ */
-+int
-+regexec(regexp *prog, char *string)
-+{
-+	register char *s;
-+	struct match_globals g;
-+
-+	/* Be paranoid... */
-+	if (prog == NULL || string == NULL) {
-+		printk("<3>Regexp: NULL parameter\n");
-+		return(0);
-+	}
-+
-+	/* Check validity of program. */
-+	if (UCHARAT(prog->program) != MAGIC) {
-+		printk("<3>Regexp: corrupted program\n");
-+		return(0);
-+	}
-+
-+	/* If there is a "must appear" string, look for it. */
-+	if (prog->regmust != NULL) {
-+		s = string;
-+		while ((s = strchr(s, prog->regmust[0])) != NULL) {
-+			if (strncmp(s, prog->regmust, prog->regmlen) == 0)
-+				break;	/* Found it. */
-+			s++;
-+		}
-+		if (s == NULL)	/* Not present. */
-+			return(0);
-+	}
-+
-+	/* Mark beginning of line for ^ . */
-+	g.regbol = string;
-+
-+	/* Simplest case:  anchored match need be tried only once. */
-+	if (prog->reganch)
-+		return(regtry(&g, prog, string));
-+
-+	/* Messy cases:  unanchored match. */
-+	s = string;
-+	if (prog->regstart != '\0')
-+		/* We know what char it must start with. */
-+		while ((s = strchr(s, prog->regstart)) != NULL) {
-+			if (regtry(&g, prog, s))
-+				return(1);
-+			s++;
-+		}
-+	else
-+		/* We don't -- general case. */
-+		do {
-+			if (regtry(&g, prog, s))
-+				return(1);
-+		} while (*s++ != '\0');
-+
-+	/* Failure. */
-+	return(0);
-+}
-+
-+/*
-+ - regtry - try match at specific point
-+ */
-+static int			/* 0 failure, 1 success */
-+regtry(struct match_globals *g, regexp *prog, char *string)
-+{
-+	register int i;
-+	register char **sp;
-+	register char **ep;
-+
-+	g->reginput = string;
-+	g->regstartp = prog->startp;
-+	g->regendp = prog->endp;
-+
-+	sp = prog->startp;
-+	ep = prog->endp;
-+	for (i = NSUBEXP; i > 0; i--) {
-+		*sp++ = NULL;
-+		*ep++ = NULL;
-+	}
-+	if (regmatch(g, prog->program + 1)) {
-+		prog->startp[0] = string;
-+		prog->endp[0] = g->reginput;
-+		return(1);
-+	} else
-+		return(0);
-+}
-+
-+/*
-+ - regmatch - main matching routine
-+ *
-+ * Conceptually the strategy is simple:  check to see whether the current
-+ * node matches, call self recursively to see whether the rest matches,
-+ * and then act accordingly.  In practice we make some effort to avoid
-+ * recursion, in particular by going through "ordinary" nodes (that don't
-+ * need to know whether the rest of the match failed) by a loop instead of
-+ * by recursion.
-+ */
-+static int			/* 0 failure, 1 success */
-+regmatch(struct match_globals *g, char *prog)
-+{
-+	register char *scan = prog; /* Current node. */
-+	char *next;		    /* Next node. */
-+
-+#ifdef DEBUG
-+	if (scan != NULL && regnarrate)
-+		fprintf(stderr, "%s(\n", regprop(scan));
-+#endif
-+	while (scan != NULL) {
-+#ifdef DEBUG
-+		if (regnarrate)
-+			fprintf(stderr, "%s...\n", regprop(scan));
-+#endif
-+		next = regnext(g, scan);
-+
-+		switch (OP(scan)) {
-+		case BOL:
-+			if (g->reginput != g->regbol)
-+				return(0);
-+			break;
-+		case EOL:
-+			if (*g->reginput != '\0')
-+				return(0);
-+			break;
-+		case ANY:
-+			if (*g->reginput == '\0')
-+				return(0);
-+			g->reginput++;
-+			break;
-+		case EXACTLY: {
-+				register int len;
-+				register char *opnd;
-+
-+				opnd = OPERAND(scan);
-+				/* Inline the first character, for speed. */
-+				if (*opnd != *g->reginput)
-+					return(0);
-+				len = strlen(opnd);
-+				if (len > 1 && strncmp(opnd, g->reginput, len) != 0)
-+					return(0);
-+				g->reginput += len;
-+			}
-+			break;
-+		case ANYOF:
-+			if (*g->reginput == '\0' || strchr(OPERAND(scan), *g->reginput) == NULL)
-+				return(0);
-+			g->reginput++;
-+			break;
-+		case ANYBUT:
-+			if (*g->reginput == '\0' || strchr(OPERAND(scan), *g->reginput) != NULL)
-+				return(0);
-+			g->reginput++;
-+			break;
-+		case NOTHING:
-+		case BACK:
-+			break;
-+		case OPEN+1:
-+		case OPEN+2:
-+		case OPEN+3:
-+		case OPEN+4:
-+		case OPEN+5:
-+		case OPEN+6:
-+		case OPEN+7:
-+		case OPEN+8:
-+		case OPEN+9: {
-+				register int no;
-+				register char *save;
-+
-+				no = OP(scan) - OPEN;
-+				save = g->reginput;
-+
-+				if (regmatch(g, next)) {
-+					/*
-+					 * Don't set startp if some later
-+					 * invocation of the same parentheses
-+					 * already has.
-+					 */
-+					if (g->regstartp[no] == NULL)
-+						g->regstartp[no] = save;
-+					return(1);
-+				} else
-+					return(0);
-+			}
-+			break;
-+		case CLOSE+1:
-+		case CLOSE+2:
-+		case CLOSE+3:
-+		case CLOSE+4:
-+		case CLOSE+5:
-+		case CLOSE+6:
-+		case CLOSE+7:
-+		case CLOSE+8:
-+		case CLOSE+9:
-+			{
-+				register int no;
-+				register char *save;
-+
-+				no = OP(scan) - CLOSE;
-+				save = g->reginput;
-+
-+				if (regmatch(g, next)) {
-+					/*
-+					 * Don't set endp if some later
-+					 * invocation of the same parentheses
-+					 * already has.
-+					 */
-+					if (g->regendp[no] == NULL)
-+						g->regendp[no] = save;
-+					return(1);
-+				} else
-+					return(0);
-+			}
-+			break;
-+		case BRANCH: {
-+				register char *save;
-+
-+				if (OP(next) != BRANCH)		/* No choice. */
-+					next = OPERAND(scan);	/* Avoid recursion. */
-+				else {
-+					do {
-+						save = g->reginput;
-+						if (regmatch(g, OPERAND(scan)))
-+							return(1);
-+						g->reginput = save;
-+						scan = regnext(g, scan);
-+					} while (scan != NULL && OP(scan) == BRANCH);
-+					return(0);
-+					/* NOTREACHED */
-+				}
-+			}
-+			break;
-+		case STAR:
-+		case PLUS: {
-+				register char nextch;
-+				register int no;
-+				register char *save;
-+				register int min;
-+
-+				/*
-+				 * Lookahead to avoid useless match attempts
-+				 * when we know what character comes next.
-+				 */
-+				nextch = '\0';
-+				if (OP(next) == EXACTLY)
-+					nextch = *OPERAND(next);
-+				min = (OP(scan) == STAR) ? 0 : 1;
-+				save = g->reginput;
-+				no = regrepeat(g, OPERAND(scan));
-+				while (no >= min) {
-+					/* If it could work, try it. */
-+					if (nextch == '\0' || *g->reginput == nextch)
-+						if (regmatch(g, next))
-+							return(1);
-+					/* Couldn't or didn't -- back up. */
-+					no--;
-+					g->reginput = save + no;
-+				}
-+				return(0);
-+			}
-+			break;
-+		case END:
-+			return(1);	/* Success! */
-+			break;
-+		default:
-+			printk("<3>Regexp: memory corruption\n");
-+			return(0);
-+			break;
-+		}
-+
-+		scan = next;
-+	}
-+
-+	/*
-+	 * We get here only if there's trouble -- normally "case END" is
-+	 * the terminating point.
-+	 */
-+	printk("<3>Regexp: corrupted pointers\n");
-+	return(0);
-+}
-+
-+/*
-+ - regrepeat - repeatedly match something simple, report how many
-+ */
-+static int
-+regrepeat(struct match_globals *g, char *p)
-+{
-+	register int count = 0;
-+	register char *scan;
-+	register char *opnd;
-+
-+	scan = g->reginput;
-+	opnd = OPERAND(p);
-+	switch (OP(p)) {
-+	case ANY:
-+		count = strlen(scan);
-+		scan += count;
-+		break;
-+	case EXACTLY:
-+		while (*opnd == *scan) {
-+			count++;
-+			scan++;
-+		}
-+		break;
-+	case ANYOF:
-+		while (*scan != '\0' && strchr(opnd, *scan) != NULL) {
-+			count++;
-+			scan++;
-+		}
-+		break;
-+	case ANYBUT:
-+		while (*scan != '\0' && strchr(opnd, *scan) == NULL) {
-+			count++;
-+			scan++;
-+		}
-+		break;
-+	default:		/* Oh dear.  Called inappropriately. */
-+		printk("<3>Regexp: internal foulup\n");
-+		count = 0;	/* Best compromise. */
-+		break;
-+	}
-+	g->reginput = scan;
-+
-+	return(count);
-+}
-+
-+/*
-+ - regnext - dig the "next" pointer out of a node
-+ */
-+static char*
-+regnext(struct match_globals *g, char *p)
-+{
-+	register int offset;
-+
-+	if (p == &g->regdummy)
-+		return(NULL);
-+
-+	offset = NEXT(p);
-+	if (offset == 0)
-+		return(NULL);
-+
-+	if (OP(p) == BACK)
-+		return(p-offset);
-+	else
-+		return(p+offset);
-+}
-+
-+#ifdef DEBUG
-+
-+STATIC char *regprop();
-+
-+/*
-+ - regdump - dump a regexp onto stdout in vaguely comprehensible form
-+ */
-+void
-+regdump(regexp *r)
-+{
-+	register char *s;
-+	register char op = EXACTLY;	/* Arbitrary non-END op. */
-+	register char *next;
-+	/* extern char *strchr(); */
-+
-+
-+	s = r->program + 1;
-+	while (op != END) {	/* While that wasn't END last time... */
-+		op = OP(s);
-+		printf("%2d%s", s-r->program, regprop(s));	/* Where, what. */
-+		next = regnext(s);
-+		if (next == NULL)		/* Next ptr. */
-+			printf("(0)");
-+		else
-+			printf("(%d)", (s-r->program)+(next-s));
-+		s += 3;
-+		if (op == ANYOF || op == ANYBUT || op == EXACTLY) {
-+			/* Literal string, where present. */
-+			while (*s != '\0') {
-+				putchar(*s);
-+				s++;
-+			}
-+			s++;
-+		}
-+		putchar('\n');
-+	}
-+
-+	/* Header fields of interest. */
-+	if (r->regstart != '\0')
-+		printf("start `%c' ", r->regstart);
-+	if (r->reganch)
-+		printf("anchored ");
-+	if (r->regmust != NULL)
-+		printf("must have \"%s\"", r->regmust);
-+	printf("\n");
-+}
-+
-+/*
-+ - regprop - printable representation of opcode
-+ */
-+static char *
-+regprop(char *op)
-+{
-+#define BUFLEN 50
-+	register char *p;
-+	static char buf[BUFLEN];
-+
-+	strcpy(buf, ":");
-+
-+	switch (OP(op)) {
-+	case BOL:
-+		p = "BOL";
-+		break;
-+	case EOL:
-+		p = "EOL";
-+		break;
-+	case ANY:
-+		p = "ANY";
-+		break;
-+	case ANYOF:
-+		p = "ANYOF";
-+		break;
-+	case ANYBUT:
-+		p = "ANYBUT";
-+		break;
-+	case BRANCH:
-+		p = "BRANCH";
-+		break;
-+	case EXACTLY:
-+		p = "EXACTLY";
-+		break;
-+	case NOTHING:
-+		p = "NOTHING";
-+		break;
-+	case BACK:
-+		p = "BACK";
-+		break;
-+	case END:
-+		p = "END";
-+		break;
-+	case OPEN+1:
-+	case OPEN+2:
-+	case OPEN+3:
-+	case OPEN+4:
-+	case OPEN+5:
-+	case OPEN+6:
-+	case OPEN+7:
-+	case OPEN+8:
-+	case OPEN+9:
-+		snprintf(buf+strlen(buf),BUFLEN-strlen(buf), "OPEN%d", OP(op)-OPEN);
-+		p = NULL;
-+		break;
-+	case CLOSE+1:
-+	case CLOSE+2:
-+	case CLOSE+3:
-+	case CLOSE+4:
-+	case CLOSE+5:
-+	case CLOSE+6:
-+	case CLOSE+7:
-+	case CLOSE+8:
-+	case CLOSE+9:
-+		snprintf(buf+strlen(buf),BUFLEN-strlen(buf), "CLOSE%d", OP(op)-CLOSE);
-+		p = NULL;
-+		break;
-+	case STAR:
-+		p = "STAR";
-+		break;
-+	case PLUS:
-+		p = "PLUS";
-+		break;
-+	default:
-+		printk("<3>Regexp: corrupted opcode\n");
-+		break;
-+	}
-+	if (p != NULL)
-+		strncat(buf, p, BUFLEN-strlen(buf));
-+	return(buf);
-+}
-+#endif
-+
-+
---- /dev/null
-+++ b/net/netfilter/regexp/regexp.h
-@@ -0,0 +1,41 @@
-+/*
-+ * Definitions etc. for regexp(3) routines.
-+ *
-+ * Caveat:  this is V8 regexp(3) [actually, a reimplementation thereof],
-+ * not the System V one.
-+ */
-+
-+#ifndef REGEXP_H
-+#define REGEXP_H
-+
-+
-+/*
-+http://www.opensource.apple.com/darwinsource/10.3/expect-1/expect/expect.h ,
-+which contains a version of this library, says:
-+
-+ *
-+ * NSUBEXP must be at least 10, and no greater than 117 or the parser
-+ * will not work properly.
-+ *
-+
-+However, it looks rather like this library is limited to 10.  If you think
-+otherwise, let us know.
-+*/
-+
-+#define NSUBEXP  10
-+typedef struct regexp {
-+	char *startp[NSUBEXP];
-+	char *endp[NSUBEXP];
-+	char regstart;		/* Internal use only. */
-+	char reganch;		/* Internal use only. */
-+	char *regmust;		/* Internal use only. */
-+	int regmlen;		/* Internal use only. */
-+	char program[1];	/* Unwarranted chumminess with compiler. */
-+} regexp;
-+
-+regexp * regcomp(char *exp, int *patternsize);
-+int regexec(regexp *prog, char *string);
-+void regsub(regexp *prog, char *source, char *dest);
-+void regerror(char *s);
-+
-+#endif
---- /dev/null
-+++ b/net/netfilter/regexp/regmagic.h
-@@ -0,0 +1,5 @@
-+/*
-+ * The first byte of the regexp internal "program" is actually this magic
-+ * number; the start node begins in the second byte.
-+ */
-+#define	MAGIC	0234
---- /dev/null
-+++ b/net/netfilter/regexp/regsub.c
-@@ -0,0 +1,95 @@
-+/*
-+ * regsub
-+ * @(#)regsub.c	1.3 of 2 April 86
-+ *
-+ *	Copyright (c) 1986 by University of Toronto.
-+ *	Written by Henry Spencer.  Not derived from licensed software.
-+ *
-+ *	Permission is granted to anyone to use this software for any
-+ *	purpose on any computer system, and to redistribute it freely,
-+ *	subject to the following restrictions:
-+ *
-+ *	1. The author is not responsible for the consequences of use of
-+ *		this software, no matter how awful, even if they arise
-+ *		from defects in it.
-+ *
-+ *	2. The origin of this software must not be misrepresented, either
-+ *		by explicit claim or by omission.
-+ *
-+ *	3. Altered versions must be plainly marked as such, and must not
-+ *		be misrepresented as being the original software.
-+ *
-+ *
-+ * This code was modified by Ethan Sommer to work within the kernel
-+ * (it now uses kmalloc etc..)
-+ *
-+ */
-+#include "regexp.h"
-+#include "regmagic.h"
-+#include <linux/string.h>
-+
-+
-+#ifndef CHARBITS
-+#define	UCHARAT(p)	((int)*(unsigned char *)(p))
-+#else
-+#define	UCHARAT(p)	((int)*(p)&CHARBITS)
-+#endif
-+
-+#if 0
-+//void regerror(char * s)
-+//{
-+//        printk("regexp(3): %s", s);
-+//        /* NOTREACHED */
-+//}
-+#endif
-+
-+/*
-+ - regsub - perform substitutions after a regexp match
-+ */
-+void
-+regsub(regexp * prog, char * source, char * dest)
-+{
-+	register char *src;
-+	register char *dst;
-+	register char c;
-+	register int no;
-+	register int len;
-+	
-+	/* Not necessary and gcc doesn't like it -MLS */
-+	/*extern char *strncpy();*/
-+
-+	if (prog == NULL || source == NULL || dest == NULL) {
-+		regerror("NULL parm to regsub");
-+		return;
-+	}
-+	if (UCHARAT(prog->program) != MAGIC) {
-+		regerror("damaged regexp fed to regsub");
-+		return;
-+	}
-+
-+	src = source;
-+	dst = dest;
-+	while ((c = *src++) != '\0') {
-+		if (c == '&')
-+			no = 0;
-+		else if (c == '\\' && '0' <= *src && *src <= '9')
-+			no = *src++ - '0';
-+		else
-+			no = -1;
-+
-+		if (no < 0) {	/* Ordinary character. */
-+			if (c == '\\' && (*src == '\\' || *src == '&'))
-+				c = *src++;
-+			*dst++ = c;
-+		} else if (prog->startp[no] != NULL && prog->endp[no] != NULL) {
-+			len = prog->endp[no] - prog->startp[no];
-+			(void) strncpy(dst, prog->startp[no], len);
-+			dst += len;
-+			if (len != 0 && *(dst-1) == '\0') {	/* strncpy hit NUL. */
-+				regerror("damaged match string");
-+				return;
-+			}
-+		}
-+	}
-+	*dst++ = '\0';
-+}
---- /dev/null
-+++ b/net/netfilter/xt_layer7.c
-@@ -0,0 +1,666 @@
-+/*
-+  Kernel module to match application layer (OSI layer 7) data in connections.
-+
-+  http://l7-filter.sf.net
-+
-+  (C) 2003-2009 Matthew Strait and Ethan Sommer.
-+
-+  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.
-+  http://www.gnu.org/licenses/gpl.txt
-+
-+  Based on ipt_string.c (C) 2000 Emmanuel Roger <winfield@freegates.be>,
-+  xt_helper.c (C) 2002 Harald Welte and cls_layer7.c (C) 2003 Matthew Strait,
-+  Ethan Sommer, Justin Levandoski.
-+*/
-+
-+#include <linux/spinlock.h>
-+#include <linux/version.h>
-+#include <net/ip.h>
-+#include <net/tcp.h>
-+#include <linux/module.h>
-+#include <linux/skbuff.h>
-+#include <linux/netfilter.h>
-+#include <net/netfilter/nf_conntrack.h>
-+#include <net/netfilter/nf_conntrack_core.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-+#include <net/netfilter/nf_conntrack_extend.h>
-+#include <net/netfilter/nf_conntrack_acct.h>
-+#endif
-+#include <linux/netfilter/x_tables.h>
-+#include <linux/netfilter/xt_layer7.h>
-+#include <linux/ctype.h>
-+#include <linux/proc_fs.h>
-+
-+#include "regexp/regexp.c"
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Matthew Strait <quadong@users.sf.net>, Ethan Sommer <sommere@users.sf.net>");
-+MODULE_DESCRIPTION("iptables application layer match module");
-+MODULE_ALIAS("ipt_layer7");
-+MODULE_VERSION("2.21");
-+
-+static int maxdatalen = 2048; // this is the default
-+module_param(maxdatalen, int, 0444);
-+MODULE_PARM_DESC(maxdatalen, "maximum bytes of data looked at by l7-filter");
-+#ifdef CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG
-+	#define DPRINTK(format,args...) printk(format,##args)
-+#else
-+	#define DPRINTK(format,args...)
-+#endif
-+
-+/* Number of packets whose data we look at.
-+This can be modified through /proc/net/layer7_numpackets */
-+static int num_packets = 10;
-+
-+static struct pattern_cache {
-+	char * regex_string;
-+	regexp * pattern;
-+	struct pattern_cache * next;
-+} * first_pattern_cache = NULL;
-+
-+DEFINE_SPINLOCK(l7_lock);
-+
-+static int total_acct_packets(struct nf_conn *ct)
-+{
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 26)
-+	BUG_ON(ct == NULL);
-+	return (ct->counters[IP_CT_DIR_ORIGINAL].packets + ct->counters[IP_CT_DIR_REPLY].packets);
-+#else
-+	struct nf_conn_counter *acct;
-+
-+	BUG_ON(ct == NULL);
-+	acct = nf_conn_acct_find(ct);
-+	if (!acct)
-+		return 0;
-+	return (acct[IP_CT_DIR_ORIGINAL].packets + acct[IP_CT_DIR_REPLY].packets);
-+#endif
-+}
-+
-+#ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
-+/* Converts an unfriendly string into a friendly one by
-+replacing unprintables with periods and all whitespace with " ". */
-+static char * friendly_print(unsigned char * s)
-+{
-+	char * f = kmalloc(strlen(s) + 1, GFP_ATOMIC);
-+	int i;
-+
-+	if(!f) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in "
-+					"friendly_print, bailing.\n");
-+		return NULL;
-+	}
-+
-+	for(i = 0; i < strlen(s); i++){
-+		if(isprint(s[i]) && s[i] < 128)	f[i] = s[i];
-+		else if(isspace(s[i]))		f[i] = ' ';
-+		else 				f[i] = '.';
-+	}
-+	f[i] = '\0';
-+	return f;
-+}
-+
-+static char dec2hex(int i)
-+{
-+	switch (i) {
-+		case 0 ... 9:
-+			return (i + '0');
-+			break;
-+		case 10 ... 15:
-+			return (i - 10 + 'a');
-+			break;
-+		default:
-+			if (net_ratelimit())
-+				printk("layer7: Problem in dec2hex\n");
-+			return '\0';
-+	}
-+}
-+
-+static char * hex_print(unsigned char * s)
-+{
-+	char * g = kmalloc(strlen(s)*3 + 1, GFP_ATOMIC);
-+	int i;
-+
-+	if(!g) {
-+	       if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in hex_print, "
-+					"bailing.\n");
-+	       return NULL;
-+	}
-+
-+	for(i = 0; i < strlen(s); i++) {
-+		g[i*3    ] = dec2hex(s[i]/16);
-+		g[i*3 + 1] = dec2hex(s[i]%16);
-+		g[i*3 + 2] = ' ';
-+	}
-+	g[i*3] = '\0';
-+
-+	return g;
-+}
-+#endif // DEBUG
-+
-+/* Use instead of regcomp.  As we expect to be seeing the same regexps over and
-+over again, it make sense to cache the results. */
-+static regexp * compile_and_cache(const char * regex_string, 
-+                                  const char * protocol)
-+{
-+	struct pattern_cache * node               = first_pattern_cache;
-+	struct pattern_cache * last_pattern_cache = first_pattern_cache;
-+	struct pattern_cache * tmp;
-+	unsigned int len;
-+
-+	while (node != NULL) {
-+		if (!strcmp(node->regex_string, regex_string))
-+		return node->pattern;
-+
-+		last_pattern_cache = node;/* points at the last non-NULL node */
-+		node = node->next;
-+	}
-+
-+	/* If we reach the end of the list, then we have not yet cached
-+	   the pattern for this regex. Let's do that now.
-+	   Be paranoid about running out of memory to avoid list corruption. */
-+	tmp = kmalloc(sizeof(struct pattern_cache), GFP_ATOMIC);
-+
-+	if(!tmp) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in "
-+					"compile_and_cache, bailing.\n");
-+		return NULL;
-+	}
-+
-+	tmp->regex_string  = kmalloc(strlen(regex_string) + 1, GFP_ATOMIC);
-+	tmp->pattern       = kmalloc(sizeof(struct regexp),    GFP_ATOMIC);
-+	tmp->next = NULL;
-+
-+	if(!tmp->regex_string || !tmp->pattern) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in "
-+					"compile_and_cache, bailing.\n");
-+		kfree(tmp->regex_string);
-+		kfree(tmp->pattern);
-+		kfree(tmp);
-+		return NULL;
-+	}
-+
-+	/* Ok.  The new node is all ready now. */
-+	node = tmp;
-+
-+	if(first_pattern_cache == NULL) /* list is empty */
-+		first_pattern_cache = node; /* make node the beginning */
-+	else
-+		last_pattern_cache->next = node; /* attach node to the end */
-+
-+	/* copy the string and compile the regex */
-+	len = strlen(regex_string);
-+	DPRINTK("About to compile this: \"%s\"\n", regex_string);
-+	node->pattern = regcomp((char *)regex_string, &len);
-+	if ( !node->pattern ) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: Error compiling regexp "
-+					"\"%s\" (%s)\n", 
-+					regex_string, protocol);
-+		/* pattern is now cached as NULL, so we won't try again. */
-+	}
-+
-+	strcpy(node->regex_string, regex_string);
-+	return node->pattern;
-+}
-+
-+static int can_handle(const struct sk_buff *skb)
-+{
-+	if(!ip_hdr(skb)) /* not IP */
-+		return 0;
-+	if(ip_hdr(skb)->protocol != IPPROTO_TCP &&
-+	   ip_hdr(skb)->protocol != IPPROTO_UDP &&
-+	   ip_hdr(skb)->protocol != IPPROTO_ICMP)
-+		return 0;
-+	return 1;
-+}
-+
-+/* Returns offset the into the skb->data that the application data starts */
-+static int app_data_offset(const struct sk_buff *skb)
-+{
-+	/* In case we are ported somewhere (ebtables?) where ip_hdr(skb)
-+	isn't set, this can be gotten from 4*(skb->data[0] & 0x0f) as well. */
-+	int ip_hl = 4*ip_hdr(skb)->ihl;
-+
-+	if( ip_hdr(skb)->protocol == IPPROTO_TCP ) {
-+		/* 12 == offset into TCP header for the header length field.
-+		Can't get this with skb->h.th->doff because the tcphdr
-+		struct doesn't get set when routing (this is confirmed to be
-+		true in Netfilter as well as QoS.) */
-+		int tcp_hl = 4*(skb->data[ip_hl + 12] >> 4);
-+
-+		return ip_hl + tcp_hl;
-+	} else if( ip_hdr(skb)->protocol == IPPROTO_UDP  ) {
-+		return ip_hl + 8; /* UDP header is always 8 bytes */
-+	} else if( ip_hdr(skb)->protocol == IPPROTO_ICMP ) {
-+		return ip_hl + 8; /* ICMP header is 8 bytes */
-+	} else {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: tried to handle unknown "
-+					"protocol!\n");
-+		return ip_hl + 8; /* something reasonable */
-+	}
-+}
-+
-+/* handles whether there's a match when we aren't appending data anymore */
-+static int match_no_append(struct nf_conn * conntrack, 
-+                           struct nf_conn * master_conntrack, 
-+                           enum ip_conntrack_info ctinfo,
-+                           enum ip_conntrack_info master_ctinfo,
-+                           const struct xt_layer7_info * info)
-+{
-+	/* If we're in here, throw the app data away */
-+	if(master_conntrack->layer7.app_data != NULL) {
-+
-+	#ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
-+		if(!master_conntrack->layer7.app_proto) {
-+			char * f = 
-+			  friendly_print(master_conntrack->layer7.app_data);
-+			char * g = 
-+			  hex_print(master_conntrack->layer7.app_data);
-+			DPRINTK("\nl7-filter gave up after %d bytes "
-+				"(%d packets):\n%s\n",
-+				strlen(f), total_acct_packets(master_conntrack), f);
-+			kfree(f);
-+			DPRINTK("In hex: %s\n", g);
-+			kfree(g);
-+		}
-+	#endif
-+
-+		kfree(master_conntrack->layer7.app_data);
-+		master_conntrack->layer7.app_data = NULL; /* don't free again */
-+	}
-+
-+	if(master_conntrack->layer7.app_proto){
-+		/* Here child connections set their .app_proto (for /proc) */
-+		if(!conntrack->layer7.app_proto) {
-+			conntrack->layer7.app_proto = 
-+			  kmalloc(strlen(master_conntrack->layer7.app_proto)+1, 
-+			    GFP_ATOMIC);
-+			if(!conntrack->layer7.app_proto){
-+				if (net_ratelimit())
-+					printk(KERN_ERR "layer7: out of memory "
-+							"in match_no_append, "
-+							"bailing.\n");
-+				return 1;
-+			}
-+			strcpy(conntrack->layer7.app_proto, 
-+				master_conntrack->layer7.app_proto);
-+		}
-+
-+		return (!strcmp(master_conntrack->layer7.app_proto, 
-+				info->protocol));
-+	}
-+	else {
-+		/* If not classified, set to "unknown" to distinguish from
-+		connections that are still being tested. */
-+		master_conntrack->layer7.app_proto = 
-+			kmalloc(strlen("unknown")+1, GFP_ATOMIC);
-+		if(!master_conntrack->layer7.app_proto){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in "
-+						"match_no_append, bailing.\n");
-+			return 1;
-+		}
-+		strcpy(master_conntrack->layer7.app_proto, "unknown");
-+		return 0;
-+	}
-+}
-+
-+/* add the new app data to the conntrack.  Return number of bytes added. */
-+static int add_data(struct nf_conn * master_conntrack,
-+                    char * app_data, int appdatalen)
-+{
-+	int length = 0, i;
-+	int oldlength = master_conntrack->layer7.app_data_len;
-+
-+	/* This is a fix for a race condition by Deti Fliegl. However, I'm not 
-+	   clear on whether the race condition exists or whether this really 
-+	   fixes it.  I might just be being dense... Anyway, if it's not really 
-+	   a fix, all it does is waste a very small amount of time. */
-+	if(!master_conntrack->layer7.app_data) return 0;
-+
-+	/* Strip nulls. Make everything lower case (our regex lib doesn't
-+	do case insensitivity).  Add it to the end of the current data. */
-+	for(i = 0; i < maxdatalen-oldlength-1 &&
-+		   i < appdatalen; i++) {
-+		if(app_data[i] != '\0') {
-+			/* the kernel version of tolower mungs 'upper ascii' */
-+			master_conntrack->layer7.app_data[length+oldlength] =
-+				isascii(app_data[i])? 
-+					tolower(app_data[i]) : app_data[i];
-+			length++;
-+		}
-+	}
-+
-+	master_conntrack->layer7.app_data[length+oldlength] = '\0';
-+	master_conntrack->layer7.app_data_len = length + oldlength;
-+
-+	return length;
-+}
-+
-+/* taken from drivers/video/modedb.c */
-+static int my_atoi(const char *s)
-+{
-+	int val = 0;
-+
-+	for (;; s++) {
-+		switch (*s) {
-+			case '0'...'9':
-+			val = 10*val+(*s-'0');
-+			break;
-+		default:
-+			return val;
-+		}
-+	}
-+}
-+
-+/* write out num_packets to userland. */
-+static int layer7_read_proc(char* page, char ** start, off_t off, int count,
-+                            int* eof, void * data)
-+{
-+	if(num_packets > 99 && net_ratelimit())
-+		printk(KERN_ERR "layer7: NOT REACHED. num_packets too big\n");
-+
-+	page[0] = num_packets/10 + '0';
-+	page[1] = num_packets%10 + '0';
-+	page[2] = '\n';
-+	page[3] = '\0';
-+
-+	*eof=1;
-+
-+	return 3;
-+}
-+
-+/* Read in num_packets from userland */
-+static int layer7_write_proc(struct file* file, const char* buffer,
-+                             unsigned long count, void *data)
-+{
-+	char * foo = kmalloc(count, GFP_ATOMIC);
-+
-+	if(!foo){
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory, bailing. "
-+					"num_packets unchanged.\n");
-+		return count;
-+	}
-+
-+	if(copy_from_user(foo, buffer, count)) {
-+		return -EFAULT;
-+	}
-+
-+
-+	num_packets = my_atoi(foo);
-+	kfree (foo);
-+
-+	/* This has an arbitrary limit to make the math easier. I'm lazy.
-+	But anyway, 99 is a LOT! If you want more, you're doing it wrong! */
-+	if(num_packets > 99) {
-+		printk(KERN_WARNING "layer7: num_packets can't be > 99.\n");
-+		num_packets = 99;
-+	} else if(num_packets < 1) {
-+		printk(KERN_WARNING "layer7: num_packets can't be < 1.\n");
-+		num_packets = 1;
-+	}
-+
-+	return count;
-+}
-+
-+static bool
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+match(const struct sk_buff *skbin, const struct xt_match_param *par)
-+#else
-+match(const struct sk_buff *skbin,
-+      const struct net_device *in,
-+      const struct net_device *out,
-+      const struct xt_match *match,
-+      const void *matchinfo,
-+      int offset,
-+      unsigned int protoff,
-+      bool *hotdrop)
-+#endif
-+{
-+	/* sidestep const without getting a compiler warning... */
-+	struct sk_buff * skb = (struct sk_buff *)skbin; 
-+
-+	const struct xt_layer7_info * info = 
-+	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+		par->matchinfo;
-+	#else
-+		matchinfo;
-+	#endif
-+
-+	enum ip_conntrack_info master_ctinfo, ctinfo;
-+	struct nf_conn *master_conntrack, *conntrack;
-+	unsigned char * app_data;
-+	unsigned int pattern_result, appdatalen;
-+	regexp * comppattern;
-+
-+	/* Be paranoid/incompetent - lock the entire match function. */
-+	spin_lock_bh(&l7_lock);
-+
-+	if(!can_handle(skb)){
-+		DPRINTK("layer7: This is some protocol I can't handle.\n");
-+		spin_unlock_bh(&l7_lock);
-+		return info->invert;
-+	}
-+
-+	/* Treat parent & all its children together as one connection, except
-+	for the purpose of setting conntrack->layer7.app_proto in the actual
-+	connection. This makes /proc/net/ip_conntrack more satisfying. */
-+	if(!(conntrack = nf_ct_get(skb, &ctinfo)) ||
-+	   !(master_conntrack=nf_ct_get(skb,&master_ctinfo))){
-+		DPRINTK("layer7: couldn't get conntrack.\n");
-+		spin_unlock_bh(&l7_lock);
-+		return info->invert;
-+	}
-+
-+	/* Try to get a master conntrack (and its master etc) for FTP, etc. */
-+	while (master_ct(master_conntrack) != NULL)
-+		master_conntrack = master_ct(master_conntrack);
-+
-+	/* if we've classified it or seen too many packets */
-+	if(total_acct_packets(master_conntrack) > num_packets ||
-+	   master_conntrack->layer7.app_proto) {
-+
-+		pattern_result = match_no_append(conntrack, master_conntrack, 
-+						 ctinfo, master_ctinfo, info);
-+
-+		/* skb->cb[0] == seen. Don't do things twice if there are 
-+		multiple l7 rules. I'm not sure that using cb for this purpose 
-+		is correct, even though it says "put your private variables 
-+		there". But it doesn't look like it is being used for anything
-+		else in the skbs that make it here. */
-+		skb->cb[0] = 1; /* marking it seen here's probably irrelevant */
-+
-+		spin_unlock_bh(&l7_lock);
-+		return (pattern_result ^ info->invert);
-+	}
-+
-+	if(skb_is_nonlinear(skb)){
-+		if(skb_linearize(skb) != 0){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: failed to linearize "
-+						"packet, bailing.\n");
-+			spin_unlock_bh(&l7_lock);
-+			return info->invert;
-+		}
-+	}
-+
-+	/* now that the skb is linearized, it's safe to set these. */
-+	app_data = skb->data + app_data_offset(skb);
-+	appdatalen = skb_tail_pointer(skb) - app_data;
-+
-+	/* the return value gets checked later, when we're ready to use it */
-+	comppattern = compile_and_cache(info->pattern, info->protocol);
-+
-+	/* On the first packet of a connection, allocate space for app data */
-+	if(total_acct_packets(master_conntrack) == 1 && !skb->cb[0] && 
-+	   !master_conntrack->layer7.app_data){
-+		master_conntrack->layer7.app_data = 
-+			kmalloc(maxdatalen, GFP_ATOMIC);
-+		if(!master_conntrack->layer7.app_data){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in "
-+						"match, bailing.\n");
-+			spin_unlock_bh(&l7_lock);
-+			return info->invert;
-+		}
-+
-+		master_conntrack->layer7.app_data[0] = '\0';
-+	}
-+
-+	/* Can be here, but unallocated, if numpackets is increased near
-+	the beginning of a connection */
-+	if(master_conntrack->layer7.app_data == NULL){
-+		spin_unlock_bh(&l7_lock);
-+		return info->invert; /* unmatched */
-+	}
-+
-+	if(!skb->cb[0]){
-+		int newbytes;
-+		newbytes = add_data(master_conntrack, app_data, appdatalen);
-+
-+		if(newbytes == 0) { /* didn't add any data */
-+			skb->cb[0] = 1;
-+			/* Didn't match before, not going to match now */
-+			spin_unlock_bh(&l7_lock);
-+			return info->invert;
-+		}
-+	}
-+
-+	/* If looking for "unknown", then never match.  "Unknown" means that
-+	we've given up; we're still trying with these packets. */
-+	if(!strcmp(info->protocol, "unknown")) {
-+		pattern_result = 0;
-+	/* If looking for "unset", then always match. "Unset" means that we
-+	haven't yet classified the connection. */
-+	} else if(!strcmp(info->protocol, "unset")) {
-+		pattern_result = 2;
-+		DPRINTK("layer7: matched unset: not yet classified "
-+			"(%d/%d packets)\n",
-+                        total_acct_packets(master_conntrack), num_packets);
-+	/* If the regexp failed to compile, don't bother running it */
-+	} else if(comppattern && 
-+		  regexec(comppattern, master_conntrack->layer7.app_data)){
-+		DPRINTK("layer7: matched %s\n", info->protocol);
-+		pattern_result = 1;
-+	} else pattern_result = 0;
-+
-+	if(pattern_result == 1) {
-+		master_conntrack->layer7.app_proto = 
-+			kmalloc(strlen(info->protocol)+1, GFP_ATOMIC);
-+		if(!master_conntrack->layer7.app_proto){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in "
-+						"match, bailing.\n");
-+			spin_unlock_bh(&l7_lock);
-+			return (pattern_result ^ info->invert);
-+		}
-+		strcpy(master_conntrack->layer7.app_proto, info->protocol);
-+	} else if(pattern_result > 1) { /* cleanup from "unset" */
-+		pattern_result = 1;
-+	}
-+
-+	/* mark the packet seen */
-+	skb->cb[0] = 1;
-+
-+	spin_unlock_bh(&l7_lock);
-+	return (pattern_result ^ info->invert);
-+}
-+
-+// load nf_conntrack_ipv4
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+static bool check(const struct xt_mtchk_param *par)
-+{
-+        if (nf_ct_l3proto_try_module_get(par->match->family) < 0) {
-+                printk(KERN_WARNING "can't load conntrack support for "
-+                                    "proto=%d\n", par->match->family);
-+#else
-+static bool check(const char *tablename, const void *inf,
-+		 const struct xt_match *match, void *matchinfo,
-+		 unsigned int hook_mask)
-+{
-+        if (nf_ct_l3proto_try_module_get(match->family) < 0) {
-+                printk(KERN_WARNING "can't load conntrack support for "
-+                                    "proto=%d\n", match->family);
-+#endif
-+                return 0;
-+        }
-+	return 1;
-+}
-+
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+	static void destroy(const struct xt_mtdtor_param *par)
-+	{
-+		nf_ct_l3proto_module_put(par->match->family);
-+	}
-+#else
-+	static void destroy(const struct xt_match *match, void *matchinfo)
-+	{
-+		nf_ct_l3proto_module_put(match->family);
-+	}
-+#endif
-+
-+static struct xt_match xt_layer7_match[] __read_mostly = {
-+{
-+	.name		= "layer7",
-+	.family		= AF_INET,
-+	.checkentry	= check,
-+	.match		= match,
-+	.destroy	= destroy,
-+	.matchsize	= sizeof(struct xt_layer7_info),
-+	.me		= THIS_MODULE
-+}
-+};
-+
-+static void layer7_cleanup_proc(void)
-+{
-+	remove_proc_entry("layer7_numpackets", init_net.proc_net);
-+}
-+
-+/* register the proc file */
-+static void layer7_init_proc(void)
-+{
-+	struct proc_dir_entry* entry;
-+	entry = create_proc_entry("layer7_numpackets", 0644, init_net.proc_net);
-+	entry->read_proc = layer7_read_proc;
-+	entry->write_proc = layer7_write_proc;
-+}
-+
-+static int __init xt_layer7_init(void)
-+{
-+	need_conntrack();
-+
-+	layer7_init_proc();
-+	if(maxdatalen < 1) {
-+		printk(KERN_WARNING "layer7: maxdatalen can't be < 1, "
-+			"using 1\n");
-+		maxdatalen = 1;
-+	}
-+	/* This is not a hard limit.  It's just here to prevent people from
-+	bringing their slow machines to a grinding halt. */
-+	else if(maxdatalen > 65536) {
-+		printk(KERN_WARNING "layer7: maxdatalen can't be > 65536, "
-+			"using 65536\n");
-+		maxdatalen = 65536;
-+	}
-+	return xt_register_matches(xt_layer7_match,
-+				   ARRAY_SIZE(xt_layer7_match));
-+}
-+
-+static void __exit xt_layer7_fini(void)
-+{
-+	layer7_cleanup_proc();
-+	xt_unregister_matches(xt_layer7_match, ARRAY_SIZE(xt_layer7_match));
-+}
-+
-+module_init(xt_layer7_init);
-+module_exit(xt_layer7_fini);
diff --git a/target/linux/generic-2.6/patches-2.6.25/101-netfilter_layer7_pktmatch.patch b/target/linux/generic-2.6/patches-2.6.25/101-netfilter_layer7_pktmatch.patch
deleted file mode 100644
index 7b0dd43c0..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/101-netfilter_layer7_pktmatch.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- a/include/linux/netfilter/xt_layer7.h
-+++ b/include/linux/netfilter/xt_layer7.h
-@@ -8,6 +8,7 @@ struct xt_layer7_info {
-     char protocol[MAX_PROTOCOL_LEN];
-     char pattern[MAX_PATTERN_LEN];
-     u_int8_t invert;
-+    u_int8_t pkt;
- };
- 
- #endif /* _XT_LAYER7_H */
---- a/net/netfilter/xt_layer7.c
-+++ b/net/netfilter/xt_layer7.c
-@@ -314,34 +314,36 @@ static int match_no_append(struct nf_con
- }
- 
- /* add the new app data to the conntrack.  Return number of bytes added. */
--static int add_data(struct nf_conn * master_conntrack,
--                    char * app_data, int appdatalen)
-+static int add_datastr(char *target, int offset, char *app_data, int len)
- {
- 	int length = 0, i;
--	int oldlength = master_conntrack->layer7.app_data_len;
--
--	/* This is a fix for a race condition by Deti Fliegl. However, I'm not 
--	   clear on whether the race condition exists or whether this really 
--	   fixes it.  I might just be being dense... Anyway, if it's not really 
--	   a fix, all it does is waste a very small amount of time. */
--	if(!master_conntrack->layer7.app_data) return 0;
-+	
-+	if (!target) return 0;
- 
- 	/* Strip nulls. Make everything lower case (our regex lib doesn't
- 	do case insensitivity).  Add it to the end of the current data. */
--	for(i = 0; i < maxdatalen-oldlength-1 &&
--		   i < appdatalen; i++) {
-+	for(i = 0; i < maxdatalen-offset-1 && i < len; i++) {
- 		if(app_data[i] != '\0') {
- 			/* the kernel version of tolower mungs 'upper ascii' */
--			master_conntrack->layer7.app_data[length+oldlength] =
-+			target[length+offset] =
- 				isascii(app_data[i])? 
- 					tolower(app_data[i]) : app_data[i];
- 			length++;
- 		}
- 	}
-+	target[length+offset] = '\0';
-+	
-+	return length;
-+}
- 
--	master_conntrack->layer7.app_data[length+oldlength] = '\0';
--	master_conntrack->layer7.app_data_len = length + oldlength;
-+/* add the new app data to the conntrack.  Return number of bytes added. */
-+static int add_data(struct nf_conn * master_conntrack,
-+                    char * app_data, int appdatalen)
-+{
-+	int length;
- 
-+	length = add_datastr(master_conntrack->layer7.app_data, master_conntrack->layer7.app_data_len, app_data, appdatalen);
-+	master_conntrack->layer7.app_data_len += length;
- 	return length;
- }
- 
-@@ -438,7 +440,7 @@ match(const struct sk_buff *skbin,
- 
- 	enum ip_conntrack_info master_ctinfo, ctinfo;
- 	struct nf_conn *master_conntrack, *conntrack;
--	unsigned char * app_data;
-+	unsigned char *app_data, *tmp_data;
- 	unsigned int pattern_result, appdatalen;
- 	regexp * comppattern;
- 
-@@ -466,9 +468,8 @@ match(const struct sk_buff *skbin,
- 		master_conntrack = master_ct(master_conntrack);
- 
- 	/* if we've classified it or seen too many packets */
--	if(total_acct_packets(master_conntrack) > num_packets ||
--	   master_conntrack->layer7.app_proto) {
--
-+	if(!info->pkt && (total_acct_packets(master_conntrack) > num_packets ||
-+	   master_conntrack->layer7.app_proto)) {
- 		pattern_result = match_no_append(conntrack, master_conntrack, 
- 						 ctinfo, master_ctinfo, info);
- 
-@@ -500,6 +501,25 @@ match(const struct sk_buff *skbin,
- 	/* the return value gets checked later, when we're ready to use it */
- 	comppattern = compile_and_cache(info->pattern, info->protocol);
- 
-+	if (info->pkt) {
-+		tmp_data = kmalloc(maxdatalen, GFP_ATOMIC);
-+		if(!tmp_data){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in match, bailing.\n");
-+			return info->invert;
-+		}
-+
-+		tmp_data[0] = '\0';
-+		add_datastr(tmp_data, 0, app_data, appdatalen);
-+		pattern_result = ((comppattern && regexec(comppattern, tmp_data)) ? 1 : 0);
-+
-+		kfree(tmp_data);
-+		tmp_data = NULL;
-+		spin_unlock_bh(&l7_lock);
-+
-+		return (pattern_result ^ info->invert);
-+	}
-+
- 	/* On the first packet of a connection, allocate space for app data */
- 	if(total_acct_packets(master_conntrack) == 1 && !skb->cb[0] && 
- 	   !master_conntrack->layer7.app_data){
diff --git a/target/linux/generic-2.6/patches-2.6.25/120-netfilter-headers-types.patch b/target/linux/generic-2.6/patches-2.6.25/120-netfilter-headers-types.patch
deleted file mode 100644
index 32251e37d..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/120-netfilter-headers-types.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-commit c8942f1f0a7e2160ebf2e51ba89e50ee5895a1e7
-Author: Patrick McHardy <kaber@trash.net>
-Date:   Wed May 21 14:08:38 2008 -0700
-
-    netfilter: Move linux/types.h inclusions outside of #ifdef __KERNEL__
-    
-    Greg Steuck <greg@nest.cx> points out that some of the netfilter
-    headers can't be used in userspace without including linux/types.h
-    first. The headers include their own linux/types.h include statements,
-    these are stripped by make headers-install because they are inside
-    #ifdef __KERNEL__ however. Move them out to fix this.
-    
-    Reported and Tested by Greg Steuck.
-    
-    Signed-off-by: Patrick McHardy <kaber@trash.net>
-    Signed-off-by: David S. Miller <davem@davemloft.net>
-
---- a/include/linux/netfilter.h
-+++ b/include/linux/netfilter.h
-@@ -3,7 +3,6 @@
- 
- #ifdef __KERNEL__
- #include <linux/init.h>
--#include <linux/types.h>
- #include <linux/skbuff.h>
- #include <linux/net.h>
- #include <linux/if.h>
-@@ -12,6 +11,7 @@
- #include <linux/wait.h>
- #include <linux/list.h>
- #endif
-+#include <linux/types.h>
- #include <linux/compiler.h>
- 
- /* Responses from hook functions. */
---- a/include/linux/netfilter_arp/arp_tables.h
-+++ b/include/linux/netfilter_arp/arp_tables.h
-@@ -11,11 +11,11 @@
- 
- #ifdef __KERNEL__
- #include <linux/if.h>
--#include <linux/types.h>
- #include <linux/in.h>
- #include <linux/if_arp.h>
- #include <linux/skbuff.h>
- #endif
-+#include <linux/types.h>
- #include <linux/compiler.h>
- #include <linux/netfilter_arp.h>
- 
---- a/include/linux/netfilter_ipv4/ip_tables.h
-+++ b/include/linux/netfilter_ipv4/ip_tables.h
-@@ -17,11 +17,11 @@
- 
- #ifdef __KERNEL__
- #include <linux/if.h>
--#include <linux/types.h>
- #include <linux/in.h>
- #include <linux/ip.h>
- #include <linux/skbuff.h>
- #endif
-+#include <linux/types.h>
- #include <linux/compiler.h>
- #include <linux/netfilter_ipv4.h>
- 
---- a/include/linux/netfilter_ipv6/ip6_tables.h
-+++ b/include/linux/netfilter_ipv6/ip6_tables.h
-@@ -17,11 +17,11 @@
- 
- #ifdef __KERNEL__
- #include <linux/if.h>
--#include <linux/types.h>
- #include <linux/in6.h>
- #include <linux/ipv6.h>
- #include <linux/skbuff.h>
- #endif
-+#include <linux/types.h>
- #include <linux/compiler.h>
- #include <linux/netfilter_ipv6.h>
- 
diff --git a/target/linux/generic-2.6/patches-2.6.25/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.25/150-netfilter_imq.patch
deleted file mode 100644
index 5fcef0a7d..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/150-netfilter_imq.patch
+++ /dev/null
@@ -1,914 +0,0 @@
---- /dev/null
-+++ b/drivers/net/imq.c
-@@ -0,0 +1,474 @@
-+/*
-+ *             Pseudo-driver for the intermediate queue device.
-+ *
-+ *             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.
-+ *
-+ * Authors:    Patrick McHardy, <kaber@trash.net>
-+ *
-+ *            The first version was written by Martin Devera, <devik@cdi.cz>
-+ *
-+ * Credits:    Jan Rafaj <imq2t@cedric.vabo.cz>
-+ *              - Update patch to 2.4.21
-+ *             Sebastian Strollo <sstrollo@nortelnetworks.com>
-+ *              - Fix "Dead-loop on netdevice imq"-issue
-+ *             Marcel Sebek <sebek64@post.cz>
-+ *              - Update to 2.6.2-rc1
-+ *
-+ *	       After some time of inactivity there is a group taking care
-+ *	       of IMQ again: http://www.linuximq.net
-+ *
-+ *
-+ *	       2004/06/30 - New version of IMQ patch to kernels <=2.6.7
-+ *             including the following changes:
-+ *
-+ *	       - Correction of ipv6 support "+"s issue (Hasso Tepper)
-+ *	       - Correction of imq_init_devs() issue that resulted in
-+ *	       kernel OOPS unloading IMQ as module (Norbert Buchmuller)
-+ *	       - Addition of functionality to choose number of IMQ devices
-+ *	       during kernel config (Andre Correa)
-+ *	       - Addition of functionality to choose how IMQ hooks on
-+ *	       PRE and POSTROUTING (after or before NAT) (Andre Correa)
-+ *	       - Cosmetic corrections (Norbert Buchmuller) (Andre Correa)
-+ *
-+ *
-+ *             2005/12/16 - IMQ versions between 2.6.7 and 2.6.13 were
-+ *             released with almost no problems. 2.6.14-x was released
-+ *             with some important changes: nfcache was removed; After
-+ *             some weeks of trouble we figured out that some IMQ fields
-+ *             in skb were missing in skbuff.c - skb_clone and copy_skb_header.
-+ *             These functions are correctly patched by this new patch version.
-+ *
-+ *             Thanks for all who helped to figure out all the problems with
-+ *             2.6.14.x: Patrick McHardy, Rune Kock, VeNoMouS, Max CtRiX,
-+ *             Kevin Shanahan, Richard Lucassen, Valery Dachev (hopefully
-+ *             I didn't forget anybody). I apologize again for my lack of time.
-+ *
-+ *
-+ *             2008/06/17 - 2.6.25 - Changed imq.c to use qdisc_run() instead 
-+ *	       of qdisc_restart() and moved qdisc_run() to tasklet to avoid
-+ *             recursive locking. New initialization routines to fix 'rmmod' not
-+ *             working anymore. Used code from ifb.c. (Jussi Kivilinna)
-+ *	       
-+ *	       Also, many thanks to pablo Sebastian Greco for making the initial
-+ *	       patch and to those who helped the testing.
-+ *
-+ *             More info at: http://www.linuximq.net/ (Andre Correa)
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/moduleparam.h>
-+#include <linux/skbuff.h>
-+#include <linux/netdevice.h>
-+#include <linux/rtnetlink.h>
-+#include <linux/if_arp.h>
-+#include <linux/netfilter.h>
-+#include <linux/netfilter_ipv4.h>
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	#include <linux/netfilter_ipv6.h>
-+#endif
-+#include <linux/imq.h>
-+#include <net/pkt_sched.h>
-+#include <net/netfilter/nf_queue.h>
-+
-+struct imq_private {
-+	struct tasklet_struct tasklet;
-+	unsigned long tasklet_pending;
-+};
-+
-+static nf_hookfn imq_nf_hook;
-+
-+static struct nf_hook_ops imq_ingress_ipv4 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET,
-+	.hooknum	= NF_INET_PRE_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	.priority	= NF_IP_PRI_MANGLE + 1
-+#else
-+	.priority	= NF_IP_PRI_NAT_DST + 1
-+#endif
-+};
-+
-+static struct nf_hook_ops imq_egress_ipv4 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET,
-+	.hooknum	= NF_INET_POST_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
-+	.priority	= NF_IP_PRI_LAST
-+#else
-+	.priority	= NF_IP_PRI_NAT_SRC - 1
-+#endif
-+};
-+
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+static struct nf_hook_ops imq_ingress_ipv6 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET6,
-+	.hooknum	= NF_INET_PRE_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	.priority	= NF_IP6_PRI_MANGLE + 1
-+#else
-+	.priority	= NF_IP6_PRI_NAT_DST + 1
-+#endif
-+};
-+
-+static struct nf_hook_ops imq_egress_ipv6 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET6,
-+	.hooknum	= NF_INET_POST_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
-+	.priority	= NF_IP6_PRI_LAST
-+#else
-+	.priority	= NF_IP6_PRI_NAT_SRC - 1
-+#endif
-+};
-+#endif
-+
-+#if defined(CONFIG_IMQ_NUM_DEVS)
-+static unsigned int numdevs = CONFIG_IMQ_NUM_DEVS;
-+#else
-+static unsigned int numdevs = IMQ_MAX_DEVS;
-+#endif
-+
-+static struct net_device *imq_devs_cache[IMQ_MAX_DEVS];
-+
-+static struct net_device_stats *imq_get_stats(struct net_device *dev)
-+{
-+	return &dev->stats;
-+}
-+
-+/* called for packets kfree'd in qdiscs at places other than enqueue */
-+static void imq_skb_destructor(struct sk_buff *skb)
-+{
-+	struct nf_queue_entry *entry = skb->nf_queue_entry;
-+
-+	if (entry) {
-+		if (entry->indev)
-+			dev_put(entry->indev);
-+		if (entry->outdev)
-+			dev_put(entry->outdev);
-+		kfree(entry);
-+	}
-+}
-+
-+static int imq_dev_xmit(struct sk_buff *skb, struct net_device *dev)
-+{
-+	dev->stats.tx_bytes += skb->len;
-+	dev->stats.tx_packets++;
-+
-+	skb->imq_flags = 0;
-+	skb->destructor = NULL;
-+
-+	dev->trans_start = jiffies;
-+	nf_reinject(skb->nf_queue_entry, NF_ACCEPT);
-+	return 0;
-+}
-+
-+static int imq_nf_queue(struct nf_queue_entry *entry, unsigned queue_num)
-+{
-+	struct net_device *dev;
-+	struct imq_private *priv;
-+	struct sk_buff *skb2 = NULL;
-+	struct Qdisc *q;
-+	unsigned int index = entry->skb->imq_flags & IMQ_F_IFMASK;
-+	int ret = -1;
-+
-+	if (index > numdevs)
-+		return -1;
-+
-+	/* check for imq device by index from cache */
-+	dev = imq_devs_cache[index];
-+	if (!dev) {
-+		char buf[8];
-+
-+		/* get device by name and cache result */
-+		snprintf(buf, sizeof(buf), "imq%d", index);
-+		dev = dev_get_by_name(&init_net, buf);
-+		if (!dev) {
-+			/* not found ?!*/
-+			BUG();
-+			return -1;
-+		}
-+
-+		imq_devs_cache[index] = dev;
-+	}
-+
-+	priv = netdev_priv(dev);
-+	if (!(dev->flags & IFF_UP)) {
-+		entry->skb->imq_flags = 0;
-+		nf_reinject(entry, NF_ACCEPT);
-+		return 0;
-+	}
-+	dev->last_rx = jiffies;
-+
-+	if (entry->skb->destructor) {
-+		skb2 = entry->skb;
-+		entry->skb = skb_clone(entry->skb, GFP_ATOMIC);
-+		if (!entry->skb)
-+			return -1;
-+	}
-+	entry->skb->nf_queue_entry = entry;
-+
-+	dev->stats.rx_bytes += entry->skb->len;
-+	dev->stats.rx_packets++;
-+
-+	spin_lock_bh(&dev->queue_lock);
-+	q = dev->qdisc;
-+	if (q->enqueue) {
-+		q->enqueue(skb_get(entry->skb), q);
-+		if (skb_shared(entry->skb)) {
-+			entry->skb->destructor = imq_skb_destructor;
-+			kfree_skb(entry->skb);
-+			ret = 0;
-+		}
-+	}
-+	if (!test_and_set_bit(1, &priv->tasklet_pending))
-+		tasklet_schedule(&priv->tasklet);
-+	spin_unlock_bh(&dev->queue_lock);
-+
-+	if (skb2)
-+		kfree_skb(ret ? entry->skb : skb2);
-+
-+	return ret;
-+}
-+
-+static struct nf_queue_handler nfqh = {
-+	.name  = "imq",
-+	.outfn = imq_nf_queue,
-+};
-+
-+static void qdisc_run_tasklet(unsigned long arg)
-+{
-+	struct net_device *dev = (struct net_device *)arg;
-+	struct imq_private *priv = netdev_priv(dev);
-+
-+	spin_lock(&dev->queue_lock);
-+	qdisc_run(dev);
-+	clear_bit(1, &priv->tasklet_pending);
-+	spin_unlock(&dev->queue_lock);
-+}
-+
-+static unsigned int imq_nf_hook(unsigned int hook, struct sk_buff *pskb,
-+				const struct net_device *indev,
-+				const struct net_device *outdev,
-+				int (*okfn)(struct sk_buff *))
-+{
-+	if (pskb->imq_flags & IMQ_F_ENQUEUE)
-+		return NF_QUEUE;
-+
-+	return NF_ACCEPT;
-+}
-+
-+static int imq_close(struct net_device *dev)
-+{
-+	struct imq_private *priv = netdev_priv(dev);
-+
-+	tasklet_kill(&priv->tasklet);
-+	netif_stop_queue(dev);
-+
-+	return 0;
-+}
-+
-+static int imq_open(struct net_device *dev)
-+{
-+	struct imq_private *priv = netdev_priv(dev);
-+
-+	tasklet_init(&priv->tasklet, qdisc_run_tasklet, (unsigned long)dev);
-+	netif_start_queue(dev);
-+
-+	return 0;
-+}
-+
-+static void imq_setup(struct net_device *dev)
-+{
-+	dev->hard_start_xmit    = imq_dev_xmit;
-+	dev->open		= imq_open;
-+	dev->get_stats		= imq_get_stats;
-+	dev->stop		= imq_close;
-+	dev->type               = ARPHRD_VOID;
-+	dev->mtu                = 16000;
-+	dev->tx_queue_len       = 11000;
-+	dev->flags              = IFF_NOARP;
-+}
-+
-+static struct rtnl_link_ops imq_link_ops __read_mostly = {
-+	.kind		= "imq",
-+	.priv_size	= sizeof(struct imq_private),
-+	.setup		= imq_setup,
-+};
-+
-+static int __init imq_init_hooks(void)
-+{
-+	int err;
-+
-+	err = nf_register_queue_handler(PF_INET, &nfqh);
-+	if (err)
-+		goto err1;
-+
-+	err = nf_register_hook(&imq_ingress_ipv4);
-+	if (err)
-+		goto err2;
-+
-+	err = nf_register_hook(&imq_egress_ipv4);
-+	if (err)
-+		goto err3;
-+
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	err = nf_register_queue_handler(PF_INET6, &nfqh);
-+	if (err)
-+		goto err4;
-+
-+	err = nf_register_hook(&imq_ingress_ipv6);
-+	if (err)
-+		goto err5;
-+
-+	err = nf_register_hook(&imq_egress_ipv6);
-+	if (err)
-+		goto err6;
-+#endif
-+
-+	return 0;
-+
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+err6:
-+	nf_unregister_hook(&imq_ingress_ipv6);
-+err5:
-+	nf_unregister_queue_handler(PF_INET6, &nfqh);
-+err4:
-+	nf_unregister_hook(&imq_egress_ipv4);
-+#endif
-+err3:
-+	nf_unregister_hook(&imq_ingress_ipv4);
-+err2:
-+	nf_unregister_queue_handler(PF_INET, &nfqh);
-+err1:
-+	return err;
-+}
-+
-+static int __init imq_init_one(int index)
-+{
-+	struct net_device *dev;
-+	int ret;
-+
-+	dev = alloc_netdev(sizeof(struct imq_private), "imq%d", imq_setup);
-+	if (!dev)
-+		return -ENOMEM;
-+
-+	ret = dev_alloc_name(dev, dev->name);
-+	if (ret < 0)
-+		goto fail;
-+
-+	dev->rtnl_link_ops = &imq_link_ops;
-+	ret = register_netdevice(dev);
-+	if (ret < 0)
-+		goto fail;
-+
-+	return 0;
-+fail:
-+	free_netdev(dev);
-+	return ret;
-+}
-+
-+static int __init imq_init_devs(void)
-+{
-+	int err, i;
-+
-+	if (!numdevs || numdevs > IMQ_MAX_DEVS) {
-+		printk(KERN_ERR "IMQ: numdevs has to be betweed 1 and %u\n",
-+		       IMQ_MAX_DEVS);
-+		return -EINVAL;
-+	}
-+
-+	rtnl_lock();
-+	err = __rtnl_link_register(&imq_link_ops);
-+
-+	for (i = 0; i < numdevs && !err; i++)
-+		err = imq_init_one(i);
-+
-+	if (err) {
-+		__rtnl_link_unregister(&imq_link_ops);
-+		memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
-+	}
-+	rtnl_unlock();
-+
-+	return err;
-+}
-+
-+static int __init imq_init_module(void)
-+{
-+	int err;
-+
-+	err = imq_init_devs();
-+	if (err) {
-+		printk(KERN_ERR "IMQ: Error trying imq_init_devs(net)\n");
-+		return err;
-+	}
-+
-+	err = imq_init_hooks();
-+	if (err) {
-+		printk(KERN_ERR "IMQ: Error trying imq_init_hooks()\n");
-+		rtnl_link_unregister(&imq_link_ops);
-+		memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
-+		return err;
-+	}
-+
-+	printk(KERN_INFO "IMQ driver loaded successfully.\n");
-+
-+#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	printk(KERN_INFO "\tHooking IMQ before NAT on PREROUTING.\n");
-+#else
-+	printk(KERN_INFO "\tHooking IMQ after NAT on PREROUTING.\n");
-+#endif
-+#if defined(CONFIG_IMQ_BEHAVIOR_AB) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	printk(KERN_INFO "\tHooking IMQ before NAT on POSTROUTING.\n");
-+#else
-+	printk(KERN_INFO "\tHooking IMQ after NAT on POSTROUTING.\n");
-+#endif
-+
-+	return 0;
-+}
-+
-+static void __exit imq_unhook(void)
-+{
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	nf_unregister_hook(&imq_ingress_ipv6);
-+	nf_unregister_hook(&imq_egress_ipv6);
-+	nf_unregister_queue_handler(PF_INET6, &nfqh);
-+#endif
-+	nf_unregister_hook(&imq_ingress_ipv4);
-+	nf_unregister_hook(&imq_egress_ipv4);
-+	nf_unregister_queue_handler(PF_INET, &nfqh);
-+}
-+
-+static void __exit imq_cleanup_devs(void)
-+{
-+	rtnl_link_unregister(&imq_link_ops);
-+	memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
-+}
-+
-+static void __exit imq_exit_module(void)
-+{
-+	imq_unhook();
-+	imq_cleanup_devs();
-+	printk(KERN_INFO "IMQ driver unloaded successfully.\n");
-+}
-+
-+module_init(imq_init_module);
-+module_exit(imq_exit_module);
-+
-+module_param(numdevs, int, 0);
-+MODULE_PARM_DESC(numdevs, "number of IMQ devices (how many imq* devices will "
-+			"be created)");
-+MODULE_AUTHOR("http://www.linuximq.net");
-+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See "
-+			"http://www.linuximq.net/ for more information.");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS_RTNL_LINK("imq");
-+
---- a/drivers/net/Kconfig
-+++ b/drivers/net/Kconfig
-@@ -117,6 +117,129 @@ config EQUALIZER
- 	  To compile this driver as a module, choose M here: the module
- 	  will be called eql.  If unsure, say N.
- 
-+config IMQ
-+	tristate "IMQ (intermediate queueing device) support"
-+	depends on NETDEVICES && NETFILTER
-+	---help---
-+	  The IMQ device(s) is used as placeholder for QoS queueing
-+	  disciplines. Every packet entering/leaving the IP stack can be
-+	  directed through the IMQ device where it's enqueued/dequeued to the
-+	  attached qdisc. This allows you to treat network devices as classes
-+	  and distribute bandwidth among them. Iptables is used to specify
-+	  through which IMQ device, if any, packets travel.
-+
-+	  More information at: http://www.linuximq.net/
-+
-+	  To compile this driver as a module, choose M here: the module
-+	  will be called imq.  If unsure, say N.
-+
-+choice
-+	prompt "IMQ behavior (PRE/POSTROUTING)"
-+	depends on IMQ
-+	default IMQ_BEHAVIOR_AB
-+	help
-+
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		IMQ can work in any of the following ways:
-+
-+		    PREROUTING   |      POSTROUTING
-+		-----------------|-------------------
-+		#1  After NAT    |      After NAT
-+		#2  After NAT    |      Before NAT
-+		#3  Before NAT   |      After NAT
-+		#4  Before NAT   |      Before NAT
-+
-+		The default behavior is to hook before NAT on PREROUTING
-+		and after NAT on POSTROUTING (#3).
-+
-+		This settings are specially usefull when trying to use IMQ
-+		to shape NATed clients.
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_AA
-+	bool "IMQ AA"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   After NAT
-+		POSTROUTING:  After NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_AB
-+	bool "IMQ AB"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   After NAT
-+		POSTROUTING:  Before NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_BA
-+	bool "IMQ BA"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   Before NAT
-+		POSTROUTING:  After NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_BB
-+	bool "IMQ BB"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   Before NAT
-+		POSTROUTING:  Before NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+endchoice
-+
-+config IMQ_NUM_DEVS
-+
-+	int "Number of IMQ devices"
-+	range 2 16
-+	depends on IMQ
-+	default "16"
-+	help
-+
-+		This settings defines how many IMQ devices will be
-+		created.
-+
-+		The default value is 16.
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
- config TUN
- 	tristate "Universal TUN/TAP device driver support"
- 	select CRC32
---- a/drivers/net/Makefile
-+++ b/drivers/net/Makefile
-@@ -143,6 +143,7 @@ obj-$(CONFIG_SLHC) += slhc.o
- obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
- 
- obj-$(CONFIG_DUMMY) += dummy.o
-+obj-$(CONFIG_IMQ) += imq.o
- obj-$(CONFIG_IFB) += ifb.o
- obj-$(CONFIG_MACVLAN) += macvlan.o
- obj-$(CONFIG_DE600) += de600.o
---- /dev/null
-+++ b/include/linux/imq.h
-@@ -0,0 +1,9 @@
-+#ifndef _IMQ_H
-+#define _IMQ_H
-+
-+#define IMQ_MAX_DEVS   16
-+
-+#define IMQ_F_IFMASK   0x7f
-+#define IMQ_F_ENQUEUE  0x80
-+
-+#endif /* _IMQ_H */
---- /dev/null
-+++ b/include/linux/netfilter_ipv4/ipt_IMQ.h
-@@ -0,0 +1,8 @@
-+#ifndef _IPT_IMQ_H
-+#define _IPT_IMQ_H
-+
-+struct ipt_imq_info {
-+	unsigned int todev;     /* target imq device */
-+};
-+
-+#endif /* _IPT_IMQ_H */
---- /dev/null
-+++ b/include/linux/netfilter_ipv6/ip6t_IMQ.h
-@@ -0,0 +1,8 @@
-+#ifndef _IP6T_IMQ_H
-+#define _IP6T_IMQ_H
-+
-+struct ip6t_imq_info {
-+	unsigned int todev;     /* target imq device */
-+};
-+
-+#endif /* _IP6T_IMQ_H */
---- a/include/linux/skbuff.h
-+++ b/include/linux/skbuff.h
-@@ -296,6 +296,10 @@ struct sk_buff {
- 	struct nf_conntrack	*nfct;
- 	struct sk_buff		*nfct_reasm;
- #endif
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	unsigned char			imq_flags;
-+	struct nf_queue_entry	*nf_queue_entry;
-+#endif
- #ifdef CONFIG_BRIDGE_NETFILTER
- 	struct nf_bridge_info	*nf_bridge;
- #endif
-@@ -1736,6 +1740,10 @@ static inline void __nf_copy(struct sk_b
- 	dst->nfct_reasm = src->nfct_reasm;
- 	nf_conntrack_get_reasm(src->nfct_reasm);
- #endif
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	dst->imq_flags = src->imq_flags;
-+	dst->nf_queue_entry = src->nf_queue_entry;
-+#endif
- #ifdef CONFIG_BRIDGE_NETFILTER
- 	dst->nf_bridge  = src->nf_bridge;
- 	nf_bridge_get(src->nf_bridge);
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -95,6 +95,9 @@
- #include <net/net_namespace.h>
- #include <net/sock.h>
- #include <linux/rtnetlink.h>
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+#include <linux/imq.h>
-+#endif
- #include <linux/proc_fs.h>
- #include <linux/seq_file.h>
- #include <linux/stat.h>
-@@ -1537,7 +1540,11 @@ static int dev_gso_segment(struct sk_buf
- int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
- {
- 	if (likely(!skb->next)) {
--		if (!list_empty(&ptype_all))
-+		if (!list_empty(&ptype_all)
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+		    && !(skb->imq_flags & IMQ_F_ENQUEUE)
-+#endif
-+		    )
- 			dev_queue_xmit_nit(skb, dev);
- 
- 		if (netif_needs_gso(dev, skb)) {
---- /dev/null
-+++ b/net/ipv4/netfilter/ipt_IMQ.c
-@@ -0,0 +1,69 @@
-+/*
-+ * This target marks packets to be enqueued to an imq device
-+ */
-+#include <linux/module.h>
-+#include <linux/skbuff.h>
-+#include <linux/netfilter_ipv4/ip_tables.h>
-+#include <linux/netfilter_ipv4/ipt_IMQ.h>
-+#include <linux/imq.h>
-+
-+static unsigned int imq_target(struct sk_buff *pskb,
-+			       const struct net_device *in,
-+			       const struct net_device *out,
-+			       unsigned int hooknum,
-+			       const struct xt_target *target,
-+			       const void *targinfo)
-+{
-+	struct ipt_imq_info *mr = (struct ipt_imq_info *)targinfo;
-+
-+	pskb->imq_flags = mr->todev | IMQ_F_ENQUEUE;
-+
-+	return XT_CONTINUE;
-+}
-+
-+static bool imq_checkentry(const char *tablename,
-+			  const void *e,
-+			  const struct xt_target *target,
-+			  void *targinfo,
-+			  unsigned int hook_mask)
-+{
-+	struct ipt_imq_info *mr;
-+
-+	mr = (struct ipt_imq_info *)targinfo;
-+
-+	if (mr->todev > IMQ_MAX_DEVS) {
-+		printk(KERN_WARNING
-+		       "IMQ: invalid device specified, highest is %u\n",
-+		       IMQ_MAX_DEVS);
-+		return 0;
-+	}
-+
-+	return 1;
-+}
-+
-+static struct xt_target ipt_imq_reg = {
-+	.name		= "IMQ",
-+	.family		= AF_INET,
-+	.target		= imq_target,
-+	.targetsize	= sizeof(struct ipt_imq_info),
-+	.checkentry	= imq_checkentry,
-+	.me		= THIS_MODULE,
-+	.table		= "mangle"
-+};
-+
-+static int __init init(void)
-+{
-+	return xt_register_target(&ipt_imq_reg);
-+}
-+
-+static void __exit fini(void)
-+{
-+	xt_unregister_target(&ipt_imq_reg);
-+}
-+
-+module_init(init);
-+module_exit(fini);
-+
-+MODULE_AUTHOR("http://www.linuximq.net");
-+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
-+MODULE_LICENSE("GPL");
---- a/net/ipv4/netfilter/Kconfig
-+++ b/net/ipv4/netfilter/Kconfig
-@@ -123,6 +123,17 @@ config IP_NF_FILTER
- 
- 	  To compile it as a module, choose M here.  If unsure, say N.
- 
-+config IP_NF_TARGET_IMQ
-+       tristate "IMQ target support"
-+       depends on IP_NF_MANGLE && IMQ
-+       help
-+         This option adds a `IMQ' target which is used to specify if and
-+         to which IMQ device packets should get enqueued/dequeued.
-+
-+	 For more information visit: http://www.linuximq.net/
-+
-+         To compile it as a module, choose M here.  If unsure, say N.
-+
- config IP_NF_TARGET_REJECT
- 	tristate "REJECT target support"
- 	depends on IP_NF_FILTER
---- a/net/ipv4/netfilter/Makefile
-+++ b/net/ipv4/netfilter/Makefile
-@@ -51,6 +51,7 @@ obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl
- obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o
- obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o
- obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o
-+obj-$(CONFIG_IP_NF_TARGET_IMQ) += ipt_IMQ.o
- obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o
- obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o
- obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o
---- /dev/null
-+++ b/net/ipv6/netfilter/ip6t_IMQ.c
-@@ -0,0 +1,69 @@
-+/*
-+ * This target marks packets to be enqueued to an imq device
-+ */
-+#include <linux/module.h>
-+#include <linux/skbuff.h>
-+#include <linux/netfilter_ipv6/ip6_tables.h>
-+#include <linux/netfilter_ipv6/ip6t_IMQ.h>
-+#include <linux/imq.h>
-+
-+static unsigned int imq_target(struct sk_buff *pskb,
-+			       const struct net_device *in,
-+			       const struct net_device *out,
-+			       unsigned int hooknum,
-+			       const struct xt_target *target,
-+			       const void *targinfo)
-+{
-+	struct ip6t_imq_info *mr = (struct ip6t_imq_info *)targinfo;
-+
-+	pskb->imq_flags = mr->todev | IMQ_F_ENQUEUE;
-+
-+	return XT_CONTINUE;
-+}
-+
-+static bool imq_checkentry(const char *tablename,
-+			  const void *entry,
-+			  const struct xt_target *target,
-+			  void *targinfo,
-+			  unsigned int hook_mask)
-+{
-+	struct ip6t_imq_info *mr;
-+
-+	mr = (struct ip6t_imq_info *)targinfo;
-+
-+	if (mr->todev > IMQ_MAX_DEVS) {
-+		printk(KERN_WARNING
-+		       "IMQ: invalid device specified, highest is %u\n",
-+		       IMQ_MAX_DEVS);
-+		return 0;
-+	}
-+
-+	return 1;
-+}
-+
-+static struct xt_target ip6t_imq_reg = {
-+	.name           = "IMQ",
-+	.family		= AF_INET6,
-+	.target         = imq_target,
-+	.targetsize	= sizeof(struct ip6t_imq_info),
-+	.table		= "mangle",
-+	.checkentry     = imq_checkentry,
-+	.me             = THIS_MODULE
-+};
-+
-+static int __init init(void)
-+{
-+	return xt_register_target(&ip6t_imq_reg);
-+}
-+
-+static void __exit fini(void)
-+{
-+	xt_unregister_target(&ip6t_imq_reg);
-+}
-+
-+module_init(init);
-+module_exit(fini);
-+
-+MODULE_AUTHOR("http://www.linuximq.net");
-+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
-+MODULE_LICENSE("GPL");
---- a/net/ipv6/netfilter/Kconfig
-+++ b/net/ipv6/netfilter/Kconfig
-@@ -179,6 +179,15 @@ config IP6_NF_MANGLE
- 
- 	  To compile it as a module, choose M here.  If unsure, say N.
- 
-+config IP6_NF_TARGET_IMQ
-+	tristate "IMQ target support"
-+	depends on IP6_NF_MANGLE && IMQ
-+	help
-+          This option adds a `IMQ' target which is used to specify if and
-+          to which imq device packets should get enqueued/dequeued.
-+
-+          To compile it as a module, choose M here.  If unsure, say N.
-+
- config IP6_NF_TARGET_HL
- 	tristate  'HL (hoplimit) target support'
- 	depends on IP6_NF_MANGLE
---- a/net/ipv6/netfilter/Makefile
-+++ b/net/ipv6/netfilter/Makefile
-@@ -6,6 +6,7 @@
- obj-$(CONFIG_IP6_NF_IPTABLES) += ip6_tables.o
- obj-$(CONFIG_IP6_NF_FILTER) += ip6table_filter.o
- obj-$(CONFIG_IP6_NF_MANGLE) += ip6table_mangle.o
-+obj-$(CONFIG_IP6_NF_TARGET_IMQ) += ip6t_IMQ.o
- obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o
- obj-$(CONFIG_IP6_NF_RAW) += ip6table_raw.o
- 
---- a/net/sched/sch_generic.c
-+++ b/net/sched/sch_generic.c
-@@ -203,6 +203,7 @@ void __qdisc_run(struct net_device *dev)
- 
- 	clear_bit(__LINK_STATE_QDISC_RUNNING, &dev->state);
- }
-+EXPORT_SYMBOL(__qdisc_run);
- 
- static void dev_watchdog(unsigned long arg)
- {
diff --git a/target/linux/generic-2.6/patches-2.6.25/180-netfilter_depends.patch b/target/linux/generic-2.6/patches-2.6.25/180-netfilter_depends.patch
deleted file mode 100644
index efab40c2d..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/180-netfilter_depends.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -145,7 +145,7 @@ config NF_CONNTRACK_FTP
- 
- config NF_CONNTRACK_H323
- 	tristate "H.323 protocol support"
--	depends on NF_CONNTRACK && (IPV6 || IPV6=n)
-+	depends on NF_CONNTRACK
- 	depends on NETFILTER_ADVANCED
- 	help
- 	  H.323 is a VoIP signalling protocol from ITU-T. As one of the most
-@@ -423,7 +423,7 @@ config NETFILTER_XT_TARGET_CONNSECMARK
- 
- config NETFILTER_XT_TARGET_TCPMSS
- 	tristate '"TCPMSS" target support'
--	depends on NETFILTER_XTABLES && (IPV6 || IPV6=n)
-+	depends on NETFILTER_XTABLES
- 	default m if NETFILTER_ADVANCED=n
- 	---help---
- 	  This option adds a `TCPMSS' target, which allows you to alter the
diff --git a/target/linux/generic-2.6/patches-2.6.25/190-netfilter_rtsp.patch b/target/linux/generic-2.6/patches-2.6.25/190-netfilter_rtsp.patch
deleted file mode 100644
index 6d1648881..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/190-netfilter_rtsp.patch
+++ /dev/null
@@ -1,1362 +0,0 @@
---- /dev/null
-+++ b/include/linux/netfilter/nf_conntrack_rtsp.h
-@@ -0,0 +1,63 @@
-+/*
-+ * RTSP extension for IP connection tracking.
-+ * (C) 2003 by Tom Marshall <tmarshall at real.com>
-+ * based on ip_conntrack_irc.h
-+ *
-+ *      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.
-+ */
-+#ifndef _IP_CONNTRACK_RTSP_H
-+#define _IP_CONNTRACK_RTSP_H
-+
-+//#define IP_NF_RTSP_DEBUG 1
-+#define IP_NF_RTSP_VERSION "0.6.21"
-+
-+#ifdef __KERNEL__
-+/* port block types */
-+typedef enum {
-+    pb_single,  /* client_port=x */
-+    pb_range,   /* client_port=x-y */
-+    pb_discon   /* client_port=x/y (rtspbis) */
-+} portblock_t;
-+
-+/* We record seq number and length of rtsp headers here, all in host order. */
-+
-+/*
-+ * This structure is per expected connection.  It is a member of struct
-+ * ip_conntrack_expect.  The TCP SEQ for the conntrack expect is stored
-+ * there and we are expected to only store the length of the data which
-+ * needs replaced.  If a packet contains multiple RTSP messages, we create
-+ * one expected connection per message.
-+ *
-+ * We use these variables to mark the entire header block.  This may seem
-+ * like overkill, but the nature of RTSP requires it.  A header may appear
-+ * multiple times in a message.  We must treat two Transport headers the
-+ * same as one Transport header with two entries.
-+ */
-+struct ip_ct_rtsp_expect
-+{
-+    u_int32_t   len;        /* length of header block */
-+    portblock_t pbtype;     /* Type of port block that was requested */
-+    u_int16_t   loport;     /* Port that was requested, low or first */
-+    u_int16_t   hiport;     /* Port that was requested, high or second */
-+#if 0
-+    uint        method;     /* RTSP method */
-+    uint        cseq;       /* CSeq from request */
-+#endif
-+};
-+
-+extern unsigned int (*nf_nat_rtsp_hook)(struct sk_buff *skb,
-+				 enum ip_conntrack_info ctinfo,
-+				 unsigned int matchoff, unsigned int matchlen,
-+				 struct ip_ct_rtsp_expect *prtspexp,
-+				 struct nf_conntrack_expect *exp);
-+
-+extern void (*nf_nat_rtsp_hook_expectfn)(struct nf_conn *ct, struct nf_conntrack_expect *exp);
-+
-+#define RTSP_PORT   554
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _IP_CONNTRACK_RTSP_H */
---- /dev/null
-+++ b/include/linux/netfilter_helpers.h
-@@ -0,0 +1,133 @@
-+/*
-+ * Helpers for netfiler modules.  This file provides implementations for basic
-+ * functions such as strncasecmp(), etc.
-+ *
-+ * gcc will warn for defined but unused functions, so we only include the
-+ * functions requested.  The following macros are used:
-+ *   NF_NEED_STRNCASECMP        nf_strncasecmp()
-+ *   NF_NEED_STRTOU16           nf_strtou16()
-+ *   NF_NEED_STRTOU32           nf_strtou32()
-+ */
-+#ifndef _NETFILTER_HELPERS_H
-+#define _NETFILTER_HELPERS_H
-+
-+/* Only include these functions for kernel code. */
-+#ifdef __KERNEL__
-+
-+#include <linux/ctype.h>
-+#define iseol(c) ( (c) == '\r' || (c) == '\n' )
-+
-+/*
-+ * The standard strncasecmp()
-+ */
-+#ifdef NF_NEED_STRNCASECMP
-+static int
-+nf_strncasecmp(const char* s1, const char* s2, u_int32_t len)
-+{
-+    if (s1 == NULL || s2 == NULL)
-+    {
-+        if (s1 == NULL && s2 == NULL)
-+        {
-+            return 0;
-+        }
-+        return (s1 == NULL) ? -1 : 1;
-+    }
-+    while (len > 0 && tolower(*s1) == tolower(*s2))
-+    {
-+        len--;
-+        s1++;
-+        s2++;
-+    }
-+    return ( (len == 0) ? 0 : (tolower(*s1) - tolower(*s2)) );
-+}
-+#endif /* NF_NEED_STRNCASECMP */
-+
-+/*
-+ * Parse a string containing a 16-bit unsigned integer.
-+ * Returns the number of chars used, or zero if no number is found.
-+ */
-+#ifdef NF_NEED_STRTOU16
-+static int
-+nf_strtou16(const char* pbuf, u_int16_t* pval)
-+{
-+    int n = 0;
-+
-+    *pval = 0;
-+    while (isdigit(pbuf[n]))
-+    {
-+        *pval = (*pval * 10) + (pbuf[n] - '0');
-+        n++;
-+    }
-+
-+    return n;
-+}
-+#endif /* NF_NEED_STRTOU16 */
-+
-+/*
-+ * Parse a string containing a 32-bit unsigned integer.
-+ * Returns the number of chars used, or zero if no number is found.
-+ */
-+#ifdef NF_NEED_STRTOU32
-+static int
-+nf_strtou32(const char* pbuf, u_int32_t* pval)
-+{
-+    int n = 0;
-+
-+    *pval = 0;
-+    while (pbuf[n] >= '0' && pbuf[n] <= '9')
-+    {
-+        *pval = (*pval * 10) + (pbuf[n] - '0');
-+        n++;
-+    }
-+
-+    return n;
-+}
-+#endif /* NF_NEED_STRTOU32 */
-+
-+/*
-+ * Given a buffer and length, advance to the next line and mark the current
-+ * line.
-+ */
-+#ifdef NF_NEED_NEXTLINE
-+static int
-+nf_nextline(char* p, uint len, uint* poff, uint* plineoff, uint* plinelen)
-+{
-+    uint    off = *poff;
-+    uint    physlen = 0;
-+
-+    if (off >= len)
-+    {
-+        return 0;
-+    }
-+
-+    while (p[off] != '\n')
-+    {
-+        if (len-off <= 1)
-+        {
-+            return 0;
-+        }
-+
-+        physlen++;
-+        off++;
-+    }
-+
-+    /* if we saw a crlf, physlen needs adjusted */
-+    if (physlen > 0 && p[off] == '\n' && p[off-1] == '\r')
-+    {
-+        physlen--;
-+    }
-+
-+    /* advance past the newline */
-+    off++;
-+
-+    *plineoff = *poff;
-+    *plinelen = physlen;
-+    *poff = off;
-+
-+    return 1;
-+}
-+#endif /* NF_NEED_NEXTLINE */
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _NETFILTER_HELPERS_H */
---- /dev/null
-+++ b/include/linux/netfilter_mime.h
-@@ -0,0 +1,89 @@
-+/*
-+ * MIME functions for netfilter modules.  This file provides implementations
-+ * for basic MIME parsing.  MIME headers are used in many protocols, such as
-+ * HTTP, RTSP, SIP, etc.
-+ *
-+ * gcc will warn for defined but unused functions, so we only include the
-+ * functions requested.  The following macros are used:
-+ *   NF_NEED_MIME_NEXTLINE      nf_mime_nextline()
-+ */
-+#ifndef _NETFILTER_MIME_H
-+#define _NETFILTER_MIME_H
-+
-+/* Only include these functions for kernel code. */
-+#ifdef __KERNEL__
-+
-+#include <linux/ctype.h>
-+
-+/*
-+ * Given a buffer and length, advance to the next line and mark the current
-+ * line.  If the current line is empty, *plinelen will be set to zero.  If
-+ * not, it will be set to the actual line length (including CRLF).
-+ *
-+ * 'line' in this context means logical line (includes LWS continuations).
-+ * Returns 1 on success, 0 on failure.
-+ */
-+#ifdef NF_NEED_MIME_NEXTLINE
-+static int
-+nf_mime_nextline(char* p, uint len, uint* poff, uint* plineoff, uint* plinelen)
-+{
-+    uint    off = *poff;
-+    uint    physlen = 0;
-+    int     is_first_line = 1;
-+
-+    if (off >= len)
-+    {
-+        return 0;
-+    }
-+
-+    do
-+    {
-+        while (p[off] != '\n')
-+        {
-+            if (len-off <= 1)
-+            {
-+                return 0;
-+            }
-+
-+            physlen++;
-+            off++;
-+        }
-+
-+        /* if we saw a crlf, physlen needs adjusted */
-+        if (physlen > 0 && p[off] == '\n' && p[off-1] == '\r')
-+        {
-+            physlen--;
-+        }
-+
-+        /* advance past the newline */
-+        off++;
-+
-+        /* check for an empty line */
-+        if (physlen == 0)
-+        {
-+            break;
-+        }
-+
-+        /* check for colon on the first physical line */
-+        if (is_first_line)
-+        {
-+            is_first_line = 0;
-+            if (memchr(p+(*poff), ':', physlen) == NULL)
-+            {
-+                return 0;
-+            }
-+        }
-+    }
-+    while (p[off] == ' ' || p[off] == '\t');
-+
-+    *plineoff = *poff;
-+    *plinelen = (physlen == 0) ? 0 : (off - *poff);
-+    *poff = off;
-+
-+    return 1;
-+}
-+#endif /* NF_NEED_MIME_NEXTLINE */
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _NETFILTER_MIME_H */
---- a/net/ipv4/netfilter/Makefile
-+++ b/net/ipv4/netfilter/Makefile
-@@ -23,6 +23,7 @@ obj-$(CONFIG_NF_NAT_AMANDA) += nf_nat_am
- obj-$(CONFIG_NF_NAT_FTP) += nf_nat_ftp.o
- obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o
- obj-$(CONFIG_NF_NAT_IRC) += nf_nat_irc.o
-+obj-$(CONFIG_NF_NAT_RTSP) += nf_nat_rtsp.o
- obj-$(CONFIG_NF_NAT_PPTP) += nf_nat_pptp.o
- obj-$(CONFIG_NF_NAT_SIP) += nf_nat_sip.o
- obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -258,6 +258,16 @@ config NF_CONNTRACK_TFTP
- 
- 	  To compile it as a module, choose M here.  If unsure, say N.
- 
-+config NF_CONNTRACK_RTSP
-+	tristate "RTSP protocol support"
-+	depends on NF_CONNTRACK
-+	help
-+		Support the RTSP protocol.  This allows UDP transports to be setup
-+		properly, including RTP and RDT.
-+
-+		If you want to compile it as a module, say 'M' here and read
-+		Documentation/modules.txt.  If unsure, say 'Y'.
-+
- config NF_CT_NETLINK
- 	tristate 'Connection tracking netlink interface'
- 	depends on NF_CONNTRACK
---- a/net/netfilter/Makefile
-+++ b/net/netfilter/Makefile
-@@ -32,6 +32,7 @@ obj-$(CONFIG_NF_CONNTRACK_PPTP) += nf_co
- obj-$(CONFIG_NF_CONNTRACK_SANE) += nf_conntrack_sane.o
- obj-$(CONFIG_NF_CONNTRACK_SIP) += nf_conntrack_sip.o
- obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_conntrack_tftp.o
-+obj-$(CONFIG_NF_CONNTRACK_RTSP) += nf_conntrack_rtsp.o
- 
- # generic X tables 
- obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o
---- a/net/ipv4/netfilter/Kconfig
-+++ b/net/ipv4/netfilter/Kconfig
-@@ -266,6 +266,11 @@ config NF_NAT_IRC
- 	depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT
- 	default NF_NAT && NF_CONNTRACK_IRC
- 
-+config NF_NAT_RTSP
-+	tristate
-+ 	depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT
-+ 	default NF_NAT && NF_CONNTRACK_RTSP
-+
- config NF_NAT_TFTP
- 	tristate
- 	depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT
---- /dev/null
-+++ b/net/netfilter/nf_conntrack_rtsp.c
-@@ -0,0 +1,513 @@
-+/*
-+ * RTSP extension for IP connection tracking
-+ * (C) 2003 by Tom Marshall <tmarshall at real.com>
-+ * based on ip_conntrack_irc.c
-+ *
-+ *      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.
-+ *
-+ * Module load syntax:
-+ *   insmod nf_conntrack_rtsp.o ports=port1,port2,...port<MAX_PORTS>
-+ *                              max_outstanding=n setup_timeout=secs
-+ *
-+ * If no ports are specified, the default will be port 554.
-+ *
-+ * With max_outstanding you can define the maximum number of not yet
-+ * answered SETUP requests per RTSP session (default 8).
-+ * With setup_timeout you can specify how long the system waits for
-+ * an expected data channel (default 300 seconds).
-+ *
-+ * 2005-02-13: Harald Welte <laforge at netfilter.org>
-+ * 	- port to 2.6
-+ * 	- update to recent post-2.6.11 api changes
-+ * 2006-09-14: Steven Van Acker <deepstar at singularity.be>
-+ *      - removed calls to NAT code from conntrack helper: NAT no longer needed to use rtsp-conntrack
-+ * 2007-04-18: Michael Guntsche <mike at it-loops.com>
-+ * 			- Port to new NF API
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/netfilter.h>
-+#include <linux/ip.h>
-+#include <linux/inet.h>
-+#include <net/tcp.h>
-+
-+#include <net/netfilter/nf_conntrack.h>
-+#include <net/netfilter/nf_conntrack_expect.h>
-+#include <net/netfilter/nf_conntrack_helper.h>
-+#include <linux/netfilter/nf_conntrack_rtsp.h>
-+
-+#define NF_NEED_STRNCASECMP
-+#define NF_NEED_STRTOU16
-+#define NF_NEED_STRTOU32
-+#define NF_NEED_NEXTLINE
-+#include <linux/netfilter_helpers.h>
-+#define NF_NEED_MIME_NEXTLINE
-+#include <linux/netfilter_mime.h>
-+
-+#include <linux/ctype.h>
-+#define MAX_SIMUL_SETUP 8 /* XXX: use max_outstanding */
-+#define INFOP(fmt, args...) printk(KERN_INFO "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#if 0
-+#define DEBUGP(fmt, args...) printk(KERN_DEBUG "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#else
-+#define DEBUGP(fmt, args...)
-+#endif
-+
-+#define MAX_PORTS 8
-+static int ports[MAX_PORTS];
-+static int num_ports = 0;
-+static int max_outstanding = 8;
-+static unsigned int setup_timeout = 300;
-+
-+MODULE_AUTHOR("Tom Marshall <tmarshall at real.com>");
-+MODULE_DESCRIPTION("RTSP connection tracking module");
-+MODULE_LICENSE("GPL");
-+module_param_array(ports, int, &num_ports, 0400);
-+MODULE_PARM_DESC(ports, "port numbers of RTSP servers");
-+module_param(max_outstanding, int, 0400);
-+MODULE_PARM_DESC(max_outstanding, "max number of outstanding SETUP requests per RTSP session");
-+module_param(setup_timeout, int, 0400);
-+MODULE_PARM_DESC(setup_timeout, "timeout on for unestablished data channels");
-+
-+static char *rtsp_buffer;
-+static DEFINE_SPINLOCK(rtsp_buffer_lock);
-+
-+unsigned int (*nf_nat_rtsp_hook)(struct sk_buff *skb,
-+				 enum ip_conntrack_info ctinfo,
-+				 unsigned int matchoff, unsigned int matchlen,struct ip_ct_rtsp_expect* prtspexp,
-+				 struct nf_conntrack_expect *exp);
-+void (*nf_nat_rtsp_hook_expectfn)(struct nf_conn *ct, struct nf_conntrack_expect *exp);
-+
-+EXPORT_SYMBOL_GPL(nf_nat_rtsp_hook);
-+
-+/*
-+ * Max mappings we will allow for one RTSP connection (for RTP, the number
-+ * of allocated ports is twice this value).  Note that SMIL burns a lot of
-+ * ports so keep this reasonably high.  If this is too low, you will see a
-+ * lot of "no free client map entries" messages.
-+ */
-+#define MAX_PORT_MAPS 16
-+
-+/*** default port list was here in the masq code: 554, 3030, 4040 ***/
-+
-+#define SKIP_WSPACE(ptr,len,off) while(off < len && isspace(*(ptr+off))) { off++; }
-+
-+/*
-+ * Parse an RTSP packet.
-+ *
-+ * Returns zero if parsing failed.
-+ *
-+ * Parameters:
-+ *  IN      ptcp        tcp data pointer
-+ *  IN      tcplen      tcp data len
-+ *  IN/OUT  ptcpoff     points to current tcp offset
-+ *  OUT     phdrsoff    set to offset of rtsp headers
-+ *  OUT     phdrslen    set to length of rtsp headers
-+ *  OUT     pcseqoff    set to offset of CSeq header
-+ *  OUT     pcseqlen    set to length of CSeq header
-+ */
-+static int
-+rtsp_parse_message(char* ptcp, uint tcplen, uint* ptcpoff,
-+                   uint* phdrsoff, uint* phdrslen,
-+                   uint* pcseqoff, uint* pcseqlen,
-+                   uint* transoff, uint* translen)
-+{
-+	uint    entitylen = 0;
-+	uint    lineoff;
-+	uint    linelen;
-+
-+	if (!nf_nextline(ptcp, tcplen, ptcpoff, &lineoff, &linelen))
-+		return 0;
-+
-+	*phdrsoff = *ptcpoff;
-+	while (nf_mime_nextline(ptcp, tcplen, ptcpoff, &lineoff, &linelen)) {
-+		if (linelen == 0) {
-+			if (entitylen > 0)
-+				*ptcpoff += min(entitylen, tcplen - *ptcpoff);
-+			break;
-+		}
-+		if (lineoff+linelen > tcplen) {
-+			INFOP("!! overrun !!\n");
-+			break;
-+		}
-+
-+		if (nf_strncasecmp(ptcp+lineoff, "CSeq:", 5) == 0) {
-+			*pcseqoff = lineoff;
-+			*pcseqlen = linelen;
-+		}
-+
-+		if (nf_strncasecmp(ptcp+lineoff, "Transport:", 10) == 0) {
-+			*transoff = lineoff;
-+			*translen = linelen;
-+		}
-+
-+		if (nf_strncasecmp(ptcp+lineoff, "Content-Length:", 15) == 0) {
-+			uint off = lineoff+15;
-+			SKIP_WSPACE(ptcp+lineoff, linelen, off);
-+			nf_strtou32(ptcp+off, &entitylen);
-+		}
-+	}
-+	*phdrslen = (*ptcpoff) - (*phdrsoff);
-+
-+	return 1;
-+}
-+
-+/*
-+ * Find lo/hi client ports (if any) in transport header
-+ * In:
-+ *   ptcp, tcplen = packet
-+ *   tranoff, tranlen = buffer to search
-+ *
-+ * Out:
-+ *   pport_lo, pport_hi = lo/hi ports (host endian)
-+ *
-+ * Returns nonzero if any client ports found
-+ *
-+ * Note: it is valid (and expected) for the client to request multiple
-+ * transports, so we need to parse the entire line.
-+ */
-+static int
-+rtsp_parse_transport(char* ptran, uint tranlen,
-+                     struct ip_ct_rtsp_expect* prtspexp)
-+{
-+	int     rc = 0;
-+	uint    off = 0;
-+
-+	if (tranlen < 10 || !iseol(ptran[tranlen-1]) ||
-+	    nf_strncasecmp(ptran, "Transport:", 10) != 0) {
-+		INFOP("sanity check failed\n");
-+		return 0;
-+	}
-+
-+	DEBUGP("tran='%.*s'\n", (int)tranlen, ptran);
-+	off += 10;
-+	SKIP_WSPACE(ptran, tranlen, off);
-+
-+	/* Transport: tran;field;field=val,tran;field;field=val,... */
-+	while (off < tranlen) {
-+		const char* pparamend;
-+		uint        nextparamoff;
-+
-+		pparamend = memchr(ptran+off, ',', tranlen-off);
-+		pparamend = (pparamend == NULL) ? ptran+tranlen : pparamend+1;
-+		nextparamoff = pparamend-ptran;
-+
-+		while (off < nextparamoff) {
-+			const char* pfieldend;
-+			uint        nextfieldoff;
-+
-+			pfieldend = memchr(ptran+off, ';', nextparamoff-off);
-+			nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
-+
-+			if (strncmp(ptran+off, "client_port=", 12) == 0) {
-+				u_int16_t   port;
-+				uint        numlen;
-+
-+				off += 12;
-+				numlen = nf_strtou16(ptran+off, &port);
-+				off += numlen;
-+				if (prtspexp->loport != 0 && prtspexp->loport != port)
-+					DEBUGP("multiple ports found, port %hu ignored\n", port);
-+				else {
-+					DEBUGP("lo port found : %hu\n", port);
-+					prtspexp->loport = prtspexp->hiport = port;
-+					if (ptran[off] == '-') {
-+						off++;
-+						numlen = nf_strtou16(ptran+off, &port);
-+						off += numlen;
-+						prtspexp->pbtype = pb_range;
-+						prtspexp->hiport = port;
-+
-+						// If we have a range, assume rtp:
-+						// loport must be even, hiport must be loport+1
-+						if ((prtspexp->loport & 0x0001) != 0 ||
-+						    prtspexp->hiport != prtspexp->loport+1) {
-+							DEBUGP("incorrect range: %hu-%hu, correcting\n",
-+							       prtspexp->loport, prtspexp->hiport);
-+							prtspexp->loport &= 0xfffe;
-+							prtspexp->hiport = prtspexp->loport+1;
-+						}
-+					} else if (ptran[off] == '/') {
-+						off++;
-+						numlen = nf_strtou16(ptran+off, &port);
-+						off += numlen;
-+						prtspexp->pbtype = pb_discon;
-+						prtspexp->hiport = port;
-+					}
-+					rc = 1;
-+				}
-+			}
-+
-+			/*
-+			 * Note we don't look for the destination parameter here.
-+			 * If we are using NAT, the NAT module will handle it.  If not,
-+			 * and the client is sending packets elsewhere, the expectation
-+			 * will quietly time out.
-+			 */
-+
-+			off = nextfieldoff;
-+		}
-+
-+		off = nextparamoff;
-+	}
-+
-+	return rc;
-+}
-+
-+void expected(struct nf_conn *ct, struct nf_conntrack_expect *exp)
-+{
-+    if(nf_nat_rtsp_hook_expectfn) {
-+        nf_nat_rtsp_hook_expectfn(ct,exp);
-+    }
-+}
-+
-+/*** conntrack functions ***/
-+
-+/* outbound packet: client->server */
-+
-+static inline int
-+help_out(struct sk_buff *skb, unsigned char *rb_ptr, unsigned int datalen,
-+                struct nf_conn *ct, enum ip_conntrack_info ctinfo)
-+{
-+	struct ip_ct_rtsp_expect expinfo;
-+
-+	int dir = CTINFO2DIR(ctinfo);   /* = IP_CT_DIR_ORIGINAL */
-+	//struct  tcphdr* tcph = (void*)iph + iph->ihl * 4;
-+	//uint    tcplen = pktlen - iph->ihl * 4;
-+	char*   pdata = rb_ptr;
-+	//uint    datalen = tcplen - tcph->doff * 4;
-+	uint    dataoff = 0;
-+	int ret = NF_ACCEPT;
-+
-+	struct nf_conntrack_expect *exp;
-+
-+	__be16 be_loport;
-+
-+	memset(&expinfo, 0, sizeof(expinfo));
-+
-+	while (dataoff < datalen) {
-+		uint    cmdoff = dataoff;
-+		uint    hdrsoff = 0;
-+		uint    hdrslen = 0;
-+		uint    cseqoff = 0;
-+		uint    cseqlen = 0;
-+		uint    transoff = 0;
-+		uint    translen = 0;
-+		uint    off;
-+
-+		if (!rtsp_parse_message(pdata, datalen, &dataoff,
-+					&hdrsoff, &hdrslen,
-+					&cseqoff, &cseqlen,
-+					&transoff, &translen))
-+			break;      /* not a valid message */
-+
-+		if (strncmp(pdata+cmdoff, "SETUP ", 6) != 0)
-+			continue;   /* not a SETUP message */
-+		DEBUGP("found a setup message\n");
-+
-+		off = 0;
-+		if(translen) {
-+			rtsp_parse_transport(pdata+transoff, translen, &expinfo);
-+		}
-+
-+		if (expinfo.loport == 0) {
-+			DEBUGP("no udp transports found\n");
-+			continue;   /* no udp transports found */
-+		}
-+
-+		DEBUGP("udp transport found, ports=(%d,%hu,%hu)\n",
-+		       (int)expinfo.pbtype, expinfo.loport, expinfo.hiport);
-+
-+		exp = nf_ct_expect_alloc(ct);
-+		if (!exp) {
-+			ret = NF_DROP;
-+			goto out;
-+		}
-+
-+		be_loport = htons(expinfo.loport);
-+
-+		nf_ct_expect_init(exp, ct->tuplehash[!dir].tuple.src.l3num,
-+			&ct->tuplehash[!dir].tuple.src.u3, &ct->tuplehash[!dir].tuple.dst.u3,
-+			IPPROTO_UDP, NULL, &be_loport);
-+
-+		exp->master = ct;
-+
-+		exp->expectfn = expected;
-+		exp->flags = 0;
-+
-+		if (expinfo.pbtype == pb_range) {
-+			DEBUGP("Changing expectation mask to handle multiple ports\n");
-+			exp->mask.src.u.udp.port  = 0xfffe;
-+		}
-+
-+		DEBUGP("expect_related %u.%u.%u.%u:%u-%u.%u.%u.%u:%u\n",
-+		       NIPQUAD(exp->tuple.src.u3.ip),
-+		       ntohs(exp->tuple.src.u.udp.port),
-+		       NIPQUAD(exp->tuple.dst.u3.ip),
-+		       ntohs(exp->tuple.dst.u.udp.port));
-+
-+		if (nf_nat_rtsp_hook)
-+			/* pass the request off to the nat helper */
-+			ret = nf_nat_rtsp_hook(skb, ctinfo, hdrsoff, hdrslen, &expinfo, exp);
-+		else if (nf_ct_expect_related(exp) != 0) {
-+			INFOP("nf_ct_expect_related failed\n");
-+			ret  = NF_DROP;
-+		}
-+		nf_ct_expect_put(exp);
-+		goto out;
-+	}
-+out:
-+
-+	return ret;
-+}
-+
-+
-+static inline int
-+help_in(struct sk_buff *skb, size_t pktlen,
-+ struct nf_conn* ct, enum ip_conntrack_info ctinfo)
-+{
-+ return NF_ACCEPT;
-+}
-+
-+static int help(struct sk_buff *skb, unsigned int protoff,
-+		struct nf_conn *ct, enum ip_conntrack_info ctinfo)
-+{
-+	struct tcphdr _tcph, *th;
-+	unsigned int dataoff, datalen;
-+	char *rb_ptr;
-+	int ret = NF_DROP;
-+
-+	/* Until there's been traffic both ways, don't look in packets. */
-+	if (ctinfo != IP_CT_ESTABLISHED &&
-+	    ctinfo != IP_CT_ESTABLISHED + IP_CT_IS_REPLY) {
-+		DEBUGP("conntrackinfo = %u\n", ctinfo);
-+		return NF_ACCEPT;
-+	}
-+
-+	/* Not whole TCP header? */
-+	th = skb_header_pointer(skb, protoff, sizeof(_tcph), &_tcph);
-+
-+	if (!th)
-+		return NF_ACCEPT;
-+
-+	/* No data ? */
-+	dataoff = protoff + th->doff*4;
-+	datalen = skb->len - dataoff;
-+	if (dataoff >= skb->len)
-+		return NF_ACCEPT;
-+
-+	spin_lock_bh(&rtsp_buffer_lock);
-+	rb_ptr = skb_header_pointer(skb, dataoff,
-+				    skb->len - dataoff, rtsp_buffer);
-+	BUG_ON(rb_ptr == NULL);
-+
-+#if 0
-+	/* Checksum invalid?  Ignore. */
-+	/* FIXME: Source route IP option packets --RR */
-+	if (tcp_v4_check(tcph, tcplen, iph->saddr, iph->daddr,
-+			 csum_partial((char*)tcph, tcplen, 0)))
-+	{
-+		DEBUGP("bad csum: %p %u %u.%u.%u.%u %u.%u.%u.%u\n",
-+		       tcph, tcplen, NIPQUAD(iph->saddr), NIPQUAD(iph->daddr));
-+		return NF_ACCEPT;
-+	}
-+#endif
-+
-+	switch (CTINFO2DIR(ctinfo)) {
-+	case IP_CT_DIR_ORIGINAL:
-+		ret = help_out(skb, rb_ptr, datalen, ct, ctinfo);
-+		break;
-+	case IP_CT_DIR_REPLY:
-+		DEBUGP("IP_CT_DIR_REPLY\n");
-+		/* inbound packet: server->client */
-+		ret = NF_ACCEPT;
-+		break;
-+	}
-+
-+	spin_unlock_bh(&rtsp_buffer_lock);
-+
-+	return ret;
-+}
-+
-+static struct nf_conntrack_helper rtsp_helpers[MAX_PORTS];
-+static char rtsp_names[MAX_PORTS][10];
-+
-+/* This function is intentionally _NOT_ defined as __exit */
-+static void
-+fini(void)
-+{
-+	int i;
-+	for (i = 0; i < num_ports; i++) {
-+		DEBUGP("unregistering port %d\n", ports[i]);
-+		nf_conntrack_helper_unregister(&rtsp_helpers[i]);
-+	}
-+	kfree(rtsp_buffer);
-+}
-+
-+static int __init
-+init(void)
-+{
-+	int i, ret;
-+	struct nf_conntrack_helper *hlpr;
-+	char *tmpname;
-+
-+	printk("nf_conntrack_rtsp v" IP_NF_RTSP_VERSION " loading\n");
-+
-+	if (max_outstanding < 1) {
-+		printk("nf_conntrack_rtsp: max_outstanding must be a positive integer\n");
-+		return -EBUSY;
-+	}
-+	if (setup_timeout < 0) {
-+		printk("nf_conntrack_rtsp: setup_timeout must be a positive integer\n");
-+		return -EBUSY;
-+	}
-+
-+	rtsp_buffer = kmalloc(65536, GFP_KERNEL);
-+	if (!rtsp_buffer)
-+		return -ENOMEM;
-+
-+	/* If no port given, default to standard rtsp port */
-+	if (ports[0] == 0) {
-+		ports[0] = RTSP_PORT;
-+	}
-+
-+	for (i = 0; (i < MAX_PORTS) && ports[i]; i++) {
-+		hlpr = &rtsp_helpers[i];
-+		memset(hlpr, 0, sizeof(struct nf_conntrack_helper));
-+		hlpr->tuple.src.u.tcp.port = htons(ports[i]);
-+		hlpr->tuple.dst.protonum = IPPROTO_TCP;
-+		hlpr->max_expected = max_outstanding;
-+		hlpr->timeout = setup_timeout;
-+		hlpr->me = THIS_MODULE;
-+		hlpr->help = help;
-+
-+		tmpname = &rtsp_names[i][0];
-+		if (ports[i] == RTSP_PORT) {
-+			sprintf(tmpname, "rtsp");
-+		} else {
-+			sprintf(tmpname, "rtsp-%d", i);
-+		}
-+		hlpr->name = tmpname;
-+
-+		DEBUGP("port #%d: %d\n", i, ports[i]);
-+
-+		ret = nf_conntrack_helper_register(hlpr);
-+
-+		if (ret) {
-+			printk("nf_conntrack_rtsp: ERROR registering port %d\n", ports[i]);
-+			fini();
-+			return -EBUSY;
-+		}
-+		num_ports++;
-+	}
-+	return 0;
-+}
-+
-+module_init(init);
-+module_exit(fini);
-+
-+EXPORT_SYMBOL(nf_nat_rtsp_hook_expectfn);
-+
---- /dev/null
-+++ b/net/ipv4/netfilter/nf_nat_rtsp.c
-@@ -0,0 +1,496 @@
-+/*
-+ * RTSP extension for TCP NAT alteration
-+ * (C) 2003 by Tom Marshall <tmarshall at real.com>
-+ * based on ip_nat_irc.c
-+ *
-+ *      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.
-+ *
-+ * Module load syntax:
-+ *      insmod nf_nat_rtsp.o ports=port1,port2,...port<MAX_PORTS>
-+ *                           stunaddr=<address>
-+ *                           destaction=[auto|strip|none]
-+ *
-+ * If no ports are specified, the default will be port 554 only.
-+ *
-+ * stunaddr specifies the address used to detect that a client is using STUN.
-+ * If this address is seen in the destination parameter, it is assumed that
-+ * the client has already punched a UDP hole in the firewall, so we don't
-+ * mangle the client_port.  If none is specified, it is autodetected.  It
-+ * only needs to be set if you have multiple levels of NAT.  It should be
-+ * set to the external address that the STUN clients detect.  Note that in
-+ * this case, it will not be possible for clients to use UDP with servers
-+ * between the NATs.
-+ *
-+ * If no destaction is specified, auto is used.
-+ *   destaction=auto:  strip destination parameter if it is not stunaddr.
-+ *   destaction=strip: always strip destination parameter (not recommended).
-+ *   destaction=none:  do not touch destination parameter (not recommended).
-+ */
-+
-+#include <linux/module.h>
-+#include <net/tcp.h>
-+#include <net/netfilter/nf_nat_helper.h>
-+#include <net/netfilter/nf_nat_rule.h>
-+#include <linux/netfilter/nf_conntrack_rtsp.h>
-+#include <net/netfilter/nf_conntrack_expect.h>
-+
-+#include <linux/inet.h>
-+#include <linux/ctype.h>
-+#define NF_NEED_STRNCASECMP
-+#define NF_NEED_STRTOU16
-+#include <linux/netfilter_helpers.h>
-+#define NF_NEED_MIME_NEXTLINE
-+#include <linux/netfilter_mime.h>
-+
-+#define INFOP(fmt, args...) printk(KERN_INFO "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#if 0
-+#define DEBUGP(fmt, args...) printk(KERN_DEBUG "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#else
-+#define DEBUGP(fmt, args...)
-+#endif
-+
-+#define MAX_PORTS       8
-+#define DSTACT_AUTO     0
-+#define DSTACT_STRIP    1
-+#define DSTACT_NONE     2
-+
-+static char*    stunaddr = NULL;
-+static char*    destaction = NULL;
-+
-+static u_int32_t extip = 0;
-+static int       dstact = 0;
-+
-+MODULE_AUTHOR("Tom Marshall <tmarshall at real.com>");
-+MODULE_DESCRIPTION("RTSP network address translation module");
-+MODULE_LICENSE("GPL");
-+module_param(stunaddr, charp, 0644);
-+MODULE_PARM_DESC(stunaddr, "Address for detecting STUN");
-+module_param(destaction, charp, 0644);
-+MODULE_PARM_DESC(destaction, "Action for destination parameter (auto/strip/none)");
-+
-+#define SKIP_WSPACE(ptr,len,off) while(off < len && isspace(*(ptr+off))) { off++; }
-+
-+/*** helper functions ***/
-+
-+static void
-+get_skb_tcpdata(struct sk_buff* skb, char** pptcpdata, uint* ptcpdatalen)
-+{
-+    struct iphdr*   iph  = ip_hdr(skb);
-+    struct tcphdr*  tcph = (void *)iph + ip_hdrlen(skb);
-+
-+    *pptcpdata = (char*)tcph +  tcph->doff*4;
-+    *ptcpdatalen = ((char*)skb_transport_header(skb) + skb->len) - *pptcpdata;
-+}
-+
-+/*** nat functions ***/
-+
-+/*
-+ * Mangle the "Transport:" header:
-+ *   - Replace all occurences of "client_port=<spec>"
-+ *   - Handle destination parameter
-+ *
-+ * In:
-+ *   ct, ctinfo = conntrack context
-+ *   skb        = packet
-+ *   tranoff    = Transport header offset from TCP data
-+ *   tranlen    = Transport header length (incl. CRLF)
-+ *   rport_lo   = replacement low  port (host endian)
-+ *   rport_hi   = replacement high port (host endian)
-+ *
-+ * Returns packet size difference.
-+ *
-+ * Assumes that a complete transport header is present, ending with CR or LF
-+ */
-+static int
-+rtsp_mangle_tran(enum ip_conntrack_info ctinfo,
-+                 struct nf_conntrack_expect* exp,
-+								 struct ip_ct_rtsp_expect* prtspexp,
-+                 struct sk_buff* skb, uint tranoff, uint tranlen)
-+{
-+    char*       ptcp;
-+    uint        tcplen;
-+    char*       ptran;
-+    char        rbuf1[16];      /* Replacement buffer (one port) */
-+    uint        rbuf1len;       /* Replacement len (one port) */
-+    char        rbufa[16];      /* Replacement buffer (all ports) */
-+    uint        rbufalen;       /* Replacement len (all ports) */
-+    u_int32_t   newip;
-+    u_int16_t   loport, hiport;
-+    uint        off = 0;
-+    uint        diff;           /* Number of bytes we removed */
-+
-+    struct nf_conn *ct = exp->master;
-+    struct nf_conntrack_tuple *t;
-+
-+    char    szextaddr[15+1];
-+    uint    extaddrlen;
-+    int     is_stun;
-+
-+    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+    ptran = ptcp+tranoff;
-+
-+    if (tranoff+tranlen > tcplen || tcplen-tranoff < tranlen ||
-+        tranlen < 10 || !iseol(ptran[tranlen-1]) ||
-+        nf_strncasecmp(ptran, "Transport:", 10) != 0)
-+    {
-+        INFOP("sanity check failed\n");
-+        return 0;
-+    }
-+    off += 10;
-+    SKIP_WSPACE(ptcp+tranoff, tranlen, off);
-+
-+    newip = ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip;
-+    t = &exp->tuple;
-+    t->dst.u3.ip = newip;
-+
-+    extaddrlen = extip ? sprintf(szextaddr, "%u.%u.%u.%u", NIPQUAD(extip))
-+                       : sprintf(szextaddr, "%u.%u.%u.%u", NIPQUAD(newip));
-+    DEBUGP("stunaddr=%s (%s)\n", szextaddr, (extip?"forced":"auto"));
-+
-+    rbuf1len = rbufalen = 0;
-+    switch (prtspexp->pbtype)
-+    {
-+    case pb_single:
-+        for (loport = prtspexp->loport; loport != 0; loport++) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(loport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                DEBUGP("using port %hu\n", loport);
-+                break;
-+            }
-+        }
-+        if (loport != 0)
-+        {
-+            rbuf1len = sprintf(rbuf1, "%hu", loport);
-+            rbufalen = sprintf(rbufa, "%hu", loport);
-+        }
-+        break;
-+    case pb_range:
-+        for (loport = prtspexp->loport; loport != 0; loport += 2) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(loport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                hiport = loport + ~exp->mask.src.u.udp.port;
-+                DEBUGP("using ports %hu-%hu\n", loport, hiport);
-+                break;
-+            }
-+        }
-+        if (loport != 0)
-+        {
-+            rbuf1len = sprintf(rbuf1, "%hu", loport);
-+            rbufalen = sprintf(rbufa, "%hu-%hu", loport, loport+1);
-+        }
-+        break;
-+    case pb_discon:
-+        for (loport = prtspexp->loport; loport != 0; loport++) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(loport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                DEBUGP("using port %hu (1 of 2)\n", loport);
-+                break;
-+            }
-+        }
-+        for (hiport = prtspexp->hiport; hiport != 0; hiport++) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(hiport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                DEBUGP("using port %hu (2 of 2)\n", hiport);
-+                break;
-+            }
-+        }
-+        if (loport != 0 && hiport != 0)
-+        {
-+            rbuf1len = sprintf(rbuf1, "%hu", loport);
-+            if (hiport == loport+1)
-+            {
-+                rbufalen = sprintf(rbufa, "%hu-%hu", loport, hiport);
-+            }
-+            else
-+            {
-+                rbufalen = sprintf(rbufa, "%hu/%hu", loport, hiport);
-+            }
-+        }
-+        break;
-+    }
-+
-+    if (rbuf1len == 0)
-+    {
-+        return 0;   /* cannot get replacement port(s) */
-+    }
-+
-+    /* Transport: tran;field;field=val,tran;field;field=val,... */
-+    while (off < tranlen)
-+    {
-+        uint        saveoff;
-+        const char* pparamend;
-+        uint        nextparamoff;
-+
-+        pparamend = memchr(ptran+off, ',', tranlen-off);
-+        pparamend = (pparamend == NULL) ? ptran+tranlen : pparamend+1;
-+        nextparamoff = pparamend-ptcp;
-+
-+        /*
-+         * We pass over each param twice.  On the first pass, we look for a
-+         * destination= field.  It is handled by the security policy.  If it
-+         * is present, allowed, and equal to our external address, we assume
-+         * that STUN is being used and we leave the client_port= field alone.
-+         */
-+        is_stun = 0;
-+        saveoff = off;
-+        while (off < nextparamoff)
-+        {
-+            const char* pfieldend;
-+            uint        nextfieldoff;
-+
-+            pfieldend = memchr(ptran+off, ';', nextparamoff-off);
-+            nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
-+
-+            if (dstact != DSTACT_NONE && strncmp(ptran+off, "destination=", 12) == 0)
-+            {
-+                if (strncmp(ptran+off+12, szextaddr, extaddrlen) == 0)
-+                {
-+                    is_stun = 1;
-+                }
-+                if (dstact == DSTACT_STRIP || (dstact == DSTACT_AUTO && !is_stun))
-+                {
-+                    diff = nextfieldoff-off;
-+                    if (!nf_nat_mangle_tcp_packet(skb, ct, ctinfo,
-+                                                         off, diff, NULL, 0))
-+                    {
-+                        /* mangle failed, all we can do is bail */
-+			nf_ct_unexpect_related(exp);
-+                        return 0;
-+                    }
-+                    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+                    ptran = ptcp+tranoff;
-+                    tranlen -= diff;
-+                    nextparamoff -= diff;
-+                    nextfieldoff -= diff;
-+                }
-+            }
-+
-+            off = nextfieldoff;
-+        }
-+        if (is_stun)
-+        {
-+            continue;
-+        }
-+        off = saveoff;
-+        while (off < nextparamoff)
-+        {
-+            const char* pfieldend;
-+            uint        nextfieldoff;
-+
-+            pfieldend = memchr(ptran+off, ';', nextparamoff-off);
-+            nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
-+
-+            if (strncmp(ptran+off, "client_port=", 12) == 0)
-+            {
-+                u_int16_t   port;
-+                uint        numlen;
-+                uint        origoff;
-+                uint        origlen;
-+                char*       rbuf    = rbuf1;
-+                uint        rbuflen = rbuf1len;
-+
-+                off += 12;
-+                origoff = (ptran-ptcp)+off;
-+                origlen = 0;
-+                numlen = nf_strtou16(ptran+off, &port);
-+                off += numlen;
-+                origlen += numlen;
-+                if (port != prtspexp->loport)
-+                {
-+                    DEBUGP("multiple ports found, port %hu ignored\n", port);
-+                }
-+                else
-+                {
-+                    if (ptran[off] == '-' || ptran[off] == '/')
-+                    {
-+                        off++;
-+                        origlen++;
-+                        numlen = nf_strtou16(ptran+off, &port);
-+                        off += numlen;
-+                        origlen += numlen;
-+                        rbuf = rbufa;
-+                        rbuflen = rbufalen;
-+                    }
-+
-+                    /*
-+                     * note we cannot just memcpy() if the sizes are the same.
-+                     * the mangle function does skb resizing, checks for a
-+                     * cloned skb, and updates the checksums.
-+                     *
-+                     * parameter 4 below is offset from start of tcp data.
-+                     */
-+                    diff = origlen-rbuflen;
-+                    if (!nf_nat_mangle_tcp_packet(skb, ct, ctinfo,
-+                                              origoff, origlen, rbuf, rbuflen))
-+                    {
-+                        /* mangle failed, all we can do is bail */
-+			nf_ct_unexpect_related(exp);
-+                        return 0;
-+                    }
-+                    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+                    ptran = ptcp+tranoff;
-+                    tranlen -= diff;
-+                    nextparamoff -= diff;
-+                    nextfieldoff -= diff;
-+                }
-+            }
-+
-+            off = nextfieldoff;
-+        }
-+
-+        off = nextparamoff;
-+    }
-+
-+    return 1;
-+}
-+
-+static uint
-+help_out(struct sk_buff *skb, enum ip_conntrack_info ctinfo,
-+	 unsigned int matchoff, unsigned int matchlen, struct ip_ct_rtsp_expect* prtspexp,
-+	 struct nf_conntrack_expect* exp)
-+{
-+    char*   ptcp;
-+    uint    tcplen;
-+    uint    hdrsoff;
-+    uint    hdrslen;
-+    uint    lineoff;
-+    uint    linelen;
-+    uint    off;
-+
-+    //struct iphdr* iph = (struct iphdr*)skb->nh.iph;
-+    //struct tcphdr* tcph = (struct tcphdr*)((void*)iph + iph->ihl*4);
-+
-+    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+    hdrsoff = matchoff;//exp->seq - ntohl(tcph->seq);
-+    hdrslen = matchlen;
-+    off = hdrsoff;
-+    DEBUGP("NAT rtsp help_out\n");
-+
-+    while (nf_mime_nextline(ptcp, hdrsoff+hdrslen, &off, &lineoff, &linelen))
-+    {
-+        if (linelen == 0)
-+        {
-+            break;
-+        }
-+        if (off > hdrsoff+hdrslen)
-+        {
-+            INFOP("!! overrun !!");
-+            break;
-+        }
-+        DEBUGP("hdr: len=%u, %.*s", linelen, (int)linelen, ptcp+lineoff);
-+
-+        if (nf_strncasecmp(ptcp+lineoff, "Transport:", 10) == 0)
-+        {
-+            uint oldtcplen = tcplen;
-+	    DEBUGP("hdr: Transport\n");
-+            if (!rtsp_mangle_tran(ctinfo, exp, prtspexp, skb, lineoff, linelen))
-+            {
-+		DEBUGP("hdr: Transport mangle failed");
-+                break;
-+            }
-+            get_skb_tcpdata(skb, &ptcp, &tcplen);
-+            hdrslen -= (oldtcplen-tcplen);
-+            off -= (oldtcplen-tcplen);
-+            lineoff -= (oldtcplen-tcplen);
-+            linelen -= (oldtcplen-tcplen);
-+            DEBUGP("rep: len=%u, %.*s", linelen, (int)linelen, ptcp+lineoff);
-+        }
-+    }
-+
-+    return NF_ACCEPT;
-+}
-+
-+static unsigned int
-+help(struct sk_buff *skb, enum ip_conntrack_info ctinfo,
-+     unsigned int matchoff, unsigned int matchlen, struct ip_ct_rtsp_expect* prtspexp,
-+     struct nf_conntrack_expect* exp)
-+{
-+    int dir = CTINFO2DIR(ctinfo);
-+    int rc = NF_ACCEPT;
-+
-+    switch (dir)
-+    {
-+    case IP_CT_DIR_ORIGINAL:
-+        rc = help_out(skb, ctinfo, matchoff, matchlen, prtspexp, exp);
-+        break;
-+    case IP_CT_DIR_REPLY:
-+	DEBUGP("unmangle ! %u\n", ctinfo);
-+    	/* XXX: unmangle */
-+	rc = NF_ACCEPT;
-+        break;
-+    }
-+    //UNLOCK_BH(&ip_rtsp_lock);
-+
-+    return rc;
-+}
-+
-+static void expected(struct nf_conn* ct, struct nf_conntrack_expect *exp)
-+{
-+    struct nf_nat_multi_range_compat mr;
-+    u_int32_t newdstip, newsrcip, newip;
-+
-+    struct nf_conn *master = ct->master;
-+
-+    newdstip = master->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
-+    newsrcip = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
-+    //FIXME (how to port that ?)
-+    //code from 2.4 : newip = (HOOK2MANIP(hooknum) == IP_NAT_MANIP_SRC) ? newsrcip : newdstip;
-+    newip = newdstip;
-+
-+    DEBUGP("newsrcip=%u.%u.%u.%u, newdstip=%u.%u.%u.%u, newip=%u.%u.%u.%u\n",
-+           NIPQUAD(newsrcip), NIPQUAD(newdstip), NIPQUAD(newip));
-+
-+    mr.rangesize = 1;
-+    // We don't want to manip the per-protocol, just the IPs.
-+    mr.range[0].flags = IP_NAT_RANGE_MAP_IPS;
-+    mr.range[0].min_ip = mr.range[0].max_ip = newip;
-+
-+    nf_nat_setup_info(ct, &mr.range[0], IP_NAT_MANIP_DST);
-+}
-+
-+
-+static void __exit fini(void)
-+{
-+	nf_nat_rtsp_hook = NULL;
-+        nf_nat_rtsp_hook_expectfn = NULL;
-+	synchronize_net();
-+}
-+
-+static int __init init(void)
-+{
-+	printk("nf_nat_rtsp v" IP_NF_RTSP_VERSION " loading\n");
-+
-+	BUG_ON(nf_nat_rtsp_hook);
-+	nf_nat_rtsp_hook = help;
-+        nf_nat_rtsp_hook_expectfn = &expected;
-+
-+	if (stunaddr != NULL)
-+		extip = in_aton(stunaddr);
-+
-+	if (destaction != NULL) {
-+	        if (strcmp(destaction, "auto") == 0)
-+			dstact = DSTACT_AUTO;
-+
-+		if (strcmp(destaction, "strip") == 0)
-+			dstact = DSTACT_STRIP;
-+
-+		if (strcmp(destaction, "none") == 0)
-+			dstact = DSTACT_NONE;
-+	}
-+
-+	return 0;
-+}
-+
-+module_init(init);
-+module_exit(fini);
diff --git a/target/linux/generic-2.6/patches-2.6.25/200-sched_esfq.patch b/target/linux/generic-2.6/patches-2.6.25/200-sched_esfq.patch
deleted file mode 100644
index 3f66e2c67..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/200-sched_esfq.patch
+++ /dev/null
@@ -1,797 +0,0 @@
---- a/include/linux/pkt_sched.h
-+++ b/include/linux/pkt_sched.h
-@@ -162,8 +162,37 @@ struct tc_sfq_xstats
-  *
-  *	The only reason for this is efficiency, it is possible
-  *	to change these parameters in compile time.
-+ *	
-+ *	If you need to play with these values, use esfq instead.
-  */
- 
-+/* ESFQ section */
-+
-+enum
-+{
-+        /* traditional */
-+	TCA_SFQ_HASH_CLASSIC,
-+	TCA_SFQ_HASH_DST,
-+	TCA_SFQ_HASH_SRC,
-+	TCA_SFQ_HASH_FWMARK,
-+	/* conntrack */
-+	TCA_SFQ_HASH_CTORIGDST,
-+	TCA_SFQ_HASH_CTORIGSRC,
-+	TCA_SFQ_HASH_CTREPLDST,
-+	TCA_SFQ_HASH_CTREPLSRC,
-+	TCA_SFQ_HASH_CTNATCHG,
-+};
-+
-+struct tc_esfq_qopt
-+{
-+	unsigned	quantum;	/* Bytes per round allocated to flow */
-+	int		perturb_period;	/* Period of hash perturbation */
-+	__u32		limit;		/* Maximal packets in queue */
-+	unsigned	divisor;	/* Hash divisor  */
-+	unsigned	flows;		/* Maximal number of flows  */
-+	unsigned	hash_kind;	/* Hash function to use for flow identification */
-+};
-+
- /* RED section */
- 
- enum
---- a/net/sched/Kconfig
-+++ b/net/sched/Kconfig
-@@ -139,6 +139,37 @@ config NET_SCH_SFQ
- 	  To compile this code as a module, choose M here: the
- 	  module will be called sch_sfq.
- 
-+config NET_SCH_ESFQ
-+	tristate "Enhanced Stochastic Fairness Queueing (ESFQ)"
-+	---help---
-+	  Say Y here if you want to use the Enhanced Stochastic Fairness
-+	  Queueing (ESFQ) packet scheduling algorithm for some of your network
-+	  devices or as a leaf discipline for a classful qdisc such as HTB or
-+	  CBQ (see the top of <file:net/sched/sch_esfq.c> for details and
-+	  references to the SFQ algorithm).
-+
-+	  This is an enchanced SFQ version which allows you to control some
-+	  hardcoded values in the SFQ scheduler.
-+
-+	  ESFQ also adds control of the hash function used to identify packet
-+	  flows. The original SFQ discipline hashes by connection; ESFQ add
-+	  several other hashing methods, such as by src IP or by dst IP, which
-+	  can be more fair to users in some networking situations.
-+	  
-+	  To compile this code as a module, choose M here: the
-+	  module will be called sch_esfq.
-+
-+config NET_SCH_ESFQ_NFCT
-+	bool "Connection Tracking Hash Types"
-+	depends on NET_SCH_ESFQ && NF_CONNTRACK
-+	---help---
-+	  Say Y here to enable support for hashing based on netfilter connection
-+	  tracking information. This is useful for a router that is also using
-+	  NAT to connect privately-addressed hosts to the Internet. If you want
-+	  to provide fair distribution of upstream bandwidth, ESFQ must use
-+	  connection tracking information, since all outgoing packets will share
-+	  the same source address.
-+
- config NET_SCH_TEQL
- 	tristate "True Link Equalizer (TEQL)"
- 	---help---
---- a/net/sched/Makefile
-+++ b/net/sched/Makefile
-@@ -23,6 +23,7 @@ obj-$(CONFIG_NET_SCH_GRED)	+= sch_gred.o
- obj-$(CONFIG_NET_SCH_INGRESS)	+= sch_ingress.o 
- obj-$(CONFIG_NET_SCH_DSMARK)	+= sch_dsmark.o
- obj-$(CONFIG_NET_SCH_SFQ)	+= sch_sfq.o
-+obj-$(CONFIG_NET_SCH_ESFQ)	+= sch_esfq.o
- obj-$(CONFIG_NET_SCH_TBF)	+= sch_tbf.o
- obj-$(CONFIG_NET_SCH_TEQL)	+= sch_teql.o
- obj-$(CONFIG_NET_SCH_PRIO)	+= sch_prio.o
---- /dev/null
-+++ b/net/sched/sch_esfq.c
-@@ -0,0 +1,704 @@
-+/*
-+ * net/sched/sch_esfq.c	Extended Stochastic Fairness Queueing discipline.
-+ *
-+ *		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.
-+ *
-+ * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
-+ *
-+ * Changes:	Alexander Atanasov, <alex@ssi.bg>
-+ *		Added dynamic depth,limit,divisor,hash_kind options.
-+ *		Added dst and src hashes.
-+ *
-+ * 		Alexander Clouter, <alex@digriz.org.uk>
-+ *		Ported ESFQ to Linux 2.6.
-+ *
-+ * 		Corey Hickey, <bugfood-c@fatooh.org>
-+ *		Maintenance of the Linux 2.6 port.
-+ *		Added fwmark hash (thanks to Robert Kurjata).
-+ *		Added usage of jhash.
-+ *		Added conntrack support.
-+ *		Added ctnatchg hash (thanks to Ben Pfountz).
-+ */
-+
-+#include <linux/module.h>
-+#include <asm/uaccess.h>
-+#include <asm/system.h>
-+#include <linux/bitops.h>
-+#include <linux/types.h>
-+#include <linux/kernel.h>
-+#include <linux/jiffies.h>
-+#include <linux/string.h>
-+#include <linux/mm.h>
-+#include <linux/socket.h>
-+#include <linux/sockios.h>
-+#include <linux/in.h>
-+#include <linux/errno.h>
-+#include <linux/interrupt.h>
-+#include <linux/if_ether.h>
-+#include <linux/inet.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/notifier.h>
-+#include <linux/init.h>
-+#include <net/ip.h>
-+#include <linux/ipv6.h>
-+#include <net/route.h>
-+#include <linux/skbuff.h>
-+#include <net/sock.h>
-+#include <net/pkt_sched.h>
-+#include <linux/jhash.h>
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+#include <net/netfilter/nf_conntrack.h>
-+#endif
-+
-+/*	Stochastic Fairness Queuing algorithm.
-+	For more comments look at sch_sfq.c.
-+	The difference is that you can change limit, depth,
-+	hash table size and choose alternate hash types.
-+	
-+	classic:	same as in sch_sfq.c
-+	dst:		destination IP address
-+	src:		source IP address
-+	fwmark:		netfilter mark value
-+	ctorigdst:	original destination IP address
-+	ctorigsrc:	original source IP address
-+	ctrepldst:	reply destination IP address
-+	ctreplsrc:	reply source IP 
-+	
-+*/
-+
-+#define ESFQ_HEAD 0
-+#define ESFQ_TAIL 1
-+
-+/* This type should contain at least SFQ_DEPTH*2 values */
-+typedef unsigned int esfq_index;
-+
-+struct esfq_head
-+{
-+	esfq_index	next;
-+	esfq_index	prev;
-+};
-+
-+struct esfq_sched_data
-+{
-+/* Parameters */
-+	int		perturb_period;
-+	unsigned	quantum;	/* Allotment per round: MUST BE >= MTU */
-+	int		limit;
-+	unsigned	depth;
-+	unsigned	hash_divisor;
-+	unsigned	hash_kind;
-+/* Variables */
-+	struct timer_list perturb_timer;
-+	int		perturbation;
-+	esfq_index	tail;		/* Index of current slot in round */
-+	esfq_index	max_depth;	/* Maximal depth */
-+
-+	esfq_index	*ht;			/* Hash table */
-+	esfq_index	*next;			/* Active slots link */
-+	short		*allot;			/* Current allotment per slot */
-+	unsigned short	*hash;			/* Hash value indexed by slots */
-+	struct sk_buff_head	*qs;		/* Slot queue */
-+	struct esfq_head	*dep;		/* Linked list of slots, indexed by depth */
-+};
-+
-+/* This contains the info we will hash. */
-+struct esfq_packet_info
-+{
-+	u32	proto;		/* protocol or port */
-+	u32	src;		/* source from packet header */
-+	u32	dst;		/* destination from packet header */
-+	u32	ctorigsrc;	/* original source from conntrack */
-+	u32	ctorigdst;	/* original destination from conntrack */
-+	u32	ctreplsrc;	/* reply source from conntrack */
-+	u32	ctrepldst;	/* reply destination from conntrack */
-+	u32	mark;		/* netfilter mark (fwmark) */
-+};
-+
-+static __inline__ unsigned esfq_jhash_1word(struct esfq_sched_data *q,u32 a)
-+{
-+	return jhash_1word(a, q->perturbation) & (q->hash_divisor-1);
-+}
-+
-+static __inline__ unsigned esfq_jhash_2words(struct esfq_sched_data *q, u32 a, u32 b)
-+{
-+	return jhash_2words(a, b, q->perturbation) & (q->hash_divisor-1);
-+}
-+
-+static __inline__ unsigned esfq_jhash_3words(struct esfq_sched_data *q, u32 a, u32 b, u32 c)
-+{
-+	return jhash_3words(a, b, c, q->perturbation) & (q->hash_divisor-1);
-+}
-+
-+static unsigned esfq_hash(struct esfq_sched_data *q, struct sk_buff *skb)
-+{
-+	struct esfq_packet_info info;
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+	enum ip_conntrack_info ctinfo;
-+	struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
-+#endif
-+	
-+	switch (skb->protocol) {
-+	case __constant_htons(ETH_P_IP):
-+	{
-+		struct iphdr *iph = ip_hdr(skb);
-+		info.dst = iph->daddr;
-+		info.src = iph->saddr;
-+		if (!(iph->frag_off&htons(IP_MF|IP_OFFSET)) &&
-+		    (iph->protocol == IPPROTO_TCP ||
-+		     iph->protocol == IPPROTO_UDP ||
-+		     iph->protocol == IPPROTO_SCTP ||
-+		     iph->protocol == IPPROTO_DCCP ||
-+		     iph->protocol == IPPROTO_ESP))
-+			info.proto = *(((u32*)iph) + iph->ihl);
-+		else
-+			info.proto = iph->protocol;
-+		break;
-+	}
-+	case __constant_htons(ETH_P_IPV6):
-+	{
-+		struct ipv6hdr *iph = ipv6_hdr(skb);
-+		/* Hash ipv6 addresses into a u32. This isn't ideal,
-+		 * but the code is simple. */
-+		info.dst = jhash2(iph->daddr.s6_addr32, 4, q->perturbation);
-+		info.src = jhash2(iph->saddr.s6_addr32, 4, q->perturbation);
-+		if (iph->nexthdr == IPPROTO_TCP ||
-+		    iph->nexthdr == IPPROTO_UDP ||
-+		    iph->nexthdr == IPPROTO_SCTP ||
-+		    iph->nexthdr == IPPROTO_DCCP ||
-+		    iph->nexthdr == IPPROTO_ESP)
-+			info.proto = *(u32*)&iph[1];
-+		else
-+			info.proto = iph->nexthdr;
-+		break;
-+	}
-+	default:
-+		info.dst   = (u32)(unsigned long)skb->dst;
-+		info.src   = (u32)(unsigned long)skb->sk;
-+		info.proto = skb->protocol;
-+	}
-+
-+	info.mark = skb->mark;
-+
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+	/* defaults if there is no conntrack info */
-+	info.ctorigsrc = info.src;
-+	info.ctorigdst = info.dst;
-+	info.ctreplsrc = info.dst;
-+	info.ctrepldst = info.src;
-+	/* collect conntrack info */
-+	if (ct && ct != &nf_conntrack_untracked) {
-+		if (skb->protocol == __constant_htons(ETH_P_IP)) {
-+			info.ctorigsrc = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
-+			info.ctorigdst = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip;
-+			info.ctreplsrc = ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip;
-+			info.ctrepldst = ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip;
-+		}
-+		else if (skb->protocol == __constant_htons(ETH_P_IPV6)) {
-+			/* Again, hash ipv6 addresses into a single u32. */
-+			info.ctorigsrc = jhash2(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip6, 4, q->perturbation);
-+			info.ctorigdst = jhash2(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip6, 4, q->perturbation);
-+			info.ctreplsrc = jhash2(ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip6, 4, q->perturbation);
-+			info.ctrepldst = jhash2(ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip6, 4, q->perturbation);
-+		}
-+
-+	}
-+#endif
-+
-+	switch(q->hash_kind) {
-+	case TCA_SFQ_HASH_CLASSIC:
-+		return esfq_jhash_3words(q, info.dst, info.src, info.proto);
-+	case TCA_SFQ_HASH_DST:
-+		return esfq_jhash_1word(q, info.dst);
-+	case TCA_SFQ_HASH_SRC:
-+		return esfq_jhash_1word(q, info.src);
-+	case TCA_SFQ_HASH_FWMARK:
-+		return esfq_jhash_1word(q, info.mark);
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+	case TCA_SFQ_HASH_CTORIGDST:
-+		return esfq_jhash_1word(q, info.ctorigdst);
-+	case TCA_SFQ_HASH_CTORIGSRC:
-+		return esfq_jhash_1word(q, info.ctorigsrc);
-+	case TCA_SFQ_HASH_CTREPLDST:
-+		return esfq_jhash_1word(q, info.ctrepldst);
-+	case TCA_SFQ_HASH_CTREPLSRC:
-+		return esfq_jhash_1word(q, info.ctreplsrc);
-+	case TCA_SFQ_HASH_CTNATCHG:
-+	{
-+		if (info.ctorigdst == info.ctreplsrc)
-+			return esfq_jhash_1word(q, info.ctorigsrc);
-+		return esfq_jhash_1word(q, info.ctreplsrc);
-+	}
-+#endif
-+	default:
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "ESFQ: Unknown hash method. Falling back to classic.\n");
-+	}
-+	return esfq_jhash_3words(q, info.dst, info.src, info.proto);
-+}
-+
-+static inline void esfq_link(struct esfq_sched_data *q, esfq_index x)
-+{
-+	esfq_index p, n;
-+	int d = q->qs[x].qlen + q->depth;
-+
-+	p = d;
-+	n = q->dep[d].next;
-+	q->dep[x].next = n;
-+	q->dep[x].prev = p;
-+	q->dep[p].next = q->dep[n].prev = x;
-+}
-+
-+static inline void esfq_dec(struct esfq_sched_data *q, esfq_index x)
-+{
-+	esfq_index p, n;
-+
-+	n = q->dep[x].next;
-+	p = q->dep[x].prev;
-+	q->dep[p].next = n;
-+	q->dep[n].prev = p;
-+
-+	if (n == p && q->max_depth == q->qs[x].qlen + 1)
-+		q->max_depth--;
-+
-+	esfq_link(q, x);
-+}
-+
-+static inline void esfq_inc(struct esfq_sched_data *q, esfq_index x)
-+{
-+	esfq_index p, n;
-+	int d;
-+
-+	n = q->dep[x].next;
-+	p = q->dep[x].prev;
-+	q->dep[p].next = n;
-+	q->dep[n].prev = p;
-+	d = q->qs[x].qlen;
-+	if (q->max_depth < d)
-+		q->max_depth = d;
-+
-+	esfq_link(q, x);
-+}
-+
-+static unsigned int esfq_drop(struct Qdisc *sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_index d = q->max_depth;
-+	struct sk_buff *skb;
-+	unsigned int len;
-+
-+	/* Queue is full! Find the longest slot and
-+	   drop a packet from it */
-+
-+	if (d > 1) {
-+		esfq_index x = q->dep[d+q->depth].next;
-+		skb = q->qs[x].prev;
-+		len = skb->len;
-+		__skb_unlink(skb, &q->qs[x]);
-+		kfree_skb(skb);
-+		esfq_dec(q, x);
-+		sch->q.qlen--;
-+		sch->qstats.drops++;
-+		sch->qstats.backlog -= len;
-+		return len;
-+	}
-+
-+	if (d == 1) {
-+		/* It is difficult to believe, but ALL THE SLOTS HAVE LENGTH 1. */
-+		d = q->next[q->tail];
-+		q->next[q->tail] = q->next[d];
-+		q->allot[q->next[d]] += q->quantum;
-+		skb = q->qs[d].prev;
-+		len = skb->len;
-+		__skb_unlink(skb, &q->qs[d]);
-+		kfree_skb(skb);
-+		esfq_dec(q, d);
-+		sch->q.qlen--;
-+		q->ht[q->hash[d]] = q->depth;
-+		sch->qstats.drops++;
-+		sch->qstats.backlog -= len;
-+		return len;
-+	}
-+
-+	return 0;
-+}
-+
-+static void esfq_q_enqueue(struct sk_buff *skb, struct esfq_sched_data *q, unsigned int end)
-+{
-+	unsigned hash = esfq_hash(q, skb);
-+	unsigned depth = q->depth;
-+	esfq_index x;
-+
-+	x = q->ht[hash];
-+	if (x == depth) {
-+		q->ht[hash] = x = q->dep[depth].next;
-+		q->hash[x] = hash;
-+	}
-+
-+	if (end == ESFQ_TAIL)
-+		__skb_queue_tail(&q->qs[x], skb);
-+	else
-+		__skb_queue_head(&q->qs[x], skb);
-+
-+	esfq_inc(q, x);
-+	if (q->qs[x].qlen == 1) {		/* The flow is new */
-+		if (q->tail == depth) {	/* It is the first flow */
-+			q->tail = x;
-+			q->next[x] = x;
-+			q->allot[x] = q->quantum;
-+		} else {
-+			q->next[x] = q->next[q->tail];
-+			q->next[q->tail] = x;
-+			q->tail = x;
-+		}
-+	}
-+}
-+
-+static int esfq_enqueue(struct sk_buff *skb, struct Qdisc* sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_q_enqueue(skb, q, ESFQ_TAIL);
-+	sch->qstats.backlog += skb->len;
-+	if (++sch->q.qlen < q->limit-1) {
-+		sch->bstats.bytes += skb->len;
-+		sch->bstats.packets++;
-+		return 0;
-+	}
-+
-+	sch->qstats.drops++;
-+	esfq_drop(sch);
-+	return NET_XMIT_CN;
-+}
-+
-+
-+static int esfq_requeue(struct sk_buff *skb, struct Qdisc* sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_q_enqueue(skb, q, ESFQ_HEAD);
-+	sch->qstats.backlog += skb->len;
-+	if (++sch->q.qlen < q->limit - 1) {
-+		sch->qstats.requeues++;
-+		return 0;
-+	}
-+
-+	sch->qstats.drops++;
-+	esfq_drop(sch);
-+	return NET_XMIT_CN;
-+}
-+
-+static struct sk_buff *esfq_q_dequeue(struct esfq_sched_data *q)
-+{
-+	struct sk_buff *skb;
-+	unsigned depth = q->depth;
-+	esfq_index a, old_a;
-+
-+	/* No active slots */
-+	if (q->tail == depth)
-+		return NULL;
-+	
-+	a = old_a = q->next[q->tail];
-+	
-+	/* Grab packet */
-+	skb = __skb_dequeue(&q->qs[a]);
-+	esfq_dec(q, a);
-+	
-+	/* Is the slot empty? */
-+	if (q->qs[a].qlen == 0) {
-+		q->ht[q->hash[a]] = depth;
-+		a = q->next[a];
-+		if (a == old_a) {
-+			q->tail = depth;
-+			return skb;
-+		}
-+		q->next[q->tail] = a;
-+		q->allot[a] += q->quantum;
-+	} else if ((q->allot[a] -= skb->len) <= 0) {
-+		q->tail = a;
-+		a = q->next[a];
-+		q->allot[a] += q->quantum;
-+	}
-+	
-+	return skb;
-+}
-+
-+static struct sk_buff *esfq_dequeue(struct Qdisc* sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	struct sk_buff *skb;
-+
-+	skb = esfq_q_dequeue(q);
-+	if (skb == NULL)
-+		return NULL;
-+	sch->q.qlen--;
-+	sch->qstats.backlog -= skb->len;
-+	return skb;
-+}
-+
-+static void esfq_q_destroy(struct esfq_sched_data *q)
-+{
-+	del_timer(&q->perturb_timer);
-+	if(q->ht)
-+		kfree(q->ht);
-+	if(q->dep)
-+		kfree(q->dep);
-+	if(q->next)
-+		kfree(q->next);
-+	if(q->allot)
-+		kfree(q->allot);
-+	if(q->hash)
-+		kfree(q->hash);
-+	if(q->qs)
-+		kfree(q->qs);
-+}
-+
-+static void esfq_destroy(struct Qdisc *sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_q_destroy(q);
-+}
-+
-+
-+static void esfq_reset(struct Qdisc* sch)
-+{
-+	struct sk_buff *skb;
-+
-+	while ((skb = esfq_dequeue(sch)) != NULL)
-+		kfree_skb(skb);
-+}
-+
-+static void esfq_perturbation(unsigned long arg)
-+{
-+	struct Qdisc *sch = (struct Qdisc*)arg;
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+
-+	q->perturbation = net_random()&0x1F;
-+
-+	if (q->perturb_period) {
-+		q->perturb_timer.expires = jiffies + q->perturb_period;
-+		add_timer(&q->perturb_timer);
-+	}
-+}
-+
-+static unsigned int esfq_check_hash(unsigned int kind)
-+{
-+	switch (kind) {
-+	case TCA_SFQ_HASH_CTORIGDST:
-+	case TCA_SFQ_HASH_CTORIGSRC:
-+	case TCA_SFQ_HASH_CTREPLDST:
-+	case TCA_SFQ_HASH_CTREPLSRC:
-+	case TCA_SFQ_HASH_CTNATCHG:
-+#ifndef CONFIG_NET_SCH_ESFQ_NFCT
-+	{
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "ESFQ: Conntrack hash types disabled in kernel config. Falling back to classic.\n");
-+		return TCA_SFQ_HASH_CLASSIC;
-+	}
-+#endif
-+	case TCA_SFQ_HASH_CLASSIC:
-+	case TCA_SFQ_HASH_DST:
-+	case TCA_SFQ_HASH_SRC:
-+	case TCA_SFQ_HASH_FWMARK:
-+		return kind;
-+	default:
-+	{
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "ESFQ: Unknown hash type. Falling back to classic.\n");
-+		return TCA_SFQ_HASH_CLASSIC;
-+	}
-+	}
-+}
-+	
-+static int esfq_q_init(struct esfq_sched_data *q, struct rtattr *opt)
-+{
-+	struct tc_esfq_qopt *ctl = RTA_DATA(opt);
-+	esfq_index p = ~0U/2;
-+	int i;
-+	
-+	if (opt && opt->rta_len < RTA_LENGTH(sizeof(*ctl)))
-+		return -EINVAL;
-+
-+	q->perturbation = 0;
-+	q->hash_kind = TCA_SFQ_HASH_CLASSIC;
-+	q->max_depth = 0;
-+	if (opt == NULL) {
-+		q->perturb_period = 0;
-+		q->hash_divisor = 1024;
-+		q->tail = q->limit = q->depth = 128;
-+		
-+	} else {
-+		struct tc_esfq_qopt *ctl = RTA_DATA(opt);
-+		if (ctl->quantum)
-+			q->quantum = ctl->quantum;
-+		q->perturb_period = ctl->perturb_period*HZ;
-+		q->hash_divisor = ctl->divisor ? : 1024;
-+		q->tail = q->limit = q->depth = ctl->flows ? : 128;
-+		
-+		if ( q->depth > p - 1 )
-+			return -EINVAL;
-+		
-+		if (ctl->limit)
-+			q->limit = min_t(u32, ctl->limit, q->depth);
-+		
-+		if (ctl->hash_kind) {
-+			q->hash_kind = esfq_check_hash(ctl->hash_kind);
-+		}
-+	}
-+	
-+	q->ht = kmalloc(q->hash_divisor*sizeof(esfq_index), GFP_KERNEL);
-+	if (!q->ht)
-+		goto err_case;
-+	q->dep = kmalloc((1+q->depth*2)*sizeof(struct esfq_head), GFP_KERNEL);
-+	if (!q->dep)
-+		goto err_case;
-+	q->next = kmalloc(q->depth*sizeof(esfq_index), GFP_KERNEL);
-+	if (!q->next)
-+		goto err_case;
-+	q->allot = kmalloc(q->depth*sizeof(short), GFP_KERNEL);
-+	if (!q->allot)
-+		goto err_case;
-+	q->hash = kmalloc(q->depth*sizeof(unsigned short), GFP_KERNEL);
-+	if (!q->hash)
-+		goto err_case;
-+	q->qs = kmalloc(q->depth*sizeof(struct sk_buff_head), GFP_KERNEL);
-+	if (!q->qs)
-+		goto err_case;
-+	
-+	for (i=0; i< q->hash_divisor; i++)
-+		q->ht[i] = q->depth;
-+	for (i=0; i<q->depth; i++) {
-+		skb_queue_head_init(&q->qs[i]);
-+		q->dep[i+q->depth].next = i+q->depth;
-+		q->dep[i+q->depth].prev = i+q->depth;
-+	}
-+	
-+	for (i=0; i<q->depth; i++)
-+		esfq_link(q, i);
-+	return 0;
-+err_case:
-+	esfq_q_destroy(q);
-+	return -ENOBUFS;
-+}
-+
-+static int esfq_init(struct Qdisc *sch, struct rtattr *opt)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	int err;
-+	
-+	q->quantum = psched_mtu(sch->dev); /* default */
-+	if ((err = esfq_q_init(q, opt)))
-+		return err;
-+
-+	init_timer(&q->perturb_timer);
-+	q->perturb_timer.data = (unsigned long)sch;
-+	q->perturb_timer.function = esfq_perturbation;
-+	if (q->perturb_period) {
-+		q->perturb_timer.expires = jiffies + q->perturb_period;
-+		add_timer(&q->perturb_timer);
-+	}
-+	
-+	return 0;
-+}
-+
-+static int esfq_change(struct Qdisc *sch, struct rtattr *opt)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	struct esfq_sched_data new;
-+	struct sk_buff *skb;
-+	int err;
-+	
-+	/* set up new queue */
-+	memset(&new, 0, sizeof(struct esfq_sched_data));
-+	new.quantum = psched_mtu(sch->dev); /* default */
-+	if ((err = esfq_q_init(&new, opt)))
-+		return err;
-+
-+	/* copy all packets from the old queue to the new queue */
-+	sch_tree_lock(sch);
-+	while ((skb = esfq_q_dequeue(q)) != NULL)
-+		esfq_q_enqueue(skb, &new, ESFQ_TAIL);
-+	
-+	/* clean up the old queue */
-+	esfq_q_destroy(q);
-+
-+	/* copy elements of the new queue into the old queue */
-+	q->perturb_period = new.perturb_period;
-+	q->quantum        = new.quantum;
-+	q->limit          = new.limit;
-+	q->depth          = new.depth;
-+	q->hash_divisor   = new.hash_divisor;
-+	q->hash_kind      = new.hash_kind;
-+	q->tail           = new.tail;
-+	q->max_depth      = new.max_depth;
-+	q->ht    = new.ht;
-+	q->dep   = new.dep;
-+	q->next  = new.next;
-+	q->allot = new.allot;
-+	q->hash  = new.hash;
-+	q->qs    = new.qs;
-+
-+	/* finish up */
-+	if (q->perturb_period) {
-+		q->perturb_timer.expires = jiffies + q->perturb_period;
-+		add_timer(&q->perturb_timer);
-+	} else {
-+		q->perturbation = 0;
-+	}
-+	sch_tree_unlock(sch);
-+	return 0;
-+}
-+
-+static int esfq_dump(struct Qdisc *sch, struct sk_buff *skb)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	unsigned char *b = skb->tail;
-+	struct tc_esfq_qopt opt;
-+
-+	opt.quantum = q->quantum;
-+	opt.perturb_period = q->perturb_period/HZ;
-+
-+	opt.limit = q->limit;
-+	opt.divisor = q->hash_divisor;
-+	opt.flows = q->depth;
-+	opt.hash_kind = q->hash_kind;
-+
-+	RTA_PUT(skb, TCA_OPTIONS, sizeof(opt), &opt);
-+
-+	return skb->len;
-+
-+rtattr_failure:
-+	skb_trim(skb, b - skb->data);
-+	return -1;
-+}
-+
-+static struct Qdisc_ops esfq_qdisc_ops =
-+{
-+	.next		=	NULL,
-+	.cl_ops		=	NULL,
-+	.id		=	"esfq",
-+	.priv_size	=	sizeof(struct esfq_sched_data),
-+	.enqueue	=	esfq_enqueue,
-+	.dequeue	=	esfq_dequeue,
-+	.requeue	=	esfq_requeue,
-+	.drop		=	esfq_drop,
-+	.init		=	esfq_init,
-+	.reset		=	esfq_reset,
-+	.destroy	=	esfq_destroy,
-+	.change		=	esfq_change,
-+	.dump		=	esfq_dump,
-+	.owner		=	THIS_MODULE,
-+};
-+
-+static int __init esfq_module_init(void)
-+{
-+	return register_qdisc(&esfq_qdisc_ops);
-+}
-+static void __exit esfq_module_exit(void) 
-+{
-+	unregister_qdisc(&esfq_qdisc_ops);
-+}
-+module_init(esfq_module_init)
-+module_exit(esfq_module_exit)
-+MODULE_LICENSE("GPL");
diff --git a/target/linux/generic-2.6/patches-2.6.25/204-jffs2_eofdetect.patch b/target/linux/generic-2.6/patches-2.6.25/204-jffs2_eofdetect.patch
deleted file mode 100644
index eccdbe2f9..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/204-jffs2_eofdetect.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/fs/jffs2/build.c
-+++ b/fs/jffs2/build.c
-@@ -105,6 +105,17 @@ static int jffs2_build_filesystem(struct
- 	dbg_fsbuild("scanned flash completely\n");
- 	jffs2_dbg_dump_block_lists_nolock(c);
- 
-+	if (c->flags & (1 << 7)) {
-+		printk("%s(): unlocking the mtd device... ", __func__);
-+		if (c->mtd->unlock)
-+			c->mtd->unlock(c->mtd, 0, c->mtd->size);
-+		printk("done.\n");
-+		
-+		printk("%s(): erasing all blocks after the end marker... ", __func__);
-+		jffs2_erase_pending_blocks(c, -1);
-+		printk("done.\n");
-+	}
-+
- 	dbg_fsbuild("pass 1 starting\n");
- 	c->flags |= JFFS2_SB_FLAG_BUILDING;
- 	/* Now scan the directory tree, increasing nlink according to every dirent found. */
---- a/fs/jffs2/scan.c
-+++ b/fs/jffs2/scan.c
-@@ -142,9 +142,12 @@ int jffs2_scan_medium(struct jffs2_sb_in
- 
- 		/* reset summary info for next eraseblock scan */
- 		jffs2_sum_reset_collected(s);
--
--		ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
--						buf_size, s);
-+		
-+		if (c->flags & (1 << 7))
-+			ret = BLK_STATE_ALLFF;
-+		else
-+			ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
-+							buf_size, s);
- 
- 		if (ret < 0)
- 			goto out;
-@@ -545,6 +548,17 @@ static int jffs2_scan_eraseblock (struct
- 			return err;
- 	}
- 
-+	if ((buf[0] == 0xde) &&
-+		(buf[1] == 0xad) &&
-+		(buf[2] == 0xc0) &&
-+		(buf[3] == 0xde)) {
-+		/* end of filesystem. erase everything after this point */
-+		printk("%s(): End of filesystem marker found at 0x%x\n", __func__, jeb->offset);
-+		c->flags |= (1 << 7);
-+
-+		return BLK_STATE_ALLFF;
-+	}
-+	
- 	/* We temporarily use 'ofs' as a pointer into the buffer/jeb */
- 	ofs = 0;
- 
diff --git a/target/linux/generic-2.6/patches-2.6.25/207-powerpc_asm_segment_h.patch b/target/linux/generic-2.6/patches-2.6.25/207-powerpc_asm_segment_h.patch
deleted file mode 100644
index 1272e82c7..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/207-powerpc_asm_segment_h.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- /dev/null
-+++ b/include/asm-powerpc/segment.h
-@@ -0,0 +1,6 @@
-+#ifndef _ASM_SEGMENT_H
-+#define _ASM_SEGMENT_H
-+
-+/* Only here because we have some old header files that expect it.. */
-+
-+#endif /* _ASM_SEGMENT_H */
diff --git a/target/linux/generic-2.6/patches-2.6.25/208-rtl8110sb_fix.patch b/target/linux/generic-2.6/patches-2.6.25/208-rtl8110sb_fix.patch
deleted file mode 100644
index 2196a494b..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/208-rtl8110sb_fix.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/drivers/net/r8169.c
-+++ b/drivers/net/r8169.c
-@@ -1539,7 +1539,7 @@ static const struct rtl_cfg_info {
- 		.hw_start	= rtl_hw_start_8169,
- 		.region		= 1,
- 		.align		= 0,
--		.intr_event	= SYSErr | LinkChg | RxOverflow |
-+		.intr_event	= LinkChg | RxOverflow |
- 				  RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
- 		.napi_event	= RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
- 		.msi		= 0
-@@ -1548,7 +1548,7 @@ static const struct rtl_cfg_info {
- 		.hw_start	= rtl_hw_start_8168,
- 		.region		= 2,
- 		.align		= 8,
--		.intr_event	= SYSErr | LinkChg | RxOverflow |
-+		.intr_event	= LinkChg | RxOverflow |
- 				  TxErr | TxOK | RxOK | RxErr,
- 		.napi_event	= TxErr | TxOK | RxOK | RxOverflow,
- 		.msi		= RTL_FEATURE_MSI
-@@ -1557,7 +1557,7 @@ static const struct rtl_cfg_info {
- 		.hw_start	= rtl_hw_start_8101,
- 		.region		= 2,
- 		.align		= 8,
--		.intr_event	= SYSErr | LinkChg | RxOverflow | PCSTimeout |
-+		.intr_event	= LinkChg | RxOverflow | PCSTimeout |
- 				  RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
- 		.napi_event	= RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
- 		.msi		= RTL_FEATURE_MSI
-@@ -2905,10 +2905,12 @@ static irqreturn_t rtl8169_interrupt(int
- 			break;
- 		}
- 
-+#if 0
- 		if (unlikely(status & SYSErr)) {
- 			rtl8169_pcierr_interrupt(dev);
- 			break;
- 		}
-+#endif
- 
- 		if (status & LinkChg)
- 			rtl8169_check_link_status(dev, tp, ioaddr);
diff --git a/target/linux/generic-2.6/patches-2.6.25/209-mini_fo.patch b/target/linux/generic-2.6/patches-2.6.25/209-mini_fo.patch
deleted file mode 100644
index 9d76d0159..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/209-mini_fo.patch
+++ /dev/null
@@ -1,7776 +0,0 @@
---- a/fs/Kconfig
-+++ b/fs/Kconfig
-@@ -1449,6 +1449,9 @@ config VXFS_FS
- 	  To compile this as a module, choose M here: the module will be
- 	  called freevxfs.  If unsure, say N.
- 
-+config MINI_FO
-+	tristate "Mini fanout overlay filesystem"
-+
- config MINIX_FS
- 	tristate "Minix file system support"
- 	depends on BLOCK
---- a/fs/Makefile
-+++ b/fs/Makefile
-@@ -77,6 +77,7 @@ obj-$(CONFIG_SQUASHFS)		+= squashfs/
- obj-y				+= ramfs/
- obj-$(CONFIG_HUGETLBFS)		+= hugetlbfs/
- obj-$(CONFIG_CODA_FS)		+= coda/
-+obj-$(CONFIG_MINI_FO)		+= mini_fo/
- obj-$(CONFIG_MINIX_FS)		+= minix/
- obj-$(CONFIG_FAT_FS)		+= fat/
- obj-$(CONFIG_MSDOS_FS)		+= msdos/
---- /dev/null
-+++ b/fs/mini_fo/aux.c
-@@ -0,0 +1,577 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+/* check if file exists in storage  */
-+int exists_in_storage(dentry_t *dentry)
-+{
-+	check_mini_fo_dentry(dentry);
-+	if(dtost(dentry) == MODIFIED || dtost(dentry) == CREATED || dtost(dentry) == DEL_REWRITTEN)
-+		return 1;
-+	return 0;
-+}
-+
-+/* check if dentry is in an existing state */
-+int is_mini_fo_existant(dentry_t *dentry)
-+{
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) == DELETED || dtost(dentry) == NON_EXISTANT)
-+		return 0;
-+	else
-+		return 1;
-+}
-+
-+/*
-+ * This function will create a negative storage dentry for
-+ * dentry, what is required for many create like options.
-+ * It will create the storage structure if necessary.
-+ */
-+int get_neg_sto_dentry(dentry_t *dentry)
-+{
-+	int err = 0;
-+	unsigned int len;
-+	const unsigned char *name;
-+
-+	if(!dentry ||
-+	   !dtopd(dentry) ||
-+	   !(dtost(dentry) == UNMODIFIED ||
-+	     dtost(dentry) == NON_EXISTANT ||
-+	     dtost(dentry) == DELETED)) {
-+		printk(KERN_CRIT "mini_fo: get_neg_sto_dentry: invalid dentry passed.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	/* Have we got a neg. dentry already? */
-+	if(dtohd2(dentry)) {
-+		err = 0;
-+		goto out;
-+	}
-+	if(dtost(dentry->d_parent) == UNMODIFIED) {
-+		/* build sto struct */
-+		err = build_sto_structure(dentry->d_parent->d_parent, dentry->d_parent);
-+		if(err ||
-+		   dtost(dentry->d_parent) != MODIFIED) {
-+			printk(KERN_CRIT "mini_fo: get_neg_sto_dentry: ERROR building sto structure.\n");
-+			err = -1;
-+			goto out;
-+		}
-+	}
-+
-+	len = dentry->d_name.len;
-+	name = dentry->d_name.name;
-+
-+	dtohd2(dentry) =
-+		lookup_one_len(name, dtohd2(dentry->d_parent), len);
-+
-+ out:
-+	return err;
-+}
-+
-+int check_mini_fo_dentry(dentry_t *dentry)
-+{
-+ 	ASSERT(dentry != NULL);
-+	ASSERT(dtopd(dentry) != NULL);
-+	ASSERT((dtohd(dentry) != NULL) || (dtohd2(dentry) != NULL));
-+
-+/* 	if(dtost(dentry) == MODIFIED) { */
-+/* 		ASSERT(dentry->d_inode != NULL); */
-+/* 		ASSERT(dtohd(dentry) != NULL); */
-+/* 		ASSERT(dtohd(dentry)->d_inode != NULL); */
-+/* 		ASSERT(dtohd2(dentry) != NULL); */
-+/* 		ASSERT(dtohd2(dentry)->d_inode != NULL); */
-+/* 	} */
-+/* 	else if(dtost(dentry) == UNMODIFIED) { */
-+/* 		ASSERT(dentry->d_inode != NULL); */
-+/* 		ASSERT( */
-+/* 	} */
-+	return 0;
-+}
-+
-+int check_mini_fo_file(file_t *file)
-+{
-+	ASSERT(file != NULL);
-+	ASSERT(ftopd(file) != NULL);
-+	ASSERT(file->f_dentry != NULL);
-+
-+	/* violent checking, check depending of state and type
-+	 *	if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {}
-+	 */
-+	ASSERT((ftohf(file) != NULL) || (ftohf2(file) != NULL));
-+	return 0;
-+}
-+
-+int check_mini_fo_inode(inode_t *inode)
-+{
-+	ASSERT(inode != NULL);
-+	ASSERT(itopd(inode) != NULL);
-+	ASSERT((itohi(inode) != NULL) || (itohi2(inode) != NULL));
-+	return 0;
-+}
-+
-+/*
-+ * will walk a base path as provided by get_mini_fo_bpath and return
-+ * the (hopefully ;-) ) positive dentry of the renamed base dir.
-+ *
-+ * This does some work of path_init.
-+ */
-+dentry_t *bpath_walk(super_block_t *sb, char *bpath)
-+{
-+	int err;
-+        struct vfsmount *mnt;
-+	struct nameidata nd;
-+
-+	/* be paranoid */
-+	if(!bpath || bpath[0] != '/') {
-+		printk(KERN_CRIT "mini_fo: bpath_walk: Invalid string.\n");
-+		return NULL;
-+	}
-+	if(!sb || !stopd(sb)) {
-+		printk(KERN_CRIT "mini_fo: bpath_walk: Invalid sb.\n");
-+		return NULL;
-+	}
-+
-+	/* fix this: how do I reach this lock?
-+	 * read_lock(&current->fs->lock); */
-+	mnt = mntget(stopd(sb)->hidden_mnt);
-+	/* read_unlock(&current->fs->lock); */
-+
-+	err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
-+
-+	/* validate */
-+	if (err || !nd.dentry || !nd.dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: bpath_walk: path_walk failed.\n");
-+		return NULL;
-+	}
-+	return nd.dentry;
-+}
-+
-+
-+/* returns the full path of the basefile incl. its name */
-+int get_mini_fo_bpath(dentry_t *dentry, char **bpath, int *bpath_len)
-+{
-+	char *buf_walker;
-+	int len = 0;
-+	dentry_t *sky_walker;
-+
-+	if(!dentry || !dtohd(dentry)) {
-+		printk(KERN_CRIT "mini_fo: get_mini_fo_bpath: invalid dentry passed.\n");
-+		return -1;
-+	}
-+	sky_walker = dtohd(dentry);
-+
-+	do {
-+		len += sky_walker->d_name.len + 1 ; /* 1 for '/' */
-+		sky_walker = sky_walker->d_parent;
-+	} while(sky_walker != stopd(dentry->d_inode->i_sb)->base_dir_dentry);
-+
-+	/* 1 to oil the loop */
-+	*bpath = (char*)  kmalloc(len + 1, GFP_KERNEL);
-+	if(!*bpath) {
-+		printk(KERN_CRIT "mini_fo: get_mini_fo_bpath: out of mem.\n");
-+		return -1;
-+	}
-+	buf_walker = *bpath+len; /* put it on last char */
-+	*buf_walker = '\n';
-+	sky_walker = dtohd(dentry);
-+
-+	do {
-+		buf_walker -= sky_walker->d_name.len;
-+		strncpy(buf_walker,
-+			sky_walker->d_name.name,
-+			sky_walker->d_name.len);
-+		*(--buf_walker) = '/';
-+		sky_walker = sky_walker->d_parent;
-+	} while(sky_walker != stopd(dentry->d_inode->i_sb)->base_dir_dentry);
-+
-+	/* bpath_len doesn't count newline! */
-+	*bpath_len = len;
-+ 	return 0;
-+}
-+
-+int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
-+		    dentry_t *src_dentry, struct vfsmount *src_mnt)
-+{
-+	void *buf;
-+	mm_segment_t old_fs;
-+	file_t *tgt_file;
-+	file_t *src_file;
-+	int bytes, len, tmp, err;
-+	err = 0;
-+
-+	if(!(tgt_dentry->d_inode && src_dentry->d_inode)) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR, neg. dentry passed.\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+
-+	dget(tgt_dentry);
-+	dget(src_dentry);
-+	mntget(tgt_mnt);
-+	mntget(src_mnt);
-+
-+	/* open file write only */
-+	tgt_file = dentry_open(tgt_dentry, tgt_mnt, 0x1);
-+	if(!tgt_file || IS_ERR(tgt_file)) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening target file.\n");
-+		err = PTR_ERR(tgt_file);
-+		goto out_err;
-+	}
-+
-+	/* open file read only */
-+	src_file = dentry_open(src_dentry, src_mnt, 0x0);
-+	if(!src_file || IS_ERR(src_file)) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening source file.\n");
-+		err = PTR_ERR(src_file);
-+
-+		/* close target file */
-+		fput(tgt_file);
-+		goto out_err;
-+	}
-+
-+	/* check if the filesystem(s) support read respective write */
-+	if(!src_file->f_op->read || !tgt_file->f_op->write) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR, no fs read or write support.\n");
-+		err = -EPERM;
-+		goto out_close;
-+	}
-+
-+	/* allocate a page for transfering the data */
-+	buf = (void *) __get_free_page(GFP_KERNEL);
-+	if(!buf) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR, out of kernel mem.\n");
-+		goto out_err;
-+	}
-+
-+	tgt_file->f_pos = 0;
-+	src_file->f_pos = 0;
-+
-+	old_fs = get_fs();
-+	set_fs(KERNEL_DS);
-+
-+	/* Doing this I assume that a read operation will return a full
-+	 * buffer while there is still data to read, and a less than
-+	 * full buffer when all data has been read.
-+	 */
-+	bytes = len = PAGE_SIZE;
-+	while(bytes == len) {
-+		bytes = src_file->f_op->read(src_file, buf, len,
-+					     &src_file->f_pos);
-+		tmp = tgt_file->f_op->write(tgt_file, buf, bytes,
-+					    &tgt_file->f_pos);
-+		if(tmp != bytes) {
-+			printk(KERN_CRIT "mini_fo_cp_cont: ERROR writing.\n");
-+			goto out_close_unset;
-+		}
-+	}
-+
-+	free_page((unsigned long) buf);
-+	set_fs(old_fs);
-+	fput(tgt_file);
-+	fput(src_file);
-+	goto out;
-+
-+ out_close_unset:
-+	free_page((unsigned long) buf);
-+	set_fs(old_fs);
-+
-+ out_close:
-+	fput(tgt_file);
-+	fput(src_file);
-+
-+ out_err:
-+	dput(tgt_dentry);
-+	dput(src_dentry);
-+
-+	/* mk: not sure if this need to be done */
-+	mntput(tgt_mnt);
-+	mntput(src_mnt);
-+
-+ out:
-+	return err;
-+}
-+
-+/* mk:
-+ * ndl (no-duplicate list) stuff
-+ * This is used in mini_fo_readdir, to save the storage directory contents
-+ * and later when reading base, match them against the list in order
-+ * to avoid duplicates.
-+ */
-+
-+/* add a file specified by name and len to the ndl
-+ * Return values: 0 on success, <0 on failure.
-+ */
-+int ndl_add_entry(struct readdir_data *rd, const char *name, int len)
-+{
-+	struct ndl_entry *tmp_entry;
-+
-+	tmp_entry = (struct ndl_entry *)
-+		kmalloc(sizeof(struct ndl_entry), GFP_KERNEL);
-+	if(!tmp_entry) {
-+                printk(KERN_CRIT "mini_fo: ndl_add_entry: out of mem.\n");
-+                return -ENOMEM;
-+        }
-+        tmp_entry->name = (char*) kmalloc(len, GFP_KERNEL);
-+        if(!tmp_entry->name) {
-+                printk(KERN_CRIT "mini_fo: ndl_add_entry: out of mem.\n");
-+                return -ENOMEM;
-+        }
-+	strncpy(tmp_entry->name, name, len);
-+        tmp_entry->len = len;
-+
-+        list_add(&tmp_entry->list, &rd->ndl_list);
-+        rd->ndl_size++;
-+        return 0;
-+}
-+
-+/* delete all list entries and free memory */
-+void ndl_put_list(struct readdir_data *rd)
-+{
-+	struct list_head *tmp;
-+	struct ndl_entry *tmp_entry;
-+
-+	if(rd->ndl_size <= 0)
-+		return;
-+	while(!list_empty(&rd->ndl_list)) {
-+		tmp = rd->ndl_list.next;
-+                list_del(tmp);
-+                tmp_entry = list_entry(tmp, struct ndl_entry, list);
-+		kfree(tmp_entry->name);
-+                kfree(tmp_entry);
-+        }
-+	rd->ndl_size = 0;
-+}
-+
-+/* Check if a file specified by name and len is in the ndl
-+ * Return value: 0 if not in list, 1 if file is found in ndl.
-+ */
-+int ndl_check_entry(struct readdir_data *rd, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+	struct ndl_entry *tmp_entry;
-+
-+	if(rd->ndl_size <= 0)
-+		return 0;
-+
-+	list_for_each(tmp, &rd->ndl_list) {
-+                tmp_entry = list_entry(tmp, struct ndl_entry, list);
-+                if(tmp_entry->len != len)
-+                        continue;
-+                if(!strncmp(tmp_entry->name, name, len))
-+                        return 1;
-+        }
-+        return 0;
-+}
-+
-+/* mk:
-+ * Recursive function to create corresponding directorys in the storage fs.
-+ * The function will build the storage directorys up to dentry.
-+ */
-+int build_sto_structure(dentry_t *dir, dentry_t *dentry)
-+{
-+	int err;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	if(dentry->d_parent != dir) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: invalid parameter or meta data corruption [1].\n");
-+		return 1;
-+	}
-+
-+       	if(dtost(dir) != MODIFIED) {
-+		err = build_sto_structure(dir->d_parent, dentry->d_parent);
-+		if(err)
-+			return err;
-+	}
-+
-+	/* ok, coming back again. */
-+	check_mini_fo_dentry(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(!hidden_sto_dentry) {
-+		/*
-+		 * This is the case after creating the first
-+		 * hidden_sto_dentry.
-+		 * After one negative storage_dentry, all pointers to
-+		 * hidden_storage dentries are set to NULL. We need to
-+		 * create the negative dentry before we create the storage
-+		 * file.
-+		 */
-+		unsigned int len;
-+		const unsigned char *name;
-+		len = dtohd(dentry)->d_name.len;
-+		name = dtohd(dentry)->d_name.name;
-+		hidden_sto_dentry = lookup_one_len(name, dtohd2(dir), len);
-+		dtohd2(dentry) = hidden_sto_dentry;
-+	}
-+
-+	/* was:	hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	/* lets be safe */
-+	if(dtohd2(dir) != hidden_sto_dir_dentry) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: invalid parameter or meta data corruption [2].\n");
-+		return 1;
-+	}
-+
-+	/* check for errors in lock_parent */
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+	if(IS_ERR(hidden_sto_dir_dentry)) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: lock_parent failed.\n");
-+		return err;
-+	}
-+
-+	err = vfs_mkdir(hidden_sto_dir_dentry->d_inode,
-+			hidden_sto_dentry,
-+			dir->d_inode->i_mode);
-+
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: failed to create storage dir [1].\n");
-+		/* was: unlock_dir(dir); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&dir->d_inode->i_mutex);
-+#else
-+		up(&dir->d_inode->i_sem);
-+#endif
-+		dput(dir);
-+		return err;
-+	}
-+
-+	/* everything ok! */
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: failed to create storage dir [2].\n");
-+		/* was: unlock_dir(dir); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&dir->d_inode->i_mutex);
-+#else
-+		up(&dir->d_inode->i_sem);
-+#endif
-+		dput(dir);
-+		return 1;
-+	}
-+
-+	/* interpose the new inode and set new state */
-+	itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	dtopd(dentry)->state = MODIFIED;
-+
-+	/* initalize the wol list */
-+	itopd(dentry->d_inode)->deleted_list_size = -1;
-+	itopd(dentry->d_inode)->renamed_list_size = -1;
-+	meta_build_lists(dentry);
-+
-+	fist_copy_attr_all(dentry->d_inode, itohi2(dentry->d_inode));
-+	fist_copy_attr_timesizes(dir->d_inode,
-+				 hidden_sto_dir_dentry->d_inode);
-+	dir->d_inode->i_nlink++;
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+	return 0;
-+}
-+
-+
-+#if 0 /* unused */
-+
-+/*
-+ * Read "len" bytes from "filename" into "buf".
-+ * "buf" is in kernel space.
-+ */
-+int
-+mini_fo_read_file(const char *filename, void *buf, int len)
-+{
-+    file_t *filp;
-+    mm_segment_t oldfs;
-+    int bytes;
-+    /* Chroot? Maybe NULL isn't right here */
-+    filp = filp_open(filename, O_RDONLY, 0);
-+    if (!filp || IS_ERR(filp)) {
-+	printk("mini_fo_read_file err %d\n", (int) PTR_ERR(filp));
-+	return -1;  /* or do something else */
-+    }
-+
-+    if (!filp->f_op->read)
-+	return -2;  /* file(system) doesn't allow reads */
-+
-+    /* now read len bytes from offset 0 */
-+    filp->f_pos = 0;		/* start offset */
-+    oldfs = get_fs();
-+    set_fs(KERNEL_DS);
-+    bytes = filp->f_op->read(filp, buf, len, &filp->f_pos);
-+    set_fs(oldfs);
-+
-+    /* close the file */
-+    fput(filp);
-+
-+    return bytes;
-+}
-+
-+
-+
-+/*
-+ * Write "len" bytes from "buf" to "filename"
-+ * "buf" is in kernel space.
-+ */
-+int
-+mini_fo_write_file(const char *filename, void *buf, int len)
-+{
-+    file_t *filp;
-+    mm_segment_t oldfs;
-+    int bytes;
-+				/* Chroot? Maybe NULL isn't right here */
-+    filp = filp_open(filename, O_RDWR|O_CREAT, 0640);
-+    if (!filp || IS_ERR(filp)) {
-+	printk("mini_fo_write_file err %d\n", (int) PTR_ERR(filp));
-+	return -1;  /* or do something else */
-+    }
-+
-+    if (!filp->f_op->write)
-+	return -2;  /* file(system) doesn't allow writes */
-+
-+    /* now write len bytes from offset 0 */
-+    filp->f_pos = 0;		/* start offset */
-+    oldfs = get_fs();
-+    set_fs(KERNEL_DS);
-+    bytes = filp->f_op->write(filp, buf, len, &filp->f_pos);
-+    set_fs(oldfs);
-+
-+    /* close the file */
-+    fput(filp);
-+
-+    return bytes;
-+}
-+
-+#endif /* unused */
-+
---- /dev/null
-+++ b/fs/mini_fo/ChangeLog
-@@ -0,0 +1,281 @@
-+2006-01-24  Markus Klotzbuecher  <mk@mary.denx.de>
-+
-+	* Add tons of ugly ifdefs to Ed L. Cashin's mutex patch to
-+          retain backwards compatibility.
-+
-+2006-01-24  Ed L. Cashin <ecashin@coraid.com>
-+
-+	* Support for the new mutex infrastructure
-+	(7892f2f48d165a34b0b8130c8a195dfd807b8cb6)
-+
-+2005-10-15  Markus Klotzbuecher  <mk@localhost.localdomain>
-+
-+	* Bugfix for a serious memory leak in mini_fo_follow_link.
-+
-+2005-09-21  Markus Klotzbuecher  <mk@mary>
-+
-+	* new release 0.6.1
-+
-+	* fix of a compiler warning due to changes in 2.6.13
-+
-+2005-09-21  Klaus Wenninger  <klaus.wenninger@siemens.com>
-+
-+	* file.c: readdir: fix for a bug that caused directory entries
-+          to show up twice when using storage filesystems such as
-+          minixfs or pramfs.
-+
-+2005-06-30  Eric Lammerts <eric@lammerts.org>
-+
-+	* fix for an oops when overwriting a binary thats beeing
-+          executed.
-+
-+2005-06-09    <mk@mary>
-+
-+	* Renamed overlay to mini_fo-overlay.
-+
-+	* Added mini_fo-merge script to allow merging of storage and base
-+	after making modifications.
-+
-+2005-05-22  root  <mk@mary>
-+
-+	* Added overlay script that allows to easily mount mini_fo ontop
-+	of a given base directory
-+
-+2005-05-10    <mk@mary>
-+
-+	* inode.c: xattr functions return -EOPNOSUPP instead of
-+          -ENOSUPP, what confuses "ls -l"
-+
-+	* Changed license from LGPL to GPL.
-+
-+2005-05-08  root  <mk@mary>
-+
-+	* Makefile: clean it up and added make install and make
-+          uninstall.
-+
-+2005-05-06    <mk@mary>
-+
-+	* merged devel branch back to main. [v0-6-0-pre3]
-+
-+	* removed unused files print.c and fist_ioctl. [devel-0-0-18]
-+
-+	* ioctl: removed fist_ioctl stuff, that is not needed for
-+          now.
-+
-+2005-05-03    <mk@mary>
-+
-+	* file.c: simplified mini_fo_open and mini_fo_setattr using
-+          new state changing functions. [devel-0-0-17]
-+
-+	* inode.c: Fixed getattr state bug (see below) in 2.4 function
-+          mini_fo_inode revalidate.
-+
-+	* inode.c: found an other bug in mini_fo_getattr. States are not
-+	  reliable in this function, as a file can be opened, unlinked and
-+	  the getattr function called. This results in a deleted dentry
-+	  with an inode. Fix is to ignore states and simply use the inode
-+	  available.
-+
-+2005-04-29    <mk@mary>
-+
-+	* file.c: Bugfix and cleanup in fasync and fsync. [devel-0-0-16]
-+
-+	* file.c: do not use mini_fo_lock so the generic version is
-+          used (I guess).
-+
-+	* inode.c: getattr, never call getattr on lower files, as this
-+          will cause the inum to change.
-+
-+	* inode.c: rename_reg_file renamed to rename_nondir, as it
-+          doesn't matter as long it't not a dir. Removed all
-+          rename_dev_file etc.
-+
-+	* tagged as devel-0-0-15
-+
-+	* inode.c: added support for chosing support for extended
-+          attrs at compile time by XATTR define in mini_fo.h .
-+
-+	* inode.c: fixed mini_fo_getattr to use mini_fo inode and not
-+          lower again, what avoids inode number changes that confused
-+          rm again. This is the proper solution.
-+
-+2005-04-24    <mk@mary>
-+
-+	* all files: updated Copyright notive to 2005. [devel-0-0-14]
-+
-+	* inode.c: fixed mini_fo_getattr to not change the inode
-+          number, even if lower files change.
-+
-+	* super.c: fixed a bug that caused deleted base file to show
-+          up suddenly after some time, or after creating a special
-+          file. The problem was that after some time or after special
-+          file creating sync_sb_inodes is called by the vfs, that
-+          called our mini_fo_put_inode. There was (wrongly) called
-+          __meta_put_lists, that nuked the lists, although the inode
-+          was going to continue its life. Moving __meta_put_lists to
-+          mini_fo_clear_inode, where an inode is really destroyed,
-+          solved the problem.
-+
-+
-+2005-04-23    <mk@mary>
-+
-+	* state.c, aux.c: more cleaning up and
-+          simplifications. [devel-0-0-13]
-+
-+	* inode.c: implemented mini_fo_getattr, that was required for
-+          2.6 because inode_revalidate has been remove there, and the
-+	  old "du" bug returned.
-+
-+
-+2005-04-20    <mk@mary>
-+
-+	* aux.c: get_neg_sto_dentry(): allow to be called for dentries
-+          in state UNMODIFIED, NON_EXISTANT _and_ DELETED.
-+
-+2005-04-19    <mk@mary>
-+
-+	* Fixed a bug under 2.6 that caused files deleted via mini_fo
-+          not to be deleted properly and therefore the fs filled up
-+          untill no memory was left. [devel-0-0-12]
-+
-+	* Added basic hard link support. This means that creating
-+          hardlinks will work, but existing ones will be treated as
-+          individual files. [devel-0-0-11]
-+
-+2005-04-17    <mk@mary>
-+
-+	* Bugfixes
-+
-+2005-04-13  root  <mk@mary>
-+
-+	* Added file state.c for the state transition
-+          functions. Doesn't work very well yet, though...
-+
-+2005-04-12    <mk@mary>
-+
-+	* Porting to 2.6 started, which is easier than expected, also
-+          due to Olivier previous work.
-+
-+2005-04-08    <mk@mary>
-+
-+	* Fixed the bug that caused du to return invalid sizes of
-+          directory trees. The problem was that
-+          mini_fo_inode_revalidate didn't always copy the attributes
-+          from the base inode properly.
-+
-+2005-04-01  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Merged devel branch back to main trunk and updated the
-+          RELEASE notes. This will be 0-6-0-pre1.
-+
-+2005-03-31  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Fixed some bugs in rename_reg_file, that only showed up in
-+          the kernel compile test. Kernel compiles cleanly ontop of
-+          mini_fo, now also make mrproper etc. work. Seems pretty stable.
-+
-+2005-03-28  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Many, many directory renaming bugfixes and a lot of other
-+          cleanup. Dir renaming seems to work relatively stable.
-+
-+2005-03-22  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Finished implementing lightweight directory renaming. Some
-+          basic testing indicates it works fine.
-+	  Next is to implement testcases for the testsuite and confirm
-+          everything is really working ok.
-+
-+2005-03-18  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Finished implementing meta.c stuff required for directory
-+          renaming.
-+
-+2005-03-17  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Fixed all compile warnings + an extremly old bug that
-+          somehow crept in while reworking the wol stuff to the META
-+          system. Turning on -Werror again... :-)
-+
-+	* Fixed some bugs in the new rename_reg_file function.
-+
-+	* Rewrote mini_fo rename and split it into several
-+          subfunctions, that handle the different types
-+          seperately. Rewrote the regular file function aswell, as it
-+          was implemented somewhat inefficient.
-+
-+2005-03-16  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Implemented new META subsystem, removed old WOL stuff in favor
-+	  if it.
-+
-+	* After some basic testing everything seems ok...
-+
-+2005-03-11  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Renaming a non regular file caused trouble because I always
-+	  tried to copy the contents. Now I only do this for regular
-+	  files. mini_fo_rename still isn't implemented properly, renaming
-+	  of device files, symlinks etc. results in a empty regular file
-+	  instead of the proper type.
-+
-+	* Directory renaming suddenly works! What a surprise! I guess
-+          this is because renaming is implemented as making a copy and
-+          removing the original. Still this might not work
-+          everywhere...
-+
-+2005-03-09  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Bugfix, when a mini_fo directory that exists in storage
-+  	  (state: MODIFIED, CREATED and DEL_REWRITTEN) is deleted, a
-+  	  possibly existing WOL file contained in it needs to be
-+  	  deleted too.
-+
-+	* Starting cleanup: defined state names in order to get rid of
-+          the state numbers.
-+
-+2005-03-08  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Makefile fix, fist_ioctl was built against wrong sources if ARCH=um
-+
-+	* Fixed a bug in dentry.c, mini_fo_d_hash. In state 4 =
-+          DEL_REWRITTEN the hash was calculated from the base dentry,
-+          which was wrong and and caused assertions in
-+          __mini_fo_hidden_dentry to fail.
-+
-+2005-02-21    <mk@mary>
-+
-+	* Implemented directory deleting (inode.c)
-+
-+	* main.c: made mini_fo_parse_options a little more robust.
-+
-+2004-12-22    <mk@mary>
-+
-+	* Makefile cleanup and uml stuff, removed unneccessary files
-+
-+	* Created a new and hopefully more informative README
-+
-+	* CHANGELOG: created a new CHANGELOG and added old entries reversely
-+
-+
-+2004-10-24 Gleb Natapov <gleb@nbase.co.il>
-+
-+	* Fix: owner and group where not correctly copied from base to
-+          storage.
-+
-+
-+2004-10-05 Gleb Natapov <gleb@nbase.co.il>
-+
-+	* Implementation of fsync, fasync and lock mini_fo functions.
-+
-+
-+2004-09-29 Bob Lee <bob@pantasys.com>
-+
-+	* Fix of a serious pointer bug
-+
-+
-+2004-09-28 Gleb Natapov <gleb@nbase.co.il>
-+
-+	* Implementation of mini_fo_mknod and mini_fo_rename, support
-+          for device files.
-+
---- /dev/null
-+++ b/fs/mini_fo/dentry.c
-@@ -0,0 +1,244 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+/*
-+ * THIS IS A BOOLEAN FUNCTION: returns 1 if valid, 0 otherwise.
-+ */
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_d_revalidate(dentry_t *dentry, struct nameidata *nd)
-+#else
-+mini_fo_d_revalidate(dentry_t *dentry, int flags)
-+#endif
-+{
-+	int err1 = 1; /* valid = 1, invalid = 0 */
-+	int err2 = 1;
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	hidden_dentry  = dtohd(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(hidden_dentry &&
-+	   hidden_dentry->d_op &&
-+	   hidden_dentry->d_op->d_revalidate) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		err1 = hidden_dentry->d_op->d_revalidate(hidden_dentry, nd);
-+#else
-+		err1 = hidden_dentry->d_op->d_revalidate(hidden_dentry, flags);
-+#endif
-+	}
-+	if(hidden_sto_dentry &&
-+	   hidden_sto_dentry->d_op &&
-+	   hidden_sto_dentry->d_op->d_revalidate) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		err2 = hidden_sto_dentry->d_op->d_revalidate(hidden_sto_dentry,
-+							     nd);
-+#else
-+		err2 = hidden_sto_dentry->d_op->d_revalidate(hidden_sto_dentry,
-+							     flags);
-+#endif
-+	}
-+
-+	/* mk: if one of the lower level dentries are valid,
-+	 * the mini_fo dentry is too.
-+	 */
-+	return (err1 || err2);
-+}
-+
-+
-+STATIC int
-+mini_fo_d_hash(dentry_t *dentry, qstr_t *name)
-+{
-+	int err = 0;
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+	/* hidden_dentry = mini_fo_hidden_dentry(dentry);
-+	 * hidden_sto_dentry = mini_fo_hidden_sto_dentry(dentry); */
-+
-+	/* state 1, 3, 4, 5: build the hash for the storage dentry */
-+	if((dtopd(dentry)->state == MODIFIED) ||
-+	   (dtopd(dentry)->state == CREATED) ||
-+	   (dtopd(dentry)->state == DEL_REWRITTEN) ||
-+	   (dtopd(dentry)->state == DELETED)) {
-+		hidden_sto_dentry = dtohd2(dentry);
-+		if(hidden_sto_dentry &&
-+		   hidden_sto_dentry->d_op &&
-+		   hidden_sto_dentry->d_op->d_hash) {
-+			err = hidden_sto_dentry->d_op->d_hash(hidden_sto_dentry, name);
-+		}
-+		goto out;
-+	}
-+	/* state 2: build the hash for the base dentry */
-+	if(dtopd(dentry)->state == UNMODIFIED) {
-+		hidden_dentry = dtohd(dentry);
-+		if(hidden_dentry &&
-+		   hidden_dentry->d_op &&
-+		   hidden_dentry->d_op->d_hash) {
-+			err = hidden_dentry->d_op->d_hash(hidden_dentry, name);
-+		}
-+		goto out;
-+	}
-+	/* state 6: build hash for the dentry that exists */
-+	if(dtopd(dentry)->state == NON_EXISTANT) {
-+		hidden_sto_dentry = dtohd2(dentry);
-+		if(hidden_sto_dentry &&
-+		   hidden_sto_dentry->d_op &&
-+		   hidden_sto_dentry->d_op->d_hash) {
-+			err = hidden_sto_dentry->d_op->d_hash(hidden_sto_dentry, name);
-+			goto out;
-+		}
-+		hidden_dentry = dtohd(dentry);
-+		if(hidden_dentry &&
-+		   hidden_dentry->d_op &&
-+		   hidden_dentry->d_op->d_hash) {
-+			err = hidden_dentry->d_op->d_hash(hidden_dentry, name);
-+			goto out;
-+		}
-+	}
-+
-+	printk(KERN_CRIT "mini_fo: d_hash: invalid state detected.\n");
-+
-+ out:
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_d_compare(dentry_t *dentry, qstr_t *a, qstr_t *b)
-+{
-+	int err;
-+	dentry_t *hidden_dentry=NULL;
-+
-+	/* hidden_dentry = mini_fo_hidden_dentry(dentry); */
-+	if(dtohd2(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else if(dtohd(dentry))
-+		hidden_dentry = dtohd(dentry);
-+
-+	if (hidden_dentry && hidden_dentry->d_op && hidden_dentry->d_op->d_compare) {
-+		err = hidden_dentry->d_op->d_compare(hidden_dentry, a, b);
-+	} else {
-+		err = ((a->len != b->len) || memcmp(a->name, b->name, b->len));
-+	}
-+
-+	return err;
-+}
-+
-+
-+int
-+mini_fo_d_delete(dentry_t *dentry)
-+{
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+	int err = 0;
-+
-+	/* this could be a negative dentry, so check first */
-+	if (!dtopd(dentry)) {
-+		printk(KERN_CRIT "mini_fo_d_delete: negative dentry passed.\n");
-+		goto out;
-+	}
-+	hidden_dentry = dtohd(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(hidden_dentry) {
-+		if(hidden_dentry->d_op &&
-+		   hidden_dentry->d_op->d_delete) {
-+			err = hidden_dentry->d_op->d_delete(hidden_dentry);
-+		}
-+	}
-+	if(hidden_sto_dentry) {
-+		if(hidden_sto_dentry->d_op &&
-+		   hidden_sto_dentry->d_op->d_delete) {
-+			err = hidden_sto_dentry->d_op->d_delete(hidden_sto_dentry);
-+		}
-+	}
-+
-+ out:
-+	return err;
-+}
-+
-+
-+void
-+mini_fo_d_release(dentry_t *dentry)
-+{
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+
-+	/* this could be a negative dentry, so check first */
-+	if (!dtopd(dentry)) {
-+		printk(KERN_CRIT "mini_fo_d_release: no private data.\n");
-+		goto out;
-+	}
-+	hidden_dentry = dtohd(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(hidden_dentry) {
-+		/* decrement hidden dentry's counter and free its inode */
-+		dput(hidden_dentry);
-+	}
-+	if(hidden_sto_dentry) {
-+                /* decrement hidden dentry's counter and free its inode */
-+		dput(hidden_sto_dentry);
-+	}
-+
-+	/* free private data (mini_fo_dentry_info) here */
-+	kfree(dtopd(dentry));
-+	__dtopd(dentry) = NULL;	/* just to be safe */
-+ out:
-+	return;
-+}
-+
-+
-+/*
-+ * we don't really need mini_fo_d_iput, because dentry_iput will call iput() if
-+ * mini_fo_d_iput is not defined. We left this implemented for ease of
-+ * tracing/debugging.
-+ */
-+void
-+mini_fo_d_iput(dentry_t *dentry, inode_t *inode)
-+{
-+	iput(inode);
-+}
-+
-+
-+struct dentry_operations mini_fo_dops = {
-+	d_revalidate:	mini_fo_d_revalidate,
-+	d_hash:		mini_fo_d_hash,
-+	d_compare:		mini_fo_d_compare,
-+	d_release:		mini_fo_d_release,
-+	d_delete:		mini_fo_d_delete,
-+	d_iput:		mini_fo_d_iput,
-+};
---- /dev/null
-+++ b/fs/mini_fo/file.c
-@@ -0,0 +1,713 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+#define ROUND_UP(x) (((x)+sizeof(long)-1) & ~(sizeof(long)-1))
-+
-+/*******************
-+ * File Operations *
-+ *******************/
-+
-+STATIC loff_t
-+mini_fo_llseek(file_t *file, loff_t offset, int origin)
-+{
-+	loff_t err;
-+	file_t *hidden_file = NULL;
-+
-+	if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {
-+		/* Check if trying to llseek from a directory */
-+		err = -EISDIR;
-+		goto out;
-+	}
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	/* always set hidden position to this one */
-+	hidden_file->f_pos = file->f_pos;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	memcpy(&(hidden_file->f_ra),
-+	       &(file->f_ra),
-+	       sizeof(struct file_ra_state));
-+#else
-+	if (file->f_reada) { /* update readahead information if needed */
-+		hidden_file->f_reada = file->f_reada;
-+		hidden_file->f_ramax = file->f_ramax;
-+		hidden_file->f_raend = file->f_raend;
-+		hidden_file->f_ralen = file->f_ralen;
-+		hidden_file->f_rawin = file->f_rawin;
-+	}
-+#endif
-+	if (hidden_file->f_op && hidden_file->f_op->llseek)
-+		err = hidden_file->f_op->llseek(hidden_file, offset, origin);
-+	else
-+		err = generic_file_llseek(hidden_file, offset, origin);
-+
-+	if (err < 0)
-+		goto out;
-+
-+	if (err != file->f_pos) {
-+		file->f_pos = err;
-+		// ION maybe this?
-+		// 	file->f_pos = hidden_file->f_pos;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		file->f_reada = 0;
-+#endif
-+		file->f_version++;
-+	}
-+
-+ out:
-+	return err;
-+}
-+
-+
-+/* mk: fanout capable */
-+STATIC ssize_t
-+mini_fo_read(file_t *file, char *buf, size_t count, loff_t *ppos)
-+{
-+	int err = -EINVAL;
-+	file_t *hidden_file = NULL;
-+	loff_t pos = *ppos;
-+
-+	if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {
-+		/* Check if trying to read from a directory */
-+		/* printk(KERN_CRIT "mini_fo_read: ERROR: trying to read data from a directory.\n"); */
-+		err = -EISDIR;
-+		goto out;
-+	}
-+
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	if (!hidden_file->f_op || !hidden_file->f_op->read)
-+		goto out;
-+
-+	err = hidden_file->f_op->read(hidden_file, buf, count, &pos);
-+	*ppos = pos;
-+
-+	if (err >= 0) {
-+		/* atime should also be updated for reads of size zero or more */
-+		fist_copy_attr_atime(file->f_dentry->d_inode,
-+				     hidden_file->f_dentry->d_inode);
-+	}
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	/*
-+	 * MAJOR HACK
-+	 * because pread() does not have any way to tell us that it is
-+	 * our caller, then we don't know for sure if we have to update
-+	 * the file positions.  This hack relies on read() having passed us
-+	 * the "real" pointer of its struct file's f_pos field.
-+	 */
-+	if (ppos == &file->f_pos)
-+		hidden_file->f_pos = *ppos = pos;
-+	if (hidden_file->f_reada) { /* update readahead information if needed */
-+		file->f_reada = hidden_file->f_reada;
-+		file->f_ramax = hidden_file->f_ramax;
-+		file->f_raend = hidden_file->f_raend;
-+		file->f_ralen = hidden_file->f_ralen;
-+		file->f_rawin = hidden_file->f_rawin;
-+	}
-+#else
-+	memcpy(&(file->f_ra),&(hidden_file->f_ra),sizeof(struct file_ra_state));
-+#endif
-+
-+ out:
-+	return err;
-+}
-+
-+
-+/* this mini_fo_write() does not modify data pages! */
-+STATIC ssize_t
-+mini_fo_write(file_t *file, const char *buf, size_t count, loff_t *ppos)
-+{
-+	int err = -EINVAL;
-+	file_t *hidden_file = NULL;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	loff_t pos = *ppos;
-+
-+	/* mk: fan out: */
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			/* This is bad! We have no storage file to write to. This
-+			 * should never happen because if a file is opened for
-+			 * writing, a copy should have been made earlier.
-+			 */
-+			printk(KERN_CRIT "mini_fo: write : ERROR, no storage file to write.\n");
-+			err = -EINVAL;
-+			goto out;
-+		}
-+	}
-+
-+	inode = file->f_dentry->d_inode;
-+	hidden_inode = itohi2(inode);
-+	if(!hidden_inode) {
-+		printk(KERN_CRIT "mini_fo: write: no sto inode found, not good.\n");
-+		goto out;
-+	}
-+
-+	if (!hidden_file->f_op || !hidden_file->f_op->write)
-+		goto out;
-+
-+	/* adjust for append -- seek to the end of the file */
-+	if (file->f_flags & O_APPEND)
-+		pos = inode->i_size;
-+
-+	err = hidden_file->f_op->write(hidden_file, buf, count, &pos);
-+
-+	/*
-+	 * copy ctime and mtime from lower layer attributes
-+	 * atime is unchanged for both layers
-+	 */
-+	if (err >= 0)
-+		fist_copy_attr_times(inode, hidden_inode);
-+
-+	*ppos = pos;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	/*
-+	 * XXX: MAJOR HACK
-+	 *
-+	 * because pwrite() does not have any way to tell us that it is
-+	 * our caller, then we don't know for sure if we have to update
-+	 * the file positions.  This hack relies on write() having passed us
-+	 * the "real" pointer of its struct file's f_pos field.
-+	 */
-+	if (ppos == &file->f_pos)
-+		hidden_file->f_pos = *ppos = pos;
-+#endif
-+	/* update this inode's size */
-+	if (pos > inode->i_size)
-+		inode->i_size = pos;
-+
-+ out:
-+	return err;
-+}
-+
-+/* Global variable to hold a file_t pointer.
-+ * This serves to allow mini_fo_filldir function to know which file is
-+ * beeing read, which is required for two reasons:
-+ *
-+ *   - be able to call wol functions in order to avoid listing deleted
-+ *     base files.
-+ *   - if we're reading a directory which is in state 1, we need to
-+ *     maintain a list (in mini_fo_filldir) of which files allready
-+ *     have been copied to userspace,to detect files existing in base
-+ *     and storage and not list them twice.
-+ */
-+filldir_t mini_fo_filldir_orig;
-+file_t *mini_fo_filldir_file;
-+
-+/* mainly copied from fs/readdir.c */
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_filldir(void * __buf, const char * name, int namlen, loff_t offset,
-+		  u64 ino, unsigned int d_type)
-+#else
-+mini_fo_filldir(void * __buf, const char * name, int namlen, loff_t offset,
-+		  ino_t ino, unsigned int d_type)
-+#endif
-+{
-+	struct getdents_callback * buf = (struct getdents_callback *) __buf;
-+	file_t* file = mini_fo_filldir_file;
-+
-+	/* In theses states we filter meta files in storage (WOL) */
-+	if(file && (dtopd(file->f_dentry)->state == MODIFIED ||
-+		    dtopd(file->f_dentry)->state == CREATED ||
-+		    dtopd(file->f_dentry)->state == DEL_REWRITTEN)) {
-+
-+		int tmp = strlen(META_FILENAME);
-+		if(tmp  == namlen) {
-+			if(!strncmp(name, META_FILENAME, namlen))
-+				return 0;
-+		}
-+	}
-+
-+	/* check if we are merging the contents of storage and base */
-+	if(file && dtopd(file->f_dentry)->state == MODIFIED) {
-+		/* check if we are still reading storage contents, if
-+		 * yes, we just save the name of the file for duplicate
-+		 * checking later. */
-+
-+		if(!ftopd(file)->rd.sto_done) {
-+			/* put file into ndl list */
-+			if(ndl_add_entry(&ftopd(file)->rd, name, namlen))
-+				printk(KERN_CRIT "mini_fo_filldir: Error adding to ndl.\n");
-+		} else {
-+			/* check if file has been deleted */
-+			if(meta_check_d_entry(file->f_dentry, name, namlen))
-+				return 0;
-+
-+			/* do duplicate checking */
-+			if(ndl_check_entry(&ftopd(file)->rd, name, namlen))
-+				return 0;
-+		}
-+	}
-+
-+	return mini_fo_filldir_orig(buf, name, namlen, offset, ino, d_type);
-+}
-+
-+
-+STATIC int
-+mini_fo_readdir(file_t *file, void *dirent, filldir_t filldir)
-+{
-+	int err = 0;/* mk: ??? -ENOTDIR; */
-+	file_t *hidden_file = NULL;
-+	file_t *hidden_sto_file = NULL;
-+	inode_t *inode;
-+	struct getdents_callback *buf;
-+	int oldcount;
-+
-+#if defined(FIST_FILTER_NAME) || defined(FIST_FILTER_SCA)
-+	struct mini_fo_getdents_callback buf;
-+#endif /* FIST_FILTER_NAME || FIST_FILTER_SCA */
-+
-+	buf = (struct getdents_callback *) dirent;
-+	oldcount = buf->count;
-+	inode = file->f_dentry->d_inode;
-+	mini_fo_filldir_file = file;
-+	mini_fo_filldir_orig = filldir;
-+
-+	ftopd(file)->rd.sto_done = 0;
-+	do {
-+		if (ftopd(file) != NULL) {
-+			if(ftohf2(file)) {
-+				hidden_sto_file = ftohf2(file);
-+				err = vfs_readdir(hidden_sto_file, mini_fo_filldir, dirent);
-+				file->f_pos = hidden_sto_file->f_pos;
-+				if (err > 0)
-+					fist_copy_attr_atime(inode, hidden_sto_file->f_dentry->d_inode);
-+				/* not finshed yet, we'll be called again */
-+				if (buf->count != oldcount)
-+					break;
-+			}
-+
-+			ftopd(file)->rd.sto_done = 1;
-+
-+			if(ftohf(file)) {
-+				hidden_file = ftohf(file);
-+				err = vfs_readdir(hidden_file, mini_fo_filldir, dirent);
-+				file->f_pos = hidden_file->f_pos;
-+				if (err > 0)
-+					fist_copy_attr_atime(inode, hidden_file->f_dentry->d_inode);
-+			}
-+
-+		}
-+	} while (0);
-+
-+	/* mk:
-+	 * we need to check if all the directory data has been copied to userspace,
-+	 * or if we will be called again by userspace to complete the operation.
-+	 */
-+	if(buf->count == oldcount) {
-+		ndl_put_list(&ftopd(file)->rd);
-+	}
-+
-+	/* unset this, safe */
-+	mini_fo_filldir_file = NULL;
-+	return err;
-+}
-+
-+
-+STATIC unsigned int
-+mini_fo_poll(file_t *file, poll_table *wait)
-+{
-+	unsigned int mask = DEFAULT_POLLMASK;
-+	file_t *hidden_file = NULL;
-+
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	if (!hidden_file->f_op || !hidden_file->f_op->poll)
-+		goto out;
-+
-+	mask = hidden_file->f_op->poll(hidden_file, wait);
-+
-+ out:
-+	return mask;
-+}
-+
-+/* FIST-LITE special version of mmap */
-+STATIC int
-+mini_fo_mmap(file_t *file, vm_area_t *vma)
-+{
-+	int err = 0;
-+	file_t *hidden_file = NULL;
-+
-+	/* fanout capability */
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	ASSERT(hidden_file != NULL);
-+	ASSERT(hidden_file->f_op != NULL);
-+	ASSERT(hidden_file->f_op->mmap != NULL);
-+
-+	vma->vm_file = hidden_file;
-+	err = hidden_file->f_op->mmap(hidden_file, vma);
-+	get_file(hidden_file); /* make sure it doesn't get freed on us */
-+	fput(file);	       /* no need to keep extra ref on ours */
-+
-+	return err;
-+}
-+
-+
-+
-+STATIC int
-+mini_fo_open(inode_t *inode, file_t *file)
-+{
-+	int err = 0;
-+ 	int hidden_flags;
-+	file_t *hidden_file = NULL;
-+	dentry_t *hidden_dentry = NULL;
-+
-+	/* fanout stuff */
-+	file_t *hidden_sto_file = NULL;
-+	dentry_t *hidden_sto_dentry = NULL;
-+
-+	__ftopd(file) =
-+		kmalloc(sizeof(struct mini_fo_file_info), GFP_KERNEL);
-+	if (!ftopd(file)) {
-+		err = -ENOMEM;
-+		goto out;
-+	}
-+
-+	/* init the readdir_helper structure */
-+	INIT_LIST_HEAD(&ftopd(file)->rd.ndl_list);
-+	ftopd(file)->rd.ndl_size = 0;
-+
-+	/* In certain paths this could stay uninitalized and cause trouble */
-+	ftohf(file) = NULL;
-+	ftohf2(file) = NULL;
-+	hidden_flags = file->f_flags;
-+
-+	/* create storage files? */
-+	if(dtost(file->f_dentry) == UNMODIFIED) {
-+		if(!IS_WRITE_FLAG(file->f_flags)) {
-+			hidden_dentry = dtohd(file->f_dentry);
-+			dget(hidden_dentry);
-+			/* dentry_open will decrement mnt refcnt if err.
-+			 * otherwise fput() will do an mntput() for us upon file close. */
-+			mntget(stopd(inode->i_sb)->hidden_mnt);
-+			hidden_file = dentry_open(hidden_dentry,
-+						  stopd(inode->i_sb)->hidden_mnt,
-+						  hidden_flags);
-+			if (IS_ERR(hidden_file)) {
-+				err = PTR_ERR(hidden_file);
-+				dput(hidden_dentry);
-+				goto out;
-+			}
-+			ftohf(file) = hidden_file;	/* link two files */
-+			goto out;
-+		}
-+		else {
-+			if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {
-+				err = dir_unmod_to_mod(file->f_dentry);
-+			} else
-+				err = nondir_unmod_to_mod(file->f_dentry, 1);
-+
-+			if (err) {
-+				printk("mini_fo_open: ERROR creating storage file.\n");
-+				goto out;
-+			}
-+		}
-+	}
-+	hidden_sto_dentry = dtohd2(file->f_dentry);
-+	dget(hidden_sto_dentry);
-+
-+	if(dtopd(file->f_dentry)->state == MODIFIED) {
-+		/* Directorys are special, interpose on both lower level files */
-+		if(S_ISDIR(itohi(inode)->i_mode)) {
-+			/* check for invalid file types of lower level files */
-+			if(!(S_ISDIR(itohi(inode)->i_mode) && S_ISDIR(itohi2(inode)->i_mode))) {
-+				printk(KERN_CRIT "mini_fo_open: meta data corruption detected.\n");
-+				dput(hidden_sto_dentry);
-+				err = -EINVAL;
-+				goto out;
-+			}
-+
-+			/* lower level directorys are ok, open the base file */
-+			hidden_dentry = dtohd(file->f_dentry);
-+			dget(hidden_dentry);
-+
-+			mntget(stopd(inode->i_sb)->hidden_mnt);
-+			hidden_file = dentry_open(hidden_dentry,
-+						  stopd(inode->i_sb)->hidden_mnt,
-+						  hidden_flags);
-+			if (IS_ERR(hidden_file)) {
-+				err = PTR_ERR(hidden_file);
-+				dput(hidden_dentry);
-+				dput(hidden_sto_dentry);
-+				goto out;
-+			}
-+			ftohf(file) = hidden_file; /* link the two files */
-+		}
-+	}
-+
-+	if(!exists_in_storage(file->f_dentry)) {
-+		printk(KERN_CRIT "mini_fo_open: invalid file state detected.\n");
-+		err = -EINVAL;
-+		dput(hidden_sto_dentry);
-+
-+		/* If the base file has been opened, we need to close it here */
-+		if(ftohf(file)) {
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				hidden_file->f_op->flush(hidden_file, NULL);
-+#else
-+				hidden_file->f_op->flush(hidden_file);
-+#endif
-+			dput(hidden_dentry);
-+		}
-+		goto out;
-+	}
-+
-+	/* ok, now we can safely open the storage file */
-+	mntget(stopd(inode->i_sb)->hidden_mnt2);
-+	hidden_sto_file = dentry_open(hidden_sto_dentry,
-+				      stopd(inode->i_sb)->hidden_mnt2,
-+				      hidden_flags);
-+
-+	/* dentry_open dputs the dentry if it fails */
-+	if (IS_ERR(hidden_sto_file)) {
-+		err = PTR_ERR(hidden_sto_file);
-+		/* close base file if open */
-+		if(ftohf(file)) {
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				hidden_file->f_op->flush(hidden_file, NULL);
-+#else
-+				hidden_file->f_op->flush(hidden_file);
-+#endif
-+			dput(hidden_dentry);
-+		}
-+		goto out;
-+	}
-+	ftohf2(file) = hidden_sto_file; /* link storage file */
-+
-+ out:
-+	if (err < 0 && ftopd(file)) {
-+		kfree(ftopd(file));
-+	}
-+	return err;
-+}
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_flush(file_t *file, fl_owner_t id)
-+#else
-+mini_fo_flush(file_t *file)
-+#endif
-+{
-+	int err1 = 0;		/* assume ok (see open.c:close_fp) */
-+	int err2 = 0;
-+	file_t *hidden_file = NULL;
-+
-+	check_mini_fo_file(file);
-+
-+	/* mk: we don't do any state checking here, as its not worth the time.
-+	 * Just flush the lower level files if they exist.
-+	 */
-+	if(ftopd(file) != NULL) {
-+		if(ftohf(file) != NULL) {
-+			hidden_file = ftohf(file);
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				err1 = hidden_file->f_op->flush(hidden_file, id);
-+#else
-+				err1 = hidden_file->f_op->flush(hidden_file);
-+#endif
-+		}
-+		if(ftohf2(file) != NULL) {
-+			hidden_file = ftohf2(file);
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				err2 = hidden_file->f_op->flush(hidden_file, id);
-+#else
-+				err2 = hidden_file->f_op->flush(hidden_file);
-+#endif
-+		}
-+	}
-+	return (err1 | err2);
-+}
-+
-+
-+STATIC int
-+mini_fo_release(inode_t *inode, file_t *file)
-+{
-+	int err = 0;
-+	file_t *hidden_file = NULL;
-+
-+	if (ftopd(file) != NULL) {
-+		if(ftohf(file)) {
-+			hidden_file = ftohf(file);
-+			fput(hidden_file);
-+		}
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+			fput(hidden_file);
-+		}
-+		kfree(ftopd(file));
-+	}
-+	return err;
-+}
-+
-+STATIC int
-+mini_fo_fsync(file_t *file, dentry_t *dentry, int datasync)
-+{
-+	int err1 = 0;
-+	int err2 = 0;
-+	file_t *hidden_file = NULL;
-+	dentry_t *hidden_dentry;
-+
-+	check_mini_fo_file(file);
-+
-+	if ((hidden_file = ftohf(file)) != NULL) {
-+		hidden_dentry = dtohd(dentry);
-+		if (hidden_file->f_op && hidden_file->f_op->fsync) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+			err1 = hidden_file->f_op->fsync(hidden_file, hidden_dentry, datasync);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		}
-+	}
-+
-+	if ((hidden_file = ftohf2(file)) != NULL) {
-+		hidden_dentry = dtohd2(dentry);
-+		if (hidden_file->f_op && hidden_file->f_op->fsync) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+			err2 = hidden_file->f_op->fsync(hidden_file, hidden_dentry, datasync);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		}
-+	}
-+	else
-+		goto err;
-+
-+err:
-+	return (err1 || err2);
-+}
-+
-+
-+STATIC int
-+mini_fo_fasync(int fd, file_t *file, int flag)
-+{
-+	int err1 = 0;
-+	int err2 = 0;
-+
-+	file_t *hidden_file = NULL;
-+
-+	check_mini_fo_file(file);
-+
-+	if((hidden_file = ftohf(file)) != NULL) {
-+		err1 = hidden_file->f_op->fasync(fd, hidden_file, flag);
-+	}
-+	if((hidden_file = ftohf2(file)) != NULL) {
-+		err2 = hidden_file->f_op->fasync(fd, hidden_file, flag);
-+	}
-+
-+	return (err1 || err2);
-+}
-+
-+
-+
-+struct file_operations mini_fo_dir_fops =
-+	{
-+		read:	generic_read_dir,
-+		write:	mini_fo_write,
-+		readdir: mini_fo_readdir,
-+		poll:	mini_fo_poll,
-+		/* ioctl:	mini_fo_ioctl, */
-+		mmap:	mini_fo_mmap,
-+		open:	mini_fo_open,
-+		flush:	mini_fo_flush,
-+		release: mini_fo_release,
-+		fsync:	mini_fo_fsync,
-+		fasync:	mini_fo_fasync,
-+		/* not needed lock:	mini_fo_lock, */
-+		/* not needed: readv */
-+		/* not needed: writev */
-+		/* not implemented: sendpage */
-+		/* not implemented: get_unmapped_area */
-+	};
-+
-+struct file_operations mini_fo_main_fops =
-+	{
-+		llseek:	mini_fo_llseek,
-+		read:	mini_fo_read,
-+		write:	mini_fo_write,
-+		readdir: mini_fo_readdir,
-+		poll:	mini_fo_poll,
-+		/* ioctl:	mini_fo_ioctl, */
-+		mmap:	mini_fo_mmap,
-+		open:	mini_fo_open,
-+		flush:	mini_fo_flush,
-+		release: mini_fo_release,
-+		fsync:	mini_fo_fsync,
-+		fasync:	mini_fo_fasync,
-+		/* not needed: lock:	mini_fo_lock, */
-+		/* not needed: readv */
-+		/* not needed: writev */
-+		/* not implemented: sendpage */
-+		/* not implemented: get_unmapped_area */
-+	};
---- /dev/null
-+++ b/fs/mini_fo/fist.h
-@@ -0,0 +1,252 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifndef __FIST_H_
-+#define __FIST_H_
-+
-+/*
-+ * KERNEL ONLY CODE:
-+ */
-+#ifdef __KERNEL__
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
-+#include <linux/autoconf.h>
-+#else
-+#include <linux/config.h>
-+#endif
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+#ifdef CONFIG_MODVERSIONS
-+# define MODVERSIONS
-+# include <linux/modversions.h>
-+#endif /* CONFIG_MODVERSIONS */
-+#endif /* KERNEL_VERSION < 2.6.0 */
-+#include <linux/sched.h>
-+#include <linux/kernel.h>
-+#include <linux/mm.h>
-+#include <linux/string.h>
-+#include <linux/stat.h>
-+#include <linux/errno.h>
-+#include <linux/wait.h>
-+#include <linux/limits.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+#include <linux/locks.h>
-+#else
-+#include <linux/buffer_head.h>
-+#include <linux/pagemap.h>
-+#include <linux/namei.h>
-+#include <linux/module.h>
-+#include <linux/mount.h>
-+#include <linux/page-flags.h>
-+#include <linux/writeback.h>
-+#include <linux/statfs.h>
-+#endif
-+#include <linux/smp.h>
-+#include <linux/smp_lock.h>
-+#include <linux/file.h>
-+#include <linux/slab.h>
-+#include <linux/vmalloc.h>
-+#include <linux/poll.h>
-+#include <linux/list.h>
-+#include <linux/init.h>
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)
-+#include <linux/xattr.h>
-+#endif
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#include <linux/security.h>
-+#endif
-+
-+#include <linux/swap.h>
-+
-+#include <asm/system.h>
-+/* #include <asm/segment.h> */
-+#include <asm/mman.h>
-+#include <linux/seq_file.h>
-+
-+/*
-+ * MACROS:
-+ */
-+
-+/* those mapped to ATTR_* were copied from linux/fs.h */
-+#define FA_MODE		ATTR_MODE
-+#define FA_UID		ATTR_UID
-+#define FA_GID		ATTR_GID
-+#define FA_SIZE		ATTR_SIZE
-+#define FA_ATIME	ATTR_ATIME
-+#define FA_MTIME	ATTR_MTIME
-+#define FA_CTIME	ATTR_CTIME
-+#define FA_ATIME_SET	ATTR_ATIME_SET
-+#define FA_MTIME_SET	ATTR_MTIME_SET
-+#define FA_FORCE	ATTR_FORCE
-+#define FA_ATTR_FLAGS	ATTR_ATTR_FLAG
-+
-+/* must be greater than all other ATTR_* flags! */
-+#define FA_NLINK	2048
-+#define FA_BLKSIZE	4096
-+#define FA_BLOCKS	8192
-+#define FA_TIMES	(FA_ATIME|FA_MTIME|FA_CTIME)
-+#define FA_ALL		0
-+
-+/* macros to manage changes between kernels */
-+#define INODE_DATA(i)	(&(i)->i_data)
-+
-+#define MIN(x,y) ((x < y) ? (x) : (y))
-+#define MAX(x,y) ((x > y) ? (x) : (y))
-+#define MAXPATHLEN PATH_MAX
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,5)
-+# define lookup_one_len(a,b,c) lookup_one(a,b)
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,4,5) */
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,8)
-+# define generic_file_llseek default_llseek
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,4,8) */
-+
-+#ifndef SEEK_SET
-+# define SEEK_SET 0
-+#endif /* not SEEK_SET */
-+
-+#ifndef SEEK_CUR
-+# define SEEK_CUR 1
-+#endif /* not SEEK_CUR */
-+
-+#ifndef SEEK_END
-+# define SEEK_END 2
-+#endif /* not SEEK_END */
-+
-+#ifndef DEFAULT_POLLMASK
-+# define DEFAULT_POLLMASK (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)
-+#endif /* not DEFAULT_POLLMASK */
-+
-+/* XXX: fix this so fistgen generates kfree() code directly */
-+#define kfree_s(a,b) kfree(a)
-+
-+/*
-+ * TYPEDEFS:
-+ */
-+typedef struct dentry dentry_t;
-+typedef struct file file_t;
-+typedef struct inode inode_t;
-+typedef inode_t vnode_t;
-+typedef struct page page_t;
-+typedef struct qstr qstr_t;
-+typedef struct super_block super_block_t;
-+typedef super_block_t vfs_t;
-+typedef struct vm_area_struct vm_area_t;
-+
-+
-+/*
-+ * EXTERNALS:
-+ */
-+
-+#define FPPF(str,page) printk("PPF %s 0x%x/%d: Lck:%d Err:%d Ref:%d Upd:%d Other::%d:%d:%d:%d:\n", \
-+		str, \
-+		(int) page, \
-+		(int) page->index, \
-+		(PageLocked(page) ? 1 : 0), \
-+		(PageError(page) ? 1 : 0), \
-+		(PageReferenced(page) ? 1 : 0), \
-+		(Page_Uptodate(page) ? 1 : 0), \
-+		(PageDecrAfter(page) ? 1 : 0), \
-+		(PageSlab(page) ? 1 : 0), \
-+		(PageSwapCache(page) ? 1 : 0), \
-+		(PageReserved(page) ? 1 : 0) \
-+		)
-+#define EZKDBG printk("EZK %s:%d:%s\n",__FILE__,__LINE__,__FUNCTION__)
-+#if 0
-+# define EZKDBG1 printk("EZK %s:%d\n",__FILE__,__LINE__)
-+#else
-+# define EZKDBG1
-+#endif
-+
-+extern int fist_get_debug_value(void);
-+extern int fist_set_debug_value(int val);
-+#if 0 /* mini_fo doesn't need these */
-+extern void fist_dprint_internal(int level, char *str,...);
-+extern void fist_print_dentry(char *str, const dentry_t *dentry);
-+extern void fist_print_inode(char *str, const inode_t *inode);
-+extern void fist_print_file(char *str, const file_t *file);
-+extern void fist_print_buffer_flags(char *str, struct buffer_head *buffer);
-+extern void fist_print_page_flags(char *str, page_t *page);
-+extern void fist_print_page_bytes(char *str, page_t *page);
-+extern void fist_print_pte_flags(char *str, const page_t *page);
-+extern void fist_checkinode(inode_t *inode, char *msg);
-+extern void fist_print_sb(char *str, const super_block_t *sb);
-+
-+/* §$% by mk: special debug functions */
-+extern void fist_mk_print_dentry(char *str, const dentry_t *dentry);
-+extern void fist_mk_print_inode(char *str, const inode_t *inode);
-+
-+extern char *add_indent(void);
-+extern char *del_indent(void);
-+#endif/* mini_fo doesn't need these */
-+
-+
-+#define STATIC
-+#define ASSERT(EX)	\
-+do {	\
-+    if (!(EX)) {	\
-+	printk(KERN_CRIT "ASSERTION FAILED: %s at %s:%d (%s)\n", #EX,	\
-+	       __FILE__, __LINE__, __FUNCTION__);	\
-+	(*((char *)0))=0;	\
-+    }	\
-+} while (0)
-+/* same ASSERT, but tell me who was the caller of the function */
-+#define ASSERT2(EX)	\
-+do {	\
-+    if (!(EX)) {	\
-+	printk(KERN_CRIT "ASSERTION FAILED (caller): %s at %s:%d (%s)\n", #EX,	\
-+	       file, line, func);	\
-+	(*((char *)0))=0;	\
-+    }	\
-+} while (0)
-+
-+#if 0 /* mini_fo doesn't need these */
-+#define dprintk(format, args...) printk(KERN_DEBUG format, ##args)
-+#define fist_dprint(level, str, args...) fist_dprint_internal(level, KERN_DEBUG str, ## args)
-+#define print_entry_location() fist_dprint(4, "%sIN:  %s %s:%d\n", add_indent(), __FUNCTION__, __FILE__, __LINE__)
-+#define print_exit_location() fist_dprint(4, "%s OUT: %s %s:%d\n", del_indent(), __FUNCTION__, __FILE__, __LINE__)
-+#define print_exit_status(status) fist_dprint(4, "%s OUT: %s %s:%d, STATUS: %d\n", del_indent(), __FUNCTION__, __FILE__, __LINE__, status)
-+#define print_exit_pointer(status) \
-+do { \
-+  if (IS_ERR(status)) \
-+    fist_dprint(4, "%s OUT: %s %s:%d, RESULT: %ld\n", del_indent(), __FUNCTION__, __FILE__, __LINE__, PTR_ERR(status)); \
-+  else \
-+    fist_dprint(4, "%s OUT: %s %s:%d, RESULT: 0x%x\n", del_indent(), __FUNCTION__, __FILE__, __LINE__, PTR_ERR(status)); \
-+} while (0)
-+#endif/* mini_fo doesn't need these */
-+
-+#endif /* __KERNEL__ */
-+
-+
-+/*
-+ * DEFINITIONS FOR USER AND KERNEL CODE:
-+ * (Note: ioctl numbers 1--9 are reserved for fistgen, the rest
-+ *  are auto-generated automatically based on the user's .fist file.)
-+ */
-+# define FIST_IOCTL_GET_DEBUG_VALUE	_IOR(0x15, 1, int)
-+# define FIST_IOCTL_SET_DEBUG_VALUE	_IOW(0x15, 2, int)
-+
-+#endif /* not __FIST_H_ */
---- /dev/null
-+++ b/fs/mini_fo/inode.c
-@@ -0,0 +1,1564 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd)
-+#else
-+mini_fo_create(inode_t *dir, dentry_t *dentry, int mode)
-+#endif
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	err = create_sto_reg_file(dentry, mode, nd);
-+#else
-+	err = create_sto_reg_file(dentry, mode);
-+#endif
-+	check_mini_fo_dentry(dentry);
-+	return err;
-+}
-+
-+
-+STATIC dentry_t *
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_lookup(inode_t *dir, dentry_t *dentry, struct nameidata* nd)
-+#else
-+mini_fo_lookup(inode_t *dir, dentry_t *dentry)
-+#endif
-+{
-+	int err = 0;
-+	dentry_t *hidden_dir_dentry;
-+	dentry_t *hidden_dentry = NULL;
-+
-+	dentry_t *hidden_sto_dir_dentry;
-+	dentry_t *hidden_sto_dentry = NULL;
-+
-+	/* whiteout flag */
-+	int del_flag = 0;
-+	char *bpath = NULL;
-+
-+	const char *name;
-+	unsigned int namelen;
-+
-+	/* Don't allow lookups of META-files */
-+	namelen = strlen(META_FILENAME);
-+	if(namelen == dentry->d_name.len) {
-+		if(!strncmp(dentry->d_name.name, META_FILENAME, namelen)) {
-+			err = -ENOENT;
-+			goto out;
-+		}
-+	}
-+
-+	hidden_dir_dentry = dtohd(dentry->d_parent);
-+	hidden_sto_dir_dentry = dtohd2(dentry->d_parent);
-+
-+	name = dentry->d_name.name;
-+	namelen = dentry->d_name.len;
-+
-+	/* must initialize dentry operations */
-+	dentry->d_op = &mini_fo_dops;
-+
-+	/* setup the del_flag */
-+	del_flag = __meta_check_d_entry(dir, name, namelen);
-+	bpath = __meta_check_r_entry(dir, name, namelen);
-+
-+	/* perform the lookups of base and storage files:
-+	 *
-+	 * This caused some serious trouble, as a lookup_one_len passing
-+	 * a negative dentry oopses. Solution is to only do the lookup
-+	 * if the dentry is positive, else we set it to NULL
-+	 * More trouble, who said a *_dir_dentry can't be NULL?
-+	 */
-+	if(bpath) {
-+		/* Cross-Interposing (C), yeah! */
-+		hidden_dentry = bpath_walk(dir->i_sb, bpath);
-+		if(!hidden_dentry || !hidden_dentry->d_inode) {
-+			printk(KERN_CRIT "mini_fo_lookup: bpath_walk failed.\n");
-+			err= -EINVAL;
-+			goto out;
-+		}
-+
-+		/* this can be set up safely without fear of spaghetti
-+		 * interposing as it is only used for copying times */
-+		hidden_dir_dentry = hidden_dentry->d_parent;
-+		kfree(bpath);
-+	}
-+	else if(hidden_dir_dentry && hidden_dir_dentry->d_inode)
-+		hidden_dentry =
-+			lookup_one_len(name, hidden_dir_dentry, namelen);
-+	else
-+		hidden_dentry = NULL;
-+
-+	if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode)
-+		hidden_sto_dentry =
-+			lookup_one_len(name, hidden_sto_dir_dentry, namelen);
-+	else
-+		hidden_sto_dentry =  NULL;
-+
-+	/* catch error in lookup */
-+	if (IS_ERR(hidden_dentry) || IS_ERR(hidden_sto_dentry)) {
-+		/* mk: we need to call dput on the dentry, whose
-+		 * lookup_one_len operation failed, in order to avoid
-+		 * unmount trouble.
-+		 */
-+		if(IS_ERR(hidden_dentry)) {
-+			printk(KERN_CRIT "mini_fo_lookup: ERR from base dentry, lookup failed.\n");
-+			err = PTR_ERR(hidden_dentry);
-+		} else {
-+			dput(hidden_dentry);
-+		}
-+		if(IS_ERR(hidden_sto_dentry)) {
-+			printk(KERN_CRIT "mini_fo_lookup: ERR from storage dentry, lookup failed.\n");
-+			err = PTR_ERR(hidden_sto_dentry);
-+		} else {
-+			dput(hidden_sto_dentry);
-+		}
-+		goto out;
-+	}
-+
-+	/* allocate dentry private data */
-+	__dtopd(dentry) = (struct mini_fo_dentry_info *)
-+		kmalloc(sizeof(struct mini_fo_dentry_info), GFP_KERNEL);
-+
-+	if (!dtopd(dentry)) {
-+		err = -ENOMEM;
-+		goto out_dput;
-+	}
-+
-+	/* check for different states of the mini_fo file to be looked up. */
-+
-+	/* state 1, file has been modified */
-+	if(hidden_dentry && hidden_sto_dentry &&
-+	   hidden_dentry->d_inode && hidden_sto_dentry->d_inode && !del_flag) {
-+
-+		/* update parent directory's atime */
-+		fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+
-+		dtopd(dentry)->state = MODIFIED;
-+		dtohd(dentry) = hidden_dentry;
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		err = mini_fo_tri_interpose(hidden_dentry,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state1).\n");
-+			goto out_free;
-+		}
-+		goto out;
-+	}
-+	/* state 2, file is unmodified */
-+	if(hidden_dentry && hidden_dentry->d_inode && !del_flag) {
-+
-+		fist_copy_attr_atime(dir, hidden_dir_dentry->d_inode);
-+
-+		dtopd(dentry)->state = UNMODIFIED;
-+		dtohd(dentry) = hidden_dentry;
-+		dtohd2(dentry) = hidden_sto_dentry; /* could be negative */
-+
-+		err = mini_fo_tri_interpose(hidden_dentry,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state2).\n");
-+			goto out_free;
-+		}
-+		goto out;
-+	}
-+	/* state 3, file has been newly created */
-+	if(hidden_sto_dentry && hidden_sto_dentry->d_inode && !del_flag) {
-+
-+		fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+		dtopd(dentry)->state = CREATED;
-+		dtohd(dentry) = hidden_dentry; /* could be negative */
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		err = mini_fo_tri_interpose(hidden_dentry,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state3).\n");
-+			goto out_free;
-+		}
-+		goto out;
-+	}
-+
-+	/* state 4, file has deleted and created again. */
-+	if(hidden_dentry && hidden_sto_dentry &&
-+	   hidden_dentry->d_inode &&
-+	   hidden_sto_dentry->d_inode && del_flag) {
-+
-+		fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+		dtopd(dentry)->state = DEL_REWRITTEN;
-+		dtohd(dentry) = NULL;
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		err = mini_fo_tri_interpose(NULL,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state4).\n");
-+			goto out_free;
-+		}
-+		/* We will never need this dentry again, as the file has been
-+		 * deleted from base */
-+		dput(hidden_dentry);
-+		goto out;
-+	}
-+	/* state 5, file has been deleted in base */
-+	if(hidden_dentry && hidden_sto_dentry &&
-+	   hidden_dentry->d_inode &&
-+	   !hidden_sto_dentry->d_inode && del_flag) {
-+
-+		/* check which parents atime we need for updating */
-+		if(hidden_sto_dir_dentry->d_inode)
-+			fist_copy_attr_atime(dir,
-+					     hidden_sto_dir_dentry->d_inode);
-+		else
-+			fist_copy_attr_atime(dir,
-+					     hidden_dir_dentry->d_inode);
-+
-+		dtopd(dentry)->state = DELETED;
-+		dtohd(dentry) = NULL;
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		/* add negative dentry to dcache to speed up lookups */
-+		d_add(dentry, NULL);
-+		dput(hidden_dentry);
-+		goto out;
-+	}
-+	/* state 6, file does not exist */
-+	if(((hidden_dentry && !hidden_dentry->d_inode) ||
-+	    (hidden_sto_dentry && !hidden_sto_dentry->d_inode)) && !del_flag)
-+		{
-+			/* check which parents atime we need for updating */
-+			if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode)
-+				fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+			else
-+				fist_copy_attr_atime(dir, hidden_dir_dentry->d_inode);
-+
-+			dtopd(dentry)->state = NON_EXISTANT;
-+			dtohd(dentry) = hidden_dentry;
-+			dtohd2(dentry) = hidden_sto_dentry;
-+			d_add(dentry, NULL);
-+			goto out;
-+		}
-+
-+	/* if we get to here, were in an invalid state. bad. */
-+	printk(KERN_CRIT "mini_fo_lookup: ERROR, meta data corruption detected.\n");
-+
-+	/* end state checking */
-+ out_free:
-+	d_drop(dentry);		/* so that our bad dentry will get destroyed */
-+	kfree(dtopd(dentry));
-+	__dtopd(dentry) = NULL;	/* be safe */
-+
-+ out_dput:
-+	if(hidden_dentry)
-+		dput(hidden_dentry);
-+	if(hidden_sto_dentry)
-+		dput(hidden_sto_dentry); /* drops usage count and marks for release */
-+
-+ out:
-+	/* initalize wol if file exists and is directory */
-+	if(dentry->d_inode) {
-+		if(S_ISDIR(dentry->d_inode->i_mode)) {
-+			itopd(dentry->d_inode)->deleted_list_size = -1;
-+			itopd(dentry->d_inode)->renamed_list_size = -1;
-+			meta_build_lists(dentry);
-+		}
-+	}
-+	return ERR_PTR(err);
-+}
-+
-+
-+STATIC int
-+mini_fo_link(dentry_t *old_dentry, inode_t *dir, dentry_t *new_dentry)
-+{
-+	int err;
-+	dentry_t *hidden_old_dentry;
-+	dentry_t *hidden_new_dentry;
-+	dentry_t *hidden_dir_dentry;
-+
-+
-+	check_mini_fo_dentry(old_dentry);
-+	check_mini_fo_dentry(new_dentry);
-+	check_mini_fo_inode(dir);
-+
-+	/* no links to directorys and existing targets target allowed */
-+	if(S_ISDIR(old_dentry->d_inode->i_mode) ||
-+	   is_mini_fo_existant(new_dentry)) {
-+		err = -EPERM;
-+		goto out;
-+	}
-+
-+	/* bring it directly from unmod to del_rew */
-+	if(dtost(old_dentry) == UNMODIFIED) {
-+		err = nondir_unmod_to_mod(old_dentry, 1);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+		err = meta_add_d_entry(old_dentry->d_parent,
-+				       old_dentry->d_name.name,
-+				       old_dentry->d_name.len);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+		dput(dtohd(old_dentry));
-+		dtohd(old_dentry) = NULL;
-+		dtost(old_dentry) = DEL_REWRITTEN;
-+	}
-+
-+	err = get_neg_sto_dentry(new_dentry);
-+	if(err) {
-+		err = -EINVAL;
-+		goto out;
-+	}
-+
-+	hidden_old_dentry = dtohd2(old_dentry);
-+	hidden_new_dentry = dtohd2(new_dentry);
-+
-+	dget(hidden_old_dentry);
-+	dget(hidden_new_dentry);
-+
-+	/* was: hidden_dir_dentry = lock_parent(hidden_new_dentry); */
-+	hidden_dir_dentry = dget(hidden_new_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = vfs_link(hidden_old_dentry,
-+		       hidden_dir_dentry->d_inode,
-+		       hidden_new_dentry);
-+	if (err || !hidden_new_dentry->d_inode)
-+		goto out_lock;
-+
-+	dtost(new_dentry) = CREATED;
-+ 	err = mini_fo_tri_interpose(NULL, hidden_new_dentry, new_dentry, dir->i_sb, 0);
-+	if (err)
-+		goto out_lock;
-+
-+	fist_copy_attr_timesizes(dir, hidden_new_dentry->d_inode);
-+	/* propagate number of hard-links */
-+	old_dentry->d_inode->i_nlink = itohi2(old_dentry->d_inode)->i_nlink;
-+
-+ out_lock:
-+	/* was: unlock_dir(hidden_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_dir_dentry);
-+
-+	dput(hidden_new_dentry);
-+	dput(hidden_old_dentry);
-+	if (!new_dentry->d_inode)
-+		d_drop(new_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_unlink(inode_t *dir, dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	dget(dentry);
-+	if(dtopd(dentry)->state == MODIFIED) {
-+		err = nondir_mod_to_del(dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == UNMODIFIED) {
-+		err = nondir_unmod_to_del(dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == CREATED) {
-+		err = nondir_creat_to_del(dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == DEL_REWRITTEN) {
-+		err = nondir_del_rew_to_del(dentry);
-+		goto out;
-+	}
-+
-+	printk(KERN_CRIT "mini_fo_unlink: ERROR, invalid state detected.\n");
-+
-+ out:
-+	fist_copy_attr_times(dir, itohi2(dentry->d_parent->d_inode));
-+
-+	if(!err) {
-+		/* is this causing my pain? d_delete(dentry); */
-+		d_drop(dentry);
-+	}
-+
-+	dput(dentry);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_symlink(inode_t *dir, dentry_t *dentry, const char *symname)
-+{
-+	int err=0;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        umode_t mode;
-+#endif
-+
-+	/* Fail if the symlink file exists */
-+	if(!(dtost(dentry) == DELETED ||
-+	     dtost(dentry) == NON_EXISTANT)) {
-+		err = -EEXIST;
-+		goto out;
-+	}
-+
-+	err = get_neg_sto_dentry(dentry);
-+	if(err) {
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	dget(hidden_sto_dentry);
-+	/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	mode = S_IALLUGO;
-+	err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
-+			  hidden_sto_dentry, symname, mode);
-+#else
-+	err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
-+			  hidden_sto_dentry,
-+			  symname);
-+#endif
-+	if (err || !hidden_sto_dentry->d_inode)
-+                goto out_lock;
-+
-+        if(dtost(dentry) == DELETED) {
-+                dtost(dentry) = DEL_REWRITTEN;
-+                err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        } else if(dtost(dentry) == NON_EXISTANT) {
-+                dtost(dentry) = CREATED;
-+                err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        }
-+	fist_copy_attr_timesizes(dir, hidden_sto_dir_dentry->d_inode);
-+
-+ out_lock:
-+        /* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+
-+        dput(hidden_sto_dentry);
-+        if (!dentry->d_inode)
-+                d_drop(dentry);
-+ out:
-+        return err;
-+}
-+
-+STATIC int
-+mini_fo_mkdir(inode_t *dir, dentry_t *dentry, int mode)
-+{
-+	int err;
-+
-+	err = create_sto_dir(dentry, mode);
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_rmdir(inode_t *dir, dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+	dentry_t *meta_dentry;
-+	inode_t *hidden_sto_dir = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+	check_mini_fo_inode(dir);
-+
-+	dget(dentry);
-+	if(dtopd(dentry)->state == MODIFIED) {
-+		/* XXX: disabled, because it does not bother to check files on
-+		 * the original filesystem - just a hack, but better than simply
-+		 * removing it without testing */
-+		err = -EINVAL;
-+		goto out;
-+
-+		hidden_sto_dir = itohi2(dir);
-+		hidden_sto_dentry = dtohd2(dentry);
-+
-+		/* was:hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+		hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		/* Delete an old WOL file contained in the storage dir */
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     hidden_sto_dentry,
-+					     strlen(META_FILENAME));
-+		if(meta_dentry->d_inode) {
-+			err = vfs_unlink(hidden_sto_dentry->d_inode, meta_dentry);
-+			dput(meta_dentry);
-+			if(!err)
-+				d_delete(meta_dentry);
-+		}
-+
-+		err = vfs_rmdir(hidden_sto_dir, hidden_sto_dentry);
-+		dput(hidden_sto_dentry);
-+		if(!err)
-+			d_delete(hidden_sto_dentry);
-+
-+		/* propagate number of hard-links */
-+		dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+
-+		dput(dtohd(dentry));
-+
-+		dtohd(dentry) = NULL;
-+		dtopd(dentry)->state = DELETED;
-+
-+		/* carefull with R files */
-+		if( __meta_is_r_entry(dir,
-+				      dentry->d_name.name,
-+				      dentry->d_name.len) == 1) {
-+			err = meta_remove_r_entry(dentry->d_parent,
-+						  dentry->d_name.name,
-+						  dentry->d_name.len);
-+			if(err) {
-+				printk(KERN_CRIT "mini_fo: rmdir: meta_remove_r_entry failed.\n");
-+				goto out;
-+			}
-+		}
-+		else {
-+			/* ok, add deleted file to META */
-+			meta_add_d_entry(dentry->d_parent,
-+					 dentry->d_name.name,
-+					 dentry->d_name.len);
-+		}
-+		/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+		dput(hidden_sto_dir_dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == UNMODIFIED) {
-+		/* XXX: simply adding it to the delete list here is fscking dangerous!
-+		 * as a temporary hack, i will disable rmdir on unmodified directories
-+		 * for now.
-+		 */
-+		err = -EINVAL;
-+		goto out;
-+
-+		err = get_neg_sto_dentry(dentry);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+
-+		/* dput base dentry, this will relase the inode and free the
-+		 * dentry, as we will never need it again. */
-+		dput(dtohd(dentry));
-+		dtohd(dentry) = NULL;
-+		dtopd(dentry)->state = DELETED;
-+
-+		/* add deleted file to META-file */
-+		meta_add_d_entry(dentry->d_parent,
-+				 dentry->d_name.name,
-+				 dentry->d_name.len);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == CREATED) {
-+		hidden_sto_dir = itohi2(dir);
-+		hidden_sto_dentry = dtohd2(dentry);
-+
-+		/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
-+		hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		/* Delete an old WOL file contained in the storage dir */
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     hidden_sto_dentry,
-+					     strlen(META_FILENAME));
-+		if(meta_dentry->d_inode) {
-+			/* is this necessary? dget(meta_dentry); */
-+			err = vfs_unlink(hidden_sto_dentry->d_inode,
-+					 meta_dentry);
-+			dput(meta_dentry);
-+			if(!err)
-+				d_delete(meta_dentry);
-+		}
-+
-+		err = vfs_rmdir(hidden_sto_dir, hidden_sto_dentry);
-+		dput(hidden_sto_dentry);
-+		if(!err)
-+			d_delete(hidden_sto_dentry);
-+
-+		/* propagate number of hard-links */
-+		dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+		dtopd(dentry)->state = NON_EXISTANT;
-+
-+		/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+		dput(hidden_sto_dir_dentry);
-+
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == DEL_REWRITTEN) {
-+		hidden_sto_dir = itohi2(dir);
-+		hidden_sto_dentry = dtohd2(dentry);
-+
-+		/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
-+		hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		/* Delete an old WOL file contained in the storage dir */
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     hidden_sto_dentry,
-+					     strlen(META_FILENAME));
-+		if(meta_dentry->d_inode) {
-+			/* is this necessary? dget(meta_dentry); */
-+			err = vfs_unlink(hidden_sto_dentry->d_inode,
-+					 meta_dentry);
-+			dput(meta_dentry);
-+			if(!err)
-+				d_delete(meta_dentry);
-+		}
-+
-+		err = vfs_rmdir(hidden_sto_dir, hidden_sto_dentry);
-+		dput(hidden_sto_dentry);
-+		if(!err)
-+			d_delete(hidden_sto_dentry);
-+
-+		/* propagate number of hard-links */
-+		dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+		dtopd(dentry)->state = DELETED;
-+		/* was: unlock_dir(hidden_sto_dir_dentry); */
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+		dput(hidden_sto_dir_dentry);
-+		goto out;
-+	}
-+
-+	printk(KERN_CRIT "mini_fo_rmdir: ERROR, invalid state detected.\n");
-+
-+ out:
-+	if(!err) {
-+		d_drop(dentry);
-+	}
-+
-+	fist_copy_attr_times(dir, itohi2(dentry->d_parent->d_inode));
-+	dput(dentry);
-+
-+	return err;
-+}
-+
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_mknod(inode_t *dir, dentry_t *dentry, int mode, dev_t dev)
-+#else
-+mini_fo_mknod(inode_t *dir, dentry_t *dentry, int mode, int dev)
-+#endif
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	err = create_sto_nod(dentry, mode, dev);
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo_mknod: creating sto nod failed.\n");
-+		err = -EINVAL;
-+	}
-+
-+	check_mini_fo_dentry(dentry);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_rename(inode_t *old_dir, dentry_t *old_dentry,
-+	       inode_t *new_dir, dentry_t *new_dentry)
-+{
-+	/* dispatch */
-+	if(S_ISDIR(old_dentry->d_inode->i_mode))
-+		return rename_directory(old_dir, old_dentry, new_dir, new_dentry);
-+	return rename_nondir(old_dir, old_dentry, new_dir, new_dentry);
-+
-+}
-+
-+int rename_directory(inode_t *old_dir, dentry_t *old_dentry,
-+		     inode_t *new_dir, dentry_t *new_dentry)
-+{
-+	int err, bpath_len;
-+	char *bpath;
-+
-+	dentry_t *hidden_old_dentry;
-+	dentry_t *hidden_new_dentry;
-+	dentry_t *hidden_old_dir_dentry;
-+	dentry_t *hidden_new_dir_dentry;
-+
-+	err = 0;
-+	bpath = NULL;
-+	bpath_len = 0;
-+
-+	/* this is a test, chuck out if it works */
-+	if(!(dtopd(new_dentry)->state == DELETED ||
-+	     dtopd(new_dentry)->state == NON_EXISTANT)) {
-+		printk(KERN_CRIT "mini_fo: rename_directory: \
-+                                  uh, ah, new_dentry not negative.\n");
-+		/* return -1; */
-+	}
-+
-+	/* state = UNMODIFIED */
-+	if(dtopd(old_dentry)->state == UNMODIFIED) {
-+		err = dir_unmod_to_mod(old_dentry);
-+		if (err)
-+			goto out;
-+	}
-+
-+	/* state = MODIFIED */
-+	if(dtopd(old_dentry)->state == MODIFIED) {
-+		bpath = meta_check_r_entry(old_dentry->d_parent,
-+					   old_dentry->d_name.name,
-+					   old_dentry->d_name.len);
-+		if(bpath) {
-+			err = meta_remove_r_entry(old_dentry->d_parent,
-+						  old_dentry->d_name.name,
-+						  old_dentry->d_name.len);
-+			if(err) {
-+				printk(KERN_CRIT "mini_fo: rename_directory:\
-+                                                   meta_remove_r_entry \
-+                                                  failed.\n");
-+				goto out;
-+			}
-+			err = meta_add_r_entry(new_dentry->d_parent,
-+					       bpath,
-+					       strlen(bpath),
-+					       new_dentry->d_name.name,
-+					       new_dentry->d_name.len);
-+			kfree(bpath);
-+		}
-+		else {/* wol it */
-+			err = meta_add_d_entry(old_dentry->d_parent,
-+					       old_dentry->d_name.name,
-+					       old_dentry->d_name.len);
-+			if (err)
-+				goto out;
-+			/* put it on rename list */
-+			err = get_mini_fo_bpath(old_dentry,
-+						&bpath,
-+						&bpath_len);
-+			if (err)
-+				goto out;
-+			err = meta_add_r_entry(new_dentry->d_parent,
-+					       bpath, bpath_len,
-+					       new_dentry->d_name.name,
-+					       new_dentry->d_name.len);
-+			if (err)
-+				goto out;
-+		}
-+		/* no state change, MODIFIED stays MODIFIED */
-+	}
-+	/* state = CREATED */
-+	if(dtopd(old_dentry)->state == CREATED ||
-+	   dtopd(old_dentry)->state == DEL_REWRITTEN) {
-+		if(dtohd(old_dentry))
-+			dput(dtohd(old_dentry));
-+
-+		if(dtopd(new_dentry)->state == DELETED) {
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+			dtohd(old_dentry) = NULL;
-+		}
-+		else if(dtopd(new_dentry)->state == NON_EXISTANT) {
-+			dtopd(old_dentry)->state = CREATED;
-+			/* steal new dentry's neg. base dentry */
-+			dtohd(old_dentry) = dtohd(new_dentry);
-+			dtohd(new_dentry) = NULL;
-+		}
-+	}
-+	if(dtopd(new_dentry)->state == UNMODIFIED ||
-+	   dtopd(new_dentry)->state == NON_EXISTANT) {
-+		err = get_neg_sto_dentry(new_dentry);
-+		if(err)
-+			goto out;
-+	}
-+
-+	/* now move sto file */
-+	hidden_old_dentry = dtohd2(old_dentry);
-+	hidden_new_dentry = dtohd2(new_dentry);
-+
-+	dget(hidden_old_dentry);
-+	dget(hidden_new_dentry);
-+
-+	hidden_old_dir_dentry = dget(hidden_old_dentry->d_parent);
-+	hidden_new_dir_dentry = dget(hidden_new_dentry->d_parent);
-+	double_lock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+
-+	err = vfs_rename(hidden_old_dir_dentry->d_inode, hidden_old_dentry,
-+			 hidden_new_dir_dentry->d_inode, hidden_new_dentry);
-+	if(err)
-+		goto out_lock;
-+
-+	fist_copy_attr_all(new_dir, hidden_new_dir_dentry->d_inode);
-+	if (new_dir != old_dir)
-+		fist_copy_attr_all(old_dir,
-+				   hidden_old_dir_dentry->d_inode);
-+
-+ out_lock:
-+	/* double_unlock will dput the new/old parent dentries
-+	 * whose refcnts were incremented via get_parent above. */
-+	double_unlock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+	dput(hidden_new_dentry);
-+	dput(hidden_old_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+int rename_nondir(inode_t *old_dir, dentry_t *old_dentry,
-+		  inode_t *new_dir, dentry_t *new_dentry)
-+{
-+	int err=0;
-+
-+	check_mini_fo_dentry(old_dentry);
-+	check_mini_fo_dentry(new_dentry);
-+	check_mini_fo_inode(old_dir);
-+	check_mini_fo_inode(new_dir);
-+
-+	/* state: UNMODIFIED */
-+	if(dtost(old_dentry) == UNMODIFIED) {
-+		err = nondir_unmod_to_mod(old_dentry, 1);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+	}
-+
-+	/* the easy states */
-+	if(exists_in_storage(old_dentry)) {
-+
-+		dentry_t *hidden_old_dentry;
-+		dentry_t *hidden_new_dentry;
-+		dentry_t *hidden_old_dir_dentry;
-+		dentry_t *hidden_new_dir_dentry;
-+
-+		/* if old file is MODIFIED, add it to the deleted_list */
-+		if(dtopd(old_dentry)->state == MODIFIED) {
-+			meta_add_d_entry(old_dentry->d_parent,
-+					 old_dentry->d_name.name,
-+					 old_dentry->d_name.len);
-+
-+			dput(dtohd(old_dentry));
-+		}
-+		/* if old file is CREATED, we only release the base dentry */
-+		if(dtopd(old_dentry)->state == CREATED) {
-+			if(dtohd(old_dentry))
-+				dput(dtohd(old_dentry));
-+		}
-+
-+		/* now setup the new states (depends on new_dentry state) */
-+		/* new dentry state =  MODIFIED */
-+		if(dtopd(new_dentry)->state == MODIFIED) {
-+			meta_add_d_entry(new_dentry->d_parent,
-+					 new_dentry->d_name.name,
-+					 new_dentry->d_name.len);
-+
-+			/* new dentry will be d_put'ed later by the vfs
-+			 * so don't do it here
-+			 * dput(dtohd(new_dentry));
-+			 */
-+			dtohd(old_dentry) = NULL;
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+		}
-+		/* new dentry state =  UNMODIFIED */
-+		else if(dtopd(new_dentry)->state == UNMODIFIED) {
-+			if(get_neg_sto_dentry(new_dentry))
-+				return -EINVAL;
-+
-+			meta_add_d_entry(new_dentry->d_parent,
-+					 new_dentry->d_name.name,
-+					 new_dentry->d_name.len);
-+
-+			/* is this right??? */
-+			/*dput(dtohd(new_dentry));*/
-+			dtohd(old_dentry) = NULL;
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+		}
-+		/* new dentry state =  CREATED */
-+		else if(dtopd(new_dentry)->state == CREATED) {
-+			/* we keep the neg. base dentry (if exists) */
-+			dtohd(old_dentry) = dtohd(new_dentry);
-+			/* ...and set it to Null, or we'll get
-+			 * dcache.c:345 if it gets dput twice... */
-+			dtohd(new_dentry) = NULL;
-+			dtopd(old_dentry)->state = CREATED;
-+		}
-+		/* new dentry state =  NON_EXISTANT */
-+		else if(dtopd(new_dentry)->state == NON_EXISTANT) {
-+			if(get_neg_sto_dentry(new_dentry))
-+				return -EINVAL;
-+
-+			/* we keep the neg. base dentry (if exists) */
-+			dtohd(old_dentry) = dtohd(new_dentry);
-+			/* ...and set it to Null, or we'll get
-+			 * Dr. dcache.c:345 if it gets dput twice... */
-+			dtohd(new_dentry) = NULL;
-+			dtopd(old_dentry)->state = CREATED;
-+		}
-+		/* new dentry state =  DEL_REWRITTEN or DELETED */
-+		else if(dtopd(new_dentry)->state == DEL_REWRITTEN ||
-+			dtopd(new_dentry)->state == DELETED) {
-+			dtohd(old_dentry) = NULL;
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+		}
-+		else { /* not possible, uhh, ahh */
-+			printk(KERN_CRIT
-+			       "mini_fo: rename_reg_file: invalid state detected [1].\n");
-+			return -1;
-+		}
-+
-+		/* now we definitely have a sto file */
-+		hidden_old_dentry = dtohd2(old_dentry);
-+		hidden_new_dentry = dtohd2(new_dentry);
-+
-+		dget(hidden_old_dentry);
-+		dget(hidden_new_dentry);
-+
-+		hidden_old_dir_dentry = dget(hidden_old_dentry->d_parent);
-+		hidden_new_dir_dentry = dget(hidden_new_dentry->d_parent);
-+		double_lock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+
-+		err = vfs_rename(hidden_old_dir_dentry->d_inode,
-+				 hidden_old_dentry,
-+				 hidden_new_dir_dentry->d_inode,
-+				 hidden_new_dentry);
-+		if(err)
-+			goto out_lock;
-+
-+		fist_copy_attr_all(new_dir, hidden_new_dir_dentry->d_inode);
-+		if (new_dir != old_dir)
-+			fist_copy_attr_all(old_dir, hidden_old_dir_dentry->d_inode);
-+
-+	out_lock:
-+		/* double_unlock will dput the new/old parent dentries
-+		 * whose refcnts were incremented via get_parent above.
-+		 */
-+		double_unlock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+		dput(hidden_new_dentry);
-+		dput(hidden_old_dentry);
-+	out:
-+		return err;
-+	}
-+	else { /* invalid state */
-+		printk(KERN_CRIT "mini_fo: rename_reg_file: ERROR: invalid state detected [2].\n");
-+		return -1;
-+	}
-+}
-+
-+
-+STATIC int
-+mini_fo_readlink(dentry_t *dentry, char *buf, int bufsiz)
-+{
-+	int err=0;
-+	dentry_t *hidden_dentry = NULL;
-+
-+	if(dtohd2(dentry) && dtohd2(dentry)->d_inode) {
-+		hidden_dentry = dtohd2(dentry);
-+	} else if(dtohd(dentry) && dtohd(dentry)->d_inode) {
-+		hidden_dentry = dtohd(dentry);
-+	} else {
-+		goto out;
-+	}
-+
-+	if (!hidden_dentry->d_inode->i_op ||
-+	    !hidden_dentry->d_inode->i_op->readlink) {
-+		err = -EINVAL;		goto out;
-+	}
-+
-+	err = hidden_dentry->d_inode->i_op->readlink(hidden_dentry,
-+						     buf,
-+						     bufsiz);
-+	if (err > 0)
-+		fist_copy_attr_atime(dentry->d_inode, hidden_dentry->d_inode);
-+
-+ out:
-+	return err;
-+}
-+
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-+static int mini_fo_follow_link(dentry_t *dentry, struct nameidata *nd)
-+#else
-+static void* mini_fo_follow_link(dentry_t *dentry, struct nameidata *nd)
-+#endif
-+{
-+	char *buf;
-+	int len = PAGE_SIZE, err;
-+	mm_segment_t old_fs;
-+
-+	/* in 2.6 this is freed by mini_fo_put_link called by __do_follow_link */
-+	buf = kmalloc(len, GFP_KERNEL);
-+	if (!buf) {
-+		err = -ENOMEM;
-+		goto out;
-+	}
-+
-+	/* read the symlink, and then we will follow it */
-+	old_fs = get_fs();
-+	set_fs(KERNEL_DS);
-+	err = dentry->d_inode->i_op->readlink(dentry, buf, len);
-+	set_fs(old_fs);
-+	if (err < 0) {
-+		kfree(buf);
-+		buf = NULL;
-+		goto out;
-+	}
-+	buf[err] = 0;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        nd_set_link(nd, buf);
-+        err = 0;
-+#else
-+	err = vfs_follow_link(nd, buf);
-+#endif
-+
-+ out:
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	kfree(buf);
-+#endif
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-+        return err;
-+#else
-+        return ERR_PTR(err);
-+#endif
-+}
-+
-+STATIC
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-+void mini_fo_put_link(struct dentry *dentry, struct nameidata *nd)
-+#else
-+void mini_fo_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
-+#endif
-+{
-+        char *link;
-+        link = nd_get_link(nd);
-+        kfree(link);
-+}
-+#endif
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_permission(inode_t *inode, int mask, struct nameidata *nd)
-+#else
-+mini_fo_permission(inode_t *inode, int mask)
-+#endif
-+{
-+	inode_t *hidden_inode;
-+	int mode;
-+	int err;
-+
-+	if(itohi2(inode)) {
-+		hidden_inode = itohi2(inode);
-+	} else {
-+		hidden_inode = itohi(inode);
-+	}
-+	mode = inode->i_mode;
-+
-+	/* not really needed, as permission handles everything:
-+	 *	err = vfs_permission(inode, mask);
-+	 *	if (err)
-+	 *		goto out;
-+	 */
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	err = permission(hidden_inode, mask, nd);
-+#else
-+	err = permission(hidden_inode, mask);
-+#endif
-+
-+	/*  out: */
-+	return err;
-+}
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+STATIC int
-+mini_fo_inode_revalidate(dentry_t *dentry)
-+{
-+	int err = 0;
-+	dentry_t *hidden_dentry;
-+	inode_t *hidden_inode;
-+
-+	ASSERT(dentry->d_inode);
-+	ASSERT(itopd(dentry->d_inode));
-+
-+	if(itohi2(dentry->d_inode)) {
-+                hidden_dentry = dtohd2(dentry);
-+		hidden_inode = hidden_dentry->d_inode;
-+	} else if(itohi(dentry->d_inode)) {
-+                hidden_dentry = dtohd(dentry);
-+		hidden_inode = hidden_dentry->d_inode;
-+	} else {
-+                printk(KERN_CRIT "mini_fo_inode_revalidate: ERROR, invalid state detected.\n");
-+                err = -ENOENT;
-+                goto out;
-+        }
-+	if (hidden_inode && hidden_inode->i_op && hidden_inode->i_op->revalidate){
-+		err = hidden_inode->i_op->revalidate(hidden_dentry);
-+		if (err)
-+			goto out;
-+	}
-+	fist_copy_attr_all(dentry->d_inode, hidden_inode);
-+ out:
-+	return err;
-+}
-+#endif
-+
-+STATIC int
-+mini_fo_setattr(dentry_t *dentry, struct iattr *ia)
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(!is_mini_fo_existant(dentry)) {
-+		printk(KERN_CRIT "mini_fo_setattr: ERROR, invalid state detected [1].\n");
-+		goto out;
-+	}
-+
-+	if(dtost(dentry) == UNMODIFIED) {
-+		if(!IS_COPY_FLAG(ia->ia_valid))
-+			goto out; /* we ignore these changes to base */
-+
-+		if(S_ISDIR(dentry->d_inode->i_mode)) {
-+			err = dir_unmod_to_mod(dentry);
-+		} else {
-+			/* we copy contents if file is not beeing truncated */
-+			if(S_ISREG(dentry->d_inode->i_mode) &&
-+			   !(ia->ia_size == 0 && (ia->ia_valid & ATTR_SIZE))) {
-+				err = nondir_unmod_to_mod(dentry, 1);
-+			} else
-+				err = nondir_unmod_to_mod(dentry, 0);
-+		}
-+		if(err) {
-+			err = -EINVAL;
-+			printk(KERN_CRIT "mini_fo_setattr: ERROR changing states.\n");
-+			goto out;
-+		}
-+	}
-+	if(!exists_in_storage(dentry)) {
-+		printk(KERN_CRIT "mini_fo_setattr: ERROR, invalid state detected [2].\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	ASSERT(dentry->d_inode);
-+	ASSERT(dtohd2(dentry));
-+	ASSERT(itopd(dentry->d_inode));
-+	ASSERT(itohi2(dentry->d_inode));
-+
-+	err = notify_change(dtohd2(dentry), ia);
-+	fist_copy_attr_all(dentry->d_inode, itohi2(dentry->d_inode));
-+ out:
-+	return err;
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+STATIC int
-+mini_fo_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
-+{
-+	int err = 0;
-+        dentry_t *hidden_dentry;
-+
-+	ASSERT(dentry->d_inode);
-+	ASSERT(itopd(dentry->d_inode));
-+
-+	if(itohi2(dentry->d_inode)) {
-+                hidden_dentry = dtohd2(dentry);
-+	} else if(itohi(dentry->d_inode)) {
-+                hidden_dentry = dtohd(dentry);
-+	} else {
-+                printk(KERN_CRIT "mini_fo_getattr: ERROR, invalid state detected.\n");
-+                err = -ENOENT;
-+                goto out;
-+        }
-+	fist_copy_attr_all(dentry->d_inode, hidden_dentry->d_inode);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	generic_fillattr(dentry->d_inode, stat);
-+	if (!stat->blksize) {
-+		struct super_block *s = hidden_dentry->d_inode->i_sb;
-+		unsigned blocks;
-+		blocks = (stat->size+s->s_blocksize-1) >> s->s_blocksize_bits;
-+		stat->blocks = (s->s_blocksize / 512) * blocks;
-+		stat->blksize = s->s_blocksize;
-+	}
-+ out:
-+        return err;
-+}
-+#endif
-+
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+#if 0 /* no xattr_alloc() and xattr_free() */
-+/* This is lifted from fs/xattr.c */
-+static void *
-+xattr_alloc(size_t size, size_t limit)
-+{
-+	void *ptr;
-+
-+	if (size > limit)
-+		return ERR_PTR(-E2BIG);
-+
-+	if (!size)	/* size request, no buffer is needed */
-+		return NULL;
-+	else if (size <= PAGE_SIZE)
-+		ptr = kmalloc((unsigned long) size, GFP_KERNEL);
-+	else
-+		ptr = vmalloc((unsigned long) size);
-+	if (!ptr)
-+		return ERR_PTR(-ENOMEM);
-+	return ptr;
-+}
-+
-+static void
-+xattr_free(void *ptr, size_t size)
-+{
-+	if (!size)	/* size request, no buffer was needed */
-+		return;
-+	else if (size <= PAGE_SIZE)
-+		kfree(ptr);
-+	else
-+		vfree(ptr);
-+}
-+#endif /* no xattr_alloc() and xattr_free() */
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+mini_fo_getxattr(struct dentry *dentry, const char *name, void *value, size_t size) {
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+	/* Define these anyway so we don't need as much ifdef'ed code. */
-+	char *encoded_name = NULL;
-+	char *encoded_value = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->getxattr) {
-+		encoded_name = (char *)name;
-+		encoded_value = (char *)value;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->getxattr(hidden_dentry, encoded_name, encoded_value, size);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,21) \
-+     && LINUX_VERSION_CODE <= KERNEL_VERSION(2,4,23)) \
-+     || LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
-+mini_fo_setxattr(struct dentry *dentry, const char *name,
-+		 const void *value, size_t size, int flags)
-+#else
-+mini_fo_setxattr(struct dentry *dentry, const char *name,
-+		 void *value, size_t size, int flags)
-+#endif
-+
-+{
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+
-+	/* Define these anyway, so we don't have as much ifdef'ed code. */
-+	char *encoded_value = NULL;
-+	char *encoded_name = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->setxattr) {
-+		encoded_name = (char *)name;
-+		encoded_value = (char *)value;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->setxattr(hidden_dentry, encoded_name, encoded_value, size, flags);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+mini_fo_removexattr(struct dentry *dentry, const char *name) {
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+	char *encoded_name;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->removexattr) {
-+		encoded_name = (char *)name;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->removexattr(hidden_dentry, encoded_name);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+mini_fo_listxattr(struct dentry *dentry, char *list, size_t size) {
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+	char *encoded_list = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->listxattr) {
-+		encoded_list = list;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->listxattr(hidden_dentry, encoded_list, size);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+# endif /* defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)) */
-+
-+struct inode_operations mini_fo_symlink_iops =
-+	{
-+		readlink:	mini_fo_readlink,
-+		follow_link: mini_fo_follow_link,
-+		/* mk: permission:	mini_fo_permission, */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		revalidate:	mini_fo_inode_revalidate,
-+#endif
-+		setattr:	mini_fo_setattr,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		getattr:	mini_fo_getattr,
-+		put_link:       mini_fo_put_link,
-+#endif
-+
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+		setxattr:	mini_fo_setxattr,
-+		getxattr:	mini_fo_getxattr,
-+		listxattr:	mini_fo_listxattr,
-+		removexattr: mini_fo_removexattr
-+# endif /* defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)) */
-+	};
-+
-+struct inode_operations mini_fo_dir_iops =
-+	{
-+		create:	mini_fo_create,
-+		lookup:	mini_fo_lookup,
-+		link:	mini_fo_link,
-+		unlink:	mini_fo_unlink,
-+		symlink:	mini_fo_symlink,
-+		mkdir:	mini_fo_mkdir,
-+		rmdir:	mini_fo_rmdir,
-+		mknod:	mini_fo_mknod,
-+		rename:	mini_fo_rename,
-+		/* no readlink/follow_link for non-symlinks */
-+		// off because we have setattr
-+		//    truncate:	mini_fo_truncate,
-+		/* mk:permission:	mini_fo_permission, */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		revalidate:	mini_fo_inode_revalidate,
-+#endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		getattr:	mini_fo_getattr,
-+#endif
-+		setattr:	mini_fo_setattr,
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+		setxattr:	mini_fo_setxattr,
-+		getxattr:	mini_fo_getxattr,
-+		listxattr:	mini_fo_listxattr,
-+		removexattr: mini_fo_removexattr
-+# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */
-+	};
-+
-+struct inode_operations mini_fo_main_iops =
-+	{
-+		/* permission:	mini_fo_permission, */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		revalidate:	mini_fo_inode_revalidate,
-+#endif
-+		setattr:	mini_fo_setattr,
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		getattr:	mini_fo_getattr,
-+#endif
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+		setxattr:	mini_fo_setxattr,
-+		getxattr:	mini_fo_getxattr,
-+		listxattr:	mini_fo_listxattr,
-+		removexattr:    mini_fo_removexattr
-+# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */
-+	};
---- /dev/null
-+++ b/fs/mini_fo/main.c
-@@ -0,0 +1,423 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+#include <linux/module.h>
-+
-+/* This definition must only appear after we include <linux/module.h> */
-+#ifndef MODULE_LICENSE
-+# define MODULE_LICENSE(bison)
-+#endif /* not MODULE_LICENSE */
-+
-+/*
-+ * This is the mini_fo tri interpose function, which extends the
-+ * functionality of the regular interpose by interposing a higher
-+ * level inode on top of two lower level ones: the base filesystem
-+ * inode and the storage filesystem inode.
-+ *
-+ *  sb we pass is mini_fo's super_block
-+ */
-+int
-+mini_fo_tri_interpose(dentry_t *hidden_dentry,
-+		      dentry_t *hidden_sto_dentry,
-+		      dentry_t *dentry, super_block_t *sb, int flag)
-+{
-+	inode_t *hidden_inode = NULL;
-+	inode_t *hidden_sto_inode = NULL; /* store corresponding storage inode */
-+	int err = 0;
-+	inode_t *inode;
-+
-+	/* Pointer to hidden_sto_inode if exists, else to hidden_inode.
-+	 * This is used to copy the attributes of the correct inode. */
-+	inode_t *master_inode;
-+
-+	if(hidden_dentry)
-+		hidden_inode = hidden_dentry->d_inode;
-+	if(hidden_sto_dentry)
-+		hidden_sto_inode = hidden_sto_dentry->d_inode;
-+
-+	ASSERT(dentry->d_inode == NULL);
-+
-+	/* mk: One of the inodes associated with the dentrys is likely to
-+	 * be NULL, so carefull:
-+	 */
-+	ASSERT((hidden_inode != NULL) || (hidden_sto_inode != NULL));
-+
-+	if(hidden_sto_inode)
-+		master_inode = hidden_sto_inode;
-+	else
-+		master_inode = hidden_inode;
-+
-+	/*
-+	 * We allocate our new inode below, by calling iget.
-+	 * iget will call our read_inode which will initialize some
-+	 * of the new inode's fields
-+	 */
-+
-+	/*
-+	 * original: inode = iget(sb, hidden_inode->i_ino);
-+	 */
-+	inode = iget(sb, iunique(sb, 25));
-+	if (!inode) {
-+		err = -EACCES;		/* should be impossible??? */
-+		goto out;
-+	}
-+
-+	/*
-+	 * interpose the inode if not already interposed
-+	 *   this is possible if the inode is being reused
-+	 * XXX: what happens if we get_empty_inode() but there's another already?
-+	 * for now, ASSERT() that this can't happen; fix later.
-+	 */
-+	if (itohi(inode) != NULL) {
-+		printk(KERN_CRIT "mini_fo_tri_interpose: itohi(inode) != NULL.\n");
-+	}
-+	if (itohi2(inode) != NULL) {
-+		printk(KERN_CRIT "mini_fo_tri_interpose: itohi2(inode) != NULL.\n");
-+	}
-+
-+	/* mk: Carefull, igrab can't handle NULL inodes (ok, why should it?), so
-+	 * we need to check here:
-+	 */
-+	if(hidden_inode)
-+		itohi(inode) = igrab(hidden_inode);
-+	else
-+		itohi(inode) = NULL;
-+
-+	if(hidden_sto_inode)
-+		itohi2(inode) = igrab(hidden_sto_inode);
-+	else
-+		itohi2(inode) = NULL;
-+
-+
-+	/* Use different set of inode ops for symlinks & directories*/
-+	if (S_ISLNK(master_inode->i_mode))
-+		inode->i_op = &mini_fo_symlink_iops;
-+	else if (S_ISDIR(master_inode->i_mode))
-+		inode->i_op = &mini_fo_dir_iops;
-+
-+	/* Use different set of file ops for directories */
-+	if (S_ISDIR(master_inode->i_mode))
-+		inode->i_fop = &mini_fo_dir_fops;
-+
-+	/* properly initialize special inodes */
-+	if (S_ISBLK(master_inode->i_mode) || S_ISCHR(master_inode->i_mode) ||
-+	    S_ISFIFO(master_inode->i_mode) || S_ISSOCK(master_inode->i_mode)) {
-+		init_special_inode(inode, master_inode->i_mode, master_inode->i_rdev);
-+	}
-+
-+	/* Fix our inode's address operations to that of the lower inode */
-+	if (inode->i_mapping->a_ops != master_inode->i_mapping->a_ops) {
-+		inode->i_mapping->a_ops = master_inode->i_mapping->a_ops;
-+	}
-+
-+	/* only (our) lookup wants to do a d_add */
-+	if (flag)
-+		d_add(dentry, inode);
-+	else
-+		d_instantiate(dentry, inode);
-+
-+	ASSERT(dtopd(dentry) != NULL);
-+
-+	/* all well, copy inode attributes */
-+	fist_copy_attr_all(inode, master_inode);
-+
-+ out:
-+	return err;
-+}
-+
-+/* parse mount options "base=" and "sto=" */
-+dentry_t *
-+mini_fo_parse_options(super_block_t *sb, char *options)
-+{
-+	dentry_t *hidden_root = ERR_PTR(-EINVAL);
-+	dentry_t *hidden_root2 = ERR_PTR(-EINVAL);
-+	struct nameidata nd, nd2;
-+	char *name, *tmp, *end;
-+	int err = 0;
-+
-+	/* We don't want to go off the end of our arguments later on. */
-+	for (end = options; *end; end++);
-+
-+	while (options < end) {
-+		tmp = options;
-+		while (*tmp && *tmp != ',')
-+			tmp++;
-+		*tmp = '\0';
-+		if (!strncmp("base=", options, 5)) {
-+			name = options + 5;
-+			printk(KERN_INFO "mini_fo: using base directory: %s\n", name);
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+			if (path_init(name, LOOKUP_FOLLOW, &nd))
-+				err = path_walk(name, &nd);
-+#else
-+			err = path_lookup(name, LOOKUP_FOLLOW, &nd);
-+#endif
-+			if (err) {
-+				printk(KERN_CRIT "mini_fo: error accessing hidden directory '%s'\n", name);
-+				hidden_root = ERR_PTR(err);
-+				goto out;
-+			}
-+			hidden_root = nd.dentry;
-+			stopd(sb)->base_dir_dentry = nd.dentry;
-+			stopd(sb)->hidden_mnt = nd.mnt;
-+
-+		} else if(!strncmp("sto=", options, 4)) {
-+			/* parse the storage dir */
-+			name = options + 4;
-+			printk(KERN_INFO "mini_fo: using storage directory: %s\n", name);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+			if(path_init(name, LOOKUP_FOLLOW, &nd2))
-+				err = path_walk(name, &nd2);
-+#else
-+                        err = path_lookup(name, LOOKUP_FOLLOW, &nd2);
-+#endif
-+			if(err) {
-+				printk(KERN_CRIT "mini_fo: error accessing hidden storage directory '%s'\n", name);
-+
-+				hidden_root2 = ERR_PTR(err);
-+				goto out;
-+			}
-+			hidden_root2 = nd2.dentry;
-+			stopd(sb)->storage_dir_dentry = nd2.dentry;
-+			stopd(sb)->hidden_mnt2 = nd2.mnt;
-+			stohs2(sb) = hidden_root2->d_sb;
-+
-+			/* validate storage dir, this is done in
-+			 * mini_fo_read_super for the base directory.
-+			 */
-+			if (IS_ERR(hidden_root2)) {
-+				printk(KERN_WARNING "mini_fo_parse_options: storage dentry lookup failed (err = %ld)\n", PTR_ERR(hidden_root2));
-+				goto out;
-+			}
-+			if (!hidden_root2->d_inode) {
-+				printk(KERN_WARNING "mini_fo_parse_options: no storage dir to interpose on.\n");
-+				goto out;
-+			}
-+			stohs2(sb) = hidden_root2->d_sb;
-+		} else {
-+			printk(KERN_WARNING "mini_fo: unrecognized option '%s'\n", options);
-+			hidden_root = ERR_PTR(-EINVAL);
-+			goto out;
-+		}
-+		options = tmp + 1;
-+	}
-+
-+ out:
-+	if(IS_ERR(hidden_root2))
-+		return hidden_root2;
-+	return hidden_root;
-+}
-+
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+static int
-+#else
-+super_block_t *
-+#endif
-+mini_fo_read_super(super_block_t *sb, void *raw_data, int silent)
-+{
-+	dentry_t *hidden_root;
-+	int err = 0;
-+
-+	if (!raw_data) {
-+		printk(KERN_WARNING "mini_fo_read_super: missing argument\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	/*
-+	 * Allocate superblock private data
-+	 */
-+	__stopd(sb) = kmalloc(sizeof(struct mini_fo_sb_info), GFP_KERNEL);
-+	if (!stopd(sb)) {
-+		printk(KERN_WARNING "%s: out of memory\n", __FUNCTION__);
-+		err = -ENOMEM;
-+		goto out;
-+	}
-+	stohs(sb) = NULL;
-+
-+	hidden_root = mini_fo_parse_options(sb, raw_data);
-+	if (IS_ERR(hidden_root)) {
-+		printk(KERN_WARNING "mini_fo_read_super: lookup_dentry failed (err = %ld)\n", PTR_ERR(hidden_root));
-+		err = PTR_ERR(hidden_root);
-+		goto out_free;
-+	}
-+	if (!hidden_root->d_inode) {
-+		printk(KERN_WARNING "mini_fo_read_super: no directory to interpose on\n");
-+		goto out_free;
-+	}
-+	stohs(sb) = hidden_root->d_sb;
-+
-+	/*
-+	 * Linux 2.4.2-ac3 and beyond has code in
-+	 * mm/filemap.c:generic_file_write() that requires sb->s_maxbytes
-+	 * to be populated.  If not set, all write()s under that sb will
-+	 * return 0.
-+	 *
-+	 * Linux 2.4.4+ automatically sets s_maxbytes to MAX_NON_LFS;
-+	 * the filesystem should override it only if it supports LFS.
-+	 */
-+	/* non-SCA code is good to go with LFS */
-+	sb->s_maxbytes = hidden_root->d_sb->s_maxbytes;
-+
-+	sb->s_op = &mini_fo_sops;
-+	/*
-+	 * we can't use d_alloc_root if we want to use
-+	 * our own interpose function unchanged,
-+	 * so we simply replicate *most* of the code in d_alloc_root here
-+	 */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	sb->s_root = d_alloc(NULL, &(const struct qstr) { "/", 1, 0 });
-+#else
-+	sb->s_root = d_alloc(NULL, &(const struct qstr){hash: 0, name: "/", len : 1});
-+#endif
-+	if (IS_ERR(sb->s_root)) {
-+		printk(KERN_WARNING "mini_fo_read_super: d_alloc failed\n");
-+		err = -ENOMEM;
-+		goto out_dput;
-+	}
-+
-+	sb->s_root->d_op = &mini_fo_dops;
-+	sb->s_root->d_sb = sb;
-+	sb->s_root->d_parent = sb->s_root;
-+
-+	/* link the upper and lower dentries */
-+	__dtopd(sb->s_root) = (struct mini_fo_dentry_info *)
-+		kmalloc(sizeof(struct mini_fo_dentry_info), GFP_KERNEL);
-+	if (!dtopd(sb->s_root)) {
-+		err = -ENOMEM;
-+		goto out_dput2;
-+	}
-+	dtopd(sb->s_root)->state = MODIFIED;
-+	dtohd(sb->s_root) = hidden_root;
-+
-+	/* fanout relevant, interpose on storage root dentry too */
-+	dtohd2(sb->s_root) = stopd(sb)->storage_dir_dentry;
-+
-+	/* ...and call tri-interpose to interpose root dir inodes
-+	 * if (mini_fo_interpose(hidden_root, sb->s_root, sb, 0))
-+	 */
-+	if(mini_fo_tri_interpose(hidden_root, dtohd2(sb->s_root), sb->s_root, sb, 0))
-+		goto out_dput2;
-+
-+	/* initalize the wol list */
-+	itopd(sb->s_root->d_inode)->deleted_list_size = -1;
-+	itopd(sb->s_root->d_inode)->renamed_list_size = -1;
-+	meta_build_lists(sb->s_root);
-+
-+	goto out;
-+
-+ out_dput2:
-+	dput(sb->s_root);
-+ out_dput:
-+	dput(hidden_root);
-+	dput(dtohd2(sb->s_root)); /* release the hidden_sto_dentry too */
-+ out_free:
-+	kfree(stopd(sb));
-+	__stopd(sb) = NULL;
-+ out:
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        return err;
-+#else
-+        if (err) {
-+		return ERR_PTR(err);
-+        } else {
-+		return sb;
-+        }
-+#endif
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+static int mini_fo_get_sb(struct file_system_type *fs_type,
-+					  int flags, const char *dev_name,
-+					  void *raw_data, struct vfsmount *mnt)
-+{
-+	return get_sb_nodev(fs_type, flags, raw_data, mini_fo_read_super, mnt);
-+}
-+#else
-+static struct super_block *mini_fo_get_sb(struct file_system_type *fs_type,
-+					  int flags, const char *dev_name,
-+					  void *raw_data)
-+{
-+	return get_sb_nodev(fs_type, flags, raw_data, mini_fo_read_super);
-+}
-+#endif
-+
-+void mini_fo_kill_block_super(struct super_block *sb)
-+{
-+	generic_shutdown_super(sb);
-+	/*
-+	 *      XXX: BUG: Halcrow: Things get unstable sometime after this point:
-+	 *      lib/rwsem-spinlock.c:127: spin_is_locked on uninitialized
-+	 *      fs/fs-writeback.c:402: spin_lock(fs/super.c:a0381828) already
-+	 *      locked by fs/fs-writeback.c/402
-+	 *
-+	 *      Apparently, someone's not releasing a lock on sb_lock...
-+	 */
-+}
-+
-+static struct file_system_type mini_fo_fs_type = {
-+	.owner          = THIS_MODULE,
-+	.name           = "mini_fo",
-+	.get_sb         = mini_fo_get_sb,
-+	.kill_sb        = mini_fo_kill_block_super,
-+	.fs_flags       = 0,
-+};
-+
-+
-+#else
-+static DECLARE_FSTYPE(mini_fo_fs_type, "mini_fo", mini_fo_read_super, 0);
-+#endif
-+
-+static int __init init_mini_fo_fs(void)
-+{
-+	printk("Registering mini_fo version $Id$\n");
-+	return register_filesystem(&mini_fo_fs_type);
-+}
-+static void __exit exit_mini_fo_fs(void)
-+{
-+	printk("Unregistering mini_fo version $Id$\n");
-+	unregister_filesystem(&mini_fo_fs_type);
-+}
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+EXPORT_NO_SYMBOLS;
-+#endif
-+
-+MODULE_AUTHOR("Erez Zadok <ezk@cs.sunysb.edu>");
-+MODULE_DESCRIPTION("FiST-generated mini_fo filesystem");
-+MODULE_LICENSE("GPL");
-+
-+/* MODULE_PARM(fist_debug_var, "i"); */
-+/* MODULE_PARM_DESC(fist_debug_var, "Debug level"); */
-+
-+module_init(init_mini_fo_fs)
-+module_exit(exit_mini_fo_fs)
---- /dev/null
-+++ b/fs/mini_fo/Makefile
-@@ -0,0 +1,17 @@
-+#
-+# Makefile for mini_fo 2.4 and 2.6 Linux kernels
-+#
-+# Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+#
-+# 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.
-+#
-+
-+obj-$(CONFIG_MINI_FO) := mini_fo.o
-+mini_fo-objs   := meta.o dentry.o file.o inode.o main.o super.o state.o aux.o
-+
-+# dependencies
-+${mini_fo-objs}: mini_fo.h fist.h
-+
---- /dev/null
-+++ b/fs/mini_fo/meta.c
-@@ -0,0 +1,1000 @@
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+int meta_build_lists(dentry_t *dentry)
-+{
-+	struct mini_fo_inode_info *inode_info;
-+
-+	dentry_t *meta_dentry = 0;
-+	file_t *meta_file = 0;
-+	mm_segment_t old_fs;
-+	void *buf;
-+
-+	int bytes, len;
-+	struct vfsmount *meta_mnt;
-+	char *entry;
-+
-+	inode_info = itopd(dentry->d_inode);
-+	if(!(inode_info->deleted_list_size == -1 &&
-+	     inode_info->renamed_list_size == -1)) {
-+		printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                  Error, list(s) not virgin.\n");
-+		return -1;
-+	}
-+
-+	/* init our meta lists */
-+	INIT_LIST_HEAD(&inode_info->deleted_list);
-+	inode_info->deleted_list_size = 0;
-+
-+	INIT_LIST_HEAD(&inode_info->renamed_list);
-+	inode_info->renamed_list_size = 0;
-+
-+  	/* might there be a META-file? */
-+	if(dtohd2(dentry) && dtohd2(dentry)->d_inode) {
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     dtohd2(dentry),
-+					     strlen(META_FILENAME));
-+		if(!meta_dentry->d_inode) {
-+			dput(meta_dentry);
-+			goto out_ok;
-+		}
-+		/* $%& err, is this correct? */
-+		meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+		mntget(meta_mnt);
-+
-+
-+		/* open META-file for reading */
-+		meta_file = dentry_open(meta_dentry, meta_mnt, 0x0);
-+		if(!meta_file || IS_ERR(meta_file)) {
-+			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                          ERROR opening META file.\n");
-+			goto out_err;
-+		}
-+
-+		/* check if fs supports reading */
-+		if(!meta_file->f_op->read) {
-+			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                          ERROR, fs does not support reading.\n");
-+			goto out_err_close;
-+		}
-+
-+		/* allocate a page for transfering the data */
-+		buf = (void *) __get_free_page(GFP_KERNEL);
-+		if(!buf) {
-+			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                          ERROR, out of mem.\n");
-+			goto out_err_close;
-+		}
-+		meta_file->f_pos = 0;
-+		old_fs = get_fs();
-+		set_fs(KERNEL_DS);
-+		do {
-+			char *c;
-+			bytes = meta_file->f_op->read(meta_file, buf, PAGE_SIZE, &meta_file->f_pos);
-+			if(bytes == PAGE_SIZE) {
-+				/* trim a cut off filename and adjust f_pos to get it next time */
-+				for(c = (char*) buf+PAGE_SIZE;
-+				    *c != '\n';
-+				    c--, bytes--, meta_file->f_pos--);
-+			}
-+			entry = (char *) buf;
-+			while(entry < (char *) buf+bytes) {
-+
-+				char *old_path;
-+				char *dir_name;
-+				int old_len, new_len;
-+
-+				/* len without '\n'*/
-+				len = (int) (strchr(entry, '\n') - entry);
-+				switch (*entry) {
-+				case 'D':
-+					/* format: "D filename" */
-+					meta_list_add_d_entry(dentry,
-+							      entry+2,
-+							      len-2);
-+					break;
-+				case 'R':
-+					/* format: "R path/xy/dir newDir" */
-+					old_path = entry+2;
-+					dir_name = strchr(old_path, ' ') + 1;
-+					old_len =  dir_name - old_path - 1;
-+					new_len = ((int) entry) + len - ((int ) dir_name);
-+					meta_list_add_r_entry(dentry,
-+							      old_path,
-+							      old_len,
-+							      dir_name,
-+							      new_len);
-+					break;
-+				default:
-+					/* unknown entry type detected */
-+					break;
-+				}
-+				entry += len+1;
-+			}
-+
-+		} while(meta_file->f_pos < meta_dentry->d_inode->i_size);
-+
-+		free_page((unsigned long) buf);
-+		set_fs(old_fs);
-+		fput(meta_file);
-+	}
-+	goto out_ok;
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out_err:
-+	mntput(meta_mnt);
-+	dput(meta_dentry);
-+	return -1;
-+ out_ok:
-+	return 1; /* check this!!! inode_info->wol_size; */
-+}
-+
-+/* cleanups up all lists and free's the mem by dentry */
-+int meta_put_lists(dentry_t *dentry)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk("mini_fo: meta_put_lists: invalid dentry passed.\n");
-+		return -1;
-+	}
-+	return __meta_put_lists(dentry->d_inode);
-+}
-+
-+/* cleanups up all lists and free's the mem by inode */
-+int __meta_put_lists(inode_t *inode)
-+{
-+	int err = 0;
-+	if(!inode || !itopd(inode)) {
-+		printk("mini_fo: __meta_put_lists: invalid inode passed.\n");
-+		return -1;
-+	}
-+	err = __meta_put_d_list(inode);
-+	err |= __meta_put_r_list(inode);
-+	return err;
-+}
-+
-+int meta_sync_lists(dentry_t *dentry)
-+{
-+	int err = 0;
-+	if(!dentry || !dentry->d_inode) {
-+		printk("mini_fo: meta_sync_lists: \
-+                        invalid dentry passed.\n");
-+		return -1;
-+	}
-+	err = meta_sync_d_list(dentry, 0);
-+	err |= meta_sync_r_list(dentry, 1);
-+	return err;
-+}
-+
-+
-+/* remove all D entries from the renamed list and free the mem */
-+int __meta_put_d_list(inode_t *inode)
-+{
-+	struct list_head *tmp;
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: __meta_put_d_list: \
-+                                  invalid inode passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(inode);
-+
-+        /* nuke the DELETED-list */
-+        if(inode_info->deleted_list_size <= 0)
-+		return 0;
-+
-+	while(!list_empty(&inode_info->deleted_list)) {
-+		tmp = inode_info->deleted_list.next;
-+		list_del(tmp);
-+		del_entry = list_entry(tmp, struct deleted_entry, list);
-+		kfree(del_entry->name);
-+		kfree(del_entry);
-+	}
-+	inode_info->deleted_list_size = 0;
-+
-+	return 0;
-+}
-+
-+/* remove all R entries from the renamed list and free the mem */
-+int __meta_put_r_list(inode_t *inode)
-+{
-+	struct list_head *tmp;
-+	struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: meta_put_r_list: invalid inode.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(inode);
-+
-+        /* nuke the RENAMED-list */
-+        if(inode_info->renamed_list_size <= 0)
-+		return 0;
-+
-+	while(!list_empty(&inode_info->renamed_list)) {
-+		tmp = inode_info->renamed_list.next;
-+		list_del(tmp);
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		kfree(ren_entry->new_name);
-+		kfree(ren_entry->old_name);
-+		kfree(ren_entry);
-+	}
-+	inode_info->renamed_list_size = 0;
-+
-+	return 0;
-+}
-+
-+int meta_add_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	int err = 0;
-+	err = meta_list_add_d_entry(dentry, name, len);
-+	err |= meta_write_d_entry(dentry,name,len);
-+	return err;
-+}
-+
-+/* add a D entry to the deleted list */
-+int meta_list_add_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_list_add_d_entry: \
-+                                  invalid dentry passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->deleted_list_size < 0)
-+                return -1;
-+
-+        del_entry = (struct deleted_entry *)
-+		kmalloc(sizeof(struct deleted_entry), GFP_KERNEL);
-+        del_entry->name = (char*) kmalloc(len, GFP_KERNEL);
-+        if(!del_entry || !del_entry->name) {
-+                printk(KERN_CRIT "mini_fo: meta_list_add_d_entry: \
-+                                  out of mem.\n");
-+		kfree(del_entry->name);
-+		kfree(del_entry);
-+                return -ENOMEM;
-+        }
-+
-+        strncpy(del_entry->name, name, len);
-+        del_entry->len = len;
-+
-+        list_add(&del_entry->list, &inode_info->deleted_list);
-+        inode_info->deleted_list_size++;
-+        return 0;
-+}
-+
-+int meta_add_r_entry(dentry_t *dentry,
-+			  const char *old_name, int old_len,
-+			  const char *new_name, int new_len)
-+{
-+	int err = 0;
-+	err = meta_list_add_r_entry(dentry,
-+				    old_name, old_len,
-+				    new_name, new_len);
-+	err |= meta_write_r_entry(dentry,
-+				  old_name, old_len,
-+				  new_name, new_len);
-+	return err;
-+}
-+
-+/* add a R entry to the renamed list */
-+int meta_list_add_r_entry(dentry_t *dentry,
-+			  const char *old_name, int old_len,
-+			  const char *new_name, int new_len)
-+{
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_list_add_r_entry: \
-+                                  invalid dentry passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->renamed_list_size < 0)
-+                return -1;
-+
-+        ren_entry = (struct renamed_entry *)
-+		kmalloc(sizeof(struct renamed_entry), GFP_KERNEL);
-+        ren_entry->old_name = (char*) kmalloc(old_len, GFP_KERNEL);
-+        ren_entry->new_name = (char*) kmalloc(new_len, GFP_KERNEL);
-+
-+        if(!ren_entry || !ren_entry->old_name || !ren_entry->new_name) {
-+                printk(KERN_CRIT "mini_fo: meta_list_add_r_entry: \
-+                                  out of mem.\n");
-+		kfree(ren_entry->new_name);
-+		kfree(ren_entry->old_name);
-+		kfree(ren_entry);
-+                return -ENOMEM;
-+        }
-+
-+        strncpy(ren_entry->old_name, old_name, old_len);
-+        ren_entry->old_len = old_len;
-+        strncpy(ren_entry->new_name, new_name, new_len);
-+        ren_entry->new_len = new_len;
-+
-+        list_add(&ren_entry->list, &inode_info->renamed_list);
-+        inode_info->renamed_list_size++;
-+        return 0;
-+}
-+
-+
-+int meta_remove_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	int err = 0;
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT
-+		       "mini_fo: meta_remove_r_entry: \
-+                        invalid dentry passed.\n");
-+		return -1;
-+	}
-+
-+	err = meta_list_remove_r_entry(dentry, name, len);
-+	err |= meta_sync_lists(dentry);
-+	return err;
-+}
-+
-+int meta_list_remove_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT
-+		       "mini_fo: meta_list_remove_r_entry: \
-+                        invalid dentry passed.\n");
-+		return -1;
-+	}
-+	return __meta_list_remove_r_entry(dentry->d_inode, name, len);
-+}
-+
-+int __meta_list_remove_r_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode))
-+		printk(KERN_CRIT
-+		       "mini_fo: __meta_list_remove_r_entry: \
-+                        invalid inode passed.\n");
-+	inode_info = itopd(inode);
-+
-+        if(inode_info->renamed_list_size < 0)
-+                return -1;
-+        if(inode_info->renamed_list_size == 0)
-+                return 1;
-+
-+	list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		if(ren_entry->new_len != len)
-+			continue;
-+
-+		if(!strncmp(ren_entry->new_name, name, len)) {
-+			list_del(tmp);
-+			kfree(ren_entry->new_name);
-+			kfree(ren_entry->old_name);
-+			kfree(ren_entry);
-+			inode_info->renamed_list_size--;
-+			return 0;
-+		}
-+	}
-+	return 1;
-+}
-+
-+
-+/* append a single D entry to the meta file */
-+int meta_write_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	dentry_t *meta_dentry = 0;
-+        file_t *meta_file = 0;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err;
-+        struct vfsmount *meta_mnt = 0;
-+        char *buf;
-+
-+	err = 0;
-+
-+	if(itopd(dentry->d_inode)->deleted_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	if(dtopd(dentry)->state == UNMODIFIED) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry), strlen (META_FILENAME));
-+
-+	/* We need to create a META-file */
-+        if(!meta_dentry->d_inode) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry,
-+			   S_IRUSR | S_IWUSR,
-+			   NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry,
-+			   S_IRUSR | S_IWUSR);
-+#endif
-+	}
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  ERROR opening meta file.\n");
-+                mntput(meta_mnt); /* $%& is this necessary? */
-+                dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* size: len for name, 1 for \n and 2 for "D " */
-+	buf = (char *) kmalloc(len+3, GFP_KERNEL);
-+	if (!buf) {
-+		printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  out of mem.\n");
-+		return -ENOMEM;
-+	}
-+
-+	buf[0] = 'D';
-+	buf[1] = ' ';
-+	strncpy(buf+2, name, len);
-+	buf[len+2] = '\n';
-+	bytes = meta_file->f_op->write(meta_file, buf, len+3,
-+				       &meta_file->f_pos);
-+	if(bytes != len+3) {
-+		printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  ERROR writing.\n");
-+		err = -1;
-+	}
-+	kfree(buf);
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+}
-+
-+/* append a single R entry to the meta file */
-+int meta_write_r_entry(dentry_t *dentry,
-+		       const char *old_name, int old_len,
-+		       const char *new_name, int new_len)
-+{
-+	dentry_t *meta_dentry = 0;
-+        file_t *meta_file = 0;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err, buf_len;
-+	struct vfsmount *meta_mnt = 0;
-+        char *buf;
-+
-+
-+	err = 0;
-+
-+	if(itopd(dentry->d_inode)->renamed_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* build the storage structure? */
-+	if(dtopd(dentry)->state == UNMODIFIED) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry),
-+				     strlen (META_FILENAME));
-+        if(!meta_dentry->d_inode) {
-+                /* We need to create a META-file */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR, NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR);
-+#endif
-+	}
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-+                                  ERROR opening meta file.\n");
-+                mntput(meta_mnt);
-+                dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* size: 2 for "R ", old_len+new_len for names, 1 blank+1 \n */
-+	buf_len = old_len + new_len + 4;
-+	buf = (char *) kmalloc(buf_len, GFP_KERNEL);
-+	if (!buf) {
-+		printk(KERN_CRIT "mini_fo: meta_write_r_entry: out of mem.\n");
-+		return -ENOMEM;
-+	}
-+
-+	buf[0] = 'R';
-+	buf[1] = ' ';
-+	strncpy(buf + 2, old_name, old_len);
-+	buf[old_len + 2] = ' ';
-+	strncpy(buf + old_len + 3, new_name, new_len);
-+	buf[buf_len -1] = '\n';
-+	bytes = meta_file->f_op->write(meta_file, buf, buf_len, &meta_file->f_pos);
-+	if(bytes != buf_len) {
-+		printk(KERN_CRIT "mini_fo: meta_write_r_entry: ERROR writing.\n");
-+		err = -1;
-+	}
-+
-+	kfree(buf);
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+}
-+
-+/* sync D list to disk, append data if app_flag is 1 */
-+/* check the meta_mnt, which seems not to be used (properly)  */
-+
-+int meta_sync_d_list(dentry_t *dentry, int app_flag)
-+{
-+	dentry_t *meta_dentry;
-+        file_t *meta_file;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err;
-+        struct vfsmount *meta_mnt;
-+        char *buf;
-+
-+	struct list_head *tmp;
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	err = 0;
-+	meta_file=0;
-+	meta_mnt=0;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                  invalid inode passed.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->deleted_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* ok, there is something to sync */
-+
-+	/* build the storage structure? */
-+        if(!dtohd2(dentry) && !itohi2(dentry->d_inode)) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry),
-+				     strlen(META_FILENAME));
-+        if(!meta_dentry->d_inode) {
-+                /* We need to create a META-file */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR, NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR);
-+#endif
-+		app_flag = 0;
-+	}
-+	/* need we truncate the meta file? */
-+	if(!app_flag) {
-+		struct iattr newattrs;
-+                newattrs.ia_size = 0;
-+                newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                down(&meta_dentry->d_inode->i_sem);
-+#endif
-+                err = notify_change(meta_dentry, &newattrs);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                up(&meta_dentry->d_inode->i_sem);
-+#endif
-+
-+                if(err || meta_dentry->d_inode->i_size != 0) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          ERROR truncating meta file.\n");
-+                        goto out_err_close;
-+		}
-+	}
-+
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                  ERROR opening meta file.\n");
-+		/* we don't mntget so we dont't mntput (for now)
-+		 * mntput(meta_mnt);
-+		 */
-+		dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* here we go... */
-+        list_for_each(tmp, &inode_info->deleted_list) {
-+		del_entry = list_entry(tmp, struct deleted_entry, list);
-+
-+		/* size: len for name, 1 for \n and 2 for "D " */
-+		buf = (char *) kmalloc(del_entry->len+3, GFP_KERNEL);
-+		if (!buf) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          out of mem.\n");
-+			return -ENOMEM;
-+		}
-+
-+		buf[0] = 'D';
-+		buf[1] = ' ';
-+		strncpy(buf+2, del_entry->name, del_entry->len);
-+		buf[del_entry->len+2] = '\n';
-+		bytes = meta_file->f_op->write(meta_file, buf,
-+					       del_entry->len+3,
-+					       &meta_file->f_pos);
-+		if(bytes != del_entry->len+3) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          ERROR writing.\n");
-+			err |= -1;
-+		}
-+		kfree(buf);
-+	}
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+
-+}
-+
-+int meta_sync_r_list(dentry_t *dentry, int app_flag)
-+{
-+	dentry_t *meta_dentry;
-+        file_t *meta_file;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err, buf_len;
-+        struct vfsmount *meta_mnt;
-+        char *buf;
-+
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	err = 0;
-+	meta_file=0;
-+	meta_mnt=0;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                  invalid dentry passed.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->deleted_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* ok, there is something to sync */
-+
-+	/* build the storage structure? */
-+        if(!dtohd2(dentry) && !itohi2(dentry->d_inode)) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry),
-+				     strlen(META_FILENAME));
-+        if(!meta_dentry->d_inode) {
-+                /* We need to create a META-file */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR, NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR);
-+#endif
-+		app_flag = 0;
-+	}
-+	/* need we truncate the meta file? */
-+	if(!app_flag) {
-+		struct iattr newattrs;
-+                newattrs.ia_size = 0;
-+                newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                down(&meta_dentry->d_inode->i_sem);
-+#endif
-+                err = notify_change(meta_dentry, &newattrs);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                up(&meta_dentry->d_inode->i_sem);
-+#endif
-+                if(err || meta_dentry->d_inode->i_size != 0) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          ERROR truncating meta file.\n");
-+                        goto out_err_close;
-+		}
-+	}
-+
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                  ERROR opening meta file.\n");
-+		/* we don't mntget so we dont't mntput (for now)
-+		 * mntput(meta_mnt);
-+		 */
-+		dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* here we go... */
-+        list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		/* size:
-+		 * 2 for "R ", old_len+new_len for names, 1 blank+1 \n */
-+		buf_len = ren_entry->old_len + ren_entry->new_len + 4;
-+		buf = (char *) kmalloc(buf_len, GFP_KERNEL);
-+		if (!buf) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          out of mem.\n");
-+			return -ENOMEM;
-+		}
-+		buf[0] = 'R';
-+		buf[1] = ' ';
-+		strncpy(buf + 2, ren_entry->old_name, ren_entry->old_len);
-+		buf[ren_entry->old_len + 2] = ' ';
-+		strncpy(buf + ren_entry->old_len + 3,
-+			ren_entry->new_name, ren_entry->new_len);
-+		buf[buf_len - 1] = '\n';
-+		bytes = meta_file->f_op->write(meta_file, buf,
-+					       buf_len, &meta_file->f_pos);
-+		if(bytes != buf_len) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          ERROR writing.\n");
-+			err |= -1;
-+		}
-+		kfree(buf);
-+	}
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+}
-+
-+int meta_check_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode)
-+		printk(KERN_CRIT "mini_fo: meta_check_d_dentry: \
-+                                  invalid dentry passed.\n");
-+	return __meta_check_d_entry(dentry->d_inode, name, len);
-+}
-+
-+int __meta_check_d_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode))
-+		printk(KERN_CRIT "mini_fo: __meta_check_d_dentry: \
-+                                  invalid inode passed.\n");
-+
-+        inode_info = itopd(inode);
-+
-+        if(inode_info->deleted_list_size <= 0)
-+                return 0;
-+
-+        list_for_each(tmp, &inode_info->deleted_list) {
-+		del_entry = list_entry(tmp, struct deleted_entry, list);
-+		if(del_entry->len != len)
-+			continue;
-+
-+		if(!strncmp(del_entry->name, name, len))
-+			return 1;
-+	}
-+	return 0;
-+}
-+
-+/*
-+ * check if file has been renamed and return path to orig. base dir.
-+ * Implements no error return values so far, what of course sucks.
-+ * String is null terminated.'
-+ */
-+char* meta_check_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry: \
-+                                  invalid dentry passed.\n");
-+		return NULL;
-+	}
-+	return __meta_check_r_entry(dentry->d_inode, name, len);
-+}
-+
-+char* __meta_check_r_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+	char *old_path;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry: \
-+                                  invalid inode passed.\n");
-+		return NULL;
-+	}
-+	inode_info = itopd(inode);
-+
-+        if(inode_info->renamed_list_size <= 0)
-+                return NULL;
-+
-+        list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		if(ren_entry->new_len != len)
-+			continue;
-+
-+		if(!strncmp(ren_entry->new_name, name, len)) {
-+			old_path = (char *)
-+				kmalloc(ren_entry->old_len+1, GFP_KERNEL);
-+			strncpy(old_path,
-+				ren_entry->old_name,
-+				ren_entry->old_len);
-+			old_path[ren_entry->old_len]='\0';
-+			return old_path;
-+		}
-+	}
-+	return NULL;
-+}
-+
-+/*
-+ * This version only checks if entry exists and return:
-+ *     1 if exists,
-+ *     0 if not,
-+ *    -1 if error.
-+ */
-+int meta_is_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry [2]: \
-+                                  invalid dentry passed.\n");
-+		return -1;
-+	}
-+	return __meta_is_r_entry(dentry->d_inode, name, len);
-+}
-+
-+int __meta_is_r_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry [2]: \
-+                                  invalid inode passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(inode);
-+
-+        if(inode_info->renamed_list_size <= 0)
-+                return -1;
-+
-+        list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		if(ren_entry->new_len != len)
-+			continue;
-+
-+		if(!strncmp(ren_entry->new_name, name, len))
-+			return 1;
-+	}
-+	return 0;
-+}
-+
---- /dev/null
-+++ b/fs/mini_fo/mini_fo.h
-@@ -0,0 +1,510 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifndef __MINI_FO_H_
-+#define __MINI_FO_H_
-+
-+#ifdef __KERNEL__
-+
-+/* META stuff */
-+#define META_FILENAME "META_dAfFgHE39ktF3HD2sr"
-+
-+/* use xattrs? */
-+#define XATTR
-+
-+/* File attributes that when changed, result in a file beeing copied to storage */
-+#define COPY_FLAGS ATTR_MODE | ATTR_UID | ATTR_GID | ATTR_SIZE
-+
-+/*
-+ * mini_fo filestates
-+ */
-+#define MODIFIED       1
-+#define UNMODIFIED     2
-+#define CREATED        3
-+#define DEL_REWRITTEN  4
-+#define DELETED        5
-+#define NON_EXISTANT   6
-+
-+/* fist file systems superblock magic */
-+# define MINI_FO_SUPER_MAGIC 0xf15f
-+
-+/*
-+ * STRUCTURES:
-+ */
-+
-+/* mini_fo inode data in memory */
-+struct mini_fo_inode_info {
-+	inode_t *wii_inode;
-+	inode_t *wii_inode2; /* pointer to storage inode */
-+
-+	/* META-data lists */
-+	/* deleted list, ex wol */
-+	struct list_head deleted_list;
-+	int deleted_list_size;
-+
-+	/* renamed list */
-+	struct list_head renamed_list;
-+	int renamed_list_size;
-+
-+	/* add other lists here ... */
-+};
-+
-+/* mini_fo dentry data in memory */
-+struct mini_fo_dentry_info {
-+	dentry_t *wdi_dentry;
-+	dentry_t *wdi_dentry2; /* pointer to  storage dentry */
-+	unsigned int state;  /* state of the mini_fo dentry */
-+};
-+
-+
-+/* mini_fo super-block data in memory */
-+struct mini_fo_sb_info {
-+	super_block_t *wsi_sb, *wsi_sb2; /* mk: might point to the same sb */
-+	struct vfsmount *hidden_mnt, *hidden_mnt2;
-+	dentry_t *base_dir_dentry;
-+	dentry_t *storage_dir_dentry;
-+	;
-+};
-+
-+/* readdir_data, readdir helper struct */
-+struct readdir_data {
-+	struct list_head ndl_list; /* linked list head ptr */
-+	int ndl_size; /* list size */
-+	int sto_done; /* flag to show that the storage dir entries have
-+		       * all been read an now follow base entries */
-+};
-+
-+/* file private data. */
-+struct mini_fo_file_info {
-+	struct file *wfi_file;
-+	struct file *wfi_file2; /* pointer to storage file */
-+	struct readdir_data rd;
-+};
-+
-+/* struct ndl_entry */
-+struct ndl_entry {
-+	struct list_head list;
-+	char *name;
-+	int len;
-+};
-+
-+/********************************
-+ *  META-data structures
-+ ********************************/
-+
-+/* deleted entry */
-+struct deleted_entry {
-+	struct list_head list;
-+	char *name;
-+	int len;
-+};
-+
-+/* renamed entry */
-+struct renamed_entry {
-+	struct list_head list;
-+	char *old_name;     /* old directory with full path */
-+	int old_len;        /* length of above string */
-+	char *new_name;     /* new directory name */
-+	int new_len;        /* length of above string */
-+};
-+
-+/* attr_change entry */
-+struct attr_change_entry {
-+	struct list_head list;
-+	char *name;
-+	int len;
-+};
-+
-+/* link entry */
-+struct link_entry {
-+	struct list_head list;
-+	int links_moved;
-+	int inum_base;
-+	int inum_sto;
-+	char *weird_name;
-+	int weird_name_len;
-+};
-+
-+
-+/* Some other stuff required for mini_fo_filldir64, copied from
-+ * fs/readdir.c
-+ */
-+
-+#define ROUND_UP64(x) (((x)+sizeof(u64)-1) & ~(sizeof(u64)-1))
-+#define NAME_OFFSET(de) ((int) ((de)->d_name - (char *) (de)))
-+
-+
-+struct linux_dirent64 {
-+        u64             d_ino;
-+        s64             d_off;
-+        unsigned short  d_reclen;
-+        unsigned char   d_type;
-+        char            d_name[0];
-+};
-+
-+
-+struct getdents_callback64 {
-+        struct linux_dirent64 * current_dir;
-+        struct linux_dirent64 * previous;
-+        int count;
-+        int error;
-+};
-+
-+struct linux_dirent {
-+	unsigned long   d_ino;
-+	unsigned long   d_off;
-+	unsigned short  d_reclen;
-+	char            d_name[1];
-+};
-+
-+struct getdents_callback {
-+	struct linux_dirent * current_dir;
-+	struct linux_dirent * previous;
-+	int count;
-+	int error;
-+};
-+
-+
-+/*
-+ * MACROS:
-+ */
-+
-+/* file TO private_data */
-+# define ftopd(file) ((struct mini_fo_file_info *)((file)->private_data))
-+# define __ftopd(file) ((file)->private_data)
-+/* file TO hidden_file */
-+# define ftohf(file) ((ftopd(file))->wfi_file)
-+# define ftohf2(file) ((ftopd(file))->wfi_file2)
-+
-+/* inode TO private_data */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+# define itopd(ino) ((struct mini_fo_inode_info *)(ino)->i_private)
-+# define __itopd(ino) ((ino)->i_private)
-+#else
-+# define itopd(ino) ((struct mini_fo_inode_info *)(ino)->u.generic_ip)
-+# define __itopd(ino) ((ino)->u.generic_ip)
-+#endif
-+/* inode TO hidden_inode */
-+# define itohi(ino) (itopd(ino)->wii_inode)
-+# define itohi2(ino) (itopd(ino)->wii_inode2)
-+
-+/* superblock TO private_data */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+# define stopd(super) ((struct mini_fo_sb_info *)(super)->s_fs_info)
-+# define __stopd(super) ((super)->s_fs_info)
-+#else
-+# define stopd(super) ((struct mini_fo_sb_info *)(super)->u.generic_sbp)
-+# define __stopd(super) ((super)->u.generic_sbp)
-+#endif
-+
-+/* unused? # define vfs2priv stopd */
-+/* superblock TO hidden_superblock */
-+
-+# define stohs(super) (stopd(super)->wsi_sb)
-+# define stohs2(super) (stopd(super)->wsi_sb2)
-+
-+/* dentry TO private_data */
-+# define dtopd(dentry) ((struct mini_fo_dentry_info *)(dentry)->d_fsdata)
-+# define __dtopd(dentry) ((dentry)->d_fsdata)
-+/* dentry TO hidden_dentry */
-+# define dtohd(dent) (dtopd(dent)->wdi_dentry)
-+# define dtohd2(dent) (dtopd(dent)->wdi_dentry2)
-+
-+/* dentry to state */
-+# define dtost(dent) (dtopd(dent)->state)
-+# define sbt(sb) ((sb)->s_type->name)
-+
-+#define IS_WRITE_FLAG(flag) (flag & (O_RDWR | O_WRONLY | O_APPEND))
-+#define IS_COPY_FLAG(flag) (flag & (COPY_FLAGS))
-+
-+/* macros to simplify non-SCA code */
-+#  define MALLOC_PAGE_POINTERS(hidden_pages, num_hidden_pages)
-+#  define MALLOC_PAGEDATA_POINTERS(hidden_pages_data, num_hidden_pages)
-+#  define FREE_PAGE_POINTERS(hidden_pages, num)
-+#  define FREE_PAGEDATA_POINTERS(hidden_pages_data, num)
-+#  define FOR_EACH_PAGE
-+#  define CURRENT_HIDDEN_PAGE hidden_page
-+#  define CURRENT_HIDDEN_PAGEDATA hidden_page_data
-+#  define CURRENT_HIDDEN_PAGEINDEX page->index
-+
-+/*
-+ * EXTERNALS:
-+ */
-+extern struct file_operations mini_fo_main_fops;
-+extern struct file_operations mini_fo_dir_fops;
-+extern struct inode_operations mini_fo_main_iops;
-+extern struct inode_operations mini_fo_dir_iops;
-+extern struct inode_operations mini_fo_symlink_iops;
-+extern struct super_operations mini_fo_sops;
-+extern struct dentry_operations mini_fo_dops;
-+extern struct vm_operations_struct mini_fo_shared_vmops;
-+extern struct vm_operations_struct mini_fo_private_vmops;
-+extern struct address_space_operations mini_fo_aops;
-+
-+#if 0 /* unused by mini_fo */
-+extern int mini_fo_interpose(dentry_t *hidden_dentry, dentry_t *this_dentry, super_block_t *sb, int flag);
-+#if defined(FIST_FILTER_DATA) || defined(FIST_FILTER_SCA)
-+extern page_t *mini_fo_get1page(file_t *file, int index);
-+extern int mini_fo_fill_zeros(file_t *file, page_t *page, unsigned from);
-+# endif /* FIST_FILTER_DATA || FIST_FILTER_SCA */
-+
-+
-+#  define mini_fo_hidden_dentry(d) __mini_fo_hidden_dentry(__FILE__,__FUNCTION__,__LINE__,(d))
-+#  define mini_fo_hidden_sto_dentry(d) __mini_fo_hidden_sto_dentry(__FILE__,__FUNCTION__,__LINE__,(d))
-+
-+extern dentry_t *__mini_fo_hidden_dentry(char *file, char *func, int line, dentry_t *this_dentry);
-+extern dentry_t *__mini_fo_hidden_sto_dentry(char *file, char *func, int line, dentry_t *this_dentry);
-+
-+extern int mini_fo_read_file(const char *filename, void *buf, int len);
-+extern int mini_fo_write_file(const char *filename, void *buf, int len);
-+extern dentry_t *fist_lookup(dentry_t *dir, const char *name, vnode_t **out, uid_t uid, gid_t gid);
-+#endif /* unused by mini_fo */
-+
-+/* state transition functions */
-+extern int nondir_unmod_to_mod(dentry_t *dentry, int cp_flag);
-+extern int nondir_del_rew_to_del(dentry_t *dentry);
-+extern int nondir_creat_to_del(dentry_t *dentry);
-+extern int nondir_mod_to_del(dentry_t *dentry);
-+extern int nondir_unmod_to_del(dentry_t *dentry);
-+
-+extern int dir_unmod_to_mod(dentry_t *dentry);
-+
-+/* rename specials */
-+extern int rename_directory(inode_t *old_dir, dentry_t *old_dentry, inode_t *new_dir, dentry_t *new_dentry);
-+extern int rename_nondir(inode_t *old_dir, dentry_t *old_dentry, inode_t *new_dir, dentry_t *new_dentry);
-+
-+/* misc stuff */
-+extern int mini_fo_tri_interpose(dentry_t *hidden_dentry,
-+				 dentry_t *hidden_sto_dentry,
-+				 dentry_t *dentry,
-+				 super_block_t *sb, int flag);
-+
-+extern int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
-+			   dentry_t *src_dentry, struct vfsmount *src_mnt);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
-+
-+extern int create_sto_nod(dentry_t *dentry, int mode, dev_t dev);
-+extern int create_sto_reg_file(dentry_t *dentry, int mode, struct nameidata *nd);
-+#else
-+extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode);
-+
-+extern int create_sto_nod(dentry_t *dentry, int mode, int dev);
-+extern int create_sto_reg_file(dentry_t *dentry, int mode);
-+#endif
-+
-+extern int create_sto_dir(dentry_t *dentry, int mode);
-+
-+extern int exists_in_storage(dentry_t *dentry);
-+extern int is_mini_fo_existant(dentry_t *dentry);
-+extern int get_neg_sto_dentry(dentry_t *dentry);
-+extern int build_sto_structure(dentry_t *dir, dentry_t *dentry);
-+extern int get_mini_fo_bpath(dentry_t *dentry, char **bpath, int *bpath_len);
-+extern dentry_t *bpath_walk(super_block_t *sb, char *bpath);
-+extern int bpath_put(dentry_t *dentry);
-+
-+/* check_mini_fo types functions */
-+extern int check_mini_fo_dentry(dentry_t *dentry);
-+extern int check_mini_fo_file(file_t *file);
-+extern int check_mini_fo_inode(inode_t *inode);
-+
-+/* General meta functions, can be called from outside of meta.c */
-+extern int meta_build_lists(dentry_t *dentry);
-+extern int meta_put_lists(dentry_t *dentry);
-+extern int __meta_put_lists(inode_t *inode);
-+
-+extern int meta_add_d_entry(dentry_t *dentry, const char *name, int len);
-+extern int meta_add_r_entry(dentry_t *dentry,
-+			    const char *old_name, int old_len,
-+			    const char *new_name, int new_len);
-+
-+extern int meta_remove_r_entry(dentry_t *dentry, const char *name, int len);
-+
-+extern int meta_check_d_entry(dentry_t *dentry, const char *name, int len);
-+extern int __meta_check_d_entry(inode_t *inode, const char *name, int len);
-+
-+extern char* meta_check_r_entry(dentry_t *dentry, const char *name, int len);
-+extern char* __meta_check_r_entry(inode_t *inode, const char *name, int len);
-+extern int meta_is_r_entry(dentry_t *dentry, const char *name, int len);
-+extern int __meta_is_r_entry(inode_t *inode, const char *name, int len);
-+
-+/* Specific meta functions, should be called only inside meta.c */
-+extern int __meta_put_d_list(inode_t *inode);
-+extern int __meta_put_r_list(inode_t *inode);
-+
-+extern int meta_list_add_d_entry(dentry_t *dentry,
-+				 const char *name, int len);
-+extern int meta_list_add_r_entry(dentry_t *dentry,
-+				 const char *old_name, int old_len,
-+				 const char *new_name, int new_len);
-+
-+extern int meta_list_remove_r_entry(dentry_t *dentry,
-+				    const char *name, int len);
-+
-+extern int __meta_list_remove_r_entry(inode_t *inode,
-+				      const char *name, int len);
-+
-+extern int meta_write_d_entry(dentry_t *dentry, const char *name, int len);
-+extern int meta_write_r_entry(dentry_t *dentry,
-+			      const char *old_name, int old_len,
-+			      const char *new_name, int new_len);
-+
-+extern int meta_sync_lists(dentry_t *dentry);
-+extern int meta_sync_d_list(dentry_t *dentry, int app_flag);
-+extern int meta_sync_r_list(dentry_t *dentry, int app_flag);
-+
-+/* ndl stuff */
-+extern int ndl_add_entry(struct readdir_data *rd, const char *name, int len);
-+extern void ndl_put_list(struct readdir_data *rd);
-+extern int ndl_check_entry(struct readdir_data *rd,
-+			   const char *name, int len);
-+
-+
-+# define copy_inode_size(dst, src) \
-+    dst->i_size = src->i_size; \
-+    dst->i_blocks = src->i_blocks;
-+
-+static inline void
-+fist_copy_attr_atime(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_atime = src->i_atime;
-+}
-+static inline void
-+fist_copy_attr_times(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_atime = src->i_atime;
-+	dest->i_mtime = src->i_mtime;
-+	dest->i_ctime = src->i_ctime;
-+}
-+static inline void
-+fist_copy_attr_timesizes(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_atime = src->i_atime;
-+	dest->i_mtime = src->i_mtime;
-+	dest->i_ctime = src->i_ctime;
-+	copy_inode_size(dest, src);
-+}
-+static inline void
-+fist_copy_attr_all(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_mode = src->i_mode;
-+	dest->i_nlink = src->i_nlink;
-+	dest->i_uid = src->i_uid;
-+	dest->i_gid = src->i_gid;
-+	dest->i_rdev = src->i_rdev;
-+	dest->i_atime = src->i_atime;
-+	dest->i_mtime = src->i_mtime;
-+	dest->i_ctime = src->i_ctime;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-+	dest->i_blksize = src->i_blksize;
-+#endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,12)
-+	dest->i_blkbits = src->i_blkbits;
-+# endif /* linux 2.4.12 and newer */
-+	copy_inode_size(dest, src);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	dest->i_attr_flags = src->i_attr_flags;
-+#else
-+	dest->i_flags = src->i_flags;
-+#endif
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+/* copied from linux/fs.h */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+static inline void double_lock(struct dentry *d1, struct dentry *d2)
-+{
-+	struct mutex *m1 = &d1->d_inode->i_mutex;
-+	struct mutex *m2 = &d2->d_inode->i_mutex;
-+	if (m1 != m2) {
-+		if ((unsigned long) m1 < (unsigned long) m2) {
-+			struct mutex *tmp = m2;
-+			m2 = m1; m1 = tmp;
-+		}
-+		mutex_lock(m1);
-+	}
-+	mutex_lock(m2);
-+}
-+
-+static inline void double_unlock(struct dentry *d1, struct dentry *d2)
-+{
-+	struct mutex *m1 = &d1->d_inode->i_mutex;
-+	struct mutex *m2 = &d2->d_inode->i_mutex;
-+	mutex_unlock(m1);
-+	if (m1 != m2)
-+		mutex_unlock(m2);
-+	dput(d1);
-+	dput(d2);
-+}
-+
-+#else
-+static inline void double_down(struct semaphore *s1, struct semaphore *s2)
-+{
-+        if (s1 != s2) {
-+                if ((unsigned long) s1 < (unsigned long) s2) {
-+                        struct semaphore *tmp = s2;
-+                        s2 = s1; s1 = tmp;
-+                }
-+                down(s1);
-+        }
-+        down(s2);
-+}
-+
-+static inline void double_up(struct semaphore *s1, struct semaphore *s2)
-+{
-+        up(s1);
-+        if (s1 != s2)
-+                up(s2);
-+}
-+
-+static inline void double_lock(struct dentry *d1, struct dentry *d2)
-+{
-+        double_down(&d1->d_inode->i_sem, &d2->d_inode->i_sem);
-+}
-+
-+static inline void double_unlock(struct dentry *d1, struct dentry *d2)
-+{
-+        double_up(&d1->d_inode->i_sem,&d2->d_inode->i_sem);
-+        dput(d1);
-+        dput(d2);
-+}
-+#endif   /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) */
-+#endif  /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
-+#endif /* __KERNEL__ */
-+
-+/*
-+ * Definitions for user and kernel code
-+ */
-+
-+/* ioctls */
-+
-+#endif	/* not __MINI_FO_H_ */
---- /dev/null
-+++ b/fs/mini_fo/mini_fo-merge
-@@ -0,0 +1,180 @@
-+#!/bin/bash
-+#
-+# Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
-+# 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.
-+#
-+
-+BASE=
-+STO=
-+HELP=
-+DRYRUN=
-+VERBOSE=
-+TMP="/tmp/"
-+META_NAME="META_dAfFgHE39ktF3HD2sr"
-+SKIP_DEL_LIST="skip-delete-list.mini_fo-merge"
-+
-+COMMAND=
-+exec_command()
-+{
-+    if [ x$DRYRUN == "xset" ]; then
-+	echo "  would run: $COMMAND"
-+    elif ! [ x$DRYRUN == "xset" ]; then
-+	if [ x$VERBOSE == "xset" ]; then
-+	    echo "  running: $COMMAND"
-+	fi
-+	eval $COMMAND
-+    fi
-+}
-+
-+usage()
-+{
-+cat <<EOF
-+
-+USAGE: $0 -b <base dir> -s <storage dir>
-+Version 0.1
-+
-+This script merges the contents of a mini_fo storage file system back
-+to the base file system.
-+
-+!!! Warning: This will modify the base filesystem and can destroy data
-+             if used wrongly.
-+
-+Options:
-+     -b <base dir>
-+          the directory of the base file system.
-+
-+     -s <storage dir>
-+          the directory of the storage file system.
-+
-+     -d   dry run, will not change anything and print the commands that
-+          would be executed.
-+
-+     -t   tmp dir for storing temporary file. default: $TMP
-+
-+     -v   show what operations are performed.
-+
-+     -h   displays this message.
-+
-+EOF
-+}
-+
-+# parse parameters
-+while getopts hdvt:b:s: OPTS
-+  do
-+  case $OPTS in
-+      h)  HELP="set";;
-+      d)  DRYRUN="set";;
-+      v)  VERBOSE="set";;
-+      b)  BASE="$OPTARG";;
-+      s)  STO="$OPTARG";;
-+      t)  TMP="$OPTARG";;
-+      ?)  usage
-+	  exit 1;;
-+  esac
-+done
-+
-+if [ "x$HELP" == "xset" ]; then
-+    usage
-+    exit -1
-+fi
-+
-+if ! [ -d "$BASE" ] || ! [ -d "$STO" ]; then
-+    echo -e "$0:\n Error, -s and/or -b argument missing. type $0 -h for help."
-+    exit -1;
-+fi
-+
-+# get full paths
-+pushd $STO; STO=`pwd`; popd
-+pushd $BASE; BASE=`pwd`; popd
-+TMP=${TMP%/}
-+
-+
-+cat<<EOF
-+###############################################################################
-+# mini_fo-merge
-+#
-+# base dir:       $BASE
-+# storage dir:    $STO
-+# meta filename:  $META_NAME
-+# dry run:        $DRYRUN
-+# verbose:        $VERBOSE
-+# tmp files:      $TMP
-+###############################################################################
-+
-+EOF
-+
-+rm $TMP/$SKIP_DEL_LIST
-+
-+# first process all renamed dirs
-+echo "Merging renamed directories..."
-+pushd $STO &> /dev/null
-+find . -name $META_NAME -type f -print0  | xargs -0 -e grep  -e '^R ' | tr -s ':R' ' ' | while read ENTRY; do
-+    echo "entry: $ENTRY"
-+    META_FILE=`echo $ENTRY | cut -d ' ' -f 1`
-+    OLD_B_DIR=`echo $ENTRY | cut -d ' ' -f 2 | sed -e 's/\///'`
-+    NEW_NAME=`echo $ENTRY | cut -d ' ' -f 3`
-+    NEW_B_DIR=`echo $META_FILE | sed -e "s/$META_NAME/$NEW_NAME/" | sed -e 's/^\.\///'`
-+    echo "META_FILE: $META_FILE"
-+    echo "OLD_B_DIR: $OLD_B_DIR"
-+    echo "NEW_NAME: $NEW_NAME"
-+    echo  "NEW_B_DIR: $NEW_B_DIR"
-+
-+    pushd $BASE &> /dev/null
-+    # remove an existing dir in storage
-+    COMMAND="rm -rf $NEW_B_DIR"; exec_command
-+    COMMAND="cp -R $OLD_B_DIR $NEW_B_DIR"; exec_command
-+    echo ""
-+    popd &> /dev/null
-+
-+    # remember this dir to exclude it from deleting later
-+    echo $NEW_B_DIR >> $TMP/$SKIP_DEL_LIST
-+done
-+
-+# delete all whiteouted files from base
-+echo -e "\nDeleting whiteout'ed files from base file system..."
-+find . -name $META_NAME -type f -print0  | xargs -0 -e grep  -e '^D ' | sed -e 's/:D//' | while read ENTRY; do
-+    META_FILE=`echo $ENTRY | cut -d ' ' -f 1`
-+    DEL_NAME=`echo $ENTRY | cut -d ' ' -f 2`
-+    DEL_FILE=`echo $META_FILE | sed -e "s/$META_NAME/$DEL_NAME/" | sed -e 's/^\.\///'`
-+    grep -x $DEL_FILE $TMP/$SKIP_DEL_LIST &> /dev/null
-+    if [ $? -ne 0 ]; then
-+	pushd $BASE &> /dev/null
-+	COMMAND="rm -rf $DEL_FILE"; exec_command
-+	popd &> /dev/null
-+    else
-+	echo "  excluding: $DEL_FILE as in skip-del-list."
-+    fi
-+done
-+
-+# create all dirs and update permissions
-+echo -e "\nSetting up directory structures in base file system..."
-+find . -type d | sed -e 's/^\.\///' | while read DIR; do
-+    PERMS=`stat -c %a $DIR`
-+    DIR_UID=`stat -c %u $DIR`
-+    DIR_GID=`stat -c %g $DIR`
-+    pushd $BASE &> /dev/null
-+    if ! [ -d $DIR ]; then
-+	COMMAND="mkdir -p $DIR"; exec_command
-+    fi
-+    COMMAND="chmod $PERMS $DIR"; exec_command
-+    COMMAND="chown $DIR_UID:$DIR_GID $DIR"; exec_command
-+    popd &> /dev/null
-+done
-+
-+# merge all non-directory files
-+echo -e "\nMerging all non-directory files...."
-+for i in b c p f l s; do
-+    find . -type $i | sed -e 's/^\.\///' | grep -v "$META_NAME" | while read FILE; do
-+	pushd $BASE #&> /dev/null
-+	COMMAND="cp -df $STO/$FILE $BASE/$FILE"; exec_command
-+	popd &> /dev/null
-+    done
-+done
-+popd &> /dev/null
-+
-+#rm $TMP/$SKIP_DEL_LIST
-+
-+echo "Done!"
---- /dev/null
-+++ b/fs/mini_fo/mini_fo-overlay
-@@ -0,0 +1,130 @@
-+#!/bin/bash
-+#
-+# Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
-+# 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.
-+#
-+
-+HELP=
-+SUFF=
-+MNTP=
-+MNT_DIR="/mnt"
-+STO=
-+STO_DIR="/tmp"
-+BASE=
-+
-+usage()
-+{
-+cat <<EOF
-+
-+Usage: $0 [-s suffix] [-d sto_dir_dir] [-m mount point] base_dir
-+Version 0.1
-+
-+This script overlays the given base directory using the mini_fo file
-+system. If only the base directory base_dir is given, $0
-+will use a storage directory called "sto-<base_dir_name>" in $STO_DIR,
-+and mount point "mini_fo-<base_dir_dir>" in $MNT_DIR.
-+
-+Options:
-+     -s <suffix>
-+          add given suffix to storage directory and the mount
-+          point. This is usefull for overlaying one base directory
-+          several times and avoiding conflicts with storage directory
-+          names and mount points.
-+
-+     -d <sto_dir_dir>
-+          change the directory in which the storage directory will be
-+          created (default is currently "$STO_DIR".
-+
-+     -m <mount point>
-+          use an alternative directory to create the mini_fo
-+          mountpoint (default is currently "$MNT_DIR".
-+
-+     -h   displays this message.
-+
-+EOF
-+exit 1;
-+}
-+
-+while getopts hm:s:d: OPTS
-+  do
-+  case $OPTS in
-+      s)  SUFF="$OPTARG";;
-+      d)  STO_DIR="$OPTARG";;
-+      m)  MNT_DIR="$OPTARG";;
-+      h)  HELP="set";;
-+      ?)  usage
-+	  exit 1;;
-+  esac
-+done
-+shift $(($OPTIND - 1))
-+
-+BASE="$1"
-+
-+if [ "x$HELP" == "xset" ]; then
-+    usage
-+    exit -1
-+fi
-+
-+# fix suffix
-+if [ "x$SUFF" != "x" ]; then
-+    SUFF="-$SUFF"
-+fi
-+
-+# kill trailing slashes
-+MNT_DIR=${MNT_DIR%/}
-+STO_DIR=${STO_DIR%/}
-+BASE=${BASE%/}
-+
-+
-+if ! [ -d "$BASE" ]; then
-+    echo "invalid base dir $BASE, run $0 -h for help."
-+    exit -1
-+fi
-+
-+# check opts
-+if ! [ -d "$MNT_DIR" ]; then
-+    echo "invalid mount dir $MNT_DIR, run $0 -h for help."
-+    exit -1
-+fi
-+
-+if ! [ -d "$STO_DIR" ]; then
-+    echo "invalid sto_dir_dir $STO_DIR, run $0 -h for help."
-+    exit -1
-+fi
-+
-+MNTP="$MNT_DIR/mini_fo-`basename $BASE`$SUFF"
-+STO="$STO_DIR/sto-`basename $BASE`$SUFF"
-+
-+# create the mount point if it doesn't exist
-+mkdir -p $MNTP
-+if [ $? -ne 0 ]; then
-+    echo "Error, failed to create mount point $MNTP"
-+fi
-+
-+mkdir -p $STO
-+if [ $? -ne 0 ]; then
-+    echo "Error, failed to create storage dir $STO"
-+fi
-+
-+# check if fs is already mounted
-+mount | grep mini_fo | grep $MNTP &> /dev/null
-+if [ $? -eq 0 ]; then
-+    echo "Error, existing mini_fo mount at $MNTP."
-+    exit -1
-+fi
-+
-+mount | grep mini_fo | grep $STO &> /dev/null
-+if [ $? -eq 0 ]; then
-+    echo "Error, $STO seems to be used already."
-+    exit -1
-+fi
-+
-+# mount
-+mount -t mini_fo -o base=$BASE,sto=$STO $BASE $MNTP
-+
-+if [ $? -ne 0 ]; then
-+    echo "Error, mounting failed, maybe no permisson to mount?"
-+fi
---- /dev/null
-+++ b/fs/mini_fo/mmap.c
-@@ -0,0 +1,637 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+
-+#ifdef FIST_COUNT_WRITES
-+/* for counting writes in the middle vs. regular writes */
-+unsigned long count_writes = 0, count_writes_middle = 0;
-+#endif /* FIST_COUNT_WRITES */
-+
-+/* forward declaration of commit write and prepare write */
-+STATIC int mini_fo_commit_write(file_t *file, page_t *page, unsigned from, unsigned to);
-+STATIC int mini_fo_prepare_write(file_t *file, page_t *page, unsigned from, unsigned to);
-+
-+
-+/*
-+ * Function for handling creation of holes when lseek-ing past the
-+ * end of the file and then writing some data.
-+ */
-+int
-+mini_fo_fill_zeros(file_t* file, page_t *page, unsigned from)
-+{
-+	int err = 0;
-+	dentry_t *dentry = file->f_dentry;
-+	inode_t *inode = dentry->d_inode;
-+	page_t *tmp_page;
-+	int index;
-+
-+	print_entry_location();
-+
-+	for (index = inode->i_size >> PAGE_CACHE_SHIFT; index < page->index; index++) {
-+		tmp_page = mini_fo_get1page(file, index);
-+		if (IS_ERR(tmp_page)) {
-+			err = PTR_ERR(tmp_page);
-+			goto out;
-+		}
-+
-+		/*
-+		 * zero out rest of the contents of the page between the appropriate
-+		 * offsets.
-+		 */
-+		memset((char*)page_address(tmp_page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, PAGE_CACHE_SIZE - (inode->i_size & ~PAGE_CACHE_MASK));
-+
-+		if (! (err = mini_fo_prepare_write(file, tmp_page, 0, PAGE_CACHE_SIZE)))
-+			err = mini_fo_commit_write(file, tmp_page, 0, PAGE_CACHE_SIZE);
-+
-+		page_cache_release(tmp_page);
-+		if (err < 0)
-+			goto out;
-+		if (current->need_resched)
-+			schedule();
-+	}
-+
-+	/* zero out appropriate parts of last page */
-+
-+	/*
-+	 * if the encoding type is block, then adjust the 'from' (where the
-+	 * zeroing will start) offset appropriately
-+	 */
-+	from = from & (~(FIST_ENCODING_BLOCKSIZE - 1));
-+
-+	if ((from - (inode->i_size & ~PAGE_CACHE_MASK)) > 0) {
-+
-+		memset((char*)page_address(page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, from - (inode->i_size & ~PAGE_CACHE_MASK));
-+		if (! (err = mini_fo_prepare_write(file, page, 0, PAGE_CACHE_SIZE)))
-+			err = mini_fo_commit_write(file, page, 0, PAGE_CACHE_SIZE);
-+
-+		if (err < 0)
-+			goto out;
-+		if (current->need_resched)
-+			schedule();
-+	}
-+
-+ out:
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+
-+STATIC int
-+mini_fo_writepage(page_t *page)
-+{
-+	int err = -EIO;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	page_t *hidden_page;
-+	char *kaddr, *hidden_kaddr;
-+
-+	print_entry_location();
-+
-+	inode = page->mapping->host;
-+	hidden_inode = itohi(inode);
-+
-+	/*
-+	 * writepage is called when shared mmap'ed files need to write
-+	 * their pages, while prepare/commit_write are called from the
-+	 * non-paged write() interface.  (However, in 2.3 the two interfaces
-+	 * share the same cache, while in 2.2 they didn't.)
-+	 *
-+	 * So we pretty much have to duplicate much of what commit_write does.
-+	 */
-+
-+	/* find lower page (returns a locked page) */
-+	hidden_page = grab_cache_page(hidden_inode->i_mapping, page->index);
-+	if (!hidden_page)
-+		goto out;
-+
-+	/* get page address, and encode it */
-+	kaddr = (char *) kmap(page);
-+	hidden_kaddr = (char*) kmap(hidden_page);
-+	mini_fo_encode_block(kaddr, hidden_kaddr, PAGE_CACHE_SIZE, inode, inode->i_sb, page->index);
-+	/* if encode_block could fail, then return error */
-+	kunmap(page);
-+	kunmap(hidden_page);
-+
-+	/* call lower writepage (expects locked page) */
-+	err = hidden_inode->i_mapping->a_ops->writepage(hidden_page);
-+
-+	/*
-+	 * update mtime and ctime of lower level file system
-+	 * mini_fo' mtime and ctime are updated by generic_file_write
-+	 */
-+	hidden_inode->i_mtime = hidden_inode->i_ctime = CURRENT_TIME;
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,1)
-+	UnlockPage(hidden_page);	/* b/c grab_cache_page locked it */
-+# endif /* kernel older than 2.4.1 */
-+	page_cache_release(hidden_page); /* b/c grab_cache_page increased refcnt */
-+
-+	if (err)
-+		ClearPageUptodate(page);
-+	else
-+		SetPageUptodate(page);
-+ out:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,1)
-+	UnlockPage(page);
-+# endif /* kernel 2.4.1 and newer */
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+/*
-+ * get one page from cache or lower f/s, return error otherwise.
-+ * returns unlocked, up-to-date page (if ok), with increased refcnt.
-+ */
-+page_t *
-+mini_fo_get1page(file_t *file, int index)
-+{
-+	page_t *page;
-+	dentry_t *dentry;
-+	inode_t *inode;
-+	struct address_space *mapping;
-+	int err;
-+
-+	print_entry_location();
-+
-+	dentry = file->f_dentry; /* CPW: Moved below print_entry_location */
-+	inode = dentry->d_inode;
-+	mapping = inode->i_mapping;
-+
-+	fist_dprint(8, "%s: read page index %d pid %d\n", __FUNCTION__, index, current->pid);
-+	if (index < 0) {
-+		printk("%s BUG: index=%d\n", __FUNCTION__, index);
-+		page = ERR_PTR(-EIO);
-+		goto out;
-+	}
-+	page = read_cache_page(mapping,
-+			       index,
-+			       (filler_t *) mapping->a_ops->readpage,
-+			       (void *) file);
-+	if (IS_ERR(page))
-+		goto out;
-+	wait_on_page(page);
-+	if (!Page_Uptodate(page)) {
-+		lock_page(page);
-+		err = mapping->a_ops->readpage(file, page);
-+		if (err) {
-+			page = ERR_PTR(err);
-+			goto out;
-+		}
-+		wait_on_page(page);
-+		if (!Page_Uptodate(page)) {
-+			page = ERR_PTR(-EIO);
-+			goto out;
-+		}
-+	}
-+
-+ out:
-+	print_exit_pointer(page);
-+	return page;
-+}
-+
-+
-+/*
-+ * get one page from cache or lower f/s, return error otherwise.
-+ * similar to get1page, but doesn't guarantee that it will return
-+ * an unlocked page.
-+ */
-+page_t *
-+mini_fo_get1page_cached(file_t *file, int index)
-+{
-+	page_t *page;
-+	dentry_t *dentry;
-+	inode_t *inode;
-+	struct address_space *mapping;
-+	int err;
-+
-+	print_entry_location();
-+
-+	dentry = file->f_dentry; /* CPW: Moved below print_entry_location */
-+	inode = dentry->d_inode;
-+	mapping = inode->i_mapping;
-+
-+	fist_dprint(8, "%s: read page index %d pid %d\n", __FUNCTION__, index, current->pid);
-+	if (index < 0) {
-+		printk("%s BUG: index=%d\n", __FUNCTION__, index);
-+		page = ERR_PTR(-EIO);
-+		goto out;
-+	}
-+	page = read_cache_page(mapping,
-+			       index,
-+			       (filler_t *) mapping->a_ops->readpage,
-+			       (void *) file);
-+	if (IS_ERR(page))
-+		goto out;
-+
-+ out:
-+	print_exit_pointer(page);
-+	return page;
-+}
-+
-+
-+/*
-+ * readpage is called from generic_page_read and the fault handler.
-+ * If your file system uses generic_page_read for the read op, it
-+ * must implement readpage.
-+ *
-+ * Readpage expects a locked page, and must unlock it.
-+ */
-+STATIC int
-+mini_fo_do_readpage(file_t *file, page_t *page)
-+{
-+	int err = -EIO;
-+	dentry_t *dentry;
-+	file_t *hidden_file = NULL;
-+	dentry_t *hidden_dentry;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	char *page_data;
-+	page_t *hidden_page;
-+	char *hidden_page_data;
-+	int real_size;
-+
-+	print_entry_location();
-+
-+	dentry = file->f_dentry; /* CPW: Moved below print_entry_location */
-+	if (ftopd(file) != NULL)
-+		hidden_file = ftohf(file);
-+	hidden_dentry = dtohd(dentry);
-+	inode = dentry->d_inode;
-+	hidden_inode = itohi(inode);
-+
-+	fist_dprint(7, "%s: requesting page %d from file %s\n", __FUNCTION__, page->index, dentry->d_name.name);
-+
-+	MALLOC_PAGE_POINTERS(hidden_pages, num_hidden_pages);
-+	MALLOC_PAGEDATA_POINTERS(hidden_pages_data, num_hidden_pages);
-+	FOR_EACH_PAGE
-+		CURRENT_HIDDEN_PAGE = NULL;
-+
-+	/* find lower page (returns a locked page) */
-+	FOR_EACH_PAGE {
-+		fist_dprint(8, "%s: Current page index = %d\n", __FUNCTION__, CURRENT_HIDDEN_PAGEINDEX);
-+		CURRENT_HIDDEN_PAGE = read_cache_page(hidden_inode->i_mapping,
-+						      CURRENT_HIDDEN_PAGEINDEX,
-+						      (filler_t *) hidden_inode->i_mapping->a_ops->readpage,
-+						      (void *) hidden_file);
-+		if (IS_ERR(CURRENT_HIDDEN_PAGE)) {
-+			err = PTR_ERR(CURRENT_HIDDEN_PAGE);
-+			CURRENT_HIDDEN_PAGE = NULL;
-+			goto out_release;
-+		}
-+	}
-+
-+	/*
-+	 * wait for the page data to show up
-+	 * (signaled by readpage as unlocking the page)
-+	 */
-+	FOR_EACH_PAGE {
-+		wait_on_page(CURRENT_HIDDEN_PAGE);
-+		if (!Page_Uptodate(CURRENT_HIDDEN_PAGE)) {
-+			/*
-+			 * call readpage() again if we returned from wait_on_page with a
-+			 * page that's not up-to-date; that can happen when a partial
-+			 * page has a few buffers which are ok, but not the whole
-+			 * page.
-+			 */
-+			lock_page(CURRENT_HIDDEN_PAGE);
-+			err = hidden_inode->i_mapping->a_ops->readpage(hidden_file,
-+								       CURRENT_HIDDEN_PAGE);
-+			if (err) {
-+				CURRENT_HIDDEN_PAGE = NULL;
-+				goto out_release;
-+			}
-+			wait_on_page(CURRENT_HIDDEN_PAGE);
-+			if (!Page_Uptodate(CURRENT_HIDDEN_PAGE)) {
-+				err = -EIO;
-+				goto out_release;
-+			}
-+		}
-+	}
-+
-+	/* map pages, get their addresses */
-+	page_data = (char *) kmap(page);
-+	FOR_EACH_PAGE
-+		CURRENT_HIDDEN_PAGEDATA = (char *) kmap(CURRENT_HIDDEN_PAGE);
-+
-+	/* if decode_block could fail, then return error */
-+	err = 0;
-+	real_size = hidden_inode->i_size - (page->index << PAGE_CACHE_SHIFT);
-+	if (real_size <= 0)
-+		memset(page_data, 0, PAGE_CACHE_SIZE);
-+	else if (real_size < PAGE_CACHE_SIZE) {
-+		mini_fo_decode_block(hidden_page_data, page_data, real_size, inode, inode->i_sb, page->index);
-+		memset(page_data + real_size, 0, PAGE_CACHE_SIZE - real_size);
-+	} else
-+		mini_fo_decode_block(hidden_page_data, page_data, PAGE_CACHE_SIZE, inode, inode->i_sb, page->index);
-+
-+	FOR_EACH_PAGE
-+		kunmap(CURRENT_HIDDEN_PAGE);
-+	kunmap(page);
-+
-+ out_release:
-+	FOR_EACH_PAGE
-+		if (CURRENT_HIDDEN_PAGE)
-+			page_cache_release(CURRENT_HIDDEN_PAGE); /* undo read_cache_page */
-+
-+	FREE_PAGE_POINTERS(hidden_pages, num_hidden_pages);
-+	FREE_PAGEDATA_POINTERS(hidden_pages_data, num_hidden_pages);
-+
-+ out:
-+	if (err == 0)
-+		SetPageUptodate(page);
-+	else
-+		ClearPageUptodate(page);
-+
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_readpage(file_t *file, page_t *page)
-+{
-+	int err;
-+	print_entry_location();
-+
-+	err = mini_fo_do_readpage(file, page);
-+
-+	/*
-+	 * we have to unlock our page, b/c we _might_ have gotten a locked page.
-+	 * but we no longer have to wakeup on our page here, b/c UnlockPage does
-+	 * it
-+	 */
-+	UnlockPage(page);
-+
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_prepare_write(file_t *file, page_t *page, unsigned from, unsigned to)
-+{
-+	int err = 0;
-+
-+	print_entry_location();
-+
-+	/*
-+	 * we call kmap(page) only here, and do the kunmap
-+	 * and the actual downcalls, including unlockpage and uncache
-+	 * in commit_write.
-+	 */
-+	kmap(page);
-+
-+	/* fast path for whole page writes */
-+	if (from == 0 && to == PAGE_CACHE_SIZE)
-+		goto out;
-+	/* read the page to "revalidate" our data */
-+	/* call the helper function which doesn't unlock the page */
-+	if (!Page_Uptodate(page))
-+		err = mini_fo_do_readpage(file, page);
-+
-+ out:
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+
-+STATIC int
-+mini_fo_commit_write(file_t *file, page_t *page, unsigned from, unsigned to)
-+{
-+	int err = -ENOMEM;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	page_t *hidden_page;
-+	file_t *hidden_file = NULL;
-+	loff_t pos;
-+	unsigned bytes = to - from;
-+	unsigned hidden_from, hidden_to, hidden_bytes;
-+
-+	print_entry_location();
-+
-+	inode = page->mapping->host; /* CPW: Moved below print_entry_location */
-+	hidden_inode = itohi(inode);
-+
-+	ASSERT(file != NULL);
-+	/*
-+	 * here we have a kmapped page, with data from the user copied
-+	 * into it.  we need to encode_block it, and then call the lower
-+	 * commit_write.  We also need to simulate same behavior of
-+	 * generic_file_write, and call prepare_write on the lower f/s first.
-+	 */
-+#ifdef FIST_COUNT_WRITES
-+	count_writes++;
-+# endif /* FIST_COUNT_WRITES */
-+
-+	/* this is append and/or extend -- we can't have holes so fill them in */
-+	if (page->index > (hidden_inode->i_size >> PAGE_CACHE_SHIFT)) {
-+		page_t *tmp_page;
-+		int index;
-+		for (index = hidden_inode->i_size >> PAGE_CACHE_SHIFT; index < page->index; index++) {
-+			tmp_page = mini_fo_get1page(file, index);
-+			if (IS_ERR(tmp_page)) {
-+				err = PTR_ERR(tmp_page);
-+				goto out;
-+			}
-+			/* zero out the contents of the page at the appropriate offsets */
-+			memset((char*)page_address(tmp_page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, PAGE_CACHE_SIZE - (inode->i_size & ~PAGE_CACHE_MASK));
-+			if (!(err = mini_fo_prepare_write(file, tmp_page, 0, PAGE_CACHE_SIZE)))
-+				err = mini_fo_commit_write(file, tmp_page, 0, PAGE_CACHE_SIZE);
-+			page_cache_release(tmp_page);
-+			if (err < 0)
-+				goto out;
-+			if (current->need_resched)
-+				schedule();
-+		}
-+	}
-+
-+	if (ftopd(file) != NULL)
-+		hidden_file = ftohf(file);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_inode->i_mutex);
-+#else
-+	down(&hidden_inode->i_sem);
-+#endif
-+	/* find lower page (returns a locked page) */
-+	hidden_page = grab_cache_page(hidden_inode->i_mapping, page->index);
-+	if (!hidden_page)
-+		goto out;
-+
-+#if FIST_ENCODING_BLOCKSIZE > 1
-+#  error encoding_blocksize greater than 1 is not yet supported
-+# endif /* FIST_ENCODING_BLOCKSIZE > 1 */
-+
-+	hidden_from = from & (~(FIST_ENCODING_BLOCKSIZE - 1));
-+	hidden_to = ((to + FIST_ENCODING_BLOCKSIZE - 1) & (~(FIST_ENCODING_BLOCKSIZE - 1)));
-+	if ((page->index << PAGE_CACHE_SHIFT) + to > hidden_inode->i_size) {
-+
-+		/*
-+		 * if this call to commit_write had introduced holes and the code
-+		 * for handling holes was invoked, then the beginning of this page
-+		 * must be zeroed out
-+		 * zero out bytes from 'size_of_file%pagesize' to 'from'.
-+		 */
-+		if ((hidden_from - (inode->i_size & ~PAGE_CACHE_MASK)) > 0)
-+			memset((char*)page_address(page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, hidden_from - (inode->i_size & ~PAGE_CACHE_MASK));
-+
-+	}
-+	hidden_bytes = hidden_to - hidden_from;
-+
-+	/* call lower prepare_write */
-+	err = -EINVAL;
-+	if (hidden_inode->i_mapping &&
-+	    hidden_inode->i_mapping->a_ops &&
-+	    hidden_inode->i_mapping->a_ops->prepare_write)
-+		err = hidden_inode->i_mapping->a_ops->prepare_write(hidden_file,
-+								    hidden_page,
-+								    hidden_from,
-+								    hidden_to);
-+	if (err)
-+		/* don't leave locked pages behind, esp. on an ENOSPC */
-+		goto out_unlock;
-+
-+	fist_dprint(8, "%s: encoding %d bytes\n", __FUNCTION__, hidden_bytes);
-+	mini_fo_encode_block((char *) page_address(page) + hidden_from, (char*) page_address(hidden_page) + hidden_from, hidden_bytes, inode, inode->i_sb, page->index);
-+	/* if encode_block could fail, then goto unlock and return error */
-+
-+	/* call lower commit_write */
-+	err = hidden_inode->i_mapping->a_ops->commit_write(hidden_file,
-+							   hidden_page,
-+							   hidden_from,
-+							   hidden_to);
-+
-+	if (err < 0)
-+		goto out_unlock;
-+
-+	err = bytes;	/* convert error to no. of bytes */
-+
-+	inode->i_blocks = hidden_inode->i_blocks;
-+	/* we may have to update i_size */
-+	pos = (page->index << PAGE_CACHE_SHIFT) + to;
-+	if (pos > inode->i_size)
-+		inode->i_size = pos;
-+
-+	/*
-+	 * update mtime and ctime of lower level file system
-+	 * mini_fo' mtime and ctime are updated by generic_file_write
-+	 */
-+	hidden_inode->i_mtime = hidden_inode->i_ctime = CURRENT_TIME;
-+
-+	mark_inode_dirty_sync(inode);
-+
-+ out_unlock:
-+	UnlockPage(hidden_page);
-+	page_cache_release(hidden_page);
-+	kunmap(page);		/* kmap was done in prepare_write */
-+ out:
-+	/* we must set our page as up-to-date */
-+	if (err < 0)
-+		ClearPageUptodate(page);
-+	else
-+		SetPageUptodate(page);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_inode->i_mutex);
-+#else
-+	up(&hidden_inode->i_sem);
-+#endif
-+	print_exit_status(err);
-+	return err;			/* assume all is ok */
-+}
-+
-+
-+STATIC int
-+mini_fo_bmap(struct address_space *mapping, long block)
-+{
-+	int err = 0;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+
-+	print_entry_location();
-+
-+	inode = (inode_t *) mapping->host;
-+	hidden_inode = itohi(inode);
-+
-+	if (hidden_inode->i_mapping->a_ops->bmap)
-+		err = hidden_inode->i_mapping->a_ops->bmap(hidden_inode->i_mapping, block);
-+	print_exit_location();
-+	return err;
-+}
-+
-+
-+/*
-+ * This function is copied verbatim from mm/filemap.c.
-+ * XXX: It should be simply moved to some header file instead -- bug Al about it!
-+ */
-+static inline int sync_page(struct page *page)
-+{
-+	struct address_space *mapping = page->mapping;
-+
-+	if (mapping && mapping->a_ops && mapping->a_ops->sync_page)
-+		return mapping->a_ops->sync_page(page);
-+	return 0;
-+}
-+
-+
-+/*
-+ * XXX: we may not need this function if not FIST_FILTER_DATA.
-+ * FIXME: for FIST_FILTER_SCA, get all lower pages and sync them each.
-+ */
-+STATIC int
-+mini_fo_sync_page(page_t *page)
-+{
-+	int err = 0;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	page_t *hidden_page;
-+
-+	print_entry_location();
-+
-+	inode = page->mapping->host; /* CPW: Moved below print_entry_location */
-+	hidden_inode = itohi(inode);
-+
-+	/* find lower page (returns a locked page) */
-+	hidden_page = grab_cache_page(hidden_inode->i_mapping, page->index);
-+	if (!hidden_page)
-+		goto out;
-+
-+	err = sync_page(hidden_page);
-+
-+	UnlockPage(hidden_page);	/* b/c grab_cache_page locked it */
-+	page_cache_release(hidden_page); /* b/c grab_cache_page increased refcnt */
-+
-+ out:
-+	print_exit_status(err);
-+	return err;
-+}
---- /dev/null
-+++ b/fs/mini_fo/README
-@@ -0,0 +1,163 @@
-+README for the mini_fo overlay file system
-+=========================================
-+
-+
-+WHAT IS MINI_FO?
-+----------------
-+
-+mini_fo is a virtual kernel file system that can make read-only
-+file systems writable. This is done by redirecting modifying operations
-+to a writeable location called "storage directory", and leaving the
-+original data in the "base directory" untouched. When reading, the
-+file system merges the modifed and original data so that only the
-+newest versions will appear. This occurs transparently to the user,
-+who can access the data like on any other read-write file system.
-+
-+Base and storage directories may be located on the same or on
-+different partitions and may be of different file system types. While
-+the storage directory obviously needs to be writable, the base may or
-+may not be writable, what doesn't matter as it will no be modified
-+anyway.
-+
-+
-+WHAT IS GOOD FOR?
-+-----------------
-+
-+The primary purpose of the mini_fo file system is to allow easy
-+software updates to embedded systems, that often store their root
-+file system in a read-only flash file system, but there are many
-+more as for example sandboxing, or for allowing live-cds to
-+permanently store information.
-+
-+
-+BUILDING
-+--------
-+This should be simple. Adjust the Makefile to point to the correct
-+kernel headers you want to build the module for. Then:
-+
-+    # make
-+
-+should build "mini_fo.o" for a 2.4 kernel or "mini_fo.ko" for a 2.6
-+kernel.
-+
-+If you are building the module for you current kernel, you can install
-+the module (as root):
-+
-+    # make install
-+
-+or uninstall with
-+
-+    # make uninstall
-+
-+
-+USING THE FILE SYSTEM
-+--------------------
-+
-+the general mount syntax is:
-+
-+   mount -t mini_fo -o base=<base directory>,sto=<storage directory>\
-+                            <base directory> <mount point>
-+
-+Example:
-+
-+You have mounted a cdrom to /mnt/cdrom and want to modifiy some files
-+on it:
-+
-+load the module (as root)
-+
-+    # insmod mini_fo.o for a 2.4 kernel or
-+
-+    # insmod mini_fo.ko for a 2.6 kernel
-+
-+
-+create a storage dir in tmp and a mountpoint for mini_fo:
-+
-+    # mkdir /tmp/sto
-+    # mkdir /mnt/mini_fo
-+
-+and mount the mini_fo file system:
-+
-+    # mount -t mini_fo -o base=/mnt/cdrom,sto=/tmp/sto /mnt/cdrom /mnt/mini_fo
-+
-+
-+Now the data stored on the cd can be accessed via the mini_fo
-+mountpoint just like any read-write file system, files can be modified
-+and deleted, new ones can be created and so on. When done unmount the
-+file system:
-+
-+    # unmount /mnt/mini_fo
-+
-+Note that if the file system is mounted again using the same storage
-+file system, of course it will appear in the modified state again. If
-+you remount it using an new empty storage directory, it will be
-+unmodified. Therefore by executing:
-+
-+    # cd /tmp/sto
-+    # rm -rf *
-+
-+you can nuke all the changes you made to the original file system. But
-+ remember NEVER do this while the mini_fo file system is mounted!
-+
-+
-+Alternatively you can use the mini_fo-overlay bash script, that
-+simplifies managing mini_fo mounts. See TOOLS Section.
-+
-+
-+TOOLS
-+-----
-+
-+mini_fo-merge (experimental):
-+
-+This is a bash script that will merge changes contained in the storage
-+directory back to the base directory. This allows mini_fo to function
-+as a cache file system by overlaying a slow (network, ...) file system
-+and using a fast (ramdisk, ...) as storage. When done, changes can be
-+merged back to the (slow) base with mini_fo-merge. See "mini_fo-merge
-+-h" for details.
-+
-+It can be usefull for merging changes back after a successfull test
-+(patches, software updates...)
-+
-+
-+mini_fo-overlay:
-+
-+This bash script simplifies managing one or more mini_fo mounts. For
-+overlaying a directory called "basedir1", you can just call:
-+
-+    # mini_fo-overlay basedir1
-+
-+This will mount mini_fo with "basedir1" as base, "/tmp/sto-basedir1/"
-+as storage to "/mnt/mini_fo-basedir1/". It has more options though,
-+type "mini_fo-overlay -h" for details.
-+
-+
-+DOCUMENTATION, REPORTING BUGS, GETTING HELP
-+-------------------------------------------
-+
-+Please visit the mini_fo project page at:
-+
-+http://www.denx.de/twiki/bin/view/Know/MiniFOHome
-+
-+
-+WARNINGS
-+--------
-+
-+Never modify the base or the storage directorys while the mini_fo
-+file system is mounted, or you might crash you system. Simply accessing
-+and reading should not cause any trouble.
-+
-+Exporting a mini_fo mount point via NFS has not been tested, and may
-+or may not work.
-+
-+Check the RELEASE_NOTES for details on bugs and features.
-+
-+
-+
-+Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+
-+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.
-+
-+
---- /dev/null
-+++ b/fs/mini_fo/RELEASE_NOTES
-@@ -0,0 +1,111 @@
-+Release:	mini_fo-0.6.1 (v0-6-1)
-+Date:		21.09.2005
-+
-+
-+Changes:
-+--------
-+v0-6-1:
-+
-+- bugfixes (see ChangeLog)
-+
-+- two helper scripts "mini_fo_merge" and "mini_fo_overlay" (see
-+  README for details).
-+
-+v0-6-0:
-+
-+- Support for 2.4 and 2.6 (see Makefile)
-+
-+- Partial hard link support (creating works as expected, but already
-+  existing links in the base file system will be treated as if they
-+  were individual files).
-+
-+- Various bugfixes and cleanups.
-+
-+
-+v0-6-0-pre1:
-+
-+- This is mini_fo-0-6-0-pre1! This release is a complete rewrite of
-+  many vital mini_fo parts such as the old whiteout list code which
-+  has been replaced by the new META subsystem.
-+
-+- Light weight directory renaming implemented. This means if a
-+  directory is renamed via the mini_fo filesystem this will no longer
-+  result in a complete copy in storage, instead only one empty
-+  directory will be created. All base filed contained in the original
-+  directory stay there until modified.
-+
-+- Special files (creating, renaming, deleting etc.) now working.
-+
-+- Many bugfixes and cleanup, mini_fo is now a lot more stable.
-+
-+
-+v0-5-10:
-+
-+- Final release of the 0-5-* versions. Next will be a complete rewrite
-+  of many features. This release contains several bugfixes related to
-+  directory renaming.
-+
-+
-+v0-5-10-pre6:
-+
-+- Lots of cleanup and several bugfixes related to directory deleting
-+
-+- Directory renaming suddenly works, what is most likely due to the
-+  fact tha that "mv" is smart: if the classic rename doesn't work it
-+  will assume that source and target file are on different fs and will
-+  copy the directory and try to remove the source directory. Until
-+  directory removing wasn't implemented, it would fail to do this and
-+  rollback.
-+  So, directory renaming works for now, but it doesn't yet do what you
-+  would expect from a overlay fs, so use with care.
-+
-+
-+v0-5-10-pre5:
-+
-+- implemented directory deleting
-+- made parsing of mount options more stable
-+- New format of mount options! (See README)
-+- I can't reproduce the unknown panic with 2.4.25 anymore, so I'll
-+  happily assume it never existed!
-+
-+
-+Implemented features:
-+---------------------
-+
-+- creating hard links (see BUGS on already existing hard links)
-+- lightweight directory renaming
-+- renaming device files, pipes, sockets, etc.
-+- creating, renaming, deleting of special files
-+- deleting directorys
-+- general directory reading (simple "ls" )
-+- creating files in existing directorys
-+- creating directorys
-+- renaming files.
-+- reading and writing files (involves opening)
-+- appending to files (creates copy in storage)
-+- deleting files
-+- llseek works too, what allows editors to work
-+- persistency (a deleted file stay deleted over remounts)
-+- use of symbolic links
-+- creating of device files
-+
-+
-+Not (yet) implemented features:
-+-------------------------------
-+
-+- full hard link support.
-+
-+
-+
-+BUGS:
-+-----
-+
-+Hard links in the base file system will be treated as individual
-+files, not as links to one inode.
-+
-+The main problem with hard links isn't allowing to create them, but
-+their pure existence. If you modify a base hard link, the changes made
-+will only show up on this link, the other link will remain in the
-+original state. I hope to fix this someday. Please note that this does
-+not effect the special hard links '.' and '..', that are handled
-+seperately by the lower fs.
---- /dev/null
-+++ b/fs/mini_fo/state.c
-@@ -0,0 +1,620 @@
-+/*
-+ * Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+
-+/* create the storage file, setup new states */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+int create_sto_reg_file(dentry_t *dentry, int mode, struct nameidata *nd)
-+#else
-+int create_sto_reg_file(dentry_t *dentry, int mode)
-+#endif
-+{
-+	int err = 0;
-+	inode_t *dir;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	if(exists_in_storage(dentry)) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: wrong type or state.\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if (err) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: ERROR getting neg. sto dentry.\n");
-+		goto out;
-+	}
-+
-+	dir = dentry->d_parent->d_inode;
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* lock parent */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+        down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+        if (IS_ERR(hidden_sto_dir_dentry))
-+                goto out;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+			 hidden_sto_dentry,
-+			 mode, nd);
-+#else
-+	err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+			 hidden_sto_dentry,
-+			 mode);
-+#endif
-+        if(err) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: ERROR creating sto file.\n");
-+                goto out_lock;
-+	}
-+
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: ERROR creating sto file [2].\n");
-+                err = -EINVAL;
-+                goto out_lock;
-+        }
-+
-+        /* interpose the new inode */
-+        if(dtost(dentry) == DELETED) {
-+                dtost(dentry) = DEL_REWRITTEN;
-+                err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        }
-+        else if(dtost(dentry) == NON_EXISTANT) {
-+                dtost(dentry) = CREATED;
-+                err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        }
-+        else if(dtost(dentry) == UNMODIFIED) {
-+                dtost(dentry) = MODIFIED;
-+                /* interpose on new inode */
-+                if(itohi2(dentry->d_inode) != NULL) {
-+                        printk(KERN_CRIT "mini_fo: create_sto_file: invalid inode detected.\n");
-+                        err = -EINVAL;
-+                        goto out_lock;
-+                }
-+                itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	}
-+	fist_copy_attr_timesizes(dentry->d_parent->d_inode,
-+				 hidden_sto_dir_dentry->d_inode);
-+
-+ out_lock:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+        dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+/* create the sto dir, setup states */
-+int create_sto_dir(dentry_t *dentry, int mode)
-+{
-+	int err = 0;
-+	inode_t *dir;
-+	dentry_t *hidden_sto_dentry;
-+        dentry_t *hidden_sto_dir_dentry;
-+
-+	/* had to take the "!S_ISDIR(mode))" check out, because it failed */
-+	if(exists_in_storage(dentry)) {
-+                printk(KERN_CRIT "mini_fo: create_sto_dir: wrong type or state.\\
-+n");
-+                err = -EINVAL;
-+                goto out;
-+        }
-+
-+	err = get_neg_sto_dentry(dentry);
-+	if(err) {
-+		err = -EINVAL;
-+		goto out;
-+	}
-+
-+	dir = dentry->d_parent->d_inode;
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+	if (IS_ERR(hidden_sto_dir_dentry))
-+		goto out;
-+
-+	err = vfs_mkdir(hidden_sto_dir_dentry->d_inode,
-+			hidden_sto_dentry,
-+			mode);
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo: create_sto_dir: ERROR creating sto dir.\n");
-+		goto out_lock;
-+	}
-+
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: create_sto_dir: ERROR creating sto dir [2].\n");
-+		err = -EINVAL;
-+		goto out_lock;
-+	}
-+
-+	/* interpose the new inode */
-+	if(dtost(dentry) == DELETED) {
-+		dtost(dentry) = DEL_REWRITTEN;
-+		err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtopd(dentry)->state == NON_EXISTANT) {
-+		dtopd(dentry)->state = CREATED;
-+		err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtopd(dentry)->state == UNMODIFIED) {
-+		dtopd(dentry)->state = MODIFIED;
-+		/* interpose on new inode */
-+		if(itohi2(dentry->d_inode) != NULL) {
-+			printk(KERN_CRIT "mini_fo:  create_sto_dir: ERROR, invalid inode detected.\n");
-+			err = -EINVAL;
-+			goto out_lock;
-+		}
-+		itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	}
-+
-+	fist_copy_attr_timesizes(dir, hidden_sto_dir_dentry->d_inode);
-+
-+	/* initalize the wol list */
-+	itopd(dentry->d_inode)->deleted_list_size = -1;
-+	itopd(dentry->d_inode)->renamed_list_size = -1;
-+	meta_build_lists(dentry);
-+
-+
-+ out_lock:
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+int create_sto_nod(dentry_t *dentry, int mode, dev_t dev)
-+#else
-+int create_sto_nod(dentry_t *dentry, int mode, int dev)
-+#endif
-+{
-+	int err = 0;
-+	inode_t *dir;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	if(exists_in_storage(dentry)) {
-+		err = -EEXIST;
-+		goto out;
-+	}
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if (err) {
-+                printk(KERN_CRIT "mini_fo: create_sto_nod: ERROR getting neg. sto dentry.\n");
-+                goto out;
-+        }
-+
-+	dir = dentry->d_parent->d_inode;
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* lock parent */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+	if (IS_ERR(hidden_sto_dir_dentry))
-+		goto out;
-+
-+	err = vfs_mknod(hidden_sto_dir_dentry->d_inode, hidden_sto_dentry, mode, dev);
-+	if(err)
-+		goto out_lock;
-+
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: create_sto_nod: creating storage inode failed [1].\n");
-+		err = -EINVAL; /* return something indicating failure */
-+		goto out_lock;
-+	}
-+
-+	/* interpose the new inode */
-+	if(dtost(dentry) == DELETED) {
-+		dtost(dentry) = DEL_REWRITTEN;
-+		err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtost(dentry) == NON_EXISTANT) {
-+		dtost(dentry) = CREATED;
-+		err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtost(dentry) == UNMODIFIED) {
-+		dtost(dentry) = MODIFIED;
-+		/* interpose on new inode */
-+		if(itohi2(dentry->d_inode) != NULL) {
-+			printk(KERN_CRIT "mini_fo: create_sto_nod: error, invalid inode detected.\n");
-+			err = -EINVAL;
-+			goto out_lock;
-+		}
-+		itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	}
-+
-+	fist_copy_attr_timesizes(dir, hidden_sto_dir_dentry->d_inode);
-+
-+ out_lock:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+
-+/* unimplemented (and possibly not usefull):
-+
-+   nondir-del_to_del_rew
-+   nondir-non_exist_to_creat
-+
-+   dir-unmod_to_del
-+   dir-mod_to_del
-+   dir-creat_to_del
-+   dir-del_rew_to_del
-+   dir-del_to_del_rew
-+   dir-non_exist_to_creat
-+*/
-+
-+
-+/* bring a file of any type from state UNMODIFIED to MODIFIED */
-+int nondir_unmod_to_mod(dentry_t *dentry, int cp_flag)
-+{
-+	int err = 0;
-+	struct vfsmount *tgt_mnt;
-+	struct vfsmount *src_mnt;
-+	dentry_t *tgt_dentry;
-+	dentry_t *src_dentry;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if((dtost(dentry) != UNMODIFIED) ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if (err) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  ERROR getting neg. sto dentry.\n");
-+		goto out;
-+	}
-+
-+	/* create sto file */
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* lock parent */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+        down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+        if (IS_ERR(hidden_sto_dir_dentry))
-+                goto out;
-+
-+	/* handle different types of nondirs */
-+	if(S_ISCHR(dentry->d_inode->i_mode) ||
-+	   S_ISBLK(dentry->d_inode->i_mode)) {
-+		err = vfs_mknod(hidden_sto_dir_dentry->d_inode,
-+				hidden_sto_dentry,
-+				dtohd(dentry)->d_inode->i_mode,
-+				dtohd(dentry)->d_inode->i_rdev);
-+	}
-+
-+	else if(S_ISREG(dentry->d_inode->i_mode)) {
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+				 hidden_sto_dentry,
-+				 dtohd(dentry)->d_inode->i_mode, NULL);
-+#else
-+		err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+				 hidden_sto_dentry,
-+				 dtohd(dentry)->d_inode->i_mode);
-+#endif
-+	}
-+        if(err) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  ERROR creating sto file.\n");
-+                goto out_lock;
-+	}
-+
-+	/* interpose on new inode */
-+	if(itohi2(dentry->d_inode) != NULL) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  ERROR, invalid inode detected.\n");
-+		err = -EINVAL;
-+		goto out_lock;
-+	}
-+
-+	itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+
-+        fist_copy_attr_timesizes(dentry->d_parent->d_inode,
-+				 hidden_sto_dir_dentry->d_inode);
-+	dtost(dentry) = MODIFIED;
-+
-+	/* copy contents if regular file and cp_flag = 1 */
-+	if((cp_flag == 1) && S_ISREG(dentry->d_inode->i_mode)) {
-+
-+		/* unlock first */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		dput(hidden_sto_dir_dentry);
-+
-+		tgt_dentry = dtohd2(dentry);
-+		tgt_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+		src_dentry = dtohd(dentry);
-+		src_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt;
-+
-+		err = mini_fo_cp_cont(tgt_dentry, tgt_mnt,
-+				      src_dentry, src_mnt);
-+		if(err) {
-+			printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                          ERROR copying contents.\n");
-+		}
-+		goto out;
-+	}
-+
-+ out_lock:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+        dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+/* this function is currently identical to nondir_creat_to_del */
-+int nondir_del_rew_to_del(dentry_t *dentry)
-+{
-+	return nondir_creat_to_del(dentry);
-+}
-+
-+int nondir_creat_to_del(dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	inode_t *hidden_sto_dir_inode;
-+	dentry_t *hidden_sto_dir_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	/* for now this function serves for both state DEL_REWRITTEN and
-+	 * CREATED */
-+	if(!(dtost(dentry) == CREATED || (dtost(dentry) == DEL_REWRITTEN)) ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_mod_to_del/del_rew_to_del: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	hidden_sto_dir_inode = itohi2(dentry->d_parent->d_inode);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	/* avoid destroying the hidden inode if the file is in use */
-+	dget(hidden_sto_dentry);
-+	err = vfs_unlink(hidden_sto_dir_inode, hidden_sto_dentry);
-+	dput(hidden_sto_dentry);
-+	if(!err)
-+		d_delete(hidden_sto_dentry);
-+
-+	/* propagate number of hard-links */
-+	dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+
-+	dtost(dentry) = NON_EXISTANT;
-+
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+int nondir_mod_to_del(dentry_t *dentry)
-+{
-+	int err;
-+	dentry_t *hidden_sto_dentry;
-+	inode_t *hidden_sto_dir_inode;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) != MODIFIED ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_mod_to_del: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	hidden_sto_dir_inode = itohi2(dentry->d_parent->d_inode);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* was hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	/* avoid destroying the hidden inode if the file is in use */
-+	dget(hidden_sto_dentry);
-+	err = vfs_unlink(hidden_sto_dir_inode, hidden_sto_dentry);
-+	dput(hidden_sto_dentry);
-+	if(!err)
-+		d_delete(hidden_sto_dentry);
-+
-+	/* propagate number of hard-links */
-+	dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+
-+	/* dput base dentry, this will relase the inode and free the
-+	 * dentry, as we will never need it again. */
-+	dput(dtohd(dentry));
-+	dtohd(dentry) = NULL;
-+	dtost(dentry) = DELETED;
-+
-+	/* add deleted file to META-file */
-+	meta_add_d_entry(dentry->d_parent,
-+			 dentry->d_name.name,
-+			 dentry->d_name.len);
-+
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+int nondir_unmod_to_del(dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) != UNMODIFIED ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_del: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	 /* next we have to get a negative dentry for the storage file */
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if(err)
-+		goto out;
-+
-+	/* add deleted file to META lists */
-+	err = meta_add_d_entry(dentry->d_parent,
-+			       dentry->d_name.name,
-+			       dentry->d_name.len);
-+
-+	if(err)
-+		goto out;
-+
-+	/* dput base dentry, this will relase the inode and free the
-+	 * dentry, as we will never need it again. */
-+	dput(dtohd(dentry));
-+	dtohd(dentry) = NULL;
-+	dtost(dentry) = DELETED;
-+
-+ out:
-+	return err;
-+}
-+
-+/* bring a dir from state UNMODIFIED to MODIFIED */
-+int dir_unmod_to_mod(dentry_t *dentry)
-+{
-+	int err;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) != UNMODIFIED ||
-+	   !S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: dir_unmod_to_mod: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* this creates our dir incl. sto. structure */
-+	err = build_sto_structure(dentry->d_parent, dentry);
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo: dir_unmod_to_mod: \
-+                                  build_sto_structure failed.\n");
-+		goto out;
-+	}
-+ out:
-+	return err;
-+}
-+
---- /dev/null
-+++ b/fs/mini_fo/super.c
-@@ -0,0 +1,281 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+
-+STATIC void
-+mini_fo_read_inode(inode_t *inode)
-+{
-+	static struct address_space_operations mini_fo_empty_aops;
-+
-+	__itopd(inode) = kmalloc(sizeof(struct mini_fo_inode_info), GFP_KERNEL);
-+	if (!itopd(inode)) {
-+		printk("<0>%s:%s:%d: No kernel memory!\n", __FILE__, __FUNCTION__, __LINE__);
-+		ASSERT(NULL);
-+	}
-+	itohi(inode) = NULL;
-+	itohi2(inode) = NULL;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	inode->i_version++;
-+#else
-+	inode->i_version = ++event;	/* increment inode version */
-+#endif
-+	inode->i_op = &mini_fo_main_iops;
-+	inode->i_fop = &mini_fo_main_fops;
-+#if 0
-+	/*
-+	 * XXX: To export a file system via NFS, it has to have the
-+	 * FS_REQUIRES_DEV flag, so turn it on.  But should we inherit it from
-+	 * the lower file system, or can we allow our file system to be exported
-+	 * even if the lower one cannot be natively exported.
-+	 */
-+	inode->i_sb->s_type->fs_flags |= FS_REQUIRES_DEV;
-+	/*
-+	 * OK, the above was a hack, which is now turned off because it may
-+	 * cause a panic/oops on some systems.  The correct way to export a
-+	 * "nodev" filesystem is via using nfs-utils > 1.0 and the "fsid=" export
-+	 * parameter, which requires 2.4.20 or later.
-+	 */
-+#endif
-+	/* I don't think ->a_ops is ever allowed to be NULL */
-+	inode->i_mapping->a_ops = &mini_fo_empty_aops;
-+}
-+
-+
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+/*
-+ * No need to call write_inode() on the lower inode, as it
-+ * will have been marked 'dirty' anyway. But we might need
-+ * to write some of our own stuff to disk.
-+ */
-+STATIC void
-+mini_fo_write_inode(inode_t *inode, int sync)
-+{
-+	print_entry_location();
-+	print_exit_location();
-+}
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+
-+
-+STATIC void
-+mini_fo_put_inode(inode_t *inode)
-+{
-+	/*
-+	 * This is really funky stuff:
-+	 * Basically, if i_count == 1, iput will then decrement it and this inode will be destroyed.
-+	 * It is currently holding a reference to the hidden inode.
-+	 * Therefore, it needs to release that reference by calling iput on the hidden inode.
-+	 * iput() _will_ do it for us (by calling our clear_inode), but _only_ if i_nlink == 0.
-+	 * The problem is, NFS keeps i_nlink == 1 for silly_rename'd files.
-+	 * So we must for our i_nlink to 0 here to trick iput() into calling our clear_inode.
-+	 */
-+	if (atomic_read(&inode->i_count) == 1)
-+		inode->i_nlink = 0;
-+}
-+
-+
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+/*
-+ * we now define delete_inode, because there are two VFS paths that may
-+ * destroy an inode: one of them calls clear inode before doing everything
-+ * else that's needed, and the other is fine.  This way we truncate the inode
-+ * size (and its pages) and then clear our own inode, which will do an iput
-+ * on our and the lower inode.
-+ */
-+STATIC void
-+mini_fo_delete_inode(inode_t *inode)
-+{
-+	print_entry_location();
-+
-+	fist_checkinode(inode, "mini_fo_delete_inode IN");
-+	inode->i_size = 0;		/* every f/s seems to do that */
-+	clear_inode(inode);
-+
-+	print_exit_location();
-+}
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+
-+
-+/* final actions when unmounting a file system */
-+STATIC void
-+mini_fo_put_super(super_block_t *sb)
-+{
-+	if (stopd(sb)) {
-+		mntput(stopd(sb)->hidden_mnt);
-+		mntput(stopd(sb)->hidden_mnt2);
-+
-+		/* mk: no! dput(stopd(sb)->base_dir_dentry);
-+		   dput(stopd(sb)->storage_dir_dentry); */
-+
-+		kfree(stopd(sb));
-+		__stopd(sb) = NULL;
-+	}
-+}
-+
-+
-+#ifdef NOT_NEEDED
-+/*
-+ * This is called in do_umount before put_super.
-+ * The superblock lock is not held yet.
-+ * We probably do not need to define this or call write_super
-+ * on the hidden_sb, because sync_supers() will get to hidden_sb
-+ * sooner or later.  But it is also called from file_fsync()...
-+ */
-+STATIC void
-+mini_fo_write_super(super_block_t *sb)
-+{
-+	return;
-+}
-+#endif /* NOT_NEEDED */
-+
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_statfs(struct dentry *d, struct kstatfs *buf)
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_statfs(super_block_t *sb, struct kstatfs *buf)
-+#else
-+mini_fo_statfs(super_block_t *sb, struct statfs *buf)
-+#endif
-+{
-+	int err = 0;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+	struct dentry *hidden_d;
-+
-+	hidden_d = dtohd(d);
-+	err = vfs_statfs(hidden_d, buf);
-+#else
-+	super_block_t *hidden_sb;
-+
-+	hidden_sb = stohs(sb);
-+	err = vfs_statfs(hidden_sb, buf);
-+#endif
-+
-+	return err;
-+}
-+
-+
-+/*
-+ * XXX: not implemented.  This is not allowed yet.
-+ * Should we call this on the hidden_sb?  Probably not.
-+ */
-+STATIC int
-+mini_fo_remount_fs(super_block_t *sb, int *flags, char *data)
-+{
-+	//printk(KERN_CRIT "mini_fo_remount_fs: WARNING, this function is umimplemented.\n");
-+	return -ENOSYS;
-+}
-+
-+
-+/*
-+ * Called by iput() when the inode reference count reached zero
-+ * and the inode is not hashed anywhere.  Used to clear anything
-+ * that needs to be, before the inode is completely destroyed and put
-+ * on the inode free list.
-+ */
-+STATIC void
-+mini_fo_clear_inode(inode_t *inode)
-+{
-+	/*
-+	 * Decrement a reference to a hidden_inode, which was incremented
-+	 * by our read_inode when it was created initially.
-+	 */
-+
-+	/* release the wol_list */
-+	if(S_ISDIR(inode->i_mode)) {
-+		__meta_put_lists(inode);
-+	}
-+
-+	/* mk: fan out fun */
-+	if(itohi(inode))
-+		iput(itohi(inode));
-+	if(itohi2(inode))
-+		iput(itohi2(inode));
-+
-+	// XXX: why this assertion fails?
-+	// because it doesn't like us
-+	// ASSERT((inode->i_state & I_DIRTY) == 0);
-+	kfree(itopd(inode));
-+	__itopd(inode) = NULL;
-+}
-+
-+
-+/*
-+ * Called in do_umount() if the MNT_FORCE flag was used and this
-+ * function is defined.  See comment in linux/fs/super.c:do_umount().
-+ * Used only in nfs, to kill any pending RPC tasks, so that subsequent
-+ * code can actually succeed and won't leave tasks that need handling.
-+ *
-+ * PS. I wonder if this is somehow useful to undo damage that was
-+ * left in the kernel after a user level file server (such as amd)
-+ * dies.
-+ */
-+STATIC void
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_umount_begin(struct vfsmount *mnt, int flags)
-+{
-+	struct vfsmount *hidden_mnt;
-+
-+	hidden_mnt = stopd(mnt->mnt_sb)->hidden_mnt;
-+
-+	if (hidden_mnt->mnt_sb->s_op->umount_begin)
-+		hidden_mnt->mnt_sb->s_op->umount_begin(hidden_mnt, flags);
-+
-+}
-+#else
-+mini_fo_umount_begin(super_block_t *sb)
-+{
-+	super_block_t *hidden_sb;
-+
-+	hidden_sb = stohs(sb);
-+
-+	if (hidden_sb->s_op->umount_begin)
-+		hidden_sb->s_op->umount_begin(hidden_sb);
-+
-+}
-+#endif
-+
-+
-+struct super_operations mini_fo_sops =
-+{
-+	read_inode:		mini_fo_read_inode,
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+	write_inode:	mini_fo_write_inode,
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+	put_inode:		mini_fo_put_inode,
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+	delete_inode:	mini_fo_delete_inode,
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+	put_super:		mini_fo_put_super,
-+	statfs:		mini_fo_statfs,
-+	remount_fs:		mini_fo_remount_fs,
-+	clear_inode:	mini_fo_clear_inode,
-+	umount_begin:	mini_fo_umount_begin,
-+};
diff --git a/target/linux/generic-2.6/patches-2.6.25/210-mini_fo_2.6.25_fixes.patch b/target/linux/generic-2.6/patches-2.6.25/210-mini_fo_2.6.25_fixes.patch
deleted file mode 100644
index d71e3b6fa..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/210-mini_fo_2.6.25_fixes.patch
+++ /dev/null
@@ -1,143 +0,0 @@
---- a/fs/mini_fo/main.c
-+++ b/fs/mini_fo/main.c
-@@ -79,6 +79,7 @@ mini_fo_tri_interpose(dentry_t *hidden_d
- 	 * of the new inode's fields
- 	 */
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
- 	/*
- 	 * original: inode = iget(sb, hidden_inode->i_ino);
- 	 */
-@@ -87,6 +88,13 @@ mini_fo_tri_interpose(dentry_t *hidden_d
- 		err = -EACCES;		/* should be impossible??? */
- 		goto out;
- 	}
-+#else
-+	inode = mini_fo_iget(sb, iunique(sb, 25));
-+	if (IS_ERR(inode)) {
-+		err = PTR_ERR(inode);
-+		goto out;
-+	}
-+#endif
- 
- 	/*
- 	 * interpose the inode if not already interposed
-@@ -184,9 +192,9 @@ mini_fo_parse_options(super_block_t *sb,
- 				hidden_root = ERR_PTR(err);
- 				goto out;
- 			}
--			hidden_root = nd.dentry;
--			stopd(sb)->base_dir_dentry = nd.dentry;
--			stopd(sb)->hidden_mnt = nd.mnt;
-+			hidden_root = nd_get_dentry(&nd);
-+			stopd(sb)->base_dir_dentry = nd_get_dentry(&nd);
-+			stopd(sb)->hidden_mnt = nd_get_mnt(&nd);
- 
- 		} else if(!strncmp("sto=", options, 4)) {
- 			/* parse the storage dir */
-@@ -204,9 +212,9 @@ mini_fo_parse_options(super_block_t *sb,
- 				hidden_root2 = ERR_PTR(err);
- 				goto out;
- 			}
--			hidden_root2 = nd2.dentry;
--			stopd(sb)->storage_dir_dentry = nd2.dentry;
--			stopd(sb)->hidden_mnt2 = nd2.mnt;
-+			hidden_root2 = nd_get_dentry(&nd2);
-+			stopd(sb)->storage_dir_dentry = nd_get_dentry(&nd2);
-+			stopd(sb)->hidden_mnt2 = nd_get_mnt(&nd2);
- 			stohs2(sb) = hidden_root2->d_sb;
- 
- 			/* validate storage dir, this is done in
---- a/fs/mini_fo/mini_fo.h
-+++ b/fs/mini_fo/mini_fo.h
-@@ -302,6 +302,10 @@ extern int mini_fo_tri_interpose(dentry_
- extern int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
- 			   dentry_t *src_dentry, struct vfsmount *src_mnt);
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
-+extern struct inode *mini_fo_iget(struct super_block *sb, unsigned long ino);
-+#endif
-+
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
- 
-@@ -501,6 +505,29 @@ static inline void double_unlock(struct 
- #endif  /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
- #endif /* __KERNEL__ */
- 
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
-+static inline dentry_t *nd_get_dentry(struct nameidata *nd)
-+{
-+	return (nd->path.dentry);
-+}
-+
-+static inline struct vfsmount *nd_get_mnt(struct nameidata *nd)
-+{
-+	return (nd->path.mnt);
-+}
-+#else
-+static inline dentry_t *nd_get_dentry(struct nameidata *nd)
-+{
-+	return (nd->dentry);
-+}
-+
-+static inline struct vfsmount *nd_get_mnt(struct nameidata *nd)
-+{
-+	return (nd->mnt);
-+}
-+#endif
-+
- /*
-  * Definitions for user and kernel code
-  */
---- a/fs/mini_fo/super.c
-+++ b/fs/mini_fo/super.c
-@@ -262,10 +262,31 @@ mini_fo_umount_begin(super_block_t *sb)
- }
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
-+struct inode *
-+mini_fo_iget(struct super_block *sb, unsigned long ino)
-+{
-+	struct inode *inode;
-+
-+	inode = iget_locked(sb, ino);
-+	if (!inode)
-+		return ERR_PTR(-ENOMEM);
-+
-+	if (!(inode->i_state & I_NEW))
-+		return inode;
-+
-+	mini_fo_read_inode(inode);
-+
-+	unlock_new_inode(inode);
-+	return inode;
-+}
-+#endif /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25) */
- 
- struct super_operations mini_fo_sops =
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
- 	read_inode:		mini_fo_read_inode,
-+#endif
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
- 	write_inode:	mini_fo_write_inode,
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
---- a/fs/mini_fo/aux.c
-+++ b/fs/mini_fo/aux.c
-@@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb, 
- 	err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
- 
- 	/* validate */
--	if (err || !nd.dentry || !nd.dentry->d_inode) {
-+	if (err || !nd_get_dentry(&nd) || !nd_get_dentry(&nd)->d_inode) {
- 		printk(KERN_CRIT "mini_fo: bpath_walk: path_walk failed.\n");
- 		return NULL;
- 	}
--	return nd.dentry;
-+	return nd_get_dentry(&nd);
- }
- 
- 
diff --git a/target/linux/generic-2.6/patches-2.6.25/211-mini_fo_2.6.25_dentry_open_war.patch b/target/linux/generic-2.6/patches-2.6.25/211-mini_fo_2.6.25_dentry_open_war.patch
deleted file mode 100644
index 48a19429b..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/211-mini_fo_2.6.25_dentry_open_war.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- a/fs/mini_fo/meta.c
-+++ b/fs/mini_fo/meta.c
-@@ -442,6 +442,11 @@ int meta_write_d_entry(dentry_t *dentry,
- 			   S_IRUSR | S_IWUSR);
- #endif
- 	}
-+
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-@@ -535,6 +540,11 @@ int meta_write_r_entry(dentry_t *dentry,
- 			   meta_dentry, S_IRUSR | S_IWUSR);
- #endif
- 	}
-+
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-@@ -671,14 +681,16 @@ int meta_sync_d_list(dentry_t *dentry, i
- 		}
- 	}
- 
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-                                   ERROR opening meta file.\n");
--		/* we don't mntget so we dont't mntput (for now)
--		 * mntput(meta_mnt);
--		 */
-+		mntput(meta_mnt);
- 		dput(meta_dentry);
- 		err = -1;
-                 goto out;
-@@ -811,14 +823,16 @@ int meta_sync_r_list(dentry_t *dentry, i
- 		}
- 	}
- 
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-                                   ERROR opening meta file.\n");
--		/* we don't mntget so we dont't mntput (for now)
--		 * mntput(meta_mnt);
--		 */
-+		mntput(meta_mnt);
- 		dput(meta_dentry);
- 		err = -1;
-                 goto out;
diff --git a/target/linux/generic-2.6/patches-2.6.25/213-kobject_uevent.patch b/target/linux/generic-2.6/patches-2.6.25/213-kobject_uevent.patch
deleted file mode 100644
index f91db03bd..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/213-kobject_uevent.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/lib/kobject_uevent.c
-+++ b/lib/kobject_uevent.c
-@@ -27,7 +27,8 @@ u64 uevent_seqnum;
- char uevent_helper[UEVENT_HELPER_PATH_LEN] = CONFIG_UEVENT_HELPER_PATH;
- static DEFINE_SPINLOCK(sequence_lock);
- #if defined(CONFIG_NET)
--static struct sock *uevent_sock;
-+struct sock *uevent_sock = NULL;
-+EXPORT_SYMBOL_GPL(uevent_sock);
- #endif
- 
- /* the strings here must match the enum in include/linux/kobject.h */
-@@ -40,6 +41,18 @@ static const char *kobject_actions[] = {
- 	[KOBJ_OFFLINE] =	"offline",
- };
- 
-+u64 uevent_next_seqnum(void)
-+{
-+	u64 seq;
-+
-+	spin_lock(&sequence_lock);
-+	seq = ++uevent_seqnum;
-+	spin_unlock(&sequence_lock);
-+	
-+	return seq;
-+}
-+EXPORT_SYMBOL_GPL(uevent_next_seqnum);
-+
- /**
-  * kobject_action_type - translate action string to numeric type
-  *
-@@ -192,9 +205,7 @@ int kobject_uevent_env(struct kobject *k
- 		kobj->state_remove_uevent_sent = 1;
- 
- 	/* we will send an event, so request a new sequence number */
--	spin_lock(&sequence_lock);
--	seq = ++uevent_seqnum;
--	spin_unlock(&sequence_lock);
-+	seq = uevent_next_seqnum();
- 	retval = add_uevent_var(env, "SEQNUM=%llu", (unsigned long long)seq);
- 	if (retval)
- 		goto exit;
diff --git a/target/linux/generic-2.6/patches-2.6.25/220-sound_kconfig.patch b/target/linux/generic-2.6/patches-2.6.25/220-sound_kconfig.patch
deleted file mode 100644
index d215d1207..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/220-sound_kconfig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/sound/core/Kconfig
-+++ b/sound/core/Kconfig
-@@ -9,7 +9,7 @@ config SND_PCM
- 	depends on SND
- 
- config SND_HWDEP
--	tristate
-+	tristate "Sound hardware support"
- 	depends on SND
- 
- config SND_RAWMIDI
diff --git a/target/linux/generic-2.6/patches-2.6.25/30-fix_conflicting_getline.patch b/target/linux/generic-2.6/patches-2.6.25/30-fix_conflicting_getline.patch
deleted file mode 100644
index 0a68134f7..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/30-fix_conflicting_getline.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/scripts/unifdef.c
-+++ b/scripts/unifdef.c
-@@ -206,7 +206,7 @@ static void             done(void);
- static void             error(const char *);
- static int              findsym(const char *);
- static void             flushline(bool);
--static Linetype         getline(void);
-+static Linetype         get_line(void);
- static Linetype         ifeval(const char **);
- static void             ignoreoff(void);
- static void             ignoreon(void);
-@@ -512,7 +512,7 @@ process(void)
- 
- 	for (;;) {
- 		linenum++;
--		lineval = getline();
-+		lineval = get_line();
- 		trans_table[ifstate[depth]][lineval]();
- 		debug("process %s -> %s depth %d",
- 		    linetype_name[lineval],
-@@ -526,7 +526,7 @@ process(void)
-  * help from skipcomment().
-  */
- static Linetype
--getline(void)
-+get_line(void)
- {
- 	const char *cp;
- 	int cursym;
diff --git a/target/linux/generic-2.6/patches-2.6.25/400-ledtrig_morse.patch b/target/linux/generic-2.6/patches-2.6.25/400-ledtrig_morse.patch
deleted file mode 100644
index 7208dde0e..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/400-ledtrig_morse.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -181,4 +181,8 @@ config LEDS_TRIGGER_HEARTBEAT
- 	  load average.
- 	  If unsure, say Y.
- 
-+config LEDS_TRIGGER_MORSE
-+	tristate "LED Morse Trigger"
-+	depends on LEDS_TRIGGERS
-+
- endif # NEW_LEDS
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -26,3 +26,4 @@ obj-$(CONFIG_LEDS_HP6XX)		+= leds-hp6xx.
- obj-$(CONFIG_LEDS_TRIGGER_TIMER)	+= ledtrig-timer.o
- obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK)	+= ledtrig-ide-disk.o
- obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)	+= ledtrig-heartbeat.o
-+obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
diff --git a/target/linux/generic-2.6/patches-2.6.25/402-ledtrig_default_on.patch b/target/linux/generic-2.6/patches-2.6.25/402-ledtrig_default_on.patch
deleted file mode 100644
index d20eb5eae..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/402-ledtrig_default_on.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -185,4 +185,11 @@ config LEDS_TRIGGER_MORSE
- 	tristate "LED Morse Trigger"
- 	depends on LEDS_TRIGGERS
- 
-+config LEDS_TRIGGER_DEFAULT_ON
-+	tristate "LED Default ON Trigger"
-+	depends on LEDS_TRIGGERS
-+	help
-+	  This allows LEDs to be initialised in the ON state.
-+	  If unsure, say Y.
-+
- endif # NEW_LEDS
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -27,3 +27,4 @@ obj-$(CONFIG_LEDS_TRIGGER_TIMER)	+= ledt
- obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK)	+= ledtrig-ide-disk.o
- obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)	+= ledtrig-heartbeat.o
- obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
-+obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o
diff --git a/target/linux/generic-2.6/patches-2.6.25/403-ds1672_detect.patch b/target/linux/generic-2.6/patches-2.6.25/403-ds1672_detect.patch
deleted file mode 100644
index 86c26346a..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/403-ds1672_detect.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/drivers/rtc/rtc-ds1672.c
-+++ b/drivers/rtc/rtc-ds1672.c
-@@ -13,10 +13,10 @@
- #include <linux/i2c.h>
- #include <linux/rtc.h>
- 
--#define DRV_VERSION "0.3"
-+#define DRV_VERSION "0.4"
- 
--/* Addresses to scan: none. This chip cannot be detected. */
--static const unsigned short normal_i2c[] = { I2C_CLIENT_END };
-+/* Addresses to scan: 0x68 */
-+static const unsigned short normal_i2c[] = { 0x68, I2C_CLIENT_END };
- 
- /* Insmod parameters */
- I2C_CLIENT_INSMOD;
diff --git a/target/linux/generic-2.6/patches-2.6.25/410-gpio_buttons.patch b/target/linux/generic-2.6/patches-2.6.25/410-gpio_buttons.patch
deleted file mode 100644
index 46ca987e5..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/410-gpio_buttons.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/drivers/input/misc/Kconfig
-+++ b/drivers/input/misc/Kconfig
-@@ -197,4 +197,20 @@ config HP_SDC_RTC
- 	  Say Y here if you want to support the built-in real time clock
- 	  of the HP SDC controller.
- 
-+config INPUT_GPIO_BUTTONS
-+	tristate "Polled GPIO buttons interface"
-+	depends on GENERIC_GPIO
-+	select INPUT_POLLDEV
-+	help
-+	  This driver implements support for buttons connected
-+	  to GPIO pins of various CPUs (and some other chips).
-+
-+	  Say Y here if your device has buttons connected
-+	  directly to such GPIO pins.  Your board-specific
-+	  setup logic must also provide a platform device,
-+	  with configuration data saying which GPIOs are used.
-+
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called gpio-buttons.
-+
- endif
---- a/drivers/input/misc/Makefile
-+++ b/drivers/input/misc/Makefile
-@@ -19,3 +19,4 @@ obj-$(CONFIG_INPUT_YEALINK)		+= yealink.
- obj-$(CONFIG_HP_SDC_RTC)		+= hp_sdc_rtc.o
- obj-$(CONFIG_INPUT_UINPUT)		+= uinput.o
- obj-$(CONFIG_INPUT_APANEL)		+= apanel.o
-+obj-$(CONFIG_INPUT_GPIO_BUTTONS)	+= gpio_buttons.o
diff --git a/target/linux/generic-2.6/patches-2.6.25/420-gpiodev.patch b/target/linux/generic-2.6/patches-2.6.25/420-gpiodev.patch
deleted file mode 100644
index de8b57adf..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/420-gpiodev.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/drivers/char/Kconfig
-+++ b/drivers/char/Kconfig
-@@ -955,6 +955,13 @@ config CS5535_GPIO
- 
- 	  If compiled as a module, it will be called cs5535_gpio.
- 
-+config GPIO_DEVICE
-+	tristate "GPIO device support"
-+	depends on GENERIC_GPIO
-+	help
-+	  Say Y to enable Linux GPIO device support.  This allows control of
-+	  GPIO pins using a character device
-+
- config GPIO_VR41XX
- 	tristate "NEC VR4100 series General-purpose I/O Unit support"
- 	depends on CPU_VR41XX
---- a/drivers/char/Makefile
-+++ b/drivers/char/Makefile
-@@ -94,6 +94,7 @@ obj-$(CONFIG_SCx200_GPIO)	+= scx200_gpio
- obj-$(CONFIG_PC8736x_GPIO)	+= pc8736x_gpio.o
- obj-$(CONFIG_NSC_GPIO)		+= nsc_gpio.o
- obj-$(CONFIG_CS5535_GPIO)	+= cs5535_gpio.o
-+obj-$(CONFIG_GPIO_DEVICE)	+= gpio_dev.o
- obj-$(CONFIG_GPIO_VR41XX)	+= vr41xx_giu.o
- obj-$(CONFIG_GPIO_TB0219)	+= tb0219.o
- obj-$(CONFIG_TELCLOCK)		+= tlclk.o
diff --git a/target/linux/generic-2.6/patches-2.6.25/510-yaffs_support.patch b/target/linux/generic-2.6/patches-2.6.25/510-yaffs_support.patch
deleted file mode 100644
index cef6ea592..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/510-yaffs_support.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/fs/Kconfig
-+++ b/fs/Kconfig
-@@ -421,6 +421,7 @@ config FS_POSIX_ACL
- 
- source "fs/xfs/Kconfig"
- source "fs/gfs2/Kconfig"
-+source "fs/yaffs2/Kconfig"
- 
- config OCFS2_FS
- 	tristate "OCFS2 file system support"
---- a/fs/Makefile
-+++ b/fs/Makefile
-@@ -121,3 +121,4 @@ obj-$(CONFIG_HPPFS)		+= hppfs/
- obj-$(CONFIG_DEBUG_FS)		+= debugfs/
- obj-$(CONFIG_OCFS2_FS)		+= ocfs2/
- obj-$(CONFIG_GFS2_FS)           += gfs2/
-+obj-$(CONFIG_YAFFS_FS)		+= yaffs2/
diff --git a/target/linux/generic-2.6/patches-2.6.25/512-yaffs_2.6.25_fix.patch b/target/linux/generic-2.6/patches-2.6.25/512-yaffs_2.6.25_fix.patch
deleted file mode 100644
index c12733634..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/512-yaffs_2.6.25_fix.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- a/fs/yaffs2/yaffs_fs.c
-+++ b/fs/yaffs2/yaffs_fs.c
-@@ -181,7 +181,13 @@ static int yaffs_statfs(struct super_blo
- #else
- static int yaffs_statfs(struct super_block *sb, struct statfs *buf);
- #endif
-+
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25))
-+static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino);
-+#else
- static void yaffs_read_inode(struct inode *inode);
-+#endif
-+
- 
- static void yaffs_put_inode(struct inode *inode);
- static void yaffs_delete_inode(struct inode *);
-@@ -284,7 +290,9 @@ static struct file_operations yaffs_dir_
- 
- static struct super_operations yaffs_super_ops = {
- 	.statfs = yaffs_statfs,
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25))
- 	.read_inode = yaffs_read_inode,
-+#endif
- 	.put_inode = yaffs_put_inode,
- 	.put_super = yaffs_put_super,
- 	.delete_inode = yaffs_delete_inode,
-@@ -844,11 +852,17 @@ struct inode *yaffs_get_inode(struct sup
- 	T(YAFFS_TRACE_OS,
- 	  (KERN_DEBUG "yaffs_get_inode for object %d\n", obj->objectId));
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25))
-+	inode = yaffs_iget(sb, obj->objectId);
-+	if (IS_ERR(inode))
-+		return NULL;
-+#else
- 	inode = iget(sb, obj->objectId);
- 
- 	/* NB Side effect: iget calls back to yaffs_read_inode(). */
- 	/* iget also increments the inode's i_count */
- 	/* NB You can't be holding grossLock or deadlock will happen! */
-+#endif
- 
- 	return inode;
- }
-@@ -1427,6 +1441,39 @@ static int yaffs_sync_fs(struct super_bl
- }
- 
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25))
-+static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino)
-+{
-+	yaffs_Object *obj;
-+	yaffs_Device *dev = yaffs_SuperToDevice(sb);
-+	struct inode *inode;
-+
-+	T(YAFFS_TRACE_OS,
-+	  (KERN_DEBUG "yaffs_iget for %lu\n", ino));
-+
-+	inode = iget_locked(sb, ino);
-+	if (!inode)
-+		return ERR_PTR(-ENOMEM);
-+	if (!(inode->i_state & I_NEW))
-+		return inode;
-+
-+	/* NB This is called as a side effect of other functions, but
-+	 * we had to release the lock to prevent deadlocks, so
-+	 * need to lock again.
-+	 */
-+
-+	yaffs_GrossLock(dev);
-+
-+	obj = yaffs_FindObjectByNumber(dev, inode->i_ino);
-+
-+	yaffs_FillInodeFromObject(inode, obj);
-+
-+	yaffs_GrossUnlock(dev);
-+
-+	unlock_new_inode(inode);
-+	return inode;
-+}
-+#else
- static void yaffs_read_inode(struct inode *inode)
- {
- 	/* NB This is called as a side effect of other functions, but
-@@ -1448,6 +1495,7 @@ static void yaffs_read_inode(struct inod
- 
- 	yaffs_GrossUnlock(dev);
- }
-+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)) */
- 
- static LIST_HEAD(yaffs_dev_list);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.25/600-phy_extension.patch b/target/linux/generic-2.6/patches-2.6.25/600-phy_extension.patch
deleted file mode 100644
index c4ef46529..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/600-phy_extension.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/drivers/net/phy/phy.c
-+++ b/drivers/net/phy/phy.c
-@@ -348,6 +348,50 @@ int phy_ethtool_gset(struct phy_device *
- }
- EXPORT_SYMBOL(phy_ethtool_gset);
- 
-+int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr)
-+{
-+	u32 cmd;
-+	int tmp;
-+	struct ethtool_cmd ecmd = { ETHTOOL_GSET };
-+	struct ethtool_value edata = { ETHTOOL_GLINK };
-+
-+	if (get_user(cmd, (u32 *) useraddr))
-+		return -EFAULT;
-+
-+	switch (cmd) {
-+	case ETHTOOL_GSET:
-+		phy_ethtool_gset(phydev, &ecmd);
-+		if (copy_to_user(useraddr, &ecmd, sizeof(ecmd)))
-+			return -EFAULT;
-+		return 0;
-+	
-+	case ETHTOOL_SSET:
-+		if (copy_from_user(&ecmd, useraddr, sizeof(ecmd)))
-+			return -EFAULT;
-+		return phy_ethtool_sset(phydev, &ecmd);
-+
-+	case ETHTOOL_NWAY_RST:
-+		/* if autoneg is off, it's an error */
-+		tmp = phy_read(phydev, MII_BMCR);
-+		if (tmp & BMCR_ANENABLE) {
-+			tmp |= (BMCR_ANRESTART);
-+			phy_write(phydev, MII_BMCR, tmp);
-+			return 0;
-+		}	
-+		return -EINVAL;
-+
-+	case ETHTOOL_GLINK:
-+		edata.data = (phy_read(phydev,
-+				MII_BMSR) & BMSR_LSTATUS) ? 1 : 0;
-+		if (copy_to_user(useraddr, &edata, sizeof(edata)))
-+			return -EFAULT;
-+		return 0;
-+	}
-+
-+	return -EOPNOTSUPP;
-+}
-+EXPORT_SYMBOL(phy_ethtool_ioctl);
-+
- /**
-  * phy_mii_ioctl - generic PHY MII ioctl interface
-  * @phydev: the phy_device struct
---- a/include/linux/phy.h
-+++ b/include/linux/phy.h
-@@ -399,6 +399,7 @@ void phy_start_machine(struct phy_device
- void phy_stop_machine(struct phy_device *phydev);
- int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
- int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);
-+int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr);
- int phy_mii_ioctl(struct phy_device *phydev,
- 		struct mii_ioctl_data *mii_data, int cmd);
- int phy_start_interrupts(struct phy_device *phydev);
diff --git a/target/linux/generic-2.6/patches-2.6.25/700-powerpc_git.patch b/target/linux/generic-2.6/patches-2.6.25/700-powerpc_git.patch
deleted file mode 100644
index a47129171..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/700-powerpc_git.patch
+++ /dev/null
@@ -1,102433 +0,0 @@
---- a/Documentation/kernel-parameters.txt
-+++ b/Documentation/kernel-parameters.txt
-@@ -930,6 +930,8 @@ and is between 256 and 4096 characters. 
- 
- 	l2cr=		[PPC]
- 
-+	l3cr=		[PPC]
-+
- 	lapic		[X86-32,APIC] Enable the local APIC even if BIOS
- 			disabled it.
- 
---- a/Documentation/powerpc/booting-without-of.txt
-+++ b/Documentation/powerpc/booting-without-of.txt
-@@ -59,12 +59,39 @@ Table of Contents
-       p) Freescale Synchronous Serial Interface
- 	  q) USB EHCI controllers
- 
--  VII - Specifying interrupt information for devices
-+  VII - Marvell Discovery mv64[345]6x System Controller chips
-+    1) The /system-controller node
-+    2) Child nodes of /system-controller
-+      a) Marvell Discovery MDIO bus
-+      b) Marvell Discovery ethernet controller
-+      c) Marvell Discovery PHY nodes
-+      d) Marvell Discovery SDMA nodes
-+      e) Marvell Discovery BRG nodes
-+      f) Marvell Discovery CUNIT nodes
-+      g) Marvell Discovery MPSCROUTING nodes
-+      h) Marvell Discovery MPSCINTR nodes
-+      i) Marvell Discovery MPSC nodes
-+      j) Marvell Discovery Watch Dog Timer nodes
-+      k) Marvell Discovery I2C nodes
-+      l) Marvell Discovery PIC (Programmable Interrupt Controller) nodes
-+      m) Marvell Discovery MPP (Multipurpose Pins) multiplexing nodes
-+      n) Marvell Discovery GPP (General Purpose Pins) nodes
-+      o) Marvell Discovery PCI host bridge node
-+      p) Marvell Discovery CPU Error nodes
-+      q) Marvell Discovery SRAM Controller nodes
-+      r) Marvell Discovery PCI Error Handler nodes
-+      s) Marvell Discovery Memory Controller nodes
-+
-+  VIII - Specifying interrupt information for devices
-     1) interrupts property
-     2) interrupt-parent property
-     3) OpenPIC Interrupt Controllers
-     4) ISA Interrupt Controllers
- 
-+  VIII - Specifying GPIO information for devices
-+    1) gpios property
-+    2) gpio-controller nodes
-+
-   Appendix A - Sample SOC node for MPC8540
- 
- 
-@@ -1269,10 +1296,6 @@ platforms are moved over to use the flat
- 
-   Recommended properties:
- 
--    - linux,network-index : This is the intended "index" of this
--      network device.  This is used by the bootwrapper to interpret
--      MAC addresses passed by the firmware when no information other
--      than indices is available to associate an address with a device.
-     - phy-connection-type : a string naming the controller/PHY interface type,
-       i.e., "mii" (default), "rmii", "gmii", "rgmii", "rgmii-id", "sgmii",
-       "tbi", or "rtbi".  This property is only really needed if the connection
-@@ -1622,8 +1645,7 @@ platforms are moved over to use the flat
-    - device_type : should be "network", "hldc", "uart", "transparent"
-      "bisync", "atm", or "serial".
-    - compatible : could be "ucc_geth" or "fsl_atm" and so on.
--   - model : should be "UCC".
--   - device-id : the ucc number(1-8), corresponding to UCCx in UM.
-+   - cell-index : the ucc number(1-8), corresponding to UCCx in UM.
-    - reg : Offset and length of the register set for the device
-    - interrupts : <a b> where a is the interrupt number and b is a
-      field that represents an encoding of the sense and level
-@@ -1667,10 +1689,6 @@ platforms are moved over to use the flat
-    - phy-handle : The phandle for the PHY connected to this controller.
- 
-    Recommended properties:
--   - linux,network-index : This is the intended "index" of this
--     network device.  This is used by the bootwrapper to interpret
--     MAC addresses passed by the firmware when no information other
--     than indices is available to associate an address with a device.
-    - phy-connection-type : a string naming the controller/PHY interface type,
-      i.e., "mii" (default), "rmii", "gmii", "rgmii", "rgmii-id" (Internal
-      Delay), "rgmii-txid" (delay on TX only), "rgmii-rxid" (delay on RX only),
-@@ -1680,8 +1698,7 @@ platforms are moved over to use the flat
- 	ucc@2000 {
- 		device_type = "network";
- 		compatible = "ucc_geth";
--		model = "UCC";
--		device-id = <1>;
-+		cell-index = <1>;
- 		reg = <2000 200>;
- 		interrupts = <a0 0>;
- 		interrupt-parent = <700>;
-@@ -1995,7 +2012,6 @@ platforms are moved over to use the flat
- 		interrupts = <20 8>;
- 		interrupt-parent = <&PIC>;
- 		phy-handle = <&PHY0>;
--		linux,network-index = <0>;
- 		fsl,cpm-command = <12000300>;
- 	};
- 
-@@ -2217,12 +2233,6 @@ platforms are moved over to use the flat
- 			  EMAC, that is the content of the current (bogus) "phy-port"
- 			  property.
- 
--    Recommended properties:
--    - linux,network-index : This is the intended "index" of this
--      network device.  This is used by the bootwrapper to interpret
--      MAC addresses passed by the firmware when no information other
--      than indices is available to associate an address with a device.
--
-     Optional properties:
-     - phy-address       : 1 cell, optional, MDIO address of the PHY. If absent,
- 			  a search is performed.
-@@ -2246,7 +2256,6 @@ platforms are moved over to use the flat
-     Example:
- 
- 	EMAC0: ethernet@40000800 {
--		linux,network-index = <0>;
- 		device_type = "network";
- 		compatible = "ibm,emac-440gp", "ibm,emac";
- 		interrupt-parent = <&UIC1>;
-@@ -2817,9 +2826,528 @@ platforms are moved over to use the flat
- 	   };
- 
- 
--   More devices will be defined as this spec matures.
-+VII - Marvell Discovery mv64[345]6x System Controller chips
-+===========================================================
-+
-+The Marvell mv64[345]60 series of system controller chips contain
-+many of the peripherals needed to implement a complete computer
-+system.  In this section, we define device tree nodes to describe
-+the system controller chip itself and each of the peripherals
-+which it contains.  Compatible string values for each node are
-+prefixed with the string "marvell,", for Marvell Technology Group Ltd.
-+
-+1) The /system-controller node
-+
-+  This node is used to represent the system-controller and must be
-+  present when the system uses a system contller chip. The top-level
-+  system-controller node contains information that is global to all
-+  devices within the system controller chip. The node name begins
-+  with "system-controller" followed by the unit address, which is
-+  the base address of the memory-mapped register set for the system
-+  controller chip.
-+
-+  Required properties:
-+
-+    - ranges : Describes the translation of system controller addresses
-+      for memory mapped registers.
-+    - clock-frequency: Contains the main clock frequency for the system
-+      controller chip.
-+    - reg : This property defines the address and size of the
-+      memory-mapped registers contained within the system controller
-+      chip.  The address specified in the "reg" property should match
-+      the unit address of the system-controller node.
-+    - #address-cells : Address representation for system controller
-+      devices.  This field represents the number of cells needed to
-+      represent the address of the memory-mapped registers of devices
-+      within the system controller chip.
-+    - #size-cells : Size representation for for the memory-mapped
-+      registers within the system controller chip.
-+    - #interrupt-cells : Defines the width of cells used to represent
-+      interrupts.
-+
-+  Optional properties:
-+
-+    - model : The specific model of the system controller chip.  Such
-+      as, "mv64360", "mv64460", or "mv64560".
-+    - compatible : A string identifying the compatibility identifiers
-+      of the system controller chip.
-+
-+  The system-controller node contains child nodes for each system
-+  controller device that the platform uses.  Nodes should not be created
-+  for devices which exist on the system controller chip but are not used
-+
-+  Example Marvell Discovery mv64360 system-controller node:
-+
-+    system-controller@f1000000 { /* Marvell Discovery mv64360 */
-+	    #address-cells = <1>;
-+	    #size-cells = <1>;
-+	    model = "mv64360";                      /* Default */
-+	    compatible = "marvell,mv64360";
-+	    clock-frequency = <133333333>;
-+	    reg = <0xf1000000 0x10000>;
-+	    virtual-reg = <0xf1000000>;
-+	    ranges = <0x88000000 0x88000000 0x1000000 /* PCI 0 I/O Space */
-+		    0x80000000 0x80000000 0x8000000 /* PCI 0 MEM Space */
-+		    0xa0000000 0xa0000000 0x4000000 /* User FLASH */
-+		    0x00000000 0xf1000000 0x0010000 /* Bridge's regs */
-+		    0xf2000000 0xf2000000 0x0040000>;/* Integrated SRAM */
-+
-+	    [ child node definitions... ]
-+    }
-+
-+2) Child nodes of /system-controller
-+
-+   a) Marvell Discovery MDIO bus
-+
-+   The MDIO is a bus to which the PHY devices are connected.  For each
-+   device that exists on this bus, a child node should be created.  See
-+   the definition of the PHY node below for an example of how to define
-+   a PHY.
-+
-+   Required properties:
-+     - #address-cells : Should be <1>
-+     - #size-cells : Should be <0>
-+     - device_type : Should be "mdio"
-+     - compatible : Should be "marvell,mv64360-mdio"
-+
-+   Example:
-+
-+     mdio {
-+	     #address-cells = <1>;
-+	     #size-cells = <0>;
-+	     device_type = "mdio";
-+	     compatible = "marvell,mv64360-mdio";
-+
-+	     ethernet-phy@0 {
-+		     ......
-+	     };
-+     };
-+
-+
-+   b) Marvell Discovery ethernet controller
-+
-+   The Discover ethernet controller is described with two levels
-+   of nodes.  The first level describes an ethernet silicon block
-+   and the second level describes up to 3 ethernet nodes within
-+   that block.  The reason for the multiple levels is that the
-+   registers for the node are interleaved within a single set
-+   of registers.  The "ethernet-block" level describes the
-+   shared register set, and the "ethernet" nodes describe ethernet
-+   port-specific properties.
-+
-+   Ethernet block node
-+
-+   Required properties:
-+     - #address-cells : <1>
-+     - #size-cells : <0>
-+     - compatible : "marvell,mv64360-eth-block"
-+     - reg : Offset and length of the register set for this block
-+
-+   Example Discovery Ethernet block node:
-+     ethernet-block@2000 {
-+	     #address-cells = <1>;
-+	     #size-cells = <0>;
-+	     compatible = "marvell,mv64360-eth-block";
-+	     reg = <0x2000 0x2000>;
-+	     ethernet@0 {
-+		     .......
-+	     };
-+     };
-+
-+   Ethernet port node
-+
-+   Required properties:
-+     - device_type : Should be "network".
-+     - compatible : Should be "marvell,mv64360-eth".
-+     - reg : Should be <0>, <1>, or <2>, according to which registers
-+       within the silicon block the device uses.
-+     - interrupts : <a> where a is the interrupt number for the port.
-+     - interrupt-parent : the phandle for the interrupt controller
-+       that services interrupts for this device.
-+     - phy : the phandle for the PHY connected to this ethernet
-+       controller.
-+     - local-mac-address : 6 bytes, MAC address
-+
-+   Example Discovery Ethernet port node:
-+     ethernet@0 {
-+	     device_type = "network";
-+	     compatible = "marvell,mv64360-eth";
-+	     reg = <0>;
-+	     interrupts = <32>;
-+	     interrupt-parent = <&PIC>;
-+	     phy = <&PHY0>;
-+	     local-mac-address = [ 00 00 00 00 00 00 ];
-+     };
-+
-+
-+
-+   c) Marvell Discovery PHY nodes
-+
-+   Required properties:
-+     - device_type : Should be "ethernet-phy"
-+     - interrupts : <a> where a is the interrupt number for this phy.
-+     - interrupt-parent : the phandle for the interrupt controller that
-+       services interrupts for this device.
-+     - reg : The ID number for the phy, usually a small integer
-+
-+   Example Discovery PHY node:
-+     ethernet-phy@1 {
-+	     device_type = "ethernet-phy";
-+	     compatible = "broadcom,bcm5421";
-+	     interrupts = <76>;      /* GPP 12 */
-+	     interrupt-parent = <&PIC>;
-+	     reg = <1>;
-+     };
-+
-+
-+   d) Marvell Discovery SDMA nodes
-+
-+   Represent DMA hardware associated with the MPSC (multiprotocol
-+   serial controllers).
-+
-+   Required properties:
-+     - compatible : "marvell,mv64360-sdma"
-+     - reg : Offset and length of the register set for this device
-+     - interrupts : <a> where a is the interrupt number for the DMA
-+       device.
-+     - interrupt-parent : the phandle for the interrupt controller
-+       that services interrupts for this device.
-+
-+   Example Discovery SDMA node:
-+     sdma@4000 {
-+	     compatible = "marvell,mv64360-sdma";
-+	     reg = <0x4000 0xc18>;
-+	     virtual-reg = <0xf1004000>;
-+	     interrupts = <36>;
-+	     interrupt-parent = <&PIC>;
-+     };
-+
-+
-+   e) Marvell Discovery BRG nodes
-+
-+   Represent baud rate generator hardware associated with the MPSC
-+   (multiprotocol serial controllers).
-+
-+   Required properties:
-+     - compatible : "marvell,mv64360-brg"
-+     - reg : Offset and length of the register set for this device
-+     - clock-src : A value from 0 to 15 which selects the clock
-+       source for the baud rate generator.  This value corresponds
-+       to the CLKS value in the BRGx configuration register.  See
-+       the mv64x60 User's Manual.
-+     - clock-frequence : The frequency (in Hz) of the baud rate
-+       generator's input clock.
-+     - current-speed : The current speed setting (presumably by
-+       firmware) of the baud rate generator.
-+
-+   Example Discovery BRG node:
-+     brg@b200 {
-+	     compatible = "marvell,mv64360-brg";
-+	     reg = <0xb200 0x8>;
-+	     clock-src = <8>;
-+	     clock-frequency = <133333333>;
-+	     current-speed = <9600>;
-+     };
-+
-+
-+   f) Marvell Discovery CUNIT nodes
-+
-+   Represent the Serial Communications Unit device hardware.
-+
-+   Required properties:
-+     - reg : Offset and length of the register set for this device
-+
-+   Example Discovery CUNIT node:
-+     cunit@f200 {
-+	     reg = <0xf200 0x200>;
-+     };
-+
-+
-+   g) Marvell Discovery MPSCROUTING nodes
-+
-+   Represent the Discovery's MPSC routing hardware
-+
-+   Required properties:
-+     - reg : Offset and length of the register set for this device
-+
-+   Example Discovery CUNIT node:
-+     mpscrouting@b500 {
-+	     reg = <0xb400 0xc>;
-+     };
-+
-+
-+   h) Marvell Discovery MPSCINTR nodes
-+
-+   Represent the Discovery's MPSC DMA interrupt hardware registers
-+   (SDMA cause and mask registers).
-+
-+   Required properties:
-+     - reg : Offset and length of the register set for this device
-+
-+   Example Discovery MPSCINTR node:
-+     mpsintr@b800 {
-+	     reg = <0xb800 0x100>;
-+     };
-+
-+
-+   i) Marvell Discovery MPSC nodes
-+
-+   Represent the Discovery's MPSC (Multiprotocol Serial Controller)
-+   serial port.
-+
-+   Required properties:
-+     - device_type : "serial"
-+     - compatible : "marvell,mv64360-mpsc"
-+     - reg : Offset and length of the register set for this device
-+     - sdma : the phandle for the SDMA node used by this port
-+     - brg : the phandle for the BRG node used by this port
-+     - cunit : the phandle for the CUNIT node used by this port
-+     - mpscrouting : the phandle for the MPSCROUTING node used by this port
-+     - mpscintr : the phandle for the MPSCINTR node used by this port
-+     - cell-index : the hardware index of this cell in the MPSC core
-+     - max_idle : value needed for MPSC CHR3 (Maximum Frame Length)
-+       register
-+     - interrupts : <a> where a is the interrupt number for the MPSC.
-+     - interrupt-parent : the phandle for the interrupt controller
-+       that services interrupts for this device.
-+
-+   Example Discovery MPSCINTR node:
-+     mpsc@8000 {
-+	     device_type = "serial";
-+	     compatible = "marvell,mv64360-mpsc";
-+	     reg = <0x8000 0x38>;
-+	     virtual-reg = <0xf1008000>;
-+	     sdma = <&SDMA0>;
-+	     brg = <&BRG0>;
-+	     cunit = <&CUNIT>;
-+	     mpscrouting = <&MPSCROUTING>;
-+	     mpscintr = <&MPSCINTR>;
-+	     cell-index = <0>;
-+	     max_idle = <40>;
-+	     interrupts = <40>;
-+	     interrupt-parent = <&PIC>;
-+     };
-+
- 
--VII - Specifying interrupt information for devices
-+   j) Marvell Discovery Watch Dog Timer nodes
-+
-+   Represent the Discovery's watchdog timer hardware
-+
-+   Required properties:
-+     - compatible : "marvell,mv64360-wdt"
-+     - reg : Offset and length of the register set for this device
-+
-+   Example Discovery Watch Dog Timer node:
-+     wdt@b410 {
-+	     compatible = "marvell,mv64360-wdt";
-+	     reg = <0xb410 0x8>;
-+     };
-+
-+
-+   k) Marvell Discovery I2C nodes
-+
-+   Represent the Discovery's I2C hardware
-+
-+   Required properties:
-+     - device_type : "i2c"
-+     - compatible : "marvell,mv64360-i2c"
-+     - reg : Offset and length of the register set for this device
-+     - interrupts : <a> where a is the interrupt number for the I2C.
-+     - interrupt-parent : the phandle for the interrupt controller
-+       that services interrupts for this device.
-+
-+   Example Discovery I2C node:
-+	     compatible = "marvell,mv64360-i2c";
-+	     reg = <0xc000 0x20>;
-+	     virtual-reg = <0xf100c000>;
-+	     interrupts = <37>;
-+	     interrupt-parent = <&PIC>;
-+     };
-+
-+
-+   l) Marvell Discovery PIC (Programmable Interrupt Controller) nodes
-+
-+   Represent the Discovery's PIC hardware
-+
-+   Required properties:
-+     - #interrupt-cells : <1>
-+     - #address-cells : <0>
-+     - compatible : "marvell,mv64360-pic"
-+     - reg : Offset and length of the register set for this device
-+     - interrupt-controller
-+
-+   Example Discovery PIC node:
-+     pic {
-+	     #interrupt-cells = <1>;
-+	     #address-cells = <0>;
-+	     compatible = "marvell,mv64360-pic";
-+	     reg = <0x0 0x88>;
-+	     interrupt-controller;
-+     };
-+
-+
-+   m) Marvell Discovery MPP (Multipurpose Pins) multiplexing nodes
-+
-+   Represent the Discovery's MPP hardware
-+
-+   Required properties:
-+     - compatible : "marvell,mv64360-mpp"
-+     - reg : Offset and length of the register set for this device
-+
-+   Example Discovery MPP node:
-+     mpp@f000 {
-+	     compatible = "marvell,mv64360-mpp";
-+	     reg = <0xf000 0x10>;
-+     };
-+
-+
-+   n) Marvell Discovery GPP (General Purpose Pins) nodes
-+
-+   Represent the Discovery's GPP hardware
-+
-+   Required properties:
-+     - compatible : "marvell,mv64360-gpp"
-+     - reg : Offset and length of the register set for this device
-+
-+   Example Discovery GPP node:
-+     gpp@f000 {
-+	     compatible = "marvell,mv64360-gpp";
-+	     reg = <0xf100 0x20>;
-+     };
-+
-+
-+   o) Marvell Discovery PCI host bridge node
-+
-+   Represents the Discovery's PCI host bridge device.  The properties
-+   for this node conform to Rev 2.1 of the PCI Bus Binding to IEEE
-+   1275-1994.  A typical value for the compatible property is
-+   "marvell,mv64360-pci".
-+
-+   Example Discovery PCI host bridge node
-+     pci@80000000 {
-+	     #address-cells = <3>;
-+	     #size-cells = <2>;
-+	     #interrupt-cells = <1>;
-+	     device_type = "pci";
-+	     compatible = "marvell,mv64360-pci";
-+	     reg = <0xcf8 0x8>;
-+	     ranges = <0x01000000 0x0        0x0
-+			     0x88000000 0x0 0x01000000
-+		       0x02000000 0x0 0x80000000
-+			     0x80000000 0x0 0x08000000>;
-+	     bus-range = <0 255>;
-+	     clock-frequency = <66000000>;
-+	     interrupt-parent = <&PIC>;
-+	     interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
-+	     interrupt-map = <
-+		     /* IDSEL 0x0a */
-+		     0x5000 0 0 1 &PIC 80
-+		     0x5000 0 0 2 &PIC 81
-+		     0x5000 0 0 3 &PIC 91
-+		     0x5000 0 0 4 &PIC 93
-+
-+		     /* IDSEL 0x0b */
-+		     0x5800 0 0 1 &PIC 91
-+		     0x5800 0 0 2 &PIC 93
-+		     0x5800 0 0 3 &PIC 80
-+		     0x5800 0 0 4 &PIC 81
-+
-+		     /* IDSEL 0x0c */
-+		     0x6000 0 0 1 &PIC 91
-+		     0x6000 0 0 2 &PIC 93
-+		     0x6000 0 0 3 &PIC 80
-+		     0x6000 0 0 4 &PIC 81
-+
-+		     /* IDSEL 0x0d */
-+		     0x6800 0 0 1 &PIC 93
-+		     0x6800 0 0 2 &PIC 80
-+		     0x6800 0 0 3 &PIC 81
-+		     0x6800 0 0 4 &PIC 91
-+	     >;
-+     };
-+
-+
-+   p) Marvell Discovery CPU Error nodes
-+
-+   Represent the Discovery's CPU error handler device.
-+
-+   Required properties:
-+     - compatible : "marvell,mv64360-cpu-error"
-+     - reg : Offset and length of the register set for this device
-+     - interrupts : the interrupt number for this device
-+     - interrupt-parent : the phandle for the interrupt controller
-+       that services interrupts for this device.
-+
-+   Example Discovery CPU Error node:
-+     cpu-error@0070 {
-+	     compatible = "marvell,mv64360-cpu-error";
-+	     reg = <0x70 0x10 0x128 0x28>;
-+	     interrupts = <3>;
-+	     interrupt-parent = <&PIC>;
-+     };
-+
-+
-+   q) Marvell Discovery SRAM Controller nodes
-+
-+   Represent the Discovery's SRAM controller device.
-+
-+   Required properties:
-+     - compatible : "marvell,mv64360-sram-ctrl"
-+     - reg : Offset and length of the register set for this device
-+     - interrupts : the interrupt number for this device
-+     - interrupt-parent : the phandle for the interrupt controller
-+       that services interrupts for this device.
-+
-+   Example Discovery SRAM Controller node:
-+     sram-ctrl@0380 {
-+	     compatible = "marvell,mv64360-sram-ctrl";
-+	     reg = <0x380 0x80>;
-+	     interrupts = <13>;
-+	     interrupt-parent = <&PIC>;
-+     };
-+
-+
-+   r) Marvell Discovery PCI Error Handler nodes
-+
-+   Represent the Discovery's PCI error handler device.
-+
-+   Required properties:
-+     - compatible : "marvell,mv64360-pci-error"
-+     - reg : Offset and length of the register set for this device
-+     - interrupts : the interrupt number for this device
-+     - interrupt-parent : the phandle for the interrupt controller
-+       that services interrupts for this device.
-+
-+   Example Discovery PCI Error Handler node:
-+     pci-error@1d40 {
-+	     compatible = "marvell,mv64360-pci-error";
-+	     reg = <0x1d40 0x40 0xc28 0x4>;
-+	     interrupts = <12>;
-+	     interrupt-parent = <&PIC>;
-+     };
-+
-+
-+   s) Marvell Discovery Memory Controller nodes
-+
-+   Represent the Discovery's memory controller device.
-+
-+   Required properties:
-+     - compatible : "marvell,mv64360-mem-ctrl"
-+     - reg : Offset and length of the register set for this device
-+     - interrupts : the interrupt number for this device
-+     - interrupt-parent : the phandle for the interrupt controller
-+       that services interrupts for this device.
-+
-+   Example Discovery Memory Controller node:
-+     mem-ctrl@1400 {
-+	     compatible = "marvell,mv64360-mem-ctrl";
-+	     reg = <0x1400 0x60>;
-+	     interrupts = <17>;
-+	     interrupt-parent = <&PIC>;
-+     };
-+
-+
-+VIII - Specifying interrupt information for devices
- ===================================================
- 
- The device tree represents the busses and devices of a hardware
-@@ -2905,6 +3433,54 @@ encodings listed below:
- 	2 =  high to low edge sensitive type enabled
- 	3 =  low to high edge sensitive type enabled
- 
-+VIII - Specifying GPIO information for devices
-+==============================================
-+
-+1) gpios property
-+-----------------
-+
-+Nodes that makes use of GPIOs should define them using `gpios' property,
-+format of which is: <&gpio-controller1-phandle gpio1-specifier
-+		     &gpio-controller2-phandle gpio2-specifier
-+		     0 /* holes are permitted, means no GPIO 3 */
-+		     &gpio-controller4-phandle gpio4-specifier
-+		     ...>;
-+
-+Note that gpio-specifier length is controller dependent.
-+
-+gpio-specifier may encode: bank, pin position inside the bank,
-+whether pin is open-drain and whether pin is logically inverted.
-+
-+Example of the node using GPIOs:
-+
-+	node {
-+		gpios = <&qe_pio_e 18 0>;
-+	};
-+
-+In this example gpio-specifier is "18 0" and encodes GPIO pin number,
-+and empty GPIO flags as accepted by the "qe_pio_e" gpio-controller.
-+
-+2) gpio-controller nodes
-+------------------------
-+
-+Every GPIO controller node must have #gpio-cells property defined,
-+this information will be used to translate gpio-specifiers.
-+
-+Example of two SOC GPIO banks defined as gpio-controller nodes:
-+
-+	qe_pio_a: gpio-controller@1400 {
-+		#gpio-cells = <2>;
-+		compatible = "fsl,qe-pario-bank-a", "fsl,qe-pario-bank";
-+		reg = <0x1400 0x18>;
-+		gpio-controller;
-+	};
-+
-+	qe_pio_e: gpio-controller@1460 {
-+		#gpio-cells = <2>;
-+		compatible = "fsl,qe-pario-bank-e", "fsl,qe-pario-bank";
-+		reg = <0x1460 0x18>;
-+		gpio-controller;
-+	};
- 
- Appendix A - Sample SOC node for MPC8540
- ========================================
---- /dev/null
-+++ b/Documentation/powerpc/phyp-assisted-dump.txt
-@@ -0,0 +1,127 @@
-+
-+                   Hypervisor-Assisted Dump
-+                   ------------------------
-+                       November 2007
-+
-+The goal of hypervisor-assisted dump is to enable the dump of
-+a crashed system, and to do so from a fully-reset system, and
-+to minimize the total elapsed time until the system is back
-+in production use.
-+
-+As compared to kdump or other strategies, hypervisor-assisted
-+dump offers several strong, practical advantages:
-+
-+-- Unlike kdump, the system has been reset, and loaded
-+   with a fresh copy of the kernel.  In particular,
-+   PCI and I/O devices have been reinitialized and are
-+   in a clean, consistent state.
-+-- As the dump is performed, the dumped memory becomes
-+   immediately available to the system for normal use.
-+-- After the dump is completed, no further reboots are
-+   required; the system will be fully usable, and running
-+   in it's normal, production mode on it normal kernel.
-+
-+The above can only be accomplished by coordination with,
-+and assistance from the hypervisor. The procedure is
-+as follows:
-+
-+-- When a system crashes, the hypervisor will save
-+   the low 256MB of RAM to a previously registered
-+   save region. It will also save system state, system
-+   registers, and hardware PTE's.
-+
-+-- After the low 256MB area has been saved, the
-+   hypervisor will reset PCI and other hardware state.
-+   It will *not* clear RAM. It will then launch the
-+   bootloader, as normal.
-+
-+-- The freshly booted kernel will notice that there
-+   is a new node (ibm,dump-kernel) in the device tree,
-+   indicating that there is crash data available from
-+   a previous boot. It will boot into only 256MB of RAM,
-+   reserving the rest of system memory.
-+
-+-- Userspace tools will parse /sys/kernel/release_region
-+   and read /proc/vmcore to obtain the contents of memory,
-+   which holds the previous crashed kernel. The userspace
-+   tools may copy this info to disk, or network, nas, san,
-+   iscsi, etc. as desired.
-+
-+   For Example: the values in /sys/kernel/release-region
-+   would look something like this (address-range pairs).
-+   CPU:0x177fee000-0x10000: HPTE:0x177ffe020-0x1000: /
-+   DUMP:0x177fff020-0x10000000, 0x10000000-0x16F1D370A
-+
-+-- As the userspace tools complete saving a portion of
-+   dump, they echo an offset and size to
-+   /sys/kernel/release_region to release the reserved
-+   memory back to general use.
-+
-+   An example of this is:
-+     "echo 0x40000000 0x10000000 > /sys/kernel/release_region"
-+   which will release 256MB at the 1GB boundary.
-+
-+Please note that the hypervisor-assisted dump feature
-+is only available on Power6-based systems with recent
-+firmware versions.
-+
-+Implementation details:
-+----------------------
-+
-+During boot, a check is made to see if firmware supports
-+this feature on this particular machine. If it does, then
-+we check to see if a active dump is waiting for us. If yes
-+then everything but 256 MB of RAM is reserved during early
-+boot. This area is released once we collect a dump from user
-+land scripts that are run. If there is dump data, then
-+the /sys/kernel/release_region file is created, and
-+the reserved memory is held.
-+
-+If there is no waiting dump data, then only the highest
-+256MB of the ram is reserved as a scratch area. This area
-+is *not* released: this region will be kept permanently
-+reserved, so that it can act as a receptacle for a copy
-+of the low 256MB in the case a crash does occur. See,
-+however, "open issues" below, as to whether
-+such a reserved region is really needed.
-+
-+Currently the dump will be copied from /proc/vmcore to a
-+a new file upon user intervention. The starting address
-+to be read and the range for each data point in provided
-+in /sys/kernel/release_region.
-+
-+The tools to examine the dump will be same as the ones
-+used for kdump.
-+
-+General notes:
-+--------------
-+Security: please note that there are potential security issues
-+with any sort of dump mechanism. In particular, plaintext
-+(unencrypted) data, and possibly passwords, may be present in
-+the dump data. Userspace tools must take adequate precautions to
-+preserve security.
-+
-+Open issues/ToDo:
-+------------
-+ o The various code paths that tell the hypervisor that a crash
-+   occurred, vs. it simply being a normal reboot, should be
-+   reviewed, and possibly clarified/fixed.
-+
-+ o Instead of using /sys/kernel, should there be a /sys/dump
-+   instead? There is a dump_subsys being created by the s390 code,
-+   perhaps the pseries code should use a similar layout as well.
-+
-+ o Is reserving a 256MB region really required? The goal of
-+   reserving a 256MB scratch area is to make sure that no
-+   important crash data is clobbered when the hypervisor
-+   save low mem to the scratch area. But, if one could assure
-+   that nothing important is located in some 256MB area, then
-+   it would not need to be reserved. Something that can be
-+   improved in subsequent versions.
-+
-+ o Still working the kdump team to integrate this with kdump,
-+   some work remains but this would not affect the current
-+   patches.
-+
-+ o Still need to write a shell script, to copy the dump away.
-+   Currently I am parsing it manually.
---- a/arch/powerpc/Kconfig
-+++ b/arch/powerpc/Kconfig
-@@ -49,6 +49,19 @@ config IRQ_PER_CPU
- 	bool
- 	default y
- 
-+config STACKTRACE_SUPPORT
-+	bool
-+	default y
-+
-+config TRACE_IRQFLAGS_SUPPORT
-+	bool
-+	depends on PPC64
-+	default y
-+
-+config LOCKDEP_SUPPORT
-+	bool
-+	default y
-+
- config RWSEM_GENERIC_SPINLOCK
- 	bool
- 
-@@ -81,6 +94,11 @@ config GENERIC_FIND_NEXT_BIT
- 	bool
- 	default y
- 
-+config GENERIC_GPIO
-+	bool
-+	help
-+	  Generic GPIO API support
-+
- config ARCH_NO_VIRT_TO_BUS
- 	def_bool PPC64
- 
-@@ -91,6 +109,7 @@ config PPC
- 	select HAVE_OPROFILE
- 	select HAVE_KPROBES
- 	select HAVE_KRETPROBES
-+	select HAVE_LMB
- 
- config EARLY_PRINTK
- 	bool
-@@ -210,15 +229,6 @@ source kernel/Kconfig.hz
- source kernel/Kconfig.preempt
- source "fs/Kconfig.binfmt"
- 
--# We optimistically allocate largepages from the VM, so make the limit
--# large enough (16MB). This badly named config option is actually
--# max order + 1
--config FORCE_MAX_ZONEORDER
--	int
--	depends on PPC64
--	default "9" if PPC_64K_PAGES
--	default "13"
--
- config HUGETLB_PAGE_SIZE_VARIABLE
- 	bool
- 	depends on HUGETLB_PAGE
-@@ -307,6 +317,16 @@ config CRASH_DUMP
- 
- 	  Don't change this unless you know what you are doing.
- 
-+config PHYP_DUMP
-+	bool "Hypervisor-assisted dump (EXPERIMENTAL)"
-+	depends on PPC_PSERIES && EXPERIMENTAL
-+	help
-+	  Hypervisor-assisted dump is meant to be a kdump replacement
-+	  offering robustness and speed not possible without system
-+	  hypervisor assistence.
-+
-+	  If unsure, say "N"
-+
- config PPCBUG_NVRAM
- 	bool "Enable reading PPCBUG NVRAM during boot" if PPLUS || LOPEC
- 	default y if PPC_PREP
-@@ -381,6 +401,26 @@ config PPC_64K_PAGES
- 	  while on hardware with such support, it will be used to map
- 	  normal application pages.
- 
-+config FORCE_MAX_ZONEORDER
-+	int "Maximum zone order"
-+	default "9" if PPC_64K_PAGES
-+	default "13" if PPC64 && !PPC_64K_PAGES
-+	default "11"
-+	help
-+	  The kernel memory allocator divides physically contiguous memory
-+	  blocks into "zones", where each zone is a power of two number of
-+	  pages.  This option selects the largest power of two that the kernel
-+	  keeps in the memory allocator.  If you need to allocate very large
-+	  blocks of physically contiguous memory, then you may need to
-+	  increase this value.
-+
-+	  This config option is actually maximum order plus one. For example,
-+	  a value of 11 means that the largest free memory block is 2^10 pages.
-+
-+	  The page size is not necessarily 4KB.  For example, on 64-bit
-+	  systems, 64KB pages can be enabled via CONFIG_PPC_64K_PAGES.  Keep
-+	  this in mind when choosing a value for this option.
-+
- config PPC_SUBPAGE_PROT
- 	bool "Support setting protections for 4k subpages"
- 	depends on PPC_64K_PAGES
-@@ -490,6 +530,14 @@ config FSL_PCI
-  	bool
- 	select PPC_INDIRECT_PCI
- 
-+config 4xx_SOC
-+	bool
-+
-+config FSL_LBC
-+	bool
-+	help
-+	  Freescale Localbus support
-+
- # Yes MCA RS/6000s exist but Linux-PPC does not currently support any
- config MCA
- 	bool
-@@ -663,22 +711,6 @@ config CONSISTENT_SIZE
- 	hex "Size of consistent memory pool" if CONSISTENT_SIZE_BOOL
- 	default "0x00200000" if NOT_COHERENT_CACHE
- 
--config BOOT_LOAD_BOOL
--	bool "Set the boot link/load address"
--	depends on ADVANCED_OPTIONS && !PPC_MULTIPLATFORM
--	help
--	  This option allows you to set the initial load address of the zImage
--	  or zImage.initrd file.  This can be useful if you are on a board
--	  which has a small amount of memory.
--
--	  Say N here unless you know what you are doing.
--
--config BOOT_LOAD
--	hex "Link/load address for booting" if BOOT_LOAD_BOOL
--	default "0x00400000" if 40x || 8xx || 8260
--	default "0x01000000" if 44x
--	default "0x00800000"
--
- config PIN_TLB
- 	bool "Pinned Kernel TLBs (860 ONLY)"
- 	depends on ADVANCED_OPTIONS && 8xx
---- a/arch/powerpc/Kconfig.debug
-+++ b/arch/powerpc/Kconfig.debug
-@@ -269,7 +269,7 @@ config PPC_EARLY_DEBUG_CPM_ADDR
- 	hex "CPM UART early debug transmit descriptor address"
- 	depends on PPC_EARLY_DEBUG_CPM
- 	default "0xfa202008" if PPC_EP88XC
--	default "0xf0000008" if CPM2
-+	default "0xf0001ff8" if CPM2
- 	default "0xff002008" if CPM1
- 	help
- 	  This specifies the address of the transmit descriptor
---- a/arch/powerpc/Makefile
-+++ b/arch/powerpc/Makefile
-@@ -71,13 +71,11 @@ endif
- 
- LDFLAGS_vmlinux	:= -Bstatic
- 
--CPPFLAGS-$(CONFIG_PPC32) := -Iarch/$(ARCH)
--AFLAGS-$(CONFIG_PPC32)	:= -Iarch/$(ARCH)
- CFLAGS-$(CONFIG_PPC64)	:= -mminimal-toc -mtraceback=none  -mcall-aixdesc
--CFLAGS-$(CONFIG_PPC32)	:= -Iarch/$(ARCH) -ffixed-r2 -mmultiple
--KBUILD_CPPFLAGS	+= $(CPPFLAGS-y)
--KBUILD_AFLAGS	+= $(AFLAGS-y)
--KBUILD_CFLAGS	+= -msoft-float -pipe $(CFLAGS-y)
-+CFLAGS-$(CONFIG_PPC32)	:= -ffixed-r2 -mmultiple
-+KBUILD_CPPFLAGS	+= -Iarch/$(ARCH)
-+KBUILD_AFLAGS	+= -Iarch/$(ARCH)
-+KBUILD_CFLAGS	+= -msoft-float -pipe -Iarch/$(ARCH) $(CFLAGS-y)
- CPP		= $(CC) -E $(KBUILD_CFLAGS)
- 
- CHECKFLAGS	+= -m$(CONFIG_WORD_SIZE) -D__powerpc__ -D__powerpc$(CONFIG_WORD_SIZE)__
-@@ -164,7 +162,7 @@ boot := arch/$(ARCH)/boot
- $(BOOT_TARGETS): vmlinux
- 	$(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)
- 
--bootwrapper_install:
-+bootwrapper_install %.dtb:
- 	$(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)
- 
- define archhelp
---- a/arch/powerpc/boot/Makefile
-+++ b/arch/powerpc/boot/Makefile
-@@ -40,6 +40,7 @@ $(obj)/ebony.o: BOOTCFLAGS += -mcpu=405
- $(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405
- $(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405
- $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
-+$(obj)/virtex405-head.o: BOOTCFLAGS += -mcpu=405
- 
- 
- zlib       := inffast.c inflate.c inftrees.c
-@@ -64,7 +65,8 @@ src-plat := of.c cuboot-52xx.c cuboot-82
- 		cuboot-bamboo.c cuboot-mpc7448hpc2.c cuboot-taishan.c \
- 		fixed-head.S ep88xc.c ep405.c \
- 		cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c \
--		cuboot-warp.c cuboot-85xx-cpm2.c
-+		cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \
-+		virtex405-head.S
- src-boot := $(src-wlib) $(src-plat) empty.c
- 
- src-boot := $(addprefix $(obj)/, $(src-boot))
-@@ -192,7 +194,7 @@ image-$(CONFIG_PPC_CHRP)		+= zImage.chrp
- image-$(CONFIG_PPC_EFIKA)		+= zImage.chrp
- image-$(CONFIG_PPC_PMAC)		+= zImage.pmac
- image-$(CONFIG_PPC_HOLLY)		+= zImage.holly
--image-$(CONFIG_PPC_PRPMC2800)		+= zImage.prpmc2800
-+image-$(CONFIG_PPC_PRPMC2800)		+= dtbImage.prpmc2800
- image-$(CONFIG_PPC_ISERIES)		+= zImage.iseries
- image-$(CONFIG_DEFAULT_UIMAGE)		+= uImage
- 
-@@ -216,6 +218,7 @@ image-$(CONFIG_RAINIER)			+= cuImage.rai
- image-$(CONFIG_TAISHAN)			+= cuImage.taishan
- image-$(CONFIG_KATMAI)			+= cuImage.katmai
- image-$(CONFIG_WARP)			+= cuImage.warp
-+image-$(CONFIG_YOSEMITE)		+= cuImage.yosemite
- 
- # Board ports in arch/powerpc/platform/8xx/Kconfig
- image-$(CONFIG_PPC_MPC86XADS)		+= cuImage.mpc866ads
-@@ -255,6 +258,7 @@ image-$(CONFIG_TQM8555)			+= cuImage.tqm
- image-$(CONFIG_TQM8560)			+= cuImage.tqm8560
- image-$(CONFIG_SBC8548)			+= cuImage.sbc8548
- image-$(CONFIG_SBC8560)			+= cuImage.sbc8560
-+image-$(CONFIG_KSI8560)			+= cuImage.ksi8560
- 
- # Board ports in arch/powerpc/platform/embedded6xx/Kconfig
- image-$(CONFIG_STORCENTER)		+= cuImage.storcenter
-@@ -285,11 +289,11 @@ $(obj)/zImage.%: vmlinux $(wrapperbits)
- 	$(call if_changed,wrap,$*)
- 
- # dtbImage% - a dtbImage is a zImage with an embedded device tree blob
--$(obj)/dtbImage.initrd.%: vmlinux $(wrapperbits) $(dtstree)/%.dts
--	$(call if_changed,wrap,$*,$(dtstree)/$*.dts,,$(obj)/ramdisk.image.gz)
-+$(obj)/dtbImage.initrd.%: vmlinux $(wrapperbits) $(obj)/%.dtb
-+	$(call if_changed,wrap,$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)
- 
--$(obj)/dtbImage.%: vmlinux $(wrapperbits) $(dtstree)/%.dts
--	$(call if_changed,wrap,$*,$(dtstree)/$*.dts)
-+$(obj)/dtbImage.%: vmlinux $(wrapperbits) $(obj)/%.dtb
-+	$(call if_changed,wrap,$*,,$(obj)/$*.dtb)
- 
- # This cannot be in the root of $(src) as the zImage rule always adds a $(obj)
- # prefix
-@@ -302,14 +306,24 @@ $(obj)/zImage.iseries: vmlinux
- $(obj)/uImage: vmlinux $(wrapperbits)
- 	$(call if_changed,wrap,uboot)
- 
--$(obj)/cuImage.%: vmlinux $(dtstree)/%.dts $(wrapperbits)
--	$(call if_changed,wrap,cuboot-$*,$(dtstree)/$*.dts)
-+$(obj)/cuImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)
-+	$(call if_changed,wrap,cuboot-$*,,$(obj)/$*.dtb)
- 
--$(obj)/treeImage.initrd.%: vmlinux $(dtstree)/%.dts $(wrapperbits)
--	$(call if_changed,wrap,treeboot-$*,$(dtstree)/$*.dts,,$(obj)/ramdisk.image.gz)
-+$(obj)/simpleImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)
-+	$(call if_changed,wrap,simpleboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)
- 
--$(obj)/treeImage.%: vmlinux $(dtstree)/%.dts $(wrapperbits)
--	$(call if_changed,wrap,treeboot-$*,$(dtstree)/$*.dts)
-+$(obj)/simpleImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)
-+	$(call if_changed,wrap,simpleboot-$*,,$(obj)/$*.dtb)
-+
-+$(obj)/treeImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)
-+	$(call if_changed,wrap,treeboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)
-+
-+$(obj)/treeImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)
-+	$(call if_changed,wrap,treeboot-$*,,$(obj)/$*.dtb)
-+
-+# Rule to build device tree blobs
-+$(obj)/%.dtb: $(dtstree)/%.dts $(obj)/dtc
-+	$(obj)/dtc -O dtb -o $(obj)/$*.dtb -b 0 $(DTS_FLAGS) $(dtstree)/$*.dts
- 
- # If there isn't a platform selected then just strip the vmlinux.
- ifeq (,$(image-y))
-@@ -326,7 +340,7 @@ install: $(CONFIGURE) $(addprefix $(obj)
- 
- # anything not in $(targets)
- clean-files += $(image-) $(initrd-) zImage zImage.initrd cuImage.* treeImage.* \
--	otheros.bld
-+	otheros.bld *.dtb
- 
- # clean up files cached by wrapper
- clean-kernel := vmlinux.strip vmlinux.bin
---- a/arch/powerpc/boot/bamboo.c
-+++ b/arch/powerpc/boot/bamboo.c
-@@ -33,7 +33,8 @@ static void bamboo_fixups(void)
- 	ibm440ep_fixup_clocks(sysclk, 11059200, 25000000);
- 	ibm4xx_sdram_fixup_memsize();
- 	ibm4xx_quiesce_eth((u32 *)0xef600e00, (u32 *)0xef600f00);
--	dt_fixup_mac_addresses(bamboo_mac0, bamboo_mac1);
-+	dt_fixup_mac_address_by_alias("ethernet0", bamboo_mac0);
-+	dt_fixup_mac_address_by_alias("ethernet1", bamboo_mac1);
- }
- 
- void bamboo_init(void *mac0, void *mac1)
---- a/arch/powerpc/boot/cpm-serial.c
-+++ b/arch/powerpc/boot/cpm-serial.c
-@@ -11,6 +11,7 @@
- #include "types.h"
- #include "io.h"
- #include "ops.h"
-+#include "page.h"
- 
- struct cpm_scc {
- 	u32 gsmrl;
-@@ -42,6 +43,22 @@ struct cpm_param {
- 	u16 tbase;
- 	u8 rfcr;
- 	u8 tfcr;
-+	u16 mrblr;
-+	u32 rstate;
-+	u8 res1[4];
-+	u16 rbptr;
-+	u8 res2[6];
-+	u32 tstate;
-+	u8 res3[4];
-+	u16 tbptr;
-+	u8 res4[6];
-+	u16 maxidl;
-+	u16 idlc;
-+	u16 brkln;
-+	u16 brkec;
-+	u16 brkcr;
-+	u16 rmask;
-+	u8 res5[4];
- };
- 
- struct cpm_bd {
-@@ -54,10 +71,10 @@ static void *cpcr;
- static struct cpm_param *param;
- static struct cpm_smc *smc;
- static struct cpm_scc *scc;
--struct cpm_bd *tbdf, *rbdf;
-+static struct cpm_bd *tbdf, *rbdf;
- static u32 cpm_cmd;
--static u8 *muram_start;
--static u32 muram_offset;
-+static void *cbd_addr;
-+static u32 cbd_offset;
- 
- static void (*do_cmd)(int op);
- static void (*enable_port)(void);
-@@ -119,20 +136,25 @@ static int cpm_serial_open(void)
- 
- 	out_8(&param->rfcr, 0x10);
- 	out_8(&param->tfcr, 0x10);
-+	out_be16(&param->mrblr, 1);
-+	out_be16(&param->maxidl, 0);
-+	out_be16(&param->brkec, 0);
-+	out_be16(&param->brkln, 0);
-+	out_be16(&param->brkcr, 0);
- 
--	rbdf = (struct cpm_bd *)muram_start;
--	rbdf->addr = (u8 *)(rbdf + 2);
-+	rbdf = cbd_addr;
-+	rbdf->addr = (u8 *)rbdf - 1;
- 	rbdf->sc = 0xa000;
- 	rbdf->len = 1;
- 
- 	tbdf = rbdf + 1;
--	tbdf->addr = (u8 *)(rbdf + 2) + 1;
-+	tbdf->addr = (u8 *)rbdf - 2;
- 	tbdf->sc = 0x2000;
- 	tbdf->len = 1;
- 
- 	sync();
--	out_be16(&param->rbase, muram_offset);
--	out_be16(&param->tbase, muram_offset + sizeof(struct cpm_bd));
-+	out_be16(&param->rbase, cbd_offset);
-+	out_be16(&param->tbase, cbd_offset + sizeof(struct cpm_bd));
- 
- 	do_cmd(CPM_CMD_INIT_RX_TX);
- 
-@@ -175,10 +197,12 @@ static unsigned char cpm_serial_getc(voi
- 
- int cpm_console_init(void *devp, struct serial_console_data *scdp)
- {
--	void *reg_virt[2];
--	int is_smc = 0, is_cpm2 = 0, n;
--	unsigned long reg_phys;
-+	void *vreg[2];
-+	u32 reg[2];
-+	int is_smc = 0, is_cpm2 = 0;
- 	void *parent, *muram;
-+	void *muram_addr;
-+	unsigned long muram_offset, muram_size;
- 
- 	if (dt_is_compatible(devp, "fsl,cpm1-smc-uart")) {
- 		is_smc = 1;
-@@ -202,63 +226,64 @@ int cpm_console_init(void *devp, struct 
- 	else
- 		do_cmd = cpm1_cmd;
- 
--	n = getprop(devp, "fsl,cpm-command", &cpm_cmd, 4);
--	if (n < 4)
-+	if (getprop(devp, "fsl,cpm-command", &cpm_cmd, 4) < 4)
- 		return -1;
- 
--	n = getprop(devp, "virtual-reg", reg_virt, sizeof(reg_virt));
--	if (n < (int)sizeof(reg_virt)) {
--		for (n = 0; n < 2; n++) {
--			if (!dt_xlate_reg(devp, n, &reg_phys, NULL))
--				return -1;
--
--			reg_virt[n] = (void *)reg_phys;
--		}
--	}
-+	if (dt_get_virtual_reg(devp, vreg, 2) < 2)
-+		return -1;
- 
- 	if (is_smc)
--		smc = reg_virt[0];
-+		smc = vreg[0];
- 	else
--		scc = reg_virt[0];
-+		scc = vreg[0];
- 
--	param = reg_virt[1];
-+	param = vreg[1];
- 
- 	parent = get_parent(devp);
- 	if (!parent)
- 		return -1;
- 
--	n = getprop(parent, "virtual-reg", reg_virt, sizeof(reg_virt));
--	if (n < (int)sizeof(reg_virt)) {
--		if (!dt_xlate_reg(parent, 0, &reg_phys, NULL))
--			return -1;
--
--		reg_virt[0] = (void *)reg_phys;
--	}
--
--	cpcr = reg_virt[0];
-+	if (dt_get_virtual_reg(parent, &cpcr, 1) < 1)
-+		return -1;
- 
- 	muram = finddevice("/soc/cpm/muram/data");
- 	if (!muram)
- 		return -1;
- 
- 	/* For bootwrapper-compatible device trees, we assume that the first
--	 * entry has at least 18 bytes, and that #address-cells/#data-cells
-+	 * entry has at least 128 bytes, and that #address-cells/#data-cells
- 	 * is one for both parent and child.
- 	 */
- 
--	n = getprop(muram, "virtual-reg", reg_virt, sizeof(reg_virt));
--	if (n < (int)sizeof(reg_virt)) {
--		if (!dt_xlate_reg(muram, 0, &reg_phys, NULL))
--			return -1;
-+	if (dt_get_virtual_reg(muram, &muram_addr, 1) < 1)
-+		return -1;
-+
-+	if (getprop(muram, "reg", reg, 8) < 8)
-+		return -1;
-+
-+	muram_offset = reg[0];
-+	muram_size = reg[1];
-+
-+	/* Store the buffer descriptors at the end of the first muram chunk.
-+	 * For SMC ports on CPM2-based platforms, relocate the parameter RAM
-+	 * just before the buffer descriptors.
-+	 */
-+
-+	cbd_offset = muram_offset + muram_size - 2 * sizeof(struct cpm_bd);
- 
--		reg_virt[0] = (void *)reg_phys;
-+	if (is_cpm2 && is_smc) {
-+		u16 *smc_base = (u16 *)param;
-+		u16 pram_offset;
-+
-+		pram_offset = cbd_offset - 64;
-+		pram_offset = _ALIGN_DOWN(pram_offset, 64);
-+
-+		disable_port();
-+		out_be16(smc_base, pram_offset);
-+		param = muram_addr - muram_offset + pram_offset;
- 	}
- 
--	muram_start = reg_virt[0];
--
--	n = getprop(muram, "reg", &muram_offset, 4);
--	if (n < 4)
--		return -1;
-+	cbd_addr = muram_addr - muram_offset + cbd_offset;
- 
- 	scdp->open = cpm_serial_open;
- 	scdp->putc = cpm_serial_putc;
---- a/arch/powerpc/boot/cuboot-pq2.c
-+++ b/arch/powerpc/boot/cuboot-pq2.c
-@@ -128,7 +128,7 @@ static void fixup_pci(void)
- 	u8 *soc_regs;
- 	int i, len;
- 	void *node, *parent_node;
--	u32 naddr, nsize, mem_log2;
-+	u32 naddr, nsize, mem_pow2, mem_mask;
- 
- 	node = finddevice("/pci");
- 	if (!node || !dt_is_compatible(node, "fsl,pq2-pci"))
-@@ -141,7 +141,7 @@ static void fixup_pci(void)
- 
- 	soc_regs = (u8 *)fsl_get_immr();
- 	if (!soc_regs)
--		goto err;
-+		goto unhandled;
- 
- 	dt_get_reg_format(node, &naddr, &nsize);
- 	if (naddr != 3 || nsize != 2)
-@@ -153,7 +153,7 @@ static void fixup_pci(void)
- 
- 	dt_get_reg_format(parent_node, &naddr, &nsize);
- 	if (naddr != 1 || nsize != 1)
--		goto err;
-+		goto unhandled;
- 
- 	len = getprop(node, "ranges", pci_ranges_buf,
- 	              sizeof(pci_ranges_buf));
-@@ -170,14 +170,20 @@ static void fixup_pci(void)
- 	}
- 
- 	if (!mem || !mmio || !io)
--		goto err;
-+		goto unhandled;
-+	if (mem->size[1] != mmio->size[1])
-+		goto unhandled;
-+	if (mem->size[1] & (mem->size[1] - 1))
-+		goto unhandled;
-+	if (io->size[1] & (io->size[1] - 1))
-+		goto unhandled;
- 
- 	if (mem->phys_addr + mem->size[1] == mmio->phys_addr)
- 		mem_base = mem;
- 	else if (mmio->phys_addr + mmio->size[1] == mem->phys_addr)
- 		mem_base = mmio;
- 	else
--		goto err;
-+		goto unhandled;
- 
- 	out_be32(&pci_regs[1][0], mem_base->phys_addr | 1);
- 	out_be32(&pci_regs[2][0], ~(mem->size[1] + mmio->size[1] - 1));
-@@ -201,8 +207,9 @@ static void fixup_pci(void)
- 	out_le32(&pci_regs[0][58], 0);
- 	out_le32(&pci_regs[0][60], 0);
- 
--	mem_log2 = 1 << (__ilog2_u32(bd.bi_memsize - 1) + 1);
--	out_le32(&pci_regs[0][62], 0xa0000000 | ~((1 << (mem_log2 - 12)) - 1));
-+	mem_pow2 = 1 << (__ilog2_u32(bd.bi_memsize - 1) + 1);
-+	mem_mask = ~(mem_pow2 - 1) >> 12;
-+	out_le32(&pci_regs[0][62], 0xa0000000 | mem_mask);
- 
- 	/* If PCI is disabled, drive RST high to enable. */
- 	if (!(in_le32(&pci_regs[0][32]) & 1)) {
-@@ -228,7 +235,11 @@ static void fixup_pci(void)
- 	return;
- 
- err:
--	printf("Bad PCI node\r\n");
-+	printf("Bad PCI node -- using existing firmware setup.\r\n");
-+	return;
-+
-+unhandled:
-+	printf("Unsupported PCI node -- using existing firmware setup.\r\n");
- }
- 
- static void pq2_platform_fixups(void)
---- a/arch/powerpc/boot/cuboot-rainier.c
-+++ b/arch/powerpc/boot/cuboot-rainier.c
-@@ -42,7 +42,8 @@ static void rainier_fixups(void)
- 	ibm440ep_fixup_clocks(sysclk, 11059200, 50000000);
- 	ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
- 	ibm4xx_denali_fixup_memsize();
--	dt_fixup_mac_addresses(&bd.bi_enetaddr, &bd.bi_enet1addr);
-+	dt_fixup_mac_address_by_alias("ethernet0", bd.bi_enetaddr);
-+	dt_fixup_mac_address_by_alias("ethernet1", bd.bi_enet1addr);
- }
- 
- void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
---- a/arch/powerpc/boot/cuboot-sequoia.c
-+++ b/arch/powerpc/boot/cuboot-sequoia.c
-@@ -42,7 +42,8 @@ static void sequoia_fixups(void)
- 	ibm440ep_fixup_clocks(sysclk, 11059200, 50000000);
- 	ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
- 	ibm4xx_denali_fixup_memsize();
--	dt_fixup_mac_addresses(&bd.bi_enetaddr, &bd.bi_enet1addr);
-+	dt_fixup_mac_address_by_alias("ethernet0", bd.bi_enetaddr);
-+	dt_fixup_mac_address_by_alias("ethernet1", bd.bi_enet1addr);
- }
- 
- void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
---- a/arch/powerpc/boot/cuboot-taishan.c
-+++ b/arch/powerpc/boot/cuboot-taishan.c
-@@ -40,7 +40,8 @@ static void taishan_fixups(void)
- 
- 	ibm4xx_sdram_fixup_memsize();
- 
--	dt_fixup_mac_addresses(bd.bi_enetaddr, bd.bi_enet1addr);
-+	dt_fixup_mac_address_by_alias("ethernet0", bd.bi_enetaddr);
-+	dt_fixup_mac_address_by_alias("ethernet1", bd.bi_enet1addr);
- 
- 	ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
- }
---- a/arch/powerpc/boot/cuboot-warp.c
-+++ b/arch/powerpc/boot/cuboot-warp.c
-@@ -24,7 +24,7 @@ static void warp_fixups(void)
- 	ibm440ep_fixup_clocks(sysclk, 11059200, 50000000);
- 	ibm4xx_sdram_fixup_memsize();
- 	ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
--	dt_fixup_mac_addresses(&bd.bi_enetaddr);
-+	dt_fixup_mac_address_by_alias("ethernet0", bd.bi_enetaddr);
- }
- 
- 
---- /dev/null
-+++ b/arch/powerpc/boot/cuboot-yosemite.c
-@@ -0,0 +1,44 @@
-+/*
-+ * Old U-boot compatibility for Yosemite
-+ *
-+ * Author: Josh Boyer <jwboyer@linux.vnet.ibm.com>
-+ *
-+ * Copyright 2008 IBM Corporation
-+ *
-+ * 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.
-+ */
-+
-+#include "ops.h"
-+#include "stdio.h"
-+#include "4xx.h"
-+#include "44x.h"
-+#include "cuboot.h"
-+
-+#define TARGET_4xx
-+#define TARGET_44x
-+#include "ppcboot.h"
-+
-+static bd_t bd;
-+
-+static void yosemite_fixups(void)
-+{
-+	unsigned long sysclk = 66666666;
-+
-+	ibm440ep_fixup_clocks(sysclk, 11059200, 50000000);
-+	ibm4xx_sdram_fixup_memsize();
-+	ibm4xx_quiesce_eth((u32 *)0xef600e00, (u32 *)0xef600f00);
-+	dt_fixup_mac_address_by_alias("ethernet0", bd.bi_enetaddr);
-+	dt_fixup_mac_address_by_alias("ethernet1", bd.bi_enet1addr);
-+}
-+
-+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
-+		unsigned long r6, unsigned long r7)
-+{
-+	CUBOOT_INIT();
-+	platform_ops.fixups = yosemite_fixups;
-+	platform_ops.exit = ibm44x_dbcr_reset;
-+	fdt_init(_dtb_start);
-+	serial_console_init();
-+}
---- a/arch/powerpc/boot/devtree.c
-+++ b/arch/powerpc/boot/devtree.c
-@@ -350,3 +350,23 @@ int dt_is_compatible(void *node, const c
- 
- 	return 0;
- }
-+
-+int dt_get_virtual_reg(void *node, void **addr, int nres)
-+{
-+	unsigned long xaddr;
-+	int n;
-+
-+	n = getprop(node, "virtual-reg", addr, nres * 4);
-+	if (n > 0)
-+		return n / 4;
-+
-+	for (n = 0; n < nres; n++) {
-+		if (!dt_xlate_reg(node, n, &xaddr, NULL))
-+			break;
-+
-+		addr[n] = (void *)xaddr;
-+	}
-+
-+	return n;
-+}
-+
---- a/arch/powerpc/boot/dts/bamboo.dts
-+++ b/arch/powerpc/boot/dts/bamboo.dts
-@@ -204,7 +204,6 @@
- 			};
- 
- 			EMAC0: ethernet@ef600e00 {
--				linux,network-index = <0>;
- 				device_type = "network";
- 				compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
- 				interrupt-parent = <&UIC1>;
-@@ -225,7 +224,6 @@
- 			};
- 
- 			EMAC1: ethernet@ef600f00 {
--				linux,network-index = <1>;
- 				device_type = "network";
- 				compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
- 				interrupt-parent = <&UIC1>;
---- /dev/null
-+++ b/arch/powerpc/boot/dts/canyonlands.dts
-@@ -0,0 +1,402 @@
-+/*
-+ * Device Tree Source for AMCC Canyonlands (460EX)
-+ *
-+ * Copyright 2008 DENX Software Engineering, Stefan Roese <sr@denx.de>
-+ *
-+ * This file is licensed under the terms of the GNU General Public
-+ * License version 2.  This program is licensed "as is" without
-+ * any warranty of any kind, whether express or implied.
-+ */
-+
-+/ {
-+	#address-cells = <2>;
-+	#size-cells = <1>;
-+	model = "amcc,canyonlands";
-+	compatible = "amcc,canyonlands";
-+	dcr-parent = <&/cpus/cpu@0>;
-+
-+	aliases {
-+		ethernet0 = &EMAC0;
-+		ethernet1 = &EMAC1;
-+		serial0 = &UART0;
-+		serial1 = &UART1;
-+	};
-+
-+	cpus {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		cpu@0 {
-+			device_type = "cpu";
-+			model = "PowerPC,460EX";
-+			reg = <0>;
-+			clock-frequency = <0>; /* Filled in by U-Boot */
-+			timebase-frequency = <0>; /* Filled in by U-Boot */
-+			i-cache-line-size = <20>;
-+			d-cache-line-size = <20>;
-+			i-cache-size = <8000>;
-+			d-cache-size = <8000>;
-+			dcr-controller;
-+			dcr-access-method = "native";
-+		};
-+	};
-+
-+	memory {
-+		device_type = "memory";
-+		reg = <0 0 0>; /* Filled in by U-Boot */
-+	};
-+
-+	UIC0: interrupt-controller0 {
-+		compatible = "ibm,uic-460ex","ibm,uic";
-+		interrupt-controller;
-+		cell-index = <0>;
-+		dcr-reg = <0c0 009>;
-+		#address-cells = <0>;
-+		#size-cells = <0>;
-+		#interrupt-cells = <2>;
-+	};
-+
-+	UIC1: interrupt-controller1 {
-+		compatible = "ibm,uic-460ex","ibm,uic";
-+		interrupt-controller;
-+		cell-index = <1>;
-+		dcr-reg = <0d0 009>;
-+		#address-cells = <0>;
-+		#size-cells = <0>;
-+		#interrupt-cells = <2>;
-+		interrupts = <1e 4 1f 4>; /* cascade */
-+		interrupt-parent = <&UIC0>;
-+	};
-+
-+	UIC2: interrupt-controller2 {
-+		compatible = "ibm,uic-460ex","ibm,uic";
-+		interrupt-controller;
-+		cell-index = <2>;
-+		dcr-reg = <0e0 009>;
-+		#address-cells = <0>;
-+		#size-cells = <0>;
-+		#interrupt-cells = <2>;
-+		interrupts = <a 4 b 4>; /* cascade */
-+		interrupt-parent = <&UIC0>;
-+	};
-+
-+	UIC3: interrupt-controller3 {
-+		compatible = "ibm,uic-460ex","ibm,uic";
-+		interrupt-controller;
-+		cell-index = <3>;
-+		dcr-reg = <0f0 009>;
-+		#address-cells = <0>;
-+		#size-cells = <0>;
-+		#interrupt-cells = <2>;
-+		interrupts = <10 4 11 4>; /* cascade */
-+		interrupt-parent = <&UIC0>;
-+	};
-+
-+	SDR0: sdr {
-+		compatible = "ibm,sdr-460ex";
-+		dcr-reg = <00e 002>;
-+	};
-+
-+	CPR0: cpr {
-+		compatible = "ibm,cpr-460ex";
-+		dcr-reg = <00c 002>;
-+	};
-+
-+	plb {
-+		compatible = "ibm,plb-460ex", "ibm,plb4";
-+		#address-cells = <2>;
-+		#size-cells = <1>;
-+		ranges;
-+		clock-frequency = <0>; /* Filled in by U-Boot */
-+
-+		SDRAM0: sdram {
-+			compatible = "ibm,sdram-460ex", "ibm,sdram-405gp";
-+			dcr-reg = <010 2>;
-+		};
-+
-+		MAL0: mcmal {
-+			compatible = "ibm,mcmal-460ex", "ibm,mcmal2";
-+			dcr-reg = <180 62>;
-+			num-tx-chans = <2>;
-+			num-rx-chans = <10>;
-+			#address-cells = <0>;
-+			#size-cells = <0>;
-+			interrupt-parent = <&UIC2>;
-+			interrupts = <	/*TXEOB*/ 6 4
-+					/*RXEOB*/ 7 4
-+					/*SERR*/  3 4
-+					/*TXDE*/  4 4
-+					/*RXDE*/  5 4>;
-+		};
-+
-+		POB0: opb {
-+			compatible = "ibm,opb-460ex", "ibm,opb";
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+			ranges = <b0000000 4 b0000000 50000000>;
-+			clock-frequency = <0>; /* Filled in by U-Boot */
-+
-+			EBC0: ebc {
-+				compatible = "ibm,ebc-460ex", "ibm,ebc";
-+				dcr-reg = <012 2>;
-+				#address-cells = <2>;
-+				#size-cells = <1>;
-+				clock-frequency = <0>; /* Filled in by U-Boot */
-+				interrupts = <6 4>;
-+				interrupt-parent = <&UIC1>;
-+			};
-+
-+			UART0: serial@ef600300 {
-+				device_type = "serial";
-+				compatible = "ns16550";
-+				reg = <ef600300 8>;
-+				virtual-reg = <ef600300>;
-+				clock-frequency = <0>; /* Filled in by U-Boot */
-+				current-speed = <0>; /* Filled in by U-Boot */
-+				interrupt-parent = <&UIC1>;
-+				interrupts = <1 4>;
-+			};
-+
-+			UART1: serial@ef600400 {
-+				device_type = "serial";
-+				compatible = "ns16550";
-+				reg = <ef600400 8>;
-+				virtual-reg = <ef600400>;
-+				clock-frequency = <0>; /* Filled in by U-Boot */
-+				current-speed = <0>; /* Filled in by U-Boot */
-+				interrupt-parent = <&UIC0>;
-+				interrupts = <1 4>;
-+			};
-+
-+			UART2: serial@ef600500 {
-+				device_type = "serial";
-+				compatible = "ns16550";
-+				reg = <ef600500 8>;
-+				virtual-reg = <ef600500>;
-+				clock-frequency = <0>; /* Filled in by U-Boot */
-+				current-speed = <0>; /* Filled in by U-Boot */
-+				interrupt-parent = <&UIC1>;
-+				interrupts = <1d 4>;
-+			};
-+
-+			UART3: serial@ef600600 {
-+				device_type = "serial";
-+				compatible = "ns16550";
-+				reg = <ef600600 8>;
-+				virtual-reg = <ef600600>;
-+				clock-frequency = <0>; /* Filled in by U-Boot */
-+				current-speed = <0>; /* Filled in by U-Boot */
-+				interrupt-parent = <&UIC1>;
-+				interrupts = <1e 4>;
-+			};
-+
-+			IIC0: i2c@ef600700 {
-+				compatible = "ibm,iic-460ex", "ibm,iic";
-+				reg = <ef600700 14>;
-+				interrupt-parent = <&UIC0>;
-+				interrupts = <2 4>;
-+			};
-+
-+			IIC1: i2c@ef600800 {
-+				compatible = "ibm,iic-460ex", "ibm,iic";
-+				reg = <ef600800 14>;
-+				interrupt-parent = <&UIC0>;
-+				interrupts = <3 4>;
-+			};
-+
-+			ZMII0: emac-zmii@ef600d00 {
-+				compatible = "ibm,zmii-460ex", "ibm,zmii";
-+				reg = <ef600d00 c>;
-+			};
-+
-+			RGMII0: emac-rgmii@ef601500 {
-+				compatible = "ibm,rgmii-460ex", "ibm,rgmii";
-+				reg = <ef601500 8>;
-+				has-mdio;
-+			};
-+
-+			TAH0: emac-tah@ef601350 {
-+				compatible = "ibm,tah-460ex", "ibm,tah";
-+				reg = <ef601350 30>;
-+			};
-+
-+			TAH1: emac-tah@ef601450 {
-+				compatible = "ibm,tah-460ex", "ibm,tah";
-+				reg = <ef601450 30>;
-+			};
-+
-+			EMAC0: ethernet@ef600e00 {
-+				device_type = "network";
-+				compatible = "ibm,emac-460ex", "ibm,emac4";
-+				interrupt-parent = <&EMAC0>;
-+				interrupts = <0 1>;
-+				#interrupt-cells = <1>;
-+				#address-cells = <0>;
-+				#size-cells = <0>;
-+				interrupt-map = </*Status*/ 0 &UIC2 10 4
-+						 /*Wake*/   1 &UIC2 14 4>;
-+				reg = <ef600e00 70>;
-+				local-mac-address = [000000000000]; /* Filled in by U-Boot */
-+				mal-device = <&MAL0>;
-+				mal-tx-channel = <0>;
-+				mal-rx-channel = <0>;
-+				cell-index = <0>;
-+				max-frame-size = <2328>;
-+				rx-fifo-size = <1000>;
-+				tx-fifo-size = <800>;
-+				phy-mode = "rgmii";
-+				phy-map = <00000000>;
-+				rgmii-device = <&RGMII0>;
-+				rgmii-channel = <0>;
-+				tah-device = <&TAH0>;
-+				tah-channel = <0>;
-+				has-inverted-stacr-oc;
-+				has-new-stacr-staopc;
-+			};
-+
-+			EMAC1: ethernet@ef600f00 {
-+				device_type = "network";
-+				compatible = "ibm,emac-460ex", "ibm,emac4";
-+				interrupt-parent = <&EMAC1>;
-+				interrupts = <0 1>;
-+				#interrupt-cells = <1>;
-+				#address-cells = <0>;
-+				#size-cells = <0>;
-+				interrupt-map = </*Status*/ 0 &UIC2 11 4
-+						 /*Wake*/   1 &UIC2 15 4>;
-+				reg = <ef600f00 70>;
-+				local-mac-address = [000000000000]; /* Filled in by U-Boot */
-+				mal-device = <&MAL0>;
-+				mal-tx-channel = <1>;
-+				mal-rx-channel = <8>;
-+				cell-index = <1>;
-+				max-frame-size = <2328>;
-+				rx-fifo-size = <1000>;
-+				tx-fifo-size = <800>;
-+				phy-mode = "rgmii";
-+				phy-map = <00000000>;
-+				rgmii-device = <&RGMII0>;
-+				rgmii-channel = <1>;
-+				tah-device = <&TAH1>;
-+				tah-channel = <1>;
-+				has-inverted-stacr-oc;
-+				has-new-stacr-staopc;
-+				mdio-device = <&EMAC0>;
-+			};
-+		};
-+
-+		PCIX0: pci@c0ec00000 {
-+			device_type = "pci";
-+			#interrupt-cells = <1>;
-+			#size-cells = <2>;
-+			#address-cells = <3>;
-+			compatible = "ibm,plb-pcix-460ex", "ibm,plb-pcix";
-+			primary;
-+			large-inbound-windows;
-+			enable-msi-hole;
-+			reg = <c 0ec00000   8	/* Config space access */
-+			       0 0 0		/* no IACK cycles */
-+			       c 0ed00000   4   /* Special cycles */
-+			       c 0ec80000 100	/* Internal registers */
-+			       c 0ec80100  fc>;	/* Internal messaging registers */
-+
-+			/* Outbound ranges, one memory and one IO,
-+			 * later cannot be changed
-+			 */
-+			ranges = <02000000 0 80000000 0000000d 80000000 0 80000000
-+				  01000000 0 00000000 0000000c 08000000 0 00010000>;
-+
-+			/* Inbound 2GB range starting at 0 */
-+			dma-ranges = <42000000 0 0 0 0 0 80000000>;
-+
-+			/* This drives busses 0 to 0x3f */
-+			bus-range = <0 3f>;
-+
-+			/* All PCI interrupts are routed to ext IRQ 2 -> UIC1-0 */
-+			interrupt-map-mask = <0000 0 0 0>;
-+			interrupt-map = < 0000 0 0 0 &UIC1 0 8 >;
-+		};
-+
-+		PCIE0: pciex@d00000000 {
-+			device_type = "pci";
-+			#interrupt-cells = <1>;
-+			#size-cells = <2>;
-+			#address-cells = <3>;
-+			compatible = "ibm,plb-pciex-460ex", "ibm,plb-pciex";
-+			primary;
-+			port = <0>; /* port number */
-+			reg = <d 00000000 20000000	/* Config space access */
-+			       c 08010000 00001000>;	/* Registers */
-+			dcr-reg = <100 020>;
-+			sdr-base = <300>;
-+
-+			/* Outbound ranges, one memory and one IO,
-+			 * later cannot be changed
-+			 */
-+			ranges = <02000000 0 80000000 0000000e 00000000 0 80000000
-+				  01000000 0 00000000 0000000f 80000000 0 00010000>;
-+
-+			/* Inbound 2GB range starting at 0 */
-+			dma-ranges = <42000000 0 0 0 0 0 80000000>;
-+
-+			/* This drives busses 40 to 0x7f */
-+			bus-range = <40 7f>;
-+
-+			/* Legacy interrupts (note the weird polarity, the bridge seems
-+			 * to invert PCIe legacy interrupts).
-+			 * We are de-swizzling here because the numbers are actually for
-+			 * port of the root complex virtual P2P bridge. But I want
-+			 * to avoid putting a node for it in the tree, so the numbers
-+			 * below are basically de-swizzled numbers.
-+			 * The real slot is on idsel 0, so the swizzling is 1:1
-+			 */
-+			interrupt-map-mask = <0000 0 0 7>;
-+			interrupt-map = <
-+				0000 0 0 1 &UIC3 c 4 /* swizzled int A */
-+				0000 0 0 2 &UIC3 d 4 /* swizzled int B */
-+				0000 0 0 3 &UIC3 e 4 /* swizzled int C */
-+				0000 0 0 4 &UIC3 f 4 /* swizzled int D */>;
-+		};
-+
-+		PCIE1: pciex@d20000000 {
-+			device_type = "pci";
-+			#interrupt-cells = <1>;
-+			#size-cells = <2>;
-+			#address-cells = <3>;
-+			compatible = "ibm,plb-pciex-460ex", "ibm,plb-pciex";
-+			primary;
-+			port = <1>; /* port number */
-+			reg = <d 20000000 20000000	/* Config space access */
-+			       c 08011000 00001000>;	/* Registers */
-+			dcr-reg = <120 020>;
-+			sdr-base = <340>;
-+
-+			/* Outbound ranges, one memory and one IO,
-+			 * later cannot be changed
-+			 */
-+			ranges = <02000000 0 80000000 0000000e 80000000 0 80000000
-+				  01000000 0 00000000 0000000f 80010000 0 00010000>;
-+
-+			/* Inbound 2GB range starting at 0 */
-+			dma-ranges = <42000000 0 0 0 0 0 80000000>;
-+
-+			/* This drives busses 80 to 0xbf */
-+			bus-range = <80 bf>;
-+
-+			/* Legacy interrupts (note the weird polarity, the bridge seems
-+			 * to invert PCIe legacy interrupts).
-+			 * We are de-swizzling here because the numbers are actually for
-+			 * port of the root complex virtual P2P bridge. But I want
-+			 * to avoid putting a node for it in the tree, so the numbers
-+			 * below are basically de-swizzled numbers.
-+			 * The real slot is on idsel 0, so the swizzling is 1:1
-+			 */
-+			interrupt-map-mask = <0000 0 0 7>;
-+			interrupt-map = <
-+				0000 0 0 1 &UIC3 10 4 /* swizzled int A */
-+				0000 0 0 2 &UIC3 11 4 /* swizzled int B */
-+				0000 0 0 3 &UIC3 12 4 /* swizzled int C */
-+				0000 0 0 4 &UIC3 13 4 /* swizzled int D */>;
-+		};
-+	};
-+};
---- a/arch/powerpc/boot/dts/ebony.dts
-+++ b/arch/powerpc/boot/dts/ebony.dts
-@@ -241,7 +241,6 @@
- 			};
- 
- 			EMAC0: ethernet@40000800 {
--				linux,network-index = <0>;
- 				device_type = "network";
- 				compatible = "ibm,emac-440gp", "ibm,emac";
- 				interrupt-parent = <&UIC1>;
-@@ -261,7 +260,6 @@
- 				zmii-channel = <0>;
- 			};
- 			EMAC1: ethernet@40000900 {
--				linux,network-index = <1>;
- 				device_type = "network";
- 				compatible = "ibm,emac-440gp", "ibm,emac";
- 				interrupt-parent = <&UIC1>;
---- a/arch/powerpc/boot/dts/ep8248e.dts
-+++ b/arch/powerpc/boot/dts/ep8248e.dts
-@@ -121,8 +121,7 @@
- 
- 				data@0 {
- 					compatible = "fsl,cpm-muram-data";
--					reg = <0 0x1100 0x1140
--					       0xec0 0x9800 0x800>;
-+					reg = <0 0x2000 0x9800 0x800>;
- 				};
- 			};
- 
-@@ -138,7 +137,7 @@
- 				device_type = "serial";
- 				compatible = "fsl,mpc8248-smc-uart",
- 				             "fsl,cpm2-smc-uart";
--				reg = <0x11a80 0x20 0x1100 0x40>;
-+				reg = <0x11a80 0x20 0x87fc 2>;
- 				interrupts = <4 8>;
- 				interrupt-parent = <&PIC>;
- 				fsl,cpm-brg = <7>;
---- a/arch/powerpc/boot/dts/ep88xc.dts
-+++ b/arch/powerpc/boot/dts/ep88xc.dts
-@@ -2,7 +2,7 @@
-  * EP88xC Device Tree Source
-  *
-  * Copyright 2006 MontaVista Software, Inc.
-- * Copyright 2007 Freescale Semiconductor, Inc.
-+ * Copyright 2007,2008 Freescale Semiconductor, Inc.
-  *
-  * 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
-@@ -10,6 +10,7 @@
-  * option) any later version.
-  */
- 
-+/dts-v1/;
- 
- / {
- 	model = "EP88xC";
-@@ -23,44 +24,44 @@
- 
- 		PowerPC,885@0 {
- 			device_type = "cpu";
--			reg = <0>;
--			d-cache-line-size = <d#16>;
--			i-cache-line-size = <d#16>;
--			d-cache-size = <d#8192>;
--			i-cache-size = <d#8192>;
-+			reg = <0x0>;
-+			d-cache-line-size = <16>;
-+			i-cache-line-size = <16>;
-+			d-cache-size = <8192>;
-+			i-cache-size = <8192>;
- 			timebase-frequency = <0>;
- 			bus-frequency = <0>;
- 			clock-frequency = <0>;
--			interrupts = <f 2>;	// decrementer interrupt
-+			interrupts = <15 2>;	// decrementer interrupt
- 			interrupt-parent = <&PIC>;
- 		};
- 	};
- 
- 	memory {
- 		device_type = "memory";
--		reg = <0 0>;
-+		reg = <0x0 0x0>;
- 	};
- 
- 	localbus@fa200100 {
- 		compatible = "fsl,mpc885-localbus", "fsl,pq1-localbus";
- 		#address-cells = <2>;
- 		#size-cells = <1>;
--		reg = <fa200100 40>;
-+		reg = <0xfa200100 0x40>;
- 
- 		ranges = <
--			0 0 fc000000 04000000
--			3 0 fa000000 01000000
-+			0x0 0x0 0xfc000000 0x4000000
-+			0x3 0x0 0xfa000000 0x1000000
- 		>;
- 
- 		flash@0,2000000 {
- 			compatible = "cfi-flash";
--			reg = <0 2000000 2000000>;
-+			reg = <0x0 0x2000000 0x2000000>;
- 			bank-width = <4>;
- 			device-width = <2>;
- 		};
- 
- 		board-control@3,400000 {
--			reg = <3 400000 10>;
-+			reg = <0x3 0x400000 0x10>;
- 			compatible = "fsl,ep88xc-bcsr";
- 		};
- 	};
-@@ -70,25 +71,25 @@
- 		#address-cells = <1>;
- 		#size-cells = <1>;
- 		device_type = "soc";
--		ranges = <0 fa200000 00004000>;
-+		ranges = <0x0 0xfa200000 0x4000>;
- 		bus-frequency = <0>;
- 
- 		// Temporary -- will go away once kernel uses ranges for get_immrbase().
--		reg = <fa200000 4000>;
-+		reg = <0xfa200000 0x4000>;
- 
- 		mdio@e00 {
- 			compatible = "fsl,mpc885-fec-mdio", "fsl,pq1-fec-mdio";
--			reg = <e00 188>;
-+			reg = <0xe00 0x188>;
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 
- 			PHY0: ethernet-phy@0 {
--				reg = <0>;
-+				reg = <0x0>;
- 				device_type = "ethernet-phy";
- 			};
- 
- 			PHY1: ethernet-phy@1 {
--				reg = <1>;
-+				reg = <0x1>;
- 				device_type = "ethernet-phy";
- 			};
- 		};
-@@ -97,7 +98,7 @@
- 			device_type = "network";
- 			compatible = "fsl,mpc885-fec-enet",
- 			             "fsl,pq1-fec-enet";
--			reg = <e00 188>;
-+			reg = <0xe00 0x188>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
- 			interrupts = <3 1>;
- 			interrupt-parent = <&PIC>;
-@@ -109,7 +110,7 @@
- 			device_type = "network";
- 			compatible = "fsl,mpc885-fec-enet",
- 			             "fsl,pq1-fec-enet";
--			reg = <1e00 188>;
-+			reg = <0x1e00 0x188>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
- 			interrupts = <7 1>;
- 			interrupt-parent = <&PIC>;
-@@ -120,7 +121,7 @@
- 		PIC: interrupt-controller@0 {
- 			interrupt-controller;
- 			#interrupt-cells = <2>;
--			reg = <0 24>;
-+			reg = <0x0 0x24>;
- 			compatible = "fsl,mpc885-pic", "fsl,pq1-pic";
- 		};
- 
-@@ -130,29 +131,29 @@
- 			#size-cells = <2>;
- 			compatible = "fsl,pq-pcmcia";
- 			device_type = "pcmcia";
--			reg = <80 80>;
-+			reg = <0x80 0x80>;
- 			interrupt-parent = <&PIC>;
--			interrupts = <d 1>;
-+			interrupts = <13 1>;
- 		};
- 
- 		cpm@9c0 {
- 			#address-cells = <1>;
- 			#size-cells = <1>;
- 			compatible = "fsl,mpc885-cpm", "fsl,cpm1";
--			command-proc = <9c0>;
-+			command-proc = <0x9c0>;
- 			interrupts = <0>;	// cpm error interrupt
- 			interrupt-parent = <&CPM_PIC>;
--			reg = <9c0 40>;
-+			reg = <0x9c0 0x40>;
- 			ranges;
- 
- 			muram@2000 {
- 				#address-cells = <1>;
- 				#size-cells = <1>;
--				ranges = <0 2000 2000>;
-+				ranges = <0x0 0x2000 0x2000>;
- 
- 				data@0 {
- 					compatible = "fsl,cpm-muram-data";
--					reg = <0 1c00>;
-+					reg = <0x0 0x1c00>;
- 				};
- 			};
- 
-@@ -160,7 +161,7 @@
- 				compatible = "fsl,mpc885-brg",
- 				             "fsl,cpm1-brg",
- 				             "fsl,cpm-brg";
--				reg = <9f0 10>;
-+				reg = <0x9f0 0x10>;
- 			};
- 
- 			CPM_PIC: interrupt-controller@930 {
-@@ -168,7 +169,7 @@
- 				#interrupt-cells = <1>;
- 				interrupts = <5 2 0 2>;
- 				interrupt-parent = <&PIC>;
--				reg = <930 20>;
-+				reg = <0x930 0x20>;
- 				compatible = "fsl,mpc885-cpm-pic",
- 				             "fsl,cpm1-pic";
- 			};
-@@ -178,11 +179,11 @@
- 				device_type = "serial";
- 				compatible = "fsl,mpc885-smc-uart",
- 				             "fsl,cpm1-smc-uart";
--				reg = <a80 10 3e80 40>;
-+				reg = <0xa80 0x10 0x3e80 0x40>;
- 				interrupts = <4>;
- 				interrupt-parent = <&CPM_PIC>;
- 				fsl,cpm-brg = <1>;
--				fsl,cpm-command = <0090>;
-+				fsl,cpm-command = <0x90>;
- 				linux,planetcore-label = "SMC1";
- 			};
- 
-@@ -191,11 +192,11 @@
- 				device_type = "serial";
- 				compatible = "fsl,mpc885-scc-uart",
- 				             "fsl,cpm1-scc-uart";
--				reg = <a20 20 3d00 80>;
--				interrupts = <1d>;
-+				reg = <0xa20 0x20 0x3d00 0x80>;
-+				interrupts = <29>;
- 				interrupt-parent = <&CPM_PIC>;
- 				fsl,cpm-brg = <2>;
--				fsl,cpm-command = <0040>;
-+				fsl,cpm-command = <0x40>;
- 				linux,planetcore-label = "SCC2";
- 			};
- 
-@@ -204,9 +205,9 @@
- 				#size-cells = <0>;
- 				compatible = "fsl,mpc885-usb",
- 				             "fsl,cpm1-usb";
--				reg = <a00 18 1c00 80>;
-+				reg = <0xa00 0x18 0x1c00 0x80>;
- 				interrupt-parent = <&CPM_PIC>;
--				interrupts = <1e>;
-+				interrupts = <30>;
- 				fsl,cpm-command = <0000>;
- 			};
- 		};
---- /dev/null
-+++ b/arch/powerpc/boot/dts/glacier.dts
-@@ -0,0 +1,467 @@
-+/*
-+ * Device Tree Source for AMCC Glacier (460GT)
-+ *
-+ * Copyright 2008 DENX Software Engineering, Stefan Roese <sr@denx.de>
-+ *
-+ * This file is licensed under the terms of the GNU General Public
-+ * License version 2.  This program is licensed "as is" without
-+ * any warranty of any kind, whether express or implied.
-+ */
-+
-+/ {
-+	#address-cells = <2>;
-+	#size-cells = <1>;
-+	model = "amcc,glacier";
-+	compatible = "amcc,glacier", "amcc,canyonlands";
-+	dcr-parent = <&/cpus/cpu@0>;
-+
-+	aliases {
-+		ethernet0 = &EMAC0;
-+		ethernet1 = &EMAC1;
-+		ethernet2 = &EMAC2;
-+		ethernet3 = &EMAC3;
-+		serial0 = &UART0;
-+		serial1 = &UART1;
-+	};
-+
-+	cpus {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		cpu@0 {
-+			device_type = "cpu";
-+			model = "PowerPC,460GT";
-+			reg = <0>;
-+			clock-frequency = <0>; /* Filled in by U-Boot */
-+			timebase-frequency = <0>; /* Filled in by U-Boot */
-+			i-cache-line-size = <20>;
-+			d-cache-line-size = <20>;
-+			i-cache-size = <8000>;
-+			d-cache-size = <8000>;
-+			dcr-controller;
-+			dcr-access-method = "native";
-+		};
-+	};
-+
-+	memory {
-+		device_type = "memory";
-+		reg = <0 0 0>; /* Filled in by U-Boot */
-+	};
-+
-+	UIC0: interrupt-controller0 {
-+		compatible = "ibm,uic-460gt","ibm,uic";
-+		interrupt-controller;
-+		cell-index = <0>;
-+		dcr-reg = <0c0 009>;
-+		#address-cells = <0>;
-+		#size-cells = <0>;
-+		#interrupt-cells = <2>;
-+	};
-+
-+	UIC1: interrupt-controller1 {
-+		compatible = "ibm,uic-460gt","ibm,uic";
-+		interrupt-controller;
-+		cell-index = <1>;
-+		dcr-reg = <0d0 009>;
-+		#address-cells = <0>;
-+		#size-cells = <0>;
-+		#interrupt-cells = <2>;
-+		interrupts = <1e 4 1f 4>; /* cascade */
-+		interrupt-parent = <&UIC0>;
-+	};
-+
-+	UIC2: interrupt-controller2 {
-+		compatible = "ibm,uic-460gt","ibm,uic";
-+		interrupt-controller;
-+		cell-index = <2>;
-+		dcr-reg = <0e0 009>;
-+		#address-cells = <0>;
-+		#size-cells = <0>;
-+		#interrupt-cells = <2>;
-+		interrupts = <a 4 b 4>; /* cascade */
-+		interrupt-parent = <&UIC0>;
-+	};
-+
-+	UIC3: interrupt-controller3 {
-+		compatible = "ibm,uic-460gt","ibm,uic";
-+		interrupt-controller;
-+		cell-index = <3>;
-+		dcr-reg = <0f0 009>;
-+		#address-cells = <0>;
-+		#size-cells = <0>;
-+		#interrupt-cells = <2>;
-+		interrupts = <10 4 11 4>; /* cascade */
-+		interrupt-parent = <&UIC0>;
-+	};
-+
-+	SDR0: sdr {
-+		compatible = "ibm,sdr-460gt";
-+		dcr-reg = <00e 002>;
-+	};
-+
-+	CPR0: cpr {
-+		compatible = "ibm,cpr-460gt";
-+		dcr-reg = <00c 002>;
-+	};
-+
-+	plb {
-+		compatible = "ibm,plb-460gt", "ibm,plb4";
-+		#address-cells = <2>;
-+		#size-cells = <1>;
-+		ranges;
-+		clock-frequency = <0>; /* Filled in by U-Boot */
-+
-+		SDRAM0: sdram {
-+			compatible = "ibm,sdram-460gt", "ibm,sdram-405gp";
-+			dcr-reg = <010 2>;
-+		};
-+
-+		MAL0: mcmal {
-+			compatible = "ibm,mcmal-460gt", "ibm,mcmal2";
-+			dcr-reg = <180 62>;
-+			num-tx-chans = <4>;
-+			num-rx-chans = <20>;
-+			#address-cells = <0>;
-+			#size-cells = <0>;
-+			interrupt-parent = <&UIC2>;
-+			interrupts = <	/*TXEOB*/ 6 4
-+					/*RXEOB*/ 7 4
-+					/*SERR*/  3 4
-+					/*TXDE*/  4 4
-+					/*RXDE*/  5 4>;
-+			desc-base-addr-high = <8>;
-+		};
-+
-+		POB0: opb {
-+			compatible = "ibm,opb-460gt", "ibm,opb";
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+			ranges = <b0000000 4 b0000000 50000000>;
-+			clock-frequency = <0>; /* Filled in by U-Boot */
-+
-+			EBC0: ebc {
-+				compatible = "ibm,ebc-460gt", "ibm,ebc";
-+				dcr-reg = <012 2>;
-+				#address-cells = <2>;
-+				#size-cells = <1>;
-+				clock-frequency = <0>; /* Filled in by U-Boot */
-+				interrupts = <6 4>;
-+				interrupt-parent = <&UIC1>;
-+			};
-+
-+			UART0: serial@ef600300 {
-+				device_type = "serial";
-+				compatible = "ns16550";
-+				reg = <ef600300 8>;
-+				virtual-reg = <ef600300>;
-+				clock-frequency = <0>; /* Filled in by U-Boot */
-+				current-speed = <0>; /* Filled in by U-Boot */
-+				interrupt-parent = <&UIC1>;
-+				interrupts = <1 4>;
-+			};
-+
-+			UART1: serial@ef600400 {
-+				device_type = "serial";
-+				compatible = "ns16550";
-+				reg = <ef600400 8>;
-+				virtual-reg = <ef600400>;
-+				clock-frequency = <0>; /* Filled in by U-Boot */
-+				current-speed = <0>; /* Filled in by U-Boot */
-+				interrupt-parent = <&UIC0>;
-+				interrupts = <1 4>;
-+			};
-+
-+			UART2: serial@ef600500 {
-+				device_type = "serial";
-+				compatible = "ns16550";
-+				reg = <ef600500 8>;
-+				virtual-reg = <ef600500>;
-+				clock-frequency = <0>; /* Filled in by U-Boot */
-+				current-speed = <0>; /* Filled in by U-Boot */
-+				interrupt-parent = <&UIC1>;
-+				interrupts = <1d 4>;
-+			};
-+
-+			UART3: serial@ef600600 {
-+				device_type = "serial";
-+				compatible = "ns16550";
-+				reg = <ef600600 8>;
-+				virtual-reg = <ef600600>;
-+				clock-frequency = <0>; /* Filled in by U-Boot */
-+				current-speed = <0>; /* Filled in by U-Boot */
-+				interrupt-parent = <&UIC1>;
-+				interrupts = <1e 4>;
-+			};
-+
-+			IIC0: i2c@ef600700 {
-+				compatible = "ibm,iic-460gt", "ibm,iic";
-+				reg = <ef600700 14>;
-+				interrupt-parent = <&UIC0>;
-+				interrupts = <2 4>;
-+			};
-+
-+			IIC1: i2c@ef600800 {
-+				compatible = "ibm,iic-460gt", "ibm,iic";
-+				reg = <ef600800 14>;
-+				interrupt-parent = <&UIC0>;
-+				interrupts = <3 4>;
-+			};
-+
-+			ZMII0: emac-zmii@ef600d00 {
-+				compatible = "ibm,zmii-460gt", "ibm,zmii";
-+				reg = <ef600d00 c>;
-+			};
-+
-+			RGMII0: emac-rgmii@ef601500 {
-+				compatible = "ibm,rgmii-460gt", "ibm,rgmii";
-+				reg = <ef601500 8>;
-+				has-mdio;
-+			};
-+
-+			RGMII1: emac-rgmii@ef601600 {
-+				compatible = "ibm,rgmii-460gt", "ibm,rgmii";
-+				reg = <ef601600 8>;
-+				has-mdio;
-+			};
-+
-+			TAH0: emac-tah@ef601350 {
-+				compatible = "ibm,tah-460gt", "ibm,tah";
-+				reg = <ef601350 30>;
-+			};
-+
-+			TAH1: emac-tah@ef601450 {
-+				compatible = "ibm,tah-460gt", "ibm,tah";
-+				reg = <ef601450 30>;
-+			};
-+
-+			EMAC0: ethernet@ef600e00 {
-+				device_type = "network";
-+				compatible = "ibm,emac-460gt", "ibm,emac4";
-+				interrupt-parent = <&EMAC0>;
-+				interrupts = <0 1>;
-+				#interrupt-cells = <1>;
-+				#address-cells = <0>;
-+				#size-cells = <0>;
-+				interrupt-map = </*Status*/ 0 &UIC2 10 4
-+						 /*Wake*/   1 &UIC2 14 4>;
-+				reg = <ef600e00 70>;
-+				local-mac-address = [000000000000]; /* Filled in by U-Boot */
-+				mal-device = <&MAL0>;
-+				mal-tx-channel = <0>;
-+				mal-rx-channel = <0>;
-+				cell-index = <0>;
-+				max-frame-size = <2328>;
-+				rx-fifo-size = <1000>;
-+				tx-fifo-size = <800>;
-+				phy-mode = "rgmii";
-+				phy-map = <00000000>;
-+				rgmii-device = <&RGMII0>;
-+				rgmii-channel = <0>;
-+				tah-device = <&TAH0>;
-+				tah-channel = <0>;
-+				has-inverted-stacr-oc;
-+				has-new-stacr-staopc;
-+			};
-+
-+			EMAC1: ethernet@ef600f00 {
-+				device_type = "network";
-+				compatible = "ibm,emac-460gt", "ibm,emac4";
-+				interrupt-parent = <&EMAC1>;
-+				interrupts = <0 1>;
-+				#interrupt-cells = <1>;
-+				#address-cells = <0>;
-+				#size-cells = <0>;
-+				interrupt-map = </*Status*/ 0 &UIC2 11 4
-+						 /*Wake*/   1 &UIC2 15 4>;
-+				reg = <ef600f00 70>;
-+				local-mac-address = [000000000000]; /* Filled in by U-Boot */
-+				mal-device = <&MAL0>;
-+				mal-tx-channel = <1>;
-+				mal-rx-channel = <8>;
-+				cell-index = <1>;
-+				max-frame-size = <2328>;
-+				rx-fifo-size = <1000>;
-+				tx-fifo-size = <800>;
-+				phy-mode = "rgmii";
-+				phy-map = <00000000>;
-+				rgmii-device = <&RGMII0>;
-+				rgmii-channel = <1>;
-+				tah-device = <&TAH1>;
-+				tah-channel = <1>;
-+				has-inverted-stacr-oc;
-+				has-new-stacr-staopc;
-+				mdio-device = <&EMAC0>;
-+			};
-+
-+			EMAC2: ethernet@ef601100 {
-+				device_type = "network";
-+				compatible = "ibm,emac-460gt", "ibm,emac4";
-+				interrupt-parent = <&EMAC2>;
-+				interrupts = <0 1>;
-+				#interrupt-cells = <1>;
-+				#address-cells = <0>;
-+				#size-cells = <0>;
-+				interrupt-map = </*Status*/ 0 &UIC2 12 4
-+						 /*Wake*/   1 &UIC2 16 4>;
-+				reg = <ef601100 70>;
-+				local-mac-address = [000000000000]; /* Filled in by U-Boot */
-+				mal-device = <&MAL0>;
-+				mal-tx-channel = <2>;
-+				mal-rx-channel = <10>;
-+				cell-index = <2>;
-+				max-frame-size = <2328>;
-+				rx-fifo-size = <1000>;
-+				tx-fifo-size = <800>;
-+				phy-mode = "rgmii";
-+				phy-map = <00000000>;
-+				rgmii-device = <&RGMII1>;
-+				rgmii-channel = <0>;
-+				has-inverted-stacr-oc;
-+				has-new-stacr-staopc;
-+				mdio-device = <&EMAC0>;
-+			};
-+
-+			EMAC3: ethernet@ef601200 {
-+				device_type = "network";
-+				compatible = "ibm,emac-460gt", "ibm,emac4";
-+				interrupt-parent = <&EMAC3>;
-+				interrupts = <0 1>;
-+				#interrupt-cells = <1>;
-+				#address-cells = <0>;
-+				#size-cells = <0>;
-+				interrupt-map = </*Status*/ 0 &UIC2 13 4
-+						 /*Wake*/   1 &UIC2 17 4>;
-+				reg = <ef601200 70>;
-+				local-mac-address = [000000000000]; /* Filled in by U-Boot */
-+				mal-device = <&MAL0>;
-+				mal-tx-channel = <3>;
-+				mal-rx-channel = <18>;
-+				cell-index = <3>;
-+				max-frame-size = <2328>;
-+				rx-fifo-size = <1000>;
-+				tx-fifo-size = <800>;
-+				phy-mode = "rgmii";
-+				phy-map = <00000000>;
-+				rgmii-device = <&RGMII1>;
-+				rgmii-channel = <1>;
-+				has-inverted-stacr-oc;
-+				has-new-stacr-staopc;
-+				mdio-device = <&EMAC0>;
-+			};
-+		};
-+
-+		PCIX0: pci@c0ec00000 {
-+			device_type = "pci";
-+			#interrupt-cells = <1>;
-+			#size-cells = <2>;
-+			#address-cells = <3>;
-+			compatible = "ibm,plb-pcix-460gt", "ibm,plb-pcix";
-+			primary;
-+			large-inbound-windows;
-+			enable-msi-hole;
-+			reg = <c 0ec00000   8	/* Config space access */
-+			       0 0 0		/* no IACK cycles */
-+			       c 0ed00000   4   /* Special cycles */
-+			       c 0ec80000 100	/* Internal registers */
-+			       c 0ec80100  fc>;	/* Internal messaging registers */
-+
-+			/* Outbound ranges, one memory and one IO,
-+			 * later cannot be changed
-+			 */
-+			ranges = <02000000 0 80000000 0000000d 80000000 0 80000000
-+				  01000000 0 00000000 0000000c 08000000 0 00010000>;
-+
-+			/* Inbound 2GB range starting at 0 */
-+			dma-ranges = <42000000 0 0 0 0 0 80000000>;
-+
-+			/* This drives busses 0 to 0x3f */
-+			bus-range = <0 3f>;
-+
-+			/* All PCI interrupts are routed to ext IRQ 2 -> UIC1-0 */
-+			interrupt-map-mask = <0000 0 0 0>;
-+			interrupt-map = < 0000 0 0 0 &UIC1 0 8 >;
-+		};
-+
-+		PCIE0: pciex@d00000000 {
-+			device_type = "pci";
-+			#interrupt-cells = <1>;
-+			#size-cells = <2>;
-+			#address-cells = <3>;
-+			compatible = "ibm,plb-pciex-460ex", "ibm,plb-pciex";
-+			primary;
-+			port = <0>; /* port number */
-+			reg = <d 00000000 20000000	/* Config space access */
-+			       c 08010000 00001000>;	/* Registers */
-+			dcr-reg = <100 020>;
-+			sdr-base = <300>;
-+
-+			/* Outbound ranges, one memory and one IO,
-+			 * later cannot be changed
-+			 */
-+			ranges = <02000000 0 80000000 0000000e 00000000 0 80000000
-+				  01000000 0 00000000 0000000f 80000000 0 00010000>;
-+
-+			/* Inbound 2GB range starting at 0 */
-+			dma-ranges = <42000000 0 0 0 0 0 80000000>;
-+
-+			/* This drives busses 40 to 0x7f */
-+			bus-range = <40 7f>;
-+
-+			/* Legacy interrupts (note the weird polarity, the bridge seems
-+			 * to invert PCIe legacy interrupts).
-+			 * We are de-swizzling here because the numbers are actually for
-+			 * port of the root complex virtual P2P bridge. But I want
-+			 * to avoid putting a node for it in the tree, so the numbers
-+			 * below are basically de-swizzled numbers.
-+			 * The real slot is on idsel 0, so the swizzling is 1:1
-+			 */
-+			interrupt-map-mask = <0000 0 0 7>;
-+			interrupt-map = <
-+				0000 0 0 1 &UIC3 c 4 /* swizzled int A */
-+				0000 0 0 2 &UIC3 d 4 /* swizzled int B */
-+				0000 0 0 3 &UIC3 e 4 /* swizzled int C */
-+				0000 0 0 4 &UIC3 f 4 /* swizzled int D */>;
-+		};
-+
-+		PCIE1: pciex@d20000000 {
-+			device_type = "pci";
-+			#interrupt-cells = <1>;
-+			#size-cells = <2>;
-+			#address-cells = <3>;
-+			compatible = "ibm,plb-pciex-460ex", "ibm,plb-pciex";
-+			primary;
-+			port = <1>; /* port number */
-+			reg = <d 20000000 20000000	/* Config space access */
-+			       c 08011000 00001000>;	/* Registers */
-+			dcr-reg = <120 020>;
-+			sdr-base = <340>;
-+
-+			/* Outbound ranges, one memory and one IO,
-+			 * later cannot be changed
-+			 */
-+			ranges = <02000000 0 80000000 0000000e 80000000 0 80000000
-+				  01000000 0 00000000 0000000f 80010000 0 00010000>;
-+
-+			/* Inbound 2GB range starting at 0 */
-+			dma-ranges = <42000000 0 0 0 0 0 80000000>;
-+
-+			/* This drives busses 80 to 0xbf */
-+			bus-range = <80 bf>;
-+
-+			/* Legacy interrupts (note the weird polarity, the bridge seems
-+			 * to invert PCIe legacy interrupts).
-+			 * We are de-swizzling here because the numbers are actually for
-+			 * port of the root complex virtual P2P bridge. But I want
-+			 * to avoid putting a node for it in the tree, so the numbers
-+			 * below are basically de-swizzled numbers.
-+			 * The real slot is on idsel 0, so the swizzling is 1:1
-+			 */
-+			interrupt-map-mask = <0000 0 0 7>;
-+			interrupt-map = <
-+				0000 0 0 1 &UIC3 10 4 /* swizzled int A */
-+				0000 0 0 2 &UIC3 11 4 /* swizzled int B */
-+				0000 0 0 3 &UIC3 12 4 /* swizzled int C */
-+				0000 0 0 4 &UIC3 13 4 /* swizzled int D */>;
-+		};
-+	};
-+};
---- a/arch/powerpc/boot/dts/haleakala.dts
-+++ b/arch/powerpc/boot/dts/haleakala.dts
-@@ -12,7 +12,7 @@
- 	#address-cells = <1>;
- 	#size-cells = <1>;
- 	model = "amcc,haleakala";
--	compatible = "amcc,kilauea";
-+	compatible = "amcc,haleakala", "amcc,kilauea";
- 	dcr-parent = <&/cpus/cpu@0>;
- 
- 	aliases {
-@@ -218,7 +218,7 @@
- 				mal-tx-channel = <0>;
- 				mal-rx-channel = <0>;
- 				cell-index = <0>;
--				max-frame-size = <5dc>;
-+				max-frame-size = <2328>;
- 				rx-fifo-size = <1000>;
- 				tx-fifo-size = <800>;
- 				phy-mode = "rgmii";
---- a/arch/powerpc/boot/dts/katmai.dts
-+++ b/arch/powerpc/boot/dts/katmai.dts
-@@ -212,7 +212,7 @@
- 				mal-tx-channel = <0>;
- 				mal-rx-channel = <0>;
- 				cell-index = <0>;
--				max-frame-size = <5dc>;
-+				max-frame-size = <2328>;
- 				rx-fifo-size = <1000>;
- 				tx-fifo-size = <800>;
- 				phy-mode = "gmii";
---- a/arch/powerpc/boot/dts/kilauea.dts
-+++ b/arch/powerpc/boot/dts/kilauea.dts
-@@ -219,7 +219,7 @@
- 				mal-tx-channel = <0>;
- 				mal-rx-channel = <0>;
- 				cell-index = <0>;
--				max-frame-size = <5dc>;
-+				max-frame-size = <2328>;
- 				rx-fifo-size = <1000>;
- 				tx-fifo-size = <800>;
- 				phy-mode = "rgmii";
-@@ -247,7 +247,7 @@
- 				mal-tx-channel = <1>;
- 				mal-rx-channel = <1>;
- 				cell-index = <1>;
--				max-frame-size = <5dc>;
-+				max-frame-size = <2328>;
- 				rx-fifo-size = <1000>;
- 				tx-fifo-size = <800>;
- 				phy-mode = "rgmii";
---- /dev/null
-+++ b/arch/powerpc/boot/dts/ksi8560.dts
-@@ -0,0 +1,267 @@
-+/*
-+ * Device Tree Source for Emerson KSI8560
-+ *
-+ * Author: Alexandr Smirnov <asmirnov@ru.mvista.com>
-+ *
-+ * Based on mpc8560ads.dts
-+ *
-+ * 2008 (c) MontaVista, Software, Inc.  This file is licensed under
-+ * the terms of the GNU General Public License version 2.  This program
-+ * is licensed "as is" without any warranty of any kind, whether express
-+ * or implied.
-+ *
-+ */
-+
-+/dts-v1/;
-+
-+/ {
-+	model = "KSI8560";
-+	compatible = "emerson,KSI8560";
-+	#address-cells = <1>;
-+	#size-cells = <1>;
-+
-+	aliases {
-+		ethernet0 = &enet0;
-+		ethernet1 = &enet1;
-+		ethernet2 = &enet2;
-+	};
-+
-+	cpus {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		PowerPC,8560@0 {
-+			device_type = "cpu";
-+			reg = <0>;
-+			d-cache-line-size = <32>;
-+			i-cache-line-size = <32>;
-+			d-cache-size = <0x8000>;		/* L1, 32K */
-+			i-cache-size = <0x8000>;		/* L1, 32K */
-+			timebase-frequency = <0>;		/* From U-boot */
-+			bus-frequency = <0>;			/* From U-boot */
-+			clock-frequency = <0>;			/* From U-boot */
-+		};
-+	};
-+
-+	memory {
-+		device_type = "memory";
-+		reg = <0x00000000 0x10000000>;			/* Fixed by bootwrapper */
-+	};
-+
-+	soc@fdf00000 {
-+		#address-cells = <1>;
-+		#size-cells = <1>;
-+		device_type = "soc";
-+		ranges = <0x00000000 0xfdf00000 0x00100000>;
-+		bus-frequency = <0>;				/* Fixed by bootwrapper */
-+
-+		memory-controller@2000 {
-+			compatible = "fsl,8540-memory-controller";
-+			reg = <0x2000 0x1000>;
-+			interrupt-parent = <&MPIC>;
-+			interrupts = <0x12 0x2>;
-+		};
-+
-+		l2-cache-controller@20000 {
-+			compatible = "fsl,8540-l2-cache-controller";
-+			reg = <0x20000 0x1000>;
-+			cache-line-size = <0x20>;		/* 32 bytes */
-+			cache-size = <0x40000>;			/* L2, 256K */
-+			interrupt-parent = <&MPIC>;
-+			interrupts = <0x10 0x2>;
-+		};
-+
-+		i2c@3000 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			cell-index = <0>;
-+			compatible = "fsl-i2c";
-+			reg = <0x3000 0x100>;
-+			interrupts = <0x2b 0x2>;
-+			interrupt-parent = <&MPIC>;
-+			dfsrr;
-+		};
-+
-+		mdio@24520 {					/* For TSECs */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			compatible = "fsl,gianfar-mdio";
-+			reg = <0x24520 0x20>;
-+
-+			PHY1: ethernet-phy@1 {
-+				interrupt-parent = <&MPIC>;
-+				reg = <0x1>;
-+				device_type = "ethernet-phy";
-+			};
-+
-+			PHY2: ethernet-phy@2 {
-+				interrupt-parent = <&MPIC>;
-+				reg = <0x2>;
-+				device_type = "ethernet-phy";
-+			};
-+		};
-+
-+		enet0: ethernet@24000 {
-+			device_type = "network";
-+			model = "TSEC";
-+			compatible = "gianfar";
-+			reg = <0x24000 0x1000>;
-+			/* Mac address filled in by bootwrapper */
-+			local-mac-address = [ 00 00 00 00 00 00 ];
-+			interrupts = <0x1d 0x2 0x1e 0x2 0x22 0x2>;
-+			interrupt-parent = <&MPIC>;
-+			phy-handle = <&PHY1>;
-+		};
-+
-+		enet1: ethernet@25000 {
-+			device_type = "network";
-+			model = "TSEC";
-+			compatible = "gianfar";
-+			reg = <0x25000 0x1000>;
-+			/* Mac address filled in by bootwrapper */
-+			local-mac-address = [ 00 00 00 00 00 00 ];
-+			interrupts = <0x23 0x2 0x24 0x2 0x28 0x2>;
-+			interrupt-parent = <&MPIC>;
-+			phy-handle = <&PHY2>;
-+		};
-+
-+		MPIC: pic@40000 {
-+			#address-cells = <0>;
-+			#interrupt-cells = <2>;
-+			interrupt-controller;
-+			reg = <0x40000 0x40000>;
-+			device_type = "open-pic";
-+		};
-+
-+		cpm@919c0 {
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+			compatible = "fsl,mpc8560-cpm", "fsl,cpm2";
-+			reg = <0x919c0 0x30>;
-+			ranges;
-+
-+			muram@80000 {
-+				#address-cells = <1>;
-+				#size-cells = <1>;
-+				ranges = <0x0 0x80000 0x10000>;
-+
-+				data@0 {
-+					compatible = "fsl,cpm-muram-data";
-+					reg = <0x0 0x4000 0x9000 0x2000>;
-+				};
-+			};
-+
-+			brg@919f0 {
-+				compatible = "fsl,mpc8560-brg",
-+					     "fsl,cpm2-brg",
-+					     "fsl,cpm-brg";
-+				reg = <0x919f0 0x10 0x915f0 0x10>;
-+				clock-frequency = <165000000>;	/* 166MHz */
-+			};
-+
-+			CPMPIC: pic@90c00 {
-+				#address-cells = <0>;
-+				#interrupt-cells = <2>;
-+				interrupt-controller;
-+				interrupts = <0x2e 0x2>;
-+				interrupt-parent = <&MPIC>;
-+				reg = <0x90c00 0x80>;
-+				compatible = "fsl,mpc8560-cpm-pic", "fsl,cpm2-pic";
-+			};
-+
-+			serial@91a00 {
-+				device_type = "serial";
-+				compatible = "fsl,mpc8560-scc-uart",
-+					     "fsl,cpm2-scc-uart";
-+				reg = <0x91a00 0x20 0x88000 0x100>;
-+				fsl,cpm-brg = <1>;
-+				fsl,cpm-command = <0x800000>;
-+				current-speed = <0x1c200>;
-+				interrupts = <0x28 0x8>;
-+				interrupt-parent = <&CPMPIC>;
-+			};
-+
-+			serial@91a20 {
-+				device_type = "serial";
-+				compatible = "fsl,mpc8560-scc-uart",
-+					     "fsl,cpm2-scc-uart";
-+				reg = <0x91a20 0x20 0x88100 0x100>;
-+				fsl,cpm-brg = <2>;
-+				fsl,cpm-command = <0x4a00000>;
-+				current-speed = <0x1c200>;
-+				interrupts = <0x29 0x8>;
-+				interrupt-parent = <&CPMPIC>;
-+			};
-+
-+			mdio@90d00 {				/* For FCCs */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				compatible = "fsl,cpm2-mdio-bitbang";
-+				reg = <0x90d00 0x14>;
-+				fsl,mdio-pin = <24>;
-+				fsl,mdc-pin = <25>;
-+
-+				PHY0: ethernet-phy@0 {
-+					interrupt-parent = <&MPIC>;
-+					reg = <0x0>;
-+					device_type = "ethernet-phy";
-+				};
-+			};
-+
-+			enet2: ethernet@91300 {
-+				device_type = "network";
-+				compatible = "fsl,mpc8560-fcc-enet",
-+					     "fsl,cpm2-fcc-enet";
-+				reg = <0x91300 0x20 0x88400 0x100 0x91390 0x1>;
-+				/* Mac address filled in by bootwrapper */
-+				local-mac-address = [ 00 00 00 00 00 00 ];
-+				fsl,cpm-command = <0x12000300>;
-+				interrupts = <0x20 0x8>;
-+				interrupt-parent = <&CPMPIC>;
-+				phy-handle = <&PHY0>;
-+			};
-+		};
-+	};
-+
-+	localbus@fdf05000 {
-+		#address-cells = <2>;
-+		#size-cells = <1>;
-+		compatible = "fsl,mpc8560-localbus";
-+		reg = <0xfdf05000 0x68>;
-+
-+		ranges = <0x0 0x0 0xe0000000 0x00800000
-+			  0x4 0x0 0xe8080000 0x00080000>;
-+
-+		flash@0,0 {
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+			compatible = "jedec-flash";
-+			reg = <0x0 0x0 0x800000>;
-+			bank-width = <0x2>;
-+
-+			partition@0 {
-+				label = "Primary Kernel";
-+				reg = <0x0 0x180000>;
-+			};
-+			partition@180000 {
-+				label = "Primary Filesystem";
-+				reg = <0x180000 0x580000>;
-+			};
-+			partition@700000 {
-+				label = "Monitor";
-+				reg = <0x300000 0x100000>;
-+				read-only;
-+			};
-+		};
-+
-+		cpld@4,0 {
-+			compatible = "emerson,KSI8560-cpld";
-+			reg = <0x4 0x0 0x80000>;
-+		};
-+	};
-+
-+
-+	chosen {
-+		linux,stdout-path = "/soc/cpm/serial@91a00";
-+	};
-+};
---- a/arch/powerpc/boot/dts/kuroboxHD.dts
-+++ b/arch/powerpc/boot/dts/kuroboxHD.dts
-@@ -7,6 +7,7 @@
-  * Based on sandpoint.dts
-  *
-  * 2006 (c) G. Liakhovetski <g.liakhovetski@gmx.de>
-+ * Copyright 2008 Freescale Semiconductor, Inc.
-  *
-  * This file is licensed under
-  * the terms of the GNU General Public License version 2.  This program
-@@ -17,6 +18,8 @@ XXXX add flash parts, rtc, ??
- 
-  */
- 
-+/dts-v1/;
-+
- / {
- 	model = "KuroboxHD";
- 	compatible = "linkstation";
-@@ -35,19 +38,19 @@ XXXX add flash parts, rtc, ??
- 
- 		PowerPC,603e { /* Really 8241 */
- 			device_type = "cpu";
--			reg = <0>;
--			clock-frequency = <bebc200>;	/* Fixed by bootloader */
--			timebase-frequency = <1743000>; /* Fixed by bootloader */
-+			reg = <0x0>;
-+			clock-frequency = <200000000>;	/* Fixed by bootloader */
-+			timebase-frequency = <24391680>; /* Fixed by bootloader */
- 			bus-frequency = <0>;		/* Fixed by bootloader */
- 			/* Following required by dtc but not used */
--			i-cache-size = <4000>;
--			d-cache-size = <4000>;
-+			i-cache-size = <0x4000>;
-+			d-cache-size = <0x4000>;
- 		};
- 	};
- 
- 	memory {
- 		device_type = "memory";
--		reg = <00000000 04000000>;
-+		reg = <0x0 0x4000000>;
- 	};
- 
- 	soc10x { /* AFAICT need to make soc for 8245's uarts to be defined */
-@@ -56,26 +59,26 @@ XXXX add flash parts, rtc, ??
- 		device_type = "soc";
- 		compatible = "mpc10x";
- 		store-gathering = <0>; /* 0 == off, !0 == on */
--		reg = <80000000 00100000>;
--		ranges = <80000000 80000000 70000000	/* pci mem space */
--			  fc000000 fc000000 00100000	/* EUMB */
--			  fe000000 fe000000 00c00000	/* pci i/o space */
--			  fec00000 fec00000 00300000	/* pci cfg regs */
--			  fef00000 fef00000 00100000>;	/* pci iack */
-+		reg = <0x80000000 0x100000>;
-+		ranges = <0x80000000 0x80000000 0x70000000	/* pci mem space */
-+			  0xfc000000 0xfc000000 0x100000	/* EUMB */
-+			  0xfe000000 0xfe000000 0xc00000	/* pci i/o space */
-+			  0xfec00000 0xfec00000 0x300000	/* pci cfg regs */
-+			  0xfef00000 0xfef00000 0x100000>;	/* pci iack */
- 
- 		i2c@80003000 {
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 			cell-index = <0>;
- 			compatible = "fsl-i2c";
--			reg = <80003000 1000>;
-+			reg = <0x80003000 0x1000>;
- 			interrupts = <5 2>;
- 			interrupt-parent = <&mpic>;
- 
- 			rtc@32 {
- 				device_type = "rtc";
- 				compatible = "ricoh,rs5c372a";
--				reg = <32>;
-+				reg = <0x32>;
- 			};
- 		};
- 
-@@ -83,9 +86,9 @@ XXXX add flash parts, rtc, ??
- 			cell-index = <0>;
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <80004500 8>;
--			clock-frequency = <5d08d88>;
--			current-speed = <2580>;
-+			reg = <0x80004500 0x8>;
-+			clock-frequency = <97553800>;
-+			current-speed = <9600>;
- 			interrupts = <9 0>;
- 			interrupt-parent = <&mpic>;
- 		};
-@@ -94,10 +97,10 @@ XXXX add flash parts, rtc, ??
- 			cell-index = <1>;
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <80004600 8>;
--			clock-frequency = <5d08d88>;
--			current-speed = <e100>;
--			interrupts = <a 0>;
-+			reg = <0x80004600 0x8>;
-+			clock-frequency = <97553800>;
-+			current-speed = <57600>;
-+			interrupts = <10 0>;
- 			interrupt-parent = <&mpic>;
- 		};
- 
-@@ -107,7 +110,7 @@ XXXX add flash parts, rtc, ??
- 			device_type = "open-pic";
- 			compatible = "chrp,open-pic";
- 			interrupt-controller;
--			reg = <80040000 40000>;
-+			reg = <0x80040000 0x40000>;
- 		};
- 
- 		pci0: pci@fec00000 {
-@@ -116,29 +119,29 @@ XXXX add flash parts, rtc, ??
- 			#interrupt-cells = <1>;
- 			device_type = "pci";
- 			compatible = "mpc10x-pci";
--			reg = <fec00000 400000>;
--			ranges = <01000000 0        0 fe000000 0 00c00000
--				  02000000 0 80000000 80000000 0 70000000>;
--			bus-range = <0 ff>;
--			clock-frequency = <7f28155>;
-+			reg = <0xfec00000 0x400000>;
-+			ranges = <0x1000000 0x0        0x0 0xfe000000 0x0 0xc00000
-+				  0x2000000 0x0 0x80000000 0x80000000 0x0 0x70000000>;
-+			bus-range = <0 255>;
-+			clock-frequency = <133333333>;
- 			interrupt-parent = <&mpic>;
--			interrupt-map-mask = <f800 0 0 7>;
-+			interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 			interrupt-map = <
- 				/* IDSEL 11 - IRQ0 ETH */
--				5800 0 0 1 &mpic 0 1
--				5800 0 0 2 &mpic 1 1
--				5800 0 0 3 &mpic 2 1
--				5800 0 0 4 &mpic 3 1
-+				0x5800 0x0 0x0 0x1 &mpic 0x0 0x1
-+				0x5800 0x0 0x0 0x2 &mpic 0x1 0x1
-+				0x5800 0x0 0x0 0x3 &mpic 0x2 0x1
-+				0x5800 0x0 0x0 0x4 &mpic 0x3 0x1
- 				/* IDSEL 12 - IRQ1 IDE0 */
--				6000 0 0 1 &mpic 1 1
--				6000 0 0 2 &mpic 2 1
--				6000 0 0 3 &mpic 3 1
--				6000 0 0 4 &mpic 0 1
-+				0x6000 0x0 0x0 0x1 &mpic 0x1 0x1
-+				0x6000 0x0 0x0 0x2 &mpic 0x2 0x1
-+				0x6000 0x0 0x0 0x3 &mpic 0x3 0x1
-+				0x6000 0x0 0x0 0x4 &mpic 0x0 0x1
- 				/* IDSEL 14 - IRQ3 USB2.0 */
--				7000 0 0 1 &mpic 3 1
--				7000 0 0 2 &mpic 3 1
--				7000 0 0 3 &mpic 3 1
--				7000 0 0 4 &mpic 3 1
-+				0x7000 0x0 0x0 0x1 &mpic 0x3 0x1
-+				0x7000 0x0 0x0 0x2 &mpic 0x3 0x1
-+				0x7000 0x0 0x0 0x3 &mpic 0x3 0x1
-+				0x7000 0x0 0x0 0x4 &mpic 0x3 0x1
- 			>;
- 		};
- 	};
---- a/arch/powerpc/boot/dts/kuroboxHG.dts
-+++ b/arch/powerpc/boot/dts/kuroboxHG.dts
-@@ -7,6 +7,7 @@
-  * Based on sandpoint.dts
-  *
-  * 2006 (c) G. Liakhovetski <g.liakhovetski@gmx.de>
-+ * Copyright 2008 Freescale Semiconductor, Inc.
-  *
-  * This file is licensed under
-  * the terms of the GNU General Public License version 2.  This program
-@@ -17,6 +18,8 @@ XXXX add flash parts, rtc, ??
- 
-  */
- 
-+/dts-v1/;
-+
- / {
- 	model = "KuroboxHG";
- 	compatible = "linkstation";
-@@ -35,19 +38,19 @@ XXXX add flash parts, rtc, ??
- 
- 		PowerPC,603e { /* Really 8241 */
- 			device_type = "cpu";
--			reg = <0>;
--			clock-frequency = <fdad680>;	/* Fixed by bootloader */
--			timebase-frequency = <1F04000>; /* Fixed by bootloader */
-+			reg = <0x0>;
-+			clock-frequency = <266000000>;	/* Fixed by bootloader */
-+			timebase-frequency = <32522240>; /* Fixed by bootloader */
- 			bus-frequency = <0>;		/* Fixed by bootloader */
- 			/* Following required by dtc but not used */
--			i-cache-size = <4000>;
--			d-cache-size = <4000>;
-+			i-cache-size = <0x4000>;
-+			d-cache-size = <0x4000>;
- 		};
- 	};
- 
- 	memory {
- 		device_type = "memory";
--		reg = <00000000 08000000>;
-+		reg = <0x0 0x8000000>;
- 	};
- 
- 	soc10x { /* AFAICT need to make soc for 8245's uarts to be defined */
-@@ -56,26 +59,26 @@ XXXX add flash parts, rtc, ??
- 		device_type = "soc";
- 		compatible = "mpc10x";
- 		store-gathering = <0>; /* 0 == off, !0 == on */
--		reg = <80000000 00100000>;
--		ranges = <80000000 80000000 70000000	/* pci mem space */
--			  fc000000 fc000000 00100000	/* EUMB */
--			  fe000000 fe000000 00c00000	/* pci i/o space */
--			  fec00000 fec00000 00300000	/* pci cfg regs */
--			  fef00000 fef00000 00100000>;	/* pci iack */
-+		reg = <0x80000000 0x100000>;
-+		ranges = <0x80000000 0x80000000 0x70000000	/* pci mem space */
-+			  0xfc000000 0xfc000000 0x100000	/* EUMB */
-+			  0xfe000000 0xfe000000 0xc00000	/* pci i/o space */
-+			  0xfec00000 0xfec00000 0x300000	/* pci cfg regs */
-+			  0xfef00000 0xfef00000 0x100000>;	/* pci iack */
- 
- 		i2c@80003000 {
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 			cell-index = <0>;
- 			compatible = "fsl-i2c";
--			reg = <80003000 1000>;
-+			reg = <0x80003000 0x1000>;
- 			interrupts = <5 2>;
- 			interrupt-parent = <&mpic>;
- 
- 			rtc@32 {
- 				device_type = "rtc";
- 				compatible = "ricoh,rs5c372a";
--				reg = <32>;
-+				reg = <0x32>;
- 			};
- 		};
- 
-@@ -83,9 +86,9 @@ XXXX add flash parts, rtc, ??
- 			cell-index = <0>;
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <80004500 8>;
--			clock-frequency = <7c044a8>;
--			current-speed = <2580>;
-+			reg = <0x80004500 0x8>;
-+			clock-frequency = <130041000>;
-+			current-speed = <9600>;
- 			interrupts = <9 0>;
- 			interrupt-parent = <&mpic>;
- 		};
-@@ -94,10 +97,10 @@ XXXX add flash parts, rtc, ??
- 			cell-index = <1>;
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <80004600 8>;
--			clock-frequency = <7c044a8>;
--			current-speed = <e100>;
--			interrupts = <a 0>;
-+			reg = <0x80004600 0x8>;
-+			clock-frequency = <130041000>;
-+			current-speed = <57600>;
-+			interrupts = <10 0>;
- 			interrupt-parent = <&mpic>;
- 		};
- 
-@@ -107,7 +110,7 @@ XXXX add flash parts, rtc, ??
- 			device_type = "open-pic";
- 			compatible = "chrp,open-pic";
- 			interrupt-controller;
--			reg = <80040000 40000>;
-+			reg = <0x80040000 0x40000>;
- 		};
- 
- 		pci0: pci@fec00000 {
-@@ -116,29 +119,29 @@ XXXX add flash parts, rtc, ??
- 			#interrupt-cells = <1>;
- 			device_type = "pci";
- 			compatible = "mpc10x-pci";
--			reg = <fec00000 400000>;
--			ranges = <01000000 0        0 fe000000 0 00c00000
--				  02000000 0 80000000 80000000 0 70000000>;
--			bus-range = <0 ff>;
--			clock-frequency = <7f28155>;
-+			reg = <0xfec00000 0x400000>;
-+			ranges = <0x1000000 0x0        0x0 0xfe000000 0x0 0xc00000
-+				  0x2000000 0x0 0x80000000 0x80000000 0x0 0x70000000>;
-+			bus-range = <0 255>;
-+			clock-frequency = <133333333>;
- 			interrupt-parent = <&mpic>;
--			interrupt-map-mask = <f800 0 0 7>;
-+			interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 			interrupt-map = <
- 				/* IDSEL 11 - IRQ0 ETH */
--				5800 0 0 1 &mpic 0 1
--				5800 0 0 2 &mpic 1 1
--				5800 0 0 3 &mpic 2 1
--				5800 0 0 4 &mpic 3 1
-+				0x5800 0x0 0x0 0x1 &mpic 0x0 0x1
-+				0x5800 0x0 0x0 0x2 &mpic 0x1 0x1
-+				0x5800 0x0 0x0 0x3 &mpic 0x2 0x1
-+				0x5800 0x0 0x0 0x4 &mpic 0x3 0x1
- 				/* IDSEL 12 - IRQ1 IDE0 */
--				6000 0 0 1 &mpic 1 1
--				6000 0 0 2 &mpic 2 1
--				6000 0 0 3 &mpic 3 1
--				6000 0 0 4 &mpic 0 1
-+				0x6000 0x0 0x0 0x1 &mpic 0x1 0x1
-+				0x6000 0x0 0x0 0x2 &mpic 0x2 0x1
-+				0x6000 0x0 0x0 0x3 &mpic 0x3 0x1
-+				0x6000 0x0 0x0 0x4 &mpic 0x0 0x1
- 				/* IDSEL 14 - IRQ3 USB2.0 */
--				7000 0 0 1 &mpic 3 1
--				7000 0 0 2 &mpic 3 1
--				7000 0 0 3 &mpic 3 1
--				7000 0 0 4 &mpic 3 1
-+				0x7000 0x0 0x0 0x1 &mpic 0x3 0x1
-+				0x7000 0x0 0x0 0x2 &mpic 0x3 0x1
-+				0x7000 0x0 0x0 0x3 &mpic 0x3 0x1
-+				0x7000 0x0 0x0 0x4 &mpic 0x3 0x1
- 			>;
- 		};
- 	};
---- a/arch/powerpc/boot/dts/makalu.dts
-+++ b/arch/powerpc/boot/dts/makalu.dts
-@@ -219,7 +219,7 @@
- 				mal-tx-channel = <0>;
- 				mal-rx-channel = <0>;
- 				cell-index = <0>;
--				max-frame-size = <5dc>;
-+				max-frame-size = <2328>;
- 				rx-fifo-size = <1000>;
- 				tx-fifo-size = <800>;
- 				phy-mode = "rgmii";
-@@ -247,7 +247,7 @@
- 				mal-tx-channel = <1>;
- 				mal-rx-channel = <1>;
- 				cell-index = <1>;
--				max-frame-size = <5dc>;
-+				max-frame-size = <2328>;
- 				rx-fifo-size = <1000>;
- 				tx-fifo-size = <800>;
- 				phy-mode = "rgmii";
---- a/arch/powerpc/boot/dts/mpc7448hpc2.dts
-+++ b/arch/powerpc/boot/dts/mpc7448hpc2.dts
-@@ -1,7 +1,7 @@
- /*
-  * MPC7448HPC2 (Taiga) board Device Tree Source
-  *
-- * Copyright 2006 Freescale Semiconductor Inc.
-+ * Copyright 2006, 2008 Freescale Semiconductor Inc.
-  * 2006 Roy Zang <Roy Zang at freescale.com>.
-  *
-  * This program is free software; you can redistribute  it and/or modify it
-@@ -10,6 +10,7 @@
-  * option) any later version.
-  */
- 
-+/dts-v1/;
- 
- / {
- 	model = "mpc7448hpc2";
-@@ -23,11 +24,11 @@
- 				
- 		PowerPC,7448@0 {
- 			device_type = "cpu";
--			reg = <0>;
--			d-cache-line-size = <20>;	// 32 bytes
--			i-cache-line-size = <20>;	// 32 bytes
--			d-cache-size = <8000>;		// L1, 32K bytes
--			i-cache-size = <8000>;		// L1, 32K bytes
-+			reg = <0x0>;
-+			d-cache-line-size = <32>;	// 32 bytes
-+			i-cache-line-size = <32>;	// 32 bytes
-+			d-cache-size = <0x8000>;		// L1, 32K bytes
-+			i-cache-size = <0x8000>;		// L1, 32K bytes
- 			timebase-frequency = <0>;	// 33 MHz, from uboot
- 			clock-frequency = <0>;		// From U-Boot
- 			bus-frequency = <0>;		// From U-Boot
-@@ -36,7 +37,7 @@
- 
- 	memory {
- 		device_type = "memory";
--		reg = <00000000 20000000	// DDR2   512M at 0
-+		reg = <0x0 0x20000000	// DDR2   512M at 0
- 		       >;
- 	};
- 
-@@ -44,14 +45,14 @@
- 		#address-cells = <1>;
- 		#size-cells = <1>;
- 		device_type = "tsi-bridge";
--		ranges = <00000000 c0000000 00010000>;
--		reg = <c0000000 00010000>;
-+		ranges = <0x0 0xc0000000 0x10000>;
-+		reg = <0xc0000000 0x10000>;
- 		bus-frequency = <0>;
- 
- 		i2c@7000 {
- 			interrupt-parent = <&mpic>;
--			interrupts = <E 0>;
--			reg = <7000 400>;
-+			interrupts = <14 0>;
-+			reg = <0x7000 0x400>;
- 			device_type = "i2c";
- 			compatible  = "tsi108-i2c";
- 		};
-@@ -59,20 +60,20 @@
- 		MDIO: mdio@6000 {
- 			device_type = "mdio";
- 			compatible = "tsi108-mdio";
--			reg = <6000 50>;
-+			reg = <0x6000 0x50>;
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 
- 			phy8: ethernet-phy@8 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <2 1>;
--				reg = <8>;
-+				reg = <0x8>;
- 			};
- 
- 			phy9: ethernet-phy@9 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <2 1>;
--				reg = <9>;
-+				reg = <0x9>;
- 			};
- 
- 		};
-@@ -82,9 +83,9 @@
- 			#size-cells = <0>;
- 			device_type = "network";
- 			compatible = "tsi108-ethernet";
--			reg = <6000 200>;
-+			reg = <0x6000 0x200>;
- 			address = [ 00 06 D2 00 00 01 ];
--			interrupts = <10 2>;
-+			interrupts = <16 2>;
- 			interrupt-parent = <&mpic>;
- 			mdio-handle = <&MDIO>;
- 			phy-handle = <&phy8>;
-@@ -96,9 +97,9 @@
- 			#size-cells = <0>;
- 			device_type = "network";
- 			compatible = "tsi108-ethernet";
--			reg = <6400 200>;
-+			reg = <0x6400 0x200>;
- 			address = [ 00 06 D2 00 00 02 ];
--			interrupts = <11 2>;
-+			interrupts = <17 2>;
- 			interrupt-parent = <&mpic>;
- 			mdio-handle = <&MDIO>;
- 			phy-handle = <&phy9>;
-@@ -107,18 +108,18 @@
- 		serial@7808 {
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <7808 200>;
--			clock-frequency = <3f6b5a00>;
--			interrupts = <c 0>;
-+			reg = <0x7808 0x200>;
-+			clock-frequency = <1064000000>;
-+			interrupts = <12 0>;
- 			interrupt-parent = <&mpic>;
- 		};
- 
- 		serial@7c08 {
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <7c08 200>;
--			clock-frequency = <3f6b5a00>;
--			interrupts = <d 0>;
-+			reg = <0x7c08 0x200>;
-+			clock-frequency = <1064000000>;
-+			interrupts = <13 0>;
- 			interrupt-parent = <&mpic>;
- 		};
- 
-@@ -127,7 +128,7 @@
- 			interrupt-controller;
- 			#address-cells = <0>;
- 			#interrupt-cells = <2>;
--			reg = <7400 400>;
-+			reg = <0x7400 0x400>;
- 			compatible = "chrp,open-pic";
- 			device_type = "open-pic";
-                        	big-endian;
-@@ -138,39 +139,39 @@
- 			#interrupt-cells = <1>;
- 			#size-cells = <2>;
- 			#address-cells = <3>;
--			reg = <1000 1000>;
-+			reg = <0x1000 0x1000>;
- 			bus-range = <0 0>;
--			ranges = <02000000 0 e0000000 e0000000 0 1A000000	
--				  01000000 0 00000000 fa000000 0 00010000>;
--			clock-frequency = <7f28154>;
-+			ranges = <0x2000000 0x0 0xe0000000 0xe0000000 0x0 0x1a000000	
-+				  0x1000000 0x0 0x0 0xfa000000 0x0 0x10000>;
-+			clock-frequency = <133333332>;
- 			interrupt-parent = <&mpic>;
--			interrupts = <17 2>;
--			interrupt-map-mask = <f800 0 0 7>;
-+			interrupts = <23 2>;
-+			interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 			interrupt-map = <
- 
- 				/* IDSEL 0x11 */
--				0800 0 0 1 &RT0 24 0
--				0800 0 0 2 &RT0 25 0
--				0800 0 0 3 &RT0 26 0
--				0800 0 0 4 &RT0 27 0
-+				0x800 0x0 0x0 0x1 &RT0 0x24 0x0
-+				0x800 0x0 0x0 0x2 &RT0 0x25 0x0
-+				0x800 0x0 0x0 0x3 &RT0 0x26 0x0
-+				0x800 0x0 0x0 0x4 &RT0 0x27 0x0
- 
- 				/* IDSEL 0x12 */
--				1000 0 0 1 &RT0 25 0
--				1000 0 0 2 &RT0 26 0
--				1000 0 0 3 &RT0 27 0
--				1000 0 0 4 &RT0 24 0
-+				0x1000 0x0 0x0 0x1 &RT0 0x25 0x0
-+				0x1000 0x0 0x0 0x2 &RT0 0x26 0x0
-+				0x1000 0x0 0x0 0x3 &RT0 0x27 0x0
-+				0x1000 0x0 0x0 0x4 &RT0 0x24 0x0
- 
- 				/* IDSEL 0x13 */
--				1800 0 0 1 &RT0 26 0
--				1800 0 0 2 &RT0 27 0
--				1800 0 0 3 &RT0 24 0
--				1800 0 0 4 &RT0 25 0
-+				0x1800 0x0 0x0 0x1 &RT0 0x26 0x0
-+				0x1800 0x0 0x0 0x2 &RT0 0x27 0x0
-+				0x1800 0x0 0x0 0x3 &RT0 0x24 0x0
-+				0x1800 0x0 0x0 0x4 &RT0 0x25 0x0
- 
- 				/* IDSEL 0x14 */
--				2000 0 0 1 &RT0 27 0
--				2000 0 0 2 &RT0 24 0
--				2000 0 0 3 &RT0 25 0
--				2000 0 0 4 &RT0 26 0
-+				0x2000 0x0 0x0 0x1 &RT0 0x27 0x0
-+				0x2000 0x0 0x0 0x2 &RT0 0x24 0x0
-+				0x2000 0x0 0x0 0x3 &RT0 0x25 0x0
-+				0x2000 0x0 0x0 0x4 &RT0 0x26 0x0
- 				>;
- 
- 			RT0: router@1180 {
-@@ -180,7 +181,7 @@
- 				#address-cells = <0>;
- 				#interrupt-cells = <2>;
- 				big-endian;
--				interrupts = <17 2>;
-+				interrupts = <23 2>;
- 				interrupt-parent = <&mpic>;
- 			};
- 		};
---- a/arch/powerpc/boot/dts/mpc8272ads.dts
-+++ b/arch/powerpc/boot/dts/mpc8272ads.dts
-@@ -1,7 +1,7 @@
- /*
-  * MPC8272 ADS Device Tree Source
-  *
-- * Copyright 2005 Freescale Semiconductor Inc.
-+ * Copyright 2005,2008 Freescale Semiconductor Inc.
-  *
-  * 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
-@@ -9,6 +9,8 @@
-  * option) any later version.
-  */
- 
-+/dts-v1/;
-+
- / {
- 	model = "MPC8272ADS";
- 	compatible = "fsl,mpc8272ads";
-@@ -21,11 +23,11 @@
- 
- 		PowerPC,8272@0 {
- 			device_type = "cpu";
--			reg = <0>;
--			d-cache-line-size = <d#32>;
--			i-cache-line-size = <d#32>;
--			d-cache-size = <d#16384>;
--			i-cache-size = <d#16384>;
-+			reg = <0x0>;
-+			d-cache-line-size = <32>;
-+			i-cache-line-size = <32>;
-+			d-cache-size = <16384>;
-+			i-cache-size = <16384>;
- 			timebase-frequency = <0>;
- 			bus-frequency = <0>;
- 			clock-frequency = <0>;
-@@ -34,7 +36,7 @@
- 
- 	memory {
- 		device_type = "memory";
--		reg = <0 0>;
-+		reg = <0x0 0x0>;
- 	};
- 
- 	localbus@f0010100 {
-@@ -42,21 +44,21 @@
- 		             "fsl,pq2-localbus";
- 		#address-cells = <2>;
- 		#size-cells = <1>;
--		reg = <f0010100 40>;
-+		reg = <0xf0010100 0x40>;
- 
--		ranges = <0 0 fe000000 02000000
--		          1 0 f4500000 00008000
--		          3 0 f8200000 00008000>;
-+		ranges = <0x0 0x0 0xfe000000 0x2000000
-+		          0x1 0x0 0xf4500000 0x8000
-+		          0x3 0x0 0xf8200000 0x8000>;
- 
- 		flash@0,0 {
- 			compatible = "jedec-flash";
--			reg = <0 0 2000000>;
-+			reg = <0x0 0x0 0x2000000>;
- 			bank-width = <4>;
- 			device-width = <1>;
- 		};
- 
- 		board-control@1,0 {
--			reg = <1 0 20>;
-+			reg = <0x1 0x0 0x20>;
- 			compatible = "fsl,mpc8272ads-bcsr";
- 		};
- 
-@@ -65,46 +67,46 @@
- 			             "fsl,pq2ads-pci-pic";
- 			#interrupt-cells = <1>;
- 			interrupt-controller;
--			reg = <3 0 8>;
-+			reg = <0x3 0x0 0x8>;
- 			interrupt-parent = <&PIC>;
--			interrupts = <14 8>;
-+			interrupts = <20 8>;
- 		};
- 	};
- 
- 
- 	pci@f0010800 {
- 		device_type = "pci";
--		reg = <f0010800 10c f00101ac 8 f00101c4 8>;
-+		reg = <0xf0010800 0x10c 0xf00101ac 0x8 0xf00101c4 0x8>;
- 		compatible = "fsl,mpc8272-pci", "fsl,pq2-pci";
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		clock-frequency = <d#66666666>;
--		interrupt-map-mask = <f800 0 0 7>;
-+		clock-frequency = <66666666>;
-+		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 		interrupt-map = <
- 		                 /* IDSEL 0x16 */
--		                 b000 0 0 1 &PCI_PIC 0
--		                 b000 0 0 2 &PCI_PIC 1
--		                 b000 0 0 3 &PCI_PIC 2
--		                 b000 0 0 4 &PCI_PIC 3
-+		                 0xb000 0x0 0x0 0x1 &PCI_PIC 0
-+		                 0xb000 0x0 0x0 0x2 &PCI_PIC 1
-+		                 0xb000 0x0 0x0 0x3 &PCI_PIC 2
-+		                 0xb000 0x0 0x0 0x4 &PCI_PIC 3
- 
- 		                 /* IDSEL 0x17 */
--		                 b800 0 0 1 &PCI_PIC 4
--		                 b800 0 0 2 &PCI_PIC 5
--		                 b800 0 0 3 &PCI_PIC 6
--		                 b800 0 0 4 &PCI_PIC 7
-+		                 0xb800 0x0 0x0 0x1 &PCI_PIC 4
-+		                 0xb800 0x0 0x0 0x2 &PCI_PIC 5
-+		                 0xb800 0x0 0x0 0x3 &PCI_PIC 6
-+		                 0xb800 0x0 0x0 0x4 &PCI_PIC 7
- 
- 		                 /* IDSEL 0x18 */
--		                 c000 0 0 1 &PCI_PIC 8
--		                 c000 0 0 2 &PCI_PIC 9
--		                 c000 0 0 3 &PCI_PIC a
--		                 c000 0 0 4 &PCI_PIC b>;
-+		                 0xc000 0x0 0x0 0x1 &PCI_PIC 8
-+		                 0xc000 0x0 0x0 0x2 &PCI_PIC 9
-+		                 0xc000 0x0 0x0 0x3 &PCI_PIC 10
-+		                 0xc000 0x0 0x0 0x4 &PCI_PIC 11>;
- 
- 		interrupt-parent = <&PIC>;
--		interrupts = <12 8>;
--		ranges = <42000000 0 80000000 80000000 0 20000000
--		          02000000 0 a0000000 a0000000 0 20000000
--		          01000000 0 00000000 f6000000 0 02000000>;
-+		interrupts = <18 8>;
-+		ranges = <0x42000000 0x0 0x80000000 0x80000000 0x0 0x20000000
-+		          0x2000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000
-+		          0x1000000 0x0 0x0 0xf6000000 0x0 0x2000000>;
- 	};
- 
- 	soc@f0000000 {
-@@ -112,26 +114,26 @@
- 		#size-cells = <1>;
- 		device_type = "soc";
- 		compatible = "fsl,mpc8272", "fsl,pq2-soc";
--		ranges = <00000000 f0000000 00053000>;
-+		ranges = <0x0 0xf0000000 0x53000>;
- 
- 		// Temporary -- will go away once kernel uses ranges for get_immrbase().
--		reg = <f0000000 00053000>;
-+		reg = <0xf0000000 0x53000>;
- 
- 		cpm@119c0 {
- 			#address-cells = <1>;
- 			#size-cells = <1>;
- 			compatible = "fsl,mpc8272-cpm", "fsl,cpm2";
--			reg = <119c0 30>;
-+			reg = <0x119c0 0x30>;
- 			ranges;
- 
- 			muram@0 {
- 				#address-cells = <1>;
- 				#size-cells = <1>;
--				ranges = <0 0 10000>;
-+				ranges = <0x0 0x0 0x10000>;
- 
- 				data@0 {
- 					compatible = "fsl,cpm-muram-data";
--					reg = <0 2000 9800 800>;
-+					reg = <0x0 0x2000 0x9800 0x800>;
- 				};
- 			};
- 
-@@ -139,29 +141,29 @@
- 				compatible = "fsl,mpc8272-brg",
- 				             "fsl,cpm2-brg",
- 				             "fsl,cpm-brg";
--				reg = <119f0 10 115f0 10>;
-+				reg = <0x119f0 0x10 0x115f0 0x10>;
- 			};
- 
- 			serial@11a00 {
- 				device_type = "serial";
- 				compatible = "fsl,mpc8272-scc-uart",
- 				             "fsl,cpm2-scc-uart";
--				reg = <11a00 20 8000 100>;
--				interrupts = <28 8>;
-+				reg = <0x11a00 0x20 0x8000 0x100>;
-+				interrupts = <40 8>;
- 				interrupt-parent = <&PIC>;
- 				fsl,cpm-brg = <1>;
--				fsl,cpm-command = <00800000>;
-+				fsl,cpm-command = <0x800000>;
- 			};
- 
- 			serial@11a60 {
- 				device_type = "serial";
- 				compatible = "fsl,mpc8272-scc-uart",
- 				             "fsl,cpm2-scc-uart";
--				reg = <11a60 20 8300 100>;
--				interrupts = <2b 8>;
-+				reg = <0x11a60 0x20 0x8300 0x100>;
-+				interrupts = <43 8>;
- 				interrupt-parent = <&PIC>;
- 				fsl,cpm-brg = <4>;
--				fsl,cpm-command = <0ce00000>;
-+				fsl,cpm-command = <0xce00000>;
- 			};
- 
- 			mdio@10d40 {
-@@ -169,23 +171,23 @@
- 				compatible = "fsl,mpc8272ads-mdio-bitbang",
- 				             "fsl,mpc8272-mdio-bitbang",
- 				             "fsl,cpm2-mdio-bitbang";
--				reg = <10d40 14>;
-+				reg = <0x10d40 0x14>;
- 				#address-cells = <1>;
- 				#size-cells = <0>;
--				fsl,mdio-pin = <12>;
--				fsl,mdc-pin = <13>;
-+				fsl,mdio-pin = <18>;
-+				fsl,mdc-pin = <19>;
- 
- 				PHY0: ethernet-phy@0 {
- 					interrupt-parent = <&PIC>;
--					interrupts = <17 8>;
--					reg = <0>;
-+					interrupts = <23 8>;
-+					reg = <0x0>;
- 					device_type = "ethernet-phy";
- 				};
- 
- 				PHY1: ethernet-phy@1 {
- 					interrupt-parent = <&PIC>;
--					interrupts = <17 8>;
--					reg = <3>;
-+					interrupts = <23 8>;
-+					reg = <0x3>;
- 					device_type = "ethernet-phy";
- 				};
- 			};
-@@ -194,33 +196,33 @@
- 				device_type = "network";
- 				compatible = "fsl,mpc8272-fcc-enet",
- 				             "fsl,cpm2-fcc-enet";
--				reg = <11300 20 8400 100 11390 1>;
-+				reg = <0x11300 0x20 0x8400 0x100 0x11390 0x1>;
- 				local-mac-address = [ 00 00 00 00 00 00 ];
--				interrupts = <20 8>;
-+				interrupts = <32 8>;
- 				interrupt-parent = <&PIC>;
- 				phy-handle = <&PHY0>;
- 				linux,network-index = <0>;
--				fsl,cpm-command = <12000300>;
-+				fsl,cpm-command = <0x12000300>;
- 			};
- 
- 			ethernet@11320 {
- 				device_type = "network";
- 				compatible = "fsl,mpc8272-fcc-enet",
- 				             "fsl,cpm2-fcc-enet";
--				reg = <11320 20 8500 100 113b0 1>;
-+				reg = <0x11320 0x20 0x8500 0x100 0x113b0 0x1>;
- 				local-mac-address = [ 00 00 00 00 00 00 ];
--				interrupts = <21 8>;
-+				interrupts = <33 8>;
- 				interrupt-parent = <&PIC>;
- 				phy-handle = <&PHY1>;
- 				linux,network-index = <1>;
--				fsl,cpm-command = <16200300>;
-+				fsl,cpm-command = <0x16200300>;
- 			};
- 		};
- 
- 		PIC: interrupt-controller@10c00 {
- 			#interrupt-cells = <2>;
- 			interrupt-controller;
--			reg = <10c00 80>;
-+			reg = <0x10c00 0x80>;
- 			compatible = "fsl,mpc8272-pic", "fsl,cpm2-pic";
- 		};
- 
-@@ -232,14 +234,14 @@
- 			             "fsl,talitos-sec2",
- 			             "fsl,talitos",
- 			             "talitos";
--			reg = <30000 10000>;
--			interrupts = <b 8>;
-+			reg = <0x30000 0x10000>;
-+			interrupts = <11 8>;
- 			interrupt-parent = <&PIC>;
- 			num-channels = <4>;
--			channel-fifo-len = <18>;
--			exec-units-mask = <0000007e>;
-+			channel-fifo-len = <24>;
-+			exec-units-mask = <0x7e>;
- /* desc mask is for rev1.x, we need runtime fixup for >=2.x */
--			descriptor-types-mask = <01010ebf>;
-+			descriptor-types-mask = <0x1010ebf>;
- 		};
- 	};
- 
---- a/arch/powerpc/boot/dts/mpc832x_mds.dts
-+++ b/arch/powerpc/boot/dts/mpc832x_mds.dts
-@@ -255,9 +255,7 @@
- 		enet0: ucc@2200 {
- 			device_type = "network";
- 			compatible = "ucc_geth";
--			model = "UCC";
- 			cell-index = <3>;
--			device-id = <3>;
- 			reg = <0x2200 0x200>;
- 			interrupts = <34>;
- 			interrupt-parent = <&qeic>;
-@@ -271,9 +269,7 @@
- 		enet1: ucc@3200 {
- 			device_type = "network";
- 			compatible = "ucc_geth";
--			model = "UCC";
- 			cell-index = <4>;
--			device-id = <4>;
- 			reg = <0x3200 0x200>;
- 			interrupts = <35>;
- 			interrupt-parent = <&qeic>;
-@@ -287,8 +283,7 @@
- 		ucc@2400 {
- 			device_type = "serial";
- 			compatible = "ucc_uart";
--			model = "UCC";
--			device-id = <5>;	/* The UCC number, 1-7*/
-+			cell-index = <5>;	/* The UCC number, 1-7*/
- 			port-number = <0>;	/* Which ttyQEx device */
- 			soft-uart;		/* We need Soft-UART */
- 			reg = <0x2400 0x200>;
---- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
-+++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts
-@@ -208,9 +208,7 @@
- 		enet0: ucc@3000 {
- 			device_type = "network";
- 			compatible = "ucc_geth";
--			model = "UCC";
- 			cell-index = <2>;
--			device-id = <2>;
- 			reg = <0x3000 0x200>;
- 			interrupts = <33>;
- 			interrupt-parent = <&qeic>;
-@@ -224,9 +222,7 @@
- 		enet1: ucc@2200 {
- 			device_type = "network";
- 			compatible = "ucc_geth";
--			model = "UCC";
- 			cell-index = <3>;
--			device-id = <3>;
- 			reg = <0x2200 0x200>;
- 			interrupts = <34>;
- 			interrupt-parent = <&qeic>;
---- a/arch/powerpc/boot/dts/mpc836x_mds.dts
-+++ b/arch/powerpc/boot/dts/mpc836x_mds.dts
-@@ -257,9 +257,7 @@
- 		enet0: ucc@2000 {
- 			device_type = "network";
- 			compatible = "ucc_geth";
--			model = "UCC";
- 			cell-index = <1>;
--			device-id = <1>;
- 			reg = <0x2000 0x200>;
- 			interrupts = <32>;
- 			interrupt-parent = <&qeic>;
-@@ -274,9 +272,7 @@
- 		enet1: ucc@3000 {
- 			device_type = "network";
- 			compatible = "ucc_geth";
--			model = "UCC";
- 			cell-index = <2>;
--			device-id = <2>;
- 			reg = <0x3000 0x200>;
- 			interrupts = <33>;
- 			interrupt-parent = <&qeic>;
---- a/arch/powerpc/boot/dts/mpc8540ads.dts
-+++ b/arch/powerpc/boot/dts/mpc8540ads.dts
-@@ -1,7 +1,7 @@
- /*
-  * MPC8540 ADS Device Tree Source
-  *
-- * Copyright 2006 Freescale Semiconductor Inc.
-+ * Copyright 2006, 2008 Freescale Semiconductor Inc.
-  *
-  * 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
-@@ -9,6 +9,7 @@
-  * option) any later version.
-  */
- 
-+/dts-v1/;
- 
- / {
- 	model = "MPC8540ADS";
-@@ -31,11 +32,11 @@
- 
- 		PowerPC,8540@0 {
- 			device_type = "cpu";
--			reg = <0>;
--			d-cache-line-size = <20>;	// 32 bytes
--			i-cache-line-size = <20>;	// 32 bytes
--			d-cache-size = <8000>;		// L1, 32K
--			i-cache-size = <8000>;		// L1, 32K
-+			reg = <0x0>;
-+			d-cache-line-size = <32>;	// 32 bytes
-+			i-cache-line-size = <32>;	// 32 bytes
-+			d-cache-size = <0x8000>;		// L1, 32K
-+			i-cache-size = <0x8000>;		// L1, 32K
- 			timebase-frequency = <0>;	//  33 MHz, from uboot
- 			bus-frequency = <0>;	// 166 MHz
- 			clock-frequency = <0>;	// 825 MHz, from uboot
-@@ -44,31 +45,31 @@
- 
- 	memory {
- 		device_type = "memory";
--		reg = <00000000 08000000>;	// 128M at 0x0
-+		reg = <0x0 0x8000000>;	// 128M at 0x0
- 	};
- 
- 	soc8540@e0000000 {
- 		#address-cells = <1>;
- 		#size-cells = <1>;
- 		device_type = "soc";
--		ranges = <0 e0000000 00100000>;
--		reg = <e0000000 00100000>;	// CCSRBAR 1M
-+		ranges = <0x0 0xe0000000 0x100000>;
-+		reg = <0xe0000000 0x100000>;	// CCSRBAR 1M
- 		bus-frequency = <0>;
- 
- 		memory-controller@2000 {
- 			compatible = "fsl,8540-memory-controller";
--			reg = <2000 1000>;
-+			reg = <0x2000 0x1000>;
- 			interrupt-parent = <&mpic>;
--			interrupts = <12 2>;
-+			interrupts = <18 2>;
- 		};
- 
- 		l2-cache-controller@20000 {
- 			compatible = "fsl,8540-l2-cache-controller";
--			reg = <20000 1000>;
--			cache-line-size = <20>;	// 32 bytes
--			cache-size = <40000>;	// L2, 256K
-+			reg = <0x20000 0x1000>;
-+			cache-line-size = <32>;	// 32 bytes
-+			cache-size = <0x40000>;	// L2, 256K
- 			interrupt-parent = <&mpic>;
--			interrupts = <10 2>;
-+			interrupts = <16 2>;
- 		};
- 
- 		i2c@3000 {
-@@ -76,8 +77,8 @@
- 			#size-cells = <0>;
- 			cell-index = <0>;
- 			compatible = "fsl-i2c";
--			reg = <3000 100>;
--			interrupts = <2b 2>;
-+			reg = <0x3000 0x100>;
-+			interrupts = <43 2>;
- 			interrupt-parent = <&mpic>;
- 			dfsrr;
- 		};
-@@ -86,24 +87,24 @@
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 			compatible = "fsl,gianfar-mdio";
--			reg = <24520 20>;
-+			reg = <0x24520 0x20>;
- 
- 			phy0: ethernet-phy@0 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <5 1>;
--				reg = <0>;
-+				reg = <0x0>;
- 				device_type = "ethernet-phy";
- 			};
- 			phy1: ethernet-phy@1 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <5 1>;
--				reg = <1>;
-+				reg = <0x1>;
- 				device_type = "ethernet-phy";
- 			};
- 			phy3: ethernet-phy@3 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <7 1>;
--				reg = <3>;
-+				reg = <0x3>;
- 				device_type = "ethernet-phy";
- 			};
- 		};
-@@ -113,9 +114,9 @@
- 			device_type = "network";
- 			model = "TSEC";
- 			compatible = "gianfar";
--			reg = <24000 1000>;
-+			reg = <0x24000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <1d 2 1e 2 22 2>;
-+			interrupts = <29 2 30 2 34 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy0>;
- 		};
-@@ -125,9 +126,9 @@
- 			device_type = "network";
- 			model = "TSEC";
- 			compatible = "gianfar";
--			reg = <25000 1000>;
-+			reg = <0x25000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <23 2 24 2 28 2>;
-+			interrupts = <35 2 36 2 40 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy1>;
- 		};
-@@ -137,9 +138,9 @@
- 			device_type = "network";
- 			model = "FEC";
- 			compatible = "gianfar";
--			reg = <26000 1000>;
-+			reg = <0x26000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <29 2>;
-+			interrupts = <41 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy3>;
- 		};
-@@ -148,9 +149,9 @@
- 			cell-index = <0>;
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <4500 100>; 	// reg base, size
-+			reg = <0x4500 0x100>; 	// reg base, size
- 			clock-frequency = <0>; 	// should we fill in in uboot?
--			interrupts = <2a 2>;
-+			interrupts = <42 2>;
- 			interrupt-parent = <&mpic>;
- 		};
- 
-@@ -158,9 +159,9 @@
- 			cell-index = <1>;
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <4600 100>;	// reg base, size
-+			reg = <0x4600 0x100>;	// reg base, size
- 			clock-frequency = <0>; 	// should we fill in in uboot?
--			interrupts = <2a 2>;
-+			interrupts = <42 2>;
- 			interrupt-parent = <&mpic>;
- 		};
- 		mpic: pic@40000 {
-@@ -168,7 +169,7 @@
- 			interrupt-controller;
- 			#address-cells = <0>;
- 			#interrupt-cells = <2>;
--			reg = <40000 40000>;
-+			reg = <0x40000 0x40000>;
- 			compatible = "chrp,open-pic";
- 			device_type = "open-pic";
- 			big-endian;
-@@ -177,90 +178,90 @@
- 
- 	pci0: pci@e0008000 {
- 		cell-index = <0>;
--		interrupt-map-mask = <f800 0 0 7>;
-+		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 		interrupt-map = <
- 
- 			/* IDSEL 0x02 */
--			1000 0 0 1 &mpic 1 1
--			1000 0 0 2 &mpic 2 1
--			1000 0 0 3 &mpic 3 1
--			1000 0 0 4 &mpic 4 1
-+			0x1000 0x0 0x0 0x1 &mpic 0x1 0x1
-+			0x1000 0x0 0x0 0x2 &mpic 0x2 0x1
-+			0x1000 0x0 0x0 0x3 &mpic 0x3 0x1
-+			0x1000 0x0 0x0 0x4 &mpic 0x4 0x1
- 
- 			/* IDSEL 0x03 */
--			1800 0 0 1 &mpic 4 1
--			1800 0 0 2 &mpic 1 1
--			1800 0 0 3 &mpic 2 1
--			1800 0 0 4 &mpic 3 1
-+			0x1800 0x0 0x0 0x1 &mpic 0x4 0x1
-+			0x1800 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0x1800 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0x1800 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 			/* IDSEL 0x04 */
--			2000 0 0 1 &mpic 3 1
--			2000 0 0 2 &mpic 4 1
--			2000 0 0 3 &mpic 1 1
--			2000 0 0 4 &mpic 2 1
-+			0x2000 0x0 0x0 0x1 &mpic 0x3 0x1
-+			0x2000 0x0 0x0 0x2 &mpic 0x4 0x1
-+			0x2000 0x0 0x0 0x3 &mpic 0x1 0x1
-+			0x2000 0x0 0x0 0x4 &mpic 0x2 0x1
- 
- 			/* IDSEL 0x05 */
--			2800 0 0 1 &mpic 2 1
--			2800 0 0 2 &mpic 3 1
--			2800 0 0 3 &mpic 4 1
--			2800 0 0 4 &mpic 1 1
-+			0x2800 0x0 0x0 0x1 &mpic 0x2 0x1
-+			0x2800 0x0 0x0 0x2 &mpic 0x3 0x1
-+			0x2800 0x0 0x0 0x3 &mpic 0x4 0x1
-+			0x2800 0x0 0x0 0x4 &mpic 0x1 0x1
- 
- 			/* IDSEL 0x0c */
--			6000 0 0 1 &mpic 1 1
--			6000 0 0 2 &mpic 2 1
--			6000 0 0 3 &mpic 3 1
--			6000 0 0 4 &mpic 4 1
-+			0x6000 0x0 0x0 0x1 &mpic 0x1 0x1
-+			0x6000 0x0 0x0 0x2 &mpic 0x2 0x1
-+			0x6000 0x0 0x0 0x3 &mpic 0x3 0x1
-+			0x6000 0x0 0x0 0x4 &mpic 0x4 0x1
- 
- 			/* IDSEL 0x0d */
--			6800 0 0 1 &mpic 4 1
--			6800 0 0 2 &mpic 1 1
--			6800 0 0 3 &mpic 2 1
--			6800 0 0 4 &mpic 3 1
-+			0x6800 0x0 0x0 0x1 &mpic 0x4 0x1
-+			0x6800 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0x6800 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0x6800 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 			/* IDSEL 0x0e */
--			7000 0 0 1 &mpic 3 1
--			7000 0 0 2 &mpic 4 1
--			7000 0 0 3 &mpic 1 1
--			7000 0 0 4 &mpic 2 1
-+			0x7000 0x0 0x0 0x1 &mpic 0x3 0x1
-+			0x7000 0x0 0x0 0x2 &mpic 0x4 0x1
-+			0x7000 0x0 0x0 0x3 &mpic 0x1 0x1
-+			0x7000 0x0 0x0 0x4 &mpic 0x2 0x1
- 
- 			/* IDSEL 0x0f */
--			7800 0 0 1 &mpic 2 1
--			7800 0 0 2 &mpic 3 1
--			7800 0 0 3 &mpic 4 1
--			7800 0 0 4 &mpic 1 1
-+			0x7800 0x0 0x0 0x1 &mpic 0x2 0x1
-+			0x7800 0x0 0x0 0x2 &mpic 0x3 0x1
-+			0x7800 0x0 0x0 0x3 &mpic 0x4 0x1
-+			0x7800 0x0 0x0 0x4 &mpic 0x1 0x1
- 
- 			/* IDSEL 0x12 */
--			9000 0 0 1 &mpic 1 1
--			9000 0 0 2 &mpic 2 1
--			9000 0 0 3 &mpic 3 1
--			9000 0 0 4 &mpic 4 1
-+			0x9000 0x0 0x0 0x1 &mpic 0x1 0x1
-+			0x9000 0x0 0x0 0x2 &mpic 0x2 0x1
-+			0x9000 0x0 0x0 0x3 &mpic 0x3 0x1
-+			0x9000 0x0 0x0 0x4 &mpic 0x4 0x1
- 
- 			/* IDSEL 0x13 */
--			9800 0 0 1 &mpic 4 1
--			9800 0 0 2 &mpic 1 1
--			9800 0 0 3 &mpic 2 1
--			9800 0 0 4 &mpic 3 1
-+			0x9800 0x0 0x0 0x1 &mpic 0x4 0x1
-+			0x9800 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0x9800 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0x9800 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 			/* IDSEL 0x14 */
--			a000 0 0 1 &mpic 3 1
--			a000 0 0 2 &mpic 4 1
--			a000 0 0 3 &mpic 1 1
--			a000 0 0 4 &mpic 2 1
-+			0xa000 0x0 0x0 0x1 &mpic 0x3 0x1
-+			0xa000 0x0 0x0 0x2 &mpic 0x4 0x1
-+			0xa000 0x0 0x0 0x3 &mpic 0x1 0x1
-+			0xa000 0x0 0x0 0x4 &mpic 0x2 0x1
- 
- 			/* IDSEL 0x15 */
--			a800 0 0 1 &mpic 2 1
--			a800 0 0 2 &mpic 3 1
--			a800 0 0 3 &mpic 4 1
--			a800 0 0 4 &mpic 1 1>;
-+			0xa800 0x0 0x0 0x1 &mpic 0x2 0x1
-+			0xa800 0x0 0x0 0x2 &mpic 0x3 0x1
-+			0xa800 0x0 0x0 0x3 &mpic 0x4 0x1
-+			0xa800 0x0 0x0 0x4 &mpic 0x1 0x1>;
- 		interrupt-parent = <&mpic>;
--		interrupts = <18 2>;
-+		interrupts = <24 2>;
- 		bus-range = <0 0>;
--		ranges = <02000000 0 80000000 80000000 0 20000000
--			  01000000 0 00000000 e2000000 0 00100000>;
--		clock-frequency = <3f940aa>;
-+		ranges = <0x2000000 0x0 0x80000000 0x80000000 0x0 0x20000000
-+			  0x1000000 0x0 0x0 0xe2000000 0x0 0x100000>;
-+		clock-frequency = <66666666>;
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		reg = <e0008000 1000>;
-+		reg = <0xe0008000 0x1000>;
- 		compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
- 		device_type = "pci";
- 	};
---- a/arch/powerpc/boot/dts/mpc8541cds.dts
-+++ b/arch/powerpc/boot/dts/mpc8541cds.dts
-@@ -1,7 +1,7 @@
- /*
-  * MPC8541 CDS Device Tree Source
-  *
-- * Copyright 2006 Freescale Semiconductor Inc.
-+ * Copyright 2006, 2008 Freescale Semiconductor Inc.
-  *
-  * 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
-@@ -9,6 +9,7 @@
-  * option) any later version.
-  */
- 
-+/dts-v1/;
- 
- / {
- 	model = "MPC8541CDS";
-@@ -31,11 +32,11 @@
- 
- 		PowerPC,8541@0 {
- 			device_type = "cpu";
--			reg = <0>;
--			d-cache-line-size = <20>;	// 32 bytes
--			i-cache-line-size = <20>;	// 32 bytes
--			d-cache-size = <8000>;		// L1, 32K
--			i-cache-size = <8000>;		// L1, 32K
-+			reg = <0x0>;
-+			d-cache-line-size = <32>;	// 32 bytes
-+			i-cache-line-size = <32>;	// 32 bytes
-+			d-cache-size = <0x8000>;		// L1, 32K
-+			i-cache-size = <0x8000>;		// L1, 32K
- 			timebase-frequency = <0>;	//  33 MHz, from uboot
- 			bus-frequency = <0>;	// 166 MHz
- 			clock-frequency = <0>;	// 825 MHz, from uboot
-@@ -44,31 +45,31 @@
- 
- 	memory {
- 		device_type = "memory";
--		reg = <00000000 08000000>;	// 128M at 0x0
-+		reg = <0x0 0x8000000>;	// 128M at 0x0
- 	};
- 
- 	soc8541@e0000000 {
- 		#address-cells = <1>;
- 		#size-cells = <1>;
- 		device_type = "soc";
--		ranges = <0 e0000000 00100000>;
--		reg = <e0000000 00001000>;	// CCSRBAR 1M
-+		ranges = <0x0 0xe0000000 0x100000>;
-+		reg = <0xe0000000 0x1000>;	// CCSRBAR 1M
- 		bus-frequency = <0>;
- 
- 		memory-controller@2000 {
- 			compatible = "fsl,8541-memory-controller";
--			reg = <2000 1000>;
-+			reg = <0x2000 0x1000>;
- 			interrupt-parent = <&mpic>;
--			interrupts = <12 2>;
-+			interrupts = <18 2>;
- 		};
- 
- 		l2-cache-controller@20000 {
- 			compatible = "fsl,8541-l2-cache-controller";
--			reg = <20000 1000>;
--			cache-line-size = <20>;	// 32 bytes
--			cache-size = <40000>;	// L2, 256K
-+			reg = <0x20000 0x1000>;
-+			cache-line-size = <32>;	// 32 bytes
-+			cache-size = <0x40000>;	// L2, 256K
- 			interrupt-parent = <&mpic>;
--			interrupts = <10 2>;
-+			interrupts = <16 2>;
- 		};
- 
- 		i2c@3000 {
-@@ -76,8 +77,8 @@
- 			#size-cells = <0>;
- 			cell-index = <0>;
- 			compatible = "fsl-i2c";
--			reg = <3000 100>;
--			interrupts = <2b 2>;
-+			reg = <0x3000 0x100>;
-+			interrupts = <43 2>;
- 			interrupt-parent = <&mpic>;
- 			dfsrr;
- 		};
-@@ -86,18 +87,18 @@
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 			compatible = "fsl,gianfar-mdio";
--			reg = <24520 20>;
-+			reg = <0x24520 0x20>;
- 
- 			phy0: ethernet-phy@0 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <5 1>;
--				reg = <0>;
-+				reg = <0x0>;
- 				device_type = "ethernet-phy";
- 			};
- 			phy1: ethernet-phy@1 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <5 1>;
--				reg = <1>;
-+				reg = <0x1>;
- 				device_type = "ethernet-phy";
- 			};
- 		};
-@@ -107,9 +108,9 @@
- 			device_type = "network";
- 			model = "TSEC";
- 			compatible = "gianfar";
--			reg = <24000 1000>;
-+			reg = <0x24000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <1d 2 1e 2 22 2>;
-+			interrupts = <29 2 30 2 34 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy0>;
- 		};
-@@ -119,9 +120,9 @@
- 			device_type = "network";
- 			model = "TSEC";
- 			compatible = "gianfar";
--			reg = <25000 1000>;
-+			reg = <0x25000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <23 2 24 2 28 2>;
-+			interrupts = <35 2 36 2 40 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy1>;
- 		};
-@@ -130,9 +131,9 @@
- 			cell-index = <0>;
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <4500 100>; 	// reg base, size
-+			reg = <0x4500 0x100>; 	// reg base, size
- 			clock-frequency = <0>; 	// should we fill in in uboot?
--			interrupts = <2a 2>;
-+			interrupts = <42 2>;
- 			interrupt-parent = <&mpic>;
- 		};
- 
-@@ -140,9 +141,9 @@
- 			cell-index = <1>;
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <4600 100>;	// reg base, size
-+			reg = <0x4600 0x100>;	// reg base, size
- 			clock-frequency = <0>; 	// should we fill in in uboot?
--			interrupts = <2a 2>;
-+			interrupts = <42 2>;
- 			interrupt-parent = <&mpic>;
- 		};
- 
-@@ -151,7 +152,7 @@
- 			interrupt-controller;
- 			#address-cells = <0>;
- 			#interrupt-cells = <2>;
--			reg = <40000 40000>;
-+			reg = <0x40000 0x40000>;
- 			compatible = "chrp,open-pic";
- 			device_type = "open-pic";
-                         big-endian;
-@@ -161,17 +162,17 @@
- 			#address-cells = <1>;
- 			#size-cells = <1>;
- 			compatible = "fsl,mpc8541-cpm", "fsl,cpm2";
--			reg = <919c0 30>;
-+			reg = <0x919c0 0x30>;
- 			ranges;
- 
- 			muram@80000 {
- 				#address-cells = <1>;
- 				#size-cells = <1>;
--				ranges = <0 80000 10000>;
-+				ranges = <0x0 0x80000 0x10000>;
- 
- 				data@0 {
- 					compatible = "fsl,cpm-muram-data";
--					reg = <0 2000 9000 1000>;
-+					reg = <0x0 0x2000 0x9000 0x1000>;
- 				};
- 			};
- 
-@@ -179,16 +180,16 @@
- 				compatible = "fsl,mpc8541-brg",
- 				             "fsl,cpm2-brg",
- 				             "fsl,cpm-brg";
--				reg = <919f0 10 915f0 10>;
-+				reg = <0x919f0 0x10 0x915f0 0x10>;
- 			};
- 
- 			cpmpic: pic@90c00 {
- 				interrupt-controller;
- 				#address-cells = <0>;
- 				#interrupt-cells = <2>;
--				interrupts = <2e 2>;
-+				interrupts = <46 2>;
- 				interrupt-parent = <&mpic>;
--				reg = <90c00 80>;
-+				reg = <0x90c00 0x80>;
- 				compatible = "fsl,mpc8541-cpm-pic", "fsl,cpm2-pic";
- 			};
- 		};
-@@ -196,68 +197,68 @@
- 
- 	pci0: pci@e0008000 {
- 		cell-index = <0>;
--		interrupt-map-mask = <1f800 0 0 7>;
-+		interrupt-map-mask = <0x1f800 0x0 0x0 0x7>;
- 		interrupt-map = <
- 
- 			/* IDSEL 0x10 */
--			08000 0 0 1 &mpic 0 1
--			08000 0 0 2 &mpic 1 1
--			08000 0 0 3 &mpic 2 1
--			08000 0 0 4 &mpic 3 1
-+			0x8000 0x0 0x0 0x1 &mpic 0x0 0x1
-+			0x8000 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0x8000 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0x8000 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 			/* IDSEL 0x11 */
--			08800 0 0 1 &mpic 0 1
--			08800 0 0 2 &mpic 1 1
--			08800 0 0 3 &mpic 2 1
--			08800 0 0 4 &mpic 3 1
-+			0x8800 0x0 0x0 0x1 &mpic 0x0 0x1
-+			0x8800 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0x8800 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0x8800 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 			/* IDSEL 0x12 (Slot 1) */
--			09000 0 0 1 &mpic 0 1
--			09000 0 0 2 &mpic 1 1
--			09000 0 0 3 &mpic 2 1
--			09000 0 0 4 &mpic 3 1
-+			0x9000 0x0 0x0 0x1 &mpic 0x0 0x1
-+			0x9000 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0x9000 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0x9000 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 			/* IDSEL 0x13 (Slot 2) */
--			09800 0 0 1 &mpic 1 1
--			09800 0 0 2 &mpic 2 1
--			09800 0 0 3 &mpic 3 1
--			09800 0 0 4 &mpic 0 1
-+			0x9800 0x0 0x0 0x1 &mpic 0x1 0x1
-+			0x9800 0x0 0x0 0x2 &mpic 0x2 0x1
-+			0x9800 0x0 0x0 0x3 &mpic 0x3 0x1
-+			0x9800 0x0 0x0 0x4 &mpic 0x0 0x1
- 
- 			/* IDSEL 0x14 (Slot 3) */
--			0a000 0 0 1 &mpic 2 1
--			0a000 0 0 2 &mpic 3 1
--			0a000 0 0 3 &mpic 0 1
--			0a000 0 0 4 &mpic 1 1
-+			0xa000 0x0 0x0 0x1 &mpic 0x2 0x1
-+			0xa000 0x0 0x0 0x2 &mpic 0x3 0x1
-+			0xa000 0x0 0x0 0x3 &mpic 0x0 0x1
-+			0xa000 0x0 0x0 0x4 &mpic 0x1 0x1
- 
- 			/* IDSEL 0x15 (Slot 4) */
--			0a800 0 0 1 &mpic 3 1
--			0a800 0 0 2 &mpic 0 1
--			0a800 0 0 3 &mpic 1 1
--			0a800 0 0 4 &mpic 2 1
-+			0xa800 0x0 0x0 0x1 &mpic 0x3 0x1
-+			0xa800 0x0 0x0 0x2 &mpic 0x0 0x1
-+			0xa800 0x0 0x0 0x3 &mpic 0x1 0x1
-+			0xa800 0x0 0x0 0x4 &mpic 0x2 0x1
- 
- 			/* Bus 1 (Tundra Bridge) */
- 			/* IDSEL 0x12 (ISA bridge) */
--			19000 0 0 1 &mpic 0 1
--			19000 0 0 2 &mpic 1 1
--			19000 0 0 3 &mpic 2 1
--			19000 0 0 4 &mpic 3 1>;
-+			0x19000 0x0 0x0 0x1 &mpic 0x0 0x1
-+			0x19000 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0x19000 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0x19000 0x0 0x0 0x4 &mpic 0x3 0x1>;
- 		interrupt-parent = <&mpic>;
--		interrupts = <18 2>;
-+		interrupts = <24 2>;
- 		bus-range = <0 0>;
--		ranges = <02000000 0 80000000 80000000 0 20000000
--			  01000000 0 00000000 e2000000 0 00100000>;
--		clock-frequency = <3f940aa>;
-+		ranges = <0x2000000 0x0 0x80000000 0x80000000 0x0 0x20000000
-+			  0x1000000 0x0 0x0 0xe2000000 0x0 0x100000>;
-+		clock-frequency = <66666666>;
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		reg = <e0008000 1000>;
-+		reg = <0xe0008000 0x1000>;
- 		compatible = "fsl,mpc8540-pci";
- 		device_type = "pci";
- 
- 		i8259@19000 {
- 			interrupt-controller;
- 			device_type = "interrupt-controller";
--			reg = <19000 0 0 0 1>;
-+			reg = <0x19000 0x0 0x0 0x0 0x1>;
- 			#address-cells = <0>;
- 			#interrupt-cells = <2>;
- 			compatible = "chrp,iic";
-@@ -268,24 +269,24 @@
- 
- 	pci1: pci@e0009000 {
- 		cell-index = <1>;
--		interrupt-map-mask = <f800 0 0 7>;
-+		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 		interrupt-map = <
- 
- 			/* IDSEL 0x15 */
--			a800 0 0 1 &mpic b 1
--			a800 0 0 2 &mpic b 1
--			a800 0 0 3 &mpic b 1
--			a800 0 0 4 &mpic b 1>;
-+			0xa800 0x0 0x0 0x1 &mpic 0xb 0x1
-+			0xa800 0x0 0x0 0x2 &mpic 0xb 0x1
-+			0xa800 0x0 0x0 0x3 &mpic 0xb 0x1
-+			0xa800 0x0 0x0 0x4 &mpic 0xb 0x1>;
- 		interrupt-parent = <&mpic>;
--		interrupts = <19 2>;
-+		interrupts = <25 2>;
- 		bus-range = <0 0>;
--		ranges = <02000000 0 a0000000 a0000000 0 20000000
--			  01000000 0 00000000 e3000000 0 00100000>;
--		clock-frequency = <3f940aa>;
-+		ranges = <0x2000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000
-+			  0x1000000 0x0 0x0 0xe3000000 0x0 0x100000>;
-+		clock-frequency = <66666666>;
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		reg = <e0009000 1000>;
-+		reg = <0xe0009000 0x1000>;
- 		compatible = "fsl,mpc8540-pci";
- 		device_type = "pci";
- 	};
---- a/arch/powerpc/boot/dts/mpc8544ds.dts
-+++ b/arch/powerpc/boot/dts/mpc8544ds.dts
-@@ -1,7 +1,7 @@
- /*
-  * MPC8544 DS Device Tree Source
-  *
-- * Copyright 2007 Freescale Semiconductor Inc.
-+ * Copyright 2007, 2008 Freescale Semiconductor Inc.
-  *
-  * 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
-@@ -9,6 +9,7 @@
-  * option) any later version.
-  */
- 
-+/dts-v1/;
- / {
- 	model = "MPC8544DS";
- 	compatible = "MPC8544DS", "MPC85xxDS";
-@@ -27,17 +28,16 @@
- 	};
- 
- 	cpus {
--		#cpus = <1>;
- 		#address-cells = <1>;
- 		#size-cells = <0>;
- 
- 		PowerPC,8544@0 {
- 			device_type = "cpu";
--			reg = <0>;
--			d-cache-line-size = <20>;	// 32 bytes
--			i-cache-line-size = <20>;	// 32 bytes
--			d-cache-size = <8000>;		// L1, 32K
--			i-cache-size = <8000>;		// L1, 32K
-+			reg = <0x0>;
-+			d-cache-line-size = <32>;	// 32 bytes
-+			i-cache-line-size = <32>;	// 32 bytes
-+			d-cache-size = <0x8000>;		// L1, 32K
-+			i-cache-size = <0x8000>;		// L1, 32K
- 			timebase-frequency = <0>;
- 			bus-frequency = <0>;
- 			clock-frequency = <0>;
-@@ -46,7 +46,7 @@
- 
- 	memory {
- 		device_type = "memory";
--		reg = <00000000 00000000>;	// Filled by U-Boot
-+		reg = <0x0 0x0>;	// Filled by U-Boot
- 	};
- 
- 	soc8544@e0000000 {
-@@ -54,24 +54,24 @@
- 		#size-cells = <1>;
- 		device_type = "soc";
- 
--		ranges = <00000000 e0000000 00100000>;
--		reg = <e0000000 00001000>;	// CCSRBAR 1M
-+		ranges = <0x0 0xe0000000 0x100000>;
-+		reg = <0xe0000000 0x1000>;	// CCSRBAR 1M
- 		bus-frequency = <0>;		// Filled out by uboot.
- 
- 		memory-controller@2000 {
- 			compatible = "fsl,8544-memory-controller";
--			reg = <2000 1000>;
-+			reg = <0x2000 0x1000>;
- 			interrupt-parent = <&mpic>;
--			interrupts = <12 2>;
-+			interrupts = <18 2>;
- 		};
- 
- 		l2-cache-controller@20000 {
- 			compatible = "fsl,8544-l2-cache-controller";
--			reg = <20000 1000>;
--			cache-line-size = <20>;	// 32 bytes
--			cache-size = <40000>;	// L2, 256K
-+			reg = <0x20000 0x1000>;
-+			cache-line-size = <32>;	// 32 bytes
-+			cache-size = <0x40000>;	// L2, 256K
- 			interrupt-parent = <&mpic>;
--			interrupts = <10 2>;
-+			interrupts = <16 2>;
- 		};
- 
- 		i2c@3000 {
-@@ -79,8 +79,8 @@
- 			#size-cells = <0>;
- 			cell-index = <0>;
- 			compatible = "fsl-i2c";
--			reg = <3000 100>;
--			interrupts = <2b 2>;
-+			reg = <0x3000 0x100>;
-+			interrupts = <43 2>;
- 			interrupt-parent = <&mpic>;
- 			dfsrr;
- 		};
-@@ -90,8 +90,8 @@
- 			#size-cells = <0>;
- 			cell-index = <1>;
- 			compatible = "fsl-i2c";
--			reg = <3100 100>;
--			interrupts = <2b 2>;
-+			reg = <0x3100 0x100>;
-+			interrupts = <43 2>;
- 			interrupt-parent = <&mpic>;
- 			dfsrr;
- 		};
-@@ -100,30 +100,71 @@
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 			compatible = "fsl,gianfar-mdio";
--			reg = <24520 20>;
-+			reg = <0x24520 0x20>;
- 
- 			phy0: ethernet-phy@0 {
- 				interrupt-parent = <&mpic>;
--				interrupts = <a 1>;
--				reg = <0>;
-+				interrupts = <10 1>;
-+				reg = <0x0>;
- 				device_type = "ethernet-phy";
- 			};
- 			phy1: ethernet-phy@1 {
- 				interrupt-parent = <&mpic>;
--				interrupts = <a 1>;
--				reg = <1>;
-+				interrupts = <10 1>;
-+				reg = <0x1>;
- 				device_type = "ethernet-phy";
- 			};
- 		};
- 
-+		dma@21300 {
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+			compatible = "fsl,mpc8544-dma", "fsl,eloplus-dma";
-+			reg = <0x21300 0x4>;
-+			ranges = <0x0 0x21100 0x200>;
-+			cell-index = <0>;
-+			dma-channel@0 {
-+				compatible = "fsl,mpc8544-dma-channel",
-+						"fsl,eloplus-dma-channel";
-+				reg = <0x0 0x80>;
-+				cell-index = <0>;
-+				interrupt-parent = <&mpic>;
-+				interrupts = <20 2>;
-+			};
-+			dma-channel@80 {
-+				compatible = "fsl,mpc8544-dma-channel",
-+						"fsl,eloplus-dma-channel";
-+				reg = <0x80 0x80>;
-+				cell-index = <1>;
-+				interrupt-parent = <&mpic>;
-+				interrupts = <21 2>;
-+			};
-+			dma-channel@100 {
-+				compatible = "fsl,mpc8544-dma-channel",
-+						"fsl,eloplus-dma-channel";
-+				reg = <0x100 0x80>;
-+				cell-index = <2>;
-+				interrupt-parent = <&mpic>;
-+				interrupts = <22 2>;
-+			};
-+			dma-channel@180 {
-+				compatible = "fsl,mpc8544-dma-channel",
-+						"fsl,eloplus-dma-channel";
-+				reg = <0x180 0x80>;
-+				cell-index = <3>;
-+				interrupt-parent = <&mpic>;
-+				interrupts = <23 2>;
-+			};
-+		};
-+
- 		enet0: ethernet@24000 {
- 			cell-index = <0>;
- 			device_type = "network";
- 			model = "TSEC";
- 			compatible = "gianfar";
--			reg = <24000 1000>;
-+			reg = <0x24000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <1d 2 1e 2 22 2>;
-+			interrupts = <29 2 30 2 34 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy0>;
- 			phy-connection-type = "rgmii-id";
-@@ -134,9 +175,9 @@
- 			device_type = "network";
- 			model = "TSEC";
- 			compatible = "gianfar";
--			reg = <26000 1000>;
-+			reg = <0x26000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <1f 2 20 2 21 2>;
-+			interrupts = <31 2 32 2 33 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy1>;
- 			phy-connection-type = "rgmii-id";
-@@ -146,9 +187,9 @@
- 			cell-index = <0>;
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <4500 100>;
-+			reg = <0x4500 0x100>;
- 			clock-frequency = <0>;
--			interrupts = <2a 2>;
-+			interrupts = <42 2>;
- 			interrupt-parent = <&mpic>;
- 		};
- 
-@@ -156,15 +197,15 @@
- 			cell-index = <1>;
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <4600 100>;
-+			reg = <0x4600 0x100>;
- 			clock-frequency = <0>;
--			interrupts = <2a 2>;
-+			interrupts = <42 2>;
- 			interrupt-parent = <&mpic>;
- 		};
- 
- 		global-utilities@e0000 {	//global utilities block
- 			compatible = "fsl,mpc8548-guts";
--			reg = <e0000 1000>;
-+			reg = <0xe0000 0x1000>;
- 			fsl,has-rstcr;
- 		};
- 
-@@ -173,7 +214,7 @@
- 			interrupt-controller;
- 			#address-cells = <0>;
- 			#interrupt-cells = <2>;
--			reg = <40000 40000>;
-+			reg = <0x40000 0x40000>;
- 			compatible = "chrp,open-pic";
- 			device_type = "open-pic";
- 			big-endian;
-@@ -184,32 +225,32 @@
- 		cell-index = <0>;
- 		compatible = "fsl,mpc8540-pci";
- 		device_type = "pci";
--		interrupt-map-mask = <f800 0 0 7>;
-+		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 		interrupt-map = <
- 
- 			/* IDSEL 0x11 J17 Slot 1 */
--			8800 0 0 1 &mpic 2 1
--			8800 0 0 2 &mpic 3 1
--			8800 0 0 3 &mpic 4 1
--			8800 0 0 4 &mpic 1 1
-+			0x8800 0x0 0x0 0x1 &mpic 0x2 0x1
-+			0x8800 0x0 0x0 0x2 &mpic 0x3 0x1
-+			0x8800 0x0 0x0 0x3 &mpic 0x4 0x1
-+			0x8800 0x0 0x0 0x4 &mpic 0x1 0x1
- 
- 			/* IDSEL 0x12 J16 Slot 2 */
- 
--			9000 0 0 1 &mpic 3 1
--			9000 0 0 2 &mpic 4 1
--			9000 0 0 3 &mpic 2 1
--			9000 0 0 4 &mpic 1 1>;
-+			0x9000 0x0 0x0 0x1 &mpic 0x3 0x1
-+			0x9000 0x0 0x0 0x2 &mpic 0x4 0x1
-+			0x9000 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0x9000 0x0 0x0 0x4 &mpic 0x1 0x1>;
- 
- 		interrupt-parent = <&mpic>;
--		interrupts = <18 2>;
--		bus-range = <0 ff>;
--		ranges = <02000000 0 c0000000 c0000000 0 20000000
--			  01000000 0 00000000 e1000000 0 00010000>;
--		clock-frequency = <3f940aa>;
-+		interrupts = <24 2>;
-+		bus-range = <0 255>;
-+		ranges = <0x2000000 0x0 0xc0000000 0xc0000000 0x0 0x20000000
-+			  0x1000000 0x0 0x0 0xe1000000 0x0 0x10000>;
-+		clock-frequency = <66666666>;
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		reg = <e0008000 1000>;
-+		reg = <0xe0008000 0x1000>;
- 	};
- 
- 	pci1: pcie@e0009000 {
-@@ -219,33 +260,33 @@
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		reg = <e0009000 1000>;
--		bus-range = <0 ff>;
--		ranges = <02000000 0 80000000 80000000 0 20000000
--			  01000000 0 00000000 e1010000 0 00010000>;
--		clock-frequency = <1fca055>;
-+		reg = <0xe0009000 0x1000>;
-+		bus-range = <0 255>;
-+		ranges = <0x2000000 0x0 0x80000000 0x80000000 0x0 0x20000000
-+			  0x1000000 0x0 0x0 0xe1010000 0x0 0x10000>;
-+		clock-frequency = <33333333>;
- 		interrupt-parent = <&mpic>;
--		interrupts = <1a 2>;
--		interrupt-map-mask = <f800 0 0 7>;
-+		interrupts = <26 2>;
-+		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 		interrupt-map = <
- 			/* IDSEL 0x0 */
--			0000 0 0 1 &mpic 4 1
--			0000 0 0 2 &mpic 5 1
--			0000 0 0 3 &mpic 6 1
--			0000 0 0 4 &mpic 7 1
-+			0000 0x0 0x0 0x1 &mpic 0x4 0x1
-+			0000 0x0 0x0 0x2 &mpic 0x5 0x1
-+			0000 0x0 0x0 0x3 &mpic 0x6 0x1
-+			0000 0x0 0x0 0x4 &mpic 0x7 0x1
- 			>;
- 		pcie@0 {
--			reg = <0 0 0 0 0>;
-+			reg = <0x0 0x0 0x0 0x0 0x0>;
- 			#size-cells = <2>;
- 			#address-cells = <3>;
- 			device_type = "pci";
--			ranges = <02000000 0 80000000
--				  02000000 0 80000000
--				  0 20000000
--
--				  01000000 0 00000000
--				  01000000 0 00000000
--				  0 00010000>;
-+			ranges = <0x2000000 0x0 0x80000000
-+				  0x2000000 0x0 0x80000000
-+				  0x0 0x20000000
-+
-+				  0x1000000 0x0 0x0
-+				  0x1000000 0x0 0x0
-+				  0x0 0x10000>;
- 		};
- 	};
- 
-@@ -256,33 +297,33 @@
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		reg = <e000a000 1000>;
--		bus-range = <0 ff>;
--		ranges = <02000000 0 a0000000 a0000000 0 10000000
--			  01000000 0 00000000 e1020000 0 00010000>;
--		clock-frequency = <1fca055>;
-+		reg = <0xe000a000 0x1000>;
-+		bus-range = <0 255>;
-+		ranges = <0x2000000 0x0 0xa0000000 0xa0000000 0x0 0x10000000
-+			  0x1000000 0x0 0x0 0xe1020000 0x0 0x10000>;
-+		clock-frequency = <33333333>;
- 		interrupt-parent = <&mpic>;
--		interrupts = <19 2>;
--		interrupt-map-mask = <f800 0 0 7>;
-+		interrupts = <25 2>;
-+		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 		interrupt-map = <
- 			/* IDSEL 0x0 */
--			0000 0 0 1 &mpic 0 1
--			0000 0 0 2 &mpic 1 1
--			0000 0 0 3 &mpic 2 1
--			0000 0 0 4 &mpic 3 1
-+			0000 0x0 0x0 0x1 &mpic 0x0 0x1
-+			0000 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0000 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0000 0x0 0x0 0x4 &mpic 0x3 0x1
- 			>;
- 		pcie@0 {
--			reg = <0 0 0 0 0>;
-+			reg = <0x0 0x0 0x0 0x0 0x0>;
- 			#size-cells = <2>;
- 			#address-cells = <3>;
- 			device_type = "pci";
--			ranges = <02000000 0 a0000000
--				  02000000 0 a0000000
--				  0 10000000
--
--				  01000000 0 00000000
--				  01000000 0 00000000
--				  0 00010000>;
-+			ranges = <0x2000000 0x0 0xa0000000
-+				  0x2000000 0x0 0xa0000000
-+				  0x0 0x10000000
-+
-+				  0x1000000 0x0 0x0
-+				  0x1000000 0x0 0x0
-+				  0x0 0x10000>;
- 		};
- 	};
- 
-@@ -293,72 +334,72 @@
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		reg = <e000b000 1000>;
--		bus-range = <0 ff>;
--		ranges = <02000000 0 b0000000 b0000000 0 00100000
--			  01000000 0 00000000 b0100000 0 00100000>;
--		clock-frequency = <1fca055>;
-+		reg = <0xe000b000 0x1000>;
-+		bus-range = <0 255>;
-+		ranges = <0x2000000 0x0 0xb0000000 0xb0000000 0x0 0x100000
-+			  0x1000000 0x0 0x0 0xb0100000 0x0 0x100000>;
-+		clock-frequency = <33333333>;
- 		interrupt-parent = <&mpic>;
--		interrupts = <1b 2>;
--		interrupt-map-mask = <ff00 0 0 1>;
-+		interrupts = <27 2>;
-+		interrupt-map-mask = <0xff00 0x0 0x0 0x1>;
- 		interrupt-map = <
- 			// IDSEL 0x1c  USB
--			e000 0 0 1 &i8259 c 2
--			e100 0 0 2 &i8259 9 2
--			e200 0 0 3 &i8259 a 2
--			e300 0 0 4 &i8259 b 2
-+			0xe000 0x0 0x0 0x1 &i8259 0xc 0x2
-+			0xe100 0x0 0x0 0x2 &i8259 0x9 0x2
-+			0xe200 0x0 0x0 0x3 &i8259 0xa 0x2
-+			0xe300 0x0 0x0 0x4 &i8259 0xb 0x2
- 
- 			// IDSEL 0x1d  Audio
--			e800 0 0 1 &i8259 6 2
-+			0xe800 0x0 0x0 0x1 &i8259 0x6 0x2
- 
- 			// IDSEL 0x1e Legacy
--			f000 0 0 1 &i8259 7 2
--			f100 0 0 1 &i8259 7 2
-+			0xf000 0x0 0x0 0x1 &i8259 0x7 0x2
-+			0xf100 0x0 0x0 0x1 &i8259 0x7 0x2
- 
- 			// IDSEL 0x1f IDE/SATA
--			f800 0 0 1 &i8259 e 2
--			f900 0 0 1 &i8259 5 2
-+			0xf800 0x0 0x0 0x1 &i8259 0xe 0x2
-+			0xf900 0x0 0x0 0x1 &i8259 0x5 0x2
- 		>;
- 
- 		pcie@0 {
--			reg = <0 0 0 0 0>;
-+			reg = <0x0 0x0 0x0 0x0 0x0>;
- 			#size-cells = <2>;
- 			#address-cells = <3>;
- 			device_type = "pci";
--			ranges = <02000000 0 b0000000
--				  02000000 0 b0000000
--				  0 00100000
--
--				  01000000 0 00000000
--				  01000000 0 00000000
--				  0 00100000>;
-+			ranges = <0x2000000 0x0 0xb0000000
-+				  0x2000000 0x0 0xb0000000
-+				  0x0 0x100000
-+
-+				  0x1000000 0x0 0x0
-+				  0x1000000 0x0 0x0
-+				  0x0 0x100000>;
- 
- 			uli1575@0 {
--				reg = <0 0 0 0 0>;
-+				reg = <0x0 0x0 0x0 0x0 0x0>;
- 				#size-cells = <2>;
- 				#address-cells = <3>;
--				ranges = <02000000 0 b0000000
--					  02000000 0 b0000000
--					  0 00100000
--
--					  01000000 0 00000000
--					  01000000 0 00000000
--					  0 00100000>;
-+				ranges = <0x2000000 0x0 0xb0000000
-+					  0x2000000 0x0 0xb0000000
-+					  0x0 0x100000
-+
-+					  0x1000000 0x0 0x0
-+					  0x1000000 0x0 0x0
-+					  0x0 0x100000>;
- 				isa@1e {
- 					device_type = "isa";
- 					#interrupt-cells = <2>;
- 					#size-cells = <1>;
- 					#address-cells = <2>;
--					reg = <f000 0 0 0 0>;
--					ranges = <1 0
--						  01000000 0 0
--						  00001000>;
-+					reg = <0xf000 0x0 0x0 0x0 0x0>;
-+					ranges = <0x1 0x0
-+						  0x1000000 0x0 0x0
-+						  0x1000>;
- 					interrupt-parent = <&i8259>;
- 
- 					i8259: interrupt-controller@20 {
--						reg = <1 20 2
--						       1 a0 2
--						       1 4d0 2>;
-+						reg = <0x1 0x20 0x2
-+						       0x1 0xa0 0x2
-+						       0x1 0x4d0 0x2>;
- 						interrupt-controller;
- 						device_type = "interrupt-controller";
- 						#address-cells = <0>;
-@@ -371,28 +412,28 @@
- 					i8042@60 {
- 						#size-cells = <0>;
- 						#address-cells = <1>;
--						reg = <1 60 1 1 64 1>;
--						interrupts = <1 3 c 3>;
-+						reg = <0x1 0x60 0x1 0x1 0x64 0x1>;
-+						interrupts = <1 3 12 3>;
- 						interrupt-parent = <&i8259>;
- 
- 						keyboard@0 {
--							reg = <0>;
-+							reg = <0x0>;
- 							compatible = "pnpPNP,303";
- 						};
- 
- 						mouse@1 {
--							reg = <1>;
-+							reg = <0x1>;
- 							compatible = "pnpPNP,f03";
- 						};
- 					};
- 
- 					rtc@70 {
- 						compatible = "pnpPNP,b00";
--						reg = <1 70 2>;
-+						reg = <0x1 0x70 0x2>;
- 					};
- 
- 					gpio@400 {
--						reg = <1 400 80>;
-+						reg = <0x1 0x400 0x80>;
- 					};
- 				};
- 			};
---- a/arch/powerpc/boot/dts/mpc8548cds.dts
-+++ b/arch/powerpc/boot/dts/mpc8548cds.dts
-@@ -1,7 +1,7 @@
- /*
-  * MPC8548 CDS Device Tree Source
-  *
-- * Copyright 2006 Freescale Semiconductor Inc.
-+ * Copyright 2006, 2008 Freescale Semiconductor Inc.
-  *
-  * 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
-@@ -9,6 +9,7 @@
-  * option) any later version.
-  */
- 
-+/dts-v1/;
- 
- / {
- 	model = "MPC8548CDS";
-@@ -36,11 +37,11 @@
- 
- 		PowerPC,8548@0 {
- 			device_type = "cpu";
--			reg = <0>;
--			d-cache-line-size = <20>;	// 32 bytes
--			i-cache-line-size = <20>;	// 32 bytes
--			d-cache-size = <8000>;		// L1, 32K
--			i-cache-size = <8000>;		// L1, 32K
-+			reg = <0x0>;
-+			d-cache-line-size = <32>;	// 32 bytes
-+			i-cache-line-size = <32>;	// 32 bytes
-+			d-cache-size = <0x8000>;		// L1, 32K
-+			i-cache-size = <0x8000>;		// L1, 32K
- 			timebase-frequency = <0>;	//  33 MHz, from uboot
- 			bus-frequency = <0>;	// 166 MHz
- 			clock-frequency = <0>;	// 825 MHz, from uboot
-@@ -49,31 +50,31 @@
- 
- 	memory {
- 		device_type = "memory";
--		reg = <00000000 08000000>;	// 128M at 0x0
-+		reg = <0x0 0x8000000>;	// 128M at 0x0
- 	};
- 
- 	soc8548@e0000000 {
- 		#address-cells = <1>;
- 		#size-cells = <1>;
- 		device_type = "soc";
--		ranges = <00000000 e0000000 00100000>;
--		reg = <e0000000 00001000>;	// CCSRBAR
-+		ranges = <0x0 0xe0000000 0x100000>;
-+		reg = <0xe0000000 0x1000>;	// CCSRBAR
- 		bus-frequency = <0>;
- 
- 		memory-controller@2000 {
- 			compatible = "fsl,8548-memory-controller";
--			reg = <2000 1000>;
-+			reg = <0x2000 0x1000>;
- 			interrupt-parent = <&mpic>;
--			interrupts = <12 2>;
-+			interrupts = <18 2>;
- 		};
- 
- 		l2-cache-controller@20000 {
- 			compatible = "fsl,8548-l2-cache-controller";
--			reg = <20000 1000>;
--			cache-line-size = <20>;	// 32 bytes
--			cache-size = <80000>;	// L2, 512K
-+			reg = <0x20000 0x1000>;
-+			cache-line-size = <32>;	// 32 bytes
-+			cache-size = <0x80000>;	// L2, 512K
- 			interrupt-parent = <&mpic>;
--			interrupts = <10 2>;
-+			interrupts = <16 2>;
- 		};
- 
- 		i2c@3000 {
-@@ -81,8 +82,8 @@
- 			#size-cells = <0>;
- 			cell-index = <0>;
- 			compatible = "fsl-i2c";
--			reg = <3000 100>;
--			interrupts = <2b 2>;
-+			reg = <0x3000 0x100>;
-+			interrupts = <43 2>;
- 			interrupt-parent = <&mpic>;
- 			dfsrr;
- 		};
-@@ -92,8 +93,8 @@
- 			#size-cells = <0>;
- 			cell-index = <1>;
- 			compatible = "fsl-i2c";
--			reg = <3100 100>;
--			interrupts = <2b 2>;
-+			reg = <0x3100 0x100>;
-+			interrupts = <43 2>;
- 			interrupt-parent = <&mpic>;
- 			dfsrr;
- 		};
-@@ -102,30 +103,30 @@
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 			compatible = "fsl,gianfar-mdio";
--			reg = <24520 20>;
-+			reg = <0x24520 0x20>;
- 
- 			phy0: ethernet-phy@0 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <5 1>;
--				reg = <0>;
-+				reg = <0x0>;
- 				device_type = "ethernet-phy";
- 			};
- 			phy1: ethernet-phy@1 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <5 1>;
--				reg = <1>;
-+				reg = <0x1>;
- 				device_type = "ethernet-phy";
- 			};
- 			phy2: ethernet-phy@2 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <5 1>;
--				reg = <2>;
-+				reg = <0x2>;
- 				device_type = "ethernet-phy";
- 			};
- 			phy3: ethernet-phy@3 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <5 1>;
--				reg = <3>;
-+				reg = <0x3>;
- 				device_type = "ethernet-phy";
- 			};
- 		};
-@@ -135,9 +136,9 @@
- 			device_type = "network";
- 			model = "eTSEC";
- 			compatible = "gianfar";
--			reg = <24000 1000>;
-+			reg = <0x24000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <1d 2 1e 2 22 2>;
-+			interrupts = <29 2 30 2 34 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy0>;
- 		};
-@@ -147,9 +148,9 @@
- 			device_type = "network";
- 			model = "eTSEC";
- 			compatible = "gianfar";
--			reg = <25000 1000>;
-+			reg = <0x25000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <23 2 24 2 28 2>;
-+			interrupts = <35 2 36 2 40 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy1>;
- 		};
-@@ -160,9 +161,9 @@
- 			device_type = "network";
- 			model = "eTSEC";
- 			compatible = "gianfar";
--			reg = <26000 1000>;
-+			reg = <0x26000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <1f 2 20 2 21 2>;
-+			interrupts = <31 2 32 2 33 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy2>;
- 		};
-@@ -172,9 +173,9 @@
- 			device_type = "network";
- 			model = "eTSEC";
- 			compatible = "gianfar";
--			reg = <27000 1000>;
-+			reg = <0x27000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <25 2 26 2 27 2>;
-+			interrupts = <37 2 38 2 39 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy3>;
- 		};
-@@ -184,9 +185,9 @@
- 			cell-index = <0>;
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <4500 100>;	// reg base, size
-+			reg = <0x4500 0x100>;	// reg base, size
- 			clock-frequency = <0>;	// should we fill in in uboot?
--			interrupts = <2a 2>;
-+			interrupts = <42 2>;
- 			interrupt-parent = <&mpic>;
- 		};
- 
-@@ -194,15 +195,15 @@
- 			cell-index = <1>;
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <4600 100>;	// reg base, size
-+			reg = <0x4600 0x100>;	// reg base, size
- 			clock-frequency = <0>;	// should we fill in in uboot?
--			interrupts = <2a 2>;
-+			interrupts = <42 2>;
- 			interrupt-parent = <&mpic>;
- 		};
- 
- 		global-utilities@e0000 {	//global utilities reg
- 			compatible = "fsl,mpc8548-guts";
--			reg = <e0000 1000>;
-+			reg = <0xe0000 0x1000>;
- 			fsl,has-rstcr;
- 		};
- 
-@@ -211,7 +212,7 @@
- 			interrupt-controller;
- 			#address-cells = <0>;
- 			#interrupt-cells = <2>;
--			reg = <40000 40000>;
-+			reg = <0x40000 0x40000>;
- 			compatible = "chrp,open-pic";
- 			device_type = "open-pic";
-                         big-endian;
-@@ -220,139 +221,139 @@
- 
- 	pci0: pci@e0008000 {
- 		cell-index = <0>;
--		interrupt-map-mask = <f800 0 0 7>;
-+		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 		interrupt-map = <
- 			/* IDSEL 0x4 (PCIX Slot 2) */
--			02000 0 0 1 &mpic 0 1
--			02000 0 0 2 &mpic 1 1
--			02000 0 0 3 &mpic 2 1
--			02000 0 0 4 &mpic 3 1
-+			0x2000 0x0 0x0 0x1 &mpic 0x0 0x1
-+			0x2000 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0x2000 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0x2000 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 			/* IDSEL 0x5 (PCIX Slot 3) */
--			02800 0 0 1 &mpic 1 1
--			02800 0 0 2 &mpic 2 1
--			02800 0 0 3 &mpic 3 1
--			02800 0 0 4 &mpic 0 1
-+			0x2800 0x0 0x0 0x1 &mpic 0x1 0x1
-+			0x2800 0x0 0x0 0x2 &mpic 0x2 0x1
-+			0x2800 0x0 0x0 0x3 &mpic 0x3 0x1
-+			0x2800 0x0 0x0 0x4 &mpic 0x0 0x1
- 
- 			/* IDSEL 0x6 (PCIX Slot 4) */
--			03000 0 0 1 &mpic 2 1
--			03000 0 0 2 &mpic 3 1
--			03000 0 0 3 &mpic 0 1
--			03000 0 0 4 &mpic 1 1
-+			0x3000 0x0 0x0 0x1 &mpic 0x2 0x1
-+			0x3000 0x0 0x0 0x2 &mpic 0x3 0x1
-+			0x3000 0x0 0x0 0x3 &mpic 0x0 0x1
-+			0x3000 0x0 0x0 0x4 &mpic 0x1 0x1
- 
- 			/* IDSEL 0x8 (PCIX Slot 5) */
--			04000 0 0 1 &mpic 0 1
--			04000 0 0 2 &mpic 1 1
--			04000 0 0 3 &mpic 2 1
--			04000 0 0 4 &mpic 3 1
-+			0x4000 0x0 0x0 0x1 &mpic 0x0 0x1
-+			0x4000 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0x4000 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0x4000 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 			/* IDSEL 0xC (Tsi310 bridge) */
--			06000 0 0 1 &mpic 0 1
--			06000 0 0 2 &mpic 1 1
--			06000 0 0 3 &mpic 2 1
--			06000 0 0 4 &mpic 3 1
-+			0x6000 0x0 0x0 0x1 &mpic 0x0 0x1
-+			0x6000 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0x6000 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0x6000 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 			/* IDSEL 0x14 (Slot 2) */
--			0a000 0 0 1 &mpic 0 1
--			0a000 0 0 2 &mpic 1 1
--			0a000 0 0 3 &mpic 2 1
--			0a000 0 0 4 &mpic 3 1
-+			0xa000 0x0 0x0 0x1 &mpic 0x0 0x1
-+			0xa000 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0xa000 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0xa000 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 			/* IDSEL 0x15 (Slot 3) */
--			0a800 0 0 1 &mpic 1 1
--			0a800 0 0 2 &mpic 2 1
--			0a800 0 0 3 &mpic 3 1
--			0a800 0 0 4 &mpic 0 1
-+			0xa800 0x0 0x0 0x1 &mpic 0x1 0x1
-+			0xa800 0x0 0x0 0x2 &mpic 0x2 0x1
-+			0xa800 0x0 0x0 0x3 &mpic 0x3 0x1
-+			0xa800 0x0 0x0 0x4 &mpic 0x0 0x1
- 
- 			/* IDSEL 0x16 (Slot 4) */
--			0b000 0 0 1 &mpic 2 1
--			0b000 0 0 2 &mpic 3 1
--			0b000 0 0 3 &mpic 0 1
--			0b000 0 0 4 &mpic 1 1
-+			0xb000 0x0 0x0 0x1 &mpic 0x2 0x1
-+			0xb000 0x0 0x0 0x2 &mpic 0x3 0x1
-+			0xb000 0x0 0x0 0x3 &mpic 0x0 0x1
-+			0xb000 0x0 0x0 0x4 &mpic 0x1 0x1
- 
- 			/* IDSEL 0x18 (Slot 5) */
--			0c000 0 0 1 &mpic 0 1
--			0c000 0 0 2 &mpic 1 1
--			0c000 0 0 3 &mpic 2 1
--			0c000 0 0 4 &mpic 3 1
-+			0xc000 0x0 0x0 0x1 &mpic 0x0 0x1
-+			0xc000 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0xc000 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0xc000 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 			/* IDSEL 0x1C (Tsi310 bridge PCI primary) */
--			0E000 0 0 1 &mpic 0 1
--			0E000 0 0 2 &mpic 1 1
--			0E000 0 0 3 &mpic 2 1
--			0E000 0 0 4 &mpic 3 1>;
-+			0xe000 0x0 0x0 0x1 &mpic 0x0 0x1
-+			0xe000 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0xe000 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0xe000 0x0 0x0 0x4 &mpic 0x3 0x1>;
- 
- 		interrupt-parent = <&mpic>;
--		interrupts = <18 2>;
-+		interrupts = <24 2>;
- 		bus-range = <0 0>;
--		ranges = <02000000 0 80000000 80000000 0 10000000
--			  01000000 0 00000000 e2000000 0 00800000>;
--		clock-frequency = <3f940aa>;
-+		ranges = <0x2000000 0x0 0x80000000 0x80000000 0x0 0x10000000
-+			  0x1000000 0x0 0x0 0xe2000000 0x0 0x800000>;
-+		clock-frequency = <66666666>;
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		reg = <e0008000 1000>;
-+		reg = <0xe0008000 0x1000>;
- 		compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
- 		device_type = "pci";
- 
- 		pci_bridge@1c {
--			interrupt-map-mask = <f800 0 0 7>;
-+			interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 			interrupt-map = <
- 
- 				/* IDSEL 0x00 (PrPMC Site) */
--				0000 0 0 1 &mpic 0 1
--				0000 0 0 2 &mpic 1 1
--				0000 0 0 3 &mpic 2 1
--				0000 0 0 4 &mpic 3 1
-+				0000 0x0 0x0 0x1 &mpic 0x0 0x1
-+				0000 0x0 0x0 0x2 &mpic 0x1 0x1
-+				0000 0x0 0x0 0x3 &mpic 0x2 0x1
-+				0000 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 				/* IDSEL 0x04 (VIA chip) */
--				2000 0 0 1 &mpic 0 1
--				2000 0 0 2 &mpic 1 1
--				2000 0 0 3 &mpic 2 1
--				2000 0 0 4 &mpic 3 1
-+				0x2000 0x0 0x0 0x1 &mpic 0x0 0x1
-+				0x2000 0x0 0x0 0x2 &mpic 0x1 0x1
-+				0x2000 0x0 0x0 0x3 &mpic 0x2 0x1
-+				0x2000 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 				/* IDSEL 0x05 (8139) */
--				2800 0 0 1 &mpic 1 1
-+				0x2800 0x0 0x0 0x1 &mpic 0x1 0x1
- 
- 				/* IDSEL 0x06 (Slot 6) */
--				3000 0 0 1 &mpic 2 1
--				3000 0 0 2 &mpic 3 1
--				3000 0 0 3 &mpic 0 1
--				3000 0 0 4 &mpic 1 1
-+				0x3000 0x0 0x0 0x1 &mpic 0x2 0x1
-+				0x3000 0x0 0x0 0x2 &mpic 0x3 0x1
-+				0x3000 0x0 0x0 0x3 &mpic 0x0 0x1
-+				0x3000 0x0 0x0 0x4 &mpic 0x1 0x1
- 
- 				/* IDESL 0x07 (Slot 7) */
--				3800 0 0 1 &mpic 3 1
--				3800 0 0 2 &mpic 0 1
--				3800 0 0 3 &mpic 1 1
--				3800 0 0 4 &mpic 2 1>;
-+				0x3800 0x0 0x0 0x1 &mpic 0x3 0x1
-+				0x3800 0x0 0x0 0x2 &mpic 0x0 0x1
-+				0x3800 0x0 0x0 0x3 &mpic 0x1 0x1
-+				0x3800 0x0 0x0 0x4 &mpic 0x2 0x1>;
- 
--			reg = <e000 0 0 0 0>;
-+			reg = <0xe000 0x0 0x0 0x0 0x0>;
- 			#interrupt-cells = <1>;
- 			#size-cells = <2>;
- 			#address-cells = <3>;
--			ranges = <02000000 0 80000000
--				  02000000 0 80000000
--				  0 20000000
--				  01000000 0 00000000
--				  01000000 0 00000000
--				  0 00080000>;
--			clock-frequency = <1fca055>;
-+			ranges = <0x2000000 0x0 0x80000000
-+				  0x2000000 0x0 0x80000000
-+				  0x0 0x20000000
-+				  0x1000000 0x0 0x0
-+				  0x1000000 0x0 0x0
-+				  0x0 0x80000>;
-+			clock-frequency = <33333333>;
- 
- 			isa@4 {
- 				device_type = "isa";
- 				#interrupt-cells = <2>;
- 				#size-cells = <1>;
- 				#address-cells = <2>;
--				reg = <2000 0 0 0 0>;
--				ranges = <1 0 01000000 0 0 00001000>;
-+				reg = <0x2000 0x0 0x0 0x0 0x0>;
-+				ranges = <0x1 0x0 0x1000000 0x0 0x0 0x1000>;
- 				interrupt-parent = <&i8259>;
- 
- 				i8259: interrupt-controller@20 {
- 					interrupt-controller;
- 					device_type = "interrupt-controller";
--					reg = <1 20 2
--					       1 a0 2
--					       1 4d0 2>;
-+					reg = <0x1 0x20 0x2
-+					       0x1 0xa0 0x2
-+					       0x1 0x4d0 0x2>;
- 					#address-cells = <0>;
- 					#interrupt-cells = <2>;
- 					compatible = "chrp,iic";
-@@ -362,7 +363,7 @@
- 
- 				rtc@70 {
- 					compatible = "pnpPNP,b00";
--					reg = <1 70 2>;
-+					reg = <0x1 0x70 0x2>;
- 				};
- 			};
- 		};
-@@ -370,64 +371,64 @@
- 
- 	pci1: pci@e0009000 {
- 		cell-index = <1>;
--		interrupt-map-mask = <f800 0 0 7>;
-+		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 		interrupt-map = <
- 
- 			/* IDSEL 0x15 */
--			a800 0 0 1 &mpic b 1
--			a800 0 0 2 &mpic 1 1
--			a800 0 0 3 &mpic 2 1
--			a800 0 0 4 &mpic 3 1>;
-+			0xa800 0x0 0x0 0x1 &mpic 0xb 0x1
-+			0xa800 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0xa800 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0xa800 0x0 0x0 0x4 &mpic 0x3 0x1>;
- 
- 		interrupt-parent = <&mpic>;
--		interrupts = <19 2>;
-+		interrupts = <25 2>;
- 		bus-range = <0 0>;
--		ranges = <02000000 0 90000000 90000000 0 10000000
--			  01000000 0 00000000 e2800000 0 00800000>;
--		clock-frequency = <3f940aa>;
-+		ranges = <0x2000000 0x0 0x90000000 0x90000000 0x0 0x10000000
-+			  0x1000000 0x0 0x0 0xe2800000 0x0 0x800000>;
-+		clock-frequency = <66666666>;
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		reg = <e0009000 1000>;
-+		reg = <0xe0009000 0x1000>;
- 		compatible = "fsl,mpc8540-pci";
- 		device_type = "pci";
- 	};
- 
- 	pci2: pcie@e000a000 {
- 		cell-index = <2>;
--		interrupt-map-mask = <f800 0 0 7>;
-+		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 		interrupt-map = <
- 
- 			/* IDSEL 0x0 (PEX) */
--			00000 0 0 1 &mpic 0 1
--			00000 0 0 2 &mpic 1 1
--			00000 0 0 3 &mpic 2 1
--			00000 0 0 4 &mpic 3 1>;
-+			00000 0x0 0x0 0x1 &mpic 0x0 0x1
-+			00000 0x0 0x0 0x2 &mpic 0x1 0x1
-+			00000 0x0 0x0 0x3 &mpic 0x2 0x1
-+			00000 0x0 0x0 0x4 &mpic 0x3 0x1>;
- 
- 		interrupt-parent = <&mpic>;
--		interrupts = <1a 2>;
--		bus-range = <0 ff>;
--		ranges = <02000000 0 a0000000 a0000000 0 20000000
--			  01000000 0 00000000 e3000000 0 08000000>;
--		clock-frequency = <1fca055>;
-+		interrupts = <26 2>;
-+		bus-range = <0 255>;
-+		ranges = <0x2000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000
-+			  0x1000000 0x0 0x0 0xe3000000 0x0 0x8000000>;
-+		clock-frequency = <33333333>;
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		reg = <e000a000 1000>;
-+		reg = <0xe000a000 0x1000>;
- 		compatible = "fsl,mpc8548-pcie";
- 		device_type = "pci";
- 		pcie@0 {
--			reg = <0 0 0 0 0>;
-+			reg = <0x0 0x0 0x0 0x0 0x0>;
- 			#size-cells = <2>;
- 			#address-cells = <3>;
- 			device_type = "pci";
--			ranges = <02000000 0 a0000000
--				  02000000 0 a0000000
--				  0 20000000
--
--				  01000000 0 00000000
--				  01000000 0 00000000
--				  0 08000000>;
-+			ranges = <0x2000000 0x0 0xa0000000
-+				  0x2000000 0x0 0xa0000000
-+				  0x0 0x20000000
-+
-+				  0x1000000 0x0 0x0
-+				  0x1000000 0x0 0x0
-+				  0x0 0x8000000>;
- 		};
- 	};
- };
---- a/arch/powerpc/boot/dts/mpc8555cds.dts
-+++ b/arch/powerpc/boot/dts/mpc8555cds.dts
-@@ -1,7 +1,7 @@
- /*
-  * MPC8555 CDS Device Tree Source
-  *
-- * Copyright 2006 Freescale Semiconductor Inc.
-+ * Copyright 2006, 2008 Freescale Semiconductor Inc.
-  *
-  * 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
-@@ -9,6 +9,7 @@
-  * option) any later version.
-  */
- 
-+/dts-v1/;
- 
- / {
- 	model = "MPC8555CDS";
-@@ -31,11 +32,11 @@
- 
- 		PowerPC,8555@0 {
- 			device_type = "cpu";
--			reg = <0>;
--			d-cache-line-size = <20>;	// 32 bytes
--			i-cache-line-size = <20>;	// 32 bytes
--			d-cache-size = <8000>;		// L1, 32K
--			i-cache-size = <8000>;		// L1, 32K
-+			reg = <0x0>;
-+			d-cache-line-size = <32>;	// 32 bytes
-+			i-cache-line-size = <32>;	// 32 bytes
-+			d-cache-size = <0x8000>;		// L1, 32K
-+			i-cache-size = <0x8000>;		// L1, 32K
- 			timebase-frequency = <0>;	//  33 MHz, from uboot
- 			bus-frequency = <0>;	// 166 MHz
- 			clock-frequency = <0>;	// 825 MHz, from uboot
-@@ -44,31 +45,31 @@
- 
- 	memory {
- 		device_type = "memory";
--		reg = <00000000 08000000>;	// 128M at 0x0
-+		reg = <0x0 0x8000000>;	// 128M at 0x0
- 	};
- 
- 	soc8555@e0000000 {
- 		#address-cells = <1>;
- 		#size-cells = <1>;
- 		device_type = "soc";
--		ranges = <0 e0000000 00100000>;
--		reg = <e0000000 00001000>;	// CCSRBAR 1M
-+		ranges = <0x0 0xe0000000 0x100000>;
-+		reg = <0xe0000000 0x1000>;	// CCSRBAR 1M
- 		bus-frequency = <0>;
- 
- 		memory-controller@2000 {
- 			compatible = "fsl,8555-memory-controller";
--			reg = <2000 1000>;
-+			reg = <0x2000 0x1000>;
- 			interrupt-parent = <&mpic>;
--			interrupts = <12 2>;
-+			interrupts = <18 2>;
- 		};
- 
- 		l2-cache-controller@20000 {
- 			compatible = "fsl,8555-l2-cache-controller";
--			reg = <20000 1000>;
--			cache-line-size = <20>;	// 32 bytes
--			cache-size = <40000>;	// L2, 256K
-+			reg = <0x20000 0x1000>;
-+			cache-line-size = <32>;	// 32 bytes
-+			cache-size = <0x40000>;	// L2, 256K
- 			interrupt-parent = <&mpic>;
--			interrupts = <10 2>;
-+			interrupts = <16 2>;
- 		};
- 
- 		i2c@3000 {
-@@ -76,8 +77,8 @@
- 			#size-cells = <0>;
- 			cell-index = <0>;
- 			compatible = "fsl-i2c";
--			reg = <3000 100>;
--			interrupts = <2b 2>;
-+			reg = <0x3000 0x100>;
-+			interrupts = <43 2>;
- 			interrupt-parent = <&mpic>;
- 			dfsrr;
- 		};
-@@ -86,18 +87,18 @@
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 			compatible = "fsl,gianfar-mdio";
--			reg = <24520 20>;
-+			reg = <0x24520 0x20>;
- 
- 			phy0: ethernet-phy@0 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <5 1>;
--				reg = <0>;
-+				reg = <0x0>;
- 				device_type = "ethernet-phy";
- 			};
- 			phy1: ethernet-phy@1 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <5 1>;
--				reg = <1>;
-+				reg = <0x1>;
- 				device_type = "ethernet-phy";
- 			};
- 		};
-@@ -107,9 +108,9 @@
- 			device_type = "network";
- 			model = "TSEC";
- 			compatible = "gianfar";
--			reg = <24000 1000>;
-+			reg = <0x24000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <1d 2 1e 2 22 2>;
-+			interrupts = <29 2 30 2 34 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy0>;
- 		};
-@@ -119,9 +120,9 @@
- 			device_type = "network";
- 			model = "TSEC";
- 			compatible = "gianfar";
--			reg = <25000 1000>;
-+			reg = <0x25000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <23 2 24 2 28 2>;
-+			interrupts = <35 2 36 2 40 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy1>;
- 		};
-@@ -130,9 +131,9 @@
- 			cell-index = <0>;
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <4500 100>; 	// reg base, size
-+			reg = <0x4500 0x100>; 	// reg base, size
- 			clock-frequency = <0>; 	// should we fill in in uboot?
--			interrupts = <2a 2>;
-+			interrupts = <42 2>;
- 			interrupt-parent = <&mpic>;
- 		};
- 
-@@ -140,9 +141,9 @@
- 			cell-index = <1>;
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <4600 100>;	// reg base, size
-+			reg = <0x4600 0x100>;	// reg base, size
- 			clock-frequency = <0>; 	// should we fill in in uboot?
--			interrupts = <2a 2>;
-+			interrupts = <42 2>;
- 			interrupt-parent = <&mpic>;
- 		};
- 
-@@ -151,7 +152,7 @@
- 			interrupt-controller;
- 			#address-cells = <0>;
- 			#interrupt-cells = <2>;
--			reg = <40000 40000>;
-+			reg = <0x40000 0x40000>;
- 			compatible = "chrp,open-pic";
- 			device_type = "open-pic";
-                         big-endian;
-@@ -161,17 +162,17 @@
- 			#address-cells = <1>;
- 			#size-cells = <1>;
- 			compatible = "fsl,mpc8555-cpm", "fsl,cpm2";
--			reg = <919c0 30>;
-+			reg = <0x919c0 0x30>;
- 			ranges;
- 
- 			muram@80000 {
- 				#address-cells = <1>;
- 				#size-cells = <1>;
--				ranges = <0 80000 10000>;
-+				ranges = <0x0 0x80000 0x10000>;
- 
- 				data@0 {
- 					compatible = "fsl,cpm-muram-data";
--					reg = <0 2000 9000 1000>;
-+					reg = <0x0 0x2000 0x9000 0x1000>;
- 				};
- 			};
- 
-@@ -179,16 +180,16 @@
- 				compatible = "fsl,mpc8555-brg",
- 				             "fsl,cpm2-brg",
- 				             "fsl,cpm-brg";
--				reg = <919f0 10 915f0 10>;
-+				reg = <0x919f0 0x10 0x915f0 0x10>;
- 			};
- 
- 			cpmpic: pic@90c00 {
- 				interrupt-controller;
- 				#address-cells = <0>;
- 				#interrupt-cells = <2>;
--				interrupts = <2e 2>;
-+				interrupts = <46 2>;
- 				interrupt-parent = <&mpic>;
--				reg = <90c00 80>;
-+				reg = <0x90c00 0x80>;
- 				compatible = "fsl,mpc8555-cpm-pic", "fsl,cpm2-pic";
- 			};
- 		};
-@@ -196,68 +197,68 @@
- 
- 	pci0: pci@e0008000 {
- 		cell-index = <0>;
--		interrupt-map-mask = <1f800 0 0 7>;
-+		interrupt-map-mask = <0x1f800 0x0 0x0 0x7>;
- 		interrupt-map = <
- 
- 			/* IDSEL 0x10 */
--			08000 0 0 1 &mpic 0 1
--			08000 0 0 2 &mpic 1 1
--			08000 0 0 3 &mpic 2 1
--			08000 0 0 4 &mpic 3 1
-+			0x8000 0x0 0x0 0x1 &mpic 0x0 0x1
-+			0x8000 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0x8000 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0x8000 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 			/* IDSEL 0x11 */
--			08800 0 0 1 &mpic 0 1
--			08800 0 0 2 &mpic 1 1
--			08800 0 0 3 &mpic 2 1
--			08800 0 0 4 &mpic 3 1
-+			0x8800 0x0 0x0 0x1 &mpic 0x0 0x1
-+			0x8800 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0x8800 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0x8800 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 			/* IDSEL 0x12 (Slot 1) */
--			09000 0 0 1 &mpic 0 1
--			09000 0 0 2 &mpic 1 1
--			09000 0 0 3 &mpic 2 1
--			09000 0 0 4 &mpic 3 1
-+			0x9000 0x0 0x0 0x1 &mpic 0x0 0x1
-+			0x9000 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0x9000 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0x9000 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 			/* IDSEL 0x13 (Slot 2) */
--			09800 0 0 1 &mpic 1 1
--			09800 0 0 2 &mpic 2 1
--			09800 0 0 3 &mpic 3 1
--			09800 0 0 4 &mpic 0 1
-+			0x9800 0x0 0x0 0x1 &mpic 0x1 0x1
-+			0x9800 0x0 0x0 0x2 &mpic 0x2 0x1
-+			0x9800 0x0 0x0 0x3 &mpic 0x3 0x1
-+			0x9800 0x0 0x0 0x4 &mpic 0x0 0x1
- 
- 			/* IDSEL 0x14 (Slot 3) */
--			0a000 0 0 1 &mpic 2 1
--			0a000 0 0 2 &mpic 3 1
--			0a000 0 0 3 &mpic 0 1
--			0a000 0 0 4 &mpic 1 1
-+			0xa000 0x0 0x0 0x1 &mpic 0x2 0x1
-+			0xa000 0x0 0x0 0x2 &mpic 0x3 0x1
-+			0xa000 0x0 0x0 0x3 &mpic 0x0 0x1
-+			0xa000 0x0 0x0 0x4 &mpic 0x1 0x1
- 
- 			/* IDSEL 0x15 (Slot 4) */
--			0a800 0 0 1 &mpic 3 1
--			0a800 0 0 2 &mpic 0 1
--			0a800 0 0 3 &mpic 1 1
--			0a800 0 0 4 &mpic 2 1
-+			0xa800 0x0 0x0 0x1 &mpic 0x3 0x1
-+			0xa800 0x0 0x0 0x2 &mpic 0x0 0x1
-+			0xa800 0x0 0x0 0x3 &mpic 0x1 0x1
-+			0xa800 0x0 0x0 0x4 &mpic 0x2 0x1
- 
- 			/* Bus 1 (Tundra Bridge) */
- 			/* IDSEL 0x12 (ISA bridge) */
--			19000 0 0 1 &mpic 0 1
--			19000 0 0 2 &mpic 1 1
--			19000 0 0 3 &mpic 2 1
--			19000 0 0 4 &mpic 3 1>;
-+			0x19000 0x0 0x0 0x1 &mpic 0x0 0x1
-+			0x19000 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0x19000 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0x19000 0x0 0x0 0x4 &mpic 0x3 0x1>;
- 		interrupt-parent = <&mpic>;
--		interrupts = <18 2>;
-+		interrupts = <24 2>;
- 		bus-range = <0 0>;
--		ranges = <02000000 0 80000000 80000000 0 20000000
--			  01000000 0 00000000 e2000000 0 00100000>;
--		clock-frequency = <3f940aa>;
-+		ranges = <0x2000000 0x0 0x80000000 0x80000000 0x0 0x20000000
-+			  0x1000000 0x0 0x0 0xe2000000 0x0 0x100000>;
-+		clock-frequency = <66666666>;
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		reg = <e0008000 1000>;
-+		reg = <0xe0008000 0x1000>;
- 		compatible = "fsl,mpc8540-pci";
- 		device_type = "pci";
- 
- 		i8259@19000 {
- 			interrupt-controller;
- 			device_type = "interrupt-controller";
--			reg = <19000 0 0 0 1>;
-+			reg = <0x19000 0x0 0x0 0x0 0x1>;
- 			#address-cells = <0>;
- 			#interrupt-cells = <2>;
- 			compatible = "chrp,iic";
-@@ -268,24 +269,24 @@
- 
- 	pci1: pci@e0009000 {
- 		cell-index = <1>;
--		interrupt-map-mask = <f800 0 0 7>;
-+		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 		interrupt-map = <
- 
- 			/* IDSEL 0x15 */
--			a800 0 0 1 &mpic b 1
--			a800 0 0 2 &mpic b 1
--			a800 0 0 3 &mpic b 1
--			a800 0 0 4 &mpic b 1>;
-+			0xa800 0x0 0x0 0x1 &mpic 0xb 0x1
-+			0xa800 0x0 0x0 0x2 &mpic 0xb 0x1
-+			0xa800 0x0 0x0 0x3 &mpic 0xb 0x1
-+			0xa800 0x0 0x0 0x4 &mpic 0xb 0x1>;
- 		interrupt-parent = <&mpic>;
--		interrupts = <19 2>;
-+		interrupts = <25 2>;
- 		bus-range = <0 0>;
--		ranges = <02000000 0 a0000000 a0000000 0 20000000
--			  01000000 0 00000000 e3000000 0 00100000>;
--		clock-frequency = <3f940aa>;
-+		ranges = <0x2000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000
-+			  0x1000000 0x0 0x0 0xe3000000 0x0 0x100000>;
-+		clock-frequency = <66666666>;
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		reg = <e0009000 1000>;
-+		reg = <0xe0009000 0x1000>;
- 		compatible = "fsl,mpc8540-pci";
- 		device_type = "pci";
- 	};
---- a/arch/powerpc/boot/dts/mpc8560ads.dts
-+++ b/arch/powerpc/boot/dts/mpc8560ads.dts
-@@ -1,7 +1,7 @@
- /*
-  * MPC8560 ADS Device Tree Source
-  *
-- * Copyright 2006 Freescale Semiconductor Inc.
-+ * Copyright 2006, 2008 Freescale Semiconductor Inc.
-  *
-  * 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
-@@ -9,6 +9,7 @@
-  * option) any later version.
-  */
- 
-+/dts-v1/;
- 
- / {
- 	model = "MPC8560ADS";
-@@ -32,74 +33,74 @@
- 
- 		PowerPC,8560@0 {
- 			device_type = "cpu";
--			reg = <0>;
--			d-cache-line-size = <20>;	// 32 bytes
--			i-cache-line-size = <20>;	// 32 bytes
--			d-cache-size = <8000>;		// L1, 32K
--			i-cache-size = <8000>;		// L1, 32K
--			timebase-frequency = <04ead9a0>;
--			bus-frequency = <13ab6680>;
--			clock-frequency = <312c8040>;
-+			reg = <0x0>;
-+			d-cache-line-size = <32>;	// 32 bytes
-+			i-cache-line-size = <32>;	// 32 bytes
-+			d-cache-size = <0x8000>;		// L1, 32K
-+			i-cache-size = <0x8000>;		// L1, 32K
-+			timebase-frequency = <82500000>;
-+			bus-frequency = <330000000>;
-+			clock-frequency = <825000000>;
- 		};
- 	};
- 
- 	memory {
- 		device_type = "memory";
--		reg = <00000000 10000000>;
-+		reg = <0x0 0x10000000>;
- 	};
- 
- 	soc8560@e0000000 {
- 		#address-cells = <1>;
- 		#size-cells = <1>;
- 		device_type = "soc";
--		ranges = <0 e0000000 00100000>;
--		reg = <e0000000 00000200>;
--		bus-frequency = <13ab6680>;
-+		ranges = <0x0 0xe0000000 0x100000>;
-+		reg = <0xe0000000 0x200>;
-+		bus-frequency = <330000000>;
- 
- 		memory-controller@2000 {
- 			compatible = "fsl,8540-memory-controller";
--			reg = <2000 1000>;
-+			reg = <0x2000 0x1000>;
- 			interrupt-parent = <&mpic>;
--			interrupts = <12 2>;
-+			interrupts = <18 2>;
- 		};
- 
- 		l2-cache-controller@20000 {
- 			compatible = "fsl,8540-l2-cache-controller";
--			reg = <20000 1000>;
--			cache-line-size = <20>;	// 32 bytes
--			cache-size = <40000>;	// L2, 256K
-+			reg = <0x20000 0x1000>;
-+			cache-line-size = <32>;	// 32 bytes
-+			cache-size = <0x40000>;	// L2, 256K
- 			interrupt-parent = <&mpic>;
--			interrupts = <10 2>;
-+			interrupts = <16 2>;
- 		};
- 
- 		mdio@24520 {
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 			compatible = "fsl,gianfar-mdio";
--			reg = <24520 20>;
-+			reg = <0x24520 0x20>;
- 
- 			phy0: ethernet-phy@0 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <5 1>;
--				reg = <0>;
-+				reg = <0x0>;
- 				device_type = "ethernet-phy";
- 			};
- 			phy1: ethernet-phy@1 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <5 1>;
--				reg = <1>;
-+				reg = <0x1>;
- 				device_type = "ethernet-phy";
- 			};
- 			phy2: ethernet-phy@2 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <7 1>;
--				reg = <2>;
-+				reg = <0x2>;
- 				device_type = "ethernet-phy";
- 			};
- 			phy3: ethernet-phy@3 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <7 1>;
--				reg = <3>;
-+				reg = <0x3>;
- 				device_type = "ethernet-phy";
- 			};
- 		};
-@@ -109,9 +110,9 @@
- 			device_type = "network";
- 			model = "TSEC";
- 			compatible = "gianfar";
--			reg = <24000 1000>;
-+			reg = <0x24000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <1d 2 1e 2 22 2>;
-+			interrupts = <29 2 30 2 34 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy0>;
- 		};
-@@ -121,9 +122,9 @@
- 			device_type = "network";
- 			model = "TSEC";
- 			compatible = "gianfar";
--			reg = <25000 1000>;
-+			reg = <0x25000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <23 2 24 2 28 2>;
-+			interrupts = <35 2 36 2 40 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy1>;
- 		};
-@@ -132,7 +133,7 @@
- 			interrupt-controller;
- 			#address-cells = <0>;
- 			#interrupt-cells = <2>;
--			reg = <40000 40000>;
-+			reg = <0x40000 0x40000>;
- 			device_type = "open-pic";
- 		};
- 
-@@ -140,17 +141,17 @@
- 			#address-cells = <1>;
- 			#size-cells = <1>;
- 			compatible = "fsl,mpc8560-cpm", "fsl,cpm2";
--			reg = <919c0 30>;
-+			reg = <0x919c0 0x30>;
- 			ranges;
- 
- 			muram@80000 {
- 				#address-cells = <1>;
- 				#size-cells = <1>;
--				ranges = <0 80000 10000>;
-+				ranges = <0x0 0x80000 0x10000>;
- 
- 				data@0 {
- 					compatible = "fsl,cpm-muram-data";
--					reg = <0 4000 9000 2000>;
-+					reg = <0x0 0x4000 0x9000 0x2000>;
- 				};
- 			};
- 
-@@ -158,17 +159,17 @@
- 				compatible = "fsl,mpc8560-brg",
- 				             "fsl,cpm2-brg",
- 				             "fsl,cpm-brg";
--				reg = <919f0 10 915f0 10>;
--				clock-frequency = <d#165000000>;
-+				reg = <0x919f0 0x10 0x915f0 0x10>;
-+				clock-frequency = <165000000>;
- 			};
- 
- 			cpmpic: pic@90c00 {
- 				interrupt-controller;
- 				#address-cells = <0>;
- 				#interrupt-cells = <2>;
--				interrupts = <2e 2>;
-+				interrupts = <46 2>;
- 				interrupt-parent = <&mpic>;
--				reg = <90c00 80>;
-+				reg = <0x90c00 0x80>;
- 				compatible = "fsl,mpc8560-cpm-pic", "fsl,cpm2-pic";
- 			};
- 
-@@ -176,11 +177,11 @@
- 				device_type = "serial";
- 				compatible = "fsl,mpc8560-scc-uart",
- 				             "fsl,cpm2-scc-uart";
--				reg = <91a00 20 88000 100>;
-+				reg = <0x91a00 0x20 0x88000 0x100>;
- 				fsl,cpm-brg = <1>;
--				fsl,cpm-command = <00800000>;
--				current-speed = <1c200>;
--				interrupts = <28 8>;
-+				fsl,cpm-command = <0x800000>;
-+				current-speed = <115200>;
-+				interrupts = <40 8>;
- 				interrupt-parent = <&cpmpic>;
- 			};
- 
-@@ -188,11 +189,11 @@
- 				device_type = "serial";
- 				compatible = "fsl,mpc8560-scc-uart",
- 				             "fsl,cpm2-scc-uart";
--				reg = <91a20 20 88100 100>;
-+				reg = <0x91a20 0x20 0x88100 0x100>;
- 				fsl,cpm-brg = <2>;
--				fsl,cpm-command = <04a00000>;
--				current-speed = <1c200>;
--				interrupts = <29 8>;
-+				fsl,cpm-command = <0x4a00000>;
-+				current-speed = <115200>;
-+				interrupts = <41 8>;
- 				interrupt-parent = <&cpmpic>;
- 			};
- 
-@@ -200,10 +201,10 @@
- 				device_type = "network";
- 				compatible = "fsl,mpc8560-fcc-enet",
- 				             "fsl,cpm2-fcc-enet";
--				reg = <91320 20 88500 100 913b0 1>;
-+				reg = <0x91320 0x20 0x88500 0x100 0x913b0 0x1>;
- 				local-mac-address = [ 00 00 00 00 00 00 ];
--				fsl,cpm-command = <16200300>;
--				interrupts = <21 8>;
-+				fsl,cpm-command = <0x16200300>;
-+				interrupts = <33 8>;
- 				interrupt-parent = <&cpmpic>;
- 				phy-handle = <&phy2>;
- 			};
-@@ -212,10 +213,10 @@
- 				device_type = "network";
- 				compatible = "fsl,mpc8560-fcc-enet",
- 				             "fsl,cpm2-fcc-enet";
--				reg = <91340 20 88600 100 913d0 1>;
-+				reg = <0x91340 0x20 0x88600 0x100 0x913d0 0x1>;
- 				local-mac-address = [ 00 00 00 00 00 00 ];
--				fsl,cpm-command = <1a400300>;
--				interrupts = <22 8>;
-+				fsl,cpm-command = <0x1a400300>;
-+				interrupts = <34 8>;
- 				interrupt-parent = <&cpmpic>;
- 				phy-handle = <&phy3>;
- 			};
-@@ -229,87 +230,87 @@
- 		#address-cells = <3>;
- 		compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
- 		device_type = "pci";
--		reg = <e0008000 1000>;
--		clock-frequency = <3f940aa>;
--		interrupt-map-mask = <f800 0 0 7>;
-+		reg = <0xe0008000 0x1000>;
-+		clock-frequency = <66666666>;
-+		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 		interrupt-map = <
- 
- 				/* IDSEL 0x2 */
--				 1000 0 0 1 &mpic 1 1
--				 1000 0 0 2 &mpic 2 1
--				 1000 0 0 3 &mpic 3 1
--				 1000 0 0 4 &mpic 4 1
-+				 0x1000 0x0 0x0 0x1 &mpic 0x1 0x1
-+				 0x1000 0x0 0x0 0x2 &mpic 0x2 0x1
-+				 0x1000 0x0 0x0 0x3 &mpic 0x3 0x1
-+				 0x1000 0x0 0x0 0x4 &mpic 0x4 0x1
- 
- 				/* IDSEL 0x3 */
--				 1800 0 0 1 &mpic 4 1
--				 1800 0 0 2 &mpic 1 1
--				 1800 0 0 3 &mpic 2 1
--				 1800 0 0 4 &mpic 3 1
-+				 0x1800 0x0 0x0 0x1 &mpic 0x4 0x1
-+				 0x1800 0x0 0x0 0x2 &mpic 0x1 0x1
-+				 0x1800 0x0 0x0 0x3 &mpic 0x2 0x1
-+				 0x1800 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 				/* IDSEL 0x4 */
--				 2000 0 0 1 &mpic 3 1
--				 2000 0 0 2 &mpic 4 1
--				 2000 0 0 3 &mpic 1 1
--				 2000 0 0 4 &mpic 2 1
-+				 0x2000 0x0 0x0 0x1 &mpic 0x3 0x1
-+				 0x2000 0x0 0x0 0x2 &mpic 0x4 0x1
-+				 0x2000 0x0 0x0 0x3 &mpic 0x1 0x1
-+				 0x2000 0x0 0x0 0x4 &mpic 0x2 0x1
- 
- 				/* IDSEL 0x5  */
--				 2800 0 0 1 &mpic 2 1
--				 2800 0 0 2 &mpic 3 1
--				 2800 0 0 3 &mpic 4 1
--				 2800 0 0 4 &mpic 1 1
-+				 0x2800 0x0 0x0 0x1 &mpic 0x2 0x1
-+				 0x2800 0x0 0x0 0x2 &mpic 0x3 0x1
-+				 0x2800 0x0 0x0 0x3 &mpic 0x4 0x1
-+				 0x2800 0x0 0x0 0x4 &mpic 0x1 0x1
- 
- 				/* IDSEL 12 */
--				 6000 0 0 1 &mpic 1 1
--				 6000 0 0 2 &mpic 2 1
--				 6000 0 0 3 &mpic 3 1
--				 6000 0 0 4 &mpic 4 1
-+				 0x6000 0x0 0x0 0x1 &mpic 0x1 0x1
-+				 0x6000 0x0 0x0 0x2 &mpic 0x2 0x1
-+				 0x6000 0x0 0x0 0x3 &mpic 0x3 0x1
-+				 0x6000 0x0 0x0 0x4 &mpic 0x4 0x1
- 
- 				/* IDSEL 13 */
--				 6800 0 0 1 &mpic 4 1
--				 6800 0 0 2 &mpic 1 1
--				 6800 0 0 3 &mpic 2 1
--				 6800 0 0 4 &mpic 3 1
-+				 0x6800 0x0 0x0 0x1 &mpic 0x4 0x1
-+				 0x6800 0x0 0x0 0x2 &mpic 0x1 0x1
-+				 0x6800 0x0 0x0 0x3 &mpic 0x2 0x1
-+				 0x6800 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 				/* IDSEL 14*/
--				 7000 0 0 1 &mpic 3 1
--				 7000 0 0 2 &mpic 4 1
--				 7000 0 0 3 &mpic 1 1
--				 7000 0 0 4 &mpic 2 1
-+				 0x7000 0x0 0x0 0x1 &mpic 0x3 0x1
-+				 0x7000 0x0 0x0 0x2 &mpic 0x4 0x1
-+				 0x7000 0x0 0x0 0x3 &mpic 0x1 0x1
-+				 0x7000 0x0 0x0 0x4 &mpic 0x2 0x1
- 
- 				/* IDSEL 15 */
--				 7800 0 0 1 &mpic 2 1
--				 7800 0 0 2 &mpic 3 1
--				 7800 0 0 3 &mpic 4 1
--				 7800 0 0 4 &mpic 1 1
-+				 0x7800 0x0 0x0 0x1 &mpic 0x2 0x1
-+				 0x7800 0x0 0x0 0x2 &mpic 0x3 0x1
-+				 0x7800 0x0 0x0 0x3 &mpic 0x4 0x1
-+				 0x7800 0x0 0x0 0x4 &mpic 0x1 0x1
- 
- 				/* IDSEL 18 */
--				 9000 0 0 1 &mpic 1 1
--				 9000 0 0 2 &mpic 2 1
--				 9000 0 0 3 &mpic 3 1
--				 9000 0 0 4 &mpic 4 1
-+				 0x9000 0x0 0x0 0x1 &mpic 0x1 0x1
-+				 0x9000 0x0 0x0 0x2 &mpic 0x2 0x1
-+				 0x9000 0x0 0x0 0x3 &mpic 0x3 0x1
-+				 0x9000 0x0 0x0 0x4 &mpic 0x4 0x1
- 
- 				/* IDSEL 19 */
--				 9800 0 0 1 &mpic 4 1
--				 9800 0 0 2 &mpic 1 1
--				 9800 0 0 3 &mpic 2 1
--				 9800 0 0 4 &mpic 3 1
-+				 0x9800 0x0 0x0 0x1 &mpic 0x4 0x1
-+				 0x9800 0x0 0x0 0x2 &mpic 0x1 0x1
-+				 0x9800 0x0 0x0 0x3 &mpic 0x2 0x1
-+				 0x9800 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 				/* IDSEL 20 */
--				 a000 0 0 1 &mpic 3 1
--				 a000 0 0 2 &mpic 4 1
--				 a000 0 0 3 &mpic 1 1
--				 a000 0 0 4 &mpic 2 1
-+				 0xa000 0x0 0x0 0x1 &mpic 0x3 0x1
-+				 0xa000 0x0 0x0 0x2 &mpic 0x4 0x1
-+				 0xa000 0x0 0x0 0x3 &mpic 0x1 0x1
-+				 0xa000 0x0 0x0 0x4 &mpic 0x2 0x1
- 
- 				/* IDSEL 21 */
--				 a800 0 0 1 &mpic 2 1
--				 a800 0 0 2 &mpic 3 1
--				 a800 0 0 3 &mpic 4 1
--				 a800 0 0 4 &mpic 1 1>;
-+				 0xa800 0x0 0x0 0x1 &mpic 0x2 0x1
-+				 0xa800 0x0 0x0 0x2 &mpic 0x3 0x1
-+				 0xa800 0x0 0x0 0x3 &mpic 0x4 0x1
-+				 0xa800 0x0 0x0 0x4 &mpic 0x1 0x1>;
- 
- 		interrupt-parent = <&mpic>;
--		interrupts = <18 2>;
-+		interrupts = <24 2>;
- 		bus-range = <0 0>;
--		ranges = <02000000 0 80000000 80000000 0 20000000
--			  01000000 0 00000000 e2000000 0 01000000>;
-+		ranges = <0x2000000 0x0 0x80000000 0x80000000 0x0 0x20000000
-+			  0x1000000 0x0 0x0 0xe2000000 0x0 0x1000000>;
- 	};
- };
---- a/arch/powerpc/boot/dts/mpc8568mds.dts
-+++ b/arch/powerpc/boot/dts/mpc8568mds.dts
-@@ -1,7 +1,7 @@
- /*
-  * MPC8568E MDS Device Tree Source
-  *
-- * Copyright 2007 Freescale Semiconductor Inc.
-+ * Copyright 2007, 2008 Freescale Semiconductor Inc.
-  *
-  * 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
-@@ -9,10 +9,7 @@
-  * option) any later version.
-  */
- 
--
--/*
--/memreserve/	00000000 1000000;
--*/
-+/dts-v1/;
- 
- / {
- 	model = "MPC8568EMDS";
-@@ -37,11 +34,11 @@
- 
- 		PowerPC,8568@0 {
- 			device_type = "cpu";
--			reg = <0>;
--			d-cache-line-size = <20>;	// 32 bytes
--			i-cache-line-size = <20>;	// 32 bytes
--			d-cache-size = <8000>;		// L1, 32K
--			i-cache-size = <8000>;		// L1, 32K
-+			reg = <0x0>;
-+			d-cache-line-size = <32>;	// 32 bytes
-+			i-cache-line-size = <32>;	// 32 bytes
-+			d-cache-size = <0x8000>;		// L1, 32K
-+			i-cache-size = <0x8000>;		// L1, 32K
- 			timebase-frequency = <0>;
- 			bus-frequency = <0>;
- 			clock-frequency = <0>;
-@@ -50,36 +47,36 @@
- 
- 	memory {
- 		device_type = "memory";
--		reg = <00000000 10000000>;
-+		reg = <0x0 0x10000000>;
- 	};
- 
- 	bcsr@f8000000 {
- 		device_type = "board-control";
--		reg = <f8000000 8000>;
-+		reg = <0xf8000000 0x8000>;
- 	};
- 
- 	soc8568@e0000000 {
- 		#address-cells = <1>;
- 		#size-cells = <1>;
- 		device_type = "soc";
--		ranges = <0 e0000000 00100000>;
--		reg = <e0000000 00001000>;
-+		ranges = <0x0 0xe0000000 0x100000>;
-+		reg = <0xe0000000 0x1000>;
- 		bus-frequency = <0>;
- 
- 		memory-controller@2000 {
- 			compatible = "fsl,8568-memory-controller";
--			reg = <2000 1000>;
-+			reg = <0x2000 0x1000>;
- 			interrupt-parent = <&mpic>;
--			interrupts = <12 2>;
-+			interrupts = <18 2>;
- 		};
- 
- 		l2-cache-controller@20000 {
- 			compatible = "fsl,8568-l2-cache-controller";
--			reg = <20000 1000>;
--			cache-line-size = <20>;	// 32 bytes
--			cache-size = <80000>;	// L2, 512K
-+			reg = <0x20000 0x1000>;
-+			cache-line-size = <32>;	// 32 bytes
-+			cache-size = <0x80000>;	// L2, 512K
- 			interrupt-parent = <&mpic>;
--			interrupts = <10 2>;
-+			interrupts = <16 2>;
- 		};
- 
- 		i2c@3000 {
-@@ -87,14 +84,14 @@
- 			#size-cells = <0>;
- 			cell-index = <0>;
- 			compatible = "fsl-i2c";
--			reg = <3000 100>;
--			interrupts = <2b 2>;
-+			reg = <0x3000 0x100>;
-+			interrupts = <43 2>;
- 			interrupt-parent = <&mpic>;
- 			dfsrr;
- 
- 			rtc@68 {
- 				compatible = "dallas,ds1374";
--				reg = <68>;
-+				reg = <0x68>;
- 			};
- 		};
- 
-@@ -103,8 +100,8 @@
- 			#size-cells = <0>;
- 			cell-index = <1>;
- 			compatible = "fsl-i2c";
--			reg = <3100 100>;
--			interrupts = <2b 2>;
-+			reg = <0x3100 0x100>;
-+			interrupts = <43 2>;
- 			interrupt-parent = <&mpic>;
- 			dfsrr;
- 		};
-@@ -113,30 +110,30 @@
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 			compatible = "fsl,gianfar-mdio";
--			reg = <24520 20>;
-+			reg = <0x24520 0x20>;
- 
- 			phy0: ethernet-phy@7 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <1 1>;
--				reg = <7>;
-+				reg = <0x7>;
- 				device_type = "ethernet-phy";
- 			};
- 			phy1: ethernet-phy@1 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <2 1>;
--				reg = <1>;
-+				reg = <0x1>;
- 				device_type = "ethernet-phy";
- 			};
- 			phy2: ethernet-phy@2 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <1 1>;
--				reg = <2>;
-+				reg = <0x2>;
- 				device_type = "ethernet-phy";
- 			};
- 			phy3: ethernet-phy@3 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <2 1>;
--				reg = <3>;
-+				reg = <0x3>;
- 				device_type = "ethernet-phy";
- 			};
- 		};
-@@ -146,9 +143,9 @@
- 			device_type = "network";
- 			model = "eTSEC";
- 			compatible = "gianfar";
--			reg = <24000 1000>;
-+			reg = <0x24000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
-- 			interrupts = <1d 2 1e 2 22 2>;
-+ 			interrupts = <29 2 30 2 34 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy2>;
- 		};
-@@ -158,9 +155,9 @@
- 			device_type = "network";
- 			model = "eTSEC";
- 			compatible = "gianfar";
--			reg = <25000 1000>;
-+			reg = <0x25000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
-- 			interrupts = <23 2 24 2 28 2>;
-+ 			interrupts = <35 2 36 2 40 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy3>;
- 		};
-@@ -169,15 +166,15 @@
- 			cell-index = <0>;
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <4500 100>;
-+			reg = <0x4500 0x100>;
- 			clock-frequency = <0>;
--			interrupts = <2a 2>;
-+			interrupts = <42 2>;
- 			interrupt-parent = <&mpic>;
- 		};
- 
- 		global-utilities@e0000 {	//global utilities block
- 			compatible = "fsl,mpc8548-guts";
--			reg = <e0000 1000>;
-+			reg = <0xe0000 0x1000>;
- 			fsl,has-rstcr;
- 		};
- 
-@@ -185,9 +182,9 @@
- 			cell-index = <1>;
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <4600 100>;
-+			reg = <0x4600 0x100>;
- 			clock-frequency = <0>;
--			interrupts = <2a 2>;
-+			interrupts = <42 2>;
- 			interrupt-parent = <&mpic>;
- 		};
- 
-@@ -195,13 +192,13 @@
- 			device_type = "crypto";
- 			model = "SEC2";
- 			compatible = "talitos";
--			reg = <30000 f000>;
--			interrupts = <2d 2>;
-+			reg = <0x30000 0xf000>;
-+			interrupts = <45 2>;
- 			interrupt-parent = <&mpic>;
- 			num-channels = <4>;
--			channel-fifo-len = <18>;
--			exec-units-mask = <000000fe>;
--			descriptor-types-mask = <012b0ebf>;
-+			channel-fifo-len = <24>;
-+			exec-units-mask = <0xfe>;
-+			descriptor-types-mask = <0x12b0ebf>;
- 		};
- 
- 		mpic: pic@40000 {
-@@ -209,73 +206,73 @@
- 			interrupt-controller;
- 			#address-cells = <0>;
- 			#interrupt-cells = <2>;
--			reg = <40000 40000>;
-+			reg = <0x40000 0x40000>;
- 			compatible = "chrp,open-pic";
- 			device_type = "open-pic";
-                         big-endian;
- 		};
- 
- 		par_io@e0100 {
--			reg = <e0100 100>;
-+			reg = <0xe0100 0x100>;
- 			device_type = "par_io";
- 			num-ports = <7>;
- 
- 			pio1: ucc_pin@01 {
- 				pio-map = <
- 			/* port  pin  dir  open_drain  assignment  has_irq */
--					4  0a  1  0  2  0 	/* TxD0 */
--					4  09  1  0  2  0 	/* TxD1 */
--					4  08  1  0  2  0 	/* TxD2 */
--					4  07  1  0  2  0 	/* TxD3 */
--					4  17  1  0  2  0 	/* TxD4 */
--					4  16  1  0  2  0 	/* TxD5 */
--					4  15  1  0  2  0 	/* TxD6 */
--					4  14  1  0  2  0 	/* TxD7 */
--					4  0f  2  0  2  0 	/* RxD0 */
--					4  0e  2  0  2  0 	/* RxD1 */
--					4  0d  2  0  2  0 	/* RxD2 */
--					4  0c  2  0  2  0 	/* RxD3 */
--					4  1d  2  0  2  0 	/* RxD4 */
--					4  1c  2  0  2  0 	/* RxD5 */
--					4  1b  2  0  2  0 	/* RxD6 */
--					4  1a  2  0  2  0 	/* RxD7 */
--					4  0b  1  0  2  0 	/* TX_EN */
--					4  18  1  0  2  0 	/* TX_ER */
--					4  10  2  0  2  0 	/* RX_DV */
--					4  1e  2  0  2  0 	/* RX_ER */
--					4  11  2  0  2  0 	/* RX_CLK */
--					4  13  1  0  2  0 	/* GTX_CLK */
--					1  1f  2  0  3  0>;	/* GTX125 */
-+					0x4  0xa  0x1  0x0  0x2  0x0 	/* TxD0 */
-+					0x4  0x9  0x1  0x0  0x2  0x0 	/* TxD1 */
-+					0x4  0x8  0x1  0x0  0x2  0x0 	/* TxD2 */
-+					0x4  0x7  0x1  0x0  0x2  0x0 	/* TxD3 */
-+					0x4  0x17  0x1  0x0  0x2  0x0 	/* TxD4 */
-+					0x4  0x16  0x1  0x0  0x2  0x0 	/* TxD5 */
-+					0x4  0x15  0x1  0x0  0x2  0x0 	/* TxD6 */
-+					0x4  0x14  0x1  0x0  0x2  0x0 	/* TxD7 */
-+					0x4  0xf  0x2  0x0  0x2  0x0 	/* RxD0 */
-+					0x4  0xe  0x2  0x0  0x2  0x0 	/* RxD1 */
-+					0x4  0xd  0x2  0x0  0x2  0x0 	/* RxD2 */
-+					0x4  0xc  0x2  0x0  0x2  0x0 	/* RxD3 */
-+					0x4  0x1d  0x2  0x0  0x2  0x0 	/* RxD4 */
-+					0x4  0x1c  0x2  0x0  0x2  0x0 	/* RxD5 */
-+					0x4  0x1b  0x2  0x0  0x2  0x0 	/* RxD6 */
-+					0x4  0x1a  0x2  0x0  0x2  0x0 	/* RxD7 */
-+					0x4  0xb  0x1  0x0  0x2  0x0 	/* TX_EN */
-+					0x4  0x18  0x1  0x0  0x2  0x0 	/* TX_ER */
-+					0x4  0x10  0x2  0x0  0x2  0x0 	/* RX_DV */
-+					0x4  0x1e  0x2  0x0  0x2  0x0 	/* RX_ER */
-+					0x4  0x11  0x2  0x0  0x2  0x0 	/* RX_CLK */
-+					0x4  0x13  0x1  0x0  0x2  0x0 	/* GTX_CLK */
-+					0x1  0x1f  0x2  0x0  0x3  0x0>;	/* GTX125 */
- 			};
- 
- 			pio2: ucc_pin@02 {
- 				pio-map = <
- 			/* port  pin  dir  open_drain  assignment  has_irq */
--					5  0a 1  0  2  0   /* TxD0 */
--					5  09 1  0  2  0   /* TxD1 */
--					5  08 1  0  2  0   /* TxD2 */
--					5  07 1  0  2  0   /* TxD3 */
--					5  17 1  0  2  0   /* TxD4 */
--					5  16 1  0  2  0   /* TxD5 */
--					5  15 1  0  2  0   /* TxD6 */
--					5  14 1  0  2  0   /* TxD7 */
--					5  0f 2  0  2  0   /* RxD0 */
--					5  0e 2  0  2  0   /* RxD1 */
--					5  0d 2  0  2  0   /* RxD2 */
--					5  0c 2  0  2  0   /* RxD3 */
--					5  1d 2  0  2  0   /* RxD4 */
--					5  1c 2  0  2  0   /* RxD5 */
--					5  1b 2  0  2  0   /* RxD6 */
--					5  1a 2  0  2  0   /* RxD7 */
--					5  0b 1  0  2  0   /* TX_EN */
--					5  18 1  0  2  0   /* TX_ER */
--					5  10 2  0  2  0   /* RX_DV */
--					5  1e 2  0  2  0   /* RX_ER */
--					5  11 2  0  2  0   /* RX_CLK */
--					5  13 1  0  2  0   /* GTX_CLK */
--					1  1f 2  0  3  0   /* GTX125 */
--					4  06 3  0  2  0   /* MDIO */
--					4  05 1  0  2  0>; /* MDC */
-+					0x5  0xa 0x1  0x0  0x2  0x0   /* TxD0 */
-+					0x5  0x9 0x1  0x0  0x2  0x0   /* TxD1 */
-+					0x5  0x8 0x1  0x0  0x2  0x0   /* TxD2 */
-+					0x5  0x7 0x1  0x0  0x2  0x0   /* TxD3 */
-+					0x5  0x17 0x1  0x0  0x2  0x0   /* TxD4 */
-+					0x5  0x16 0x1  0x0  0x2  0x0   /* TxD5 */
-+					0x5  0x15 0x1  0x0  0x2  0x0   /* TxD6 */
-+					0x5  0x14 0x1  0x0  0x2  0x0   /* TxD7 */
-+					0x5  0xf 0x2  0x0  0x2  0x0   /* RxD0 */
-+					0x5  0xe 0x2  0x0  0x2  0x0   /* RxD1 */
-+					0x5  0xd 0x2  0x0  0x2  0x0   /* RxD2 */
-+					0x5  0xc 0x2  0x0  0x2  0x0   /* RxD3 */
-+					0x5  0x1d 0x2  0x0  0x2  0x0   /* RxD4 */
-+					0x5  0x1c 0x2  0x0  0x2  0x0   /* RxD5 */
-+					0x5  0x1b 0x2  0x0  0x2  0x0   /* RxD6 */
-+					0x5  0x1a 0x2  0x0  0x2  0x0   /* RxD7 */
-+					0x5  0xb 0x1  0x0  0x2  0x0   /* TX_EN */
-+					0x5  0x18 0x1  0x0  0x2  0x0   /* TX_ER */
-+					0x5  0x10 0x2  0x0  0x2  0x0   /* RX_DV */
-+					0x5  0x1e 0x2  0x0  0x2  0x0   /* RX_ER */
-+					0x5  0x11 0x2  0x0  0x2  0x0   /* RX_CLK */
-+					0x5  0x13 0x1  0x0  0x2  0x0   /* GTX_CLK */
-+					0x1  0x1f 0x2  0x0  0x3  0x0   /* GTX125 */
-+					0x4  0x6 0x3  0x0  0x2  0x0   /* MDIO */
-+					0x4  0x5 0x1  0x0  0x2  0x0>; /* MDC */
- 			};
- 		};
- 	};
-@@ -285,28 +282,28 @@
- 		#size-cells = <1>;
- 		device_type = "qe";
- 		compatible = "fsl,qe";
--		ranges = <0 e0080000 00040000>;
--		reg = <e0080000 480>;
-+		ranges = <0x0 0xe0080000 0x40000>;
-+		reg = <0xe0080000 0x480>;
- 		brg-frequency = <0>;
--		bus-frequency = <179A7B00>;
-+		bus-frequency = <396000000>;
- 
- 		muram@10000 {
-  			#address-cells = <1>;
-  			#size-cells = <1>;
- 			compatible = "fsl,qe-muram", "fsl,cpm-muram";
--			ranges = <0 00010000 0000c000>;
-+			ranges = <0x0 0x10000 0x10000>;
- 
- 			data-only@0 {
- 				compatible = "fsl,qe-muram-data",
- 					     "fsl,cpm-muram-data";
--				reg = <0 c000>;
-+				reg = <0x0 0x10000>;
- 			};
- 		};
- 
- 		spi@4c0 {
- 			cell-index = <0>;
- 			compatible = "fsl,spi";
--			reg = <4c0 40>;
-+			reg = <0x4c0 0x40>;
- 			interrupts = <2>;
- 			interrupt-parent = <&qeic>;
- 			mode = "cpu";
-@@ -315,7 +312,7 @@
- 		spi@500 {
- 			cell-index = <1>;
- 			compatible = "fsl,spi";
--			reg = <500 40>;
-+			reg = <0x500 0x40>;
- 			interrupts = <1>;
- 			interrupt-parent = <&qeic>;
- 			mode = "cpu";
-@@ -324,11 +321,9 @@
- 		enet2: ucc@2000 {
- 			device_type = "network";
- 			compatible = "ucc_geth";
--			model = "UCC";
- 			cell-index = <1>;
--			device-id = <1>;
--			reg = <2000 200>;
--			interrupts = <20>;
-+			reg = <0x2000 0x200>;
-+			interrupts = <32>;
- 			interrupt-parent = <&qeic>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
- 			rx-clock-name = "none";
-@@ -341,11 +336,9 @@
- 		enet3: ucc@3000 {
- 			device_type = "network";
- 			compatible = "ucc_geth";
--			model = "UCC";
- 			cell-index = <2>;
--			device-id = <2>;
--			reg = <3000 200>;
--			interrupts = <21>;
-+			reg = <0x3000 0x200>;
-+			interrupts = <33>;
- 			interrupt-parent = <&qeic>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
- 			rx-clock-name = "none";
-@@ -358,7 +351,7 @@
- 		mdio@2120 {
- 			#address-cells = <1>;
- 			#size-cells = <0>;
--			reg = <2120 18>;
-+			reg = <0x2120 0x18>;
- 			compatible = "fsl,ucc-mdio";
- 
- 			/* These are the same PHYs as on
-@@ -366,25 +359,25 @@
- 			qe_phy0: ethernet-phy@07 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <1 1>;
--				reg = <7>;
-+				reg = <0x7>;
- 				device_type = "ethernet-phy";
- 			};
- 			qe_phy1: ethernet-phy@01 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <2 1>;
--				reg = <1>;
-+				reg = <0x1>;
- 				device_type = "ethernet-phy";
- 			};
- 			qe_phy2: ethernet-phy@02 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <1 1>;
--				reg = <2>;
-+				reg = <0x2>;
- 				device_type = "ethernet-phy";
- 			};
- 			qe_phy3: ethernet-phy@03 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <2 1>;
--				reg = <3>;
-+				reg = <0x3>;
- 				device_type = "ethernet-phy";
- 			};
- 		};
-@@ -394,9 +387,9 @@
- 			compatible = "fsl,qe-ic";
- 			#address-cells = <0>;
- 			#interrupt-cells = <1>;
--			reg = <80 80>;
-+			reg = <0x80 0x80>;
- 			big-endian;
--			interrupts = <2e 2 2e 2>; //high:30 low:30
-+			interrupts = <46 2 46 2>; //high:30 low:30
- 			interrupt-parent = <&mpic>;
- 		};
- 
-@@ -404,30 +397,30 @@
- 
- 	pci0: pci@e0008000 {
- 		cell-index = <0>;
--		interrupt-map-mask = <f800 0 0 7>;
-+		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 		interrupt-map = <
- 			/* IDSEL 0x12 AD18 */
--			9000 0 0 1 &mpic 5 1
--			9000 0 0 2 &mpic 6 1
--			9000 0 0 3 &mpic 7 1
--			9000 0 0 4 &mpic 4 1
-+			0x9000 0x0 0x0 0x1 &mpic 0x5 0x1
-+			0x9000 0x0 0x0 0x2 &mpic 0x6 0x1
-+			0x9000 0x0 0x0 0x3 &mpic 0x7 0x1
-+			0x9000 0x0 0x0 0x4 &mpic 0x4 0x1
- 
- 			/* IDSEL 0x13 AD19 */
--			9800 0 0 1 &mpic 6 1
--			9800 0 0 2 &mpic 7 1
--			9800 0 0 3 &mpic 4 1
--			9800 0 0 4 &mpic 5 1>;
-+			0x9800 0x0 0x0 0x1 &mpic 0x6 0x1
-+			0x9800 0x0 0x0 0x2 &mpic 0x7 0x1
-+			0x9800 0x0 0x0 0x3 &mpic 0x4 0x1
-+			0x9800 0x0 0x0 0x4 &mpic 0x5 0x1>;
- 
- 		interrupt-parent = <&mpic>;
--		interrupts = <18 2>;
--		bus-range = <0 ff>;
--		ranges = <02000000 0 80000000 80000000 0 20000000
--			  01000000 0 00000000 e2000000 0 00800000>;
--		clock-frequency = <3f940aa>;
-+		interrupts = <24 2>;
-+		bus-range = <0 255>;
-+		ranges = <0x2000000 0x0 0x80000000 0x80000000 0x0 0x20000000
-+			  0x1000000 0x0 0x0 0xe2000000 0x0 0x800000>;
-+		clock-frequency = <66666666>;
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		reg = <e0008000 1000>;
-+		reg = <0xe0008000 0x1000>;
- 		compatible = "fsl,mpc8540-pci";
- 		device_type = "pci";
- 	};
-@@ -435,39 +428,39 @@
- 	/* PCI Express */
- 	pci1: pcie@e000a000 {
- 		cell-index = <2>;
--		interrupt-map-mask = <f800 0 0 7>;
-+		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 		interrupt-map = <
- 
- 			/* IDSEL 0x0 (PEX) */
--			00000 0 0 1 &mpic 0 1
--			00000 0 0 2 &mpic 1 1
--			00000 0 0 3 &mpic 2 1
--			00000 0 0 4 &mpic 3 1>;
-+			00000 0x0 0x0 0x1 &mpic 0x0 0x1
-+			00000 0x0 0x0 0x2 &mpic 0x1 0x1
-+			00000 0x0 0x0 0x3 &mpic 0x2 0x1
-+			00000 0x0 0x0 0x4 &mpic 0x3 0x1>;
- 
- 		interrupt-parent = <&mpic>;
--		interrupts = <1a 2>;
--		bus-range = <0 ff>;
--		ranges = <02000000 0 a0000000 a0000000 0 10000000
--			  01000000 0 00000000 e2800000 0 00800000>;
--		clock-frequency = <1fca055>;
-+		interrupts = <26 2>;
-+		bus-range = <0 255>;
-+		ranges = <0x2000000 0x0 0xa0000000 0xa0000000 0x0 0x10000000
-+			  0x1000000 0x0 0x0 0xe2800000 0x0 0x800000>;
-+		clock-frequency = <33333333>;
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		reg = <e000a000 1000>;
-+		reg = <0xe000a000 0x1000>;
- 		compatible = "fsl,mpc8548-pcie";
- 		device_type = "pci";
- 		pcie@0 {
--			reg = <0 0 0 0 0>;
-+			reg = <0x0 0x0 0x0 0x0 0x0>;
- 			#size-cells = <2>;
- 			#address-cells = <3>;
- 			device_type = "pci";
--			ranges = <02000000 0 a0000000
--				  02000000 0 a0000000
--				  0 10000000
--
--				  01000000 0 00000000
--				  01000000 0 00000000
--				  0 00800000>;
-+			ranges = <0x2000000 0x0 0xa0000000
-+				  0x2000000 0x0 0xa0000000
-+				  0x0 0x10000000
-+
-+				  0x1000000 0x0 0x0
-+				  0x1000000 0x0 0x0
-+				  0x0 0x800000>;
- 		};
- 	};
- };
---- a/arch/powerpc/boot/dts/mpc8572ds.dts
-+++ b/arch/powerpc/boot/dts/mpc8572ds.dts
-@@ -1,7 +1,7 @@
- /*
-  * MPC8572 DS Device Tree Source
-  *
-- * Copyright 2007 Freescale Semiconductor Inc.
-+ * Copyright 2007, 2008 Freescale Semiconductor Inc.
-  *
-  * 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
-@@ -9,6 +9,7 @@
-  * option) any later version.
-  */
- 
-+/dts-v1/;
- / {
- 	model = "fsl,MPC8572DS";
- 	compatible = "fsl,MPC8572DS";
-@@ -33,11 +34,11 @@
- 
- 		PowerPC,8572@0 {
- 			device_type = "cpu";
--			reg = <0>;
--			d-cache-line-size = <20>;	// 32 bytes
--			i-cache-line-size = <20>;	// 32 bytes
--			d-cache-size = <8000>;		// L1, 32K
--			i-cache-size = <8000>;		// L1, 32K
-+			reg = <0x0>;
-+			d-cache-line-size = <32>;	// 32 bytes
-+			i-cache-line-size = <32>;	// 32 bytes
-+			d-cache-size = <0x8000>;		// L1, 32K
-+			i-cache-size = <0x8000>;		// L1, 32K
- 			timebase-frequency = <0>;
- 			bus-frequency = <0>;
- 			clock-frequency = <0>;
-@@ -45,11 +46,11 @@
- 
- 		PowerPC,8572@1 {
- 			device_type = "cpu";
--			reg = <1>;
--			d-cache-line-size = <20>;	// 32 bytes
--			i-cache-line-size = <20>;	// 32 bytes
--			d-cache-size = <8000>;		// L1, 32K
--			i-cache-size = <8000>;		// L1, 32K
-+			reg = <0x1>;
-+			d-cache-line-size = <32>;	// 32 bytes
-+			i-cache-line-size = <32>;	// 32 bytes
-+			d-cache-size = <0x8000>;		// L1, 32K
-+			i-cache-size = <0x8000>;		// L1, 32K
- 			timebase-frequency = <0>;
- 			bus-frequency = <0>;
- 			clock-frequency = <0>;
-@@ -58,38 +59,38 @@
- 
- 	memory {
- 		device_type = "memory";
--		reg = <00000000 00000000>;	// Filled by U-Boot
-+		reg = <0x0 0x0>;	// Filled by U-Boot
- 	};
- 
- 	soc8572@ffe00000 {
- 		#address-cells = <1>;
- 		#size-cells = <1>;
- 		device_type = "soc";
--		ranges = <00000000 ffe00000 00100000>;
--		reg = <ffe00000 00001000>;	// CCSRBAR & soc regs, remove once parse code for immrbase fixed
-+		ranges = <0x0 0xffe00000 0x100000>;
-+		reg = <0xffe00000 0x1000>;	// CCSRBAR & soc regs, remove once parse code for immrbase fixed
- 		bus-frequency = <0>;		// Filled out by uboot.
- 
- 		memory-controller@2000 {
- 			compatible = "fsl,mpc8572-memory-controller";
--			reg = <2000 1000>;
-+			reg = <0x2000 0x1000>;
- 			interrupt-parent = <&mpic>;
--			interrupts = <12 2>;
-+			interrupts = <18 2>;
- 		};
- 
- 		memory-controller@6000 {
- 			compatible = "fsl,mpc8572-memory-controller";
--			reg = <6000 1000>;
-+			reg = <0x6000 0x1000>;
- 			interrupt-parent = <&mpic>;
--			interrupts = <12 2>;
-+			interrupts = <18 2>;
- 		};
- 
- 		l2-cache-controller@20000 {
- 			compatible = "fsl,mpc8572-l2-cache-controller";
--			reg = <20000 1000>;
--			cache-line-size = <20>;	// 32 bytes
--			cache-size = <80000>;	// L2, 512K
-+			reg = <0x20000 0x1000>;
-+			cache-line-size = <32>;	// 32 bytes
-+			cache-size = <0x80000>;	// L2, 512K
- 			interrupt-parent = <&mpic>;
--			interrupts = <10 2>;
-+			interrupts = <16 2>;
- 		};
- 
- 		i2c@3000 {
-@@ -97,8 +98,8 @@
- 			#size-cells = <0>;
- 			cell-index = <0>;
- 			compatible = "fsl-i2c";
--			reg = <3000 100>;
--			interrupts = <2b 2>;
-+			reg = <0x3000 0x100>;
-+			interrupts = <43 2>;
- 			interrupt-parent = <&mpic>;
- 			dfsrr;
- 		};
-@@ -108,8 +109,8 @@
- 			#size-cells = <0>;
- 			cell-index = <1>;
- 			compatible = "fsl-i2c";
--			reg = <3100 100>;
--			interrupts = <2b 2>;
-+			reg = <0x3100 0x100>;
-+			interrupts = <43 2>;
- 			interrupt-parent = <&mpic>;
- 			dfsrr;
- 		};
-@@ -118,27 +119,27 @@
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 			compatible = "fsl,gianfar-mdio";
--			reg = <24520 20>;
-+			reg = <0x24520 0x20>;
- 
- 			phy0: ethernet-phy@0 {
- 				interrupt-parent = <&mpic>;
--				interrupts = <a 1>;
--				reg = <0>;
-+				interrupts = <10 1>;
-+				reg = <0x0>;
- 			};
- 			phy1: ethernet-phy@1 {
- 				interrupt-parent = <&mpic>;
--				interrupts = <a 1>;
--				reg = <1>;
-+				interrupts = <10 1>;
-+				reg = <0x1>;
- 			};
- 			phy2: ethernet-phy@2 {
- 				interrupt-parent = <&mpic>;
--				interrupts = <a 1>;
--				reg = <2>;
-+				interrupts = <10 1>;
-+				reg = <0x2>;
- 			};
- 			phy3: ethernet-phy@3 {
- 				interrupt-parent = <&mpic>;
--				interrupts = <a 1>;
--				reg = <3>;
-+				interrupts = <10 1>;
-+				reg = <0x3>;
- 			};
- 		};
- 
-@@ -147,9 +148,9 @@
- 			device_type = "network";
- 			model = "eTSEC";
- 			compatible = "gianfar";
--			reg = <24000 1000>;
-+			reg = <0x24000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <1d 2 1e 2 22 2>;
-+			interrupts = <29 2 30 2 34 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy0>;
- 			phy-connection-type = "rgmii-id";
-@@ -160,9 +161,9 @@
- 			device_type = "network";
- 			model = "eTSEC";
- 			compatible = "gianfar";
--			reg = <25000 1000>;
-+			reg = <0x25000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <23 2 24 2 28 2>;
-+			interrupts = <35 2 36 2 40 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy1>;
- 			phy-connection-type = "rgmii-id";
-@@ -173,9 +174,9 @@
- 			device_type = "network";
- 			model = "eTSEC";
- 			compatible = "gianfar";
--			reg = <26000 1000>;
-+			reg = <0x26000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <1f 2 20 2 21 2>;
-+			interrupts = <31 2 32 2 33 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy2>;
- 			phy-connection-type = "rgmii-id";
-@@ -186,9 +187,9 @@
- 			device_type = "network";
- 			model = "eTSEC";
- 			compatible = "gianfar";
--			reg = <27000 1000>;
-+			reg = <0x27000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <25 2 26 2 27 2>;
-+			interrupts = <37 2 38 2 39 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy3>;
- 			phy-connection-type = "rgmii-id";
-@@ -198,9 +199,9 @@
- 			cell-index = <0>;
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <4500 100>;
-+			reg = <0x4500 0x100>;
- 			clock-frequency = <0>;
--			interrupts = <2a 2>;
-+			interrupts = <42 2>;
- 			interrupt-parent = <&mpic>;
- 		};
- 
-@@ -208,15 +209,15 @@
- 			cell-index = <1>;
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <4600 100>;
-+			reg = <0x4600 0x100>;
- 			clock-frequency = <0>;
--			interrupts = <2a 2>;
-+			interrupts = <42 2>;
- 			interrupt-parent = <&mpic>;
- 		};
- 
- 		global-utilities@e0000 {	//global utilities block
- 			compatible = "fsl,mpc8572-guts";
--			reg = <e0000 1000>;
-+			reg = <0xe0000 0x1000>;
- 			fsl,has-rstcr;
- 		};
- 
-@@ -225,7 +226,7 @@
- 			interrupt-controller;
- 			#address-cells = <0>;
- 			#interrupt-cells = <2>;
--			reg = <40000 40000>;
-+			reg = <0x40000 0x40000>;
- 			compatible = "chrp,open-pic";
- 			device_type = "open-pic";
- 			big-endian;
-@@ -239,167 +240,167 @@
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		reg = <ffe08000 1000>;
--		bus-range = <0 ff>;
--		ranges = <02000000 0 80000000 80000000 0 20000000
--			  01000000 0 00000000 ffc00000 0 00010000>;
--		clock-frequency = <1fca055>;
-+		reg = <0xffe08000 0x1000>;
-+		bus-range = <0 255>;
-+		ranges = <0x2000000 0x0 0x80000000 0x80000000 0x0 0x20000000
-+			  0x1000000 0x0 0x0 0xffc00000 0x0 0x10000>;
-+		clock-frequency = <33333333>;
- 		interrupt-parent = <&mpic>;
--		interrupts = <18 2>;
--		interrupt-map-mask = <ff00 0 0 7>;
-+		interrupts = <24 2>;
-+		interrupt-map-mask = <0xff00 0x0 0x0 0x7>;
- 		interrupt-map = <
- 			/* IDSEL 0x11 func 0 - PCI slot 1 */
--			8800 0 0 1 &mpic 2 1
--			8800 0 0 2 &mpic 3 1
--			8800 0 0 3 &mpic 4 1
--			8800 0 0 4 &mpic 1 1
-+			0x8800 0x0 0x0 0x1 &mpic 0x2 0x1
-+			0x8800 0x0 0x0 0x2 &mpic 0x3 0x1
-+			0x8800 0x0 0x0 0x3 &mpic 0x4 0x1
-+			0x8800 0x0 0x0 0x4 &mpic 0x1 0x1
- 
- 			/* IDSEL 0x11 func 1 - PCI slot 1 */
--			8900 0 0 1 &mpic 2 1
--			8900 0 0 2 &mpic 3 1
--			8900 0 0 3 &mpic 4 1
--			8900 0 0 4 &mpic 1 1
-+			0x8900 0x0 0x0 0x1 &mpic 0x2 0x1
-+			0x8900 0x0 0x0 0x2 &mpic 0x3 0x1
-+			0x8900 0x0 0x0 0x3 &mpic 0x4 0x1
-+			0x8900 0x0 0x0 0x4 &mpic 0x1 0x1
- 
- 			/* IDSEL 0x11 func 2 - PCI slot 1 */
--			8a00 0 0 1 &mpic 2 1
--			8a00 0 0 2 &mpic 3 1
--			8a00 0 0 3 &mpic 4 1
--			8a00 0 0 4 &mpic 1 1
-+			0x8a00 0x0 0x0 0x1 &mpic 0x2 0x1
-+			0x8a00 0x0 0x0 0x2 &mpic 0x3 0x1
-+			0x8a00 0x0 0x0 0x3 &mpic 0x4 0x1
-+			0x8a00 0x0 0x0 0x4 &mpic 0x1 0x1
- 
- 			/* IDSEL 0x11 func 3 - PCI slot 1 */
--			8b00 0 0 1 &mpic 2 1
--			8b00 0 0 2 &mpic 3 1
--			8b00 0 0 3 &mpic 4 1
--			8b00 0 0 4 &mpic 1 1
-+			0x8b00 0x0 0x0 0x1 &mpic 0x2 0x1
-+			0x8b00 0x0 0x0 0x2 &mpic 0x3 0x1
-+			0x8b00 0x0 0x0 0x3 &mpic 0x4 0x1
-+			0x8b00 0x0 0x0 0x4 &mpic 0x1 0x1
- 
- 			/* IDSEL 0x11 func 4 - PCI slot 1 */
--			8c00 0 0 1 &mpic 2 1
--			8c00 0 0 2 &mpic 3 1
--			8c00 0 0 3 &mpic 4 1
--			8c00 0 0 4 &mpic 1 1
-+			0x8c00 0x0 0x0 0x1 &mpic 0x2 0x1
-+			0x8c00 0x0 0x0 0x2 &mpic 0x3 0x1
-+			0x8c00 0x0 0x0 0x3 &mpic 0x4 0x1
-+			0x8c00 0x0 0x0 0x4 &mpic 0x1 0x1
- 
- 			/* IDSEL 0x11 func 5 - PCI slot 1 */
--			8d00 0 0 1 &mpic 2 1
--			8d00 0 0 2 &mpic 3 1
--			8d00 0 0 3 &mpic 4 1
--			8d00 0 0 4 &mpic 1 1
-+			0x8d00 0x0 0x0 0x1 &mpic 0x2 0x1
-+			0x8d00 0x0 0x0 0x2 &mpic 0x3 0x1
-+			0x8d00 0x0 0x0 0x3 &mpic 0x4 0x1
-+			0x8d00 0x0 0x0 0x4 &mpic 0x1 0x1
- 
- 			/* IDSEL 0x11 func 6 - PCI slot 1 */
--			8e00 0 0 1 &mpic 2 1
--			8e00 0 0 2 &mpic 3 1
--			8e00 0 0 3 &mpic 4 1
--			8e00 0 0 4 &mpic 1 1
-+			0x8e00 0x0 0x0 0x1 &mpic 0x2 0x1
-+			0x8e00 0x0 0x0 0x2 &mpic 0x3 0x1
-+			0x8e00 0x0 0x0 0x3 &mpic 0x4 0x1
-+			0x8e00 0x0 0x0 0x4 &mpic 0x1 0x1
- 
- 			/* IDSEL 0x11 func 7 - PCI slot 1 */
--			8f00 0 0 1 &mpic 2 1
--			8f00 0 0 2 &mpic 3 1
--			8f00 0 0 3 &mpic 4 1
--			8f00 0 0 4 &mpic 1 1
-+			0x8f00 0x0 0x0 0x1 &mpic 0x2 0x1
-+			0x8f00 0x0 0x0 0x2 &mpic 0x3 0x1
-+			0x8f00 0x0 0x0 0x3 &mpic 0x4 0x1
-+			0x8f00 0x0 0x0 0x4 &mpic 0x1 0x1
- 
- 			/* IDSEL 0x12 func 0 - PCI slot 2 */
--			9000 0 0 1 &mpic 3 1
--			9000 0 0 2 &mpic 4 1
--			9000 0 0 3 &mpic 1 1
--			9000 0 0 4 &mpic 2 1
-+			0x9000 0x0 0x0 0x1 &mpic 0x3 0x1
-+			0x9000 0x0 0x0 0x2 &mpic 0x4 0x1
-+			0x9000 0x0 0x0 0x3 &mpic 0x1 0x1
-+			0x9000 0x0 0x0 0x4 &mpic 0x2 0x1
- 
- 			/* IDSEL 0x12 func 1 - PCI slot 2 */
--			9100 0 0 1 &mpic 3 1
--			9100 0 0 2 &mpic 4 1
--			9100 0 0 3 &mpic 1 1
--			9100 0 0 4 &mpic 2 1
-+			0x9100 0x0 0x0 0x1 &mpic 0x3 0x1
-+			0x9100 0x0 0x0 0x2 &mpic 0x4 0x1
-+			0x9100 0x0 0x0 0x3 &mpic 0x1 0x1
-+			0x9100 0x0 0x0 0x4 &mpic 0x2 0x1
- 
- 			/* IDSEL 0x12 func 2 - PCI slot 2 */
--			9200 0 0 1 &mpic 3 1
--			9200 0 0 2 &mpic 4 1
--			9200 0 0 3 &mpic 1 1
--			9200 0 0 4 &mpic 2 1
-+			0x9200 0x0 0x0 0x1 &mpic 0x3 0x1
-+			0x9200 0x0 0x0 0x2 &mpic 0x4 0x1
-+			0x9200 0x0 0x0 0x3 &mpic 0x1 0x1
-+			0x9200 0x0 0x0 0x4 &mpic 0x2 0x1
- 
- 			/* IDSEL 0x12 func 3 - PCI slot 2 */
--			9300 0 0 1 &mpic 3 1
--			9300 0 0 2 &mpic 4 1
--			9300 0 0 3 &mpic 1 1
--			9300 0 0 4 &mpic 2 1
-+			0x9300 0x0 0x0 0x1 &mpic 0x3 0x1
-+			0x9300 0x0 0x0 0x2 &mpic 0x4 0x1
-+			0x9300 0x0 0x0 0x3 &mpic 0x1 0x1
-+			0x9300 0x0 0x0 0x4 &mpic 0x2 0x1
- 
- 			/* IDSEL 0x12 func 4 - PCI slot 2 */
--			9400 0 0 1 &mpic 3 1
--			9400 0 0 2 &mpic 4 1
--			9400 0 0 3 &mpic 1 1
--			9400 0 0 4 &mpic 2 1
-+			0x9400 0x0 0x0 0x1 &mpic 0x3 0x1
-+			0x9400 0x0 0x0 0x2 &mpic 0x4 0x1
-+			0x9400 0x0 0x0 0x3 &mpic 0x1 0x1
-+			0x9400 0x0 0x0 0x4 &mpic 0x2 0x1
- 
- 			/* IDSEL 0x12 func 5 - PCI slot 2 */
--			9500 0 0 1 &mpic 3 1
--			9500 0 0 2 &mpic 4 1
--			9500 0 0 3 &mpic 1 1
--			9500 0 0 4 &mpic 2 1
-+			0x9500 0x0 0x0 0x1 &mpic 0x3 0x1
-+			0x9500 0x0 0x0 0x2 &mpic 0x4 0x1
-+			0x9500 0x0 0x0 0x3 &mpic 0x1 0x1
-+			0x9500 0x0 0x0 0x4 &mpic 0x2 0x1
- 
- 			/* IDSEL 0x12 func 6 - PCI slot 2 */
--			9600 0 0 1 &mpic 3 1
--			9600 0 0 2 &mpic 4 1
--			9600 0 0 3 &mpic 1 1
--			9600 0 0 4 &mpic 2 1
-+			0x9600 0x0 0x0 0x1 &mpic 0x3 0x1
-+			0x9600 0x0 0x0 0x2 &mpic 0x4 0x1
-+			0x9600 0x0 0x0 0x3 &mpic 0x1 0x1
-+			0x9600 0x0 0x0 0x4 &mpic 0x2 0x1
- 
- 			/* IDSEL 0x12 func 7 - PCI slot 2 */
--			9700 0 0 1 &mpic 3 1
--			9700 0 0 2 &mpic 4 1
--			9700 0 0 3 &mpic 1 1
--			9700 0 0 4 &mpic 2 1
-+			0x9700 0x0 0x0 0x1 &mpic 0x3 0x1
-+			0x9700 0x0 0x0 0x2 &mpic 0x4 0x1
-+			0x9700 0x0 0x0 0x3 &mpic 0x1 0x1
-+			0x9700 0x0 0x0 0x4 &mpic 0x2 0x1
- 
- 			// IDSEL 0x1c  USB
--			e000 0 0 1 &i8259 c 2
--			e100 0 0 2 &i8259 9 2
--			e200 0 0 3 &i8259 a 2
--			e300 0 0 4 &i8259 b 2
-+			0xe000 0x0 0x0 0x1 &i8259 0xc 0x2
-+			0xe100 0x0 0x0 0x2 &i8259 0x9 0x2
-+			0xe200 0x0 0x0 0x3 &i8259 0xa 0x2
-+			0xe300 0x0 0x0 0x4 &i8259 0xb 0x2
- 
- 			// IDSEL 0x1d  Audio
--			e800 0 0 1 &i8259 6 2
-+			0xe800 0x0 0x0 0x1 &i8259 0x6 0x2
- 
- 			// IDSEL 0x1e Legacy
--			f000 0 0 1 &i8259 7 2
--			f100 0 0 1 &i8259 7 2
-+			0xf000 0x0 0x0 0x1 &i8259 0x7 0x2
-+			0xf100 0x0 0x0 0x1 &i8259 0x7 0x2
- 
- 			// IDSEL 0x1f IDE/SATA
--			f800 0 0 1 &i8259 e 2
--			f900 0 0 1 &i8259 5 2
-+			0xf800 0x0 0x0 0x1 &i8259 0xe 0x2
-+			0xf900 0x0 0x0 0x1 &i8259 0x5 0x2
- 
- 			>;
- 
- 		pcie@0 {
--			reg = <0 0 0 0 0>;
-+			reg = <0x0 0x0 0x0 0x0 0x0>;
- 			#size-cells = <2>;
- 			#address-cells = <3>;
- 			device_type = "pci";
--			ranges = <02000000 0 80000000
--				  02000000 0 80000000
--				  0 20000000
--
--				  01000000 0 00000000
--				  01000000 0 00000000
--				  0 00100000>;
-+			ranges = <0x2000000 0x0 0x80000000
-+				  0x2000000 0x0 0x80000000
-+				  0x0 0x20000000
-+
-+				  0x1000000 0x0 0x0
-+				  0x1000000 0x0 0x0
-+				  0x0 0x100000>;
- 			uli1575@0 {
--				reg = <0 0 0 0 0>;
-+				reg = <0x0 0x0 0x0 0x0 0x0>;
- 				#size-cells = <2>;
- 				#address-cells = <3>;
--				ranges = <02000000 0 80000000
--					  02000000 0 80000000
--					  0 20000000
--
--					  01000000 0 00000000
--					  01000000 0 00000000
--					  0 00100000>;
-+				ranges = <0x2000000 0x0 0x80000000
-+					  0x2000000 0x0 0x80000000
-+					  0x0 0x20000000
-+
-+					  0x1000000 0x0 0x0
-+					  0x1000000 0x0 0x0
-+					  0x0 0x100000>;
- 				isa@1e {
- 					device_type = "isa";
- 					#interrupt-cells = <2>;
- 					#size-cells = <1>;
- 					#address-cells = <2>;
--					reg = <f000 0 0 0 0>;
--					ranges = <1 0 01000000 0 0
--						  00001000>;
-+					reg = <0xf000 0x0 0x0 0x0 0x0>;
-+					ranges = <0x1 0x0 0x1000000 0x0 0x0
-+						  0x1000>;
- 					interrupt-parent = <&i8259>;
- 
- 					i8259: interrupt-controller@20 {
--						reg = <1 20 2
--						       1 a0 2
--						       1 4d0 2>;
-+						reg = <0x1 0x20 0x2
-+						       0x1 0xa0 0x2
-+						       0x1 0x4d0 0x2>;
- 						interrupt-controller;
- 						device_type = "interrupt-controller";
- 						#address-cells = <0>;
-@@ -412,29 +413,29 @@
- 					i8042@60 {
- 						#size-cells = <0>;
- 						#address-cells = <1>;
--						reg = <1 60 1 1 64 1>;
--						interrupts = <1 3 c 3>;
-+						reg = <0x1 0x60 0x1 0x1 0x64 0x1>;
-+						interrupts = <1 3 12 3>;
- 						interrupt-parent =
- 							<&i8259>;
- 
- 						keyboard@0 {
--							reg = <0>;
-+							reg = <0x0>;
- 							compatible = "pnpPNP,303";
- 						};
- 
- 						mouse@1 {
--							reg = <1>;
-+							reg = <0x1>;
- 							compatible = "pnpPNP,f03";
- 						};
- 					};
- 
- 					rtc@70 {
- 						compatible = "pnpPNP,b00";
--						reg = <1 70 2>;
-+						reg = <0x1 0x70 0x2>;
- 					};
- 
- 					gpio@400 {
--						reg = <1 400 80>;
-+						reg = <0x1 0x400 0x80>;
- 					};
- 				};
- 			};
-@@ -449,33 +450,33 @@
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		reg = <ffe09000 1000>;
--		bus-range = <0 ff>;
--		ranges = <02000000 0 a0000000 a0000000 0 20000000
--			  01000000 0 00000000 ffc10000 0 00010000>;
--		clock-frequency = <1fca055>;
-+		reg = <0xffe09000 0x1000>;
-+		bus-range = <0 255>;
-+		ranges = <0x2000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000
-+			  0x1000000 0x0 0x0 0xffc10000 0x0 0x10000>;
-+		clock-frequency = <33333333>;
- 		interrupt-parent = <&mpic>;
--		interrupts = <1a 2>;
--		interrupt-map-mask = <f800 0 0 7>;
-+		interrupts = <26 2>;
-+		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 		interrupt-map = <
- 			/* IDSEL 0x0 */
--			0000 0 0 1 &mpic 4 1
--			0000 0 0 2 &mpic 5 1
--			0000 0 0 3 &mpic 6 1
--			0000 0 0 4 &mpic 7 1
-+			0000 0x0 0x0 0x1 &mpic 0x4 0x1
-+			0000 0x0 0x0 0x2 &mpic 0x5 0x1
-+			0000 0x0 0x0 0x3 &mpic 0x6 0x1
-+			0000 0x0 0x0 0x4 &mpic 0x7 0x1
- 			>;
- 		pcie@0 {
--			reg = <0 0 0 0 0>;
-+			reg = <0x0 0x0 0x0 0x0 0x0>;
- 			#size-cells = <2>;
- 			#address-cells = <3>;
- 			device_type = "pci";
--			ranges = <02000000 0 a0000000
--				  02000000 0 a0000000
--				  0 20000000
--
--				  01000000 0 00000000
--				  01000000 0 00000000
--				  0 00100000>;
-+			ranges = <0x2000000 0x0 0xa0000000
-+				  0x2000000 0x0 0xa0000000
-+				  0x0 0x20000000
-+
-+				  0x1000000 0x0 0x0
-+				  0x1000000 0x0 0x0
-+				  0x0 0x100000>;
- 		};
- 	};
- 
-@@ -486,33 +487,33 @@
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		reg = <ffe0a000 1000>;
--		bus-range = <0 ff>;
--		ranges = <02000000 0 c0000000 c0000000 0 20000000
--			  01000000 0 00000000 ffc20000 0 00010000>;
--		clock-frequency = <1fca055>;
-+		reg = <0xffe0a000 0x1000>;
-+		bus-range = <0 255>;
-+		ranges = <0x2000000 0x0 0xc0000000 0xc0000000 0x0 0x20000000
-+			  0x1000000 0x0 0x0 0xffc20000 0x0 0x10000>;
-+		clock-frequency = <33333333>;
- 		interrupt-parent = <&mpic>;
--		interrupts = <1b 2>;
--		interrupt-map-mask = <f800 0 0 7>;
-+		interrupts = <27 2>;
-+		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 		interrupt-map = <
- 			/* IDSEL 0x0 */
--			0000 0 0 1 &mpic 0 1
--			0000 0 0 2 &mpic 1 1
--			0000 0 0 3 &mpic 2 1
--			0000 0 0 4 &mpic 3 1
-+			0000 0x0 0x0 0x1 &mpic 0x0 0x1
-+			0000 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0000 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0000 0x0 0x0 0x4 &mpic 0x3 0x1
- 			>;
- 		pcie@0 {
--			reg = <0 0 0 0 0>;
-+			reg = <0x0 0x0 0x0 0x0 0x0>;
- 			#size-cells = <2>;
- 			#address-cells = <3>;
- 			device_type = "pci";
--			ranges = <02000000 0 c0000000
--				  02000000 0 c0000000
--				  0 20000000
--
--				  01000000 0 00000000
--				  01000000 0 00000000
--				  0 00100000>;
-+			ranges = <0x2000000 0x0 0xc0000000
-+				  0x2000000 0x0 0xc0000000
-+				  0x0 0x20000000
-+
-+				  0x1000000 0x0 0x0
-+				  0x1000000 0x0 0x0
-+				  0x0 0x100000>;
- 		};
- 	};
- };
---- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
-+++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
-@@ -13,7 +13,7 @@
- 
- / {
- 	model = "MPC8641HPCN";
--	compatible = "mpc86xx";
-+	compatible = "fsl,mpc8641hpcn";
- 	#address-cells = <1>;
- 	#size-cells = <1>;
- 
---- a/arch/powerpc/boot/dts/mpc866ads.dts
-+++ b/arch/powerpc/boot/dts/mpc866ads.dts
-@@ -2,6 +2,7 @@
-  * MPC866 ADS Device Tree Source
-  *
-  * Copyright 2006 MontaVista Software, Inc.
-+ * Copyright 2008 Freescale Semiconductor, Inc.
-  *
-  * 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
-@@ -9,6 +10,7 @@
-  * option) any later version.
-  */
- 
-+/dts-v1/;
- 
- / {
- 	model = "MPC866ADS";
-@@ -22,37 +24,37 @@
- 
- 		PowerPC,866@0 {
- 			device_type = "cpu";
--			reg = <0>;
--			d-cache-line-size = <10>;	// 16 bytes
--			i-cache-line-size = <10>;	// 16 bytes
--			d-cache-size = <2000>;		// L1, 8K
--			i-cache-size = <4000>;		// L1, 16K
-+			reg = <0x0>;
-+			d-cache-line-size = <16>;	// 16 bytes
-+			i-cache-line-size = <16>;	// 16 bytes
-+			d-cache-size = <0x2000>;		// L1, 8K
-+			i-cache-size = <0x4000>;		// L1, 16K
- 			timebase-frequency = <0>;
- 			bus-frequency = <0>;
- 			clock-frequency = <0>;
--			interrupts = <f 2>;	// decrementer interrupt
-+			interrupts = <15 2>;	// decrementer interrupt
- 			interrupt-parent = <&PIC>;
- 		};
- 	};
- 
- 	memory {
- 		device_type = "memory";
--		reg = <00000000 800000>;
-+		reg = <0x0 0x800000>;
- 	};
- 
- 	localbus@ff000100 {
- 		compatible = "fsl,mpc866-localbus", "fsl,pq1-localbus";
- 		#address-cells = <2>;
- 		#size-cells = <1>;
--		reg = <ff000100 40>;
-+		reg = <0xff000100 0x40>;
- 
- 		ranges = <
--			1 0 ff080000 00008000
--			5 0 ff0a0000 00008000
-+			0x1 0x0 0xff080000 0x8000
-+			0x5 0x0 0xff0a0000 0x8000
- 		>;
- 
- 		board-control@1,0 {
--			reg = <1 0 20 5 300 4>;
-+			reg = <0x1 0x0 0x20 0x5 0x300 0x4>;
- 			compatible = "fsl,mpc866ads-bcsr";
- 		};
- 	};
-@@ -61,17 +63,17 @@
- 		#address-cells = <1>;
- 		#size-cells = <1>;
- 		device_type = "soc";
--		ranges = <0 ff000000 00100000>;
--		reg = <ff000000 00000200>;
-+		ranges = <0x0 0xff000000 0x100000>;
-+		reg = <0xff000000 0x200>;
- 		bus-frequency = <0>;
- 
- 		mdio@e00 {
- 			compatible = "fsl,mpc866-fec-mdio", "fsl,pq1-fec-mdio";
--			reg = <e00 188>;
-+			reg = <0xe00 0x188>;
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 			PHY: ethernet-phy@f {
--				reg = <f>;
-+				reg = <0xf>;
- 				device_type = "ethernet-phy";
- 			};
- 		};
-@@ -80,7 +82,7 @@
- 			device_type = "network";
- 			compatible = "fsl,mpc866-fec-enet",
- 			             "fsl,pq1-fec-enet";
--			reg = <e00 188>;
-+			reg = <0xe00 0x188>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
- 			interrupts = <3 1>;
- 			interrupt-parent = <&PIC>;
-@@ -91,7 +93,7 @@
- 		PIC: pic@0 {
- 			interrupt-controller;
- 			#interrupt-cells = <2>;
--			reg = <0 24>;
-+			reg = <0x0 0x24>;
- 			compatible = "fsl,mpc866-pic", "fsl,pq1-pic";
- 		};
- 
-@@ -100,7 +102,7 @@
- 			#size-cells = <1>;
- 			compatible = "fsl,mpc866-cpm", "fsl,cpm1";
- 			ranges;
--			reg = <9c0 40>;
-+			reg = <0x9c0 0x40>;
- 			brg-frequency = <0>;
- 			interrupts = <0 2>;	// cpm error interrupt
- 			interrupt-parent = <&CPM_PIC>;
-@@ -108,11 +110,11 @@
- 			muram@2000 {
- 				#address-cells = <1>;
- 				#size-cells = <1>;
--				ranges = <0 2000 2000>;
-+				ranges = <0x0 0x2000 0x2000>;
- 
- 				data@0 {
- 					compatible = "fsl,cpm-muram-data";
--					reg = <0 1c00>;
-+					reg = <0x0 0x1c00>;
- 				};
- 			};
- 
-@@ -120,7 +122,7 @@
- 				compatible = "fsl,mpc866-brg",
- 					     "fsl,cpm1-brg",
- 					     "fsl,cpm-brg";
--				reg = <9f0 10>;
-+				reg = <0x9f0 0x10>;
- 				clock-frequency = <0>;
- 			};
- 
-@@ -130,7 +132,7 @@
- 				#interrupt-cells = <1>;
- 				interrupts = <5 2 0 2>;
- 				interrupt-parent = <&PIC>;
--				reg = <930 20>;
-+				reg = <0x930 0x20>;
- 				compatible = "fsl,mpc866-cpm-pic",
- 				             "fsl,cpm1-pic";
- 			};
-@@ -140,31 +142,31 @@
- 				device_type = "serial";
- 				compatible = "fsl,mpc866-smc-uart",
- 				             "fsl,cpm1-smc-uart";
--				reg = <a80 10 3e80 40>;
-+				reg = <0xa80 0x10 0x3e80 0x40>;
- 				interrupts = <4>;
- 				interrupt-parent = <&CPM_PIC>;
- 				fsl,cpm-brg = <1>;
--				fsl,cpm-command = <0090>;
-+				fsl,cpm-command = <0x90>;
- 			};
- 
- 			serial@a90 {
- 				device_type = "serial";
- 				compatible = "fsl,mpc866-smc-uart",
- 				             "fsl,cpm1-smc-uart";
--				reg = <a90 10 3f80 40>;
-+				reg = <0xa90 0x10 0x3f80 0x40>;
- 				interrupts = <3>;
- 				interrupt-parent = <&CPM_PIC>;
- 				fsl,cpm-brg = <2>;
--				fsl,cpm-command = <00d0>;
-+				fsl,cpm-command = <0xd0>;
- 			};
- 
- 			ethernet@a00 {
- 				device_type = "network";
- 				compatible = "fsl,mpc866-scc-enet",
- 				             "fsl,cpm1-scc-enet";
--				reg = <a00 18 3c00 100>;
-+				reg = <0xa00 0x18 0x3c00 0x100>;
- 				local-mac-address = [ 00 00 00 00 00 00 ];
--				interrupts = <1e>;
-+				interrupts = <30>;
- 				interrupt-parent = <&CPM_PIC>;
- 				fsl,cpm-command = <0000>;
- 				linux,network-index = <1>;
---- a/arch/powerpc/boot/dts/mpc885ads.dts
-+++ b/arch/powerpc/boot/dts/mpc885ads.dts
-@@ -2,7 +2,7 @@
-  * MPC885 ADS Device Tree Source
-  *
-  * Copyright 2006 MontaVista Software, Inc.
-- * Copyright 2007 Freescale Semiconductor, Inc.
-+ * Copyright 2007,2008 Freescale Semiconductor, Inc.
-  *
-  * 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
-@@ -10,6 +10,7 @@
-  * option) any later version.
-  */
- 
-+/dts-v1/;
- 
- / {
- 	model = "MPC885ADS";
-@@ -23,45 +24,45 @@
- 
- 		PowerPC,885@0 {
- 			device_type = "cpu";
--			reg = <0>;
--			d-cache-line-size = <d#16>;
--			i-cache-line-size = <d#16>;
--			d-cache-size = <d#8192>;
--			i-cache-size = <d#8192>;
-+			reg = <0x0>;
-+			d-cache-line-size = <16>;
-+			i-cache-line-size = <16>;
-+			d-cache-size = <8192>;
-+			i-cache-size = <8192>;
- 			timebase-frequency = <0>;
- 			bus-frequency = <0>;
- 			clock-frequency = <0>;
--			interrupts = <f 2>;	// decrementer interrupt
-+			interrupts = <15 2>;	// decrementer interrupt
- 			interrupt-parent = <&PIC>;
- 		};
- 	};
- 
- 	memory {
- 		device_type = "memory";
--		reg = <0 0>;
-+		reg = <0x0 0x0>;
- 	};
- 
- 	localbus@ff000100 {
- 		compatible = "fsl,mpc885-localbus", "fsl,pq1-localbus";
- 		#address-cells = <2>;
- 		#size-cells = <1>;
--		reg = <ff000100 40>;
-+		reg = <0xff000100 0x40>;
- 
- 		ranges = <
--			0 0 fe000000 00800000
--			1 0 ff080000 00008000
--			5 0 ff0a0000 00008000
-+			0x0 0x0 0xfe000000 0x800000
-+			0x1 0x0 0xff080000 0x8000
-+			0x5 0x0 0xff0a0000 0x8000
- 		>;
- 
- 		flash@0,0 {
- 			compatible = "jedec-flash";
--			reg = <0 0 800000>;
-+			reg = <0x0 0x0 0x800000>;
- 			bank-width = <4>;
- 			device-width = <1>;
- 		};
- 
- 		board-control@1,0 {
--			reg = <1 0 20 5 300 4>;
-+			reg = <0x1 0x0 0x20 0x5 0x300 0x4>;
- 			compatible = "fsl,mpc885ads-bcsr";
- 		};
- 	};
-@@ -71,30 +72,30 @@
- 		#address-cells = <1>;
- 		#size-cells = <1>;
- 		device_type = "soc";
--		ranges = <0 ff000000 00004000>;
-+		ranges = <0x0 0xff000000 0x4000>;
- 		bus-frequency = <0>;
- 
- 		// Temporary -- will go away once kernel uses ranges for get_immrbase().
--		reg = <ff000000 4000>;
-+		reg = <0xff000000 0x4000>;
- 
- 		mdio@e00 {
- 			compatible = "fsl,mpc885-fec-mdio", "fsl,pq1-fec-mdio";
--			reg = <e00 188>;
-+			reg = <0xe00 0x188>;
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 
- 			PHY0: ethernet-phy@0 {
--				reg = <0>;
-+				reg = <0x0>;
- 				device_type = "ethernet-phy";
- 			};
- 
- 			PHY1: ethernet-phy@1 {
--				reg = <1>;
-+				reg = <0x1>;
- 				device_type = "ethernet-phy";
- 			};
- 
- 			PHY2: ethernet-phy@2 {
--				reg = <2>;
-+				reg = <0x2>;
- 				device_type = "ethernet-phy";
- 			};
- 		};
-@@ -103,7 +104,7 @@
- 			device_type = "network";
- 			compatible = "fsl,mpc885-fec-enet",
- 			             "fsl,pq1-fec-enet";
--			reg = <e00 188>;
-+			reg = <0xe00 0x188>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
- 			interrupts = <3 1>;
- 			interrupt-parent = <&PIC>;
-@@ -115,7 +116,7 @@
- 			device_type = "network";
- 			compatible = "fsl,mpc885-fec-enet",
- 			             "fsl,pq1-fec-enet";
--			reg = <1e00 188>;
-+			reg = <0x1e00 0x188>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
- 			interrupts = <7 1>;
- 			interrupt-parent = <&PIC>;
-@@ -126,7 +127,7 @@
- 		PIC: interrupt-controller@0 {
- 			interrupt-controller;
- 			#interrupt-cells = <2>;
--			reg = <0 24>;
-+			reg = <0x0 0x24>;
- 			compatible = "fsl,mpc885-pic", "fsl,pq1-pic";
- 		};
- 
-@@ -136,29 +137,29 @@
- 			#size-cells = <2>;
- 			compatible = "fsl,pq-pcmcia";
- 			device_type = "pcmcia";
--			reg = <80 80>;
-+			reg = <0x80 0x80>;
- 			interrupt-parent = <&PIC>;
--			interrupts = <d 1>;
-+			interrupts = <13 1>;
- 		};
- 
- 		cpm@9c0 {
- 			#address-cells = <1>;
- 			#size-cells = <1>;
- 			compatible = "fsl,mpc885-cpm", "fsl,cpm1";
--			command-proc = <9c0>;
-+			command-proc = <0x9c0>;
- 			interrupts = <0>;	// cpm error interrupt
- 			interrupt-parent = <&CPM_PIC>;
--			reg = <9c0 40>;
-+			reg = <0x9c0 0x40>;
- 			ranges;
- 
- 			muram@2000 {
- 				#address-cells = <1>;
- 				#size-cells = <1>;
--				ranges = <0 2000 2000>;
-+				ranges = <0x0 0x2000 0x2000>;
- 
- 				data@0 {
- 					compatible = "fsl,cpm-muram-data";
--					reg = <0 1c00>;
-+					reg = <0x0 0x1c00>;
- 				};
- 			};
- 
-@@ -167,7 +168,7 @@
- 				             "fsl,cpm1-brg",
- 				             "fsl,cpm-brg";
- 				clock-frequency = <0>;
--				reg = <9f0 10>;
-+				reg = <0x9f0 0x10>;
- 			};
- 
- 			CPM_PIC: interrupt-controller@930 {
-@@ -175,7 +176,7 @@
- 				#interrupt-cells = <1>;
- 				interrupts = <5 2 0 2>;
- 				interrupt-parent = <&PIC>;
--				reg = <930 20>;
-+				reg = <0x930 0x20>;
- 				compatible = "fsl,mpc885-cpm-pic",
- 				             "fsl,cpm1-pic";
- 			};
-@@ -184,34 +185,34 @@
- 				device_type = "serial";
- 				compatible = "fsl,mpc885-smc-uart",
- 				             "fsl,cpm1-smc-uart";
--				reg = <a80 10 3e80 40>;
-+				reg = <0xa80 0x10 0x3e80 0x40>;
- 				interrupts = <4>;
- 				interrupt-parent = <&CPM_PIC>;
- 				fsl,cpm-brg = <1>;
--				fsl,cpm-command = <0090>;
-+				fsl,cpm-command = <0x90>;
- 			};
- 
- 			serial@a90 {
- 				device_type = "serial";
- 				compatible = "fsl,mpc885-smc-uart",
- 				             "fsl,cpm1-smc-uart";
--				reg = <a90 10 3f80 40>;
-+				reg = <0xa90 0x10 0x3f80 0x40>;
- 				interrupts = <3>;
- 				interrupt-parent = <&CPM_PIC>;
- 				fsl,cpm-brg = <2>;
--				fsl,cpm-command = <00d0>;
-+				fsl,cpm-command = <0xd0>;
- 			};
- 
- 			ethernet@a40 {
- 				device_type = "network";
- 				compatible = "fsl,mpc885-scc-enet",
- 				             "fsl,cpm1-scc-enet";
--				reg = <a40 18 3e00 100>;
-+				reg = <0xa40 0x18 0x3e00 0x100>;
- 				local-mac-address = [ 00 00 00 00 00 00 ];
--				interrupts = <1c>;
-+				interrupts = <28>;
- 				interrupt-parent = <&CPM_PIC>;
- 				phy-handle = <&PHY2>;
--				fsl,cpm-command = <0080>;
-+				fsl,cpm-command = <0x80>;
- 				linux,network-index = <2>;
- 			};
- 		};
---- a/arch/powerpc/boot/dts/pq2fads.dts
-+++ b/arch/powerpc/boot/dts/pq2fads.dts
-@@ -1,7 +1,7 @@
- /*
-  * Device Tree for the PQ2FADS-ZU board with an MPC8280 chip.
-  *
-- * Copyright 2007 Freescale Semiconductor Inc.
-+ * Copyright 2007,2008 Freescale Semiconductor Inc.
-  *
-  * 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
-@@ -9,6 +9,8 @@
-  * option) any later version.
-  */
- 
-+/dts-v1/;
-+
- / {
- 	model = "pq2fads";
- 	compatible = "fsl,pq2fads";
-@@ -21,11 +23,11 @@
- 
- 		cpu@0 {
- 			device_type = "cpu";
--			reg = <0>;
--			d-cache-line-size = <d#32>;
--			i-cache-line-size = <d#32>;
--			d-cache-size = <d#16384>;
--			i-cache-size = <d#16384>;
-+			reg = <0x0>;
-+			d-cache-line-size = <32>;
-+			i-cache-line-size = <32>;
-+			d-cache-size = <16384>;
-+			i-cache-size = <16384>;
- 			timebase-frequency = <0>;
- 			clock-frequency = <0>;
- 		};
-@@ -33,7 +35,7 @@
- 
- 	memory {
- 		device_type = "memory";
--		reg = <0 0>;
-+		reg = <0x0 0x0>;
- 	};
- 
- 	localbus@f0010100 {
-@@ -41,67 +43,67 @@
- 		             "fsl,pq2-localbus";
- 		#address-cells = <2>;
- 		#size-cells = <1>;
--		reg = <f0010100 60>;
-+		reg = <0xf0010100 0x60>;
- 
--		ranges = <0 0 fe000000 00800000
--		          1 0 f4500000 00008000
--		          8 0 f8200000 00008000>;
-+		ranges = <0x0 0x0 0xfe000000 0x800000
-+		          0x1 0x0 0xf4500000 0x8000
-+		          0x8 0x0 0xf8200000 0x8000>;
- 
- 		flash@0,0 {
- 			compatible = "jedec-flash";
--			reg = <0 0 800000>;
-+			reg = <0x0 0x0 0x800000>;
- 			bank-width = <4>;
- 			device-width = <1>;
- 		};
- 
- 		bcsr@1,0 {
--			reg = <1 0 20>;
-+			reg = <0x1 0x0 0x20>;
- 			compatible = "fsl,pq2fads-bcsr";
- 		};
- 
- 		PCI_PIC: pic@8,0 {
- 			#interrupt-cells = <1>;
- 			interrupt-controller;
--			reg = <8 0 8>;
-+			reg = <0x8 0x0 0x8>;
- 			compatible = "fsl,pq2ads-pci-pic";
- 			interrupt-parent = <&PIC>;
--			interrupts = <18 8>;
-+			interrupts = <24 8>;
- 		};
- 	};
- 
- 	pci@f0010800 {
- 		device_type = "pci";
--		reg = <f0010800 10c f00101ac 8 f00101c4 8>;
-+		reg = <0xf0010800 0x10c 0xf00101ac 0x8 0xf00101c4 0x8>;
- 		compatible = "fsl,mpc8280-pci", "fsl,pq2-pci";
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		clock-frequency = <d#66000000>;
--		interrupt-map-mask = <f800 0 0 7>;
-+		clock-frequency = <66000000>;
-+		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 		interrupt-map = <
- 		                /* IDSEL 0x16 */
--		                 b000 0 0 1 &PCI_PIC 0
--		                 b000 0 0 2 &PCI_PIC 1
--		                 b000 0 0 3 &PCI_PIC 2
--		                 b000 0 0 4 &PCI_PIC 3
-+		                 0xb000 0x0 0x0 0x1 &PCI_PIC 0
-+		                 0xb000 0x0 0x0 0x2 &PCI_PIC 1
-+		                 0xb000 0x0 0x0 0x3 &PCI_PIC 2
-+		                 0xb000 0x0 0x0 0x4 &PCI_PIC 3
- 
- 		                /* IDSEL 0x17 */
--		                 b800 0 0 1 &PCI_PIC 4
--		                 b800 0 0 2 &PCI_PIC 5
--		                 b800 0 0 3 &PCI_PIC 6
--		                 b800 0 0 4 &PCI_PIC 7
-+		                 0xb800 0x0 0x0 0x1 &PCI_PIC 4
-+		                 0xb800 0x0 0x0 0x2 &PCI_PIC 5
-+		                 0xb800 0x0 0x0 0x3 &PCI_PIC 6
-+		                 0xb800 0x0 0x0 0x4 &PCI_PIC 7
- 
- 		                /* IDSEL 0x18 */
--		                 c000 0 0 1 &PCI_PIC 8
--		                 c000 0 0 2 &PCI_PIC 9
--		                 c000 0 0 3 &PCI_PIC a
--		                 c000 0 0 4 &PCI_PIC b>;
-+		                 0xc000 0x0 0x0 0x1 &PCI_PIC 8
-+		                 0xc000 0x0 0x0 0x2 &PCI_PIC 9
-+		                 0xc000 0x0 0x0 0x3 &PCI_PIC 10
-+		                 0xc000 0x0 0x0 0x4 &PCI_PIC 11>;
- 
- 		interrupt-parent = <&PIC>;
--		interrupts = <12 8>;
--		ranges = <42000000 0 80000000 80000000 0 20000000
--		          02000000 0 a0000000 a0000000 0 20000000
--		          01000000 0 00000000 f6000000 0 02000000>;
-+		interrupts = <18 8>;
-+		ranges = <0x42000000 0x0 0x80000000 0x80000000 0x0 0x20000000
-+		          0x2000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000
-+		          0x1000000 0x0 0x0 0xf6000000 0x0 0x2000000>;
- 	};
- 
- 	soc@f0000000 {
-@@ -109,27 +111,27 @@
- 		#size-cells = <1>;
- 		device_type = "soc";
- 		compatible = "fsl,mpc8280", "fsl,pq2-soc";
--		ranges = <00000000 f0000000 00053000>;
-+		ranges = <0x0 0xf0000000 0x53000>;
- 
- 		// Temporary -- will go away once kernel uses ranges for get_immrbase().
--		reg = <f0000000 00053000>;
-+		reg = <0xf0000000 0x53000>;
- 
- 		cpm@119c0 {
- 			#address-cells = <1>;
- 			#size-cells = <1>;
- 			#interrupt-cells = <2>;
- 			compatible = "fsl,mpc8280-cpm", "fsl,cpm2";
--			reg = <119c0 30>;
-+			reg = <0x119c0 0x30>;
- 			ranges;
- 
- 			muram@0 {
- 				#address-cells = <1>;
- 				#size-cells = <1>;
--				ranges = <0 0 10000>;
-+				ranges = <0x0 0x0 0x10000>;
- 
- 				data@0 {
- 					compatible = "fsl,cpm-muram-data";
--					reg = <0 2000 9800 800>;
-+					reg = <0x0 0x2000 0x9800 0x800>;
- 				};
- 			};
- 
-@@ -137,53 +139,53 @@
- 				compatible = "fsl,mpc8280-brg",
- 				             "fsl,cpm2-brg",
- 				             "fsl,cpm-brg";
--				reg = <119f0 10 115f0 10>;
-+				reg = <0x119f0 0x10 0x115f0 0x10>;
- 			};
- 
- 			serial@11a00 {
- 				device_type = "serial";
- 				compatible = "fsl,mpc8280-scc-uart",
- 				             "fsl,cpm2-scc-uart";
--				reg = <11a00 20 8000 100>;
--				interrupts = <28 8>;
-+				reg = <0x11a00 0x20 0x8000 0x100>;
-+				interrupts = <40 8>;
- 				interrupt-parent = <&PIC>;
- 				fsl,cpm-brg = <1>;
--				fsl,cpm-command = <00800000>;
-+				fsl,cpm-command = <0x800000>;
- 			};
- 
- 			serial@11a20 {
- 				device_type = "serial";
- 				compatible = "fsl,mpc8280-scc-uart",
- 				             "fsl,cpm2-scc-uart";
--				reg = <11a20 20 8100 100>;
--				interrupts = <29 8>;
-+				reg = <0x11a20 0x20 0x8100 0x100>;
-+				interrupts = <41 8>;
- 				interrupt-parent = <&PIC>;
- 				fsl,cpm-brg = <2>;
--				fsl,cpm-command = <04a00000>;
-+				fsl,cpm-command = <0x4a00000>;
- 			};
- 
- 			ethernet@11320 {
- 				device_type = "network";
- 				compatible = "fsl,mpc8280-fcc-enet",
- 				             "fsl,cpm2-fcc-enet";
--				reg = <11320 20 8500 100 113b0 1>;
--				interrupts = <21 8>;
-+				reg = <0x11320 0x20 0x8500 0x100 0x113b0 0x1>;
-+				interrupts = <33 8>;
- 				interrupt-parent = <&PIC>;
- 				phy-handle = <&PHY0>;
- 				linux,network-index = <0>;
--				fsl,cpm-command = <16200300>;
-+				fsl,cpm-command = <0x16200300>;
- 			};
- 
- 			ethernet@11340 {
- 				device_type = "network";
- 				compatible = "fsl,mpc8280-fcc-enet",
- 				             "fsl,cpm2-fcc-enet";
--				reg = <11340 20 8600 100 113d0 1>;
--				interrupts = <22 8>;
-+				reg = <0x11340 0x20 0x8600 0x100 0x113d0 0x1>;
-+				interrupts = <34 8>;
- 				interrupt-parent = <&PIC>;
- 				phy-handle = <&PHY1>;
- 				linux,network-index = <1>;
--				fsl,cpm-command = <1a400300>;
-+				fsl,cpm-command = <0x1a400300>;
- 				local-mac-address = [00 e0 0c 00 79 01];
- 			};
- 
-@@ -194,21 +196,21 @@
- 				             "fsl,cpm2-mdio-bitbang";
- 				#address-cells = <1>;
- 				#size-cells = <0>;
--				reg = <10d40 14>;
-+				reg = <0x10d40 0x14>;
- 				fsl,mdio-pin = <9>;
--				fsl,mdc-pin = <a>;
-+				fsl,mdc-pin = <10>;
- 
- 				PHY0: ethernet-phy@0 {
- 					interrupt-parent = <&PIC>;
--					interrupts = <19 2>;
--					reg = <0>;
-+					interrupts = <25 2>;
-+					reg = <0x0>;
- 					device_type = "ethernet-phy";
- 				};
- 
- 				PHY1: ethernet-phy@1 {
- 					interrupt-parent = <&PIC>;
--					interrupts = <19 2>;
--					reg = <3>;
-+					interrupts = <25 2>;
-+					reg = <0x3>;
- 					device_type = "ethernet-phy";
- 				};
- 			};
-@@ -218,17 +220,17 @@
- 				#size-cells = <0>;
- 				compatible = "fsl,mpc8280-usb",
- 				             "fsl,cpm2-usb";
--				reg = <11b60 18 8b00 100>;
-+				reg = <0x11b60 0x18 0x8b00 0x100>;
- 				interrupt-parent = <&PIC>;
--				interrupts = <b 8>;
--				fsl,cpm-command = <2e600000>;
-+				interrupts = <11 8>;
-+				fsl,cpm-command = <0x2e600000>;
- 			};
- 		};
- 
- 		PIC: interrupt-controller@10c00 {
- 			#interrupt-cells = <2>;
- 			interrupt-controller;
--			reg = <10c00 80>;
-+			reg = <0x10c00 0x80>;
- 			compatible = "fsl,mpc8280-pic", "fsl,cpm2-pic";
- 		};
- 
---- a/arch/powerpc/boot/dts/prpmc2800.dts
-+++ b/arch/powerpc/boot/dts/prpmc2800.dts
-@@ -11,6 +11,8 @@
-  * if it can determine the exact PrPMC type.
-  */
- 
-+/dts-v1/;
-+
- / {
- 	#address-cells = <1>;
- 	#size-cells = <1>;
-@@ -25,46 +27,46 @@
- 		PowerPC,7447 {
- 			device_type = "cpu";
- 			reg = <0>;
--			clock-frequency = <2bb0b140>;	/* Default (733 MHz) */
--			bus-frequency = <7f28155>;	/* 133.333333 MHz */
--			timebase-frequency = <1fca055>;	/* 33.333333 MHz */
--			i-cache-line-size = <20>;
--			d-cache-line-size = <20>;
--			i-cache-size = <8000>;
--			d-cache-size = <8000>;
-+			clock-frequency = <733333333>;	/* Default */
-+			bus-frequency = <133333333>;
-+			timebase-frequency = <33333333>;
-+			i-cache-line-size = <32>;
-+			d-cache-line-size = <32>;
-+			i-cache-size = <32768>;
-+			d-cache-size = <32768>;
- 		};
- 	};
- 
- 	memory {
- 		device_type = "memory";
--		reg = <00000000 20000000>;	/* Default (512MB) */
-+		reg = <0x0 0x20000000>;			/* Default (512MB) */
- 	};
- 
--	mv64x60@f1000000 { /* Marvell Discovery */
-+	system-controller@f1000000 { /* Marvell Discovery mv64360 */
- 		#address-cells = <1>;
- 		#size-cells = <1>;
- 		model = "mv64360";			/* Default */
--		compatible = "marvell,mv64x60";
--		clock-frequency = <7f28155>;		/* 133.333333 MHz */
--		reg = <f1000000 00010000>;
--		virtual-reg = <f1000000>;
--		ranges = <88000000 88000000 01000000	/* PCI 0 I/O Space */
--			  80000000 80000000 08000000	/* PCI 0 MEM Space */
--			  a0000000 a0000000 04000000	/* User FLASH */
--			  00000000 f1000000 00010000	/* Bridge's regs */
--			  f2000000 f2000000 00040000>;	/* Integrated SRAM */
-+		compatible = "marvell,mv64360";
-+		clock-frequency = <133333333>;
-+		reg = <0xf1000000 0x10000>;
-+		virtual-reg = <0xf1000000>;
-+		ranges = <0x88000000 0x88000000 0x1000000 /* PCI 0 I/O Space */
-+			  0x80000000 0x80000000 0x8000000 /* PCI 0 MEM Space */
-+			  0xa0000000 0xa0000000 0x4000000 /* User FLASH */
-+			  0x00000000 0xf1000000 0x0010000 /* Bridge's regs */
-+			  0xf2000000 0xf2000000 0x0040000>;/* Integrated SRAM */
- 
- 		flash@a0000000 {
- 			device_type = "rom";
- 			compatible = "direct-mapped";
--			reg = <a0000000 4000000>; /* Default (64MB) */
-+			reg = <0xa0000000 0x4000000>; /* Default (64MB) */
- 			probe-type = "CFI";
- 			bank-width = <4>;
--			partitions = <00000000 00100000 /* RO */
--				      00100000 00040001 /* RW */
--				      00140000 00400000 /* RO */
--				      00540000 039c0000 /* RO */
--				      03f00000 00100000>; /* RO */
-+			partitions = <0x00000000 0x00100000 /* RO */
-+				      0x00100000 0x00040001 /* RW */
-+				      0x00140000 0x00400000 /* RO */
-+				      0x00540000 0x039c0000 /* RO */
-+				      0x03f00000 0x00100000>; /* RO */
- 			partition-names = "FW Image A", "FW Config Data", "Kernel Image", "Filesystem", "FW Image B";
- 		};
- 
-@@ -72,171 +74,153 @@
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 			device_type = "mdio";
--			compatible = "marvell,mv64x60-mdio";
--			ethernet-phy@1 {
-+			compatible = "marvell,mv64360-mdio";
-+			PHY0: ethernet-phy@1 {
- 				device_type = "ethernet-phy";
- 				compatible = "broadcom,bcm5421";
--				interrupts = <4c>;	/* GPP 12 */
--				interrupt-parent = <&/mv64x60/pic>;
-+				interrupts = <76>;	/* GPP 12 */
-+				interrupt-parent = <&PIC>;
- 				reg = <1>;
- 			};
--			ethernet-phy@3 {
-+			PHY1: ethernet-phy@3 {
- 				device_type = "ethernet-phy";
- 				compatible = "broadcom,bcm5421";
--				interrupts = <4c>;	/* GPP 12 */
--				interrupt-parent = <&/mv64x60/pic>;
-+				interrupts = <76>;	/* GPP 12 */
-+				interrupt-parent = <&PIC>;
- 				reg = <3>;
- 			};
- 		};
- 
--		ethernet@2000 {
--			reg = <2000 2000>;
--			eth0 {
-+		ethernet-group@2000 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			compatible = "marvell,mv64360-eth-group";
-+			reg = <0x2000 0x2000>;
-+			ethernet@0 {
- 				device_type = "network";
--				compatible = "marvell,mv64x60-eth";
--				block-index = <0>;
--				interrupts = <20>;
--				interrupt-parent = <&/mv64x60/pic>;
--				phy = <&/mv64x60/mdio/ethernet-phy@1>;
-+				compatible = "marvell,mv64360-eth";
-+				reg = <0>;
-+				interrupts = <32>;
-+				interrupt-parent = <&PIC>;
-+				phy = <&PHY0>;
- 				local-mac-address = [ 00 00 00 00 00 00 ];
- 			};
--			eth1 {
-+			ethernet@1 {
- 				device_type = "network";
--				compatible = "marvell,mv64x60-eth";
--				block-index = <1>;
--				interrupts = <21>;
--				interrupt-parent = <&/mv64x60/pic>;
--				phy = <&/mv64x60/mdio/ethernet-phy@3>;
-+				compatible = "marvell,mv64360-eth";
-+				reg = <1>;
-+				interrupts = <33>;
-+				interrupt-parent = <&PIC>;
-+				phy = <&PHY1>;
- 				local-mac-address = [ 00 00 00 00 00 00 ];
- 			};
- 		};
- 
--		sdma@4000 {
--			device_type = "dma";
--			compatible = "marvell,mv64x60-sdma";
--			reg = <4000 c18>;
--			virtual-reg = <f1004000>;
--			interrupt-base = <0>;
--			interrupts = <24>;
--			interrupt-parent = <&/mv64x60/pic>;
--		};
--
--		sdma@6000 {
--			device_type = "dma";
--			compatible = "marvell,mv64x60-sdma";
--			reg = <6000 c18>;
--			virtual-reg = <f1006000>;
--			interrupt-base = <0>;
--			interrupts = <26>;
--			interrupt-parent = <&/mv64x60/pic>;
--		};
--
--		brg@b200 {
--			compatible = "marvell,mv64x60-brg";
--			reg = <b200 8>;
-+		SDMA0: sdma@4000 {
-+			compatible = "marvell,mv64360-sdma";
-+			reg = <0x4000 0xc18>;
-+			virtual-reg = <0xf1004000>;
-+			interrupts = <36>;
-+			interrupt-parent = <&PIC>;
-+		};
-+
-+		SDMA1: sdma@6000 {
-+			compatible = "marvell,mv64360-sdma";
-+			reg = <0x6000 0xc18>;
-+			virtual-reg = <0xf1006000>;
-+			interrupts = <38>;
-+			interrupt-parent = <&PIC>;
-+		};
-+
-+		BRG0: brg@b200 {
-+			compatible = "marvell,mv64360-brg";
-+			reg = <0xb200 0x8>;
- 			clock-src = <8>;
--			clock-frequency = <7ed6b40>;
--			current-speed = <2580>;
--			bcr = <0>;
-+			clock-frequency = <133333333>;
-+			current-speed = <9600>;
- 		};
- 
--		brg@b208 {
--			compatible = "marvell,mv64x60-brg";
--			reg = <b208 8>;
-+		BRG1: brg@b208 {
-+			compatible = "marvell,mv64360-brg";
-+			reg = <0xb208 0x8>;
- 			clock-src = <8>;
--			clock-frequency = <7ed6b40>;
--			current-speed = <2580>;
--			bcr = <0>;
-+			clock-frequency = <133333333>;
-+			current-speed = <9600>;
- 		};
- 
--		cunit@f200 {
--			reg = <f200 200>;
-+		CUNIT: cunit@f200 {
-+			reg = <0xf200 0x200>;
- 		};
- 
--		mpscrouting@b400 {
--			reg = <b400 c>;
-+		MPSCROUTING: mpscrouting@b400 {
-+			reg = <0xb400 0xc>;
- 		};
- 
--		mpscintr@b800 {
--			reg = <b800 100>;
--			virtual-reg = <f100b800>;
-+		MPSCINTR: mpscintr@b800 {
-+			reg = <0xb800 0x100>;
-+			virtual-reg = <0xf100b800>;
- 		};
- 
--		mpsc@8000 {
-+		MPSC0: mpsc@8000 {
- 			device_type = "serial";
--			compatible = "marvell,mpsc";
--			reg = <8000 38>;
--			virtual-reg = <f1008000>;
--			sdma = <&/mv64x60/sdma@4000>;
--			brg = <&/mv64x60/brg@b200>;
--			cunit = <&/mv64x60/cunit@f200>;
--			mpscrouting = <&/mv64x60/mpscrouting@b400>;
--			mpscintr = <&/mv64x60/mpscintr@b800>;
--			block-index = <0>;
--			max_idle = <28>;
--			chr_1 = <0>;
--			chr_2 = <0>;
--			chr_10 = <3>;
--			mpcr = <0>;
--			interrupts = <28>;
--			interrupt-parent = <&/mv64x60/pic>;
-+			compatible = "marvell,mv64360-mpsc";
-+			reg = <0x8000 0x38>;
-+			virtual-reg = <0xf1008000>;
-+			sdma = <&SDMA0>;
-+			brg = <&BRG0>;
-+			cunit = <&CUNIT>;
-+			mpscrouting = <&MPSCROUTING>;
-+			mpscintr = <&MPSCINTR>;
-+			cell-index = <0>;
-+			interrupts = <40>;
-+			interrupt-parent = <&PIC>;
- 		};
- 
--		mpsc@9000 {
-+		MPSC1: mpsc@9000 {
- 			device_type = "serial";
--			compatible = "marvell,mpsc";
--			reg = <9000 38>;
--			virtual-reg = <f1009000>;
--			sdma = <&/mv64x60/sdma@6000>;
--			brg = <&/mv64x60/brg@b208>;
--			cunit = <&/mv64x60/cunit@f200>;
--			mpscrouting = <&/mv64x60/mpscrouting@b400>;
--			mpscintr = <&/mv64x60/mpscintr@b800>;
--			block-index = <1>;
--			max_idle = <28>;
--			chr_1 = <0>;
--			chr_2 = <0>;
--			chr_10 = <3>;
--			mpcr = <0>;
--			interrupts = <2a>;
--			interrupt-parent = <&/mv64x60/pic>;
-+			compatible = "marvell,mv64360-mpsc";
-+			reg = <0x9000 0x38>;
-+			virtual-reg = <0xf1009000>;
-+			sdma = <&SDMA1>;
-+			brg = <&BRG1>;
-+			cunit = <&CUNIT>;
-+			mpscrouting = <&MPSCROUTING>;
-+			mpscintr = <&MPSCINTR>;
-+			cell-index = <1>;
-+			interrupts = <42>;
-+			interrupt-parent = <&PIC>;
- 		};
- 
- 		wdt@b410 {			/* watchdog timer */
--			compatible = "marvell,mv64x60-wdt";
--			reg = <b410 8>;
--			timeout = <a>;		/* wdt timeout in seconds */
-+			compatible = "marvell,mv64360-wdt";
-+			reg = <0xb410 0x8>;
- 		};
- 
- 		i2c@c000 {
- 			device_type = "i2c";
--			compatible = "marvell,mv64x60-i2c";
--			reg = <c000 20>;
--			virtual-reg = <f100c000>;
--			freq_m = <8>;
--			freq_n = <3>;
--			timeout = <3e8>;		/* 1000 = 1 second */
--			retries = <1>;
--			interrupts = <25>;
--			interrupt-parent = <&/mv64x60/pic>;
-+			compatible = "marvell,mv64360-i2c";
-+			reg = <0xc000 0x20>;
-+			virtual-reg = <0xf100c000>;
-+			interrupts = <37>;
-+			interrupt-parent = <&PIC>;
- 		};
- 
--		pic {
-+		PIC: pic {
- 			#interrupt-cells = <1>;
- 			#address-cells = <0>;
--			compatible = "marvell,mv64x60-pic";
--			reg = <0000 88>;
-+			compatible = "marvell,mv64360-pic";
-+			reg = <0x0 0x88>;
- 			interrupt-controller;
- 		};
- 
- 		mpp@f000 {
--			compatible = "marvell,mv64x60-mpp";
--			reg = <f000 10>;
-+			compatible = "marvell,mv64360-mpp";
-+			reg = <0xf000 0x10>;
- 		};
- 
- 		gpp@f100 {
--			compatible = "marvell,mv64x60-gpp";
--			reg = <f100 20>;
-+			compatible = "marvell,mv64360-gpp";
-+			reg = <0xf100 0x20>;
- 		};
- 
- 		pci@80000000 {
-@@ -244,73 +228,75 @@
- 			#size-cells = <2>;
- 			#interrupt-cells = <1>;
- 			device_type = "pci";
--			compatible = "marvell,mv64x60-pci";
--			reg = <0cf8 8>;
--			ranges = <01000000 0        0 88000000 0 01000000
--				  02000000 0 80000000 80000000 0 08000000>;
--			bus-range = <0 ff>;
--			clock-frequency = <3EF1480>;
--			interrupt-pci-iack = <0c34>;
--			interrupt-parent = <&/mv64x60/pic>;
--			interrupt-map-mask = <f800 0 0 7>;
-+			compatible = "marvell,mv64360-pci";
-+			reg = <0xcf8 0x8>;
-+			ranges = <0x01000000 0x0        0x0
-+					0x88000000 0x0 0x01000000
-+				  0x02000000 0x0 0x80000000
-+				  	0x80000000 0x0 0x08000000>;
-+			bus-range = <0 255>;
-+			clock-frequency = <66000000>;
-+			interrupt-pci-iack = <0xc34>;
-+			interrupt-parent = <&PIC>;
-+			interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 			interrupt-map = <
- 				/* IDSEL 0x0a */
--				5000 0 0 1 &/mv64x60/pic 50
--				5000 0 0 2 &/mv64x60/pic 51
--				5000 0 0 3 &/mv64x60/pic 5b
--				5000 0 0 4 &/mv64x60/pic 5d
-+				0x5000 0 0 1 &PIC 80
-+				0x5000 0 0 2 &PIC 81
-+				0x5000 0 0 3 &PIC 91
-+				0x5000 0 0 4 &PIC 93
- 
- 				/* IDSEL 0x0b */
--				5800 0 0 1 &/mv64x60/pic 5b
--				5800 0 0 2 &/mv64x60/pic 5d
--				5800 0 0 3 &/mv64x60/pic 50
--				5800 0 0 4 &/mv64x60/pic 51
-+				0x5800 0 0 1 &PIC 91
-+				0x5800 0 0 2 &PIC 93
-+				0x5800 0 0 3 &PIC 80
-+				0x5800 0 0 4 &PIC 81
- 
- 				/* IDSEL 0x0c */
--				6000 0 0 1 &/mv64x60/pic 5b
--				6000 0 0 2 &/mv64x60/pic 5d
--				6000 0 0 3 &/mv64x60/pic 50
--				6000 0 0 4 &/mv64x60/pic 51
-+				0x6000 0 0 1 &PIC 91
-+				0x6000 0 0 2 &PIC 93
-+				0x6000 0 0 3 &PIC 80
-+				0x6000 0 0 4 &PIC 81
- 
- 				/* IDSEL 0x0d */
--				6800 0 0 1 &/mv64x60/pic 5d
--				6800 0 0 2 &/mv64x60/pic 50
--				6800 0 0 3 &/mv64x60/pic 51
--				6800 0 0 4 &/mv64x60/pic 5b
-+				0x6800 0 0 1 &PIC 93
-+				0x6800 0 0 2 &PIC 80
-+				0x6800 0 0 3 &PIC 81
-+				0x6800 0 0 4 &PIC 91
- 			>;
- 		};
- 
- 		cpu-error@0070 {
--			compatible = "marvell,mv64x60-cpu-error";
--			reg = <0070 10 0128 28>;
--			interrupts = <03>;
--			interrupt-parent = <&/mv64x60/pic>;
-+			compatible = "marvell,mv64360-cpu-error";
-+			reg = <0x70 0x10 0x128 0x28>;
-+			interrupts = <3>;
-+			interrupt-parent = <&PIC>;
- 		};
- 
- 		sram-ctrl@0380 {
--			compatible = "marvell,mv64x60-sram-ctrl";
--			reg = <0380 80>;
--			interrupts = <0d>;
--			interrupt-parent = <&/mv64x60/pic>;
-+			compatible = "marvell,mv64360-sram-ctrl";
-+			reg = <0x380 0x80>;
-+			interrupts = <13>;
-+			interrupt-parent = <&PIC>;
- 		};
- 
- 		pci-error@1d40 {
--			compatible = "marvell,mv64x60-pci-error";
--			reg = <1d40 40 0c28 4>;
--			interrupts = <0c>;
--			interrupt-parent = <&/mv64x60/pic>;
-+			compatible = "marvell,mv64360-pci-error";
-+			reg = <0x1d40 0x40 0xc28 0x4>;
-+			interrupts = <12>;
-+			interrupt-parent = <&PIC>;
- 		};
- 
- 		mem-ctrl@1400 {
--			compatible = "marvell,mv64x60-mem-ctrl";
--			reg = <1400 60>;
--			interrupts = <11>;
--			interrupt-parent = <&/mv64x60/pic>;
-+			compatible = "marvell,mv64360-mem-ctrl";
-+			reg = <0x1400 0x60>;
-+			interrupts = <17>;
-+			interrupt-parent = <&PIC>;
- 		};
- 	};
- 
- 	chosen {
- 		bootargs = "ip=on";
--		linux,stdout-path = "/mv64x60@f1000000/mpsc@8000";
-+		linux,stdout-path = &MPSC0;
- 	};
- };
---- a/arch/powerpc/boot/dts/rainier.dts
-+++ b/arch/powerpc/boot/dts/rainier.dts
-@@ -254,7 +254,6 @@
- 			};
- 
- 			EMAC0: ethernet@ef600e00 {
--				linux,network-index = <0>;
- 				device_type = "network";
- 				compatible = "ibm,emac-440grx", "ibm,emac-440epx", "ibm,emac4";
- 				interrupt-parent = <&EMAC0>;
-@@ -270,7 +269,7 @@
- 				mal-tx-channel = <0>;
- 				mal-rx-channel = <0>;
- 				cell-index = <0>;
--				max-frame-size = <5dc>;
-+				max-frame-size = <2328>;
- 				rx-fifo-size = <1000>;
- 				tx-fifo-size = <800>;
- 				phy-mode = "rgmii";
-@@ -284,7 +283,6 @@
- 			};
- 
- 			EMAC1: ethernet@ef600f00 {
--				linux,network-index = <1>;
- 				device_type = "network";
- 				compatible = "ibm,emac-440grx", "ibm,emac-440epx", "ibm,emac4";
- 				interrupt-parent = <&EMAC1>;
-@@ -300,7 +298,7 @@
- 				mal-tx-channel = <1>;
- 				mal-rx-channel = <1>;
- 				cell-index = <1>;
--				max-frame-size = <5dc>;
-+				max-frame-size = <2328>;
- 				rx-fifo-size = <1000>;
- 				tx-fifo-size = <800>;
- 				phy-mode = "rgmii";
---- /dev/null
-+++ b/arch/powerpc/boot/dts/sbc8641d.dts
-@@ -0,0 +1,352 @@
-+/*
-+ * SBC8641D Device Tree Source
-+ *
-+ * Copyright 2008 Wind River Systems Inc.
-+ *
-+ * Paul Gortmaker (see MAINTAINERS for contact information)
-+ *
-+ * Based largely on the mpc8641_hpcn.dts by Freescale Semiconductor Inc.
-+ *
-+ * 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.
-+ */
-+
-+/dts-v1/;
-+
-+/ {
-+	model = "SBC8641D";
-+	compatible = "wind,sbc8641";
-+	#address-cells = <1>;
-+	#size-cells = <1>;
-+
-+	aliases {
-+		ethernet0 = &enet0;
-+		ethernet1 = &enet1;
-+		ethernet2 = &enet2;
-+		ethernet3 = &enet3;
-+		serial0 = &serial0;
-+		serial1 = &serial1;
-+		pci0 = &pci0;
-+		pci1 = &pci1;
-+	};
-+
-+	cpus {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		PowerPC,8641@0 {
-+			device_type = "cpu";
-+			reg = <0>;
-+			d-cache-line-size = <32>;
-+			i-cache-line-size = <32>;
-+			d-cache-size = <32768>;		// L1
-+			i-cache-size = <32768>;		// L1
-+			timebase-frequency = <0>;	// From uboot
-+			bus-frequency = <0>;		// From uboot
-+			clock-frequency = <0>;		// From uboot
-+		};
-+		PowerPC,8641@1 {
-+			device_type = "cpu";
-+			reg = <1>;
-+			d-cache-line-size = <32>;
-+			i-cache-line-size = <32>;
-+			d-cache-size = <32768>;
-+			i-cache-size = <32768>;
-+			timebase-frequency = <0>;	// From uboot
-+			bus-frequency = <0>;		// From uboot
-+			clock-frequency = <0>;		// From uboot
-+		};
-+	};
-+
-+	memory {
-+		device_type = "memory";
-+		reg = <0x00000000 0x20000000>;	// 512M at 0x0
-+	};
-+
-+	localbus@f8005000 {
-+		#address-cells = <2>;
-+		#size-cells = <1>;
-+		compatible = "fsl,mpc8641-localbus", "simple-bus";
-+		reg = <0xf8005000 0x1000>;
-+		interrupts = <19 2>;
-+		interrupt-parent = <&mpic>;
-+
-+		ranges = <0 0 0xff000000 0x01000000	// 16MB Boot flash
-+			  1 0 0xf0000000 0x00010000	// 64KB EEPROM
-+			  2 0 0xf1000000 0x00100000	// EPLD (1MB)
-+			  3 0 0xe0000000 0x04000000	// 64MB LB SDRAM (CS3)
-+			  4 0 0xe4000000 0x04000000	// 64MB LB SDRAM (CS4)
-+			  6 0 0xf4000000 0x00100000	// LCD display (1MB)
-+			  7 0 0xe8000000 0x04000000>;	// 64MB OneNAND
-+
-+		flash@0,0 {
-+			compatible = "cfi-flash";
-+			reg = <0 0 0x01000000>;
-+			bank-width = <2>;
-+			device-width = <2>;
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+			partition@0 {
-+				label = "dtb";
-+				reg = <0x00000000 0x00100000>;
-+				read-only;
-+			};
-+			partition@300000 {
-+				label = "kernel";
-+				reg = <0x00100000 0x00400000>;
-+				read-only;
-+			};
-+			partition@400000 {
-+				label = "fs";
-+				reg = <0x00500000 0x00a00000>;
-+			};
-+			partition@700000 {
-+				label = "firmware";
-+				reg = <0x00f00000 0x00100000>;
-+				read-only;
-+			};
-+		};
-+
-+		epld@2,0 {
-+			compatible = "wrs,epld-localbus";
-+			#address-cells = <2>;
-+			#size-cells = <1>;
-+			reg = <2 0 0x100000>;
-+			ranges = <0 0 5 0 1	// User switches
-+				  1 0 5 1 1	// Board ID/Rev
-+				  3 0 5 3 1>;	// LEDs
-+		};
-+	};
-+
-+	soc@f8000000 {
-+		#address-cells = <1>;
-+		#size-cells = <1>;
-+		device_type = "soc";
-+		compatible = "simple-bus";
-+		ranges = <0x00000000 0xf8000000 0x00100000>;
-+		reg = <0xf8000000 0x00001000>;	// CCSRBAR
-+		bus-frequency = <0>;
-+
-+		i2c@3000 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			cell-index = <0>;
-+			compatible = "fsl-i2c";
-+			reg = <0x3000 0x100>;
-+			interrupts = <43 2>;
-+			interrupt-parent = <&mpic>;
-+			dfsrr;
-+		};
-+
-+		i2c@3100 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			cell-index = <1>;
-+			compatible = "fsl-i2c";
-+			reg = <0x3100 0x100>;
-+			interrupts = <43 2>;
-+			interrupt-parent = <&mpic>;
-+			dfsrr;
-+		};
-+
-+		mdio@24520 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			compatible = "fsl,gianfar-mdio";
-+			reg = <0x24520 0x20>;
-+
-+			phy0: ethernet-phy@1f {
-+				interrupt-parent = <&mpic>;
-+				interrupts = <10 1>;
-+				reg = <0x1f>;
-+				device_type = "ethernet-phy";
-+			};
-+			phy1: ethernet-phy@0 {
-+				interrupt-parent = <&mpic>;
-+				interrupts = <10 1>;
-+				reg = <0>;
-+				device_type = "ethernet-phy";
-+			};
-+			phy2: ethernet-phy@1 {
-+				interrupt-parent = <&mpic>;
-+				interrupts = <10 1>;
-+				reg = <1>;
-+				device_type = "ethernet-phy";
-+			};
-+			phy3: ethernet-phy@2 {
-+				interrupt-parent = <&mpic>;
-+				interrupts = <10 1>;
-+				reg = <2>;
-+				device_type = "ethernet-phy";
-+			};
-+		};
-+
-+		enet0: ethernet@24000 {
-+			cell-index = <0>;
-+			device_type = "network";
-+			model = "TSEC";
-+			compatible = "gianfar";
-+			reg = <0x24000 0x1000>;
-+			local-mac-address = [ 00 00 00 00 00 00 ];
-+			interrupts = <29 2 30  2 34 2>;
-+			interrupt-parent = <&mpic>;
-+			phy-handle = <&phy0>;
-+			phy-connection-type = "rgmii-id";
-+		};
-+
-+		enet1: ethernet@25000 {
-+			cell-index = <1>;
-+			device_type = "network";
-+			model = "TSEC";
-+			compatible = "gianfar";
-+			reg = <0x25000 0x1000>;
-+			local-mac-address = [ 00 00 00 00 00 00 ];
-+			interrupts = <35 2 36 2 40 2>;
-+			interrupt-parent = <&mpic>;
-+			phy-handle = <&phy1>;
-+			phy-connection-type = "rgmii-id";
-+		};
-+
-+		enet2: ethernet@26000 {
-+			cell-index = <2>;
-+			device_type = "network";
-+			model = "TSEC";
-+			compatible = "gianfar";
-+			reg = <0x26000 0x1000>;
-+			local-mac-address = [ 00 00 00 00 00 00 ];
-+			interrupts = <31 2 32 2 33 2>;
-+			interrupt-parent = <&mpic>;
-+			phy-handle = <&phy2>;
-+			phy-connection-type = "rgmii-id";
-+		};
-+
-+		enet3: ethernet@27000 {
-+			cell-index = <3>;
-+			device_type = "network";
-+			model = "TSEC";
-+			compatible = "gianfar";
-+			reg = <0x27000 0x1000>;
-+			local-mac-address = [ 00 00 00 00 00 00 ];
-+			interrupts = <37 2 38 2 39 2>;
-+			interrupt-parent = <&mpic>;
-+			phy-handle = <&phy3>;
-+			phy-connection-type = "rgmii-id";
-+		};
-+
-+		serial0: serial@4500 {
-+			cell-index = <0>;
-+			device_type = "serial";
-+			compatible = "ns16550";
-+			reg = <0x4500 0x100>;
-+			clock-frequency = <0>;
-+			interrupts = <42 2>;
-+			interrupt-parent = <&mpic>;
-+		};
-+
-+		serial1: serial@4600 {
-+			cell-index = <1>;
-+			device_type = "serial";
-+			compatible = "ns16550";
-+			reg = <0x4600 0x100>;
-+			clock-frequency = <0>;
-+			interrupts = <28 2>;
-+			interrupt-parent = <&mpic>;
-+		};
-+
-+		mpic: pic@40000 {
-+			clock-frequency = <0>;
-+			interrupt-controller;
-+			#address-cells = <0>;
-+			#interrupt-cells = <2>;
-+			reg = <0x40000 0x40000>;
-+			compatible = "chrp,open-pic";
-+			device_type = "open-pic";
-+			big-endian;
-+		};
-+
-+		global-utilities@e0000 {
-+			compatible = "fsl,mpc8641-guts";
-+			reg = <0xe0000 0x1000>;
-+			fsl,has-rstcr;
-+		};
-+	};
-+
-+	pci0: pcie@f8008000 {
-+		cell-index = <0>;
-+		compatible = "fsl,mpc8641-pcie";
-+		device_type = "pci";
-+		#interrupt-cells = <1>;
-+		#size-cells = <2>;
-+		#address-cells = <3>;
-+		reg = <0xf8008000 0x1000>;
-+		bus-range = <0x0 0xff>;
-+		ranges = <0x02000000 0x0 0x80000000 0x80000000 0x0 0x20000000
-+			  0x01000000 0x0 0x00000000 0xe2000000 0x0 0x00100000>;
-+		clock-frequency = <33333333>;
-+		interrupt-parent = <&mpic>;
-+		interrupts = <24 2>;
-+		interrupt-map-mask = <0xff00 0 0 7>;
-+		interrupt-map = <
-+			/* IDSEL 0x0 */
-+			0x0000 0 0 1 &mpic 0 1
-+			0x0000 0 0 2 &mpic 1 1
-+			0x0000 0 0 3 &mpic 2 1
-+			0x0000 0 0 4 &mpic 3 1
-+			>;
-+
-+		pcie@0 {
-+			reg = <0 0 0 0 0>;
-+			#size-cells = <2>;
-+			#address-cells = <3>;
-+			device_type = "pci";
-+			ranges = <0x02000000 0x0 0x80000000
-+				  0x02000000 0x0 0x80000000
-+				  0x0 0x20000000
-+
-+				  0x01000000 0x0 0x00000000
-+				  0x01000000 0x0 0x00000000
-+				  0x0 0x00100000>;
-+		};
-+
-+	};
-+
-+	pci1: pcie@f8009000 {
-+		cell-index = <1>;
-+		compatible = "fsl,mpc8641-pcie";
-+		device_type = "pci";
-+		#interrupt-cells = <1>;
-+		#size-cells = <2>;
-+		#address-cells = <3>;
-+		reg = <0xf8009000 0x1000>;
-+		bus-range = <0 0xff>;
-+		ranges = <0x02000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000
-+			  0x01000000 0x0 0x00000000 0xe3000000 0x0 0x00100000>;
-+		clock-frequency = <33333333>;
-+		interrupt-parent = <&mpic>;
-+		interrupts = <25 2>;
-+		interrupt-map-mask = <0xf800 0 0 7>;
-+		interrupt-map = <
-+			/* IDSEL 0x0 */
-+			0x0000 0 0 1 &mpic 4 1
-+			0x0000 0 0 2 &mpic 5 1
-+			0x0000 0 0 3 &mpic 6 1
-+			0x0000 0 0 4 &mpic 7 1
-+			>;
-+
-+		pcie@0 {
-+			reg = <0 0 0 0 0>;
-+			#size-cells = <2>;
-+			#address-cells = <3>;
-+			device_type = "pci";
-+			ranges = <0x02000000 0x0 0xa0000000
-+				  0x02000000 0x0 0xa0000000
-+				  0x0 0x20000000
-+
-+				  0x01000000 0x0 0x00000000
-+				  0x01000000 0x0 0x00000000
-+				  0x0 0x00100000>;
-+		};
-+	};
-+};
---- a/arch/powerpc/boot/dts/sequoia.dts
-+++ b/arch/powerpc/boot/dts/sequoia.dts
-@@ -269,7 +269,6 @@
- 			};
- 
- 			EMAC0: ethernet@ef600e00 {
--				linux,network-index = <0>;
- 				device_type = "network";
- 				compatible = "ibm,emac-440epx", "ibm,emac4";
- 				interrupt-parent = <&EMAC0>;
-@@ -285,7 +284,7 @@
- 				mal-tx-channel = <0>;
- 				mal-rx-channel = <0>;
- 				cell-index = <0>;
--				max-frame-size = <5dc>;
-+				max-frame-size = <2328>;
- 				rx-fifo-size = <1000>;
- 				tx-fifo-size = <800>;
- 				phy-mode = "rgmii";
-@@ -299,7 +298,6 @@
- 			};
- 
- 			EMAC1: ethernet@ef600f00 {
--				linux,network-index = <1>;
- 				device_type = "network";
- 				compatible = "ibm,emac-440epx", "ibm,emac4";
- 				interrupt-parent = <&EMAC1>;
-@@ -315,7 +313,7 @@
- 				mal-tx-channel = <1>;
- 				mal-rx-channel = <1>;
- 				cell-index = <1>;
--				max-frame-size = <5dc>;
-+				max-frame-size = <2328>;
- 				rx-fifo-size = <1000>;
- 				tx-fifo-size = <800>;
- 				phy-mode = "rgmii";
---- a/arch/powerpc/boot/dts/taishan.dts
-+++ b/arch/powerpc/boot/dts/taishan.dts
-@@ -104,6 +104,16 @@
- 		// FIXME: anything else?
- 	};
- 
-+	L2C0: l2c {
-+		compatible = "ibm,l2-cache-440gx", "ibm,l2-cache";
-+		dcr-reg = <20 8			/* Internal SRAM DCR's */
-+			   30 8>;		/* L2 cache DCR's */
-+		cache-line-size = <20>;		/* 32 bytes */
-+		cache-size = <40000>;		/* L2, 256K */
-+		interrupt-parent = <&UIC2>;
-+		interrupts = <17 1>;
-+	};
-+
- 	plb {
- 		compatible = "ibm,plb-440gx", "ibm,plb4";
- 		#address-cells = <2>;
-@@ -232,10 +242,18 @@
- 				reg = <40000790 8>;
- 			};
- 
-+			TAH0: emac-tah@40000b50 {
-+				compatible = "ibm,tah-440gx", "ibm,tah";
-+				reg = <40000b50 30>;
-+			};
-+
-+			TAH1: emac-tah@40000d50 {
-+				compatible = "ibm,tah-440gx", "ibm,tah";
-+				reg = <40000d50 30>;
-+			};
- 
- 			EMAC0: ethernet@40000800 {
- 				unused = <1>;
--				linux,network-index = <2>;
- 				device_type = "network";
- 				compatible = "ibm,emac-440gx", "ibm,emac4";
- 				interrupt-parent = <&UIC1>;
-@@ -256,7 +274,6 @@
- 			};
- 		 	EMAC1: ethernet@40000900 {
- 				unused = <1>;
--				linux,network-index = <3>;
- 				device_type = "network";
- 				compatible = "ibm,emac-440gx", "ibm,emac4";
- 				interrupt-parent = <&UIC1>;
-@@ -277,7 +294,6 @@
- 			};
- 
- 		 	EMAC2: ethernet@40000c00 {
--				linux,network-index = <0>;
- 				device_type = "network";
- 				compatible = "ibm,emac-440gx", "ibm,emac4";
- 				interrupt-parent = <&UIC2>;
-@@ -288,7 +304,7 @@
- 				mal-tx-channel = <2>;
- 				mal-rx-channel = <2>;
- 				cell-index = <2>;
--				max-frame-size = <5dc>;
-+				max-frame-size = <2328>;
- 				rx-fifo-size = <1000>;
- 				tx-fifo-size = <800>;
- 				phy-mode = "rgmii";
-@@ -297,10 +313,11 @@
- 				rgmii-channel = <0>;
-  				zmii-device = <&ZMII0>;
- 				zmii-channel = <2>;
-+				tah-device = <&TAH0>;
-+				tah-channel = <0>;
- 			};
- 
- 		 	EMAC3: ethernet@40000e00 {
--				linux,network-index = <1>;
- 				device_type = "network";
- 				compatible = "ibm,emac-440gx", "ibm,emac4";
- 				interrupt-parent = <&UIC2>;
-@@ -311,7 +328,7 @@
- 				mal-tx-channel = <3>;
- 				mal-rx-channel = <3>;
- 				cell-index = <3>;
--				max-frame-size = <5dc>;
-+				max-frame-size = <2328>;
- 				rx-fifo-size = <1000>;
- 				tx-fifo-size = <800>;
- 				phy-mode = "rgmii";
-@@ -320,6 +337,8 @@
- 				rgmii-channel = <1>;
-  				zmii-device = <&ZMII0>;
- 				zmii-channel = <3>;
-+				tah-device = <&TAH1>;
-+				tah-channel = <0>;
- 			};
- 
- 
---- a/arch/powerpc/boot/dts/walnut.dts
-+++ b/arch/powerpc/boot/dts/walnut.dts
-@@ -125,7 +125,6 @@
- 			};
- 
- 			EMAC: ethernet@ef600800 {
--				linux,network-index = <0>;
- 				device_type = "network";
- 				compatible = "ibm,emac-405gp", "ibm,emac";
- 				interrupt-parent = <&UIC0>;
---- a/arch/powerpc/boot/dts/warp.dts
-+++ b/arch/powerpc/boot/dts/warp.dts
-@@ -204,7 +204,6 @@
- 			};
- 
- 			EMAC0: ethernet@ef600e00 {
--				linux,network-index = <0>;
- 				device_type = "network";
- 				compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
- 				interrupt-parent = <&UIC1>;
---- /dev/null
-+++ b/arch/powerpc/boot/dts/yosemite.dts
-@@ -0,0 +1,304 @@
-+/*
-+ * Device Tree Source for AMCC Yosemite
-+ *
-+ * Copyright 2008 IBM Corp.
-+ * Josh Boyer <jwboyer@linux.vnet.ibm.com>
-+ *
-+ * This file is licensed under the terms of the GNU General Public
-+ * License version 2.  This program is licensed "as is" without
-+ * any warranty of any kind, whether express or implied.
-+ */
-+
-+/ {
-+	#address-cells = <2>;
-+	#size-cells = <1>;
-+	model = "amcc,yosemite";
-+	compatible = "amcc,yosemite","amcc,bamboo";
-+	dcr-parent = <&/cpus/cpu@0>;
-+
-+	aliases {
-+		ethernet0 = &EMAC0;
-+		ethernet1 = &EMAC1;
-+		serial0 = &UART0;
-+		serial1 = &UART1;
-+		serial2 = &UART2;
-+		serial3 = &UART3;
-+	};
-+
-+	cpus {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		cpu@0 {
-+			device_type = "cpu";
-+			model = "PowerPC,440EP";
-+			reg = <0>;
-+			clock-frequency = <0>; /* Filled in by zImage */
-+			timebase-frequency = <0>; /* Filled in by zImage */
-+			i-cache-line-size = <20>;
-+			d-cache-line-size = <20>;
-+			i-cache-size = <8000>;
-+			d-cache-size = <8000>;
-+			dcr-controller;
-+			dcr-access-method = "native";
-+		};
-+	};
-+
-+	memory {
-+		device_type = "memory";
-+		reg = <0 0 0>; /* Filled in by zImage */
-+	};
-+
-+	UIC0: interrupt-controller0 {
-+		compatible = "ibm,uic-440ep","ibm,uic";
-+		interrupt-controller;
-+		cell-index = <0>;
-+		dcr-reg = <0c0 009>;
-+		#address-cells = <0>;
-+		#size-cells = <0>;
-+		#interrupt-cells = <2>;
-+	};
-+
-+	UIC1: interrupt-controller1 {
-+		compatible = "ibm,uic-440ep","ibm,uic";
-+		interrupt-controller;
-+		cell-index = <1>;
-+		dcr-reg = <0d0 009>;
-+		#address-cells = <0>;
-+		#size-cells = <0>;
-+		#interrupt-cells = <2>;
-+		interrupts = <1e 4 1f 4>; /* cascade */
-+		interrupt-parent = <&UIC0>;
-+	};
-+
-+	SDR0: sdr {
-+		compatible = "ibm,sdr-440ep";
-+		dcr-reg = <00e 002>;
-+	};
-+
-+	CPR0: cpr {
-+		compatible = "ibm,cpr-440ep";
-+		dcr-reg = <00c 002>;
-+	};
-+
-+	plb {
-+		compatible = "ibm,plb-440ep", "ibm,plb-440gp", "ibm,plb4";
-+		#address-cells = <2>;
-+		#size-cells = <1>;
-+		ranges;
-+		clock-frequency = <0>; /* Filled in by zImage */
-+
-+		SDRAM0: sdram {
-+			compatible = "ibm,sdram-440ep", "ibm,sdram-405gp";
-+			dcr-reg = <010 2>;
-+		};
-+
-+		DMA0: dma {
-+			compatible = "ibm,dma-440ep", "ibm,dma-440gp";
-+			dcr-reg = <100 027>;
-+		};
-+
-+		MAL0: mcmal {
-+			compatible = "ibm,mcmal-440ep", "ibm,mcmal-440gp", "ibm,mcmal";
-+			dcr-reg = <180 62>;
-+			num-tx-chans = <4>;
-+			num-rx-chans = <2>;
-+			interrupt-parent = <&MAL0>;
-+			interrupts = <0 1 2 3 4>;
-+			#interrupt-cells = <1>;
-+			#address-cells = <0>;
-+			#size-cells = <0>;
-+			interrupt-map = </*TXEOB*/ 0 &UIC0 a 4
-+					/*RXEOB*/ 1 &UIC0 b 4
-+					/*SERR*/  2 &UIC1 0 4
-+					/*TXDE*/  3 &UIC1 1 4
-+					/*RXDE*/  4 &UIC1 2 4>;
-+		};
-+
-+		POB0: opb {
-+			compatible = "ibm,opb-440ep", "ibm,opb-440gp", "ibm,opb";
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+			/* Bamboo is oddball in the 44x world and doesn't use the ERPN
-+			 * bits.
-+			 */
-+			ranges = <00000000 0 00000000 80000000
-+			          80000000 0 80000000 80000000>;
-+			interrupt-parent = <&UIC1>;
-+			interrupts = <7 4>;
-+			clock-frequency = <0>; /* Filled in by zImage */
-+
-+			EBC0: ebc {
-+				compatible = "ibm,ebc-440ep", "ibm,ebc-440gp", "ibm,ebc";
-+				dcr-reg = <012 2>;
-+				#address-cells = <2>;
-+				#size-cells = <1>;
-+				clock-frequency = <0>; /* Filled in by zImage */
-+				interrupts = <5 1>;
-+				interrupt-parent = <&UIC1>;
-+			};
-+
-+			UART0: serial@ef600300 {
-+				device_type = "serial";
-+				compatible = "ns16550";
-+				reg = <ef600300 8>;
-+				virtual-reg = <ef600300>;
-+				clock-frequency = <0>; /* Filled in by zImage */
-+				current-speed = <1c200>;
-+				interrupt-parent = <&UIC0>;
-+				interrupts = <0 4>;
-+			};
-+
-+			UART1: serial@ef600400 {
-+				device_type = "serial";
-+				compatible = "ns16550";
-+				reg = <ef600400 8>;
-+				virtual-reg = <ef600400>;
-+				clock-frequency = <0>;
-+				current-speed = <0>;
-+				interrupt-parent = <&UIC0>;
-+				interrupts = <1 4>;
-+			};
-+
-+			UART2: serial@ef600500 {
-+				device_type = "serial";
-+				compatible = "ns16550";
-+				reg = <ef600500 8>;
-+				virtual-reg = <ef600500>;
-+				clock-frequency = <0>;
-+				current-speed = <0>;
-+				interrupt-parent = <&UIC0>;
-+				interrupts = <3 4>;
-+				status = "disabled";
-+			};
-+
-+			UART3: serial@ef600600 {
-+				device_type = "serial";
-+				compatible = "ns16550";
-+				reg = <ef600600 8>;
-+				virtual-reg = <ef600600>;
-+				clock-frequency = <0>;
-+				current-speed = <0>;
-+				interrupt-parent = <&UIC0>;
-+				interrupts = <4 4>;
-+				status = "disabled";
-+			};
-+
-+			IIC0: i2c@ef600700 {
-+				compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic";
-+				reg = <ef600700 14>;
-+				interrupt-parent = <&UIC0>;
-+				interrupts = <2 4>;
-+			};
-+
-+			IIC1: i2c@ef600800 {
-+				compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic";
-+				reg = <ef600800 14>;
-+				interrupt-parent = <&UIC0>;
-+				interrupts = <7 4>;
-+			};
-+
-+			spi@ef600900 {
-+				compatible = "amcc,spi-440ep";
-+				reg = <ef600900 6>;
-+				interrupts = <8 4>;
-+				interrupt-parent = <&UIC0>;
-+			};
-+
-+			ZMII0: emac-zmii@ef600d00 {
-+				compatible = "ibm,zmii-440ep", "ibm,zmii-440gp", "ibm,zmii";
-+				reg = <ef600d00 c>;
-+			};
-+
-+			EMAC0: ethernet@ef600e00 {
-+				device_type = "network";
-+				compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
-+				interrupt-parent = <&UIC1>;
-+				interrupts = <1c 4 1d 4>;
-+				reg = <ef600e00 70>;
-+				local-mac-address = [000000000000];
-+				mal-device = <&MAL0>;
-+				mal-tx-channel = <0 1>;
-+				mal-rx-channel = <0>;
-+				cell-index = <0>;
-+				max-frame-size = <5dc>;
-+				rx-fifo-size = <1000>;
-+				tx-fifo-size = <800>;
-+				phy-mode = "rmii";
-+				phy-map = <00000000>;
-+				zmii-device = <&ZMII0>;
-+				zmii-channel = <0>;
-+			};
-+
-+			EMAC1: ethernet@ef600f00 {
-+				device_type = "network";
-+				compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
-+				interrupt-parent = <&UIC1>;
-+				interrupts = <1e 4 1f 4>;
-+				reg = <ef600f00 70>;
-+				local-mac-address = [000000000000];
-+				mal-device = <&MAL0>;
-+				mal-tx-channel = <2 3>;
-+				mal-rx-channel = <1>;
-+				cell-index = <1>;
-+				max-frame-size = <5dc>;
-+				rx-fifo-size = <1000>;
-+				tx-fifo-size = <800>;
-+				phy-mode = "rmii";
-+				phy-map = <00000000>;
-+				zmii-device = <&ZMII0>;
-+				zmii-channel = <1>;
-+			};
-+
-+			usb@ef601000 {
-+				compatible = "ohci-be";
-+				reg = <ef601000 80>;
-+				interrupts = <8 4 9 4>;
-+				interrupt-parent = < &UIC1 >;
-+			};
-+		};
-+
-+		PCI0: pci@ec000000 {
-+			device_type = "pci";
-+			#interrupt-cells = <1>;
-+			#size-cells = <2>;
-+			#address-cells = <3>;
-+			compatible = "ibm,plb440ep-pci", "ibm,plb-pci";
-+			primary;
-+			reg = <0 eec00000 8	/* Config space access */
-+			       0 eed00000 4	/* IACK */
-+			       0 eed00000 4	/* Special cycle */
-+			       0 ef400000 40>;	/* Internal registers */
-+
-+			/* Outbound ranges, one memory and one IO,
-+			 * later cannot be changed. Chip supports a second
-+			 * IO range but we don't use it for now
-+			 */
-+			ranges = <02000000 0 a0000000 0 a0000000 0 20000000
-+				  01000000 0 00000000 0 e8000000 0 00010000>;
-+
-+			/* Inbound 2GB range starting at 0 */
-+			dma-ranges = <42000000 0 0 0 0 0 80000000>;
-+
-+			/* Bamboo has all 4 IRQ pins tied together per slot */
-+			interrupt-map-mask = <f800 0 0 0>;
-+			interrupt-map = <
-+				/* IDSEL 1 */
-+				0800 0 0 0 &UIC0 1c 8
-+
-+				/* IDSEL 2 */
-+				1000 0 0 0 &UIC0 1b 8
-+
-+				/* IDSEL 3 */
-+				1800 0 0 0 &UIC0 1a 8
-+
-+				/* IDSEL 4 */
-+				2000 0 0 0 &UIC0 19 8
-+			>;
-+		};
-+	};
-+
-+	chosen {
-+		linux,stdout-path = "/plb/opb/serial@ef600300";
-+	};
-+};
---- a/arch/powerpc/boot/ebony.c
-+++ b/arch/powerpc/boot/ebony.c
-@@ -75,7 +75,8 @@ static void ebony_fixups(void)
- 
- 	ibm440gp_fixup_clocks(sysclk, 6 * 1843200);
- 	ibm4xx_sdram_fixup_memsize();
--	dt_fixup_mac_addresses(ebony_mac0, ebony_mac1);
-+	dt_fixup_mac_address_by_alias("ethernet0", ebony_mac0);
-+	dt_fixup_mac_address_by_alias("ethernet1", ebony_mac1);
- 	ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
- 	ebony_flashsel_fixup();
- }
---- a/arch/powerpc/boot/libfdt-wrapper.c
-+++ b/arch/powerpc/boot/libfdt-wrapper.c
-@@ -35,7 +35,7 @@
- #define check_err(err) \
- 	({ \
- 		if (BAD_ERROR(err) || ((err < 0) && DEBUG)) \
--			printf("%s():%d  %s\n\r", __FUNCTION__, __LINE__, \
-+			printf("%s():%d  %s\n\r", __func__, __LINE__, \
- 			       fdt_strerror(err)); \
- 		if (BAD_ERROR(err)) \
- 			exit(); \
---- a/arch/powerpc/boot/mpc52xx-psc.c
-+++ b/arch/powerpc/boot/mpc52xx-psc.c
-@@ -51,14 +51,9 @@ static unsigned char psc_getc(void)
- 
- int mpc5200_psc_console_init(void *devp, struct serial_console_data *scdp)
- {
--	int n;
--
- 	/* Get the base address of the psc registers */
--	n = getprop(devp, "virtual-reg", &psc, sizeof(psc));
--	if (n != sizeof(psc)) {
--		if (!dt_xlate_reg(devp, 0, (void *)&psc, NULL))
--			return -1;
--	}
-+	if (dt_get_virtual_reg(devp, &psc, 1) < 1)
-+		return -1;
- 
- 	scdp->open = psc_open;
- 	scdp->putc = psc_putc;
---- a/arch/powerpc/boot/mpsc.c
-+++ b/arch/powerpc/boot/mpsc.c
-@@ -141,7 +141,7 @@ int mpsc_console_init(void *devp, struct
- 	if (mpscintr_base == NULL)
- 		goto err_out;
- 
--	n = getprop(devp, "block-index", &v, sizeof(v));
-+	n = getprop(devp, "cell-index", &v, sizeof(v));
- 	if (n != sizeof(v))
- 		goto err_out;
- 	reg_set = (int)v;
---- a/arch/powerpc/boot/mv64x60.c
-+++ b/arch/powerpc/boot/mv64x60.c
-@@ -535,7 +535,7 @@ u8 *mv64x60_get_bridge_pbase(void)
- 	u32 v[2];
- 	void *devp;
- 
--	devp = finddevice("/mv64x60");
-+	devp = find_node_by_compatible(NULL, "marvell,mv64360");
- 	if (devp == NULL)
- 		goto err_out;
- 	if (getprop(devp, "reg", v, sizeof(v)) != sizeof(v))
-@@ -553,7 +553,7 @@ u8 *mv64x60_get_bridge_base(void)
- 	u32 v;
- 	void *devp;
- 
--	devp = finddevice("/mv64x60");
-+	devp = find_node_by_compatible(NULL, "marvell,mv64360");
- 	if (devp == NULL)
- 		goto err_out;
- 	if (getprop(devp, "virtual-reg", &v, sizeof(v)) != sizeof(v))
---- a/arch/powerpc/boot/mv64x60_i2c.c
-+++ b/arch/powerpc/boot/mv64x60_i2c.c
-@@ -185,7 +185,7 @@ int mv64x60_i2c_open(void)
- 	u32 v;
- 	void *devp;
- 
--	devp = finddevice("/mv64x60/i2c");
-+	devp = find_node_by_compatible(NULL, "marvell,mv64360-i2c");
- 	if (devp == NULL)
- 		goto err_out;
- 	if (getprop(devp, "virtual-reg", &v, sizeof(v)) != sizeof(v))
---- a/arch/powerpc/boot/ns16550.c
-+++ b/arch/powerpc/boot/ns16550.c
-@@ -55,15 +55,9 @@ static u8 ns16550_tstc(void)
- int ns16550_console_init(void *devp, struct serial_console_data *scdp)
- {
- 	int n;
--	unsigned long reg_phys;
- 
--	n = getprop(devp, "virtual-reg", &reg_base, sizeof(reg_base));
--	if (n != sizeof(reg_base)) {
--		if (!dt_xlate_reg(devp, 0, &reg_phys, NULL))
--			return -1;
--
--		reg_base = (void *)reg_phys;
--	}
-+	if (dt_get_virtual_reg(devp, (void **)&reg_base, 1) < 1)
-+		return -1;
- 
- 	n = getprop(devp, "reg-shift", &reg_shift, sizeof(reg_shift));
- 	if (n != sizeof(reg_shift))
---- a/arch/powerpc/boot/ops.h
-+++ b/arch/powerpc/boot/ops.h
-@@ -95,6 +95,7 @@ int dt_xlate_reg(void *node, int res, un
- int dt_xlate_addr(void *node, u32 *buf, int buflen, unsigned long *xlated_addr);
- int dt_is_compatible(void *node, const char *compat);
- void dt_get_reg_format(void *node, u32 *naddr, u32 *nsize);
-+int dt_get_virtual_reg(void *node, void **addr, int nres);
- 
- static inline void *finddevice(const char *name)
- {
---- a/arch/powerpc/boot/prpmc2800.c
-+++ b/arch/powerpc/boot/prpmc2800.c
-@@ -344,20 +344,20 @@ static void prpmc2800_bridge_setup(u32 m
- 			acc_bits);
- 
- 	/* Get the cpu -> pci i/o & mem mappings from the device tree */
--	devp = finddevice("/mv64x60/pci@80000000");
-+	devp = find_node_by_compatible(NULL, "marvell,mv64360-pci");
- 	if (devp == NULL)
--		fatal("Error: Missing /mv64x60/pci@80000000"
-+		fatal("Error: Missing marvell,mv64360-pci"
- 				" device tree node\n\r");
- 
- 	rc = getprop(devp, "ranges", v, sizeof(v));
- 	if (rc != sizeof(v))
--		fatal("Error: Can't find /mv64x60/pci@80000000/ranges"
-+		fatal("Error: Can't find marvell,mv64360-pci ranges"
- 				" property\n\r");
- 
- 	/* Get the cpu -> pci i/o & mem mappings from the device tree */
--	devp = finddevice("/mv64x60");
-+	devp = find_node_by_compatible(NULL, "marvell,mv64360");
- 	if (devp == NULL)
--		fatal("Error: Missing /mv64x60 device tree node\n\r");
-+		fatal("Error: Missing marvell,mv64360 device tree node\n\r");
- 
- 	enables = in_le32((u32 *)(bridge_base + MV64x60_CPU_BAR_ENABLE));
- 	enables |= 0x0007fe00; /* Disable all cpu->pci windows */
-@@ -429,9 +429,9 @@ static void prpmc2800_fixups(void)
- 	setprop(devp, "model", model, l);
- 
- 	/* Set /cpus/PowerPC,7447/clock-frequency */
--	devp = finddevice("/cpus/PowerPC,7447");
-+	devp = find_node_by_prop_value_str(NULL, "device_type", "cpu");
- 	if (devp == NULL)
--		fatal("Error: Missing proper /cpus device tree node\n\r");
-+		fatal("Error: Missing proper cpu device tree node\n\r");
- 	v[0] = bip->core_speed;
- 	setprop(devp, "clock-frequency", &v[0], sizeof(v[0]));
- 
-@@ -443,16 +443,17 @@ static void prpmc2800_fixups(void)
- 	v[1] = bip->mem_size;
- 	setprop(devp, "reg", v, sizeof(v));
- 
--	/* Update /mv64x60/model, if this is a mv64362 */
-+	/* Update model, if this is a mv64362 */
- 	if (bip->bridge_type == BRIDGE_TYPE_MV64362) {
--		devp = finddevice("/mv64x60");
-+		devp = find_node_by_compatible(NULL, "marvell,mv64360");
- 		if (devp == NULL)
--			fatal("Error: Missing /mv64x60 device tree node\n\r");
-+			fatal("Error: Missing marvell,mv64360"
-+					" device tree node\n\r");
- 		setprop(devp, "model", "mv64362", strlen("mv64362") + 1);
- 	}
- 
- 	/* Set User FLASH size */
--	devp = finddevice("/mv64x60/flash@a0000000");
-+	devp = find_node_by_compatible(NULL, "direct-mapped");
- 	if (devp == NULL)
- 		fatal("Error: Missing User FLASH device tree node\n\r");
- 	rc = getprop(devp, "reg", v, sizeof(v));
---- a/arch/powerpc/boot/ps3-head.S
-+++ b/arch/powerpc/boot/ps3-head.S
-@@ -27,8 +27,9 @@
- /*
-  * __system_reset_overlay - The PS3 first stage entry.
-  *
-- * The bootwraper build script copies the 0x100 bytes at symbol
-- * __system_reset_overlay to offset 0x100 of the rom image.
-+ * The bootwraper build script copies the 512 bytes at symbol
-+ * __system_reset_overlay to offset 0x100 of the rom image.  This symbol
-+ * must occupy 512 or less bytes.
-  *
-  * The PS3 has a single processor with two threads.
-  */
-@@ -47,8 +48,6 @@ __system_reset_overlay:
- 
- 	mfspr	r3, 0x88
- 	cntlzw.	r3, r3
--	li	r4, 0
--	li	r5, 0
- 	beq	1f
- 
- 	/* Secondary goes to __secondary_hold in kernel. */
-@@ -57,8 +56,14 @@ __system_reset_overlay:
- 	mtctr	r4
- 	bctr
- 
--	/* Primary delays then goes to _zimage_start in wrapper. */
- 1:
-+	/* Save the value at addr zero for a null pointer write check later. */
-+
-+	li	r4, 0
-+	lwz	r3, 0(r4)
-+
-+	/* Primary delays then goes to _zimage_start in wrapper. */
-+
- 	or	31, 31, 31 /* db16cyc */
- 	or	31, 31, 31 /* db16cyc */
- 
-@@ -67,16 +72,18 @@ __system_reset_overlay:
- 	mtctr	r4
- 	bctr
- 
-+	. = __system_reset_overlay + 512
-+
- /*
-  * __system_reset_kernel - Place holder for the kernel reset vector.
-  *
-- * The bootwrapper build script copies 0x100 bytes from offset 0x100
-+ * The bootwrapper build script copies 512 bytes from offset 0x100
-  * of the rom image to the symbol __system_reset_kernel.  At runtime
-- * the bootwrapper program copies the 0x100 bytes at __system_reset_kernel
-- * to ram address 0x100.  This symbol must occupy 0x100 bytes.
-+ * the bootwrapper program copies the 512 bytes at __system_reset_kernel
-+ * to ram address 0x100.  This symbol must occupy 512 bytes.
-  */
- 
- 	.globl __system_reset_kernel
- __system_reset_kernel:
- 
--	. = __system_reset_kernel + 0x100
-+	. = __system_reset_kernel + 512
---- a/arch/powerpc/boot/ps3.c
-+++ b/arch/powerpc/boot/ps3.c
-@@ -27,10 +27,10 @@
- #include "page.h"
- #include "ops.h"
- 
--extern s64 lv1_panic(u64 in_1);
--extern s64 lv1_get_logical_partition_id(u64 *out_1);
--extern s64 lv1_get_logical_ppe_id(u64 *out_1);
--extern s64 lv1_get_repository_node_value(u64 in_1, u64 in_2, u64 in_3,
-+extern int lv1_panic(u64 in_1);
-+extern int lv1_get_logical_partition_id(u64 *out_1);
-+extern int lv1_get_logical_ppe_id(u64 *out_1);
-+extern int lv1_get_repository_node_value(u64 in_1, u64 in_2, u64 in_3,
- 	u64 in_4, u64 in_5, u64 *out_1, u64 *out_2);
- 
- #ifdef DEBUG
-@@ -46,6 +46,7 @@ BSS_STACK(4096);
-  * edit the command line passed to vmlinux (by setting /chosen/bootargs).
-  * The buffer is put in it's own section so that tools may locate it easier.
-  */
-+
- static char cmdline[COMMAND_LINE_SIZE]
- 	__attribute__((__section__("__builtin_cmdline")));
- 
-@@ -75,7 +76,7 @@ static void ps3_exit(void)
- 
- static int ps3_repository_read_rm_size(u64 *rm_size)
- {
--	s64 result;
-+	int result;
- 	u64 lpar_id;
- 	u64 ppe_id;
- 	u64 v2;
-@@ -114,16 +115,17 @@ void ps3_copy_vectors(void)
- {
- 	extern char __system_reset_kernel[];
- 
--	memcpy((void *)0x100, __system_reset_kernel, 0x100);
--	flush_cache((void *)0x100, 0x100);
-+	memcpy((void *)0x100, __system_reset_kernel, 512);
-+	flush_cache((void *)0x100, 512);
- }
- 
--void platform_init(void)
-+void platform_init(unsigned long null_check)
- {
- 	const u32 heapsize = 0x1000000 - (u32)_end; /* 16MiB */
- 	void *chosen;
- 	unsigned long ft_addr;
- 	u64 rm_size;
-+	unsigned long val;
- 
- 	console_ops.write = ps3_console_write;
- 	platform_ops.exit = ps3_exit;
-@@ -151,6 +153,11 @@ void platform_init(void)
- 
- 	printf(" flat tree at 0x%lx\n\r", ft_addr);
- 
-+	val = *(unsigned long *)0;
-+
-+	if (val != null_check)
-+		printf("null check failed: %lx != %lx\n\r", val, null_check);
-+
- 	((kernel_entry_t)0)(ft_addr, 0, NULL);
- 
- 	ps3_exit();
---- a/arch/powerpc/boot/serial.c
-+++ b/arch/powerpc/boot/serial.c
-@@ -119,7 +119,7 @@ int serial_console_init(void)
- 
- 	if (dt_is_compatible(devp, "ns16550"))
- 		rc = ns16550_console_init(devp, &serial_cd);
--	else if (dt_is_compatible(devp, "marvell,mpsc"))
-+	else if (dt_is_compatible(devp, "marvell,mv64360-mpsc"))
- 		rc = mpsc_console_init(devp, &serial_cd);
- 	else if (dt_is_compatible(devp, "fsl,cpm1-scc-uart") ||
- 	         dt_is_compatible(devp, "fsl,cpm1-smc-uart") ||
---- /dev/null
-+++ b/arch/powerpc/boot/simpleboot.c
-@@ -0,0 +1,84 @@
-+/*
-+ * The simple platform -- for booting when firmware doesn't supply a device
-+ *                        tree or any platform configuration information.
-+ *                        All data is extracted from an embedded device tree
-+ *                        blob.
-+ *
-+ * Authors: Scott Wood <scottwood@freescale.com>
-+ *          Grant Likely <grant.likely@secretlab.ca>
-+ *
-+ * Copyright (c) 2007 Freescale Semiconductor, Inc.
-+ * Copyright (c) 2008 Secret Lab Technologies Ltd.
-+ *
-+ * 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.
-+ */
-+
-+#include "ops.h"
-+#include "types.h"
-+#include "io.h"
-+#include "stdio.h"
-+#include "libfdt/libfdt.h"
-+
-+BSS_STACK(4*1024);
-+
-+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
-+		   unsigned long r6, unsigned long r7)
-+{
-+	const u32 *na, *ns, *reg, *timebase;
-+	u64 memsize64;
-+	int node, size, i;
-+
-+	/* Make sure FDT blob is sane */
-+	if (fdt_check_header(_dtb_start) != 0)
-+		fatal("Invalid device tree blob\n");
-+
-+	/* Find the #address-cells and #size-cells properties */
-+	node = fdt_path_offset(_dtb_start, "/");
-+	if (node < 0)
-+		fatal("Cannot find root node\n");
-+	na = fdt_getprop(_dtb_start, node, "#address-cells", &size);
-+	if (!na || (size != 4))
-+		fatal("Cannot find #address-cells property");
-+	ns = fdt_getprop(_dtb_start, node, "#size-cells", &size);
-+	if (!ns || (size != 4))
-+		fatal("Cannot find #size-cells property");
-+
-+	/* Find the memory range */
-+	node = fdt_node_offset_by_prop_value(_dtb_start, -1, "device_type",
-+					     "memory", sizeof("memory"));
-+	if (node < 0)
-+		fatal("Cannot find memory node\n");
-+	reg = fdt_getprop(_dtb_start, node, "reg", &size);
-+	if (size < (*na+*ns) * sizeof(u32))
-+		fatal("cannot get memory range\n");
-+
-+	/* Only interested in memory based at 0 */
-+	for (i = 0; i < *na; i++)
-+		if (*reg++ != 0)
-+			fatal("Memory range is not based at address 0\n");
-+
-+	/* get the memsize and trucate it to under 4G on 32 bit machines */
-+	memsize64 = 0;
-+	for (i = 0; i < *ns; i++)
-+		memsize64 = (memsize64 << 32) | *reg++;
-+	if (sizeof(void *) == 4 && memsize64 >= 0x100000000ULL)
-+		memsize64 = 0xffffffff;
-+
-+	/* finally, setup the timebase */
-+	node = fdt_node_offset_by_prop_value(_dtb_start, -1, "device_type",
-+					     "cpu", sizeof("cpu"));
-+	if (!node)
-+		fatal("Cannot find cpu node\n");
-+	timebase = fdt_getprop(_dtb_start, node, "timebase-frequency", &size);
-+	if (timebase && (size == 4))
-+		timebase_period_ns = 1000000000 / *timebase;
-+
-+	/* Now we have the memory size; initialize the heap */
-+	simple_alloc_init(_end, memsize64 - (unsigned long)_end, 32, 64);
-+
-+	/* prepare the device tree and find the console */
-+	fdt_init(_dtb_start);
-+	serial_console_init();
-+}
---- a/arch/powerpc/boot/treeboot-walnut.c
-+++ b/arch/powerpc/boot/treeboot-walnut.c
-@@ -68,7 +68,7 @@ static void walnut_fixups(void)
- 	ibm4xx_quiesce_eth((u32 *)0xef600800, NULL);
- 	ibm4xx_fixup_ebc_ranges("/plb/ebc");
- 	walnut_flashsel_fixup();
--	dt_fixup_mac_addresses((u8 *) WALNUT_OPENBIOS_MAC_OFF);
-+	dt_fixup_mac_address_by_alias("ethernet0", (u8 *) WALNUT_OPENBIOS_MAC_OFF);
- }
- 
- void platform_init(void)
---- /dev/null
-+++ b/arch/powerpc/boot/virtex405-head.S
-@@ -0,0 +1,30 @@
-+#include "ppc_asm.h"
-+
-+	.text
-+	.global _zimage_start
-+_zimage_start:
-+
-+	/* PPC errata 213: needed by Virtex-4 FX */
-+	mfccr0  0
-+	oris    0,0,0x50000000@h
-+	mtccr0  0
-+
-+	/*
-+	 * Invalidate the data cache if the data cache is turned off.
-+	 * - The 405 core does not invalidate the data cache on power-up
-+	 *   or reset but does turn off the data cache. We cannot assume
-+	 *   that the cache contents are valid.
-+	 * - If the data cache is turned on this must have been done by
-+	 *   a bootloader and we assume that the cache contents are
-+	 *   valid.
-+	 */
-+	mfdccr	r9
-+	cmplwi	r9,0
-+	bne	2f
-+	lis	r9,0
-+	li	r8,256
-+	mtctr	r8
-+1:	dccci	r0,r9
-+	addi	r9,r9,0x20
-+	bdnz	1b
-+2:	b	_zimage_start_lib
---- a/arch/powerpc/boot/wrapper
-+++ b/arch/powerpc/boot/wrapper
-@@ -174,7 +174,7 @@ cuboot*)
-     *-mpc83*)
-         platformo=$object/cuboot-83xx.o
-         ;;
--    *-tqm8541|*-mpc8560*|*-tqm8560|*-tqm8555)
-+    *-tqm8541|*-mpc8560*|*-tqm8560|*-tqm8555|*-ksi8560*)
-         platformo=$object/cuboot-85xx-cpm2.o
-         ;;
-     *-mpc85*|*-tqm8540|*-sbc85*)
-@@ -199,6 +199,10 @@ adder875-redboot)
-     platformo="$object/fixed-head.o $object/redboot-8xx.o"
-     binary=y
-     ;;
-+simpleboot-virtex405-*)
-+    platformo="$object/virtex405-head.o $object/simpleboot.o"
-+    binary=y
-+    ;;
- esac
- 
- vmz="$tmpdir/`basename \"$kernel\"`.$ext"
-@@ -226,10 +230,13 @@ if [ -n "$version" ]; then
-     uboot_version="-n Linux-$version"
- fi
- 
-+# physical offset of kernel image
-+membase=`${CROSS}objdump -p "$kernel" | grep -m 1 LOAD | awk '{print $7}'`
-+
- case "$platform" in
- uboot)
-     rm -f "$ofile"
--    mkimage -A ppc -O linux -T kernel -C gzip -a 00000000 -e 00000000 \
-+    mkimage -A ppc -O linux -T kernel -C gzip -a $membase -e $membase \
- 	$uboot_version -d "$vmz" "$ofile"
-     if [ -z "$cacheit" ]; then
- 	rm -f "$vmz"
-@@ -298,15 +305,16 @@ treeboot*)
-     exit 0
-     ;;
- ps3)
--    # The ps3's loader supports loading gzipped binary images from flash
--    # rom to addr zero. The loader enters the image at addr 0x100.  A
--    # bootwrapper overlay is use to arrange for the kernel to be loaded
--    # to addr zero and to have a suitable bootwrapper entry at 0x100.
--    # To construct the rom image, 0x100 bytes from offset 0x100 in the
--    # kernel is copied to the bootwrapper symbol __system_reset_kernel.
--    # The 0x100 bytes at the bootwrapper symbol __system_reset_overlay is
--    # then copied to offset 0x100.  At runtime the bootwrapper program
--    # copies the 0x100 bytes at __system_reset_kernel to addr 0x100.
-+    # The ps3's loader supports loading a gzipped binary image from flash
-+    # rom to ram addr zero. The loader then enters the system reset
-+    # vector at addr 0x100.  A bootwrapper overlay is used to arrange for
-+    # a binary image of the kernel to be at addr zero, and yet have a
-+    # suitable bootwrapper entry at 0x100.  To construct the final rom
-+    # image 512 bytes from offset 0x100 is copied to the bootwrapper
-+    # place holder at symbol __system_reset_kernel.  The 512 bytes of the
-+    # bootwrapper entry code at symbol __system_reset_overlay is then
-+    # copied to offset 0x100.  At runtime the bootwrapper program copies
-+    # the data at __system_reset_kernel back to addr 0x100.
- 
-     system_reset_overlay=0x`${CROSS}nm "$ofile" \
-         | grep ' __system_reset_overlay$'       \
-@@ -317,7 +325,7 @@ ps3)
-         | cut -d' ' -f1`
-     system_reset_kernel=`printf "%d" $system_reset_kernel`
-     overlay_dest="256"
--    overlay_size="256"
-+    overlay_size="512"
- 
-     ${CROSS}objcopy -O binary "$ofile" "$ofile.bin"
- 
---- /dev/null
-+++ b/arch/powerpc/configs/40x/ep405_defconfig
-@@ -0,0 +1,968 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc2
-+# Fri Feb 15 21:50:09 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+CONFIG_40x=y
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_4xx=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_NOT_COHERENT_CACHE=y
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+# CONFIG_DEFAULT_UIMAGE is not set
-+CONFIG_PPC_DCR_NATIVE=y
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_PPC_DCR=y
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+CONFIG_POSIX_MQUEUE=y
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+CONFIG_KALLSYMS_ALL=y
-+CONFIG_KALLSYMS_EXTRA_PASS=y
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=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 is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+CONFIG_LBD=y
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_AS=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="anticipatory"
-+CONFIG_CLASSIC_RCU=y
-+# CONFIG_PREEMPT_RCU is not set
-+# CONFIG_PPC4xx_PCI_EXPRESS is not set
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_EP405=y
-+# CONFIG_KILAUEA is not set
-+# CONFIG_MAKALU is not set
-+# CONFIG_WALNUT is not set
-+# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
-+CONFIG_405GP=y
-+CONFIG_IBM405_ERR77=y
-+CONFIG_IBM405_ERR51=y
-+# CONFIG_IPIC is not set
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_RCU_TRACE=y
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_MATH_EMULATION is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_CONSISTENT_START=0xff100000
-+CONFIG_CONSISTENT_SIZE=0x00200000
-+CONFIG_BOOT_LOAD=0x00400000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+# CONFIG_IP_MULTICAST is not set
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_ARPD is not set
-+# CONFIG_SYN_COOKIES is not set
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_BEET is not set
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=y
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=y
-+CONFIG_PROC_EVENTS=y
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+CONFIG_MTD_OF_PARTS=y
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=m
-+CONFIG_MTD_BLOCK=m
-+# CONFIG_MTD_BLOCK_RO is not set
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+CONFIG_MTD_JEDECPROBE=y
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+# CONFIG_MTD_CFI_INTELEXT is not set
-+CONFIG_MTD_CFI_AMDSTD=y
-+# CONFIG_MTD_CFI_STAA is not set
-+CONFIG_MTD_CFI_UTIL=y
-+# CONFIG_MTD_RAM is not set
-+# CONFIG_MTD_ROM is not set
-+# CONFIG_MTD_ABSENT is not set
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+CONFIG_MTD_PHYSMAP_OF=y
-+# CONFIG_MTD_INTEL_VR_NOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_PMC551 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+# CONFIG_MTD_NAND is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+# CONFIG_BLK_DEV_LOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+# CONFIG_BLK_DEV_UB is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=35000
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+# CONFIG_XILINX_SYSACE is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+# CONFIG_MII is not set
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+CONFIG_IBM_NEW_EMAC=y
-+CONFIG_IBM_NEW_EMAC_RXB=128
-+CONFIG_IBM_NEW_EMAC_TXB=64
-+CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
-+CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
-+CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
-+# CONFIG_IBM_NEW_EMAC_DEBUG is not set
-+CONFIG_IBM_NEW_EMAC_ZMII=y
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+
-+#
-+# USB Network Adapters
-+#
-+# CONFIG_USB_CATC is not set
-+# CONFIG_USB_KAWETH is not set
-+# CONFIG_USB_PEGASUS is not set
-+# CONFIG_USB_RTL8150 is not set
-+# CONFIG_USB_USBNET is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+# CONFIG_INPUT is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+CONFIG_SERIAL_8250_EXTENDED=y
-+# CONFIG_SERIAL_8250_MANY_PORTS is not set
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-+# CONFIG_SERIAL_8250_RSA is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+CONFIG_SERIAL_OF_PLATFORM=y
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+CONFIG_THERMAL=y
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+# CONFIG_DAB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-+
-+#
-+# Miscellaneous USB options
-+#
-+CONFIG_USB_DEVICEFS=y
-+CONFIG_USB_DEVICE_CLASS=y
-+# CONFIG_USB_DYNAMIC_MINORS is not set
-+# CONFIG_USB_OTG is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+# CONFIG_USB_EHCI_HCD is not set
-+# CONFIG_USB_ISP116X_HCD is not set
-+CONFIG_USB_OHCI_HCD=y
-+CONFIG_USB_OHCI_HCD_PPC_OF=y
-+CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
-+CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
-+CONFIG_USB_OHCI_HCD_PCI=y
-+CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
-+CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
-+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-+# CONFIG_USB_UHCI_HCD is not set
-+# CONFIG_USB_SL811_HCD is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+
-+#
-+# USB Device Class drivers
-+#
-+# CONFIG_USB_ACM is not set
-+# CONFIG_USB_PRINTER is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+
-+#
-+# may also be needed; see USB_STORAGE Help for more information
-+#
-+# CONFIG_USB_LIBUSUAL is not set
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+CONFIG_USB_MON=y
-+
-+#
-+# USB port drivers
-+#
-+# CONFIG_USB_SERIAL is not set
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+# CONFIG_USB_EMI62 is not set
-+# CONFIG_USB_EMI26 is not set
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_AUERSWALD is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+# CONFIG_USB_BERRY_CHARGE is not set
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_PHIDGET is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+# CONFIG_USB_LD is not set
-+# CONFIG_USB_TRANCEVIBRATOR is not set
-+# CONFIG_USB_IOWARRIOR is not set
-+# CONFIG_USB_TEST is not set
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+# CONFIG_EXT3_FS is not set
-+# CONFIG_EXT4DEV_FS is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+# CONFIG_MSDOS_FS is not set
-+# CONFIG_VFAT_FS is not set
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+# CONFIG_JFFS2_FS is not set
-+CONFIG_CRAMFS=y
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# 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_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+CONFIG_DEBUG_FS=y
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+CONFIG_DEBUG_BUGVERBOSE=y
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+# CONFIG_DEBUGGER is not set
-+# CONFIG_VIRQ_DEBUG is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+CONFIG_CRYPTO_MD5=y
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=y
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=y
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/40x/kilauea_defconfig
-@@ -0,0 +1,839 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc2
-+# Fri Feb 15 21:51:43 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+CONFIG_40x=y
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_4xx=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_NOT_COHERENT_CACHE=y
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+# CONFIG_DEFAULT_UIMAGE is not set
-+CONFIG_PPC_DCR_NATIVE=y
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_PPC_DCR=y
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+CONFIG_POSIX_MQUEUE=y
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+CONFIG_KALLSYMS_ALL=y
-+CONFIG_KALLSYMS_EXTRA_PASS=y
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=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 is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+CONFIG_LBD=y
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_AS=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="anticipatory"
-+CONFIG_CLASSIC_RCU=y
-+# CONFIG_PREEMPT_RCU is not set
-+CONFIG_PPC4xx_PCI_EXPRESS=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+# CONFIG_EP405 is not set
-+CONFIG_KILAUEA=y
-+# CONFIG_MAKALU is not set
-+# CONFIG_WALNUT is not set
-+# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
-+CONFIG_405EX=y
-+# CONFIG_IPIC is not set
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_RCU_TRACE=y
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_MATH_EMULATION is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_CONSISTENT_START=0xff100000
-+CONFIG_CONSISTENT_SIZE=0x00200000
-+CONFIG_BOOT_LOAD=0x00400000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+# CONFIG_IP_MULTICAST is not set
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_ARPD is not set
-+# CONFIG_SYN_COOKIES is not set
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_BEET is not set
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=y
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=y
-+CONFIG_PROC_EVENTS=y
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+CONFIG_MTD_OF_PARTS=y
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=m
-+CONFIG_MTD_BLOCK=m
-+# CONFIG_MTD_BLOCK_RO is not set
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+CONFIG_MTD_JEDECPROBE=y
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+# CONFIG_MTD_CFI_INTELEXT is not set
-+CONFIG_MTD_CFI_AMDSTD=y
-+# CONFIG_MTD_CFI_STAA is not set
-+CONFIG_MTD_CFI_UTIL=y
-+# CONFIG_MTD_RAM is not set
-+# CONFIG_MTD_ROM is not set
-+# CONFIG_MTD_ABSENT is not set
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+CONFIG_MTD_PHYSMAP_OF=y
-+# CONFIG_MTD_INTEL_VR_NOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_PMC551 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+# CONFIG_MTD_NAND is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+# CONFIG_BLK_DEV_LOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=35000
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+# CONFIG_XILINX_SYSACE is not set
-+# CONFIG_MISC_DEVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+# CONFIG_MII is not set
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+CONFIG_IBM_NEW_EMAC=y
-+CONFIG_IBM_NEW_EMAC_RXB=256
-+CONFIG_IBM_NEW_EMAC_TXB=256
-+CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
-+CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
-+CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
-+# CONFIG_IBM_NEW_EMAC_DEBUG is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+CONFIG_IBM_NEW_EMAC_RGMII=y
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+CONFIG_IBM_NEW_EMAC_EMAC4=y
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+# CONFIG_NETDEV_1000 is not set
-+# CONFIG_NETDEV_10000 is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+# CONFIG_INPUT is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+CONFIG_SERIAL_8250_EXTENDED=y
-+# CONFIG_SERIAL_8250_MANY_PORTS is not set
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-+# CONFIG_SERIAL_8250_RSA is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+CONFIG_SERIAL_OF_PLATFORM=y
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+CONFIG_THERMAL=y
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+# CONFIG_DAB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+# CONFIG_USB_SUPPORT is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+# CONFIG_EXT3_FS is not set
-+# CONFIG_EXT4DEV_FS is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+# CONFIG_MSDOS_FS is not set
-+# CONFIG_VFAT_FS is not set
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+# CONFIG_JFFS2_FS is not set
-+CONFIG_CRAMFS=y
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# 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_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+CONFIG_DEBUG_FS=y
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+CONFIG_DEBUG_BUGVERBOSE=y
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+# CONFIG_DEBUGGER is not set
-+# CONFIG_VIRQ_DEBUG is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+CONFIG_CRYPTO_MD5=y
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=y
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=y
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/40x/makalu_defconfig
-@@ -0,0 +1,839 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc2
-+# Fri Feb 15 21:52:30 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+CONFIG_40x=y
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_4xx=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_NOT_COHERENT_CACHE=y
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+# CONFIG_DEFAULT_UIMAGE is not set
-+CONFIG_PPC_DCR_NATIVE=y
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_PPC_DCR=y
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+CONFIG_POSIX_MQUEUE=y
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+CONFIG_KALLSYMS_ALL=y
-+CONFIG_KALLSYMS_EXTRA_PASS=y
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=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 is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+CONFIG_LBD=y
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_AS=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="anticipatory"
-+CONFIG_CLASSIC_RCU=y
-+# CONFIG_PREEMPT_RCU is not set
-+CONFIG_PPC4xx_PCI_EXPRESS=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+# CONFIG_EP405 is not set
-+# CONFIG_KILAUEA is not set
-+CONFIG_MAKALU=y
-+# CONFIG_WALNUT is not set
-+# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
-+CONFIG_405EX=y
-+# CONFIG_IPIC is not set
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_RCU_TRACE=y
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_MATH_EMULATION is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_CONSISTENT_START=0xff100000
-+CONFIG_CONSISTENT_SIZE=0x00200000
-+CONFIG_BOOT_LOAD=0x00400000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+# CONFIG_IP_MULTICAST is not set
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_ARPD is not set
-+# CONFIG_SYN_COOKIES is not set
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_BEET is not set
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=y
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=y
-+CONFIG_PROC_EVENTS=y
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+CONFIG_MTD_OF_PARTS=y
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=m
-+CONFIG_MTD_BLOCK=m
-+# CONFIG_MTD_BLOCK_RO is not set
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+CONFIG_MTD_JEDECPROBE=y
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+# CONFIG_MTD_CFI_INTELEXT is not set
-+CONFIG_MTD_CFI_AMDSTD=y
-+# CONFIG_MTD_CFI_STAA is not set
-+CONFIG_MTD_CFI_UTIL=y
-+# CONFIG_MTD_RAM is not set
-+# CONFIG_MTD_ROM is not set
-+# CONFIG_MTD_ABSENT is not set
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+CONFIG_MTD_PHYSMAP_OF=y
-+# CONFIG_MTD_INTEL_VR_NOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_PMC551 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+# CONFIG_MTD_NAND is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+# CONFIG_BLK_DEV_LOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=35000
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+# CONFIG_XILINX_SYSACE is not set
-+# CONFIG_MISC_DEVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+# CONFIG_MII is not set
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+CONFIG_IBM_NEW_EMAC=y
-+CONFIG_IBM_NEW_EMAC_RXB=256
-+CONFIG_IBM_NEW_EMAC_TXB=256
-+CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
-+CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
-+CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
-+# CONFIG_IBM_NEW_EMAC_DEBUG is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+CONFIG_IBM_NEW_EMAC_RGMII=y
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+CONFIG_IBM_NEW_EMAC_EMAC4=y
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+# CONFIG_NETDEV_1000 is not set
-+# CONFIG_NETDEV_10000 is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+# CONFIG_INPUT is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+CONFIG_SERIAL_8250_EXTENDED=y
-+# CONFIG_SERIAL_8250_MANY_PORTS is not set
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-+# CONFIG_SERIAL_8250_RSA is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+CONFIG_SERIAL_OF_PLATFORM=y
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+CONFIG_THERMAL=y
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+# CONFIG_DAB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+# CONFIG_USB_SUPPORT is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+# CONFIG_EXT3_FS is not set
-+# CONFIG_EXT4DEV_FS is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+# CONFIG_MSDOS_FS is not set
-+# CONFIG_VFAT_FS is not set
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+# CONFIG_JFFS2_FS is not set
-+CONFIG_CRAMFS=y
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# 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_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+CONFIG_DEBUG_FS=y
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+CONFIG_DEBUG_BUGVERBOSE=y
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+# CONFIG_DEBUGGER is not set
-+# CONFIG_VIRQ_DEBUG is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+CONFIG_CRYPTO_MD5=y
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=y
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=y
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/40x/walnut_defconfig
-@@ -0,0 +1,887 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc2
-+# Fri Feb 15 21:54:12 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+CONFIG_40x=y
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_4xx=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_NOT_COHERENT_CACHE=y
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+# CONFIG_DEFAULT_UIMAGE is not set
-+CONFIG_PPC_DCR_NATIVE=y
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_PPC_DCR=y
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+CONFIG_POSIX_MQUEUE=y
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+CONFIG_KALLSYMS_ALL=y
-+CONFIG_KALLSYMS_EXTRA_PASS=y
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=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 is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+CONFIG_LBD=y
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_AS=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="anticipatory"
-+CONFIG_CLASSIC_RCU=y
-+# CONFIG_PREEMPT_RCU is not set
-+# CONFIG_PPC4xx_PCI_EXPRESS is not set
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+# CONFIG_EP405 is not set
-+# CONFIG_KILAUEA is not set
-+# CONFIG_MAKALU is not set
-+CONFIG_WALNUT=y
-+# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
-+CONFIG_405GP=y
-+CONFIG_IBM405_ERR77=y
-+CONFIG_IBM405_ERR51=y
-+# CONFIG_IPIC is not set
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+CONFIG_OF_RTC=y
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_RCU_TRACE=y
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_MATH_EMULATION is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+CONFIG_RESOURCES_64BIT=y
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+# CONFIG_PCI_LEGACY is not set
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_CONSISTENT_START=0xff100000
-+CONFIG_CONSISTENT_SIZE=0x00200000
-+CONFIG_BOOT_LOAD=0x00400000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+# CONFIG_IP_MULTICAST is not set
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_ARPD is not set
-+# CONFIG_SYN_COOKIES is not set
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_BEET is not set
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=y
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=y
-+CONFIG_PROC_EVENTS=y
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+CONFIG_MTD_OF_PARTS=y
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=m
-+CONFIG_MTD_BLOCK=m
-+# CONFIG_MTD_BLOCK_RO is not set
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+CONFIG_MTD_JEDECPROBE=y
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+# CONFIG_MTD_CFI_INTELEXT is not set
-+CONFIG_MTD_CFI_AMDSTD=y
-+# CONFIG_MTD_CFI_STAA is not set
-+CONFIG_MTD_CFI_UTIL=y
-+# CONFIG_MTD_RAM is not set
-+# CONFIG_MTD_ROM is not set
-+# CONFIG_MTD_ABSENT is not set
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+CONFIG_MTD_PHYSMAP_OF=y
-+# CONFIG_MTD_INTEL_VR_NOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_PMC551 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+# CONFIG_MTD_NAND is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+# CONFIG_BLK_DEV_LOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=35000
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+# CONFIG_XILINX_SYSACE is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+# CONFIG_MII is not set
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+CONFIG_IBM_NEW_EMAC=y
-+CONFIG_IBM_NEW_EMAC_RXB=128
-+CONFIG_IBM_NEW_EMAC_TXB=64
-+CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
-+CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
-+CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
-+# CONFIG_IBM_NEW_EMAC_DEBUG is not set
-+CONFIG_IBM_NEW_EMAC_ZMII=y
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+# CONFIG_INPUT is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+CONFIG_SERIAL_8250_EXTENDED=y
-+# CONFIG_SERIAL_8250_MANY_PORTS is not set
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-+# CONFIG_SERIAL_8250_RSA is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+CONFIG_SERIAL_OF_PLATFORM=y
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+CONFIG_THERMAL=y
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+# CONFIG_DAB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+# CONFIG_EXT3_FS is not set
-+# CONFIG_EXT4DEV_FS is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+# CONFIG_MSDOS_FS is not set
-+# CONFIG_VFAT_FS is not set
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+# CONFIG_JFFS2_FS is not set
-+CONFIG_CRAMFS=y
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# 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_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+CONFIG_DEBUG_FS=y
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+CONFIG_DEBUG_BUGVERBOSE=y
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+# CONFIG_DEBUGGER is not set
-+# CONFIG_VIRQ_DEBUG is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+CONFIG_CRYPTO_MD5=y
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=y
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=y
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/44x/bamboo_defconfig
-@@ -0,0 +1,815 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc2
-+# Fri Feb 15 21:36:39 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+CONFIG_44x=y
-+# CONFIG_E200 is not set
-+CONFIG_PPC_FPU=y
-+CONFIG_4xx=y
-+CONFIG_BOOKE=y
-+CONFIG_PTE_64BIT=y
-+CONFIG_PHYS_64BIT=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_NOT_COHERENT_CACHE=y
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+# CONFIG_DEFAULT_UIMAGE is not set
-+CONFIG_PPC_DCR_NATIVE=y
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_PPC_DCR=y
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+CONFIG_POSIX_MQUEUE=y
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_ALL is not set
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=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 is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+CONFIG_LBD=y
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_AS=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="anticipatory"
-+CONFIG_CLASSIC_RCU=y
-+# CONFIG_PREEMPT_RCU is not set
-+# CONFIG_PPC4xx_PCI_EXPRESS is not set
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_BAMBOO=y
-+# CONFIG_EBONY is not set
-+# CONFIG_SEQUOIA is not set
-+# CONFIG_TAISHAN is not set
-+# CONFIG_KATMAI is not set
-+# CONFIG_RAINIER is not set
-+# CONFIG_WARP is not set
-+CONFIG_440EP=y
-+CONFIG_IBM440EP_ERR42=y
-+# CONFIG_IPIC is not set
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_RCU_TRACE=y
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_MATH_EMULATION is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+CONFIG_RESOURCES_64BIT=y
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+CONFIG_CMDLINE_BOOL=y
-+CONFIG_CMDLINE=""
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_CONSISTENT_START=0xff100000
-+CONFIG_CONSISTENT_SIZE=0x00200000
-+CONFIG_BOOT_LOAD=0x01000000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+# CONFIG_IP_MULTICAST is not set
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_ARPD is not set
-+# CONFIG_SYN_COOKIES is not set
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_BEET is not set
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=y
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=y
-+CONFIG_PROC_EVENTS=y
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+# CONFIG_BLK_DEV_LOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=35000
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+# CONFIG_XILINX_SYSACE is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+# CONFIG_MII is not set
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+CONFIG_IBM_NEW_EMAC=y
-+CONFIG_IBM_NEW_EMAC_RXB=128
-+CONFIG_IBM_NEW_EMAC_TXB=64
-+CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
-+CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
-+CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
-+# CONFIG_IBM_NEW_EMAC_DEBUG is not set
-+CONFIG_IBM_NEW_EMAC_ZMII=y
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+# CONFIG_INPUT is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+# CONFIG_SERIAL_8250_PCI is not set
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+CONFIG_SERIAL_8250_EXTENDED=y
-+# CONFIG_SERIAL_8250_MANY_PORTS is not set
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-+# CONFIG_SERIAL_8250_RSA is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+CONFIG_SERIAL_OF_PLATFORM=y
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+CONFIG_THERMAL=y
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+# CONFIG_EXT3_FS is not set
-+# CONFIG_EXT4DEV_FS is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+# CONFIG_MSDOS_FS is not set
-+# CONFIG_VFAT_FS is not set
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+CONFIG_CRAMFS=y
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# 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_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+CONFIG_DEBUG_FS=y
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+CONFIG_DEBUGGER=y
-+# CONFIG_KGDB is not set
-+# CONFIG_XMON is not set
-+# CONFIG_VIRQ_DEBUG is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+CONFIG_CRYPTO_MD5=y
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=y
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=y
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/44x/canyonlands_defconfig
-@@ -0,0 +1,721 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc1
-+# Thu Feb 21 14:29:28 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+CONFIG_44x=y
-+# CONFIG_E200 is not set
-+CONFIG_PPC_FPU=y
-+CONFIG_4xx=y
-+CONFIG_BOOKE=y
-+CONFIG_PTE_64BIT=y
-+CONFIG_PHYS_64BIT=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_NOT_COHERENT_CACHE=y
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+# CONFIG_DEFAULT_UIMAGE is not set
-+CONFIG_PPC_DCR_NATIVE=y
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_PPC_DCR=y
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+CONFIG_POSIX_MQUEUE=y
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_ALL is not set
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+# CONFIG_LOGBUFFER is not set
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=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 is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+CONFIG_LBD=y
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_AS=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="anticipatory"
-+CONFIG_CLASSIC_RCU=y
-+# CONFIG_PREEMPT_RCU is not set
-+CONFIG_PPC4xx_PCI_EXPRESS=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+# CONFIG_BAMBOO is not set
-+# CONFIG_EBONY is not set
-+# CONFIG_SEQUOIA is not set
-+# CONFIG_TAISHAN is not set
-+# CONFIG_KATMAI is not set
-+# CONFIG_RAINIER is not set
-+# CONFIG_WARP is not set
-+CONFIG_CANYONLANDS=y
-+CONFIG_460EX=y
-+# CONFIG_IPIC is not set
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+CONFIG_TICK_ONESHOT=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_RCU_TRACE=y
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_MATH_EMULATION is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+CONFIG_RESOURCES_64BIT=y
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+CONFIG_CMDLINE_BOOL=y
-+CONFIG_CMDLINE=""
-+CONFIG_SECCOMP=y
-+CONFIG_WANT_DEVICE_TREE=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_CONSISTENT_START=0xff100000
-+CONFIG_CONSISTENT_SIZE=0x00200000
-+CONFIG_BOOT_LOAD=0x01000000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+# CONFIG_IP_MULTICAST is not set
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_ARPD is not set
-+# CONFIG_SYN_COOKIES is not set
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_BEET is not set
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=y
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=y
-+CONFIG_PROC_EVENTS=y
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+# CONFIG_BLK_DEV_LOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=35000
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+# CONFIG_XILINX_SYSACE is not set
-+# CONFIG_MISC_DEVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+# CONFIG_MII is not set
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+CONFIG_IBM_NEW_EMAC=y
-+CONFIG_IBM_NEW_EMAC_RXB=256
-+CONFIG_IBM_NEW_EMAC_TXB=256
-+CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
-+CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
-+CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
-+# CONFIG_IBM_NEW_EMAC_DEBUG is not set
-+CONFIG_IBM_NEW_EMAC_ZMII=y
-+CONFIG_IBM_NEW_EMAC_RGMII=y
-+CONFIG_IBM_NEW_EMAC_TAH=y
-+CONFIG_IBM_NEW_EMAC_EMAC4=y
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+# CONFIG_NETDEV_1000 is not set
-+# CONFIG_NETDEV_10000 is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+# CONFIG_INPUT is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+# CONFIG_SERIAL_8250_PCI is not set
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+CONFIG_SERIAL_8250_EXTENDED=y
-+# CONFIG_SERIAL_8250_MANY_PORTS is not set
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-+# CONFIG_SERIAL_8250_RSA is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+CONFIG_SERIAL_OF_PLATFORM=y
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+# CONFIG_THERMAL is not set
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+# CONFIG_USB_SUPPORT is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+# CONFIG_EXT3_FS is not set
-+# CONFIG_EXT4DEV_FS is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+# CONFIG_MSDOS_FS is not set
-+# CONFIG_VFAT_FS is not set
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+CONFIG_CRAMFS=y
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# 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_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+CONFIG_DEBUG_FS=y
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+CONFIG_DEBUGGER=y
-+# CONFIG_KGDB is not set
-+# CONFIG_XMON is not set
-+# CONFIG_VIRQ_DEBUG is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+# CONFIG_CRYPTO is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/44x/ebony_defconfig
-@@ -0,0 +1,898 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc2
-+# Fri Feb 15 21:50:44 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+CONFIG_44x=y
-+# CONFIG_E200 is not set
-+CONFIG_4xx=y
-+CONFIG_BOOKE=y
-+CONFIG_PTE_64BIT=y
-+CONFIG_PHYS_64BIT=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_NOT_COHERENT_CACHE=y
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+# CONFIG_DEFAULT_UIMAGE is not set
-+CONFIG_PPC_DCR_NATIVE=y
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_PPC_DCR=y
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+CONFIG_POSIX_MQUEUE=y
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+CONFIG_KALLSYMS_ALL=y
-+CONFIG_KALLSYMS_EXTRA_PASS=y
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=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 is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+CONFIG_LBD=y
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_AS=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="anticipatory"
-+CONFIG_CLASSIC_RCU=y
-+# CONFIG_PREEMPT_RCU is not set
-+# CONFIG_PPC4xx_PCI_EXPRESS is not set
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+# CONFIG_BAMBOO is not set
-+CONFIG_EBONY=y
-+# CONFIG_SEQUOIA is not set
-+# CONFIG_TAISHAN is not set
-+# CONFIG_KATMAI is not set
-+# CONFIG_RAINIER is not set
-+# CONFIG_WARP is not set
-+CONFIG_440GP=y
-+# CONFIG_IPIC is not set
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+CONFIG_OF_RTC=y
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_RCU_TRACE=y
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+CONFIG_MATH_EMULATION=y
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+CONFIG_RESOURCES_64BIT=y
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_CONSISTENT_START=0xff100000
-+CONFIG_CONSISTENT_SIZE=0x00200000
-+CONFIG_BOOT_LOAD=0x01000000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+# CONFIG_IP_MULTICAST is not set
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_ARPD is not set
-+# CONFIG_SYN_COOKIES is not set
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_BEET is not set
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=y
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=y
-+CONFIG_PROC_EVENTS=y
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+# CONFIG_MTD_CMDLINE_PARTS is not set
-+CONFIG_MTD_OF_PARTS=y
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+CONFIG_MTD_BLOCK=y
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+CONFIG_MTD_JEDECPROBE=y
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+# CONFIG_MTD_CFI_INTELEXT is not set
-+CONFIG_MTD_CFI_AMDSTD=y
-+# CONFIG_MTD_CFI_STAA is not set
-+CONFIG_MTD_CFI_UTIL=y
-+# CONFIG_MTD_RAM is not set
-+# CONFIG_MTD_ROM is not set
-+# CONFIG_MTD_ABSENT is not set
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+CONFIG_MTD_PHYSMAP_OF=y
-+# CONFIG_MTD_INTEL_VR_NOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_PMC551 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+# CONFIG_MTD_NAND is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+# CONFIG_BLK_DEV_LOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=35000
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+# CONFIG_XILINX_SYSACE is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+# CONFIG_MII is not set
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+CONFIG_IBM_NEW_EMAC=y
-+CONFIG_IBM_NEW_EMAC_RXB=128
-+CONFIG_IBM_NEW_EMAC_TXB=64
-+CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
-+CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
-+CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
-+# CONFIG_IBM_NEW_EMAC_DEBUG is not set
-+CONFIG_IBM_NEW_EMAC_ZMII=y
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+# CONFIG_INPUT is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+# CONFIG_SERIAL_8250_PCI is not set
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+CONFIG_SERIAL_8250_EXTENDED=y
-+# CONFIG_SERIAL_8250_MANY_PORTS is not set
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-+# CONFIG_SERIAL_8250_RSA is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+CONFIG_SERIAL_OF_PLATFORM=y
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+CONFIG_THERMAL=y
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+# CONFIG_DAB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+# CONFIG_EXT3_FS is not set
-+# CONFIG_EXT4DEV_FS is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+# CONFIG_MSDOS_FS is not set
-+# CONFIG_VFAT_FS is not set
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+CONFIG_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-+# CONFIG_JFFS2_SUMMARY is not set
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+# CONFIG_JFFS2_LZO is not set
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+CONFIG_CRAMFS=y
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# 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
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+CONFIG_DEBUG_FS=y
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+CONFIG_DEBUG_BUGVERBOSE=y
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+# CONFIG_DEBUGGER is not set
-+# CONFIG_VIRQ_DEBUG is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+CONFIG_CRYPTO_MD5=y
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=y
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=y
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+# CONFIG_CRYPTO_HW is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/44x/katmai_defconfig
-@@ -0,0 +1,790 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.24-rc6
-+# Mon Dec 24 11:17:43 2007
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+CONFIG_44x=y
-+# CONFIG_E200 is not set
-+CONFIG_4xx=y
-+CONFIG_BOOKE=y
-+CONFIG_PTE_64BIT=y
-+CONFIG_PHYS_64BIT=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_NOT_COHERENT_CACHE=y
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+# CONFIG_DEFAULT_UIMAGE is not set
-+CONFIG_PPC_DCR_NATIVE=y
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_PPC_DCR=y
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+CONFIG_POSIX_MQUEUE=y
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_USER_NS is not set
-+# CONFIG_PID_NS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_FAIR_GROUP_SCHED=y
-+CONFIG_FAIR_USER_SCHED=y
-+# CONFIG_FAIR_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+# CONFIG_RELAY is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_ALL is not set
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+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_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+CONFIG_LBD=y
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_AS=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="anticipatory"
-+CONFIG_PPC4xx_PCI_EXPRESS=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC52xx is not set
-+# CONFIG_PPC_MPC5200 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+# CONFIG_BAMBOO is not set
-+# CONFIG_EBONY is not set
-+# CONFIG_SEQUOIA is not set
-+# CONFIG_TAISHAN is not set
-+CONFIG_KATMAI=y
-+# CONFIG_RAINIER is not set
-+CONFIG_440SPe=y
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_CPM2 is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_MATH_EMULATION is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+CONFIG_RESOURCES_64BIT=y
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+CONFIG_CMDLINE_BOOL=y
-+CONFIG_CMDLINE=""
-+CONFIG_SECCOMP=y
-+CONFIG_WANT_DEVICE_TREE=y
-+CONFIG_DEVICE_TREE="katmai.dts"
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_CONSISTENT_START=0xff100000
-+CONFIG_CONSISTENT_SIZE=0x00200000
-+CONFIG_BOOT_LOAD=0x01000000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+# CONFIG_IP_MULTICAST is not set
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_ARPD is not set
-+# CONFIG_SYN_COOKIES is not set
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_BEET is not set
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=y
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=y
-+CONFIG_PROC_EVENTS=y
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+# CONFIG_BLK_DEV_LOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=35000
-+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+# CONFIG_XILINX_SYSACE is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+CONFIG_MACINTOSH_DRIVERS=y
-+# CONFIG_MAC_EMUMOUSEBTN is not set
-+# CONFIG_WINDFARM is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_ARCNET is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+# CONFIG_MII is not set
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+CONFIG_IBM_NEW_EMAC=y
-+CONFIG_IBM_NEW_EMAC_RXB=128
-+CONFIG_IBM_NEW_EMAC_TXB=64
-+CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
-+CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
-+CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
-+# CONFIG_IBM_NEW_EMAC_DEBUG is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+CONFIG_IBM_NEW_EMAC_EMAC4=y
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_SHAPER is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+# CONFIG_INPUT is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+# CONFIG_SERIAL_8250_PCI is not set
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+CONFIG_SERIAL_8250_EXTENDED=y
-+# CONFIG_SERIAL_8250_MANY_PORTS is not set
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-+# CONFIG_SERIAL_8250_RSA is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+CONFIG_SERIAL_OF_PLATFORM=y
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+
-+#
-+# USB Gadget Support
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+# CONFIG_EXT3_FS is not set
-+# CONFIG_EXT4DEV_FS is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+CONFIG_DNOTIFY=y
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+# CONFIG_MSDOS_FS is not set
-+# CONFIG_VFAT_FS is not set
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+CONFIG_CRAMFS=y
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+# CONFIG_UCC_SLOW is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# 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_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+CONFIG_INSTRUMENTATION=y
-+# CONFIG_PROFILING is not set
-+# CONFIG_KPROBES is not set
-+# CONFIG_MARKERS is not set
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+CONFIG_FORCED_INLINING=y
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+CONFIG_DEBUGGER=y
-+# CONFIG_KGDB is not set
-+# CONFIG_XMON is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+CONFIG_CRYPTO_MD5=y
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=y
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=y
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/44x/rainier_defconfig
-@@ -0,0 +1,899 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc2
-+# Fri Feb 15 21:53:10 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+CONFIG_44x=y
-+# CONFIG_E200 is not set
-+CONFIG_4xx=y
-+CONFIG_BOOKE=y
-+CONFIG_PTE_64BIT=y
-+CONFIG_PHYS_64BIT=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_NOT_COHERENT_CACHE=y
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+# CONFIG_DEFAULT_UIMAGE is not set
-+CONFIG_PPC_DCR_NATIVE=y
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_PPC_DCR=y
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+CONFIG_POSIX_MQUEUE=y
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_ALL is not set
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=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 is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+CONFIG_LBD=y
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_AS=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="anticipatory"
-+CONFIG_CLASSIC_RCU=y
-+# CONFIG_PREEMPT_RCU is not set
-+# CONFIG_PPC4xx_PCI_EXPRESS is not set
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+# CONFIG_BAMBOO is not set
-+# CONFIG_EBONY is not set
-+# CONFIG_SEQUOIA is not set
-+# CONFIG_TAISHAN is not set
-+# CONFIG_KATMAI is not set
-+CONFIG_RAINIER=y
-+# CONFIG_WARP is not set
-+CONFIG_440GRX=y
-+# CONFIG_IPIC is not set
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_RCU_TRACE=y
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+CONFIG_MATH_EMULATION=y
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+CONFIG_RESOURCES_64BIT=y
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+CONFIG_CMDLINE_BOOL=y
-+CONFIG_CMDLINE=""
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_CONSISTENT_START=0xff100000
-+CONFIG_CONSISTENT_SIZE=0x00200000
-+CONFIG_BOOT_LOAD=0x01000000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+# CONFIG_IP_MULTICAST is not set
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_ARPD is not set
-+# CONFIG_SYN_COOKIES is not set
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_BEET is not set
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=y
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=y
-+CONFIG_PROC_EVENTS=y
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+CONFIG_MTD_OF_PARTS=y
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+# CONFIG_MTD_BLKDEVS is not set
-+# CONFIG_MTD_BLOCK is not set
-+# CONFIG_MTD_BLOCK_RO is not set
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+CONFIG_MTD_JEDECPROBE=y
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+CONFIG_MTD_CFI_INTELEXT=y
-+CONFIG_MTD_CFI_AMDSTD=y
-+# CONFIG_MTD_CFI_STAA is not set
-+CONFIG_MTD_CFI_UTIL=y
-+# CONFIG_MTD_RAM is not set
-+# CONFIG_MTD_ROM is not set
-+# CONFIG_MTD_ABSENT is not set
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+CONFIG_MTD_PHYSMAP_OF=y
-+# CONFIG_MTD_INTEL_VR_NOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_PMC551 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+# CONFIG_MTD_NAND is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+# CONFIG_BLK_DEV_LOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=35000
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+# CONFIG_XILINX_SYSACE is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+CONFIG_MACINTOSH_DRIVERS=y
-+# CONFIG_MAC_EMUMOUSEBTN is not set
-+# CONFIG_WINDFARM is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+# CONFIG_NET_ETHERNET is not set
-+CONFIG_IBM_NEW_EMAC_ZMII=y
-+CONFIG_IBM_NEW_EMAC_RGMII=y
-+CONFIG_IBM_NEW_EMAC_EMAC4=y
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+# CONFIG_INPUT is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+# CONFIG_SERIAL_8250_PCI is not set
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+CONFIG_SERIAL_8250_EXTENDED=y
-+# CONFIG_SERIAL_8250_MANY_PORTS is not set
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-+# CONFIG_SERIAL_8250_RSA is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+CONFIG_SERIAL_OF_PLATFORM=y
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+CONFIG_THERMAL=y
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+# CONFIG_EXT3_FS is not set
-+# CONFIG_EXT4DEV_FS is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+# CONFIG_MSDOS_FS is not set
-+# CONFIG_VFAT_FS is not set
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+CONFIG_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-+# CONFIG_JFFS2_SUMMARY is not set
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+# CONFIG_JFFS2_LZO is not set
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+CONFIG_CRAMFS=y
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# 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
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+CONFIG_DEBUG_FS=y
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+CONFIG_DEBUGGER=y
-+# CONFIG_KGDB is not set
-+# CONFIG_XMON is not set
-+# CONFIG_VIRQ_DEBUG is not set
-+# CONFIG_BDI_SWITCH is not set
-+CONFIG_PPC_EARLY_DEBUG=y
-+# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
-+# CONFIG_PPC_EARLY_DEBUG_G5 is not set
-+# CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL is not set
-+# CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set
-+# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
-+# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
-+# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
-+# CONFIG_PPC_EARLY_DEBUG_BEAT is not set
-+CONFIG_PPC_EARLY_DEBUG_44x=y
-+# CONFIG_PPC_EARLY_DEBUG_40x is not set
-+# CONFIG_PPC_EARLY_DEBUG_CPM is not set
-+CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0xef600300
-+CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x1
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+CONFIG_CRYPTO_MD5=y
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=y
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=y
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/44x/sequoia_defconfig
-@@ -0,0 +1,916 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc2
-+# Fri Feb 15 21:53:46 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+CONFIG_44x=y
-+# CONFIG_E200 is not set
-+CONFIG_PPC_FPU=y
-+CONFIG_4xx=y
-+CONFIG_BOOKE=y
-+CONFIG_PTE_64BIT=y
-+CONFIG_PHYS_64BIT=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_NOT_COHERENT_CACHE=y
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+# CONFIG_DEFAULT_UIMAGE is not set
-+CONFIG_PPC_DCR_NATIVE=y
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_PPC_DCR=y
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+CONFIG_POSIX_MQUEUE=y
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_ALL is not set
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=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 is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+CONFIG_LBD=y
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_AS=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="anticipatory"
-+CONFIG_CLASSIC_RCU=y
-+# CONFIG_PREEMPT_RCU is not set
-+# CONFIG_PPC4xx_PCI_EXPRESS is not set
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+# CONFIG_BAMBOO is not set
-+# CONFIG_EBONY is not set
-+CONFIG_SEQUOIA=y
-+# CONFIG_TAISHAN is not set
-+# CONFIG_KATMAI is not set
-+# CONFIG_RAINIER is not set
-+# CONFIG_WARP is not set
-+CONFIG_440EPX=y
-+# CONFIG_IPIC is not set
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+CONFIG_TICK_ONESHOT=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_RCU_TRACE=y
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_MATH_EMULATION is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+CONFIG_RESOURCES_64BIT=y
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+CONFIG_CMDLINE_BOOL=y
-+CONFIG_CMDLINE=""
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_CONSISTENT_START=0xff100000
-+CONFIG_CONSISTENT_SIZE=0x00200000
-+CONFIG_BOOT_LOAD=0x01000000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+# CONFIG_IP_MULTICAST is not set
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_ARPD is not set
-+# CONFIG_SYN_COOKIES is not set
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_BEET is not set
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=y
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=y
-+CONFIG_PROC_EVENTS=y
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+CONFIG_MTD_OF_PARTS=y
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+# CONFIG_MTD_BLKDEVS is not set
-+# CONFIG_MTD_BLOCK is not set
-+# CONFIG_MTD_BLOCK_RO is not set
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+CONFIG_MTD_JEDECPROBE=y
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+CONFIG_MTD_CFI_INTELEXT=y
-+CONFIG_MTD_CFI_AMDSTD=y
-+# CONFIG_MTD_CFI_STAA is not set
-+CONFIG_MTD_CFI_UTIL=y
-+# CONFIG_MTD_RAM is not set
-+# CONFIG_MTD_ROM is not set
-+# CONFIG_MTD_ABSENT is not set
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+CONFIG_MTD_PHYSMAP_OF=y
-+# CONFIG_MTD_INTEL_VR_NOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_PMC551 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+# CONFIG_MTD_NAND is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+# CONFIG_BLK_DEV_LOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=35000
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+# CONFIG_XILINX_SYSACE is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+# CONFIG_MII is not set
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+CONFIG_IBM_NEW_EMAC=y
-+CONFIG_IBM_NEW_EMAC_RXB=128
-+CONFIG_IBM_NEW_EMAC_TXB=64
-+CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
-+CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
-+CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
-+# CONFIG_IBM_NEW_EMAC_DEBUG is not set
-+CONFIG_IBM_NEW_EMAC_ZMII=y
-+CONFIG_IBM_NEW_EMAC_RGMII=y
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+CONFIG_IBM_NEW_EMAC_EMAC4=y
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+# CONFIG_INPUT is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+# CONFIG_SERIAL_8250_PCI is not set
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+CONFIG_SERIAL_8250_EXTENDED=y
-+# CONFIG_SERIAL_8250_MANY_PORTS is not set
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-+# CONFIG_SERIAL_8250_RSA is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+CONFIG_SERIAL_OF_PLATFORM=y
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+CONFIG_THERMAL=y
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+# CONFIG_EXT3_FS is not set
-+# CONFIG_EXT4DEV_FS is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+# CONFIG_MSDOS_FS is not set
-+# CONFIG_VFAT_FS is not set
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+CONFIG_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-+# CONFIG_JFFS2_SUMMARY is not set
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+# CONFIG_JFFS2_LZO is not set
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+CONFIG_CRAMFS=y
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# 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
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+CONFIG_DEBUG_FS=y
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+CONFIG_DEBUGGER=y
-+# CONFIG_KGDB is not set
-+# CONFIG_XMON is not set
-+# CONFIG_VIRQ_DEBUG is not set
-+# CONFIG_BDI_SWITCH is not set
-+CONFIG_PPC_EARLY_DEBUG=y
-+# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
-+# CONFIG_PPC_EARLY_DEBUG_G5 is not set
-+# CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL is not set
-+# CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set
-+# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
-+# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
-+# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
-+# CONFIG_PPC_EARLY_DEBUG_BEAT is not set
-+CONFIG_PPC_EARLY_DEBUG_44x=y
-+# CONFIG_PPC_EARLY_DEBUG_40x is not set
-+# CONFIG_PPC_EARLY_DEBUG_CPM is not set
-+CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0xef600300
-+CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x1
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+CONFIG_CRYPTO_MD5=y
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=y
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=y
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/44x/taishan_defconfig
-@@ -0,0 +1,815 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc2
-+# Fri Feb 15 21:40:44 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+CONFIG_44x=y
-+# CONFIG_E200 is not set
-+CONFIG_4xx=y
-+CONFIG_BOOKE=y
-+CONFIG_PTE_64BIT=y
-+CONFIG_PHYS_64BIT=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_NOT_COHERENT_CACHE=y
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+# CONFIG_DEFAULT_UIMAGE is not set
-+CONFIG_PPC_DCR_NATIVE=y
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_PPC_DCR=y
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+CONFIG_POSIX_MQUEUE=y
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_ALL is not set
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=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 is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+CONFIG_LBD=y
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_AS=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="anticipatory"
-+CONFIG_CLASSIC_RCU=y
-+# CONFIG_PREEMPT_RCU is not set
-+# CONFIG_PPC4xx_PCI_EXPRESS is not set
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+# CONFIG_BAMBOO is not set
-+# CONFIG_EBONY is not set
-+# CONFIG_SEQUOIA is not set
-+CONFIG_TAISHAN=y
-+# CONFIG_KATMAI is not set
-+# CONFIG_RAINIER is not set
-+# CONFIG_WARP is not set
-+CONFIG_440GX=y
-+# CONFIG_IPIC is not set
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_RCU_TRACE=y
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_MATH_EMULATION is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+CONFIG_RESOURCES_64BIT=y
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+CONFIG_CMDLINE_BOOL=y
-+CONFIG_CMDLINE=""
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_CONSISTENT_START=0xff100000
-+CONFIG_CONSISTENT_SIZE=0x00200000
-+CONFIG_BOOT_LOAD=0x01000000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+# CONFIG_IP_MULTICAST is not set
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_ARPD is not set
-+# CONFIG_SYN_COOKIES is not set
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_BEET is not set
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=y
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=y
-+CONFIG_PROC_EVENTS=y
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+# CONFIG_BLK_DEV_LOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=35000
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+# CONFIG_XILINX_SYSACE is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+CONFIG_MACINTOSH_DRIVERS=y
-+# CONFIG_MAC_EMUMOUSEBTN is not set
-+# CONFIG_WINDFARM is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+# CONFIG_MII is not set
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+CONFIG_IBM_NEW_EMAC=y
-+CONFIG_IBM_NEW_EMAC_RXB=128
-+CONFIG_IBM_NEW_EMAC_TXB=64
-+CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
-+CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
-+CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
-+# CONFIG_IBM_NEW_EMAC_DEBUG is not set
-+CONFIG_IBM_NEW_EMAC_ZMII=y
-+CONFIG_IBM_NEW_EMAC_RGMII=y
-+CONFIG_IBM_NEW_EMAC_TAH=y
-+CONFIG_IBM_NEW_EMAC_EMAC4=y
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+# CONFIG_INPUT is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+# CONFIG_SERIAL_8250_PCI is not set
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+CONFIG_SERIAL_8250_EXTENDED=y
-+# CONFIG_SERIAL_8250_MANY_PORTS is not set
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-+# CONFIG_SERIAL_8250_RSA is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+CONFIG_SERIAL_OF_PLATFORM=y
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+CONFIG_THERMAL=y
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+# CONFIG_EXT3_FS is not set
-+# CONFIG_EXT4DEV_FS is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+# CONFIG_MSDOS_FS is not set
-+# CONFIG_VFAT_FS is not set
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+CONFIG_CRAMFS=y
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# 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_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+CONFIG_DEBUG_FS=y
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+CONFIG_DEBUGGER=y
-+# CONFIG_KGDB is not set
-+# CONFIG_XMON is not set
-+# CONFIG_VIRQ_DEBUG is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+CONFIG_CRYPTO_MD5=y
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=y
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=y
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/44x/warp_defconfig
-@@ -0,0 +1,1110 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc2
-+# Fri Feb 15 21:54:43 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+CONFIG_44x=y
-+# CONFIG_E200 is not set
-+CONFIG_PPC_FPU=y
-+CONFIG_4xx=y
-+CONFIG_BOOKE=y
-+CONFIG_PTE_64BIT=y
-+CONFIG_PHYS_64BIT=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_NOT_COHERENT_CACHE=y
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+# CONFIG_DEFAULT_UIMAGE is not set
-+CONFIG_PPC_DCR_NATIVE=y
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_PPC_DCR=y
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION="-pika"
-+# CONFIG_LOCALVERSION_AUTO is not set
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_ALL is not set
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+# CONFIG_HOTPLUG is not set
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=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_SLAB=y
-+# CONFIG_SLUB is not set
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+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
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_AS=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="anticipatory"
-+CONFIG_CLASSIC_RCU=y
-+# CONFIG_PREEMPT_RCU is not set
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+# CONFIG_BAMBOO is not set
-+# CONFIG_EBONY is not set
-+# CONFIG_SEQUOIA is not set
-+# CONFIG_TAISHAN is not set
-+# CONFIG_KATMAI is not set
-+# CONFIG_RAINIER is not set
-+CONFIG_WARP=y
-+CONFIG_440EP=y
-+CONFIG_IBM440EP_ERR42=y
-+# CONFIG_IPIC is not set
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+# CONFIG_HZ_250 is not set
-+# CONFIG_HZ_300 is not set
-+CONFIG_HZ_1000=y
-+CONFIG_HZ=1000
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_RCU_TRACE=y
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_MATH_EMULATION is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+CONFIG_RESOURCES_64BIT=y
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+CONFIG_CMDLINE_BOOL=y
-+CONFIG_CMDLINE="ip=on"
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+# CONFIG_PCI is not set
-+# CONFIG_PCI_DOMAINS is not set
-+# CONFIG_PCI_SYSCALL is not set
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_CONSISTENT_START=0xff100000
-+CONFIG_CONSISTENT_SIZE=0x00200000
-+CONFIG_BOOT_LOAD=0x01000000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+# CONFIG_IP_MULTICAST is not set
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+# CONFIG_IP_PNP_BOOTP is not set
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_ARPD is not set
-+# CONFIG_SYN_COOKIES is not set
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+CONFIG_INET_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IP_VS is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+CONFIG_NETFILTER=y
-+# CONFIG_NETFILTER_DEBUG is not set
-+CONFIG_NETFILTER_ADVANCED=y
-+
-+#
-+# Core Netfilter Configuration
-+#
-+# CONFIG_NETFILTER_NETLINK_QUEUE is not set
-+# CONFIG_NETFILTER_NETLINK_LOG is not set
-+# CONFIG_NF_CONNTRACK is not set
-+# CONFIG_NETFILTER_XTABLES is not set
-+
-+#
-+# IP: Netfilter Configuration
-+#
-+# CONFIG_IP_NF_QUEUE is not set
-+# CONFIG_IP_NF_IPTABLES is not set
-+# CONFIG_IP_NF_ARPTABLES is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+CONFIG_VLAN_8021Q=y
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+# CONFIG_STANDALONE is not set
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+# CONFIG_MTD_CMDLINE_PARTS is not set
-+CONFIG_MTD_OF_PARTS=y
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+CONFIG_MTD_BLOCK=y
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+CONFIG_MTD_OOPS=m
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+# CONFIG_MTD_CFI_INTELEXT is not set
-+CONFIG_MTD_CFI_AMDSTD=y
-+# CONFIG_MTD_CFI_STAA is not set
-+CONFIG_MTD_CFI_UTIL=y
-+# CONFIG_MTD_RAM is not set
-+# CONFIG_MTD_ROM is not set
-+# CONFIG_MTD_ABSENT is not set
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+CONFIG_MTD_PHYSMAP_OF=y
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+CONFIG_MTD_NAND=y
-+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
-+CONFIG_MTD_NAND_ECC_SMC=y
-+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-+CONFIG_MTD_NAND_IDS=y
-+# CONFIG_MTD_NAND_DISKONCHIP is not set
-+# CONFIG_MTD_NAND_NANDSIM is not set
-+# CONFIG_MTD_NAND_PLATFORM is not set
-+# CONFIG_MTD_ALAUDA is not set
-+# CONFIG_MTD_NAND_FSL_ELBC is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+# CONFIG_BLK_DEV_LOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_UB is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=4096
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+# CONFIG_XILINX_SYSACE is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=y
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=y
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+# CONFIG_BLK_DEV_SR is not set
-+# CONFIG_CHR_DEV_SG is not set
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+# CONFIG_SCSI_SCAN_ASYNC is not set
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+CONFIG_SCSI_SPI_ATTRS=y
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+# CONFIG_SCSI_LOWLEVEL is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+CONFIG_IBM_NEW_EMAC=y
-+CONFIG_IBM_NEW_EMAC_RXB=128
-+CONFIG_IBM_NEW_EMAC_TXB=64
-+CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
-+CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
-+CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
-+# CONFIG_IBM_NEW_EMAC_DEBUG is not set
-+CONFIG_IBM_NEW_EMAC_ZMII=y
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_B44 is not set
-+# CONFIG_NETDEV_1000 is not set
-+# CONFIG_NETDEV_10000 is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+
-+#
-+# USB Network Adapters
-+#
-+# CONFIG_USB_CATC is not set
-+# CONFIG_USB_KAWETH is not set
-+# CONFIG_USB_PEGASUS is not set
-+# CONFIG_USB_RTL8150 is not set
-+# CONFIG_USB_USBNET is not set
-+# CONFIG_WAN is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+# CONFIG_INPUT is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+CONFIG_SERIAL_8250_EXTENDED=y
-+# CONFIG_SERIAL_8250_MANY_PORTS is not set
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-+# CONFIG_SERIAL_8250_RSA is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+CONFIG_HW_RANDOM=y
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+# CONFIG_I2C_CHARDEV is not set
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_MPC is not set
-+# 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
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+CONFIG_SENSORS_EEPROM=y
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+# CONFIG_I2C_DEBUG_CORE is not set
-+# CONFIG_I2C_DEBUG_ALGO is not set
-+# CONFIG_I2C_DEBUG_BUS is not set
-+# CONFIG_I2C_DEBUG_CHIP is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S is not set
-+# CONFIG_SENSORS_GL518SM is not set
-+# CONFIG_SENSORS_GL520SM is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_LM63 is not set
-+# CONFIG_SENSORS_LM75 is not set
-+# CONFIG_SENSORS_LM77 is not set
-+# CONFIG_SENSORS_LM78 is not set
-+# CONFIG_SENSORS_LM80 is not set
-+# CONFIG_SENSORS_LM83 is not set
-+# CONFIG_SENSORS_LM85 is not set
-+# 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_ADS7828 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
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83L786NG is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+CONFIG_THERMAL=y
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+# CONFIG_DAB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_VGASTATE is not set
-+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+# CONFIG_USB_ARCH_HAS_EHCI is not set
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-+
-+#
-+# Miscellaneous USB options
-+#
-+# CONFIG_USB_DEVICEFS is not set
-+CONFIG_USB_DEVICE_CLASS=y
-+# CONFIG_USB_DYNAMIC_MINORS is not set
-+# CONFIG_USB_OTG is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+# CONFIG_USB_ISP116X_HCD is not set
-+CONFIG_USB_OHCI_HCD=y
-+CONFIG_USB_OHCI_HCD_PPC_OF=y
-+CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
-+# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
-+CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
-+CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
-+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-+# CONFIG_USB_SL811_HCD is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+
-+#
-+# USB Device Class drivers
-+#
-+# CONFIG_USB_ACM is not set
-+# CONFIG_USB_PRINTER is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+
-+#
-+# may also be needed; see USB_STORAGE Help for more information
-+#
-+CONFIG_USB_STORAGE=y
-+# CONFIG_USB_STORAGE_DEBUG is not set
-+# CONFIG_USB_STORAGE_DATAFAB is not set
-+# CONFIG_USB_STORAGE_FREECOM is not set
-+# CONFIG_USB_STORAGE_ISD200 is not set
-+# CONFIG_USB_STORAGE_DPCM is not set
-+# CONFIG_USB_STORAGE_USBAT is not set
-+# CONFIG_USB_STORAGE_SDDR09 is not set
-+# CONFIG_USB_STORAGE_SDDR55 is not set
-+# CONFIG_USB_STORAGE_JUMPSHOT is not set
-+# CONFIG_USB_STORAGE_ALAUDA is not set
-+# CONFIG_USB_STORAGE_KARMA is not set
-+# CONFIG_USB_LIBUSUAL is not set
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
-+CONFIG_USB_MON=y
-+
-+#
-+# USB port drivers
-+#
-+# CONFIG_USB_SERIAL is not set
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+# CONFIG_USB_EMI62 is not set
-+# CONFIG_USB_EMI26 is not set
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_AUERSWALD is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+# CONFIG_USB_BERRY_CHARGE is not set
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_PHIDGET is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+# CONFIG_USB_LD is not set
-+# CONFIG_USB_TRANCEVIBRATOR is not set
-+# CONFIG_USB_IOWARRIOR is not set
-+# CONFIG_USB_GADGET is not set
-+CONFIG_MMC=m
-+# CONFIG_MMC_DEBUG is not set
-+# CONFIG_MMC_UNSAFE_RESUME is not set
-+
-+#
-+# MMC/SD Card Drivers
-+#
-+CONFIG_MMC_BLOCK=m
-+CONFIG_MMC_BLOCK_BOUNCE=y
-+# CONFIG_SDIO_UART is not set
-+
-+#
-+# MMC/SD Host Controller Drivers
-+#
-+# CONFIG_MMC_WBSD is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+# CONFIG_EXT3_FS is not set
-+# CONFIG_EXT4DEV_FS is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+CONFIG_FAT_FS=y
-+CONFIG_MSDOS_FS=y
-+CONFIG_VFAT_FS=y
-+CONFIG_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+# CONFIG_TMPFS is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+CONFIG_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-+# CONFIG_JFFS2_SUMMARY is not set
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+# CONFIG_JFFS2_LZO is not set
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+CONFIG_CRAMFS=y
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+CONFIG_NLS=y
-+CONFIG_NLS_DEFAULT="iso8859-1"
-+CONFIG_NLS_CODEPAGE_437=y
-+# CONFIG_NLS_CODEPAGE_737 is not set
-+# CONFIG_NLS_CODEPAGE_775 is not set
-+CONFIG_NLS_CODEPAGE_850=y
-+# CONFIG_NLS_CODEPAGE_852 is not set
-+# CONFIG_NLS_CODEPAGE_855 is not set
-+# CONFIG_NLS_CODEPAGE_857 is not set
-+# CONFIG_NLS_CODEPAGE_860 is not set
-+# CONFIG_NLS_CODEPAGE_861 is not set
-+# CONFIG_NLS_CODEPAGE_862 is not set
-+# CONFIG_NLS_CODEPAGE_863 is not set
-+# CONFIG_NLS_CODEPAGE_864 is not set
-+# CONFIG_NLS_CODEPAGE_865 is not set
-+# CONFIG_NLS_CODEPAGE_866 is not set
-+# CONFIG_NLS_CODEPAGE_869 is not set
-+# CONFIG_NLS_CODEPAGE_936 is not set
-+# CONFIG_NLS_CODEPAGE_950 is not set
-+# CONFIG_NLS_CODEPAGE_932 is not set
-+# CONFIG_NLS_CODEPAGE_949 is not set
-+# CONFIG_NLS_CODEPAGE_874 is not set
-+# CONFIG_NLS_ISO8859_8 is not set
-+# CONFIG_NLS_CODEPAGE_1250 is not set
-+# CONFIG_NLS_CODEPAGE_1251 is not set
-+CONFIG_NLS_ASCII=y
-+CONFIG_NLS_ISO8859_1=y
-+# CONFIG_NLS_ISO8859_2 is not set
-+# CONFIG_NLS_ISO8859_3 is not set
-+# CONFIG_NLS_ISO8859_4 is not set
-+# CONFIG_NLS_ISO8859_5 is not set
-+# CONFIG_NLS_ISO8859_6 is not set
-+# CONFIG_NLS_ISO8859_7 is not set
-+# CONFIG_NLS_ISO8859_9 is not set
-+# CONFIG_NLS_ISO8859_13 is not set
-+# CONFIG_NLS_ISO8859_14 is not set
-+CONFIG_NLS_ISO8859_15=y
-+# CONFIG_NLS_KOI8_R is not set
-+# CONFIG_NLS_KOI8_U is not set
-+CONFIG_NLS_UTF8=y
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+CONFIG_CRC_CCITT=y
-+# 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
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+CONFIG_DEBUG_FS=y
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+# CONFIG_SCHED_DEBUG is not set
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_DEBUG_SLAB is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+CONFIG_DEBUG_INFO=y
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+# CONFIG_DEBUGGER is not set
-+# CONFIG_VIRQ_DEBUG is not set
-+CONFIG_BDI_SWITCH=y
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+# CONFIG_CRYPTO_MANAGER is not set
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+# CONFIG_CRYPTO_MD5 is not set
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+# CONFIG_CRYPTO_CBC is not set
-+# CONFIG_CRYPTO_PCBC is not set
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+# CONFIG_CRYPTO_DES is not set
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
-@@ -0,0 +1,1395 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Fri Apr 11 11:10:09 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+CONFIG_6xx=y
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_PPC_FPU=y
-+# CONFIG_FSL_EMB_PERFMON is not set
-+CONFIG_PPC_STD_MMU=y
-+CONFIG_PPC_STD_MMU_32=y
-+# CONFIG_PPC_MM_SLICES is not set
-+# CONFIG_SMP is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+# CONFIG_KALLSYMS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+# CONFIG_EPOLL is not set
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+# CONFIG_KMOD is not set
-+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
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_AS=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="anticipatory"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MULTIPLATFORM is not set
-+# CONFIG_PPC_82xx is not set
-+CONFIG_PPC_83xx=y
-+# CONFIG_PPC_86xx is not set
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC83xx=y
-+CONFIG_MPC831x_RDB=y
-+# CONFIG_MPC832x_MDS is not set
-+# CONFIG_MPC832x_RDB is not set
-+# CONFIG_MPC834x_MDS is not set
-+# CONFIG_MPC834x_ITX is not set
-+# CONFIG_MPC836x_MDS is not set
-+# CONFIG_MPC837x_MDS is not set
-+# CONFIG_MPC837x_RDB is not set
-+# CONFIG_SBC834x is not set
-+CONFIG_PPC_MPC831x=y
-+CONFIG_IPIC=y
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+CONFIG_TICK_ONESHOT=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+CONFIG_FORCE_MAX_ZONEORDER=11
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_GENERIC_ISA_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+CONFIG_INET_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+# CONFIG_MTD_CMDLINE_PARTS is not set
-+CONFIG_MTD_OF_PARTS=y
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+CONFIG_MTD_BLOCK=y
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+# CONFIG_MTD_CFI_INTELEXT is not set
-+CONFIG_MTD_CFI_AMDSTD=y
-+# CONFIG_MTD_CFI_STAA is not set
-+CONFIG_MTD_CFI_UTIL=y
-+# CONFIG_MTD_RAM is not set
-+# CONFIG_MTD_ROM is not set
-+# CONFIG_MTD_ABSENT is not set
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+CONFIG_MTD_PHYSMAP_OF=y
-+# CONFIG_MTD_INTEL_VR_NOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_PMC551 is not set
-+# CONFIG_MTD_DATAFLASH is not set
-+# CONFIG_MTD_M25P80 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+CONFIG_MTD_NAND=y
-+CONFIG_MTD_NAND_VERIFY_WRITE=y
-+# CONFIG_MTD_NAND_ECC_SMC is not set
-+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-+CONFIG_MTD_NAND_IDS=y
-+# CONFIG_MTD_NAND_DISKONCHIP is not set
-+# CONFIG_MTD_NAND_CAFE is not set
-+# CONFIG_MTD_NAND_NANDSIM is not set
-+# CONFIG_MTD_NAND_PLATFORM is not set
-+# CONFIG_MTD_ALAUDA is not set
-+CONFIG_MTD_NAND_FSL_ELBC=y
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+# CONFIG_BLK_DEV_UB is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=y
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+# CONFIG_BLK_DEV_SD is not set
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+# CONFIG_BLK_DEV_SR is not set
-+CONFIG_CHR_DEV_SG=y
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+# CONFIG_SCSI_SCAN_ASYNC is not set
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+CONFIG_SCSI_SPI_ATTRS=y
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-+# CONFIG_SCSI_3W_9XXX is not set
-+# CONFIG_SCSI_ACARD is not set
-+# CONFIG_SCSI_AACRAID is not set
-+# CONFIG_SCSI_AIC7XXX is not set
-+# CONFIG_SCSI_AIC7XXX_OLD is not set
-+# CONFIG_SCSI_AIC79XX is not set
-+# CONFIG_SCSI_AIC94XX is not set
-+# CONFIG_SCSI_DPT_I2O is not set
-+# CONFIG_SCSI_ADVANSYS is not set
-+# CONFIG_SCSI_ARCMSR is not set
-+# CONFIG_MEGARAID_NEWGEN is not set
-+# CONFIG_MEGARAID_LEGACY is not set
-+# CONFIG_MEGARAID_SAS is not set
-+# CONFIG_SCSI_HPTIOP is not set
-+# CONFIG_SCSI_BUSLOGIC is not set
-+# CONFIG_SCSI_DMX3191D is not set
-+# CONFIG_SCSI_EATA is not set
-+# CONFIG_SCSI_FUTURE_DOMAIN is not set
-+# CONFIG_SCSI_GDTH is not set
-+# CONFIG_SCSI_IPS is not set
-+# CONFIG_SCSI_INITIO is not set
-+# CONFIG_SCSI_INIA100 is not set
-+# CONFIG_SCSI_MVSAS is not set
-+# CONFIG_SCSI_STEX is not set
-+# CONFIG_SCSI_SYM53C8XX_2 is not set
-+# CONFIG_SCSI_QLOGIC_1280 is not set
-+# CONFIG_SCSI_QLA_FC is not set
-+# CONFIG_SCSI_QLA_ISCSI is not set
-+# CONFIG_SCSI_LPFC is not set
-+# CONFIG_SCSI_DC395x is not set
-+# CONFIG_SCSI_DC390T is not set
-+# CONFIG_SCSI_NSP32 is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_SCSI_SRP is not set
-+# CONFIG_ATA is not set
-+CONFIG_MD=y
-+CONFIG_BLK_DEV_MD=y
-+CONFIG_MD_LINEAR=y
-+CONFIG_MD_RAID0=y
-+CONFIG_MD_RAID1=y
-+# CONFIG_MD_RAID10 is not set
-+# CONFIG_MD_RAID456 is not set
-+# CONFIG_MD_MULTIPATH is not set
-+# CONFIG_MD_FAULTY is not set
-+# CONFIG_BLK_DEV_DM is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+# CONFIG_MARVELL_PHY is not set
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+CONFIG_CICADA_PHY=y
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_ENC28J60 is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+CONFIG_NET_PCI=y
-+# CONFIG_PCNET32 is not set
-+# CONFIG_AMD8111_ETH is not set
-+# CONFIG_ADAPTEC_STARFIRE is not set
-+# CONFIG_B44 is not set
-+# CONFIG_FORCEDETH is not set
-+# CONFIG_EEPRO100 is not set
-+CONFIG_E100=y
-+# CONFIG_FEALNX is not set
-+# CONFIG_NATSEMI is not set
-+# CONFIG_NE2K_PCI is not set
-+# CONFIG_8139CP is not set
-+# CONFIG_8139TOO is not set
-+# CONFIG_R6040 is not set
-+# CONFIG_SIS900 is not set
-+# CONFIG_EPIC100 is not set
-+# CONFIG_SUNDANCE is not set
-+# CONFIG_TLAN is not set
-+# CONFIG_VIA_RHINE is not set
-+# CONFIG_SC92031 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+
-+#
-+# USB Network Adapters
-+#
-+# CONFIG_USB_CATC is not set
-+# CONFIG_USB_KAWETH is not set
-+# CONFIG_USB_PEGASUS is not set
-+# CONFIG_USB_RTL8150 is not set
-+# CONFIG_USB_USBNET is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NET_FC is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+CONFIG_HW_RANDOM=y
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_ALI1535 is not set
-+# CONFIG_I2C_ALI1563 is not set
-+# CONFIG_I2C_ALI15X3 is not set
-+# CONFIG_I2C_AMD756 is not set
-+# CONFIG_I2C_AMD8111 is not set
-+# CONFIG_I2C_I801 is not set
-+# CONFIG_I2C_I810 is not set
-+# CONFIG_I2C_PIIX4 is not set
-+CONFIG_I2C_MPC=y
-+# CONFIG_I2C_NFORCE2 is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_PROSAVAGE is not set
-+# CONFIG_I2C_SAVAGE4 is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_SIS5595 is not set
-+# CONFIG_I2C_SIS630 is not set
-+# CONFIG_I2C_SIS96X 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_VIA is not set
-+# CONFIG_I2C_VIAPRO is not set
-+# CONFIG_I2C_VOODOO3 is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+# CONFIG_I2C_DEBUG_CORE is not set
-+# CONFIG_I2C_DEBUG_ALGO is not set
-+# CONFIG_I2C_DEBUG_BUS is not set
-+# CONFIG_I2C_DEBUG_CHIP is not set
-+
-+#
-+# SPI support
-+#
-+CONFIG_SPI=y
-+# CONFIG_SPI_DEBUG is not set
-+CONFIG_SPI_MASTER=y
-+
-+#
-+# SPI Master Controller Drivers
-+#
-+CONFIG_SPI_BITBANG=y
-+CONFIG_SPI_MPC83xx=y
-+
-+#
-+# SPI Protocol Masters
-+#
-+# CONFIG_SPI_AT25 is not set
-+# CONFIG_SPI_SPIDEV is not set
-+# CONFIG_SPI_TLE62X0 is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ADT7473 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_I5K_AMB is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S is not set
-+# CONFIG_SENSORS_GL518SM is not set
-+# CONFIG_SENSORS_GL520SM is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_LM63 is not set
-+# CONFIG_SENSORS_LM70 is not set
-+# CONFIG_SENSORS_LM75 is not set
-+# CONFIG_SENSORS_LM77 is not set
-+# CONFIG_SENSORS_LM78 is not set
-+# CONFIG_SENSORS_LM80 is not set
-+# CONFIG_SENSORS_LM83 is not set
-+# CONFIG_SENSORS_LM85 is not set
-+# 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_SIS5595 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_ADS7828 is not set
-+# CONFIG_SENSORS_THMC50 is not set
-+# CONFIG_SENSORS_VIA686A is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_VT8231 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83L786NG is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+# CONFIG_THERMAL is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_83xx_WDT=y
-+
-+#
-+# PCI-based Watchdog Cards
-+#
-+# CONFIG_PCIPCWATCHDOG is not set
-+# CONFIG_WDTPCI is not set
-+
-+#
-+# USB-based Watchdog Cards
-+#
-+# CONFIG_USBPCWATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+# CONFIG_USB_DABUSB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+
-+#
-+# USB Input Devices
-+#
-+# CONFIG_USB_HID is not set
-+
-+#
-+# USB HID Boot Protocol drivers
-+#
-+# CONFIG_USB_KBD is not set
-+# CONFIG_USB_MOUSE is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-+
-+#
-+# Miscellaneous USB options
-+#
-+CONFIG_USB_DEVICEFS=y
-+CONFIG_USB_DEVICE_CLASS=y
-+# CONFIG_USB_DYNAMIC_MINORS is not set
-+# CONFIG_USB_OTG is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+CONFIG_USB_EHCI_HCD=y
-+CONFIG_USB_EHCI_ROOT_HUB_TT=y
-+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-+CONFIG_USB_EHCI_FSL=y
-+CONFIG_USB_EHCI_HCD_PPC_OF=y
-+# CONFIG_USB_ISP116X_HCD is not set
-+CONFIG_USB_OHCI_HCD=y
-+CONFIG_USB_OHCI_HCD_PPC_OF=y
-+CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
-+# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
-+CONFIG_USB_OHCI_HCD_PCI=y
-+CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
-+CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
-+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-+CONFIG_USB_UHCI_HCD=y
-+# CONFIG_USB_SL811_HCD is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+
-+#
-+# USB Device Class drivers
-+#
-+# CONFIG_USB_ACM is not set
-+# CONFIG_USB_PRINTER is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+
-+#
-+# may also be needed; see USB_STORAGE Help for more information
-+#
-+CONFIG_USB_STORAGE=y
-+# CONFIG_USB_STORAGE_DEBUG is not set
-+# CONFIG_USB_STORAGE_DATAFAB is not set
-+# CONFIG_USB_STORAGE_FREECOM is not set
-+# CONFIG_USB_STORAGE_ISD200 is not set
-+# CONFIG_USB_STORAGE_DPCM is not set
-+# CONFIG_USB_STORAGE_USBAT is not set
-+# CONFIG_USB_STORAGE_SDDR09 is not set
-+# CONFIG_USB_STORAGE_SDDR55 is not set
-+# CONFIG_USB_STORAGE_JUMPSHOT is not set
-+# CONFIG_USB_STORAGE_ALAUDA is not set
-+# CONFIG_USB_STORAGE_KARMA is not set
-+# CONFIG_USB_LIBUSUAL is not set
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
-+CONFIG_USB_MON=y
-+
-+#
-+# USB port drivers
-+#
-+# CONFIG_USB_SERIAL is not set
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+# CONFIG_USB_EMI62 is not set
-+# CONFIG_USB_EMI26 is not set
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_AUERSWALD is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+# CONFIG_USB_BERRY_CHARGE is not set
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_PHIDGET is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+# CONFIG_USB_SISUSBVGA is not set
-+# CONFIG_USB_LD is not set
-+# CONFIG_USB_TRANCEVIBRATOR is not set
-+# CONFIG_USB_IOWARRIOR is not set
-+# CONFIG_USB_TEST is not set
-+CONFIG_USB_GADGET=y
-+# CONFIG_USB_GADGET_DEBUG is not set
-+# CONFIG_USB_GADGET_DEBUG_FILES is not set
-+CONFIG_USB_GADGET_SELECTED=y
-+# CONFIG_USB_GADGET_AMD5536UDC is not set
-+# CONFIG_USB_GADGET_ATMEL_USBA is not set
-+# CONFIG_USB_GADGET_FSL_USB2 is not set
-+CONFIG_USB_GADGET_NET2280=y
-+CONFIG_USB_NET2280=y
-+# 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
-+# CONFIG_USB_ZERO is not set
-+CONFIG_USB_ETH=y
-+CONFIG_USB_ETH_RNDIS=y
-+# CONFIG_USB_GADGETFS is not set
-+# CONFIG_USB_FILE_STORAGE is not set
-+# CONFIG_USB_G_SERIAL is not set
-+# CONFIG_USB_MIDI_GADGET is not set
-+# CONFIG_USB_G_PRINTER is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+# CONFIG_RTC_DEBUG is not set
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# I2C RTC drivers
-+#
-+CONFIG_RTC_DRV_DS1307=y
-+# CONFIG_RTC_DRV_DS1374 is not set
-+# CONFIG_RTC_DRV_DS1672 is not set
-+# CONFIG_RTC_DRV_MAX6900 is not set
-+# CONFIG_RTC_DRV_RS5C372 is not set
-+# CONFIG_RTC_DRV_ISL1208 is not set
-+# CONFIG_RTC_DRV_X1205 is not set
-+# CONFIG_RTC_DRV_PCF8563 is not set
-+# CONFIG_RTC_DRV_PCF8583 is not set
-+# CONFIG_RTC_DRV_M41T80 is not set
-+# CONFIG_RTC_DRV_S35390A is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+# CONFIG_RTC_DRV_MAX6902 is not set
-+# CONFIG_RTC_DRV_R9701 is not set
-+# CONFIG_RTC_DRV_RS5C348 is not set
-+
-+#
-+# Platform RTC drivers
-+#
-+# CONFIG_RTC_DRV_CMOS is not set
-+# CONFIG_RTC_DRV_DS1511 is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_M48T59 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+CONFIG_EXT3_FS_XATTR=y
-+# CONFIG_EXT3_FS_POSIX_ACL is not set
-+# CONFIG_EXT3_FS_SECURITY is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+# CONFIG_MSDOS_FS is not set
-+# CONFIG_VFAT_FS is not set
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+CONFIG_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-+# CONFIG_JFFS2_SUMMARY is not set
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+# CONFIG_JFFS2_LZO is not set
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+# CONFIG_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+CONFIG_NFS_V4=y
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+CONFIG_SUNRPC_GSS=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_BSD_DISKLABEL is not set
-+# CONFIG_MINIX_SUBPARTITION is not set
-+# CONFIG_SOLARIS_X86_PARTITION is not set
-+# CONFIG_UNIXWARE_DISKLABEL is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# 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
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+CONFIG_HAVE_LMB=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+# CONFIG_DEBUGGER is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+CONFIG_CRYPTO_MD5=y
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
-@@ -0,0 +1,1451 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Mon Mar 24 08:48:15 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+CONFIG_6xx=y
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_PPC_FPU=y
-+# CONFIG_FSL_EMB_PERFMON is not set
-+CONFIG_PPC_STD_MMU=y
-+CONFIG_PPC_STD_MMU_32=y
-+# CONFIG_PPC_MM_SLICES is not set
-+# CONFIG_SMP is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+# CONFIG_KALLSYMS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+# CONFIG_EPOLL is not set
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+# CONFIG_KMOD is not set
-+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
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_AS=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="anticipatory"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MULTIPLATFORM is not set
-+# CONFIG_PPC_82xx is not set
-+CONFIG_PPC_83xx=y
-+# CONFIG_PPC_86xx is not set
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC83xx=y
-+CONFIG_MPC831x_RDB=y
-+# CONFIG_MPC832x_MDS is not set
-+# CONFIG_MPC832x_RDB is not set
-+# CONFIG_MPC834x_MDS is not set
-+# CONFIG_MPC834x_ITX is not set
-+# CONFIG_MPC836x_MDS is not set
-+# CONFIG_MPC837x_MDS is not set
-+# CONFIG_MPC837x_RDB is not set
-+# CONFIG_SBC834x is not set
-+CONFIG_PPC_MPC831x=y
-+CONFIG_IPIC=y
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+CONFIG_TICK_ONESHOT=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_GENERIC_ISA_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+CONFIG_INET_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+# CONFIG_MTD_CMDLINE_PARTS is not set
-+# CONFIG_MTD_OF_PARTS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+CONFIG_MTD_BLOCK=y
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+# CONFIG_MTD_CFI_INTELEXT is not set
-+CONFIG_MTD_CFI_AMDSTD=y
-+# CONFIG_MTD_CFI_STAA is not set
-+CONFIG_MTD_CFI_UTIL=y
-+# CONFIG_MTD_RAM is not set
-+# CONFIG_MTD_ROM is not set
-+# CONFIG_MTD_ABSENT is not set
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+CONFIG_MTD_PHYSMAP_OF=y
-+# CONFIG_MTD_INTEL_VR_NOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_PMC551 is not set
-+# CONFIG_MTD_DATAFLASH is not set
-+# CONFIG_MTD_M25P80 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+CONFIG_MTD_NAND=y
-+CONFIG_MTD_NAND_VERIFY_WRITE=y
-+# CONFIG_MTD_NAND_ECC_SMC is not set
-+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-+CONFIG_MTD_NAND_IDS=y
-+# CONFIG_MTD_NAND_DISKONCHIP is not set
-+# CONFIG_MTD_NAND_CAFE is not set
-+# CONFIG_MTD_NAND_NANDSIM is not set
-+# CONFIG_MTD_NAND_PLATFORM is not set
-+# CONFIG_MTD_ALAUDA is not set
-+# CONFIG_MTD_NAND_FSL_ELBC is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+# CONFIG_BLK_DEV_UB is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=y
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+# CONFIG_BLK_DEV_SD is not set
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+# CONFIG_BLK_DEV_SR is not set
-+CONFIG_CHR_DEV_SG=y
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+# CONFIG_SCSI_SCAN_ASYNC is not set
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+CONFIG_SCSI_SPI_ATTRS=y
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-+# CONFIG_SCSI_3W_9XXX is not set
-+# CONFIG_SCSI_ACARD is not set
-+# CONFIG_SCSI_AACRAID is not set
-+# CONFIG_SCSI_AIC7XXX is not set
-+# CONFIG_SCSI_AIC7XXX_OLD is not set
-+# CONFIG_SCSI_AIC79XX is not set
-+# CONFIG_SCSI_AIC94XX is not set
-+# CONFIG_SCSI_DPT_I2O is not set
-+# CONFIG_SCSI_ADVANSYS is not set
-+# CONFIG_SCSI_ARCMSR is not set
-+# CONFIG_MEGARAID_NEWGEN is not set
-+# CONFIG_MEGARAID_LEGACY is not set
-+# CONFIG_MEGARAID_SAS is not set
-+# CONFIG_SCSI_HPTIOP is not set
-+# CONFIG_SCSI_BUSLOGIC is not set
-+# CONFIG_SCSI_DMX3191D is not set
-+# CONFIG_SCSI_EATA is not set
-+# CONFIG_SCSI_FUTURE_DOMAIN is not set
-+# CONFIG_SCSI_GDTH is not set
-+# CONFIG_SCSI_IPS is not set
-+# CONFIG_SCSI_INITIO is not set
-+# CONFIG_SCSI_INIA100 is not set
-+# CONFIG_SCSI_MVSAS is not set
-+# CONFIG_SCSI_STEX is not set
-+# CONFIG_SCSI_SYM53C8XX_2 is not set
-+# CONFIG_SCSI_IPR is not set
-+# CONFIG_SCSI_QLOGIC_1280 is not set
-+# CONFIG_SCSI_QLA_FC is not set
-+# CONFIG_SCSI_QLA_ISCSI is not set
-+# CONFIG_SCSI_LPFC is not set
-+# CONFIG_SCSI_DC395x is not set
-+# CONFIG_SCSI_DC390T is not set
-+# CONFIG_SCSI_NSP32 is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_SCSI_SRP is not set
-+CONFIG_ATA=y
-+# CONFIG_ATA_NONSTANDARD is not set
-+# CONFIG_SATA_AHCI is not set
-+# CONFIG_SATA_SVW is not set
-+# CONFIG_ATA_PIIX is not set
-+# CONFIG_SATA_MV is not set
-+# CONFIG_SATA_NV is not set
-+# CONFIG_PDC_ADMA is not set
-+# CONFIG_SATA_QSTOR is not set
-+# CONFIG_SATA_PROMISE is not set
-+# CONFIG_SATA_SX4 is not set
-+# CONFIG_SATA_SIL is not set
-+# CONFIG_SATA_SIL24 is not set
-+# CONFIG_SATA_SIS is not set
-+# CONFIG_SATA_ULI is not set
-+# CONFIG_SATA_VIA is not set
-+# CONFIG_SATA_VITESSE is not set
-+# CONFIG_SATA_INIC162X is not set
-+CONFIG_SATA_FSL=y
-+# CONFIG_PATA_ALI is not set
-+# CONFIG_PATA_AMD is not set
-+# CONFIG_PATA_ARTOP is not set
-+# CONFIG_PATA_ATIIXP is not set
-+# CONFIG_PATA_CMD640_PCI is not set
-+# CONFIG_PATA_CMD64X is not set
-+# CONFIG_PATA_CS5520 is not set
-+# CONFIG_PATA_CS5530 is not set
-+# CONFIG_PATA_CYPRESS is not set
-+# CONFIG_PATA_EFAR is not set
-+# CONFIG_ATA_GENERIC is not set
-+# CONFIG_PATA_HPT366 is not set
-+# CONFIG_PATA_HPT37X is not set
-+# CONFIG_PATA_HPT3X2N is not set
-+# CONFIG_PATA_HPT3X3 is not set
-+# CONFIG_PATA_IT821X is not set
-+# CONFIG_PATA_IT8213 is not set
-+# CONFIG_PATA_JMICRON is not set
-+# CONFIG_PATA_TRIFLEX is not set
-+# CONFIG_PATA_MARVELL is not set
-+# CONFIG_PATA_MPIIX is not set
-+# CONFIG_PATA_OLDPIIX is not set
-+# CONFIG_PATA_NETCELL is not set
-+# CONFIG_PATA_NINJA32 is not set
-+# CONFIG_PATA_NS87410 is not set
-+# CONFIG_PATA_NS87415 is not set
-+# CONFIG_PATA_OPTI is not set
-+# CONFIG_PATA_OPTIDMA is not set
-+# CONFIG_PATA_PDC_OLD is not set
-+# CONFIG_PATA_RADISYS is not set
-+# CONFIG_PATA_RZ1000 is not set
-+# CONFIG_PATA_SC1200 is not set
-+# CONFIG_PATA_SERVERWORKS is not set
-+# CONFIG_PATA_PDC2027X is not set
-+# CONFIG_PATA_SIL680 is not set
-+# CONFIG_PATA_SIS is not set
-+# CONFIG_PATA_VIA is not set
-+# CONFIG_PATA_WINBOND is not set
-+# CONFIG_PATA_PLATFORM is not set
-+CONFIG_MD=y
-+CONFIG_BLK_DEV_MD=y
-+CONFIG_MD_LINEAR=y
-+CONFIG_MD_RAID0=y
-+CONFIG_MD_RAID1=y
-+# CONFIG_MD_RAID10 is not set
-+# CONFIG_MD_RAID456 is not set
-+# CONFIG_MD_MULTIPATH is not set
-+# CONFIG_MD_FAULTY is not set
-+# CONFIG_BLK_DEV_DM is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+# CONFIG_MARVELL_PHY is not set
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_ENC28J60 is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+CONFIG_NET_PCI=y
-+# CONFIG_PCNET32 is not set
-+# CONFIG_AMD8111_ETH is not set
-+# CONFIG_ADAPTEC_STARFIRE is not set
-+# CONFIG_B44 is not set
-+# CONFIG_FORCEDETH is not set
-+# CONFIG_EEPRO100 is not set
-+CONFIG_E100=y
-+# CONFIG_FEALNX is not set
-+# CONFIG_NATSEMI is not set
-+# CONFIG_NE2K_PCI is not set
-+# CONFIG_8139CP is not set
-+# CONFIG_8139TOO is not set
-+# CONFIG_R6040 is not set
-+# CONFIG_SIS900 is not set
-+# CONFIG_EPIC100 is not set
-+# CONFIG_SUNDANCE is not set
-+# CONFIG_TLAN is not set
-+# CONFIG_VIA_RHINE is not set
-+# CONFIG_SC92031 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+
-+#
-+# USB Network Adapters
-+#
-+# CONFIG_USB_CATC is not set
-+# CONFIG_USB_KAWETH is not set
-+# CONFIG_USB_PEGASUS is not set
-+# CONFIG_USB_RTL8150 is not set
-+# CONFIG_USB_USBNET is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NET_FC is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+CONFIG_HW_RANDOM=y
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_ALI1535 is not set
-+# CONFIG_I2C_ALI1563 is not set
-+# CONFIG_I2C_ALI15X3 is not set
-+# CONFIG_I2C_AMD756 is not set
-+# CONFIG_I2C_AMD8111 is not set
-+# CONFIG_I2C_I801 is not set
-+# CONFIG_I2C_I810 is not set
-+# CONFIG_I2C_PIIX4 is not set
-+CONFIG_I2C_MPC=y
-+# CONFIG_I2C_NFORCE2 is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_PROSAVAGE is not set
-+# CONFIG_I2C_SAVAGE4 is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_SIS5595 is not set
-+# CONFIG_I2C_SIS630 is not set
-+# CONFIG_I2C_SIS96X 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_VIA is not set
-+# CONFIG_I2C_VIAPRO is not set
-+# CONFIG_I2C_VOODOO3 is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+# CONFIG_I2C_DEBUG_CORE is not set
-+# CONFIG_I2C_DEBUG_ALGO is not set
-+# CONFIG_I2C_DEBUG_BUS is not set
-+# CONFIG_I2C_DEBUG_CHIP is not set
-+
-+#
-+# SPI support
-+#
-+CONFIG_SPI=y
-+# CONFIG_SPI_DEBUG is not set
-+CONFIG_SPI_MASTER=y
-+
-+#
-+# SPI Master Controller Drivers
-+#
-+CONFIG_SPI_BITBANG=y
-+CONFIG_SPI_MPC83xx=y
-+
-+#
-+# SPI Protocol Masters
-+#
-+# CONFIG_SPI_AT25 is not set
-+# CONFIG_SPI_SPIDEV is not set
-+# CONFIG_SPI_TLE62X0 is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ADT7473 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_I5K_AMB is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S is not set
-+# CONFIG_SENSORS_GL518SM is not set
-+# CONFIG_SENSORS_GL520SM is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_LM63 is not set
-+# CONFIG_SENSORS_LM70 is not set
-+# CONFIG_SENSORS_LM75 is not set
-+# CONFIG_SENSORS_LM77 is not set
-+# CONFIG_SENSORS_LM78 is not set
-+# CONFIG_SENSORS_LM80 is not set
-+# CONFIG_SENSORS_LM83 is not set
-+# CONFIG_SENSORS_LM85 is not set
-+# 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_SIS5595 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_ADS7828 is not set
-+# CONFIG_SENSORS_THMC50 is not set
-+# CONFIG_SENSORS_VIA686A is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_VT8231 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83L786NG is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+# CONFIG_THERMAL is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_83xx_WDT=y
-+
-+#
-+# PCI-based Watchdog Cards
-+#
-+# CONFIG_PCIPCWATCHDOG is not set
-+# CONFIG_WDTPCI is not set
-+
-+#
-+# USB-based Watchdog Cards
-+#
-+# CONFIG_USBPCWATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+# CONFIG_USB_DABUSB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+
-+#
-+# USB Input Devices
-+#
-+# CONFIG_USB_HID is not set
-+
-+#
-+# USB HID Boot Protocol drivers
-+#
-+# CONFIG_USB_KBD is not set
-+# CONFIG_USB_MOUSE is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-+
-+#
-+# Miscellaneous USB options
-+#
-+CONFIG_USB_DEVICEFS=y
-+CONFIG_USB_DEVICE_CLASS=y
-+# CONFIG_USB_DYNAMIC_MINORS is not set
-+# CONFIG_USB_OTG is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+CONFIG_USB_EHCI_HCD=y
-+CONFIG_USB_EHCI_ROOT_HUB_TT=y
-+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-+CONFIG_USB_EHCI_FSL=y
-+CONFIG_USB_EHCI_HCD_PPC_OF=y
-+# CONFIG_USB_ISP116X_HCD is not set
-+CONFIG_USB_OHCI_HCD=y
-+CONFIG_USB_OHCI_HCD_PPC_OF=y
-+CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
-+# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
-+CONFIG_USB_OHCI_HCD_PCI=y
-+CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
-+CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
-+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-+CONFIG_USB_UHCI_HCD=y
-+# CONFIG_USB_SL811_HCD is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+
-+#
-+# USB Device Class drivers
-+#
-+# CONFIG_USB_ACM is not set
-+# CONFIG_USB_PRINTER is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+
-+#
-+# may also be needed; see USB_STORAGE Help for more information
-+#
-+CONFIG_USB_STORAGE=y
-+# CONFIG_USB_STORAGE_DEBUG is not set
-+# CONFIG_USB_STORAGE_DATAFAB is not set
-+# CONFIG_USB_STORAGE_FREECOM is not set
-+# CONFIG_USB_STORAGE_ISD200 is not set
-+# CONFIG_USB_STORAGE_DPCM is not set
-+# CONFIG_USB_STORAGE_USBAT is not set
-+# CONFIG_USB_STORAGE_SDDR09 is not set
-+# CONFIG_USB_STORAGE_SDDR55 is not set
-+# CONFIG_USB_STORAGE_JUMPSHOT is not set
-+# CONFIG_USB_STORAGE_ALAUDA is not set
-+# CONFIG_USB_STORAGE_KARMA is not set
-+# CONFIG_USB_LIBUSUAL is not set
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
-+CONFIG_USB_MON=y
-+
-+#
-+# USB port drivers
-+#
-+# CONFIG_USB_SERIAL is not set
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+# CONFIG_USB_EMI62 is not set
-+# CONFIG_USB_EMI26 is not set
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_AUERSWALD is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+# CONFIG_USB_BERRY_CHARGE is not set
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_PHIDGET is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+# CONFIG_USB_SISUSBVGA is not set
-+# CONFIG_USB_LD is not set
-+# CONFIG_USB_TRANCEVIBRATOR is not set
-+# CONFIG_USB_IOWARRIOR is not set
-+# CONFIG_USB_TEST is not set
-+CONFIG_USB_GADGET=y
-+# CONFIG_USB_GADGET_DEBUG is not set
-+# CONFIG_USB_GADGET_DEBUG_FILES is not set
-+CONFIG_USB_GADGET_SELECTED=y
-+# CONFIG_USB_GADGET_AMD5536UDC is not set
-+# CONFIG_USB_GADGET_ATMEL_USBA is not set
-+# CONFIG_USB_GADGET_FSL_USB2 is not set
-+CONFIG_USB_GADGET_NET2280=y
-+CONFIG_USB_NET2280=y
-+# 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
-+# CONFIG_USB_ZERO is not set
-+CONFIG_USB_ETH=y
-+CONFIG_USB_ETH_RNDIS=y
-+# CONFIG_USB_GADGETFS is not set
-+# CONFIG_USB_FILE_STORAGE is not set
-+# CONFIG_USB_G_SERIAL is not set
-+# CONFIG_USB_MIDI_GADGET is not set
-+# CONFIG_USB_G_PRINTER is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+# CONFIG_RTC_DEBUG is not set
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# I2C RTC drivers
-+#
-+CONFIG_RTC_DRV_DS1307=y
-+# CONFIG_RTC_DRV_DS1374 is not set
-+# CONFIG_RTC_DRV_DS1672 is not set
-+# CONFIG_RTC_DRV_MAX6900 is not set
-+# CONFIG_RTC_DRV_RS5C372 is not set
-+# CONFIG_RTC_DRV_ISL1208 is not set
-+# CONFIG_RTC_DRV_X1205 is not set
-+# CONFIG_RTC_DRV_PCF8563 is not set
-+# CONFIG_RTC_DRV_PCF8583 is not set
-+# CONFIG_RTC_DRV_M41T80 is not set
-+# CONFIG_RTC_DRV_S35390A is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+# CONFIG_RTC_DRV_MAX6902 is not set
-+# CONFIG_RTC_DRV_R9701 is not set
-+# CONFIG_RTC_DRV_RS5C348 is not set
-+
-+#
-+# Platform RTC drivers
-+#
-+# CONFIG_RTC_DRV_CMOS is not set
-+# CONFIG_RTC_DRV_DS1511 is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_M48T59 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+CONFIG_EXT3_FS_XATTR=y
-+# CONFIG_EXT3_FS_POSIX_ACL is not set
-+# CONFIG_EXT3_FS_SECURITY is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+# CONFIG_MSDOS_FS is not set
-+# CONFIG_VFAT_FS is not set
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+CONFIG_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-+# CONFIG_JFFS2_SUMMARY is not set
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+# CONFIG_JFFS2_LZO is not set
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+# CONFIG_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+CONFIG_NFS_V4=y
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+CONFIG_SUNRPC_GSS=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_BSD_DISKLABEL is not set
-+# CONFIG_MINIX_SUBPARTITION is not set
-+# CONFIG_SOLARIS_X86_PARTITION is not set
-+# CONFIG_UNIXWARE_DISKLABEL is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# 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
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+# CONFIG_DEBUGGER is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+CONFIG_CRYPTO_MD5=y
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
-@@ -0,0 +1,1081 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc7
-+# Mon Mar 31 11:36:51 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+CONFIG_6xx=y
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_PPC_FPU=y
-+# CONFIG_FSL_EMB_PERFMON is not set
-+CONFIG_PPC_STD_MMU=y
-+CONFIG_PPC_STD_MMU_32=y
-+# CONFIG_PPC_MM_SLICES is not set
-+# CONFIG_SMP is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+# CONFIG_KALLSYMS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+# CONFIG_EPOLL is not set
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+# CONFIG_KMOD is not set
-+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
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_AS=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="anticipatory"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MULTIPLATFORM is not set
-+# CONFIG_PPC_82xx is not set
-+CONFIG_PPC_83xx=y
-+# CONFIG_PPC_86xx is not set
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC83xx=y
-+# CONFIG_MPC831x_RDB is not set
-+CONFIG_MPC832x_MDS=y
-+# CONFIG_MPC832x_RDB is not set
-+# CONFIG_MPC834x_MDS is not set
-+# CONFIG_MPC834x_ITX is not set
-+# CONFIG_MPC836x_MDS is not set
-+# CONFIG_MPC837x_MDS is not set
-+# CONFIG_MPC837x_RDB is not set
-+# CONFIG_SBC834x is not set
-+CONFIG_PPC_MPC832x=y
-+CONFIG_IPIC=y
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+CONFIG_QUICC_ENGINE=y
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+CONFIG_TICK_ONESHOT=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+CONFIG_MATH_EMULATION=y
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_GENERIC_ISA_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+CONFIG_INET_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=y
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+# CONFIG_BLK_DEV_SD is not set
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+# CONFIG_BLK_DEV_SR is not set
-+# CONFIG_CHR_DEV_SG is not set
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+# CONFIG_SCSI_SCAN_ASYNC is not set
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-+# CONFIG_SCSI_3W_9XXX is not set
-+# CONFIG_SCSI_ACARD is not set
-+# CONFIG_SCSI_AACRAID is not set
-+# CONFIG_SCSI_AIC7XXX is not set
-+# CONFIG_SCSI_AIC7XXX_OLD is not set
-+# CONFIG_SCSI_AIC79XX is not set
-+# CONFIG_SCSI_AIC94XX is not set
-+# CONFIG_SCSI_DPT_I2O is not set
-+# CONFIG_SCSI_ADVANSYS is not set
-+# CONFIG_SCSI_ARCMSR is not set
-+# CONFIG_MEGARAID_NEWGEN is not set
-+# CONFIG_MEGARAID_LEGACY is not set
-+# CONFIG_MEGARAID_SAS is not set
-+# CONFIG_SCSI_HPTIOP is not set
-+# CONFIG_SCSI_BUSLOGIC is not set
-+# CONFIG_SCSI_DMX3191D is not set
-+# CONFIG_SCSI_EATA is not set
-+# CONFIG_SCSI_FUTURE_DOMAIN is not set
-+# CONFIG_SCSI_GDTH is not set
-+# CONFIG_SCSI_IPS is not set
-+# CONFIG_SCSI_INITIO is not set
-+# CONFIG_SCSI_INIA100 is not set
-+# CONFIG_SCSI_MVSAS is not set
-+# CONFIG_SCSI_STEX is not set
-+# CONFIG_SCSI_SYM53C8XX_2 is not set
-+# CONFIG_SCSI_QLOGIC_1280 is not set
-+# CONFIG_SCSI_QLA_FC is not set
-+# CONFIG_SCSI_QLA_ISCSI is not set
-+# CONFIG_SCSI_LPFC is not set
-+# CONFIG_SCSI_DC395x is not set
-+# CONFIG_SCSI_DC390T is not set
-+# CONFIG_SCSI_NSP32 is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_SCSI_SRP is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+# CONFIG_MARVELL_PHY is not set
-+CONFIG_DAVICOM_PHY=y
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+# CONFIG_GIANFAR is not set
-+CONFIG_UCC_GETH=y
-+# CONFIG_UGETH_NAPI is not set
-+# CONFIG_UGETH_MAGIC_PACKET is not set
-+# CONFIG_UGETH_FILTERING is not set
-+# CONFIG_UGETH_TX_ON_DEMAND is not set
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NET_FC is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+# CONFIG_SERIAL_QE is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+CONFIG_HW_RANDOM=y
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_ALI1535 is not set
-+# CONFIG_I2C_ALI1563 is not set
-+# CONFIG_I2C_ALI15X3 is not set
-+# CONFIG_I2C_AMD756 is not set
-+# CONFIG_I2C_AMD8111 is not set
-+# CONFIG_I2C_I801 is not set
-+# CONFIG_I2C_I810 is not set
-+# CONFIG_I2C_PIIX4 is not set
-+CONFIG_I2C_MPC=y
-+# CONFIG_I2C_NFORCE2 is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_PROSAVAGE is not set
-+# CONFIG_I2C_SAVAGE4 is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_SIS5595 is not set
-+# CONFIG_I2C_SIS630 is not set
-+# CONFIG_I2C_SIS96X is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_STUB is not set
-+# CONFIG_I2C_VIA is not set
-+# CONFIG_I2C_VIAPRO is not set
-+# CONFIG_I2C_VOODOO3 is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+# CONFIG_I2C_DEBUG_CORE is not set
-+# CONFIG_I2C_DEBUG_ALGO is not set
-+# CONFIG_I2C_DEBUG_BUS is not set
-+# CONFIG_I2C_DEBUG_CHIP is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ADT7473 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_I5K_AMB is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S is not set
-+# CONFIG_SENSORS_GL518SM is not set
-+# CONFIG_SENSORS_GL520SM is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_LM63 is not set
-+# CONFIG_SENSORS_LM75 is not set
-+# CONFIG_SENSORS_LM77 is not set
-+# CONFIG_SENSORS_LM78 is not set
-+# CONFIG_SENSORS_LM80 is not set
-+# CONFIG_SENSORS_LM83 is not set
-+# CONFIG_SENSORS_LM85 is not set
-+# 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_SIS5595 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_ADS7828 is not set
-+# CONFIG_SENSORS_THMC50 is not set
-+# CONFIG_SENSORS_VIA686A is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_VT8231 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83L786NG is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+# CONFIG_THERMAL is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_83xx_WDT=y
-+
-+#
-+# PCI-based Watchdog Cards
-+#
-+# CONFIG_PCIPCWATCHDOG is not set
-+# CONFIG_WDTPCI is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+# CONFIG_RTC_DEBUG is not set
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# I2C RTC drivers
-+#
-+# CONFIG_RTC_DRV_DS1307 is not set
-+CONFIG_RTC_DRV_DS1374=y
-+# CONFIG_RTC_DRV_DS1672 is not set
-+# CONFIG_RTC_DRV_MAX6900 is not set
-+# CONFIG_RTC_DRV_RS5C372 is not set
-+# CONFIG_RTC_DRV_ISL1208 is not set
-+# CONFIG_RTC_DRV_X1205 is not set
-+# CONFIG_RTC_DRV_PCF8563 is not set
-+# CONFIG_RTC_DRV_PCF8583 is not set
-+# CONFIG_RTC_DRV_M41T80 is not set
-+# CONFIG_RTC_DRV_S35390A is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+
-+#
-+# Platform RTC drivers
-+#
-+# CONFIG_RTC_DRV_CMOS is not set
-+# CONFIG_RTC_DRV_DS1511 is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_M48T59 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+CONFIG_EXT3_FS_XATTR=y
-+# CONFIG_EXT3_FS_POSIX_ACL is not set
-+# CONFIG_EXT3_FS_SECURITY is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+# CONFIG_MSDOS_FS is not set
-+# CONFIG_VFAT_FS is not set
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+# CONFIG_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+CONFIG_NFS_V4=y
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+CONFIG_SUNRPC_GSS=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+# CONFIG_MSDOS_PARTITION is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+CONFIG_UCC_FAST=y
-+CONFIG_UCC=y
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# 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_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+# CONFIG_DEBUG_KERNEL is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+CONFIG_CRYPTO_MD5=y
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
-+CONFIG_PPC_LIB_RHEAP=y
---- /dev/null
-+++ b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
-@@ -0,0 +1,1233 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Mon Mar 24 08:48:16 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+CONFIG_6xx=y
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_PPC_FPU=y
-+# CONFIG_FSL_EMB_PERFMON is not set
-+CONFIG_PPC_STD_MMU=y
-+CONFIG_PPC_STD_MMU_32=y
-+# CONFIG_PPC_MM_SLICES is not set
-+# CONFIG_SMP is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+# CONFIG_KALLSYMS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+# CONFIG_EPOLL is not set
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+# CONFIG_KMOD is not set
-+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
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_AS=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="anticipatory"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MULTIPLATFORM is not set
-+# CONFIG_PPC_82xx is not set
-+CONFIG_PPC_83xx=y
-+# CONFIG_PPC_86xx is not set
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC83xx=y
-+# CONFIG_MPC831x_RDB is not set
-+# CONFIG_MPC832x_MDS is not set
-+CONFIG_MPC832x_RDB=y
-+# CONFIG_MPC834x_MDS is not set
-+# CONFIG_MPC834x_ITX is not set
-+# CONFIG_MPC836x_MDS is not set
-+# CONFIG_MPC837x_MDS is not set
-+# CONFIG_MPC837x_RDB is not set
-+# CONFIG_SBC834x is not set
-+CONFIG_PPC_MPC832x=y
-+CONFIG_IPIC=y
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+CONFIG_QUICC_ENGINE=y
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+CONFIG_TICK_ONESHOT=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+CONFIG_MATH_EMULATION=y
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_GENERIC_ISA_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+CONFIG_INET_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+# CONFIG_BLK_DEV_UB is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=y
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=y
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+# CONFIG_BLK_DEV_SR is not set
-+# CONFIG_CHR_DEV_SG is not set
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+# CONFIG_SCSI_SCAN_ASYNC is not set
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-+# CONFIG_SCSI_3W_9XXX is not set
-+# CONFIG_SCSI_ACARD is not set
-+# CONFIG_SCSI_AACRAID is not set
-+# CONFIG_SCSI_AIC7XXX is not set
-+# CONFIG_SCSI_AIC7XXX_OLD is not set
-+# CONFIG_SCSI_AIC79XX is not set
-+# CONFIG_SCSI_AIC94XX is not set
-+# CONFIG_SCSI_DPT_I2O is not set
-+# CONFIG_SCSI_ADVANSYS is not set
-+# CONFIG_SCSI_ARCMSR is not set
-+# CONFIG_MEGARAID_NEWGEN is not set
-+# CONFIG_MEGARAID_LEGACY is not set
-+# CONFIG_MEGARAID_SAS is not set
-+# CONFIG_SCSI_HPTIOP is not set
-+# CONFIG_SCSI_BUSLOGIC is not set
-+# CONFIG_SCSI_DMX3191D is not set
-+# CONFIG_SCSI_EATA is not set
-+# CONFIG_SCSI_FUTURE_DOMAIN is not set
-+# CONFIG_SCSI_GDTH is not set
-+# CONFIG_SCSI_IPS is not set
-+# CONFIG_SCSI_INITIO is not set
-+# CONFIG_SCSI_INIA100 is not set
-+# CONFIG_SCSI_MVSAS is not set
-+# CONFIG_SCSI_STEX is not set
-+# CONFIG_SCSI_SYM53C8XX_2 is not set
-+# CONFIG_SCSI_QLOGIC_1280 is not set
-+# CONFIG_SCSI_QLA_FC is not set
-+# CONFIG_SCSI_QLA_ISCSI is not set
-+# CONFIG_SCSI_LPFC is not set
-+# CONFIG_SCSI_DC395x is not set
-+# CONFIG_SCSI_DC390T is not set
-+# CONFIG_SCSI_NSP32 is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_SCSI_SRP is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+# CONFIG_MARVELL_PHY is not set
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+CONFIG_ICPLUS_PHY=y
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_ENC28J60 is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+CONFIG_E1000=y
-+# CONFIG_E1000_NAPI is not set
-+# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+# CONFIG_GIANFAR is not set
-+CONFIG_UCC_GETH=y
-+CONFIG_UGETH_NAPI=y
-+# CONFIG_UGETH_MAGIC_PACKET is not set
-+# CONFIG_UGETH_FILTERING is not set
-+# CONFIG_UGETH_TX_ON_DEMAND is not set
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+
-+#
-+# USB Network Adapters
-+#
-+# CONFIG_USB_CATC is not set
-+# CONFIG_USB_KAWETH is not set
-+# CONFIG_USB_PEGASUS is not set
-+# CONFIG_USB_RTL8150 is not set
-+# CONFIG_USB_USBNET is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NET_FC is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+# CONFIG_SERIAL_QE is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+CONFIG_HW_RANDOM=y
-+# CONFIG_NVRAM is not set
-+CONFIG_GEN_RTC=y
-+# CONFIG_GEN_RTC_X is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_ALI1535 is not set
-+# CONFIG_I2C_ALI1563 is not set
-+# CONFIG_I2C_ALI15X3 is not set
-+# CONFIG_I2C_AMD756 is not set
-+# CONFIG_I2C_AMD8111 is not set
-+# CONFIG_I2C_I801 is not set
-+# CONFIG_I2C_I810 is not set
-+# CONFIG_I2C_PIIX4 is not set
-+CONFIG_I2C_MPC=y
-+# CONFIG_I2C_NFORCE2 is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_PROSAVAGE is not set
-+# CONFIG_I2C_SAVAGE4 is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_SIS5595 is not set
-+# CONFIG_I2C_SIS630 is not set
-+# CONFIG_I2C_SIS96X 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_VIA is not set
-+# CONFIG_I2C_VIAPRO is not set
-+# CONFIG_I2C_VOODOO3 is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+# CONFIG_I2C_DEBUG_CORE is not set
-+# CONFIG_I2C_DEBUG_ALGO is not set
-+# CONFIG_I2C_DEBUG_BUS is not set
-+# CONFIG_I2C_DEBUG_CHIP is not set
-+
-+#
-+# SPI support
-+#
-+CONFIG_SPI=y
-+CONFIG_SPI_MASTER=y
-+
-+#
-+# SPI Master Controller Drivers
-+#
-+CONFIG_SPI_BITBANG=y
-+CONFIG_SPI_MPC83xx=y
-+
-+#
-+# SPI Protocol Masters
-+#
-+# CONFIG_SPI_AT25 is not set
-+# CONFIG_SPI_SPIDEV is not set
-+# CONFIG_SPI_TLE62X0 is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ADT7473 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_I5K_AMB is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S is not set
-+# CONFIG_SENSORS_GL518SM is not set
-+# CONFIG_SENSORS_GL520SM is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_LM63 is not set
-+# CONFIG_SENSORS_LM70 is not set
-+# CONFIG_SENSORS_LM75 is not set
-+# CONFIG_SENSORS_LM77 is not set
-+# CONFIG_SENSORS_LM78 is not set
-+# CONFIG_SENSORS_LM80 is not set
-+# CONFIG_SENSORS_LM83 is not set
-+# CONFIG_SENSORS_LM85 is not set
-+# 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_SIS5595 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_ADS7828 is not set
-+# CONFIG_SENSORS_THMC50 is not set
-+# CONFIG_SENSORS_VIA686A is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_VT8231 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83L786NG is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+# CONFIG_THERMAL is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_83xx_WDT=y
-+
-+#
-+# PCI-based Watchdog Cards
-+#
-+# CONFIG_PCIPCWATCHDOG is not set
-+# CONFIG_WDTPCI is not set
-+
-+#
-+# USB-based Watchdog Cards
-+#
-+# CONFIG_USBPCWATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+# CONFIG_USB_DABUSB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+
-+#
-+# USB Input Devices
-+#
-+# CONFIG_USB_HID is not set
-+
-+#
-+# USB HID Boot Protocol drivers
-+#
-+# CONFIG_USB_KBD is not set
-+# CONFIG_USB_MOUSE is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-+
-+#
-+# Miscellaneous USB options
-+#
-+CONFIG_USB_DEVICEFS=y
-+CONFIG_USB_DEVICE_CLASS=y
-+# CONFIG_USB_DYNAMIC_MINORS is not set
-+# CONFIG_USB_OTG is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+CONFIG_USB_EHCI_HCD=y
-+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
-+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-+# CONFIG_USB_EHCI_FSL is not set
-+CONFIG_USB_EHCI_HCD_PPC_OF=y
-+# CONFIG_USB_ISP116X_HCD is not set
-+CONFIG_USB_OHCI_HCD=y
-+CONFIG_USB_OHCI_HCD_PPC_OF=y
-+CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
-+# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
-+CONFIG_USB_OHCI_HCD_PCI=y
-+CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
-+CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
-+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-+# CONFIG_USB_UHCI_HCD is not set
-+# CONFIG_USB_SL811_HCD is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+
-+#
-+# USB Device Class drivers
-+#
-+# CONFIG_USB_ACM is not set
-+# CONFIG_USB_PRINTER is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+
-+#
-+# may also be needed; see USB_STORAGE Help for more information
-+#
-+CONFIG_USB_STORAGE=y
-+# CONFIG_USB_STORAGE_DEBUG is not set
-+# CONFIG_USB_STORAGE_DATAFAB is not set
-+# CONFIG_USB_STORAGE_FREECOM is not set
-+# CONFIG_USB_STORAGE_ISD200 is not set
-+# CONFIG_USB_STORAGE_DPCM is not set
-+# CONFIG_USB_STORAGE_USBAT is not set
-+# CONFIG_USB_STORAGE_SDDR09 is not set
-+# CONFIG_USB_STORAGE_SDDR55 is not set
-+# CONFIG_USB_STORAGE_JUMPSHOT is not set
-+# CONFIG_USB_STORAGE_ALAUDA is not set
-+# CONFIG_USB_STORAGE_KARMA is not set
-+# CONFIG_USB_LIBUSUAL is not set
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
-+CONFIG_USB_MON=y
-+
-+#
-+# USB port drivers
-+#
-+# CONFIG_USB_SERIAL is not set
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+# CONFIG_USB_EMI62 is not set
-+# CONFIG_USB_EMI26 is not set
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_AUERSWALD is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+# CONFIG_USB_BERRY_CHARGE is not set
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_PHIDGET is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+# CONFIG_USB_SISUSBVGA is not set
-+# CONFIG_USB_LD is not set
-+# CONFIG_USB_TRANCEVIBRATOR is not set
-+# CONFIG_USB_IOWARRIOR is not set
-+# CONFIG_USB_TEST is not set
-+# CONFIG_USB_GADGET is not set
-+CONFIG_MMC=y
-+# CONFIG_MMC_DEBUG is not set
-+# CONFIG_MMC_UNSAFE_RESUME is not set
-+
-+#
-+# MMC/SD Card Drivers
-+#
-+CONFIG_MMC_BLOCK=y
-+CONFIG_MMC_BLOCK_BOUNCE=y
-+# CONFIG_SDIO_UART is not set
-+
-+#
-+# MMC/SD Host Controller Drivers
-+#
-+# CONFIG_MMC_SDHCI is not set
-+# CONFIG_MMC_WBSD is not set
-+# CONFIG_MMC_TIFM_SD is not set
-+CONFIG_MMC_SPI=y
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+CONFIG_EXT3_FS_XATTR=y
-+# CONFIG_EXT3_FS_POSIX_ACL is not set
-+# CONFIG_EXT3_FS_SECURITY is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+CONFIG_FAT_FS=y
-+CONFIG_MSDOS_FS=y
-+CONFIG_VFAT_FS=y
-+CONFIG_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+# CONFIG_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+CONFIG_NFS_V4=y
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+CONFIG_SUNRPC_GSS=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_BSD_DISKLABEL is not set
-+# CONFIG_MINIX_SUBPARTITION is not set
-+# CONFIG_SOLARIS_X86_PARTITION is not set
-+# CONFIG_UNIXWARE_DISKLABEL is not set
-+CONFIG_LDM_PARTITION=y
-+# CONFIG_LDM_DEBUG is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+CONFIG_NLS=y
-+CONFIG_NLS_DEFAULT="iso8859-1"
-+CONFIG_NLS_CODEPAGE_437=y
-+# CONFIG_NLS_CODEPAGE_737 is not set
-+# CONFIG_NLS_CODEPAGE_775 is not set
-+# CONFIG_NLS_CODEPAGE_850 is not set
-+# CONFIG_NLS_CODEPAGE_852 is not set
-+# CONFIG_NLS_CODEPAGE_855 is not set
-+# CONFIG_NLS_CODEPAGE_857 is not set
-+# CONFIG_NLS_CODEPAGE_860 is not set
-+# CONFIG_NLS_CODEPAGE_861 is not set
-+# CONFIG_NLS_CODEPAGE_862 is not set
-+# CONFIG_NLS_CODEPAGE_863 is not set
-+# CONFIG_NLS_CODEPAGE_864 is not set
-+# CONFIG_NLS_CODEPAGE_865 is not set
-+# CONFIG_NLS_CODEPAGE_866 is not set
-+# CONFIG_NLS_CODEPAGE_869 is not set
-+# CONFIG_NLS_CODEPAGE_936 is not set
-+# CONFIG_NLS_CODEPAGE_950 is not set
-+CONFIG_NLS_CODEPAGE_932=y
-+# CONFIG_NLS_CODEPAGE_949 is not set
-+# CONFIG_NLS_CODEPAGE_874 is not set
-+CONFIG_NLS_ISO8859_8=y
-+# CONFIG_NLS_CODEPAGE_1250 is not set
-+# CONFIG_NLS_CODEPAGE_1251 is not set
-+# CONFIG_NLS_ASCII is not set
-+CONFIG_NLS_ISO8859_1=y
-+# CONFIG_NLS_ISO8859_2 is not set
-+# CONFIG_NLS_ISO8859_3 is not set
-+# CONFIG_NLS_ISO8859_4 is not set
-+# CONFIG_NLS_ISO8859_5 is not set
-+# CONFIG_NLS_ISO8859_6 is not set
-+# CONFIG_NLS_ISO8859_7 is not set
-+# CONFIG_NLS_ISO8859_9 is not set
-+# CONFIG_NLS_ISO8859_13 is not set
-+# CONFIG_NLS_ISO8859_14 is not set
-+# CONFIG_NLS_ISO8859_15 is not set
-+# CONFIG_NLS_KOI8_R is not set
-+# CONFIG_NLS_KOI8_U is not set
-+# CONFIG_NLS_UTF8 is not set
-+# CONFIG_DLM is not set
-+CONFIG_UCC_FAST=y
-+CONFIG_UCC=y
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+CONFIG_CRC_ITU_T=y
-+CONFIG_CRC32=y
-+CONFIG_CRC7=y
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+# CONFIG_DEBUG_KERNEL is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+CONFIG_CRYPTO_MD5=y
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
-+CONFIG_PPC_LIB_RHEAP=y
---- /dev/null
-+++ b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
-@@ -0,0 +1,1295 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Mon Mar 24 08:48:17 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+CONFIG_6xx=y
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_PPC_FPU=y
-+# CONFIG_FSL_EMB_PERFMON is not set
-+CONFIG_PPC_STD_MMU=y
-+CONFIG_PPC_STD_MMU_32=y
-+# CONFIG_PPC_MM_SLICES is not set
-+# CONFIG_SMP is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+# CONFIG_KALLSYMS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+# CONFIG_EPOLL is not set
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+# CONFIG_KMOD is not set
-+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
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_AS=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="anticipatory"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MULTIPLATFORM is not set
-+# CONFIG_PPC_82xx is not set
-+CONFIG_PPC_83xx=y
-+# CONFIG_PPC_86xx is not set
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC83xx=y
-+# CONFIG_MPC831x_RDB is not set
-+# CONFIG_MPC832x_MDS is not set
-+# CONFIG_MPC832x_RDB is not set
-+# CONFIG_MPC834x_MDS is not set
-+CONFIG_MPC834x_ITX=y
-+# CONFIG_MPC836x_MDS is not set
-+# CONFIG_MPC837x_MDS is not set
-+# CONFIG_MPC837x_RDB is not set
-+# CONFIG_SBC834x is not set
-+CONFIG_PPC_MPC834x=y
-+CONFIG_IPIC=y
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+CONFIG_TICK_ONESHOT=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_GENERIC_ISA_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+CONFIG_INET_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+# CONFIG_MTD_PARTITIONS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+# CONFIG_MTD_BLKDEVS is not set
-+# CONFIG_MTD_BLOCK is not set
-+# CONFIG_MTD_BLOCK_RO is not set
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+# CONFIG_MTD_CFI_INTELEXT is not set
-+CONFIG_MTD_CFI_AMDSTD=y
-+# CONFIG_MTD_CFI_STAA is not set
-+CONFIG_MTD_CFI_UTIL=y
-+# CONFIG_MTD_RAM is not set
-+# CONFIG_MTD_ROM is not set
-+# CONFIG_MTD_ABSENT is not set
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+CONFIG_MTD_PHYSMAP=y
-+CONFIG_MTD_PHYSMAP_START=0xfe000000
-+CONFIG_MTD_PHYSMAP_LEN=0x1000000
-+CONFIG_MTD_PHYSMAP_BANKWIDTH=2
-+# CONFIG_MTD_PHYSMAP_OF is not set
-+# CONFIG_MTD_INTEL_VR_NOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_PMC551 is not set
-+# CONFIG_MTD_DATAFLASH is not set
-+# CONFIG_MTD_M25P80 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+# CONFIG_MTD_NAND is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+# CONFIG_BLK_DEV_UB is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+CONFIG_IDE=y
-+CONFIG_IDE_MAX_HWIFS=4
-+# CONFIG_BLK_DEV_IDE is not set
-+# CONFIG_BLK_DEV_HD_ONLY is not set
-+# CONFIG_BLK_DEV_HD is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=y
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=y
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+# CONFIG_BLK_DEV_SR is not set
-+CONFIG_CHR_DEV_SG=y
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+# CONFIG_SCSI_SCAN_ASYNC is not set
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+CONFIG_SCSI_SPI_ATTRS=y
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-+# CONFIG_SCSI_3W_9XXX is not set
-+# CONFIG_SCSI_ACARD is not set
-+# CONFIG_SCSI_AACRAID is not set
-+# CONFIG_SCSI_AIC7XXX is not set
-+# CONFIG_SCSI_AIC7XXX_OLD is not set
-+# CONFIG_SCSI_AIC79XX is not set
-+# CONFIG_SCSI_AIC94XX is not set
-+# CONFIG_SCSI_DPT_I2O is not set
-+# CONFIG_SCSI_ADVANSYS is not set
-+# CONFIG_SCSI_ARCMSR is not set
-+# CONFIG_MEGARAID_NEWGEN is not set
-+# CONFIG_MEGARAID_LEGACY is not set
-+# CONFIG_MEGARAID_SAS is not set
-+# CONFIG_SCSI_HPTIOP is not set
-+# CONFIG_SCSI_BUSLOGIC is not set
-+# CONFIG_SCSI_DMX3191D is not set
-+# CONFIG_SCSI_EATA is not set
-+# CONFIG_SCSI_FUTURE_DOMAIN is not set
-+# CONFIG_SCSI_GDTH is not set
-+# CONFIG_SCSI_IPS is not set
-+# CONFIG_SCSI_INITIO is not set
-+# CONFIG_SCSI_INIA100 is not set
-+# CONFIG_SCSI_MVSAS is not set
-+# CONFIG_SCSI_STEX is not set
-+# CONFIG_SCSI_SYM53C8XX_2 is not set
-+# CONFIG_SCSI_IPR is not set
-+# CONFIG_SCSI_QLOGIC_1280 is not set
-+# CONFIG_SCSI_QLA_FC is not set
-+# CONFIG_SCSI_QLA_ISCSI is not set
-+# CONFIG_SCSI_LPFC is not set
-+# CONFIG_SCSI_DC395x is not set
-+# CONFIG_SCSI_DC390T is not set
-+# CONFIG_SCSI_NSP32 is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_SCSI_SRP is not set
-+CONFIG_ATA=y
-+# CONFIG_ATA_NONSTANDARD is not set
-+# CONFIG_SATA_AHCI is not set
-+# CONFIG_SATA_SVW is not set
-+# CONFIG_ATA_PIIX is not set
-+# CONFIG_SATA_MV is not set
-+# CONFIG_SATA_NV is not set
-+# CONFIG_PDC_ADMA is not set
-+# CONFIG_SATA_QSTOR is not set
-+# CONFIG_SATA_PROMISE is not set
-+# CONFIG_SATA_SX4 is not set
-+CONFIG_SATA_SIL=y
-+# CONFIG_SATA_SIL24 is not set
-+# CONFIG_SATA_SIS is not set
-+# CONFIG_SATA_ULI is not set
-+# CONFIG_SATA_VIA is not set
-+# CONFIG_SATA_VITESSE is not set
-+# CONFIG_SATA_INIC162X is not set
-+# CONFIG_SATA_FSL is not set
-+# CONFIG_PATA_ALI is not set
-+# CONFIG_PATA_AMD is not set
-+# CONFIG_PATA_ARTOP is not set
-+# CONFIG_PATA_ATIIXP is not set
-+# CONFIG_PATA_CMD640_PCI is not set
-+# CONFIG_PATA_CMD64X is not set
-+# CONFIG_PATA_CS5520 is not set
-+# CONFIG_PATA_CS5530 is not set
-+# CONFIG_PATA_CYPRESS is not set
-+# CONFIG_PATA_EFAR is not set
-+# CONFIG_ATA_GENERIC is not set
-+# CONFIG_PATA_HPT366 is not set
-+# CONFIG_PATA_HPT37X is not set
-+# CONFIG_PATA_HPT3X2N is not set
-+# CONFIG_PATA_HPT3X3 is not set
-+# CONFIG_PATA_IT821X is not set
-+# CONFIG_PATA_IT8213 is not set
-+# CONFIG_PATA_JMICRON is not set
-+# CONFIG_PATA_TRIFLEX is not set
-+# CONFIG_PATA_MARVELL is not set
-+# CONFIG_PATA_MPIIX is not set
-+# CONFIG_PATA_OLDPIIX is not set
-+# CONFIG_PATA_NETCELL is not set
-+# CONFIG_PATA_NINJA32 is not set
-+# CONFIG_PATA_NS87410 is not set
-+# CONFIG_PATA_NS87415 is not set
-+# CONFIG_PATA_OPTI is not set
-+# CONFIG_PATA_OPTIDMA is not set
-+# CONFIG_PATA_PDC_OLD is not set
-+# CONFIG_PATA_RADISYS is not set
-+# CONFIG_PATA_RZ1000 is not set
-+# CONFIG_PATA_SC1200 is not set
-+# CONFIG_PATA_SERVERWORKS is not set
-+# CONFIG_PATA_PDC2027X is not set
-+# CONFIG_PATA_SIL680 is not set
-+# CONFIG_PATA_SIS is not set
-+# CONFIG_PATA_VIA is not set
-+# CONFIG_PATA_WINBOND is not set
-+CONFIG_PATA_PLATFORM=y
-+CONFIG_PATA_OF_PLATFORM=y
-+CONFIG_MD=y
-+CONFIG_BLK_DEV_MD=y
-+CONFIG_MD_LINEAR=y
-+CONFIG_MD_RAID0=y
-+CONFIG_MD_RAID1=y
-+# CONFIG_MD_RAID10 is not set
-+# CONFIG_MD_RAID456 is not set
-+# CONFIG_MD_MULTIPATH is not set
-+# CONFIG_MD_FAULTY is not set
-+# CONFIG_BLK_DEV_DM is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+# CONFIG_MARVELL_PHY is not set
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+CONFIG_CICADA_PHY=y
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+# CONFIG_NET_ETHERNET is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+
-+#
-+# USB Network Adapters
-+#
-+# CONFIG_USB_CATC is not set
-+# CONFIG_USB_KAWETH is not set
-+# CONFIG_USB_PEGASUS is not set
-+# CONFIG_USB_RTL8150 is not set
-+# CONFIG_USB_USBNET is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NET_FC is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+# CONFIG_INPUT is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+# CONFIG_SERIAL_8250_PCI is not set
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+CONFIG_HW_RANDOM=y
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_ALI1535 is not set
-+# CONFIG_I2C_ALI1563 is not set
-+# CONFIG_I2C_ALI15X3 is not set
-+# CONFIG_I2C_AMD756 is not set
-+# CONFIG_I2C_AMD8111 is not set
-+# CONFIG_I2C_I801 is not set
-+# CONFIG_I2C_I810 is not set
-+# CONFIG_I2C_PIIX4 is not set
-+CONFIG_I2C_MPC=y
-+# CONFIG_I2C_NFORCE2 is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_PROSAVAGE is not set
-+# CONFIG_I2C_SAVAGE4 is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_SIS5595 is not set
-+# CONFIG_I2C_SIS630 is not set
-+# CONFIG_I2C_SIS96X 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_VIA is not set
-+# CONFIG_I2C_VIAPRO is not set
-+# CONFIG_I2C_VOODOO3 is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+CONFIG_SENSORS_PCF8574=y
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+# CONFIG_I2C_DEBUG_CORE is not set
-+# CONFIG_I2C_DEBUG_ALGO is not set
-+# CONFIG_I2C_DEBUG_BUS is not set
-+# CONFIG_I2C_DEBUG_CHIP is not set
-+
-+#
-+# SPI support
-+#
-+CONFIG_SPI=y
-+CONFIG_SPI_MASTER=y
-+
-+#
-+# SPI Master Controller Drivers
-+#
-+CONFIG_SPI_BITBANG=y
-+CONFIG_SPI_MPC83xx=y
-+
-+#
-+# SPI Protocol Masters
-+#
-+# CONFIG_SPI_AT25 is not set
-+# CONFIG_SPI_SPIDEV is not set
-+# CONFIG_SPI_TLE62X0 is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+# CONFIG_THERMAL is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_83xx_WDT=y
-+
-+#
-+# PCI-based Watchdog Cards
-+#
-+# CONFIG_PCIPCWATCHDOG is not set
-+# CONFIG_WDTPCI is not set
-+
-+#
-+# USB-based Watchdog Cards
-+#
-+# CONFIG_USBPCWATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+# CONFIG_USB_DABUSB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-+
-+#
-+# Miscellaneous USB options
-+#
-+CONFIG_USB_DEVICEFS=y
-+CONFIG_USB_DEVICE_CLASS=y
-+# CONFIG_USB_DYNAMIC_MINORS is not set
-+# CONFIG_USB_OTG is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+CONFIG_USB_EHCI_HCD=y
-+CONFIG_USB_EHCI_ROOT_HUB_TT=y
-+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-+CONFIG_USB_EHCI_FSL=y
-+CONFIG_USB_EHCI_HCD_PPC_OF=y
-+# CONFIG_USB_ISP116X_HCD is not set
-+# CONFIG_USB_OHCI_HCD is not set
-+CONFIG_USB_UHCI_HCD=y
-+# CONFIG_USB_SL811_HCD is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+
-+#
-+# USB Device Class drivers
-+#
-+# CONFIG_USB_ACM is not set
-+# CONFIG_USB_PRINTER is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+
-+#
-+# may also be needed; see USB_STORAGE Help for more information
-+#
-+CONFIG_USB_STORAGE=y
-+# CONFIG_USB_STORAGE_DEBUG is not set
-+# CONFIG_USB_STORAGE_DATAFAB is not set
-+# CONFIG_USB_STORAGE_FREECOM is not set
-+# CONFIG_USB_STORAGE_ISD200 is not set
-+# CONFIG_USB_STORAGE_DPCM is not set
-+# CONFIG_USB_STORAGE_USBAT is not set
-+# CONFIG_USB_STORAGE_SDDR09 is not set
-+# CONFIG_USB_STORAGE_SDDR55 is not set
-+# CONFIG_USB_STORAGE_JUMPSHOT is not set
-+# CONFIG_USB_STORAGE_ALAUDA is not set
-+# CONFIG_USB_STORAGE_KARMA is not set
-+# CONFIG_USB_LIBUSUAL is not set
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
-+CONFIG_USB_MON=y
-+
-+#
-+# USB port drivers
-+#
-+# CONFIG_USB_SERIAL is not set
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+# CONFIG_USB_EMI62 is not set
-+# CONFIG_USB_EMI26 is not set
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_AUERSWALD is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+# CONFIG_USB_BERRY_CHARGE is not set
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_PHIDGET is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+# CONFIG_USB_SISUSBVGA is not set
-+# CONFIG_USB_LD is not set
-+# CONFIG_USB_TRANCEVIBRATOR is not set
-+# CONFIG_USB_IOWARRIOR is not set
-+# CONFIG_USB_TEST is not set
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+# CONFIG_RTC_DEBUG is not set
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# I2C RTC drivers
-+#
-+CONFIG_RTC_DRV_DS1307=y
-+# CONFIG_RTC_DRV_DS1374 is not set
-+# CONFIG_RTC_DRV_DS1672 is not set
-+# CONFIG_RTC_DRV_MAX6900 is not set
-+# CONFIG_RTC_DRV_RS5C372 is not set
-+# CONFIG_RTC_DRV_ISL1208 is not set
-+# CONFIG_RTC_DRV_X1205 is not set
-+# CONFIG_RTC_DRV_PCF8563 is not set
-+# CONFIG_RTC_DRV_PCF8583 is not set
-+# CONFIG_RTC_DRV_M41T80 is not set
-+# CONFIG_RTC_DRV_S35390A is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+# CONFIG_RTC_DRV_MAX6902 is not set
-+# CONFIG_RTC_DRV_R9701 is not set
-+# CONFIG_RTC_DRV_RS5C348 is not set
-+
-+#
-+# Platform RTC drivers
-+#
-+# CONFIG_RTC_DRV_CMOS is not set
-+# CONFIG_RTC_DRV_DS1511 is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_M48T59 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+CONFIG_EXT3_FS_XATTR=y
-+# CONFIG_EXT3_FS_POSIX_ACL is not set
-+# CONFIG_EXT3_FS_SECURITY is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+CONFIG_FAT_FS=y
-+CONFIG_MSDOS_FS=y
-+CONFIG_VFAT_FS=y
-+CONFIG_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+# CONFIG_JFFS2_FS is not set
-+# CONFIG_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+CONFIG_NFS_V4=y
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+CONFIG_SUNRPC_GSS=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+CONFIG_MAC_PARTITION=y
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_BSD_DISKLABEL is not set
-+# CONFIG_MINIX_SUBPARTITION is not set
-+# CONFIG_SOLARIS_X86_PARTITION is not set
-+# CONFIG_UNIXWARE_DISKLABEL is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+CONFIG_NLS=y
-+CONFIG_NLS_DEFAULT="iso8859-1"
-+# CONFIG_NLS_CODEPAGE_437 is not set
-+# CONFIG_NLS_CODEPAGE_737 is not set
-+# CONFIG_NLS_CODEPAGE_775 is not set
-+# CONFIG_NLS_CODEPAGE_850 is not set
-+# CONFIG_NLS_CODEPAGE_852 is not set
-+# CONFIG_NLS_CODEPAGE_855 is not set
-+# CONFIG_NLS_CODEPAGE_857 is not set
-+# CONFIG_NLS_CODEPAGE_860 is not set
-+# CONFIG_NLS_CODEPAGE_861 is not set
-+# CONFIG_NLS_CODEPAGE_862 is not set
-+# CONFIG_NLS_CODEPAGE_863 is not set
-+# CONFIG_NLS_CODEPAGE_864 is not set
-+# CONFIG_NLS_CODEPAGE_865 is not set
-+# CONFIG_NLS_CODEPAGE_866 is not set
-+# CONFIG_NLS_CODEPAGE_869 is not set
-+# CONFIG_NLS_CODEPAGE_936 is not set
-+# CONFIG_NLS_CODEPAGE_950 is not set
-+# CONFIG_NLS_CODEPAGE_932 is not set
-+# CONFIG_NLS_CODEPAGE_949 is not set
-+# CONFIG_NLS_CODEPAGE_874 is not set
-+# CONFIG_NLS_ISO8859_8 is not set
-+# CONFIG_NLS_CODEPAGE_1250 is not set
-+# CONFIG_NLS_CODEPAGE_1251 is not set
-+# CONFIG_NLS_ASCII is not set
-+# CONFIG_NLS_ISO8859_1 is not set
-+# CONFIG_NLS_ISO8859_2 is not set
-+# CONFIG_NLS_ISO8859_3 is not set
-+# CONFIG_NLS_ISO8859_4 is not set
-+# CONFIG_NLS_ISO8859_5 is not set
-+# CONFIG_NLS_ISO8859_6 is not set
-+# CONFIG_NLS_ISO8859_7 is not set
-+# CONFIG_NLS_ISO8859_9 is not set
-+# CONFIG_NLS_ISO8859_13 is not set
-+# CONFIG_NLS_ISO8859_14 is not set
-+# CONFIG_NLS_ISO8859_15 is not set
-+# CONFIG_NLS_KOI8_R is not set
-+# CONFIG_NLS_KOI8_U is not set
-+# CONFIG_NLS_UTF8 is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# 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_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+# CONFIG_DEBUG_KERNEL is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+CONFIG_CRYPTO_MD5=y
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
-@@ -0,0 +1,1222 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Mon Mar 24 08:48:18 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+CONFIG_6xx=y
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_PPC_FPU=y
-+# CONFIG_FSL_EMB_PERFMON is not set
-+CONFIG_PPC_STD_MMU=y
-+CONFIG_PPC_STD_MMU_32=y
-+# CONFIG_PPC_MM_SLICES is not set
-+# CONFIG_SMP is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+# CONFIG_KALLSYMS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+# CONFIG_EPOLL is not set
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+# CONFIG_KMOD is not set
-+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
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_AS=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="anticipatory"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MULTIPLATFORM is not set
-+# CONFIG_PPC_82xx is not set
-+CONFIG_PPC_83xx=y
-+# CONFIG_PPC_86xx is not set
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC83xx=y
-+# CONFIG_MPC831x_RDB is not set
-+# CONFIG_MPC832x_MDS is not set
-+# CONFIG_MPC832x_RDB is not set
-+# CONFIG_MPC834x_MDS is not set
-+CONFIG_MPC834x_ITX=y
-+# CONFIG_MPC836x_MDS is not set
-+# CONFIG_MPC837x_MDS is not set
-+# CONFIG_MPC837x_RDB is not set
-+# CONFIG_SBC834x is not set
-+CONFIG_PPC_MPC834x=y
-+CONFIG_IPIC=y
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+CONFIG_TICK_ONESHOT=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_GENERIC_ISA_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+CONFIG_INET_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+# CONFIG_MTD_PARTITIONS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+# CONFIG_MTD_BLKDEVS is not set
-+# CONFIG_MTD_BLOCK is not set
-+# CONFIG_MTD_BLOCK_RO is not set
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+# CONFIG_MTD_CFI_INTELEXT is not set
-+CONFIG_MTD_CFI_AMDSTD=y
-+# CONFIG_MTD_CFI_STAA is not set
-+CONFIG_MTD_CFI_UTIL=y
-+# CONFIG_MTD_RAM is not set
-+# CONFIG_MTD_ROM is not set
-+# CONFIG_MTD_ABSENT is not set
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+CONFIG_MTD_PHYSMAP=y
-+CONFIG_MTD_PHYSMAP_START=0xfe000000
-+CONFIG_MTD_PHYSMAP_LEN=0x800000
-+CONFIG_MTD_PHYSMAP_BANKWIDTH=2
-+# CONFIG_MTD_PHYSMAP_OF is not set
-+# CONFIG_MTD_INTEL_VR_NOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_PMC551 is not set
-+# CONFIG_MTD_DATAFLASH is not set
-+# CONFIG_MTD_M25P80 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+# CONFIG_MTD_NAND is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+# CONFIG_BLK_DEV_UB is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=y
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=y
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+# CONFIG_BLK_DEV_SR is not set
-+CONFIG_CHR_DEV_SG=y
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+# CONFIG_SCSI_SCAN_ASYNC is not set
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+CONFIG_SCSI_SPI_ATTRS=y
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-+# CONFIG_SCSI_3W_9XXX is not set
-+# CONFIG_SCSI_ACARD is not set
-+# CONFIG_SCSI_AACRAID is not set
-+# CONFIG_SCSI_AIC7XXX is not set
-+# CONFIG_SCSI_AIC7XXX_OLD is not set
-+# CONFIG_SCSI_AIC79XX is not set
-+# CONFIG_SCSI_AIC94XX is not set
-+# CONFIG_SCSI_DPT_I2O is not set
-+# CONFIG_SCSI_ADVANSYS is not set
-+# CONFIG_SCSI_ARCMSR is not set
-+# CONFIG_MEGARAID_NEWGEN is not set
-+# CONFIG_MEGARAID_LEGACY is not set
-+# CONFIG_MEGARAID_SAS is not set
-+# CONFIG_SCSI_HPTIOP is not set
-+# CONFIG_SCSI_BUSLOGIC is not set
-+# CONFIG_SCSI_DMX3191D is not set
-+# CONFIG_SCSI_EATA is not set
-+# CONFIG_SCSI_FUTURE_DOMAIN is not set
-+# CONFIG_SCSI_GDTH is not set
-+# CONFIG_SCSI_IPS is not set
-+# CONFIG_SCSI_INITIO is not set
-+# CONFIG_SCSI_INIA100 is not set
-+# CONFIG_SCSI_MVSAS is not set
-+# CONFIG_SCSI_STEX is not set
-+# CONFIG_SCSI_SYM53C8XX_2 is not set
-+# CONFIG_SCSI_QLOGIC_1280 is not set
-+# CONFIG_SCSI_QLA_FC is not set
-+# CONFIG_SCSI_QLA_ISCSI is not set
-+# CONFIG_SCSI_LPFC is not set
-+# CONFIG_SCSI_DC395x is not set
-+# CONFIG_SCSI_DC390T is not set
-+# CONFIG_SCSI_NSP32 is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_SCSI_SRP is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+# CONFIG_MARVELL_PHY is not set
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+CONFIG_CICADA_PHY=y
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+# CONFIG_NET_ETHERNET is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+
-+#
-+# USB Network Adapters
-+#
-+# CONFIG_USB_CATC is not set
-+# CONFIG_USB_KAWETH is not set
-+# CONFIG_USB_PEGASUS is not set
-+# CONFIG_USB_RTL8150 is not set
-+# CONFIG_USB_USBNET is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NET_FC is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+# CONFIG_INPUT is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+# CONFIG_SERIAL_8250_PCI is not set
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+CONFIG_HW_RANDOM=y
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_ALI1535 is not set
-+# CONFIG_I2C_ALI1563 is not set
-+# CONFIG_I2C_ALI15X3 is not set
-+# CONFIG_I2C_AMD756 is not set
-+# CONFIG_I2C_AMD8111 is not set
-+# CONFIG_I2C_I801 is not set
-+# CONFIG_I2C_I810 is not set
-+# CONFIG_I2C_PIIX4 is not set
-+CONFIG_I2C_MPC=y
-+# CONFIG_I2C_NFORCE2 is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_PROSAVAGE is not set
-+# CONFIG_I2C_SAVAGE4 is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_SIS5595 is not set
-+# CONFIG_I2C_SIS630 is not set
-+# CONFIG_I2C_SIS96X 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_VIA is not set
-+# CONFIG_I2C_VIAPRO is not set
-+# CONFIG_I2C_VOODOO3 is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+CONFIG_SENSORS_PCF8574=y
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+# CONFIG_I2C_DEBUG_CORE is not set
-+# CONFIG_I2C_DEBUG_ALGO is not set
-+# CONFIG_I2C_DEBUG_BUS is not set
-+# CONFIG_I2C_DEBUG_CHIP is not set
-+
-+#
-+# SPI support
-+#
-+CONFIG_SPI=y
-+CONFIG_SPI_MASTER=y
-+
-+#
-+# SPI Master Controller Drivers
-+#
-+CONFIG_SPI_BITBANG=y
-+CONFIG_SPI_MPC83xx=y
-+
-+#
-+# SPI Protocol Masters
-+#
-+# CONFIG_SPI_AT25 is not set
-+# CONFIG_SPI_SPIDEV is not set
-+# CONFIG_SPI_TLE62X0 is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+# CONFIG_THERMAL is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_83xx_WDT=y
-+
-+#
-+# PCI-based Watchdog Cards
-+#
-+# CONFIG_PCIPCWATCHDOG is not set
-+# CONFIG_WDTPCI is not set
-+
-+#
-+# USB-based Watchdog Cards
-+#
-+# CONFIG_USBPCWATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+# CONFIG_USB_DABUSB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-+
-+#
-+# Miscellaneous USB options
-+#
-+# CONFIG_USB_DEVICEFS is not set
-+CONFIG_USB_DEVICE_CLASS=y
-+# CONFIG_USB_DYNAMIC_MINORS is not set
-+# CONFIG_USB_OTG is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+CONFIG_USB_EHCI_HCD=y
-+CONFIG_USB_EHCI_ROOT_HUB_TT=y
-+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-+CONFIG_USB_EHCI_FSL=y
-+CONFIG_USB_EHCI_HCD_PPC_OF=y
-+# CONFIG_USB_ISP116X_HCD is not set
-+# CONFIG_USB_OHCI_HCD is not set
-+CONFIG_USB_UHCI_HCD=y
-+# CONFIG_USB_SL811_HCD is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+
-+#
-+# USB Device Class drivers
-+#
-+# CONFIG_USB_ACM is not set
-+# CONFIG_USB_PRINTER is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+
-+#
-+# may also be needed; see USB_STORAGE Help for more information
-+#
-+CONFIG_USB_STORAGE=y
-+# CONFIG_USB_STORAGE_DEBUG is not set
-+# CONFIG_USB_STORAGE_DATAFAB is not set
-+# CONFIG_USB_STORAGE_FREECOM is not set
-+# CONFIG_USB_STORAGE_ISD200 is not set
-+# CONFIG_USB_STORAGE_DPCM is not set
-+# CONFIG_USB_STORAGE_USBAT is not set
-+# CONFIG_USB_STORAGE_SDDR09 is not set
-+# CONFIG_USB_STORAGE_SDDR55 is not set
-+# CONFIG_USB_STORAGE_JUMPSHOT is not set
-+# CONFIG_USB_STORAGE_ALAUDA is not set
-+# CONFIG_USB_STORAGE_KARMA is not set
-+# CONFIG_USB_LIBUSUAL is not set
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
-+CONFIG_USB_MON=y
-+
-+#
-+# USB port drivers
-+#
-+# CONFIG_USB_SERIAL is not set
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+# CONFIG_USB_EMI62 is not set
-+# CONFIG_USB_EMI26 is not set
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_AUERSWALD is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+# CONFIG_USB_BERRY_CHARGE is not set
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_PHIDGET is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+# CONFIG_USB_SISUSBVGA is not set
-+# CONFIG_USB_LD is not set
-+# CONFIG_USB_TRANCEVIBRATOR is not set
-+# CONFIG_USB_IOWARRIOR is not set
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+# CONFIG_RTC_DEBUG is not set
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# I2C RTC drivers
-+#
-+CONFIG_RTC_DRV_DS1307=y
-+# CONFIG_RTC_DRV_DS1374 is not set
-+# CONFIG_RTC_DRV_DS1672 is not set
-+# CONFIG_RTC_DRV_MAX6900 is not set
-+# CONFIG_RTC_DRV_RS5C372 is not set
-+# CONFIG_RTC_DRV_ISL1208 is not set
-+# CONFIG_RTC_DRV_X1205 is not set
-+# CONFIG_RTC_DRV_PCF8563 is not set
-+# CONFIG_RTC_DRV_PCF8583 is not set
-+# CONFIG_RTC_DRV_M41T80 is not set
-+# CONFIG_RTC_DRV_S35390A is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+# CONFIG_RTC_DRV_MAX6902 is not set
-+# CONFIG_RTC_DRV_R9701 is not set
-+# CONFIG_RTC_DRV_RS5C348 is not set
-+
-+#
-+# Platform RTC drivers
-+#
-+# CONFIG_RTC_DRV_CMOS is not set
-+# CONFIG_RTC_DRV_DS1511 is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_M48T59 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+CONFIG_EXT3_FS_XATTR=y
-+# CONFIG_EXT3_FS_POSIX_ACL is not set
-+# CONFIG_EXT3_FS_SECURITY is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+CONFIG_FAT_FS=y
-+CONFIG_MSDOS_FS=y
-+CONFIG_VFAT_FS=y
-+CONFIG_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+# CONFIG_JFFS2_FS is not set
-+# CONFIG_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+CONFIG_NFS_V4=y
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+CONFIG_SUNRPC_GSS=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+CONFIG_MAC_PARTITION=y
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_BSD_DISKLABEL is not set
-+# CONFIG_MINIX_SUBPARTITION is not set
-+# CONFIG_SOLARIS_X86_PARTITION is not set
-+# CONFIG_UNIXWARE_DISKLABEL is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+CONFIG_NLS=y
-+CONFIG_NLS_DEFAULT="iso8859-1"
-+# CONFIG_NLS_CODEPAGE_437 is not set
-+# CONFIG_NLS_CODEPAGE_737 is not set
-+# CONFIG_NLS_CODEPAGE_775 is not set
-+# CONFIG_NLS_CODEPAGE_850 is not set
-+# CONFIG_NLS_CODEPAGE_852 is not set
-+# CONFIG_NLS_CODEPAGE_855 is not set
-+# CONFIG_NLS_CODEPAGE_857 is not set
-+# CONFIG_NLS_CODEPAGE_860 is not set
-+# CONFIG_NLS_CODEPAGE_861 is not set
-+# CONFIG_NLS_CODEPAGE_862 is not set
-+# CONFIG_NLS_CODEPAGE_863 is not set
-+# CONFIG_NLS_CODEPAGE_864 is not set
-+# CONFIG_NLS_CODEPAGE_865 is not set
-+# CONFIG_NLS_CODEPAGE_866 is not set
-+# CONFIG_NLS_CODEPAGE_869 is not set
-+# CONFIG_NLS_CODEPAGE_936 is not set
-+# CONFIG_NLS_CODEPAGE_950 is not set
-+# CONFIG_NLS_CODEPAGE_932 is not set
-+# CONFIG_NLS_CODEPAGE_949 is not set
-+# CONFIG_NLS_CODEPAGE_874 is not set
-+# CONFIG_NLS_ISO8859_8 is not set
-+# CONFIG_NLS_CODEPAGE_1250 is not set
-+# CONFIG_NLS_CODEPAGE_1251 is not set
-+# CONFIG_NLS_ASCII is not set
-+# CONFIG_NLS_ISO8859_1 is not set
-+# CONFIG_NLS_ISO8859_2 is not set
-+# CONFIG_NLS_ISO8859_3 is not set
-+# CONFIG_NLS_ISO8859_4 is not set
-+# CONFIG_NLS_ISO8859_5 is not set
-+# CONFIG_NLS_ISO8859_6 is not set
-+# CONFIG_NLS_ISO8859_7 is not set
-+# CONFIG_NLS_ISO8859_9 is not set
-+# CONFIG_NLS_ISO8859_13 is not set
-+# CONFIG_NLS_ISO8859_14 is not set
-+# CONFIG_NLS_ISO8859_15 is not set
-+# CONFIG_NLS_KOI8_R is not set
-+# CONFIG_NLS_KOI8_U is not set
-+# CONFIG_NLS_UTF8 is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# 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_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+# CONFIG_DEBUG_KERNEL is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+CONFIG_CRYPTO_MD5=y
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
-@@ -0,0 +1,1021 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc7
-+# Mon Mar 31 11:36:56 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+CONFIG_6xx=y
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_PPC_FPU=y
-+# CONFIG_FSL_EMB_PERFMON is not set
-+CONFIG_PPC_STD_MMU=y
-+CONFIG_PPC_STD_MMU_32=y
-+# CONFIG_PPC_MM_SLICES is not set
-+# CONFIG_SMP is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+# CONFIG_KALLSYMS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+# CONFIG_EPOLL is not set
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+# CONFIG_KMOD is not set
-+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
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_AS=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="anticipatory"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MULTIPLATFORM is not set
-+# CONFIG_PPC_82xx is not set
-+CONFIG_PPC_83xx=y
-+# CONFIG_PPC_86xx is not set
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC83xx=y
-+# CONFIG_MPC831x_RDB is not set
-+# CONFIG_MPC832x_MDS is not set
-+# CONFIG_MPC832x_RDB is not set
-+CONFIG_MPC834x_MDS=y
-+# CONFIG_MPC834x_ITX is not set
-+# CONFIG_MPC836x_MDS is not set
-+# CONFIG_MPC837x_MDS is not set
-+# CONFIG_MPC837x_RDB is not set
-+# CONFIG_SBC834x is not set
-+CONFIG_PPC_MPC834x=y
-+CONFIG_IPIC=y
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+CONFIG_TICK_ONESHOT=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_GENERIC_ISA_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+CONFIG_XFRM_USER=m
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+CONFIG_INET_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+CONFIG_MARVELL_PHY=y
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+CONFIG_NET_PCI=y
-+# CONFIG_PCNET32 is not set
-+# CONFIG_AMD8111_ETH is not set
-+# CONFIG_ADAPTEC_STARFIRE is not set
-+# CONFIG_B44 is not set
-+# CONFIG_FORCEDETH is not set
-+# CONFIG_EEPRO100 is not set
-+CONFIG_E100=y
-+# CONFIG_FEALNX is not set
-+# CONFIG_NATSEMI is not set
-+# CONFIG_NE2K_PCI is not set
-+# CONFIG_8139CP is not set
-+# CONFIG_8139TOO is not set
-+# CONFIG_R6040 is not set
-+# CONFIG_SIS900 is not set
-+# CONFIG_EPIC100 is not set
-+# CONFIG_SUNDANCE is not set
-+# CONFIG_TLAN is not set
-+# CONFIG_VIA_RHINE is not set
-+# CONFIG_SC92031 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+CONFIG_GIANFAR=y
-+# CONFIG_GFAR_NAPI is not set
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_ALI1535 is not set
-+# CONFIG_I2C_ALI1563 is not set
-+# CONFIG_I2C_ALI15X3 is not set
-+# CONFIG_I2C_AMD756 is not set
-+# CONFIG_I2C_AMD8111 is not set
-+# CONFIG_I2C_I801 is not set
-+# CONFIG_I2C_I810 is not set
-+# CONFIG_I2C_PIIX4 is not set
-+CONFIG_I2C_MPC=y
-+# CONFIG_I2C_NFORCE2 is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_PROSAVAGE is not set
-+# CONFIG_I2C_SAVAGE4 is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_SIS5595 is not set
-+# CONFIG_I2C_SIS630 is not set
-+# CONFIG_I2C_SIS96X is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_STUB is not set
-+# CONFIG_I2C_VIA is not set
-+# CONFIG_I2C_VIAPRO is not set
-+# CONFIG_I2C_VOODOO3 is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+# CONFIG_I2C_DEBUG_CORE is not set
-+# CONFIG_I2C_DEBUG_ALGO is not set
-+# CONFIG_I2C_DEBUG_BUS is not set
-+# CONFIG_I2C_DEBUG_CHIP is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ADT7473 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_I5K_AMB is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S is not set
-+# CONFIG_SENSORS_GL518SM is not set
-+# CONFIG_SENSORS_GL520SM is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_LM63 is not set
-+# CONFIG_SENSORS_LM75 is not set
-+# CONFIG_SENSORS_LM77 is not set
-+# CONFIG_SENSORS_LM78 is not set
-+# CONFIG_SENSORS_LM80 is not set
-+# CONFIG_SENSORS_LM83 is not set
-+# CONFIG_SENSORS_LM85 is not set
-+# 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_SIS5595 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_ADS7828 is not set
-+# CONFIG_SENSORS_THMC50 is not set
-+# CONFIG_SENSORS_VIA686A is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_VT8231 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83L786NG is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+# CONFIG_THERMAL is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_83xx_WDT=y
-+
-+#
-+# PCI-based Watchdog Cards
-+#
-+# CONFIG_PCIPCWATCHDOG is not set
-+# CONFIG_WDTPCI is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+# CONFIG_RTC_DEBUG is not set
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# I2C RTC drivers
-+#
-+# CONFIG_RTC_DRV_DS1307 is not set
-+CONFIG_RTC_DRV_DS1374=y
-+# CONFIG_RTC_DRV_DS1672 is not set
-+# CONFIG_RTC_DRV_MAX6900 is not set
-+# CONFIG_RTC_DRV_RS5C372 is not set
-+# CONFIG_RTC_DRV_ISL1208 is not set
-+# CONFIG_RTC_DRV_X1205 is not set
-+# CONFIG_RTC_DRV_PCF8563 is not set
-+# CONFIG_RTC_DRV_PCF8583 is not set
-+# CONFIG_RTC_DRV_M41T80 is not set
-+# CONFIG_RTC_DRV_S35390A is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+
-+#
-+# Platform RTC drivers
-+#
-+# CONFIG_RTC_DRV_CMOS is not set
-+# CONFIG_RTC_DRV_DS1511 is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_M48T59 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+CONFIG_EXT3_FS_XATTR=y
-+# CONFIG_EXT3_FS_POSIX_ACL is not set
-+# CONFIG_EXT3_FS_SECURITY is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+# CONFIG_MSDOS_FS is not set
-+# CONFIG_VFAT_FS is not set
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+# CONFIG_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+CONFIG_NFS_V4=y
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+CONFIG_SUNRPC_GSS=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+# CONFIG_MSDOS_PARTITION is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# 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_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+# CONFIG_DEBUG_KERNEL is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+CONFIG_CRYPTO_MD5=y
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
-@@ -0,0 +1,1079 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc7
-+# Mon Mar 31 11:36:57 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+CONFIG_6xx=y
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_PPC_FPU=y
-+# CONFIG_FSL_EMB_PERFMON is not set
-+CONFIG_PPC_STD_MMU=y
-+CONFIG_PPC_STD_MMU_32=y
-+# CONFIG_PPC_MM_SLICES is not set
-+# CONFIG_SMP is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+# CONFIG_KALLSYMS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+# CONFIG_EPOLL is not set
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+# CONFIG_KMOD is not set
-+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
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_AS=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="anticipatory"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MULTIPLATFORM is not set
-+# CONFIG_PPC_82xx is not set
-+CONFIG_PPC_83xx=y
-+# CONFIG_PPC_86xx is not set
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC83xx=y
-+# CONFIG_MPC831x_RDB is not set
-+# CONFIG_MPC832x_MDS is not set
-+# CONFIG_MPC832x_RDB is not set
-+# CONFIG_MPC834x_MDS is not set
-+# CONFIG_MPC834x_ITX is not set
-+CONFIG_MPC836x_MDS=y
-+# CONFIG_MPC837x_MDS is not set
-+# CONFIG_MPC837x_RDB is not set
-+# CONFIG_SBC834x is not set
-+CONFIG_IPIC=y
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+CONFIG_QUICC_ENGINE=y
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+CONFIG_TICK_ONESHOT=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_GENERIC_ISA_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+CONFIG_INET_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=y
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+# CONFIG_BLK_DEV_SD is not set
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+# CONFIG_BLK_DEV_SR is not set
-+# CONFIG_CHR_DEV_SG is not set
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+# CONFIG_SCSI_SCAN_ASYNC is not set
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-+# CONFIG_SCSI_3W_9XXX is not set
-+# CONFIG_SCSI_ACARD is not set
-+# CONFIG_SCSI_AACRAID is not set
-+# CONFIG_SCSI_AIC7XXX is not set
-+# CONFIG_SCSI_AIC7XXX_OLD is not set
-+# CONFIG_SCSI_AIC79XX is not set
-+# CONFIG_SCSI_AIC94XX is not set
-+# CONFIG_SCSI_DPT_I2O is not set
-+# CONFIG_SCSI_ADVANSYS is not set
-+# CONFIG_SCSI_ARCMSR is not set
-+# CONFIG_MEGARAID_NEWGEN is not set
-+# CONFIG_MEGARAID_LEGACY is not set
-+# CONFIG_MEGARAID_SAS is not set
-+# CONFIG_SCSI_HPTIOP is not set
-+# CONFIG_SCSI_BUSLOGIC is not set
-+# CONFIG_SCSI_DMX3191D is not set
-+# CONFIG_SCSI_EATA is not set
-+# CONFIG_SCSI_FUTURE_DOMAIN is not set
-+# CONFIG_SCSI_GDTH is not set
-+# CONFIG_SCSI_IPS is not set
-+# CONFIG_SCSI_INITIO is not set
-+# CONFIG_SCSI_INIA100 is not set
-+# CONFIG_SCSI_MVSAS is not set
-+# CONFIG_SCSI_STEX is not set
-+# CONFIG_SCSI_SYM53C8XX_2 is not set
-+# CONFIG_SCSI_QLOGIC_1280 is not set
-+# CONFIG_SCSI_QLA_FC is not set
-+# CONFIG_SCSI_QLA_ISCSI is not set
-+# CONFIG_SCSI_LPFC is not set
-+# CONFIG_SCSI_DC395x is not set
-+# CONFIG_SCSI_DC390T is not set
-+# CONFIG_SCSI_NSP32 is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_SCSI_SRP is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+CONFIG_MARVELL_PHY=y
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+# CONFIG_GIANFAR is not set
-+CONFIG_UCC_GETH=y
-+# CONFIG_UGETH_NAPI is not set
-+# CONFIG_UGETH_MAGIC_PACKET is not set
-+# CONFIG_UGETH_FILTERING is not set
-+# CONFIG_UGETH_TX_ON_DEMAND is not set
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NET_FC is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+# CONFIG_SERIAL_QE is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+CONFIG_HW_RANDOM=y
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_ALI1535 is not set
-+# CONFIG_I2C_ALI1563 is not set
-+# CONFIG_I2C_ALI15X3 is not set
-+# CONFIG_I2C_AMD756 is not set
-+# CONFIG_I2C_AMD8111 is not set
-+# CONFIG_I2C_I801 is not set
-+# CONFIG_I2C_I810 is not set
-+# CONFIG_I2C_PIIX4 is not set
-+CONFIG_I2C_MPC=y
-+# CONFIG_I2C_NFORCE2 is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_PROSAVAGE is not set
-+# CONFIG_I2C_SAVAGE4 is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_SIS5595 is not set
-+# CONFIG_I2C_SIS630 is not set
-+# CONFIG_I2C_SIS96X is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_STUB is not set
-+# CONFIG_I2C_VIA is not set
-+# CONFIG_I2C_VIAPRO is not set
-+# CONFIG_I2C_VOODOO3 is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+# CONFIG_I2C_DEBUG_CORE is not set
-+# CONFIG_I2C_DEBUG_ALGO is not set
-+# CONFIG_I2C_DEBUG_BUS is not set
-+# CONFIG_I2C_DEBUG_CHIP is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ADT7473 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_I5K_AMB is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S is not set
-+# CONFIG_SENSORS_GL518SM is not set
-+# CONFIG_SENSORS_GL520SM is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_LM63 is not set
-+# CONFIG_SENSORS_LM75 is not set
-+# CONFIG_SENSORS_LM77 is not set
-+# CONFIG_SENSORS_LM78 is not set
-+# CONFIG_SENSORS_LM80 is not set
-+# CONFIG_SENSORS_LM83 is not set
-+# CONFIG_SENSORS_LM85 is not set
-+# 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_SIS5595 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_ADS7828 is not set
-+# CONFIG_SENSORS_THMC50 is not set
-+# CONFIG_SENSORS_VIA686A is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_VT8231 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83L786NG is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+# CONFIG_THERMAL is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_83xx_WDT=y
-+
-+#
-+# PCI-based Watchdog Cards
-+#
-+# CONFIG_PCIPCWATCHDOG is not set
-+# CONFIG_WDTPCI is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+# CONFIG_RTC_DEBUG is not set
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# I2C RTC drivers
-+#
-+# CONFIG_RTC_DRV_DS1307 is not set
-+CONFIG_RTC_DRV_DS1374=y
-+# CONFIG_RTC_DRV_DS1672 is not set
-+# CONFIG_RTC_DRV_MAX6900 is not set
-+# CONFIG_RTC_DRV_RS5C372 is not set
-+# CONFIG_RTC_DRV_ISL1208 is not set
-+# CONFIG_RTC_DRV_X1205 is not set
-+# CONFIG_RTC_DRV_PCF8563 is not set
-+# CONFIG_RTC_DRV_PCF8583 is not set
-+# CONFIG_RTC_DRV_M41T80 is not set
-+# CONFIG_RTC_DRV_S35390A is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+
-+#
-+# Platform RTC drivers
-+#
-+# CONFIG_RTC_DRV_CMOS is not set
-+# CONFIG_RTC_DRV_DS1511 is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_M48T59 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+CONFIG_EXT3_FS_XATTR=y
-+# CONFIG_EXT3_FS_POSIX_ACL is not set
-+# CONFIG_EXT3_FS_SECURITY is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+# CONFIG_MSDOS_FS is not set
-+# CONFIG_VFAT_FS is not set
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+# CONFIG_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+CONFIG_NFS_V4=y
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+CONFIG_SUNRPC_GSS=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+# CONFIG_MSDOS_PARTITION is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+CONFIG_UCC_FAST=y
-+CONFIG_UCC=y
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# 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_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+# CONFIG_DEBUG_KERNEL is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+CONFIG_CRYPTO_MD5=y
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
-+CONFIG_PPC_LIB_RHEAP=y
---- /dev/null
-+++ b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
-@@ -0,0 +1,899 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Mon Mar 24 08:48:23 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+CONFIG_6xx=y
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_PPC_FPU=y
-+# CONFIG_FSL_EMB_PERFMON is not set
-+CONFIG_PPC_STD_MMU=y
-+CONFIG_PPC_STD_MMU_32=y
-+# CONFIG_PPC_MM_SLICES is not set
-+# CONFIG_SMP is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+# CONFIG_EPOLL is not set
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLAB=y
-+# CONFIG_SLUB is not set
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+# CONFIG_KMOD is not set
-+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
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_AS=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="anticipatory"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MULTIPLATFORM is not set
-+# CONFIG_PPC_82xx is not set
-+CONFIG_PPC_83xx=y
-+# CONFIG_PPC_86xx is not set
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC83xx=y
-+# CONFIG_MPC831x_RDB is not set
-+# CONFIG_MPC832x_MDS is not set
-+# CONFIG_MPC832x_RDB is not set
-+# CONFIG_MPC834x_MDS is not set
-+# CONFIG_MPC834x_ITX is not set
-+# CONFIG_MPC836x_MDS is not set
-+CONFIG_MPC837x_MDS=y
-+# CONFIG_MPC837x_RDB is not set
-+# CONFIG_SBC834x is not set
-+CONFIG_PPC_MPC837x=y
-+CONFIG_IPIC=y
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_GENERIC_ISA_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+# CONFIG_PCI is not set
-+# CONFIG_PCI_DOMAINS is not set
-+# CONFIG_PCI_SYSCALL is not set
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
-+# CONFIG_PCCARD is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+CONFIG_XFRM_USER=m
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+CONFIG_INET_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=y
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=y
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+# CONFIG_BLK_DEV_SR is not set
-+CONFIG_CHR_DEV_SG=y
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+# CONFIG_SCSI_SCAN_ASYNC is not set
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_SCSI_DEBUG is not set
-+CONFIG_ATA=y
-+# CONFIG_ATA_NONSTANDARD is not set
-+# CONFIG_SATA_MV is not set
-+CONFIG_SATA_FSL=y
-+# CONFIG_PATA_PLATFORM is not set
-+# CONFIG_MD is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+CONFIG_MARVELL_PHY=y
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_E1000E_ENABLED is not set
-+CONFIG_GIANFAR=y
-+# CONFIG_GFAR_NAPI is not set
-+CONFIG_NETDEV_10000=y
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+CONFIG_GEN_RTC=y
-+# CONFIG_GEN_RTC_X is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+CONFIG_I2C_MPC=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
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+# CONFIG_I2C_DEBUG_CORE is not set
-+# CONFIG_I2C_DEBUG_ALGO is not set
-+# CONFIG_I2C_DEBUG_BUS is not set
-+# CONFIG_I2C_DEBUG_CHIP is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ADT7473 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S is not set
-+# CONFIG_SENSORS_GL518SM is not set
-+# CONFIG_SENSORS_GL520SM is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_LM63 is not set
-+# CONFIG_SENSORS_LM75 is not set
-+# CONFIG_SENSORS_LM77 is not set
-+# CONFIG_SENSORS_LM78 is not set
-+# CONFIG_SENSORS_LM80 is not set
-+# CONFIG_SENSORS_LM83 is not set
-+# CONFIG_SENSORS_LM85 is not set
-+# 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_ADS7828 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
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83L786NG is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+# CONFIG_THERMAL is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_83xx_WDT=y
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+# CONFIG_USB_ARCH_HAS_OHCI is not set
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+CONFIG_EXT3_FS_XATTR=y
-+# CONFIG_EXT3_FS_POSIX_ACL is not set
-+# CONFIG_EXT3_FS_SECURITY is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+# CONFIG_MSDOS_FS is not set
-+# CONFIG_VFAT_FS is not set
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+# CONFIG_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+CONFIG_NFS_V4=y
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+CONFIG_SUNRPC_GSS=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_BSD_DISKLABEL is not set
-+# CONFIG_MINIX_SUBPARTITION is not set
-+# CONFIG_SOLARIS_X86_PARTITION is not set
-+# CONFIG_UNIXWARE_DISKLABEL is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# 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_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+# CONFIG_DEBUG_KERNEL is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+CONFIG_CRYPTO_MD5=y
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
-@@ -0,0 +1,930 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Mon Mar 24 08:48:24 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+CONFIG_6xx=y
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_PPC_FPU=y
-+# CONFIG_FSL_EMB_PERFMON is not set
-+CONFIG_PPC_STD_MMU=y
-+CONFIG_PPC_STD_MMU_32=y
-+# CONFIG_PPC_MM_SLICES is not set
-+# CONFIG_SMP is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+# CONFIG_EPOLL is not set
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLAB=y
-+# CONFIG_SLUB is not set
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+# CONFIG_KMOD is not set
-+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
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_AS=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="anticipatory"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MULTIPLATFORM is not set
-+# CONFIG_PPC_82xx is not set
-+CONFIG_PPC_83xx=y
-+# CONFIG_PPC_86xx is not set
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC83xx=y
-+# CONFIG_MPC831x_RDB is not set
-+# CONFIG_MPC832x_MDS is not set
-+# CONFIG_MPC832x_RDB is not set
-+# CONFIG_MPC834x_MDS is not set
-+# CONFIG_MPC834x_ITX is not set
-+# CONFIG_MPC836x_MDS is not set
-+# CONFIG_MPC837x_MDS is not set
-+CONFIG_MPC837x_RDB=y
-+# CONFIG_SBC834x is not set
-+CONFIG_PPC_MPC837x=y
-+CONFIG_IPIC=y
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_GENERIC_ISA_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+# CONFIG_PCI is not set
-+# CONFIG_PCI_DOMAINS is not set
-+# CONFIG_PCI_SYSCALL is not set
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
-+# CONFIG_PCCARD is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_BEET is not set
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=y
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=y
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+# CONFIG_BLK_DEV_SR is not set
-+CONFIG_CHR_DEV_SG=y
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+# CONFIG_SCSI_SCAN_ASYNC is not set
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_SCSI_DEBUG is not set
-+CONFIG_ATA=y
-+# CONFIG_ATA_NONSTANDARD is not set
-+# CONFIG_SATA_MV is not set
-+CONFIG_SATA_FSL=y
-+# CONFIG_PATA_PLATFORM is not set
-+CONFIG_MD=y
-+CONFIG_BLK_DEV_MD=y
-+# CONFIG_MD_LINEAR is not set
-+# CONFIG_MD_RAID0 is not set
-+CONFIG_MD_RAID1=y
-+# CONFIG_MD_RAID10 is not set
-+CONFIG_MD_RAID456=y
-+CONFIG_MD_RAID5_RESHAPE=y
-+# CONFIG_MD_MULTIPATH is not set
-+# CONFIG_MD_FAULTY is not set
-+# CONFIG_BLK_DEV_DM is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+CONFIG_MARVELL_PHY=y
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_E1000E_ENABLED is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+# CONFIG_NETDEV_10000 is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+CONFIG_GEN_RTC=y
-+# CONFIG_GEN_RTC_X is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+CONFIG_I2C_MPC=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
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+# CONFIG_I2C_DEBUG_CORE is not set
-+# CONFIG_I2C_DEBUG_ALGO is not set
-+# CONFIG_I2C_DEBUG_BUS is not set
-+# CONFIG_I2C_DEBUG_CHIP is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ADT7473 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S is not set
-+# CONFIG_SENSORS_GL518SM is not set
-+# CONFIG_SENSORS_GL520SM is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_LM63 is not set
-+# CONFIG_SENSORS_LM75 is not set
-+# CONFIG_SENSORS_LM77 is not set
-+# CONFIG_SENSORS_LM78 is not set
-+# CONFIG_SENSORS_LM80 is not set
-+# CONFIG_SENSORS_LM83 is not set
-+# CONFIG_SENSORS_LM85 is not set
-+# 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_ADS7828 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
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83L786NG is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+# CONFIG_THERMAL is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_83xx_WDT=y
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+# CONFIG_USB_ARCH_HAS_OHCI is not set
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-+
-+#
-+# Miscellaneous USB options
-+#
-+# CONFIG_USB_DEVICEFS is not set
-+CONFIG_USB_DEVICE_CLASS=y
-+# CONFIG_USB_DYNAMIC_MINORS is not set
-+# CONFIG_USB_OTG is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+CONFIG_USB_EHCI_HCD=y
-+CONFIG_USB_EHCI_ROOT_HUB_TT=y
-+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-+CONFIG_USB_EHCI_FSL=y
-+CONFIG_USB_EHCI_HCD_PPC_OF=y
-+# CONFIG_USB_ISP116X_HCD is not set
-+# CONFIG_USB_SL811_HCD is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+CONFIG_EXT3_FS_XATTR=y
-+# CONFIG_EXT3_FS_POSIX_ACL is not set
-+# CONFIG_EXT3_FS_SECURITY is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+# CONFIG_MSDOS_FS is not set
-+# CONFIG_VFAT_FS is not set
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+# CONFIG_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+CONFIG_NFS_V4=y
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+CONFIG_SUNRPC_GSS=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_BSD_DISKLABEL is not set
-+# CONFIG_MINIX_SUBPARTITION is not set
-+# CONFIG_SOLARIS_X86_PARTITION is not set
-+# CONFIG_UNIXWARE_DISKLABEL is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# 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_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+# CONFIG_ENABLE_MUST_CHECK is not set
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+# CONFIG_DEBUG_KERNEL is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_XOR_BLOCKS=y
-+CONFIG_ASYNC_CORE=y
-+CONFIG_ASYNC_MEMCPY=y
-+CONFIG_ASYNC_XOR=y
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+CONFIG_CRYPTO_MD5=y
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/83xx/sbc834x_defconfig
-@@ -0,0 +1,828 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Mon Mar 24 08:48:38 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+CONFIG_6xx=y
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_PPC_FPU=y
-+# CONFIG_FSL_EMB_PERFMON is not set
-+CONFIG_PPC_STD_MMU=y
-+CONFIG_PPC_STD_MMU_32=y
-+# CONFIG_PPC_MM_SLICES is not set
-+# CONFIG_SMP is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+# CONFIG_KALLSYMS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+# CONFIG_EPOLL is not set
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLAB=y
-+# CONFIG_SLUB is not set
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+# CONFIG_KMOD is not set
-+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
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_AS=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="anticipatory"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MULTIPLATFORM is not set
-+# CONFIG_PPC_82xx is not set
-+CONFIG_PPC_83xx=y
-+# CONFIG_PPC_86xx is not set
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC83xx=y
-+# CONFIG_MPC831x_RDB is not set
-+# CONFIG_MPC832x_MDS is not set
-+# CONFIG_MPC832x_RDB is not set
-+# CONFIG_MPC834x_MDS is not set
-+# CONFIG_MPC834x_ITX is not set
-+# CONFIG_MPC836x_MDS is not set
-+# CONFIG_MPC837x_MDS is not set
-+# CONFIG_MPC837x_RDB is not set
-+CONFIG_SBC834x=y
-+CONFIG_PPC_MPC834x=y
-+CONFIG_IPIC=y
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_GENERIC_ISA_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+# CONFIG_PCI is not set
-+# CONFIG_PCI_DOMAINS is not set
-+# CONFIG_PCI_SYSCALL is not set
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
-+# CONFIG_PCCARD is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+CONFIG_XFRM_USER=m
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+CONFIG_INET_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+# CONFIG_MARVELL_PHY is not set
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+CONFIG_BROADCOM_PHY=y
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_E1000E_ENABLED is not set
-+CONFIG_GIANFAR=y
-+# CONFIG_GFAR_NAPI is not set
-+# CONFIG_NETDEV_10000 is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+CONFIG_GEN_RTC=y
-+# CONFIG_GEN_RTC_X is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+CONFIG_I2C_MPC=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
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+# CONFIG_I2C_DEBUG_CORE is not set
-+# CONFIG_I2C_DEBUG_ALGO is not set
-+# CONFIG_I2C_DEBUG_BUS is not set
-+# CONFIG_I2C_DEBUG_CHIP is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ADT7473 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S is not set
-+# CONFIG_SENSORS_GL518SM is not set
-+# CONFIG_SENSORS_GL520SM is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_LM63 is not set
-+# CONFIG_SENSORS_LM75 is not set
-+# CONFIG_SENSORS_LM77 is not set
-+# CONFIG_SENSORS_LM78 is not set
-+# CONFIG_SENSORS_LM80 is not set
-+# CONFIG_SENSORS_LM83 is not set
-+# CONFIG_SENSORS_LM85 is not set
-+# 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_ADS7828 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
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83L786NG is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+# CONFIG_THERMAL is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_83xx_WDT=y
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+# CONFIG_DAB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_VGASTATE is not set
-+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+# CONFIG_USB_SUPPORT is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+# CONFIG_EXT2_FS is not set
-+# CONFIG_EXT3_FS is not set
-+# CONFIG_EXT4DEV_FS is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+# CONFIG_MSDOS_FS is not set
-+# CONFIG_VFAT_FS is not set
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+# CONFIG_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+CONFIG_NFS_V4=y
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+CONFIG_SUNRPC_GSS=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# 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_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+# CONFIG_DEBUG_KERNEL is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+CONFIG_CRYPTO_MD5=y
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+# CONFIG_CRYPTO_HW is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/85xx/ksi8560_defconfig
-@@ -0,0 +1,899 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.24
-+# Mon Feb 11 16:25:19 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+CONFIG_PPC_85xx=y
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_E500=y
-+CONFIG_BOOKE=y
-+CONFIG_FSL_BOOKE=y
-+CONFIG_FSL_EMB_PERFMON=y
-+# CONFIG_PHYS_64BIT is not set
-+CONFIG_SPE=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_USER_NS is not set
-+# CONFIG_PID_NS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_FAIR_GROUP_SCHED=y
-+CONFIG_FAIR_USER_SCHED=y
-+# CONFIG_FAIR_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+# CONFIG_RELAY is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_ALL is not set
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+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 is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+# CONFIG_MODULES is not set
-+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
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_AS=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="anticipatory"
-+CONFIG_CLASSIC_RCU=y
-+# CONFIG_PREEMPT_RCU is not set
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC85xx=y
-+# CONFIG_MPC8540_ADS is not set
-+# CONFIG_MPC8560_ADS is not set
-+# CONFIG_MPC85xx_CDS is not set
-+# CONFIG_MPC85xx_MDS is not set
-+# CONFIG_MPC85xx_DS is not set
-+CONFIG_KSI8560=y
-+# CONFIG_STX_GP3 is not set
-+# CONFIG_TQM8540 is not set
-+# CONFIG_TQM8541 is not set
-+# CONFIG_TQM8555 is not set
-+# CONFIG_TQM8560 is not set
-+# CONFIG_SBC8548 is not set
-+# CONFIG_SBC8560 is not set
-+# CONFIG_IPIC is not set
-+CONFIG_MPIC=y
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+CONFIG_CPM2=y
-+CONFIG_PPC_CPM_NEW_BINDING=y
-+# CONFIG_FSL_ULI1575 is not set
-+CONFIG_CPM=y
-+
-+#
-+# Kernel options
-+#
-+CONFIG_HIGHMEM=y
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_RCU_TRACE=y
-+CONFIG_BINFMT_ELF=y
-+CONFIG_BINFMT_MISC=y
-+CONFIG_MATH_EMULATION=y
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+# CONFIG_PROC_DEVICETREE is not set
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+# CONFIG_SECCOMP is not set
-+CONFIG_WANT_DEVICE_TREE=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_FSL_SOC=y
-+# CONFIG_PCI is not set
-+# CONFIG_PCI_DOMAINS is not set
-+# CONFIG_PCI_SYSCALL is not set
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
-+# CONFIG_PCCARD is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+CONFIG_INET_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+CONFIG_MTD_CONCAT=y
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+# CONFIG_MTD_CMDLINE_PARTS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+CONFIG_MTD_BLOCK=y
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+CONFIG_MTD_JEDECPROBE=y
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+# CONFIG_MTD_CFI_INTELEXT is not set
-+CONFIG_MTD_CFI_AMDSTD=y
-+# CONFIG_MTD_CFI_STAA is not set
-+CONFIG_MTD_CFI_UTIL=y
-+# CONFIG_MTD_RAM is not set
-+# CONFIG_MTD_ROM is not set
-+# CONFIG_MTD_ABSENT is not set
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+CONFIG_MTD_PHYSMAP_OF=y
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+# CONFIG_MTD_NAND is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+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
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_EEPROM_93CX6 is not set
-+CONFIG_IDE=y
-+CONFIG_IDE_MAX_HWIFS=4
-+CONFIG_BLK_DEV_IDE=y
-+
-+#
-+# Please see Documentation/ide.txt for help/info on IDE drives
-+#
-+# CONFIG_BLK_DEV_IDE_SATA is not set
-+# CONFIG_BLK_DEV_IDEDISK is not set
-+# CONFIG_IDEDISK_MULTI_MODE is not set
-+# CONFIG_BLK_DEV_IDECD is not set
-+# CONFIG_BLK_DEV_IDETAPE is not set
-+# CONFIG_BLK_DEV_IDEFLOPPY is not set
-+# CONFIG_IDE_TASK_IOCTL is not set
-+CONFIG_IDE_PROC_FS=y
-+
-+#
-+# IDE chipset support/bugfixes
-+#
-+CONFIG_IDE_GENERIC=y
-+# CONFIG_BLK_DEV_PLATFORM is not set
-+# CONFIG_BLK_DEV_IDEDMA is not set
-+CONFIG_IDE_ARCH_OBSOLETE_INIT=y
-+# CONFIG_BLK_DEV_HD is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+CONFIG_MARVELL_PHY=y
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+CONFIG_MDIO_BITBANG=y
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_B44 is not set
-+CONFIG_FS_ENET=y
-+# CONFIG_FS_ENET_HAS_SCC is not set
-+CONFIG_FS_ENET_HAS_FCC=y
-+CONFIG_FS_ENET_MDIO_FCC=y
-+CONFIG_NETDEV_1000=y
-+# CONFIG_E1000E_ENABLED is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+CONFIG_NETDEV_10000=y
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+# CONFIG_SERIAL_8250 is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+CONFIG_SERIAL_CPM=y
-+CONFIG_SERIAL_CPM_CONSOLE=y
-+CONFIG_SERIAL_CPM_SCC1=y
-+# CONFIG_SERIAL_CPM_SCC2 is not set
-+# CONFIG_SERIAL_CPM_SCC3 is not set
-+# CONFIG_SERIAL_CPM_SCC4 is not set
-+# CONFIG_SERIAL_CPM_SMC1 is not set
-+# CONFIG_SERIAL_CPM_SMC2 is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+CONFIG_HW_RANDOM=y
-+# CONFIG_NVRAM is not set
-+CONFIG_GEN_RTC=y
-+# CONFIG_GEN_RTC_X is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_PC87427 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_SMSC47B397 is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=y
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+CONFIG_USB_SUPPORT=y
-+# CONFIG_USB_ARCH_HAS_HCD is not set
-+# CONFIG_USB_ARCH_HAS_OHCI is not set
-+# CONFIG_USB_ARCH_HAS_EHCI is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+CONFIG_EXT3_FS_XATTR=y
-+# CONFIG_EXT3_FS_POSIX_ACL is not set
-+# CONFIG_EXT3_FS_SECURITY is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+# CONFIG_JBD_DEBUG is not set
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+CONFIG_DNOTIFY=y
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+# CONFIG_MSDOS_FS is not set
-+# CONFIG_VFAT_FS is not set
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+# CONFIG_JFFS2_FS is not set
-+# CONFIG_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+# CONFIG_NFS_V3 is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+# CONFIG_MSDOS_PARTITION is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# 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_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+CONFIG_DEBUG_FS=y
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+CONFIG_DEBUG_MUTEXES=y
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_HIGHMEM is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+CONFIG_FORCED_INLINING=y
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+# CONFIG_DEBUGGER is not set
-+# CONFIG_KGDB_CONSOLE is not set
-+# CONFIG_VIRQ_DEBUG is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+# CONFIG_CRYPTO_MANAGER is not set
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+# CONFIG_CRYPTO_MD5 is not set
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+# CONFIG_CRYPTO_CBC is not set
-+# CONFIG_CRYPTO_PCBC is not set
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+# CONFIG_CRYPTO_DES is not set
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_PPC_CLOCK is not set
-+CONFIG_PPC_LIB_RHEAP=y
---- /dev/null
-+++ b/arch/powerpc/configs/85xx/mpc8540_ads_defconfig
-@@ -0,0 +1,796 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Mon Mar 24 08:48:25 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+CONFIG_PPC_85xx=y
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_E500=y
-+CONFIG_BOOKE=y
-+CONFIG_FSL_BOOKE=y
-+CONFIG_FSL_EMB_PERFMON=y
-+# CONFIG_PHYS_64BIT is not set
-+CONFIG_SPE=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_ALL is not set
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=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 is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+# CONFIG_MODULES is not set
-+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
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_AS=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="anticipatory"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC85xx=y
-+CONFIG_MPC8540_ADS=y
-+# CONFIG_MPC8560_ADS is not set
-+# CONFIG_MPC85xx_CDS is not set
-+# CONFIG_MPC85xx_MDS is not set
-+# CONFIG_MPC85xx_DS is not set
-+# CONFIG_STX_GP3 is not set
-+# CONFIG_TQM8540 is not set
-+# CONFIG_TQM8541 is not set
-+# CONFIG_TQM8555 is not set
-+# CONFIG_TQM8560 is not set
-+# CONFIG_SBC8548 is not set
-+# CONFIG_SBC8560 is not set
-+# CONFIG_IPIC is not set
-+CONFIG_MPIC=y
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_CPM2 is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+CONFIG_TICK_ONESHOT=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+CONFIG_BINFMT_MISC=y
-+CONFIG_MATH_EMULATION=y
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+# CONFIG_SECCOMP is not set
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_FSL_SOC=y
-+# CONFIG_PCI is not set
-+# CONFIG_PCI_DOMAINS is not set
-+# CONFIG_PCI_SYSCALL is not set
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
-+# CONFIG_PCCARD is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+CONFIG_XFRM_USER=y
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+CONFIG_INET_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+# CONFIG_MARVELL_PHY is not set
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_E1000E_ENABLED is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+CONFIG_NETDEV_10000=y
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+CONFIG_GEN_RTC=y
-+# CONFIG_GEN_RTC_X is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_PC87427 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_SMSC47B397 is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+# CONFIG_THERMAL is not set
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=y
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+CONFIG_USB_SUPPORT=y
-+# CONFIG_USB_ARCH_HAS_HCD is not set
-+# CONFIG_USB_ARCH_HAS_OHCI is not set
-+# CONFIG_USB_ARCH_HAS_EHCI is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+CONFIG_EXT3_FS_XATTR=y
-+# CONFIG_EXT3_FS_POSIX_ACL is not set
-+# CONFIG_EXT3_FS_SECURITY is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+# CONFIG_MSDOS_FS is not set
-+# CONFIG_VFAT_FS is not set
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+# CONFIG_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+# CONFIG_NFS_V3 is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+# CONFIG_MSDOS_PARTITION is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# 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_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+CONFIG_DEBUG_MUTEXES=y
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+# CONFIG_DEBUGGER is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+# CONFIG_CRYPTO_MANAGER is not set
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+# CONFIG_CRYPTO_MD5 is not set
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+# CONFIG_CRYPTO_CBC is not set
-+# CONFIG_CRYPTO_PCBC is not set
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+# CONFIG_CRYPTO_DES is not set
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/85xx/mpc8544_ds_defconfig
-@@ -0,0 +1,1564 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc7
-+# Mon Mar 31 11:37:03 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+CONFIG_PPC_85xx=y
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_E500=y
-+CONFIG_BOOKE=y
-+CONFIG_FSL_BOOKE=y
-+CONFIG_FSL_EMB_PERFMON=y
-+# CONFIG_PHYS_64BIT is not set
-+CONFIG_SPE=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+CONFIG_POSIX_MQUEUE=y
-+CONFIG_BSD_PROCESS_ACCT=y
-+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
-+# CONFIG_TASKSTATS is not set
-+CONFIG_AUDIT=y
-+# CONFIG_AUDITSYSCALL is not set
-+CONFIG_IKCONFIG=y
-+CONFIG_IKCONFIG_PROC=y
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+CONFIG_KALLSYMS_ALL=y
-+CONFIG_KALLSYMS_EXTRA_PASS=y
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=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 is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+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
-+CONFIG_BLOCK=y
-+CONFIG_LBD=y
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+# CONFIG_DEFAULT_AS is not set
-+# CONFIG_DEFAULT_DEADLINE is not set
-+CONFIG_DEFAULT_CFQ=y
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="cfq"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC85xx=y
-+# CONFIG_MPC8540_ADS is not set
-+# CONFIG_MPC8560_ADS is not set
-+# CONFIG_MPC85xx_CDS is not set
-+# CONFIG_MPC85xx_MDS is not set
-+CONFIG_MPC85xx_DS=y
-+# CONFIG_KSI8560 is not set
-+# CONFIG_STX_GP3 is not set
-+# CONFIG_TQM8540 is not set
-+# CONFIG_TQM8541 is not set
-+# CONFIG_TQM8555 is not set
-+# CONFIG_TQM8560 is not set
-+# CONFIG_SBC8548 is not set
-+# CONFIG_SBC8560 is not set
-+# CONFIG_IPIC is not set
-+CONFIG_MPIC=y
-+# CONFIG_MPIC_WEIRD is not set
-+CONFIG_PPC_I8259=y
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_CPM2 is not set
-+CONFIG_FSL_ULI1575=y
-+
-+#
-+# Kernel options
-+#
-+CONFIG_HIGHMEM=y
-+CONFIG_TICK_ONESHOT=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+CONFIG_BINFMT_MISC=m
-+CONFIG_FORCE_MAX_ZONEORDER=11
-+CONFIG_MATH_EMULATION=y
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_GENERIC_ISA_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_FSL_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+CONFIG_XFRM_USER=y
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+CONFIG_NET_KEY=m
-+# CONFIG_NET_KEY_MIGRATE is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+CONFIG_IP_ADVANCED_ROUTER=y
-+CONFIG_ASK_IP_FIB_HASH=y
-+# CONFIG_IP_FIB_TRIE is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_MULTIPLE_TABLES=y
-+CONFIG_IP_ROUTE_MULTIPATH=y
-+CONFIG_IP_ROUTE_VERBOSE=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+CONFIG_IP_PNP_RARP=y
-+CONFIG_NET_IPIP=y
-+CONFIG_NET_IPGRE=y
-+CONFIG_NET_IPGRE_BROADCAST=y
-+CONFIG_IP_MROUTE=y
-+CONFIG_IP_PIMSM_V1=y
-+CONFIG_IP_PIMSM_V2=y
-+CONFIG_ARPD=y
-+# CONFIG_SYN_COOKIES is not set
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+CONFIG_INET_TUNNEL=y
-+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_BEET is not set
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+CONFIG_IPV6=y
-+# CONFIG_IPV6_PRIVACY is not set
-+# CONFIG_IPV6_ROUTER_PREF is not set
-+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-+# CONFIG_INET6_AH is not set
-+# CONFIG_INET6_ESP is not set
-+# CONFIG_INET6_IPCOMP is not set
-+# CONFIG_IPV6_MIP6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+CONFIG_INET6_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET6_XFRM_MODE_TUNNEL=y
-+CONFIG_INET6_XFRM_MODE_BEET=y
-+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-+CONFIG_IPV6_SIT=y
-+# CONFIG_IPV6_TUNNEL is not set
-+# CONFIG_IPV6_MULTIPLE_TABLES is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+CONFIG_IP_SCTP=m
-+# CONFIG_SCTP_DBG_MSG is not set
-+# CONFIG_SCTP_DBG_OBJCNT is not set
-+# CONFIG_SCTP_HMAC_NONE is not set
-+# CONFIG_SCTP_HMAC_SHA1 is not set
-+CONFIG_SCTP_HMAC_MD5=y
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+CONFIG_FIB_RULES=y
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=y
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+CONFIG_BLK_DEV_NBD=y
-+# CONFIG_BLK_DEV_SX8 is not set
-+# CONFIG_BLK_DEV_UB is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=131072
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=y
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=y
-+CONFIG_CHR_DEV_ST=y
-+# CONFIG_CHR_DEV_OSST is not set
-+CONFIG_BLK_DEV_SR=y
-+# CONFIG_BLK_DEV_SR_VENDOR is not set
-+CONFIG_CHR_DEV_SG=y
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+CONFIG_SCSI_MULTI_LUN=y
-+# CONFIG_SCSI_CONSTANTS is not set
-+CONFIG_SCSI_LOGGING=y
-+# CONFIG_SCSI_SCAN_ASYNC is not set
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-+# CONFIG_SCSI_3W_9XXX is not set
-+# CONFIG_SCSI_ACARD is not set
-+# CONFIG_SCSI_AACRAID is not set
-+# CONFIG_SCSI_AIC7XXX is not set
-+# CONFIG_SCSI_AIC7XXX_OLD is not set
-+# CONFIG_SCSI_AIC79XX is not set
-+# CONFIG_SCSI_AIC94XX is not set
-+# CONFIG_SCSI_DPT_I2O is not set
-+# CONFIG_SCSI_ADVANSYS is not set
-+# CONFIG_SCSI_ARCMSR is not set
-+# CONFIG_MEGARAID_NEWGEN is not set
-+# CONFIG_MEGARAID_LEGACY is not set
-+# CONFIG_MEGARAID_SAS is not set
-+# CONFIG_SCSI_HPTIOP is not set
-+# CONFIG_SCSI_BUSLOGIC is not set
-+# CONFIG_SCSI_DMX3191D is not set
-+# CONFIG_SCSI_EATA is not set
-+# CONFIG_SCSI_FUTURE_DOMAIN is not set
-+# CONFIG_SCSI_GDTH is not set
-+# CONFIG_SCSI_IPS is not set
-+# CONFIG_SCSI_INITIO is not set
-+# CONFIG_SCSI_INIA100 is not set
-+# CONFIG_SCSI_MVSAS is not set
-+# CONFIG_SCSI_STEX is not set
-+# CONFIG_SCSI_SYM53C8XX_2 is not set
-+# CONFIG_SCSI_IPR is not set
-+# CONFIG_SCSI_QLOGIC_1280 is not set
-+# CONFIG_SCSI_QLA_FC is not set
-+# CONFIG_SCSI_QLA_ISCSI is not set
-+# CONFIG_SCSI_LPFC is not set
-+# CONFIG_SCSI_DC395x is not set
-+# CONFIG_SCSI_DC390T is not set
-+# CONFIG_SCSI_NSP32 is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_SCSI_SRP is not set
-+CONFIG_ATA=y
-+# CONFIG_ATA_NONSTANDARD is not set
-+CONFIG_SATA_AHCI=y
-+# CONFIG_SATA_SVW is not set
-+# CONFIG_ATA_PIIX is not set
-+# CONFIG_SATA_MV is not set
-+# CONFIG_SATA_NV is not set
-+# CONFIG_PDC_ADMA is not set
-+# CONFIG_SATA_QSTOR is not set
-+# CONFIG_SATA_PROMISE is not set
-+# CONFIG_SATA_SX4 is not set
-+# CONFIG_SATA_SIL is not set
-+# CONFIG_SATA_SIL24 is not set
-+# CONFIG_SATA_SIS is not set
-+# CONFIG_SATA_ULI is not set
-+# CONFIG_SATA_VIA is not set
-+# CONFIG_SATA_VITESSE is not set
-+# CONFIG_SATA_INIC162X is not set
-+# CONFIG_SATA_FSL is not set
-+CONFIG_PATA_ALI=y
-+# CONFIG_PATA_AMD is not set
-+# CONFIG_PATA_ARTOP is not set
-+# CONFIG_PATA_ATIIXP is not set
-+# CONFIG_PATA_CMD640_PCI is not set
-+# CONFIG_PATA_CMD64X is not set
-+# CONFIG_PATA_CS5520 is not set
-+# CONFIG_PATA_CS5530 is not set
-+# CONFIG_PATA_CYPRESS is not set
-+# CONFIG_PATA_EFAR is not set
-+# CONFIG_ATA_GENERIC is not set
-+# CONFIG_PATA_HPT366 is not set
-+# CONFIG_PATA_HPT37X is not set
-+# CONFIG_PATA_HPT3X2N is not set
-+# CONFIG_PATA_HPT3X3 is not set
-+# CONFIG_PATA_IT821X is not set
-+# CONFIG_PATA_IT8213 is not set
-+# CONFIG_PATA_JMICRON is not set
-+# CONFIG_PATA_TRIFLEX is not set
-+# CONFIG_PATA_MARVELL is not set
-+# CONFIG_PATA_MPIIX is not set
-+# CONFIG_PATA_OLDPIIX is not set
-+# CONFIG_PATA_NETCELL is not set
-+# CONFIG_PATA_NINJA32 is not set
-+# CONFIG_PATA_NS87410 is not set
-+# CONFIG_PATA_NS87415 is not set
-+# CONFIG_PATA_OPTI is not set
-+# CONFIG_PATA_OPTIDMA is not set
-+# CONFIG_PATA_PDC_OLD is not set
-+# CONFIG_PATA_RADISYS is not set
-+# CONFIG_PATA_RZ1000 is not set
-+# CONFIG_PATA_SC1200 is not set
-+# CONFIG_PATA_SERVERWORKS is not set
-+# CONFIG_PATA_PDC2027X is not set
-+# CONFIG_PATA_SIL680 is not set
-+# CONFIG_PATA_SIS is not set
-+# CONFIG_PATA_VIA is not set
-+# CONFIG_PATA_WINBOND is not set
-+# CONFIG_PATA_PLATFORM is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+CONFIG_DUMMY=y
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+# CONFIG_MARVELL_PHY is not set
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+CONFIG_VITESSE_PHY=y
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+
-+#
-+# USB Network Adapters
-+#
-+# CONFIG_USB_CATC is not set
-+# CONFIG_USB_KAWETH is not set
-+# CONFIG_USB_PEGASUS is not set
-+# CONFIG_USB_RTL8150 is not set
-+# CONFIG_USB_USBNET is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NET_FC is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+CONFIG_SERIO=y
-+CONFIG_SERIO_I8042=y
-+CONFIG_SERIO_SERPORT=y
-+# CONFIG_SERIO_PCIPS2 is not set
-+CONFIG_SERIO_LIBPS2=y
-+# CONFIG_SERIO_RAW is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+CONFIG_VT=y
-+CONFIG_VT_CONSOLE=y
-+CONFIG_HW_CONSOLE=y
-+# CONFIG_VT_HW_CONSOLE_BINDING is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=y
-+CONFIG_SERIAL_8250_NR_UARTS=2
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
-+CONFIG_SERIAL_8250_EXTENDED=y
-+CONFIG_SERIAL_8250_MANY_PORTS=y
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+CONFIG_SERIAL_8250_DETECT_IRQ=y
-+CONFIG_SERIAL_8250_RSA=y
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+CONFIG_NVRAM=y
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+# CONFIG_I2C_CHARDEV is not set
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_ALI1535 is not set
-+# CONFIG_I2C_ALI1563 is not set
-+# CONFIG_I2C_ALI15X3 is not set
-+# CONFIG_I2C_AMD756 is not set
-+# CONFIG_I2C_AMD8111 is not set
-+# CONFIG_I2C_I801 is not set
-+# CONFIG_I2C_I810 is not set
-+# CONFIG_I2C_PIIX4 is not set
-+CONFIG_I2C_MPC=y
-+# CONFIG_I2C_NFORCE2 is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_PROSAVAGE is not set
-+# CONFIG_I2C_SAVAGE4 is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_SIS5595 is not set
-+# CONFIG_I2C_SIS630 is not set
-+# CONFIG_I2C_SIS96X 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_VIA is not set
-+# CONFIG_I2C_VIAPRO is not set
-+# CONFIG_I2C_VOODOO3 is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+CONFIG_SENSORS_EEPROM=y
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+# CONFIG_I2C_DEBUG_CORE is not set
-+# CONFIG_I2C_DEBUG_ALGO is not set
-+# CONFIG_I2C_DEBUG_BUS is not set
-+# CONFIG_I2C_DEBUG_CHIP is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+# CONFIG_THERMAL is not set
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+CONFIG_DVB_CORE=m
-+# CONFIG_DVB_CORE_ATTACH is not set
-+CONFIG_DVB_CAPTURE_DRIVERS=y
-+
-+#
-+# Supported SAA7146 based PCI Adapters
-+#
-+# CONFIG_TTPCI_EEPROM is not set
-+# CONFIG_DVB_BUDGET_CORE is not set
-+
-+#
-+# Supported USB Adapters
-+#
-+# CONFIG_DVB_USB is not set
-+# CONFIG_DVB_TTUSB_BUDGET is not set
-+# CONFIG_DVB_TTUSB_DEC is not set
-+# CONFIG_DVB_CINERGYT2 is not set
-+
-+#
-+# Supported FlexCopII (B2C2) Adapters
-+#
-+# CONFIG_DVB_B2C2_FLEXCOP is not set
-+
-+#
-+# Supported BT878 Adapters
-+#
-+
-+#
-+# Supported Pluto2 Adapters
-+#
-+# CONFIG_DVB_PLUTO2 is not set
-+
-+#
-+# Supported DVB Frontends
-+#
-+
-+#
-+# Customise DVB Frontends
-+#
-+# CONFIG_DVB_FE_CUSTOMISE is not set
-+
-+#
-+# DVB-S (satellite) frontends
-+#
-+# CONFIG_DVB_STV0299 is not set
-+# CONFIG_DVB_CX24110 is not set
-+# CONFIG_DVB_CX24123 is not set
-+# CONFIG_DVB_TDA8083 is not set
-+# CONFIG_DVB_MT312 is not set
-+# CONFIG_DVB_VES1X93 is not set
-+# CONFIG_DVB_S5H1420 is not set
-+# CONFIG_DVB_TDA10086 is not set
-+
-+#
-+# DVB-T (terrestrial) frontends
-+#
-+# CONFIG_DVB_SP8870 is not set
-+# CONFIG_DVB_SP887X is not set
-+# CONFIG_DVB_CX22700 is not set
-+# CONFIG_DVB_CX22702 is not set
-+# CONFIG_DVB_L64781 is not set
-+# CONFIG_DVB_TDA1004X is not set
-+# CONFIG_DVB_NXT6000 is not set
-+# CONFIG_DVB_MT352 is not set
-+# CONFIG_DVB_ZL10353 is not set
-+# CONFIG_DVB_DIB3000MB is not set
-+# CONFIG_DVB_DIB3000MC is not set
-+# CONFIG_DVB_DIB7000M is not set
-+# CONFIG_DVB_DIB7000P is not set
-+
-+#
-+# DVB-C (cable) frontends
-+#
-+# CONFIG_DVB_VES1820 is not set
-+# CONFIG_DVB_TDA10021 is not set
-+# CONFIG_DVB_TDA10023 is not set
-+# CONFIG_DVB_STV0297 is not set
-+
-+#
-+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-+#
-+# CONFIG_DVB_NXT200X is not set
-+# CONFIG_DVB_OR51211 is not set
-+# CONFIG_DVB_OR51132 is not set
-+# CONFIG_DVB_BCM3510 is not set
-+# CONFIG_DVB_LGDT330X is not set
-+# CONFIG_DVB_S5H1409 is not set
-+
-+#
-+# Tuners/PLL support
-+#
-+# CONFIG_DVB_PLL is not set
-+# CONFIG_DVB_TDA826X is not set
-+# CONFIG_DVB_TDA827X is not set
-+# CONFIG_DVB_TDA18271 is not set
-+# CONFIG_DVB_TUNER_QT1010 is not set
-+# CONFIG_DVB_TUNER_MT2060 is not set
-+# CONFIG_DVB_TUNER_MT2266 is not set
-+# CONFIG_DVB_TUNER_MT2131 is not set
-+# CONFIG_DVB_TUNER_DIB0070 is not set
-+# CONFIG_DVB_TUNER_XC5000 is not set
-+
-+#
-+# Miscellaneous devices
-+#
-+# CONFIG_DVB_LNBP21 is not set
-+# CONFIG_DVB_ISL6421 is not set
-+# CONFIG_DVB_TUA6100 is not set
-+CONFIG_DAB=y
-+# CONFIG_USB_DABUSB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=y
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Console display driver support
-+#
-+CONFIG_VGA_CONSOLE=y
-+# CONFIG_VGACON_SOFT_SCROLLBACK is not set
-+CONFIG_DUMMY_CONSOLE=y
-+
-+#
-+# Sound
-+#
-+CONFIG_SOUND=y
-+
-+#
-+# Advanced Linux Sound Architecture
-+#
-+CONFIG_SND=y
-+CONFIG_SND_TIMER=y
-+CONFIG_SND_PCM=y
-+# CONFIG_SND_SEQUENCER is not set
-+# CONFIG_SND_MIXER_OSS is not set
-+# CONFIG_SND_PCM_OSS is not set
-+# CONFIG_SND_DYNAMIC_MINORS is not set
-+CONFIG_SND_SUPPORT_OLD_API=y
-+CONFIG_SND_VERBOSE_PROCFS=y
-+# CONFIG_SND_VERBOSE_PRINTK is not set
-+# CONFIG_SND_DEBUG is not set
-+
-+#
-+# Generic devices
-+#
-+CONFIG_SND_AC97_CODEC=y
-+# CONFIG_SND_DUMMY is not set
-+# CONFIG_SND_MTPAV is not set
-+# CONFIG_SND_SERIAL_U16550 is not set
-+# CONFIG_SND_MPU401 is not set
-+
-+#
-+# PCI devices
-+#
-+# CONFIG_SND_AD1889 is not set
-+# CONFIG_SND_ALS300 is not set
-+# CONFIG_SND_ALS4000 is not set
-+# CONFIG_SND_ALI5451 is not set
-+# CONFIG_SND_ATIIXP is not set
-+# CONFIG_SND_ATIIXP_MODEM is not set
-+# CONFIG_SND_AU8810 is not set
-+# CONFIG_SND_AU8820 is not set
-+# CONFIG_SND_AU8830 is not set
-+# CONFIG_SND_AZT3328 is not set
-+# CONFIG_SND_BT87X is not set
-+# CONFIG_SND_CA0106 is not set
-+# CONFIG_SND_CMIPCI is not set
-+# CONFIG_SND_OXYGEN is not set
-+# CONFIG_SND_CS4281 is not set
-+# CONFIG_SND_CS46XX is not set
-+# CONFIG_SND_CS5530 is not set
-+# CONFIG_SND_DARLA20 is not set
-+# CONFIG_SND_GINA20 is not set
-+# CONFIG_SND_LAYLA20 is not set
-+# CONFIG_SND_DARLA24 is not set
-+# CONFIG_SND_GINA24 is not set
-+# CONFIG_SND_LAYLA24 is not set
-+# CONFIG_SND_MONA is not set
-+# CONFIG_SND_MIA is not set
-+# CONFIG_SND_ECHO3G is not set
-+# CONFIG_SND_INDIGO is not set
-+# CONFIG_SND_INDIGOIO is not set
-+# CONFIG_SND_INDIGODJ is not set
-+# CONFIG_SND_EMU10K1 is not set
-+# CONFIG_SND_EMU10K1X is not set
-+# CONFIG_SND_ENS1370 is not set
-+# CONFIG_SND_ENS1371 is not set
-+# CONFIG_SND_ES1938 is not set
-+# CONFIG_SND_ES1968 is not set
-+# CONFIG_SND_FM801 is not set
-+# CONFIG_SND_HDA_INTEL is not set
-+# CONFIG_SND_HDSP is not set
-+# CONFIG_SND_HDSPM is not set
-+# CONFIG_SND_HIFIER is not set
-+# CONFIG_SND_ICE1712 is not set
-+# CONFIG_SND_ICE1724 is not set
-+CONFIG_SND_INTEL8X0=y
-+# CONFIG_SND_INTEL8X0M is not set
-+# CONFIG_SND_KORG1212 is not set
-+# CONFIG_SND_MAESTRO3 is not set
-+# CONFIG_SND_MIXART is not set
-+# CONFIG_SND_NM256 is not set
-+# CONFIG_SND_PCXHR is not set
-+# CONFIG_SND_RIPTIDE is not set
-+# CONFIG_SND_RME32 is not set
-+# CONFIG_SND_RME96 is not set
-+# CONFIG_SND_RME9652 is not set
-+# CONFIG_SND_SONICVIBES is not set
-+# CONFIG_SND_TRIDENT is not set
-+# CONFIG_SND_VIA82XX is not set
-+# CONFIG_SND_VIA82XX_MODEM is not set
-+# CONFIG_SND_VIRTUOSO is not set
-+# CONFIG_SND_VX222 is not set
-+# CONFIG_SND_YMFPCI is not set
-+# CONFIG_SND_AC97_POWER_SAVE is not set
-+
-+#
-+# ALSA PowerMac devices
-+#
-+
-+#
-+# ALSA PowerPC devices
-+#
-+
-+#
-+# USB devices
-+#
-+# CONFIG_SND_USB_AUDIO is not set
-+# CONFIG_SND_USB_USX2Y is not set
-+# CONFIG_SND_USB_CAIAQ is not set
-+
-+#
-+# System on Chip audio support
-+#
-+# CONFIG_SND_SOC is not set
-+
-+#
-+# SoC Audio support for SuperH
-+#
-+
-+#
-+# ALSA SoC audio for Freescale SOCs
-+#
-+
-+#
-+# Open Sound System
-+#
-+# CONFIG_SOUND_PRIME is not set
-+CONFIG_AC97_BUS=y
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+
-+#
-+# USB Input Devices
-+#
-+CONFIG_USB_HID=y
-+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-+# CONFIG_HID_FF is not set
-+# CONFIG_USB_HIDDEV is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-+
-+#
-+# Miscellaneous USB options
-+#
-+CONFIG_USB_DEVICEFS=y
-+CONFIG_USB_DEVICE_CLASS=y
-+# CONFIG_USB_DYNAMIC_MINORS is not set
-+# CONFIG_USB_OTG is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+CONFIG_USB_EHCI_HCD=y
-+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
-+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-+# CONFIG_USB_EHCI_FSL is not set
-+CONFIG_USB_EHCI_HCD_PPC_OF=y
-+# CONFIG_USB_ISP116X_HCD is not set
-+CONFIG_USB_OHCI_HCD=y
-+CONFIG_USB_OHCI_HCD_PPC_OF=y
-+CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
-+CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
-+CONFIG_USB_OHCI_HCD_PCI=y
-+CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
-+CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
-+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-+# CONFIG_USB_UHCI_HCD is not set
-+# CONFIG_USB_SL811_HCD is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+
-+#
-+# USB Device Class drivers
-+#
-+# CONFIG_USB_ACM is not set
-+# CONFIG_USB_PRINTER is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+
-+#
-+# may also be needed; see USB_STORAGE Help for more information
-+#
-+CONFIG_USB_STORAGE=y
-+# CONFIG_USB_STORAGE_DEBUG is not set
-+# CONFIG_USB_STORAGE_DATAFAB is not set
-+# CONFIG_USB_STORAGE_FREECOM is not set
-+# CONFIG_USB_STORAGE_ISD200 is not set
-+# CONFIG_USB_STORAGE_DPCM is not set
-+# CONFIG_USB_STORAGE_USBAT is not set
-+# CONFIG_USB_STORAGE_SDDR09 is not set
-+# CONFIG_USB_STORAGE_SDDR55 is not set
-+# CONFIG_USB_STORAGE_JUMPSHOT is not set
-+# CONFIG_USB_STORAGE_ALAUDA is not set
-+# CONFIG_USB_STORAGE_KARMA is not set
-+# CONFIG_USB_LIBUSUAL is not set
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
-+CONFIG_USB_MON=y
-+
-+#
-+# USB port drivers
-+#
-+# CONFIG_USB_SERIAL is not set
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+# CONFIG_USB_EMI62 is not set
-+# CONFIG_USB_EMI26 is not set
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_AUERSWALD is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+# CONFIG_USB_BERRY_CHARGE is not set
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_PHIDGET is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+# CONFIG_USB_SISUSBVGA is not set
-+# CONFIG_USB_LD is not set
-+# CONFIG_USB_TRANCEVIBRATOR is not set
-+# CONFIG_USB_IOWARRIOR is not set
-+# CONFIG_USB_TEST is not set
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+# CONFIG_RTC_DEBUG is not set
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# I2C RTC drivers
-+#
-+# CONFIG_RTC_DRV_DS1307 is not set
-+# CONFIG_RTC_DRV_DS1374 is not set
-+# CONFIG_RTC_DRV_DS1672 is not set
-+# CONFIG_RTC_DRV_MAX6900 is not set
-+# CONFIG_RTC_DRV_RS5C372 is not set
-+# CONFIG_RTC_DRV_ISL1208 is not set
-+# CONFIG_RTC_DRV_X1205 is not set
-+# CONFIG_RTC_DRV_PCF8563 is not set
-+# CONFIG_RTC_DRV_PCF8583 is not set
-+# CONFIG_RTC_DRV_M41T80 is not set
-+# CONFIG_RTC_DRV_S35390A is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+
-+#
-+# Platform RTC drivers
-+#
-+CONFIG_RTC_DRV_CMOS=y
-+# CONFIG_RTC_DRV_DS1511 is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_M48T59 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+CONFIG_DMADEVICES=y
-+
-+#
-+# DMA Devices
-+#
-+CONFIG_FSL_DMA=y
-+# CONFIG_FSL_DMA_SELFTEST is not set
-+CONFIG_DMA_ENGINE=y
-+
-+#
-+# DMA Clients
-+#
-+# CONFIG_NET_DMA is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+CONFIG_EXT3_FS_XATTR=y
-+# CONFIG_EXT3_FS_POSIX_ACL is not set
-+# CONFIG_EXT3_FS_SECURITY is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+CONFIG_ISO9660_FS=m
-+CONFIG_JOLIET=y
-+CONFIG_ZISOFS=y
-+CONFIG_UDF_FS=m
-+CONFIG_UDF_NLS=y
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+CONFIG_FAT_FS=y
-+CONFIG_MSDOS_FS=m
-+CONFIG_VFAT_FS=y
-+CONFIG_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+CONFIG_NTFS_FS=y
-+# CONFIG_NTFS_DEBUG is not set
-+# CONFIG_NTFS_RW is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+CONFIG_ADFS_FS=m
-+# CONFIG_ADFS_FS_RW is not set
-+CONFIG_AFFS_FS=m
-+CONFIG_HFS_FS=m
-+CONFIG_HFSPLUS_FS=m
-+CONFIG_BEFS_FS=m
-+# CONFIG_BEFS_DEBUG is not set
-+CONFIG_BFS_FS=m
-+CONFIG_EFS_FS=m
-+CONFIG_CRAMFS=y
-+CONFIG_VXFS_FS=m
-+# CONFIG_MINIX_FS is not set
-+CONFIG_HPFS_FS=m
-+CONFIG_QNX4FS_FS=m
-+# CONFIG_ROMFS_FS is not set
-+CONFIG_SYSV_FS=m
-+CONFIG_UFS_FS=m
-+# CONFIG_UFS_FS_WRITE is not set
-+# CONFIG_UFS_DEBUG is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+CONFIG_NFS_V4=y
-+# CONFIG_NFS_DIRECTIO is not set
-+CONFIG_NFSD=y
-+# CONFIG_NFSD_V3 is not set
-+CONFIG_NFSD_TCP=y
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_EXPORTFS=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+CONFIG_SUNRPC_GSS=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+CONFIG_MAC_PARTITION=y
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_BSD_DISKLABEL is not set
-+# CONFIG_MINIX_SUBPARTITION is not set
-+# CONFIG_SOLARIS_X86_PARTITION is not set
-+# CONFIG_UNIXWARE_DISKLABEL is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+CONFIG_NLS=y
-+CONFIG_NLS_DEFAULT="iso8859-1"
-+# CONFIG_NLS_CODEPAGE_437 is not set
-+# CONFIG_NLS_CODEPAGE_737 is not set
-+# CONFIG_NLS_CODEPAGE_775 is not set
-+# CONFIG_NLS_CODEPAGE_850 is not set
-+# CONFIG_NLS_CODEPAGE_852 is not set
-+# CONFIG_NLS_CODEPAGE_855 is not set
-+# CONFIG_NLS_CODEPAGE_857 is not set
-+# CONFIG_NLS_CODEPAGE_860 is not set
-+# CONFIG_NLS_CODEPAGE_861 is not set
-+# CONFIG_NLS_CODEPAGE_862 is not set
-+# CONFIG_NLS_CODEPAGE_863 is not set
-+# CONFIG_NLS_CODEPAGE_864 is not set
-+# CONFIG_NLS_CODEPAGE_865 is not set
-+# CONFIG_NLS_CODEPAGE_866 is not set
-+# CONFIG_NLS_CODEPAGE_869 is not set
-+# CONFIG_NLS_CODEPAGE_936 is not set
-+# CONFIG_NLS_CODEPAGE_950 is not set
-+# CONFIG_NLS_CODEPAGE_932 is not set
-+# CONFIG_NLS_CODEPAGE_949 is not set
-+# CONFIG_NLS_CODEPAGE_874 is not set
-+# CONFIG_NLS_ISO8859_8 is not set
-+# CONFIG_NLS_CODEPAGE_1250 is not set
-+# CONFIG_NLS_CODEPAGE_1251 is not set
-+# CONFIG_NLS_ASCII is not set
-+# CONFIG_NLS_ISO8859_1 is not set
-+# CONFIG_NLS_ISO8859_2 is not set
-+# CONFIG_NLS_ISO8859_3 is not set
-+# CONFIG_NLS_ISO8859_4 is not set
-+# CONFIG_NLS_ISO8859_5 is not set
-+# CONFIG_NLS_ISO8859_6 is not set
-+# CONFIG_NLS_ISO8859_7 is not set
-+# CONFIG_NLS_ISO8859_9 is not set
-+# CONFIG_NLS_ISO8859_13 is not set
-+# CONFIG_NLS_ISO8859_14 is not set
-+# CONFIG_NLS_ISO8859_15 is not set
-+# CONFIG_NLS_KOI8_R is not set
-+# CONFIG_NLS_KOI8_U is not set
-+CONFIG_NLS_UTF8=m
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+CONFIG_LIBCRC32C=m
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+CONFIG_HAVE_LMB=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_HIGHMEM is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+CONFIG_DEBUG_INFO=y
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+# CONFIG_DEBUGGER is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_HASH=y
-+CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_HMAC=y
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+CONFIG_CRYPTO_MD5=y
-+CONFIG_CRYPTO_SHA1=m
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/85xx/mpc8560_ads_defconfig
-@@ -0,0 +1,885 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Mon Mar 24 08:48:27 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+CONFIG_PPC_85xx=y
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_E500=y
-+CONFIG_BOOKE=y
-+CONFIG_FSL_BOOKE=y
-+CONFIG_FSL_EMB_PERFMON=y
-+# CONFIG_PHYS_64BIT is not set
-+CONFIG_SPE=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_ALL is not set
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=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 is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+# CONFIG_MODULES is not set
-+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
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_AS=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="anticipatory"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC85xx=y
-+# CONFIG_MPC8540_ADS is not set
-+CONFIG_MPC8560_ADS=y
-+# CONFIG_MPC85xx_CDS is not set
-+# CONFIG_MPC85xx_MDS is not set
-+# CONFIG_MPC85xx_DS is not set
-+# CONFIG_STX_GP3 is not set
-+# CONFIG_TQM8540 is not set
-+# CONFIG_TQM8541 is not set
-+# CONFIG_TQM8555 is not set
-+# CONFIG_TQM8560 is not set
-+# CONFIG_SBC8548 is not set
-+# CONFIG_SBC8560 is not set
-+# CONFIG_IPIC is not set
-+CONFIG_MPIC=y
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+CONFIG_CPM2=y
-+CONFIG_PPC_CPM_NEW_BINDING=y
-+# CONFIG_FSL_ULI1575 is not set
-+CONFIG_CPM=y
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+CONFIG_BINFMT_MISC=y
-+CONFIG_MATH_EMULATION=y
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+# CONFIG_PROC_DEVICETREE is not set
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+# CONFIG_SECCOMP is not set
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_FSL_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+CONFIG_PCI_DEBUG=y
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+CONFIG_INET_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+CONFIG_MARVELL_PHY=y
-+CONFIG_DAVICOM_PHY=y
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+CONFIG_FS_ENET=y
-+# CONFIG_FS_ENET_HAS_SCC is not set
-+CONFIG_FS_ENET_HAS_FCC=y
-+# CONFIG_FS_ENET_MDIO_FCC is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+CONFIG_E1000=y
-+CONFIG_E1000_NAPI=y
-+# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+# CONFIG_SERIAL_8250 is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+CONFIG_SERIAL_CPM=y
-+CONFIG_SERIAL_CPM_CONSOLE=y
-+CONFIG_SERIAL_CPM_SCC1=y
-+CONFIG_SERIAL_CPM_SCC2=y
-+# CONFIG_SERIAL_CPM_SCC3 is not set
-+# CONFIG_SERIAL_CPM_SCC4 is not set
-+# CONFIG_SERIAL_CPM_SMC1 is not set
-+# CONFIG_SERIAL_CPM_SMC2 is not set
-+# CONFIG_SERIAL_JSM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+CONFIG_HW_RANDOM=y
-+# CONFIG_NVRAM is not set
-+CONFIG_GEN_RTC=y
-+# CONFIG_GEN_RTC_X is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_I5K_AMB is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_PC87427 is not set
-+# CONFIG_SENSORS_SIS5595 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_SMSC47B397 is not set
-+# CONFIG_SENSORS_VIA686A is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_VT8231 is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+# CONFIG_THERMAL is not set
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=y
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+CONFIG_EXT3_FS_XATTR=y
-+# CONFIG_EXT3_FS_POSIX_ACL is not set
-+# CONFIG_EXT3_FS_SECURITY is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+# CONFIG_MSDOS_FS is not set
-+# CONFIG_VFAT_FS is not set
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+# CONFIG_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+# CONFIG_NFS_V3 is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+# CONFIG_MSDOS_PARTITION is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# 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_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+CONFIG_DEBUG_MUTEXES=y
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+# CONFIG_DEBUGGER is not set
-+# CONFIG_KGDB_CONSOLE is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+# CONFIG_CRYPTO_MANAGER is not set
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+# CONFIG_CRYPTO_MD5 is not set
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+# CONFIG_CRYPTO_CBC is not set
-+# CONFIG_CRYPTO_PCBC is not set
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+# CONFIG_CRYPTO_DES is not set
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
-+CONFIG_PPC_LIB_RHEAP=y
---- /dev/null
-+++ b/arch/powerpc/configs/85xx/mpc8568mds_defconfig
-@@ -0,0 +1,1117 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc7
-+# Mon Mar 31 11:37:05 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+CONFIG_PPC_85xx=y
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_E500=y
-+CONFIG_BOOKE=y
-+CONFIG_FSL_BOOKE=y
-+CONFIG_FSL_EMB_PERFMON=y
-+# CONFIG_PHYS_64BIT is not set
-+CONFIG_SPE=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+# CONFIG_KALLSYMS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+# CONFIG_EPOLL is not set
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+# CONFIG_KMOD is not set
-+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
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_AS=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="anticipatory"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC85xx=y
-+# CONFIG_MPC8540_ADS is not set
-+# CONFIG_MPC8560_ADS is not set
-+# CONFIG_MPC85xx_CDS is not set
-+CONFIG_MPC85xx_MDS=y
-+# CONFIG_MPC85xx_DS is not set
-+# CONFIG_STX_GP3 is not set
-+# CONFIG_TQM8540 is not set
-+# CONFIG_TQM8541 is not set
-+# CONFIG_TQM8555 is not set
-+# CONFIG_TQM8560 is not set
-+# CONFIG_SBC8548 is not set
-+# CONFIG_SBC8560 is not set
-+# CONFIG_IPIC is not set
-+CONFIG_MPIC=y
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+CONFIG_QUICC_ENGINE=y
-+# CONFIG_CPM2 is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+CONFIG_TICK_ONESHOT=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+CONFIG_MATH_EMULATION=y
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_FSL_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+CONFIG_INET_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=y
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+# CONFIG_BLK_DEV_SD is not set
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+# CONFIG_BLK_DEV_SR is not set
-+# CONFIG_CHR_DEV_SG is not set
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+# CONFIG_SCSI_SCAN_ASYNC is not set
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-+# CONFIG_SCSI_3W_9XXX is not set
-+# CONFIG_SCSI_ACARD is not set
-+# CONFIG_SCSI_AACRAID is not set
-+# CONFIG_SCSI_AIC7XXX is not set
-+# CONFIG_SCSI_AIC7XXX_OLD is not set
-+# CONFIG_SCSI_AIC79XX is not set
-+# CONFIG_SCSI_AIC94XX is not set
-+# CONFIG_SCSI_DPT_I2O is not set
-+# CONFIG_SCSI_ADVANSYS is not set
-+# CONFIG_SCSI_ARCMSR is not set
-+# CONFIG_MEGARAID_NEWGEN is not set
-+# CONFIG_MEGARAID_LEGACY is not set
-+# CONFIG_MEGARAID_SAS is not set
-+# CONFIG_SCSI_HPTIOP is not set
-+# CONFIG_SCSI_BUSLOGIC is not set
-+# CONFIG_SCSI_DMX3191D is not set
-+# CONFIG_SCSI_EATA is not set
-+# CONFIG_SCSI_FUTURE_DOMAIN is not set
-+# CONFIG_SCSI_GDTH is not set
-+# CONFIG_SCSI_IPS is not set
-+# CONFIG_SCSI_INITIO is not set
-+# CONFIG_SCSI_INIA100 is not set
-+# CONFIG_SCSI_MVSAS is not set
-+# CONFIG_SCSI_STEX is not set
-+# CONFIG_SCSI_SYM53C8XX_2 is not set
-+# CONFIG_SCSI_QLOGIC_1280 is not set
-+# CONFIG_SCSI_QLA_FC is not set
-+# CONFIG_SCSI_QLA_ISCSI is not set
-+# CONFIG_SCSI_LPFC is not set
-+# CONFIG_SCSI_DC395x is not set
-+# CONFIG_SCSI_DC390T is not set
-+# CONFIG_SCSI_NSP32 is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_SCSI_SRP is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+CONFIG_MARVELL_PHY=y
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+# CONFIG_UCC_GETH is not set
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NET_FC is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+# CONFIG_SERIAL_QE is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+CONFIG_HW_RANDOM=y
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_ALI1535 is not set
-+# CONFIG_I2C_ALI1563 is not set
-+# CONFIG_I2C_ALI15X3 is not set
-+# CONFIG_I2C_AMD756 is not set
-+# CONFIG_I2C_AMD8111 is not set
-+# CONFIG_I2C_I801 is not set
-+# CONFIG_I2C_I810 is not set
-+# CONFIG_I2C_PIIX4 is not set
-+CONFIG_I2C_MPC=y
-+# CONFIG_I2C_NFORCE2 is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_PROSAVAGE is not set
-+# CONFIG_I2C_SAVAGE4 is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_SIS5595 is not set
-+# CONFIG_I2C_SIS630 is not set
-+# CONFIG_I2C_SIS96X is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_STUB is not set
-+# CONFIG_I2C_VIA is not set
-+# CONFIG_I2C_VIAPRO is not set
-+# CONFIG_I2C_VOODOO3 is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+# CONFIG_I2C_DEBUG_CORE is not set
-+# CONFIG_I2C_DEBUG_ALGO is not set
-+# CONFIG_I2C_DEBUG_BUS is not set
-+# CONFIG_I2C_DEBUG_CHIP is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ADT7473 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_I5K_AMB is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S is not set
-+# CONFIG_SENSORS_GL518SM is not set
-+# CONFIG_SENSORS_GL520SM is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_LM63 is not set
-+# CONFIG_SENSORS_LM75 is not set
-+# CONFIG_SENSORS_LM77 is not set
-+# CONFIG_SENSORS_LM78 is not set
-+# CONFIG_SENSORS_LM80 is not set
-+# CONFIG_SENSORS_LM83 is not set
-+# CONFIG_SENSORS_LM85 is not set
-+# 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_SIS5595 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_ADS7828 is not set
-+# CONFIG_SENSORS_THMC50 is not set
-+# CONFIG_SENSORS_VIA686A is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_VT8231 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83L786NG is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+# CONFIG_THERMAL is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+# CONFIG_BOOKE_WDT is not set
-+
-+#
-+# PCI-based Watchdog Cards
-+#
-+# CONFIG_PCIPCWATCHDOG is not set
-+# CONFIG_WDTPCI is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+# CONFIG_RTC_DEBUG is not set
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# I2C RTC drivers
-+#
-+# CONFIG_RTC_DRV_DS1307 is not set
-+CONFIG_RTC_DRV_DS1374=y
-+# CONFIG_RTC_DRV_DS1672 is not set
-+# CONFIG_RTC_DRV_MAX6900 is not set
-+# CONFIG_RTC_DRV_RS5C372 is not set
-+# CONFIG_RTC_DRV_ISL1208 is not set
-+# CONFIG_RTC_DRV_X1205 is not set
-+# CONFIG_RTC_DRV_PCF8563 is not set
-+# CONFIG_RTC_DRV_PCF8583 is not set
-+# CONFIG_RTC_DRV_M41T80 is not set
-+# CONFIG_RTC_DRV_S35390A is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+
-+#
-+# Platform RTC drivers
-+#
-+# CONFIG_RTC_DRV_CMOS is not set
-+# CONFIG_RTC_DRV_DS1511 is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_M48T59 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+CONFIG_EXT3_FS_XATTR=y
-+# CONFIG_EXT3_FS_POSIX_ACL is not set
-+# CONFIG_EXT3_FS_SECURITY is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+# CONFIG_MSDOS_FS is not set
-+# CONFIG_VFAT_FS is not set
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+# CONFIG_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+CONFIG_NFS_V4=y
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+CONFIG_SUNRPC_GSS=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+# CONFIG_MSDOS_PARTITION is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# 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_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+CONFIG_DEBUGGER=y
-+# CONFIG_XMON is not set
-+# CONFIG_BDI_SWITCH is not set
-+CONFIG_PPC_EARLY_DEBUG=y
-+# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
-+# CONFIG_PPC_EARLY_DEBUG_G5 is not set
-+# CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL is not set
-+# CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set
-+# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
-+# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
-+# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
-+# CONFIG_PPC_EARLY_DEBUG_BEAT is not set
-+# CONFIG_PPC_EARLY_DEBUG_44x is not set
-+# CONFIG_PPC_EARLY_DEBUG_40x is not set
-+# CONFIG_PPC_EARLY_DEBUG_CPM is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+CONFIG_CRYPTO_MD5=y
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
-+CONFIG_PPC_LIB_RHEAP=y
---- /dev/null
-+++ b/arch/powerpc/configs/85xx/mpc8572_ds_defconfig
-@@ -0,0 +1,1549 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc7
-+# Mon Mar 31 11:37:06 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+CONFIG_PPC_85xx=y
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_E500=y
-+CONFIG_BOOKE=y
-+CONFIG_FSL_BOOKE=y
-+CONFIG_FSL_EMB_PERFMON=y
-+# CONFIG_PHYS_64BIT is not set
-+CONFIG_SPE=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+CONFIG_POSIX_MQUEUE=y
-+CONFIG_BSD_PROCESS_ACCT=y
-+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
-+# CONFIG_TASKSTATS is not set
-+CONFIG_AUDIT=y
-+# CONFIG_AUDITSYSCALL is not set
-+CONFIG_IKCONFIG=y
-+CONFIG_IKCONFIG_PROC=y
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+CONFIG_KALLSYMS_ALL=y
-+CONFIG_KALLSYMS_EXTRA_PASS=y
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=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 is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+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
-+CONFIG_BLOCK=y
-+CONFIG_LBD=y
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+# CONFIG_DEFAULT_AS is not set
-+# CONFIG_DEFAULT_DEADLINE is not set
-+CONFIG_DEFAULT_CFQ=y
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="cfq"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC85xx=y
-+# CONFIG_MPC8540_ADS is not set
-+# CONFIG_MPC8560_ADS is not set
-+# CONFIG_MPC85xx_CDS is not set
-+# CONFIG_MPC85xx_MDS is not set
-+CONFIG_MPC85xx_DS=y
-+# CONFIG_STX_GP3 is not set
-+# CONFIG_TQM8540 is not set
-+# CONFIG_TQM8541 is not set
-+# CONFIG_TQM8555 is not set
-+# CONFIG_TQM8560 is not set
-+# CONFIG_SBC8548 is not set
-+# CONFIG_SBC8560 is not set
-+# CONFIG_IPIC is not set
-+CONFIG_MPIC=y
-+# CONFIG_MPIC_WEIRD is not set
-+CONFIG_PPC_I8259=y
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_CPM2 is not set
-+CONFIG_FSL_ULI1575=y
-+
-+#
-+# Kernel options
-+#
-+CONFIG_HIGHMEM=y
-+CONFIG_TICK_ONESHOT=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+CONFIG_BINFMT_MISC=m
-+CONFIG_MATH_EMULATION=y
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_GENERIC_ISA_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_FSL_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+CONFIG_XFRM_USER=y
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+CONFIG_NET_KEY=m
-+# CONFIG_NET_KEY_MIGRATE is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+CONFIG_IP_ADVANCED_ROUTER=y
-+CONFIG_ASK_IP_FIB_HASH=y
-+# CONFIG_IP_FIB_TRIE is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_MULTIPLE_TABLES=y
-+CONFIG_IP_ROUTE_MULTIPATH=y
-+CONFIG_IP_ROUTE_VERBOSE=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+CONFIG_IP_PNP_RARP=y
-+CONFIG_NET_IPIP=y
-+CONFIG_NET_IPGRE=y
-+CONFIG_NET_IPGRE_BROADCAST=y
-+CONFIG_IP_MROUTE=y
-+CONFIG_IP_PIMSM_V1=y
-+CONFIG_IP_PIMSM_V2=y
-+CONFIG_ARPD=y
-+# CONFIG_SYN_COOKIES is not set
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+CONFIG_INET_TUNNEL=y
-+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_BEET is not set
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+CONFIG_IPV6=y
-+# CONFIG_IPV6_PRIVACY is not set
-+# CONFIG_IPV6_ROUTER_PREF is not set
-+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-+# CONFIG_INET6_AH is not set
-+# CONFIG_INET6_ESP is not set
-+# CONFIG_INET6_IPCOMP is not set
-+# CONFIG_IPV6_MIP6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+CONFIG_INET6_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET6_XFRM_MODE_TUNNEL=y
-+CONFIG_INET6_XFRM_MODE_BEET=y
-+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-+CONFIG_IPV6_SIT=y
-+# CONFIG_IPV6_TUNNEL is not set
-+# CONFIG_IPV6_MULTIPLE_TABLES is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+CONFIG_IP_SCTP=m
-+# CONFIG_SCTP_DBG_MSG is not set
-+# CONFIG_SCTP_DBG_OBJCNT is not set
-+# CONFIG_SCTP_HMAC_NONE is not set
-+# CONFIG_SCTP_HMAC_SHA1 is not set
-+CONFIG_SCTP_HMAC_MD5=y
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+CONFIG_FIB_RULES=y
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=y
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+CONFIG_BLK_DEV_NBD=y
-+# CONFIG_BLK_DEV_SX8 is not set
-+# CONFIG_BLK_DEV_UB is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=131072
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=y
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=y
-+CONFIG_CHR_DEV_ST=y
-+# CONFIG_CHR_DEV_OSST is not set
-+CONFIG_BLK_DEV_SR=y
-+# CONFIG_BLK_DEV_SR_VENDOR is not set
-+CONFIG_CHR_DEV_SG=y
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+CONFIG_SCSI_MULTI_LUN=y
-+# CONFIG_SCSI_CONSTANTS is not set
-+CONFIG_SCSI_LOGGING=y
-+# CONFIG_SCSI_SCAN_ASYNC is not set
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-+# CONFIG_SCSI_3W_9XXX is not set
-+# CONFIG_SCSI_ACARD is not set
-+# CONFIG_SCSI_AACRAID is not set
-+# CONFIG_SCSI_AIC7XXX is not set
-+# CONFIG_SCSI_AIC7XXX_OLD is not set
-+# CONFIG_SCSI_AIC79XX is not set
-+# CONFIG_SCSI_AIC94XX is not set
-+# CONFIG_SCSI_DPT_I2O is not set
-+# CONFIG_SCSI_ADVANSYS is not set
-+# CONFIG_SCSI_ARCMSR is not set
-+# CONFIG_MEGARAID_NEWGEN is not set
-+# CONFIG_MEGARAID_LEGACY is not set
-+# CONFIG_MEGARAID_SAS is not set
-+# CONFIG_SCSI_HPTIOP is not set
-+# CONFIG_SCSI_BUSLOGIC is not set
-+# CONFIG_SCSI_DMX3191D is not set
-+# CONFIG_SCSI_EATA is not set
-+# CONFIG_SCSI_FUTURE_DOMAIN is not set
-+# CONFIG_SCSI_GDTH is not set
-+# CONFIG_SCSI_IPS is not set
-+# CONFIG_SCSI_INITIO is not set
-+# CONFIG_SCSI_INIA100 is not set
-+# CONFIG_SCSI_MVSAS is not set
-+# CONFIG_SCSI_STEX is not set
-+# CONFIG_SCSI_SYM53C8XX_2 is not set
-+# CONFIG_SCSI_IPR is not set
-+# CONFIG_SCSI_QLOGIC_1280 is not set
-+# CONFIG_SCSI_QLA_FC is not set
-+# CONFIG_SCSI_QLA_ISCSI is not set
-+# CONFIG_SCSI_LPFC is not set
-+# CONFIG_SCSI_DC395x is not set
-+# CONFIG_SCSI_DC390T is not set
-+# CONFIG_SCSI_NSP32 is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_SCSI_SRP is not set
-+CONFIG_ATA=y
-+# CONFIG_ATA_NONSTANDARD is not set
-+CONFIG_SATA_AHCI=y
-+# CONFIG_SATA_SVW is not set
-+# CONFIG_ATA_PIIX is not set
-+# CONFIG_SATA_MV is not set
-+# CONFIG_SATA_NV is not set
-+# CONFIG_PDC_ADMA is not set
-+# CONFIG_SATA_QSTOR is not set
-+# CONFIG_SATA_PROMISE is not set
-+# CONFIG_SATA_SX4 is not set
-+# CONFIG_SATA_SIL is not set
-+# CONFIG_SATA_SIL24 is not set
-+# CONFIG_SATA_SIS is not set
-+# CONFIG_SATA_ULI is not set
-+# CONFIG_SATA_VIA is not set
-+# CONFIG_SATA_VITESSE is not set
-+# CONFIG_SATA_INIC162X is not set
-+# CONFIG_SATA_FSL is not set
-+CONFIG_PATA_ALI=y
-+# CONFIG_PATA_AMD is not set
-+# CONFIG_PATA_ARTOP is not set
-+# CONFIG_PATA_ATIIXP is not set
-+# CONFIG_PATA_CMD640_PCI is not set
-+# CONFIG_PATA_CMD64X is not set
-+# CONFIG_PATA_CS5520 is not set
-+# CONFIG_PATA_CS5530 is not set
-+# CONFIG_PATA_CYPRESS is not set
-+# CONFIG_PATA_EFAR is not set
-+# CONFIG_ATA_GENERIC is not set
-+# CONFIG_PATA_HPT366 is not set
-+# CONFIG_PATA_HPT37X is not set
-+# CONFIG_PATA_HPT3X2N is not set
-+# CONFIG_PATA_HPT3X3 is not set
-+# CONFIG_PATA_IT821X is not set
-+# CONFIG_PATA_IT8213 is not set
-+# CONFIG_PATA_JMICRON is not set
-+# CONFIG_PATA_TRIFLEX is not set
-+# CONFIG_PATA_MARVELL is not set
-+# CONFIG_PATA_MPIIX is not set
-+# CONFIG_PATA_OLDPIIX is not set
-+# CONFIG_PATA_NETCELL is not set
-+# CONFIG_PATA_NINJA32 is not set
-+# CONFIG_PATA_NS87410 is not set
-+# CONFIG_PATA_NS87415 is not set
-+# CONFIG_PATA_OPTI is not set
-+# CONFIG_PATA_OPTIDMA is not set
-+# CONFIG_PATA_PDC_OLD is not set
-+# CONFIG_PATA_RADISYS is not set
-+# CONFIG_PATA_RZ1000 is not set
-+# CONFIG_PATA_SC1200 is not set
-+# CONFIG_PATA_SERVERWORKS is not set
-+# CONFIG_PATA_PDC2027X is not set
-+# CONFIG_PATA_SIL680 is not set
-+# CONFIG_PATA_SIS is not set
-+# CONFIG_PATA_VIA is not set
-+# CONFIG_PATA_WINBOND is not set
-+# CONFIG_PATA_PLATFORM is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+CONFIG_DUMMY=y
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+# CONFIG_MARVELL_PHY is not set
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+CONFIG_VITESSE_PHY=y
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+
-+#
-+# USB Network Adapters
-+#
-+# CONFIG_USB_CATC is not set
-+# CONFIG_USB_KAWETH is not set
-+# CONFIG_USB_PEGASUS is not set
-+# CONFIG_USB_RTL8150 is not set
-+# CONFIG_USB_USBNET is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NET_FC is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+CONFIG_SERIO=y
-+CONFIG_SERIO_I8042=y
-+CONFIG_SERIO_SERPORT=y
-+# CONFIG_SERIO_PCIPS2 is not set
-+CONFIG_SERIO_LIBPS2=y
-+# CONFIG_SERIO_RAW is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+CONFIG_VT=y
-+CONFIG_VT_CONSOLE=y
-+CONFIG_HW_CONSOLE=y
-+# CONFIG_VT_HW_CONSOLE_BINDING is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=y
-+CONFIG_SERIAL_8250_NR_UARTS=2
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
-+CONFIG_SERIAL_8250_EXTENDED=y
-+CONFIG_SERIAL_8250_MANY_PORTS=y
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+CONFIG_SERIAL_8250_DETECT_IRQ=y
-+CONFIG_SERIAL_8250_RSA=y
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+CONFIG_NVRAM=y
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+# CONFIG_I2C_CHARDEV is not set
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_ALI1535 is not set
-+# CONFIG_I2C_ALI1563 is not set
-+# CONFIG_I2C_ALI15X3 is not set
-+# CONFIG_I2C_AMD756 is not set
-+# CONFIG_I2C_AMD8111 is not set
-+# CONFIG_I2C_I801 is not set
-+# CONFIG_I2C_I810 is not set
-+# CONFIG_I2C_PIIX4 is not set
-+CONFIG_I2C_MPC=y
-+# CONFIG_I2C_NFORCE2 is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_PROSAVAGE is not set
-+# CONFIG_I2C_SAVAGE4 is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_SIS5595 is not set
-+# CONFIG_I2C_SIS630 is not set
-+# CONFIG_I2C_SIS96X 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_VIA is not set
-+# CONFIG_I2C_VIAPRO is not set
-+# CONFIG_I2C_VOODOO3 is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+CONFIG_SENSORS_EEPROM=y
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+# CONFIG_I2C_DEBUG_CORE is not set
-+# CONFIG_I2C_DEBUG_ALGO is not set
-+# CONFIG_I2C_DEBUG_BUS is not set
-+# CONFIG_I2C_DEBUG_CHIP is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+# CONFIG_THERMAL is not set
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+CONFIG_DVB_CORE=m
-+# CONFIG_DVB_CORE_ATTACH is not set
-+CONFIG_DVB_CAPTURE_DRIVERS=y
-+
-+#
-+# Supported SAA7146 based PCI Adapters
-+#
-+# CONFIG_TTPCI_EEPROM is not set
-+# CONFIG_DVB_BUDGET_CORE is not set
-+
-+#
-+# Supported USB Adapters
-+#
-+# CONFIG_DVB_USB is not set
-+# CONFIG_DVB_TTUSB_BUDGET is not set
-+# CONFIG_DVB_TTUSB_DEC is not set
-+# CONFIG_DVB_CINERGYT2 is not set
-+
-+#
-+# Supported FlexCopII (B2C2) Adapters
-+#
-+# CONFIG_DVB_B2C2_FLEXCOP is not set
-+
-+#
-+# Supported BT878 Adapters
-+#
-+
-+#
-+# Supported Pluto2 Adapters
-+#
-+# CONFIG_DVB_PLUTO2 is not set
-+
-+#
-+# Supported DVB Frontends
-+#
-+
-+#
-+# Customise DVB Frontends
-+#
-+# CONFIG_DVB_FE_CUSTOMISE is not set
-+
-+#
-+# DVB-S (satellite) frontends
-+#
-+# CONFIG_DVB_STV0299 is not set
-+# CONFIG_DVB_CX24110 is not set
-+# CONFIG_DVB_CX24123 is not set
-+# CONFIG_DVB_TDA8083 is not set
-+# CONFIG_DVB_MT312 is not set
-+# CONFIG_DVB_VES1X93 is not set
-+# CONFIG_DVB_S5H1420 is not set
-+# CONFIG_DVB_TDA10086 is not set
-+
-+#
-+# DVB-T (terrestrial) frontends
-+#
-+# CONFIG_DVB_SP8870 is not set
-+# CONFIG_DVB_SP887X is not set
-+# CONFIG_DVB_CX22700 is not set
-+# CONFIG_DVB_CX22702 is not set
-+# CONFIG_DVB_L64781 is not set
-+# CONFIG_DVB_TDA1004X is not set
-+# CONFIG_DVB_NXT6000 is not set
-+# CONFIG_DVB_MT352 is not set
-+# CONFIG_DVB_ZL10353 is not set
-+# CONFIG_DVB_DIB3000MB is not set
-+# CONFIG_DVB_DIB3000MC is not set
-+# CONFIG_DVB_DIB7000M is not set
-+# CONFIG_DVB_DIB7000P is not set
-+
-+#
-+# DVB-C (cable) frontends
-+#
-+# CONFIG_DVB_VES1820 is not set
-+# CONFIG_DVB_TDA10021 is not set
-+# CONFIG_DVB_TDA10023 is not set
-+# CONFIG_DVB_STV0297 is not set
-+
-+#
-+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-+#
-+# CONFIG_DVB_NXT200X is not set
-+# CONFIG_DVB_OR51211 is not set
-+# CONFIG_DVB_OR51132 is not set
-+# CONFIG_DVB_BCM3510 is not set
-+# CONFIG_DVB_LGDT330X is not set
-+# CONFIG_DVB_S5H1409 is not set
-+
-+#
-+# Tuners/PLL support
-+#
-+# CONFIG_DVB_PLL is not set
-+# CONFIG_DVB_TDA826X is not set
-+# CONFIG_DVB_TDA827X is not set
-+# CONFIG_DVB_TDA18271 is not set
-+# CONFIG_DVB_TUNER_QT1010 is not set
-+# CONFIG_DVB_TUNER_MT2060 is not set
-+# CONFIG_DVB_TUNER_MT2266 is not set
-+# CONFIG_DVB_TUNER_MT2131 is not set
-+# CONFIG_DVB_TUNER_DIB0070 is not set
-+# CONFIG_DVB_TUNER_XC5000 is not set
-+
-+#
-+# Miscellaneous devices
-+#
-+# CONFIG_DVB_LNBP21 is not set
-+# CONFIG_DVB_ISL6421 is not set
-+# CONFIG_DVB_TUA6100 is not set
-+CONFIG_DAB=y
-+# CONFIG_USB_DABUSB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=y
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Console display driver support
-+#
-+CONFIG_VGA_CONSOLE=y
-+# CONFIG_VGACON_SOFT_SCROLLBACK is not set
-+CONFIG_DUMMY_CONSOLE=y
-+
-+#
-+# Sound
-+#
-+CONFIG_SOUND=y
-+
-+#
-+# Advanced Linux Sound Architecture
-+#
-+CONFIG_SND=y
-+CONFIG_SND_TIMER=y
-+CONFIG_SND_PCM=y
-+# CONFIG_SND_SEQUENCER is not set
-+# CONFIG_SND_MIXER_OSS is not set
-+# CONFIG_SND_PCM_OSS is not set
-+# CONFIG_SND_DYNAMIC_MINORS is not set
-+CONFIG_SND_SUPPORT_OLD_API=y
-+CONFIG_SND_VERBOSE_PROCFS=y
-+# CONFIG_SND_VERBOSE_PRINTK is not set
-+# CONFIG_SND_DEBUG is not set
-+
-+#
-+# Generic devices
-+#
-+CONFIG_SND_AC97_CODEC=y
-+# CONFIG_SND_DUMMY is not set
-+# CONFIG_SND_MTPAV is not set
-+# CONFIG_SND_SERIAL_U16550 is not set
-+# CONFIG_SND_MPU401 is not set
-+
-+#
-+# PCI devices
-+#
-+# CONFIG_SND_AD1889 is not set
-+# CONFIG_SND_ALS300 is not set
-+# CONFIG_SND_ALS4000 is not set
-+# CONFIG_SND_ALI5451 is not set
-+# CONFIG_SND_ATIIXP is not set
-+# CONFIG_SND_ATIIXP_MODEM is not set
-+# CONFIG_SND_AU8810 is not set
-+# CONFIG_SND_AU8820 is not set
-+# CONFIG_SND_AU8830 is not set
-+# CONFIG_SND_AZT3328 is not set
-+# CONFIG_SND_BT87X is not set
-+# CONFIG_SND_CA0106 is not set
-+# CONFIG_SND_CMIPCI is not set
-+# CONFIG_SND_OXYGEN is not set
-+# CONFIG_SND_CS4281 is not set
-+# CONFIG_SND_CS46XX is not set
-+# CONFIG_SND_CS5530 is not set
-+# CONFIG_SND_DARLA20 is not set
-+# CONFIG_SND_GINA20 is not set
-+# CONFIG_SND_LAYLA20 is not set
-+# CONFIG_SND_DARLA24 is not set
-+# CONFIG_SND_GINA24 is not set
-+# CONFIG_SND_LAYLA24 is not set
-+# CONFIG_SND_MONA is not set
-+# CONFIG_SND_MIA is not set
-+# CONFIG_SND_ECHO3G is not set
-+# CONFIG_SND_INDIGO is not set
-+# CONFIG_SND_INDIGOIO is not set
-+# CONFIG_SND_INDIGODJ is not set
-+# CONFIG_SND_EMU10K1 is not set
-+# CONFIG_SND_EMU10K1X is not set
-+# CONFIG_SND_ENS1370 is not set
-+# CONFIG_SND_ENS1371 is not set
-+# CONFIG_SND_ES1938 is not set
-+# CONFIG_SND_ES1968 is not set
-+# CONFIG_SND_FM801 is not set
-+# CONFIG_SND_HDA_INTEL is not set
-+# CONFIG_SND_HDSP is not set
-+# CONFIG_SND_HDSPM is not set
-+# CONFIG_SND_HIFIER is not set
-+# CONFIG_SND_ICE1712 is not set
-+# CONFIG_SND_ICE1724 is not set
-+CONFIG_SND_INTEL8X0=y
-+# CONFIG_SND_INTEL8X0M is not set
-+# CONFIG_SND_KORG1212 is not set
-+# CONFIG_SND_MAESTRO3 is not set
-+# CONFIG_SND_MIXART is not set
-+# CONFIG_SND_NM256 is not set
-+# CONFIG_SND_PCXHR is not set
-+# CONFIG_SND_RIPTIDE is not set
-+# CONFIG_SND_RME32 is not set
-+# CONFIG_SND_RME96 is not set
-+# CONFIG_SND_RME9652 is not set
-+# CONFIG_SND_SONICVIBES is not set
-+# CONFIG_SND_TRIDENT is not set
-+# CONFIG_SND_VIA82XX is not set
-+# CONFIG_SND_VIA82XX_MODEM is not set
-+# CONFIG_SND_VIRTUOSO is not set
-+# CONFIG_SND_VX222 is not set
-+# CONFIG_SND_YMFPCI is not set
-+# CONFIG_SND_AC97_POWER_SAVE is not set
-+
-+#
-+# ALSA PowerMac devices
-+#
-+
-+#
-+# ALSA PowerPC devices
-+#
-+
-+#
-+# USB devices
-+#
-+# CONFIG_SND_USB_AUDIO is not set
-+# CONFIG_SND_USB_USX2Y is not set
-+# CONFIG_SND_USB_CAIAQ is not set
-+
-+#
-+# System on Chip audio support
-+#
-+# CONFIG_SND_SOC is not set
-+
-+#
-+# SoC Audio support for SuperH
-+#
-+
-+#
-+# ALSA SoC audio for Freescale SOCs
-+#
-+
-+#
-+# Open Sound System
-+#
-+# CONFIG_SOUND_PRIME is not set
-+CONFIG_AC97_BUS=y
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+
-+#
-+# USB Input Devices
-+#
-+CONFIG_USB_HID=y
-+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-+# CONFIG_HID_FF is not set
-+# CONFIG_USB_HIDDEV is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-+
-+#
-+# Miscellaneous USB options
-+#
-+CONFIG_USB_DEVICEFS=y
-+CONFIG_USB_DEVICE_CLASS=y
-+# CONFIG_USB_DYNAMIC_MINORS is not set
-+# CONFIG_USB_OTG is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+CONFIG_USB_EHCI_HCD=y
-+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
-+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-+# CONFIG_USB_EHCI_FSL is not set
-+CONFIG_USB_EHCI_HCD_PPC_OF=y
-+# CONFIG_USB_ISP116X_HCD is not set
-+CONFIG_USB_OHCI_HCD=y
-+CONFIG_USB_OHCI_HCD_PPC_OF=y
-+CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
-+CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
-+CONFIG_USB_OHCI_HCD_PCI=y
-+CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
-+CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
-+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-+# CONFIG_USB_UHCI_HCD is not set
-+# CONFIG_USB_SL811_HCD is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+
-+#
-+# USB Device Class drivers
-+#
-+# CONFIG_USB_ACM is not set
-+# CONFIG_USB_PRINTER is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+
-+#
-+# may also be needed; see USB_STORAGE Help for more information
-+#
-+CONFIG_USB_STORAGE=y
-+# CONFIG_USB_STORAGE_DEBUG is not set
-+# CONFIG_USB_STORAGE_DATAFAB is not set
-+# CONFIG_USB_STORAGE_FREECOM is not set
-+# CONFIG_USB_STORAGE_ISD200 is not set
-+# CONFIG_USB_STORAGE_DPCM is not set
-+# CONFIG_USB_STORAGE_USBAT is not set
-+# CONFIG_USB_STORAGE_SDDR09 is not set
-+# CONFIG_USB_STORAGE_SDDR55 is not set
-+# CONFIG_USB_STORAGE_JUMPSHOT is not set
-+# CONFIG_USB_STORAGE_ALAUDA is not set
-+# CONFIG_USB_STORAGE_KARMA is not set
-+# CONFIG_USB_LIBUSUAL is not set
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
-+CONFIG_USB_MON=y
-+
-+#
-+# USB port drivers
-+#
-+# CONFIG_USB_SERIAL is not set
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+# CONFIG_USB_EMI62 is not set
-+# CONFIG_USB_EMI26 is not set
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_AUERSWALD is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+# CONFIG_USB_BERRY_CHARGE is not set
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_PHIDGET is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+# CONFIG_USB_SISUSBVGA is not set
-+# CONFIG_USB_LD is not set
-+# CONFIG_USB_TRANCEVIBRATOR is not set
-+# CONFIG_USB_IOWARRIOR is not set
-+# CONFIG_USB_TEST is not set
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+# CONFIG_RTC_DEBUG is not set
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# I2C RTC drivers
-+#
-+# CONFIG_RTC_DRV_DS1307 is not set
-+# CONFIG_RTC_DRV_DS1374 is not set
-+# CONFIG_RTC_DRV_DS1672 is not set
-+# CONFIG_RTC_DRV_MAX6900 is not set
-+# CONFIG_RTC_DRV_RS5C372 is not set
-+# CONFIG_RTC_DRV_ISL1208 is not set
-+# CONFIG_RTC_DRV_X1205 is not set
-+# CONFIG_RTC_DRV_PCF8563 is not set
-+# CONFIG_RTC_DRV_PCF8583 is not set
-+# CONFIG_RTC_DRV_M41T80 is not set
-+# CONFIG_RTC_DRV_S35390A is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+
-+#
-+# Platform RTC drivers
-+#
-+CONFIG_RTC_DRV_CMOS=y
-+# CONFIG_RTC_DRV_DS1511 is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_M48T59 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+CONFIG_EXT3_FS_XATTR=y
-+# CONFIG_EXT3_FS_POSIX_ACL is not set
-+# CONFIG_EXT3_FS_SECURITY is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+CONFIG_ISO9660_FS=m
-+CONFIG_JOLIET=y
-+CONFIG_ZISOFS=y
-+CONFIG_UDF_FS=m
-+CONFIG_UDF_NLS=y
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+CONFIG_FAT_FS=y
-+CONFIG_MSDOS_FS=m
-+CONFIG_VFAT_FS=y
-+CONFIG_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+CONFIG_NTFS_FS=y
-+# CONFIG_NTFS_DEBUG is not set
-+# CONFIG_NTFS_RW is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+CONFIG_ADFS_FS=m
-+# CONFIG_ADFS_FS_RW is not set
-+CONFIG_AFFS_FS=m
-+CONFIG_HFS_FS=m
-+CONFIG_HFSPLUS_FS=m
-+CONFIG_BEFS_FS=m
-+# CONFIG_BEFS_DEBUG is not set
-+CONFIG_BFS_FS=m
-+CONFIG_EFS_FS=m
-+CONFIG_CRAMFS=y
-+CONFIG_VXFS_FS=m
-+# CONFIG_MINIX_FS is not set
-+CONFIG_HPFS_FS=m
-+CONFIG_QNX4FS_FS=m
-+# CONFIG_ROMFS_FS is not set
-+CONFIG_SYSV_FS=m
-+CONFIG_UFS_FS=m
-+# CONFIG_UFS_FS_WRITE is not set
-+# CONFIG_UFS_DEBUG is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+CONFIG_NFS_V4=y
-+# CONFIG_NFS_DIRECTIO is not set
-+CONFIG_NFSD=y
-+# CONFIG_NFSD_V3 is not set
-+CONFIG_NFSD_TCP=y
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_EXPORTFS=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+CONFIG_SUNRPC_GSS=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+CONFIG_MAC_PARTITION=y
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_BSD_DISKLABEL is not set
-+# CONFIG_MINIX_SUBPARTITION is not set
-+# CONFIG_SOLARIS_X86_PARTITION is not set
-+# CONFIG_UNIXWARE_DISKLABEL is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+CONFIG_NLS=y
-+CONFIG_NLS_DEFAULT="iso8859-1"
-+# CONFIG_NLS_CODEPAGE_437 is not set
-+# CONFIG_NLS_CODEPAGE_737 is not set
-+# CONFIG_NLS_CODEPAGE_775 is not set
-+# CONFIG_NLS_CODEPAGE_850 is not set
-+# CONFIG_NLS_CODEPAGE_852 is not set
-+# CONFIG_NLS_CODEPAGE_855 is not set
-+# CONFIG_NLS_CODEPAGE_857 is not set
-+# CONFIG_NLS_CODEPAGE_860 is not set
-+# CONFIG_NLS_CODEPAGE_861 is not set
-+# CONFIG_NLS_CODEPAGE_862 is not set
-+# CONFIG_NLS_CODEPAGE_863 is not set
-+# CONFIG_NLS_CODEPAGE_864 is not set
-+# CONFIG_NLS_CODEPAGE_865 is not set
-+# CONFIG_NLS_CODEPAGE_866 is not set
-+# CONFIG_NLS_CODEPAGE_869 is not set
-+# CONFIG_NLS_CODEPAGE_936 is not set
-+# CONFIG_NLS_CODEPAGE_950 is not set
-+# CONFIG_NLS_CODEPAGE_932 is not set
-+# CONFIG_NLS_CODEPAGE_949 is not set
-+# CONFIG_NLS_CODEPAGE_874 is not set
-+# CONFIG_NLS_ISO8859_8 is not set
-+# CONFIG_NLS_CODEPAGE_1250 is not set
-+# CONFIG_NLS_CODEPAGE_1251 is not set
-+# CONFIG_NLS_ASCII is not set
-+# CONFIG_NLS_ISO8859_1 is not set
-+# CONFIG_NLS_ISO8859_2 is not set
-+# CONFIG_NLS_ISO8859_3 is not set
-+# CONFIG_NLS_ISO8859_4 is not set
-+# CONFIG_NLS_ISO8859_5 is not set
-+# CONFIG_NLS_ISO8859_6 is not set
-+# CONFIG_NLS_ISO8859_7 is not set
-+# CONFIG_NLS_ISO8859_9 is not set
-+# CONFIG_NLS_ISO8859_13 is not set
-+# CONFIG_NLS_ISO8859_14 is not set
-+# CONFIG_NLS_ISO8859_15 is not set
-+# CONFIG_NLS_KOI8_R is not set
-+# CONFIG_NLS_KOI8_U is not set
-+CONFIG_NLS_UTF8=m
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+CONFIG_LIBCRC32C=m
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_HIGHMEM is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+CONFIG_DEBUG_INFO=y
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+# CONFIG_DEBUGGER is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_HASH=y
-+CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_HMAC=y
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+CONFIG_CRYPTO_MD5=y
-+CONFIG_CRYPTO_SHA1=m
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig
-@@ -0,0 +1,935 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Mon Mar 24 08:48:30 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+CONFIG_PPC_85xx=y
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_E500=y
-+CONFIG_BOOKE=y
-+CONFIG_FSL_BOOKE=y
-+CONFIG_FSL_EMB_PERFMON=y
-+# CONFIG_PHYS_64BIT is not set
-+CONFIG_SPE=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_ALL is not set
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=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 is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+# CONFIG_MODULES is not set
-+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
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_AS=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="anticipatory"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC85xx=y
-+# CONFIG_MPC8540_ADS is not set
-+# CONFIG_MPC8560_ADS is not set
-+CONFIG_MPC85xx_CDS=y
-+# CONFIG_MPC85xx_MDS is not set
-+# CONFIG_MPC85xx_DS is not set
-+# CONFIG_STX_GP3 is not set
-+# CONFIG_TQM8540 is not set
-+# CONFIG_TQM8541 is not set
-+# CONFIG_TQM8555 is not set
-+# CONFIG_TQM8560 is not set
-+# CONFIG_SBC8548 is not set
-+# CONFIG_SBC8560 is not set
-+# CONFIG_IPIC is not set
-+CONFIG_MPIC=y
-+# CONFIG_MPIC_WEIRD is not set
-+CONFIG_PPC_I8259=y
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_CPM2 is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+CONFIG_TICK_ONESHOT=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+CONFIG_BINFMT_MISC=y
-+CONFIG_MATH_EMULATION=y
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+# CONFIG_SECCOMP is not set
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_FSL_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+CONFIG_XFRM_USER=y
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+CONFIG_INET_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+CONFIG_IDE=y
-+CONFIG_IDE_MAX_HWIFS=4
-+CONFIG_BLK_DEV_IDE=y
-+
-+#
-+# Please see Documentation/ide/ide.txt for help/info on IDE drives
-+#
-+# CONFIG_BLK_DEV_IDE_SATA is not set
-+# CONFIG_BLK_DEV_IDEDISK is not set
-+# CONFIG_IDEDISK_MULTI_MODE is not set
-+# CONFIG_BLK_DEV_IDECD is not set
-+# CONFIG_BLK_DEV_IDETAPE is not set
-+# CONFIG_BLK_DEV_IDEFLOPPY is not set
-+# CONFIG_IDE_TASK_IOCTL is not set
-+CONFIG_IDE_PROC_FS=y
-+
-+#
-+# IDE chipset support/bugfixes
-+#
-+CONFIG_IDE_GENERIC=y
-+# CONFIG_BLK_DEV_PLATFORM is not set
-+CONFIG_BLK_DEV_IDEDMA_SFF=y
-+
-+#
-+# PCI IDE chipsets support
-+#
-+CONFIG_BLK_DEV_IDEPCI=y
-+CONFIG_IDEPCI_PCIBUS_ORDER=y
-+# CONFIG_BLK_DEV_OFFBOARD is not set
-+CONFIG_BLK_DEV_GENERIC=y
-+# CONFIG_BLK_DEV_OPTI621 is not set
-+CONFIG_BLK_DEV_IDEDMA_PCI=y
-+# CONFIG_BLK_DEV_AEC62XX is not set
-+# CONFIG_BLK_DEV_ALI15X3 is not set
-+# CONFIG_BLK_DEV_AMD74XX is not set
-+# CONFIG_BLK_DEV_CMD64X is not set
-+# CONFIG_BLK_DEV_TRIFLEX is not set
-+# CONFIG_BLK_DEV_CY82C693 is not set
-+# CONFIG_BLK_DEV_CS5520 is not set
-+# CONFIG_BLK_DEV_CS5530 is not set
-+# CONFIG_BLK_DEV_HPT34X is not set
-+# CONFIG_BLK_DEV_HPT366 is not set
-+# CONFIG_BLK_DEV_JMICRON is not set
-+# CONFIG_BLK_DEV_SC1200 is not set
-+# CONFIG_BLK_DEV_PIIX is not set
-+# CONFIG_BLK_DEV_IT8213 is not set
-+# CONFIG_BLK_DEV_IT821X is not set
-+# CONFIG_BLK_DEV_NS87415 is not set
-+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
-+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
-+# CONFIG_BLK_DEV_SVWKS is not set
-+# CONFIG_BLK_DEV_SIIMAGE is not set
-+# CONFIG_BLK_DEV_SL82C105 is not set
-+# CONFIG_BLK_DEV_SLC90E66 is not set
-+# CONFIG_BLK_DEV_TRM290 is not set
-+CONFIG_BLK_DEV_VIA82CXXX=y
-+# CONFIG_BLK_DEV_TC86C001 is not set
-+CONFIG_BLK_DEV_IDEDMA=y
-+CONFIG_IDE_ARCH_OBSOLETE_INIT=y
-+# CONFIG_BLK_DEV_HD is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+# CONFIG_MARVELL_PHY is not set
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+CONFIG_E1000=y
-+CONFIG_E1000_NAPI=y
-+# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+CONFIG_GEN_RTC=y
-+# CONFIG_GEN_RTC_X is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_I5K_AMB is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_PC87427 is not set
-+# CONFIG_SENSORS_SIS5595 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_SMSC47B397 is not set
-+# CONFIG_SENSORS_VIA686A is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_VT8231 is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+# CONFIG_THERMAL is not set
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=y
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+CONFIG_EXT3_FS_XATTR=y
-+# CONFIG_EXT3_FS_POSIX_ACL is not set
-+# CONFIG_EXT3_FS_SECURITY is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+# CONFIG_MSDOS_FS is not set
-+# CONFIG_VFAT_FS is not set
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+# CONFIG_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+# CONFIG_NFS_V3 is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+# CONFIG_MSDOS_PARTITION is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# 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_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+CONFIG_DEBUG_MUTEXES=y
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+# CONFIG_DEBUGGER is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+# CONFIG_CRYPTO_MANAGER is not set
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+# CONFIG_CRYPTO_MD5 is not set
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+# CONFIG_CRYPTO_CBC is not set
-+# CONFIG_CRYPTO_PCBC is not set
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+# CONFIG_CRYPTO_DES is not set
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/85xx/sbc8548_defconfig
-@@ -0,0 +1,812 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Mon Mar 24 08:48:39 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+CONFIG_PPC_85xx=y
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_E500=y
-+CONFIG_BOOKE=y
-+CONFIG_FSL_BOOKE=y
-+CONFIG_FSL_EMB_PERFMON=y
-+# CONFIG_PHYS_64BIT is not set
-+CONFIG_SPE=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=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_SLAB=y
-+# CONFIG_SLUB is not set
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+# CONFIG_MODULES is not set
-+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
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_AS=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="anticipatory"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC85xx=y
-+# CONFIG_MPC8540_ADS is not set
-+# CONFIG_MPC8560_ADS is not set
-+# CONFIG_MPC85xx_CDS is not set
-+# CONFIG_MPC85xx_MDS is not set
-+# CONFIG_MPC85xx_DS is not set
-+# CONFIG_STX_GP3 is not set
-+# CONFIG_TQM8540 is not set
-+# CONFIG_TQM8541 is not set
-+# CONFIG_TQM8555 is not set
-+# CONFIG_TQM8560 is not set
-+CONFIG_SBC8548=y
-+# CONFIG_SBC8560 is not set
-+# CONFIG_IPIC is not set
-+CONFIG_MPIC=y
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_CPM2 is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+CONFIG_BINFMT_MISC=y
-+CONFIG_MATH_EMULATION=y
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+# CONFIG_SECCOMP is not set
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_FSL_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+CONFIG_XFRM_USER=y
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+CONFIG_INET_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=4096
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+# CONFIG_MARVELL_PHY is not set
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+CONFIG_BROADCOM_PHY=y
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+CONFIG_GEN_RTC=y
-+# CONFIG_GEN_RTC_X is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_I5K_AMB is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_PC87427 is not set
-+# CONFIG_SENSORS_SIS5595 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_SMSC47B397 is not set
-+# CONFIG_SENSORS_VIA686A is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_VT8231 is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+# CONFIG_THERMAL is not set
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=y
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+# CONFIG_HID_SUPPORT is not set
-+# CONFIG_USB_SUPPORT is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+# CONFIG_EXT2_FS is not set
-+# CONFIG_EXT3_FS is not set
-+# CONFIG_EXT4DEV_FS is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+# CONFIG_MSDOS_FS is not set
-+# CONFIG_VFAT_FS is not set
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+# CONFIG_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+# CONFIG_NFS_V3 is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# 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_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+# CONFIG_DEBUG_KERNEL is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+# CONFIG_CRYPTO_MANAGER is not set
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+# CONFIG_CRYPTO_MD5 is not set
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+# CONFIG_CRYPTO_CBC is not set
-+# CONFIG_CRYPTO_PCBC is not set
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+# CONFIG_CRYPTO_DES is not set
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/85xx/sbc8560_defconfig
-@@ -0,0 +1,830 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Mon Mar 24 08:48:39 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+CONFIG_PPC_85xx=y
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_E500=y
-+CONFIG_BOOKE=y
-+CONFIG_FSL_BOOKE=y
-+CONFIG_FSL_EMB_PERFMON=y
-+# CONFIG_PHYS_64BIT is not set
-+CONFIG_SPE=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_ALL is not set
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=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_SLAB=y
-+# CONFIG_SLUB is not set
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+# CONFIG_MODULES is not set
-+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
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_AS=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="anticipatory"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC85xx=y
-+# CONFIG_MPC8540_ADS is not set
-+# CONFIG_MPC8560_ADS is not set
-+# CONFIG_MPC85xx_CDS is not set
-+# CONFIG_MPC85xx_MDS is not set
-+# CONFIG_MPC85xx_DS is not set
-+# CONFIG_STX_GP3 is not set
-+# CONFIG_TQM8540 is not set
-+# CONFIG_TQM8541 is not set
-+# CONFIG_TQM8555 is not set
-+# CONFIG_TQM8560 is not set
-+# CONFIG_SBC8548 is not set
-+CONFIG_SBC8560=y
-+# CONFIG_IPIC is not set
-+CONFIG_MPIC=y
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_CPM2 is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+CONFIG_BINFMT_MISC=y
-+# CONFIG_MATH_EMULATION is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+# CONFIG_SECCOMP is not set
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_FSL_SOC=y
-+# CONFIG_PCI is not set
-+# CONFIG_PCI_DOMAINS is not set
-+# CONFIG_PCI_SYSCALL is not set
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
-+# CONFIG_PCCARD is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+CONFIG_XFRM_USER=y
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+CONFIG_INET_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+# CONFIG_MARVELL_PHY is not set
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+CONFIG_BROADCOM_PHY=y
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_E1000E_ENABLED is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+CONFIG_NETDEV_10000=y
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_NR_UARTS=2
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_PC87427 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_SMSC47B397 is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+# CONFIG_THERMAL is not set
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=y
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+CONFIG_USB_SUPPORT=y
-+# CONFIG_USB_ARCH_HAS_HCD is not set
-+# CONFIG_USB_ARCH_HAS_OHCI is not set
-+# CONFIG_USB_ARCH_HAS_EHCI is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_EDAC is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+# CONFIG_RTC_DEBUG is not set
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+
-+#
-+# Platform RTC drivers
-+#
-+# CONFIG_RTC_DRV_CMOS is not set
-+# CONFIG_RTC_DRV_DS1511 is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+CONFIG_RTC_DRV_M48T59=y
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+# CONFIG_EXT2_FS is not set
-+# CONFIG_EXT3_FS is not set
-+# CONFIG_EXT4DEV_FS is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+# CONFIG_MSDOS_FS is not set
-+# CONFIG_VFAT_FS is not set
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+# CONFIG_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+# CONFIG_NFS_V3 is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+# CONFIG_MSDOS_PARTITION is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# 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_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_DEBUG_SLAB is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+CONFIG_DEBUG_MUTEXES=y
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+# CONFIG_DEBUGGER is not set
-+# CONFIG_BDI_SWITCH is not set
-+CONFIG_PPC_EARLY_DEBUG=y
-+# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
-+# CONFIG_PPC_EARLY_DEBUG_G5 is not set
-+# CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL is not set
-+# CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set
-+# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
-+# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
-+# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
-+# CONFIG_PPC_EARLY_DEBUG_BEAT is not set
-+# CONFIG_PPC_EARLY_DEBUG_44x is not set
-+# CONFIG_PPC_EARLY_DEBUG_40x is not set
-+# CONFIG_PPC_EARLY_DEBUG_CPM is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+# CONFIG_CRYPTO_MANAGER is not set
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+# CONFIG_CRYPTO_MD5 is not set
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+# CONFIG_CRYPTO_CBC is not set
-+# CONFIG_CRYPTO_PCBC is not set
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+# CONFIG_CRYPTO_DES is not set
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/85xx/stx_gp3_defconfig
-@@ -0,0 +1,1253 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Mon Mar 24 08:48:42 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+CONFIG_PPC_85xx=y
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_E500=y
-+CONFIG_BOOKE=y
-+CONFIG_FSL_BOOKE=y
-+CONFIG_FSL_EMB_PERFMON=y
-+# CONFIG_PHYS_64BIT is not set
-+CONFIG_SPE=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_ALL is not set
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=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 is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+# CONFIG_MODULE_UNLOAD is not set
-+CONFIG_MODVERSIONS=y
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+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
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+# CONFIG_DEFAULT_AS is not set
-+# CONFIG_DEFAULT_DEADLINE is not set
-+CONFIG_DEFAULT_CFQ=y
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="cfq"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC85xx=y
-+# CONFIG_MPC8540_ADS is not set
-+# CONFIG_MPC8560_ADS is not set
-+# CONFIG_MPC85xx_CDS is not set
-+# CONFIG_MPC85xx_MDS is not set
-+# CONFIG_MPC85xx_DS is not set
-+CONFIG_STX_GP3=y
-+# CONFIG_TQM8540 is not set
-+# CONFIG_TQM8541 is not set
-+# CONFIG_TQM8555 is not set
-+# CONFIG_TQM8560 is not set
-+# CONFIG_SBC8548 is not set
-+# CONFIG_SBC8560 is not set
-+# CONFIG_IPIC is not set
-+CONFIG_MPIC=y
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+CONFIG_CPM2=y
-+CONFIG_PPC_CPM_NEW_BINDING=y
-+# CONFIG_FSL_ULI1575 is not set
-+CONFIG_CPM=y
-+
-+#
-+# Kernel options
-+#
-+CONFIG_HIGHMEM=y
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+CONFIG_BINFMT_MISC=m
-+CONFIG_MATH_EMULATION=y
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_FSL_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+# CONFIG_IP_MULTICAST is not set
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+# CONFIG_IP_PNP_DHCP is not set
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_ARPD is not set
-+# CONFIG_SYN_COOKIES is not set
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+CONFIG_INET_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IP_VS is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+CONFIG_NETFILTER=y
-+# CONFIG_NETFILTER_DEBUG is not set
-+CONFIG_NETFILTER_ADVANCED=y
-+
-+#
-+# Core Netfilter Configuration
-+#
-+# CONFIG_NETFILTER_NETLINK_QUEUE is not set
-+# CONFIG_NETFILTER_NETLINK_LOG is not set
-+# CONFIG_NF_CONNTRACK is not set
-+CONFIG_NETFILTER_XTABLES=m
-+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
-+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
-+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
-+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
-+# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
-+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
-+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
-+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
-+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
-+# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
-+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
-+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
-+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
-+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
-+# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
-+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
-+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
-+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
-+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
-+# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
-+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
-+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
-+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
-+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
-+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
-+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
-+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
-+
-+#
-+# IP: Netfilter Configuration
-+#
-+# CONFIG_IP_NF_QUEUE is not set
-+CONFIG_IP_NF_IPTABLES=m
-+# CONFIG_IP_NF_MATCH_RECENT is not set
-+# CONFIG_IP_NF_MATCH_ECN is not set
-+# CONFIG_IP_NF_MATCH_AH is not set
-+# CONFIG_IP_NF_MATCH_TTL is not set
-+# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
-+CONFIG_IP_NF_FILTER=m
-+# CONFIG_IP_NF_TARGET_REJECT is not set
-+# CONFIG_IP_NF_TARGET_LOG is not set
-+# CONFIG_IP_NF_TARGET_ULOG is not set
-+# CONFIG_IP_NF_MANGLE is not set
-+# CONFIG_IP_NF_RAW is not set
-+# CONFIG_IP_NF_ARPTABLES is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+CONFIG_NET_PKTGEN=y
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+CONFIG_PARPORT=m
-+CONFIG_PARPORT_PC=m
-+# CONFIG_PARPORT_PC_FIFO is not set
-+# CONFIG_PARPORT_PC_SUPERIO is not set
-+# CONFIG_PARPORT_GSC is not set
-+# CONFIG_PARPORT_AX88796 is not set
-+# CONFIG_PARPORT_1284 is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_PARIDE is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=m
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+CONFIG_BLK_DEV_NBD=m
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+CONFIG_IDE=y
-+CONFIG_IDE_MAX_HWIFS=4
-+CONFIG_BLK_DEV_IDE=y
-+
-+#
-+# Please see Documentation/ide/ide.txt for help/info on IDE drives
-+#
-+# CONFIG_BLK_DEV_IDE_SATA is not set
-+CONFIG_BLK_DEV_IDEDISK=y
-+# CONFIG_IDEDISK_MULTI_MODE is not set
-+CONFIG_BLK_DEV_IDECD=m
-+CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
-+# CONFIG_BLK_DEV_IDETAPE is not set
-+# CONFIG_BLK_DEV_IDEFLOPPY is not set
-+# CONFIG_BLK_DEV_IDESCSI is not set
-+# CONFIG_IDE_TASK_IOCTL is not set
-+CONFIG_IDE_PROC_FS=y
-+
-+#
-+# IDE chipset support/bugfixes
-+#
-+CONFIG_IDE_GENERIC=y
-+# CONFIG_BLK_DEV_PLATFORM is not set
-+
-+#
-+# PCI IDE chipsets support
-+#
-+# CONFIG_BLK_DEV_GENERIC is not set
-+# CONFIG_BLK_DEV_OPTI621 is not set
-+# CONFIG_BLK_DEV_AEC62XX is not set
-+# CONFIG_BLK_DEV_ALI15X3 is not set
-+# CONFIG_BLK_DEV_AMD74XX is not set
-+# CONFIG_BLK_DEV_CMD64X is not set
-+# CONFIG_BLK_DEV_TRIFLEX is not set
-+# CONFIG_BLK_DEV_CY82C693 is not set
-+# CONFIG_BLK_DEV_CS5520 is not set
-+# CONFIG_BLK_DEV_CS5530 is not set
-+# CONFIG_BLK_DEV_HPT34X is not set
-+# CONFIG_BLK_DEV_HPT366 is not set
-+# CONFIG_BLK_DEV_JMICRON is not set
-+# CONFIG_BLK_DEV_SC1200 is not set
-+# CONFIG_BLK_DEV_PIIX is not set
-+# CONFIG_BLK_DEV_IT8213 is not set
-+# CONFIG_BLK_DEV_IT821X is not set
-+# CONFIG_BLK_DEV_NS87415 is not set
-+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
-+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
-+# CONFIG_BLK_DEV_SVWKS is not set
-+# CONFIG_BLK_DEV_SIIMAGE is not set
-+# CONFIG_BLK_DEV_SL82C105 is not set
-+# CONFIG_BLK_DEV_SLC90E66 is not set
-+# CONFIG_BLK_DEV_TRM290 is not set
-+# CONFIG_BLK_DEV_VIA82CXXX is not set
-+# CONFIG_BLK_DEV_TC86C001 is not set
-+# CONFIG_BLK_DEV_IDEDMA is not set
-+CONFIG_IDE_ARCH_OBSOLETE_INIT=y
-+# CONFIG_BLK_DEV_HD is not set
-+
-+#
-+# SCSI device support
-+#
-+# 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
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=m
-+CONFIG_CHR_DEV_ST=m
-+# CONFIG_CHR_DEV_OSST is not set
-+CONFIG_BLK_DEV_SR=m
-+# CONFIG_BLK_DEV_SR_VENDOR is not set
-+CONFIG_CHR_DEV_SG=m
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+CONFIG_SCSI_MULTI_LUN=y
-+CONFIG_SCSI_CONSTANTS=y
-+# CONFIG_SCSI_LOGGING is not set
-+# CONFIG_SCSI_SCAN_ASYNC is not set
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-+# CONFIG_SCSI_3W_9XXX is not set
-+# CONFIG_SCSI_ACARD is not set
-+# CONFIG_SCSI_AACRAID is not set
-+# CONFIG_SCSI_AIC7XXX is not set
-+# CONFIG_SCSI_AIC7XXX_OLD is not set
-+# CONFIG_SCSI_AIC79XX is not set
-+# CONFIG_SCSI_AIC94XX is not set
-+# CONFIG_SCSI_DPT_I2O is not set
-+# CONFIG_SCSI_ADVANSYS is not set
-+# CONFIG_SCSI_ARCMSR is not set
-+# CONFIG_MEGARAID_NEWGEN is not set
-+# CONFIG_MEGARAID_LEGACY is not set
-+# CONFIG_MEGARAID_SAS is not set
-+# CONFIG_SCSI_HPTIOP is not set
-+# CONFIG_SCSI_BUSLOGIC is not set
-+# CONFIG_SCSI_DMX3191D is not set
-+# CONFIG_SCSI_EATA is not set
-+# CONFIG_SCSI_FUTURE_DOMAIN is not set
-+# CONFIG_SCSI_GDTH is not set
-+# CONFIG_SCSI_IPS is not set
-+# CONFIG_SCSI_INITIO is not set
-+# CONFIG_SCSI_INIA100 is not set
-+# CONFIG_SCSI_PPA is not set
-+# CONFIG_SCSI_IMM is not set
-+# CONFIG_SCSI_MVSAS is not set
-+# CONFIG_SCSI_STEX is not set
-+# CONFIG_SCSI_SYM53C8XX_2 is not set
-+# CONFIG_SCSI_QLOGIC_1280 is not set
-+# CONFIG_SCSI_QLA_FC is not set
-+# CONFIG_SCSI_QLA_ISCSI is not set
-+# CONFIG_SCSI_LPFC is not set
-+# CONFIG_SCSI_DC395x is not set
-+# CONFIG_SCSI_DC390T is not set
-+# CONFIG_SCSI_NSP32 is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_SCSI_SRP is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+CONFIG_MARVELL_PHY=y
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+# CONFIG_MII is not set
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+# CONFIG_NET_POCKET is not set
-+# CONFIG_FS_ENET is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PLIP is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NET_FC is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+CONFIG_INPUT_MOUSEDEV=y
-+CONFIG_INPUT_MOUSEDEV_PSAUX=y
-+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1280
-+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=1024
-+CONFIG_INPUT_JOYDEV=m
-+CONFIG_INPUT_EVDEV=m
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+CONFIG_INPUT_KEYBOARD=y
-+CONFIG_KEYBOARD_ATKBD=y
-+# CONFIG_KEYBOARD_SUNKBD is not set
-+# CONFIG_KEYBOARD_LKKBD is not set
-+# CONFIG_KEYBOARD_XTKBD is not set
-+# CONFIG_KEYBOARD_NEWTON is not set
-+# CONFIG_KEYBOARD_STOWAWAY is not set
-+CONFIG_INPUT_MOUSE=y
-+CONFIG_MOUSE_PS2=y
-+CONFIG_MOUSE_PS2_ALPS=y
-+CONFIG_MOUSE_PS2_LOGIPS2PP=y
-+CONFIG_MOUSE_PS2_SYNAPTICS=y
-+CONFIG_MOUSE_PS2_LIFEBOOK=y
-+CONFIG_MOUSE_PS2_TRACKPOINT=y
-+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
-+# CONFIG_MOUSE_SERIAL is not set
-+# CONFIG_MOUSE_APPLETOUCH is not set
-+# CONFIG_MOUSE_VSXXXAA is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+CONFIG_SERIO=y
-+CONFIG_SERIO_I8042=y
-+CONFIG_SERIO_SERPORT=y
-+# CONFIG_SERIO_PARKBD is not set
-+# CONFIG_SERIO_PCIPS2 is not set
-+CONFIG_SERIO_LIBPS2=y
-+# CONFIG_SERIO_RAW is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+# CONFIG_SERIAL_8250 is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+CONFIG_SERIAL_CPM=y
-+CONFIG_SERIAL_CPM_CONSOLE=y
-+# CONFIG_SERIAL_CPM_SCC1 is not set
-+CONFIG_SERIAL_CPM_SCC2=y
-+# CONFIG_SERIAL_CPM_SCC3 is not set
-+# CONFIG_SERIAL_CPM_SCC4 is not set
-+# CONFIG_SERIAL_CPM_SMC1 is not set
-+# CONFIG_SERIAL_CPM_SMC2 is not set
-+# CONFIG_SERIAL_JSM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+CONFIG_PRINTER=m
-+# CONFIG_LP_CONSOLE is not set
-+# CONFIG_PPDEV is not set
-+# CONFIG_IPMI_HANDLER is not set
-+CONFIG_HW_RANDOM=m
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+CONFIG_I2C=m
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=m
-+
-+#
-+# I2C Algorithms
-+#
-+CONFIG_I2C_ALGOBIT=m
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_ALI1535 is not set
-+# CONFIG_I2C_ALI1563 is not set
-+# CONFIG_I2C_ALI15X3 is not set
-+# CONFIG_I2C_AMD756 is not set
-+# CONFIG_I2C_AMD8111 is not set
-+# CONFIG_I2C_I801 is not set
-+# CONFIG_I2C_I810 is not set
-+# CONFIG_I2C_PIIX4 is not set
-+# CONFIG_I2C_MPC is not set
-+# CONFIG_I2C_NFORCE2 is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_PROSAVAGE is not set
-+# CONFIG_I2C_SAVAGE4 is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_SIS5595 is not set
-+# CONFIG_I2C_SIS630 is not set
-+# CONFIG_I2C_SIS96X is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_STUB is not set
-+# CONFIG_I2C_VIA is not set
-+# CONFIG_I2C_VIAPRO is not set
-+# CONFIG_I2C_VOODOO3 is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+# CONFIG_I2C_DEBUG_CORE is not set
-+# CONFIG_I2C_DEBUG_ALGO is not set
-+# CONFIG_I2C_DEBUG_BUS is not set
-+# CONFIG_I2C_DEBUG_CHIP is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ADT7473 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_I5K_AMB is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S is not set
-+# CONFIG_SENSORS_GL518SM is not set
-+# CONFIG_SENSORS_GL520SM is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_LM63 is not set
-+# CONFIG_SENSORS_LM75 is not set
-+# CONFIG_SENSORS_LM77 is not set
-+# CONFIG_SENSORS_LM78 is not set
-+# CONFIG_SENSORS_LM80 is not set
-+# CONFIG_SENSORS_LM83 is not set
-+# CONFIG_SENSORS_LM85 is not set
-+# 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_SIS5595 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_ADS7828 is not set
-+# CONFIG_SENSORS_THMC50 is not set
-+# CONFIG_SENSORS_VIA686A is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_VT8231 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83L786NG is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+# CONFIG_THERMAL is not set
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+CONFIG_AGP=m
-+CONFIG_DRM=m
-+# CONFIG_DRM_TDFX is not set
-+# CONFIG_DRM_R128 is not set
-+# CONFIG_DRM_RADEON is not set
-+# CONFIG_DRM_MGA is not set
-+# CONFIG_DRM_SIS is not set
-+# CONFIG_DRM_VIA is not set
-+# CONFIG_DRM_SAVAGE is not set
-+# CONFIG_VGASTATE is not set
-+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+CONFIG_SOUND=m
-+
-+#
-+# Advanced Linux Sound Architecture
-+#
-+# CONFIG_SND is not set
-+
-+#
-+# Open Sound System
-+#
-+# CONFIG_SOUND_PRIME is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+# CONFIG_DMADEVICES is not set
-+# CONFIG_AUXDISPLAY is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+CONFIG_EXT3_FS_XATTR=y
-+# CONFIG_EXT3_FS_POSIX_ACL is not set
-+# CONFIG_EXT3_FS_SECURITY is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+CONFIG_AUTOFS_FS=m
-+CONFIG_AUTOFS4_FS=y
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+CONFIG_ISO9660_FS=m
-+# CONFIG_JOLIET is not set
-+# CONFIG_ZISOFS is not set
-+CONFIG_UDF_FS=m
-+CONFIG_UDF_NLS=y
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+CONFIG_FAT_FS=m
-+CONFIG_MSDOS_FS=m
-+CONFIG_VFAT_FS=m
-+CONFIG_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+# CONFIG_PROC_KCORE is not set
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+CONFIG_CRAMFS=m
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+CONFIG_SMB_FS=m
-+# CONFIG_SMB_NLS_DEFAULT is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+CONFIG_NLS=y
-+CONFIG_NLS_DEFAULT="iso8859-1"
-+# CONFIG_NLS_CODEPAGE_437 is not set
-+# CONFIG_NLS_CODEPAGE_737 is not set
-+# CONFIG_NLS_CODEPAGE_775 is not set
-+# CONFIG_NLS_CODEPAGE_850 is not set
-+# CONFIG_NLS_CODEPAGE_852 is not set
-+# CONFIG_NLS_CODEPAGE_855 is not set
-+# CONFIG_NLS_CODEPAGE_857 is not set
-+# CONFIG_NLS_CODEPAGE_860 is not set
-+# CONFIG_NLS_CODEPAGE_861 is not set
-+# CONFIG_NLS_CODEPAGE_862 is not set
-+# CONFIG_NLS_CODEPAGE_863 is not set
-+# CONFIG_NLS_CODEPAGE_864 is not set
-+# CONFIG_NLS_CODEPAGE_865 is not set
-+# CONFIG_NLS_CODEPAGE_866 is not set
-+# CONFIG_NLS_CODEPAGE_869 is not set
-+# CONFIG_NLS_CODEPAGE_936 is not set
-+# CONFIG_NLS_CODEPAGE_950 is not set
-+# CONFIG_NLS_CODEPAGE_932 is not set
-+# CONFIG_NLS_CODEPAGE_949 is not set
-+# CONFIG_NLS_CODEPAGE_874 is not set
-+# CONFIG_NLS_ISO8859_8 is not set
-+# CONFIG_NLS_CODEPAGE_1250 is not set
-+# CONFIG_NLS_CODEPAGE_1251 is not set
-+# CONFIG_NLS_ASCII is not set
-+# CONFIG_NLS_ISO8859_1 is not set
-+# CONFIG_NLS_ISO8859_2 is not set
-+# CONFIG_NLS_ISO8859_3 is not set
-+# CONFIG_NLS_ISO8859_4 is not set
-+# CONFIG_NLS_ISO8859_5 is not set
-+# CONFIG_NLS_ISO8859_6 is not set
-+# CONFIG_NLS_ISO8859_7 is not set
-+# CONFIG_NLS_ISO8859_9 is not set
-+# CONFIG_NLS_ISO8859_13 is not set
-+# CONFIG_NLS_ISO8859_14 is not set
-+# CONFIG_NLS_ISO8859_15 is not set
-+# CONFIG_NLS_KOI8_R is not set
-+# CONFIG_NLS_KOI8_U is not set
-+# CONFIG_NLS_UTF8 is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+CONFIG_CRC_CCITT=y
-+# 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=m
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_HIGHMEM is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+# CONFIG_DEBUGGER is not set
-+# CONFIG_KGDB_CONSOLE is not set
-+CONFIG_BDI_SWITCH=y
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+# CONFIG_CRYPTO_MANAGER is not set
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+# CONFIG_CRYPTO_MD5 is not set
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+# CONFIG_CRYPTO_CBC is not set
-+# CONFIG_CRYPTO_PCBC is not set
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+# CONFIG_CRYPTO_DES is not set
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
-+CONFIG_PPC_LIB_RHEAP=y
---- /dev/null
-+++ b/arch/powerpc/configs/85xx/tqm8540_defconfig
-@@ -0,0 +1,1097 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Mon Mar 24 08:48:43 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+CONFIG_PPC_85xx=y
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_E500=y
-+CONFIG_BOOKE=y
-+CONFIG_FSL_BOOKE=y
-+CONFIG_FSL_EMB_PERFMON=y
-+# CONFIG_PHYS_64BIT is not set
-+CONFIG_SPE=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+# CONFIG_KALLSYMS is not set
-+# CONFIG_HOTPLUG is not set
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+# CONFIG_EPOLL is not set
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+# CONFIG_MODULES is not set
-+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
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_AS=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="anticipatory"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC85xx=y
-+# CONFIG_MPC8540_ADS is not set
-+# CONFIG_MPC8560_ADS is not set
-+# CONFIG_MPC85xx_CDS is not set
-+# CONFIG_MPC85xx_MDS is not set
-+# CONFIG_MPC85xx_DS is not set
-+# CONFIG_STX_GP3 is not set
-+CONFIG_TQM8540=y
-+# CONFIG_TQM8541 is not set
-+# CONFIG_TQM8555 is not set
-+# CONFIG_TQM8560 is not set
-+# CONFIG_SBC8548 is not set
-+# CONFIG_SBC8560 is not set
-+CONFIG_TQM85xx=y
-+# CONFIG_IPIC is not set
-+CONFIG_MPIC=y
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_CPM2 is not set
-+CONFIG_PPC_CPM_NEW_BINDING=y
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+CONFIG_MATH_EMULATION=y
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+# CONFIG_PROC_DEVICETREE is not set
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_FSL_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+CONFIG_INET_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+CONFIG_MTD_CONCAT=y
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+# CONFIG_MTD_OF_PARTS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+CONFIG_MTD_BLOCK=y
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+# CONFIG_MTD_CFI_INTELEXT is not set
-+CONFIG_MTD_CFI_AMDSTD=y
-+# CONFIG_MTD_CFI_STAA is not set
-+CONFIG_MTD_CFI_UTIL=y
-+# CONFIG_MTD_RAM is not set
-+# CONFIG_MTD_ROM is not set
-+# CONFIG_MTD_ABSENT is not set
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+# CONFIG_MTD_PHYSMAP_OF is not set
-+# CONFIG_MTD_INTEL_VR_NOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_PMC551 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+# CONFIG_MTD_NAND is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+CONFIG_IDE=y
-+CONFIG_IDE_MAX_HWIFS=4
-+CONFIG_BLK_DEV_IDE=y
-+
-+#
-+# Please see Documentation/ide/ide.txt for help/info on IDE drives
-+#
-+# CONFIG_BLK_DEV_IDE_SATA is not set
-+CONFIG_BLK_DEV_IDEDISK=y
-+# CONFIG_IDEDISK_MULTI_MODE is not set
-+# CONFIG_BLK_DEV_IDECD is not set
-+# CONFIG_BLK_DEV_IDETAPE is not set
-+# CONFIG_BLK_DEV_IDEFLOPPY is not set
-+# CONFIG_IDE_TASK_IOCTL is not set
-+CONFIG_IDE_PROC_FS=y
-+
-+#
-+# IDE chipset support/bugfixes
-+#
-+CONFIG_IDE_GENERIC=y
-+# CONFIG_BLK_DEV_PLATFORM is not set
-+CONFIG_BLK_DEV_IDEDMA_SFF=y
-+
-+#
-+# PCI IDE chipsets support
-+#
-+CONFIG_BLK_DEV_IDEPCI=y
-+CONFIG_IDEPCI_PCIBUS_ORDER=y
-+# CONFIG_BLK_DEV_OFFBOARD is not set
-+CONFIG_BLK_DEV_GENERIC=y
-+# CONFIG_BLK_DEV_OPTI621 is not set
-+CONFIG_BLK_DEV_IDEDMA_PCI=y
-+# CONFIG_BLK_DEV_AEC62XX is not set
-+# CONFIG_BLK_DEV_ALI15X3 is not set
-+# CONFIG_BLK_DEV_AMD74XX is not set
-+# CONFIG_BLK_DEV_CMD64X is not set
-+# CONFIG_BLK_DEV_TRIFLEX is not set
-+# CONFIG_BLK_DEV_CY82C693 is not set
-+# CONFIG_BLK_DEV_CS5520 is not set
-+# CONFIG_BLK_DEV_CS5530 is not set
-+# CONFIG_BLK_DEV_HPT34X is not set
-+# CONFIG_BLK_DEV_HPT366 is not set
-+# CONFIG_BLK_DEV_JMICRON is not set
-+# CONFIG_BLK_DEV_SC1200 is not set
-+# CONFIG_BLK_DEV_PIIX is not set
-+# CONFIG_BLK_DEV_IT8213 is not set
-+# CONFIG_BLK_DEV_IT821X is not set
-+# CONFIG_BLK_DEV_NS87415 is not set
-+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
-+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
-+# CONFIG_BLK_DEV_SVWKS is not set
-+# CONFIG_BLK_DEV_SIIMAGE is not set
-+# CONFIG_BLK_DEV_SL82C105 is not set
-+# CONFIG_BLK_DEV_SLC90E66 is not set
-+# CONFIG_BLK_DEV_TRM290 is not set
-+CONFIG_BLK_DEV_VIA82CXXX=y
-+# CONFIG_BLK_DEV_TC86C001 is not set
-+CONFIG_BLK_DEV_IDEDMA=y
-+CONFIG_IDE_ARCH_OBSOLETE_INIT=y
-+# CONFIG_BLK_DEV_HD is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+# CONFIG_MARVELL_PHY is not set
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+CONFIG_NET_PCI=y
-+# CONFIG_PCNET32 is not set
-+# CONFIG_AMD8111_ETH is not set
-+# CONFIG_ADAPTEC_STARFIRE is not set
-+# CONFIG_B44 is not set
-+# CONFIG_FORCEDETH is not set
-+# CONFIG_EEPRO100 is not set
-+CONFIG_E100=y
-+# CONFIG_FEALNX is not set
-+# CONFIG_NATSEMI is not set
-+# CONFIG_NE2K_PCI is not set
-+# CONFIG_8139CP is not set
-+# CONFIG_8139TOO is not set
-+# CONFIG_R6040 is not set
-+# CONFIG_SIS900 is not set
-+# CONFIG_EPIC100 is not set
-+# CONFIG_SUNDANCE is not set
-+# CONFIG_TLAN is not set
-+# CONFIG_VIA_RHINE is not set
-+# CONFIG_SC92031 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+CONFIG_HW_RANDOM=y
-+# CONFIG_NVRAM is not set
-+CONFIG_GEN_RTC=y
-+# CONFIG_GEN_RTC_X is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_ALI1535 is not set
-+# CONFIG_I2C_ALI1563 is not set
-+# CONFIG_I2C_ALI15X3 is not set
-+# CONFIG_I2C_AMD756 is not set
-+# CONFIG_I2C_AMD8111 is not set
-+# CONFIG_I2C_I801 is not set
-+# CONFIG_I2C_I810 is not set
-+# CONFIG_I2C_PIIX4 is not set
-+CONFIG_I2C_MPC=y
-+# CONFIG_I2C_NFORCE2 is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_PROSAVAGE is not set
-+# CONFIG_I2C_SAVAGE4 is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_SIS5595 is not set
-+# CONFIG_I2C_SIS630 is not set
-+# CONFIG_I2C_SIS96X is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_VIA is not set
-+# CONFIG_I2C_VIAPRO is not set
-+# CONFIG_I2C_VOODOO3 is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+# CONFIG_I2C_DEBUG_CORE is not set
-+# CONFIG_I2C_DEBUG_ALGO is not set
-+# CONFIG_I2C_DEBUG_BUS is not set
-+# CONFIG_I2C_DEBUG_CHIP is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ADT7473 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_I5K_AMB is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S is not set
-+# CONFIG_SENSORS_GL518SM is not set
-+# CONFIG_SENSORS_GL520SM is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_LM63 is not set
-+CONFIG_SENSORS_LM75=y
-+# CONFIG_SENSORS_LM77 is not set
-+# CONFIG_SENSORS_LM78 is not set
-+# CONFIG_SENSORS_LM80 is not set
-+# CONFIG_SENSORS_LM83 is not set
-+# CONFIG_SENSORS_LM85 is not set
-+# 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_SIS5595 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_ADS7828 is not set
-+# CONFIG_SENSORS_THMC50 is not set
-+# CONFIG_SENSORS_VIA686A is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_VT8231 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83L786NG is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+CONFIG_HWMON_DEBUG_CHIP=y
-+# CONFIG_THERMAL is not set
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+CONFIG_EXT3_FS_XATTR=y
-+# CONFIG_EXT3_FS_POSIX_ACL is not set
-+# CONFIG_EXT3_FS_SECURITY is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+# CONFIG_MSDOS_FS is not set
-+# CONFIG_VFAT_FS is not set
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+CONFIG_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-+# CONFIG_JFFS2_SUMMARY is not set
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+# CONFIG_JFFS2_LZO is not set
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+CONFIG_CRAMFS=y
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+# CONFIG_NFS_V3 is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+# CONFIG_MSDOS_PARTITION is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# 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
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+# CONFIG_DEBUG_KERNEL is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+# CONFIG_CRYPTO_MANAGER is not set
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+# CONFIG_CRYPTO_MD5 is not set
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+# CONFIG_CRYPTO_CBC is not set
-+# CONFIG_CRYPTO_PCBC is not set
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+# CONFIG_CRYPTO_DES is not set
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/85xx/tqm8541_defconfig
-@@ -0,0 +1,1109 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Mon Mar 24 08:48:44 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+CONFIG_PPC_85xx=y
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_E500=y
-+CONFIG_BOOKE=y
-+CONFIG_FSL_BOOKE=y
-+CONFIG_FSL_EMB_PERFMON=y
-+# CONFIG_PHYS_64BIT is not set
-+CONFIG_SPE=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+# CONFIG_KALLSYMS is not set
-+# CONFIG_HOTPLUG is not set
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+# CONFIG_EPOLL is not set
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+# CONFIG_MODULES is not set
-+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
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_AS=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="anticipatory"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC85xx=y
-+# CONFIG_MPC8540_ADS is not set
-+# CONFIG_MPC8560_ADS is not set
-+# CONFIG_MPC85xx_CDS is not set
-+# CONFIG_MPC85xx_MDS is not set
-+# CONFIG_MPC85xx_DS is not set
-+# CONFIG_STX_GP3 is not set
-+# CONFIG_TQM8540 is not set
-+CONFIG_TQM8541=y
-+# CONFIG_TQM8555 is not set
-+# CONFIG_TQM8560 is not set
-+# CONFIG_SBC8548 is not set
-+# CONFIG_SBC8560 is not set
-+CONFIG_TQM85xx=y
-+# CONFIG_IPIC is not set
-+CONFIG_MPIC=y
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+CONFIG_CPM2=y
-+CONFIG_PPC_CPM_NEW_BINDING=y
-+# CONFIG_FSL_ULI1575 is not set
-+CONFIG_CPM=y
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+CONFIG_MATH_EMULATION=y
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+# CONFIG_PROC_DEVICETREE is not set
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_FSL_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+CONFIG_INET_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+CONFIG_MTD_CONCAT=y
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+# CONFIG_MTD_OF_PARTS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+CONFIG_MTD_BLOCK=y
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+# CONFIG_MTD_CFI_INTELEXT is not set
-+CONFIG_MTD_CFI_AMDSTD=y
-+# CONFIG_MTD_CFI_STAA is not set
-+CONFIG_MTD_CFI_UTIL=y
-+# CONFIG_MTD_RAM is not set
-+# CONFIG_MTD_ROM is not set
-+# CONFIG_MTD_ABSENT is not set
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+# CONFIG_MTD_PHYSMAP_OF is not set
-+# CONFIG_MTD_INTEL_VR_NOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_PMC551 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+# CONFIG_MTD_NAND is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+CONFIG_IDE=y
-+CONFIG_IDE_MAX_HWIFS=4
-+CONFIG_BLK_DEV_IDE=y
-+
-+#
-+# Please see Documentation/ide/ide.txt for help/info on IDE drives
-+#
-+# CONFIG_BLK_DEV_IDE_SATA is not set
-+CONFIG_BLK_DEV_IDEDISK=y
-+# CONFIG_IDEDISK_MULTI_MODE is not set
-+# CONFIG_BLK_DEV_IDECD is not set
-+# CONFIG_BLK_DEV_IDETAPE is not set
-+# CONFIG_BLK_DEV_IDEFLOPPY is not set
-+# CONFIG_IDE_TASK_IOCTL is not set
-+CONFIG_IDE_PROC_FS=y
-+
-+#
-+# IDE chipset support/bugfixes
-+#
-+CONFIG_IDE_GENERIC=y
-+# CONFIG_BLK_DEV_PLATFORM is not set
-+CONFIG_BLK_DEV_IDEDMA_SFF=y
-+
-+#
-+# PCI IDE chipsets support
-+#
-+CONFIG_BLK_DEV_IDEPCI=y
-+CONFIG_IDEPCI_PCIBUS_ORDER=y
-+# CONFIG_BLK_DEV_OFFBOARD is not set
-+CONFIG_BLK_DEV_GENERIC=y
-+# CONFIG_BLK_DEV_OPTI621 is not set
-+CONFIG_BLK_DEV_IDEDMA_PCI=y
-+# CONFIG_BLK_DEV_AEC62XX is not set
-+# CONFIG_BLK_DEV_ALI15X3 is not set
-+# CONFIG_BLK_DEV_AMD74XX is not set
-+# CONFIG_BLK_DEV_CMD64X is not set
-+# CONFIG_BLK_DEV_TRIFLEX is not set
-+# CONFIG_BLK_DEV_CY82C693 is not set
-+# CONFIG_BLK_DEV_CS5520 is not set
-+# CONFIG_BLK_DEV_CS5530 is not set
-+# CONFIG_BLK_DEV_HPT34X is not set
-+# CONFIG_BLK_DEV_HPT366 is not set
-+# CONFIG_BLK_DEV_JMICRON is not set
-+# CONFIG_BLK_DEV_SC1200 is not set
-+# CONFIG_BLK_DEV_PIIX is not set
-+# CONFIG_BLK_DEV_IT8213 is not set
-+# CONFIG_BLK_DEV_IT821X is not set
-+# CONFIG_BLK_DEV_NS87415 is not set
-+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
-+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
-+# CONFIG_BLK_DEV_SVWKS is not set
-+# CONFIG_BLK_DEV_SIIMAGE is not set
-+# CONFIG_BLK_DEV_SL82C105 is not set
-+# CONFIG_BLK_DEV_SLC90E66 is not set
-+# CONFIG_BLK_DEV_TRM290 is not set
-+CONFIG_BLK_DEV_VIA82CXXX=y
-+# CONFIG_BLK_DEV_TC86C001 is not set
-+CONFIG_BLK_DEV_IDEDMA=y
-+CONFIG_IDE_ARCH_OBSOLETE_INIT=y
-+# CONFIG_BLK_DEV_HD is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+# CONFIG_MARVELL_PHY is not set
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+CONFIG_NET_PCI=y
-+# CONFIG_PCNET32 is not set
-+# CONFIG_AMD8111_ETH is not set
-+# CONFIG_ADAPTEC_STARFIRE is not set
-+# CONFIG_B44 is not set
-+# CONFIG_FORCEDETH is not set
-+# CONFIG_EEPRO100 is not set
-+CONFIG_E100=y
-+# CONFIG_FEALNX is not set
-+# CONFIG_NATSEMI is not set
-+# CONFIG_NE2K_PCI is not set
-+# CONFIG_8139CP is not set
-+# CONFIG_8139TOO is not set
-+# CONFIG_R6040 is not set
-+# CONFIG_SIS900 is not set
-+# CONFIG_EPIC100 is not set
-+# CONFIG_SUNDANCE is not set
-+# CONFIG_TLAN is not set
-+# CONFIG_VIA_RHINE is not set
-+# CONFIG_SC92031 is not set
-+# CONFIG_FS_ENET is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+CONFIG_SERIAL_CPM=y
-+CONFIG_SERIAL_CPM_CONSOLE=y
-+CONFIG_SERIAL_CPM_SCC1=y
-+# CONFIG_SERIAL_CPM_SCC2 is not set
-+# CONFIG_SERIAL_CPM_SCC3 is not set
-+# CONFIG_SERIAL_CPM_SCC4 is not set
-+# CONFIG_SERIAL_CPM_SMC1 is not set
-+# CONFIG_SERIAL_CPM_SMC2 is not set
-+# CONFIG_SERIAL_JSM is not set
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+CONFIG_HW_RANDOM=y
-+# CONFIG_NVRAM is not set
-+CONFIG_GEN_RTC=y
-+# CONFIG_GEN_RTC_X is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_ALI1535 is not set
-+# CONFIG_I2C_ALI1563 is not set
-+# CONFIG_I2C_ALI15X3 is not set
-+# CONFIG_I2C_AMD756 is not set
-+# CONFIG_I2C_AMD8111 is not set
-+# CONFIG_I2C_I801 is not set
-+# CONFIG_I2C_I810 is not set
-+# CONFIG_I2C_PIIX4 is not set
-+CONFIG_I2C_MPC=y
-+# CONFIG_I2C_NFORCE2 is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_PROSAVAGE is not set
-+# CONFIG_I2C_SAVAGE4 is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_SIS5595 is not set
-+# CONFIG_I2C_SIS630 is not set
-+# CONFIG_I2C_SIS96X is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_VIA is not set
-+# CONFIG_I2C_VIAPRO is not set
-+# CONFIG_I2C_VOODOO3 is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+# CONFIG_I2C_DEBUG_CORE is not set
-+# CONFIG_I2C_DEBUG_ALGO is not set
-+# CONFIG_I2C_DEBUG_BUS is not set
-+# CONFIG_I2C_DEBUG_CHIP is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ADT7473 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_I5K_AMB is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S is not set
-+# CONFIG_SENSORS_GL518SM is not set
-+# CONFIG_SENSORS_GL520SM is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_LM63 is not set
-+CONFIG_SENSORS_LM75=y
-+# CONFIG_SENSORS_LM77 is not set
-+# CONFIG_SENSORS_LM78 is not set
-+# CONFIG_SENSORS_LM80 is not set
-+# CONFIG_SENSORS_LM83 is not set
-+# CONFIG_SENSORS_LM85 is not set
-+# 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_SIS5595 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_ADS7828 is not set
-+# CONFIG_SENSORS_THMC50 is not set
-+# CONFIG_SENSORS_VIA686A is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_VT8231 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83L786NG is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+CONFIG_HWMON_DEBUG_CHIP=y
-+# CONFIG_THERMAL is not set
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+CONFIG_EXT3_FS_XATTR=y
-+# CONFIG_EXT3_FS_POSIX_ACL is not set
-+# CONFIG_EXT3_FS_SECURITY is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+# CONFIG_MSDOS_FS is not set
-+# CONFIG_VFAT_FS is not set
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+CONFIG_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-+# CONFIG_JFFS2_SUMMARY is not set
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+# CONFIG_JFFS2_LZO is not set
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+CONFIG_CRAMFS=y
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+# CONFIG_NFS_V3 is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+# CONFIG_MSDOS_PARTITION is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# 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
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+# CONFIG_DEBUG_KERNEL is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_KGDB_CONSOLE is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+# CONFIG_CRYPTO_MANAGER is not set
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+# CONFIG_CRYPTO_MD5 is not set
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+# CONFIG_CRYPTO_CBC is not set
-+# CONFIG_CRYPTO_PCBC is not set
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+# CONFIG_CRYPTO_DES is not set
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
-+CONFIG_PPC_LIB_RHEAP=y
---- /dev/null
-+++ b/arch/powerpc/configs/85xx/tqm8555_defconfig
-@@ -0,0 +1,1109 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Mon Mar 24 08:48:44 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+CONFIG_PPC_85xx=y
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_E500=y
-+CONFIG_BOOKE=y
-+CONFIG_FSL_BOOKE=y
-+CONFIG_FSL_EMB_PERFMON=y
-+# CONFIG_PHYS_64BIT is not set
-+CONFIG_SPE=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+# CONFIG_KALLSYMS is not set
-+# CONFIG_HOTPLUG is not set
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+# CONFIG_EPOLL is not set
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+# CONFIG_MODULES is not set
-+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
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_AS=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="anticipatory"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC85xx=y
-+# CONFIG_MPC8540_ADS is not set
-+# CONFIG_MPC8560_ADS is not set
-+# CONFIG_MPC85xx_CDS is not set
-+# CONFIG_MPC85xx_MDS is not set
-+# CONFIG_MPC85xx_DS is not set
-+# CONFIG_STX_GP3 is not set
-+# CONFIG_TQM8540 is not set
-+# CONFIG_TQM8541 is not set
-+CONFIG_TQM8555=y
-+# CONFIG_TQM8560 is not set
-+# CONFIG_SBC8548 is not set
-+# CONFIG_SBC8560 is not set
-+CONFIG_TQM85xx=y
-+# CONFIG_IPIC is not set
-+CONFIG_MPIC=y
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+CONFIG_CPM2=y
-+CONFIG_PPC_CPM_NEW_BINDING=y
-+# CONFIG_FSL_ULI1575 is not set
-+CONFIG_CPM=y
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+CONFIG_MATH_EMULATION=y
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+# CONFIG_PROC_DEVICETREE is not set
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_FSL_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+CONFIG_INET_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+CONFIG_MTD_CONCAT=y
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+# CONFIG_MTD_OF_PARTS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+CONFIG_MTD_BLOCK=y
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+# CONFIG_MTD_CFI_INTELEXT is not set
-+CONFIG_MTD_CFI_AMDSTD=y
-+# CONFIG_MTD_CFI_STAA is not set
-+CONFIG_MTD_CFI_UTIL=y
-+# CONFIG_MTD_RAM is not set
-+# CONFIG_MTD_ROM is not set
-+# CONFIG_MTD_ABSENT is not set
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+# CONFIG_MTD_PHYSMAP_OF is not set
-+# CONFIG_MTD_INTEL_VR_NOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_PMC551 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+# CONFIG_MTD_NAND is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+CONFIG_IDE=y
-+CONFIG_IDE_MAX_HWIFS=4
-+CONFIG_BLK_DEV_IDE=y
-+
-+#
-+# Please see Documentation/ide/ide.txt for help/info on IDE drives
-+#
-+# CONFIG_BLK_DEV_IDE_SATA is not set
-+CONFIG_BLK_DEV_IDEDISK=y
-+# CONFIG_IDEDISK_MULTI_MODE is not set
-+# CONFIG_BLK_DEV_IDECD is not set
-+# CONFIG_BLK_DEV_IDETAPE is not set
-+# CONFIG_BLK_DEV_IDEFLOPPY is not set
-+# CONFIG_IDE_TASK_IOCTL is not set
-+CONFIG_IDE_PROC_FS=y
-+
-+#
-+# IDE chipset support/bugfixes
-+#
-+CONFIG_IDE_GENERIC=y
-+# CONFIG_BLK_DEV_PLATFORM is not set
-+CONFIG_BLK_DEV_IDEDMA_SFF=y
-+
-+#
-+# PCI IDE chipsets support
-+#
-+CONFIG_BLK_DEV_IDEPCI=y
-+CONFIG_IDEPCI_PCIBUS_ORDER=y
-+# CONFIG_BLK_DEV_OFFBOARD is not set
-+CONFIG_BLK_DEV_GENERIC=y
-+# CONFIG_BLK_DEV_OPTI621 is not set
-+CONFIG_BLK_DEV_IDEDMA_PCI=y
-+# CONFIG_BLK_DEV_AEC62XX is not set
-+# CONFIG_BLK_DEV_ALI15X3 is not set
-+# CONFIG_BLK_DEV_AMD74XX is not set
-+# CONFIG_BLK_DEV_CMD64X is not set
-+# CONFIG_BLK_DEV_TRIFLEX is not set
-+# CONFIG_BLK_DEV_CY82C693 is not set
-+# CONFIG_BLK_DEV_CS5520 is not set
-+# CONFIG_BLK_DEV_CS5530 is not set
-+# CONFIG_BLK_DEV_HPT34X is not set
-+# CONFIG_BLK_DEV_HPT366 is not set
-+# CONFIG_BLK_DEV_JMICRON is not set
-+# CONFIG_BLK_DEV_SC1200 is not set
-+# CONFIG_BLK_DEV_PIIX is not set
-+# CONFIG_BLK_DEV_IT8213 is not set
-+# CONFIG_BLK_DEV_IT821X is not set
-+# CONFIG_BLK_DEV_NS87415 is not set
-+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
-+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
-+# CONFIG_BLK_DEV_SVWKS is not set
-+# CONFIG_BLK_DEV_SIIMAGE is not set
-+# CONFIG_BLK_DEV_SL82C105 is not set
-+# CONFIG_BLK_DEV_SLC90E66 is not set
-+# CONFIG_BLK_DEV_TRM290 is not set
-+CONFIG_BLK_DEV_VIA82CXXX=y
-+# CONFIG_BLK_DEV_TC86C001 is not set
-+CONFIG_BLK_DEV_IDEDMA=y
-+CONFIG_IDE_ARCH_OBSOLETE_INIT=y
-+# CONFIG_BLK_DEV_HD is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+# CONFIG_MARVELL_PHY is not set
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+CONFIG_NET_PCI=y
-+# CONFIG_PCNET32 is not set
-+# CONFIG_AMD8111_ETH is not set
-+# CONFIG_ADAPTEC_STARFIRE is not set
-+# CONFIG_B44 is not set
-+# CONFIG_FORCEDETH is not set
-+# CONFIG_EEPRO100 is not set
-+CONFIG_E100=y
-+# CONFIG_FEALNX is not set
-+# CONFIG_NATSEMI is not set
-+# CONFIG_NE2K_PCI is not set
-+# CONFIG_8139CP is not set
-+# CONFIG_8139TOO is not set
-+# CONFIG_R6040 is not set
-+# CONFIG_SIS900 is not set
-+# CONFIG_EPIC100 is not set
-+# CONFIG_SUNDANCE is not set
-+# CONFIG_TLAN is not set
-+# CONFIG_VIA_RHINE is not set
-+# CONFIG_SC92031 is not set
-+# CONFIG_FS_ENET is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+CONFIG_SERIAL_CPM=y
-+CONFIG_SERIAL_CPM_CONSOLE=y
-+CONFIG_SERIAL_CPM_SCC1=y
-+# CONFIG_SERIAL_CPM_SCC2 is not set
-+# CONFIG_SERIAL_CPM_SCC3 is not set
-+# CONFIG_SERIAL_CPM_SCC4 is not set
-+# CONFIG_SERIAL_CPM_SMC1 is not set
-+# CONFIG_SERIAL_CPM_SMC2 is not set
-+# CONFIG_SERIAL_JSM is not set
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+CONFIG_HW_RANDOM=y
-+# CONFIG_NVRAM is not set
-+CONFIG_GEN_RTC=y
-+# CONFIG_GEN_RTC_X is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_ALI1535 is not set
-+# CONFIG_I2C_ALI1563 is not set
-+# CONFIG_I2C_ALI15X3 is not set
-+# CONFIG_I2C_AMD756 is not set
-+# CONFIG_I2C_AMD8111 is not set
-+# CONFIG_I2C_I801 is not set
-+# CONFIG_I2C_I810 is not set
-+# CONFIG_I2C_PIIX4 is not set
-+CONFIG_I2C_MPC=y
-+# CONFIG_I2C_NFORCE2 is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_PROSAVAGE is not set
-+# CONFIG_I2C_SAVAGE4 is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_SIS5595 is not set
-+# CONFIG_I2C_SIS630 is not set
-+# CONFIG_I2C_SIS96X is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_VIA is not set
-+# CONFIG_I2C_VIAPRO is not set
-+# CONFIG_I2C_VOODOO3 is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+# CONFIG_I2C_DEBUG_CORE is not set
-+# CONFIG_I2C_DEBUG_ALGO is not set
-+# CONFIG_I2C_DEBUG_BUS is not set
-+# CONFIG_I2C_DEBUG_CHIP is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ADT7473 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_I5K_AMB is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S is not set
-+# CONFIG_SENSORS_GL518SM is not set
-+# CONFIG_SENSORS_GL520SM is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_LM63 is not set
-+CONFIG_SENSORS_LM75=y
-+# CONFIG_SENSORS_LM77 is not set
-+# CONFIG_SENSORS_LM78 is not set
-+# CONFIG_SENSORS_LM80 is not set
-+# CONFIG_SENSORS_LM83 is not set
-+# CONFIG_SENSORS_LM85 is not set
-+# 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_SIS5595 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_ADS7828 is not set
-+# CONFIG_SENSORS_THMC50 is not set
-+# CONFIG_SENSORS_VIA686A is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_VT8231 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83L786NG is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+CONFIG_HWMON_DEBUG_CHIP=y
-+# CONFIG_THERMAL is not set
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+CONFIG_EXT3_FS_XATTR=y
-+# CONFIG_EXT3_FS_POSIX_ACL is not set
-+# CONFIG_EXT3_FS_SECURITY is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+# CONFIG_MSDOS_FS is not set
-+# CONFIG_VFAT_FS is not set
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+CONFIG_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-+# CONFIG_JFFS2_SUMMARY is not set
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+# CONFIG_JFFS2_LZO is not set
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+CONFIG_CRAMFS=y
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+# CONFIG_NFS_V3 is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+# CONFIG_MSDOS_PARTITION is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# 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
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+# CONFIG_DEBUG_KERNEL is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_KGDB_CONSOLE is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+# CONFIG_CRYPTO_MANAGER is not set
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+# CONFIG_CRYPTO_MD5 is not set
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+# CONFIG_CRYPTO_CBC is not set
-+# CONFIG_CRYPTO_PCBC is not set
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+# CONFIG_CRYPTO_DES is not set
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
-+CONFIG_PPC_LIB_RHEAP=y
---- /dev/null
-+++ b/arch/powerpc/configs/85xx/tqm8560_defconfig
-@@ -0,0 +1,1109 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Mon Mar 24 08:48:45 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+CONFIG_PPC_85xx=y
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_E500=y
-+CONFIG_BOOKE=y
-+CONFIG_FSL_BOOKE=y
-+CONFIG_FSL_EMB_PERFMON=y
-+# CONFIG_PHYS_64BIT is not set
-+CONFIG_SPE=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+# CONFIG_KALLSYMS is not set
-+# CONFIG_HOTPLUG is not set
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+# CONFIG_EPOLL is not set
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+# CONFIG_MODULES is not set
-+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
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_AS=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="anticipatory"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC85xx=y
-+# CONFIG_MPC8540_ADS is not set
-+# CONFIG_MPC8560_ADS is not set
-+# CONFIG_MPC85xx_CDS is not set
-+# CONFIG_MPC85xx_MDS is not set
-+# CONFIG_MPC85xx_DS is not set
-+# CONFIG_STX_GP3 is not set
-+# CONFIG_TQM8540 is not set
-+# CONFIG_TQM8541 is not set
-+# CONFIG_TQM8555 is not set
-+CONFIG_TQM8560=y
-+# CONFIG_SBC8548 is not set
-+# CONFIG_SBC8560 is not set
-+CONFIG_TQM85xx=y
-+# CONFIG_IPIC is not set
-+CONFIG_MPIC=y
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+CONFIG_CPM2=y
-+CONFIG_PPC_CPM_NEW_BINDING=y
-+# CONFIG_FSL_ULI1575 is not set
-+CONFIG_CPM=y
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+CONFIG_MATH_EMULATION=y
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+# CONFIG_PROC_DEVICETREE is not set
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_FSL_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+CONFIG_INET_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+CONFIG_MTD_CONCAT=y
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+# CONFIG_MTD_OF_PARTS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+CONFIG_MTD_BLOCK=y
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+# CONFIG_MTD_CFI_INTELEXT is not set
-+CONFIG_MTD_CFI_AMDSTD=y
-+# CONFIG_MTD_CFI_STAA is not set
-+CONFIG_MTD_CFI_UTIL=y
-+# CONFIG_MTD_RAM is not set
-+# CONFIG_MTD_ROM is not set
-+# CONFIG_MTD_ABSENT is not set
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+# CONFIG_MTD_PHYSMAP_OF is not set
-+# CONFIG_MTD_INTEL_VR_NOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_PMC551 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+# CONFIG_MTD_NAND is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+CONFIG_IDE=y
-+CONFIG_IDE_MAX_HWIFS=4
-+CONFIG_BLK_DEV_IDE=y
-+
-+#
-+# Please see Documentation/ide/ide.txt for help/info on IDE drives
-+#
-+# CONFIG_BLK_DEV_IDE_SATA is not set
-+CONFIG_BLK_DEV_IDEDISK=y
-+# CONFIG_IDEDISK_MULTI_MODE is not set
-+# CONFIG_BLK_DEV_IDECD is not set
-+# CONFIG_BLK_DEV_IDETAPE is not set
-+# CONFIG_BLK_DEV_IDEFLOPPY is not set
-+# CONFIG_IDE_TASK_IOCTL is not set
-+CONFIG_IDE_PROC_FS=y
-+
-+#
-+# IDE chipset support/bugfixes
-+#
-+CONFIG_IDE_GENERIC=y
-+# CONFIG_BLK_DEV_PLATFORM is not set
-+CONFIG_BLK_DEV_IDEDMA_SFF=y
-+
-+#
-+# PCI IDE chipsets support
-+#
-+CONFIG_BLK_DEV_IDEPCI=y
-+CONFIG_IDEPCI_PCIBUS_ORDER=y
-+# CONFIG_BLK_DEV_OFFBOARD is not set
-+CONFIG_BLK_DEV_GENERIC=y
-+# CONFIG_BLK_DEV_OPTI621 is not set
-+CONFIG_BLK_DEV_IDEDMA_PCI=y
-+# CONFIG_BLK_DEV_AEC62XX is not set
-+# CONFIG_BLK_DEV_ALI15X3 is not set
-+# CONFIG_BLK_DEV_AMD74XX is not set
-+# CONFIG_BLK_DEV_CMD64X is not set
-+# CONFIG_BLK_DEV_TRIFLEX is not set
-+# CONFIG_BLK_DEV_CY82C693 is not set
-+# CONFIG_BLK_DEV_CS5520 is not set
-+# CONFIG_BLK_DEV_CS5530 is not set
-+# CONFIG_BLK_DEV_HPT34X is not set
-+# CONFIG_BLK_DEV_HPT366 is not set
-+# CONFIG_BLK_DEV_JMICRON is not set
-+# CONFIG_BLK_DEV_SC1200 is not set
-+# CONFIG_BLK_DEV_PIIX is not set
-+# CONFIG_BLK_DEV_IT8213 is not set
-+# CONFIG_BLK_DEV_IT821X is not set
-+# CONFIG_BLK_DEV_NS87415 is not set
-+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
-+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
-+# CONFIG_BLK_DEV_SVWKS is not set
-+# CONFIG_BLK_DEV_SIIMAGE is not set
-+# CONFIG_BLK_DEV_SL82C105 is not set
-+# CONFIG_BLK_DEV_SLC90E66 is not set
-+# CONFIG_BLK_DEV_TRM290 is not set
-+CONFIG_BLK_DEV_VIA82CXXX=y
-+# CONFIG_BLK_DEV_TC86C001 is not set
-+CONFIG_BLK_DEV_IDEDMA=y
-+CONFIG_IDE_ARCH_OBSOLETE_INIT=y
-+# CONFIG_BLK_DEV_HD is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+# CONFIG_MARVELL_PHY is not set
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+CONFIG_NET_PCI=y
-+# CONFIG_PCNET32 is not set
-+# CONFIG_AMD8111_ETH is not set
-+# CONFIG_ADAPTEC_STARFIRE is not set
-+# CONFIG_B44 is not set
-+# CONFIG_FORCEDETH is not set
-+# CONFIG_EEPRO100 is not set
-+CONFIG_E100=y
-+# CONFIG_FEALNX is not set
-+# CONFIG_NATSEMI is not set
-+# CONFIG_NE2K_PCI is not set
-+# CONFIG_8139CP is not set
-+# CONFIG_8139TOO is not set
-+# CONFIG_R6040 is not set
-+# CONFIG_SIS900 is not set
-+# CONFIG_EPIC100 is not set
-+# CONFIG_SUNDANCE is not set
-+# CONFIG_TLAN is not set
-+# CONFIG_VIA_RHINE is not set
-+# CONFIG_SC92031 is not set
-+# CONFIG_FS_ENET is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+CONFIG_SERIAL_CPM=y
-+CONFIG_SERIAL_CPM_CONSOLE=y
-+CONFIG_SERIAL_CPM_SCC1=y
-+# CONFIG_SERIAL_CPM_SCC2 is not set
-+# CONFIG_SERIAL_CPM_SCC3 is not set
-+# CONFIG_SERIAL_CPM_SCC4 is not set
-+# CONFIG_SERIAL_CPM_SMC1 is not set
-+# CONFIG_SERIAL_CPM_SMC2 is not set
-+# CONFIG_SERIAL_JSM is not set
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+CONFIG_HW_RANDOM=y
-+# CONFIG_NVRAM is not set
-+CONFIG_GEN_RTC=y
-+# CONFIG_GEN_RTC_X is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_ALI1535 is not set
-+# CONFIG_I2C_ALI1563 is not set
-+# CONFIG_I2C_ALI15X3 is not set
-+# CONFIG_I2C_AMD756 is not set
-+# CONFIG_I2C_AMD8111 is not set
-+# CONFIG_I2C_I801 is not set
-+# CONFIG_I2C_I810 is not set
-+# CONFIG_I2C_PIIX4 is not set
-+CONFIG_I2C_MPC=y
-+# CONFIG_I2C_NFORCE2 is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_PROSAVAGE is not set
-+# CONFIG_I2C_SAVAGE4 is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_SIS5595 is not set
-+# CONFIG_I2C_SIS630 is not set
-+# CONFIG_I2C_SIS96X is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_VIA is not set
-+# CONFIG_I2C_VIAPRO is not set
-+# CONFIG_I2C_VOODOO3 is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+# CONFIG_I2C_DEBUG_CORE is not set
-+# CONFIG_I2C_DEBUG_ALGO is not set
-+# CONFIG_I2C_DEBUG_BUS is not set
-+# CONFIG_I2C_DEBUG_CHIP is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ADT7473 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_I5K_AMB is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S is not set
-+# CONFIG_SENSORS_GL518SM is not set
-+# CONFIG_SENSORS_GL520SM is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_LM63 is not set
-+CONFIG_SENSORS_LM75=y
-+# CONFIG_SENSORS_LM77 is not set
-+# CONFIG_SENSORS_LM78 is not set
-+# CONFIG_SENSORS_LM80 is not set
-+# CONFIG_SENSORS_LM83 is not set
-+# CONFIG_SENSORS_LM85 is not set
-+# 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_SIS5595 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_ADS7828 is not set
-+# CONFIG_SENSORS_THMC50 is not set
-+# CONFIG_SENSORS_VIA686A is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_VT8231 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83L786NG is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+CONFIG_HWMON_DEBUG_CHIP=y
-+# CONFIG_THERMAL is not set
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+CONFIG_EXT3_FS_XATTR=y
-+# CONFIG_EXT3_FS_POSIX_ACL is not set
-+# CONFIG_EXT3_FS_SECURITY is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+# CONFIG_MSDOS_FS is not set
-+# CONFIG_VFAT_FS is not set
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+CONFIG_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-+# CONFIG_JFFS2_SUMMARY is not set
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+# CONFIG_JFFS2_LZO is not set
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+CONFIG_CRAMFS=y
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+# CONFIG_NFS_V3 is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+# CONFIG_MSDOS_PARTITION is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# 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
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+# CONFIG_DEBUG_KERNEL is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_KGDB_CONSOLE is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+# CONFIG_CRYPTO_MANAGER is not set
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+# CONFIG_CRYPTO_MD5 is not set
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+# CONFIG_CRYPTO_CBC is not set
-+# CONFIG_CRYPTO_PCBC is not set
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+# CONFIG_CRYPTO_DES is not set
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
-+CONFIG_PPC_LIB_RHEAP=y
---- a/arch/powerpc/configs/bamboo_defconfig
-+++ /dev/null
-@@ -1,815 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc2
--# Fri Feb 15 21:36:39 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--CONFIG_44x=y
--# CONFIG_E200 is not set
--CONFIG_PPC_FPU=y
--CONFIG_4xx=y
--CONFIG_BOOKE=y
--CONFIG_PTE_64BIT=y
--CONFIG_PHYS_64BIT=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_NOT_COHERENT_CACHE=y
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--# CONFIG_DEFAULT_UIMAGE is not set
--CONFIG_PPC_DCR_NATIVE=y
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_PPC_DCR=y
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--CONFIG_POSIX_MQUEUE=y
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--CONFIG_FAIR_GROUP_SCHED=y
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--CONFIG_KALLSYMS=y
--# CONFIG_KALLSYMS_ALL is not set
--# CONFIG_KALLSYMS_EXTRA_PASS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=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 is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--# CONFIG_KPROBES is not set
--CONFIG_HAVE_KPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--CONFIG_KMOD=y
--CONFIG_BLOCK=y
--CONFIG_LBD=y
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--CONFIG_DEFAULT_AS=y
--# CONFIG_DEFAULT_DEADLINE is not set
--# CONFIG_DEFAULT_CFQ is not set
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="anticipatory"
--CONFIG_CLASSIC_RCU=y
--# CONFIG_PREEMPT_RCU is not set
--# CONFIG_PPC4xx_PCI_EXPRESS is not set
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_BAMBOO=y
--# CONFIG_EBONY is not set
--# CONFIG_SEQUOIA is not set
--# CONFIG_TAISHAN is not set
--# CONFIG_KATMAI is not set
--# CONFIG_RAINIER is not set
--# CONFIG_WARP is not set
--CONFIG_440EP=y
--CONFIG_IBM440EP_ERR42=y
--# CONFIG_IPIC is not set
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_RCU_TRACE=y
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--# CONFIG_MATH_EMULATION is not set
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--CONFIG_RESOURCES_64BIT=y
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--CONFIG_CMDLINE_BOOL=y
--CONFIG_CMDLINE=""
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCI_DEBUG is not set
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_CONSISTENT_START=0xff100000
--CONFIG_CONSISTENT_SIZE=0x00200000
--CONFIG_BOOT_LOAD=0x01000000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--# CONFIG_IP_MULTICAST is not set
--# CONFIG_IP_ADVANCED_ROUTER is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_PNP=y
--CONFIG_IP_PNP_DHCP=y
--CONFIG_IP_PNP_BOOTP=y
--# CONFIG_IP_PNP_RARP is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_ARPD is not set
--# CONFIG_SYN_COOKIES is not set
--# CONFIG_INET_AH is not set
--# CONFIG_INET_ESP is not set
--# CONFIG_INET_IPCOMP is not set
--# CONFIG_INET_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
--# CONFIG_INET_XFRM_MODE_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_BEET is not set
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--# CONFIG_BRIDGE is not set
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--# CONFIG_LLC2 is not set
--# CONFIG_IPX is not set
--# CONFIG_ATALK is not set
--# CONFIG_X25 is not set
--# CONFIG_LAPB is not set
--# CONFIG_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--CONFIG_FW_LOADER=y
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--CONFIG_CONNECTOR=y
--CONFIG_PROC_EVENTS=y
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--# CONFIG_BLK_DEV_LOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=35000
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--# CONFIG_XILINX_SYSACE is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--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 is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--# CONFIG_PHYLIB is not set
--CONFIG_NET_ETHERNET=y
--# CONFIG_MII is not set
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--CONFIG_IBM_NEW_EMAC=y
--CONFIG_IBM_NEW_EMAC_RXB=128
--CONFIG_IBM_NEW_EMAC_TXB=64
--CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
--CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
--CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
--# CONFIG_IBM_NEW_EMAC_DEBUG is not set
--CONFIG_IBM_NEW_EMAC_ZMII=y
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--# CONFIG_INPUT is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--# CONFIG_SERIAL_8250_PCI is not set
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--CONFIG_SERIAL_8250_EXTENDED=y
--# CONFIG_SERIAL_8250_MANY_PORTS is not set
--CONFIG_SERIAL_8250_SHARE_IRQ=y
--# CONFIG_SERIAL_8250_DETECT_IRQ is not set
--# CONFIG_SERIAL_8250_RSA is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--CONFIG_SERIAL_OF_PLATFORM=y
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--# CONFIG_I2C is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--# CONFIG_HWMON is not set
--CONFIG_THERMAL=y
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=m
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--# CONFIG_EXT3_FS is not set
--# CONFIG_EXT4DEV_FS is not set
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# CONFIG_AUTOFS_FS is not set
--# CONFIG_AUTOFS4_FS is not set
--# CONFIG_FUSE_FS is not set
--
--#
--# CD-ROM/DVD Filesystems
--#
--# CONFIG_ISO9660_FS is not set
--# CONFIG_UDF_FS is not set
--
--#
--# DOS/FAT/NT Filesystems
--#
--# CONFIG_MSDOS_FS is not set
--# CONFIG_VFAT_FS is not set
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
--
--#
--# Miscellaneous filesystems
--#
--# CONFIG_ADFS_FS is not set
--# CONFIG_AFFS_FS is not set
--# CONFIG_HFS_FS is not set
--# CONFIG_HFSPLUS_FS is not set
--# CONFIG_BEFS_FS is not set
--# CONFIG_BFS_FS is not set
--# CONFIG_EFS_FS is not set
--CONFIG_CRAMFS=y
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--# CONFIG_PARTITION_ADVANCED is not set
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# 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_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--CONFIG_MAGIC_SYSRQ=y
--# CONFIG_UNUSED_SYMBOLS is not set
--CONFIG_DEBUG_FS=y
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_DEBUG_INFO is not set
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--CONFIG_DEBUGGER=y
--# CONFIG_KGDB is not set
--# CONFIG_XMON is not set
--# CONFIG_VIRQ_DEBUG is not set
--# CONFIG_BDI_SWITCH is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--CONFIG_CRYPTO_MD5=y
--# CONFIG_CRYPTO_SHA1 is not set
--# CONFIG_CRYPTO_SHA256 is not set
--# CONFIG_CRYPTO_SHA512 is not set
--# CONFIG_CRYPTO_WP512 is not set
--# CONFIG_CRYPTO_TGR192 is not set
--# CONFIG_CRYPTO_GF128MUL is not set
--CONFIG_CRYPTO_ECB=y
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=y
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# CONFIG_CRYPTO_BLOWFISH is not set
--# CONFIG_CRYPTO_TWOFISH is not set
--# CONFIG_CRYPTO_SERPENT is not set
--# CONFIG_CRYPTO_AES is not set
--# CONFIG_CRYPTO_CAST5 is not set
--# CONFIG_CRYPTO_CAST6 is not set
--# CONFIG_CRYPTO_TEA is not set
--# CONFIG_CRYPTO_ARC4 is not set
--# CONFIG_CRYPTO_KHAZAD is not set
--# CONFIG_CRYPTO_ANUBIS is not set
--# CONFIG_CRYPTO_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/chrp32_defconfig
-+++ b/arch/powerpc/configs/chrp32_defconfig
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
- # Linux kernel version: 2.6.25-rc6
--# Thu Mar 20 10:33:36 2008
-+# Thu Mar 27 13:55:37 2008
- #
- # CONFIG_PPC64 is not set
- 
-@@ -74,8 +74,6 @@ CONFIG_IKCONFIG_PROC=y
- CONFIG_LOG_BUF_SHIFT=15
- # CONFIG_CGROUPS is not set
- # CONFIG_GROUP_SCHED is not set
--# CONFIG_USER_SCHED is not set
--# CONFIG_CGROUP_SCHED is not set
- CONFIG_SYSFS_DEPRECATED=y
- CONFIG_SYSFS_DEPRECATED_V2=y
- # CONFIG_RELAY is not set
-@@ -243,7 +241,7 @@ CONFIG_PCI_SYSCALL=y
- # CONFIG_PCIEPORTBUS is not set
- CONFIG_ARCH_SUPPORTS_MSI=y
- # CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_LEGACY is not set
- # CONFIG_PCI_DEBUG is not set
- # CONFIG_PCCARD is not set
- # CONFIG_HOTPLUG_PCI is not set
-@@ -1328,6 +1326,7 @@ CONFIG_PLIST=y
- CONFIG_HAS_IOMEM=y
- CONFIG_HAS_IOPORT=y
- CONFIG_HAS_DMA=y
-+CONFIG_HAVE_LMB=y
- 
- #
- # Kernel hacking
---- a/arch/powerpc/configs/ebony_defconfig
-+++ /dev/null
-@@ -1,898 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc2
--# Fri Feb 15 21:50:44 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--CONFIG_44x=y
--# CONFIG_E200 is not set
--CONFIG_4xx=y
--CONFIG_BOOKE=y
--CONFIG_PTE_64BIT=y
--CONFIG_PHYS_64BIT=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_NOT_COHERENT_CACHE=y
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--# CONFIG_DEFAULT_UIMAGE is not set
--CONFIG_PPC_DCR_NATIVE=y
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_PPC_DCR=y
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--CONFIG_POSIX_MQUEUE=y
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--CONFIG_FAIR_GROUP_SCHED=y
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--CONFIG_KALLSYMS=y
--CONFIG_KALLSYMS_ALL=y
--CONFIG_KALLSYMS_EXTRA_PASS=y
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=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 is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--# CONFIG_KPROBES is not set
--CONFIG_HAVE_KPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--CONFIG_KMOD=y
--CONFIG_BLOCK=y
--CONFIG_LBD=y
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--CONFIG_DEFAULT_AS=y
--# CONFIG_DEFAULT_DEADLINE is not set
--# CONFIG_DEFAULT_CFQ is not set
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="anticipatory"
--CONFIG_CLASSIC_RCU=y
--# CONFIG_PREEMPT_RCU is not set
--# CONFIG_PPC4xx_PCI_EXPRESS is not set
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--# CONFIG_BAMBOO is not set
--CONFIG_EBONY=y
--# CONFIG_SEQUOIA is not set
--# CONFIG_TAISHAN is not set
--# CONFIG_KATMAI is not set
--# CONFIG_RAINIER is not set
--# CONFIG_WARP is not set
--CONFIG_440GP=y
--# CONFIG_IPIC is not set
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_FSL_ULI1575 is not set
--CONFIG_OF_RTC=y
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_RCU_TRACE=y
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--CONFIG_MATH_EMULATION=y
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--CONFIG_RESOURCES_64BIT=y
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCI_DEBUG is not set
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_CONSISTENT_START=0xff100000
--CONFIG_CONSISTENT_SIZE=0x00200000
--CONFIG_BOOT_LOAD=0x01000000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--# CONFIG_IP_MULTICAST is not set
--# CONFIG_IP_ADVANCED_ROUTER is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_PNP=y
--CONFIG_IP_PNP_DHCP=y
--CONFIG_IP_PNP_BOOTP=y
--# CONFIG_IP_PNP_RARP is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_ARPD is not set
--# CONFIG_SYN_COOKIES is not set
--# CONFIG_INET_AH is not set
--# CONFIG_INET_ESP is not set
--# CONFIG_INET_IPCOMP is not set
--# CONFIG_INET_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
--# CONFIG_INET_XFRM_MODE_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_BEET is not set
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--# CONFIG_BRIDGE is not set
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--# CONFIG_LLC2 is not set
--# CONFIG_IPX is not set
--# CONFIG_ATALK is not set
--# CONFIG_X25 is not set
--# CONFIG_LAPB is not set
--# CONFIG_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--CONFIG_FW_LOADER=y
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--CONFIG_CONNECTOR=y
--CONFIG_PROC_EVENTS=y
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--# CONFIG_MTD_CONCAT is not set
--CONFIG_MTD_PARTITIONS=y
--# CONFIG_MTD_REDBOOT_PARTS is not set
--# CONFIG_MTD_CMDLINE_PARTS is not set
--CONFIG_MTD_OF_PARTS=y
--
--#
--# User Modules And Translation Layers
--#
--CONFIG_MTD_CHAR=y
--CONFIG_MTD_BLKDEVS=y
--CONFIG_MTD_BLOCK=y
--# CONFIG_FTL is not set
--# CONFIG_NFTL is not set
--# CONFIG_INFTL is not set
--# CONFIG_RFD_FTL is not set
--# CONFIG_SSFDC is not set
--# CONFIG_MTD_OOPS is not set
--
--#
--# RAM/ROM/Flash chip drivers
--#
--CONFIG_MTD_CFI=y
--CONFIG_MTD_JEDECPROBE=y
--CONFIG_MTD_GEN_PROBE=y
--# CONFIG_MTD_CFI_ADV_OPTIONS is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--CONFIG_MTD_MAP_BANK_WIDTH_4=y
--# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
--CONFIG_MTD_CFI_I1=y
--CONFIG_MTD_CFI_I2=y
--# CONFIG_MTD_CFI_I4 is not set
--# CONFIG_MTD_CFI_I8 is not set
--# CONFIG_MTD_CFI_INTELEXT is not set
--CONFIG_MTD_CFI_AMDSTD=y
--# CONFIG_MTD_CFI_STAA is not set
--CONFIG_MTD_CFI_UTIL=y
--# CONFIG_MTD_RAM is not set
--# CONFIG_MTD_ROM is not set
--# CONFIG_MTD_ABSENT is not set
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--# CONFIG_MTD_PHYSMAP is not set
--CONFIG_MTD_PHYSMAP_OF=y
--# CONFIG_MTD_INTEL_VR_NOR is not set
--# CONFIG_MTD_PLATRAM is not set
--
--#
--# Self-contained MTD device drivers
--#
--# CONFIG_MTD_PMC551 is not set
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_MTDRAM is not set
--# CONFIG_MTD_BLOCK2MTD is not set
--
--#
--# Disk-On-Chip Device Drivers
--#
--# CONFIG_MTD_DOC2000 is not set
--# CONFIG_MTD_DOC2001 is not set
--# CONFIG_MTD_DOC2001PLUS is not set
--# CONFIG_MTD_NAND is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--# CONFIG_BLK_DEV_LOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=35000
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--# CONFIG_XILINX_SYSACE is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--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 is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--# CONFIG_PHYLIB is not set
--CONFIG_NET_ETHERNET=y
--# CONFIG_MII is not set
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--CONFIG_IBM_NEW_EMAC=y
--CONFIG_IBM_NEW_EMAC_RXB=128
--CONFIG_IBM_NEW_EMAC_TXB=64
--CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
--CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
--CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
--# CONFIG_IBM_NEW_EMAC_DEBUG is not set
--CONFIG_IBM_NEW_EMAC_ZMII=y
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--# CONFIG_INPUT is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--# CONFIG_SERIAL_8250_PCI is not set
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--CONFIG_SERIAL_8250_EXTENDED=y
--# CONFIG_SERIAL_8250_MANY_PORTS is not set
--CONFIG_SERIAL_8250_SHARE_IRQ=y
--# CONFIG_SERIAL_8250_DETECT_IRQ is not set
--# CONFIG_SERIAL_8250_RSA is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--CONFIG_SERIAL_OF_PLATFORM=y
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--# CONFIG_I2C is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--# CONFIG_HWMON is not set
--CONFIG_THERMAL=y
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--# CONFIG_DAB is not set
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--# CONFIG_VIDEO_OUTPUT_CONTROL is not set
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--# CONFIG_EXT3_FS is not set
--# CONFIG_EXT4DEV_FS is not set
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# CONFIG_AUTOFS_FS is not set
--# CONFIG_AUTOFS4_FS is not set
--# CONFIG_FUSE_FS is not set
--
--#
--# CD-ROM/DVD Filesystems
--#
--# CONFIG_ISO9660_FS is not set
--# CONFIG_UDF_FS is not set
--
--#
--# DOS/FAT/NT Filesystems
--#
--# CONFIG_MSDOS_FS is not set
--# CONFIG_VFAT_FS is not set
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
--
--#
--# Miscellaneous filesystems
--#
--# CONFIG_ADFS_FS is not set
--# CONFIG_AFFS_FS is not set
--# CONFIG_HFS_FS is not set
--# CONFIG_HFSPLUS_FS is not set
--# CONFIG_BEFS_FS is not set
--# CONFIG_BFS_FS is not set
--# CONFIG_EFS_FS is not set
--CONFIG_JFFS2_FS=y
--CONFIG_JFFS2_FS_DEBUG=0
--CONFIG_JFFS2_FS_WRITEBUFFER=y
--# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
--# CONFIG_JFFS2_SUMMARY is not set
--# CONFIG_JFFS2_FS_XATTR is not set
--# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
--CONFIG_JFFS2_ZLIB=y
--# CONFIG_JFFS2_LZO is not set
--CONFIG_JFFS2_RTIME=y
--# CONFIG_JFFS2_RUBIN is not set
--CONFIG_CRAMFS=y
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--# CONFIG_PARTITION_ADVANCED is not set
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# 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
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--CONFIG_MAGIC_SYSRQ=y
--# CONFIG_UNUSED_SYMBOLS is not set
--CONFIG_DEBUG_FS=y
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--CONFIG_DEBUG_BUGVERBOSE=y
--# CONFIG_DEBUG_INFO is not set
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--# CONFIG_DEBUGGER is not set
--# CONFIG_VIRQ_DEBUG is not set
--# CONFIG_BDI_SWITCH is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--CONFIG_CRYPTO_MD5=y
--# CONFIG_CRYPTO_SHA1 is not set
--# CONFIG_CRYPTO_SHA256 is not set
--# CONFIG_CRYPTO_SHA512 is not set
--# CONFIG_CRYPTO_WP512 is not set
--# CONFIG_CRYPTO_TGR192 is not set
--# CONFIG_CRYPTO_GF128MUL is not set
--CONFIG_CRYPTO_ECB=y
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=y
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# CONFIG_CRYPTO_BLOWFISH is not set
--# CONFIG_CRYPTO_TWOFISH is not set
--# CONFIG_CRYPTO_SERPENT is not set
--# CONFIG_CRYPTO_AES is not set
--# CONFIG_CRYPTO_CAST5 is not set
--# CONFIG_CRYPTO_CAST6 is not set
--# CONFIG_CRYPTO_TEA is not set
--# CONFIG_CRYPTO_ARC4 is not set
--# CONFIG_CRYPTO_KHAZAD is not set
--# CONFIG_CRYPTO_ANUBIS is not set
--# CONFIG_CRYPTO_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--# CONFIG_CRYPTO_HW is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/ep405_defconfig
-+++ /dev/null
-@@ -1,968 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc2
--# Fri Feb 15 21:50:09 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--CONFIG_40x=y
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_4xx=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_NOT_COHERENT_CACHE=y
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--# CONFIG_DEFAULT_UIMAGE is not set
--CONFIG_PPC_DCR_NATIVE=y
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_PPC_DCR=y
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--CONFIG_POSIX_MQUEUE=y
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--CONFIG_FAIR_GROUP_SCHED=y
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--CONFIG_KALLSYMS=y
--CONFIG_KALLSYMS_ALL=y
--CONFIG_KALLSYMS_EXTRA_PASS=y
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=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 is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--# CONFIG_KPROBES is not set
--CONFIG_HAVE_KPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--CONFIG_KMOD=y
--CONFIG_BLOCK=y
--CONFIG_LBD=y
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--CONFIG_DEFAULT_AS=y
--# CONFIG_DEFAULT_DEADLINE is not set
--# CONFIG_DEFAULT_CFQ is not set
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="anticipatory"
--CONFIG_CLASSIC_RCU=y
--# CONFIG_PREEMPT_RCU is not set
--# CONFIG_PPC4xx_PCI_EXPRESS is not set
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_EP405=y
--# CONFIG_KILAUEA is not set
--# CONFIG_MAKALU is not set
--# CONFIG_WALNUT is not set
--# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
--CONFIG_405GP=y
--CONFIG_IBM405_ERR77=y
--CONFIG_IBM405_ERR51=y
--# CONFIG_IPIC is not set
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_RCU_TRACE=y
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--# CONFIG_MATH_EMULATION is not set
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCI_DEBUG is not set
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_CONSISTENT_START=0xff100000
--CONFIG_CONSISTENT_SIZE=0x00200000
--CONFIG_BOOT_LOAD=0x00400000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--# CONFIG_IP_MULTICAST is not set
--# CONFIG_IP_ADVANCED_ROUTER is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_PNP=y
--CONFIG_IP_PNP_DHCP=y
--CONFIG_IP_PNP_BOOTP=y
--# CONFIG_IP_PNP_RARP is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_ARPD is not set
--# CONFIG_SYN_COOKIES is not set
--# CONFIG_INET_AH is not set
--# CONFIG_INET_ESP is not set
--# CONFIG_INET_IPCOMP is not set
--# CONFIG_INET_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
--# CONFIG_INET_XFRM_MODE_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_BEET is not set
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--# CONFIG_BRIDGE is not set
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--# CONFIG_LLC2 is not set
--# CONFIG_IPX is not set
--# CONFIG_ATALK is not set
--# CONFIG_X25 is not set
--# CONFIG_LAPB is not set
--# CONFIG_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--CONFIG_FW_LOADER=y
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--CONFIG_CONNECTOR=y
--CONFIG_PROC_EVENTS=y
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--# CONFIG_MTD_CONCAT is not set
--CONFIG_MTD_PARTITIONS=y
--# CONFIG_MTD_REDBOOT_PARTS is not set
--CONFIG_MTD_CMDLINE_PARTS=y
--CONFIG_MTD_OF_PARTS=y
--
--#
--# User Modules And Translation Layers
--#
--CONFIG_MTD_CHAR=y
--CONFIG_MTD_BLKDEVS=m
--CONFIG_MTD_BLOCK=m
--# CONFIG_MTD_BLOCK_RO is not set
--# CONFIG_FTL is not set
--# CONFIG_NFTL is not set
--# CONFIG_INFTL is not set
--# CONFIG_RFD_FTL is not set
--# CONFIG_SSFDC is not set
--# CONFIG_MTD_OOPS is not set
--
--#
--# RAM/ROM/Flash chip drivers
--#
--CONFIG_MTD_CFI=y
--CONFIG_MTD_JEDECPROBE=y
--CONFIG_MTD_GEN_PROBE=y
--# CONFIG_MTD_CFI_ADV_OPTIONS is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--CONFIG_MTD_MAP_BANK_WIDTH_4=y
--# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
--CONFIG_MTD_CFI_I1=y
--CONFIG_MTD_CFI_I2=y
--# CONFIG_MTD_CFI_I4 is not set
--# CONFIG_MTD_CFI_I8 is not set
--# CONFIG_MTD_CFI_INTELEXT is not set
--CONFIG_MTD_CFI_AMDSTD=y
--# CONFIG_MTD_CFI_STAA is not set
--CONFIG_MTD_CFI_UTIL=y
--# CONFIG_MTD_RAM is not set
--# CONFIG_MTD_ROM is not set
--# CONFIG_MTD_ABSENT is not set
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--# CONFIG_MTD_PHYSMAP is not set
--CONFIG_MTD_PHYSMAP_OF=y
--# CONFIG_MTD_INTEL_VR_NOR is not set
--# CONFIG_MTD_PLATRAM is not set
--
--#
--# Self-contained MTD device drivers
--#
--# CONFIG_MTD_PMC551 is not set
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_MTDRAM is not set
--# CONFIG_MTD_BLOCK2MTD is not set
--
--#
--# Disk-On-Chip Device Drivers
--#
--# CONFIG_MTD_DOC2000 is not set
--# CONFIG_MTD_DOC2001 is not set
--# CONFIG_MTD_DOC2001PLUS is not set
--# CONFIG_MTD_NAND is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--# CONFIG_BLK_DEV_LOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--# CONFIG_BLK_DEV_UB is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=35000
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--# CONFIG_XILINX_SYSACE is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--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 is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--# CONFIG_PHYLIB is not set
--CONFIG_NET_ETHERNET=y
--# CONFIG_MII is not set
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--CONFIG_IBM_NEW_EMAC=y
--CONFIG_IBM_NEW_EMAC_RXB=128
--CONFIG_IBM_NEW_EMAC_TXB=64
--CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
--CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
--CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
--# CONFIG_IBM_NEW_EMAC_DEBUG is not set
--CONFIG_IBM_NEW_EMAC_ZMII=y
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--
--#
--# USB Network Adapters
--#
--# CONFIG_USB_CATC is not set
--# CONFIG_USB_KAWETH is not set
--# CONFIG_USB_PEGASUS is not set
--# CONFIG_USB_RTL8150 is not set
--# CONFIG_USB_USBNET is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--# CONFIG_INPUT is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--CONFIG_SERIAL_8250_EXTENDED=y
--# CONFIG_SERIAL_8250_MANY_PORTS is not set
--CONFIG_SERIAL_8250_SHARE_IRQ=y
--# CONFIG_SERIAL_8250_DETECT_IRQ is not set
--# CONFIG_SERIAL_8250_RSA is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--CONFIG_SERIAL_OF_PLATFORM=y
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--# CONFIG_I2C is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--# CONFIG_HWMON is not set
--CONFIG_THERMAL=y
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--# CONFIG_DAB is not set
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=m
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--CONFIG_USB=y
--# CONFIG_USB_DEBUG is not set
--# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
--
--#
--# Miscellaneous USB options
--#
--CONFIG_USB_DEVICEFS=y
--CONFIG_USB_DEVICE_CLASS=y
--# CONFIG_USB_DYNAMIC_MINORS is not set
--# CONFIG_USB_OTG is not set
--
--#
--# USB Host Controller Drivers
--#
--# CONFIG_USB_EHCI_HCD is not set
--# CONFIG_USB_ISP116X_HCD is not set
--CONFIG_USB_OHCI_HCD=y
--CONFIG_USB_OHCI_HCD_PPC_OF=y
--CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
--CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
--CONFIG_USB_OHCI_HCD_PCI=y
--CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
--CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
--CONFIG_USB_OHCI_LITTLE_ENDIAN=y
--# CONFIG_USB_UHCI_HCD is not set
--# CONFIG_USB_SL811_HCD is not set
--# CONFIG_USB_R8A66597_HCD is not set
--
--#
--# USB Device Class drivers
--#
--# CONFIG_USB_ACM is not set
--# CONFIG_USB_PRINTER is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--
--#
--# may also be needed; see USB_STORAGE Help for more information
--#
--# CONFIG_USB_LIBUSUAL is not set
--
--#
--# USB Imaging devices
--#
--# CONFIG_USB_MDC800 is not set
--CONFIG_USB_MON=y
--
--#
--# USB port drivers
--#
--# CONFIG_USB_SERIAL is not set
--
--#
--# USB Miscellaneous drivers
--#
--# CONFIG_USB_EMI62 is not set
--# CONFIG_USB_EMI26 is not set
--# CONFIG_USB_ADUTUX is not set
--# CONFIG_USB_AUERSWALD is not set
--# CONFIG_USB_RIO500 is not set
--# CONFIG_USB_LEGOTOWER is not set
--# CONFIG_USB_LCD is not set
--# CONFIG_USB_BERRY_CHARGE is not set
--# CONFIG_USB_LED is not set
--# CONFIG_USB_CYPRESS_CY7C63 is not set
--# CONFIG_USB_CYTHERM is not set
--# CONFIG_USB_PHIDGET is not set
--# CONFIG_USB_IDMOUSE is not set
--# CONFIG_USB_FTDI_ELAN is not set
--# CONFIG_USB_APPLEDISPLAY is not set
--# CONFIG_USB_LD is not set
--# CONFIG_USB_TRANCEVIBRATOR is not set
--# CONFIG_USB_IOWARRIOR is not set
--# CONFIG_USB_TEST is not set
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--# CONFIG_EXT3_FS is not set
--# CONFIG_EXT4DEV_FS is not set
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# CONFIG_AUTOFS_FS is not set
--# CONFIG_AUTOFS4_FS is not set
--# CONFIG_FUSE_FS is not set
--
--#
--# CD-ROM/DVD Filesystems
--#
--# CONFIG_ISO9660_FS is not set
--# CONFIG_UDF_FS is not set
--
--#
--# DOS/FAT/NT Filesystems
--#
--# CONFIG_MSDOS_FS is not set
--# CONFIG_VFAT_FS is not set
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
--
--#
--# Miscellaneous filesystems
--#
--# CONFIG_ADFS_FS is not set
--# CONFIG_AFFS_FS is not set
--# CONFIG_HFS_FS is not set
--# CONFIG_HFSPLUS_FS is not set
--# CONFIG_BEFS_FS is not set
--# CONFIG_BFS_FS is not set
--# CONFIG_EFS_FS is not set
--# CONFIG_JFFS2_FS is not set
--CONFIG_CRAMFS=y
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--# CONFIG_PARTITION_ADVANCED is not set
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# 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_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--CONFIG_MAGIC_SYSRQ=y
--# CONFIG_UNUSED_SYMBOLS is not set
--CONFIG_DEBUG_FS=y
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--CONFIG_DEBUG_BUGVERBOSE=y
--# CONFIG_DEBUG_INFO is not set
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--# CONFIG_DEBUGGER is not set
--# CONFIG_VIRQ_DEBUG is not set
--# CONFIG_BDI_SWITCH is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--CONFIG_CRYPTO_MD5=y
--# CONFIG_CRYPTO_SHA1 is not set
--# CONFIG_CRYPTO_SHA256 is not set
--# CONFIG_CRYPTO_SHA512 is not set
--# CONFIG_CRYPTO_WP512 is not set
--# CONFIG_CRYPTO_TGR192 is not set
--# CONFIG_CRYPTO_GF128MUL is not set
--CONFIG_CRYPTO_ECB=y
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=y
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# CONFIG_CRYPTO_BLOWFISH is not set
--# CONFIG_CRYPTO_TWOFISH is not set
--# CONFIG_CRYPTO_SERPENT is not set
--# CONFIG_CRYPTO_AES is not set
--# CONFIG_CRYPTO_CAST5 is not set
--# CONFIG_CRYPTO_CAST6 is not set
--# CONFIG_CRYPTO_TEA is not set
--# CONFIG_CRYPTO_ARC4 is not set
--# CONFIG_CRYPTO_KHAZAD is not set
--# CONFIG_CRYPTO_ANUBIS is not set
--# CONFIG_CRYPTO_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/g5_defconfig
-+++ b/arch/powerpc/configs/g5_defconfig
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
- # Linux kernel version: 2.6.25-rc6
--# Thu Mar 20 10:36:41 2008
-+# Thu Mar 27 13:55:43 2008
- #
- CONFIG_PPC64=y
- 
-@@ -77,8 +77,6 @@ CONFIG_IKCONFIG_PROC=y
- CONFIG_LOG_BUF_SHIFT=17
- # CONFIG_CGROUPS is not set
- # CONFIG_GROUP_SCHED is not set
--# CONFIG_USER_SCHED is not set
--# CONFIG_CGROUP_SCHED is not set
- CONFIG_SYSFS_DEPRECATED=y
- CONFIG_SYSFS_DEPRECATED_V2=y
- # CONFIG_RELAY is not set
-@@ -276,7 +274,7 @@ CONFIG_PCI_SYSCALL=y
- # CONFIG_PCIEPORTBUS is not set
- CONFIG_ARCH_SUPPORTS_MSI=y
- CONFIG_PCI_MSI=y
--CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_LEGACY is not set
- # CONFIG_PCI_DEBUG is not set
- # CONFIG_PCCARD is not set
- # CONFIG_HOTPLUG_PCI is not set
-@@ -1596,6 +1594,7 @@ CONFIG_PLIST=y
- CONFIG_HAS_IOMEM=y
- CONFIG_HAS_IOPORT=y
- CONFIG_HAS_DMA=y
-+CONFIG_HAVE_LMB=y
- 
- #
- # Kernel hacking
---- a/arch/powerpc/configs/iseries_defconfig
-+++ b/arch/powerpc/configs/iseries_defconfig
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
- # Linux kernel version: 2.6.25-rc6
--# Thu Mar 20 10:43:46 2008
-+# Thu Mar 27 13:55:45 2008
- #
- CONFIG_PPC64=y
- 
-@@ -77,8 +77,6 @@ CONFIG_IKCONFIG_PROC=y
- CONFIG_LOG_BUF_SHIFT=17
- # CONFIG_CGROUPS is not set
- # CONFIG_GROUP_SCHED is not set
--# CONFIG_USER_SCHED is not set
--# CONFIG_CGROUP_SCHED is not set
- CONFIG_SYSFS_DEPRECATED=y
- CONFIG_SYSFS_DEPRECATED_V2=y
- # CONFIG_RELAY is not set
-@@ -261,7 +259,7 @@ CONFIG_PCI_SYSCALL=y
- # CONFIG_PCIEPORTBUS is not set
- CONFIG_ARCH_SUPPORTS_MSI=y
- # CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_LEGACY is not set
- # CONFIG_PCI_DEBUG is not set
- # CONFIG_PCCARD is not set
- # CONFIG_HOTPLUG_PCI is not set
-@@ -1065,6 +1063,7 @@ CONFIG_PLIST=y
- CONFIG_HAS_IOMEM=y
- CONFIG_HAS_IOPORT=y
- CONFIG_HAS_DMA=y
-+CONFIG_HAVE_LMB=y
- 
- #
- # Kernel hacking
---- a/arch/powerpc/configs/katmai_defconfig
-+++ /dev/null
-@@ -1,790 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.24-rc6
--# Mon Dec 24 11:17:43 2007
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--CONFIG_44x=y
--# CONFIG_E200 is not set
--CONFIG_4xx=y
--CONFIG_BOOKE=y
--CONFIG_PTE_64BIT=y
--CONFIG_PHYS_64BIT=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_NOT_COHERENT_CACHE=y
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--# CONFIG_DEFAULT_UIMAGE is not set
--CONFIG_PPC_DCR_NATIVE=y
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_PPC_DCR=y
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--CONFIG_POSIX_MQUEUE=y
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_USER_NS is not set
--# CONFIG_PID_NS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_FAIR_GROUP_SCHED=y
--CONFIG_FAIR_USER_SCHED=y
--# CONFIG_FAIR_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--# CONFIG_RELAY is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--CONFIG_KALLSYMS=y
--# CONFIG_KALLSYMS_ALL is not set
--# CONFIG_KALLSYMS_EXTRA_PASS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--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_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--CONFIG_KMOD=y
--CONFIG_BLOCK=y
--CONFIG_LBD=y
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--CONFIG_DEFAULT_AS=y
--# CONFIG_DEFAULT_DEADLINE is not set
--# CONFIG_DEFAULT_CFQ is not set
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="anticipatory"
--CONFIG_PPC4xx_PCI_EXPRESS=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC52xx is not set
--# CONFIG_PPC_MPC5200 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--# CONFIG_BAMBOO is not set
--# CONFIG_EBONY is not set
--# CONFIG_SEQUOIA is not set
--# CONFIG_TAISHAN is not set
--CONFIG_KATMAI=y
--# CONFIG_RAINIER is not set
--CONFIG_440SPe=y
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_CPM2 is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--# CONFIG_MATH_EMULATION is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--CONFIG_RESOURCES_64BIT=y
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--CONFIG_CMDLINE_BOOL=y
--CONFIG_CMDLINE=""
--CONFIG_SECCOMP=y
--CONFIG_WANT_DEVICE_TREE=y
--CONFIG_DEVICE_TREE="katmai.dts"
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCI_DEBUG is not set
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_CONSISTENT_START=0xff100000
--CONFIG_CONSISTENT_SIZE=0x00200000
--CONFIG_BOOT_LOAD=0x01000000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--# CONFIG_IP_MULTICAST is not set
--# CONFIG_IP_ADVANCED_ROUTER is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_PNP=y
--CONFIG_IP_PNP_DHCP=y
--CONFIG_IP_PNP_BOOTP=y
--# CONFIG_IP_PNP_RARP is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_ARPD is not set
--# CONFIG_SYN_COOKIES is not set
--# CONFIG_INET_AH is not set
--# CONFIG_INET_ESP is not set
--# CONFIG_INET_IPCOMP is not set
--# CONFIG_INET_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
--# CONFIG_INET_XFRM_MODE_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_BEET is not set
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--# CONFIG_BRIDGE is not set
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--# CONFIG_LLC2 is not set
--# CONFIG_IPX is not set
--# CONFIG_ATALK is not set
--# CONFIG_X25 is not set
--# CONFIG_LAPB is not set
--# CONFIG_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--CONFIG_FW_LOADER=y
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--CONFIG_CONNECTOR=y
--CONFIG_PROC_EVENTS=y
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--# CONFIG_BLK_DEV_LOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=35000
--CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--# CONFIG_XILINX_SYSACE is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--CONFIG_MACINTOSH_DRIVERS=y
--# CONFIG_MAC_EMUMOUSEBTN is not set
--# CONFIG_WINDFARM is not set
--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 is not set
--# CONFIG_VETH is not set
--# CONFIG_IP1000 is not set
--# CONFIG_ARCNET is not set
--# CONFIG_PHYLIB is not set
--CONFIG_NET_ETHERNET=y
--# CONFIG_MII is not set
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--CONFIG_IBM_NEW_EMAC=y
--CONFIG_IBM_NEW_EMAC_RXB=128
--CONFIG_IBM_NEW_EMAC_TXB=64
--CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
--CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
--CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
--# CONFIG_IBM_NEW_EMAC_DEBUG is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--CONFIG_IBM_NEW_EMAC_EMAC4=y
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_SHAPER is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--# CONFIG_INPUT is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--# CONFIG_SERIAL_8250_PCI is not set
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--CONFIG_SERIAL_8250_EXTENDED=y
--# CONFIG_SERIAL_8250_MANY_PORTS is not set
--CONFIG_SERIAL_8250_SHARE_IRQ=y
--# CONFIG_SERIAL_8250_DETECT_IRQ is not set
--# CONFIG_SERIAL_8250_RSA is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--CONFIG_SERIAL_OF_PLATFORM=y
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--# CONFIG_I2C is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--# CONFIG_HWMON is not set
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=m
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--
--#
--# USB Gadget Support
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--# CONFIG_EXT3_FS is not set
--# CONFIG_EXT4DEV_FS is not set
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_ROMFS_FS is not set
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--CONFIG_DNOTIFY=y
--# CONFIG_AUTOFS_FS is not set
--# CONFIG_AUTOFS4_FS is not set
--# CONFIG_FUSE_FS is not set
--
--#
--# CD-ROM/DVD Filesystems
--#
--# CONFIG_ISO9660_FS is not set
--# CONFIG_UDF_FS is not set
--
--#
--# DOS/FAT/NT Filesystems
--#
--# CONFIG_MSDOS_FS is not set
--# CONFIG_VFAT_FS is not set
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
--
--#
--# Miscellaneous filesystems
--#
--# CONFIG_ADFS_FS is not set
--# CONFIG_AFFS_FS is not set
--# CONFIG_HFS_FS is not set
--# CONFIG_HFSPLUS_FS is not set
--# CONFIG_BEFS_FS is not set
--# CONFIG_BFS_FS is not set
--# CONFIG_EFS_FS is not set
--CONFIG_CRAMFS=y
--# CONFIG_VXFS_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--# CONFIG_PARTITION_ADVANCED is not set
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--# CONFIG_UCC_SLOW is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# 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_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--CONFIG_INSTRUMENTATION=y
--# CONFIG_PROFILING is not set
--# CONFIG_KPROBES is not set
--# CONFIG_MARKERS is not set
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--CONFIG_MAGIC_SYSRQ=y
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_DEBUG_INFO is not set
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--CONFIG_FORCED_INLINING=y
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--CONFIG_DEBUGGER=y
--# CONFIG_KGDB is not set
--# CONFIG_XMON is not set
--# CONFIG_BDI_SWITCH is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--CONFIG_CRYPTO_MD5=y
--# CONFIG_CRYPTO_SHA1 is not set
--# CONFIG_CRYPTO_SHA256 is not set
--# CONFIG_CRYPTO_SHA512 is not set
--# CONFIG_CRYPTO_WP512 is not set
--# CONFIG_CRYPTO_TGR192 is not set
--# CONFIG_CRYPTO_GF128MUL is not set
--CONFIG_CRYPTO_ECB=y
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=y
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# CONFIG_CRYPTO_BLOWFISH is not set
--# CONFIG_CRYPTO_TWOFISH is not set
--# CONFIG_CRYPTO_SERPENT is not set
--# CONFIG_CRYPTO_AES is not set
--# CONFIG_CRYPTO_CAST5 is not set
--# CONFIG_CRYPTO_CAST6 is not set
--# CONFIG_CRYPTO_TEA is not set
--# CONFIG_CRYPTO_ARC4 is not set
--# CONFIG_CRYPTO_KHAZAD is not set
--# CONFIG_CRYPTO_ANUBIS is not set
--# CONFIG_CRYPTO_SEED is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/kilauea_defconfig
-+++ /dev/null
-@@ -1,839 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc2
--# Fri Feb 15 21:51:43 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--CONFIG_40x=y
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_4xx=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_NOT_COHERENT_CACHE=y
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--# CONFIG_DEFAULT_UIMAGE is not set
--CONFIG_PPC_DCR_NATIVE=y
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_PPC_DCR=y
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--CONFIG_POSIX_MQUEUE=y
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--# CONFIG_FAIR_GROUP_SCHED is not set
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--CONFIG_KALLSYMS=y
--CONFIG_KALLSYMS_ALL=y
--CONFIG_KALLSYMS_EXTRA_PASS=y
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=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 is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--# CONFIG_KPROBES is not set
--CONFIG_HAVE_KPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--CONFIG_KMOD=y
--CONFIG_BLOCK=y
--CONFIG_LBD=y
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--CONFIG_DEFAULT_AS=y
--# CONFIG_DEFAULT_DEADLINE is not set
--# CONFIG_DEFAULT_CFQ is not set
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="anticipatory"
--CONFIG_CLASSIC_RCU=y
--# CONFIG_PREEMPT_RCU is not set
--CONFIG_PPC4xx_PCI_EXPRESS=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--# CONFIG_EP405 is not set
--CONFIG_KILAUEA=y
--# CONFIG_MAKALU is not set
--# CONFIG_WALNUT is not set
--# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
--CONFIG_405EX=y
--# CONFIG_IPIC is not set
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_RCU_TRACE=y
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--# CONFIG_MATH_EMULATION is not set
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCI_DEBUG is not set
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_CONSISTENT_START=0xff100000
--CONFIG_CONSISTENT_SIZE=0x00200000
--CONFIG_BOOT_LOAD=0x00400000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--# CONFIG_IP_MULTICAST is not set
--# CONFIG_IP_ADVANCED_ROUTER is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_PNP=y
--CONFIG_IP_PNP_DHCP=y
--CONFIG_IP_PNP_BOOTP=y
--# CONFIG_IP_PNP_RARP is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_ARPD is not set
--# CONFIG_SYN_COOKIES is not set
--# CONFIG_INET_AH is not set
--# CONFIG_INET_ESP is not set
--# CONFIG_INET_IPCOMP is not set
--# CONFIG_INET_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
--# CONFIG_INET_XFRM_MODE_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_BEET is not set
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--# CONFIG_BRIDGE is not set
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--# CONFIG_LLC2 is not set
--# CONFIG_IPX is not set
--# CONFIG_ATALK is not set
--# CONFIG_X25 is not set
--# CONFIG_LAPB is not set
--# CONFIG_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--CONFIG_FW_LOADER=y
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--CONFIG_CONNECTOR=y
--CONFIG_PROC_EVENTS=y
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--# CONFIG_MTD_CONCAT is not set
--CONFIG_MTD_PARTITIONS=y
--# CONFIG_MTD_REDBOOT_PARTS is not set
--CONFIG_MTD_CMDLINE_PARTS=y
--CONFIG_MTD_OF_PARTS=y
--
--#
--# User Modules And Translation Layers
--#
--CONFIG_MTD_CHAR=y
--CONFIG_MTD_BLKDEVS=m
--CONFIG_MTD_BLOCK=m
--# CONFIG_MTD_BLOCK_RO is not set
--# CONFIG_FTL is not set
--# CONFIG_NFTL is not set
--# CONFIG_INFTL is not set
--# CONFIG_RFD_FTL is not set
--# CONFIG_SSFDC is not set
--# CONFIG_MTD_OOPS is not set
--
--#
--# RAM/ROM/Flash chip drivers
--#
--CONFIG_MTD_CFI=y
--CONFIG_MTD_JEDECPROBE=y
--CONFIG_MTD_GEN_PROBE=y
--# CONFIG_MTD_CFI_ADV_OPTIONS is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--CONFIG_MTD_MAP_BANK_WIDTH_4=y
--# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
--CONFIG_MTD_CFI_I1=y
--CONFIG_MTD_CFI_I2=y
--# CONFIG_MTD_CFI_I4 is not set
--# CONFIG_MTD_CFI_I8 is not set
--# CONFIG_MTD_CFI_INTELEXT is not set
--CONFIG_MTD_CFI_AMDSTD=y
--# CONFIG_MTD_CFI_STAA is not set
--CONFIG_MTD_CFI_UTIL=y
--# CONFIG_MTD_RAM is not set
--# CONFIG_MTD_ROM is not set
--# CONFIG_MTD_ABSENT is not set
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--# CONFIG_MTD_PHYSMAP is not set
--CONFIG_MTD_PHYSMAP_OF=y
--# CONFIG_MTD_INTEL_VR_NOR is not set
--# CONFIG_MTD_PLATRAM is not set
--
--#
--# Self-contained MTD device drivers
--#
--# CONFIG_MTD_PMC551 is not set
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_MTDRAM is not set
--# CONFIG_MTD_BLOCK2MTD is not set
--
--#
--# Disk-On-Chip Device Drivers
--#
--# CONFIG_MTD_DOC2000 is not set
--# CONFIG_MTD_DOC2001 is not set
--# CONFIG_MTD_DOC2001PLUS is not set
--# CONFIG_MTD_NAND is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--# CONFIG_BLK_DEV_LOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=35000
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--# CONFIG_XILINX_SYSACE is not set
--# CONFIG_MISC_DEVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--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 is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--# CONFIG_PHYLIB is not set
--CONFIG_NET_ETHERNET=y
--# CONFIG_MII is not set
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--CONFIG_IBM_NEW_EMAC=y
--CONFIG_IBM_NEW_EMAC_RXB=256
--CONFIG_IBM_NEW_EMAC_TXB=256
--CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
--CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
--CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
--# CONFIG_IBM_NEW_EMAC_DEBUG is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--CONFIG_IBM_NEW_EMAC_RGMII=y
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--CONFIG_IBM_NEW_EMAC_EMAC4=y
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--# CONFIG_NETDEV_1000 is not set
--# CONFIG_NETDEV_10000 is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--# CONFIG_INPUT is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--CONFIG_SERIAL_8250_EXTENDED=y
--# CONFIG_SERIAL_8250_MANY_PORTS is not set
--CONFIG_SERIAL_8250_SHARE_IRQ=y
--# CONFIG_SERIAL_8250_DETECT_IRQ is not set
--# CONFIG_SERIAL_8250_RSA is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--CONFIG_SERIAL_OF_PLATFORM=y
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--# CONFIG_I2C is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--# CONFIG_HWMON is not set
--CONFIG_THERMAL=y
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--# CONFIG_DAB is not set
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--# CONFIG_VIDEO_OUTPUT_CONTROL is not set
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--# CONFIG_USB_SUPPORT is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--# CONFIG_EXT3_FS is not set
--# CONFIG_EXT4DEV_FS is not set
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# CONFIG_AUTOFS_FS is not set
--# CONFIG_AUTOFS4_FS is not set
--# CONFIG_FUSE_FS is not set
--
--#
--# CD-ROM/DVD Filesystems
--#
--# CONFIG_ISO9660_FS is not set
--# CONFIG_UDF_FS is not set
--
--#
--# DOS/FAT/NT Filesystems
--#
--# CONFIG_MSDOS_FS is not set
--# CONFIG_VFAT_FS is not set
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
--
--#
--# Miscellaneous filesystems
--#
--# CONFIG_ADFS_FS is not set
--# CONFIG_AFFS_FS is not set
--# CONFIG_HFS_FS is not set
--# CONFIG_HFSPLUS_FS is not set
--# CONFIG_BEFS_FS is not set
--# CONFIG_BFS_FS is not set
--# CONFIG_EFS_FS is not set
--# CONFIG_JFFS2_FS is not set
--CONFIG_CRAMFS=y
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--# CONFIG_PARTITION_ADVANCED is not set
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# 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_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--CONFIG_MAGIC_SYSRQ=y
--# CONFIG_UNUSED_SYMBOLS is not set
--CONFIG_DEBUG_FS=y
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--CONFIG_DEBUG_BUGVERBOSE=y
--# CONFIG_DEBUG_INFO is not set
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--# CONFIG_DEBUGGER is not set
--# CONFIG_VIRQ_DEBUG is not set
--# CONFIG_BDI_SWITCH is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--CONFIG_CRYPTO_MD5=y
--# CONFIG_CRYPTO_SHA1 is not set
--# CONFIG_CRYPTO_SHA256 is not set
--# CONFIG_CRYPTO_SHA512 is not set
--# CONFIG_CRYPTO_WP512 is not set
--# CONFIG_CRYPTO_TGR192 is not set
--# CONFIG_CRYPTO_GF128MUL is not set
--CONFIG_CRYPTO_ECB=y
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=y
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# CONFIG_CRYPTO_BLOWFISH is not set
--# CONFIG_CRYPTO_TWOFISH is not set
--# CONFIG_CRYPTO_SERPENT is not set
--# CONFIG_CRYPTO_AES is not set
--# CONFIG_CRYPTO_CAST5 is not set
--# CONFIG_CRYPTO_CAST6 is not set
--# CONFIG_CRYPTO_TEA is not set
--# CONFIG_CRYPTO_ARC4 is not set
--# CONFIG_CRYPTO_KHAZAD is not set
--# CONFIG_CRYPTO_ANUBIS is not set
--# CONFIG_CRYPTO_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/makalu_defconfig
-+++ /dev/null
-@@ -1,839 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc2
--# Fri Feb 15 21:52:30 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--CONFIG_40x=y
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_4xx=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_NOT_COHERENT_CACHE=y
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--# CONFIG_DEFAULT_UIMAGE is not set
--CONFIG_PPC_DCR_NATIVE=y
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_PPC_DCR=y
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--CONFIG_POSIX_MQUEUE=y
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--# CONFIG_FAIR_GROUP_SCHED is not set
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--CONFIG_KALLSYMS=y
--CONFIG_KALLSYMS_ALL=y
--CONFIG_KALLSYMS_EXTRA_PASS=y
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=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 is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--# CONFIG_KPROBES is not set
--CONFIG_HAVE_KPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--CONFIG_KMOD=y
--CONFIG_BLOCK=y
--CONFIG_LBD=y
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--CONFIG_DEFAULT_AS=y
--# CONFIG_DEFAULT_DEADLINE is not set
--# CONFIG_DEFAULT_CFQ is not set
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="anticipatory"
--CONFIG_CLASSIC_RCU=y
--# CONFIG_PREEMPT_RCU is not set
--CONFIG_PPC4xx_PCI_EXPRESS=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--# CONFIG_EP405 is not set
--# CONFIG_KILAUEA is not set
--CONFIG_MAKALU=y
--# CONFIG_WALNUT is not set
--# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
--CONFIG_405EX=y
--# CONFIG_IPIC is not set
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_RCU_TRACE=y
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--# CONFIG_MATH_EMULATION is not set
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCI_DEBUG is not set
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_CONSISTENT_START=0xff100000
--CONFIG_CONSISTENT_SIZE=0x00200000
--CONFIG_BOOT_LOAD=0x00400000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--# CONFIG_IP_MULTICAST is not set
--# CONFIG_IP_ADVANCED_ROUTER is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_PNP=y
--CONFIG_IP_PNP_DHCP=y
--CONFIG_IP_PNP_BOOTP=y
--# CONFIG_IP_PNP_RARP is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_ARPD is not set
--# CONFIG_SYN_COOKIES is not set
--# CONFIG_INET_AH is not set
--# CONFIG_INET_ESP is not set
--# CONFIG_INET_IPCOMP is not set
--# CONFIG_INET_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
--# CONFIG_INET_XFRM_MODE_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_BEET is not set
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--# CONFIG_BRIDGE is not set
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--# CONFIG_LLC2 is not set
--# CONFIG_IPX is not set
--# CONFIG_ATALK is not set
--# CONFIG_X25 is not set
--# CONFIG_LAPB is not set
--# CONFIG_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--CONFIG_FW_LOADER=y
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--CONFIG_CONNECTOR=y
--CONFIG_PROC_EVENTS=y
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--# CONFIG_MTD_CONCAT is not set
--CONFIG_MTD_PARTITIONS=y
--# CONFIG_MTD_REDBOOT_PARTS is not set
--CONFIG_MTD_CMDLINE_PARTS=y
--CONFIG_MTD_OF_PARTS=y
--
--#
--# User Modules And Translation Layers
--#
--CONFIG_MTD_CHAR=y
--CONFIG_MTD_BLKDEVS=m
--CONFIG_MTD_BLOCK=m
--# CONFIG_MTD_BLOCK_RO is not set
--# CONFIG_FTL is not set
--# CONFIG_NFTL is not set
--# CONFIG_INFTL is not set
--# CONFIG_RFD_FTL is not set
--# CONFIG_SSFDC is not set
--# CONFIG_MTD_OOPS is not set
--
--#
--# RAM/ROM/Flash chip drivers
--#
--CONFIG_MTD_CFI=y
--CONFIG_MTD_JEDECPROBE=y
--CONFIG_MTD_GEN_PROBE=y
--# CONFIG_MTD_CFI_ADV_OPTIONS is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--CONFIG_MTD_MAP_BANK_WIDTH_4=y
--# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
--CONFIG_MTD_CFI_I1=y
--CONFIG_MTD_CFI_I2=y
--# CONFIG_MTD_CFI_I4 is not set
--# CONFIG_MTD_CFI_I8 is not set
--# CONFIG_MTD_CFI_INTELEXT is not set
--CONFIG_MTD_CFI_AMDSTD=y
--# CONFIG_MTD_CFI_STAA is not set
--CONFIG_MTD_CFI_UTIL=y
--# CONFIG_MTD_RAM is not set
--# CONFIG_MTD_ROM is not set
--# CONFIG_MTD_ABSENT is not set
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--# CONFIG_MTD_PHYSMAP is not set
--CONFIG_MTD_PHYSMAP_OF=y
--# CONFIG_MTD_INTEL_VR_NOR is not set
--# CONFIG_MTD_PLATRAM is not set
--
--#
--# Self-contained MTD device drivers
--#
--# CONFIG_MTD_PMC551 is not set
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_MTDRAM is not set
--# CONFIG_MTD_BLOCK2MTD is not set
--
--#
--# Disk-On-Chip Device Drivers
--#
--# CONFIG_MTD_DOC2000 is not set
--# CONFIG_MTD_DOC2001 is not set
--# CONFIG_MTD_DOC2001PLUS is not set
--# CONFIG_MTD_NAND is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--# CONFIG_BLK_DEV_LOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=35000
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--# CONFIG_XILINX_SYSACE is not set
--# CONFIG_MISC_DEVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--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 is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--# CONFIG_PHYLIB is not set
--CONFIG_NET_ETHERNET=y
--# CONFIG_MII is not set
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--CONFIG_IBM_NEW_EMAC=y
--CONFIG_IBM_NEW_EMAC_RXB=256
--CONFIG_IBM_NEW_EMAC_TXB=256
--CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
--CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
--CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
--# CONFIG_IBM_NEW_EMAC_DEBUG is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--CONFIG_IBM_NEW_EMAC_RGMII=y
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--CONFIG_IBM_NEW_EMAC_EMAC4=y
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--# CONFIG_NETDEV_1000 is not set
--# CONFIG_NETDEV_10000 is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--# CONFIG_INPUT is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--CONFIG_SERIAL_8250_EXTENDED=y
--# CONFIG_SERIAL_8250_MANY_PORTS is not set
--CONFIG_SERIAL_8250_SHARE_IRQ=y
--# CONFIG_SERIAL_8250_DETECT_IRQ is not set
--# CONFIG_SERIAL_8250_RSA is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--CONFIG_SERIAL_OF_PLATFORM=y
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--# CONFIG_I2C is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--# CONFIG_HWMON is not set
--CONFIG_THERMAL=y
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--# CONFIG_DAB is not set
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--# CONFIG_VIDEO_OUTPUT_CONTROL is not set
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--# CONFIG_USB_SUPPORT is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--# CONFIG_EXT3_FS is not set
--# CONFIG_EXT4DEV_FS is not set
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# CONFIG_AUTOFS_FS is not set
--# CONFIG_AUTOFS4_FS is not set
--# CONFIG_FUSE_FS is not set
--
--#
--# CD-ROM/DVD Filesystems
--#
--# CONFIG_ISO9660_FS is not set
--# CONFIG_UDF_FS is not set
--
--#
--# DOS/FAT/NT Filesystems
--#
--# CONFIG_MSDOS_FS is not set
--# CONFIG_VFAT_FS is not set
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
--
--#
--# Miscellaneous filesystems
--#
--# CONFIG_ADFS_FS is not set
--# CONFIG_AFFS_FS is not set
--# CONFIG_HFS_FS is not set
--# CONFIG_HFSPLUS_FS is not set
--# CONFIG_BEFS_FS is not set
--# CONFIG_BFS_FS is not set
--# CONFIG_EFS_FS is not set
--# CONFIG_JFFS2_FS is not set
--CONFIG_CRAMFS=y
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--# CONFIG_PARTITION_ADVANCED is not set
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# 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_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--CONFIG_MAGIC_SYSRQ=y
--# CONFIG_UNUSED_SYMBOLS is not set
--CONFIG_DEBUG_FS=y
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--CONFIG_DEBUG_BUGVERBOSE=y
--# CONFIG_DEBUG_INFO is not set
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--# CONFIG_DEBUGGER is not set
--# CONFIG_VIRQ_DEBUG is not set
--# CONFIG_BDI_SWITCH is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--CONFIG_CRYPTO_MD5=y
--# CONFIG_CRYPTO_SHA1 is not set
--# CONFIG_CRYPTO_SHA256 is not set
--# CONFIG_CRYPTO_SHA512 is not set
--# CONFIG_CRYPTO_WP512 is not set
--# CONFIG_CRYPTO_TGR192 is not set
--# CONFIG_CRYPTO_GF128MUL is not set
--CONFIG_CRYPTO_ECB=y
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=y
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# CONFIG_CRYPTO_BLOWFISH is not set
--# CONFIG_CRYPTO_TWOFISH is not set
--# CONFIG_CRYPTO_SERPENT is not set
--# CONFIG_CRYPTO_AES is not set
--# CONFIG_CRYPTO_CAST5 is not set
--# CONFIG_CRYPTO_CAST6 is not set
--# CONFIG_CRYPTO_TEA is not set
--# CONFIG_CRYPTO_ARC4 is not set
--# CONFIG_CRYPTO_KHAZAD is not set
--# CONFIG_CRYPTO_ANUBIS is not set
--# CONFIG_CRYPTO_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/maple_defconfig
-+++ b/arch/powerpc/configs/maple_defconfig
-@@ -333,7 +333,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
- CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
- CONFIG_STANDALONE=y
- CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
-+CONFIG_FW_LOADER=y
- # CONFIG_DEBUG_DRIVER is not set
- # CONFIG_DEBUG_DEVRES is not set
- # CONFIG_SYS_HYPERVISOR is not set
-@@ -374,6 +374,7 @@ CONFIG_BLK_DEV_IDEDISK=y
- CONFIG_BLK_DEV_IDECD=y
- # CONFIG_BLK_DEV_IDETAPE is not set
- # CONFIG_BLK_DEV_IDEFLOPPY is not set
-+# CONFIG_BLK_DEV_IDESCSI is not set
- CONFIG_IDE_TASK_IOCTL=y
- CONFIG_IDE_PROC_FS=y
- 
-@@ -427,10 +428,129 @@ CONFIG_IDE_ARCH_OBSOLETE_INIT=y
- # SCSI device support
- #
- # CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
-+CONFIG_SCSI=y
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
- # CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
-+# CONFIG_SCSI_PROC_FS is not set
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=y
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+# CONFIG_BLK_DEV_SR is not set
-+CONFIG_CHR_DEV_SG=y
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+# CONFIG_SCSI_SCAN_ASYNC is not set
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-+# CONFIG_SCSI_3W_9XXX is not set
-+# CONFIG_SCSI_ACARD is not set
-+# CONFIG_SCSI_AACRAID is not set
-+# CONFIG_SCSI_AIC7XXX is not set
-+# CONFIG_SCSI_AIC7XXX_OLD is not set
-+# CONFIG_SCSI_AIC79XX is not set
-+# CONFIG_SCSI_AIC94XX is not set
-+# CONFIG_SCSI_ARCMSR is not set
-+# CONFIG_MEGARAID_NEWGEN is not set
-+# CONFIG_MEGARAID_LEGACY is not set
-+# CONFIG_MEGARAID_SAS is not set
-+# CONFIG_SCSI_HPTIOP is not set
-+# CONFIG_SCSI_DMX3191D is not set
-+# CONFIG_SCSI_EATA is not set
-+# CONFIG_SCSI_FUTURE_DOMAIN is not set
-+# CONFIG_SCSI_GDTH is not set
-+# CONFIG_SCSI_IPS is not set
-+# CONFIG_SCSI_INITIO is not set
-+# CONFIG_SCSI_INIA100 is not set
-+# CONFIG_SCSI_STEX is not set
-+# CONFIG_SCSI_SYM53C8XX_2 is not set
-+CONFIG_SCSI_IPR=y
-+CONFIG_SCSI_IPR_TRACE=y
-+CONFIG_SCSI_IPR_DUMP=y
-+# CONFIG_SCSI_QLOGIC_1280 is not set
-+# CONFIG_SCSI_QLA_FC is not set
-+# CONFIG_SCSI_QLA_ISCSI is not set
-+# CONFIG_SCSI_LPFC is not set
-+# CONFIG_SCSI_DC395x is not set
-+# CONFIG_SCSI_DC390T is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_SCSI_SRP is not set
-+CONFIG_ATA=y
-+CONFIG_ATA_NONSTANDARD=y
-+# CONFIG_SATA_AHCI is not set
-+# CONFIG_SATA_SVW is not set
-+# CONFIG_ATA_PIIX is not set
-+# CONFIG_SATA_MV is not set
-+# CONFIG_SATA_NV is not set
-+# CONFIG_PDC_ADMA is not set
-+# CONFIG_SATA_QSTOR is not set
-+# CONFIG_SATA_PROMISE is not set
-+# CONFIG_SATA_SX4 is not set
-+# CONFIG_SATA_SIL is not set
-+# CONFIG_SATA_SIL24 is not set
-+# CONFIG_SATA_SIS is not set
-+# CONFIG_SATA_ULI is not set
-+# CONFIG_SATA_VIA is not set
-+# CONFIG_SATA_VITESSE is not set
-+# CONFIG_SATA_INIC162X is not set
-+# CONFIG_PATA_ALI is not set
-+# CONFIG_PATA_AMD is not set
-+# CONFIG_PATA_ARTOP is not set
-+# CONFIG_PATA_ATIIXP is not set
-+# CONFIG_PATA_CMD640_PCI is not set
-+# CONFIG_PATA_CMD64X is not set
-+# CONFIG_PATA_CS5520 is not set
-+# CONFIG_PATA_CS5530 is not set
-+# CONFIG_PATA_CYPRESS is not set
-+# CONFIG_PATA_EFAR is not set
-+# CONFIG_ATA_GENERIC is not set
-+# CONFIG_PATA_HPT366 is not set
-+# CONFIG_PATA_HPT37X is not set
-+# CONFIG_PATA_HPT3X2N is not set
-+# CONFIG_PATA_HPT3X3 is not set
-+# CONFIG_PATA_IT821X is not set
-+# CONFIG_PATA_IT8213 is not set
-+# CONFIG_PATA_JMICRON is not set
-+# CONFIG_PATA_TRIFLEX is not set
-+# CONFIG_PATA_MARVELL is not set
-+# CONFIG_PATA_MPIIX is not set
-+# CONFIG_PATA_OLDPIIX is not set
-+# CONFIG_PATA_NETCELL is not set
-+# CONFIG_PATA_NS87410 is not set
-+# CONFIG_PATA_NS87415 is not set
-+# CONFIG_PATA_OPTI is not set
-+# CONFIG_PATA_OPTIDMA is not set
-+# CONFIG_PATA_PDC_OLD is not set
-+# CONFIG_PATA_RADISYS is not set
-+# CONFIG_PATA_RZ1000 is not set
-+# CONFIG_PATA_SC1200 is not set
-+# CONFIG_PATA_SERVERWORKS is not set
-+# CONFIG_PATA_PDC2027X is not set
-+# CONFIG_PATA_SIL680 is not set
-+# CONFIG_PATA_SIS is not set
-+# CONFIG_PATA_VIA is not set
-+# CONFIG_PATA_WINBOND is not set
- # CONFIG_MD is not set
- # CONFIG_FUSION is not set
- 
-@@ -536,6 +656,7 @@ CONFIG_USB_PEGASUS=y
- # CONFIG_HIPPI is not set
- # CONFIG_PPP is not set
- # CONFIG_SLIP is not set
-+# CONFIG_NET_FC is not set
- # CONFIG_SHAPER is not set
- # CONFIG_NETCONSOLE is not set
- # CONFIG_NETPOLL is not set
-@@ -783,12 +904,14 @@ CONFIG_USB_UHCI_HCD=y
- #
- # may also be needed; see USB_STORAGE Help for more information
- #
-+# CONFIG_USB_STORAGE is not set
- # CONFIG_USB_LIBUSUAL is not set
- 
- #
- # USB Imaging devices
- #
- # CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
- CONFIG_USB_MON=y
- 
- #
---- a/arch/powerpc/configs/mpc8313_rdb_defconfig
-+++ /dev/null
-@@ -1,1393 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:14 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--CONFIG_6xx=y
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_PPC_FPU=y
--# CONFIG_FSL_EMB_PERFMON is not set
--CONFIG_PPC_STD_MMU=y
--CONFIG_PPC_STD_MMU_32=y
--# CONFIG_PPC_MM_SLICES is not set
--# CONFIG_SMP is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--# CONFIG_FAIR_GROUP_SCHED is not set
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--# CONFIG_KALLSYMS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--# CONFIG_EPOLL is not set
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--# CONFIG_KMOD is not set
--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
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--CONFIG_DEFAULT_AS=y
--# CONFIG_DEFAULT_DEADLINE is not set
--# CONFIG_DEFAULT_CFQ is not set
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="anticipatory"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MULTIPLATFORM is not set
--# CONFIG_PPC_82xx is not set
--CONFIG_PPC_83xx=y
--# CONFIG_PPC_86xx is not set
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC83xx=y
--CONFIG_MPC831x_RDB=y
--# CONFIG_MPC832x_MDS is not set
--# CONFIG_MPC832x_RDB is not set
--# CONFIG_MPC834x_MDS is not set
--# CONFIG_MPC834x_ITX is not set
--# CONFIG_MPC836x_MDS is not set
--# CONFIG_MPC837x_MDS is not set
--# CONFIG_MPC837x_RDB is not set
--# CONFIG_SBC834x is not set
--CONFIG_PPC_MPC831x=y
--CONFIG_IPIC=y
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--CONFIG_TICK_ONESHOT=y
--CONFIG_NO_HZ=y
--CONFIG_HIGH_RES_TIMERS=y
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_GENERIC_ISA_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCI_DEBUG is not set
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--# CONFIG_XFRM_USER is not set
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# CONFIG_IP_ADVANCED_ROUTER is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_PNP=y
--CONFIG_IP_PNP_DHCP=y
--CONFIG_IP_PNP_BOOTP=y
--# CONFIG_IP_PNP_RARP is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# CONFIG_INET_AH is not set
--# CONFIG_INET_ESP is not set
--# CONFIG_INET_IPCOMP is not set
--# CONFIG_INET_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--CONFIG_INET_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--# CONFIG_BRIDGE is not set
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--# CONFIG_LLC2 is not set
--# CONFIG_IPX is not set
--# CONFIG_ATALK is not set
--# CONFIG_X25 is not set
--# CONFIG_LAPB is not set
--# CONFIG_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--# CONFIG_MTD_CONCAT is not set
--CONFIG_MTD_PARTITIONS=y
--# CONFIG_MTD_REDBOOT_PARTS is not set
--# CONFIG_MTD_CMDLINE_PARTS is not set
--# CONFIG_MTD_OF_PARTS is not set
--
--#
--# User Modules And Translation Layers
--#
--CONFIG_MTD_CHAR=y
--CONFIG_MTD_BLKDEVS=y
--CONFIG_MTD_BLOCK=y
--# CONFIG_FTL is not set
--# CONFIG_NFTL is not set
--# CONFIG_INFTL is not set
--# CONFIG_RFD_FTL is not set
--# CONFIG_SSFDC is not set
--# CONFIG_MTD_OOPS is not set
--
--#
--# RAM/ROM/Flash chip drivers
--#
--CONFIG_MTD_CFI=y
--# CONFIG_MTD_JEDECPROBE is not set
--CONFIG_MTD_GEN_PROBE=y
--# CONFIG_MTD_CFI_ADV_OPTIONS is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--CONFIG_MTD_MAP_BANK_WIDTH_4=y
--# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
--CONFIG_MTD_CFI_I1=y
--CONFIG_MTD_CFI_I2=y
--# CONFIG_MTD_CFI_I4 is not set
--# CONFIG_MTD_CFI_I8 is not set
--# CONFIG_MTD_CFI_INTELEXT is not set
--CONFIG_MTD_CFI_AMDSTD=y
--# CONFIG_MTD_CFI_STAA is not set
--CONFIG_MTD_CFI_UTIL=y
--# CONFIG_MTD_RAM is not set
--# CONFIG_MTD_ROM is not set
--# CONFIG_MTD_ABSENT is not set
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--# CONFIG_MTD_PHYSMAP is not set
--CONFIG_MTD_PHYSMAP_OF=y
--# CONFIG_MTD_INTEL_VR_NOR is not set
--# CONFIG_MTD_PLATRAM is not set
--
--#
--# Self-contained MTD device drivers
--#
--# CONFIG_MTD_PMC551 is not set
--# CONFIG_MTD_DATAFLASH is not set
--# CONFIG_MTD_M25P80 is not set
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_MTDRAM is not set
--# CONFIG_MTD_BLOCK2MTD is not set
--
--#
--# Disk-On-Chip Device Drivers
--#
--# CONFIG_MTD_DOC2000 is not set
--# CONFIG_MTD_DOC2001 is not set
--# CONFIG_MTD_DOC2001PLUS is not set
--CONFIG_MTD_NAND=y
--CONFIG_MTD_NAND_VERIFY_WRITE=y
--# CONFIG_MTD_NAND_ECC_SMC is not set
--# CONFIG_MTD_NAND_MUSEUM_IDS is not set
--CONFIG_MTD_NAND_IDS=y
--# CONFIG_MTD_NAND_DISKONCHIP is not set
--# CONFIG_MTD_NAND_CAFE is not set
--# CONFIG_MTD_NAND_NANDSIM is not set
--# CONFIG_MTD_NAND_PLATFORM is not set
--# CONFIG_MTD_ALAUDA is not set
--# CONFIG_MTD_NAND_FSL_ELBC is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--# CONFIG_BLK_DEV_UB is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--CONFIG_SCSI=y
--CONFIG_SCSI_DMA=y
--# CONFIG_SCSI_TGT is not set
--# CONFIG_SCSI_NETLINK is not set
--CONFIG_SCSI_PROC_FS=y
--
--#
--# SCSI support type (disk, tape, CD-ROM)
--#
--# CONFIG_BLK_DEV_SD is not set
--# CONFIG_CHR_DEV_ST is not set
--# CONFIG_CHR_DEV_OSST is not set
--# CONFIG_BLK_DEV_SR is not set
--CONFIG_CHR_DEV_SG=y
--# CONFIG_CHR_DEV_SCH is not set
--
--#
--# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
--#
--# CONFIG_SCSI_MULTI_LUN is not set
--# CONFIG_SCSI_CONSTANTS is not set
--# CONFIG_SCSI_LOGGING is not set
--# CONFIG_SCSI_SCAN_ASYNC is not set
--CONFIG_SCSI_WAIT_SCAN=m
--
--#
--# SCSI Transports
--#
--CONFIG_SCSI_SPI_ATTRS=y
--# CONFIG_SCSI_FC_ATTRS is not set
--# CONFIG_SCSI_ISCSI_ATTRS is not set
--# CONFIG_SCSI_SAS_LIBSAS is not set
--# CONFIG_SCSI_SRP_ATTRS is not set
--CONFIG_SCSI_LOWLEVEL=y
--# CONFIG_ISCSI_TCP is not set
--# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
--# CONFIG_SCSI_3W_9XXX is not set
--# CONFIG_SCSI_ACARD is not set
--# CONFIG_SCSI_AACRAID is not set
--# CONFIG_SCSI_AIC7XXX is not set
--# CONFIG_SCSI_AIC7XXX_OLD is not set
--# CONFIG_SCSI_AIC79XX is not set
--# CONFIG_SCSI_AIC94XX is not set
--# CONFIG_SCSI_DPT_I2O is not set
--# CONFIG_SCSI_ADVANSYS is not set
--# CONFIG_SCSI_ARCMSR is not set
--# CONFIG_MEGARAID_NEWGEN is not set
--# CONFIG_MEGARAID_LEGACY is not set
--# CONFIG_MEGARAID_SAS is not set
--# CONFIG_SCSI_HPTIOP is not set
--# CONFIG_SCSI_BUSLOGIC is not set
--# CONFIG_SCSI_DMX3191D is not set
--# CONFIG_SCSI_EATA is not set
--# CONFIG_SCSI_FUTURE_DOMAIN is not set
--# CONFIG_SCSI_GDTH is not set
--# CONFIG_SCSI_IPS is not set
--# CONFIG_SCSI_INITIO is not set
--# CONFIG_SCSI_INIA100 is not set
--# CONFIG_SCSI_MVSAS is not set
--# CONFIG_SCSI_STEX is not set
--# CONFIG_SCSI_SYM53C8XX_2 is not set
--# CONFIG_SCSI_QLOGIC_1280 is not set
--# CONFIG_SCSI_QLA_FC is not set
--# CONFIG_SCSI_QLA_ISCSI is not set
--# CONFIG_SCSI_LPFC is not set
--# CONFIG_SCSI_DC395x is not set
--# CONFIG_SCSI_DC390T is not set
--# CONFIG_SCSI_NSP32 is not set
--# CONFIG_SCSI_DEBUG is not set
--# CONFIG_SCSI_SRP is not set
--# CONFIG_ATA is not set
--CONFIG_MD=y
--CONFIG_BLK_DEV_MD=y
--CONFIG_MD_LINEAR=y
--CONFIG_MD_RAID0=y
--CONFIG_MD_RAID1=y
--# CONFIG_MD_RAID10 is not set
--# CONFIG_MD_RAID456 is not set
--# CONFIG_MD_MULTIPATH is not set
--# CONFIG_MD_FAULTY is not set
--# CONFIG_BLK_DEV_DM is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--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 is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--# CONFIG_MARVELL_PHY is not set
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--CONFIG_CICADA_PHY=y
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_ENC28J60 is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--CONFIG_NET_PCI=y
--# CONFIG_PCNET32 is not set
--# CONFIG_AMD8111_ETH is not set
--# CONFIG_ADAPTEC_STARFIRE is not set
--# CONFIG_B44 is not set
--# CONFIG_FORCEDETH is not set
--# CONFIG_EEPRO100 is not set
--CONFIG_E100=y
--# CONFIG_FEALNX is not set
--# CONFIG_NATSEMI is not set
--# CONFIG_NE2K_PCI is not set
--# CONFIG_8139CP is not set
--# CONFIG_8139TOO is not set
--# CONFIG_R6040 is not set
--# CONFIG_SIS900 is not set
--# CONFIG_EPIC100 is not set
--# CONFIG_SUNDANCE is not set
--# CONFIG_TLAN is not set
--# CONFIG_VIA_RHINE is not set
--# CONFIG_SC92031 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--CONFIG_GIANFAR=y
--CONFIG_GFAR_NAPI=y
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--
--#
--# USB Network Adapters
--#
--# CONFIG_USB_CATC is not set
--# CONFIG_USB_KAWETH is not set
--# CONFIG_USB_PEGASUS is not set
--# CONFIG_USB_RTL8150 is not set
--# CONFIG_USB_USBNET is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NET_FC is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--CONFIG_HW_RANDOM=y
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=y
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_ALI1535 is not set
--# CONFIG_I2C_ALI1563 is not set
--# CONFIG_I2C_ALI15X3 is not set
--# CONFIG_I2C_AMD756 is not set
--# CONFIG_I2C_AMD8111 is not set
--# CONFIG_I2C_I801 is not set
--# CONFIG_I2C_I810 is not set
--# CONFIG_I2C_PIIX4 is not set
--CONFIG_I2C_MPC=y
--# CONFIG_I2C_NFORCE2 is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--# CONFIG_I2C_PROSAVAGE is not set
--# CONFIG_I2C_SAVAGE4 is not set
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_SIS5595 is not set
--# CONFIG_I2C_SIS630 is not set
--# CONFIG_I2C_SIS96X 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_VIA is not set
--# CONFIG_I2C_VIAPRO is not set
--# CONFIG_I2C_VOODOO3 is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 is not set
--# CONFIG_I2C_DEBUG_CORE is not set
--# CONFIG_I2C_DEBUG_ALGO is not set
--# CONFIG_I2C_DEBUG_BUS is not set
--# CONFIG_I2C_DEBUG_CHIP is not set
--
--#
--# SPI support
--#
--CONFIG_SPI=y
--# CONFIG_SPI_DEBUG is not set
--CONFIG_SPI_MASTER=y
--
--#
--# SPI Master Controller Drivers
--#
--CONFIG_SPI_BITBANG=y
--CONFIG_SPI_MPC83xx=y
--
--#
--# SPI Protocol Masters
--#
--# CONFIG_SPI_AT25 is not set
--# CONFIG_SPI_SPIDEV is not set
--# CONFIG_SPI_TLE62X0 is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_AD7418 is not set
--# CONFIG_SENSORS_ADM1021 is not set
--# CONFIG_SENSORS_ADM1025 is not set
--# CONFIG_SENSORS_ADM1026 is not set
--# CONFIG_SENSORS_ADM1029 is not set
--# CONFIG_SENSORS_ADM1031 is not set
--# CONFIG_SENSORS_ADM9240 is not set
--# CONFIG_SENSORS_ADT7470 is not set
--# CONFIG_SENSORS_ADT7473 is not set
--# CONFIG_SENSORS_ATXP1 is not set
--# CONFIG_SENSORS_DS1621 is not set
--# CONFIG_SENSORS_I5K_AMB is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_F75375S is not set
--# CONFIG_SENSORS_GL518SM is not set
--# CONFIG_SENSORS_GL520SM is not set
--# CONFIG_SENSORS_IT87 is not set
--# CONFIG_SENSORS_LM63 is not set
--# CONFIG_SENSORS_LM70 is not set
--# CONFIG_SENSORS_LM75 is not set
--# CONFIG_SENSORS_LM77 is not set
--# CONFIG_SENSORS_LM78 is not set
--# CONFIG_SENSORS_LM80 is not set
--# CONFIG_SENSORS_LM83 is not set
--# CONFIG_SENSORS_LM85 is not set
--# 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_SIS5595 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_ADS7828 is not set
--# CONFIG_SENSORS_THMC50 is not set
--# CONFIG_SENSORS_VIA686A is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_VT8231 is not set
--# CONFIG_SENSORS_W83781D is not set
--# CONFIG_SENSORS_W83791D is not set
--# CONFIG_SENSORS_W83792D is not set
--# CONFIG_SENSORS_W83793 is not set
--# CONFIG_SENSORS_W83L785TS is not set
--# CONFIG_SENSORS_W83L786NG is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--# CONFIG_HWMON_DEBUG_CHIP is not set
--# CONFIG_THERMAL is not set
--CONFIG_WATCHDOG=y
--# CONFIG_WATCHDOG_NOWAYOUT is not set
--
--#
--# Watchdog Device Drivers
--#
--# CONFIG_SOFT_WATCHDOG is not set
--CONFIG_83xx_WDT=y
--
--#
--# PCI-based Watchdog Cards
--#
--# CONFIG_PCIPCWATCHDOG is not set
--# CONFIG_WDTPCI is not set
--
--#
--# USB-based Watchdog Cards
--#
--# CONFIG_USBPCWATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--# CONFIG_USB_DABUSB is not set
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=m
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--
--#
--# USB Input Devices
--#
--# CONFIG_USB_HID is not set
--
--#
--# USB HID Boot Protocol drivers
--#
--# CONFIG_USB_KBD is not set
--# CONFIG_USB_MOUSE is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--CONFIG_USB=y
--# CONFIG_USB_DEBUG is not set
--# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
--
--#
--# Miscellaneous USB options
--#
--CONFIG_USB_DEVICEFS=y
--CONFIG_USB_DEVICE_CLASS=y
--# CONFIG_USB_DYNAMIC_MINORS is not set
--# CONFIG_USB_OTG is not set
--
--#
--# USB Host Controller Drivers
--#
--CONFIG_USB_EHCI_HCD=y
--CONFIG_USB_EHCI_ROOT_HUB_TT=y
--# CONFIG_USB_EHCI_TT_NEWSCHED is not set
--CONFIG_USB_EHCI_FSL=y
--CONFIG_USB_EHCI_HCD_PPC_OF=y
--# CONFIG_USB_ISP116X_HCD is not set
--CONFIG_USB_OHCI_HCD=y
--CONFIG_USB_OHCI_HCD_PPC_OF=y
--CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
--# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
--CONFIG_USB_OHCI_HCD_PCI=y
--CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
--CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
--CONFIG_USB_OHCI_LITTLE_ENDIAN=y
--CONFIG_USB_UHCI_HCD=y
--# CONFIG_USB_SL811_HCD is not set
--# CONFIG_USB_R8A66597_HCD is not set
--
--#
--# USB Device Class drivers
--#
--# CONFIG_USB_ACM is not set
--# CONFIG_USB_PRINTER is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--
--#
--# may also be needed; see USB_STORAGE Help for more information
--#
--CONFIG_USB_STORAGE=y
--# CONFIG_USB_STORAGE_DEBUG is not set
--# CONFIG_USB_STORAGE_DATAFAB is not set
--# CONFIG_USB_STORAGE_FREECOM is not set
--# CONFIG_USB_STORAGE_ISD200 is not set
--# CONFIG_USB_STORAGE_DPCM is not set
--# CONFIG_USB_STORAGE_USBAT is not set
--# CONFIG_USB_STORAGE_SDDR09 is not set
--# CONFIG_USB_STORAGE_SDDR55 is not set
--# CONFIG_USB_STORAGE_JUMPSHOT is not set
--# CONFIG_USB_STORAGE_ALAUDA is not set
--# CONFIG_USB_STORAGE_KARMA is not set
--# CONFIG_USB_LIBUSUAL is not set
--
--#
--# USB Imaging devices
--#
--# CONFIG_USB_MDC800 is not set
--# CONFIG_USB_MICROTEK is not set
--CONFIG_USB_MON=y
--
--#
--# USB port drivers
--#
--# CONFIG_USB_SERIAL is not set
--
--#
--# USB Miscellaneous drivers
--#
--# CONFIG_USB_EMI62 is not set
--# CONFIG_USB_EMI26 is not set
--# CONFIG_USB_ADUTUX is not set
--# CONFIG_USB_AUERSWALD is not set
--# CONFIG_USB_RIO500 is not set
--# CONFIG_USB_LEGOTOWER is not set
--# CONFIG_USB_LCD is not set
--# CONFIG_USB_BERRY_CHARGE is not set
--# CONFIG_USB_LED is not set
--# CONFIG_USB_CYPRESS_CY7C63 is not set
--# CONFIG_USB_CYTHERM is not set
--# CONFIG_USB_PHIDGET is not set
--# CONFIG_USB_IDMOUSE is not set
--# CONFIG_USB_FTDI_ELAN is not set
--# CONFIG_USB_APPLEDISPLAY is not set
--# CONFIG_USB_SISUSBVGA is not set
--# CONFIG_USB_LD is not set
--# CONFIG_USB_TRANCEVIBRATOR is not set
--# CONFIG_USB_IOWARRIOR is not set
--# CONFIG_USB_TEST is not set
--CONFIG_USB_GADGET=y
--# CONFIG_USB_GADGET_DEBUG is not set
--# CONFIG_USB_GADGET_DEBUG_FILES is not set
--CONFIG_USB_GADGET_SELECTED=y
--# CONFIG_USB_GADGET_AMD5536UDC is not set
--# CONFIG_USB_GADGET_ATMEL_USBA is not set
--# CONFIG_USB_GADGET_FSL_USB2 is not set
--CONFIG_USB_GADGET_NET2280=y
--CONFIG_USB_NET2280=y
--# 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
--# CONFIG_USB_ZERO is not set
--CONFIG_USB_ETH=y
--CONFIG_USB_ETH_RNDIS=y
--# CONFIG_USB_GADGETFS is not set
--# CONFIG_USB_FILE_STORAGE is not set
--# CONFIG_USB_G_SERIAL is not set
--# CONFIG_USB_MIDI_GADGET is not set
--# CONFIG_USB_G_PRINTER is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--CONFIG_RTC_LIB=y
--CONFIG_RTC_CLASS=y
--CONFIG_RTC_HCTOSYS=y
--CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
--# CONFIG_RTC_DEBUG is not set
--
--#
--# RTC interfaces
--#
--CONFIG_RTC_INTF_SYSFS=y
--CONFIG_RTC_INTF_PROC=y
--CONFIG_RTC_INTF_DEV=y
--CONFIG_RTC_INTF_DEV_UIE_EMUL=y
--# CONFIG_RTC_DRV_TEST is not set
--
--#
--# I2C RTC drivers
--#
--CONFIG_RTC_DRV_DS1307=y
--# CONFIG_RTC_DRV_DS1374 is not set
--# CONFIG_RTC_DRV_DS1672 is not set
--# CONFIG_RTC_DRV_MAX6900 is not set
--# CONFIG_RTC_DRV_RS5C372 is not set
--# CONFIG_RTC_DRV_ISL1208 is not set
--# CONFIG_RTC_DRV_X1205 is not set
--# CONFIG_RTC_DRV_PCF8563 is not set
--# CONFIG_RTC_DRV_PCF8583 is not set
--# CONFIG_RTC_DRV_M41T80 is not set
--# CONFIG_RTC_DRV_S35390A is not set
--
--#
--# SPI RTC drivers
--#
--# CONFIG_RTC_DRV_MAX6902 is not set
--# CONFIG_RTC_DRV_R9701 is not set
--# CONFIG_RTC_DRV_RS5C348 is not set
--
--#
--# Platform RTC drivers
--#
--# CONFIG_RTC_DRV_CMOS is not set
--# CONFIG_RTC_DRV_DS1511 is not set
--# CONFIG_RTC_DRV_DS1553 is not set
--# CONFIG_RTC_DRV_DS1742 is not set
--# CONFIG_RTC_DRV_STK17TA8 is not set
--# CONFIG_RTC_DRV_M48T86 is not set
--# CONFIG_RTC_DRV_M48T59 is not set
--# CONFIG_RTC_DRV_V3020 is not set
--
--#
--# on-CPU RTC drivers
--#
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--CONFIG_EXT3_FS=y
--CONFIG_EXT3_FS_XATTR=y
--# CONFIG_EXT3_FS_POSIX_ACL is not set
--# CONFIG_EXT3_FS_SECURITY is not set
--# CONFIG_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# CONFIG_AUTOFS_FS is not set
--# CONFIG_AUTOFS4_FS is not set
--# CONFIG_FUSE_FS is not set
--
--#
--# CD-ROM/DVD Filesystems
--#
--# CONFIG_ISO9660_FS is not set
--# CONFIG_UDF_FS is not set
--
--#
--# DOS/FAT/NT Filesystems
--#
--# CONFIG_MSDOS_FS is not set
--# CONFIG_VFAT_FS is not set
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
--
--#
--# Miscellaneous filesystems
--#
--# CONFIG_ADFS_FS is not set
--# CONFIG_AFFS_FS is not set
--# CONFIG_HFS_FS is not set
--# CONFIG_HFSPLUS_FS is not set
--# CONFIG_BEFS_FS is not set
--# CONFIG_BFS_FS is not set
--# CONFIG_EFS_FS is not set
--CONFIG_JFFS2_FS=y
--CONFIG_JFFS2_FS_DEBUG=0
--CONFIG_JFFS2_FS_WRITEBUFFER=y
--# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
--# CONFIG_JFFS2_SUMMARY is not set
--# CONFIG_JFFS2_FS_XATTR is not set
--# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
--CONFIG_JFFS2_ZLIB=y
--# CONFIG_JFFS2_LZO is not set
--CONFIG_JFFS2_RTIME=y
--# CONFIG_JFFS2_RUBIN is not set
--# CONFIG_CRAMFS is not set
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--CONFIG_NFS_V4=y
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--CONFIG_SUNRPC_GSS=y
--# CONFIG_SUNRPC_BIND34 is not set
--CONFIG_RPCSEC_GSS_KRB5=y
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--# CONFIG_MAC_PARTITION is not set
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_BSD_DISKLABEL is not set
--# CONFIG_MINIX_SUBPARTITION is not set
--# CONFIG_SOLARIS_X86_PARTITION is not set
--# CONFIG_UNIXWARE_DISKLABEL is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# 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
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_DEBUG_INFO is not set
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--# CONFIG_DEBUGGER is not set
--# CONFIG_BDI_SWITCH is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--CONFIG_CRYPTO_MD5=y
--# CONFIG_CRYPTO_SHA1 is not set
--# CONFIG_CRYPTO_SHA256 is not set
--# CONFIG_CRYPTO_SHA512 is not set
--# CONFIG_CRYPTO_WP512 is not set
--# CONFIG_CRYPTO_TGR192 is not set
--# CONFIG_CRYPTO_GF128MUL is not set
--# CONFIG_CRYPTO_ECB is not set
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# CONFIG_CRYPTO_BLOWFISH is not set
--# CONFIG_CRYPTO_TWOFISH is not set
--# CONFIG_CRYPTO_SERPENT is not set
--# CONFIG_CRYPTO_AES is not set
--# CONFIG_CRYPTO_CAST5 is not set
--# CONFIG_CRYPTO_CAST6 is not set
--# CONFIG_CRYPTO_TEA is not set
--# CONFIG_CRYPTO_ARC4 is not set
--# CONFIG_CRYPTO_KHAZAD is not set
--# CONFIG_CRYPTO_ANUBIS is not set
--# CONFIG_CRYPTO_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/mpc8315_rdb_defconfig
-+++ /dev/null
-@@ -1,1451 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:15 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--CONFIG_6xx=y
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_PPC_FPU=y
--# CONFIG_FSL_EMB_PERFMON is not set
--CONFIG_PPC_STD_MMU=y
--CONFIG_PPC_STD_MMU_32=y
--# CONFIG_PPC_MM_SLICES is not set
--# CONFIG_SMP is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--# CONFIG_FAIR_GROUP_SCHED is not set
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--# CONFIG_KALLSYMS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--# CONFIG_EPOLL is not set
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--# CONFIG_KMOD is not set
--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
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--CONFIG_DEFAULT_AS=y
--# CONFIG_DEFAULT_DEADLINE is not set
--# CONFIG_DEFAULT_CFQ is not set
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="anticipatory"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MULTIPLATFORM is not set
--# CONFIG_PPC_82xx is not set
--CONFIG_PPC_83xx=y
--# CONFIG_PPC_86xx is not set
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC83xx=y
--CONFIG_MPC831x_RDB=y
--# CONFIG_MPC832x_MDS is not set
--# CONFIG_MPC832x_RDB is not set
--# CONFIG_MPC834x_MDS is not set
--# CONFIG_MPC834x_ITX is not set
--# CONFIG_MPC836x_MDS is not set
--# CONFIG_MPC837x_MDS is not set
--# CONFIG_MPC837x_RDB is not set
--# CONFIG_SBC834x is not set
--CONFIG_PPC_MPC831x=y
--CONFIG_IPIC=y
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--CONFIG_TICK_ONESHOT=y
--CONFIG_NO_HZ=y
--CONFIG_HIGH_RES_TIMERS=y
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_GENERIC_ISA_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCI_DEBUG is not set
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--# CONFIG_XFRM_USER is not set
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# CONFIG_IP_ADVANCED_ROUTER is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_PNP=y
--CONFIG_IP_PNP_DHCP=y
--CONFIG_IP_PNP_BOOTP=y
--# CONFIG_IP_PNP_RARP is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# CONFIG_INET_AH is not set
--# CONFIG_INET_ESP is not set
--# CONFIG_INET_IPCOMP is not set
--# CONFIG_INET_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--CONFIG_INET_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--# CONFIG_BRIDGE is not set
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--# CONFIG_LLC2 is not set
--# CONFIG_IPX is not set
--# CONFIG_ATALK is not set
--# CONFIG_X25 is not set
--# CONFIG_LAPB is not set
--# CONFIG_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--# CONFIG_MTD_CONCAT is not set
--CONFIG_MTD_PARTITIONS=y
--# CONFIG_MTD_REDBOOT_PARTS is not set
--# CONFIG_MTD_CMDLINE_PARTS is not set
--# CONFIG_MTD_OF_PARTS is not set
--
--#
--# User Modules And Translation Layers
--#
--CONFIG_MTD_CHAR=y
--CONFIG_MTD_BLKDEVS=y
--CONFIG_MTD_BLOCK=y
--# CONFIG_FTL is not set
--# CONFIG_NFTL is not set
--# CONFIG_INFTL is not set
--# CONFIG_RFD_FTL is not set
--# CONFIG_SSFDC is not set
--# CONFIG_MTD_OOPS is not set
--
--#
--# RAM/ROM/Flash chip drivers
--#
--CONFIG_MTD_CFI=y
--# CONFIG_MTD_JEDECPROBE is not set
--CONFIG_MTD_GEN_PROBE=y
--# CONFIG_MTD_CFI_ADV_OPTIONS is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--CONFIG_MTD_MAP_BANK_WIDTH_4=y
--# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
--CONFIG_MTD_CFI_I1=y
--CONFIG_MTD_CFI_I2=y
--# CONFIG_MTD_CFI_I4 is not set
--# CONFIG_MTD_CFI_I8 is not set
--# CONFIG_MTD_CFI_INTELEXT is not set
--CONFIG_MTD_CFI_AMDSTD=y
--# CONFIG_MTD_CFI_STAA is not set
--CONFIG_MTD_CFI_UTIL=y
--# CONFIG_MTD_RAM is not set
--# CONFIG_MTD_ROM is not set
--# CONFIG_MTD_ABSENT is not set
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--# CONFIG_MTD_PHYSMAP is not set
--CONFIG_MTD_PHYSMAP_OF=y
--# CONFIG_MTD_INTEL_VR_NOR is not set
--# CONFIG_MTD_PLATRAM is not set
--
--#
--# Self-contained MTD device drivers
--#
--# CONFIG_MTD_PMC551 is not set
--# CONFIG_MTD_DATAFLASH is not set
--# CONFIG_MTD_M25P80 is not set
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_MTDRAM is not set
--# CONFIG_MTD_BLOCK2MTD is not set
--
--#
--# Disk-On-Chip Device Drivers
--#
--# CONFIG_MTD_DOC2000 is not set
--# CONFIG_MTD_DOC2001 is not set
--# CONFIG_MTD_DOC2001PLUS is not set
--CONFIG_MTD_NAND=y
--CONFIG_MTD_NAND_VERIFY_WRITE=y
--# CONFIG_MTD_NAND_ECC_SMC is not set
--# CONFIG_MTD_NAND_MUSEUM_IDS is not set
--CONFIG_MTD_NAND_IDS=y
--# CONFIG_MTD_NAND_DISKONCHIP is not set
--# CONFIG_MTD_NAND_CAFE is not set
--# CONFIG_MTD_NAND_NANDSIM is not set
--# CONFIG_MTD_NAND_PLATFORM is not set
--# CONFIG_MTD_ALAUDA is not set
--# CONFIG_MTD_NAND_FSL_ELBC is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--# CONFIG_BLK_DEV_UB is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--CONFIG_SCSI=y
--CONFIG_SCSI_DMA=y
--# CONFIG_SCSI_TGT is not set
--# CONFIG_SCSI_NETLINK is not set
--CONFIG_SCSI_PROC_FS=y
--
--#
--# SCSI support type (disk, tape, CD-ROM)
--#
--# CONFIG_BLK_DEV_SD is not set
--# CONFIG_CHR_DEV_ST is not set
--# CONFIG_CHR_DEV_OSST is not set
--# CONFIG_BLK_DEV_SR is not set
--CONFIG_CHR_DEV_SG=y
--# CONFIG_CHR_DEV_SCH is not set
--
--#
--# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
--#
--# CONFIG_SCSI_MULTI_LUN is not set
--# CONFIG_SCSI_CONSTANTS is not set
--# CONFIG_SCSI_LOGGING is not set
--# CONFIG_SCSI_SCAN_ASYNC is not set
--CONFIG_SCSI_WAIT_SCAN=m
--
--#
--# SCSI Transports
--#
--CONFIG_SCSI_SPI_ATTRS=y
--# CONFIG_SCSI_FC_ATTRS is not set
--# CONFIG_SCSI_ISCSI_ATTRS is not set
--# CONFIG_SCSI_SAS_LIBSAS is not set
--# CONFIG_SCSI_SRP_ATTRS is not set
--CONFIG_SCSI_LOWLEVEL=y
--# CONFIG_ISCSI_TCP is not set
--# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
--# CONFIG_SCSI_3W_9XXX is not set
--# CONFIG_SCSI_ACARD is not set
--# CONFIG_SCSI_AACRAID is not set
--# CONFIG_SCSI_AIC7XXX is not set
--# CONFIG_SCSI_AIC7XXX_OLD is not set
--# CONFIG_SCSI_AIC79XX is not set
--# CONFIG_SCSI_AIC94XX is not set
--# CONFIG_SCSI_DPT_I2O is not set
--# CONFIG_SCSI_ADVANSYS is not set
--# CONFIG_SCSI_ARCMSR is not set
--# CONFIG_MEGARAID_NEWGEN is not set
--# CONFIG_MEGARAID_LEGACY is not set
--# CONFIG_MEGARAID_SAS is not set
--# CONFIG_SCSI_HPTIOP is not set
--# CONFIG_SCSI_BUSLOGIC is not set
--# CONFIG_SCSI_DMX3191D is not set
--# CONFIG_SCSI_EATA is not set
--# CONFIG_SCSI_FUTURE_DOMAIN is not set
--# CONFIG_SCSI_GDTH is not set
--# CONFIG_SCSI_IPS is not set
--# CONFIG_SCSI_INITIO is not set
--# CONFIG_SCSI_INIA100 is not set
--# CONFIG_SCSI_MVSAS is not set
--# CONFIG_SCSI_STEX is not set
--# CONFIG_SCSI_SYM53C8XX_2 is not set
--# CONFIG_SCSI_IPR is not set
--# CONFIG_SCSI_QLOGIC_1280 is not set
--# CONFIG_SCSI_QLA_FC is not set
--# CONFIG_SCSI_QLA_ISCSI is not set
--# CONFIG_SCSI_LPFC is not set
--# CONFIG_SCSI_DC395x is not set
--# CONFIG_SCSI_DC390T is not set
--# CONFIG_SCSI_NSP32 is not set
--# CONFIG_SCSI_DEBUG is not set
--# CONFIG_SCSI_SRP is not set
--CONFIG_ATA=y
--# CONFIG_ATA_NONSTANDARD is not set
--# CONFIG_SATA_AHCI is not set
--# CONFIG_SATA_SVW is not set
--# CONFIG_ATA_PIIX is not set
--# CONFIG_SATA_MV is not set
--# CONFIG_SATA_NV is not set
--# CONFIG_PDC_ADMA is not set
--# CONFIG_SATA_QSTOR is not set
--# CONFIG_SATA_PROMISE is not set
--# CONFIG_SATA_SX4 is not set
--# CONFIG_SATA_SIL is not set
--# CONFIG_SATA_SIL24 is not set
--# CONFIG_SATA_SIS is not set
--# CONFIG_SATA_ULI is not set
--# CONFIG_SATA_VIA is not set
--# CONFIG_SATA_VITESSE is not set
--# CONFIG_SATA_INIC162X is not set
--CONFIG_SATA_FSL=y
--# CONFIG_PATA_ALI is not set
--# CONFIG_PATA_AMD is not set
--# CONFIG_PATA_ARTOP is not set
--# CONFIG_PATA_ATIIXP is not set
--# CONFIG_PATA_CMD640_PCI is not set
--# CONFIG_PATA_CMD64X is not set
--# CONFIG_PATA_CS5520 is not set
--# CONFIG_PATA_CS5530 is not set
--# CONFIG_PATA_CYPRESS is not set
--# CONFIG_PATA_EFAR is not set
--# CONFIG_ATA_GENERIC is not set
--# CONFIG_PATA_HPT366 is not set
--# CONFIG_PATA_HPT37X is not set
--# CONFIG_PATA_HPT3X2N is not set
--# CONFIG_PATA_HPT3X3 is not set
--# CONFIG_PATA_IT821X is not set
--# CONFIG_PATA_IT8213 is not set
--# CONFIG_PATA_JMICRON is not set
--# CONFIG_PATA_TRIFLEX is not set
--# CONFIG_PATA_MARVELL is not set
--# CONFIG_PATA_MPIIX is not set
--# CONFIG_PATA_OLDPIIX is not set
--# CONFIG_PATA_NETCELL is not set
--# CONFIG_PATA_NINJA32 is not set
--# CONFIG_PATA_NS87410 is not set
--# CONFIG_PATA_NS87415 is not set
--# CONFIG_PATA_OPTI is not set
--# CONFIG_PATA_OPTIDMA is not set
--# CONFIG_PATA_PDC_OLD is not set
--# CONFIG_PATA_RADISYS is not set
--# CONFIG_PATA_RZ1000 is not set
--# CONFIG_PATA_SC1200 is not set
--# CONFIG_PATA_SERVERWORKS is not set
--# CONFIG_PATA_PDC2027X is not set
--# CONFIG_PATA_SIL680 is not set
--# CONFIG_PATA_SIS is not set
--# CONFIG_PATA_VIA is not set
--# CONFIG_PATA_WINBOND is not set
--# CONFIG_PATA_PLATFORM is not set
--CONFIG_MD=y
--CONFIG_BLK_DEV_MD=y
--CONFIG_MD_LINEAR=y
--CONFIG_MD_RAID0=y
--CONFIG_MD_RAID1=y
--# CONFIG_MD_RAID10 is not set
--# CONFIG_MD_RAID456 is not set
--# CONFIG_MD_MULTIPATH is not set
--# CONFIG_MD_FAULTY is not set
--# CONFIG_BLK_DEV_DM is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--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 is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--# CONFIG_MARVELL_PHY is not set
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_ENC28J60 is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--CONFIG_NET_PCI=y
--# CONFIG_PCNET32 is not set
--# CONFIG_AMD8111_ETH is not set
--# CONFIG_ADAPTEC_STARFIRE is not set
--# CONFIG_B44 is not set
--# CONFIG_FORCEDETH is not set
--# CONFIG_EEPRO100 is not set
--CONFIG_E100=y
--# CONFIG_FEALNX is not set
--# CONFIG_NATSEMI is not set
--# CONFIG_NE2K_PCI is not set
--# CONFIG_8139CP is not set
--# CONFIG_8139TOO is not set
--# CONFIG_R6040 is not set
--# CONFIG_SIS900 is not set
--# CONFIG_EPIC100 is not set
--# CONFIG_SUNDANCE is not set
--# CONFIG_TLAN is not set
--# CONFIG_VIA_RHINE is not set
--# CONFIG_SC92031 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--CONFIG_GIANFAR=y
--CONFIG_GFAR_NAPI=y
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--
--#
--# USB Network Adapters
--#
--# CONFIG_USB_CATC is not set
--# CONFIG_USB_KAWETH is not set
--# CONFIG_USB_PEGASUS is not set
--# CONFIG_USB_RTL8150 is not set
--# CONFIG_USB_USBNET is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NET_FC is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--CONFIG_HW_RANDOM=y
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=y
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_ALI1535 is not set
--# CONFIG_I2C_ALI1563 is not set
--# CONFIG_I2C_ALI15X3 is not set
--# CONFIG_I2C_AMD756 is not set
--# CONFIG_I2C_AMD8111 is not set
--# CONFIG_I2C_I801 is not set
--# CONFIG_I2C_I810 is not set
--# CONFIG_I2C_PIIX4 is not set
--CONFIG_I2C_MPC=y
--# CONFIG_I2C_NFORCE2 is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--# CONFIG_I2C_PROSAVAGE is not set
--# CONFIG_I2C_SAVAGE4 is not set
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_SIS5595 is not set
--# CONFIG_I2C_SIS630 is not set
--# CONFIG_I2C_SIS96X 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_VIA is not set
--# CONFIG_I2C_VIAPRO is not set
--# CONFIG_I2C_VOODOO3 is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 is not set
--# CONFIG_I2C_DEBUG_CORE is not set
--# CONFIG_I2C_DEBUG_ALGO is not set
--# CONFIG_I2C_DEBUG_BUS is not set
--# CONFIG_I2C_DEBUG_CHIP is not set
--
--#
--# SPI support
--#
--CONFIG_SPI=y
--# CONFIG_SPI_DEBUG is not set
--CONFIG_SPI_MASTER=y
--
--#
--# SPI Master Controller Drivers
--#
--CONFIG_SPI_BITBANG=y
--CONFIG_SPI_MPC83xx=y
--
--#
--# SPI Protocol Masters
--#
--# CONFIG_SPI_AT25 is not set
--# CONFIG_SPI_SPIDEV is not set
--# CONFIG_SPI_TLE62X0 is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_AD7418 is not set
--# CONFIG_SENSORS_ADM1021 is not set
--# CONFIG_SENSORS_ADM1025 is not set
--# CONFIG_SENSORS_ADM1026 is not set
--# CONFIG_SENSORS_ADM1029 is not set
--# CONFIG_SENSORS_ADM1031 is not set
--# CONFIG_SENSORS_ADM9240 is not set
--# CONFIG_SENSORS_ADT7470 is not set
--# CONFIG_SENSORS_ADT7473 is not set
--# CONFIG_SENSORS_ATXP1 is not set
--# CONFIG_SENSORS_DS1621 is not set
--# CONFIG_SENSORS_I5K_AMB is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_F75375S is not set
--# CONFIG_SENSORS_GL518SM is not set
--# CONFIG_SENSORS_GL520SM is not set
--# CONFIG_SENSORS_IT87 is not set
--# CONFIG_SENSORS_LM63 is not set
--# CONFIG_SENSORS_LM70 is not set
--# CONFIG_SENSORS_LM75 is not set
--# CONFIG_SENSORS_LM77 is not set
--# CONFIG_SENSORS_LM78 is not set
--# CONFIG_SENSORS_LM80 is not set
--# CONFIG_SENSORS_LM83 is not set
--# CONFIG_SENSORS_LM85 is not set
--# 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_SIS5595 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_ADS7828 is not set
--# CONFIG_SENSORS_THMC50 is not set
--# CONFIG_SENSORS_VIA686A is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_VT8231 is not set
--# CONFIG_SENSORS_W83781D is not set
--# CONFIG_SENSORS_W83791D is not set
--# CONFIG_SENSORS_W83792D is not set
--# CONFIG_SENSORS_W83793 is not set
--# CONFIG_SENSORS_W83L785TS is not set
--# CONFIG_SENSORS_W83L786NG is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--# CONFIG_HWMON_DEBUG_CHIP is not set
--# CONFIG_THERMAL is not set
--CONFIG_WATCHDOG=y
--# CONFIG_WATCHDOG_NOWAYOUT is not set
--
--#
--# Watchdog Device Drivers
--#
--# CONFIG_SOFT_WATCHDOG is not set
--CONFIG_83xx_WDT=y
--
--#
--# PCI-based Watchdog Cards
--#
--# CONFIG_PCIPCWATCHDOG is not set
--# CONFIG_WDTPCI is not set
--
--#
--# USB-based Watchdog Cards
--#
--# CONFIG_USBPCWATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--# CONFIG_USB_DABUSB is not set
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=m
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--
--#
--# USB Input Devices
--#
--# CONFIG_USB_HID is not set
--
--#
--# USB HID Boot Protocol drivers
--#
--# CONFIG_USB_KBD is not set
--# CONFIG_USB_MOUSE is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--CONFIG_USB=y
--# CONFIG_USB_DEBUG is not set
--# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
--
--#
--# Miscellaneous USB options
--#
--CONFIG_USB_DEVICEFS=y
--CONFIG_USB_DEVICE_CLASS=y
--# CONFIG_USB_DYNAMIC_MINORS is not set
--# CONFIG_USB_OTG is not set
--
--#
--# USB Host Controller Drivers
--#
--CONFIG_USB_EHCI_HCD=y
--CONFIG_USB_EHCI_ROOT_HUB_TT=y
--# CONFIG_USB_EHCI_TT_NEWSCHED is not set
--CONFIG_USB_EHCI_FSL=y
--CONFIG_USB_EHCI_HCD_PPC_OF=y
--# CONFIG_USB_ISP116X_HCD is not set
--CONFIG_USB_OHCI_HCD=y
--CONFIG_USB_OHCI_HCD_PPC_OF=y
--CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
--# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
--CONFIG_USB_OHCI_HCD_PCI=y
--CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
--CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
--CONFIG_USB_OHCI_LITTLE_ENDIAN=y
--CONFIG_USB_UHCI_HCD=y
--# CONFIG_USB_SL811_HCD is not set
--# CONFIG_USB_R8A66597_HCD is not set
--
--#
--# USB Device Class drivers
--#
--# CONFIG_USB_ACM is not set
--# CONFIG_USB_PRINTER is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--
--#
--# may also be needed; see USB_STORAGE Help for more information
--#
--CONFIG_USB_STORAGE=y
--# CONFIG_USB_STORAGE_DEBUG is not set
--# CONFIG_USB_STORAGE_DATAFAB is not set
--# CONFIG_USB_STORAGE_FREECOM is not set
--# CONFIG_USB_STORAGE_ISD200 is not set
--# CONFIG_USB_STORAGE_DPCM is not set
--# CONFIG_USB_STORAGE_USBAT is not set
--# CONFIG_USB_STORAGE_SDDR09 is not set
--# CONFIG_USB_STORAGE_SDDR55 is not set
--# CONFIG_USB_STORAGE_JUMPSHOT is not set
--# CONFIG_USB_STORAGE_ALAUDA is not set
--# CONFIG_USB_STORAGE_KARMA is not set
--# CONFIG_USB_LIBUSUAL is not set
--
--#
--# USB Imaging devices
--#
--# CONFIG_USB_MDC800 is not set
--# CONFIG_USB_MICROTEK is not set
--CONFIG_USB_MON=y
--
--#
--# USB port drivers
--#
--# CONFIG_USB_SERIAL is not set
--
--#
--# USB Miscellaneous drivers
--#
--# CONFIG_USB_EMI62 is not set
--# CONFIG_USB_EMI26 is not set
--# CONFIG_USB_ADUTUX is not set
--# CONFIG_USB_AUERSWALD is not set
--# CONFIG_USB_RIO500 is not set
--# CONFIG_USB_LEGOTOWER is not set
--# CONFIG_USB_LCD is not set
--# CONFIG_USB_BERRY_CHARGE is not set
--# CONFIG_USB_LED is not set
--# CONFIG_USB_CYPRESS_CY7C63 is not set
--# CONFIG_USB_CYTHERM is not set
--# CONFIG_USB_PHIDGET is not set
--# CONFIG_USB_IDMOUSE is not set
--# CONFIG_USB_FTDI_ELAN is not set
--# CONFIG_USB_APPLEDISPLAY is not set
--# CONFIG_USB_SISUSBVGA is not set
--# CONFIG_USB_LD is not set
--# CONFIG_USB_TRANCEVIBRATOR is not set
--# CONFIG_USB_IOWARRIOR is not set
--# CONFIG_USB_TEST is not set
--CONFIG_USB_GADGET=y
--# CONFIG_USB_GADGET_DEBUG is not set
--# CONFIG_USB_GADGET_DEBUG_FILES is not set
--CONFIG_USB_GADGET_SELECTED=y
--# CONFIG_USB_GADGET_AMD5536UDC is not set
--# CONFIG_USB_GADGET_ATMEL_USBA is not set
--# CONFIG_USB_GADGET_FSL_USB2 is not set
--CONFIG_USB_GADGET_NET2280=y
--CONFIG_USB_NET2280=y
--# 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
--# CONFIG_USB_ZERO is not set
--CONFIG_USB_ETH=y
--CONFIG_USB_ETH_RNDIS=y
--# CONFIG_USB_GADGETFS is not set
--# CONFIG_USB_FILE_STORAGE is not set
--# CONFIG_USB_G_SERIAL is not set
--# CONFIG_USB_MIDI_GADGET is not set
--# CONFIG_USB_G_PRINTER is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--CONFIG_RTC_LIB=y
--CONFIG_RTC_CLASS=y
--CONFIG_RTC_HCTOSYS=y
--CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
--# CONFIG_RTC_DEBUG is not set
--
--#
--# RTC interfaces
--#
--CONFIG_RTC_INTF_SYSFS=y
--CONFIG_RTC_INTF_PROC=y
--CONFIG_RTC_INTF_DEV=y
--CONFIG_RTC_INTF_DEV_UIE_EMUL=y
--# CONFIG_RTC_DRV_TEST is not set
--
--#
--# I2C RTC drivers
--#
--CONFIG_RTC_DRV_DS1307=y
--# CONFIG_RTC_DRV_DS1374 is not set
--# CONFIG_RTC_DRV_DS1672 is not set
--# CONFIG_RTC_DRV_MAX6900 is not set
--# CONFIG_RTC_DRV_RS5C372 is not set
--# CONFIG_RTC_DRV_ISL1208 is not set
--# CONFIG_RTC_DRV_X1205 is not set
--# CONFIG_RTC_DRV_PCF8563 is not set
--# CONFIG_RTC_DRV_PCF8583 is not set
--# CONFIG_RTC_DRV_M41T80 is not set
--# CONFIG_RTC_DRV_S35390A is not set
--
--#
--# SPI RTC drivers
--#
--# CONFIG_RTC_DRV_MAX6902 is not set
--# CONFIG_RTC_DRV_R9701 is not set
--# CONFIG_RTC_DRV_RS5C348 is not set
--
--#
--# Platform RTC drivers
--#
--# CONFIG_RTC_DRV_CMOS is not set
--# CONFIG_RTC_DRV_DS1511 is not set
--# CONFIG_RTC_DRV_DS1553 is not set
--# CONFIG_RTC_DRV_DS1742 is not set
--# CONFIG_RTC_DRV_STK17TA8 is not set
--# CONFIG_RTC_DRV_M48T86 is not set
--# CONFIG_RTC_DRV_M48T59 is not set
--# CONFIG_RTC_DRV_V3020 is not set
--
--#
--# on-CPU RTC drivers
--#
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--CONFIG_EXT3_FS=y
--CONFIG_EXT3_FS_XATTR=y
--# CONFIG_EXT3_FS_POSIX_ACL is not set
--# CONFIG_EXT3_FS_SECURITY is not set
--# CONFIG_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# CONFIG_AUTOFS_FS is not set
--# CONFIG_AUTOFS4_FS is not set
--# CONFIG_FUSE_FS is not set
--
--#
--# CD-ROM/DVD Filesystems
--#
--# CONFIG_ISO9660_FS is not set
--# CONFIG_UDF_FS is not set
--
--#
--# DOS/FAT/NT Filesystems
--#
--# CONFIG_MSDOS_FS is not set
--# CONFIG_VFAT_FS is not set
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
--
--#
--# Miscellaneous filesystems
--#
--# CONFIG_ADFS_FS is not set
--# CONFIG_AFFS_FS is not set
--# CONFIG_HFS_FS is not set
--# CONFIG_HFSPLUS_FS is not set
--# CONFIG_BEFS_FS is not set
--# CONFIG_BFS_FS is not set
--# CONFIG_EFS_FS is not set
--CONFIG_JFFS2_FS=y
--CONFIG_JFFS2_FS_DEBUG=0
--CONFIG_JFFS2_FS_WRITEBUFFER=y
--# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
--# CONFIG_JFFS2_SUMMARY is not set
--# CONFIG_JFFS2_FS_XATTR is not set
--# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
--CONFIG_JFFS2_ZLIB=y
--# CONFIG_JFFS2_LZO is not set
--CONFIG_JFFS2_RTIME=y
--# CONFIG_JFFS2_RUBIN is not set
--# CONFIG_CRAMFS is not set
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--CONFIG_NFS_V4=y
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--CONFIG_SUNRPC_GSS=y
--# CONFIG_SUNRPC_BIND34 is not set
--CONFIG_RPCSEC_GSS_KRB5=y
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--# CONFIG_MAC_PARTITION is not set
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_BSD_DISKLABEL is not set
--# CONFIG_MINIX_SUBPARTITION is not set
--# CONFIG_SOLARIS_X86_PARTITION is not set
--# CONFIG_UNIXWARE_DISKLABEL is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# 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
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_DEBUG_INFO is not set
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--# CONFIG_DEBUGGER is not set
--# CONFIG_BDI_SWITCH is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--CONFIG_CRYPTO_MD5=y
--# CONFIG_CRYPTO_SHA1 is not set
--# CONFIG_CRYPTO_SHA256 is not set
--# CONFIG_CRYPTO_SHA512 is not set
--# CONFIG_CRYPTO_WP512 is not set
--# CONFIG_CRYPTO_TGR192 is not set
--# CONFIG_CRYPTO_GF128MUL is not set
--# CONFIG_CRYPTO_ECB is not set
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# CONFIG_CRYPTO_BLOWFISH is not set
--# CONFIG_CRYPTO_TWOFISH is not set
--# CONFIG_CRYPTO_SERPENT is not set
--# CONFIG_CRYPTO_AES is not set
--# CONFIG_CRYPTO_CAST5 is not set
--# CONFIG_CRYPTO_CAST6 is not set
--# CONFIG_CRYPTO_TEA is not set
--# CONFIG_CRYPTO_ARC4 is not set
--# CONFIG_CRYPTO_KHAZAD is not set
--# CONFIG_CRYPTO_ANUBIS is not set
--# CONFIG_CRYPTO_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/mpc832x_mds_defconfig
-+++ /dev/null
-@@ -1,1081 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc7
--# Mon Mar 31 11:36:51 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--CONFIG_6xx=y
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_PPC_FPU=y
--# CONFIG_FSL_EMB_PERFMON is not set
--CONFIG_PPC_STD_MMU=y
--CONFIG_PPC_STD_MMU_32=y
--# CONFIG_PPC_MM_SLICES is not set
--# CONFIG_SMP is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--# CONFIG_FAIR_GROUP_SCHED is not set
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--# CONFIG_KALLSYMS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--# CONFIG_EPOLL is not set
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--# CONFIG_KMOD is not set
--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
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--CONFIG_DEFAULT_AS=y
--# CONFIG_DEFAULT_DEADLINE is not set
--# CONFIG_DEFAULT_CFQ is not set
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="anticipatory"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MULTIPLATFORM is not set
--# CONFIG_PPC_82xx is not set
--CONFIG_PPC_83xx=y
--# CONFIG_PPC_86xx is not set
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC83xx=y
--# CONFIG_MPC831x_RDB is not set
--CONFIG_MPC832x_MDS=y
--# CONFIG_MPC832x_RDB is not set
--# CONFIG_MPC834x_MDS is not set
--# CONFIG_MPC834x_ITX is not set
--# CONFIG_MPC836x_MDS is not set
--# CONFIG_MPC837x_MDS is not set
--# CONFIG_MPC837x_RDB is not set
--# CONFIG_SBC834x is not set
--CONFIG_PPC_MPC832x=y
--CONFIG_IPIC=y
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--CONFIG_QUICC_ENGINE=y
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--CONFIG_TICK_ONESHOT=y
--CONFIG_NO_HZ=y
--CONFIG_HIGH_RES_TIMERS=y
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--CONFIG_MATH_EMULATION=y
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_GENERIC_ISA_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--# CONFIG_XFRM_USER is not set
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# CONFIG_IP_ADVANCED_ROUTER is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_PNP=y
--CONFIG_IP_PNP_DHCP=y
--CONFIG_IP_PNP_BOOTP=y
--# CONFIG_IP_PNP_RARP is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# CONFIG_INET_AH is not set
--# CONFIG_INET_ESP is not set
--# CONFIG_INET_IPCOMP is not set
--# CONFIG_INET_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--CONFIG_INET_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--# CONFIG_BRIDGE is not set
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--# CONFIG_LLC2 is not set
--# CONFIG_IPX is not set
--# CONFIG_ATALK is not set
--# CONFIG_X25 is not set
--# CONFIG_LAPB is not set
--# CONFIG_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--CONFIG_SCSI=y
--CONFIG_SCSI_DMA=y
--# CONFIG_SCSI_TGT is not set
--# CONFIG_SCSI_NETLINK is not set
--CONFIG_SCSI_PROC_FS=y
--
--#
--# SCSI support type (disk, tape, CD-ROM)
--#
--# CONFIG_BLK_DEV_SD is not set
--# CONFIG_CHR_DEV_ST is not set
--# CONFIG_CHR_DEV_OSST is not set
--# CONFIG_BLK_DEV_SR is not set
--# CONFIG_CHR_DEV_SG is not set
--# CONFIG_CHR_DEV_SCH is not set
--
--#
--# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
--#
--# CONFIG_SCSI_MULTI_LUN is not set
--# CONFIG_SCSI_CONSTANTS is not set
--# CONFIG_SCSI_LOGGING is not set
--# CONFIG_SCSI_SCAN_ASYNC is not set
--CONFIG_SCSI_WAIT_SCAN=m
--
--#
--# SCSI Transports
--#
--# CONFIG_SCSI_SPI_ATTRS is not set
--# CONFIG_SCSI_FC_ATTRS is not set
--# CONFIG_SCSI_ISCSI_ATTRS is not set
--# CONFIG_SCSI_SAS_LIBSAS is not set
--# CONFIG_SCSI_SRP_ATTRS is not set
--CONFIG_SCSI_LOWLEVEL=y
--# CONFIG_ISCSI_TCP is not set
--# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
--# CONFIG_SCSI_3W_9XXX is not set
--# CONFIG_SCSI_ACARD is not set
--# CONFIG_SCSI_AACRAID is not set
--# CONFIG_SCSI_AIC7XXX is not set
--# CONFIG_SCSI_AIC7XXX_OLD is not set
--# CONFIG_SCSI_AIC79XX is not set
--# CONFIG_SCSI_AIC94XX is not set
--# CONFIG_SCSI_DPT_I2O is not set
--# CONFIG_SCSI_ADVANSYS is not set
--# CONFIG_SCSI_ARCMSR is not set
--# CONFIG_MEGARAID_NEWGEN is not set
--# CONFIG_MEGARAID_LEGACY is not set
--# CONFIG_MEGARAID_SAS is not set
--# CONFIG_SCSI_HPTIOP is not set
--# CONFIG_SCSI_BUSLOGIC is not set
--# CONFIG_SCSI_DMX3191D is not set
--# CONFIG_SCSI_EATA is not set
--# CONFIG_SCSI_FUTURE_DOMAIN is not set
--# CONFIG_SCSI_GDTH is not set
--# CONFIG_SCSI_IPS is not set
--# CONFIG_SCSI_INITIO is not set
--# CONFIG_SCSI_INIA100 is not set
--# CONFIG_SCSI_MVSAS is not set
--# CONFIG_SCSI_STEX is not set
--# CONFIG_SCSI_SYM53C8XX_2 is not set
--# CONFIG_SCSI_QLOGIC_1280 is not set
--# CONFIG_SCSI_QLA_FC is not set
--# CONFIG_SCSI_QLA_ISCSI is not set
--# CONFIG_SCSI_LPFC is not set
--# CONFIG_SCSI_DC395x is not set
--# CONFIG_SCSI_DC390T is not set
--# CONFIG_SCSI_NSP32 is not set
--# CONFIG_SCSI_DEBUG is not set
--# CONFIG_SCSI_SRP is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--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 is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--# CONFIG_MARVELL_PHY is not set
--CONFIG_DAVICOM_PHY=y
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--# CONFIG_GIANFAR is not set
--CONFIG_UCC_GETH=y
--# CONFIG_UGETH_NAPI is not set
--# CONFIG_UGETH_MAGIC_PACKET is not set
--# CONFIG_UGETH_FILTERING is not set
--# CONFIG_UGETH_TX_ON_DEMAND is not set
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NET_FC is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--# CONFIG_SERIAL_OF_PLATFORM is not set
--# CONFIG_SERIAL_QE is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--CONFIG_HW_RANDOM=y
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=y
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_ALI1535 is not set
--# CONFIG_I2C_ALI1563 is not set
--# CONFIG_I2C_ALI15X3 is not set
--# CONFIG_I2C_AMD756 is not set
--# CONFIG_I2C_AMD8111 is not set
--# CONFIG_I2C_I801 is not set
--# CONFIG_I2C_I810 is not set
--# CONFIG_I2C_PIIX4 is not set
--CONFIG_I2C_MPC=y
--# CONFIG_I2C_NFORCE2 is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--# CONFIG_I2C_PROSAVAGE is not set
--# CONFIG_I2C_SAVAGE4 is not set
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_SIS5595 is not set
--# CONFIG_I2C_SIS630 is not set
--# CONFIG_I2C_SIS96X is not set
--# CONFIG_I2C_TAOS_EVM is not set
--# CONFIG_I2C_STUB is not set
--# CONFIG_I2C_VIA is not set
--# CONFIG_I2C_VIAPRO is not set
--# CONFIG_I2C_VOODOO3 is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 is not set
--# CONFIG_I2C_DEBUG_CORE is not set
--# CONFIG_I2C_DEBUG_ALGO is not set
--# CONFIG_I2C_DEBUG_BUS is not set
--# CONFIG_I2C_DEBUG_CHIP is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_AD7418 is not set
--# CONFIG_SENSORS_ADM1021 is not set
--# CONFIG_SENSORS_ADM1025 is not set
--# CONFIG_SENSORS_ADM1026 is not set
--# CONFIG_SENSORS_ADM1029 is not set
--# CONFIG_SENSORS_ADM1031 is not set
--# CONFIG_SENSORS_ADM9240 is not set
--# CONFIG_SENSORS_ADT7470 is not set
--# CONFIG_SENSORS_ADT7473 is not set
--# CONFIG_SENSORS_ATXP1 is not set
--# CONFIG_SENSORS_DS1621 is not set
--# CONFIG_SENSORS_I5K_AMB is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_F75375S is not set
--# CONFIG_SENSORS_GL518SM is not set
--# CONFIG_SENSORS_GL520SM is not set
--# CONFIG_SENSORS_IT87 is not set
--# CONFIG_SENSORS_LM63 is not set
--# CONFIG_SENSORS_LM75 is not set
--# CONFIG_SENSORS_LM77 is not set
--# CONFIG_SENSORS_LM78 is not set
--# CONFIG_SENSORS_LM80 is not set
--# CONFIG_SENSORS_LM83 is not set
--# CONFIG_SENSORS_LM85 is not set
--# 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_SIS5595 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_ADS7828 is not set
--# CONFIG_SENSORS_THMC50 is not set
--# CONFIG_SENSORS_VIA686A is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_VT8231 is not set
--# CONFIG_SENSORS_W83781D is not set
--# CONFIG_SENSORS_W83791D is not set
--# CONFIG_SENSORS_W83792D is not set
--# CONFIG_SENSORS_W83793 is not set
--# CONFIG_SENSORS_W83L785TS is not set
--# CONFIG_SENSORS_W83L786NG is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--# CONFIG_HWMON_DEBUG_CHIP is not set
--# CONFIG_THERMAL is not set
--CONFIG_WATCHDOG=y
--# CONFIG_WATCHDOG_NOWAYOUT is not set
--
--#
--# Watchdog Device Drivers
--#
--# CONFIG_SOFT_WATCHDOG is not set
--CONFIG_83xx_WDT=y
--
--#
--# PCI-based Watchdog Cards
--#
--# CONFIG_PCIPCWATCHDOG is not set
--# CONFIG_WDTPCI is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=m
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--CONFIG_RTC_LIB=y
--CONFIG_RTC_CLASS=y
--CONFIG_RTC_HCTOSYS=y
--CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
--# CONFIG_RTC_DEBUG is not set
--
--#
--# RTC interfaces
--#
--CONFIG_RTC_INTF_SYSFS=y
--CONFIG_RTC_INTF_PROC=y
--CONFIG_RTC_INTF_DEV=y
--# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
--# CONFIG_RTC_DRV_TEST is not set
--
--#
--# I2C RTC drivers
--#
--# CONFIG_RTC_DRV_DS1307 is not set
--CONFIG_RTC_DRV_DS1374=y
--# CONFIG_RTC_DRV_DS1672 is not set
--# CONFIG_RTC_DRV_MAX6900 is not set
--# CONFIG_RTC_DRV_RS5C372 is not set
--# CONFIG_RTC_DRV_ISL1208 is not set
--# CONFIG_RTC_DRV_X1205 is not set
--# CONFIG_RTC_DRV_PCF8563 is not set
--# CONFIG_RTC_DRV_PCF8583 is not set
--# CONFIG_RTC_DRV_M41T80 is not set
--# CONFIG_RTC_DRV_S35390A is not set
--
--#
--# SPI RTC drivers
--#
--
--#
--# Platform RTC drivers
--#
--# CONFIG_RTC_DRV_CMOS is not set
--# CONFIG_RTC_DRV_DS1511 is not set
--# CONFIG_RTC_DRV_DS1553 is not set
--# CONFIG_RTC_DRV_DS1742 is not set
--# CONFIG_RTC_DRV_STK17TA8 is not set
--# CONFIG_RTC_DRV_M48T86 is not set
--# CONFIG_RTC_DRV_M48T59 is not set
--# CONFIG_RTC_DRV_V3020 is not set
--
--#
--# on-CPU RTC drivers
--#
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--CONFIG_EXT3_FS=y
--CONFIG_EXT3_FS_XATTR=y
--# CONFIG_EXT3_FS_POSIX_ACL is not set
--# CONFIG_EXT3_FS_SECURITY is not set
--# CONFIG_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# CONFIG_AUTOFS_FS is not set
--# CONFIG_AUTOFS4_FS is not set
--# CONFIG_FUSE_FS is not set
--
--#
--# CD-ROM/DVD Filesystems
--#
--# CONFIG_ISO9660_FS is not set
--# CONFIG_UDF_FS is not set
--
--#
--# DOS/FAT/NT Filesystems
--#
--# CONFIG_MSDOS_FS is not set
--# CONFIG_VFAT_FS is not set
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
--
--#
--# Miscellaneous filesystems
--#
--# CONFIG_ADFS_FS is not set
--# CONFIG_AFFS_FS is not set
--# CONFIG_HFS_FS is not set
--# CONFIG_HFSPLUS_FS is not set
--# CONFIG_BEFS_FS is not set
--# CONFIG_BFS_FS is not set
--# CONFIG_EFS_FS is not set
--# CONFIG_CRAMFS is not set
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--CONFIG_NFS_V4=y
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--CONFIG_SUNRPC_GSS=y
--# CONFIG_SUNRPC_BIND34 is not set
--CONFIG_RPCSEC_GSS_KRB5=y
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--# CONFIG_MAC_PARTITION is not set
--# CONFIG_MSDOS_PARTITION is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--CONFIG_UCC_FAST=y
--CONFIG_UCC=y
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# 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_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--# CONFIG_DEBUG_KERNEL is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--CONFIG_CRYPTO_MD5=y
--# CONFIG_CRYPTO_SHA1 is not set
--# CONFIG_CRYPTO_SHA256 is not set
--# CONFIG_CRYPTO_SHA512 is not set
--# CONFIG_CRYPTO_WP512 is not set
--# CONFIG_CRYPTO_TGR192 is not set
--# CONFIG_CRYPTO_GF128MUL is not set
--CONFIG_CRYPTO_ECB=m
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# CONFIG_CRYPTO_BLOWFISH is not set
--# CONFIG_CRYPTO_TWOFISH is not set
--# CONFIG_CRYPTO_SERPENT is not set
--# CONFIG_CRYPTO_AES is not set
--# CONFIG_CRYPTO_CAST5 is not set
--# CONFIG_CRYPTO_CAST6 is not set
--# CONFIG_CRYPTO_TEA is not set
--# CONFIG_CRYPTO_ARC4 is not set
--# CONFIG_CRYPTO_KHAZAD is not set
--# CONFIG_CRYPTO_ANUBIS is not set
--# CONFIG_CRYPTO_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
--CONFIG_PPC_LIB_RHEAP=y
---- a/arch/powerpc/configs/mpc832x_rdb_defconfig
-+++ /dev/null
-@@ -1,1233 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:16 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--CONFIG_6xx=y
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_PPC_FPU=y
--# CONFIG_FSL_EMB_PERFMON is not set
--CONFIG_PPC_STD_MMU=y
--CONFIG_PPC_STD_MMU_32=y
--# CONFIG_PPC_MM_SLICES is not set
--# CONFIG_SMP is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--# CONFIG_FAIR_GROUP_SCHED is not set
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--# CONFIG_KALLSYMS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--# CONFIG_EPOLL is not set
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--# CONFIG_KMOD is not set
--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
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--CONFIG_DEFAULT_AS=y
--# CONFIG_DEFAULT_DEADLINE is not set
--# CONFIG_DEFAULT_CFQ is not set
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="anticipatory"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MULTIPLATFORM is not set
--# CONFIG_PPC_82xx is not set
--CONFIG_PPC_83xx=y
--# CONFIG_PPC_86xx is not set
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC83xx=y
--# CONFIG_MPC831x_RDB is not set
--# CONFIG_MPC832x_MDS is not set
--CONFIG_MPC832x_RDB=y
--# CONFIG_MPC834x_MDS is not set
--# CONFIG_MPC834x_ITX is not set
--# CONFIG_MPC836x_MDS is not set
--# CONFIG_MPC837x_MDS is not set
--# CONFIG_MPC837x_RDB is not set
--# CONFIG_SBC834x is not set
--CONFIG_PPC_MPC832x=y
--CONFIG_IPIC=y
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--CONFIG_QUICC_ENGINE=y
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--CONFIG_TICK_ONESHOT=y
--CONFIG_NO_HZ=y
--CONFIG_HIGH_RES_TIMERS=y
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--CONFIG_MATH_EMULATION=y
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_GENERIC_ISA_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--# CONFIG_XFRM_USER is not set
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# CONFIG_IP_ADVANCED_ROUTER is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_PNP=y
--CONFIG_IP_PNP_DHCP=y
--CONFIG_IP_PNP_BOOTP=y
--# CONFIG_IP_PNP_RARP is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# CONFIG_INET_AH is not set
--# CONFIG_INET_ESP is not set
--# CONFIG_INET_IPCOMP is not set
--# CONFIG_INET_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--CONFIG_INET_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--# CONFIG_BRIDGE is not set
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--# CONFIG_LLC2 is not set
--# CONFIG_IPX is not set
--# CONFIG_ATALK is not set
--# CONFIG_X25 is not set
--# CONFIG_LAPB is not set
--# CONFIG_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--# CONFIG_BLK_DEV_UB is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--CONFIG_SCSI=y
--CONFIG_SCSI_DMA=y
--# CONFIG_SCSI_TGT is not set
--# CONFIG_SCSI_NETLINK is not set
--CONFIG_SCSI_PROC_FS=y
--
--#
--# SCSI support type (disk, tape, CD-ROM)
--#
--CONFIG_BLK_DEV_SD=y
--# CONFIG_CHR_DEV_ST is not set
--# CONFIG_CHR_DEV_OSST is not set
--# CONFIG_BLK_DEV_SR is not set
--# CONFIG_CHR_DEV_SG is not set
--# CONFIG_CHR_DEV_SCH is not set
--
--#
--# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
--#
--# CONFIG_SCSI_MULTI_LUN is not set
--# CONFIG_SCSI_CONSTANTS is not set
--# CONFIG_SCSI_LOGGING is not set
--# CONFIG_SCSI_SCAN_ASYNC is not set
--CONFIG_SCSI_WAIT_SCAN=m
--
--#
--# SCSI Transports
--#
--# CONFIG_SCSI_SPI_ATTRS is not set
--# CONFIG_SCSI_FC_ATTRS is not set
--# CONFIG_SCSI_ISCSI_ATTRS is not set
--# CONFIG_SCSI_SAS_LIBSAS is not set
--# CONFIG_SCSI_SRP_ATTRS is not set
--CONFIG_SCSI_LOWLEVEL=y
--# CONFIG_ISCSI_TCP is not set
--# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
--# CONFIG_SCSI_3W_9XXX is not set
--# CONFIG_SCSI_ACARD is not set
--# CONFIG_SCSI_AACRAID is not set
--# CONFIG_SCSI_AIC7XXX is not set
--# CONFIG_SCSI_AIC7XXX_OLD is not set
--# CONFIG_SCSI_AIC79XX is not set
--# CONFIG_SCSI_AIC94XX is not set
--# CONFIG_SCSI_DPT_I2O is not set
--# CONFIG_SCSI_ADVANSYS is not set
--# CONFIG_SCSI_ARCMSR is not set
--# CONFIG_MEGARAID_NEWGEN is not set
--# CONFIG_MEGARAID_LEGACY is not set
--# CONFIG_MEGARAID_SAS is not set
--# CONFIG_SCSI_HPTIOP is not set
--# CONFIG_SCSI_BUSLOGIC is not set
--# CONFIG_SCSI_DMX3191D is not set
--# CONFIG_SCSI_EATA is not set
--# CONFIG_SCSI_FUTURE_DOMAIN is not set
--# CONFIG_SCSI_GDTH is not set
--# CONFIG_SCSI_IPS is not set
--# CONFIG_SCSI_INITIO is not set
--# CONFIG_SCSI_INIA100 is not set
--# CONFIG_SCSI_MVSAS is not set
--# CONFIG_SCSI_STEX is not set
--# CONFIG_SCSI_SYM53C8XX_2 is not set
--# CONFIG_SCSI_QLOGIC_1280 is not set
--# CONFIG_SCSI_QLA_FC is not set
--# CONFIG_SCSI_QLA_ISCSI is not set
--# CONFIG_SCSI_LPFC is not set
--# CONFIG_SCSI_DC395x is not set
--# CONFIG_SCSI_DC390T is not set
--# CONFIG_SCSI_NSP32 is not set
--# CONFIG_SCSI_DEBUG is not set
--# CONFIG_SCSI_SRP is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--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 is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--# CONFIG_MARVELL_PHY is not set
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--CONFIG_ICPLUS_PHY=y
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_ENC28J60 is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--CONFIG_E1000=y
--# CONFIG_E1000_NAPI is not set
--# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--# CONFIG_GIANFAR is not set
--CONFIG_UCC_GETH=y
--CONFIG_UGETH_NAPI=y
--# CONFIG_UGETH_MAGIC_PACKET is not set
--# CONFIG_UGETH_FILTERING is not set
--# CONFIG_UGETH_TX_ON_DEMAND is not set
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--
--#
--# USB Network Adapters
--#
--# CONFIG_USB_CATC is not set
--# CONFIG_USB_KAWETH is not set
--# CONFIG_USB_PEGASUS is not set
--# CONFIG_USB_RTL8150 is not set
--# CONFIG_USB_USBNET is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NET_FC is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--# CONFIG_SERIAL_OF_PLATFORM is not set
--# CONFIG_SERIAL_QE is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--CONFIG_HW_RANDOM=y
--# CONFIG_NVRAM is not set
--CONFIG_GEN_RTC=y
--# CONFIG_GEN_RTC_X is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=y
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_ALI1535 is not set
--# CONFIG_I2C_ALI1563 is not set
--# CONFIG_I2C_ALI15X3 is not set
--# CONFIG_I2C_AMD756 is not set
--# CONFIG_I2C_AMD8111 is not set
--# CONFIG_I2C_I801 is not set
--# CONFIG_I2C_I810 is not set
--# CONFIG_I2C_PIIX4 is not set
--CONFIG_I2C_MPC=y
--# CONFIG_I2C_NFORCE2 is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--# CONFIG_I2C_PROSAVAGE is not set
--# CONFIG_I2C_SAVAGE4 is not set
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_SIS5595 is not set
--# CONFIG_I2C_SIS630 is not set
--# CONFIG_I2C_SIS96X 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_VIA is not set
--# CONFIG_I2C_VIAPRO is not set
--# CONFIG_I2C_VOODOO3 is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 is not set
--# CONFIG_I2C_DEBUG_CORE is not set
--# CONFIG_I2C_DEBUG_ALGO is not set
--# CONFIG_I2C_DEBUG_BUS is not set
--# CONFIG_I2C_DEBUG_CHIP is not set
--
--#
--# SPI support
--#
--CONFIG_SPI=y
--CONFIG_SPI_MASTER=y
--
--#
--# SPI Master Controller Drivers
--#
--CONFIG_SPI_BITBANG=y
--CONFIG_SPI_MPC83xx=y
--
--#
--# SPI Protocol Masters
--#
--# CONFIG_SPI_AT25 is not set
--# CONFIG_SPI_SPIDEV is not set
--# CONFIG_SPI_TLE62X0 is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_AD7418 is not set
--# CONFIG_SENSORS_ADM1021 is not set
--# CONFIG_SENSORS_ADM1025 is not set
--# CONFIG_SENSORS_ADM1026 is not set
--# CONFIG_SENSORS_ADM1029 is not set
--# CONFIG_SENSORS_ADM1031 is not set
--# CONFIG_SENSORS_ADM9240 is not set
--# CONFIG_SENSORS_ADT7470 is not set
--# CONFIG_SENSORS_ADT7473 is not set
--# CONFIG_SENSORS_ATXP1 is not set
--# CONFIG_SENSORS_DS1621 is not set
--# CONFIG_SENSORS_I5K_AMB is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_F75375S is not set
--# CONFIG_SENSORS_GL518SM is not set
--# CONFIG_SENSORS_GL520SM is not set
--# CONFIG_SENSORS_IT87 is not set
--# CONFIG_SENSORS_LM63 is not set
--# CONFIG_SENSORS_LM70 is not set
--# CONFIG_SENSORS_LM75 is not set
--# CONFIG_SENSORS_LM77 is not set
--# CONFIG_SENSORS_LM78 is not set
--# CONFIG_SENSORS_LM80 is not set
--# CONFIG_SENSORS_LM83 is not set
--# CONFIG_SENSORS_LM85 is not set
--# 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_SIS5595 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_ADS7828 is not set
--# CONFIG_SENSORS_THMC50 is not set
--# CONFIG_SENSORS_VIA686A is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_VT8231 is not set
--# CONFIG_SENSORS_W83781D is not set
--# CONFIG_SENSORS_W83791D is not set
--# CONFIG_SENSORS_W83792D is not set
--# CONFIG_SENSORS_W83793 is not set
--# CONFIG_SENSORS_W83L785TS is not set
--# CONFIG_SENSORS_W83L786NG is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--# CONFIG_HWMON_DEBUG_CHIP is not set
--# CONFIG_THERMAL is not set
--CONFIG_WATCHDOG=y
--# CONFIG_WATCHDOG_NOWAYOUT is not set
--
--#
--# Watchdog Device Drivers
--#
--# CONFIG_SOFT_WATCHDOG is not set
--CONFIG_83xx_WDT=y
--
--#
--# PCI-based Watchdog Cards
--#
--# CONFIG_PCIPCWATCHDOG is not set
--# CONFIG_WDTPCI is not set
--
--#
--# USB-based Watchdog Cards
--#
--# CONFIG_USBPCWATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--# CONFIG_USB_DABUSB is not set
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=m
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--
--#
--# USB Input Devices
--#
--# CONFIG_USB_HID is not set
--
--#
--# USB HID Boot Protocol drivers
--#
--# CONFIG_USB_KBD is not set
--# CONFIG_USB_MOUSE is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--CONFIG_USB=y
--# CONFIG_USB_DEBUG is not set
--# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
--
--#
--# Miscellaneous USB options
--#
--CONFIG_USB_DEVICEFS=y
--CONFIG_USB_DEVICE_CLASS=y
--# CONFIG_USB_DYNAMIC_MINORS is not set
--# CONFIG_USB_OTG is not set
--
--#
--# USB Host Controller Drivers
--#
--CONFIG_USB_EHCI_HCD=y
--# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
--# CONFIG_USB_EHCI_TT_NEWSCHED is not set
--# CONFIG_USB_EHCI_FSL is not set
--CONFIG_USB_EHCI_HCD_PPC_OF=y
--# CONFIG_USB_ISP116X_HCD is not set
--CONFIG_USB_OHCI_HCD=y
--CONFIG_USB_OHCI_HCD_PPC_OF=y
--CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
--# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
--CONFIG_USB_OHCI_HCD_PCI=y
--CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
--CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
--CONFIG_USB_OHCI_LITTLE_ENDIAN=y
--# CONFIG_USB_UHCI_HCD is not set
--# CONFIG_USB_SL811_HCD is not set
--# CONFIG_USB_R8A66597_HCD is not set
--
--#
--# USB Device Class drivers
--#
--# CONFIG_USB_ACM is not set
--# CONFIG_USB_PRINTER is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--
--#
--# may also be needed; see USB_STORAGE Help for more information
--#
--CONFIG_USB_STORAGE=y
--# CONFIG_USB_STORAGE_DEBUG is not set
--# CONFIG_USB_STORAGE_DATAFAB is not set
--# CONFIG_USB_STORAGE_FREECOM is not set
--# CONFIG_USB_STORAGE_ISD200 is not set
--# CONFIG_USB_STORAGE_DPCM is not set
--# CONFIG_USB_STORAGE_USBAT is not set
--# CONFIG_USB_STORAGE_SDDR09 is not set
--# CONFIG_USB_STORAGE_SDDR55 is not set
--# CONFIG_USB_STORAGE_JUMPSHOT is not set
--# CONFIG_USB_STORAGE_ALAUDA is not set
--# CONFIG_USB_STORAGE_KARMA is not set
--# CONFIG_USB_LIBUSUAL is not set
--
--#
--# USB Imaging devices
--#
--# CONFIG_USB_MDC800 is not set
--# CONFIG_USB_MICROTEK is not set
--CONFIG_USB_MON=y
--
--#
--# USB port drivers
--#
--# CONFIG_USB_SERIAL is not set
--
--#
--# USB Miscellaneous drivers
--#
--# CONFIG_USB_EMI62 is not set
--# CONFIG_USB_EMI26 is not set
--# CONFIG_USB_ADUTUX is not set
--# CONFIG_USB_AUERSWALD is not set
--# CONFIG_USB_RIO500 is not set
--# CONFIG_USB_LEGOTOWER is not set
--# CONFIG_USB_LCD is not set
--# CONFIG_USB_BERRY_CHARGE is not set
--# CONFIG_USB_LED is not set
--# CONFIG_USB_CYPRESS_CY7C63 is not set
--# CONFIG_USB_CYTHERM is not set
--# CONFIG_USB_PHIDGET is not set
--# CONFIG_USB_IDMOUSE is not set
--# CONFIG_USB_FTDI_ELAN is not set
--# CONFIG_USB_APPLEDISPLAY is not set
--# CONFIG_USB_SISUSBVGA is not set
--# CONFIG_USB_LD is not set
--# CONFIG_USB_TRANCEVIBRATOR is not set
--# CONFIG_USB_IOWARRIOR is not set
--# CONFIG_USB_TEST is not set
--# CONFIG_USB_GADGET is not set
--CONFIG_MMC=y
--# CONFIG_MMC_DEBUG is not set
--# CONFIG_MMC_UNSAFE_RESUME is not set
--
--#
--# MMC/SD Card Drivers
--#
--CONFIG_MMC_BLOCK=y
--CONFIG_MMC_BLOCK_BOUNCE=y
--# CONFIG_SDIO_UART is not set
--
--#
--# MMC/SD Host Controller Drivers
--#
--# CONFIG_MMC_SDHCI is not set
--# CONFIG_MMC_WBSD is not set
--# CONFIG_MMC_TIFM_SD is not set
--CONFIG_MMC_SPI=y
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--CONFIG_EXT3_FS=y
--CONFIG_EXT3_FS_XATTR=y
--# CONFIG_EXT3_FS_POSIX_ACL is not set
--# CONFIG_EXT3_FS_SECURITY is not set
--# CONFIG_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# CONFIG_AUTOFS_FS is not set
--# CONFIG_AUTOFS4_FS is not set
--# CONFIG_FUSE_FS is not set
--
--#
--# CD-ROM/DVD Filesystems
--#
--# CONFIG_ISO9660_FS is not set
--# CONFIG_UDF_FS is not set
--
--#
--# DOS/FAT/NT Filesystems
--#
--CONFIG_FAT_FS=y
--CONFIG_MSDOS_FS=y
--CONFIG_VFAT_FS=y
--CONFIG_FAT_DEFAULT_CODEPAGE=437
--CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
--
--#
--# Miscellaneous filesystems
--#
--# CONFIG_ADFS_FS is not set
--# CONFIG_AFFS_FS is not set
--# CONFIG_HFS_FS is not set
--# CONFIG_HFSPLUS_FS is not set
--# CONFIG_BEFS_FS is not set
--# CONFIG_BFS_FS is not set
--# CONFIG_EFS_FS is not set
--# CONFIG_CRAMFS is not set
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--CONFIG_NFS_V4=y
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--CONFIG_SUNRPC_GSS=y
--# CONFIG_SUNRPC_BIND34 is not set
--CONFIG_RPCSEC_GSS_KRB5=y
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--# CONFIG_MAC_PARTITION is not set
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_BSD_DISKLABEL is not set
--# CONFIG_MINIX_SUBPARTITION is not set
--# CONFIG_SOLARIS_X86_PARTITION is not set
--# CONFIG_UNIXWARE_DISKLABEL is not set
--CONFIG_LDM_PARTITION=y
--# CONFIG_LDM_DEBUG is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--CONFIG_NLS=y
--CONFIG_NLS_DEFAULT="iso8859-1"
--CONFIG_NLS_CODEPAGE_437=y
--# CONFIG_NLS_CODEPAGE_737 is not set
--# CONFIG_NLS_CODEPAGE_775 is not set
--# CONFIG_NLS_CODEPAGE_850 is not set
--# CONFIG_NLS_CODEPAGE_852 is not set
--# CONFIG_NLS_CODEPAGE_855 is not set
--# CONFIG_NLS_CODEPAGE_857 is not set
--# CONFIG_NLS_CODEPAGE_860 is not set
--# CONFIG_NLS_CODEPAGE_861 is not set
--# CONFIG_NLS_CODEPAGE_862 is not set
--# CONFIG_NLS_CODEPAGE_863 is not set
--# CONFIG_NLS_CODEPAGE_864 is not set
--# CONFIG_NLS_CODEPAGE_865 is not set
--# CONFIG_NLS_CODEPAGE_866 is not set
--# CONFIG_NLS_CODEPAGE_869 is not set
--# CONFIG_NLS_CODEPAGE_936 is not set
--# CONFIG_NLS_CODEPAGE_950 is not set
--CONFIG_NLS_CODEPAGE_932=y
--# CONFIG_NLS_CODEPAGE_949 is not set
--# CONFIG_NLS_CODEPAGE_874 is not set
--CONFIG_NLS_ISO8859_8=y
--# CONFIG_NLS_CODEPAGE_1250 is not set
--# CONFIG_NLS_CODEPAGE_1251 is not set
--# CONFIG_NLS_ASCII is not set
--CONFIG_NLS_ISO8859_1=y
--# CONFIG_NLS_ISO8859_2 is not set
--# CONFIG_NLS_ISO8859_3 is not set
--# CONFIG_NLS_ISO8859_4 is not set
--# CONFIG_NLS_ISO8859_5 is not set
--# CONFIG_NLS_ISO8859_6 is not set
--# CONFIG_NLS_ISO8859_7 is not set
--# CONFIG_NLS_ISO8859_9 is not set
--# CONFIG_NLS_ISO8859_13 is not set
--# CONFIG_NLS_ISO8859_14 is not set
--# CONFIG_NLS_ISO8859_15 is not set
--# CONFIG_NLS_KOI8_R is not set
--# CONFIG_NLS_KOI8_U is not set
--# CONFIG_NLS_UTF8 is not set
--# CONFIG_DLM is not set
--CONFIG_UCC_FAST=y
--CONFIG_UCC=y
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# CONFIG_CRC16 is not set
--CONFIG_CRC_ITU_T=y
--CONFIG_CRC32=y
--CONFIG_CRC7=y
--# CONFIG_LIBCRC32C is not set
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--# CONFIG_DEBUG_KERNEL is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--CONFIG_CRYPTO_MD5=y
--# CONFIG_CRYPTO_SHA1 is not set
--# CONFIG_CRYPTO_SHA256 is not set
--# CONFIG_CRYPTO_SHA512 is not set
--# CONFIG_CRYPTO_WP512 is not set
--# CONFIG_CRYPTO_TGR192 is not set
--# CONFIG_CRYPTO_GF128MUL is not set
--CONFIG_CRYPTO_ECB=m
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# CONFIG_CRYPTO_BLOWFISH is not set
--# CONFIG_CRYPTO_TWOFISH is not set
--# CONFIG_CRYPTO_SERPENT is not set
--# CONFIG_CRYPTO_AES is not set
--# CONFIG_CRYPTO_CAST5 is not set
--# CONFIG_CRYPTO_CAST6 is not set
--# CONFIG_CRYPTO_TEA is not set
--# CONFIG_CRYPTO_ARC4 is not set
--# CONFIG_CRYPTO_KHAZAD is not set
--# CONFIG_CRYPTO_ANUBIS is not set
--# CONFIG_CRYPTO_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
--CONFIG_PPC_LIB_RHEAP=y
---- a/arch/powerpc/configs/mpc834x_itx_defconfig
-+++ /dev/null
-@@ -1,1295 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:17 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--CONFIG_6xx=y
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_PPC_FPU=y
--# CONFIG_FSL_EMB_PERFMON is not set
--CONFIG_PPC_STD_MMU=y
--CONFIG_PPC_STD_MMU_32=y
--# CONFIG_PPC_MM_SLICES is not set
--# CONFIG_SMP is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--# CONFIG_FAIR_GROUP_SCHED is not set
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--# CONFIG_KALLSYMS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--# CONFIG_EPOLL is not set
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--# CONFIG_KMOD is not set
--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
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--CONFIG_DEFAULT_AS=y
--# CONFIG_DEFAULT_DEADLINE is not set
--# CONFIG_DEFAULT_CFQ is not set
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="anticipatory"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MULTIPLATFORM is not set
--# CONFIG_PPC_82xx is not set
--CONFIG_PPC_83xx=y
--# CONFIG_PPC_86xx is not set
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC83xx=y
--# CONFIG_MPC831x_RDB is not set
--# CONFIG_MPC832x_MDS is not set
--# CONFIG_MPC832x_RDB is not set
--# CONFIG_MPC834x_MDS is not set
--CONFIG_MPC834x_ITX=y
--# CONFIG_MPC836x_MDS is not set
--# CONFIG_MPC837x_MDS is not set
--# CONFIG_MPC837x_RDB is not set
--# CONFIG_SBC834x is not set
--CONFIG_PPC_MPC834x=y
--CONFIG_IPIC=y
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--CONFIG_TICK_ONESHOT=y
--CONFIG_NO_HZ=y
--CONFIG_HIGH_RES_TIMERS=y
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_GENERIC_ISA_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--# CONFIG_XFRM_USER is not set
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# CONFIG_IP_ADVANCED_ROUTER is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_PNP=y
--CONFIG_IP_PNP_DHCP=y
--CONFIG_IP_PNP_BOOTP=y
--# CONFIG_IP_PNP_RARP is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# CONFIG_INET_AH is not set
--# CONFIG_INET_ESP is not set
--# CONFIG_INET_IPCOMP is not set
--# CONFIG_INET_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--CONFIG_INET_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--# CONFIG_BRIDGE is not set
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--# CONFIG_LLC2 is not set
--# CONFIG_IPX is not set
--# CONFIG_ATALK is not set
--# CONFIG_X25 is not set
--# CONFIG_LAPB is not set
--# CONFIG_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--# CONFIG_MTD_CONCAT is not set
--# CONFIG_MTD_PARTITIONS is not set
--
--#
--# User Modules And Translation Layers
--#
--CONFIG_MTD_CHAR=y
--# CONFIG_MTD_BLKDEVS is not set
--# CONFIG_MTD_BLOCK is not set
--# CONFIG_MTD_BLOCK_RO is not set
--# CONFIG_FTL is not set
--# CONFIG_NFTL is not set
--# CONFIG_INFTL is not set
--# CONFIG_RFD_FTL is not set
--# CONFIG_SSFDC is not set
--# CONFIG_MTD_OOPS is not set
--
--#
--# RAM/ROM/Flash chip drivers
--#
--CONFIG_MTD_CFI=y
--# CONFIG_MTD_JEDECPROBE is not set
--CONFIG_MTD_GEN_PROBE=y
--# CONFIG_MTD_CFI_ADV_OPTIONS is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--CONFIG_MTD_MAP_BANK_WIDTH_4=y
--# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
--CONFIG_MTD_CFI_I1=y
--CONFIG_MTD_CFI_I2=y
--# CONFIG_MTD_CFI_I4 is not set
--# CONFIG_MTD_CFI_I8 is not set
--# CONFIG_MTD_CFI_INTELEXT is not set
--CONFIG_MTD_CFI_AMDSTD=y
--# CONFIG_MTD_CFI_STAA is not set
--CONFIG_MTD_CFI_UTIL=y
--# CONFIG_MTD_RAM is not set
--# CONFIG_MTD_ROM is not set
--# CONFIG_MTD_ABSENT is not set
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--CONFIG_MTD_PHYSMAP=y
--CONFIG_MTD_PHYSMAP_START=0xfe000000
--CONFIG_MTD_PHYSMAP_LEN=0x1000000
--CONFIG_MTD_PHYSMAP_BANKWIDTH=2
--# CONFIG_MTD_PHYSMAP_OF is not set
--# CONFIG_MTD_INTEL_VR_NOR is not set
--# CONFIG_MTD_PLATRAM is not set
--
--#
--# Self-contained MTD device drivers
--#
--# CONFIG_MTD_PMC551 is not set
--# CONFIG_MTD_DATAFLASH is not set
--# CONFIG_MTD_M25P80 is not set
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_MTDRAM is not set
--# CONFIG_MTD_BLOCK2MTD is not set
--
--#
--# Disk-On-Chip Device Drivers
--#
--# CONFIG_MTD_DOC2000 is not set
--# CONFIG_MTD_DOC2001 is not set
--# CONFIG_MTD_DOC2001PLUS is not set
--# CONFIG_MTD_NAND is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--# CONFIG_BLK_DEV_UB is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--CONFIG_IDE=y
--CONFIG_IDE_MAX_HWIFS=4
--# CONFIG_BLK_DEV_IDE is not set
--# CONFIG_BLK_DEV_HD_ONLY is not set
--# CONFIG_BLK_DEV_HD is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--CONFIG_SCSI=y
--CONFIG_SCSI_DMA=y
--# CONFIG_SCSI_TGT is not set
--# CONFIG_SCSI_NETLINK is not set
--CONFIG_SCSI_PROC_FS=y
--
--#
--# SCSI support type (disk, tape, CD-ROM)
--#
--CONFIG_BLK_DEV_SD=y
--# CONFIG_CHR_DEV_ST is not set
--# CONFIG_CHR_DEV_OSST is not set
--# CONFIG_BLK_DEV_SR is not set
--CONFIG_CHR_DEV_SG=y
--# CONFIG_CHR_DEV_SCH is not set
--
--#
--# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
--#
--# CONFIG_SCSI_MULTI_LUN is not set
--# CONFIG_SCSI_CONSTANTS is not set
--# CONFIG_SCSI_LOGGING is not set
--# CONFIG_SCSI_SCAN_ASYNC is not set
--CONFIG_SCSI_WAIT_SCAN=m
--
--#
--# SCSI Transports
--#
--CONFIG_SCSI_SPI_ATTRS=y
--# CONFIG_SCSI_FC_ATTRS is not set
--# CONFIG_SCSI_ISCSI_ATTRS is not set
--# CONFIG_SCSI_SAS_LIBSAS is not set
--# CONFIG_SCSI_SRP_ATTRS is not set
--CONFIG_SCSI_LOWLEVEL=y
--# CONFIG_ISCSI_TCP is not set
--# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
--# CONFIG_SCSI_3W_9XXX is not set
--# CONFIG_SCSI_ACARD is not set
--# CONFIG_SCSI_AACRAID is not set
--# CONFIG_SCSI_AIC7XXX is not set
--# CONFIG_SCSI_AIC7XXX_OLD is not set
--# CONFIG_SCSI_AIC79XX is not set
--# CONFIG_SCSI_AIC94XX is not set
--# CONFIG_SCSI_DPT_I2O is not set
--# CONFIG_SCSI_ADVANSYS is not set
--# CONFIG_SCSI_ARCMSR is not set
--# CONFIG_MEGARAID_NEWGEN is not set
--# CONFIG_MEGARAID_LEGACY is not set
--# CONFIG_MEGARAID_SAS is not set
--# CONFIG_SCSI_HPTIOP is not set
--# CONFIG_SCSI_BUSLOGIC is not set
--# CONFIG_SCSI_DMX3191D is not set
--# CONFIG_SCSI_EATA is not set
--# CONFIG_SCSI_FUTURE_DOMAIN is not set
--# CONFIG_SCSI_GDTH is not set
--# CONFIG_SCSI_IPS is not set
--# CONFIG_SCSI_INITIO is not set
--# CONFIG_SCSI_INIA100 is not set
--# CONFIG_SCSI_MVSAS is not set
--# CONFIG_SCSI_STEX is not set
--# CONFIG_SCSI_SYM53C8XX_2 is not set
--# CONFIG_SCSI_IPR is not set
--# CONFIG_SCSI_QLOGIC_1280 is not set
--# CONFIG_SCSI_QLA_FC is not set
--# CONFIG_SCSI_QLA_ISCSI is not set
--# CONFIG_SCSI_LPFC is not set
--# CONFIG_SCSI_DC395x is not set
--# CONFIG_SCSI_DC390T is not set
--# CONFIG_SCSI_NSP32 is not set
--# CONFIG_SCSI_DEBUG is not set
--# CONFIG_SCSI_SRP is not set
--CONFIG_ATA=y
--# CONFIG_ATA_NONSTANDARD is not set
--# CONFIG_SATA_AHCI is not set
--# CONFIG_SATA_SVW is not set
--# CONFIG_ATA_PIIX is not set
--# CONFIG_SATA_MV is not set
--# CONFIG_SATA_NV is not set
--# CONFIG_PDC_ADMA is not set
--# CONFIG_SATA_QSTOR is not set
--# CONFIG_SATA_PROMISE is not set
--# CONFIG_SATA_SX4 is not set
--CONFIG_SATA_SIL=y
--# CONFIG_SATA_SIL24 is not set
--# CONFIG_SATA_SIS is not set
--# CONFIG_SATA_ULI is not set
--# CONFIG_SATA_VIA is not set
--# CONFIG_SATA_VITESSE is not set
--# CONFIG_SATA_INIC162X is not set
--# CONFIG_SATA_FSL is not set
--# CONFIG_PATA_ALI is not set
--# CONFIG_PATA_AMD is not set
--# CONFIG_PATA_ARTOP is not set
--# CONFIG_PATA_ATIIXP is not set
--# CONFIG_PATA_CMD640_PCI is not set
--# CONFIG_PATA_CMD64X is not set
--# CONFIG_PATA_CS5520 is not set
--# CONFIG_PATA_CS5530 is not set
--# CONFIG_PATA_CYPRESS is not set
--# CONFIG_PATA_EFAR is not set
--# CONFIG_ATA_GENERIC is not set
--# CONFIG_PATA_HPT366 is not set
--# CONFIG_PATA_HPT37X is not set
--# CONFIG_PATA_HPT3X2N is not set
--# CONFIG_PATA_HPT3X3 is not set
--# CONFIG_PATA_IT821X is not set
--# CONFIG_PATA_IT8213 is not set
--# CONFIG_PATA_JMICRON is not set
--# CONFIG_PATA_TRIFLEX is not set
--# CONFIG_PATA_MARVELL is not set
--# CONFIG_PATA_MPIIX is not set
--# CONFIG_PATA_OLDPIIX is not set
--# CONFIG_PATA_NETCELL is not set
--# CONFIG_PATA_NINJA32 is not set
--# CONFIG_PATA_NS87410 is not set
--# CONFIG_PATA_NS87415 is not set
--# CONFIG_PATA_OPTI is not set
--# CONFIG_PATA_OPTIDMA is not set
--# CONFIG_PATA_PDC_OLD is not set
--# CONFIG_PATA_RADISYS is not set
--# CONFIG_PATA_RZ1000 is not set
--# CONFIG_PATA_SC1200 is not set
--# CONFIG_PATA_SERVERWORKS is not set
--# CONFIG_PATA_PDC2027X is not set
--# CONFIG_PATA_SIL680 is not set
--# CONFIG_PATA_SIS is not set
--# CONFIG_PATA_VIA is not set
--# CONFIG_PATA_WINBOND is not set
--CONFIG_PATA_PLATFORM=y
--CONFIG_PATA_OF_PLATFORM=y
--CONFIG_MD=y
--CONFIG_BLK_DEV_MD=y
--CONFIG_MD_LINEAR=y
--CONFIG_MD_RAID0=y
--CONFIG_MD_RAID1=y
--# CONFIG_MD_RAID10 is not set
--# CONFIG_MD_RAID456 is not set
--# CONFIG_MD_MULTIPATH is not set
--# CONFIG_MD_FAULTY is not set
--# CONFIG_BLK_DEV_DM is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--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 is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--# CONFIG_MARVELL_PHY is not set
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--CONFIG_CICADA_PHY=y
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--# CONFIG_NET_ETHERNET is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--CONFIG_GIANFAR=y
--CONFIG_GFAR_NAPI=y
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--
--#
--# USB Network Adapters
--#
--# CONFIG_USB_CATC is not set
--# CONFIG_USB_KAWETH is not set
--# CONFIG_USB_PEGASUS is not set
--# CONFIG_USB_RTL8150 is not set
--# CONFIG_USB_USBNET is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NET_FC is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--# CONFIG_INPUT is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--# CONFIG_SERIAL_8250_PCI is not set
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--CONFIG_HW_RANDOM=y
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=y
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_ALI1535 is not set
--# CONFIG_I2C_ALI1563 is not set
--# CONFIG_I2C_ALI15X3 is not set
--# CONFIG_I2C_AMD756 is not set
--# CONFIG_I2C_AMD8111 is not set
--# CONFIG_I2C_I801 is not set
--# CONFIG_I2C_I810 is not set
--# CONFIG_I2C_PIIX4 is not set
--CONFIG_I2C_MPC=y
--# CONFIG_I2C_NFORCE2 is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--# CONFIG_I2C_PROSAVAGE is not set
--# CONFIG_I2C_SAVAGE4 is not set
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_SIS5595 is not set
--# CONFIG_I2C_SIS630 is not set
--# CONFIG_I2C_SIS96X 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_VIA is not set
--# CONFIG_I2C_VIAPRO is not set
--# CONFIG_I2C_VOODOO3 is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--CONFIG_SENSORS_PCF8574=y
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 is not set
--# CONFIG_I2C_DEBUG_CORE is not set
--# CONFIG_I2C_DEBUG_ALGO is not set
--# CONFIG_I2C_DEBUG_BUS is not set
--# CONFIG_I2C_DEBUG_CHIP is not set
--
--#
--# SPI support
--#
--CONFIG_SPI=y
--CONFIG_SPI_MASTER=y
--
--#
--# SPI Master Controller Drivers
--#
--CONFIG_SPI_BITBANG=y
--CONFIG_SPI_MPC83xx=y
--
--#
--# SPI Protocol Masters
--#
--# CONFIG_SPI_AT25 is not set
--# CONFIG_SPI_SPIDEV is not set
--# CONFIG_SPI_TLE62X0 is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--# CONFIG_HWMON is not set
--# CONFIG_THERMAL is not set
--CONFIG_WATCHDOG=y
--# CONFIG_WATCHDOG_NOWAYOUT is not set
--
--#
--# Watchdog Device Drivers
--#
--# CONFIG_SOFT_WATCHDOG is not set
--CONFIG_83xx_WDT=y
--
--#
--# PCI-based Watchdog Cards
--#
--# CONFIG_PCIPCWATCHDOG is not set
--# CONFIG_WDTPCI is not set
--
--#
--# USB-based Watchdog Cards
--#
--# CONFIG_USBPCWATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--# CONFIG_USB_DABUSB is not set
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=m
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--CONFIG_USB=y
--# CONFIG_USB_DEBUG is not set
--# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
--
--#
--# Miscellaneous USB options
--#
--CONFIG_USB_DEVICEFS=y
--CONFIG_USB_DEVICE_CLASS=y
--# CONFIG_USB_DYNAMIC_MINORS is not set
--# CONFIG_USB_OTG is not set
--
--#
--# USB Host Controller Drivers
--#
--CONFIG_USB_EHCI_HCD=y
--CONFIG_USB_EHCI_ROOT_HUB_TT=y
--# CONFIG_USB_EHCI_TT_NEWSCHED is not set
--CONFIG_USB_EHCI_FSL=y
--CONFIG_USB_EHCI_HCD_PPC_OF=y
--# CONFIG_USB_ISP116X_HCD is not set
--# CONFIG_USB_OHCI_HCD is not set
--CONFIG_USB_UHCI_HCD=y
--# CONFIG_USB_SL811_HCD is not set
--# CONFIG_USB_R8A66597_HCD is not set
--
--#
--# USB Device Class drivers
--#
--# CONFIG_USB_ACM is not set
--# CONFIG_USB_PRINTER is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--
--#
--# may also be needed; see USB_STORAGE Help for more information
--#
--CONFIG_USB_STORAGE=y
--# CONFIG_USB_STORAGE_DEBUG is not set
--# CONFIG_USB_STORAGE_DATAFAB is not set
--# CONFIG_USB_STORAGE_FREECOM is not set
--# CONFIG_USB_STORAGE_ISD200 is not set
--# CONFIG_USB_STORAGE_DPCM is not set
--# CONFIG_USB_STORAGE_USBAT is not set
--# CONFIG_USB_STORAGE_SDDR09 is not set
--# CONFIG_USB_STORAGE_SDDR55 is not set
--# CONFIG_USB_STORAGE_JUMPSHOT is not set
--# CONFIG_USB_STORAGE_ALAUDA is not set
--# CONFIG_USB_STORAGE_KARMA is not set
--# CONFIG_USB_LIBUSUAL is not set
--
--#
--# USB Imaging devices
--#
--# CONFIG_USB_MDC800 is not set
--# CONFIG_USB_MICROTEK is not set
--CONFIG_USB_MON=y
--
--#
--# USB port drivers
--#
--# CONFIG_USB_SERIAL is not set
--
--#
--# USB Miscellaneous drivers
--#
--# CONFIG_USB_EMI62 is not set
--# CONFIG_USB_EMI26 is not set
--# CONFIG_USB_ADUTUX is not set
--# CONFIG_USB_AUERSWALD is not set
--# CONFIG_USB_RIO500 is not set
--# CONFIG_USB_LEGOTOWER is not set
--# CONFIG_USB_LCD is not set
--# CONFIG_USB_BERRY_CHARGE is not set
--# CONFIG_USB_LED is not set
--# CONFIG_USB_CYPRESS_CY7C63 is not set
--# CONFIG_USB_CYTHERM is not set
--# CONFIG_USB_PHIDGET is not set
--# CONFIG_USB_IDMOUSE is not set
--# CONFIG_USB_FTDI_ELAN is not set
--# CONFIG_USB_APPLEDISPLAY is not set
--# CONFIG_USB_SISUSBVGA is not set
--# CONFIG_USB_LD is not set
--# CONFIG_USB_TRANCEVIBRATOR is not set
--# CONFIG_USB_IOWARRIOR is not set
--# CONFIG_USB_TEST is not set
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--CONFIG_RTC_LIB=y
--CONFIG_RTC_CLASS=y
--CONFIG_RTC_HCTOSYS=y
--CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
--# CONFIG_RTC_DEBUG is not set
--
--#
--# RTC interfaces
--#
--CONFIG_RTC_INTF_SYSFS=y
--CONFIG_RTC_INTF_PROC=y
--CONFIG_RTC_INTF_DEV=y
--CONFIG_RTC_INTF_DEV_UIE_EMUL=y
--# CONFIG_RTC_DRV_TEST is not set
--
--#
--# I2C RTC drivers
--#
--CONFIG_RTC_DRV_DS1307=y
--# CONFIG_RTC_DRV_DS1374 is not set
--# CONFIG_RTC_DRV_DS1672 is not set
--# CONFIG_RTC_DRV_MAX6900 is not set
--# CONFIG_RTC_DRV_RS5C372 is not set
--# CONFIG_RTC_DRV_ISL1208 is not set
--# CONFIG_RTC_DRV_X1205 is not set
--# CONFIG_RTC_DRV_PCF8563 is not set
--# CONFIG_RTC_DRV_PCF8583 is not set
--# CONFIG_RTC_DRV_M41T80 is not set
--# CONFIG_RTC_DRV_S35390A is not set
--
--#
--# SPI RTC drivers
--#
--# CONFIG_RTC_DRV_MAX6902 is not set
--# CONFIG_RTC_DRV_R9701 is not set
--# CONFIG_RTC_DRV_RS5C348 is not set
--
--#
--# Platform RTC drivers
--#
--# CONFIG_RTC_DRV_CMOS is not set
--# CONFIG_RTC_DRV_DS1511 is not set
--# CONFIG_RTC_DRV_DS1553 is not set
--# CONFIG_RTC_DRV_DS1742 is not set
--# CONFIG_RTC_DRV_STK17TA8 is not set
--# CONFIG_RTC_DRV_M48T86 is not set
--# CONFIG_RTC_DRV_M48T59 is not set
--# CONFIG_RTC_DRV_V3020 is not set
--
--#
--# on-CPU RTC drivers
--#
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--CONFIG_EXT3_FS=y
--CONFIG_EXT3_FS_XATTR=y
--# CONFIG_EXT3_FS_POSIX_ACL is not set
--# CONFIG_EXT3_FS_SECURITY is not set
--# CONFIG_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# CONFIG_AUTOFS_FS is not set
--# CONFIG_AUTOFS4_FS is not set
--# CONFIG_FUSE_FS is not set
--
--#
--# CD-ROM/DVD Filesystems
--#
--# CONFIG_ISO9660_FS is not set
--# CONFIG_UDF_FS is not set
--
--#
--# DOS/FAT/NT Filesystems
--#
--CONFIG_FAT_FS=y
--CONFIG_MSDOS_FS=y
--CONFIG_VFAT_FS=y
--CONFIG_FAT_DEFAULT_CODEPAGE=437
--CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
--
--#
--# Miscellaneous filesystems
--#
--# CONFIG_ADFS_FS is not set
--# CONFIG_AFFS_FS is not set
--# CONFIG_HFS_FS is not set
--# CONFIG_HFSPLUS_FS is not set
--# CONFIG_BEFS_FS is not set
--# CONFIG_BFS_FS is not set
--# CONFIG_EFS_FS is not set
--# CONFIG_JFFS2_FS is not set
--# CONFIG_CRAMFS is not set
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--CONFIG_NFS_V4=y
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--CONFIG_SUNRPC_GSS=y
--# CONFIG_SUNRPC_BIND34 is not set
--CONFIG_RPCSEC_GSS_KRB5=y
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--CONFIG_MAC_PARTITION=y
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_BSD_DISKLABEL is not set
--# CONFIG_MINIX_SUBPARTITION is not set
--# CONFIG_SOLARIS_X86_PARTITION is not set
--# CONFIG_UNIXWARE_DISKLABEL is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--CONFIG_NLS=y
--CONFIG_NLS_DEFAULT="iso8859-1"
--# CONFIG_NLS_CODEPAGE_437 is not set
--# CONFIG_NLS_CODEPAGE_737 is not set
--# CONFIG_NLS_CODEPAGE_775 is not set
--# CONFIG_NLS_CODEPAGE_850 is not set
--# CONFIG_NLS_CODEPAGE_852 is not set
--# CONFIG_NLS_CODEPAGE_855 is not set
--# CONFIG_NLS_CODEPAGE_857 is not set
--# CONFIG_NLS_CODEPAGE_860 is not set
--# CONFIG_NLS_CODEPAGE_861 is not set
--# CONFIG_NLS_CODEPAGE_862 is not set
--# CONFIG_NLS_CODEPAGE_863 is not set
--# CONFIG_NLS_CODEPAGE_864 is not set
--# CONFIG_NLS_CODEPAGE_865 is not set
--# CONFIG_NLS_CODEPAGE_866 is not set
--# CONFIG_NLS_CODEPAGE_869 is not set
--# CONFIG_NLS_CODEPAGE_936 is not set
--# CONFIG_NLS_CODEPAGE_950 is not set
--# CONFIG_NLS_CODEPAGE_932 is not set
--# CONFIG_NLS_CODEPAGE_949 is not set
--# CONFIG_NLS_CODEPAGE_874 is not set
--# CONFIG_NLS_ISO8859_8 is not set
--# CONFIG_NLS_CODEPAGE_1250 is not set
--# CONFIG_NLS_CODEPAGE_1251 is not set
--# CONFIG_NLS_ASCII is not set
--# CONFIG_NLS_ISO8859_1 is not set
--# CONFIG_NLS_ISO8859_2 is not set
--# CONFIG_NLS_ISO8859_3 is not set
--# CONFIG_NLS_ISO8859_4 is not set
--# CONFIG_NLS_ISO8859_5 is not set
--# CONFIG_NLS_ISO8859_6 is not set
--# CONFIG_NLS_ISO8859_7 is not set
--# CONFIG_NLS_ISO8859_9 is not set
--# CONFIG_NLS_ISO8859_13 is not set
--# CONFIG_NLS_ISO8859_14 is not set
--# CONFIG_NLS_ISO8859_15 is not set
--# CONFIG_NLS_KOI8_R is not set
--# CONFIG_NLS_KOI8_U is not set
--# CONFIG_NLS_UTF8 is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# 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_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--# CONFIG_DEBUG_KERNEL is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--CONFIG_CRYPTO_MD5=y
--# CONFIG_CRYPTO_SHA1 is not set
--# CONFIG_CRYPTO_SHA256 is not set
--# CONFIG_CRYPTO_SHA512 is not set
--# CONFIG_CRYPTO_WP512 is not set
--# CONFIG_CRYPTO_TGR192 is not set
--# CONFIG_CRYPTO_GF128MUL is not set
--# CONFIG_CRYPTO_ECB is not set
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# CONFIG_CRYPTO_BLOWFISH is not set
--# CONFIG_CRYPTO_TWOFISH is not set
--# CONFIG_CRYPTO_SERPENT is not set
--# CONFIG_CRYPTO_AES is not set
--# CONFIG_CRYPTO_CAST5 is not set
--# CONFIG_CRYPTO_CAST6 is not set
--# CONFIG_CRYPTO_TEA is not set
--# CONFIG_CRYPTO_ARC4 is not set
--# CONFIG_CRYPTO_KHAZAD is not set
--# CONFIG_CRYPTO_ANUBIS is not set
--# CONFIG_CRYPTO_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/mpc834x_itxgp_defconfig
-+++ /dev/null
-@@ -1,1222 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:18 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--CONFIG_6xx=y
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_PPC_FPU=y
--# CONFIG_FSL_EMB_PERFMON is not set
--CONFIG_PPC_STD_MMU=y
--CONFIG_PPC_STD_MMU_32=y
--# CONFIG_PPC_MM_SLICES is not set
--# CONFIG_SMP is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--# CONFIG_FAIR_GROUP_SCHED is not set
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--# CONFIG_KALLSYMS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--# CONFIG_EPOLL is not set
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--# CONFIG_KMOD is not set
--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
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--CONFIG_DEFAULT_AS=y
--# CONFIG_DEFAULT_DEADLINE is not set
--# CONFIG_DEFAULT_CFQ is not set
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="anticipatory"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MULTIPLATFORM is not set
--# CONFIG_PPC_82xx is not set
--CONFIG_PPC_83xx=y
--# CONFIG_PPC_86xx is not set
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC83xx=y
--# CONFIG_MPC831x_RDB is not set
--# CONFIG_MPC832x_MDS is not set
--# CONFIG_MPC832x_RDB is not set
--# CONFIG_MPC834x_MDS is not set
--CONFIG_MPC834x_ITX=y
--# CONFIG_MPC836x_MDS is not set
--# CONFIG_MPC837x_MDS is not set
--# CONFIG_MPC837x_RDB is not set
--# CONFIG_SBC834x is not set
--CONFIG_PPC_MPC834x=y
--CONFIG_IPIC=y
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--CONFIG_TICK_ONESHOT=y
--CONFIG_NO_HZ=y
--CONFIG_HIGH_RES_TIMERS=y
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_GENERIC_ISA_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--# CONFIG_XFRM_USER is not set
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# CONFIG_IP_ADVANCED_ROUTER is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_PNP=y
--CONFIG_IP_PNP_DHCP=y
--CONFIG_IP_PNP_BOOTP=y
--# CONFIG_IP_PNP_RARP is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# CONFIG_INET_AH is not set
--# CONFIG_INET_ESP is not set
--# CONFIG_INET_IPCOMP is not set
--# CONFIG_INET_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--CONFIG_INET_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--# CONFIG_BRIDGE is not set
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--# CONFIG_LLC2 is not set
--# CONFIG_IPX is not set
--# CONFIG_ATALK is not set
--# CONFIG_X25 is not set
--# CONFIG_LAPB is not set
--# CONFIG_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--# CONFIG_MTD_CONCAT is not set
--# CONFIG_MTD_PARTITIONS is not set
--
--#
--# User Modules And Translation Layers
--#
--CONFIG_MTD_CHAR=y
--# CONFIG_MTD_BLKDEVS is not set
--# CONFIG_MTD_BLOCK is not set
--# CONFIG_MTD_BLOCK_RO is not set
--# CONFIG_FTL is not set
--# CONFIG_NFTL is not set
--# CONFIG_INFTL is not set
--# CONFIG_RFD_FTL is not set
--# CONFIG_SSFDC is not set
--# CONFIG_MTD_OOPS is not set
--
--#
--# RAM/ROM/Flash chip drivers
--#
--CONFIG_MTD_CFI=y
--# CONFIG_MTD_JEDECPROBE is not set
--CONFIG_MTD_GEN_PROBE=y
--# CONFIG_MTD_CFI_ADV_OPTIONS is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--CONFIG_MTD_MAP_BANK_WIDTH_4=y
--# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
--CONFIG_MTD_CFI_I1=y
--CONFIG_MTD_CFI_I2=y
--# CONFIG_MTD_CFI_I4 is not set
--# CONFIG_MTD_CFI_I8 is not set
--# CONFIG_MTD_CFI_INTELEXT is not set
--CONFIG_MTD_CFI_AMDSTD=y
--# CONFIG_MTD_CFI_STAA is not set
--CONFIG_MTD_CFI_UTIL=y
--# CONFIG_MTD_RAM is not set
--# CONFIG_MTD_ROM is not set
--# CONFIG_MTD_ABSENT is not set
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--CONFIG_MTD_PHYSMAP=y
--CONFIG_MTD_PHYSMAP_START=0xfe000000
--CONFIG_MTD_PHYSMAP_LEN=0x800000
--CONFIG_MTD_PHYSMAP_BANKWIDTH=2
--# CONFIG_MTD_PHYSMAP_OF is not set
--# CONFIG_MTD_INTEL_VR_NOR is not set
--# CONFIG_MTD_PLATRAM is not set
--
--#
--# Self-contained MTD device drivers
--#
--# CONFIG_MTD_PMC551 is not set
--# CONFIG_MTD_DATAFLASH is not set
--# CONFIG_MTD_M25P80 is not set
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_MTDRAM is not set
--# CONFIG_MTD_BLOCK2MTD is not set
--
--#
--# Disk-On-Chip Device Drivers
--#
--# CONFIG_MTD_DOC2000 is not set
--# CONFIG_MTD_DOC2001 is not set
--# CONFIG_MTD_DOC2001PLUS is not set
--# CONFIG_MTD_NAND is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--# CONFIG_BLK_DEV_UB is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--CONFIG_SCSI=y
--CONFIG_SCSI_DMA=y
--# CONFIG_SCSI_TGT is not set
--# CONFIG_SCSI_NETLINK is not set
--CONFIG_SCSI_PROC_FS=y
--
--#
--# SCSI support type (disk, tape, CD-ROM)
--#
--CONFIG_BLK_DEV_SD=y
--# CONFIG_CHR_DEV_ST is not set
--# CONFIG_CHR_DEV_OSST is not set
--# CONFIG_BLK_DEV_SR is not set
--CONFIG_CHR_DEV_SG=y
--# CONFIG_CHR_DEV_SCH is not set
--
--#
--# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
--#
--# CONFIG_SCSI_MULTI_LUN is not set
--# CONFIG_SCSI_CONSTANTS is not set
--# CONFIG_SCSI_LOGGING is not set
--# CONFIG_SCSI_SCAN_ASYNC is not set
--CONFIG_SCSI_WAIT_SCAN=m
--
--#
--# SCSI Transports
--#
--CONFIG_SCSI_SPI_ATTRS=y
--# CONFIG_SCSI_FC_ATTRS is not set
--# CONFIG_SCSI_ISCSI_ATTRS is not set
--# CONFIG_SCSI_SAS_LIBSAS is not set
--# CONFIG_SCSI_SRP_ATTRS is not set
--CONFIG_SCSI_LOWLEVEL=y
--# CONFIG_ISCSI_TCP is not set
--# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
--# CONFIG_SCSI_3W_9XXX is not set
--# CONFIG_SCSI_ACARD is not set
--# CONFIG_SCSI_AACRAID is not set
--# CONFIG_SCSI_AIC7XXX is not set
--# CONFIG_SCSI_AIC7XXX_OLD is not set
--# CONFIG_SCSI_AIC79XX is not set
--# CONFIG_SCSI_AIC94XX is not set
--# CONFIG_SCSI_DPT_I2O is not set
--# CONFIG_SCSI_ADVANSYS is not set
--# CONFIG_SCSI_ARCMSR is not set
--# CONFIG_MEGARAID_NEWGEN is not set
--# CONFIG_MEGARAID_LEGACY is not set
--# CONFIG_MEGARAID_SAS is not set
--# CONFIG_SCSI_HPTIOP is not set
--# CONFIG_SCSI_BUSLOGIC is not set
--# CONFIG_SCSI_DMX3191D is not set
--# CONFIG_SCSI_EATA is not set
--# CONFIG_SCSI_FUTURE_DOMAIN is not set
--# CONFIG_SCSI_GDTH is not set
--# CONFIG_SCSI_IPS is not set
--# CONFIG_SCSI_INITIO is not set
--# CONFIG_SCSI_INIA100 is not set
--# CONFIG_SCSI_MVSAS is not set
--# CONFIG_SCSI_STEX is not set
--# CONFIG_SCSI_SYM53C8XX_2 is not set
--# CONFIG_SCSI_QLOGIC_1280 is not set
--# CONFIG_SCSI_QLA_FC is not set
--# CONFIG_SCSI_QLA_ISCSI is not set
--# CONFIG_SCSI_LPFC is not set
--# CONFIG_SCSI_DC395x is not set
--# CONFIG_SCSI_DC390T is not set
--# CONFIG_SCSI_NSP32 is not set
--# CONFIG_SCSI_DEBUG is not set
--# CONFIG_SCSI_SRP is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--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 is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--# CONFIG_MARVELL_PHY is not set
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--CONFIG_CICADA_PHY=y
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--# CONFIG_NET_ETHERNET is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--CONFIG_GIANFAR=y
--CONFIG_GFAR_NAPI=y
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--
--#
--# USB Network Adapters
--#
--# CONFIG_USB_CATC is not set
--# CONFIG_USB_KAWETH is not set
--# CONFIG_USB_PEGASUS is not set
--# CONFIG_USB_RTL8150 is not set
--# CONFIG_USB_USBNET is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NET_FC is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--# CONFIG_INPUT is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--# CONFIG_SERIAL_8250_PCI is not set
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--CONFIG_HW_RANDOM=y
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=y
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_ALI1535 is not set
--# CONFIG_I2C_ALI1563 is not set
--# CONFIG_I2C_ALI15X3 is not set
--# CONFIG_I2C_AMD756 is not set
--# CONFIG_I2C_AMD8111 is not set
--# CONFIG_I2C_I801 is not set
--# CONFIG_I2C_I810 is not set
--# CONFIG_I2C_PIIX4 is not set
--CONFIG_I2C_MPC=y
--# CONFIG_I2C_NFORCE2 is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--# CONFIG_I2C_PROSAVAGE is not set
--# CONFIG_I2C_SAVAGE4 is not set
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_SIS5595 is not set
--# CONFIG_I2C_SIS630 is not set
--# CONFIG_I2C_SIS96X 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_VIA is not set
--# CONFIG_I2C_VIAPRO is not set
--# CONFIG_I2C_VOODOO3 is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--CONFIG_SENSORS_PCF8574=y
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 is not set
--# CONFIG_I2C_DEBUG_CORE is not set
--# CONFIG_I2C_DEBUG_ALGO is not set
--# CONFIG_I2C_DEBUG_BUS is not set
--# CONFIG_I2C_DEBUG_CHIP is not set
--
--#
--# SPI support
--#
--CONFIG_SPI=y
--CONFIG_SPI_MASTER=y
--
--#
--# SPI Master Controller Drivers
--#
--CONFIG_SPI_BITBANG=y
--CONFIG_SPI_MPC83xx=y
--
--#
--# SPI Protocol Masters
--#
--# CONFIG_SPI_AT25 is not set
--# CONFIG_SPI_SPIDEV is not set
--# CONFIG_SPI_TLE62X0 is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--# CONFIG_HWMON is not set
--# CONFIG_THERMAL is not set
--CONFIG_WATCHDOG=y
--# CONFIG_WATCHDOG_NOWAYOUT is not set
--
--#
--# Watchdog Device Drivers
--#
--# CONFIG_SOFT_WATCHDOG is not set
--CONFIG_83xx_WDT=y
--
--#
--# PCI-based Watchdog Cards
--#
--# CONFIG_PCIPCWATCHDOG is not set
--# CONFIG_WDTPCI is not set
--
--#
--# USB-based Watchdog Cards
--#
--# CONFIG_USBPCWATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--# CONFIG_USB_DABUSB is not set
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=m
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--CONFIG_USB=y
--# CONFIG_USB_DEBUG is not set
--# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
--
--#
--# Miscellaneous USB options
--#
--# CONFIG_USB_DEVICEFS is not set
--CONFIG_USB_DEVICE_CLASS=y
--# CONFIG_USB_DYNAMIC_MINORS is not set
--# CONFIG_USB_OTG is not set
--
--#
--# USB Host Controller Drivers
--#
--CONFIG_USB_EHCI_HCD=y
--CONFIG_USB_EHCI_ROOT_HUB_TT=y
--# CONFIG_USB_EHCI_TT_NEWSCHED is not set
--CONFIG_USB_EHCI_FSL=y
--CONFIG_USB_EHCI_HCD_PPC_OF=y
--# CONFIG_USB_ISP116X_HCD is not set
--# CONFIG_USB_OHCI_HCD is not set
--CONFIG_USB_UHCI_HCD=y
--# CONFIG_USB_SL811_HCD is not set
--# CONFIG_USB_R8A66597_HCD is not set
--
--#
--# USB Device Class drivers
--#
--# CONFIG_USB_ACM is not set
--# CONFIG_USB_PRINTER is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--
--#
--# may also be needed; see USB_STORAGE Help for more information
--#
--CONFIG_USB_STORAGE=y
--# CONFIG_USB_STORAGE_DEBUG is not set
--# CONFIG_USB_STORAGE_DATAFAB is not set
--# CONFIG_USB_STORAGE_FREECOM is not set
--# CONFIG_USB_STORAGE_ISD200 is not set
--# CONFIG_USB_STORAGE_DPCM is not set
--# CONFIG_USB_STORAGE_USBAT is not set
--# CONFIG_USB_STORAGE_SDDR09 is not set
--# CONFIG_USB_STORAGE_SDDR55 is not set
--# CONFIG_USB_STORAGE_JUMPSHOT is not set
--# CONFIG_USB_STORAGE_ALAUDA is not set
--# CONFIG_USB_STORAGE_KARMA is not set
--# CONFIG_USB_LIBUSUAL is not set
--
--#
--# USB Imaging devices
--#
--# CONFIG_USB_MDC800 is not set
--# CONFIG_USB_MICROTEK is not set
--CONFIG_USB_MON=y
--
--#
--# USB port drivers
--#
--# CONFIG_USB_SERIAL is not set
--
--#
--# USB Miscellaneous drivers
--#
--# CONFIG_USB_EMI62 is not set
--# CONFIG_USB_EMI26 is not set
--# CONFIG_USB_ADUTUX is not set
--# CONFIG_USB_AUERSWALD is not set
--# CONFIG_USB_RIO500 is not set
--# CONFIG_USB_LEGOTOWER is not set
--# CONFIG_USB_LCD is not set
--# CONFIG_USB_BERRY_CHARGE is not set
--# CONFIG_USB_LED is not set
--# CONFIG_USB_CYPRESS_CY7C63 is not set
--# CONFIG_USB_CYTHERM is not set
--# CONFIG_USB_PHIDGET is not set
--# CONFIG_USB_IDMOUSE is not set
--# CONFIG_USB_FTDI_ELAN is not set
--# CONFIG_USB_APPLEDISPLAY is not set
--# CONFIG_USB_SISUSBVGA is not set
--# CONFIG_USB_LD is not set
--# CONFIG_USB_TRANCEVIBRATOR is not set
--# CONFIG_USB_IOWARRIOR is not set
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--CONFIG_RTC_LIB=y
--CONFIG_RTC_CLASS=y
--CONFIG_RTC_HCTOSYS=y
--CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
--# CONFIG_RTC_DEBUG is not set
--
--#
--# RTC interfaces
--#
--CONFIG_RTC_INTF_SYSFS=y
--CONFIG_RTC_INTF_PROC=y
--CONFIG_RTC_INTF_DEV=y
--CONFIG_RTC_INTF_DEV_UIE_EMUL=y
--# CONFIG_RTC_DRV_TEST is not set
--
--#
--# I2C RTC drivers
--#
--CONFIG_RTC_DRV_DS1307=y
--# CONFIG_RTC_DRV_DS1374 is not set
--# CONFIG_RTC_DRV_DS1672 is not set
--# CONFIG_RTC_DRV_MAX6900 is not set
--# CONFIG_RTC_DRV_RS5C372 is not set
--# CONFIG_RTC_DRV_ISL1208 is not set
--# CONFIG_RTC_DRV_X1205 is not set
--# CONFIG_RTC_DRV_PCF8563 is not set
--# CONFIG_RTC_DRV_PCF8583 is not set
--# CONFIG_RTC_DRV_M41T80 is not set
--# CONFIG_RTC_DRV_S35390A is not set
--
--#
--# SPI RTC drivers
--#
--# CONFIG_RTC_DRV_MAX6902 is not set
--# CONFIG_RTC_DRV_R9701 is not set
--# CONFIG_RTC_DRV_RS5C348 is not set
--
--#
--# Platform RTC drivers
--#
--# CONFIG_RTC_DRV_CMOS is not set
--# CONFIG_RTC_DRV_DS1511 is not set
--# CONFIG_RTC_DRV_DS1553 is not set
--# CONFIG_RTC_DRV_DS1742 is not set
--# CONFIG_RTC_DRV_STK17TA8 is not set
--# CONFIG_RTC_DRV_M48T86 is not set
--# CONFIG_RTC_DRV_M48T59 is not set
--# CONFIG_RTC_DRV_V3020 is not set
--
--#
--# on-CPU RTC drivers
--#
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--CONFIG_EXT3_FS=y
--CONFIG_EXT3_FS_XATTR=y
--# CONFIG_EXT3_FS_POSIX_ACL is not set
--# CONFIG_EXT3_FS_SECURITY is not set
--# CONFIG_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# CONFIG_AUTOFS_FS is not set
--# CONFIG_AUTOFS4_FS is not set
--# CONFIG_FUSE_FS is not set
--
--#
--# CD-ROM/DVD Filesystems
--#
--# CONFIG_ISO9660_FS is not set
--# CONFIG_UDF_FS is not set
--
--#
--# DOS/FAT/NT Filesystems
--#
--CONFIG_FAT_FS=y
--CONFIG_MSDOS_FS=y
--CONFIG_VFAT_FS=y
--CONFIG_FAT_DEFAULT_CODEPAGE=437
--CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
--
--#
--# Miscellaneous filesystems
--#
--# CONFIG_ADFS_FS is not set
--# CONFIG_AFFS_FS is not set
--# CONFIG_HFS_FS is not set
--# CONFIG_HFSPLUS_FS is not set
--# CONFIG_BEFS_FS is not set
--# CONFIG_BFS_FS is not set
--# CONFIG_EFS_FS is not set
--# CONFIG_JFFS2_FS is not set
--# CONFIG_CRAMFS is not set
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--CONFIG_NFS_V4=y
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--CONFIG_SUNRPC_GSS=y
--# CONFIG_SUNRPC_BIND34 is not set
--CONFIG_RPCSEC_GSS_KRB5=y
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--CONFIG_MAC_PARTITION=y
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_BSD_DISKLABEL is not set
--# CONFIG_MINIX_SUBPARTITION is not set
--# CONFIG_SOLARIS_X86_PARTITION is not set
--# CONFIG_UNIXWARE_DISKLABEL is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--CONFIG_NLS=y
--CONFIG_NLS_DEFAULT="iso8859-1"
--# CONFIG_NLS_CODEPAGE_437 is not set
--# CONFIG_NLS_CODEPAGE_737 is not set
--# CONFIG_NLS_CODEPAGE_775 is not set
--# CONFIG_NLS_CODEPAGE_850 is not set
--# CONFIG_NLS_CODEPAGE_852 is not set
--# CONFIG_NLS_CODEPAGE_855 is not set
--# CONFIG_NLS_CODEPAGE_857 is not set
--# CONFIG_NLS_CODEPAGE_860 is not set
--# CONFIG_NLS_CODEPAGE_861 is not set
--# CONFIG_NLS_CODEPAGE_862 is not set
--# CONFIG_NLS_CODEPAGE_863 is not set
--# CONFIG_NLS_CODEPAGE_864 is not set
--# CONFIG_NLS_CODEPAGE_865 is not set
--# CONFIG_NLS_CODEPAGE_866 is not set
--# CONFIG_NLS_CODEPAGE_869 is not set
--# CONFIG_NLS_CODEPAGE_936 is not set
--# CONFIG_NLS_CODEPAGE_950 is not set
--# CONFIG_NLS_CODEPAGE_932 is not set
--# CONFIG_NLS_CODEPAGE_949 is not set
--# CONFIG_NLS_CODEPAGE_874 is not set
--# CONFIG_NLS_ISO8859_8 is not set
--# CONFIG_NLS_CODEPAGE_1250 is not set
--# CONFIG_NLS_CODEPAGE_1251 is not set
--# CONFIG_NLS_ASCII is not set
--# CONFIG_NLS_ISO8859_1 is not set
--# CONFIG_NLS_ISO8859_2 is not set
--# CONFIG_NLS_ISO8859_3 is not set
--# CONFIG_NLS_ISO8859_4 is not set
--# CONFIG_NLS_ISO8859_5 is not set
--# CONFIG_NLS_ISO8859_6 is not set
--# CONFIG_NLS_ISO8859_7 is not set
--# CONFIG_NLS_ISO8859_9 is not set
--# CONFIG_NLS_ISO8859_13 is not set
--# CONFIG_NLS_ISO8859_14 is not set
--# CONFIG_NLS_ISO8859_15 is not set
--# CONFIG_NLS_KOI8_R is not set
--# CONFIG_NLS_KOI8_U is not set
--# CONFIG_NLS_UTF8 is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# 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_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--# CONFIG_DEBUG_KERNEL is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--CONFIG_CRYPTO_MD5=y
--# CONFIG_CRYPTO_SHA1 is not set
--# CONFIG_CRYPTO_SHA256 is not set
--# CONFIG_CRYPTO_SHA512 is not set
--# CONFIG_CRYPTO_WP512 is not set
--# CONFIG_CRYPTO_TGR192 is not set
--# CONFIG_CRYPTO_GF128MUL is not set
--# CONFIG_CRYPTO_ECB is not set
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# CONFIG_CRYPTO_BLOWFISH is not set
--# CONFIG_CRYPTO_TWOFISH is not set
--# CONFIG_CRYPTO_SERPENT is not set
--# CONFIG_CRYPTO_AES is not set
--# CONFIG_CRYPTO_CAST5 is not set
--# CONFIG_CRYPTO_CAST6 is not set
--# CONFIG_CRYPTO_TEA is not set
--# CONFIG_CRYPTO_ARC4 is not set
--# CONFIG_CRYPTO_KHAZAD is not set
--# CONFIG_CRYPTO_ANUBIS is not set
--# CONFIG_CRYPTO_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/mpc834x_mds_defconfig
-+++ /dev/null
-@@ -1,1021 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc7
--# Mon Mar 31 11:36:56 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--CONFIG_6xx=y
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_PPC_FPU=y
--# CONFIG_FSL_EMB_PERFMON is not set
--CONFIG_PPC_STD_MMU=y
--CONFIG_PPC_STD_MMU_32=y
--# CONFIG_PPC_MM_SLICES is not set
--# CONFIG_SMP is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--# CONFIG_FAIR_GROUP_SCHED is not set
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--# CONFIG_KALLSYMS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--# CONFIG_EPOLL is not set
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--# CONFIG_KMOD is not set
--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
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--CONFIG_DEFAULT_AS=y
--# CONFIG_DEFAULT_DEADLINE is not set
--# CONFIG_DEFAULT_CFQ is not set
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="anticipatory"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MULTIPLATFORM is not set
--# CONFIG_PPC_82xx is not set
--CONFIG_PPC_83xx=y
--# CONFIG_PPC_86xx is not set
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC83xx=y
--# CONFIG_MPC831x_RDB is not set
--# CONFIG_MPC832x_MDS is not set
--# CONFIG_MPC832x_RDB is not set
--CONFIG_MPC834x_MDS=y
--# CONFIG_MPC834x_ITX is not set
--# CONFIG_MPC836x_MDS is not set
--# CONFIG_MPC837x_MDS is not set
--# CONFIG_MPC837x_RDB is not set
--# CONFIG_SBC834x is not set
--CONFIG_PPC_MPC834x=y
--CONFIG_IPIC=y
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--CONFIG_TICK_ONESHOT=y
--CONFIG_NO_HZ=y
--CONFIG_HIGH_RES_TIMERS=y
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_GENERIC_ISA_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--CONFIG_XFRM_USER=m
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# CONFIG_IP_ADVANCED_ROUTER is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_PNP=y
--CONFIG_IP_PNP_DHCP=y
--CONFIG_IP_PNP_BOOTP=y
--# CONFIG_IP_PNP_RARP is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# CONFIG_INET_AH is not set
--# CONFIG_INET_ESP is not set
--# CONFIG_INET_IPCOMP is not set
--# CONFIG_INET_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--CONFIG_INET_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--# CONFIG_BRIDGE is not set
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--# CONFIG_LLC2 is not set
--# CONFIG_IPX is not set
--# CONFIG_ATALK is not set
--# CONFIG_X25 is not set
--# CONFIG_LAPB is not set
--# CONFIG_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--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 is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--CONFIG_MARVELL_PHY=y
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--CONFIG_NET_PCI=y
--# CONFIG_PCNET32 is not set
--# CONFIG_AMD8111_ETH is not set
--# CONFIG_ADAPTEC_STARFIRE is not set
--# CONFIG_B44 is not set
--# CONFIG_FORCEDETH is not set
--# CONFIG_EEPRO100 is not set
--CONFIG_E100=y
--# CONFIG_FEALNX is not set
--# CONFIG_NATSEMI is not set
--# CONFIG_NE2K_PCI is not set
--# CONFIG_8139CP is not set
--# CONFIG_8139TOO is not set
--# CONFIG_R6040 is not set
--# CONFIG_SIS900 is not set
--# CONFIG_EPIC100 is not set
--# CONFIG_SUNDANCE is not set
--# CONFIG_TLAN is not set
--# CONFIG_VIA_RHINE is not set
--# CONFIG_SC92031 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--CONFIG_GIANFAR=y
--# CONFIG_GFAR_NAPI is not set
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=y
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_ALI1535 is not set
--# CONFIG_I2C_ALI1563 is not set
--# CONFIG_I2C_ALI15X3 is not set
--# CONFIG_I2C_AMD756 is not set
--# CONFIG_I2C_AMD8111 is not set
--# CONFIG_I2C_I801 is not set
--# CONFIG_I2C_I810 is not set
--# CONFIG_I2C_PIIX4 is not set
--CONFIG_I2C_MPC=y
--# CONFIG_I2C_NFORCE2 is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--# CONFIG_I2C_PROSAVAGE is not set
--# CONFIG_I2C_SAVAGE4 is not set
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_SIS5595 is not set
--# CONFIG_I2C_SIS630 is not set
--# CONFIG_I2C_SIS96X is not set
--# CONFIG_I2C_TAOS_EVM is not set
--# CONFIG_I2C_STUB is not set
--# CONFIG_I2C_VIA is not set
--# CONFIG_I2C_VIAPRO is not set
--# CONFIG_I2C_VOODOO3 is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 is not set
--# CONFIG_I2C_DEBUG_CORE is not set
--# CONFIG_I2C_DEBUG_ALGO is not set
--# CONFIG_I2C_DEBUG_BUS is not set
--# CONFIG_I2C_DEBUG_CHIP is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_AD7418 is not set
--# CONFIG_SENSORS_ADM1021 is not set
--# CONFIG_SENSORS_ADM1025 is not set
--# CONFIG_SENSORS_ADM1026 is not set
--# CONFIG_SENSORS_ADM1029 is not set
--# CONFIG_SENSORS_ADM1031 is not set
--# CONFIG_SENSORS_ADM9240 is not set
--# CONFIG_SENSORS_ADT7470 is not set
--# CONFIG_SENSORS_ADT7473 is not set
--# CONFIG_SENSORS_ATXP1 is not set
--# CONFIG_SENSORS_DS1621 is not set
--# CONFIG_SENSORS_I5K_AMB is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_F75375S is not set
--# CONFIG_SENSORS_GL518SM is not set
--# CONFIG_SENSORS_GL520SM is not set
--# CONFIG_SENSORS_IT87 is not set
--# CONFIG_SENSORS_LM63 is not set
--# CONFIG_SENSORS_LM75 is not set
--# CONFIG_SENSORS_LM77 is not set
--# CONFIG_SENSORS_LM78 is not set
--# CONFIG_SENSORS_LM80 is not set
--# CONFIG_SENSORS_LM83 is not set
--# CONFIG_SENSORS_LM85 is not set
--# 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_SIS5595 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_ADS7828 is not set
--# CONFIG_SENSORS_THMC50 is not set
--# CONFIG_SENSORS_VIA686A is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_VT8231 is not set
--# CONFIG_SENSORS_W83781D is not set
--# CONFIG_SENSORS_W83791D is not set
--# CONFIG_SENSORS_W83792D is not set
--# CONFIG_SENSORS_W83793 is not set
--# CONFIG_SENSORS_W83L785TS is not set
--# CONFIG_SENSORS_W83L786NG is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--# CONFIG_HWMON_DEBUG_CHIP is not set
--# CONFIG_THERMAL is not set
--CONFIG_WATCHDOG=y
--# CONFIG_WATCHDOG_NOWAYOUT is not set
--
--#
--# Watchdog Device Drivers
--#
--# CONFIG_SOFT_WATCHDOG is not set
--CONFIG_83xx_WDT=y
--
--#
--# PCI-based Watchdog Cards
--#
--# CONFIG_PCIPCWATCHDOG is not set
--# CONFIG_WDTPCI is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=m
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--CONFIG_RTC_LIB=y
--CONFIG_RTC_CLASS=y
--CONFIG_RTC_HCTOSYS=y
--CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
--# CONFIG_RTC_DEBUG is not set
--
--#
--# RTC interfaces
--#
--CONFIG_RTC_INTF_SYSFS=y
--CONFIG_RTC_INTF_PROC=y
--CONFIG_RTC_INTF_DEV=y
--# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
--# CONFIG_RTC_DRV_TEST is not set
--
--#
--# I2C RTC drivers
--#
--# CONFIG_RTC_DRV_DS1307 is not set
--CONFIG_RTC_DRV_DS1374=y
--# CONFIG_RTC_DRV_DS1672 is not set
--# CONFIG_RTC_DRV_MAX6900 is not set
--# CONFIG_RTC_DRV_RS5C372 is not set
--# CONFIG_RTC_DRV_ISL1208 is not set
--# CONFIG_RTC_DRV_X1205 is not set
--# CONFIG_RTC_DRV_PCF8563 is not set
--# CONFIG_RTC_DRV_PCF8583 is not set
--# CONFIG_RTC_DRV_M41T80 is not set
--# CONFIG_RTC_DRV_S35390A is not set
--
--#
--# SPI RTC drivers
--#
--
--#
--# Platform RTC drivers
--#
--# CONFIG_RTC_DRV_CMOS is not set
--# CONFIG_RTC_DRV_DS1511 is not set
--# CONFIG_RTC_DRV_DS1553 is not set
--# CONFIG_RTC_DRV_DS1742 is not set
--# CONFIG_RTC_DRV_STK17TA8 is not set
--# CONFIG_RTC_DRV_M48T86 is not set
--# CONFIG_RTC_DRV_M48T59 is not set
--# CONFIG_RTC_DRV_V3020 is not set
--
--#
--# on-CPU RTC drivers
--#
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--CONFIG_EXT3_FS=y
--CONFIG_EXT3_FS_XATTR=y
--# CONFIG_EXT3_FS_POSIX_ACL is not set
--# CONFIG_EXT3_FS_SECURITY is not set
--# CONFIG_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# CONFIG_AUTOFS_FS is not set
--# CONFIG_AUTOFS4_FS is not set
--# CONFIG_FUSE_FS is not set
--
--#
--# CD-ROM/DVD Filesystems
--#
--# CONFIG_ISO9660_FS is not set
--# CONFIG_UDF_FS is not set
--
--#
--# DOS/FAT/NT Filesystems
--#
--# CONFIG_MSDOS_FS is not set
--# CONFIG_VFAT_FS is not set
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
--
--#
--# Miscellaneous filesystems
--#
--# CONFIG_ADFS_FS is not set
--# CONFIG_AFFS_FS is not set
--# CONFIG_HFS_FS is not set
--# CONFIG_HFSPLUS_FS is not set
--# CONFIG_BEFS_FS is not set
--# CONFIG_BFS_FS is not set
--# CONFIG_EFS_FS is not set
--# CONFIG_CRAMFS is not set
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--CONFIG_NFS_V4=y
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--CONFIG_SUNRPC_GSS=y
--# CONFIG_SUNRPC_BIND34 is not set
--CONFIG_RPCSEC_GSS_KRB5=y
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--# CONFIG_MAC_PARTITION is not set
--# CONFIG_MSDOS_PARTITION is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# 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_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--# CONFIG_DEBUG_KERNEL is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--CONFIG_CRYPTO_MD5=y
--# CONFIG_CRYPTO_SHA1 is not set
--# CONFIG_CRYPTO_SHA256 is not set
--# CONFIG_CRYPTO_SHA512 is not set
--# CONFIG_CRYPTO_WP512 is not set
--# CONFIG_CRYPTO_TGR192 is not set
--# CONFIG_CRYPTO_GF128MUL is not set
--CONFIG_CRYPTO_ECB=m
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# CONFIG_CRYPTO_BLOWFISH is not set
--# CONFIG_CRYPTO_TWOFISH is not set
--# CONFIG_CRYPTO_SERPENT is not set
--# CONFIG_CRYPTO_AES is not set
--# CONFIG_CRYPTO_CAST5 is not set
--# CONFIG_CRYPTO_CAST6 is not set
--# CONFIG_CRYPTO_TEA is not set
--# CONFIG_CRYPTO_ARC4 is not set
--# CONFIG_CRYPTO_KHAZAD is not set
--# CONFIG_CRYPTO_ANUBIS is not set
--# CONFIG_CRYPTO_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/mpc836x_mds_defconfig
-+++ /dev/null
-@@ -1,1079 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc7
--# Mon Mar 31 11:36:57 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--CONFIG_6xx=y
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_PPC_FPU=y
--# CONFIG_FSL_EMB_PERFMON is not set
--CONFIG_PPC_STD_MMU=y
--CONFIG_PPC_STD_MMU_32=y
--# CONFIG_PPC_MM_SLICES is not set
--# CONFIG_SMP is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--# CONFIG_FAIR_GROUP_SCHED is not set
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--# CONFIG_KALLSYMS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--# CONFIG_EPOLL is not set
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--# CONFIG_KMOD is not set
--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
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--CONFIG_DEFAULT_AS=y
--# CONFIG_DEFAULT_DEADLINE is not set
--# CONFIG_DEFAULT_CFQ is not set
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="anticipatory"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MULTIPLATFORM is not set
--# CONFIG_PPC_82xx is not set
--CONFIG_PPC_83xx=y
--# CONFIG_PPC_86xx is not set
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC83xx=y
--# CONFIG_MPC831x_RDB is not set
--# CONFIG_MPC832x_MDS is not set
--# CONFIG_MPC832x_RDB is not set
--# CONFIG_MPC834x_MDS is not set
--# CONFIG_MPC834x_ITX is not set
--CONFIG_MPC836x_MDS=y
--# CONFIG_MPC837x_MDS is not set
--# CONFIG_MPC837x_RDB is not set
--# CONFIG_SBC834x is not set
--CONFIG_IPIC=y
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--CONFIG_QUICC_ENGINE=y
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--CONFIG_TICK_ONESHOT=y
--CONFIG_NO_HZ=y
--CONFIG_HIGH_RES_TIMERS=y
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_GENERIC_ISA_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--# CONFIG_XFRM_USER is not set
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# CONFIG_IP_ADVANCED_ROUTER is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_PNP=y
--CONFIG_IP_PNP_DHCP=y
--CONFIG_IP_PNP_BOOTP=y
--# CONFIG_IP_PNP_RARP is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# CONFIG_INET_AH is not set
--# CONFIG_INET_ESP is not set
--# CONFIG_INET_IPCOMP is not set
--# CONFIG_INET_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--CONFIG_INET_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--# CONFIG_BRIDGE is not set
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--# CONFIG_LLC2 is not set
--# CONFIG_IPX is not set
--# CONFIG_ATALK is not set
--# CONFIG_X25 is not set
--# CONFIG_LAPB is not set
--# CONFIG_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--CONFIG_SCSI=y
--CONFIG_SCSI_DMA=y
--# CONFIG_SCSI_TGT is not set
--# CONFIG_SCSI_NETLINK is not set
--CONFIG_SCSI_PROC_FS=y
--
--#
--# SCSI support type (disk, tape, CD-ROM)
--#
--# CONFIG_BLK_DEV_SD is not set
--# CONFIG_CHR_DEV_ST is not set
--# CONFIG_CHR_DEV_OSST is not set
--# CONFIG_BLK_DEV_SR is not set
--# CONFIG_CHR_DEV_SG is not set
--# CONFIG_CHR_DEV_SCH is not set
--
--#
--# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
--#
--# CONFIG_SCSI_MULTI_LUN is not set
--# CONFIG_SCSI_CONSTANTS is not set
--# CONFIG_SCSI_LOGGING is not set
--# CONFIG_SCSI_SCAN_ASYNC is not set
--CONFIG_SCSI_WAIT_SCAN=m
--
--#
--# SCSI Transports
--#
--# CONFIG_SCSI_SPI_ATTRS is not set
--# CONFIG_SCSI_FC_ATTRS is not set
--# CONFIG_SCSI_ISCSI_ATTRS is not set
--# CONFIG_SCSI_SAS_LIBSAS is not set
--# CONFIG_SCSI_SRP_ATTRS is not set
--CONFIG_SCSI_LOWLEVEL=y
--# CONFIG_ISCSI_TCP is not set
--# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
--# CONFIG_SCSI_3W_9XXX is not set
--# CONFIG_SCSI_ACARD is not set
--# CONFIG_SCSI_AACRAID is not set
--# CONFIG_SCSI_AIC7XXX is not set
--# CONFIG_SCSI_AIC7XXX_OLD is not set
--# CONFIG_SCSI_AIC79XX is not set
--# CONFIG_SCSI_AIC94XX is not set
--# CONFIG_SCSI_DPT_I2O is not set
--# CONFIG_SCSI_ADVANSYS is not set
--# CONFIG_SCSI_ARCMSR is not set
--# CONFIG_MEGARAID_NEWGEN is not set
--# CONFIG_MEGARAID_LEGACY is not set
--# CONFIG_MEGARAID_SAS is not set
--# CONFIG_SCSI_HPTIOP is not set
--# CONFIG_SCSI_BUSLOGIC is not set
--# CONFIG_SCSI_DMX3191D is not set
--# CONFIG_SCSI_EATA is not set
--# CONFIG_SCSI_FUTURE_DOMAIN is not set
--# CONFIG_SCSI_GDTH is not set
--# CONFIG_SCSI_IPS is not set
--# CONFIG_SCSI_INITIO is not set
--# CONFIG_SCSI_INIA100 is not set
--# CONFIG_SCSI_MVSAS is not set
--# CONFIG_SCSI_STEX is not set
--# CONFIG_SCSI_SYM53C8XX_2 is not set
--# CONFIG_SCSI_QLOGIC_1280 is not set
--# CONFIG_SCSI_QLA_FC is not set
--# CONFIG_SCSI_QLA_ISCSI is not set
--# CONFIG_SCSI_LPFC is not set
--# CONFIG_SCSI_DC395x is not set
--# CONFIG_SCSI_DC390T is not set
--# CONFIG_SCSI_NSP32 is not set
--# CONFIG_SCSI_DEBUG is not set
--# CONFIG_SCSI_SRP is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--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 is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--CONFIG_MARVELL_PHY=y
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--# CONFIG_GIANFAR is not set
--CONFIG_UCC_GETH=y
--# CONFIG_UGETH_NAPI is not set
--# CONFIG_UGETH_MAGIC_PACKET is not set
--# CONFIG_UGETH_FILTERING is not set
--# CONFIG_UGETH_TX_ON_DEMAND is not set
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NET_FC is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--# CONFIG_SERIAL_OF_PLATFORM is not set
--# CONFIG_SERIAL_QE is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--CONFIG_HW_RANDOM=y
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=y
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_ALI1535 is not set
--# CONFIG_I2C_ALI1563 is not set
--# CONFIG_I2C_ALI15X3 is not set
--# CONFIG_I2C_AMD756 is not set
--# CONFIG_I2C_AMD8111 is not set
--# CONFIG_I2C_I801 is not set
--# CONFIG_I2C_I810 is not set
--# CONFIG_I2C_PIIX4 is not set
--CONFIG_I2C_MPC=y
--# CONFIG_I2C_NFORCE2 is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--# CONFIG_I2C_PROSAVAGE is not set
--# CONFIG_I2C_SAVAGE4 is not set
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_SIS5595 is not set
--# CONFIG_I2C_SIS630 is not set
--# CONFIG_I2C_SIS96X is not set
--# CONFIG_I2C_TAOS_EVM is not set
--# CONFIG_I2C_STUB is not set
--# CONFIG_I2C_VIA is not set
--# CONFIG_I2C_VIAPRO is not set
--# CONFIG_I2C_VOODOO3 is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 is not set
--# CONFIG_I2C_DEBUG_CORE is not set
--# CONFIG_I2C_DEBUG_ALGO is not set
--# CONFIG_I2C_DEBUG_BUS is not set
--# CONFIG_I2C_DEBUG_CHIP is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_AD7418 is not set
--# CONFIG_SENSORS_ADM1021 is not set
--# CONFIG_SENSORS_ADM1025 is not set
--# CONFIG_SENSORS_ADM1026 is not set
--# CONFIG_SENSORS_ADM1029 is not set
--# CONFIG_SENSORS_ADM1031 is not set
--# CONFIG_SENSORS_ADM9240 is not set
--# CONFIG_SENSORS_ADT7470 is not set
--# CONFIG_SENSORS_ADT7473 is not set
--# CONFIG_SENSORS_ATXP1 is not set
--# CONFIG_SENSORS_DS1621 is not set
--# CONFIG_SENSORS_I5K_AMB is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_F75375S is not set
--# CONFIG_SENSORS_GL518SM is not set
--# CONFIG_SENSORS_GL520SM is not set
--# CONFIG_SENSORS_IT87 is not set
--# CONFIG_SENSORS_LM63 is not set
--# CONFIG_SENSORS_LM75 is not set
--# CONFIG_SENSORS_LM77 is not set
--# CONFIG_SENSORS_LM78 is not set
--# CONFIG_SENSORS_LM80 is not set
--# CONFIG_SENSORS_LM83 is not set
--# CONFIG_SENSORS_LM85 is not set
--# 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_SIS5595 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_ADS7828 is not set
--# CONFIG_SENSORS_THMC50 is not set
--# CONFIG_SENSORS_VIA686A is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_VT8231 is not set
--# CONFIG_SENSORS_W83781D is not set
--# CONFIG_SENSORS_W83791D is not set
--# CONFIG_SENSORS_W83792D is not set
--# CONFIG_SENSORS_W83793 is not set
--# CONFIG_SENSORS_W83L785TS is not set
--# CONFIG_SENSORS_W83L786NG is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--# CONFIG_HWMON_DEBUG_CHIP is not set
--# CONFIG_THERMAL is not set
--CONFIG_WATCHDOG=y
--# CONFIG_WATCHDOG_NOWAYOUT is not set
--
--#
--# Watchdog Device Drivers
--#
--# CONFIG_SOFT_WATCHDOG is not set
--CONFIG_83xx_WDT=y
--
--#
--# PCI-based Watchdog Cards
--#
--# CONFIG_PCIPCWATCHDOG is not set
--# CONFIG_WDTPCI is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=m
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--CONFIG_RTC_LIB=y
--CONFIG_RTC_CLASS=y
--CONFIG_RTC_HCTOSYS=y
--CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
--# CONFIG_RTC_DEBUG is not set
--
--#
--# RTC interfaces
--#
--CONFIG_RTC_INTF_SYSFS=y
--CONFIG_RTC_INTF_PROC=y
--CONFIG_RTC_INTF_DEV=y
--# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
--# CONFIG_RTC_DRV_TEST is not set
--
--#
--# I2C RTC drivers
--#
--# CONFIG_RTC_DRV_DS1307 is not set
--CONFIG_RTC_DRV_DS1374=y
--# CONFIG_RTC_DRV_DS1672 is not set
--# CONFIG_RTC_DRV_MAX6900 is not set
--# CONFIG_RTC_DRV_RS5C372 is not set
--# CONFIG_RTC_DRV_ISL1208 is not set
--# CONFIG_RTC_DRV_X1205 is not set
--# CONFIG_RTC_DRV_PCF8563 is not set
--# CONFIG_RTC_DRV_PCF8583 is not set
--# CONFIG_RTC_DRV_M41T80 is not set
--# CONFIG_RTC_DRV_S35390A is not set
--
--#
--# SPI RTC drivers
--#
--
--#
--# Platform RTC drivers
--#
--# CONFIG_RTC_DRV_CMOS is not set
--# CONFIG_RTC_DRV_DS1511 is not set
--# CONFIG_RTC_DRV_DS1553 is not set
--# CONFIG_RTC_DRV_DS1742 is not set
--# CONFIG_RTC_DRV_STK17TA8 is not set
--# CONFIG_RTC_DRV_M48T86 is not set
--# CONFIG_RTC_DRV_M48T59 is not set
--# CONFIG_RTC_DRV_V3020 is not set
--
--#
--# on-CPU RTC drivers
--#
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--CONFIG_EXT3_FS=y
--CONFIG_EXT3_FS_XATTR=y
--# CONFIG_EXT3_FS_POSIX_ACL is not set
--# CONFIG_EXT3_FS_SECURITY is not set
--# CONFIG_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# CONFIG_AUTOFS_FS is not set
--# CONFIG_AUTOFS4_FS is not set
--# CONFIG_FUSE_FS is not set
--
--#
--# CD-ROM/DVD Filesystems
--#
--# CONFIG_ISO9660_FS is not set
--# CONFIG_UDF_FS is not set
--
--#
--# DOS/FAT/NT Filesystems
--#
--# CONFIG_MSDOS_FS is not set
--# CONFIG_VFAT_FS is not set
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
--
--#
--# Miscellaneous filesystems
--#
--# CONFIG_ADFS_FS is not set
--# CONFIG_AFFS_FS is not set
--# CONFIG_HFS_FS is not set
--# CONFIG_HFSPLUS_FS is not set
--# CONFIG_BEFS_FS is not set
--# CONFIG_BFS_FS is not set
--# CONFIG_EFS_FS is not set
--# CONFIG_CRAMFS is not set
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--CONFIG_NFS_V4=y
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--CONFIG_SUNRPC_GSS=y
--# CONFIG_SUNRPC_BIND34 is not set
--CONFIG_RPCSEC_GSS_KRB5=y
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--# CONFIG_MAC_PARTITION is not set
--# CONFIG_MSDOS_PARTITION is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--CONFIG_UCC_FAST=y
--CONFIG_UCC=y
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# 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_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--# CONFIG_DEBUG_KERNEL is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--CONFIG_CRYPTO_MD5=y
--# CONFIG_CRYPTO_SHA1 is not set
--# CONFIG_CRYPTO_SHA256 is not set
--# CONFIG_CRYPTO_SHA512 is not set
--# CONFIG_CRYPTO_WP512 is not set
--# CONFIG_CRYPTO_TGR192 is not set
--# CONFIG_CRYPTO_GF128MUL is not set
--CONFIG_CRYPTO_ECB=m
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# CONFIG_CRYPTO_BLOWFISH is not set
--# CONFIG_CRYPTO_TWOFISH is not set
--# CONFIG_CRYPTO_SERPENT is not set
--# CONFIG_CRYPTO_AES is not set
--# CONFIG_CRYPTO_CAST5 is not set
--# CONFIG_CRYPTO_CAST6 is not set
--# CONFIG_CRYPTO_TEA is not set
--# CONFIG_CRYPTO_ARC4 is not set
--# CONFIG_CRYPTO_KHAZAD is not set
--# CONFIG_CRYPTO_ANUBIS is not set
--# CONFIG_CRYPTO_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
--CONFIG_PPC_LIB_RHEAP=y
---- a/arch/powerpc/configs/mpc837x_mds_defconfig
-+++ /dev/null
-@@ -1,899 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:23 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--CONFIG_6xx=y
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_PPC_FPU=y
--# CONFIG_FSL_EMB_PERFMON is not set
--CONFIG_PPC_STD_MMU=y
--CONFIG_PPC_STD_MMU_32=y
--# CONFIG_PPC_MM_SLICES is not set
--# CONFIG_SMP is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--CONFIG_FAIR_GROUP_SCHED=y
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--CONFIG_KALLSYMS=y
--# CONFIG_KALLSYMS_EXTRA_PASS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--# CONFIG_EPOLL is not set
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLAB=y
--# CONFIG_SLUB is not set
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--# CONFIG_KPROBES is not set
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--# CONFIG_KMOD is not set
--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
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--CONFIG_DEFAULT_AS=y
--# CONFIG_DEFAULT_DEADLINE is not set
--# CONFIG_DEFAULT_CFQ is not set
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="anticipatory"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MULTIPLATFORM is not set
--# CONFIG_PPC_82xx is not set
--CONFIG_PPC_83xx=y
--# CONFIG_PPC_86xx is not set
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC83xx=y
--# CONFIG_MPC831x_RDB is not set
--# CONFIG_MPC832x_MDS is not set
--# CONFIG_MPC832x_RDB is not set
--# CONFIG_MPC834x_MDS is not set
--# CONFIG_MPC834x_ITX is not set
--# CONFIG_MPC836x_MDS is not set
--CONFIG_MPC837x_MDS=y
--# CONFIG_MPC837x_RDB is not set
--# CONFIG_SBC834x is not set
--CONFIG_PPC_MPC837x=y
--CONFIG_IPIC=y
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_GENERIC_ISA_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--# CONFIG_PCI is not set
--# CONFIG_PCI_DOMAINS is not set
--# CONFIG_PCI_SYSCALL is not set
--# CONFIG_ARCH_SUPPORTS_MSI is not set
--# CONFIG_PCCARD is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--CONFIG_XFRM_USER=m
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# CONFIG_IP_ADVANCED_ROUTER is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_PNP=y
--CONFIG_IP_PNP_DHCP=y
--CONFIG_IP_PNP_BOOTP=y
--# CONFIG_IP_PNP_RARP is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# CONFIG_INET_AH is not set
--# CONFIG_INET_ESP is not set
--# CONFIG_INET_IPCOMP is not set
--# CONFIG_INET_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--CONFIG_INET_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--# CONFIG_BRIDGE is not set
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--# CONFIG_LLC2 is not set
--# CONFIG_IPX is not set
--# CONFIG_ATALK is not set
--# CONFIG_X25 is not set
--# CONFIG_LAPB is not set
--# CONFIG_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--CONFIG_SCSI=y
--CONFIG_SCSI_DMA=y
--# CONFIG_SCSI_TGT is not set
--# CONFIG_SCSI_NETLINK is not set
--CONFIG_SCSI_PROC_FS=y
--
--#
--# SCSI support type (disk, tape, CD-ROM)
--#
--CONFIG_BLK_DEV_SD=y
--# CONFIG_CHR_DEV_ST is not set
--# CONFIG_CHR_DEV_OSST is not set
--# CONFIG_BLK_DEV_SR is not set
--CONFIG_CHR_DEV_SG=y
--# CONFIG_CHR_DEV_SCH is not set
--
--#
--# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
--#
--# CONFIG_SCSI_MULTI_LUN is not set
--# CONFIG_SCSI_CONSTANTS is not set
--# CONFIG_SCSI_LOGGING is not set
--# CONFIG_SCSI_SCAN_ASYNC is not set
--CONFIG_SCSI_WAIT_SCAN=m
--
--#
--# SCSI Transports
--#
--# CONFIG_SCSI_SPI_ATTRS is not set
--# CONFIG_SCSI_FC_ATTRS is not set
--# CONFIG_SCSI_ISCSI_ATTRS is not set
--# CONFIG_SCSI_SAS_LIBSAS is not set
--# CONFIG_SCSI_SRP_ATTRS is not set
--CONFIG_SCSI_LOWLEVEL=y
--# CONFIG_ISCSI_TCP is not set
--# CONFIG_SCSI_DEBUG is not set
--CONFIG_ATA=y
--# CONFIG_ATA_NONSTANDARD is not set
--# CONFIG_SATA_MV is not set
--CONFIG_SATA_FSL=y
--# CONFIG_PATA_PLATFORM is not set
--# CONFIG_MD is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--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 is not set
--# CONFIG_VETH is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--CONFIG_MARVELL_PHY=y
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_E1000E_ENABLED is not set
--CONFIG_GIANFAR=y
--# CONFIG_GFAR_NAPI is not set
--CONFIG_NETDEV_10000=y
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--CONFIG_GEN_RTC=y
--# CONFIG_GEN_RTC_X is not set
--# CONFIG_R3964 is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=y
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--CONFIG_I2C_MPC=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
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 is not set
--# CONFIG_I2C_DEBUG_CORE is not set
--# CONFIG_I2C_DEBUG_ALGO is not set
--# CONFIG_I2C_DEBUG_BUS is not set
--# CONFIG_I2C_DEBUG_CHIP is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_AD7418 is not set
--# CONFIG_SENSORS_ADM1021 is not set
--# CONFIG_SENSORS_ADM1025 is not set
--# CONFIG_SENSORS_ADM1026 is not set
--# CONFIG_SENSORS_ADM1029 is not set
--# CONFIG_SENSORS_ADM1031 is not set
--# CONFIG_SENSORS_ADM9240 is not set
--# CONFIG_SENSORS_ADT7470 is not set
--# CONFIG_SENSORS_ADT7473 is not set
--# CONFIG_SENSORS_ATXP1 is not set
--# CONFIG_SENSORS_DS1621 is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_F75375S is not set
--# CONFIG_SENSORS_GL518SM is not set
--# CONFIG_SENSORS_GL520SM is not set
--# CONFIG_SENSORS_IT87 is not set
--# CONFIG_SENSORS_LM63 is not set
--# CONFIG_SENSORS_LM75 is not set
--# CONFIG_SENSORS_LM77 is not set
--# CONFIG_SENSORS_LM78 is not set
--# CONFIG_SENSORS_LM80 is not set
--# CONFIG_SENSORS_LM83 is not set
--# CONFIG_SENSORS_LM85 is not set
--# 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_ADS7828 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
--# CONFIG_SENSORS_W83792D is not set
--# CONFIG_SENSORS_W83793 is not set
--# CONFIG_SENSORS_W83L785TS is not set
--# CONFIG_SENSORS_W83L786NG is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--# CONFIG_HWMON_DEBUG_CHIP is not set
--# CONFIG_THERMAL is not set
--CONFIG_WATCHDOG=y
--# CONFIG_WATCHDOG_NOWAYOUT is not set
--
--#
--# Watchdog Device Drivers
--#
--# CONFIG_SOFT_WATCHDOG is not set
--CONFIG_83xx_WDT=y
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=m
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--# CONFIG_USB_ARCH_HAS_OHCI is not set
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--CONFIG_EXT3_FS=y
--CONFIG_EXT3_FS_XATTR=y
--# CONFIG_EXT3_FS_POSIX_ACL is not set
--# CONFIG_EXT3_FS_SECURITY is not set
--# CONFIG_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# CONFIG_AUTOFS_FS is not set
--# CONFIG_AUTOFS4_FS is not set
--# CONFIG_FUSE_FS is not set
--
--#
--# CD-ROM/DVD Filesystems
--#
--# CONFIG_ISO9660_FS is not set
--# CONFIG_UDF_FS is not set
--
--#
--# DOS/FAT/NT Filesystems
--#
--# CONFIG_MSDOS_FS is not set
--# CONFIG_VFAT_FS is not set
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
--
--#
--# Miscellaneous filesystems
--#
--# CONFIG_ADFS_FS is not set
--# CONFIG_AFFS_FS is not set
--# CONFIG_HFS_FS is not set
--# CONFIG_HFSPLUS_FS is not set
--# CONFIG_BEFS_FS is not set
--# CONFIG_BFS_FS is not set
--# CONFIG_EFS_FS is not set
--# CONFIG_CRAMFS is not set
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--CONFIG_NFS_V4=y
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--CONFIG_SUNRPC_GSS=y
--# CONFIG_SUNRPC_BIND34 is not set
--CONFIG_RPCSEC_GSS_KRB5=y
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--# CONFIG_MAC_PARTITION is not set
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_BSD_DISKLABEL is not set
--# CONFIG_MINIX_SUBPARTITION is not set
--# CONFIG_SOLARIS_X86_PARTITION is not set
--# CONFIG_UNIXWARE_DISKLABEL is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# 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_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--# CONFIG_DEBUG_KERNEL is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--CONFIG_CRYPTO_MD5=y
--# CONFIG_CRYPTO_SHA1 is not set
--# CONFIG_CRYPTO_SHA256 is not set
--# CONFIG_CRYPTO_SHA512 is not set
--# CONFIG_CRYPTO_WP512 is not set
--# CONFIG_CRYPTO_TGR192 is not set
--# CONFIG_CRYPTO_GF128MUL is not set
--CONFIG_CRYPTO_ECB=m
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# CONFIG_CRYPTO_BLOWFISH is not set
--# CONFIG_CRYPTO_TWOFISH is not set
--# CONFIG_CRYPTO_SERPENT is not set
--# CONFIG_CRYPTO_AES is not set
--# CONFIG_CRYPTO_CAST5 is not set
--# CONFIG_CRYPTO_CAST6 is not set
--# CONFIG_CRYPTO_TEA is not set
--# CONFIG_CRYPTO_ARC4 is not set
--# CONFIG_CRYPTO_KHAZAD is not set
--# CONFIG_CRYPTO_ANUBIS is not set
--# CONFIG_CRYPTO_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/mpc837x_rdb_defconfig
-+++ /dev/null
-@@ -1,930 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:24 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--CONFIG_6xx=y
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_PPC_FPU=y
--# CONFIG_FSL_EMB_PERFMON is not set
--CONFIG_PPC_STD_MMU=y
--CONFIG_PPC_STD_MMU_32=y
--# CONFIG_PPC_MM_SLICES is not set
--# CONFIG_SMP is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--CONFIG_FAIR_GROUP_SCHED=y
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--CONFIG_KALLSYMS=y
--# CONFIG_KALLSYMS_EXTRA_PASS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--# CONFIG_EPOLL is not set
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLAB=y
--# CONFIG_SLUB is not set
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--# CONFIG_KPROBES is not set
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--# CONFIG_KMOD is not set
--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
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--CONFIG_DEFAULT_AS=y
--# CONFIG_DEFAULT_DEADLINE is not set
--# CONFIG_DEFAULT_CFQ is not set
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="anticipatory"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MULTIPLATFORM is not set
--# CONFIG_PPC_82xx is not set
--CONFIG_PPC_83xx=y
--# CONFIG_PPC_86xx is not set
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC83xx=y
--# CONFIG_MPC831x_RDB is not set
--# CONFIG_MPC832x_MDS is not set
--# CONFIG_MPC832x_RDB is not set
--# CONFIG_MPC834x_MDS is not set
--# CONFIG_MPC834x_ITX is not set
--# CONFIG_MPC836x_MDS is not set
--# CONFIG_MPC837x_MDS is not set
--CONFIG_MPC837x_RDB=y
--# CONFIG_SBC834x is not set
--CONFIG_PPC_MPC837x=y
--CONFIG_IPIC=y
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_GENERIC_ISA_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--# CONFIG_PCI is not set
--# CONFIG_PCI_DOMAINS is not set
--# CONFIG_PCI_SYSCALL is not set
--# CONFIG_ARCH_SUPPORTS_MSI is not set
--# CONFIG_PCCARD is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# CONFIG_IP_ADVANCED_ROUTER is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_PNP=y
--CONFIG_IP_PNP_DHCP=y
--CONFIG_IP_PNP_BOOTP=y
--# CONFIG_IP_PNP_RARP is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# CONFIG_INET_AH is not set
--# CONFIG_INET_ESP is not set
--# CONFIG_INET_IPCOMP is not set
--# CONFIG_INET_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
--# CONFIG_INET_XFRM_MODE_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_BEET is not set
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--# CONFIG_BRIDGE is not set
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--# CONFIG_LLC2 is not set
--# CONFIG_IPX is not set
--# CONFIG_ATALK is not set
--# CONFIG_X25 is not set
--# CONFIG_LAPB is not set
--# CONFIG_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--CONFIG_SCSI=y
--CONFIG_SCSI_DMA=y
--# CONFIG_SCSI_TGT is not set
--# CONFIG_SCSI_NETLINK is not set
--CONFIG_SCSI_PROC_FS=y
--
--#
--# SCSI support type (disk, tape, CD-ROM)
--#
--CONFIG_BLK_DEV_SD=y
--# CONFIG_CHR_DEV_ST is not set
--# CONFIG_CHR_DEV_OSST is not set
--# CONFIG_BLK_DEV_SR is not set
--CONFIG_CHR_DEV_SG=y
--# CONFIG_CHR_DEV_SCH is not set
--
--#
--# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
--#
--# CONFIG_SCSI_MULTI_LUN is not set
--# CONFIG_SCSI_CONSTANTS is not set
--# CONFIG_SCSI_LOGGING is not set
--# CONFIG_SCSI_SCAN_ASYNC is not set
--CONFIG_SCSI_WAIT_SCAN=m
--
--#
--# SCSI Transports
--#
--# CONFIG_SCSI_SPI_ATTRS is not set
--# CONFIG_SCSI_FC_ATTRS is not set
--# CONFIG_SCSI_ISCSI_ATTRS is not set
--# CONFIG_SCSI_SAS_LIBSAS is not set
--# CONFIG_SCSI_SRP_ATTRS is not set
--CONFIG_SCSI_LOWLEVEL=y
--# CONFIG_ISCSI_TCP is not set
--# CONFIG_SCSI_DEBUG is not set
--CONFIG_ATA=y
--# CONFIG_ATA_NONSTANDARD is not set
--# CONFIG_SATA_MV is not set
--CONFIG_SATA_FSL=y
--# CONFIG_PATA_PLATFORM is not set
--CONFIG_MD=y
--CONFIG_BLK_DEV_MD=y
--# CONFIG_MD_LINEAR is not set
--# CONFIG_MD_RAID0 is not set
--CONFIG_MD_RAID1=y
--# CONFIG_MD_RAID10 is not set
--CONFIG_MD_RAID456=y
--CONFIG_MD_RAID5_RESHAPE=y
--# CONFIG_MD_MULTIPATH is not set
--# CONFIG_MD_FAULTY is not set
--# CONFIG_BLK_DEV_DM is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--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 is not set
--# CONFIG_VETH is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--CONFIG_MARVELL_PHY=y
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_E1000E_ENABLED is not set
--CONFIG_GIANFAR=y
--CONFIG_GFAR_NAPI=y
--# CONFIG_NETDEV_10000 is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--CONFIG_GEN_RTC=y
--# CONFIG_GEN_RTC_X is not set
--# CONFIG_R3964 is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=y
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--CONFIG_I2C_MPC=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
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 is not set
--# CONFIG_I2C_DEBUG_CORE is not set
--# CONFIG_I2C_DEBUG_ALGO is not set
--# CONFIG_I2C_DEBUG_BUS is not set
--# CONFIG_I2C_DEBUG_CHIP is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_AD7418 is not set
--# CONFIG_SENSORS_ADM1021 is not set
--# CONFIG_SENSORS_ADM1025 is not set
--# CONFIG_SENSORS_ADM1026 is not set
--# CONFIG_SENSORS_ADM1029 is not set
--# CONFIG_SENSORS_ADM1031 is not set
--# CONFIG_SENSORS_ADM9240 is not set
--# CONFIG_SENSORS_ADT7470 is not set
--# CONFIG_SENSORS_ADT7473 is not set
--# CONFIG_SENSORS_ATXP1 is not set
--# CONFIG_SENSORS_DS1621 is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_F75375S is not set
--# CONFIG_SENSORS_GL518SM is not set
--# CONFIG_SENSORS_GL520SM is not set
--# CONFIG_SENSORS_IT87 is not set
--# CONFIG_SENSORS_LM63 is not set
--# CONFIG_SENSORS_LM75 is not set
--# CONFIG_SENSORS_LM77 is not set
--# CONFIG_SENSORS_LM78 is not set
--# CONFIG_SENSORS_LM80 is not set
--# CONFIG_SENSORS_LM83 is not set
--# CONFIG_SENSORS_LM85 is not set
--# 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_ADS7828 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
--# CONFIG_SENSORS_W83792D is not set
--# CONFIG_SENSORS_W83793 is not set
--# CONFIG_SENSORS_W83L785TS is not set
--# CONFIG_SENSORS_W83L786NG is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--# CONFIG_HWMON_DEBUG_CHIP is not set
--# CONFIG_THERMAL is not set
--CONFIG_WATCHDOG=y
--# CONFIG_WATCHDOG_NOWAYOUT is not set
--
--#
--# Watchdog Device Drivers
--#
--# CONFIG_SOFT_WATCHDOG is not set
--CONFIG_83xx_WDT=y
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=m
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--# CONFIG_USB_ARCH_HAS_OHCI is not set
--CONFIG_USB_ARCH_HAS_EHCI=y
--CONFIG_USB=y
--# CONFIG_USB_DEBUG is not set
--# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
--
--#
--# Miscellaneous USB options
--#
--# CONFIG_USB_DEVICEFS is not set
--CONFIG_USB_DEVICE_CLASS=y
--# CONFIG_USB_DYNAMIC_MINORS is not set
--# CONFIG_USB_OTG is not set
--
--#
--# USB Host Controller Drivers
--#
--CONFIG_USB_EHCI_HCD=y
--CONFIG_USB_EHCI_ROOT_HUB_TT=y
--# CONFIG_USB_EHCI_TT_NEWSCHED is not set
--CONFIG_USB_EHCI_FSL=y
--CONFIG_USB_EHCI_HCD_PPC_OF=y
--# CONFIG_USB_ISP116X_HCD is not set
--# CONFIG_USB_SL811_HCD is not set
--# CONFIG_USB_R8A66597_HCD is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--CONFIG_EXT3_FS=y
--CONFIG_EXT3_FS_XATTR=y
--# CONFIG_EXT3_FS_POSIX_ACL is not set
--# CONFIG_EXT3_FS_SECURITY is not set
--# CONFIG_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# CONFIG_AUTOFS_FS is not set
--# CONFIG_AUTOFS4_FS is not set
--# CONFIG_FUSE_FS is not set
--
--#
--# CD-ROM/DVD Filesystems
--#
--# CONFIG_ISO9660_FS is not set
--# CONFIG_UDF_FS is not set
--
--#
--# DOS/FAT/NT Filesystems
--#
--# CONFIG_MSDOS_FS is not set
--# CONFIG_VFAT_FS is not set
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
--
--#
--# Miscellaneous filesystems
--#
--# CONFIG_ADFS_FS is not set
--# CONFIG_AFFS_FS is not set
--# CONFIG_HFS_FS is not set
--# CONFIG_HFSPLUS_FS is not set
--# CONFIG_BEFS_FS is not set
--# CONFIG_BFS_FS is not set
--# CONFIG_EFS_FS is not set
--# CONFIG_CRAMFS is not set
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--CONFIG_NFS_V4=y
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--CONFIG_SUNRPC_GSS=y
--# CONFIG_SUNRPC_BIND34 is not set
--CONFIG_RPCSEC_GSS_KRB5=y
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--# CONFIG_MAC_PARTITION is not set
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_BSD_DISKLABEL is not set
--# CONFIG_MINIX_SUBPARTITION is not set
--# CONFIG_SOLARIS_X86_PARTITION is not set
--# CONFIG_UNIXWARE_DISKLABEL is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# 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_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--# CONFIG_ENABLE_MUST_CHECK is not set
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--# CONFIG_DEBUG_KERNEL is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_XOR_BLOCKS=y
--CONFIG_ASYNC_CORE=y
--CONFIG_ASYNC_MEMCPY=y
--CONFIG_ASYNC_XOR=y
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--CONFIG_CRYPTO_MD5=y
--# CONFIG_CRYPTO_SHA1 is not set
--# CONFIG_CRYPTO_SHA256 is not set
--# CONFIG_CRYPTO_SHA512 is not set
--# CONFIG_CRYPTO_WP512 is not set
--# CONFIG_CRYPTO_TGR192 is not set
--# CONFIG_CRYPTO_GF128MUL is not set
--CONFIG_CRYPTO_ECB=m
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# CONFIG_CRYPTO_BLOWFISH is not set
--# CONFIG_CRYPTO_TWOFISH is not set
--# CONFIG_CRYPTO_SERPENT is not set
--# CONFIG_CRYPTO_AES is not set
--# CONFIG_CRYPTO_CAST5 is not set
--# CONFIG_CRYPTO_CAST6 is not set
--# CONFIG_CRYPTO_TEA is not set
--# CONFIG_CRYPTO_ARC4 is not set
--# CONFIG_CRYPTO_KHAZAD is not set
--# CONFIG_CRYPTO_ANUBIS is not set
--# CONFIG_CRYPTO_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/mpc83xx_defconfig
-+++ b/arch/powerpc/configs/mpc83xx_defconfig
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:25 2008
-+# Linux kernel version: 2.6.25-rc9
-+# Tue Apr 15 18:07:36 2008
- #
- # CONFIG_PPC64 is not set
- 
-@@ -201,6 +201,7 @@ CONFIG_PREEMPT_NONE=y
- # CONFIG_PREEMPT is not set
- CONFIG_BINFMT_ELF=y
- # CONFIG_BINFMT_MISC is not set
-+CONFIG_FORCE_MAX_ZONEORDER=11
- CONFIG_MATH_EMULATION=y
- # CONFIG_IOMMU_HELPER is not set
- CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-@@ -353,7 +354,90 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
- # CONFIG_FW_LOADER is not set
- # CONFIG_SYS_HYPERVISOR is not set
- # CONFIG_CONNECTOR is not set
--# CONFIG_MTD is not set
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+# CONFIG_MTD_CMDLINE_PARTS is not set
-+CONFIG_MTD_OF_PARTS=y
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+CONFIG_MTD_BLOCK=y
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+# CONFIG_MTD_CFI_INTELEXT is not set
-+CONFIG_MTD_CFI_AMDSTD=y
-+# CONFIG_MTD_CFI_STAA is not set
-+CONFIG_MTD_CFI_UTIL=y
-+# CONFIG_MTD_RAM is not set
-+# CONFIG_MTD_ROM is not set
-+# CONFIG_MTD_ABSENT is not set
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+CONFIG_MTD_PHYSMAP_OF=y
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+CONFIG_MTD_NAND=y
-+CONFIG_MTD_NAND_VERIFY_WRITE=y
-+# CONFIG_MTD_NAND_ECC_SMC is not set
-+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-+CONFIG_MTD_NAND_IDS=y
-+# CONFIG_MTD_NAND_DISKONCHIP is not set
-+# CONFIG_MTD_NAND_NANDSIM is not set
-+# CONFIG_MTD_NAND_PLATFORM is not set
-+# CONFIG_MTD_ALAUDA is not set
-+CONFIG_MTD_NAND_FSL_ELBC=y
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
- CONFIG_OF_DEVICE=y
- # CONFIG_PARPORT is not set
- CONFIG_BLK_DEV=y
-@@ -362,6 +446,7 @@ CONFIG_BLK_DEV=y
- CONFIG_BLK_DEV_LOOP=y
- # CONFIG_BLK_DEV_CRYPTOLOOP is not set
- # CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_UB is not set
- CONFIG_BLK_DEV_RAM=y
- CONFIG_BLK_DEV_RAM_COUNT=16
- CONFIG_BLK_DEV_RAM_SIZE=32768
-@@ -469,6 +554,15 @@ CONFIG_NETDEV_10000=y
- #
- # CONFIG_WLAN_PRE80211 is not set
- # CONFIG_WLAN_80211 is not set
-+
-+#
-+# USB Network Adapters
-+#
-+# CONFIG_USB_CATC is not set
-+# CONFIG_USB_KAWETH is not set
-+# CONFIG_USB_PEGASUS is not set
-+# CONFIG_USB_RTL8150 is not set
-+# CONFIG_USB_USBNET is not set
- # CONFIG_WAN is not set
- # CONFIG_PPP is not set
- # CONFIG_SLIP is not set
-@@ -563,6 +657,7 @@ CONFIG_I2C_MPC=y
- # 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
- 
- #
- # Miscellaneous I2C Chip support
-@@ -648,6 +743,11 @@ CONFIG_WATCHDOG=y
- CONFIG_83xx_WDT=y
- 
- #
-+# USB-based Watchdog Cards
-+#
-+# CONFIG_USBPCWATCHDOG is not set
-+
-+#
- # Sonics Silicon Backplane
- #
- CONFIG_SSB_POSSIBLE=y
-@@ -664,6 +764,7 @@ CONFIG_SSB_POSSIBLE=y
- # CONFIG_VIDEO_DEV is not set
- # CONFIG_DVB_CORE is not set
- CONFIG_DAB=y
-+# CONFIG_USB_DABUSB is not set
- 
- #
- # Graphics support
-@@ -686,6 +787,14 @@ CONFIG_HID_SUPPORT=y
- CONFIG_HID=y
- # CONFIG_HID_DEBUG is not set
- # CONFIG_HIDRAW is not set
-+
-+#
-+# USB Input Devices
-+#
-+CONFIG_USB_HID=y
-+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-+# CONFIG_HID_FF is not set
-+# CONFIG_USB_HIDDEV is not set
- CONFIG_USB_SUPPORT=y
- CONFIG_USB_ARCH_HAS_HCD=y
- # CONFIG_USB_ARCH_HAS_OHCI is not set
-@@ -715,8 +824,55 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
- # CONFIG_USB_R8A66597_HCD is not set
- 
- #
-+# USB Device Class drivers
-+#
-+# CONFIG_USB_ACM is not set
-+# CONFIG_USB_PRINTER is not set
-+
-+#
- # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
- #
-+
-+#
-+# may also be needed; see USB_STORAGE Help for more information
-+#
-+# CONFIG_USB_STORAGE is not set
-+# CONFIG_USB_LIBUSUAL is not set
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
-+CONFIG_USB_MON=y
-+
-+#
-+# USB port drivers
-+#
-+# CONFIG_USB_SERIAL is not set
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+# CONFIG_USB_EMI62 is not set
-+# CONFIG_USB_EMI26 is not set
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_AUERSWALD is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+# CONFIG_USB_BERRY_CHARGE is not set
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_PHIDGET is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+# CONFIG_USB_SISUSBVGA is not set
-+# CONFIG_USB_LD is not set
-+# CONFIG_USB_TRANCEVIBRATOR is not set
-+# CONFIG_USB_IOWARRIOR is not set
- # CONFIG_USB_GADGET is not set
- # CONFIG_MMC is not set
- # CONFIG_MEMSTICK is not set
-@@ -792,6 +948,7 @@ CONFIG_TMPFS=y
- # CONFIG_BEFS_FS is not set
- # CONFIG_BFS_FS is not set
- # CONFIG_EFS_FS is not set
-+# CONFIG_JFFS2_FS is not set
- # CONFIG_CRAMFS is not set
- # CONFIG_VXFS_FS is not set
- # CONFIG_MINIX_FS is not set
-@@ -862,6 +1019,7 @@ CONFIG_PLIST=y
- CONFIG_HAS_IOMEM=y
- CONFIG_HAS_IOPORT=y
- CONFIG_HAS_DMA=y
-+CONFIG_HAVE_LMB=y
- 
- #
- # Kernel hacking
---- a/arch/powerpc/configs/mpc8540_ads_defconfig
-+++ /dev/null
-@@ -1,796 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:25 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--CONFIG_PPC_85xx=y
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_E500=y
--CONFIG_BOOKE=y
--CONFIG_FSL_BOOKE=y
--CONFIG_FSL_EMB_PERFMON=y
--# CONFIG_PHYS_64BIT is not set
--CONFIG_SPE=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--# CONFIG_FAIR_GROUP_SCHED is not set
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--CONFIG_KALLSYMS=y
--# CONFIG_KALLSYMS_ALL is not set
--# CONFIG_KALLSYMS_EXTRA_PASS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=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 is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--# CONFIG_MODULES is not set
--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
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--CONFIG_DEFAULT_AS=y
--# CONFIG_DEFAULT_DEADLINE is not set
--# CONFIG_DEFAULT_CFQ is not set
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="anticipatory"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC85xx=y
--CONFIG_MPC8540_ADS=y
--# CONFIG_MPC8560_ADS is not set
--# CONFIG_MPC85xx_CDS is not set
--# CONFIG_MPC85xx_MDS is not set
--# CONFIG_MPC85xx_DS is not set
--# CONFIG_STX_GP3 is not set
--# CONFIG_TQM8540 is not set
--# CONFIG_TQM8541 is not set
--# CONFIG_TQM8555 is not set
--# CONFIG_TQM8560 is not set
--# CONFIG_SBC8548 is not set
--# CONFIG_SBC8560 is not set
--# CONFIG_IPIC is not set
--CONFIG_MPIC=y
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_CPM2 is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--CONFIG_TICK_ONESHOT=y
--CONFIG_NO_HZ=y
--CONFIG_HIGH_RES_TIMERS=y
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--CONFIG_BINFMT_MISC=y
--CONFIG_MATH_EMULATION=y
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--# CONFIG_SECCOMP is not set
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_FSL_SOC=y
--# CONFIG_PCI is not set
--# CONFIG_PCI_DOMAINS is not set
--# CONFIG_PCI_SYSCALL is not set
--# CONFIG_ARCH_SUPPORTS_MSI is not set
--# CONFIG_PCCARD is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--CONFIG_XFRM_USER=y
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# CONFIG_IP_ADVANCED_ROUTER is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_PNP=y
--CONFIG_IP_PNP_DHCP=y
--CONFIG_IP_PNP_BOOTP=y
--# CONFIG_IP_PNP_RARP is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# CONFIG_INET_AH is not set
--# CONFIG_INET_ESP is not set
--# CONFIG_INET_IPCOMP is not set
--# CONFIG_INET_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--CONFIG_INET_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--# CONFIG_BRIDGE is not set
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--# CONFIG_LLC2 is not set
--# CONFIG_IPX is not set
--# CONFIG_ATALK is not set
--# CONFIG_X25 is not set
--# CONFIG_LAPB is not set
--# CONFIG_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--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 is not set
--# CONFIG_VETH is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--# CONFIG_MARVELL_PHY is not set
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_E1000E_ENABLED is not set
--CONFIG_GIANFAR=y
--CONFIG_GFAR_NAPI=y
--CONFIG_NETDEV_10000=y
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--CONFIG_SERIAL_8250_SHARE_IRQ=y
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--CONFIG_GEN_RTC=y
--# CONFIG_GEN_RTC_X is not set
--# CONFIG_R3964 is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--# CONFIG_I2C is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_IT87 is not set
--# CONFIG_SENSORS_PC87360 is not set
--# CONFIG_SENSORS_PC87427 is not set
--# CONFIG_SENSORS_SMSC47M1 is not set
--# CONFIG_SENSORS_SMSC47B397 is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--# CONFIG_HWMON_DEBUG_CHIP is not set
--# CONFIG_THERMAL is not set
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=y
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--CONFIG_USB_SUPPORT=y
--# CONFIG_USB_ARCH_HAS_HCD is not set
--# CONFIG_USB_ARCH_HAS_OHCI is not set
--# CONFIG_USB_ARCH_HAS_EHCI is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--CONFIG_EXT3_FS=y
--CONFIG_EXT3_FS_XATTR=y
--# CONFIG_EXT3_FS_POSIX_ACL is not set
--# CONFIG_EXT3_FS_SECURITY is not set
--# CONFIG_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# CONFIG_AUTOFS_FS is not set
--# CONFIG_AUTOFS4_FS is not set
--# CONFIG_FUSE_FS is not set
--
--#
--# CD-ROM/DVD Filesystems
--#
--# CONFIG_ISO9660_FS is not set
--# CONFIG_UDF_FS is not set
--
--#
--# DOS/FAT/NT Filesystems
--#
--# CONFIG_MSDOS_FS is not set
--# CONFIG_VFAT_FS is not set
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
--
--#
--# Miscellaneous filesystems
--#
--# CONFIG_ADFS_FS is not set
--# CONFIG_AFFS_FS is not set
--# CONFIG_HFS_FS is not set
--# CONFIG_HFSPLUS_FS is not set
--# CONFIG_BEFS_FS is not set
--# CONFIG_BFS_FS is not set
--# CONFIG_EFS_FS is not set
--# CONFIG_CRAMFS is not set
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--# CONFIG_NFS_V3 is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--# CONFIG_MAC_PARTITION is not set
--# CONFIG_MSDOS_PARTITION is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# 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_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--CONFIG_DEBUG_MUTEXES=y
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_DEBUG_INFO is not set
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--# CONFIG_DEBUGGER is not set
--# CONFIG_BDI_SWITCH is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--# CONFIG_CRYPTO_SEQIV is not set
--# CONFIG_CRYPTO_MANAGER is not set
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--# CONFIG_CRYPTO_MD5 is not set
--# CONFIG_CRYPTO_SHA1 is not set
--# CONFIG_CRYPTO_SHA256 is not set
--# CONFIG_CRYPTO_SHA512 is not set
--# CONFIG_CRYPTO_WP512 is not set
--# CONFIG_CRYPTO_TGR192 is not set
--# CONFIG_CRYPTO_GF128MUL is not set
--# CONFIG_CRYPTO_ECB is not set
--# CONFIG_CRYPTO_CBC is not set
--# CONFIG_CRYPTO_PCBC is not set
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--# CONFIG_CRYPTO_DES is not set
--# CONFIG_CRYPTO_FCRYPT is not set
--# CONFIG_CRYPTO_BLOWFISH is not set
--# CONFIG_CRYPTO_TWOFISH is not set
--# CONFIG_CRYPTO_SERPENT is not set
--# CONFIG_CRYPTO_AES is not set
--# CONFIG_CRYPTO_CAST5 is not set
--# CONFIG_CRYPTO_CAST6 is not set
--# CONFIG_CRYPTO_TEA is not set
--# CONFIG_CRYPTO_ARC4 is not set
--# CONFIG_CRYPTO_KHAZAD is not set
--# CONFIG_CRYPTO_ANUBIS is not set
--# CONFIG_CRYPTO_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/mpc8544_ds_defconfig
-+++ /dev/null
-@@ -1,1549 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc7
--# Mon Mar 31 11:37:03 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--CONFIG_PPC_85xx=y
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_E500=y
--CONFIG_BOOKE=y
--CONFIG_FSL_BOOKE=y
--CONFIG_FSL_EMB_PERFMON=y
--# CONFIG_PHYS_64BIT is not set
--CONFIG_SPE=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--CONFIG_POSIX_MQUEUE=y
--CONFIG_BSD_PROCESS_ACCT=y
--# CONFIG_BSD_PROCESS_ACCT_V3 is not set
--# CONFIG_TASKSTATS is not set
--CONFIG_AUDIT=y
--# CONFIG_AUDITSYSCALL is not set
--CONFIG_IKCONFIG=y
--CONFIG_IKCONFIG_PROC=y
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--# CONFIG_FAIR_GROUP_SCHED is not set
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--CONFIG_KALLSYMS=y
--CONFIG_KALLSYMS_ALL=y
--CONFIG_KALLSYMS_EXTRA_PASS=y
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=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 is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--# CONFIG_KPROBES is not set
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--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
--CONFIG_BLOCK=y
--CONFIG_LBD=y
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--# CONFIG_DEFAULT_AS is not set
--# CONFIG_DEFAULT_DEADLINE is not set
--CONFIG_DEFAULT_CFQ=y
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="cfq"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC85xx=y
--# CONFIG_MPC8540_ADS is not set
--# CONFIG_MPC8560_ADS is not set
--# CONFIG_MPC85xx_CDS is not set
--# CONFIG_MPC85xx_MDS is not set
--CONFIG_MPC85xx_DS=y
--# CONFIG_STX_GP3 is not set
--# CONFIG_TQM8540 is not set
--# CONFIG_TQM8541 is not set
--# CONFIG_TQM8555 is not set
--# CONFIG_TQM8560 is not set
--# CONFIG_SBC8548 is not set
--# CONFIG_SBC8560 is not set
--# CONFIG_IPIC is not set
--CONFIG_MPIC=y
--# CONFIG_MPIC_WEIRD is not set
--CONFIG_PPC_I8259=y
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_CPM2 is not set
--CONFIG_FSL_ULI1575=y
--
--#
--# Kernel options
--#
--CONFIG_HIGHMEM=y
--CONFIG_TICK_ONESHOT=y
--CONFIG_NO_HZ=y
--CONFIG_HIGH_RES_TIMERS=y
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--CONFIG_BINFMT_MISC=m
--CONFIG_MATH_EMULATION=y
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_GENERIC_ISA_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_FSL_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCI_DEBUG is not set
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--CONFIG_XFRM_USER=y
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--CONFIG_NET_KEY=m
--# CONFIG_NET_KEY_MIGRATE is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--CONFIG_IP_ADVANCED_ROUTER=y
--CONFIG_ASK_IP_FIB_HASH=y
--# CONFIG_IP_FIB_TRIE is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_MULTIPLE_TABLES=y
--CONFIG_IP_ROUTE_MULTIPATH=y
--CONFIG_IP_ROUTE_VERBOSE=y
--CONFIG_IP_PNP=y
--CONFIG_IP_PNP_DHCP=y
--CONFIG_IP_PNP_BOOTP=y
--CONFIG_IP_PNP_RARP=y
--CONFIG_NET_IPIP=y
--CONFIG_NET_IPGRE=y
--CONFIG_NET_IPGRE_BROADCAST=y
--CONFIG_IP_MROUTE=y
--CONFIG_IP_PIMSM_V1=y
--CONFIG_IP_PIMSM_V2=y
--CONFIG_ARPD=y
--# CONFIG_SYN_COOKIES is not set
--# CONFIG_INET_AH is not set
--# CONFIG_INET_ESP is not set
--# CONFIG_INET_IPCOMP is not set
--# CONFIG_INET_XFRM_TUNNEL is not set
--CONFIG_INET_TUNNEL=y
--# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
--# CONFIG_INET_XFRM_MODE_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_BEET is not set
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--CONFIG_IPV6=y
--# CONFIG_IPV6_PRIVACY is not set
--# CONFIG_IPV6_ROUTER_PREF is not set
--# CONFIG_IPV6_OPTIMISTIC_DAD is not set
--# CONFIG_INET6_AH is not set
--# CONFIG_INET6_ESP is not set
--# CONFIG_INET6_IPCOMP is not set
--# CONFIG_IPV6_MIP6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--CONFIG_INET6_XFRM_MODE_TRANSPORT=y
--CONFIG_INET6_XFRM_MODE_TUNNEL=y
--CONFIG_INET6_XFRM_MODE_BEET=y
--# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
--CONFIG_IPV6_SIT=y
--# CONFIG_IPV6_TUNNEL is not set
--# CONFIG_IPV6_MULTIPLE_TABLES is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--CONFIG_IP_SCTP=m
--# CONFIG_SCTP_DBG_MSG is not set
--# CONFIG_SCTP_DBG_OBJCNT is not set
--# CONFIG_SCTP_HMAC_NONE is not set
--# CONFIG_SCTP_HMAC_SHA1 is not set
--CONFIG_SCTP_HMAC_MD5=y
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--# CONFIG_BRIDGE is not set
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--# CONFIG_LLC2 is not set
--# CONFIG_IPX is not set
--# CONFIG_ATALK is not set
--# CONFIG_X25 is not set
--# CONFIG_LAPB is not set
--# CONFIG_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--CONFIG_FIB_RULES=y
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--CONFIG_FW_LOADER=y
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--CONFIG_BLK_DEV_NBD=y
--# CONFIG_BLK_DEV_SX8 is not set
--# CONFIG_BLK_DEV_UB is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=131072
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--CONFIG_SCSI=y
--CONFIG_SCSI_DMA=y
--# CONFIG_SCSI_TGT is not set
--# CONFIG_SCSI_NETLINK is not set
--CONFIG_SCSI_PROC_FS=y
--
--#
--# SCSI support type (disk, tape, CD-ROM)
--#
--CONFIG_BLK_DEV_SD=y
--CONFIG_CHR_DEV_ST=y
--# CONFIG_CHR_DEV_OSST is not set
--CONFIG_BLK_DEV_SR=y
--# CONFIG_BLK_DEV_SR_VENDOR is not set
--CONFIG_CHR_DEV_SG=y
--# CONFIG_CHR_DEV_SCH is not set
--
--#
--# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
--#
--CONFIG_SCSI_MULTI_LUN=y
--# CONFIG_SCSI_CONSTANTS is not set
--CONFIG_SCSI_LOGGING=y
--# CONFIG_SCSI_SCAN_ASYNC is not set
--CONFIG_SCSI_WAIT_SCAN=m
--
--#
--# SCSI Transports
--#
--# CONFIG_SCSI_SPI_ATTRS is not set
--# CONFIG_SCSI_FC_ATTRS is not set
--# CONFIG_SCSI_ISCSI_ATTRS is not set
--# CONFIG_SCSI_SAS_LIBSAS is not set
--# CONFIG_SCSI_SRP_ATTRS is not set
--CONFIG_SCSI_LOWLEVEL=y
--# CONFIG_ISCSI_TCP is not set
--# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
--# CONFIG_SCSI_3W_9XXX is not set
--# CONFIG_SCSI_ACARD is not set
--# CONFIG_SCSI_AACRAID is not set
--# CONFIG_SCSI_AIC7XXX is not set
--# CONFIG_SCSI_AIC7XXX_OLD is not set
--# CONFIG_SCSI_AIC79XX is not set
--# CONFIG_SCSI_AIC94XX is not set
--# CONFIG_SCSI_DPT_I2O is not set
--# CONFIG_SCSI_ADVANSYS is not set
--# CONFIG_SCSI_ARCMSR is not set
--# CONFIG_MEGARAID_NEWGEN is not set
--# CONFIG_MEGARAID_LEGACY is not set
--# CONFIG_MEGARAID_SAS is not set
--# CONFIG_SCSI_HPTIOP is not set
--# CONFIG_SCSI_BUSLOGIC is not set
--# CONFIG_SCSI_DMX3191D is not set
--# CONFIG_SCSI_EATA is not set
--# CONFIG_SCSI_FUTURE_DOMAIN is not set
--# CONFIG_SCSI_GDTH is not set
--# CONFIG_SCSI_IPS is not set
--# CONFIG_SCSI_INITIO is not set
--# CONFIG_SCSI_INIA100 is not set
--# CONFIG_SCSI_MVSAS is not set
--# CONFIG_SCSI_STEX is not set
--# CONFIG_SCSI_SYM53C8XX_2 is not set
--# CONFIG_SCSI_IPR is not set
--# CONFIG_SCSI_QLOGIC_1280 is not set
--# CONFIG_SCSI_QLA_FC is not set
--# CONFIG_SCSI_QLA_ISCSI is not set
--# CONFIG_SCSI_LPFC is not set
--# CONFIG_SCSI_DC395x is not set
--# CONFIG_SCSI_DC390T is not set
--# CONFIG_SCSI_NSP32 is not set
--# CONFIG_SCSI_DEBUG is not set
--# CONFIG_SCSI_SRP is not set
--CONFIG_ATA=y
--# CONFIG_ATA_NONSTANDARD is not set
--CONFIG_SATA_AHCI=y
--# CONFIG_SATA_SVW is not set
--# CONFIG_ATA_PIIX is not set
--# CONFIG_SATA_MV is not set
--# CONFIG_SATA_NV is not set
--# CONFIG_PDC_ADMA is not set
--# CONFIG_SATA_QSTOR is not set
--# CONFIG_SATA_PROMISE is not set
--# CONFIG_SATA_SX4 is not set
--# CONFIG_SATA_SIL is not set
--# CONFIG_SATA_SIL24 is not set
--# CONFIG_SATA_SIS is not set
--# CONFIG_SATA_ULI is not set
--# CONFIG_SATA_VIA is not set
--# CONFIG_SATA_VITESSE is not set
--# CONFIG_SATA_INIC162X is not set
--# CONFIG_SATA_FSL is not set
--CONFIG_PATA_ALI=y
--# CONFIG_PATA_AMD is not set
--# CONFIG_PATA_ARTOP is not set
--# CONFIG_PATA_ATIIXP is not set
--# CONFIG_PATA_CMD640_PCI is not set
--# CONFIG_PATA_CMD64X is not set
--# CONFIG_PATA_CS5520 is not set
--# CONFIG_PATA_CS5530 is not set
--# CONFIG_PATA_CYPRESS is not set
--# CONFIG_PATA_EFAR is not set
--# CONFIG_ATA_GENERIC is not set
--# CONFIG_PATA_HPT366 is not set
--# CONFIG_PATA_HPT37X is not set
--# CONFIG_PATA_HPT3X2N is not set
--# CONFIG_PATA_HPT3X3 is not set
--# CONFIG_PATA_IT821X is not set
--# CONFIG_PATA_IT8213 is not set
--# CONFIG_PATA_JMICRON is not set
--# CONFIG_PATA_TRIFLEX is not set
--# CONFIG_PATA_MARVELL is not set
--# CONFIG_PATA_MPIIX is not set
--# CONFIG_PATA_OLDPIIX is not set
--# CONFIG_PATA_NETCELL is not set
--# CONFIG_PATA_NINJA32 is not set
--# CONFIG_PATA_NS87410 is not set
--# CONFIG_PATA_NS87415 is not set
--# CONFIG_PATA_OPTI is not set
--# CONFIG_PATA_OPTIDMA is not set
--# CONFIG_PATA_PDC_OLD is not set
--# CONFIG_PATA_RADISYS is not set
--# CONFIG_PATA_RZ1000 is not set
--# CONFIG_PATA_SC1200 is not set
--# CONFIG_PATA_SERVERWORKS is not set
--# CONFIG_PATA_PDC2027X is not set
--# CONFIG_PATA_SIL680 is not set
--# CONFIG_PATA_SIS is not set
--# CONFIG_PATA_VIA is not set
--# CONFIG_PATA_WINBOND is not set
--# CONFIG_PATA_PLATFORM is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--CONFIG_DUMMY=y
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--# CONFIG_MARVELL_PHY is not set
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--CONFIG_VITESSE_PHY=y
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--CONFIG_GIANFAR=y
--CONFIG_GFAR_NAPI=y
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--
--#
--# USB Network Adapters
--#
--# CONFIG_USB_CATC is not set
--# CONFIG_USB_KAWETH is not set
--# CONFIG_USB_PEGASUS is not set
--# CONFIG_USB_RTL8150 is not set
--# CONFIG_USB_USBNET is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NET_FC is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--CONFIG_SERIO=y
--CONFIG_SERIO_I8042=y
--CONFIG_SERIO_SERPORT=y
--# CONFIG_SERIO_PCIPS2 is not set
--CONFIG_SERIO_LIBPS2=y
--# CONFIG_SERIO_RAW is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--CONFIG_VT=y
--CONFIG_VT_CONSOLE=y
--CONFIG_HW_CONSOLE=y
--# CONFIG_VT_HW_CONSOLE_BINDING is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=y
--CONFIG_SERIAL_8250_NR_UARTS=2
--CONFIG_SERIAL_8250_RUNTIME_UARTS=2
--CONFIG_SERIAL_8250_EXTENDED=y
--CONFIG_SERIAL_8250_MANY_PORTS=y
--CONFIG_SERIAL_8250_SHARE_IRQ=y
--CONFIG_SERIAL_8250_DETECT_IRQ=y
--CONFIG_SERIAL_8250_RSA=y
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--CONFIG_NVRAM=y
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--# CONFIG_I2C_CHARDEV is not set
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_ALI1535 is not set
--# CONFIG_I2C_ALI1563 is not set
--# CONFIG_I2C_ALI15X3 is not set
--# CONFIG_I2C_AMD756 is not set
--# CONFIG_I2C_AMD8111 is not set
--# CONFIG_I2C_I801 is not set
--# CONFIG_I2C_I810 is not set
--# CONFIG_I2C_PIIX4 is not set
--CONFIG_I2C_MPC=y
--# CONFIG_I2C_NFORCE2 is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--# CONFIG_I2C_PROSAVAGE is not set
--# CONFIG_I2C_SAVAGE4 is not set
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_SIS5595 is not set
--# CONFIG_I2C_SIS630 is not set
--# CONFIG_I2C_SIS96X 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_VIA is not set
--# CONFIG_I2C_VIAPRO is not set
--# CONFIG_I2C_VOODOO3 is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--CONFIG_SENSORS_EEPROM=y
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 is not set
--# CONFIG_I2C_DEBUG_CORE is not set
--# CONFIG_I2C_DEBUG_ALGO is not set
--# CONFIG_I2C_DEBUG_BUS is not set
--# CONFIG_I2C_DEBUG_CHIP is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--# CONFIG_HWMON is not set
--# CONFIG_THERMAL is not set
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--CONFIG_DVB_CORE=m
--# CONFIG_DVB_CORE_ATTACH is not set
--CONFIG_DVB_CAPTURE_DRIVERS=y
--
--#
--# Supported SAA7146 based PCI Adapters
--#
--# CONFIG_TTPCI_EEPROM is not set
--# CONFIG_DVB_BUDGET_CORE is not set
--
--#
--# Supported USB Adapters
--#
--# CONFIG_DVB_USB is not set
--# CONFIG_DVB_TTUSB_BUDGET is not set
--# CONFIG_DVB_TTUSB_DEC is not set
--# CONFIG_DVB_CINERGYT2 is not set
--
--#
--# Supported FlexCopII (B2C2) Adapters
--#
--# CONFIG_DVB_B2C2_FLEXCOP is not set
--
--#
--# Supported BT878 Adapters
--#
--
--#
--# Supported Pluto2 Adapters
--#
--# CONFIG_DVB_PLUTO2 is not set
--
--#
--# Supported DVB Frontends
--#
--
--#
--# Customise DVB Frontends
--#
--# CONFIG_DVB_FE_CUSTOMISE is not set
--
--#
--# DVB-S (satellite) frontends
--#
--# CONFIG_DVB_STV0299 is not set
--# CONFIG_DVB_CX24110 is not set
--# CONFIG_DVB_CX24123 is not set
--# CONFIG_DVB_TDA8083 is not set
--# CONFIG_DVB_MT312 is not set
--# CONFIG_DVB_VES1X93 is not set
--# CONFIG_DVB_S5H1420 is not set
--# CONFIG_DVB_TDA10086 is not set
--
--#
--# DVB-T (terrestrial) frontends
--#
--# CONFIG_DVB_SP8870 is not set
--# CONFIG_DVB_SP887X is not set
--# CONFIG_DVB_CX22700 is not set
--# CONFIG_DVB_CX22702 is not set
--# CONFIG_DVB_L64781 is not set
--# CONFIG_DVB_TDA1004X is not set
--# CONFIG_DVB_NXT6000 is not set
--# CONFIG_DVB_MT352 is not set
--# CONFIG_DVB_ZL10353 is not set
--# CONFIG_DVB_DIB3000MB is not set
--# CONFIG_DVB_DIB3000MC is not set
--# CONFIG_DVB_DIB7000M is not set
--# CONFIG_DVB_DIB7000P is not set
--
--#
--# DVB-C (cable) frontends
--#
--# CONFIG_DVB_VES1820 is not set
--# CONFIG_DVB_TDA10021 is not set
--# CONFIG_DVB_TDA10023 is not set
--# CONFIG_DVB_STV0297 is not set
--
--#
--# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
--#
--# CONFIG_DVB_NXT200X is not set
--# CONFIG_DVB_OR51211 is not set
--# CONFIG_DVB_OR51132 is not set
--# CONFIG_DVB_BCM3510 is not set
--# CONFIG_DVB_LGDT330X is not set
--# CONFIG_DVB_S5H1409 is not set
--
--#
--# Tuners/PLL support
--#
--# CONFIG_DVB_PLL is not set
--# CONFIG_DVB_TDA826X is not set
--# CONFIG_DVB_TDA827X is not set
--# CONFIG_DVB_TDA18271 is not set
--# CONFIG_DVB_TUNER_QT1010 is not set
--# CONFIG_DVB_TUNER_MT2060 is not set
--# CONFIG_DVB_TUNER_MT2266 is not set
--# CONFIG_DVB_TUNER_MT2131 is not set
--# CONFIG_DVB_TUNER_DIB0070 is not set
--# CONFIG_DVB_TUNER_XC5000 is not set
--
--#
--# Miscellaneous devices
--#
--# CONFIG_DVB_LNBP21 is not set
--# CONFIG_DVB_ISL6421 is not set
--# CONFIG_DVB_TUA6100 is not set
--CONFIG_DAB=y
--# CONFIG_USB_DABUSB is not set
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=y
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Console display driver support
--#
--CONFIG_VGA_CONSOLE=y
--# CONFIG_VGACON_SOFT_SCROLLBACK is not set
--CONFIG_DUMMY_CONSOLE=y
--
--#
--# Sound
--#
--CONFIG_SOUND=y
--
--#
--# Advanced Linux Sound Architecture
--#
--CONFIG_SND=y
--CONFIG_SND_TIMER=y
--CONFIG_SND_PCM=y
--# CONFIG_SND_SEQUENCER is not set
--# CONFIG_SND_MIXER_OSS is not set
--# CONFIG_SND_PCM_OSS is not set
--# CONFIG_SND_DYNAMIC_MINORS is not set
--CONFIG_SND_SUPPORT_OLD_API=y
--CONFIG_SND_VERBOSE_PROCFS=y
--# CONFIG_SND_VERBOSE_PRINTK is not set
--# CONFIG_SND_DEBUG is not set
--
--#
--# Generic devices
--#
--CONFIG_SND_AC97_CODEC=y
--# CONFIG_SND_DUMMY is not set
--# CONFIG_SND_MTPAV is not set
--# CONFIG_SND_SERIAL_U16550 is not set
--# CONFIG_SND_MPU401 is not set
--
--#
--# PCI devices
--#
--# CONFIG_SND_AD1889 is not set
--# CONFIG_SND_ALS300 is not set
--# CONFIG_SND_ALS4000 is not set
--# CONFIG_SND_ALI5451 is not set
--# CONFIG_SND_ATIIXP is not set
--# CONFIG_SND_ATIIXP_MODEM is not set
--# CONFIG_SND_AU8810 is not set
--# CONFIG_SND_AU8820 is not set
--# CONFIG_SND_AU8830 is not set
--# CONFIG_SND_AZT3328 is not set
--# CONFIG_SND_BT87X is not set
--# CONFIG_SND_CA0106 is not set
--# CONFIG_SND_CMIPCI is not set
--# CONFIG_SND_OXYGEN is not set
--# CONFIG_SND_CS4281 is not set
--# CONFIG_SND_CS46XX is not set
--# CONFIG_SND_CS5530 is not set
--# CONFIG_SND_DARLA20 is not set
--# CONFIG_SND_GINA20 is not set
--# CONFIG_SND_LAYLA20 is not set
--# CONFIG_SND_DARLA24 is not set
--# CONFIG_SND_GINA24 is not set
--# CONFIG_SND_LAYLA24 is not set
--# CONFIG_SND_MONA is not set
--# CONFIG_SND_MIA is not set
--# CONFIG_SND_ECHO3G is not set
--# CONFIG_SND_INDIGO is not set
--# CONFIG_SND_INDIGOIO is not set
--# CONFIG_SND_INDIGODJ is not set
--# CONFIG_SND_EMU10K1 is not set
--# CONFIG_SND_EMU10K1X is not set
--# CONFIG_SND_ENS1370 is not set
--# CONFIG_SND_ENS1371 is not set
--# CONFIG_SND_ES1938 is not set
--# CONFIG_SND_ES1968 is not set
--# CONFIG_SND_FM801 is not set
--# CONFIG_SND_HDA_INTEL is not set
--# CONFIG_SND_HDSP is not set
--# CONFIG_SND_HDSPM is not set
--# CONFIG_SND_HIFIER is not set
--# CONFIG_SND_ICE1712 is not set
--# CONFIG_SND_ICE1724 is not set
--CONFIG_SND_INTEL8X0=y
--# CONFIG_SND_INTEL8X0M is not set
--# CONFIG_SND_KORG1212 is not set
--# CONFIG_SND_MAESTRO3 is not set
--# CONFIG_SND_MIXART is not set
--# CONFIG_SND_NM256 is not set
--# CONFIG_SND_PCXHR is not set
--# CONFIG_SND_RIPTIDE is not set
--# CONFIG_SND_RME32 is not set
--# CONFIG_SND_RME96 is not set
--# CONFIG_SND_RME9652 is not set
--# CONFIG_SND_SONICVIBES is not set
--# CONFIG_SND_TRIDENT is not set
--# CONFIG_SND_VIA82XX is not set
--# CONFIG_SND_VIA82XX_MODEM is not set
--# CONFIG_SND_VIRTUOSO is not set
--# CONFIG_SND_VX222 is not set
--# CONFIG_SND_YMFPCI is not set
--# CONFIG_SND_AC97_POWER_SAVE is not set
--
--#
--# ALSA PowerMac devices
--#
--
--#
--# ALSA PowerPC devices
--#
--
--#
--# USB devices
--#
--# CONFIG_SND_USB_AUDIO is not set
--# CONFIG_SND_USB_USX2Y is not set
--# CONFIG_SND_USB_CAIAQ is not set
--
--#
--# System on Chip audio support
--#
--# CONFIG_SND_SOC is not set
--
--#
--# SoC Audio support for SuperH
--#
--
--#
--# ALSA SoC audio for Freescale SOCs
--#
--
--#
--# Open Sound System
--#
--# CONFIG_SOUND_PRIME is not set
--CONFIG_AC97_BUS=y
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--
--#
--# USB Input Devices
--#
--CONFIG_USB_HID=y
--# CONFIG_USB_HIDINPUT_POWERBOOK is not set
--# CONFIG_HID_FF is not set
--# CONFIG_USB_HIDDEV is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--CONFIG_USB=y
--# CONFIG_USB_DEBUG is not set
--# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
--
--#
--# Miscellaneous USB options
--#
--CONFIG_USB_DEVICEFS=y
--CONFIG_USB_DEVICE_CLASS=y
--# CONFIG_USB_DYNAMIC_MINORS is not set
--# CONFIG_USB_OTG is not set
--
--#
--# USB Host Controller Drivers
--#
--CONFIG_USB_EHCI_HCD=y
--# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
--# CONFIG_USB_EHCI_TT_NEWSCHED is not set
--# CONFIG_USB_EHCI_FSL is not set
--CONFIG_USB_EHCI_HCD_PPC_OF=y
--# CONFIG_USB_ISP116X_HCD is not set
--CONFIG_USB_OHCI_HCD=y
--CONFIG_USB_OHCI_HCD_PPC_OF=y
--CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
--CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
--CONFIG_USB_OHCI_HCD_PCI=y
--CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
--CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
--CONFIG_USB_OHCI_LITTLE_ENDIAN=y
--# CONFIG_USB_UHCI_HCD is not set
--# CONFIG_USB_SL811_HCD is not set
--# CONFIG_USB_R8A66597_HCD is not set
--
--#
--# USB Device Class drivers
--#
--# CONFIG_USB_ACM is not set
--# CONFIG_USB_PRINTER is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--
--#
--# may also be needed; see USB_STORAGE Help for more information
--#
--CONFIG_USB_STORAGE=y
--# CONFIG_USB_STORAGE_DEBUG is not set
--# CONFIG_USB_STORAGE_DATAFAB is not set
--# CONFIG_USB_STORAGE_FREECOM is not set
--# CONFIG_USB_STORAGE_ISD200 is not set
--# CONFIG_USB_STORAGE_DPCM is not set
--# CONFIG_USB_STORAGE_USBAT is not set
--# CONFIG_USB_STORAGE_SDDR09 is not set
--# CONFIG_USB_STORAGE_SDDR55 is not set
--# CONFIG_USB_STORAGE_JUMPSHOT is not set
--# CONFIG_USB_STORAGE_ALAUDA is not set
--# CONFIG_USB_STORAGE_KARMA is not set
--# CONFIG_USB_LIBUSUAL is not set
--
--#
--# USB Imaging devices
--#
--# CONFIG_USB_MDC800 is not set
--# CONFIG_USB_MICROTEK is not set
--CONFIG_USB_MON=y
--
--#
--# USB port drivers
--#
--# CONFIG_USB_SERIAL is not set
--
--#
--# USB Miscellaneous drivers
--#
--# CONFIG_USB_EMI62 is not set
--# CONFIG_USB_EMI26 is not set
--# CONFIG_USB_ADUTUX is not set
--# CONFIG_USB_AUERSWALD is not set
--# CONFIG_USB_RIO500 is not set
--# CONFIG_USB_LEGOTOWER is not set
--# CONFIG_USB_LCD is not set
--# CONFIG_USB_BERRY_CHARGE is not set
--# CONFIG_USB_LED is not set
--# CONFIG_USB_CYPRESS_CY7C63 is not set
--# CONFIG_USB_CYTHERM is not set
--# CONFIG_USB_PHIDGET is not set
--# CONFIG_USB_IDMOUSE is not set
--# CONFIG_USB_FTDI_ELAN is not set
--# CONFIG_USB_APPLEDISPLAY is not set
--# CONFIG_USB_SISUSBVGA is not set
--# CONFIG_USB_LD is not set
--# CONFIG_USB_TRANCEVIBRATOR is not set
--# CONFIG_USB_IOWARRIOR is not set
--# CONFIG_USB_TEST is not set
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--CONFIG_RTC_LIB=y
--CONFIG_RTC_CLASS=y
--CONFIG_RTC_HCTOSYS=y
--CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
--# CONFIG_RTC_DEBUG is not set
--
--#
--# RTC interfaces
--#
--CONFIG_RTC_INTF_SYSFS=y
--CONFIG_RTC_INTF_PROC=y
--CONFIG_RTC_INTF_DEV=y
--# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
--# CONFIG_RTC_DRV_TEST is not set
--
--#
--# I2C RTC drivers
--#
--# CONFIG_RTC_DRV_DS1307 is not set
--# CONFIG_RTC_DRV_DS1374 is not set
--# CONFIG_RTC_DRV_DS1672 is not set
--# CONFIG_RTC_DRV_MAX6900 is not set
--# CONFIG_RTC_DRV_RS5C372 is not set
--# CONFIG_RTC_DRV_ISL1208 is not set
--# CONFIG_RTC_DRV_X1205 is not set
--# CONFIG_RTC_DRV_PCF8563 is not set
--# CONFIG_RTC_DRV_PCF8583 is not set
--# CONFIG_RTC_DRV_M41T80 is not set
--# CONFIG_RTC_DRV_S35390A is not set
--
--#
--# SPI RTC drivers
--#
--
--#
--# Platform RTC drivers
--#
--CONFIG_RTC_DRV_CMOS=y
--# CONFIG_RTC_DRV_DS1511 is not set
--# CONFIG_RTC_DRV_DS1553 is not set
--# CONFIG_RTC_DRV_DS1742 is not set
--# CONFIG_RTC_DRV_STK17TA8 is not set
--# CONFIG_RTC_DRV_M48T86 is not set
--# CONFIG_RTC_DRV_M48T59 is not set
--# CONFIG_RTC_DRV_V3020 is not set
--
--#
--# on-CPU RTC drivers
--#
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--CONFIG_EXT3_FS=y
--CONFIG_EXT3_FS_XATTR=y
--# CONFIG_EXT3_FS_POSIX_ACL is not set
--# CONFIG_EXT3_FS_SECURITY is not set
--# CONFIG_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# CONFIG_AUTOFS_FS is not set
--# CONFIG_AUTOFS4_FS is not set
--# CONFIG_FUSE_FS is not set
--
--#
--# CD-ROM/DVD Filesystems
--#
--CONFIG_ISO9660_FS=m
--CONFIG_JOLIET=y
--CONFIG_ZISOFS=y
--CONFIG_UDF_FS=m
--CONFIG_UDF_NLS=y
--
--#
--# DOS/FAT/NT Filesystems
--#
--CONFIG_FAT_FS=y
--CONFIG_MSDOS_FS=m
--CONFIG_VFAT_FS=y
--CONFIG_FAT_DEFAULT_CODEPAGE=437
--CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
--CONFIG_NTFS_FS=y
--# CONFIG_NTFS_DEBUG is not set
--# CONFIG_NTFS_RW is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
--
--#
--# Miscellaneous filesystems
--#
--CONFIG_ADFS_FS=m
--# CONFIG_ADFS_FS_RW is not set
--CONFIG_AFFS_FS=m
--CONFIG_HFS_FS=m
--CONFIG_HFSPLUS_FS=m
--CONFIG_BEFS_FS=m
--# CONFIG_BEFS_DEBUG is not set
--CONFIG_BFS_FS=m
--CONFIG_EFS_FS=m
--CONFIG_CRAMFS=y
--CONFIG_VXFS_FS=m
--# CONFIG_MINIX_FS is not set
--CONFIG_HPFS_FS=m
--CONFIG_QNX4FS_FS=m
--# CONFIG_ROMFS_FS is not set
--CONFIG_SYSV_FS=m
--CONFIG_UFS_FS=m
--# CONFIG_UFS_FS_WRITE is not set
--# CONFIG_UFS_DEBUG is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--CONFIG_NFS_V4=y
--# CONFIG_NFS_DIRECTIO is not set
--CONFIG_NFSD=y
--# CONFIG_NFSD_V3 is not set
--CONFIG_NFSD_TCP=y
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_EXPORTFS=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--CONFIG_SUNRPC_GSS=y
--# CONFIG_SUNRPC_BIND34 is not set
--CONFIG_RPCSEC_GSS_KRB5=y
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--CONFIG_MAC_PARTITION=y
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_BSD_DISKLABEL is not set
--# CONFIG_MINIX_SUBPARTITION is not set
--# CONFIG_SOLARIS_X86_PARTITION is not set
--# CONFIG_UNIXWARE_DISKLABEL is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--CONFIG_NLS=y
--CONFIG_NLS_DEFAULT="iso8859-1"
--# CONFIG_NLS_CODEPAGE_437 is not set
--# CONFIG_NLS_CODEPAGE_737 is not set
--# CONFIG_NLS_CODEPAGE_775 is not set
--# CONFIG_NLS_CODEPAGE_850 is not set
--# CONFIG_NLS_CODEPAGE_852 is not set
--# CONFIG_NLS_CODEPAGE_855 is not set
--# CONFIG_NLS_CODEPAGE_857 is not set
--# CONFIG_NLS_CODEPAGE_860 is not set
--# CONFIG_NLS_CODEPAGE_861 is not set
--# CONFIG_NLS_CODEPAGE_862 is not set
--# CONFIG_NLS_CODEPAGE_863 is not set
--# CONFIG_NLS_CODEPAGE_864 is not set
--# CONFIG_NLS_CODEPAGE_865 is not set
--# CONFIG_NLS_CODEPAGE_866 is not set
--# CONFIG_NLS_CODEPAGE_869 is not set
--# CONFIG_NLS_CODEPAGE_936 is not set
--# CONFIG_NLS_CODEPAGE_950 is not set
--# CONFIG_NLS_CODEPAGE_932 is not set
--# CONFIG_NLS_CODEPAGE_949 is not set
--# CONFIG_NLS_CODEPAGE_874 is not set
--# CONFIG_NLS_ISO8859_8 is not set
--# CONFIG_NLS_CODEPAGE_1250 is not set
--# CONFIG_NLS_CODEPAGE_1251 is not set
--# CONFIG_NLS_ASCII is not set
--# CONFIG_NLS_ISO8859_1 is not set
--# CONFIG_NLS_ISO8859_2 is not set
--# CONFIG_NLS_ISO8859_3 is not set
--# CONFIG_NLS_ISO8859_4 is not set
--# CONFIG_NLS_ISO8859_5 is not set
--# CONFIG_NLS_ISO8859_6 is not set
--# CONFIG_NLS_ISO8859_7 is not set
--# CONFIG_NLS_ISO8859_9 is not set
--# CONFIG_NLS_ISO8859_13 is not set
--# CONFIG_NLS_ISO8859_14 is not set
--# CONFIG_NLS_ISO8859_15 is not set
--# CONFIG_NLS_KOI8_R is not set
--# CONFIG_NLS_KOI8_U is not set
--CONFIG_NLS_UTF8=m
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# CONFIG_CRC16 is not set
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--CONFIG_LIBCRC32C=m
--CONFIG_ZLIB_INFLATE=y
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--# CONFIG_DEBUG_HIGHMEM is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--CONFIG_DEBUG_INFO=y
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--# CONFIG_DEBUGGER is not set
--# CONFIG_BDI_SWITCH is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_HASH=y
--CONFIG_CRYPTO_MANAGER=y
--CONFIG_CRYPTO_HMAC=y
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--CONFIG_CRYPTO_MD5=y
--CONFIG_CRYPTO_SHA1=m
--# CONFIG_CRYPTO_SHA256 is not set
--# CONFIG_CRYPTO_SHA512 is not set
--# CONFIG_CRYPTO_WP512 is not set
--# CONFIG_CRYPTO_TGR192 is not set
--# CONFIG_CRYPTO_GF128MUL is not set
--# CONFIG_CRYPTO_ECB is not set
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# CONFIG_CRYPTO_BLOWFISH is not set
--# CONFIG_CRYPTO_TWOFISH is not set
--# CONFIG_CRYPTO_SERPENT is not set
--# CONFIG_CRYPTO_AES is not set
--# CONFIG_CRYPTO_CAST5 is not set
--# CONFIG_CRYPTO_CAST6 is not set
--# CONFIG_CRYPTO_TEA is not set
--# CONFIG_CRYPTO_ARC4 is not set
--# CONFIG_CRYPTO_KHAZAD is not set
--# CONFIG_CRYPTO_ANUBIS is not set
--# CONFIG_CRYPTO_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/mpc8560_ads_defconfig
-+++ /dev/null
-@@ -1,885 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:27 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--CONFIG_PPC_85xx=y
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_E500=y
--CONFIG_BOOKE=y
--CONFIG_FSL_BOOKE=y
--CONFIG_FSL_EMB_PERFMON=y
--# CONFIG_PHYS_64BIT is not set
--CONFIG_SPE=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--# CONFIG_FAIR_GROUP_SCHED is not set
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--CONFIG_KALLSYMS=y
--# CONFIG_KALLSYMS_ALL is not set
--# CONFIG_KALLSYMS_EXTRA_PASS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=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 is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--# CONFIG_MODULES is not set
--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
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--CONFIG_DEFAULT_AS=y
--# CONFIG_DEFAULT_DEADLINE is not set
--# CONFIG_DEFAULT_CFQ is not set
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="anticipatory"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC85xx=y
--# CONFIG_MPC8540_ADS is not set
--CONFIG_MPC8560_ADS=y
--# CONFIG_MPC85xx_CDS is not set
--# CONFIG_MPC85xx_MDS is not set
--# CONFIG_MPC85xx_DS is not set
--# CONFIG_STX_GP3 is not set
--# CONFIG_TQM8540 is not set
--# CONFIG_TQM8541 is not set
--# CONFIG_TQM8555 is not set
--# CONFIG_TQM8560 is not set
--# CONFIG_SBC8548 is not set
--# CONFIG_SBC8560 is not set
--# CONFIG_IPIC is not set
--CONFIG_MPIC=y
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--CONFIG_CPM2=y
--CONFIG_PPC_CPM_NEW_BINDING=y
--# CONFIG_FSL_ULI1575 is not set
--CONFIG_CPM=y
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--CONFIG_BINFMT_MISC=y
--CONFIG_MATH_EMULATION=y
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--# CONFIG_PROC_DEVICETREE is not set
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--# CONFIG_SECCOMP is not set
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_FSL_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--CONFIG_PCI_DEBUG=y
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--# CONFIG_XFRM_USER is not set
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# CONFIG_IP_ADVANCED_ROUTER is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_PNP=y
--CONFIG_IP_PNP_DHCP=y
--CONFIG_IP_PNP_BOOTP=y
--# CONFIG_IP_PNP_RARP is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# CONFIG_INET_AH is not set
--# CONFIG_INET_ESP is not set
--# CONFIG_INET_IPCOMP is not set
--# CONFIG_INET_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--CONFIG_INET_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--# CONFIG_BRIDGE is not set
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--# CONFIG_LLC2 is not set
--# CONFIG_IPX is not set
--# CONFIG_ATALK is not set
--# CONFIG_X25 is not set
--# CONFIG_LAPB is not set
--# CONFIG_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--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 is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--CONFIG_MARVELL_PHY=y
--CONFIG_DAVICOM_PHY=y
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--CONFIG_FS_ENET=y
--# CONFIG_FS_ENET_HAS_SCC is not set
--CONFIG_FS_ENET_HAS_FCC=y
--# CONFIG_FS_ENET_MDIO_FCC is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--CONFIG_E1000=y
--CONFIG_E1000_NAPI=y
--# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--CONFIG_GIANFAR=y
--CONFIG_GFAR_NAPI=y
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--# CONFIG_SERIAL_8250 is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--CONFIG_SERIAL_CPM=y
--CONFIG_SERIAL_CPM_CONSOLE=y
--CONFIG_SERIAL_CPM_SCC1=y
--CONFIG_SERIAL_CPM_SCC2=y
--# CONFIG_SERIAL_CPM_SCC3 is not set
--# CONFIG_SERIAL_CPM_SCC4 is not set
--# CONFIG_SERIAL_CPM_SMC1 is not set
--# CONFIG_SERIAL_CPM_SMC2 is not set
--# CONFIG_SERIAL_JSM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--CONFIG_HW_RANDOM=y
--# CONFIG_NVRAM is not set
--CONFIG_GEN_RTC=y
--# CONFIG_GEN_RTC_X is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--# CONFIG_I2C is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_I5K_AMB is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_IT87 is not set
--# CONFIG_SENSORS_PC87360 is not set
--# CONFIG_SENSORS_PC87427 is not set
--# CONFIG_SENSORS_SIS5595 is not set
--# CONFIG_SENSORS_SMSC47M1 is not set
--# CONFIG_SENSORS_SMSC47B397 is not set
--# CONFIG_SENSORS_VIA686A is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_VT8231 is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--# CONFIG_HWMON_DEBUG_CHIP is not set
--# CONFIG_THERMAL is not set
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=y
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--CONFIG_EXT3_FS=y
--CONFIG_EXT3_FS_XATTR=y
--# CONFIG_EXT3_FS_POSIX_ACL is not set
--# CONFIG_EXT3_FS_SECURITY is not set
--# CONFIG_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# CONFIG_AUTOFS_FS is not set
--# CONFIG_AUTOFS4_FS is not set
--# CONFIG_FUSE_FS is not set
--
--#
--# CD-ROM/DVD Filesystems
--#
--# CONFIG_ISO9660_FS is not set
--# CONFIG_UDF_FS is not set
--
--#
--# DOS/FAT/NT Filesystems
--#
--# CONFIG_MSDOS_FS is not set
--# CONFIG_VFAT_FS is not set
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
--
--#
--# Miscellaneous filesystems
--#
--# CONFIG_ADFS_FS is not set
--# CONFIG_AFFS_FS is not set
--# CONFIG_HFS_FS is not set
--# CONFIG_HFSPLUS_FS is not set
--# CONFIG_BEFS_FS is not set
--# CONFIG_BFS_FS is not set
--# CONFIG_EFS_FS is not set
--# CONFIG_CRAMFS is not set
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--# CONFIG_NFS_V3 is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--# CONFIG_MAC_PARTITION is not set
--# CONFIG_MSDOS_PARTITION is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# 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_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--CONFIG_DEBUG_MUTEXES=y
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_DEBUG_INFO is not set
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--# CONFIG_DEBUGGER is not set
--# CONFIG_KGDB_CONSOLE is not set
--# CONFIG_BDI_SWITCH is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--# CONFIG_CRYPTO_SEQIV is not set
--# CONFIG_CRYPTO_MANAGER is not set
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--# CONFIG_CRYPTO_MD5 is not set
--# CONFIG_CRYPTO_SHA1 is not set
--# CONFIG_CRYPTO_SHA256 is not set
--# CONFIG_CRYPTO_SHA512 is not set
--# CONFIG_CRYPTO_WP512 is not set
--# CONFIG_CRYPTO_TGR192 is not set
--# CONFIG_CRYPTO_GF128MUL is not set
--# CONFIG_CRYPTO_ECB is not set
--# CONFIG_CRYPTO_CBC is not set
--# CONFIG_CRYPTO_PCBC is not set
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--# CONFIG_CRYPTO_DES is not set
--# CONFIG_CRYPTO_FCRYPT is not set
--# CONFIG_CRYPTO_BLOWFISH is not set
--# CONFIG_CRYPTO_TWOFISH is not set
--# CONFIG_CRYPTO_SERPENT is not set
--# CONFIG_CRYPTO_AES is not set
--# CONFIG_CRYPTO_CAST5 is not set
--# CONFIG_CRYPTO_CAST6 is not set
--# CONFIG_CRYPTO_TEA is not set
--# CONFIG_CRYPTO_ARC4 is not set
--# CONFIG_CRYPTO_KHAZAD is not set
--# CONFIG_CRYPTO_ANUBIS is not set
--# CONFIG_CRYPTO_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
--CONFIG_PPC_LIB_RHEAP=y
---- a/arch/powerpc/configs/mpc8568mds_defconfig
-+++ /dev/null
-@@ -1,1117 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc7
--# Mon Mar 31 11:37:05 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--CONFIG_PPC_85xx=y
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_E500=y
--CONFIG_BOOKE=y
--CONFIG_FSL_BOOKE=y
--CONFIG_FSL_EMB_PERFMON=y
--# CONFIG_PHYS_64BIT is not set
--CONFIG_SPE=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--# CONFIG_FAIR_GROUP_SCHED is not set
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--# CONFIG_KALLSYMS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--# CONFIG_EPOLL is not set
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--# CONFIG_KMOD is not set
--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
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--CONFIG_DEFAULT_AS=y
--# CONFIG_DEFAULT_DEADLINE is not set
--# CONFIG_DEFAULT_CFQ is not set
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="anticipatory"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC85xx=y
--# CONFIG_MPC8540_ADS is not set
--# CONFIG_MPC8560_ADS is not set
--# CONFIG_MPC85xx_CDS is not set
--CONFIG_MPC85xx_MDS=y
--# CONFIG_MPC85xx_DS is not set
--# CONFIG_STX_GP3 is not set
--# CONFIG_TQM8540 is not set
--# CONFIG_TQM8541 is not set
--# CONFIG_TQM8555 is not set
--# CONFIG_TQM8560 is not set
--# CONFIG_SBC8548 is not set
--# CONFIG_SBC8560 is not set
--# CONFIG_IPIC is not set
--CONFIG_MPIC=y
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--CONFIG_QUICC_ENGINE=y
--# CONFIG_CPM2 is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--CONFIG_TICK_ONESHOT=y
--CONFIG_NO_HZ=y
--CONFIG_HIGH_RES_TIMERS=y
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--CONFIG_MATH_EMULATION=y
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_FSL_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCI_DEBUG is not set
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--# CONFIG_XFRM_USER is not set
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# CONFIG_IP_ADVANCED_ROUTER is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_PNP=y
--CONFIG_IP_PNP_DHCP=y
--CONFIG_IP_PNP_BOOTP=y
--# CONFIG_IP_PNP_RARP is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# CONFIG_INET_AH is not set
--# CONFIG_INET_ESP is not set
--# CONFIG_INET_IPCOMP is not set
--# CONFIG_INET_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--CONFIG_INET_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--# CONFIG_BRIDGE is not set
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--# CONFIG_LLC2 is not set
--# CONFIG_IPX is not set
--# CONFIG_ATALK is not set
--# CONFIG_X25 is not set
--# CONFIG_LAPB is not set
--# CONFIG_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--CONFIG_SCSI=y
--CONFIG_SCSI_DMA=y
--# CONFIG_SCSI_TGT is not set
--# CONFIG_SCSI_NETLINK is not set
--CONFIG_SCSI_PROC_FS=y
--
--#
--# SCSI support type (disk, tape, CD-ROM)
--#
--# CONFIG_BLK_DEV_SD is not set
--# CONFIG_CHR_DEV_ST is not set
--# CONFIG_CHR_DEV_OSST is not set
--# CONFIG_BLK_DEV_SR is not set
--# CONFIG_CHR_DEV_SG is not set
--# CONFIG_CHR_DEV_SCH is not set
--
--#
--# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
--#
--# CONFIG_SCSI_MULTI_LUN is not set
--# CONFIG_SCSI_CONSTANTS is not set
--# CONFIG_SCSI_LOGGING is not set
--# CONFIG_SCSI_SCAN_ASYNC is not set
--CONFIG_SCSI_WAIT_SCAN=m
--
--#
--# SCSI Transports
--#
--# CONFIG_SCSI_SPI_ATTRS is not set
--# CONFIG_SCSI_FC_ATTRS is not set
--# CONFIG_SCSI_ISCSI_ATTRS is not set
--# CONFIG_SCSI_SAS_LIBSAS is not set
--# CONFIG_SCSI_SRP_ATTRS is not set
--CONFIG_SCSI_LOWLEVEL=y
--# CONFIG_ISCSI_TCP is not set
--# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
--# CONFIG_SCSI_3W_9XXX is not set
--# CONFIG_SCSI_ACARD is not set
--# CONFIG_SCSI_AACRAID is not set
--# CONFIG_SCSI_AIC7XXX is not set
--# CONFIG_SCSI_AIC7XXX_OLD is not set
--# CONFIG_SCSI_AIC79XX is not set
--# CONFIG_SCSI_AIC94XX is not set
--# CONFIG_SCSI_DPT_I2O is not set
--# CONFIG_SCSI_ADVANSYS is not set
--# CONFIG_SCSI_ARCMSR is not set
--# CONFIG_MEGARAID_NEWGEN is not set
--# CONFIG_MEGARAID_LEGACY is not set
--# CONFIG_MEGARAID_SAS is not set
--# CONFIG_SCSI_HPTIOP is not set
--# CONFIG_SCSI_BUSLOGIC is not set
--# CONFIG_SCSI_DMX3191D is not set
--# CONFIG_SCSI_EATA is not set
--# CONFIG_SCSI_FUTURE_DOMAIN is not set
--# CONFIG_SCSI_GDTH is not set
--# CONFIG_SCSI_IPS is not set
--# CONFIG_SCSI_INITIO is not set
--# CONFIG_SCSI_INIA100 is not set
--# CONFIG_SCSI_MVSAS is not set
--# CONFIG_SCSI_STEX is not set
--# CONFIG_SCSI_SYM53C8XX_2 is not set
--# CONFIG_SCSI_QLOGIC_1280 is not set
--# CONFIG_SCSI_QLA_FC is not set
--# CONFIG_SCSI_QLA_ISCSI is not set
--# CONFIG_SCSI_LPFC is not set
--# CONFIG_SCSI_DC395x is not set
--# CONFIG_SCSI_DC390T is not set
--# CONFIG_SCSI_NSP32 is not set
--# CONFIG_SCSI_DEBUG is not set
--# CONFIG_SCSI_SRP is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--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 is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--CONFIG_MARVELL_PHY=y
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--CONFIG_GIANFAR=y
--CONFIG_GFAR_NAPI=y
--# CONFIG_UCC_GETH is not set
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NET_FC is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--CONFIG_SERIAL_8250_SHARE_IRQ=y
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--# CONFIG_SERIAL_OF_PLATFORM is not set
--# CONFIG_SERIAL_QE is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--CONFIG_HW_RANDOM=y
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=y
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_ALI1535 is not set
--# CONFIG_I2C_ALI1563 is not set
--# CONFIG_I2C_ALI15X3 is not set
--# CONFIG_I2C_AMD756 is not set
--# CONFIG_I2C_AMD8111 is not set
--# CONFIG_I2C_I801 is not set
--# CONFIG_I2C_I810 is not set
--# CONFIG_I2C_PIIX4 is not set
--CONFIG_I2C_MPC=y
--# CONFIG_I2C_NFORCE2 is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--# CONFIG_I2C_PROSAVAGE is not set
--# CONFIG_I2C_SAVAGE4 is not set
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_SIS5595 is not set
--# CONFIG_I2C_SIS630 is not set
--# CONFIG_I2C_SIS96X is not set
--# CONFIG_I2C_TAOS_EVM is not set
--# CONFIG_I2C_STUB is not set
--# CONFIG_I2C_VIA is not set
--# CONFIG_I2C_VIAPRO is not set
--# CONFIG_I2C_VOODOO3 is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 is not set
--# CONFIG_I2C_DEBUG_CORE is not set
--# CONFIG_I2C_DEBUG_ALGO is not set
--# CONFIG_I2C_DEBUG_BUS is not set
--# CONFIG_I2C_DEBUG_CHIP is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_AD7418 is not set
--# CONFIG_SENSORS_ADM1021 is not set
--# CONFIG_SENSORS_ADM1025 is not set
--# CONFIG_SENSORS_ADM1026 is not set
--# CONFIG_SENSORS_ADM1029 is not set
--# CONFIG_SENSORS_ADM1031 is not set
--# CONFIG_SENSORS_ADM9240 is not set
--# CONFIG_SENSORS_ADT7470 is not set
--# CONFIG_SENSORS_ADT7473 is not set
--# CONFIG_SENSORS_ATXP1 is not set
--# CONFIG_SENSORS_DS1621 is not set
--# CONFIG_SENSORS_I5K_AMB is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_F75375S is not set
--# CONFIG_SENSORS_GL518SM is not set
--# CONFIG_SENSORS_GL520SM is not set
--# CONFIG_SENSORS_IT87 is not set
--# CONFIG_SENSORS_LM63 is not set
--# CONFIG_SENSORS_LM75 is not set
--# CONFIG_SENSORS_LM77 is not set
--# CONFIG_SENSORS_LM78 is not set
--# CONFIG_SENSORS_LM80 is not set
--# CONFIG_SENSORS_LM83 is not set
--# CONFIG_SENSORS_LM85 is not set
--# 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_SIS5595 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_ADS7828 is not set
--# CONFIG_SENSORS_THMC50 is not set
--# CONFIG_SENSORS_VIA686A is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_VT8231 is not set
--# CONFIG_SENSORS_W83781D is not set
--# CONFIG_SENSORS_W83791D is not set
--# CONFIG_SENSORS_W83792D is not set
--# CONFIG_SENSORS_W83793 is not set
--# CONFIG_SENSORS_W83L785TS is not set
--# CONFIG_SENSORS_W83L786NG is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--# CONFIG_HWMON_DEBUG_CHIP is not set
--# CONFIG_THERMAL is not set
--CONFIG_WATCHDOG=y
--# CONFIG_WATCHDOG_NOWAYOUT is not set
--
--#
--# Watchdog Device Drivers
--#
--# CONFIG_SOFT_WATCHDOG is not set
--# CONFIG_BOOKE_WDT is not set
--
--#
--# PCI-based Watchdog Cards
--#
--# CONFIG_PCIPCWATCHDOG is not set
--# CONFIG_WDTPCI is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=m
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--CONFIG_RTC_LIB=y
--CONFIG_RTC_CLASS=y
--CONFIG_RTC_HCTOSYS=y
--CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
--# CONFIG_RTC_DEBUG is not set
--
--#
--# RTC interfaces
--#
--CONFIG_RTC_INTF_SYSFS=y
--CONFIG_RTC_INTF_PROC=y
--CONFIG_RTC_INTF_DEV=y
--# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
--# CONFIG_RTC_DRV_TEST is not set
--
--#
--# I2C RTC drivers
--#
--# CONFIG_RTC_DRV_DS1307 is not set
--CONFIG_RTC_DRV_DS1374=y
--# CONFIG_RTC_DRV_DS1672 is not set
--# CONFIG_RTC_DRV_MAX6900 is not set
--# CONFIG_RTC_DRV_RS5C372 is not set
--# CONFIG_RTC_DRV_ISL1208 is not set
--# CONFIG_RTC_DRV_X1205 is not set
--# CONFIG_RTC_DRV_PCF8563 is not set
--# CONFIG_RTC_DRV_PCF8583 is not set
--# CONFIG_RTC_DRV_M41T80 is not set
--# CONFIG_RTC_DRV_S35390A is not set
--
--#
--# SPI RTC drivers
--#
--
--#
--# Platform RTC drivers
--#
--# CONFIG_RTC_DRV_CMOS is not set
--# CONFIG_RTC_DRV_DS1511 is not set
--# CONFIG_RTC_DRV_DS1553 is not set
--# CONFIG_RTC_DRV_DS1742 is not set
--# CONFIG_RTC_DRV_STK17TA8 is not set
--# CONFIG_RTC_DRV_M48T86 is not set
--# CONFIG_RTC_DRV_M48T59 is not set
--# CONFIG_RTC_DRV_V3020 is not set
--
--#
--# on-CPU RTC drivers
--#
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--CONFIG_EXT3_FS=y
--CONFIG_EXT3_FS_XATTR=y
--# CONFIG_EXT3_FS_POSIX_ACL is not set
--# CONFIG_EXT3_FS_SECURITY is not set
--# CONFIG_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# CONFIG_AUTOFS_FS is not set
--# CONFIG_AUTOFS4_FS is not set
--# CONFIG_FUSE_FS is not set
--
--#
--# CD-ROM/DVD Filesystems
--#
--# CONFIG_ISO9660_FS is not set
--# CONFIG_UDF_FS is not set
--
--#
--# DOS/FAT/NT Filesystems
--#
--# CONFIG_MSDOS_FS is not set
--# CONFIG_VFAT_FS is not set
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
--
--#
--# Miscellaneous filesystems
--#
--# CONFIG_ADFS_FS is not set
--# CONFIG_AFFS_FS is not set
--# CONFIG_HFS_FS is not set
--# CONFIG_HFSPLUS_FS is not set
--# CONFIG_BEFS_FS is not set
--# CONFIG_BFS_FS is not set
--# CONFIG_EFS_FS is not set
--# CONFIG_CRAMFS is not set
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--CONFIG_NFS_V4=y
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--CONFIG_SUNRPC_GSS=y
--# CONFIG_SUNRPC_BIND34 is not set
--CONFIG_RPCSEC_GSS_KRB5=y
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--# CONFIG_MAC_PARTITION is not set
--# CONFIG_MSDOS_PARTITION is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# 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_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_DEBUG_INFO is not set
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--CONFIG_DEBUGGER=y
--# CONFIG_XMON is not set
--# CONFIG_BDI_SWITCH is not set
--CONFIG_PPC_EARLY_DEBUG=y
--# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
--# CONFIG_PPC_EARLY_DEBUG_G5 is not set
--# CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL is not set
--# CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set
--# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
--# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
--# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
--# CONFIG_PPC_EARLY_DEBUG_BEAT is not set
--# CONFIG_PPC_EARLY_DEBUG_44x is not set
--# CONFIG_PPC_EARLY_DEBUG_40x is not set
--# CONFIG_PPC_EARLY_DEBUG_CPM is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--CONFIG_CRYPTO_MD5=y
--# CONFIG_CRYPTO_SHA1 is not set
--# CONFIG_CRYPTO_SHA256 is not set
--# CONFIG_CRYPTO_SHA512 is not set
--# CONFIG_CRYPTO_WP512 is not set
--# CONFIG_CRYPTO_TGR192 is not set
--# CONFIG_CRYPTO_GF128MUL is not set
--CONFIG_CRYPTO_ECB=m
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# CONFIG_CRYPTO_BLOWFISH is not set
--# CONFIG_CRYPTO_TWOFISH is not set
--# CONFIG_CRYPTO_SERPENT is not set
--# CONFIG_CRYPTO_AES is not set
--# CONFIG_CRYPTO_CAST5 is not set
--# CONFIG_CRYPTO_CAST6 is not set
--# CONFIG_CRYPTO_TEA is not set
--# CONFIG_CRYPTO_ARC4 is not set
--# CONFIG_CRYPTO_KHAZAD is not set
--# CONFIG_CRYPTO_ANUBIS is not set
--# CONFIG_CRYPTO_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
--CONFIG_PPC_LIB_RHEAP=y
---- a/arch/powerpc/configs/mpc8572_ds_defconfig
-+++ /dev/null
-@@ -1,1549 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc7
--# Mon Mar 31 11:37:06 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--CONFIG_PPC_85xx=y
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_E500=y
--CONFIG_BOOKE=y
--CONFIG_FSL_BOOKE=y
--CONFIG_FSL_EMB_PERFMON=y
--# CONFIG_PHYS_64BIT is not set
--CONFIG_SPE=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--CONFIG_POSIX_MQUEUE=y
--CONFIG_BSD_PROCESS_ACCT=y
--# CONFIG_BSD_PROCESS_ACCT_V3 is not set
--# CONFIG_TASKSTATS is not set
--CONFIG_AUDIT=y
--# CONFIG_AUDITSYSCALL is not set
--CONFIG_IKCONFIG=y
--CONFIG_IKCONFIG_PROC=y
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--# CONFIG_FAIR_GROUP_SCHED is not set
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--CONFIG_KALLSYMS=y
--CONFIG_KALLSYMS_ALL=y
--CONFIG_KALLSYMS_EXTRA_PASS=y
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=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 is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--# CONFIG_KPROBES is not set
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--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
--CONFIG_BLOCK=y
--CONFIG_LBD=y
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--# CONFIG_DEFAULT_AS is not set
--# CONFIG_DEFAULT_DEADLINE is not set
--CONFIG_DEFAULT_CFQ=y
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="cfq"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC85xx=y
--# CONFIG_MPC8540_ADS is not set
--# CONFIG_MPC8560_ADS is not set
--# CONFIG_MPC85xx_CDS is not set
--# CONFIG_MPC85xx_MDS is not set
--CONFIG_MPC85xx_DS=y
--# CONFIG_STX_GP3 is not set
--# CONFIG_TQM8540 is not set
--# CONFIG_TQM8541 is not set
--# CONFIG_TQM8555 is not set
--# CONFIG_TQM8560 is not set
--# CONFIG_SBC8548 is not set
--# CONFIG_SBC8560 is not set
--# CONFIG_IPIC is not set
--CONFIG_MPIC=y
--# CONFIG_MPIC_WEIRD is not set
--CONFIG_PPC_I8259=y
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_CPM2 is not set
--CONFIG_FSL_ULI1575=y
--
--#
--# Kernel options
--#
--CONFIG_HIGHMEM=y
--CONFIG_TICK_ONESHOT=y
--CONFIG_NO_HZ=y
--CONFIG_HIGH_RES_TIMERS=y
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--CONFIG_BINFMT_MISC=m
--CONFIG_MATH_EMULATION=y
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_GENERIC_ISA_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_FSL_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCI_DEBUG is not set
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--CONFIG_XFRM_USER=y
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--CONFIG_NET_KEY=m
--# CONFIG_NET_KEY_MIGRATE is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--CONFIG_IP_ADVANCED_ROUTER=y
--CONFIG_ASK_IP_FIB_HASH=y
--# CONFIG_IP_FIB_TRIE is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_MULTIPLE_TABLES=y
--CONFIG_IP_ROUTE_MULTIPATH=y
--CONFIG_IP_ROUTE_VERBOSE=y
--CONFIG_IP_PNP=y
--CONFIG_IP_PNP_DHCP=y
--CONFIG_IP_PNP_BOOTP=y
--CONFIG_IP_PNP_RARP=y
--CONFIG_NET_IPIP=y
--CONFIG_NET_IPGRE=y
--CONFIG_NET_IPGRE_BROADCAST=y
--CONFIG_IP_MROUTE=y
--CONFIG_IP_PIMSM_V1=y
--CONFIG_IP_PIMSM_V2=y
--CONFIG_ARPD=y
--# CONFIG_SYN_COOKIES is not set
--# CONFIG_INET_AH is not set
--# CONFIG_INET_ESP is not set
--# CONFIG_INET_IPCOMP is not set
--# CONFIG_INET_XFRM_TUNNEL is not set
--CONFIG_INET_TUNNEL=y
--# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
--# CONFIG_INET_XFRM_MODE_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_BEET is not set
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--CONFIG_IPV6=y
--# CONFIG_IPV6_PRIVACY is not set
--# CONFIG_IPV6_ROUTER_PREF is not set
--# CONFIG_IPV6_OPTIMISTIC_DAD is not set
--# CONFIG_INET6_AH is not set
--# CONFIG_INET6_ESP is not set
--# CONFIG_INET6_IPCOMP is not set
--# CONFIG_IPV6_MIP6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--CONFIG_INET6_XFRM_MODE_TRANSPORT=y
--CONFIG_INET6_XFRM_MODE_TUNNEL=y
--CONFIG_INET6_XFRM_MODE_BEET=y
--# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
--CONFIG_IPV6_SIT=y
--# CONFIG_IPV6_TUNNEL is not set
--# CONFIG_IPV6_MULTIPLE_TABLES is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--CONFIG_IP_SCTP=m
--# CONFIG_SCTP_DBG_MSG is not set
--# CONFIG_SCTP_DBG_OBJCNT is not set
--# CONFIG_SCTP_HMAC_NONE is not set
--# CONFIG_SCTP_HMAC_SHA1 is not set
--CONFIG_SCTP_HMAC_MD5=y
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--# CONFIG_BRIDGE is not set
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--# CONFIG_LLC2 is not set
--# CONFIG_IPX is not set
--# CONFIG_ATALK is not set
--# CONFIG_X25 is not set
--# CONFIG_LAPB is not set
--# CONFIG_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--CONFIG_FIB_RULES=y
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--CONFIG_FW_LOADER=y
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--CONFIG_BLK_DEV_NBD=y
--# CONFIG_BLK_DEV_SX8 is not set
--# CONFIG_BLK_DEV_UB is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=131072
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--CONFIG_SCSI=y
--CONFIG_SCSI_DMA=y
--# CONFIG_SCSI_TGT is not set
--# CONFIG_SCSI_NETLINK is not set
--CONFIG_SCSI_PROC_FS=y
--
--#
--# SCSI support type (disk, tape, CD-ROM)
--#
--CONFIG_BLK_DEV_SD=y
--CONFIG_CHR_DEV_ST=y
--# CONFIG_CHR_DEV_OSST is not set
--CONFIG_BLK_DEV_SR=y
--# CONFIG_BLK_DEV_SR_VENDOR is not set
--CONFIG_CHR_DEV_SG=y
--# CONFIG_CHR_DEV_SCH is not set
--
--#
--# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
--#
--CONFIG_SCSI_MULTI_LUN=y
--# CONFIG_SCSI_CONSTANTS is not set
--CONFIG_SCSI_LOGGING=y
--# CONFIG_SCSI_SCAN_ASYNC is not set
--CONFIG_SCSI_WAIT_SCAN=m
--
--#
--# SCSI Transports
--#
--# CONFIG_SCSI_SPI_ATTRS is not set
--# CONFIG_SCSI_FC_ATTRS is not set
--# CONFIG_SCSI_ISCSI_ATTRS is not set
--# CONFIG_SCSI_SAS_LIBSAS is not set
--# CONFIG_SCSI_SRP_ATTRS is not set
--CONFIG_SCSI_LOWLEVEL=y
--# CONFIG_ISCSI_TCP is not set
--# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
--# CONFIG_SCSI_3W_9XXX is not set
--# CONFIG_SCSI_ACARD is not set
--# CONFIG_SCSI_AACRAID is not set
--# CONFIG_SCSI_AIC7XXX is not set
--# CONFIG_SCSI_AIC7XXX_OLD is not set
--# CONFIG_SCSI_AIC79XX is not set
--# CONFIG_SCSI_AIC94XX is not set
--# CONFIG_SCSI_DPT_I2O is not set
--# CONFIG_SCSI_ADVANSYS is not set
--# CONFIG_SCSI_ARCMSR is not set
--# CONFIG_MEGARAID_NEWGEN is not set
--# CONFIG_MEGARAID_LEGACY is not set
--# CONFIG_MEGARAID_SAS is not set
--# CONFIG_SCSI_HPTIOP is not set
--# CONFIG_SCSI_BUSLOGIC is not set
--# CONFIG_SCSI_DMX3191D is not set
--# CONFIG_SCSI_EATA is not set
--# CONFIG_SCSI_FUTURE_DOMAIN is not set
--# CONFIG_SCSI_GDTH is not set
--# CONFIG_SCSI_IPS is not set
--# CONFIG_SCSI_INITIO is not set
--# CONFIG_SCSI_INIA100 is not set
--# CONFIG_SCSI_MVSAS is not set
--# CONFIG_SCSI_STEX is not set
--# CONFIG_SCSI_SYM53C8XX_2 is not set
--# CONFIG_SCSI_IPR is not set
--# CONFIG_SCSI_QLOGIC_1280 is not set
--# CONFIG_SCSI_QLA_FC is not set
--# CONFIG_SCSI_QLA_ISCSI is not set
--# CONFIG_SCSI_LPFC is not set
--# CONFIG_SCSI_DC395x is not set
--# CONFIG_SCSI_DC390T is not set
--# CONFIG_SCSI_NSP32 is not set
--# CONFIG_SCSI_DEBUG is not set
--# CONFIG_SCSI_SRP is not set
--CONFIG_ATA=y
--# CONFIG_ATA_NONSTANDARD is not set
--CONFIG_SATA_AHCI=y
--# CONFIG_SATA_SVW is not set
--# CONFIG_ATA_PIIX is not set
--# CONFIG_SATA_MV is not set
--# CONFIG_SATA_NV is not set
--# CONFIG_PDC_ADMA is not set
--# CONFIG_SATA_QSTOR is not set
--# CONFIG_SATA_PROMISE is not set
--# CONFIG_SATA_SX4 is not set
--# CONFIG_SATA_SIL is not set
--# CONFIG_SATA_SIL24 is not set
--# CONFIG_SATA_SIS is not set
--# CONFIG_SATA_ULI is not set
--# CONFIG_SATA_VIA is not set
--# CONFIG_SATA_VITESSE is not set
--# CONFIG_SATA_INIC162X is not set
--# CONFIG_SATA_FSL is not set
--CONFIG_PATA_ALI=y
--# CONFIG_PATA_AMD is not set
--# CONFIG_PATA_ARTOP is not set
--# CONFIG_PATA_ATIIXP is not set
--# CONFIG_PATA_CMD640_PCI is not set
--# CONFIG_PATA_CMD64X is not set
--# CONFIG_PATA_CS5520 is not set
--# CONFIG_PATA_CS5530 is not set
--# CONFIG_PATA_CYPRESS is not set
--# CONFIG_PATA_EFAR is not set
--# CONFIG_ATA_GENERIC is not set
--# CONFIG_PATA_HPT366 is not set
--# CONFIG_PATA_HPT37X is not set
--# CONFIG_PATA_HPT3X2N is not set
--# CONFIG_PATA_HPT3X3 is not set
--# CONFIG_PATA_IT821X is not set
--# CONFIG_PATA_IT8213 is not set
--# CONFIG_PATA_JMICRON is not set
--# CONFIG_PATA_TRIFLEX is not set
--# CONFIG_PATA_MARVELL is not set
--# CONFIG_PATA_MPIIX is not set
--# CONFIG_PATA_OLDPIIX is not set
--# CONFIG_PATA_NETCELL is not set
--# CONFIG_PATA_NINJA32 is not set
--# CONFIG_PATA_NS87410 is not set
--# CONFIG_PATA_NS87415 is not set
--# CONFIG_PATA_OPTI is not set
--# CONFIG_PATA_OPTIDMA is not set
--# CONFIG_PATA_PDC_OLD is not set
--# CONFIG_PATA_RADISYS is not set
--# CONFIG_PATA_RZ1000 is not set
--# CONFIG_PATA_SC1200 is not set
--# CONFIG_PATA_SERVERWORKS is not set
--# CONFIG_PATA_PDC2027X is not set
--# CONFIG_PATA_SIL680 is not set
--# CONFIG_PATA_SIS is not set
--# CONFIG_PATA_VIA is not set
--# CONFIG_PATA_WINBOND is not set
--# CONFIG_PATA_PLATFORM is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--CONFIG_DUMMY=y
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--# CONFIG_MARVELL_PHY is not set
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--CONFIG_VITESSE_PHY=y
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--CONFIG_GIANFAR=y
--CONFIG_GFAR_NAPI=y
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--
--#
--# USB Network Adapters
--#
--# CONFIG_USB_CATC is not set
--# CONFIG_USB_KAWETH is not set
--# CONFIG_USB_PEGASUS is not set
--# CONFIG_USB_RTL8150 is not set
--# CONFIG_USB_USBNET is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NET_FC is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--CONFIG_SERIO=y
--CONFIG_SERIO_I8042=y
--CONFIG_SERIO_SERPORT=y
--# CONFIG_SERIO_PCIPS2 is not set
--CONFIG_SERIO_LIBPS2=y
--# CONFIG_SERIO_RAW is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--CONFIG_VT=y
--CONFIG_VT_CONSOLE=y
--CONFIG_HW_CONSOLE=y
--# CONFIG_VT_HW_CONSOLE_BINDING is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=y
--CONFIG_SERIAL_8250_NR_UARTS=2
--CONFIG_SERIAL_8250_RUNTIME_UARTS=2
--CONFIG_SERIAL_8250_EXTENDED=y
--CONFIG_SERIAL_8250_MANY_PORTS=y
--CONFIG_SERIAL_8250_SHARE_IRQ=y
--CONFIG_SERIAL_8250_DETECT_IRQ=y
--CONFIG_SERIAL_8250_RSA=y
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--CONFIG_NVRAM=y
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--# CONFIG_I2C_CHARDEV is not set
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_ALI1535 is not set
--# CONFIG_I2C_ALI1563 is not set
--# CONFIG_I2C_ALI15X3 is not set
--# CONFIG_I2C_AMD756 is not set
--# CONFIG_I2C_AMD8111 is not set
--# CONFIG_I2C_I801 is not set
--# CONFIG_I2C_I810 is not set
--# CONFIG_I2C_PIIX4 is not set
--CONFIG_I2C_MPC=y
--# CONFIG_I2C_NFORCE2 is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--# CONFIG_I2C_PROSAVAGE is not set
--# CONFIG_I2C_SAVAGE4 is not set
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_SIS5595 is not set
--# CONFIG_I2C_SIS630 is not set
--# CONFIG_I2C_SIS96X 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_VIA is not set
--# CONFIG_I2C_VIAPRO is not set
--# CONFIG_I2C_VOODOO3 is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--CONFIG_SENSORS_EEPROM=y
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 is not set
--# CONFIG_I2C_DEBUG_CORE is not set
--# CONFIG_I2C_DEBUG_ALGO is not set
--# CONFIG_I2C_DEBUG_BUS is not set
--# CONFIG_I2C_DEBUG_CHIP is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--# CONFIG_HWMON is not set
--# CONFIG_THERMAL is not set
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--CONFIG_DVB_CORE=m
--# CONFIG_DVB_CORE_ATTACH is not set
--CONFIG_DVB_CAPTURE_DRIVERS=y
--
--#
--# Supported SAA7146 based PCI Adapters
--#
--# CONFIG_TTPCI_EEPROM is not set
--# CONFIG_DVB_BUDGET_CORE is not set
--
--#
--# Supported USB Adapters
--#
--# CONFIG_DVB_USB is not set
--# CONFIG_DVB_TTUSB_BUDGET is not set
--# CONFIG_DVB_TTUSB_DEC is not set
--# CONFIG_DVB_CINERGYT2 is not set
--
--#
--# Supported FlexCopII (B2C2) Adapters
--#
--# CONFIG_DVB_B2C2_FLEXCOP is not set
--
--#
--# Supported BT878 Adapters
--#
--
--#
--# Supported Pluto2 Adapters
--#
--# CONFIG_DVB_PLUTO2 is not set
--
--#
--# Supported DVB Frontends
--#
--
--#
--# Customise DVB Frontends
--#
--# CONFIG_DVB_FE_CUSTOMISE is not set
--
--#
--# DVB-S (satellite) frontends
--#
--# CONFIG_DVB_STV0299 is not set
--# CONFIG_DVB_CX24110 is not set
--# CONFIG_DVB_CX24123 is not set
--# CONFIG_DVB_TDA8083 is not set
--# CONFIG_DVB_MT312 is not set
--# CONFIG_DVB_VES1X93 is not set
--# CONFIG_DVB_S5H1420 is not set
--# CONFIG_DVB_TDA10086 is not set
--
--#
--# DVB-T (terrestrial) frontends
--#
--# CONFIG_DVB_SP8870 is not set
--# CONFIG_DVB_SP887X is not set
--# CONFIG_DVB_CX22700 is not set
--# CONFIG_DVB_CX22702 is not set
--# CONFIG_DVB_L64781 is not set
--# CONFIG_DVB_TDA1004X is not set
--# CONFIG_DVB_NXT6000 is not set
--# CONFIG_DVB_MT352 is not set
--# CONFIG_DVB_ZL10353 is not set
--# CONFIG_DVB_DIB3000MB is not set
--# CONFIG_DVB_DIB3000MC is not set
--# CONFIG_DVB_DIB7000M is not set
--# CONFIG_DVB_DIB7000P is not set
--
--#
--# DVB-C (cable) frontends
--#
--# CONFIG_DVB_VES1820 is not set
--# CONFIG_DVB_TDA10021 is not set
--# CONFIG_DVB_TDA10023 is not set
--# CONFIG_DVB_STV0297 is not set
--
--#
--# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
--#
--# CONFIG_DVB_NXT200X is not set
--# CONFIG_DVB_OR51211 is not set
--# CONFIG_DVB_OR51132 is not set
--# CONFIG_DVB_BCM3510 is not set
--# CONFIG_DVB_LGDT330X is not set
--# CONFIG_DVB_S5H1409 is not set
--
--#
--# Tuners/PLL support
--#
--# CONFIG_DVB_PLL is not set
--# CONFIG_DVB_TDA826X is not set
--# CONFIG_DVB_TDA827X is not set
--# CONFIG_DVB_TDA18271 is not set
--# CONFIG_DVB_TUNER_QT1010 is not set
--# CONFIG_DVB_TUNER_MT2060 is not set
--# CONFIG_DVB_TUNER_MT2266 is not set
--# CONFIG_DVB_TUNER_MT2131 is not set
--# CONFIG_DVB_TUNER_DIB0070 is not set
--# CONFIG_DVB_TUNER_XC5000 is not set
--
--#
--# Miscellaneous devices
--#
--# CONFIG_DVB_LNBP21 is not set
--# CONFIG_DVB_ISL6421 is not set
--# CONFIG_DVB_TUA6100 is not set
--CONFIG_DAB=y
--# CONFIG_USB_DABUSB is not set
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=y
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Console display driver support
--#
--CONFIG_VGA_CONSOLE=y
--# CONFIG_VGACON_SOFT_SCROLLBACK is not set
--CONFIG_DUMMY_CONSOLE=y
--
--#
--# Sound
--#
--CONFIG_SOUND=y
--
--#
--# Advanced Linux Sound Architecture
--#
--CONFIG_SND=y
--CONFIG_SND_TIMER=y
--CONFIG_SND_PCM=y
--# CONFIG_SND_SEQUENCER is not set
--# CONFIG_SND_MIXER_OSS is not set
--# CONFIG_SND_PCM_OSS is not set
--# CONFIG_SND_DYNAMIC_MINORS is not set
--CONFIG_SND_SUPPORT_OLD_API=y
--CONFIG_SND_VERBOSE_PROCFS=y
--# CONFIG_SND_VERBOSE_PRINTK is not set
--# CONFIG_SND_DEBUG is not set
--
--#
--# Generic devices
--#
--CONFIG_SND_AC97_CODEC=y
--# CONFIG_SND_DUMMY is not set
--# CONFIG_SND_MTPAV is not set
--# CONFIG_SND_SERIAL_U16550 is not set
--# CONFIG_SND_MPU401 is not set
--
--#
--# PCI devices
--#
--# CONFIG_SND_AD1889 is not set
--# CONFIG_SND_ALS300 is not set
--# CONFIG_SND_ALS4000 is not set
--# CONFIG_SND_ALI5451 is not set
--# CONFIG_SND_ATIIXP is not set
--# CONFIG_SND_ATIIXP_MODEM is not set
--# CONFIG_SND_AU8810 is not set
--# CONFIG_SND_AU8820 is not set
--# CONFIG_SND_AU8830 is not set
--# CONFIG_SND_AZT3328 is not set
--# CONFIG_SND_BT87X is not set
--# CONFIG_SND_CA0106 is not set
--# CONFIG_SND_CMIPCI is not set
--# CONFIG_SND_OXYGEN is not set
--# CONFIG_SND_CS4281 is not set
--# CONFIG_SND_CS46XX is not set
--# CONFIG_SND_CS5530 is not set
--# CONFIG_SND_DARLA20 is not set
--# CONFIG_SND_GINA20 is not set
--# CONFIG_SND_LAYLA20 is not set
--# CONFIG_SND_DARLA24 is not set
--# CONFIG_SND_GINA24 is not set
--# CONFIG_SND_LAYLA24 is not set
--# CONFIG_SND_MONA is not set
--# CONFIG_SND_MIA is not set
--# CONFIG_SND_ECHO3G is not set
--# CONFIG_SND_INDIGO is not set
--# CONFIG_SND_INDIGOIO is not set
--# CONFIG_SND_INDIGODJ is not set
--# CONFIG_SND_EMU10K1 is not set
--# CONFIG_SND_EMU10K1X is not set
--# CONFIG_SND_ENS1370 is not set
--# CONFIG_SND_ENS1371 is not set
--# CONFIG_SND_ES1938 is not set
--# CONFIG_SND_ES1968 is not set
--# CONFIG_SND_FM801 is not set
--# CONFIG_SND_HDA_INTEL is not set
--# CONFIG_SND_HDSP is not set
--# CONFIG_SND_HDSPM is not set
--# CONFIG_SND_HIFIER is not set
--# CONFIG_SND_ICE1712 is not set
--# CONFIG_SND_ICE1724 is not set
--CONFIG_SND_INTEL8X0=y
--# CONFIG_SND_INTEL8X0M is not set
--# CONFIG_SND_KORG1212 is not set
--# CONFIG_SND_MAESTRO3 is not set
--# CONFIG_SND_MIXART is not set
--# CONFIG_SND_NM256 is not set
--# CONFIG_SND_PCXHR is not set
--# CONFIG_SND_RIPTIDE is not set
--# CONFIG_SND_RME32 is not set
--# CONFIG_SND_RME96 is not set
--# CONFIG_SND_RME9652 is not set
--# CONFIG_SND_SONICVIBES is not set
--# CONFIG_SND_TRIDENT is not set
--# CONFIG_SND_VIA82XX is not set
--# CONFIG_SND_VIA82XX_MODEM is not set
--# CONFIG_SND_VIRTUOSO is not set
--# CONFIG_SND_VX222 is not set
--# CONFIG_SND_YMFPCI is not set
--# CONFIG_SND_AC97_POWER_SAVE is not set
--
--#
--# ALSA PowerMac devices
--#
--
--#
--# ALSA PowerPC devices
--#
--
--#
--# USB devices
--#
--# CONFIG_SND_USB_AUDIO is not set
--# CONFIG_SND_USB_USX2Y is not set
--# CONFIG_SND_USB_CAIAQ is not set
--
--#
--# System on Chip audio support
--#
--# CONFIG_SND_SOC is not set
--
--#
--# SoC Audio support for SuperH
--#
--
--#
--# ALSA SoC audio for Freescale SOCs
--#
--
--#
--# Open Sound System
--#
--# CONFIG_SOUND_PRIME is not set
--CONFIG_AC97_BUS=y
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--
--#
--# USB Input Devices
--#
--CONFIG_USB_HID=y
--# CONFIG_USB_HIDINPUT_POWERBOOK is not set
--# CONFIG_HID_FF is not set
--# CONFIG_USB_HIDDEV is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--CONFIG_USB=y
--# CONFIG_USB_DEBUG is not set
--# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
--
--#
--# Miscellaneous USB options
--#
--CONFIG_USB_DEVICEFS=y
--CONFIG_USB_DEVICE_CLASS=y
--# CONFIG_USB_DYNAMIC_MINORS is not set
--# CONFIG_USB_OTG is not set
--
--#
--# USB Host Controller Drivers
--#
--CONFIG_USB_EHCI_HCD=y
--# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
--# CONFIG_USB_EHCI_TT_NEWSCHED is not set
--# CONFIG_USB_EHCI_FSL is not set
--CONFIG_USB_EHCI_HCD_PPC_OF=y
--# CONFIG_USB_ISP116X_HCD is not set
--CONFIG_USB_OHCI_HCD=y
--CONFIG_USB_OHCI_HCD_PPC_OF=y
--CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
--CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
--CONFIG_USB_OHCI_HCD_PCI=y
--CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
--CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
--CONFIG_USB_OHCI_LITTLE_ENDIAN=y
--# CONFIG_USB_UHCI_HCD is not set
--# CONFIG_USB_SL811_HCD is not set
--# CONFIG_USB_R8A66597_HCD is not set
--
--#
--# USB Device Class drivers
--#
--# CONFIG_USB_ACM is not set
--# CONFIG_USB_PRINTER is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--
--#
--# may also be needed; see USB_STORAGE Help for more information
--#
--CONFIG_USB_STORAGE=y
--# CONFIG_USB_STORAGE_DEBUG is not set
--# CONFIG_USB_STORAGE_DATAFAB is not set
--# CONFIG_USB_STORAGE_FREECOM is not set
--# CONFIG_USB_STORAGE_ISD200 is not set
--# CONFIG_USB_STORAGE_DPCM is not set
--# CONFIG_USB_STORAGE_USBAT is not set
--# CONFIG_USB_STORAGE_SDDR09 is not set
--# CONFIG_USB_STORAGE_SDDR55 is not set
--# CONFIG_USB_STORAGE_JUMPSHOT is not set
--# CONFIG_USB_STORAGE_ALAUDA is not set
--# CONFIG_USB_STORAGE_KARMA is not set
--# CONFIG_USB_LIBUSUAL is not set
--
--#
--# USB Imaging devices
--#
--# CONFIG_USB_MDC800 is not set
--# CONFIG_USB_MICROTEK is not set
--CONFIG_USB_MON=y
--
--#
--# USB port drivers
--#
--# CONFIG_USB_SERIAL is not set
--
--#
--# USB Miscellaneous drivers
--#
--# CONFIG_USB_EMI62 is not set
--# CONFIG_USB_EMI26 is not set
--# CONFIG_USB_ADUTUX is not set
--# CONFIG_USB_AUERSWALD is not set
--# CONFIG_USB_RIO500 is not set
--# CONFIG_USB_LEGOTOWER is not set
--# CONFIG_USB_LCD is not set
--# CONFIG_USB_BERRY_CHARGE is not set
--# CONFIG_USB_LED is not set
--# CONFIG_USB_CYPRESS_CY7C63 is not set
--# CONFIG_USB_CYTHERM is not set
--# CONFIG_USB_PHIDGET is not set
--# CONFIG_USB_IDMOUSE is not set
--# CONFIG_USB_FTDI_ELAN is not set
--# CONFIG_USB_APPLEDISPLAY is not set
--# CONFIG_USB_SISUSBVGA is not set
--# CONFIG_USB_LD is not set
--# CONFIG_USB_TRANCEVIBRATOR is not set
--# CONFIG_USB_IOWARRIOR is not set
--# CONFIG_USB_TEST is not set
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--CONFIG_RTC_LIB=y
--CONFIG_RTC_CLASS=y
--CONFIG_RTC_HCTOSYS=y
--CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
--# CONFIG_RTC_DEBUG is not set
--
--#
--# RTC interfaces
--#
--CONFIG_RTC_INTF_SYSFS=y
--CONFIG_RTC_INTF_PROC=y
--CONFIG_RTC_INTF_DEV=y
--# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
--# CONFIG_RTC_DRV_TEST is not set
--
--#
--# I2C RTC drivers
--#
--# CONFIG_RTC_DRV_DS1307 is not set
--# CONFIG_RTC_DRV_DS1374 is not set
--# CONFIG_RTC_DRV_DS1672 is not set
--# CONFIG_RTC_DRV_MAX6900 is not set
--# CONFIG_RTC_DRV_RS5C372 is not set
--# CONFIG_RTC_DRV_ISL1208 is not set
--# CONFIG_RTC_DRV_X1205 is not set
--# CONFIG_RTC_DRV_PCF8563 is not set
--# CONFIG_RTC_DRV_PCF8583 is not set
--# CONFIG_RTC_DRV_M41T80 is not set
--# CONFIG_RTC_DRV_S35390A is not set
--
--#
--# SPI RTC drivers
--#
--
--#
--# Platform RTC drivers
--#
--CONFIG_RTC_DRV_CMOS=y
--# CONFIG_RTC_DRV_DS1511 is not set
--# CONFIG_RTC_DRV_DS1553 is not set
--# CONFIG_RTC_DRV_DS1742 is not set
--# CONFIG_RTC_DRV_STK17TA8 is not set
--# CONFIG_RTC_DRV_M48T86 is not set
--# CONFIG_RTC_DRV_M48T59 is not set
--# CONFIG_RTC_DRV_V3020 is not set
--
--#
--# on-CPU RTC drivers
--#
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--CONFIG_EXT3_FS=y
--CONFIG_EXT3_FS_XATTR=y
--# CONFIG_EXT3_FS_POSIX_ACL is not set
--# CONFIG_EXT3_FS_SECURITY is not set
--# CONFIG_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# CONFIG_AUTOFS_FS is not set
--# CONFIG_AUTOFS4_FS is not set
--# CONFIG_FUSE_FS is not set
--
--#
--# CD-ROM/DVD Filesystems
--#
--CONFIG_ISO9660_FS=m
--CONFIG_JOLIET=y
--CONFIG_ZISOFS=y
--CONFIG_UDF_FS=m
--CONFIG_UDF_NLS=y
--
--#
--# DOS/FAT/NT Filesystems
--#
--CONFIG_FAT_FS=y
--CONFIG_MSDOS_FS=m
--CONFIG_VFAT_FS=y
--CONFIG_FAT_DEFAULT_CODEPAGE=437
--CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
--CONFIG_NTFS_FS=y
--# CONFIG_NTFS_DEBUG is not set
--# CONFIG_NTFS_RW is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
--
--#
--# Miscellaneous filesystems
--#
--CONFIG_ADFS_FS=m
--# CONFIG_ADFS_FS_RW is not set
--CONFIG_AFFS_FS=m
--CONFIG_HFS_FS=m
--CONFIG_HFSPLUS_FS=m
--CONFIG_BEFS_FS=m
--# CONFIG_BEFS_DEBUG is not set
--CONFIG_BFS_FS=m
--CONFIG_EFS_FS=m
--CONFIG_CRAMFS=y
--CONFIG_VXFS_FS=m
--# CONFIG_MINIX_FS is not set
--CONFIG_HPFS_FS=m
--CONFIG_QNX4FS_FS=m
--# CONFIG_ROMFS_FS is not set
--CONFIG_SYSV_FS=m
--CONFIG_UFS_FS=m
--# CONFIG_UFS_FS_WRITE is not set
--# CONFIG_UFS_DEBUG is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--CONFIG_NFS_V4=y
--# CONFIG_NFS_DIRECTIO is not set
--CONFIG_NFSD=y
--# CONFIG_NFSD_V3 is not set
--CONFIG_NFSD_TCP=y
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_EXPORTFS=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--CONFIG_SUNRPC_GSS=y
--# CONFIG_SUNRPC_BIND34 is not set
--CONFIG_RPCSEC_GSS_KRB5=y
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--CONFIG_MAC_PARTITION=y
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_BSD_DISKLABEL is not set
--# CONFIG_MINIX_SUBPARTITION is not set
--# CONFIG_SOLARIS_X86_PARTITION is not set
--# CONFIG_UNIXWARE_DISKLABEL is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--CONFIG_NLS=y
--CONFIG_NLS_DEFAULT="iso8859-1"
--# CONFIG_NLS_CODEPAGE_437 is not set
--# CONFIG_NLS_CODEPAGE_737 is not set
--# CONFIG_NLS_CODEPAGE_775 is not set
--# CONFIG_NLS_CODEPAGE_850 is not set
--# CONFIG_NLS_CODEPAGE_852 is not set
--# CONFIG_NLS_CODEPAGE_855 is not set
--# CONFIG_NLS_CODEPAGE_857 is not set
--# CONFIG_NLS_CODEPAGE_860 is not set
--# CONFIG_NLS_CODEPAGE_861 is not set
--# CONFIG_NLS_CODEPAGE_862 is not set
--# CONFIG_NLS_CODEPAGE_863 is not set
--# CONFIG_NLS_CODEPAGE_864 is not set
--# CONFIG_NLS_CODEPAGE_865 is not set
--# CONFIG_NLS_CODEPAGE_866 is not set
--# CONFIG_NLS_CODEPAGE_869 is not set
--# CONFIG_NLS_CODEPAGE_936 is not set
--# CONFIG_NLS_CODEPAGE_950 is not set
--# CONFIG_NLS_CODEPAGE_932 is not set
--# CONFIG_NLS_CODEPAGE_949 is not set
--# CONFIG_NLS_CODEPAGE_874 is not set
--# CONFIG_NLS_ISO8859_8 is not set
--# CONFIG_NLS_CODEPAGE_1250 is not set
--# CONFIG_NLS_CODEPAGE_1251 is not set
--# CONFIG_NLS_ASCII is not set
--# CONFIG_NLS_ISO8859_1 is not set
--# CONFIG_NLS_ISO8859_2 is not set
--# CONFIG_NLS_ISO8859_3 is not set
--# CONFIG_NLS_ISO8859_4 is not set
--# CONFIG_NLS_ISO8859_5 is not set
--# CONFIG_NLS_ISO8859_6 is not set
--# CONFIG_NLS_ISO8859_7 is not set
--# CONFIG_NLS_ISO8859_9 is not set
--# CONFIG_NLS_ISO8859_13 is not set
--# CONFIG_NLS_ISO8859_14 is not set
--# CONFIG_NLS_ISO8859_15 is not set
--# CONFIG_NLS_KOI8_R is not set
--# CONFIG_NLS_KOI8_U is not set
--CONFIG_NLS_UTF8=m
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# CONFIG_CRC16 is not set
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--CONFIG_LIBCRC32C=m
--CONFIG_ZLIB_INFLATE=y
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--# CONFIG_DEBUG_HIGHMEM is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--CONFIG_DEBUG_INFO=y
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--# CONFIG_DEBUGGER is not set
--# CONFIG_BDI_SWITCH is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_HASH=y
--CONFIG_CRYPTO_MANAGER=y
--CONFIG_CRYPTO_HMAC=y
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--CONFIG_CRYPTO_MD5=y
--CONFIG_CRYPTO_SHA1=m
--# CONFIG_CRYPTO_SHA256 is not set
--# CONFIG_CRYPTO_SHA512 is not set
--# CONFIG_CRYPTO_WP512 is not set
--# CONFIG_CRYPTO_TGR192 is not set
--# CONFIG_CRYPTO_GF128MUL is not set
--# CONFIG_CRYPTO_ECB is not set
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# CONFIG_CRYPTO_BLOWFISH is not set
--# CONFIG_CRYPTO_TWOFISH is not set
--# CONFIG_CRYPTO_SERPENT is not set
--# CONFIG_CRYPTO_AES is not set
--# CONFIG_CRYPTO_CAST5 is not set
--# CONFIG_CRYPTO_CAST6 is not set
--# CONFIG_CRYPTO_TEA is not set
--# CONFIG_CRYPTO_ARC4 is not set
--# CONFIG_CRYPTO_KHAZAD is not set
--# CONFIG_CRYPTO_ANUBIS is not set
--# CONFIG_CRYPTO_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/mpc85xx_cds_defconfig
-+++ /dev/null
-@@ -1,935 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:30 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--CONFIG_PPC_85xx=y
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_E500=y
--CONFIG_BOOKE=y
--CONFIG_FSL_BOOKE=y
--CONFIG_FSL_EMB_PERFMON=y
--# CONFIG_PHYS_64BIT is not set
--CONFIG_SPE=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--# CONFIG_FAIR_GROUP_SCHED is not set
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--CONFIG_KALLSYMS=y
--# CONFIG_KALLSYMS_ALL is not set
--# CONFIG_KALLSYMS_EXTRA_PASS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=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 is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--# CONFIG_MODULES is not set
--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
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--CONFIG_DEFAULT_AS=y
--# CONFIG_DEFAULT_DEADLINE is not set
--# CONFIG_DEFAULT_CFQ is not set
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="anticipatory"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC85xx=y
--# CONFIG_MPC8540_ADS is not set
--# CONFIG_MPC8560_ADS is not set
--CONFIG_MPC85xx_CDS=y
--# CONFIG_MPC85xx_MDS is not set
--# CONFIG_MPC85xx_DS is not set
--# CONFIG_STX_GP3 is not set
--# CONFIG_TQM8540 is not set
--# CONFIG_TQM8541 is not set
--# CONFIG_TQM8555 is not set
--# CONFIG_TQM8560 is not set
--# CONFIG_SBC8548 is not set
--# CONFIG_SBC8560 is not set
--# CONFIG_IPIC is not set
--CONFIG_MPIC=y
--# CONFIG_MPIC_WEIRD is not set
--CONFIG_PPC_I8259=y
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_CPM2 is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--CONFIG_TICK_ONESHOT=y
--CONFIG_NO_HZ=y
--CONFIG_HIGH_RES_TIMERS=y
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--CONFIG_BINFMT_MISC=y
--CONFIG_MATH_EMULATION=y
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--# CONFIG_SECCOMP is not set
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_FSL_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCI_DEBUG is not set
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--CONFIG_XFRM_USER=y
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# CONFIG_IP_ADVANCED_ROUTER is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_PNP=y
--CONFIG_IP_PNP_DHCP=y
--CONFIG_IP_PNP_BOOTP=y
--# CONFIG_IP_PNP_RARP is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# CONFIG_INET_AH is not set
--# CONFIG_INET_ESP is not set
--# CONFIG_INET_IPCOMP is not set
--# CONFIG_INET_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--CONFIG_INET_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--# CONFIG_BRIDGE is not set
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--# CONFIG_LLC2 is not set
--# CONFIG_IPX is not set
--# CONFIG_ATALK is not set
--# CONFIG_X25 is not set
--# CONFIG_LAPB is not set
--# CONFIG_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--CONFIG_IDE=y
--CONFIG_IDE_MAX_HWIFS=4
--CONFIG_BLK_DEV_IDE=y
--
--#
--# Please see Documentation/ide/ide.txt for help/info on IDE drives
--#
--# CONFIG_BLK_DEV_IDE_SATA is not set
--# CONFIG_BLK_DEV_IDEDISK is not set
--# CONFIG_IDEDISK_MULTI_MODE is not set
--# CONFIG_BLK_DEV_IDECD is not set
--# CONFIG_BLK_DEV_IDETAPE is not set
--# CONFIG_BLK_DEV_IDEFLOPPY is not set
--# CONFIG_IDE_TASK_IOCTL is not set
--CONFIG_IDE_PROC_FS=y
--
--#
--# IDE chipset support/bugfixes
--#
--CONFIG_IDE_GENERIC=y
--# CONFIG_BLK_DEV_PLATFORM is not set
--CONFIG_BLK_DEV_IDEDMA_SFF=y
--
--#
--# PCI IDE chipsets support
--#
--CONFIG_BLK_DEV_IDEPCI=y
--CONFIG_IDEPCI_PCIBUS_ORDER=y
--# CONFIG_BLK_DEV_OFFBOARD is not set
--CONFIG_BLK_DEV_GENERIC=y
--# CONFIG_BLK_DEV_OPTI621 is not set
--CONFIG_BLK_DEV_IDEDMA_PCI=y
--# CONFIG_BLK_DEV_AEC62XX is not set
--# CONFIG_BLK_DEV_ALI15X3 is not set
--# CONFIG_BLK_DEV_AMD74XX is not set
--# CONFIG_BLK_DEV_CMD64X is not set
--# CONFIG_BLK_DEV_TRIFLEX is not set
--# CONFIG_BLK_DEV_CY82C693 is not set
--# CONFIG_BLK_DEV_CS5520 is not set
--# CONFIG_BLK_DEV_CS5530 is not set
--# CONFIG_BLK_DEV_HPT34X is not set
--# CONFIG_BLK_DEV_HPT366 is not set
--# CONFIG_BLK_DEV_JMICRON is not set
--# CONFIG_BLK_DEV_SC1200 is not set
--# CONFIG_BLK_DEV_PIIX is not set
--# CONFIG_BLK_DEV_IT8213 is not set
--# CONFIG_BLK_DEV_IT821X is not set
--# CONFIG_BLK_DEV_NS87415 is not set
--# CONFIG_BLK_DEV_PDC202XX_OLD is not set
--# CONFIG_BLK_DEV_PDC202XX_NEW is not set
--# CONFIG_BLK_DEV_SVWKS is not set
--# CONFIG_BLK_DEV_SIIMAGE is not set
--# CONFIG_BLK_DEV_SL82C105 is not set
--# CONFIG_BLK_DEV_SLC90E66 is not set
--# CONFIG_BLK_DEV_TRM290 is not set
--CONFIG_BLK_DEV_VIA82CXXX=y
--# CONFIG_BLK_DEV_TC86C001 is not set
--CONFIG_BLK_DEV_IDEDMA=y
--CONFIG_IDE_ARCH_OBSOLETE_INIT=y
--# CONFIG_BLK_DEV_HD is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--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 is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--# CONFIG_MARVELL_PHY is not set
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--CONFIG_E1000=y
--CONFIG_E1000_NAPI=y
--# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--CONFIG_GIANFAR=y
--CONFIG_GFAR_NAPI=y
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--CONFIG_SERIAL_8250_SHARE_IRQ=y
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--CONFIG_GEN_RTC=y
--# CONFIG_GEN_RTC_X is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--# CONFIG_I2C is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_I5K_AMB is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_IT87 is not set
--# CONFIG_SENSORS_PC87360 is not set
--# CONFIG_SENSORS_PC87427 is not set
--# CONFIG_SENSORS_SIS5595 is not set
--# CONFIG_SENSORS_SMSC47M1 is not set
--# CONFIG_SENSORS_SMSC47B397 is not set
--# CONFIG_SENSORS_VIA686A is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_VT8231 is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--# CONFIG_HWMON_DEBUG_CHIP is not set
--# CONFIG_THERMAL is not set
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=y
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--CONFIG_EXT3_FS=y
--CONFIG_EXT3_FS_XATTR=y
--# CONFIG_EXT3_FS_POSIX_ACL is not set
--# CONFIG_EXT3_FS_SECURITY is not set
--# CONFIG_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# CONFIG_AUTOFS_FS is not set
--# CONFIG_AUTOFS4_FS is not set
--# CONFIG_FUSE_FS is not set
--
--#
--# CD-ROM/DVD Filesystems
--#
--# CONFIG_ISO9660_FS is not set
--# CONFIG_UDF_FS is not set
--
--#
--# DOS/FAT/NT Filesystems
--#
--# CONFIG_MSDOS_FS is not set
--# CONFIG_VFAT_FS is not set
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
--
--#
--# Miscellaneous filesystems
--#
--# CONFIG_ADFS_FS is not set
--# CONFIG_AFFS_FS is not set
--# CONFIG_HFS_FS is not set
--# CONFIG_HFSPLUS_FS is not set
--# CONFIG_BEFS_FS is not set
--# CONFIG_BFS_FS is not set
--# CONFIG_EFS_FS is not set
--# CONFIG_CRAMFS is not set
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--# CONFIG_NFS_V3 is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--# CONFIG_MAC_PARTITION is not set
--# CONFIG_MSDOS_PARTITION is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# 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_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--CONFIG_DEBUG_MUTEXES=y
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_DEBUG_INFO is not set
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--# CONFIG_DEBUGGER is not set
--# CONFIG_BDI_SWITCH is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--# CONFIG_CRYPTO_SEQIV is not set
--# CONFIG_CRYPTO_MANAGER is not set
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--# CONFIG_CRYPTO_MD5 is not set
--# CONFIG_CRYPTO_SHA1 is not set
--# CONFIG_CRYPTO_SHA256 is not set
--# CONFIG_CRYPTO_SHA512 is not set
--# CONFIG_CRYPTO_WP512 is not set
--# CONFIG_CRYPTO_TGR192 is not set
--# CONFIG_CRYPTO_GF128MUL is not set
--# CONFIG_CRYPTO_ECB is not set
--# CONFIG_CRYPTO_CBC is not set
--# CONFIG_CRYPTO_PCBC is not set
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--# CONFIG_CRYPTO_DES is not set
--# CONFIG_CRYPTO_FCRYPT is not set
--# CONFIG_CRYPTO_BLOWFISH is not set
--# CONFIG_CRYPTO_TWOFISH is not set
--# CONFIG_CRYPTO_SERPENT is not set
--# CONFIG_CRYPTO_AES is not set
--# CONFIG_CRYPTO_CAST5 is not set
--# CONFIG_CRYPTO_CAST6 is not set
--# CONFIG_CRYPTO_TEA is not set
--# CONFIG_CRYPTO_ARC4 is not set
--# CONFIG_CRYPTO_KHAZAD is not set
--# CONFIG_CRYPTO_ANUBIS is not set
--# CONFIG_CRYPTO_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/pmac32_defconfig
-+++ b/arch/powerpc/configs/pmac32_defconfig
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
- # Linux kernel version: 2.6.25-rc6
--# Thu Mar 20 11:05:14 2008
-+# Thu Mar 27 13:56:21 2008
- #
- # CONFIG_PPC64 is not set
- 
-@@ -77,8 +77,6 @@ CONFIG_IKCONFIG_PROC=y
- CONFIG_LOG_BUF_SHIFT=14
- # CONFIG_CGROUPS is not set
- # CONFIG_GROUP_SCHED is not set
--# CONFIG_USER_SCHED is not set
--# CONFIG_CGROUP_SCHED is not set
- CONFIG_SYSFS_DEPRECATED=y
- CONFIG_SYSFS_DEPRECATED_V2=y
- # CONFIG_RELAY is not set
-@@ -272,7 +270,7 @@ CONFIG_PCI_SYSCALL=y
- # CONFIG_PCIEPORTBUS is not set
- CONFIG_ARCH_SUPPORTS_MSI=y
- # CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_LEGACY is not set
- # CONFIG_PCI_DEBUG is not set
- CONFIG_PCCARD=m
- # CONFIG_PCMCIA_DEBUG is not set
-@@ -1895,6 +1893,7 @@ CONFIG_PLIST=y
- CONFIG_HAS_IOMEM=y
- CONFIG_HAS_IOPORT=y
- CONFIG_HAS_DMA=y
-+CONFIG_HAVE_LMB=y
- 
- #
- # Kernel hacking
---- /dev/null
-+++ b/arch/powerpc/configs/ppc40x_defconfig
-@@ -0,0 +1,896 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc9
-+# Tue Apr 15 08:46:44 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+CONFIG_40x=y
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_4xx=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_NOT_COHERENT_CACHE=y
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+# CONFIG_DEFAULT_UIMAGE is not set
-+CONFIG_PPC_DCR_NATIVE=y
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_PPC_DCR=y
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+CONFIG_POSIX_MQUEUE=y
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+CONFIG_KALLSYMS_ALL=y
-+CONFIG_KALLSYMS_EXTRA_PASS=y
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=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 is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+CONFIG_LBD=y
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_AS=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="anticipatory"
-+CONFIG_CLASSIC_RCU=y
-+CONFIG_PPC4xx_PCI_EXPRESS=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_EP405=y
-+CONFIG_KILAUEA=y
-+CONFIG_MAKALU=y
-+CONFIG_WALNUT=y
-+CONFIG_XILINX_VIRTEX_GENERIC_BOARD=y
-+CONFIG_405GP=y
-+CONFIG_405EX=y
-+CONFIG_XILINX_VIRTEX=y
-+CONFIG_XILINX_VIRTEX_II_PRO=y
-+CONFIG_XILINX_VIRTEX_4_FX=y
-+CONFIG_IBM405_ERR77=y
-+CONFIG_IBM405_ERR51=y
-+# CONFIG_IPIC is not set
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+CONFIG_OF_RTC=y
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_MATH_EMULATION is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+CONFIG_RESOURCES_64BIT=y
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_FORCE_MAX_ZONEORDER=11
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_4xx_SOC=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+# CONFIG_PCI_LEGACY is not set
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_CONSISTENT_START=0xff100000
-+CONFIG_CONSISTENT_SIZE=0x00200000
-+CONFIG_BOOT_LOAD=0x00400000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+# CONFIG_IP_MULTICAST is not set
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_ARPD is not set
-+# CONFIG_SYN_COOKIES is not set
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_BEET is not set
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=y
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=y
-+CONFIG_PROC_EVENTS=y
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+CONFIG_MTD_OF_PARTS=y
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=m
-+CONFIG_MTD_BLOCK=m
-+# CONFIG_MTD_BLOCK_RO is not set
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+CONFIG_MTD_JEDECPROBE=y
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+# CONFIG_MTD_CFI_INTELEXT is not set
-+CONFIG_MTD_CFI_AMDSTD=y
-+# CONFIG_MTD_CFI_STAA is not set
-+CONFIG_MTD_CFI_UTIL=y
-+# CONFIG_MTD_RAM is not set
-+# CONFIG_MTD_ROM is not set
-+# CONFIG_MTD_ABSENT is not set
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+CONFIG_MTD_PHYSMAP_OF=y
-+# CONFIG_MTD_INTEL_VR_NOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_PMC551 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+# CONFIG_MTD_NAND is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+# CONFIG_BLK_DEV_LOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=35000
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+# CONFIG_XILINX_SYSACE is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+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 is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+# CONFIG_MII is not set
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+CONFIG_IBM_NEW_EMAC=y
-+CONFIG_IBM_NEW_EMAC_RXB=128
-+CONFIG_IBM_NEW_EMAC_TXB=64
-+CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
-+CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
-+CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
-+# CONFIG_IBM_NEW_EMAC_DEBUG is not set
-+CONFIG_IBM_NEW_EMAC_ZMII=y
-+CONFIG_IBM_NEW_EMAC_RGMII=y
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+CONFIG_IBM_NEW_EMAC_EMAC4=y
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+# CONFIG_INPUT is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+CONFIG_SERIAL_8250_EXTENDED=y
-+# CONFIG_SERIAL_8250_MANY_PORTS is not set
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-+# CONFIG_SERIAL_8250_RSA is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+CONFIG_SERIAL_OF_PLATFORM=y
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+CONFIG_XILINX_HWICAP=m
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+CONFIG_THERMAL=y
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+# CONFIG_DAB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+# CONFIG_EXT3_FS is not set
-+# CONFIG_EXT4DEV_FS is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+# CONFIG_MSDOS_FS is not set
-+# CONFIG_VFAT_FS is not set
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+# CONFIG_JFFS2_FS is not set
-+CONFIG_CRAMFS=y
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# 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_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+CONFIG_HAVE_LMB=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+CONFIG_DEBUG_FS=y
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+CONFIG_DEBUG_BUGVERBOSE=y
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+# CONFIG_DEBUGGER is not set
-+# CONFIG_VIRQ_DEBUG is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+CONFIG_CRYPTO_MD5=y
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=y
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=y
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/ppc44x_defconfig
-+++ b/arch/powerpc/configs/ppc44x_defconfig
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc2
--# Fri Feb 15 21:57:35 2008
-+# Linux kernel version: 2.6.25-rc6
-+# Sat Apr  5 09:35:48 2008
- #
- # CONFIG_PPC64 is not set
- 
-@@ -79,6 +79,7 @@ CONFIG_FAIR_GROUP_SCHED=y
- CONFIG_USER_SCHED=y
- # CONFIG_CGROUP_SCHED is not set
- CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
- # CONFIG_RELAY is not set
- # CONFIG_NAMESPACES is not set
- CONFIG_BLK_DEV_INITRD=y
-@@ -113,6 +114,7 @@ CONFIG_SLUB=y
- CONFIG_HAVE_OPROFILE=y
- # CONFIG_KPROBES is not set
- CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
- CONFIG_PROC_PAGE_MONITOR=y
- CONFIG_SLABINFO=y
- CONFIG_RT_MUTEXES=y
-@@ -143,7 +145,6 @@ CONFIG_DEFAULT_AS=y
- # CONFIG_DEFAULT_NOOP is not set
- CONFIG_DEFAULT_IOSCHED="anticipatory"
- CONFIG_CLASSIC_RCU=y
--# CONFIG_PREEMPT_RCU is not set
- CONFIG_PPC4xx_PCI_EXPRESS=y
- 
- #
-@@ -161,12 +162,15 @@ CONFIG_TAISHAN=y
- CONFIG_KATMAI=y
- CONFIG_RAINIER=y
- CONFIG_WARP=y
-+CONFIG_CANYONLANDS=y
-+CONFIG_YOSEMITE=y
- CONFIG_440EP=y
- CONFIG_440EPX=y
- CONFIG_440GRX=y
- CONFIG_440GP=y
- CONFIG_440GX=y
- CONFIG_440SPe=y
-+CONFIG_460EX=y
- CONFIG_IBM440EP_ERR42=y
- # CONFIG_IPIC is not set
- # CONFIG_MPIC is not set
-@@ -199,7 +203,6 @@ CONFIG_HZ=250
- CONFIG_PREEMPT_NONE=y
- # CONFIG_PREEMPT_VOLUNTARY is not set
- # CONFIG_PREEMPT is not set
--# CONFIG_RCU_TRACE is not set
- CONFIG_BINFMT_ELF=y
- # CONFIG_BINFMT_MISC is not set
- CONFIG_MATH_EMULATION=y
-@@ -232,6 +235,7 @@ CONFIG_ISA_DMA_API=y
- #
- CONFIG_ZONE_DMA=y
- CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_4xx_SOC=y
- CONFIG_PCI=y
- CONFIG_PCI_DOMAINS=y
- CONFIG_PCI_SYSCALL=y
-@@ -678,6 +682,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
- # CONFIG_INFINIBAND is not set
- # CONFIG_EDAC is not set
- # CONFIG_RTC_CLASS is not set
-+# CONFIG_DMADEVICES is not set
- 
- #
- # Userspace I/O
-@@ -805,6 +810,7 @@ CONFIG_PLIST=y
- CONFIG_HAS_IOMEM=y
- CONFIG_HAS_IOPORT=y
- CONFIG_HAS_DMA=y
-+CONFIG_HAVE_LMB=y
- 
- #
- # Kernel hacking
---- a/arch/powerpc/configs/ppc64_defconfig
-+++ b/arch/powerpc/configs/ppc64_defconfig
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
- # Linux kernel version: 2.6.25-rc6
--# Thu Mar 20 11:06:28 2008
-+# Thu Mar 27 13:56:24 2008
- #
- CONFIG_PPC64=y
- 
-@@ -84,8 +84,6 @@ CONFIG_CGROUPS=y
- # CONFIG_CGROUP_NS is not set
- CONFIG_CPUSETS=y
- # CONFIG_GROUP_SCHED is not set
--# CONFIG_USER_SCHED is not set
--# CONFIG_CGROUP_SCHED is not set
- # CONFIG_CGROUP_CPUACCT is not set
- # CONFIG_RESOURCE_COUNTERS is not set
- CONFIG_SYSFS_DEPRECATED=y
-@@ -289,6 +287,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
- CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
- CONFIG_KEXEC=y
- # CONFIG_CRASH_DUMP is not set
-+# CONFIG_PHYP_DUMP is not set
- CONFIG_IRQ_ALL_CPUS=y
- # CONFIG_NUMA is not set
- CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-@@ -335,7 +334,7 @@ CONFIG_PCI_SYSCALL=y
- # CONFIG_PCIEPORTBUS is not set
- CONFIG_ARCH_SUPPORTS_MSI=y
- CONFIG_PCI_MSI=y
--CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_LEGACY is not set
- # CONFIG_PCI_DEBUG is not set
- CONFIG_PCCARD=y
- # CONFIG_PCMCIA_DEBUG is not set
-@@ -1881,6 +1880,7 @@ CONFIG_PLIST=y
- CONFIG_HAS_IOMEM=y
- CONFIG_HAS_IOPORT=y
- CONFIG_HAS_DMA=y
-+CONFIG_HAVE_LMB=y
- 
- #
- # Kernel hacking
---- a/arch/powerpc/configs/pseries_defconfig
-+++ b/arch/powerpc/configs/pseries_defconfig
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
- # Linux kernel version: 2.6.25-rc6
--# Thu Mar 20 11:08:01 2008
-+# Thu Mar 27 13:56:28 2008
- #
- CONFIG_PPC64=y
- 
-@@ -83,8 +83,6 @@ CONFIG_CGROUPS=y
- CONFIG_CGROUP_NS=y
- CONFIG_CPUSETS=y
- # CONFIG_GROUP_SCHED is not set
--# CONFIG_USER_SCHED is not set
--# CONFIG_CGROUP_SCHED is not set
- CONFIG_CGROUP_CPUACCT=y
- # CONFIG_RESOURCE_COUNTERS is not set
- CONFIG_SYSFS_DEPRECATED=y
-@@ -237,6 +235,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
- CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
- CONFIG_KEXEC=y
- # CONFIG_CRASH_DUMP is not set
-+# CONFIG_PHYP_DUMP is not set
- CONFIG_IRQ_ALL_CPUS=y
- CONFIG_NUMA=y
- CONFIG_NODES_SHIFT=4
-@@ -283,7 +282,7 @@ CONFIG_PCI_SYSCALL=y
- # CONFIG_PCIEPORTBUS is not set
- CONFIG_ARCH_SUPPORTS_MSI=y
- CONFIG_PCI_MSI=y
--CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_LEGACY is not set
- # CONFIG_PCI_DEBUG is not set
- # CONFIG_PCCARD is not set
- CONFIG_HOTPLUG_PCI=m
-@@ -1519,6 +1518,7 @@ CONFIG_PLIST=y
- CONFIG_HAS_IOMEM=y
- CONFIG_HAS_IOPORT=y
- CONFIG_HAS_DMA=y
-+CONFIG_HAVE_LMB=y
- 
- #
- # Kernel hacking
---- a/arch/powerpc/configs/rainier_defconfig
-+++ /dev/null
-@@ -1,899 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc2
--# Fri Feb 15 21:53:10 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--CONFIG_44x=y
--# CONFIG_E200 is not set
--CONFIG_4xx=y
--CONFIG_BOOKE=y
--CONFIG_PTE_64BIT=y
--CONFIG_PHYS_64BIT=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_NOT_COHERENT_CACHE=y
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--# CONFIG_DEFAULT_UIMAGE is not set
--CONFIG_PPC_DCR_NATIVE=y
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_PPC_DCR=y
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--CONFIG_POSIX_MQUEUE=y
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--CONFIG_FAIR_GROUP_SCHED=y
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--CONFIG_KALLSYMS=y
--# CONFIG_KALLSYMS_ALL is not set
--# CONFIG_KALLSYMS_EXTRA_PASS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=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 is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--# CONFIG_KPROBES is not set
--CONFIG_HAVE_KPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--CONFIG_KMOD=y
--CONFIG_BLOCK=y
--CONFIG_LBD=y
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--CONFIG_DEFAULT_AS=y
--# CONFIG_DEFAULT_DEADLINE is not set
--# CONFIG_DEFAULT_CFQ is not set
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="anticipatory"
--CONFIG_CLASSIC_RCU=y
--# CONFIG_PREEMPT_RCU is not set
--# CONFIG_PPC4xx_PCI_EXPRESS is not set
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--# CONFIG_BAMBOO is not set
--# CONFIG_EBONY is not set
--# CONFIG_SEQUOIA is not set
--# CONFIG_TAISHAN is not set
--# CONFIG_KATMAI is not set
--CONFIG_RAINIER=y
--# CONFIG_WARP is not set
--CONFIG_440GRX=y
--# CONFIG_IPIC is not set
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_RCU_TRACE=y
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--CONFIG_MATH_EMULATION=y
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--CONFIG_RESOURCES_64BIT=y
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--CONFIG_CMDLINE_BOOL=y
--CONFIG_CMDLINE=""
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCI_DEBUG is not set
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_CONSISTENT_START=0xff100000
--CONFIG_CONSISTENT_SIZE=0x00200000
--CONFIG_BOOT_LOAD=0x01000000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--# CONFIG_IP_MULTICAST is not set
--# CONFIG_IP_ADVANCED_ROUTER is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_PNP=y
--CONFIG_IP_PNP_DHCP=y
--CONFIG_IP_PNP_BOOTP=y
--# CONFIG_IP_PNP_RARP is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_ARPD is not set
--# CONFIG_SYN_COOKIES is not set
--# CONFIG_INET_AH is not set
--# CONFIG_INET_ESP is not set
--# CONFIG_INET_IPCOMP is not set
--# CONFIG_INET_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
--# CONFIG_INET_XFRM_MODE_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_BEET is not set
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--# CONFIG_BRIDGE is not set
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--# CONFIG_LLC2 is not set
--# CONFIG_IPX is not set
--# CONFIG_ATALK is not set
--# CONFIG_X25 is not set
--# CONFIG_LAPB is not set
--# CONFIG_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--CONFIG_FW_LOADER=y
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--CONFIG_CONNECTOR=y
--CONFIG_PROC_EVENTS=y
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--# CONFIG_MTD_CONCAT is not set
--CONFIG_MTD_PARTITIONS=y
--# CONFIG_MTD_REDBOOT_PARTS is not set
--CONFIG_MTD_CMDLINE_PARTS=y
--CONFIG_MTD_OF_PARTS=y
--
--#
--# User Modules And Translation Layers
--#
--CONFIG_MTD_CHAR=y
--# CONFIG_MTD_BLKDEVS is not set
--# CONFIG_MTD_BLOCK is not set
--# CONFIG_MTD_BLOCK_RO is not set
--# CONFIG_FTL is not set
--# CONFIG_NFTL is not set
--# CONFIG_INFTL is not set
--# CONFIG_RFD_FTL is not set
--# CONFIG_SSFDC is not set
--# CONFIG_MTD_OOPS is not set
--
--#
--# RAM/ROM/Flash chip drivers
--#
--CONFIG_MTD_CFI=y
--CONFIG_MTD_JEDECPROBE=y
--CONFIG_MTD_GEN_PROBE=y
--# CONFIG_MTD_CFI_ADV_OPTIONS is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--CONFIG_MTD_MAP_BANK_WIDTH_4=y
--# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
--CONFIG_MTD_CFI_I1=y
--CONFIG_MTD_CFI_I2=y
--# CONFIG_MTD_CFI_I4 is not set
--# CONFIG_MTD_CFI_I8 is not set
--CONFIG_MTD_CFI_INTELEXT=y
--CONFIG_MTD_CFI_AMDSTD=y
--# CONFIG_MTD_CFI_STAA is not set
--CONFIG_MTD_CFI_UTIL=y
--# CONFIG_MTD_RAM is not set
--# CONFIG_MTD_ROM is not set
--# CONFIG_MTD_ABSENT is not set
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--# CONFIG_MTD_PHYSMAP is not set
--CONFIG_MTD_PHYSMAP_OF=y
--# CONFIG_MTD_INTEL_VR_NOR is not set
--# CONFIG_MTD_PLATRAM is not set
--
--#
--# Self-contained MTD device drivers
--#
--# CONFIG_MTD_PMC551 is not set
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_MTDRAM is not set
--# CONFIG_MTD_BLOCK2MTD is not set
--
--#
--# Disk-On-Chip Device Drivers
--#
--# CONFIG_MTD_DOC2000 is not set
--# CONFIG_MTD_DOC2001 is not set
--# CONFIG_MTD_DOC2001PLUS is not set
--# CONFIG_MTD_NAND is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--# CONFIG_BLK_DEV_LOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=35000
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--# CONFIG_XILINX_SYSACE is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--CONFIG_MACINTOSH_DRIVERS=y
--# CONFIG_MAC_EMUMOUSEBTN is not set
--# CONFIG_WINDFARM is not set
--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 is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--# CONFIG_NET_ETHERNET is not set
--CONFIG_IBM_NEW_EMAC_ZMII=y
--CONFIG_IBM_NEW_EMAC_RGMII=y
--CONFIG_IBM_NEW_EMAC_EMAC4=y
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--# CONFIG_INPUT is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--# CONFIG_SERIAL_8250_PCI is not set
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--CONFIG_SERIAL_8250_EXTENDED=y
--# CONFIG_SERIAL_8250_MANY_PORTS is not set
--CONFIG_SERIAL_8250_SHARE_IRQ=y
--# CONFIG_SERIAL_8250_DETECT_IRQ is not set
--# CONFIG_SERIAL_8250_RSA is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--CONFIG_SERIAL_OF_PLATFORM=y
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--# CONFIG_I2C is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--# CONFIG_HWMON is not set
--CONFIG_THERMAL=y
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=m
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--# CONFIG_EXT3_FS is not set
--# CONFIG_EXT4DEV_FS is not set
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# CONFIG_AUTOFS_FS is not set
--# CONFIG_AUTOFS4_FS is not set
--# CONFIG_FUSE_FS is not set
--
--#
--# CD-ROM/DVD Filesystems
--#
--# CONFIG_ISO9660_FS is not set
--# CONFIG_UDF_FS is not set
--
--#
--# DOS/FAT/NT Filesystems
--#
--# CONFIG_MSDOS_FS is not set
--# CONFIG_VFAT_FS is not set
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
--
--#
--# Miscellaneous filesystems
--#
--# CONFIG_ADFS_FS is not set
--# CONFIG_AFFS_FS is not set
--# CONFIG_HFS_FS is not set
--# CONFIG_HFSPLUS_FS is not set
--# CONFIG_BEFS_FS is not set
--# CONFIG_BFS_FS is not set
--# CONFIG_EFS_FS is not set
--CONFIG_JFFS2_FS=y
--CONFIG_JFFS2_FS_DEBUG=0
--CONFIG_JFFS2_FS_WRITEBUFFER=y
--# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
--# CONFIG_JFFS2_SUMMARY is not set
--# CONFIG_JFFS2_FS_XATTR is not set
--# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
--CONFIG_JFFS2_ZLIB=y
--# CONFIG_JFFS2_LZO is not set
--CONFIG_JFFS2_RTIME=y
--# CONFIG_JFFS2_RUBIN is not set
--CONFIG_CRAMFS=y
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--# CONFIG_PARTITION_ADVANCED is not set
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# 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
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--CONFIG_MAGIC_SYSRQ=y
--# CONFIG_UNUSED_SYMBOLS is not set
--CONFIG_DEBUG_FS=y
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_DEBUG_INFO is not set
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--CONFIG_DEBUGGER=y
--# CONFIG_KGDB is not set
--# CONFIG_XMON is not set
--# CONFIG_VIRQ_DEBUG is not set
--# CONFIG_BDI_SWITCH is not set
--CONFIG_PPC_EARLY_DEBUG=y
--# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
--# CONFIG_PPC_EARLY_DEBUG_G5 is not set
--# CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL is not set
--# CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set
--# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
--# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
--# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
--# CONFIG_PPC_EARLY_DEBUG_BEAT is not set
--CONFIG_PPC_EARLY_DEBUG_44x=y
--# CONFIG_PPC_EARLY_DEBUG_40x is not set
--# CONFIG_PPC_EARLY_DEBUG_CPM is not set
--CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0xef600300
--CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x1
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--CONFIG_CRYPTO_MD5=y
--# CONFIG_CRYPTO_SHA1 is not set
--# CONFIG_CRYPTO_SHA256 is not set
--# CONFIG_CRYPTO_SHA512 is not set
--# CONFIG_CRYPTO_WP512 is not set
--# CONFIG_CRYPTO_TGR192 is not set
--# CONFIG_CRYPTO_GF128MUL is not set
--CONFIG_CRYPTO_ECB=y
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=y
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# CONFIG_CRYPTO_BLOWFISH is not set
--# CONFIG_CRYPTO_TWOFISH is not set
--# CONFIG_CRYPTO_SERPENT is not set
--# CONFIG_CRYPTO_AES is not set
--# CONFIG_CRYPTO_CAST5 is not set
--# CONFIG_CRYPTO_CAST6 is not set
--# CONFIG_CRYPTO_TEA is not set
--# CONFIG_CRYPTO_ARC4 is not set
--# CONFIG_CRYPTO_KHAZAD is not set
--# CONFIG_CRYPTO_ANUBIS is not set
--# CONFIG_CRYPTO_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/sbc834x_defconfig
-+++ /dev/null
-@@ -1,828 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:38 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--CONFIG_6xx=y
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_PPC_FPU=y
--# CONFIG_FSL_EMB_PERFMON is not set
--CONFIG_PPC_STD_MMU=y
--CONFIG_PPC_STD_MMU_32=y
--# CONFIG_PPC_MM_SLICES is not set
--# CONFIG_SMP is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--CONFIG_FAIR_GROUP_SCHED=y
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--# CONFIG_KALLSYMS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--# CONFIG_EPOLL is not set
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLAB=y
--# CONFIG_SLUB is not set
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--# CONFIG_KMOD is not set
--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
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--CONFIG_DEFAULT_AS=y
--# CONFIG_DEFAULT_DEADLINE is not set
--# CONFIG_DEFAULT_CFQ is not set
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="anticipatory"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MULTIPLATFORM is not set
--# CONFIG_PPC_82xx is not set
--CONFIG_PPC_83xx=y
--# CONFIG_PPC_86xx is not set
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC83xx=y
--# CONFIG_MPC831x_RDB is not set
--# CONFIG_MPC832x_MDS is not set
--# CONFIG_MPC832x_RDB is not set
--# CONFIG_MPC834x_MDS is not set
--# CONFIG_MPC834x_ITX is not set
--# CONFIG_MPC836x_MDS is not set
--# CONFIG_MPC837x_MDS is not set
--# CONFIG_MPC837x_RDB is not set
--CONFIG_SBC834x=y
--CONFIG_PPC_MPC834x=y
--CONFIG_IPIC=y
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_GENERIC_ISA_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--# CONFIG_PCI is not set
--# CONFIG_PCI_DOMAINS is not set
--# CONFIG_PCI_SYSCALL is not set
--# CONFIG_ARCH_SUPPORTS_MSI is not set
--# CONFIG_PCCARD is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--CONFIG_XFRM_USER=m
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# CONFIG_IP_ADVANCED_ROUTER is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_PNP=y
--CONFIG_IP_PNP_DHCP=y
--CONFIG_IP_PNP_BOOTP=y
--# CONFIG_IP_PNP_RARP is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# CONFIG_INET_AH is not set
--# CONFIG_INET_ESP is not set
--# CONFIG_INET_IPCOMP is not set
--# CONFIG_INET_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--CONFIG_INET_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--# CONFIG_BRIDGE is not set
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--# CONFIG_LLC2 is not set
--# CONFIG_IPX is not set
--# CONFIG_ATALK is not set
--# CONFIG_X25 is not set
--# CONFIG_LAPB is not set
--# CONFIG_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--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 is not set
--# CONFIG_VETH is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--# CONFIG_MARVELL_PHY is not set
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--CONFIG_BROADCOM_PHY=y
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_E1000E_ENABLED is not set
--CONFIG_GIANFAR=y
--# CONFIG_GFAR_NAPI is not set
--# CONFIG_NETDEV_10000 is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--CONFIG_GEN_RTC=y
--# CONFIG_GEN_RTC_X is not set
--# CONFIG_R3964 is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=y
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--CONFIG_I2C_MPC=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
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 is not set
--# CONFIG_I2C_DEBUG_CORE is not set
--# CONFIG_I2C_DEBUG_ALGO is not set
--# CONFIG_I2C_DEBUG_BUS is not set
--# CONFIG_I2C_DEBUG_CHIP is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_AD7418 is not set
--# CONFIG_SENSORS_ADM1021 is not set
--# CONFIG_SENSORS_ADM1025 is not set
--# CONFIG_SENSORS_ADM1026 is not set
--# CONFIG_SENSORS_ADM1029 is not set
--# CONFIG_SENSORS_ADM1031 is not set
--# CONFIG_SENSORS_ADM9240 is not set
--# CONFIG_SENSORS_ADT7470 is not set
--# CONFIG_SENSORS_ADT7473 is not set
--# CONFIG_SENSORS_ATXP1 is not set
--# CONFIG_SENSORS_DS1621 is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_F75375S is not set
--# CONFIG_SENSORS_GL518SM is not set
--# CONFIG_SENSORS_GL520SM is not set
--# CONFIG_SENSORS_IT87 is not set
--# CONFIG_SENSORS_LM63 is not set
--# CONFIG_SENSORS_LM75 is not set
--# CONFIG_SENSORS_LM77 is not set
--# CONFIG_SENSORS_LM78 is not set
--# CONFIG_SENSORS_LM80 is not set
--# CONFIG_SENSORS_LM83 is not set
--# CONFIG_SENSORS_LM85 is not set
--# 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_ADS7828 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
--# CONFIG_SENSORS_W83792D is not set
--# CONFIG_SENSORS_W83793 is not set
--# CONFIG_SENSORS_W83L785TS is not set
--# CONFIG_SENSORS_W83L786NG is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--# CONFIG_HWMON_DEBUG_CHIP is not set
--# CONFIG_THERMAL is not set
--CONFIG_WATCHDOG=y
--# CONFIG_WATCHDOG_NOWAYOUT is not set
--
--#
--# Watchdog Device Drivers
--#
--# CONFIG_SOFT_WATCHDOG is not set
--CONFIG_83xx_WDT=y
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--# CONFIG_DAB is not set
--
--#
--# Graphics support
--#
--# CONFIG_VGASTATE is not set
--# CONFIG_VIDEO_OUTPUT_CONTROL is not set
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--# CONFIG_USB_SUPPORT is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--# CONFIG_EXT2_FS is not set
--# CONFIG_EXT3_FS is not set
--# CONFIG_EXT4DEV_FS is not set
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# CONFIG_AUTOFS_FS is not set
--# CONFIG_AUTOFS4_FS is not set
--# CONFIG_FUSE_FS is not set
--
--#
--# CD-ROM/DVD Filesystems
--#
--# CONFIG_ISO9660_FS is not set
--# CONFIG_UDF_FS is not set
--
--#
--# DOS/FAT/NT Filesystems
--#
--# CONFIG_MSDOS_FS is not set
--# CONFIG_VFAT_FS is not set
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
--
--#
--# Miscellaneous filesystems
--#
--# CONFIG_ADFS_FS is not set
--# CONFIG_AFFS_FS is not set
--# CONFIG_HFS_FS is not set
--# CONFIG_HFSPLUS_FS is not set
--# CONFIG_BEFS_FS is not set
--# CONFIG_BFS_FS is not set
--# CONFIG_EFS_FS is not set
--# CONFIG_CRAMFS is not set
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--CONFIG_NFS_V4=y
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--CONFIG_SUNRPC_GSS=y
--# CONFIG_SUNRPC_BIND34 is not set
--CONFIG_RPCSEC_GSS_KRB5=y
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--# CONFIG_PARTITION_ADVANCED is not set
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# 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_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--# CONFIG_DEBUG_KERNEL is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--CONFIG_CRYPTO_MD5=y
--# CONFIG_CRYPTO_SHA1 is not set
--# CONFIG_CRYPTO_SHA256 is not set
--# CONFIG_CRYPTO_SHA512 is not set
--# CONFIG_CRYPTO_WP512 is not set
--# CONFIG_CRYPTO_TGR192 is not set
--# CONFIG_CRYPTO_GF128MUL is not set
--CONFIG_CRYPTO_ECB=m
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# CONFIG_CRYPTO_BLOWFISH is not set
--# CONFIG_CRYPTO_TWOFISH is not set
--# CONFIG_CRYPTO_SERPENT is not set
--# CONFIG_CRYPTO_AES is not set
--# CONFIG_CRYPTO_CAST5 is not set
--# CONFIG_CRYPTO_CAST6 is not set
--# CONFIG_CRYPTO_TEA is not set
--# CONFIG_CRYPTO_ARC4 is not set
--# CONFIG_CRYPTO_KHAZAD is not set
--# CONFIG_CRYPTO_ANUBIS is not set
--# CONFIG_CRYPTO_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--# CONFIG_CRYPTO_HW is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/sbc8548_defconfig
-+++ /dev/null
-@@ -1,812 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:39 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--CONFIG_PPC_85xx=y
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_E500=y
--CONFIG_BOOKE=y
--CONFIG_FSL_BOOKE=y
--CONFIG_FSL_EMB_PERFMON=y
--# CONFIG_PHYS_64BIT is not set
--CONFIG_SPE=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--CONFIG_FAIR_GROUP_SCHED=y
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--CONFIG_KALLSYMS=y
--# CONFIG_KALLSYMS_EXTRA_PASS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=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_SLAB=y
--# CONFIG_SLUB is not set
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--# CONFIG_MODULES is not set
--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
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--CONFIG_DEFAULT_AS=y
--# CONFIG_DEFAULT_DEADLINE is not set
--# CONFIG_DEFAULT_CFQ is not set
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="anticipatory"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC85xx=y
--# CONFIG_MPC8540_ADS is not set
--# CONFIG_MPC8560_ADS is not set
--# CONFIG_MPC85xx_CDS is not set
--# CONFIG_MPC85xx_MDS is not set
--# CONFIG_MPC85xx_DS is not set
--# CONFIG_STX_GP3 is not set
--# CONFIG_TQM8540 is not set
--# CONFIG_TQM8541 is not set
--# CONFIG_TQM8555 is not set
--# CONFIG_TQM8560 is not set
--CONFIG_SBC8548=y
--# CONFIG_SBC8560 is not set
--# CONFIG_IPIC is not set
--CONFIG_MPIC=y
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_CPM2 is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--CONFIG_BINFMT_MISC=y
--CONFIG_MATH_EMULATION=y
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--# CONFIG_SECCOMP is not set
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_FSL_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--CONFIG_XFRM_USER=y
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# CONFIG_IP_ADVANCED_ROUTER is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_PNP=y
--CONFIG_IP_PNP_DHCP=y
--CONFIG_IP_PNP_BOOTP=y
--# CONFIG_IP_PNP_RARP is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# CONFIG_INET_AH is not set
--# CONFIG_INET_ESP is not set
--# CONFIG_INET_IPCOMP is not set
--# CONFIG_INET_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--CONFIG_INET_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--# CONFIG_BRIDGE is not set
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--# CONFIG_LLC2 is not set
--# CONFIG_IPX is not set
--# CONFIG_ATALK is not set
--# CONFIG_X25 is not set
--# CONFIG_LAPB is not set
--# CONFIG_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=4096
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--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 is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--# CONFIG_MARVELL_PHY is not set
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--CONFIG_BROADCOM_PHY=y
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--CONFIG_GIANFAR=y
--CONFIG_GFAR_NAPI=y
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--CONFIG_SERIAL_8250_SHARE_IRQ=y
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--CONFIG_GEN_RTC=y
--# CONFIG_GEN_RTC_X is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--# CONFIG_I2C is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_I5K_AMB is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_IT87 is not set
--# CONFIG_SENSORS_PC87360 is not set
--# CONFIG_SENSORS_PC87427 is not set
--# CONFIG_SENSORS_SIS5595 is not set
--# CONFIG_SENSORS_SMSC47M1 is not set
--# CONFIG_SENSORS_SMSC47B397 is not set
--# CONFIG_SENSORS_VIA686A is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_VT8231 is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--# CONFIG_HWMON_DEBUG_CHIP is not set
--# CONFIG_THERMAL is not set
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=y
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--# CONFIG_HID_SUPPORT is not set
--# CONFIG_USB_SUPPORT is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--# CONFIG_EXT2_FS is not set
--# CONFIG_EXT3_FS is not set
--# CONFIG_EXT4DEV_FS is not set
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# CONFIG_AUTOFS_FS is not set
--# CONFIG_AUTOFS4_FS is not set
--# CONFIG_FUSE_FS is not set
--
--#
--# CD-ROM/DVD Filesystems
--#
--# CONFIG_ISO9660_FS is not set
--# CONFIG_UDF_FS is not set
--
--#
--# DOS/FAT/NT Filesystems
--#
--# CONFIG_MSDOS_FS is not set
--# CONFIG_VFAT_FS is not set
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
--
--#
--# Miscellaneous filesystems
--#
--# CONFIG_ADFS_FS is not set
--# CONFIG_AFFS_FS is not set
--# CONFIG_HFS_FS is not set
--# CONFIG_HFSPLUS_FS is not set
--# CONFIG_BEFS_FS is not set
--# CONFIG_BFS_FS is not set
--# CONFIG_EFS_FS is not set
--# CONFIG_CRAMFS is not set
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--# CONFIG_NFS_V3 is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--# CONFIG_PARTITION_ADVANCED is not set
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# 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_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--# CONFIG_DEBUG_KERNEL is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--# CONFIG_CRYPTO_SEQIV is not set
--# CONFIG_CRYPTO_MANAGER is not set
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--# CONFIG_CRYPTO_MD5 is not set
--# CONFIG_CRYPTO_SHA1 is not set
--# CONFIG_CRYPTO_SHA256 is not set
--# CONFIG_CRYPTO_SHA512 is not set
--# CONFIG_CRYPTO_WP512 is not set
--# CONFIG_CRYPTO_TGR192 is not set
--# CONFIG_CRYPTO_GF128MUL is not set
--# CONFIG_CRYPTO_ECB is not set
--# CONFIG_CRYPTO_CBC is not set
--# CONFIG_CRYPTO_PCBC is not set
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--# CONFIG_CRYPTO_DES is not set
--# CONFIG_CRYPTO_FCRYPT is not set
--# CONFIG_CRYPTO_BLOWFISH is not set
--# CONFIG_CRYPTO_TWOFISH is not set
--# CONFIG_CRYPTO_SERPENT is not set
--# CONFIG_CRYPTO_AES is not set
--# CONFIG_CRYPTO_CAST5 is not set
--# CONFIG_CRYPTO_CAST6 is not set
--# CONFIG_CRYPTO_TEA is not set
--# CONFIG_CRYPTO_ARC4 is not set
--# CONFIG_CRYPTO_KHAZAD is not set
--# CONFIG_CRYPTO_ANUBIS is not set
--# CONFIG_CRYPTO_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/sbc8560_defconfig
-+++ /dev/null
-@@ -1,830 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:39 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--CONFIG_PPC_85xx=y
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_E500=y
--CONFIG_BOOKE=y
--CONFIG_FSL_BOOKE=y
--CONFIG_FSL_EMB_PERFMON=y
--# CONFIG_PHYS_64BIT is not set
--CONFIG_SPE=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--CONFIG_FAIR_GROUP_SCHED=y
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--CONFIG_KALLSYMS=y
--# CONFIG_KALLSYMS_ALL is not set
--# CONFIG_KALLSYMS_EXTRA_PASS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=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_SLAB=y
--# CONFIG_SLUB is not set
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--# CONFIG_MODULES is not set
--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
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--CONFIG_DEFAULT_AS=y
--# CONFIG_DEFAULT_DEADLINE is not set
--# CONFIG_DEFAULT_CFQ is not set
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="anticipatory"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC85xx=y
--# CONFIG_MPC8540_ADS is not set
--# CONFIG_MPC8560_ADS is not set
--# CONFIG_MPC85xx_CDS is not set
--# CONFIG_MPC85xx_MDS is not set
--# CONFIG_MPC85xx_DS is not set
--# CONFIG_STX_GP3 is not set
--# CONFIG_TQM8540 is not set
--# CONFIG_TQM8541 is not set
--# CONFIG_TQM8555 is not set
--# CONFIG_TQM8560 is not set
--# CONFIG_SBC8548 is not set
--CONFIG_SBC8560=y
--# CONFIG_IPIC is not set
--CONFIG_MPIC=y
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_CPM2 is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--CONFIG_BINFMT_MISC=y
--# CONFIG_MATH_EMULATION is not set
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--# CONFIG_SECCOMP is not set
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_FSL_SOC=y
--# CONFIG_PCI is not set
--# CONFIG_PCI_DOMAINS is not set
--# CONFIG_PCI_SYSCALL is not set
--# CONFIG_ARCH_SUPPORTS_MSI is not set
--# CONFIG_PCCARD is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--CONFIG_XFRM_USER=y
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# CONFIG_IP_ADVANCED_ROUTER is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_PNP=y
--CONFIG_IP_PNP_DHCP=y
--CONFIG_IP_PNP_BOOTP=y
--# CONFIG_IP_PNP_RARP is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# CONFIG_INET_AH is not set
--# CONFIG_INET_ESP is not set
--# CONFIG_INET_IPCOMP is not set
--# CONFIG_INET_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--CONFIG_INET_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--# CONFIG_BRIDGE is not set
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--# CONFIG_LLC2 is not set
--# CONFIG_IPX is not set
--# CONFIG_ATALK is not set
--# CONFIG_X25 is not set
--# CONFIG_LAPB is not set
--# CONFIG_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--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 is not set
--# CONFIG_VETH is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--# CONFIG_MARVELL_PHY is not set
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--CONFIG_BROADCOM_PHY=y
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_E1000E_ENABLED is not set
--CONFIG_GIANFAR=y
--CONFIG_GFAR_NAPI=y
--CONFIG_NETDEV_10000=y
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_NR_UARTS=2
--CONFIG_SERIAL_8250_RUNTIME_UARTS=2
--# CONFIG_SERIAL_8250_EXTENDED is not set
--CONFIG_SERIAL_8250_SHARE_IRQ=y
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--# CONFIG_I2C is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_IT87 is not set
--# CONFIG_SENSORS_PC87360 is not set
--# CONFIG_SENSORS_PC87427 is not set
--# CONFIG_SENSORS_SMSC47M1 is not set
--# CONFIG_SENSORS_SMSC47B397 is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--# CONFIG_HWMON_DEBUG_CHIP is not set
--# CONFIG_THERMAL is not set
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=y
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--CONFIG_USB_SUPPORT=y
--# CONFIG_USB_ARCH_HAS_HCD is not set
--# CONFIG_USB_ARCH_HAS_OHCI is not set
--# CONFIG_USB_ARCH_HAS_EHCI is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_EDAC is not set
--CONFIG_RTC_LIB=y
--CONFIG_RTC_CLASS=y
--CONFIG_RTC_HCTOSYS=y
--CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
--# CONFIG_RTC_DEBUG is not set
--
--#
--# RTC interfaces
--#
--CONFIG_RTC_INTF_SYSFS=y
--CONFIG_RTC_INTF_PROC=y
--CONFIG_RTC_INTF_DEV=y
--# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
--# CONFIG_RTC_DRV_TEST is not set
--
--#
--# SPI RTC drivers
--#
--
--#
--# Platform RTC drivers
--#
--# CONFIG_RTC_DRV_CMOS is not set
--# CONFIG_RTC_DRV_DS1511 is not set
--# CONFIG_RTC_DRV_DS1553 is not set
--# CONFIG_RTC_DRV_DS1742 is not set
--# CONFIG_RTC_DRV_STK17TA8 is not set
--# CONFIG_RTC_DRV_M48T86 is not set
--CONFIG_RTC_DRV_M48T59=y
--# CONFIG_RTC_DRV_V3020 is not set
--
--#
--# on-CPU RTC drivers
--#
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--# CONFIG_EXT2_FS is not set
--# CONFIG_EXT3_FS is not set
--# CONFIG_EXT4DEV_FS is not set
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# CONFIG_AUTOFS_FS is not set
--# CONFIG_AUTOFS4_FS is not set
--# CONFIG_FUSE_FS is not set
--
--#
--# CD-ROM/DVD Filesystems
--#
--# CONFIG_ISO9660_FS is not set
--# CONFIG_UDF_FS is not set
--
--#
--# DOS/FAT/NT Filesystems
--#
--# CONFIG_MSDOS_FS is not set
--# CONFIG_VFAT_FS is not set
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
--
--#
--# Miscellaneous filesystems
--#
--# CONFIG_ADFS_FS is not set
--# CONFIG_AFFS_FS is not set
--# CONFIG_HFS_FS is not set
--# CONFIG_HFSPLUS_FS is not set
--# CONFIG_BEFS_FS is not set
--# CONFIG_BFS_FS is not set
--# CONFIG_EFS_FS is not set
--# CONFIG_CRAMFS is not set
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--# CONFIG_NFS_V3 is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--# CONFIG_MAC_PARTITION is not set
--# CONFIG_MSDOS_PARTITION is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# 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_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--CONFIG_MAGIC_SYSRQ=y
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_DEBUG_SLAB is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--CONFIG_DEBUG_MUTEXES=y
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_DEBUG_INFO is not set
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--# CONFIG_DEBUGGER is not set
--# CONFIG_BDI_SWITCH is not set
--CONFIG_PPC_EARLY_DEBUG=y
--# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
--# CONFIG_PPC_EARLY_DEBUG_G5 is not set
--# CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL is not set
--# CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set
--# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
--# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
--# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
--# CONFIG_PPC_EARLY_DEBUG_BEAT is not set
--# CONFIG_PPC_EARLY_DEBUG_44x is not set
--# CONFIG_PPC_EARLY_DEBUG_40x is not set
--# CONFIG_PPC_EARLY_DEBUG_CPM is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--# CONFIG_CRYPTO_SEQIV is not set
--# CONFIG_CRYPTO_MANAGER is not set
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--# CONFIG_CRYPTO_MD5 is not set
--# CONFIG_CRYPTO_SHA1 is not set
--# CONFIG_CRYPTO_SHA256 is not set
--# CONFIG_CRYPTO_SHA512 is not set
--# CONFIG_CRYPTO_WP512 is not set
--# CONFIG_CRYPTO_TGR192 is not set
--# CONFIG_CRYPTO_GF128MUL is not set
--# CONFIG_CRYPTO_ECB is not set
--# CONFIG_CRYPTO_CBC is not set
--# CONFIG_CRYPTO_PCBC is not set
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--# CONFIG_CRYPTO_DES is not set
--# CONFIG_CRYPTO_FCRYPT is not set
--# CONFIG_CRYPTO_BLOWFISH is not set
--# CONFIG_CRYPTO_TWOFISH is not set
--# CONFIG_CRYPTO_SERPENT is not set
--# CONFIG_CRYPTO_AES is not set
--# CONFIG_CRYPTO_CAST5 is not set
--# CONFIG_CRYPTO_CAST6 is not set
--# CONFIG_CRYPTO_TEA is not set
--# CONFIG_CRYPTO_ARC4 is not set
--# CONFIG_CRYPTO_KHAZAD is not set
--# CONFIG_CRYPTO_ANUBIS is not set
--# CONFIG_CRYPTO_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/sbc8641d_defconfig
-@@ -0,0 +1,1342 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Thu Apr 10 18:03:25 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+CONFIG_6xx=y
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_PPC_FPU=y
-+CONFIG_ALTIVEC=y
-+CONFIG_PPC_STD_MMU=y
-+CONFIG_PPC_STD_MMU_32=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_SMP=y
-+CONFIG_NR_CPUS=2
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_GENERIC_LOCKBREAK=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+CONFIG_GENERIC_TBSYNC=y
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_LOCK_KERNEL=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+CONFIG_POSIX_MQUEUE=y
-+CONFIG_BSD_PROCESS_ACCT=y
-+CONFIG_BSD_PROCESS_ACCT_V3=y
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+CONFIG_IKCONFIG=y
-+CONFIG_IKCONFIG_PROC=y
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+CONFIG_RELAY=y
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_ALL is not set
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=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_SLAB=y
-+# CONFIG_SLUB is not set
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_STOP_MACHINE=y
-+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
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+# CONFIG_DEFAULT_AS is not set
-+# CONFIG_DEFAULT_DEADLINE is not set
-+CONFIG_DEFAULT_CFQ=y
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="cfq"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MULTIPLATFORM is not set
-+# CONFIG_PPC_82xx is not set
-+# CONFIG_PPC_83xx is not set
-+CONFIG_PPC_86xx=y
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+# CONFIG_MPC8641_HPCN is not set
-+CONFIG_SBC8641D=y
-+# CONFIG_MPC8610_HPCD is not set
-+CONFIG_MPC8641=y
-+# CONFIG_IPIC is not set
-+CONFIG_MPIC=y
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+CONFIG_TICK_ONESHOT=y
-+# CONFIG_NO_HZ is not set
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+# CONFIG_PREEMPT_NONE is not set
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+CONFIG_PREEMPT=y
-+# CONFIG_PREEMPT_RCU is not set
-+CONFIG_BINFMT_ELF=y
-+CONFIG_BINFMT_MISC=m
-+CONFIG_FORCE_MAX_ZONEORDER=11
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_IRQ_ALL_CPUS=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+# CONFIG_PROC_DEVICETREE is not set
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_GENERIC_ISA_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_FSL_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+CONFIG_PCIEPORTBUS=y
-+CONFIG_PCIEAER=y
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+CONFIG_PACKET_MMAP=y
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+CONFIG_XFRM_USER=m
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+CONFIG_NET_KEY=m
-+# CONFIG_NET_KEY_MIGRATE is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+CONFIG_IP_ADVANCED_ROUTER=y
-+CONFIG_ASK_IP_FIB_HASH=y
-+# CONFIG_IP_FIB_TRIE is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_MULTIPLE_TABLES=y
-+CONFIG_IP_ROUTE_MULTIPATH=y
-+CONFIG_IP_ROUTE_VERBOSE=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+CONFIG_IP_PNP_RARP=y
-+CONFIG_NET_IPIP=m
-+CONFIG_NET_IPGRE=m
-+CONFIG_NET_IPGRE_BROADCAST=y
-+CONFIG_IP_MROUTE=y
-+CONFIG_IP_PIMSM_V1=y
-+CONFIG_IP_PIMSM_V2=y
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+CONFIG_INET_AH=m
-+CONFIG_INET_ESP=m
-+CONFIG_INET_IPCOMP=m
-+CONFIG_INET_XFRM_TUNNEL=m
-+CONFIG_INET_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IP_VS is not set
-+CONFIG_IPV6=m
-+# CONFIG_IPV6_PRIVACY is not set
-+# CONFIG_IPV6_ROUTER_PREF is not set
-+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-+CONFIG_INET6_AH=m
-+CONFIG_INET6_ESP=m
-+CONFIG_INET6_IPCOMP=m
-+# CONFIG_IPV6_MIP6 is not set
-+CONFIG_INET6_XFRM_TUNNEL=m
-+CONFIG_INET6_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET6_XFRM_MODE_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_BEET=m
-+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-+CONFIG_IPV6_SIT=m
-+CONFIG_IPV6_TUNNEL=m
-+# CONFIG_IPV6_MULTIPLE_TABLES is not set
-+# CONFIG_NETLABEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+CONFIG_NETFILTER=y
-+# CONFIG_NETFILTER_DEBUG is not set
-+CONFIG_NETFILTER_ADVANCED=y
-+CONFIG_BRIDGE_NETFILTER=y
-+
-+#
-+# Core Netfilter Configuration
-+#
-+# CONFIG_NETFILTER_NETLINK_QUEUE is not set
-+# CONFIG_NETFILTER_NETLINK_LOG is not set
-+# CONFIG_NF_CONNTRACK is not set
-+CONFIG_NETFILTER_XTABLES=m
-+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
-+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
-+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
-+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
-+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
-+# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
-+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
-+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
-+# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
-+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
-+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
-+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
-+# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
-+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
-+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
-+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
-+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
-+# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
-+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
-+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
-+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
-+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
-+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
-+# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
-+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
-+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
-+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
-+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
-+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
-+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
-+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
-+
-+#
-+# IP: Netfilter Configuration
-+#
-+CONFIG_IP_NF_QUEUE=m
-+CONFIG_IP_NF_IPTABLES=m
-+CONFIG_IP_NF_MATCH_RECENT=m
-+CONFIG_IP_NF_MATCH_ECN=m
-+# CONFIG_IP_NF_MATCH_AH is not set
-+CONFIG_IP_NF_MATCH_TTL=m
-+CONFIG_IP_NF_MATCH_ADDRTYPE=m
-+CONFIG_IP_NF_FILTER=m
-+CONFIG_IP_NF_TARGET_REJECT=m
-+CONFIG_IP_NF_TARGET_LOG=m
-+CONFIG_IP_NF_TARGET_ULOG=m
-+CONFIG_IP_NF_MANGLE=m
-+CONFIG_IP_NF_TARGET_ECN=m
-+# CONFIG_IP_NF_TARGET_TTL is not set
-+CONFIG_IP_NF_RAW=m
-+CONFIG_IP_NF_ARPTABLES=m
-+CONFIG_IP_NF_ARPFILTER=m
-+CONFIG_IP_NF_ARP_MANGLE=m
-+
-+#
-+# IPv6: Netfilter Configuration
-+#
-+CONFIG_IP6_NF_QUEUE=m
-+CONFIG_IP6_NF_IPTABLES=m
-+CONFIG_IP6_NF_MATCH_RT=m
-+CONFIG_IP6_NF_MATCH_OPTS=m
-+CONFIG_IP6_NF_MATCH_FRAG=m
-+CONFIG_IP6_NF_MATCH_HL=m
-+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-+# CONFIG_IP6_NF_MATCH_AH is not set
-+# CONFIG_IP6_NF_MATCH_MH is not set
-+CONFIG_IP6_NF_MATCH_EUI64=m
-+CONFIG_IP6_NF_FILTER=m
-+CONFIG_IP6_NF_TARGET_LOG=m
-+# CONFIG_IP6_NF_TARGET_REJECT is not set
-+CONFIG_IP6_NF_MANGLE=m
-+# CONFIG_IP6_NF_TARGET_HL is not set
-+CONFIG_IP6_NF_RAW=m
-+
-+#
-+# Bridge: Netfilter Configuration
-+#
-+# CONFIG_BRIDGE_NF_EBTABLES is not set
-+# CONFIG_IP_DCCP is not set
-+CONFIG_IP_SCTP=m
-+# CONFIG_SCTP_DBG_MSG is not set
-+# CONFIG_SCTP_DBG_OBJCNT is not set
-+# CONFIG_SCTP_HMAC_NONE is not set
-+# CONFIG_SCTP_HMAC_SHA1 is not set
-+CONFIG_SCTP_HMAC_MD5=y
-+CONFIG_TIPC=m
-+# CONFIG_TIPC_ADVANCED is not set
-+# CONFIG_TIPC_DEBUG is not set
-+CONFIG_ATM=m
-+CONFIG_ATM_CLIP=m
-+# CONFIG_ATM_CLIP_NO_ICMP is not set
-+CONFIG_ATM_LANE=m
-+CONFIG_ATM_MPOA=m
-+CONFIG_ATM_BR2684=m
-+# CONFIG_ATM_BR2684_IPFILTER is not set
-+CONFIG_BRIDGE=m
-+CONFIG_VLAN_8021Q=m
-+# CONFIG_DECNET is not set
-+CONFIG_LLC=m
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+CONFIG_WAN_ROUTER=m
-+CONFIG_NET_SCHED=y
-+
-+#
-+# Queueing/Scheduling
-+#
-+CONFIG_NET_SCH_CBQ=m
-+CONFIG_NET_SCH_HTB=m
-+CONFIG_NET_SCH_HFSC=m
-+CONFIG_NET_SCH_ATM=m
-+CONFIG_NET_SCH_PRIO=m
-+# CONFIG_NET_SCH_RR is not set
-+CONFIG_NET_SCH_RED=m
-+CONFIG_NET_SCH_SFQ=m
-+CONFIG_NET_SCH_TEQL=m
-+CONFIG_NET_SCH_TBF=m
-+CONFIG_NET_SCH_GRED=m
-+CONFIG_NET_SCH_DSMARK=m
-+CONFIG_NET_SCH_NETEM=m
-+
-+#
-+# Classification
-+#
-+CONFIG_NET_CLS=y
-+# CONFIG_NET_CLS_BASIC is not set
-+CONFIG_NET_CLS_TCINDEX=m
-+CONFIG_NET_CLS_ROUTE4=m
-+CONFIG_NET_CLS_ROUTE=y
-+CONFIG_NET_CLS_FW=m
-+CONFIG_NET_CLS_U32=m
-+# CONFIG_CLS_U32_PERF is not set
-+# CONFIG_CLS_U32_MARK is not set
-+CONFIG_NET_CLS_RSVP=m
-+CONFIG_NET_CLS_RSVP6=m
-+# CONFIG_NET_CLS_FLOW is not set
-+# CONFIG_NET_EMATCH is not set
-+# CONFIG_NET_CLS_ACT is not set
-+# CONFIG_NET_CLS_IND is not set
-+CONFIG_NET_SCH_FIFO=y
-+
-+#
-+# Network testing
-+#
-+CONFIG_NET_PKTGEN=m
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+CONFIG_FIB_RULES=y
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+CONFIG_MTD_CONCAT=y
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+# CONFIG_MTD_CMDLINE_PARTS is not set
-+# CONFIG_MTD_OF_PARTS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+CONFIG_MTD_BLOCK=y
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+CONFIG_MTD_CFI_ADV_OPTIONS=y
-+# CONFIG_MTD_CFI_NOSWAP is not set
-+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-+CONFIG_MTD_CFI_LE_BYTE_SWAP=y
-+# CONFIG_MTD_CFI_GEOMETRY is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+# CONFIG_MTD_OTP is not set
-+CONFIG_MTD_CFI_INTELEXT=y
-+# CONFIG_MTD_CFI_AMDSTD is not set
-+# CONFIG_MTD_CFI_STAA is not set
-+CONFIG_MTD_CFI_UTIL=y
-+# CONFIG_MTD_RAM is not set
-+# CONFIG_MTD_ROM is not set
-+# CONFIG_MTD_ABSENT is not set
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+CONFIG_MTD_PHYSMAP_OF=y
-+# CONFIG_MTD_INTEL_VR_NOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_PMC551 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+# CONFIG_MTD_NAND is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=m
-+CONFIG_BLK_DEV_CRYPTOLOOP=m
-+CONFIG_BLK_DEV_NBD=m
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=4096
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+CONFIG_MD=y
-+CONFIG_BLK_DEV_MD=y
-+CONFIG_MD_LINEAR=y
-+CONFIG_MD_RAID0=y
-+CONFIG_MD_RAID1=y
-+CONFIG_MD_RAID10=y
-+# CONFIG_MD_RAID456 is not set
-+CONFIG_MD_MULTIPATH=y
-+CONFIG_MD_FAULTY=y
-+CONFIG_BLK_DEV_DM=y
-+# CONFIG_DM_DEBUG is not set
-+CONFIG_DM_CRYPT=y
-+CONFIG_DM_SNAPSHOT=y
-+CONFIG_DM_MIRROR=y
-+CONFIG_DM_ZERO=y
-+# CONFIG_DM_MULTIPATH is not set
-+# CONFIG_DM_DELAY is not set
-+# CONFIG_DM_UEVENT is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+CONFIG_DUMMY=m
-+CONFIG_BONDING=m
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+CONFIG_TUN=m
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+# CONFIG_MARVELL_PHY is not set
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+CONFIG_BROADCOM_PHY=y
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+CONFIG_GIANFAR=y
-+# CONFIG_GFAR_NAPI is not set
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+# CONFIG_NETDEV_10000 is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+CONFIG_ATM_DRIVERS=y
-+# CONFIG_ATM_DUMMY is not set
-+# CONFIG_ATM_TCP is not set
-+# CONFIG_ATM_LANAI is not set
-+# CONFIG_ATM_ENI is not set
-+# CONFIG_ATM_FIRESTREAM is not set
-+# CONFIG_ATM_ZATM is not set
-+# CONFIG_ATM_NICSTAR is not set
-+# CONFIG_ATM_IDT77252 is not set
-+# CONFIG_ATM_AMBASSADOR is not set
-+# CONFIG_ATM_HORIZON is not set
-+# CONFIG_ATM_IA is not set
-+# CONFIG_ATM_FORE200E_MAYBE is not set
-+# CONFIG_ATM_HE is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+CONFIG_PPP=m
-+CONFIG_PPP_MULTILINK=y
-+CONFIG_PPP_FILTER=y
-+CONFIG_PPP_ASYNC=m
-+CONFIG_PPP_SYNC_TTY=m
-+CONFIG_PPP_DEFLATE=m
-+CONFIG_PPP_BSDCOMP=m
-+# CONFIG_PPP_MPPE is not set
-+CONFIG_PPPOE=m
-+CONFIG_PPPOATM=m
-+# CONFIG_PPPOL2TP is not set
-+CONFIG_SLIP=m
-+CONFIG_SLIP_COMPRESSED=y
-+CONFIG_SLHC=m
-+CONFIG_SLIP_SMART=y
-+CONFIG_SLIP_MODE_SLIP6=y
-+CONFIG_NETCONSOLE=y
-+# CONFIG_NETCONSOLE_DYNAMIC is not set
-+CONFIG_NETPOLL=y
-+CONFIG_NETPOLL_TRAP=y
-+CONFIG_NET_POLL_CONTROLLER=y
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+CONFIG_INPUT_MOUSEDEV=y
-+CONFIG_INPUT_MOUSEDEV_PSAUX=y
-+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+CONFIG_VT=y
-+CONFIG_VT_CONSOLE=y
-+CONFIG_HW_CONSOLE=y
-+# CONFIG_VT_HW_CONSOLE_BINDING is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+# CONFIG_SERIAL_8250_PCI is not set
-+CONFIG_SERIAL_8250_NR_UARTS=2
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+CONFIG_HW_RANDOM=m
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_ALI1535 is not set
-+# CONFIG_I2C_ALI1563 is not set
-+# CONFIG_I2C_ALI15X3 is not set
-+# CONFIG_I2C_AMD756 is not set
-+# CONFIG_I2C_AMD8111 is not set
-+# CONFIG_I2C_I801 is not set
-+# CONFIG_I2C_I810 is not set
-+# CONFIG_I2C_PIIX4 is not set
-+CONFIG_I2C_MPC=y
-+# CONFIG_I2C_NFORCE2 is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_PROSAVAGE is not set
-+# CONFIG_I2C_SAVAGE4 is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_SIS5595 is not set
-+# CONFIG_I2C_SIS630 is not set
-+# CONFIG_I2C_SIS96X is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_STUB is not set
-+# CONFIG_I2C_VIA is not set
-+# CONFIG_I2C_VIAPRO is not set
-+# CONFIG_I2C_VOODOO3 is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+# CONFIG_I2C_DEBUG_CORE is not set
-+# CONFIG_I2C_DEBUG_ALGO is not set
-+# CONFIG_I2C_DEBUG_BUS is not set
-+# CONFIG_I2C_DEBUG_CHIP is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ADT7473 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_I5K_AMB is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S is not set
-+# CONFIG_SENSORS_GL518SM is not set
-+# CONFIG_SENSORS_GL520SM is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_LM63 is not set
-+# CONFIG_SENSORS_LM75 is not set
-+# CONFIG_SENSORS_LM77 is not set
-+# CONFIG_SENSORS_LM78 is not set
-+# CONFIG_SENSORS_LM80 is not set
-+# CONFIG_SENSORS_LM83 is not set
-+# CONFIG_SENSORS_LM85 is not set
-+# 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_SIS5595 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_ADS7828 is not set
-+# CONFIG_SENSORS_THMC50 is not set
-+# CONFIG_SENSORS_VIA686A is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_VT8231 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83L786NG is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+# CONFIG_THERMAL is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+CONFIG_SOFT_WATCHDOG=m
-+
-+#
-+# PCI-based Watchdog Cards
-+#
-+# CONFIG_PCIPCWATCHDOG is not set
-+# CONFIG_WDTPCI is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Console display driver support
-+#
-+CONFIG_VGA_CONSOLE=y
-+# CONFIG_VGACON_SOFT_SCROLLBACK is not set
-+CONFIG_DUMMY_CONSOLE=y
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+CONFIG_EXT2_FS_XATTR=y
-+CONFIG_EXT2_FS_POSIX_ACL=y
-+# CONFIG_EXT2_FS_SECURITY is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+CONFIG_EXT3_FS_XATTR=y
-+CONFIG_EXT3_FS_POSIX_ACL=y
-+# CONFIG_EXT3_FS_SECURITY is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+# CONFIG_JBD_DEBUG is not set
-+CONFIG_FS_MBCACHE=y
-+CONFIG_REISERFS_FS=m
-+# CONFIG_REISERFS_CHECK is not set
-+# CONFIG_REISERFS_PROC_INFO is not set
-+CONFIG_REISERFS_FS_XATTR=y
-+CONFIG_REISERFS_FS_POSIX_ACL=y
-+# CONFIG_REISERFS_FS_SECURITY is not set
-+# CONFIG_JFS_FS is not set
-+CONFIG_FS_POSIX_ACL=y
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+CONFIG_OCFS2_FS=m
-+CONFIG_OCFS2_DEBUG_MASKLOG=y
-+# CONFIG_OCFS2_DEBUG_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+CONFIG_AUTOFS_FS=m
-+CONFIG_AUTOFS4_FS=m
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+# CONFIG_MSDOS_FS is not set
-+# CONFIG_VFAT_FS is not set
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+CONFIG_CONFIGFS_FS=m
-+
-+#
-+# Miscellaneous filesystems
-+#
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+# CONFIG_JFFS2_FS is not set
-+# CONFIG_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+CONFIG_MINIX_FS=m
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+CONFIG_ROMFS_FS=m
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+CONFIG_NFS_V4=y
-+CONFIG_NFS_DIRECTIO=y
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+CONFIG_SUNRPC_GSS=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+CONFIG_SMB_FS=m
-+CONFIG_SMB_NLS_DEFAULT=y
-+CONFIG_SMB_NLS_REMOTE="cp437"
-+CONFIG_CIFS=m
-+# CONFIG_CIFS_STATS is not set
-+# CONFIG_CIFS_WEAK_PW_HASH is not set
-+CONFIG_CIFS_XATTR=y
-+CONFIG_CIFS_POSIX=y
-+# CONFIG_CIFS_DEBUG2 is not set
-+# CONFIG_CIFS_EXPERIMENTAL is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+CONFIG_NLS=m
-+CONFIG_NLS_DEFAULT="iso8859-1"
-+CONFIG_NLS_CODEPAGE_437=m
-+CONFIG_NLS_CODEPAGE_737=m
-+CONFIG_NLS_CODEPAGE_775=m
-+CONFIG_NLS_CODEPAGE_850=m
-+CONFIG_NLS_CODEPAGE_852=m
-+CONFIG_NLS_CODEPAGE_855=m
-+CONFIG_NLS_CODEPAGE_857=m
-+CONFIG_NLS_CODEPAGE_860=m
-+CONFIG_NLS_CODEPAGE_861=m
-+CONFIG_NLS_CODEPAGE_862=m
-+CONFIG_NLS_CODEPAGE_863=m
-+CONFIG_NLS_CODEPAGE_864=m
-+CONFIG_NLS_CODEPAGE_865=m
-+CONFIG_NLS_CODEPAGE_866=m
-+CONFIG_NLS_CODEPAGE_869=m
-+CONFIG_NLS_CODEPAGE_936=m
-+CONFIG_NLS_CODEPAGE_950=m
-+CONFIG_NLS_CODEPAGE_932=m
-+CONFIG_NLS_CODEPAGE_949=m
-+CONFIG_NLS_CODEPAGE_874=m
-+CONFIG_NLS_ISO8859_8=m
-+CONFIG_NLS_CODEPAGE_1250=m
-+CONFIG_NLS_CODEPAGE_1251=m
-+CONFIG_NLS_ASCII=m
-+CONFIG_NLS_ISO8859_1=m
-+CONFIG_NLS_ISO8859_2=m
-+CONFIG_NLS_ISO8859_3=m
-+CONFIG_NLS_ISO8859_4=m
-+CONFIG_NLS_ISO8859_5=m
-+CONFIG_NLS_ISO8859_6=m
-+CONFIG_NLS_ISO8859_7=m
-+CONFIG_NLS_ISO8859_9=m
-+CONFIG_NLS_ISO8859_13=m
-+CONFIG_NLS_ISO8859_14=m
-+CONFIG_NLS_ISO8859_15=m
-+CONFIG_NLS_KOI8_R=m
-+CONFIG_NLS_KOI8_U=m
-+CONFIG_NLS_UTF8=m
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+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=m
-+CONFIG_ZLIB_INFLATE=m
-+CONFIG_ZLIB_DEFLATE=m
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+CONFIG_HAVE_LMB=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+CONFIG_DEBUG_FS=y
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_DEBUG_SLAB is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+CONFIG_DEBUG_INFO=y
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+CONFIG_DEBUGGER=y
-+# CONFIG_XMON is not set
-+# CONFIG_VIRQ_DEBUG is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+CONFIG_SECURITY=y
-+CONFIG_SECURITY_NETWORK=y
-+# CONFIG_SECURITY_NETWORK_XFRM is not set
-+CONFIG_SECURITY_CAPABILITIES=y
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_AEAD=m
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_HASH=y
-+CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_HMAC=y
-+# CONFIG_CRYPTO_XCBC is not set
-+CONFIG_CRYPTO_NULL=m
-+CONFIG_CRYPTO_MD4=m
-+CONFIG_CRYPTO_MD5=y
-+CONFIG_CRYPTO_SHA1=m
-+CONFIG_CRYPTO_SHA256=m
-+CONFIG_CRYPTO_SHA512=m
-+CONFIG_CRYPTO_WP512=m
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+CONFIG_CRYPTO_BLOWFISH=m
-+CONFIG_CRYPTO_TWOFISH=m
-+CONFIG_CRYPTO_TWOFISH_COMMON=m
-+CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_AES=m
-+CONFIG_CRYPTO_CAST5=m
-+CONFIG_CRYPTO_CAST6=m
-+CONFIG_CRYPTO_TEA=m
-+CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_KHAZAD=m
-+CONFIG_CRYPTO_ANUBIS=m
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+CONFIG_CRYPTO_DEFLATE=m
-+CONFIG_CRYPTO_MICHAEL_MIC=m
-+CONFIG_CRYPTO_CRC32C=m
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+CONFIG_CRYPTO_TEST=m
-+CONFIG_CRYPTO_AUTHENC=m
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/sequoia_defconfig
-+++ /dev/null
-@@ -1,916 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc2
--# Fri Feb 15 21:53:46 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--CONFIG_44x=y
--# CONFIG_E200 is not set
--CONFIG_PPC_FPU=y
--CONFIG_4xx=y
--CONFIG_BOOKE=y
--CONFIG_PTE_64BIT=y
--CONFIG_PHYS_64BIT=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_NOT_COHERENT_CACHE=y
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--# CONFIG_DEFAULT_UIMAGE is not set
--CONFIG_PPC_DCR_NATIVE=y
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_PPC_DCR=y
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--CONFIG_POSIX_MQUEUE=y
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--# CONFIG_FAIR_GROUP_SCHED is not set
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--CONFIG_KALLSYMS=y
--# CONFIG_KALLSYMS_ALL is not set
--# CONFIG_KALLSYMS_EXTRA_PASS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=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 is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--# CONFIG_KPROBES is not set
--CONFIG_HAVE_KPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--CONFIG_KMOD=y
--CONFIG_BLOCK=y
--CONFIG_LBD=y
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--CONFIG_DEFAULT_AS=y
--# CONFIG_DEFAULT_DEADLINE is not set
--# CONFIG_DEFAULT_CFQ is not set
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="anticipatory"
--CONFIG_CLASSIC_RCU=y
--# CONFIG_PREEMPT_RCU is not set
--# CONFIG_PPC4xx_PCI_EXPRESS is not set
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--# CONFIG_BAMBOO is not set
--# CONFIG_EBONY is not set
--CONFIG_SEQUOIA=y
--# CONFIG_TAISHAN is not set
--# CONFIG_KATMAI is not set
--# CONFIG_RAINIER is not set
--# CONFIG_WARP is not set
--CONFIG_440EPX=y
--# CONFIG_IPIC is not set
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--CONFIG_TICK_ONESHOT=y
--CONFIG_NO_HZ=y
--CONFIG_HIGH_RES_TIMERS=y
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_RCU_TRACE=y
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--# CONFIG_MATH_EMULATION is not set
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--CONFIG_RESOURCES_64BIT=y
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--CONFIG_CMDLINE_BOOL=y
--CONFIG_CMDLINE=""
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCI_DEBUG is not set
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_CONSISTENT_START=0xff100000
--CONFIG_CONSISTENT_SIZE=0x00200000
--CONFIG_BOOT_LOAD=0x01000000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--# CONFIG_IP_MULTICAST is not set
--# CONFIG_IP_ADVANCED_ROUTER is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_PNP=y
--CONFIG_IP_PNP_DHCP=y
--CONFIG_IP_PNP_BOOTP=y
--# CONFIG_IP_PNP_RARP is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_ARPD is not set
--# CONFIG_SYN_COOKIES is not set
--# CONFIG_INET_AH is not set
--# CONFIG_INET_ESP is not set
--# CONFIG_INET_IPCOMP is not set
--# CONFIG_INET_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
--# CONFIG_INET_XFRM_MODE_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_BEET is not set
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--# CONFIG_BRIDGE is not set
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--# CONFIG_LLC2 is not set
--# CONFIG_IPX is not set
--# CONFIG_ATALK is not set
--# CONFIG_X25 is not set
--# CONFIG_LAPB is not set
--# CONFIG_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--CONFIG_FW_LOADER=y
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--CONFIG_CONNECTOR=y
--CONFIG_PROC_EVENTS=y
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--# CONFIG_MTD_CONCAT is not set
--CONFIG_MTD_PARTITIONS=y
--# CONFIG_MTD_REDBOOT_PARTS is not set
--CONFIG_MTD_CMDLINE_PARTS=y
--CONFIG_MTD_OF_PARTS=y
--
--#
--# User Modules And Translation Layers
--#
--CONFIG_MTD_CHAR=y
--# CONFIG_MTD_BLKDEVS is not set
--# CONFIG_MTD_BLOCK is not set
--# CONFIG_MTD_BLOCK_RO is not set
--# CONFIG_FTL is not set
--# CONFIG_NFTL is not set
--# CONFIG_INFTL is not set
--# CONFIG_RFD_FTL is not set
--# CONFIG_SSFDC is not set
--# CONFIG_MTD_OOPS is not set
--
--#
--# RAM/ROM/Flash chip drivers
--#
--CONFIG_MTD_CFI=y
--CONFIG_MTD_JEDECPROBE=y
--CONFIG_MTD_GEN_PROBE=y
--# CONFIG_MTD_CFI_ADV_OPTIONS is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--CONFIG_MTD_MAP_BANK_WIDTH_4=y
--# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
--CONFIG_MTD_CFI_I1=y
--CONFIG_MTD_CFI_I2=y
--# CONFIG_MTD_CFI_I4 is not set
--# CONFIG_MTD_CFI_I8 is not set
--CONFIG_MTD_CFI_INTELEXT=y
--CONFIG_MTD_CFI_AMDSTD=y
--# CONFIG_MTD_CFI_STAA is not set
--CONFIG_MTD_CFI_UTIL=y
--# CONFIG_MTD_RAM is not set
--# CONFIG_MTD_ROM is not set
--# CONFIG_MTD_ABSENT is not set
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--# CONFIG_MTD_PHYSMAP is not set
--CONFIG_MTD_PHYSMAP_OF=y
--# CONFIG_MTD_INTEL_VR_NOR is not set
--# CONFIG_MTD_PLATRAM is not set
--
--#
--# Self-contained MTD device drivers
--#
--# CONFIG_MTD_PMC551 is not set
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_MTDRAM is not set
--# CONFIG_MTD_BLOCK2MTD is not set
--
--#
--# Disk-On-Chip Device Drivers
--#
--# CONFIG_MTD_DOC2000 is not set
--# CONFIG_MTD_DOC2001 is not set
--# CONFIG_MTD_DOC2001PLUS is not set
--# CONFIG_MTD_NAND is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--# CONFIG_BLK_DEV_LOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=35000
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--# CONFIG_XILINX_SYSACE is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--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 is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--# CONFIG_PHYLIB is not set
--CONFIG_NET_ETHERNET=y
--# CONFIG_MII is not set
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--CONFIG_IBM_NEW_EMAC=y
--CONFIG_IBM_NEW_EMAC_RXB=128
--CONFIG_IBM_NEW_EMAC_TXB=64
--CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
--CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
--CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
--# CONFIG_IBM_NEW_EMAC_DEBUG is not set
--CONFIG_IBM_NEW_EMAC_ZMII=y
--CONFIG_IBM_NEW_EMAC_RGMII=y
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--CONFIG_IBM_NEW_EMAC_EMAC4=y
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--# CONFIG_INPUT is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--# CONFIG_SERIAL_8250_PCI is not set
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--CONFIG_SERIAL_8250_EXTENDED=y
--# CONFIG_SERIAL_8250_MANY_PORTS is not set
--CONFIG_SERIAL_8250_SHARE_IRQ=y
--# CONFIG_SERIAL_8250_DETECT_IRQ is not set
--# CONFIG_SERIAL_8250_RSA is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--CONFIG_SERIAL_OF_PLATFORM=y
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--# CONFIG_I2C is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--# CONFIG_HWMON is not set
--CONFIG_THERMAL=y
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=m
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--# CONFIG_EXT3_FS is not set
--# CONFIG_EXT4DEV_FS is not set
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# CONFIG_AUTOFS_FS is not set
--# CONFIG_AUTOFS4_FS is not set
--# CONFIG_FUSE_FS is not set
--
--#
--# CD-ROM/DVD Filesystems
--#
--# CONFIG_ISO9660_FS is not set
--# CONFIG_UDF_FS is not set
--
--#
--# DOS/FAT/NT Filesystems
--#
--# CONFIG_MSDOS_FS is not set
--# CONFIG_VFAT_FS is not set
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
--
--#
--# Miscellaneous filesystems
--#
--# CONFIG_ADFS_FS is not set
--# CONFIG_AFFS_FS is not set
--# CONFIG_HFS_FS is not set
--# CONFIG_HFSPLUS_FS is not set
--# CONFIG_BEFS_FS is not set
--# CONFIG_BFS_FS is not set
--# CONFIG_EFS_FS is not set
--CONFIG_JFFS2_FS=y
--CONFIG_JFFS2_FS_DEBUG=0
--CONFIG_JFFS2_FS_WRITEBUFFER=y
--# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
--# CONFIG_JFFS2_SUMMARY is not set
--# CONFIG_JFFS2_FS_XATTR is not set
--# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
--CONFIG_JFFS2_ZLIB=y
--# CONFIG_JFFS2_LZO is not set
--CONFIG_JFFS2_RTIME=y
--# CONFIG_JFFS2_RUBIN is not set
--CONFIG_CRAMFS=y
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--# CONFIG_PARTITION_ADVANCED is not set
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# 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
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--CONFIG_MAGIC_SYSRQ=y
--# CONFIG_UNUSED_SYMBOLS is not set
--CONFIG_DEBUG_FS=y
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_DEBUG_INFO is not set
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--CONFIG_DEBUGGER=y
--# CONFIG_KGDB is not set
--# CONFIG_XMON is not set
--# CONFIG_VIRQ_DEBUG is not set
--# CONFIG_BDI_SWITCH is not set
--CONFIG_PPC_EARLY_DEBUG=y
--# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
--# CONFIG_PPC_EARLY_DEBUG_G5 is not set
--# CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL is not set
--# CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set
--# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
--# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
--# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
--# CONFIG_PPC_EARLY_DEBUG_BEAT is not set
--CONFIG_PPC_EARLY_DEBUG_44x=y
--# CONFIG_PPC_EARLY_DEBUG_40x is not set
--# CONFIG_PPC_EARLY_DEBUG_CPM is not set
--CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0xef600300
--CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x1
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--CONFIG_CRYPTO_MD5=y
--# CONFIG_CRYPTO_SHA1 is not set
--# CONFIG_CRYPTO_SHA256 is not set
--# CONFIG_CRYPTO_SHA512 is not set
--# CONFIG_CRYPTO_WP512 is not set
--# CONFIG_CRYPTO_TGR192 is not set
--# CONFIG_CRYPTO_GF128MUL is not set
--CONFIG_CRYPTO_ECB=y
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=y
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# CONFIG_CRYPTO_BLOWFISH is not set
--# CONFIG_CRYPTO_TWOFISH is not set
--# CONFIG_CRYPTO_SERPENT is not set
--# CONFIG_CRYPTO_AES is not set
--# CONFIG_CRYPTO_CAST5 is not set
--# CONFIG_CRYPTO_CAST6 is not set
--# CONFIG_CRYPTO_TEA is not set
--# CONFIG_CRYPTO_ARC4 is not set
--# CONFIG_CRYPTO_KHAZAD is not set
--# CONFIG_CRYPTO_ANUBIS is not set
--# CONFIG_CRYPTO_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/stx_gp3_defconfig
-+++ /dev/null
-@@ -1,1253 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:42 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--CONFIG_PPC_85xx=y
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_E500=y
--CONFIG_BOOKE=y
--CONFIG_FSL_BOOKE=y
--CONFIG_FSL_EMB_PERFMON=y
--# CONFIG_PHYS_64BIT is not set
--CONFIG_SPE=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--CONFIG_FAIR_GROUP_SCHED=y
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--CONFIG_KALLSYMS=y
--# CONFIG_KALLSYMS_ALL is not set
--# CONFIG_KALLSYMS_EXTRA_PASS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=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 is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--# CONFIG_KPROBES is not set
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--# CONFIG_MODULE_UNLOAD is not set
--CONFIG_MODVERSIONS=y
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--CONFIG_KMOD=y
--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
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--# CONFIG_DEFAULT_AS is not set
--# CONFIG_DEFAULT_DEADLINE is not set
--CONFIG_DEFAULT_CFQ=y
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="cfq"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC85xx=y
--# CONFIG_MPC8540_ADS is not set
--# CONFIG_MPC8560_ADS is not set
--# CONFIG_MPC85xx_CDS is not set
--# CONFIG_MPC85xx_MDS is not set
--# CONFIG_MPC85xx_DS is not set
--CONFIG_STX_GP3=y
--# CONFIG_TQM8540 is not set
--# CONFIG_TQM8541 is not set
--# CONFIG_TQM8555 is not set
--# CONFIG_TQM8560 is not set
--# CONFIG_SBC8548 is not set
--# CONFIG_SBC8560 is not set
--# CONFIG_IPIC is not set
--CONFIG_MPIC=y
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--CONFIG_CPM2=y
--CONFIG_PPC_CPM_NEW_BINDING=y
--# CONFIG_FSL_ULI1575 is not set
--CONFIG_CPM=y
--
--#
--# Kernel options
--#
--CONFIG_HIGHMEM=y
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--CONFIG_BINFMT_MISC=m
--CONFIG_MATH_EMULATION=y
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_FSL_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCI_DEBUG is not set
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--# CONFIG_XFRM_USER is not set
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--# CONFIG_IP_MULTICAST is not set
--# CONFIG_IP_ADVANCED_ROUTER is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_PNP=y
--# CONFIG_IP_PNP_DHCP is not set
--CONFIG_IP_PNP_BOOTP=y
--# CONFIG_IP_PNP_RARP is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_ARPD is not set
--# CONFIG_SYN_COOKIES is not set
--# CONFIG_INET_AH is not set
--# CONFIG_INET_ESP is not set
--# CONFIG_INET_IPCOMP is not set
--# CONFIG_INET_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--CONFIG_INET_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IP_VS is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--CONFIG_NETFILTER=y
--# CONFIG_NETFILTER_DEBUG is not set
--CONFIG_NETFILTER_ADVANCED=y
--
--#
--# Core Netfilter Configuration
--#
--# CONFIG_NETFILTER_NETLINK_QUEUE is not set
--# CONFIG_NETFILTER_NETLINK_LOG is not set
--# CONFIG_NF_CONNTRACK is not set
--CONFIG_NETFILTER_XTABLES=m
--# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
--# CONFIG_NETFILTER_XT_TARGET_MARK is not set
--# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
--# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
--# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
--# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
--# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
--# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
--# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
--# CONFIG_NETFILTER_XT_MATCH_ESP is not set
--# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
--# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
--# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
--# CONFIG_NETFILTER_XT_MATCH_MAC is not set
--# CONFIG_NETFILTER_XT_MATCH_MARK is not set
--# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
--# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
--# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
--# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
--# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
--# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
--# CONFIG_NETFILTER_XT_MATCH_REALM is not set
--# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
--# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
--# CONFIG_NETFILTER_XT_MATCH_STRING is not set
--# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
--# CONFIG_NETFILTER_XT_MATCH_TIME is not set
--# CONFIG_NETFILTER_XT_MATCH_U32 is not set
--# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
--
--#
--# IP: Netfilter Configuration
--#
--# CONFIG_IP_NF_QUEUE is not set
--CONFIG_IP_NF_IPTABLES=m
--# CONFIG_IP_NF_MATCH_RECENT is not set
--# CONFIG_IP_NF_MATCH_ECN is not set
--# CONFIG_IP_NF_MATCH_AH is not set
--# CONFIG_IP_NF_MATCH_TTL is not set
--# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
--CONFIG_IP_NF_FILTER=m
--# CONFIG_IP_NF_TARGET_REJECT is not set
--# CONFIG_IP_NF_TARGET_LOG is not set
--# CONFIG_IP_NF_TARGET_ULOG is not set
--# CONFIG_IP_NF_MANGLE is not set
--# CONFIG_IP_NF_RAW is not set
--# CONFIG_IP_NF_ARPTABLES is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--# CONFIG_BRIDGE is not set
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--# CONFIG_LLC2 is not set
--# CONFIG_IPX is not set
--# CONFIG_ATALK is not set
--# CONFIG_X25 is not set
--# CONFIG_LAPB is not set
--# CONFIG_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--CONFIG_NET_PKTGEN=y
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--CONFIG_PARPORT=m
--CONFIG_PARPORT_PC=m
--# CONFIG_PARPORT_PC_FIFO is not set
--# CONFIG_PARPORT_PC_SUPERIO is not set
--# CONFIG_PARPORT_GSC is not set
--# CONFIG_PARPORT_AX88796 is not set
--# CONFIG_PARPORT_1284 is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_PARIDE is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=m
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--CONFIG_BLK_DEV_NBD=m
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--CONFIG_IDE=y
--CONFIG_IDE_MAX_HWIFS=4
--CONFIG_BLK_DEV_IDE=y
--
--#
--# Please see Documentation/ide/ide.txt for help/info on IDE drives
--#
--# CONFIG_BLK_DEV_IDE_SATA is not set
--CONFIG_BLK_DEV_IDEDISK=y
--# CONFIG_IDEDISK_MULTI_MODE is not set
--CONFIG_BLK_DEV_IDECD=m
--CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
--# CONFIG_BLK_DEV_IDETAPE is not set
--# CONFIG_BLK_DEV_IDEFLOPPY is not set
--# CONFIG_BLK_DEV_IDESCSI is not set
--# CONFIG_IDE_TASK_IOCTL is not set
--CONFIG_IDE_PROC_FS=y
--
--#
--# IDE chipset support/bugfixes
--#
--CONFIG_IDE_GENERIC=y
--# CONFIG_BLK_DEV_PLATFORM is not set
--
--#
--# PCI IDE chipsets support
--#
--# CONFIG_BLK_DEV_GENERIC is not set
--# CONFIG_BLK_DEV_OPTI621 is not set
--# CONFIG_BLK_DEV_AEC62XX is not set
--# CONFIG_BLK_DEV_ALI15X3 is not set
--# CONFIG_BLK_DEV_AMD74XX is not set
--# CONFIG_BLK_DEV_CMD64X is not set
--# CONFIG_BLK_DEV_TRIFLEX is not set
--# CONFIG_BLK_DEV_CY82C693 is not set
--# CONFIG_BLK_DEV_CS5520 is not set
--# CONFIG_BLK_DEV_CS5530 is not set
--# CONFIG_BLK_DEV_HPT34X is not set
--# CONFIG_BLK_DEV_HPT366 is not set
--# CONFIG_BLK_DEV_JMICRON is not set
--# CONFIG_BLK_DEV_SC1200 is not set
--# CONFIG_BLK_DEV_PIIX is not set
--# CONFIG_BLK_DEV_IT8213 is not set
--# CONFIG_BLK_DEV_IT821X is not set
--# CONFIG_BLK_DEV_NS87415 is not set
--# CONFIG_BLK_DEV_PDC202XX_OLD is not set
--# CONFIG_BLK_DEV_PDC202XX_NEW is not set
--# CONFIG_BLK_DEV_SVWKS is not set
--# CONFIG_BLK_DEV_SIIMAGE is not set
--# CONFIG_BLK_DEV_SL82C105 is not set
--# CONFIG_BLK_DEV_SLC90E66 is not set
--# CONFIG_BLK_DEV_TRM290 is not set
--# CONFIG_BLK_DEV_VIA82CXXX is not set
--# CONFIG_BLK_DEV_TC86C001 is not set
--# CONFIG_BLK_DEV_IDEDMA is not set
--CONFIG_IDE_ARCH_OBSOLETE_INIT=y
--# CONFIG_BLK_DEV_HD is not set
--
--#
--# SCSI device support
--#
--# 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
--
--#
--# SCSI support type (disk, tape, CD-ROM)
--#
--CONFIG_BLK_DEV_SD=m
--CONFIG_CHR_DEV_ST=m
--# CONFIG_CHR_DEV_OSST is not set
--CONFIG_BLK_DEV_SR=m
--# CONFIG_BLK_DEV_SR_VENDOR is not set
--CONFIG_CHR_DEV_SG=m
--# CONFIG_CHR_DEV_SCH is not set
--
--#
--# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
--#
--CONFIG_SCSI_MULTI_LUN=y
--CONFIG_SCSI_CONSTANTS=y
--# CONFIG_SCSI_LOGGING is not set
--# CONFIG_SCSI_SCAN_ASYNC is not set
--CONFIG_SCSI_WAIT_SCAN=m
--
--#
--# SCSI Transports
--#
--# CONFIG_SCSI_SPI_ATTRS is not set
--# CONFIG_SCSI_FC_ATTRS is not set
--# CONFIG_SCSI_ISCSI_ATTRS is not set
--# CONFIG_SCSI_SAS_LIBSAS is not set
--# CONFIG_SCSI_SRP_ATTRS is not set
--CONFIG_SCSI_LOWLEVEL=y
--# CONFIG_ISCSI_TCP is not set
--# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
--# CONFIG_SCSI_3W_9XXX is not set
--# CONFIG_SCSI_ACARD is not set
--# CONFIG_SCSI_AACRAID is not set
--# CONFIG_SCSI_AIC7XXX is not set
--# CONFIG_SCSI_AIC7XXX_OLD is not set
--# CONFIG_SCSI_AIC79XX is not set
--# CONFIG_SCSI_AIC94XX is not set
--# CONFIG_SCSI_DPT_I2O is not set
--# CONFIG_SCSI_ADVANSYS is not set
--# CONFIG_SCSI_ARCMSR is not set
--# CONFIG_MEGARAID_NEWGEN is not set
--# CONFIG_MEGARAID_LEGACY is not set
--# CONFIG_MEGARAID_SAS is not set
--# CONFIG_SCSI_HPTIOP is not set
--# CONFIG_SCSI_BUSLOGIC is not set
--# CONFIG_SCSI_DMX3191D is not set
--# CONFIG_SCSI_EATA is not set
--# CONFIG_SCSI_FUTURE_DOMAIN is not set
--# CONFIG_SCSI_GDTH is not set
--# CONFIG_SCSI_IPS is not set
--# CONFIG_SCSI_INITIO is not set
--# CONFIG_SCSI_INIA100 is not set
--# CONFIG_SCSI_PPA is not set
--# CONFIG_SCSI_IMM is not set
--# CONFIG_SCSI_MVSAS is not set
--# CONFIG_SCSI_STEX is not set
--# CONFIG_SCSI_SYM53C8XX_2 is not set
--# CONFIG_SCSI_QLOGIC_1280 is not set
--# CONFIG_SCSI_QLA_FC is not set
--# CONFIG_SCSI_QLA_ISCSI is not set
--# CONFIG_SCSI_LPFC is not set
--# CONFIG_SCSI_DC395x is not set
--# CONFIG_SCSI_DC390T is not set
--# CONFIG_SCSI_NSP32 is not set
--# CONFIG_SCSI_DEBUG is not set
--# CONFIG_SCSI_SRP is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--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 is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--CONFIG_MARVELL_PHY=y
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--# CONFIG_MII is not set
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--# CONFIG_NET_POCKET is not set
--# CONFIG_FS_ENET is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--CONFIG_GIANFAR=y
--CONFIG_GFAR_NAPI=y
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PLIP is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NET_FC is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--CONFIG_INPUT_MOUSEDEV=y
--CONFIG_INPUT_MOUSEDEV_PSAUX=y
--CONFIG_INPUT_MOUSEDEV_SCREEN_X=1280
--CONFIG_INPUT_MOUSEDEV_SCREEN_Y=1024
--CONFIG_INPUT_JOYDEV=m
--CONFIG_INPUT_EVDEV=m
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--CONFIG_INPUT_KEYBOARD=y
--CONFIG_KEYBOARD_ATKBD=y
--# CONFIG_KEYBOARD_SUNKBD is not set
--# CONFIG_KEYBOARD_LKKBD is not set
--# CONFIG_KEYBOARD_XTKBD is not set
--# CONFIG_KEYBOARD_NEWTON is not set
--# CONFIG_KEYBOARD_STOWAWAY is not set
--CONFIG_INPUT_MOUSE=y
--CONFIG_MOUSE_PS2=y
--CONFIG_MOUSE_PS2_ALPS=y
--CONFIG_MOUSE_PS2_LOGIPS2PP=y
--CONFIG_MOUSE_PS2_SYNAPTICS=y
--CONFIG_MOUSE_PS2_LIFEBOOK=y
--CONFIG_MOUSE_PS2_TRACKPOINT=y
--# CONFIG_MOUSE_PS2_TOUCHKIT is not set
--# CONFIG_MOUSE_SERIAL is not set
--# CONFIG_MOUSE_APPLETOUCH is not set
--# CONFIG_MOUSE_VSXXXAA is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--CONFIG_SERIO=y
--CONFIG_SERIO_I8042=y
--CONFIG_SERIO_SERPORT=y
--# CONFIG_SERIO_PARKBD is not set
--# CONFIG_SERIO_PCIPS2 is not set
--CONFIG_SERIO_LIBPS2=y
--# CONFIG_SERIO_RAW is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--# CONFIG_SERIAL_8250 is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--CONFIG_SERIAL_CPM=y
--CONFIG_SERIAL_CPM_CONSOLE=y
--# CONFIG_SERIAL_CPM_SCC1 is not set
--CONFIG_SERIAL_CPM_SCC2=y
--# CONFIG_SERIAL_CPM_SCC3 is not set
--# CONFIG_SERIAL_CPM_SCC4 is not set
--# CONFIG_SERIAL_CPM_SMC1 is not set
--# CONFIG_SERIAL_CPM_SMC2 is not set
--# CONFIG_SERIAL_JSM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--CONFIG_PRINTER=m
--# CONFIG_LP_CONSOLE is not set
--# CONFIG_PPDEV is not set
--# CONFIG_IPMI_HANDLER is not set
--CONFIG_HW_RANDOM=m
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--CONFIG_I2C=m
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=m
--
--#
--# I2C Algorithms
--#
--CONFIG_I2C_ALGOBIT=m
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_ALI1535 is not set
--# CONFIG_I2C_ALI1563 is not set
--# CONFIG_I2C_ALI15X3 is not set
--# CONFIG_I2C_AMD756 is not set
--# CONFIG_I2C_AMD8111 is not set
--# CONFIG_I2C_I801 is not set
--# CONFIG_I2C_I810 is not set
--# CONFIG_I2C_PIIX4 is not set
--# CONFIG_I2C_MPC is not set
--# CONFIG_I2C_NFORCE2 is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--# CONFIG_I2C_PROSAVAGE is not set
--# CONFIG_I2C_SAVAGE4 is not set
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_SIS5595 is not set
--# CONFIG_I2C_SIS630 is not set
--# CONFIG_I2C_SIS96X is not set
--# CONFIG_I2C_TAOS_EVM is not set
--# CONFIG_I2C_STUB is not set
--# CONFIG_I2C_VIA is not set
--# CONFIG_I2C_VIAPRO is not set
--# CONFIG_I2C_VOODOO3 is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 is not set
--# CONFIG_I2C_DEBUG_CORE is not set
--# CONFIG_I2C_DEBUG_ALGO is not set
--# CONFIG_I2C_DEBUG_BUS is not set
--# CONFIG_I2C_DEBUG_CHIP is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_AD7418 is not set
--# CONFIG_SENSORS_ADM1021 is not set
--# CONFIG_SENSORS_ADM1025 is not set
--# CONFIG_SENSORS_ADM1026 is not set
--# CONFIG_SENSORS_ADM1029 is not set
--# CONFIG_SENSORS_ADM1031 is not set
--# CONFIG_SENSORS_ADM9240 is not set
--# CONFIG_SENSORS_ADT7470 is not set
--# CONFIG_SENSORS_ADT7473 is not set
--# CONFIG_SENSORS_ATXP1 is not set
--# CONFIG_SENSORS_DS1621 is not set
--# CONFIG_SENSORS_I5K_AMB is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_F75375S is not set
--# CONFIG_SENSORS_GL518SM is not set
--# CONFIG_SENSORS_GL520SM is not set
--# CONFIG_SENSORS_IT87 is not set
--# CONFIG_SENSORS_LM63 is not set
--# CONFIG_SENSORS_LM75 is not set
--# CONFIG_SENSORS_LM77 is not set
--# CONFIG_SENSORS_LM78 is not set
--# CONFIG_SENSORS_LM80 is not set
--# CONFIG_SENSORS_LM83 is not set
--# CONFIG_SENSORS_LM85 is not set
--# 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_SIS5595 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_ADS7828 is not set
--# CONFIG_SENSORS_THMC50 is not set
--# CONFIG_SENSORS_VIA686A is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_VT8231 is not set
--# CONFIG_SENSORS_W83781D is not set
--# CONFIG_SENSORS_W83791D is not set
--# CONFIG_SENSORS_W83792D is not set
--# CONFIG_SENSORS_W83793 is not set
--# CONFIG_SENSORS_W83L785TS is not set
--# CONFIG_SENSORS_W83L786NG is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--# CONFIG_HWMON_DEBUG_CHIP is not set
--# CONFIG_THERMAL is not set
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--CONFIG_AGP=m
--CONFIG_DRM=m
--# CONFIG_DRM_TDFX is not set
--# CONFIG_DRM_R128 is not set
--# CONFIG_DRM_RADEON is not set
--# CONFIG_DRM_MGA is not set
--# CONFIG_DRM_SIS is not set
--# CONFIG_DRM_VIA is not set
--# CONFIG_DRM_SAVAGE is not set
--# CONFIG_VGASTATE is not set
--# CONFIG_VIDEO_OUTPUT_CONTROL is not set
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--CONFIG_SOUND=m
--
--#
--# Advanced Linux Sound Architecture
--#
--# CONFIG_SND is not set
--
--#
--# Open Sound System
--#
--# CONFIG_SOUND_PRIME is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--# CONFIG_DMADEVICES is not set
--# CONFIG_AUXDISPLAY is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--CONFIG_EXT3_FS=y
--CONFIG_EXT3_FS_XATTR=y
--# CONFIG_EXT3_FS_POSIX_ACL is not set
--# CONFIG_EXT3_FS_SECURITY is not set
--# CONFIG_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--CONFIG_AUTOFS_FS=m
--CONFIG_AUTOFS4_FS=y
--# CONFIG_FUSE_FS is not set
--
--#
--# CD-ROM/DVD Filesystems
--#
--CONFIG_ISO9660_FS=m
--# CONFIG_JOLIET is not set
--# CONFIG_ZISOFS is not set
--CONFIG_UDF_FS=m
--CONFIG_UDF_NLS=y
--
--#
--# DOS/FAT/NT Filesystems
--#
--CONFIG_FAT_FS=m
--CONFIG_MSDOS_FS=m
--CONFIG_VFAT_FS=m
--CONFIG_FAT_DEFAULT_CODEPAGE=437
--CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--# CONFIG_PROC_KCORE is not set
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
--
--#
--# Miscellaneous filesystems
--#
--# CONFIG_ADFS_FS is not set
--# CONFIG_AFFS_FS is not set
--# CONFIG_HFS_FS is not set
--# CONFIG_HFSPLUS_FS is not set
--# CONFIG_BEFS_FS is not set
--# CONFIG_BFS_FS is not set
--# CONFIG_EFS_FS is not set
--CONFIG_CRAMFS=m
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--CONFIG_SMB_FS=m
--# CONFIG_SMB_NLS_DEFAULT is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--# CONFIG_PARTITION_ADVANCED is not set
--CONFIG_MSDOS_PARTITION=y
--CONFIG_NLS=y
--CONFIG_NLS_DEFAULT="iso8859-1"
--# CONFIG_NLS_CODEPAGE_437 is not set
--# CONFIG_NLS_CODEPAGE_737 is not set
--# CONFIG_NLS_CODEPAGE_775 is not set
--# CONFIG_NLS_CODEPAGE_850 is not set
--# CONFIG_NLS_CODEPAGE_852 is not set
--# CONFIG_NLS_CODEPAGE_855 is not set
--# CONFIG_NLS_CODEPAGE_857 is not set
--# CONFIG_NLS_CODEPAGE_860 is not set
--# CONFIG_NLS_CODEPAGE_861 is not set
--# CONFIG_NLS_CODEPAGE_862 is not set
--# CONFIG_NLS_CODEPAGE_863 is not set
--# CONFIG_NLS_CODEPAGE_864 is not set
--# CONFIG_NLS_CODEPAGE_865 is not set
--# CONFIG_NLS_CODEPAGE_866 is not set
--# CONFIG_NLS_CODEPAGE_869 is not set
--# CONFIG_NLS_CODEPAGE_936 is not set
--# CONFIG_NLS_CODEPAGE_950 is not set
--# CONFIG_NLS_CODEPAGE_932 is not set
--# CONFIG_NLS_CODEPAGE_949 is not set
--# CONFIG_NLS_CODEPAGE_874 is not set
--# CONFIG_NLS_ISO8859_8 is not set
--# CONFIG_NLS_CODEPAGE_1250 is not set
--# CONFIG_NLS_CODEPAGE_1251 is not set
--# CONFIG_NLS_ASCII is not set
--# CONFIG_NLS_ISO8859_1 is not set
--# CONFIG_NLS_ISO8859_2 is not set
--# CONFIG_NLS_ISO8859_3 is not set
--# CONFIG_NLS_ISO8859_4 is not set
--# CONFIG_NLS_ISO8859_5 is not set
--# CONFIG_NLS_ISO8859_6 is not set
--# CONFIG_NLS_ISO8859_7 is not set
--# CONFIG_NLS_ISO8859_9 is not set
--# CONFIG_NLS_ISO8859_13 is not set
--# CONFIG_NLS_ISO8859_14 is not set
--# CONFIG_NLS_ISO8859_15 is not set
--# CONFIG_NLS_KOI8_R is not set
--# CONFIG_NLS_KOI8_U is not set
--# CONFIG_NLS_UTF8 is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--CONFIG_CRC_CCITT=y
--# 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=m
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--# CONFIG_DEBUG_HIGHMEM is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_DEBUG_INFO is not set
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--# CONFIG_DEBUGGER is not set
--# CONFIG_KGDB_CONSOLE is not set
--CONFIG_BDI_SWITCH=y
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--# CONFIG_CRYPTO_SEQIV is not set
--# CONFIG_CRYPTO_MANAGER is not set
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--# CONFIG_CRYPTO_MD5 is not set
--# CONFIG_CRYPTO_SHA1 is not set
--# CONFIG_CRYPTO_SHA256 is not set
--# CONFIG_CRYPTO_SHA512 is not set
--# CONFIG_CRYPTO_WP512 is not set
--# CONFIG_CRYPTO_TGR192 is not set
--# CONFIG_CRYPTO_GF128MUL is not set
--# CONFIG_CRYPTO_ECB is not set
--# CONFIG_CRYPTO_CBC is not set
--# CONFIG_CRYPTO_PCBC is not set
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--# CONFIG_CRYPTO_DES is not set
--# CONFIG_CRYPTO_FCRYPT is not set
--# CONFIG_CRYPTO_BLOWFISH is not set
--# CONFIG_CRYPTO_TWOFISH is not set
--# CONFIG_CRYPTO_SERPENT is not set
--# CONFIG_CRYPTO_AES is not set
--# CONFIG_CRYPTO_CAST5 is not set
--# CONFIG_CRYPTO_CAST6 is not set
--# CONFIG_CRYPTO_TEA is not set
--# CONFIG_CRYPTO_ARC4 is not set
--# CONFIG_CRYPTO_KHAZAD is not set
--# CONFIG_CRYPTO_ANUBIS is not set
--# CONFIG_CRYPTO_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
--CONFIG_PPC_LIB_RHEAP=y
---- a/arch/powerpc/configs/taishan_defconfig
-+++ /dev/null
-@@ -1,815 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc2
--# Fri Feb 15 21:40:44 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--CONFIG_44x=y
--# CONFIG_E200 is not set
--CONFIG_4xx=y
--CONFIG_BOOKE=y
--CONFIG_PTE_64BIT=y
--CONFIG_PHYS_64BIT=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_NOT_COHERENT_CACHE=y
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--# CONFIG_DEFAULT_UIMAGE is not set
--CONFIG_PPC_DCR_NATIVE=y
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_PPC_DCR=y
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--CONFIG_POSIX_MQUEUE=y
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--CONFIG_FAIR_GROUP_SCHED=y
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--CONFIG_KALLSYMS=y
--# CONFIG_KALLSYMS_ALL is not set
--# CONFIG_KALLSYMS_EXTRA_PASS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=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 is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--# CONFIG_KPROBES is not set
--CONFIG_HAVE_KPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--CONFIG_KMOD=y
--CONFIG_BLOCK=y
--CONFIG_LBD=y
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--CONFIG_DEFAULT_AS=y
--# CONFIG_DEFAULT_DEADLINE is not set
--# CONFIG_DEFAULT_CFQ is not set
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="anticipatory"
--CONFIG_CLASSIC_RCU=y
--# CONFIG_PREEMPT_RCU is not set
--# CONFIG_PPC4xx_PCI_EXPRESS is not set
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--# CONFIG_BAMBOO is not set
--# CONFIG_EBONY is not set
--# CONFIG_SEQUOIA is not set
--CONFIG_TAISHAN=y
--# CONFIG_KATMAI is not set
--# CONFIG_RAINIER is not set
--# CONFIG_WARP is not set
--CONFIG_440GX=y
--# CONFIG_IPIC is not set
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_RCU_TRACE=y
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--# CONFIG_MATH_EMULATION is not set
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--CONFIG_RESOURCES_64BIT=y
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--CONFIG_CMDLINE_BOOL=y
--CONFIG_CMDLINE=""
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCI_DEBUG is not set
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_CONSISTENT_START=0xff100000
--CONFIG_CONSISTENT_SIZE=0x00200000
--CONFIG_BOOT_LOAD=0x01000000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--# CONFIG_IP_MULTICAST is not set
--# CONFIG_IP_ADVANCED_ROUTER is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_PNP=y
--CONFIG_IP_PNP_DHCP=y
--CONFIG_IP_PNP_BOOTP=y
--# CONFIG_IP_PNP_RARP is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_ARPD is not set
--# CONFIG_SYN_COOKIES is not set
--# CONFIG_INET_AH is not set
--# CONFIG_INET_ESP is not set
--# CONFIG_INET_IPCOMP is not set
--# CONFIG_INET_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
--# CONFIG_INET_XFRM_MODE_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_BEET is not set
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--# CONFIG_BRIDGE is not set
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--# CONFIG_LLC2 is not set
--# CONFIG_IPX is not set
--# CONFIG_ATALK is not set
--# CONFIG_X25 is not set
--# CONFIG_LAPB is not set
--# CONFIG_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--CONFIG_FW_LOADER=y
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--CONFIG_CONNECTOR=y
--CONFIG_PROC_EVENTS=y
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--# CONFIG_BLK_DEV_LOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=35000
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--# CONFIG_XILINX_SYSACE is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--CONFIG_MACINTOSH_DRIVERS=y
--# CONFIG_MAC_EMUMOUSEBTN is not set
--# CONFIG_WINDFARM is not set
--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 is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--# CONFIG_PHYLIB is not set
--CONFIG_NET_ETHERNET=y
--# CONFIG_MII is not set
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--CONFIG_IBM_NEW_EMAC=y
--CONFIG_IBM_NEW_EMAC_RXB=128
--CONFIG_IBM_NEW_EMAC_TXB=64
--CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
--CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
--CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
--# CONFIG_IBM_NEW_EMAC_DEBUG is not set
--CONFIG_IBM_NEW_EMAC_ZMII=y
--CONFIG_IBM_NEW_EMAC_RGMII=y
--CONFIG_IBM_NEW_EMAC_TAH=y
--CONFIG_IBM_NEW_EMAC_EMAC4=y
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--# CONFIG_INPUT is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--# CONFIG_SERIAL_8250_PCI is not set
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--CONFIG_SERIAL_8250_EXTENDED=y
--# CONFIG_SERIAL_8250_MANY_PORTS is not set
--CONFIG_SERIAL_8250_SHARE_IRQ=y
--# CONFIG_SERIAL_8250_DETECT_IRQ is not set
--# CONFIG_SERIAL_8250_RSA is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--CONFIG_SERIAL_OF_PLATFORM=y
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--# CONFIG_I2C is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--# CONFIG_HWMON is not set
--CONFIG_THERMAL=y
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=m
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--# CONFIG_EXT3_FS is not set
--# CONFIG_EXT4DEV_FS is not set
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# CONFIG_AUTOFS_FS is not set
--# CONFIG_AUTOFS4_FS is not set
--# CONFIG_FUSE_FS is not set
--
--#
--# CD-ROM/DVD Filesystems
--#
--# CONFIG_ISO9660_FS is not set
--# CONFIG_UDF_FS is not set
--
--#
--# DOS/FAT/NT Filesystems
--#
--# CONFIG_MSDOS_FS is not set
--# CONFIG_VFAT_FS is not set
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
--
--#
--# Miscellaneous filesystems
--#
--# CONFIG_ADFS_FS is not set
--# CONFIG_AFFS_FS is not set
--# CONFIG_HFS_FS is not set
--# CONFIG_HFSPLUS_FS is not set
--# CONFIG_BEFS_FS is not set
--# CONFIG_BFS_FS is not set
--# CONFIG_EFS_FS is not set
--CONFIG_CRAMFS=y
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--# CONFIG_PARTITION_ADVANCED is not set
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# 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_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--CONFIG_MAGIC_SYSRQ=y
--# CONFIG_UNUSED_SYMBOLS is not set
--CONFIG_DEBUG_FS=y
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_DEBUG_INFO is not set
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--CONFIG_DEBUGGER=y
--# CONFIG_KGDB is not set
--# CONFIG_XMON is not set
--# CONFIG_VIRQ_DEBUG is not set
--# CONFIG_BDI_SWITCH is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--CONFIG_CRYPTO_MD5=y
--# CONFIG_CRYPTO_SHA1 is not set
--# CONFIG_CRYPTO_SHA256 is not set
--# CONFIG_CRYPTO_SHA512 is not set
--# CONFIG_CRYPTO_WP512 is not set
--# CONFIG_CRYPTO_TGR192 is not set
--# CONFIG_CRYPTO_GF128MUL is not set
--CONFIG_CRYPTO_ECB=y
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=y
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# CONFIG_CRYPTO_BLOWFISH is not set
--# CONFIG_CRYPTO_TWOFISH is not set
--# CONFIG_CRYPTO_SERPENT is not set
--# CONFIG_CRYPTO_AES is not set
--# CONFIG_CRYPTO_CAST5 is not set
--# CONFIG_CRYPTO_CAST6 is not set
--# CONFIG_CRYPTO_TEA is not set
--# CONFIG_CRYPTO_ARC4 is not set
--# CONFIG_CRYPTO_KHAZAD is not set
--# CONFIG_CRYPTO_ANUBIS is not set
--# CONFIG_CRYPTO_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/tqm8540_defconfig
-+++ /dev/null
-@@ -1,1097 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:43 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--CONFIG_PPC_85xx=y
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_E500=y
--CONFIG_BOOKE=y
--CONFIG_FSL_BOOKE=y
--CONFIG_FSL_EMB_PERFMON=y
--# CONFIG_PHYS_64BIT is not set
--CONFIG_SPE=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--CONFIG_FAIR_GROUP_SCHED=y
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--# CONFIG_KALLSYMS is not set
--# CONFIG_HOTPLUG is not set
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--# CONFIG_EPOLL is not set
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--# CONFIG_MODULES is not set
--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
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--CONFIG_DEFAULT_AS=y
--# CONFIG_DEFAULT_DEADLINE is not set
--# CONFIG_DEFAULT_CFQ is not set
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="anticipatory"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC85xx=y
--# CONFIG_MPC8540_ADS is not set
--# CONFIG_MPC8560_ADS is not set
--# CONFIG_MPC85xx_CDS is not set
--# CONFIG_MPC85xx_MDS is not set
--# CONFIG_MPC85xx_DS is not set
--# CONFIG_STX_GP3 is not set
--CONFIG_TQM8540=y
--# CONFIG_TQM8541 is not set
--# CONFIG_TQM8555 is not set
--# CONFIG_TQM8560 is not set
--# CONFIG_SBC8548 is not set
--# CONFIG_SBC8560 is not set
--CONFIG_TQM85xx=y
--# CONFIG_IPIC is not set
--CONFIG_MPIC=y
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_CPM2 is not set
--CONFIG_PPC_CPM_NEW_BINDING=y
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--CONFIG_MATH_EMULATION=y
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--# CONFIG_PROC_DEVICETREE is not set
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_FSL_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--# CONFIG_XFRM_USER is not set
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# CONFIG_IP_ADVANCED_ROUTER is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_PNP=y
--CONFIG_IP_PNP_DHCP=y
--CONFIG_IP_PNP_BOOTP=y
--# CONFIG_IP_PNP_RARP is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# CONFIG_INET_AH is not set
--# CONFIG_INET_ESP is not set
--# CONFIG_INET_IPCOMP is not set
--# CONFIG_INET_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--CONFIG_INET_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--# CONFIG_BRIDGE is not set
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--# CONFIG_LLC2 is not set
--# CONFIG_IPX is not set
--# CONFIG_ATALK is not set
--# CONFIG_X25 is not set
--# CONFIG_LAPB is not set
--# CONFIG_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--CONFIG_MTD_CONCAT=y
--CONFIG_MTD_PARTITIONS=y
--# CONFIG_MTD_REDBOOT_PARTS is not set
--CONFIG_MTD_CMDLINE_PARTS=y
--# CONFIG_MTD_OF_PARTS is not set
--
--#
--# User Modules And Translation Layers
--#
--CONFIG_MTD_CHAR=y
--CONFIG_MTD_BLKDEVS=y
--CONFIG_MTD_BLOCK=y
--# CONFIG_FTL is not set
--# CONFIG_NFTL is not set
--# CONFIG_INFTL is not set
--# CONFIG_RFD_FTL is not set
--# CONFIG_SSFDC is not set
--# CONFIG_MTD_OOPS is not set
--
--#
--# RAM/ROM/Flash chip drivers
--#
--CONFIG_MTD_CFI=y
--# CONFIG_MTD_JEDECPROBE is not set
--CONFIG_MTD_GEN_PROBE=y
--# CONFIG_MTD_CFI_ADV_OPTIONS is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--CONFIG_MTD_MAP_BANK_WIDTH_4=y
--# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
--CONFIG_MTD_CFI_I1=y
--CONFIG_MTD_CFI_I2=y
--# CONFIG_MTD_CFI_I4 is not set
--# CONFIG_MTD_CFI_I8 is not set
--# CONFIG_MTD_CFI_INTELEXT is not set
--CONFIG_MTD_CFI_AMDSTD=y
--# CONFIG_MTD_CFI_STAA is not set
--CONFIG_MTD_CFI_UTIL=y
--# CONFIG_MTD_RAM is not set
--# CONFIG_MTD_ROM is not set
--# CONFIG_MTD_ABSENT is not set
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--# CONFIG_MTD_PHYSMAP is not set
--# CONFIG_MTD_PHYSMAP_OF is not set
--# CONFIG_MTD_INTEL_VR_NOR is not set
--# CONFIG_MTD_PLATRAM is not set
--
--#
--# Self-contained MTD device drivers
--#
--# CONFIG_MTD_PMC551 is not set
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_MTDRAM is not set
--# CONFIG_MTD_BLOCK2MTD is not set
--
--#
--# Disk-On-Chip Device Drivers
--#
--# CONFIG_MTD_DOC2000 is not set
--# CONFIG_MTD_DOC2001 is not set
--# CONFIG_MTD_DOC2001PLUS is not set
--# CONFIG_MTD_NAND is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--CONFIG_IDE=y
--CONFIG_IDE_MAX_HWIFS=4
--CONFIG_BLK_DEV_IDE=y
--
--#
--# Please see Documentation/ide/ide.txt for help/info on IDE drives
--#
--# CONFIG_BLK_DEV_IDE_SATA is not set
--CONFIG_BLK_DEV_IDEDISK=y
--# CONFIG_IDEDISK_MULTI_MODE is not set
--# CONFIG_BLK_DEV_IDECD is not set
--# CONFIG_BLK_DEV_IDETAPE is not set
--# CONFIG_BLK_DEV_IDEFLOPPY is not set
--# CONFIG_IDE_TASK_IOCTL is not set
--CONFIG_IDE_PROC_FS=y
--
--#
--# IDE chipset support/bugfixes
--#
--CONFIG_IDE_GENERIC=y
--# CONFIG_BLK_DEV_PLATFORM is not set
--CONFIG_BLK_DEV_IDEDMA_SFF=y
--
--#
--# PCI IDE chipsets support
--#
--CONFIG_BLK_DEV_IDEPCI=y
--CONFIG_IDEPCI_PCIBUS_ORDER=y
--# CONFIG_BLK_DEV_OFFBOARD is not set
--CONFIG_BLK_DEV_GENERIC=y
--# CONFIG_BLK_DEV_OPTI621 is not set
--CONFIG_BLK_DEV_IDEDMA_PCI=y
--# CONFIG_BLK_DEV_AEC62XX is not set
--# CONFIG_BLK_DEV_ALI15X3 is not set
--# CONFIG_BLK_DEV_AMD74XX is not set
--# CONFIG_BLK_DEV_CMD64X is not set
--# CONFIG_BLK_DEV_TRIFLEX is not set
--# CONFIG_BLK_DEV_CY82C693 is not set
--# CONFIG_BLK_DEV_CS5520 is not set
--# CONFIG_BLK_DEV_CS5530 is not set
--# CONFIG_BLK_DEV_HPT34X is not set
--# CONFIG_BLK_DEV_HPT366 is not set
--# CONFIG_BLK_DEV_JMICRON is not set
--# CONFIG_BLK_DEV_SC1200 is not set
--# CONFIG_BLK_DEV_PIIX is not set
--# CONFIG_BLK_DEV_IT8213 is not set
--# CONFIG_BLK_DEV_IT821X is not set
--# CONFIG_BLK_DEV_NS87415 is not set
--# CONFIG_BLK_DEV_PDC202XX_OLD is not set
--# CONFIG_BLK_DEV_PDC202XX_NEW is not set
--# CONFIG_BLK_DEV_SVWKS is not set
--# CONFIG_BLK_DEV_SIIMAGE is not set
--# CONFIG_BLK_DEV_SL82C105 is not set
--# CONFIG_BLK_DEV_SLC90E66 is not set
--# CONFIG_BLK_DEV_TRM290 is not set
--CONFIG_BLK_DEV_VIA82CXXX=y
--# CONFIG_BLK_DEV_TC86C001 is not set
--CONFIG_BLK_DEV_IDEDMA=y
--CONFIG_IDE_ARCH_OBSOLETE_INIT=y
--# CONFIG_BLK_DEV_HD is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--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 is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--# CONFIG_MARVELL_PHY is not set
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--CONFIG_NET_PCI=y
--# CONFIG_PCNET32 is not set
--# CONFIG_AMD8111_ETH is not set
--# CONFIG_ADAPTEC_STARFIRE is not set
--# CONFIG_B44 is not set
--# CONFIG_FORCEDETH is not set
--# CONFIG_EEPRO100 is not set
--CONFIG_E100=y
--# CONFIG_FEALNX is not set
--# CONFIG_NATSEMI is not set
--# CONFIG_NE2K_PCI is not set
--# CONFIG_8139CP is not set
--# CONFIG_8139TOO is not set
--# CONFIG_R6040 is not set
--# CONFIG_SIS900 is not set
--# CONFIG_EPIC100 is not set
--# CONFIG_SUNDANCE is not set
--# CONFIG_TLAN is not set
--# CONFIG_VIA_RHINE is not set
--# CONFIG_SC92031 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--CONFIG_GIANFAR=y
--CONFIG_GFAR_NAPI=y
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--CONFIG_SERIAL_8250_SHARE_IRQ=y
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--CONFIG_HW_RANDOM=y
--# CONFIG_NVRAM is not set
--CONFIG_GEN_RTC=y
--# CONFIG_GEN_RTC_X is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=y
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_ALI1535 is not set
--# CONFIG_I2C_ALI1563 is not set
--# CONFIG_I2C_ALI15X3 is not set
--# CONFIG_I2C_AMD756 is not set
--# CONFIG_I2C_AMD8111 is not set
--# CONFIG_I2C_I801 is not set
--# CONFIG_I2C_I810 is not set
--# CONFIG_I2C_PIIX4 is not set
--CONFIG_I2C_MPC=y
--# CONFIG_I2C_NFORCE2 is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--# CONFIG_I2C_PROSAVAGE is not set
--# CONFIG_I2C_SAVAGE4 is not set
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_SIS5595 is not set
--# CONFIG_I2C_SIS630 is not set
--# CONFIG_I2C_SIS96X is not set
--# CONFIG_I2C_TAOS_EVM is not set
--# CONFIG_I2C_VIA is not set
--# CONFIG_I2C_VIAPRO is not set
--# CONFIG_I2C_VOODOO3 is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 is not set
--# CONFIG_I2C_DEBUG_CORE is not set
--# CONFIG_I2C_DEBUG_ALGO is not set
--# CONFIG_I2C_DEBUG_BUS is not set
--# CONFIG_I2C_DEBUG_CHIP is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_AD7418 is not set
--# CONFIG_SENSORS_ADM1021 is not set
--# CONFIG_SENSORS_ADM1025 is not set
--# CONFIG_SENSORS_ADM1026 is not set
--# CONFIG_SENSORS_ADM1029 is not set
--# CONFIG_SENSORS_ADM1031 is not set
--# CONFIG_SENSORS_ADM9240 is not set
--# CONFIG_SENSORS_ADT7470 is not set
--# CONFIG_SENSORS_ADT7473 is not set
--# CONFIG_SENSORS_ATXP1 is not set
--# CONFIG_SENSORS_DS1621 is not set
--# CONFIG_SENSORS_I5K_AMB is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_F75375S is not set
--# CONFIG_SENSORS_GL518SM is not set
--# CONFIG_SENSORS_GL520SM is not set
--# CONFIG_SENSORS_IT87 is not set
--# CONFIG_SENSORS_LM63 is not set
--CONFIG_SENSORS_LM75=y
--# CONFIG_SENSORS_LM77 is not set
--# CONFIG_SENSORS_LM78 is not set
--# CONFIG_SENSORS_LM80 is not set
--# CONFIG_SENSORS_LM83 is not set
--# CONFIG_SENSORS_LM85 is not set
--# 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_SIS5595 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_ADS7828 is not set
--# CONFIG_SENSORS_THMC50 is not set
--# CONFIG_SENSORS_VIA686A is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_VT8231 is not set
--# CONFIG_SENSORS_W83781D is not set
--# CONFIG_SENSORS_W83791D is not set
--# CONFIG_SENSORS_W83792D is not set
--# CONFIG_SENSORS_W83793 is not set
--# CONFIG_SENSORS_W83L785TS is not set
--# CONFIG_SENSORS_W83L786NG is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--CONFIG_HWMON_DEBUG_CHIP=y
--# CONFIG_THERMAL is not set
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--# CONFIG_VIDEO_OUTPUT_CONTROL is not set
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--CONFIG_EXT3_FS=y
--CONFIG_EXT3_FS_XATTR=y
--# CONFIG_EXT3_FS_POSIX_ACL is not set
--# CONFIG_EXT3_FS_SECURITY is not set
--# CONFIG_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# CONFIG_AUTOFS_FS is not set
--# CONFIG_AUTOFS4_FS is not set
--# CONFIG_FUSE_FS is not set
--
--#
--# CD-ROM/DVD Filesystems
--#
--# CONFIG_ISO9660_FS is not set
--# CONFIG_UDF_FS is not set
--
--#
--# DOS/FAT/NT Filesystems
--#
--# CONFIG_MSDOS_FS is not set
--# CONFIG_VFAT_FS is not set
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
--
--#
--# Miscellaneous filesystems
--#
--# CONFIG_ADFS_FS is not set
--# CONFIG_AFFS_FS is not set
--# CONFIG_HFS_FS is not set
--# CONFIG_HFSPLUS_FS is not set
--# CONFIG_BEFS_FS is not set
--# CONFIG_BFS_FS is not set
--# CONFIG_EFS_FS is not set
--CONFIG_JFFS2_FS=y
--CONFIG_JFFS2_FS_DEBUG=0
--CONFIG_JFFS2_FS_WRITEBUFFER=y
--# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
--# CONFIG_JFFS2_SUMMARY is not set
--# CONFIG_JFFS2_FS_XATTR is not set
--# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
--CONFIG_JFFS2_ZLIB=y
--# CONFIG_JFFS2_LZO is not set
--CONFIG_JFFS2_RTIME=y
--# CONFIG_JFFS2_RUBIN is not set
--CONFIG_CRAMFS=y
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--# CONFIG_NFS_V3 is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--# CONFIG_MAC_PARTITION is not set
--# CONFIG_MSDOS_PARTITION is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# 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
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--# CONFIG_DEBUG_KERNEL is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--# CONFIG_CRYPTO_SEQIV is not set
--# CONFIG_CRYPTO_MANAGER is not set
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--# CONFIG_CRYPTO_MD5 is not set
--# CONFIG_CRYPTO_SHA1 is not set
--# CONFIG_CRYPTO_SHA256 is not set
--# CONFIG_CRYPTO_SHA512 is not set
--# CONFIG_CRYPTO_WP512 is not set
--# CONFIG_CRYPTO_TGR192 is not set
--# CONFIG_CRYPTO_GF128MUL is not set
--# CONFIG_CRYPTO_ECB is not set
--# CONFIG_CRYPTO_CBC is not set
--# CONFIG_CRYPTO_PCBC is not set
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--# CONFIG_CRYPTO_DES is not set
--# CONFIG_CRYPTO_FCRYPT is not set
--# CONFIG_CRYPTO_BLOWFISH is not set
--# CONFIG_CRYPTO_TWOFISH is not set
--# CONFIG_CRYPTO_SERPENT is not set
--# CONFIG_CRYPTO_AES is not set
--# CONFIG_CRYPTO_CAST5 is not set
--# CONFIG_CRYPTO_CAST6 is not set
--# CONFIG_CRYPTO_TEA is not set
--# CONFIG_CRYPTO_ARC4 is not set
--# CONFIG_CRYPTO_KHAZAD is not set
--# CONFIG_CRYPTO_ANUBIS is not set
--# CONFIG_CRYPTO_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/tqm8541_defconfig
-+++ /dev/null
-@@ -1,1109 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:44 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--CONFIG_PPC_85xx=y
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_E500=y
--CONFIG_BOOKE=y
--CONFIG_FSL_BOOKE=y
--CONFIG_FSL_EMB_PERFMON=y
--# CONFIG_PHYS_64BIT is not set
--CONFIG_SPE=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--CONFIG_FAIR_GROUP_SCHED=y
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--# CONFIG_KALLSYMS is not set
--# CONFIG_HOTPLUG is not set
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--# CONFIG_EPOLL is not set
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--# CONFIG_MODULES is not set
--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
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--CONFIG_DEFAULT_AS=y
--# CONFIG_DEFAULT_DEADLINE is not set
--# CONFIG_DEFAULT_CFQ is not set
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="anticipatory"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC85xx=y
--# CONFIG_MPC8540_ADS is not set
--# CONFIG_MPC8560_ADS is not set
--# CONFIG_MPC85xx_CDS is not set
--# CONFIG_MPC85xx_MDS is not set
--# CONFIG_MPC85xx_DS is not set
--# CONFIG_STX_GP3 is not set
--# CONFIG_TQM8540 is not set
--CONFIG_TQM8541=y
--# CONFIG_TQM8555 is not set
--# CONFIG_TQM8560 is not set
--# CONFIG_SBC8548 is not set
--# CONFIG_SBC8560 is not set
--CONFIG_TQM85xx=y
--# CONFIG_IPIC is not set
--CONFIG_MPIC=y
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--CONFIG_CPM2=y
--CONFIG_PPC_CPM_NEW_BINDING=y
--# CONFIG_FSL_ULI1575 is not set
--CONFIG_CPM=y
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--CONFIG_MATH_EMULATION=y
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--# CONFIG_PROC_DEVICETREE is not set
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_FSL_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--# CONFIG_XFRM_USER is not set
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# CONFIG_IP_ADVANCED_ROUTER is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_PNP=y
--CONFIG_IP_PNP_DHCP=y
--CONFIG_IP_PNP_BOOTP=y
--# CONFIG_IP_PNP_RARP is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# CONFIG_INET_AH is not set
--# CONFIG_INET_ESP is not set
--# CONFIG_INET_IPCOMP is not set
--# CONFIG_INET_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--CONFIG_INET_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--# CONFIG_BRIDGE is not set
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--# CONFIG_LLC2 is not set
--# CONFIG_IPX is not set
--# CONFIG_ATALK is not set
--# CONFIG_X25 is not set
--# CONFIG_LAPB is not set
--# CONFIG_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--CONFIG_MTD_CONCAT=y
--CONFIG_MTD_PARTITIONS=y
--# CONFIG_MTD_REDBOOT_PARTS is not set
--CONFIG_MTD_CMDLINE_PARTS=y
--# CONFIG_MTD_OF_PARTS is not set
--
--#
--# User Modules And Translation Layers
--#
--CONFIG_MTD_CHAR=y
--CONFIG_MTD_BLKDEVS=y
--CONFIG_MTD_BLOCK=y
--# CONFIG_FTL is not set
--# CONFIG_NFTL is not set
--# CONFIG_INFTL is not set
--# CONFIG_RFD_FTL is not set
--# CONFIG_SSFDC is not set
--# CONFIG_MTD_OOPS is not set
--
--#
--# RAM/ROM/Flash chip drivers
--#
--CONFIG_MTD_CFI=y
--# CONFIG_MTD_JEDECPROBE is not set
--CONFIG_MTD_GEN_PROBE=y
--# CONFIG_MTD_CFI_ADV_OPTIONS is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--CONFIG_MTD_MAP_BANK_WIDTH_4=y
--# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
--CONFIG_MTD_CFI_I1=y
--CONFIG_MTD_CFI_I2=y
--# CONFIG_MTD_CFI_I4 is not set
--# CONFIG_MTD_CFI_I8 is not set
--# CONFIG_MTD_CFI_INTELEXT is not set
--CONFIG_MTD_CFI_AMDSTD=y
--# CONFIG_MTD_CFI_STAA is not set
--CONFIG_MTD_CFI_UTIL=y
--# CONFIG_MTD_RAM is not set
--# CONFIG_MTD_ROM is not set
--# CONFIG_MTD_ABSENT is not set
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--# CONFIG_MTD_PHYSMAP is not set
--# CONFIG_MTD_PHYSMAP_OF is not set
--# CONFIG_MTD_INTEL_VR_NOR is not set
--# CONFIG_MTD_PLATRAM is not set
--
--#
--# Self-contained MTD device drivers
--#
--# CONFIG_MTD_PMC551 is not set
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_MTDRAM is not set
--# CONFIG_MTD_BLOCK2MTD is not set
--
--#
--# Disk-On-Chip Device Drivers
--#
--# CONFIG_MTD_DOC2000 is not set
--# CONFIG_MTD_DOC2001 is not set
--# CONFIG_MTD_DOC2001PLUS is not set
--# CONFIG_MTD_NAND is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--CONFIG_IDE=y
--CONFIG_IDE_MAX_HWIFS=4
--CONFIG_BLK_DEV_IDE=y
--
--#
--# Please see Documentation/ide/ide.txt for help/info on IDE drives
--#
--# CONFIG_BLK_DEV_IDE_SATA is not set
--CONFIG_BLK_DEV_IDEDISK=y
--# CONFIG_IDEDISK_MULTI_MODE is not set
--# CONFIG_BLK_DEV_IDECD is not set
--# CONFIG_BLK_DEV_IDETAPE is not set
--# CONFIG_BLK_DEV_IDEFLOPPY is not set
--# CONFIG_IDE_TASK_IOCTL is not set
--CONFIG_IDE_PROC_FS=y
--
--#
--# IDE chipset support/bugfixes
--#
--CONFIG_IDE_GENERIC=y
--# CONFIG_BLK_DEV_PLATFORM is not set
--CONFIG_BLK_DEV_IDEDMA_SFF=y
--
--#
--# PCI IDE chipsets support
--#
--CONFIG_BLK_DEV_IDEPCI=y
--CONFIG_IDEPCI_PCIBUS_ORDER=y
--# CONFIG_BLK_DEV_OFFBOARD is not set
--CONFIG_BLK_DEV_GENERIC=y
--# CONFIG_BLK_DEV_OPTI621 is not set
--CONFIG_BLK_DEV_IDEDMA_PCI=y
--# CONFIG_BLK_DEV_AEC62XX is not set
--# CONFIG_BLK_DEV_ALI15X3 is not set
--# CONFIG_BLK_DEV_AMD74XX is not set
--# CONFIG_BLK_DEV_CMD64X is not set
--# CONFIG_BLK_DEV_TRIFLEX is not set
--# CONFIG_BLK_DEV_CY82C693 is not set
--# CONFIG_BLK_DEV_CS5520 is not set
--# CONFIG_BLK_DEV_CS5530 is not set
--# CONFIG_BLK_DEV_HPT34X is not set
--# CONFIG_BLK_DEV_HPT366 is not set
--# CONFIG_BLK_DEV_JMICRON is not set
--# CONFIG_BLK_DEV_SC1200 is not set
--# CONFIG_BLK_DEV_PIIX is not set
--# CONFIG_BLK_DEV_IT8213 is not set
--# CONFIG_BLK_DEV_IT821X is not set
--# CONFIG_BLK_DEV_NS87415 is not set
--# CONFIG_BLK_DEV_PDC202XX_OLD is not set
--# CONFIG_BLK_DEV_PDC202XX_NEW is not set
--# CONFIG_BLK_DEV_SVWKS is not set
--# CONFIG_BLK_DEV_SIIMAGE is not set
--# CONFIG_BLK_DEV_SL82C105 is not set
--# CONFIG_BLK_DEV_SLC90E66 is not set
--# CONFIG_BLK_DEV_TRM290 is not set
--CONFIG_BLK_DEV_VIA82CXXX=y
--# CONFIG_BLK_DEV_TC86C001 is not set
--CONFIG_BLK_DEV_IDEDMA=y
--CONFIG_IDE_ARCH_OBSOLETE_INIT=y
--# CONFIG_BLK_DEV_HD is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--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 is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--# CONFIG_MARVELL_PHY is not set
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--CONFIG_NET_PCI=y
--# CONFIG_PCNET32 is not set
--# CONFIG_AMD8111_ETH is not set
--# CONFIG_ADAPTEC_STARFIRE is not set
--# CONFIG_B44 is not set
--# CONFIG_FORCEDETH is not set
--# CONFIG_EEPRO100 is not set
--CONFIG_E100=y
--# CONFIG_FEALNX is not set
--# CONFIG_NATSEMI is not set
--# CONFIG_NE2K_PCI is not set
--# CONFIG_8139CP is not set
--# CONFIG_8139TOO is not set
--# CONFIG_R6040 is not set
--# CONFIG_SIS900 is not set
--# CONFIG_EPIC100 is not set
--# CONFIG_SUNDANCE is not set
--# CONFIG_TLAN is not set
--# CONFIG_VIA_RHINE is not set
--# CONFIG_SC92031 is not set
--# CONFIG_FS_ENET is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--CONFIG_GIANFAR=y
--CONFIG_GFAR_NAPI=y
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--CONFIG_SERIAL_8250_SHARE_IRQ=y
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--CONFIG_SERIAL_CPM=y
--CONFIG_SERIAL_CPM_CONSOLE=y
--CONFIG_SERIAL_CPM_SCC1=y
--# CONFIG_SERIAL_CPM_SCC2 is not set
--# CONFIG_SERIAL_CPM_SCC3 is not set
--# CONFIG_SERIAL_CPM_SCC4 is not set
--# CONFIG_SERIAL_CPM_SMC1 is not set
--# CONFIG_SERIAL_CPM_SMC2 is not set
--# CONFIG_SERIAL_JSM is not set
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--CONFIG_HW_RANDOM=y
--# CONFIG_NVRAM is not set
--CONFIG_GEN_RTC=y
--# CONFIG_GEN_RTC_X is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=y
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_ALI1535 is not set
--# CONFIG_I2C_ALI1563 is not set
--# CONFIG_I2C_ALI15X3 is not set
--# CONFIG_I2C_AMD756 is not set
--# CONFIG_I2C_AMD8111 is not set
--# CONFIG_I2C_I801 is not set
--# CONFIG_I2C_I810 is not set
--# CONFIG_I2C_PIIX4 is not set
--CONFIG_I2C_MPC=y
--# CONFIG_I2C_NFORCE2 is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--# CONFIG_I2C_PROSAVAGE is not set
--# CONFIG_I2C_SAVAGE4 is not set
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_SIS5595 is not set
--# CONFIG_I2C_SIS630 is not set
--# CONFIG_I2C_SIS96X is not set
--# CONFIG_I2C_TAOS_EVM is not set
--# CONFIG_I2C_VIA is not set
--# CONFIG_I2C_VIAPRO is not set
--# CONFIG_I2C_VOODOO3 is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 is not set
--# CONFIG_I2C_DEBUG_CORE is not set
--# CONFIG_I2C_DEBUG_ALGO is not set
--# CONFIG_I2C_DEBUG_BUS is not set
--# CONFIG_I2C_DEBUG_CHIP is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_AD7418 is not set
--# CONFIG_SENSORS_ADM1021 is not set
--# CONFIG_SENSORS_ADM1025 is not set
--# CONFIG_SENSORS_ADM1026 is not set
--# CONFIG_SENSORS_ADM1029 is not set
--# CONFIG_SENSORS_ADM1031 is not set
--# CONFIG_SENSORS_ADM9240 is not set
--# CONFIG_SENSORS_ADT7470 is not set
--# CONFIG_SENSORS_ADT7473 is not set
--# CONFIG_SENSORS_ATXP1 is not set
--# CONFIG_SENSORS_DS1621 is not set
--# CONFIG_SENSORS_I5K_AMB is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_F75375S is not set
--# CONFIG_SENSORS_GL518SM is not set
--# CONFIG_SENSORS_GL520SM is not set
--# CONFIG_SENSORS_IT87 is not set
--# CONFIG_SENSORS_LM63 is not set
--CONFIG_SENSORS_LM75=y
--# CONFIG_SENSORS_LM77 is not set
--# CONFIG_SENSORS_LM78 is not set
--# CONFIG_SENSORS_LM80 is not set
--# CONFIG_SENSORS_LM83 is not set
--# CONFIG_SENSORS_LM85 is not set
--# 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_SIS5595 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_ADS7828 is not set
--# CONFIG_SENSORS_THMC50 is not set
--# CONFIG_SENSORS_VIA686A is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_VT8231 is not set
--# CONFIG_SENSORS_W83781D is not set
--# CONFIG_SENSORS_W83791D is not set
--# CONFIG_SENSORS_W83792D is not set
--# CONFIG_SENSORS_W83793 is not set
--# CONFIG_SENSORS_W83L785TS is not set
--# CONFIG_SENSORS_W83L786NG is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--CONFIG_HWMON_DEBUG_CHIP=y
--# CONFIG_THERMAL is not set
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--# CONFIG_VIDEO_OUTPUT_CONTROL is not set
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--CONFIG_EXT3_FS=y
--CONFIG_EXT3_FS_XATTR=y
--# CONFIG_EXT3_FS_POSIX_ACL is not set
--# CONFIG_EXT3_FS_SECURITY is not set
--# CONFIG_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# CONFIG_AUTOFS_FS is not set
--# CONFIG_AUTOFS4_FS is not set
--# CONFIG_FUSE_FS is not set
--
--#
--# CD-ROM/DVD Filesystems
--#
--# CONFIG_ISO9660_FS is not set
--# CONFIG_UDF_FS is not set
--
--#
--# DOS/FAT/NT Filesystems
--#
--# CONFIG_MSDOS_FS is not set
--# CONFIG_VFAT_FS is not set
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
--
--#
--# Miscellaneous filesystems
--#
--# CONFIG_ADFS_FS is not set
--# CONFIG_AFFS_FS is not set
--# CONFIG_HFS_FS is not set
--# CONFIG_HFSPLUS_FS is not set
--# CONFIG_BEFS_FS is not set
--# CONFIG_BFS_FS is not set
--# CONFIG_EFS_FS is not set
--CONFIG_JFFS2_FS=y
--CONFIG_JFFS2_FS_DEBUG=0
--CONFIG_JFFS2_FS_WRITEBUFFER=y
--# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
--# CONFIG_JFFS2_SUMMARY is not set
--# CONFIG_JFFS2_FS_XATTR is not set
--# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
--CONFIG_JFFS2_ZLIB=y
--# CONFIG_JFFS2_LZO is not set
--CONFIG_JFFS2_RTIME=y
--# CONFIG_JFFS2_RUBIN is not set
--CONFIG_CRAMFS=y
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--# CONFIG_NFS_V3 is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--# CONFIG_MAC_PARTITION is not set
--# CONFIG_MSDOS_PARTITION is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# 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
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--# CONFIG_DEBUG_KERNEL is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_KGDB_CONSOLE is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--# CONFIG_CRYPTO_SEQIV is not set
--# CONFIG_CRYPTO_MANAGER is not set
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--# CONFIG_CRYPTO_MD5 is not set
--# CONFIG_CRYPTO_SHA1 is not set
--# CONFIG_CRYPTO_SHA256 is not set
--# CONFIG_CRYPTO_SHA512 is not set
--# CONFIG_CRYPTO_WP512 is not set
--# CONFIG_CRYPTO_TGR192 is not set
--# CONFIG_CRYPTO_GF128MUL is not set
--# CONFIG_CRYPTO_ECB is not set
--# CONFIG_CRYPTO_CBC is not set
--# CONFIG_CRYPTO_PCBC is not set
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--# CONFIG_CRYPTO_DES is not set
--# CONFIG_CRYPTO_FCRYPT is not set
--# CONFIG_CRYPTO_BLOWFISH is not set
--# CONFIG_CRYPTO_TWOFISH is not set
--# CONFIG_CRYPTO_SERPENT is not set
--# CONFIG_CRYPTO_AES is not set
--# CONFIG_CRYPTO_CAST5 is not set
--# CONFIG_CRYPTO_CAST6 is not set
--# CONFIG_CRYPTO_TEA is not set
--# CONFIG_CRYPTO_ARC4 is not set
--# CONFIG_CRYPTO_KHAZAD is not set
--# CONFIG_CRYPTO_ANUBIS is not set
--# CONFIG_CRYPTO_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
--CONFIG_PPC_LIB_RHEAP=y
---- a/arch/powerpc/configs/tqm8555_defconfig
-+++ /dev/null
-@@ -1,1109 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:44 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--CONFIG_PPC_85xx=y
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_E500=y
--CONFIG_BOOKE=y
--CONFIG_FSL_BOOKE=y
--CONFIG_FSL_EMB_PERFMON=y
--# CONFIG_PHYS_64BIT is not set
--CONFIG_SPE=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--CONFIG_FAIR_GROUP_SCHED=y
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--# CONFIG_KALLSYMS is not set
--# CONFIG_HOTPLUG is not set
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--# CONFIG_EPOLL is not set
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--# CONFIG_MODULES is not set
--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
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--CONFIG_DEFAULT_AS=y
--# CONFIG_DEFAULT_DEADLINE is not set
--# CONFIG_DEFAULT_CFQ is not set
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="anticipatory"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC85xx=y
--# CONFIG_MPC8540_ADS is not set
--# CONFIG_MPC8560_ADS is not set
--# CONFIG_MPC85xx_CDS is not set
--# CONFIG_MPC85xx_MDS is not set
--# CONFIG_MPC85xx_DS is not set
--# CONFIG_STX_GP3 is not set
--# CONFIG_TQM8540 is not set
--# CONFIG_TQM8541 is not set
--CONFIG_TQM8555=y
--# CONFIG_TQM8560 is not set
--# CONFIG_SBC8548 is not set
--# CONFIG_SBC8560 is not set
--CONFIG_TQM85xx=y
--# CONFIG_IPIC is not set
--CONFIG_MPIC=y
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--CONFIG_CPM2=y
--CONFIG_PPC_CPM_NEW_BINDING=y
--# CONFIG_FSL_ULI1575 is not set
--CONFIG_CPM=y
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--CONFIG_MATH_EMULATION=y
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--# CONFIG_PROC_DEVICETREE is not set
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_FSL_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--# CONFIG_XFRM_USER is not set
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# CONFIG_IP_ADVANCED_ROUTER is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_PNP=y
--CONFIG_IP_PNP_DHCP=y
--CONFIG_IP_PNP_BOOTP=y
--# CONFIG_IP_PNP_RARP is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# CONFIG_INET_AH is not set
--# CONFIG_INET_ESP is not set
--# CONFIG_INET_IPCOMP is not set
--# CONFIG_INET_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--CONFIG_INET_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--# CONFIG_BRIDGE is not set
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--# CONFIG_LLC2 is not set
--# CONFIG_IPX is not set
--# CONFIG_ATALK is not set
--# CONFIG_X25 is not set
--# CONFIG_LAPB is not set
--# CONFIG_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--CONFIG_MTD_CONCAT=y
--CONFIG_MTD_PARTITIONS=y
--# CONFIG_MTD_REDBOOT_PARTS is not set
--CONFIG_MTD_CMDLINE_PARTS=y
--# CONFIG_MTD_OF_PARTS is not set
--
--#
--# User Modules And Translation Layers
--#
--CONFIG_MTD_CHAR=y
--CONFIG_MTD_BLKDEVS=y
--CONFIG_MTD_BLOCK=y
--# CONFIG_FTL is not set
--# CONFIG_NFTL is not set
--# CONFIG_INFTL is not set
--# CONFIG_RFD_FTL is not set
--# CONFIG_SSFDC is not set
--# CONFIG_MTD_OOPS is not set
--
--#
--# RAM/ROM/Flash chip drivers
--#
--CONFIG_MTD_CFI=y
--# CONFIG_MTD_JEDECPROBE is not set
--CONFIG_MTD_GEN_PROBE=y
--# CONFIG_MTD_CFI_ADV_OPTIONS is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--CONFIG_MTD_MAP_BANK_WIDTH_4=y
--# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
--CONFIG_MTD_CFI_I1=y
--CONFIG_MTD_CFI_I2=y
--# CONFIG_MTD_CFI_I4 is not set
--# CONFIG_MTD_CFI_I8 is not set
--# CONFIG_MTD_CFI_INTELEXT is not set
--CONFIG_MTD_CFI_AMDSTD=y
--# CONFIG_MTD_CFI_STAA is not set
--CONFIG_MTD_CFI_UTIL=y
--# CONFIG_MTD_RAM is not set
--# CONFIG_MTD_ROM is not set
--# CONFIG_MTD_ABSENT is not set
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--# CONFIG_MTD_PHYSMAP is not set
--# CONFIG_MTD_PHYSMAP_OF is not set
--# CONFIG_MTD_INTEL_VR_NOR is not set
--# CONFIG_MTD_PLATRAM is not set
--
--#
--# Self-contained MTD device drivers
--#
--# CONFIG_MTD_PMC551 is not set
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_MTDRAM is not set
--# CONFIG_MTD_BLOCK2MTD is not set
--
--#
--# Disk-On-Chip Device Drivers
--#
--# CONFIG_MTD_DOC2000 is not set
--# CONFIG_MTD_DOC2001 is not set
--# CONFIG_MTD_DOC2001PLUS is not set
--# CONFIG_MTD_NAND is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--CONFIG_IDE=y
--CONFIG_IDE_MAX_HWIFS=4
--CONFIG_BLK_DEV_IDE=y
--
--#
--# Please see Documentation/ide/ide.txt for help/info on IDE drives
--#
--# CONFIG_BLK_DEV_IDE_SATA is not set
--CONFIG_BLK_DEV_IDEDISK=y
--# CONFIG_IDEDISK_MULTI_MODE is not set
--# CONFIG_BLK_DEV_IDECD is not set
--# CONFIG_BLK_DEV_IDETAPE is not set
--# CONFIG_BLK_DEV_IDEFLOPPY is not set
--# CONFIG_IDE_TASK_IOCTL is not set
--CONFIG_IDE_PROC_FS=y
--
--#
--# IDE chipset support/bugfixes
--#
--CONFIG_IDE_GENERIC=y
--# CONFIG_BLK_DEV_PLATFORM is not set
--CONFIG_BLK_DEV_IDEDMA_SFF=y
--
--#
--# PCI IDE chipsets support
--#
--CONFIG_BLK_DEV_IDEPCI=y
--CONFIG_IDEPCI_PCIBUS_ORDER=y
--# CONFIG_BLK_DEV_OFFBOARD is not set
--CONFIG_BLK_DEV_GENERIC=y
--# CONFIG_BLK_DEV_OPTI621 is not set
--CONFIG_BLK_DEV_IDEDMA_PCI=y
--# CONFIG_BLK_DEV_AEC62XX is not set
--# CONFIG_BLK_DEV_ALI15X3 is not set
--# CONFIG_BLK_DEV_AMD74XX is not set
--# CONFIG_BLK_DEV_CMD64X is not set
--# CONFIG_BLK_DEV_TRIFLEX is not set
--# CONFIG_BLK_DEV_CY82C693 is not set
--# CONFIG_BLK_DEV_CS5520 is not set
--# CONFIG_BLK_DEV_CS5530 is not set
--# CONFIG_BLK_DEV_HPT34X is not set
--# CONFIG_BLK_DEV_HPT366 is not set
--# CONFIG_BLK_DEV_JMICRON is not set
--# CONFIG_BLK_DEV_SC1200 is not set
--# CONFIG_BLK_DEV_PIIX is not set
--# CONFIG_BLK_DEV_IT8213 is not set
--# CONFIG_BLK_DEV_IT821X is not set
--# CONFIG_BLK_DEV_NS87415 is not set
--# CONFIG_BLK_DEV_PDC202XX_OLD is not set
--# CONFIG_BLK_DEV_PDC202XX_NEW is not set
--# CONFIG_BLK_DEV_SVWKS is not set
--# CONFIG_BLK_DEV_SIIMAGE is not set
--# CONFIG_BLK_DEV_SL82C105 is not set
--# CONFIG_BLK_DEV_SLC90E66 is not set
--# CONFIG_BLK_DEV_TRM290 is not set
--CONFIG_BLK_DEV_VIA82CXXX=y
--# CONFIG_BLK_DEV_TC86C001 is not set
--CONFIG_BLK_DEV_IDEDMA=y
--CONFIG_IDE_ARCH_OBSOLETE_INIT=y
--# CONFIG_BLK_DEV_HD is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--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 is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--# CONFIG_MARVELL_PHY is not set
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--CONFIG_NET_PCI=y
--# CONFIG_PCNET32 is not set
--# CONFIG_AMD8111_ETH is not set
--# CONFIG_ADAPTEC_STARFIRE is not set
--# CONFIG_B44 is not set
--# CONFIG_FORCEDETH is not set
--# CONFIG_EEPRO100 is not set
--CONFIG_E100=y
--# CONFIG_FEALNX is not set
--# CONFIG_NATSEMI is not set
--# CONFIG_NE2K_PCI is not set
--# CONFIG_8139CP is not set
--# CONFIG_8139TOO is not set
--# CONFIG_R6040 is not set
--# CONFIG_SIS900 is not set
--# CONFIG_EPIC100 is not set
--# CONFIG_SUNDANCE is not set
--# CONFIG_TLAN is not set
--# CONFIG_VIA_RHINE is not set
--# CONFIG_SC92031 is not set
--# CONFIG_FS_ENET is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--CONFIG_GIANFAR=y
--CONFIG_GFAR_NAPI=y
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--CONFIG_SERIAL_8250_SHARE_IRQ=y
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--CONFIG_SERIAL_CPM=y
--CONFIG_SERIAL_CPM_CONSOLE=y
--CONFIG_SERIAL_CPM_SCC1=y
--# CONFIG_SERIAL_CPM_SCC2 is not set
--# CONFIG_SERIAL_CPM_SCC3 is not set
--# CONFIG_SERIAL_CPM_SCC4 is not set
--# CONFIG_SERIAL_CPM_SMC1 is not set
--# CONFIG_SERIAL_CPM_SMC2 is not set
--# CONFIG_SERIAL_JSM is not set
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--CONFIG_HW_RANDOM=y
--# CONFIG_NVRAM is not set
--CONFIG_GEN_RTC=y
--# CONFIG_GEN_RTC_X is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=y
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_ALI1535 is not set
--# CONFIG_I2C_ALI1563 is not set
--# CONFIG_I2C_ALI15X3 is not set
--# CONFIG_I2C_AMD756 is not set
--# CONFIG_I2C_AMD8111 is not set
--# CONFIG_I2C_I801 is not set
--# CONFIG_I2C_I810 is not set
--# CONFIG_I2C_PIIX4 is not set
--CONFIG_I2C_MPC=y
--# CONFIG_I2C_NFORCE2 is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--# CONFIG_I2C_PROSAVAGE is not set
--# CONFIG_I2C_SAVAGE4 is not set
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_SIS5595 is not set
--# CONFIG_I2C_SIS630 is not set
--# CONFIG_I2C_SIS96X is not set
--# CONFIG_I2C_TAOS_EVM is not set
--# CONFIG_I2C_VIA is not set
--# CONFIG_I2C_VIAPRO is not set
--# CONFIG_I2C_VOODOO3 is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 is not set
--# CONFIG_I2C_DEBUG_CORE is not set
--# CONFIG_I2C_DEBUG_ALGO is not set
--# CONFIG_I2C_DEBUG_BUS is not set
--# CONFIG_I2C_DEBUG_CHIP is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_AD7418 is not set
--# CONFIG_SENSORS_ADM1021 is not set
--# CONFIG_SENSORS_ADM1025 is not set
--# CONFIG_SENSORS_ADM1026 is not set
--# CONFIG_SENSORS_ADM1029 is not set
--# CONFIG_SENSORS_ADM1031 is not set
--# CONFIG_SENSORS_ADM9240 is not set
--# CONFIG_SENSORS_ADT7470 is not set
--# CONFIG_SENSORS_ADT7473 is not set
--# CONFIG_SENSORS_ATXP1 is not set
--# CONFIG_SENSORS_DS1621 is not set
--# CONFIG_SENSORS_I5K_AMB is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_F75375S is not set
--# CONFIG_SENSORS_GL518SM is not set
--# CONFIG_SENSORS_GL520SM is not set
--# CONFIG_SENSORS_IT87 is not set
--# CONFIG_SENSORS_LM63 is not set
--CONFIG_SENSORS_LM75=y
--# CONFIG_SENSORS_LM77 is not set
--# CONFIG_SENSORS_LM78 is not set
--# CONFIG_SENSORS_LM80 is not set
--# CONFIG_SENSORS_LM83 is not set
--# CONFIG_SENSORS_LM85 is not set
--# 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_SIS5595 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_ADS7828 is not set
--# CONFIG_SENSORS_THMC50 is not set
--# CONFIG_SENSORS_VIA686A is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_VT8231 is not set
--# CONFIG_SENSORS_W83781D is not set
--# CONFIG_SENSORS_W83791D is not set
--# CONFIG_SENSORS_W83792D is not set
--# CONFIG_SENSORS_W83793 is not set
--# CONFIG_SENSORS_W83L785TS is not set
--# CONFIG_SENSORS_W83L786NG is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--CONFIG_HWMON_DEBUG_CHIP=y
--# CONFIG_THERMAL is not set
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--# CONFIG_VIDEO_OUTPUT_CONTROL is not set
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--CONFIG_EXT3_FS=y
--CONFIG_EXT3_FS_XATTR=y
--# CONFIG_EXT3_FS_POSIX_ACL is not set
--# CONFIG_EXT3_FS_SECURITY is not set
--# CONFIG_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# CONFIG_AUTOFS_FS is not set
--# CONFIG_AUTOFS4_FS is not set
--# CONFIG_FUSE_FS is not set
--
--#
--# CD-ROM/DVD Filesystems
--#
--# CONFIG_ISO9660_FS is not set
--# CONFIG_UDF_FS is not set
--
--#
--# DOS/FAT/NT Filesystems
--#
--# CONFIG_MSDOS_FS is not set
--# CONFIG_VFAT_FS is not set
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
--
--#
--# Miscellaneous filesystems
--#
--# CONFIG_ADFS_FS is not set
--# CONFIG_AFFS_FS is not set
--# CONFIG_HFS_FS is not set
--# CONFIG_HFSPLUS_FS is not set
--# CONFIG_BEFS_FS is not set
--# CONFIG_BFS_FS is not set
--# CONFIG_EFS_FS is not set
--CONFIG_JFFS2_FS=y
--CONFIG_JFFS2_FS_DEBUG=0
--CONFIG_JFFS2_FS_WRITEBUFFER=y
--# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
--# CONFIG_JFFS2_SUMMARY is not set
--# CONFIG_JFFS2_FS_XATTR is not set
--# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
--CONFIG_JFFS2_ZLIB=y
--# CONFIG_JFFS2_LZO is not set
--CONFIG_JFFS2_RTIME=y
--# CONFIG_JFFS2_RUBIN is not set
--CONFIG_CRAMFS=y
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--# CONFIG_NFS_V3 is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--# CONFIG_MAC_PARTITION is not set
--# CONFIG_MSDOS_PARTITION is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# 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
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--# CONFIG_DEBUG_KERNEL is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_KGDB_CONSOLE is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--# CONFIG_CRYPTO_SEQIV is not set
--# CONFIG_CRYPTO_MANAGER is not set
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--# CONFIG_CRYPTO_MD5 is not set
--# CONFIG_CRYPTO_SHA1 is not set
--# CONFIG_CRYPTO_SHA256 is not set
--# CONFIG_CRYPTO_SHA512 is not set
--# CONFIG_CRYPTO_WP512 is not set
--# CONFIG_CRYPTO_TGR192 is not set
--# CONFIG_CRYPTO_GF128MUL is not set
--# CONFIG_CRYPTO_ECB is not set
--# CONFIG_CRYPTO_CBC is not set
--# CONFIG_CRYPTO_PCBC is not set
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--# CONFIG_CRYPTO_DES is not set
--# CONFIG_CRYPTO_FCRYPT is not set
--# CONFIG_CRYPTO_BLOWFISH is not set
--# CONFIG_CRYPTO_TWOFISH is not set
--# CONFIG_CRYPTO_SERPENT is not set
--# CONFIG_CRYPTO_AES is not set
--# CONFIG_CRYPTO_CAST5 is not set
--# CONFIG_CRYPTO_CAST6 is not set
--# CONFIG_CRYPTO_TEA is not set
--# CONFIG_CRYPTO_ARC4 is not set
--# CONFIG_CRYPTO_KHAZAD is not set
--# CONFIG_CRYPTO_ANUBIS is not set
--# CONFIG_CRYPTO_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
--CONFIG_PPC_LIB_RHEAP=y
---- a/arch/powerpc/configs/tqm8560_defconfig
-+++ /dev/null
-@@ -1,1109 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:45 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--CONFIG_PPC_85xx=y
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_E500=y
--CONFIG_BOOKE=y
--CONFIG_FSL_BOOKE=y
--CONFIG_FSL_EMB_PERFMON=y
--# CONFIG_PHYS_64BIT is not set
--CONFIG_SPE=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--CONFIG_FAIR_GROUP_SCHED=y
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--# CONFIG_KALLSYMS is not set
--# CONFIG_HOTPLUG is not set
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--# CONFIG_EPOLL is not set
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--# CONFIG_MODULES is not set
--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
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--CONFIG_DEFAULT_AS=y
--# CONFIG_DEFAULT_DEADLINE is not set
--# CONFIG_DEFAULT_CFQ is not set
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="anticipatory"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC85xx=y
--# CONFIG_MPC8540_ADS is not set
--# CONFIG_MPC8560_ADS is not set
--# CONFIG_MPC85xx_CDS is not set
--# CONFIG_MPC85xx_MDS is not set
--# CONFIG_MPC85xx_DS is not set
--# CONFIG_STX_GP3 is not set
--# CONFIG_TQM8540 is not set
--# CONFIG_TQM8541 is not set
--# CONFIG_TQM8555 is not set
--CONFIG_TQM8560=y
--# CONFIG_SBC8548 is not set
--# CONFIG_SBC8560 is not set
--CONFIG_TQM85xx=y
--# CONFIG_IPIC is not set
--CONFIG_MPIC=y
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--CONFIG_CPM2=y
--CONFIG_PPC_CPM_NEW_BINDING=y
--# CONFIG_FSL_ULI1575 is not set
--CONFIG_CPM=y
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--CONFIG_MATH_EMULATION=y
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--# CONFIG_PROC_DEVICETREE is not set
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_FSL_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--# CONFIG_XFRM_USER is not set
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# CONFIG_IP_ADVANCED_ROUTER is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_PNP=y
--CONFIG_IP_PNP_DHCP=y
--CONFIG_IP_PNP_BOOTP=y
--# CONFIG_IP_PNP_RARP is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# CONFIG_INET_AH is not set
--# CONFIG_INET_ESP is not set
--# CONFIG_INET_IPCOMP is not set
--# CONFIG_INET_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--CONFIG_INET_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--# CONFIG_BRIDGE is not set
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--# CONFIG_LLC2 is not set
--# CONFIG_IPX is not set
--# CONFIG_ATALK is not set
--# CONFIG_X25 is not set
--# CONFIG_LAPB is not set
--# CONFIG_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--CONFIG_MTD_CONCAT=y
--CONFIG_MTD_PARTITIONS=y
--# CONFIG_MTD_REDBOOT_PARTS is not set
--CONFIG_MTD_CMDLINE_PARTS=y
--# CONFIG_MTD_OF_PARTS is not set
--
--#
--# User Modules And Translation Layers
--#
--CONFIG_MTD_CHAR=y
--CONFIG_MTD_BLKDEVS=y
--CONFIG_MTD_BLOCK=y
--# CONFIG_FTL is not set
--# CONFIG_NFTL is not set
--# CONFIG_INFTL is not set
--# CONFIG_RFD_FTL is not set
--# CONFIG_SSFDC is not set
--# CONFIG_MTD_OOPS is not set
--
--#
--# RAM/ROM/Flash chip drivers
--#
--CONFIG_MTD_CFI=y
--# CONFIG_MTD_JEDECPROBE is not set
--CONFIG_MTD_GEN_PROBE=y
--# CONFIG_MTD_CFI_ADV_OPTIONS is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--CONFIG_MTD_MAP_BANK_WIDTH_4=y
--# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
--CONFIG_MTD_CFI_I1=y
--CONFIG_MTD_CFI_I2=y
--# CONFIG_MTD_CFI_I4 is not set
--# CONFIG_MTD_CFI_I8 is not set
--# CONFIG_MTD_CFI_INTELEXT is not set
--CONFIG_MTD_CFI_AMDSTD=y
--# CONFIG_MTD_CFI_STAA is not set
--CONFIG_MTD_CFI_UTIL=y
--# CONFIG_MTD_RAM is not set
--# CONFIG_MTD_ROM is not set
--# CONFIG_MTD_ABSENT is not set
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--# CONFIG_MTD_PHYSMAP is not set
--# CONFIG_MTD_PHYSMAP_OF is not set
--# CONFIG_MTD_INTEL_VR_NOR is not set
--# CONFIG_MTD_PLATRAM is not set
--
--#
--# Self-contained MTD device drivers
--#
--# CONFIG_MTD_PMC551 is not set
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_MTDRAM is not set
--# CONFIG_MTD_BLOCK2MTD is not set
--
--#
--# Disk-On-Chip Device Drivers
--#
--# CONFIG_MTD_DOC2000 is not set
--# CONFIG_MTD_DOC2001 is not set
--# CONFIG_MTD_DOC2001PLUS is not set
--# CONFIG_MTD_NAND is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--CONFIG_IDE=y
--CONFIG_IDE_MAX_HWIFS=4
--CONFIG_BLK_DEV_IDE=y
--
--#
--# Please see Documentation/ide/ide.txt for help/info on IDE drives
--#
--# CONFIG_BLK_DEV_IDE_SATA is not set
--CONFIG_BLK_DEV_IDEDISK=y
--# CONFIG_IDEDISK_MULTI_MODE is not set
--# CONFIG_BLK_DEV_IDECD is not set
--# CONFIG_BLK_DEV_IDETAPE is not set
--# CONFIG_BLK_DEV_IDEFLOPPY is not set
--# CONFIG_IDE_TASK_IOCTL is not set
--CONFIG_IDE_PROC_FS=y
--
--#
--# IDE chipset support/bugfixes
--#
--CONFIG_IDE_GENERIC=y
--# CONFIG_BLK_DEV_PLATFORM is not set
--CONFIG_BLK_DEV_IDEDMA_SFF=y
--
--#
--# PCI IDE chipsets support
--#
--CONFIG_BLK_DEV_IDEPCI=y
--CONFIG_IDEPCI_PCIBUS_ORDER=y
--# CONFIG_BLK_DEV_OFFBOARD is not set
--CONFIG_BLK_DEV_GENERIC=y
--# CONFIG_BLK_DEV_OPTI621 is not set
--CONFIG_BLK_DEV_IDEDMA_PCI=y
--# CONFIG_BLK_DEV_AEC62XX is not set
--# CONFIG_BLK_DEV_ALI15X3 is not set
--# CONFIG_BLK_DEV_AMD74XX is not set
--# CONFIG_BLK_DEV_CMD64X is not set
--# CONFIG_BLK_DEV_TRIFLEX is not set
--# CONFIG_BLK_DEV_CY82C693 is not set
--# CONFIG_BLK_DEV_CS5520 is not set
--# CONFIG_BLK_DEV_CS5530 is not set
--# CONFIG_BLK_DEV_HPT34X is not set
--# CONFIG_BLK_DEV_HPT366 is not set
--# CONFIG_BLK_DEV_JMICRON is not set
--# CONFIG_BLK_DEV_SC1200 is not set
--# CONFIG_BLK_DEV_PIIX is not set
--# CONFIG_BLK_DEV_IT8213 is not set
--# CONFIG_BLK_DEV_IT821X is not set
--# CONFIG_BLK_DEV_NS87415 is not set
--# CONFIG_BLK_DEV_PDC202XX_OLD is not set
--# CONFIG_BLK_DEV_PDC202XX_NEW is not set
--# CONFIG_BLK_DEV_SVWKS is not set
--# CONFIG_BLK_DEV_SIIMAGE is not set
--# CONFIG_BLK_DEV_SL82C105 is not set
--# CONFIG_BLK_DEV_SLC90E66 is not set
--# CONFIG_BLK_DEV_TRM290 is not set
--CONFIG_BLK_DEV_VIA82CXXX=y
--# CONFIG_BLK_DEV_TC86C001 is not set
--CONFIG_BLK_DEV_IDEDMA=y
--CONFIG_IDE_ARCH_OBSOLETE_INIT=y
--# CONFIG_BLK_DEV_HD is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--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 is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--# CONFIG_MARVELL_PHY is not set
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--CONFIG_NET_PCI=y
--# CONFIG_PCNET32 is not set
--# CONFIG_AMD8111_ETH is not set
--# CONFIG_ADAPTEC_STARFIRE is not set
--# CONFIG_B44 is not set
--# CONFIG_FORCEDETH is not set
--# CONFIG_EEPRO100 is not set
--CONFIG_E100=y
--# CONFIG_FEALNX is not set
--# CONFIG_NATSEMI is not set
--# CONFIG_NE2K_PCI is not set
--# CONFIG_8139CP is not set
--# CONFIG_8139TOO is not set
--# CONFIG_R6040 is not set
--# CONFIG_SIS900 is not set
--# CONFIG_EPIC100 is not set
--# CONFIG_SUNDANCE is not set
--# CONFIG_TLAN is not set
--# CONFIG_VIA_RHINE is not set
--# CONFIG_SC92031 is not set
--# CONFIG_FS_ENET is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--CONFIG_GIANFAR=y
--CONFIG_GFAR_NAPI=y
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--CONFIG_SERIAL_8250_SHARE_IRQ=y
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--CONFIG_SERIAL_CPM=y
--CONFIG_SERIAL_CPM_CONSOLE=y
--CONFIG_SERIAL_CPM_SCC1=y
--# CONFIG_SERIAL_CPM_SCC2 is not set
--# CONFIG_SERIAL_CPM_SCC3 is not set
--# CONFIG_SERIAL_CPM_SCC4 is not set
--# CONFIG_SERIAL_CPM_SMC1 is not set
--# CONFIG_SERIAL_CPM_SMC2 is not set
--# CONFIG_SERIAL_JSM is not set
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--CONFIG_HW_RANDOM=y
--# CONFIG_NVRAM is not set
--CONFIG_GEN_RTC=y
--# CONFIG_GEN_RTC_X is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=y
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_ALI1535 is not set
--# CONFIG_I2C_ALI1563 is not set
--# CONFIG_I2C_ALI15X3 is not set
--# CONFIG_I2C_AMD756 is not set
--# CONFIG_I2C_AMD8111 is not set
--# CONFIG_I2C_I801 is not set
--# CONFIG_I2C_I810 is not set
--# CONFIG_I2C_PIIX4 is not set
--CONFIG_I2C_MPC=y
--# CONFIG_I2C_NFORCE2 is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--# CONFIG_I2C_PROSAVAGE is not set
--# CONFIG_I2C_SAVAGE4 is not set
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_SIS5595 is not set
--# CONFIG_I2C_SIS630 is not set
--# CONFIG_I2C_SIS96X is not set
--# CONFIG_I2C_TAOS_EVM is not set
--# CONFIG_I2C_VIA is not set
--# CONFIG_I2C_VIAPRO is not set
--# CONFIG_I2C_VOODOO3 is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 is not set
--# CONFIG_I2C_DEBUG_CORE is not set
--# CONFIG_I2C_DEBUG_ALGO is not set
--# CONFIG_I2C_DEBUG_BUS is not set
--# CONFIG_I2C_DEBUG_CHIP is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_AD7418 is not set
--# CONFIG_SENSORS_ADM1021 is not set
--# CONFIG_SENSORS_ADM1025 is not set
--# CONFIG_SENSORS_ADM1026 is not set
--# CONFIG_SENSORS_ADM1029 is not set
--# CONFIG_SENSORS_ADM1031 is not set
--# CONFIG_SENSORS_ADM9240 is not set
--# CONFIG_SENSORS_ADT7470 is not set
--# CONFIG_SENSORS_ADT7473 is not set
--# CONFIG_SENSORS_ATXP1 is not set
--# CONFIG_SENSORS_DS1621 is not set
--# CONFIG_SENSORS_I5K_AMB is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_F75375S is not set
--# CONFIG_SENSORS_GL518SM is not set
--# CONFIG_SENSORS_GL520SM is not set
--# CONFIG_SENSORS_IT87 is not set
--# CONFIG_SENSORS_LM63 is not set
--CONFIG_SENSORS_LM75=y
--# CONFIG_SENSORS_LM77 is not set
--# CONFIG_SENSORS_LM78 is not set
--# CONFIG_SENSORS_LM80 is not set
--# CONFIG_SENSORS_LM83 is not set
--# CONFIG_SENSORS_LM85 is not set
--# 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_SIS5595 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_ADS7828 is not set
--# CONFIG_SENSORS_THMC50 is not set
--# CONFIG_SENSORS_VIA686A is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_VT8231 is not set
--# CONFIG_SENSORS_W83781D is not set
--# CONFIG_SENSORS_W83791D is not set
--# CONFIG_SENSORS_W83792D is not set
--# CONFIG_SENSORS_W83793 is not set
--# CONFIG_SENSORS_W83L785TS is not set
--# CONFIG_SENSORS_W83L786NG is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--CONFIG_HWMON_DEBUG_CHIP=y
--# CONFIG_THERMAL is not set
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--# CONFIG_VIDEO_OUTPUT_CONTROL is not set
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--CONFIG_EXT3_FS=y
--CONFIG_EXT3_FS_XATTR=y
--# CONFIG_EXT3_FS_POSIX_ACL is not set
--# CONFIG_EXT3_FS_SECURITY is not set
--# CONFIG_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# CONFIG_AUTOFS_FS is not set
--# CONFIG_AUTOFS4_FS is not set
--# CONFIG_FUSE_FS is not set
--
--#
--# CD-ROM/DVD Filesystems
--#
--# CONFIG_ISO9660_FS is not set
--# CONFIG_UDF_FS is not set
--
--#
--# DOS/FAT/NT Filesystems
--#
--# CONFIG_MSDOS_FS is not set
--# CONFIG_VFAT_FS is not set
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
--
--#
--# Miscellaneous filesystems
--#
--# CONFIG_ADFS_FS is not set
--# CONFIG_AFFS_FS is not set
--# CONFIG_HFS_FS is not set
--# CONFIG_HFSPLUS_FS is not set
--# CONFIG_BEFS_FS is not set
--# CONFIG_BFS_FS is not set
--# CONFIG_EFS_FS is not set
--CONFIG_JFFS2_FS=y
--CONFIG_JFFS2_FS_DEBUG=0
--CONFIG_JFFS2_FS_WRITEBUFFER=y
--# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
--# CONFIG_JFFS2_SUMMARY is not set
--# CONFIG_JFFS2_FS_XATTR is not set
--# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
--CONFIG_JFFS2_ZLIB=y
--# CONFIG_JFFS2_LZO is not set
--CONFIG_JFFS2_RTIME=y
--# CONFIG_JFFS2_RUBIN is not set
--CONFIG_CRAMFS=y
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--# CONFIG_NFS_V3 is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--# CONFIG_MAC_PARTITION is not set
--# CONFIG_MSDOS_PARTITION is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# 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
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--# CONFIG_DEBUG_KERNEL is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_KGDB_CONSOLE is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--# CONFIG_CRYPTO_SEQIV is not set
--# CONFIG_CRYPTO_MANAGER is not set
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--# CONFIG_CRYPTO_MD5 is not set
--# CONFIG_CRYPTO_SHA1 is not set
--# CONFIG_CRYPTO_SHA256 is not set
--# CONFIG_CRYPTO_SHA512 is not set
--# CONFIG_CRYPTO_WP512 is not set
--# CONFIG_CRYPTO_TGR192 is not set
--# CONFIG_CRYPTO_GF128MUL is not set
--# CONFIG_CRYPTO_ECB is not set
--# CONFIG_CRYPTO_CBC is not set
--# CONFIG_CRYPTO_PCBC is not set
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--# CONFIG_CRYPTO_DES is not set
--# CONFIG_CRYPTO_FCRYPT is not set
--# CONFIG_CRYPTO_BLOWFISH is not set
--# CONFIG_CRYPTO_TWOFISH is not set
--# CONFIG_CRYPTO_SERPENT is not set
--# CONFIG_CRYPTO_AES is not set
--# CONFIG_CRYPTO_CAST5 is not set
--# CONFIG_CRYPTO_CAST6 is not set
--# CONFIG_CRYPTO_TEA is not set
--# CONFIG_CRYPTO_ARC4 is not set
--# CONFIG_CRYPTO_KHAZAD is not set
--# CONFIG_CRYPTO_ANUBIS is not set
--# CONFIG_CRYPTO_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
--CONFIG_PPC_LIB_RHEAP=y
---- a/arch/powerpc/configs/walnut_defconfig
-+++ /dev/null
-@@ -1,887 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc2
--# Fri Feb 15 21:54:12 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--CONFIG_40x=y
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_4xx=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_NOT_COHERENT_CACHE=y
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--# CONFIG_DEFAULT_UIMAGE is not set
--CONFIG_PPC_DCR_NATIVE=y
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_PPC_DCR=y
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--CONFIG_POSIX_MQUEUE=y
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--CONFIG_FAIR_GROUP_SCHED=y
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--CONFIG_KALLSYMS=y
--CONFIG_KALLSYMS_ALL=y
--CONFIG_KALLSYMS_EXTRA_PASS=y
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=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 is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--# CONFIG_KPROBES is not set
--CONFIG_HAVE_KPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--CONFIG_KMOD=y
--CONFIG_BLOCK=y
--CONFIG_LBD=y
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--CONFIG_DEFAULT_AS=y
--# CONFIG_DEFAULT_DEADLINE is not set
--# CONFIG_DEFAULT_CFQ is not set
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="anticipatory"
--CONFIG_CLASSIC_RCU=y
--# CONFIG_PREEMPT_RCU is not set
--# CONFIG_PPC4xx_PCI_EXPRESS is not set
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--# CONFIG_EP405 is not set
--# CONFIG_KILAUEA is not set
--# CONFIG_MAKALU is not set
--CONFIG_WALNUT=y
--# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
--CONFIG_405GP=y
--CONFIG_IBM405_ERR77=y
--CONFIG_IBM405_ERR51=y
--# CONFIG_IPIC is not set
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_FSL_ULI1575 is not set
--CONFIG_OF_RTC=y
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_RCU_TRACE=y
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--# CONFIG_MATH_EMULATION is not set
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--CONFIG_RESOURCES_64BIT=y
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--# CONFIG_PCI_LEGACY is not set
--# CONFIG_PCI_DEBUG is not set
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_CONSISTENT_START=0xff100000
--CONFIG_CONSISTENT_SIZE=0x00200000
--CONFIG_BOOT_LOAD=0x00400000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--# CONFIG_IP_MULTICAST is not set
--# CONFIG_IP_ADVANCED_ROUTER is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_PNP=y
--CONFIG_IP_PNP_DHCP=y
--CONFIG_IP_PNP_BOOTP=y
--# CONFIG_IP_PNP_RARP is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_ARPD is not set
--# CONFIG_SYN_COOKIES is not set
--# CONFIG_INET_AH is not set
--# CONFIG_INET_ESP is not set
--# CONFIG_INET_IPCOMP is not set
--# CONFIG_INET_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
--# CONFIG_INET_XFRM_MODE_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_BEET is not set
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--# CONFIG_BRIDGE is not set
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--# CONFIG_LLC2 is not set
--# CONFIG_IPX is not set
--# CONFIG_ATALK is not set
--# CONFIG_X25 is not set
--# CONFIG_LAPB is not set
--# CONFIG_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--CONFIG_FW_LOADER=y
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--CONFIG_CONNECTOR=y
--CONFIG_PROC_EVENTS=y
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--# CONFIG_MTD_CONCAT is not set
--CONFIG_MTD_PARTITIONS=y
--# CONFIG_MTD_REDBOOT_PARTS is not set
--CONFIG_MTD_CMDLINE_PARTS=y
--CONFIG_MTD_OF_PARTS=y
--
--#
--# User Modules And Translation Layers
--#
--CONFIG_MTD_CHAR=y
--CONFIG_MTD_BLKDEVS=m
--CONFIG_MTD_BLOCK=m
--# CONFIG_MTD_BLOCK_RO is not set
--# CONFIG_FTL is not set
--# CONFIG_NFTL is not set
--# CONFIG_INFTL is not set
--# CONFIG_RFD_FTL is not set
--# CONFIG_SSFDC is not set
--# CONFIG_MTD_OOPS is not set
--
--#
--# RAM/ROM/Flash chip drivers
--#
--CONFIG_MTD_CFI=y
--CONFIG_MTD_JEDECPROBE=y
--CONFIG_MTD_GEN_PROBE=y
--# CONFIG_MTD_CFI_ADV_OPTIONS is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--CONFIG_MTD_MAP_BANK_WIDTH_4=y
--# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
--CONFIG_MTD_CFI_I1=y
--CONFIG_MTD_CFI_I2=y
--# CONFIG_MTD_CFI_I4 is not set
--# CONFIG_MTD_CFI_I8 is not set
--# CONFIG_MTD_CFI_INTELEXT is not set
--CONFIG_MTD_CFI_AMDSTD=y
--# CONFIG_MTD_CFI_STAA is not set
--CONFIG_MTD_CFI_UTIL=y
--# CONFIG_MTD_RAM is not set
--# CONFIG_MTD_ROM is not set
--# CONFIG_MTD_ABSENT is not set
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--# CONFIG_MTD_PHYSMAP is not set
--CONFIG_MTD_PHYSMAP_OF=y
--# CONFIG_MTD_INTEL_VR_NOR is not set
--# CONFIG_MTD_PLATRAM is not set
--
--#
--# Self-contained MTD device drivers
--#
--# CONFIG_MTD_PMC551 is not set
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_MTDRAM is not set
--# CONFIG_MTD_BLOCK2MTD is not set
--
--#
--# Disk-On-Chip Device Drivers
--#
--# CONFIG_MTD_DOC2000 is not set
--# CONFIG_MTD_DOC2001 is not set
--# CONFIG_MTD_DOC2001PLUS is not set
--# CONFIG_MTD_NAND is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--# CONFIG_BLK_DEV_LOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=35000
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--# CONFIG_XILINX_SYSACE is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--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 is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--# CONFIG_PHYLIB is not set
--CONFIG_NET_ETHERNET=y
--# CONFIG_MII is not set
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--CONFIG_IBM_NEW_EMAC=y
--CONFIG_IBM_NEW_EMAC_RXB=128
--CONFIG_IBM_NEW_EMAC_TXB=64
--CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
--CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
--CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
--# CONFIG_IBM_NEW_EMAC_DEBUG is not set
--CONFIG_IBM_NEW_EMAC_ZMII=y
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--# CONFIG_INPUT is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--CONFIG_SERIAL_8250_EXTENDED=y
--# CONFIG_SERIAL_8250_MANY_PORTS is not set
--CONFIG_SERIAL_8250_SHARE_IRQ=y
--# CONFIG_SERIAL_8250_DETECT_IRQ is not set
--# CONFIG_SERIAL_8250_RSA is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--CONFIG_SERIAL_OF_PLATFORM=y
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--# CONFIG_I2C is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--# CONFIG_HWMON is not set
--CONFIG_THERMAL=y
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--# CONFIG_DAB is not set
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=m
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--# CONFIG_EXT3_FS is not set
--# CONFIG_EXT4DEV_FS is not set
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# CONFIG_AUTOFS_FS is not set
--# CONFIG_AUTOFS4_FS is not set
--# CONFIG_FUSE_FS is not set
--
--#
--# CD-ROM/DVD Filesystems
--#
--# CONFIG_ISO9660_FS is not set
--# CONFIG_UDF_FS is not set
--
--#
--# DOS/FAT/NT Filesystems
--#
--# CONFIG_MSDOS_FS is not set
--# CONFIG_VFAT_FS is not set
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
--
--#
--# Miscellaneous filesystems
--#
--# CONFIG_ADFS_FS is not set
--# CONFIG_AFFS_FS is not set
--# CONFIG_HFS_FS is not set
--# CONFIG_HFSPLUS_FS is not set
--# CONFIG_BEFS_FS is not set
--# CONFIG_BFS_FS is not set
--# CONFIG_EFS_FS is not set
--# CONFIG_JFFS2_FS is not set
--CONFIG_CRAMFS=y
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--# CONFIG_PARTITION_ADVANCED is not set
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# 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_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--CONFIG_MAGIC_SYSRQ=y
--# CONFIG_UNUSED_SYMBOLS is not set
--CONFIG_DEBUG_FS=y
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--CONFIG_DEBUG_BUGVERBOSE=y
--# CONFIG_DEBUG_INFO is not set
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--# CONFIG_DEBUGGER is not set
--# CONFIG_VIRQ_DEBUG is not set
--# CONFIG_BDI_SWITCH is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--CONFIG_CRYPTO_MD5=y
--# CONFIG_CRYPTO_SHA1 is not set
--# CONFIG_CRYPTO_SHA256 is not set
--# CONFIG_CRYPTO_SHA512 is not set
--# CONFIG_CRYPTO_WP512 is not set
--# CONFIG_CRYPTO_TGR192 is not set
--# CONFIG_CRYPTO_GF128MUL is not set
--CONFIG_CRYPTO_ECB=y
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=y
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# CONFIG_CRYPTO_BLOWFISH is not set
--# CONFIG_CRYPTO_TWOFISH is not set
--# CONFIG_CRYPTO_SERPENT is not set
--# CONFIG_CRYPTO_AES is not set
--# CONFIG_CRYPTO_CAST5 is not set
--# CONFIG_CRYPTO_CAST6 is not set
--# CONFIG_CRYPTO_TEA is not set
--# CONFIG_CRYPTO_ARC4 is not set
--# CONFIG_CRYPTO_KHAZAD is not set
--# CONFIG_CRYPTO_ANUBIS is not set
--# CONFIG_CRYPTO_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/warp_defconfig
-+++ /dev/null
-@@ -1,1110 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc2
--# Fri Feb 15 21:54:43 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--CONFIG_44x=y
--# CONFIG_E200 is not set
--CONFIG_PPC_FPU=y
--CONFIG_4xx=y
--CONFIG_BOOKE=y
--CONFIG_PTE_64BIT=y
--CONFIG_PHYS_64BIT=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_NOT_COHERENT_CACHE=y
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--# CONFIG_DEFAULT_UIMAGE is not set
--CONFIG_PPC_DCR_NATIVE=y
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_PPC_DCR=y
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION="-pika"
--# CONFIG_LOCALVERSION_AUTO is not set
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--CONFIG_FAIR_GROUP_SCHED=y
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--CONFIG_KALLSYMS=y
--# CONFIG_KALLSYMS_ALL is not set
--# CONFIG_KALLSYMS_EXTRA_PASS is not set
--# CONFIG_HOTPLUG is not set
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=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_SLAB=y
--# CONFIG_SLUB is not set
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--# CONFIG_KPROBES is not set
--CONFIG_HAVE_KPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--CONFIG_KMOD=y
--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
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--CONFIG_DEFAULT_AS=y
--# CONFIG_DEFAULT_DEADLINE is not set
--# CONFIG_DEFAULT_CFQ is not set
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="anticipatory"
--CONFIG_CLASSIC_RCU=y
--# CONFIG_PREEMPT_RCU is not set
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--# CONFIG_BAMBOO is not set
--# CONFIG_EBONY is not set
--# CONFIG_SEQUOIA is not set
--# CONFIG_TAISHAN is not set
--# CONFIG_KATMAI is not set
--# CONFIG_RAINIER is not set
--CONFIG_WARP=y
--CONFIG_440EP=y
--CONFIG_IBM440EP_ERR42=y
--# CONFIG_IPIC is not set
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--# CONFIG_HZ_250 is not set
--# CONFIG_HZ_300 is not set
--CONFIG_HZ_1000=y
--CONFIG_HZ=1000
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_RCU_TRACE=y
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--# CONFIG_MATH_EMULATION is not set
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--CONFIG_RESOURCES_64BIT=y
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--CONFIG_CMDLINE_BOOL=y
--CONFIG_CMDLINE="ip=on"
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--# CONFIG_PCI is not set
--# CONFIG_PCI_DOMAINS is not set
--# CONFIG_PCI_SYSCALL is not set
--# CONFIG_ARCH_SUPPORTS_MSI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_CONSISTENT_START=0xff100000
--CONFIG_CONSISTENT_SIZE=0x00200000
--CONFIG_BOOT_LOAD=0x01000000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--# CONFIG_XFRM_USER is not set
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--# CONFIG_IP_MULTICAST is not set
--# CONFIG_IP_ADVANCED_ROUTER is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_PNP=y
--CONFIG_IP_PNP_DHCP=y
--# CONFIG_IP_PNP_BOOTP is not set
--# CONFIG_IP_PNP_RARP is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_ARPD is not set
--# CONFIG_SYN_COOKIES is not set
--# CONFIG_INET_AH is not set
--# CONFIG_INET_ESP is not set
--# CONFIG_INET_IPCOMP is not set
--# CONFIG_INET_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--CONFIG_INET_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IP_VS is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--CONFIG_NETFILTER=y
--# CONFIG_NETFILTER_DEBUG is not set
--CONFIG_NETFILTER_ADVANCED=y
--
--#
--# Core Netfilter Configuration
--#
--# CONFIG_NETFILTER_NETLINK_QUEUE is not set
--# CONFIG_NETFILTER_NETLINK_LOG is not set
--# CONFIG_NF_CONNTRACK is not set
--# CONFIG_NETFILTER_XTABLES is not set
--
--#
--# IP: Netfilter Configuration
--#
--# CONFIG_IP_NF_QUEUE is not set
--# CONFIG_IP_NF_IPTABLES is not set
--# CONFIG_IP_NF_ARPTABLES is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--# CONFIG_BRIDGE is not set
--CONFIG_VLAN_8021Q=y
--# CONFIG_DECNET is not set
--# CONFIG_LLC2 is not set
--# CONFIG_IPX is not set
--# CONFIG_ATALK is not set
--# CONFIG_X25 is not set
--# CONFIG_LAPB is not set
--# CONFIG_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--# CONFIG_STANDALONE is not set
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--# CONFIG_MTD_CONCAT is not set
--CONFIG_MTD_PARTITIONS=y
--# CONFIG_MTD_REDBOOT_PARTS is not set
--# CONFIG_MTD_CMDLINE_PARTS is not set
--CONFIG_MTD_OF_PARTS=y
--
--#
--# User Modules And Translation Layers
--#
--CONFIG_MTD_CHAR=y
--CONFIG_MTD_BLKDEVS=y
--CONFIG_MTD_BLOCK=y
--# CONFIG_FTL is not set
--# CONFIG_NFTL is not set
--# CONFIG_INFTL is not set
--# CONFIG_RFD_FTL is not set
--# CONFIG_SSFDC is not set
--CONFIG_MTD_OOPS=m
--
--#
--# RAM/ROM/Flash chip drivers
--#
--CONFIG_MTD_CFI=y
--# CONFIG_MTD_JEDECPROBE is not set
--CONFIG_MTD_GEN_PROBE=y
--# CONFIG_MTD_CFI_ADV_OPTIONS is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--CONFIG_MTD_MAP_BANK_WIDTH_4=y
--# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
--CONFIG_MTD_CFI_I1=y
--CONFIG_MTD_CFI_I2=y
--# CONFIG_MTD_CFI_I4 is not set
--# CONFIG_MTD_CFI_I8 is not set
--# CONFIG_MTD_CFI_INTELEXT is not set
--CONFIG_MTD_CFI_AMDSTD=y
--# CONFIG_MTD_CFI_STAA is not set
--CONFIG_MTD_CFI_UTIL=y
--# CONFIG_MTD_RAM is not set
--# CONFIG_MTD_ROM is not set
--# CONFIG_MTD_ABSENT is not set
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--# CONFIG_MTD_PHYSMAP is not set
--CONFIG_MTD_PHYSMAP_OF=y
--# CONFIG_MTD_PLATRAM is not set
--
--#
--# Self-contained MTD device drivers
--#
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_MTDRAM is not set
--# CONFIG_MTD_BLOCK2MTD is not set
--
--#
--# Disk-On-Chip Device Drivers
--#
--# CONFIG_MTD_DOC2000 is not set
--# CONFIG_MTD_DOC2001 is not set
--# CONFIG_MTD_DOC2001PLUS is not set
--CONFIG_MTD_NAND=y
--# CONFIG_MTD_NAND_VERIFY_WRITE is not set
--CONFIG_MTD_NAND_ECC_SMC=y
--# CONFIG_MTD_NAND_MUSEUM_IDS is not set
--CONFIG_MTD_NAND_IDS=y
--# CONFIG_MTD_NAND_DISKONCHIP is not set
--# CONFIG_MTD_NAND_NANDSIM is not set
--# CONFIG_MTD_NAND_PLATFORM is not set
--# CONFIG_MTD_ALAUDA is not set
--# CONFIG_MTD_NAND_FSL_ELBC is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--# CONFIG_BLK_DEV_LOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_UB is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=4096
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--# CONFIG_XILINX_SYSACE is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--CONFIG_SCSI=y
--CONFIG_SCSI_DMA=y
--# CONFIG_SCSI_TGT is not set
--# CONFIG_SCSI_NETLINK is not set
--CONFIG_SCSI_PROC_FS=y
--
--#
--# SCSI support type (disk, tape, CD-ROM)
--#
--CONFIG_BLK_DEV_SD=y
--# CONFIG_CHR_DEV_ST is not set
--# CONFIG_CHR_DEV_OSST is not set
--# CONFIG_BLK_DEV_SR is not set
--# CONFIG_CHR_DEV_SG is not set
--# CONFIG_CHR_DEV_SCH is not set
--
--#
--# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
--#
--# CONFIG_SCSI_MULTI_LUN is not set
--# CONFIG_SCSI_CONSTANTS is not set
--# CONFIG_SCSI_LOGGING is not set
--# CONFIG_SCSI_SCAN_ASYNC is not set
--CONFIG_SCSI_WAIT_SCAN=m
--
--#
--# SCSI Transports
--#
--CONFIG_SCSI_SPI_ATTRS=y
--# CONFIG_SCSI_FC_ATTRS is not set
--# CONFIG_SCSI_ISCSI_ATTRS is not set
--# CONFIG_SCSI_SAS_LIBSAS is not set
--# CONFIG_SCSI_SRP_ATTRS is not set
--# CONFIG_SCSI_LOWLEVEL is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--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 is not set
--# CONFIG_VETH is not set
--# CONFIG_PHYLIB is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--CONFIG_IBM_NEW_EMAC=y
--CONFIG_IBM_NEW_EMAC_RXB=128
--CONFIG_IBM_NEW_EMAC_TXB=64
--CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
--CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
--CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
--# CONFIG_IBM_NEW_EMAC_DEBUG is not set
--CONFIG_IBM_NEW_EMAC_ZMII=y
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_B44 is not set
--# CONFIG_NETDEV_1000 is not set
--# CONFIG_NETDEV_10000 is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--
--#
--# USB Network Adapters
--#
--# CONFIG_USB_CATC is not set
--# CONFIG_USB_KAWETH is not set
--# CONFIG_USB_PEGASUS is not set
--# CONFIG_USB_RTL8150 is not set
--# CONFIG_USB_USBNET is not set
--# CONFIG_WAN is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--# CONFIG_INPUT is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--CONFIG_SERIAL_8250_EXTENDED=y
--# CONFIG_SERIAL_8250_MANY_PORTS is not set
--CONFIG_SERIAL_8250_SHARE_IRQ=y
--# CONFIG_SERIAL_8250_DETECT_IRQ is not set
--# CONFIG_SERIAL_8250_RSA is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--CONFIG_HW_RANDOM=y
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--# CONFIG_I2C_CHARDEV is not set
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_MPC is not set
--# 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
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--CONFIG_SENSORS_EEPROM=y
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 is not set
--# CONFIG_I2C_DEBUG_CORE is not set
--# CONFIG_I2C_DEBUG_ALGO is not set
--# CONFIG_I2C_DEBUG_BUS is not set
--# CONFIG_I2C_DEBUG_CHIP is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_AD7418 is not set
--# CONFIG_SENSORS_ADM1021 is not set
--# CONFIG_SENSORS_ADM1025 is not set
--# CONFIG_SENSORS_ADM1026 is not set
--# CONFIG_SENSORS_ADM1029 is not set
--# CONFIG_SENSORS_ADM1031 is not set
--# CONFIG_SENSORS_ADM9240 is not set
--# CONFIG_SENSORS_ADT7470 is not set
--# CONFIG_SENSORS_ATXP1 is not set
--# CONFIG_SENSORS_DS1621 is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_F75375S is not set
--# CONFIG_SENSORS_GL518SM is not set
--# CONFIG_SENSORS_GL520SM is not set
--# CONFIG_SENSORS_IT87 is not set
--# CONFIG_SENSORS_LM63 is not set
--# CONFIG_SENSORS_LM75 is not set
--# CONFIG_SENSORS_LM77 is not set
--# CONFIG_SENSORS_LM78 is not set
--# CONFIG_SENSORS_LM80 is not set
--# CONFIG_SENSORS_LM83 is not set
--# CONFIG_SENSORS_LM85 is not set
--# 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_ADS7828 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
--# CONFIG_SENSORS_W83792D is not set
--# CONFIG_SENSORS_W83793 is not set
--# CONFIG_SENSORS_W83L785TS is not set
--# CONFIG_SENSORS_W83L786NG is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--# CONFIG_HWMON_DEBUG_CHIP is not set
--CONFIG_THERMAL=y
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--# CONFIG_DAB is not set
--
--#
--# Graphics support
--#
--# CONFIG_VGASTATE is not set
--# CONFIG_VIDEO_OUTPUT_CONTROL is not set
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--# CONFIG_USB_ARCH_HAS_EHCI is not set
--CONFIG_USB=y
--# CONFIG_USB_DEBUG is not set
--# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
--
--#
--# Miscellaneous USB options
--#
--# CONFIG_USB_DEVICEFS is not set
--CONFIG_USB_DEVICE_CLASS=y
--# CONFIG_USB_DYNAMIC_MINORS is not set
--# CONFIG_USB_OTG is not set
--
--#
--# USB Host Controller Drivers
--#
--# CONFIG_USB_ISP116X_HCD is not set
--CONFIG_USB_OHCI_HCD=y
--CONFIG_USB_OHCI_HCD_PPC_OF=y
--CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
--# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
--CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
--CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
--CONFIG_USB_OHCI_LITTLE_ENDIAN=y
--# CONFIG_USB_SL811_HCD is not set
--# CONFIG_USB_R8A66597_HCD is not set
--
--#
--# USB Device Class drivers
--#
--# CONFIG_USB_ACM is not set
--# CONFIG_USB_PRINTER is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--
--#
--# may also be needed; see USB_STORAGE Help for more information
--#
--CONFIG_USB_STORAGE=y
--# CONFIG_USB_STORAGE_DEBUG is not set
--# CONFIG_USB_STORAGE_DATAFAB is not set
--# CONFIG_USB_STORAGE_FREECOM is not set
--# CONFIG_USB_STORAGE_ISD200 is not set
--# CONFIG_USB_STORAGE_DPCM is not set
--# CONFIG_USB_STORAGE_USBAT is not set
--# CONFIG_USB_STORAGE_SDDR09 is not set
--# CONFIG_USB_STORAGE_SDDR55 is not set
--# CONFIG_USB_STORAGE_JUMPSHOT is not set
--# CONFIG_USB_STORAGE_ALAUDA is not set
--# CONFIG_USB_STORAGE_KARMA is not set
--# CONFIG_USB_LIBUSUAL is not set
--
--#
--# USB Imaging devices
--#
--# CONFIG_USB_MDC800 is not set
--# CONFIG_USB_MICROTEK is not set
--CONFIG_USB_MON=y
--
--#
--# USB port drivers
--#
--# CONFIG_USB_SERIAL is not set
--
--#
--# USB Miscellaneous drivers
--#
--# CONFIG_USB_EMI62 is not set
--# CONFIG_USB_EMI26 is not set
--# CONFIG_USB_ADUTUX is not set
--# CONFIG_USB_AUERSWALD is not set
--# CONFIG_USB_RIO500 is not set
--# CONFIG_USB_LEGOTOWER is not set
--# CONFIG_USB_LCD is not set
--# CONFIG_USB_BERRY_CHARGE is not set
--# CONFIG_USB_LED is not set
--# CONFIG_USB_CYPRESS_CY7C63 is not set
--# CONFIG_USB_CYTHERM is not set
--# CONFIG_USB_PHIDGET is not set
--# CONFIG_USB_IDMOUSE is not set
--# CONFIG_USB_FTDI_ELAN is not set
--# CONFIG_USB_APPLEDISPLAY is not set
--# CONFIG_USB_LD is not set
--# CONFIG_USB_TRANCEVIBRATOR is not set
--# CONFIG_USB_IOWARRIOR is not set
--# CONFIG_USB_GADGET is not set
--CONFIG_MMC=m
--# CONFIG_MMC_DEBUG is not set
--# CONFIG_MMC_UNSAFE_RESUME is not set
--
--#
--# MMC/SD Card Drivers
--#
--CONFIG_MMC_BLOCK=m
--CONFIG_MMC_BLOCK_BOUNCE=y
--# CONFIG_SDIO_UART is not set
--
--#
--# MMC/SD Host Controller Drivers
--#
--# CONFIG_MMC_WBSD is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--# CONFIG_EXT3_FS is not set
--# CONFIG_EXT4DEV_FS is not set
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# CONFIG_AUTOFS_FS is not set
--# CONFIG_AUTOFS4_FS is not set
--# CONFIG_FUSE_FS is not set
--
--#
--# CD-ROM/DVD Filesystems
--#
--# CONFIG_ISO9660_FS is not set
--# CONFIG_UDF_FS is not set
--
--#
--# DOS/FAT/NT Filesystems
--#
--CONFIG_FAT_FS=y
--CONFIG_MSDOS_FS=y
--CONFIG_VFAT_FS=y
--CONFIG_FAT_DEFAULT_CODEPAGE=437
--CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--# CONFIG_TMPFS is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
--
--#
--# Miscellaneous filesystems
--#
--# CONFIG_ADFS_FS is not set
--# CONFIG_AFFS_FS is not set
--# CONFIG_HFS_FS is not set
--# CONFIG_HFSPLUS_FS is not set
--# CONFIG_BEFS_FS is not set
--# CONFIG_BFS_FS is not set
--# CONFIG_EFS_FS is not set
--CONFIG_JFFS2_FS=y
--CONFIG_JFFS2_FS_DEBUG=0
--CONFIG_JFFS2_FS_WRITEBUFFER=y
--# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
--# CONFIG_JFFS2_SUMMARY is not set
--# CONFIG_JFFS2_FS_XATTR is not set
--# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
--CONFIG_JFFS2_ZLIB=y
--# CONFIG_JFFS2_LZO is not set
--CONFIG_JFFS2_RTIME=y
--# CONFIG_JFFS2_RUBIN is not set
--CONFIG_CRAMFS=y
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--# CONFIG_PARTITION_ADVANCED is not set
--CONFIG_MSDOS_PARTITION=y
--CONFIG_NLS=y
--CONFIG_NLS_DEFAULT="iso8859-1"
--CONFIG_NLS_CODEPAGE_437=y
--# CONFIG_NLS_CODEPAGE_737 is not set
--# CONFIG_NLS_CODEPAGE_775 is not set
--CONFIG_NLS_CODEPAGE_850=y
--# CONFIG_NLS_CODEPAGE_852 is not set
--# CONFIG_NLS_CODEPAGE_855 is not set
--# CONFIG_NLS_CODEPAGE_857 is not set
--# CONFIG_NLS_CODEPAGE_860 is not set
--# CONFIG_NLS_CODEPAGE_861 is not set
--# CONFIG_NLS_CODEPAGE_862 is not set
--# CONFIG_NLS_CODEPAGE_863 is not set
--# CONFIG_NLS_CODEPAGE_864 is not set
--# CONFIG_NLS_CODEPAGE_865 is not set
--# CONFIG_NLS_CODEPAGE_866 is not set
--# CONFIG_NLS_CODEPAGE_869 is not set
--# CONFIG_NLS_CODEPAGE_936 is not set
--# CONFIG_NLS_CODEPAGE_950 is not set
--# CONFIG_NLS_CODEPAGE_932 is not set
--# CONFIG_NLS_CODEPAGE_949 is not set
--# CONFIG_NLS_CODEPAGE_874 is not set
--# CONFIG_NLS_ISO8859_8 is not set
--# CONFIG_NLS_CODEPAGE_1250 is not set
--# CONFIG_NLS_CODEPAGE_1251 is not set
--CONFIG_NLS_ASCII=y
--CONFIG_NLS_ISO8859_1=y
--# CONFIG_NLS_ISO8859_2 is not set
--# CONFIG_NLS_ISO8859_3 is not set
--# CONFIG_NLS_ISO8859_4 is not set
--# CONFIG_NLS_ISO8859_5 is not set
--# CONFIG_NLS_ISO8859_6 is not set
--# CONFIG_NLS_ISO8859_7 is not set
--# CONFIG_NLS_ISO8859_9 is not set
--# CONFIG_NLS_ISO8859_13 is not set
--# CONFIG_NLS_ISO8859_14 is not set
--CONFIG_NLS_ISO8859_15=y
--# CONFIG_NLS_KOI8_R is not set
--# CONFIG_NLS_KOI8_U is not set
--CONFIG_NLS_UTF8=y
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--CONFIG_CRC_CCITT=y
--# 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
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--CONFIG_MAGIC_SYSRQ=y
--# CONFIG_UNUSED_SYMBOLS is not set
--CONFIG_DEBUG_FS=y
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--# CONFIG_SCHED_DEBUG is not set
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_DEBUG_SLAB is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--CONFIG_DEBUG_INFO=y
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--# CONFIG_DEBUGGER is not set
--# CONFIG_VIRQ_DEBUG is not set
--CONFIG_BDI_SWITCH=y
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--# CONFIG_CRYPTO_SEQIV is not set
--# CONFIG_CRYPTO_MANAGER is not set
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--# CONFIG_CRYPTO_MD5 is not set
--# CONFIG_CRYPTO_SHA1 is not set
--# CONFIG_CRYPTO_SHA256 is not set
--# CONFIG_CRYPTO_SHA512 is not set
--# CONFIG_CRYPTO_WP512 is not set
--# CONFIG_CRYPTO_TGR192 is not set
--# CONFIG_CRYPTO_GF128MUL is not set
--# CONFIG_CRYPTO_ECB is not set
--# CONFIG_CRYPTO_CBC is not set
--# CONFIG_CRYPTO_PCBC is not set
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--# CONFIG_CRYPTO_DES is not set
--# CONFIG_CRYPTO_FCRYPT is not set
--# CONFIG_CRYPTO_BLOWFISH is not set
--# CONFIG_CRYPTO_TWOFISH is not set
--# CONFIG_CRYPTO_SERPENT is not set
--# CONFIG_CRYPTO_AES is not set
--# CONFIG_CRYPTO_CAST5 is not set
--# CONFIG_CRYPTO_CAST6 is not set
--# CONFIG_CRYPTO_TEA is not set
--# CONFIG_CRYPTO_ARC4 is not set
--# CONFIG_CRYPTO_KHAZAD is not set
--# CONFIG_CRYPTO_ANUBIS is not set
--# CONFIG_CRYPTO_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/kernel/Makefile
-+++ b/arch/powerpc/kernel/Makefile
-@@ -67,6 +67,7 @@ obj-$(CONFIG_BOOTX_TEXT)	+= btext.o
- obj-$(CONFIG_SMP)		+= smp.o
- obj-$(CONFIG_KPROBES)		+= kprobes.o
- obj-$(CONFIG_PPC_UDBG_16550)	+= legacy_serial.o udbg_16550.o
-+obj-$(CONFIG_STACKTRACE)	+= stacktrace.o
- 
- pci64-$(CONFIG_PPC64)		+= pci_dn.o isa-bridge.o
- obj-$(CONFIG_PCI)		+= pci_$(CONFIG_WORD_SIZE).o $(pci64-y) \
---- a/arch/powerpc/kernel/asm-offsets.c
-+++ b/arch/powerpc/kernel/asm-offsets.c
-@@ -26,8 +26,6 @@
- #ifdef CONFIG_PPC64
- #include <linux/time.h>
- #include <linux/hardirq.h>
--#else
--#include <linux/ptrace.h>
- #endif
- 
- #include <asm/io.h>
-@@ -46,6 +44,9 @@
- #include <asm/mmu.h>
- #include <asm/hvcall.h>
- #endif
-+#ifdef CONFIG_PPC_ISERIES
-+#include <asm/iseries/alpaca.h>
-+#endif
- 
- #define DEFINE(sym, val) \
- 	asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-@@ -60,7 +61,6 @@ int main(void)
- 	DEFINE(AUDITCONTEXT, offsetof(struct task_struct, audit_context));
- #else
- 	DEFINE(THREAD_INFO, offsetof(struct task_struct, stack));
--	DEFINE(PTRACE, offsetof(struct task_struct, ptrace));
- #endif /* CONFIG_PPC64 */
- 
- 	DEFINE(KSP, offsetof(struct thread_struct, ksp));
-@@ -80,7 +80,6 @@ int main(void)
- 	DEFINE(PGDIR, offsetof(struct thread_struct, pgdir));
- #if defined(CONFIG_4xx) || defined(CONFIG_BOOKE)
- 	DEFINE(THREAD_DBCR0, offsetof(struct thread_struct, dbcr0));
--	DEFINE(PT_PTRACED, PT_PTRACED);
- #endif
- #ifdef CONFIG_SPE
- 	DEFINE(THREAD_EVR0, offsetof(struct thread_struct, evr[0]));
-@@ -325,6 +324,9 @@ int main(void)
- 	DEFINE(PAGE_OFFSET_VSID, KERNEL_VSID(PAGE_OFFSET));
- 	DEFINE(VMALLOC_START_ESID, GET_ESID(VMALLOC_START));
- 	DEFINE(VMALLOC_START_VSID, KERNEL_VSID(VMALLOC_START));
-+
-+	/* alpaca */
-+	DEFINE(ALPACA_SIZE, sizeof(struct alpaca));
- #endif
- 
- 	DEFINE(PGD_TABLE_SIZE, PGD_TABLE_SIZE);
---- a/arch/powerpc/kernel/btext.c
-+++ b/arch/powerpc/kernel/btext.c
-@@ -7,6 +7,7 @@
- #include <linux/string.h>
- #include <linux/init.h>
- #include <linux/module.h>
-+#include <linux/lmb.h>
- 
- #include <asm/sections.h>
- #include <asm/prom.h>
-@@ -15,7 +16,7 @@
- #include <asm/mmu.h>
- #include <asm/pgtable.h>
- #include <asm/io.h>
--#include <asm/lmb.h>
-+#include <asm/prom.h>
- #include <asm/processor.h>
- #include <asm/udbg.h>
- 
---- a/arch/powerpc/kernel/cpu_setup_44x.S
-+++ b/arch/powerpc/kernel/cpu_setup_44x.S
-@@ -3,7 +3,7 @@
-  * Valentine Barshak <vbarshak@ru.mvista.com>
-  * MontaVista Software, Inc (c) 2007
-  *
-- * Based on cpu_setup_6xx code by 
-+ * Based on cpu_setup_6xx code by
-  * Benjamin Herrenschmidt <benh@kernel.crashing.org>
-  *
-  * This program is free software; you can redistribute it and/or
-@@ -32,6 +32,9 @@ _GLOBAL(__setup_cpu_440grx)
- 	bl	__fixup_440A_mcheck
- 	mtlr	r4
- 	blr
-+_GLOBAL(__setup_cpu_460ex)
-+_GLOBAL(__setup_cpu_460gt)
-+	b	__init_fpu_44x
- _GLOBAL(__setup_cpu_440gx)
- _GLOBAL(__setup_cpu_440spe)
- 	b	__fixup_440A_mcheck
---- a/arch/powerpc/kernel/cputable.c
-+++ b/arch/powerpc/kernel/cputable.c
-@@ -36,6 +36,8 @@ extern void __setup_cpu_440epx(unsigned 
- extern void __setup_cpu_440gx(unsigned long offset, struct cpu_spec* spec);
- extern void __setup_cpu_440grx(unsigned long offset, struct cpu_spec* spec);
- extern void __setup_cpu_440spe(unsigned long offset, struct cpu_spec* spec);
-+extern void __setup_cpu_460ex(unsigned long offset, struct cpu_spec* spec);
-+extern void __setup_cpu_460gt(unsigned long offset, struct cpu_spec* spec);
- extern void __setup_cpu_603(unsigned long offset, struct cpu_spec* spec);
- extern void __setup_cpu_604(unsigned long offset, struct cpu_spec* spec);
- extern void __setup_cpu_750(unsigned long offset, struct cpu_spec* spec);
-@@ -1397,6 +1399,30 @@ static struct cpu_spec __initdata cpu_sp
- 		.machine_check		= machine_check_440A,
- 		.platform		= "ppc440",
- 	},
-+	{ /* 460EX */
-+		.pvr_mask		= 0xffff0002,
-+		.pvr_value		= 0x13020002,
-+		.cpu_name		= "460EX",
-+		.cpu_features		= CPU_FTRS_44X,
-+		.cpu_user_features	= COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU,
-+		.icache_bsize		= 32,
-+		.dcache_bsize		= 32,
-+		.cpu_setup		= __setup_cpu_460ex,
-+		.machine_check		= machine_check_440A,
-+		.platform		= "ppc440",
-+	},
-+	{ /* 460GT */
-+		.pvr_mask		= 0xffff0002,
-+		.pvr_value		= 0x13020000,
-+		.cpu_name		= "460GT",
-+		.cpu_features		= CPU_FTRS_44X,
-+		.cpu_user_features	= COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU,
-+		.icache_bsize		= 32,
-+		.dcache_bsize		= 32,
-+		.cpu_setup		= __setup_cpu_460gt,
-+		.machine_check		= machine_check_440A,
-+		.platform		= "ppc440",
-+	},
- #endif /* CONFIG_44x */
- #ifdef CONFIG_FSL_BOOKE
- #ifdef CONFIG_E200
-@@ -1512,7 +1538,7 @@ struct cpu_spec * __init identify_cpu(un
- 				*t = *s;
- 			*PTRRELOC(&cur_cpu_spec) = &the_cpu_spec;
- #if defined(CONFIG_PPC64) || defined(CONFIG_BOOKE)
--			/* ppc64 and booke expect identify_cpu to also call 
-+			/* ppc64 and booke expect identify_cpu to also call
- 			 * setup_cpu for that processor. I will consolidate
- 			 * that at a later time, for now, just use #ifdef.
- 			 * we also don't need to PTRRELOC the function pointer
---- a/arch/powerpc/kernel/crash.c
-+++ b/arch/powerpc/kernel/crash.c
-@@ -24,12 +24,13 @@
- #include <linux/init.h>
- #include <linux/irq.h>
- #include <linux/types.h>
-+#include <linux/lmb.h>
- 
- #include <asm/processor.h>
- #include <asm/machdep.h>
- #include <asm/kexec.h>
- #include <asm/kdump.h>
--#include <asm/lmb.h>
-+#include <asm/prom.h>
- #include <asm/firmware.h>
- #include <asm/smp.h>
- #include <asm/system.h>
---- a/arch/powerpc/kernel/crash_dump.c
-+++ b/arch/powerpc/kernel/crash_dump.c
-@@ -13,8 +13,9 @@
- 
- #include <linux/crash_dump.h>
- #include <linux/bootmem.h>
-+#include <linux/lmb.h>
- #include <asm/kdump.h>
--#include <asm/lmb.h>
-+#include <asm/prom.h>
- #include <asm/firmware.h>
- #include <asm/uaccess.h>
- 
---- a/arch/powerpc/kernel/entry_32.S
-+++ b/arch/powerpc/kernel/entry_32.S
-@@ -110,9 +110,9 @@ transfer_to_handler:
- 	stw	r11,PT_REGS(r12)
- #if defined(CONFIG_40x) || defined(CONFIG_BOOKE)
- 	/* Check to see if the dbcr0 register is set up to debug.  Use the
--	   single-step bit to do this. */
-+	   internal debug mode bit to do this. */
- 	lwz	r12,THREAD_DBCR0(r12)
--	andis.	r12,r12,DBCR0_IC@h
-+	andis.	r12,r12,DBCR0_IDM@h
- 	beq+	3f
- 	/* From user and task is ptraced - load up global dbcr0 */
- 	li	r12,-1			/* clear all pending debug events */
-@@ -120,6 +120,12 @@ transfer_to_handler:
- 	lis	r11,global_dbcr0@ha
- 	tophys(r11,r11)
- 	addi	r11,r11,global_dbcr0@l
-+#ifdef CONFIG_SMP
-+	rlwinm	r9,r1,0,0,(31-THREAD_SHIFT)
-+	lwz	r9,TI_CPU(r9)
-+	slwi	r9,r9,3
-+	add	r11,r11,r9
-+#endif
- 	lwz	r12,0(r11)
- 	mtspr	SPRN_DBCR0,r12
- 	lwz	r12,4(r11)
-@@ -238,10 +244,10 @@ ret_from_syscall:
- 	stw	r11,_CCR(r1)
- syscall_exit_cont:
- #if defined(CONFIG_4xx) || defined(CONFIG_BOOKE)
--	/* If the process has its own DBCR0 value, load it up.  The single
--	   step bit tells us that dbcr0 should be loaded. */
-+	/* If the process has its own DBCR0 value, load it up.  The internal
-+	   debug mode bit tells us that dbcr0 should be loaded. */
- 	lwz	r0,THREAD+THREAD_DBCR0(r2)
--	andis.	r10,r0,DBCR0_IC@h
-+	andis.	r10,r0,DBCR0_IDM@h
- 	bnel-	load_dbcr0
- #endif
- #ifdef CONFIG_44x
-@@ -666,10 +672,10 @@ user_exc_return:		/* r10 contains MSR_KE
- 
- restore_user:
- #if defined(CONFIG_4xx) || defined(CONFIG_BOOKE)
--	/* Check whether this process has its own DBCR0 value.  The single
--	   step bit tells us that dbcr0 should be loaded. */
-+	/* Check whether this process has its own DBCR0 value.  The internal
-+	   debug mode bit tells us that dbcr0 should be loaded. */
- 	lwz	r0,THREAD+THREAD_DBCR0(r2)
--	andis.	r10,r0,DBCR0_IC@h
-+	andis.	r10,r0,DBCR0_IDM@h
- 	bnel-	load_dbcr0
- #endif
- 
-@@ -879,6 +885,12 @@ load_dbcr0:
- 	mfspr	r10,SPRN_DBCR0
- 	lis	r11,global_dbcr0@ha
- 	addi	r11,r11,global_dbcr0@l
-+#ifdef CONFIG_SMP
-+	rlwinm	r9,r1,0,0,(31-THREAD_SHIFT)
-+	lwz	r9,TI_CPU(r9)
-+	slwi	r9,r9,3
-+	add	r11,r11,r9
-+#endif
- 	stw	r10,0(r11)
- 	mtspr	SPRN_DBCR0,r0
- 	lwz	r10,4(r11)
-@@ -891,7 +903,7 @@ load_dbcr0:
- 	.section .bss
- 	.align	4
- global_dbcr0:
--	.space	8
-+	.space	8*NR_CPUS
- 	.previous
- #endif /* !(CONFIG_4xx || CONFIG_BOOKE) */
- 
---- a/arch/powerpc/kernel/entry_64.S
-+++ b/arch/powerpc/kernel/entry_64.S
-@@ -29,6 +29,8 @@
- #include <asm/cputable.h>
- #include <asm/firmware.h>
- #include <asm/bug.h>
-+#include <asm/ptrace.h>
-+#include <asm/irqflags.h>
- 
- /*
-  * System calls.
-@@ -39,7 +41,7 @@
- 
- /* This value is used to mark exception frames on the stack. */
- exception_marker:
--	.tc	ID_72656773_68657265[TC],0x7265677368657265
-+	.tc	ID_EXC_MARKER[TC],STACK_FRAME_REGS_MARKER
- 
- 	.section	".text"
- 	.align 7
-@@ -88,6 +90,14 @@ system_call_common:
- 	addi	r9,r1,STACK_FRAME_OVERHEAD
- 	ld	r11,exception_marker@toc(r2)
- 	std	r11,-16(r9)		/* "regshere" marker */
-+#ifdef CONFIG_TRACE_IRQFLAGS
-+	bl	.trace_hardirqs_on
-+	REST_GPR(0,r1)
-+	REST_4GPRS(3,r1)
-+	REST_2GPRS(7,r1)
-+	addi	r9,r1,STACK_FRAME_OVERHEAD
-+	ld	r12,_MSR(r1)
-+#endif /* CONFIG_TRACE_IRQFLAGS */
- 	li	r10,1
- 	stb	r10,PACASOFTIRQEN(r13)
- 	stb	r10,PACAHARDIRQEN(r13)
-@@ -102,7 +112,7 @@ BEGIN_FW_FTR_SECTION
- 	b	hardware_interrupt_entry
- 2:
- END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
--#endif
-+#endif /* CONFIG_PPC_ISERIES */
- 	mfmsr	r11
- 	ori	r11,r11,MSR_EE
- 	mtmsrd	r11,1
-@@ -504,6 +514,10 @@ BEGIN_FW_FTR_SECTION
- 
- 	li	r3,0
- 	stb	r3,PACASOFTIRQEN(r13)	/* ensure we are soft-disabled */
-+#ifdef CONFIG_TRACE_IRQFLAGS
-+	bl	.trace_hardirqs_off
-+	mfmsr	r10
-+#endif
- 	ori	r10,r10,MSR_EE
- 	mtmsrd	r10			/* hard-enable again */
- 	addi	r3,r1,STACK_FRAME_OVERHEAD
-@@ -512,7 +526,7 @@ BEGIN_FW_FTR_SECTION
- 4:
- END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
- #endif
--	stb	r5,PACASOFTIRQEN(r13)
-+	TRACE_AND_RESTORE_IRQ(r5);
- 
- 	/* extract EE bit and use it to restore paca->hard_enabled */
- 	ld	r3,_MSR(r1)
-@@ -580,6 +594,16 @@ do_work:
- 	bne	restore
- 	/* here we are preempting the current task */
- 1:
-+#ifdef CONFIG_TRACE_IRQFLAGS
-+	bl	.trace_hardirqs_on
-+	/* Note: we just clobbered r10 which used to contain the previous
-+	 * MSR before the hard-disabling done by the caller of do_work.
-+	 * We don't have that value anymore, but it doesn't matter as
-+	 * we will hard-enable unconditionally, we can just reload the
-+	 * current MSR into r10
-+	 */
-+	mfmsr	r10
-+#endif /* CONFIG_TRACE_IRQFLAGS */
- 	li	r0,1
- 	stb	r0,PACASOFTIRQEN(r13)
- 	stb	r0,PACAHARDIRQEN(r13)
---- a/arch/powerpc/kernel/head_32.S
-+++ b/arch/powerpc/kernel/head_32.S
-@@ -30,6 +30,7 @@
- #include <asm/thread_info.h>
- #include <asm/ppc_asm.h>
- #include <asm/asm-offsets.h>
-+#include <asm/ptrace.h>
- 
- /* 601 only have IBAT; cr0.eq is set on 601 when using this macro */
- #define LOAD_BAT(n, reg, RA, RB)	\
-@@ -268,8 +269,8 @@ __secondary_hold_acknowledge:
- 	li	r10,MSR_KERNEL & ~(MSR_IR|MSR_DR); /* can take exceptions */ \
- 	MTMSRD(r10);			/* (except for mach check in rtas) */ \
- 	stw	r0,GPR0(r11);	\
--	lis	r10,0x7265;		/* put exception frame marker */ \
--	addi	r10,r10,0x6773;	\
-+	lis	r10,STACK_FRAME_REGS_MARKER@ha; /* exception frame marker */ \
-+	addi	r10,r10,STACK_FRAME_REGS_MARKER@l; \
- 	stw	r10,8(r11);	\
- 	SAVE_4GPRS(3, r11);	\
- 	SAVE_2GPRS(7, r11)
-@@ -763,23 +764,6 @@ load_up_altivec:
- 	b	fast_exception_return
- 
- /*
-- * AltiVec unavailable trap from kernel - print a message, but let
-- * the task use AltiVec in the kernel until it returns to user mode.
-- */
--KernelAltiVec:
--	lwz	r3,_MSR(r1)
--	oris	r3,r3,MSR_VEC@h
--	stw	r3,_MSR(r1)	/* enable use of AltiVec after return */
--	lis	r3,87f@h
--	ori	r3,r3,87f@l
--	mr	r4,r2		/* current */
--	lwz	r5,_NIP(r1)
--	bl	printk
--	b	ret_from_except
--87:	.string	"AltiVec used in kernel  (task=%p, pc=%x)  \n"
--	.align	4,0
--
--/*
-  * giveup_altivec(tsk)
-  * Disable AltiVec for the task given as the argument,
-  * and save the AltiVec registers in its thread_struct.
---- a/arch/powerpc/kernel/head_44x.S
-+++ b/arch/powerpc/kernel/head_44x.S
-@@ -211,7 +211,7 @@ skpinv:	addi	r4,r4,1				/* Increment */
- 	SET_IVOR(12, WatchdogTimer);
- 	SET_IVOR(13, DataTLBError);
- 	SET_IVOR(14, InstructionTLBError);
--	SET_IVOR(15, Debug);
-+	SET_IVOR(15, DebugCrit);
- 
- 	/* Establish the interrupt vector base */
- 	lis	r4,interrupt_base@h	/* IVPR only uses the high 16-bits */
-@@ -578,7 +578,7 @@ interrupt_base:
- 	b	InstructionStorage
- 
- 	/* Debug Interrupt */
--	DEBUG_EXCEPTION
-+	DEBUG_CRIT_EXCEPTION
- 
- /*
-  * Local functions
---- a/arch/powerpc/kernel/head_64.S
-+++ b/arch/powerpc/kernel/head_64.S
-@@ -36,8 +36,7 @@
- #include <asm/firmware.h>
- #include <asm/page_64.h>
- #include <asm/exception.h>
--
--#define DO_SOFT_DISABLE
-+#include <asm/irqflags.h>
- 
- /*
-  * We layout physical memory as follows:
-@@ -450,8 +449,8 @@ bad_stack:
-  */
- fast_exc_return_irq:			/* restores irq state too */
- 	ld	r3,SOFTE(r1)
-+	TRACE_AND_RESTORE_IRQ(r3);
- 	ld	r12,_MSR(r1)
--	stb	r3,PACASOFTIRQEN(r13)	/* restore paca->soft_enabled */
- 	rldicl	r4,r12,49,63		/* get MSR_EE to LSB */
- 	stb	r4,PACAHARDIRQEN(r13)	/* restore paca->hard_enabled */
- 	b	1f
-@@ -621,7 +620,7 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISER
- 	mtlr	r10
- 
- 	andi.	r10,r12,MSR_RI	/* check for unrecoverable exception */
--	beq-	unrecov_slb
-+	beq-	2f
- 
- .machine	push
- .machine	"power4"
-@@ -643,6 +642,22 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISER
- 	rfid
- 	b	.	/* prevent speculative execution */
- 
-+2:
-+#ifdef CONFIG_PPC_ISERIES
-+BEGIN_FW_FTR_SECTION
-+	b	unrecov_slb
-+END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
-+#endif /* CONFIG_PPC_ISERIES */
-+	mfspr	r11,SPRN_SRR0
-+	clrrdi	r10,r13,32
-+	LOAD_HANDLER(r10,unrecov_slb)
-+	mtspr	SPRN_SRR0,r10
-+	mfmsr	r10
-+	ori	r10,r10,MSR_IR|MSR_DR|MSR_RI
-+	mtspr	SPRN_SRR1,r10
-+	rfid
-+	b	.
-+
- unrecov_slb:
- 	EXCEPTION_PROLOG_COMMON(0x4100, PACA_EXSLB)
- 	DISABLE_INTS
-@@ -808,7 +823,7 @@ _STATIC(load_up_altivec)
-  * Hash table stuff
-  */
- 	.align	7
--_GLOBAL(do_hash_page)
-+_STATIC(do_hash_page)
- 	std	r3,_DAR(r1)
- 	std	r4,_DSISR(r1)
- 
-@@ -820,6 +835,27 @@ BEGIN_FTR_SECTION
- END_FTR_SECTION_IFCLR(CPU_FTR_SLB)
- 
- 	/*
-+	 * On iSeries, we soft-disable interrupts here, then
-+	 * hard-enable interrupts so that the hash_page code can spin on
-+	 * the hash_table_lock without problems on a shared processor.
-+	 */
-+	DISABLE_INTS
-+
-+	/*
-+	 * Currently, trace_hardirqs_off() will be called by DISABLE_INTS
-+	 * and will clobber volatile registers when irq tracing is enabled
-+	 * so we need to reload them. It may be possible to be smarter here
-+	 * and move the irq tracing elsewhere but let's keep it simple for
-+	 * now
-+	 */
-+#ifdef CONFIG_TRACE_IRQFLAGS
-+	ld	r3,_DAR(r1)
-+	ld	r4,_DSISR(r1)
-+	ld	r5,_TRAP(r1)
-+	ld	r12,_MSR(r1)
-+	clrrdi	r5,r5,4
-+#endif /* CONFIG_TRACE_IRQFLAGS */
-+	/*
- 	 * We need to set the _PAGE_USER bit if MSR_PR is set or if we are
- 	 * accessing a userspace segment (even from the kernel). We assume
- 	 * kernel addresses always have the high bit set.
-@@ -832,13 +868,6 @@ END_FTR_SECTION_IFCLR(CPU_FTR_SLB)
- 	rlwimi	r4,r5,22+2,31-2,31-2	/* Set _PAGE_EXEC if trap is 0x400 */
- 
- 	/*
--	 * On iSeries, we soft-disable interrupts here, then
--	 * hard-enable interrupts so that the hash_page code can spin on
--	 * the hash_table_lock without problems on a shared processor.
--	 */
--	DISABLE_INTS
--
--	/*
- 	 * r3 contains the faulting address
- 	 * r4 contains the required access permissions
- 	 * r5 contains the trap number
-@@ -848,7 +877,6 @@ END_FTR_SECTION_IFCLR(CPU_FTR_SLB)
- 	bl	.hash_page		/* build HPTE if possible */
- 	cmpdi	r3,0			/* see if hash_page succeeded */
- 
--#ifdef DO_SOFT_DISABLE
- BEGIN_FW_FTR_SECTION
- 	/*
- 	 * If we had interrupts soft-enabled at the point where the
-@@ -860,7 +888,7 @@ BEGIN_FW_FTR_SECTION
- 	 */
- 	beq	13f
- END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
--#endif
-+
- BEGIN_FW_FTR_SECTION
- 	/*
- 	 * Here we have interrupts hard-disabled, so it is sufficient
-@@ -874,11 +902,12 @@ END_FW_FTR_SECTION_IFCLR(FW_FEATURE_ISER
- 
- 	/*
- 	 * hash_page couldn't handle it, set soft interrupt enable back
--	 * to what it was before the trap.  Note that .local_irq_restore
-+	 * to what it was before the trap.  Note that .raw_local_irq_restore
- 	 * handles any interrupts pending at this point.
- 	 */
- 	ld	r3,SOFTE(r1)
--	bl	.local_irq_restore
-+	TRACE_AND_RESTORE_IRQ_PARTIAL(r3, 11f)
-+	bl	.raw_local_irq_restore
- 	b	11f
- 
- /* Here we have a page fault that hash_page can't handle. */
-@@ -1477,6 +1506,10 @@ _INIT_STATIC(start_here_multiplatform)
- 	addi	r2,r2,0x4000
- 	add	r2,r2,r26
- 
-+	/* Set initial ptr to current */
-+	LOAD_REG_IMMEDIATE(r4, init_task)
-+	std	r4,PACACURRENT(r13)
-+
- 	/* Do very early kernel initializations, including initial hash table,
- 	 * stab and slb setup before we turn on relocation.	*/
- 
-@@ -1505,10 +1538,6 @@ _INIT_GLOBAL(start_here_common)
- 	li	r0,0
- 	stdu	r0,-STACK_FRAME_OVERHEAD(r1)
- 
--	/* ptr to current */
--	LOAD_REG_IMMEDIATE(r4, init_task)
--	std	r4,PACACURRENT(r13)
--
- 	/* Load the TOC */
- 	ld	r2,PACATOC(r13)
- 	std	r1,PACAKSAVE(r13)
---- a/arch/powerpc/kernel/head_booke.h
-+++ b/arch/powerpc/kernel/head_booke.h
-@@ -56,8 +56,17 @@
-  * is necessary since the MMU is always on, for Book-E parts, and the stacks
-  * are offset from KERNELBASE.
-  *
-+ * There is some space optimization to be had here if desired.  However
-+ * to allow for a common kernel with support for debug exceptions either
-+ * going to critical or their own debug level we aren't currently
-+ * providing configurations that micro-optimize space usage.
-  */
--#define BOOKE_EXCEPTION_STACK_SIZE	(8192)
-+#ifdef CONFIG_44x
-+#define NUM_EXCEPTION_LVLS	2
-+#else
-+#define NUM_EXCEPTION_LVLS	3
-+#endif
-+#define BOOKE_EXCEPTION_STACK_SIZE	(4096 * NUM_EXCEPTION_LVLS)
- 
- /* CRIT_SPRG only used in critical exception handling */
- #define CRIT_SPRG	SPRN_SPRG2
-@@ -68,7 +77,7 @@
- #define CRIT_STACK_TOP		(exception_stack_top)
- 
- /* only on e200 for now */
--#define DEBUG_STACK_TOP		(exception_stack_top - 4096)
-+#define DEBUG_STACK_TOP		(exception_stack_top - 8192)
- #define DEBUG_SPRG		SPRN_SPRG6W
- 
- #ifdef CONFIG_SMP
-@@ -212,9 +221,8 @@ label:
-  * save (and later restore) the MSR via SPRN_CSRR1, which will still have
-  * the MSR_DE bit set.
-  */
--#ifdef CONFIG_E200
--#define DEBUG_EXCEPTION							      \
--	START_EXCEPTION(Debug);						      \
-+#define DEBUG_DEBUG_EXCEPTION						      \
-+	START_EXCEPTION(DebugDebug);					      \
- 	DEBUG_EXCEPTION_PROLOG;						      \
- 									      \
- 	/*								      \
-@@ -234,8 +242,8 @@ label:
- 	cmplw	r12,r10;						      \
- 	blt+	2f;			/* addr below exception vectors */    \
- 									      \
--	lis	r10,Debug@h;						      \
--	ori	r10,r10,Debug@l;					      \
-+	lis	r10,DebugDebug@h;					      \
-+	ori	r10,r10,DebugDebug@l;					      \
- 	cmplw	r12,r10;						      \
- 	bgt+	2f;			/* addr above exception vectors */    \
- 									      \
-@@ -265,9 +273,9 @@ label:
- 2:	mfspr	r4,SPRN_DBSR;						      \
- 	addi	r3,r1,STACK_FRAME_OVERHEAD;				      \
- 	EXC_XFER_TEMPLATE(DebugException, 0x2002, (MSR_KERNEL & ~(MSR_ME|MSR_DE|MSR_CE)), NOCOPY, debug_transfer_to_handler, ret_from_debug_exc)
--#else
--#define DEBUG_EXCEPTION							      \
--	START_EXCEPTION(Debug);						      \
-+
-+#define DEBUG_CRIT_EXCEPTION						      \
-+	START_EXCEPTION(DebugCrit);					      \
- 	CRITICAL_EXCEPTION_PROLOG;					      \
- 									      \
- 	/*								      \
-@@ -287,8 +295,8 @@ label:
- 	cmplw	r12,r10;						      \
- 	blt+	2f;			/* addr below exception vectors */    \
- 									      \
--	lis	r10,Debug@h;						      \
--	ori	r10,r10,Debug@l;					      \
-+	lis	r10,DebugCrit@h;						      \
-+	ori	r10,r10,DebugCrit@l;					      \
- 	cmplw	r12,r10;						      \
- 	bgt+	2f;			/* addr above exception vectors */    \
- 									      \
-@@ -318,7 +326,6 @@ label:
- 2:	mfspr	r4,SPRN_DBSR;						      \
- 	addi	r3,r1,STACK_FRAME_OVERHEAD;				      \
- 	EXC_XFER_TEMPLATE(DebugException, 0x2002, (MSR_KERNEL & ~(MSR_ME|MSR_DE|MSR_CE)), NOCOPY, crit_transfer_to_handler, ret_from_crit_exc)
--#endif
- 
- #define INSTRUCTION_STORAGE_EXCEPTION					      \
- 	START_EXCEPTION(InstructionStorage)				      \
---- a/arch/powerpc/kernel/head_fsl_booke.S
-+++ b/arch/powerpc/kernel/head_fsl_booke.S
-@@ -68,7 +68,9 @@ _ENTRY(_start);
- 	mr	r29,r5
- 	mr	r28,r6
- 	mr	r27,r7
-+	li	r25,0		/* phys kernel start (low) */
- 	li	r24,0		/* CPU number */
-+	li	r23,0		/* phys kernel start (high) */
- 
- /* We try to not make any assumptions about how the boot loader
-  * setup or used the TLBs.  We invalidate all mappings from the
-@@ -167,7 +169,28 @@ skpinv:	addi	r6,r6,1				/* Increment */
- 	mtspr	SPRN_MAS0,r7
- 	tlbre
- 
--	/* Just modify the entry ID, EPN and RPN for the temp mapping */
-+	/* grab and fixup the RPN */
-+	mfspr	r6,SPRN_MAS1	/* extract MAS1[SIZE] */
-+	rlwinm	r6,r6,25,27,30
-+	li	r8,-1
-+	addi	r6,r6,10
-+	slw	r6,r8,r6	/* convert to mask */
-+
-+	bl	1f		/* Find our address */
-+1:	mflr	r7
-+
-+	mfspr	r8,SPRN_MAS3
-+#ifdef CONFIG_PHYS_64BIT
-+	mfspr	r23,SPRN_MAS7
-+#endif
-+	and	r8,r6,r8
-+	subfic	r9,r6,-4096
-+	and	r9,r9,r7
-+
-+	or	r25,r8,r9
-+	ori	r8,r25,(MAS3_SX|MAS3_SW|MAS3_SR)
-+
-+	/* Just modify the entry ID and EPN for the temp mapping */
- 	lis	r7,0x1000	/* Set MAS0(TLBSEL) = 1 */
- 	rlwimi	r7,r5,16,4,15	/* Setup MAS0 = TLBSEL | ESEL(r5) */
- 	mtspr	SPRN_MAS0,r7
-@@ -177,12 +200,10 @@ skpinv:	addi	r6,r6,1				/* Increment */
- 	ori	r6,r6,(MAS1_TSIZE(BOOKE_PAGESZ_4K))@l
- 	mtspr	SPRN_MAS1,r6
- 	mfspr	r6,SPRN_MAS2
--	lis	r7,PHYSICAL_START@h
-+	li	r7,0		/* temp EPN = 0 */
- 	rlwimi	r7,r6,0,20,31
- 	mtspr	SPRN_MAS2,r7
--	mfspr	r6,SPRN_MAS3
--	rlwimi	r7,r6,0,20,31
--	mtspr	SPRN_MAS3,r7
-+	mtspr	SPRN_MAS3,r8
- 	tlbwe
- 
- 	xori	r6,r4,1
-@@ -232,8 +253,7 @@ skpinv:	addi	r6,r6,1				/* Increment */
- 	ori	r6,r6,PAGE_OFFSET@l
- 	rlwimi	r6,r7,0,20,31
- 	mtspr	SPRN_MAS2,r6
--	li	r7,(MAS3_SX|MAS3_SW|MAS3_SR)
--	mtspr	SPRN_MAS3,r7
-+	mtspr	SPRN_MAS3,r8
- 	tlbwe
- 
- /* 7. Jump to KERNELBASE mapping */
-@@ -283,7 +303,10 @@ skpinv:	addi	r6,r6,1				/* Increment */
- 	SET_IVOR(12, WatchdogTimer);
- 	SET_IVOR(13, DataTLBError);
- 	SET_IVOR(14, InstructionTLBError);
--	SET_IVOR(15, Debug);
-+	SET_IVOR(15, DebugDebug);
-+#if defined(CONFIG_E500)
-+	SET_IVOR(15, DebugCrit);
-+#endif
- 	SET_IVOR(32, SPEUnavailable);
- 	SET_IVOR(33, SPEFloatingPointData);
- 	SET_IVOR(34, SPEFloatingPointRound);
-@@ -718,7 +741,10 @@ interrupt_base:
- 
- 
- 	/* Debug Interrupt */
--	DEBUG_EXCEPTION
-+	DEBUG_DEBUG_EXCEPTION
-+#if defined(CONFIG_E500)
-+	DEBUG_CRIT_EXCEPTION
-+#endif
- 
- /*
-  * Local functions
---- a/arch/powerpc/kernel/ibmebus.c
-+++ b/arch/powerpc/kernel/ibmebus.c
-@@ -183,7 +183,7 @@ static int ibmebus_create_devices(const 
- 		ret = ibmebus_create_device(child);
- 		if (ret) {
- 			printk(KERN_ERR "%s: failed to create device (%i)",
--			       __FUNCTION__, ret);
-+			       __func__, ret);
- 			of_node_put(child);
- 			break;
- 		}
-@@ -269,7 +269,7 @@ static ssize_t ibmebus_store_probe(struc
- 	if (bus_find_device(&ibmebus_bus_type, NULL, path,
- 			    ibmebus_match_path)) {
- 		printk(KERN_WARNING "%s: %s has already been probed\n",
--		       __FUNCTION__, path);
-+		       __func__, path);
- 		rc = -EEXIST;
- 		goto out;
- 	}
-@@ -279,7 +279,7 @@ static ssize_t ibmebus_store_probe(struc
- 		of_node_put(dn);
- 	} else {
- 		printk(KERN_WARNING "%s: no such device node: %s\n",
--		       __FUNCTION__, path);
-+		       __func__, path);
- 		rc = -ENODEV;
- 	}
- 
-@@ -308,7 +308,7 @@ static ssize_t ibmebus_store_remove(stru
- 		return count;
- 	} else {
- 		printk(KERN_WARNING "%s: %s not on the bus\n",
--		       __FUNCTION__, path);
-+		       __func__, path);
- 
- 		kfree(path);
- 		return -ENODEV;
-@@ -337,14 +337,14 @@ static int __init ibmebus_bus_init(void)
- 	err = of_bus_type_init(&ibmebus_bus_type, "ibmebus");
- 	if (err) {
- 		printk(KERN_ERR "%s: failed to register IBM eBus.\n",
--		       __FUNCTION__);
-+		       __func__);
- 		return err;
- 	}
- 
- 	err = device_register(&ibmebus_bus_device);
- 	if (err) {
- 		printk(KERN_WARNING "%s: device_register returned %i\n",
--		       __FUNCTION__, err);
-+		       __func__, err);
- 		bus_unregister(&ibmebus_bus_type);
- 
- 		return err;
---- a/arch/powerpc/kernel/iommu.c
-+++ b/arch/powerpc/kernel/iommu.c
-@@ -520,7 +520,7 @@ void iommu_free_table(struct iommu_table
- 	unsigned int order;
- 
- 	if (!tbl || !tbl->it_map) {
--		printk(KERN_ERR "%s: expected TCE map for %s\n", __FUNCTION__,
-+		printk(KERN_ERR "%s: expected TCE map for %s\n", __func__,
- 				node_name);
- 		return;
- 	}
-@@ -530,7 +530,7 @@ void iommu_free_table(struct iommu_table
- 	for (i = 0; i < (tbl->it_size/64); i++) {
- 		if (tbl->it_map[i] != 0) {
- 			printk(KERN_WARNING "%s: Unexpected TCEs for %s\n",
--				__FUNCTION__, node_name);
-+				__func__, node_name);
- 			break;
- 		}
- 	}
---- a/arch/powerpc/kernel/irq.c
-+++ b/arch/powerpc/kernel/irq.c
-@@ -114,7 +114,7 @@ static inline void set_soft_enabled(unsi
- 	: : "r" (enable), "i" (offsetof(struct paca_struct, soft_enabled)));
- }
- 
--void local_irq_restore(unsigned long en)
-+void raw_local_irq_restore(unsigned long en)
- {
- 	/*
- 	 * get_paca()->soft_enabled = en;
-@@ -174,6 +174,7 @@ void local_irq_restore(unsigned long en)
- 
- 	__hard_irq_enable();
- }
-+EXPORT_SYMBOL(raw_local_irq_restore);
- #endif /* CONFIG_PPC64 */
- 
- int show_interrupts(struct seq_file *p, void *v)
-@@ -310,8 +311,21 @@ void do_IRQ(struct pt_regs *regs)
- 				handler = &__do_IRQ;
- 			irqtp->task = curtp->task;
- 			irqtp->flags = 0;
-+
-+			/* Copy the softirq bits in preempt_count so that the
-+			 * softirq checks work in the hardirq context.
-+			 */
-+			irqtp->preempt_count =
-+				(irqtp->preempt_count & ~SOFTIRQ_MASK) |
-+				(curtp->preempt_count & SOFTIRQ_MASK);
-+
- 			call_handle_irq(irq, desc, irqtp, handler);
- 			irqtp->task = NULL;
-+
-+
-+			/* Set any flag that may have been set on the
-+			 * alternate stack
-+			 */
- 			if (irqtp->flags)
- 				set_bits(irqtp->flags, &curtp->flags);
- 		} else
-@@ -357,7 +371,7 @@ void irq_ctx_init(void)
- 		memset((void *)softirq_ctx[i], 0, THREAD_SIZE);
- 		tp = softirq_ctx[i];
- 		tp->cpu = i;
--		tp->preempt_count = SOFTIRQ_OFFSET;
-+		tp->preempt_count = 0;
- 
- 		memset((void *)hardirq_ctx[i], 0, THREAD_SIZE);
- 		tp = hardirq_ctx[i];
---- a/arch/powerpc/kernel/isa-bridge.c
-+++ b/arch/powerpc/kernel/isa-bridge.c
-@@ -80,13 +80,13 @@ static void __devinit pci_process_ISA_OF
- 	 *			(size depending on dev->n_addr_cells)
- 	 *   cell 5:		the size of the range
- 	 */
--	if ((range->isa_addr.a_hi && ISA_SPACE_MASK) != ISA_SPACE_IO) {
-+	if ((range->isa_addr.a_hi & ISA_SPACE_MASK) != ISA_SPACE_IO) {
- 		range++;
- 		rlen -= sizeof(struct isa_range);
- 		if (rlen < sizeof(struct isa_range))
- 			goto inval_range;
- 	}
--	if ((range->isa_addr.a_hi && ISA_SPACE_MASK) != ISA_SPACE_IO)
-+	if ((range->isa_addr.a_hi & ISA_SPACE_MASK) != ISA_SPACE_IO)
- 		goto inval_range;
- 
- 	isa_addr = range->isa_addr.a_lo;
-@@ -99,7 +99,7 @@ static void __devinit pci_process_ISA_OF
- 	 */
- 	if ((pci_addr != 0) || (isa_addr != 0)) {
- 		printk(KERN_ERR "unexpected isa to pci mapping: %s\n",
--		       __FUNCTION__);
-+		       __func__);
- 		return;
- 	}
- 
---- a/arch/powerpc/kernel/lparcfg.c
-+++ b/arch/powerpc/kernel/lparcfg.c
-@@ -226,7 +226,7 @@ static void parse_system_parameter_strin
- 	unsigned char *local_buffer = kmalloc(SPLPAR_MAXLENGTH, GFP_KERNEL);
- 	if (!local_buffer) {
- 		printk(KERN_ERR "%s %s kmalloc failure at line %d \n",
--		       __FILE__, __FUNCTION__, __LINE__);
-+		       __FILE__, __func__, __LINE__);
- 		return;
- 	}
- 
-@@ -243,14 +243,14 @@ static void parse_system_parameter_strin
- 	if (call_status != 0) {
- 		printk(KERN_INFO
- 		       "%s %s Error calling get-system-parameter (0x%x)\n",
--		       __FILE__, __FUNCTION__, call_status);
-+		       __FILE__, __func__, call_status);
- 	} else {
- 		int splpar_strlen;
- 		int idx, w_idx;
- 		char *workbuffer = kzalloc(SPLPAR_MAXLENGTH, GFP_KERNEL);
- 		if (!workbuffer) {
- 			printk(KERN_ERR "%s %s kmalloc failure at line %d \n",
--			       __FILE__, __FUNCTION__, __LINE__);
-+			       __FILE__, __func__, __LINE__);
- 			kfree(local_buffer);
- 			return;
- 		}
-@@ -484,10 +484,10 @@ static ssize_t lparcfg_write(struct file
- 	current_weight = (resource >> 5 * 8) & 0xFF;
- 
- 	pr_debug("%s: current_entitled = %lu, current_weight = %u\n",
--		 __FUNCTION__, current_entitled, current_weight);
-+		 __func__, current_entitled, current_weight);
- 
- 	pr_debug("%s: new_entitled = %lu, new_weight = %u\n",
--		 __FUNCTION__, *new_entitled_ptr, *new_weight_ptr);
-+		 __func__, *new_entitled_ptr, *new_weight_ptr);
- 
- 	retval = plpar_hcall_norets(H_SET_PPP, *new_entitled_ptr,
- 				    *new_weight_ptr);
-@@ -502,7 +502,7 @@ static ssize_t lparcfg_write(struct file
- 		retval = -EINVAL;
- 	} else {
- 		printk(KERN_WARNING "%s: received unknown hv return code %ld",
--		       __FUNCTION__, retval);
-+		       __func__, retval);
- 		retval = -EIO;
- 	}
- 
---- a/arch/powerpc/kernel/machine_kexec.c
-+++ b/arch/powerpc/kernel/machine_kexec.c
-@@ -12,8 +12,9 @@
- #include <linux/kexec.h>
- #include <linux/reboot.h>
- #include <linux/threads.h>
-+#include <linux/lmb.h>
- #include <asm/machdep.h>
--#include <asm/lmb.h>
-+#include <asm/prom.h>
- 
- void machine_crash_shutdown(struct pt_regs *regs)
- {
---- a/arch/powerpc/kernel/paca.c
-+++ b/arch/powerpc/kernel/paca.c
-@@ -15,7 +15,6 @@
- #include <asm/ptrace.h>
- #include <asm/page.h>
- #include <asm/lppaca.h>
--#include <asm/iseries/it_lp_reg_save.h>
- #include <asm/paca.h>
- #include <asm/mmu.h>
- 
-@@ -25,13 +24,13 @@
- extern unsigned long __toc_start;
- 
- /*
-- * iSeries structure which the hypervisor knows about - this structure
-+ * The structure which the hypervisor knows about - this structure
-  * should not cross a page boundary.  The vpa_init/register_vpa call
-  * is now known to fail if the lppaca structure crosses a page
-- * boundary.  The lppaca is also used on POWER5 pSeries boxes.  The
-- * lppaca is 640 bytes long, and cannot readily change since the
-- * hypervisor knows its layout, so a 1kB alignment will suffice to
-- * ensure that it doesn't cross a page boundary.
-+ * boundary.  The lppaca is also used on legacy iSeries and POWER5
-+ * pSeries boxes.  The lppaca is 640 bytes long, and cannot readily
-+ * change since the hypervisor knows its layout, so a 1kB alignment
-+ * will suffice to ensure that it doesn't cross a page boundary.
-  */
- struct lppaca lppaca[] = {
- 	[0 ... (NR_CPUS-1)] = {
-@@ -66,32 +65,17 @@ struct slb_shadow slb_shadow[] __cacheli
-  * processors.  The processor VPD array needs one entry per physical
-  * processor (not thread).
-  */
--#define PACA_INIT_COMMON(number)					    \
-+#define PACA_INIT(number)						    \
-+{									    \
- 	.lppaca_ptr = &lppaca[number],					    \
- 	.lock_token = 0x8000,						    \
- 	.paca_index = (number),		/* Paca Index */		    \
- 	.kernel_toc = (unsigned long)(&__toc_start) + 0x8000UL,		    \
- 	.hw_cpu_id = 0xffff,						    \
--	.slb_shadow_ptr = &slb_shadow[number],
--
--#ifdef CONFIG_PPC_ISERIES
--#define PACA_INIT_ISERIES(number)					    \
--	.reg_save_ptr = &iseries_reg_save[number],
--
--#define PACA_INIT(number)						    \
--{									    \
--	PACA_INIT_COMMON(number)					    \
--	PACA_INIT_ISERIES(number)					    \
-+	.slb_shadow_ptr = &slb_shadow[number],				    \
-+	.__current = &init_task,					    \
- }
- 
--#else
--#define PACA_INIT(number)						    \
--{									    \
--	PACA_INIT_COMMON(number)					    \
--}
--
--#endif
--
- struct paca_struct paca[] = {
- 	PACA_INIT(0),
- #if NR_CPUS > 1
---- a/arch/powerpc/kernel/ppc_ksyms.c
-+++ b/arch/powerpc/kernel/ppc_ksyms.c
-@@ -45,10 +45,6 @@
- #include <asm/signal.h>
- #include <asm/dcr.h>
- 
--#ifdef CONFIG_PPC64
--EXPORT_SYMBOL(local_irq_restore);
--#endif
--
- #ifdef CONFIG_PPC32
- extern void transfer_to_handler(void);
- extern void do_IRQ(struct pt_regs *regs);
-@@ -58,7 +54,6 @@ extern void program_check_exception(stru
- extern void single_step_exception(struct pt_regs *regs);
- extern int sys_sigreturn(struct pt_regs *regs);
- 
--EXPORT_SYMBOL(empty_zero_page);
- EXPORT_SYMBOL(clear_pages);
- EXPORT_SYMBOL(copy_page);
- EXPORT_SYMBOL(ISA_DMA_THRESHOLD);
-@@ -79,6 +74,7 @@ EXPORT_SYMBOL(strncpy);
- EXPORT_SYMBOL(strcat);
- EXPORT_SYMBOL(strlen);
- EXPORT_SYMBOL(strcmp);
-+EXPORT_SYMBOL(strncmp);
- 
- EXPORT_SYMBOL(csum_partial);
- EXPORT_SYMBOL(csum_partial_copy_generic);
-@@ -192,3 +188,4 @@ EXPORT_SYMBOL(intercept_table);
- EXPORT_SYMBOL(__mtdcr);
- EXPORT_SYMBOL(__mfdcr);
- #endif
-+EXPORT_SYMBOL(empty_zero_page);
---- a/arch/powerpc/kernel/process.c
-+++ b/arch/powerpc/kernel/process.c
-@@ -868,11 +868,6 @@ int sys_execve(unsigned long a0, unsigne
- 	flush_spe_to_thread(current);
- 	error = do_execve(filename, (char __user * __user *) a1,
- 			  (char __user * __user *) a2, regs);
--	if (error == 0) {
--		task_lock(current);
--		current->ptrace &= ~PT_DTRACE;
--		task_unlock(current);
--	}
- 	putname(filename);
- out:
- 	return error;
-@@ -919,20 +914,6 @@ int validate_sp(unsigned long sp, struct
- 	return valid_irq_stack(sp, p, nbytes);
- }
- 
--#ifdef CONFIG_PPC64
--#define MIN_STACK_FRAME	112	/* same as STACK_FRAME_OVERHEAD, in fact */
--#define FRAME_LR_SAVE	2
--#define INT_FRAME_SIZE	(sizeof(struct pt_regs) + STACK_FRAME_OVERHEAD + 288)
--#define REGS_MARKER	0x7265677368657265ul
--#define FRAME_MARKER	12
--#else
--#define MIN_STACK_FRAME	16
--#define FRAME_LR_SAVE	1
--#define INT_FRAME_SIZE	(sizeof(struct pt_regs) + STACK_FRAME_OVERHEAD)
--#define REGS_MARKER	0x72656773ul
--#define FRAME_MARKER	2
--#endif
--
- EXPORT_SYMBOL(validate_sp);
- 
- unsigned long get_wchan(struct task_struct *p)
-@@ -944,15 +925,15 @@ unsigned long get_wchan(struct task_stru
- 		return 0;
- 
- 	sp = p->thread.ksp;
--	if (!validate_sp(sp, p, MIN_STACK_FRAME))
-+	if (!validate_sp(sp, p, STACK_FRAME_OVERHEAD))
- 		return 0;
- 
- 	do {
- 		sp = *(unsigned long *)sp;
--		if (!validate_sp(sp, p, MIN_STACK_FRAME))
-+		if (!validate_sp(sp, p, STACK_FRAME_OVERHEAD))
- 			return 0;
- 		if (count > 0) {
--			ip = ((unsigned long *)sp)[FRAME_LR_SAVE];
-+			ip = ((unsigned long *)sp)[STACK_FRAME_LR_SAVE];
- 			if (!in_sched_functions(ip))
- 				return ip;
- 		}
-@@ -981,12 +962,12 @@ void show_stack(struct task_struct *tsk,
- 	lr = 0;
- 	printk("Call Trace:\n");
- 	do {
--		if (!validate_sp(sp, tsk, MIN_STACK_FRAME))
-+		if (!validate_sp(sp, tsk, STACK_FRAME_OVERHEAD))
- 			return;
- 
- 		stack = (unsigned long *) sp;
- 		newsp = stack[0];
--		ip = stack[FRAME_LR_SAVE];
-+		ip = stack[STACK_FRAME_LR_SAVE];
- 		if (!firstframe || ip != lr) {
- 			printk("["REG"] ["REG"] ", sp, ip);
- 			print_symbol("%s", ip);
-@@ -1000,8 +981,8 @@ void show_stack(struct task_struct *tsk,
- 		 * See if this is an exception frame.
- 		 * We look for the "regshere" marker in the current frame.
- 		 */
--		if (validate_sp(sp, tsk, INT_FRAME_SIZE)
--		    && stack[FRAME_MARKER] == REGS_MARKER) {
-+		if (validate_sp(sp, tsk, STACK_INT_FRAME_SIZE)
-+		    && stack[STACK_FRAME_MARKER] == STACK_FRAME_REGS_MARKER) {
- 			struct pt_regs *regs = (struct pt_regs *)
- 				(sp + STACK_FRAME_OVERHEAD);
- 			printk("--- Exception: %lx", regs->trap);
---- a/arch/powerpc/kernel/prom.c
-+++ b/arch/powerpc/kernel/prom.c
-@@ -31,10 +31,10 @@
- #include <linux/kexec.h>
- #include <linux/debugfs.h>
- #include <linux/irq.h>
-+#include <linux/lmb.h>
- 
- #include <asm/prom.h>
- #include <asm/rtas.h>
--#include <asm/lmb.h>
- #include <asm/page.h>
- #include <asm/processor.h>
- #include <asm/irq.h>
-@@ -51,6 +51,7 @@
- #include <asm/machdep.h>
- #include <asm/pSeries_reconfig.h>
- #include <asm/pci-bridge.h>
-+#include <asm/phyp_dump.h>
- #include <asm/kexec.h>
- 
- #ifdef DEBUG
-@@ -436,7 +437,7 @@ early_param("mem", early_parse_mem);
-  * The device tree may be allocated beyond our memory limit, or inside the
-  * crash kernel region for kdump. If so, move it out of the way.
-  */
--static void move_device_tree(void)
-+static void __init move_device_tree(void)
- {
- 	unsigned long start, size;
- 	void *p;
-@@ -1040,6 +1041,87 @@ static void __init early_reserve_mem(voi
- #endif
- }
- 
-+#ifdef CONFIG_PHYP_DUMP
-+/**
-+ * phyp_dump_calculate_reserve_size() - reserve variable boot area 5% or arg
-+ *
-+ * Function to find the largest size we need to reserve
-+ * during early boot process.
-+ *
-+ * It either looks for boot param and returns that OR
-+ * returns larger of 256 or 5% rounded down to multiples of 256MB.
-+ *
-+ */
-+static inline unsigned long phyp_dump_calculate_reserve_size(void)
-+{
-+	unsigned long tmp;
-+
-+	if (phyp_dump_info->reserve_bootvar)
-+		return phyp_dump_info->reserve_bootvar;
-+
-+	/* divide by 20 to get 5% of value */
-+	tmp = lmb_end_of_DRAM();
-+	do_div(tmp, 20);
-+
-+	/* round it down in multiples of 256 */
-+	tmp = tmp & ~0x0FFFFFFFUL;
-+
-+	return (tmp > PHYP_DUMP_RMR_END ? tmp : PHYP_DUMP_RMR_END);
-+}
-+
-+/**
-+ * phyp_dump_reserve_mem() - reserve all not-yet-dumped mmemory
-+ *
-+ * This routine may reserve memory regions in the kernel only
-+ * if the system is supported and a dump was taken in last
-+ * boot instance or if the hardware is supported and the
-+ * scratch area needs to be setup. In other instances it returns
-+ * without reserving anything. The memory in case of dump being
-+ * active is freed when the dump is collected (by userland tools).
-+ */
-+static void __init phyp_dump_reserve_mem(void)
-+{
-+	unsigned long base, size;
-+	unsigned long variable_reserve_size;
-+
-+	if (!phyp_dump_info->phyp_dump_configured) {
-+		printk(KERN_ERR "Phyp-dump not supported on this hardware\n");
-+		return;
-+	}
-+
-+	if (!phyp_dump_info->phyp_dump_at_boot) {
-+		printk(KERN_INFO "Phyp-dump disabled at boot time\n");
-+		return;
-+	}
-+
-+	variable_reserve_size = phyp_dump_calculate_reserve_size();
-+
-+	if (phyp_dump_info->phyp_dump_is_active) {
-+		/* Reserve *everything* above RMR.Area freed by userland tools*/
-+		base = variable_reserve_size;
-+		size = lmb_end_of_DRAM() - base;
-+
-+		/* XXX crashed_ram_end is wrong, since it may be beyond
-+		 * the memory_limit, it will need to be adjusted. */
-+		lmb_reserve(base, size);
-+
-+		phyp_dump_info->init_reserve_start = base;
-+		phyp_dump_info->init_reserve_size = size;
-+	} else {
-+		size = phyp_dump_info->cpu_state_size +
-+			phyp_dump_info->hpte_region_size +
-+			variable_reserve_size;
-+		base = lmb_end_of_DRAM() - size;
-+		lmb_reserve(base, size);
-+		phyp_dump_info->init_reserve_start = base;
-+		phyp_dump_info->init_reserve_size = size;
-+	}
-+}
-+#else
-+static inline void __init phyp_dump_reserve_mem(void) {}
-+#endif /* CONFIG_PHYP_DUMP  && CONFIG_PPC_RTAS */
-+
-+
- void __init early_init_devtree(void *params)
- {
- 	DBG(" -> early_init_devtree(%p)\n", params);
-@@ -1052,6 +1134,11 @@ void __init early_init_devtree(void *par
- 	of_scan_flat_dt(early_init_dt_scan_rtas, NULL);
- #endif
- 
-+#ifdef CONFIG_PHYP_DUMP
-+	/* scan tree to see if dump occured during last boot */
-+	of_scan_flat_dt(early_init_dt_scan_phyp_dump, NULL);
-+#endif
-+
- 	/* Retrieve various informations from the /chosen node of the
- 	 * device-tree, including the platform type, initrd location and
- 	 * size, TCE reserve, and more ...
-@@ -1072,6 +1159,7 @@ void __init early_init_devtree(void *par
- 	reserve_kdump_trampoline();
- 	reserve_crashkernel();
- 	early_reserve_mem();
-+	phyp_dump_reserve_mem();
- 
- 	lmb_enforce_memory_limit(memory_limit);
- 	lmb_analyze();
-@@ -1244,12 +1332,14 @@ EXPORT_SYMBOL(of_node_put);
-  */
- void of_attach_node(struct device_node *np)
- {
--	write_lock(&devtree_lock);
-+	unsigned long flags;
-+
-+	write_lock_irqsave(&devtree_lock, flags);
- 	np->sibling = np->parent->child;
- 	np->allnext = allnodes;
- 	np->parent->child = np;
- 	allnodes = np;
--	write_unlock(&devtree_lock);
-+	write_unlock_irqrestore(&devtree_lock, flags);
- }
- 
- /*
-@@ -1260,8 +1350,9 @@ void of_attach_node(struct device_node *
- void of_detach_node(struct device_node *np)
- {
- 	struct device_node *parent;
-+	unsigned long flags;
- 
--	write_lock(&devtree_lock);
-+	write_lock_irqsave(&devtree_lock, flags);
- 
- 	parent = np->parent;
- 	if (!parent)
-@@ -1292,7 +1383,7 @@ void of_detach_node(struct device_node *
- 	of_node_set_flag(np, OF_DETACHED);
- 
- out_unlock:
--	write_unlock(&devtree_lock);
-+	write_unlock_irqrestore(&devtree_lock, flags);
- }
- 
- #ifdef CONFIG_PPC_PSERIES
-@@ -1373,20 +1464,21 @@ __initcall(prom_reconfig_setup);
- int prom_add_property(struct device_node* np, struct property* prop)
- {
- 	struct property **next;
-+	unsigned long flags;
- 
- 	prop->next = NULL;	
--	write_lock(&devtree_lock);
-+	write_lock_irqsave(&devtree_lock, flags);
- 	next = &np->properties;
- 	while (*next) {
- 		if (strcmp(prop->name, (*next)->name) == 0) {
- 			/* duplicate ! don't insert it */
--			write_unlock(&devtree_lock);
-+			write_unlock_irqrestore(&devtree_lock, flags);
- 			return -1;
- 		}
- 		next = &(*next)->next;
- 	}
- 	*next = prop;
--	write_unlock(&devtree_lock);
-+	write_unlock_irqrestore(&devtree_lock, flags);
- 
- #ifdef CONFIG_PROC_DEVICETREE
- 	/* try to add to proc as well if it was initialized */
-@@ -1406,9 +1498,10 @@ int prom_add_property(struct device_node
- int prom_remove_property(struct device_node *np, struct property *prop)
- {
- 	struct property **next;
-+	unsigned long flags;
- 	int found = 0;
- 
--	write_lock(&devtree_lock);
-+	write_lock_irqsave(&devtree_lock, flags);
- 	next = &np->properties;
- 	while (*next) {
- 		if (*next == prop) {
-@@ -1421,7 +1514,7 @@ int prom_remove_property(struct device_n
- 		}
- 		next = &(*next)->next;
- 	}
--	write_unlock(&devtree_lock);
-+	write_unlock_irqrestore(&devtree_lock, flags);
- 
- 	if (!found)
- 		return -ENODEV;
-@@ -1447,9 +1540,10 @@ int prom_update_property(struct device_n
- 			 struct property *oldprop)
- {
- 	struct property **next;
-+	unsigned long flags;
- 	int found = 0;
- 
--	write_lock(&devtree_lock);
-+	write_lock_irqsave(&devtree_lock, flags);
- 	next = &np->properties;
- 	while (*next) {
- 		if (*next == oldprop) {
-@@ -1463,7 +1557,7 @@ int prom_update_property(struct device_n
- 		}
- 		next = &(*next)->next;
- 	}
--	write_unlock(&devtree_lock);
-+	write_unlock_irqrestore(&devtree_lock, flags);
- 
- 	if (!found)
- 		return -ENODEV;
---- a/arch/powerpc/kernel/prom_init.c
-+++ b/arch/powerpc/kernel/prom_init.c
-@@ -2240,6 +2240,14 @@ static void __init fixup_device_tree_efi
- 	if (rv != PROM_ERROR && (strcmp(prop, "chrp") == 0))
- 		prom_setprop(node, "/", "device_type", "efika", sizeof("efika"));
- 
-+	/* CODEGEN,description is exposed in /proc/cpuinfo so
-+	   fix that too */
-+	rv = prom_getprop(node, "CODEGEN,description", prop, sizeof(prop));
-+	if (rv != PROM_ERROR && (strstr(prop, "CHRP")))
-+		prom_setprop(node, "/", "CODEGEN,description",
-+			     "Efika 5200B PowerPC System",
-+			     sizeof("Efika 5200B PowerPC System"));
-+
- 	/* Fixup bestcomm interrupts property */
- 	node = call_prom("finddevice", 1, 1, ADDR("/builtin/bestcomm"));
- 	if (PHANDLE_VALID(node)) {
---- a/arch/powerpc/kernel/rtas.c
-+++ b/arch/powerpc/kernel/rtas.c
-@@ -22,6 +22,7 @@
- #include <linux/smp.h>
- #include <linux/completion.h>
- #include <linux/cpumask.h>
-+#include <linux/lmb.h>
- 
- #include <asm/prom.h>
- #include <asm/rtas.h>
-@@ -34,7 +35,6 @@
- #include <asm/system.h>
- #include <asm/delay.h>
- #include <asm/uaccess.h>
--#include <asm/lmb.h>
- #include <asm/udbg.h>
- #include <asm/syscalls.h>
- #include <asm/smp.h>
-@@ -507,7 +507,7 @@ int rtas_error_rc(int rtas_rc)
- 			break;
- 		default:
- 			printk(KERN_ERR "%s: unexpected RTAS error %d\n",
--					__FUNCTION__, rtas_rc);
-+					__func__, rtas_rc);
- 			rc = -ERANGE;
- 			break;
- 	}
---- a/arch/powerpc/kernel/rtas_flash.c
-+++ b/arch/powerpc/kernel/rtas_flash.c
-@@ -807,7 +807,7 @@ int __init rtas_flash_init(void)
- 				rtas_block_ctor);
- 	if (!flash_block_cache) {
- 		printk(KERN_ERR "%s: failed to create block cache\n",
--				__FUNCTION__);
-+				__func__);
- 		rc = -ENOMEM;
- 		goto cleanup;
- 	}
---- a/arch/powerpc/kernel/rtas_pci.c
-+++ b/arch/powerpc/kernel/rtas_pci.c
-@@ -56,21 +56,6 @@ static inline int config_access_valid(st
- 	return 0;
- }
- 
--static int of_device_available(struct device_node * dn)
--{
--        const char *status;
--
--        status = of_get_property(dn, "status", NULL);
--
--        if (!status)
--                return 1;
--
--        if (!strcmp(status, "okay"))
--                return 1;
--
--        return 0;
--}
--
- int rtas_read_config(struct pci_dn *pdn, int where, int size, u32 *val)
- {
- 	int returnval = -1;
-@@ -117,7 +102,7 @@ static int rtas_pci_read_config(struct p
- 	for (dn = busdn->child; dn; dn = dn->sibling) {
- 		struct pci_dn *pdn = PCI_DN(dn);
- 		if (pdn && pdn->devfn == devfn
--		    && of_device_available(dn))
-+		    && of_device_is_available(dn))
- 			return rtas_read_config(pdn, where, size, val);
- 	}
- 
-@@ -164,7 +149,7 @@ static int rtas_pci_write_config(struct 
- 	for (dn = busdn->child; dn; dn = dn->sibling) {
- 		struct pci_dn *pdn = PCI_DN(dn);
- 		if (pdn && pdn->devfn == devfn
--		    && of_device_available(dn))
-+		    && of_device_is_available(dn))
- 			return rtas_write_config(pdn, where, size, val);
- 	}
- 	return PCIBIOS_DEVICE_NOT_FOUND;
-@@ -326,7 +311,7 @@ int pcibios_remove_root_bus(struct pci_c
- 
- 	res = b->resource[0];
- 	if (!res->flags) {
--		printk(KERN_ERR "%s: no IO resource for PHB %s\n", __FUNCTION__,
-+		printk(KERN_ERR "%s: no IO resource for PHB %s\n", __func__,
- 				b->name);
- 		return 1;
- 	}
-@@ -334,13 +319,13 @@ int pcibios_remove_root_bus(struct pci_c
- 	rc = pcibios_unmap_io_space(b);
- 	if (rc) {
- 		printk(KERN_ERR "%s: failed to unmap IO on bus %s\n",
--			__FUNCTION__, b->name);
-+			__func__, b->name);
- 		return 1;
- 	}
- 
- 	if (release_resource(res)) {
- 		printk(KERN_ERR "%s: failed to release IO on bus %s\n",
--				__FUNCTION__, b->name);
-+				__func__, b->name);
- 		return 1;
- 	}
- 
-@@ -348,13 +333,13 @@ int pcibios_remove_root_bus(struct pci_c
- 		res = b->resource[i];
- 		if (!res->flags && i == 0) {
- 			printk(KERN_ERR "%s: no MEM resource for PHB %s\n",
--				__FUNCTION__, b->name);
-+				__func__, b->name);
- 			return 1;
- 		}
- 		if (res->flags && release_resource(res)) {
- 			printk(KERN_ERR
- 			       "%s: failed to release IO %d on bus %s\n",
--				__FUNCTION__, i, b->name);
-+				__func__, i, b->name);
- 			return 1;
- 		}
- 	}
---- a/arch/powerpc/kernel/setup-common.c
-+++ b/arch/powerpc/kernel/setup-common.c
-@@ -34,6 +34,7 @@
- #include <linux/serial_8250.h>
- #include <linux/debugfs.h>
- #include <linux/percpu.h>
-+#include <linux/lmb.h>
- #include <asm/io.h>
- #include <asm/prom.h>
- #include <asm/processor.h>
-@@ -56,7 +57,6 @@
- #include <asm/cache.h>
- #include <asm/page.h>
- #include <asm/mmu.h>
--#include <asm/lmb.h>
- #include <asm/xmon.h>
- #include <asm/cputhreads.h>
- 
-@@ -167,6 +167,8 @@ static int show_cpuinfo(struct seq_file 
- 	unsigned short min;
- 
- 	if (cpu_id == NR_CPUS) {
-+		struct device_node *root;
-+		const char *model = NULL;
- #if defined(CONFIG_SMP) && defined(CONFIG_PPC32)
- 		unsigned long bogosum = 0;
- 		int i;
-@@ -178,6 +180,13 @@ static int show_cpuinfo(struct seq_file 
- 		seq_printf(m, "timebase\t: %lu\n", ppc_tb_freq);
- 		if (ppc_md.name)
- 			seq_printf(m, "platform\t: %s\n", ppc_md.name);
-+		root = of_find_node_by_path("/");
-+		if (root)
-+			model = of_get_property(root, "model", NULL);
-+		if (model)
-+			seq_printf(m, "model\t\t: %s\n", model);
-+		of_node_put(root);
-+
- 		if (ppc_md.show_cpuinfo != NULL)
- 			ppc_md.show_cpuinfo(m);
- 
---- a/arch/powerpc/kernel/setup_32.c
-+++ b/arch/powerpc/kernel/setup_32.c
-@@ -172,6 +172,18 @@ int __init ppc_setup_l2cr(char *str)
- }
- __setup("l2cr=", ppc_setup_l2cr);
- 
-+/* Checks "l3cr=xxxx" command-line option */
-+int __init ppc_setup_l3cr(char *str)
-+{
-+	if (cpu_has_feature(CPU_FTR_L3CR)) {
-+		unsigned long val = simple_strtoul(str, NULL, 0);
-+		printk(KERN_INFO "l3cr set to %lx\n", val);
-+		_set_L3CR(val);		/* and enable it */
-+	}
-+	return 1;
-+}
-+__setup("l3cr=", ppc_setup_l3cr);
-+
- #ifdef CONFIG_GENERIC_NVRAM
- 
- /* Generic nvram hooks used by drivers/char/gen_nvram.c */
-@@ -277,7 +289,7 @@ void __init setup_arch(char **cmdline_p)
- 	if (ppc_md.panic)
- 		setup_panic();
- 
--	init_mm.start_code = PAGE_OFFSET;
-+	init_mm.start_code = (unsigned long)_stext;
- 	init_mm.end_code = (unsigned long) _etext;
- 	init_mm.end_data = (unsigned long) _edata;
- 	init_mm.brk = klimit;
---- a/arch/powerpc/kernel/setup_64.c
-+++ b/arch/powerpc/kernel/setup_64.c
-@@ -33,6 +33,8 @@
- #include <linux/serial_8250.h>
- #include <linux/bootmem.h>
- #include <linux/pci.h>
-+#include <linux/lockdep.h>
-+#include <linux/lmb.h>
- #include <asm/io.h>
- #include <asm/kdump.h>
- #include <asm/prom.h>
-@@ -55,7 +57,6 @@
- #include <asm/cache.h>
- #include <asm/page.h>
- #include <asm/mmu.h>
--#include <asm/lmb.h>
- #include <asm/firmware.h>
- #include <asm/xmon.h>
- #include <asm/udbg.h>
-@@ -178,6 +179,9 @@ void __init early_setup(unsigned long dt
- 	/* Enable early debugging if any specified (see udbg.h) */
- 	udbg_early_init();
- 
-+	/* Initialize lockdep early or else spinlocks will blow */
-+	lockdep_init();
-+
-  	DBG(" -> early_setup(), dt_ptr: 0x%lx\n", dt_ptr);
- 
- 	/*
-@@ -510,7 +514,7 @@ void __init setup_arch(char **cmdline_p)
- 	if (ppc_md.panic)
- 		setup_panic();
- 
--	init_mm.start_code = PAGE_OFFSET;
-+	init_mm.start_code = (unsigned long)_stext;
- 	init_mm.end_code = (unsigned long) _etext;
- 	init_mm.end_data = (unsigned long) _edata;
- 	init_mm.brk = klimit;
---- /dev/null
-+++ b/arch/powerpc/kernel/stacktrace.c
-@@ -0,0 +1,47 @@
-+/*
-+ * Stack trace utility
-+ *
-+ * Copyright 2008 Christoph Hellwig, IBM Corp.
-+ *
-+ *
-+ *      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/sched.h>
-+#include <linux/stacktrace.h>
-+#include <asm/ptrace.h>
-+#include <asm/asm-offsets.h>
-+
-+/*
-+ * Save stack-backtrace addresses into a stack_trace buffer.
-+ */
-+void save_stack_trace(struct stack_trace *trace)
-+{
-+	unsigned long sp;
-+
-+	asm("mr %0,1" : "=r" (sp));
-+
-+	for (;;) {
-+		unsigned long *stack = (unsigned long *) sp;
-+		unsigned long newsp, ip;
-+
-+		if (!validate_sp(sp, current, STACK_FRAME_OVERHEAD))
-+			return;
-+
-+		newsp = stack[0];
-+		ip = stack[STACK_FRAME_LR_SAVE];
-+
-+		if (!trace->skip)
-+			trace->entries[trace->nr_entries++] = ip;
-+		else
-+			trace->skip--;
-+
-+		if (trace->nr_entries >= trace->max_entries)
-+			return;
-+
-+		sp = newsp;
-+	}
-+}
---- a/arch/powerpc/kernel/sys_ppc32.c
-+++ b/arch/powerpc/kernel/sys_ppc32.c
-@@ -368,11 +368,6 @@ long compat_sys_execve(unsigned long a0,
- 
- 	error = compat_do_execve(filename, compat_ptr(a1), compat_ptr(a2), regs);
- 
--	if (error == 0) {
--		task_lock(current);
--		current->ptrace &= ~PT_DTRACE;
--		task_unlock(current);
--	}
- 	putname(filename);
- 
- out:
---- a/arch/powerpc/kernel/vdso.c
-+++ b/arch/powerpc/kernel/vdso.c
-@@ -21,13 +21,14 @@
- #include <linux/elf.h>
- #include <linux/security.h>
- #include <linux/bootmem.h>
-+#include <linux/lmb.h>
- 
- #include <asm/pgtable.h>
- #include <asm/system.h>
- #include <asm/processor.h>
- #include <asm/mmu.h>
- #include <asm/mmu_context.h>
--#include <asm/lmb.h>
-+#include <asm/prom.h>
- #include <asm/machdep.h>
- #include <asm/cputable.h>
- #include <asm/sections.h>
---- a/arch/powerpc/kernel/vio.c
-+++ b/arch/powerpc/kernel/vio.c
-@@ -139,7 +139,7 @@ static int vio_bus_remove(struct device 
-  */
- int vio_register_driver(struct vio_driver *viodrv)
- {
--	printk(KERN_DEBUG "%s: driver %s registering\n", __FUNCTION__,
-+	printk(KERN_DEBUG "%s: driver %s registering\n", __func__,
- 		viodrv->driver.name);
- 
- 	/* fill in 'struct driver' fields */
-@@ -184,7 +184,7 @@ struct vio_dev *vio_register_device_node
- 	/* we need the 'device_type' property, in order to match with drivers */
- 	if (of_node->type == NULL) {
- 		printk(KERN_WARNING "%s: node %s missing 'device_type'\n",
--				__FUNCTION__,
-+				__func__,
- 				of_node->name ? of_node->name : "<unknown>");
- 		return NULL;
- 	}
-@@ -192,7 +192,7 @@ struct vio_dev *vio_register_device_node
- 	unit_address = of_get_property(of_node, "reg", NULL);
- 	if (unit_address == NULL) {
- 		printk(KERN_WARNING "%s: node %s missing 'reg'\n",
--				__FUNCTION__,
-+				__func__,
- 				of_node->name ? of_node->name : "<unknown>");
- 		return NULL;
- 	}
-@@ -227,7 +227,7 @@ struct vio_dev *vio_register_device_node
- 	/* register with generic device framework */
- 	if (device_register(&viodev->dev)) {
- 		printk(KERN_ERR "%s: failed to register device %s\n",
--				__FUNCTION__, viodev->dev.bus_id);
-+				__func__, viodev->dev.bus_id);
- 		/* XXX free TCE table */
- 		kfree(viodev);
- 		return NULL;
-@@ -258,7 +258,7 @@ static int __init vio_bus_init(void)
- 	err = device_register(&vio_bus_device.dev);
- 	if (err) {
- 		printk(KERN_WARNING "%s: device_register returned %i\n",
--				__FUNCTION__, err);
-+				__func__, err);
- 		return err;
- 	}
- 
---- a/arch/powerpc/kernel/vmlinux.lds.S
-+++ b/arch/powerpc/kernel/vmlinux.lds.S
-@@ -1,11 +1,9 @@
- #ifdef CONFIG_PPC64
--#include <asm/page.h>
- #define PROVIDE32(x)	PROVIDE(__unused__##x)
- #else
--#define PAGE_SIZE	4096
--#define KERNELBASE	CONFIG_KERNEL_START
- #define PROVIDE32(x)	PROVIDE(x)
- #endif
-+#include <asm/page.h>
- #include <asm-generic/vmlinux.lds.h>
- #include <asm/cache.h>
- 
-@@ -33,7 +31,7 @@ SECTIONS
-  */
- 
- 	/* Text and gots */
--	.text : {
-+	.text : AT(ADDR(.text) - LOAD_OFFSET) {
- 		ALIGN_FUNCTION();
- 		*(.text.head)
- 		_text = .;
-@@ -58,7 +56,7 @@ SECTIONS
- 	RODATA
- 
- 	/* Exception & bug tables */
--	__ex_table : {
-+	__ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) {
- 		__start___ex_table = .;
- 		*(__ex_table)
- 		__stop___ex_table = .;
-@@ -74,7 +72,7 @@ SECTIONS
- 	. = ALIGN(PAGE_SIZE);
- 	__init_begin = .;
- 
--	.init.text : {
-+	.init.text : AT(ADDR(.init.text) - LOAD_OFFSET) {
- 		_sinittext = .;
- 		INIT_TEXT
- 		_einittext = .;
-@@ -83,11 +81,11 @@ SECTIONS
- 	/* .exit.text is discarded at runtime, not link time,
- 	 * to deal with references from __bug_table
- 	 */
--	.exit.text : {
-+	.exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
- 		EXIT_TEXT
- 	}
- 
--	.init.data : {
-+	.init.data : AT(ADDR(.init.data) - LOAD_OFFSET) {
- 		INIT_DATA
- 		__vtop_table_begin = .;
- 		*(.vtop_fixup);
-@@ -103,19 +101,19 @@ SECTIONS
- 	}
- 
- 	. = ALIGN(16);
--	.init.setup : {
-+	.init.setup : AT(ADDR(.init.setup) - LOAD_OFFSET) {
- 		__setup_start = .;
- 		*(.init.setup)
- 		__setup_end = .;
- 	}
- 
--	.initcall.init : {
-+	.initcall.init : AT(ADDR(.initcall.init) - LOAD_OFFSET) {
- 		__initcall_start = .;
- 		INITCALLS
- 		__initcall_end = .;
- 		}
- 
--	.con_initcall.init : {
-+	.con_initcall.init : AT(ADDR(.con_initcall.init) - LOAD_OFFSET) {
- 		__con_initcall_start = .;
- 		*(.con_initcall.init)
- 		__con_initcall_end = .;
-@@ -124,14 +122,14 @@ SECTIONS
- 	SECURITY_INIT
- 
- 	. = ALIGN(8);
--	__ftr_fixup : {
-+	__ftr_fixup : AT(ADDR(__ftr_fixup) - LOAD_OFFSET) {
- 		__start___ftr_fixup = .;
- 		*(__ftr_fixup)
- 		__stop___ftr_fixup = .;
- 	}
- #ifdef CONFIG_PPC64
- 	. = ALIGN(8);
--	__fw_ftr_fixup : {
-+	__fw_ftr_fixup : AT(ADDR(__fw_ftr_fixup) - LOAD_OFFSET) {
- 		__start___fw_ftr_fixup = .;
- 		*(__fw_ftr_fixup)
- 		__stop___fw_ftr_fixup = .;
-@@ -139,14 +137,14 @@ SECTIONS
- #endif
- #ifdef CONFIG_BLK_DEV_INITRD
- 	. = ALIGN(PAGE_SIZE);
--	.init.ramfs : {
-+	.init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET) {
- 		__initramfs_start = .;
- 		*(.init.ramfs)
- 		__initramfs_end = .;
- 	}
- #endif
- 	. = ALIGN(PAGE_SIZE);
--	.data.percpu : {
-+	.data.percpu  : AT(ADDR(.data.percpu) - LOAD_OFFSET) {
- 		__per_cpu_start = .;
- 		*(.data.percpu)
- 		*(.data.percpu.shared_aligned)
-@@ -154,7 +152,7 @@ SECTIONS
- 	}
- 
- 	. = ALIGN(8);
--	.machine.desc : {
-+	.machine.desc : AT(ADDR(.machine.desc) - LOAD_OFFSET) {
- 		__machine_desc_start = . ;
- 		*(.machine.desc)
- 		__machine_desc_end = . ;
-@@ -172,25 +170,24 @@ SECTIONS
- 	_sdata = .;
- 
- #ifdef CONFIG_PPC32
--	.data    :
--	{
-+	.data : AT(ADDR(.data) - LOAD_OFFSET) {
- 		DATA_DATA
- 		*(.sdata)
- 		*(.got.plt) *(.got)
- 	}
- #else
--	.data : {
-+	.data : AT(ADDR(.data) - LOAD_OFFSET) {
- 		DATA_DATA
- 		*(.data.rel*)
- 		*(.toc1)
- 		*(.branch_lt)
- 	}
- 
--	.opd : {
-+	.opd : AT(ADDR(.opd) - LOAD_OFFSET) {
- 		*(.opd)
- 	}
- 
--	.got : {
-+	.got : AT(ADDR(.got) - LOAD_OFFSET) {
- 		__toc_start = .;
- 		*(.got)
- 		*(.toc)
-@@ -207,26 +204,26 @@ SECTIONS
- #else
- 	. = ALIGN(16384);
- #endif
--	.data.init_task : {
-+	.data.init_task : AT(ADDR(.data.init_task) - LOAD_OFFSET) {
- 		*(.data.init_task)
- 	}
- 
- 	. = ALIGN(PAGE_SIZE);
--	.data.page_aligned : {
-+	.data.page_aligned : AT(ADDR(.data.page_aligned) - LOAD_OFFSET) {
- 		*(.data.page_aligned)
- 	}
- 
--	.data.cacheline_aligned : {
-+	.data.cacheline_aligned : AT(ADDR(.data.cacheline_aligned) - LOAD_OFFSET) {
- 		*(.data.cacheline_aligned)
- 	}
- 
- 	. = ALIGN(L1_CACHE_BYTES);
--	.data.read_mostly : {
-+	.data.read_mostly : AT(ADDR(.data.read_mostly) - LOAD_OFFSET) {
- 		*(.data.read_mostly)
- 	}
- 
- 	. = ALIGN(PAGE_SIZE);
--	__data_nosave : {
-+	.data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
- 		__nosave_begin = .;
- 		*(.data.nosave)
- 		. = ALIGN(PAGE_SIZE);
-@@ -237,7 +234,7 @@ SECTIONS
-  * And finally the bss
-  */
- 
--	.bss : {
-+	.bss : AT(ADDR(.bss) - LOAD_OFFSET) {
- 		__bss_start = .;
- 		*(.sbss) *(.scommon)
- 		*(.dynbss)
---- a/arch/powerpc/lib/rheap.c
-+++ b/arch/powerpc/lib/rheap.c
-@@ -54,7 +54,7 @@ static int grow(rh_info_t * info, int ma
- 
- 	new_blocks = max_blocks - info->max_blocks;
- 
--	block = kmalloc(sizeof(rh_block_t) * max_blocks, GFP_KERNEL);
-+	block = kmalloc(sizeof(rh_block_t) * max_blocks, GFP_ATOMIC);
- 	if (block == NULL)
- 		return -ENOMEM;
- 
-@@ -258,7 +258,7 @@ rh_info_t *rh_create(unsigned int alignm
- 	if ((alignment & (alignment - 1)) != 0)
- 		return ERR_PTR(-EINVAL);
- 
--	info = kmalloc(sizeof(*info), GFP_KERNEL);
-+	info = kmalloc(sizeof(*info), GFP_ATOMIC);
- 	if (info == NULL)
- 		return ERR_PTR(-ENOMEM);
- 
---- a/arch/powerpc/lib/string.S
-+++ b/arch/powerpc/lib/string.S
-@@ -75,6 +75,20 @@ _GLOBAL(strcmp)
- 	beq	1b
- 	blr
- 
-+_GLOBAL(strncmp)
-+	PPC_LCMPI r5,0
-+	beqlr
-+	mtctr	r5
-+	addi	r5,r3,-1
-+	addi	r4,r4,-1
-+1:	lbzu	r3,1(r5)
-+	cmpwi	1,r3,0
-+	lbzu	r0,1(r4)
-+	subf.	r3,r0,r3
-+	beqlr	1
-+	bdnzt	eq,1b
-+	blr
-+
- _GLOBAL(strlen)
- 	addi	r4,r3,-1
- 1:	lbzu	r0,1(r4)
---- a/arch/powerpc/math-emu/fabs.c
-+++ b/arch/powerpc/math-emu/fabs.c
-@@ -9,7 +9,7 @@ fabs(u32 *frD, u32 *frB)
- 	frD[1] = frB[1];
- 
- #ifdef DEBUG
--	printk("%s: D %p, B %p: ", __FUNCTION__, frD, frB);
-+	printk("%s: D %p, B %p: ", __func__, frD, frB);
- 	dump_double(frD);
- 	printk("\n");
- #endif
---- a/arch/powerpc/math-emu/fadd.c
-+++ b/arch/powerpc/math-emu/fadd.c
-@@ -14,7 +14,7 @@ fadd(void *frD, void *frA, void *frB)
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
-+	printk("%s: %p %p %p\n", __func__, frD, frA, frB);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
---- a/arch/powerpc/math-emu/fadds.c
-+++ b/arch/powerpc/math-emu/fadds.c
-@@ -15,7 +15,7 @@ fadds(void *frD, void *frA, void *frB)
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
-+	printk("%s: %p %p %p\n", __func__, frD, frA, frB);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
---- a/arch/powerpc/math-emu/fcmpo.c
-+++ b/arch/powerpc/math-emu/fcmpo.c
-@@ -15,7 +15,7 @@ fcmpo(u32 *ccr, int crfD, void *frA, voi
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p (%08x) %d %p %p\n", __FUNCTION__, ccr, *ccr, crfD, frA, frB);
-+	printk("%s: %p (%08x) %d %p %p\n", __func__, ccr, *ccr, crfD, frA, frB);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
---- a/arch/powerpc/math-emu/fcmpu.c
-+++ b/arch/powerpc/math-emu/fcmpu.c
-@@ -14,7 +14,7 @@ fcmpu(u32 *ccr, int crfD, void *frA, voi
- 	long cmp;
- 
- #ifdef DEBUG
--	printk("%s: %p (%08x) %d %p %p\n", __FUNCTION__, ccr, *ccr, crfD, frA, frB);
-+	printk("%s: %p (%08x) %d %p %p\n", __func__, ccr, *ccr, crfD, frA, frB);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
---- a/arch/powerpc/math-emu/fctiw.c
-+++ b/arch/powerpc/math-emu/fctiw.c
-@@ -16,7 +16,7 @@ fctiw(u32 *frD, void *frB)
- 	frD[1] = r;
- 
- #ifdef DEBUG
--	printk("%s: D %p, B %p: ", __FUNCTION__, frD, frB);
-+	printk("%s: D %p, B %p: ", __func__, frD, frB);
- 	dump_double(frD);
- 	printk("\n");
- #endif
---- a/arch/powerpc/math-emu/fctiwz.c
-+++ b/arch/powerpc/math-emu/fctiwz.c
-@@ -23,7 +23,7 @@ fctiwz(u32 *frD, void *frB)
- 	__FPU_FPSCR = fpscr;
- 
- #ifdef DEBUG
--	printk("%s: D %p, B %p: ", __FUNCTION__, frD, frB);
-+	printk("%s: D %p, B %p: ", __func__, frD, frB);
- 	dump_double(frD);
- 	printk("\n");
- #endif
---- a/arch/powerpc/math-emu/fdiv.c
-+++ b/arch/powerpc/math-emu/fdiv.c
-@@ -14,7 +14,7 @@ fdiv(void *frD, void *frA, void *frB)
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
-+	printk("%s: %p %p %p\n", __func__, frD, frA, frB);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
-@@ -28,13 +28,13 @@ fdiv(void *frD, void *frA, void *frB)
- 	if (A_c == FP_CLS_ZERO && B_c == FP_CLS_ZERO) {
- 		ret |= EFLAG_VXZDZ;
- #ifdef DEBUG
--		printk("%s: FPSCR_VXZDZ raised\n", __FUNCTION__);
-+		printk("%s: FPSCR_VXZDZ raised\n", __func__);
- #endif
- 	}
- 	if (A_c == FP_CLS_INF && B_c == FP_CLS_INF) {
- 		ret |= EFLAG_VXIDI;
- #ifdef DEBUG
--		printk("%s: FPSCR_VXIDI raised\n", __FUNCTION__);
-+		printk("%s: FPSCR_VXIDI raised\n", __func__);
- #endif
- 	}
- 
---- a/arch/powerpc/math-emu/fdivs.c
-+++ b/arch/powerpc/math-emu/fdivs.c
-@@ -15,7 +15,7 @@ fdivs(void *frD, void *frA, void *frB)
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
-+	printk("%s: %p %p %p\n", __func__, frD, frA, frB);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
-@@ -29,13 +29,13 @@ fdivs(void *frD, void *frA, void *frB)
- 	if (A_c == FP_CLS_ZERO && B_c == FP_CLS_ZERO) {
- 		ret |= EFLAG_VXZDZ;
- #ifdef DEBUG
--		printk("%s: FPSCR_VXZDZ raised\n", __FUNCTION__);
-+		printk("%s: FPSCR_VXZDZ raised\n", __func__);
- #endif
- 	}
- 	if (A_c == FP_CLS_INF && B_c == FP_CLS_INF) {
- 		ret |= EFLAG_VXIDI;
- #ifdef DEBUG
--		printk("%s: FPSCR_VXIDI raised\n", __FUNCTION__);
-+		printk("%s: FPSCR_VXIDI raised\n", __func__);
- #endif
- 	}
- 
---- a/arch/powerpc/math-emu/fmadd.c
-+++ b/arch/powerpc/math-emu/fmadd.c
-@@ -16,7 +16,7 @@ fmadd(void *frD, void *frA, void *frB, v
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
-+	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
---- a/arch/powerpc/math-emu/fmadds.c
-+++ b/arch/powerpc/math-emu/fmadds.c
-@@ -17,7 +17,7 @@ fmadds(void *frD, void *frA, void *frB, 
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
-+	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
---- a/arch/powerpc/math-emu/fmr.c
-+++ b/arch/powerpc/math-emu/fmr.c
-@@ -9,7 +9,7 @@ fmr(u32 *frD, u32 *frB)
- 	frD[1] = frB[1];
- 
- #ifdef DEBUG
--	printk("%s: D %p, B %p: ", __FUNCTION__, frD, frB);
-+	printk("%s: D %p, B %p: ", __func__, frD, frB);
- 	dump_double(frD);
- 	printk("\n");
- #endif
---- a/arch/powerpc/math-emu/fmsub.c
-+++ b/arch/powerpc/math-emu/fmsub.c
-@@ -16,7 +16,7 @@ fmsub(void *frD, void *frA, void *frB, v
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
-+	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
---- a/arch/powerpc/math-emu/fmsubs.c
-+++ b/arch/powerpc/math-emu/fmsubs.c
-@@ -17,7 +17,7 @@ fmsubs(void *frD, void *frA, void *frB, 
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
-+	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
---- a/arch/powerpc/math-emu/fmul.c
-+++ b/arch/powerpc/math-emu/fmul.c
-@@ -14,7 +14,7 @@ fmul(void *frD, void *frA, void *frB)
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
-+	printk("%s: %p %p %p\n", __func__, frD, frA, frB);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
---- a/arch/powerpc/math-emu/fmuls.c
-+++ b/arch/powerpc/math-emu/fmuls.c
-@@ -15,7 +15,7 @@ fmuls(void *frD, void *frA, void *frB)
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
-+	printk("%s: %p %p %p\n", __func__, frD, frA, frB);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
---- a/arch/powerpc/math-emu/fnabs.c
-+++ b/arch/powerpc/math-emu/fnabs.c
-@@ -9,7 +9,7 @@ fnabs(u32 *frD, u32 *frB)
- 	frD[1] = frB[1];
- 
- #ifdef DEBUG
--	printk("%s: D %p, B %p: ", __FUNCTION__, frD, frB);
-+	printk("%s: D %p, B %p: ", __func__, frD, frB);
- 	dump_double(frD);
- 	printk("\n");
- #endif
---- a/arch/powerpc/math-emu/fneg.c
-+++ b/arch/powerpc/math-emu/fneg.c
-@@ -9,7 +9,7 @@ fneg(u32 *frD, u32 *frB)
- 	frD[1] = frB[1];
- 
- #ifdef DEBUG
--	printk("%s: D %p, B %p: ", __FUNCTION__, frD, frB);
-+	printk("%s: D %p, B %p: ", __func__, frD, frB);
- 	dump_double(frD);
- 	printk("\n");
- #endif
---- a/arch/powerpc/math-emu/fnmadd.c
-+++ b/arch/powerpc/math-emu/fnmadd.c
-@@ -16,7 +16,7 @@ fnmadd(void *frD, void *frA, void *frB, 
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
-+	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
---- a/arch/powerpc/math-emu/fnmadds.c
-+++ b/arch/powerpc/math-emu/fnmadds.c
-@@ -17,7 +17,7 @@ fnmadds(void *frD, void *frA, void *frB,
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
-+	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
---- a/arch/powerpc/math-emu/fnmsub.c
-+++ b/arch/powerpc/math-emu/fnmsub.c
-@@ -16,7 +16,7 @@ fnmsub(void *frD, void *frA, void *frB, 
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
-+	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
---- a/arch/powerpc/math-emu/fnmsubs.c
-+++ b/arch/powerpc/math-emu/fnmsubs.c
-@@ -17,7 +17,7 @@ fnmsubs(void *frD, void *frA, void *frB,
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
-+	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
---- a/arch/powerpc/math-emu/fres.c
-+++ b/arch/powerpc/math-emu/fres.c
-@@ -6,7 +6,7 @@ int
- fres(void *frD, void *frB)
- {
- #ifdef DEBUG
--	printk("%s: %p %p\n", __FUNCTION__, frD, frB);
-+	printk("%s: %p %p\n", __func__, frD, frB);
- #endif
- 	return -ENOSYS;
- }
---- a/arch/powerpc/math-emu/frsp.c
-+++ b/arch/powerpc/math-emu/frsp.c
-@@ -12,7 +12,7 @@ frsp(void *frD, void *frB)
- 	FP_DECL_D(B);
- 
- #ifdef DEBUG
--	printk("%s: D %p, B %p\n", __FUNCTION__, frD, frB);
-+	printk("%s: D %p, B %p\n", __func__, frD, frB);
- #endif
- 
- 	__FP_UNPACK_D(B, frB);
---- a/arch/powerpc/math-emu/frsqrte.c
-+++ b/arch/powerpc/math-emu/frsqrte.c
-@@ -6,7 +6,7 @@ int
- frsqrte(void *frD, void *frB)
- {
- #ifdef DEBUG
--	printk("%s: %p %p\n", __FUNCTION__, frD, frB);
-+	printk("%s: %p %p\n", __func__, frD, frB);
- #endif
- 	return 0;
- }
---- a/arch/powerpc/math-emu/fsel.c
-+++ b/arch/powerpc/math-emu/fsel.c
-@@ -11,7 +11,7 @@ fsel(u32 *frD, void *frA, u32 *frB, u32 
- 	FP_DECL_D(A);
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
-+	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
---- a/arch/powerpc/math-emu/fsqrt.c
-+++ b/arch/powerpc/math-emu/fsqrt.c
-@@ -13,7 +13,7 @@ fsqrt(void *frD, void *frB)
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frB);
-+	printk("%s: %p %p %p %p\n", __func__, frD, frB);
- #endif
- 
- 	__FP_UNPACK_D(B, frB);
---- a/arch/powerpc/math-emu/fsqrts.c
-+++ b/arch/powerpc/math-emu/fsqrts.c
-@@ -14,7 +14,7 @@ fsqrts(void *frD, void *frB)
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frB);
-+	printk("%s: %p %p %p %p\n", __func__, frD, frB);
- #endif
- 
- 	__FP_UNPACK_D(B, frB);
---- a/arch/powerpc/math-emu/fsub.c
-+++ b/arch/powerpc/math-emu/fsub.c
-@@ -14,7 +14,7 @@ fsub(void *frD, void *frA, void *frB)
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
-+	printk("%s: %p %p %p\n", __func__, frD, frA, frB);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
---- a/arch/powerpc/math-emu/fsubs.c
-+++ b/arch/powerpc/math-emu/fsubs.c
-@@ -15,7 +15,7 @@ fsubs(void *frD, void *frA, void *frB)
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
-+	printk("%s: %p %p %p\n", __func__, frD, frA, frB);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
---- a/arch/powerpc/math-emu/lfd.c
-+++ b/arch/powerpc/math-emu/lfd.c
-@@ -11,7 +11,7 @@ lfd(void *frD, void *ea)
- 	if (copy_from_user(frD, ea, sizeof(double)))
- 		return -EFAULT;
- #ifdef DEBUG
--	printk("%s: D %p, ea %p: ", __FUNCTION__, frD, ea);
-+	printk("%s: D %p, ea %p: ", __func__, frD, ea);
- 	dump_double(frD);
- 	printk("\n");
- #endif
---- a/arch/powerpc/math-emu/lfs.c
-+++ b/arch/powerpc/math-emu/lfs.c
-@@ -14,7 +14,7 @@ lfs(void *frD, void *ea)
- 	float f;
- 
- #ifdef DEBUG
--	printk("%s: D %p, ea %p\n", __FUNCTION__, frD, ea);
-+	printk("%s: D %p, ea %p\n", __func__, frD, ea);
- #endif
- 
- 	if (copy_from_user(&f, ea, sizeof(float)))
---- a/arch/powerpc/math-emu/mcrfs.c
-+++ b/arch/powerpc/math-emu/mcrfs.c
-@@ -10,7 +10,7 @@ mcrfs(u32 *ccr, u32 crfD, u32 crfS)
- 	u32 value, clear;
- 
- #ifdef DEBUG
--	printk("%s: %p (%08x) %d %d\n", __FUNCTION__, ccr, *ccr, crfD, crfS);
-+	printk("%s: %p (%08x) %d %d\n", __func__, ccr, *ccr, crfD, crfS);
- #endif
- 
- 	clear = 15 << ((7 - crfS) << 2);
-@@ -24,7 +24,7 @@ mcrfs(u32 *ccr, u32 crfD, u32 crfS)
- 	*ccr |= (value << ((7 - crfD) << 2));
- 
- #ifdef DEBUG
--	printk("CR: %08x\n", __FUNCTION__, *ccr);
-+	printk("CR: %08x\n", __func__, *ccr);
- #endif
- 
- 	return 0;
---- a/arch/powerpc/math-emu/mffs.c
-+++ b/arch/powerpc/math-emu/mffs.c
-@@ -10,7 +10,7 @@ mffs(u32 *frD)
- 	frD[1] = __FPU_FPSCR;
- 
- #ifdef DEBUG
--	printk("%s: frD %p: %08x.%08x\n", __FUNCTION__, frD, frD[0], frD[1]);
-+	printk("%s: frD %p: %08x.%08x\n", __func__, frD, frD[0], frD[1]);
- #endif
- 
- 	return 0;
---- a/arch/powerpc/math-emu/mtfsb0.c
-+++ b/arch/powerpc/math-emu/mtfsb0.c
-@@ -11,7 +11,7 @@ mtfsb0(int crbD)
- 		__FPU_FPSCR &= ~(1 << (31 - crbD));
- 
- #ifdef DEBUG
--	printk("%s: %d %08lx\n", __FUNCTION__, crbD, __FPU_FPSCR);
-+	printk("%s: %d %08lx\n", __func__, crbD, __FPU_FPSCR);
- #endif
- 
- 	return 0;
---- a/arch/powerpc/math-emu/mtfsb1.c
-+++ b/arch/powerpc/math-emu/mtfsb1.c
-@@ -11,7 +11,7 @@ mtfsb1(int crbD)
- 		__FPU_FPSCR |= (1 << (31 - crbD));
- 
- #ifdef DEBUG
--	printk("%s: %d %08lx\n", __FUNCTION__, crbD, __FPU_FPSCR);
-+	printk("%s: %d %08lx\n", __func__, crbD, __FPU_FPSCR);
- #endif
- 
- 	return 0;
---- a/arch/powerpc/math-emu/mtfsf.c
-+++ b/arch/powerpc/math-emu/mtfsf.c
-@@ -38,7 +38,7 @@ mtfsf(unsigned int FM, u32 *frB)
- 	__FPU_FPSCR |= (frB[1] & mask);
- 
- #ifdef DEBUG
--	printk("%s: %02x %p: %08lx\n", __FUNCTION__, FM, frB, __FPU_FPSCR);
-+	printk("%s: %02x %p: %08lx\n", __func__, FM, frB, __FPU_FPSCR);
- #endif
- 
- 	return 0;
---- a/arch/powerpc/math-emu/mtfsfi.c
-+++ b/arch/powerpc/math-emu/mtfsfi.c
-@@ -16,7 +16,7 @@ mtfsfi(unsigned int crfD, unsigned int I
- 	__FPU_FPSCR |= (IMM & 0xf) << ((7 - crfD) << 2);
- 
- #ifdef DEBUG
--	printk("%s: %d %x: %08lx\n", __FUNCTION__, crfD, IMM, __FPU_FPSCR);
-+	printk("%s: %d %x: %08lx\n", __func__, crfD, IMM, __FPU_FPSCR);
- #endif
- 
- 	return 0;
---- a/arch/powerpc/math-emu/stfd.c
-+++ b/arch/powerpc/math-emu/stfd.c
-@@ -7,7 +7,7 @@ stfd(void *frS, void *ea)
- {
- #if 0
- #ifdef DEBUG
--	printk("%s: S %p, ea %p: ", __FUNCTION__, frS, ea);
-+	printk("%s: S %p, ea %p: ", __func__, frS, ea);
- 	dump_double(frS);
- 	printk("\n");
- #endif
---- a/arch/powerpc/math-emu/stfiwx.c
-+++ b/arch/powerpc/math-emu/stfiwx.c
-@@ -6,7 +6,7 @@ int
- stfiwx(u32 *frS, void *ea)
- {
- #ifdef DEBUG
--	printk("%s: %p %p\n", __FUNCTION__, frS, ea);
-+	printk("%s: %p %p\n", __func__, frS, ea);
- #endif
- 
- 	if (copy_to_user(ea, &frS[1], sizeof(frS[1])))
---- a/arch/powerpc/math-emu/stfs.c
-+++ b/arch/powerpc/math-emu/stfs.c
-@@ -15,7 +15,7 @@ stfs(void *frS, void *ea)
- 	int err;
- 
- #ifdef DEBUG
--	printk("%s: S %p, ea %p\n", __FUNCTION__, frS, ea);
-+	printk("%s: S %p, ea %p\n", __func__, frS, ea);
- #endif
- 
- 	__FP_UNPACK_D(A, frS);
---- a/arch/powerpc/mm/40x_mmu.c
-+++ b/arch/powerpc/mm/40x_mmu.c
-@@ -97,7 +97,7 @@ unsigned long __init mmu_mapin_ram(void)
- 	phys_addr_t p;
- 
- 	v = KERNELBASE;
--	p = PPC_MEMSTART;
-+	p = 0;
- 	s = total_lowmem;
- 
- 	if (__map_without_ltlbs)
---- a/arch/powerpc/mm/44x_mmu.c
-+++ b/arch/powerpc/mm/44x_mmu.c
-@@ -67,7 +67,7 @@ unsigned long __init mmu_mapin_ram(void)
- 
- 	/* Pin in enough TLBs to cover any lowmem not covered by the
- 	 * initial 256M mapping established in head_44x.S */
--	for (addr = PPC_PIN_SIZE; addr < total_lowmem;
-+	for (addr = PPC_PIN_SIZE; addr < lowmem_end_addr;
- 	     addr += PPC_PIN_SIZE)
- 		ppc44x_pin_tlb(addr + PAGE_OFFSET, addr);
- 
---- a/arch/powerpc/mm/Makefile
-+++ b/arch/powerpc/mm/Makefile
-@@ -6,7 +6,7 @@ ifeq ($(CONFIG_PPC64),y)
- EXTRA_CFLAGS	+= -mno-minimal-toc
- endif
- 
--obj-y				:= fault.o mem.o lmb.o \
-+obj-y				:= fault.o mem.o \
- 				   init_$(CONFIG_WORD_SIZE).o \
- 				   pgtable_$(CONFIG_WORD_SIZE).o \
- 				   mmu_context_$(CONFIG_WORD_SIZE).o
---- a/arch/powerpc/mm/fsl_booke_mmu.c
-+++ b/arch/powerpc/mm/fsl_booke_mmu.c
-@@ -49,18 +49,15 @@
- #include <asm/mmu.h>
- #include <asm/uaccess.h>
- #include <asm/smp.h>
--#include <asm/bootx.h>
- #include <asm/machdep.h>
- #include <asm/setup.h>
- 
-+#include "mmu_decl.h"
-+
- extern void loadcam_entry(unsigned int index);
- unsigned int tlbcam_index;
- unsigned int num_tlbcam_entries;
- static unsigned long __cam0, __cam1, __cam2;
--extern unsigned long total_lowmem;
--extern unsigned long __max_low_memory;
--extern unsigned long __initial_memory_limit;
--#define MAX_LOW_MEM	CONFIG_LOWMEM_SIZE
- 
- #define NUM_TLBCAMS	(16)
- 
-@@ -165,15 +162,15 @@ void invalidate_tlbcam_entry(int index)
- void __init cam_mapin_ram(unsigned long cam0, unsigned long cam1,
- 		unsigned long cam2)
- {
--	settlbcam(0, PAGE_OFFSET, PPC_MEMSTART, cam0, _PAGE_KERNEL, 0);
-+	settlbcam(0, PAGE_OFFSET, memstart_addr, cam0, _PAGE_KERNEL, 0);
- 	tlbcam_index++;
- 	if (cam1) {
- 		tlbcam_index++;
--		settlbcam(1, PAGE_OFFSET+cam0, PPC_MEMSTART+cam0, cam1, _PAGE_KERNEL, 0);
-+		settlbcam(1, PAGE_OFFSET+cam0, memstart_addr+cam0, cam1, _PAGE_KERNEL, 0);
- 	}
- 	if (cam2) {
- 		tlbcam_index++;
--		settlbcam(2, PAGE_OFFSET+cam0+cam1, PPC_MEMSTART+cam0+cam1, cam2, _PAGE_KERNEL, 0);
-+		settlbcam(2, PAGE_OFFSET+cam0+cam1, memstart_addr+cam0+cam1, cam2, _PAGE_KERNEL, 0);
- 	}
- }
- 
-@@ -196,35 +193,32 @@ unsigned long __init mmu_mapin_ram(void)
- void __init
- adjust_total_lowmem(void)
- {
--	unsigned long max_low_mem = MAX_LOW_MEM;
--	unsigned long cam_max = 0x10000000;
--	unsigned long ram;
--
--	/* adjust CAM size to max_low_mem */
--	if (max_low_mem < cam_max)
--		cam_max = max_low_mem;
--
--	/* adjust lowmem size to max_low_mem */
--	if (max_low_mem < total_lowmem)
--		ram = max_low_mem;
--	else
--		ram = total_lowmem;
-+	phys_addr_t max_lowmem_size = __max_low_memory;
-+	phys_addr_t cam_max_size = 0x10000000;
-+	phys_addr_t ram;
-+
-+	/* adjust CAM size to max_lowmem_size */
-+	if (max_lowmem_size < cam_max_size)
-+		cam_max_size = max_lowmem_size;
-+
-+	/* adjust lowmem size to max_lowmem_size */
-+	ram = min(max_lowmem_size, total_lowmem);
- 
- 	/* Calculate CAM values */
- 	__cam0 = 1UL << 2 * (__ilog2(ram) / 2);
--	if (__cam0 > cam_max)
--		__cam0 = cam_max;
-+	if (__cam0 > cam_max_size)
-+		__cam0 = cam_max_size;
- 	ram -= __cam0;
- 	if (ram) {
- 		__cam1 = 1UL << 2 * (__ilog2(ram) / 2);
--		if (__cam1 > cam_max)
--			__cam1 = cam_max;
-+		if (__cam1 > cam_max_size)
-+			__cam1 = cam_max_size;
- 		ram -= __cam1;
- 	}
- 	if (ram) {
- 		__cam2 = 1UL << 2 * (__ilog2(ram) / 2);
--		if (__cam2 > cam_max)
--			__cam2 = cam_max;
-+		if (__cam2 > cam_max_size)
-+			__cam2 = cam_max_size;
- 		ram -= __cam2;
- 	}
- 
-@@ -232,6 +226,6 @@ adjust_total_lowmem(void)
- 			" CAM2=%ldMb residual: %ldMb\n",
- 			__cam0 >> 20, __cam1 >> 20, __cam2 >> 20,
- 			(total_lowmem - __cam0 - __cam1 - __cam2) >> 20);
--	__max_low_memory = max_low_mem = __cam0 + __cam1 + __cam2;
--	__initial_memory_limit = __max_low_memory;
-+	__max_low_memory = __cam0 + __cam1 + __cam2;
-+	__initial_memory_limit_addr = memstart_addr + __max_low_memory;
- }
---- a/arch/powerpc/mm/hash_utils_64.c
-+++ b/arch/powerpc/mm/hash_utils_64.c
-@@ -31,6 +31,7 @@
- #include <linux/cache.h>
- #include <linux/init.h>
- #include <linux/signal.h>
-+#include <linux/lmb.h>
- 
- #include <asm/processor.h>
- #include <asm/pgtable.h>
-@@ -41,7 +42,7 @@
- #include <asm/system.h>
- #include <asm/uaccess.h>
- #include <asm/machdep.h>
--#include <asm/lmb.h>
-+#include <asm/prom.h>
- #include <asm/abs_addr.h>
- #include <asm/tlbflush.h>
- #include <asm/io.h>
-@@ -191,6 +192,29 @@ int htab_bolt_mapping(unsigned long vsta
- 	return ret < 0 ? ret : 0;
- }
- 
-+#ifdef CONFIG_MEMORY_HOTPLUG
-+static int htab_remove_mapping(unsigned long vstart, unsigned long vend,
-+		      int psize, int ssize)
-+{
-+	unsigned long vaddr;
-+	unsigned int step, shift;
-+
-+	shift = mmu_psize_defs[psize].shift;
-+	step = 1 << shift;
-+
-+	if (!ppc_md.hpte_removebolted) {
-+		printk(KERN_WARNING "Platform doesn't implement "
-+				"hpte_removebolted\n");
-+		return -EINVAL;
-+	}
-+
-+	for (vaddr = vstart; vaddr < vend; vaddr += step)
-+		ppc_md.hpte_removebolted(vaddr, psize, ssize);
-+
-+	return 0;
-+}
-+#endif /* CONFIG_MEMORY_HOTPLUG */
-+
- static int __init htab_dt_scan_seg_sizes(unsigned long node,
- 					 const char *uname, int depth,
- 					 void *data)
-@@ -434,6 +458,12 @@ void create_section_mapping(unsigned lon
- 			_PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_COHERENT | PP_RWXX,
- 			mmu_linear_psize, mmu_kernel_ssize));
- }
-+
-+int remove_section_mapping(unsigned long start, unsigned long end)
-+{
-+	return htab_remove_mapping(start, end, mmu_linear_psize,
-+			mmu_kernel_ssize);
-+}
- #endif /* CONFIG_MEMORY_HOTPLUG */
- 
- static inline void make_bl(unsigned int *insn_addr, void *func)
---- a/arch/powerpc/mm/init_32.c
-+++ b/arch/powerpc/mm/init_32.c
-@@ -30,6 +30,7 @@
- #include <linux/highmem.h>
- #include <linux/initrd.h>
- #include <linux/pagemap.h>
-+#include <linux/lmb.h>
- 
- #include <asm/pgalloc.h>
- #include <asm/prom.h>
-@@ -41,7 +42,6 @@
- #include <asm/machdep.h>
- #include <asm/btext.h>
- #include <asm/tlb.h>
--#include <asm/lmb.h>
- #include <asm/sections.h>
- 
- #include "mmu_decl.h"
-@@ -59,8 +59,8 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_ga
- unsigned long total_memory;
- unsigned long total_lowmem;
- 
--unsigned long ppc_memstart;
--unsigned long ppc_memoffset = PAGE_OFFSET;
-+phys_addr_t memstart_addr;
-+phys_addr_t lowmem_end_addr;
- 
- int boot_mapsize;
- #ifdef CONFIG_PPC_PMAC
-@@ -95,10 +95,10 @@ int __map_without_ltlbs;
- unsigned long __max_low_memory = MAX_LOW_MEM;
- 
- /*
-- * limit of what is accessible with initial MMU setup -
-+ * address of the limit of what is accessible with initial MMU setup -
-  * 256MB usually, but only 16MB on 601.
-  */
--unsigned long __initial_memory_limit = 0x10000000;
-+phys_addr_t __initial_memory_limit_addr = (phys_addr_t)0x10000000;
- 
- /*
-  * Check for command-line options that affect what MMU_init will do.
-@@ -131,10 +131,10 @@ void __init MMU_init(void)
- 
- 	/* 601 can only access 16MB at the moment */
- 	if (PVR_VER(mfspr(SPRN_PVR)) == 1)
--		__initial_memory_limit = 0x01000000;
-+		__initial_memory_limit_addr = 0x01000000;
- 	/* 8xx can only access 8MB at the moment */
- 	if (PVR_VER(mfspr(SPRN_PVR)) == 0x50)
--		__initial_memory_limit = 0x00800000;
-+		__initial_memory_limit_addr = 0x00800000;
- 
- 	/* parse args from command line */
- 	MMU_setup();
-@@ -145,8 +145,8 @@ void __init MMU_init(void)
- 		printk(KERN_WARNING "Only using first contiguous memory region");
- 	}
- 
--	total_memory = lmb_end_of_DRAM();
--	total_lowmem = total_memory;
-+	total_lowmem = total_memory = lmb_end_of_DRAM() - memstart_addr;
-+	lowmem_end_addr = memstart_addr + total_lowmem;
- 
- #ifdef CONFIG_FSL_BOOKE
- 	/* Freescale Book-E parts expect lowmem to be mapped by fixed TLB
-@@ -157,9 +157,10 @@ void __init MMU_init(void)
- 
- 	if (total_lowmem > __max_low_memory) {
- 		total_lowmem = __max_low_memory;
-+		lowmem_end_addr = memstart_addr + total_lowmem;
- #ifndef CONFIG_HIGHMEM
- 		total_memory = total_lowmem;
--		lmb_enforce_memory_limit(total_lowmem);
-+		lmb_enforce_memory_limit(lowmem_end_addr);
- 		lmb_analyze();
- #endif /* CONFIG_HIGHMEM */
- 	}
-@@ -184,8 +185,6 @@ void __init MMU_init(void)
- 	/* Map in I/O resources */
- 	if (ppc_md.progress)
- 		ppc_md.progress("MMU:setio", 0x302);
--	if (ppc_md.setup_io_mappings)
--		ppc_md.setup_io_mappings();
- 
- 	/* Initialize the context management stuff */
- 	mmu_context_init();
-@@ -208,7 +207,7 @@ void __init *early_get_page(void)
- 		p = alloc_bootmem_pages(PAGE_SIZE);
- 	} else {
- 		p = __va(lmb_alloc_base(PAGE_SIZE, PAGE_SIZE,
--					__initial_memory_limit));
-+					__initial_memory_limit_addr));
- 	}
- 	return p;
- }
-@@ -276,7 +275,7 @@ static int __init setup_kcore(void)
- 
- 		kcore_mem = kmalloc(sizeof(struct kcore_list), GFP_ATOMIC);
- 		if (!kcore_mem)
--			panic("%s: kmalloc failed\n", __FUNCTION__);
-+			panic("%s: kmalloc failed\n", __func__);
- 
- 		/* must stay under 32 bits */
- 		if ( 0xfffffffful - (unsigned long)__va(base) < size) {
---- a/arch/powerpc/mm/init_64.c
-+++ b/arch/powerpc/mm/init_64.c
-@@ -38,11 +38,11 @@
- #include <linux/nodemask.h>
- #include <linux/module.h>
- #include <linux/poison.h>
-+#include <linux/lmb.h>
- 
- #include <asm/pgalloc.h>
- #include <asm/page.h>
- #include <asm/prom.h>
--#include <asm/lmb.h>
- #include <asm/rtas.h>
- #include <asm/io.h>
- #include <asm/mmu_context.h>
-@@ -72,8 +72,7 @@
- #warning TASK_SIZE is smaller than it needs to be.
- #endif
- 
--/* max amount of RAM to use */
--unsigned long __max_memory;
-+phys_addr_t memstart_addr;
- 
- void free_initmem(void)
- {
-@@ -122,7 +121,7 @@ static int __init setup_kcore(void)
- 		/* GFP_ATOMIC to avoid might_sleep warnings during boot */
- 		kcore_mem = kmalloc(sizeof(struct kcore_list), GFP_ATOMIC);
- 		if (!kcore_mem)
--			panic("%s: kmalloc failed\n", __FUNCTION__);
-+			panic("%s: kmalloc failed\n", __func__);
- 
- 		kclist_add(kcore_mem, __va(base), size);
- 	}
---- a/arch/powerpc/mm/lmb.c
-+++ /dev/null
-@@ -1,357 +0,0 @@
--/*
-- * Procedures for maintaining information about logical memory blocks.
-- *
-- * Peter Bergner, IBM Corp.	June 2001.
-- * Copyright (C) 2001 Peter Bergner.
-- * 
-- *      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/kernel.h>
--#include <linux/init.h>
--#include <linux/bitops.h>
--#include <asm/types.h>
--#include <asm/page.h>
--#include <asm/prom.h>
--#include <asm/lmb.h>
--#ifdef CONFIG_PPC32
--#include "mmu_decl.h"		/* for __max_low_memory */
--#endif
--
--#undef DEBUG
--
--#ifdef DEBUG
--#include <asm/udbg.h>
--#define DBG(fmt...) udbg_printf(fmt)
--#else
--#define DBG(fmt...)
--#endif
--
--#define LMB_ALLOC_ANYWHERE	0
--
--struct lmb lmb;
--
--void lmb_dump_all(void)
--{
--#ifdef DEBUG
--	unsigned long i;
--
--	DBG("lmb_dump_all:\n");
--	DBG("    memory.cnt		  = 0x%lx\n", lmb.memory.cnt);
--	DBG("    memory.size		  = 0x%lx\n", lmb.memory.size);
--	for (i=0; i < lmb.memory.cnt ;i++) {
--		DBG("    memory.region[0x%x].base       = 0x%lx\n",
--			    i, lmb.memory.region[i].base);
--		DBG("		      .size     = 0x%lx\n",
--			    lmb.memory.region[i].size);
--	}
--
--	DBG("\n    reserved.cnt	  = 0x%lx\n", lmb.reserved.cnt);
--	DBG("    reserved.size	  = 0x%lx\n", lmb.reserved.size);
--	for (i=0; i < lmb.reserved.cnt ;i++) {
--		DBG("    reserved.region[0x%x].base       = 0x%lx\n",
--			    i, lmb.reserved.region[i].base);
--		DBG("		      .size     = 0x%lx\n",
--			    lmb.reserved.region[i].size);
--	}
--#endif /* DEBUG */
--}
--
--static unsigned long __init lmb_addrs_overlap(unsigned long base1,
--		unsigned long size1, unsigned long base2, unsigned long size2)
--{
--	return ((base1 < (base2+size2)) && (base2 < (base1+size1)));
--}
--
--static long __init lmb_addrs_adjacent(unsigned long base1, unsigned long size1,
--		unsigned long base2, unsigned long size2)
--{
--	if (base2 == base1 + size1)
--		return 1;
--	else if (base1 == base2 + size2)
--		return -1;
--
--	return 0;
--}
--
--static long __init lmb_regions_adjacent(struct lmb_region *rgn,
--		unsigned long r1, unsigned long r2)
--{
--	unsigned long base1 = rgn->region[r1].base;
--	unsigned long size1 = rgn->region[r1].size;
--	unsigned long base2 = rgn->region[r2].base;
--	unsigned long size2 = rgn->region[r2].size;
--
--	return lmb_addrs_adjacent(base1, size1, base2, size2);
--}
--
--static void __init lmb_remove_region(struct lmb_region *rgn, unsigned long r)
--{
--	unsigned long i;
--
--	for (i = r; i < rgn->cnt - 1; i++) {
--		rgn->region[i].base = rgn->region[i + 1].base;
--		rgn->region[i].size = rgn->region[i + 1].size;
--	}
--	rgn->cnt--;
--}
--
--/* Assumption: base addr of region 1 < base addr of region 2 */
--static void __init lmb_coalesce_regions(struct lmb_region *rgn,
--		unsigned long r1, unsigned long r2)
--{
--	rgn->region[r1].size += rgn->region[r2].size;
--	lmb_remove_region(rgn, r2);
--}
--
--/* This routine called with relocation disabled. */
--void __init lmb_init(void)
--{
--	/* Create a dummy zero size LMB which will get coalesced away later.
--	 * This simplifies the lmb_add() code below...
--	 */
--	lmb.memory.region[0].base = 0;
--	lmb.memory.region[0].size = 0;
--	lmb.memory.cnt = 1;
--
--	/* Ditto. */
--	lmb.reserved.region[0].base = 0;
--	lmb.reserved.region[0].size = 0;
--	lmb.reserved.cnt = 1;
--}
--
--/* This routine may be called with relocation disabled. */
--void __init lmb_analyze(void)
--{
--	int i;
--
--	lmb.memory.size = 0;
--
--	for (i = 0; i < lmb.memory.cnt; i++)
--		lmb.memory.size += lmb.memory.region[i].size;
--}
--
--/* This routine called with relocation disabled. */
--static long __init lmb_add_region(struct lmb_region *rgn, unsigned long base,
--				  unsigned long size)
--{
--	unsigned long coalesced = 0;
--	long adjacent, i;
--
--	/* First try and coalesce this LMB with another. */
--	for (i=0; i < rgn->cnt; i++) {
--		unsigned long rgnbase = rgn->region[i].base;
--		unsigned long rgnsize = rgn->region[i].size;
--
--		if ((rgnbase == base) && (rgnsize == size))
--			/* Already have this region, so we're done */
--			return 0;
--
--		adjacent = lmb_addrs_adjacent(base,size,rgnbase,rgnsize);
--		if ( adjacent > 0 ) {
--			rgn->region[i].base -= size;
--			rgn->region[i].size += size;
--			coalesced++;
--			break;
--		}
--		else if ( adjacent < 0 ) {
--			rgn->region[i].size += size;
--			coalesced++;
--			break;
--		}
--	}
--
--	if ((i < rgn->cnt-1) && lmb_regions_adjacent(rgn, i, i+1) ) {
--		lmb_coalesce_regions(rgn, i, i+1);
--		coalesced++;
--	}
--
--	if (coalesced)
--		return coalesced;
--	if (rgn->cnt >= MAX_LMB_REGIONS)
--		return -1;
--
--	/* Couldn't coalesce the LMB, so add it to the sorted table. */
--	for (i = rgn->cnt-1; i >= 0; i--) {
--		if (base < rgn->region[i].base) {
--			rgn->region[i+1].base = rgn->region[i].base;
--			rgn->region[i+1].size = rgn->region[i].size;
--		} else {
--			rgn->region[i+1].base = base;
--			rgn->region[i+1].size = size;
--			break;
--		}
--	}
--	rgn->cnt++;
--
--	return 0;
--}
--
--/* This routine may be called with relocation disabled. */
--long __init lmb_add(unsigned long base, unsigned long size)
--{
--	struct lmb_region *_rgn = &(lmb.memory);
--
--	/* On pSeries LPAR systems, the first LMB is our RMO region. */
--	if (base == 0)
--		lmb.rmo_size = size;
--
--	return lmb_add_region(_rgn, base, size);
--
--}
--
--long __init lmb_reserve(unsigned long base, unsigned long size)
--{
--	struct lmb_region *_rgn = &(lmb.reserved);
--
--	BUG_ON(0 == size);
--
--	return lmb_add_region(_rgn, base, size);
--}
--
--long __init lmb_overlaps_region(struct lmb_region *rgn, unsigned long base,
--				unsigned long size)
--{
--	unsigned long i;
--
--	for (i=0; i < rgn->cnt; i++) {
--		unsigned long rgnbase = rgn->region[i].base;
--		unsigned long rgnsize = rgn->region[i].size;
--		if ( lmb_addrs_overlap(base,size,rgnbase,rgnsize) ) {
--			break;
--		}
--	}
--
--	return (i < rgn->cnt) ? i : -1;
--}
--
--unsigned long __init lmb_alloc(unsigned long size, unsigned long align)
--{
--	return lmb_alloc_base(size, align, LMB_ALLOC_ANYWHERE);
--}
--
--unsigned long __init lmb_alloc_base(unsigned long size, unsigned long align,
--				    unsigned long max_addr)
--{
--	unsigned long alloc;
--
--	alloc = __lmb_alloc_base(size, align, max_addr);
--
--	if (alloc == 0)
--		panic("ERROR: Failed to allocate 0x%lx bytes below 0x%lx.\n",
--				size, max_addr);
--
--	return alloc;
--}
--
--unsigned long __init __lmb_alloc_base(unsigned long size, unsigned long align,
--				    unsigned long max_addr)
--{
--	long i, j;
--	unsigned long base = 0;
--
--	BUG_ON(0 == size);
--
--#ifdef CONFIG_PPC32
--	/* On 32-bit, make sure we allocate lowmem */
--	if (max_addr == LMB_ALLOC_ANYWHERE)
--		max_addr = __max_low_memory;
--#endif
--	for (i = lmb.memory.cnt-1; i >= 0; i--) {
--		unsigned long lmbbase = lmb.memory.region[i].base;
--		unsigned long lmbsize = lmb.memory.region[i].size;
--
--		if (max_addr == LMB_ALLOC_ANYWHERE)
--			base = _ALIGN_DOWN(lmbbase + lmbsize - size, align);
--		else if (lmbbase < max_addr) {
--			base = min(lmbbase + lmbsize, max_addr);
--			base = _ALIGN_DOWN(base - size, align);
--		} else
--			continue;
--
--		while ((lmbbase <= base) &&
--		       ((j = lmb_overlaps_region(&lmb.reserved, base, size)) >= 0) )
--			base = _ALIGN_DOWN(lmb.reserved.region[j].base - size,
--					   align);
--
--		if ((base != 0) && (lmbbase <= base))
--			break;
--	}
--
--	if (i < 0)
--		return 0;
--
--	lmb_add_region(&lmb.reserved, base, size);
--
--	return base;
--}
--
--/* You must call lmb_analyze() before this. */
--unsigned long __init lmb_phys_mem_size(void)
--{
--	return lmb.memory.size;
--}
--
--unsigned long __init lmb_end_of_DRAM(void)
--{
--	int idx = lmb.memory.cnt - 1;
--
--	return (lmb.memory.region[idx].base + lmb.memory.region[idx].size);
--}
--
--/* You must call lmb_analyze() after this. */
--void __init lmb_enforce_memory_limit(unsigned long memory_limit)
--{
--	unsigned long i, limit;
--	struct lmb_property *p;
--
--	if (! memory_limit)
--		return;
--
--	/* Truncate the lmb regions to satisfy the memory limit. */
--	limit = memory_limit;
--	for (i = 0; i < lmb.memory.cnt; i++) {
--		if (limit > lmb.memory.region[i].size) {
--			limit -= lmb.memory.region[i].size;
--			continue;
--		}
--
--		lmb.memory.region[i].size = limit;
--		lmb.memory.cnt = i + 1;
--		break;
--	}
--
--	if (lmb.memory.region[0].size < lmb.rmo_size)
--		lmb.rmo_size = lmb.memory.region[0].size;
--
--	/* And truncate any reserves above the limit also. */
--	for (i = 0; i < lmb.reserved.cnt; i++) {
--		p = &lmb.reserved.region[i];
--
--		if (p->base > memory_limit)
--			p->size = 0;
--		else if ((p->base + p->size) > memory_limit)
--			p->size = memory_limit - p->base;
--
--		if (p->size == 0) {
--			lmb_remove_region(&lmb.reserved, i);
--			i--;
--		}
--	}
--}
--
--int __init lmb_is_reserved(unsigned long addr)
--{
--	int i;
--
--	for (i = 0; i < lmb.reserved.cnt; i++) {
--		unsigned long upper = lmb.reserved.region[i].base +
--				      lmb.reserved.region[i].size - 1;
--		if ((addr >= lmb.reserved.region[i].base) && (addr <= upper))
--			return 1;
--	}
--	return 0;
--}
---- a/arch/powerpc/mm/mem.c
-+++ b/arch/powerpc/mm/mem.c
-@@ -31,6 +31,7 @@
- #include <linux/initrd.h>
- #include <linux/pagemap.h>
- #include <linux/suspend.h>
-+#include <linux/lmb.h>
- 
- #include <asm/pgalloc.h>
- #include <asm/prom.h>
-@@ -42,7 +43,6 @@
- #include <asm/machdep.h>
- #include <asm/btext.h>
- #include <asm/tlb.h>
--#include <asm/lmb.h>
- #include <asm/sections.h>
- #include <asm/vdso.h>
- 
-@@ -111,7 +111,7 @@ int memory_add_physaddr_to_nid(u64 start
- }
- #endif
- 
--int __devinit arch_add_memory(int nid, u64 start, u64 size)
-+int arch_add_memory(int nid, u64 start, u64 size)
- {
- 	struct pglist_data *pgdata;
- 	struct zone *zone;
-@@ -175,7 +175,6 @@ void show_mem(void)
- 
- 	printk("Mem-info:\n");
- 	show_free_areas();
--	printk("Free swap:       %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
- 	for_each_online_pgdat(pgdat) {
- 		unsigned long flags;
- 		pgdat_resize_lock(pgdat, &flags);
-@@ -217,9 +216,11 @@ void __init do_init_bootmem(void)
- 	unsigned long total_pages;
- 	int boot_mapsize;
- 
--	max_pfn = total_pages = lmb_end_of_DRAM() >> PAGE_SHIFT;
-+	max_pfn = lmb_end_of_DRAM() >> PAGE_SHIFT;
-+	total_pages = (lmb_end_of_DRAM() - memstart_addr) >> PAGE_SHIFT;
- #ifdef CONFIG_HIGHMEM
- 	total_pages = total_lowmem >> PAGE_SHIFT;
-+	max_low_pfn = lowmem_end_addr >> PAGE_SHIFT;
- #endif
- 
- 	/*
-@@ -245,18 +246,18 @@ void __init do_init_bootmem(void)
- 	 * present.
- 	 */
- #ifdef CONFIG_HIGHMEM
--	free_bootmem_with_active_regions(0, total_lowmem >> PAGE_SHIFT);
-+	free_bootmem_with_active_regions(0, lowmem_end_addr >> PAGE_SHIFT);
- 
- 	/* reserve the sections we're already using */
- 	for (i = 0; i < lmb.reserved.cnt; i++) {
- 		unsigned long addr = lmb.reserved.region[i].base +
- 				     lmb_size_bytes(&lmb.reserved, i) - 1;
--		if (addr < total_lowmem)
-+		if (addr < lowmem_end_addr)
- 			reserve_bootmem(lmb.reserved.region[i].base,
- 					lmb_size_bytes(&lmb.reserved, i),
- 					BOOTMEM_DEFAULT);
--		else if (lmb.reserved.region[i].base < total_lowmem) {
--			unsigned long adjusted_size = total_lowmem -
-+		else if (lmb.reserved.region[i].base < lowmem_end_addr) {
-+			unsigned long adjusted_size = lowmem_end_addr -
- 				      lmb.reserved.region[i].base;
- 			reserve_bootmem(lmb.reserved.region[i].base,
- 					adjusted_size, BOOTMEM_DEFAULT);
-@@ -326,7 +327,7 @@ void __init paging_init(void)
- 	       (top_of_ram - total_ram) >> 20);
- 	memset(max_zone_pfns, 0, sizeof(max_zone_pfns));
- #ifdef CONFIG_HIGHMEM
--	max_zone_pfns[ZONE_DMA] = total_lowmem >> PAGE_SHIFT;
-+	max_zone_pfns[ZONE_DMA] = lowmem_end_addr >> PAGE_SHIFT;
- 	max_zone_pfns[ZONE_HIGHMEM] = top_of_ram >> PAGE_SHIFT;
- #else
- 	max_zone_pfns[ZONE_DMA] = top_of_ram >> PAGE_SHIFT;
-@@ -381,7 +382,7 @@ void __init mem_init(void)
- 	{
- 		unsigned long pfn, highmem_mapnr;
- 
--		highmem_mapnr = total_lowmem >> PAGE_SHIFT;
-+		highmem_mapnr = lowmem_end_addr >> PAGE_SHIFT;
- 		for (pfn = highmem_mapnr; pfn < max_mapnr; ++pfn) {
- 			struct page *page = pfn_to_page(pfn);
- 			if (lmb_is_reserved(pfn << PAGE_SHIFT))
---- a/arch/powerpc/mm/mmu_decl.h
-+++ b/arch/powerpc/mm/mmu_decl.h
-@@ -48,9 +48,11 @@ extern unsigned int num_tlbcam_entries;
- 
- extern unsigned long ioremap_bot;
- extern unsigned long __max_low_memory;
--extern unsigned long __initial_memory_limit;
-+extern phys_addr_t __initial_memory_limit_addr;
- extern unsigned long total_memory;
- extern unsigned long total_lowmem;
-+extern phys_addr_t memstart_addr;
-+extern phys_addr_t lowmem_end_addr;
- 
- /* ...and now those things that may be slightly different between processor
-  * architectures.  -- Dan
---- a/arch/powerpc/mm/numa.c
-+++ b/arch/powerpc/mm/numa.c
-@@ -17,8 +17,9 @@
- #include <linux/nodemask.h>
- #include <linux/cpu.h>
- #include <linux/notifier.h>
-+#include <linux/lmb.h>
- #include <asm/sparsemem.h>
--#include <asm/lmb.h>
-+#include <asm/prom.h>
- #include <asm/system.h>
- #include <asm/smp.h>
- 
---- a/arch/powerpc/mm/pgtable_32.c
-+++ b/arch/powerpc/mm/pgtable_32.c
-@@ -281,12 +281,13 @@ int map_page(unsigned long va, phys_addr
-  */
- void __init mapin_ram(void)
- {
--	unsigned long v, p, s, f;
-+	unsigned long v, s, f;
-+	phys_addr_t p;
- 	int ktext;
- 
- 	s = mmu_mapin_ram();
- 	v = KERNELBASE + s;
--	p = PPC_MEMSTART + s;
-+	p = memstart_addr + s;
- 	for (; s < total_lowmem; s += PAGE_SIZE) {
- 		ktext = ((char *) v >= _stext && (char *) v < etext);
- 		f = ktext ?_PAGE_RAM_TEXT : _PAGE_RAM;
---- a/arch/powerpc/mm/ppc_mmu_32.c
-+++ b/arch/powerpc/mm/ppc_mmu_32.c
-@@ -26,11 +26,11 @@
- #include <linux/mm.h>
- #include <linux/init.h>
- #include <linux/highmem.h>
-+#include <linux/lmb.h>
- 
- #include <asm/prom.h>
- #include <asm/mmu.h>
- #include <asm/machdep.h>
--#include <asm/lmb.h>
- 
- #include "mmu_decl.h"
- 
-@@ -82,7 +82,6 @@ unsigned long __init mmu_mapin_ram(void)
- #else
- 	unsigned long tot, bl, done;
- 	unsigned long max_size = (256<<20);
--	unsigned long align;
- 
- 	if (__map_without_bats) {
- 		printk(KERN_DEBUG "RAM mapped without BATs\n");
-@@ -93,19 +92,13 @@ unsigned long __init mmu_mapin_ram(void)
- 
- 	/* Make sure we don't map a block larger than the
- 	   smallest alignment of the physical address. */
--	/* alignment of PPC_MEMSTART */
--	align = ~(PPC_MEMSTART-1) & PPC_MEMSTART;
--	/* set BAT block size to MIN(max_size, align) */
--	if (align && align < max_size)
--		max_size = align;
--
- 	tot = total_lowmem;
- 	for (bl = 128<<10; bl < max_size; bl <<= 1) {
- 		if (bl * 2 > tot)
- 			break;
- 	}
- 
--	setbat(2, KERNELBASE, PPC_MEMSTART, bl, _PAGE_RAM);
-+	setbat(2, KERNELBASE, 0, bl, _PAGE_RAM);
- 	done = (unsigned long)bat_addrs[2].limit - KERNELBASE + 1;
- 	if ((done < tot) && !bat_addrs[3].limit) {
- 		/* use BAT3 to cover a bit more */
-@@ -113,7 +106,7 @@ unsigned long __init mmu_mapin_ram(void)
- 		for (bl = 128<<10; bl < max_size; bl <<= 1)
- 			if (bl * 2 > tot)
- 				break;
--		setbat(3, KERNELBASE+done, PPC_MEMSTART+done, bl, _PAGE_RAM);
-+		setbat(3, KERNELBASE+done, done, bl, _PAGE_RAM);
- 		done = (unsigned long)bat_addrs[3].limit - KERNELBASE + 1;
- 	}
- 
-@@ -240,7 +233,7 @@ void __init MMU_init_hw(void)
- 	 */
- 	if ( ppc_md.progress ) ppc_md.progress("hash:find piece", 0x322);
- 	Hash = __va(lmb_alloc_base(Hash_size, Hash_size,
--				   __initial_memory_limit));
-+				   __initial_memory_limit_addr));
- 	cacheable_memzero(Hash, Hash_size);
- 	_SDR1 = __pa(Hash) | SDR1_LOW_BITS;
- 
---- a/arch/powerpc/mm/stab.c
-+++ b/arch/powerpc/mm/stab.c
-@@ -12,12 +12,14 @@
-  *      2 of the License, or (at your option) any later version.
-  */
- 
-+#include <linux/lmb.h>
-+
- #include <asm/pgtable.h>
- #include <asm/mmu.h>
- #include <asm/mmu_context.h>
- #include <asm/paca.h>
- #include <asm/cputable.h>
--#include <asm/lmb.h>
-+#include <asm/prom.h>
- #include <asm/abs_addr.h>
- #include <asm/firmware.h>
- #include <asm/iseries/hv_call.h>
---- a/arch/powerpc/oprofile/cell/spu_task_sync.c
-+++ b/arch/powerpc/oprofile/cell/spu_task_sync.c
-@@ -68,7 +68,7 @@ static struct cached_info *get_cached_in
- 	if (spu_num >= num_spu_nodes) {
- 		printk(KERN_ERR "SPU_PROF: "
- 		       "%s, line %d: Invalid index %d into spu info cache\n",
--		       __FUNCTION__, __LINE__, spu_num);
-+		       __func__, __LINE__, spu_num);
- 		ret_info = NULL;
- 		goto out;
- 	}
-@@ -115,7 +115,7 @@ prepare_cached_spu_info(struct spu *spu,
- 	if (!info) {
- 		printk(KERN_ERR "SPU_PROF: "
- 		       "%s, line %d: create vma_map failed\n",
--		       __FUNCTION__, __LINE__);
-+		       __func__, __LINE__);
- 		retval = -ENOMEM;
- 		goto err_alloc;
- 	}
-@@ -123,7 +123,7 @@ prepare_cached_spu_info(struct spu *spu,
- 	if (!new_map) {
- 		printk(KERN_ERR "SPU_PROF: "
- 		       "%s, line %d: create vma_map failed\n",
--		       __FUNCTION__, __LINE__);
-+		       __func__, __LINE__);
- 		retval = -ENOMEM;
- 		goto err_alloc;
- 	}
-@@ -171,7 +171,7 @@ static int release_cached_info(int spu_i
- 			printk(KERN_ERR "SPU_PROF: "
- 				"%s, line %d: "
- 				"Invalid index %d into spu info cache\n",
--				__FUNCTION__, __LINE__, spu_index);
-+				__func__, __LINE__, spu_index);
- 			goto out;
- 		}
- 		end = spu_index + 1;
-@@ -273,7 +273,7 @@ fail_no_image_cookie:
- 
- 	printk(KERN_ERR "SPU_PROF: "
- 		"%s, line %d: Cannot find dcookie for SPU binary\n",
--		__FUNCTION__, __LINE__);
-+		__func__, __LINE__);
- 	goto out;
- }
- 
-@@ -467,7 +467,7 @@ int spu_sync_stop(void)
- 	if (ret) {
- 		printk(KERN_ERR "SPU_PROF: "
- 			"%s, line %d: spu_switch_event_unregister returned %d\n",
--			__FUNCTION__, __LINE__, ret);
-+			__func__, __LINE__, ret);
- 		goto out;
- 	}
- 
---- a/arch/powerpc/oprofile/cell/vma_map.c
-+++ b/arch/powerpc/oprofile/cell/vma_map.c
-@@ -72,7 +72,7 @@ vma_map_add(struct vma_to_fileoffset_map
- 		kzalloc(sizeof(struct vma_to_fileoffset_map), GFP_KERNEL);
- 	if (!new) {
- 		printk(KERN_ERR "SPU_PROF: %s, line %d: malloc failed\n",
--		       __FUNCTION__, __LINE__);
-+		       __func__, __LINE__);
- 		vma_map_free(map);
- 		return NULL;
- 	}
-@@ -134,19 +134,19 @@ struct vma_to_fileoffset_map *create_vma
- 	if (memcmp(ehdr.e_ident, expected, EI_PAD) != 0) {
- 		printk(KERN_ERR "SPU_PROF: "
- 		       "%s, line %d: Unexpected e_ident parsing SPU ELF\n",
--		       __FUNCTION__, __LINE__);
-+		       __func__, __LINE__);
- 		goto fail;
- 	}
- 	if (ehdr.e_machine != EM_SPU) {
- 		printk(KERN_ERR "SPU_PROF: "
- 		       "%s, line %d: Unexpected e_machine parsing SPU ELF\n",
--		       __FUNCTION__,  __LINE__);
-+		       __func__,  __LINE__);
- 		goto fail;
- 	}
- 	if (ehdr.e_type != ET_EXEC) {
- 		printk(KERN_ERR "SPU_PROF: "
- 		       "%s, line %d: Unexpected e_type parsing SPU ELF\n",
--		       __FUNCTION__, __LINE__);
-+		       __func__, __LINE__);
- 		goto fail;
- 	}
- 	phdr_start = spu_elf_start + ehdr.e_phoff;
-@@ -232,7 +232,7 @@ struct vma_to_fileoffset_map *create_vma
- 	if (overlay_tbl_offset < 0) {
- 		printk(KERN_ERR "SPU_PROF: "
- 		       "%s, line %d: Error finding SPU overlay table\n",
--		       __FUNCTION__, __LINE__);
-+		       __func__, __LINE__);
- 		goto fail;
- 	}
- 	ovly_table = spu_elf_start + overlay_tbl_offset;
---- a/arch/powerpc/oprofile/op_model_cell.c
-+++ b/arch/powerpc/oprofile/op_model_cell.c
-@@ -216,7 +216,7 @@ static void pm_rtas_reset_signals(u32 no
- 		 * failure to stop OProfile.
- 		 */
- 		printk(KERN_WARNING "%s: rtas returned: %d\n",
--		       __FUNCTION__, ret);
-+		       __func__, ret);
- }
- 
- static int pm_rtas_activate_signals(u32 node, u32 count)
-@@ -255,7 +255,7 @@ static int pm_rtas_activate_signals(u32 
- 
- 		if (unlikely(ret)) {
- 			printk(KERN_WARNING "%s: rtas returned: %d\n",
--			       __FUNCTION__, ret);
-+			       __func__, ret);
- 			return -EIO;
- 		}
- 	}
-@@ -560,7 +560,7 @@ static int cell_reg_setup(struct op_coun
- 		if (unlikely(spu_rtas_token == RTAS_UNKNOWN_SERVICE)) {
- 			printk(KERN_ERR
- 			       "%s: rtas token ibm,cbe-spu-perftools unknown\n",
--			       __FUNCTION__);
-+			       __func__);
- 			return -EIO;
- 		}
- 	}
-@@ -576,7 +576,7 @@ static int cell_reg_setup(struct op_coun
- 	if (unlikely(pm_rtas_token == RTAS_UNKNOWN_SERVICE)) {
- 		printk(KERN_ERR
- 		       "%s: rtas token ibm,cbe-perftools unknown\n",
--		       __FUNCTION__);
-+		       __func__);
- 		return -EIO;
- 	}
- 
-@@ -853,7 +853,7 @@ static int pm_rtas_activate_spu_profilin
- 
- 	if (unlikely(ret)) {
- 		printk(KERN_WARNING "%s: rtas returned: %d\n",
--		       __FUNCTION__, ret);
-+		       __func__, ret);
- 		return -EIO;
- 	}
- 
-@@ -949,7 +949,7 @@ static int cell_global_start_spu(struct 
- 		if (unlikely(ret != 0)) {
- 			printk(KERN_ERR
- 			       "%s: rtas call ibm,cbe-spu-perftools failed, return = %d\n",
--			       __FUNCTION__, ret);
-+			       __func__, ret);
- 			rtas_error = -EIO;
- 			goto out;
- 		}
-@@ -1061,7 +1061,7 @@ static void cell_global_stop_spu(void)
- 		if (unlikely(rtn_value != 0)) {
- 			printk(KERN_ERR
- 			       "%s: rtas call ibm,cbe-spu-perftools failed, return = %d\n",
--			       __FUNCTION__, rtn_value);
-+			       __func__, rtn_value);
- 		}
- 
- 		/* Deactivate the signals */
---- a/arch/powerpc/platforms/40x/ep405.c
-+++ b/arch/powerpc/platforms/40x/ep405.c
-@@ -29,6 +29,7 @@
- #include <asm/time.h>
- #include <asm/uic.h>
- #include <asm/pci-bridge.h>
-+#include <asm/ppc4xx.h>
- 
- static struct device_node *bcsr_node;
- static void __iomem *bcsr_regs;
-@@ -119,5 +120,6 @@ define_machine(ep405) {
- 	.progress		= udbg_progress,
- 	.init_IRQ		= uic_init_tree,
- 	.get_irq		= uic_get_irq,
-+	.restart		= ppc4xx_reset_system,
- 	.calibrate_decr		= generic_calibrate_decr,
- };
---- a/arch/powerpc/platforms/40x/kilauea.c
-+++ b/arch/powerpc/platforms/40x/kilauea.c
-@@ -1,7 +1,7 @@
- /*
-  * Kilauea board specific routines
-  *
-- * Copyright 2007 DENX Software Engineering, Stefan Roese <sr@denx.de>
-+ * Copyright 2007-2008 DENX Software Engineering, Stefan Roese <sr@denx.de>
-  *
-  * Based on the Walnut code by
-  * Josh Boyer <jwboyer@linux.vnet.ibm.com>
-@@ -20,6 +20,7 @@
- #include <asm/time.h>
- #include <asm/uic.h>
- #include <asm/pci-bridge.h>
-+#include <asm/ppc4xx.h>
- 
- static __initdata struct of_device_id kilauea_of_bus[] = {
- 	{ .compatible = "ibm,plb4", },
-@@ -54,5 +55,6 @@ define_machine(kilauea) {
- 	.progress 			= udbg_progress,
- 	.init_IRQ 			= uic_init_tree,
- 	.get_irq 			= uic_get_irq,
-+	.restart			= ppc4xx_reset_system,
- 	.calibrate_decr			= generic_calibrate_decr,
- };
---- a/arch/powerpc/platforms/40x/makalu.c
-+++ b/arch/powerpc/platforms/40x/makalu.c
-@@ -20,6 +20,7 @@
- #include <asm/time.h>
- #include <asm/uic.h>
- #include <asm/pci-bridge.h>
-+#include <asm/ppc4xx.h>
- 
- static __initdata struct of_device_id makalu_of_bus[] = {
- 	{ .compatible = "ibm,plb4", },
-@@ -54,5 +55,6 @@ define_machine(makalu) {
- 	.progress 			= udbg_progress,
- 	.init_IRQ 			= uic_init_tree,
- 	.get_irq 			= uic_get_irq,
-+	.restart			= ppc4xx_reset_system,
- 	.calibrate_decr			= generic_calibrate_decr,
- };
---- a/arch/powerpc/platforms/40x/virtex.c
-+++ b/arch/powerpc/platforms/40x/virtex.c
-@@ -14,6 +14,7 @@
- #include <asm/prom.h>
- #include <asm/time.h>
- #include <asm/xilinx_intc.h>
-+#include <asm/ppc4xx.h>
- 
- static struct of_device_id xilinx_of_bus_ids[] __initdata = {
- 	{ .compatible = "xlnx,plb-v46-1.00.a", },
-@@ -48,5 +49,6 @@ define_machine(virtex) {
- 	.probe			= virtex_probe,
- 	.init_IRQ		= xilinx_intc_init_tree,
- 	.get_irq		= xilinx_intc_get_irq,
-+	.restart		= ppc4xx_reset_system,
- 	.calibrate_decr		= generic_calibrate_decr,
- };
---- a/arch/powerpc/platforms/40x/walnut.c
-+++ b/arch/powerpc/platforms/40x/walnut.c
-@@ -26,6 +26,7 @@
- #include <asm/time.h>
- #include <asm/uic.h>
- #include <asm/pci-bridge.h>
-+#include <asm/ppc4xx.h>
- 
- static __initdata struct of_device_id walnut_of_bus[] = {
- 	{ .compatible = "ibm,plb3", },
-@@ -61,5 +62,6 @@ define_machine(walnut) {
- 	.progress		= udbg_progress,
- 	.init_IRQ		= uic_init_tree,
- 	.get_irq		= uic_get_irq,
--	.calibrate_decr	= generic_calibrate_decr,
-+	.restart		= ppc4xx_reset_system,
-+	.calibrate_decr		= generic_calibrate_decr,
- };
---- a/arch/powerpc/platforms/44x/44x.h
-+++ b/arch/powerpc/platforms/44x/44x.h
-@@ -3,6 +3,5 @@
- 
- extern u8 as1_readb(volatile u8 __iomem  *addr);
- extern void as1_writeb(u8 data, volatile u8 __iomem *addr);
--extern void ppc44x_reset_system(char *cmd);
- 
- #endif /* __POWERPC_PLATFORMS_44X_44X_H */
---- a/arch/powerpc/platforms/44x/Kconfig
-+++ b/arch/powerpc/platforms/44x/Kconfig
-@@ -67,6 +67,25 @@ config WARP
- 	  See http://www.pikatechnologies.com/ and follow the "PIKA for Computer
- 	  Telephony Developers" link for more information.
- 
-+config CANYONLANDS
-+	bool "Canyonlands"
-+	depends on 44x
-+	default n
-+	select 460EX
-+	select PCI
-+	select PPC4xx_PCI_EXPRESS
-+	help
-+	  This option enables support for the AMCC PPC460EX evaluation board.
-+
-+config YOSEMITE
-+	bool "Yosemite"
-+	depends on 44x
-+	default n
-+	select 440EP
-+	select PCI
-+	help
-+	  This option enables support for the AMCC PPC440EP evaluation board.
-+
- #config LUAN
- #	bool "Luan"
- #	depends on 44x
-@@ -122,6 +141,14 @@ config 440SPe
- 	bool
- 	select IBM_NEW_EMAC_EMAC4
- 
-+config 460EX
-+	bool
-+	select PPC_FPU
-+	select IBM_NEW_EMAC_EMAC4
-+	select IBM_NEW_EMAC_RGMII
-+	select IBM_NEW_EMAC_ZMII
-+	select IBM_NEW_EMAC_TAH
-+
- # 44x errata/workaround config symbols, selected by the CPU models above
- config IBM440EP_ERR42
- 	bool
---- a/arch/powerpc/platforms/44x/Makefile
-+++ b/arch/powerpc/platforms/44x/Makefile
-@@ -1,9 +1,11 @@
--obj-$(CONFIG_44x)	:= misc_44x.o
-+obj-$(CONFIG_44x)	:= misc_44x.o idle.o
- obj-$(CONFIG_EBONY)	+= ebony.o
- obj-$(CONFIG_TAISHAN)	+= taishan.o
- obj-$(CONFIG_BAMBOO)	+= bamboo.o
-+obj-$(CONFIG_YOSEMITE)	+= bamboo.o
- obj-$(CONFIG_SEQUOIA)	+= sequoia.o
- obj-$(CONFIG_KATMAI)	+= katmai.o
- obj-$(CONFIG_RAINIER)	+= rainier.o
- obj-$(CONFIG_WARP)	+= warp.o
- obj-$(CONFIG_WARP)	+= warp-nand.o
-+obj-$(CONFIG_CANYONLANDS) += canyonlands.o
---- a/arch/powerpc/platforms/44x/bamboo.c
-+++ b/arch/powerpc/platforms/44x/bamboo.c
-@@ -22,8 +22,7 @@
- #include <asm/time.h>
- #include <asm/uic.h>
- #include <asm/pci-bridge.h>
--
--#include "44x.h"
-+#include <asm/ppc4xx.h>
- 
- static __initdata struct of_device_id bamboo_of_bus[] = {
- 	{ .compatible = "ibm,plb4", },
-@@ -53,11 +52,11 @@ static int __init bamboo_probe(void)
- }
- 
- define_machine(bamboo) {
--	.name 				= "Bamboo",
--	.probe 				= bamboo_probe,
--	.progress 			= udbg_progress,
--	.init_IRQ 			= uic_init_tree,
--	.get_irq 			= uic_get_irq,
--	.restart			= ppc44x_reset_system,
-+	.name 			= "Bamboo",
-+	.probe 			= bamboo_probe,
-+	.progress 		= udbg_progress,
-+	.init_IRQ 		= uic_init_tree,
-+	.get_irq 		= uic_get_irq,
-+	.restart		= ppc4xx_reset_system,
- 	.calibrate_decr 	= generic_calibrate_decr,
- };
---- /dev/null
-+++ b/arch/powerpc/platforms/44x/canyonlands.c
-@@ -0,0 +1,63 @@
-+/*
-+ * Canyonlands board specific routines
-+ *
-+ * Copyright 2008 DENX Software Engineering, Stefan Roese <sr@denx.de>
-+ *
-+ * Based on the Katmai code by
-+ * Benjamin Herrenschmidt <benh@kernel.crashing.org>
-+ * Copyright 2007 IBM Corp.
-+ * Josh Boyer <jwboyer@linux.vnet.ibm.com>
-+ * Copyright 2007 IBM Corporation
-+ *
-+ * 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/init.h>
-+#include <linux/of_platform.h>
-+
-+#include <asm/machdep.h>
-+#include <asm/prom.h>
-+#include <asm/udbg.h>
-+#include <asm/time.h>
-+#include <asm/uic.h>
-+#include <asm/pci-bridge.h>
-+#include <asm/ppc4xx.h>
-+
-+static __initdata struct of_device_id canyonlands_of_bus[] = {
-+	{ .compatible = "ibm,plb4", },
-+	{ .compatible = "ibm,opb", },
-+	{ .compatible = "ibm,ebc", },
-+	{},
-+};
-+
-+static int __init canyonlands_device_probe(void)
-+{
-+	of_platform_bus_probe(NULL, canyonlands_of_bus, NULL);
-+
-+	return 0;
-+}
-+machine_device_initcall(canyonlands, canyonlands_device_probe);
-+
-+static int __init canyonlands_probe(void)
-+{
-+	unsigned long root = of_get_flat_dt_root();
-+
-+	if (!of_flat_dt_is_compatible(root, "amcc,canyonlands"))
-+		return 0;
-+
-+	ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC;
-+
-+	return 1;
-+}
-+
-+define_machine(canyonlands) {
-+	.name 				= "Canyonlands",
-+	.probe 				= canyonlands_probe,
-+	.progress 			= udbg_progress,
-+	.init_IRQ 			= uic_init_tree,
-+	.get_irq 			= uic_get_irq,
-+	.restart			= ppc4xx_reset_system,
-+	.calibrate_decr			= generic_calibrate_decr,
-+};
---- a/arch/powerpc/platforms/44x/ebony.c
-+++ b/arch/powerpc/platforms/44x/ebony.c
-@@ -26,8 +26,7 @@
- #include <asm/time.h>
- #include <asm/uic.h>
- #include <asm/pci-bridge.h>
--
--#include "44x.h"
-+#include <asm/ppc4xx.h>
- 
- static __initdata struct of_device_id ebony_of_bus[] = {
- 	{ .compatible = "ibm,plb4", },
-@@ -66,6 +65,6 @@ define_machine(ebony) {
- 	.progress		= udbg_progress,
- 	.init_IRQ		= uic_init_tree,
- 	.get_irq		= uic_get_irq,
--	.restart		= ppc44x_reset_system,
-+	.restart		= ppc4xx_reset_system,
- 	.calibrate_decr		= generic_calibrate_decr,
- };
---- /dev/null
-+++ b/arch/powerpc/platforms/44x/idle.c
-@@ -0,0 +1,67 @@
-+/*
-+ * Copyright 2008 IBM Corp. 
-+ *
-+ * Based on arch/powerpc/platforms/pasemi/idle.c: 
-+ * Copyright (C) 2006-2007 PA Semi, Inc
-+ *
-+ * Added by: Jerone Young <jyoung5@us.ibm.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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-+ *
-+ */
-+
-+#include <linux/of.h>
-+#include <linux/kernel.h>
-+#include <asm/machdep.h>
-+
-+static int mode_spin;
-+
-+static void ppc44x_idle(void)
-+{
-+	unsigned long msr_save;
-+
-+	msr_save = mfmsr();
-+	/* set wait state MSR */
-+	mtmsr(msr_save|MSR_WE|MSR_EE|MSR_CE|MSR_DE);
-+	isync();
-+	/* return to initial state */
-+	mtmsr(msr_save);
-+	isync();
-+}
-+
-+int __init ppc44x_idle_init(void)
-+{
-+	if (!mode_spin) {
-+		/* If we are not setting spin mode 
-+                   then we set to wait mode */
-+		ppc_md.power_save = &ppc44x_idle;
-+	}
-+
-+	return 0;
-+}
-+
-+arch_initcall(ppc44x_idle_init);
-+
-+static int __init idle_param(char *p)
-+{ 
-+
-+	if (!strcmp("spin", p)) {
-+		mode_spin = 1;
-+		ppc_md.power_save = NULL;
-+	}
-+
-+	return 0;
-+}
-+
-+early_param("idle", idle_param);
---- a/arch/powerpc/platforms/44x/katmai.c
-+++ b/arch/powerpc/platforms/44x/katmai.c
-@@ -22,8 +22,7 @@
- #include <asm/time.h>
- #include <asm/uic.h>
- #include <asm/pci-bridge.h>
--
--#include "44x.h"
-+#include <asm/ppc4xx.h>
- 
- static __initdata struct of_device_id katmai_of_bus[] = {
- 	{ .compatible = "ibm,plb4", },
-@@ -58,6 +57,6 @@ define_machine(katmai) {
- 	.progress 			= udbg_progress,
- 	.init_IRQ 			= uic_init_tree,
- 	.get_irq 			= uic_get_irq,
--	.restart			= ppc44x_reset_system,
-+	.restart			= ppc4xx_reset_system,
- 	.calibrate_decr			= generic_calibrate_decr,
- };
---- a/arch/powerpc/platforms/44x/misc_44x.S
-+++ b/arch/powerpc/platforms/44x/misc_44x.S
-@@ -44,14 +44,3 @@ _GLOBAL(as1_writeb)
- 	sync
- 	isync
- 	blr
--
--/*
-- * void ppc44x_reset_system(char *cmd)
-- *
-- * At present, this routine just applies a system reset.
-- */
--_GLOBAL(ppc44x_reset_system)
--	mfspr	r13,SPRN_DBCR0
--	oris	r13,r13,DBCR0_RST_SYSTEM@h
--	mtspr	SPRN_DBCR0,r13
--	b	.			/* Just in case the reset doesn't work */
---- a/arch/powerpc/platforms/44x/rainier.c
-+++ b/arch/powerpc/platforms/44x/rainier.c
-@@ -22,7 +22,7 @@
- #include <asm/time.h>
- #include <asm/uic.h>
- #include <asm/pci-bridge.h>
--#include "44x.h"
-+#include <asm/ppc4xx.h>
- 
- static __initdata struct of_device_id rainier_of_bus[] = {
- 	{ .compatible = "ibm,plb4", },
-@@ -57,6 +57,6 @@ define_machine(rainier) {
- 	.progress 			= udbg_progress,
- 	.init_IRQ 			= uic_init_tree,
- 	.get_irq 			= uic_get_irq,
--	.restart			= ppc44x_reset_system,
-+	.restart			= ppc4xx_reset_system,
- 	.calibrate_decr			= generic_calibrate_decr,
- };
---- a/arch/powerpc/platforms/44x/sequoia.c
-+++ b/arch/powerpc/platforms/44x/sequoia.c
-@@ -23,7 +23,7 @@
- #include <asm/uic.h>
- #include <asm/pci-bridge.h>
- 
--#include "44x.h"
-+#include <asm/ppc4xx.h>
- 
- static __initdata struct of_device_id sequoia_of_bus[] = {
- 	{ .compatible = "ibm,plb4", },
-@@ -58,6 +58,6 @@ define_machine(sequoia) {
- 	.progress 			= udbg_progress,
- 	.init_IRQ 			= uic_init_tree,
- 	.get_irq 			= uic_get_irq,
--	.restart			= ppc44x_reset_system,
-+	.restart			= ppc4xx_reset_system,
- 	.calibrate_decr			= generic_calibrate_decr,
- };
---- a/arch/powerpc/platforms/44x/taishan.c
-+++ b/arch/powerpc/platforms/44x/taishan.c
-@@ -29,8 +29,7 @@
- #include <asm/time.h>
- #include <asm/uic.h>
- #include <asm/pci-bridge.h>
--
--#include "44x.h"
-+#include <asm/ppc4xx.h>
- 
- static __initdata struct of_device_id taishan_of_bus[] = {
- 	{ .compatible = "ibm,plb4", },
-@@ -68,6 +67,6 @@ define_machine(taishan) {
- 	.progress		= udbg_progress,
- 	.init_IRQ		= uic_init_tree,
- 	.get_irq		= uic_get_irq,
--	.restart		= ppc44x_reset_system,
-+	.restart		= ppc4xx_reset_system,
- 	.calibrate_decr		= generic_calibrate_decr,
- };
---- a/arch/powerpc/platforms/44x/warp-nand.c
-+++ b/arch/powerpc/platforms/44x/warp-nand.c
-@@ -11,6 +11,7 @@
- #include <linux/mtd/partitions.h>
- #include <linux/mtd/nand.h>
- #include <linux/mtd/ndfc.h>
-+#include <asm/machdep.h>
- 
- #ifdef CONFIG_MTD_NAND_NDFC
- 
-@@ -100,6 +101,6 @@ static int warp_setup_nand_flash(void)
- 
- 	return 0;
- }
--device_initcall(warp_setup_nand_flash);
-+machine_device_initcall(warp, warp_setup_nand_flash);
- 
- #endif
---- a/arch/powerpc/platforms/44x/warp.c
-+++ b/arch/powerpc/platforms/44x/warp.c
-@@ -18,9 +18,7 @@
- #include <asm/udbg.h>
- #include <asm/time.h>
- #include <asm/uic.h>
--
--#include "44x.h"
--
-+#include <asm/ppc4xx.h>
- 
- static __initdata struct of_device_id warp_of_bus[] = {
- 	{ .compatible = "ibm,plb4", },
-@@ -49,7 +47,7 @@ define_machine(warp) {
- 	.progress 	= udbg_progress,
- 	.init_IRQ 	= uic_init_tree,
- 	.get_irq 	= uic_get_irq,
--	.restart	= ppc44x_reset_system,
-+	.restart	= ppc4xx_reset_system,
- 	.calibrate_decr = generic_calibrate_decr,
- };
- 
---- a/arch/powerpc/platforms/52xx/lite5200.c
-+++ b/arch/powerpc/platforms/52xx/lite5200.c
-@@ -63,7 +63,7 @@ lite5200_fix_clock_config(void)
- 	of_node_put(np);
- 	if (!cdm) {
- 		printk(KERN_ERR "%s() failed; expect abnormal behaviour\n",
--		       __FUNCTION__);
-+		       __func__);
- 		return;
- 	}
- 
-@@ -98,7 +98,7 @@ lite5200_fix_port_config(void)
- 	of_node_put(np);
- 	if (!gpio) {
- 		printk(KERN_ERR "%s() failed. expect abnormal behavior\n",
--		       __FUNCTION__);
-+		       __func__);
- 		return;
- 	}
- 
---- a/arch/powerpc/platforms/82xx/Kconfig
-+++ b/arch/powerpc/platforms/82xx/Kconfig
-@@ -11,7 +11,6 @@ config MPC8272_ADS
- 	select 8260
- 	select FSL_SOC
- 	select PQ2_ADS_PCI_PIC if PCI
--	select PPC_CPM_NEW_BINDING
- 	help
- 	  This option enables support for the MPC8272 ADS board
- 
-@@ -22,7 +21,6 @@ config PQ2FADS
- 	select 8260
- 	select FSL_SOC
- 	select PQ2_ADS_PCI_PIC if PCI
--	select PPC_CPM_NEW_BINDING
- 	help
- 	  This option enables support for the PQ2FADS board
- 
-@@ -31,7 +29,6 @@ config EP8248E
- 	select 8272
- 	select 8260
- 	select FSL_SOC
--	select PPC_CPM_NEW_BINDING
- 	select MDIO_BITBANG
- 	help
- 	  This enables support for the Embedded Planet EP8248E board.
---- a/arch/powerpc/platforms/83xx/mpc837x_rdb.c
-+++ b/arch/powerpc/platforms/83xx/mpc837x_rdb.c
-@@ -46,6 +46,7 @@ static void __init mpc837x_rdb_setup_arc
- static struct of_device_id mpc837x_ids[] = {
- 	{ .type = "soc", },
- 	{ .compatible = "soc", },
-+	{ .compatible = "simple-bus", },
- 	{},
- };
- 
---- a/arch/powerpc/platforms/83xx/mpc83xx.h
-+++ b/arch/powerpc/platforms/83xx/mpc83xx.h
-@@ -16,6 +16,7 @@
- #define MPC83XX_SCCR_USB_DRCM_10   0x00200000
- #define MPC8315_SCCR_USB_MASK      0x00c00000
- #define MPC8315_SCCR_USB_DRCM_11   0x00c00000
-+#define MPC8315_SCCR_USB_DRCM_01   0x00400000
- #define MPC837X_SCCR_USB_DRCM_11   0x00c00000
- 
- /* system i/o configuration register low */
-@@ -37,6 +38,7 @@
- /* USB Control Register */
- #define FSL_USB2_CONTROL_OFFS      0x500
- #define CONTROL_UTMI_PHY_EN        0x00000200
-+#define CONTROL_REFSEL_24MHZ       0x00000040
- #define CONTROL_REFSEL_48MHZ       0x00000080
- #define CONTROL_PHY_CLK_SEL_ULPI   0x00000400
- #define CONTROL_OTG_PORT           0x00000020
---- a/arch/powerpc/platforms/83xx/usb.c
-+++ b/arch/powerpc/platforms/83xx/usb.c
-@@ -129,7 +129,7 @@ int mpc831x_usb_cfg(void)
- 	if (immr_node && of_device_is_compatible(immr_node, "fsl,mpc8315-immr"))
- 		clrsetbits_be32(immap + MPC83XX_SCCR_OFFS,
- 		                MPC8315_SCCR_USB_MASK,
--		                MPC8315_SCCR_USB_DRCM_11);
-+		                MPC8315_SCCR_USB_DRCM_01);
- 	else
- 		clrsetbits_be32(immap + MPC83XX_SCCR_OFFS,
- 		                MPC83XX_SCCR_USB_MASK,
-@@ -164,9 +164,15 @@ int mpc831x_usb_cfg(void)
- 	/* Using on-chip PHY */
- 	if (prop && (!strcmp(prop, "utmi_wide") ||
- 		     !strcmp(prop, "utmi"))) {
--		/* Set UTMI_PHY_EN, REFSEL to 48MHZ */
-+		u32 refsel;
-+
-+		if (of_device_is_compatible(immr_node, "fsl,mpc8315-immr"))
-+			refsel = CONTROL_REFSEL_24MHZ;
-+		else
-+			refsel = CONTROL_REFSEL_48MHZ;
-+		/* Set UTMI_PHY_EN and REFSEL */
- 		out_be32(usb_regs + FSL_USB2_CONTROL_OFFS,
--				CONTROL_UTMI_PHY_EN | CONTROL_REFSEL_48MHZ);
-+				CONTROL_UTMI_PHY_EN | refsel);
- 	/* Using external UPLI PHY */
- 	} else if (prop && !strcmp(prop, "ulpi")) {
- 		/* Set PHY_CLK_SEL to ULPI */
---- a/arch/powerpc/platforms/85xx/Kconfig
-+++ b/arch/powerpc/platforms/85xx/Kconfig
-@@ -19,7 +19,6 @@ config MPC8540_ADS
- config MPC8560_ADS
- 	bool "Freescale MPC8560 ADS"
- 	select DEFAULT_UIMAGE
--	select PPC_CPM_NEW_BINDING
- 	select CPM2
- 	help
- 	  This option enables support for the MPC 8560 ADS board
-@@ -46,6 +45,12 @@ config MPC85xx_DS
- 	help
- 	  This option enables support for the MPC85xx DS (MPC8544 DS) board
- 
-+config KSI8560
-+        bool "Emerson KSI8560"
-+        select DEFAULT_UIMAGE
-+        help
-+          This option enables support for the Emerson KSI8560 board
-+
- config STX_GP3
- 	bool "Silicon Turnkey Express GP3"
- 	help
-@@ -53,14 +58,12 @@ config STX_GP3
- 	  board.
- 	select CPM2
- 	select DEFAULT_UIMAGE
--	select PPC_CPM_NEW_BINDING
- 
- config TQM8540
- 	bool "TQ Components TQM8540"
- 	help
- 	  This option enables support for the TQ Components TQM8540 board.
- 	select DEFAULT_UIMAGE
--	select PPC_CPM_NEW_BINDING
- 	select TQM85xx
- 
- config TQM8541
-@@ -68,7 +71,6 @@ config TQM8541
- 	help
- 	  This option enables support for the TQ Components TQM8541 board.
- 	select DEFAULT_UIMAGE
--	select PPC_CPM_NEW_BINDING
- 	select TQM85xx
- 	select CPM2
- 
-@@ -77,7 +79,6 @@ config TQM8555
- 	help
- 	  This option enables support for the TQ Components TQM8555 board.
- 	select DEFAULT_UIMAGE
--	select PPC_CPM_NEW_BINDING
- 	select TQM85xx
- 	select CPM2
- 
-@@ -86,7 +87,6 @@ config TQM8560
- 	help
- 	  This option enables support for the TQ Components TQM8560 board.
- 	select DEFAULT_UIMAGE
--	select PPC_CPM_NEW_BINDING
- 	select TQM85xx
- 	select CPM2
- 
-@@ -99,7 +99,6 @@ config SBC8548
- config SBC8560
- 	bool "Wind River SBC8560"
- 	select DEFAULT_UIMAGE
--	select PPC_CPM_NEW_BINDING if CPM2
- 	help
- 	  This option enables support for the Wind River SBC8560 board
- 
---- a/arch/powerpc/platforms/85xx/Makefile
-+++ b/arch/powerpc/platforms/85xx/Makefile
-@@ -10,3 +10,4 @@ obj-$(CONFIG_STX_GP3)	  += stx_gp3.o
- obj-$(CONFIG_TQM85xx)	  += tqm85xx.o
- obj-$(CONFIG_SBC8560)     += sbc8560.o
- obj-$(CONFIG_SBC8548)     += sbc8548.o
-+obj-$(CONFIG_KSI8560)	  += ksi8560.o
---- /dev/null
-+++ b/arch/powerpc/platforms/85xx/ksi8560.c
-@@ -0,0 +1,257 @@
-+/*
-+ * Board setup routines for the Emerson KSI8560
-+ *
-+ * Author: Alexandr Smirnov <asmirnov@ru.mvista.com>
-+ *
-+ * Based on mpc85xx_ads.c maintained by Kumar Gala
-+ *
-+ * 2008 (c) MontaVista, Software, Inc.  This file is licensed under
-+ * the terms of the GNU General Public License version 2.  This program
-+ * is licensed "as is" without any warranty of any kind, whether express
-+ * or implied.
-+ *
-+ */
-+
-+#include <linux/stddef.h>
-+#include <linux/kernel.h>
-+#include <linux/pci.h>
-+#include <linux/kdev_t.h>
-+#include <linux/delay.h>
-+#include <linux/seq_file.h>
-+#include <linux/of_platform.h>
-+
-+#include <asm/system.h>
-+#include <asm/time.h>
-+#include <asm/machdep.h>
-+#include <asm/pci-bridge.h>
-+#include <asm/mpic.h>
-+#include <mm/mmu_decl.h>
-+#include <asm/udbg.h>
-+#include <asm/prom.h>
-+
-+#include <sysdev/fsl_soc.h>
-+#include <sysdev/fsl_pci.h>
-+
-+#include <asm/cpm2.h>
-+#include <sysdev/cpm2_pic.h>
-+
-+
-+#define KSI8560_CPLD_HVR		0x04 /* Hardware Version Register */
-+#define KSI8560_CPLD_PVR		0x08 /* PLD Version Register */
-+#define KSI8560_CPLD_RCR1		0x30 /* Reset Command Register 1 */
-+
-+#define KSI8560_CPLD_RCR1_CPUHR		0x80 /* CPU Hard Reset */
-+
-+static void __iomem *cpld_base = NULL;
-+
-+static void machine_restart(char *cmd)
-+{
-+	if (cpld_base)
-+		out_8(cpld_base + KSI8560_CPLD_RCR1, KSI8560_CPLD_RCR1_CPUHR);
-+	else
-+		printk(KERN_ERR "Can't find CPLD base, hang forever\n");
-+
-+	for (;;);
-+}
-+
-+static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)
-+{
-+	int cascade_irq;
-+
-+	while ((cascade_irq = cpm2_get_irq()) >= 0)
-+		generic_handle_irq(cascade_irq);
-+
-+	desc->chip->eoi(irq);
-+}
-+
-+static void __init ksi8560_pic_init(void)
-+{
-+	struct mpic *mpic;
-+	struct resource r;
-+	struct device_node *np;
-+#ifdef CONFIG_CPM2
-+	int irq;
-+#endif
-+
-+	np = of_find_node_by_type(NULL, "open-pic");
-+
-+	if (np == NULL) {
-+		printk(KERN_ERR "Could not find open-pic node\n");
-+		return;
-+	}
-+
-+	if (of_address_to_resource(np, 0, &r)) {
-+		printk(KERN_ERR "Could not map mpic register space\n");
-+		of_node_put(np);
-+		return;
-+	}
-+
-+	mpic = mpic_alloc(np, r.start,
-+			MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
-+			0, 256, " OpenPIC  ");
-+	BUG_ON(mpic == NULL);
-+	of_node_put(np);
-+
-+	mpic_init(mpic);
-+
-+#ifdef CONFIG_CPM2
-+	/* Setup CPM2 PIC */
-+	np = of_find_compatible_node(NULL, NULL, "fsl,cpm2-pic");
-+	if (np == NULL) {
-+		printk(KERN_ERR "PIC init: can not find fsl,cpm2-pic node\n");
-+		return;
-+	}
-+	irq = irq_of_parse_and_map(np, 0);
-+
-+	cpm2_pic_init(np);
-+	of_node_put(np);
-+	set_irq_chained_handler(irq, cpm2_cascade);
-+
-+	setup_irq(0, NULL);
-+#endif
-+}
-+
-+#ifdef CONFIG_CPM2
-+/*
-+ * Setup I/O ports
-+ */
-+struct cpm_pin {
-+	int port, pin, flags;
-+};
-+
-+static struct cpm_pin __initdata ksi8560_pins[] = {
-+	/* SCC1 */
-+	{3, 29, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
-+	{3, 30, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
-+	{3, 31, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
-+
-+	/* SCC2 */
-+	{3, 26, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
-+	{3, 27, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
-+	{3, 28, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
-+
-+	/* FCC1 */
-+	{0, 14, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
-+	{0, 15, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
-+	{0, 16, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
-+	{0, 17, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
-+	{0, 18, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
-+	{0, 19, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
-+	{0, 20, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
-+	{0, 21, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
-+	{0, 26, CPM_PIN_INPUT | CPM_PIN_SECONDARY},
-+	{0, 27, CPM_PIN_INPUT | CPM_PIN_SECONDARY},
-+	{0, 28, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
-+	{0, 29, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
-+	{0, 30, CPM_PIN_INPUT | CPM_PIN_SECONDARY},
-+	{0, 31, CPM_PIN_INPUT | CPM_PIN_SECONDARY},
-+	{2, 23, CPM_PIN_INPUT | CPM_PIN_PRIMARY}, /* CLK9 */
-+	{2, 22, CPM_PIN_INPUT | CPM_PIN_PRIMARY}, /* CLK10 */
-+
-+};
-+
-+static void __init init_ioports(void)
-+{
-+	int i;
-+
-+	for (i = 0; i < ARRAY_SIZE(ksi8560_pins); i++) {
-+		struct cpm_pin *pin = &ksi8560_pins[i];
-+		cpm2_set_pin(pin->port, pin->pin, pin->flags);
-+	}
-+
-+	cpm2_clk_setup(CPM_CLK_SCC1, CPM_BRG1, CPM_CLK_RX);
-+	cpm2_clk_setup(CPM_CLK_SCC1, CPM_BRG1, CPM_CLK_TX);
-+	cpm2_clk_setup(CPM_CLK_SCC2, CPM_BRG2, CPM_CLK_RX);
-+	cpm2_clk_setup(CPM_CLK_SCC2, CPM_BRG2, CPM_CLK_TX);
-+	cpm2_clk_setup(CPM_CLK_FCC1, CPM_CLK9, CPM_CLK_RX);
-+	cpm2_clk_setup(CPM_CLK_FCC1, CPM_CLK10, CPM_CLK_TX);
-+}
-+#endif
-+
-+/*
-+ * Setup the architecture
-+ */
-+static void __init ksi8560_setup_arch(void)
-+{
-+	struct device_node *cpld;
-+
-+	cpld = of_find_compatible_node(NULL, NULL, "emerson,KSI8560-cpld");
-+	if (cpld)
-+		cpld_base = of_iomap(cpld, 0);
-+	else
-+		printk(KERN_ERR "Can't find CPLD in device tree\n");
-+
-+	if (ppc_md.progress)
-+		ppc_md.progress("ksi8560_setup_arch()", 0);
-+
-+#ifdef CONFIG_CPM2
-+	cpm2_reset();
-+	init_ioports();
-+#endif
-+}
-+
-+static void ksi8560_show_cpuinfo(struct seq_file *m)
-+{
-+	uint pvid, svid, phid1;
-+	uint memsize = total_memory;
-+
-+	pvid = mfspr(SPRN_PVR);
-+	svid = mfspr(SPRN_SVR);
-+
-+	seq_printf(m, "Vendor\t\t: Emerson Network Power\n");
-+	seq_printf(m, "Board\t\t: KSI8560\n");
-+
-+	if (cpld_base) {
-+		seq_printf(m, "Hardware rev\t: %d\n",
-+					in_8(cpld_base + KSI8560_CPLD_HVR));
-+		seq_printf(m, "CPLD rev\t: %d\n",
-+					in_8(cpld_base + KSI8560_CPLD_PVR));
-+	} else
-+		seq_printf(m, "Unknown Hardware and CPLD revs\n");
-+
-+	seq_printf(m, "PVR\t\t: 0x%x\n", pvid);
-+	seq_printf(m, "SVR\t\t: 0x%x\n", svid);
-+
-+	/* Display cpu Pll setting */
-+	phid1 = mfspr(SPRN_HID1);
-+	seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f));
-+
-+	/* Display the amount of memory */
-+	seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
-+}
-+
-+static struct of_device_id __initdata of_bus_ids[] = {
-+	{ .type = "soc", },
-+	{ .name = "cpm", },
-+	{ .name = "localbus", },
-+	{},
-+};
-+
-+static int __init declare_of_platform_devices(void)
-+{
-+	of_platform_bus_probe(NULL, of_bus_ids, NULL);
-+
-+	return 0;
-+}
-+machine_device_initcall(ksi8560, declare_of_platform_devices);
-+
-+/*
-+ * Called very early, device-tree isn't unflattened
-+ */
-+static int __init ksi8560_probe(void)
-+{
-+	unsigned long root = of_get_flat_dt_root();
-+
-+	return of_flat_dt_is_compatible(root, "emerson,KSI8560");
-+}
-+
-+define_machine(ksi8560) {
-+	.name			= "KSI8560",
-+	.probe			= ksi8560_probe,
-+	.setup_arch		= ksi8560_setup_arch,
-+	.init_IRQ		= ksi8560_pic_init,
-+	.show_cpuinfo		= ksi8560_show_cpuinfo,
-+	.get_irq		= mpic_get_irq,
-+	.restart		= machine_restart,
-+	.calibrate_decr		= generic_calibrate_decr,
-+};
---- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c
-+++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
-@@ -165,7 +165,7 @@ static void __init init_ioports(void)
- 	int i;
- 
- 	for (i = 0; i < ARRAY_SIZE(mpc8560_ads_pins); i++) {
--		struct cpm_pin *pin = &mpc8560_ads_pins[i];
-+		const struct cpm_pin *pin = &mpc8560_ads_pins[i];
- 		cpm2_set_pin(pin->port, pin->pin, pin->flags);
- 	}
- 
---- a/arch/powerpc/platforms/85xx/mpc85xx_ds.c
-+++ b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
-@@ -19,6 +19,7 @@
- #include <linux/delay.h>
- #include <linux/seq_file.h>
- #include <linux/interrupt.h>
-+#include <linux/of_platform.h>
- 
- #include <asm/system.h>
- #include <asm/time.h>
-@@ -36,7 +37,7 @@
- #undef DEBUG
- 
- #ifdef DEBUG
--#define DBG(fmt, args...) printk(KERN_ERR "%s: " fmt, __FUNCTION__, ## args)
-+#define DBG(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args)
- #else
- #define DBG(fmt, args...)
- #endif
-@@ -183,6 +184,18 @@ static int __init mpc8544_ds_probe(void)
- 	}
- }
- 
-+static struct of_device_id mpc85xxds_ids[] = {
-+	{ .type = "soc", },
-+	{ .compatible = "soc", },
-+	{},
-+};
-+
-+static int __init mpc85xxds_publish_devices(void)
-+{
-+	return of_platform_bus_probe(NULL, mpc85xxds_ids, NULL);
-+}
-+machine_device_initcall(mpc8544_ds, mpc85xxds_publish_devices);
-+
- /*
-  * Called very early, device-tree isn't unflattened
-  */
---- a/arch/powerpc/platforms/86xx/Kconfig
-+++ b/arch/powerpc/platforms/86xx/Kconfig
-@@ -11,6 +11,12 @@ config MPC8641_HPCN
- 	help
- 	  This option enables support for the MPC8641 HPCN board.
- 
-+config SBC8641D
-+	bool "Wind River SBC8641D"
-+	select DEFAULT_UIMAGE
-+	help
-+	  This option enables support for the WRS SBC8641D board.
-+
- config MPC8610_HPCD
- 	bool "Freescale MPC8610 HPCD"
- 	select DEFAULT_UIMAGE
-@@ -24,7 +30,7 @@ config MPC8641
- 	select FSL_PCI if PCI
- 	select PPC_UDBG_16550
- 	select MPIC
--	default y if MPC8641_HPCN
-+	default y if MPC8641_HPCN || SBC8641D
- 
- config MPC8610
- 	bool
---- a/arch/powerpc/platforms/86xx/Makefile
-+++ b/arch/powerpc/platforms/86xx/Makefile
-@@ -4,4 +4,5 @@
- 
- obj-$(CONFIG_SMP)		+= mpc86xx_smp.o
- obj-$(CONFIG_MPC8641_HPCN)	+= mpc86xx_hpcn.o
-+obj-$(CONFIG_SBC8641D)		+= sbc8641d.o
- obj-$(CONFIG_MPC8610_HPCD)	+= mpc8610_hpcd.o
---- a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
-+++ b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
-@@ -52,7 +52,7 @@ static int __init mpc8610_declare_of_pla
- }
- machine_device_initcall(mpc86xx_hpcd, mpc8610_declare_of_platform_devices);
- 
--void __init
-+static void __init
- mpc86xx_hpcd_init_irq(void)
- {
- 	struct mpic *mpic1;
-@@ -200,7 +200,7 @@ static int __init mpc86xx_hpcd_probe(voi
- 	return 0;
- }
- 
--long __init
-+static long __init
- mpc86xx_time_init(void)
- {
- 	unsigned int temp;
---- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
-+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
-@@ -55,7 +55,7 @@ static void mpc86xx_8259_cascade(unsigne
- }
- #endif	/* CONFIG_PCI */
- 
--void __init
-+static void __init
- mpc86xx_hpcn_init_irq(void)
- {
- 	struct mpic *mpic1;
-@@ -162,7 +162,7 @@ mpc86xx_hpcn_setup_arch(void)
- }
- 
- 
--void
-+static void
- mpc86xx_hpcn_show_cpuinfo(struct seq_file *m)
- {
- 	struct device_node *root;
-@@ -190,13 +190,19 @@ static int __init mpc86xx_hpcn_probe(voi
- {
- 	unsigned long root = of_get_flat_dt_root();
- 
--	if (of_flat_dt_is_compatible(root, "mpc86xx"))
-+	if (of_flat_dt_is_compatible(root, "fsl,mpc8641hpcn"))
- 		return 1;	/* Looks good */
- 
-+	/* Be nice and don't give silent boot death.  Delete this in 2.6.27 */
-+	if (of_flat_dt_is_compatible(root, "mpc86xx")) {
-+		pr_warning("WARNING: your dts/dtb is old. You must update before the next kernel release\n");
-+		return 1;
-+	}
-+
- 	return 0;
- }
- 
--long __init
-+static long __init
- mpc86xx_time_init(void)
- {
- 	unsigned int temp;
---- /dev/null
-+++ b/arch/powerpc/platforms/86xx/sbc8641d.c
-@@ -0,0 +1,164 @@
-+/*
-+ * SBC8641D board specific routines
-+ *
-+ * Copyright 2008 Wind River Systems Inc.
-+ *
-+ * By Paul Gortmaker (see MAINTAINERS for contact information)
-+ *
-+ * Based largely on the 8641 HPCN support by Freescale Semiconductor Inc.
-+ *
-+ * 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/stddef.h>
-+#include <linux/kernel.h>
-+#include <linux/pci.h>
-+#include <linux/kdev_t.h>
-+#include <linux/delay.h>
-+#include <linux/seq_file.h>
-+#include <linux/of_platform.h>
-+
-+#include <asm/system.h>
-+#include <asm/time.h>
-+#include <asm/machdep.h>
-+#include <asm/pci-bridge.h>
-+#include <asm/mpc86xx.h>
-+#include <asm/prom.h>
-+#include <mm/mmu_decl.h>
-+#include <asm/udbg.h>
-+
-+#include <asm/mpic.h>
-+
-+#include <sysdev/fsl_pci.h>
-+#include <sysdev/fsl_soc.h>
-+
-+#include "mpc86xx.h"
-+
-+static void __init
-+sbc8641_init_irq(void)
-+{
-+	struct mpic *mpic1;
-+	struct device_node *np;
-+	struct resource res;
-+
-+	/* Determine PIC address. */
-+	np = of_find_node_by_type(NULL, "open-pic");
-+	if (np == NULL)
-+		return;
-+	of_address_to_resource(np, 0, &res);
-+
-+	/* Alloc mpic structure and per isu has 16 INT entries. */
-+	mpic1 = mpic_alloc(np, res.start,
-+			MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
-+			0, 256, " MPIC     ");
-+	of_node_put(np);
-+	BUG_ON(mpic1 == NULL);
-+
-+	mpic_init(mpic1);
-+}
-+
-+static void __init
-+sbc8641_setup_arch(void)
-+{
-+#ifdef CONFIG_PCI
-+	struct device_node *np;
-+#endif
-+
-+	if (ppc_md.progress)
-+		ppc_md.progress("sbc8641_setup_arch()", 0);
-+
-+#ifdef CONFIG_PCI
-+	for_each_compatible_node(np, "pci", "fsl,mpc8641-pcie")
-+		fsl_add_bridge(np, 0);
-+#endif
-+
-+	printk("SBC8641 board from Wind River\n");
-+
-+#ifdef CONFIG_SMP
-+	mpc86xx_smp_init();
-+#endif
-+}
-+
-+
-+static void
-+sbc8641_show_cpuinfo(struct seq_file *m)
-+{
-+	struct device_node *root;
-+	uint memsize = total_memory;
-+	const char *model = "";
-+	uint svid = mfspr(SPRN_SVR);
-+
-+	seq_printf(m, "Vendor\t\t: Wind River Systems\n");
-+
-+	root = of_find_node_by_path("/");
-+	if (root)
-+		model = of_get_property(root, "model", NULL);
-+	seq_printf(m, "Machine\t\t: %s\n", model);
-+	of_node_put(root);
-+
-+	seq_printf(m, "SVR\t\t: 0x%x\n", svid);
-+	seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
-+}
-+
-+
-+/*
-+ * Called very early, device-tree isn't unflattened
-+ */
-+static int __init sbc8641_probe(void)
-+{
-+	unsigned long root = of_get_flat_dt_root();
-+
-+	if (of_flat_dt_is_compatible(root, "wind,sbc8641"))
-+		return 1;	/* Looks good */
-+
-+	return 0;
-+}
-+
-+static long __init
-+mpc86xx_time_init(void)
-+{
-+	unsigned int temp;
-+
-+	/* Set the time base to zero */
-+	mtspr(SPRN_TBWL, 0);
-+	mtspr(SPRN_TBWU, 0);
-+
-+	temp = mfspr(SPRN_HID0);
-+	temp |= HID0_TBEN;
-+	mtspr(SPRN_HID0, temp);
-+	asm volatile("isync");
-+
-+	return 0;
-+}
-+
-+static __initdata struct of_device_id of_bus_ids[] = {
-+	{ .compatible = "simple-bus", },
-+	{},
-+};
-+
-+static int __init declare_of_platform_devices(void)
-+{
-+	of_platform_bus_probe(NULL, of_bus_ids, NULL);
-+
-+	return 0;
-+}
-+machine_device_initcall(sbc8641, declare_of_platform_devices);
-+
-+define_machine(sbc8641) {
-+	.name			= "SBC8641D",
-+	.probe			= sbc8641_probe,
-+	.setup_arch		= sbc8641_setup_arch,
-+	.init_IRQ		= sbc8641_init_irq,
-+	.show_cpuinfo		= sbc8641_show_cpuinfo,
-+	.get_irq		= mpic_get_irq,
-+	.restart		= fsl_rstcr_restart,
-+	.time_init		= mpc86xx_time_init,
-+	.calibrate_decr		= generic_calibrate_decr,
-+	.progress		= udbg_progress,
-+#ifdef CONFIG_PCI
-+	.pcibios_fixup_bus	= fsl_pcibios_fixup_bus,
-+#endif
-+};
---- a/arch/powerpc/platforms/8xx/Kconfig
-+++ b/arch/powerpc/platforms/8xx/Kconfig
-@@ -18,7 +18,6 @@ config MPC8XXFADS
- config MPC86XADS
- 	bool "MPC86XADS"
- 	select CPM1
--	select PPC_CPM_NEW_BINDING
- 	help
- 	  MPC86x Application Development System by Freescale Semiconductor.
- 	  The MPC86xADS is meant to serve as a platform for s/w and h/w
-@@ -27,7 +26,6 @@ config MPC86XADS
- config MPC885ADS
- 	bool "MPC885ADS"
- 	select CPM1
--	select PPC_CPM_NEW_BINDING
- 	help
- 	  Freescale Semiconductor MPC885 Application Development System (ADS).
- 	  Also known as DUET.
-@@ -37,7 +35,6 @@ config MPC885ADS
- config PPC_EP88XC
- 	bool "Embedded Planet EP88xC (a.k.a. CWH-PPC-885XN-VE)"
- 	select CPM1
--	select PPC_CPM_NEW_BINDING
- 	help
- 	  This enables support for the Embedded Planet EP88xC board.
- 
-@@ -47,7 +44,6 @@ config PPC_EP88XC
- config PPC_ADDER875
- 	bool "Analogue & Micro Adder 875"
- 	select CPM1
--	select PPC_CPM_NEW_BINDING
- 	select REDBOOT
- 	help
- 	  This enables support for the Analogue & Micro Adder 875
---- a/arch/powerpc/platforms/8xx/m8xx_setup.c
-+++ b/arch/powerpc/platforms/8xx/m8xx_setup.c
-@@ -111,17 +111,12 @@ void __init mpc8xx_calibrate_decr(void)
- 
- 	/* Processor frequency is MHz.
- 	 */
--	ppc_tb_freq = 50000000;
--	if (!get_freq("bus-frequency", &ppc_tb_freq)) {
--		printk(KERN_ERR "WARNING: Estimating decrementer frequency "
--		                "(not found)\n");
--	}
--	ppc_tb_freq /= 16;
- 	ppc_proc_freq = 50000000;
- 	if (!get_freq("clock-frequency", &ppc_proc_freq))
- 		printk(KERN_ERR "WARNING: Estimating processor frequency "
- 		                "(not found)\n");
- 
-+	ppc_tb_freq = ppc_proc_freq / 16;
- 	printk("Decrementer Frequency = 0x%lx\n", ppc_tb_freq);
- 
- 	/* Perform some more timer/timebase initialization.  This used
---- a/arch/powerpc/platforms/Kconfig
-+++ b/arch/powerpc/platforms/Kconfig
-@@ -290,13 +290,7 @@ config CPM2
- config PPC_CPM_NEW_BINDING
- 	bool
- 	depends on CPM1 || CPM2
--	help
--	  Select this if your board has been converted to use the new
--	  device tree bindings for CPM, and no longer needs the
--	  ioport callbacks or the platform device glue code.
--
--	  The fs_enet and cpm_uart drivers will be built as
--	  of_platform devices.
-+	default y
- 
- config AXON_RAM
- 	tristate "Axon DDR2 memory device driver"
---- a/arch/powerpc/platforms/Kconfig.cputype
-+++ b/arch/powerpc/platforms/Kconfig.cputype
-@@ -41,11 +41,13 @@ config 40x
- 	bool "AMCC 40x"
- 	select PPC_DCR_NATIVE
- 	select PPC_UDBG_16550
-+	select 4xx_SOC
- 
- config 44x
- 	bool "AMCC 44x"
- 	select PPC_DCR_NATIVE
- 	select PPC_UDBG_16550
-+	select 4xx_SOC
- 
- config E200
- 	bool "Freescale e200"
---- a/arch/powerpc/platforms/cell/iommu.c
-+++ b/arch/powerpc/platforms/cell/iommu.c
-@@ -28,13 +28,13 @@
- #include <linux/notifier.h>
- #include <linux/of.h>
- #include <linux/of_platform.h>
-+#include <linux/lmb.h>
- 
- #include <asm/prom.h>
- #include <asm/iommu.h>
- #include <asm/machdep.h>
- #include <asm/pci-bridge.h>
- #include <asm/udbg.h>
--#include <asm/lmb.h>
- #include <asm/firmware.h>
- #include <asm/cell-regs.h>
- 
-@@ -316,7 +316,7 @@ static void cell_iommu_setup_stab(struct
- 	segments = max(dbase + dsize, fbase + fsize) >> IO_SEGMENT_SHIFT;
- 
- 	pr_debug("%s: iommu[%d]: segments: %lu\n",
--			__FUNCTION__, iommu->nid, segments);
-+			__func__, iommu->nid, segments);
- 
- 	/* set up the segment table */
- 	stab_size = segments * sizeof(unsigned long);
-@@ -343,7 +343,7 @@ static unsigned long *cell_iommu_alloc_p
- 				(1 << 12) / sizeof(unsigned long));
- 
- 	ptab_size = segments * pages_per_segment * sizeof(unsigned long);
--	pr_debug("%s: iommu[%d]: ptab_size: %lu, order: %d\n", __FUNCTION__,
-+	pr_debug("%s: iommu[%d]: ptab_size: %lu, order: %d\n", __func__,
- 			iommu->nid, ptab_size, get_order(ptab_size));
- 	page = alloc_pages_node(iommu->nid, GFP_KERNEL, get_order(ptab_size));
- 	BUG_ON(!page);
-@@ -355,7 +355,7 @@ static unsigned long *cell_iommu_alloc_p
- 	n_pte_pages = (pages_per_segment * sizeof(unsigned long)) >> 12;
- 
- 	pr_debug("%s: iommu[%d]: stab at %p, ptab at %p, n_pte_pages: %lu\n",
--			__FUNCTION__, iommu->nid, iommu->stab, ptab,
-+			__func__, iommu->nid, iommu->stab, ptab,
- 			n_pte_pages);
- 
- 	/* initialise the STEs */
-@@ -394,7 +394,7 @@ static void cell_iommu_enable_hardware(s
- 
- 	if (cell_iommu_find_ioc(iommu->nid, &xlate_base))
- 		panic("%s: missing IOC register mappings for node %d\n",
--		      __FUNCTION__, iommu->nid);
-+		      __func__, iommu->nid);
- 
- 	iommu->xlate_regs = ioremap(xlate_base, IOC_Reg_Size);
- 	iommu->cmd_regs = iommu->xlate_regs + IOC_IOCmd_Offset;
---- a/arch/powerpc/platforms/cell/pervasive.c
-+++ b/arch/powerpc/platforms/cell/pervasive.c
-@@ -65,7 +65,7 @@ static void cbe_power_save(void)
- 		break;
- 	default:
- 		printk(KERN_WARNING "%s: unknown configuration\n",
--			__FUNCTION__);
-+			__func__);
- 		break;
- 	}
- 	mtspr(SPRN_TSC_CELL, thread_switch_control);
---- a/arch/powerpc/platforms/cell/ras.c
-+++ b/arch/powerpc/platforms/cell/ras.c
-@@ -132,7 +132,7 @@ static int __init cbe_ptcal_enable_on_no
- 				(unsigned int)(addr >> 32),
- 				(unsigned int)(addr & 0xffffffff))) {
- 		printk(KERN_ERR "%s: error enabling PTCAL on node %d!\n",
--				__FUNCTION__, nid);
-+				__func__, nid);
- 		goto out_free_pages;
- 	}
- 
-@@ -162,7 +162,7 @@ static int __init cbe_ptcal_enable(void)
- 	if (!size)
- 		return -ENODEV;
- 
--	pr_debug("%s: enabling PTCAL, size = 0x%x\n", __FUNCTION__, *size);
-+	pr_debug("%s: enabling PTCAL, size = 0x%x\n", __func__, *size);
- 	order = get_order(*size);
- 	of_node_put(np);
- 
-@@ -180,7 +180,7 @@ static int __init cbe_ptcal_enable(void)
- 		const u32 *nid = of_get_property(np, "node-id", NULL);
- 		if (!nid) {
- 			printk(KERN_ERR "%s: node %s is missing node-id?\n",
--					__FUNCTION__, np->full_name);
-+					__func__, np->full_name);
- 			continue;
- 		}
- 		cbe_ptcal_enable_on_node(*nid, order);
-@@ -195,13 +195,13 @@ static int cbe_ptcal_disable(void)
- 	struct ptcal_area *area, *tmp;
- 	int ret = 0;
- 
--	pr_debug("%s: disabling PTCAL\n", __FUNCTION__);
-+	pr_debug("%s: disabling PTCAL\n", __func__);
- 
- 	list_for_each_entry_safe(area, tmp, &ptcal_list, list) {
- 		/* disable ptcal on this node */
- 		if (rtas_call(ptcal_stop_tok, 1, 1, NULL, area->nid)) {
- 			printk(KERN_ERR "%s: error disabling PTCAL "
--					"on node %d!\n", __FUNCTION__,
-+					"on node %d!\n", __func__,
- 					area->nid);
- 			ret = -EIO;
- 			continue;
---- a/arch/powerpc/platforms/cell/spu_base.c
-+++ b/arch/powerpc/platforms/cell/spu_base.c
-@@ -165,7 +165,7 @@ static int __spu_trap_data_seg(struct sp
- 	struct spu_slb slb;
- 	int psize;
- 
--	pr_debug("%s\n", __FUNCTION__);
-+	pr_debug("%s\n", __func__);
- 
- 	slb.esid = (ea & ESID_MASK) | SLB_ESID_V;
- 
-@@ -215,7 +215,7 @@ static int __spu_trap_data_seg(struct sp
- extern int hash_page(unsigned long ea, unsigned long access, unsigned long trap); //XXX
- static int __spu_trap_data_map(struct spu *spu, unsigned long ea, u64 dsisr)
- {
--	pr_debug("%s, %lx, %lx\n", __FUNCTION__, dsisr, ea);
-+	pr_debug("%s, %lx, %lx\n", __func__, dsisr, ea);
- 
- 	/* Handle kernel space hash faults immediately.
- 	   User hash faults need to be deferred to process context. */
-@@ -351,7 +351,7 @@ spu_irq_class_1(int irq, void *data)
- 		__spu_trap_data_seg(spu, dar);
- 
- 	spin_unlock(&spu->register_lock);
--	pr_debug("%s: %lx %lx %lx %lx\n", __FUNCTION__, mask, stat,
-+	pr_debug("%s: %lx %lx %lx %lx\n", __func__, mask, stat,
- 			dar, dsisr);
- 
- 	if (stat & CLASS1_STORAGE_FAULT_INTR)
-@@ -726,7 +726,7 @@ static int __init init_spu_base(void)
- 
- 	if (ret < 0) {
- 		printk(KERN_WARNING "%s: Error initializing spus\n",
--			__FUNCTION__);
-+			__func__);
- 		goto out_unregister_sysdev_class;
- 	}
- 
---- a/arch/powerpc/platforms/cell/spu_callbacks.c
-+++ b/arch/powerpc/platforms/cell/spu_callbacks.c
-@@ -54,7 +54,7 @@ long spu_sys_callback(struct spu_syscall
- 	long (*syscall)(u64 a1, u64 a2, u64 a3, u64 a4, u64 a5, u64 a6);
- 
- 	if (s->nr_ret >= ARRAY_SIZE(spu_syscall_table)) {
--		pr_debug("%s: invalid syscall #%ld", __FUNCTION__, s->nr_ret);
-+		pr_debug("%s: invalid syscall #%ld", __func__, s->nr_ret);
- 		return -ENOSYS;
- 	}
- 
---- a/arch/powerpc/platforms/cell/spu_manage.c
-+++ b/arch/powerpc/platforms/cell/spu_manage.c
-@@ -92,7 +92,7 @@ static int __init spu_map_interrupts_old
- 
- 	tmp = of_get_property(np->parent->parent, "node-id", NULL);
- 	if (!tmp) {
--		printk(KERN_WARNING "%s: can't find node-id\n", __FUNCTION__);
-+		printk(KERN_WARNING "%s: can't find node-id\n", __func__);
- 		nid = spu->node;
- 	} else
- 		nid = tmp[0];
-@@ -296,7 +296,7 @@ static int __init of_enumerate_spus(int 
- 		ret = fn(node);
- 		if (ret) {
- 			printk(KERN_WARNING "%s: Error initializing %s\n",
--				__FUNCTION__, node->name);
-+				__func__, node->name);
- 			break;
- 		}
- 		n++;
-@@ -327,7 +327,7 @@ static int __init of_create_spu(struct s
- 		if (!legacy_map) {
- 			legacy_map = 1;
- 			printk(KERN_WARNING "%s: Legacy device tree found, "
--				"trying to map old style\n", __FUNCTION__);
-+				"trying to map old style\n", __func__);
- 		}
- 		ret = spu_map_device_old(spu);
- 		if (ret) {
-@@ -342,7 +342,7 @@ static int __init of_create_spu(struct s
- 		if (!legacy_irq) {
- 			legacy_irq = 1;
- 			printk(KERN_WARNING "%s: Legacy device tree found, "
--				"trying old style irq\n", __FUNCTION__);
-+				"trying old style irq\n", __func__);
- 		}
- 		ret = spu_map_interrupts_old(spu, spe);
- 		if (ret) {
---- a/arch/powerpc/platforms/cell/spufs/coredump.c
-+++ b/arch/powerpc/platforms/cell/spufs/coredump.c
-@@ -133,8 +133,6 @@ static struct spu_context *coredump_next
- 		if (ctx->flags & SPU_CREATE_NOSCHED)
- 			continue;
- 
--		/* start searching the next fd next time we're called */
--		(*fd)++;
- 		break;
- 	}
- 
-@@ -157,6 +155,9 @@ int spufs_coredump_extra_notes_size(void
- 			break;
- 
- 		size += rc;
-+
-+		/* start searching the next fd next time */
-+		fd++;
- 	}
- 
- 	return size;
-@@ -239,6 +240,9 @@ int spufs_coredump_extra_notes_write(str
- 		}
- 
- 		spu_release_saved(ctx);
-+
-+		/* start searching the next fd next time */
-+		fd++;
- 	}
- 
- 	return 0;
---- a/arch/powerpc/platforms/cell/spufs/file.c
-+++ b/arch/powerpc/platforms/cell/spufs/file.c
-@@ -1337,7 +1337,7 @@ static u64 spufs_signal1_type_get(struct
- 	return ctx->ops->signal1_type_get(ctx);
- }
- DEFINE_SPUFS_ATTRIBUTE(spufs_signal1_type, spufs_signal1_type_get,
--		       spufs_signal1_type_set, "%llu", SPU_ATTR_ACQUIRE);
-+		       spufs_signal1_type_set, "%llu\n", SPU_ATTR_ACQUIRE);
- 
- 
- static int spufs_signal2_type_set(void *data, u64 val)
-@@ -1359,7 +1359,7 @@ static u64 spufs_signal2_type_get(struct
- 	return ctx->ops->signal2_type_get(ctx);
- }
- DEFINE_SPUFS_ATTRIBUTE(spufs_signal2_type, spufs_signal2_type_get,
--		       spufs_signal2_type_set, "%llu", SPU_ATTR_ACQUIRE);
-+		       spufs_signal2_type_set, "%llu\n", SPU_ATTR_ACQUIRE);
- 
- #if SPUFS_MMAP_4K
- static unsigned long spufs_mss_mmap_nopfn(struct vm_area_struct *vma,
-@@ -1556,7 +1556,7 @@ void spufs_mfc_callback(struct spu *spu)
- 
- 	wake_up_all(&ctx->mfc_wq);
- 
--	pr_debug("%s %s\n", __FUNCTION__, spu->name);
-+	pr_debug("%s %s\n", __func__, spu->name);
- 	if (ctx->mfc_fasync) {
- 		u32 free_elements, tagstatus;
- 		unsigned int mask;
-@@ -1790,7 +1790,7 @@ static unsigned int spufs_mfc_poll(struc
- 	if (tagstatus & ctx->tagwait)
- 		mask |= POLLIN | POLLRDNORM;
- 
--	pr_debug("%s: free %d tagstatus %d tagwait %d\n", __FUNCTION__,
-+	pr_debug("%s: free %d tagstatus %d tagwait %d\n", __func__,
- 		free_elements, tagstatus, ctx->tagwait);
- 
- 	return mask;
---- a/arch/powerpc/platforms/cell/spufs/run.c
-+++ b/arch/powerpc/platforms/cell/spufs/run.c
-@@ -98,7 +98,7 @@ static int spu_setup_isolated(struct spu
- 			!= MFC_CNTL_PURGE_DMA_COMPLETE) {
- 		if (time_after(jiffies, timeout)) {
- 			printk(KERN_ERR "%s: timeout flushing MFC DMA queue\n",
--					__FUNCTION__);
-+					__func__);
- 			ret = -EIO;
- 			goto out;
- 		}
-@@ -124,7 +124,7 @@ static int spu_setup_isolated(struct spu
- 				status_loading) {
- 		if (time_after(jiffies, timeout)) {
- 			printk(KERN_ERR "%s: timeout waiting for loader\n",
--					__FUNCTION__);
-+					__func__);
- 			ret = -EIO;
- 			goto out_drop_priv;
- 		}
-@@ -134,7 +134,7 @@ static int spu_setup_isolated(struct spu
- 	if (!(status & SPU_STATUS_RUNNING)) {
- 		/* If isolated LOAD has failed: run SPU, we will get a stop-and
- 		 * signal later. */
--		pr_debug("%s: isolated LOAD failed\n", __FUNCTION__);
-+		pr_debug("%s: isolated LOAD failed\n", __func__);
- 		ctx->ops->runcntl_write(ctx, SPU_RUNCNTL_RUNNABLE);
- 		ret = -EACCES;
- 		goto out_drop_priv;
-@@ -142,7 +142,7 @@ static int spu_setup_isolated(struct spu
- 
- 	if (!(status & SPU_STATUS_ISOLATED_STATE)) {
- 		/* This isn't allowed by the CBEA, but check anyway */
--		pr_debug("%s: SPU fell out of isolated mode?\n", __FUNCTION__);
-+		pr_debug("%s: SPU fell out of isolated mode?\n", __func__);
- 		ctx->ops->runcntl_write(ctx, SPU_RUNCNTL_STOP);
- 		ret = -EINVAL;
- 		goto out_drop_priv;
-@@ -282,7 +282,7 @@ static int spu_handle_restartsys(struct 
- 		break;
- 	default:
- 		printk(KERN_WARNING "%s: unexpected return code %ld\n",
--			__FUNCTION__, *spu_ret);
-+			__func__, *spu_ret);
- 		ret = 0;
- 	}
- 	return ret;
-@@ -323,6 +323,10 @@ static int spu_process_callback(struct s
- 			return -EINTR;
- 	}
- 
-+	/* need to re-get the ls, as it may have changed when we released the
-+	 * spu */
-+	ls = (void __iomem *)ctx->ops->get_ls(ctx);
-+
- 	/* write result, jump over indirect pointer */
- 	memcpy_toio(ls + ls_pointer, &spu_ret, sizeof(spu_ret));
- 	ctx->ops->npc_write(ctx, npc);
---- a/arch/powerpc/platforms/cell/spufs/switch.c
-+++ b/arch/powerpc/platforms/cell/spufs/switch.c
-@@ -1815,6 +1815,7 @@ static void save_csa(struct spu_state *p
- 	save_mfc_csr_ato(prev, spu);	/* Step 24. */
- 	save_mfc_tclass_id(prev, spu);	/* Step 25. */
- 	set_mfc_tclass_id(prev, spu);	/* Step 26. */
-+	save_mfc_cmd(prev, spu);	/* Step 26a - moved from 44. */
- 	purge_mfc_queue(prev, spu);	/* Step 27. */
- 	wait_purge_complete(prev, spu);	/* Step 28. */
- 	setup_mfc_sr1(prev, spu);	/* Step 30. */
-@@ -1831,7 +1832,6 @@ static void save_csa(struct spu_state *p
- 	save_ppuint_mb(prev, spu);	/* Step 41. */
- 	save_ch_part1(prev, spu);	/* Step 42. */
- 	save_spu_mb(prev, spu);	        /* Step 43. */
--	save_mfc_cmd(prev, spu);	/* Step 44. */
- 	reset_ch(prev, spu);	        /* Step 45. */
- }
- 
---- a/arch/powerpc/platforms/celleb/beat.c
-+++ b/arch/powerpc/platforms/celleb/beat.c
-@@ -48,6 +48,7 @@ void beat_power_off(void)
- }
- 
- u64 beat_halt_code = 0x1000000000000000UL;
-+EXPORT_SYMBOL(beat_halt_code);
- 
- void beat_halt(void)
- {
-@@ -94,9 +95,8 @@ ssize_t beat_nvram_read(char *buf, size_
- 		len = count;
- 		if (len > BEAT_NVRW_CNT)
- 			len = BEAT_NVRW_CNT;
--		if (beat_eeprom_read(i, len, p)) {
-+		if (beat_eeprom_read(i, len, p))
- 			return -EIO;
--		}
- 
- 		p += len;
- 		i += len;
-@@ -121,9 +121,8 @@ ssize_t beat_nvram_write(char *buf, size
- 		len = count;
- 		if (len > BEAT_NVRW_CNT)
- 			len = BEAT_NVRW_CNT;
--		if (beat_eeprom_write(i, len, p)) {
-+		if (beat_eeprom_write(i, len, p))
- 			return -EIO;
--		}
- 
- 		p += len;
- 		i += len;
-@@ -149,13 +148,14 @@ int64_t beat_get_term_char(u64 vterm, u6
- 	u64 db[2];
- 	s64 ret;
- 
--	ret = beat_get_characters_from_console(vterm, len, (u8*)db);
-+	ret = beat_get_characters_from_console(vterm, len, (u8 *)db);
- 	if (ret == 0) {
- 		*t1 = db[0];
- 		*t2 = db[1];
- 	}
- 	return ret;
- }
-+EXPORT_SYMBOL(beat_get_term_char);
- 
- int64_t beat_put_term_char(u64 vterm, u64 len, u64 t1, u64 t2)
- {
-@@ -163,8 +163,9 @@ int64_t beat_put_term_char(u64 vterm, u6
- 
- 	db[0] = t1;
- 	db[1] = t2;
--	return beat_put_characters_to_console(vterm, len, (u8*)db);
-+	return beat_put_characters_to_console(vterm, len, (u8 *)db);
- }
-+EXPORT_SYMBOL(beat_put_term_char);
- 
- void beat_power_save(void)
- {
-@@ -261,7 +262,3 @@ static int __init beat_event_init(void)
- }
- 
- device_initcall(beat_event_init);
--
--EXPORT_SYMBOL(beat_get_term_char);
--EXPORT_SYMBOL(beat_put_term_char);
--EXPORT_SYMBOL(beat_halt_code);
---- a/arch/powerpc/platforms/celleb/beat.h
-+++ b/arch/powerpc/platforms/celleb/beat.h
-@@ -21,8 +21,8 @@
- #ifndef _CELLEB_BEAT_H
- #define _CELLEB_BEAT_H
- 
--int64_t beat_get_term_char(uint64_t,uint64_t*,uint64_t*,uint64_t*);
--int64_t beat_put_term_char(uint64_t,uint64_t,uint64_t,uint64_t);
-+int64_t beat_get_term_char(uint64_t, uint64_t *, uint64_t *, uint64_t *);
-+int64_t beat_put_term_char(uint64_t, uint64_t, uint64_t, uint64_t);
- int64_t beat_repository_encode(int, const char *, uint64_t[4]);
- void beat_restart(char *);
- void beat_power_off(void);
---- a/arch/powerpc/platforms/celleb/beat_wrapper.h
-+++ b/arch/powerpc/platforms/celleb/beat_wrapper.h
-@@ -197,7 +197,8 @@ static inline s64 beat_put_characters_to
- 	u64 b[2];
- 
- 	memcpy(b, buffer, len);
--	return beat_hcall_norets(HV_put_characters_to_console, termno, len,					 b[0], b[1]);
-+	return beat_hcall_norets(HV_put_characters_to_console, termno, len,
-+		b[0], b[1]);
- }
- 
- static inline s64 beat_get_spe_privileged_state_1_registers(
---- a/arch/powerpc/platforms/celleb/htab.c
-+++ b/arch/powerpc/platforms/celleb/htab.c
-@@ -35,9 +35,9 @@
- #include "beat_wrapper.h"
- 
- #ifdef DEBUG_LOW
--#define DBG_LOW(fmt...) do { udbg_printf(fmt); } while(0)
-+#define DBG_LOW(fmt...) do { udbg_printf(fmt); } while (0)
- #else
--#define DBG_LOW(fmt...) do { } while(0)
-+#define DBG_LOW(fmt...) do { } while (0)
- #endif
- 
- static DEFINE_SPINLOCK(beat_htab_lock);
-@@ -116,7 +116,8 @@ static long beat_lpar_hpte_insert(unsign
- 		hpte_r &= ~_PAGE_COHERENT;
- 
- 	spin_lock(&beat_htab_lock);
--	if ((lpar_rc = beat_read_mask(hpte_group)) == 0) {
-+	lpar_rc = beat_read_mask(hpte_group);
-+	if (lpar_rc == 0) {
- 		if (!(vflags & HPTE_V_BOLTED))
- 			DBG_LOW(" full\n");
- 		spin_unlock(&beat_htab_lock);
---- a/arch/powerpc/platforms/celleb/interrupt.c
-+++ b/arch/powerpc/platforms/celleb/interrupt.c
-@@ -34,7 +34,7 @@ static DEFINE_SPINLOCK(beatic_irq_mask_l
- static uint64_t	beatic_irq_mask_enable[(MAX_IRQS+255)/64];
- static uint64_t	beatic_irq_mask_ack[(MAX_IRQS+255)/64];
- 
--static struct irq_host *beatic_host = NULL;
-+static struct irq_host *beatic_host;
- 
- /*
-  * In this implementation, "virq" == "IRQ plug number",
-@@ -49,13 +49,13 @@ static inline void beatic_update_irq_mas
- 
- 	off = (irq_plug / 256) * 4;
- 	masks[0] = beatic_irq_mask_enable[off + 0]
--	           & beatic_irq_mask_ack[off + 0];
-+		& beatic_irq_mask_ack[off + 0];
- 	masks[1] = beatic_irq_mask_enable[off + 1]
--	           & beatic_irq_mask_ack[off + 1];
-+		& beatic_irq_mask_ack[off + 1];
- 	masks[2] = beatic_irq_mask_enable[off + 2]
--	           & beatic_irq_mask_ack[off + 2];
-+		& beatic_irq_mask_ack[off + 2];
- 	masks[3] = beatic_irq_mask_enable[off + 3]
--	           & beatic_irq_mask_ack[off + 3];
-+		& beatic_irq_mask_ack[off + 3];
- 	if (beat_set_interrupt_mask(irq_plug&~255UL,
- 		masks[0], masks[1], masks[2], masks[3]) != 0)
- 		panic("Failed to set mask IRQ!");
-@@ -96,7 +96,8 @@ static void beatic_end_irq(unsigned int 
- 	s64 err;
- 	unsigned long flags;
- 
--	if ((err = beat_downcount_of_interrupt(irq_plug)) != 0) {
-+	err = beat_downcount_of_interrupt(irq_plug);
-+	if (err != 0) {
- 		if ((err & 0xFFFFFFFF) != 0xFFFFFFF5) /* -11: wrong state */
- 			panic("Failed to downcount IRQ! Error = %16lx", err);
- 
-@@ -138,7 +139,8 @@ static int beatic_pic_host_map(struct ir
- 	struct irq_desc *desc = get_irq_desc(virq);
- 	int64_t	err;
- 
--	if ((err = beat_construct_and_connect_irq_plug(virq, hw)) < 0)
-+	err = beat_construct_and_connect_irq_plug(virq, hw);
-+	if (err < 0)
- 		return -EIO;
- 
- 	desc->status |= IRQ_LEVEL;
-@@ -202,22 +204,22 @@ static inline unsigned int beatic_get_ir
- 		beat_detect_pending_interrupts(i, pending);
- 		__asm__ ("cntlzd %0,%1":"=r"(ub):
- 			"r"(pending[0] & beatic_irq_mask_enable[i/64+0]
--			               & beatic_irq_mask_ack[i/64+0]));
-+				       & beatic_irq_mask_ack[i/64+0]));
- 		if (ub != 64)
- 			return i + ub + 0;
- 		__asm__ ("cntlzd %0,%1":"=r"(ub):
- 			"r"(pending[1] & beatic_irq_mask_enable[i/64+1]
--			               & beatic_irq_mask_ack[i/64+1]));
-+				       & beatic_irq_mask_ack[i/64+1]));
- 		if (ub != 64)
- 			return i + ub + 64;
- 		__asm__ ("cntlzd %0,%1":"=r"(ub):
- 			"r"(pending[2] & beatic_irq_mask_enable[i/64+2]
--			               & beatic_irq_mask_ack[i/64+2]));
-+				       & beatic_irq_mask_ack[i/64+2]));
- 		if (ub != 64)
- 			return i + ub + 128;
- 		__asm__ ("cntlzd %0,%1":"=r"(ub):
- 			"r"(pending[3] & beatic_irq_mask_enable[i/64+3]
--			               & beatic_irq_mask_ack[i/64+3]));
-+				       & beatic_irq_mask_ack[i/64+3]));
- 		if (ub != 64)
- 			return i + ub + 192;
- 	}
-@@ -250,7 +252,7 @@ void __init beatic_init_IRQ(void)
- 
- 	/* Allocate an irq host */
- 	beatic_host = irq_alloc_host(NULL, IRQ_HOST_MAP_NOMAP, 0,
--					 &beatic_pic_host_ops,
-+				     &beatic_pic_host_ops,
- 					 0);
- 	BUG_ON(beatic_host == NULL);
- 	irq_set_default_host(beatic_host);
---- a/arch/powerpc/platforms/celleb/scc_epci.c
-+++ b/arch/powerpc/platforms/celleb/scc_epci.c
-@@ -161,9 +161,9 @@ static PCI_IO_ADDR celleb_epci_make_conf
- 	if (bus != hose->bus)
- 		addr = celleb_epci_get_epci_cfg(hose) +
- 		       (((bus->number & 0xff) << 16)
--		        | ((devfn & 0xff) << 8)
--		        | (where & 0xff)
--		        | 0x01000000);
-+			| ((devfn & 0xff) << 8)
-+			| (where & 0xff)
-+			| 0x01000000);
- 	else
- 		addr = celleb_epci_get_epci_cfg(hose) +
- 		       (((devfn & 0xff) << 8) | (where & 0xff));
-@@ -174,7 +174,7 @@ static PCI_IO_ADDR celleb_epci_make_conf
- }
- 
- static int celleb_epci_read_config(struct pci_bus *bus,
--			unsigned int devfn, int where, int size, u32 * val)
-+			unsigned int devfn, int where, int size, u32 *val)
- {
- 	PCI_IO_ADDR epci_base;
- 	PCI_IO_ADDR addr;
---- a/arch/powerpc/platforms/celleb/scc_sio.c
-+++ b/arch/powerpc/platforms/celleb/scc_sio.c
-@@ -28,7 +28,7 @@
- 
- /* sio irq0=0xb00010022 irq0=0xb00010023 irq2=0xb00010024
-     mmio=0xfff000-0x1000,0xff2000-0x1000 */
--static int txx9_serial_bitmap __initdata = 0;
-+static int txx9_serial_bitmap __initdata;
- 
- static struct {
- 	uint32_t offset;
-@@ -84,7 +84,7 @@ static int __init txx9_serial_config(cha
- 	int	i;
- 
- 	for (;;) {
--		switch(get_option(&ptr, &i)) {
-+		switch (get_option(&ptr, &i)) {
- 		default:
- 			return 0;
- 		case 2:
---- a/arch/powerpc/platforms/celleb/spu_priv1.c
-+++ b/arch/powerpc/platforms/celleb/spu_priv1.c
-@@ -183,8 +183,7 @@ static u64 resource_allocation_enable_ge
- 	return enable;
- }
- 
--const struct spu_priv1_ops spu_priv1_beat_ops =
--{
-+const struct spu_priv1_ops spu_priv1_beat_ops = {
- 	.int_mask_and = int_mask_and,
- 	.int_mask_or = int_mask_or,
- 	.int_mask_set = int_mask_set,
---- a/arch/powerpc/platforms/celleb/udbg_beat.c
-+++ b/arch/powerpc/platforms/celleb/udbg_beat.c
-@@ -54,7 +54,8 @@ static int udbg_getc_poll_beat(void)
- 	if (inbuflen == 0) {
- 		/* get some more chars. */
- 		inbuflen = 0;
--		rc = beat_get_term_char(celleb_vtermno, &inbuflen, inbuf+0, inbuf+1);
-+		rc = beat_get_term_char(celleb_vtermno, &inbuflen,
-+					inbuf+0, inbuf+1);
- 		if (rc != 0)
- 			inbuflen = 0;	/* otherwise inbuflen is garbage */
- 	}
-@@ -78,7 +79,7 @@ static int udbg_getc_beat(void)
- 		if (ch == -1) {
- 			/* This shouldn't be needed...but... */
- 			volatile unsigned long delay;
--			for (delay=0; delay < 2000000; delay++)
-+			for (delay = 0; delay < 2000000; delay++)
- 				;
- 		} else {
- 			return ch;
---- a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
-+++ b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
-@@ -117,11 +117,11 @@ static void __init mpc7448_hpc2_init_IRQ
- 	}
- 
- 	if (mpic_paddr == 0) {
--		printk("%s: No tsi108 PIC found !\n", __FUNCTION__);
-+		printk("%s: No tsi108 PIC found !\n", __func__);
- 		return;
- 	}
- 
--	DBG("%s: tsi108 pic phys_addr = 0x%x\n", __FUNCTION__,
-+	DBG("%s: tsi108 pic phys_addr = 0x%x\n", __func__,
- 	    (u32) mpic_paddr);
- 
- 	mpic = mpic_alloc(tsi_pic, mpic_paddr,
-@@ -140,17 +140,17 @@ static void __init mpc7448_hpc2_init_IRQ
- #ifdef CONFIG_PCI
- 	tsi_pci = of_find_node_by_type(NULL, "pci");
- 	if (tsi_pci == NULL) {
--		printk("%s: No tsi108 pci node found !\n", __FUNCTION__);
-+		printk("%s: No tsi108 pci node found !\n", __func__);
- 		return;
- 	}
- 	cascade_node = of_find_node_by_type(NULL, "pic-router");
- 	if (cascade_node == NULL) {
--		printk("%s: No tsi108 pci cascade node found !\n", __FUNCTION__);
-+		printk("%s: No tsi108 pci cascade node found !\n", __func__);
- 		return;
- 	}
- 
- 	cascade_pci_irq = irq_of_parse_and_map(tsi_pci, 0);
--	DBG("%s: tsi108 cascade_pci_irq = 0x%x\n", __FUNCTION__,
-+	DBG("%s: tsi108 cascade_pci_irq = 0x%x\n", __func__,
- 	    (u32) cascade_pci_irq);
- 	tsi108_pci_int_init(cascade_node);
- 	set_irq_data(cascade_pci_irq, mpic);
---- a/arch/powerpc/platforms/embedded6xx/prpmc2800.c
-+++ b/arch/powerpc/platforms/embedded6xx/prpmc2800.c
-@@ -49,13 +49,13 @@ static void __init prpmc2800_setup_arch(
- 	 * ioremap mpp and gpp registers in case they are later
- 	 * needed by prpmc2800_reset_board().
- 	 */
--	np = of_find_compatible_node(NULL, NULL, "marvell,mv64x60-mpp");
-+	np = of_find_compatible_node(NULL, NULL, "marvell,mv64360-mpp");
- 	reg = of_get_property(np, "reg", NULL);
- 	paddr = of_translate_address(np, reg);
- 	of_node_put(np);
- 	mv64x60_mpp_reg_base = ioremap(paddr, reg[1]);
- 
--	np = of_find_compatible_node(NULL, NULL, "marvell,mv64x60-gpp");
-+	np = of_find_compatible_node(NULL, NULL, "marvell,mv64360-gpp");
- 	reg = of_get_property(np, "reg", NULL);
- 	paddr = of_translate_address(np, reg);
- 	of_node_put(np);
---- a/arch/powerpc/platforms/iseries/exception.S
-+++ b/arch/powerpc/platforms/iseries/exception.S
-@@ -38,11 +38,19 @@
- 
- 	.globl system_reset_iSeries
- system_reset_iSeries:
--	mfspr	r13,SPRN_SPRG3		/* Get paca address */
-+	mfspr	r13,SPRN_SPRG3		/* Get alpaca address */
-+	LOAD_REG_IMMEDIATE(r23, alpaca)
-+	li	r0,ALPACA_SIZE
-+	sub	r23,r13,r23
-+	divdu	r23,r23,r0		/* r23 has cpu number */
-+	LOAD_REG_IMMEDIATE(r13, paca)
-+	mulli	r0,r23,PACA_SIZE
-+	add	r13,r13,r0
-+	mtspr	SPRN_SPRG3,r13		/* Save it away for the future */
- 	mfmsr	r24
- 	ori	r24,r24,MSR_RI
- 	mtmsrd	r24			/* RI on */
--	lhz	r24,PACAPACAINDEX(r13)	/* Get processor # */
-+	mr	r24,r23
- 	cmpwi	0,r24,0			/* Are we processor 0? */
- 	bne	1f
- 	b	.__start_initialization_iSeries	/* Start up the first processor */
---- a/arch/powerpc/platforms/iseries/ipl_parms.h
-+++ b/arch/powerpc/platforms/iseries/ipl_parms.h
-@@ -65,6 +65,4 @@ struct ItIplParmsReal {
- 	u64	xRsvd13;		// Reserved			x38-x3F
- };
- 
--extern struct ItIplParmsReal	xItIplParmsReal;
--
- #endif /* _ISERIES_IPL_PARMS_H */
---- a/arch/powerpc/platforms/iseries/lpardata.c
-+++ b/arch/powerpc/platforms/iseries/lpardata.c
-@@ -14,10 +14,10 @@
- #include <asm/ptrace.h>
- #include <asm/abs_addr.h>
- #include <asm/lppaca.h>
--#include <asm/iseries/it_lp_reg_save.h>
- #include <asm/paca.h>
- #include <asm/iseries/lpar_map.h>
- #include <asm/iseries/it_lp_queue.h>
-+#include <asm/iseries/alpaca.h>
- 
- #include "naca.h"
- #include "vpd_areas.h"
-@@ -31,7 +31,7 @@
- /* The HvReleaseData is the root of the information shared between
-  * the hypervisor and Linux.
-  */
--struct HvReleaseData hvReleaseData = {
-+const struct HvReleaseData hvReleaseData = {
- 	.xDesc = 0xc8a5d9c4,	/* "HvRD" ebcdic */
- 	.xSize = sizeof(struct HvReleaseData),
- 	.xVpdAreasPtrOffset = offsetof(struct naca_struct, xItVpdAreas),
-@@ -61,6 +61,63 @@ struct naca_struct naca = {
- 	.xRamDiskSize = 0,
- };
- 
-+struct ItLpRegSave {
-+	u32	xDesc;		// Eye catcher  "LpRS" ebcdic	000-003
-+	u16	xSize;		// Size of this class		004-005
-+	u8	xInUse;         // Area is live                 006-007
-+	u8	xRsvd1[9];	// Reserved			007-00F
-+
-+	u8      xFixedRegSave[352]; // Fixed Register Save Area 010-16F
-+	u32	xCTRL;		// Control Register		170-173
-+	u32	xDEC;		// Decrementer			174-177
-+	u32	xFPSCR;		// FP Status and Control Reg	178-17B
-+	u32	xPVR;		// Processor Version Number	17C-17F
-+
-+	u64	xMMCR0;		// Monitor Mode Control Reg 0	180-187
-+	u32	xPMC1;		// Perf Monitor Counter 1	188-18B
-+	u32	xPMC2;		// Perf Monitor Counter 2	18C-18F
-+	u32	xPMC3;		// Perf Monitor Counter 3	190-193
-+	u32	xPMC4;		// Perf Monitor Counter 4	194-197
-+	u32	xPIR;		// Processor ID Reg		198-19B
-+
-+	u32	xMMCR1;		// Monitor Mode Control Reg 1	19C-19F
-+	u32	xMMCRA;		// Monitor Mode Control Reg A	1A0-1A3
-+	u32	xPMC5;		// Perf Monitor Counter 5	1A4-1A7
-+	u32	xPMC6;		// Perf Monitor Counter 6	1A8-1AB
-+	u32	xPMC7;		// Perf Monitor Counter 7	1AC-1AF
-+	u32	xPMC8;		// Perf Monitor Counter 8	1B0-1B3
-+	u32	xTSC;		// Thread Switch Control	1B4-1B7
-+	u32	xTST;		// Thread Switch Timeout	1B8-1BB
-+	u32	xRsvd;          // Reserved                     1BC-1BF
-+
-+	u64	xACCR;		// Address Compare Control Reg	1C0-1C7
-+	u64	xIMR;		// Instruction Match Register	1C8-1CF
-+	u64	xSDR1;		// Storage Description Reg 1	1D0-1D7
-+	u64	xSPRG0;		// Special Purpose Reg General0	1D8-1DF
-+	u64	xSPRG1;		// Special Purpose Reg General1	1E0-1E7
-+	u64	xSPRG2;		// Special Purpose Reg General2	1E8-1EF
-+	u64	xSPRG3;		// Special Purpose Reg General3	1F0-1F7
-+	u64	xTB;		// Time Base Register		1F8-1FF
-+
-+	u64	xFPR[32];	// Floating Point Registers	200-2FF
-+
-+	u64	xMSR;		// Machine State Register	300-307
-+	u64	xNIA;		// Next Instruction Address	308-30F
-+
-+	u64	xDABR;		// Data Address Breakpoint Reg	310-317
-+	u64	xIABR;		// Inst Address Breakpoint Reg	318-31F
-+
-+	u64	xHID0;		// HW Implementation Dependent0	320-327
-+
-+	u64	xHID4;		// HW Implementation Dependent4	328-32F
-+	u64	xSCOMd;		// SCON Data Reg (SPRG4)	330-337
-+	u64	xSCOMc;		// SCON Command Reg (SPRG5)	338-33F
-+	u64	xSDAR;		// Sample Data Address Register	340-347
-+	u64	xSIAR;		// Sample Inst Address Register	348-34F
-+
-+	u8	xRsvd3[176];	// Reserved			350-3FF
-+};
-+
- extern void system_reset_iSeries(void);
- extern void machine_check_iSeries(void);
- extern void data_access_iSeries(void);
-@@ -129,7 +186,7 @@ struct ItLpNaca itLpNaca = {
- };
- 
- /* May be filled in by the hypervisor so cannot end up in the BSS */
--struct ItIplParmsReal xItIplParmsReal __attribute__((__section__(".data")));
-+static struct ItIplParmsReal xItIplParmsReal __attribute__((__section__(".data")));
- 
- /* May be filled in by the hypervisor so cannot end up in the BSS */
- struct ItExtVpdPanel xItExtVpdPanel __attribute__((__section__(".data")));
-@@ -152,13 +209,54 @@ u64    xMsVpd[3400] __attribute__((__sec
- 
- /* Space for Recovery Log Buffer */
- /* May be filled in by the hypervisor so cannot end up in the BSS */
--u64    xRecoveryLogBuffer[32] __attribute__((__section__(".data")));
-+static u64    xRecoveryLogBuffer[32] __attribute__((__section__(".data")));
- 
--struct SpCommArea xSpCommArea = {
-+static const struct SpCommArea xSpCommArea = {
- 	.xDesc = 0xE2D7C3C2,
- 	.xFormat = 1,
- };
- 
-+static const struct ItLpRegSave iseries_reg_save[] = {
-+	[0 ... (NR_CPUS-1)] = {
-+		.xDesc = 0xd397d9e2,	/* "LpRS" */
-+		.xSize = sizeof(struct ItLpRegSave),
-+	},
-+};
-+
-+#define ALPACA_INIT(number)						\
-+{									\
-+	.lppaca_ptr = &lppaca[number],					\
-+	.reg_save_ptr = &iseries_reg_save[number],			\
-+}
-+
-+const struct alpaca alpaca[] = {
-+	ALPACA_INIT( 0),
-+#if NR_CPUS > 1
-+	ALPACA_INIT( 1), ALPACA_INIT( 2), ALPACA_INIT( 3),
-+#if NR_CPUS > 4
-+	ALPACA_INIT( 4), ALPACA_INIT( 5), ALPACA_INIT( 6), ALPACA_INIT( 7),
-+#if NR_CPUS > 8
-+	ALPACA_INIT( 8), ALPACA_INIT( 9), ALPACA_INIT(10), ALPACA_INIT(11),
-+	ALPACA_INIT(12), ALPACA_INIT(13), ALPACA_INIT(14), ALPACA_INIT(15),
-+	ALPACA_INIT(16), ALPACA_INIT(17), ALPACA_INIT(18), ALPACA_INIT(19),
-+	ALPACA_INIT(20), ALPACA_INIT(21), ALPACA_INIT(22), ALPACA_INIT(23),
-+	ALPACA_INIT(24), ALPACA_INIT(25), ALPACA_INIT(26), ALPACA_INIT(27),
-+	ALPACA_INIT(28), ALPACA_INIT(29), ALPACA_INIT(30), ALPACA_INIT(31),
-+#if NR_CPUS > 32
-+	ALPACA_INIT(32), ALPACA_INIT(33), ALPACA_INIT(34), ALPACA_INIT(35),
-+	ALPACA_INIT(36), ALPACA_INIT(37), ALPACA_INIT(38), ALPACA_INIT(39),
-+	ALPACA_INIT(40), ALPACA_INIT(41), ALPACA_INIT(42), ALPACA_INIT(43),
-+	ALPACA_INIT(44), ALPACA_INIT(45), ALPACA_INIT(46), ALPACA_INIT(47),
-+	ALPACA_INIT(48), ALPACA_INIT(49), ALPACA_INIT(50), ALPACA_INIT(51),
-+	ALPACA_INIT(52), ALPACA_INIT(53), ALPACA_INIT(54), ALPACA_INIT(55),
-+	ALPACA_INIT(56), ALPACA_INIT(57), ALPACA_INIT(58), ALPACA_INIT(59),
-+	ALPACA_INIT(60), ALPACA_INIT(61), ALPACA_INIT(62), ALPACA_INIT(63),
-+#endif
-+#endif
-+#endif
-+#endif
-+};
-+
- /* The LparMap data is now located at offset 0x6000 in head.S
-  * It was put there so that the HvReleaseData could address it
-  * with a 32-bit offset as required by the iSeries hypervisor
-@@ -167,7 +265,7 @@ struct SpCommArea xSpCommArea = {
-  * the Naca via the HvReleaseData area.  The HvReleaseData has the
-  * offset into the Naca of the pointer to the ItVpdAreas.
-  */
--struct ItVpdAreas itVpdAreas = {
-+const struct ItVpdAreas itVpdAreas = {
- 	.xSlicDesc = 0xc9a3e5c1,		/* "ItVA" */
- 	.xSlicSize = sizeof(struct ItVpdAreas),
- 	.xSlicVpdEntries = ItVpdMaxEntries,	/* # VPD array entries */
-@@ -185,7 +283,7 @@ struct ItVpdAreas itVpdAreas = {
- 	.xSlicVpdLens = {			/* VPD lengths */
- 	        0,0,0,		        /*  0 - 2 */
- 		sizeof(xItExtVpdPanel), /*       3 Extended VPD   */
--		sizeof(struct paca_struct),	/*       4 length of Paca  */
-+		sizeof(struct alpaca),	/*       4 length of (fake) Paca  */
- 		0,			/*       5 */
- 		sizeof(struct ItIplParmsReal),/* 6 length of IPL parms */
- 		26992,			/*	 7 length of MS VPD */
-@@ -203,7 +301,7 @@ struct ItVpdAreas itVpdAreas = {
- 	.xSlicVpdAdrs = {			/* VPD addresses */
- 		0,0,0,			/*	 0 -  2 */
- 		&xItExtVpdPanel,        /*       3 Extended VPD */
--		&paca[0],		/*       4 first Paca */
-+		&alpaca[0],		/*       4 first (fake) Paca */
- 		0,			/*       5 */
- 		&xItIplParmsReal,	/*	 6 IPL parms */
- 		&xMsVpd,		/*	 7 MS Vpd */
-@@ -219,10 +317,3 @@ struct ItVpdAreas itVpdAreas = {
- 		0,0
- 	}
- };
--
--struct ItLpRegSave iseries_reg_save[] = {
--	[0 ... (NR_CPUS-1)] = {
--		.xDesc = 0xd397d9e2,	/* "LpRS" */
--		.xSize = sizeof(struct ItLpRegSave),
--	},
--};
---- a/arch/powerpc/platforms/iseries/naca.h
-+++ b/arch/powerpc/platforms/iseries/naca.h
-@@ -14,7 +14,7 @@
- 
- struct naca_struct {
- 	/* Kernel only data - undefined for user space */
--	void *xItVpdAreas;              /* VPD Data                  0x00 */
-+	const void *xItVpdAreas;	/* VPD Data                  0x00 */
- 	void *xRamDisk;                 /* iSeries ramdisk           0x08 */
- 	u64   xRamDiskSize;		/* In pages                  0x10 */
- };
---- a/arch/powerpc/platforms/iseries/pci.c
-+++ b/arch/powerpc/platforms/iseries/pci.c
-@@ -23,6 +23,7 @@
- 
- #undef DEBUG
- 
-+#include <linux/jiffies.h>
- #include <linux/kernel.h>
- #include <linux/list.h>
- #include <linux/string.h>
-@@ -586,7 +587,7 @@ static inline struct device_node *xlate_
- 		static unsigned long last_jiffies;
- 		static int num_printed;
- 
--		if ((jiffies - last_jiffies) > 60 * HZ) {
-+		if (time_after(jiffies, last_jiffies + 60 * HZ)) {
- 			last_jiffies = jiffies;
- 			num_printed = 0;
- 		}
---- a/arch/powerpc/platforms/iseries/release_data.h
-+++ b/arch/powerpc/platforms/iseries/release_data.h
-@@ -58,6 +58,6 @@ struct HvReleaseData {
- 	char	xRsvd3[20];	/* Reserved			x2C-x3F */
- };
- 
--extern struct HvReleaseData	hvReleaseData;
-+extern const struct HvReleaseData	hvReleaseData;
- 
- #endif /* _ISERIES_RELEASE_DATA_H */
---- a/arch/powerpc/platforms/iseries/spcomm_area.h
-+++ b/arch/powerpc/platforms/iseries/spcomm_area.h
-@@ -31,6 +31,4 @@ struct SpCommArea {
- 	u8	xRsvd2[80];		// Reserved				030-07F
- };
- 
--extern struct SpCommArea xSpCommArea;
--
- #endif /* _ISERIES_SPCOMM_AREA_H */
---- a/arch/powerpc/platforms/iseries/vpd_areas.h
-+++ b/arch/powerpc/platforms/iseries/vpd_areas.h
-@@ -80,9 +80,9 @@ struct ItVpdAreas {
- 	u32	xPlicDmaLens[ItDmaMaxEntries];// Array of DMA lengths	080-0A7
- 	u32	xPlicDmaToks[ItDmaMaxEntries];// Array of DMA tokens	0A8-0CF
- 	u32	xSlicVpdLens[ItVpdMaxEntries];// Array of VPD lengths	0D0-12F
--	void	*xSlicVpdAdrs[ItVpdMaxEntries];// Array of VPD buffers	130-1EF
-+	const void *xSlicVpdAdrs[ItVpdMaxEntries];// Array of VPD buffers 130-1EF
- };
- 
--extern struct ItVpdAreas	itVpdAreas;
-+extern const struct ItVpdAreas	itVpdAreas;
- 
- #endif /* _ISERIES_VPD_AREAS_H */
---- a/arch/powerpc/platforms/maple/pci.c
-+++ b/arch/powerpc/platforms/maple/pci.c
-@@ -592,50 +592,3 @@ int maple_pci_get_legacy_ide_irq(struct 
- 	}
- 	return irq;
- }
--
--/* XXX: To remove once all firmwares are ok */
--static void fixup_maple_ide(struct pci_dev* dev)
--{
--	if (!machine_is(maple))
--		return;
--
--#if 0 /* Enable this to enable IDE port 0 */
--	{
--		u8 v;
--
--		pci_read_config_byte(dev, 0x40, &v);
--		v |= 2;
--		pci_write_config_byte(dev, 0x40, v);
--	}
--#endif
--#if 0 /* fix bus master base */
--	pci_write_config_dword(dev, 0x20, 0xcc01);
--	printk("old ide resource: %lx -> %lx \n",
--	       dev->resource[4].start, dev->resource[4].end);
--	dev->resource[4].start = 0xcc00;
--	dev->resource[4].end = 0xcc10;
--#endif
--#if 0 /* Enable this to fixup IDE sense/polarity of irqs in IO-APICs */
--	{
--		struct pci_dev *apicdev;
--		u32 v;
--
--		apicdev = pci_get_slot (dev->bus, PCI_DEVFN(5,0));
--		if (apicdev == NULL)
--			printk("IDE Fixup IRQ: Can't find IO-APIC !\n");
--		else {
--			pci_write_config_byte(apicdev, 0xf2, 0x10 + 2*14);
--			pci_read_config_dword(apicdev, 0xf4, &v);
--			v &= ~0x00000022;
--			pci_write_config_dword(apicdev, 0xf4, v);
--			pci_write_config_byte(apicdev, 0xf2, 0x10 + 2*15);
--			pci_read_config_dword(apicdev, 0xf4, &v);
--			v &= ~0x00000022;
--			pci_write_config_dword(apicdev, 0xf4, v);
--			pci_dev_put(apicdev);
--		}
--	}
--#endif
--}
--DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8111_IDE,
--			 fixup_maple_ide);
---- a/arch/powerpc/platforms/maple/setup.c
-+++ b/arch/powerpc/platforms/maple/setup.c
-@@ -43,6 +43,7 @@
- #include <linux/smp.h>
- #include <linux/bitops.h>
- #include <linux/of_device.h>
-+#include <linux/lmb.h>
- 
- #include <asm/processor.h>
- #include <asm/sections.h>
-@@ -57,7 +58,6 @@
- #include <asm/dma.h>
- #include <asm/cputable.h>
- #include <asm/time.h>
--#include <asm/lmb.h>
- #include <asm/mpic.h>
- #include <asm/rtas.h>
- #include <asm/udbg.h>
-@@ -319,7 +319,7 @@ static int __init maple_probe(void)
- 	return 1;
- }
- 
--define_machine(maple_md) {
-+define_machine(maple) {
- 	.name			= "Maple",
- 	.probe			= maple_probe,
- 	.setup_arch		= maple_setup_arch,
---- a/arch/powerpc/platforms/pasemi/dma_lib.c
-+++ b/arch/powerpc/platforms/pasemi/dma_lib.c
-@@ -17,6 +17,7 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-  */
- 
-+#include <linux/kernel.h>
- #include <linux/init.h>
- #include <linux/module.h>
- #include <linux/pci.h>
-@@ -26,6 +27,8 @@
- 
- #define MAX_TXCH 64
- #define MAX_RXCH 64
-+#define MAX_FLAGS 64
-+#define MAX_FUN 8
- 
- static struct pasdma_status *dma_status;
- 
-@@ -43,6 +46,8 @@ static struct pci_dev *dma_pdev;
- 
- static DECLARE_BITMAP(txch_free, MAX_TXCH);
- static DECLARE_BITMAP(rxch_free, MAX_RXCH);
-+static DECLARE_BITMAP(flags_free, MAX_FLAGS);
-+static DECLARE_BITMAP(fun_free, MAX_FUN);
- 
- /* pasemi_read_iob_reg - read IOB register
-  * @reg: Register to read (offset into PCI CFG space)
-@@ -373,6 +378,106 @@ void pasemi_dma_free_buf(struct pasemi_d
- }
- EXPORT_SYMBOL(pasemi_dma_free_buf);
- 
-+/* pasemi_dma_alloc_flag - Allocate a flag (event) for channel syncronization
-+ *
-+ * Allocates a flag for use with channel syncronization (event descriptors).
-+ * Returns allocated flag (0-63), < 0 on error.
-+ */
-+int pasemi_dma_alloc_flag(void)
-+{
-+	int bit;
-+
-+retry:
-+	bit = find_next_bit(flags_free, MAX_FLAGS, 0);
-+	if (bit >= MAX_FLAGS)
-+		return -ENOSPC;
-+	if (!test_and_clear_bit(bit, flags_free))
-+		goto retry;
-+
-+	return bit;
-+}
-+EXPORT_SYMBOL(pasemi_dma_alloc_flag);
-+
-+
-+/* pasemi_dma_free_flag - Deallocates a flag (event)
-+ * @flag: Flag number to deallocate
-+ *
-+ * Frees up a flag so it can be reused for other purposes.
-+ */
-+void pasemi_dma_free_flag(int flag)
-+{
-+	BUG_ON(test_bit(flag, flags_free));
-+	BUG_ON(flag >= MAX_FLAGS);
-+	set_bit(flag, flags_free);
-+}
-+EXPORT_SYMBOL(pasemi_dma_free_flag);
-+
-+
-+/* pasemi_dma_set_flag - Sets a flag (event) to 1
-+ * @flag: Flag number to set active
-+ *
-+ * Sets the flag provided to 1.
-+ */
-+void pasemi_dma_set_flag(int flag)
-+{
-+	BUG_ON(flag >= MAX_FLAGS);
-+	if (flag < 32)
-+		pasemi_write_dma_reg(PAS_DMA_TXF_SFLG0, 1 << flag);
-+	else
-+		pasemi_write_dma_reg(PAS_DMA_TXF_SFLG1, 1 << flag);
-+}
-+EXPORT_SYMBOL(pasemi_dma_set_flag);
-+
-+/* pasemi_dma_clear_flag - Sets a flag (event) to 0
-+ * @flag: Flag number to set inactive
-+ *
-+ * Sets the flag provided to 0.
-+ */
-+void pasemi_dma_clear_flag(int flag)
-+{
-+	BUG_ON(flag >= MAX_FLAGS);
-+	if (flag < 32)
-+		pasemi_write_dma_reg(PAS_DMA_TXF_CFLG0, 1 << flag);
-+	else
-+		pasemi_write_dma_reg(PAS_DMA_TXF_CFLG1, 1 << flag);
-+}
-+EXPORT_SYMBOL(pasemi_dma_clear_flag);
-+
-+/* pasemi_dma_alloc_fun - Allocate a function engine
-+ *
-+ * Allocates a function engine to use for crypto/checksum offload
-+ * Returns allocated engine (0-8), < 0 on error.
-+ */
-+int pasemi_dma_alloc_fun(void)
-+{
-+	int bit;
-+
-+retry:
-+	bit = find_next_bit(fun_free, MAX_FLAGS, 0);
-+	if (bit >= MAX_FLAGS)
-+		return -ENOSPC;
-+	if (!test_and_clear_bit(bit, fun_free))
-+		goto retry;
-+
-+	return bit;
-+}
-+EXPORT_SYMBOL(pasemi_dma_alloc_fun);
-+
-+
-+/* pasemi_dma_free_fun - Deallocates a function engine
-+ * @flag: Engine number to deallocate
-+ *
-+ * Frees up a function engine so it can be used for other purposes.
-+ */
-+void pasemi_dma_free_fun(int fun)
-+{
-+	BUG_ON(test_bit(fun, fun_free));
-+	BUG_ON(fun >= MAX_FLAGS);
-+	set_bit(fun, fun_free);
-+}
-+EXPORT_SYMBOL(pasemi_dma_free_fun);
-+
-+
- static void *map_onedev(struct pci_dev *p, int index)
- {
- 	struct device_node *dn;
-@@ -410,6 +515,7 @@ int pasemi_dma_init(void)
- 	struct resource res;
- 	struct device_node *dn;
- 	int i, intf, err = 0;
-+	unsigned long timeout;
- 	u32 tmp;
- 
- 	if (!machine_is(pasemi))
-@@ -478,6 +584,44 @@ int pasemi_dma_init(void)
- 	for (i = 0; i < MAX_RXCH; i++)
- 		__set_bit(i, rxch_free);
- 
-+	timeout = jiffies + HZ;
-+	pasemi_write_dma_reg(PAS_DMA_COM_RXCMD, 0);
-+	while (pasemi_read_dma_reg(PAS_DMA_COM_RXSTA) & 1) {
-+		if (time_after(jiffies, timeout)) {
-+			pr_warning("Warning: Could not disable RX section\n");
-+			break;
-+		}
-+	}
-+
-+	timeout = jiffies + HZ;
-+	pasemi_write_dma_reg(PAS_DMA_COM_TXCMD, 0);
-+	while (pasemi_read_dma_reg(PAS_DMA_COM_TXSTA) & 1) {
-+		if (time_after(jiffies, timeout)) {
-+			pr_warning("Warning: Could not disable TX section\n");
-+			break;
-+		}
-+	}
-+
-+	/* setup resource allocations for the different DMA sections */
-+	tmp = pasemi_read_dma_reg(PAS_DMA_COM_CFG);
-+	pasemi_write_dma_reg(PAS_DMA_COM_CFG, tmp | 0x18000000);
-+
-+	/* enable tx section */
-+	pasemi_write_dma_reg(PAS_DMA_COM_TXCMD, PAS_DMA_COM_TXCMD_EN);
-+
-+	/* enable rx section */
-+	pasemi_write_dma_reg(PAS_DMA_COM_RXCMD, PAS_DMA_COM_RXCMD_EN);
-+
-+	for (i = 0; i < MAX_FLAGS; i++)
-+		__set_bit(i, flags_free);
-+
-+	for (i = 0; i < MAX_FUN; i++)
-+		__set_bit(i, fun_free);
-+
-+	/* clear all status flags */
-+	pasemi_write_dma_reg(PAS_DMA_TXF_CFLG0, 0xffffffff);
-+	pasemi_write_dma_reg(PAS_DMA_TXF_CFLG1, 0xffffffff);
-+
- 	printk(KERN_INFO "PA Semi PWRficient DMA library initialized "
- 		"(%d tx, %d rx channels)\n", num_txch, num_rxch);
- 
---- a/arch/powerpc/platforms/pasemi/iommu.c
-+++ b/arch/powerpc/platforms/pasemi/iommu.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (C) 2005-2007, PA Semi, Inc
-+ * Copyright (C) 2005-2008, PA Semi, Inc
-  *
-  * Maintained by: Olof Johansson <olof@lixom.net>
-  *
-@@ -27,7 +27,6 @@
- #include <asm/abs_addr.h>
- #include <asm/firmware.h>
- 
--
- #define IOBMAP_PAGE_SHIFT	12
- #define IOBMAP_PAGE_SIZE	(1 << IOBMAP_PAGE_SHIFT)
- #define IOBMAP_PAGE_MASK	(IOBMAP_PAGE_SIZE - 1)
-@@ -35,13 +34,13 @@
- #define IOB_BASE		0xe0000000
- #define IOB_SIZE		0x3000
- /* Configuration registers */
--#define IOBCAP_REG		0x10
--#define IOBCOM_REG		0x40
-+#define IOBCAP_REG		0x40
-+#define IOBCOM_REG		0x100
- /* Enable IOB address translation */
- #define IOBCOM_ATEN		0x00000100
- 
- /* Address decode configuration register */
--#define IOB_AD_REG		0x53
-+#define IOB_AD_REG		0x14c
- /* IOBCOM_AD_REG fields */
- #define IOB_AD_VGPRT		0x00000e00
- #define IOB_AD_VGAEN		0x00000100
-@@ -56,13 +55,13 @@
- #define IOB_AD_TRNG_2G		0x00000001
- #define IOB_AD_TRNG_128G	0x00000003
- 
--#define IOB_TABLEBASE_REG	0x55
-+#define IOB_TABLEBASE_REG	0x154
- 
- /* Base of the 64 4-byte L1 registers */
--#define IOB_XLT_L1_REGBASE	0xac0
-+#define IOB_XLT_L1_REGBASE	0x2b00
- 
- /* Register to invalidate TLB entries */
--#define IOB_AT_INVAL_TLB_REG	0xb40
-+#define IOB_AT_INVAL_TLB_REG	0x2d00
- 
- /* The top two bits of the level 1 entry contains valid and type flags */
- #define IOBMAP_L1E_V		0x40000000
-@@ -76,7 +75,7 @@
- #define IOBMAP_L2E_V		0x80000000
- #define IOBMAP_L2E_V_CACHED	0xc0000000
- 
--static u32 __iomem *iob;
-+static void __iomem *iob;
- static u32 iob_l1_emptyval;
- static u32 iob_l2_emptyval;
- static u32 *iob_l2_base;
-@@ -219,7 +218,7 @@ int __init iob_init(struct device_node *
- 	for (i = 0; i < 64; i++) {
- 		/* Each L1 covers 32MB, i.e. 8K entries = 32K of ram */
- 		regword = IOBMAP_L1E_V | (__pa(iob_l2_base + i*0x2000) >> 12);
--		out_le32(iob+IOB_XLT_L1_REGBASE+i, regword);
-+		out_le32(iob+IOB_XLT_L1_REGBASE+i*4, regword);
- 	}
- 
- 	/* set 2GB translation window, based at 0 */
---- a/arch/powerpc/platforms/powermac/setup.c
-+++ b/arch/powerpc/platforms/powermac/setup.c
-@@ -53,6 +53,7 @@
- #include <linux/suspend.h>
- #include <linux/of_device.h>
- #include <linux/of_platform.h>
-+#include <linux/lmb.h>
- 
- #include <asm/reg.h>
- #include <asm/sections.h>
-@@ -74,7 +75,6 @@
- #include <asm/iommu.h>
- #include <asm/smu.h>
- #include <asm/pmc.h>
--#include <asm/lmb.h>
- #include <asm/udbg.h>
- 
- #include "pmac.h"
---- a/arch/powerpc/platforms/ps3/device-init.c
-+++ b/arch/powerpc/platforms/ps3/device-init.c
-@@ -499,41 +499,14 @@ static int __init ps3_register_graphics_
- }
- 
- /**
-- * ps3_register_repository_device - Register a device from the repositiory info.
-- *
-+ * ps3_setup_dynamic_device - Setup a dynamic device from the repository
-  */
- 
--static int ps3_register_repository_device(
--	const struct ps3_repository_device *repo)
-+static int ps3_setup_dynamic_device(const struct ps3_repository_device *repo)
- {
- 	int result;
- 
- 	switch (repo->dev_type) {
--	case PS3_DEV_TYPE_SB_GELIC:
--		result = ps3_setup_gelic_device(repo);
--		if (result) {
--			pr_debug("%s:%d ps3_setup_gelic_device failed\n",
--				__func__, __LINE__);
--		}
--		break;
--	case PS3_DEV_TYPE_SB_USB:
--
--		/* Each USB device has both an EHCI and an OHCI HC */
--
--		result = ps3_setup_ehci_device(repo);
--
--		if (result) {
--			pr_debug("%s:%d ps3_setup_ehci_device failed\n",
--				__func__, __LINE__);
--		}
--
--		result = ps3_setup_ohci_device(repo);
--
--		if (result) {
--			pr_debug("%s:%d ps3_setup_ohci_device failed\n",
--				__func__, __LINE__);
--		}
--		break;
- 	case PS3_DEV_TYPE_STOR_DISK:
- 		result = ps3_setup_storage_dev(repo, PS3_MATCH_ID_STOR_DISK);
- 
-@@ -572,6 +545,48 @@ static int ps3_register_repository_devic
- 	return result;
- }
- 
-+/**
-+ * ps3_setup_static_device - Setup a static device from the repository
-+ */
-+
-+static int __init ps3_setup_static_device(const struct ps3_repository_device *repo)
-+{
-+	int result;
-+
-+	switch (repo->dev_type) {
-+	case PS3_DEV_TYPE_SB_GELIC:
-+		result = ps3_setup_gelic_device(repo);
-+		if (result) {
-+			pr_debug("%s:%d ps3_setup_gelic_device failed\n",
-+				__func__, __LINE__);
-+		}
-+		break;
-+	case PS3_DEV_TYPE_SB_USB:
-+
-+		/* Each USB device has both an EHCI and an OHCI HC */
-+
-+		result = ps3_setup_ehci_device(repo);
-+
-+		if (result) {
-+			pr_debug("%s:%d ps3_setup_ehci_device failed\n",
-+				__func__, __LINE__);
-+		}
-+
-+		result = ps3_setup_ohci_device(repo);
-+
-+		if (result) {
-+			pr_debug("%s:%d ps3_setup_ohci_device failed\n",
-+				__func__, __LINE__);
-+		}
-+		break;
-+
-+	default:
-+		return ps3_setup_dynamic_device(repo);
-+	}
-+
-+	return result;
-+}
-+
- static void ps3_find_and_add_device(u64 bus_id, u64 dev_id)
- {
- 	struct ps3_repository_device repo;
-@@ -601,7 +616,7 @@ found:
- 		pr_debug("%s:%u: device %lu:%lu found after %u retries\n",
- 			 __func__, __LINE__, bus_id, dev_id, retries);
- 
--	ps3_register_repository_device(&repo);
-+	ps3_setup_dynamic_device(&repo);
- 	return;
- }
- 
-@@ -905,8 +920,7 @@ static int __init ps3_register_devices(v
- 
- 	ps3_register_graphics_devices();
- 
--	ps3_repository_find_devices(PS3_BUS_TYPE_SB,
--		ps3_register_repository_device);
-+	ps3_repository_find_devices(PS3_BUS_TYPE_SB, ps3_setup_static_device);
- 
- 	ps3_register_sound_devices();
- 
---- a/arch/powerpc/platforms/ps3/htab.c
-+++ b/arch/powerpc/platforms/ps3/htab.c
-@@ -19,9 +19,10 @@
-  */
- 
- #include <linux/kernel.h>
-+#include <linux/lmb.h>
- 
- #include <asm/machdep.h>
--#include <asm/lmb.h>
-+#include <asm/prom.h>
- #include <asm/udbg.h>
- #include <asm/lv1call.h>
- #include <asm/ps3fb.h>
---- a/arch/powerpc/platforms/ps3/interrupt.c
-+++ b/arch/powerpc/platforms/ps3/interrupt.c
-@@ -709,7 +709,7 @@ static unsigned int ps3_get_irq(void)
- 	asm volatile("cntlzd %0,%1" : "=r" (plug) : "r" (x));
- 	plug &= 0x3f;
- 
--	if (unlikely(plug) == NO_IRQ) {
-+	if (unlikely(plug == NO_IRQ)) {
- 		pr_debug("%s:%d: no plug found: thread_id %lu\n", __func__,
- 			__LINE__, pd->thread_id);
- 		dump_bmp(&per_cpu(ps3_private, 0));
---- a/arch/powerpc/platforms/ps3/mm.c
-+++ b/arch/powerpc/platforms/ps3/mm.c
-@@ -21,9 +21,10 @@
- #include <linux/kernel.h>
- #include <linux/module.h>
- #include <linux/memory_hotplug.h>
-+#include <linux/lmb.h>
- 
- #include <asm/firmware.h>
--#include <asm/lmb.h>
-+#include <asm/prom.h>
- #include <asm/udbg.h>
- #include <asm/lv1call.h>
- 
---- a/arch/powerpc/platforms/ps3/os-area.c
-+++ b/arch/powerpc/platforms/ps3/os-area.c
-@@ -24,8 +24,9 @@
- #include <linux/fs.h>
- #include <linux/syscalls.h>
- #include <linux/ctype.h>
-+#include <linux/lmb.h>
- 
--#include <asm/lmb.h>
-+#include <asm/prom.h>
- 
- #include "platform.h"
- 
---- a/arch/powerpc/platforms/ps3/setup.c
-+++ b/arch/powerpc/platforms/ps3/setup.c
-@@ -95,6 +95,14 @@ static void ps3_power_off(void)
- 	ps3_sys_manager_power_off(); /* never returns */
- }
- 
-+static void ps3_halt(void)
-+{
-+	DBG("%s:%d\n", __func__, __LINE__);
-+
-+	smp_send_stop();
-+	ps3_sys_manager_halt(); /* never returns */
-+}
-+
- static void ps3_panic(char *str)
- {
- 	DBG("%s:%d %s\n", __func__, __LINE__, str);
-@@ -105,7 +113,8 @@ static void ps3_panic(char *str)
- 	printk("   Please press POWER button.\n");
- 	printk("\n");
- 
--	while(1);
-+	while(1)
-+		lv1_pause(1);
- }
- 
- #if defined(CONFIG_FB_PS3) || defined(CONFIG_FB_PS3_MODULE) || \
-@@ -117,7 +126,7 @@ static void __init prealloc(struct ps3_p
- 
- 	p->address = __alloc_bootmem(p->size, p->align, __pa(MAX_DMA_ADDRESS));
- 	if (!p->address) {
--		printk(KERN_ERR "%s: Cannot allocate %s\n", __FUNCTION__,
-+		printk(KERN_ERR "%s: Cannot allocate %s\n", __func__,
- 		       p->name);
- 		return;
- 	}
-@@ -266,6 +275,7 @@ define_machine(ps3) {
- 	.progress			= ps3_progress,
- 	.restart			= ps3_restart,
- 	.power_off			= ps3_power_off,
-+	.halt				= ps3_halt,
- #if defined(CONFIG_KEXEC)
- 	.kexec_cpu_down			= ps3_kexec_cpu_down,
- 	.machine_kexec			= default_machine_kexec,
---- a/arch/powerpc/platforms/ps3/spu.c
-+++ b/arch/powerpc/platforms/ps3/spu.c
-@@ -27,6 +27,7 @@
- #include <asm/spu.h>
- #include <asm/spu_priv1.h>
- #include <asm/lv1call.h>
-+#include <asm/ps3.h>
- 
- #include "../cell/spufs/spufs.h"
- #include "platform.h"
-@@ -140,6 +141,12 @@ static void _dump_areas(unsigned int spe
- 	pr_debug("%s:%d: shadow:  %lxh\n", func, line, shadow);
- }
- 
-+inline u64 ps3_get_spe_id(void *arg)
-+{
-+	return spu_pdata(arg)->spe_id;
-+}
-+EXPORT_SYMBOL_GPL(ps3_get_spe_id);
-+
- static unsigned long get_vas_id(void)
- {
- 	unsigned long id;
---- a/arch/powerpc/platforms/pseries/Makefile
-+++ b/arch/powerpc/platforms/pseries/Makefile
-@@ -18,3 +18,4 @@ obj-$(CONFIG_HOTPLUG_CPU)	+= hotplug-cpu
- obj-$(CONFIG_HVC_CONSOLE)	+= hvconsole.o
- obj-$(CONFIG_HVCS)		+= hvcserver.o
- obj-$(CONFIG_HCALL_STATS)	+= hvCall_inst.o
-+obj-$(CONFIG_PHYP_DUMP)	+= phyp_dump.o
---- a/arch/powerpc/platforms/pseries/eeh.c
-+++ b/arch/powerpc/platforms/pseries/eeh.c
-@@ -945,7 +945,6 @@ static void *early_enable_eeh(struct dev
- 	unsigned int rets[3];
- 	struct eeh_early_enable_info *info = data;
- 	int ret;
--	const char *status = of_get_property(dn, "status", NULL);
- 	const u32 *class_code = of_get_property(dn, "class-code", NULL);
- 	const u32 *vendor_id = of_get_property(dn, "vendor-id", NULL);
- 	const u32 *device_id = of_get_property(dn, "device-id", NULL);
-@@ -959,8 +958,8 @@ static void *early_enable_eeh(struct dev
- 	pdn->eeh_freeze_count = 0;
- 	pdn->eeh_false_positives = 0;
- 
--	if (status && strncmp(status, "ok", 2) != 0)
--		return NULL;	/* ignore devices with bad status */
-+	if (!of_device_is_available(dn))
-+		return NULL;
- 
- 	/* Ignore bad nodes. */
- 	if (!class_code || !vendor_id || !device_id)
---- a/arch/powerpc/platforms/pseries/lpar.c
-+++ b/arch/powerpc/platforms/pseries/lpar.c
-@@ -40,6 +40,7 @@
- #include <asm/smp.h>
- 
- #include "plpar_wrappers.h"
-+#include "pseries.h"
- 
- #ifdef DEBUG_LOW
- #define DBG_LOW(fmt...) do { udbg_printf(fmt); } while(0)
-@@ -203,7 +204,6 @@ void __init find_udbg_vterm(void)
- 	struct device_node *stdout_node;
- 	const u32 *termno;
- 	const char *name;
--	int add_console;
- 
- 	/* find the boot console from /chosen/stdout */
- 	if (!of_chosen)
-@@ -219,8 +219,6 @@ void __init find_udbg_vterm(void)
- 		printk(KERN_WARNING "stdout node missing 'name' property!\n");
- 		goto out;
- 	}
--	/* The user has requested a console so this is already set up. */
--	add_console = !strstr(cmd_line, "console=");
- 
- 	/* Check if it's a virtual terminal */
- 	if (strncmp(name, "vty", 3) != 0)
-@@ -234,15 +232,13 @@ void __init find_udbg_vterm(void)
- 		udbg_putc = udbg_putcLP;
- 		udbg_getc = udbg_getcLP;
- 		udbg_getc_poll = udbg_getc_pollLP;
--		if (add_console)
--			add_preferred_console("hvc", termno[0] & 0xff, NULL);
-+		add_preferred_console("hvc", termno[0] & 0xff, NULL);
- 	} else if (of_device_is_compatible(stdout_node, "hvterm-protocol")) {
- 		vtermno = termno[0];
- 		udbg_putc = udbg_hvsi_putc;
- 		udbg_getc = udbg_hvsi_getc;
- 		udbg_getc_poll = udbg_hvsi_getc_poll;
--		if (add_console)
--			add_preferred_console("hvsi", termno[0] & 0xff, NULL);
-+		add_preferred_console("hvsi", termno[0] & 0xff, NULL);
- 	}
- out:
- 	of_node_put(stdout_node);
-@@ -520,6 +516,20 @@ static void pSeries_lpar_hpte_invalidate
- 	BUG_ON(lpar_rc != H_SUCCESS);
- }
- 
-+static void pSeries_lpar_hpte_removebolted(unsigned long ea,
-+					   int psize, int ssize)
-+{
-+	unsigned long slot, vsid, va;
-+
-+	vsid = get_kernel_vsid(ea, ssize);
-+	va = hpt_va(ea, vsid, ssize);
-+
-+	slot = pSeries_lpar_hpte_find(va, psize, ssize);
-+	BUG_ON(slot == -1);
-+
-+	pSeries_lpar_hpte_invalidate(slot, va, psize, ssize, 0);
-+}
-+
- /* Flag bits for H_BULK_REMOVE */
- #define HBR_REQUEST	0x4000000000000000UL
- #define HBR_RESPONSE	0x8000000000000000UL
-@@ -597,6 +607,7 @@ void __init hpte_init_lpar(void)
- 	ppc_md.hpte_updateboltedpp = pSeries_lpar_hpte_updateboltedpp;
- 	ppc_md.hpte_insert	= pSeries_lpar_hpte_insert;
- 	ppc_md.hpte_remove	= pSeries_lpar_hpte_remove;
-+	ppc_md.hpte_removebolted = pSeries_lpar_hpte_removebolted;
- 	ppc_md.flush_hash_range	= pSeries_lpar_flush_hash_range;
- 	ppc_md.hpte_clear_all   = pSeries_lpar_hptab_clear;
- }
---- a/arch/powerpc/platforms/pseries/pci_dlpar.c
-+++ b/arch/powerpc/platforms/pseries/pci_dlpar.c
-@@ -123,7 +123,7 @@ pcibios_pci_config_bridge(struct pci_dev
- 	/* Add to children of PCI bridge dev->bus */
- 	child_bus = pci_add_new_bus(dev->bus, dev, sec_busno);
- 	if (!child_bus) {
--		printk (KERN_ERR "%s: could not add second bus\n", __FUNCTION__);
-+		printk (KERN_ERR "%s: could not add second bus\n", __func__);
- 		return -EIO;
- 	}
- 	sprintf(child_bus->name, "PCI Bus #%02x", child_bus->number);
---- /dev/null
-+++ b/arch/powerpc/platforms/pseries/phyp_dump.c
-@@ -0,0 +1,507 @@
-+/*
-+ * Hypervisor-assisted dump
-+ *
-+ * Linas Vepstas, Manish Ahuja 2008
-+ * Copyright 2008 IBM Corp.
-+ *
-+ *      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/init.h>
-+#include <linux/kobject.h>
-+#include <linux/mm.h>
-+#include <linux/of.h>
-+#include <linux/pfn.h>
-+#include <linux/swap.h>
-+#include <linux/sysfs.h>
-+
-+#include <asm/page.h>
-+#include <asm/phyp_dump.h>
-+#include <asm/machdep.h>
-+#include <asm/prom.h>
-+#include <asm/rtas.h>
-+
-+/* Variables, used to communicate data between early boot and late boot */
-+static struct phyp_dump phyp_dump_vars;
-+struct phyp_dump *phyp_dump_info = &phyp_dump_vars;
-+
-+static int ibm_configure_kernel_dump;
-+/* ------------------------------------------------- */
-+/* RTAS interfaces to declare the dump regions */
-+
-+struct dump_section {
-+	u32 dump_flags;
-+	u16 source_type;
-+	u16 error_flags;
-+	u64 source_address;
-+	u64 source_length;
-+	u64 length_copied;
-+	u64 destination_address;
-+};
-+
-+struct phyp_dump_header {
-+	u32 version;
-+	u16 num_of_sections;
-+	u16 status;
-+
-+	u32 first_offset_section;
-+	u32 dump_disk_section;
-+	u64 block_num_dd;
-+	u64 num_of_blocks_dd;
-+	u32 offset_dd;
-+	u32 maxtime_to_auto;
-+	/* No dump disk path string used */
-+
-+	struct dump_section cpu_data;
-+	struct dump_section hpte_data;
-+	struct dump_section kernel_data;
-+};
-+
-+/* The dump header *must be* in low memory, so .bss it */
-+static struct phyp_dump_header phdr;
-+
-+#define NUM_DUMP_SECTIONS	3
-+#define DUMP_HEADER_VERSION	0x1
-+#define DUMP_REQUEST_FLAG	0x1
-+#define DUMP_SOURCE_CPU		0x0001
-+#define DUMP_SOURCE_HPTE	0x0002
-+#define DUMP_SOURCE_RMO		0x0011
-+#define DUMP_ERROR_FLAG		0x2000
-+#define DUMP_TRIGGERED		0x4000
-+#define DUMP_PERFORMED		0x8000
-+
-+
-+/**
-+ * init_dump_header() - initialize the header declaring a dump
-+ * Returns: length of dump save area.
-+ *
-+ * When the hypervisor saves crashed state, it needs to put
-+ * it somewhere. The dump header tells the hypervisor where
-+ * the data can be saved.
-+ */
-+static unsigned long init_dump_header(struct phyp_dump_header *ph)
-+{
-+	unsigned long addr_offset = 0;
-+
-+	/* Set up the dump header */
-+	ph->version = DUMP_HEADER_VERSION;
-+	ph->num_of_sections = NUM_DUMP_SECTIONS;
-+	ph->status = 0;
-+
-+	ph->first_offset_section =
-+		(u32)offsetof(struct phyp_dump_header, cpu_data);
-+	ph->dump_disk_section = 0;
-+	ph->block_num_dd = 0;
-+	ph->num_of_blocks_dd = 0;
-+	ph->offset_dd = 0;
-+
-+	ph->maxtime_to_auto = 0; /* disabled */
-+
-+	/* The first two sections are mandatory */
-+	ph->cpu_data.dump_flags = DUMP_REQUEST_FLAG;
-+	ph->cpu_data.source_type = DUMP_SOURCE_CPU;
-+	ph->cpu_data.source_address = 0;
-+	ph->cpu_data.source_length = phyp_dump_info->cpu_state_size;
-+	ph->cpu_data.destination_address = addr_offset;
-+	addr_offset += phyp_dump_info->cpu_state_size;
-+
-+	ph->hpte_data.dump_flags = DUMP_REQUEST_FLAG;
-+	ph->hpte_data.source_type = DUMP_SOURCE_HPTE;
-+	ph->hpte_data.source_address = 0;
-+	ph->hpte_data.source_length = phyp_dump_info->hpte_region_size;
-+	ph->hpte_data.destination_address = addr_offset;
-+	addr_offset += phyp_dump_info->hpte_region_size;
-+
-+	/* This section describes the low kernel region */
-+	ph->kernel_data.dump_flags = DUMP_REQUEST_FLAG;
-+	ph->kernel_data.source_type = DUMP_SOURCE_RMO;
-+	ph->kernel_data.source_address = PHYP_DUMP_RMR_START;
-+	ph->kernel_data.source_length = PHYP_DUMP_RMR_END;
-+	ph->kernel_data.destination_address = addr_offset;
-+	addr_offset += ph->kernel_data.source_length;
-+
-+	return addr_offset;
-+}
-+
-+static void print_dump_header(const struct phyp_dump_header *ph)
-+{
-+#ifdef DEBUG
-+	printk(KERN_INFO "dump header:\n");
-+	/* setup some ph->sections required */
-+	printk(KERN_INFO "version = %d\n", ph->version);
-+	printk(KERN_INFO "Sections = %d\n", ph->num_of_sections);
-+	printk(KERN_INFO "Status = 0x%x\n", ph->status);
-+
-+	/* No ph->disk, so all should be set to 0 */
-+	printk(KERN_INFO "Offset to first section 0x%x\n",
-+		ph->first_offset_section);
-+	printk(KERN_INFO "dump disk sections should be zero\n");
-+	printk(KERN_INFO "dump disk section = %d\n", ph->dump_disk_section);
-+	printk(KERN_INFO "block num = %ld\n", ph->block_num_dd);
-+	printk(KERN_INFO "number of blocks = %ld\n", ph->num_of_blocks_dd);
-+	printk(KERN_INFO "dump disk offset = %d\n", ph->offset_dd);
-+	printk(KERN_INFO "Max auto time= %d\n", ph->maxtime_to_auto);
-+
-+	/*set cpu state and hpte states as well scratch pad area */
-+	printk(KERN_INFO " CPU AREA \n");
-+	printk(KERN_INFO "cpu dump_flags =%d\n", ph->cpu_data.dump_flags);
-+	printk(KERN_INFO "cpu source_type =%d\n", ph->cpu_data.source_type);
-+	printk(KERN_INFO "cpu error_flags =%d\n", ph->cpu_data.error_flags);
-+	printk(KERN_INFO "cpu source_address =%lx\n",
-+		ph->cpu_data.source_address);
-+	printk(KERN_INFO "cpu source_length =%lx\n",
-+		ph->cpu_data.source_length);
-+	printk(KERN_INFO "cpu length_copied =%lx\n",
-+		ph->cpu_data.length_copied);
-+
-+	printk(KERN_INFO " HPTE AREA \n");
-+	printk(KERN_INFO "HPTE dump_flags =%d\n", ph->hpte_data.dump_flags);
-+	printk(KERN_INFO "HPTE source_type =%d\n", ph->hpte_data.source_type);
-+	printk(KERN_INFO "HPTE error_flags =%d\n", ph->hpte_data.error_flags);
-+	printk(KERN_INFO "HPTE source_address =%lx\n",
-+		ph->hpte_data.source_address);
-+	printk(KERN_INFO "HPTE source_length =%lx\n",
-+		ph->hpte_data.source_length);
-+	printk(KERN_INFO "HPTE length_copied =%lx\n",
-+		ph->hpte_data.length_copied);
-+
-+	printk(KERN_INFO " SRSD AREA \n");
-+	printk(KERN_INFO "SRSD dump_flags =%d\n", ph->kernel_data.dump_flags);
-+	printk(KERN_INFO "SRSD source_type =%d\n", ph->kernel_data.source_type);
-+	printk(KERN_INFO "SRSD error_flags =%d\n", ph->kernel_data.error_flags);
-+	printk(KERN_INFO "SRSD source_address =%lx\n",
-+		ph->kernel_data.source_address);
-+	printk(KERN_INFO "SRSD source_length =%lx\n",
-+		ph->kernel_data.source_length);
-+	printk(KERN_INFO "SRSD length_copied =%lx\n",
-+		ph->kernel_data.length_copied);
-+#endif
-+}
-+
-+static ssize_t show_phyp_dump_active(struct kobject *kobj,
-+			struct kobj_attribute *attr, char *buf)
-+{
-+
-+	/* create filesystem entry so kdump is phyp-dump aware */
-+	return sprintf(buf, "%lx\n", phyp_dump_info->phyp_dump_at_boot);
-+}
-+
-+static struct kobj_attribute pdl = __ATTR(phyp_dump_active, 0600,
-+					show_phyp_dump_active,
-+					NULL);
-+
-+static void register_dump_area(struct phyp_dump_header *ph, unsigned long addr)
-+{
-+	int rc;
-+
-+	/* Add addr value if not initialized before */
-+	if (ph->cpu_data.destination_address == 0) {
-+		ph->cpu_data.destination_address += addr;
-+		ph->hpte_data.destination_address += addr;
-+		ph->kernel_data.destination_address += addr;
-+	}
-+
-+	/* ToDo Invalidate kdump and free memory range. */
-+
-+	do {
-+		rc = rtas_call(ibm_configure_kernel_dump, 3, 1, NULL,
-+				1, ph, sizeof(struct phyp_dump_header));
-+	} while (rtas_busy_delay(rc));
-+
-+	if (rc) {
-+		printk(KERN_ERR "phyp-dump: unexpected error (%d) on "
-+						"register\n", rc);
-+		print_dump_header(ph);
-+		return;
-+	}
-+
-+	rc = sysfs_create_file(kernel_kobj, &pdl.attr);
-+	if (rc)
-+		printk(KERN_ERR "phyp-dump: unable to create sysfs"
-+				" file (%d)\n", rc);
-+}
-+
-+static
-+void invalidate_last_dump(struct phyp_dump_header *ph, unsigned long addr)
-+{
-+	int rc;
-+
-+	/* Add addr value if not initialized before */
-+	if (ph->cpu_data.destination_address == 0) {
-+		ph->cpu_data.destination_address += addr;
-+		ph->hpte_data.destination_address += addr;
-+		ph->kernel_data.destination_address += addr;
-+	}
-+
-+	do {
-+		rc = rtas_call(ibm_configure_kernel_dump, 3, 1, NULL,
-+				2, ph, sizeof(struct phyp_dump_header));
-+	} while (rtas_busy_delay(rc));
-+
-+	if (rc) {
-+		printk(KERN_ERR "phyp-dump: unexpected error (%d) "
-+						"on invalidate\n", rc);
-+		print_dump_header(ph);
-+	}
-+}
-+
-+/* ------------------------------------------------- */
-+/**
-+ * release_memory_range -- release memory previously lmb_reserved
-+ * @start_pfn: starting physical frame number
-+ * @nr_pages: number of pages to free.
-+ *
-+ * This routine will release memory that had been previously
-+ * lmb_reserved in early boot. The released memory becomes
-+ * available for genreal use.
-+ */
-+static void release_memory_range(unsigned long start_pfn,
-+			unsigned long nr_pages)
-+{
-+	struct page *rpage;
-+	unsigned long end_pfn;
-+	long i;
-+
-+	end_pfn = start_pfn + nr_pages;
-+
-+	for (i = start_pfn; i <= end_pfn; i++) {
-+		rpage = pfn_to_page(i);
-+		if (PageReserved(rpage)) {
-+			ClearPageReserved(rpage);
-+			init_page_count(rpage);
-+			__free_page(rpage);
-+			totalram_pages++;
-+		}
-+	}
-+}
-+
-+/**
-+ * track_freed_range -- Counts the range being freed.
-+ * Once the counter goes to zero, it re-registers dump for
-+ * future use.
-+ */
-+static void
-+track_freed_range(unsigned long addr, unsigned long length)
-+{
-+	static unsigned long scratch_area_size, reserved_area_size;
-+
-+	if (addr < phyp_dump_info->init_reserve_start)
-+		return;
-+
-+	if ((addr >= phyp_dump_info->init_reserve_start) &&
-+	    (addr <= phyp_dump_info->init_reserve_start +
-+	     phyp_dump_info->init_reserve_size))
-+		reserved_area_size += length;
-+
-+	if ((addr >= phyp_dump_info->reserved_scratch_addr) &&
-+	    (addr <= phyp_dump_info->reserved_scratch_addr +
-+	     phyp_dump_info->reserved_scratch_size))
-+		scratch_area_size += length;
-+
-+	if ((reserved_area_size == phyp_dump_info->init_reserve_size) &&
-+	    (scratch_area_size == phyp_dump_info->reserved_scratch_size)) {
-+
-+		invalidate_last_dump(&phdr,
-+				phyp_dump_info->reserved_scratch_addr);
-+		register_dump_area(&phdr,
-+				phyp_dump_info->reserved_scratch_addr);
-+	}
-+}
-+
-+/* ------------------------------------------------- */
-+/**
-+ * sysfs_release_region -- sysfs interface to release memory range.
-+ *
-+ * Usage:
-+ *   "echo <start addr> <length> > /sys/kernel/release_region"
-+ *
-+ * Example:
-+ *   "echo 0x40000000 0x10000000 > /sys/kernel/release_region"
-+ *
-+ * will release 256MB starting at 1GB.
-+ */
-+static ssize_t store_release_region(struct kobject *kobj,
-+				struct kobj_attribute *attr,
-+				const char *buf, size_t count)
-+{
-+	unsigned long start_addr, length, end_addr;
-+	unsigned long start_pfn, nr_pages;
-+	ssize_t ret;
-+
-+	ret = sscanf(buf, "%lx %lx", &start_addr, &length);
-+	if (ret != 2)
-+		return -EINVAL;
-+
-+	track_freed_range(start_addr, length);
-+
-+	/* Range-check - don't free any reserved memory that
-+	 * wasn't reserved for phyp-dump */
-+	if (start_addr < phyp_dump_info->init_reserve_start)
-+		start_addr = phyp_dump_info->init_reserve_start;
-+
-+	end_addr = phyp_dump_info->init_reserve_start +
-+			phyp_dump_info->init_reserve_size;
-+	if (start_addr+length > end_addr)
-+		length = end_addr - start_addr;
-+
-+	/* Release the region of memory assed in by user */
-+	start_pfn = PFN_DOWN(start_addr);
-+	nr_pages = PFN_DOWN(length);
-+	release_memory_range(start_pfn, nr_pages);
-+
-+	return count;
-+}
-+
-+static ssize_t show_release_region(struct kobject *kobj,
-+			struct kobj_attribute *attr, char *buf)
-+{
-+	u64 second_addr_range;
-+
-+	/* total reserved size - start of scratch area */
-+	second_addr_range = phyp_dump_info->init_reserve_size -
-+				phyp_dump_info->reserved_scratch_size;
-+	return sprintf(buf, "CPU:0x%lx-0x%lx: HPTE:0x%lx-0x%lx:"
-+			    " DUMP:0x%lx-0x%lx, 0x%lx-0x%lx:\n",
-+		phdr.cpu_data.destination_address,
-+		phdr.cpu_data.length_copied,
-+		phdr.hpte_data.destination_address,
-+		phdr.hpte_data.length_copied,
-+		phdr.kernel_data.destination_address,
-+		phdr.kernel_data.length_copied,
-+		phyp_dump_info->init_reserve_start,
-+		second_addr_range);
-+}
-+
-+static struct kobj_attribute rr = __ATTR(release_region, 0600,
-+					show_release_region,
-+					store_release_region);
-+
-+static int __init phyp_dump_setup(void)
-+{
-+	struct device_node *rtas;
-+	const struct phyp_dump_header *dump_header = NULL;
-+	unsigned long dump_area_start;
-+	unsigned long dump_area_length;
-+	int header_len = 0;
-+	int rc;
-+
-+	/* If no memory was reserved in early boot, there is nothing to do */
-+	if (phyp_dump_info->init_reserve_size == 0)
-+		return 0;
-+
-+	/* Return if phyp dump not supported */
-+	if (!phyp_dump_info->phyp_dump_configured)
-+		return -ENOSYS;
-+
-+	/* Is there dump data waiting for us? If there isn't,
-+	 * then register a new dump area, and release all of
-+	 * the rest of the reserved ram.
-+	 *
-+	 * The /rtas/ibm,kernel-dump rtas node is present only
-+	 * if there is dump data waiting for us.
-+	 */
-+	rtas = of_find_node_by_path("/rtas");
-+	if (rtas) {
-+		dump_header = of_get_property(rtas, "ibm,kernel-dump",
-+						&header_len);
-+		of_node_put(rtas);
-+	}
-+
-+	print_dump_header(dump_header);
-+	dump_area_length = init_dump_header(&phdr);
-+	/* align down */
-+	dump_area_start = phyp_dump_info->init_reserve_start & PAGE_MASK;
-+
-+	if (dump_header == NULL) {
-+		register_dump_area(&phdr, dump_area_start);
-+		return 0;
-+	}
-+
-+	/* re-register the dump area, if old dump was invalid */
-+	if ((dump_header) && (dump_header->status & DUMP_ERROR_FLAG)) {
-+		invalidate_last_dump(&phdr, dump_area_start);
-+		register_dump_area(&phdr, dump_area_start);
-+		return 0;
-+	}
-+
-+	if (dump_header) {
-+		phyp_dump_info->reserved_scratch_addr =
-+				dump_header->cpu_data.destination_address;
-+		phyp_dump_info->reserved_scratch_size =
-+				dump_header->cpu_data.source_length +
-+				dump_header->hpte_data.source_length +
-+				dump_header->kernel_data.source_length;
-+	}
-+
-+	/* Should we create a dump_subsys, analogous to s390/ipl.c ? */
-+	rc = sysfs_create_file(kernel_kobj, &rr.attr);
-+	if (rc)
-+		printk(KERN_ERR "phyp-dump: unable to create sysfs file (%d)\n",
-+									rc);
-+
-+	/* ToDo: re-register the dump area, for next time. */
-+	return 0;
-+}
-+machine_subsys_initcall(pseries, phyp_dump_setup);
-+
-+int __init early_init_dt_scan_phyp_dump(unsigned long node,
-+		const char *uname, int depth, void *data)
-+{
-+	const unsigned int *sizes;
-+
-+	phyp_dump_info->phyp_dump_configured = 0;
-+	phyp_dump_info->phyp_dump_is_active = 0;
-+
-+	if (depth != 1 || strcmp(uname, "rtas") != 0)
-+		return 0;
-+
-+	if (of_get_flat_dt_prop(node, "ibm,configure-kernel-dump", NULL))
-+		phyp_dump_info->phyp_dump_configured++;
-+
-+	if (of_get_flat_dt_prop(node, "ibm,dump-kernel", NULL))
-+		phyp_dump_info->phyp_dump_is_active++;
-+
-+	sizes = of_get_flat_dt_prop(node, "ibm,configure-kernel-dump-sizes",
-+				    NULL);
-+	if (!sizes)
-+		return 0;
-+
-+	if (sizes[0] == 1)
-+		phyp_dump_info->cpu_state_size = *((unsigned long *)&sizes[1]);
-+
-+	if (sizes[3] == 2)
-+		phyp_dump_info->hpte_region_size =
-+						*((unsigned long *)&sizes[4]);
-+	return 1;
-+}
-+
-+/* Look for phyp_dump= cmdline option */
-+static int __init early_phyp_dump_enabled(char *p)
-+{
-+	phyp_dump_info->phyp_dump_at_boot = 1;
-+
-+        if (!p)
-+                return 0;
-+
-+        if (strncmp(p, "1", 1) == 0)
-+		phyp_dump_info->phyp_dump_at_boot = 1;
-+        else if (strncmp(p, "0", 1) == 0)
-+		phyp_dump_info->phyp_dump_at_boot = 0;
-+
-+        return 0;
-+}
-+early_param("phyp_dump", early_phyp_dump_enabled);
-+
-+/* Look for phyp_dump_reserve_size= cmdline option */
-+static int __init early_phyp_dump_reserve_size(char *p)
-+{
-+        if (p)
-+		phyp_dump_info->reserve_bootvar = memparse(p, &p);
-+
-+        return 0;
-+}
-+early_param("phyp_dump_reserve_size", early_phyp_dump_reserve_size);
---- a/arch/powerpc/platforms/pseries/pseries.h
-+++ b/arch/powerpc/platforms/pseries/pseries.h
-@@ -38,4 +38,6 @@ extern void pSeries_final_fixup(void);
- /* Poweron flag used for enabling auto ups restart */
- extern unsigned long rtas_poweron_auto;
- 
-+extern void find_udbg_vterm(void);
-+
- #endif /* _PSERIES_PSERIES_H */
---- a/arch/powerpc/platforms/pseries/reconfig.c
-+++ b/arch/powerpc/platforms/pseries/reconfig.c
-@@ -222,14 +222,14 @@ static char * parse_next_property(char *
- 	tmp = strchr(buf, ' ');
- 	if (!tmp) {
- 		printk(KERN_ERR "property parse failed in %s at line %d\n",
--		       __FUNCTION__, __LINE__);
-+		       __func__, __LINE__);
- 		return NULL;
- 	}
- 	*tmp = '\0';
- 
- 	if (++tmp >= end) {
- 		printk(KERN_ERR "property parse failed in %s at line %d\n",
--		       __FUNCTION__, __LINE__);
-+		       __func__, __LINE__);
- 		return NULL;
- 	}
- 
-@@ -238,12 +238,12 @@ static char * parse_next_property(char *
- 	*length = simple_strtoul(tmp, &tmp, 10);
- 	if (*length == -1) {
- 		printk(KERN_ERR "property parse failed in %s at line %d\n",
--		       __FUNCTION__, __LINE__);
-+		       __func__, __LINE__);
- 		return NULL;
- 	}
- 	if (*tmp != ' ' || ++tmp >= end) {
- 		printk(KERN_ERR "property parse failed in %s at line %d\n",
--		       __FUNCTION__, __LINE__);
-+		       __func__, __LINE__);
- 		return NULL;
- 	}
- 
-@@ -252,12 +252,12 @@ static char * parse_next_property(char *
- 	tmp += *length;
- 	if (tmp > end) {
- 		printk(KERN_ERR "property parse failed in %s at line %d\n",
--		       __FUNCTION__, __LINE__);
-+		       __func__, __LINE__);
- 		return NULL;
- 	}
- 	else if (tmp < end && *tmp != ' ' && *tmp != '\0') {
- 		printk(KERN_ERR "property parse failed in %s at line %d\n",
--		       __FUNCTION__, __LINE__);
-+		       __func__, __LINE__);
- 		return NULL;
- 	}
- 	tmp++;
---- a/arch/powerpc/platforms/pseries/scanlog.c
-+++ b/arch/powerpc/platforms/pseries/scanlog.c
-@@ -195,31 +195,30 @@ const struct file_operations scanlog_fop
- static int __init scanlog_init(void)
- {
- 	struct proc_dir_entry *ent;
-+	void *data;
-+	int err = -ENOMEM;
- 
- 	ibm_scan_log_dump = rtas_token("ibm,scan-log-dump");
--	if (ibm_scan_log_dump == RTAS_UNKNOWN_SERVICE) {
--		printk(KERN_ERR "scan-log-dump not implemented on this system\n");
--		return -EIO;
--	}
-+	if (ibm_scan_log_dump == RTAS_UNKNOWN_SERVICE)
-+		return -ENODEV;
- 
--        ent = create_proc_entry("ppc64/rtas/scan-log-dump",  S_IRUSR, NULL);
--	if (ent) {
--		ent->proc_fops = &scanlog_fops;
--		/* Ideally we could allocate a buffer < 4G */
--		ent->data = kmalloc(RTAS_DATA_BUF_SIZE, GFP_KERNEL);
--		if (!ent->data) {
--			printk(KERN_ERR "Failed to allocate a buffer\n");
--			remove_proc_entry("scan-log-dump", ent->parent);
--			return -ENOMEM;
--		}
--		((unsigned int *)ent->data)[0] = 0;
--	} else {
--		printk(KERN_ERR "Failed to create ppc64/scan-log-dump proc entry\n");
--		return -EIO;
--	}
-+	/* Ideally we could allocate a buffer < 4G */
-+	data = kzalloc(RTAS_DATA_BUF_SIZE, GFP_KERNEL);
-+	if (!data)
-+		goto err;
-+
-+	ent = proc_create("ppc64/rtas/scan-log-dump", S_IRUSR, NULL,
-+			  &scanlog_fops);
-+	if (!ent)
-+		goto err;
-+
-+	ent->data = data;
- 	proc_ppc64_scan_log_dump = ent;
- 
- 	return 0;
-+err:
-+	kfree(data);
-+	return err;
- }
- 
- static void __exit scanlog_cleanup(void)
---- a/arch/powerpc/platforms/pseries/setup.c
-+++ b/arch/powerpc/platforms/pseries/setup.c
-@@ -76,9 +76,6 @@
- #define DBG(fmt...)
- #endif
- 
--/* move those away to a .h */
--extern void find_udbg_vterm(void);
--
- int fwnmi_active;  /* TRUE if an FWNMI handler is present */
- 
- static void pseries_shared_idle_sleep(void);
-@@ -127,14 +124,60 @@ void pseries_8259_cascade(unsigned int i
- 	desc->chip->eoi(irq);
- }
- 
--static void __init pseries_mpic_init_IRQ(void)
-+static void __init pseries_setup_i8259_cascade(void)
- {
--	struct device_node *np, *old, *cascade = NULL;
--        const unsigned int *addrp;
-+	struct device_node *np, *old, *found = NULL;
-+	unsigned int cascade;
-+	const u32 *addrp;
- 	unsigned long intack = 0;
-+	int naddr;
-+
-+	for_each_node_by_type(np, "interrupt-controller") {
-+		if (of_device_is_compatible(np, "chrp,iic")) {
-+			found = np;
-+			break;
-+		}
-+	}
-+
-+	if (found == NULL) {
-+		printk(KERN_DEBUG "pic: no ISA interrupt controller\n");
-+		return;
-+	}
-+
-+	cascade = irq_of_parse_and_map(found, 0);
-+	if (cascade == NO_IRQ) {
-+		printk(KERN_ERR "pic: failed to map cascade interrupt");
-+		return;
-+	}
-+	pr_debug("pic: cascade mapped to irq %d\n", cascade);
-+
-+	for (old = of_node_get(found); old != NULL ; old = np) {
-+		np = of_get_parent(old);
-+		of_node_put(old);
-+		if (np == NULL)
-+			break;
-+		if (strcmp(np->name, "pci") != 0)
-+			continue;
-+		addrp = of_get_property(np, "8259-interrupt-acknowledge", NULL);
-+		if (addrp == NULL)
-+			continue;
-+		naddr = of_n_addr_cells(np);
-+		intack = addrp[naddr-1];
-+		if (naddr > 1)
-+			intack |= ((unsigned long)addrp[naddr-2]) << 32;
-+	}
-+	if (intack)
-+		printk(KERN_DEBUG "pic: PCI 8259 intack at 0x%016lx\n", intack);
-+	i8259_init(found, intack);
-+	of_node_put(found);
-+	set_irq_chained_handler(cascade, pseries_8259_cascade);
-+}
-+
-+static void __init pseries_mpic_init_IRQ(void)
-+{
-+	struct device_node *np;
- 	const unsigned int *opprop;
- 	unsigned long openpic_addr = 0;
--	unsigned int cascade_irq;
- 	int naddr, n, i, opplen;
- 	struct mpic *mpic;
- 
-@@ -167,43 +210,13 @@ static void __init pseries_mpic_init_IRQ
- 	mpic_init(mpic);
- 
- 	/* Look for cascade */
--	for_each_node_by_type(np, "interrupt-controller")
--		if (of_device_is_compatible(np, "chrp,iic")) {
--			cascade = np;
--			break;
--		}
--	if (cascade == NULL)
--		return;
--
--	cascade_irq = irq_of_parse_and_map(cascade, 0);
--	if (cascade_irq == NO_IRQ) {
--		printk(KERN_ERR "mpic: failed to map cascade interrupt");
--		return;
--	}
-+	pseries_setup_i8259_cascade();
-+}
- 
--	/* Check ACK type */
--	for (old = of_node_get(cascade); old != NULL ; old = np) {
--		np = of_get_parent(old);
--		of_node_put(old);
--		if (np == NULL)
--			break;
--		if (strcmp(np->name, "pci") != 0)
--			continue;
--		addrp = of_get_property(np, "8259-interrupt-acknowledge",
--					    NULL);
--		if (addrp == NULL)
--			continue;
--		naddr = of_n_addr_cells(np);
--		intack = addrp[naddr-1];
--		if (naddr > 1)
--			intack |= ((unsigned long)addrp[naddr-2]) << 32;
--	}
--	if (intack)
--		printk(KERN_DEBUG "mpic: PCI 8259 intack at 0x%016lx\n",
--		       intack);
--	i8259_init(cascade, intack);
--	of_node_put(cascade);
--	set_irq_chained_handler(cascade_irq, pseries_8259_cascade);
-+static void __init pseries_xics_init_IRQ(void)
-+{
-+	xics_init_IRQ();
-+	pseries_setup_i8259_cascade();
- }
- 
- static void pseries_lpar_enable_pmcs(void)
-@@ -235,7 +248,7 @@ static void __init pseries_discover_pic(
- 			smp_init_pseries_mpic();
- 			return;
- 		} else if (strstr(typep, "ppc-xicp")) {
--			ppc_md.init_IRQ       = xics_init_IRQ;
-+			ppc_md.init_IRQ       = pseries_xics_init_IRQ;
- 			setup_kexec_cpu_down_xics();
- 			smp_init_pseries_xics();
- 			return;
-@@ -393,6 +406,7 @@ static void pseries_dedicated_idle_sleep
- { 
- 	unsigned int cpu = smp_processor_id();
- 	unsigned long start_snooze;
-+	unsigned long in_purr, out_purr;
- 
- 	/*
- 	 * Indicate to the HV that we are idle. Now would be
-@@ -400,6 +414,7 @@ static void pseries_dedicated_idle_sleep
- 	 */
- 	get_lppaca()->idle = 1;
- 	get_lppaca()->donate_dedicated_cpu = 1;
-+	in_purr = mfspr(SPRN_PURR);
- 
- 	/*
- 	 * We come in with interrupts disabled, and need_resched()
-@@ -432,6 +447,8 @@ static void pseries_dedicated_idle_sleep
- 
- out:
- 	HMT_medium();
-+	out_purr = mfspr(SPRN_PURR);
-+	get_lppaca()->wait_state_cycles += out_purr - in_purr;
- 	get_lppaca()->donate_dedicated_cpu = 0;
- 	get_lppaca()->idle = 0;
- }
---- a/arch/powerpc/platforms/pseries/xics.c
-+++ b/arch/powerpc/platforms/pseries/xics.c
-@@ -516,6 +516,8 @@ static struct irq_chip xics_pic_lpar = {
- 	.set_affinity = xics_set_affinity
- };
- 
-+/* Points to the irq_chip we're actually using */
-+static struct irq_chip *xics_irq_chip;
- 
- static int xics_host_match(struct irq_host *h, struct device_node *node)
- {
-@@ -526,23 +528,13 @@ static int xics_host_match(struct irq_ho
- 	return !of_device_is_compatible(node, "chrp,iic");
- }
- 
--static int xics_host_map_direct(struct irq_host *h, unsigned int virq,
--				irq_hw_number_t hw)
-+static int xics_host_map(struct irq_host *h, unsigned int virq,
-+			 irq_hw_number_t hw)
- {
--	pr_debug("xics: map_direct virq %d, hwirq 0x%lx\n", virq, hw);
-+	pr_debug("xics: map virq %d, hwirq 0x%lx\n", virq, hw);
- 
- 	get_irq_desc(virq)->status |= IRQ_LEVEL;
--	set_irq_chip_and_handler(virq, &xics_pic_direct, handle_fasteoi_irq);
--	return 0;
--}
--
--static int xics_host_map_lpar(struct irq_host *h, unsigned int virq,
--			      irq_hw_number_t hw)
--{
--	pr_debug("xics: map_direct virq %d, hwirq 0x%lx\n", virq, hw);
--
--	get_irq_desc(virq)->status |= IRQ_LEVEL;
--	set_irq_chip_and_handler(virq, &xics_pic_lpar, handle_fasteoi_irq);
-+	set_irq_chip_and_handler(virq, xics_irq_chip, handle_fasteoi_irq);
- 	return 0;
- }
- 
-@@ -561,27 +553,20 @@ static int xics_host_xlate(struct irq_ho
- 	return 0;
- }
- 
--static struct irq_host_ops xics_host_direct_ops = {
--	.match = xics_host_match,
--	.map = xics_host_map_direct,
--	.xlate = xics_host_xlate,
--};
--
--static struct irq_host_ops xics_host_lpar_ops = {
-+static struct irq_host_ops xics_host_ops = {
- 	.match = xics_host_match,
--	.map = xics_host_map_lpar,
-+	.map = xics_host_map,
- 	.xlate = xics_host_xlate,
- };
- 
- static void __init xics_init_host(void)
- {
--	struct irq_host_ops *ops;
--
- 	if (firmware_has_feature(FW_FEATURE_LPAR))
--		ops = &xics_host_lpar_ops;
-+		xics_irq_chip = &xics_pic_lpar;
- 	else
--		ops = &xics_host_direct_ops;
--	xics_host = irq_alloc_host(NULL, IRQ_HOST_MAP_TREE, 0, ops,
-+		xics_irq_chip = &xics_pic_direct;
-+
-+	xics_host = irq_alloc_host(NULL, IRQ_HOST_MAP_TREE, 0, &xics_host_ops,
- 				   XICS_IRQ_SPURIOUS);
- 	BUG_ON(xics_host == NULL);
- 	irq_set_default_host(xics_host);
-@@ -655,52 +640,6 @@ static void __init xics_init_one_node(st
- 	}
- }
- 
--
--static void __init xics_setup_8259_cascade(void)
--{
--	struct device_node *np, *old, *found = NULL;
--	int cascade, naddr;
--	const u32 *addrp;
--	unsigned long intack = 0;
--
--	for_each_node_by_type(np, "interrupt-controller")
--		if (of_device_is_compatible(np, "chrp,iic")) {
--			found = np;
--			break;
--		}
--	if (found == NULL) {
--		printk(KERN_DEBUG "xics: no ISA interrupt controller\n");
--		return;
--	}
--	cascade = irq_of_parse_and_map(found, 0);
--	if (cascade == NO_IRQ) {
--		printk(KERN_ERR "xics: failed to map cascade interrupt");
--		return;
--	}
--	pr_debug("xics: cascade mapped to irq %d\n", cascade);
--
--	for (old = of_node_get(found); old != NULL ; old = np) {
--		np = of_get_parent(old);
--		of_node_put(old);
--		if (np == NULL)
--			break;
--		if (strcmp(np->name, "pci") != 0)
--			continue;
--		addrp = of_get_property(np, "8259-interrupt-acknowledge", NULL);
--		if (addrp == NULL)
--			continue;
--		naddr = of_n_addr_cells(np);
--		intack = addrp[naddr-1];
--		if (naddr > 1)
--			intack |= ((unsigned long)addrp[naddr-2]) << 32;
--	}
--	if (intack)
--		printk(KERN_DEBUG "xics: PCI 8259 intack at 0x%016lx\n", intack);
--	i8259_init(found, intack);
--	of_node_put(found);
--	set_irq_chained_handler(cascade, pseries_8259_cascade);
--}
--
- void __init xics_init_IRQ(void)
- {
- 	struct device_node *np;
-@@ -733,8 +672,6 @@ void __init xics_init_IRQ(void)
- 
- 	xics_setup_cpu();
- 
--	xics_setup_8259_cascade();
--
- 	ppc64_boot_msg(0x21, "XICS Done");
- }
- 
---- a/arch/powerpc/platforms/pseries/xics.h
-+++ b/arch/powerpc/platforms/pseries/xics.h
-@@ -28,7 +28,4 @@ struct xics_ipi_struct {
- 
- extern struct xics_ipi_struct xics_ipi_message[NR_CPUS] __cacheline_aligned;
- 
--struct irq_desc;
--extern void pseries_8259_cascade(unsigned int irq, struct irq_desc *desc);
--
- #endif /* _POWERPC_KERNEL_XICS_H */
---- a/arch/powerpc/sysdev/Makefile
-+++ b/arch/powerpc/sysdev/Makefile
-@@ -12,6 +12,7 @@ obj-$(CONFIG_U3_DART)		+= dart_iommu.o
- obj-$(CONFIG_MMIO_NVRAM)	+= mmio_nvram.o
- obj-$(CONFIG_FSL_SOC)		+= fsl_soc.o
- obj-$(CONFIG_FSL_PCI)		+= fsl_pci.o
-+obj-$(CONFIG_FSL_LBC)		+= fsl_lbc.o
- obj-$(CONFIG_RAPIDIO)		+= fsl_rio.o
- obj-$(CONFIG_TSI108_BRIDGE)	+= tsi108_pci.o tsi108_dev.o
- obj-$(CONFIG_QUICC_ENGINE)	+= qe_lib/
-@@ -27,6 +28,7 @@ obj-$(CONFIG_PPC_INDIRECT_PCI)	+= indire
- obj-$(CONFIG_PPC_I8259)		+= i8259.o
- obj-$(CONFIG_IPIC)		+= ipic.o
- obj-$(CONFIG_4xx)		+= uic.o
-+obj-$(CONFIG_4xx_SOC)		+= ppc4xx_soc.o
- obj-$(CONFIG_XILINX_VIRTEX)	+= xilinx_intc.o
- obj-$(CONFIG_OF_RTC)		+= of_rtc.o
- ifeq ($(CONFIG_PCI),y)
---- a/arch/powerpc/sysdev/cpm1.c
-+++ b/arch/powerpc/sysdev/cpm1.c
-@@ -44,9 +44,6 @@
- 
- #define CPM_MAP_SIZE    (0x4000)
- 
--#ifndef CONFIG_PPC_CPM_NEW_BINDING
--static void m8xx_cpm_dpinit(void);
--#endif
- cpm8xx_t __iomem *cpmp;  /* Pointer to comm processor space */
- immap_t __iomem *mpc8xx_immr;
- static cpic8xx_t __iomem *cpic_reg;
-@@ -229,12 +226,7 @@ void __init cpm_reset(void)
- 	out_be32(&siu_conf->sc_sdcr, 1);
- 	immr_unmap(siu_conf);
- 
--#ifdef CONFIG_PPC_CPM_NEW_BINDING
- 	cpm_muram_init();
--#else
--	/* Reclaim the DP memory for our use. */
--	m8xx_cpm_dpinit();
--#endif
- }
- 
- static DEFINE_SPINLOCK(cmd_lock);
-@@ -257,7 +249,7 @@ int cpm_command(u32 command, u8 opcode)
- 		if ((in_be16(&cpmp->cp_cpcr) & CPM_CR_FLG) == 0)
- 			goto out;
- 
--	printk(KERN_ERR "%s(): Not able to issue CPM command\n", __FUNCTION__);
-+	printk(KERN_ERR "%s(): Not able to issue CPM command\n", __func__);
- 	ret = -EIO;
- out:
- 	spin_unlock_irqrestore(&cmd_lock, flags);
-@@ -293,110 +285,6 @@ cpm_setbrg(uint brg, uint rate)
- 			      CPM_BRG_EN | CPM_BRG_DIV16);
- }
- 
--#ifndef CONFIG_PPC_CPM_NEW_BINDING
--/*
-- * dpalloc / dpfree bits.
-- */
--static spinlock_t cpm_dpmem_lock;
--/*
-- * 16 blocks should be enough to satisfy all requests
-- * until the memory subsystem goes up...
-- */
--static rh_block_t cpm_boot_dpmem_rh_block[16];
--static rh_info_t cpm_dpmem_info;
--
--#define CPM_DPMEM_ALIGNMENT	8
--static u8 __iomem *dpram_vbase;
--static phys_addr_t dpram_pbase;
--
--static void m8xx_cpm_dpinit(void)
--{
--	spin_lock_init(&cpm_dpmem_lock);
--
--	dpram_vbase = cpmp->cp_dpmem;
--	dpram_pbase = get_immrbase() + offsetof(immap_t, im_cpm.cp_dpmem);
--
--	/* Initialize the info header */
--	rh_init(&cpm_dpmem_info, CPM_DPMEM_ALIGNMENT,
--			sizeof(cpm_boot_dpmem_rh_block) /
--			sizeof(cpm_boot_dpmem_rh_block[0]),
--			cpm_boot_dpmem_rh_block);
--
--	/*
--	 * Attach the usable dpmem area.
--	 * XXX: This is actually crap.  CPM_DATAONLY_BASE and
--	 * CPM_DATAONLY_SIZE are a subset of the available dparm.  It varies
--	 * with the processor and the microcode patches applied / activated.
--	 * But the following should be at least safe.
--	 */
--	rh_attach_region(&cpm_dpmem_info, CPM_DATAONLY_BASE, CPM_DATAONLY_SIZE);
--}
--
--/*
-- * Allocate the requested size worth of DP memory.
-- * This function returns an offset into the DPRAM area.
-- * Use cpm_dpram_addr() to get the virtual address of the area.
-- */
--unsigned long cpm_dpalloc(uint size, uint align)
--{
--	unsigned long start;
--	unsigned long flags;
--
--	spin_lock_irqsave(&cpm_dpmem_lock, flags);
--	cpm_dpmem_info.alignment = align;
--	start = rh_alloc(&cpm_dpmem_info, size, "commproc");
--	spin_unlock_irqrestore(&cpm_dpmem_lock, flags);
--
--	return (uint)start;
--}
--EXPORT_SYMBOL(cpm_dpalloc);
--
--int cpm_dpfree(unsigned long offset)
--{
--	int ret;
--	unsigned long flags;
--
--	spin_lock_irqsave(&cpm_dpmem_lock, flags);
--	ret = rh_free(&cpm_dpmem_info, offset);
--	spin_unlock_irqrestore(&cpm_dpmem_lock, flags);
--
--	return ret;
--}
--EXPORT_SYMBOL(cpm_dpfree);
--
--unsigned long cpm_dpalloc_fixed(unsigned long offset, uint size, uint align)
--{
--	unsigned long start;
--	unsigned long flags;
--
--	spin_lock_irqsave(&cpm_dpmem_lock, flags);
--	cpm_dpmem_info.alignment = align;
--	start = rh_alloc_fixed(&cpm_dpmem_info, offset, size, "commproc");
--	spin_unlock_irqrestore(&cpm_dpmem_lock, flags);
--
--	return start;
--}
--EXPORT_SYMBOL(cpm_dpalloc_fixed);
--
--void cpm_dpdump(void)
--{
--	rh_dump(&cpm_dpmem_info);
--}
--EXPORT_SYMBOL(cpm_dpdump);
--
--void *cpm_dpram_addr(unsigned long offset)
--{
--	return (void *)(dpram_vbase + offset);
--}
--EXPORT_SYMBOL(cpm_dpram_addr);
--
--uint cpm_dpram_phys(u8 *addr)
--{
--	return (dpram_pbase + (uint)(addr - dpram_vbase));
--}
--EXPORT_SYMBOL(cpm_dpram_phys);
--#endif /* !CONFIG_PPC_CPM_NEW_BINDING */
--
- struct cpm_ioport16 {
- 	__be16 dir, par, odr_sor, dat, intr;
- 	__be16 res[3];
---- a/arch/powerpc/sysdev/cpm2.c
-+++ b/arch/powerpc/sysdev/cpm2.c
-@@ -46,10 +46,6 @@
- 
- #include <sysdev/fsl_soc.h>
- 
--#ifndef CONFIG_PPC_CPM_NEW_BINDING
--static void cpm2_dpinit(void);
--#endif
--
- cpm_cpm2_t __iomem *cpmp; /* Pointer to comm processor space */
- 
- /* We allocate this here because it is used almost exclusively for
-@@ -71,15 +67,17 @@ void __init cpm2_reset(void)
- 
- 	/* Reclaim the DP memory for our use.
- 	 */
--#ifdef CONFIG_PPC_CPM_NEW_BINDING
- 	cpm_muram_init();
--#else
--	cpm2_dpinit();
--#endif
- 
- 	/* Tell everyone where the comm processor resides.
- 	 */
- 	cpmp = &cpm2_immr->im_cpm;
-+
-+#ifndef CONFIG_PPC_EARLY_DEBUG_CPM
-+	/* Reset the CPM.
-+	 */
-+	cpm_command(CPM_CR_RST, 0);
-+#endif
- }
- 
- static DEFINE_SPINLOCK(cmd_lock);
-@@ -99,7 +97,7 @@ int cpm_command(u32 command, u8 opcode)
- 		if ((in_be32(&cpmp->cp_cpcr) & CPM_CR_FLG) == 0)
- 			goto out;
- 
--	printk(KERN_ERR "%s(): Not able to issue CPM command\n", __FUNCTION__);
-+	printk(KERN_ERR "%s(): Not able to issue CPM command\n", __func__);
- 	ret = -EIO;
- out:
- 	spin_unlock_irqrestore(&cmd_lock, flags);
-@@ -347,95 +345,6 @@ int cpm2_smc_clk_setup(enum cpm_clk_targ
- 	return ret;
- }
- 
--#ifndef CONFIG_PPC_CPM_NEW_BINDING
--/*
-- * dpalloc / dpfree bits.
-- */
--static spinlock_t cpm_dpmem_lock;
--/* 16 blocks should be enough to satisfy all requests
-- * until the memory subsystem goes up... */
--static rh_block_t cpm_boot_dpmem_rh_block[16];
--static rh_info_t cpm_dpmem_info;
--static u8 __iomem *im_dprambase;
--
--static void cpm2_dpinit(void)
--{
--	spin_lock_init(&cpm_dpmem_lock);
--
--	/* initialize the info header */
--	rh_init(&cpm_dpmem_info, 1,
--			sizeof(cpm_boot_dpmem_rh_block) /
--			sizeof(cpm_boot_dpmem_rh_block[0]),
--			cpm_boot_dpmem_rh_block);
--
--	im_dprambase = cpm2_immr;
--
--	/* Attach the usable dpmem area */
--	/* XXX: This is actually crap. CPM_DATAONLY_BASE and
--	 * CPM_DATAONLY_SIZE is only a subset of the available dpram. It
--	 * varies with the processor and the microcode patches activated.
--	 * But the following should be at least safe.
--	 */
--	rh_attach_region(&cpm_dpmem_info, CPM_DATAONLY_BASE, CPM_DATAONLY_SIZE);
--}
--
--/* This function returns an index into the DPRAM area.
-- */
--unsigned long cpm_dpalloc(uint size, uint align)
--{
--	unsigned long start;
--	unsigned long flags;
--
--	spin_lock_irqsave(&cpm_dpmem_lock, flags);
--	cpm_dpmem_info.alignment = align;
--	start = rh_alloc(&cpm_dpmem_info, size, "commproc");
--	spin_unlock_irqrestore(&cpm_dpmem_lock, flags);
--
--	return (uint)start;
--}
--EXPORT_SYMBOL(cpm_dpalloc);
--
--int cpm_dpfree(unsigned long offset)
--{
--	int ret;
--	unsigned long flags;
--
--	spin_lock_irqsave(&cpm_dpmem_lock, flags);
--	ret = rh_free(&cpm_dpmem_info, offset);
--	spin_unlock_irqrestore(&cpm_dpmem_lock, flags);
--
--	return ret;
--}
--EXPORT_SYMBOL(cpm_dpfree);
--
--/* not sure if this is ever needed */
--unsigned long cpm_dpalloc_fixed(unsigned long offset, uint size, uint align)
--{
--	unsigned long start;
--	unsigned long flags;
--
--	spin_lock_irqsave(&cpm_dpmem_lock, flags);
--	cpm_dpmem_info.alignment = align;
--	start = rh_alloc_fixed(&cpm_dpmem_info, offset, size, "commproc");
--	spin_unlock_irqrestore(&cpm_dpmem_lock, flags);
--
--	return start;
--}
--EXPORT_SYMBOL(cpm_dpalloc_fixed);
--
--void cpm_dpdump(void)
--{
--	rh_dump(&cpm_dpmem_info);
--}
--EXPORT_SYMBOL(cpm_dpdump);
--
--void *cpm_dpram_addr(unsigned long offset)
--{
--	return (void *)(im_dprambase + offset);
--}
--EXPORT_SYMBOL(cpm_dpram_addr);
--#endif /* !CONFIG_PPC_CPM_NEW_BINDING */
--
- struct cpm2_ioports {
- 	u32 dir, par, sor, odr, dat;
- 	u32 res[3];
---- a/arch/powerpc/sysdev/cpm_common.c
-+++ b/arch/powerpc/sysdev/cpm_common.c
-@@ -58,7 +58,6 @@ void __init udbg_init_cpm(void)
- }
- #endif
- 
--#ifdef CONFIG_PPC_CPM_NEW_BINDING
- static spinlock_t cpm_muram_lock;
- static rh_block_t cpm_boot_muram_rh_block[16];
- static rh_info_t cpm_muram_info;
-@@ -199,5 +198,3 @@ dma_addr_t cpm_muram_dma(void __iomem *a
- 	return muram_pbase + ((u8 __iomem *)addr - muram_vbase);
- }
- EXPORT_SYMBOL(cpm_muram_dma);
--
--#endif /* CONFIG_PPC_CPM_NEW_BINDING */
---- a/arch/powerpc/sysdev/dart_iommu.c
-+++ b/arch/powerpc/sysdev/dart_iommu.c
-@@ -37,6 +37,7 @@
- #include <linux/dma-mapping.h>
- #include <linux/vmalloc.h>
- #include <linux/suspend.h>
-+#include <linux/lmb.h>
- #include <asm/io.h>
- #include <asm/prom.h>
- #include <asm/iommu.h>
-@@ -44,7 +45,6 @@
- #include <asm/machdep.h>
- #include <asm/abs_addr.h>
- #include <asm/cacheflush.h>
--#include <asm/lmb.h>
- #include <asm/ppc-pci.h>
- 
- #include "dart.h"
---- /dev/null
-+++ b/arch/powerpc/sysdev/fsl_lbc.c
-@@ -0,0 +1,129 @@
-+/*
-+ * Freescale LBC and UPM routines.
-+ *
-+ * Copyright (c) 2007-2008  MontaVista Software, Inc.
-+ *
-+ * Author: Anton Vorontsov <avorontsov@ru.mvista.com>
-+ *
-+ * 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/kernel.h>
-+#include <linux/of.h>
-+#include <asm/fsl_lbc.h>
-+
-+spinlock_t fsl_lbc_lock = __SPIN_LOCK_UNLOCKED(fsl_lbc_lock);
-+
-+struct fsl_lbc_regs __iomem *fsl_lbc_regs;
-+EXPORT_SYMBOL(fsl_lbc_regs);
-+
-+static char __initdata *compat_lbc[] = {
-+	"fsl,pq2-localbus",
-+	"fsl,pq2pro-localbus",
-+	"fsl,pq3-localbus",
-+	"fsl,elbc",
-+};
-+
-+static int __init fsl_lbc_init(void)
-+{
-+	struct device_node *lbus;
-+	int i;
-+
-+	for (i = 0; i < ARRAY_SIZE(compat_lbc); i++) {
-+		lbus = of_find_compatible_node(NULL, NULL, compat_lbc[i]);
-+		if (lbus)
-+			goto found;
-+	}
-+	return -ENODEV;
-+
-+found:
-+	fsl_lbc_regs = of_iomap(lbus, 0);
-+	of_node_put(lbus);
-+	if (!fsl_lbc_regs)
-+		return -ENOMEM;
-+	return 0;
-+}
-+arch_initcall(fsl_lbc_init);
-+
-+/**
-+ * fsl_lbc_find - find Localbus bank
-+ * @addr_base:	base address of the memory bank
-+ *
-+ * This function walks LBC banks comparing "Base address" field of the BR
-+ * registers with the supplied addr_base argument. When bases match this
-+ * function returns bank number (starting with 0), otherwise it returns
-+ * appropriate errno value.
-+ */
-+int fsl_lbc_find(phys_addr_t addr_base)
-+{
-+	int i;
-+
-+	if (!fsl_lbc_regs)
-+		return -ENODEV;
-+
-+	for (i = 0; i < ARRAY_SIZE(fsl_lbc_regs->bank); i++) {
-+		__be32 br = in_be32(&fsl_lbc_regs->bank[i].br);
-+		__be32 or = in_be32(&fsl_lbc_regs->bank[i].or);
-+
-+		if (br & BR_V && (br & or & BR_BA) == addr_base)
-+			return i;
-+	}
-+
-+	return -ENOENT;
-+}
-+EXPORT_SYMBOL(fsl_lbc_find);
-+
-+/**
-+ * fsl_upm_find - find pre-programmed UPM via base address
-+ * @addr_base:	base address of the memory bank controlled by the UPM
-+ * @upm:	pointer to the allocated fsl_upm structure
-+ *
-+ * This function fills fsl_upm structure so you can use it with the rest of
-+ * UPM API. On success this function returns 0, otherwise it returns
-+ * appropriate errno value.
-+ */
-+int fsl_upm_find(phys_addr_t addr_base, struct fsl_upm *upm)
-+{
-+	int bank;
-+	__be32 br;
-+
-+	bank = fsl_lbc_find(addr_base);
-+	if (bank < 0)
-+		return bank;
-+
-+	br = in_be32(&fsl_lbc_regs->bank[bank].br);
-+
-+	switch (br & BR_MSEL) {
-+	case BR_MS_UPMA:
-+		upm->mxmr = &fsl_lbc_regs->mamr;
-+		break;
-+	case BR_MS_UPMB:
-+		upm->mxmr = &fsl_lbc_regs->mbmr;
-+		break;
-+	case BR_MS_UPMC:
-+		upm->mxmr = &fsl_lbc_regs->mcmr;
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	switch (br & BR_PS) {
-+	case BR_PS_8:
-+		upm->width = 8;
-+		break;
-+	case BR_PS_16:
-+		upm->width = 16;
-+		break;
-+	case BR_PS_32:
-+		upm->width = 32;
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL(fsl_upm_find);
---- a/arch/powerpc/sysdev/fsl_soc.c
-+++ b/arch/powerpc/sysdev/fsl_soc.c
-@@ -75,6 +75,33 @@ phys_addr_t get_immrbase(void)
- 
- EXPORT_SYMBOL(get_immrbase);
- 
-+static u32 sysfreq = -1;
-+
-+u32 fsl_get_sys_freq(void)
-+{
-+	struct device_node *soc;
-+	const u32 *prop;
-+	int size;
-+
-+	if (sysfreq != -1)
-+		return sysfreq;
-+
-+	soc = of_find_node_by_type(NULL, "soc");
-+	if (!soc)
-+		return -1;
-+
-+	prop = of_get_property(soc, "clock-frequency", &size);
-+	if (!prop || size != sizeof(*prop) || *prop == 0)
-+		prop = of_get_property(soc, "bus-frequency", &size);
-+
-+	if (prop && size == sizeof(*prop))
-+		sysfreq = *prop;
-+
-+	of_node_put(soc);
-+	return sysfreq;
-+}
-+EXPORT_SYMBOL(fsl_get_sys_freq);
-+
- #if defined(CONFIG_CPM2) || defined(CONFIG_QUICC_ENGINE) || defined(CONFIG_8xx)
- 
- static u32 brgfreq = -1;
-@@ -516,9 +543,9 @@ arch_initcall(fsl_i2c_of_init);
- static int __init mpc83xx_wdt_init(void)
- {
- 	struct resource r;
--	struct device_node *soc, *np;
-+	struct device_node *np;
- 	struct platform_device *dev;
--	const unsigned int *freq;
-+	u32 freq = fsl_get_sys_freq();
- 	int ret;
- 
- 	np = of_find_compatible_node(NULL, "watchdog", "mpc83xx_wdt");
-@@ -528,19 +555,6 @@ static int __init mpc83xx_wdt_init(void)
- 		goto nodev;
- 	}
- 
--	soc = of_find_node_by_type(NULL, "soc");
--
--	if (!soc) {
--		ret = -ENODEV;
--		goto nosoc;
--	}
--
--	freq = of_get_property(soc, "bus-frequency", NULL);
--	if (!freq) {
--		ret = -ENODEV;
--		goto err;
--	}
--
- 	memset(&r, 0, sizeof(r));
- 
- 	ret = of_address_to_resource(np, 0, &r);
-@@ -553,20 +567,16 @@ static int __init mpc83xx_wdt_init(void)
- 		goto err;
- 	}
- 
--	ret = platform_device_add_data(dev, freq, sizeof(int));
-+	ret = platform_device_add_data(dev, &freq, sizeof(freq));
- 	if (ret)
- 		goto unreg;
- 
--	of_node_put(soc);
- 	of_node_put(np);
--
- 	return 0;
- 
- unreg:
- 	platform_device_unregister(dev);
- err:
--	of_node_put(soc);
--nosoc:
- 	of_node_put(np);
- nodev:
- 	return ret;
-@@ -735,547 +745,6 @@ err:
- 
- arch_initcall(fsl_usb_of_init);
- 
--#ifndef CONFIG_PPC_CPM_NEW_BINDING
--#ifdef CONFIG_CPM2
--
--extern void init_scc_ioports(struct fs_uart_platform_info*);
--
--static const char fcc_regs[] = "fcc_regs";
--static const char fcc_regs_c[] = "fcc_regs_c";
--static const char fcc_pram[] = "fcc_pram";
--static char bus_id[9][BUS_ID_SIZE];
--
--static int __init fs_enet_of_init(void)
--{
--	struct device_node *np;
--	unsigned int i;
--	struct platform_device *fs_enet_dev;
--	struct resource res;
--	int ret;
--
--	for (np = NULL, i = 0;
--	     (np = of_find_compatible_node(np, "network", "fs_enet")) != NULL;
--	     i++) {
--		struct resource r[4];
--		struct device_node *phy, *mdio;
--		struct fs_platform_info fs_enet_data;
--		const unsigned int *id, *phy_addr, *phy_irq;
--		const void *mac_addr;
--		const phandle *ph;
--		const char *model;
--
--		memset(r, 0, sizeof(r));
--		memset(&fs_enet_data, 0, sizeof(fs_enet_data));
--
--		ret = of_address_to_resource(np, 0, &r[0]);
--		if (ret)
--			goto err;
--		r[0].name = fcc_regs;
--
--		ret = of_address_to_resource(np, 1, &r[1]);
--		if (ret)
--			goto err;
--		r[1].name = fcc_pram;
--
--		ret = of_address_to_resource(np, 2, &r[2]);
--		if (ret)
--			goto err;
--		r[2].name = fcc_regs_c;
--		fs_enet_data.fcc_regs_c = r[2].start;
--
--		of_irq_to_resource(np, 0, &r[3]);
--
--		fs_enet_dev =
--		    platform_device_register_simple("fsl-cpm-fcc", i, &r[0], 4);
--
--		if (IS_ERR(fs_enet_dev)) {
--			ret = PTR_ERR(fs_enet_dev);
--			goto err;
--		}
--
--		model = of_get_property(np, "model", NULL);
--		if (model == NULL) {
--			ret = -ENODEV;
--			goto unreg;
--		}
--
--		mac_addr = of_get_mac_address(np);
--		if (mac_addr)
--			memcpy(fs_enet_data.macaddr, mac_addr, 6);
--
--		ph = of_get_property(np, "phy-handle", NULL);
--		phy = of_find_node_by_phandle(*ph);
--
--		if (phy == NULL) {
--			ret = -ENODEV;
--			goto unreg;
--		}
--
--		phy_addr = of_get_property(phy, "reg", NULL);
--		fs_enet_data.phy_addr = *phy_addr;
--
--		phy_irq = of_get_property(phy, "interrupts", NULL);
--
--		id = of_get_property(np, "device-id", NULL);
--		fs_enet_data.fs_no = *id;
--		strcpy(fs_enet_data.fs_type, model);
--
--		mdio = of_get_parent(phy);
--                ret = of_address_to_resource(mdio, 0, &res);
--                if (ret) {
--                        of_node_put(phy);
--                        of_node_put(mdio);
--                        goto unreg;
--                }
--
--		fs_enet_data.clk_rx = *((u32 *)of_get_property(np,
--						"rx-clock", NULL));
--		fs_enet_data.clk_tx = *((u32 *)of_get_property(np,
--						"tx-clock", NULL));
--
--		if (strstr(model, "FCC")) {
--			int fcc_index = *id - 1;
--			const unsigned char *mdio_bb_prop;
--
--			fs_enet_data.dpram_offset = (u32)cpm_dpram_addr(0);
--			fs_enet_data.rx_ring = 32;
--			fs_enet_data.tx_ring = 32;
--			fs_enet_data.rx_copybreak = 240;
--			fs_enet_data.use_napi = 0;
--			fs_enet_data.napi_weight = 17;
--			fs_enet_data.mem_offset = FCC_MEM_OFFSET(fcc_index);
--			fs_enet_data.cp_page = CPM_CR_FCC_PAGE(fcc_index);
--			fs_enet_data.cp_block = CPM_CR_FCC_SBLOCK(fcc_index);
--
--			snprintf((char*)&bus_id[(*id)], BUS_ID_SIZE, "%x:%02x",
--							(u32)res.start, fs_enet_data.phy_addr);
--			fs_enet_data.bus_id = (char*)&bus_id[(*id)];
--			fs_enet_data.init_ioports = init_fcc_ioports;
--
--			mdio_bb_prop = of_get_property(phy, "bitbang", NULL);
--			if (mdio_bb_prop) {
--				struct platform_device *fs_enet_mdio_bb_dev;
--				struct fs_mii_bb_platform_info fs_enet_mdio_bb_data;
--
--				fs_enet_mdio_bb_dev =
--					platform_device_register_simple("fsl-bb-mdio",
--							i, NULL, 0);
--				memset(&fs_enet_mdio_bb_data, 0,
--						sizeof(struct fs_mii_bb_platform_info));
--				fs_enet_mdio_bb_data.mdio_dat.bit =
--					mdio_bb_prop[0];
--				fs_enet_mdio_bb_data.mdio_dir.bit =
--					mdio_bb_prop[1];
--				fs_enet_mdio_bb_data.mdc_dat.bit =
--					mdio_bb_prop[2];
--				fs_enet_mdio_bb_data.mdio_port =
--					mdio_bb_prop[3];
--				fs_enet_mdio_bb_data.mdc_port =
--					mdio_bb_prop[4];
--				fs_enet_mdio_bb_data.delay =
--					mdio_bb_prop[5];
--
--				fs_enet_mdio_bb_data.irq[0] = phy_irq[0];
--				fs_enet_mdio_bb_data.irq[1] = -1;
--				fs_enet_mdio_bb_data.irq[2] = -1;
--				fs_enet_mdio_bb_data.irq[3] = phy_irq[0];
--				fs_enet_mdio_bb_data.irq[31] = -1;
--
--				fs_enet_mdio_bb_data.mdio_dat.offset =
--					(u32)&cpm2_immr->im_ioport.iop_pdatc;
--				fs_enet_mdio_bb_data.mdio_dir.offset =
--					(u32)&cpm2_immr->im_ioport.iop_pdirc;
--				fs_enet_mdio_bb_data.mdc_dat.offset =
--					(u32)&cpm2_immr->im_ioport.iop_pdatc;
--
--				ret = platform_device_add_data(
--						fs_enet_mdio_bb_dev,
--						&fs_enet_mdio_bb_data,
--						sizeof(struct fs_mii_bb_platform_info));
--				if (ret)
--					goto unreg;
--			}
--
--			of_node_put(phy);
--			of_node_put(mdio);
--
--			ret = platform_device_add_data(fs_enet_dev, &fs_enet_data,
--						     sizeof(struct
--							    fs_platform_info));
--			if (ret)
--				goto unreg;
--		}
--	}
--	return 0;
--
--unreg:
--	platform_device_unregister(fs_enet_dev);
--err:
--	return ret;
--}
--
--arch_initcall(fs_enet_of_init);
--
--static const char scc_regs[] = "regs";
--static const char scc_pram[] = "pram";
--
--static int __init cpm_uart_of_init(void)
--{
--	struct device_node *np;
--	unsigned int i;
--	struct platform_device *cpm_uart_dev;
--	int ret;
--
--	for (np = NULL, i = 0;
--	     (np = of_find_compatible_node(np, "serial", "cpm_uart")) != NULL;
--	     i++) {
--		struct resource r[3];
--		struct fs_uart_platform_info cpm_uart_data;
--		const int *id;
--		const char *model;
--
--		memset(r, 0, sizeof(r));
--		memset(&cpm_uart_data, 0, sizeof(cpm_uart_data));
--
--		ret = of_address_to_resource(np, 0, &r[0]);
--		if (ret)
--			goto err;
--
--		r[0].name = scc_regs;
--
--		ret = of_address_to_resource(np, 1, &r[1]);
--		if (ret)
--			goto err;
--		r[1].name = scc_pram;
--
--		of_irq_to_resource(np, 0, &r[2]);
--
--		cpm_uart_dev =
--		    platform_device_register_simple("fsl-cpm-scc:uart", i, &r[0], 3);
--
--		if (IS_ERR(cpm_uart_dev)) {
--			ret = PTR_ERR(cpm_uart_dev);
--			goto err;
--		}
--
--		id = of_get_property(np, "device-id", NULL);
--		cpm_uart_data.fs_no = *id;
--
--		model = of_get_property(np, "model", NULL);
--		strcpy(cpm_uart_data.fs_type, model);
--
--		cpm_uart_data.uart_clk = ppc_proc_freq;
--
--		cpm_uart_data.tx_num_fifo = 4;
--		cpm_uart_data.tx_buf_size = 32;
--		cpm_uart_data.rx_num_fifo = 4;
--		cpm_uart_data.rx_buf_size = 32;
--		cpm_uart_data.clk_rx = *((u32 *)of_get_property(np,
--						"rx-clock", NULL));
--		cpm_uart_data.clk_tx = *((u32 *)of_get_property(np,
--						"tx-clock", NULL));
--
--		ret =
--		    platform_device_add_data(cpm_uart_dev, &cpm_uart_data,
--					     sizeof(struct
--						    fs_uart_platform_info));
--		if (ret)
--			goto unreg;
--	}
--
--	return 0;
--
--unreg:
--	platform_device_unregister(cpm_uart_dev);
--err:
--	return ret;
--}
--
--arch_initcall(cpm_uart_of_init);
--#endif /* CONFIG_CPM2 */
--
--#ifdef CONFIG_8xx
--
--extern void init_scc_ioports(struct fs_platform_info*);
--extern int platform_device_skip(const char *model, int id);
--
--static int __init fs_enet_mdio_of_init(void)
--{
--	struct device_node *np;
--	unsigned int i;
--	struct platform_device *mdio_dev;
--	struct resource res;
--	int ret;
--
--	for (np = NULL, i = 0;
--	     (np = of_find_compatible_node(np, "mdio", "fs_enet")) != NULL;
--	     i++) {
--		struct fs_mii_fec_platform_info mdio_data;
--
--		memset(&res, 0, sizeof(res));
--		memset(&mdio_data, 0, sizeof(mdio_data));
--
--		ret = of_address_to_resource(np, 0, &res);
--		if (ret)
--			goto err;
--
--		mdio_dev =
--		    platform_device_register_simple("fsl-cpm-fec-mdio",
--						    res.start, &res, 1);
--		if (IS_ERR(mdio_dev)) {
--			ret = PTR_ERR(mdio_dev);
--			goto err;
--		}
--
--		mdio_data.mii_speed = ((((ppc_proc_freq + 4999999) / 2500000) / 2) & 0x3F) << 1;
--
--		ret =
--		    platform_device_add_data(mdio_dev, &mdio_data,
--					     sizeof(struct fs_mii_fec_platform_info));
--		if (ret)
--			goto unreg;
--	}
--	return 0;
--
--unreg:
--	platform_device_unregister(mdio_dev);
--err:
--	return ret;
--}
--
--arch_initcall(fs_enet_mdio_of_init);
--
--static const char *enet_regs = "regs";
--static const char *enet_pram = "pram";
--static const char *enet_irq = "interrupt";
--static char bus_id[9][BUS_ID_SIZE];
--
--static int __init fs_enet_of_init(void)
--{
--	struct device_node *np;
--	unsigned int i;
--	struct platform_device *fs_enet_dev = NULL;
--	struct resource res;
--	int ret;
--
--	for (np = NULL, i = 0;
--	     (np = of_find_compatible_node(np, "network", "fs_enet")) != NULL;
--	     i++) {
--		struct resource r[4];
--		struct device_node *phy = NULL, *mdio = NULL;
--		struct fs_platform_info fs_enet_data;
--		const unsigned int *id;
--		const unsigned int *phy_addr;
--		const void *mac_addr;
--		const phandle *ph;
--		const char *model;
--
--		memset(r, 0, sizeof(r));
--		memset(&fs_enet_data, 0, sizeof(fs_enet_data));
--
--		model = of_get_property(np, "model", NULL);
--		if (model == NULL) {
--			ret = -ENODEV;
--			goto unreg;
--		}
--
--		id = of_get_property(np, "device-id", NULL);
--		fs_enet_data.fs_no = *id;
--
--		if (platform_device_skip(model, *id))
--			continue;
--
--		ret = of_address_to_resource(np, 0, &r[0]);
--		if (ret)
--			goto err;
--		r[0].name = enet_regs;
--
--		mac_addr = of_get_mac_address(np);
--		if (mac_addr)
--			memcpy(fs_enet_data.macaddr, mac_addr, 6);
--
--		ph = of_get_property(np, "phy-handle", NULL);
--		if (ph != NULL)
--			phy = of_find_node_by_phandle(*ph);
--
--		if (phy != NULL) {
--			phy_addr = of_get_property(phy, "reg", NULL);
--			fs_enet_data.phy_addr = *phy_addr;
--			fs_enet_data.has_phy = 1;
--
--			mdio = of_get_parent(phy);
--			ret = of_address_to_resource(mdio, 0, &res);
--			if (ret) {
--				of_node_put(phy);
--				of_node_put(mdio);
--                                goto unreg;
--			}
--		}
--
--		model = of_get_property(np, "model", NULL);
--		strcpy(fs_enet_data.fs_type, model);
--
--		if (strstr(model, "FEC")) {
--			r[1].start = r[1].end = irq_of_parse_and_map(np, 0);
--			r[1].flags = IORESOURCE_IRQ;
--			r[1].name = enet_irq;
--
--			fs_enet_dev =
--				    platform_device_register_simple("fsl-cpm-fec", i, &r[0], 2);
--
--			if (IS_ERR(fs_enet_dev)) {
--				ret = PTR_ERR(fs_enet_dev);
--				goto err;
--			}
--
--			fs_enet_data.rx_ring = 128;
--			fs_enet_data.tx_ring = 16;
--			fs_enet_data.rx_copybreak = 240;
--			fs_enet_data.use_napi = 1;
--			fs_enet_data.napi_weight = 17;
--
--			snprintf((char*)&bus_id[i], BUS_ID_SIZE, "%x:%02x",
--							(u32)res.start, fs_enet_data.phy_addr);
--			fs_enet_data.bus_id = (char*)&bus_id[i];
--			fs_enet_data.init_ioports = init_fec_ioports;
--		}
--		if (strstr(model, "SCC")) {
--			ret = of_address_to_resource(np, 1, &r[1]);
--			if (ret)
--				goto err;
--			r[1].name = enet_pram;
--
--			r[2].start = r[2].end = irq_of_parse_and_map(np, 0);
--			r[2].flags = IORESOURCE_IRQ;
--			r[2].name = enet_irq;
--
--			fs_enet_dev =
--				    platform_device_register_simple("fsl-cpm-scc", i, &r[0], 3);
--
--			if (IS_ERR(fs_enet_dev)) {
--				ret = PTR_ERR(fs_enet_dev);
--				goto err;
--			}
--
--			fs_enet_data.rx_ring = 64;
--			fs_enet_data.tx_ring = 8;
--			fs_enet_data.rx_copybreak = 240;
--			fs_enet_data.use_napi = 1;
--			fs_enet_data.napi_weight = 17;
--
--			snprintf((char*)&bus_id[i], BUS_ID_SIZE, "%s", "fixed@10:1");
--                        fs_enet_data.bus_id = (char*)&bus_id[i];
--			fs_enet_data.init_ioports = init_scc_ioports;
--		}
--
--		of_node_put(phy);
--		of_node_put(mdio);
--
--		ret = platform_device_add_data(fs_enet_dev, &fs_enet_data,
--					     sizeof(struct
--						    fs_platform_info));
--		if (ret)
--			goto unreg;
--	}
--	return 0;
--
--unreg:
--	platform_device_unregister(fs_enet_dev);
--err:
--	return ret;
--}
--
--arch_initcall(fs_enet_of_init);
--
--static int __init fsl_pcmcia_of_init(void)
--{
--	struct device_node *np;
--	/*
--	 * Register all the devices which type is "pcmcia"
--	 */
--	for_each_compatible_node(np, "pcmcia", "fsl,pq-pcmcia")
--		of_platform_device_create(np, "m8xx-pcmcia", NULL);
--	return 0;
--}
--
--arch_initcall(fsl_pcmcia_of_init);
--
--static const char *smc_regs = "regs";
--static const char *smc_pram = "pram";
--
--static int __init cpm_smc_uart_of_init(void)
--{
--	struct device_node *np;
--	unsigned int i;
--	struct platform_device *cpm_uart_dev;
--	int ret;
--
--	for (np = NULL, i = 0;
--	     (np = of_find_compatible_node(np, "serial", "cpm_uart")) != NULL;
--	     i++) {
--		struct resource r[3];
--		struct fs_uart_platform_info cpm_uart_data;
--		const int *id;
--		const char *model;
--
--		memset(r, 0, sizeof(r));
--		memset(&cpm_uart_data, 0, sizeof(cpm_uart_data));
--
--		ret = of_address_to_resource(np, 0, &r[0]);
--		if (ret)
--			goto err;
--
--		r[0].name = smc_regs;
--
--		ret = of_address_to_resource(np, 1, &r[1]);
--		if (ret)
--			goto err;
--		r[1].name = smc_pram;
--
--		r[2].start = r[2].end = irq_of_parse_and_map(np, 0);
--		r[2].flags = IORESOURCE_IRQ;
--
--		cpm_uart_dev =
--		    platform_device_register_simple("fsl-cpm-smc:uart", i, &r[0], 3);
--
--		if (IS_ERR(cpm_uart_dev)) {
--			ret = PTR_ERR(cpm_uart_dev);
--			goto err;
--		}
--
--		model = of_get_property(np, "model", NULL);
--		strcpy(cpm_uart_data.fs_type, model);
--
--		id = of_get_property(np, "device-id", NULL);
--		cpm_uart_data.fs_no = *id;
--		cpm_uart_data.uart_clk = ppc_proc_freq;
--
--		cpm_uart_data.tx_num_fifo = 4;
--		cpm_uart_data.tx_buf_size = 32;
--		cpm_uart_data.rx_num_fifo = 4;
--		cpm_uart_data.rx_buf_size = 32;
--
--		ret =
--		    platform_device_add_data(cpm_uart_dev, &cpm_uart_data,
--					     sizeof(struct
--						    fs_uart_platform_info));
--		if (ret)
--			goto unreg;
--	}
--
--	return 0;
--
--unreg:
--	platform_device_unregister(cpm_uart_dev);
--err:
--	return ret;
--}
--
--arch_initcall(cpm_smc_uart_of_init);
--
--#endif /* CONFIG_8xx */
--#endif /* CONFIG_PPC_CPM_NEW_BINDING */
--
- static int __init of_fsl_spi_probe(char *type, char *compatible, u32 sysclk,
- 				   struct spi_board_info *board_infos,
- 				   unsigned int num_board_infos,
-@@ -1371,25 +840,9 @@ int __init fsl_spi_init(struct spi_board
- 	sysclk = get_brgfreq();
- #endif
- 	if (sysclk == -1) {
--		struct device_node *np;
--		const u32 *freq;
--		int size;
--
--		np = of_find_node_by_type(NULL, "soc");
--		if (!np)
-+		sysclk = fsl_get_sys_freq();
-+		if (sysclk == -1)
- 			return -ENODEV;
--
--		freq = of_get_property(np, "clock-frequency", &size);
--		if (!freq || size != sizeof(*freq) || *freq == 0) {
--			freq = of_get_property(np, "bus-frequency", &size);
--			if (!freq || size != sizeof(*freq) || *freq == 0) {
--				of_node_put(np);
--				return -ENODEV;
--			}
--		}
--
--		sysclk = *freq;
--		of_node_put(np);
- 	}
- 
- 	ret = of_fsl_spi_probe(NULL, "fsl,spi", sysclk, board_infos,
---- a/arch/powerpc/sysdev/fsl_soc.h
-+++ b/arch/powerpc/sysdev/fsl_soc.h
-@@ -7,6 +7,7 @@
- extern phys_addr_t get_immrbase(void);
- extern u32 get_brgfreq(void);
- extern u32 get_baudrate(void);
-+extern u32 fsl_get_sys_freq(void);
- 
- struct spi_board_info;
- 
---- a/arch/powerpc/sysdev/mpic.c
-+++ b/arch/powerpc/sysdev/mpic.c
-@@ -175,13 +175,16 @@ static inline void _mpic_write(enum mpic
- 	switch(type) {
- #ifdef CONFIG_PPC_DCR
- 	case mpic_access_dcr:
--		return dcr_write(rb->dhost, reg, value);
-+		dcr_write(rb->dhost, reg, value);
-+		break;
- #endif
- 	case mpic_access_mmio_be:
--		return out_be32(rb->base + (reg >> 2), value);
-+		out_be32(rb->base + (reg >> 2), value);
-+		break;
- 	case mpic_access_mmio_le:
- 	default:
--		return out_le32(rb->base + (reg >> 2), value);
-+		out_le32(rb->base + (reg >> 2), value);
-+		break;
- 	}
- }
- 
-@@ -1000,7 +1003,7 @@ struct mpic * __init mpic_alloc(struct d
- 				const char *name)
- {
- 	struct mpic	*mpic;
--	u32		reg;
-+	u32		greg_feature;
- 	const char	*vers;
- 	int		i;
- 	int		intvec_top;
-@@ -1064,7 +1067,8 @@ struct mpic * __init mpic_alloc(struct d
- 
- 	/* Look for protected sources */
- 	if (node) {
--		unsigned int psize, bits, mapsize;
-+		int psize;
-+		unsigned int bits, mapsize;
- 		const u32 *psrc =
- 			of_get_property(node, "protected-sources", &psize);
- 		if (psrc) {
-@@ -1107,8 +1111,7 @@ struct mpic * __init mpic_alloc(struct d
- 	 * in, try to obtain one
- 	 */
- 	if (paddr == 0 && !(mpic->flags & MPIC_USES_DCR)) {
--		const u32 *reg;
--		reg = of_get_property(node, "reg", NULL);
-+		const u32 *reg = of_get_property(node, "reg", NULL);
- 		BUG_ON(reg == NULL);
- 		paddr = of_translate_address(node, reg);
- 		BUG_ON(paddr == OF_BAD_ADDR);
-@@ -1137,12 +1140,13 @@ struct mpic * __init mpic_alloc(struct d
- 	 * MPICs, num sources as well. On ISU MPICs, sources are counted
- 	 * as ISUs are added
- 	 */
--	reg = mpic_read(mpic->gregs, MPIC_INFO(GREG_FEATURE_0));
--	mpic->num_cpus = ((reg & MPIC_GREG_FEATURE_LAST_CPU_MASK)
-+	greg_feature = mpic_read(mpic->gregs, MPIC_INFO(GREG_FEATURE_0));
-+	mpic->num_cpus = ((greg_feature & MPIC_GREG_FEATURE_LAST_CPU_MASK)
- 			  >> MPIC_GREG_FEATURE_LAST_CPU_SHIFT) + 1;
- 	if (isu_size == 0)
--		mpic->num_sources = ((reg & MPIC_GREG_FEATURE_LAST_SRC_MASK)
--				     >> MPIC_GREG_FEATURE_LAST_SRC_SHIFT) + 1;
-+		mpic->num_sources =
-+			((greg_feature & MPIC_GREG_FEATURE_LAST_SRC_MASK)
-+			 >> MPIC_GREG_FEATURE_LAST_SRC_SHIFT) + 1;
- 
- 	/* Map the per-CPU registers */
- 	for (i = 0; i < mpic->num_cpus; i++) {
-@@ -1161,7 +1165,7 @@ struct mpic * __init mpic_alloc(struct d
- 	mpic->isu_mask = (1 << mpic->isu_shift) - 1;
- 
- 	/* Display version */
--	switch (reg & MPIC_GREG_FEATURE_VERSION_MASK) {
-+	switch (greg_feature & MPIC_GREG_FEATURE_VERSION_MASK) {
- 	case 1:
- 		vers = "1.0";
- 		break;
-@@ -1321,7 +1325,7 @@ void __init mpic_set_serial_int(struct m
- 
- void mpic_irq_set_priority(unsigned int irq, unsigned int pri)
- {
--	int is_ipi;
-+	unsigned int is_ipi;
- 	struct mpic *mpic = mpic_find(irq, &is_ipi);
- 	unsigned int src = mpic_irq_to_hw(irq);
- 	unsigned long flags;
-@@ -1344,7 +1348,7 @@ void mpic_irq_set_priority(unsigned int 
- 
- unsigned int mpic_irq_get_priority(unsigned int irq)
- {
--	int is_ipi;
-+	unsigned int is_ipi;
- 	struct mpic *mpic = mpic_find(irq, &is_ipi);
- 	unsigned int src = mpic_irq_to_hw(irq);
- 	unsigned long flags;
-@@ -1406,11 +1410,6 @@ void mpic_cpu_set_priority(int prio)
- 	mpic_cpu_write(MPIC_INFO(CPU_CURRENT_TASK_PRI), prio);
- }
- 
--/*
-- * XXX: someone who knows mpic should check this.
-- * do we need to eoi the ipi including for kexec cpu here (see xics comments)?
-- * or can we reset the mpic in the new kernel?
-- */
- void mpic_teardown_this_cpu(int secondary)
- {
- 	struct mpic *mpic = mpic_primary;
-@@ -1430,6 +1429,10 @@ void mpic_teardown_this_cpu(int secondar
- 
- 	/* Set current processor priority to max */
- 	mpic_cpu_write(MPIC_INFO(CPU_CURRENT_TASK_PRI), 0xf);
-+	/* We need to EOI the IPI since not all platforms reset the MPIC
-+	 * on boot and new interrupts wouldn't get delivered otherwise.
-+	 */
-+	mpic_eoi(mpic);
- 
- 	spin_unlock_irqrestore(&mpic_lock, flags);
- }
---- a/arch/powerpc/sysdev/mv64x60_dev.c
-+++ b/arch/powerpc/sysdev/mv64x60_dev.c
-@@ -127,7 +127,7 @@ static int __init mv64x60_mpsc_device_se
- 	if (err)
- 		return err;
- 
--	prop = of_get_property(np, "block-index", NULL);
-+	prop = of_get_property(np, "cell-index", NULL);
- 	if (!prop)
- 		return -ENODEV;
- 	port_number = *(int *)prop;
-@@ -136,6 +136,7 @@ static int __init mv64x60_mpsc_device_se
- 
- 	pdata.cache_mgmt = 1; /* All current revs need this set */
- 
-+	pdata.max_idle = 40; /* default */
- 	prop = of_get_property(np, "max_idle", NULL);
- 	if (prop)
- 		pdata.max_idle = *prop;
-@@ -205,30 +206,24 @@ error:
- /*
-  * Create mv64x60_eth platform devices
-  */
--static int __init eth_register_shared_pdev(struct device_node *np)
-+static struct platform_device * __init mv64x60_eth_register_shared_pdev(
-+						struct device_node *np, int id)
- {
- 	struct platform_device *pdev;
- 	struct resource r[1];
- 	int err;
- 
--	np = of_get_parent(np);
--	if (!np)
--		return -ENODEV;
--
- 	err = of_address_to_resource(np, 0, &r[0]);
--	of_node_put(np);
- 	if (err)
--		return err;
-+		return ERR_PTR(err);
- 
--	pdev = platform_device_register_simple(MV643XX_ETH_SHARED_NAME, 0,
-+	pdev = platform_device_register_simple(MV643XX_ETH_SHARED_NAME, id,
- 					       r, 1);
--	if (IS_ERR(pdev))
--		return PTR_ERR(pdev);
--
--	return 0;
-+	return pdev;
- }
- 
--static int __init mv64x60_eth_device_setup(struct device_node *np, int id)
-+static int __init mv64x60_eth_device_setup(struct device_node *np, int id,
-+					   struct platform_device *shared_pdev)
- {
- 	struct resource r[1];
- 	struct mv643xx_eth_platform_data pdata;
-@@ -239,16 +234,12 @@ static int __init mv64x60_eth_device_set
- 	const phandle *ph;
- 	int err;
- 
--	/* only register the shared platform device the first time through */
--	if (id == 0 && (err = eth_register_shared_pdev(np)))
--		return err;
--
- 	memset(r, 0, sizeof(r));
- 	of_irq_to_resource(np, 0, &r[0]);
- 
- 	memset(&pdata, 0, sizeof(pdata));
- 
--	prop = of_get_property(np, "block-index", NULL);
-+	prop = of_get_property(np, "reg", NULL);
- 	if (!prop)
- 		return -ENODEV;
- 	pdata.port_number = *prop;
-@@ -301,7 +292,7 @@ static int __init mv64x60_eth_device_set
- 
- 	of_node_put(phy);
- 
--	pdev = platform_device_alloc(MV643XX_ETH_NAME, pdata.port_number);
-+	pdev = platform_device_alloc(MV643XX_ETH_NAME, id);
- 	if (!pdev)
- 		return -ENOMEM;
- 
-@@ -345,21 +336,19 @@ static int __init mv64x60_i2c_device_set
- 
- 	memset(&pdata, 0, sizeof(pdata));
- 
-+	pdata.freq_m = 8;	/* default */
- 	prop = of_get_property(np, "freq_m", NULL);
- 	if (!prop)
- 		return -ENODEV;
- 	pdata.freq_m = *prop;
- 
-+	pdata.freq_m = 3;	/* default */
- 	prop = of_get_property(np, "freq_n", NULL);
- 	if (!prop)
- 		return -ENODEV;
- 	pdata.freq_n = *prop;
- 
--	prop = of_get_property(np, "timeout", NULL);
--	if (prop)
--		pdata.timeout = *prop;
--	else
--		pdata.timeout = 1000;	/* 1 second */
-+	pdata.timeout = 1000;				/* default: 1 second */
- 
- 	pdev = platform_device_alloc(MV64XXX_I2C_CTLR_NAME, id);
- 	if (!pdev)
-@@ -401,10 +390,7 @@ static int __init mv64x60_wdt_device_set
- 
- 	memset(&pdata, 0, sizeof(pdata));
- 
--	prop = of_get_property(np, "timeout", NULL);
--	if (!prop)
--		return -ENODEV;
--	pdata.timeout = *prop;
-+	pdata.timeout = 10;			/* Default: 10 seconds */
- 
- 	np = of_get_parent(np);
- 	if (!np)
-@@ -441,27 +427,43 @@ error:
- 
- static int __init mv64x60_device_setup(void)
- {
--	struct device_node *np = NULL;
--	int id;
-+	struct device_node *np, *np2;
-+	struct platform_device *pdev;
-+	int id, id2;
- 	int err;
- 
- 	id = 0;
--	for_each_compatible_node(np, "serial", "marvell,mpsc")
-+	for_each_compatible_node(np, "serial", "marvell,mv64360-mpsc")
- 		if ((err = mv64x60_mpsc_device_setup(np, id++)))
- 			goto error;
- 
- 	id = 0;
--	for_each_compatible_node(np, "network", "marvell,mv64x60-eth")
--		if ((err = mv64x60_eth_device_setup(np, id++)))
-+	id2 = 0;
-+	for_each_compatible_node(np, NULL, "marvell,mv64360-eth-group") {
-+		pdev = mv64x60_eth_register_shared_pdev(np, id++);
-+		if (IS_ERR(pdev)) {
-+			err = PTR_ERR(pdev);
- 			goto error;
-+		}
-+		for_each_child_of_node(np, np2) {
-+			if (!of_device_is_compatible(np2,
-+					"marvell,mv64360-eth"))
-+				continue;
-+			err = mv64x60_eth_device_setup(np2, id2++, pdev);
-+			if (err) {
-+				of_node_put(np2);
-+				goto error;
-+			}
-+		}
-+	}
- 
- 	id = 0;
--	for_each_compatible_node(np, "i2c", "marvell,mv64x60-i2c")
-+	for_each_compatible_node(np, "i2c", "marvell,mv64360-i2c")
- 		if ((err = mv64x60_i2c_device_setup(np, id++)))
- 			goto error;
- 
- 	/* support up to one watchdog timer */
--	np = of_find_compatible_node(np, NULL, "marvell,mv64x60-wdt");
-+	np = of_find_compatible_node(np, NULL, "marvell,mv64360-wdt");
- 	if (np) {
- 		if ((err = mv64x60_wdt_device_setup(np, id)))
- 			goto error;
-@@ -489,10 +491,10 @@ static int __init mv64x60_add_mpsc_conso
- 	if (!np)
- 		goto not_mpsc;
- 
--	if (!of_device_is_compatible(np, "marvell,mpsc"))
-+	if (!of_device_is_compatible(np, "marvell,mv64360-mpsc"))
- 		goto not_mpsc;
- 
--	prop = of_get_property(np, "block-index", NULL);
-+	prop = of_get_property(np, "cell-index", NULL);
- 	if (!prop)
- 		goto not_mpsc;
- 
---- a/arch/powerpc/sysdev/mv64x60_pci.c
-+++ b/arch/powerpc/sysdev/mv64x60_pci.c
-@@ -86,14 +86,14 @@ static int __init mv64x60_sysfs_init(voi
- 	struct platform_device *pdev;
- 	const unsigned int *prop;
- 
--	np = of_find_compatible_node(NULL, NULL, "marvell,mv64x60");
-+	np = of_find_compatible_node(NULL, NULL, "marvell,mv64360");
- 	if (!np)
- 		return 0;
- 
- 	prop = of_get_property(np, "hs_reg_valid", NULL);
- 	of_node_put(np);
- 
--	pdev = platform_device_register_simple("marvell,mv64x60", 0, NULL, 0);
-+	pdev = platform_device_register_simple("marvell,mv64360", 0, NULL, 0);
- 	if (IS_ERR(pdev))
- 		return PTR_ERR(pdev);
- 
-@@ -166,6 +166,6 @@ void __init mv64x60_pci_init(void)
- {
- 	struct device_node *np;
- 
--	for_each_compatible_node(np, "pci", "marvell,mv64x60-pci")
-+	for_each_compatible_node(np, "pci", "marvell,mv64360-pci")
- 		mv64x60_add_bridge(np);
- }
---- a/arch/powerpc/sysdev/mv64x60_pic.c
-+++ b/arch/powerpc/sysdev/mv64x60_pic.c
-@@ -238,13 +238,13 @@ void __init mv64x60_init_irq(void)
- 	const unsigned int *reg;
- 	unsigned long flags;
- 
--	np = of_find_compatible_node(NULL, NULL, "marvell,mv64x60-gpp");
-+	np = of_find_compatible_node(NULL, NULL, "marvell,mv64360-gpp");
- 	reg = of_get_property(np, "reg", &size);
- 	paddr = of_translate_address(np, reg);
- 	mv64x60_gpp_reg_base = ioremap(paddr, reg[1]);
- 	of_node_put(np);
- 
--	np = of_find_compatible_node(NULL, NULL, "marvell,mv64x60-pic");
-+	np = of_find_compatible_node(NULL, NULL, "marvell,mv64360-pic");
- 	reg = of_get_property(np, "reg", &size);
- 	paddr = of_translate_address(np, reg);
- 	mv64x60_irq_reg_base = ioremap(paddr, reg[1]);
---- a/arch/powerpc/sysdev/mv64x60_udbg.c
-+++ b/arch/powerpc/sysdev/mv64x60_udbg.c
-@@ -85,7 +85,7 @@ static void mv64x60_udbg_init(void)
- 	if (!stdout)
- 		return;
- 
--	for_each_compatible_node(np, "serial", "marvell,mpsc") {
-+	for_each_compatible_node(np, "serial", "marvell,mv64360-mpsc") {
- 		if (np == stdout)
- 			break;
- 	}
---- a/arch/powerpc/sysdev/ppc4xx_pci.c
-+++ b/arch/powerpc/sysdev/ppc4xx_pci.c
-@@ -527,6 +527,7 @@ static void __init ppc4xx_probe_pcix_bri
-  *
-  * ibm,plb-pciex-440spe
-  * ibm,plb-pciex-405ex
-+ * ibm,plb-pciex-460ex
-  *
-  * Anything else will be rejected for now as they are all subtly
-  * different unfortunately.
-@@ -645,7 +646,7 @@ static int __init ppc440spe_pciex_core_i
- 	int time_out = 20;
- 
- 	/* Set PLL clock receiver to LVPECL */
--	mtdcri(SDR0, PESDR0_PLLLCT1, mfdcri(SDR0, PESDR0_PLLLCT1) | 1 << 28);
-+	dcri_clrset(SDR0, PESDR0_PLLLCT1, 0, 1 << 28);
- 
- 	/* Shouldn't we do all the calibration stuff etc... here ? */
- 	if (ppc440spe_pciex_check_reset(np))
-@@ -659,8 +660,7 @@ static int __init ppc440spe_pciex_core_i
- 	}
- 
- 	/* De-assert reset of PCIe PLL, wait for lock */
--	mtdcri(SDR0, PESDR0_PLLLCT1,
--	       mfdcri(SDR0, PESDR0_PLLLCT1) & ~(1 << 24));
-+	dcri_clrset(SDR0, PESDR0_PLLLCT1, 1 << 24, 0);
- 	udelay(3);
- 
- 	while (time_out) {
-@@ -712,9 +712,8 @@ static int ppc440spe_pciex_init_port_hw(
- 		mtdcri(SDR0, port->sdr_base + PESDRn_440SPE_HSSL7SET1,
- 		       0x35000000);
- 	}
--	val = mfdcri(SDR0, port->sdr_base + PESDRn_RCSSET);
--	mtdcri(SDR0, port->sdr_base + PESDRn_RCSSET,
--	       (val & ~(1 << 24 | 1 << 16)) | 1 << 12);
-+	dcri_clrset(SDR0, port->sdr_base + PESDRn_RCSSET,
-+			(1 << 24) | (1 << 16), 1 << 12);
- 
- 	return 0;
- }
-@@ -775,6 +774,115 @@ static struct ppc4xx_pciex_hwops ppc440s
- 	.setup_utl	= ppc440speB_pciex_init_utl,
- };
- 
-+static int __init ppc460ex_pciex_core_init(struct device_node *np)
-+{
-+	/* Nothing to do, return 2 ports */
-+	return 2;
-+}
-+
-+static int ppc460ex_pciex_init_port_hw(struct ppc4xx_pciex_port *port)
-+{
-+	u32 val;
-+	u32 utlset1;
-+
-+	if (port->endpoint)
-+		val = PTYPE_LEGACY_ENDPOINT << 20;
-+	else
-+		val = PTYPE_ROOT_PORT << 20;
-+
-+	if (port->index == 0) {
-+		val |= LNKW_X1 << 12;
-+		utlset1 = 0x20000000;
-+	} else {
-+		val |= LNKW_X4 << 12;
-+		utlset1 = 0x20101101;
-+	}
-+
-+	mtdcri(SDR0, port->sdr_base + PESDRn_DLPSET, val);
-+	mtdcri(SDR0, port->sdr_base + PESDRn_UTLSET1, utlset1);
-+	mtdcri(SDR0, port->sdr_base + PESDRn_UTLSET2, 0x01210000);
-+
-+	switch (port->index) {
-+	case 0:
-+		mtdcri(SDR0, PESDR0_460EX_L0CDRCTL, 0x00003230);
-+		mtdcri(SDR0, PESDR0_460EX_L0DRV, 0x00000136);
-+		mtdcri(SDR0, PESDR0_460EX_L0CLK, 0x00000006);
-+
-+		mtdcri(SDR0, PESDR0_460EX_PHY_CTL_RST,0x10000000);
-+		break;
-+
-+	case 1:
-+		mtdcri(SDR0, PESDR1_460EX_L0CDRCTL, 0x00003230);
-+		mtdcri(SDR0, PESDR1_460EX_L1CDRCTL, 0x00003230);
-+		mtdcri(SDR0, PESDR1_460EX_L2CDRCTL, 0x00003230);
-+		mtdcri(SDR0, PESDR1_460EX_L3CDRCTL, 0x00003230);
-+		mtdcri(SDR0, PESDR1_460EX_L0DRV, 0x00000136);
-+		mtdcri(SDR0, PESDR1_460EX_L1DRV, 0x00000136);
-+		mtdcri(SDR0, PESDR1_460EX_L2DRV, 0x00000136);
-+		mtdcri(SDR0, PESDR1_460EX_L3DRV, 0x00000136);
-+		mtdcri(SDR0, PESDR1_460EX_L0CLK, 0x00000006);
-+		mtdcri(SDR0, PESDR1_460EX_L1CLK, 0x00000006);
-+		mtdcri(SDR0, PESDR1_460EX_L2CLK, 0x00000006);
-+		mtdcri(SDR0, PESDR1_460EX_L3CLK, 0x00000006);
-+
-+		mtdcri(SDR0, PESDR1_460EX_PHY_CTL_RST,0x10000000);
-+		break;
-+	}
-+
-+	mtdcri(SDR0, port->sdr_base + PESDRn_RCSSET,
-+	       mfdcri(SDR0, port->sdr_base + PESDRn_RCSSET) |
-+	       (PESDRx_RCSSET_RSTGU | PESDRx_RCSSET_RSTPYN));
-+
-+	/* Poll for PHY reset */
-+	/* XXX FIXME add timeout */
-+	switch (port->index) {
-+	case 0:
-+		while (!(mfdcri(SDR0, PESDR0_460EX_RSTSTA) & 0x1))
-+			udelay(10);
-+		break;
-+	case 1:
-+		while (!(mfdcri(SDR0, PESDR1_460EX_RSTSTA) & 0x1))
-+			udelay(10);
-+		break;
-+	}
-+
-+	mtdcri(SDR0, port->sdr_base + PESDRn_RCSSET,
-+	       (mfdcri(SDR0, port->sdr_base + PESDRn_RCSSET) &
-+		~(PESDRx_RCSSET_RSTGU | PESDRx_RCSSET_RSTDL)) |
-+	       PESDRx_RCSSET_RSTPYN);
-+
-+	port->has_ibpre = 1;
-+
-+	return 0;
-+}
-+
-+static int ppc460ex_pciex_init_utl(struct ppc4xx_pciex_port *port)
-+{
-+	dcr_write(port->dcrs, DCRO_PEGPL_SPECIAL, 0x0);
-+
-+	/*
-+	 * Set buffer allocations and then assert VRB and TXE.
-+	 */
-+	out_be32(port->utl_base + PEUTL_PBCTL,	0x0800000c);
-+	out_be32(port->utl_base + PEUTL_OUTTR,	0x08000000);
-+	out_be32(port->utl_base + PEUTL_INTR,	0x02000000);
-+	out_be32(port->utl_base + PEUTL_OPDBSZ,	0x04000000);
-+	out_be32(port->utl_base + PEUTL_PBBSZ,	0x00000000);
-+	out_be32(port->utl_base + PEUTL_IPHBSZ,	0x02000000);
-+	out_be32(port->utl_base + PEUTL_IPDBSZ,	0x04000000);
-+	out_be32(port->utl_base + PEUTL_RCIRQEN,0x00f00000);
-+	out_be32(port->utl_base + PEUTL_PCTL,	0x80800066);
-+
-+	return 0;
-+}
-+
-+static struct ppc4xx_pciex_hwops ppc460ex_pcie_hwops __initdata =
-+{
-+	.core_init	= ppc460ex_pciex_core_init,
-+	.port_init_hw	= ppc460ex_pciex_init_port_hw,
-+	.setup_utl	= ppc460ex_pciex_init_utl,
-+};
-+
- #endif /* CONFIG_44x */
- 
- #ifdef CONFIG_40x
-@@ -830,17 +938,9 @@ static int ppc405ex_pciex_init_port_hw(s
- 	 * PCIe boards don't show this problem.
- 	 * This has to be re-tested and fixed in a later release!
- 	 */
--#if 0 /* XXX FIXME: Not resetting the PHY will leave all resources
--       * configured as done previously by U-Boot. Then Linux will currently
--       * not reassign them. So the PHY reset is now done always. This will
--       * lead to problems with the Atheros PCIe board again.
--       */
- 	val = mfdcri(SDR0, port->sdr_base + PESDRn_LOOP);
- 	if (!(val & 0x00001000))
- 		ppc405ex_pcie_phy_reset(port);
--#else
--	ppc405ex_pcie_phy_reset(port);
--#endif
- 
- 	dcr_write(port->dcrs, DCRO_PEGPL_CFG, 0x10000000);  /* guarded on */
- 
-@@ -896,6 +996,8 @@ static int __init ppc4xx_pciex_check_cor
- 		else
- 			ppc4xx_pciex_hwops = &ppc440speB_pcie_hwops;
- 	}
-+	if (of_device_is_compatible(np, "ibm,plb-pciex-460ex"))
-+		ppc4xx_pciex_hwops = &ppc460ex_pcie_hwops;
- #endif /* CONFIG_44x    */
- #ifdef CONFIG_40x
- 	if (of_device_is_compatible(np, "ibm,plb-pciex-405ex"))
-@@ -1042,8 +1144,7 @@ static int __init ppc4xx_pciex_port_init
- 		port->link = 0;
- 	}
- 
--	mtdcri(SDR0, port->sdr_base + PESDRn_RCSSET,
--	       mfdcri(SDR0, port->sdr_base + PESDRn_RCSSET) | 1 << 20);
-+	dcri_clrset(SDR0, port->sdr_base + PESDRn_RCSSET, 0, 1 << 20);
- 	msleep(100);
- 
- 	return 0;
---- a/arch/powerpc/sysdev/ppc4xx_pci.h
-+++ b/arch/powerpc/sysdev/ppc4xx_pci.h
-@@ -271,6 +271,59 @@
- #define PESDR1_405EX_PHYSTA		0x044C
- 
- /*
-+ * 460EX additional DCRs
-+ */
-+#define PESDR0_460EX_L0BIST		0x0308
-+#define PESDR0_460EX_L0BISTSTS		0x0309
-+#define PESDR0_460EX_L0CDRCTL		0x030A
-+#define PESDR0_460EX_L0DRV		0x030B
-+#define PESDR0_460EX_L0REC		0x030C
-+#define PESDR0_460EX_L0LPB		0x030D
-+#define PESDR0_460EX_L0CLK		0x030E
-+#define PESDR0_460EX_PHY_CTL_RST	0x030F
-+#define PESDR0_460EX_RSTSTA		0x0310
-+#define PESDR0_460EX_OBS		0x0311
-+#define PESDR0_460EX_L0ERRC		0x0320
-+
-+#define PESDR1_460EX_L0BIST		0x0348
-+#define PESDR1_460EX_L1BIST		0x0349
-+#define PESDR1_460EX_L2BIST		0x034A
-+#define PESDR1_460EX_L3BIST		0x034B
-+#define PESDR1_460EX_L0BISTSTS		0x034C
-+#define PESDR1_460EX_L1BISTSTS		0x034D
-+#define PESDR1_460EX_L2BISTSTS		0x034E
-+#define PESDR1_460EX_L3BISTSTS		0x034F
-+#define PESDR1_460EX_L0CDRCTL		0x0350
-+#define PESDR1_460EX_L1CDRCTL		0x0351
-+#define PESDR1_460EX_L2CDRCTL		0x0352
-+#define PESDR1_460EX_L3CDRCTL		0x0353
-+#define PESDR1_460EX_L0DRV		0x0354
-+#define PESDR1_460EX_L1DRV		0x0355
-+#define PESDR1_460EX_L2DRV		0x0356
-+#define PESDR1_460EX_L3DRV		0x0357
-+#define PESDR1_460EX_L0REC		0x0358
-+#define PESDR1_460EX_L1REC		0x0359
-+#define PESDR1_460EX_L2REC		0x035A
-+#define PESDR1_460EX_L3REC		0x035B
-+#define PESDR1_460EX_L0LPB		0x035C
-+#define PESDR1_460EX_L1LPB		0x035D
-+#define PESDR1_460EX_L2LPB		0x035E
-+#define PESDR1_460EX_L3LPB		0x035F
-+#define PESDR1_460EX_L0CLK		0x0360
-+#define PESDR1_460EX_L1CLK		0x0361
-+#define PESDR1_460EX_L2CLK		0x0362
-+#define PESDR1_460EX_L3CLK		0x0363
-+#define PESDR1_460EX_PHY_CTL_RST	0x0364
-+#define PESDR1_460EX_RSTSTA		0x0365
-+#define PESDR1_460EX_OBS		0x0366
-+#define PESDR1_460EX_L0ERRC		0x0368
-+#define PESDR1_460EX_L1ERRC		0x0369
-+#define PESDR1_460EX_L2ERRC		0x036A
-+#define PESDR1_460EX_L3ERRC		0x036B
-+#define PESDR0_460EX_IHS1		0x036C
-+#define PESDR0_460EX_IHS2		0x036D
-+
-+/*
-  * Of the above, some are common offsets from the base
-  */
- #define PESDRn_UTLSET1			0x00
-@@ -353,6 +406,12 @@
- #define PECFG_POM2LAL		0x390
- #define PECFG_POM2LAH		0x394
- 
-+/* SDR Bit Mappings */
-+#define PESDRx_RCSSET_HLDPLB	0x10000000
-+#define PESDRx_RCSSET_RSTGU	0x01000000
-+#define PESDRx_RCSSET_RDY       0x00100000
-+#define PESDRx_RCSSET_RSTDL     0x00010000
-+#define PESDRx_RCSSET_RSTPYN    0x00001000
- 
- enum
- {
---- /dev/null
-+++ b/arch/powerpc/sysdev/ppc4xx_soc.c
-@@ -0,0 +1,200 @@
-+/*
-+ * IBM/AMCC PPC4xx SoC setup code
-+ *
-+ * Copyright 2008 DENX Software Engineering, Stefan Roese <sr@denx.de>
-+ *
-+ * L2 cache routines cloned from arch/ppc/syslib/ibm440gx_common.c which is:
-+ *   Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>
-+ *   Copyright (c) 2003 - 2006 Zultys Technologies
-+ *
-+ * 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/stddef.h>
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/errno.h>
-+#include <linux/interrupt.h>
-+#include <linux/irq.h>
-+#include <linux/of_platform.h>
-+
-+#include <asm/dcr.h>
-+#include <asm/dcr-regs.h>
-+#include <asm/reg.h>
-+
-+static u32 dcrbase_l2c;
-+
-+/*
-+ * L2-cache
-+ */
-+
-+/* Issue L2C diagnostic command */
-+static inline u32 l2c_diag(u32 addr)
-+{
-+	mtdcr(dcrbase_l2c + DCRN_L2C0_ADDR, addr);
-+	mtdcr(dcrbase_l2c + DCRN_L2C0_CMD, L2C_CMD_DIAG);
-+	while (!(mfdcr(dcrbase_l2c + DCRN_L2C0_SR) & L2C_SR_CC))
-+		;
-+
-+	return mfdcr(dcrbase_l2c + DCRN_L2C0_DATA);
-+}
-+
-+static irqreturn_t l2c_error_handler(int irq, void *dev)
-+{
-+	u32 sr = mfdcr(dcrbase_l2c + DCRN_L2C0_SR);
-+
-+	if (sr & L2C_SR_CPE) {
-+		/* Read cache trapped address */
-+		u32 addr = l2c_diag(0x42000000);
-+		printk(KERN_EMERG "L2C: Cache Parity Error, addr[16:26] = 0x%08x\n",
-+		       addr);
-+	}
-+	if (sr & L2C_SR_TPE) {
-+		/* Read tag trapped address */
-+		u32 addr = l2c_diag(0x82000000) >> 16;
-+		printk(KERN_EMERG "L2C: Tag Parity Error, addr[16:26] = 0x%08x\n",
-+		       addr);
-+	}
-+
-+	/* Clear parity errors */
-+	if (sr & (L2C_SR_CPE | L2C_SR_TPE)){
-+		mtdcr(dcrbase_l2c + DCRN_L2C0_ADDR, 0);
-+		mtdcr(dcrbase_l2c + DCRN_L2C0_CMD, L2C_CMD_CCP | L2C_CMD_CTE);
-+	} else {
-+		printk(KERN_EMERG "L2C: LRU error\n");
-+	}
-+
-+	return IRQ_HANDLED;
-+}
-+
-+static int __init ppc4xx_l2c_probe(void)
-+{
-+	struct device_node *np;
-+	u32 r;
-+	unsigned long flags;
-+	int irq;
-+	const u32 *dcrreg;
-+	u32 dcrbase_isram;
-+	int len;
-+	const u32 *prop;
-+	u32 l2_size;
-+
-+	np = of_find_compatible_node(NULL, NULL, "ibm,l2-cache");
-+	if (!np)
-+		return 0;
-+
-+	/* Get l2 cache size */
-+	prop = of_get_property(np, "cache-size", NULL);
-+	if (prop == NULL) {
-+		printk(KERN_ERR "%s: Can't get cache-size!\n", np->full_name);
-+		of_node_put(np);
-+		return -ENODEV;
-+	}
-+	l2_size = prop[0];
-+
-+	/* Map DCRs */
-+	dcrreg = of_get_property(np, "dcr-reg", &len);
-+	if (!dcrreg || (len != 4 * sizeof(u32))) {
-+		printk(KERN_ERR "%s: Can't get DCR register base !",
-+		       np->full_name);
-+		of_node_put(np);
-+		return -ENODEV;
-+	}
-+	dcrbase_isram = dcrreg[0];
-+	dcrbase_l2c = dcrreg[2];
-+
-+	/* Get and map irq number from device tree */
-+	irq = irq_of_parse_and_map(np, 0);
-+	if (irq == NO_IRQ) {
-+		printk(KERN_ERR "irq_of_parse_and_map failed\n");
-+		of_node_put(np);
-+		return -ENODEV;
-+	}
-+
-+	/* Install error handler */
-+	if (request_irq(irq, l2c_error_handler, IRQF_DISABLED, "L2C", 0) < 0) {
-+		printk(KERN_ERR "Cannot install L2C error handler"
-+		       ", cache is not enabled\n");
-+		of_node_put(np);
-+		return -ENODEV;
-+	}
-+
-+	local_irq_save(flags);
-+	asm volatile ("sync" ::: "memory");
-+
-+	/* Disable SRAM */
-+	mtdcr(dcrbase_isram + DCRN_SRAM0_DPC,
-+	      mfdcr(dcrbase_isram + DCRN_SRAM0_DPC) & ~SRAM_DPC_ENABLE);
-+	mtdcr(dcrbase_isram + DCRN_SRAM0_SB0CR,
-+	      mfdcr(dcrbase_isram + DCRN_SRAM0_SB0CR) & ~SRAM_SBCR_BU_MASK);
-+	mtdcr(dcrbase_isram + DCRN_SRAM0_SB1CR,
-+	      mfdcr(dcrbase_isram + DCRN_SRAM0_SB1CR) & ~SRAM_SBCR_BU_MASK);
-+	mtdcr(dcrbase_isram + DCRN_SRAM0_SB2CR,
-+	      mfdcr(dcrbase_isram + DCRN_SRAM0_SB2CR) & ~SRAM_SBCR_BU_MASK);
-+	mtdcr(dcrbase_isram + DCRN_SRAM0_SB3CR,
-+	      mfdcr(dcrbase_isram + DCRN_SRAM0_SB3CR) & ~SRAM_SBCR_BU_MASK);
-+
-+	/* Enable L2_MODE without ICU/DCU */
-+	r = mfdcr(dcrbase_l2c + DCRN_L2C0_CFG) &
-+		~(L2C_CFG_ICU | L2C_CFG_DCU | L2C_CFG_SS_MASK);
-+	r |= L2C_CFG_L2M | L2C_CFG_SS_256;
-+	mtdcr(dcrbase_l2c + DCRN_L2C0_CFG, r);
-+
-+	mtdcr(dcrbase_l2c + DCRN_L2C0_ADDR, 0);
-+
-+	/* Hardware Clear Command */
-+	mtdcr(dcrbase_l2c + DCRN_L2C0_CMD, L2C_CMD_HCC);
-+	while (!(mfdcr(dcrbase_l2c + DCRN_L2C0_SR) & L2C_SR_CC))
-+		;
-+
-+	/* Clear Cache Parity and Tag Errors */
-+	mtdcr(dcrbase_l2c + DCRN_L2C0_CMD, L2C_CMD_CCP | L2C_CMD_CTE);
-+
-+	/* Enable 64G snoop region starting at 0 */
-+	r = mfdcr(dcrbase_l2c + DCRN_L2C0_SNP0) &
-+		~(L2C_SNP_BA_MASK | L2C_SNP_SSR_MASK);
-+	r |= L2C_SNP_SSR_32G | L2C_SNP_ESR;
-+	mtdcr(dcrbase_l2c + DCRN_L2C0_SNP0, r);
-+
-+	r = mfdcr(dcrbase_l2c + DCRN_L2C0_SNP1) &
-+		~(L2C_SNP_BA_MASK | L2C_SNP_SSR_MASK);
-+	r |= 0x80000000 | L2C_SNP_SSR_32G | L2C_SNP_ESR;
-+	mtdcr(dcrbase_l2c + DCRN_L2C0_SNP1, r);
-+
-+	asm volatile ("sync" ::: "memory");
-+
-+	/* Enable ICU/DCU ports */
-+	r = mfdcr(dcrbase_l2c + DCRN_L2C0_CFG);
-+	r &= ~(L2C_CFG_DCW_MASK | L2C_CFG_PMUX_MASK | L2C_CFG_PMIM
-+	       | L2C_CFG_TPEI | L2C_CFG_CPEI | L2C_CFG_NAM | L2C_CFG_NBRM);
-+	r |= L2C_CFG_ICU | L2C_CFG_DCU | L2C_CFG_TPC | L2C_CFG_CPC | L2C_CFG_FRAN
-+		| L2C_CFG_CPIM | L2C_CFG_TPIM | L2C_CFG_LIM | L2C_CFG_SMCM;
-+
-+	/* Check for 460EX/GT special handling */
-+	if (of_device_is_compatible(np, "ibm,l2-cache-460ex"))
-+		r |= L2C_CFG_RDBW;
-+
-+	mtdcr(dcrbase_l2c + DCRN_L2C0_CFG, r);
-+
-+	asm volatile ("sync; isync" ::: "memory");
-+	local_irq_restore(flags);
-+
-+	printk(KERN_INFO "%dk L2-cache enabled\n", l2_size >> 10);
-+
-+	of_node_put(np);
-+	return 0;
-+}
-+arch_initcall(ppc4xx_l2c_probe);
-+
-+/*
-+ * At present, this routine just applies a system reset.
-+ */
-+void ppc4xx_reset_system(char *cmd)
-+{
-+	mtspr(SPRN_DBCR0, mfspr(SPRN_DBCR0) | DBCR0_RST_SYSTEM);
-+	while (1)
-+		;	/* Just in case the reset doesn't work */
-+}
---- a/arch/powerpc/sysdev/qe_lib/qe.c
-+++ b/arch/powerpc/sysdev/qe_lib/qe.c
-@@ -55,7 +55,7 @@ struct qe_snum {
- /* We allocate this here because it is used almost exclusively for
-  * the communication processor devices.
-  */
--struct qe_immap *qe_immr = NULL;
-+struct qe_immap __iomem *qe_immr;
- EXPORT_SYMBOL(qe_immr);
- 
- static struct qe_snum snums[QE_NUM_OF_SNUM];	/* Dynamically allocated SNUMs */
-@@ -156,7 +156,7 @@ EXPORT_SYMBOL(qe_issue_cmd);
-  */
- static unsigned int brg_clk = 0;
- 
--unsigned int get_brg_clk(void)
-+unsigned int qe_get_brg_clk(void)
- {
- 	struct device_node *qe;
- 	unsigned int size;
-@@ -180,6 +180,7 @@ unsigned int get_brg_clk(void)
- 
- 	return brg_clk;
- }
-+EXPORT_SYMBOL(qe_get_brg_clk);
- 
- /* Program the BRG to the given sampling rate and multiplier
-  *
-@@ -197,7 +198,7 @@ int qe_setbrg(enum qe_clock brg, unsigne
- 	if ((brg < QE_BRG1) || (brg > QE_BRG16))
- 		return -EINVAL;
- 
--	divisor = get_brg_clk() / (rate * multiplier);
-+	divisor = qe_get_brg_clk() / (rate * multiplier);
- 
- 	if (divisor > QE_BRGC_DIVISOR_MAX + 1) {
- 		div16 = QE_BRGC_DIV16;
-@@ -415,12 +416,6 @@ void qe_muram_dump(void)
- }
- EXPORT_SYMBOL(qe_muram_dump);
- 
--void *qe_muram_addr(unsigned long offset)
--{
--	return (void *)&qe_immr->muram[offset];
--}
--EXPORT_SYMBOL(qe_muram_addr);
--
- /* The maximum number of RISCs we support */
- #define MAX_QE_RISC     2
- 
---- a/arch/powerpc/sysdev/qe_lib/qe_io.c
-+++ b/arch/powerpc/sysdev/qe_lib/qe_io.c
-@@ -22,6 +22,7 @@
- #include <linux/ioport.h>
- 
- #include <asm/io.h>
-+#include <asm/qe.h>
- #include <asm/prom.h>
- #include <sysdev/fsl_soc.h>
- 
-@@ -41,7 +42,7 @@ struct port_regs {
- #endif
- };
- 
--static struct port_regs *par_io = NULL;
-+static struct port_regs __iomem *par_io;
- static int num_par_io_ports = 0;
- 
- int par_io_init(struct device_node *np)
-@@ -165,7 +166,7 @@ int par_io_of_config(struct device_node 
- 	}
- 
- 	ph = of_get_property(np, "pio-handle", NULL);
--	if (ph == 0) {
-+	if (ph == NULL) {
- 		printk(KERN_ERR "pio-handle not available \n");
- 		return -1;
- 	}
-@@ -200,7 +201,7 @@ static void dump_par_io(void)
- {
- 	unsigned int i;
- 
--	printk(KERN_INFO "%s: par_io=%p\n", __FUNCTION__, par_io);
-+	printk(KERN_INFO "%s: par_io=%p\n", __func__, par_io);
- 	for (i = 0; i < num_par_io_ports; i++) {
- 		printk(KERN_INFO "	cpodr[%u]=%08x\n", i,
- 			in_be32(&par_io[i].cpodr));
---- a/arch/powerpc/sysdev/qe_lib/ucc_fast.c
-+++ b/arch/powerpc/sysdev/qe_lib/ucc_fast.c
-@@ -148,57 +148,57 @@ int ucc_fast_init(struct ucc_fast_info *
- 
- 	/* check if the UCC port number is in range. */
- 	if ((uf_info->ucc_num < 0) || (uf_info->ucc_num > UCC_MAX_NUM - 1)) {
--		printk(KERN_ERR "%s: illegal UCC number\n", __FUNCTION__);
-+		printk(KERN_ERR "%s: illegal UCC number\n", __func__);
- 		return -EINVAL;
- 	}
- 
- 	/* Check that 'max_rx_buf_length' is properly aligned (4). */
- 	if (uf_info->max_rx_buf_length & (UCC_FAST_MRBLR_ALIGNMENT - 1)) {
- 		printk(KERN_ERR "%s: max_rx_buf_length not aligned\n",
--			__FUNCTION__);
-+			__func__);
- 		return -EINVAL;
- 	}
- 
- 	/* Validate Virtual Fifo register values */
- 	if (uf_info->urfs < UCC_FAST_URFS_MIN_VAL) {
--		printk(KERN_ERR "%s: urfs is too small\n", __FUNCTION__);
-+		printk(KERN_ERR "%s: urfs is too small\n", __func__);
- 		return -EINVAL;
- 	}
- 
- 	if (uf_info->urfs & (UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT - 1)) {
--		printk(KERN_ERR "%s: urfs is not aligned\n", __FUNCTION__);
-+		printk(KERN_ERR "%s: urfs is not aligned\n", __func__);
- 		return -EINVAL;
- 	}
- 
- 	if (uf_info->urfet & (UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT - 1)) {
--		printk(KERN_ERR "%s: urfet is not aligned.\n", __FUNCTION__);
-+		printk(KERN_ERR "%s: urfet is not aligned.\n", __func__);
- 		return -EINVAL;
- 	}
- 
- 	if (uf_info->urfset & (UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT - 1)) {
--		printk(KERN_ERR "%s: urfset is not aligned\n", __FUNCTION__);
-+		printk(KERN_ERR "%s: urfset is not aligned\n", __func__);
- 		return -EINVAL;
- 	}
- 
- 	if (uf_info->utfs & (UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT - 1)) {
--		printk(KERN_ERR "%s: utfs is not aligned\n", __FUNCTION__);
-+		printk(KERN_ERR "%s: utfs is not aligned\n", __func__);
- 		return -EINVAL;
- 	}
- 
- 	if (uf_info->utfet & (UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT - 1)) {
--		printk(KERN_ERR "%s: utfet is not aligned\n", __FUNCTION__);
-+		printk(KERN_ERR "%s: utfet is not aligned\n", __func__);
- 		return -EINVAL;
- 	}
- 
- 	if (uf_info->utftt & (UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT - 1)) {
--		printk(KERN_ERR "%s: utftt is not aligned\n", __FUNCTION__);
-+		printk(KERN_ERR "%s: utftt is not aligned\n", __func__);
- 		return -EINVAL;
- 	}
- 
- 	uccf = kzalloc(sizeof(struct ucc_fast_private), GFP_KERNEL);
- 	if (!uccf) {
- 		printk(KERN_ERR "%s: Cannot allocate private data\n",
--			__FUNCTION__);
-+			__func__);
- 		return -ENOMEM;
- 	}
- 
-@@ -207,7 +207,7 @@ int ucc_fast_init(struct ucc_fast_info *
- 	/* Set the PHY base address */
- 	uccf->uf_regs = ioremap(uf_info->regs, sizeof(struct ucc_fast));
- 	if (uccf->uf_regs == NULL) {
--		printk(KERN_ERR "%s: Cannot map UCC registers\n", __FUNCTION__);
-+		printk(KERN_ERR "%s: Cannot map UCC registers\n", __func__);
- 		return -ENOMEM;
- 	}
- 
-@@ -230,7 +230,7 @@ int ucc_fast_init(struct ucc_fast_info *
- 	/* Set UCC to fast type */
- 	ret = ucc_set_type(uf_info->ucc_num, UCC_SPEED_TYPE_FAST);
- 	if (ret) {
--		printk(KERN_ERR "%s: cannot set UCC type\n", __FUNCTION__);
-+		printk(KERN_ERR "%s: cannot set UCC type\n", __func__);
- 		ucc_fast_free(uccf);
- 		return ret;
- 	}
-@@ -270,7 +270,7 @@ int ucc_fast_init(struct ucc_fast_info *
- 	    qe_muram_alloc(uf_info->utfs, UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT);
- 	if (IS_ERR_VALUE(uccf->ucc_fast_tx_virtual_fifo_base_offset)) {
- 		printk(KERN_ERR "%s: cannot allocate MURAM for TX FIFO\n",
--			__FUNCTION__);
-+			__func__);
- 		uccf->ucc_fast_tx_virtual_fifo_base_offset = 0;
- 		ucc_fast_free(uccf);
- 		return -ENOMEM;
-@@ -283,7 +283,7 @@ int ucc_fast_init(struct ucc_fast_info *
- 			   UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT);
- 	if (IS_ERR_VALUE(uccf->ucc_fast_rx_virtual_fifo_base_offset)) {
- 		printk(KERN_ERR "%s: cannot allocate MURAM for RX FIFO\n",
--			__FUNCTION__);
-+			__func__);
- 		uccf->ucc_fast_rx_virtual_fifo_base_offset = 0;
- 		ucc_fast_free(uccf);
- 		return -ENOMEM;
-@@ -314,7 +314,7 @@ int ucc_fast_init(struct ucc_fast_info *
- 		    ucc_set_qe_mux_rxtx(uf_info->ucc_num, uf_info->rx_clock,
- 					COMM_DIR_RX)) {
- 			printk(KERN_ERR "%s: illegal value for RX clock\n",
--			       __FUNCTION__);
-+			       __func__);
- 			ucc_fast_free(uccf);
- 			return -EINVAL;
- 		}
-@@ -323,7 +323,7 @@ int ucc_fast_init(struct ucc_fast_info *
- 		    ucc_set_qe_mux_rxtx(uf_info->ucc_num, uf_info->tx_clock,
- 					COMM_DIR_TX)) {
- 			printk(KERN_ERR "%s: illegal value for TX clock\n",
--			       __FUNCTION__);
-+			       __func__);
- 			ucc_fast_free(uccf);
- 			return -EINVAL;
- 		}
---- a/arch/powerpc/sysdev/qe_lib/ucc_slow.c
-+++ b/arch/powerpc/sysdev/qe_lib/ucc_slow.c
-@@ -142,7 +142,7 @@ int ucc_slow_init(struct ucc_slow_info *
- 
- 	/* check if the UCC port number is in range. */
- 	if ((us_info->ucc_num < 0) || (us_info->ucc_num > UCC_MAX_NUM - 1)) {
--		printk(KERN_ERR "%s: illegal UCC number\n", __FUNCTION__);
-+		printk(KERN_ERR "%s: illegal UCC number\n", __func__);
- 		return -EINVAL;
- 	}
- 
-@@ -161,7 +161,7 @@ int ucc_slow_init(struct ucc_slow_info *
- 	uccs = kzalloc(sizeof(struct ucc_slow_private), GFP_KERNEL);
- 	if (!uccs) {
- 		printk(KERN_ERR "%s: Cannot allocate private data\n",
--			__FUNCTION__);
-+			__func__);
- 		return -ENOMEM;
- 	}
- 
-@@ -170,7 +170,7 @@ int ucc_slow_init(struct ucc_slow_info *
- 	/* Set the PHY base address */
- 	uccs->us_regs = ioremap(us_info->regs, sizeof(struct ucc_slow));
- 	if (uccs->us_regs == NULL) {
--		printk(KERN_ERR "%s: Cannot map UCC registers\n", __FUNCTION__);
-+		printk(KERN_ERR "%s: Cannot map UCC registers\n", __func__);
- 		return -ENOMEM;
- 	}
- 
-@@ -189,7 +189,7 @@ int ucc_slow_init(struct ucc_slow_info *
- 	uccs->us_pram_offset =
- 		qe_muram_alloc(UCC_SLOW_PRAM_SIZE, ALIGNMENT_OF_UCC_SLOW_PRAM);
- 	if (IS_ERR_VALUE(uccs->us_pram_offset)) {
--		printk(KERN_ERR "%s: cannot allocate MURAM for PRAM", __FUNCTION__);
-+		printk(KERN_ERR "%s: cannot allocate MURAM for PRAM", __func__);
- 		ucc_slow_free(uccs);
- 		return -ENOMEM;
- 	}
-@@ -202,7 +202,7 @@ int ucc_slow_init(struct ucc_slow_info *
- 	/* Set UCC to slow type */
- 	ret = ucc_set_type(us_info->ucc_num, UCC_SPEED_TYPE_SLOW);
- 	if (ret) {
--		printk(KERN_ERR "%s: cannot set UCC type", __FUNCTION__);
-+		printk(KERN_ERR "%s: cannot set UCC type", __func__);
- 		ucc_slow_free(uccs);
- 		return ret;
- 	}
-@@ -216,7 +216,7 @@ int ucc_slow_init(struct ucc_slow_info *
- 		qe_muram_alloc(us_info->rx_bd_ring_len * sizeof(struct qe_bd),
- 				QE_ALIGNMENT_OF_BD);
- 	if (IS_ERR_VALUE(uccs->rx_base_offset)) {
--		printk(KERN_ERR "%s: cannot allocate %u RX BDs\n", __FUNCTION__,
-+		printk(KERN_ERR "%s: cannot allocate %u RX BDs\n", __func__,
- 			us_info->rx_bd_ring_len);
- 		uccs->rx_base_offset = 0;
- 		ucc_slow_free(uccs);
-@@ -227,7 +227,7 @@ int ucc_slow_init(struct ucc_slow_info *
- 		qe_muram_alloc(us_info->tx_bd_ring_len * sizeof(struct qe_bd),
- 			QE_ALIGNMENT_OF_BD);
- 	if (IS_ERR_VALUE(uccs->tx_base_offset)) {
--		printk(KERN_ERR "%s: cannot allocate TX BDs", __FUNCTION__);
-+		printk(KERN_ERR "%s: cannot allocate TX BDs", __func__);
- 		uccs->tx_base_offset = 0;
- 		ucc_slow_free(uccs);
- 		return -ENOMEM;
-@@ -317,7 +317,7 @@ int ucc_slow_init(struct ucc_slow_info *
- 		if (ucc_set_qe_mux_rxtx(us_info->ucc_num, us_info->rx_clock,
- 					COMM_DIR_RX)) {
- 			printk(KERN_ERR "%s: illegal value for RX clock\n",
--			       __FUNCTION__);
-+			       __func__);
- 			ucc_slow_free(uccs);
- 			return -EINVAL;
- 		}
-@@ -325,7 +325,7 @@ int ucc_slow_init(struct ucc_slow_info *
- 		if (ucc_set_qe_mux_rxtx(us_info->ucc_num, us_info->tx_clock,
- 					COMM_DIR_TX)) {
- 			printk(KERN_ERR "%s: illegal value for TX clock\n",
--			       __FUNCTION__);
-+			       __func__);
- 			ucc_slow_free(uccs);
- 			return -EINVAL;
- 		}
---- a/arch/powerpc/sysdev/rtc_cmos_setup.c
-+++ b/arch/powerpc/sysdev/rtc_cmos_setup.c
-@@ -56,3 +56,5 @@ static int  __init add_rtc(void)
- 	return 0;
- }
- fs_initcall(add_rtc);
-+
-+MODULE_LICENSE("GPL");
---- a/arch/powerpc/sysdev/tsi108_dev.c
-+++ b/arch/powerpc/sysdev/tsi108_dev.c
-@@ -84,7 +84,7 @@ static int __init tsi108_eth_of_init(voi
- 
- 		ret = of_address_to_resource(np, 0, &r[0]);
- 		DBG("%s: name:start->end = %s:0x%lx-> 0x%lx\n",
--			__FUNCTION__,r[0].name, r[0].start, r[0].end);
-+			__func__,r[0].name, r[0].start, r[0].end);
- 		if (ret)
- 			goto err;
- 
-@@ -93,7 +93,7 @@ static int __init tsi108_eth_of_init(voi
- 		r[1].end = irq_of_parse_and_map(np, 0);
- 		r[1].flags = IORESOURCE_IRQ;
- 		DBG("%s: name:start->end = %s:0x%lx-> 0x%lx\n",
--			__FUNCTION__,r[1].name, r[1].start, r[1].end);
-+			__func__,r[1].name, r[1].start, r[1].end);
- 
- 		tsi_eth_dev =
- 		    platform_device_register_simple("tsi-ethernet", i++, &r[0],
---- a/arch/powerpc/sysdev/tsi108_pci.c
-+++ b/arch/powerpc/sysdev/tsi108_pci.c
-@@ -207,7 +207,7 @@ int __init tsi108_setup_pci(struct devic
- 	/* PCI Config mapping */
- 	tsi108_pci_cfg_base = (u32)ioremap(cfg_phys, TSI108_PCI_CFG_SIZE);
- 	tsi108_pci_cfg_phys = cfg_phys;
--	DBG("TSI_PCI: %s tsi108_pci_cfg_base=0x%x\n", __FUNCTION__,
-+	DBG("TSI_PCI: %s tsi108_pci_cfg_base=0x%x\n", __func__,
- 	    tsi108_pci_cfg_base);
- 
- 	/* Fetch host bridge registers address */
-@@ -395,7 +395,7 @@ static int pci_irq_host_xlate(struct irq
- static int pci_irq_host_map(struct irq_host *h, unsigned int virq,
- 			  irq_hw_number_t hw)
- {	unsigned int irq;
--	DBG("%s(%d, 0x%lx)\n", __FUNCTION__, virq, hw);
-+	DBG("%s(%d, 0x%lx)\n", __func__, virq, hw);
- 	if ((virq >= 1) && (virq <= 4)){
- 		irq = virq + IRQ_PCI_INTAD_BASE - 1;
- 		get_irq_desc(irq)->status |= IRQ_LEVEL;
---- a/arch/powerpc/xmon/xmon.c
-+++ b/arch/powerpc/xmon/xmon.c
-@@ -45,7 +45,6 @@
- #ifdef CONFIG_PPC64
- #include <asm/hvcall.h>
- #include <asm/paca.h>
--#include <asm/iseries/it_lp_reg_save.h>
- #endif
- 
- #include "nonstdio.h"
-@@ -1244,15 +1243,12 @@ static void get_function_bounds(unsigned
- 
- static int xmon_depth_to_print = 64;
- 
--#ifdef CONFIG_PPC64
--#define LRSAVE_OFFSET		0x10
--#define REG_FRAME_MARKER	0x7265677368657265ul	/* "regshere" */
--#define MARKER_OFFSET		0x60
-+#define LRSAVE_OFFSET		(STACK_FRAME_LR_SAVE * sizeof(unsigned long))
-+#define MARKER_OFFSET		(STACK_FRAME_MARKER * sizeof(unsigned long))
-+
-+#ifdef __powerpc64__
- #define REGS_OFFSET		0x70
- #else
--#define LRSAVE_OFFSET		4
--#define REG_FRAME_MARKER	0x72656773
--#define MARKER_OFFSET		8
- #define REGS_OFFSET		16
- #endif
- 
-@@ -1318,7 +1314,7 @@ static void xmon_show_stack(unsigned lon
- 		/* Look for "regshere" marker to see if this is
- 		   an exception frame. */
- 		if (mread(sp + MARKER_OFFSET, &marker, sizeof(unsigned long))
--		    && marker == REG_FRAME_MARKER) {
-+		    && marker == STACK_FRAME_REGS_MARKER) {
- 			if (mread(sp + REGS_OFFSET, &regs, sizeof(regs))
- 			    != sizeof(regs)) {
- 				printf("Couldn't read registers at %lx\n",
-@@ -1598,7 +1594,6 @@ void super_regs(void)
- 		if (firmware_has_feature(FW_FEATURE_ISERIES)) {
- 			struct paca_struct *ptrPaca;
- 			struct lppaca *ptrLpPaca;
--			struct ItLpRegSave *ptrLpRegSave;
- 
- 			/* Dump out relevant Paca data areas. */
- 			printf("Paca: \n");
-@@ -1611,15 +1606,6 @@ void super_regs(void)
- 			printf("    Saved Gpr3=%.16lx  Saved Gpr4=%.16lx \n",
- 			       ptrLpPaca->saved_gpr3, ptrLpPaca->saved_gpr4);
- 			printf("    Saved Gpr5=%.16lx \n", ptrLpPaca->saved_gpr5);
--
--			printf("  Local Processor Register Save Area (LpRegSave): \n");
--			ptrLpRegSave = ptrPaca->reg_save_ptr;
--			printf("    Saved Sprg0=%.16lx  Saved Sprg1=%.16lx \n",
--			       ptrLpRegSave->xSPRG0, ptrLpRegSave->xSPRG0);
--			printf("    Saved Sprg2=%.16lx  Saved Sprg3=%.16lx \n",
--			       ptrLpRegSave->xSPRG2, ptrLpRegSave->xSPRG3);
--			printf("    Saved Msr  =%.16lx  Saved Nia  =%.16lx \n",
--			       ptrLpRegSave->xMSR, ptrLpRegSave->xNIA);
- 		}
- #endif
- 
---- a/arch/ppc/8xx_io/commproc.c
-+++ b/arch/ppc/8xx_io/commproc.c
-@@ -43,7 +43,7 @@
- ({									\
- 	u32 offset = offsetof(immap_t, member);				\
- 	void *addr = ioremap (IMAP_ADDR + offset,			\
--			      sizeof( ((immap_t*)0)->member));		\
-+			      FIELD_SIZEOF(immap_t, member));		\
- 	addr;								\
- })
- 
---- a/arch/ppc/8xx_io/fec.c
-+++ b/arch/ppc/8xx_io/fec.c
-@@ -520,7 +520,7 @@ fec_enet_interrupt(int irq, void * dev_i
- #ifdef	CONFIG_USE_MDIO
- 			fec_enet_mii(dev);
- #else
--printk("%s[%d] %s: unexpected FEC_ENET_MII event\n", __FILE__,__LINE__,__FUNCTION__);
-+printk("%s[%d] %s: unexpected FEC_ENET_MII event\n", __FILE__, __LINE__, __func__);
- #endif	/* CONFIG_USE_MDIO */
- 		}
- 
-@@ -1441,7 +1441,7 @@ irqreturn_t mii_link_interrupt(int irq, 
- 		fecp->fec_ecntrl = ecntrl;	/* restore old settings */
- 	}
- #else
--printk("%s[%d] %s: unexpected Link interrupt\n", __FILE__,__LINE__,__FUNCTION__);
-+printk("%s[%d] %s: unexpected Link interrupt\n", __FILE__, __LINE__, __func__);
- #endif	/* CONFIG_USE_MDIO */
- 
- #ifndef CONFIG_RPXCLASSIC
---- a/arch/ppc/kernel/head.S
-+++ b/arch/ppc/kernel/head.S
-@@ -701,23 +701,6 @@ load_up_altivec:
- 	b	fast_exception_return
- 
- /*
-- * AltiVec unavailable trap from kernel - print a message, but let
-- * the task use AltiVec in the kernel until it returns to user mode.
-- */
--KernelAltiVec:
--	lwz	r3,_MSR(r1)
--	oris	r3,r3,MSR_VEC@h
--	stw	r3,_MSR(r1)	/* enable use of AltiVec after return */
--	lis	r3,87f@h
--	ori	r3,r3,87f@l
--	mr	r4,r2		/* current */
--	lwz	r5,_NIP(r1)
--	bl	printk
--	b	ret_from_except
--87:	.string	"AltiVec used in kernel  (task=%p, pc=%x)  \n"
--	.align	4,0
--
--/*
-  * giveup_altivec(tsk)
-  * Disable AltiVec for the task given as the argument,
-  * and save the AltiVec registers in its thread_struct.
---- a/arch/ppc/mm/init.c
-+++ b/arch/ppc/mm/init.c
-@@ -109,7 +109,6 @@ void show_mem(void)
- 
- 	printk("Mem-info:\n");
- 	show_free_areas();
--	printk("Free swap:       %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
- 	i = max_mapnr;
- 	while (i-- > 0) {
- 		total++;
---- a/arch/ppc/platforms/radstone_ppc7d.c
-+++ b/arch/ppc/platforms/radstone_ppc7d.c
-@@ -512,7 +512,7 @@ static void __init ppc7d_init_irq(void)
- {
- 	int irq;
- 
--	pr_debug("%s\n", __FUNCTION__);
-+	pr_debug("%s\n", __func__);
- 	i8259_init(0, 0);
- 	mv64360_init_irq();
- 
-@@ -569,7 +569,7 @@ static int __init ppc7d_map_irq(struct p
- 	};
- 	const long min_idsel = 10, max_idsel = 14, irqs_per_slot = 4;
- 
--	pr_debug("%s: %04x/%04x/%x: idsel=%hx pin=%hu\n", __FUNCTION__,
-+	pr_debug("%s: %04x/%04x/%x: idsel=%hx pin=%hu\n", __func__,
- 		 dev->vendor, dev->device, PCI_FUNC(dev->devfn), idsel, pin);
- 
- 	return PCI_IRQ_TABLE_LOOKUP;
-@@ -1300,7 +1300,7 @@ static void ppc7d_init2(void)
- 	u32 data;
- 	u8 data8;
- 
--	pr_debug("%s: enter\n", __FUNCTION__);
-+	pr_debug("%s: enter\n", __func__);
- 
- 	/* Wait for debugger? */
- 	if (ppc7d_wait_debugger) {
-@@ -1333,7 +1333,7 @@ static void ppc7d_init2(void)
-         ppc_md.set_rtc_time = ppc7d_set_rtc_time;
-         ppc_md.get_rtc_time = ppc7d_get_rtc_time;
- 
--	pr_debug("%s: exit\n", __FUNCTION__);
-+	pr_debug("%s: exit\n", __func__);
- }
- 
- /* Called from machine_init(), early, before any of the __init functions
---- a/arch/ppc/syslib/mpc52xx_setup.c
-+++ b/arch/ppc/syslib/mpc52xx_setup.c
-@@ -279,7 +279,7 @@ int mpc52xx_match_psc_function(int psc_i
- 
- int mpc52xx_set_psc_clkdiv(int psc_id, int clkdiv)
- {
--	static spinlock_t lock = SPIN_LOCK_UNLOCKED;
-+	static DEFINE_SPINLOCK(lock);
- 	struct mpc52xx_cdm __iomem *cdm;
- 	unsigned long flags;
- 	u16 mclken_div;
---- a/arch/sparc64/Kconfig
-+++ b/arch/sparc64/Kconfig
-@@ -16,6 +16,7 @@ config SPARC64
- 	bool
- 	default y
- 	select HAVE_IDE
-+	select HAVE_LMB
- 	help
- 	  SPARC is a family of RISC microprocessors designed and marketed by
- 	  Sun Microsystems, incorporated.  This port covers the newer 64-bit
---- a/drivers/block/viodasd.c
-+++ b/drivers/block/viodasd.c
-@@ -69,7 +69,7 @@ MODULE_LICENSE("GPL");
- enum {
- 	PARTITION_SHIFT = 3,
- 	MAX_DISKNO = HVMAXARCHITECTEDVIRTUALDISKS,
--	MAX_DISK_NAME = sizeof(((struct gendisk *)0)->disk_name)
-+	MAX_DISK_NAME = FIELD_SIZEOF(struct gendisk, disk_name)
- };
- 
- static DEFINE_SPINLOCK(viodasd_spinlock);
---- a/drivers/char/hvc_beat.c
-+++ b/drivers/char/hvc_beat.c
-@@ -78,8 +78,8 @@ static int hvc_beat_put_chars(uint32_t v
- 	for (rest = cnt; rest > 0; rest -= nlen) {
- 		nlen = (rest > 16) ? 16 : rest;
- 		memcpy(kb, buf, nlen);
--		beat_put_term_char(vtermno, rest, kb[0], kb[1]);
--		rest -= nlen;
-+		beat_put_term_char(vtermno, nlen, kb[0], kb[1]);
-+		buf += nlen;
- 	}
- 	return cnt;
- }
---- a/drivers/char/xilinx_hwicap/buffer_icap.c
-+++ b/drivers/char/xilinx_hwicap/buffer_icap.c
-@@ -74,7 +74,7 @@
- 
- /**
-  * buffer_icap_get_status - Get the contents of the status register.
-- * @base_address: is the base address of the device
-+ * @drvdata: a pointer to the drvdata.
-  *
-  * The status register contains the ICAP status and the done bit.
-  *
-@@ -88,9 +88,9 @@
-  * D1 - Always 1
-  * D0 - Done bit
-  **/
--static inline u32 buffer_icap_get_status(void __iomem *base_address)
-+u32 buffer_icap_get_status(struct hwicap_drvdata *drvdata)
- {
--	return in_be32(base_address + XHI_STATUS_REG_OFFSET);
-+	return in_be32(drvdata->base_address + XHI_STATUS_REG_OFFSET);
- }
- 
- /**
-@@ -117,20 +117,8 @@ static inline u32 buffer_icap_get_bram(v
-  **/
- static inline bool buffer_icap_busy(void __iomem *base_address)
- {
--	return (buffer_icap_get_status(base_address) & 1) == XHI_NOT_FINISHED;
--}
--
--/**
-- * buffer_icap_busy - Return true if the icap device is not busy
-- * @base_address: is the base address of the device
-- *
-- * The queries the low order bit of the status register, which
-- * indicates whether the current configuration or readback operation
-- * has completed.
-- **/
--static inline bool buffer_icap_done(void __iomem *base_address)
--{
--	return (buffer_icap_get_status(base_address) & 1) == XHI_FINISHED;
-+	u32 status = in_be32(base_address + XHI_STATUS_REG_OFFSET);
-+	return (status & 1) == XHI_NOT_FINISHED;
- }
- 
- /**
---- a/drivers/char/xilinx_hwicap/buffer_icap.h
-+++ b/drivers/char/xilinx_hwicap/buffer_icap.h
-@@ -44,8 +44,6 @@
- #include <asm/io.h>
- #include "xilinx_hwicap.h"
- 
--void buffer_icap_reset(struct hwicap_drvdata *drvdata);
--
- /* Loads a partial bitstream from system memory. */
- int buffer_icap_set_configuration(struct hwicap_drvdata *drvdata, u32 *data,
- 			     u32 Size);
-@@ -54,4 +52,7 @@ int buffer_icap_set_configuration(struct
- int buffer_icap_get_configuration(struct hwicap_drvdata *drvdata, u32 *data,
- 			     u32 Size);
- 
-+u32 buffer_icap_get_status(struct hwicap_drvdata *drvdata);
-+void buffer_icap_reset(struct hwicap_drvdata *drvdata);
-+
- #endif
---- a/drivers/char/xilinx_hwicap/fifo_icap.c
-+++ b/drivers/char/xilinx_hwicap/fifo_icap.c
-@@ -78,13 +78,6 @@
- #define XHI_CR_READ_MASK 0x00000002 /* Read from ICAP to FIFO */
- #define XHI_CR_WRITE_MASK 0x00000001 /* Write from FIFO to ICAP */
- 
--/* Status Register (SR) */
--#define XHI_SR_CFGERR_N_MASK 0x00000100 /* Config Error Mask */
--#define XHI_SR_DALIGN_MASK 0x00000080 /* Data Alignment Mask */
--#define XHI_SR_RIP_MASK 0x00000040 /* Read back Mask */
--#define XHI_SR_IN_ABORT_N_MASK 0x00000020 /* Select Map Abort Mask */
--#define XHI_SR_DONE_MASK 0x00000001 /* Done bit Mask  */
--
- 
- #define XHI_WFO_MAX_VACANCY 1024 /* Max Write FIFO Vacancy, in words */
- #define XHI_RFO_MAX_OCCUPANCY 256 /* Max Read FIFO Occupancy, in words */
-@@ -152,13 +145,35 @@ static inline void fifo_icap_start_readb
- }
- 
- /**
-+ * fifo_icap_get_status - Get the contents of the status register.
-+ * @drvdata: a pointer to the drvdata.
-+ *
-+ * The status register contains the ICAP status and the done bit.
-+ *
-+ * D8 - cfgerr
-+ * D7 - dalign
-+ * D6 - rip
-+ * D5 - in_abort_l
-+ * D4 - Always 1
-+ * D3 - Always 1
-+ * D2 - Always 1
-+ * D1 - Always 1
-+ * D0 - Done bit
-+ **/
-+u32 fifo_icap_get_status(struct hwicap_drvdata *drvdata)
-+{
-+	u32 status = in_be32(drvdata->base_address + XHI_SR_OFFSET);
-+	dev_dbg(drvdata->dev, "Getting status = %x\n", status);
-+	return status;
-+}
-+
-+/**
-  * fifo_icap_busy - Return true if the ICAP is still processing a transaction.
-  * @drvdata: a pointer to the drvdata.
-  **/
- static inline u32 fifo_icap_busy(struct hwicap_drvdata *drvdata)
- {
- 	u32 status = in_be32(drvdata->base_address + XHI_SR_OFFSET);
--	dev_dbg(drvdata->dev, "Getting status = %x\n", status);
- 	return (status & XHI_SR_DONE_MASK) ? 0 : 1;
- }
- 
---- a/drivers/char/xilinx_hwicap/fifo_icap.h
-+++ b/drivers/char/xilinx_hwicap/fifo_icap.h
-@@ -56,6 +56,7 @@ int fifo_icap_set_configuration(
- 		u32 *FrameBuffer,
- 		u32 NumWords);
- 
-+u32 fifo_icap_get_status(struct hwicap_drvdata *drvdata);
- void fifo_icap_reset(struct hwicap_drvdata *drvdata);
- void fifo_icap_flush_fifo(struct hwicap_drvdata *drvdata);
- 
---- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c
-+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
-@@ -36,7 +36,7 @@
-  *****************************************************************************/
- 
- /*
-- * This is the code behind /dev/xilinx_icap -- it allows a user-space
-+ * This is the code behind /dev/icap* -- it allows a user-space
-  * application to use the Xilinx ICAP subsystem.
-  *
-  * The following operations are possible:
-@@ -67,7 +67,7 @@
-  * user-space application code that uses this device.  The simplest
-  * way to use this interface is simply:
-  *
-- * cp foo.bit /dev/xilinx_icap
-+ * cp foo.bit /dev/icap0
-  *
-  * Note that unless foo.bit is an appropriately constructed partial
-  * bitstream, this has a high likelyhood of overwriting the design
-@@ -105,18 +105,14 @@
- #include "buffer_icap.h"
- #include "fifo_icap.h"
- 
--#define DRIVER_NAME "xilinx_icap"
-+#define DRIVER_NAME "icap"
- 
- #define HWICAP_REGS   (0x10000)
- 
--/* dynamically allocate device number */
--static int xhwicap_major;
--static int xhwicap_minor;
-+#define XHWICAP_MAJOR 259
-+#define XHWICAP_MINOR 0
- #define HWICAP_DEVICES 1
- 
--module_param(xhwicap_major, int, S_IRUGO);
--module_param(xhwicap_minor, int, S_IRUGO);
--
- /* An array, which is set to true when the device is registered. */
- static bool probed_devices[HWICAP_DEVICES];
- static struct mutex icap_sem;
-@@ -250,8 +246,26 @@ static int hwicap_get_configuration_regi
- 	 * Create the data to be written to the ICAP.
- 	 */
- 	buffer[index++] = XHI_DUMMY_PACKET;
-+	buffer[index++] = XHI_NOOP_PACKET;
- 	buffer[index++] = XHI_SYNC_PACKET;
- 	buffer[index++] = XHI_NOOP_PACKET;
-+	buffer[index++] = XHI_NOOP_PACKET;
-+
-+	/*
-+	 * Write the data to the FIFO and initiate the transfer of data present
-+	 * in the FIFO to the ICAP device.
-+	 */
-+	status = drvdata->config->set_configuration(drvdata,
-+						    &buffer[0], index);
-+	if (status)
-+		return status;
-+
-+	/* If the syncword was not found, then we need to start over. */
-+	status = drvdata->config->get_status(drvdata);
-+	if ((status & XHI_SR_DALIGN_MASK) != XHI_SR_DALIGN_MASK)
-+		return -EIO;
-+
-+	index = 0;
- 	buffer[index++] = hwicap_type_1_read(reg) | 1;
- 	buffer[index++] = XHI_NOOP_PACKET;
- 	buffer[index++] = XHI_NOOP_PACKET;
-@@ -587,7 +601,7 @@ static int __devinit hwicap_setup(struct
- 	probed_devices[id] = 1;
- 	mutex_unlock(&icap_sem);
- 
--	devt = MKDEV(xhwicap_major, xhwicap_minor + id);
-+	devt = MKDEV(XHWICAP_MAJOR, XHWICAP_MINOR + id);
- 
- 	drvdata = kzalloc(sizeof(struct hwicap_drvdata), GFP_KERNEL);
- 	if (!drvdata) {
-@@ -664,12 +678,14 @@ static int __devinit hwicap_setup(struct
- static struct hwicap_driver_config buffer_icap_config = {
- 	.get_configuration = buffer_icap_get_configuration,
- 	.set_configuration = buffer_icap_set_configuration,
-+	.get_status = buffer_icap_get_status,
- 	.reset = buffer_icap_reset,
- };
- 
- static struct hwicap_driver_config fifo_icap_config = {
- 	.get_configuration = fifo_icap_get_configuration,
- 	.set_configuration = fifo_icap_set_configuration,
-+	.get_status = fifo_icap_get_status,
- 	.reset = fifo_icap_reset,
- };
- 
-@@ -690,7 +706,7 @@ static int __devexit hwicap_remove(struc
- 	dev_set_drvdata(dev, NULL);
- 
- 	mutex_lock(&icap_sem);
--	probed_devices[MINOR(dev->devt)-xhwicap_minor] = 0;
-+	probed_devices[MINOR(dev->devt)-XHWICAP_MINOR] = 0;
- 	mutex_unlock(&icap_sem);
- 	return 0;		/* success */
- }
-@@ -830,23 +846,12 @@ static int __init hwicap_module_init(voi
- 	icap_class = class_create(THIS_MODULE, "xilinx_config");
- 	mutex_init(&icap_sem);
- 
--	if (xhwicap_major) {
--		devt = MKDEV(xhwicap_major, xhwicap_minor);
--		retval = register_chrdev_region(
--				devt,
--				HWICAP_DEVICES,
--				DRIVER_NAME);
--		if (retval < 0)
--			return retval;
--	} else {
--		retval = alloc_chrdev_region(&devt,
--				xhwicap_minor,
--				HWICAP_DEVICES,
--				DRIVER_NAME);
--		if (retval < 0)
--			return retval;
--		xhwicap_major = MAJOR(devt);
--	}
-+	devt = MKDEV(XHWICAP_MAJOR, XHWICAP_MINOR);
-+	retval = register_chrdev_region(devt,
-+					HWICAP_DEVICES,
-+					DRIVER_NAME);
-+	if (retval < 0)
-+		return retval;
- 
- 	retval = platform_driver_register(&hwicap_platform_driver);
- 
-@@ -871,7 +876,7 @@ static int __init hwicap_module_init(voi
- 
- static void __exit hwicap_module_cleanup(void)
- {
--	dev_t devt = MKDEV(xhwicap_major, xhwicap_minor);
-+	dev_t devt = MKDEV(XHWICAP_MAJOR, XHWICAP_MINOR);
- 
- 	class_destroy(icap_class);
- 
---- a/drivers/char/xilinx_hwicap/xilinx_hwicap.h
-+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.h
-@@ -65,10 +65,27 @@ struct hwicap_drvdata {
- };
- 
- struct hwicap_driver_config {
-+	/* Read configuration data given by size into the data buffer.
-+	   Return 0 if successful. */
- 	int (*get_configuration)(struct hwicap_drvdata *drvdata, u32 *data,
- 			u32 size);
-+	/* Write configuration data given by size from the data buffer.
-+	   Return 0 if successful. */
- 	int (*set_configuration)(struct hwicap_drvdata *drvdata, u32 *data,
- 			u32 size);
-+	/* Get the status register, bit pattern given by:
-+	 * D8 - 0 = configuration error
-+	 * D7 - 1 = alignment found
-+	 * D6 - 1 = readback in progress
-+	 * D5 - 0 = abort in progress
-+	 * D4 - Always 1
-+	 * D3 - Always 1
-+	 * D2 - Always 1
-+	 * D1 - Always 1
-+	 * D0 - 1 = operation completed
-+	 */
-+	u32 (*get_status)(struct hwicap_drvdata *drvdata);
-+	/* Reset the hw */
- 	void (*reset)(struct hwicap_drvdata *drvdata);
- };
- 
-@@ -163,6 +180,13 @@ struct config_registers {
- /* Constant to use for CRC check when CRC has been disabled */
- #define XHI_DISABLED_AUTO_CRC       0x0000DEFCUL
- 
-+/* Meanings of the bits returned by get_status */
-+#define XHI_SR_CFGERR_N_MASK 0x00000100 /* Config Error Mask */
-+#define XHI_SR_DALIGN_MASK 0x00000080 /* Data Alignment Mask */
-+#define XHI_SR_RIP_MASK 0x00000040 /* Read back Mask */
-+#define XHI_SR_IN_ABORT_N_MASK 0x00000020 /* Select Map Abort Mask */
-+#define XHI_SR_DONE_MASK 0x00000001 /* Done bit Mask  */
-+
- /**
-  * hwicap_type_1_read - Generates a Type 1 read packet header.
-  * @reg: is the address of the register to be read back.
---- a/drivers/mtd/nand/fsl_elbc_nand.c
-+++ b/drivers/mtd/nand/fsl_elbc_nand.c
-@@ -36,207 +36,12 @@
- #include <linux/mtd/partitions.h>
- 
- #include <asm/io.h>
--
-+#include <asm/fsl_lbc.h>
- 
- #define MAX_BANKS 8
- #define ERR_BYTE 0xFF /* Value returned for read bytes when read failed */
- #define FCM_TIMEOUT_MSECS 500 /* Maximum number of mSecs to wait for FCM */
- 
--struct elbc_bank {
--	__be32 br;             /**< Base Register  */
--#define BR_BA           0xFFFF8000
--#define BR_BA_SHIFT             15
--#define BR_PS           0x00001800
--#define BR_PS_SHIFT             11
--#define BR_PS_8         0x00000800  /* Port Size 8 bit */
--#define BR_PS_16        0x00001000  /* Port Size 16 bit */
--#define BR_PS_32        0x00001800  /* Port Size 32 bit */
--#define BR_DECC         0x00000600
--#define BR_DECC_SHIFT            9
--#define BR_DECC_OFF     0x00000000  /* HW ECC checking and generation off */
--#define BR_DECC_CHK     0x00000200  /* HW ECC checking on, generation off */
--#define BR_DECC_CHK_GEN 0x00000400  /* HW ECC checking and generation on */
--#define BR_WP           0x00000100
--#define BR_WP_SHIFT              8
--#define BR_MSEL         0x000000E0
--#define BR_MSEL_SHIFT            5
--#define BR_MS_GPCM      0x00000000  /* GPCM */
--#define BR_MS_FCM       0x00000020  /* FCM */
--#define BR_MS_SDRAM     0x00000060  /* SDRAM */
--#define BR_MS_UPMA      0x00000080  /* UPMA */
--#define BR_MS_UPMB      0x000000A0  /* UPMB */
--#define BR_MS_UPMC      0x000000C0  /* UPMC */
--#define BR_V            0x00000001
--#define BR_V_SHIFT               0
--#define BR_RES          ~(BR_BA|BR_PS|BR_DECC|BR_WP|BR_MSEL|BR_V)
--
--	__be32 or;             /**< Base Register  */
--#define OR0 0x5004
--#define OR1 0x500C
--#define OR2 0x5014
--#define OR3 0x501C
--#define OR4 0x5024
--#define OR5 0x502C
--#define OR6 0x5034
--#define OR7 0x503C
--
--#define OR_FCM_AM               0xFFFF8000
--#define OR_FCM_AM_SHIFT                 15
--#define OR_FCM_BCTLD            0x00001000
--#define OR_FCM_BCTLD_SHIFT              12
--#define OR_FCM_PGS              0x00000400
--#define OR_FCM_PGS_SHIFT                10
--#define OR_FCM_CSCT             0x00000200
--#define OR_FCM_CSCT_SHIFT                9
--#define OR_FCM_CST              0x00000100
--#define OR_FCM_CST_SHIFT                 8
--#define OR_FCM_CHT              0x00000080
--#define OR_FCM_CHT_SHIFT                 7
--#define OR_FCM_SCY              0x00000070
--#define OR_FCM_SCY_SHIFT                 4
--#define OR_FCM_SCY_1            0x00000010
--#define OR_FCM_SCY_2            0x00000020
--#define OR_FCM_SCY_3            0x00000030
--#define OR_FCM_SCY_4            0x00000040
--#define OR_FCM_SCY_5            0x00000050
--#define OR_FCM_SCY_6            0x00000060
--#define OR_FCM_SCY_7            0x00000070
--#define OR_FCM_RST              0x00000008
--#define OR_FCM_RST_SHIFT                 3
--#define OR_FCM_TRLX             0x00000004
--#define OR_FCM_TRLX_SHIFT                2
--#define OR_FCM_EHTR             0x00000002
--#define OR_FCM_EHTR_SHIFT                1
--};
--
--struct elbc_regs {
--	struct elbc_bank bank[8];
--	u8 res0[0x28];
--	__be32 mar;             /**< UPM Address Register */
--	u8 res1[0x4];
--	__be32 mamr;            /**< UPMA Mode Register */
--	__be32 mbmr;            /**< UPMB Mode Register */
--	__be32 mcmr;            /**< UPMC Mode Register */
--	u8 res2[0x8];
--	__be32 mrtpr;           /**< Memory Refresh Timer Prescaler Register */
--	__be32 mdr;             /**< UPM Data Register */
--	u8 res3[0x4];
--	__be32 lsor;            /**< Special Operation Initiation Register */
--	__be32 lsdmr;           /**< SDRAM Mode Register */
--	u8 res4[0x8];
--	__be32 lurt;            /**< UPM Refresh Timer */
--	__be32 lsrt;            /**< SDRAM Refresh Timer */
--	u8 res5[0x8];
--	__be32 ltesr;           /**< Transfer Error Status Register */
--#define LTESR_BM   0x80000000
--#define LTESR_FCT  0x40000000
--#define LTESR_PAR  0x20000000
--#define LTESR_WP   0x04000000
--#define LTESR_ATMW 0x00800000
--#define LTESR_ATMR 0x00400000
--#define LTESR_CS   0x00080000
--#define LTESR_CC   0x00000001
--#define LTESR_NAND_MASK (LTESR_FCT | LTESR_PAR | LTESR_CC)
--	__be32 ltedr;           /**< Transfer Error Disable Register */
--	__be32 lteir;           /**< Transfer Error Interrupt Register */
--	__be32 lteatr;          /**< Transfer Error Attributes Register */
--	__be32 ltear;           /**< Transfer Error Address Register */
--	u8 res6[0xC];
--	__be32 lbcr;            /**< Configuration Register */
--#define LBCR_LDIS  0x80000000
--#define LBCR_LDIS_SHIFT    31
--#define LBCR_BCTLC 0x00C00000
--#define LBCR_BCTLC_SHIFT   22
--#define LBCR_AHD   0x00200000
--#define LBCR_LPBSE 0x00020000
--#define LBCR_LPBSE_SHIFT   17
--#define LBCR_EPAR  0x00010000
--#define LBCR_EPAR_SHIFT    16
--#define LBCR_BMT   0x0000FF00
--#define LBCR_BMT_SHIFT      8
--#define LBCR_INIT  0x00040000
--	__be32 lcrr;            /**< Clock Ratio Register */
--#define LCRR_DBYP    0x80000000
--#define LCRR_DBYP_SHIFT      31
--#define LCRR_BUFCMDC 0x30000000
--#define LCRR_BUFCMDC_SHIFT   28
--#define LCRR_ECL     0x03000000
--#define LCRR_ECL_SHIFT       24
--#define LCRR_EADC    0x00030000
--#define LCRR_EADC_SHIFT      16
--#define LCRR_CLKDIV  0x0000000F
--#define LCRR_CLKDIV_SHIFT     0
--	u8 res7[0x8];
--	__be32 fmr;             /**< Flash Mode Register */
--#define FMR_CWTO     0x0000F000
--#define FMR_CWTO_SHIFT       12
--#define FMR_BOOT     0x00000800
--#define FMR_ECCM     0x00000100
--#define FMR_AL       0x00000030
--#define FMR_AL_SHIFT          4
--#define FMR_OP       0x00000003
--#define FMR_OP_SHIFT          0
--	__be32 fir;             /**< Flash Instruction Register */
--#define FIR_OP0      0xF0000000
--#define FIR_OP0_SHIFT        28
--#define FIR_OP1      0x0F000000
--#define FIR_OP1_SHIFT        24
--#define FIR_OP2      0x00F00000
--#define FIR_OP2_SHIFT        20
--#define FIR_OP3      0x000F0000
--#define FIR_OP3_SHIFT        16
--#define FIR_OP4      0x0000F000
--#define FIR_OP4_SHIFT        12
--#define FIR_OP5      0x00000F00
--#define FIR_OP5_SHIFT         8
--#define FIR_OP6      0x000000F0
--#define FIR_OP6_SHIFT         4
--#define FIR_OP7      0x0000000F
--#define FIR_OP7_SHIFT         0
--#define FIR_OP_NOP   0x0	/* No operation and end of sequence */
--#define FIR_OP_CA    0x1        /* Issue current column address */
--#define FIR_OP_PA    0x2        /* Issue current block+page address */
--#define FIR_OP_UA    0x3        /* Issue user defined address */
--#define FIR_OP_CM0   0x4        /* Issue command from FCR[CMD0] */
--#define FIR_OP_CM1   0x5        /* Issue command from FCR[CMD1] */
--#define FIR_OP_CM2   0x6        /* Issue command from FCR[CMD2] */
--#define FIR_OP_CM3   0x7        /* Issue command from FCR[CMD3] */
--#define FIR_OP_WB    0x8        /* Write FBCR bytes from FCM buffer */
--#define FIR_OP_WS    0x9        /* Write 1 or 2 bytes from MDR[AS] */
--#define FIR_OP_RB    0xA        /* Read FBCR bytes to FCM buffer */
--#define FIR_OP_RS    0xB        /* Read 1 or 2 bytes to MDR[AS] */
--#define FIR_OP_CW0   0xC        /* Wait then issue FCR[CMD0] */
--#define FIR_OP_CW1   0xD        /* Wait then issue FCR[CMD1] */
--#define FIR_OP_RBW   0xE        /* Wait then read FBCR bytes */
--#define FIR_OP_RSW   0xE        /* Wait then read 1 or 2 bytes */
--	__be32 fcr;             /**< Flash Command Register */
--#define FCR_CMD0     0xFF000000
--#define FCR_CMD0_SHIFT       24
--#define FCR_CMD1     0x00FF0000
--#define FCR_CMD1_SHIFT       16
--#define FCR_CMD2     0x0000FF00
--#define FCR_CMD2_SHIFT        8
--#define FCR_CMD3     0x000000FF
--#define FCR_CMD3_SHIFT        0
--	__be32 fbar;            /**< Flash Block Address Register */
--#define FBAR_BLK     0x00FFFFFF
--	__be32 fpar;            /**< Flash Page Address Register */
--#define FPAR_SP_PI   0x00007C00
--#define FPAR_SP_PI_SHIFT     10
--#define FPAR_SP_MS   0x00000200
--#define FPAR_SP_CI   0x000001FF
--#define FPAR_SP_CI_SHIFT      0
--#define FPAR_LP_PI   0x0003F000
--#define FPAR_LP_PI_SHIFT     12
--#define FPAR_LP_MS   0x00000800
--#define FPAR_LP_CI   0x000007FF
--#define FPAR_LP_CI_SHIFT      0
--	__be32 fbcr;            /**< Flash Byte Count Register */
--#define FBCR_BC      0x00000FFF
--	u8 res11[0x8];
--	u8 res8[0xF00];
--};
--
- struct fsl_elbc_ctrl;
- 
- /* mtd information per set */
-@@ -261,7 +66,7 @@ struct fsl_elbc_ctrl {
- 
- 	/* device info */
- 	struct device *dev;
--	struct elbc_regs __iomem *regs;
-+	struct fsl_lbc_regs __iomem *regs;
- 	int irq;
- 	wait_queue_head_t irq_wait;
- 	unsigned int irq_status; /* status read from LTESR by irq handler */
-@@ -322,7 +127,7 @@ static void set_addr(struct mtd_info *mt
- 	struct nand_chip *chip = mtd->priv;
- 	struct fsl_elbc_mtd *priv = chip->priv;
- 	struct fsl_elbc_ctrl *ctrl = priv->ctrl;
--	struct elbc_regs __iomem *lbc = ctrl->regs;
-+	struct fsl_lbc_regs __iomem *lbc = ctrl->regs;
- 	int buf_num;
- 
- 	ctrl->page = page_addr;
-@@ -363,7 +168,7 @@ static int fsl_elbc_run_command(struct m
- 	struct nand_chip *chip = mtd->priv;
- 	struct fsl_elbc_mtd *priv = chip->priv;
- 	struct fsl_elbc_ctrl *ctrl = priv->ctrl;
--	struct elbc_regs __iomem *lbc = ctrl->regs;
-+	struct fsl_lbc_regs __iomem *lbc = ctrl->regs;
- 
- 	/* Setup the FMR[OP] to execute without write protection */
- 	out_be32(&lbc->fmr, priv->fmr | 3);
-@@ -406,7 +211,7 @@ static void fsl_elbc_do_read(struct nand
- {
- 	struct fsl_elbc_mtd *priv = chip->priv;
- 	struct fsl_elbc_ctrl *ctrl = priv->ctrl;
--	struct elbc_regs __iomem *lbc = ctrl->regs;
-+	struct fsl_lbc_regs __iomem *lbc = ctrl->regs;
- 
- 	if (priv->page_size) {
- 		out_be32(&lbc->fir,
-@@ -439,7 +244,7 @@ static void fsl_elbc_cmdfunc(struct mtd_
- 	struct nand_chip *chip = mtd->priv;
- 	struct fsl_elbc_mtd *priv = chip->priv;
- 	struct fsl_elbc_ctrl *ctrl = priv->ctrl;
--	struct elbc_regs __iomem *lbc = ctrl->regs;
-+	struct fsl_lbc_regs __iomem *lbc = ctrl->regs;
- 
- 	ctrl->use_mdr = 0;
- 
-@@ -775,7 +580,7 @@ static int fsl_elbc_wait(struct mtd_info
- {
- 	struct fsl_elbc_mtd *priv = chip->priv;
- 	struct fsl_elbc_ctrl *ctrl = priv->ctrl;
--	struct elbc_regs __iomem *lbc = ctrl->regs;
-+	struct fsl_lbc_regs __iomem *lbc = ctrl->regs;
- 
- 	if (ctrl->status != LTESR_CC)
- 		return NAND_STATUS_FAIL;
-@@ -807,7 +612,7 @@ static int fsl_elbc_chip_init_tail(struc
- 	struct nand_chip *chip = mtd->priv;
- 	struct fsl_elbc_mtd *priv = chip->priv;
- 	struct fsl_elbc_ctrl *ctrl = priv->ctrl;
--	struct elbc_regs __iomem *lbc = ctrl->regs;
-+	struct fsl_lbc_regs __iomem *lbc = ctrl->regs;
- 	unsigned int al;
- 
- 	/* calculate FMR Address Length field */
-@@ -922,7 +727,7 @@ static void fsl_elbc_write_page(struct m
- static int fsl_elbc_chip_init(struct fsl_elbc_mtd *priv)
- {
- 	struct fsl_elbc_ctrl *ctrl = priv->ctrl;
--	struct elbc_regs __iomem *lbc = ctrl->regs;
-+	struct fsl_lbc_regs __iomem *lbc = ctrl->regs;
- 	struct nand_chip *chip = &priv->chip;
- 
- 	dev_dbg(priv->dev, "eLBC Set Information for bank %d\n", priv->bank);
-@@ -986,7 +791,7 @@ static int fsl_elbc_chip_remove(struct f
- static int fsl_elbc_chip_probe(struct fsl_elbc_ctrl *ctrl,
-                                struct device_node *node)
- {
--	struct elbc_regs __iomem *lbc = ctrl->regs;
-+	struct fsl_lbc_regs __iomem *lbc = ctrl->regs;
- 	struct fsl_elbc_mtd *priv;
- 	struct resource res;
- #ifdef CONFIG_MTD_PARTITIONS
-@@ -1083,7 +888,7 @@ err:
- 
- static int __devinit fsl_elbc_ctrl_init(struct fsl_elbc_ctrl *ctrl)
- {
--	struct elbc_regs __iomem *lbc = ctrl->regs;
-+	struct fsl_lbc_regs __iomem *lbc = ctrl->regs;
- 
- 	/* clear event registers */
- 	setbits32(&lbc->ltesr, LTESR_NAND_MASK);
-@@ -1128,7 +933,7 @@ static int __devexit fsl_elbc_ctrl_remov
- static irqreturn_t fsl_elbc_ctrl_irq(int irqno, void *data)
- {
- 	struct fsl_elbc_ctrl *ctrl = data;
--	struct elbc_regs __iomem *lbc = ctrl->regs;
-+	struct fsl_lbc_regs __iomem *lbc = ctrl->regs;
- 	__be32 status = in_be32(&lbc->ltesr) & LTESR_NAND_MASK;
- 
- 	if (status) {
---- a/drivers/net/Makefile
-+++ b/drivers/net/Makefile
-@@ -219,7 +219,8 @@ obj-$(CONFIG_SMC911X) += smc911x.o
- obj-$(CONFIG_BFIN_MAC) += bfin_mac.o
- obj-$(CONFIG_DM9000) += dm9000.o
- obj-$(CONFIG_FEC_8XX) += fec_8xx/
--obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o
-+obj-$(CONFIG_PASEMI_MAC) += pasemi_mac_driver.o
-+pasemi_mac_driver-objs := pasemi_mac.o pasemi_mac_ethtool.o
- obj-$(CONFIG_MLX4_CORE) += mlx4/
- obj-$(CONFIG_ENC28J60) += enc28j60.o
- 
---- a/drivers/net/iseries_veth.c
-+++ b/drivers/net/iseries_veth.c
-@@ -308,7 +308,8 @@ static void veth_complete_allocation(voi
- 
- static int veth_allocate_events(HvLpIndex rlp, int number)
- {
--	struct veth_allocation vc = { COMPLETION_INITIALIZER(vc.c), 0 };
-+	struct veth_allocation vc =
-+		{ COMPLETION_INITIALIZER_ONSTACK(vc.c), 0 };
- 
- 	mf_allocate_lp_events(rlp, HvLpEvent_Type_VirtualLan,
- 			    sizeof(struct veth_lpevent), number,
---- a/drivers/net/pasemi_mac.c
-+++ b/drivers/net/pasemi_mac.c
-@@ -55,15 +55,10 @@
-  * - Multiqueue RX/TX
-  */
- 
--
--/* Must be a power of two */
--#define RX_RING_SIZE 2048
--#define TX_RING_SIZE 4096
--
- #define LRO_MAX_AGGR 64
- 
- #define PE_MIN_MTU	64
--#define PE_MAX_MTU	1500
-+#define PE_MAX_MTU	9000
- #define PE_DEF_MTU	ETH_DATA_LEN
- 
- #define DEFAULT_MSG_ENABLE	  \
-@@ -76,16 +71,6 @@
- 	 NETIF_MSG_RX_ERR	| \
- 	 NETIF_MSG_TX_ERR)
- 
--#define TX_DESC(tx, num)	((tx)->chan.ring_virt[(num) & (TX_RING_SIZE-1)])
--#define TX_DESC_INFO(tx, num)	((tx)->ring_info[(num) & (TX_RING_SIZE-1)])
--#define RX_DESC(rx, num)	((rx)->chan.ring_virt[(num) & (RX_RING_SIZE-1)])
--#define RX_DESC_INFO(rx, num)	((rx)->ring_info[(num) & (RX_RING_SIZE-1)])
--#define RX_BUFF(rx, num)	((rx)->buffers[(num) & (RX_RING_SIZE-1)])
--
--#define RING_USED(ring)		(((ring)->next_to_fill - (ring)->next_to_clean) \
--				 & ((ring)->size - 1))
--#define RING_AVAIL(ring)	((ring->size) - RING_USED(ring))
--
- MODULE_LICENSE("GPL");
- MODULE_AUTHOR ("Olof Johansson <olof@lixom.net>");
- MODULE_DESCRIPTION("PA Semi PWRficient Ethernet driver");
-@@ -94,6 +79,8 @@ static int debug = -1;	/* -1 == use DEFA
- module_param(debug, int, 0);
- MODULE_PARM_DESC(debug, "PA Semi MAC bitmapped debugging message enable value");
- 
-+extern const struct ethtool_ops pasemi_mac_ethtool_ops;
-+
- static int translation_enabled(void)
- {
- #if defined(CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE)
-@@ -322,6 +309,104 @@ static int pasemi_mac_unmap_tx_skb(struc
- 	return (nfrags + 3) & ~1;
- }
- 
-+static struct pasemi_mac_csring *pasemi_mac_setup_csring(struct pasemi_mac *mac)
-+{
-+	struct pasemi_mac_csring *ring;
-+	u32 val;
-+	unsigned int cfg;
-+	int chno;
-+
-+	ring = pasemi_dma_alloc_chan(TXCHAN, sizeof(struct pasemi_mac_csring),
-+				       offsetof(struct pasemi_mac_csring, chan));
-+
-+	if (!ring) {
-+		dev_err(&mac->pdev->dev, "Can't allocate checksum channel\n");
-+		goto out_chan;
-+	}
-+
-+	chno = ring->chan.chno;
-+
-+	ring->size = CS_RING_SIZE;
-+	ring->next_to_fill = 0;
-+
-+	/* Allocate descriptors */
-+	if (pasemi_dma_alloc_ring(&ring->chan, CS_RING_SIZE))
-+		goto out_ring_desc;
-+
-+	write_dma_reg(PAS_DMA_TXCHAN_BASEL(chno),
-+		      PAS_DMA_TXCHAN_BASEL_BRBL(ring->chan.ring_dma));
-+	val = PAS_DMA_TXCHAN_BASEU_BRBH(ring->chan.ring_dma >> 32);
-+	val |= PAS_DMA_TXCHAN_BASEU_SIZ(CS_RING_SIZE >> 3);
-+
-+	write_dma_reg(PAS_DMA_TXCHAN_BASEU(chno), val);
-+
-+	ring->events[0] = pasemi_dma_alloc_flag();
-+	ring->events[1] = pasemi_dma_alloc_flag();
-+	if (ring->events[0] < 0 || ring->events[1] < 0)
-+		goto out_flags;
-+
-+	pasemi_dma_clear_flag(ring->events[0]);
-+	pasemi_dma_clear_flag(ring->events[1]);
-+
-+	ring->fun = pasemi_dma_alloc_fun();
-+	if (ring->fun < 0)
-+		goto out_fun;
-+
-+	cfg = PAS_DMA_TXCHAN_CFG_TY_FUNC | PAS_DMA_TXCHAN_CFG_UP |
-+	      PAS_DMA_TXCHAN_CFG_TATTR(ring->fun) |
-+	      PAS_DMA_TXCHAN_CFG_LPSQ | PAS_DMA_TXCHAN_CFG_LPDQ;
-+
-+	if (translation_enabled())
-+		cfg |= PAS_DMA_TXCHAN_CFG_TRD | PAS_DMA_TXCHAN_CFG_TRR;
-+
-+	write_dma_reg(PAS_DMA_TXCHAN_CFG(chno), cfg);
-+
-+	/* enable channel */
-+	pasemi_dma_start_chan(&ring->chan, PAS_DMA_TXCHAN_TCMDSTA_SZ |
-+					   PAS_DMA_TXCHAN_TCMDSTA_DB |
-+					   PAS_DMA_TXCHAN_TCMDSTA_DE |
-+					   PAS_DMA_TXCHAN_TCMDSTA_DA);
-+
-+	return ring;
-+
-+out_fun:
-+out_flags:
-+	if (ring->events[0] >= 0)
-+		pasemi_dma_free_flag(ring->events[0]);
-+	if (ring->events[1] >= 0)
-+		pasemi_dma_free_flag(ring->events[1]);
-+	pasemi_dma_free_ring(&ring->chan);
-+out_ring_desc:
-+	pasemi_dma_free_chan(&ring->chan);
-+out_chan:
-+
-+	return NULL;
-+}
-+
-+static void pasemi_mac_setup_csrings(struct pasemi_mac *mac)
-+{
-+	int i;
-+	mac->cs[0] = pasemi_mac_setup_csring(mac);
-+	if (mac->type == MAC_TYPE_XAUI)
-+		mac->cs[1] = pasemi_mac_setup_csring(mac);
-+	else
-+		mac->cs[1] = 0;
-+
-+	for (i = 0; i < MAX_CS; i++)
-+		if (mac->cs[i])
-+			mac->num_cs++;
-+}
-+
-+static void pasemi_mac_free_csring(struct pasemi_mac_csring *csring)
-+{
-+	pasemi_dma_stop_chan(&csring->chan);
-+	pasemi_dma_free_flag(csring->events[0]);
-+	pasemi_dma_free_flag(csring->events[1]);
-+	pasemi_dma_free_ring(&csring->chan);
-+	pasemi_dma_free_chan(&csring->chan);
-+	pasemi_dma_free_fun(csring->fun);
-+}
-+
- static int pasemi_mac_setup_rx_resources(const struct net_device *dev)
- {
- 	struct pasemi_mac_rxring *ring;
-@@ -445,7 +530,7 @@ pasemi_mac_setup_tx_resources(const stru
- 	cfg = PAS_DMA_TXCHAN_CFG_TY_IFACE |
- 	      PAS_DMA_TXCHAN_CFG_TATTR(mac->dma_if) |
- 	      PAS_DMA_TXCHAN_CFG_UP |
--	      PAS_DMA_TXCHAN_CFG_WT(2);
-+	      PAS_DMA_TXCHAN_CFG_WT(4);
- 
- 	if (translation_enabled())
- 		cfg |= PAS_DMA_TXCHAN_CFG_TRD | PAS_DMA_TXCHAN_CFG_TRR;
-@@ -810,13 +895,21 @@ restart:
- 		u64 mactx = TX_DESC(txring, i);
- 		struct sk_buff *skb;
- 
--		skb = TX_DESC_INFO(txring, i+1).skb;
--		nr_frags = TX_DESC_INFO(txring, i).dma;
--
- 		if ((mactx  & XCT_MACTX_E) ||
- 		    (*chan->status & PAS_STATUS_ERROR))
- 			pasemi_mac_tx_error(mac, mactx);
- 
-+		/* Skip over control descriptors */
-+		if (!(mactx & XCT_MACTX_LLEN_M)) {
-+			TX_DESC(txring, i) = 0;
-+			TX_DESC(txring, i+1) = 0;
-+			buf_count = 2;
-+			continue;
-+		}
-+
-+		skb = TX_DESC_INFO(txring, i+1).skb;
-+		nr_frags = TX_DESC_INFO(txring, i).dma;
-+
- 		if (unlikely(mactx & XCT_MACTX_O))
- 			/* Not yet transmitted */
- 			break;
-@@ -1041,13 +1134,7 @@ static int pasemi_mac_open(struct net_de
- {
- 	struct pasemi_mac *mac = netdev_priv(dev);
- 	unsigned int flags;
--	int ret;
--
--	/* enable rx section */
--	write_dma_reg(PAS_DMA_COM_RXCMD, PAS_DMA_COM_RXCMD_EN);
--
--	/* enable tx section */
--	write_dma_reg(PAS_DMA_COM_TXCMD, PAS_DMA_COM_TXCMD_EN);
-+	int i, ret;
- 
- 	flags = PAS_MAC_CFG_TXP_FCE | PAS_MAC_CFG_TXP_FPC(3) |
- 		PAS_MAC_CFG_TXP_SL(3) | PAS_MAC_CFG_TXP_COB(0xf) |
-@@ -1064,6 +1151,19 @@ static int pasemi_mac_open(struct net_de
- 	if (!mac->tx)
- 		goto out_tx_ring;
- 
-+	/* We might already have allocated rings in case mtu was changed
-+	 * before interface was brought up.
-+	 */
-+	if (dev->mtu > 1500 && !mac->num_cs) {
-+		pasemi_mac_setup_csrings(mac);
-+		if (!mac->num_cs)
-+			goto out_tx_ring;
-+	}
-+
-+	/* Zero out rmon counters */
-+	for (i = 0; i < 32; i++)
-+		write_mac_reg(mac, PAS_MAC_RMON(i), 0);
-+
- 	/* 0x3ff with 33MHz clock is about 31us */
- 	write_iob_reg(PAS_IOB_DMA_COM_TIMEOUTCFG,
- 		      PAS_IOB_DMA_COM_TIMEOUTCFG_TCNT(0x3ff));
-@@ -1247,7 +1347,7 @@ static int pasemi_mac_close(struct net_d
- {
- 	struct pasemi_mac *mac = netdev_priv(dev);
- 	unsigned int sta;
--	int rxch, txch;
-+	int rxch, txch, i;
- 
- 	rxch = rx_ring(mac)->chan.chno;
- 	txch = tx_ring(mac)->chan.chno;
-@@ -1292,6 +1392,13 @@ static int pasemi_mac_close(struct net_d
- 	free_irq(mac->tx->chan.irq, mac->tx);
- 	free_irq(mac->rx->chan.irq, mac->rx);
- 
-+	for (i = 0; i < mac->num_cs; i++) {
-+		pasemi_mac_free_csring(mac->cs[i]);
-+		mac->cs[i] = NULL;
-+	}
-+
-+	mac->num_cs = 0;
-+
- 	/* Free resources */
- 	pasemi_mac_free_rx_resources(mac);
- 	pasemi_mac_free_tx_resources(mac);
-@@ -1299,35 +1406,113 @@ static int pasemi_mac_close(struct net_d
- 	return 0;
- }
- 
-+static void pasemi_mac_queue_csdesc(const struct sk_buff *skb,
-+				    const dma_addr_t *map,
-+				    const unsigned int *map_size,
-+				    struct pasemi_mac_txring *txring,
-+				    struct pasemi_mac_csring *csring)
-+{
-+	u64 fund;
-+	dma_addr_t cs_dest;
-+	const int nh_off = skb_network_offset(skb);
-+	const int nh_len = skb_network_header_len(skb);
-+	const int nfrags = skb_shinfo(skb)->nr_frags;
-+	int cs_size, i, fill, hdr, cpyhdr, evt;
-+	dma_addr_t csdma;
-+
-+	fund = XCT_FUN_ST | XCT_FUN_RR_8BRES |
-+	       XCT_FUN_O | XCT_FUN_FUN(csring->fun) |
-+	       XCT_FUN_CRM_SIG | XCT_FUN_LLEN(skb->len - nh_off) |
-+	       XCT_FUN_SHL(nh_len >> 2) | XCT_FUN_SE;
-+
-+	switch (ip_hdr(skb)->protocol) {
-+	case IPPROTO_TCP:
-+		fund |= XCT_FUN_SIG_TCP4;
-+		/* TCP checksum is 16 bytes into the header */
-+		cs_dest = map[0] + skb_transport_offset(skb) + 16;
-+		break;
-+	case IPPROTO_UDP:
-+		fund |= XCT_FUN_SIG_UDP4;
-+		/* UDP checksum is 6 bytes into the header */
-+		cs_dest = map[0] + skb_transport_offset(skb) + 6;
-+		break;
-+	default:
-+		BUG();
-+	}
-+
-+	/* Do the checksum offloaded */
-+	fill = csring->next_to_fill;
-+	hdr = fill;
-+
-+	CS_DESC(csring, fill++) = fund;
-+	/* Room for 8BRES. Checksum result is really 2 bytes into it */
-+	csdma = csring->chan.ring_dma + (fill & (CS_RING_SIZE-1)) * 8 + 2;
-+	CS_DESC(csring, fill++) = 0;
-+
-+	CS_DESC(csring, fill) = XCT_PTR_LEN(map_size[0]-nh_off) | XCT_PTR_ADDR(map[0]+nh_off);
-+	for (i = 1; i <= nfrags; i++)
-+		CS_DESC(csring, fill+i) = XCT_PTR_LEN(map_size[i]) | XCT_PTR_ADDR(map[i]);
-+
-+	fill += i;
-+	if (fill & 1)
-+		fill++;
-+
-+	/* Copy the result into the TCP packet */
-+	cpyhdr = fill;
-+	CS_DESC(csring, fill++) = XCT_FUN_O | XCT_FUN_FUN(csring->fun) |
-+				  XCT_FUN_LLEN(2) | XCT_FUN_SE;
-+	CS_DESC(csring, fill++) = XCT_PTR_LEN(2) | XCT_PTR_ADDR(cs_dest) | XCT_PTR_T;
-+	CS_DESC(csring, fill++) = XCT_PTR_LEN(2) | XCT_PTR_ADDR(csdma);
-+	fill++;
-+
-+	evt = !csring->last_event;
-+	csring->last_event = evt;
-+
-+	/* Event handshaking with MAC TX */
-+	CS_DESC(csring, fill++) = CTRL_CMD_T | CTRL_CMD_META_EVT | CTRL_CMD_O |
-+				  CTRL_CMD_ETYPE_SET | CTRL_CMD_REG(csring->events[evt]);
-+	CS_DESC(csring, fill++) = 0;
-+	CS_DESC(csring, fill++) = CTRL_CMD_T | CTRL_CMD_META_EVT | CTRL_CMD_O |
-+				  CTRL_CMD_ETYPE_WCLR | CTRL_CMD_REG(csring->events[!evt]);
-+	CS_DESC(csring, fill++) = 0;
-+	csring->next_to_fill = fill & (CS_RING_SIZE-1);
-+
-+	cs_size = fill - hdr;
-+	write_dma_reg(PAS_DMA_TXCHAN_INCR(csring->chan.chno), (cs_size) >> 1);
-+
-+	/* TX-side event handshaking */
-+	fill = txring->next_to_fill;
-+	TX_DESC(txring, fill++) = CTRL_CMD_T | CTRL_CMD_META_EVT | CTRL_CMD_O |
-+				  CTRL_CMD_ETYPE_WSET | CTRL_CMD_REG(csring->events[evt]);
-+	TX_DESC(txring, fill++) = 0;
-+	TX_DESC(txring, fill++) = CTRL_CMD_T | CTRL_CMD_META_EVT | CTRL_CMD_O |
-+				  CTRL_CMD_ETYPE_CLR | CTRL_CMD_REG(csring->events[!evt]);
-+	TX_DESC(txring, fill++) = 0;
-+	txring->next_to_fill = fill;
-+
-+	write_dma_reg(PAS_DMA_TXCHAN_INCR(txring->chan.chno), 2);
-+
-+	return;
-+}
-+
- static int pasemi_mac_start_tx(struct sk_buff *skb, struct net_device *dev)
- {
--	struct pasemi_mac *mac = netdev_priv(dev);
--	struct pasemi_mac_txring *txring;
--	u64 dflags, mactx;
-+	struct pasemi_mac * const mac = netdev_priv(dev);
-+	struct pasemi_mac_txring * const txring = tx_ring(mac);
-+	struct pasemi_mac_csring *csring;
-+	u64 dflags = 0;
-+	u64 mactx;
- 	dma_addr_t map[MAX_SKB_FRAGS+1];
- 	unsigned int map_size[MAX_SKB_FRAGS+1];
- 	unsigned long flags;
- 	int i, nfrags;
- 	int fill;
-+	const int nh_off = skb_network_offset(skb);
-+	const int nh_len = skb_network_header_len(skb);
- 
--	dflags = XCT_MACTX_O | XCT_MACTX_ST | XCT_MACTX_CRC_PAD;
--
--	if (skb->ip_summed == CHECKSUM_PARTIAL) {
--		const unsigned char *nh = skb_network_header(skb);
-+	prefetch(&txring->ring_info);
- 
--		switch (ip_hdr(skb)->protocol) {
--		case IPPROTO_TCP:
--			dflags |= XCT_MACTX_CSUM_TCP;
--			dflags |= XCT_MACTX_IPH(skb_network_header_len(skb) >> 2);
--			dflags |= XCT_MACTX_IPO(nh - skb->data);
--			break;
--		case IPPROTO_UDP:
--			dflags |= XCT_MACTX_CSUM_UDP;
--			dflags |= XCT_MACTX_IPH(skb_network_header_len(skb) >> 2);
--			dflags |= XCT_MACTX_IPO(nh - skb->data);
--			break;
--		}
--	}
-+	dflags = XCT_MACTX_O | XCT_MACTX_ST | XCT_MACTX_CRC_PAD;
- 
- 	nfrags = skb_shinfo(skb)->nr_frags;
- 
-@@ -1350,24 +1535,46 @@ static int pasemi_mac_start_tx(struct sk
- 		}
- 	}
- 
--	mactx = dflags | XCT_MACTX_LLEN(skb->len);
-+	if (skb->ip_summed == CHECKSUM_PARTIAL && skb->len <= 1540) {
-+		switch (ip_hdr(skb)->protocol) {
-+		case IPPROTO_TCP:
-+			dflags |= XCT_MACTX_CSUM_TCP;
-+			dflags |= XCT_MACTX_IPH(nh_len >> 2);
-+			dflags |= XCT_MACTX_IPO(nh_off);
-+			break;
-+		case IPPROTO_UDP:
-+			dflags |= XCT_MACTX_CSUM_UDP;
-+			dflags |= XCT_MACTX_IPH(nh_len >> 2);
-+			dflags |= XCT_MACTX_IPO(nh_off);
-+			break;
-+		default:
-+			WARN_ON(1);
-+		}
-+	}
- 
--	txring = tx_ring(mac);
-+	mactx = dflags | XCT_MACTX_LLEN(skb->len);
- 
- 	spin_lock_irqsave(&txring->lock, flags);
- 
--	fill = txring->next_to_fill;
--
- 	/* Avoid stepping on the same cache line that the DMA controller
- 	 * is currently about to send, so leave at least 8 words available.
- 	 * Total free space needed is mactx + fragments + 8
- 	 */
--	if (RING_AVAIL(txring) < nfrags + 10) {
-+	if (RING_AVAIL(txring) < nfrags + 14) {
- 		/* no room -- stop the queue and wait for tx intr */
- 		netif_stop_queue(dev);
- 		goto out_err;
- 	}
- 
-+	/* Queue up checksum + event descriptors, if needed */
-+	if (mac->num_cs && skb->ip_summed == CHECKSUM_PARTIAL && skb->len > 1540) {
-+		csring = mac->cs[mac->last_cs];
-+		mac->last_cs = (mac->last_cs + 1) % mac->num_cs;
-+
-+		pasemi_mac_queue_csdesc(skb, map, map_size, txring, csring);
-+	}
-+
-+	fill = txring->next_to_fill;
- 	TX_DESC(txring, fill) = mactx;
- 	TX_DESC_INFO(txring, fill).dma = nfrags;
- 	fill++;
-@@ -1441,12 +1648,33 @@ static int pasemi_mac_poll(struct napi_s
- 	return pkts;
- }
- 
-+#ifdef CONFIG_NET_POLL_CONTROLLER
-+/*
-+ * Polling 'interrupt' - used by things like netconsole to send skbs
-+ * without having to re-enable interrupts. It's not called while
-+ * the interrupt routine is executing.
-+ */
-+static void pasemi_mac_netpoll(struct net_device *dev)
-+{
-+	const struct pasemi_mac *mac = netdev_priv(dev);
-+
-+	disable_irq(mac->tx->chan.irq);
-+	pasemi_mac_tx_intr(mac->tx->chan.irq, mac->tx);
-+	enable_irq(mac->tx->chan.irq);
-+
-+	disable_irq(mac->rx->chan.irq);
-+	pasemi_mac_rx_intr(mac->rx->chan.irq, mac->rx);
-+	enable_irq(mac->rx->chan.irq);
-+}
-+#endif
-+
- static int pasemi_mac_change_mtu(struct net_device *dev, int new_mtu)
- {
- 	struct pasemi_mac *mac = netdev_priv(dev);
- 	unsigned int reg;
--	unsigned int rcmdsta;
-+	unsigned int rcmdsta = 0;
- 	int running;
-+	int ret = 0;
- 
- 	if (new_mtu < PE_MIN_MTU || new_mtu > PE_MAX_MTU)
- 		return -EINVAL;
-@@ -1468,6 +1696,16 @@ static int pasemi_mac_change_mtu(struct 
- 		pasemi_mac_pause_rxint(mac);
- 		pasemi_mac_clean_rx(rx_ring(mac), RX_RING_SIZE);
- 		pasemi_mac_free_rx_buffers(mac);
-+
-+	}
-+
-+	/* Setup checksum channels if large MTU and none already allocated */
-+	if (new_mtu > 1500 && !mac->num_cs) {
-+		pasemi_mac_setup_csrings(mac);
-+		if (!mac->num_cs) {
-+			ret = -ENOMEM;
-+			goto out;
-+		}
- 	}
- 
- 	/* Change maxf, i.e. what size frames are accepted.
-@@ -1482,6 +1720,7 @@ static int pasemi_mac_change_mtu(struct 
- 	/* MTU + ETH_HLEN + VLAN_HLEN + 2 64B cachelines */
- 	mac->bufsz = new_mtu + ETH_HLEN + ETH_FCS_LEN + LOCAL_SKB_ALIGN + 128;
- 
-+out:
- 	if (running) {
- 		write_dma_reg(PAS_DMA_RXINT_RCMDSTA(mac->dma_if),
- 			      rcmdsta | PAS_DMA_RXINT_RCMDSTA_EN);
-@@ -1494,7 +1733,7 @@ static int pasemi_mac_change_mtu(struct 
- 		pasemi_mac_intf_enable(mac);
- 	}
- 
--	return 0;
-+	return ret;
- }
- 
- static int __devinit
-@@ -1528,7 +1767,7 @@ pasemi_mac_probe(struct pci_dev *pdev, c
- 	netif_napi_add(dev, &mac->napi, pasemi_mac_poll, 64);
- 
- 	dev->features = NETIF_F_IP_CSUM | NETIF_F_LLTX | NETIF_F_SG |
--			NETIF_F_HIGHDMA;
-+			NETIF_F_HIGHDMA | NETIF_F_GSO;
- 
- 	mac->lro_mgr.max_aggr = LRO_MAX_AGGR;
- 	mac->lro_mgr.max_desc = MAX_LRO_DESCRIPTORS;
-@@ -1588,8 +1827,12 @@ pasemi_mac_probe(struct pci_dev *pdev, c
- 	dev->mtu = PE_DEF_MTU;
- 	/* 1500 MTU + ETH_HLEN + VLAN_HLEN + 2 64B cachelines */
- 	mac->bufsz = dev->mtu + ETH_HLEN + ETH_FCS_LEN + LOCAL_SKB_ALIGN + 128;
-+#ifdef CONFIG_NET_POLL_CONTROLLER
-+	dev->poll_controller = pasemi_mac_netpoll;
-+#endif
- 
- 	dev->change_mtu = pasemi_mac_change_mtu;
-+	dev->ethtool_ops = &pasemi_mac_ethtool_ops;
- 
- 	if (err)
- 		goto out;
---- a/drivers/net/pasemi_mac.h
-+++ b/drivers/net/pasemi_mac.h
-@@ -26,7 +26,14 @@
- #include <linux/spinlock.h>
- #include <linux/phy.h>
- 
-+/* Must be a power of two */
-+#define RX_RING_SIZE 2048
-+#define TX_RING_SIZE 4096
-+#define CS_RING_SIZE (TX_RING_SIZE*2)
-+
-+
- #define MAX_LRO_DESCRIPTORS 8
-+#define MAX_CS	2
- 
- struct pasemi_mac_txring {
- 	struct pasemi_dmachan chan; /* Must be first */
-@@ -51,6 +58,15 @@ struct pasemi_mac_rxring {
- 	struct pasemi_mac *mac;	/* Needed in intr handler */
- };
- 
-+struct pasemi_mac_csring {
-+	struct pasemi_dmachan chan;
-+	unsigned int	size;
-+	unsigned int	next_to_fill;
-+	int		events[2];
-+	int		last_event;
-+	int		fun;
-+};
-+
- struct pasemi_mac {
- 	struct net_device *netdev;
- 	struct pci_dev *pdev;
-@@ -60,10 +76,12 @@ struct pasemi_mac {
- 	struct napi_struct napi;
- 
- 	int		bufsz; /* RX ring buffer size */
-+	int		last_cs;
-+	int		num_cs;
-+	u32		dma_if;
- 	u8		type;
- #define MAC_TYPE_GMAC	1
- #define MAC_TYPE_XAUI	2
--	u32	dma_if;
- 
- 	u8		mac_addr[6];
- 
-@@ -74,6 +92,7 @@ struct pasemi_mac {
- 
- 	struct pasemi_mac_txring *tx;
- 	struct pasemi_mac_rxring *rx;
-+	struct pasemi_mac_csring *cs[MAX_CS];
- 	char		tx_irq_name[10];		/* "eth%d tx" */
- 	char		rx_irq_name[10];		/* "eth%d rx" */
- 	int	link;
-@@ -90,6 +109,16 @@ struct pasemi_mac_buffer {
- 	dma_addr_t	dma;
- };
- 
-+#define TX_DESC(tx, num)	((tx)->chan.ring_virt[(num) & (TX_RING_SIZE-1)])
-+#define TX_DESC_INFO(tx, num)	((tx)->ring_info[(num) & (TX_RING_SIZE-1)])
-+#define RX_DESC(rx, num)	((rx)->chan.ring_virt[(num) & (RX_RING_SIZE-1)])
-+#define RX_DESC_INFO(rx, num)	((rx)->ring_info[(num) & (RX_RING_SIZE-1)])
-+#define RX_BUFF(rx, num)	((rx)->buffers[(num) & (RX_RING_SIZE-1)])
-+#define CS_DESC(cs, num)	((cs)->chan.ring_virt[(num) & (CS_RING_SIZE-1)])
-+
-+#define RING_USED(ring)	(((ring)->next_to_fill - (ring)->next_to_clean) \
-+				& ((ring)->size - 1))
-+#define RING_AVAIL(ring)	((ring->size) - RING_USED(ring))
- 
- /* PCI register offsets and formats */
- 
-@@ -101,6 +130,7 @@ enum {
- 	PAS_MAC_CFG_ADR0 = 0x8c,
- 	PAS_MAC_CFG_ADR1 = 0x90,
- 	PAS_MAC_CFG_TXP = 0x98,
-+	PAS_MAC_CFG_RMON = 0x100,
- 	PAS_MAC_IPC_CHNL = 0x208,
- };
- 
-@@ -172,6 +202,8 @@ enum {
- #define PAS_MAC_CFG_TXP_TIFG(x)		(((x) << PAS_MAC_CFG_TXP_TIFG_S) & \
- 					 PAS_MAC_CFG_TXP_TIFG_M)
- 
-+#define PAS_MAC_RMON(r)			(0x100+(r)*4)
-+
- #define PAS_MAC_IPC_CHNL_DCHNO_M	0x003f0000
- #define PAS_MAC_IPC_CHNL_DCHNO_S	16
- #define PAS_MAC_IPC_CHNL_DCHNO(x)	(((x) << PAS_MAC_IPC_CHNL_DCHNO_S) & \
-@@ -181,4 +213,5 @@ enum {
- #define PAS_MAC_IPC_CHNL_BCH(x)		(((x) << PAS_MAC_IPC_CHNL_BCH_S) & \
- 					 PAS_MAC_IPC_CHNL_BCH_M)
- 
-+
- #endif /* PASEMI_MAC_H */
---- /dev/null
-+++ b/drivers/net/pasemi_mac_ethtool.c
-@@ -0,0 +1,159 @@
-+/*
-+ * Copyright (C) 2006-2008 PA Semi, Inc
-+ *
-+ * Ethtool hooks for the PA Semi PWRficient onchip 1G/10G Ethernet MACs
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-+ */
-+
-+
-+#include <linux/netdevice.h>
-+#include <linux/ethtool.h>
-+#include <linux/pci.h>
-+#include <linux/inet_lro.h>
-+
-+#include <asm/pasemi_dma.h>
-+#include "pasemi_mac.h"
-+
-+static struct {
-+	const char str[ETH_GSTRING_LEN];
-+} ethtool_stats_keys[] = {
-+	{ "rx-drops" },
-+	{ "rx-bytes" },
-+	{ "rx-packets" },
-+	{ "rx-broadcast-packets" },
-+	{ "rx-multicast-packets" },
-+	{ "rx-crc-errors" },
-+	{ "rx-undersize-errors" },
-+	{ "rx-oversize-errors" },
-+	{ "rx-short-fragment-errors" },
-+	{ "rx-jabber-errors" },
-+	{ "rx-64-byte-packets" },
-+	{ "rx-65-127-byte-packets" },
-+	{ "rx-128-255-byte-packets" },
-+	{ "rx-256-511-byte-packets" },
-+	{ "rx-512-1023-byte-packets" },
-+	{ "rx-1024-1518-byte-packets" },
-+	{ "rx-pause-frames" },
-+	{ "tx-bytes" },
-+	{ "tx-packets" },
-+	{ "tx-broadcast-packets" },
-+	{ "tx-multicast-packets" },
-+	{ "tx-collisions" },
-+	{ "tx-late-collisions" },
-+	{ "tx-excessive-collisions" },
-+	{ "tx-crc-errors" },
-+	{ "tx-undersize-errors" },
-+	{ "tx-oversize-errors" },
-+	{ "tx-64-byte-packets" },
-+	{ "tx-65-127-byte-packets" },
-+	{ "tx-128-255-byte-packets" },
-+	{ "tx-256-511-byte-packets" },
-+	{ "tx-512-1023-byte-packets" },
-+	{ "tx-1024-1518-byte-packets" },
-+};
-+
-+static int
-+pasemi_mac_ethtool_get_settings(struct net_device *netdev,
-+			       struct ethtool_cmd *cmd)
-+{
-+	struct pasemi_mac *mac = netdev_priv(netdev);
-+	struct phy_device *phydev = mac->phydev;
-+
-+	return phy_ethtool_gset(phydev, cmd);
-+}
-+
-+static void
-+pasemi_mac_ethtool_get_drvinfo(struct net_device *netdev,
-+			       struct ethtool_drvinfo *drvinfo)
-+{
-+	struct pasemi_mac *mac;
-+	mac = netdev_priv(netdev);
-+
-+	/* clear and fill out info */
-+	memset(drvinfo, 0, sizeof(struct ethtool_drvinfo));
-+	strncpy(drvinfo->driver, "pasemi_mac", 12);
-+	strcpy(drvinfo->version, "N/A");
-+	strcpy(drvinfo->fw_version, "N/A");
-+	strncpy(drvinfo->bus_info, pci_name(mac->pdev), 32);
-+}
-+
-+static u32
-+pasemi_mac_ethtool_get_msglevel(struct net_device *netdev)
-+{
-+	struct pasemi_mac *mac = netdev_priv(netdev);
-+	return mac->msg_enable;
-+}
-+
-+static void
-+pasemi_mac_ethtool_set_msglevel(struct net_device *netdev,
-+				u32 level)
-+{
-+	struct pasemi_mac *mac = netdev_priv(netdev);
-+	mac->msg_enable = level;
-+}
-+
-+
-+static void
-+pasemi_mac_ethtool_get_ringparam(struct net_device *netdev,
-+				 struct ethtool_ringparam *ering)
-+{
-+	struct pasemi_mac *mac = netdev->priv;
-+
-+	ering->tx_max_pending = TX_RING_SIZE/2;
-+	ering->tx_pending = RING_USED(mac->tx)/2;
-+	ering->rx_max_pending = RX_RING_SIZE/4;
-+	ering->rx_pending = RING_USED(mac->rx)/4;
-+}
-+
-+static int pasemi_mac_get_sset_count(struct net_device *netdev, int sset)
-+{
-+	switch (sset) {
-+	case ETH_SS_STATS:
-+		return ARRAY_SIZE(ethtool_stats_keys);
-+	default:
-+		return -EOPNOTSUPP;
-+	}
-+}
-+
-+static void pasemi_mac_get_ethtool_stats(struct net_device *netdev,
-+		struct ethtool_stats *stats, u64 *data)
-+{
-+	struct pasemi_mac *mac = netdev->priv;
-+	int i;
-+
-+	data[0] = pasemi_read_dma_reg(PAS_DMA_RXINT_RCMDSTA(mac->dma_if))
-+			>> PAS_DMA_RXINT_RCMDSTA_DROPS_S;
-+	for (i = 0; i < 32; i++)
-+		data[1+i] = pasemi_read_mac_reg(mac->dma_if, PAS_MAC_RMON(i));
-+}
-+
-+static void pasemi_mac_get_strings(struct net_device *netdev, u32 stringset,
-+				   u8 *data)
-+{
-+	memcpy(data, ethtool_stats_keys, sizeof(ethtool_stats_keys));
-+}
-+
-+const struct ethtool_ops pasemi_mac_ethtool_ops = {
-+	.get_settings		= pasemi_mac_ethtool_get_settings,
-+	.get_drvinfo		= pasemi_mac_ethtool_get_drvinfo,
-+	.get_msglevel		= pasemi_mac_ethtool_get_msglevel,
-+	.set_msglevel		= pasemi_mac_ethtool_set_msglevel,
-+	.get_link		= ethtool_op_get_link,
-+	.get_ringparam          = pasemi_mac_ethtool_get_ringparam,
-+	.get_strings		= pasemi_mac_get_strings,
-+	.get_sset_count		= pasemi_mac_get_sset_count,
-+	.get_ethtool_stats	= pasemi_mac_get_ethtool_stats,
-+};
-+
---- a/drivers/net/ps3_gelic_net.c
-+++ b/drivers/net/ps3_gelic_net.c
-@@ -1266,6 +1266,85 @@ int gelic_net_set_rx_csum(struct net_dev
- 	return 0;
- }
- 
-+static void gelic_net_get_wol(struct net_device *netdev,
-+			      struct ethtool_wolinfo *wol)
-+{
-+	if (0 <= ps3_compare_firmware_version(2, 2, 0))
-+		wol->supported = WAKE_MAGIC;
-+	else
-+		wol->supported = 0;
-+
-+	wol->wolopts = ps3_sys_manager_get_wol() ? wol->supported : 0;
-+	memset(&wol->sopass, 0, sizeof(wol->sopass));
-+}
-+static int gelic_net_set_wol(struct net_device *netdev,
-+			     struct ethtool_wolinfo *wol)
-+{
-+	int status;
-+	struct gelic_card *card;
-+	u64 v1, v2;
-+
-+	if (ps3_compare_firmware_version(2, 2, 0) < 0 ||
-+	    !capable(CAP_NET_ADMIN))
-+		return -EPERM;
-+
-+	if (wol->wolopts & ~WAKE_MAGIC)
-+		return -EINVAL;
-+
-+	card = netdev_card(netdev);
-+	if (wol->wolopts & WAKE_MAGIC) {
-+		status = lv1_net_control(bus_id(card), dev_id(card),
-+					 GELIC_LV1_SET_WOL,
-+					 GELIC_LV1_WOL_MAGIC_PACKET,
-+					 0, GELIC_LV1_WOL_MP_ENABLE,
-+					 &v1, &v2);
-+		if (status) {
-+			pr_info("%s: enabling WOL failed %d\n", __func__,
-+				status);
-+			status = -EIO;
-+			goto done;
-+		}
-+		status = lv1_net_control(bus_id(card), dev_id(card),
-+					 GELIC_LV1_SET_WOL,
-+					 GELIC_LV1_WOL_ADD_MATCH_ADDR,
-+					 0, GELIC_LV1_WOL_MATCH_ALL,
-+					 &v1, &v2);
-+		if (!status)
-+			ps3_sys_manager_set_wol(1);
-+		else {
-+			pr_info("%s: enabling WOL filter failed %d\n",
-+				__func__, status);
-+			status = -EIO;
-+		}
-+	} else {
-+		status = lv1_net_control(bus_id(card), dev_id(card),
-+					 GELIC_LV1_SET_WOL,
-+					 GELIC_LV1_WOL_MAGIC_PACKET,
-+					 0, GELIC_LV1_WOL_MP_DISABLE,
-+					 &v1, &v2);
-+		if (status) {
-+			pr_info("%s: disabling WOL failed %d\n", __func__,
-+				status);
-+			status = -EIO;
-+			goto done;
-+		}
-+		status = lv1_net_control(bus_id(card), dev_id(card),
-+					 GELIC_LV1_SET_WOL,
-+					 GELIC_LV1_WOL_DELETE_MATCH_ADDR,
-+					 0, GELIC_LV1_WOL_MATCH_ALL,
-+					 &v1, &v2);
-+		if (!status)
-+			ps3_sys_manager_set_wol(0);
-+		else {
-+			pr_info("%s: removing WOL filter failed %d\n",
-+				__func__, status);
-+			status = -EIO;
-+		}
-+	}
-+done:
-+	return status;
-+}
-+
- static struct ethtool_ops gelic_ether_ethtool_ops = {
- 	.get_drvinfo	= gelic_net_get_drvinfo,
- 	.get_settings	= gelic_ether_get_settings,
-@@ -1274,6 +1353,8 @@ static struct ethtool_ops gelic_ether_et
- 	.set_tx_csum	= ethtool_op_set_tx_csum,
- 	.get_rx_csum	= gelic_net_get_rx_csum,
- 	.set_rx_csum	= gelic_net_set_rx_csum,
-+	.get_wol	= gelic_net_get_wol,
-+	.set_wol	= gelic_net_set_wol,
- };
- 
- /**
---- a/drivers/net/ps3_gelic_net.h
-+++ b/drivers/net/ps3_gelic_net.h
-@@ -182,12 +182,32 @@ enum gelic_lv1_net_control_code {
- 	GELIC_LV1_GET_ETH_PORT_STATUS	= 2,
- 	GELIC_LV1_SET_NEGOTIATION_MODE	= 3,
- 	GELIC_LV1_GET_VLAN_ID		= 4,
-+	GELIC_LV1_SET_WOL		= 5,
- 	GELIC_LV1_GET_CHANNEL           = 6,
- 	GELIC_LV1_POST_WLAN_CMD		= 9,
- 	GELIC_LV1_GET_WLAN_CMD_RESULT	= 10,
- 	GELIC_LV1_GET_WLAN_EVENT	= 11
- };
- 
-+/* for GELIC_LV1_SET_WOL */
-+enum gelic_lv1_wol_command {
-+	GELIC_LV1_WOL_MAGIC_PACKET	= 1,
-+	GELIC_LV1_WOL_ADD_MATCH_ADDR	= 6,
-+	GELIC_LV1_WOL_DELETE_MATCH_ADDR	= 7,
-+};
-+
-+/* for GELIC_LV1_WOL_MAGIC_PACKET */
-+enum gelic_lv1_wol_mp_arg {
-+	GELIC_LV1_WOL_MP_DISABLE	= 0,
-+	GELIC_LV1_WOL_MP_ENABLE		= 1,
-+};
-+
-+/* for GELIC_LV1_WOL_{ADD,DELETE}_MATCH_ADDR */
-+enum gelic_lv1_wol_match_arg {
-+	GELIC_LV1_WOL_MATCH_INDIVIDUAL	= 0,
-+	GELIC_LV1_WOL_MATCH_ALL		= 1,
-+};
-+
- /* status returened from GET_ETH_PORT_STATUS */
- enum gelic_lv1_ether_port_status {
- 	GELIC_LV1_ETHER_LINK_UP		= 0x0000000000000001L,
---- a/drivers/net/ucc_geth.c
-+++ b/drivers/net/ucc_geth.c
-@@ -3853,7 +3853,13 @@ static int ucc_geth_probe(struct of_devi
- 
- 	ugeth_vdbg("%s: IN", __FUNCTION__);
- 
--	prop = of_get_property(np, "device-id", NULL);
-+	prop = of_get_property(np, "cell-index", NULL);
-+	if (!prop) {
-+		prop = of_get_property(np, "device-id", NULL);
-+		if (!prop)
-+			return -ENODEV;
-+	}
-+
- 	ucc_num = *prop - 1;
- 	if ((ucc_num < 0) || (ucc_num > 7))
- 		return -ENODEV;
---- a/drivers/net/ucc_geth_mii.c
-+++ b/drivers/net/ucc_geth_mii.c
-@@ -203,9 +203,14 @@ static int uec_mdio_probe(struct of_devi
- 		if ((res.start >= tempres.start) &&
- 		    (res.end <= tempres.end)) {
- 			/* set this UCC to be the MII master */
--			const u32 *id = of_get_property(tempnp, "device-id", NULL);
--			if (id == NULL)
--				goto bus_register_fail;
-+			const u32 *id;
-+
-+			id = of_get_property(tempnp, "cell-index", NULL);
-+			if (!id) {
-+				id = of_get_property(tempnp, "device-id", NULL);
-+				if (!id)
-+					goto bus_register_fail;
-+			}
- 
- 			ucc_set_qe_mux_mii_mng(*id - 1);
- 
---- a/drivers/of/Kconfig
-+++ b/drivers/of/Kconfig
-@@ -1,3 +1,15 @@
- config OF_DEVICE
- 	def_bool y
- 	depends on OF && (SPARC || PPC_OF)
-+
-+config OF_GPIO
-+	def_bool y
-+	depends on OF && PPC_OF && HAVE_GPIO_LIB
-+	help
-+	  OpenFirmware GPIO accessors
-+
-+config OF_I2C
-+	def_bool y
-+	depends on OF && I2C
-+	help
-+	  OpenFirmware I2C accessors
---- a/drivers/of/Makefile
-+++ b/drivers/of/Makefile
-@@ -1,2 +1,4 @@
- obj-y = base.o
- obj-$(CONFIG_OF_DEVICE) += device.o platform.o
-+obj-$(CONFIG_OF_GPIO)   += gpio.o
-+obj-$(CONFIG_OF_I2C)	+= i2c.o
---- a/drivers/of/base.c
-+++ b/drivers/of/base.c
-@@ -117,6 +117,32 @@ int of_device_is_compatible(const struct
- EXPORT_SYMBOL(of_device_is_compatible);
- 
- /**
-+ *  of_device_is_available - check if a device is available for use
-+ *
-+ *  @device: Node to check for availability
-+ *
-+ *  Returns 1 if the status property is absent or set to "okay" or "ok",
-+ *  0 otherwise
-+ */
-+int of_device_is_available(const struct device_node *device)
-+{
-+	const char *status;
-+	int statlen;
-+
-+	status = of_get_property(device, "status", &statlen);
-+	if (status == NULL)
-+		return 1;
-+
-+	if (statlen > 0) {
-+		if (!strcmp(status, "okay") || !strcmp(status, "ok"))
-+			return 1;
-+	}
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL(of_device_is_available);
-+
-+/**
-  *	of_get_parent - Get a node's parent if any
-  *	@node:	Node to get parent
-  *
---- /dev/null
-+++ b/drivers/of/gpio.c
-@@ -0,0 +1,242 @@
-+/*
-+ * OF helpers for the GPIO API
-+ *
-+ * Copyright (c) 2007-2008  MontaVista Software, Inc.
-+ *
-+ * Author: Anton Vorontsov <avorontsov@ru.mvista.com>
-+ *
-+ * 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/kernel.h>
-+#include <linux/errno.h>
-+#include <linux/io.h>
-+#include <linux/of.h>
-+#include <linux/of_gpio.h>
-+#include <asm/prom.h>
-+
-+/**
-+ * of_get_gpio - Get a GPIO number from the device tree to use with GPIO API
-+ * @np:		device node to get GPIO from
-+ * @index:	index of the GPIO
-+ *
-+ * Returns GPIO number to use with Linux generic GPIO API, or one of the errno
-+ * value on the error condition.
-+ */
-+int of_get_gpio(struct device_node *np, int index)
-+{
-+	int ret = -EINVAL;
-+	struct device_node *gc;
-+	struct of_gpio_chip *of_gc = NULL;
-+	int size;
-+	const u32 *gpios;
-+	u32 nr_cells;
-+	int i;
-+	const void *gpio_spec;
-+	const u32 *gpio_cells;
-+	int gpio_index = 0;
-+
-+	gpios = of_get_property(np, "gpios", &size);
-+	if (!gpios) {
-+		ret = -ENOENT;
-+		goto err0;
-+	}
-+	nr_cells = size / sizeof(u32);
-+
-+	for (i = 0; i < nr_cells; gpio_index++) {
-+		const phandle *gpio_phandle;
-+
-+		gpio_phandle = gpios + i;
-+		gpio_spec = gpio_phandle + 1;
-+
-+		/* one cell hole in the gpios = <>; */
-+		if (!*gpio_phandle) {
-+			if (gpio_index == index)
-+				return -ENOENT;
-+			i++;
-+			continue;
-+		}
-+
-+		gc = of_find_node_by_phandle(*gpio_phandle);
-+		if (!gc) {
-+			pr_debug("%s: could not find phandle for gpios\n",
-+				 np->full_name);
-+			goto err0;
-+		}
-+
-+		of_gc = gc->data;
-+		if (!of_gc) {
-+			pr_debug("%s: gpio controller %s isn't registered\n",
-+				 np->full_name, gc->full_name);
-+			goto err1;
-+		}
-+
-+		gpio_cells = of_get_property(gc, "#gpio-cells", &size);
-+		if (!gpio_cells || size != sizeof(*gpio_cells) ||
-+				*gpio_cells != of_gc->gpio_cells) {
-+			pr_debug("%s: wrong #gpio-cells for %s\n",
-+				 np->full_name, gc->full_name);
-+			goto err1;
-+		}
-+
-+		/* Next phandle is at phandle cells + #gpio-cells */
-+		i += sizeof(*gpio_phandle) / sizeof(u32) + *gpio_cells;
-+		if (i >= nr_cells + 1) {
-+			pr_debug("%s: insufficient gpio-spec length\n",
-+				 np->full_name);
-+			goto err1;
-+		}
-+
-+		if (gpio_index == index)
-+			break;
-+
-+		of_gc = NULL;
-+		of_node_put(gc);
-+	}
-+
-+	if (!of_gc) {
-+		ret = -ENOENT;
-+		goto err0;
-+	}
-+
-+	ret = of_gc->xlate(of_gc, np, gpio_spec);
-+	if (ret < 0)
-+		goto err1;
-+
-+	ret += of_gc->gc.base;
-+err1:
-+	of_node_put(gc);
-+err0:
-+	pr_debug("%s exited with status %d\n", __func__, ret);
-+	return ret;
-+}
-+EXPORT_SYMBOL(of_get_gpio);
-+
-+/**
-+ * of_gpio_simple_xlate - translate gpio_spec to the GPIO number
-+ * @of_gc:	pointer to the of_gpio_chip structure
-+ * @np:		device node of the GPIO chip
-+ * @gpio_spec:	gpio specifier as found in the device tree
-+ *
-+ * This is simple translation function, suitable for the most 1:1 mapped
-+ * gpio chips. This function performs only one sanity check: whether gpio
-+ * is less than ngpios (that is specified in the gpio_chip).
-+ */
-+int of_gpio_simple_xlate(struct of_gpio_chip *of_gc, struct device_node *np,
-+			 const void *gpio_spec)
-+{
-+	const u32 *gpio = gpio_spec;
-+
-+	if (*gpio > of_gc->gc.ngpio)
-+		return -EINVAL;
-+
-+	return *gpio;
-+}
-+EXPORT_SYMBOL(of_gpio_simple_xlate);
-+
-+/* Should be sufficient for now, later we'll use dynamic bases. */
-+#if defined(CONFIG_PPC32) || defined(CONFIG_SPARC32)
-+#define GPIOS_PER_CHIP 32
-+#else
-+#define GPIOS_PER_CHIP 64
-+#endif
-+
-+static int of_get_gpiochip_base(struct device_node *np)
-+{
-+	struct device_node *gc = NULL;
-+	int gpiochip_base = 0;
-+
-+	while ((gc = of_find_all_nodes(gc))) {
-+		if (!of_get_property(gc, "gpio-controller", NULL))
-+			continue;
-+
-+		if (gc != np) {
-+			gpiochip_base += GPIOS_PER_CHIP;
-+			continue;
-+		}
-+
-+		of_node_put(gc);
-+
-+		if (gpiochip_base >= ARCH_NR_GPIOS)
-+			return -ENOSPC;
-+
-+		return gpiochip_base;
-+	}
-+
-+	return -ENOENT;
-+}
-+
-+/**
-+ * of_mm_gpiochip_add - Add memory mapped GPIO chip (bank)
-+ * @np:		device node of the GPIO chip
-+ * @mm_gc:	pointer to the of_mm_gpio_chip allocated structure
-+ *
-+ * To use this function you should allocate and fill mm_gc with:
-+ *
-+ * 1) In the gpio_chip structure:
-+ *    - all the callbacks
-+ *
-+ * 2) In the of_gpio_chip structure:
-+ *    - gpio_cells
-+ *    - xlate callback (optional)
-+ *
-+ * 3) In the of_mm_gpio_chip structure:
-+ *    - save_regs callback (optional)
-+ *
-+ * If succeeded, this function will map bank's memory and will
-+ * do all necessary work for you. Then you'll able to use .regs
-+ * to manage GPIOs from the callbacks.
-+ */
-+int of_mm_gpiochip_add(struct device_node *np,
-+		       struct of_mm_gpio_chip *mm_gc)
-+{
-+	int ret = -ENOMEM;
-+	struct of_gpio_chip *of_gc = &mm_gc->of_gc;
-+	struct gpio_chip *gc = &of_gc->gc;
-+
-+	gc->label = kstrdup(np->full_name, GFP_KERNEL);
-+	if (!gc->label)
-+		goto err0;
-+
-+	mm_gc->regs = of_iomap(np, 0);
-+	if (!mm_gc->regs)
-+		goto err1;
-+
-+	gc->base = of_get_gpiochip_base(np);
-+	if (gc->base < 0) {
-+		ret = gc->base;
-+		goto err1;
-+	}
-+
-+	if (!of_gc->xlate)
-+		of_gc->xlate = of_gpio_simple_xlate;
-+
-+	if (mm_gc->save_regs)
-+		mm_gc->save_regs(mm_gc);
-+
-+	np->data = of_gc;
-+
-+	ret = gpiochip_add(gc);
-+	if (ret)
-+		goto err2;
-+
-+	/* We don't want to lose the node and its ->data */
-+	of_node_get(np);
-+
-+	pr_debug("%s: registered as generic GPIO chip, base is %d\n",
-+		 np->full_name, gc->base);
-+	return 0;
-+err2:
-+	np->data = NULL;
-+	iounmap(mm_gc->regs);
-+err1:
-+	kfree(gc->label);
-+err0:
-+	pr_err("%s: GPIO chip registration failed with status %d\n",
-+	       np->full_name, ret);
-+	return ret;
-+}
-+EXPORT_SYMBOL(of_mm_gpiochip_add);
---- /dev/null
-+++ b/drivers/of/i2c.c
-@@ -0,0 +1,115 @@
-+/*
-+ * OF helpers for the I2C API
-+ *
-+ * Copyright (c) 2008 Jochen Friedrich <jochen@scram.de>
-+ *
-+ * Based on a previous patch from Jon Smirl <jonsmirl@gmail.com>
-+ *
-+ * 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/i2c.h>
-+#include <linux/of.h>
-+
-+struct i2c_driver_device {
-+	char    *of_device;
-+	char    *i2c_type;
-+};
-+
-+static struct i2c_driver_device i2c_devices[] = {
-+	{ "dallas,ds1374", "rtc-ds1374" },
-+};
-+
-+static int of_find_i2c_driver(struct device_node *node,
-+			      struct i2c_board_info *info)
-+{
-+	int i, cplen;
-+	const char *compatible;
-+	const char *p;
-+
-+	/* 1. search for exception list entry */
-+	for (i = 0; i < ARRAY_SIZE(i2c_devices); i++) {
-+		if (!of_device_is_compatible(node, i2c_devices[i].of_device))
-+			continue;
-+		if (strlcpy(info->type, i2c_devices[i].i2c_type,
-+			    I2C_NAME_SIZE) >= I2C_NAME_SIZE)
-+			return -ENOMEM;
-+
-+		return 0;
-+	}
-+
-+	compatible = of_get_property(node, "compatible", &cplen);
-+	if (!compatible)
-+		return -ENODEV;
-+
-+	/* 2. search for linux,<i2c-type> entry */
-+	p = compatible;
-+	while (cplen > 0) {
-+		if (!strncmp(p, "linux,", 6)) {
-+			p += 6;
-+			if (strlcpy(info->type, p,
-+				    I2C_NAME_SIZE) >= I2C_NAME_SIZE)
-+				return -ENOMEM;
-+			return 0;
-+		}
-+
-+		i = strlen(p) + 1;
-+		p += i;
-+		cplen -= i;
-+	}
-+
-+	/* 3. take fist compatible entry and strip manufacturer */
-+	p = strchr(compatible, ',');
-+	if (!p)
-+		return -ENODEV;
-+	p++;
-+	if (strlcpy(info->type, p, I2C_NAME_SIZE) >= I2C_NAME_SIZE)
-+		return -ENOMEM;
-+	return 0;
-+}
-+
-+void of_register_i2c_devices(struct i2c_adapter *adap,
-+			     struct device_node *adap_node)
-+{
-+	void *result;
-+	struct device_node *node;
-+
-+	for_each_child_of_node(adap_node, node) {
-+		struct i2c_board_info info = {};
-+		const u32 *addr;
-+		int len;
-+
-+		addr = of_get_property(node, "reg", &len);
-+		if (!addr || len < sizeof(int) || *addr > (1 << 10) - 1) {
-+			printk(KERN_ERR
-+			       "of-i2c: invalid i2c device entry\n");
-+			continue;
-+		}
-+
-+		info.irq = irq_of_parse_and_map(node, 0);
-+		if (info.irq == NO_IRQ)
-+			info.irq = -1;
-+
-+		if (of_find_i2c_driver(node, &info) < 0) {
-+			irq_dispose_mapping(info.irq);
-+			continue;
-+		}
-+
-+		info.addr = *addr;
-+
-+		request_module(info.type);
-+
-+		result = i2c_new_device(adap, &info);
-+		if (result == NULL) {
-+			printk(KERN_ERR
-+			       "of-i2c: Failed to load driver for %s\n",
-+			       info.type);
-+			irq_dispose_mapping(info.irq);
-+			continue;
-+		}
-+	}
-+}
-+EXPORT_SYMBOL(of_register_i2c_devices);
---- a/drivers/ps3/ps3-sys-manager.c
-+++ b/drivers/ps3/ps3-sys-manager.c
-@@ -24,6 +24,7 @@
- #include <linux/reboot.h>
- 
- #include <asm/firmware.h>
-+#include <asm/lv1call.h>
- #include <asm/ps3.h>
- 
- #include "vuart.h"
-@@ -187,6 +188,7 @@ enum ps3_sys_manager_next_op {
-  * controller, and bluetooth controller.
-  * @PS3_SM_WAKE_RTC:
-  * @PS3_SM_WAKE_RTC_ERROR:
-+ * @PS3_SM_WAKE_W_O_L: Ether or wireless LAN.
-  * @PS3_SM_WAKE_P_O_R: Power on reset.
-  *
-  * Additional wakeup sources when specifying PS3_SM_NEXT_OP_SYS_SHUTDOWN.
-@@ -200,10 +202,19 @@ enum ps3_sys_manager_wake_source {
- 	PS3_SM_WAKE_DEFAULT   = 0,
- 	PS3_SM_WAKE_RTC       = 0x00000040,
- 	PS3_SM_WAKE_RTC_ERROR = 0x00000080,
-+	PS3_SM_WAKE_W_O_L     = 0x00000400,
- 	PS3_SM_WAKE_P_O_R     = 0x80000000,
- };
- 
- /**
-+ * user_wake_sources - User specified wakeup sources.
-+ *
-+ * Logical OR of enum ps3_sys_manager_wake_source types.
-+ */
-+
-+static u32 user_wake_sources = PS3_SM_WAKE_DEFAULT;
-+
-+/**
-  * enum ps3_sys_manager_cmd - Command from system manager to guest.
-  *
-  * The guest completes the actions needed, then acks or naks the command via
-@@ -581,6 +592,23 @@ fail_id:
- 	return -EIO;
- }
- 
-+static void ps3_sys_manager_fin(struct ps3_system_bus_device *dev)
-+{
-+	ps3_sys_manager_send_request_shutdown(dev);
-+
-+	pr_emerg("System Halted, OK to turn off power\n");
-+
-+	while (ps3_sys_manager_handle_msg(dev)) {
-+		/* pause until next DEC interrupt */
-+		lv1_pause(0);
-+	}
-+
-+	while (1) {
-+		/* pause, ignoring DEC interrupt */
-+		lv1_pause(1);
-+	}
-+}
-+
- /**
-  * ps3_sys_manager_final_power_off - The final platform machine_power_off routine.
-  *
-@@ -601,13 +629,9 @@ static void ps3_sys_manager_final_power_
- 	ps3_vuart_cancel_async(dev);
- 
- 	ps3_sys_manager_send_next_op(dev, PS3_SM_NEXT_OP_SYS_SHUTDOWN,
--		PS3_SM_WAKE_DEFAULT);
--	ps3_sys_manager_send_request_shutdown(dev);
--
--	pr_emerg("System Halted, OK to turn off power\n");
-+		user_wake_sources);
- 
--	while (1)
--		ps3_sys_manager_handle_msg(dev);
-+	ps3_sys_manager_fin(dev);
- }
- 
- /**
-@@ -638,14 +662,42 @@ static void ps3_sys_manager_final_restar
- 
- 	ps3_sys_manager_send_attr(dev, 0);
- 	ps3_sys_manager_send_next_op(dev, PS3_SM_NEXT_OP_SYS_REBOOT,
--		PS3_SM_WAKE_DEFAULT);
--	ps3_sys_manager_send_request_shutdown(dev);
-+		user_wake_sources);
- 
--	pr_emerg("System Halted, OK to turn off power\n");
-+	ps3_sys_manager_fin(dev);
-+}
-+
-+/**
-+ * ps3_sys_manager_get_wol - Get wake-on-lan setting.
-+ */
-+
-+int ps3_sys_manager_get_wol(void)
-+{
-+	pr_debug("%s:%d\n", __func__, __LINE__);
-+
-+	return (user_wake_sources & PS3_SM_WAKE_W_O_L) != 0;
-+}
-+EXPORT_SYMBOL_GPL(ps3_sys_manager_get_wol);
-+
-+/**
-+ * ps3_sys_manager_set_wol - Set wake-on-lan setting.
-+ */
-+
-+void ps3_sys_manager_set_wol(int state)
-+{
-+	static DEFINE_MUTEX(mutex);
-+
-+	mutex_lock(&mutex);
-+
-+	pr_debug("%s:%d: %d\n", __func__, __LINE__, state);
- 
--	while (1)
--		ps3_sys_manager_handle_msg(dev);
-+	if (state)
-+		user_wake_sources |= PS3_SM_WAKE_W_O_L;
-+	else
-+		user_wake_sources &= ~PS3_SM_WAKE_W_O_L;
-+	mutex_unlock(&mutex);
- }
-+EXPORT_SYMBOL_GPL(ps3_sys_manager_set_wol);
- 
- /**
-  * ps3_sys_manager_work - Asynchronous read handler.
---- a/drivers/ps3/sys-manager-core.c
-+++ b/drivers/ps3/sys-manager-core.c
-@@ -19,6 +19,7 @@
-  */
- 
- #include <linux/kernel.h>
-+#include <asm/lv1call.h>
- #include <asm/ps3.h>
- 
- /**
-@@ -50,10 +51,7 @@ void ps3_sys_manager_power_off(void)
- 	if (ps3_sys_manager_ops.power_off)
- 		ps3_sys_manager_ops.power_off(ps3_sys_manager_ops.dev);
- 
--	printk(KERN_EMERG "System Halted, OK to turn off power\n");
--	local_irq_disable();
--	while (1)
--		(void)0;
-+	ps3_sys_manager_halt();
- }
- 
- void ps3_sys_manager_restart(void)
-@@ -61,8 +59,14 @@ void ps3_sys_manager_restart(void)
- 	if (ps3_sys_manager_ops.restart)
- 		ps3_sys_manager_ops.restart(ps3_sys_manager_ops.dev);
- 
--	printk(KERN_EMERG "System Halted, OK to turn off power\n");
-+	ps3_sys_manager_halt();
-+}
-+
-+void ps3_sys_manager_halt(void)
-+{
-+	pr_emerg("System Halted, OK to turn off power\n");
- 	local_irq_disable();
- 	while (1)
--		(void)0;
-+		lv1_pause(1);
- }
-+
---- a/drivers/serial/cpm_uart/cpm_uart.h
-+++ b/drivers/serial/cpm_uart/cpm_uart.h
-@@ -92,6 +92,9 @@ extern struct uart_cpm_port cpm_uart_por
- 
- /* these are located in their respective files */
- void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd);
-+void __iomem *cpm_uart_map_pram(struct uart_cpm_port *port,
-+				struct device_node *np);
-+void cpm_uart_unmap_pram(struct uart_cpm_port *port, void __iomem *pram);
- int cpm_uart_init_portdesc(void);
- int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con);
- void cpm_uart_freebuf(struct uart_cpm_port *pinfo);
---- a/drivers/serial/cpm_uart/cpm_uart_core.c
-+++ b/drivers/serial/cpm_uart/cpm_uart_core.c
-@@ -966,24 +966,23 @@ static int cpm_uart_init_port(struct dev
- 	if (!mem)
- 		return -ENOMEM;
- 
--	pram = of_iomap(np, 1);
--	if (!pram) {
--		ret = -ENOMEM;
--		goto out_mem;
--	}
--
- 	if (of_device_is_compatible(np, "fsl,cpm1-scc-uart") ||
- 	    of_device_is_compatible(np, "fsl,cpm2-scc-uart")) {
- 		pinfo->sccp = mem;
--		pinfo->sccup = pram;
-+		pinfo->sccup = pram = cpm_uart_map_pram(pinfo, np);
- 	} else if (of_device_is_compatible(np, "fsl,cpm1-smc-uart") ||
- 	           of_device_is_compatible(np, "fsl,cpm2-smc-uart")) {
- 		pinfo->flags |= FLAG_SMC;
- 		pinfo->smcp = mem;
--		pinfo->smcup = pram;
-+		pinfo->smcup = pram = cpm_uart_map_pram(pinfo, np);
- 	} else {
- 		ret = -ENODEV;
--		goto out_pram;
-+		goto out_mem;
-+	}
-+
-+	if (!pram) {
-+		ret = -ENOMEM;
-+		goto out_mem;
- 	}
- 
- 	pinfo->tx_nrfifos = TX_NUM_FIFO;
-@@ -1007,7 +1006,7 @@ static int cpm_uart_init_port(struct dev
- 	return cpm_uart_request_port(&pinfo->port);
- 
- out_pram:
--	iounmap(pram);
-+	cpm_uart_unmap_pram(pinfo, pram);
- out_mem:
- 	iounmap(mem);
- 	return ret;
---- a/drivers/serial/cpm_uart/cpm_uart_cpm1.c
-+++ b/drivers/serial/cpm_uart/cpm_uart_cpm1.c
-@@ -45,6 +45,8 @@
- #include <linux/serial_core.h>
- #include <linux/kernel.h>
- 
-+#include <linux/of.h>
-+
- #include "cpm_uart.h"
- 
- /**************************************************************/
-@@ -54,6 +56,18 @@ void cpm_line_cr_cmd(struct uart_cpm_por
- {
- 	cpm_command(port->command, cmd);
- }
-+
-+void __iomem *cpm_uart_map_pram(struct uart_cpm_port *port,
-+				struct device_node *np)
-+{
-+	return of_iomap(np, 1);
-+}
-+
-+void cpm_uart_unmap_pram(struct uart_cpm_port *port, void __iomem *pram)
-+{
-+	iounmap(pram);
-+}
-+
- #else
- void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd)
- {
---- a/drivers/serial/cpm_uart/cpm_uart_cpm2.c
-+++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.c
-@@ -41,6 +41,9 @@
- #include <asm/io.h>
- #include <asm/irq.h>
- #include <asm/fs_pd.h>
-+#ifdef CONFIG_PPC_CPM_NEW_BINDING
-+#include <asm/prom.h>
-+#endif
- 
- #include <linux/serial_core.h>
- #include <linux/kernel.h>
-@@ -54,6 +57,55 @@ void cpm_line_cr_cmd(struct uart_cpm_por
- {
- 	cpm_command(port->command, cmd);
- }
-+
-+void __iomem *cpm_uart_map_pram(struct uart_cpm_port *port,
-+				struct device_node *np)
-+{
-+	void __iomem *pram;
-+	unsigned long offset;
-+	struct resource res;
-+	unsigned long len;
-+
-+	/* Don't remap parameter RAM if it has already been initialized
-+	 * during console setup.
-+	 */
-+	if (IS_SMC(port) && port->smcup)
-+		return port->smcup;
-+	else if (!IS_SMC(port) && port->sccup)
-+		return port->sccup;
-+
-+	if (of_address_to_resource(np, 1, &res))
-+		return NULL;
-+
-+	len = 1 + res.end - res.start;
-+	pram = ioremap(res.start, len);
-+	if (!pram)
-+		return NULL;
-+
-+	if (!IS_SMC(port))
-+		return pram;
-+
-+	if (len != 2) {
-+		printk(KERN_WARNING "cpm_uart[%d]: device tree references "
-+			"SMC pram, using boot loader/wrapper pram mapping. "
-+			"Please fix your device tree to reference the pram "
-+			"base register instead.\n",
-+			port->port.line);
-+		return pram;
-+	}
-+
-+	offset = cpm_dpalloc(PROFF_SMC_SIZE, 64);
-+	out_be16(pram, offset);
-+	iounmap(pram);
-+	return cpm_muram_addr(offset);
-+}
-+
-+void cpm_uart_unmap_pram(struct uart_cpm_port *port, void __iomem *pram)
-+{
-+	if (!IS_SMC(port))
-+		iounmap(pram);
-+}
-+
- #else
- void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd)
- {
---- a/drivers/serial/of_serial.c
-+++ b/drivers/serial/of_serial.c
-@@ -56,7 +56,9 @@ static int __devinit of_platform_serial_
- 	port->flags = UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF | UPF_IOREMAP
- 		| UPF_FIXED_PORT;
- 	port->dev = &ofdev->dev;
--	port->custom_divisor = *clk / (16 * (*spd));
-+	/* If current-speed was set, then try not to change it. */
-+	if (spd)
-+		port->custom_divisor = *clk / (16 * (*spd));
- 
- 	return 0;
- }
---- a/drivers/serial/ucc_uart.c
-+++ b/drivers/serial/ucc_uart.c
-@@ -1270,10 +1270,18 @@ static int ucc_uart_probe(struct of_devi
- 
- 	/* Get the UCC number (device ID) */
- 	/* UCCs are numbered 1-7 */
--	iprop = of_get_property(np, "device-id", NULL);
--	if (!iprop || (*iprop < 1) || (*iprop > UCC_MAX_NUM)) {
--		dev_err(&ofdev->dev,
--			"missing or invalid UCC specified in device tree\n");
-+	iprop = of_get_property(np, "cell-index", NULL);
-+	if (!iprop) {
-+		iprop = of_get_property(np, "device-id", NULL);
-+		if (!iprop) {
-+			dev_err(&ofdev->dev, "UCC is unspecified in "
-+				"device tree\n");
-+			return -EINVAL;
-+		}
-+	}
-+
-+	if ((*iprop < 1) || (*iprop > UCC_MAX_NUM)) {
-+		dev_err(&ofdev->dev, "no support for UCC%u\n", *iprop);
- 		kfree(qe_port);
- 		return -ENODEV;
- 	}
---- a/include/asm-powerpc/Kbuild
-+++ b/include/asm-powerpc/Kbuild
-@@ -1,5 +1,6 @@
- include include/asm-generic/Kbuild.asm
- 
-+header-y += a.out.h
- header-y += auxvec.h
- header-y += ioctls.h
- header-y += mman.h
-@@ -23,7 +24,6 @@ header-y += sigcontext.h
- header-y += statfs.h
- header-y += ps3fb.h
- 
--unifdef-y += a.out.h
- unifdef-y += asm-compat.h
- unifdef-y += bootx.h
- unifdef-y += byteorder.h
---- a/include/asm-powerpc/abs_addr.h
-+++ b/include/asm-powerpc/abs_addr.h
-@@ -12,10 +12,11 @@
-  * 2 of the License, or (at your option) any later version.
-  */
- 
-+#include <linux/lmb.h>
-+
- #include <asm/types.h>
- #include <asm/page.h>
- #include <asm/prom.h>
--#include <asm/lmb.h>
- #include <asm/firmware.h>
- 
- struct mschunks_map {
---- a/include/asm-powerpc/bitops.h
-+++ b/include/asm-powerpc/bitops.h
-@@ -312,24 +312,26 @@ static __inline__ int fls(unsigned int x
- 	asm ("cntlzw %0,%1" : "=r" (lz) : "r" (x));
- 	return 32 - lz;
- }
-+
-+/*
-+ * 64-bit can do this using one cntlzd (count leading zeroes doubleword)
-+ * instruction; for 32-bit we use the generic version, which does two
-+ * 32-bit fls calls.
-+ */
-+#ifdef __powerpc64__
-+static __inline__ int fls64(__u64 x)
-+{
-+	int lz;
-+
-+	asm ("cntlzd %0,%1" : "=r" (lz) : "r" (x));
-+	return 64 - lz;
-+}
-+#else
- #include <asm-generic/bitops/fls64.h>
-+#endif /* __powerpc64__ */
- 
- #include <asm-generic/bitops/hweight.h>
--
--#define find_first_zero_bit(addr, size) find_next_zero_bit((addr), (size), 0)
--unsigned long find_next_zero_bit(const unsigned long *addr,
--				 unsigned long size, unsigned long offset);
--/**
-- * find_first_bit - find the first set bit in a memory region
-- * @addr: The address to start the search at
-- * @size: The maximum size to search
-- *
-- * Returns the bit-number of the first set bit, not the number of the byte
-- * containing a bit.
-- */
--#define find_first_bit(addr, size) find_next_bit((addr), (size), 0)
--unsigned long find_next_bit(const unsigned long *addr,
--			    unsigned long size, unsigned long offset);
-+#include <asm-generic/bitops/find.h>
- 
- /* Little-endian versions */
- 
---- a/include/asm-powerpc/cpm.h
-+++ b/include/asm-powerpc/cpm.h
-@@ -4,6 +4,20 @@
- #include <linux/compiler.h>
- #include <linux/types.h>
- 
-+/* Opcodes common to CPM1 and CPM2
-+*/
-+#define CPM_CR_INIT_TRX		((ushort)0x0000)
-+#define CPM_CR_INIT_RX		((ushort)0x0001)
-+#define CPM_CR_INIT_TX		((ushort)0x0002)
-+#define CPM_CR_HUNT_MODE	((ushort)0x0003)
-+#define CPM_CR_STOP_TX		((ushort)0x0004)
-+#define CPM_CR_GRA_STOP_TX	((ushort)0x0005)
-+#define CPM_CR_RESTART_TX	((ushort)0x0006)
-+#define CPM_CR_CLOSE_RX_BD	((ushort)0x0007)
-+#define CPM_CR_SET_GADDR	((ushort)0x0008)
-+#define CPM_CR_SET_TIMER	((ushort)0x0008)
-+#define CPM_CR_STOP_IDMA	((ushort)0x000b)
-+
- /* Buffer descriptors used by many of the CPM protocols. */
- typedef struct cpm_buf_desc {
- 	ushort	cbd_sc;		/* Status and Control */
---- a/include/asm-powerpc/cpm1.h
-+++ b/include/asm-powerpc/cpm1.h
-@@ -28,19 +28,6 @@
- #define CPM_CR_CHAN	((ushort)0x00f0)
- #define CPM_CR_FLG	((ushort)0x0001)
- 
--/* Some commands (there are more...later)
--*/
--#define CPM_CR_INIT_TRX		((ushort)0x0000)
--#define CPM_CR_INIT_RX		((ushort)0x0001)
--#define CPM_CR_INIT_TX		((ushort)0x0002)
--#define CPM_CR_HUNT_MODE	((ushort)0x0003)
--#define CPM_CR_STOP_TX		((ushort)0x0004)
--#define CPM_CR_GRA_STOP_TX	((ushort)0x0005)
--#define CPM_CR_RESTART_TX	((ushort)0x0006)
--#define CPM_CR_CLOSE_RX_BD	((ushort)0x0007)
--#define CPM_CR_SET_GADDR	((ushort)0x0008)
--#define CPM_CR_SET_TIMER	CPM_CR_SET_GADDR
--
- /* Channel numbers.
- */
- #define CPM_CR_CH_SCC1		((ushort)0x0000)
---- a/include/asm-powerpc/cpm2.h
-+++ b/include/asm-powerpc/cpm2.h
-@@ -71,18 +71,9 @@
- 
- #define CPM_CR_FCC_PAGE(x)	(x + 0x04)
- 
--/* Some opcodes (there are more...later)
-+/* CPM2-specific opcodes (see cpm.h for common opcodes)
- */
--#define CPM_CR_INIT_TRX		((ushort)0x0000)
--#define CPM_CR_INIT_RX		((ushort)0x0001)
--#define CPM_CR_INIT_TX		((ushort)0x0002)
--#define CPM_CR_HUNT_MODE	((ushort)0x0003)
--#define CPM_CR_STOP_TX		((ushort)0x0004)
--#define CPM_CR_GRA_STOP_TX	((ushort)0x0005)
--#define CPM_CR_RESTART_TX	((ushort)0x0006)
--#define CPM_CR_SET_GADDR	((ushort)0x0008)
- #define CPM_CR_START_IDMA	((ushort)0x0009)
--#define CPM_CR_STOP_IDMA	((ushort)0x000b)
- 
- #define mk_cr_cmd(PG, SBC, MCN, OP) \
- 	((PG << 26) | (SBC << 21) | (MCN << 6) | OP)
---- a/include/asm-powerpc/cputhreads.h
-+++ b/include/asm-powerpc/cputhreads.h
-@@ -35,7 +35,7 @@ static inline cpumask_t cpu_thread_mask_
- 
- 	res = CPU_MASK_NONE;
- 	for (i = 0; i < NR_CPUS; i += threads_per_core) {
--		cpus_shift_right(tmp, threads_core_mask, i);
-+		cpus_shift_left(tmp, threads_core_mask, i);
- 		if (cpus_intersects(threads, tmp))
- 			cpu_set(i, res);
- 	}
---- a/include/asm-powerpc/dcr-native.h
-+++ b/include/asm-powerpc/dcr-native.h
-@@ -82,6 +82,19 @@ static inline void __mtdcri(int base_add
- 	spin_unlock_irqrestore(&dcr_ind_lock, flags);
- }
- 
-+static inline void __dcri_clrset(int base_addr, int base_data, int reg,
-+				 unsigned clr, unsigned set)
-+{
-+	unsigned long flags;
-+	unsigned int val;
-+
-+	spin_lock_irqsave(&dcr_ind_lock, flags);
-+	__mtdcr(base_addr, reg);
-+	val = (__mfdcr(base_data) & ~clr) | set;
-+	__mtdcr(base_data, val);
-+	spin_unlock_irqrestore(&dcr_ind_lock, flags);
-+}
-+
- #define mfdcri(base, reg)	__mfdcri(DCRN_ ## base ## _CONFIG_ADDR,	\
- 					 DCRN_ ## base ## _CONFIG_DATA,	\
- 					 reg)
-@@ -90,6 +103,10 @@ static inline void __mtdcri(int base_add
- 					 DCRN_ ## base ## _CONFIG_DATA,	\
- 					 reg, data)
- 
-+#define dcri_clrset(base, reg, clr, set)	__dcri_clrset(DCRN_ ## base ## _CONFIG_ADDR,	\
-+							      DCRN_ ## base ## _CONFIG_DATA,	\
-+							      reg, clr, set)
-+
- #endif /* __ASSEMBLY__ */
- #endif /* __KERNEL__ */
- #endif /* _ASM_POWERPC_DCR_NATIVE_H */
---- a/include/asm-powerpc/dcr-regs.h
-+++ b/include/asm-powerpc/dcr-regs.h
-@@ -68,4 +68,82 @@
- #define SDR0_UART3		0x0123
- #define SDR0_CUST0		0x4000
- 
-+/*
-+ * All those DCR register addresses are offsets from the base address
-+ * for the SRAM0 controller (e.g. 0x20 on 440GX). The base address is
-+ * excluded here and configured in the device tree.
-+ */
-+#define DCRN_SRAM0_SB0CR	0x00
-+#define DCRN_SRAM0_SB1CR	0x01
-+#define DCRN_SRAM0_SB2CR	0x02
-+#define DCRN_SRAM0_SB3CR	0x03
-+#define  SRAM_SBCR_BU_MASK	0x00000180
-+#define  SRAM_SBCR_BS_64KB	0x00000800
-+#define  SRAM_SBCR_BU_RO	0x00000080
-+#define  SRAM_SBCR_BU_RW	0x00000180
-+#define DCRN_SRAM0_BEAR		0x04
-+#define DCRN_SRAM0_BESR0	0x05
-+#define DCRN_SRAM0_BESR1	0x06
-+#define DCRN_SRAM0_PMEG		0x07
-+#define DCRN_SRAM0_CID		0x08
-+#define DCRN_SRAM0_REVID	0x09
-+#define DCRN_SRAM0_DPC		0x0a
-+#define  SRAM_DPC_ENABLE	0x80000000
-+
-+/*
-+ * All those DCR register addresses are offsets from the base address
-+ * for the SRAM0 controller (e.g. 0x30 on 440GX). The base address is
-+ * excluded here and configured in the device tree.
-+ */
-+#define DCRN_L2C0_CFG		0x00
-+#define  L2C_CFG_L2M		0x80000000
-+#define  L2C_CFG_ICU		0x40000000
-+#define  L2C_CFG_DCU		0x20000000
-+#define  L2C_CFG_DCW_MASK	0x1e000000
-+#define  L2C_CFG_TPC		0x01000000
-+#define  L2C_CFG_CPC		0x00800000
-+#define  L2C_CFG_FRAN		0x00200000
-+#define  L2C_CFG_SS_MASK	0x00180000
-+#define  L2C_CFG_SS_256		0x00000000
-+#define  L2C_CFG_CPIM		0x00040000
-+#define  L2C_CFG_TPIM		0x00020000
-+#define  L2C_CFG_LIM		0x00010000
-+#define  L2C_CFG_PMUX_MASK	0x00007000
-+#define  L2C_CFG_PMUX_SNP	0x00000000
-+#define  L2C_CFG_PMUX_IF	0x00001000
-+#define  L2C_CFG_PMUX_DF	0x00002000
-+#define  L2C_CFG_PMUX_DS	0x00003000
-+#define  L2C_CFG_PMIM		0x00000800
-+#define  L2C_CFG_TPEI		0x00000400
-+#define  L2C_CFG_CPEI		0x00000200
-+#define  L2C_CFG_NAM		0x00000100
-+#define  L2C_CFG_SMCM		0x00000080
-+#define  L2C_CFG_NBRM		0x00000040
-+#define  L2C_CFG_RDBW		0x00000008	/* only 460EX/GT */
-+#define DCRN_L2C0_CMD		0x01
-+#define  L2C_CMD_CLR		0x80000000
-+#define  L2C_CMD_DIAG		0x40000000
-+#define  L2C_CMD_INV		0x20000000
-+#define  L2C_CMD_CCP		0x10000000
-+#define  L2C_CMD_CTE		0x08000000
-+#define  L2C_CMD_STRC		0x04000000
-+#define  L2C_CMD_STPC		0x02000000
-+#define  L2C_CMD_RPMC		0x01000000
-+#define  L2C_CMD_HCC		0x00800000
-+#define DCRN_L2C0_ADDR		0x02
-+#define DCRN_L2C0_DATA		0x03
-+#define DCRN_L2C0_SR		0x04
-+#define  L2C_SR_CC		0x80000000
-+#define  L2C_SR_CPE		0x40000000
-+#define  L2C_SR_TPE		0x20000000
-+#define  L2C_SR_LRU		0x10000000
-+#define  L2C_SR_PCS		0x08000000
-+#define DCRN_L2C0_REVID		0x05
-+#define DCRN_L2C0_SNP0		0x06
-+#define DCRN_L2C0_SNP1		0x07
-+#define  L2C_SNP_BA_MASK	0xffff0000
-+#define  L2C_SNP_SSR_MASK	0x0000f000
-+#define  L2C_SNP_SSR_32G	0x0000f000
-+#define  L2C_SNP_ESR		0x00000800
-+
- #endif /* __DCR_REGS_H__ */
---- a/include/asm-powerpc/exception.h
-+++ b/include/asm-powerpc/exception.h
-@@ -228,18 +228,18 @@ label##_pSeries:							\
- BEGIN_FW_FTR_SECTION;				\
- 	stb	r11,PACAHARDIRQEN(r13);		\
- END_FW_FTR_SECTION_IFCLR(FW_FEATURE_ISERIES);	\
-+	TRACE_DISABLE_INTS;			\
- BEGIN_FW_FTR_SECTION;				\
- 	mfmsr	r10;				\
- 	ori	r10,r10,MSR_EE;			\
- 	mtmsrd	r10,1;				\
- END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
--
- #else
- #define DISABLE_INTS				\
- 	li	r11,0;				\
- 	stb	r11,PACASOFTIRQEN(r13);		\
--	stb	r11,PACAHARDIRQEN(r13)
--
-+	stb	r11,PACAHARDIRQEN(r13);		\
-+	TRACE_DISABLE_INTS
- #endif /* CONFIG_PPC_ISERIES */
- 
- #define ENABLE_INTS				\
---- /dev/null
-+++ b/include/asm-powerpc/fsl_lbc.h
-@@ -0,0 +1,311 @@
-+/* Freescale Local Bus Controller
-+ *
-+ * Copyright (c) 2006-2007 Freescale Semiconductor
-+ *
-+ * Authors: Nick Spence <nick.spence@freescale.com>,
-+ *          Scott Wood <scottwood@freescale.com>
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#ifndef __ASM_FSL_LBC_H
-+#define __ASM_FSL_LBC_H
-+
-+#include <linux/types.h>
-+#include <linux/spinlock.h>
-+#include <asm/io.h>
-+
-+struct fsl_lbc_bank {
-+	__be32 br;             /**< Base Register  */
-+#define BR_BA           0xFFFF8000
-+#define BR_BA_SHIFT             15
-+#define BR_PS           0x00001800
-+#define BR_PS_SHIFT             11
-+#define BR_PS_8         0x00000800  /* Port Size 8 bit */
-+#define BR_PS_16        0x00001000  /* Port Size 16 bit */
-+#define BR_PS_32        0x00001800  /* Port Size 32 bit */
-+#define BR_DECC         0x00000600
-+#define BR_DECC_SHIFT            9
-+#define BR_DECC_OFF     0x00000000  /* HW ECC checking and generation off */
-+#define BR_DECC_CHK     0x00000200  /* HW ECC checking on, generation off */
-+#define BR_DECC_CHK_GEN 0x00000400  /* HW ECC checking and generation on */
-+#define BR_WP           0x00000100
-+#define BR_WP_SHIFT              8
-+#define BR_MSEL         0x000000E0
-+#define BR_MSEL_SHIFT            5
-+#define BR_MS_GPCM      0x00000000  /* GPCM */
-+#define BR_MS_FCM       0x00000020  /* FCM */
-+#define BR_MS_SDRAM     0x00000060  /* SDRAM */
-+#define BR_MS_UPMA      0x00000080  /* UPMA */
-+#define BR_MS_UPMB      0x000000A0  /* UPMB */
-+#define BR_MS_UPMC      0x000000C0  /* UPMC */
-+#define BR_V            0x00000001
-+#define BR_V_SHIFT               0
-+#define BR_RES          ~(BR_BA|BR_PS|BR_DECC|BR_WP|BR_MSEL|BR_V)
-+
-+	__be32 or;             /**< Base Register  */
-+#define OR0 0x5004
-+#define OR1 0x500C
-+#define OR2 0x5014
-+#define OR3 0x501C
-+#define OR4 0x5024
-+#define OR5 0x502C
-+#define OR6 0x5034
-+#define OR7 0x503C
-+
-+#define OR_FCM_AM               0xFFFF8000
-+#define OR_FCM_AM_SHIFT                 15
-+#define OR_FCM_BCTLD            0x00001000
-+#define OR_FCM_BCTLD_SHIFT              12
-+#define OR_FCM_PGS              0x00000400
-+#define OR_FCM_PGS_SHIFT                10
-+#define OR_FCM_CSCT             0x00000200
-+#define OR_FCM_CSCT_SHIFT                9
-+#define OR_FCM_CST              0x00000100
-+#define OR_FCM_CST_SHIFT                 8
-+#define OR_FCM_CHT              0x00000080
-+#define OR_FCM_CHT_SHIFT                 7
-+#define OR_FCM_SCY              0x00000070
-+#define OR_FCM_SCY_SHIFT                 4
-+#define OR_FCM_SCY_1            0x00000010
-+#define OR_FCM_SCY_2            0x00000020
-+#define OR_FCM_SCY_3            0x00000030
-+#define OR_FCM_SCY_4            0x00000040
-+#define OR_FCM_SCY_5            0x00000050
-+#define OR_FCM_SCY_6            0x00000060
-+#define OR_FCM_SCY_7            0x00000070
-+#define OR_FCM_RST              0x00000008
-+#define OR_FCM_RST_SHIFT                 3
-+#define OR_FCM_TRLX             0x00000004
-+#define OR_FCM_TRLX_SHIFT                2
-+#define OR_FCM_EHTR             0x00000002
-+#define OR_FCM_EHTR_SHIFT                1
-+};
-+
-+struct fsl_lbc_regs {
-+	struct fsl_lbc_bank bank[8];
-+	u8 res0[0x28];
-+	__be32 mar;             /**< UPM Address Register */
-+	u8 res1[0x4];
-+	__be32 mamr;            /**< UPMA Mode Register */
-+#define MxMR_OP_NO	(0 << 28) /**< normal operation */
-+#define MxMR_OP_WA	(1 << 28) /**< write array */
-+#define MxMR_OP_RA	(2 << 28) /**< read array */
-+#define MxMR_OP_RP	(3 << 28) /**< run pattern */
-+#define MxMR_MAD	0x3f      /**< machine address */
-+	__be32 mbmr;            /**< UPMB Mode Register */
-+	__be32 mcmr;            /**< UPMC Mode Register */
-+	u8 res2[0x8];
-+	__be32 mrtpr;           /**< Memory Refresh Timer Prescaler Register */
-+	__be32 mdr;             /**< UPM Data Register */
-+	u8 res3[0x4];
-+	__be32 lsor;            /**< Special Operation Initiation Register */
-+	__be32 lsdmr;           /**< SDRAM Mode Register */
-+	u8 res4[0x8];
-+	__be32 lurt;            /**< UPM Refresh Timer */
-+	__be32 lsrt;            /**< SDRAM Refresh Timer */
-+	u8 res5[0x8];
-+	__be32 ltesr;           /**< Transfer Error Status Register */
-+#define LTESR_BM   0x80000000
-+#define LTESR_FCT  0x40000000
-+#define LTESR_PAR  0x20000000
-+#define LTESR_WP   0x04000000
-+#define LTESR_ATMW 0x00800000
-+#define LTESR_ATMR 0x00400000
-+#define LTESR_CS   0x00080000
-+#define LTESR_CC   0x00000001
-+#define LTESR_NAND_MASK (LTESR_FCT | LTESR_PAR | LTESR_CC)
-+	__be32 ltedr;           /**< Transfer Error Disable Register */
-+	__be32 lteir;           /**< Transfer Error Interrupt Register */
-+	__be32 lteatr;          /**< Transfer Error Attributes Register */
-+	__be32 ltear;           /**< Transfer Error Address Register */
-+	u8 res6[0xC];
-+	__be32 lbcr;            /**< Configuration Register */
-+#define LBCR_LDIS  0x80000000
-+#define LBCR_LDIS_SHIFT    31
-+#define LBCR_BCTLC 0x00C00000
-+#define LBCR_BCTLC_SHIFT   22
-+#define LBCR_AHD   0x00200000
-+#define LBCR_LPBSE 0x00020000
-+#define LBCR_LPBSE_SHIFT   17
-+#define LBCR_EPAR  0x00010000
-+#define LBCR_EPAR_SHIFT    16
-+#define LBCR_BMT   0x0000FF00
-+#define LBCR_BMT_SHIFT      8
-+#define LBCR_INIT  0x00040000
-+	__be32 lcrr;            /**< Clock Ratio Register */
-+#define LCRR_DBYP    0x80000000
-+#define LCRR_DBYP_SHIFT      31
-+#define LCRR_BUFCMDC 0x30000000
-+#define LCRR_BUFCMDC_SHIFT   28
-+#define LCRR_ECL     0x03000000
-+#define LCRR_ECL_SHIFT       24
-+#define LCRR_EADC    0x00030000
-+#define LCRR_EADC_SHIFT      16
-+#define LCRR_CLKDIV  0x0000000F
-+#define LCRR_CLKDIV_SHIFT     0
-+	u8 res7[0x8];
-+	__be32 fmr;             /**< Flash Mode Register */
-+#define FMR_CWTO     0x0000F000
-+#define FMR_CWTO_SHIFT       12
-+#define FMR_BOOT     0x00000800
-+#define FMR_ECCM     0x00000100
-+#define FMR_AL       0x00000030
-+#define FMR_AL_SHIFT          4
-+#define FMR_OP       0x00000003
-+#define FMR_OP_SHIFT          0
-+	__be32 fir;             /**< Flash Instruction Register */
-+#define FIR_OP0      0xF0000000
-+#define FIR_OP0_SHIFT        28
-+#define FIR_OP1      0x0F000000
-+#define FIR_OP1_SHIFT        24
-+#define FIR_OP2      0x00F00000
-+#define FIR_OP2_SHIFT        20
-+#define FIR_OP3      0x000F0000
-+#define FIR_OP3_SHIFT        16
-+#define FIR_OP4      0x0000F000
-+#define FIR_OP4_SHIFT        12
-+#define FIR_OP5      0x00000F00
-+#define FIR_OP5_SHIFT         8
-+#define FIR_OP6      0x000000F0
-+#define FIR_OP6_SHIFT         4
-+#define FIR_OP7      0x0000000F
-+#define FIR_OP7_SHIFT         0
-+#define FIR_OP_NOP   0x0	/* No operation and end of sequence */
-+#define FIR_OP_CA    0x1        /* Issue current column address */
-+#define FIR_OP_PA    0x2        /* Issue current block+page address */
-+#define FIR_OP_UA    0x3        /* Issue user defined address */
-+#define FIR_OP_CM0   0x4        /* Issue command from FCR[CMD0] */
-+#define FIR_OP_CM1   0x5        /* Issue command from FCR[CMD1] */
-+#define FIR_OP_CM2   0x6        /* Issue command from FCR[CMD2] */
-+#define FIR_OP_CM3   0x7        /* Issue command from FCR[CMD3] */
-+#define FIR_OP_WB    0x8        /* Write FBCR bytes from FCM buffer */
-+#define FIR_OP_WS    0x9        /* Write 1 or 2 bytes from MDR[AS] */
-+#define FIR_OP_RB    0xA        /* Read FBCR bytes to FCM buffer */
-+#define FIR_OP_RS    0xB        /* Read 1 or 2 bytes to MDR[AS] */
-+#define FIR_OP_CW0   0xC        /* Wait then issue FCR[CMD0] */
-+#define FIR_OP_CW1   0xD        /* Wait then issue FCR[CMD1] */
-+#define FIR_OP_RBW   0xE        /* Wait then read FBCR bytes */
-+#define FIR_OP_RSW   0xE        /* Wait then read 1 or 2 bytes */
-+	__be32 fcr;             /**< Flash Command Register */
-+#define FCR_CMD0     0xFF000000
-+#define FCR_CMD0_SHIFT       24
-+#define FCR_CMD1     0x00FF0000
-+#define FCR_CMD1_SHIFT       16
-+#define FCR_CMD2     0x0000FF00
-+#define FCR_CMD2_SHIFT        8
-+#define FCR_CMD3     0x000000FF
-+#define FCR_CMD3_SHIFT        0
-+	__be32 fbar;            /**< Flash Block Address Register */
-+#define FBAR_BLK     0x00FFFFFF
-+	__be32 fpar;            /**< Flash Page Address Register */
-+#define FPAR_SP_PI   0x00007C00
-+#define FPAR_SP_PI_SHIFT     10
-+#define FPAR_SP_MS   0x00000200
-+#define FPAR_SP_CI   0x000001FF
-+#define FPAR_SP_CI_SHIFT      0
-+#define FPAR_LP_PI   0x0003F000
-+#define FPAR_LP_PI_SHIFT     12
-+#define FPAR_LP_MS   0x00000800
-+#define FPAR_LP_CI   0x000007FF
-+#define FPAR_LP_CI_SHIFT      0
-+	__be32 fbcr;            /**< Flash Byte Count Register */
-+#define FBCR_BC      0x00000FFF
-+	u8 res11[0x8];
-+	u8 res8[0xF00];
-+};
-+
-+extern struct fsl_lbc_regs __iomem *fsl_lbc_regs;
-+extern spinlock_t fsl_lbc_lock;
-+
-+/*
-+ * FSL UPM routines
-+ */
-+struct fsl_upm {
-+	__be32 __iomem *mxmr;
-+	int width;
-+};
-+
-+extern int fsl_lbc_find(phys_addr_t addr_base);
-+extern int fsl_upm_find(phys_addr_t addr_base, struct fsl_upm *upm);
-+
-+/**
-+ * fsl_upm_start_pattern - start UPM patterns execution
-+ * @upm:	pointer to the fsl_upm structure obtained via fsl_upm_find
-+ * @pat_offset:	UPM pattern offset for the command to be executed
-+ *
-+ * This routine programmes UPM so the next memory access that hits an UPM
-+ * will trigger pattern execution, starting at pat_offset.
-+ */
-+static inline void fsl_upm_start_pattern(struct fsl_upm *upm, u8 pat_offset)
-+{
-+	clrsetbits_be32(upm->mxmr, MxMR_MAD, MxMR_OP_RP | pat_offset);
-+}
-+
-+/**
-+ * fsl_upm_end_pattern - end UPM patterns execution
-+ * @upm:	pointer to the fsl_upm structure obtained via fsl_upm_find
-+ *
-+ * This routine reverts UPM to normal operation mode.
-+ */
-+static inline void fsl_upm_end_pattern(struct fsl_upm *upm)
-+{
-+	clrbits32(upm->mxmr, MxMR_OP_RP);
-+
-+	while (in_be32(upm->mxmr) & MxMR_OP_RP)
-+		cpu_relax();
-+}
-+
-+/**
-+ * fsl_upm_run_pattern - actually run an UPM pattern
-+ * @upm:	pointer to the fsl_upm structure obtained via fsl_upm_find
-+ * @io_base:	remapped pointer to where memory access should happen
-+ * @mar:	MAR register content during pattern execution
-+ *
-+ * This function triggers dummy write to the memory specified by the io_base,
-+ * thus UPM pattern actually executed. Note that mar usage depends on the
-+ * pre-programmed AMX bits in the UPM RAM.
-+ */
-+static inline int fsl_upm_run_pattern(struct fsl_upm *upm,
-+				      void __iomem *io_base, u32 mar)
-+{
-+	int ret = 0;
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&fsl_lbc_lock, flags);
-+
-+	out_be32(&fsl_lbc_regs->mar, mar << (32 - upm->width));
-+
-+	switch (upm->width) {
-+	case 8:
-+		out_8(io_base, 0x0);
-+		break;
-+	case 16:
-+		out_be16(io_base, 0x0);
-+		break;
-+	case 32:
-+		out_be32(io_base, 0x0);
-+		break;
-+	default:
-+		ret = -EINVAL;
-+		break;
-+	}
-+
-+	spin_unlock_irqrestore(&fsl_lbc_lock, flags);
-+
-+	return ret;
-+}
-+
-+#endif /* __ASM_FSL_LBC_H */
---- /dev/null
-+++ b/include/asm-powerpc/gpio.h
-@@ -0,0 +1,56 @@
-+/*
-+ * Generic GPIO API implementation for PowerPC.
-+ *
-+ * Copyright (c) 2007-2008  MontaVista Software, Inc.
-+ *
-+ * Author: Anton Vorontsov <avorontsov@ru.mvista.com>
-+ *
-+ * 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.
-+ */
-+
-+#ifndef __ASM_POWERPC_GPIO_H
-+#define __ASM_POWERPC_GPIO_H
-+
-+#include <linux/errno.h>
-+#include <asm-generic/gpio.h>
-+
-+#ifdef CONFIG_HAVE_GPIO_LIB
-+
-+/*
-+ * We don't (yet) implement inlined/rapid versions for on-chip gpios.
-+ * Just call gpiolib.
-+ */
-+static inline int gpio_get_value(unsigned int gpio)
-+{
-+	return __gpio_get_value(gpio);
-+}
-+
-+static inline void gpio_set_value(unsigned int gpio, int value)
-+{
-+	__gpio_set_value(gpio, value);
-+}
-+
-+static inline int gpio_cansleep(unsigned int gpio)
-+{
-+	return __gpio_cansleep(gpio);
-+}
-+
-+/*
-+ * Not implemented, yet.
-+ */
-+static inline int gpio_to_irq(unsigned int gpio)
-+{
-+	return -ENOSYS;
-+}
-+
-+static inline int irq_to_gpio(unsigned int irq)
-+{
-+	return -EINVAL;
-+}
-+
-+#endif /* CONFIG_HAVE_GPIO_LIB */
-+
-+#endif /* __ASM_POWERPC_GPIO_H */
---- a/include/asm-powerpc/hw_irq.h
-+++ b/include/asm-powerpc/hw_irq.h
-@@ -27,7 +27,7 @@ static inline unsigned long local_get_fl
- 	return flags;
- }
- 
--static inline unsigned long local_irq_disable(void)
-+static inline unsigned long raw_local_irq_disable(void)
- {
- 	unsigned long flags, zero;
- 
-@@ -39,14 +39,15 @@ static inline unsigned long local_irq_di
- 	return flags;
- }
- 
--extern void local_irq_restore(unsigned long);
-+extern void raw_local_irq_restore(unsigned long);
- extern void iseries_handle_interrupts(void);
- 
--#define local_irq_enable()	local_irq_restore(1)
--#define local_save_flags(flags)	((flags) = local_get_flags())
--#define local_irq_save(flags)	((flags) = local_irq_disable())
-+#define raw_local_irq_enable()		raw_local_irq_restore(1)
-+#define raw_local_save_flags(flags)	((flags) = local_get_flags())
-+#define raw_local_irq_save(flags)	((flags) = raw_local_irq_disable())
- 
--#define irqs_disabled()		(local_get_flags() == 0)
-+#define raw_irqs_disabled()		(local_get_flags() == 0)
-+#define raw_irqs_disabled_flags(flags)	((flags) == 0)
- 
- #define __hard_irq_enable()	__mtmsrd(mfmsr() | MSR_EE, 1)
- #define __hard_irq_disable()	__mtmsrd(mfmsr() & ~MSR_EE, 1)
---- a/include/asm-powerpc/immap_qe.h
-+++ b/include/asm-powerpc/immap_qe.h
-@@ -20,6 +20,7 @@
- #ifdef __KERNEL__
- 
- #include <linux/kernel.h>
-+#include <asm/io.h>
- 
- #define QE_IMMAP_SIZE	(1024 * 1024)	/* 1MB from 1MB+IMMR */
- 
-@@ -468,7 +469,7 @@ struct qe_immap {
- 	u8			res18[0xC0000];	/* 0x140000 - 0x200000 */
- } __attribute__ ((packed));
- 
--extern struct qe_immap *qe_immr;
-+extern struct qe_immap __iomem *qe_immr;
- extern phys_addr_t get_qe_base(void);
- 
- static inline unsigned long immrbar_virt_to_phys(void *address)
---- a/include/asm-powerpc/irqflags.h
-+++ b/include/asm-powerpc/irqflags.h
-@@ -2,30 +2,43 @@
-  * include/asm-powerpc/irqflags.h
-  *
-  * IRQ flags handling
-- *
-- * This file gets included from lowlevel asm headers too, to provide
-- * wrapped versions of the local_irq_*() APIs, based on the
-- * raw_local_irq_*() macros from the lowlevel headers.
-  */
- #ifndef _ASM_IRQFLAGS_H
- #define _ASM_IRQFLAGS_H
- 
-+#ifndef __ASSEMBLY__
- /*
-  * Get definitions for raw_local_save_flags(x), etc.
-  */
- #include <asm-powerpc/hw_irq.h>
- 
-+#else
-+#ifdef CONFIG_TRACE_IRQFLAGS
- /*
-- * Do the CPU's IRQ-state tracing from assembly code. We call a
-- * C function, so save all the C-clobbered registers:
-+ * Most of the CPU's IRQ-state tracing is done from assembly code; we
-+ * have to call a C function so call a wrapper that saves all the
-+ * C-clobbered registers.
-  */
--#ifdef CONFIG_TRACE_IRQFLAGS
--
--#error No support on PowerPC yet for CONFIG_TRACE_IRQFLAGS
--
-+#define TRACE_ENABLE_INTS	bl .trace_hardirqs_on
-+#define TRACE_DISABLE_INTS	bl .trace_hardirqs_off
-+#define TRACE_AND_RESTORE_IRQ_PARTIAL(en,skip)	\
-+	cmpdi	en, 0;				\
-+	bne	95f;				\
-+	stb	en,PACASOFTIRQEN(r13);		\
-+	bl	.trace_hardirqs_off;		\
-+	b	skip;				\
-+95:	bl	.trace_hardirqs_on;		\
-+	li	en,1;
-+#define TRACE_AND_RESTORE_IRQ(en)		\
-+	TRACE_AND_RESTORE_IRQ_PARTIAL(en,96f);	\
-+96:	stb	en,PACASOFTIRQEN(r13)
- #else
--# define TRACE_IRQS_ON
--# define TRACE_IRQS_OFF
-+#define TRACE_ENABLE_INTS
-+#define TRACE_DISABLE_INTS
-+#define TRACE_AND_RESTORE_IRQ_PARTIAL(en,skip)
-+#define TRACE_AND_RESTORE_IRQ(en)		\
-+	stb	en,PACASOFTIRQEN(r13)
-+#endif
- #endif
- 
- #endif
---- /dev/null
-+++ b/include/asm-powerpc/iseries/alpaca.h
-@@ -0,0 +1,31 @@
-+/*
-+ * Copyright © 2008  Stephen Rothwell IBM Corporation
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-+ */
-+#ifndef _ASM_POWERPC_ISERIES_ALPACA_H
-+#define _ASM_POWERPC_ISERIES_ALPACA_H
-+
-+/*
-+ * This is the part of the paca that the iSeries hypervisor
-+ * needs to be statically initialised. Immediately after boot
-+ * we switch to the normal Linux paca.
-+ */
-+struct alpaca {
-+	struct lppaca *lppaca_ptr;	/* Pointer to LpPaca for PLIC */
-+	const void *reg_save_ptr;	/* Pointer to LpRegSave for PLIC */
-+};
-+
-+#endif /* _ASM_POWERPC_ISERIES_ALPACA_H */
---- a/include/asm-powerpc/iseries/it_lp_reg_save.h
-+++ /dev/null
-@@ -1,85 +0,0 @@
--/*
-- * Copyright (C) 2001  Mike Corrigan IBM Corporation
-- *
-- * 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.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-- */
--#ifndef _ASM_POWERPC_ISERIES_IT_LP_REG_SAVE_H
--#define _ASM_POWERPC_ISERIES_IT_LP_REG_SAVE_H
--
--/*
-- * This control block contains the data that is shared between PLIC
-- * and the OS
-- */
--
--struct ItLpRegSave {
--	u32	xDesc;		// Eye catcher  "LpRS" ebcdic	000-003
--	u16	xSize;		// Size of this class		004-005
--	u8	xInUse;         // Area is live                 006-007
--	u8	xRsvd1[9];	// Reserved			007-00F
--
--	u8      xFixedRegSave[352]; // Fixed Register Save Area 010-16F
--	u32	xCTRL;		// Control Register		170-173
--	u32	xDEC;		// Decrementer			174-177
--	u32	xFPSCR;		// FP Status and Control Reg	178-17B
--	u32	xPVR;		// Processor Version Number	17C-17F
--
--	u64	xMMCR0;		// Monitor Mode Control Reg 0	180-187
--	u32	xPMC1;		// Perf Monitor Counter 1	188-18B
--	u32	xPMC2;		// Perf Monitor Counter 2	18C-18F
--	u32	xPMC3;		// Perf Monitor Counter 3	190-193
--	u32	xPMC4;		// Perf Monitor Counter 4	194-197
--	u32	xPIR;		// Processor ID Reg		198-19B
--
--	u32	xMMCR1;		// Monitor Mode Control Reg 1	19C-19F
--	u32	xMMCRA;		// Monitor Mode Control Reg A	1A0-1A3
--	u32	xPMC5;		// Perf Monitor Counter 5	1A4-1A7
--	u32	xPMC6;		// Perf Monitor Counter 6	1A8-1AB
--	u32	xPMC7;		// Perf Monitor Counter 7	1AC-1AF
--	u32	xPMC8;		// Perf Monitor Counter 8	1B0-1B3
--	u32	xTSC;		// Thread Switch Control	1B4-1B7
--	u32	xTST;		// Thread Switch Timeout	1B8-1BB
--	u32	xRsvd;          // Reserved                     1BC-1BF
--
--	u64	xACCR;		// Address Compare Control Reg	1C0-1C7
--	u64	xIMR;		// Instruction Match Register	1C8-1CF
--	u64	xSDR1;		// Storage Description Reg 1	1D0-1D7
--	u64	xSPRG0;		// Special Purpose Reg General0	1D8-1DF
--	u64	xSPRG1;		// Special Purpose Reg General1	1E0-1E7
--	u64	xSPRG2;		// Special Purpose Reg General2	1E8-1EF
--	u64	xSPRG3;		// Special Purpose Reg General3	1F0-1F7
--	u64	xTB;		// Time Base Register		1F8-1FF
--
--	u64	xFPR[32];	// Floating Point Registers	200-2FF
--
--	u64	xMSR;		// Machine State Register	300-307
--	u64	xNIA;		// Next Instruction Address	308-30F
--
--	u64	xDABR;		// Data Address Breakpoint Reg	310-317
--	u64	xIABR;		// Inst Address Breakpoint Reg	318-31F
--
--	u64	xHID0;		// HW Implementation Dependent0	320-327
--
--	u64	xHID4;		// HW Implementation Dependent4	328-32F
--	u64	xSCOMd;		// SCON Data Reg (SPRG4)	330-337
--	u64	xSCOMc;		// SCON Command Reg (SPRG5)	338-33F
--	u64	xSDAR;		// Sample Data Address Register	340-347
--	u64	xSIAR;		// Sample Inst Address Register	348-34F
--
--	u8	xRsvd3[176];	// Reserved			350-3FF
--};
--
--extern struct ItLpRegSave iseries_reg_save[];
--
--#endif /* _ASM_POWERPC_ISERIES_IT_LP_REG_SAVE_H */
---- a/include/asm-powerpc/lmb.h
-+++ b/include/asm-powerpc/lmb.h
-@@ -1,81 +1,15 @@
- #ifndef _ASM_POWERPC_LMB_H
- #define _ASM_POWERPC_LMB_H
--#ifdef __KERNEL__
- 
--/*
-- * Definitions for talking to the Open Firmware PROM on
-- * Power Macintosh computers.
-- *
-- * Copyright (C) 2001 Peter Bergner, IBM Corp.
-- *
-- * 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 <asm/udbg.h>
- 
--#include <linux/init.h>
--#include <asm/prom.h>
-+#define LMB_DBG(fmt...) udbg_printf(fmt)
- 
--#define MAX_LMB_REGIONS 128
-+#ifdef CONFIG_PPC32
-+extern phys_addr_t lowmem_end_addr;
-+#define LMB_REAL_LIMIT	lowmem_end_addr
-+#else
-+#define LMB_REAL_LIMIT	0
-+#endif
- 
--struct lmb_property {
--	unsigned long base;
--	unsigned long size;
--};
--
--struct lmb_region {
--	unsigned long cnt;
--	unsigned long size;
--	struct lmb_property region[MAX_LMB_REGIONS+1];
--};
--
--struct lmb {
--	unsigned long debug;
--	unsigned long rmo_size;
--	struct lmb_region memory;
--	struct lmb_region reserved;
--};
--
--extern struct lmb lmb;
--
--extern void __init lmb_init(void);
--extern void __init lmb_analyze(void);
--extern long __init lmb_add(unsigned long base, unsigned long size);
--extern long __init lmb_reserve(unsigned long base, unsigned long size);
--extern unsigned long __init lmb_alloc(unsigned long size, unsigned long align);
--extern unsigned long __init lmb_alloc_base(unsigned long size,
--		unsigned long align, unsigned long max_addr);
--extern unsigned long __init __lmb_alloc_base(unsigned long size,
--		unsigned long align, unsigned long max_addr);
--extern unsigned long __init lmb_phys_mem_size(void);
--extern unsigned long __init lmb_end_of_DRAM(void);
--extern void __init lmb_enforce_memory_limit(unsigned long memory_limit);
--extern int __init lmb_is_reserved(unsigned long addr);
--
--extern void lmb_dump_all(void);
--
--static inline unsigned long
--lmb_size_bytes(struct lmb_region *type, unsigned long region_nr)
--{
--	return type->region[region_nr].size;
--}
--static inline unsigned long
--lmb_size_pages(struct lmb_region *type, unsigned long region_nr)
--{
--	return lmb_size_bytes(type, region_nr) >> PAGE_SHIFT;
--}
--static inline unsigned long
--lmb_start_pfn(struct lmb_region *type, unsigned long region_nr)
--{
--	return type->region[region_nr].base >> PAGE_SHIFT;
--}
--static inline unsigned long
--lmb_end_pfn(struct lmb_region *type, unsigned long region_nr)
--{
--	return lmb_start_pfn(type, region_nr) +
--	       lmb_size_pages(type, region_nr);
--}
--
--#endif /* __KERNEL__ */
- #endif /* _ASM_POWERPC_LMB_H */
---- a/include/asm-powerpc/machdep.h
-+++ b/include/asm-powerpc/machdep.h
-@@ -68,6 +68,8 @@ struct machdep_calls {
- 				       unsigned long vflags,
- 				       int psize, int ssize);
- 	long		(*hpte_remove)(unsigned long hpte_group);
-+	void            (*hpte_removebolted)(unsigned long ea,
-+					     int psize, int ssize);
- 	void		(*flush_hash_range)(unsigned long number, int local);
- 
- 	/* special for kexec, to be called in real mode, linar mapping is
-@@ -196,9 +198,6 @@ struct machdep_calls {
- 	   May be NULL. */
- 	void		(*init)(void);
- 
--	void		(*setup_io_mappings)(void);
--
--	void		(*early_serial_map)(void);
- 	void		(*kgdb_map_scc)(void);
- 
- 	/*
---- a/include/asm-powerpc/macio.h
-+++ b/include/asm-powerpc/macio.h
-@@ -2,7 +2,7 @@
- #define __MACIO_ASIC_H__
- #ifdef __KERNEL__
- 
--#include <asm/of_device.h>
-+#include <linux/of_device.h>
- 
- extern struct bus_type macio_bus_type;
- 
---- a/include/asm-powerpc/mmu-40x.h
-+++ b/include/asm-powerpc/mmu-40x.h
-@@ -53,8 +53,6 @@
- 
- #ifndef __ASSEMBLY__
- 
--typedef unsigned long phys_addr_t;
--
- typedef struct {
- 	unsigned long id;
- 	unsigned long vdso_base;
---- a/include/asm-powerpc/mmu-44x.h
-+++ b/include/asm-powerpc/mmu-44x.h
-@@ -53,8 +53,6 @@
- 
- #ifndef __ASSEMBLY__
- 
--typedef unsigned long long phys_addr_t;
--
- typedef struct {
- 	unsigned long id;
- 	unsigned long vdso_base;
---- a/include/asm-powerpc/mmu-8xx.h
-+++ b/include/asm-powerpc/mmu-8xx.h
-@@ -136,8 +136,6 @@
- #define SPRN_M_TW	799
- 
- #ifndef __ASSEMBLY__
--typedef unsigned long phys_addr_t;
--
- typedef struct {
- 	unsigned long id;
- 	unsigned long vdso_base;
---- a/include/asm-powerpc/mmu-fsl-booke.h
-+++ b/include/asm-powerpc/mmu-fsl-booke.h
-@@ -73,12 +73,6 @@
- 
- #ifndef __ASSEMBLY__
- 
--#ifndef CONFIG_PHYS_64BIT
--typedef unsigned long phys_addr_t;
--#else
--typedef unsigned long long phys_addr_t;
--#endif
--
- typedef struct {
- 	unsigned long id;
- 	unsigned long vdso_base;
---- a/include/asm-powerpc/mmu-hash32.h
-+++ b/include/asm-powerpc/mmu-hash32.h
-@@ -84,8 +84,6 @@ typedef struct {
- 	unsigned long vdso_base;
- } mm_context_t;
- 
--typedef unsigned long phys_addr_t;
--
- #endif /* !__ASSEMBLY__ */
- 
- #endif /* _ASM_POWERPC_MMU_HASH32_H_ */
---- a/include/asm-powerpc/mmu-hash64.h
-+++ b/include/asm-powerpc/mmu-hash64.h
-@@ -469,9 +469,6 @@ static inline unsigned long get_vsid(uns
- 				 VSID_MODULUS_256M)
- #define KERNEL_VSID(ea)		VSID_SCRAMBLE(GET_ESID(ea))
- 
--/* Physical address used by some IO functions */
--typedef unsigned long phys_addr_t;
--
- #endif /* __ASSEMBLY__ */
- 
- #endif /* _ASM_POWERPC_MMU_HASH64_H_ */
---- a/include/asm-powerpc/paca.h
-+++ b/include/asm-powerpc/paca.h
-@@ -42,10 +42,7 @@ struct task_struct;
-  * Defines the layout of the paca.
-  *
-  * This structure is not directly accessed by firmware or the service
-- * processor except for the first two pointers that point to the
-- * lppaca area and the ItLpRegSave area for this CPU.  The lppaca
-- * object is currently contained within the PACA but it doesn't need
-- * to be.
-+ * processor.
-  */
- struct paca_struct {
- 	/*
-@@ -55,14 +52,7 @@ struct paca_struct {
- 	 * avoid cacheline bouncing.
- 	 */
- 
--	/*
--	 * MAGIC: These first two pointers can't be moved - they're
--	 * accessed by the firmware
--	 */
- 	struct lppaca *lppaca_ptr;	/* Pointer to LpPaca for PLIC */
--#ifdef CONFIG_PPC_ISERIES
--	void *reg_save_ptr; /* Pointer to LpRegSave for PLIC */
--#endif /* CONFIG_PPC_ISERIES */
- 
- 	/*
- 	 * MAGIC: the spinlock functions in arch/powerpc/lib/locks.c 
---- a/include/asm-powerpc/page.h
-+++ b/include/asm-powerpc/page.h
-@@ -53,6 +53,7 @@
- 
- #define PAGE_OFFSET     ASM_CONST(CONFIG_KERNEL_START)
- #define KERNELBASE      (PAGE_OFFSET + PHYSICAL_START)
-+#define LOAD_OFFSET	PAGE_OFFSET
- 
- #ifdef CONFIG_FLATMEM
- #define pfn_valid(pfn)		((pfn) < max_mapnr)
---- a/include/asm-powerpc/page_32.h
-+++ b/include/asm-powerpc/page_32.h
-@@ -3,8 +3,6 @@
- 
- #define VM_DATA_DEFAULT_FLAGS	VM_DATA_DEFAULT_FLAGS32
- 
--#define PPC_MEMSTART	0
--
- #ifdef CONFIG_NOT_COHERENT_CACHE
- #define ARCH_KMALLOC_MINALIGN	L1_CACHE_BYTES
- #endif
---- a/include/asm-powerpc/pasemi_dma.h
-+++ b/include/asm-powerpc/pasemi_dma.h
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (C) 2006 PA Semi, Inc
-+ * Copyright (C) 2006-2008 PA Semi, Inc
-  *
-  * Hardware register layout and descriptor formats for the on-board
-  * DMA engine on PA Semi PWRficient. Used by ethernet, function and security
-@@ -40,6 +40,11 @@ enum {
- 	PAS_DMA_COM_TXSTA = 0x104,	/* Transmit Status Register   */
- 	PAS_DMA_COM_RXCMD = 0x108,	/* Receive Command Register   */
- 	PAS_DMA_COM_RXSTA = 0x10c,	/* Receive Status Register    */
-+	PAS_DMA_COM_CFG   = 0x114,	/* Common config reg	      */
-+	PAS_DMA_TXF_SFLG0 = 0x140,	/* Set flags                  */
-+	PAS_DMA_TXF_SFLG1 = 0x144,	/* Set flags                  */
-+	PAS_DMA_TXF_CFLG0 = 0x148,	/* Set flags                  */
-+	PAS_DMA_TXF_CFLG1 = 0x14c,	/* Set flags                  */
- };
- 
- 
-@@ -123,11 +128,16 @@ enum {
- #define    PAS_DMA_TXCHAN_TCMDSTA_DA	0x00000100
- #define PAS_DMA_TXCHAN_CFG(c)     (0x304+(c)*_PAS_DMA_TXCHAN_STRIDE)
- #define    PAS_DMA_TXCHAN_CFG_TY_IFACE	0x00000000	/* Type = interface */
-+#define    PAS_DMA_TXCHAN_CFG_TY_COPY	0x00000001	/* Type = copy only */
-+#define    PAS_DMA_TXCHAN_CFG_TY_FUNC	0x00000002	/* Type = function */
-+#define    PAS_DMA_TXCHAN_CFG_TY_XOR	0x00000003	/* Type = xor only */
- #define    PAS_DMA_TXCHAN_CFG_TATTR_M	0x0000003c
- #define    PAS_DMA_TXCHAN_CFG_TATTR_S	2
- #define    PAS_DMA_TXCHAN_CFG_TATTR(x)	(((x) << PAS_DMA_TXCHAN_CFG_TATTR_S) & \
- 					 PAS_DMA_TXCHAN_CFG_TATTR_M)
--#define    PAS_DMA_TXCHAN_CFG_WT_M	0x000001c0
-+#define    PAS_DMA_TXCHAN_CFG_LPDQ	0x00000800
-+#define    PAS_DMA_TXCHAN_CFG_LPSQ	0x00000400
-+#define    PAS_DMA_TXCHAN_CFG_WT_M	0x000003c0
- #define    PAS_DMA_TXCHAN_CFG_WT_S	6
- #define    PAS_DMA_TXCHAN_CFG_WT(x)	(((x) << PAS_DMA_TXCHAN_CFG_WT_S) & \
- 					 PAS_DMA_TXCHAN_CFG_WT_M)
-@@ -394,11 +404,62 @@ enum {
- 				 XCT_COPY_LLEN_M)
- #define XCT_COPY_SE		0x0000000000000001ull
- 
-+/* Function descriptor fields */
-+#define XCT_FUN_T		0x8000000000000000ull
-+#define XCT_FUN_ST		0x4000000000000000ull
-+#define XCT_FUN_RR_M		0x3000000000000000ull
-+#define XCT_FUN_RR_NORES	0x0000000000000000ull
-+#define XCT_FUN_RR_8BRES	0x1000000000000000ull
-+#define XCT_FUN_RR_24BRES	0x2000000000000000ull
-+#define XCT_FUN_RR_40BRES	0x3000000000000000ull
-+#define XCT_FUN_I		0x0800000000000000ull
-+#define XCT_FUN_O		0x0400000000000000ull
-+#define XCT_FUN_E		0x0200000000000000ull
-+#define XCT_FUN_FUN_M		0x01c0000000000000ull
-+#define XCT_FUN_FUN_S		54
-+#define XCT_FUN_FUN(x)		((((long)(x)) << XCT_FUN_FUN_S) & XCT_FUN_FUN_M)
-+#define XCT_FUN_CRM_M		0x0038000000000000ull
-+#define XCT_FUN_CRM_NOP		0x0000000000000000ull
-+#define XCT_FUN_CRM_SIG		0x0008000000000000ull
-+#define XCT_FUN_LLEN_M		0x0007ffff00000000ull
-+#define XCT_FUN_LLEN_S		32
-+#define XCT_FUN_LLEN(x)		((((long)(x)) << XCT_FUN_LLEN_S) & XCT_FUN_LLEN_M)
-+#define XCT_FUN_SHL_M		0x00000000f8000000ull
-+#define XCT_FUN_SHL_S		27
-+#define XCT_FUN_SHL(x)		((((long)(x)) << XCT_FUN_SHL_S) & XCT_FUN_SHL_M)
-+#define XCT_FUN_CHL_M		0x0000000007c00000ull
-+#define XCT_FUN_HSZ_M		0x00000000003c0000ull
-+#define XCT_FUN_ALG_M		0x0000000000038000ull
-+#define XCT_FUN_HP		0x0000000000004000ull
-+#define XCT_FUN_BCM_M		0x0000000000003800ull
-+#define XCT_FUN_BCP_M		0x0000000000000600ull
-+#define XCT_FUN_SIG_M		0x00000000000001f0ull
-+#define XCT_FUN_SIG_TCP4	0x0000000000000140ull
-+#define XCT_FUN_SIG_TCP6	0x0000000000000150ull
-+#define XCT_FUN_SIG_UDP4	0x0000000000000160ull
-+#define XCT_FUN_SIG_UDP6	0x0000000000000170ull
-+#define XCT_FUN_A		0x0000000000000008ull
-+#define XCT_FUN_C		0x0000000000000004ull
-+#define XCT_FUN_AL2		0x0000000000000002ull
-+#define XCT_FUN_SE		0x0000000000000001ull
-+
-+/* Function descriptor 8byte result fields */
-+#define XCT_FUNRES_8B_CS_M	0x0000ffff00000000ull
-+#define XCT_FUNRES_8B_CS_S	32
-+#define XCT_FUNRES_8B_CRC_M	0x00000000ffffffffull
-+#define XCT_FUNRES_8B_CRC_S	0
-+
- /* Control descriptor fields */
- #define CTRL_CMD_T		0x8000000000000000ull
- #define CTRL_CMD_META_EVT	0x2000000000000000ull
- #define CTRL_CMD_O		0x0400000000000000ull
--#define CTRL_CMD_REG_M		0x000000000000000full
-+#define CTRL_CMD_ETYPE_M	0x0038000000000000ull
-+#define CTRL_CMD_ETYPE_EXT	0x0000000000000000ull
-+#define CTRL_CMD_ETYPE_WSET	0x0020000000000000ull
-+#define CTRL_CMD_ETYPE_WCLR	0x0028000000000000ull
-+#define CTRL_CMD_ETYPE_SET	0x0030000000000000ull
-+#define CTRL_CMD_ETYPE_CLR	0x0038000000000000ull
-+#define CTRL_CMD_REG_M		0x000000000000007full
- #define CTRL_CMD_REG_S		0
- #define CTRL_CMD_REG(x)		((((long)(x)) << CTRL_CMD_REG_S) & \
- 				 CTRL_CMD_REG_M)
-@@ -461,6 +522,16 @@ extern void *pasemi_dma_alloc_buf(struct
- extern void pasemi_dma_free_buf(struct pasemi_dmachan *chan, int size,
- 				dma_addr_t *handle);
- 
-+/* Routines to allocate flags (events) for channel syncronization */
-+extern int  pasemi_dma_alloc_flag(void);
-+extern void pasemi_dma_free_flag(int flag);
-+extern void pasemi_dma_set_flag(int flag);
-+extern void pasemi_dma_clear_flag(int flag);
-+
-+/* Routines to allocate function engines */
-+extern int  pasemi_dma_alloc_fun(void);
-+extern void pasemi_dma_free_fun(int fun);
-+
- /* Initialize the library, must be called before any other functions */
- extern int pasemi_dma_init(void);
- 
---- a/include/asm-powerpc/pci-bridge.h
-+++ b/include/asm-powerpc/pci-bridge.h
-@@ -117,7 +117,7 @@ struct pci_controller {
- 
- #ifndef CONFIG_PPC64
- 
--static inline struct pci_controller *pci_bus_to_host(struct pci_bus *bus)
-+static inline struct pci_controller *pci_bus_to_host(const struct pci_bus *bus)
- {
- 	return bus->sysdata;
- }
-@@ -235,7 +235,7 @@ extern void pcibios_fixup_new_pci_device
- 
- extern int pcibios_remove_root_bus(struct pci_controller *phb);
- 
--static inline struct pci_controller *pci_bus_to_host(struct pci_bus *bus)
-+static inline struct pci_controller *pci_bus_to_host(const struct pci_bus *bus)
- {
- 	struct device_node *busdn = bus->sysdata;
- 
---- a/include/asm-powerpc/pgtable-ppc32.h
-+++ b/include/asm-powerpc/pgtable-ppc32.h
-@@ -98,9 +98,6 @@ extern int icache_44x_need_flush;
- #define USER_PTRS_PER_PGD	(TASK_SIZE / PGDIR_SIZE)
- #define FIRST_USER_ADDRESS	0
- 
--#define USER_PGD_PTRS (PAGE_OFFSET >> PGDIR_SHIFT)
--#define KERNEL_PGD_PTRS (PTRS_PER_PGD-USER_PGD_PTRS)
--
- #define pte_ERROR(e) \
- 	printk("%s:%d: bad pte %llx.\n", __FILE__, __LINE__, \
- 		(unsigned long long)pte_val(e))
-@@ -420,7 +417,8 @@ extern int icache_44x_need_flush;
- #define _PAGE_IO	(_PAGE_KERNEL | _PAGE_NO_CACHE | _PAGE_GUARDED)
- #define _PAGE_RAM	(_PAGE_KERNEL | _PAGE_HWEXEC)
- 
--#if defined(CONFIG_KGDB) || defined(CONFIG_XMON) || defined(CONFIG_BDI_SWITCH)
-+#if defined(CONFIG_KGDB) || defined(CONFIG_XMON) || defined(CONFIG_BDI_SWITCH) ||\
-+	defined(CONFIG_KPROBES)
- /* We want the debuggers to be able to set breakpoints anywhere, so
-  * don't write protect the kernel text */
- #define _PAGE_RAM_TEXT	_PAGE_RAM
-@@ -692,7 +690,7 @@ extern pgprot_t phys_mem_access_prot(str
- #define pmd_page_vaddr(pmd)	\
- 	((unsigned long) (pmd_val(pmd) & PAGE_MASK))
- #define pmd_page(pmd)		\
--	(mem_map + (__pa(pmd_val(pmd)) >> PAGE_SHIFT))
-+	pfn_to_page((__pa(pmd_val(pmd)) >> PAGE_SHIFT))
- #endif
- 
- /* to find an entry in a kernel page-table-directory */
---- /dev/null
-+++ b/include/asm-powerpc/phyp_dump.h
-@@ -0,0 +1,47 @@
-+/*
-+ * Hypervisor-assisted dump
-+ *
-+ * Linas Vepstas, Manish Ahuja 2008
-+ * Copyright 2008 IBM Corp.
-+ *
-+ *      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.
-+ */
-+
-+#ifndef _PPC64_PHYP_DUMP_H
-+#define _PPC64_PHYP_DUMP_H
-+
-+#ifdef CONFIG_PHYP_DUMP
-+
-+/* The RMR region will be saved for later dumping
-+ * whenever the kernel crashes. Set this to 256MB. */
-+#define PHYP_DUMP_RMR_START 0x0
-+#define PHYP_DUMP_RMR_END   (1UL<<28)
-+
-+struct phyp_dump {
-+	/* Memory that is reserved during very early boot. */
-+	unsigned long init_reserve_start;
-+	unsigned long init_reserve_size;
-+	/* cmd line options during boot */
-+	unsigned long reserve_bootvar;
-+	unsigned long phyp_dump_at_boot;
-+	/* Check status during boot if dump supported, active & present*/
-+	unsigned long phyp_dump_configured;
-+	unsigned long phyp_dump_is_active;
-+	/* store cpu & hpte size */
-+	unsigned long cpu_state_size;
-+	unsigned long hpte_region_size;
-+	/* previous scratch area values */
-+	unsigned long reserved_scratch_addr;
-+	unsigned long reserved_scratch_size;
-+};
-+
-+extern struct phyp_dump *phyp_dump_info;
-+
-+int early_init_dt_scan_phyp_dump(unsigned long node,
-+		const char *uname, int depth, void *data);
-+
-+#endif /* CONFIG_PHYP_DUMP */
-+#endif /* _PPC64_PHYP_DUMP_H */
---- a/include/asm-powerpc/pmi.h
-+++ b/include/asm-powerpc/pmi.h
-@@ -29,8 +29,6 @@
- 
- #ifdef __KERNEL__
- 
--#include <asm/of_device.h>
--
- #define PMI_TYPE_FREQ_CHANGE	0x01
- #define PMI_READ_TYPE		0
- #define PMI_READ_DATA0		1
---- /dev/null
-+++ b/include/asm-powerpc/ppc4xx.h
-@@ -0,0 +1,18 @@
-+/*
-+ * PPC4xx Prototypes and definitions
-+ *
-+ * Copyright 2008 DENX Software Engineering, Stefan Roese <sr@denx.de>
-+ *
-+ * This 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.
-+ *
-+ */
-+
-+#ifndef __ASM_POWERPC_PPC4xx_H__
-+#define __ASM_POWERPC_PPC4xx_H__
-+
-+extern void ppc4xx_reset_system(char *cmd);
-+
-+#endif /* __ASM_POWERPC_PPC4xx_H__ */
---- a/include/asm-powerpc/ps3.h
-+++ b/include/asm-powerpc/ps3.h
-@@ -434,8 +434,11 @@ struct ps3_sys_manager_ops {
- };
- 
- void ps3_sys_manager_register_ops(const struct ps3_sys_manager_ops *ops);
--void ps3_sys_manager_power_off(void);
--void ps3_sys_manager_restart(void);
-+void __noreturn ps3_sys_manager_power_off(void);
-+void __noreturn ps3_sys_manager_restart(void);
-+void __noreturn ps3_sys_manager_halt(void);
-+int ps3_sys_manager_get_wol(void);
-+void ps3_sys_manager_set_wol(int state);
- 
- struct ps3_prealloc {
-     const char *name;
---- a/include/asm-powerpc/ptrace.h
-+++ b/include/asm-powerpc/ptrace.h
-@@ -58,6 +58,11 @@ struct pt_regs {
- #define __ARCH_WANT_COMPAT_SYS_PTRACE
- 
- #define STACK_FRAME_OVERHEAD	112	/* size of minimum stack frame */
-+#define STACK_FRAME_LR_SAVE	2	/* Location of LR in stack frame */
-+#define STACK_FRAME_REGS_MARKER	ASM_CONST(0x7265677368657265)
-+#define STACK_INT_FRAME_SIZE	(sizeof(struct pt_regs) + \
-+					STACK_FRAME_OVERHEAD + 288)
-+#define STACK_FRAME_MARKER	12
- 
- /* Size of dummy stack frame allocated when calling signal handler. */
- #define __SIGNAL_FRAMESIZE	128
-@@ -66,6 +71,10 @@ struct pt_regs {
- #else /* __powerpc64__ */
- 
- #define STACK_FRAME_OVERHEAD	16	/* size of minimum stack frame */
-+#define STACK_FRAME_LR_SAVE	1	/* Location of LR in stack frame */
-+#define STACK_FRAME_REGS_MARKER	ASM_CONST(0x72656773)
-+#define STACK_INT_FRAME_SIZE	(sizeof(struct pt_regs) + STACK_FRAME_OVERHEAD)
-+#define STACK_FRAME_MARKER	2
- 
- /* Size of stack frame allocated when calling signal handler. */
- #define __SIGNAL_FRAMESIZE	64
---- a/include/asm-powerpc/qe.h
-+++ b/include/asm-powerpc/qe.h
-@@ -85,6 +85,7 @@ extern int par_io_data_set(u8 port, u8 p
- /* QE internal API */
- int qe_issue_cmd(u32 cmd, u32 device, u8 mcn_protocol, u32 cmd_input);
- enum qe_clock qe_clock_source(const char *source);
-+unsigned int qe_get_brg_clk(void);
- int qe_setbrg(enum qe_clock brg, unsigned int rate, unsigned int multiplier);
- int qe_get_snum(void);
- void qe_put_snum(u8 snum);
-@@ -92,7 +93,16 @@ unsigned long qe_muram_alloc(int size, i
- int qe_muram_free(unsigned long offset);
- unsigned long qe_muram_alloc_fixed(unsigned long offset, int size);
- void qe_muram_dump(void);
--void *qe_muram_addr(unsigned long offset);
-+
-+static inline void __iomem *qe_muram_addr(unsigned long offset)
-+{
-+	return (void __iomem *)&qe_immr->muram[offset];
-+}
-+
-+static inline unsigned long qe_muram_offset(void __iomem *addr)
-+{
-+	return addr - (void __iomem *)qe_immr->muram;
-+}
- 
- /* Structure that defines QE firmware binary files.
-  *
---- a/include/asm-powerpc/rwsem.h
-+++ b/include/asm-powerpc/rwsem.h
-@@ -32,11 +32,20 @@ struct rw_semaphore {
- #define RWSEM_ACTIVE_WRITE_BIAS		(RWSEM_WAITING_BIAS + RWSEM_ACTIVE_BIAS)
- 	spinlock_t		wait_lock;
- 	struct list_head	wait_list;
-+#ifdef CONFIG_DEBUG_LOCK_ALLOC
-+	struct lockdep_map	dep_map;
-+#endif
- };
- 
-+#ifdef CONFIG_DEBUG_LOCK_ALLOC
-+# define __RWSEM_DEP_MAP_INIT(lockname) , .dep_map = { .name = #lockname }
-+#else
-+# define __RWSEM_DEP_MAP_INIT(lockname)
-+#endif
-+
- #define __RWSEM_INITIALIZER(name) \
--	{ RWSEM_UNLOCKED_VALUE, SPIN_LOCK_UNLOCKED, \
--	  LIST_HEAD_INIT((name).wait_list) }
-+	{ RWSEM_UNLOCKED_VALUE, __SPIN_LOCK_UNLOCKED((name).wait_lock), \
-+	  LIST_HEAD_INIT((name).wait_list) __RWSEM_DEP_MAP_INIT(name) }
- 
- #define DECLARE_RWSEM(name)		\
- 	struct rw_semaphore name = __RWSEM_INITIALIZER(name)
-@@ -46,12 +55,15 @@ extern struct rw_semaphore *rwsem_down_w
- extern struct rw_semaphore *rwsem_wake(struct rw_semaphore *sem);
- extern struct rw_semaphore *rwsem_downgrade_wake(struct rw_semaphore *sem);
- 
--static inline void init_rwsem(struct rw_semaphore *sem)
--{
--	sem->count = RWSEM_UNLOCKED_VALUE;
--	spin_lock_init(&sem->wait_lock);
--	INIT_LIST_HEAD(&sem->wait_list);
--}
-+extern void __init_rwsem(struct rw_semaphore *sem, const char *name,
-+			 struct lock_class_key *key);
-+
-+#define init_rwsem(sem)					\
-+	do {						\
-+		static struct lock_class_key __key;	\
-+							\
-+		__init_rwsem((sem), #sem, &__key);	\
-+	} while (0)
- 
- /*
-  * lock for reading
-@@ -78,7 +90,7 @@ static inline int __down_read_trylock(st
- /*
-  * lock for writing
-  */
--static inline void __down_write(struct rw_semaphore *sem)
-+static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
- {
- 	int tmp;
- 
-@@ -88,6 +100,11 @@ static inline void __down_write(struct r
- 		rwsem_down_write_failed(sem);
- }
- 
-+static inline void __down_write(struct rw_semaphore *sem)
-+{
-+	__down_write_nested(sem, 0);
-+}
-+
- static inline int __down_write_trylock(struct rw_semaphore *sem)
- {
- 	int tmp;
---- a/include/asm-powerpc/sparsemem.h
-+++ b/include/asm-powerpc/sparsemem.h
-@@ -15,6 +15,7 @@
- 
- #ifdef CONFIG_MEMORY_HOTPLUG
- extern void create_section_mapping(unsigned long start, unsigned long end);
-+extern int remove_section_mapping(unsigned long start, unsigned long end);
- #ifdef CONFIG_NUMA
- extern int hot_add_scn_to_nid(unsigned long scn_addr);
- #else
---- a/include/asm-powerpc/spinlock.h
-+++ b/include/asm-powerpc/spinlock.h
-@@ -19,6 +19,7 @@
-  *
-  * (the type definitions are in asm/spinlock_types.h)
-  */
-+#include <linux/irqflags.h>
- #ifdef CONFIG_PPC64
- #include <asm/paca.h>
- #include <asm/hvcall.h>
---- a/include/asm-powerpc/string.h
-+++ b/include/asm-powerpc/string.h
-@@ -7,6 +7,7 @@
- #define __HAVE_ARCH_STRNCPY
- #define __HAVE_ARCH_STRLEN
- #define __HAVE_ARCH_STRCMP
-+#define __HAVE_ARCH_STRNCMP
- #define __HAVE_ARCH_STRCAT
- #define __HAVE_ARCH_MEMSET
- #define __HAVE_ARCH_MEMCPY
-@@ -18,6 +19,7 @@ extern char * strcpy(char *,const char *
- extern char * strncpy(char *,const char *, __kernel_size_t);
- extern __kernel_size_t strlen(const char *);
- extern int strcmp(const char *,const char *);
-+extern int strncmp(const char *, const char *, __kernel_size_t);
- extern char * strcat(char *, const char *);
- extern void * memset(void *,int,__kernel_size_t);
- extern void * memcpy(void *,const void *,__kernel_size_t);
---- a/include/asm-powerpc/types.h
-+++ b/include/asm-powerpc/types.h
-@@ -84,6 +84,13 @@ typedef unsigned long long u64;
- 
- typedef __vector128 vector128;
- 
-+/* Physical address used by some IO functions */
-+#if defined(CONFIG_PPC64) || defined(CONFIG_PHYS_64BIT)
-+typedef u64 phys_addr_t;
-+#else
-+typedef u32 phys_addr_t;
-+#endif
-+
- #ifdef __powerpc64__
- typedef u64 dma_addr_t;
- #else
---- /dev/null
-+++ b/include/asm-sparc64/lmb.h
-@@ -0,0 +1,10 @@
-+#ifndef _SPARC64_LMB_H
-+#define _SPARC64_LMB_H
-+
-+#include <asm/oplib.h>
-+
-+#define LMB_DBG(fmt...) prom_printf(fmt)
-+
-+#define LMB_REAL_LIMIT	0
-+
-+#endif /* !(_SPARC64_LMB_H) */
---- /dev/null
-+++ b/include/linux/lmb.h
-@@ -0,0 +1,85 @@
-+#ifndef _LINUX_LMB_H
-+#define _LINUX_LMB_H
-+#ifdef __KERNEL__
-+
-+/*
-+ * Logical memory blocks.
-+ *
-+ * Copyright (C) 2001 Peter Bergner, IBM Corp.
-+ *
-+ * 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/init.h>
-+#include <linux/mm.h>
-+
-+#define MAX_LMB_REGIONS 128
-+
-+struct lmb_property {
-+	u64 base;
-+	u64 size;
-+};
-+
-+struct lmb_region {
-+	unsigned long cnt;
-+	u64 size;
-+	struct lmb_property region[MAX_LMB_REGIONS+1];
-+};
-+
-+struct lmb {
-+	unsigned long debug;
-+	u64 rmo_size;
-+	struct lmb_region memory;
-+	struct lmb_region reserved;
-+};
-+
-+extern struct lmb lmb;
-+
-+extern void __init lmb_init(void);
-+extern void __init lmb_analyze(void);
-+extern long __init lmb_add(u64 base, u64 size);
-+extern long __init lmb_reserve(u64 base, u64 size);
-+extern u64 __init lmb_alloc_nid(u64 size, u64 align, int nid,
-+				u64 (*nid_range)(u64, u64, int *));
-+extern u64 __init lmb_alloc(u64 size, u64 align);
-+extern u64 __init lmb_alloc_base(u64 size,
-+		u64, u64 max_addr);
-+extern u64 __init __lmb_alloc_base(u64 size,
-+		u64 align, u64 max_addr);
-+extern u64 __init lmb_phys_mem_size(void);
-+extern u64 __init lmb_end_of_DRAM(void);
-+extern void __init lmb_enforce_memory_limit(u64 memory_limit);
-+extern int __init lmb_is_reserved(u64 addr);
-+
-+extern void lmb_dump_all(void);
-+
-+static inline u64
-+lmb_size_bytes(struct lmb_region *type, unsigned long region_nr)
-+{
-+	return type->region[region_nr].size;
-+}
-+static inline u64
-+lmb_size_pages(struct lmb_region *type, unsigned long region_nr)
-+{
-+	return lmb_size_bytes(type, region_nr) >> PAGE_SHIFT;
-+}
-+static inline u64
-+lmb_start_pfn(struct lmb_region *type, unsigned long region_nr)
-+{
-+	return type->region[region_nr].base >> PAGE_SHIFT;
-+}
-+static inline u64
-+lmb_end_pfn(struct lmb_region *type, unsigned long region_nr)
-+{
-+	return lmb_start_pfn(type, region_nr) +
-+	       lmb_size_pages(type, region_nr);
-+}
-+
-+#include <asm/lmb.h>
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _LINUX_LMB_H */
---- a/include/linux/of.h
-+++ b/include/linux/of.h
-@@ -62,6 +62,7 @@ extern struct property *of_find_property
- 					 int *lenp);
- extern int of_device_is_compatible(const struct device_node *device,
- 				   const char *);
-+extern int of_device_is_available(const struct device_node *device);
- extern const void *of_get_property(const struct device_node *node,
- 				const char *name,
- 				int *lenp);
---- /dev/null
-+++ b/include/linux/of_gpio.h
-@@ -0,0 +1,69 @@
-+/*
-+ * OF helpers for the GPIO API
-+ *
-+ * Copyright (c) 2007-2008  MontaVista Software, Inc.
-+ *
-+ * Author: Anton Vorontsov <avorontsov@ru.mvista.com>
-+ *
-+ * 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.
-+ */
-+
-+#ifndef __LINUX_OF_GPIO_H
-+#define __LINUX_OF_GPIO_H
-+
-+#include <linux/errno.h>
-+#include <asm/gpio.h>
-+
-+#ifdef CONFIG_OF_GPIO
-+
-+/*
-+ * Generic OF GPIO chip
-+ */
-+struct of_gpio_chip {
-+	struct gpio_chip gc;
-+	int gpio_cells;
-+	int (*xlate)(struct of_gpio_chip *of_gc, struct device_node *np,
-+		     const void *gpio_spec);
-+};
-+
-+static inline struct of_gpio_chip *to_of_gpio_chip(struct gpio_chip *gc)
-+{
-+	return container_of(gc, struct of_gpio_chip, gc);
-+}
-+
-+/*
-+ * OF GPIO chip for memory mapped banks
-+ */
-+struct of_mm_gpio_chip {
-+	struct of_gpio_chip of_gc;
-+	void (*save_regs)(struct of_mm_gpio_chip *mm_gc);
-+	void __iomem *regs;
-+};
-+
-+static inline struct of_mm_gpio_chip *to_of_mm_gpio_chip(struct gpio_chip *gc)
-+{
-+	struct of_gpio_chip *of_gc = to_of_gpio_chip(gc);
-+
-+	return container_of(of_gc, struct of_mm_gpio_chip, of_gc);
-+}
-+
-+extern int of_get_gpio(struct device_node *np, int index);
-+extern int of_mm_gpiochip_add(struct device_node *np,
-+			      struct of_mm_gpio_chip *mm_gc);
-+extern int of_gpio_simple_xlate(struct of_gpio_chip *of_gc,
-+				struct device_node *np,
-+				const void *gpio_spec);
-+#else
-+
-+/* Drivers may not strictly depend on the GPIO support, so let them link. */
-+static inline int of_get_gpio(struct device_node *np, int index)
-+{
-+	return -ENOSYS;
-+}
-+
-+#endif /* CONFIG_OF_GPIO */
-+
-+#endif /* __LINUX_OF_GPIO_H */
---- /dev/null
-+++ b/include/linux/of_i2c.h
-@@ -0,0 +1,24 @@
-+/*
-+ * Generic I2C API implementation for PowerPC.
-+ *
-+ * Copyright (c) 2008 Jochen Friedrich <jochen@scram.de>
-+ *
-+ * 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.
-+ */
-+
-+#ifndef __LINUX_OF_I2C_H
-+#define __LINUX_OF_I2C_H
-+
-+#include <linux/i2c.h>
-+
-+#ifdef CONFIG_OF_I2C
-+
-+void of_register_i2c_devices(struct i2c_adapter *adap,
-+			     struct device_node *adap_node);
-+
-+#endif /* CONFIG_OF_I2C */
-+
-+#endif /* __LINUX_OF_I2C_H */
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -141,4 +141,7 @@ config HAS_DMA
- config CHECK_SIGNATURE
- 	bool
- 
-+config HAVE_LMB
-+	boolean
-+
- endmenu
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -70,6 +70,8 @@ obj-$(CONFIG_FAULT_INJECTION) += fault-i
- 
- lib-$(CONFIG_GENERIC_BUG) += bug.o
- 
-+obj-$(CONFIG_HAVE_LMB) += lmb.o
-+
- hostprogs-y	:= gen_crc32table
- clean-files	:= crc32table.h
- 
---- /dev/null
-+++ b/lib/lmb.c
-@@ -0,0 +1,428 @@
-+/*
-+ * Procedures for maintaining information about logical memory blocks.
-+ *
-+ * Peter Bergner, IBM Corp.	June 2001.
-+ * Copyright (C) 2001 Peter Bergner.
-+ *
-+ *      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/kernel.h>
-+#include <linux/init.h>
-+#include <linux/bitops.h>
-+#include <linux/lmb.h>
-+
-+#define LMB_ALLOC_ANYWHERE	0
-+
-+struct lmb lmb;
-+
-+void lmb_dump_all(void)
-+{
-+#ifdef DEBUG
-+	unsigned long i;
-+
-+	pr_debug("lmb_dump_all:\n");
-+	pr_debug("    memory.cnt		  = 0x%lx\n", lmb.memory.cnt);
-+	pr_debug("    memory.size		  = 0x%llx\n",
-+	    (unsigned long long)lmb.memory.size);
-+	for (i=0; i < lmb.memory.cnt ;i++) {
-+		pr_debug("    memory.region[0x%x].base       = 0x%llx\n",
-+		    i, (unsigned long long)lmb.memory.region[i].base);
-+		pr_debug("		      .size     = 0x%llx\n",
-+		    (unsigned long long)lmb.memory.region[i].size);
-+	}
-+
-+	pr_debug("    reserved.cnt	  = 0x%lx\n", lmb.reserved.cnt);
-+	pr_debug("    reserved.size	  = 0x%lx\n", lmb.reserved.size);
-+	for (i=0; i < lmb.reserved.cnt ;i++) {
-+		pr_debug("    reserved.region[0x%x].base       = 0x%llx\n",
-+		    i, (unsigned long long)lmb.reserved.region[i].base);
-+		pr_debug("		      .size     = 0x%llx\n",
-+		    (unsigned long long)lmb.reserved.region[i].size);
-+	}
-+#endif /* DEBUG */
-+}
-+
-+static unsigned long __init lmb_addrs_overlap(u64 base1, u64 size1,
-+		u64 base2, u64 size2)
-+{
-+	return ((base1 < (base2 + size2)) && (base2 < (base1 + size1)));
-+}
-+
-+static long __init lmb_addrs_adjacent(u64 base1, u64 size1,
-+		u64 base2, u64 size2)
-+{
-+	if (base2 == base1 + size1)
-+		return 1;
-+	else if (base1 == base2 + size2)
-+		return -1;
-+
-+	return 0;
-+}
-+
-+static long __init lmb_regions_adjacent(struct lmb_region *rgn,
-+		unsigned long r1, unsigned long r2)
-+{
-+	u64 base1 = rgn->region[r1].base;
-+	u64 size1 = rgn->region[r1].size;
-+	u64 base2 = rgn->region[r2].base;
-+	u64 size2 = rgn->region[r2].size;
-+
-+	return lmb_addrs_adjacent(base1, size1, base2, size2);
-+}
-+
-+static void __init lmb_remove_region(struct lmb_region *rgn, unsigned long r)
-+{
-+	unsigned long i;
-+
-+	for (i = r; i < rgn->cnt - 1; i++) {
-+		rgn->region[i].base = rgn->region[i + 1].base;
-+		rgn->region[i].size = rgn->region[i + 1].size;
-+	}
-+	rgn->cnt--;
-+}
-+
-+/* Assumption: base addr of region 1 < base addr of region 2 */
-+static void __init lmb_coalesce_regions(struct lmb_region *rgn,
-+		unsigned long r1, unsigned long r2)
-+{
-+	rgn->region[r1].size += rgn->region[r2].size;
-+	lmb_remove_region(rgn, r2);
-+}
-+
-+void __init lmb_init(void)
-+{
-+	/* Create a dummy zero size LMB which will get coalesced away later.
-+	 * This simplifies the lmb_add() code below...
-+	 */
-+	lmb.memory.region[0].base = 0;
-+	lmb.memory.region[0].size = 0;
-+	lmb.memory.cnt = 1;
-+
-+	/* Ditto. */
-+	lmb.reserved.region[0].base = 0;
-+	lmb.reserved.region[0].size = 0;
-+	lmb.reserved.cnt = 1;
-+}
-+
-+void __init lmb_analyze(void)
-+{
-+	int i;
-+
-+	lmb.memory.size = 0;
-+
-+	for (i = 0; i < lmb.memory.cnt; i++)
-+		lmb.memory.size += lmb.memory.region[i].size;
-+}
-+
-+static long __init lmb_add_region(struct lmb_region *rgn, u64 base, u64 size)
-+{
-+	unsigned long coalesced = 0;
-+	long adjacent, i;
-+
-+	if ((rgn->cnt == 1) && (rgn->region[0].size == 0)) {
-+		rgn->region[0].base = base;
-+		rgn->region[0].size = size;
-+		return 0;
-+	}
-+
-+	/* First try and coalesce this LMB with another. */
-+	for (i = 0; i < rgn->cnt; i++) {
-+		u64 rgnbase = rgn->region[i].base;
-+		u64 rgnsize = rgn->region[i].size;
-+
-+		if ((rgnbase == base) && (rgnsize == size))
-+			/* Already have this region, so we're done */
-+			return 0;
-+
-+		adjacent = lmb_addrs_adjacent(base, size, rgnbase, rgnsize);
-+		if (adjacent > 0) {
-+			rgn->region[i].base -= size;
-+			rgn->region[i].size += size;
-+			coalesced++;
-+			break;
-+		} else if (adjacent < 0) {
-+			rgn->region[i].size += size;
-+			coalesced++;
-+			break;
-+		}
-+	}
-+
-+	if ((i < rgn->cnt - 1) && lmb_regions_adjacent(rgn, i, i+1)) {
-+		lmb_coalesce_regions(rgn, i, i+1);
-+		coalesced++;
-+	}
-+
-+	if (coalesced)
-+		return coalesced;
-+	if (rgn->cnt >= MAX_LMB_REGIONS)
-+		return -1;
-+
-+	/* Couldn't coalesce the LMB, so add it to the sorted table. */
-+	for (i = rgn->cnt - 1; i >= 0; i--) {
-+		if (base < rgn->region[i].base) {
-+			rgn->region[i+1].base = rgn->region[i].base;
-+			rgn->region[i+1].size = rgn->region[i].size;
-+		} else {
-+			rgn->region[i+1].base = base;
-+			rgn->region[i+1].size = size;
-+			break;
-+		}
-+	}
-+
-+	if (base < rgn->region[0].base) {
-+		rgn->region[0].base = base;
-+		rgn->region[0].size = size;
-+	}
-+	rgn->cnt++;
-+
-+	return 0;
-+}
-+
-+long __init lmb_add(u64 base, u64 size)
-+{
-+	struct lmb_region *_rgn = &lmb.memory;
-+
-+	/* On pSeries LPAR systems, the first LMB is our RMO region. */
-+	if (base == 0)
-+		lmb.rmo_size = size;
-+
-+	return lmb_add_region(_rgn, base, size);
-+
-+}
-+
-+long __init lmb_reserve(u64 base, u64 size)
-+{
-+	struct lmb_region *_rgn = &lmb.reserved;
-+
-+	BUG_ON(0 == size);
-+
-+	return lmb_add_region(_rgn, base, size);
-+}
-+
-+long __init lmb_overlaps_region(struct lmb_region *rgn, u64 base, u64 size)
-+{
-+	unsigned long i;
-+
-+	for (i = 0; i < rgn->cnt; i++) {
-+		u64 rgnbase = rgn->region[i].base;
-+		u64 rgnsize = rgn->region[i].size;
-+		if (lmb_addrs_overlap(base, size, rgnbase, rgnsize))
-+			break;
-+	}
-+
-+	return (i < rgn->cnt) ? i : -1;
-+}
-+
-+static u64 lmb_align_down(u64 addr, u64 size)
-+{
-+	return addr & ~(size - 1);
-+}
-+
-+static u64 lmb_align_up(u64 addr, u64 size)
-+{
-+	return (addr + (size - 1)) & ~(size - 1);
-+}
-+
-+static u64 __init lmb_alloc_nid_unreserved(u64 start, u64 end,
-+					   u64 size, u64 align)
-+{
-+	u64 base, res_base;
-+	long j;
-+
-+	base = lmb_align_down((end - size), align);
-+	while (start <= base) {
-+		j = lmb_overlaps_region(&lmb.reserved, base, size);
-+		if (j < 0) {
-+			/* this area isn't reserved, take it */
-+			if (lmb_add_region(&lmb.reserved, base,
-+					   lmb_align_up(size, align)) < 0)
-+				base = ~(u64)0;
-+			return base;
-+		}
-+		res_base = lmb.reserved.region[j].base;
-+		if (res_base < size)
-+			break;
-+		base = lmb_align_down(res_base - size, align);
-+	}
-+
-+	return ~(u64)0;
-+}
-+
-+static u64 __init lmb_alloc_nid_region(struct lmb_property *mp,
-+				       u64 (*nid_range)(u64, u64, int *),
-+				       u64 size, u64 align, int nid)
-+{
-+	u64 start, end;
-+
-+	start = mp->base;
-+	end = start + mp->size;
-+
-+	start = lmb_align_up(start, align);
-+	while (start < end) {
-+		u64 this_end;
-+		int this_nid;
-+
-+		this_end = nid_range(start, end, &this_nid);
-+		if (this_nid == nid) {
-+			u64 ret = lmb_alloc_nid_unreserved(start, this_end,
-+							   size, align);
-+			if (ret != ~(u64)0)
-+				return ret;
-+		}
-+		start = this_end;
-+	}
-+
-+	return ~(u64)0;
-+}
-+
-+u64 __init lmb_alloc_nid(u64 size, u64 align, int nid,
-+			 u64 (*nid_range)(u64 start, u64 end, int *nid))
-+{
-+	struct lmb_region *mem = &lmb.memory;
-+	int i;
-+
-+	for (i = 0; i < mem->cnt; i++) {
-+		u64 ret = lmb_alloc_nid_region(&mem->region[i],
-+					       nid_range,
-+					       size, align, nid);
-+		if (ret != ~(u64)0)
-+			return ret;
-+	}
-+
-+	return lmb_alloc(size, align);
-+}
-+
-+u64 __init lmb_alloc(u64 size, u64 align)
-+{
-+	return lmb_alloc_base(size, align, LMB_ALLOC_ANYWHERE);
-+}
-+
-+u64 __init lmb_alloc_base(u64 size, u64 align, u64 max_addr)
-+{
-+	u64 alloc;
-+
-+	alloc = __lmb_alloc_base(size, align, max_addr);
-+
-+	if (alloc == 0)
-+		panic("ERROR: Failed to allocate 0x%llx bytes below 0x%llx.\n",
-+		      (unsigned long long) size, (unsigned long long) max_addr);
-+
-+	return alloc;
-+}
-+
-+u64 __init __lmb_alloc_base(u64 size, u64 align, u64 max_addr)
-+{
-+	long i, j;
-+	u64 base = 0;
-+	u64 res_base;
-+
-+	BUG_ON(0 == size);
-+
-+	/* On some platforms, make sure we allocate lowmem */
-+	/* Note that LMB_REAL_LIMIT may be LMB_ALLOC_ANYWHERE */
-+	if (max_addr == LMB_ALLOC_ANYWHERE)
-+		max_addr = LMB_REAL_LIMIT;
-+
-+	for (i = lmb.memory.cnt - 1; i >= 0; i--) {
-+		u64 lmbbase = lmb.memory.region[i].base;
-+		u64 lmbsize = lmb.memory.region[i].size;
-+
-+		if (lmbsize < size)
-+			continue;
-+		if (max_addr == LMB_ALLOC_ANYWHERE)
-+			base = lmb_align_down(lmbbase + lmbsize - size, align);
-+		else if (lmbbase < max_addr) {
-+			base = min(lmbbase + lmbsize, max_addr);
-+			base = lmb_align_down(base - size, align);
-+		} else
-+			continue;
-+
-+		while (base && lmbbase <= base) {
-+			j = lmb_overlaps_region(&lmb.reserved, base, size);
-+			if (j < 0) {
-+				/* this area isn't reserved, take it */
-+				if (lmb_add_region(&lmb.reserved, base,
-+						   size) < 0)
-+					return 0;
-+				return base;
-+			}
-+			res_base = lmb.reserved.region[j].base;
-+			if (res_base < size)
-+				break;
-+			base = lmb_align_down(res_base - size, align);
-+		}
-+	}
-+	return 0;
-+}
-+
-+/* You must call lmb_analyze() before this. */
-+u64 __init lmb_phys_mem_size(void)
-+{
-+	return lmb.memory.size;
-+}
-+
-+u64 __init lmb_end_of_DRAM(void)
-+{
-+	int idx = lmb.memory.cnt - 1;
-+
-+	return (lmb.memory.region[idx].base + lmb.memory.region[idx].size);
-+}
-+
-+/* You must call lmb_analyze() after this. */
-+void __init lmb_enforce_memory_limit(u64 memory_limit)
-+{
-+	unsigned long i;
-+	u64 limit;
-+	struct lmb_property *p;
-+
-+	if (!memory_limit)
-+		return;
-+
-+	/* Truncate the lmb regions to satisfy the memory limit. */
-+	limit = memory_limit;
-+	for (i = 0; i < lmb.memory.cnt; i++) {
-+		if (limit > lmb.memory.region[i].size) {
-+			limit -= lmb.memory.region[i].size;
-+			continue;
-+		}
-+
-+		lmb.memory.region[i].size = limit;
-+		lmb.memory.cnt = i + 1;
-+		break;
-+	}
-+
-+	if (lmb.memory.region[0].size < lmb.rmo_size)
-+		lmb.rmo_size = lmb.memory.region[0].size;
-+
-+	/* And truncate any reserves above the limit also. */
-+	for (i = 0; i < lmb.reserved.cnt; i++) {
-+		p = &lmb.reserved.region[i];
-+
-+		if (p->base > memory_limit)
-+			p->size = 0;
-+		else if ((p->base + p->size) > memory_limit)
-+			p->size = memory_limit - p->base;
-+
-+		if (p->size == 0) {
-+			lmb_remove_region(&lmb.reserved, i);
-+			i--;
-+		}
-+	}
-+}
-+
-+int __init lmb_is_reserved(u64 addr)
-+{
-+	int i;
-+
-+	for (i = 0; i < lmb.reserved.cnt; i++) {
-+		u64 upper = lmb.reserved.region[i].base +
-+			lmb.reserved.region[i].size - 1;
-+		if ((addr >= lmb.reserved.region[i].base) && (addr <= upper))
-+			return 1;
-+	}
-+	return 0;
-+}
diff --git a/target/linux/generic-2.6/patches-2.6.25/801-usb_serial_endpoint_size.patch b/target/linux/generic-2.6/patches-2.6.25/801-usb_serial_endpoint_size.patch
deleted file mode 100644
index 395495ab1..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/801-usb_serial_endpoint_size.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/drivers/usb/serial/usb-serial.c
-+++ b/drivers/usb/serial/usb-serial.c
-@@ -58,6 +58,7 @@ static struct usb_driver usb_serial_driv
-    drivers depend on it.
- */
- 
-+static ushort maxSize = 0;
- static int debug;
- static struct usb_serial *serial_table[SERIAL_TTY_MINORS];	/* initially all NULL */
- static DEFINE_MUTEX(table_lock);
-@@ -903,7 +904,7 @@ int usb_serial_probe(struct usb_interfac
- 			dev_err(&interface->dev, "No free urbs available\n");
- 			goto probe_error;
- 		}
--		buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
-+		buffer_size = (endpoint->wMaxPacketSize > maxSize) ? endpoint->wMaxPacketSize : maxSize;
- 		port->bulk_in_size = buffer_size;
- 		port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
- 		port->bulk_in_buffer = kmalloc (buffer_size, GFP_KERNEL);
-@@ -1315,3 +1316,5 @@ MODULE_LICENSE("GPL");
- 
- module_param(debug, bool, S_IRUGO | S_IWUSR);
- MODULE_PARM_DESC(debug, "Debug enabled or not");
-+module_param(maxSize, ushort,0);
-+MODULE_PARM_DESC(maxSize,"User specified USB endpoint size");
diff --git a/target/linux/generic-2.6/patches-2.6.25/840-unable_to_open_console.patch b/target/linux/generic-2.6/patches-2.6.25/840-unable_to_open_console.patch
deleted file mode 100644
index d1d162b02..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/840-unable_to_open_console.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/init/main.c
-+++ b/init/main.c
-@@ -775,7 +775,7 @@ static int noinline init_post(void)
- 	numa_default_policy();
- 
- 	if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
--		printk(KERN_WARNING "Warning: unable to open an initial console.\n");
-+		printk(KERN_WARNING "Please be patient, while OpenWrt loads ...\n");
- 
- 	(void) sys_dup(0);
- 	(void) sys_dup(0);
diff --git a/target/linux/generic-2.6/patches-2.6.25/850-jffs2_erase_progress_indicator.patch b/target/linux/generic-2.6/patches-2.6.25/850-jffs2_erase_progress_indicator.patch
deleted file mode 100644
index 20bf1efab..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/850-jffs2_erase_progress_indicator.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/fs/jffs2/erase.c
-+++ b/fs/jffs2/erase.c
-@@ -35,6 +35,8 @@ static void jffs2_erase_block(struct jff
- {
- 	int ret;
- 	uint32_t bad_offset;
-+	static char s[]="|/-\\", *p=s;
-+
- #ifdef __ECOS
-        ret = jffs2_flash_erase(c, jeb);
-        if (!ret) {
-@@ -47,6 +49,11 @@ static void jffs2_erase_block(struct jff
- 
- 	D1(printk(KERN_DEBUG "jffs2_erase_block(): erase block %#08x (range %#08x-%#08x)\n",
- 				jeb->offset, jeb->offset, jeb->offset + c->sector_size));
-+
-+	printk("%c\b", *p);
-+	if (*++p==0)
-+	p=s;
-+
- 	instr = kmalloc(sizeof(struct erase_info) + sizeof(struct erase_priv_struct), GFP_KERNEL);
- 	if (!instr) {
- 		printk(KERN_WARNING "kmalloc for struct erase_info in jffs2_erase_block failed. Refiling block for later\n");
diff --git a/target/linux/generic-2.6/patches-2.6.25/900-headers_type_and_time.patch b/target/linux/generic-2.6/patches-2.6.25/900-headers_type_and_time.patch
deleted file mode 100644
index cd5d6864f..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/900-headers_type_and_time.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/include/linux/time.h
-+++ b/include/linux/time.h
-@@ -1,6 +1,10 @@
- #ifndef _LINUX_TIME_H
- #define _LINUX_TIME_H
- 
-+#ifndef __KERNEL__
-+#include <time.h>
-+#else
-+
- #include <linux/types.h>
- 
- #ifdef __KERNEL__
-@@ -232,4 +236,6 @@ struct itimerval {
-  */
- #define TIMER_ABSTIME			0x01
- 
-+#endif /* __KERNEL__ DEBIAN */
-+
- #endif
---- a/include/linux/types.h
-+++ b/include/linux/types.h
-@@ -1,6 +1,14 @@
- #ifndef _LINUX_TYPES_H
- #define _LINUX_TYPES_H
- 
-+/* Debian: Use userland types instead.  */
-+#ifndef __KERNEL__
-+# include <sys/types.h>
-+/* For other kernel headers.  */
-+# include <linux/posix_types.h>
-+# include <asm/types.h>
-+#else
-+
- #ifdef	__KERNEL__
- 
- #define DECLARE_BITMAP(name,bits) \
-@@ -161,6 +169,8 @@ typedef unsigned long blkcnt_t;
- 
- #endif /* __KERNEL_STRICT_NAMES */
- 
-+#endif /* __KERNEL__ DEBIAN */
-+
- /*
-  * Below are truly Linux-specific types that should never collide with
-  * any application/library that wants linux/types.h.
diff --git a/target/linux/generic-2.6/patches-2.6.25/902-darwin_scripts_include.patch b/target/linux/generic-2.6/patches-2.6.25/902-darwin_scripts_include.patch
deleted file mode 100644
index 88c0421f0..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/902-darwin_scripts_include.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- a/scripts/genksyms/parse.c_shipped
-+++ b/scripts/genksyms/parse.c_shipped
-@@ -160,7 +160,9 @@
- 
- 
- #include <assert.h>
-+#ifndef __APPLE__
- #include <malloc.h>
-+#endif
- #include "genksyms.h"
- 
- static int is_typedef;
---- a/scripts/genksyms/parse.y
-+++ b/scripts/genksyms/parse.y
-@@ -24,7 +24,9 @@
- %{
- 
- #include <assert.h>
-+#ifndef __APPLE__
- #include <malloc.h>
-+#endif
- #include "genksyms.h"
- 
- static int is_typedef;
---- a/scripts/kallsyms.c
-+++ b/scripts/kallsyms.c
-@@ -28,6 +28,35 @@
- #include <stdlib.h>
- #include <string.h>
- #include <ctype.h>
-+#ifdef __APPLE__
-+/* Darwin has no memmem implementation, this one is ripped of the uClibc-0.9.28 source */
-+void *memmem (const void *haystack, size_t haystack_len,
-+                          const void *needle,  size_t needle_len)
-+{
-+  const char *begin;
-+  const char *const last_possible
-+    = (const char *) haystack + haystack_len - needle_len;
-+
-+  if (needle_len == 0)
-+    /* The first occurrence of the empty string is deemed to occur at
-+       the beginning of the string.  */
-+    return (void *) haystack;
-+
-+  /* Sanity check, otherwise the loop might search through the whole
-+     memory.  */
-+  if (__builtin_expect (haystack_len < needle_len, 0))
-+    return NULL;
-+
-+  for (begin = (const char *) haystack; begin <= last_possible; ++begin)
-+    if (begin[0] == ((const char *) needle)[0] &&
-+        !memcmp ((const void *) &begin[1],
-+                 (const void *) ((const char *) needle + 1),
-+                 needle_len - 1))
-+      return (void *) begin;
-+
-+  return NULL;
-+}
-+#endif
- 
- #define KSYM_NAME_LEN		128
- 
---- a/scripts/kconfig/Makefile
-+++ b/scripts/kconfig/Makefile
-@@ -93,6 +93,9 @@ check-lxdialog  := $(srctree)/$(src)/lxd
- # we really need to do so. (Do not call gcc as part of make mrproper)
- HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
- HOST_LOADLIBES   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
-+ifeq ($(shell uname -s),Darwin)
-+HOST_LOADLIBES  += -lncurses
-+endif
- 
- HOST_EXTRACFLAGS += -DLOCALE
- 
---- a/scripts/mod/mk_elfconfig.c
-+++ b/scripts/mod/mk_elfconfig.c
-@@ -1,7 +1,11 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#ifndef __APPLE__
- #include <elf.h>
-+#else
-+#include "../../../../../tools/sstrip/include/elf.h"
-+#endif
- 
- int
- main(int argc, char **argv)
---- a/scripts/mod/modpost.h
-+++ b/scripts/mod/modpost.h
-@@ -7,7 +7,11 @@
- #include <sys/mman.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#if !(defined(__APPLE__) || defined(__CYGWIN__))
- #include <elf.h>
-+#else
-+#include "../../../../../tools/sstrip/include/elf.h"
-+#endif
- 
- #include "elfconfig.h"
- 
diff --git a/target/linux/generic-2.6/patches-2.6.25/903-hostap_txpower.patch b/target/linux/generic-2.6/patches-2.6.25/903-hostap_txpower.patch
deleted file mode 100644
index c0bbf2c6e..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/903-hostap_txpower.patch
+++ /dev/null
@@ -1,154 +0,0 @@
---- a/drivers/net/wireless/hostap/hostap_ap.c
-+++ b/drivers/net/wireless/hostap/hostap_ap.c
-@@ -2397,13 +2397,13 @@ int prism2_ap_get_sta_qual(local_info_t 
- 		addr[count].sa_family = ARPHRD_ETHER;
- 		memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
- 		if (sta->last_rx_silence == 0)
--			qual[count].qual = sta->last_rx_signal < 27 ?
--				0 : (sta->last_rx_signal - 27) * 92 / 127;
-+                        qual[count].qual = (sta->last_rx_signal - 156) == 0 ?
-+                                0 : (sta->last_rx_signal - 156) * 92 / 64;
- 		else
--			qual[count].qual = sta->last_rx_signal -
--				sta->last_rx_silence - 35;
--		qual[count].level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
--		qual[count].noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
-+                        qual[count].qual = (sta->last_rx_signal -
-+                                sta->last_rx_silence) * 92 / 64;
-+                qual[count].level = sta->last_rx_signal;
-+                qual[count].noise = sta->last_rx_silence;
- 		qual[count].updated = sta->last_rx_updated;
- 
- 		sta->last_rx_updated = IW_QUAL_DBM;
-@@ -2468,13 +2468,13 @@ int prism2_ap_translate_scan(struct net_
- 		memset(&iwe, 0, sizeof(iwe));
- 		iwe.cmd = IWEVQUAL;
- 		if (sta->last_rx_silence == 0)
--			iwe.u.qual.qual = sta->last_rx_signal < 27 ?
--				0 : (sta->last_rx_signal - 27) * 92 / 127;
-+	                iwe.u.qual.qual = (sta->last_rx_signal -156) == 0 ?
-+	                        0 : (sta->last_rx_signal - 156) * 92 / 64;
- 		else
--			iwe.u.qual.qual = sta->last_rx_signal -
--				sta->last_rx_silence - 35;
--		iwe.u.qual.level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
--		iwe.u.qual.noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
-+                        iwe.u.qual.qual = (sta->last_rx_signal -
-+                                sta->last_rx_silence) * 92 / 64;
-+                iwe.u.qual.level = sta->last_rx_signal;
-+                iwe.u.qual.noise = sta->last_rx_silence;
- 		iwe.u.qual.updated = sta->last_rx_updated;
- 		iwe.len = IW_EV_QUAL_LEN;
- 		current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
---- a/drivers/net/wireless/hostap/hostap_config.h
-+++ b/drivers/net/wireless/hostap/hostap_config.h
-@@ -45,4 +45,9 @@
-  */
- /* #define PRISM2_NO_STATION_MODES */
- 
-+/* Enable TX power Setting functions
-+ * (min att = -128 , max att =  127)
-+ */
-+#define RAW_TXPOWER_SETTING
-+
- #endif /* HOSTAP_CONFIG_H */
---- a/drivers/net/wireless/hostap/hostap.h
-+++ b/drivers/net/wireless/hostap/hostap.h
-@@ -89,6 +89,7 @@ extern const struct iw_handler_def hosta
- extern const struct ethtool_ops prism2_ethtool_ops;
- 
- int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
-+int hostap_restore_power(struct net_device *dev);
- 
- 
- #endif /* HOSTAP_H */
---- a/drivers/net/wireless/hostap/hostap_hw.c
-+++ b/drivers/net/wireless/hostap/hostap_hw.c
-@@ -933,6 +933,7 @@ static int hfa384x_set_rid(struct net_de
- 			prism2_hw_reset(dev);
- 	}
- 
-+	hostap_restore_power(dev);
- 	return res;
- }
- 
---- a/drivers/net/wireless/hostap/hostap_info.c
-+++ b/drivers/net/wireless/hostap/hostap_info.c
-@@ -434,6 +434,11 @@ static void handle_info_queue_linkstatus
- 	}
- 
- 	/* Get BSSID if we have a valid AP address */
-+
-+	if ( val == HFA384X_LINKSTATUS_CONNECTED ||
-+	     val == HFA384X_LINKSTATUS_DISCONNECTED ) 
-+			hostap_restore_power(local->dev);
-+
- 	if (connected) {
- 		netif_carrier_on(local->dev);
- 		netif_carrier_on(local->ddev);
---- a/drivers/net/wireless/hostap/hostap_ioctl.c
-+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
-@@ -1500,23 +1500,20 @@ static int prism2_txpower_hfa386x_to_dBm
- 		val = 255;
- 
- 	tmp = val;
--	tmp >>= 2;
- 
--	return -12 - tmp;
-+	return tmp;
- }
- 
- static u16 prism2_txpower_dBm_to_hfa386x(int val)
- {
- 	signed char tmp;
- 
--	if (val > 20)
--		return 128;
--	else if (val < -43)
-+	if (val > 127)
- 		return 127;
-+	else if (val < -128)
-+		return 128;
- 
- 	tmp = val;
--	tmp = -12 - tmp;
--	tmp <<= 2;
- 
- 	return (unsigned char) tmp;
- }
-@@ -4076,3 +4073,35 @@ int hostap_ioctl(struct net_device *dev,
- 
- 	return ret;
- }
-+
-+/* BUG FIX: Restore power setting value when lost due to F/W bug */
-+
-+int hostap_restore_power(struct net_device *dev)
-+{
-+        struct hostap_interface *iface = dev->priv;
-+       local_info_t *local = iface->local;
-+               
-+       u16 val;
-+       int ret = 0;
-+
-+       if (local->txpower_type == PRISM2_TXPOWER_OFF) {
-+                       val = 0xff; /* use all standby and sleep modes */
-+                       ret = local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
-+                                              HFA386X_CR_A_D_TEST_MODES2,
-+                                              &val, NULL);
-+       }
-+
-+#ifdef RAW_TXPOWER_SETTING
-+       if (local->txpower_type == PRISM2_TXPOWER_FIXED) {
-+               val = HFA384X_TEST_CFG_BIT_ALC;
-+               local->func->cmd(dev, HFA384X_CMDCODE_TEST |
-+                                (HFA384X_TEST_CFG_BITS << 8), 0, &val, NULL);
-+               val = prism2_txpower_dBm_to_hfa386x(local->txpower);
-+               ret = (local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
-+                            HFA386X_CR_MANUAL_TX_POWER, &val, NULL));
-+       }
-+#endif /* RAW_TXPOWER_SETTING */
-+       return (ret ? -EOPNOTSUPP : 0);
-+}
-+
-+EXPORT_SYMBOL(hostap_restore_power);
diff --git a/target/linux/generic-2.6/patches-2.6.25/903-stddef_include.patch b/target/linux/generic-2.6/patches-2.6.25/903-stddef_include.patch
deleted file mode 100644
index 7fe248d8d..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/903-stddef_include.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/include/linux/stddef.h
-+++ b/include/linux/stddef.h
-@@ -16,6 +16,7 @@ enum {
- 	false	= 0,
- 	true	= 1
- };
-+#endif /* __KERNEL__ */
- 
- #undef offsetof
- #ifdef __compiler_offsetof
-@@ -23,6 +24,5 @@ enum {
- #else
- #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
- #endif
--#endif /* __KERNEL__ */
- 
- #endif
diff --git a/target/linux/generic-2.6/patches-2.6.25/904-ls_time_locale.patch b/target/linux/generic-2.6/patches-2.6.25/904-ls_time_locale.patch
deleted file mode 100644
index 8fc9381a6..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/904-ls_time_locale.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/scripts/gen_initramfs_list.sh
-+++ b/scripts/gen_initramfs_list.sh
-@@ -125,7 +125,7 @@ parse() {
- 			str="${ftype} ${name} ${location} ${str}"
- 			;;
- 		"nod")
--			local dev=`LC_ALL=C ls -l "${location}"`
-+			local dev=`LC_ALL=C ls -l --time-style=locale "${location}"`
- 			local maj=`field 5 ${dev}`
- 			local min=`field 6 ${dev}`
- 			maj=${maj%,}
-@@ -135,7 +135,7 @@ parse() {
- 			str="${ftype} ${name} ${str} ${dev} ${maj} ${min}"
- 			;;
- 		"slink")
--			local target=`field 11 $(LC_ALL=C ls -l "${location}")`
-+			local target=`field 11 $(LC_ALL=C ls -l --time-style=locale "${location}")`
- 			str="${ftype} ${name} ${target} ${str}"
- 			;;
- 		*)
diff --git a/target/linux/generic-2.6/patches-2.6.25/905-i386_build.patch b/target/linux/generic-2.6/patches-2.6.25/905-i386_build.patch
deleted file mode 100644
index c701fdaa9..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/905-i386_build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/arch/x86/boot/tools/build.c
-+++ b/arch/x86/boot/tools/build.c
-@@ -29,7 +29,6 @@
- #include <stdarg.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--#include <sys/sysmacros.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/mman.h>
diff --git a/target/linux/generic-2.6/patches-2.6.25/906-msdosfs_header.patch b/target/linux/generic-2.6/patches-2.6.25/906-msdosfs_header.patch
deleted file mode 100644
index 128e0db94..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/906-msdosfs_header.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/include/linux/msdos_fs.h
-+++ b/include/linux/msdos_fs.h
-@@ -57,11 +57,13 @@
- #define MSDOS_DOT	".          "	/* ".", padded to MSDOS_NAME chars */
- #define MSDOS_DOTDOT	"..         "	/* "..", padded to MSDOS_NAME chars */
- 
-+#ifdef __KERNEL__
- /* media of boot sector */
- static inline int fat_valid_media(u8 media)
- {
- 	return 0xf8 <= media || media == 0xf0;
- }
-+#endif
- 
- #define FAT_FIRST_ENT(s, x)	((MSDOS_SB(s)->fat_bits == 32 ? 0x0FFFFF00 : \
- 	MSDOS_SB(s)->fat_bits == 16 ? 0xFF00 : 0xF00) | (x))
diff --git a/target/linux/generic-2.6/patches-2.6.25/910-m25p80_redboot_partitions.patch b/target/linux/generic-2.6/patches-2.6.25/910-m25p80_redboot_partitions.patch
deleted file mode 100644
index 29725148b..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/910-m25p80_redboot_partitions.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -627,12 +627,10 @@ static int __devinit m25p_probe(struct s
- 		struct mtd_partition	*parts = NULL;
- 		int			nr_parts = 0;
- 
--#ifdef CONFIG_MTD_CMDLINE_PARTS
--		static const char *part_probes[] = { "cmdlinepart", NULL, };
-+		static const char *part_probes[] = { "RedBoot", "cmdlinepart", NULL, };
- 
- 		nr_parts = parse_mtd_partitions(&flash->mtd,
- 				part_probes, &parts, 0);
--#endif
- 
- 		if (nr_parts <= 0 && data && data->parts) {
- 			parts = data->parts;
diff --git a/target/linux/generic-2.6/patches-2.6.25/921-gpio_spi_driver.patch b/target/linux/generic-2.6/patches-2.6.25/921-gpio_spi_driver.patch
deleted file mode 100644
index a80482842..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/921-gpio_spi_driver.patch
+++ /dev/null
@@ -1,359 +0,0 @@
---- /dev/null
-+++ b/include/linux/spi/spi_gpio.h
-@@ -0,0 +1,72 @@
-+/*
-+ * spi_gpio interface to platform code
-+ *
-+ * Copyright (c) 2008 Piotr Skamruk
-+ *
-+ * 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 _LINUX_SPI_SPI_GPIO
-+#define _LINUX_SPI_SPI_GPIO
-+
-+#include <linux/types.h>
-+#include <linux/spi/spi.h>
-+
-+
-+/**
-+ * struct spi_gpio_platform_data - Data definitions for a SPI-GPIO device.
-+ *
-+ * This structure holds information about a GPIO-based SPI device.
-+ *
-+ * @pin_clk: The GPIO pin number of the CLOCK pin.
-+ *
-+ * @pin_miso: The GPIO pin number of the MISO pin.
-+ *
-+ * @pin_mosi: The GPIO pin number of the MOSI pin.
-+ *
-+ * @pin_cs: The GPIO pin number of the CHIPSELECT pin.
-+ *
-+ * @cs_activelow: If true, the chip is selected when the CS line is low.
-+ *
-+ * @no_spi_delay: If true, no delay is done in the lowlevel bitbanging.
-+ *                Note that doing no delay is not standards compliant,
-+ *                but it might be needed to speed up transfers on some
-+ *                slow embedded machines.
-+ *
-+ * @boardinfo_setup: This callback is called after the
-+ *                   SPI master device was registered, but before the
-+ *                   device is registered.
-+ * @boardinfo_setup_data: Data argument passed to boardinfo_setup().
-+ */
-+struct spi_gpio_platform_data {
-+	unsigned int pin_clk;
-+	unsigned int pin_miso;
-+	unsigned int pin_mosi;
-+	unsigned int pin_cs;
-+	bool cs_activelow;
-+	bool no_spi_delay;
-+	int (*boardinfo_setup)(struct spi_board_info *bi,
-+			       struct spi_master *master,
-+			       void *data);
-+	void *boardinfo_setup_data;
-+};
-+
-+/**
-+ * SPI_GPIO_PLATDEV_NAME - The platform device name string.
-+ *
-+ * The name string that has to be used for platform_device_alloc
-+ * when allocating a spi-gpio device.
-+ */
-+#define SPI_GPIO_PLATDEV_NAME	"spi-gpio"
-+
-+/**
-+ * spi_gpio_next_id - Get another platform device ID number.
-+ *
-+ * This returns the next platform device ID number that has to be used
-+ * for platform_device_alloc. The ID is opaque and should not be used for
-+ * anything else.
-+ */
-+int spi_gpio_next_id(void);
-+
-+#endif /* _LINUX_SPI_SPI_GPIO */
---- /dev/null
-+++ b/drivers/spi/spi_gpio.c
-@@ -0,0 +1,249 @@
-+/*
-+ * Bitbanging SPI bus driver using GPIO API
-+ *
-+ * Copyright (c) 2008 Piotr Skamruk
-+ *
-+ * based on spi_s3c2410_gpio.c
-+ *   Copyright (c) 2006 Ben Dooks
-+ *   Copyright (c) 2006 Simtec Electronics
-+ * and on i2c-gpio.c
-+ *   Copyright (C) 2007 Atmel Corporation
-+ *
-+ * 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.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/delay.h>
-+#include <linux/spinlock.h>
-+#include <linux/workqueue.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/spi/spi.h>
-+#include <linux/spi/spi_bitbang.h>
-+#include <linux/spi/spi_gpio.h>
-+#include <linux/gpio.h>
-+#include <asm/atomic.h>
-+
-+
-+struct spi_gpio {
-+	struct spi_bitbang bitbang;
-+	struct spi_gpio_platform_data *info;
-+	struct platform_device *pdev;
-+	struct spi_board_info bi;
-+};
-+
-+
-+static inline struct spi_gpio *spidev_to_sg(struct spi_device *dev)
-+{
-+	return dev->controller_data;
-+}
-+
-+static inline void setsck(struct spi_device *dev, int val)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+	gpio_set_value(sp->info->pin_clk, val ? 1 : 0);
-+}
-+
-+static inline void setmosi(struct spi_device *dev, int val)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+	gpio_set_value(sp->info->pin_mosi, val ? 1 : 0);
-+}
-+
-+static inline u32 getmiso(struct spi_device *dev)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+	return gpio_get_value(sp->info->pin_miso) ? 1 : 0;
-+}
-+
-+static inline void do_spidelay(struct spi_device *dev, unsigned nsecs)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+
-+	if (!sp->info->no_spi_delay)
-+		ndelay(nsecs);
-+}
-+
-+#define spidelay(nsecs) do {					\
-+	/* Steal the spi_device pointer from our caller.	\
-+	 * The bitbang-API should probably get fixed here... */	\
-+	do_spidelay(spi, nsecs);				\
-+  } while (0)
-+
-+#define EXPAND_BITBANG_TXRX
-+#include <linux/spi/spi_bitbang.h>
-+
-+static u32 spi_gpio_txrx_mode0(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha0(spi, nsecs, 0, word, bits);
-+}
-+
-+static u32 spi_gpio_txrx_mode1(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha1(spi, nsecs, 0, word, bits);
-+}
-+
-+static u32 spi_gpio_txrx_mode2(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha0(spi, nsecs, 1, word, bits);
-+}
-+
-+static u32 spi_gpio_txrx_mode3(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha1(spi, nsecs, 1, word, bits);
-+}
-+
-+static void spi_gpio_chipselect(struct spi_device *dev, int on)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+
-+	if (sp->info->cs_activelow)
-+		on = !on;
-+	gpio_set_value(sp->info->pin_cs, on ? 1 : 0);
-+}
-+
-+static int spi_gpio_probe(struct platform_device *pdev)
-+{
-+	struct spi_master *master;
-+	struct spi_gpio_platform_data *pdata;
-+	struct spi_gpio *sp;
-+	struct spi_device *spidev;
-+	int err;
-+
-+	pdata = pdev->dev.platform_data;
-+	if (!pdata)
-+		return -ENXIO;
-+
-+	err = -ENOMEM;
-+	master = spi_alloc_master(&pdev->dev, sizeof(struct spi_gpio));
-+	if (!master)
-+		goto err_alloc_master;
-+
-+	sp = spi_master_get_devdata(master);
-+	platform_set_drvdata(pdev, sp);
-+	sp->info = pdata;
-+
-+	err = gpio_request(pdata->pin_clk, "spi_clock");
-+	if (err)
-+		goto err_request_clk;
-+	err = gpio_request(pdata->pin_mosi, "spi_mosi");
-+	if (err)
-+		goto err_request_mosi;
-+	err = gpio_request(pdata->pin_miso, "spi_miso");
-+	if (err)
-+		goto err_request_miso;
-+	err = gpio_request(pdata->pin_cs, "spi_cs");
-+	if (err)
-+		goto err_request_cs;
-+
-+	sp->bitbang.master = spi_master_get(master);
-+	sp->bitbang.master->bus_num = -1;
-+	sp->bitbang.master->num_chipselect = 1;
-+	sp->bitbang.chipselect = spi_gpio_chipselect;
-+	sp->bitbang.txrx_word[SPI_MODE_0] = spi_gpio_txrx_mode0;
-+	sp->bitbang.txrx_word[SPI_MODE_1] = spi_gpio_txrx_mode1;
-+	sp->bitbang.txrx_word[SPI_MODE_2] = spi_gpio_txrx_mode2;
-+	sp->bitbang.txrx_word[SPI_MODE_3] = spi_gpio_txrx_mode3;
-+
-+	gpio_direction_output(pdata->pin_clk, 0);
-+	gpio_direction_output(pdata->pin_mosi, 0);
-+	gpio_direction_output(pdata->pin_cs,
-+			      pdata->cs_activelow ? 1 : 0);
-+	gpio_direction_input(pdata->pin_miso);
-+
-+	err = spi_bitbang_start(&sp->bitbang);
-+	if (err)
-+		goto err_no_bitbang;
-+	err = pdata->boardinfo_setup(&sp->bi, master,
-+				     pdata->boardinfo_setup_data);
-+	if (err)
-+		goto err_bi_setup;
-+	sp->bi.controller_data = sp;
-+	spidev = spi_new_device(master, &sp->bi);
-+	if (!spidev)
-+		goto err_new_dev;
-+
-+	return 0;
-+
-+err_new_dev:
-+err_bi_setup:
-+	spi_bitbang_stop(&sp->bitbang);
-+err_no_bitbang:
-+	spi_master_put(sp->bitbang.master);
-+	gpio_free(pdata->pin_cs);
-+err_request_cs:
-+	gpio_free(pdata->pin_miso);
-+err_request_miso:
-+	gpio_free(pdata->pin_mosi);
-+err_request_mosi:
-+	gpio_free(pdata->pin_clk);
-+err_request_clk:
-+	kfree(master);
-+
-+err_alloc_master:
-+	return err;
-+}
-+
-+static int __devexit spi_gpio_remove(struct platform_device *pdev)
-+{
-+	struct spi_gpio *sp;
-+	struct spi_gpio_platform_data *pdata;
-+
-+	pdata = pdev->dev.platform_data;
-+	sp = platform_get_drvdata(pdev);
-+
-+	gpio_free(pdata->pin_clk);
-+	gpio_free(pdata->pin_mosi);
-+	gpio_free(pdata->pin_miso);
-+	gpio_free(pdata->pin_cs);
-+	spi_bitbang_stop(&sp->bitbang);
-+	spi_master_put(sp->bitbang.master);
-+
-+	return 0;
-+}
-+
-+static struct platform_driver spi_gpio_driver = {
-+	.driver		= {
-+		.name	= SPI_GPIO_PLATDEV_NAME,
-+		.owner	= THIS_MODULE,
-+	},
-+	.probe		= spi_gpio_probe,
-+	.remove		= __devexit_p(spi_gpio_remove),
-+};
-+
-+int spi_gpio_next_id(void)
-+{
-+	static atomic_t counter = ATOMIC_INIT(-1);
-+
-+	return atomic_inc_return(&counter);
-+}
-+EXPORT_SYMBOL(spi_gpio_next_id);
-+
-+static int __init spi_gpio_init(void)
-+{
-+	int err;
-+
-+	err = platform_driver_register(&spi_gpio_driver);
-+	if (err)
-+		printk(KERN_ERR "spi-gpio: register failed: %d\n", err);
-+
-+	return err;
-+}
-+module_init(spi_gpio_init);
-+
-+static void __exit spi_gpio_exit(void)
-+{
-+	platform_driver_unregister(&spi_gpio_driver);
-+}
-+module_exit(spi_gpio_exit);
-+
-+MODULE_AUTHOR("Piot Skamruk <piotr.skamruk at gmail.com>");
-+MODULE_DESCRIPTION("Platform independent GPIO bitbanging SPI driver");
-+MODULE_LICENSE("GPL v2");
---- a/drivers/spi/Kconfig
-+++ b/drivers/spi/Kconfig
-@@ -100,6 +100,19 @@ config SPI_BUTTERFLY
- 	  inexpensive battery powered microcontroller evaluation board.
- 	  This same cable can be used to flash new firmware.
- 
-+config SPI_GPIO
-+	tristate "GPIO API based bitbanging SPI controller"
-+	depends on SPI_MASTER && GENERIC_GPIO
-+	select SPI_BITBANG
-+	help
-+	  This is a platform driver that can be used for bitbanging
-+	  an SPI bus over GPIO pins.
-+	  Select this if you have any SPI device that is connected via
-+	  GPIO pins.
-+	  The module will be called spi_gpio.
-+
-+	  If unsure, say N.
-+
- config SPI_IMX
- 	tristate "Freescale iMX SPI controller"
- 	depends on SPI_MASTER && ARCH_IMX && EXPERIMENTAL
---- a/drivers/spi/Makefile
-+++ b/drivers/spi/Makefile
-@@ -16,6 +16,7 @@ obj-$(CONFIG_SPI_BFIN)			+= spi_bfin5xx.
- obj-$(CONFIG_SPI_BITBANG)		+= spi_bitbang.o
- obj-$(CONFIG_SPI_AU1550)		+= au1550_spi.o
- obj-$(CONFIG_SPI_BUTTERFLY)		+= spi_butterfly.o
-+obj-$(CONFIG_SPI_GPIO)			+= spi_gpio.o
- obj-$(CONFIG_SPI_IMX)			+= spi_imx.o
- obj-$(CONFIG_SPI_LM70_LLP)		+= spi_lm70llp.o
- obj-$(CONFIG_SPI_PXA2XX)		+= pxa2xx_spi.o
diff --git a/target/linux/generic-2.6/patches-2.6.25/922-gpiommc.patch b/target/linux/generic-2.6/patches-2.6.25/922-gpiommc.patch
deleted file mode 100644
index b775a0e6b..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/922-gpiommc.patch
+++ /dev/null
@@ -1,818 +0,0 @@
---- /dev/null
-+++ b/drivers/mmc/host/gpiommc.c
-@@ -0,0 +1,605 @@
-+/*
-+ * Driver an MMC/SD card on a bitbanging GPIO SPI bus.
-+ * This module hooks up the mmc_spi and spi_gpio modules and also
-+ * provides a configfs interface.
-+ *
-+ * Licensed under the GNU/GPL. See COPYING for details.
-+ */
-+
-+#include <linux/mmc/gpiommc.h>
-+#include <linux/platform_device.h>
-+#include <linux/list.h>
-+#include <linux/mutex.h>
-+#include <linux/spi/spi_gpio.h>
-+#include <linux/configfs.h>
-+#include <linux/gpio.h>
-+#include <asm/atomic.h>
-+
-+
-+#define PFX				"gpio-mmc: "
-+
-+
-+struct gpiommc_device {
-+	struct platform_device *pdev;
-+	struct platform_device *spi_pdev;
-+	struct spi_board_info boardinfo;
-+};
-+
-+
-+MODULE_DESCRIPTION("GPIO based MMC driver");
-+MODULE_LICENSE("GPL");
-+
-+
-+static int gpiommc_boardinfo_setup(struct spi_board_info *bi,
-+				   struct spi_master *master,
-+				   void *data)
-+{
-+	struct gpiommc_device *d = data;
-+	struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
-+
-+	/* Bind the SPI master to the MMC-SPI host driver. */
-+	strlcpy(bi->modalias, "mmc_spi", sizeof(bi->modalias));
-+
-+	bi->max_speed_hz = pdata->max_bus_speed;
-+	bi->bus_num = master->bus_num;
-+	bi->mode = pdata->mode;
-+
-+	return 0;
-+}
-+
-+static int gpiommc_probe(struct platform_device *pdev)
-+{
-+	struct gpiommc_platform_data *mmc_pdata = pdev->dev.platform_data;
-+	struct spi_gpio_platform_data spi_pdata;
-+	struct gpiommc_device *d;
-+	int err;
-+
-+	err = -ENXIO;
-+	if (!mmc_pdata)
-+		goto error;
-+
-+#ifdef CONFIG_MMC_SPI_MODULE
-+	err = request_module("mmc_spi");
-+	if (err) {
-+		printk(KERN_WARNING PFX
-+		       "Failed to request mmc_spi module.\n");
-+	}
-+#endif /* CONFIG_MMC_SPI_MODULE */
-+
-+	/* Allocate the GPIO-MMC device */
-+	err = -ENOMEM;
-+	d = kzalloc(sizeof(*d), GFP_KERNEL);
-+	if (!d)
-+		goto error;
-+	d->pdev = pdev;
-+
-+	/* Create the SPI-GPIO device */
-+	d->spi_pdev = platform_device_alloc(SPI_GPIO_PLATDEV_NAME,
-+					    spi_gpio_next_id());
-+	if (!d->spi_pdev)
-+		goto err_free_d;
-+
-+	memset(&spi_pdata, 0, sizeof(spi_pdata));
-+	spi_pdata.pin_clk = mmc_pdata->pins.gpio_clk;
-+	spi_pdata.pin_miso = mmc_pdata->pins.gpio_do;
-+	spi_pdata.pin_mosi = mmc_pdata->pins.gpio_di;
-+	spi_pdata.pin_cs = mmc_pdata->pins.gpio_cs;
-+	spi_pdata.cs_activelow = mmc_pdata->pins.cs_activelow;
-+	spi_pdata.no_spi_delay = mmc_pdata->no_spi_delay;
-+	spi_pdata.boardinfo_setup = gpiommc_boardinfo_setup;
-+	spi_pdata.boardinfo_setup_data = d;
-+
-+	err = platform_device_add_data(d->spi_pdev, &spi_pdata,
-+				       sizeof(spi_pdata));
-+	if (err)
-+		goto err_free_pdev;
-+	err = platform_device_add(d->spi_pdev);
-+	if (err)
-+		goto err_free_pdata;
-+	platform_set_drvdata(pdev, d);
-+
-+	printk(KERN_INFO PFX "MMC-Card \"%s\" "
-+	       "attached to GPIO pins di=%u, do=%u, clk=%u, cs=%u\n",
-+	       mmc_pdata->name, mmc_pdata->pins.gpio_di,
-+	       mmc_pdata->pins.gpio_do,
-+	       mmc_pdata->pins.gpio_clk,
-+	       mmc_pdata->pins.gpio_cs);
-+
-+	return 0;
-+
-+err_free_pdata:
-+	kfree(d->spi_pdev->dev.platform_data);
-+	d->spi_pdev->dev.platform_data = NULL;
-+err_free_pdev:
-+	platform_device_put(d->spi_pdev);
-+err_free_d:
-+	kfree(d);
-+error:
-+	return err;
-+}
-+
-+static int gpiommc_remove(struct platform_device *pdev)
-+{
-+	struct gpiommc_device *d = platform_get_drvdata(pdev);
-+	struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
-+
-+	platform_device_unregister(d->spi_pdev);
-+	printk(KERN_INFO PFX "GPIO based MMC-Card \"%s\" removed\n",
-+	       pdata->name);
-+	platform_device_put(d->spi_pdev);
-+
-+	return 0;
-+}
-+
-+#ifdef CONFIG_GPIOMMC_CONFIGFS
-+
-+/* A device that was created through configfs */
-+struct gpiommc_configfs_device {
-+	struct config_item item;
-+	/* The platform device, after registration. */
-+	struct platform_device *pdev;
-+	/* The configuration */
-+	struct gpiommc_platform_data pdata;
-+};
-+
-+#define GPIO_INVALID	-1
-+
-+static inline bool gpiommc_is_registered(struct gpiommc_configfs_device *dev)
-+{
-+	return (dev->pdev != NULL);
-+}
-+
-+static inline struct gpiommc_configfs_device *ci_to_gpiommc(struct config_item *item)
-+{
-+	return item ? container_of(item, struct gpiommc_configfs_device, item) : NULL;
-+}
-+
-+static struct configfs_attribute gpiommc_attr_DI = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_data_in",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_DO = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_data_out",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_CLK = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_clock",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_CS = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_chipselect",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_CS_activelow = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_chipselect_activelow",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_spimode = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "spi_mode",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_spidelay = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "spi_delay",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_max_bus_speed = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "max_bus_speed",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_register = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "register",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute *gpiommc_config_attrs[] = {
-+	&gpiommc_attr_DI,
-+	&gpiommc_attr_DO,
-+	&gpiommc_attr_CLK,
-+	&gpiommc_attr_CS,
-+	&gpiommc_attr_CS_activelow,
-+	&gpiommc_attr_spimode,
-+	&gpiommc_attr_spidelay,
-+	&gpiommc_attr_max_bus_speed,
-+	&gpiommc_attr_register,
-+	NULL,
-+};
-+
-+static ssize_t gpiommc_config_attr_show(struct config_item *item,
-+					struct configfs_attribute *attr,
-+					char *page)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+	ssize_t count = 0;
-+	unsigned int gpio;
-+	int err = 0;
-+
-+	if (attr == &gpiommc_attr_DI) {
-+		gpio = dev->pdata.pins.gpio_di;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_DO) {
-+		gpio = dev->pdata.pins.gpio_do;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CLK) {
-+		gpio = dev->pdata.pins.gpio_clk;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS) {
-+		gpio = dev->pdata.pins.gpio_cs;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS_activelow) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 dev->pdata.pins.cs_activelow);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spimode) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 dev->pdata.mode);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spidelay) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 !dev->pdata.no_spi_delay);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_max_bus_speed) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 dev->pdata.max_bus_speed);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_register) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 gpiommc_is_registered(dev));
-+		goto out;
-+	}
-+	WARN_ON(1);
-+	err = -ENOSYS;
-+out:
-+	return err ? err : count;
-+}
-+
-+static int gpiommc_do_register(struct gpiommc_configfs_device *dev,
-+			       const char *name)
-+{
-+	int err;
-+
-+	if (gpiommc_is_registered(dev))
-+		return 0;
-+
-+	if (!gpio_is_valid(dev->pdata.pins.gpio_di) ||
-+	    !gpio_is_valid(dev->pdata.pins.gpio_do) ||
-+	    !gpio_is_valid(dev->pdata.pins.gpio_clk) ||
-+	    !gpio_is_valid(dev->pdata.pins.gpio_cs)) {
-+		printk(KERN_ERR PFX
-+		       "configfs: Invalid GPIO pin number(s)\n");
-+		return -EINVAL;
-+	}
-+
-+	strlcpy(dev->pdata.name, name,
-+		sizeof(dev->pdata.name));
-+
-+	dev->pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME,
-+					  gpiommc_next_id());
-+	if (!dev->pdev)
-+		return -ENOMEM;
-+	err = platform_device_add_data(dev->pdev, &dev->pdata,
-+				       sizeof(dev->pdata));
-+	if (err) {
-+		platform_device_put(dev->pdev);
-+		return err;
-+	}
-+	err = platform_device_add(dev->pdev);
-+	if (err) {
-+		platform_device_put(dev->pdev);
-+		return err;
-+	}
-+
-+	return 0;
-+}
-+
-+static void gpiommc_do_unregister(struct gpiommc_configfs_device *dev)
-+{
-+	if (!gpiommc_is_registered(dev))
-+		return;
-+
-+	platform_device_unregister(dev->pdev);
-+	dev->pdev = NULL;
-+}
-+
-+static ssize_t gpiommc_config_attr_store(struct config_item *item,
-+					 struct configfs_attribute *attr,
-+					 const char *page, size_t count)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+	int err = -EINVAL;
-+	unsigned long data;
-+
-+	if (attr == &gpiommc_attr_register) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data == 1)
-+			err = gpiommc_do_register(dev, item->ci_name);
-+		if (data == 0) {
-+			gpiommc_do_unregister(dev);
-+			err = 0;
-+		}
-+		goto out;
-+	}
-+
-+	if (gpiommc_is_registered(dev)) {
-+		/* The rest of the config parameters can only be set
-+		 * as long as the device is not registered, yet. */
-+		err = -EBUSY;
-+		goto out;
-+	}
-+
-+	if (attr == &gpiommc_attr_DI) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_di = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_DO) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_do = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CLK) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_clk = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_cs = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS_activelow) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data != 0 && data != 1)
-+			goto out;
-+		dev->pdata.pins.cs_activelow = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spimode) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		switch (data) {
-+		case 0:
-+			dev->pdata.mode = SPI_MODE_0;
-+			break;
-+		case 1:
-+			dev->pdata.mode = SPI_MODE_1;
-+			break;
-+		case 2:
-+			dev->pdata.mode = SPI_MODE_2;
-+			break;
-+		case 3:
-+			dev->pdata.mode = SPI_MODE_3;
-+			break;
-+		default:
-+			goto out;
-+		}
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spidelay) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data != 0 && data != 1)
-+			goto out;
-+		dev->pdata.no_spi_delay = !data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_max_bus_speed) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data > UINT_MAX)
-+			goto out;
-+		dev->pdata.max_bus_speed = data;
-+		err = 0;
-+		goto out;
-+	}
-+	WARN_ON(1);
-+	err = -ENOSYS;
-+out:
-+	return err ? err : count;
-+}
-+
-+static void gpiommc_config_item_release(struct config_item *item)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+
-+	kfree(dev);
-+}
-+
-+static struct configfs_item_operations gpiommc_config_item_ops = {
-+	.release		= gpiommc_config_item_release,
-+	.show_attribute		= gpiommc_config_attr_show,
-+	.store_attribute	= gpiommc_config_attr_store,
-+};
-+
-+static struct config_item_type gpiommc_dev_ci_type = {
-+	.ct_item_ops	= &gpiommc_config_item_ops,
-+	.ct_attrs	= gpiommc_config_attrs,
-+	.ct_owner	= THIS_MODULE,
-+};
-+
-+static struct config_item *gpiommc_make_item(struct config_group *group,
-+					     const char *name)
-+{
-+	struct gpiommc_configfs_device *dev;
-+
-+	if (strlen(name) > GPIOMMC_MAX_NAMELEN) {
-+		printk(KERN_ERR PFX "configfs: device name too long\n");
-+		return NULL;
-+	}
-+
-+	dev = kzalloc(sizeof(*dev), GFP_KERNEL);
-+	if (!dev)
-+		return NULL;
-+
-+	config_item_init_type_name(&dev->item, name,
-+				   &gpiommc_dev_ci_type);
-+
-+	/* Assign default configuration */
-+	dev->pdata.pins.gpio_di = GPIO_INVALID;
-+	dev->pdata.pins.gpio_do = GPIO_INVALID;
-+	dev->pdata.pins.gpio_clk = GPIO_INVALID;
-+	dev->pdata.pins.gpio_cs = GPIO_INVALID;
-+	dev->pdata.pins.cs_activelow = 1;
-+	dev->pdata.mode = SPI_MODE_0;
-+	dev->pdata.no_spi_delay = 0;
-+	dev->pdata.max_bus_speed = 5000000; /* 5 MHz */
-+
-+	return &(dev->item);
-+}
-+
-+static void gpiommc_drop_item(struct config_group *group,
-+			      struct config_item *item)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+
-+	gpiommc_do_unregister(dev);
-+	kfree(dev);
-+}
-+
-+static struct configfs_group_operations gpiommc_ct_group_ops = {
-+	.make_item	= gpiommc_make_item,
-+	.drop_item	= gpiommc_drop_item,
-+};
-+
-+static struct config_item_type gpiommc_ci_type = {
-+	.ct_group_ops	= &gpiommc_ct_group_ops,
-+	.ct_owner	= THIS_MODULE,
-+};
-+
-+static struct configfs_subsystem gpiommc_subsys = {
-+	.su_group = {
-+		.cg_item = {
-+			.ci_namebuf = GPIOMMC_PLATDEV_NAME,
-+			.ci_type = &gpiommc_ci_type,
-+		},
-+	},
-+	.su_mutex = __MUTEX_INITIALIZER(gpiommc_subsys.su_mutex),
-+};
-+
-+#endif /* CONFIG_GPIOMMC_CONFIGFS */
-+
-+static struct platform_driver gpiommc_plat_driver = {
-+	.probe	= gpiommc_probe,
-+	.remove	= gpiommc_remove,
-+	.driver	= {
-+		.name	= GPIOMMC_PLATDEV_NAME,
-+		.owner	= THIS_MODULE,
-+	},
-+};
-+
-+int gpiommc_next_id(void)
-+{
-+	static atomic_t counter = ATOMIC_INIT(-1);
-+
-+	return atomic_inc_return(&counter);
-+}
-+EXPORT_SYMBOL(gpiommc_next_id);
-+
-+static int __init gpiommc_modinit(void)
-+{
-+	int err;
-+
-+	err = platform_driver_register(&gpiommc_plat_driver);
-+	if (err)
-+		return err;
-+
-+#ifdef CONFIG_GPIOMMC_CONFIGFS
-+	config_group_init(&gpiommc_subsys.su_group);
-+	err = configfs_register_subsystem(&gpiommc_subsys);
-+	if (err) {
-+		platform_driver_unregister(&gpiommc_plat_driver);
-+		return err;
-+	}
-+#endif /* CONFIG_GPIOMMC_CONFIGFS */
-+
-+	return 0;
-+}
-+module_init(gpiommc_modinit);
-+
-+static void __exit gpiommc_modexit(void)
-+{
-+#ifdef CONFIG_GPIOMMC_CONFIGFS
-+	configfs_unregister_subsystem(&gpiommc_subsys);
-+#endif
-+	platform_driver_unregister(&gpiommc_plat_driver);
-+}
-+module_exit(gpiommc_modexit);
---- a/drivers/mmc/host/Kconfig
-+++ b/drivers/mmc/host/Kconfig
-@@ -130,3 +130,27 @@ config MMC_SPI
- 
- 	  If unsure, or if your system has no SPI master driver, say N.
- 
-+config GPIOMMC
-+	tristate "MMC/SD over GPIO-based SPI"
-+	depends on MMC && MMC_SPI && SPI_GPIO
-+	help
-+	  This driver hooks up the mmc_spi and spi_gpio modules so that
-+	  MMC/SD cards can be used on a GPIO based bus by bitbanging
-+	  the SPI protocol in software.
-+
-+	  This driver provides a configfs interface to dynamically create
-+	  and destroy GPIO-based MMC/SD card devices. It also provides
-+	  a platform device interface API.
-+	  See Documentation/gpiommc.txt for details.
-+
-+	  The module will be called gpiommc.
-+
-+	  If unsure, say N.
-+
-+config GPIOMMC_CONFIGFS
-+	bool
-+	depends on GPIOMMC && CONFIGFS_FS
-+	default y
-+	help
-+	  This option automatically enables configfs support for gpiommc
-+	  if configfs is available.
---- a/drivers/mmc/host/Makefile
-+++ b/drivers/mmc/host/Makefile
-@@ -17,4 +17,4 @@ obj-$(CONFIG_MMC_OMAP)		+= omap.o
- obj-$(CONFIG_MMC_AT91)		+= at91_mci.o
- obj-$(CONFIG_MMC_TIFM_SD)	+= tifm_sd.o
- obj-$(CONFIG_MMC_SPI)		+= mmc_spi.o
--
-+obj-$(CONFIG_GPIOMMC)		+= gpiommc.o
---- /dev/null
-+++ b/include/linux/mmc/gpiommc.h
-@@ -0,0 +1,69 @@
-+/*
-+ * Device driver for MMC/SD cards driven over a GPIO bus.
-+ *
-+ * Licensed under the GNU/GPL version 2.
-+ */
-+#ifndef LINUX_GPIOMMC_H_
-+#define LINUX_GPIOMMC_H_
-+
-+#include <linux/types.h>
-+
-+
-+#define GPIOMMC_MAX_NAMELEN		15
-+#define GPIOMMC_MAX_NAMELEN_STR		__stringify(GPIOMMC_MAX_NAMELEN)
-+
-+/**
-+ * struct gpiommc_pins - Hardware pin assignments
-+ *
-+ * @gpio_di: The GPIO number of the DATA IN pin
-+ * @gpio_do: The GPIO number of the DATA OUT pin
-+ * @gpio_clk: The GPIO number of the CLOCK pin
-+ * @gpio_cs: The GPIO number of the CHIPSELECT pin
-+ * @cs_activelow: If true, the chip is considered selected if @gpio_cs is low.
-+ */
-+struct gpiommc_pins {
-+	unsigned int gpio_di;
-+	unsigned int gpio_do;
-+	unsigned int gpio_clk;
-+	unsigned int gpio_cs;
-+	bool cs_activelow;
-+};
-+
-+/**
-+ * struct gpiommc_platform_data - Platform data for a MMC-over-SPI-GPIO device.
-+ *
-+ * @name: The unique name string of the device.
-+ * @pins: The hardware pin assignments.
-+ * @mode: The hardware mode. This is either SPI_MODE_0,
-+ *        SPI_MODE_1, SPI_MODE_2 or SPI_MODE_3. See the SPI documentation.
-+ * @no_spi_delay: Do not use delays in the lowlevel SPI bitbanging code.
-+ *                This is not standards compliant, but may be required for some
-+ *                embedded machines to gain reasonable speed.
-+ * @max_bus_speed: The maximum speed of the SPI bus, in Hertz.
-+ */
-+struct gpiommc_platform_data {
-+	char name[GPIOMMC_MAX_NAMELEN + 1];
-+	struct gpiommc_pins pins;
-+	u8 mode;
-+	bool no_spi_delay;
-+	unsigned int max_bus_speed;
-+};
-+
-+/**
-+ * GPIOMMC_PLATDEV_NAME - The platform device name string.
-+ *
-+ * The name string that has to be used for platform_device_alloc
-+ * when allocating a gpiommc device.
-+ */
-+#define GPIOMMC_PLATDEV_NAME	"gpiommc"
-+
-+/**
-+ * gpiommc_next_id - Get another platform device ID number.
-+ *
-+ * This returns the next platform device ID number that has to be used
-+ * for platform_device_alloc. The ID is opaque and should not be used for
-+ * anything else.
-+ */
-+int gpiommc_next_id(void);
-+
-+#endif /* LINUX_GPIOMMC_H_ */
---- /dev/null
-+++ b/Documentation/gpiommc.txt
-@@ -0,0 +1,97 @@
-+GPIOMMC - Driver for an MMC/SD card on a bitbanging GPIO SPI bus
-+================================================================
-+
-+The gpiommc module hooks up the mmc_spi and spi_gpio modules for running an
-+MMC or SD card on GPIO pins.
-+
-+Two interfaces for registering a new MMC/SD card device are provided:
-+A static platform-device based mechanism and a dynamic configfs based interface.
-+
-+
-+Registering devices via platform-device
-+=======================================
-+
-+The platform-device interface is used for registering MMC/SD devices that are
-+part of the hardware platform. This is most useful only for embedded machines
-+with MMC/SD devices statically connected to the platform GPIO bus.
-+
-+The data structures are declared in <linux/mmc/gpiommc.h>.
-+
-+To register a new device, define an instance of struct gpiommc_platform_data.
-+This structure holds any information about how the device is hooked up to the
-+GPIO pins and what hardware modes the device supports. See the docbook-style
-+documentation in the header file for more information on the struct fields.
-+
-+Then allocate a new instance of a platform device by doing:
-+
-+	pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME, gpiommc_next_id());
-+
-+This will allocate the platform device data structures and hook it up to the
-+gpiommc driver.
-+Then add the gpiommc_platform_data to the platform device.
-+
-+	err = platform_device_add_data(pdev, pdata, sizeof(struct gpiommc_platform_data));
-+
-+You may free the local instance of struct gpiommc_platform_data now. (So the
-+struct may be allocated on the stack, too).
-+Now simply register the platform device.
-+
-+	err = platform_device_add(pdev);
-+
-+Done. The gpiommc probe routine will be invoked now and you should see a kernel
-+log message for the added device.
-+
-+
-+Registering devices via configfs
-+================================
-+
-+MMC/SD cards connected via GPIO often are a pretty dynamic thing, as for example
-+selfmade hacks for soldering an MMC/SD card to standard GPIO pins on embedded
-+hardware are a common situation.
-+So we provide a dynamic interface to conveniently handle adding and removing
-+devices from userspace, without the need to recompile the kernel.
-+
-+The "gpiommc" subdirectory at the configfs mountpoint is used for handling
-+the dynamic configuration.
-+
-+To create a new device, it must first be allocated with mkdir.
-+The following command will allocate a device named "my_mmc":
-+	mkdir /config/gpiommc/my_mmc
-+
-+There are several configuration files available in the new
-+/config/gpiommc/my_mmc/ directory:
-+
-+gpio_data_in			= The SPI data-IN GPIO pin number.
-+gpio_data_out			= The SPI data-OUT GPIO pin number.
-+gpio_clock			= The SPI Clock GPIO pin number.
-+gpio_chipselect			= The SPI Chipselect GPIO pin number.
-+gpio_chipselect_activelow	= Boolean. If 0, Chipselect is active-HIGH.
-+				  If 1, Chipselect is active-LOW.
-+spi_mode			= The SPI data mode. Can be 0-3.
-+spi_delay			= Enable all delays in the lowlevel bitbanging.
-+max_bus_speed			= The maximum SPI bus speed. In Hertz.
-+
-+register			= Not a configuration parameter.
-+				  Used to register the configured card
-+				  with the kernel.
-+
-+The device must first get configured and then registered by writing "1" to
-+the "register" file.
-+The configuration parameters "gpio_data_in", "gpio_data_out", "gpio_clock"
-+and "gpio_chipselect" are essential and _must_ be configured before writing
-+"1" to the "register" file. The registration will fail, otherwise.
-+
-+The default values for the other parameters are:
-+gpio_chipselect_activelow	= 1		(CS active-LOW)
-+spi_mode			= 0		(SPI_MODE_0)
-+spi_delay			= 1		(enabled)
-+max_bus_speed			= 5000000	(5 Mhz)
-+
-+Configuration values can not be changed after registration. To unregister
-+the device, write a "0" to the "register" file. The configuration can be
-+changed again after unregistering.
-+
-+To completely remove the device, simply rmdir the directory
-+(/config/gpiommc/my_mmc in this example).
-+There's no need to first unregister the device before removing it. That will
-+be done automatically.
diff --git a/target/linux/generic-2.6/patches-2.6.25/923-gpiommc-configfs-locking.patch b/target/linux/generic-2.6/patches-2.6.25/923-gpiommc-configfs-locking.patch
deleted file mode 100644
index c84f62b44..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/923-gpiommc-configfs-locking.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-The gpiommc configfs context structure needs locking, as configfs
-does not lock access between files.
-
---- a/drivers/mmc/host/gpiommc.c
-+++ b/drivers/mmc/host/gpiommc.c
-@@ -140,6 +140,8 @@ struct gpiommc_configfs_device {
- 	struct platform_device *pdev;
- 	/* The configuration */
- 	struct gpiommc_platform_data pdata;
-+	/* Mutex to protect this structure */
-+	struct mutex mutex;
- };
- 
- #define GPIO_INVALID	-1
-@@ -230,6 +232,8 @@ static ssize_t gpiommc_config_attr_show(
- 	unsigned int gpio;
- 	int err = 0;
- 
-+	mutex_lock(&dev->mutex);
-+
- 	if (attr == &gpiommc_attr_DI) {
- 		gpio = dev->pdata.pins.gpio_di;
- 		if (gpio == GPIO_INVALID)
-@@ -290,6 +294,8 @@ static ssize_t gpiommc_config_attr_show(
- 	WARN_ON(1);
- 	err = -ENOSYS;
- out:
-+	mutex_unlock(&dev->mutex);
-+
- 	return err ? err : count;
- }
- 
-@@ -349,6 +355,8 @@ static ssize_t gpiommc_config_attr_store
- 	int err = -EINVAL;
- 	unsigned long data;
- 
-+	mutex_lock(&dev->mutex);
-+
- 	if (attr == &gpiommc_attr_register) {
- 		err = strict_strtoul(page, 10, &data);
- 		if (err)
-@@ -474,6 +482,8 @@ static ssize_t gpiommc_config_attr_store
- 	WARN_ON(1);
- 	err = -ENOSYS;
- out:
-+	mutex_unlock(&dev->mutex);
-+
- 	return err ? err : count;
- }
- 
-@@ -510,6 +520,7 @@ static struct config_item *gpiommc_make_
- 	if (!dev)
- 		return NULL;
- 
-+	mutex_init(&dev->mutex);
- 	config_item_init_type_name(&dev->item, name,
- 				   &gpiommc_dev_ci_type);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.25/930-ppc_big_endian_io_memory_accessors.patch b/target/linux/generic-2.6/patches-2.6.25/930-ppc_big_endian_io_memory_accessors.patch
deleted file mode 100644
index 25abf821d..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/930-ppc_big_endian_io_memory_accessors.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From a.othieno@bluewin.ch Tue Oct 11 07:50:21 2005
-From: Arthur Othieno <a.othieno@bluewin.ch>
-Subject: Big-endian I/O memory accessors.
-Date: Tue, 11 Oct 2005 07:50:21 +1000
-X-Patchwork-ID: 2759
-
-From: Arthur Othieno <a.othieno@bluewin.ch>
-
-I/O memory accessors. Big endian version. For those busses/devices
-that do export big-endian I/O memory.
-
-Of notable relevance/reference:
-
-  http://lwn.net/Articles/132804/
-  http://ozlabs.org/pipermail/linuxppc-embedded/2005-August/019798.html
-  http://ozlabs.org/pipermail/linuxppc-embedded/2005-August/019752.html
-
-Signed-off-by: Arthur Othieno <a.othieno@bluewin.ch>
----
-
-Paulus, 
-
-A similar patch for ppc64 made it upstream with your big ppc64 merge.
-This one is still sitting in http://patchwork.ozlabs.org/linuxppc/
-and didn't make it with the ppc32 equivalent. Thanks.
-
-
- include/asm-ppc/io.h |   20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
-
-
----
---- a/include/asm-ppc/io.h
-+++ b/include/asm-ppc/io.h
-@@ -413,11 +413,21 @@ static inline unsigned int ioread16(void
- 	return readw(addr);
- }
- 
-+static inline unsigned int ioread16be(void __iomem *addr)
-+{
-+	return in_be16(addr);
-+}
-+
- static inline unsigned int ioread32(void __iomem *addr)
- {
- 	return readl(addr);
- }
- 
-+static inline unsigned int ioread32be(void __iomem *addr)
-+{
-+	return in_be32(addr);
-+}
-+
- static inline void iowrite8(u8 val, void __iomem *addr)
- {
- 	writeb(val, addr);
-@@ -428,11 +438,21 @@ static inline void iowrite16(u16 val, vo
- 	writew(val, addr);
- }
- 
-+static inline void iowrite16be(u16 val, void __iomem *addr)
-+{
-+	out_be16(addr, val);
-+}
-+
- static inline void iowrite32(u32 val, void __iomem *addr)
- {
- 	writel(val, addr);
- }
- 
-+static inline void iowrite32be(u32 val, void __iomem *addr)
-+{
-+	out_be32(addr, val);
-+}
-+
- static inline void ioread8_rep(void __iomem *addr, void *dst, unsigned long count)
- {
- 	_insb(addr, dst, count);
diff --git a/target/linux/generic-2.6/patches-2.6.25/940-arm_mach_types.patch b/target/linux/generic-2.6/patches-2.6.25/940-arm_mach_types.patch
deleted file mode 100644
index 3fd993812..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/940-arm_mach_types.patch
+++ /dev/null
@@ -1,149 +0,0 @@
---- a/arch/arm/tools/mach-types
-+++ b/arch/arm/tools/mach-types
-@@ -12,7 +12,7 @@
- #
- #   http://www.arm.linux.org.uk/developer/machines/?action=new
- #
--# Last update: Sat Jan 26 14:45:34 2008
-+# Last update: Sat Apr 19 15:13:28 2008
- #
- # machine_is_xxx	CONFIG_xxxx		MACH_TYPE_xxx		number
- #
-@@ -381,13 +381,13 @@ ks8695p			ARCH_KS8695P		KS8695P			363
- se4000			ARCH_SE4000		SE4000			364
- quadriceps		ARCH_QUADRICEPS		QUADRICEPS		365
- bronco			ARCH_BRONCO		BRONCO			366
--esl_wireless_tab	ARCH_ESL_WIRELESS_TABLETESL_WIRELESS_TABLET	367
-+esl_wireless_tab	ARCH_ESL_WIRELESS_TAB	ESL_WIRELESS_TAB	367
- esl_sofcomp		ARCH_ESL_SOFCOMP	ESL_SOFCOMP		368
- s5c7375			ARCH_S5C7375		S5C7375			369
- spearhead		ARCH_SPEARHEAD		SPEARHEAD		370
- pantera			ARCH_PANTERA		PANTERA			371
- prayoglite		ARCH_PRAYOGLITE		PRAYOGLITE		372
--gumstix			ARCH_GUMSTIK		GUMSTIK			373
-+gumstix			ARCH_GUMSTIX		GUMSTIX			373
- rcube			ARCH_RCUBE		RCUBE			374
- rea_olv			ARCH_REA_OLV		REA_OLV			375
- pxa_iphone		ARCH_PXA_IPHONE		PXA_IPHONE		376
-@@ -1463,7 +1463,7 @@ artemis			MACH_ARTEMIS		ARTEMIS			1462
- htctitan		MACH_HTCTITAN		HTCTITAN		1463
- qranium			MACH_QRANIUM		QRANIUM			1464
- adx_wsc2		MACH_ADX_WSC2		ADX_WSC2		1465
--adx_medinet		MACH_ADX_MEDINET	ADX_MEDINET		1466
-+adx_medcom		MACH_ADX_MEDINET	ADX_MEDINET		1466
- bboard			MACH_BBOARD		BBOARD			1467
- cambria			MACH_CAMBRIA		CAMBRIA			1468
- mt7xxx			MACH_MT7XXX		MT7XXX			1469
-@@ -1611,3 +1611,112 @@ kb9263			MACH_KB9263		KB9263			1612
- mt7108			MACH_MT7108		MT7108			1613
- smtr2440		MACH_SMTR2440		SMTR2440		1614
- manao			MACH_MANAO		MANAO			1615
-+cm_x300			MACH_CM_X300		CM_X300			1616
-+gulfstream_kp		MACH_GULFSTREAM_KP	GULFSTREAM_KP		1617
-+lanreadyfn522		MACH_LANREADYFN522	LANREADYFN522		1618
-+arma37			MACH_ARMA37		ARMA37			1619
-+mendel			MACH_MENDEL		MENDEL			1620
-+pelco_iliad		MACH_PELCO_ILIAD	PELCO_ILIAD		1621
-+unit2p			MACH_UNIT2P		UNIT2P			1622
-+inc20otter		MACH_INC20OTTER		INC20OTTER		1623
-+at91sam9g20ek		MACH_AT91SAM9G20EK	AT91SAM9G20EK		1624
-+sc_ge2			MACH_STORCENTER		STORCENTER		1625
-+smdk6410		MACH_SMDK6410		SMDK6410		1626
-+u300			MACH_U300		U300			1627
-+u500			MACH_U500		U500			1628
-+ds9260			MACH_DS9260		DS9260			1629
-+riverrock		MACH_RIVERROCK		RIVERROCK		1630
-+scibath			MACH_SCIBATH		SCIBATH			1631
-+at91sam7se		MACH_AT91SAM7SE512EK	AT91SAM7SE512EK		1632
-+wrt350n_v2		MACH_WRT350N_V2		WRT350N_V2		1633
-+multimedia		MACH_MULTIMEDIA		MULTIMEDIA		1634
-+marvin			MACH_MARVIN		MARVIN			1635
-+x500			MACH_X500		X500			1636
-+awlug4lcu		MACH_AWLUG4LCU		AWLUG4LCU		1637
-+palermoc		MACH_PALERMOC		PALERMOC		1638
-+omap_ldp		MACH_OMAP_LDP		OMAP_LDP		1639
-+ip500			MACH_IP500		IP500			1640
-+mx35ads			MACH_MACH_MX35ADS	MACH_MX35ADS		1641
-+ase2			MACH_ASE2		ASE2			1642
-+mx35evb			MACH_MX35EVB		MX35EVB			1643
-+aml_m8050		MACH_AML_M8050		AML_M8050		1644
-+mx35_3ds		MACH_MX35_3DS		MX35_3DS		1645
-+mars			MACH_MARS		MARS			1646
-+ntosd_644xa		MACH_NTOSD_644XA	NTOSD_644XA		1647
-+badger			MACH_BADGER		BADGER			1648
-+trizeps4wl		MACH_TRIZEPS4WL		TRIZEPS4WL		1649
-+trizeps5		MACH_TRIZEPS5		TRIZEPS5		1650
-+marlin			MACH_MARLIN		MARLIN			1651
-+ts7800			MACH_TS7800		TS7800			1652
-+hpipaq214		MACH_HPIPAQ214		HPIPAQ214		1653
-+at572d940dcm		MACH_AT572D940DCM	AT572D940DCM		1654
-+ne1board		MACH_NE1BOARD		NE1BOARD		1655
-+zante			MACH_ZANTE		ZANTE			1656
-+sffsdr			MACH_SFFSDR		SFFSDR			1657
-+tw2662			MACH_TW2662		TW2662			1658
-+vf10xx			MACH_VF10XX		VF10XX			1659
-+zoran43xx		MACH_ZORAN43XX		ZORAN43XX		1660
-+sonix926		MACH_SONIX926		SONIX926		1661
-+celestialsemi		MACH_CELESTIALSEMI	CELESTIALSEMI		1662
-+cc9m2443		MACH_CC9M2443		CC9M2443		1663
-+tw5334			MACH_TW5334		TW5334			1664
-+omap_htcartemis		MACH_HTCARTEMIS		HTCARTEMIS		1665
-+nal_hlite		MACH_NAL_HLITE		NAL_HLITE		1666
-+htcvogue		MACH_HTCVOGUE		HTCVOGUE		1667
-+smartweb		MACH_SMARTWEB		SMARTWEB		1668
-+mv86xx			MACH_MV86XX		MV86XX			1669
-+mv87xx			MACH_MV87XX		MV87XX			1670
-+songyoungho		MACH_SONGYOUNGHO	SONGYOUNGHO		1671
-+younghotema		MACH_YOUNGHOTEMA	YOUNGHOTEMA		1672
-+pcm037			MACH_PCM037		PCM037			1673
-+mmvp			MACH_MMVP		MMVP			1674
-+mmap			MACH_MMAP		MMAP			1675
-+ptid2410		MACH_PTID2410		PTID2410		1676
-+james_926		MACH_JAMES_926		JAMES_926		1677
-+fm6000			MACH_FM6000		FM6000			1678
-+db88f6281_bp		MACH_DB88F6281_BP	DB88F6281_BP		1680
-+rd88f6192_nas		MACH_RD88F6192_NAS	RD88F6192_NAS		1681
-+rd88f6281		MACH_RD88F6281		RD88F6281		1682
-+db78x00_bp		MACH_DB78X00_BP		DB78X00_BP		1683
-+smdk2416		MACH_SMDK2416		SMDK2416		1685
-+oce_spider_si		MACH_OCE_SPIDER_SI	OCE_SPIDER_SI		1686
-+oce_spider_sk		MACH_OCE_SPIDER_SK	OCE_SPIDER_SK		1687
-+rovern6			MACH_ROVERN6		ROVERN6			1688
-+pelco_evolution		MACH_PELCO_EVOLUTION	PELCO_EVOLUTION		1689
-+wbd111			MACH_WBD111		WBD111			1690
-+elaracpe		MACH_ELARACPE		ELARACPE		1691
-+mabv3			MACH_MABV3		MABV3			1692
-+mv2120			MACH_MV2120		MV2120			1693
-+csb737			MACH_CSB737		CSB737			1695
-+mx51_3ds		MACH_MX51_3DS		MX51_3DS		1696
-+g900			MACH_G900		G900			1697
-+apf27			MACH_APF27		APF27			1698
-+ggus2000		MACH_GGUS2000		GGUS2000		1699
-+omap_2430_mimic		MACH_OMAP_2430_MIMIC	OMAP_2430_MIMIC		1700
-+imx27lite		MACH_IMX27LITE		IMX27LITE		1701
-+almex			MACH_ALMEX		ALMEX			1702
-+control			MACH_CONTROL		CONTROL			1703
-+mba2410			MACH_MBA2410		MBA2410			1704
-+volcano			MACH_VOLCANO		VOLCANO			1705
-+zenith			MACH_ZENITH		ZENITH			1706
-+muchip			MACH_MUCHIP		MUCHIP			1707
-+magellan		MACH_MAGELLAN		MAGELLAN		1708
-+usb_a9260		MACH_USB_A9260		USB_A9260		1709
-+usb_a9263		MACH_USB_A9263		USB_A9263		1710
-+qil_a9260		MACH_QIL_A9260		QIL_A9260		1711
-+cme9210			MACH_CME9210		CME9210			1712
-+hczh4			MACH_HCZH4		HCZH4			1713
-+spearbasic		MACH_SPEARBASIC		SPEARBASIC		1714
-+dep2440			MACH_DEP2440		DEP2440			1715
-+hdl_gxr			MACH_HDL_GXR		HDL_GXR			1716
-+hdl_gt			MACH_HDL_GT		HDL_GT			1717
-+hdl_4g			MACH_HDL_4G		HDL_4G			1718
-+s3c6000			MACH_S3C6000		S3C6000			1719
-+mmsp2_mdk		MACH_MMSP2_MDK		MMSP2_MDK		1720
-+mpx220			MACH_MPX220		MPX220			1721
-+kzm_arm11_01		MACH_KZM_ARM11_01	KZM_ARM11_01		1722
-+htc_polaris		MACH_HTC_POLARIS	HTC_POLARIS		1723
-+htc_kaiser		MACH_HTC_KAISER		HTC_KAISER		1724
-+lg_ks20			MACH_LG_KS20		LG_KS20			1725
-+hhgps			MACH_HHGPS		HHGPS			1726
-+nokia_n810_wimax	MACH_NOKIA_N810_WIMAX	NOKIA_N810_WIMAX	1727
diff --git a/target/linux/generic-2.6/patches-2.6.25/960-backport_gpiolib_better_rmmod_infrastructure.patch b/target/linux/generic-2.6/patches-2.6.25/960-backport_gpiolib_better_rmmod_infrastructure.patch
deleted file mode 100644
index 8da25daa7..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/960-backport_gpiolib_better_rmmod_infrastructure.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>
-Date: Mon, 28 Apr 2008 09:14:44 +0000 (-0700)
-Subject: gpiolib: better rmmod infrastructure
-X-Git-Tag: v2.6.26-rc1~851
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=438d8908b379b6322fc3b28d45c9ebdddf58bc20
-
-gpiolib: better rmmod infrastructure
-
-As long as one or more GPIOs on a gpio chip are used its driver should not be
-unloaded.  The existing mechanism (gpiochip_remove failure) doesn't address
-that, since rmmod can no longer be made to fail by having the cleanup code
-report errors.  Module usecounts are the solution.
-
-Assuming standard "initialize struct to zero" policies, this change won't
-affect SOC platform drivers.  However, drivers for external chips (on I2C and
-SPI busses) should be updated if they can be built as modules.
-
-Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>
-[ gpio_ensure_requested() needs to update module usecounts too ]
-Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
----
-
---- a/drivers/gpio/gpiolib.c
-+++ b/drivers/gpio/gpiolib.c
-@@ -68,6 +68,9 @@ static void gpio_ensure_requested(struct
- 	if (test_and_set_bit(FLAG_REQUESTED, &desc->flags) == 0) {
- 		pr_warning("GPIO-%d autorequested\n", (int)(desc - gpio_desc));
- 		desc_set_label(desc, "[auto]");
-+		if (!try_module_get(desc->chip->owner))
-+			pr_err("GPIO-%d: module can't be gotten \n",
-+					(int)(desc - gpio_desc));
- 	}
- }
- 
-@@ -177,6 +180,9 @@ int gpio_request(unsigned gpio, const ch
- 	if (desc->chip == NULL)
- 		goto done;
- 
-+	if (!try_module_get(desc->chip->owner))
-+		goto done;
-+
- 	/* NOTE:  gpio_request() can be called in early boot,
- 	 * before IRQs are enabled.
- 	 */
-@@ -184,8 +190,10 @@ int gpio_request(unsigned gpio, const ch
- 	if (test_and_set_bit(FLAG_REQUESTED, &desc->flags) == 0) {
- 		desc_set_label(desc, label ? : "?");
- 		status = 0;
--	} else
-+	} else {
- 		status = -EBUSY;
-+		module_put(desc->chip->owner);
-+	}
- 
- done:
- 	if (status)
-@@ -209,9 +217,10 @@ void gpio_free(unsigned gpio)
- 	spin_lock_irqsave(&gpio_lock, flags);
- 
- 	desc = &gpio_desc[gpio];
--	if (desc->chip && test_and_clear_bit(FLAG_REQUESTED, &desc->flags))
-+	if (desc->chip && test_and_clear_bit(FLAG_REQUESTED, &desc->flags)) {
- 		desc_set_label(desc, NULL);
--	else
-+		module_put(desc->chip->owner);
-+	} else
- 		WARN_ON(extra_checks);
- 
- 	spin_unlock_irqrestore(&gpio_lock, flags);
---- a/include/asm-generic/gpio.h
-+++ b/include/asm-generic/gpio.h
-@@ -17,6 +17,7 @@
- #endif
- 
- struct seq_file;
-+struct module;
- 
- /**
-  * struct gpio_chip - abstract a GPIO controller
-@@ -48,6 +49,7 @@ struct seq_file;
-  */
- struct gpio_chip {
- 	char			*label;
-+	struct module		*owner;
- 
- 	int			(*direction_input)(struct gpio_chip *chip,
- 						unsigned offset);
diff --git a/target/linux/generic-2.6/patches-2.6.25/961-backport_gpio_define_gpio_valid.patch b/target/linux/generic-2.6/patches-2.6.25/961-backport_gpio_define_gpio_valid.patch
deleted file mode 100644
index 771b743ba..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/961-backport_gpio_define_gpio_valid.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>
-Date: Mon, 28 Apr 2008 09:14:46 +0000 (-0700)
-Subject: gpio: define gpio_is_valid()
-X-Git-Tag: v2.6.26-rc1~849
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=e6de1808f8ebfeb7e49f3c5a30cb8f2032beb287
-
-gpio: define gpio_is_valid()
-
-Introduce a gpio_is_valid() predicate; use it in gpiolib.
-
-Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>
-    [ use inline function; follow the gpio_* naming convention;
-      work without gpiolib; all programming interfaces need docs ]
-Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
----
-
---- a/Documentation/gpio.txt
-+++ b/Documentation/gpio.txt
-@@ -107,6 +107,16 @@ type of GPIO controller, and on one part
- The numbers need not be contiguous; either of those platforms could also
- use numbers 2000-2063 to identify GPIOs in a bank of I2C GPIO expanders.
- 
-+If you want to initialize a structure with an invalid GPIO number, use
-+some negative number (perhaps "-EINVAL"); that will never be valid.  To
-+test if a number could reference a GPIO, you may use this predicate:
-+
-+	int gpio_is_valid(int number);
-+
-+A number that's not valid will be rejected by calls which may request
-+or free GPIOs (see below).  Other numbers may also be rejected; for
-+example, a number might be valid but unused on a given board.
-+
- Whether a platform supports multiple GPIO controllers is currently a
- platform-specific implementation issue.
- 
---- a/drivers/gpio/gpiolib.c
-+++ b/drivers/gpio/gpiolib.c
-@@ -99,7 +99,7 @@ int gpiochip_add(struct gpio_chip *chip)
- 	 * dynamic allocation.  We don't currently support that.
- 	 */
- 
--	if (chip->base < 0 || (chip->base  + chip->ngpio) >= ARCH_NR_GPIOS) {
-+	if (chip->base < 0 || !gpio_is_valid(chip->base  + chip->ngpio)) {
- 		status = -EINVAL;
- 		goto fail;
- 	}
-@@ -174,7 +174,7 @@ int gpio_request(unsigned gpio, const ch
- 
- 	spin_lock_irqsave(&gpio_lock, flags);
- 
--	if (gpio >= ARCH_NR_GPIOS)
-+	if (!gpio_is_valid(gpio))
- 		goto done;
- 	desc = &gpio_desc[gpio];
- 	if (desc->chip == NULL)
-@@ -209,7 +209,7 @@ void gpio_free(unsigned gpio)
- 	unsigned long		flags;
- 	struct gpio_desc	*desc;
- 
--	if (gpio >= ARCH_NR_GPIOS) {
-+	if (!gpio_is_valid(gpio)) {
- 		WARN_ON(extra_checks);
- 		return;
- 	}
-@@ -245,7 +245,7 @@ const char *gpiochip_is_requested(struct
- {
- 	unsigned gpio = chip->base + offset;
- 
--	if (gpio >= ARCH_NR_GPIOS || gpio_desc[gpio].chip != chip)
-+	if (!gpio_is_valid(gpio) || gpio_desc[gpio].chip != chip)
- 		return NULL;
- 	if (test_bit(FLAG_REQUESTED, &gpio_desc[gpio].flags) == 0)
- 		return NULL;
-@@ -276,7 +276,7 @@ int gpio_direction_input(unsigned gpio)
- 
- 	spin_lock_irqsave(&gpio_lock, flags);
- 
--	if (gpio >= ARCH_NR_GPIOS)
-+	if (!gpio_is_valid(gpio))
- 		goto fail;
- 	chip = desc->chip;
- 	if (!chip || !chip->get || !chip->direction_input)
-@@ -314,7 +314,7 @@ int gpio_direction_output(unsigned gpio,
- 
- 	spin_lock_irqsave(&gpio_lock, flags);
- 
--	if (gpio >= ARCH_NR_GPIOS)
-+	if (!gpio_is_valid(gpio))
- 		goto fail;
- 	chip = desc->chip;
- 	if (!chip || !chip->set || !chip->direction_output)
-@@ -531,7 +531,7 @@ static int gpiolib_show(struct seq_file 
- 
- 	/* REVISIT this isn't locked against gpio_chip removal ... */
- 
--	for (gpio = 0; gpio < ARCH_NR_GPIOS; gpio++) {
-+	for (gpio = 0; gpio_is_valid(gpio); gpio++) {
- 		if (chip == gpio_desc[gpio].chip)
- 			continue;
- 		chip = gpio_desc[gpio].chip;
---- a/include/asm-generic/gpio.h
-+++ b/include/asm-generic/gpio.h
-@@ -16,6 +16,12 @@
- #define ARCH_NR_GPIOS		256
- #endif
- 
-+static inline int gpio_is_valid(int number)
-+{
-+	/* only some non-negative numbers are valid */
-+	return ((unsigned)number) < ARCH_NR_GPIOS;
-+}
-+
- struct seq_file;
- struct module;
- 
-@@ -99,6 +105,16 @@ extern int __gpio_cansleep(unsigned gpio
- 
- #else
- 
-+static inline int __gpio_is_valid(int number)
-+{
-+	/* only non-negative numbers are valid */
-+	return number >= 0;
-+}
-+
-+#ifndef gpio_is_valid
-+#define gpio_is_valid	__gpio_is_valid
-+#endif
-+
- /* platforms that don't directly support access to GPIOs through I2C, SPI,
-  * or other blocking infrastructure can use these wrappers.
-  */
diff --git a/target/linux/generic-2.6/patches-2.6.25/962-backport_gpiolib_dynamic_gpio_number_allocation.patch b/target/linux/generic-2.6/patches-2.6.25/962-backport_gpiolib_dynamic_gpio_number_allocation.patch
deleted file mode 100644
index 0960f6764..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/962-backport_gpiolib_dynamic_gpio_number_allocation.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From: Anton Vorontsov <avorontsov@ru.mvista.com>
-Date: Mon, 28 Apr 2008 09:14:46 +0000 (-0700)
-Subject: gpiolib: dynamic gpio number allocation
-X-Git-Tag: v2.6.26-rc1~848
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=8d0aab2f16c4fa170f32e7a74a52cd0122bbafef
-
-gpiolib: dynamic gpio number allocation
-
-If gpio_chip->base is negative during registration, gpiolib performs dynamic
-base allocation.  This is useful for devices that aren't always present, such
-as GPIOs on hotplugged devices rather than mainboards.  (This behavior was
-previously specified but not implemented.)
-
-To avoid using any numbers that may have been explicitly assigned but not yet
-registered, this dynamic allocation assigns GPIO numbers from the biggest
-number on down, instead of from the smallest on up.
-
-Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
-Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
----
-
---- a/drivers/gpio/gpiolib.c
-+++ b/drivers/gpio/gpiolib.c
-@@ -80,6 +80,33 @@ static inline struct gpio_chip *gpio_to_
- 	return gpio_desc[gpio].chip;
- }
- 
-+/* dynamic allocation of GPIOs, e.g. on a hotplugged device */
-+static int gpiochip_find_base(int ngpio)
-+{
-+	int i;
-+	int spare = 0;
-+	int base = -ENOSPC;
-+
-+	for (i = ARCH_NR_GPIOS - 1; i >= 0 ; i--) {
-+		struct gpio_chip *chip = gpio_desc[i].chip;
-+
-+		if (!chip) {
-+			spare++;
-+			if (spare == ngpio) {
-+				base = i;
-+				break;
-+			}
-+		} else {
-+			spare = 0;
-+			i -= chip->ngpio - 1;
-+		}
-+	}
-+
-+	if (gpio_is_valid(base))
-+		pr_debug("%s: found new base at %d\n", __func__, base);
-+	return base;
-+}
-+
- /**
-  * gpiochip_add() - register a gpio_chip
-  * @chip: the chip to register, with chip->base initialized
-@@ -88,38 +115,49 @@ static inline struct gpio_chip *gpio_to_
-  * Returns a negative errno if the chip can't be registered, such as
-  * because the chip->base is invalid or already associated with a
-  * different chip.  Otherwise it returns zero as a success code.
-+ *
-+ * If chip->base is negative, this requests dynamic assignment of
-+ * a range of valid GPIOs.
-  */
- int gpiochip_add(struct gpio_chip *chip)
- {
- 	unsigned long	flags;
- 	int		status = 0;
- 	unsigned	id;
-+	int		base = chip->base;
- 
--	/* NOTE chip->base negative is reserved to mean a request for
--	 * dynamic allocation.  We don't currently support that.
--	 */
--
--	if (chip->base < 0 || !gpio_is_valid(chip->base  + chip->ngpio)) {
-+	if ((!gpio_is_valid(base) || !gpio_is_valid(base + chip->ngpio))
-+			&& base >= 0) {
- 		status = -EINVAL;
- 		goto fail;
- 	}
- 
- 	spin_lock_irqsave(&gpio_lock, flags);
- 
-+	if (base < 0) {
-+		base = gpiochip_find_base(chip->ngpio);
-+		if (base < 0) {
-+			status = base;
-+			goto fail_unlock;
-+		}
-+		chip->base = base;
-+	}
-+
- 	/* these GPIO numbers must not be managed by another gpio_chip */
--	for (id = chip->base; id < chip->base + chip->ngpio; id++) {
-+	for (id = base; id < base + chip->ngpio; id++) {
- 		if (gpio_desc[id].chip != NULL) {
- 			status = -EBUSY;
- 			break;
- 		}
- 	}
- 	if (status == 0) {
--		for (id = chip->base; id < chip->base + chip->ngpio; id++) {
-+		for (id = base; id < base + chip->ngpio; id++) {
- 			gpio_desc[id].chip = chip;
- 			gpio_desc[id].flags = 0;
- 		}
- 	}
- 
-+fail_unlock:
- 	spin_unlock_irqrestore(&gpio_lock, flags);
- fail:
- 	/* failures here can mean systems won't boot... */
diff --git a/target/linux/generic-2.6/patches-2.6.25/963-backport_gpio_chip_reserve.patch b/target/linux/generic-2.6/patches-2.6.25/963-backport_gpio_chip_reserve.patch
deleted file mode 100644
index abf77c355..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/963-backport_gpio_chip_reserve.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From: Anton Vorontsov <avorontsov@ru.mvista.com>
-Date: Mon, 28 Apr 2008 09:14:47 +0000 (-0700)
-Subject: gpiochip_reserve()
-X-Git-Tag: v2.6.26-rc1~847
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=169b6a7a6e91e1ea32136681b475cbaf2074bf35
-
-gpiochip_reserve()
-
-Add a new function gpiochip_reserve() to reserve ranges of gpios that platform
-code has pre-allocated.  That is, this marks gpio numbers which will be
-claimed by drivers that haven't yet been loaded, and thus are not available
-for dynamic gpio number allocation.
-
-[akpm@linux-foundation.org: remove unneeded __must_check]
-[david-b@pacbell.net: don't export gpiochip_reserve (section fix)]
-Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
-Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
----
-
---- a/drivers/gpio/gpiolib.c
-+++ b/drivers/gpio/gpiolib.c
-@@ -43,6 +43,7 @@ struct gpio_desc {
- /* flag symbols are bit numbers */
- #define FLAG_REQUESTED	0
- #define FLAG_IS_OUT	1
-+#define FLAG_RESERVED	2
- 
- #ifdef CONFIG_DEBUG_FS
- 	const char		*label;
-@@ -88,9 +89,10 @@ static int gpiochip_find_base(int ngpio)
- 	int base = -ENOSPC;
- 
- 	for (i = ARCH_NR_GPIOS - 1; i >= 0 ; i--) {
--		struct gpio_chip *chip = gpio_desc[i].chip;
-+		struct gpio_desc *desc = &gpio_desc[i];
-+		struct gpio_chip *chip = desc->chip;
- 
--		if (!chip) {
-+		if (!chip && !test_bit(FLAG_RESERVED, &desc->flags)) {
- 			spare++;
- 			if (spare == ngpio) {
- 				base = i;
-@@ -98,7 +100,8 @@ static int gpiochip_find_base(int ngpio)
- 			}
- 		} else {
- 			spare = 0;
--			i -= chip->ngpio - 1;
-+			if (chip)
-+				i -= chip->ngpio - 1;
- 		}
- 	}
- 
-@@ -108,6 +111,47 @@ static int gpiochip_find_base(int ngpio)
- }
- 
- /**
-+ * gpiochip_reserve() - reserve range of gpios to use with platform code only
-+ * @start: starting gpio number
-+ * @ngpio: number of gpios to reserve
-+ * Context: platform init, potentially before irqs or kmalloc will work
-+ *
-+ * Returns a negative errno if any gpio within the range is already reserved
-+ * or registered, else returns zero as a success code.  Use this function
-+ * to mark a range of gpios as unavailable for dynamic gpio number allocation,
-+ * for example because its driver support is not yet loaded.
-+ */
-+int __init gpiochip_reserve(int start, int ngpio)
-+{
-+	int ret = 0;
-+	unsigned long flags;
-+	int i;
-+
-+	if (!gpio_is_valid(start) || !gpio_is_valid(start + ngpio))
-+		return -EINVAL;
-+
-+	spin_lock_irqsave(&gpio_lock, flags);
-+
-+	for (i = start; i < start + ngpio; i++) {
-+		struct gpio_desc *desc = &gpio_desc[i];
-+
-+		if (desc->chip || test_bit(FLAG_RESERVED, &desc->flags)) {
-+			ret = -EBUSY;
-+			goto err;
-+		}
-+
-+		set_bit(FLAG_RESERVED, &desc->flags);
-+	}
-+
-+	pr_debug("%s: reserved gpios from %d to %d\n",
-+		 __func__, start, start + ngpio - 1);
-+err:
-+	spin_unlock_irqrestore(&gpio_lock, flags);
-+
-+	return ret;
-+}
-+
-+/**
-  * gpiochip_add() - register a gpio_chip
-  * @chip: the chip to register, with chip->base initialized
-  * Context: potentially before irqs or kmalloc will work
---- a/include/asm-generic/gpio.h
-+++ b/include/asm-generic/gpio.h
-@@ -74,6 +74,7 @@ struct gpio_chip {
- 
- extern const char *gpiochip_is_requested(struct gpio_chip *chip,
- 			unsigned offset);
-+extern int __init __must_check gpiochip_reserve(int start, int ngpio);
- 
- /* add/remove chips */
- extern int gpiochip_add(struct gpio_chip *chip);
diff --git a/target/linux/generic-2.6/patches-2.6.25/964-backport_gpiolib_fix_off_by_one_errors.patch b/target/linux/generic-2.6/patches-2.6.25/964-backport_gpiolib_fix_off_by_one_errors.patch
deleted file mode 100644
index c875a0d4c..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/964-backport_gpiolib_fix_off_by_one_errors.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: Trent Piepho <xyzzy@speakeasy.org>
-Date: Fri, 23 May 2008 20:04:44 +0000 (-0700)
-Subject: gpiolib: fix off by one errors
-X-Git-Tag: v2.6.26-rc4~31
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=bff5fda972dc23bd1806a47c2098ae173585d013
-
-gpiolib: fix off by one errors
-
-The last gpio belonging to a chip is chip->base + chip->ngpios - 1.  Some
-places in the code, but not all, forgot the critical minus one.
-
-Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
-Acked-by: David Brownell <dbrownell@users.sourceforge.net>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
----
-
---- a/drivers/gpio/gpiolib.c
-+++ b/drivers/gpio/gpiolib.c
-@@ -127,7 +127,7 @@ int __init gpiochip_reserve(int start, i
- 	unsigned long flags;
- 	int i;
- 
--	if (!gpio_is_valid(start) || !gpio_is_valid(start + ngpio))
-+	if (!gpio_is_valid(start) || !gpio_is_valid(start + ngpio - 1))
- 		return -EINVAL;
- 
- 	spin_lock_irqsave(&gpio_lock, flags);
-@@ -170,7 +170,7 @@ int gpiochip_add(struct gpio_chip *chip)
- 	unsigned	id;
- 	int		base = chip->base;
- 
--	if ((!gpio_is_valid(base) || !gpio_is_valid(base + chip->ngpio))
-+	if ((!gpio_is_valid(base) || !gpio_is_valid(base + chip->ngpio - 1))
- 			&& base >= 0) {
- 		status = -EINVAL;
- 		goto fail;
-@@ -207,7 +207,7 @@ fail:
- 	/* failures here can mean systems won't boot... */
- 	if (status)
- 		pr_err("gpiochip_add: gpios %d..%d (%s) not registered\n",
--			chip->base, chip->base + chip->ngpio,
-+			chip->base, chip->base + chip->ngpio - 1,
- 			chip->label ? : "generic");
- 	return status;
- }
diff --git a/target/linux/generic-2.6/patches-2.6.25/971-ocf_20080917.patch b/target/linux/generic-2.6/patches-2.6.25/971-ocf_20080917.patch
deleted file mode 100644
index 4661bad13..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/971-ocf_20080917.patch
+++ /dev/null
@@ -1,180 +0,0 @@
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -593,3 +593,6 @@ config CRYPTO_LZO
- source "drivers/crypto/Kconfig"
- 
- endif	# if CRYPTO
-+
-+source "crypto/ocf/Kconfig"
-+
---- a/crypto/Makefile
-+++ b/crypto/Makefile
-@@ -65,6 +65,8 @@ obj-$(CONFIG_CRYPTO_LZO) += lzo.o
- 
- obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o
- 
-+obj-$(CONFIG_OCF_OCF) += ocf/
-+
- #
- # generic algorithms and the async_tx api
- #
---- a/drivers/char/random.c
-+++ b/drivers/char/random.c
-@@ -129,6 +129,9 @@
-  *                                unsigned int value);
-  * 	void add_interrupt_randomness(int irq);
-  *
-+ *      void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
-+ *      int random_input_wait(void);
-+ *
-  * add_input_randomness() uses the input layer interrupt timing, as well as
-  * the event type information from the hardware.
-  *
-@@ -140,6 +143,13 @@
-  * a better measure, since the timing of the disk interrupts are more
-  * unpredictable.
-  *
-+ * random_input_words() just provides a raw block of entropy to the input
-+ * pool, such as from a hardware entropy generator.
-+ *
-+ * random_input_wait() suspends the caller until such time as the
-+ * entropy pool falls below the write threshold, and returns a count of how
-+ * much entropy (in bits) is needed to sustain the pool.
-+ *
-  * All of these routines try to estimate how many bits of randomness a
-  * particular randomness source.  They do this by keeping track of the
-  * first and second order deltas of the event timings.
-@@ -669,6 +679,61 @@ void add_disk_randomness(struct gendisk 
- }
- #endif
- 
-+/*
-+ * random_input_words - add bulk entropy to pool
-+ *
-+ * @buf: buffer to add
-+ * @wordcount: number of __u32 words to add
-+ * @ent_count: total amount of entropy (in bits) to credit
-+ *
-+ * this provides bulk input of entropy to the input pool
-+ *
-+ */
-+void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
-+{
-+	add_entropy_words(&input_pool, buf, wordcount);
-+
-+	credit_entropy_store(&input_pool, ent_count);
-+
-+	DEBUG_ENT("crediting %d bits => %d\n",
-+		  ent_count, input_pool.entropy_count);
-+	/*
-+	 * Wake up waiting processes if we have enough
-+	 * entropy.
-+	 */
-+	if (input_pool.entropy_count >= random_read_wakeup_thresh)
-+		wake_up_interruptible(&random_read_wait);
-+}
-+EXPORT_SYMBOL(random_input_words);
-+
-+/*
-+ * random_input_wait - wait until random needs entropy
-+ *
-+ * this function sleeps until the /dev/random subsystem actually
-+ * needs more entropy, and then return the amount of entropy
-+ * that it would be nice to have added to the system.
-+ */
-+int random_input_wait(void)
-+{
-+	int count;
-+
-+	wait_event_interruptible(random_write_wait, 
-+			 input_pool.entropy_count < random_write_wakeup_thresh);
-+
-+	count = random_write_wakeup_thresh - input_pool.entropy_count;
-+
-+        /* likely we got woken up due to a signal */
-+	if (count <= 0) count = random_read_wakeup_thresh; 
-+
-+	DEBUG_ENT("requesting %d bits from input_wait()er %d<%d\n",
-+		  count,
-+		  input_pool.entropy_count, random_write_wakeup_thresh);
-+
-+	return count;
-+}
-+EXPORT_SYMBOL(random_input_wait);
-+
-+
- #define EXTRACT_SIZE 10
- 
- /*********************************************************************
---- a/fs/fcntl.c
-+++ b/fs/fcntl.c
-@@ -202,6 +202,7 @@ asmlinkage long sys_dup(unsigned int fil
- 		ret = dupfd(file, 0, 0);
- 	return ret;
- }
-+EXPORT_SYMBOL(sys_dup);
- 
- #define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | FASYNC | O_DIRECT | O_NOATIME)
- 
---- a/include/linux/miscdevice.h
-+++ b/include/linux/miscdevice.h
-@@ -12,6 +12,7 @@
- #define APOLLO_MOUSE_MINOR 7
- #define PC110PAD_MINOR 9
- /*#define ADB_MOUSE_MINOR 10	FIXME OBSOLETE */
-+#define CRYPTODEV_MINOR		70	/* /dev/crypto */
- #define WATCHDOG_MINOR		130	/* Watchdog timer     */
- #define TEMP_MINOR		131	/* Temperature Sensor */
- #define RTC_MINOR 135
---- a/include/linux/random.h
-+++ b/include/linux/random.h
-@@ -8,6 +8,7 @@
- #define _LINUX_RANDOM_H
- 
- #include <linux/ioctl.h>
-+#include <linux/types.h> /* for __u32 in user space */
- 
- /* ioctl()'s for the random number generator */
- 
-@@ -32,6 +33,30 @@
- /* Clear the entropy pool and associated counters.  (Superuser only.) */
- #define RNDCLEARPOOL	_IO( 'R', 0x06 )
- 
-+#ifdef CONFIG_FIPS_RNG
-+
-+/* Size of seed value - equal to AES blocksize */
-+#define AES_BLOCK_SIZE_BYTES	16
-+#define SEED_SIZE_BYTES			AES_BLOCK_SIZE_BYTES
-+/* Size of AES key */
-+#define KEY_SIZE_BYTES		16
-+
-+/* ioctl() structure used by FIPS 140-2 Tests */
-+struct rand_fips_test {
-+	unsigned char key[KEY_SIZE_BYTES];			/* Input */
-+	unsigned char datetime[SEED_SIZE_BYTES];	/* Input */
-+	unsigned char seed[SEED_SIZE_BYTES];		/* Input */
-+	unsigned char result[SEED_SIZE_BYTES];		/* Output */
-+};
-+
-+/* FIPS 140-2 RNG Variable Seed Test. (Superuser only.) */
-+#define RNDFIPSVST	_IOWR('R', 0x10, struct rand_fips_test)
-+
-+/* FIPS 140-2 RNG Monte Carlo Test. (Superuser only.) */
-+#define RNDFIPSMCT	_IOWR('R', 0x11, struct rand_fips_test)
-+
-+#endif /* #ifdef CONFIG_FIPS_RNG */
-+
- struct rand_pool_info {
- 	int	entropy_count;
- 	int	buf_size;
-@@ -48,6 +73,10 @@ extern void add_input_randomness(unsigne
- 				 unsigned int value);
- extern void add_interrupt_randomness(int irq);
- 
-+extern void random_input_words(__u32 *buf, size_t wordcount, int ent_count);
-+extern int random_input_wait(void);
-+#define HAS_RANDOM_INPUT_WAIT 1
-+
- extern void get_random_bytes(void *buf, int nbytes);
- void generate_random_uuid(unsigned char uuid_out[16]);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.25/972-ocf_compile_fix.patch b/target/linux/generic-2.6/patches-2.6.25/972-ocf_compile_fix.patch
deleted file mode 100644
index a3fa22681..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/972-ocf_compile_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/crypto/ocf/cryptosoft.c
-+++ b/crypto/ocf/cryptosoft.c
-@@ -47,7 +47,7 @@
- #include <linux/mm.h>
- #include <linux/skbuff.h>
- #include <linux/random.h>
--#include <asm/scatterlist.h>
-+#include <linux/scatterlist.h>
- 
- #include <cryptodev.h>
- #include <uio.h>
diff --git a/target/linux/generic-2.6/patches-2.6.25/981-backport_usb_serial_sierrawireless_ids.patch b/target/linux/generic-2.6/patches-2.6.25/981-backport_usb_serial_sierrawireless_ids.patch
deleted file mode 100644
index d5bb40f3e..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/981-backport_usb_serial_sierrawireless_ids.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/drivers/usb/serial/sierra.c
-+++ b/drivers/usb/serial/sierra.c
-@@ -166,14 +166,19 @@ static struct usb_device_id id_table [] 
- 	{ USB_DEVICE(0x1199, 0x6815) },	/* Sierra Wireless MC8775 */
- 	{ USB_DEVICE(0x03f0, 0x1e1d) },	/* HP hs2300 a.k.a MC8775 */
- 	{ USB_DEVICE(0x1199, 0x6820) },	/* Sierra Wireless AirCard 875 */
-+	{ USB_DEVICE(0x1199, 0x6821) },	/* Sierra Wireless AirCard 875U */
- 	{ USB_DEVICE(0x1199, 0x6832) },	/* Sierra Wireless MC8780*/
- 	{ USB_DEVICE(0x1199, 0x6833) },	/* Sierra Wireless MC8781*/
-+	{ USB_DEVICE(0x1199, 0x683B), .driver_info = DEVICE_1_PORT }, /* Sierra Wireless MC8785 Composite*/
-+	{ USB_DEVICE(0x1199, 0x683C), .driver_info = DEVICE_1_PORT }, /* Sierra Wireless MC8790 Composite*/
- 	{ USB_DEVICE(0x1199, 0x6850) },	/* Sierra Wireless AirCard 880 */
- 	{ USB_DEVICE(0x1199, 0x6851) },	/* Sierra Wireless AirCard 881 */
- 	{ USB_DEVICE(0x1199, 0x6852) },	/* Sierra Wireless AirCard 880 E */
- 	{ USB_DEVICE(0x1199, 0x6853) },	/* Sierra Wireless AirCard 881 E */
- 	{ USB_DEVICE(0x1199, 0x6855) },	/* Sierra Wireless AirCard 880 U */
- 	{ USB_DEVICE(0x1199, 0x6856) },	/* Sierra Wireless AirCard 881 U */
-+	{ USB_DEVICE(0x1199, 0x6859), .driver_info = DEVICE_1_PORT }, /* Sierra Wireless AirCard 885 E */
-+	{ USB_DEVICE(0x1199, 0x685A), .driver_info = DEVICE_1_PORT }, /* Sierra Wireless AirCard 885 E */
- 
- 	{ USB_DEVICE(0x1199, 0x6468) }, /* Sierra Wireless MP3G - EVDO */
- 	{ USB_DEVICE(0x1199, 0x6469) }, /* Sierra Wireless MP3G - UMTS/HSPA */
diff --git a/target/linux/generic-2.6/patches-2.6.25/999-use_preinit_as_init.patch b/target/linux/generic-2.6/patches-2.6.25/999-use_preinit_as_init.patch
deleted file mode 100644
index d61546d31..000000000
--- a/target/linux/generic-2.6/patches-2.6.25/999-use_preinit_as_init.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/init/main.c
-+++ b/init/main.c
-@@ -797,10 +797,7 @@ static int noinline init_post(void)
- 		printk(KERN_WARNING "Failed to execute %s.  Attempting "
- 					"defaults...\n", execute_command);
- 	}
--	run_init_process("/sbin/init");
--	run_init_process("/etc/init");
--	run_init_process("/bin/init");
--	run_init_process("/bin/sh");
-+	run_init_process("/etc/preinit");
- 
- 	panic("No init found.  Try passing init= option to kernel.");
- }
diff --git a/target/linux/generic-2.6/patches-2.6.30/941-ssb_update.patch b/target/linux/generic-2.6/patches-2.6.30/941-ssb_update.patch
index 7fdb3ca26..8d2d15895 100644
--- a/target/linux/generic-2.6/patches-2.6.30/941-ssb_update.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/941-ssb_update.patch
@@ -22,7 +22,28 @@
  struct pmu0_plltab_entry {
  	u16 freq;	/* Crystal frequency in kHz.*/
  	u8 xf;		/* Crystal frequency value for PMU control */
-@@ -506,3 +521,82 @@ void ssb_pmu_init(struct ssb_chipcommon 
+@@ -317,6 +332,12 @@ static void ssb_pmu_pll_init(struct ssb_
+ 	case 0x5354:
+ 		ssb_pmu0_pllinit_r0(cc, crystalfreq);
+ 		break;
++	case 0x4322:
++		if (cc->pmu.rev == 2) {
++			chipco_write32(cc, SSB_CHIPCO_PLLCTL_ADDR, 0x0000000A);
++			chipco_write32(cc, SSB_CHIPCO_PLLCTL_DATA, 0x380005C0);
++		}
++		break;
+ 	default:
+ 		ssb_printk(KERN_ERR PFX
+ 			   "ERROR: PLL init unknown for device %04X\n",
+@@ -402,6 +423,7 @@ static void ssb_pmu_resources_init(struc
+ 
+ 	switch (bus->chip_id) {
+ 	case 0x4312:
++	case 0x4322:
+ 		/* We keep the default settings:
+ 		 * min_msk = 0xCBB
+ 		 * max_msk = 0x7FFFF
+@@ -506,3 +528,82 @@ void ssb_pmu_init(struct ssb_chipcommon 
  	ssb_pmu_pll_init(cc);
  	ssb_pmu_resources_init(cc);
  }
@@ -139,9 +160,12 @@
  /* ssb must be initialized after PCI but before the ssb drivers.
 --- a/drivers/ssb/pci.c
 +++ b/drivers/ssb/pci.c
-@@ -169,8 +169,14 @@ err_pci:
+@@ -167,10 +167,16 @@ err_pci:
+ }
+ 
  /* Get the word-offset for a SSB_SPROM_XXX define. */
- #define SPOFF(offset)	(((offset) - SSB_SPROM_BASE) / sizeof(u16))
+-#define SPOFF(offset)	(((offset) - SSB_SPROM_BASE) / sizeof(u16))
++#define SPOFF(offset)	((offset) / sizeof(u16))
  /* Helper to extract some _offset, which is one of the SSB_SPROM_XXX defines. */
 -#define SPEX(_outvar, _offset, _mask, _shift)	\
 +#define SPEX16(_outvar, _offset, _mask, _shift)	\
@@ -155,6 +179,24 @@
  
  static inline u8 ssb_crc8(u8 crc, u8 data)
  {
+@@ -247,7 +253,7 @@ static int sprom_do_read(struct ssb_bus 
+ 	int i;
+ 
+ 	for (i = 0; i < bus->sprom_size; i++)
+-		sprom[i] = ioread16(bus->mmio + SSB_SPROM_BASE + (i * 2));
++		sprom[i] = ioread16(bus->mmio + bus->sprom_offset + (i * 2));
+ 
+ 	return 0;
+ }
+@@ -278,7 +284,7 @@ static int sprom_do_write(struct ssb_bus
+ 			ssb_printk("75%%");
+ 		else if (i % 2)
+ 			ssb_printk(".");
+-		writew(sprom[i], bus->mmio + SSB_SPROM_BASE + (i * 2));
++		writew(sprom[i], bus->mmio + bus->sprom_offset + (i * 2));
+ 		mmiowb();
+ 		msleep(20);
+ 	}
 @@ -474,12 +480,14 @@ static void sprom_extract_r8(struct ssb_
  
  	/* extract the MAC address */
@@ -235,6 +277,21 @@
  			sprom_extract_r123(out, in);
  		}
  	}
+@@ -568,6 +620,14 @@ static int ssb_pci_sprom_get(struct ssb_
+ 	int err = -ENOMEM;
+ 	u16 *buf;
+ 
++	if (!ssb_is_sprom_available(bus)) {
++		ssb_printk(KERN_ERR PFX "No SPROM available!\n");
++		return -ENODEV;
++	}
++
++	bus->sprom_offset = (bus->chipco.dev->id.revision < 31) ?
++		SSB_SPROM_BASE1 : SSB_SPROM_BASE31;
++
+ 	buf = kcalloc(SSB_SPROMSIZE_WORDS_R123, sizeof(u16), GFP_KERNEL);
+ 	if (!buf)
+ 		goto out;
 --- a/drivers/ssb/pcmcia.c
 +++ b/drivers/ssb/pcmcia.c
 @@ -583,7 +583,7 @@ static int ssb_pcmcia_sprom_write_all(st
@@ -255,26 +312,259 @@
  			   "Could not disable SPROM write access.\n");
  		failed = 1;
  	}
-@@ -678,7 +678,8 @@ int ssb_pcmcia_get_invariants(struct ssb
- 			sprom->board_rev = tuple.TupleData[1];
- 			break;
- 		case SSB_PCMCIA_CIS_PA:
+@@ -617,134 +617,140 @@ static int ssb_pcmcia_sprom_check_crc(co
+ 	}						\
+   } while (0)
+ 
+-int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
+-			      struct ssb_init_invariants *iv)
++static int ssb_pcmcia_get_mac(struct pcmcia_device *p_dev,
++			tuple_t *tuple,
++			void *priv)
+ {
+-	tuple_t tuple;
+-	int res;
+-	unsigned char buf[32];
++	struct ssb_sprom *sprom = priv;
++
++	if (tuple->TupleData[0] != CISTPL_FUNCE_LAN_NODE_ID)
++		return -EINVAL;
++	if (tuple->TupleDataLen != ETH_ALEN + 2)
++		return -EINVAL;
++	if (tuple->TupleData[1] != ETH_ALEN)
++		return -EINVAL;
++	memcpy(sprom->il0mac, &tuple->TupleData[2], ETH_ALEN);
++	return 0;
++};
++
++static int ssb_pcmcia_do_get_invariants(struct pcmcia_device *p_dev,
++					tuple_t *tuple,
++					void *priv)
++{
++	struct ssb_init_invariants *iv = priv;
+ 	struct ssb_sprom *sprom = &iv->sprom;
+ 	struct ssb_boardinfo *bi = &iv->boardinfo;
+ 	const char *error_description;
+ 
++	GOTO_ERROR_ON(tuple->TupleDataLen < 1, "VEN tpl < 1");
++	switch (tuple->TupleData[0]) {
++	case SSB_PCMCIA_CIS_ID:
++		GOTO_ERROR_ON((tuple->TupleDataLen != 5) &&
++			      (tuple->TupleDataLen != 7),
++			      "id tpl size");
++		bi->vendor = tuple->TupleData[1] |
++			((u16)tuple->TupleData[2] << 8);
++		break;
++	case SSB_PCMCIA_CIS_BOARDREV:
++		GOTO_ERROR_ON(tuple->TupleDataLen != 2,
++			"boardrev tpl size");
++		sprom->board_rev = tuple->TupleData[1];
++		break;
++	case SSB_PCMCIA_CIS_PA:
++		GOTO_ERROR_ON((tuple->TupleDataLen != 9) &&
++			(tuple->TupleDataLen != 10),
++			"pa tpl size");
++		sprom->pa0b0 = tuple->TupleData[1] |
++			((u16)tuple->TupleData[2] << 8);
++		sprom->pa0b1 = tuple->TupleData[3] |
++			((u16)tuple->TupleData[4] << 8);
++		sprom->pa0b2 = tuple->TupleData[5] |
++			((u16)tuple->TupleData[6] << 8);
++		sprom->itssi_a = tuple->TupleData[7];
++		sprom->itssi_bg = tuple->TupleData[7];
++		sprom->maxpwr_a = tuple->TupleData[8];
++		sprom->maxpwr_bg = tuple->TupleData[8];
++		break;
++	case SSB_PCMCIA_CIS_OEMNAME:
++		/* We ignore this. */
++		break;
++	case SSB_PCMCIA_CIS_CCODE:
++		GOTO_ERROR_ON(tuple->TupleDataLen != 2,
++			"ccode tpl size");
++		sprom->country_code = tuple->TupleData[1];
++		break;
++	case SSB_PCMCIA_CIS_ANTENNA:
++		GOTO_ERROR_ON(tuple->TupleDataLen != 2,
++			"ant tpl size");
++		sprom->ant_available_a = tuple->TupleData[1];
++		sprom->ant_available_bg = tuple->TupleData[1];
++		break;
++	case SSB_PCMCIA_CIS_ANTGAIN:
++		GOTO_ERROR_ON(tuple->TupleDataLen != 2,
++			"antg tpl size");
++		sprom->antenna_gain.ghz24.a0 = tuple->TupleData[1];
++		sprom->antenna_gain.ghz24.a1 = tuple->TupleData[1];
++		sprom->antenna_gain.ghz24.a2 = tuple->TupleData[1];
++		sprom->antenna_gain.ghz24.a3 = tuple->TupleData[1];
++		sprom->antenna_gain.ghz5.a0 = tuple->TupleData[1];
++		sprom->antenna_gain.ghz5.a1 = tuple->TupleData[1];
++		sprom->antenna_gain.ghz5.a2 = tuple->TupleData[1];
++		sprom->antenna_gain.ghz5.a3 = tuple->TupleData[1];
++		break;
++	case SSB_PCMCIA_CIS_BFLAGS:
++		GOTO_ERROR_ON((tuple->TupleDataLen != 3) &&
++			(tuple->TupleDataLen != 5),
++			"bfl tpl size");
++		sprom->boardflags_lo = tuple->TupleData[1] |
++			((u16)tuple->TupleData[2] << 8);
++		break;
++	case SSB_PCMCIA_CIS_LEDS:
++		GOTO_ERROR_ON(tuple->TupleDataLen != 5,
++			"leds tpl size");
++		sprom->gpio0 = tuple->TupleData[1];
++		sprom->gpio1 = tuple->TupleData[2];
++		sprom->gpio2 = tuple->TupleData[3];
++		sprom->gpio3 = tuple->TupleData[4];
++		break;
++	}
++	return -ENOSPC; /* continue with next entry */
++
++error:
++	ssb_printk(KERN_ERR PFX
++		   "PCMCIA: Failed to fetch device invariants: %s\n",
++		   error_description);
++	return -ENODEV;
++}
++
++
++int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
++			      struct ssb_init_invariants *iv)
++{
++	struct ssb_sprom *sprom = &iv->sprom;
++	int res;
++
+ 	memset(sprom, 0xFF, sizeof(*sprom));
+ 	sprom->revision = 1;
+ 	sprom->boardflags_lo = 0;
+ 	sprom->boardflags_hi = 0;
+ 
+ 	/* First fetch the MAC address. */
+-	memset(&tuple, 0, sizeof(tuple));
+-	tuple.DesiredTuple = CISTPL_FUNCE;
+-	tuple.TupleData = buf;
+-	tuple.TupleDataMax = sizeof(buf);
+-	res = pcmcia_get_first_tuple(bus->host_pcmcia, &tuple);
+-	GOTO_ERROR_ON(res != 0, "MAC first tpl");
+-	res = pcmcia_get_tuple_data(bus->host_pcmcia, &tuple);
+-	GOTO_ERROR_ON(res != 0, "MAC first tpl data");
+-	while (1) {
+-		GOTO_ERROR_ON(tuple.TupleDataLen < 1, "MAC tpl < 1");
+-		if (tuple.TupleData[0] == CISTPL_FUNCE_LAN_NODE_ID)
+-			break;
+-		res = pcmcia_get_next_tuple(bus->host_pcmcia, &tuple);
+-		GOTO_ERROR_ON(res != 0, "MAC next tpl");
+-		res = pcmcia_get_tuple_data(bus->host_pcmcia, &tuple);
+-		GOTO_ERROR_ON(res != 0, "MAC next tpl data");
++	res = pcmcia_loop_tuple(bus->host_pcmcia, CISTPL_FUNCE,
++				ssb_pcmcia_get_mac, sprom);
++	if (res != 0) {
++		ssb_printk(KERN_ERR PFX
++			"PCMCIA: Failed to fetch MAC address\n");
++		return -ENODEV;
+ 	}
+-	GOTO_ERROR_ON(tuple.TupleDataLen != ETH_ALEN + 2, "MAC tpl size");
+-	memcpy(sprom->il0mac, &tuple.TupleData[2], ETH_ALEN);
+ 
+ 	/* Fetch the vendor specific tuples. */
+-	memset(&tuple, 0, sizeof(tuple));
+-	tuple.DesiredTuple = SSB_PCMCIA_CIS;
+-	tuple.TupleData = buf;
+-	tuple.TupleDataMax = sizeof(buf);
+-	res = pcmcia_get_first_tuple(bus->host_pcmcia, &tuple);
+-	GOTO_ERROR_ON(res != 0, "VEN first tpl");
+-	res = pcmcia_get_tuple_data(bus->host_pcmcia, &tuple);
+-	GOTO_ERROR_ON(res != 0, "VEN first tpl data");
+-	while (1) {
+-		GOTO_ERROR_ON(tuple.TupleDataLen < 1, "VEN tpl < 1");
+-		switch (tuple.TupleData[0]) {
+-		case SSB_PCMCIA_CIS_ID:
+-			GOTO_ERROR_ON((tuple.TupleDataLen != 5) &&
+-				      (tuple.TupleDataLen != 7),
+-				      "id tpl size");
+-			bi->vendor = tuple.TupleData[1] |
+-			       ((u16)tuple.TupleData[2] << 8);
+-			break;
+-		case SSB_PCMCIA_CIS_BOARDREV:
+-			GOTO_ERROR_ON(tuple.TupleDataLen != 2,
+-				      "boardrev tpl size");
+-			sprom->board_rev = tuple.TupleData[1];
+-			break;
+-		case SSB_PCMCIA_CIS_PA:
 -			GOTO_ERROR_ON(tuple.TupleDataLen != 9,
-+			GOTO_ERROR_ON((tuple.TupleDataLen != 9) &&
-+				      (tuple.TupleDataLen != 10),
- 				      "pa tpl size");
- 			sprom->pa0b0 = tuple.TupleData[1] |
- 				 ((u16)tuple.TupleData[2] << 8);
-@@ -718,7 +719,8 @@ int ssb_pcmcia_get_invariants(struct ssb
- 			sprom->antenna_gain.ghz5.a3 = tuple.TupleData[1];
- 			break;
- 		case SSB_PCMCIA_CIS_BFLAGS:
+-				      "pa tpl size");
+-			sprom->pa0b0 = tuple.TupleData[1] |
+-				 ((u16)tuple.TupleData[2] << 8);
+-			sprom->pa0b1 = tuple.TupleData[3] |
+-				 ((u16)tuple.TupleData[4] << 8);
+-			sprom->pa0b2 = tuple.TupleData[5] |
+-				 ((u16)tuple.TupleData[6] << 8);
+-			sprom->itssi_a = tuple.TupleData[7];
+-			sprom->itssi_bg = tuple.TupleData[7];
+-			sprom->maxpwr_a = tuple.TupleData[8];
+-			sprom->maxpwr_bg = tuple.TupleData[8];
+-			break;
+-		case SSB_PCMCIA_CIS_OEMNAME:
+-			/* We ignore this. */
+-			break;
+-		case SSB_PCMCIA_CIS_CCODE:
+-			GOTO_ERROR_ON(tuple.TupleDataLen != 2,
+-				      "ccode tpl size");
+-			sprom->country_code = tuple.TupleData[1];
+-			break;
+-		case SSB_PCMCIA_CIS_ANTENNA:
+-			GOTO_ERROR_ON(tuple.TupleDataLen != 2,
+-				      "ant tpl size");
+-			sprom->ant_available_a = tuple.TupleData[1];
+-			sprom->ant_available_bg = tuple.TupleData[1];
+-			break;
+-		case SSB_PCMCIA_CIS_ANTGAIN:
+-			GOTO_ERROR_ON(tuple.TupleDataLen != 2,
+-				      "antg tpl size");
+-			sprom->antenna_gain.ghz24.a0 = tuple.TupleData[1];
+-			sprom->antenna_gain.ghz24.a1 = tuple.TupleData[1];
+-			sprom->antenna_gain.ghz24.a2 = tuple.TupleData[1];
+-			sprom->antenna_gain.ghz24.a3 = tuple.TupleData[1];
+-			sprom->antenna_gain.ghz5.a0 = tuple.TupleData[1];
+-			sprom->antenna_gain.ghz5.a1 = tuple.TupleData[1];
+-			sprom->antenna_gain.ghz5.a2 = tuple.TupleData[1];
+-			sprom->antenna_gain.ghz5.a3 = tuple.TupleData[1];
+-			break;
+-		case SSB_PCMCIA_CIS_BFLAGS:
 -			GOTO_ERROR_ON(tuple.TupleDataLen != 3,
-+			GOTO_ERROR_ON((tuple.TupleDataLen != 3) &&
-+				      (tuple.TupleDataLen != 5),
- 				      "bfl tpl size");
- 			sprom->boardflags_lo = tuple.TupleData[1] |
- 					 ((u16)tuple.TupleData[2] << 8);
+-				      "bfl tpl size");
+-			sprom->boardflags_lo = tuple.TupleData[1] |
+-					 ((u16)tuple.TupleData[2] << 8);
+-			break;
+-		case SSB_PCMCIA_CIS_LEDS:
+-			GOTO_ERROR_ON(tuple.TupleDataLen != 5,
+-				      "leds tpl size");
+-			sprom->gpio0 = tuple.TupleData[1];
+-			sprom->gpio1 = tuple.TupleData[2];
+-			sprom->gpio2 = tuple.TupleData[3];
+-			sprom->gpio3 = tuple.TupleData[4];
+-			break;
+-		}
+-		res = pcmcia_get_next_tuple(bus->host_pcmcia, &tuple);
+-		if (res == -ENOSPC)
+-			break;
+-		GOTO_ERROR_ON(res != 0, "VEN next tpl");
+-		res = pcmcia_get_tuple_data(bus->host_pcmcia, &tuple);
+-		GOTO_ERROR_ON(res != 0, "VEN next tpl data");
+-	}
++	res = pcmcia_loop_tuple(bus->host_pcmcia, SSB_PCMCIA_CIS,
++				ssb_pcmcia_do_get_invariants, sprom);
++	if ((res == 0) || (res == -ENOSPC))
++		return 0;
+ 
+-	return 0;
+-error:
+ 	ssb_printk(KERN_ERR PFX
+-		   "PCMCIA: Failed to fetch device invariants: %s\n",
+-		   error_description);
++			"PCMCIA: Failed to fetch device invariants\n");
+ 	return -ENODEV;
+ }
+ 
 --- a/include/linux/ssb/ssb.h
 +++ b/include/linux/ssb/ssb.h
 @@ -27,24 +27,54 @@ struct ssb_sprom {
@@ -355,9 +645,13 @@
  };
  
  /* board_vendor */
-@@ -240,8 +271,12 @@ struct ssb_bus {
+@@ -238,20 +269,33 @@ struct ssb_bus {
  
- 	/* The core in the basic address register window. (PCI bus only) */
+ 	const struct ssb_bus_ops *ops;
+ 
+-	/* The core in the basic address register window. (PCI bus only) */
++	/* The core currently mapped into the MMIO window.
++	 * Not valid on all host-buses. So don't use outside of SSB. */
  	struct ssb_device *mapped_device;
 -	/* Currently mapped PCMCIA segment. (bustype == SSB_BUSTYPE_PCMCIA only) */
 -	u8 mapped_pcmcia_seg;
@@ -370,19 +664,38 @@
  	/* Lock for core and segment switching.
  	 * On PCMCIA-host busses this is used to protect the whole MMIO access. */
  	spinlock_t bar_lock;
-@@ -252,6 +287,11 @@ struct ssb_bus {
- 	struct pci_dev *host_pci;
- 	/* Pointer to the PCMCIA device (only if bustype == SSB_BUSTYPE_PCMCIA). */
- 	struct pcmcia_device *host_pcmcia;
-+	/* Pointer to the SDIO device (only if bustype == SSB_BUSTYPE_SDIO). */
-+	struct sdio_func *host_sdio;
+ 
+-	/* The bus this backplane is running on. */
++	/* The host-bus this backplane is running on. */
+ 	enum ssb_bustype bustype;
+-	/* Pointer to the PCI bus (only valid if bustype == SSB_BUSTYPE_PCI). */
+-	struct pci_dev *host_pci;
+-	/* Pointer to the PCMCIA device (only if bustype == SSB_BUSTYPE_PCMCIA). */
+-	struct pcmcia_device *host_pcmcia;
++	/* Pointers to the host-bus. Check bustype before using any of these pointers. */
++	union {
++		/* Pointer to the PCI bus (only valid if bustype == SSB_BUSTYPE_PCI). */
++		struct pci_dev *host_pci;
++		/* Pointer to the PCMCIA device (only if bustype == SSB_BUSTYPE_PCMCIA). */
++		struct pcmcia_device *host_pcmcia;
++		/* Pointer to the SDIO device (only if bustype == SSB_BUSTYPE_SDIO). */
++		struct sdio_func *host_sdio;
++	};
 +
 +	/* See enum ssb_quirks */
 +	unsigned int quirks;
  
  #ifdef CONFIG_SSB_SPROM
  	/* Mutex to protect the SPROM writing. */
-@@ -306,6 +346,11 @@ struct ssb_bus {
+@@ -261,6 +305,7 @@ struct ssb_bus {
+ 	/* ID information about the Chip. */
+ 	u16 chip_id;
+ 	u16 chip_rev;
++	u16 sprom_offset;
+ 	u16 sprom_size;		/* number of words in sprom */
+ 	u8 chip_package;
+ 
+@@ -306,6 +351,11 @@ struct ssb_bus {
  #endif /* DEBUG */
  };
  
@@ -394,7 +707,7 @@
  /* The initialization-invariants. */
  struct ssb_init_invariants {
  	/* Versioning information about the PCB. */
-@@ -336,6 +381,12 @@ extern int ssb_bus_pcmciabus_register(st
+@@ -336,9 +386,18 @@ extern int ssb_bus_pcmciabus_register(st
  				      struct pcmcia_device *pcmcia_dev,
  				      unsigned long baseaddr);
  #endif /* CONFIG_SSB_PCMCIAHOST */
@@ -407,9 +720,58 @@
  
  extern void ssb_bus_unregister(struct ssb_bus *bus);
  
++/* Does the device have an SPROM? */
++extern bool ssb_is_sprom_available(struct ssb_bus *bus);
++
+ /* Set a fallback SPROM.
+  * See kdoc at the function definition for complete documentation. */
+ extern int ssb_arch_set_fallback_sprom(const struct ssb_sprom *sprom);
 --- a/include/linux/ssb/ssb_driver_chipcommon.h
 +++ b/include/linux/ssb/ssb_driver_chipcommon.h
-@@ -629,5 +629,15 @@ extern int ssb_chipco_serial_init(struct
+@@ -53,6 +53,7 @@
+ #define  SSB_CHIPCO_CAP_64BIT		0x08000000	/* 64-bit Backplane */
+ #define  SSB_CHIPCO_CAP_PMU		0x10000000	/* PMU available (rev >= 20) */
+ #define  SSB_CHIPCO_CAP_ECI		0x20000000	/* ECI available (rev >= 20) */
++#define  SSB_CHIPCO_CAP_SPROM		0x40000000	/* SPROM present */
+ #define SSB_CHIPCO_CORECTL		0x0008
+ #define  SSB_CHIPCO_CORECTL_UARTCLK0	0x00000001	/* Drive UART with internal clock */
+ #define	 SSB_CHIPCO_CORECTL_SE		0x00000002	/* sync clk out enable (corerev >= 3) */
+@@ -385,6 +386,7 @@
+ 
+ 
+ /** Chip specific Chip-Status register contents. */
++#define SSB_CHIPCO_CHST_4322_SPROM_EXISTS	0x00000040 /* SPROM present */
+ #define SSB_CHIPCO_CHST_4325_SPROM_OTP_SEL	0x00000003
+ #define SSB_CHIPCO_CHST_4325_DEFCIS_SEL		0 /* OTP is powered up, use def. CIS, no SPROM */
+ #define SSB_CHIPCO_CHST_4325_SPROM_SEL		1 /* OTP is powered up, SPROM is present */
+@@ -398,6 +400,18 @@
+ #define SSB_CHIPCO_CHST_4325_RCAL_VALUE_SHIFT	4
+ #define SSB_CHIPCO_CHST_4325_PMUTOP_2B 		0x00000200 /* 1 for 2b, 0 for to 2a */
+ 
++/** Macros to determine SPROM presence based on Chip-Status register. */
++#define SSB_CHIPCO_CHST_4312_SPROM_PRESENT(status) \
++	((status & SSB_CHIPCO_CHST_4325_SPROM_OTP_SEL) != \
++		SSB_CHIPCO_CHST_4325_OTP_SEL)
++#define SSB_CHIPCO_CHST_4322_SPROM_PRESENT(status) \
++	(status & SSB_CHIPCO_CHST_4322_SPROM_EXISTS)
++#define SSB_CHIPCO_CHST_4325_SPROM_PRESENT(status) \
++	(((status & SSB_CHIPCO_CHST_4325_SPROM_OTP_SEL) != \
++		SSB_CHIPCO_CHST_4325_DEFCIS_SEL) && \
++	 ((status & SSB_CHIPCO_CHST_4325_SPROM_OTP_SEL) != \
++		SSB_CHIPCO_CHST_4325_OTP_SEL))
++
+ 
+ 
+ /** Clockcontrol masks and values **/
+@@ -564,6 +578,7 @@ struct ssb_chipcommon_pmu {
+ struct ssb_chipcommon {
+ 	struct ssb_device *dev;
+ 	u32 capabilities;
++	u32 status;
+ 	/* Fast Powerup Delay constant */
+ 	u16 fast_pwrup_delay;
+ 	struct ssb_chipcommon_pmu pmu;
+@@ -629,5 +644,15 @@ extern int ssb_chipco_serial_init(struct
  /* PMU support */
  extern void ssb_pmu_init(struct ssb_chipcommon *cc);
  
@@ -436,27 +798,289 @@
   */
  #define SSB_SPROMSIZE_WORDS		64
  #define SSB_SPROMSIZE_BYTES		(SSB_SPROMSIZE_WORDS * sizeof(u16))
-@@ -327,8 +327,11 @@
+@@ -170,26 +170,27 @@
+ #define SSB_SPROMSIZE_WORDS_R4		220
+ #define SSB_SPROMSIZE_BYTES_R123	(SSB_SPROMSIZE_WORDS_R123 * sizeof(u16))
+ #define SSB_SPROMSIZE_BYTES_R4		(SSB_SPROMSIZE_WORDS_R4 * sizeof(u16))
+-#define SSB_SPROM_BASE			0x1000
+-#define SSB_SPROM_REVISION		0x107E
++#define SSB_SPROM_BASE1			0x1000
++#define SSB_SPROM_BASE31		0x0800
++#define SSB_SPROM_REVISION		0x007E
+ #define  SSB_SPROM_REVISION_REV		0x00FF	/* SPROM Revision number */
+ #define  SSB_SPROM_REVISION_CRC		0xFF00	/* SPROM CRC8 value */
+ #define  SSB_SPROM_REVISION_CRC_SHIFT	8
+ 
+ /* SPROM Revision 1 */
+-#define SSB_SPROM1_SPID			0x1004	/* Subsystem Product ID for PCI */
+-#define SSB_SPROM1_SVID			0x1006	/* Subsystem Vendor ID for PCI */
+-#define SSB_SPROM1_PID			0x1008	/* Product ID for PCI */
+-#define SSB_SPROM1_IL0MAC		0x1048	/* 6 bytes MAC address for 802.11b/g */
+-#define SSB_SPROM1_ET0MAC		0x104E	/* 6 bytes MAC address for Ethernet */
+-#define SSB_SPROM1_ET1MAC		0x1054	/* 6 bytes MAC address for 802.11a */
+-#define SSB_SPROM1_ETHPHY		0x105A	/* Ethernet PHY settings */
++#define SSB_SPROM1_SPID			0x0004	/* Subsystem Product ID for PCI */
++#define SSB_SPROM1_SVID			0x0006	/* Subsystem Vendor ID for PCI */
++#define SSB_SPROM1_PID			0x0008	/* Product ID for PCI */
++#define SSB_SPROM1_IL0MAC		0x0048	/* 6 bytes MAC address for 802.11b/g */
++#define SSB_SPROM1_ET0MAC		0x004E	/* 6 bytes MAC address for Ethernet */
++#define SSB_SPROM1_ET1MAC		0x0054	/* 6 bytes MAC address for 802.11a */
++#define SSB_SPROM1_ETHPHY		0x005A	/* Ethernet PHY settings */
+ #define  SSB_SPROM1_ETHPHY_ET0A		0x001F	/* MII Address for enet0 */
+ #define  SSB_SPROM1_ETHPHY_ET1A		0x03E0	/* MII Address for enet1 */
+ #define  SSB_SPROM1_ETHPHY_ET1A_SHIFT	5
+ #define  SSB_SPROM1_ETHPHY_ET0M		(1<<14)	/* MDIO for enet0 */
+ #define  SSB_SPROM1_ETHPHY_ET1M		(1<<15)	/* MDIO for enet1 */
+-#define SSB_SPROM1_BINF			0x105C	/* Board info */
++#define SSB_SPROM1_BINF			0x005C	/* Board info */
+ #define  SSB_SPROM1_BINF_BREV		0x00FF	/* Board Revision */
+ #define  SSB_SPROM1_BINF_CCODE		0x0F00	/* Country Code */
+ #define  SSB_SPROM1_BINF_CCODE_SHIFT	8
+@@ -197,63 +198,63 @@
+ #define  SSB_SPROM1_BINF_ANTBG_SHIFT	12
+ #define  SSB_SPROM1_BINF_ANTA		0xC000	/* Available A-PHY antennas */
+ #define  SSB_SPROM1_BINF_ANTA_SHIFT	14
+-#define SSB_SPROM1_PA0B0		0x105E
+-#define SSB_SPROM1_PA0B1		0x1060
+-#define SSB_SPROM1_PA0B2		0x1062
+-#define SSB_SPROM1_GPIOA		0x1064	/* General Purpose IO pins 0 and 1 */
++#define SSB_SPROM1_PA0B0		0x005E
++#define SSB_SPROM1_PA0B1		0x0060
++#define SSB_SPROM1_PA0B2		0x0062
++#define SSB_SPROM1_GPIOA		0x0064	/* General Purpose IO pins 0 and 1 */
+ #define  SSB_SPROM1_GPIOA_P0		0x00FF	/* Pin 0 */
+ #define  SSB_SPROM1_GPIOA_P1		0xFF00	/* Pin 1 */
+ #define  SSB_SPROM1_GPIOA_P1_SHIFT	8
+-#define SSB_SPROM1_GPIOB		0x1066	/* General Purpuse IO pins 2 and 3 */
++#define SSB_SPROM1_GPIOB		0x0066	/* General Purpuse IO pins 2 and 3 */
+ #define  SSB_SPROM1_GPIOB_P2		0x00FF	/* Pin 2 */
+ #define  SSB_SPROM1_GPIOB_P3		0xFF00	/* Pin 3 */
+ #define  SSB_SPROM1_GPIOB_P3_SHIFT	8
+-#define SSB_SPROM1_MAXPWR		0x1068	/* Power Amplifier Max Power */
++#define SSB_SPROM1_MAXPWR		0x0068	/* Power Amplifier Max Power */
+ #define  SSB_SPROM1_MAXPWR_BG		0x00FF	/* B-PHY and G-PHY (in dBm Q5.2) */
+ #define  SSB_SPROM1_MAXPWR_A		0xFF00	/* A-PHY (in dBm Q5.2) */
+ #define  SSB_SPROM1_MAXPWR_A_SHIFT	8
+-#define SSB_SPROM1_PA1B0		0x106A
+-#define SSB_SPROM1_PA1B1		0x106C
+-#define SSB_SPROM1_PA1B2		0x106E
+-#define SSB_SPROM1_ITSSI		0x1070	/* Idle TSSI Target */
++#define SSB_SPROM1_PA1B0		0x006A
++#define SSB_SPROM1_PA1B1		0x006C
++#define SSB_SPROM1_PA1B2		0x006E
++#define SSB_SPROM1_ITSSI		0x0070	/* Idle TSSI Target */
+ #define  SSB_SPROM1_ITSSI_BG		0x00FF	/* B-PHY and G-PHY*/
+ #define  SSB_SPROM1_ITSSI_A		0xFF00	/* A-PHY */
+ #define  SSB_SPROM1_ITSSI_A_SHIFT	8
+-#define SSB_SPROM1_BFLLO		0x1072	/* Boardflags (low 16 bits) */
+-#define SSB_SPROM1_AGAIN		0x1074	/* Antenna Gain (in dBm Q5.2) */
++#define SSB_SPROM1_BFLLO		0x0072	/* Boardflags (low 16 bits) */
++#define SSB_SPROM1_AGAIN		0x0074	/* Antenna Gain (in dBm Q5.2) */
+ #define  SSB_SPROM1_AGAIN_BG		0x00FF	/* B-PHY and G-PHY */
+ #define  SSB_SPROM1_AGAIN_BG_SHIFT	0
+ #define  SSB_SPROM1_AGAIN_A		0xFF00	/* A-PHY */
+ #define  SSB_SPROM1_AGAIN_A_SHIFT	8
+ 
+ /* SPROM Revision 2 (inherits from rev 1) */
+-#define SSB_SPROM2_BFLHI		0x1038	/* Boardflags (high 16 bits) */
+-#define SSB_SPROM2_MAXP_A		0x103A	/* A-PHY Max Power */
++#define SSB_SPROM2_BFLHI		0x0038	/* Boardflags (high 16 bits) */
++#define SSB_SPROM2_MAXP_A		0x003A	/* A-PHY Max Power */
+ #define  SSB_SPROM2_MAXP_A_HI		0x00FF	/* Max Power High */
+ #define  SSB_SPROM2_MAXP_A_LO		0xFF00	/* Max Power Low */
+ #define  SSB_SPROM2_MAXP_A_LO_SHIFT	8
+-#define SSB_SPROM2_PA1LOB0		0x103C	/* A-PHY PowerAmplifier Low Settings */
+-#define SSB_SPROM2_PA1LOB1		0x103E	/* A-PHY PowerAmplifier Low Settings */
+-#define SSB_SPROM2_PA1LOB2		0x1040	/* A-PHY PowerAmplifier Low Settings */
+-#define SSB_SPROM2_PA1HIB0		0x1042	/* A-PHY PowerAmplifier High Settings */
+-#define SSB_SPROM2_PA1HIB1		0x1044	/* A-PHY PowerAmplifier High Settings */
+-#define SSB_SPROM2_PA1HIB2		0x1046	/* A-PHY PowerAmplifier High Settings */
+-#define SSB_SPROM2_OPO			0x1078	/* OFDM Power Offset from CCK Level */
++#define SSB_SPROM2_PA1LOB0		0x003C	/* A-PHY PowerAmplifier Low Settings */
++#define SSB_SPROM2_PA1LOB1		0x003E	/* A-PHY PowerAmplifier Low Settings */
++#define SSB_SPROM2_PA1LOB2		0x0040	/* A-PHY PowerAmplifier Low Settings */
++#define SSB_SPROM2_PA1HIB0		0x0042	/* A-PHY PowerAmplifier High Settings */
++#define SSB_SPROM2_PA1HIB1		0x0044	/* A-PHY PowerAmplifier High Settings */
++#define SSB_SPROM2_PA1HIB2		0x0046	/* A-PHY PowerAmplifier High Settings */
++#define SSB_SPROM2_OPO			0x0078	/* OFDM Power Offset from CCK Level */
+ #define  SSB_SPROM2_OPO_VALUE		0x00FF
+ #define  SSB_SPROM2_OPO_UNUSED		0xFF00
+-#define SSB_SPROM2_CCODE		0x107C	/* Two char Country Code */
++#define SSB_SPROM2_CCODE		0x007C	/* Two char Country Code */
+ 
+ /* SPROM Revision 3 (inherits most data from rev 2) */
+-#define SSB_SPROM3_IL0MAC		0x104A	/* 6 bytes MAC address for 802.11b/g */
+-#define SSB_SPROM3_OFDMAPO		0x102C	/* A-PHY OFDM Mid Power Offset (4 bytes, BigEndian) */
+-#define SSB_SPROM3_OFDMALPO		0x1030	/* A-PHY OFDM Low Power Offset (4 bytes, BigEndian) */
+-#define SSB_SPROM3_OFDMAHPO		0x1034	/* A-PHY OFDM High Power Offset (4 bytes, BigEndian) */
+-#define SSB_SPROM3_GPIOLDC		0x1042	/* GPIO LED Powersave Duty Cycle (4 bytes, BigEndian) */
++#define SSB_SPROM3_OFDMAPO		0x002C	/* A-PHY OFDM Mid Power Offset (4 bytes, BigEndian) */
++#define SSB_SPROM3_OFDMALPO		0x0030	/* A-PHY OFDM Low Power Offset (4 bytes, BigEndian) */
++#define SSB_SPROM3_OFDMAHPO		0x0034	/* A-PHY OFDM High Power Offset (4 bytes, BigEndian) */
++#define SSB_SPROM3_GPIOLDC		0x0042	/* GPIO LED Powersave Duty Cycle (4 bytes, BigEndian) */
+ #define  SSB_SPROM3_GPIOLDC_OFF		0x0000FF00	/* Off Count */
+ #define  SSB_SPROM3_GPIOLDC_OFF_SHIFT	8
+ #define  SSB_SPROM3_GPIOLDC_ON		0x00FF0000	/* On Count */
+ #define  SSB_SPROM3_GPIOLDC_ON_SHIFT	16
+-#define SSB_SPROM3_CCKPO		0x1078	/* CCK Power Offset */
++#define SSB_SPROM3_IL0MAC		0x004A	/* 6 bytes MAC address for 802.11b/g */
++#define SSB_SPROM3_CCKPO		0x0078	/* CCK Power Offset */
+ #define  SSB_SPROM3_CCKPO_1M		0x000F	/* 1M Rate PO */
+ #define  SSB_SPROM3_CCKPO_2M		0x00F0	/* 2M Rate PO */
+ #define  SSB_SPROM3_CCKPO_2M_SHIFT	4
+@@ -264,104 +265,156 @@
+ #define  SSB_SPROM3_OFDMGPO		0x107A	/* G-PHY OFDM Power Offset (4 bytes, BigEndian) */
+ 
+ /* SPROM Revision 4 */
+-#define SSB_SPROM4_IL0MAC		0x104C	/* 6 byte MAC address for a/b/g/n */
+-#define SSB_SPROM4_ETHPHY		0x105A	/* Ethernet PHY settings ?? */
++#define SSB_SPROM4_BFLLO		0x0044	/* Boardflags (low 16 bits) */
++#define SSB_SPROM4_BFLHI		0x0046  /* Board Flags Hi */
++#define SSB_SPROM4_IL0MAC		0x004C	/* 6 byte MAC address for a/b/g/n */
++#define SSB_SPROM4_CCODE		0x0052	/* Country Code (2 bytes) */
++#define SSB_SPROM4_GPIOA		0x0056	/* Gen. Purpose IO # 0 and 1 */
++#define  SSB_SPROM4_GPIOA_P0		0x00FF	/* Pin 0 */
++#define  SSB_SPROM4_GPIOA_P1		0xFF00	/* Pin 1 */
++#define  SSB_SPROM4_GPIOA_P1_SHIFT	8
++#define SSB_SPROM4_GPIOB		0x0058	/* Gen. Purpose IO # 2 and 3 */
++#define  SSB_SPROM4_GPIOB_P2		0x00FF	/* Pin 2 */
++#define  SSB_SPROM4_GPIOB_P3		0xFF00	/* Pin 3 */
++#define  SSB_SPROM4_GPIOB_P3_SHIFT	8
++#define SSB_SPROM4_ETHPHY		0x005A	/* Ethernet PHY settings ?? */
+ #define  SSB_SPROM4_ETHPHY_ET0A		0x001F	/* MII Address for enet0 */
+ #define  SSB_SPROM4_ETHPHY_ET1A		0x03E0	/* MII Address for enet1 */
+ #define  SSB_SPROM4_ETHPHY_ET1A_SHIFT	5
+ #define  SSB_SPROM4_ETHPHY_ET0M		(1<<14)	/* MDIO for enet0 */
+ #define  SSB_SPROM4_ETHPHY_ET1M		(1<<15)	/* MDIO for enet1 */
+-#define SSB_SPROM4_CCODE		0x1052	/* Country Code (2 bytes) */
+-#define SSB_SPROM4_ANTAVAIL		0x105D  /* Antenna available bitfields */
+-#define SSB_SPROM4_ANTAVAIL_A		0x00FF	/* A-PHY bitfield */
+-#define SSB_SPROM4_ANTAVAIL_A_SHIFT	0
+-#define SSB_SPROM4_ANTAVAIL_BG		0xFF00	/* B-PHY and G-PHY bitfield */
+-#define SSB_SPROM4_ANTAVAIL_BG_SHIFT	8
+-#define SSB_SPROM4_BFLLO		0x1044	/* Boardflags (low 16 bits) */
+-#define SSB_SPROM4_AGAIN01		0x105E	/* Antenna Gain (in dBm Q5.2) */
++#define SSB_SPROM4_ANTAVAIL		0x005D  /* Antenna available bitfields */
++#define  SSB_SPROM4_ANTAVAIL_A		0x00FF	/* A-PHY bitfield */
++#define  SSB_SPROM4_ANTAVAIL_A_SHIFT	0
++#define  SSB_SPROM4_ANTAVAIL_BG		0xFF00	/* B-PHY and G-PHY bitfield */
++#define  SSB_SPROM4_ANTAVAIL_BG_SHIFT	8
++#define SSB_SPROM4_AGAIN01		0x005E	/* Antenna Gain (in dBm Q5.2) */
+ #define  SSB_SPROM4_AGAIN0		0x00FF	/* Antenna 0 */
+ #define  SSB_SPROM4_AGAIN0_SHIFT	0
+ #define  SSB_SPROM4_AGAIN1		0xFF00	/* Antenna 1 */
+ #define  SSB_SPROM4_AGAIN1_SHIFT	8
+-#define SSB_SPROM4_AGAIN23		0x1060
++#define SSB_SPROM4_AGAIN23		0x0060
+ #define  SSB_SPROM4_AGAIN2		0x00FF	/* Antenna 2 */
+ #define  SSB_SPROM4_AGAIN2_SHIFT	0
+ #define  SSB_SPROM4_AGAIN3		0xFF00	/* Antenna 3 */
+ #define  SSB_SPROM4_AGAIN3_SHIFT	8
+-#define SSB_SPROM4_BFLHI		0x1046  /* Board Flags Hi */
+-#define SSB_SPROM4_MAXP_BG		0x1080  /* Max Power BG in path 1 */
++#define SSB_SPROM4_MAXP_BG		0x0080  /* Max Power BG in path 1 */
+ #define  SSB_SPROM4_MAXP_BG_MASK	0x00FF  /* Mask for Max Power BG */
+ #define  SSB_SPROM4_ITSSI_BG		0xFF00	/* Mask for path 1 itssi_bg */
+ #define  SSB_SPROM4_ITSSI_BG_SHIFT	8
+-#define SSB_SPROM4_MAXP_A		0x108A  /* Max Power A in path 1 */
++#define SSB_SPROM4_MAXP_A		0x008A  /* Max Power A in path 1 */
+ #define  SSB_SPROM4_MAXP_A_MASK		0x00FF  /* Mask for Max Power A */
+ #define  SSB_SPROM4_ITSSI_A		0xFF00	/* Mask for path 1 itssi_a */
+ #define  SSB_SPROM4_ITSSI_A_SHIFT	8
+-#define SSB_SPROM4_GPIOA		0x1056	/* Gen. Purpose IO # 0 and 1 */
+-#define  SSB_SPROM4_GPIOA_P0		0x00FF	/* Pin 0 */
+-#define  SSB_SPROM4_GPIOA_P1		0xFF00	/* Pin 1 */
+-#define  SSB_SPROM4_GPIOA_P1_SHIFT	8
+-#define SSB_SPROM4_GPIOB		0x1058	/* Gen. Purpose IO # 2 and 3 */
+-#define  SSB_SPROM4_GPIOB_P2		0x00FF	/* Pin 2 */
+-#define  SSB_SPROM4_GPIOB_P3		0xFF00	/* Pin 3 */
+-#define  SSB_SPROM4_GPIOB_P3_SHIFT	8
+-#define SSB_SPROM4_PA0B0		0x1082	/* The paXbY locations are */
+-#define SSB_SPROM4_PA0B1		0x1084	/*   only guesses */
+-#define SSB_SPROM4_PA0B2		0x1086
+-#define SSB_SPROM4_PA1B0		0x108E
+-#define SSB_SPROM4_PA1B1		0x1090
+-#define SSB_SPROM4_PA1B2		0x1092
++#define SSB_SPROM4_PA0B0		0x0082	/* The paXbY locations are */
++#define SSB_SPROM4_PA0B1		0x0084	/*   only guesses */
++#define SSB_SPROM4_PA0B2		0x0086
++#define SSB_SPROM4_PA1B0		0x008E
++#define SSB_SPROM4_PA1B1		0x0090
++#define SSB_SPROM4_PA1B2		0x0092
+ 
+ /* SPROM Revision 5 (inherits most data from rev 4) */
+-#define SSB_SPROM5_BFLLO		0x104A	/* Boardflags (low 16 bits) */
+-#define SSB_SPROM5_BFLHI		0x104C  /* Board Flags Hi */
+-#define SSB_SPROM5_IL0MAC		0x1052	/* 6 byte MAC address for a/b/g/n */
+-#define SSB_SPROM5_CCODE		0x1044	/* Country Code (2 bytes) */
+-#define SSB_SPROM5_GPIOA		0x1076	/* Gen. Purpose IO # 0 and 1 */
++#define SSB_SPROM5_CCODE		0x0044	/* Country Code (2 bytes) */
++#define SSB_SPROM5_BFLLO		0x004A	/* Boardflags (low 16 bits) */
++#define SSB_SPROM5_BFLHI		0x004C  /* Board Flags Hi */
++#define SSB_SPROM5_IL0MAC		0x0052	/* 6 byte MAC address for a/b/g/n */
++#define SSB_SPROM5_GPIOA		0x0076	/* Gen. Purpose IO # 0 and 1 */
+ #define  SSB_SPROM5_GPIOA_P0		0x00FF	/* Pin 0 */
+ #define  SSB_SPROM5_GPIOA_P1		0xFF00	/* Pin 1 */
+ #define  SSB_SPROM5_GPIOA_P1_SHIFT	8
+-#define SSB_SPROM5_GPIOB		0x1078	/* Gen. Purpose IO # 2 and 3 */
++#define SSB_SPROM5_GPIOB		0x0078	/* Gen. Purpose IO # 2 and 3 */
+ #define  SSB_SPROM5_GPIOB_P2		0x00FF	/* Pin 2 */
+ #define  SSB_SPROM5_GPIOB_P3		0xFF00	/* Pin 3 */
  #define  SSB_SPROM5_GPIOB_P3_SHIFT	8
  
  /* SPROM Revision 8 */
 -#define SSB_SPROM8_BFLLO		0x1084	/* Boardflags (low 16 bits) */
 -#define SSB_SPROM8_BFLHI		0x1086	/* Boardflags Hi */
-+#define SSB_SPROM8_BOARDREV		0x1082	/* Board revision */
-+#define SSB_SPROM8_BFLLO		0x1084	/* Board flags (bits 0-15) */
-+#define SSB_SPROM8_BFLHI		0x1086	/* Board flags (bits 16-31) */
-+#define SSB_SPROM8_BFL2LO		0x1088	/* Board flags (bits 32-47) */
-+#define SSB_SPROM8_BFL2HI		0x108A	/* Board flags (bits 48-63) */
- #define SSB_SPROM8_IL0MAC		0x108C	/* 6 byte MAC address */
- #define SSB_SPROM8_CCODE		0x1092	/* 2 byte country code */
- #define SSB_SPROM8_ANTAVAIL		0x109C  /* Antenna available bitfields*/
-@@ -354,14 +357,63 @@
- #define  SSB_SPROM8_GPIOB_P2		0x00FF	/* Pin 2 */
- #define  SSB_SPROM8_GPIOB_P3		0xFF00	/* Pin 3 */
- #define  SSB_SPROM8_GPIOB_P3_SHIFT	8
+-#define SSB_SPROM8_IL0MAC		0x108C	/* 6 byte MAC address */
+-#define SSB_SPROM8_CCODE		0x1092	/* 2 byte country code */
+-#define SSB_SPROM8_ANTAVAIL		0x109C  /* Antenna available bitfields*/
+-#define SSB_SPROM8_ANTAVAIL_A		0xFF00	/* A-PHY bitfield */
+-#define SSB_SPROM8_ANTAVAIL_A_SHIFT	8
+-#define SSB_SPROM8_ANTAVAIL_BG		0x00FF	/* B-PHY and G-PHY bitfield */
+-#define SSB_SPROM8_ANTAVAIL_BG_SHIFT	0
+-#define SSB_SPROM8_AGAIN01		0x109E	/* Antenna Gain (in dBm Q5.2) */
++#define SSB_SPROM8_BOARDREV		0x0082	/* Board revision */
++#define SSB_SPROM8_BFLLO		0x0084	/* Board flags (bits 0-15) */
++#define SSB_SPROM8_BFLHI		0x0086	/* Board flags (bits 16-31) */
++#define SSB_SPROM8_BFL2LO		0x0088	/* Board flags (bits 32-47) */
++#define SSB_SPROM8_BFL2HI		0x008A	/* Board flags (bits 48-63) */
++#define SSB_SPROM8_IL0MAC		0x008C	/* 6 byte MAC address */
++#define SSB_SPROM8_CCODE		0x0092	/* 2 byte country code */
++#define SSB_SPROM8_GPIOA		0x0096	/*Gen. Purpose IO # 0 and 1 */
++#define  SSB_SPROM8_GPIOA_P0		0x00FF	/* Pin 0 */
++#define  SSB_SPROM8_GPIOA_P1		0xFF00	/* Pin 1 */
++#define  SSB_SPROM8_GPIOA_P1_SHIFT	8
++#define SSB_SPROM8_GPIOB		0x0098	/* Gen. Purpose IO # 2 and 3 */
++#define  SSB_SPROM8_GPIOB_P2		0x00FF	/* Pin 2 */
++#define  SSB_SPROM8_GPIOB_P3		0xFF00	/* Pin 3 */
++#define  SSB_SPROM8_GPIOB_P3_SHIFT	8
++#define SSB_SPROM8_ANTAVAIL		0x009C  /* Antenna available bitfields*/
++#define  SSB_SPROM8_ANTAVAIL_A		0xFF00	/* A-PHY bitfield */
++#define  SSB_SPROM8_ANTAVAIL_A_SHIFT	8
++#define  SSB_SPROM8_ANTAVAIL_BG		0x00FF	/* B-PHY and G-PHY bitfield */
++#define  SSB_SPROM8_ANTAVAIL_BG_SHIFT	0
++#define SSB_SPROM8_AGAIN01		0x009E	/* Antenna Gain (in dBm Q5.2) */
+ #define  SSB_SPROM8_AGAIN0		0x00FF	/* Antenna 0 */
+ #define  SSB_SPROM8_AGAIN0_SHIFT	0
+ #define  SSB_SPROM8_AGAIN1		0xFF00	/* Antenna 1 */
+ #define  SSB_SPROM8_AGAIN1_SHIFT	8
+-#define SSB_SPROM8_AGAIN23		0x10A0
++#define SSB_SPROM8_AGAIN23		0x00A0
+ #define  SSB_SPROM8_AGAIN2		0x00FF	/* Antenna 2 */
+ #define  SSB_SPROM8_AGAIN2_SHIFT	0
+ #define  SSB_SPROM8_AGAIN3		0xFF00	/* Antenna 3 */
+ #define  SSB_SPROM8_AGAIN3_SHIFT	8
+-#define SSB_SPROM8_GPIOA		0x1096	/*Gen. Purpose IO # 0 and 1 */
+-#define  SSB_SPROM8_GPIOA_P0		0x00FF	/* Pin 0 */
+-#define  SSB_SPROM8_GPIOA_P1		0xFF00	/* Pin 1 */
+-#define  SSB_SPROM8_GPIOA_P1_SHIFT	8
+-#define SSB_SPROM8_GPIOB		0x1098	/* Gen. Purpose IO # 2 and 3 */
+-#define  SSB_SPROM8_GPIOB_P2		0x00FF	/* Pin 2 */
+-#define  SSB_SPROM8_GPIOB_P3		0xFF00	/* Pin 3 */
+-#define  SSB_SPROM8_GPIOB_P3_SHIFT	8
 -#define SSB_SPROM8_MAXP_BG		0x10C0  /* Max Power BG in path 1 */
 -#define  SSB_SPROM8_MAXP_BG_MASK	0x00FF  /* Mask for Max Power BG */
-+#define SSB_SPROM8_RSSIPARM2G		0x10A4	/* RSSI params for 2GHz */
++#define SSB_SPROM8_RSSIPARM2G		0x00A4	/* RSSI params for 2GHz */
 +#define  SSB_SPROM8_RSSISMF2G		0x000F
 +#define  SSB_SPROM8_RSSISMC2G		0x00F0
 +#define  SSB_SPROM8_RSSISMC2G_SHIFT	4
@@ -464,7 +1088,7 @@
 +#define  SSB_SPROM8_RSSISAV2G_SHIFT	8
 +#define  SSB_SPROM8_BXA2G		0x1800
 +#define  SSB_SPROM8_BXA2G_SHIFT		11
-+#define SSB_SPROM8_RSSIPARM5G		0x10A6	/* RSSI params for 5GHz */
++#define SSB_SPROM8_RSSIPARM5G		0x00A6	/* RSSI params for 5GHz */
 +#define  SSB_SPROM8_RSSISMF5G		0x000F
 +#define  SSB_SPROM8_RSSISMC5G		0x00F0
 +#define  SSB_SPROM8_RSSISMC5G_SHIFT	4
@@ -472,64 +1096,75 @@
 +#define  SSB_SPROM8_RSSISAV5G_SHIFT	8
 +#define  SSB_SPROM8_BXA5G		0x1800
 +#define  SSB_SPROM8_BXA5G_SHIFT		11
-+#define SSB_SPROM8_TRI25G		0x10A8	/* TX isolation 2.4&5.3GHz */
++#define SSB_SPROM8_TRI25G		0x00A8	/* TX isolation 2.4&5.3GHz */
 +#define  SSB_SPROM8_TRI2G		0x00FF	/* TX isolation 2.4GHz */
 +#define  SSB_SPROM8_TRI5G		0xFF00	/* TX isolation 5.3GHz */
 +#define  SSB_SPROM8_TRI5G_SHIFT		8
-+#define SSB_SPROM8_TRI5GHL		0x10AA	/* TX isolation 5.2/5.8GHz */
++#define SSB_SPROM8_TRI5GHL		0x00AA	/* TX isolation 5.2/5.8GHz */
 +#define  SSB_SPROM8_TRI5GL		0x00FF	/* TX isolation 5.2GHz */
 +#define  SSB_SPROM8_TRI5GH		0xFF00	/* TX isolation 5.8GHz */
 +#define  SSB_SPROM8_TRI5GH_SHIFT	8
-+#define SSB_SPROM8_RXPO			0x10AC  /* RX power offsets */
++#define SSB_SPROM8_RXPO			0x00AC  /* RX power offsets */
 +#define  SSB_SPROM8_RXPO2G		0x00FF	/* 2GHz RX power offset */
 +#define  SSB_SPROM8_RXPO5G		0xFF00	/* 5GHz RX power offset */
 +#define  SSB_SPROM8_RXPO5G_SHIFT	8
-+#define SSB_SPROM8_MAXP_BG		0x10C0  /* Max Power 2GHz in path 1 */
++#define SSB_SPROM8_MAXP_BG		0x00C0  /* Max Power 2GHz in path 1 */
 +#define  SSB_SPROM8_MAXP_BG_MASK	0x00FF  /* Mask for Max Power 2GHz */
  #define  SSB_SPROM8_ITSSI_BG		0xFF00	/* Mask for path 1 itssi_bg */
  #define  SSB_SPROM8_ITSSI_BG_SHIFT	8
 -#define SSB_SPROM8_MAXP_A		0x10C8  /* Max Power A in path 1 */
 -#define  SSB_SPROM8_MAXP_A_MASK		0x00FF  /* Mask for Max Power A */
-+#define SSB_SPROM8_PA0B0		0x10C2	/* 2GHz power amp settings */
-+#define SSB_SPROM8_PA0B1		0x10C4
-+#define SSB_SPROM8_PA0B2		0x10C6
-+#define SSB_SPROM8_MAXP_A		0x10C8  /* Max Power 5.3GHz */
++#define SSB_SPROM8_PA0B0		0x00C2	/* 2GHz power amp settings */
++#define SSB_SPROM8_PA0B1		0x00C4
++#define SSB_SPROM8_PA0B2		0x00C6
++#define SSB_SPROM8_MAXP_A		0x00C8  /* Max Power 5.3GHz */
 +#define  SSB_SPROM8_MAXP_A_MASK		0x00FF  /* Mask for Max Power 5.3GHz */
  #define  SSB_SPROM8_ITSSI_A		0xFF00	/* Mask for path 1 itssi_a */
  #define  SSB_SPROM8_ITSSI_A_SHIFT	8
-+#define SSB_SPROM8_MAXP_AHL		0x10CA  /* Max Power 5.2/5.8GHz */
++#define SSB_SPROM8_MAXP_AHL		0x00CA  /* Max Power 5.2/5.8GHz */
 +#define  SSB_SPROM8_MAXP_AH_MASK	0x00FF  /* Mask for Max Power 5.8GHz */
 +#define  SSB_SPROM8_MAXP_AL_MASK	0xFF00  /* Mask for Max Power 5.2GHz */
 +#define  SSB_SPROM8_MAXP_AL_SHIFT	8
-+#define SSB_SPROM8_PA1B0		0x10CC	/* 5.3GHz power amp settings */
-+#define SSB_SPROM8_PA1B1		0x10CE
-+#define SSB_SPROM8_PA1B2		0x10D0
-+#define SSB_SPROM8_PA1LOB0		0x10D2	/* 5.2GHz power amp settings */
-+#define SSB_SPROM8_PA1LOB1		0x10D4
-+#define SSB_SPROM8_PA1LOB2		0x10D6
-+#define SSB_SPROM8_PA1HIB0		0x10D8	/* 5.8GHz power amp settings */
-+#define SSB_SPROM8_PA1HIB1		0x10DA
-+#define SSB_SPROM8_PA1HIB2		0x10DC
-+#define SSB_SPROM8_CCK2GPO		0x1140	/* CCK power offset */
-+#define SSB_SPROM8_OFDM2GPO		0x1142	/* 2.4GHz OFDM power offset */
-+#define SSB_SPROM8_OFDM5GPO		0x1146	/* 5.3GHz OFDM power offset */
-+#define SSB_SPROM8_OFDM5GLPO		0x114A	/* 5.2GHz OFDM power offset */
-+#define SSB_SPROM8_OFDM5GHPO		0x114E	/* 5.8GHz OFDM power offset */
++#define SSB_SPROM8_PA1B0		0x00CC	/* 5.3GHz power amp settings */
++#define SSB_SPROM8_PA1B1		0x00CE
++#define SSB_SPROM8_PA1B2		0x00D0
++#define SSB_SPROM8_PA1LOB0		0x00D2	/* 5.2GHz power amp settings */
++#define SSB_SPROM8_PA1LOB1		0x00D4
++#define SSB_SPROM8_PA1LOB2		0x00D6
++#define SSB_SPROM8_PA1HIB0		0x00D8	/* 5.8GHz power amp settings */
++#define SSB_SPROM8_PA1HIB1		0x00DA
++#define SSB_SPROM8_PA1HIB2		0x00DC
++#define SSB_SPROM8_CCK2GPO		0x0140	/* CCK power offset */
++#define SSB_SPROM8_OFDM2GPO		0x0142	/* 2.4GHz OFDM power offset */
++#define SSB_SPROM8_OFDM5GPO		0x0146	/* 5.3GHz OFDM power offset */
++#define SSB_SPROM8_OFDM5GLPO		0x014A	/* 5.2GHz OFDM power offset */
++#define SSB_SPROM8_OFDM5GHPO		0x014E	/* 5.8GHz OFDM power offset */
  
  /* Values for SSB_SPROM1_BINF_CCODE */
  enum {
 --- a/drivers/ssb/scan.c
 +++ b/drivers/ssb/scan.c
-@@ -175,6 +175,8 @@ static u32 scan_read32(struct ssb_bus *b
+@@ -162,6 +162,8 @@ static u8 chipid_to_nrcores(u16 chipid)
+ static u32 scan_read32(struct ssb_bus *bus, u8 current_coreidx,
+ 		       u16 offset)
+ {
++	u32 lo, hi;
++
+ 	switch (bus->bustype) {
+ 	case SSB_BUSTYPE_SSB:
+ 		offset += current_coreidx * SSB_CORE_SIZE;
+@@ -174,6 +176,10 @@ static u32 scan_read32(struct ssb_bus *b
+ 			offset -= 0x800;
  		} else
  			ssb_pcmcia_switch_segment(bus, 0);
- 		break;
++		lo = readw(bus->mmio + offset);
++		hi = readw(bus->mmio + offset + 2);
++		return lo | (hi << 16);
 +	default:
-+		break;
+ 		break;
  	}
  	return readl(bus->mmio + offset);
- }
-@@ -188,6 +190,8 @@ static int scan_switchcore(struct ssb_bu
+@@ -188,6 +194,8 @@ static int scan_switchcore(struct ssb_bu
  		return ssb_pci_switch_coreidx(bus, coreidx);
  	case SSB_BUSTYPE_PCMCIA:
  		return ssb_pcmcia_switch_coreidx(bus, coreidx);
@@ -538,7 +1173,7 @@
  	}
  	return 0;
  }
-@@ -206,6 +210,8 @@ void ssb_iounmap(struct ssb_bus *bus)
+@@ -206,6 +214,8 @@ void ssb_iounmap(struct ssb_bus *bus)
  		SSB_BUG_ON(1); /* Can't reach this code. */
  #endif
  		break;
@@ -547,7 +1182,7 @@
  	}
  	bus->mmio = NULL;
  	bus->mapped_device = NULL;
-@@ -230,6 +236,8 @@ static void __iomem *ssb_ioremap(struct 
+@@ -230,6 +240,8 @@ static void __iomem *ssb_ioremap(struct 
  		SSB_BUG_ON(1); /* Can't reach this code. */
  #endif
  		break;
@@ -556,3 +1191,327 @@
  	}
  
  	return mmio;
+@@ -339,7 +351,7 @@ int ssb_bus_scan(struct ssb_bus *bus,
+ 		dev->bus = bus;
+ 		dev->ops = bus->ops;
+ 
+-		ssb_dprintk(KERN_INFO PFX
++		printk(KERN_DEBUG PFX
+ 			    "Core %d found: %s "
+ 			    "(cc 0x%03X, rev 0x%02X, vendor 0x%04X)\n",
+ 			    i, ssb_core_name(dev->id.coreid),
+--- a/drivers/ssb/driver_chipcommon.c
++++ b/drivers/ssb/driver_chipcommon.c
+@@ -233,6 +233,8 @@ void ssb_chipcommon_init(struct ssb_chip
+ {
+ 	if (!cc->dev)
+ 		return; /* We don't have a ChipCommon */
++	if (cc->dev->id.revision >= 11)
++		cc->status = chipco_read32(cc, SSB_CHIPCO_CHIPSTAT);
+ 	ssb_pmu_init(cc);
+ 	chipco_powercontrol_init(cc);
+ 	ssb_chipco_set_clockmode(cc, SSB_CLKMODE_FAST);
+@@ -370,6 +372,7 @@ u32 ssb_chipco_gpio_control(struct ssb_c
+ {
+ 	return chipco_write32_masked(cc, SSB_CHIPCO_GPIOCTL, mask, value);
+ }
++EXPORT_SYMBOL(ssb_chipco_gpio_control);
+ 
+ u32 ssb_chipco_gpio_intmask(struct ssb_chipcommon *cc, u32 mask, u32 value)
+ {
+--- a/drivers/ssb/driver_mipscore.c
++++ b/drivers/ssb/driver_mipscore.c
+@@ -49,29 +49,54 @@ static const u32 ipsflag_irq_shift[] = {
+ 
+ static inline u32 ssb_irqflag(struct ssb_device *dev)
+ {
+-	return ssb_read32(dev, SSB_TPSFLAG) & SSB_TPSFLAG_BPFLAG;
++	u32 tpsflag = ssb_read32(dev, SSB_TPSFLAG);
++	if (tpsflag)
++		return ssb_read32(dev, SSB_TPSFLAG) & SSB_TPSFLAG_BPFLAG;
++	else
++		/* not irq supported */
++		return 0x3f;
++}
++
++static struct ssb_device *find_device(struct ssb_device *rdev, int irqflag)
++{
++	struct ssb_bus *bus = rdev->bus;
++	int i;
++	for (i = 0; i < bus->nr_devices; i++) {
++		struct ssb_device *dev;
++		dev = &(bus->devices[i]);
++		if (ssb_irqflag(dev) == irqflag)
++			return dev;
++	}
++	return NULL;
+ }
+ 
+ /* Get the MIPS IRQ assignment for a specified device.
+  * If unassigned, 0 is returned.
++ * If disabled, 5 is returned.
++ * If not supported, 6 is returned.
+  */
+ unsigned int ssb_mips_irq(struct ssb_device *dev)
+ {
+ 	struct ssb_bus *bus = dev->bus;
++	struct ssb_device *mdev = bus->mipscore.dev;
+ 	u32 irqflag;
+ 	u32 ipsflag;
+ 	u32 tmp;
+ 	unsigned int irq;
+ 
+ 	irqflag = ssb_irqflag(dev);
++	if (irqflag == 0x3f)
++		return 6;
+ 	ipsflag = ssb_read32(bus->mipscore.dev, SSB_IPSFLAG);
+ 	for (irq = 1; irq <= 4; irq++) {
+ 		tmp = ((ipsflag & ipsflag_irq_mask[irq]) >> ipsflag_irq_shift[irq]);
+ 		if (tmp == irqflag)
+ 			break;
+ 	}
+-	if (irq	== 5)
+-		irq = 0;
++	if (irq	== 5) {
++		if ((1 << irqflag) & ssb_read32(mdev, SSB_INTVEC))
++			irq = 0;
++	}
+ 
+ 	return irq;
+ }
+@@ -97,25 +122,56 @@ static void set_irq(struct ssb_device *d
+ 	struct ssb_device *mdev = bus->mipscore.dev;
+ 	u32 irqflag = ssb_irqflag(dev);
+ 
++	BUG_ON(oldirq == 6);
++
+ 	dev->irq = irq + 2;
+ 
+-	ssb_dprintk(KERN_INFO PFX
+-		    "set_irq: core 0x%04x, irq %d => %d\n",
+-		    dev->id.coreid, oldirq, irq);
+ 	/* clear the old irq */
+ 	if (oldirq == 0)
+ 		ssb_write32(mdev, SSB_INTVEC, (~(1 << irqflag) & ssb_read32(mdev, SSB_INTVEC)));
+-	else
++	else if (oldirq != 5)
+ 		clear_irq(bus, oldirq);
+ 
+ 	/* assign the new one */
+ 	if (irq == 0) {
+ 		ssb_write32(mdev, SSB_INTVEC, ((1 << irqflag) | ssb_read32(mdev, SSB_INTVEC)));
+ 	} else {
++		u32 ipsflag = ssb_read32(mdev, SSB_IPSFLAG);
++		if ((ipsflag & ipsflag_irq_mask[irq]) != ipsflag_irq_mask[irq]) {
++			u32 oldipsflag = (ipsflag & ipsflag_irq_mask[irq]) >> ipsflag_irq_shift[irq];
++			struct ssb_device *olddev = find_device(dev, oldipsflag);
++			if (olddev)
++				set_irq(olddev, 0);
++		}
+ 		irqflag <<= ipsflag_irq_shift[irq];
+-		irqflag |= (ssb_read32(mdev, SSB_IPSFLAG) & ~ipsflag_irq_mask[irq]);
++		irqflag |= (ipsflag & ~ipsflag_irq_mask[irq]);
+ 		ssb_write32(mdev, SSB_IPSFLAG, irqflag);
+ 	}
++	ssb_dprintk(KERN_INFO PFX
++		    "set_irq: core 0x%04x, irq %d => %d\n",
++		    dev->id.coreid, oldirq+2, irq+2);
++}
++
++static void print_irq(struct ssb_device *dev, unsigned int irq)
++{
++	int i;
++	static const char *irq_name[] = {"2(S)", "3", "4", "5", "6", "D", "I"};
++	ssb_dprintk(KERN_INFO PFX
++		"core 0x%04x, irq :", dev->id.coreid);
++	for (i = 0; i <= 6; i++) {
++		ssb_dprintk(" %s%s", irq_name[i], i==irq?"*":" ");
++	}
++	ssb_dprintk("\n");
++}
++
++static void dump_irq(struct ssb_bus *bus)
++{
++	int i;
++	for (i = 0; i < bus->nr_devices; i++) {
++		struct ssb_device *dev;
++		dev = &(bus->devices[i]);
++		print_irq(dev, ssb_mips_irq(dev));
++	}
+ }
+ 
+ static void ssb_mips_serial_init(struct ssb_mipscore *mcore)
+@@ -197,17 +253,23 @@ void ssb_mipscore_init(struct ssb_mipsco
+ 
+ 	/* Assign IRQs to all cores on the bus, start with irq line 2, because serial usually takes 1 */
+ 	for (irq = 2, i = 0; i < bus->nr_devices; i++) {
++		int mips_irq;
+ 		dev = &(bus->devices[i]);
+-		dev->irq = ssb_mips_irq(dev) + 2;
++		mips_irq = ssb_mips_irq(dev);
++		if (mips_irq > 4)
++			dev->irq = 0;
++		else
++			dev->irq = mips_irq + 2;
++		if (dev->irq > 5)
++			continue;
+ 		switch (dev->id.coreid) {
+ 		case SSB_DEV_USB11_HOST:
+ 			/* shouldn't need a separate irq line for non-4710, most of them have a proper
+ 			 * external usb controller on the pci */
+ 			if ((bus->chip_id == 0x4710) && (irq <= 4)) {
+ 				set_irq(dev, irq++);
+-				break;
+ 			}
+-			/* fallthrough */
++			break;
+ 		case SSB_DEV_PCI:
+ 		case SSB_DEV_ETHERNET:
+ 		case SSB_DEV_ETHERNET_GBIT:
+@@ -218,8 +280,14 @@ void ssb_mipscore_init(struct ssb_mipsco
+ 				set_irq(dev, irq++);
+ 				break;
+ 			}
++			/* fallthrough */
++		case SSB_DEV_EXTIF:
++			set_irq(dev, 0);
++			break;
+ 		}
+ 	}
++	ssb_dprintk(KERN_INFO PFX "after irq reconfiguration\n");
++	dump_irq(bus);
+ 
+ 	ssb_mips_serial_init(mcore);
+ 	ssb_mips_flash_detect(mcore);
+--- a/drivers/ssb/sprom.c
++++ b/drivers/ssb/sprom.c
+@@ -13,6 +13,9 @@
+ 
+ #include "ssb_private.h"
+ 
++#include <linux/ctype.h>
++#include <linux/slab.h>
++
+ 
+ static const struct ssb_sprom *fallback_sprom;
+ 
+@@ -33,17 +36,27 @@ static int sprom2hex(const u16 *sprom, c
+ static int hex2sprom(u16 *sprom, const char *dump, size_t len,
+ 		     size_t sprom_size_words)
+ {
+-	char tmp[5] = { 0 };
+-	int cnt = 0;
++	char c, tmp[5] = { 0 };
++	int err, cnt = 0;
+ 	unsigned long parsed;
+ 
+-	if (len < sprom_size_words * 2)
++	/* Strip whitespace at the end. */
++	while (len) {
++		c = dump[len - 1];
++		if (!isspace(c) && c != '\0')
++			break;
++		len--;
++	}
++	/* Length must match exactly. */
++	if (len != sprom_size_words * 4)
+ 		return -EINVAL;
+ 
+ 	while (cnt < sprom_size_words) {
+ 		memcpy(tmp, dump, 4);
+ 		dump += 4;
+-		parsed = simple_strtoul(tmp, NULL, 16);
++		err = strict_strtoul(tmp, 16, &parsed);
++		if (err)
++			return err;
+ 		sprom[cnt++] = swab16((u16)parsed);
+ 	}
+ 
+@@ -90,6 +103,7 @@ ssize_t ssb_attr_sprom_store(struct ssb_
+ 	u16 *sprom;
+ 	int res = 0, err = -ENOMEM;
+ 	size_t sprom_size_words = bus->sprom_size;
++	struct ssb_freeze_context freeze;
+ 
+ 	sprom = kcalloc(bus->sprom_size, sizeof(u16), GFP_KERNEL);
+ 	if (!sprom)
+@@ -111,18 +125,13 @@ ssize_t ssb_attr_sprom_store(struct ssb_
+ 	err = -ERESTARTSYS;
+ 	if (mutex_lock_interruptible(&bus->sprom_mutex))
+ 		goto out_kfree;
+-	err = ssb_devices_freeze(bus);
+-	if (err == -EOPNOTSUPP) {
+-		ssb_printk(KERN_ERR PFX "SPROM write: Could not freeze devices. "
+-			   "No suspend support. Is CONFIG_PM enabled?\n");
+-		goto out_unlock;
+-	}
++	err = ssb_devices_freeze(bus, &freeze);
+ 	if (err) {
+ 		ssb_printk(KERN_ERR PFX "SPROM write: Could not freeze all devices\n");
+ 		goto out_unlock;
+ 	}
+ 	res = sprom_write(bus, sprom);
+-	err = ssb_devices_thaw(bus);
++	err = ssb_devices_thaw(&freeze);
+ 	if (err)
+ 		ssb_printk(KERN_ERR PFX "SPROM write: Could not thaw all devices\n");
+ out_unlock:
+@@ -167,3 +176,17 @@ const struct ssb_sprom *ssb_get_fallback
+ {
+ 	return fallback_sprom;
+ }
++
++/* http://bcm-v4.sipsolutions.net/802.11/IsSpromAvailable */
++bool ssb_is_sprom_available(struct ssb_bus *bus)
++{
++	/* status register only exists on chipcomon rev >= 11 and we need check
++	   for >= 31 only */
++	/* this routine differs from specs as we do not access SPROM directly
++	   on PCMCIA */
++	if (bus->bustype == SSB_BUSTYPE_PCI &&
++	    bus->chipco.dev->id.revision >= 31)
++		return bus->chipco.capabilities & SSB_CHIPCO_CAP_SPROM;
++
++	return true;
++}
+--- a/drivers/ssb/ssb_private.h
++++ b/drivers/ssb/ssb_private.h
+@@ -136,19 +136,27 @@ extern const struct ssb_sprom *ssb_get_f
+ 
+ /* core.c */
+ extern u32 ssb_calc_clock_rate(u32 plltype, u32 n, u32 m);
+-extern int ssb_devices_freeze(struct ssb_bus *bus);
+-extern int ssb_devices_thaw(struct ssb_bus *bus);
+ extern struct ssb_bus *ssb_pci_dev_to_bus(struct pci_dev *pdev);
+ int ssb_for_each_bus_call(unsigned long data,
+ 			  int (*func)(struct ssb_bus *bus, unsigned long data));
+ extern struct ssb_bus *ssb_pcmcia_dev_to_bus(struct pcmcia_device *pdev);
+ 
++struct ssb_freeze_context {
++	/* Pointer to the bus */
++	struct ssb_bus *bus;
++	/* Boolean list to indicate whether a device is frozen on this bus. */
++	bool device_frozen[SSB_MAX_NR_CORES];
++};
++extern int ssb_devices_freeze(struct ssb_bus *bus, struct ssb_freeze_context *ctx);
++extern int ssb_devices_thaw(struct ssb_freeze_context *ctx);
++
++
+ 
+ /* b43_pci_bridge.c */
+ #ifdef CONFIG_SSB_B43_PCI_BRIDGE
+ extern int __init b43_pci_ssb_bridge_init(void);
+ extern void __exit b43_pci_ssb_bridge_exit(void);
+-#else /* CONFIG_SSB_B43_PCI_BRIDGR */
++#else /* CONFIG_SSB_B43_PCI_BRIDGE */
+ static inline int b43_pci_ssb_bridge_init(void)
+ {
+ 	return 0;
+@@ -156,6 +164,6 @@ static inline int b43_pci_ssb_bridge_ini
+ static inline void b43_pci_ssb_bridge_exit(void)
+ {
+ }
+-#endif /* CONFIG_SSB_PCIHOST */
++#endif /* CONFIG_SSB_B43_PCI_BRIDGE */
+ 
+ #endif /* LINUX_SSB_PRIVATE_H_ */
diff --git a/target/linux/generic-2.6/patches-2.6.31/001-squashfs_move_zlib_decomp.patch b/target/linux/generic-2.6/patches-2.6.31/001-squashfs_move_zlib_decomp.patch
deleted file mode 100644
index 94096791f..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/001-squashfs_move_zlib_decomp.patch
+++ /dev/null
@@ -1,244 +0,0 @@
-From 6c4419d997d4431bb62e73475cd6b084e83efbd1 Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Tue, 22 Sep 2009 19:25:24 +0100
-Subject: [PATCH] Squashfs: move zlib decompression wrapper code into a separate file
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/Makefile       |    2 +-
- fs/squashfs/block.c        |   74 ++----------------------------
- fs/squashfs/squashfs.h     |    4 ++
- fs/squashfs/zlib_wrapper.c |  109 ++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 118 insertions(+), 71 deletions(-)
- create mode 100644 fs/squashfs/zlib_wrapper.c
-
---- a/fs/squashfs/Makefile
-+++ b/fs/squashfs/Makefile
-@@ -4,4 +4,4 @@
- 
- obj-$(CONFIG_SQUASHFS) += squashfs.o
- squashfs-y += block.o cache.o dir.o export.o file.o fragment.o id.o inode.o
--squashfs-y += namei.o super.o symlink.o
-+squashfs-y += namei.o super.o symlink.o zlib_wrapper.o
---- a/fs/squashfs/block.c
-+++ b/fs/squashfs/block.c
-@@ -29,7 +29,6 @@
- #include <linux/fs.h>
- #include <linux/vfs.h>
- #include <linux/slab.h>
--#include <linux/mutex.h>
- #include <linux/string.h>
- #include <linux/buffer_head.h>
- #include <linux/zlib.h>
-@@ -153,72 +152,10 @@ int squashfs_read_data(struct super_bloc
- 	}
- 
- 	if (compressed) {
--		int zlib_err = 0, zlib_init = 0;
--
--		/*
--		 * Uncompress block.
--		 */
--
--		mutex_lock(&msblk->read_data_mutex);
--
--		msblk->stream.avail_out = 0;
--		msblk->stream.avail_in = 0;
--
--		bytes = length;
--		do {
--			if (msblk->stream.avail_in == 0 && k < b) {
--				avail = min(bytes, msblk->devblksize - offset);
--				bytes -= avail;
--				wait_on_buffer(bh[k]);
--				if (!buffer_uptodate(bh[k]))
--					goto release_mutex;
--
--				if (avail == 0) {
--					offset = 0;
--					put_bh(bh[k++]);
--					continue;
--				}
--
--				msblk->stream.next_in = bh[k]->b_data + offset;
--				msblk->stream.avail_in = avail;
--				offset = 0;
--			}
--
--			if (msblk->stream.avail_out == 0 && page < pages) {
--				msblk->stream.next_out = buffer[page++];
--				msblk->stream.avail_out = PAGE_CACHE_SIZE;
--			}
--
--			if (!zlib_init) {
--				zlib_err = zlib_inflateInit(&msblk->stream);
--				if (zlib_err != Z_OK) {
--					ERROR("zlib_inflateInit returned"
--						" unexpected result 0x%x,"
--						" srclength %d\n", zlib_err,
--						srclength);
--					goto release_mutex;
--				}
--				zlib_init = 1;
--			}
--
--			zlib_err = zlib_inflate(&msblk->stream, Z_SYNC_FLUSH);
--
--			if (msblk->stream.avail_in == 0 && k < b)
--				put_bh(bh[k++]);
--		} while (zlib_err == Z_OK);
--
--		if (zlib_err != Z_STREAM_END) {
--			ERROR("zlib_inflate error, data probably corrupt\n");
--			goto release_mutex;
--		}
--
--		zlib_err = zlib_inflateEnd(&msblk->stream);
--		if (zlib_err != Z_OK) {
--			ERROR("zlib_inflate error, data probably corrupt\n");
--			goto release_mutex;
--		}
--		length = msblk->stream.total_out;
--		mutex_unlock(&msblk->read_data_mutex);
-+		length = zlib_uncompress(msblk, buffer, bh, b, offset, length,
-+			srclength, pages);
-+		if (length < 0)
-+			goto read_failure;
- 	} else {
- 		/*
- 		 * Block is uncompressed.
-@@ -255,9 +192,6 @@ int squashfs_read_data(struct super_bloc
- 	kfree(bh);
- 	return length;
- 
--release_mutex:
--	mutex_unlock(&msblk->read_data_mutex);
--
- block_release:
- 	for (; k < b; k++)
- 		put_bh(bh[k]);
---- a/fs/squashfs/squashfs.h
-+++ b/fs/squashfs/squashfs.h
-@@ -70,6 +70,10 @@ extern struct inode *squashfs_iget(struc
- 				unsigned int);
- extern int squashfs_read_inode(struct inode *, long long);
- 
-+/* zlib_wrapper.c */
-+extern int zlib_uncompress(struct squashfs_sb_info *, void **,
-+				struct buffer_head **, int, int, int, int, int);
-+
- /*
-  * Inodes and files operations
-  */
---- /dev/null
-+++ b/fs/squashfs/zlib_wrapper.c
-@@ -0,0 +1,109 @@
-+/*
-+ * Squashfs - a compressed read only filesystem for Linux
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-+ * Phillip Lougher <phillip@lougher.demon.co.uk>
-+ *
-+ * 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,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ *
-+ * zlib_wrapper.c
-+ */
-+
-+
-+#include <linux/mutex.h>
-+#include <linux/buffer_head.h>
-+#include <linux/zlib.h>
-+
-+#include "squashfs_fs.h"
-+#include "squashfs_fs_sb.h"
-+#include "squashfs_fs_i.h"
-+#include "squashfs.h"
-+
-+int zlib_uncompress(struct squashfs_sb_info *msblk, void **buffer,
-+	struct buffer_head **bh, int b, int offset, int length, int srclength,
-+	int pages)
-+{
-+	int zlib_err = 0, zlib_init = 0;
-+	int avail, bytes, k = 0, page = 0;
-+
-+	mutex_lock(&msblk->read_data_mutex);
-+
-+	msblk->stream.avail_out = 0;
-+	msblk->stream.avail_in = 0;
-+
-+	bytes = length;
-+	do {
-+		if (msblk->stream.avail_in == 0 && k < b) {
-+			avail = min(bytes, msblk->devblksize - offset);
-+			bytes -= avail;
-+			wait_on_buffer(bh[k]);
-+			if (!buffer_uptodate(bh[k]))
-+				goto release_mutex;
-+
-+			if (avail == 0) {
-+				offset = 0;
-+				put_bh(bh[k++]);
-+				continue;
-+			}
-+
-+			msblk->stream.next_in = bh[k]->b_data + offset;
-+			msblk->stream.avail_in = avail;
-+			offset = 0;
-+		}
-+
-+		if (msblk->stream.avail_out == 0 && page < pages) {
-+			msblk->stream.next_out = buffer[page++];
-+			msblk->stream.avail_out = PAGE_CACHE_SIZE;
-+		}
-+
-+		if (!zlib_init) {
-+			zlib_err = zlib_inflateInit(&msblk->stream);
-+			if (zlib_err != Z_OK) {
-+				ERROR("zlib_inflateInit returned unexpected "
-+					"result 0x%x, srclength %d\n",
-+					zlib_err, srclength);
-+				goto release_mutex;
-+			}
-+			zlib_init = 1;
-+		}
-+
-+		zlib_err = zlib_inflate(&msblk->stream, Z_SYNC_FLUSH);
-+
-+		if (msblk->stream.avail_in == 0 && k < b)
-+			put_bh(bh[k++]);
-+	} while (zlib_err == Z_OK);
-+
-+	if (zlib_err != Z_STREAM_END) {
-+		ERROR("zlib_inflate error, data probably corrupt\n");
-+		goto release_mutex;
-+	}
-+
-+	zlib_err = zlib_inflateEnd(&msblk->stream);
-+	if (zlib_err != Z_OK) {
-+		ERROR("zlib_inflate error, data probably corrupt\n");
-+		goto release_mutex;
-+	}
-+
-+	mutex_unlock(&msblk->read_data_mutex);
-+	return msblk->stream.total_out;
-+
-+release_mutex:
-+	mutex_unlock(&msblk->read_data_mutex);
-+
-+	for (; k < b; k++)
-+		put_bh(bh[k]);
-+
-+	return -EIO;
-+}
diff --git a/target/linux/generic-2.6/patches-2.6.31/002-squashfs_factor_out_remaining_zlib.patch b/target/linux/generic-2.6/patches-2.6.31/002-squashfs_factor_out_remaining_zlib.patch
deleted file mode 100644
index eacbb97ae..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/002-squashfs_factor_out_remaining_zlib.patch
+++ /dev/null
@@ -1,317 +0,0 @@
-From 37c44e85fd49676ec15ccaeea065662c1fbcda7d Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Wed, 23 Sep 2009 19:04:49 +0100
-Subject: [PATCH] Squashfs: Factor out remaining zlib dependencies into separate wrapper file
-
-Move zlib buffer init/destroy code into separate wrapper file.  Also
-make zlib z_stream field a void * removing the need to include zlib.h
-for most files.
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/block.c          |    1 -
- fs/squashfs/cache.c          |    1 -
- fs/squashfs/dir.c            |    1 -
- fs/squashfs/export.c         |    1 -
- fs/squashfs/file.c           |    1 -
- fs/squashfs/fragment.c       |    1 -
- fs/squashfs/id.c             |    1 -
- fs/squashfs/inode.c          |    1 -
- fs/squashfs/namei.c          |    1 -
- fs/squashfs/squashfs.h       |    2 +
- fs/squashfs/squashfs_fs_sb.h |    2 +-
- fs/squashfs/super.c          |   14 +++------
- fs/squashfs/symlink.c        |    1 -
- fs/squashfs/zlib_wrapper.c   |   56 ++++++++++++++++++++++++++++++++---------
- 14 files changed, 51 insertions(+), 33 deletions(-)
-
---- a/fs/squashfs/block.c
-+++ b/fs/squashfs/block.c
-@@ -31,7 +31,6 @@
- #include <linux/slab.h>
- #include <linux/string.h>
- #include <linux/buffer_head.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/cache.c
-+++ b/fs/squashfs/cache.c
-@@ -51,7 +51,6 @@
- #include <linux/sched.h>
- #include <linux/spinlock.h>
- #include <linux/wait.h>
--#include <linux/zlib.h>
- #include <linux/pagemap.h>
- 
- #include "squashfs_fs.h"
---- a/fs/squashfs/dir.c
-+++ b/fs/squashfs/dir.c
-@@ -30,7 +30,6 @@
- #include <linux/fs.h>
- #include <linux/vfs.h>
- #include <linux/slab.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/export.c
-+++ b/fs/squashfs/export.c
-@@ -39,7 +39,6 @@
- #include <linux/vfs.h>
- #include <linux/dcache.h>
- #include <linux/exportfs.h>
--#include <linux/zlib.h>
- #include <linux/slab.h>
- 
- #include "squashfs_fs.h"
---- a/fs/squashfs/file.c
-+++ b/fs/squashfs/file.c
-@@ -47,7 +47,6 @@
- #include <linux/string.h>
- #include <linux/pagemap.h>
- #include <linux/mutex.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/fragment.c
-+++ b/fs/squashfs/fragment.c
-@@ -36,7 +36,6 @@
- #include <linux/fs.h>
- #include <linux/vfs.h>
- #include <linux/slab.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/id.c
-+++ b/fs/squashfs/id.c
-@@ -34,7 +34,6 @@
- #include <linux/fs.h>
- #include <linux/vfs.h>
- #include <linux/slab.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/inode.c
-+++ b/fs/squashfs/inode.c
-@@ -40,7 +40,6 @@
- 
- #include <linux/fs.h>
- #include <linux/vfs.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/namei.c
-+++ b/fs/squashfs/namei.c
-@@ -57,7 +57,6 @@
- #include <linux/slab.h>
- #include <linux/string.h>
- #include <linux/dcache.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/squashfs.h
-+++ b/fs/squashfs/squashfs.h
-@@ -71,6 +71,8 @@ extern struct inode *squashfs_iget(struc
- extern int squashfs_read_inode(struct inode *, long long);
- 
- /* zlib_wrapper.c */
-+extern void *zlib_init(void);
-+extern void zlib_free(void *);
- extern int zlib_uncompress(struct squashfs_sb_info *, void **,
- 				struct buffer_head **, int, int, int, int, int);
- 
---- a/fs/squashfs/squashfs_fs_sb.h
-+++ b/fs/squashfs/squashfs_fs_sb.h
-@@ -64,7 +64,7 @@ struct squashfs_sb_info {
- 	struct mutex		read_data_mutex;
- 	struct mutex		meta_index_mutex;
- 	struct meta_index	*meta_index;
--	z_stream		stream;
-+	void			*stream;
- 	__le64			*inode_lookup_table;
- 	u64			inode_table;
- 	u64			directory_table;
---- a/fs/squashfs/super.c
-+++ b/fs/squashfs/super.c
-@@ -35,7 +35,6 @@
- #include <linux/pagemap.h>
- #include <linux/init.h>
- #include <linux/module.h>
--#include <linux/zlib.h>
- #include <linux/magic.h>
- 
- #include "squashfs_fs.h"
-@@ -87,12 +86,9 @@ static int squashfs_fill_super(struct su
- 	}
- 	msblk = sb->s_fs_info;
- 
--	msblk->stream.workspace = kmalloc(zlib_inflate_workspacesize(),
--		GFP_KERNEL);
--	if (msblk->stream.workspace == NULL) {
--		ERROR("Failed to allocate zlib workspace\n");
-+	msblk->stream = zlib_init();
-+	if (msblk->stream == NULL)
- 		goto failure;
--	}
- 
- 	sblk = kzalloc(sizeof(*sblk), GFP_KERNEL);
- 	if (sblk == NULL) {
-@@ -292,17 +288,17 @@ failed_mount:
- 	squashfs_cache_delete(msblk->block_cache);
- 	squashfs_cache_delete(msblk->fragment_cache);
- 	squashfs_cache_delete(msblk->read_page);
-+	zlib_free(msblk->stream);
- 	kfree(msblk->inode_lookup_table);
- 	kfree(msblk->fragment_index);
- 	kfree(msblk->id_table);
--	kfree(msblk->stream.workspace);
- 	kfree(sb->s_fs_info);
- 	sb->s_fs_info = NULL;
- 	kfree(sblk);
- 	return err;
- 
- failure:
--	kfree(msblk->stream.workspace);
-+	zlib_free(msblk->stream);
- 	kfree(sb->s_fs_info);
- 	sb->s_fs_info = NULL;
- 	return -ENOMEM;
-@@ -346,10 +342,10 @@ static void squashfs_put_super(struct su
- 		squashfs_cache_delete(sbi->block_cache);
- 		squashfs_cache_delete(sbi->fragment_cache);
- 		squashfs_cache_delete(sbi->read_page);
-+		zlib_free(sbi->stream);
- 		kfree(sbi->id_table);
- 		kfree(sbi->fragment_index);
- 		kfree(sbi->meta_index);
--		kfree(sbi->stream.workspace);
- 		kfree(sb->s_fs_info);
- 		sb->s_fs_info = NULL;
- 	}
---- a/fs/squashfs/symlink.c
-+++ b/fs/squashfs/symlink.c
-@@ -36,7 +36,6 @@
- #include <linux/slab.h>
- #include <linux/string.h>
- #include <linux/pagemap.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/zlib_wrapper.c
-+++ b/fs/squashfs/zlib_wrapper.c
-@@ -31,21 +31,51 @@
- #include "squashfs_fs_i.h"
- #include "squashfs.h"
- 
-+void *zlib_init()
-+{
-+	z_stream *stream = kmalloc(sizeof(z_stream), GFP_KERNEL);
-+	if (stream == NULL)
-+		goto failed;
-+	stream->workspace = kmalloc(zlib_inflate_workspacesize(),
-+		GFP_KERNEL);
-+	if (stream->workspace == NULL)
-+		goto failed;
-+
-+	return stream;
-+
-+failed:
-+	ERROR("Failed to allocate zlib workspace\n");
-+	kfree(stream);
-+	return NULL;
-+}
-+
-+
-+void zlib_free(void *strm)
-+{
-+	z_stream *stream = strm;
-+
-+	if (stream)
-+		kfree(stream->workspace);
-+	kfree(stream);
-+}
-+
-+
- int zlib_uncompress(struct squashfs_sb_info *msblk, void **buffer,
- 	struct buffer_head **bh, int b, int offset, int length, int srclength,
- 	int pages)
- {
- 	int zlib_err = 0, zlib_init = 0;
- 	int avail, bytes, k = 0, page = 0;
-+	z_stream *stream = msblk->stream;
- 
- 	mutex_lock(&msblk->read_data_mutex);
- 
--	msblk->stream.avail_out = 0;
--	msblk->stream.avail_in = 0;
-+	stream->avail_out = 0;
-+	stream->avail_in = 0;
- 
- 	bytes = length;
- 	do {
--		if (msblk->stream.avail_in == 0 && k < b) {
-+		if (stream->avail_in == 0 && k < b) {
- 			avail = min(bytes, msblk->devblksize - offset);
- 			bytes -= avail;
- 			wait_on_buffer(bh[k]);
-@@ -58,18 +88,18 @@ int zlib_uncompress(struct squashfs_sb_i
- 				continue;
- 			}
- 
--			msblk->stream.next_in = bh[k]->b_data + offset;
--			msblk->stream.avail_in = avail;
-+			stream->next_in = bh[k]->b_data + offset;
-+			stream->avail_in = avail;
- 			offset = 0;
- 		}
- 
--		if (msblk->stream.avail_out == 0 && page < pages) {
--			msblk->stream.next_out = buffer[page++];
--			msblk->stream.avail_out = PAGE_CACHE_SIZE;
-+		if (stream->avail_out == 0 && page < pages) {
-+			stream->next_out = buffer[page++];
-+			stream->avail_out = PAGE_CACHE_SIZE;
- 		}
- 
- 		if (!zlib_init) {
--			zlib_err = zlib_inflateInit(&msblk->stream);
-+			zlib_err = zlib_inflateInit(stream);
- 			if (zlib_err != Z_OK) {
- 				ERROR("zlib_inflateInit returned unexpected "
- 					"result 0x%x, srclength %d\n",
-@@ -79,9 +109,9 @@ int zlib_uncompress(struct squashfs_sb_i
- 			zlib_init = 1;
- 		}
- 
--		zlib_err = zlib_inflate(&msblk->stream, Z_SYNC_FLUSH);
-+		zlib_err = zlib_inflate(stream, Z_SYNC_FLUSH);
- 
--		if (msblk->stream.avail_in == 0 && k < b)
-+		if (stream->avail_in == 0 && k < b)
- 			put_bh(bh[k++]);
- 	} while (zlib_err == Z_OK);
- 
-@@ -90,14 +120,14 @@ int zlib_uncompress(struct squashfs_sb_i
- 		goto release_mutex;
- 	}
- 
--	zlib_err = zlib_inflateEnd(&msblk->stream);
-+	zlib_err = zlib_inflateEnd(stream);
- 	if (zlib_err != Z_OK) {
- 		ERROR("zlib_inflate error, data probably corrupt\n");
- 		goto release_mutex;
- 	}
- 
- 	mutex_unlock(&msblk->read_data_mutex);
--	return msblk->stream.total_out;
-+	return stream->total_out;
- 
- release_mutex:
- 	mutex_unlock(&msblk->read_data_mutex);
diff --git a/target/linux/generic-2.6/patches-2.6.31/003-squashfs_add_decompressor_framework.patch b/target/linux/generic-2.6/patches-2.6.31/003-squashfs_add_decompressor_framework.patch
deleted file mode 100644
index cbfbf5369..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/003-squashfs_add_decompressor_framework.patch
+++ /dev/null
@@ -1,426 +0,0 @@
-From 327fbf47a419befc6bff74f3ca42d2b6f0841903 Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Tue, 6 Oct 2009 04:04:15 +0100
-Subject: [PATCH] Squashfs: add a decompressor framework
-
-This adds a decompressor framework which allows multiple compression
-algorithms to be cleanly supported.
-
-Also update zlib wrapper and other code to use the new framework.
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/Makefile         |    2 +-
- fs/squashfs/block.c          |    6 ++--
- fs/squashfs/decompressor.c   |   58 ++++++++++++++++++++++++++++++++++++++++++
- fs/squashfs/decompressor.h   |   55 +++++++++++++++++++++++++++++++++++++++
- fs/squashfs/squashfs.h       |   14 +++++-----
- fs/squashfs/squashfs_fs_sb.h |   41 +++++++++++++++--------------
- fs/squashfs/super.c          |   45 ++++++++++++++++++-------------
- fs/squashfs/zlib_wrapper.c   |   17 ++++++++++--
- 8 files changed, 185 insertions(+), 53 deletions(-)
- create mode 100644 fs/squashfs/decompressor.c
- create mode 100644 fs/squashfs/decompressor.h
-
---- a/fs/squashfs/Makefile
-+++ b/fs/squashfs/Makefile
-@@ -4,4 +4,4 @@
- 
- obj-$(CONFIG_SQUASHFS) += squashfs.o
- squashfs-y += block.o cache.o dir.o export.o file.o fragment.o id.o inode.o
--squashfs-y += namei.o super.o symlink.o zlib_wrapper.o
-+squashfs-y += namei.o super.o symlink.o zlib_wrapper.o decompressor.o
---- a/fs/squashfs/block.c
-+++ b/fs/squashfs/block.c
-@@ -36,7 +36,7 @@
- #include "squashfs_fs_sb.h"
- #include "squashfs_fs_i.h"
- #include "squashfs.h"
--
-+#include "decompressor.h"
- /*
-  * Read the metadata block length, this is stored in the first two
-  * bytes of the metadata block.
-@@ -151,8 +151,8 @@ int squashfs_read_data(struct super_bloc
- 	}
- 
- 	if (compressed) {
--		length = zlib_uncompress(msblk, buffer, bh, b, offset, length,
--			srclength, pages);
-+		length = squashfs_decompress(msblk, buffer, bh, b, offset,
-+			length, srclength, pages);
- 		if (length < 0)
- 			goto read_failure;
- 	} else {
---- /dev/null
-+++ b/fs/squashfs/decompressor.c
-@@ -0,0 +1,58 @@
-+/*
-+ * Squashfs - a compressed read only filesystem for Linux
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-+ * Phillip Lougher <phillip@lougher.demon.co.uk>
-+ *
-+ * 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,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ *
-+ * decompressor.c
-+ */
-+
-+#include <linux/types.h>
-+#include <linux/mutex.h>
-+#include <linux/buffer_head.h>
-+
-+#include "squashfs_fs.h"
-+#include "squashfs_fs_sb.h"
-+#include "squashfs_fs_i.h"
-+#include "decompressor.h"
-+#include "squashfs.h"
-+
-+/*
-+ * This file (and decompressor.h) implements a decompressor framework for
-+ * Squashfs, allowing multiple decompressors to be easily supported
-+ */
-+
-+static const struct squashfs_decompressor squashfs_unknown_comp_ops = {
-+	NULL, NULL, NULL, 0, "unknown", 0
-+};
-+
-+static const struct squashfs_decompressor *decompressor[] = {
-+	&squashfs_zlib_comp_ops,
-+	&squashfs_unknown_comp_ops
-+};
-+
-+
-+const struct squashfs_decompressor *squashfs_lookup_decompressor(int id)
-+{
-+	int i;
-+
-+	for (i = 0; decompressor[i]->id; i++)
-+		if (id == decompressor[i]->id)
-+			break;
-+
-+	return decompressor[i];
-+}
---- /dev/null
-+++ b/fs/squashfs/decompressor.h
-@@ -0,0 +1,55 @@
-+#ifndef DECOMPRESSOR_H
-+#define DECOMPRESSOR_H
-+/*
-+ * Squashfs - a compressed read only filesystem for Linux
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-+ * Phillip Lougher <phillip@lougher.demon.co.uk>
-+ *
-+ * 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,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ *
-+ * decompressor.h
-+ */
-+
-+struct squashfs_decompressor {
-+	void	*(*init)(void);
-+	void	(*free)(void *);
-+	int	(*decompress)(struct squashfs_sb_info *, void **,
-+		struct buffer_head **, int, int, int, int, int);
-+	int	id;
-+	char	*name;
-+	int	supported;
-+};
-+
-+static inline void *squashfs_decompressor_init(struct squashfs_sb_info *msblk)
-+{
-+	return msblk->decompressor->init();
-+}
-+
-+static inline void squashfs_decompressor_free(struct squashfs_sb_info *msblk,
-+	void *s)
-+{
-+	if (msblk->decompressor)
-+		msblk->decompressor->free(s);
-+}
-+
-+static inline int squashfs_decompress(struct squashfs_sb_info *msblk,
-+	void **buffer, struct buffer_head **bh, int b, int offset, int length,
-+	int srclength, int pages)
-+{
-+	return msblk->decompressor->decompress(msblk, buffer, bh, b, offset,
-+		length, srclength, pages);
-+}
-+#endif
---- a/fs/squashfs/squashfs.h
-+++ b/fs/squashfs/squashfs.h
-@@ -51,6 +51,9 @@ extern struct squashfs_cache_entry *squa
- 				u64, int);
- extern int squashfs_read_table(struct super_block *, void *, u64, int);
- 
-+/* decompressor.c */
-+extern const struct squashfs_decompressor *squashfs_lookup_decompressor(int);
-+
- /* export.c */
- extern __le64 *squashfs_read_inode_lookup_table(struct super_block *, u64,
- 				unsigned int);
-@@ -70,14 +73,8 @@ extern struct inode *squashfs_iget(struc
- 				unsigned int);
- extern int squashfs_read_inode(struct inode *, long long);
- 
--/* zlib_wrapper.c */
--extern void *zlib_init(void);
--extern void zlib_free(void *);
--extern int zlib_uncompress(struct squashfs_sb_info *, void **,
--				struct buffer_head **, int, int, int, int, int);
--
- /*
-- * Inodes and files operations
-+ * Inodes, files and decompressor operations
-  */
- 
- /* dir.c */
-@@ -94,3 +91,6 @@ extern const struct inode_operations squ
- 
- /* symlink.c */
- extern const struct address_space_operations squashfs_symlink_aops;
-+
-+/* zlib_wrapper.c */
-+extern const struct squashfs_decompressor squashfs_zlib_comp_ops;
---- a/fs/squashfs/squashfs_fs_sb.h
-+++ b/fs/squashfs/squashfs_fs_sb.h
-@@ -52,25 +52,26 @@ struct squashfs_cache_entry {
- };
- 
- struct squashfs_sb_info {
--	int			devblksize;
--	int			devblksize_log2;
--	struct squashfs_cache	*block_cache;
--	struct squashfs_cache	*fragment_cache;
--	struct squashfs_cache	*read_page;
--	int			next_meta_index;
--	__le64			*id_table;
--	__le64			*fragment_index;
--	unsigned int		*fragment_index_2;
--	struct mutex		read_data_mutex;
--	struct mutex		meta_index_mutex;
--	struct meta_index	*meta_index;
--	void			*stream;
--	__le64			*inode_lookup_table;
--	u64			inode_table;
--	u64			directory_table;
--	unsigned int		block_size;
--	unsigned short		block_log;
--	long long		bytes_used;
--	unsigned int		inodes;
-+	const struct squashfs_decompressor	*decompressor;
-+	int					devblksize;
-+	int					devblksize_log2;
-+	struct squashfs_cache			*block_cache;
-+	struct squashfs_cache			*fragment_cache;
-+	struct squashfs_cache			*read_page;
-+	int					next_meta_index;
-+	__le64					*id_table;
-+	__le64					*fragment_index;
-+	unsigned int				*fragment_index_2;
-+	struct mutex				read_data_mutex;
-+	struct mutex				meta_index_mutex;
-+	struct meta_index			*meta_index;
-+	void					*stream;
-+	__le64					*inode_lookup_table;
-+	u64					inode_table;
-+	u64					directory_table;
-+	unsigned int				block_size;
-+	unsigned short				block_log;
-+	long long				bytes_used;
-+	unsigned int				inodes;
- };
- #endif
---- a/fs/squashfs/super.c
-+++ b/fs/squashfs/super.c
-@@ -41,27 +41,35 @@
- #include "squashfs_fs_sb.h"
- #include "squashfs_fs_i.h"
- #include "squashfs.h"
-+#include "decompressor.h"
- 
- static struct file_system_type squashfs_fs_type;
- static struct super_operations squashfs_super_ops;
- 
--static int supported_squashfs_filesystem(short major, short minor, short comp)
-+static const struct squashfs_decompressor *supported_squashfs_filesystem(short
-+	major, short minor, short id)
- {
-+	const struct squashfs_decompressor *decompressor;
-+
- 	if (major < SQUASHFS_MAJOR) {
- 		ERROR("Major/Minor mismatch, older Squashfs %d.%d "
- 			"filesystems are unsupported\n", major, minor);
--		return -EINVAL;
-+		return NULL;
- 	} else if (major > SQUASHFS_MAJOR || minor > SQUASHFS_MINOR) {
- 		ERROR("Major/Minor mismatch, trying to mount newer "
- 			"%d.%d filesystem\n", major, minor);
- 		ERROR("Please update your kernel\n");
--		return -EINVAL;
-+		return NULL;
- 	}
- 
--	if (comp != ZLIB_COMPRESSION)
--		return -EINVAL;
-+	decompressor = squashfs_lookup_decompressor(id);
-+	if (!decompressor->supported) {
-+		ERROR("Filesystem uses \"%s\" compression. This is not "
-+			"supported\n", decompressor->name);
-+		return NULL;
-+	}
- 
--	return 0;
-+	return decompressor;
- }
- 
- 
-@@ -86,10 +94,6 @@ static int squashfs_fill_super(struct su
- 	}
- 	msblk = sb->s_fs_info;
- 
--	msblk->stream = zlib_init();
--	if (msblk->stream == NULL)
--		goto failure;
--
- 	sblk = kzalloc(sizeof(*sblk), GFP_KERNEL);
- 	if (sblk == NULL) {
- 		ERROR("Failed to allocate squashfs_super_block\n");
-@@ -116,25 +120,25 @@ static int squashfs_fill_super(struct su
- 		goto failed_mount;
- 	}
- 
-+	err = -EINVAL;
-+
- 	/* Check it is a SQUASHFS superblock */
- 	sb->s_magic = le32_to_cpu(sblk->s_magic);
- 	if (sb->s_magic != SQUASHFS_MAGIC) {
- 		if (!silent)
- 			ERROR("Can't find a SQUASHFS superblock on %s\n",
- 						bdevname(sb->s_bdev, b));
--		err = -EINVAL;
- 		goto failed_mount;
- 	}
- 
--	/* Check the MAJOR & MINOR versions and compression type */
--	err = supported_squashfs_filesystem(le16_to_cpu(sblk->s_major),
-+	/* Check the MAJOR & MINOR versions and lookup compression type */
-+	msblk->decompressor = supported_squashfs_filesystem(
-+			le16_to_cpu(sblk->s_major),
- 			le16_to_cpu(sblk->s_minor),
- 			le16_to_cpu(sblk->compression));
--	if (err < 0)
-+	if (msblk->decompressor == NULL)
- 		goto failed_mount;
- 
--	err = -EINVAL;
--
- 	/*
- 	 * Check if there's xattrs in the filesystem.  These are not
- 	 * supported in this version, so warn that they will be ignored.
-@@ -201,6 +205,10 @@ static int squashfs_fill_super(struct su
- 
- 	err = -ENOMEM;
- 
-+	msblk->stream = squashfs_decompressor_init(msblk);
-+	if (msblk->stream == NULL)
-+		goto failed_mount;
-+
- 	msblk->block_cache = squashfs_cache_init("metadata",
- 			SQUASHFS_CACHED_BLKS, SQUASHFS_METADATA_SIZE);
- 	if (msblk->block_cache == NULL)
-@@ -288,7 +296,7 @@ failed_mount:
- 	squashfs_cache_delete(msblk->block_cache);
- 	squashfs_cache_delete(msblk->fragment_cache);
- 	squashfs_cache_delete(msblk->read_page);
--	zlib_free(msblk->stream);
-+	squashfs_decompressor_free(msblk, msblk->stream);
- 	kfree(msblk->inode_lookup_table);
- 	kfree(msblk->fragment_index);
- 	kfree(msblk->id_table);
-@@ -298,7 +306,6 @@ failed_mount:
- 	return err;
- 
- failure:
--	zlib_free(msblk->stream);
- 	kfree(sb->s_fs_info);
- 	sb->s_fs_info = NULL;
- 	return -ENOMEM;
-@@ -342,7 +349,7 @@ static void squashfs_put_super(struct su
- 		squashfs_cache_delete(sbi->block_cache);
- 		squashfs_cache_delete(sbi->fragment_cache);
- 		squashfs_cache_delete(sbi->read_page);
--		zlib_free(sbi->stream);
-+		squashfs_decompressor_free(sbi, sbi->stream);
- 		kfree(sbi->id_table);
- 		kfree(sbi->fragment_index);
- 		kfree(sbi->meta_index);
---- a/fs/squashfs/zlib_wrapper.c
-+++ b/fs/squashfs/zlib_wrapper.c
-@@ -30,8 +30,9 @@
- #include "squashfs_fs_sb.h"
- #include "squashfs_fs_i.h"
- #include "squashfs.h"
-+#include "decompressor.h"
- 
--void *zlib_init()
-+static void *zlib_init(void)
- {
- 	z_stream *stream = kmalloc(sizeof(z_stream), GFP_KERNEL);
- 	if (stream == NULL)
-@@ -50,7 +51,7 @@ failed:
- }
- 
- 
--void zlib_free(void *strm)
-+static void zlib_free(void *strm)
- {
- 	z_stream *stream = strm;
- 
-@@ -60,7 +61,7 @@ void zlib_free(void *strm)
- }
- 
- 
--int zlib_uncompress(struct squashfs_sb_info *msblk, void **buffer,
-+static int zlib_uncompress(struct squashfs_sb_info *msblk, void **buffer,
- 	struct buffer_head **bh, int b, int offset, int length, int srclength,
- 	int pages)
- {
-@@ -137,3 +138,13 @@ release_mutex:
- 
- 	return -EIO;
- }
-+
-+const struct squashfs_decompressor squashfs_zlib_comp_ops = {
-+	.init = zlib_init,
-+	.free = zlib_free,
-+	.decompress = zlib_uncompress,
-+	.id = ZLIB_COMPRESSION,
-+	.name = "zlib",
-+	.supported = 1
-+};
-+
diff --git a/target/linux/generic-2.6/patches-2.6.31/004-squashfs_add_decompressor_lzma_lzo.patch b/target/linux/generic-2.6/patches-2.6.31/004-squashfs_add_decompressor_lzma_lzo.patch
deleted file mode 100644
index a378c0005..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/004-squashfs_add_decompressor_lzma_lzo.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 1885ca0a1973944684f252094a703b7c80dfc974 Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Wed, 14 Oct 2009 03:58:11 +0100
-Subject: [PATCH] Squashfs: add decompressor entries for lzma and lzo
-
-Add knowledge of lzma/lzo compression formats to the decompressor
-framework.  For now these are added as unsupported.  Without
-these entries lzma/lzo compressed filesystems will be flagged as
-having unknown compression which is undesirable.
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/decompressor.c |   10 ++++++++++
- fs/squashfs/squashfs_fs.h  |    4 +++-
- 2 files changed, 13 insertions(+), 1 deletions(-)
-
---- a/fs/squashfs/decompressor.c
-+++ b/fs/squashfs/decompressor.c
-@@ -36,12 +36,22 @@
-  * Squashfs, allowing multiple decompressors to be easily supported
-  */
- 
-+static const struct squashfs_decompressor squashfs_lzma_unsupported_comp_ops = {
-+	NULL, NULL, NULL, LZMA_COMPRESSION, "lzma", 0
-+};
-+
-+static const struct squashfs_decompressor squashfs_lzo_unsupported_comp_ops = {
-+	NULL, NULL, NULL, LZO_COMPRESSION, "lzo", 0
-+};
-+
- static const struct squashfs_decompressor squashfs_unknown_comp_ops = {
- 	NULL, NULL, NULL, 0, "unknown", 0
- };
- 
- static const struct squashfs_decompressor *decompressor[] = {
- 	&squashfs_zlib_comp_ops,
-+	&squashfs_lzma_unsupported_comp_ops,
-+	&squashfs_lzo_unsupported_comp_ops,
- 	&squashfs_unknown_comp_ops
- };
- 
---- a/fs/squashfs/squashfs_fs.h
-+++ b/fs/squashfs/squashfs_fs.h
-@@ -211,7 +211,9 @@ struct meta_index {
- /*
-  * definitions for structures on disk
-  */
--#define ZLIB_COMPRESSION	 1
-+#define ZLIB_COMPRESSION	1
-+#define LZMA_COMPRESSION	2
-+#define LZO_COMPRESSION		3
- 
- struct squashfs_super_block {
- 	__le32			s_magic;
diff --git a/target/linux/generic-2.6/patches-2.6.31/005-squashfs_extra_parameter.patch b/target/linux/generic-2.6/patches-2.6.31/005-squashfs_extra_parameter.patch
deleted file mode 100644
index 099168134..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/005-squashfs_extra_parameter.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 5f393ede3ddb5dd4cc2a9f243182fac45f1ce10b Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Wed, 14 Oct 2009 04:07:54 +0100
-Subject: [PATCH] Squashfs: add an extra parameter to the decompressor init function
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/decompressor.h |    4 ++--
- fs/squashfs/zlib_wrapper.c |    2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
---- a/fs/squashfs/decompressor.h
-+++ b/fs/squashfs/decompressor.h
-@@ -24,7 +24,7 @@
-  */
- 
- struct squashfs_decompressor {
--	void	*(*init)(void);
-+	void	*(*init)(struct squashfs_sb_info *);
- 	void	(*free)(void *);
- 	int	(*decompress)(struct squashfs_sb_info *, void **,
- 		struct buffer_head **, int, int, int, int, int);
-@@ -35,7 +35,7 @@ struct squashfs_decompressor {
- 
- static inline void *squashfs_decompressor_init(struct squashfs_sb_info *msblk)
- {
--	return msblk->decompressor->init();
-+	return msblk->decompressor->init(msblk);
- }
- 
- static inline void squashfs_decompressor_free(struct squashfs_sb_info *msblk,
---- a/fs/squashfs/zlib_wrapper.c
-+++ b/fs/squashfs/zlib_wrapper.c
-@@ -32,7 +32,7 @@
- #include "squashfs.h"
- #include "decompressor.h"
- 
--static void *zlib_init(void)
-+static void *zlib_init(struct squashfs_sb_info *dummy)
- {
- 	z_stream *stream = kmalloc(sizeof(z_stream), GFP_KERNEL);
- 	if (stream == NULL)
diff --git a/target/linux/generic-2.6/patches-2.6.31/006-squashfs_add_lzma.patch b/target/linux/generic-2.6/patches-2.6.31/006-squashfs_add_lzma.patch
deleted file mode 100644
index 9fd57970f..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/006-squashfs_add_lzma.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-From f49e1efdd179d54e814ff2a8e8f469496583062c Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Tue, 20 Oct 2009 10:54:36 +0100
-Subject: [PATCH] Squashfs: add LZMA compression
-
-Add support for LZMA compressed filesystems.  This is an initial
-implementation.
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/Kconfig        |    5 ++
- fs/squashfs/Makefile       |    1 +
- fs/squashfs/decompressor.c |    4 +
- fs/squashfs/lzma_wrapper.c |  151 ++++++++++++++++++++++++++++++++++++++++++++
- fs/squashfs/squashfs.h     |    3 +
- 5 files changed, 164 insertions(+), 0 deletions(-)
- create mode 100644 fs/squashfs/lzma_wrapper.c
-
---- a/fs/squashfs/Kconfig
-+++ b/fs/squashfs/Kconfig
-@@ -26,6 +26,11 @@ config SQUASHFS
- 
- 	  If unsure, say N.
- 
-+config SQUASHFS_LZMA
-+	bool "Include support for LZMA compressed file systems"
-+	depends on SQUASHFS
-+	select DECOMPRESS_LZMA
-+
- config SQUASHFS_EMBEDDED
- 
- 	bool "Additional option for memory-constrained systems" 
---- a/fs/squashfs/Makefile
-+++ b/fs/squashfs/Makefile
-@@ -5,3 +5,4 @@
- obj-$(CONFIG_SQUASHFS) += squashfs.o
- squashfs-y += block.o cache.o dir.o export.o file.o fragment.o id.o inode.o
- squashfs-y += namei.o super.o symlink.o zlib_wrapper.o decompressor.o
-+squashfs-$(CONFIG_SQUASHFS_LZMA) += lzma_wrapper.o
---- a/fs/squashfs/decompressor.c
-+++ b/fs/squashfs/decompressor.c
-@@ -50,7 +50,11 @@ static const struct squashfs_decompresso
- 
- static const struct squashfs_decompressor *decompressor[] = {
- 	&squashfs_zlib_comp_ops,
-+#ifdef CONFIG_SQUASHFS_LZMA
-+	&squashfs_lzma_comp_ops,
-+#else
- 	&squashfs_lzma_unsupported_comp_ops,
-+#endif
- 	&squashfs_lzo_unsupported_comp_ops,
- 	&squashfs_unknown_comp_ops
- };
---- /dev/null
-+++ b/fs/squashfs/lzma_wrapper.c
-@@ -0,0 +1,151 @@
-+/*
-+ * Squashfs - a compressed read only filesystem for Linux
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-+ * Phillip Lougher <phillip@lougher.demon.co.uk>
-+ *
-+ * 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,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ *
-+ * lzma_wrapper.c
-+ */
-+
-+#include <asm/unaligned.h>
-+#include <linux/buffer_head.h>
-+#include <linux/mutex.h>
-+#include <linux/vmalloc.h>
-+#include <linux/decompress/unlzma.h>
-+
-+#include "squashfs_fs.h"
-+#include "squashfs_fs_sb.h"
-+#include "squashfs_fs_i.h"
-+#include "squashfs.h"
-+#include "decompressor.h"
-+
-+struct squashfs_lzma {
-+	void	*input;
-+	void	*output;
-+};
-+
-+/* decompress_unlzma.c is currently non re-entrant... */
-+DEFINE_MUTEX(lzma_mutex);
-+
-+/* decompress_unlzma.c doesn't provide any context in its callbacks... */
-+static int lzma_error;
-+
-+static void error(char *m)
-+{
-+	ERROR("unlzma error: %s\n", m);
-+	lzma_error = 1;
-+}
-+
-+	
-+static void *lzma_init(struct squashfs_sb_info *msblk)
-+{
-+	struct squashfs_lzma *stream = kzalloc(sizeof(*stream), GFP_KERNEL);
-+	if (stream == NULL)
-+		goto failed;
-+	stream->input = vmalloc(msblk->block_size);
-+	if (stream->input == NULL)
-+		goto failed;
-+	stream->output = vmalloc(msblk->block_size);
-+	if (stream->output == NULL)
-+		goto failed2;
-+
-+	return stream;
-+
-+failed2:
-+	vfree(stream->input);
-+failed:
-+	ERROR("failed to allocate lzma workspace\n");
-+	kfree(stream);
-+	return NULL;
-+}
-+
-+
-+static void lzma_free(void *strm)
-+{
-+	struct squashfs_lzma *stream = strm;
-+
-+	if (stream) {
-+		vfree(stream->input);
-+		vfree(stream->output);
-+	}
-+	kfree(stream);
-+}
-+
-+
-+static int lzma_uncompress(struct squashfs_sb_info *msblk, void **buffer,
-+	struct buffer_head **bh, int b, int offset, int length, int srclength,
-+	int pages)
-+{
-+	struct squashfs_lzma *stream = msblk->stream;
-+	void *buff = stream->input;
-+	int avail, i, bytes = length, res;
-+
-+	mutex_lock(&lzma_mutex);
-+
-+	for (i = 0; i < b; i++) {
-+		wait_on_buffer(bh[i]);
-+		if (!buffer_uptodate(bh[i]))
-+			goto block_release;
-+
-+		avail = min(bytes, msblk->devblksize - offset);
-+		memcpy(buff, bh[i]->b_data + offset, avail);
-+		buff += avail;
-+		bytes -= avail;
-+		offset = 0;
-+		put_bh(bh[i]);
-+	}
-+
-+	lzma_error = 0;
-+	res = unlzma(stream->input, length, NULL, NULL, stream->output, NULL,
-+							error);
-+	if (res || lzma_error)
-+		goto failed;
-+
-+	/* uncompressed size is stored in the LZMA header (5 byte offset) */
-+	res = bytes = get_unaligned_le32(stream->input + 5);
-+	for (i = 0, buff = stream->output; bytes && i < pages; i++) {
-+		avail = min_t(int, bytes, PAGE_CACHE_SIZE);
-+		memcpy(buffer[i], buff, avail);
-+		buff += avail;
-+		bytes -= avail;
-+	}
-+	if (bytes)
-+		goto failed;
-+
-+	mutex_unlock(&lzma_mutex);
-+	return res;
-+
-+block_release:
-+	for (; i < b; i++)
-+		put_bh(bh[i]);
-+
-+failed:
-+	mutex_unlock(&lzma_mutex);
-+
-+	ERROR("lzma decompression failed, data probably corrupt\n");
-+	return -EIO;
-+}
-+
-+const struct squashfs_decompressor squashfs_lzma_comp_ops = {
-+	.init = lzma_init,
-+	.free = lzma_free,
-+	.decompress = lzma_uncompress,
-+	.id = LZMA_COMPRESSION,
-+	.name = "lzma",
-+	.supported = 1
-+};
-+
---- a/fs/squashfs/squashfs.h
-+++ b/fs/squashfs/squashfs.h
-@@ -94,3 +94,6 @@ extern const struct address_space_operat
- 
- /* zlib_wrapper.c */
- extern const struct squashfs_decompressor squashfs_zlib_comp_ops;
-+
-+/* lzma wrapper.c */
-+extern const struct squashfs_decompressor squashfs_lzma_comp_ops;
diff --git a/target/linux/generic-2.6/patches-2.6.31/007-squashfs_make_lzma_available.patch b/target/linux/generic-2.6/patches-2.6.31/007-squashfs_make_lzma_available.patch
deleted file mode 100644
index aa6c11012..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/007-squashfs_make_lzma_available.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-From fdf23ed283bc6ef5c25076ce2065f892120ff556 Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Thu, 22 Oct 2009 04:57:38 +0100
-Subject: [PATCH] Squashfs: Make unlzma available to non initramfs/initrd code
-
-Add a config option DECOMPRESS_LZMA_NEEDED which allows subsystems to
-specify they need the unlzma code.  Normally decompress_unlzma.c is
-compiled with __init and unlzma is not exported to modules.
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/Kconfig                   |    1 +
- include/linux/decompress/bunzip2_mm.h |   12 ++++++++++++
- include/linux/decompress/inflate_mm.h |   12 ++++++++++++
- include/linux/decompress/mm.h         |    3 ---
- include/linux/decompress/unlzma_mm.h  |   20 ++++++++++++++++++++
- lib/Kconfig                           |    3 +++
- lib/decompress_bunzip2.c              |    1 +
- lib/decompress_inflate.c              |    1 +
- lib/decompress_unlzma.c               |    5 ++++-
- 9 files changed, 54 insertions(+), 4 deletions(-)
- create mode 100644 include/linux/decompress/bunzip2_mm.h
- create mode 100644 include/linux/decompress/inflate_mm.h
- create mode 100644 include/linux/decompress/unlzma_mm.h
-
---- a/fs/squashfs/Kconfig
-+++ b/fs/squashfs/Kconfig
-@@ -30,6 +30,7 @@ config SQUASHFS_LZMA
- 	bool "Include support for LZMA compressed file systems"
- 	depends on SQUASHFS
- 	select DECOMPRESS_LZMA
-+	select DECOMPRESS_LZMA_NEEDED
- 
- config SQUASHFS_EMBEDDED
- 
---- /dev/null
-+++ b/include/linux/decompress/bunzip2_mm.h
-@@ -0,0 +1,12 @@
-+#ifndef BUNZIP2_MM_H
-+#define BUNZIP2_MM_H
-+
-+#ifdef STATIC
-+/* Code active when included from pre-boot environment: */
-+#define INIT
-+#else
-+/* Compile for initramfs/initrd code only */
-+#define INIT __init
-+#endif
-+
-+#endif
---- /dev/null
-+++ b/include/linux/decompress/inflate_mm.h
-@@ -0,0 +1,12 @@
-+#ifndef INFLATE_MM_H
-+#define INFLATE_MM_H
-+
-+#ifdef STATIC
-+/* Code active when included from pre-boot environment: */
-+#define INIT
-+#else
-+/* Compile for initramfs/initrd code only */
-+#define INIT __init
-+#endif
-+
-+#endif
---- a/include/linux/decompress/mm.h
-+++ b/include/linux/decompress/mm.h
-@@ -53,8 +53,6 @@ static void free(void *where)
- 
- #define set_error_fn(x)
- 
--#define INIT
--
- #else /* STATIC */
- 
- /* Code active when compiled standalone for use when loading ramdisk: */
-@@ -77,7 +75,6 @@ static void free(void *where)
- static void(*error)(char *m);
- #define set_error_fn(x) error = x;
- 
--#define INIT __init
- #define STATIC
- 
- #include <linux/init.h>
---- /dev/null
-+++ b/include/linux/decompress/unlzma_mm.h
-@@ -0,0 +1,20 @@
-+#ifndef UNLZMA_MM_H
-+#define UNLZMA_MM_H
-+
-+#ifdef STATIC
-+
-+/* Code active when included from pre-boot environment: */
-+#define INIT
-+
-+#elif defined(CONFIG_DECOMPRESS_LZMA_NEEDED)
-+
-+/* Make it available to non initramfs/initrd code */
-+#define INIT
-+#include <linux/module.h>
-+#else
-+
-+/* Compile for initramfs/initrd code only */
-+#define INIT __init
-+#endif
-+
-+#endif
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -117,6 +117,9 @@ config DECOMPRESS_BZIP2
- config DECOMPRESS_LZMA
- 	tristate
- 
-+config DECOMPRESS_LZMA_NEEDED
-+	 boolean
-+
- #
- # Generic allocator support is selected if needed
- #
---- a/lib/decompress_bunzip2.c
-+++ b/lib/decompress_bunzip2.c
-@@ -52,6 +52,7 @@
- #include <linux/slab.h>
- #endif /* STATIC */
- 
-+#include <linux/decompress/bunzip2_mm.h>
- #include <linux/decompress/mm.h>
- 
- #ifndef INT_MAX
---- a/lib/decompress_inflate.c
-+++ b/lib/decompress_inflate.c
-@@ -23,6 +23,7 @@
- 
- #endif /* STATIC */
- 
-+#include <linux/decompress/inflate_mm.h>
- #include <linux/decompress/mm.h>
- 
- #define GZIP_IOBUF_SIZE (16*1024)
---- a/lib/decompress_unlzma.c
-+++ b/lib/decompress_unlzma.c
-@@ -36,6 +36,7 @@
- #include <linux/slab.h>
- #endif /* STATIC */
- 
-+#include <linux/decompress/unlzma_mm.h>
- #include <linux/decompress/mm.h>
- 
- #define	MIN(a, b) (((a) < (b)) ? (a) : (b))
-@@ -523,7 +524,7 @@ static inline void INIT process_bit1(str
- 
- 
- 
--STATIC inline int INIT unlzma(unsigned char *buf, int in_len,
-+STATIC int INIT unlzma(unsigned char *buf, int in_len,
- 			      int(*fill)(void*, unsigned int),
- 			      int(*flush)(void*, unsigned int),
- 			      unsigned char *output,
-@@ -656,4 +657,6 @@ STATIC int INIT decompress(unsigned char
- {
- 	return unlzma(buf, in_len - 4, fill, flush, output, posp, error_fn);
- }
-+#elif defined(CONFIG_DECOMPRESS_LZMA_NEEDED)
-+EXPORT_SYMBOL(unlzma);
- #endif
diff --git a/target/linux/generic-2.6/patches-2.6.31/011-mips_boot.patch b/target/linux/generic-2.6/patches-2.6.31/011-mips_boot.patch
deleted file mode 100644
index c2a043acd..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/011-mips_boot.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/mips/kernel/head.S
-+++ b/arch/mips/kernel/head.S
-@@ -121,6 +121,8 @@
- #endif
- 	.endm
- 
-+	j kernel_entry
-+	nop
- #ifndef CONFIG_NO_EXCEPT_FILL
- 	/*
- 	 * Reserved space for exception handlers.
diff --git a/target/linux/generic-2.6/patches-2.6.31/012-extra_optimization.patch b/target/linux/generic-2.6/patches-2.6.31/012-extra_optimization.patch
deleted file mode 100644
index e0ba51598..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/012-extra_optimization.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -521,7 +521,7 @@ all: vmlinux
- ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
- KBUILD_CFLAGS	+= -Os
- else
--KBUILD_CFLAGS	+= -O2
-+KBUILD_CFLAGS	+= -O2 -fno-reorder-blocks -fno-tree-ch
- endif
- 
- include $(srctree)/arch/$(SRCARCH)/Makefile
-@@ -559,6 +559,9 @@ endif
- NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
- CHECKFLAGS     += $(NOSTDINC_FLAGS)
- 
-+# improve gcc optimization
-+CFLAGS += $(call cc-option,-funit-at-a-time,)
-+
- # warn about C99 declaration after statement
- KBUILD_CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)
- 
diff --git a/target/linux/generic-2.6/patches-2.6.31/013-gcc4_inline_fix.patch b/target/linux/generic-2.6/patches-2.6.31/013-gcc4_inline_fix.patch
deleted file mode 100644
index 642f11b21..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/013-gcc4_inline_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/mips/include/asm/system.h
-+++ b/arch/mips/include/asm/system.h
-@@ -187,7 +187,7 @@ extern __u64 __xchg_u64_unsupported_on_3
-    if something tries to do an invalid xchg().  */
- extern void __xchg_called_with_bad_pointer(void);
- 
--static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
-+static __always_inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
- {
- 	switch (size) {
- 	case 4:
diff --git a/target/linux/generic-2.6/patches-2.6.31/014-samsung_flash b/target/linux/generic-2.6/patches-2.6.31/014-samsung_flash
deleted file mode 100644
index 1faeb41ea..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/014-samsung_flash
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -51,6 +51,7 @@
- #define SST49LF040B	        0x0050
- #define SST49LF008A		0x005a
- #define AT49BV6416		0x00d6
-+#define MANUFACTURER_SAMSUNG	0x00ec
- 
- static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
- static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
-@@ -375,12 +376,19 @@ struct mtd_info *cfi_cmdset_0002(struct 
- 
- 		if (extp->MajorVersion != '1' ||
- 		    (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
--			printk(KERN_ERR "  Unknown Amd/Fujitsu Extended Query "
--			       "version %c.%c.\n",  extp->MajorVersion,
--			       extp->MinorVersion);
--			kfree(extp);
--			kfree(mtd);
--			return NULL;
-+		        if (cfi->mfr == MANUFACTURER_SAMSUNG &&
-+			    (extp->MajorVersion == '3' && extp->MinorVersion == '3')) {
-+			    printk(KERN_NOTICE "  Newer Samsung flash detected, "
-+			           "should be compatibile with Amd/Fujitsu.\n");
-+		        }
-+		        else {
-+			    printk(KERN_ERR "  Unknown Amd/Fujitsu Extended Query "
-+			           "version %c.%c.\n",  extp->MajorVersion,
-+			           extp->MinorVersion);
-+			    kfree(extp);
-+			    kfree(mtd);
-+			    return NULL;
-+		        }
- 		}
- 
- 		/* Install our own private info structure */
diff --git a/target/linux/generic-2.6/patches-2.6.31/020-mips_multi_machine_support.patch b/target/linux/generic-2.6/patches-2.6.31/020-mips_multi_machine_support.patch
deleted file mode 100644
index 24cef8c1d..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/020-mips_multi_machine_support.patch
+++ /dev/null
@@ -1,173 +0,0 @@
---- /dev/null
-+++ b/arch/mips/include/asm/mips_machine.h
-@@ -0,0 +1,47 @@
-+/*
-+ *  Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
-+ *
-+ *  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 __ASM_MIPS_MACHINE_H
-+#define __ASM_MIPS_MACHINE_H
-+
-+#include <linux/init.h>
-+#include <linux/list.h>
-+
-+struct mips_machine {
-+	unsigned long		mach_type;
-+	void			(*mach_setup)(void);
-+	char			*mach_name;
-+	struct list_head	list;
-+};
-+
-+void mips_machine_register(struct mips_machine *) __init;
-+void mips_machine_setup(unsigned long machtype) __init;
-+void mips_machine_set_name(char *name) __init;
-+
-+extern char *mips_machine_name;
-+
-+#define MIPS_MACHINE(_type, _name, _setup) 			\
-+static char machine_name_##_type[] __initdata = _name;		\
-+static struct mips_machine machine_##_type __initdata =		\
-+{								\
-+	.mach_type	= _type,				\
-+	.mach_name	= machine_name_##_type,			\
-+	.mach_setup	= _setup,				\
-+};								\
-+								\
-+static int __init register_machine_##_type(void)		\
-+{								\
-+	mips_machine_register(&machine_##_type);		\
-+	return 0;						\
-+}								\
-+								\
-+pure_initcall(register_machine_##_type)
-+
-+#endif /* __ASM_MIPS_MACHINE_H */
-+
---- /dev/null
-+++ b/arch/mips/kernel/mips_machine.c
-@@ -0,0 +1,74 @@
-+/*
-+ *  Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
-+ *
-+ *  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.
-+ *
-+ */
-+#include <linux/mm.h>
-+
-+#include <asm/mips_machine.h>
-+#include <asm/bootinfo.h>
-+
-+static struct list_head mips_machines __initdata =
-+		LIST_HEAD_INIT(mips_machines);
-+
-+char *mips_machine_name = "Unknown";
-+
-+static struct mips_machine * __init mips_machine_find(unsigned long machtype)
-+{
-+	struct list_head *this;
-+
-+	list_for_each(this, &mips_machines) {
-+		struct mips_machine *mach;
-+
-+		mach = list_entry(this, struct mips_machine, list);
-+		if (mach->mach_type == machtype)
-+			return mach;
-+	}
-+
-+	return NULL;
-+}
-+
-+void __init mips_machine_register(struct mips_machine *mach)
-+{
-+	list_add_tail(&mach->list, &mips_machines);
-+}
-+
-+void __init mips_machine_set_name(char *name)
-+{
-+	unsigned int len;
-+	char *p;
-+
-+	if (name == NULL)
-+		return;
-+
-+	len = strlen(name);
-+	p = kmalloc(len + 1, GFP_KERNEL);
-+	if (p) {
-+		strncpy(p, name, len);
-+		p[len] = '\0';
-+		mips_machine_name = p;
-+	} else {
-+		printk(KERN_WARNING "MIPS: no memory for machine_name\n");
-+	}
-+}
-+
-+void __init mips_machine_setup(unsigned long machtype)
-+{
-+	struct mips_machine *mach;
-+
-+	mach = mips_machine_find(machtype);
-+	if (!mach) {
-+		printk(KERN_ALERT "MIPS: no machine registered for "
-+			"machtype %lu\n", machtype);
-+		return;
-+	}
-+
-+	mips_machine_set_name(mach->mach_name);
-+	printk(KERN_INFO "MIPS: machine is %s\n", mips_machine_name);
-+
-+	if (mach->mach_setup)
-+		mach->mach_setup();
-+}
---- a/arch/mips/kernel/Makefile
-+++ b/arch/mips/kernel/Makefile
-@@ -87,6 +87,7 @@ obj-$(CONFIG_GPIO_TXX9)		+= gpio_txx9.o
- 
- obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o
- obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
-+obj-$(CONFIG_MIPS_MACHINE)	+= mips_machine.o
- 
- CFLAGS_cpu-bugs64.o	= $(shell if $(CC) $(KBUILD_CFLAGS) -Wa,-mdaddi -c -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-DHAVE_AS_SET_DADDI"; fi)
- 
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -837,6 +837,9 @@ config MIPS_DISABLE_OBSOLETE_IDE
- config SYNC_R4K
- 	bool
- 
-+config MIPS_MACHINE
-+	def_bool n
-+
- config NO_IOPORT
- 	def_bool n
- 
---- a/arch/mips/kernel/proc.c
-+++ b/arch/mips/kernel/proc.c
-@@ -12,6 +12,7 @@
- #include <asm/cpu-features.h>
- #include <asm/mipsregs.h>
- #include <asm/processor.h>
-+#include <asm/mips_machine.h>
- 
- unsigned int vced_count, vcei_count;
- 
-@@ -31,8 +32,12 @@ static int show_cpuinfo(struct seq_file 
- 	/*
- 	 * For the first processor also print the system type
- 	 */
--	if (n == 0)
-+	if (n == 0) {
- 		seq_printf(m, "system type\t\t: %s\n", get_system_type());
-+#ifdef CONFIG_MIPS_MACHINE
-+		seq_printf(m, "machine\t\t\t: %s\n", mips_machine_name);
-+#endif
-+	}
- 
- 	seq_printf(m, "processor\t\t: %ld\n", n);
- 	sprintf(fmt, "cpu model\t\t: %%s V%%d.%%d%s\n",
diff --git a/target/linux/generic-2.6/patches-2.6.31/021-mips_image_cmdline_hack.patch b/target/linux/generic-2.6/patches-2.6.31/021-mips_image_cmdline_hack.patch
deleted file mode 100644
index 026a84b6a..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/021-mips_image_cmdline_hack.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -840,6 +840,10 @@ config SYNC_R4K
- config MIPS_MACHINE
- 	def_bool n
- 
-+config IMAGE_CMDLINE_HACK
-+	bool "OpenWrt specific image command line hack"
-+	default n
-+
- config NO_IOPORT
- 	def_bool n
- 
---- a/arch/mips/kernel/head.S
-+++ b/arch/mips/kernel/head.S
-@@ -143,6 +143,12 @@ FEXPORT(__kernel_entry)
- 	j	kernel_entry
- #endif
- 
-+#ifdef CONFIG_IMAGE_CMDLINE_HACK
-+	.ascii	"CMDLINE:"
-+EXPORT(__image_cmdline)
-+	.fill	0x400
-+#endif /* CONFIG_IMAGE_CMDLINE_HACK */
-+
- 	__REF
- 
- NESTED(kernel_entry, 16, sp)			# kernel entry point
diff --git a/target/linux/generic-2.6/patches-2.6.31/022-mips_use_generic_thread_info_allocator.patch b/target/linux/generic-2.6/patches-2.6.31/022-mips_use_generic_thread_info_allocator.patch
deleted file mode 100644
index 737e51bd2..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/022-mips_use_generic_thread_info_allocator.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/arch/mips/include/asm/thread_info.h
-+++ b/arch/mips/include/asm/thread_info.h
-@@ -83,6 +83,7 @@ register struct thread_info *__current_t
- #define THREAD_SIZE (PAGE_SIZE << THREAD_SIZE_ORDER)
- #define THREAD_MASK (THREAD_SIZE - 1UL)
- 
-+#if 0
- #define __HAVE_ARCH_THREAD_INFO_ALLOCATOR
- 
- #ifdef CONFIG_DEBUG_STACK_USAGE
-@@ -99,6 +100,7 @@ register struct thread_info *__current_t
- #endif
- 
- #define free_thread_info(info) kfree(info)
-+#endif
- 
- #endif /* !__ASSEMBLY__ */
- 
diff --git a/target/linux/generic-2.6/patches-2.6.31/025-mips_disable_fpu.patch b/target/linux/generic-2.6/patches-2.6.31/025-mips_disable_fpu.patch
deleted file mode 100644
index 37d64a95d..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/025-mips_disable_fpu.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-MIPS: allow disabling the kernel FPU emulator
-
-This patch allows turning off the in-kernel Algorithmics
-FPU emulator support, which allows one to save a couple of
-precious blocks on an embedded system.
-
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -825,6 +825,17 @@ config I8259
- config MIPS_BONITO64
- 	bool
- 
-+config MIPS_FPU_EMU
-+	bool "Enable FPU emulation"
-+	default y
-+	help
-+	   This option allows building a kernel with or without the Algorithmics
-+	   FPU emulator enabled. Turning off this option results in a kernel which
-+	   does not catch floating operations exceptions. Make sure that your toolchain
-+	   is configured to enable software floating point emulation in that case.
-+		
-+	   If unsure say Y here.
-+
- config MIPS_MSC
- 	bool
- 
---- a/arch/mips/math-emu/Makefile
-+++ b/arch/mips/math-emu/Makefile
-@@ -2,12 +2,14 @@
- # Makefile for the Linux/MIPS kernel FPU emulation.
- #
- 
--obj-y	:= cp1emu.o ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
-+obj-y	:=	kernel_linkage.o dsemul.o cp1emu.o
-+
-+obj-$(CONFIG_MIPS_FPU_EMU)	+= ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
- 	   ieee754xcpt.o dp_frexp.o dp_modf.o dp_div.o dp_mul.o dp_sub.o \
- 	   dp_add.o dp_fsp.o dp_cmp.o dp_logb.o dp_scalb.o dp_simple.o \
- 	   dp_tint.o dp_fint.o dp_tlong.o dp_flong.o sp_frexp.o sp_modf.o \
- 	   sp_div.o sp_mul.o sp_sub.o sp_add.o sp_fdp.o sp_cmp.o sp_logb.o \
- 	   sp_scalb.o sp_simple.o sp_tint.o sp_fint.o sp_tlong.o sp_flong.o \
--	   dp_sqrt.o sp_sqrt.o kernel_linkage.o dsemul.o
-+	   dp_sqrt.o sp_sqrt.o
- 
- EXTRA_CFLAGS += -Werror
---- a/arch/mips/math-emu/cp1emu.c
-+++ b/arch/mips/math-emu/cp1emu.c
-@@ -56,6 +56,12 @@
- #endif
- #define __mips 4
- 
-+/* Further private data for which no space exists in mips_fpu_struct */
-+
-+struct mips_fpu_emulator_stats fpuemustats;
-+
-+#ifdef CONFIG_MIPS_FPU_EMU
-+
- /* Function which emulates a floating point instruction. */
- 
- static int fpu_emu(struct pt_regs *, struct mips_fpu_struct *,
-@@ -66,10 +72,6 @@ static int fpux_emu(struct pt_regs *,
- 	struct mips_fpu_struct *, mips_instruction);
- #endif
- 
--/* Further private data for which no space exists in mips_fpu_struct */
--
--struct mips_fpu_emulator_stats fpuemustats;
--
- /* Control registers */
- 
- #define FPCREG_RID	0	/* $0  = revision id */
-@@ -1273,6 +1275,13 @@ int fpu_emulator_cop1Handler(struct pt_r
- 
- 	return sig;
- }
-+#else
-+int fpu_emulator_cop1Handler(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
-+        int has_fpu)
-+{
-+	return 0;
-+}
-+#endif /* CONFIG_MIPS_FPU_EMU */
- 
- #ifdef CONFIG_DEBUG_FS
- extern struct dentry *mips_debugfs_dir;
---- a/arch/mips/math-emu/dsemul.c
-+++ b/arch/mips/math-emu/dsemul.c
-@@ -109,6 +109,7 @@ int mips_dsemul(struct pt_regs *regs, mi
- 	return SIGILL;		/* force out of emulation loop */
- }
- 
-+#ifdef CONFIG_MIPS_FPU_EMU
- int do_dsemulret(struct pt_regs *xcp)
- {
- 	struct emuframe __user *fr;
-@@ -165,3 +166,9 @@ int do_dsemulret(struct pt_regs *xcp)
- 
- 	return 1;
- }
-+#else
-+int do_dsemulret(struct pt_regs *xcp)
-+{
-+	return 0;
-+}
-+#endif /* CONFIG_MIPS_FPU_EMU */
---- a/arch/mips/math-emu/kernel_linkage.c
-+++ b/arch/mips/math-emu/kernel_linkage.c
-@@ -29,6 +29,7 @@
- 
- #define SIGNALLING_NAN 0x7ff800007ff80000LL
- 
-+#ifdef CONFIG_MIPS_FPU_EMU
- void fpu_emulator_init_fpu(void)
- {
- 	static int first = 1;
-@@ -112,4 +113,36 @@ int fpu_emulator_restore_context32(struc
- 
- 	return err;
- }
--#endif
-+#endif	/* CONFIG_64BIT */
-+#else
-+
-+void fpu_emulator_init_fpu(void)
-+{
-+	printk(KERN_INFO "FPU emulator disabled, make sure your toolchain"
-+		"was compiled with software floating point support (soft-float)\n");
-+	return;
-+}
-+
-+int fpu_emulator_save_context(struct sigcontext __user *sc)
-+{
-+	return 0;
-+}
-+
-+int fpu_emulator_restore_context(struct sigcontext __user *sc)
-+{
-+	return 0;
-+}
-+
-+int fpu_emulator_save_context32(struct sigcontext32 __user *sc)
-+{
-+	return 0;
-+}
-+
-+int fpu_emulator_restore_context32(struct sigcontext32 __user *sc)
-+{
-+	return 0;
-+}
-+
-+#ifdef CONFIG_64BIT
-+#endif	/* CONFIG_64BIT */
-+#endif /* CONFIG_MIPS_FPU_EMU */
diff --git a/target/linux/generic-2.6/patches-2.6.31/027-mips_module_reloc.patch b/target/linux/generic-2.6/patches-2.6.31/027-mips_module_reloc.patch
deleted file mode 100644
index c0dc64e26..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/027-mips_module_reloc.patch
+++ /dev/null
@@ -1,368 +0,0 @@
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -83,7 +83,7 @@ all-$(CONFIG_BOOT_ELF64)	:= $(vmlinux-64
- cflags-y			+= -G 0 -mno-abicalls -fno-pic -pipe
- cflags-y			+= -msoft-float
- LDFLAGS_vmlinux			+= -G 0 -static -n -nostdlib
--MODFLAGS			+= -mlong-calls
-+MODFLAGS			+= -mno-long-calls
- 
- cflags-y += -ffreestanding
- 
---- a/arch/mips/include/asm/module.h
-+++ b/arch/mips/include/asm/module.h
-@@ -9,6 +9,11 @@ struct mod_arch_specific {
- 	struct list_head dbe_list;
- 	const struct exception_table_entry *dbe_start;
- 	const struct exception_table_entry *dbe_end;
-+
-+	void *phys_plt_tbl;
-+	void *virt_plt_tbl;
-+	unsigned int phys_plt_offset;
-+	unsigned int virt_plt_offset;
- };
- 
- typedef uint8_t Elf64_Byte;		/* Type for a 8-bit quantity.  */
---- a/arch/mips/kernel/module.c
-+++ b/arch/mips/kernel/module.c
-@@ -43,6 +43,117 @@ static struct mips_hi16 *mips_hi16_list;
- static LIST_HEAD(dbe_list);
- static DEFINE_SPINLOCK(dbe_lock);
- 
-+/*
-+ * Get the potential max trampolines size required of the init and
-+ * non-init sections. Only used if we cannot find enough contiguous
-+ * physically mapped memory to put the module into.
-+ */
-+static unsigned int
-+get_plt_size(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,
-+             const char *secstrings, unsigned int symindex, bool is_init)
-+{
-+	unsigned long ret = 0;
-+	unsigned int i, j;
-+	Elf_Sym *syms;
-+
-+	/* Everything marked ALLOC (this includes the exported symbols) */
-+	for (i = 1; i < hdr->e_shnum; ++i) {
-+		unsigned int info = sechdrs[i].sh_info;
-+
-+		if (sechdrs[i].sh_type != SHT_REL
-+		    && sechdrs[i].sh_type != SHT_RELA)
-+			continue;
-+
-+		/* Not a valid relocation section? */
-+		if (info >= hdr->e_shnum)
-+			continue;
-+
-+		/* Don't bother with non-allocated sections */
-+		if (!(sechdrs[info].sh_flags & SHF_ALLOC))
-+			continue;
-+
-+		/* If it's called *.init*, and we're not init, we're
-+                   not interested */
-+		if ((strstr(secstrings + sechdrs[i].sh_name, ".init") != 0)
-+		    != is_init)
-+			continue;
-+
-+		syms = (Elf_Sym *) sechdrs[symindex].sh_addr;
-+		if (sechdrs[i].sh_type == SHT_REL) {
-+			Elf_Mips_Rel *rel = (void *) sechdrs[i].sh_addr;
-+			unsigned int size = sechdrs[i].sh_size / sizeof(*rel);
-+
-+			for (j = 0; j < size; ++j) {
-+				Elf_Sym *sym;
-+
-+				if (ELF_MIPS_R_TYPE(rel[j]) != R_MIPS_26)
-+					continue;
-+
-+				sym = syms + ELF_MIPS_R_SYM(rel[j]);
-+				if (!is_init && sym->st_shndx != SHN_UNDEF)
-+					continue;
-+
-+				ret += 4 * sizeof(int);
-+			}
-+		} else {
-+			Elf_Mips_Rela *rela = (void *) sechdrs[i].sh_addr;
-+			unsigned int size = sechdrs[i].sh_size / sizeof(*rela);
-+
-+			for (j = 0; j < size; ++j) {
-+				Elf_Sym *sym;
-+
-+				if (ELF_MIPS_R_TYPE(rela[j]) != R_MIPS_26)
-+					continue;
-+
-+				sym = syms + ELF_MIPS_R_SYM(rela[j]);
-+				if (!is_init && sym->st_shndx != SHN_UNDEF)
-+					continue;
-+
-+				ret += 4 * sizeof(int);
-+			}
-+		}
-+	}
-+
-+	return ret;
-+}
-+
-+#ifndef MODULE_START
-+static void *alloc_phys(unsigned long size)
-+{
-+	unsigned order;
-+	struct page *page;
-+	struct page *p;
-+
-+	size = PAGE_ALIGN(size);
-+	order = get_order(size);
-+
-+	page = alloc_pages(GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN |
-+			__GFP_THISNODE, order);
-+	if (!page)
-+		return NULL;
-+
-+	split_page(page, order);
-+
-+	for (p = page + (size >> PAGE_SHIFT); p < page + (1 << order); ++p)
-+		__free_page(p);
-+
-+	return page_address(page);
-+}
-+#endif
-+
-+static void free_phys(void *ptr, unsigned long size)
-+{
-+	struct page *page;
-+	struct page *end;
-+
-+	page = virt_to_page(ptr);
-+	end = page + (PAGE_ALIGN(size) >> PAGE_SHIFT);
-+
-+	for (; page < end; ++page)
-+		__free_page(page);
-+}
-+
-+
- void *module_alloc(unsigned long size)
- {
- #ifdef MODULE_START
-@@ -58,21 +169,99 @@ void *module_alloc(unsigned long size)
- 
- 	return __vmalloc_area(area, GFP_KERNEL, PAGE_KERNEL);
- #else
-+	void *ptr;
-+
- 	if (size == 0)
- 		return NULL;
--	return vmalloc(size);
-+
-+	ptr = alloc_phys(size);
-+
-+	/* If we failed to allocate physically contiguous memory,
-+	 * fall back to regular vmalloc. The module loader code will
-+	 * create jump tables to handle long jumps */
-+	if (!ptr)
-+		return vmalloc(size);
-+
-+	return ptr;
-+#endif
-+}
-+
-+static inline bool is_phys_addr(void *ptr)
-+{
-+#ifdef CONFIG_64BIT
-+	return (KSEGX((unsigned long)ptr) == CKSEG0);
-+#else
-+	return (KSEGX(ptr) == KSEG0);
- #endif
- }
- 
- /* Free memory returned from module_alloc */
- void module_free(struct module *mod, void *module_region)
- {
--	vfree(module_region);
-+	if (is_phys_addr(module_region)) {
-+		if (mod->module_init == module_region)
-+			free_phys(module_region, mod->init_size);
-+		else if (mod->module_core == module_region)
-+			free_phys(module_region, mod->core_size);
-+		else
-+			BUG();
-+	} else {
-+		vfree(module_region);
-+	}
-+}
-+
-+static void *__module_alloc(int size, bool phys)
-+{
-+	void *ptr;
-+
-+	if (phys)
-+		ptr = kmalloc(size, GFP_KERNEL);
-+	else
-+		ptr = vmalloc(size);
-+	return ptr;
-+}
-+
-+static void __module_free(void *ptr)
-+{
-+	if (is_phys_addr(ptr))
-+		kfree(ptr);
-+	else
-+		vfree(ptr);
- }
- 
- int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
- 			      char *secstrings, struct module *mod)
- {
-+	unsigned int symindex = 0;
-+	unsigned int core_size, init_size;
-+	int i;
-+
-+	for (i = 1; i < hdr->e_shnum; i++)
-+		if (sechdrs[i].sh_type == SHT_SYMTAB)
-+			symindex = i;
-+
-+	core_size = get_plt_size(hdr, sechdrs, secstrings, symindex, false);
-+	init_size = get_plt_size(hdr, sechdrs, secstrings, symindex, true);
-+
-+	mod->arch.phys_plt_offset = 0;
-+	mod->arch.virt_plt_offset = 0;
-+	mod->arch.phys_plt_tbl = NULL;
-+	mod->arch.virt_plt_tbl = NULL;
-+
-+	if ((core_size + init_size) == 0)
-+		return 0;
-+
-+	mod->arch.phys_plt_tbl = __module_alloc(core_size + init_size, 1);
-+	if (!mod->arch.phys_plt_tbl)
-+		return -ENOMEM;
-+
-+	mod->arch.virt_plt_tbl = __module_alloc(core_size + init_size, 0);
-+	if (!mod->arch.virt_plt_tbl) {
-+		__module_free(mod->arch.phys_plt_tbl);
-+		mod->arch.phys_plt_tbl = NULL;
-+		return -ENOMEM;
-+	}
-+
- 	return 0;
- }
- 
-@@ -95,28 +284,36 @@ static int apply_r_mips_32_rela(struct m
- 	return 0;
- }
- 
--static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
-+static Elf_Addr add_plt_entry_to(unsigned *plt_offset,
-+				 void *start, Elf_Addr v)
- {
--	if (v % 4) {
--		pr_err("module %s: dangerous R_MIPS_26 REL relocation\n",
--		       me->name);
--		return -ENOEXEC;
--	}
-+	unsigned *tramp = start + *plt_offset;
-+	*plt_offset += 4 * sizeof(int);
- 
--	if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
--		printk(KERN_ERR
--		       "module %s: relocation overflow\n",
--		       me->name);
--		return -ENOEXEC;
--	}
-+	/* adjust carry for addiu */
-+	if (v & 0x00008000)
-+		v += 0x10000;
- 
--	*location = (*location & ~0x03ffffff) |
--	            ((*location + (v >> 2)) & 0x03ffffff);
-+	tramp[0] = 0x3c190000 | (v >> 16);      /* lui t9, hi16 */
-+	tramp[1] = 0x27390000 | (v & 0xffff);   /* addiu t9, t9, lo16 */
-+	tramp[2] = 0x03200008;                  /* jr t9 */
-+	tramp[3] = 0x00000000;                  /* nop */
- 
--	return 0;
-+	return (Elf_Addr) tramp;
- }
- 
--static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)
-+static Elf_Addr add_plt_entry(struct module *me, void *location, Elf_Addr v)
-+{
-+	if (is_phys_addr(location))
-+		return add_plt_entry_to(&me->arch.phys_plt_offset,
-+				me->arch.phys_plt_tbl, v);
-+	else
-+		return add_plt_entry_to(&me->arch.virt_plt_offset,
-+				me->arch.virt_plt_tbl, v);
-+
-+}
-+
-+static int set_r_mips_26(struct module *me, u32 *location, u32 ofs, Elf_Addr v)
- {
- 	if (v % 4) {
- 		pr_err("module %s: dangerous R_MIPS_26 RELArelocation\n",
-@@ -125,17 +322,31 @@ static int apply_r_mips_26_rela(struct m
- 	}
- 
- 	if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
--		printk(KERN_ERR
-+	    v = add_plt_entry(me, location, v + (ofs << 2));
-+		if (!v) {
-+			printk(KERN_ERR
- 		       "module %s: relocation overflow\n",
- 		       me->name);
--		return -ENOEXEC;
-+			return -ENOEXEC;
-+		}
-+		ofs = 0;
- 	}
- 
--	*location = (*location & ~0x03ffffff) | ((v >> 2) & 0x03ffffff);
-+	*location = (*location & ~0x03ffffff) | ((ofs + (v >> 2)) & 0x03ffffff);
- 
- 	return 0;
- }
- 
-+static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
-+{
-+	return set_r_mips_26(me, location, *location & 0x03ffffff, v);
-+}
-+
-+static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)
-+{
-+	return set_r_mips_26(me, location, 0, v);
-+}
-+
- static int apply_r_mips_hi16_rel(struct module *me, u32 *location, Elf_Addr v)
- {
- 	struct mips_hi16 *n;
-@@ -400,11 +611,32 @@ int module_finalize(const Elf_Ehdr *hdr,
- 		list_add(&me->arch.dbe_list, &dbe_list);
- 		spin_unlock_irq(&dbe_lock);
- 	}
-+
-+	/* Get rid of the fixup trampoline if we're running the module
-+	 * from physically mapped address space */
-+	if (me->arch.phys_plt_offset == 0) {
-+		__module_free(me->arch.phys_plt_tbl);
-+		me->arch.phys_plt_tbl = NULL;
-+	}
-+	if (me->arch.virt_plt_offset == 0) {
-+		__module_free(me->arch.virt_plt_tbl);
-+		me->arch.virt_plt_tbl = NULL;
-+	}
-+
- 	return 0;
- }
- 
- void module_arch_cleanup(struct module *mod)
- {
-+	if (mod->arch.phys_plt_tbl) {
-+		__module_free(mod->arch.phys_plt_tbl);
-+		mod->arch.phys_plt_tbl = NULL;
-+	}
-+	if (mod->arch.virt_plt_tbl) {
-+		__module_free(mod->arch.virt_plt_tbl);
-+		mod->arch.virt_plt_tbl = NULL;
-+	}
-+
- 	spin_lock_irq(&dbe_lock);
- 	list_del(&mod->arch.dbe_list);
- 	spin_unlock_irq(&dbe_lock);
diff --git a/target/linux/generic-2.6/patches-2.6.31/028-module_exports.patch b/target/linux/generic-2.6/patches-2.6.31/028-module_exports.patch
deleted file mode 100644
index 3d73a0212..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/028-module_exports.patch
+++ /dev/null
@@ -1,201 +0,0 @@
---- a/include/asm-generic/vmlinux.lds.h
-+++ b/include/asm-generic/vmlinux.lds.h
-@@ -55,6 +55,27 @@
- #define LOAD_OFFSET 0
- #endif
- 
-+#ifndef SYMTAB_KEEP_STR
-+#define SYMTAB_KEEP_STR *(__ksymtab_strings.*)
-+#define SYMTAB_DISCARD_STR
-+#else
-+#define SYMTAB_DISCARD_STR *(__ksymtab_strings.*)
-+#endif
-+
-+#ifndef SYMTAB_KEEP
-+#define SYMTAB_KEEP *(__ksymtab.*)
-+#define SYMTAB_DISCARD
-+#else
-+#define SYMTAB_DISCARD *(__ksymtab.*)
-+#endif
-+
-+#ifndef SYMTAB_KEEP_GPL
-+#define SYMTAB_KEEP_GPL *(__ksymtab_gpl.*)
-+#define SYMTAB_DISCARD_GPL
-+#else
-+#define SYMTAB_DISCARD_GPL *(__ksymtab_gpl.*)
-+#endif
-+
- #ifndef VMLINUX_SYMBOL
- #define VMLINUX_SYMBOL(_sym_) _sym_
- #endif
-@@ -256,35 +277,35 @@
- 	/* Kernel symbol table: Normal symbols */			\
- 	__ksymtab         : AT(ADDR(__ksymtab) - LOAD_OFFSET) {		\
- 		VMLINUX_SYMBOL(__start___ksymtab) = .;			\
--		*(__ksymtab)						\
-+		SYMTAB_KEEP						\
- 		VMLINUX_SYMBOL(__stop___ksymtab) = .;			\
- 	}								\
- 									\
- 	/* Kernel symbol table: GPL-only symbols */			\
- 	__ksymtab_gpl     : AT(ADDR(__ksymtab_gpl) - LOAD_OFFSET) {	\
- 		VMLINUX_SYMBOL(__start___ksymtab_gpl) = .;		\
--		*(__ksymtab_gpl)					\
-+		SYMTAB_KEEP_GPL						\
- 		VMLINUX_SYMBOL(__stop___ksymtab_gpl) = .;		\
- 	}								\
- 									\
- 	/* Kernel symbol table: Normal unused symbols */		\
- 	__ksymtab_unused  : AT(ADDR(__ksymtab_unused) - LOAD_OFFSET) {	\
- 		VMLINUX_SYMBOL(__start___ksymtab_unused) = .;		\
--		*(__ksymtab_unused)					\
-+		*(__ksymtab_unused.*)					\
- 		VMLINUX_SYMBOL(__stop___ksymtab_unused) = .;		\
- 	}								\
- 									\
- 	/* Kernel symbol table: GPL-only unused symbols */		\
- 	__ksymtab_unused_gpl : AT(ADDR(__ksymtab_unused_gpl) - LOAD_OFFSET) { \
- 		VMLINUX_SYMBOL(__start___ksymtab_unused_gpl) = .;	\
--		*(__ksymtab_unused_gpl)					\
-+		*(__ksymtab_unused_gpl.*)				\
- 		VMLINUX_SYMBOL(__stop___ksymtab_unused_gpl) = .;	\
- 	}								\
- 									\
- 	/* Kernel symbol table: GPL-future-only symbols */		\
- 	__ksymtab_gpl_future : AT(ADDR(__ksymtab_gpl_future) - LOAD_OFFSET) { \
- 		VMLINUX_SYMBOL(__start___ksymtab_gpl_future) = .;	\
--		*(__ksymtab_gpl_future)					\
-+		*(__ksymtab_gpl_future.*)				\
- 		VMLINUX_SYMBOL(__stop___ksymtab_gpl_future) = .;	\
- 	}								\
- 									\
-@@ -325,7 +346,13 @@
- 									\
- 	/* Kernel symbol table: strings */				\
-         __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) {	\
--		*(__ksymtab_strings)					\
-+		SYMTAB_KEEP_STR						\
-+	}								\
-+									\
-+	/DISCARD/ : {							\
-+		SYMTAB_DISCARD						\
-+		SYMTAB_DISCARD_GPL					\
-+		SYMTAB_DISCARD_STR					\
- 	}								\
- 									\
- 	/* __*init sections */						\
---- a/include/linux/module.h
-+++ b/include/linux/module.h
-@@ -188,16 +188,24 @@ void *__symbol_get_gpl(const char *symbo
- #define __CRC_SYMBOL(sym, sec)
- #endif
- 
-+#ifdef MODULE
-+#define __EXPORT_SUFFIX(sym)
-+#else
-+#define __EXPORT_SUFFIX(sym) "." #sym
-+#endif
-+
- /* For every exported symbol, place a struct in the __ksymtab section */
- #define __EXPORT_SYMBOL(sym, sec)				\
- 	extern typeof(sym) sym;					\
- 	__CRC_SYMBOL(sym, sec)					\
- 	static const char __kstrtab_##sym[]			\
--	__attribute__((section("__ksymtab_strings"), aligned(1))) \
-+	__attribute__((section("__ksymtab_strings"		\
-+	  __EXPORT_SUFFIX(sym)), aligned(1)))			\
- 	= MODULE_SYMBOL_PREFIX #sym;                    	\
- 	static const struct kernel_symbol __ksymtab_##sym	\
- 	__used							\
--	__attribute__((section("__ksymtab" sec), unused))	\
-+	__attribute__((section("__ksymtab" sec			\
-+	  __EXPORT_SUFFIX(sym)), unused))			\
- 	= { (unsigned long)&sym, __kstrtab_##sym }
- 
- #define EXPORT_SYMBOL(sym)					\
---- a/arch/arm/kernel/vmlinux.lds.S
-+++ b/arch/arm/kernel/vmlinux.lds.S
-@@ -79,26 +79,6 @@ SECTIONS
- #endif
- 	}
- 
--	/DISCARD/ : {			/* Exit code and data		*/
--		EXIT_TEXT
--		EXIT_DATA
--		*(.exitcall.exit)
--		*(.ARM.exidx.exit.text)
--		*(.ARM.extab.exit.text)
--#ifndef CONFIG_HOTPLUG_CPU
--		*(.ARM.exidx.cpuexit.text)
--		*(.ARM.extab.cpuexit.text)
--#endif
--#ifndef CONFIG_HOTPLUG
--		*(.ARM.exidx.devexit.text)
--		*(.ARM.extab.devexit.text)
--#endif
--#ifndef CONFIG_MMU
--		*(.fixup)
--		*(__ex_table)
--#endif
--	}
--
- 	.text : {			/* Real text segment		*/
- 		_text = .;		/* Text and read-only data	*/
- 			__exception_text_start = .;
-@@ -205,6 +185,28 @@ SECTIONS
- 		__bss_stop = .;
- 		_end = .;
- 	}
-+
-+	/DISCARD/ : {			/* Exit code and data		*/
-+		EXIT_TEXT
-+		EXIT_DATA
-+		*(.discard)
-+		*(.exitcall.exit)
-+		*(.ARM.exidx.exit.text)
-+		*(.ARM.extab.exit.text)
-+#ifndef CONFIG_HOTPLUG_CPU
-+		*(.ARM.exidx.cpuexit.text)
-+		*(.ARM.extab.cpuexit.text)
-+#endif
-+#ifndef CONFIG_HOTPLUG
-+		*(.ARM.exidx.devexit.text)
-+		*(.ARM.extab.devexit.text)
-+#endif
-+#ifndef CONFIG_MMU
-+		*(.fixup)
-+		*(__ex_table)
-+#endif
-+	}
-+
- 					/* Stabs debugging sections.	*/
- 	.stab 0 : { *(.stab) }
- 	.stabstr 0 : { *(.stabstr) }
---- a/arch/powerpc/kernel/vmlinux.lds.S
-+++ b/arch/powerpc/kernel/vmlinux.lds.S
-@@ -37,12 +37,6 @@ jiffies = jiffies_64 + 4;
- #endif
- SECTIONS
- {
--	/* Sections to be discarded. */
--	/DISCARD/ : {
--	*(.exitcall.exit)
--	EXIT_DATA
--	}
--
- 	. = KERNELBASE;
- 
- /*
-@@ -295,6 +289,12 @@ SECTIONS
- 		__bss_stop = .;
- 	}
- 
-+	/* Sections to be discarded. */
-+	/DISCARD/ : {
-+	*(.exitcall.exit)
-+	EXIT_DATA
-+	}
-+
- 	. = ALIGN(PAGE_SIZE);
- 	_end = . ;
- 	PROVIDE32 (end = .);
diff --git a/target/linux/generic-2.6/patches-2.6.31/029-arm_module_unresolved_weak_sym.patch b/target/linux/generic-2.6/patches-2.6.31/029-arm_module_unresolved_weak_sym.patch
deleted file mode 100644
index 42d2dbd20..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/029-arm_module_unresolved_weak_sym.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/arch/arm/kernel/module.c
-+++ b/arch/arm/kernel/module.c
-@@ -120,6 +120,10 @@ apply_relocate(Elf32_Shdr *sechdrs, cons
- 			return -ENOEXEC;
- 		}
- 
-+		if ((IS_ERR_VALUE(sym->st_value) || !sym->st_value) &&
-+		    ELF_ST_BIND(sym->st_info) == STB_WEAK)
-+			continue;
-+
- 		loc = dstsec->sh_addr + rel->r_offset;
- 
- 		switch (ELF32_R_TYPE(rel->r_info)) {
diff --git a/target/linux/generic-2.6/patches-2.6.31/030-pci_disable_common_quirks.patch b/target/linux/generic-2.6/patches-2.6.31/030-pci_disable_common_quirks.patch
deleted file mode 100644
index c99ff1d49..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/030-pci_disable_common_quirks.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/drivers/pci/Kconfig
-+++ b/drivers/pci/Kconfig
-@@ -51,6 +51,12 @@ config PCI_STUB
- 
- 	  When in doubt, say N.
- 
-+config PCI_DISABLE_COMMON_QUIRKS
-+	bool "PCI disable common quirks"
-+	depends on PCI
-+	help
-+	  If you don't know what to do here, say N.
-+
- config HT_IRQ
- 	bool "Interrupts on hypertransport devices"
- 	default y
---- a/drivers/pci/quirks.c
-+++ b/drivers/pci/quirks.c
-@@ -98,6 +98,7 @@ static void __devinit quirk_resource_ali
- }
- DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, quirk_resource_alignment);
- 
-+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
- /* The Mellanox Tavor device gives false positive parity errors
-  * Mark this device with a broken_parity_status, to allow
-  * PCI scanning code to "skip" this now blacklisted device.
-@@ -1867,7 +1868,9 @@ static void __devinit fixup_rev1_53c810(
- 	}
- }
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
-+#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
- 
-+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
- /* Enable 1k I/O space granularity on the Intel P64H2 */
- static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
- {
-@@ -2498,6 +2501,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x150d, quirk_i82576_sriov);
- 
- #endif	/* CONFIG_PCI_IOV */
-+#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
- 
- static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f,
- 			  struct pci_fixup *end)
diff --git a/target/linux/generic-2.6/patches-2.6.31/031-ppc_gcc_build_fix.patch b/target/linux/generic-2.6/patches-2.6.31/031-ppc_gcc_build_fix.patch
deleted file mode 100644
index 3151eee26..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/031-ppc_gcc_build_fix.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-GCC 4.4.x looks to be adding support for generating out-of-line register
-saves/restores based on:
-
-http://gcc.gnu.org/ml/gcc-patches/2008-04/msg01678.html
-
-This breaks the kernel build as we'd have to link with libgcc to get the
-implementation of the register save/restores.
-
-To workaround this issue, we just stole the save/restore code from gcc
-and simplified it down for our needs (integer only).  We only do this if
-PPC32 as gcc makes believe the linker on ppc64 will deal with this and
-only if CONFIG_CC_OPTIMIZE_FOR_SIZE is set (thus -Os).
-
-Signed-off-by: Kumar Gala <[EMAIL PROTECTED]>
----
-
-If someone using cutting edge toolchains for ppc64 could test and make
-sure if we enable CONFIG_CC_OPTIMIZE_FOR_SIZE things work that would be
-nice.
-
-- k
-
- arch/powerpc/kernel/misc_32.S   |   77 +++++++++++++++++++++++++++
- arch/powerpc/kernel/ppc_ksyms.c |  111 +++++++++++++++++++++++++++++++++++++++
- 2 files changed, 188 insertions(+), 0 deletions(-)
-
---- a/arch/powerpc/kernel/misc_32.S
-+++ b/arch/powerpc/kernel/misc_32.S
-@@ -813,3 +813,80 @@ relocate_new_kernel_end:
- relocate_new_kernel_size:
- 	.long relocate_new_kernel_end - relocate_new_kernel
- #endif
-+
-+#if defined(CONFIG_PPC32) && defined(CONFIG_CC_OPTIMIZE_FOR_SIZE)
-+/* Routines for saving integer registers, called by the compiler.  */
-+/* Called with r11 pointing to the stack header word of the caller of the */
-+/* function, just beyond the end of the integer save area.  */
-+
-+_GLOBAL(_savegpr_14)   stw     14,-72(11)      /* save gp registers */
-+_GLOBAL(_savegpr_15)   stw     15,-68(11)
-+_GLOBAL(_savegpr_16)   stw     16,-64(11)
-+_GLOBAL(_savegpr_17)   stw     17,-60(11)
-+_GLOBAL(_savegpr_18)   stw     18,-56(11)
-+_GLOBAL(_savegpr_19)   stw     19,-52(11)
-+_GLOBAL(_savegpr_20)   stw     20,-48(11)
-+_GLOBAL(_savegpr_21)   stw     21,-44(11)
-+_GLOBAL(_savegpr_22)   stw     22,-40(11)
-+_GLOBAL(_savegpr_23)   stw     23,-36(11)
-+_GLOBAL(_savegpr_24)   stw     24,-32(11)
-+_GLOBAL(_savegpr_25)   stw     25,-28(11)
-+_GLOBAL(_savegpr_26)   stw     26,-24(11)
-+_GLOBAL(_savegpr_27)   stw     27,-20(11)
-+_GLOBAL(_savegpr_28)   stw     28,-16(11)
-+_GLOBAL(_savegpr_29)   stw     29,-12(11)
-+_GLOBAL(_savegpr_30)   stw     30,-8(11)
-+_GLOBAL(_savegpr_31)   stw     31,-4(11)
-+                       blr
-+
-+/* Routines for restoring integer registers, called by the compiler.  */
-+/* Called with r11 pointing to the stack header word of the caller of the */
-+/* function, just beyond the end of the integer restore area.  */
-+
-+_GLOBAL(_restgpr_14)   lwz     14,-72(11)      /* restore gp registers */
-+_GLOBAL(_restgpr_15)   lwz     15,-68(11)
-+_GLOBAL(_restgpr_16)   lwz     16,-64(11)
-+_GLOBAL(_restgpr_17)   lwz     17,-60(11)
-+_GLOBAL(_restgpr_18)   lwz     18,-56(11)
-+_GLOBAL(_restgpr_19)   lwz     19,-52(11)
-+_GLOBAL(_restgpr_20)   lwz     20,-48(11)
-+_GLOBAL(_restgpr_21)   lwz     21,-44(11)
-+_GLOBAL(_restgpr_22)   lwz     22,-40(11)
-+_GLOBAL(_restgpr_23)   lwz     23,-36(11)
-+_GLOBAL(_restgpr_24)   lwz     24,-32(11)
-+_GLOBAL(_restgpr_25)   lwz     25,-28(11)
-+_GLOBAL(_restgpr_26)   lwz     26,-24(11)
-+_GLOBAL(_restgpr_27)   lwz     27,-20(11)
-+_GLOBAL(_restgpr_28)   lwz     28,-16(11)
-+_GLOBAL(_restgpr_29)   lwz     29,-12(11)
-+_GLOBAL(_restgpr_30)   lwz     30,-8(11)
-+_GLOBAL(_restgpr_31)   lwz     31,-4(11)
-+                       blr
-+
-+/* Routines for restoring integer registers, called by the compiler.  */
-+/* Called with r11 pointing to the stack header word of the caller of the */
-+/* function, just beyond the end of the integer restore area.  */
-+
-+_GLOBAL(_restgpr_14_x) lwz     14,-72(11)      /* restore gp registers */
-+_GLOBAL(_restgpr_15_x) lwz     15,-68(11)
-+_GLOBAL(_restgpr_16_x) lwz     16,-64(11)
-+_GLOBAL(_restgpr_17_x) lwz     17,-60(11)
-+_GLOBAL(_restgpr_18_x) lwz     18,-56(11)
-+_GLOBAL(_restgpr_19_x) lwz     19,-52(11)
-+_GLOBAL(_restgpr_20_x) lwz     20,-48(11)
-+_GLOBAL(_restgpr_21_x) lwz     21,-44(11)
-+_GLOBAL(_restgpr_22_x) lwz     22,-40(11)
-+_GLOBAL(_restgpr_23_x) lwz     23,-36(11)
-+_GLOBAL(_restgpr_24_x) lwz     24,-32(11)
-+_GLOBAL(_restgpr_25_x) lwz     25,-28(11)
-+_GLOBAL(_restgpr_26_x) lwz     26,-24(11)
-+_GLOBAL(_restgpr_27_x) lwz     27,-20(11)
-+_GLOBAL(_restgpr_28_x) lwz     28,-16(11)
-+_GLOBAL(_restgpr_29_x) lwz     29,-12(11)
-+_GLOBAL(_restgpr_30_x) lwz     30,-8(11)
-+_GLOBAL(_restgpr_31_x) lwz     0,4(11)
-+                       lwz     31,-4(11)
-+                       mtlr    0
-+                       mr      1,11
-+                       blr
-+#endif
---- a/arch/powerpc/kernel/ppc_ksyms.c
-+++ b/arch/powerpc/kernel/ppc_ksyms.c
-@@ -188,3 +188,114 @@ EXPORT_SYMBOL(__mtdcr);
- EXPORT_SYMBOL(__mfdcr);
- #endif
- EXPORT_SYMBOL(empty_zero_page);
-+
-+#if defined(CONFIG_PPC32) && defined(CONFIG_CC_OPTIMIZE_FOR_SIZE)
-+void _savegpr_14(void);
-+void _savegpr_15(void);
-+void _savegpr_16(void);
-+void _savegpr_17(void);
-+void _savegpr_18(void);
-+void _savegpr_19(void);
-+void _savegpr_20(void);
-+void _savegpr_21(void);
-+void _savegpr_22(void);
-+void _savegpr_23(void);
-+void _savegpr_24(void);
-+void _savegpr_25(void);
-+void _savegpr_26(void);
-+void _savegpr_27(void);
-+void _savegpr_28(void);
-+void _savegpr_29(void);
-+void _savegpr_30(void);
-+void _savegpr_31(void);
-+void _restgpr_14(void);
-+void _restgpr_15(void);
-+void _restgpr_16(void);
-+void _restgpr_17(void);
-+void _restgpr_18(void);
-+void _restgpr_19(void);
-+void _restgpr_20(void);
-+void _restgpr_21(void);
-+void _restgpr_22(void);
-+void _restgpr_23(void);
-+void _restgpr_24(void);
-+void _restgpr_25(void);
-+void _restgpr_26(void);
-+void _restgpr_27(void);
-+void _restgpr_28(void);
-+void _restgpr_29(void);
-+void _restgpr_30(void);
-+void _restgpr_31(void);
-+void _restgpr_14_x(void);
-+void _restgpr_15_x(void);
-+void _restgpr_16_x(void);
-+void _restgpr_17_x(void);
-+void _restgpr_18_x(void);
-+void _restgpr_19_x(void);
-+void _restgpr_20_x(void);
-+void _restgpr_21_x(void);
-+void _restgpr_22_x(void);
-+void _restgpr_23_x(void);
-+void _restgpr_24_x(void);
-+void _restgpr_25_x(void);
-+void _restgpr_26_x(void);
-+void _restgpr_27_x(void);
-+void _restgpr_28_x(void);
-+void _restgpr_29_x(void);
-+void _restgpr_30_x(void);
-+void _restgpr_31_x(void);
-+EXPORT_SYMBOL(_savegpr_14);
-+EXPORT_SYMBOL(_savegpr_15);
-+EXPORT_SYMBOL(_savegpr_16);
-+EXPORT_SYMBOL(_savegpr_17);
-+EXPORT_SYMBOL(_savegpr_18);
-+EXPORT_SYMBOL(_savegpr_19);
-+EXPORT_SYMBOL(_savegpr_20);
-+EXPORT_SYMBOL(_savegpr_21);
-+EXPORT_SYMBOL(_savegpr_22);
-+EXPORT_SYMBOL(_savegpr_23);
-+EXPORT_SYMBOL(_savegpr_24);
-+EXPORT_SYMBOL(_savegpr_25);
-+EXPORT_SYMBOL(_savegpr_26);
-+EXPORT_SYMBOL(_savegpr_27);
-+EXPORT_SYMBOL(_savegpr_28);
-+EXPORT_SYMBOL(_savegpr_29);
-+EXPORT_SYMBOL(_savegpr_30);
-+EXPORT_SYMBOL(_savegpr_31);
-+EXPORT_SYMBOL(_restgpr_14);
-+EXPORT_SYMBOL(_restgpr_15);
-+EXPORT_SYMBOL(_restgpr_16);
-+EXPORT_SYMBOL(_restgpr_17);
-+EXPORT_SYMBOL(_restgpr_18);
-+EXPORT_SYMBOL(_restgpr_19);
-+EXPORT_SYMBOL(_restgpr_20);
-+EXPORT_SYMBOL(_restgpr_21);
-+EXPORT_SYMBOL(_restgpr_22);
-+EXPORT_SYMBOL(_restgpr_23);
-+EXPORT_SYMBOL(_restgpr_24);
-+EXPORT_SYMBOL(_restgpr_25);
-+EXPORT_SYMBOL(_restgpr_26);
-+EXPORT_SYMBOL(_restgpr_27);
-+EXPORT_SYMBOL(_restgpr_28);
-+EXPORT_SYMBOL(_restgpr_29);
-+EXPORT_SYMBOL(_restgpr_30);
-+EXPORT_SYMBOL(_restgpr_31);
-+EXPORT_SYMBOL(_restgpr_14_x);
-+EXPORT_SYMBOL(_restgpr_15_x);
-+EXPORT_SYMBOL(_restgpr_16_x);
-+EXPORT_SYMBOL(_restgpr_17_x);
-+EXPORT_SYMBOL(_restgpr_18_x);
-+EXPORT_SYMBOL(_restgpr_19_x);
-+EXPORT_SYMBOL(_restgpr_20_x);
-+EXPORT_SYMBOL(_restgpr_21_x);
-+EXPORT_SYMBOL(_restgpr_22_x);
-+EXPORT_SYMBOL(_restgpr_23_x);
-+EXPORT_SYMBOL(_restgpr_24_x);
-+EXPORT_SYMBOL(_restgpr_25_x);
-+EXPORT_SYMBOL(_restgpr_26_x);
-+EXPORT_SYMBOL(_restgpr_27_x);
-+EXPORT_SYMBOL(_restgpr_28_x);
-+EXPORT_SYMBOL(_restgpr_29_x);
-+EXPORT_SYMBOL(_restgpr_30_x);
-+EXPORT_SYMBOL(_restgpr_31_x);
-+#endif /* CONFIG_PPC32 && CONFIG_CC_OPTIMIZE_FOR_SIZE */
diff --git a/target/linux/generic-2.6/patches-2.6.31/049-byteshift_h_fix_usage_for_compressed_kernels.patch b/target/linux/generic-2.6/patches-2.6.31/049-byteshift_h_fix_usage_for_compressed_kernels.patch
deleted file mode 100644
index 5cd81070e..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/049-byteshift_h_fix_usage_for_compressed_kernels.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 2fa4341074cd02fb39aa23410740764948755635 Mon Sep 17 00:00:00 2001
-From: Albin Tonnerre <albin.tonnerre@free-electrons.com>
-Date: Wed, 23 Sep 2009 15:57:38 -0700
-Subject: [PATCH] include/linux/unaligned/{l,b}e_byteshift.h: fix usage for compressed kernels
-
-When unaligned accesses are required for uncompressing a kernel (such as
-for LZO decompression on ARM in a patch that follows), including
-<linux/kernel.h> causes issues as it brings in a lot of things that are
-not available in the decompression environment.
-
-linux/kernel.h brings at least:
-extern int console_printk[];
-extern const char hex_asc[];
-which causes errors at link-time as they are not available when
-compiling the pre-boot environement. There are also a few others:
-
-  arch/arm/boot/compressed/misc.o: In function `valid_user_regs':
-   arch/arm/include/asm/ptrace.h:158: undefined reference to `elf_hwcap'
-  arch/arm/boot/compressed/misc.o: In function `console_silent':
-   include/linux/kernel.h:292: undefined reference to `console_printk'
-  arch/arm/boot/compressed/misc.o: In function `console_verbose':
-   include/linux/kernel.h:297: undefined reference to `console_printk'
-  arch/arm/boot/compressed/misc.o: In function `pack_hex_byte':
-   include/linux/kernel.h:360: undefined reference to `hex_asc'
-  arch/arm/boot/compressed/misc.o: In function `hweight_long':
-   include/linux/bitops.h:45: undefined reference to `hweight32'
-  arch/arm/boot/compressed/misc.o: In function `__cmpxchg_local_generic':
-   include/asm-generic/cmpxchg-local.h:21: undefined reference to `wrong_size_cmpxchg'
-   include/asm-generic/cmpxchg-local.h:42: undefined reference to `wrong_size_cmpxchg'
-  arch/arm/boot/compressed/misc.o: In function `__xchg':
-   arch/arm/include/asm/system.h:309: undefined reference to `__bad_xchg'
-
-However, those files apparently use nothing from <linux/kernel.h>, all
-they need is the declaration of types such as u32 or u64, so
-<linux/types.h> should be enough
-
-Signed-off-by: Albin Tonnerre <albin.tonnerre@free-electrons.com>
-Cc: Sam Ravnborg <sam@ravnborg.org>
-Cc: Russell King <rmk@arm.linux.org.uk>
-Cc: Ingo Molnar <mingo@elte.hu>
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Cc: "H. Peter Anvin" <hpa@zytor.com>
-Cc: Phillip Lougher <phillip@lougher.demon.co.uk>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
----
- include/linux/unaligned/be_byteshift.h |    2 +-
- include/linux/unaligned/le_byteshift.h |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/include/linux/unaligned/be_byteshift.h
-+++ b/include/linux/unaligned/be_byteshift.h
-@@ -1,7 +1,7 @@
- #ifndef _LINUX_UNALIGNED_BE_BYTESHIFT_H
- #define _LINUX_UNALIGNED_BE_BYTESHIFT_H
- 
--#include <linux/kernel.h>
-+#include <linux/types.h>
- 
- static inline u16 __get_unaligned_be16(const u8 *p)
- {
---- a/include/linux/unaligned/le_byteshift.h
-+++ b/include/linux/unaligned/le_byteshift.h
-@@ -1,7 +1,7 @@
- #ifndef _LINUX_UNALIGNED_LE_BYTESHIFT_H
- #define _LINUX_UNALIGNED_LE_BYTESHIFT_H
- 
--#include <linux/kernel.h>
-+#include <linux/types.h>
- 
- static inline u16 __get_unaligned_le16(const u8 *p)
- {
diff --git a/target/linux/generic-2.6/patches-2.6.31/050-lzo_compressed_kernels.patch b/target/linux/generic-2.6/patches-2.6.31/050-lzo_compressed_kernels.patch
deleted file mode 100644
index 733d1756f..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/050-lzo_compressed_kernels.patch
+++ /dev/null
@@ -1,309 +0,0 @@
---- /dev/null
-+++ b/include/linux/decompress/unlzo.h
-@@ -0,0 +1,10 @@
-+#ifndef DECOMPRESS_UNLZO_H
-+#define DECOMPRESS_UNLZO_H
-+
-+int unlzo(unsigned char *inbuf, int len,
-+	int(*fill)(void*, unsigned int),
-+	int(*flush)(void*, unsigned int),
-+	unsigned char *output,
-+	int *pos,
-+	void(*error)(char *x));
-+#endif
---- a/init/Kconfig
-+++ b/init/Kconfig
-@@ -115,10 +115,13 @@ config HAVE_KERNEL_BZIP2
- config HAVE_KERNEL_LZMA
- 	bool
- 
-+config HAVE_KERNEL_LZO
-+	bool
-+
- choice
- 	prompt "Kernel compression mode"
- 	default KERNEL_GZIP
--	depends on HAVE_KERNEL_GZIP || HAVE_KERNEL_BZIP2 || HAVE_KERNEL_LZMA
-+	depends on HAVE_KERNEL_GZIP || HAVE_KERNEL_BZIP2 || HAVE_KERNEL_LZMA || HAVE_KERNEL_LZO
- 	help
- 	  The linux kernel is a kind of self-extracting executable.
- 	  Several compression algorithms are available, which differ
-@@ -141,9 +144,8 @@ config KERNEL_GZIP
- 	bool "Gzip"
- 	depends on HAVE_KERNEL_GZIP
- 	help
--	  The old and tried gzip compression. Its compression ratio is
--	  the poorest among the 3 choices; however its speed (both
--	  compression and decompression) is the fastest.
-+	  The old and tried gzip compression. It provides a good balance
-+	  between compression ratio and decompression speed.
- 
- config KERNEL_BZIP2
- 	bool "Bzip2"
-@@ -164,6 +166,14 @@ config KERNEL_LZMA
- 	  two. Compression is slowest.	The kernel size is about 33%
- 	  smaller with LZMA in comparison to gzip.
- 
-+config KERNEL_LZO
-+	bool "LZO"
-+	depends on HAVE_KERNEL_LZO
-+	help
-+	  Its compression ratio is the poorest among the 4. The kernel
-+	  size is about about 10% bigger than gzip; however its speed
-+	  (both compression and decompression) is the fastest.
-+
- endchoice
- 
- config SWAP
---- /dev/null
-+++ b/lib/decompress_unlzo.c
-@@ -0,0 +1,208 @@
-+/*
-+ * LZO decompressor for the Linux kernel. Code borrowed from the lzo
-+ * implementation by Markus Franz Xaver Johannes Oberhumer.
-+ *
-+ * Linux kernel adaptation:
-+ * Copyright (C) 2009
-+ * Albin Tonnerre, Free Electrons <albin.tonnerre@free-electrons.com>
-+ *
-+ * Original code:
-+ * Copyright (C) 1996-2005 Markus Franz Xaver Johannes Oberhumer
-+ * All Rights Reserved.
-+ *
-+ * lzop and the LZO library are free software; you can redistribute them
-+ * and/or modify them 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; see the file COPYING.
-+ * If not, write to the Free Software Foundation, Inc.,
-+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ *
-+ * Markus F.X.J. Oberhumer
-+ * <markus@oberhumer.com>
-+ * http://www.oberhumer.com/opensource/lzop/
-+ */
-+
-+#ifdef STATIC
-+#include "lzo/lzo1x_decompress.c"
-+#else
-+#include <linux/slab.h>
-+#include <linux/decompress/unlzo.h>
-+#endif
-+
-+#include <linux/types.h>
-+#include <linux/lzo.h>
-+#include <linux/decompress/mm.h>
-+
-+#include <linux/compiler.h>
-+#include <asm/unaligned.h>
-+
-+static const unsigned char lzop_magic[] =
-+	{ 0x89, 0x4c, 0x5a, 0x4f, 0x00, 0x0d, 0x0a, 0x1a, 0x0a };
-+
-+#define LZO_BLOCK_SIZE        (256*1024l)
-+#define HEADER_HAS_FILTER      0x00000800L
-+
-+STATIC inline int INIT parse_header(u8 *input, u8 *skip)
-+{
-+	int l;
-+	u8 *parse = input;
-+	u8 level = 0;
-+	u16 version;
-+
-+	/* read magic: 9 first bits */
-+	for (l = 0; l < 9; l++) {
-+		if (*parse++ != lzop_magic[l])
-+			return 0;
-+	}
-+	/* get version (2bytes), skip library version (2),
-+	 * 'need to be extracted' version (2) and
-+	 * method (1) */
-+	version = get_unaligned_be16(parse);
-+	parse += 7;
-+	if (version >= 0x0940)
-+		level = *parse++;
-+	if (get_unaligned_be32(parse) & HEADER_HAS_FILTER)
-+		parse += 8; /* flags + filter info */
-+	else
-+		parse += 4; /* flags */
-+
-+	/* skip mode and mtime_low */
-+	parse += 8;
-+	if (version >= 0x0940)
-+		parse += 4;	/* skip mtime_high */
-+
-+	l = *parse++;
-+	/* don't care about the file name, and skip checksum */
-+	parse += l + 4;
-+
-+	*skip = parse - input;
-+	return 1;
-+}
-+
-+STATIC inline int INIT unlzo(u8 *input, int in_len,
-+				int (*fill) (void *, unsigned int),
-+				int (*flush) (void *, unsigned int),
-+				u8 *output, int *posp,
-+				void (*error_fn) (char *x))
-+{
-+	u8 skip = 0, r = 0;
-+	u32 src_len, dst_len;
-+	size_t tmp;
-+	u8 *in_buf, *in_buf_save, *out_buf;
-+	int obytes_processed = 0;
-+
-+	set_error_fn(error_fn);
-+
-+	if (output)
-+		out_buf = output;
-+	else if (!flush) {
-+		error("NULL output pointer and no flush function provided");
-+		goto exit;
-+	} else {
-+		out_buf = malloc(LZO_BLOCK_SIZE);
-+		if (!out_buf) {
-+			error("Could not allocate output buffer");
-+			goto exit;
-+		}
-+	}
-+
-+	if (input && fill) {
-+		error("Both input pointer and fill function provided, don't know what to do");
-+		goto exit_1;
-+	} else if (input)
-+		in_buf = input;
-+	else if (!fill || !posp) {
-+		error("NULL input pointer and missing position pointer or fill function");
-+		goto exit_1;
-+	} else {
-+		in_buf = malloc(lzo1x_worst_compress(LZO_BLOCK_SIZE));
-+		if (!in_buf) {
-+			error("Could not allocate input buffer");
-+			goto exit_1;
-+		}
-+	}
-+	in_buf_save = in_buf;
-+
-+	if (posp)
-+		*posp = 0;
-+
-+	if (fill)
-+		fill(in_buf, lzo1x_worst_compress(LZO_BLOCK_SIZE));
-+
-+	if (!parse_header(input, &skip)) {
-+		error("invalid header");
-+		goto exit_2;
-+	}
-+	in_buf += skip;
-+
-+	if (posp)
-+		*posp = skip;
-+
-+	for (;;) {
-+		/* read uncompressed block size */
-+		dst_len = get_unaligned_be32(in_buf);
-+		in_buf += 4;
-+
-+		/* exit if last block */
-+		if (dst_len == 0) {
-+			if (posp)
-+				*posp += 4;
-+			break;
-+		}
-+
-+		if (dst_len > LZO_BLOCK_SIZE) {
-+			error("dest len longer than block size");
-+			goto exit_2;
-+		}
-+
-+		/* read compressed block size, and skip block checksum info */
-+		src_len = get_unaligned_be32(in_buf);
-+		in_buf += 8;
-+
-+		if (src_len <= 0 || src_len > dst_len) {
-+			error("file corrupted");
-+			goto exit_2;
-+		}
-+
-+		/* decompress */
-+		tmp = dst_len;
-+		r = lzo1x_decompress_safe((u8 *) in_buf, src_len, out_buf, &tmp);
-+
-+		if (r != LZO_E_OK || dst_len != tmp) {
-+			error("Compressed data violation");
-+			goto exit_2;
-+		}
-+
-+		obytes_processed += dst_len;
-+		if (flush)
-+			flush(out_buf, dst_len);
-+		if (output)
-+			out_buf += dst_len;
-+		if (posp)
-+			*posp += src_len + 12;
-+		if (fill) {
-+			in_buf = in_buf_save;
-+			fill(in_buf, lzo1x_worst_compress(LZO_BLOCK_SIZE));
-+		} else
-+			in_buf += src_len;
-+	}
-+
-+exit_2:
-+	if (!input)
-+		free(in_buf);
-+exit_1:
-+	if (!output)
-+		free(out_buf);
-+exit:
-+	return obytes_processed;
-+}
-+
-+#define decompress unlzo
---- a/lib/lzo/lzo1x_decompress.c
-+++ b/lib/lzo/lzo1x_decompress.c
-@@ -11,11 +11,13 @@
-  *  Richard Purdie <rpurdie@openedhand.com>
-  */
- 
-+#ifndef STATIC
- #include <linux/module.h>
- #include <linux/kernel.h>
--#include <linux/lzo.h>
--#include <asm/byteorder.h>
-+#endif
-+
- #include <asm/unaligned.h>
-+#include <linux/lzo.h>
- #include "lzodefs.h"
- 
- #define HAVE_IP(x, ip_end, ip) ((size_t)(ip_end - ip) < (x))
-@@ -244,9 +246,10 @@ lookbehind_overrun:
- 	*out_len = op - out;
- 	return LZO_E_LOOKBEHIND_OVERRUN;
- }
--
-+#ifndef STATIC
- EXPORT_SYMBOL_GPL(lzo1x_decompress_safe);
- 
- MODULE_LICENSE("GPL");
- MODULE_DESCRIPTION("LZO1X Decompressor");
- 
-+#endif
---- a/scripts/Makefile.lib
-+++ b/scripts/Makefile.lib
-@@ -230,3 +230,8 @@ quiet_cmd_lzma = LZMA    $@
- cmd_lzma = (cat $(filter-out FORCE,$^) | \
- 	lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
- 	(rm -f $@ ; false)
-+
-+quiet_cmd_lzo = LZO    $@
-+cmd_lzo = (cat $(filter-out FORCE,$^) | \
-+	lzop -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
-+	(rm -f $@ ; false)
diff --git a/target/linux/generic-2.6/patches-2.6.31/051-lzo_compressed_kernel_for_arm.patch b/target/linux/generic-2.6/patches-2.6.31/051-lzo_compressed_kernel_for_arm.patch
deleted file mode 100644
index 49512bb41..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/051-lzo_compressed_kernel_for_arm.patch
+++ /dev/null
@@ -1,283 +0,0 @@
---- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -18,6 +18,8 @@ config ARM
- 	select HAVE_KRETPROBES if (HAVE_KPROBES)
- 	select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
- 	select HAVE_GENERIC_DMA_COHERENT
-+	select HAVE_KERNEL_GZIP
-+	select HAVE_KERNEL_LZO
- 	help
- 	  The ARM series is a line of low-power-consumption RISC chip designs
- 	  licensed by ARM Ltd and targeted at embedded applications and
---- a/arch/arm/boot/compressed/Makefile
-+++ b/arch/arm/boot/compressed/Makefile
-@@ -63,8 +63,12 @@ endif
- 
- SEDFLAGS	= s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/
- 
--targets       := vmlinux vmlinux.lds piggy.gz piggy.o font.o font.c \
--		 head.o misc.o $(OBJS)
-+suffix_$(CONFIG_KERNEL_GZIP) = gzip
-+suffix_$(CONFIG_KERNEL_LZO)  = lzo
-+
-+targets       := vmlinux vmlinux.lds \
-+		 piggy.$(suffix_y) piggy.$(suffix_y).o \
-+		 font.o font.c head.o misc.o $(OBJS)
- 
- ifeq ($(CONFIG_FUNCTION_TRACER),y)
- ORIG_CFLAGS := $(KBUILD_CFLAGS)
-@@ -87,22 +91,31 @@ endif
- ifneq ($(PARAMS_PHYS),)
- LDFLAGS_vmlinux += --defsym params_phys=$(PARAMS_PHYS)
- endif
--LDFLAGS_vmlinux += -p --no-undefined -X \
--	$(shell $(CC) $(KBUILD_CFLAGS) --print-libgcc-file-name) -T
-+# ?
-+LDFLAGS_vmlinux += -p
-+# Report unresolved symbol references
-+LDFLAGS_vmlinux += --no-undefined
-+# Delete all temporary local symbols
-+LDFLAGS_vmlinux += -X
-+# Next argument is a linker script
-+LDFLAGS_vmlinux += -T
-+
-+# For __aeabi_uidivmod
-+lib1funcs = $(srctree)/arch/$(SRCARCH)/lib/lib1funcs.o
- 
- # Don't allow any static data in misc.o, which
- # would otherwise mess up our GOT table
- CFLAGS_misc.o := -Dstatic=
- 
--$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.o \
--	 	$(addprefix $(obj)/, $(OBJS)) FORCE
-+$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.$(suffix_y).o \
-+	 	$(addprefix $(obj)/, $(OBJS)) $(lib1funcs) FORCE
- 	$(call if_changed,ld)
- 	@:
- 
--$(obj)/piggy.gz: $(obj)/../Image FORCE
--	$(call if_changed,gzip)
-+$(obj)/piggy.$(suffix_y): $(obj)/../Image FORCE
-+	$(call if_changed,$(suffix_y))
- 
--$(obj)/piggy.o:  $(obj)/piggy.gz FORCE
-+$(obj)/piggy.$(suffix_y).o:  $(obj)/piggy.$(suffix_y) FORCE
- 
- CFLAGS_font.o := -Dstatic=
- 
---- a/arch/arm/boot/compressed/misc.c
-+++ b/arch/arm/boot/compressed/misc.c
-@@ -18,10 +18,15 @@
- 
- unsigned int __machine_arch_type;
- 
-+#define _LINUX_STRING_H_
-+
- #include <linux/compiler.h>	/* for inline */
- #include <linux/types.h>	/* for size_t */
- #include <linux/stddef.h>	/* for NULL */
- #include <asm/string.h>
-+#include <linux/linkage.h>
-+
-+#include <asm/unaligned.h>
- 
- #ifdef STANDALONE_DEBUG
- #define putstr printf
-@@ -188,34 +193,8 @@ static inline __ptr_t memcpy(__ptr_t __d
- /*
-  * gzip delarations
-  */
--#define OF(args)  args
- #define STATIC static
- 
--typedef unsigned char  uch;
--typedef unsigned short ush;
--typedef unsigned long  ulg;
--
--#define WSIZE 0x8000		/* Window size must be at least 32k, */
--				/* and a power of two */
--
--static uch *inbuf;		/* input buffer */
--static uch window[WSIZE];	/* Sliding window buffer */
--
--static unsigned insize;		/* valid bytes in inbuf */
--static unsigned inptr;		/* index of next byte to be processed in inbuf */
--static unsigned outcnt;		/* bytes in output buffer */
--
--/* gzip flag byte */
--#define ASCII_FLAG   0x01 /* bit 0 set: file probably ascii text */
--#define CONTINUATION 0x02 /* bit 1 set: continuation of multi-part gzip file */
--#define EXTRA_FIELD  0x04 /* bit 2 set: extra field present */
--#define ORIG_NAME    0x08 /* bit 3 set: original file name present */
--#define COMMENT      0x10 /* bit 4 set: file comment present */
--#define ENCRYPTED    0x20 /* bit 5 set: file is encrypted */
--#define RESERVED     0xC0 /* bit 6,7:   reserved */
--
--#define get_byte()  (inptr < insize ? inbuf[inptr++] : fill_inbuf())
--
- /* Diagnostic functions */
- #ifdef DEBUG
- #  define Assert(cond,msg) {if(!(cond)) error(msg);}
-@@ -233,24 +212,20 @@ static unsigned outcnt;		/* bytes in out
- #  define Tracecv(c,x)
- #endif
- 
--static int  fill_inbuf(void);
--static void flush_window(void);
- static void error(char *m);
- 
- extern char input_data[];
- extern char input_data_end[];
- 
--static uch *output_data;
--static ulg output_ptr;
--static ulg bytes_out;
-+static unsigned char *output_data;
-+static unsigned long output_ptr;
- 
- static void error(char *m);
- 
- static void putstr(const char *);
- 
--extern int end;
--static ulg free_mem_ptr;
--static ulg free_mem_end_ptr;
-+static unsigned long free_mem_ptr;
-+static unsigned long free_mem_end_ptr;
- 
- #ifdef STANDALONE_DEBUG
- #define NO_INFLATE_MALLOC
-@@ -258,46 +233,13 @@ static ulg free_mem_end_ptr;
- 
- #define ARCH_HAS_DECOMP_WDOG
- 
--#include "../../../../lib/inflate.c"
--
--/* ===========================================================================
-- * Fill the input buffer. This is called only when the buffer is empty
-- * and at least one byte is really needed.
-- */
--int fill_inbuf(void)
--{
--	if (insize != 0)
--		error("ran out of input data");
--
--	inbuf = input_data;
--	insize = &input_data_end[0] - &input_data[0];
--
--	inptr = 1;
--	return inbuf[0];
--}
-+#ifdef CONFIG_KERNEL_GZIP
-+#include "../../../../lib/decompress_inflate.c"
-+#endif
- 
--/* ===========================================================================
-- * Write the output window window[0..outcnt-1] and update crc and bytes_out.
-- * (Used for the decompressed data only.)
-- */
--void flush_window(void)
--{
--	ulg c = crc;
--	unsigned n;
--	uch *in, *out, ch;
--
--	in = window;
--	out = &output_data[output_ptr];
--	for (n = 0; n < outcnt; n++) {
--		ch = *out++ = *in++;
--		c = crc_32_tab[((int)c ^ ch) & 0xff] ^ (c >> 8);
--	}
--	crc = c;
--	bytes_out += (ulg)outcnt;
--	output_ptr += (ulg)outcnt;
--	outcnt = 0;
--	putstr(".");
--}
-+#ifdef CONFIG_KERNEL_LZO
-+#include "../../../../lib/decompress_unlzo.c"
-+#endif
- 
- #ifndef arch_error
- #define arch_error(x)
-@@ -314,22 +256,33 @@ static void error(char *x)
- 	while(1);	/* Halt */
- }
- 
-+asmlinkage void __div0(void)
-+{
-+	error("Attempting division by 0!");
-+}
-+
- #ifndef STANDALONE_DEBUG
- 
--ulg
--decompress_kernel(ulg output_start, ulg free_mem_ptr_p, ulg free_mem_ptr_end_p,
--		  int arch_id)
-+unsigned long
-+decompress_kernel(unsigned long output_start, unsigned long free_mem_ptr_p,
-+		unsigned long free_mem_ptr_end_p,
-+		int arch_id)
- {
--	output_data		= (uch *)output_start;	/* Points to kernel start */
-+	unsigned char *tmp;
-+
-+	output_data		= (unsigned char *)output_start;
- 	free_mem_ptr		= free_mem_ptr_p;
- 	free_mem_end_ptr	= free_mem_ptr_end_p;
- 	__machine_arch_type	= arch_id;
- 
- 	arch_decomp_setup();
- 
--	makecrc();
-+	tmp = (unsigned char *) (((unsigned long)input_data_end) - 4);
-+	output_ptr = get_unaligned_le32(tmp);
-+
- 	putstr("Uncompressing Linux...");
--	gunzip();
-+	decompress(input_data, input_data_end - input_data,
-+			NULL, NULL, output_data, NULL, error);
- 	putstr(" done, booting the kernel.\n");
- 	return output_ptr;
- }
-@@ -341,11 +294,10 @@ int main()
- {
- 	output_data = output_buffer;
- 
--	makecrc();
- 	putstr("Uncompressing Linux...");
--	gunzip();
-+	decompress(input_data, input_data_end - input_data,
-+			NULL, NULL, output_data, NULL, error);
- 	putstr("done.\n");
- 	return 0;
- }
- #endif
--	
---- a/arch/arm/boot/compressed/piggy.S
-+++ /dev/null
-@@ -1,6 +0,0 @@
--	.section .piggydata,#alloc
--	.globl	input_data
--input_data:
--	.incbin	"arch/arm/boot/compressed/piggy.gz"
--	.globl	input_data_end
--input_data_end:
---- /dev/null
-+++ b/arch/arm/boot/compressed/piggy.gzip.S
-@@ -0,0 +1,6 @@
-+	.section .piggydata,#alloc
-+	.globl	input_data
-+input_data:
-+	.incbin	"arch/arm/boot/compressed/piggy.gzip"
-+	.globl	input_data_end
-+input_data_end:
---- /dev/null
-+++ b/arch/arm/boot/compressed/piggy.lzo.S
-@@ -0,0 +1,6 @@
-+	.section .piggydata,#alloc
-+	.globl	input_data
-+input_data:
-+	.incbin	"arch/arm/boot/compressed/piggy.lzo"
-+	.globl	input_data_end
-+input_data_end:
diff --git a/target/linux/generic-2.6/patches-2.6.31/052-lzo_compressed_kernel_for_x86.patch b/target/linux/generic-2.6/patches-2.6.31/052-lzo_compressed_kernel_for_x86.patch
deleted file mode 100644
index ea7d2400b..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/052-lzo_compressed_kernel_for_x86.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/arch/x86/Kconfig
-+++ b/arch/x86/Kconfig
-@@ -49,6 +49,7 @@ config X86
- 	select HAVE_KERNEL_GZIP
- 	select HAVE_KERNEL_BZIP2
- 	select HAVE_KERNEL_LZMA
-+	select HAVE_KERNEL_LZO
- 	select HAVE_ARCH_KMEMCHECK
- 
- config OUTPUT_FORMAT
---- a/arch/x86/boot/compressed/Makefile
-+++ b/arch/x86/boot/compressed/Makefile
-@@ -4,7 +4,7 @@
- # create a compressed vmlinux image from the original vmlinux
- #
- 
--targets := vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma head_$(BITS).o misc.o piggy.o
-+targets := vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma vmlinux.bin.lzo head_$(BITS).o misc.o piggy.o
- 
- KBUILD_CFLAGS := -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2
- KBUILD_CFLAGS += -fno-strict-aliasing -fPIC
-@@ -48,10 +48,13 @@ $(obj)/vmlinux.bin.bz2: $(vmlinux.bin.al
- 	$(call if_changed,bzip2)
- $(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y) FORCE
- 	$(call if_changed,lzma)
-+$(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) FORCE
-+	$(call if_changed,lzo)
- 
- suffix-$(CONFIG_KERNEL_GZIP)	:= gz
- suffix-$(CONFIG_KERNEL_BZIP2)	:= bz2
- suffix-$(CONFIG_KERNEL_LZMA)	:= lzma
-+suffix-$(CONFIG_KERNEL_LZO) 	:= lzo
- 
- quiet_cmd_mkpiggy = MKPIGGY $@
-       cmd_mkpiggy = $(obj)/mkpiggy $< > $@ || ( rm -f $@ ; false )
---- a/arch/x86/boot/compressed/misc.c
-+++ b/arch/x86/boot/compressed/misc.c
-@@ -162,6 +162,10 @@ static int lines, cols;
- #include "../../../../lib/decompress_unlzma.c"
- #endif
- 
-+#ifdef CONFIG_KERNEL_LZO
-+#include "../../../../lib/decompress_unlzo.c"
-+#endif
-+
- static void scroll(void)
- {
- 	int i;
diff --git a/target/linux/generic-2.6/patches-2.6.31/053-lzo_compression_for_initramfs.patch b/target/linux/generic-2.6/patches-2.6.31/053-lzo_compression_for_initramfs.patch
deleted file mode 100644
index c05c3833d..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/053-lzo_compression_for_initramfs.patch
+++ /dev/null
@@ -1,106 +0,0 @@
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -120,6 +120,10 @@ config DECOMPRESS_LZMA
- config DECOMPRESS_LZMA_NEEDED
- 	 boolean
- 
-+config DECOMPRESS_LZO
-+	select LZO_DECOMPRESS
-+	tristate
-+
- #
- # Generic allocator support is selected if needed
- #
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -69,6 +69,7 @@ obj-$(CONFIG_LZO_DECOMPRESS) += lzo/
- lib-$(CONFIG_DECOMPRESS_GZIP) += decompress_inflate.o
- lib-$(CONFIG_DECOMPRESS_BZIP2) += decompress_bunzip2.o
- lib-$(CONFIG_DECOMPRESS_LZMA) += decompress_unlzma.o
-+lib-$(CONFIG_DECOMPRESS_LZO) += decompress_unlzo.o
- 
- obj-$(CONFIG_TEXTSEARCH) += textsearch.o
- obj-$(CONFIG_TEXTSEARCH_KMP) += ts_kmp.o
---- a/lib/decompress.c
-+++ b/lib/decompress.c
-@@ -9,6 +9,7 @@
- #include <linux/decompress/bunzip2.h>
- #include <linux/decompress/unlzma.h>
- #include <linux/decompress/inflate.h>
-+#include <linux/decompress/unlzo.h>
- 
- #include <linux/types.h>
- #include <linux/string.h>
-@@ -22,6 +23,9 @@
- #ifndef CONFIG_DECOMPRESS_LZMA
- # define unlzma NULL
- #endif
-+#ifndef CONFIG_DECOMPRESS_LZO
-+# define unlzo NULL
-+#endif
- 
- static const struct compress_format {
- 	unsigned char magic[2];
-@@ -32,6 +36,7 @@ static const struct compress_format {
- 	{ {037, 0236}, "gzip", gunzip },
- 	{ {0x42, 0x5a}, "bzip2", bunzip2 },
- 	{ {0x5d, 0x00}, "lzma", unlzma },
-+	{ {0x89, 0x4c}, "lzo", unlzo },
- 	{ {0, 0}, NULL, NULL }
- };
- 
---- a/usr/Kconfig
-+++ b/usr/Kconfig
-@@ -72,6 +72,15 @@ config RD_LZMA
- 	  Support loading of a LZMA encoded initial ramdisk or cpio buffer
- 	  If unsure, say N.
- 
-+config RD_LZO
-+	bool "Support initial ramdisks compressed using LZO" if EMBEDDED
-+	default !EMBEDDED
-+	depends on BLK_DEV_INITRD && HAVE_KERNEL_LZO
-+	select DECOMPRESS_LZO
-+	help
-+	  Support loading of a LZO encoded initial ramdisk or cpio buffer
-+	  If unsure, say N.
-+
- choice
- 	prompt "Built-in initramfs compression mode" if INITRAMFS_SOURCE!=""
- 	help
-@@ -108,16 +117,15 @@ config INITRAMFS_COMPRESSION_GZIP
- 	bool "Gzip"
- 	depends on RD_GZIP
- 	help
--	  The old and tried gzip compression. Its compression ratio is
--	  the poorest among the 3 choices; however its speed (both
--	  compression and decompression) is the fastest.
-+	  The old and tried gzip compression. It provides a good balance
-+	  between compression ratio and decompression speed.
- 
- config INITRAMFS_COMPRESSION_BZIP2
- 	bool "Bzip2"
- 	depends on RD_BZIP2
- 	help
- 	  Its compression ratio and speed is intermediate.
--	  Decompression speed is slowest among the three.  The initramfs
-+	  Decompression speed is slowest among the four.  The initramfs
- 	  size is about 10% smaller with bzip2, in comparison to gzip.
- 	  Bzip2 uses a large amount of memory. For modern kernels you
- 	  will need at least 8MB RAM or more for booting.
-@@ -128,7 +136,15 @@ config INITRAMFS_COMPRESSION_LZMA
- 	help
- 	  The most recent compression algorithm.
- 	  Its ratio is best, decompression speed is between the other
--	  two. Compression is slowest.	The initramfs size is about 33%
-+	  three. Compression is slowest. The initramfs size is about 33%
- 	  smaller with LZMA in comparison to gzip.
- 
-+config INITRAMFS_COMPRESSION_LZO
-+	bool "LZO"
-+	depends on RD_LZO
-+	help
-+	  Its compression ratio is the poorest among the four. The kernel
-+	  size is about about 10% bigger than gzip; however its speed
-+	  (both compression and decompression) is the fastest.
-+
- endchoice
diff --git a/target/linux/generic-2.6/patches-2.6.31/055-lzma_arm_kernel.patch b/target/linux/generic-2.6/patches-2.6.31/055-lzma_arm_kernel.patch
deleted file mode 100644
index a0111bd55..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/055-lzma_arm_kernel.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From d0f226a0f104c7d1da1d215b8013359273e39e18 Mon Sep 17 00:00:00 2001
-From: Albin Tonnerre <albin.tonnerre@free-electrons.com>
-Date: Fri, 16 Oct 2009 16:17:22 +0200
-Subject: [PATCH] Add LZMA decompression on ARM
-
-
-Signed-off-by: Albin Tonnerre <albin.tonnerre@free-electrons.com>
----
- arch/arm/Kconfig                      |    1 +
- arch/arm/boot/compressed/Makefile     |    1 +
- arch/arm/boot/compressed/misc.c       |    4 ++++
- arch/arm/boot/compressed/piggy.lzma.S |    6 ++++++
- 4 files changed, 12 insertions(+), 0 deletions(-)
- create mode 100644 arch/arm/boot/compressed/piggy.lzma.S
-
---- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -20,6 +20,7 @@ config ARM
- 	select HAVE_GENERIC_DMA_COHERENT
- 	select HAVE_KERNEL_GZIP
- 	select HAVE_KERNEL_LZO
-+	select HAVE_KERNEL_LZMA
- 	help
- 	  The ARM series is a line of low-power-consumption RISC chip designs
- 	  licensed by ARM Ltd and targeted at embedded applications and
---- a/arch/arm/boot/compressed/Makefile
-+++ b/arch/arm/boot/compressed/Makefile
-@@ -65,6 +65,7 @@ SEDFLAGS	= s/TEXT_START/$(ZTEXTADDR)/;s/
- 
- suffix_$(CONFIG_KERNEL_GZIP) = gzip
- suffix_$(CONFIG_KERNEL_LZO)  = lzo
-+suffix_$(CONFIG_KERNEL_LZMA)  = lzma
- 
- targets       := vmlinux vmlinux.lds \
- 		 piggy.$(suffix_y) piggy.$(suffix_y).o \
---- a/arch/arm/boot/compressed/misc.c
-+++ b/arch/arm/boot/compressed/misc.c
-@@ -237,6 +237,10 @@ static unsigned long free_mem_end_ptr;
- #include "../../../../lib/decompress_inflate.c"
- #endif
- 
-+#ifdef CONFIG_KERNEL_LZMA
-+#include "../../../../lib/decompress_unlzma.c"
-+#endif
-+
- #ifdef CONFIG_KERNEL_LZO
- #include "../../../../lib/decompress_unlzo.c"
- #endif
---- /dev/null
-+++ b/arch/arm/boot/compressed/piggy.lzma.S
-@@ -0,0 +1,6 @@
-+	.section .piggydata,#alloc
-+	.globl	input_data
-+input_data:
-+	.incbin	"arch/arm/boot/compressed/piggy.lzma"
-+	.globl	input_data_end
-+input_data_end:
diff --git a/target/linux/generic-2.6/patches-2.6.31/060-block2mtd_init.patch b/target/linux/generic-2.6/patches-2.6.31/060-block2mtd_init.patch
deleted file mode 100644
index 50df4aae0..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/060-block2mtd_init.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- a/drivers/mtd/devices/block2mtd.c
-+++ b/drivers/mtd/devices/block2mtd.c
-@@ -14,6 +14,7 @@
- #include <linux/list.h>
- #include <linux/init.h>
- #include <linux/mtd/mtd.h>
-+#include <linux/mtd/partitions.h>
- #include <linux/buffer_head.h>
- #include <linux/mutex.h>
- #include <linux/mount.h>
-@@ -232,10 +233,11 @@ static void block2mtd_free_device(struct
- 
- 
- /* FIXME: ensure that mtd->size % erase_size == 0 */
--static struct block2mtd_dev *add_device(char *devname, int erase_size)
-+static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname)
- {
- 	struct block_device *bdev;
- 	struct block2mtd_dev *dev;
-+	struct mtd_partition *part;
- 	char *name;
- 
- 	if (!devname)
-@@ -273,17 +275,17 @@ static struct block2mtd_dev *add_device(
- 
- 	mutex_init(&dev->write_mutex);
- 
--	/* Setup the MTD structure */
--	/* make the name contain the block device in */
--	name = kmalloc(sizeof("block2mtd: ") + strlen(devname) + 1,
--			GFP_KERNEL);
-+	if (!mtdname)
-+		mtdname = devname;
-+
-+	name = kmalloc(strlen(mtdname) + 1, GFP_KERNEL);
- 	if (!name)
- 		goto devinit_err;
- 
--	sprintf(name, "block2mtd: %s", devname);
-+	strcpy(name, mtdname);
- 	dev->mtd.name = name;
- 
--	dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK;
-+	dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK & ~(erase_size - 1);
- 	dev->mtd.erasesize = erase_size;
- 	dev->mtd.writesize = 1;
- 	dev->mtd.type = MTD_RAM;
-@@ -296,14 +298,17 @@ static struct block2mtd_dev *add_device(
- 	dev->mtd.priv = dev;
- 	dev->mtd.owner = THIS_MODULE;
- 
--	if (add_mtd_device(&dev->mtd)) {
-+	part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
-+	part->name = dev->mtd.name;
-+	part->offset = 0;
-+	part->size = dev->mtd.size;
-+	if (add_mtd_partitions(&dev->mtd, part, 1)) {
- 		/* Device didnt get added, so free the entry */
- 		goto devinit_err;
- 	}
- 	list_add(&dev->list, &blkmtd_device_list);
- 	INFO("mtd%d: [%s] erase_size = %dKiB [%d]", dev->mtd.index,
--			dev->mtd.name + strlen("block2mtd: "),
--			dev->mtd.erasesize >> 10, dev->mtd.erasesize);
-+			mtdname, dev->mtd.erasesize >> 10, dev->mtd.erasesize);
- 	return dev;
- 
- devinit_err:
-@@ -376,9 +381,9 @@ static char block2mtd_paramline[80 + 12]
- 
- static int block2mtd_setup2(const char *val)
- {
--	char buf[80 + 12]; /* 80 for device, 12 for erase size */
-+	char buf[80 + 12 + 80]; /* 80 for device, 12 for erase size, 80 for name */
- 	char *str = buf;
--	char *token[2];
-+	char *token[3];
- 	char *name;
- 	size_t erase_size = PAGE_SIZE;
- 	int i, ret;
-@@ -389,7 +394,7 @@ static int block2mtd_setup2(const char *
- 	strcpy(str, val);
- 	kill_final_newline(str);
- 
--	for (i = 0; i < 2; i++)
-+	for (i = 0; i < 3; i++)
- 		token[i] = strsep(&str, ",");
- 
- 	if (str)
-@@ -408,8 +413,10 @@ static int block2mtd_setup2(const char *
- 			parse_err("illegal erase size");
- 		}
- 	}
-+	if (token[2] && (strlen(token[2]) + 1 > 80))
-+		parse_err("mtd device name too long");
- 
--	add_device(name, erase_size);
-+	add_device(name, erase_size, token[2]);
- 
- 	return 0;
- }
-@@ -443,7 +450,7 @@ static int block2mtd_setup(const char *v
- 
- 
- module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
--MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>]\"");
-+MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>]]\"");
- 
- static int __init block2mtd_init(void)
- {
diff --git a/target/linux/generic-2.6/patches-2.6.31/065-rootfs_split.patch b/target/linux/generic-2.6/patches-2.6.31/065-rootfs_split.patch
deleted file mode 100644
index 7956baf9b..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/065-rootfs_split.patch
+++ /dev/null
@@ -1,625 +0,0 @@
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -53,6 +53,16 @@ config MTD_TESTS
- 	  should normally be compiled as kernel modules. The modules perform
- 	  various checks and verifications when loaded.
- 
-+config MTD_ROOTFS_ROOT_DEV
-+	bool "Automatically set 'rootfs' partition to be root filesystem"
-+	depends on MTD_PARTITIONS
-+	default y
-+
-+config MTD_ROOTFS_SPLIT
-+	bool "Automatically split 'rootfs' partition for squashfs"
-+	depends on MTD_PARTITIONS
-+	default y
-+
- config MTD_REDBOOT_PARTS
- 	tristate "RedBoot partition table parsing"
- 	depends on MTD_PARTITIONS
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -18,6 +18,8 @@
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
- #include <linux/mtd/compatmac.h>
-+#include <linux/root_dev.h>
-+#include <linux/magic.h>
- 
- /* Our partition linked list */
- static LIST_HEAD(mtd_partitions);
-@@ -35,7 +37,7 @@ struct mtd_part {
-  * the pointer to that structure with this macro.
-  */
- #define PART(x)  ((struct mtd_part *)(x))
--
-+#define IS_PART(mtd) (mtd->read == part_read)
- 
- /*
-  * MTD methods which simply translate the effective address and pass through
-@@ -502,6 +504,150 @@ out_register:
- 	return slave;
- }
- 
-+#ifdef CONFIG_MTD_ROOTFS_SPLIT
-+#define ROOTFS_SPLIT_NAME "rootfs_data"
-+#define ROOTFS_REMOVED_NAME "<removed>"
-+
-+struct squashfs_super_block {
-+	__le32 s_magic;
-+	__le32 pad0[9];
-+	__le64 bytes_used;
-+};
-+
-+
-+static int split_squashfs(struct mtd_info *master, int offset, int *split_offset)
-+{
-+	struct squashfs_super_block sb;
-+	int len, ret;
-+
-+	ret = master->read(master, offset, sizeof(sb), &len, (void *) &sb);
-+	if (ret || (len != sizeof(sb))) {
-+		printk(KERN_ALERT "split_squashfs: error occured while reading "
-+			"from \"%s\"\n", master->name);
-+		return -EINVAL;
-+	}
-+
-+	if (SQUASHFS_MAGIC != le32_to_cpu(sb.s_magic) ) {
-+		printk(KERN_ALERT "split_squashfs: no squashfs found in \"%s\"\n",
-+			master->name);
-+		*split_offset = 0;
-+		return 0;
-+	}
-+
-+	if (le64_to_cpu((sb.bytes_used)) <= 0) {
-+		printk(KERN_ALERT "split_squashfs: squashfs is empty in \"%s\"\n",
-+			master->name);
-+		*split_offset = 0;
-+		return 0;
-+	}
-+
-+	len = (u32) le64_to_cpu(sb.bytes_used);
-+	len += (offset & 0x000fffff);
-+	len +=  (master->erasesize - 1);
-+	len &= ~(master->erasesize - 1);
-+	len -= (offset & 0x000fffff);
-+	*split_offset = offset + len;
-+
-+	return 0;
-+}
-+
-+static int split_rootfs_data(struct mtd_info *master, struct mtd_info *rpart, const struct mtd_partition *part)
-+{
-+	struct mtd_partition *dpart;
-+	struct mtd_part *slave = NULL;
-+	int split_offset = 0;
-+	int ret;
-+
-+	ret = split_squashfs(master, part->offset, &split_offset);
-+	if (ret)
-+		return ret;
-+
-+	if (split_offset <= 0)
-+		return 0;
-+
-+	dpart = kmalloc(sizeof(*part)+sizeof(ROOTFS_SPLIT_NAME)+1, GFP_KERNEL);
-+	if (dpart == NULL) {
-+		printk(KERN_INFO "split_squashfs: no memory for partition \"%s\"\n",
-+			ROOTFS_SPLIT_NAME);
-+		return -ENOMEM;
-+	}
-+
-+	memcpy(dpart, part, sizeof(*part));
-+	dpart->name = (unsigned char *)&dpart[1];
-+	strcpy(dpart->name, ROOTFS_SPLIT_NAME);
-+
-+	dpart->size -= split_offset - dpart->offset;
-+	dpart->offset = split_offset;
-+
-+	if (dpart == NULL)
-+		return 1;
-+
-+	printk(KERN_INFO "mtd: partition \"%s\" created automatically, ofs=%llX, len=%llX \n",
-+		ROOTFS_SPLIT_NAME, dpart->offset, dpart->size);
-+
-+	slave = add_one_partition(master, dpart, 0, split_offset);
-+	if (!slave) {
-+		kfree(dpart);
-+		return -ENOMEM;
-+	}
-+	rpart->split = &slave->mtd;
-+
-+	return 0;
-+}
-+
-+static int refresh_rootfs_split(struct mtd_info *mtd)
-+{
-+	struct mtd_partition tpart;
-+	struct mtd_part *part;
-+	char *name;
-+	//int index = 0;
-+	int offset, size;
-+	int ret;
-+
-+	part = PART(mtd);
-+
-+	/* check for the new squashfs offset first */
-+	ret = split_squashfs(part->master, part->offset, &offset);
-+	if (ret)
-+		return ret;
-+
-+	if ((offset > 0) && !mtd->split) {
-+		printk(KERN_INFO "%s: creating new split partition for \"%s\"\n", __func__, mtd->name);
-+		/* if we don't have a rootfs split partition, create a new one */
-+		tpart.name = (char *) mtd->name;
-+		tpart.size = mtd->size;
-+		tpart.offset = part->offset;
-+
-+		return split_rootfs_data(part->master, &part->mtd, &tpart);
-+	} else if ((offset > 0) && mtd->split) {
-+		/* update the offsets of the existing partition */
-+		size = mtd->size + part->offset - offset;
-+
-+		part = PART(mtd->split);
-+		part->offset = offset;
-+		part->mtd.size = size;
-+		printk(KERN_INFO "%s: %s partition \"" ROOTFS_SPLIT_NAME "\", offset: 0x%06x (0x%06x)\n",
-+			__func__, (!strcmp(part->mtd.name, ROOTFS_SPLIT_NAME) ? "updating" : "creating"),
-+			(u32) part->offset, (u32) part->mtd.size);
-+		name = kmalloc(sizeof(ROOTFS_SPLIT_NAME) + 1, GFP_KERNEL);
-+		strcpy(name, ROOTFS_SPLIT_NAME);
-+		part->mtd.name = name;
-+	} else if ((offset <= 0) && mtd->split) {
-+		printk(KERN_INFO "%s: removing partition \"%s\"\n", __func__, mtd->split->name);
-+
-+		/* mark existing partition as removed */
-+		part = PART(mtd->split);
-+		name = kmalloc(sizeof(ROOTFS_SPLIT_NAME) + 1, GFP_KERNEL);
-+		strcpy(name, ROOTFS_REMOVED_NAME);
-+		part->mtd.name = name;
-+		part->offset = 0;
-+		part->mtd.size = 0;
-+	}
-+
-+	return 0;
-+}
-+#endif /* CONFIG_MTD_ROOTFS_SPLIT */
-+
- /*
-  * This function, given a master MTD object and a partition table, creates
-  * and registers slave MTD objects which are bound to the master according to
-@@ -517,7 +663,7 @@ int add_mtd_partitions(struct mtd_info *
- {
- 	struct mtd_part *slave;
- 	uint64_t cur_offset = 0;
--	int i;
-+	int i, ret;
- 
- 	printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
- 
-@@ -525,6 +671,21 @@ int add_mtd_partitions(struct mtd_info *
- 		slave = add_one_partition(master, parts + i, i, cur_offset);
- 		if (!slave)
- 			return -ENOMEM;
-+
-+		if (!strcmp(parts[i].name, "rootfs")) {
-+#ifdef CONFIG_MTD_ROOTFS_ROOT_DEV
-+			if (ROOT_DEV == 0) {
-+				printk(KERN_NOTICE "mtd: partition \"rootfs\" "
-+					"set to be root filesystem\n");
-+				ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, slave->mtd.index);
-+			}
-+#endif
-+#ifdef CONFIG_MTD_ROOTFS_SPLIT
-+			ret = split_rootfs_data(master, &slave->mtd, &parts[i]);
-+			/* if (ret == 0)
-+				j++; */
-+#endif
-+		}
- 		cur_offset = slave->offset + slave->mtd.size;
- 	}
- 
-@@ -532,6 +693,32 @@ int add_mtd_partitions(struct mtd_info *
- }
- EXPORT_SYMBOL(add_mtd_partitions);
- 
-+int refresh_mtd_partitions(struct mtd_info *mtd)
-+{
-+	int ret = 0;
-+
-+	if (IS_PART(mtd)) {
-+		struct mtd_part *part;
-+		struct mtd_info *master;
-+
-+		part = PART(mtd);
-+		master = part->master;
-+		if (master->refresh_device)
-+			ret = master->refresh_device(master);
-+	}
-+
-+	if (!ret && mtd->refresh_device)
-+		ret = mtd->refresh_device(mtd);
-+
-+#ifdef CONFIG_MTD_ROOTFS_SPLIT
-+	if (!ret && IS_PART(mtd) && !strcmp(mtd->name, "rootfs"))
-+		refresh_rootfs_split(mtd);
-+#endif
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL_GPL(refresh_mtd_partitions);
-+
- static DEFINE_SPINLOCK(part_parser_lock);
- static LIST_HEAD(part_parsers);
- 
---- a/drivers/mtd/devices/block2mtd.c
-+++ b/drivers/mtd/devices/block2mtd.c
-@@ -29,6 +29,8 @@ struct block2mtd_dev {
- 	struct block_device *blkdev;
- 	struct mtd_info mtd;
- 	struct mutex write_mutex;
-+	rwlock_t bdev_mutex;
-+	char devname[0];
- };
- 
- 
-@@ -81,6 +83,12 @@ static int block2mtd_erase(struct mtd_in
- 	size_t len = instr->len;
- 	int err;
- 
-+	read_lock(&dev->bdev_mutex);
-+	if (!dev->blkdev) {
-+		err = -EINVAL;
-+		goto done;
-+	}
-+
- 	instr->state = MTD_ERASING;
- 	mutex_lock(&dev->write_mutex);
- 	err = _block2mtd_erase(dev, from, len);
-@@ -93,6 +101,10 @@ static int block2mtd_erase(struct mtd_in
- 
- 	instr->state = MTD_ERASE_DONE;
- 	mtd_erase_callback(instr);
-+
-+done:
-+	read_unlock(&dev->bdev_mutex);
-+
- 	return err;
- }
- 
-@@ -104,10 +116,14 @@ static int block2mtd_read(struct mtd_inf
- 	struct page *page;
- 	int index = from >> PAGE_SHIFT;
- 	int offset = from & (PAGE_SIZE-1);
--	int cpylen;
-+	int cpylen, err = 0;
-+
-+	read_lock(&dev->bdev_mutex);
-+	if (!dev->blkdev || (from > mtd->size)) {
-+		err = -EINVAL;
-+		goto done;
-+	}
- 
--	if (from > mtd->size)
--		return -EINVAL;
- 	if (from + len > mtd->size)
- 		len = mtd->size - from;
- 
-@@ -122,10 +138,14 @@ static int block2mtd_read(struct mtd_inf
- 		len = len - cpylen;
- 
- 		page = page_read(dev->blkdev->bd_inode->i_mapping, index);
--		if (!page)
--			return -ENOMEM;
--		if (IS_ERR(page))
--			return PTR_ERR(page);
-+		if (!page) {
-+			err = -ENOMEM;
-+			goto done;
-+		}
-+		if (IS_ERR(page)) {
-+			err = PTR_ERR(page);
-+			goto done;
-+		}
- 
- 		memcpy(buf, page_address(page) + offset, cpylen);
- 		page_cache_release(page);
-@@ -136,7 +156,10 @@ static int block2mtd_read(struct mtd_inf
- 		offset = 0;
- 		index++;
- 	}
--	return 0;
-+
-+done:
-+	read_unlock(&dev->bdev_mutex);
-+	return err;
- }
- 
- 
-@@ -188,12 +211,22 @@ static int block2mtd_write(struct mtd_in
- 		size_t *retlen, const u_char *buf)
- {
- 	struct block2mtd_dev *dev = mtd->priv;
--	int err;
-+	int err = 0;
-+
-+	read_lock(&dev->bdev_mutex);
-+	if (!dev->blkdev) {
-+		err = -EINVAL;
-+		goto done;
-+	}
- 
- 	if (!len)
--		return 0;
--	if (to >= mtd->size)
--		return -ENOSPC;
-+		goto done;
-+
-+	if (to >= mtd->size) {
-+		err = -ENOSPC;
-+		goto done;
-+	}
-+
- 	if (to + len > mtd->size)
- 		len = mtd->size - to;
- 
-@@ -202,6 +235,9 @@ static int block2mtd_write(struct mtd_in
- 	mutex_unlock(&dev->write_mutex);
- 	if (err > 0)
- 		err = 0;
-+
-+done:
-+	read_unlock(&dev->bdev_mutex);
- 	return err;
- }
- 
-@@ -210,52 +246,29 @@ static int block2mtd_write(struct mtd_in
- static void block2mtd_sync(struct mtd_info *mtd)
- {
- 	struct block2mtd_dev *dev = mtd->priv;
--	sync_blockdev(dev->blkdev);
--	return;
--}
--
--
--static void block2mtd_free_device(struct block2mtd_dev *dev)
--{
--	if (!dev)
--		return;
--
--	kfree(dev->mtd.name);
- 
--	if (dev->blkdev) {
--		invalidate_mapping_pages(dev->blkdev->bd_inode->i_mapping,
--					0, -1);
--		close_bdev_exclusive(dev->blkdev, FMODE_READ|FMODE_WRITE);
--	}
-+	read_lock(&dev->bdev_mutex);
-+	if (dev->blkdev)
-+		sync_blockdev(dev->blkdev);
-+	read_unlock(&dev->bdev_mutex);
- 
--	kfree(dev);
-+	return;
- }
- 
- 
--/* FIXME: ensure that mtd->size % erase_size == 0 */
--static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname)
-+static int _open_bdev(struct block2mtd_dev *dev)
- {
- 	struct block_device *bdev;
--	struct block2mtd_dev *dev;
--	struct mtd_partition *part;
--	char *name;
--
--	if (!devname)
--		return NULL;
--
--	dev = kzalloc(sizeof(struct block2mtd_dev), GFP_KERNEL);
--	if (!dev)
--		return NULL;
- 
- 	/* Get a handle on the device */
--	bdev = open_bdev_exclusive(devname, FMODE_READ|FMODE_WRITE, NULL);
-+	bdev = open_bdev_exclusive(dev->devname, FMODE_READ|FMODE_WRITE, NULL);
- #ifndef MODULE
- 	if (IS_ERR(bdev)) {
- 
- 		/* We might not have rootfs mounted at this point. Try
- 		   to resolve the device name by other means. */
- 
--		dev_t devt = name_to_dev_t(devname);
-+		dev_t devt = name_to_dev_t(dev->devname);
- 		if (devt) {
- 			bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
- 		}
-@@ -263,17 +276,98 @@ static struct block2mtd_dev *add_device(
- #endif
- 
- 	if (IS_ERR(bdev)) {
--		ERROR("error: cannot open device %s", devname);
--		goto devinit_err;
-+		ERROR("error: cannot open device %s", dev->devname);
-+		return 1;
- 	}
- 	dev->blkdev = bdev;
- 
- 	if (MAJOR(bdev->bd_dev) == MTD_BLOCK_MAJOR) {
- 		ERROR("attempting to use an MTD device as a block device");
--		goto devinit_err;
-+		return 1;
- 	}
- 
-+	return 0;
-+}
-+
-+static void _close_bdev(struct block2mtd_dev *dev)
-+{
-+	struct block_device *bdev;
-+
-+	if (!dev->blkdev)
-+		return;
-+
-+	bdev = dev->blkdev;
-+	invalidate_mapping_pages(dev->blkdev->bd_inode->i_mapping, 0, -1);
-+	close_bdev_exclusive(dev->blkdev, FMODE_READ|FMODE_WRITE);
-+	dev->blkdev = NULL;
-+}
-+
-+static void block2mtd_free_device(struct block2mtd_dev *dev)
-+{
-+	if (!dev)
-+		return;
-+
-+	kfree(dev->mtd.name);
-+	_close_bdev(dev);
-+	kfree(dev);
-+}
-+
-+
-+static int block2mtd_refresh(struct mtd_info *mtd)
-+{
-+	struct block2mtd_dev *dev = mtd->priv;
-+	struct block_device *bdev;
-+	dev_t devt;
-+	int err = 0;
-+
-+	/* no other mtd function can run at this point */
-+	write_lock(&dev->bdev_mutex);
-+
-+	/* get the device number for the whole disk */
-+	devt = MKDEV(MAJOR(dev->blkdev->bd_dev), 0);
-+
-+	/* close the old block device */
-+	_close_bdev(dev);
-+
-+	/* open the whole disk, issue a partition rescan, then */
-+	bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
-+	if (!bdev || !bdev->bd_disk)
-+		err = -EINVAL;
-+#ifndef CONFIG_MTD_BLOCK2MTD_MODULE
-+	else
-+		err = rescan_partitions(bdev->bd_disk, bdev);
-+#endif
-+	if (bdev)
-+		close_bdev_exclusive(bdev, FMODE_READ|FMODE_WRITE);
-+
-+	/* try to open the partition block device again */
-+	_open_bdev(dev);
-+	write_unlock(&dev->bdev_mutex);
-+
-+	return err;
-+}
-+
-+/* FIXME: ensure that mtd->size % erase_size == 0 */
-+static struct block2mtd_dev *add_device(char *devname, int erase_size, char *mtdname)
-+{
-+	struct block2mtd_dev *dev;
-+	struct mtd_partition *part;
-+	char *name;
-+
-+	if (!devname)
-+		return NULL;
-+
-+	dev = kzalloc(sizeof(struct block2mtd_dev) + strlen(devname) + 1, GFP_KERNEL);
-+	if (!dev)
-+		return NULL;
-+
-+	strcpy(dev->devname, devname);
-+
-+	if (_open_bdev(dev))
-+		goto devinit_err;
-+
- 	mutex_init(&dev->write_mutex);
-+	rwlock_init(&dev->bdev_mutex);
- 
- 	if (!mtdname)
- 		mtdname = devname;
-@@ -297,6 +391,7 @@ static struct block2mtd_dev *add_device(
- 	dev->mtd.read = block2mtd_read;
- 	dev->mtd.priv = dev;
- 	dev->mtd.owner = THIS_MODULE;
-+	dev->mtd.refresh_device = block2mtd_refresh;
- 
- 	part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
- 	part->name = dev->mtd.name;
---- a/drivers/mtd/mtdchar.c
-+++ b/drivers/mtd/mtdchar.c
-@@ -18,6 +18,7 @@
- 
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/compatmac.h>
-+#include <linux/mtd/partitions.h>
- 
- #include <asm/uaccess.h>
- 
-@@ -814,6 +815,13 @@ static int mtd_ioctl(struct inode *inode
- 		file->f_pos = 0;
- 		break;
- 	}
-+#ifdef CONFIG_MTD_PARTITIONS
-+	case MTDREFRESH:
-+	{
-+		ret = refresh_mtd_partitions(mtd);
-+		break;
-+	}
-+#endif
- 
- 	default:
- 		ret = -ENOTTY;
---- a/include/linux/mtd/mtd.h
-+++ b/include/linux/mtd/mtd.h
-@@ -101,6 +101,7 @@ struct mtd_oob_ops {
- 	uint8_t		*oobbuf;
- };
- 
-+struct mtd_info;
- struct mtd_info {
- 	u_char type;
- 	uint32_t flags;
-@@ -241,6 +242,9 @@ struct mtd_info {
- 	struct device dev;
- 	int usecount;
- 
-+	int (*refresh_device)(struct mtd_info *mtd);
-+	struct mtd_info *split;
-+
- 	/* If the driver is something smart, like UBI, it may need to maintain
- 	 * its own reference counting. The below functions are only for driver.
- 	 * The driver may register its callbacks. These callbacks are not
---- a/include/linux/mtd/partitions.h
-+++ b/include/linux/mtd/partitions.h
-@@ -34,12 +34,14 @@
-  * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
-  */
- 
-+struct mtd_partition;
- struct mtd_partition {
- 	char *name;			/* identifier string */
- 	uint64_t size;			/* partition size */
- 	uint64_t offset;		/* offset within the master MTD space */
- 	uint32_t mask_flags;		/* master MTD flags to mask out for this partition */
- 	struct nand_ecclayout *ecclayout;	/* out of band layout for this partition (NAND only)*/
-+	int (*refresh_partition)(struct mtd_info *);
- };
- 
- #define MTDPART_OFS_NXTBLK	(-2)
-@@ -51,6 +53,7 @@ struct mtd_info;
- 
- int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int);
- int del_mtd_partitions(struct mtd_info *);
-+int refresh_mtd_partitions(struct mtd_info *);
- 
- /*
-  * Functions dealing with the various ways of partitioning the space
---- a/include/mtd/mtd-abi.h
-+++ b/include/mtd/mtd-abi.h
-@@ -110,6 +110,7 @@ struct otp_info {
- #define MEMERASE64		_IOW('M', 20, struct erase_info_user64)
- #define MEMWRITEOOB64		_IOWR('M', 21, struct mtd_oob_buf64)
- #define MEMREADOOB64		_IOWR('M', 22, struct mtd_oob_buf64)
-+#define MTDREFRESH		_IO('M', 23)
- 
- /*
-  * Obsolete legacy interface. Keep it in order not to break userspace
diff --git a/target/linux/generic-2.6/patches-2.6.31/066-block2mtd_probe.patch b/target/linux/generic-2.6/patches-2.6.31/066-block2mtd_probe.patch
deleted file mode 100644
index b2b1a347f..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/066-block2mtd_probe.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/drivers/mtd/devices/block2mtd.c
-+++ b/drivers/mtd/devices/block2mtd.c
-@@ -268,6 +268,7 @@ static int _open_bdev(struct block2mtd_d
- 		/* We might not have rootfs mounted at this point. Try
- 		   to resolve the device name by other means. */
- 
-+		wait_for_device_probe();
- 		dev_t devt = name_to_dev_t(dev->devname);
- 		if (devt) {
- 			bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
diff --git a/target/linux/generic-2.6/patches-2.6.31/070-redboot_space.patch b/target/linux/generic-2.6/patches-2.6.31/070-redboot_space.patch
deleted file mode 100644
index 6ace83c01..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/070-redboot_space.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/drivers/mtd/redboot.c
-+++ b/drivers/mtd/redboot.c
-@@ -249,14 +249,21 @@ static int parse_redboot_partitions(stru
- #endif
- 		names += strlen(names)+1;
- 
--#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
- 		if(fl->next && fl->img->flash_base + fl->img->size + master->erasesize <= fl->next->img->flash_base) {
--			i++;
--			parts[i].offset = parts[i-1].size + parts[i-1].offset;
--			parts[i].size = fl->next->img->flash_base - parts[i].offset;
--			parts[i].name = nullname;
--		}
-+			if (!strcmp(parts[i].name, "rootfs")) {
-+				parts[i].size = fl->next->img->flash_base;
-+				parts[i].size &= ~(master->erasesize - 1);
-+				parts[i].size -= parts[i].offset;
-+#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
-+				nrparts--;
-+			} else {
-+				i++;
-+				parts[i].offset = parts[i-1].size + parts[i-1].offset;
-+				parts[i].size = fl->next->img->flash_base - parts[i].offset;
-+				parts[i].name = nullname;
- #endif
-+			}
-+		}
- 		tmp_fl = fl;
- 		fl = fl->next;
- 		kfree(tmp_fl);
diff --git a/target/linux/generic-2.6/patches-2.6.31/071-redboot_boardconfig.patch b/target/linux/generic-2.6/patches-2.6.31/071-redboot_boardconfig.patch
deleted file mode 100644
index f9bc4fe36..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/071-redboot_boardconfig.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/drivers/mtd/redboot.c
-+++ b/drivers/mtd/redboot.c
-@@ -11,6 +11,8 @@
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
- 
-+#define BOARD_CONFIG_PART		"boardconfig"
-+
- struct fis_image_desc {
-     unsigned char name[16];      // Null terminated name
-     uint32_t	  flash_base;    // Address within FLASH of image
-@@ -41,6 +43,7 @@ static int parse_redboot_partitions(stru
-                              struct mtd_partition **pparts,
-                              unsigned long fis_origin)
- {
-+	unsigned long max_offset = 0;
- 	int nrparts = 0;
- 	struct fis_image_desc *buf;
- 	struct mtd_partition *parts;
-@@ -209,14 +212,14 @@ static int parse_redboot_partitions(stru
- 		}
- 	}
- #endif
--	parts = kzalloc(sizeof(*parts)*nrparts + nulllen + namelen, GFP_KERNEL);
-+	parts = kzalloc(sizeof(*parts) * (nrparts + 1) + nulllen + namelen + sizeof(BOARD_CONFIG_PART), GFP_KERNEL);
- 
- 	if (!parts) {
- 		ret = -ENOMEM;
- 		goto out;
- 	}
- 
--	nullname = (char *)&parts[nrparts];
-+	nullname = (char *)&parts[nrparts + 1];
- #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
- 	if (nulllen > 0) {
- 		strcpy(nullname, nullstring);
-@@ -235,6 +238,8 @@ static int parse_redboot_partitions(stru
- 	}
- #endif
- 	for ( ; i<nrparts; i++) {
-+		if(max_offset < buf[i].flash_base + buf[i].size)
-+			max_offset = buf[i].flash_base + buf[i].size;
- 		parts[i].size = fl->img->size;
- 		parts[i].offset = fl->img->flash_base;
- 		parts[i].name = names;
-@@ -268,6 +273,14 @@ static int parse_redboot_partitions(stru
- 		fl = fl->next;
- 		kfree(tmp_fl);
- 	}
-+	if(master->size - max_offset >= master->erasesize)
-+	{
-+		parts[nrparts].size = master->size - max_offset;
-+		parts[nrparts].offset = max_offset;
-+		parts[nrparts].name = names;
-+		strcpy(names, BOARD_CONFIG_PART);
-+		nrparts++;
-+	}
- 	ret = nrparts;
- 	*pparts = parts;
-  out:
diff --git a/target/linux/generic-2.6/patches-2.6.31/080-mtd_plat_nand_chip_fixup.patch b/target/linux/generic-2.6/patches-2.6.31/080-mtd_plat_nand_chip_fixup.patch
deleted file mode 100644
index 2566151ef..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/080-mtd_plat_nand_chip_fixup.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/include/linux/mtd/nand.h
-+++ b/include/linux/mtd/nand.h
-@@ -575,6 +575,7 @@ struct platform_nand_chip {
- 	int			chip_delay;
- 	unsigned int		options;
- 	const char		**part_probe_types;
-+	int			(*chip_fixup)(struct mtd_info *mtd);
- 	void			(*set_parts)(uint64_t size,
- 					struct platform_nand_chip *chip);
- 	void			*priv;
---- a/drivers/mtd/nand/plat_nand.c
-+++ b/drivers/mtd/nand/plat_nand.c
-@@ -80,7 +80,18 @@ static int __devinit plat_nand_probe(str
- 	}
- 
- 	/* Scan to find existance of the device */
--	if (nand_scan(&data->mtd, 1)) {
-+	if (nand_scan_ident(&data->mtd, 1)) {
-+		res = -ENXIO;
-+		goto out;
-+	}
-+
-+	if (pdata->chip.chip_fixup) {
-+		res = pdata->chip.chip_fixup(&data->mtd);
-+		if (res)
-+			goto out;
-+	}
-+
-+	if (nand_scan_tail(&data->mtd)) {
- 		res = -ENXIO;
- 		goto out;
- 	}
diff --git a/target/linux/generic-2.6/patches-2.6.31/081-mtd_myloader_partition_parser.patch b/target/linux/generic-2.6/patches-2.6.31/081-mtd_myloader_partition_parser.patch
deleted file mode 100644
index 61b822ee8..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/081-mtd_myloader_partition_parser.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -181,6 +181,22 @@ config MTD_AR7_PARTS
- 	---help---
- 	  TI AR7 partitioning support
- 
-+config MTD_MYLOADER_PARTS
-+	tristate "MyLoader partition parsing"
-+	depends on MTD_PARTITIONS && (ADM5120 || ATHEROS_AR231X || ATHEROS_AR71XX)
-+	---help---
-+	  MyLoader is a bootloader which allows the user to define partitions
-+	  in flash devices, by putting a table in the second erase block
-+	  on the device, similar to a partition table. This table gives the 
-+	  offsets and lengths of the user defined partitions.
-+
-+	  If you need code which can detect and parse these tables, and
-+	  register MTD 'partitions' corresponding to each image detected,
-+	  enable this option.
-+
-+	  You will still need the parsing functions to be called by the driver
-+	  for your particular device. It won't happen automatically.
-+
- comment "User Modules And Translation Layers"
- 
- config MTD_CHAR
---- a/drivers/mtd/Makefile
-+++ b/drivers/mtd/Makefile
-@@ -13,6 +13,7 @@ obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdli
- obj-$(CONFIG_MTD_AFS_PARTS)	+= afs.o
- obj-$(CONFIG_MTD_AR7_PARTS)	+= ar7part.o
- obj-$(CONFIG_MTD_OF_PARTS)      += ofpart.o
-+obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
- 
- # 'Users' - code which presents functionality to userspace.
- obj-$(CONFIG_MTD_CHAR)		+= mtdchar.o
diff --git a/target/linux/generic-2.6/patches-2.6.31/082-mtd_info_move_forward_decl.patch b/target/linux/generic-2.6/patches-2.6.31/082-mtd_info_move_forward_decl.patch
deleted file mode 100644
index 13f0a217d..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/082-mtd_info_move_forward_decl.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/include/linux/mtd/partitions.h
-+++ b/include/linux/mtd/partitions.h
-@@ -33,6 +33,7 @@
-  * Note: writeable partitions require their size and offset be
-  * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
-  */
-+struct mtd_info;
- 
- struct mtd_partition;
- struct mtd_partition {
-@@ -49,7 +50,6 @@ struct mtd_partition {
- #define MTDPART_SIZ_FULL	(0)
- 
- 
--struct mtd_info;
- 
- int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int);
- int del_mtd_partitions(struct mtd_info *);
diff --git a/target/linux/generic-2.6/patches-2.6.31/090-mtd_fix_nand_correct_data_return_code.patch b/target/linux/generic-2.6/patches-2.6.31/090-mtd_fix_nand_correct_data_return_code.patch
deleted file mode 100644
index be2c7d732..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/090-mtd_fix_nand_correct_data_return_code.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/drivers/mtd/nand/nand_ecc.c
-+++ b/drivers/mtd/nand/nand_ecc.c
-@@ -492,8 +492,7 @@ int nand_correct_data(struct mtd_info *m
- 	if ((bitsperbyte[b0] + bitsperbyte[b1] + bitsperbyte[b2]) == 1)
- 		return 1;	/* error in ecc data; no action needed */
- 
--	printk(KERN_ERR "uncorrectable error : ");
--	return -1;
-+	return -EBADMSG;
- }
- EXPORT_SYMBOL(nand_correct_data);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.31/100-netfilter_layer7_2.21.patch b/target/linux/generic-2.6/patches-2.6.31/100-netfilter_layer7_2.21.patch
deleted file mode 100644
index b846f7855..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/100-netfilter_layer7_2.21.patch
+++ /dev/null
@@ -1,2132 +0,0 @@
---- /dev/null
-+++ b/include/linux/netfilter/xt_layer7.h
-@@ -0,0 +1,13 @@
-+#ifndef _XT_LAYER7_H
-+#define _XT_LAYER7_H
-+
-+#define MAX_PATTERN_LEN 8192
-+#define MAX_PROTOCOL_LEN 256
-+
-+struct xt_layer7_info {
-+    char protocol[MAX_PROTOCOL_LEN];
-+    char pattern[MAX_PATTERN_LEN];
-+    u_int8_t invert;
-+};
-+
-+#endif /* _XT_LAYER7_H */
---- a/include/net/netfilter/nf_conntrack.h
-+++ b/include/net/netfilter/nf_conntrack.h
-@@ -116,6 +116,22 @@ struct nf_conn {
- 	u_int32_t secmark;
- #endif
- 
-+#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || \
-+    defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
-+	struct {
-+		/*
-+		 * e.g. "http". NULL before decision. "unknown" after decision
-+		 * if no match.
-+		 */
-+		char *app_proto;
-+		/*
-+		 * application layer data so far. NULL after match decision.
-+		 */
-+		char *app_data;
-+		unsigned int app_data_len;
-+	} layer7;
-+#endif
-+
- 	/* Storage reserved for other modules: */
- 	union nf_conntrack_proto proto;
- 
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -858,6 +858,27 @@ config NETFILTER_XT_MATCH_STATE
- 
- 	  To compile it as a module, choose M here.  If unsure, say N.
- 
-+config NETFILTER_XT_MATCH_LAYER7
-+	tristate '"layer7" match support'
-+	depends on NETFILTER_XTABLES
-+	depends on EXPERIMENTAL && (IP_NF_CONNTRACK || NF_CONNTRACK)
-+       depends on NF_CT_ACCT
-+	help
-+	  Say Y if you want to be able to classify connections (and their
-+	  packets) based on regular expression matching of their application
-+	  layer data.   This is one way to classify applications such as
-+	  peer-to-peer filesharing systems that do not always use the same
-+	  port.
-+
-+	  To compile it as a module, choose M here.  If unsure, say N.
-+
-+config NETFILTER_XT_MATCH_LAYER7_DEBUG
-+        bool 'Layer 7 debugging output'
-+        depends on NETFILTER_XT_MATCH_LAYER7
-+        help
-+          Say Y to get lots of debugging output.
-+
-+
- config NETFILTER_XT_MATCH_STATISTIC
- 	tristate '"statistic" match support'
- 	depends on NETFILTER_ADVANCED
---- a/net/netfilter/Makefile
-+++ b/net/netfilter/Makefile
-@@ -89,6 +89,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) 
- obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
-+obj-$(CONFIG_NETFILTER_XT_MATCH_LAYER7) += xt_layer7.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_STATISTIC) += xt_statistic.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) += xt_string.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
---- a/net/netfilter/nf_conntrack_core.c
-+++ b/net/netfilter/nf_conntrack_core.c
-@@ -200,6 +200,14 @@ destroy_conntrack(struct nf_conntrack *n
- 	 * too. */
- 	nf_ct_remove_expectations(ct);
- 
-+	#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
-+	if(ct->layer7.app_proto)
-+		kfree(ct->layer7.app_proto);
-+	if(ct->layer7.app_data)
-+	kfree(ct->layer7.app_data);
-+	#endif
-+
-+
- 	/* We overload first tuple to link into unconfirmed list. */
- 	if (!nf_ct_is_confirmed(ct)) {
- 		BUG_ON(hlist_nulls_unhashed(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnnode));
---- a/net/netfilter/nf_conntrack_standalone.c
-+++ b/net/netfilter/nf_conntrack_standalone.c
-@@ -171,6 +171,12 @@ static int ct_seq_show(struct seq_file *
- 		goto release;
- #endif
- 
-+#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
-+	if(ct->layer7.app_proto &&
-+           seq_printf(s, "l7proto=%s ", ct->layer7.app_proto))
-+		return -ENOSPC;
-+#endif
-+
- 	if (seq_printf(s, "use=%u\n", atomic_read(&ct->ct_general.use)))
- 		goto release;
- 
---- /dev/null
-+++ b/net/netfilter/regexp/regexp.c
-@@ -0,0 +1,1197 @@
-+/*
-+ * regcomp and regexec -- regsub and regerror are elsewhere
-+ * @(#)regexp.c	1.3 of 18 April 87
-+ *
-+ *	Copyright (c) 1986 by University of Toronto.
-+ *	Written by Henry Spencer.  Not derived from licensed software.
-+ *
-+ *	Permission is granted to anyone to use this software for any
-+ *	purpose on any computer system, and to redistribute it freely,
-+ *	subject to the following restrictions:
-+ *
-+ *	1. The author is not responsible for the consequences of use of
-+ *		this software, no matter how awful, even if they arise
-+ *		from defects in it.
-+ *
-+ *	2. The origin of this software must not be misrepresented, either
-+ *		by explicit claim or by omission.
-+ *
-+ *	3. Altered versions must be plainly marked as such, and must not
-+ *		be misrepresented as being the original software.
-+ *
-+ * Beware that some of this code is subtly aware of the way operator
-+ * precedence is structured in regular expressions.  Serious changes in
-+ * regular-expression syntax might require a total rethink.
-+ *
-+ * This code was modified by Ethan Sommer to work within the kernel
-+ * (it now uses kmalloc etc..)
-+ *
-+ * Modified slightly by Matthew Strait to use more modern C.
-+ */
-+
-+#include "regexp.h"
-+#include "regmagic.h"
-+
-+/* added by ethan and matt.  Lets it work in both kernel and user space.
-+(So iptables can use it, for instance.)  Yea, it goes both ways... */
-+#if __KERNEL__
-+  #define malloc(foo) kmalloc(foo,GFP_ATOMIC)
-+#else
-+  #define printk(format,args...) printf(format,##args)
-+#endif
-+
-+void regerror(char * s)
-+{
-+        printk("<3>Regexp: %s\n", s);
-+        /* NOTREACHED */
-+}
-+
-+/*
-+ * The "internal use only" fields in regexp.h are present to pass info from
-+ * compile to execute that permits the execute phase to run lots faster on
-+ * simple cases.  They are:
-+ *
-+ * regstart	char that must begin a match; '\0' if none obvious
-+ * reganch	is the match anchored (at beginning-of-line only)?
-+ * regmust	string (pointer into program) that match must include, or NULL
-+ * regmlen	length of regmust string
-+ *
-+ * Regstart and reganch permit very fast decisions on suitable starting points
-+ * for a match, cutting down the work a lot.  Regmust permits fast rejection
-+ * of lines that cannot possibly match.  The regmust tests are costly enough
-+ * that regcomp() supplies a regmust only if the r.e. contains something
-+ * potentially expensive (at present, the only such thing detected is * or +
-+ * at the start of the r.e., which can involve a lot of backup).  Regmlen is
-+ * supplied because the test in regexec() needs it and regcomp() is computing
-+ * it anyway.
-+ */
-+
-+/*
-+ * Structure for regexp "program".  This is essentially a linear encoding
-+ * of a nondeterministic finite-state machine (aka syntax charts or
-+ * "railroad normal form" in parsing technology).  Each node is an opcode
-+ * plus a "next" pointer, possibly plus an operand.  "Next" pointers of
-+ * all nodes except BRANCH implement concatenation; a "next" pointer with
-+ * a BRANCH on both ends of it is connecting two alternatives.  (Here we
-+ * have one of the subtle syntax dependencies:  an individual BRANCH (as
-+ * opposed to a collection of them) is never concatenated with anything
-+ * because of operator precedence.)  The operand of some types of node is
-+ * a literal string; for others, it is a node leading into a sub-FSM.  In
-+ * particular, the operand of a BRANCH node is the first node of the branch.
-+ * (NB this is *not* a tree structure:  the tail of the branch connects
-+ * to the thing following the set of BRANCHes.)  The opcodes are:
-+ */
-+
-+/* definition	number	opnd?	meaning */
-+#define	END	0	/* no	End of program. */
-+#define	BOL	1	/* no	Match "" at beginning of line. */
-+#define	EOL	2	/* no	Match "" at end of line. */
-+#define	ANY	3	/* no	Match any one character. */
-+#define	ANYOF	4	/* str	Match any character in this string. */
-+#define	ANYBUT	5	/* str	Match any character not in this string. */
-+#define	BRANCH	6	/* node	Match this alternative, or the next... */
-+#define	BACK	7	/* no	Match "", "next" ptr points backward. */
-+#define	EXACTLY	8	/* str	Match this string. */
-+#define	NOTHING	9	/* no	Match empty string. */
-+#define	STAR	10	/* node	Match this (simple) thing 0 or more times. */
-+#define	PLUS	11	/* node	Match this (simple) thing 1 or more times. */
-+#define	OPEN	20	/* no	Mark this point in input as start of #n. */
-+			/*	OPEN+1 is number 1, etc. */
-+#define	CLOSE	30	/* no	Analogous to OPEN. */
-+
-+/*
-+ * Opcode notes:
-+ *
-+ * BRANCH	The set of branches constituting a single choice are hooked
-+ *		together with their "next" pointers, since precedence prevents
-+ *		anything being concatenated to any individual branch.  The
-+ *		"next" pointer of the last BRANCH in a choice points to the
-+ *		thing following the whole choice.  This is also where the
-+ *		final "next" pointer of each individual branch points; each
-+ *		branch starts with the operand node of a BRANCH node.
-+ *
-+ * BACK		Normal "next" pointers all implicitly point forward; BACK
-+ *		exists to make loop structures possible.
-+ *
-+ * STAR,PLUS	'?', and complex '*' and '+', are implemented as circular
-+ *		BRANCH structures using BACK.  Simple cases (one character
-+ *		per match) are implemented with STAR and PLUS for speed
-+ *		and to minimize recursive plunges.
-+ *
-+ * OPEN,CLOSE	...are numbered at compile time.
-+ */
-+
-+/*
-+ * A node is one char of opcode followed by two chars of "next" pointer.
-+ * "Next" pointers are stored as two 8-bit pieces, high order first.  The
-+ * value is a positive offset from the opcode of the node containing it.
-+ * An operand, if any, simply follows the node.  (Note that much of the
-+ * code generation knows about this implicit relationship.)
-+ *
-+ * Using two bytes for the "next" pointer is vast overkill for most things,
-+ * but allows patterns to get big without disasters.
-+ */
-+#define	OP(p)	(*(p))
-+#define	NEXT(p)	(((*((p)+1)&0377)<<8) + (*((p)+2)&0377))
-+#define	OPERAND(p)	((p) + 3)
-+
-+/*
-+ * See regmagic.h for one further detail of program structure.
-+ */
-+
-+
-+/*
-+ * Utility definitions.
-+ */
-+#ifndef CHARBITS
-+#define	UCHARAT(p)	((int)*(unsigned char *)(p))
-+#else
-+#define	UCHARAT(p)	((int)*(p)&CHARBITS)
-+#endif
-+
-+#define	FAIL(m)	{ regerror(m); return(NULL); }
-+#define	ISMULT(c)	((c) == '*' || (c) == '+' || (c) == '?')
-+#define	META	"^$.[()|?+*\\"
-+
-+/*
-+ * Flags to be passed up and down.
-+ */
-+#define	HASWIDTH	01	/* Known never to match null string. */
-+#define	SIMPLE		02	/* Simple enough to be STAR/PLUS operand. */
-+#define	SPSTART		04	/* Starts with * or +. */
-+#define	WORST		0	/* Worst case. */
-+
-+/*
-+ * Global work variables for regcomp().
-+ */
-+struct match_globals {
-+char *reginput;		/* String-input pointer. */
-+char *regbol;		/* Beginning of input, for ^ check. */
-+char **regstartp;	/* Pointer to startp array. */
-+char **regendp;		/* Ditto for endp. */
-+char *regparse;		/* Input-scan pointer. */
-+int regnpar;		/* () count. */
-+char regdummy;
-+char *regcode;		/* Code-emit pointer; &regdummy = don't. */
-+long regsize;		/* Code size. */
-+};
-+
-+/*
-+ * Forward declarations for regcomp()'s friends.
-+ */
-+#ifndef STATIC
-+#define	STATIC	static
-+#endif
-+STATIC char *reg(struct match_globals *g, int paren,int *flagp);
-+STATIC char *regbranch(struct match_globals *g, int *flagp);
-+STATIC char *regpiece(struct match_globals *g, int *flagp);
-+STATIC char *regatom(struct match_globals *g, int *flagp);
-+STATIC char *regnode(struct match_globals *g, char op);
-+STATIC char *regnext(struct match_globals *g, char *p);
-+STATIC void regc(struct match_globals *g, char b);
-+STATIC void reginsert(struct match_globals *g, char op, char *opnd);
-+STATIC void regtail(struct match_globals *g, char *p, char *val);
-+STATIC void regoptail(struct match_globals *g, char *p, char *val);
-+
-+
-+__kernel_size_t my_strcspn(const char *s1,const char *s2)
-+{
-+        char *scan1;
-+        char *scan2;
-+        int count;
-+
-+        count = 0;
-+        for (scan1 = (char *)s1; *scan1 != '\0'; scan1++) {
-+                for (scan2 = (char *)s2; *scan2 != '\0';)       /* ++ moved down. */
-+                        if (*scan1 == *scan2++)
-+                                return(count);
-+                count++;
-+        }
-+        return(count);
-+}
-+
-+/*
-+ - regcomp - compile a regular expression into internal code
-+ *
-+ * We can't allocate space until we know how big the compiled form will be,
-+ * but we can't compile it (and thus know how big it is) until we've got a
-+ * place to put the code.  So we cheat:  we compile it twice, once with code
-+ * generation turned off and size counting turned on, and once "for real".
-+ * This also means that we don't allocate space until we are sure that the
-+ * thing really will compile successfully, and we never have to move the
-+ * code and thus invalidate pointers into it.  (Note that it has to be in
-+ * one piece because free() must be able to free it all.)
-+ *
-+ * Beware that the optimization-preparation code in here knows about some
-+ * of the structure of the compiled regexp.
-+ */
-+regexp *
-+regcomp(char *exp,int *patternsize)
-+{
-+	register regexp *r;
-+	register char *scan;
-+	register char *longest;
-+	register int len;
-+	int flags;
-+	struct match_globals g;
-+	
-+	/* commented out by ethan
-+	   extern char *malloc();
-+	*/
-+
-+	if (exp == NULL)
-+		FAIL("NULL argument");
-+
-+	/* First pass: determine size, legality. */
-+	g.regparse = exp;
-+	g.regnpar = 1;
-+	g.regsize = 0L;
-+	g.regcode = &g.regdummy;
-+	regc(&g, MAGIC);
-+	if (reg(&g, 0, &flags) == NULL)
-+		return(NULL);
-+
-+	/* Small enough for pointer-storage convention? */
-+	if (g.regsize >= 32767L)		/* Probably could be 65535L. */
-+		FAIL("regexp too big");
-+
-+	/* Allocate space. */
-+	*patternsize=sizeof(regexp) + (unsigned)g.regsize;
-+	r = (regexp *)malloc(sizeof(regexp) + (unsigned)g.regsize);
-+	if (r == NULL)
-+		FAIL("out of space");
-+
-+	/* Second pass: emit code. */
-+	g.regparse = exp;
-+	g.regnpar = 1;
-+	g.regcode = r->program;
-+	regc(&g, MAGIC);
-+	if (reg(&g, 0, &flags) == NULL)
-+		return(NULL);
-+
-+	/* Dig out information for optimizations. */
-+	r->regstart = '\0';	/* Worst-case defaults. */
-+	r->reganch = 0;
-+	r->regmust = NULL;
-+	r->regmlen = 0;
-+	scan = r->program+1;			/* First BRANCH. */
-+	if (OP(regnext(&g, scan)) == END) {		/* Only one top-level choice. */
-+		scan = OPERAND(scan);
-+
-+		/* Starting-point info. */
-+		if (OP(scan) == EXACTLY)
-+			r->regstart = *OPERAND(scan);
-+		else if (OP(scan) == BOL)
-+			r->reganch++;
-+
-+		/*
-+		 * If there's something expensive in the r.e., find the
-+		 * longest literal string that must appear and make it the
-+		 * regmust.  Resolve ties in favor of later strings, since
-+		 * the regstart check works with the beginning of the r.e.
-+		 * and avoiding duplication strengthens checking.  Not a
-+		 * strong reason, but sufficient in the absence of others.
-+		 */
-+		if (flags&SPSTART) {
-+			longest = NULL;
-+			len = 0;
-+			for (; scan != NULL; scan = regnext(&g, scan))
-+				if (OP(scan) == EXACTLY && strlen(OPERAND(scan)) >= len) {
-+					longest = OPERAND(scan);
-+					len = strlen(OPERAND(scan));
-+				}
-+			r->regmust = longest;
-+			r->regmlen = len;
-+		}
-+	}
-+
-+	return(r);
-+}
-+
-+/*
-+ - reg - regular expression, i.e. main body or parenthesized thing
-+ *
-+ * Caller must absorb opening parenthesis.
-+ *
-+ * Combining parenthesis handling with the base level of regular expression
-+ * is a trifle forced, but the need to tie the tails of the branches to what
-+ * follows makes it hard to avoid.
-+ */
-+static char *
-+reg(struct match_globals *g, int paren, int *flagp /* Parenthesized? */ )
-+{
-+	register char *ret;
-+	register char *br;
-+	register char *ender;
-+	register int parno = 0; /* 0 makes gcc happy */
-+	int flags;
-+
-+	*flagp = HASWIDTH;	/* Tentatively. */
-+
-+	/* Make an OPEN node, if parenthesized. */
-+	if (paren) {
-+		if (g->regnpar >= NSUBEXP)
-+			FAIL("too many ()");
-+		parno = g->regnpar;
-+		g->regnpar++;
-+		ret = regnode(g, OPEN+parno);
-+	} else
-+		ret = NULL;
-+
-+	/* Pick up the branches, linking them together. */
-+	br = regbranch(g, &flags);
-+	if (br == NULL)
-+		return(NULL);
-+	if (ret != NULL)
-+		regtail(g, ret, br);	/* OPEN -> first. */
-+	else
-+		ret = br;
-+	if (!(flags&HASWIDTH))
-+		*flagp &= ~HASWIDTH;
-+	*flagp |= flags&SPSTART;
-+	while (*g->regparse == '|') {
-+		g->regparse++;
-+		br = regbranch(g, &flags);
-+		if (br == NULL)
-+			return(NULL);
-+		regtail(g, ret, br);	/* BRANCH -> BRANCH. */
-+		if (!(flags&HASWIDTH))
-+			*flagp &= ~HASWIDTH;
-+		*flagp |= flags&SPSTART;
-+	}
-+
-+	/* Make a closing node, and hook it on the end. */
-+	ender = regnode(g, (paren) ? CLOSE+parno : END);	
-+	regtail(g, ret, ender);
-+
-+	/* Hook the tails of the branches to the closing node. */
-+	for (br = ret; br != NULL; br = regnext(g, br))
-+		regoptail(g, br, ender);
-+
-+	/* Check for proper termination. */
-+	if (paren && *g->regparse++ != ')') {
-+		FAIL("unmatched ()");
-+	} else if (!paren && *g->regparse != '\0') {
-+		if (*g->regparse == ')') {
-+			FAIL("unmatched ()");
-+		} else
-+			FAIL("junk on end");	/* "Can't happen". */
-+		/* NOTREACHED */
-+	}
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regbranch - one alternative of an | operator
-+ *
-+ * Implements the concatenation operator.
-+ */
-+static char *
-+regbranch(struct match_globals *g, int *flagp)
-+{
-+	register char *ret;
-+	register char *chain;
-+	register char *latest;
-+	int flags;
-+
-+	*flagp = WORST;		/* Tentatively. */
-+
-+	ret = regnode(g, BRANCH);
-+	chain = NULL;
-+	while (*g->regparse != '\0' && *g->regparse != '|' && *g->regparse != ')') {
-+		latest = regpiece(g, &flags);
-+		if (latest == NULL)
-+			return(NULL);
-+		*flagp |= flags&HASWIDTH;
-+		if (chain == NULL)	/* First piece. */
-+			*flagp |= flags&SPSTART;
-+		else
-+			regtail(g, chain, latest);
-+		chain = latest;
-+	}
-+	if (chain == NULL)	/* Loop ran zero times. */
-+		(void) regnode(g, NOTHING);
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regpiece - something followed by possible [*+?]
-+ *
-+ * Note that the branching code sequences used for ? and the general cases
-+ * of * and + are somewhat optimized:  they use the same NOTHING node as
-+ * both the endmarker for their branch list and the body of the last branch.
-+ * It might seem that this node could be dispensed with entirely, but the
-+ * endmarker role is not redundant.
-+ */
-+static char *
-+regpiece(struct match_globals *g, int *flagp)
-+{
-+	register char *ret;
-+	register char op;
-+	register char *next;
-+	int flags;
-+
-+	ret = regatom(g, &flags);
-+	if (ret == NULL)
-+		return(NULL);
-+
-+	op = *g->regparse;
-+	if (!ISMULT(op)) {
-+		*flagp = flags;
-+		return(ret);
-+	}
-+
-+	if (!(flags&HASWIDTH) && op != '?')
-+		FAIL("*+ operand could be empty");
-+	*flagp = (op != '+') ? (WORST|SPSTART) : (WORST|HASWIDTH);
-+
-+	if (op == '*' && (flags&SIMPLE))
-+		reginsert(g, STAR, ret);
-+	else if (op == '*') {
-+		/* Emit x* as (x&|), where & means "self". */
-+		reginsert(g, BRANCH, ret);			/* Either x */
-+		regoptail(g, ret, regnode(g, BACK));		/* and loop */
-+		regoptail(g, ret, ret);			/* back */
-+		regtail(g, ret, regnode(g, BRANCH));		/* or */
-+		regtail(g, ret, regnode(g, NOTHING));		/* null. */
-+	} else if (op == '+' && (flags&SIMPLE))
-+		reginsert(g, PLUS, ret);
-+	else if (op == '+') {
-+		/* Emit x+ as x(&|), where & means "self". */
-+		next = regnode(g, BRANCH);			/* Either */
-+		regtail(g, ret, next);
-+		regtail(g, regnode(g, BACK), ret);		/* loop back */
-+		regtail(g, next, regnode(g, BRANCH));		/* or */
-+		regtail(g, ret, regnode(g, NOTHING));		/* null. */
-+	} else if (op == '?') {
-+		/* Emit x? as (x|) */
-+		reginsert(g, BRANCH, ret);			/* Either x */
-+		regtail(g, ret, regnode(g, BRANCH));		/* or */
-+		next = regnode(g, NOTHING);		/* null. */
-+		regtail(g, ret, next);
-+		regoptail(g, ret, next);
-+	}
-+	g->regparse++;
-+	if (ISMULT(*g->regparse))
-+		FAIL("nested *?+");
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regatom - the lowest level
-+ *
-+ * Optimization:  gobbles an entire sequence of ordinary characters so that
-+ * it can turn them into a single node, which is smaller to store and
-+ * faster to run.  Backslashed characters are exceptions, each becoming a
-+ * separate node; the code is simpler that way and it's not worth fixing.
-+ */
-+static char *
-+regatom(struct match_globals *g, int *flagp)
-+{
-+	register char *ret;
-+	int flags;
-+
-+	*flagp = WORST;		/* Tentatively. */
-+
-+	switch (*g->regparse++) {
-+	case '^':
-+		ret = regnode(g, BOL);
-+		break;
-+	case '$':
-+		ret = regnode(g, EOL);
-+		break;
-+	case '.':
-+		ret = regnode(g, ANY);
-+		*flagp |= HASWIDTH|SIMPLE;
-+		break;
-+	case '[': {
-+			register int class;
-+			register int classend;
-+
-+			if (*g->regparse == '^') {	/* Complement of range. */
-+				ret = regnode(g, ANYBUT);
-+				g->regparse++;
-+			} else
-+				ret = regnode(g, ANYOF);
-+			if (*g->regparse == ']' || *g->regparse == '-')
-+				regc(g, *g->regparse++);
-+			while (*g->regparse != '\0' && *g->regparse != ']') {
-+				if (*g->regparse == '-') {
-+					g->regparse++;
-+					if (*g->regparse == ']' || *g->regparse == '\0')
-+						regc(g, '-');
-+					else {
-+						class = UCHARAT(g->regparse-2)+1;
-+						classend = UCHARAT(g->regparse);
-+						if (class > classend+1)
-+							FAIL("invalid [] range");
-+						for (; class <= classend; class++)
-+							regc(g, class);
-+						g->regparse++;
-+					}
-+				} else
-+					regc(g, *g->regparse++);
-+			}
-+			regc(g, '\0');
-+			if (*g->regparse != ']')
-+				FAIL("unmatched []");
-+			g->regparse++;
-+			*flagp |= HASWIDTH|SIMPLE;
-+		}
-+		break;
-+	case '(':
-+		ret = reg(g, 1, &flags);
-+		if (ret == NULL)
-+			return(NULL);
-+		*flagp |= flags&(HASWIDTH|SPSTART);
-+		break;
-+	case '\0':
-+	case '|':
-+	case ')':
-+		FAIL("internal urp");	/* Supposed to be caught earlier. */
-+		break;
-+	case '?':
-+	case '+':
-+	case '*':
-+		FAIL("?+* follows nothing");
-+		break;
-+	case '\\':
-+		if (*g->regparse == '\0')
-+			FAIL("trailing \\");
-+		ret = regnode(g, EXACTLY);
-+		regc(g, *g->regparse++);
-+		regc(g, '\0');
-+		*flagp |= HASWIDTH|SIMPLE;
-+		break;
-+	default: {
-+			register int len;
-+			register char ender;
-+
-+			g->regparse--;
-+			len = my_strcspn((const char *)g->regparse, (const char *)META);
-+			if (len <= 0)
-+				FAIL("internal disaster");
-+			ender = *(g->regparse+len);
-+			if (len > 1 && ISMULT(ender))
-+				len--;		/* Back off clear of ?+* operand. */
-+			*flagp |= HASWIDTH;
-+			if (len == 1)
-+				*flagp |= SIMPLE;
-+			ret = regnode(g, EXACTLY);
-+			while (len > 0) {
-+				regc(g, *g->regparse++);
-+				len--;
-+			}
-+			regc(g, '\0');
-+		}
-+		break;
-+	}
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regnode - emit a node
-+ */
-+static char *			/* Location. */
-+regnode(struct match_globals *g, char op)
-+{
-+	register char *ret;
-+	register char *ptr;
-+
-+	ret = g->regcode;
-+	if (ret == &g->regdummy) {
-+		g->regsize += 3;
-+		return(ret);
-+	}
-+
-+	ptr = ret;
-+	*ptr++ = op;
-+	*ptr++ = '\0';		/* Null "next" pointer. */
-+	*ptr++ = '\0';
-+	g->regcode = ptr;
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regc - emit (if appropriate) a byte of code
-+ */
-+static void
-+regc(struct match_globals *g, char b)
-+{
-+	if (g->regcode != &g->regdummy)
-+		*g->regcode++ = b;
-+	else
-+		g->regsize++;
-+}
-+
-+/*
-+ - reginsert - insert an operator in front of already-emitted operand
-+ *
-+ * Means relocating the operand.
-+ */
-+static void
-+reginsert(struct match_globals *g, char op, char* opnd)
-+{
-+	register char *src;
-+	register char *dst;
-+	register char *place;
-+
-+	if (g->regcode == &g->regdummy) {
-+		g->regsize += 3;
-+		return;
-+	}
-+
-+	src = g->regcode;
-+	g->regcode += 3;
-+	dst = g->regcode;
-+	while (src > opnd)
-+		*--dst = *--src;
-+
-+	place = opnd;		/* Op node, where operand used to be. */
-+	*place++ = op;
-+	*place++ = '\0';
-+	*place++ = '\0';
-+}
-+
-+/*
-+ - regtail - set the next-pointer at the end of a node chain
-+ */
-+static void
-+regtail(struct match_globals *g, char *p, char *val)
-+{
-+	register char *scan;
-+	register char *temp;
-+	register int offset;
-+
-+	if (p == &g->regdummy)
-+		return;
-+
-+	/* Find last node. */
-+	scan = p;
-+	for (;;) {
-+		temp = regnext(g, scan);
-+		if (temp == NULL)
-+			break;
-+		scan = temp;
-+	}
-+
-+	if (OP(scan) == BACK)
-+		offset = scan - val;
-+	else
-+		offset = val - scan;
-+	*(scan+1) = (offset>>8)&0377;
-+	*(scan+2) = offset&0377;
-+}
-+
-+/*
-+ - regoptail - regtail on operand of first argument; nop if operandless
-+ */
-+static void
-+regoptail(struct match_globals *g, char *p, char *val)
-+{
-+	/* "Operandless" and "op != BRANCH" are synonymous in practice. */
-+	if (p == NULL || p == &g->regdummy || OP(p) != BRANCH)
-+		return;
-+	regtail(g, OPERAND(p), val);
-+}
-+
-+/*
-+ * regexec and friends
-+ */
-+
-+
-+/*
-+ * Forwards.
-+ */
-+STATIC int regtry(struct match_globals *g, regexp *prog, char *string);
-+STATIC int regmatch(struct match_globals *g, char *prog);
-+STATIC int regrepeat(struct match_globals *g, char *p);
-+
-+#ifdef DEBUG
-+int regnarrate = 0;
-+void regdump();
-+STATIC char *regprop(char *op);
-+#endif
-+
-+/*
-+ - regexec - match a regexp against a string
-+ */
-+int
-+regexec(regexp *prog, char *string)
-+{
-+	register char *s;
-+	struct match_globals g;
-+
-+	/* Be paranoid... */
-+	if (prog == NULL || string == NULL) {
-+		printk("<3>Regexp: NULL parameter\n");
-+		return(0);
-+	}
-+
-+	/* Check validity of program. */
-+	if (UCHARAT(prog->program) != MAGIC) {
-+		printk("<3>Regexp: corrupted program\n");
-+		return(0);
-+	}
-+
-+	/* If there is a "must appear" string, look for it. */
-+	if (prog->regmust != NULL) {
-+		s = string;
-+		while ((s = strchr(s, prog->regmust[0])) != NULL) {
-+			if (strncmp(s, prog->regmust, prog->regmlen) == 0)
-+				break;	/* Found it. */
-+			s++;
-+		}
-+		if (s == NULL)	/* Not present. */
-+			return(0);
-+	}
-+
-+	/* Mark beginning of line for ^ . */
-+	g.regbol = string;
-+
-+	/* Simplest case:  anchored match need be tried only once. */
-+	if (prog->reganch)
-+		return(regtry(&g, prog, string));
-+
-+	/* Messy cases:  unanchored match. */
-+	s = string;
-+	if (prog->regstart != '\0')
-+		/* We know what char it must start with. */
-+		while ((s = strchr(s, prog->regstart)) != NULL) {
-+			if (regtry(&g, prog, s))
-+				return(1);
-+			s++;
-+		}
-+	else
-+		/* We don't -- general case. */
-+		do {
-+			if (regtry(&g, prog, s))
-+				return(1);
-+		} while (*s++ != '\0');
-+
-+	/* Failure. */
-+	return(0);
-+}
-+
-+/*
-+ - regtry - try match at specific point
-+ */
-+static int			/* 0 failure, 1 success */
-+regtry(struct match_globals *g, regexp *prog, char *string)
-+{
-+	register int i;
-+	register char **sp;
-+	register char **ep;
-+
-+	g->reginput = string;
-+	g->regstartp = prog->startp;
-+	g->regendp = prog->endp;
-+
-+	sp = prog->startp;
-+	ep = prog->endp;
-+	for (i = NSUBEXP; i > 0; i--) {
-+		*sp++ = NULL;
-+		*ep++ = NULL;
-+	}
-+	if (regmatch(g, prog->program + 1)) {
-+		prog->startp[0] = string;
-+		prog->endp[0] = g->reginput;
-+		return(1);
-+	} else
-+		return(0);
-+}
-+
-+/*
-+ - regmatch - main matching routine
-+ *
-+ * Conceptually the strategy is simple:  check to see whether the current
-+ * node matches, call self recursively to see whether the rest matches,
-+ * and then act accordingly.  In practice we make some effort to avoid
-+ * recursion, in particular by going through "ordinary" nodes (that don't
-+ * need to know whether the rest of the match failed) by a loop instead of
-+ * by recursion.
-+ */
-+static int			/* 0 failure, 1 success */
-+regmatch(struct match_globals *g, char *prog)
-+{
-+	register char *scan = prog; /* Current node. */
-+	char *next;		    /* Next node. */
-+
-+#ifdef DEBUG
-+	if (scan != NULL && regnarrate)
-+		fprintf(stderr, "%s(\n", regprop(scan));
-+#endif
-+	while (scan != NULL) {
-+#ifdef DEBUG
-+		if (regnarrate)
-+			fprintf(stderr, "%s...\n", regprop(scan));
-+#endif
-+		next = regnext(g, scan);
-+
-+		switch (OP(scan)) {
-+		case BOL:
-+			if (g->reginput != g->regbol)
-+				return(0);
-+			break;
-+		case EOL:
-+			if (*g->reginput != '\0')
-+				return(0);
-+			break;
-+		case ANY:
-+			if (*g->reginput == '\0')
-+				return(0);
-+			g->reginput++;
-+			break;
-+		case EXACTLY: {
-+				register int len;
-+				register char *opnd;
-+
-+				opnd = OPERAND(scan);
-+				/* Inline the first character, for speed. */
-+				if (*opnd != *g->reginput)
-+					return(0);
-+				len = strlen(opnd);
-+				if (len > 1 && strncmp(opnd, g->reginput, len) != 0)
-+					return(0);
-+				g->reginput += len;
-+			}
-+			break;
-+		case ANYOF:
-+			if (*g->reginput == '\0' || strchr(OPERAND(scan), *g->reginput) == NULL)
-+				return(0);
-+			g->reginput++;
-+			break;
-+		case ANYBUT:
-+			if (*g->reginput == '\0' || strchr(OPERAND(scan), *g->reginput) != NULL)
-+				return(0);
-+			g->reginput++;
-+			break;
-+		case NOTHING:
-+		case BACK:
-+			break;
-+		case OPEN+1:
-+		case OPEN+2:
-+		case OPEN+3:
-+		case OPEN+4:
-+		case OPEN+5:
-+		case OPEN+6:
-+		case OPEN+7:
-+		case OPEN+8:
-+		case OPEN+9: {
-+				register int no;
-+				register char *save;
-+
-+				no = OP(scan) - OPEN;
-+				save = g->reginput;
-+
-+				if (regmatch(g, next)) {
-+					/*
-+					 * Don't set startp if some later
-+					 * invocation of the same parentheses
-+					 * already has.
-+					 */
-+					if (g->regstartp[no] == NULL)
-+						g->regstartp[no] = save;
-+					return(1);
-+				} else
-+					return(0);
-+			}
-+			break;
-+		case CLOSE+1:
-+		case CLOSE+2:
-+		case CLOSE+3:
-+		case CLOSE+4:
-+		case CLOSE+5:
-+		case CLOSE+6:
-+		case CLOSE+7:
-+		case CLOSE+8:
-+		case CLOSE+9:
-+			{
-+				register int no;
-+				register char *save;
-+
-+				no = OP(scan) - CLOSE;
-+				save = g->reginput;
-+
-+				if (regmatch(g, next)) {
-+					/*
-+					 * Don't set endp if some later
-+					 * invocation of the same parentheses
-+					 * already has.
-+					 */
-+					if (g->regendp[no] == NULL)
-+						g->regendp[no] = save;
-+					return(1);
-+				} else
-+					return(0);
-+			}
-+			break;
-+		case BRANCH: {
-+				register char *save;
-+
-+				if (OP(next) != BRANCH)		/* No choice. */
-+					next = OPERAND(scan);	/* Avoid recursion. */
-+				else {
-+					do {
-+						save = g->reginput;
-+						if (regmatch(g, OPERAND(scan)))
-+							return(1);
-+						g->reginput = save;
-+						scan = regnext(g, scan);
-+					} while (scan != NULL && OP(scan) == BRANCH);
-+					return(0);
-+					/* NOTREACHED */
-+				}
-+			}
-+			break;
-+		case STAR:
-+		case PLUS: {
-+				register char nextch;
-+				register int no;
-+				register char *save;
-+				register int min;
-+
-+				/*
-+				 * Lookahead to avoid useless match attempts
-+				 * when we know what character comes next.
-+				 */
-+				nextch = '\0';
-+				if (OP(next) == EXACTLY)
-+					nextch = *OPERAND(next);
-+				min = (OP(scan) == STAR) ? 0 : 1;
-+				save = g->reginput;
-+				no = regrepeat(g, OPERAND(scan));
-+				while (no >= min) {
-+					/* If it could work, try it. */
-+					if (nextch == '\0' || *g->reginput == nextch)
-+						if (regmatch(g, next))
-+							return(1);
-+					/* Couldn't or didn't -- back up. */
-+					no--;
-+					g->reginput = save + no;
-+				}
-+				return(0);
-+			}
-+			break;
-+		case END:
-+			return(1);	/* Success! */
-+			break;
-+		default:
-+			printk("<3>Regexp: memory corruption\n");
-+			return(0);
-+			break;
-+		}
-+
-+		scan = next;
-+	}
-+
-+	/*
-+	 * We get here only if there's trouble -- normally "case END" is
-+	 * the terminating point.
-+	 */
-+	printk("<3>Regexp: corrupted pointers\n");
-+	return(0);
-+}
-+
-+/*
-+ - regrepeat - repeatedly match something simple, report how many
-+ */
-+static int
-+regrepeat(struct match_globals *g, char *p)
-+{
-+	register int count = 0;
-+	register char *scan;
-+	register char *opnd;
-+
-+	scan = g->reginput;
-+	opnd = OPERAND(p);
-+	switch (OP(p)) {
-+	case ANY:
-+		count = strlen(scan);
-+		scan += count;
-+		break;
-+	case EXACTLY:
-+		while (*opnd == *scan) {
-+			count++;
-+			scan++;
-+		}
-+		break;
-+	case ANYOF:
-+		while (*scan != '\0' && strchr(opnd, *scan) != NULL) {
-+			count++;
-+			scan++;
-+		}
-+		break;
-+	case ANYBUT:
-+		while (*scan != '\0' && strchr(opnd, *scan) == NULL) {
-+			count++;
-+			scan++;
-+		}
-+		break;
-+	default:		/* Oh dear.  Called inappropriately. */
-+		printk("<3>Regexp: internal foulup\n");
-+		count = 0;	/* Best compromise. */
-+		break;
-+	}
-+	g->reginput = scan;
-+
-+	return(count);
-+}
-+
-+/*
-+ - regnext - dig the "next" pointer out of a node
-+ */
-+static char*
-+regnext(struct match_globals *g, char *p)
-+{
-+	register int offset;
-+
-+	if (p == &g->regdummy)
-+		return(NULL);
-+
-+	offset = NEXT(p);
-+	if (offset == 0)
-+		return(NULL);
-+
-+	if (OP(p) == BACK)
-+		return(p-offset);
-+	else
-+		return(p+offset);
-+}
-+
-+#ifdef DEBUG
-+
-+STATIC char *regprop();
-+
-+/*
-+ - regdump - dump a regexp onto stdout in vaguely comprehensible form
-+ */
-+void
-+regdump(regexp *r)
-+{
-+	register char *s;
-+	register char op = EXACTLY;	/* Arbitrary non-END op. */
-+	register char *next;
-+	/* extern char *strchr(); */
-+
-+
-+	s = r->program + 1;
-+	while (op != END) {	/* While that wasn't END last time... */
-+		op = OP(s);
-+		printf("%2d%s", s-r->program, regprop(s));	/* Where, what. */
-+		next = regnext(s);
-+		if (next == NULL)		/* Next ptr. */
-+			printf("(0)");
-+		else
-+			printf("(%d)", (s-r->program)+(next-s));
-+		s += 3;
-+		if (op == ANYOF || op == ANYBUT || op == EXACTLY) {
-+			/* Literal string, where present. */
-+			while (*s != '\0') {
-+				putchar(*s);
-+				s++;
-+			}
-+			s++;
-+		}
-+		putchar('\n');
-+	}
-+
-+	/* Header fields of interest. */
-+	if (r->regstart != '\0')
-+		printf("start `%c' ", r->regstart);
-+	if (r->reganch)
-+		printf("anchored ");
-+	if (r->regmust != NULL)
-+		printf("must have \"%s\"", r->regmust);
-+	printf("\n");
-+}
-+
-+/*
-+ - regprop - printable representation of opcode
-+ */
-+static char *
-+regprop(char *op)
-+{
-+#define BUFLEN 50
-+	register char *p;
-+	static char buf[BUFLEN];
-+
-+	strcpy(buf, ":");
-+
-+	switch (OP(op)) {
-+	case BOL:
-+		p = "BOL";
-+		break;
-+	case EOL:
-+		p = "EOL";
-+		break;
-+	case ANY:
-+		p = "ANY";
-+		break;
-+	case ANYOF:
-+		p = "ANYOF";
-+		break;
-+	case ANYBUT:
-+		p = "ANYBUT";
-+		break;
-+	case BRANCH:
-+		p = "BRANCH";
-+		break;
-+	case EXACTLY:
-+		p = "EXACTLY";
-+		break;
-+	case NOTHING:
-+		p = "NOTHING";
-+		break;
-+	case BACK:
-+		p = "BACK";
-+		break;
-+	case END:
-+		p = "END";
-+		break;
-+	case OPEN+1:
-+	case OPEN+2:
-+	case OPEN+3:
-+	case OPEN+4:
-+	case OPEN+5:
-+	case OPEN+6:
-+	case OPEN+7:
-+	case OPEN+8:
-+	case OPEN+9:
-+		snprintf(buf+strlen(buf),BUFLEN-strlen(buf), "OPEN%d", OP(op)-OPEN);
-+		p = NULL;
-+		break;
-+	case CLOSE+1:
-+	case CLOSE+2:
-+	case CLOSE+3:
-+	case CLOSE+4:
-+	case CLOSE+5:
-+	case CLOSE+6:
-+	case CLOSE+7:
-+	case CLOSE+8:
-+	case CLOSE+9:
-+		snprintf(buf+strlen(buf),BUFLEN-strlen(buf), "CLOSE%d", OP(op)-CLOSE);
-+		p = NULL;
-+		break;
-+	case STAR:
-+		p = "STAR";
-+		break;
-+	case PLUS:
-+		p = "PLUS";
-+		break;
-+	default:
-+		printk("<3>Regexp: corrupted opcode\n");
-+		break;
-+	}
-+	if (p != NULL)
-+		strncat(buf, p, BUFLEN-strlen(buf));
-+	return(buf);
-+}
-+#endif
-+
-+
---- /dev/null
-+++ b/net/netfilter/regexp/regexp.h
-@@ -0,0 +1,41 @@
-+/*
-+ * Definitions etc. for regexp(3) routines.
-+ *
-+ * Caveat:  this is V8 regexp(3) [actually, a reimplementation thereof],
-+ * not the System V one.
-+ */
-+
-+#ifndef REGEXP_H
-+#define REGEXP_H
-+
-+
-+/*
-+http://www.opensource.apple.com/darwinsource/10.3/expect-1/expect/expect.h ,
-+which contains a version of this library, says:
-+
-+ *
-+ * NSUBEXP must be at least 10, and no greater than 117 or the parser
-+ * will not work properly.
-+ *
-+
-+However, it looks rather like this library is limited to 10.  If you think
-+otherwise, let us know.
-+*/
-+
-+#define NSUBEXP  10
-+typedef struct regexp {
-+	char *startp[NSUBEXP];
-+	char *endp[NSUBEXP];
-+	char regstart;		/* Internal use only. */
-+	char reganch;		/* Internal use only. */
-+	char *regmust;		/* Internal use only. */
-+	int regmlen;		/* Internal use only. */
-+	char program[1];	/* Unwarranted chumminess with compiler. */
-+} regexp;
-+
-+regexp * regcomp(char *exp, int *patternsize);
-+int regexec(regexp *prog, char *string);
-+void regsub(regexp *prog, char *source, char *dest);
-+void regerror(char *s);
-+
-+#endif
---- /dev/null
-+++ b/net/netfilter/regexp/regmagic.h
-@@ -0,0 +1,5 @@
-+/*
-+ * The first byte of the regexp internal "program" is actually this magic
-+ * number; the start node begins in the second byte.
-+ */
-+#define	MAGIC	0234
---- /dev/null
-+++ b/net/netfilter/regexp/regsub.c
-@@ -0,0 +1,95 @@
-+/*
-+ * regsub
-+ * @(#)regsub.c	1.3 of 2 April 86
-+ *
-+ *	Copyright (c) 1986 by University of Toronto.
-+ *	Written by Henry Spencer.  Not derived from licensed software.
-+ *
-+ *	Permission is granted to anyone to use this software for any
-+ *	purpose on any computer system, and to redistribute it freely,
-+ *	subject to the following restrictions:
-+ *
-+ *	1. The author is not responsible for the consequences of use of
-+ *		this software, no matter how awful, even if they arise
-+ *		from defects in it.
-+ *
-+ *	2. The origin of this software must not be misrepresented, either
-+ *		by explicit claim or by omission.
-+ *
-+ *	3. Altered versions must be plainly marked as such, and must not
-+ *		be misrepresented as being the original software.
-+ *
-+ *
-+ * This code was modified by Ethan Sommer to work within the kernel
-+ * (it now uses kmalloc etc..)
-+ *
-+ */
-+#include "regexp.h"
-+#include "regmagic.h"
-+#include <linux/string.h>
-+
-+
-+#ifndef CHARBITS
-+#define	UCHARAT(p)	((int)*(unsigned char *)(p))
-+#else
-+#define	UCHARAT(p)	((int)*(p)&CHARBITS)
-+#endif
-+
-+#if 0
-+//void regerror(char * s)
-+//{
-+//        printk("regexp(3): %s", s);
-+//        /* NOTREACHED */
-+//}
-+#endif
-+
-+/*
-+ - regsub - perform substitutions after a regexp match
-+ */
-+void
-+regsub(regexp * prog, char * source, char * dest)
-+{
-+	register char *src;
-+	register char *dst;
-+	register char c;
-+	register int no;
-+	register int len;
-+	
-+	/* Not necessary and gcc doesn't like it -MLS */
-+	/*extern char *strncpy();*/
-+
-+	if (prog == NULL || source == NULL || dest == NULL) {
-+		regerror("NULL parm to regsub");
-+		return;
-+	}
-+	if (UCHARAT(prog->program) != MAGIC) {
-+		regerror("damaged regexp fed to regsub");
-+		return;
-+	}
-+
-+	src = source;
-+	dst = dest;
-+	while ((c = *src++) != '\0') {
-+		if (c == '&')
-+			no = 0;
-+		else if (c == '\\' && '0' <= *src && *src <= '9')
-+			no = *src++ - '0';
-+		else
-+			no = -1;
-+
-+		if (no < 0) {	/* Ordinary character. */
-+			if (c == '\\' && (*src == '\\' || *src == '&'))
-+				c = *src++;
-+			*dst++ = c;
-+		} else if (prog->startp[no] != NULL && prog->endp[no] != NULL) {
-+			len = prog->endp[no] - prog->startp[no];
-+			(void) strncpy(dst, prog->startp[no], len);
-+			dst += len;
-+			if (len != 0 && *(dst-1) == '\0') {	/* strncpy hit NUL. */
-+				regerror("damaged match string");
-+				return;
-+			}
-+		}
-+	}
-+	*dst++ = '\0';
-+}
---- /dev/null
-+++ b/net/netfilter/xt_layer7.c
-@@ -0,0 +1,666 @@
-+/*
-+  Kernel module to match application layer (OSI layer 7) data in connections.
-+
-+  http://l7-filter.sf.net
-+
-+  (C) 2003-2009 Matthew Strait and Ethan Sommer.
-+
-+  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.
-+  http://www.gnu.org/licenses/gpl.txt
-+
-+  Based on ipt_string.c (C) 2000 Emmanuel Roger <winfield@freegates.be>,
-+  xt_helper.c (C) 2002 Harald Welte and cls_layer7.c (C) 2003 Matthew Strait,
-+  Ethan Sommer, Justin Levandoski.
-+*/
-+
-+#include <linux/spinlock.h>
-+#include <linux/version.h>
-+#include <net/ip.h>
-+#include <net/tcp.h>
-+#include <linux/module.h>
-+#include <linux/skbuff.h>
-+#include <linux/netfilter.h>
-+#include <net/netfilter/nf_conntrack.h>
-+#include <net/netfilter/nf_conntrack_core.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-+#include <net/netfilter/nf_conntrack_extend.h>
-+#include <net/netfilter/nf_conntrack_acct.h>
-+#endif
-+#include <linux/netfilter/x_tables.h>
-+#include <linux/netfilter/xt_layer7.h>
-+#include <linux/ctype.h>
-+#include <linux/proc_fs.h>
-+
-+#include "regexp/regexp.c"
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Matthew Strait <quadong@users.sf.net>, Ethan Sommer <sommere@users.sf.net>");
-+MODULE_DESCRIPTION("iptables application layer match module");
-+MODULE_ALIAS("ipt_layer7");
-+MODULE_VERSION("2.21");
-+
-+static int maxdatalen = 2048; // this is the default
-+module_param(maxdatalen, int, 0444);
-+MODULE_PARM_DESC(maxdatalen, "maximum bytes of data looked at by l7-filter");
-+#ifdef CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG
-+	#define DPRINTK(format,args...) printk(format,##args)
-+#else
-+	#define DPRINTK(format,args...)
-+#endif
-+
-+/* Number of packets whose data we look at.
-+This can be modified through /proc/net/layer7_numpackets */
-+static int num_packets = 10;
-+
-+static struct pattern_cache {
-+	char * regex_string;
-+	regexp * pattern;
-+	struct pattern_cache * next;
-+} * first_pattern_cache = NULL;
-+
-+DEFINE_SPINLOCK(l7_lock);
-+
-+static int total_acct_packets(struct nf_conn *ct)
-+{
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 26)
-+	BUG_ON(ct == NULL);
-+	return (ct->counters[IP_CT_DIR_ORIGINAL].packets + ct->counters[IP_CT_DIR_REPLY].packets);
-+#else
-+	struct nf_conn_counter *acct;
-+
-+	BUG_ON(ct == NULL);
-+	acct = nf_conn_acct_find(ct);
-+	if (!acct)
-+		return 0;
-+	return (acct[IP_CT_DIR_ORIGINAL].packets + acct[IP_CT_DIR_REPLY].packets);
-+#endif
-+}
-+
-+#ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
-+/* Converts an unfriendly string into a friendly one by
-+replacing unprintables with periods and all whitespace with " ". */
-+static char * friendly_print(unsigned char * s)
-+{
-+	char * f = kmalloc(strlen(s) + 1, GFP_ATOMIC);
-+	int i;
-+
-+	if(!f) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in "
-+					"friendly_print, bailing.\n");
-+		return NULL;
-+	}
-+
-+	for(i = 0; i < strlen(s); i++){
-+		if(isprint(s[i]) && s[i] < 128)	f[i] = s[i];
-+		else if(isspace(s[i]))		f[i] = ' ';
-+		else 				f[i] = '.';
-+	}
-+	f[i] = '\0';
-+	return f;
-+}
-+
-+static char dec2hex(int i)
-+{
-+	switch (i) {
-+		case 0 ... 9:
-+			return (i + '0');
-+			break;
-+		case 10 ... 15:
-+			return (i - 10 + 'a');
-+			break;
-+		default:
-+			if (net_ratelimit())
-+				printk("layer7: Problem in dec2hex\n");
-+			return '\0';
-+	}
-+}
-+
-+static char * hex_print(unsigned char * s)
-+{
-+	char * g = kmalloc(strlen(s)*3 + 1, GFP_ATOMIC);
-+	int i;
-+
-+	if(!g) {
-+	       if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in hex_print, "
-+					"bailing.\n");
-+	       return NULL;
-+	}
-+
-+	for(i = 0; i < strlen(s); i++) {
-+		g[i*3    ] = dec2hex(s[i]/16);
-+		g[i*3 + 1] = dec2hex(s[i]%16);
-+		g[i*3 + 2] = ' ';
-+	}
-+	g[i*3] = '\0';
-+
-+	return g;
-+}
-+#endif // DEBUG
-+
-+/* Use instead of regcomp.  As we expect to be seeing the same regexps over and
-+over again, it make sense to cache the results. */
-+static regexp * compile_and_cache(const char * regex_string, 
-+                                  const char * protocol)
-+{
-+	struct pattern_cache * node               = first_pattern_cache;
-+	struct pattern_cache * last_pattern_cache = first_pattern_cache;
-+	struct pattern_cache * tmp;
-+	unsigned int len;
-+
-+	while (node != NULL) {
-+		if (!strcmp(node->regex_string, regex_string))
-+		return node->pattern;
-+
-+		last_pattern_cache = node;/* points at the last non-NULL node */
-+		node = node->next;
-+	}
-+
-+	/* If we reach the end of the list, then we have not yet cached
-+	   the pattern for this regex. Let's do that now.
-+	   Be paranoid about running out of memory to avoid list corruption. */
-+	tmp = kmalloc(sizeof(struct pattern_cache), GFP_ATOMIC);
-+
-+	if(!tmp) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in "
-+					"compile_and_cache, bailing.\n");
-+		return NULL;
-+	}
-+
-+	tmp->regex_string  = kmalloc(strlen(regex_string) + 1, GFP_ATOMIC);
-+	tmp->pattern       = kmalloc(sizeof(struct regexp),    GFP_ATOMIC);
-+	tmp->next = NULL;
-+
-+	if(!tmp->regex_string || !tmp->pattern) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in "
-+					"compile_and_cache, bailing.\n");
-+		kfree(tmp->regex_string);
-+		kfree(tmp->pattern);
-+		kfree(tmp);
-+		return NULL;
-+	}
-+
-+	/* Ok.  The new node is all ready now. */
-+	node = tmp;
-+
-+	if(first_pattern_cache == NULL) /* list is empty */
-+		first_pattern_cache = node; /* make node the beginning */
-+	else
-+		last_pattern_cache->next = node; /* attach node to the end */
-+
-+	/* copy the string and compile the regex */
-+	len = strlen(regex_string);
-+	DPRINTK("About to compile this: \"%s\"\n", regex_string);
-+	node->pattern = regcomp((char *)regex_string, &len);
-+	if ( !node->pattern ) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: Error compiling regexp "
-+					"\"%s\" (%s)\n", 
-+					regex_string, protocol);
-+		/* pattern is now cached as NULL, so we won't try again. */
-+	}
-+
-+	strcpy(node->regex_string, regex_string);
-+	return node->pattern;
-+}
-+
-+static int can_handle(const struct sk_buff *skb)
-+{
-+	if(!ip_hdr(skb)) /* not IP */
-+		return 0;
-+	if(ip_hdr(skb)->protocol != IPPROTO_TCP &&
-+	   ip_hdr(skb)->protocol != IPPROTO_UDP &&
-+	   ip_hdr(skb)->protocol != IPPROTO_ICMP)
-+		return 0;
-+	return 1;
-+}
-+
-+/* Returns offset the into the skb->data that the application data starts */
-+static int app_data_offset(const struct sk_buff *skb)
-+{
-+	/* In case we are ported somewhere (ebtables?) where ip_hdr(skb)
-+	isn't set, this can be gotten from 4*(skb->data[0] & 0x0f) as well. */
-+	int ip_hl = 4*ip_hdr(skb)->ihl;
-+
-+	if( ip_hdr(skb)->protocol == IPPROTO_TCP ) {
-+		/* 12 == offset into TCP header for the header length field.
-+		Can't get this with skb->h.th->doff because the tcphdr
-+		struct doesn't get set when routing (this is confirmed to be
-+		true in Netfilter as well as QoS.) */
-+		int tcp_hl = 4*(skb->data[ip_hl + 12] >> 4);
-+
-+		return ip_hl + tcp_hl;
-+	} else if( ip_hdr(skb)->protocol == IPPROTO_UDP  ) {
-+		return ip_hl + 8; /* UDP header is always 8 bytes */
-+	} else if( ip_hdr(skb)->protocol == IPPROTO_ICMP ) {
-+		return ip_hl + 8; /* ICMP header is 8 bytes */
-+	} else {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: tried to handle unknown "
-+					"protocol!\n");
-+		return ip_hl + 8; /* something reasonable */
-+	}
-+}
-+
-+/* handles whether there's a match when we aren't appending data anymore */
-+static int match_no_append(struct nf_conn * conntrack, 
-+                           struct nf_conn * master_conntrack, 
-+                           enum ip_conntrack_info ctinfo,
-+                           enum ip_conntrack_info master_ctinfo,
-+                           const struct xt_layer7_info * info)
-+{
-+	/* If we're in here, throw the app data away */
-+	if(master_conntrack->layer7.app_data != NULL) {
-+
-+	#ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
-+		if(!master_conntrack->layer7.app_proto) {
-+			char * f = 
-+			  friendly_print(master_conntrack->layer7.app_data);
-+			char * g = 
-+			  hex_print(master_conntrack->layer7.app_data);
-+			DPRINTK("\nl7-filter gave up after %d bytes "
-+				"(%d packets):\n%s\n",
-+				strlen(f), total_acct_packets(master_conntrack), f);
-+			kfree(f);
-+			DPRINTK("In hex: %s\n", g);
-+			kfree(g);
-+		}
-+	#endif
-+
-+		kfree(master_conntrack->layer7.app_data);
-+		master_conntrack->layer7.app_data = NULL; /* don't free again */
-+	}
-+
-+	if(master_conntrack->layer7.app_proto){
-+		/* Here child connections set their .app_proto (for /proc) */
-+		if(!conntrack->layer7.app_proto) {
-+			conntrack->layer7.app_proto = 
-+			  kmalloc(strlen(master_conntrack->layer7.app_proto)+1, 
-+			    GFP_ATOMIC);
-+			if(!conntrack->layer7.app_proto){
-+				if (net_ratelimit())
-+					printk(KERN_ERR "layer7: out of memory "
-+							"in match_no_append, "
-+							"bailing.\n");
-+				return 1;
-+			}
-+			strcpy(conntrack->layer7.app_proto, 
-+				master_conntrack->layer7.app_proto);
-+		}
-+
-+		return (!strcmp(master_conntrack->layer7.app_proto, 
-+				info->protocol));
-+	}
-+	else {
-+		/* If not classified, set to "unknown" to distinguish from
-+		connections that are still being tested. */
-+		master_conntrack->layer7.app_proto = 
-+			kmalloc(strlen("unknown")+1, GFP_ATOMIC);
-+		if(!master_conntrack->layer7.app_proto){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in "
-+						"match_no_append, bailing.\n");
-+			return 1;
-+		}
-+		strcpy(master_conntrack->layer7.app_proto, "unknown");
-+		return 0;
-+	}
-+}
-+
-+/* add the new app data to the conntrack.  Return number of bytes added. */
-+static int add_data(struct nf_conn * master_conntrack,
-+                    char * app_data, int appdatalen)
-+{
-+	int length = 0, i;
-+	int oldlength = master_conntrack->layer7.app_data_len;
-+
-+	/* This is a fix for a race condition by Deti Fliegl. However, I'm not 
-+	   clear on whether the race condition exists or whether this really 
-+	   fixes it.  I might just be being dense... Anyway, if it's not really 
-+	   a fix, all it does is waste a very small amount of time. */
-+	if(!master_conntrack->layer7.app_data) return 0;
-+
-+	/* Strip nulls. Make everything lower case (our regex lib doesn't
-+	do case insensitivity).  Add it to the end of the current data. */
-+	for(i = 0; i < maxdatalen-oldlength-1 &&
-+		   i < appdatalen; i++) {
-+		if(app_data[i] != '\0') {
-+			/* the kernel version of tolower mungs 'upper ascii' */
-+			master_conntrack->layer7.app_data[length+oldlength] =
-+				isascii(app_data[i])? 
-+					tolower(app_data[i]) : app_data[i];
-+			length++;
-+		}
-+	}
-+
-+	master_conntrack->layer7.app_data[length+oldlength] = '\0';
-+	master_conntrack->layer7.app_data_len = length + oldlength;
-+
-+	return length;
-+}
-+
-+/* taken from drivers/video/modedb.c */
-+static int my_atoi(const char *s)
-+{
-+	int val = 0;
-+
-+	for (;; s++) {
-+		switch (*s) {
-+			case '0'...'9':
-+			val = 10*val+(*s-'0');
-+			break;
-+		default:
-+			return val;
-+		}
-+	}
-+}
-+
-+/* write out num_packets to userland. */
-+static int layer7_read_proc(char* page, char ** start, off_t off, int count,
-+                            int* eof, void * data)
-+{
-+	if(num_packets > 99 && net_ratelimit())
-+		printk(KERN_ERR "layer7: NOT REACHED. num_packets too big\n");
-+
-+	page[0] = num_packets/10 + '0';
-+	page[1] = num_packets%10 + '0';
-+	page[2] = '\n';
-+	page[3] = '\0';
-+
-+	*eof=1;
-+
-+	return 3;
-+}
-+
-+/* Read in num_packets from userland */
-+static int layer7_write_proc(struct file* file, const char* buffer,
-+                             unsigned long count, void *data)
-+{
-+	char * foo = kmalloc(count, GFP_ATOMIC);
-+
-+	if(!foo){
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory, bailing. "
-+					"num_packets unchanged.\n");
-+		return count;
-+	}
-+
-+	if(copy_from_user(foo, buffer, count)) {
-+		return -EFAULT;
-+	}
-+
-+
-+	num_packets = my_atoi(foo);
-+	kfree (foo);
-+
-+	/* This has an arbitrary limit to make the math easier. I'm lazy.
-+	But anyway, 99 is a LOT! If you want more, you're doing it wrong! */
-+	if(num_packets > 99) {
-+		printk(KERN_WARNING "layer7: num_packets can't be > 99.\n");
-+		num_packets = 99;
-+	} else if(num_packets < 1) {
-+		printk(KERN_WARNING "layer7: num_packets can't be < 1.\n");
-+		num_packets = 1;
-+	}
-+
-+	return count;
-+}
-+
-+static bool
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+match(const struct sk_buff *skbin, const struct xt_match_param *par)
-+#else
-+match(const struct sk_buff *skbin,
-+      const struct net_device *in,
-+      const struct net_device *out,
-+      const struct xt_match *match,
-+      const void *matchinfo,
-+      int offset,
-+      unsigned int protoff,
-+      bool *hotdrop)
-+#endif
-+{
-+	/* sidestep const without getting a compiler warning... */
-+	struct sk_buff * skb = (struct sk_buff *)skbin; 
-+
-+	const struct xt_layer7_info * info = 
-+	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+		par->matchinfo;
-+	#else
-+		matchinfo;
-+	#endif
-+
-+	enum ip_conntrack_info master_ctinfo, ctinfo;
-+	struct nf_conn *master_conntrack, *conntrack;
-+	unsigned char * app_data;
-+	unsigned int pattern_result, appdatalen;
-+	regexp * comppattern;
-+
-+	/* Be paranoid/incompetent - lock the entire match function. */
-+	spin_lock_bh(&l7_lock);
-+
-+	if(!can_handle(skb)){
-+		DPRINTK("layer7: This is some protocol I can't handle.\n");
-+		spin_unlock_bh(&l7_lock);
-+		return info->invert;
-+	}
-+
-+	/* Treat parent & all its children together as one connection, except
-+	for the purpose of setting conntrack->layer7.app_proto in the actual
-+	connection. This makes /proc/net/ip_conntrack more satisfying. */
-+	if(!(conntrack = nf_ct_get(skb, &ctinfo)) ||
-+	   !(master_conntrack=nf_ct_get(skb,&master_ctinfo))){
-+		DPRINTK("layer7: couldn't get conntrack.\n");
-+		spin_unlock_bh(&l7_lock);
-+		return info->invert;
-+	}
-+
-+	/* Try to get a master conntrack (and its master etc) for FTP, etc. */
-+	while (master_ct(master_conntrack) != NULL)
-+		master_conntrack = master_ct(master_conntrack);
-+
-+	/* if we've classified it or seen too many packets */
-+	if(total_acct_packets(master_conntrack) > num_packets ||
-+	   master_conntrack->layer7.app_proto) {
-+
-+		pattern_result = match_no_append(conntrack, master_conntrack, 
-+						 ctinfo, master_ctinfo, info);
-+
-+		/* skb->cb[0] == seen. Don't do things twice if there are 
-+		multiple l7 rules. I'm not sure that using cb for this purpose 
-+		is correct, even though it says "put your private variables 
-+		there". But it doesn't look like it is being used for anything
-+		else in the skbs that make it here. */
-+		skb->cb[0] = 1; /* marking it seen here's probably irrelevant */
-+
-+		spin_unlock_bh(&l7_lock);
-+		return (pattern_result ^ info->invert);
-+	}
-+
-+	if(skb_is_nonlinear(skb)){
-+		if(skb_linearize(skb) != 0){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: failed to linearize "
-+						"packet, bailing.\n");
-+			spin_unlock_bh(&l7_lock);
-+			return info->invert;
-+		}
-+	}
-+
-+	/* now that the skb is linearized, it's safe to set these. */
-+	app_data = skb->data + app_data_offset(skb);
-+	appdatalen = skb_tail_pointer(skb) - app_data;
-+
-+	/* the return value gets checked later, when we're ready to use it */
-+	comppattern = compile_and_cache(info->pattern, info->protocol);
-+
-+	/* On the first packet of a connection, allocate space for app data */
-+	if(total_acct_packets(master_conntrack) == 1 && !skb->cb[0] && 
-+	   !master_conntrack->layer7.app_data){
-+		master_conntrack->layer7.app_data = 
-+			kmalloc(maxdatalen, GFP_ATOMIC);
-+		if(!master_conntrack->layer7.app_data){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in "
-+						"match, bailing.\n");
-+			spin_unlock_bh(&l7_lock);
-+			return info->invert;
-+		}
-+
-+		master_conntrack->layer7.app_data[0] = '\0';
-+	}
-+
-+	/* Can be here, but unallocated, if numpackets is increased near
-+	the beginning of a connection */
-+	if(master_conntrack->layer7.app_data == NULL){
-+		spin_unlock_bh(&l7_lock);
-+		return info->invert; /* unmatched */
-+	}
-+
-+	if(!skb->cb[0]){
-+		int newbytes;
-+		newbytes = add_data(master_conntrack, app_data, appdatalen);
-+
-+		if(newbytes == 0) { /* didn't add any data */
-+			skb->cb[0] = 1;
-+			/* Didn't match before, not going to match now */
-+			spin_unlock_bh(&l7_lock);
-+			return info->invert;
-+		}
-+	}
-+
-+	/* If looking for "unknown", then never match.  "Unknown" means that
-+	we've given up; we're still trying with these packets. */
-+	if(!strcmp(info->protocol, "unknown")) {
-+		pattern_result = 0;
-+	/* If looking for "unset", then always match. "Unset" means that we
-+	haven't yet classified the connection. */
-+	} else if(!strcmp(info->protocol, "unset")) {
-+		pattern_result = 2;
-+		DPRINTK("layer7: matched unset: not yet classified "
-+			"(%d/%d packets)\n",
-+                        total_acct_packets(master_conntrack), num_packets);
-+	/* If the regexp failed to compile, don't bother running it */
-+	} else if(comppattern && 
-+		  regexec(comppattern, master_conntrack->layer7.app_data)){
-+		DPRINTK("layer7: matched %s\n", info->protocol);
-+		pattern_result = 1;
-+	} else pattern_result = 0;
-+
-+	if(pattern_result == 1) {
-+		master_conntrack->layer7.app_proto = 
-+			kmalloc(strlen(info->protocol)+1, GFP_ATOMIC);
-+		if(!master_conntrack->layer7.app_proto){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in "
-+						"match, bailing.\n");
-+			spin_unlock_bh(&l7_lock);
-+			return (pattern_result ^ info->invert);
-+		}
-+		strcpy(master_conntrack->layer7.app_proto, info->protocol);
-+	} else if(pattern_result > 1) { /* cleanup from "unset" */
-+		pattern_result = 1;
-+	}
-+
-+	/* mark the packet seen */
-+	skb->cb[0] = 1;
-+
-+	spin_unlock_bh(&l7_lock);
-+	return (pattern_result ^ info->invert);
-+}
-+
-+// load nf_conntrack_ipv4
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+static bool check(const struct xt_mtchk_param *par)
-+{
-+        if (nf_ct_l3proto_try_module_get(par->match->family) < 0) {
-+                printk(KERN_WARNING "can't load conntrack support for "
-+                                    "proto=%d\n", par->match->family);
-+#else
-+static bool check(const char *tablename, const void *inf,
-+		 const struct xt_match *match, void *matchinfo,
-+		 unsigned int hook_mask)
-+{
-+        if (nf_ct_l3proto_try_module_get(match->family) < 0) {
-+                printk(KERN_WARNING "can't load conntrack support for "
-+                                    "proto=%d\n", match->family);
-+#endif
-+                return 0;
-+        }
-+	return 1;
-+}
-+
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+	static void destroy(const struct xt_mtdtor_param *par)
-+	{
-+		nf_ct_l3proto_module_put(par->match->family);
-+	}
-+#else
-+	static void destroy(const struct xt_match *match, void *matchinfo)
-+	{
-+		nf_ct_l3proto_module_put(match->family);
-+	}
-+#endif
-+
-+static struct xt_match xt_layer7_match[] __read_mostly = {
-+{
-+	.name		= "layer7",
-+	.family		= AF_INET,
-+	.checkentry	= check,
-+	.match		= match,
-+	.destroy	= destroy,
-+	.matchsize	= sizeof(struct xt_layer7_info),
-+	.me		= THIS_MODULE
-+}
-+};
-+
-+static void layer7_cleanup_proc(void)
-+{
-+	remove_proc_entry("layer7_numpackets", init_net.proc_net);
-+}
-+
-+/* register the proc file */
-+static void layer7_init_proc(void)
-+{
-+	struct proc_dir_entry* entry;
-+	entry = create_proc_entry("layer7_numpackets", 0644, init_net.proc_net);
-+	entry->read_proc = layer7_read_proc;
-+	entry->write_proc = layer7_write_proc;
-+}
-+
-+static int __init xt_layer7_init(void)
-+{
-+	need_conntrack();
-+
-+	layer7_init_proc();
-+	if(maxdatalen < 1) {
-+		printk(KERN_WARNING "layer7: maxdatalen can't be < 1, "
-+			"using 1\n");
-+		maxdatalen = 1;
-+	}
-+	/* This is not a hard limit.  It's just here to prevent people from
-+	bringing their slow machines to a grinding halt. */
-+	else if(maxdatalen > 65536) {
-+		printk(KERN_WARNING "layer7: maxdatalen can't be > 65536, "
-+			"using 65536\n");
-+		maxdatalen = 65536;
-+	}
-+	return xt_register_matches(xt_layer7_match,
-+				   ARRAY_SIZE(xt_layer7_match));
-+}
-+
-+static void __exit xt_layer7_fini(void)
-+{
-+	layer7_cleanup_proc();
-+	xt_unregister_matches(xt_layer7_match, ARRAY_SIZE(xt_layer7_match));
-+}
-+
-+module_init(xt_layer7_init);
-+module_exit(xt_layer7_fini);
diff --git a/target/linux/generic-2.6/patches-2.6.31/101-netfilter_layer7_pktmatch.patch b/target/linux/generic-2.6/patches-2.6.31/101-netfilter_layer7_pktmatch.patch
deleted file mode 100644
index f65e301fd..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/101-netfilter_layer7_pktmatch.patch
+++ /dev/null
@@ -1,108 +0,0 @@
---- a/include/linux/netfilter/xt_layer7.h
-+++ b/include/linux/netfilter/xt_layer7.h
-@@ -8,6 +8,7 @@ struct xt_layer7_info {
-     char protocol[MAX_PROTOCOL_LEN];
-     char pattern[MAX_PATTERN_LEN];
-     u_int8_t invert;
-+    u_int8_t pkt;
- };
- 
- #endif /* _XT_LAYER7_H */
---- a/net/netfilter/xt_layer7.c
-+++ b/net/netfilter/xt_layer7.c
-@@ -314,33 +314,35 @@ static int match_no_append(struct nf_con
- }
- 
- /* add the new app data to the conntrack.  Return number of bytes added. */
--static int add_data(struct nf_conn * master_conntrack,
--                    char * app_data, int appdatalen)
-+static int add_datastr(char *target, int offset, char *app_data, int len)
- {
- 	int length = 0, i;
--	int oldlength = master_conntrack->layer7.app_data_len;
--
--	/* This is a fix for a race condition by Deti Fliegl. However, I'm not 
--	   clear on whether the race condition exists or whether this really 
--	   fixes it.  I might just be being dense... Anyway, if it's not really 
--	   a fix, all it does is waste a very small amount of time. */
--	if(!master_conntrack->layer7.app_data) return 0;
-+	if (!target) return 0;
- 
- 	/* Strip nulls. Make everything lower case (our regex lib doesn't
- 	do case insensitivity).  Add it to the end of the current data. */
--	for(i = 0; i < maxdatalen-oldlength-1 &&
--		   i < appdatalen; i++) {
-+ 	for(i = 0; i < maxdatalen-offset-1 && i < len; i++) {
- 		if(app_data[i] != '\0') {
- 			/* the kernel version of tolower mungs 'upper ascii' */
--			master_conntrack->layer7.app_data[length+oldlength] =
-+			target[length+offset] =
- 				isascii(app_data[i])? 
- 					tolower(app_data[i]) : app_data[i];
- 			length++;
- 		}
- 	}
-+	target[length+offset] = '\0';
-+
-+	return length;
-+}
-+
-+/* add the new app data to the conntrack.  Return number of bytes added. */
-+static int add_data(struct nf_conn * master_conntrack,
-+                    char * app_data, int appdatalen)
-+{
-+	int length;
- 
--	master_conntrack->layer7.app_data[length+oldlength] = '\0';
--	master_conntrack->layer7.app_data_len = length + oldlength;
-+	length = add_datastr(master_conntrack->layer7.app_data, master_conntrack->layer7.app_data_len, app_data, appdatalen);
-+	master_conntrack->layer7.app_data_len += length;
- 
- 	return length;
- }
-@@ -438,7 +440,7 @@ match(const struct sk_buff *skbin,
- 
- 	enum ip_conntrack_info master_ctinfo, ctinfo;
- 	struct nf_conn *master_conntrack, *conntrack;
--	unsigned char * app_data;
-+	unsigned char *app_data, *tmp_data;
- 	unsigned int pattern_result, appdatalen;
- 	regexp * comppattern;
- 
-@@ -466,8 +468,8 @@ match(const struct sk_buff *skbin,
- 		master_conntrack = master_ct(master_conntrack);
- 
- 	/* if we've classified it or seen too many packets */
--	if(total_acct_packets(master_conntrack) > num_packets ||
--	   master_conntrack->layer7.app_proto) {
-+	if(!info->pkt && (total_acct_packets(master_conntrack) > num_packets ||
-+	   master_conntrack->layer7.app_proto)) {
- 
- 		pattern_result = match_no_append(conntrack, master_conntrack, 
- 						 ctinfo, master_ctinfo, info);
-@@ -500,6 +502,25 @@ match(const struct sk_buff *skbin,
- 	/* the return value gets checked later, when we're ready to use it */
- 	comppattern = compile_and_cache(info->pattern, info->protocol);
- 
-+	if (info->pkt) {
-+		tmp_data = kmalloc(maxdatalen, GFP_ATOMIC);
-+		if(!tmp_data){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in match, bailing.\n");
-+			return info->invert;
-+		}
-+
-+		tmp_data[0] = '\0';
-+		add_datastr(tmp_data, 0, app_data, appdatalen);
-+		pattern_result = ((comppattern && regexec(comppattern, tmp_data)) ? 1 : 0);
-+
-+		kfree(tmp_data);
-+		tmp_data = NULL;
-+		spin_unlock_bh(&l7_lock);
-+
-+		return (pattern_result ^ info->invert);
-+	}
-+
- 	/* On the first packet of a connection, allocate space for app data */
- 	if(total_acct_packets(master_conntrack) == 1 && !skb->cb[0] && 
- 	   !master_conntrack->layer7.app_data){
diff --git a/target/linux/generic-2.6/patches-2.6.31/110-netfilter_match_speedup.patch b/target/linux/generic-2.6/patches-2.6.31/110-netfilter_match_speedup.patch
deleted file mode 100644
index d6c113aa3..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/110-netfilter_match_speedup.patch
+++ /dev/null
@@ -1,144 +0,0 @@
---- a/include/linux/netfilter_ipv4/ip_tables.h
-+++ b/include/linux/netfilter_ipv4/ip_tables.h
-@@ -62,6 +62,7 @@ struct ipt_ip {
- #define IPT_F_FRAG		0x01	/* Set if rule is a fragment rule */
- #define IPT_F_GOTO		0x02	/* Set if jump is a goto */
- #define IPT_F_MASK		0x03	/* All possible flag bits mask. */
-+#define IPT_F_NO_DEF_MATCH	0x80	/* Internal: no default match rules present */
- 
- /* Values for "inv" field in struct ipt_ip. */
- #define IPT_INV_VIA_IN		0x01	/* Invert the sense of IN IFACE. */
---- a/net/ipv4/netfilter/ip_tables.c
-+++ b/net/ipv4/netfilter/ip_tables.c
-@@ -87,6 +87,9 @@ ip_packet_match(const struct iphdr *ip,
- 
- #define FWINV(bool, invflg) ((bool) ^ !!(ipinfo->invflags & (invflg)))
- 
-+	if (ipinfo->flags & IPT_F_NO_DEF_MATCH)
-+		return true;
-+
- 	if (FWINV((ip->saddr&ipinfo->smsk.s_addr) != ipinfo->src.s_addr,
- 		  IPT_INV_SRCIP)
- 	    || FWINV((ip->daddr&ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr,
-@@ -137,13 +140,35 @@ ip_packet_match(const struct iphdr *ip,
- 		return false;
- 	}
- 
-+#undef FWINV
- 	return true;
- }
- 
- static bool
--ip_checkentry(const struct ipt_ip *ip)
-+ip_checkentry(struct ipt_ip *ip)
- {
--	if (ip->flags & ~IPT_F_MASK) {
-+#define FWINV(bool, invflg) ((bool) || (ip->invflags & (invflg)))
-+
-+	if (FWINV(ip->smsk.s_addr, IPT_INV_SRCIP) ||
-+		FWINV(ip->dmsk.s_addr, IPT_INV_DSTIP))
-+		goto has_match_rules;
-+
-+	if (FWINV(!!((const unsigned long *)ip->iniface_mask)[0],
-+		IPT_INV_VIA_IN) ||
-+	    FWINV(!!((const unsigned long *)ip->outiface_mask)[0],
-+		IPT_INV_VIA_OUT))
-+		goto has_match_rules;
-+
-+	if (FWINV(ip->proto, IPT_INV_PROTO))
-+		goto has_match_rules;
-+
-+	if (FWINV(ip->flags&IPT_F_FRAG, IPT_INV_FRAG))
-+		goto has_match_rules;
-+
-+	ip->flags |= IPT_F_NO_DEF_MATCH;
-+
-+has_match_rules:
-+	if (ip->flags & ~(IPT_F_MASK|IPT_F_NO_DEF_MATCH)) {
- 		duprintf("Unknown flag bits set: %08X\n",
- 			 ip->flags & ~IPT_F_MASK);
- 		return false;
-@@ -153,6 +178,8 @@ ip_checkentry(const struct ipt_ip *ip)
- 			 ip->invflags & ~IPT_INV_MASK);
- 		return false;
- 	}
-+
-+#undef FWINV
- 	return true;
- }
- 
-@@ -200,7 +227,6 @@ unconditional(const struct ipt_ip *ip)
- 			return 0;
- 
- 	return 1;
--#undef FWINV
- }
- 
- #if defined(CONFIG_NETFILTER_XT_TARGET_TRACE) || \
-@@ -326,8 +352,28 @@ ipt_do_table(struct sk_buff *skb,
- 	struct xt_match_param mtpar;
- 	struct xt_target_param tgpar;
- 
--	/* Initialization */
- 	ip = ip_hdr(skb);
-+
-+	IP_NF_ASSERT(table->valid_hooks & (1 << hook));
-+	xt_info_rdlock_bh();
-+	private = table->private;
-+	table_base = private->entries[smp_processor_id()];
-+	e = get_entry(table_base, private->hook_entry[hook]);
-+
-+	if (e->target_offset <= sizeof(struct ipt_entry) &&
-+		(e->ip.flags & IPT_F_NO_DEF_MATCH)) {
-+			struct ipt_entry_target *t = ipt_get_target(e);
-+			if (!t->u.kernel.target->target) {
-+				int v = ((struct ipt_standard_target *)t)->verdict;
-+				if ((v < 0) && (v != IPT_RETURN)) {
-+					ADD_COUNTER(e->counters, ntohs(ip->tot_len), 1);
-+					xt_info_rdunlock_bh();
-+					return (unsigned)(-v) - 1;
-+				}
-+			}
-+	}
-+
-+	/* Initialization */
- 	datalen = skb->len - ip->ihl * 4;
- 	indev = in ? in->name : nulldevname;
- 	outdev = out ? out->name : nulldevname;
-@@ -345,13 +391,6 @@ ipt_do_table(struct sk_buff *skb,
- 	mtpar.family  = tgpar.family = NFPROTO_IPV4;
- 	mtpar.hooknum = tgpar.hooknum = hook;
- 
--	IP_NF_ASSERT(table->valid_hooks & (1 << hook));
--	xt_info_rdlock_bh();
--	private = table->private;
--	table_base = private->entries[smp_processor_id()];
--
--	e = get_entry(table_base, private->hook_entry[hook]);
--
- 	/* For return from builtin chain */
- 	back = get_entry(table_base, private->underflow[hook]);
- 
-@@ -978,6 +1017,7 @@ copy_entries_to_user(unsigned int total_
- 		unsigned int i;
- 		const struct ipt_entry_match *m;
- 		const struct ipt_entry_target *t;
-+		u8 flags;
- 
- 		e = (struct ipt_entry *)(loc_cpu_entry + off);
- 		if (copy_to_user(userptr + off
-@@ -988,6 +1028,14 @@ copy_entries_to_user(unsigned int total_
- 			goto free_counters;
- 		}
- 
-+		flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
-+		if (copy_to_user(userptr + off
-+				 + offsetof(struct ipt_entry, ip.flags),
-+				 &flags, sizeof(flags)) != 0) {
-+			ret = -EFAULT;
-+			goto free_counters;
-+		}
-+
- 		for (i = sizeof(struct ipt_entry);
- 		     i < e->target_offset;
- 		     i += m->u.match_size) {
diff --git a/target/linux/generic-2.6/patches-2.6.31/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.31/150-netfilter_imq.patch
deleted file mode 100644
index 026e9bdee..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/150-netfilter_imq.patch
+++ /dev/null
@@ -1,1260 +0,0 @@
---- /dev/null
-+++ b/drivers/net/imq.c
-@@ -0,0 +1,571 @@
-+/*
-+ *             Pseudo-driver for the intermediate queue device.
-+ *
-+ *             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.
-+ *
-+ * Authors:    Patrick McHardy, <kaber@trash.net>
-+ *
-+ *            The first version was written by Martin Devera, <devik@cdi.cz>
-+ *
-+ * Credits:    Jan Rafaj <imq2t@cedric.vabo.cz>
-+ *              - Update patch to 2.4.21
-+ *             Sebastian Strollo <sstrollo@nortelnetworks.com>
-+ *              - Fix "Dead-loop on netdevice imq"-issue
-+ *             Marcel Sebek <sebek64@post.cz>
-+ *              - Update to 2.6.2-rc1
-+ *
-+ *	       After some time of inactivity there is a group taking care
-+ *	       of IMQ again: http://www.linuximq.net
-+ *
-+ *
-+ *	       2004/06/30 - New version of IMQ patch to kernels <=2.6.7
-+ *             including the following changes:
-+ *
-+ *	       - Correction of ipv6 support "+"s issue (Hasso Tepper)
-+ *	       - Correction of imq_init_devs() issue that resulted in
-+ *	       kernel OOPS unloading IMQ as module (Norbert Buchmuller)
-+ *	       - Addition of functionality to choose number of IMQ devices
-+ *	       during kernel config (Andre Correa)
-+ *	       - Addition of functionality to choose how IMQ hooks on
-+ *	       PRE and POSTROUTING (after or before NAT) (Andre Correa)
-+ *	       - Cosmetic corrections (Norbert Buchmuller) (Andre Correa)
-+ *
-+ *
-+ *             2005/12/16 - IMQ versions between 2.6.7 and 2.6.13 were
-+ *             released with almost no problems. 2.6.14-x was released
-+ *             with some important changes: nfcache was removed; After
-+ *             some weeks of trouble we figured out that some IMQ fields
-+ *             in skb were missing in skbuff.c - skb_clone and copy_skb_header.
-+ *             These functions are correctly patched by this new patch version.
-+ *
-+ *             Thanks for all who helped to figure out all the problems with
-+ *             2.6.14.x: Patrick McHardy, Rune Kock, VeNoMouS, Max CtRiX,
-+ *             Kevin Shanahan, Richard Lucassen, Valery Dachev (hopefully
-+ *             I didn't forget anybody). I apologize again for my lack of time.
-+ *
-+ *
-+ *             2008/06/17 - 2.6.25 - Changed imq.c to use qdisc_run() instead
-+ *             of qdisc_restart() and moved qdisc_run() to tasklet to avoid
-+ *             recursive locking. New initialization routines to fix 'rmmod' not
-+ *             working anymore. Used code from ifb.c. (Jussi Kivilinna)
-+ *
-+ *             2008/08/06 - 2.6.26 - (JK)
-+ *              - Replaced tasklet with 'netif_schedule()'.
-+ *              - Cleaned up and added comments for imq_nf_queue().
-+ *
-+ *             2009/04/12
-+ *              - Add skb_save_cb/skb_restore_cb helper functions for backuping
-+ *                control buffer. This is needed because qdisc-layer on kernels
-+ *                2.6.27 and newer overwrite control buffer. (Jussi Kivilinna)
-+ *              - Add better locking for IMQ device. Hopefully this will solve
-+ *                SMP issues. (Jussi Kivilinna)
-+ *              - Port to 2.6.27
-+ *              - Port to 2.6.28
-+ *              - Port to 2.6.29 + fix rmmod not working
-+ *
-+ *             2009/04/20 - (Jussi Kivilinna)
-+ *              - Use netdevice feature flags to avoid extra packet handling
-+ *                by core networking layer and possibly increase performance.
-+ *
-+ *	       Also, many thanks to pablo Sebastian Greco for making the initial
-+ *	       patch and to those who helped the testing.
-+ *
-+ *             More info at: http://www.linuximq.net/ (Andre Correa)
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/moduleparam.h>
-+#include <linux/list.h>
-+#include <linux/skbuff.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/rtnetlink.h>
-+#include <linux/if_arp.h>
-+#include <linux/netfilter.h>
-+#include <linux/netfilter_ipv4.h>
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	#include <linux/netfilter_ipv6.h>
-+#endif
-+#include <linux/imq.h>
-+#include <net/pkt_sched.h>
-+#include <net/netfilter/nf_queue.h>
-+
-+static nf_hookfn imq_nf_hook;
-+
-+static struct nf_hook_ops imq_ingress_ipv4 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET,
-+	.hooknum	= NF_INET_PRE_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	.priority	= NF_IP_PRI_MANGLE + 1
-+#else
-+	.priority	= NF_IP_PRI_NAT_DST + 1
-+#endif
-+};
-+
-+static struct nf_hook_ops imq_egress_ipv4 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET,
-+	.hooknum	= NF_INET_POST_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
-+	.priority	= NF_IP_PRI_LAST
-+#else
-+	.priority	= NF_IP_PRI_NAT_SRC - 1
-+#endif
-+};
-+
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+static struct nf_hook_ops imq_ingress_ipv6 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET6,
-+	.hooknum	= NF_INET_PRE_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	.priority	= NF_IP6_PRI_MANGLE + 1
-+#else
-+	.priority	= NF_IP6_PRI_NAT_DST + 1
-+#endif
-+};
-+
-+static struct nf_hook_ops imq_egress_ipv6 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET6,
-+	.hooknum	= NF_INET_POST_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
-+	.priority	= NF_IP6_PRI_LAST
-+#else
-+	.priority	= NF_IP6_PRI_NAT_SRC - 1
-+#endif
-+};
-+#endif
-+
-+#if defined(CONFIG_IMQ_NUM_DEVS)
-+static unsigned int numdevs = CONFIG_IMQ_NUM_DEVS;
-+#else
-+static unsigned int numdevs = IMQ_MAX_DEVS;
-+#endif
-+
-+static DEFINE_SPINLOCK(imq_nf_queue_lock);
-+
-+static struct net_device *imq_devs_cache[IMQ_MAX_DEVS];
-+
-+
-+static struct net_device_stats *imq_get_stats(struct net_device *dev)
-+{
-+	return &dev->stats;
-+}
-+
-+/* called for packets kfree'd in qdiscs at places other than enqueue */
-+static void imq_skb_destructor(struct sk_buff *skb)
-+{
-+	struct nf_queue_entry *entry = skb->nf_queue_entry;
-+
-+	if (entry) {
-+		nf_queue_entry_release_refs(entry);
-+		kfree(entry);
-+	}
-+
-+	skb_restore_cb(skb); /* kfree backup */
-+}
-+
-+static void imq_nf_reinject(struct nf_queue_entry *entry, unsigned int verdict)
-+{
-+	int status;
-+
-+	if (!entry->next_outfn) {
-+		spin_lock_bh(&imq_nf_queue_lock);
-+		nf_reinject(entry, verdict);
-+		spin_unlock_bh(&imq_nf_queue_lock);
-+		return;
-+	}
-+
-+	rcu_read_lock();
-+	local_bh_disable();
-+	status = entry->next_outfn(entry, entry->next_queuenum);
-+	local_bh_enable();
-+	if (status < 0) {
-+		nf_queue_entry_release_refs(entry);
-+		kfree_skb(entry->skb);
-+		kfree(entry);
-+	}
-+
-+	rcu_read_unlock();
-+}
-+
-+static int imq_dev_xmit(struct sk_buff *skb, struct net_device *dev)
-+{
-+	dev->stats.tx_bytes += skb->len;
-+	dev->stats.tx_packets++;
-+
-+	skb->imq_flags = 0;
-+	skb->destructor = NULL;
-+
-+	skb_restore_cb(skb); /* restore skb->cb */
-+
-+	dev->trans_start = jiffies;
-+	imq_nf_reinject(skb->nf_queue_entry, NF_ACCEPT);
-+	return 0;
-+}
-+
-+static int imq_nf_queue(struct nf_queue_entry *entry, unsigned queue_num)
-+{
-+	struct net_device *dev;
-+	struct sk_buff *skb_orig, *skb, *skb_shared;
-+	struct Qdisc *q;
-+	struct netdev_queue *txq;
-+	int users, index;
-+	int retval = -EINVAL;
-+
-+	index = entry->skb->imq_flags & IMQ_F_IFMASK;
-+	if (unlikely(index > numdevs - 1)) {
-+		if (net_ratelimit())
-+			printk(KERN_WARNING
-+			       "IMQ: invalid device specified, highest is %u\n",
-+			       numdevs - 1);
-+		retval = -EINVAL;
-+		goto out;
-+	}
-+
-+	/* check for imq device by index from cache */
-+	dev = imq_devs_cache[index];
-+	if (unlikely(!dev)) {
-+		char buf[8];
-+
-+		/* get device by name and cache result */
-+		snprintf(buf, sizeof(buf), "imq%d", index);
-+		dev = dev_get_by_name(&init_net, buf);
-+		if (!dev) {
-+			/* not found ?!*/
-+			BUG();
-+			retval = -ENODEV;
-+			goto out;
-+		}
-+
-+		imq_devs_cache[index] = dev;
-+		dev_put(dev);
-+	}
-+
-+	if (unlikely(!(dev->flags & IFF_UP))) {
-+		entry->skb->imq_flags = 0;
-+		imq_nf_reinject(entry, NF_ACCEPT);
-+		retval = 0;
-+		goto out;
-+	}
-+	dev->last_rx = jiffies;
-+
-+	skb = entry->skb;
-+	skb_orig = NULL;
-+
-+	/* skb has owner? => make clone */
-+	if (unlikely(skb->destructor)) {
-+		skb_orig = skb;
-+		skb = skb_clone(skb, GFP_ATOMIC);
-+		if (!skb) {
-+			retval = -ENOMEM;
-+			goto out;
-+		}
-+		entry->skb = skb;
-+	}
-+
-+	skb->nf_queue_entry = entry;
-+
-+	dev->stats.rx_bytes += skb->len;
-+	dev->stats.rx_packets++;
-+
-+	txq = dev_pick_tx(dev, skb);
-+
-+	q = rcu_dereference(txq->qdisc);
-+	if (unlikely(!q->enqueue))
-+		goto packet_not_eaten_by_imq_dev;
-+
-+	spin_lock_bh(qdisc_lock(q));
-+
-+	users = atomic_read(&skb->users);
-+
-+	skb_shared = skb_get(skb); /* increase reference count by one */
-+	skb_save_cb(skb_shared); /* backup skb->cb, as qdisc layer will
-+					overwrite it */
-+	qdisc_enqueue_root(skb_shared, q); /* might kfree_skb */
-+
-+	if (likely(atomic_read(&skb_shared->users) == users + 1)) {
-+		kfree_skb(skb_shared); /* decrease reference count by one */
-+
-+		skb->destructor = &imq_skb_destructor;
-+
-+		/* cloned? */
-+		if (skb_orig)
-+			kfree_skb(skb_orig); /* free original */
-+
-+		spin_unlock_bh(qdisc_lock(q));
-+
-+		/* schedule qdisc dequeue */
-+		__netif_schedule(q);
-+
-+		retval = 0;
-+		goto out;
-+	} else {
-+		skb_restore_cb(skb_shared); /* restore skb->cb */
-+		/* qdisc dropped packet and decreased skb reference count of
-+		 * skb, so we don't really want to and try refree as that would
-+		 * actually destroy the skb. */
-+		spin_unlock_bh(qdisc_lock(q));
-+		goto packet_not_eaten_by_imq_dev;
-+	}
-+
-+packet_not_eaten_by_imq_dev:
-+	/* cloned? restore original */
-+	if (skb_orig) {
-+		kfree_skb(skb);
-+		entry->skb = skb_orig;
-+	}
-+	retval = -1;
-+out:
-+	return retval;
-+}
-+
-+static struct nf_queue_handler nfqh = {
-+	.name  = "imq",
-+	.outfn = imq_nf_queue,
-+};
-+
-+static unsigned int imq_nf_hook(unsigned int hook, struct sk_buff *pskb,
-+				const struct net_device *indev,
-+				const struct net_device *outdev,
-+				int (*okfn)(struct sk_buff *))
-+{
-+	if (pskb->imq_flags & IMQ_F_ENQUEUE)
-+		return NF_QUEUE;
-+
-+	return NF_ACCEPT;
-+}
-+
-+static int imq_close(struct net_device *dev)
-+{
-+	netif_stop_queue(dev);
-+	return 0;
-+}
-+
-+static int imq_open(struct net_device *dev)
-+{
-+	netif_start_queue(dev);
-+	return 0;
-+}
-+
-+static const struct net_device_ops imq_netdev_ops = {
-+	.ndo_open		= imq_open,
-+	.ndo_stop		= imq_close,
-+	.ndo_start_xmit		= imq_dev_xmit,
-+	.ndo_get_stats		= imq_get_stats,
-+};
-+
-+static void imq_setup(struct net_device *dev)
-+{
-+	dev->netdev_ops		= &imq_netdev_ops;
-+	dev->type               = ARPHRD_VOID;
-+	dev->mtu                = 16000;
-+	dev->tx_queue_len       = 11000;
-+	dev->flags              = IFF_NOARP;
-+	dev->features           = NETIF_F_SG | NETIF_F_FRAGLIST |
-+				  NETIF_F_GSO | NETIF_F_HW_CSUM |
-+				  NETIF_F_HIGHDMA;
-+}
-+
-+static int imq_validate(struct nlattr *tb[], struct nlattr *data[])
-+{
-+	int ret = 0;
-+
-+	if (tb[IFLA_ADDRESS]) {
-+		if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN) {
-+			ret = -EINVAL;
-+			goto end;
-+		}
-+		if (!is_valid_ether_addr(nla_data(tb[IFLA_ADDRESS]))) {
-+			ret = -EADDRNOTAVAIL;
-+			goto end;
-+		}
-+	}
-+	return 0;
-+end:
-+	printk(KERN_WARNING "IMQ: imq_validate failed (%d)\n", ret);
-+	return ret;
-+}
-+
-+static struct rtnl_link_ops imq_link_ops __read_mostly = {
-+	.kind		= "imq",
-+	.priv_size	= 0,
-+	.setup		= imq_setup,
-+	.validate	= imq_validate,
-+};
-+
-+static int __init imq_init_hooks(void)
-+{
-+	int err;
-+
-+	nf_register_queue_imq_handler(&nfqh);
-+
-+	err = nf_register_hook(&imq_ingress_ipv4);
-+	if (err)
-+		goto err1;
-+
-+	err = nf_register_hook(&imq_egress_ipv4);
-+	if (err)
-+		goto err2;
-+
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	err = nf_register_hook(&imq_ingress_ipv6);
-+	if (err)
-+		goto err3;
-+
-+	err = nf_register_hook(&imq_egress_ipv6);
-+	if (err)
-+		goto err4;
-+#endif
-+
-+	return 0;
-+
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+err4:
-+	nf_unregister_hook(&imq_ingress_ipv6);
-+err3:
-+	nf_unregister_hook(&imq_egress_ipv4);
-+#endif
-+err2:
-+	nf_unregister_hook(&imq_ingress_ipv4);
-+err1:
-+	nf_unregister_queue_imq_handler();
-+	return err;
-+}
-+
-+static int __init imq_init_one(int index)
-+{
-+	struct net_device *dev;
-+	int ret;
-+
-+	dev = alloc_netdev(0, "imq%d", imq_setup);
-+	if (!dev)
-+		return -ENOMEM;
-+
-+	ret = dev_alloc_name(dev, dev->name);
-+	if (ret < 0)
-+		goto fail;
-+
-+	dev->rtnl_link_ops = &imq_link_ops;
-+	ret = register_netdevice(dev);
-+	if (ret < 0)
-+		goto fail;
-+
-+	return 0;
-+fail:
-+	free_netdev(dev);
-+	return ret;
-+}
-+
-+static int __init imq_init_devs(void)
-+{
-+	int err, i;
-+
-+	if (numdevs < 1 || numdevs > IMQ_MAX_DEVS) {
-+		printk(KERN_ERR "IMQ: numdevs has to be betweed 1 and %u\n",
-+		       IMQ_MAX_DEVS);
-+		return -EINVAL;
-+	}
-+
-+	rtnl_lock();
-+	err = __rtnl_link_register(&imq_link_ops);
-+
-+	for (i = 0; i < numdevs && !err; i++)
-+		err = imq_init_one(i);
-+
-+	if (err) {
-+		__rtnl_link_unregister(&imq_link_ops);
-+		memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
-+	}
-+	rtnl_unlock();
-+
-+	return err;
-+}
-+
-+static int __init imq_init_module(void)
-+{
-+	int err;
-+
-+#if defined(CONFIG_IMQ_NUM_DEVS)
-+	BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS > 16);
-+	BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS < 2);
-+	BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS - 1 > IMQ_F_IFMASK);
-+#endif
-+
-+	err = imq_init_devs();
-+	if (err) {
-+		printk(KERN_ERR "IMQ: Error trying imq_init_devs(net)\n");
-+		return err;
-+	}
-+
-+	err = imq_init_hooks();
-+	if (err) {
-+		printk(KERN_ERR "IMQ: Error trying imq_init_hooks()\n");
-+		rtnl_link_unregister(&imq_link_ops);
-+		memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
-+		return err;
-+	}
-+
-+	printk(KERN_INFO "IMQ driver loaded successfully.\n");
-+
-+#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	printk(KERN_INFO "\tHooking IMQ before NAT on PREROUTING.\n");
-+#else
-+	printk(KERN_INFO "\tHooking IMQ after NAT on PREROUTING.\n");
-+#endif
-+#if defined(CONFIG_IMQ_BEHAVIOR_AB) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	printk(KERN_INFO "\tHooking IMQ before NAT on POSTROUTING.\n");
-+#else
-+	printk(KERN_INFO "\tHooking IMQ after NAT on POSTROUTING.\n");
-+#endif
-+
-+	return 0;
-+}
-+
-+static void __exit imq_unhook(void)
-+{
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	nf_unregister_hook(&imq_ingress_ipv6);
-+	nf_unregister_hook(&imq_egress_ipv6);
-+#endif
-+	nf_unregister_hook(&imq_ingress_ipv4);
-+	nf_unregister_hook(&imq_egress_ipv4);
-+
-+	nf_unregister_queue_imq_handler();
-+}
-+
-+static void __exit imq_cleanup_devs(void)
-+{
-+	rtnl_link_unregister(&imq_link_ops);
-+	memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
-+}
-+
-+static void __exit imq_exit_module(void)
-+{
-+	imq_unhook();
-+	imq_cleanup_devs();
-+	printk(KERN_INFO "IMQ driver unloaded successfully.\n");
-+}
-+
-+module_init(imq_init_module);
-+module_exit(imq_exit_module);
-+
-+module_param(numdevs, int, 0);
-+MODULE_PARM_DESC(numdevs, "number of IMQ devices (how many imq* devices will "
-+			"be created)");
-+MODULE_AUTHOR("http://www.linuximq.net");
-+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See "
-+			"http://www.linuximq.net/ for more information.");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS_RTNL_LINK("imq");
-+
---- a/drivers/net/Kconfig
-+++ b/drivers/net/Kconfig
-@@ -109,6 +109,129 @@ config EQUALIZER
- 	  To compile this driver as a module, choose M here: the module
- 	  will be called eql.  If unsure, say N.
- 
-+config IMQ
-+	tristate "IMQ (intermediate queueing device) support"
-+	depends on NETDEVICES && NETFILTER
-+	---help---
-+	  The IMQ device(s) is used as placeholder for QoS queueing
-+	  disciplines. Every packet entering/leaving the IP stack can be
-+	  directed through the IMQ device where it's enqueued/dequeued to the
-+	  attached qdisc. This allows you to treat network devices as classes
-+	  and distribute bandwidth among them. Iptables is used to specify
-+	  through which IMQ device, if any, packets travel.
-+
-+	  More information at: http://www.linuximq.net/
-+
-+	  To compile this driver as a module, choose M here: the module
-+	  will be called imq.  If unsure, say N.
-+
-+choice
-+	prompt "IMQ behavior (PRE/POSTROUTING)"
-+	depends on IMQ
-+	default IMQ_BEHAVIOR_AB
-+	help
-+
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		IMQ can work in any of the following ways:
-+
-+		    PREROUTING   |      POSTROUTING
-+		-----------------|-------------------
-+		#1  After NAT    |      After NAT
-+		#2  After NAT    |      Before NAT
-+		#3  Before NAT   |      After NAT
-+		#4  Before NAT   |      Before NAT
-+
-+		The default behavior is to hook before NAT on PREROUTING
-+		and after NAT on POSTROUTING (#3).
-+
-+		This settings are specially usefull when trying to use IMQ
-+		to shape NATed clients.
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_AA
-+	bool "IMQ AA"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   After NAT
-+		POSTROUTING:  After NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_AB
-+	bool "IMQ AB"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   After NAT
-+		POSTROUTING:  Before NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_BA
-+	bool "IMQ BA"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   Before NAT
-+		POSTROUTING:  After NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_BB
-+	bool "IMQ BB"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   Before NAT
-+		POSTROUTING:  Before NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+endchoice
-+
-+config IMQ_NUM_DEVS
-+
-+	int "Number of IMQ devices"
-+	range 2 16
-+	depends on IMQ
-+	default "16"
-+	help
-+
-+		This settings defines how many IMQ devices will be
-+		created.
-+
-+		The default value is 16.
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
- config TUN
- 	tristate "Universal TUN/TAP device driver support"
- 	select CRC32
---- a/drivers/net/Makefile
-+++ b/drivers/net/Makefile
-@@ -160,6 +160,7 @@ obj-$(CONFIG_SLHC) += slhc.o
- obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
- 
- obj-$(CONFIG_DUMMY) += dummy.o
-+obj-$(CONFIG_IMQ) += imq.o
- obj-$(CONFIG_IFB) += ifb.o
- obj-$(CONFIG_MACVLAN) += macvlan.o
- obj-$(CONFIG_DE600) += de600.o
---- /dev/null
-+++ b/include/linux/imq.h
-@@ -0,0 +1,13 @@
-+#ifndef _IMQ_H
-+#define _IMQ_H
-+
-+/* IFMASK (16 device indexes, 0 to 15) and flag(s) fit in 5 bits */
-+#define IMQ_F_BITS	5
-+
-+#define IMQ_F_IFMASK	0x0f
-+#define IMQ_F_ENQUEUE	0x10
-+
-+#define IMQ_MAX_DEVS	(IMQ_F_IFMASK + 1)
-+
-+#endif /* _IMQ_H */
-+
---- /dev/null
-+++ b/include/linux/netfilter_ipv4/ipt_IMQ.h
-@@ -0,0 +1,10 @@
-+#ifndef _IPT_IMQ_H
-+#define _IPT_IMQ_H
-+
-+/* Backwards compatibility for old userspace */
-+#include <linux/netfilter/xt_IMQ.h>
-+
-+#define ipt_imq_info xt_imq_info
-+
-+#endif /* _IPT_IMQ_H */
-+
---- /dev/null
-+++ b/include/linux/netfilter_ipv6/ip6t_IMQ.h
-@@ -0,0 +1,10 @@
-+#ifndef _IP6T_IMQ_H
-+#define _IP6T_IMQ_H
-+
-+/* Backwards compatibility for old userspace */
-+#include <linux/netfilter/xt_IMQ.h>
-+
-+#define ip6t_imq_info xt_imq_info
-+
-+#endif /* _IP6T_IMQ_H */
-+
---- a/include/linux/skbuff.h
-+++ b/include/linux/skbuff.h
-@@ -29,6 +29,9 @@
- #include <linux/rcupdate.h>
- #include <linux/dmaengine.h>
- #include <linux/hrtimer.h>
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+#include <linux/imq.h>
-+#endif
- 
- /* Don't change this without changing skb_csum_unnecessary! */
- #define CHECKSUM_NONE 0
-@@ -331,6 +334,9 @@ struct sk_buff {
- 	 * first. This is owned by whoever has the skb queued ATM.
- 	 */
- 	char			cb[48];
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	void			*cb_next;
-+#endif
- 
- 	unsigned int		len,
- 				data_len;
-@@ -363,6 +369,9 @@ struct sk_buff {
- 	struct nf_conntrack	*nfct;
- 	struct sk_buff		*nfct_reasm;
- #endif
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	struct nf_queue_entry	*nf_queue_entry;
-+#endif
- #ifdef CONFIG_BRIDGE_NETFILTER
- 	struct nf_bridge_info	*nf_bridge;
- #endif
-@@ -386,6 +395,9 @@ struct sk_buff {
- 	kmemcheck_bitfield_end(flags2);
- 
- 	/* 0/13/14 bit hole */
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	__u8			imq_flags:IMQ_F_BITS;
-+#endif
- 
- #ifdef CONFIG_NET_DMA
- 	dma_cookie_t		dma_cookie;
-@@ -441,6 +453,12 @@ static inline struct rtable *skb_rtable(
- 	return (struct rtable *)skb_dst(skb);
- }
- 
-+
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+extern int skb_save_cb(struct sk_buff *skb);
-+extern int skb_restore_cb(struct sk_buff *skb);
-+#endif
-+
- extern void kfree_skb(struct sk_buff *skb);
- extern void consume_skb(struct sk_buff *skb);
- extern void	       __kfree_skb(struct sk_buff *skb);
-@@ -1976,6 +1994,10 @@ static inline void __nf_copy(struct sk_b
- 	dst->nfct_reasm = src->nfct_reasm;
- 	nf_conntrack_get_reasm(src->nfct_reasm);
- #endif
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	dst->imq_flags = src->imq_flags;
-+	dst->nf_queue_entry = src->nf_queue_entry;
-+#endif
- #ifdef CONFIG_BRIDGE_NETFILTER
- 	dst->nf_bridge  = src->nf_bridge;
- 	nf_bridge_get(src->nf_bridge);
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -96,6 +96,9 @@
- #include <net/net_namespace.h>
- #include <net/sock.h>
- #include <linux/rtnetlink.h>
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+#include <linux/imq.h>
-+#endif
- #include <linux/proc_fs.h>
- #include <linux/seq_file.h>
- #include <linux/stat.h>
-@@ -1687,7 +1690,11 @@ int dev_hard_start_xmit(struct sk_buff *
- 	int rc;
- 
- 	if (likely(!skb->next)) {
--		if (!list_empty(&ptype_all))
-+		if (!list_empty(&ptype_all)
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+		    && !(skb->imq_flags & IMQ_F_ENQUEUE)
-+#endif
-+		    )
- 			dev_queue_xmit_nit(skb, dev);
- 
- 		if (netif_needs_gso(dev, skb)) {
-@@ -1772,8 +1779,7 @@ u16 skb_tx_hash(const struct net_device 
- }
- EXPORT_SYMBOL(skb_tx_hash);
- 
--static struct netdev_queue *dev_pick_tx(struct net_device *dev,
--					struct sk_buff *skb)
-+struct netdev_queue *dev_pick_tx(struct net_device *dev, struct sk_buff *skb)
- {
- 	const struct net_device_ops *ops = dev->netdev_ops;
- 	u16 queue_index = 0;
-@@ -1786,6 +1792,7 @@ static struct netdev_queue *dev_pick_tx(
- 	skb_set_queue_mapping(skb, queue_index);
- 	return netdev_get_tx_queue(dev, queue_index);
- }
-+EXPORT_SYMBOL(dev_pick_tx);
- 
- /**
-  *	dev_queue_xmit - transmit a buffer
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -1102,6 +1102,7 @@ extern int		dev_alloc_name(struct net_de
- extern int		dev_open(struct net_device *dev);
- extern int		dev_close(struct net_device *dev);
- extern void		dev_disable_lro(struct net_device *dev);
-+extern struct netdev_queue *dev_pick_tx(struct net_device *dev, struct sk_buff *skb);
- extern int		dev_queue_xmit(struct sk_buff *skb);
- extern int		register_netdevice(struct net_device *dev);
- extern void		unregister_netdevice(struct net_device *dev);
---- /dev/null
-+++ b/include/linux/netfilter/xt_IMQ.h
-@@ -0,0 +1,9 @@
-+#ifndef _XT_IMQ_H
-+#define _XT_IMQ_H
-+
-+struct xt_imq_info {
-+	unsigned int todev;     /* target imq device */
-+};
-+
-+#endif /* _XT_IMQ_H */
-+
---- a/include/net/netfilter/nf_queue.h
-+++ b/include/net/netfilter/nf_queue.h
-@@ -13,6 +13,12 @@ struct nf_queue_entry {
- 	struct net_device	*indev;
- 	struct net_device	*outdev;
- 	int			(*okfn)(struct sk_buff *);
-+
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	int			(*next_outfn)(struct nf_queue_entry *entry,
-+					      unsigned int queuenum);
-+	unsigned int		next_queuenum;
-+#endif
- };
- 
- #define nf_queue_entry_reroute(x) ((void *)x + sizeof(struct nf_queue_entry))
-@@ -30,5 +36,11 @@ extern int nf_unregister_queue_handler(u
- 				       const struct nf_queue_handler *qh);
- extern void nf_unregister_queue_handlers(const struct nf_queue_handler *qh);
- extern void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict);
-+extern void nf_queue_entry_release_refs(struct nf_queue_entry *entry);
-+
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+extern void nf_register_queue_imq_handler(const struct nf_queue_handler *qh);
-+extern void nf_unregister_queue_imq_handler(void);
-+#endif
- 
- #endif /* _NF_QUEUE_H */
---- a/net/core/skbuff.c
-+++ b/net/core/skbuff.c
-@@ -72,6 +72,9 @@
- 
- static struct kmem_cache *skbuff_head_cache __read_mostly;
- static struct kmem_cache *skbuff_fclone_cache __read_mostly;
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+static struct kmem_cache *skbuff_cb_store_cache __read_mostly;
-+#endif
- 
- static void sock_pipe_buf_release(struct pipe_inode_info *pipe,
- 				  struct pipe_buffer *buf)
-@@ -91,6 +94,80 @@ static int sock_pipe_buf_steal(struct pi
- 	return 1;
- }
- 
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+/* Control buffer save/restore for IMQ devices */
-+struct skb_cb_table {
-+	void			*cb_next;
-+	atomic_t		refcnt;
-+	char      		cb[48];
-+};
-+
-+static DEFINE_SPINLOCK(skb_cb_store_lock);
-+
-+int skb_save_cb(struct sk_buff *skb)
-+{
-+	struct skb_cb_table *next;
-+
-+	next = kmem_cache_alloc(skbuff_cb_store_cache, GFP_ATOMIC);
-+	if (!next)
-+		return -ENOMEM;
-+
-+	BUILD_BUG_ON(sizeof(skb->cb) != sizeof(next->cb));
-+
-+	memcpy(next->cb, skb->cb, sizeof(skb->cb));
-+	next->cb_next = skb->cb_next;
-+
-+	atomic_set(&next->refcnt, 1);
-+
-+	skb->cb_next = next;
-+	return 0;
-+}
-+EXPORT_SYMBOL(skb_save_cb);
-+
-+int skb_restore_cb(struct sk_buff *skb)
-+{
-+	struct skb_cb_table *next;
-+
-+	if (!skb->cb_next)
-+		return 0;
-+
-+	next = skb->cb_next;
-+
-+	BUILD_BUG_ON(sizeof(skb->cb) != sizeof(next->cb));
-+
-+	memcpy(skb->cb, next->cb, sizeof(skb->cb));
-+	skb->cb_next = next->cb_next;
-+
-+	spin_lock(&skb_cb_store_lock);
-+
-+	if (atomic_dec_and_test(&next->refcnt)) {
-+		kmem_cache_free(skbuff_cb_store_cache, next);
-+	}
-+
-+	spin_unlock(&skb_cb_store_lock);
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL(skb_restore_cb);
-+
-+static void skb_copy_stored_cb(struct sk_buff *new, struct sk_buff *old)
-+{
-+	struct skb_cb_table *next;
-+
-+	if (!old->cb_next) {
-+		new->cb_next = 0;
-+		return;
-+	}
-+
-+	spin_lock(&skb_cb_store_lock);
-+
-+	next = old->cb_next;
-+	atomic_inc(&next->refcnt);
-+	new->cb_next = next;
-+
-+	spin_unlock(&skb_cb_store_lock);
-+}
-+#endif
- 
- /* Pipe buffer operations for a socket. */
- static struct pipe_buf_operations sock_pipe_buf_ops = {
-@@ -398,6 +475,15 @@ static void skb_release_head_state(struc
- 		WARN_ON(in_irq());
- 		skb->destructor(skb);
- 	}
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	/* This should not happen. When it does, avoid memleak by restoring
-+	the chain of cb-backups. */
-+	while(skb->cb_next != NULL) {
-+		printk(KERN_WARNING "kfree_skb: skb->cb_next: %08x\n",
-+			skb->cb_next);
-+		skb_restore_cb(skb);
-+	}
-+#endif
- #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
- 	nf_conntrack_put(skb->nfct);
- 	nf_conntrack_put_reasm(skb->nfct_reasm);
-@@ -535,6 +621,9 @@ static void __copy_skb_header(struct sk_
- 	new->sp			= secpath_get(old->sp);
- #endif
- 	memcpy(new->cb, old->cb, sizeof(old->cb));
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+   skb_copy_stored_cb(new, old);
-+#endif
- 	new->csum		= old->csum;
- 	new->local_df		= old->local_df;
- 	new->pkt_type		= old->pkt_type;
-@@ -2779,6 +2868,13 @@ void __init skb_init(void)
- 						0,
- 						SLAB_HWCACHE_ALIGN|SLAB_PANIC,
- 						NULL);
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	skbuff_cb_store_cache = kmem_cache_create("skbuff_cb_store_cache",
-+						  sizeof(struct skb_cb_table),
-+						  0,
-+						  SLAB_HWCACHE_ALIGN|SLAB_PANIC,
-+						  NULL);
-+#endif
- }
- 
- /**
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -396,6 +396,18 @@ config NETFILTER_XT_TARGET_LED
- 	  For more information on the LEDs available on your system, see
- 	  Documentation/leds-class.txt
- 
-+config NETFILTER_XT_TARGET_IMQ
-+        tristate '"IMQ" target support'
-+	depends on NETFILTER_XTABLES
-+	depends on IP_NF_MANGLE || IP6_NF_MANGLE
-+	select IMQ
-+	default m if NETFILTER_ADVANCED=n
-+        help
-+          This option adds a `IMQ' target which is used to specify if and
-+          to which imq device packets should get enqueued/dequeued.
-+
-+          To compile it as a module, choose M here.  If unsure, say N.
-+
- config NETFILTER_XT_TARGET_MARK
- 	tristate '"MARK" target support'
- 	default m if NETFILTER_ADVANCED=n
---- a/net/netfilter/Makefile
-+++ b/net/netfilter/Makefile
-@@ -46,6 +46,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_CONNMAR
- obj-$(CONFIG_NETFILTER_XT_TARGET_CONNSECMARK) += xt_CONNSECMARK.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_HL) += xt_HL.o
-+obj-$(CONFIG_NETFILTER_XT_TARGET_IMQ) += xt_IMQ.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_LED) += xt_LED.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_MARK) += xt_MARK.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_NFLOG) += xt_NFLOG.o
---- a/net/netfilter/nf_queue.c
-+++ b/net/netfilter/nf_queue.c
-@@ -20,6 +20,26 @@ static const struct nf_queue_handler *qu
- 
- static DEFINE_MUTEX(queue_handler_mutex);
- 
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+static const struct nf_queue_handler *queue_imq_handler;
-+
-+void nf_register_queue_imq_handler(const struct nf_queue_handler *qh)
-+{
-+	mutex_lock(&queue_handler_mutex);
-+	rcu_assign_pointer(queue_imq_handler, qh);
-+	mutex_unlock(&queue_handler_mutex);
-+}
-+EXPORT_SYMBOL(nf_register_queue_imq_handler);
-+
-+void nf_unregister_queue_imq_handler(void)
-+{
-+	mutex_lock(&queue_handler_mutex);
-+	rcu_assign_pointer(queue_imq_handler, NULL);
-+	mutex_unlock(&queue_handler_mutex);
-+}
-+EXPORT_SYMBOL(nf_unregister_queue_imq_handler);
-+#endif
-+
- /* return EBUSY when somebody else is registered, return EEXIST if the
-  * same handler is registered, return 0 in case of success. */
- int nf_register_queue_handler(u_int8_t pf, const struct nf_queue_handler *qh)
-@@ -80,7 +100,7 @@ void nf_unregister_queue_handlers(const 
- }
- EXPORT_SYMBOL_GPL(nf_unregister_queue_handlers);
- 
--static void nf_queue_entry_release_refs(struct nf_queue_entry *entry)
-+void nf_queue_entry_release_refs(struct nf_queue_entry *entry)
- {
- 	/* Release those devices we held, or Alexey will kill me. */
- 	if (entry->indev)
-@@ -100,6 +120,7 @@ static void nf_queue_entry_release_refs(
- 	/* Drop reference to owner of hook which queued us. */
- 	module_put(entry->elem->owner);
- }
-+EXPORT_SYMBOL_GPL(nf_queue_entry_release_refs);
- 
- /*
-  * Any packet that leaves via this function must come back
-@@ -121,12 +142,26 @@ static int __nf_queue(struct sk_buff *sk
- #endif
- 	const struct nf_afinfo *afinfo;
- 	const struct nf_queue_handler *qh;
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	const struct nf_queue_handler *qih = NULL;
-+#endif
- 
- 	/* QUEUE == DROP if noone is waiting, to be safe. */
- 	rcu_read_lock();
- 
- 	qh = rcu_dereference(queue_handler[pf]);
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	if (pf == PF_INET || pf == PF_INET6)
-+#else
-+	if (pf == PF_INET)
-+#endif
-+		qih = rcu_dereference(queue_imq_handler);
-+
-+	if (!qh && !qih)
-+#else /* !IMQ */
- 	if (!qh)
-+#endif
- 		goto err_unlock;
- 
- 	afinfo = nf_get_afinfo(pf);
-@@ -145,6 +180,10 @@ static int __nf_queue(struct sk_buff *sk
- 		.indev	= indev,
- 		.outdev	= outdev,
- 		.okfn	= okfn,
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+		.next_outfn = qh ? qh->outfn : NULL,
-+		.next_queuenum = queuenum,
-+#endif
- 	};
- 
- 	/* If it's going away, ignore hook. */
-@@ -170,8 +209,19 @@ static int __nf_queue(struct sk_buff *sk
- 	}
- #endif
- 	afinfo->saveroute(skb, entry);
-+
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	if (qih) {
-+		status = qih->outfn(entry, queuenum);
-+		goto imq_skip_queue;
-+	}
-+#endif
-+
- 	status = qh->outfn(entry, queuenum);
- 
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+imq_skip_queue:
-+#endif
- 	rcu_read_unlock();
- 
- 	if (status < 0) {
---- /dev/null
-+++ b/net/netfilter/xt_IMQ.c
-@@ -0,0 +1,73 @@
-+/*
-+ * This target marks packets to be enqueued to an imq device
-+ */
-+#include <linux/module.h>
-+#include <linux/skbuff.h>
-+#include <linux/netfilter/x_tables.h>
-+#include <linux/netfilter/xt_IMQ.h>
-+#include <linux/imq.h>
-+
-+static unsigned int imq_target(struct sk_buff *pskb,
-+				const struct xt_target_param *par)
-+{
-+	const struct xt_imq_info *mr = par->targinfo;
-+
-+	pskb->imq_flags = (mr->todev & IMQ_F_IFMASK) | IMQ_F_ENQUEUE;
-+
-+	return XT_CONTINUE;
-+}
-+
-+static bool imq_checkentry(const struct xt_tgchk_param *par)
-+{
-+	struct xt_imq_info *mr = par->targinfo;
-+
-+	if (mr->todev > IMQ_MAX_DEVS - 1) {
-+		printk(KERN_WARNING
-+		       "IMQ: invalid device specified, highest is %u\n",
-+		       IMQ_MAX_DEVS - 1);
-+		return 0;
-+	}
-+
-+	return 1;
-+}
-+
-+static struct xt_target xt_imq_reg[] __read_mostly = {
-+	{
-+		.name           = "IMQ",
-+		.family		= AF_INET,
-+		.checkentry     = imq_checkentry,
-+		.target         = imq_target,
-+		.targetsize	= sizeof(struct xt_imq_info),
-+		.table		= "mangle",
-+		.me             = THIS_MODULE
-+	},
-+	{
-+		.name           = "IMQ",
-+		.family		= AF_INET6,
-+		.checkentry     = imq_checkentry,
-+		.target         = imq_target,
-+		.targetsize	= sizeof(struct xt_imq_info),
-+		.table		= "mangle",
-+		.me             = THIS_MODULE
-+	},
-+};
-+
-+static int __init imq_init(void)
-+{
-+	return xt_register_targets(xt_imq_reg, ARRAY_SIZE(xt_imq_reg));
-+}
-+
-+static void __exit imq_fini(void)
-+{
-+	xt_unregister_targets(xt_imq_reg, ARRAY_SIZE(xt_imq_reg));
-+}
-+
-+module_init(imq_init);
-+module_exit(imq_fini);
-+
-+MODULE_AUTHOR("http://www.linuximq.net");
-+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS("ipt_IMQ");
-+MODULE_ALIAS("ip6t_IMQ");
-+
diff --git a/target/linux/generic-2.6/patches-2.6.31/180-netfilter_depends.patch b/target/linux/generic-2.6/patches-2.6.31/180-netfilter_depends.patch
deleted file mode 100644
index fc00d159c..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/180-netfilter_depends.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -160,7 +160,6 @@ config NF_CONNTRACK_FTP
- 
- config NF_CONNTRACK_H323
- 	tristate "H.323 protocol support"
--	depends on (IPV6 || IPV6=n)
- 	depends on NETFILTER_ADVANCED
- 	help
- 	  H.323 is a VoIP signalling protocol from ITU-T. As one of the most
-@@ -505,7 +504,6 @@ config NETFILTER_XT_TARGET_SECMARK
- 
- config NETFILTER_XT_TARGET_TCPMSS
- 	tristate '"TCPMSS" target support'
--	depends on (IPV6 || IPV6=n)
- 	default m if NETFILTER_ADVANCED=n
- 	---help---
- 	  This option adds a `TCPMSS' target, which allows you to alter the
diff --git a/target/linux/generic-2.6/patches-2.6.31/190-netfilter_rtsp.patch b/target/linux/generic-2.6/patches-2.6.31/190-netfilter_rtsp.patch
deleted file mode 100644
index 29e82084c..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/190-netfilter_rtsp.patch
+++ /dev/null
@@ -1,1366 +0,0 @@
---- /dev/null
-+++ b/include/linux/netfilter/nf_conntrack_rtsp.h
-@@ -0,0 +1,63 @@
-+/*
-+ * RTSP extension for IP connection tracking.
-+ * (C) 2003 by Tom Marshall <tmarshall at real.com>
-+ * based on ip_conntrack_irc.h
-+ *
-+ *      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.
-+ */
-+#ifndef _IP_CONNTRACK_RTSP_H
-+#define _IP_CONNTRACK_RTSP_H
-+
-+//#define IP_NF_RTSP_DEBUG 1
-+#define IP_NF_RTSP_VERSION "0.6.21"
-+
-+#ifdef __KERNEL__
-+/* port block types */
-+typedef enum {
-+    pb_single,  /* client_port=x */
-+    pb_range,   /* client_port=x-y */
-+    pb_discon   /* client_port=x/y (rtspbis) */
-+} portblock_t;
-+
-+/* We record seq number and length of rtsp headers here, all in host order. */
-+
-+/*
-+ * This structure is per expected connection.  It is a member of struct
-+ * ip_conntrack_expect.  The TCP SEQ for the conntrack expect is stored
-+ * there and we are expected to only store the length of the data which
-+ * needs replaced.  If a packet contains multiple RTSP messages, we create
-+ * one expected connection per message.
-+ *
-+ * We use these variables to mark the entire header block.  This may seem
-+ * like overkill, but the nature of RTSP requires it.  A header may appear
-+ * multiple times in a message.  We must treat two Transport headers the
-+ * same as one Transport header with two entries.
-+ */
-+struct ip_ct_rtsp_expect
-+{
-+    u_int32_t   len;        /* length of header block */
-+    portblock_t pbtype;     /* Type of port block that was requested */
-+    u_int16_t   loport;     /* Port that was requested, low or first */
-+    u_int16_t   hiport;     /* Port that was requested, high or second */
-+#if 0
-+    uint        method;     /* RTSP method */
-+    uint        cseq;       /* CSeq from request */
-+#endif
-+};
-+
-+extern unsigned int (*nf_nat_rtsp_hook)(struct sk_buff *skb,
-+				 enum ip_conntrack_info ctinfo,
-+				 unsigned int matchoff, unsigned int matchlen,
-+				 struct ip_ct_rtsp_expect *prtspexp,
-+				 struct nf_conntrack_expect *exp);
-+
-+extern void (*nf_nat_rtsp_hook_expectfn)(struct nf_conn *ct, struct nf_conntrack_expect *exp);
-+
-+#define RTSP_PORT   554
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _IP_CONNTRACK_RTSP_H */
---- /dev/null
-+++ b/include/linux/netfilter_helpers.h
-@@ -0,0 +1,133 @@
-+/*
-+ * Helpers for netfiler modules.  This file provides implementations for basic
-+ * functions such as strncasecmp(), etc.
-+ *
-+ * gcc will warn for defined but unused functions, so we only include the
-+ * functions requested.  The following macros are used:
-+ *   NF_NEED_STRNCASECMP        nf_strncasecmp()
-+ *   NF_NEED_STRTOU16           nf_strtou16()
-+ *   NF_NEED_STRTOU32           nf_strtou32()
-+ */
-+#ifndef _NETFILTER_HELPERS_H
-+#define _NETFILTER_HELPERS_H
-+
-+/* Only include these functions for kernel code. */
-+#ifdef __KERNEL__
-+
-+#include <linux/ctype.h>
-+#define iseol(c) ( (c) == '\r' || (c) == '\n' )
-+
-+/*
-+ * The standard strncasecmp()
-+ */
-+#ifdef NF_NEED_STRNCASECMP
-+static int
-+nf_strncasecmp(const char* s1, const char* s2, u_int32_t len)
-+{
-+    if (s1 == NULL || s2 == NULL)
-+    {
-+        if (s1 == NULL && s2 == NULL)
-+        {
-+            return 0;
-+        }
-+        return (s1 == NULL) ? -1 : 1;
-+    }
-+    while (len > 0 && tolower(*s1) == tolower(*s2))
-+    {
-+        len--;
-+        s1++;
-+        s2++;
-+    }
-+    return ( (len == 0) ? 0 : (tolower(*s1) - tolower(*s2)) );
-+}
-+#endif /* NF_NEED_STRNCASECMP */
-+
-+/*
-+ * Parse a string containing a 16-bit unsigned integer.
-+ * Returns the number of chars used, or zero if no number is found.
-+ */
-+#ifdef NF_NEED_STRTOU16
-+static int
-+nf_strtou16(const char* pbuf, u_int16_t* pval)
-+{
-+    int n = 0;
-+
-+    *pval = 0;
-+    while (isdigit(pbuf[n]))
-+    {
-+        *pval = (*pval * 10) + (pbuf[n] - '0');
-+        n++;
-+    }
-+
-+    return n;
-+}
-+#endif /* NF_NEED_STRTOU16 */
-+
-+/*
-+ * Parse a string containing a 32-bit unsigned integer.
-+ * Returns the number of chars used, or zero if no number is found.
-+ */
-+#ifdef NF_NEED_STRTOU32
-+static int
-+nf_strtou32(const char* pbuf, u_int32_t* pval)
-+{
-+    int n = 0;
-+
-+    *pval = 0;
-+    while (pbuf[n] >= '0' && pbuf[n] <= '9')
-+    {
-+        *pval = (*pval * 10) + (pbuf[n] - '0');
-+        n++;
-+    }
-+
-+    return n;
-+}
-+#endif /* NF_NEED_STRTOU32 */
-+
-+/*
-+ * Given a buffer and length, advance to the next line and mark the current
-+ * line.
-+ */
-+#ifdef NF_NEED_NEXTLINE
-+static int
-+nf_nextline(char* p, uint len, uint* poff, uint* plineoff, uint* plinelen)
-+{
-+    uint    off = *poff;
-+    uint    physlen = 0;
-+
-+    if (off >= len)
-+    {
-+        return 0;
-+    }
-+
-+    while (p[off] != '\n')
-+    {
-+        if (len-off <= 1)
-+        {
-+            return 0;
-+        }
-+
-+        physlen++;
-+        off++;
-+    }
-+
-+    /* if we saw a crlf, physlen needs adjusted */
-+    if (physlen > 0 && p[off] == '\n' && p[off-1] == '\r')
-+    {
-+        physlen--;
-+    }
-+
-+    /* advance past the newline */
-+    off++;
-+
-+    *plineoff = *poff;
-+    *plinelen = physlen;
-+    *poff = off;
-+
-+    return 1;
-+}
-+#endif /* NF_NEED_NEXTLINE */
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _NETFILTER_HELPERS_H */
---- /dev/null
-+++ b/include/linux/netfilter_mime.h
-@@ -0,0 +1,89 @@
-+/*
-+ * MIME functions for netfilter modules.  This file provides implementations
-+ * for basic MIME parsing.  MIME headers are used in many protocols, such as
-+ * HTTP, RTSP, SIP, etc.
-+ *
-+ * gcc will warn for defined but unused functions, so we only include the
-+ * functions requested.  The following macros are used:
-+ *   NF_NEED_MIME_NEXTLINE      nf_mime_nextline()
-+ */
-+#ifndef _NETFILTER_MIME_H
-+#define _NETFILTER_MIME_H
-+
-+/* Only include these functions for kernel code. */
-+#ifdef __KERNEL__
-+
-+#include <linux/ctype.h>
-+
-+/*
-+ * Given a buffer and length, advance to the next line and mark the current
-+ * line.  If the current line is empty, *plinelen will be set to zero.  If
-+ * not, it will be set to the actual line length (including CRLF).
-+ *
-+ * 'line' in this context means logical line (includes LWS continuations).
-+ * Returns 1 on success, 0 on failure.
-+ */
-+#ifdef NF_NEED_MIME_NEXTLINE
-+static int
-+nf_mime_nextline(char* p, uint len, uint* poff, uint* plineoff, uint* plinelen)
-+{
-+    uint    off = *poff;
-+    uint    physlen = 0;
-+    int     is_first_line = 1;
-+
-+    if (off >= len)
-+    {
-+        return 0;
-+    }
-+
-+    do
-+    {
-+        while (p[off] != '\n')
-+        {
-+            if (len-off <= 1)
-+            {
-+                return 0;
-+            }
-+
-+            physlen++;
-+            off++;
-+        }
-+
-+        /* if we saw a crlf, physlen needs adjusted */
-+        if (physlen > 0 && p[off] == '\n' && p[off-1] == '\r')
-+        {
-+            physlen--;
-+        }
-+
-+        /* advance past the newline */
-+        off++;
-+
-+        /* check for an empty line */
-+        if (physlen == 0)
-+        {
-+            break;
-+        }
-+
-+        /* check for colon on the first physical line */
-+        if (is_first_line)
-+        {
-+            is_first_line = 0;
-+            if (memchr(p+(*poff), ':', physlen) == NULL)
-+            {
-+                return 0;
-+            }
-+        }
-+    }
-+    while (p[off] == ' ' || p[off] == '\t');
-+
-+    *plineoff = *poff;
-+    *plinelen = (physlen == 0) ? 0 : (off - *poff);
-+    *poff = off;
-+
-+    return 1;
-+}
-+#endif /* NF_NEED_MIME_NEXTLINE */
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _NETFILTER_MIME_H */
---- a/net/ipv4/netfilter/Makefile
-+++ b/net/ipv4/netfilter/Makefile
-@@ -26,6 +26,7 @@ obj-$(CONFIG_NF_NAT_AMANDA) += nf_nat_am
- obj-$(CONFIG_NF_NAT_FTP) += nf_nat_ftp.o
- obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o
- obj-$(CONFIG_NF_NAT_IRC) += nf_nat_irc.o
-+obj-$(CONFIG_NF_NAT_RTSP) += nf_nat_rtsp.o
- obj-$(CONFIG_NF_NAT_PPTP) += nf_nat_pptp.o
- obj-$(CONFIG_NF_NAT_SIP) += nf_nat_sip.o
- obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -267,6 +267,16 @@ config NF_CONNTRACK_TFTP
- 
- 	  To compile it as a module, choose M here.  If unsure, say N.
- 
-+config NF_CONNTRACK_RTSP
-+	tristate "RTSP protocol support"
-+	depends on NF_CONNTRACK
-+	help
-+		Support the RTSP protocol.  This allows UDP transports to be setup
-+		properly, including RTP and RDT.
-+
-+		If you want to compile it as a module, say 'M' here and read
-+		Documentation/modules.txt.  If unsure, say 'Y'.
-+
- config NF_CT_NETLINK
- 	tristate 'Connection tracking netlink interface'
- 	select NETFILTER_NETLINK
---- a/net/netfilter/Makefile
-+++ b/net/netfilter/Makefile
-@@ -33,6 +33,7 @@ obj-$(CONFIG_NF_CONNTRACK_PPTP) += nf_co
- obj-$(CONFIG_NF_CONNTRACK_SANE) += nf_conntrack_sane.o
- obj-$(CONFIG_NF_CONNTRACK_SIP) += nf_conntrack_sip.o
- obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_conntrack_tftp.o
-+obj-$(CONFIG_NF_CONNTRACK_RTSP) += nf_conntrack_rtsp.o
- 
- # transparent proxy support
- obj-$(CONFIG_NETFILTER_TPROXY) += nf_tproxy_core.o
---- a/net/ipv4/netfilter/Kconfig
-+++ b/net/ipv4/netfilter/Kconfig
-@@ -257,6 +257,11 @@ config NF_NAT_IRC
- 	depends on NF_CONNTRACK && NF_NAT
- 	default NF_NAT && NF_CONNTRACK_IRC
- 
-+config NF_NAT_RTSP
-+	tristate
-+ 	depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT
-+ 	default NF_NAT && NF_CONNTRACK_RTSP
-+
- config NF_NAT_TFTP
- 	tristate
- 	depends on NF_CONNTRACK && NF_NAT
---- /dev/null
-+++ b/net/netfilter/nf_conntrack_rtsp.c
-@@ -0,0 +1,517 @@
-+/*
-+ * RTSP extension for IP connection tracking
-+ * (C) 2003 by Tom Marshall <tmarshall at real.com>
-+ * based on ip_conntrack_irc.c
-+ *
-+ *      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.
-+ *
-+ * Module load syntax:
-+ *   insmod nf_conntrack_rtsp.o ports=port1,port2,...port<MAX_PORTS>
-+ *                              max_outstanding=n setup_timeout=secs
-+ *
-+ * If no ports are specified, the default will be port 554.
-+ *
-+ * With max_outstanding you can define the maximum number of not yet
-+ * answered SETUP requests per RTSP session (default 8).
-+ * With setup_timeout you can specify how long the system waits for
-+ * an expected data channel (default 300 seconds).
-+ *
-+ * 2005-02-13: Harald Welte <laforge at netfilter.org>
-+ * 	- port to 2.6
-+ * 	- update to recent post-2.6.11 api changes
-+ * 2006-09-14: Steven Van Acker <deepstar at singularity.be>
-+ *      - removed calls to NAT code from conntrack helper: NAT no longer needed to use rtsp-conntrack
-+ * 2007-04-18: Michael Guntsche <mike at it-loops.com>
-+ * 			- Port to new NF API
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/netfilter.h>
-+#include <linux/ip.h>
-+#include <linux/inet.h>
-+#include <net/tcp.h>
-+
-+#include <net/netfilter/nf_conntrack.h>
-+#include <net/netfilter/nf_conntrack_expect.h>
-+#include <net/netfilter/nf_conntrack_helper.h>
-+#include <linux/netfilter/nf_conntrack_rtsp.h>
-+
-+#define NF_NEED_STRNCASECMP
-+#define NF_NEED_STRTOU16
-+#define NF_NEED_STRTOU32
-+#define NF_NEED_NEXTLINE
-+#include <linux/netfilter_helpers.h>
-+#define NF_NEED_MIME_NEXTLINE
-+#include <linux/netfilter_mime.h>
-+
-+#include <linux/ctype.h>
-+#define MAX_SIMUL_SETUP 8 /* XXX: use max_outstanding */
-+#define INFOP(fmt, args...) printk(KERN_INFO "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#if 0
-+#define DEBUGP(fmt, args...) printk(KERN_DEBUG "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#else
-+#define DEBUGP(fmt, args...)
-+#endif
-+
-+#define MAX_PORTS 8
-+static int ports[MAX_PORTS];
-+static int num_ports = 0;
-+static int max_outstanding = 8;
-+static unsigned int setup_timeout = 300;
-+
-+MODULE_AUTHOR("Tom Marshall <tmarshall at real.com>");
-+MODULE_DESCRIPTION("RTSP connection tracking module");
-+MODULE_LICENSE("GPL");
-+module_param_array(ports, int, &num_ports, 0400);
-+MODULE_PARM_DESC(ports, "port numbers of RTSP servers");
-+module_param(max_outstanding, int, 0400);
-+MODULE_PARM_DESC(max_outstanding, "max number of outstanding SETUP requests per RTSP session");
-+module_param(setup_timeout, int, 0400);
-+MODULE_PARM_DESC(setup_timeout, "timeout on for unestablished data channels");
-+
-+static char *rtsp_buffer;
-+static DEFINE_SPINLOCK(rtsp_buffer_lock);
-+
-+unsigned int (*nf_nat_rtsp_hook)(struct sk_buff *skb,
-+				 enum ip_conntrack_info ctinfo,
-+				 unsigned int matchoff, unsigned int matchlen,struct ip_ct_rtsp_expect* prtspexp,
-+				 struct nf_conntrack_expect *exp);
-+void (*nf_nat_rtsp_hook_expectfn)(struct nf_conn *ct, struct nf_conntrack_expect *exp);
-+
-+EXPORT_SYMBOL_GPL(nf_nat_rtsp_hook);
-+
-+/*
-+ * Max mappings we will allow for one RTSP connection (for RTP, the number
-+ * of allocated ports is twice this value).  Note that SMIL burns a lot of
-+ * ports so keep this reasonably high.  If this is too low, you will see a
-+ * lot of "no free client map entries" messages.
-+ */
-+#define MAX_PORT_MAPS 16
-+
-+/*** default port list was here in the masq code: 554, 3030, 4040 ***/
-+
-+#define SKIP_WSPACE(ptr,len,off) while(off < len && isspace(*(ptr+off))) { off++; }
-+
-+/*
-+ * Parse an RTSP packet.
-+ *
-+ * Returns zero if parsing failed.
-+ *
-+ * Parameters:
-+ *  IN      ptcp        tcp data pointer
-+ *  IN      tcplen      tcp data len
-+ *  IN/OUT  ptcpoff     points to current tcp offset
-+ *  OUT     phdrsoff    set to offset of rtsp headers
-+ *  OUT     phdrslen    set to length of rtsp headers
-+ *  OUT     pcseqoff    set to offset of CSeq header
-+ *  OUT     pcseqlen    set to length of CSeq header
-+ */
-+static int
-+rtsp_parse_message(char* ptcp, uint tcplen, uint* ptcpoff,
-+                   uint* phdrsoff, uint* phdrslen,
-+                   uint* pcseqoff, uint* pcseqlen,
-+                   uint* transoff, uint* translen)
-+{
-+	uint    entitylen = 0;
-+	uint    lineoff;
-+	uint    linelen;
-+
-+	if (!nf_nextline(ptcp, tcplen, ptcpoff, &lineoff, &linelen))
-+		return 0;
-+
-+	*phdrsoff = *ptcpoff;
-+	while (nf_mime_nextline(ptcp, tcplen, ptcpoff, &lineoff, &linelen)) {
-+		if (linelen == 0) {
-+			if (entitylen > 0)
-+				*ptcpoff += min(entitylen, tcplen - *ptcpoff);
-+			break;
-+		}
-+		if (lineoff+linelen > tcplen) {
-+			INFOP("!! overrun !!\n");
-+			break;
-+		}
-+
-+		if (nf_strncasecmp(ptcp+lineoff, "CSeq:", 5) == 0) {
-+			*pcseqoff = lineoff;
-+			*pcseqlen = linelen;
-+		}
-+
-+		if (nf_strncasecmp(ptcp+lineoff, "Transport:", 10) == 0) {
-+			*transoff = lineoff;
-+			*translen = linelen;
-+		}
-+
-+		if (nf_strncasecmp(ptcp+lineoff, "Content-Length:", 15) == 0) {
-+			uint off = lineoff+15;
-+			SKIP_WSPACE(ptcp+lineoff, linelen, off);
-+			nf_strtou32(ptcp+off, &entitylen);
-+		}
-+	}
-+	*phdrslen = (*ptcpoff) - (*phdrsoff);
-+
-+	return 1;
-+}
-+
-+/*
-+ * Find lo/hi client ports (if any) in transport header
-+ * In:
-+ *   ptcp, tcplen = packet
-+ *   tranoff, tranlen = buffer to search
-+ *
-+ * Out:
-+ *   pport_lo, pport_hi = lo/hi ports (host endian)
-+ *
-+ * Returns nonzero if any client ports found
-+ *
-+ * Note: it is valid (and expected) for the client to request multiple
-+ * transports, so we need to parse the entire line.
-+ */
-+static int
-+rtsp_parse_transport(char* ptran, uint tranlen,
-+                     struct ip_ct_rtsp_expect* prtspexp)
-+{
-+	int     rc = 0;
-+	uint    off = 0;
-+
-+	if (tranlen < 10 || !iseol(ptran[tranlen-1]) ||
-+	    nf_strncasecmp(ptran, "Transport:", 10) != 0) {
-+		INFOP("sanity check failed\n");
-+		return 0;
-+	}
-+
-+	DEBUGP("tran='%.*s'\n", (int)tranlen, ptran);
-+	off += 10;
-+	SKIP_WSPACE(ptran, tranlen, off);
-+
-+	/* Transport: tran;field;field=val,tran;field;field=val,... */
-+	while (off < tranlen) {
-+		const char* pparamend;
-+		uint        nextparamoff;
-+
-+		pparamend = memchr(ptran+off, ',', tranlen-off);
-+		pparamend = (pparamend == NULL) ? ptran+tranlen : pparamend+1;
-+		nextparamoff = pparamend-ptran;
-+
-+		while (off < nextparamoff) {
-+			const char* pfieldend;
-+			uint        nextfieldoff;
-+
-+			pfieldend = memchr(ptran+off, ';', nextparamoff-off);
-+			nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
-+
-+			if (strncmp(ptran+off, "client_port=", 12) == 0) {
-+				u_int16_t   port;
-+				uint        numlen;
-+
-+				off += 12;
-+				numlen = nf_strtou16(ptran+off, &port);
-+				off += numlen;
-+				if (prtspexp->loport != 0 && prtspexp->loport != port)
-+					DEBUGP("multiple ports found, port %hu ignored\n", port);
-+				else {
-+					DEBUGP("lo port found : %hu\n", port);
-+					prtspexp->loport = prtspexp->hiport = port;
-+					if (ptran[off] == '-') {
-+						off++;
-+						numlen = nf_strtou16(ptran+off, &port);
-+						off += numlen;
-+						prtspexp->pbtype = pb_range;
-+						prtspexp->hiport = port;
-+
-+						// If we have a range, assume rtp:
-+						// loport must be even, hiport must be loport+1
-+						if ((prtspexp->loport & 0x0001) != 0 ||
-+						    prtspexp->hiport != prtspexp->loport+1) {
-+							DEBUGP("incorrect range: %hu-%hu, correcting\n",
-+							       prtspexp->loport, prtspexp->hiport);
-+							prtspexp->loport &= 0xfffe;
-+							prtspexp->hiport = prtspexp->loport+1;
-+						}
-+					} else if (ptran[off] == '/') {
-+						off++;
-+						numlen = nf_strtou16(ptran+off, &port);
-+						off += numlen;
-+						prtspexp->pbtype = pb_discon;
-+						prtspexp->hiport = port;
-+					}
-+					rc = 1;
-+				}
-+			}
-+
-+			/*
-+			 * Note we don't look for the destination parameter here.
-+			 * If we are using NAT, the NAT module will handle it.  If not,
-+			 * and the client is sending packets elsewhere, the expectation
-+			 * will quietly time out.
-+			 */
-+
-+			off = nextfieldoff;
-+		}
-+
-+		off = nextparamoff;
-+	}
-+
-+	return rc;
-+}
-+
-+void expected(struct nf_conn *ct, struct nf_conntrack_expect *exp)
-+{
-+    if(nf_nat_rtsp_hook_expectfn) {
-+        nf_nat_rtsp_hook_expectfn(ct,exp);
-+    }
-+}
-+
-+/*** conntrack functions ***/
-+
-+/* outbound packet: client->server */
-+
-+static inline int
-+help_out(struct sk_buff *skb, unsigned char *rb_ptr, unsigned int datalen,
-+                struct nf_conn *ct, enum ip_conntrack_info ctinfo)
-+{
-+	struct ip_ct_rtsp_expect expinfo;
-+
-+	int dir = CTINFO2DIR(ctinfo);   /* = IP_CT_DIR_ORIGINAL */
-+	//struct  tcphdr* tcph = (void*)iph + iph->ihl * 4;
-+	//uint    tcplen = pktlen - iph->ihl * 4;
-+	char*   pdata = rb_ptr;
-+	//uint    datalen = tcplen - tcph->doff * 4;
-+	uint    dataoff = 0;
-+	int ret = NF_ACCEPT;
-+
-+	struct nf_conntrack_expect *exp;
-+
-+	__be16 be_loport;
-+
-+	memset(&expinfo, 0, sizeof(expinfo));
-+
-+	while (dataoff < datalen) {
-+		uint    cmdoff = dataoff;
-+		uint    hdrsoff = 0;
-+		uint    hdrslen = 0;
-+		uint    cseqoff = 0;
-+		uint    cseqlen = 0;
-+		uint    transoff = 0;
-+		uint    translen = 0;
-+		uint    off;
-+
-+		if (!rtsp_parse_message(pdata, datalen, &dataoff,
-+					&hdrsoff, &hdrslen,
-+					&cseqoff, &cseqlen,
-+					&transoff, &translen))
-+			break;      /* not a valid message */
-+
-+		if (strncmp(pdata+cmdoff, "SETUP ", 6) != 0)
-+			continue;   /* not a SETUP message */
-+		DEBUGP("found a setup message\n");
-+
-+		off = 0;
-+		if(translen) {
-+			rtsp_parse_transport(pdata+transoff, translen, &expinfo);
-+		}
-+
-+		if (expinfo.loport == 0) {
-+			DEBUGP("no udp transports found\n");
-+			continue;   /* no udp transports found */
-+		}
-+
-+		DEBUGP("udp transport found, ports=(%d,%hu,%hu)\n",
-+		       (int)expinfo.pbtype, expinfo.loport, expinfo.hiport);
-+
-+		exp = nf_ct_expect_alloc(ct);
-+		if (!exp) {
-+			ret = NF_DROP;
-+			goto out;
-+		}
-+
-+		be_loport = htons(expinfo.loport);
-+
-+		nf_ct_expect_init(exp, NF_CT_EXPECT_CLASS_DEFAULT,
-+			ct->tuplehash[!dir].tuple.src.l3num,
-+			&ct->tuplehash[!dir].tuple.src.u3, &ct->tuplehash[!dir].tuple.dst.u3,
-+			IPPROTO_UDP, NULL, &be_loport);
-+
-+		exp->master = ct;
-+
-+		exp->expectfn = expected;
-+		exp->flags = 0;
-+
-+		if (expinfo.pbtype == pb_range) {
-+			DEBUGP("Changing expectation mask to handle multiple ports\n");
-+			exp->mask.src.u.udp.port  = 0xfffe;
-+		}
-+
-+		DEBUGP("expect_related %u.%u.%u.%u:%u-%u.%u.%u.%u:%u\n",
-+		       NIPQUAD(exp->tuple.src.u3.ip),
-+		       ntohs(exp->tuple.src.u.udp.port),
-+		       NIPQUAD(exp->tuple.dst.u3.ip),
-+		       ntohs(exp->tuple.dst.u.udp.port));
-+
-+		if (nf_nat_rtsp_hook)
-+			/* pass the request off to the nat helper */
-+			ret = nf_nat_rtsp_hook(skb, ctinfo, hdrsoff, hdrslen, &expinfo, exp);
-+		else if (nf_ct_expect_related(exp) != 0) {
-+			INFOP("nf_ct_expect_related failed\n");
-+			ret  = NF_DROP;
-+		}
-+		nf_ct_expect_put(exp);
-+		goto out;
-+	}
-+out:
-+
-+	return ret;
-+}
-+
-+
-+static inline int
-+help_in(struct sk_buff *skb, size_t pktlen,
-+ struct nf_conn* ct, enum ip_conntrack_info ctinfo)
-+{
-+ return NF_ACCEPT;
-+}
-+
-+static int help(struct sk_buff *skb, unsigned int protoff,
-+		struct nf_conn *ct, enum ip_conntrack_info ctinfo)
-+{
-+	struct tcphdr _tcph, *th;
-+	unsigned int dataoff, datalen;
-+	char *rb_ptr;
-+	int ret = NF_DROP;
-+
-+	/* Until there's been traffic both ways, don't look in packets. */
-+	if (ctinfo != IP_CT_ESTABLISHED &&
-+	    ctinfo != IP_CT_ESTABLISHED + IP_CT_IS_REPLY) {
-+		DEBUGP("conntrackinfo = %u\n", ctinfo);
-+		return NF_ACCEPT;
-+	}
-+
-+	/* Not whole TCP header? */
-+	th = skb_header_pointer(skb, protoff, sizeof(_tcph), &_tcph);
-+
-+	if (!th)
-+		return NF_ACCEPT;
-+
-+	/* No data ? */
-+	dataoff = protoff + th->doff*4;
-+	datalen = skb->len - dataoff;
-+	if (dataoff >= skb->len)
-+		return NF_ACCEPT;
-+
-+	spin_lock_bh(&rtsp_buffer_lock);
-+	rb_ptr = skb_header_pointer(skb, dataoff,
-+				    skb->len - dataoff, rtsp_buffer);
-+	BUG_ON(rb_ptr == NULL);
-+
-+#if 0
-+	/* Checksum invalid?  Ignore. */
-+	/* FIXME: Source route IP option packets --RR */
-+	if (tcp_v4_check(tcph, tcplen, iph->saddr, iph->daddr,
-+			 csum_partial((char*)tcph, tcplen, 0)))
-+	{
-+		DEBUGP("bad csum: %p %u %u.%u.%u.%u %u.%u.%u.%u\n",
-+		       tcph, tcplen, NIPQUAD(iph->saddr), NIPQUAD(iph->daddr));
-+		return NF_ACCEPT;
-+	}
-+#endif
-+
-+	switch (CTINFO2DIR(ctinfo)) {
-+	case IP_CT_DIR_ORIGINAL:
-+		ret = help_out(skb, rb_ptr, datalen, ct, ctinfo);
-+		break;
-+	case IP_CT_DIR_REPLY:
-+		DEBUGP("IP_CT_DIR_REPLY\n");
-+		/* inbound packet: server->client */
-+		ret = NF_ACCEPT;
-+		break;
-+	}
-+
-+	spin_unlock_bh(&rtsp_buffer_lock);
-+
-+	return ret;
-+}
-+
-+static struct nf_conntrack_helper rtsp_helpers[MAX_PORTS];
-+static char rtsp_names[MAX_PORTS][10];
-+static struct nf_conntrack_expect_policy rtsp_expect_policy;
-+
-+/* This function is intentionally _NOT_ defined as __exit */
-+static void
-+fini(void)
-+{
-+	int i;
-+	for (i = 0; i < num_ports; i++) {
-+		DEBUGP("unregistering port %d\n", ports[i]);
-+		nf_conntrack_helper_unregister(&rtsp_helpers[i]);
-+	}
-+	kfree(rtsp_buffer);
-+}
-+
-+static int __init
-+init(void)
-+{
-+	int i, ret;
-+	struct nf_conntrack_helper *hlpr;
-+	char *tmpname;
-+
-+	printk("nf_conntrack_rtsp v" IP_NF_RTSP_VERSION " loading\n");
-+
-+	if (max_outstanding < 1) {
-+		printk("nf_conntrack_rtsp: max_outstanding must be a positive integer\n");
-+		return -EBUSY;
-+	}
-+	if (setup_timeout < 0) {
-+		printk("nf_conntrack_rtsp: setup_timeout must be a positive integer\n");
-+		return -EBUSY;
-+	}
-+
-+	rtsp_expect_policy.max_expected = max_outstanding;
-+	rtsp_expect_policy.timeout = setup_timeout;
-+
-+	rtsp_buffer = kmalloc(65536, GFP_KERNEL);
-+	if (!rtsp_buffer)
-+		return -ENOMEM;
-+
-+	/* If no port given, default to standard rtsp port */
-+	if (ports[0] == 0) {
-+		ports[0] = RTSP_PORT;
-+	}
-+
-+	for (i = 0; (i < MAX_PORTS) && ports[i]; i++) {
-+		hlpr = &rtsp_helpers[i];
-+		memset(hlpr, 0, sizeof(struct nf_conntrack_helper));
-+		hlpr->tuple.src.u.tcp.port = htons(ports[i]);
-+		hlpr->tuple.dst.protonum = IPPROTO_TCP;
-+		hlpr->expect_policy = &rtsp_expect_policy;
-+		hlpr->me = THIS_MODULE;
-+		hlpr->help = help;
-+
-+		tmpname = &rtsp_names[i][0];
-+		if (ports[i] == RTSP_PORT) {
-+			sprintf(tmpname, "rtsp");
-+		} else {
-+			sprintf(tmpname, "rtsp-%d", i);
-+		}
-+		hlpr->name = tmpname;
-+
-+		DEBUGP("port #%d: %d\n", i, ports[i]);
-+
-+		ret = nf_conntrack_helper_register(hlpr);
-+
-+		if (ret) {
-+			printk("nf_conntrack_rtsp: ERROR registering port %d\n", ports[i]);
-+			fini();
-+			return -EBUSY;
-+		}
-+		num_ports++;
-+	}
-+	return 0;
-+}
-+
-+module_init(init);
-+module_exit(fini);
-+
-+EXPORT_SYMBOL(nf_nat_rtsp_hook_expectfn);
-+
---- /dev/null
-+++ b/net/ipv4/netfilter/nf_nat_rtsp.c
-@@ -0,0 +1,496 @@
-+/*
-+ * RTSP extension for TCP NAT alteration
-+ * (C) 2003 by Tom Marshall <tmarshall at real.com>
-+ * based on ip_nat_irc.c
-+ *
-+ *      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.
-+ *
-+ * Module load syntax:
-+ *      insmod nf_nat_rtsp.o ports=port1,port2,...port<MAX_PORTS>
-+ *                           stunaddr=<address>
-+ *                           destaction=[auto|strip|none]
-+ *
-+ * If no ports are specified, the default will be port 554 only.
-+ *
-+ * stunaddr specifies the address used to detect that a client is using STUN.
-+ * If this address is seen in the destination parameter, it is assumed that
-+ * the client has already punched a UDP hole in the firewall, so we don't
-+ * mangle the client_port.  If none is specified, it is autodetected.  It
-+ * only needs to be set if you have multiple levels of NAT.  It should be
-+ * set to the external address that the STUN clients detect.  Note that in
-+ * this case, it will not be possible for clients to use UDP with servers
-+ * between the NATs.
-+ *
-+ * If no destaction is specified, auto is used.
-+ *   destaction=auto:  strip destination parameter if it is not stunaddr.
-+ *   destaction=strip: always strip destination parameter (not recommended).
-+ *   destaction=none:  do not touch destination parameter (not recommended).
-+ */
-+
-+#include <linux/module.h>
-+#include <net/tcp.h>
-+#include <net/netfilter/nf_nat_helper.h>
-+#include <net/netfilter/nf_nat_rule.h>
-+#include <linux/netfilter/nf_conntrack_rtsp.h>
-+#include <net/netfilter/nf_conntrack_expect.h>
-+
-+#include <linux/inet.h>
-+#include <linux/ctype.h>
-+#define NF_NEED_STRNCASECMP
-+#define NF_NEED_STRTOU16
-+#include <linux/netfilter_helpers.h>
-+#define NF_NEED_MIME_NEXTLINE
-+#include <linux/netfilter_mime.h>
-+
-+#define INFOP(fmt, args...) printk(KERN_INFO "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#if 0
-+#define DEBUGP(fmt, args...) printk(KERN_DEBUG "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#else
-+#define DEBUGP(fmt, args...)
-+#endif
-+
-+#define MAX_PORTS       8
-+#define DSTACT_AUTO     0
-+#define DSTACT_STRIP    1
-+#define DSTACT_NONE     2
-+
-+static char*    stunaddr = NULL;
-+static char*    destaction = NULL;
-+
-+static u_int32_t extip = 0;
-+static int       dstact = 0;
-+
-+MODULE_AUTHOR("Tom Marshall <tmarshall at real.com>");
-+MODULE_DESCRIPTION("RTSP network address translation module");
-+MODULE_LICENSE("GPL");
-+module_param(stunaddr, charp, 0644);
-+MODULE_PARM_DESC(stunaddr, "Address for detecting STUN");
-+module_param(destaction, charp, 0644);
-+MODULE_PARM_DESC(destaction, "Action for destination parameter (auto/strip/none)");
-+
-+#define SKIP_WSPACE(ptr,len,off) while(off < len && isspace(*(ptr+off))) { off++; }
-+
-+/*** helper functions ***/
-+
-+static void
-+get_skb_tcpdata(struct sk_buff* skb, char** pptcpdata, uint* ptcpdatalen)
-+{
-+    struct iphdr*   iph  = ip_hdr(skb);
-+    struct tcphdr*  tcph = (void *)iph + ip_hdrlen(skb);
-+
-+    *pptcpdata = (char*)tcph +  tcph->doff*4;
-+    *ptcpdatalen = ((char*)skb_transport_header(skb) + skb->len) - *pptcpdata;
-+}
-+
-+/*** nat functions ***/
-+
-+/*
-+ * Mangle the "Transport:" header:
-+ *   - Replace all occurences of "client_port=<spec>"
-+ *   - Handle destination parameter
-+ *
-+ * In:
-+ *   ct, ctinfo = conntrack context
-+ *   skb        = packet
-+ *   tranoff    = Transport header offset from TCP data
-+ *   tranlen    = Transport header length (incl. CRLF)
-+ *   rport_lo   = replacement low  port (host endian)
-+ *   rport_hi   = replacement high port (host endian)
-+ *
-+ * Returns packet size difference.
-+ *
-+ * Assumes that a complete transport header is present, ending with CR or LF
-+ */
-+static int
-+rtsp_mangle_tran(enum ip_conntrack_info ctinfo,
-+                 struct nf_conntrack_expect* exp,
-+								 struct ip_ct_rtsp_expect* prtspexp,
-+                 struct sk_buff* skb, uint tranoff, uint tranlen)
-+{
-+    char*       ptcp;
-+    uint        tcplen;
-+    char*       ptran;
-+    char        rbuf1[16];      /* Replacement buffer (one port) */
-+    uint        rbuf1len;       /* Replacement len (one port) */
-+    char        rbufa[16];      /* Replacement buffer (all ports) */
-+    uint        rbufalen;       /* Replacement len (all ports) */
-+    u_int32_t   newip;
-+    u_int16_t   loport, hiport;
-+    uint        off = 0;
-+    uint        diff;           /* Number of bytes we removed */
-+
-+    struct nf_conn *ct = exp->master;
-+    struct nf_conntrack_tuple *t;
-+
-+    char    szextaddr[15+1];
-+    uint    extaddrlen;
-+    int     is_stun;
-+
-+    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+    ptran = ptcp+tranoff;
-+
-+    if (tranoff+tranlen > tcplen || tcplen-tranoff < tranlen ||
-+        tranlen < 10 || !iseol(ptran[tranlen-1]) ||
-+        nf_strncasecmp(ptran, "Transport:", 10) != 0)
-+    {
-+        INFOP("sanity check failed\n");
-+        return 0;
-+    }
-+    off += 10;
-+    SKIP_WSPACE(ptcp+tranoff, tranlen, off);
-+
-+    newip = ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip;
-+    t = &exp->tuple;
-+    t->dst.u3.ip = newip;
-+
-+    extaddrlen = extip ? sprintf(szextaddr, "%u.%u.%u.%u", NIPQUAD(extip))
-+                       : sprintf(szextaddr, "%u.%u.%u.%u", NIPQUAD(newip));
-+    DEBUGP("stunaddr=%s (%s)\n", szextaddr, (extip?"forced":"auto"));
-+
-+    rbuf1len = rbufalen = 0;
-+    switch (prtspexp->pbtype)
-+    {
-+    case pb_single:
-+        for (loport = prtspexp->loport; loport != 0; loport++) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(loport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                DEBUGP("using port %hu\n", loport);
-+                break;
-+            }
-+        }
-+        if (loport != 0)
-+        {
-+            rbuf1len = sprintf(rbuf1, "%hu", loport);
-+            rbufalen = sprintf(rbufa, "%hu", loport);
-+        }
-+        break;
-+    case pb_range:
-+        for (loport = prtspexp->loport; loport != 0; loport += 2) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(loport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                hiport = loport + ~exp->mask.src.u.udp.port;
-+                DEBUGP("using ports %hu-%hu\n", loport, hiport);
-+                break;
-+            }
-+        }
-+        if (loport != 0)
-+        {
-+            rbuf1len = sprintf(rbuf1, "%hu", loport);
-+            rbufalen = sprintf(rbufa, "%hu-%hu", loport, loport+1);
-+        }
-+        break;
-+    case pb_discon:
-+        for (loport = prtspexp->loport; loport != 0; loport++) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(loport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                DEBUGP("using port %hu (1 of 2)\n", loport);
-+                break;
-+            }
-+        }
-+        for (hiport = prtspexp->hiport; hiport != 0; hiport++) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(hiport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                DEBUGP("using port %hu (2 of 2)\n", hiport);
-+                break;
-+            }
-+        }
-+        if (loport != 0 && hiport != 0)
-+        {
-+            rbuf1len = sprintf(rbuf1, "%hu", loport);
-+            if (hiport == loport+1)
-+            {
-+                rbufalen = sprintf(rbufa, "%hu-%hu", loport, hiport);
-+            }
-+            else
-+            {
-+                rbufalen = sprintf(rbufa, "%hu/%hu", loport, hiport);
-+            }
-+        }
-+        break;
-+    }
-+
-+    if (rbuf1len == 0)
-+    {
-+        return 0;   /* cannot get replacement port(s) */
-+    }
-+
-+    /* Transport: tran;field;field=val,tran;field;field=val,... */
-+    while (off < tranlen)
-+    {
-+        uint        saveoff;
-+        const char* pparamend;
-+        uint        nextparamoff;
-+
-+        pparamend = memchr(ptran+off, ',', tranlen-off);
-+        pparamend = (pparamend == NULL) ? ptran+tranlen : pparamend+1;
-+        nextparamoff = pparamend-ptcp;
-+
-+        /*
-+         * We pass over each param twice.  On the first pass, we look for a
-+         * destination= field.  It is handled by the security policy.  If it
-+         * is present, allowed, and equal to our external address, we assume
-+         * that STUN is being used and we leave the client_port= field alone.
-+         */
-+        is_stun = 0;
-+        saveoff = off;
-+        while (off < nextparamoff)
-+        {
-+            const char* pfieldend;
-+            uint        nextfieldoff;
-+
-+            pfieldend = memchr(ptran+off, ';', nextparamoff-off);
-+            nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
-+
-+            if (dstact != DSTACT_NONE && strncmp(ptran+off, "destination=", 12) == 0)
-+            {
-+                if (strncmp(ptran+off+12, szextaddr, extaddrlen) == 0)
-+                {
-+                    is_stun = 1;
-+                }
-+                if (dstact == DSTACT_STRIP || (dstact == DSTACT_AUTO && !is_stun))
-+                {
-+                    diff = nextfieldoff-off;
-+                    if (!nf_nat_mangle_tcp_packet(skb, ct, ctinfo,
-+                                                         off, diff, NULL, 0))
-+                    {
-+                        /* mangle failed, all we can do is bail */
-+			nf_ct_unexpect_related(exp);
-+                        return 0;
-+                    }
-+                    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+                    ptran = ptcp+tranoff;
-+                    tranlen -= diff;
-+                    nextparamoff -= diff;
-+                    nextfieldoff -= diff;
-+                }
-+            }
-+
-+            off = nextfieldoff;
-+        }
-+        if (is_stun)
-+        {
-+            continue;
-+        }
-+        off = saveoff;
-+        while (off < nextparamoff)
-+        {
-+            const char* pfieldend;
-+            uint        nextfieldoff;
-+
-+            pfieldend = memchr(ptran+off, ';', nextparamoff-off);
-+            nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
-+
-+            if (strncmp(ptran+off, "client_port=", 12) == 0)
-+            {
-+                u_int16_t   port;
-+                uint        numlen;
-+                uint        origoff;
-+                uint        origlen;
-+                char*       rbuf    = rbuf1;
-+                uint        rbuflen = rbuf1len;
-+
-+                off += 12;
-+                origoff = (ptran-ptcp)+off;
-+                origlen = 0;
-+                numlen = nf_strtou16(ptran+off, &port);
-+                off += numlen;
-+                origlen += numlen;
-+                if (port != prtspexp->loport)
-+                {
-+                    DEBUGP("multiple ports found, port %hu ignored\n", port);
-+                }
-+                else
-+                {
-+                    if (ptran[off] == '-' || ptran[off] == '/')
-+                    {
-+                        off++;
-+                        origlen++;
-+                        numlen = nf_strtou16(ptran+off, &port);
-+                        off += numlen;
-+                        origlen += numlen;
-+                        rbuf = rbufa;
-+                        rbuflen = rbufalen;
-+                    }
-+
-+                    /*
-+                     * note we cannot just memcpy() if the sizes are the same.
-+                     * the mangle function does skb resizing, checks for a
-+                     * cloned skb, and updates the checksums.
-+                     *
-+                     * parameter 4 below is offset from start of tcp data.
-+                     */
-+                    diff = origlen-rbuflen;
-+                    if (!nf_nat_mangle_tcp_packet(skb, ct, ctinfo,
-+                                              origoff, origlen, rbuf, rbuflen))
-+                    {
-+                        /* mangle failed, all we can do is bail */
-+			nf_ct_unexpect_related(exp);
-+                        return 0;
-+                    }
-+                    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+                    ptran = ptcp+tranoff;
-+                    tranlen -= diff;
-+                    nextparamoff -= diff;
-+                    nextfieldoff -= diff;
-+                }
-+            }
-+
-+            off = nextfieldoff;
-+        }
-+
-+        off = nextparamoff;
-+    }
-+
-+    return 1;
-+}
-+
-+static uint
-+help_out(struct sk_buff *skb, enum ip_conntrack_info ctinfo,
-+	 unsigned int matchoff, unsigned int matchlen, struct ip_ct_rtsp_expect* prtspexp,
-+	 struct nf_conntrack_expect* exp)
-+{
-+    char*   ptcp;
-+    uint    tcplen;
-+    uint    hdrsoff;
-+    uint    hdrslen;
-+    uint    lineoff;
-+    uint    linelen;
-+    uint    off;
-+
-+    //struct iphdr* iph = (struct iphdr*)skb->nh.iph;
-+    //struct tcphdr* tcph = (struct tcphdr*)((void*)iph + iph->ihl*4);
-+
-+    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+    hdrsoff = matchoff;//exp->seq - ntohl(tcph->seq);
-+    hdrslen = matchlen;
-+    off = hdrsoff;
-+    DEBUGP("NAT rtsp help_out\n");
-+
-+    while (nf_mime_nextline(ptcp, hdrsoff+hdrslen, &off, &lineoff, &linelen))
-+    {
-+        if (linelen == 0)
-+        {
-+            break;
-+        }
-+        if (off > hdrsoff+hdrslen)
-+        {
-+            INFOP("!! overrun !!");
-+            break;
-+        }
-+        DEBUGP("hdr: len=%u, %.*s", linelen, (int)linelen, ptcp+lineoff);
-+
-+        if (nf_strncasecmp(ptcp+lineoff, "Transport:", 10) == 0)
-+        {
-+            uint oldtcplen = tcplen;
-+	    DEBUGP("hdr: Transport\n");
-+            if (!rtsp_mangle_tran(ctinfo, exp, prtspexp, skb, lineoff, linelen))
-+            {
-+		DEBUGP("hdr: Transport mangle failed");
-+                break;
-+            }
-+            get_skb_tcpdata(skb, &ptcp, &tcplen);
-+            hdrslen -= (oldtcplen-tcplen);
-+            off -= (oldtcplen-tcplen);
-+            lineoff -= (oldtcplen-tcplen);
-+            linelen -= (oldtcplen-tcplen);
-+            DEBUGP("rep: len=%u, %.*s", linelen, (int)linelen, ptcp+lineoff);
-+        }
-+    }
-+
-+    return NF_ACCEPT;
-+}
-+
-+static unsigned int
-+help(struct sk_buff *skb, enum ip_conntrack_info ctinfo,
-+     unsigned int matchoff, unsigned int matchlen, struct ip_ct_rtsp_expect* prtspexp,
-+     struct nf_conntrack_expect* exp)
-+{
-+    int dir = CTINFO2DIR(ctinfo);
-+    int rc = NF_ACCEPT;
-+
-+    switch (dir)
-+    {
-+    case IP_CT_DIR_ORIGINAL:
-+        rc = help_out(skb, ctinfo, matchoff, matchlen, prtspexp, exp);
-+        break;
-+    case IP_CT_DIR_REPLY:
-+	DEBUGP("unmangle ! %u\n", ctinfo);
-+    	/* XXX: unmangle */
-+	rc = NF_ACCEPT;
-+        break;
-+    }
-+    //UNLOCK_BH(&ip_rtsp_lock);
-+
-+    return rc;
-+}
-+
-+static void expected(struct nf_conn* ct, struct nf_conntrack_expect *exp)
-+{
-+    struct nf_nat_multi_range_compat mr;
-+    u_int32_t newdstip, newsrcip, newip;
-+
-+    struct nf_conn *master = ct->master;
-+
-+    newdstip = master->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
-+    newsrcip = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
-+    //FIXME (how to port that ?)
-+    //code from 2.4 : newip = (HOOK2MANIP(hooknum) == IP_NAT_MANIP_SRC) ? newsrcip : newdstip;
-+    newip = newdstip;
-+
-+    DEBUGP("newsrcip=%u.%u.%u.%u, newdstip=%u.%u.%u.%u, newip=%u.%u.%u.%u\n",
-+           NIPQUAD(newsrcip), NIPQUAD(newdstip), NIPQUAD(newip));
-+
-+    mr.rangesize = 1;
-+    // We don't want to manip the per-protocol, just the IPs.
-+    mr.range[0].flags = IP_NAT_RANGE_MAP_IPS;
-+    mr.range[0].min_ip = mr.range[0].max_ip = newip;
-+
-+    nf_nat_setup_info(ct, &mr.range[0], IP_NAT_MANIP_DST);
-+}
-+
-+
-+static void __exit fini(void)
-+{
-+	nf_nat_rtsp_hook = NULL;
-+        nf_nat_rtsp_hook_expectfn = NULL;
-+	synchronize_net();
-+}
-+
-+static int __init init(void)
-+{
-+	printk("nf_nat_rtsp v" IP_NF_RTSP_VERSION " loading\n");
-+
-+	BUG_ON(nf_nat_rtsp_hook);
-+	nf_nat_rtsp_hook = help;
-+        nf_nat_rtsp_hook_expectfn = &expected;
-+
-+	if (stunaddr != NULL)
-+		extip = in_aton(stunaddr);
-+
-+	if (destaction != NULL) {
-+	        if (strcmp(destaction, "auto") == 0)
-+			dstact = DSTACT_AUTO;
-+
-+		if (strcmp(destaction, "strip") == 0)
-+			dstact = DSTACT_STRIP;
-+
-+		if (strcmp(destaction, "none") == 0)
-+			dstact = DSTACT_NONE;
-+	}
-+
-+	return 0;
-+}
-+
-+module_init(init);
-+module_exit(fini);
diff --git a/target/linux/generic-2.6/patches-2.6.31/200-sched_esfq.patch b/target/linux/generic-2.6/patches-2.6.31/200-sched_esfq.patch
deleted file mode 100644
index f3636e652..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/200-sched_esfq.patch
+++ /dev/null
@@ -1,795 +0,0 @@
---- a/include/linux/pkt_sched.h
-+++ b/include/linux/pkt_sched.h
-@@ -182,8 +182,37 @@ struct tc_sfq_xstats
-  *
-  *	The only reason for this is efficiency, it is possible
-  *	to change these parameters in compile time.
-+ *
-+ *	If you need to play with these values, use esfq instead.
-  */
- 
-+/* ESFQ section */
-+
-+enum
-+{
-+        /* traditional */
-+	TCA_SFQ_HASH_CLASSIC,
-+	TCA_SFQ_HASH_DST,
-+	TCA_SFQ_HASH_SRC,
-+	TCA_SFQ_HASH_FWMARK,
-+	/* conntrack */
-+	TCA_SFQ_HASH_CTORIGDST,
-+	TCA_SFQ_HASH_CTORIGSRC,
-+	TCA_SFQ_HASH_CTREPLDST,
-+	TCA_SFQ_HASH_CTREPLSRC,
-+	TCA_SFQ_HASH_CTNATCHG,
-+};
-+
-+struct tc_esfq_qopt
-+{
-+	unsigned	quantum;	/* Bytes per round allocated to flow */
-+	int		perturb_period;	/* Period of hash perturbation */
-+	__u32		limit;		/* Maximal packets in queue */
-+	unsigned	divisor;	/* Hash divisor  */
-+	unsigned	flows;		/* Maximal number of flows  */
-+	unsigned	hash_kind;	/* Hash function to use for flow identification */
-+};
-+
- /* RED section */
- 
- enum
---- a/net/sched/Kconfig
-+++ b/net/sched/Kconfig
-@@ -137,6 +137,37 @@ config NET_SCH_SFQ
- 	  To compile this code as a module, choose M here: the
- 	  module will be called sch_sfq.
- 
-+config NET_SCH_ESFQ
-+	tristate "Enhanced Stochastic Fairness Queueing (ESFQ)"
-+	---help---
-+	  Say Y here if you want to use the Enhanced Stochastic Fairness
-+	  Queueing (ESFQ) packet scheduling algorithm for some of your network
-+	  devices or as a leaf discipline for a classful qdisc such as HTB or
-+	  CBQ (see the top of <file:net/sched/sch_esfq.c> for details and
-+	  references to the SFQ algorithm).
-+
-+	  This is an enchanced SFQ version which allows you to control some
-+	  hardcoded values in the SFQ scheduler.
-+
-+	  ESFQ also adds control of the hash function used to identify packet
-+	  flows. The original SFQ discipline hashes by connection; ESFQ add
-+	  several other hashing methods, such as by src IP or by dst IP, which
-+	  can be more fair to users in some networking situations.
-+
-+	  To compile this code as a module, choose M here: the
-+	  module will be called sch_esfq.
-+
-+config NET_SCH_ESFQ_NFCT
-+	bool "Connection Tracking Hash Types"
-+	depends on NET_SCH_ESFQ && NF_CONNTRACK
-+	---help---
-+	  Say Y here to enable support for hashing based on netfilter connection
-+	  tracking information. This is useful for a router that is also using
-+	  NAT to connect privately-addressed hosts to the Internet. If you want
-+	  to provide fair distribution of upstream bandwidth, ESFQ must use
-+	  connection tracking information, since all outgoing packets will share
-+	  the same source address.
-+
- config NET_SCH_TEQL
- 	tristate "True Link Equalizer (TEQL)"
- 	---help---
---- a/net/sched/Makefile
-+++ b/net/sched/Makefile
-@@ -24,6 +24,7 @@ obj-$(CONFIG_NET_SCH_GRED)	+= sch_gred.o
- obj-$(CONFIG_NET_SCH_INGRESS)	+= sch_ingress.o 
- obj-$(CONFIG_NET_SCH_DSMARK)	+= sch_dsmark.o
- obj-$(CONFIG_NET_SCH_SFQ)	+= sch_sfq.o
-+obj-$(CONFIG_NET_SCH_ESFQ)	+= sch_esfq.o
- obj-$(CONFIG_NET_SCH_TBF)	+= sch_tbf.o
- obj-$(CONFIG_NET_SCH_TEQL)	+= sch_teql.o
- obj-$(CONFIG_NET_SCH_PRIO)	+= sch_prio.o
---- /dev/null
-+++ b/net/sched/sch_esfq.c
-@@ -0,0 +1,702 @@
-+/*
-+ * net/sched/sch_esfq.c	Extended Stochastic Fairness Queueing discipline.
-+ *
-+ *		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.
-+ *
-+ * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
-+ *
-+ * Changes:	Alexander Atanasov, <alex@ssi.bg>
-+ *		Added dynamic depth,limit,divisor,hash_kind options.
-+ *		Added dst and src hashes.
-+ *
-+ * 		Alexander Clouter, <alex@digriz.org.uk>
-+ *		Ported ESFQ to Linux 2.6.
-+ *
-+ * 		Corey Hickey, <bugfood-c@fatooh.org>
-+ *		Maintenance of the Linux 2.6 port.
-+ *		Added fwmark hash (thanks to Robert Kurjata).
-+ *		Added usage of jhash.
-+ *		Added conntrack support.
-+ *		Added ctnatchg hash (thanks to Ben Pfountz).
-+ */
-+
-+#include <linux/module.h>
-+#include <asm/uaccess.h>
-+#include <asm/system.h>
-+#include <linux/bitops.h>
-+#include <linux/types.h>
-+#include <linux/kernel.h>
-+#include <linux/jiffies.h>
-+#include <linux/string.h>
-+#include <linux/mm.h>
-+#include <linux/socket.h>
-+#include <linux/sockios.h>
-+#include <linux/in.h>
-+#include <linux/errno.h>
-+#include <linux/interrupt.h>
-+#include <linux/if_ether.h>
-+#include <linux/inet.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/notifier.h>
-+#include <linux/init.h>
-+#include <net/ip.h>
-+#include <net/netlink.h>
-+#include <linux/ipv6.h>
-+#include <net/route.h>
-+#include <linux/skbuff.h>
-+#include <net/sock.h>
-+#include <net/pkt_sched.h>
-+#include <linux/jhash.h>
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+#include <net/netfilter/nf_conntrack.h>
-+#endif
-+
-+/*	Stochastic Fairness Queuing algorithm.
-+	For more comments look at sch_sfq.c.
-+	The difference is that you can change limit, depth,
-+	hash table size and choose alternate hash types.
-+
-+	classic:	same as in sch_sfq.c
-+	dst:		destination IP address
-+	src:		source IP address
-+	fwmark:		netfilter mark value
-+	ctorigdst:	original destination IP address
-+	ctorigsrc:	original source IP address
-+	ctrepldst:	reply destination IP address
-+	ctreplsrc:	reply source IP
-+
-+*/
-+
-+#define ESFQ_HEAD 0
-+#define ESFQ_TAIL 1
-+
-+/* This type should contain at least SFQ_DEPTH*2 values */
-+typedef unsigned int esfq_index;
-+
-+struct esfq_head
-+{
-+	esfq_index	next;
-+	esfq_index	prev;
-+};
-+
-+struct esfq_sched_data
-+{
-+/* Parameters */
-+	int		perturb_period;
-+	unsigned	quantum;	/* Allotment per round: MUST BE >= MTU */
-+	int		limit;
-+	unsigned	depth;
-+	unsigned	hash_divisor;
-+	unsigned	hash_kind;
-+/* Variables */
-+	struct timer_list perturb_timer;
-+	int		perturbation;
-+	esfq_index	tail;		/* Index of current slot in round */
-+	esfq_index	max_depth;	/* Maximal depth */
-+
-+	esfq_index	*ht;			/* Hash table */
-+	esfq_index	*next;			/* Active slots link */
-+	short		*allot;			/* Current allotment per slot */
-+	unsigned short	*hash;			/* Hash value indexed by slots */
-+	struct sk_buff_head	*qs;		/* Slot queue */
-+	struct esfq_head	*dep;		/* Linked list of slots, indexed by depth */
-+};
-+
-+/* This contains the info we will hash. */
-+struct esfq_packet_info
-+{
-+	u32	proto;		/* protocol or port */
-+	u32	src;		/* source from packet header */
-+	u32	dst;		/* destination from packet header */
-+	u32	ctorigsrc;	/* original source from conntrack */
-+	u32	ctorigdst;	/* original destination from conntrack */
-+	u32	ctreplsrc;	/* reply source from conntrack */
-+	u32	ctrepldst;	/* reply destination from conntrack */
-+	u32	mark;		/* netfilter mark (fwmark) */
-+};
-+
-+static __inline__ unsigned esfq_jhash_1word(struct esfq_sched_data *q,u32 a)
-+{
-+	return jhash_1word(a, q->perturbation) & (q->hash_divisor-1);
-+}
-+
-+static __inline__ unsigned esfq_jhash_2words(struct esfq_sched_data *q, u32 a, u32 b)
-+{
-+	return jhash_2words(a, b, q->perturbation) & (q->hash_divisor-1);
-+}
-+
-+static __inline__ unsigned esfq_jhash_3words(struct esfq_sched_data *q, u32 a, u32 b, u32 c)
-+{
-+	return jhash_3words(a, b, c, q->perturbation) & (q->hash_divisor-1);
-+}
-+
-+static unsigned esfq_hash(struct esfq_sched_data *q, struct sk_buff *skb)
-+{
-+	struct esfq_packet_info info;
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+	enum ip_conntrack_info ctinfo;
-+	struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
-+#endif
-+
-+	switch (skb->protocol) {
-+	case __constant_htons(ETH_P_IP):
-+	{
-+		struct iphdr *iph = ip_hdr(skb);
-+		info.dst = iph->daddr;
-+		info.src = iph->saddr;
-+		if (!(iph->frag_off&htons(IP_MF|IP_OFFSET)) &&
-+		    (iph->protocol == IPPROTO_TCP ||
-+		     iph->protocol == IPPROTO_UDP ||
-+		     iph->protocol == IPPROTO_SCTP ||
-+		     iph->protocol == IPPROTO_DCCP ||
-+		     iph->protocol == IPPROTO_ESP))
-+			info.proto = *(((u32*)iph) + iph->ihl);
-+		else
-+			info.proto = iph->protocol;
-+		break;
-+	}
-+	case __constant_htons(ETH_P_IPV6):
-+	{
-+		struct ipv6hdr *iph = ipv6_hdr(skb);
-+		/* Hash ipv6 addresses into a u32. This isn't ideal,
-+		 * but the code is simple. */
-+		info.dst = jhash2(iph->daddr.s6_addr32, 4, q->perturbation);
-+		info.src = jhash2(iph->saddr.s6_addr32, 4, q->perturbation);
-+		if (iph->nexthdr == IPPROTO_TCP ||
-+		    iph->nexthdr == IPPROTO_UDP ||
-+		    iph->nexthdr == IPPROTO_SCTP ||
-+		    iph->nexthdr == IPPROTO_DCCP ||
-+		    iph->nexthdr == IPPROTO_ESP)
-+			info.proto = *(u32*)&iph[1];
-+		else
-+			info.proto = iph->nexthdr;
-+		break;
-+	}
-+	default:
-+		info.dst   = (u32)(unsigned long)skb_dst(skb);
-+		info.src   = (u32)(unsigned long)skb->sk;
-+		info.proto = skb->protocol;
-+	}
-+
-+	info.mark = skb->mark;
-+
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+	/* defaults if there is no conntrack info */
-+	info.ctorigsrc = info.src;
-+	info.ctorigdst = info.dst;
-+	info.ctreplsrc = info.dst;
-+	info.ctrepldst = info.src;
-+	/* collect conntrack info */
-+	if (ct && ct != &nf_conntrack_untracked) {
-+		if (skb->protocol == __constant_htons(ETH_P_IP)) {
-+			info.ctorigsrc = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
-+			info.ctorigdst = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip;
-+			info.ctreplsrc = ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip;
-+			info.ctrepldst = ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip;
-+		}
-+		else if (skb->protocol == __constant_htons(ETH_P_IPV6)) {
-+			/* Again, hash ipv6 addresses into a single u32. */
-+			info.ctorigsrc = jhash2(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip6, 4, q->perturbation);
-+			info.ctorigdst = jhash2(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip6, 4, q->perturbation);
-+			info.ctreplsrc = jhash2(ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip6, 4, q->perturbation);
-+			info.ctrepldst = jhash2(ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip6, 4, q->perturbation);
-+		}
-+
-+	}
-+#endif
-+
-+	switch(q->hash_kind) {
-+	case TCA_SFQ_HASH_CLASSIC:
-+		return esfq_jhash_3words(q, info.dst, info.src, info.proto);
-+	case TCA_SFQ_HASH_DST:
-+		return esfq_jhash_1word(q, info.dst);
-+	case TCA_SFQ_HASH_SRC:
-+		return esfq_jhash_1word(q, info.src);
-+	case TCA_SFQ_HASH_FWMARK:
-+		return esfq_jhash_1word(q, info.mark);
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+	case TCA_SFQ_HASH_CTORIGDST:
-+		return esfq_jhash_1word(q, info.ctorigdst);
-+	case TCA_SFQ_HASH_CTORIGSRC:
-+		return esfq_jhash_1word(q, info.ctorigsrc);
-+	case TCA_SFQ_HASH_CTREPLDST:
-+		return esfq_jhash_1word(q, info.ctrepldst);
-+	case TCA_SFQ_HASH_CTREPLSRC:
-+		return esfq_jhash_1word(q, info.ctreplsrc);
-+	case TCA_SFQ_HASH_CTNATCHG:
-+	{
-+		if (info.ctorigdst == info.ctreplsrc)
-+			return esfq_jhash_1word(q, info.ctorigsrc);
-+		return esfq_jhash_1word(q, info.ctreplsrc);
-+	}
-+#endif
-+	default:
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "ESFQ: Unknown hash method. Falling back to classic.\n");
-+	}
-+	return esfq_jhash_3words(q, info.dst, info.src, info.proto);
-+}
-+
-+static inline void esfq_link(struct esfq_sched_data *q, esfq_index x)
-+{
-+	esfq_index p, n;
-+	int d = q->qs[x].qlen + q->depth;
-+
-+	p = d;
-+	n = q->dep[d].next;
-+	q->dep[x].next = n;
-+	q->dep[x].prev = p;
-+	q->dep[p].next = q->dep[n].prev = x;
-+}
-+
-+static inline void esfq_dec(struct esfq_sched_data *q, esfq_index x)
-+{
-+	esfq_index p, n;
-+
-+	n = q->dep[x].next;
-+	p = q->dep[x].prev;
-+	q->dep[p].next = n;
-+	q->dep[n].prev = p;
-+
-+	if (n == p && q->max_depth == q->qs[x].qlen + 1)
-+		q->max_depth--;
-+
-+	esfq_link(q, x);
-+}
-+
-+static inline void esfq_inc(struct esfq_sched_data *q, esfq_index x)
-+{
-+	esfq_index p, n;
-+	int d;
-+
-+	n = q->dep[x].next;
-+	p = q->dep[x].prev;
-+	q->dep[p].next = n;
-+	q->dep[n].prev = p;
-+	d = q->qs[x].qlen;
-+	if (q->max_depth < d)
-+		q->max_depth = d;
-+
-+	esfq_link(q, x);
-+}
-+
-+static unsigned int esfq_drop(struct Qdisc *sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_index d = q->max_depth;
-+	struct sk_buff *skb;
-+	unsigned int len;
-+
-+	/* Queue is full! Find the longest slot and
-+	   drop a packet from it */
-+
-+	if (d > 1) {
-+		esfq_index x = q->dep[d+q->depth].next;
-+		skb = q->qs[x].prev;
-+		len = skb->len;
-+		__skb_unlink(skb, &q->qs[x]);
-+		kfree_skb(skb);
-+		esfq_dec(q, x);
-+		sch->q.qlen--;
-+		sch->qstats.drops++;
-+		sch->qstats.backlog -= len;
-+		return len;
-+	}
-+
-+	if (d == 1) {
-+		/* It is difficult to believe, but ALL THE SLOTS HAVE LENGTH 1. */
-+		d = q->next[q->tail];
-+		q->next[q->tail] = q->next[d];
-+		q->allot[q->next[d]] += q->quantum;
-+		skb = q->qs[d].prev;
-+		len = skb->len;
-+		__skb_unlink(skb, &q->qs[d]);
-+		kfree_skb(skb);
-+		esfq_dec(q, d);
-+		sch->q.qlen--;
-+		q->ht[q->hash[d]] = q->depth;
-+		sch->qstats.drops++;
-+		sch->qstats.backlog -= len;
-+		return len;
-+	}
-+
-+	return 0;
-+}
-+
-+static void esfq_q_enqueue(struct sk_buff *skb, struct esfq_sched_data *q, unsigned int end)
-+{
-+	unsigned hash = esfq_hash(q, skb);
-+	unsigned depth = q->depth;
-+	esfq_index x;
-+
-+	x = q->ht[hash];
-+	if (x == depth) {
-+		q->ht[hash] = x = q->dep[depth].next;
-+		q->hash[x] = hash;
-+	}
-+
-+	if (end == ESFQ_TAIL)
-+		__skb_queue_tail(&q->qs[x], skb);
-+	else
-+		__skb_queue_head(&q->qs[x], skb);
-+
-+	esfq_inc(q, x);
-+	if (q->qs[x].qlen == 1) {		/* The flow is new */
-+		if (q->tail == depth) {	/* It is the first flow */
-+			q->tail = x;
-+			q->next[x] = x;
-+			q->allot[x] = q->quantum;
-+		} else {
-+			q->next[x] = q->next[q->tail];
-+			q->next[q->tail] = x;
-+			q->tail = x;
-+		}
-+	}
-+}
-+
-+static int esfq_enqueue(struct sk_buff *skb, struct Qdisc* sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_q_enqueue(skb, q, ESFQ_TAIL);
-+	sch->qstats.backlog += skb->len;
-+	if (++sch->q.qlen < q->limit-1) {
-+		sch->bstats.bytes += skb->len;
-+		sch->bstats.packets++;
-+		return 0;
-+	}
-+
-+	sch->qstats.drops++;
-+	esfq_drop(sch);
-+	return NET_XMIT_CN;
-+}
-+
-+static struct sk_buff *esfq_peek(struct Qdisc* sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_index a;
-+
-+	/* No active slots */
-+	if (q->tail == q->depth)
-+		return NULL;
-+
-+	a = q->next[q->tail];
-+	return skb_peek(&q->qs[a]);
-+}
-+
-+static struct sk_buff *esfq_q_dequeue(struct esfq_sched_data *q)
-+{
-+	struct sk_buff *skb;
-+	unsigned depth = q->depth;
-+	esfq_index a, old_a;
-+
-+	/* No active slots */
-+	if (q->tail == depth)
-+		return NULL;
-+
-+	a = old_a = q->next[q->tail];
-+
-+	/* Grab packet */
-+	skb = __skb_dequeue(&q->qs[a]);
-+	esfq_dec(q, a);
-+
-+	/* Is the slot empty? */
-+	if (q->qs[a].qlen == 0) {
-+		q->ht[q->hash[a]] = depth;
-+		a = q->next[a];
-+		if (a == old_a) {
-+			q->tail = depth;
-+			return skb;
-+		}
-+		q->next[q->tail] = a;
-+		q->allot[a] += q->quantum;
-+	} else if ((q->allot[a] -= skb->len) <= 0) {
-+		q->tail = a;
-+		a = q->next[a];
-+		q->allot[a] += q->quantum;
-+	}
-+
-+	return skb;
-+}
-+
-+static struct sk_buff *esfq_dequeue(struct Qdisc* sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	struct sk_buff *skb;
-+
-+	skb = esfq_q_dequeue(q);
-+	if (skb == NULL)
-+		return NULL;
-+	sch->q.qlen--;
-+	sch->qstats.backlog -= skb->len;
-+	return skb;
-+}
-+
-+static void esfq_q_destroy(struct esfq_sched_data *q)
-+{
-+	del_timer(&q->perturb_timer);
-+	if(q->ht)
-+		kfree(q->ht);
-+	if(q->dep)
-+		kfree(q->dep);
-+	if(q->next)
-+		kfree(q->next);
-+	if(q->allot)
-+		kfree(q->allot);
-+	if(q->hash)
-+		kfree(q->hash);
-+	if(q->qs)
-+		kfree(q->qs);
-+}
-+
-+static void esfq_destroy(struct Qdisc *sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_q_destroy(q);
-+}
-+
-+
-+static void esfq_reset(struct Qdisc* sch)
-+{
-+	struct sk_buff *skb;
-+
-+	while ((skb = esfq_dequeue(sch)) != NULL)
-+		kfree_skb(skb);
-+}
-+
-+static void esfq_perturbation(unsigned long arg)
-+{
-+	struct Qdisc *sch = (struct Qdisc*)arg;
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+
-+	q->perturbation = net_random()&0x1F;
-+
-+	if (q->perturb_period) {
-+		q->perturb_timer.expires = jiffies + q->perturb_period;
-+		add_timer(&q->perturb_timer);
-+	}
-+}
-+
-+static unsigned int esfq_check_hash(unsigned int kind)
-+{
-+	switch (kind) {
-+	case TCA_SFQ_HASH_CTORIGDST:
-+	case TCA_SFQ_HASH_CTORIGSRC:
-+	case TCA_SFQ_HASH_CTREPLDST:
-+	case TCA_SFQ_HASH_CTREPLSRC:
-+	case TCA_SFQ_HASH_CTNATCHG:
-+#ifndef CONFIG_NET_SCH_ESFQ_NFCT
-+	{
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "ESFQ: Conntrack hash types disabled in kernel config. Falling back to classic.\n");
-+		return TCA_SFQ_HASH_CLASSIC;
-+	}
-+#endif
-+	case TCA_SFQ_HASH_CLASSIC:
-+	case TCA_SFQ_HASH_DST:
-+	case TCA_SFQ_HASH_SRC:
-+	case TCA_SFQ_HASH_FWMARK:
-+		return kind;
-+	default:
-+	{
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "ESFQ: Unknown hash type. Falling back to classic.\n");
-+		return TCA_SFQ_HASH_CLASSIC;
-+	}
-+	}
-+}
-+
-+static int esfq_q_init(struct esfq_sched_data *q, struct nlattr *opt)
-+{
-+	struct tc_esfq_qopt *ctl = nla_data(opt);
-+	esfq_index p = ~0U/2;
-+	int i;
-+
-+	if (opt && opt->nla_len < nla_attr_size(sizeof(*ctl)))
-+		return -EINVAL;
-+
-+	q->perturbation = 0;
-+	q->hash_kind = TCA_SFQ_HASH_CLASSIC;
-+	q->max_depth = 0;
-+	if (opt == NULL) {
-+		q->perturb_period = 0;
-+		q->hash_divisor = 1024;
-+		q->tail = q->limit = q->depth = 128;
-+
-+	} else {
-+		struct tc_esfq_qopt *ctl = nla_data(opt);
-+		if (ctl->quantum)
-+			q->quantum = ctl->quantum;
-+		q->perturb_period = ctl->perturb_period*HZ;
-+		q->hash_divisor = ctl->divisor ? : 1024;
-+		q->tail = q->limit = q->depth = ctl->flows ? : 128;
-+
-+		if ( q->depth > p - 1 )
-+			return -EINVAL;
-+
-+		if (ctl->limit)
-+			q->limit = min_t(u32, ctl->limit, q->depth);
-+
-+		if (ctl->hash_kind) {
-+			q->hash_kind = esfq_check_hash(ctl->hash_kind);
-+		}
-+	}
-+
-+	q->ht = kmalloc(q->hash_divisor*sizeof(esfq_index), GFP_KERNEL);
-+	if (!q->ht)
-+		goto err_case;
-+	q->dep = kmalloc((1+q->depth*2)*sizeof(struct esfq_head), GFP_KERNEL);
-+	if (!q->dep)
-+		goto err_case;
-+	q->next = kmalloc(q->depth*sizeof(esfq_index), GFP_KERNEL);
-+	if (!q->next)
-+		goto err_case;
-+	q->allot = kmalloc(q->depth*sizeof(short), GFP_KERNEL);
-+	if (!q->allot)
-+		goto err_case;
-+	q->hash = kmalloc(q->depth*sizeof(unsigned short), GFP_KERNEL);
-+	if (!q->hash)
-+		goto err_case;
-+	q->qs = kmalloc(q->depth*sizeof(struct sk_buff_head), GFP_KERNEL);
-+	if (!q->qs)
-+		goto err_case;
-+
-+	for (i=0; i< q->hash_divisor; i++)
-+		q->ht[i] = q->depth;
-+	for (i=0; i<q->depth; i++) {
-+		skb_queue_head_init(&q->qs[i]);
-+		q->dep[i+q->depth].next = i+q->depth;
-+		q->dep[i+q->depth].prev = i+q->depth;
-+	}
-+
-+	for (i=0; i<q->depth; i++)
-+		esfq_link(q, i);
-+	return 0;
-+err_case:
-+	esfq_q_destroy(q);
-+	return -ENOBUFS;
-+}
-+
-+static int esfq_init(struct Qdisc *sch, struct nlattr *opt)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	int err;
-+
-+	q->quantum = psched_mtu(qdisc_dev(sch)); /* default */
-+	if ((err = esfq_q_init(q, opt)))
-+		return err;
-+
-+	init_timer(&q->perturb_timer);
-+	q->perturb_timer.data = (unsigned long)sch;
-+	q->perturb_timer.function = esfq_perturbation;
-+	if (q->perturb_period) {
-+		q->perturb_timer.expires = jiffies + q->perturb_period;
-+		add_timer(&q->perturb_timer);
-+	}
-+
-+	return 0;
-+}
-+
-+static int esfq_change(struct Qdisc *sch, struct nlattr *opt)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	struct esfq_sched_data new;
-+	struct sk_buff *skb;
-+	int err;
-+
-+	/* set up new queue */
-+	memset(&new, 0, sizeof(struct esfq_sched_data));
-+	new.quantum = psched_mtu(qdisc_dev(sch)); /* default */
-+	if ((err = esfq_q_init(&new, opt)))
-+		return err;
-+
-+	/* copy all packets from the old queue to the new queue */
-+	sch_tree_lock(sch);
-+	while ((skb = esfq_q_dequeue(q)) != NULL)
-+		esfq_q_enqueue(skb, &new, ESFQ_TAIL);
-+
-+	/* clean up the old queue */
-+	esfq_q_destroy(q);
-+
-+	/* copy elements of the new queue into the old queue */
-+	q->perturb_period = new.perturb_period;
-+	q->quantum        = new.quantum;
-+	q->limit          = new.limit;
-+	q->depth          = new.depth;
-+	q->hash_divisor   = new.hash_divisor;
-+	q->hash_kind      = new.hash_kind;
-+	q->tail           = new.tail;
-+	q->max_depth      = new.max_depth;
-+	q->ht    = new.ht;
-+	q->dep   = new.dep;
-+	q->next  = new.next;
-+	q->allot = new.allot;
-+	q->hash  = new.hash;
-+	q->qs    = new.qs;
-+
-+	/* finish up */
-+	if (q->perturb_period) {
-+		q->perturb_timer.expires = jiffies + q->perturb_period;
-+		add_timer(&q->perturb_timer);
-+	} else {
-+		q->perturbation = 0;
-+	}
-+	sch_tree_unlock(sch);
-+	return 0;
-+}
-+
-+static int esfq_dump(struct Qdisc *sch, struct sk_buff *skb)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	unsigned char *b = skb_tail_pointer(skb);
-+	struct tc_esfq_qopt opt;
-+
-+	opt.quantum = q->quantum;
-+	opt.perturb_period = q->perturb_period/HZ;
-+
-+	opt.limit = q->limit;
-+	opt.divisor = q->hash_divisor;
-+	opt.flows = q->depth;
-+	opt.hash_kind = q->hash_kind;
-+
-+	NLA_PUT(skb, TCA_OPTIONS, sizeof(opt), &opt);
-+
-+	return skb->len;
-+
-+nla_put_failure:
-+	nlmsg_trim(skb, b);
-+	return -1;
-+}
-+
-+static struct Qdisc_ops esfq_qdisc_ops =
-+{
-+	.next		=	NULL,
-+	.cl_ops		=	NULL,
-+	.id		=	"esfq",
-+	.priv_size	=	sizeof(struct esfq_sched_data),
-+	.enqueue	=	esfq_enqueue,
-+	.dequeue	=	esfq_dequeue,
-+	.peek		=	esfq_peek,
-+	.drop		=	esfq_drop,
-+	.init		=	esfq_init,
-+	.reset		=	esfq_reset,
-+	.destroy	=	esfq_destroy,
-+	.change		=	esfq_change,
-+	.dump		=	esfq_dump,
-+	.owner		=	THIS_MODULE,
-+};
-+
-+static int __init esfq_module_init(void)
-+{
-+	return register_qdisc(&esfq_qdisc_ops);
-+}
-+static void __exit esfq_module_exit(void)
-+{
-+	unregister_qdisc(&esfq_qdisc_ops);
-+}
-+module_init(esfq_module_init)
-+module_exit(esfq_module_exit)
-+MODULE_LICENSE("GPL");
diff --git a/target/linux/generic-2.6/patches-2.6.31/201-jhash3.patch b/target/linux/generic-2.6/patches-2.6.31/201-jhash3.patch
deleted file mode 100644
index 0218fa19c..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/201-jhash3.patch
+++ /dev/null
@@ -1,227 +0,0 @@
---- a/include/linux/jhash.h
-+++ b/include/linux/jhash.h
-@@ -3,80 +3,95 @@
- 
- /* jhash.h: Jenkins hash support.
-  *
-- * Copyright (C) 1996 Bob Jenkins (bob_jenkins@burtleburtle.net)
-+ * Copyright (C) 2006. Bob Jenkins (bob_jenkins@burtleburtle.net)
-  *
-  * http://burtleburtle.net/bob/hash/
-  *
-  * These are the credits from Bob's sources:
-  *
-- * lookup2.c, by Bob Jenkins, December 1996, Public Domain.
-- * hash(), hash2(), hash3, and mix() are externally useful functions.
-- * Routines to test the hash are included if SELF_TEST is defined.
-- * You can use this free for any purpose.  It has no warranty.
-+ * lookup3.c, by Bob Jenkins, May 2006, Public Domain.
-  *
-- * Copyright (C) 2003 David S. Miller (davem@redhat.com)
-+ * These are functions for producing 32-bit hashes for hash table lookup.
-+ * hashword(), hashlittle(), hashlittle2(), hashbig(), mix(), and final() 
-+ * are externally useful functions.  Routines to test the hash are included 
-+ * if SELF_TEST is defined.  You can use this free for any purpose.  It's in
-+ * the public domain.  It has no warranty.
-+ *
-+ * Copyright (C) 2009 Jozsef Kadlecsik (kadlec@blackhole.kfki.hu)
-  *
-  * I've modified Bob's hash to be useful in the Linux kernel, and
-- * any bugs present are surely my fault.  -DaveM
-+ * any bugs present are my fault.  Jozsef
-  */
- 
--/* NOTE: Arguments are modified. */
--#define __jhash_mix(a, b, c) \
-+#define __rot(x,k) (((x)<<(k)) | ((x)>>(32-(k))))
-+
-+/* __jhash_mix - mix 3 32-bit values reversibly. */
-+#define __jhash_mix(a,b,c) \
-+{ \
-+  a -= c;  a ^= __rot(c, 4);  c += b; \
-+  b -= a;  b ^= __rot(a, 6);  a += c; \
-+  c -= b;  c ^= __rot(b, 8);  b += a; \
-+  a -= c;  a ^= __rot(c,16);  c += b; \
-+  b -= a;  b ^= __rot(a,19);  a += c; \
-+  c -= b;  c ^= __rot(b, 4);  b += a; \
-+}
-+
-+/* __jhash_final - final mixing of 3 32-bit values (a,b,c) into c */
-+#define __jhash_final(a,b,c) \
- { \
--  a -= b; a -= c; a ^= (c>>13); \
--  b -= c; b -= a; b ^= (a<<8); \
--  c -= a; c -= b; c ^= (b>>13); \
--  a -= b; a -= c; a ^= (c>>12);  \
--  b -= c; b -= a; b ^= (a<<16); \
--  c -= a; c -= b; c ^= (b>>5); \
--  a -= b; a -= c; a ^= (c>>3);  \
--  b -= c; b -= a; b ^= (a<<10); \
--  c -= a; c -= b; c ^= (b>>15); \
-+  c ^= b; c -= __rot(b,14); \
-+  a ^= c; a -= __rot(c,11); \
-+  b ^= a; b -= __rot(a,25); \
-+  c ^= b; c -= __rot(b,16); \
-+  a ^= c; a -= __rot(c,4);  \
-+  b ^= a; b -= __rot(a,14); \
-+  c ^= b; c -= __rot(b,24); \
- }
- 
--/* The golden ration: an arbitrary value */
--#define JHASH_GOLDEN_RATIO	0x9e3779b9
-+/* An arbitrary initial parameter */
-+#define JHASH_GOLDEN_RATIO	0xdeadbeef
- 
- /* The most generic version, hashes an arbitrary sequence
-  * of bytes.  No alignment or length assumptions are made about
-- * the input key.
-+ * the input key. The result depends on endianness.
-  */
- static inline u32 jhash(const void *key, u32 length, u32 initval)
- {
--	u32 a, b, c, len;
-+	u32 a,b,c;
- 	const u8 *k = key;
- 
--	len = length;
--	a = b = JHASH_GOLDEN_RATIO;
--	c = initval;
--
--	while (len >= 12) {
--		a += (k[0] +((u32)k[1]<<8) +((u32)k[2]<<16) +((u32)k[3]<<24));
--		b += (k[4] +((u32)k[5]<<8) +((u32)k[6]<<16) +((u32)k[7]<<24));
--		c += (k[8] +((u32)k[9]<<8) +((u32)k[10]<<16)+((u32)k[11]<<24));
--
--		__jhash_mix(a,b,c);
-+	/* Set up the internal state */
-+	a = b = c = JHASH_GOLDEN_RATIO + length + initval;
- 
-+	/* all but the last block: affect some 32 bits of (a,b,c) */
-+	while (length > 12) {
-+    		a += (k[0] + ((u32)k[1]<<8) + ((u32)k[2]<<16) + ((u32)k[3]<<24));
-+		b += (k[4] + ((u32)k[5]<<8) + ((u32)k[6]<<16) + ((u32)k[7]<<24));
-+		c += (k[8] + ((u32)k[9]<<8) + ((u32)k[10]<<16) + ((u32)k[11]<<24));
-+		__jhash_mix(a, b, c);
-+		length -= 12;
- 		k += 12;
--		len -= 12;
- 	}
- 
--	c += length;
--	switch (len) {
--	case 11: c += ((u32)k[10]<<24);
--	case 10: c += ((u32)k[9]<<16);
--	case 9 : c += ((u32)k[8]<<8);
--	case 8 : b += ((u32)k[7]<<24);
--	case 7 : b += ((u32)k[6]<<16);
--	case 6 : b += ((u32)k[5]<<8);
-+	/* last block: affect all 32 bits of (c) */
-+	/* all the case statements fall through */
-+	switch (length) {
-+	case 12: c += (u32)k[11]<<24;
-+	case 11: c += (u32)k[10]<<16;
-+	case 10: c += (u32)k[9]<<8;
-+	case 9 : c += k[8];
-+	case 8 : b += (u32)k[7]<<24;
-+	case 7 : b += (u32)k[6]<<16;
-+	case 6 : b += (u32)k[5]<<8;
- 	case 5 : b += k[4];
--	case 4 : a += ((u32)k[3]<<24);
--	case 3 : a += ((u32)k[2]<<16);
--	case 2 : a += ((u32)k[1]<<8);
-+	case 4 : a += (u32)k[3]<<24;
-+	case 3 : a += (u32)k[2]<<16;
-+	case 2 : a += (u32)k[1]<<8;
- 	case 1 : a += k[0];
--	};
--
--	__jhash_mix(a,b,c);
-+		__jhash_final(a, b, c);
-+	case 0 :
-+		break;
-+	}
- 
- 	return c;
- }
-@@ -86,58 +101,57 @@ static inline u32 jhash(const void *key,
-  */
- static inline u32 jhash2(const u32 *k, u32 length, u32 initval)
- {
--	u32 a, b, c, len;
-+	u32 a, b, c;
- 
--	a = b = JHASH_GOLDEN_RATIO;
--	c = initval;
--	len = length;
-+	/* Set up the internal state */
-+	a = b = c = JHASH_GOLDEN_RATIO + (length<<2) + initval;
- 
--	while (len >= 3) {
-+	/* handle most of the key */
-+	while (length > 3) {
- 		a += k[0];
- 		b += k[1];
- 		c += k[2];
- 		__jhash_mix(a, b, c);
--		k += 3; len -= 3;
-+		length -= 3;
-+		k += 3;
- 	}
- 
--	c += length * 4;
--
--	switch (len) {
--	case 2 : b += k[1];
--	case 1 : a += k[0];
--	};
--
--	__jhash_mix(a,b,c);
-+	/* handle the last 3 u32's */
-+	/* all the case statements fall through */ 
-+	switch (length) {
-+	case 3: c += k[2];
-+	case 2: b += k[1];
-+	case 1: a += k[0];
-+		__jhash_final(a, b, c);
-+	case 0:     /* case 0: nothing left to add */
-+		break;
-+	}
- 
- 	return c;
- }
- 
--
- /* A special ultra-optimized versions that knows they are hashing exactly
-  * 3, 2 or 1 word(s).
-- *
-- * NOTE: In partilar the "c += length; __jhash_mix(a,b,c);" normally
-- *       done at the end is not done here.
-  */
- static inline u32 jhash_3words(u32 a, u32 b, u32 c, u32 initval)
- {
--	a += JHASH_GOLDEN_RATIO;
--	b += JHASH_GOLDEN_RATIO;
--	c += initval;
-+	a += JHASH_GOLDEN_RATIO + initval;
-+	b += JHASH_GOLDEN_RATIO + initval;
-+	c += JHASH_GOLDEN_RATIO + initval;
- 
--	__jhash_mix(a, b, c);
-+	__jhash_final(a, b, c);
- 
- 	return c;
- }
- 
- static inline u32 jhash_2words(u32 a, u32 b, u32 initval)
- {
--	return jhash_3words(a, b, 0, initval);
-+	return jhash_3words(0, a, b, initval);
- }
- 
- static inline u32 jhash_1word(u32 a, u32 initval)
- {
--	return jhash_3words(a, 0, 0, initval);
-+	return jhash_3words(0, 0, a, initval);
- }
- 
- #endif /* _LINUX_JHASH_H */
diff --git a/target/linux/generic-2.6/patches-2.6.31/202-mips_mem_functions_performance.patch b/target/linux/generic-2.6/patches-2.6.31/202-mips_mem_functions_performance.patch
deleted file mode 100644
index 6ea9ba51e..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/202-mips_mem_functions_performance.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- a/arch/mips/include/asm/string.h
-+++ b/arch/mips/include/asm/string.h
-@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__ 
- 
- #define __HAVE_ARCH_MEMSET
- extern void *memset(void *__s, int __c, size_t __count);
-+#define memset(__s, __c, len)					\
-+({								\
-+	size_t __len = (len);					\
-+	void *__ret;						\
-+	if (__builtin_constant_p(len) && __len >= 64)		\
-+		__ret = memset((__s), (__c), __len);		\
-+	else							\
-+		__ret = __builtin_memset((__s), (__c), __len);	\
-+	__ret;							\
-+})
- 
- #define __HAVE_ARCH_MEMCPY
- extern void *memcpy(void *__to, __const__ void *__from, size_t __n);
-+#define memcpy(dst, src, len)					\
-+({								\
-+	size_t __len = (len);					\
-+	void *__ret;						\
-+	if (__builtin_constant_p(len) && __len >= 64)		\
-+		__ret = memcpy((dst), (src), __len);		\
-+	else							\
-+		__ret = __builtin_memcpy((dst), (src), __len);	\
-+	__ret;							\
-+})
- 
- #define __HAVE_ARCH_MEMMOVE
- extern void *memmove(void *__dest, __const__ void *__src, size_t __n);
-+#define memmove(dst, src, len)					\
-+({								\
-+	size_t __len = (len);					\
-+	void *__ret;						\
-+	if (__builtin_constant_p(len) && __len >= 64)		\
-+		__ret = memmove((dst), (src), __len);		\
-+	else							\
-+		__ret = __builtin_memmove((dst), (src), __len);	\
-+	__ret;							\
-+})
-+
-+#define __HAVE_ARCH_MEMCMP
-+#define memcmp(src1, src2, len) __builtin_memcmp((src1), (src2), (len))
- 
- #endif /* _ASM_STRING_H */
---- a/arch/mips/lib/Makefile
-+++ b/arch/mips/lib/Makefile
-@@ -3,7 +3,7 @@
- #
- 
- lib-y	+= csum_partial.o delay.o memcpy.o memcpy-inatomic.o memset.o \
--	   strlen_user.o strncpy_user.o strnlen_user.o uncached.o
-+	   strlen_user.o strncpy_user.o strnlen_user.o uncached.o memcmp.o
- 
- obj-y			+= iomap.o
- obj-$(CONFIG_PCI)	+= iomap-pci.o
---- /dev/null
-+++ b/arch/mips/lib/memcmp.c
-@@ -0,0 +1,22 @@
-+/*
-+ *  copied from linux/lib/string.c
-+ *
-+ *  Copyright (C) 1991, 1992  Linus Torvalds
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/string.h>
-+
-+#undef memcmp
-+int memcmp(const void *cs, const void *ct, size_t count)
-+{
-+	const unsigned char *su1, *su2;
-+	int res = 0;
-+
-+	for (su1 = cs, su2 = ct; 0 < count; ++su1, ++su2, count--)
-+		if ((res = *su1 - *su2) != 0)
-+			break;
-+	return res;
-+}
-+EXPORT_SYMBOL(memcmp);
-+
diff --git a/target/linux/generic-2.6/patches-2.6.31/203-slab_maxsize.patch b/target/linux/generic-2.6/patches-2.6.31/203-slab_maxsize.patch
deleted file mode 100644
index 0c1ae72a4..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/203-slab_maxsize.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/include/linux/slab.h
-+++ b/include/linux/slab.h
-@@ -124,8 +124,8 @@ int kmem_ptr_validate(struct kmem_cache 
-  * to do various tricks to work around compiler limitations in order to
-  * ensure proper constant folding.
-  */
--#define KMALLOC_SHIFT_HIGH	((MAX_ORDER + PAGE_SHIFT - 1) <= 25 ? \
--				(MAX_ORDER + PAGE_SHIFT - 1) : 25)
-+#define KMALLOC_SHIFT_HIGH	((MAX_ORDER + PAGE_SHIFT - 1) <= 17 ? \
-+				(MAX_ORDER + PAGE_SHIFT - 1) : 17)
- 
- #define KMALLOC_MAX_SIZE	(1UL << KMALLOC_SHIFT_HIGH)
- #define KMALLOC_MAX_ORDER	(KMALLOC_SHIFT_HIGH - PAGE_SHIFT)
diff --git a/target/linux/generic-2.6/patches-2.6.31/204-jffs2_eofdetect.patch b/target/linux/generic-2.6/patches-2.6.31/204-jffs2_eofdetect.patch
deleted file mode 100644
index 16d3e1f8e..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/204-jffs2_eofdetect.patch
+++ /dev/null
@@ -1,132 +0,0 @@
---- a/fs/jffs2/build.c
-+++ b/fs/jffs2/build.c
-@@ -111,6 +111,17 @@ static int jffs2_build_filesystem(struct
- 	dbg_fsbuild("scanned flash completely\n");
- 	jffs2_dbg_dump_block_lists_nolock(c);
- 
-+	if (c->flags & (1 << 7)) {
-+		printk("%s(): unlocking the mtd device... ", __func__);
-+		if (c->mtd->unlock)
-+			c->mtd->unlock(c->mtd, 0, c->mtd->size);
-+		printk("done.\n");
-+
-+		printk("%s(): erasing all blocks after the end marker... ", __func__);
-+		jffs2_erase_pending_blocks(c, -1);
-+		printk("done.\n");
-+	}
-+
- 	dbg_fsbuild("pass 1 starting\n");
- 	c->flags |= JFFS2_SB_FLAG_BUILDING;
- 	/* Now scan the directory tree, increasing nlink according to every dirent found. */
---- a/fs/jffs2/scan.c
-+++ b/fs/jffs2/scan.c
-@@ -72,7 +72,7 @@ static int file_dirty(struct jffs2_sb_in
- 		return ret;
- 	if ((ret = jffs2_scan_dirty_space(c, jeb, jeb->free_size)))
- 		return ret;
--	/* Turned wasted size into dirty, since we apparently 
-+	/* Turned wasted size into dirty, since we apparently
- 	   think it's recoverable now. */
- 	jeb->dirty_size += jeb->wasted_size;
- 	c->dirty_size += jeb->wasted_size;
-@@ -144,8 +144,11 @@ int jffs2_scan_medium(struct jffs2_sb_in
- 		/* reset summary info for next eraseblock scan */
- 		jffs2_sum_reset_collected(s);
- 
--		ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
--						buf_size, s);
-+		if (c->flags & (1 << 7))
-+			ret = BLK_STATE_ALLFF;
-+		else
-+			ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
-+							buf_size, s);
- 
- 		if (ret < 0)
- 			goto out;
-@@ -400,7 +403,7 @@ static int jffs2_scan_xref_node(struct j
- 	if (!ref)
- 		return -ENOMEM;
- 
--	/* BEFORE jffs2_build_xattr_subsystem() called, 
-+	/* BEFORE jffs2_build_xattr_subsystem() called,
- 	 * and AFTER xattr_ref is marked as a dead xref,
- 	 * ref->xid is used to store 32bit xid, xd is not used
- 	 * ref->ino is used to store 32bit inode-number, ic is not used
-@@ -473,7 +476,7 @@ static int jffs2_scan_eraseblock (struct
- 		struct jffs2_sum_marker *sm;
- 		void *sumptr = NULL;
- 		uint32_t sumlen;
--	      
-+
- 		if (!buf_size) {
- 			/* XIP case. Just look, point at the summary if it's there */
- 			sm = (void *)buf + c->sector_size - sizeof(*sm);
-@@ -489,9 +492,9 @@ static int jffs2_scan_eraseblock (struct
- 				buf_len = sizeof(*sm);
- 
- 			/* Read as much as we want into the _end_ of the preallocated buffer */
--			err = jffs2_fill_scan_buf(c, buf + buf_size - buf_len, 
-+			err = jffs2_fill_scan_buf(c, buf + buf_size - buf_len,
- 						  jeb->offset + c->sector_size - buf_len,
--						  buf_len);				
-+						  buf_len);
- 			if (err)
- 				return err;
- 
-@@ -510,9 +513,9 @@ static int jffs2_scan_eraseblock (struct
- 				}
- 				if (buf_len < sumlen) {
- 					/* Need to read more so that the entire summary node is present */
--					err = jffs2_fill_scan_buf(c, sumptr, 
-+					err = jffs2_fill_scan_buf(c, sumptr,
- 								  jeb->offset + c->sector_size - sumlen,
--								  sumlen - buf_len);				
-+								  sumlen - buf_len);
- 					if (err)
- 						return err;
- 				}
-@@ -525,7 +528,7 @@ static int jffs2_scan_eraseblock (struct
- 
- 			if (buf_size && sumlen > buf_size)
- 				kfree(sumptr);
--			/* If it returns with a real error, bail. 
-+			/* If it returns with a real error, bail.
- 			   If it returns positive, that's a block classification
- 			   (i.e. BLK_STATE_xxx) so return that too.
- 			   If it returns zero, fall through to full scan. */
-@@ -546,6 +549,17 @@ static int jffs2_scan_eraseblock (struct
- 			return err;
- 	}
- 
-+	if ((buf[0] == 0xde) &&
-+		(buf[1] == 0xad) &&
-+		(buf[2] == 0xc0) &&
-+		(buf[3] == 0xde)) {
-+		/* end of filesystem. erase everything after this point */
-+		printk("%s(): End of filesystem marker found at 0x%x\n", __func__, jeb->offset);
-+		c->flags |= (1 << 7);
-+
-+		return BLK_STATE_ALLFF;
-+	}
-+
- 	/* We temporarily use 'ofs' as a pointer into the buffer/jeb */
- 	ofs = 0;
- 
-@@ -671,7 +685,7 @@ scan_more:
- 				scan_end = buf_len;
- 				goto more_empty;
- 			}
--			
-+
- 			/* See how much more there is to read in this eraseblock... */
- 			buf_len = min_t(uint32_t, buf_size, jeb->offset + c->sector_size - ofs);
- 			if (!buf_len) {
-@@ -907,7 +921,7 @@ scan_more:
- 
- 	D1(printk(KERN_DEBUG "Block at 0x%08x: free 0x%08x, dirty 0x%08x, unchecked 0x%08x, used 0x%08x, wasted 0x%08x\n",
- 		  jeb->offset,jeb->free_size, jeb->dirty_size, jeb->unchecked_size, jeb->used_size, jeb->wasted_size));
--	
-+
- 	/* mark_node_obsolete can add to wasted !! */
- 	if (jeb->wasted_size) {
- 		jeb->dirty_size += jeb->wasted_size;
diff --git a/target/linux/generic-2.6/patches-2.6.31/205-skb_padding.patch b/target/linux/generic-2.6/patches-2.6.31/205-skb_padding.patch
deleted file mode 100644
index 80c7e704e..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/205-skb_padding.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/include/linux/skbuff.h
-+++ b/include/linux/skbuff.h
-@@ -1387,11 +1387,18 @@ static inline int skb_network_offset(con
-  *
-  * Various parts of the networking layer expect at least 32 bytes of
-  * headroom, you should not reduce this.
-+ *
-+ * This has been changed to 64 to acommodate for routing between ethernet
-+ * and wireless, but only for new allocations
-  */
- #ifndef NET_SKB_PAD
- #define NET_SKB_PAD	32
- #endif
- 
-+#ifndef NET_SKB_PAD_ALLOC
-+#define NET_SKB_PAD_ALLOC	64
-+#endif
-+
- extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
- 
- static inline void __skb_trim(struct sk_buff *skb, unsigned int len)
-@@ -1481,9 +1488,9 @@ static inline void __skb_queue_purge(str
- static inline struct sk_buff *__dev_alloc_skb(unsigned int length,
- 					      gfp_t gfp_mask)
- {
--	struct sk_buff *skb = alloc_skb(length + NET_SKB_PAD, gfp_mask);
-+	struct sk_buff *skb = alloc_skb(length + NET_SKB_PAD_ALLOC, gfp_mask);
- 	if (likely(skb))
--		skb_reserve(skb, NET_SKB_PAD);
-+		skb_reserve(skb, NET_SKB_PAD_ALLOC);
- 	return skb;
- }
- 
-@@ -1556,7 +1563,7 @@ static inline int __skb_cow(struct sk_bu
- 		delta = headroom - skb_headroom(skb);
- 
- 	if (delta || cloned)
--		return pskb_expand_head(skb, ALIGN(delta, NET_SKB_PAD), 0,
-+		return pskb_expand_head(skb, ALIGN(delta, NET_SKB_PAD_ALLOC), 0,
- 					GFP_ATOMIC);
- 	return 0;
- }
---- a/net/core/skbuff.c
-+++ b/net/core/skbuff.c
-@@ -336,9 +336,9 @@ struct sk_buff *__netdev_alloc_skb(struc
- 	int node = dev->dev.parent ? dev_to_node(dev->dev.parent) : -1;
- 	struct sk_buff *skb;
- 
--	skb = __alloc_skb(length + NET_SKB_PAD, gfp_mask, 0, node);
-+	skb = __alloc_skb(length + NET_SKB_PAD_ALLOC, gfp_mask, 0, node);
- 	if (likely(skb)) {
--		skb_reserve(skb, NET_SKB_PAD);
-+		skb_reserve(skb, NET_SKB_PAD_ALLOC);
- 		skb->dev = dev;
- 	}
- 	return skb;
diff --git a/target/linux/generic-2.6/patches-2.6.31/207-powerpc_asm_segment_h.patch b/target/linux/generic-2.6/patches-2.6.31/207-powerpc_asm_segment_h.patch
deleted file mode 100644
index 1272e82c7..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/207-powerpc_asm_segment_h.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- /dev/null
-+++ b/include/asm-powerpc/segment.h
-@@ -0,0 +1,6 @@
-+#ifndef _ASM_SEGMENT_H
-+#define _ASM_SEGMENT_H
-+
-+/* Only here because we have some old header files that expect it.. */
-+
-+#endif /* _ASM_SEGMENT_H */
diff --git a/target/linux/generic-2.6/patches-2.6.31/209-mini_fo.patch b/target/linux/generic-2.6/patches-2.6.31/209-mini_fo.patch
deleted file mode 100644
index e3ce162ad..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/209-mini_fo.patch
+++ /dev/null
@@ -1,7780 +0,0 @@
---- a/fs/Kconfig
-+++ b/fs/Kconfig
-@@ -178,6 +178,7 @@ source "fs/ubifs/Kconfig"
- source "fs/cramfs/Kconfig"
- source "fs/squashfs/Kconfig"
- source "fs/freevxfs/Kconfig"
-+source "fs/mini_fo/Kconfig"
- source "fs/minix/Kconfig"
- source "fs/omfs/Kconfig"
- source "fs/hpfs/Kconfig"
---- a/fs/Makefile
-+++ b/fs/Makefile
-@@ -77,6 +77,7 @@ obj-$(CONFIG_SQUASHFS)		+= squashfs/
- obj-y				+= ramfs/
- obj-$(CONFIG_HUGETLBFS)		+= hugetlbfs/
- obj-$(CONFIG_CODA_FS)		+= coda/
-+obj-$(CONFIG_MINI_FO)		+= mini_fo/
- obj-$(CONFIG_MINIX_FS)		+= minix/
- obj-$(CONFIG_FAT_FS)		+= fat/
- obj-$(CONFIG_BFS_FS)		+= bfs/
---- /dev/null
-+++ b/fs/mini_fo/aux.c
-@@ -0,0 +1,577 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+/* check if file exists in storage  */
-+int exists_in_storage(dentry_t *dentry)
-+{
-+	check_mini_fo_dentry(dentry);
-+	if(dtost(dentry) == MODIFIED || dtost(dentry) == CREATED || dtost(dentry) == DEL_REWRITTEN)
-+		return 1;
-+	return 0;
-+}
-+
-+/* check if dentry is in an existing state */
-+int is_mini_fo_existant(dentry_t *dentry)
-+{
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) == DELETED || dtost(dentry) == NON_EXISTANT)
-+		return 0;
-+	else
-+		return 1;
-+}
-+
-+/*
-+ * This function will create a negative storage dentry for
-+ * dentry, what is required for many create like options.
-+ * It will create the storage structure if necessary.
-+ */
-+int get_neg_sto_dentry(dentry_t *dentry)
-+{
-+	int err = 0;
-+	unsigned int len;
-+	const unsigned char *name;
-+
-+	if(!dentry ||
-+	   !dtopd(dentry) ||
-+	   !(dtost(dentry) == UNMODIFIED ||
-+	     dtost(dentry) == NON_EXISTANT ||
-+	     dtost(dentry) == DELETED)) {
-+		printk(KERN_CRIT "mini_fo: get_neg_sto_dentry: invalid dentry passed.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	/* Have we got a neg. dentry already? */
-+	if(dtohd2(dentry)) {
-+		err = 0;
-+		goto out;
-+	}
-+	if(dtost(dentry->d_parent) == UNMODIFIED) {
-+		/* build sto struct */
-+		err = build_sto_structure(dentry->d_parent->d_parent, dentry->d_parent);
-+		if(err ||
-+		   dtost(dentry->d_parent) != MODIFIED) {
-+			printk(KERN_CRIT "mini_fo: get_neg_sto_dentry: ERROR building sto structure.\n");
-+			err = -1;
-+			goto out;
-+		}
-+	}
-+
-+	len = dentry->d_name.len;
-+	name = dentry->d_name.name;
-+
-+	dtohd2(dentry) =
-+		lookup_one_len(name, dtohd2(dentry->d_parent), len);
-+
-+ out:
-+	return err;
-+}
-+
-+int check_mini_fo_dentry(dentry_t *dentry)
-+{
-+ 	ASSERT(dentry != NULL);
-+	ASSERT(dtopd(dentry) != NULL);
-+	ASSERT((dtohd(dentry) != NULL) || (dtohd2(dentry) != NULL));
-+
-+/* 	if(dtost(dentry) == MODIFIED) { */
-+/* 		ASSERT(dentry->d_inode != NULL); */
-+/* 		ASSERT(dtohd(dentry) != NULL); */
-+/* 		ASSERT(dtohd(dentry)->d_inode != NULL); */
-+/* 		ASSERT(dtohd2(dentry) != NULL); */
-+/* 		ASSERT(dtohd2(dentry)->d_inode != NULL); */
-+/* 	} */
-+/* 	else if(dtost(dentry) == UNMODIFIED) { */
-+/* 		ASSERT(dentry->d_inode != NULL); */
-+/* 		ASSERT( */
-+/* 	} */
-+	return 0;
-+}
-+
-+int check_mini_fo_file(file_t *file)
-+{
-+	ASSERT(file != NULL);
-+	ASSERT(ftopd(file) != NULL);
-+	ASSERT(file->f_dentry != NULL);
-+
-+	/* violent checking, check depending of state and type
-+	 *	if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {}
-+	 */
-+	ASSERT((ftohf(file) != NULL) || (ftohf2(file) != NULL));
-+	return 0;
-+}
-+
-+int check_mini_fo_inode(inode_t *inode)
-+{
-+	ASSERT(inode != NULL);
-+	ASSERT(itopd(inode) != NULL);
-+	ASSERT((itohi(inode) != NULL) || (itohi2(inode) != NULL));
-+	return 0;
-+}
-+
-+/*
-+ * will walk a base path as provided by get_mini_fo_bpath and return
-+ * the (hopefully ;-) ) positive dentry of the renamed base dir.
-+ *
-+ * This does some work of path_init.
-+ */
-+dentry_t *bpath_walk(super_block_t *sb, char *bpath)
-+{
-+	int err;
-+        struct vfsmount *mnt;
-+	struct nameidata nd;
-+
-+	/* be paranoid */
-+	if(!bpath || bpath[0] != '/') {
-+		printk(KERN_CRIT "mini_fo: bpath_walk: Invalid string.\n");
-+		return NULL;
-+	}
-+	if(!sb || !stopd(sb)) {
-+		printk(KERN_CRIT "mini_fo: bpath_walk: Invalid sb.\n");
-+		return NULL;
-+	}
-+
-+	/* fix this: how do I reach this lock?
-+	 * read_lock(&current->fs->lock); */
-+	mnt = mntget(stopd(sb)->hidden_mnt);
-+	/* read_unlock(&current->fs->lock); */
-+
-+	err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
-+
-+	/* validate */
-+	if (err || !nd.dentry || !nd.dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: bpath_walk: path_walk failed.\n");
-+		return NULL;
-+	}
-+	return nd.dentry;
-+}
-+
-+
-+/* returns the full path of the basefile incl. its name */
-+int get_mini_fo_bpath(dentry_t *dentry, char **bpath, int *bpath_len)
-+{
-+	char *buf_walker;
-+	int len = 0;
-+	dentry_t *sky_walker;
-+
-+	if(!dentry || !dtohd(dentry)) {
-+		printk(KERN_CRIT "mini_fo: get_mini_fo_bpath: invalid dentry passed.\n");
-+		return -1;
-+	}
-+	sky_walker = dtohd(dentry);
-+
-+	do {
-+		len += sky_walker->d_name.len + 1 ; /* 1 for '/' */
-+		sky_walker = sky_walker->d_parent;
-+	} while(sky_walker != stopd(dentry->d_inode->i_sb)->base_dir_dentry);
-+
-+	/* 1 to oil the loop */
-+	*bpath = (char*)  kmalloc(len + 1, GFP_KERNEL);
-+	if(!*bpath) {
-+		printk(KERN_CRIT "mini_fo: get_mini_fo_bpath: out of mem.\n");
-+		return -1;
-+	}
-+	buf_walker = *bpath+len; /* put it on last char */
-+	*buf_walker = '\n';
-+	sky_walker = dtohd(dentry);
-+
-+	do {
-+		buf_walker -= sky_walker->d_name.len;
-+		strncpy(buf_walker,
-+			sky_walker->d_name.name,
-+			sky_walker->d_name.len);
-+		*(--buf_walker) = '/';
-+		sky_walker = sky_walker->d_parent;
-+	} while(sky_walker != stopd(dentry->d_inode->i_sb)->base_dir_dentry);
-+
-+	/* bpath_len doesn't count newline! */
-+	*bpath_len = len;
-+ 	return 0;
-+}
-+
-+int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
-+		    dentry_t *src_dentry, struct vfsmount *src_mnt)
-+{
-+	void *buf;
-+	mm_segment_t old_fs;
-+	file_t *tgt_file;
-+	file_t *src_file;
-+	int bytes, len, tmp, err;
-+	err = 0;
-+
-+	if(!(tgt_dentry->d_inode && src_dentry->d_inode)) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR, neg. dentry passed.\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+
-+	dget(tgt_dentry);
-+	dget(src_dentry);
-+	mntget(tgt_mnt);
-+	mntget(src_mnt);
-+
-+	/* open file write only */
-+	tgt_file = dentry_open(tgt_dentry, tgt_mnt, 0x1);
-+	if(!tgt_file || IS_ERR(tgt_file)) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening target file.\n");
-+		err = PTR_ERR(tgt_file);
-+		goto out_err;
-+	}
-+
-+	/* open file read only */
-+	src_file = dentry_open(src_dentry, src_mnt, 0x0);
-+	if(!src_file || IS_ERR(src_file)) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening source file.\n");
-+		err = PTR_ERR(src_file);
-+
-+		/* close target file */
-+		fput(tgt_file);
-+		goto out_err;
-+	}
-+
-+	/* check if the filesystem(s) support read respective write */
-+	if(!src_file->f_op->read || !tgt_file->f_op->write) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR, no fs read or write support.\n");
-+		err = -EPERM;
-+		goto out_close;
-+	}
-+
-+	/* allocate a page for transfering the data */
-+	buf = (void *) __get_free_page(GFP_KERNEL);
-+	if(!buf) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR, out of kernel mem.\n");
-+		goto out_err;
-+	}
-+
-+	tgt_file->f_pos = 0;
-+	src_file->f_pos = 0;
-+
-+	old_fs = get_fs();
-+	set_fs(KERNEL_DS);
-+
-+	/* Doing this I assume that a read operation will return a full
-+	 * buffer while there is still data to read, and a less than
-+	 * full buffer when all data has been read.
-+	 */
-+	bytes = len = PAGE_SIZE;
-+	while(bytes == len) {
-+		bytes = src_file->f_op->read(src_file, buf, len,
-+					     &src_file->f_pos);
-+		tmp = tgt_file->f_op->write(tgt_file, buf, bytes,
-+					    &tgt_file->f_pos);
-+		if(tmp != bytes) {
-+			printk(KERN_CRIT "mini_fo_cp_cont: ERROR writing.\n");
-+			goto out_close_unset;
-+		}
-+	}
-+
-+	free_page((unsigned long) buf);
-+	set_fs(old_fs);
-+	fput(tgt_file);
-+	fput(src_file);
-+	goto out;
-+
-+ out_close_unset:
-+	free_page((unsigned long) buf);
-+	set_fs(old_fs);
-+
-+ out_close:
-+	fput(tgt_file);
-+	fput(src_file);
-+
-+ out_err:
-+	dput(tgt_dentry);
-+	dput(src_dentry);
-+
-+	/* mk: not sure if this need to be done */
-+	mntput(tgt_mnt);
-+	mntput(src_mnt);
-+
-+ out:
-+	return err;
-+}
-+
-+/* mk:
-+ * ndl (no-duplicate list) stuff
-+ * This is used in mini_fo_readdir, to save the storage directory contents
-+ * and later when reading base, match them against the list in order
-+ * to avoid duplicates.
-+ */
-+
-+/* add a file specified by name and len to the ndl
-+ * Return values: 0 on success, <0 on failure.
-+ */
-+int ndl_add_entry(struct readdir_data *rd, const char *name, int len)
-+{
-+	struct ndl_entry *tmp_entry;
-+
-+	tmp_entry = (struct ndl_entry *)
-+		kmalloc(sizeof(struct ndl_entry), GFP_KERNEL);
-+	if(!tmp_entry) {
-+                printk(KERN_CRIT "mini_fo: ndl_add_entry: out of mem.\n");
-+                return -ENOMEM;
-+        }
-+        tmp_entry->name = (char*) kmalloc(len, GFP_KERNEL);
-+        if(!tmp_entry->name) {
-+                printk(KERN_CRIT "mini_fo: ndl_add_entry: out of mem.\n");
-+                return -ENOMEM;
-+        }
-+	strncpy(tmp_entry->name, name, len);
-+        tmp_entry->len = len;
-+
-+        list_add(&tmp_entry->list, &rd->ndl_list);
-+        rd->ndl_size++;
-+        return 0;
-+}
-+
-+/* delete all list entries and free memory */
-+void ndl_put_list(struct readdir_data *rd)
-+{
-+	struct list_head *tmp;
-+	struct ndl_entry *tmp_entry;
-+
-+	if(rd->ndl_size <= 0)
-+		return;
-+	while(!list_empty(&rd->ndl_list)) {
-+		tmp = rd->ndl_list.next;
-+                list_del(tmp);
-+                tmp_entry = list_entry(tmp, struct ndl_entry, list);
-+		kfree(tmp_entry->name);
-+                kfree(tmp_entry);
-+        }
-+	rd->ndl_size = 0;
-+}
-+
-+/* Check if a file specified by name and len is in the ndl
-+ * Return value: 0 if not in list, 1 if file is found in ndl.
-+ */
-+int ndl_check_entry(struct readdir_data *rd, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+	struct ndl_entry *tmp_entry;
-+
-+	if(rd->ndl_size <= 0)
-+		return 0;
-+
-+	list_for_each(tmp, &rd->ndl_list) {
-+                tmp_entry = list_entry(tmp, struct ndl_entry, list);
-+                if(tmp_entry->len != len)
-+                        continue;
-+                if(!strncmp(tmp_entry->name, name, len))
-+                        return 1;
-+        }
-+        return 0;
-+}
-+
-+/* mk:
-+ * Recursive function to create corresponding directorys in the storage fs.
-+ * The function will build the storage directorys up to dentry.
-+ */
-+int build_sto_structure(dentry_t *dir, dentry_t *dentry)
-+{
-+	int err;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	if(dentry->d_parent != dir) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: invalid parameter or meta data corruption [1].\n");
-+		return 1;
-+	}
-+
-+       	if(dtost(dir) != MODIFIED) {
-+		err = build_sto_structure(dir->d_parent, dentry->d_parent);
-+		if(err)
-+			return err;
-+	}
-+
-+	/* ok, coming back again. */
-+	check_mini_fo_dentry(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(!hidden_sto_dentry) {
-+		/*
-+		 * This is the case after creating the first
-+		 * hidden_sto_dentry.
-+		 * After one negative storage_dentry, all pointers to
-+		 * hidden_storage dentries are set to NULL. We need to
-+		 * create the negative dentry before we create the storage
-+		 * file.
-+		 */
-+		unsigned int len;
-+		const unsigned char *name;
-+		len = dtohd(dentry)->d_name.len;
-+		name = dtohd(dentry)->d_name.name;
-+		hidden_sto_dentry = lookup_one_len(name, dtohd2(dir), len);
-+		dtohd2(dentry) = hidden_sto_dentry;
-+	}
-+
-+	/* was:	hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	/* lets be safe */
-+	if(dtohd2(dir) != hidden_sto_dir_dentry) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: invalid parameter or meta data corruption [2].\n");
-+		return 1;
-+	}
-+
-+	/* check for errors in lock_parent */
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+	if(IS_ERR(hidden_sto_dir_dentry)) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: lock_parent failed.\n");
-+		return err;
-+	}
-+
-+	err = vfs_mkdir(hidden_sto_dir_dentry->d_inode,
-+			hidden_sto_dentry,
-+			dir->d_inode->i_mode);
-+
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: failed to create storage dir [1].\n");
-+		/* was: unlock_dir(dir); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&dir->d_inode->i_mutex);
-+#else
-+		up(&dir->d_inode->i_sem);
-+#endif
-+		dput(dir);
-+		return err;
-+	}
-+
-+	/* everything ok! */
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: failed to create storage dir [2].\n");
-+		/* was: unlock_dir(dir); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&dir->d_inode->i_mutex);
-+#else
-+		up(&dir->d_inode->i_sem);
-+#endif
-+		dput(dir);
-+		return 1;
-+	}
-+
-+	/* interpose the new inode and set new state */
-+	itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	dtopd(dentry)->state = MODIFIED;
-+
-+	/* initalize the wol list */
-+	itopd(dentry->d_inode)->deleted_list_size = -1;
-+	itopd(dentry->d_inode)->renamed_list_size = -1;
-+	meta_build_lists(dentry);
-+
-+	fist_copy_attr_all(dentry->d_inode, itohi2(dentry->d_inode));
-+	fist_copy_attr_timesizes(dir->d_inode,
-+				 hidden_sto_dir_dentry->d_inode);
-+	dir->d_inode->i_nlink++;
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+	return 0;
-+}
-+
-+
-+#if 0 /* unused */
-+
-+/*
-+ * Read "len" bytes from "filename" into "buf".
-+ * "buf" is in kernel space.
-+ */
-+int
-+mini_fo_read_file(const char *filename, void *buf, int len)
-+{
-+    file_t *filp;
-+    mm_segment_t oldfs;
-+    int bytes;
-+    /* Chroot? Maybe NULL isn't right here */
-+    filp = filp_open(filename, O_RDONLY, 0);
-+    if (!filp || IS_ERR(filp)) {
-+	printk("mini_fo_read_file err %d\n", (int) PTR_ERR(filp));
-+	return -1;  /* or do something else */
-+    }
-+
-+    if (!filp->f_op->read)
-+	return -2;  /* file(system) doesn't allow reads */
-+
-+    /* now read len bytes from offset 0 */
-+    filp->f_pos = 0;		/* start offset */
-+    oldfs = get_fs();
-+    set_fs(KERNEL_DS);
-+    bytes = filp->f_op->read(filp, buf, len, &filp->f_pos);
-+    set_fs(oldfs);
-+
-+    /* close the file */
-+    fput(filp);
-+
-+    return bytes;
-+}
-+
-+
-+
-+/*
-+ * Write "len" bytes from "buf" to "filename"
-+ * "buf" is in kernel space.
-+ */
-+int
-+mini_fo_write_file(const char *filename, void *buf, int len)
-+{
-+    file_t *filp;
-+    mm_segment_t oldfs;
-+    int bytes;
-+				/* Chroot? Maybe NULL isn't right here */
-+    filp = filp_open(filename, O_RDWR|O_CREAT, 0640);
-+    if (!filp || IS_ERR(filp)) {
-+	printk("mini_fo_write_file err %d\n", (int) PTR_ERR(filp));
-+	return -1;  /* or do something else */
-+    }
-+
-+    if (!filp->f_op->write)
-+	return -2;  /* file(system) doesn't allow writes */
-+
-+    /* now write len bytes from offset 0 */
-+    filp->f_pos = 0;		/* start offset */
-+    oldfs = get_fs();
-+    set_fs(KERNEL_DS);
-+    bytes = filp->f_op->write(filp, buf, len, &filp->f_pos);
-+    set_fs(oldfs);
-+
-+    /* close the file */
-+    fput(filp);
-+
-+    return bytes;
-+}
-+
-+#endif /* unused */
-+
---- /dev/null
-+++ b/fs/mini_fo/ChangeLog
-@@ -0,0 +1,281 @@
-+2006-01-24  Markus Klotzbuecher  <mk@mary.denx.de>
-+
-+	* Add tons of ugly ifdefs to Ed L. Cashin's mutex patch to
-+          retain backwards compatibility.
-+
-+2006-01-24  Ed L. Cashin <ecashin@coraid.com>
-+
-+	* Support for the new mutex infrastructure
-+	(7892f2f48d165a34b0b8130c8a195dfd807b8cb6)
-+
-+2005-10-15  Markus Klotzbuecher  <mk@localhost.localdomain>
-+
-+	* Bugfix for a serious memory leak in mini_fo_follow_link.
-+
-+2005-09-21  Markus Klotzbuecher  <mk@mary>
-+
-+	* new release 0.6.1
-+
-+	* fix of a compiler warning due to changes in 2.6.13
-+
-+2005-09-21  Klaus Wenninger  <klaus.wenninger@siemens.com>
-+
-+	* file.c: readdir: fix for a bug that caused directory entries
-+          to show up twice when using storage filesystems such as
-+          minixfs or pramfs.
-+
-+2005-06-30  Eric Lammerts <eric@lammerts.org>
-+
-+	* fix for an oops when overwriting a binary thats beeing
-+          executed.
-+
-+2005-06-09    <mk@mary>
-+
-+	* Renamed overlay to mini_fo-overlay.
-+
-+	* Added mini_fo-merge script to allow merging of storage and base
-+	after making modifications.
-+
-+2005-05-22  root  <mk@mary>
-+
-+	* Added overlay script that allows to easily mount mini_fo ontop
-+	of a given base directory
-+
-+2005-05-10    <mk@mary>
-+
-+	* inode.c: xattr functions return -EOPNOSUPP instead of
-+          -ENOSUPP, what confuses "ls -l"
-+
-+	* Changed license from LGPL to GPL.
-+
-+2005-05-08  root  <mk@mary>
-+
-+	* Makefile: clean it up and added make install and make
-+          uninstall.
-+
-+2005-05-06    <mk@mary>
-+
-+	* merged devel branch back to main. [v0-6-0-pre3]
-+
-+	* removed unused files print.c and fist_ioctl. [devel-0-0-18]
-+
-+	* ioctl: removed fist_ioctl stuff, that is not needed for
-+          now.
-+
-+2005-05-03    <mk@mary>
-+
-+	* file.c: simplified mini_fo_open and mini_fo_setattr using
-+          new state changing functions. [devel-0-0-17]
-+
-+	* inode.c: Fixed getattr state bug (see below) in 2.4 function
-+          mini_fo_inode revalidate.
-+
-+	* inode.c: found an other bug in mini_fo_getattr. States are not
-+	  reliable in this function, as a file can be opened, unlinked and
-+	  the getattr function called. This results in a deleted dentry
-+	  with an inode. Fix is to ignore states and simply use the inode
-+	  available.
-+
-+2005-04-29    <mk@mary>
-+
-+	* file.c: Bugfix and cleanup in fasync and fsync. [devel-0-0-16]
-+
-+	* file.c: do not use mini_fo_lock so the generic version is
-+          used (I guess).
-+
-+	* inode.c: getattr, never call getattr on lower files, as this
-+          will cause the inum to change.
-+
-+	* inode.c: rename_reg_file renamed to rename_nondir, as it
-+          doesn't matter as long it't not a dir. Removed all
-+          rename_dev_file etc.
-+
-+	* tagged as devel-0-0-15
-+
-+	* inode.c: added support for chosing support for extended
-+          attrs at compile time by XATTR define in mini_fo.h .
-+
-+	* inode.c: fixed mini_fo_getattr to use mini_fo inode and not
-+          lower again, what avoids inode number changes that confused
-+          rm again. This is the proper solution.
-+
-+2005-04-24    <mk@mary>
-+
-+	* all files: updated Copyright notive to 2005. [devel-0-0-14]
-+
-+	* inode.c: fixed mini_fo_getattr to not change the inode
-+          number, even if lower files change.
-+
-+	* super.c: fixed a bug that caused deleted base file to show
-+          up suddenly after some time, or after creating a special
-+          file. The problem was that after some time or after special
-+          file creating sync_sb_inodes is called by the vfs, that
-+          called our mini_fo_put_inode. There was (wrongly) called
-+          __meta_put_lists, that nuked the lists, although the inode
-+          was going to continue its life. Moving __meta_put_lists to
-+          mini_fo_clear_inode, where an inode is really destroyed,
-+          solved the problem.
-+
-+
-+2005-04-23    <mk@mary>
-+
-+	* state.c, aux.c: more cleaning up and
-+          simplifications. [devel-0-0-13]
-+
-+	* inode.c: implemented mini_fo_getattr, that was required for
-+          2.6 because inode_revalidate has been remove there, and the
-+	  old "du" bug returned.
-+
-+
-+2005-04-20    <mk@mary>
-+
-+	* aux.c: get_neg_sto_dentry(): allow to be called for dentries
-+          in state UNMODIFIED, NON_EXISTANT _and_ DELETED.
-+
-+2005-04-19    <mk@mary>
-+
-+	* Fixed a bug under 2.6 that caused files deleted via mini_fo
-+          not to be deleted properly and therefore the fs filled up
-+          untill no memory was left. [devel-0-0-12]
-+
-+	* Added basic hard link support. This means that creating
-+          hardlinks will work, but existing ones will be treated as
-+          individual files. [devel-0-0-11]
-+
-+2005-04-17    <mk@mary>
-+
-+	* Bugfixes
-+
-+2005-04-13  root  <mk@mary>
-+
-+	* Added file state.c for the state transition
-+          functions. Doesn't work very well yet, though...
-+
-+2005-04-12    <mk@mary>
-+
-+	* Porting to 2.6 started, which is easier than expected, also
-+          due to Olivier previous work.
-+
-+2005-04-08    <mk@mary>
-+
-+	* Fixed the bug that caused du to return invalid sizes of
-+          directory trees. The problem was that
-+          mini_fo_inode_revalidate didn't always copy the attributes
-+          from the base inode properly.
-+
-+2005-04-01  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Merged devel branch back to main trunk and updated the
-+          RELEASE notes. This will be 0-6-0-pre1.
-+
-+2005-03-31  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Fixed some bugs in rename_reg_file, that only showed up in
-+          the kernel compile test. Kernel compiles cleanly ontop of
-+          mini_fo, now also make mrproper etc. work. Seems pretty stable.
-+
-+2005-03-28  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Many, many directory renaming bugfixes and a lot of other
-+          cleanup. Dir renaming seems to work relatively stable.
-+
-+2005-03-22  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Finished implementing lightweight directory renaming. Some
-+          basic testing indicates it works fine.
-+	  Next is to implement testcases for the testsuite and confirm
-+          everything is really working ok.
-+
-+2005-03-18  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Finished implementing meta.c stuff required for directory
-+          renaming.
-+
-+2005-03-17  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Fixed all compile warnings + an extremly old bug that
-+          somehow crept in while reworking the wol stuff to the META
-+          system. Turning on -Werror again... :-)
-+
-+	* Fixed some bugs in the new rename_reg_file function.
-+
-+	* Rewrote mini_fo rename and split it into several
-+          subfunctions, that handle the different types
-+          seperately. Rewrote the regular file function aswell, as it
-+          was implemented somewhat inefficient.
-+
-+2005-03-16  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Implemented new META subsystem, removed old WOL stuff in favor
-+	  if it.
-+
-+	* After some basic testing everything seems ok...
-+
-+2005-03-11  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Renaming a non regular file caused trouble because I always
-+	  tried to copy the contents. Now I only do this for regular
-+	  files. mini_fo_rename still isn't implemented properly, renaming
-+	  of device files, symlinks etc. results in a empty regular file
-+	  instead of the proper type.
-+
-+	* Directory renaming suddenly works! What a surprise! I guess
-+          this is because renaming is implemented as making a copy and
-+          removing the original. Still this might not work
-+          everywhere...
-+
-+2005-03-09  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Bugfix, when a mini_fo directory that exists in storage
-+  	  (state: MODIFIED, CREATED and DEL_REWRITTEN) is deleted, a
-+  	  possibly existing WOL file contained in it needs to be
-+  	  deleted too.
-+
-+	* Starting cleanup: defined state names in order to get rid of
-+          the state numbers.
-+
-+2005-03-08  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Makefile fix, fist_ioctl was built against wrong sources if ARCH=um
-+
-+	* Fixed a bug in dentry.c, mini_fo_d_hash. In state 4 =
-+          DEL_REWRITTEN the hash was calculated from the base dentry,
-+          which was wrong and and caused assertions in
-+          __mini_fo_hidden_dentry to fail.
-+
-+2005-02-21    <mk@mary>
-+
-+	* Implemented directory deleting (inode.c)
-+
-+	* main.c: made mini_fo_parse_options a little more robust.
-+
-+2004-12-22    <mk@mary>
-+
-+	* Makefile cleanup and uml stuff, removed unneccessary files
-+
-+	* Created a new and hopefully more informative README
-+
-+	* CHANGELOG: created a new CHANGELOG and added old entries reversely
-+
-+
-+2004-10-24 Gleb Natapov <gleb@nbase.co.il>
-+
-+	* Fix: owner and group where not correctly copied from base to
-+          storage.
-+
-+
-+2004-10-05 Gleb Natapov <gleb@nbase.co.il>
-+
-+	* Implementation of fsync, fasync and lock mini_fo functions.
-+
-+
-+2004-09-29 Bob Lee <bob@pantasys.com>
-+
-+	* Fix of a serious pointer bug
-+
-+
-+2004-09-28 Gleb Natapov <gleb@nbase.co.il>
-+
-+	* Implementation of mini_fo_mknod and mini_fo_rename, support
-+          for device files.
-+
---- /dev/null
-+++ b/fs/mini_fo/dentry.c
-@@ -0,0 +1,244 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+/*
-+ * THIS IS A BOOLEAN FUNCTION: returns 1 if valid, 0 otherwise.
-+ */
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_d_revalidate(dentry_t *dentry, struct nameidata *nd)
-+#else
-+mini_fo_d_revalidate(dentry_t *dentry, int flags)
-+#endif
-+{
-+	int err1 = 1; /* valid = 1, invalid = 0 */
-+	int err2 = 1;
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	hidden_dentry  = dtohd(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(hidden_dentry &&
-+	   hidden_dentry->d_op &&
-+	   hidden_dentry->d_op->d_revalidate) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		err1 = hidden_dentry->d_op->d_revalidate(hidden_dentry, nd);
-+#else
-+		err1 = hidden_dentry->d_op->d_revalidate(hidden_dentry, flags);
-+#endif
-+	}
-+	if(hidden_sto_dentry &&
-+	   hidden_sto_dentry->d_op &&
-+	   hidden_sto_dentry->d_op->d_revalidate) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		err2 = hidden_sto_dentry->d_op->d_revalidate(hidden_sto_dentry,
-+							     nd);
-+#else
-+		err2 = hidden_sto_dentry->d_op->d_revalidate(hidden_sto_dentry,
-+							     flags);
-+#endif
-+	}
-+
-+	/* mk: if one of the lower level dentries are valid,
-+	 * the mini_fo dentry is too.
-+	 */
-+	return (err1 || err2);
-+}
-+
-+
-+STATIC int
-+mini_fo_d_hash(dentry_t *dentry, qstr_t *name)
-+{
-+	int err = 0;
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+	/* hidden_dentry = mini_fo_hidden_dentry(dentry);
-+	 * hidden_sto_dentry = mini_fo_hidden_sto_dentry(dentry); */
-+
-+	/* state 1, 3, 4, 5: build the hash for the storage dentry */
-+	if((dtopd(dentry)->state == MODIFIED) ||
-+	   (dtopd(dentry)->state == CREATED) ||
-+	   (dtopd(dentry)->state == DEL_REWRITTEN) ||
-+	   (dtopd(dentry)->state == DELETED)) {
-+		hidden_sto_dentry = dtohd2(dentry);
-+		if(hidden_sto_dentry &&
-+		   hidden_sto_dentry->d_op &&
-+		   hidden_sto_dentry->d_op->d_hash) {
-+			err = hidden_sto_dentry->d_op->d_hash(hidden_sto_dentry, name);
-+		}
-+		goto out;
-+	}
-+	/* state 2: build the hash for the base dentry */
-+	if(dtopd(dentry)->state == UNMODIFIED) {
-+		hidden_dentry = dtohd(dentry);
-+		if(hidden_dentry &&
-+		   hidden_dentry->d_op &&
-+		   hidden_dentry->d_op->d_hash) {
-+			err = hidden_dentry->d_op->d_hash(hidden_dentry, name);
-+		}
-+		goto out;
-+	}
-+	/* state 6: build hash for the dentry that exists */
-+	if(dtopd(dentry)->state == NON_EXISTANT) {
-+		hidden_sto_dentry = dtohd2(dentry);
-+		if(hidden_sto_dentry &&
-+		   hidden_sto_dentry->d_op &&
-+		   hidden_sto_dentry->d_op->d_hash) {
-+			err = hidden_sto_dentry->d_op->d_hash(hidden_sto_dentry, name);
-+			goto out;
-+		}
-+		hidden_dentry = dtohd(dentry);
-+		if(hidden_dentry &&
-+		   hidden_dentry->d_op &&
-+		   hidden_dentry->d_op->d_hash) {
-+			err = hidden_dentry->d_op->d_hash(hidden_dentry, name);
-+			goto out;
-+		}
-+	}
-+
-+	printk(KERN_CRIT "mini_fo: d_hash: invalid state detected.\n");
-+
-+ out:
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_d_compare(dentry_t *dentry, qstr_t *a, qstr_t *b)
-+{
-+	int err;
-+	dentry_t *hidden_dentry=NULL;
-+
-+	/* hidden_dentry = mini_fo_hidden_dentry(dentry); */
-+	if(dtohd2(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else if(dtohd(dentry))
-+		hidden_dentry = dtohd(dentry);
-+
-+	if (hidden_dentry && hidden_dentry->d_op && hidden_dentry->d_op->d_compare) {
-+		err = hidden_dentry->d_op->d_compare(hidden_dentry, a, b);
-+	} else {
-+		err = ((a->len != b->len) || memcmp(a->name, b->name, b->len));
-+	}
-+
-+	return err;
-+}
-+
-+
-+int
-+mini_fo_d_delete(dentry_t *dentry)
-+{
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+	int err = 0;
-+
-+	/* this could be a negative dentry, so check first */
-+	if (!dtopd(dentry)) {
-+		printk(KERN_CRIT "mini_fo_d_delete: negative dentry passed.\n");
-+		goto out;
-+	}
-+	hidden_dentry = dtohd(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(hidden_dentry) {
-+		if(hidden_dentry->d_op &&
-+		   hidden_dentry->d_op->d_delete) {
-+			err = hidden_dentry->d_op->d_delete(hidden_dentry);
-+		}
-+	}
-+	if(hidden_sto_dentry) {
-+		if(hidden_sto_dentry->d_op &&
-+		   hidden_sto_dentry->d_op->d_delete) {
-+			err = hidden_sto_dentry->d_op->d_delete(hidden_sto_dentry);
-+		}
-+	}
-+
-+ out:
-+	return err;
-+}
-+
-+
-+void
-+mini_fo_d_release(dentry_t *dentry)
-+{
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+
-+	/* this could be a negative dentry, so check first */
-+	if (!dtopd(dentry)) {
-+		printk(KERN_CRIT "mini_fo_d_release: no private data.\n");
-+		goto out;
-+	}
-+	hidden_dentry = dtohd(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(hidden_dentry) {
-+		/* decrement hidden dentry's counter and free its inode */
-+		dput(hidden_dentry);
-+	}
-+	if(hidden_sto_dentry) {
-+                /* decrement hidden dentry's counter and free its inode */
-+		dput(hidden_sto_dentry);
-+	}
-+
-+	/* free private data (mini_fo_dentry_info) here */
-+	kfree(dtopd(dentry));
-+	__dtopd(dentry) = NULL;	/* just to be safe */
-+ out:
-+	return;
-+}
-+
-+
-+/*
-+ * we don't really need mini_fo_d_iput, because dentry_iput will call iput() if
-+ * mini_fo_d_iput is not defined. We left this implemented for ease of
-+ * tracing/debugging.
-+ */
-+void
-+mini_fo_d_iput(dentry_t *dentry, inode_t *inode)
-+{
-+	iput(inode);
-+}
-+
-+
-+struct dentry_operations mini_fo_dops = {
-+	d_revalidate:	mini_fo_d_revalidate,
-+	d_hash:		mini_fo_d_hash,
-+	d_compare:		mini_fo_d_compare,
-+	d_release:		mini_fo_d_release,
-+	d_delete:		mini_fo_d_delete,
-+	d_iput:		mini_fo_d_iput,
-+};
---- /dev/null
-+++ b/fs/mini_fo/file.c
-@@ -0,0 +1,713 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+#define ROUND_UP(x) (((x)+sizeof(long)-1) & ~(sizeof(long)-1))
-+
-+/*******************
-+ * File Operations *
-+ *******************/
-+
-+STATIC loff_t
-+mini_fo_llseek(file_t *file, loff_t offset, int origin)
-+{
-+	loff_t err;
-+	file_t *hidden_file = NULL;
-+
-+	if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {
-+		/* Check if trying to llseek from a directory */
-+		err = -EISDIR;
-+		goto out;
-+	}
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	/* always set hidden position to this one */
-+	hidden_file->f_pos = file->f_pos;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	memcpy(&(hidden_file->f_ra),
-+	       &(file->f_ra),
-+	       sizeof(struct file_ra_state));
-+#else
-+	if (file->f_reada) { /* update readahead information if needed */
-+		hidden_file->f_reada = file->f_reada;
-+		hidden_file->f_ramax = file->f_ramax;
-+		hidden_file->f_raend = file->f_raend;
-+		hidden_file->f_ralen = file->f_ralen;
-+		hidden_file->f_rawin = file->f_rawin;
-+	}
-+#endif
-+	if (hidden_file->f_op && hidden_file->f_op->llseek)
-+		err = hidden_file->f_op->llseek(hidden_file, offset, origin);
-+	else
-+		err = generic_file_llseek(hidden_file, offset, origin);
-+
-+	if (err < 0)
-+		goto out;
-+
-+	if (err != file->f_pos) {
-+		file->f_pos = err;
-+		// ION maybe this?
-+		// 	file->f_pos = hidden_file->f_pos;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		file->f_reada = 0;
-+#endif
-+		file->f_version++;
-+	}
-+
-+ out:
-+	return err;
-+}
-+
-+
-+/* mk: fanout capable */
-+STATIC ssize_t
-+mini_fo_read(file_t *file, char *buf, size_t count, loff_t *ppos)
-+{
-+	int err = -EINVAL;
-+	file_t *hidden_file = NULL;
-+	loff_t pos = *ppos;
-+
-+	if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {
-+		/* Check if trying to read from a directory */
-+		/* printk(KERN_CRIT "mini_fo_read: ERROR: trying to read data from a directory.\n"); */
-+		err = -EISDIR;
-+		goto out;
-+	}
-+
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	if (!hidden_file->f_op || !hidden_file->f_op->read)
-+		goto out;
-+
-+	err = hidden_file->f_op->read(hidden_file, buf, count, &pos);
-+	*ppos = pos;
-+
-+	if (err >= 0) {
-+		/* atime should also be updated for reads of size zero or more */
-+		fist_copy_attr_atime(file->f_dentry->d_inode,
-+				     hidden_file->f_dentry->d_inode);
-+	}
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	/*
-+	 * MAJOR HACK
-+	 * because pread() does not have any way to tell us that it is
-+	 * our caller, then we don't know for sure if we have to update
-+	 * the file positions.  This hack relies on read() having passed us
-+	 * the "real" pointer of its struct file's f_pos field.
-+	 */
-+	if (ppos == &file->f_pos)
-+		hidden_file->f_pos = *ppos = pos;
-+	if (hidden_file->f_reada) { /* update readahead information if needed */
-+		file->f_reada = hidden_file->f_reada;
-+		file->f_ramax = hidden_file->f_ramax;
-+		file->f_raend = hidden_file->f_raend;
-+		file->f_ralen = hidden_file->f_ralen;
-+		file->f_rawin = hidden_file->f_rawin;
-+	}
-+#else
-+	memcpy(&(file->f_ra),&(hidden_file->f_ra),sizeof(struct file_ra_state));
-+#endif
-+
-+ out:
-+	return err;
-+}
-+
-+
-+/* this mini_fo_write() does not modify data pages! */
-+STATIC ssize_t
-+mini_fo_write(file_t *file, const char *buf, size_t count, loff_t *ppos)
-+{
-+	int err = -EINVAL;
-+	file_t *hidden_file = NULL;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	loff_t pos = *ppos;
-+
-+	/* mk: fan out: */
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			/* This is bad! We have no storage file to write to. This
-+			 * should never happen because if a file is opened for
-+			 * writing, a copy should have been made earlier.
-+			 */
-+			printk(KERN_CRIT "mini_fo: write : ERROR, no storage file to write.\n");
-+			err = -EINVAL;
-+			goto out;
-+		}
-+	}
-+
-+	inode = file->f_dentry->d_inode;
-+	hidden_inode = itohi2(inode);
-+	if(!hidden_inode) {
-+		printk(KERN_CRIT "mini_fo: write: no sto inode found, not good.\n");
-+		goto out;
-+	}
-+
-+	if (!hidden_file->f_op || !hidden_file->f_op->write)
-+		goto out;
-+
-+	/* adjust for append -- seek to the end of the file */
-+	if (file->f_flags & O_APPEND)
-+		pos = inode->i_size;
-+
-+	err = hidden_file->f_op->write(hidden_file, buf, count, &pos);
-+
-+	/*
-+	 * copy ctime and mtime from lower layer attributes
-+	 * atime is unchanged for both layers
-+	 */
-+	if (err >= 0)
-+		fist_copy_attr_times(inode, hidden_inode);
-+
-+	*ppos = pos;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	/*
-+	 * XXX: MAJOR HACK
-+	 *
-+	 * because pwrite() does not have any way to tell us that it is
-+	 * our caller, then we don't know for sure if we have to update
-+	 * the file positions.  This hack relies on write() having passed us
-+	 * the "real" pointer of its struct file's f_pos field.
-+	 */
-+	if (ppos == &file->f_pos)
-+		hidden_file->f_pos = *ppos = pos;
-+#endif
-+	/* update this inode's size */
-+	if (pos > inode->i_size)
-+		inode->i_size = pos;
-+
-+ out:
-+	return err;
-+}
-+
-+/* Global variable to hold a file_t pointer.
-+ * This serves to allow mini_fo_filldir function to know which file is
-+ * beeing read, which is required for two reasons:
-+ *
-+ *   - be able to call wol functions in order to avoid listing deleted
-+ *     base files.
-+ *   - if we're reading a directory which is in state 1, we need to
-+ *     maintain a list (in mini_fo_filldir) of which files allready
-+ *     have been copied to userspace,to detect files existing in base
-+ *     and storage and not list them twice.
-+ */
-+filldir_t mini_fo_filldir_orig;
-+file_t *mini_fo_filldir_file;
-+
-+/* mainly copied from fs/readdir.c */
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_filldir(void * __buf, const char * name, int namlen, loff_t offset,
-+		  u64 ino, unsigned int d_type)
-+#else
-+mini_fo_filldir(void * __buf, const char * name, int namlen, loff_t offset,
-+		  ino_t ino, unsigned int d_type)
-+#endif
-+{
-+	struct getdents_callback * buf = (struct getdents_callback *) __buf;
-+	file_t* file = mini_fo_filldir_file;
-+
-+	/* In theses states we filter meta files in storage (WOL) */
-+	if(file && (dtopd(file->f_dentry)->state == MODIFIED ||
-+		    dtopd(file->f_dentry)->state == CREATED ||
-+		    dtopd(file->f_dentry)->state == DEL_REWRITTEN)) {
-+
-+		int tmp = strlen(META_FILENAME);
-+		if(tmp  == namlen) {
-+			if(!strncmp(name, META_FILENAME, namlen))
-+				return 0;
-+		}
-+	}
-+
-+	/* check if we are merging the contents of storage and base */
-+	if(file && dtopd(file->f_dentry)->state == MODIFIED) {
-+		/* check if we are still reading storage contents, if
-+		 * yes, we just save the name of the file for duplicate
-+		 * checking later. */
-+
-+		if(!ftopd(file)->rd.sto_done) {
-+			/* put file into ndl list */
-+			if(ndl_add_entry(&ftopd(file)->rd, name, namlen))
-+				printk(KERN_CRIT "mini_fo_filldir: Error adding to ndl.\n");
-+		} else {
-+			/* check if file has been deleted */
-+			if(meta_check_d_entry(file->f_dentry, name, namlen))
-+				return 0;
-+
-+			/* do duplicate checking */
-+			if(ndl_check_entry(&ftopd(file)->rd, name, namlen))
-+				return 0;
-+		}
-+	}
-+
-+	return mini_fo_filldir_orig(buf, name, namlen, offset, ino, d_type);
-+}
-+
-+
-+STATIC int
-+mini_fo_readdir(file_t *file, void *dirent, filldir_t filldir)
-+{
-+	int err = 0;/* mk: ??? -ENOTDIR; */
-+	file_t *hidden_file = NULL;
-+	file_t *hidden_sto_file = NULL;
-+	inode_t *inode;
-+	struct getdents_callback *buf;
-+	int oldcount;
-+
-+#if defined(FIST_FILTER_NAME) || defined(FIST_FILTER_SCA)
-+	struct mini_fo_getdents_callback buf;
-+#endif /* FIST_FILTER_NAME || FIST_FILTER_SCA */
-+
-+	buf = (struct getdents_callback *) dirent;
-+	oldcount = buf->count;
-+	inode = file->f_dentry->d_inode;
-+	mini_fo_filldir_file = file;
-+	mini_fo_filldir_orig = filldir;
-+
-+	ftopd(file)->rd.sto_done = 0;
-+	do {
-+		if (ftopd(file) != NULL) {
-+			if(ftohf2(file)) {
-+				hidden_sto_file = ftohf2(file);
-+				err = vfs_readdir(hidden_sto_file, mini_fo_filldir, dirent);
-+				file->f_pos = hidden_sto_file->f_pos;
-+				if (err > 0)
-+					fist_copy_attr_atime(inode, hidden_sto_file->f_dentry->d_inode);
-+				/* not finshed yet, we'll be called again */
-+				if (buf->count != oldcount)
-+					break;
-+			}
-+
-+			ftopd(file)->rd.sto_done = 1;
-+
-+			if(ftohf(file)) {
-+				hidden_file = ftohf(file);
-+				err = vfs_readdir(hidden_file, mini_fo_filldir, dirent);
-+				file->f_pos = hidden_file->f_pos;
-+				if (err > 0)
-+					fist_copy_attr_atime(inode, hidden_file->f_dentry->d_inode);
-+			}
-+
-+		}
-+	} while (0);
-+
-+	/* mk:
-+	 * we need to check if all the directory data has been copied to userspace,
-+	 * or if we will be called again by userspace to complete the operation.
-+	 */
-+	if(buf->count == oldcount) {
-+		ndl_put_list(&ftopd(file)->rd);
-+	}
-+
-+	/* unset this, safe */
-+	mini_fo_filldir_file = NULL;
-+	return err;
-+}
-+
-+
-+STATIC unsigned int
-+mini_fo_poll(file_t *file, poll_table *wait)
-+{
-+	unsigned int mask = DEFAULT_POLLMASK;
-+	file_t *hidden_file = NULL;
-+
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	if (!hidden_file->f_op || !hidden_file->f_op->poll)
-+		goto out;
-+
-+	mask = hidden_file->f_op->poll(hidden_file, wait);
-+
-+ out:
-+	return mask;
-+}
-+
-+/* FIST-LITE special version of mmap */
-+STATIC int
-+mini_fo_mmap(file_t *file, vm_area_t *vma)
-+{
-+	int err = 0;
-+	file_t *hidden_file = NULL;
-+
-+	/* fanout capability */
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	ASSERT(hidden_file != NULL);
-+	ASSERT(hidden_file->f_op != NULL);
-+	ASSERT(hidden_file->f_op->mmap != NULL);
-+
-+	vma->vm_file = hidden_file;
-+	err = hidden_file->f_op->mmap(hidden_file, vma);
-+	get_file(hidden_file); /* make sure it doesn't get freed on us */
-+	fput(file);	       /* no need to keep extra ref on ours */
-+
-+	return err;
-+}
-+
-+
-+
-+STATIC int
-+mini_fo_open(inode_t *inode, file_t *file)
-+{
-+	int err = 0;
-+ 	int hidden_flags;
-+	file_t *hidden_file = NULL;
-+	dentry_t *hidden_dentry = NULL;
-+
-+	/* fanout stuff */
-+	file_t *hidden_sto_file = NULL;
-+	dentry_t *hidden_sto_dentry = NULL;
-+
-+	__ftopd(file) =
-+		kmalloc(sizeof(struct mini_fo_file_info), GFP_KERNEL);
-+	if (!ftopd(file)) {
-+		err = -ENOMEM;
-+		goto out;
-+	}
-+
-+	/* init the readdir_helper structure */
-+	INIT_LIST_HEAD(&ftopd(file)->rd.ndl_list);
-+	ftopd(file)->rd.ndl_size = 0;
-+
-+	/* In certain paths this could stay uninitalized and cause trouble */
-+	ftohf(file) = NULL;
-+	ftohf2(file) = NULL;
-+	hidden_flags = file->f_flags;
-+
-+	/* create storage files? */
-+	if(dtost(file->f_dentry) == UNMODIFIED) {
-+		if(!IS_WRITE_FLAG(file->f_flags)) {
-+			hidden_dentry = dtohd(file->f_dentry);
-+			dget(hidden_dentry);
-+			/* dentry_open will decrement mnt refcnt if err.
-+			 * otherwise fput() will do an mntput() for us upon file close. */
-+			mntget(stopd(inode->i_sb)->hidden_mnt);
-+			hidden_file = dentry_open(hidden_dentry,
-+						  stopd(inode->i_sb)->hidden_mnt,
-+						  hidden_flags);
-+			if (IS_ERR(hidden_file)) {
-+				err = PTR_ERR(hidden_file);
-+				dput(hidden_dentry);
-+				goto out;
-+			}
-+			ftohf(file) = hidden_file;	/* link two files */
-+			goto out;
-+		}
-+		else {
-+			if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {
-+				err = dir_unmod_to_mod(file->f_dentry);
-+			} else
-+				err = nondir_unmod_to_mod(file->f_dentry, 1);
-+
-+			if (err) {
-+				printk("mini_fo_open: ERROR creating storage file.\n");
-+				goto out;
-+			}
-+		}
-+	}
-+	hidden_sto_dentry = dtohd2(file->f_dentry);
-+	dget(hidden_sto_dentry);
-+
-+	if(dtopd(file->f_dentry)->state == MODIFIED) {
-+		/* Directorys are special, interpose on both lower level files */
-+		if(S_ISDIR(itohi(inode)->i_mode)) {
-+			/* check for invalid file types of lower level files */
-+			if(!(S_ISDIR(itohi(inode)->i_mode) && S_ISDIR(itohi2(inode)->i_mode))) {
-+				printk(KERN_CRIT "mini_fo_open: meta data corruption detected.\n");
-+				dput(hidden_sto_dentry);
-+				err = -EINVAL;
-+				goto out;
-+			}
-+
-+			/* lower level directorys are ok, open the base file */
-+			hidden_dentry = dtohd(file->f_dentry);
-+			dget(hidden_dentry);
-+
-+			mntget(stopd(inode->i_sb)->hidden_mnt);
-+			hidden_file = dentry_open(hidden_dentry,
-+						  stopd(inode->i_sb)->hidden_mnt,
-+						  hidden_flags);
-+			if (IS_ERR(hidden_file)) {
-+				err = PTR_ERR(hidden_file);
-+				dput(hidden_dentry);
-+				dput(hidden_sto_dentry);
-+				goto out;
-+			}
-+			ftohf(file) = hidden_file; /* link the two files */
-+		}
-+	}
-+
-+	if(!exists_in_storage(file->f_dentry)) {
-+		printk(KERN_CRIT "mini_fo_open: invalid file state detected.\n");
-+		err = -EINVAL;
-+		dput(hidden_sto_dentry);
-+
-+		/* If the base file has been opened, we need to close it here */
-+		if(ftohf(file)) {
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				hidden_file->f_op->flush(hidden_file, NULL);
-+#else
-+				hidden_file->f_op->flush(hidden_file);
-+#endif
-+			dput(hidden_dentry);
-+		}
-+		goto out;
-+	}
-+
-+	/* ok, now we can safely open the storage file */
-+	mntget(stopd(inode->i_sb)->hidden_mnt2);
-+	hidden_sto_file = dentry_open(hidden_sto_dentry,
-+				      stopd(inode->i_sb)->hidden_mnt2,
-+				      hidden_flags);
-+
-+	/* dentry_open dputs the dentry if it fails */
-+	if (IS_ERR(hidden_sto_file)) {
-+		err = PTR_ERR(hidden_sto_file);
-+		/* close base file if open */
-+		if(ftohf(file)) {
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				hidden_file->f_op->flush(hidden_file, NULL);
-+#else
-+				hidden_file->f_op->flush(hidden_file);
-+#endif
-+			dput(hidden_dentry);
-+		}
-+		goto out;
-+	}
-+	ftohf2(file) = hidden_sto_file; /* link storage file */
-+
-+ out:
-+	if (err < 0 && ftopd(file)) {
-+		kfree(ftopd(file));
-+	}
-+	return err;
-+}
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_flush(file_t *file, fl_owner_t id)
-+#else
-+mini_fo_flush(file_t *file)
-+#endif
-+{
-+	int err1 = 0;		/* assume ok (see open.c:close_fp) */
-+	int err2 = 0;
-+	file_t *hidden_file = NULL;
-+
-+	check_mini_fo_file(file);
-+
-+	/* mk: we don't do any state checking here, as its not worth the time.
-+	 * Just flush the lower level files if they exist.
-+	 */
-+	if(ftopd(file) != NULL) {
-+		if(ftohf(file) != NULL) {
-+			hidden_file = ftohf(file);
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				err1 = hidden_file->f_op->flush(hidden_file, id);
-+#else
-+				err1 = hidden_file->f_op->flush(hidden_file);
-+#endif
-+		}
-+		if(ftohf2(file) != NULL) {
-+			hidden_file = ftohf2(file);
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				err2 = hidden_file->f_op->flush(hidden_file, id);
-+#else
-+				err2 = hidden_file->f_op->flush(hidden_file);
-+#endif
-+		}
-+	}
-+	return (err1 | err2);
-+}
-+
-+
-+STATIC int
-+mini_fo_release(inode_t *inode, file_t *file)
-+{
-+	int err = 0;
-+	file_t *hidden_file = NULL;
-+
-+	if (ftopd(file) != NULL) {
-+		if(ftohf(file)) {
-+			hidden_file = ftohf(file);
-+			fput(hidden_file);
-+		}
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+			fput(hidden_file);
-+		}
-+		kfree(ftopd(file));
-+	}
-+	return err;
-+}
-+
-+STATIC int
-+mini_fo_fsync(file_t *file, dentry_t *dentry, int datasync)
-+{
-+	int err1 = 0;
-+	int err2 = 0;
-+	file_t *hidden_file = NULL;
-+	dentry_t *hidden_dentry;
-+
-+	check_mini_fo_file(file);
-+
-+	if ((hidden_file = ftohf(file)) != NULL) {
-+		hidden_dentry = dtohd(dentry);
-+		if (hidden_file->f_op && hidden_file->f_op->fsync) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+			err1 = hidden_file->f_op->fsync(hidden_file, hidden_dentry, datasync);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		}
-+	}
-+
-+	if ((hidden_file = ftohf2(file)) != NULL) {
-+		hidden_dentry = dtohd2(dentry);
-+		if (hidden_file->f_op && hidden_file->f_op->fsync) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+			err2 = hidden_file->f_op->fsync(hidden_file, hidden_dentry, datasync);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		}
-+	}
-+	else
-+		goto err;
-+
-+err:
-+	return (err1 || err2);
-+}
-+
-+
-+STATIC int
-+mini_fo_fasync(int fd, file_t *file, int flag)
-+{
-+	int err1 = 0;
-+	int err2 = 0;
-+
-+	file_t *hidden_file = NULL;
-+
-+	check_mini_fo_file(file);
-+
-+	if((hidden_file = ftohf(file)) != NULL) {
-+		err1 = hidden_file->f_op->fasync(fd, hidden_file, flag);
-+	}
-+	if((hidden_file = ftohf2(file)) != NULL) {
-+		err2 = hidden_file->f_op->fasync(fd, hidden_file, flag);
-+	}
-+
-+	return (err1 || err2);
-+}
-+
-+
-+
-+struct file_operations mini_fo_dir_fops =
-+	{
-+		read:	generic_read_dir,
-+		write:	mini_fo_write,
-+		readdir: mini_fo_readdir,
-+		poll:	mini_fo_poll,
-+		/* ioctl:	mini_fo_ioctl, */
-+		mmap:	mini_fo_mmap,
-+		open:	mini_fo_open,
-+		flush:	mini_fo_flush,
-+		release: mini_fo_release,
-+		fsync:	mini_fo_fsync,
-+		fasync:	mini_fo_fasync,
-+		/* not needed lock:	mini_fo_lock, */
-+		/* not needed: readv */
-+		/* not needed: writev */
-+		/* not implemented: sendpage */
-+		/* not implemented: get_unmapped_area */
-+	};
-+
-+struct file_operations mini_fo_main_fops =
-+	{
-+		llseek:	mini_fo_llseek,
-+		read:	mini_fo_read,
-+		write:	mini_fo_write,
-+		readdir: mini_fo_readdir,
-+		poll:	mini_fo_poll,
-+		/* ioctl:	mini_fo_ioctl, */
-+		mmap:	mini_fo_mmap,
-+		open:	mini_fo_open,
-+		flush:	mini_fo_flush,
-+		release: mini_fo_release,
-+		fsync:	mini_fo_fsync,
-+		fasync:	mini_fo_fasync,
-+		/* not needed: lock:	mini_fo_lock, */
-+		/* not needed: readv */
-+		/* not needed: writev */
-+		/* not implemented: sendpage */
-+		/* not implemented: get_unmapped_area */
-+	};
---- /dev/null
-+++ b/fs/mini_fo/fist.h
-@@ -0,0 +1,252 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifndef __FIST_H_
-+#define __FIST_H_
-+
-+/*
-+ * KERNEL ONLY CODE:
-+ */
-+#ifdef __KERNEL__
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
-+#include <linux/autoconf.h>
-+#else
-+#include <linux/config.h>
-+#endif
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+#ifdef CONFIG_MODVERSIONS
-+# define MODVERSIONS
-+# include <linux/modversions.h>
-+#endif /* CONFIG_MODVERSIONS */
-+#endif /* KERNEL_VERSION < 2.6.0 */
-+#include <linux/sched.h>
-+#include <linux/kernel.h>
-+#include <linux/mm.h>
-+#include <linux/string.h>
-+#include <linux/stat.h>
-+#include <linux/errno.h>
-+#include <linux/wait.h>
-+#include <linux/limits.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+#include <linux/locks.h>
-+#else
-+#include <linux/buffer_head.h>
-+#include <linux/pagemap.h>
-+#include <linux/namei.h>
-+#include <linux/module.h>
-+#include <linux/mount.h>
-+#include <linux/page-flags.h>
-+#include <linux/writeback.h>
-+#include <linux/statfs.h>
-+#endif
-+#include <linux/smp.h>
-+#include <linux/smp_lock.h>
-+#include <linux/file.h>
-+#include <linux/slab.h>
-+#include <linux/vmalloc.h>
-+#include <linux/poll.h>
-+#include <linux/list.h>
-+#include <linux/init.h>
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)
-+#include <linux/xattr.h>
-+#endif
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#include <linux/security.h>
-+#endif
-+
-+#include <linux/swap.h>
-+
-+#include <asm/system.h>
-+/* #include <asm/segment.h> */
-+#include <asm/mman.h>
-+#include <linux/seq_file.h>
-+
-+/*
-+ * MACROS:
-+ */
-+
-+/* those mapped to ATTR_* were copied from linux/fs.h */
-+#define FA_MODE		ATTR_MODE
-+#define FA_UID		ATTR_UID
-+#define FA_GID		ATTR_GID
-+#define FA_SIZE		ATTR_SIZE
-+#define FA_ATIME	ATTR_ATIME
-+#define FA_MTIME	ATTR_MTIME
-+#define FA_CTIME	ATTR_CTIME
-+#define FA_ATIME_SET	ATTR_ATIME_SET
-+#define FA_MTIME_SET	ATTR_MTIME_SET
-+#define FA_FORCE	ATTR_FORCE
-+#define FA_ATTR_FLAGS	ATTR_ATTR_FLAG
-+
-+/* must be greater than all other ATTR_* flags! */
-+#define FA_NLINK	2048
-+#define FA_BLKSIZE	4096
-+#define FA_BLOCKS	8192
-+#define FA_TIMES	(FA_ATIME|FA_MTIME|FA_CTIME)
-+#define FA_ALL		0
-+
-+/* macros to manage changes between kernels */
-+#define INODE_DATA(i)	(&(i)->i_data)
-+
-+#define MIN(x,y) ((x < y) ? (x) : (y))
-+#define MAX(x,y) ((x > y) ? (x) : (y))
-+#define MAXPATHLEN PATH_MAX
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,5)
-+# define lookup_one_len(a,b,c) lookup_one(a,b)
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,4,5) */
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,8)
-+# define generic_file_llseek default_llseek
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,4,8) */
-+
-+#ifndef SEEK_SET
-+# define SEEK_SET 0
-+#endif /* not SEEK_SET */
-+
-+#ifndef SEEK_CUR
-+# define SEEK_CUR 1
-+#endif /* not SEEK_CUR */
-+
-+#ifndef SEEK_END
-+# define SEEK_END 2
-+#endif /* not SEEK_END */
-+
-+#ifndef DEFAULT_POLLMASK
-+# define DEFAULT_POLLMASK (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)
-+#endif /* not DEFAULT_POLLMASK */
-+
-+/* XXX: fix this so fistgen generates kfree() code directly */
-+#define kfree_s(a,b) kfree(a)
-+
-+/*
-+ * TYPEDEFS:
-+ */
-+typedef struct dentry dentry_t;
-+typedef struct file file_t;
-+typedef struct inode inode_t;
-+typedef inode_t vnode_t;
-+typedef struct page page_t;
-+typedef struct qstr qstr_t;
-+typedef struct super_block super_block_t;
-+typedef super_block_t vfs_t;
-+typedef struct vm_area_struct vm_area_t;
-+
-+
-+/*
-+ * EXTERNALS:
-+ */
-+
-+#define FPPF(str,page) printk("PPF %s 0x%x/%d: Lck:%d Err:%d Ref:%d Upd:%d Other::%d:%d:%d:%d:\n", \
-+		str, \
-+		(int) page, \
-+		(int) page->index, \
-+		(PageLocked(page) ? 1 : 0), \
-+		(PageError(page) ? 1 : 0), \
-+		(PageReferenced(page) ? 1 : 0), \
-+		(Page_Uptodate(page) ? 1 : 0), \
-+		(PageDecrAfter(page) ? 1 : 0), \
-+		(PageSlab(page) ? 1 : 0), \
-+		(PageSwapCache(page) ? 1 : 0), \
-+		(PageReserved(page) ? 1 : 0) \
-+		)
-+#define EZKDBG printk("EZK %s:%d:%s\n",__FILE__,__LINE__,__FUNCTION__)
-+#if 0
-+# define EZKDBG1 printk("EZK %s:%d\n",__FILE__,__LINE__)
-+#else
-+# define EZKDBG1
-+#endif
-+
-+extern int fist_get_debug_value(void);
-+extern int fist_set_debug_value(int val);
-+#if 0 /* mini_fo doesn't need these */
-+extern void fist_dprint_internal(int level, char *str,...);
-+extern void fist_print_dentry(char *str, const dentry_t *dentry);
-+extern void fist_print_inode(char *str, const inode_t *inode);
-+extern void fist_print_file(char *str, const file_t *file);
-+extern void fist_print_buffer_flags(char *str, struct buffer_head *buffer);
-+extern void fist_print_page_flags(char *str, page_t *page);
-+extern void fist_print_page_bytes(char *str, page_t *page);
-+extern void fist_print_pte_flags(char *str, const page_t *page);
-+extern void fist_checkinode(inode_t *inode, char *msg);
-+extern void fist_print_sb(char *str, const super_block_t *sb);
-+
-+/* §$% by mk: special debug functions */
-+extern void fist_mk_print_dentry(char *str, const dentry_t *dentry);
-+extern void fist_mk_print_inode(char *str, const inode_t *inode);
-+
-+extern char *add_indent(void);
-+extern char *del_indent(void);
-+#endif/* mini_fo doesn't need these */
-+
-+
-+#define STATIC
-+#define ASSERT(EX)	\
-+do {	\
-+    if (!(EX)) {	\
-+	printk(KERN_CRIT "ASSERTION FAILED: %s at %s:%d (%s)\n", #EX,	\
-+	       __FILE__, __LINE__, __FUNCTION__);	\
-+	(*((char *)0))=0;	\
-+    }	\
-+} while (0)
-+/* same ASSERT, but tell me who was the caller of the function */
-+#define ASSERT2(EX)	\
-+do {	\
-+    if (!(EX)) {	\
-+	printk(KERN_CRIT "ASSERTION FAILED (caller): %s at %s:%d (%s)\n", #EX,	\
-+	       file, line, func);	\
-+	(*((char *)0))=0;	\
-+    }	\
-+} while (0)
-+
-+#if 0 /* mini_fo doesn't need these */
-+#define dprintk(format, args...) printk(KERN_DEBUG format, ##args)
-+#define fist_dprint(level, str, args...) fist_dprint_internal(level, KERN_DEBUG str, ## args)
-+#define print_entry_location() fist_dprint(4, "%sIN:  %s %s:%d\n", add_indent(), __FUNCTION__, __FILE__, __LINE__)
-+#define print_exit_location() fist_dprint(4, "%s OUT: %s %s:%d\n", del_indent(), __FUNCTION__, __FILE__, __LINE__)
-+#define print_exit_status(status) fist_dprint(4, "%s OUT: %s %s:%d, STATUS: %d\n", del_indent(), __FUNCTION__, __FILE__, __LINE__, status)
-+#define print_exit_pointer(status) \
-+do { \
-+  if (IS_ERR(status)) \
-+    fist_dprint(4, "%s OUT: %s %s:%d, RESULT: %ld\n", del_indent(), __FUNCTION__, __FILE__, __LINE__, PTR_ERR(status)); \
-+  else \
-+    fist_dprint(4, "%s OUT: %s %s:%d, RESULT: 0x%x\n", del_indent(), __FUNCTION__, __FILE__, __LINE__, PTR_ERR(status)); \
-+} while (0)
-+#endif/* mini_fo doesn't need these */
-+
-+#endif /* __KERNEL__ */
-+
-+
-+/*
-+ * DEFINITIONS FOR USER AND KERNEL CODE:
-+ * (Note: ioctl numbers 1--9 are reserved for fistgen, the rest
-+ *  are auto-generated automatically based on the user's .fist file.)
-+ */
-+# define FIST_IOCTL_GET_DEBUG_VALUE	_IOR(0x15, 1, int)
-+# define FIST_IOCTL_SET_DEBUG_VALUE	_IOW(0x15, 2, int)
-+
-+#endif /* not __FIST_H_ */
---- /dev/null
-+++ b/fs/mini_fo/inode.c
-@@ -0,0 +1,1564 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd)
-+#else
-+mini_fo_create(inode_t *dir, dentry_t *dentry, int mode)
-+#endif
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	err = create_sto_reg_file(dentry, mode, nd);
-+#else
-+	err = create_sto_reg_file(dentry, mode);
-+#endif
-+	check_mini_fo_dentry(dentry);
-+	return err;
-+}
-+
-+
-+STATIC dentry_t *
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_lookup(inode_t *dir, dentry_t *dentry, struct nameidata* nd)
-+#else
-+mini_fo_lookup(inode_t *dir, dentry_t *dentry)
-+#endif
-+{
-+	int err = 0;
-+	dentry_t *hidden_dir_dentry;
-+	dentry_t *hidden_dentry = NULL;
-+
-+	dentry_t *hidden_sto_dir_dentry;
-+	dentry_t *hidden_sto_dentry = NULL;
-+
-+	/* whiteout flag */
-+	int del_flag = 0;
-+	char *bpath = NULL;
-+
-+	const char *name;
-+	unsigned int namelen;
-+
-+	/* Don't allow lookups of META-files */
-+	namelen = strlen(META_FILENAME);
-+	if(namelen == dentry->d_name.len) {
-+		if(!strncmp(dentry->d_name.name, META_FILENAME, namelen)) {
-+			err = -ENOENT;
-+			goto out;
-+		}
-+	}
-+
-+	hidden_dir_dentry = dtohd(dentry->d_parent);
-+	hidden_sto_dir_dentry = dtohd2(dentry->d_parent);
-+
-+	name = dentry->d_name.name;
-+	namelen = dentry->d_name.len;
-+
-+	/* must initialize dentry operations */
-+	dentry->d_op = &mini_fo_dops;
-+
-+	/* setup the del_flag */
-+	del_flag = __meta_check_d_entry(dir, name, namelen);
-+	bpath = __meta_check_r_entry(dir, name, namelen);
-+
-+	/* perform the lookups of base and storage files:
-+	 *
-+	 * This caused some serious trouble, as a lookup_one_len passing
-+	 * a negative dentry oopses. Solution is to only do the lookup
-+	 * if the dentry is positive, else we set it to NULL
-+	 * More trouble, who said a *_dir_dentry can't be NULL?
-+	 */
-+	if(bpath) {
-+		/* Cross-Interposing (C), yeah! */
-+		hidden_dentry = bpath_walk(dir->i_sb, bpath);
-+		if(!hidden_dentry || !hidden_dentry->d_inode) {
-+			printk(KERN_CRIT "mini_fo_lookup: bpath_walk failed.\n");
-+			err= -EINVAL;
-+			goto out;
-+		}
-+
-+		/* this can be set up safely without fear of spaghetti
-+		 * interposing as it is only used for copying times */
-+		hidden_dir_dentry = hidden_dentry->d_parent;
-+		kfree(bpath);
-+	}
-+	else if(hidden_dir_dentry && hidden_dir_dentry->d_inode)
-+		hidden_dentry =
-+			lookup_one_len(name, hidden_dir_dentry, namelen);
-+	else
-+		hidden_dentry = NULL;
-+
-+	if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode)
-+		hidden_sto_dentry =
-+			lookup_one_len(name, hidden_sto_dir_dentry, namelen);
-+	else
-+		hidden_sto_dentry =  NULL;
-+
-+	/* catch error in lookup */
-+	if (IS_ERR(hidden_dentry) || IS_ERR(hidden_sto_dentry)) {
-+		/* mk: we need to call dput on the dentry, whose
-+		 * lookup_one_len operation failed, in order to avoid
-+		 * unmount trouble.
-+		 */
-+		if(IS_ERR(hidden_dentry)) {
-+			printk(KERN_CRIT "mini_fo_lookup: ERR from base dentry, lookup failed.\n");
-+			err = PTR_ERR(hidden_dentry);
-+		} else {
-+			dput(hidden_dentry);
-+		}
-+		if(IS_ERR(hidden_sto_dentry)) {
-+			printk(KERN_CRIT "mini_fo_lookup: ERR from storage dentry, lookup failed.\n");
-+			err = PTR_ERR(hidden_sto_dentry);
-+		} else {
-+			dput(hidden_sto_dentry);
-+		}
-+		goto out;
-+	}
-+
-+	/* allocate dentry private data */
-+	__dtopd(dentry) = (struct mini_fo_dentry_info *)
-+		kmalloc(sizeof(struct mini_fo_dentry_info), GFP_KERNEL);
-+
-+	if (!dtopd(dentry)) {
-+		err = -ENOMEM;
-+		goto out_dput;
-+	}
-+
-+	/* check for different states of the mini_fo file to be looked up. */
-+
-+	/* state 1, file has been modified */
-+	if(hidden_dentry && hidden_sto_dentry &&
-+	   hidden_dentry->d_inode && hidden_sto_dentry->d_inode && !del_flag) {
-+
-+		/* update parent directory's atime */
-+		fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+
-+		dtopd(dentry)->state = MODIFIED;
-+		dtohd(dentry) = hidden_dentry;
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		err = mini_fo_tri_interpose(hidden_dentry,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state1).\n");
-+			goto out_free;
-+		}
-+		goto out;
-+	}
-+	/* state 2, file is unmodified */
-+	if(hidden_dentry && hidden_dentry->d_inode && !del_flag) {
-+
-+		fist_copy_attr_atime(dir, hidden_dir_dentry->d_inode);
-+
-+		dtopd(dentry)->state = UNMODIFIED;
-+		dtohd(dentry) = hidden_dentry;
-+		dtohd2(dentry) = hidden_sto_dentry; /* could be negative */
-+
-+		err = mini_fo_tri_interpose(hidden_dentry,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state2).\n");
-+			goto out_free;
-+		}
-+		goto out;
-+	}
-+	/* state 3, file has been newly created */
-+	if(hidden_sto_dentry && hidden_sto_dentry->d_inode && !del_flag) {
-+
-+		fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+		dtopd(dentry)->state = CREATED;
-+		dtohd(dentry) = hidden_dentry; /* could be negative */
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		err = mini_fo_tri_interpose(hidden_dentry,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state3).\n");
-+			goto out_free;
-+		}
-+		goto out;
-+	}
-+
-+	/* state 4, file has deleted and created again. */
-+	if(hidden_dentry && hidden_sto_dentry &&
-+	   hidden_dentry->d_inode &&
-+	   hidden_sto_dentry->d_inode && del_flag) {
-+
-+		fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+		dtopd(dentry)->state = DEL_REWRITTEN;
-+		dtohd(dentry) = NULL;
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		err = mini_fo_tri_interpose(NULL,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state4).\n");
-+			goto out_free;
-+		}
-+		/* We will never need this dentry again, as the file has been
-+		 * deleted from base */
-+		dput(hidden_dentry);
-+		goto out;
-+	}
-+	/* state 5, file has been deleted in base */
-+	if(hidden_dentry && hidden_sto_dentry &&
-+	   hidden_dentry->d_inode &&
-+	   !hidden_sto_dentry->d_inode && del_flag) {
-+
-+		/* check which parents atime we need for updating */
-+		if(hidden_sto_dir_dentry->d_inode)
-+			fist_copy_attr_atime(dir,
-+					     hidden_sto_dir_dentry->d_inode);
-+		else
-+			fist_copy_attr_atime(dir,
-+					     hidden_dir_dentry->d_inode);
-+
-+		dtopd(dentry)->state = DELETED;
-+		dtohd(dentry) = NULL;
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		/* add negative dentry to dcache to speed up lookups */
-+		d_add(dentry, NULL);
-+		dput(hidden_dentry);
-+		goto out;
-+	}
-+	/* state 6, file does not exist */
-+	if(((hidden_dentry && !hidden_dentry->d_inode) ||
-+	    (hidden_sto_dentry && !hidden_sto_dentry->d_inode)) && !del_flag)
-+		{
-+			/* check which parents atime we need for updating */
-+			if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode)
-+				fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+			else
-+				fist_copy_attr_atime(dir, hidden_dir_dentry->d_inode);
-+
-+			dtopd(dentry)->state = NON_EXISTANT;
-+			dtohd(dentry) = hidden_dentry;
-+			dtohd2(dentry) = hidden_sto_dentry;
-+			d_add(dentry, NULL);
-+			goto out;
-+		}
-+
-+	/* if we get to here, were in an invalid state. bad. */
-+	printk(KERN_CRIT "mini_fo_lookup: ERROR, meta data corruption detected.\n");
-+
-+	/* end state checking */
-+ out_free:
-+	d_drop(dentry);		/* so that our bad dentry will get destroyed */
-+	kfree(dtopd(dentry));
-+	__dtopd(dentry) = NULL;	/* be safe */
-+
-+ out_dput:
-+	if(hidden_dentry)
-+		dput(hidden_dentry);
-+	if(hidden_sto_dentry)
-+		dput(hidden_sto_dentry); /* drops usage count and marks for release */
-+
-+ out:
-+	/* initalize wol if file exists and is directory */
-+	if(dentry->d_inode) {
-+		if(S_ISDIR(dentry->d_inode->i_mode)) {
-+			itopd(dentry->d_inode)->deleted_list_size = -1;
-+			itopd(dentry->d_inode)->renamed_list_size = -1;
-+			meta_build_lists(dentry);
-+		}
-+	}
-+	return ERR_PTR(err);
-+}
-+
-+
-+STATIC int
-+mini_fo_link(dentry_t *old_dentry, inode_t *dir, dentry_t *new_dentry)
-+{
-+	int err;
-+	dentry_t *hidden_old_dentry;
-+	dentry_t *hidden_new_dentry;
-+	dentry_t *hidden_dir_dentry;
-+
-+
-+	check_mini_fo_dentry(old_dentry);
-+	check_mini_fo_dentry(new_dentry);
-+	check_mini_fo_inode(dir);
-+
-+	/* no links to directorys and existing targets target allowed */
-+	if(S_ISDIR(old_dentry->d_inode->i_mode) ||
-+	   is_mini_fo_existant(new_dentry)) {
-+		err = -EPERM;
-+		goto out;
-+	}
-+
-+	/* bring it directly from unmod to del_rew */
-+	if(dtost(old_dentry) == UNMODIFIED) {
-+		err = nondir_unmod_to_mod(old_dentry, 1);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+		err = meta_add_d_entry(old_dentry->d_parent,
-+				       old_dentry->d_name.name,
-+				       old_dentry->d_name.len);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+		dput(dtohd(old_dentry));
-+		dtohd(old_dentry) = NULL;
-+		dtost(old_dentry) = DEL_REWRITTEN;
-+	}
-+
-+	err = get_neg_sto_dentry(new_dentry);
-+	if(err) {
-+		err = -EINVAL;
-+		goto out;
-+	}
-+
-+	hidden_old_dentry = dtohd2(old_dentry);
-+	hidden_new_dentry = dtohd2(new_dentry);
-+
-+	dget(hidden_old_dentry);
-+	dget(hidden_new_dentry);
-+
-+	/* was: hidden_dir_dentry = lock_parent(hidden_new_dentry); */
-+	hidden_dir_dentry = dget(hidden_new_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = vfs_link(hidden_old_dentry,
-+		       hidden_dir_dentry->d_inode,
-+		       hidden_new_dentry);
-+	if (err || !hidden_new_dentry->d_inode)
-+		goto out_lock;
-+
-+	dtost(new_dentry) = CREATED;
-+ 	err = mini_fo_tri_interpose(NULL, hidden_new_dentry, new_dentry, dir->i_sb, 0);
-+	if (err)
-+		goto out_lock;
-+
-+	fist_copy_attr_timesizes(dir, hidden_new_dentry->d_inode);
-+	/* propagate number of hard-links */
-+	old_dentry->d_inode->i_nlink = itohi2(old_dentry->d_inode)->i_nlink;
-+
-+ out_lock:
-+	/* was: unlock_dir(hidden_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_dir_dentry);
-+
-+	dput(hidden_new_dentry);
-+	dput(hidden_old_dentry);
-+	if (!new_dentry->d_inode)
-+		d_drop(new_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_unlink(inode_t *dir, dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	dget(dentry);
-+	if(dtopd(dentry)->state == MODIFIED) {
-+		err = nondir_mod_to_del(dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == UNMODIFIED) {
-+		err = nondir_unmod_to_del(dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == CREATED) {
-+		err = nondir_creat_to_del(dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == DEL_REWRITTEN) {
-+		err = nondir_del_rew_to_del(dentry);
-+		goto out;
-+	}
-+
-+	printk(KERN_CRIT "mini_fo_unlink: ERROR, invalid state detected.\n");
-+
-+ out:
-+	fist_copy_attr_times(dir, itohi2(dentry->d_parent->d_inode));
-+
-+	if(!err) {
-+		/* is this causing my pain? d_delete(dentry); */
-+		d_drop(dentry);
-+	}
-+
-+	dput(dentry);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_symlink(inode_t *dir, dentry_t *dentry, const char *symname)
-+{
-+	int err=0;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        umode_t mode;
-+#endif
-+
-+	/* Fail if the symlink file exists */
-+	if(!(dtost(dentry) == DELETED ||
-+	     dtost(dentry) == NON_EXISTANT)) {
-+		err = -EEXIST;
-+		goto out;
-+	}
-+
-+	err = get_neg_sto_dentry(dentry);
-+	if(err) {
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	dget(hidden_sto_dentry);
-+	/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	mode = S_IALLUGO;
-+	err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
-+			  hidden_sto_dentry, symname, mode);
-+#else
-+	err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
-+			  hidden_sto_dentry,
-+			  symname);
-+#endif
-+	if (err || !hidden_sto_dentry->d_inode)
-+                goto out_lock;
-+
-+        if(dtost(dentry) == DELETED) {
-+                dtost(dentry) = DEL_REWRITTEN;
-+                err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        } else if(dtost(dentry) == NON_EXISTANT) {
-+                dtost(dentry) = CREATED;
-+                err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        }
-+	fist_copy_attr_timesizes(dir, hidden_sto_dir_dentry->d_inode);
-+
-+ out_lock:
-+        /* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+
-+        dput(hidden_sto_dentry);
-+        if (!dentry->d_inode)
-+                d_drop(dentry);
-+ out:
-+        return err;
-+}
-+
-+STATIC int
-+mini_fo_mkdir(inode_t *dir, dentry_t *dentry, int mode)
-+{
-+	int err;
-+
-+	err = create_sto_dir(dentry, mode);
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_rmdir(inode_t *dir, dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+	dentry_t *meta_dentry;
-+	inode_t *hidden_sto_dir = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+	check_mini_fo_inode(dir);
-+
-+	dget(dentry);
-+	if(dtopd(dentry)->state == MODIFIED) {
-+		/* XXX: disabled, because it does not bother to check files on
-+		 * the original filesystem - just a hack, but better than simply
-+		 * removing it without testing */
-+		err = -EINVAL;
-+		goto out;
-+
-+		hidden_sto_dir = itohi2(dir);
-+		hidden_sto_dentry = dtohd2(dentry);
-+
-+		/* was:hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+		hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		/* Delete an old WOL file contained in the storage dir */
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     hidden_sto_dentry,
-+					     strlen(META_FILENAME));
-+		if(meta_dentry->d_inode) {
-+			err = vfs_unlink(hidden_sto_dentry->d_inode, meta_dentry);
-+			dput(meta_dentry);
-+			if(!err)
-+				d_delete(meta_dentry);
-+		}
-+
-+		err = vfs_rmdir(hidden_sto_dir, hidden_sto_dentry);
-+		dput(hidden_sto_dentry);
-+		if(!err)
-+			d_delete(hidden_sto_dentry);
-+
-+		/* propagate number of hard-links */
-+		dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+
-+		dput(dtohd(dentry));
-+
-+		dtohd(dentry) = NULL;
-+		dtopd(dentry)->state = DELETED;
-+
-+		/* carefull with R files */
-+		if( __meta_is_r_entry(dir,
-+				      dentry->d_name.name,
-+				      dentry->d_name.len) == 1) {
-+			err = meta_remove_r_entry(dentry->d_parent,
-+						  dentry->d_name.name,
-+						  dentry->d_name.len);
-+			if(err) {
-+				printk(KERN_CRIT "mini_fo: rmdir: meta_remove_r_entry failed.\n");
-+				goto out;
-+			}
-+		}
-+		else {
-+			/* ok, add deleted file to META */
-+			meta_add_d_entry(dentry->d_parent,
-+					 dentry->d_name.name,
-+					 dentry->d_name.len);
-+		}
-+		/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+		dput(hidden_sto_dir_dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == UNMODIFIED) {
-+		/* XXX: simply adding it to the delete list here is fscking dangerous!
-+		 * as a temporary hack, i will disable rmdir on unmodified directories
-+		 * for now.
-+		 */
-+		err = -EINVAL;
-+		goto out;
-+
-+		err = get_neg_sto_dentry(dentry);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+
-+		/* dput base dentry, this will relase the inode and free the
-+		 * dentry, as we will never need it again. */
-+		dput(dtohd(dentry));
-+		dtohd(dentry) = NULL;
-+		dtopd(dentry)->state = DELETED;
-+
-+		/* add deleted file to META-file */
-+		meta_add_d_entry(dentry->d_parent,
-+				 dentry->d_name.name,
-+				 dentry->d_name.len);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == CREATED) {
-+		hidden_sto_dir = itohi2(dir);
-+		hidden_sto_dentry = dtohd2(dentry);
-+
-+		/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
-+		hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		/* Delete an old WOL file contained in the storage dir */
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     hidden_sto_dentry,
-+					     strlen(META_FILENAME));
-+		if(meta_dentry->d_inode) {
-+			/* is this necessary? dget(meta_dentry); */
-+			err = vfs_unlink(hidden_sto_dentry->d_inode,
-+					 meta_dentry);
-+			dput(meta_dentry);
-+			if(!err)
-+				d_delete(meta_dentry);
-+		}
-+
-+		err = vfs_rmdir(hidden_sto_dir, hidden_sto_dentry);
-+		dput(hidden_sto_dentry);
-+		if(!err)
-+			d_delete(hidden_sto_dentry);
-+
-+		/* propagate number of hard-links */
-+		dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+		dtopd(dentry)->state = NON_EXISTANT;
-+
-+		/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+		dput(hidden_sto_dir_dentry);
-+
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == DEL_REWRITTEN) {
-+		hidden_sto_dir = itohi2(dir);
-+		hidden_sto_dentry = dtohd2(dentry);
-+
-+		/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
-+		hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		/* Delete an old WOL file contained in the storage dir */
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     hidden_sto_dentry,
-+					     strlen(META_FILENAME));
-+		if(meta_dentry->d_inode) {
-+			/* is this necessary? dget(meta_dentry); */
-+			err = vfs_unlink(hidden_sto_dentry->d_inode,
-+					 meta_dentry);
-+			dput(meta_dentry);
-+			if(!err)
-+				d_delete(meta_dentry);
-+		}
-+
-+		err = vfs_rmdir(hidden_sto_dir, hidden_sto_dentry);
-+		dput(hidden_sto_dentry);
-+		if(!err)
-+			d_delete(hidden_sto_dentry);
-+
-+		/* propagate number of hard-links */
-+		dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+		dtopd(dentry)->state = DELETED;
-+		/* was: unlock_dir(hidden_sto_dir_dentry); */
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+		dput(hidden_sto_dir_dentry);
-+		goto out;
-+	}
-+
-+	printk(KERN_CRIT "mini_fo_rmdir: ERROR, invalid state detected.\n");
-+
-+ out:
-+	if(!err) {
-+		d_drop(dentry);
-+	}
-+
-+	fist_copy_attr_times(dir, itohi2(dentry->d_parent->d_inode));
-+	dput(dentry);
-+
-+	return err;
-+}
-+
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_mknod(inode_t *dir, dentry_t *dentry, int mode, dev_t dev)
-+#else
-+mini_fo_mknod(inode_t *dir, dentry_t *dentry, int mode, int dev)
-+#endif
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	err = create_sto_nod(dentry, mode, dev);
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo_mknod: creating sto nod failed.\n");
-+		err = -EINVAL;
-+	}
-+
-+	check_mini_fo_dentry(dentry);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_rename(inode_t *old_dir, dentry_t *old_dentry,
-+	       inode_t *new_dir, dentry_t *new_dentry)
-+{
-+	/* dispatch */
-+	if(S_ISDIR(old_dentry->d_inode->i_mode))
-+		return rename_directory(old_dir, old_dentry, new_dir, new_dentry);
-+	return rename_nondir(old_dir, old_dentry, new_dir, new_dentry);
-+
-+}
-+
-+int rename_directory(inode_t *old_dir, dentry_t *old_dentry,
-+		     inode_t *new_dir, dentry_t *new_dentry)
-+{
-+	int err, bpath_len;
-+	char *bpath;
-+
-+	dentry_t *hidden_old_dentry;
-+	dentry_t *hidden_new_dentry;
-+	dentry_t *hidden_old_dir_dentry;
-+	dentry_t *hidden_new_dir_dentry;
-+
-+	err = 0;
-+	bpath = NULL;
-+	bpath_len = 0;
-+
-+	/* this is a test, chuck out if it works */
-+	if(!(dtopd(new_dentry)->state == DELETED ||
-+	     dtopd(new_dentry)->state == NON_EXISTANT)) {
-+		printk(KERN_CRIT "mini_fo: rename_directory: \
-+                                  uh, ah, new_dentry not negative.\n");
-+		/* return -1; */
-+	}
-+
-+	/* state = UNMODIFIED */
-+	if(dtopd(old_dentry)->state == UNMODIFIED) {
-+		err = dir_unmod_to_mod(old_dentry);
-+		if (err)
-+			goto out;
-+	}
-+
-+	/* state = MODIFIED */
-+	if(dtopd(old_dentry)->state == MODIFIED) {
-+		bpath = meta_check_r_entry(old_dentry->d_parent,
-+					   old_dentry->d_name.name,
-+					   old_dentry->d_name.len);
-+		if(bpath) {
-+			err = meta_remove_r_entry(old_dentry->d_parent,
-+						  old_dentry->d_name.name,
-+						  old_dentry->d_name.len);
-+			if(err) {
-+				printk(KERN_CRIT "mini_fo: rename_directory:\
-+                                                   meta_remove_r_entry \
-+                                                  failed.\n");
-+				goto out;
-+			}
-+			err = meta_add_r_entry(new_dentry->d_parent,
-+					       bpath,
-+					       strlen(bpath),
-+					       new_dentry->d_name.name,
-+					       new_dentry->d_name.len);
-+			kfree(bpath);
-+		}
-+		else {/* wol it */
-+			err = meta_add_d_entry(old_dentry->d_parent,
-+					       old_dentry->d_name.name,
-+					       old_dentry->d_name.len);
-+			if (err)
-+				goto out;
-+			/* put it on rename list */
-+			err = get_mini_fo_bpath(old_dentry,
-+						&bpath,
-+						&bpath_len);
-+			if (err)
-+				goto out;
-+			err = meta_add_r_entry(new_dentry->d_parent,
-+					       bpath, bpath_len,
-+					       new_dentry->d_name.name,
-+					       new_dentry->d_name.len);
-+			if (err)
-+				goto out;
-+		}
-+		/* no state change, MODIFIED stays MODIFIED */
-+	}
-+	/* state = CREATED */
-+	if(dtopd(old_dentry)->state == CREATED ||
-+	   dtopd(old_dentry)->state == DEL_REWRITTEN) {
-+		if(dtohd(old_dentry))
-+			dput(dtohd(old_dentry));
-+
-+		if(dtopd(new_dentry)->state == DELETED) {
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+			dtohd(old_dentry) = NULL;
-+		}
-+		else if(dtopd(new_dentry)->state == NON_EXISTANT) {
-+			dtopd(old_dentry)->state = CREATED;
-+			/* steal new dentry's neg. base dentry */
-+			dtohd(old_dentry) = dtohd(new_dentry);
-+			dtohd(new_dentry) = NULL;
-+		}
-+	}
-+	if(dtopd(new_dentry)->state == UNMODIFIED ||
-+	   dtopd(new_dentry)->state == NON_EXISTANT) {
-+		err = get_neg_sto_dentry(new_dentry);
-+		if(err)
-+			goto out;
-+	}
-+
-+	/* now move sto file */
-+	hidden_old_dentry = dtohd2(old_dentry);
-+	hidden_new_dentry = dtohd2(new_dentry);
-+
-+	dget(hidden_old_dentry);
-+	dget(hidden_new_dentry);
-+
-+	hidden_old_dir_dentry = dget(hidden_old_dentry->d_parent);
-+	hidden_new_dir_dentry = dget(hidden_new_dentry->d_parent);
-+	double_lock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+
-+	err = vfs_rename(hidden_old_dir_dentry->d_inode, hidden_old_dentry,
-+			 hidden_new_dir_dentry->d_inode, hidden_new_dentry);
-+	if(err)
-+		goto out_lock;
-+
-+	fist_copy_attr_all(new_dir, hidden_new_dir_dentry->d_inode);
-+	if (new_dir != old_dir)
-+		fist_copy_attr_all(old_dir,
-+				   hidden_old_dir_dentry->d_inode);
-+
-+ out_lock:
-+	/* double_unlock will dput the new/old parent dentries
-+	 * whose refcnts were incremented via get_parent above. */
-+	double_unlock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+	dput(hidden_new_dentry);
-+	dput(hidden_old_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+int rename_nondir(inode_t *old_dir, dentry_t *old_dentry,
-+		  inode_t *new_dir, dentry_t *new_dentry)
-+{
-+	int err=0;
-+
-+	check_mini_fo_dentry(old_dentry);
-+	check_mini_fo_dentry(new_dentry);
-+	check_mini_fo_inode(old_dir);
-+	check_mini_fo_inode(new_dir);
-+
-+	/* state: UNMODIFIED */
-+	if(dtost(old_dentry) == UNMODIFIED) {
-+		err = nondir_unmod_to_mod(old_dentry, 1);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+	}
-+
-+	/* the easy states */
-+	if(exists_in_storage(old_dentry)) {
-+
-+		dentry_t *hidden_old_dentry;
-+		dentry_t *hidden_new_dentry;
-+		dentry_t *hidden_old_dir_dentry;
-+		dentry_t *hidden_new_dir_dentry;
-+
-+		/* if old file is MODIFIED, add it to the deleted_list */
-+		if(dtopd(old_dentry)->state == MODIFIED) {
-+			meta_add_d_entry(old_dentry->d_parent,
-+					 old_dentry->d_name.name,
-+					 old_dentry->d_name.len);
-+
-+			dput(dtohd(old_dentry));
-+		}
-+		/* if old file is CREATED, we only release the base dentry */
-+		if(dtopd(old_dentry)->state == CREATED) {
-+			if(dtohd(old_dentry))
-+				dput(dtohd(old_dentry));
-+		}
-+
-+		/* now setup the new states (depends on new_dentry state) */
-+		/* new dentry state =  MODIFIED */
-+		if(dtopd(new_dentry)->state == MODIFIED) {
-+			meta_add_d_entry(new_dentry->d_parent,
-+					 new_dentry->d_name.name,
-+					 new_dentry->d_name.len);
-+
-+			/* new dentry will be d_put'ed later by the vfs
-+			 * so don't do it here
-+			 * dput(dtohd(new_dentry));
-+			 */
-+			dtohd(old_dentry) = NULL;
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+		}
-+		/* new dentry state =  UNMODIFIED */
-+		else if(dtopd(new_dentry)->state == UNMODIFIED) {
-+			if(get_neg_sto_dentry(new_dentry))
-+				return -EINVAL;
-+
-+			meta_add_d_entry(new_dentry->d_parent,
-+					 new_dentry->d_name.name,
-+					 new_dentry->d_name.len);
-+
-+			/* is this right??? */
-+			/*dput(dtohd(new_dentry));*/
-+			dtohd(old_dentry) = NULL;
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+		}
-+		/* new dentry state =  CREATED */
-+		else if(dtopd(new_dentry)->state == CREATED) {
-+			/* we keep the neg. base dentry (if exists) */
-+			dtohd(old_dentry) = dtohd(new_dentry);
-+			/* ...and set it to Null, or we'll get
-+			 * dcache.c:345 if it gets dput twice... */
-+			dtohd(new_dentry) = NULL;
-+			dtopd(old_dentry)->state = CREATED;
-+		}
-+		/* new dentry state =  NON_EXISTANT */
-+		else if(dtopd(new_dentry)->state == NON_EXISTANT) {
-+			if(get_neg_sto_dentry(new_dentry))
-+				return -EINVAL;
-+
-+			/* we keep the neg. base dentry (if exists) */
-+			dtohd(old_dentry) = dtohd(new_dentry);
-+			/* ...and set it to Null, or we'll get
-+			 * Dr. dcache.c:345 if it gets dput twice... */
-+			dtohd(new_dentry) = NULL;
-+			dtopd(old_dentry)->state = CREATED;
-+		}
-+		/* new dentry state =  DEL_REWRITTEN or DELETED */
-+		else if(dtopd(new_dentry)->state == DEL_REWRITTEN ||
-+			dtopd(new_dentry)->state == DELETED) {
-+			dtohd(old_dentry) = NULL;
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+		}
-+		else { /* not possible, uhh, ahh */
-+			printk(KERN_CRIT
-+			       "mini_fo: rename_reg_file: invalid state detected [1].\n");
-+			return -1;
-+		}
-+
-+		/* now we definitely have a sto file */
-+		hidden_old_dentry = dtohd2(old_dentry);
-+		hidden_new_dentry = dtohd2(new_dentry);
-+
-+		dget(hidden_old_dentry);
-+		dget(hidden_new_dentry);
-+
-+		hidden_old_dir_dentry = dget(hidden_old_dentry->d_parent);
-+		hidden_new_dir_dentry = dget(hidden_new_dentry->d_parent);
-+		double_lock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+
-+		err = vfs_rename(hidden_old_dir_dentry->d_inode,
-+				 hidden_old_dentry,
-+				 hidden_new_dir_dentry->d_inode,
-+				 hidden_new_dentry);
-+		if(err)
-+			goto out_lock;
-+
-+		fist_copy_attr_all(new_dir, hidden_new_dir_dentry->d_inode);
-+		if (new_dir != old_dir)
-+			fist_copy_attr_all(old_dir, hidden_old_dir_dentry->d_inode);
-+
-+	out_lock:
-+		/* double_unlock will dput the new/old parent dentries
-+		 * whose refcnts were incremented via get_parent above.
-+		 */
-+		double_unlock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+		dput(hidden_new_dentry);
-+		dput(hidden_old_dentry);
-+	out:
-+		return err;
-+	}
-+	else { /* invalid state */
-+		printk(KERN_CRIT "mini_fo: rename_reg_file: ERROR: invalid state detected [2].\n");
-+		return -1;
-+	}
-+}
-+
-+
-+STATIC int
-+mini_fo_readlink(dentry_t *dentry, char *buf, int bufsiz)
-+{
-+	int err=0;
-+	dentry_t *hidden_dentry = NULL;
-+
-+	if(dtohd2(dentry) && dtohd2(dentry)->d_inode) {
-+		hidden_dentry = dtohd2(dentry);
-+	} else if(dtohd(dentry) && dtohd(dentry)->d_inode) {
-+		hidden_dentry = dtohd(dentry);
-+	} else {
-+		goto out;
-+	}
-+
-+	if (!hidden_dentry->d_inode->i_op ||
-+	    !hidden_dentry->d_inode->i_op->readlink) {
-+		err = -EINVAL;		goto out;
-+	}
-+
-+	err = hidden_dentry->d_inode->i_op->readlink(hidden_dentry,
-+						     buf,
-+						     bufsiz);
-+	if (err > 0)
-+		fist_copy_attr_atime(dentry->d_inode, hidden_dentry->d_inode);
-+
-+ out:
-+	return err;
-+}
-+
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-+static int mini_fo_follow_link(dentry_t *dentry, struct nameidata *nd)
-+#else
-+static void* mini_fo_follow_link(dentry_t *dentry, struct nameidata *nd)
-+#endif
-+{
-+	char *buf;
-+	int len = PAGE_SIZE, err;
-+	mm_segment_t old_fs;
-+
-+	/* in 2.6 this is freed by mini_fo_put_link called by __do_follow_link */
-+	buf = kmalloc(len, GFP_KERNEL);
-+	if (!buf) {
-+		err = -ENOMEM;
-+		goto out;
-+	}
-+
-+	/* read the symlink, and then we will follow it */
-+	old_fs = get_fs();
-+	set_fs(KERNEL_DS);
-+	err = dentry->d_inode->i_op->readlink(dentry, buf, len);
-+	set_fs(old_fs);
-+	if (err < 0) {
-+		kfree(buf);
-+		buf = NULL;
-+		goto out;
-+	}
-+	buf[err] = 0;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        nd_set_link(nd, buf);
-+        err = 0;
-+#else
-+	err = vfs_follow_link(nd, buf);
-+#endif
-+
-+ out:
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	kfree(buf);
-+#endif
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-+        return err;
-+#else
-+        return ERR_PTR(err);
-+#endif
-+}
-+
-+STATIC
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-+void mini_fo_put_link(struct dentry *dentry, struct nameidata *nd)
-+#else
-+void mini_fo_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
-+#endif
-+{
-+        char *link;
-+        link = nd_get_link(nd);
-+        kfree(link);
-+}
-+#endif
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_permission(inode_t *inode, int mask, struct nameidata *nd)
-+#else
-+mini_fo_permission(inode_t *inode, int mask)
-+#endif
-+{
-+	inode_t *hidden_inode;
-+	int mode;
-+	int err;
-+
-+	if(itohi2(inode)) {
-+		hidden_inode = itohi2(inode);
-+	} else {
-+		hidden_inode = itohi(inode);
-+	}
-+	mode = inode->i_mode;
-+
-+	/* not really needed, as permission handles everything:
-+	 *	err = vfs_permission(inode, mask);
-+	 *	if (err)
-+	 *		goto out;
-+	 */
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	err = permission(hidden_inode, mask, nd);
-+#else
-+	err = permission(hidden_inode, mask);
-+#endif
-+
-+	/*  out: */
-+	return err;
-+}
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+STATIC int
-+mini_fo_inode_revalidate(dentry_t *dentry)
-+{
-+	int err = 0;
-+	dentry_t *hidden_dentry;
-+	inode_t *hidden_inode;
-+
-+	ASSERT(dentry->d_inode);
-+	ASSERT(itopd(dentry->d_inode));
-+
-+	if(itohi2(dentry->d_inode)) {
-+                hidden_dentry = dtohd2(dentry);
-+		hidden_inode = hidden_dentry->d_inode;
-+	} else if(itohi(dentry->d_inode)) {
-+                hidden_dentry = dtohd(dentry);
-+		hidden_inode = hidden_dentry->d_inode;
-+	} else {
-+                printk(KERN_CRIT "mini_fo_inode_revalidate: ERROR, invalid state detected.\n");
-+                err = -ENOENT;
-+                goto out;
-+        }
-+	if (hidden_inode && hidden_inode->i_op && hidden_inode->i_op->revalidate){
-+		err = hidden_inode->i_op->revalidate(hidden_dentry);
-+		if (err)
-+			goto out;
-+	}
-+	fist_copy_attr_all(dentry->d_inode, hidden_inode);
-+ out:
-+	return err;
-+}
-+#endif
-+
-+STATIC int
-+mini_fo_setattr(dentry_t *dentry, struct iattr *ia)
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(!is_mini_fo_existant(dentry)) {
-+		printk(KERN_CRIT "mini_fo_setattr: ERROR, invalid state detected [1].\n");
-+		goto out;
-+	}
-+
-+	if(dtost(dentry) == UNMODIFIED) {
-+		if(!IS_COPY_FLAG(ia->ia_valid))
-+			goto out; /* we ignore these changes to base */
-+
-+		if(S_ISDIR(dentry->d_inode->i_mode)) {
-+			err = dir_unmod_to_mod(dentry);
-+		} else {
-+			/* we copy contents if file is not beeing truncated */
-+			if(S_ISREG(dentry->d_inode->i_mode) &&
-+			   !(ia->ia_size == 0 && (ia->ia_valid & ATTR_SIZE))) {
-+				err = nondir_unmod_to_mod(dentry, 1);
-+			} else
-+				err = nondir_unmod_to_mod(dentry, 0);
-+		}
-+		if(err) {
-+			err = -EINVAL;
-+			printk(KERN_CRIT "mini_fo_setattr: ERROR changing states.\n");
-+			goto out;
-+		}
-+	}
-+	if(!exists_in_storage(dentry)) {
-+		printk(KERN_CRIT "mini_fo_setattr: ERROR, invalid state detected [2].\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	ASSERT(dentry->d_inode);
-+	ASSERT(dtohd2(dentry));
-+	ASSERT(itopd(dentry->d_inode));
-+	ASSERT(itohi2(dentry->d_inode));
-+
-+	err = notify_change(dtohd2(dentry), ia);
-+	fist_copy_attr_all(dentry->d_inode, itohi2(dentry->d_inode));
-+ out:
-+	return err;
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+STATIC int
-+mini_fo_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
-+{
-+	int err = 0;
-+        dentry_t *hidden_dentry;
-+
-+	ASSERT(dentry->d_inode);
-+	ASSERT(itopd(dentry->d_inode));
-+
-+	if(itohi2(dentry->d_inode)) {
-+                hidden_dentry = dtohd2(dentry);
-+	} else if(itohi(dentry->d_inode)) {
-+                hidden_dentry = dtohd(dentry);
-+	} else {
-+                printk(KERN_CRIT "mini_fo_getattr: ERROR, invalid state detected.\n");
-+                err = -ENOENT;
-+                goto out;
-+        }
-+	fist_copy_attr_all(dentry->d_inode, hidden_dentry->d_inode);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	generic_fillattr(dentry->d_inode, stat);
-+	if (!stat->blksize) {
-+		struct super_block *s = hidden_dentry->d_inode->i_sb;
-+		unsigned blocks;
-+		blocks = (stat->size+s->s_blocksize-1) >> s->s_blocksize_bits;
-+		stat->blocks = (s->s_blocksize / 512) * blocks;
-+		stat->blksize = s->s_blocksize;
-+	}
-+ out:
-+        return err;
-+}
-+#endif
-+
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+#if 0 /* no xattr_alloc() and xattr_free() */
-+/* This is lifted from fs/xattr.c */
-+static void *
-+xattr_alloc(size_t size, size_t limit)
-+{
-+	void *ptr;
-+
-+	if (size > limit)
-+		return ERR_PTR(-E2BIG);
-+
-+	if (!size)	/* size request, no buffer is needed */
-+		return NULL;
-+	else if (size <= PAGE_SIZE)
-+		ptr = kmalloc((unsigned long) size, GFP_KERNEL);
-+	else
-+		ptr = vmalloc((unsigned long) size);
-+	if (!ptr)
-+		return ERR_PTR(-ENOMEM);
-+	return ptr;
-+}
-+
-+static void
-+xattr_free(void *ptr, size_t size)
-+{
-+	if (!size)	/* size request, no buffer was needed */
-+		return;
-+	else if (size <= PAGE_SIZE)
-+		kfree(ptr);
-+	else
-+		vfree(ptr);
-+}
-+#endif /* no xattr_alloc() and xattr_free() */
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+mini_fo_getxattr(struct dentry *dentry, const char *name, void *value, size_t size) {
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+	/* Define these anyway so we don't need as much ifdef'ed code. */
-+	char *encoded_name = NULL;
-+	char *encoded_value = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->getxattr) {
-+		encoded_name = (char *)name;
-+		encoded_value = (char *)value;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->getxattr(hidden_dentry, encoded_name, encoded_value, size);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,21) \
-+     && LINUX_VERSION_CODE <= KERNEL_VERSION(2,4,23)) \
-+     || LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
-+mini_fo_setxattr(struct dentry *dentry, const char *name,
-+		 const void *value, size_t size, int flags)
-+#else
-+mini_fo_setxattr(struct dentry *dentry, const char *name,
-+		 void *value, size_t size, int flags)
-+#endif
-+
-+{
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+
-+	/* Define these anyway, so we don't have as much ifdef'ed code. */
-+	char *encoded_value = NULL;
-+	char *encoded_name = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->setxattr) {
-+		encoded_name = (char *)name;
-+		encoded_value = (char *)value;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->setxattr(hidden_dentry, encoded_name, encoded_value, size, flags);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+mini_fo_removexattr(struct dentry *dentry, const char *name) {
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+	char *encoded_name;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->removexattr) {
-+		encoded_name = (char *)name;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->removexattr(hidden_dentry, encoded_name);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+mini_fo_listxattr(struct dentry *dentry, char *list, size_t size) {
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+	char *encoded_list = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->listxattr) {
-+		encoded_list = list;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->listxattr(hidden_dentry, encoded_list, size);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+# endif /* defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)) */
-+
-+struct inode_operations mini_fo_symlink_iops =
-+	{
-+		readlink:	mini_fo_readlink,
-+		follow_link: mini_fo_follow_link,
-+		/* mk: permission:	mini_fo_permission, */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		revalidate:	mini_fo_inode_revalidate,
-+#endif
-+		setattr:	mini_fo_setattr,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		getattr:	mini_fo_getattr,
-+		put_link:       mini_fo_put_link,
-+#endif
-+
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+		setxattr:	mini_fo_setxattr,
-+		getxattr:	mini_fo_getxattr,
-+		listxattr:	mini_fo_listxattr,
-+		removexattr: mini_fo_removexattr
-+# endif /* defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)) */
-+	};
-+
-+struct inode_operations mini_fo_dir_iops =
-+	{
-+		create:	mini_fo_create,
-+		lookup:	mini_fo_lookup,
-+		link:	mini_fo_link,
-+		unlink:	mini_fo_unlink,
-+		symlink:	mini_fo_symlink,
-+		mkdir:	mini_fo_mkdir,
-+		rmdir:	mini_fo_rmdir,
-+		mknod:	mini_fo_mknod,
-+		rename:	mini_fo_rename,
-+		/* no readlink/follow_link for non-symlinks */
-+		// off because we have setattr
-+		//    truncate:	mini_fo_truncate,
-+		/* mk:permission:	mini_fo_permission, */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		revalidate:	mini_fo_inode_revalidate,
-+#endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		getattr:	mini_fo_getattr,
-+#endif
-+		setattr:	mini_fo_setattr,
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+		setxattr:	mini_fo_setxattr,
-+		getxattr:	mini_fo_getxattr,
-+		listxattr:	mini_fo_listxattr,
-+		removexattr: mini_fo_removexattr
-+# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */
-+	};
-+
-+struct inode_operations mini_fo_main_iops =
-+	{
-+		/* permission:	mini_fo_permission, */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		revalidate:	mini_fo_inode_revalidate,
-+#endif
-+		setattr:	mini_fo_setattr,
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		getattr:	mini_fo_getattr,
-+#endif
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+		setxattr:	mini_fo_setxattr,
-+		getxattr:	mini_fo_getxattr,
-+		listxattr:	mini_fo_listxattr,
-+		removexattr:    mini_fo_removexattr
-+# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */
-+	};
---- /dev/null
-+++ b/fs/mini_fo/main.c
-@@ -0,0 +1,423 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+#include <linux/module.h>
-+
-+/* This definition must only appear after we include <linux/module.h> */
-+#ifndef MODULE_LICENSE
-+# define MODULE_LICENSE(bison)
-+#endif /* not MODULE_LICENSE */
-+
-+/*
-+ * This is the mini_fo tri interpose function, which extends the
-+ * functionality of the regular interpose by interposing a higher
-+ * level inode on top of two lower level ones: the base filesystem
-+ * inode and the storage filesystem inode.
-+ *
-+ *  sb we pass is mini_fo's super_block
-+ */
-+int
-+mini_fo_tri_interpose(dentry_t *hidden_dentry,
-+		      dentry_t *hidden_sto_dentry,
-+		      dentry_t *dentry, super_block_t *sb, int flag)
-+{
-+	inode_t *hidden_inode = NULL;
-+	inode_t *hidden_sto_inode = NULL; /* store corresponding storage inode */
-+	int err = 0;
-+	inode_t *inode;
-+
-+	/* Pointer to hidden_sto_inode if exists, else to hidden_inode.
-+	 * This is used to copy the attributes of the correct inode. */
-+	inode_t *master_inode;
-+
-+	if(hidden_dentry)
-+		hidden_inode = hidden_dentry->d_inode;
-+	if(hidden_sto_dentry)
-+		hidden_sto_inode = hidden_sto_dentry->d_inode;
-+
-+	ASSERT(dentry->d_inode == NULL);
-+
-+	/* mk: One of the inodes associated with the dentrys is likely to
-+	 * be NULL, so carefull:
-+	 */
-+	ASSERT((hidden_inode != NULL) || (hidden_sto_inode != NULL));
-+
-+	if(hidden_sto_inode)
-+		master_inode = hidden_sto_inode;
-+	else
-+		master_inode = hidden_inode;
-+
-+	/*
-+	 * We allocate our new inode below, by calling iget.
-+	 * iget will call our read_inode which will initialize some
-+	 * of the new inode's fields
-+	 */
-+
-+	/*
-+	 * original: inode = iget(sb, hidden_inode->i_ino);
-+	 */
-+	inode = iget(sb, iunique(sb, 25));
-+	if (!inode) {
-+		err = -EACCES;		/* should be impossible??? */
-+		goto out;
-+	}
-+
-+	/*
-+	 * interpose the inode if not already interposed
-+	 *   this is possible if the inode is being reused
-+	 * XXX: what happens if we get_empty_inode() but there's another already?
-+	 * for now, ASSERT() that this can't happen; fix later.
-+	 */
-+	if (itohi(inode) != NULL) {
-+		printk(KERN_CRIT "mini_fo_tri_interpose: itohi(inode) != NULL.\n");
-+	}
-+	if (itohi2(inode) != NULL) {
-+		printk(KERN_CRIT "mini_fo_tri_interpose: itohi2(inode) != NULL.\n");
-+	}
-+
-+	/* mk: Carefull, igrab can't handle NULL inodes (ok, why should it?), so
-+	 * we need to check here:
-+	 */
-+	if(hidden_inode)
-+		itohi(inode) = igrab(hidden_inode);
-+	else
-+		itohi(inode) = NULL;
-+
-+	if(hidden_sto_inode)
-+		itohi2(inode) = igrab(hidden_sto_inode);
-+	else
-+		itohi2(inode) = NULL;
-+
-+
-+	/* Use different set of inode ops for symlinks & directories*/
-+	if (S_ISLNK(master_inode->i_mode))
-+		inode->i_op = &mini_fo_symlink_iops;
-+	else if (S_ISDIR(master_inode->i_mode))
-+		inode->i_op = &mini_fo_dir_iops;
-+
-+	/* Use different set of file ops for directories */
-+	if (S_ISDIR(master_inode->i_mode))
-+		inode->i_fop = &mini_fo_dir_fops;
-+
-+	/* properly initialize special inodes */
-+	if (S_ISBLK(master_inode->i_mode) || S_ISCHR(master_inode->i_mode) ||
-+	    S_ISFIFO(master_inode->i_mode) || S_ISSOCK(master_inode->i_mode)) {
-+		init_special_inode(inode, master_inode->i_mode, master_inode->i_rdev);
-+	}
-+
-+	/* Fix our inode's address operations to that of the lower inode */
-+	if (inode->i_mapping->a_ops != master_inode->i_mapping->a_ops) {
-+		inode->i_mapping->a_ops = master_inode->i_mapping->a_ops;
-+	}
-+
-+	/* only (our) lookup wants to do a d_add */
-+	if (flag)
-+		d_add(dentry, inode);
-+	else
-+		d_instantiate(dentry, inode);
-+
-+	ASSERT(dtopd(dentry) != NULL);
-+
-+	/* all well, copy inode attributes */
-+	fist_copy_attr_all(inode, master_inode);
-+
-+ out:
-+	return err;
-+}
-+
-+/* parse mount options "base=" and "sto=" */
-+dentry_t *
-+mini_fo_parse_options(super_block_t *sb, char *options)
-+{
-+	dentry_t *hidden_root = ERR_PTR(-EINVAL);
-+	dentry_t *hidden_root2 = ERR_PTR(-EINVAL);
-+	struct nameidata nd, nd2;
-+	char *name, *tmp, *end;
-+	int err = 0;
-+
-+	/* We don't want to go off the end of our arguments later on. */
-+	for (end = options; *end; end++);
-+
-+	while (options < end) {
-+		tmp = options;
-+		while (*tmp && *tmp != ',')
-+			tmp++;
-+		*tmp = '\0';
-+		if (!strncmp("base=", options, 5)) {
-+			name = options + 5;
-+			printk(KERN_INFO "mini_fo: using base directory: %s\n", name);
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+			if (path_init(name, LOOKUP_FOLLOW, &nd))
-+				err = path_walk(name, &nd);
-+#else
-+			err = path_lookup(name, LOOKUP_FOLLOW, &nd);
-+#endif
-+			if (err) {
-+				printk(KERN_CRIT "mini_fo: error accessing hidden directory '%s'\n", name);
-+				hidden_root = ERR_PTR(err);
-+				goto out;
-+			}
-+			hidden_root = nd.dentry;
-+			stopd(sb)->base_dir_dentry = nd.dentry;
-+			stopd(sb)->hidden_mnt = nd.mnt;
-+
-+		} else if(!strncmp("sto=", options, 4)) {
-+			/* parse the storage dir */
-+			name = options + 4;
-+			printk(KERN_INFO "mini_fo: using storage directory: %s\n", name);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+			if(path_init(name, LOOKUP_FOLLOW, &nd2))
-+				err = path_walk(name, &nd2);
-+#else
-+                        err = path_lookup(name, LOOKUP_FOLLOW, &nd2);
-+#endif
-+			if(err) {
-+				printk(KERN_CRIT "mini_fo: error accessing hidden storage directory '%s'\n", name);
-+
-+				hidden_root2 = ERR_PTR(err);
-+				goto out;
-+			}
-+			hidden_root2 = nd2.dentry;
-+			stopd(sb)->storage_dir_dentry = nd2.dentry;
-+			stopd(sb)->hidden_mnt2 = nd2.mnt;
-+			stohs2(sb) = hidden_root2->d_sb;
-+
-+			/* validate storage dir, this is done in
-+			 * mini_fo_read_super for the base directory.
-+			 */
-+			if (IS_ERR(hidden_root2)) {
-+				printk(KERN_WARNING "mini_fo_parse_options: storage dentry lookup failed (err = %ld)\n", PTR_ERR(hidden_root2));
-+				goto out;
-+			}
-+			if (!hidden_root2->d_inode) {
-+				printk(KERN_WARNING "mini_fo_parse_options: no storage dir to interpose on.\n");
-+				goto out;
-+			}
-+			stohs2(sb) = hidden_root2->d_sb;
-+		} else {
-+			printk(KERN_WARNING "mini_fo: unrecognized option '%s'\n", options);
-+			hidden_root = ERR_PTR(-EINVAL);
-+			goto out;
-+		}
-+		options = tmp + 1;
-+	}
-+
-+ out:
-+	if(IS_ERR(hidden_root2))
-+		return hidden_root2;
-+	return hidden_root;
-+}
-+
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+static int
-+#else
-+super_block_t *
-+#endif
-+mini_fo_read_super(super_block_t *sb, void *raw_data, int silent)
-+{
-+	dentry_t *hidden_root;
-+	int err = 0;
-+
-+	if (!raw_data) {
-+		printk(KERN_WARNING "mini_fo_read_super: missing argument\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	/*
-+	 * Allocate superblock private data
-+	 */
-+	__stopd(sb) = kmalloc(sizeof(struct mini_fo_sb_info), GFP_KERNEL);
-+	if (!stopd(sb)) {
-+		printk(KERN_WARNING "%s: out of memory\n", __FUNCTION__);
-+		err = -ENOMEM;
-+		goto out;
-+	}
-+	stohs(sb) = NULL;
-+
-+	hidden_root = mini_fo_parse_options(sb, raw_data);
-+	if (IS_ERR(hidden_root)) {
-+		printk(KERN_WARNING "mini_fo_read_super: lookup_dentry failed (err = %ld)\n", PTR_ERR(hidden_root));
-+		err = PTR_ERR(hidden_root);
-+		goto out_free;
-+	}
-+	if (!hidden_root->d_inode) {
-+		printk(KERN_WARNING "mini_fo_read_super: no directory to interpose on\n");
-+		goto out_free;
-+	}
-+	stohs(sb) = hidden_root->d_sb;
-+
-+	/*
-+	 * Linux 2.4.2-ac3 and beyond has code in
-+	 * mm/filemap.c:generic_file_write() that requires sb->s_maxbytes
-+	 * to be populated.  If not set, all write()s under that sb will
-+	 * return 0.
-+	 *
-+	 * Linux 2.4.4+ automatically sets s_maxbytes to MAX_NON_LFS;
-+	 * the filesystem should override it only if it supports LFS.
-+	 */
-+	/* non-SCA code is good to go with LFS */
-+	sb->s_maxbytes = hidden_root->d_sb->s_maxbytes;
-+
-+	sb->s_op = &mini_fo_sops;
-+	/*
-+	 * we can't use d_alloc_root if we want to use
-+	 * our own interpose function unchanged,
-+	 * so we simply replicate *most* of the code in d_alloc_root here
-+	 */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	sb->s_root = d_alloc(NULL, &(const struct qstr) { "/", 1, 0 });
-+#else
-+	sb->s_root = d_alloc(NULL, &(const struct qstr){hash: 0, name: "/", len : 1});
-+#endif
-+	if (IS_ERR(sb->s_root)) {
-+		printk(KERN_WARNING "mini_fo_read_super: d_alloc failed\n");
-+		err = -ENOMEM;
-+		goto out_dput;
-+	}
-+
-+	sb->s_root->d_op = &mini_fo_dops;
-+	sb->s_root->d_sb = sb;
-+	sb->s_root->d_parent = sb->s_root;
-+
-+	/* link the upper and lower dentries */
-+	__dtopd(sb->s_root) = (struct mini_fo_dentry_info *)
-+		kmalloc(sizeof(struct mini_fo_dentry_info), GFP_KERNEL);
-+	if (!dtopd(sb->s_root)) {
-+		err = -ENOMEM;
-+		goto out_dput2;
-+	}
-+	dtopd(sb->s_root)->state = MODIFIED;
-+	dtohd(sb->s_root) = hidden_root;
-+
-+	/* fanout relevant, interpose on storage root dentry too */
-+	dtohd2(sb->s_root) = stopd(sb)->storage_dir_dentry;
-+
-+	/* ...and call tri-interpose to interpose root dir inodes
-+	 * if (mini_fo_interpose(hidden_root, sb->s_root, sb, 0))
-+	 */
-+	if(mini_fo_tri_interpose(hidden_root, dtohd2(sb->s_root), sb->s_root, sb, 0))
-+		goto out_dput2;
-+
-+	/* initalize the wol list */
-+	itopd(sb->s_root->d_inode)->deleted_list_size = -1;
-+	itopd(sb->s_root->d_inode)->renamed_list_size = -1;
-+	meta_build_lists(sb->s_root);
-+
-+	goto out;
-+
-+ out_dput2:
-+	dput(sb->s_root);
-+ out_dput:
-+	dput(hidden_root);
-+	dput(dtohd2(sb->s_root)); /* release the hidden_sto_dentry too */
-+ out_free:
-+	kfree(stopd(sb));
-+	__stopd(sb) = NULL;
-+ out:
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        return err;
-+#else
-+        if (err) {
-+		return ERR_PTR(err);
-+        } else {
-+		return sb;
-+        }
-+#endif
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+static int mini_fo_get_sb(struct file_system_type *fs_type,
-+					  int flags, const char *dev_name,
-+					  void *raw_data, struct vfsmount *mnt)
-+{
-+	return get_sb_nodev(fs_type, flags, raw_data, mini_fo_read_super, mnt);
-+}
-+#else
-+static struct super_block *mini_fo_get_sb(struct file_system_type *fs_type,
-+					  int flags, const char *dev_name,
-+					  void *raw_data)
-+{
-+	return get_sb_nodev(fs_type, flags, raw_data, mini_fo_read_super);
-+}
-+#endif
-+
-+void mini_fo_kill_block_super(struct super_block *sb)
-+{
-+	generic_shutdown_super(sb);
-+	/*
-+	 *      XXX: BUG: Halcrow: Things get unstable sometime after this point:
-+	 *      lib/rwsem-spinlock.c:127: spin_is_locked on uninitialized
-+	 *      fs/fs-writeback.c:402: spin_lock(fs/super.c:a0381828) already
-+	 *      locked by fs/fs-writeback.c/402
-+	 *
-+	 *      Apparently, someone's not releasing a lock on sb_lock...
-+	 */
-+}
-+
-+static struct file_system_type mini_fo_fs_type = {
-+	.owner          = THIS_MODULE,
-+	.name           = "mini_fo",
-+	.get_sb         = mini_fo_get_sb,
-+	.kill_sb        = mini_fo_kill_block_super,
-+	.fs_flags       = 0,
-+};
-+
-+
-+#else
-+static DECLARE_FSTYPE(mini_fo_fs_type, "mini_fo", mini_fo_read_super, 0);
-+#endif
-+
-+static int __init init_mini_fo_fs(void)
-+{
-+	printk("Registering mini_fo version $Id$\n");
-+	return register_filesystem(&mini_fo_fs_type);
-+}
-+static void __exit exit_mini_fo_fs(void)
-+{
-+	printk("Unregistering mini_fo version $Id$\n");
-+	unregister_filesystem(&mini_fo_fs_type);
-+}
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+EXPORT_NO_SYMBOLS;
-+#endif
-+
-+MODULE_AUTHOR("Erez Zadok <ezk@cs.sunysb.edu>");
-+MODULE_DESCRIPTION("FiST-generated mini_fo filesystem");
-+MODULE_LICENSE("GPL");
-+
-+/* MODULE_PARM(fist_debug_var, "i"); */
-+/* MODULE_PARM_DESC(fist_debug_var, "Debug level"); */
-+
-+module_init(init_mini_fo_fs)
-+module_exit(exit_mini_fo_fs)
---- /dev/null
-+++ b/fs/mini_fo/Makefile
-@@ -0,0 +1,17 @@
-+#
-+# Makefile for mini_fo 2.4 and 2.6 Linux kernels
-+#
-+# Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+#
-+# 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.
-+#
-+
-+obj-$(CONFIG_MINI_FO) := mini_fo.o
-+mini_fo-objs   := meta.o dentry.o file.o inode.o main.o super.o state.o aux.o
-+
-+# dependencies
-+${mini_fo-objs}: mini_fo.h fist.h
-+
---- /dev/null
-+++ b/fs/mini_fo/meta.c
-@@ -0,0 +1,1000 @@
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+int meta_build_lists(dentry_t *dentry)
-+{
-+	struct mini_fo_inode_info *inode_info;
-+
-+	dentry_t *meta_dentry = 0;
-+	file_t *meta_file = 0;
-+	mm_segment_t old_fs;
-+	void *buf;
-+
-+	int bytes, len;
-+	struct vfsmount *meta_mnt;
-+	char *entry;
-+
-+	inode_info = itopd(dentry->d_inode);
-+	if(!(inode_info->deleted_list_size == -1 &&
-+	     inode_info->renamed_list_size == -1)) {
-+		printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                  Error, list(s) not virgin.\n");
-+		return -1;
-+	}
-+
-+	/* init our meta lists */
-+	INIT_LIST_HEAD(&inode_info->deleted_list);
-+	inode_info->deleted_list_size = 0;
-+
-+	INIT_LIST_HEAD(&inode_info->renamed_list);
-+	inode_info->renamed_list_size = 0;
-+
-+  	/* might there be a META-file? */
-+	if(dtohd2(dentry) && dtohd2(dentry)->d_inode) {
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     dtohd2(dentry),
-+					     strlen(META_FILENAME));
-+		if(!meta_dentry->d_inode) {
-+			dput(meta_dentry);
-+			goto out_ok;
-+		}
-+		/* $%& err, is this correct? */
-+		meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+		mntget(meta_mnt);
-+
-+
-+		/* open META-file for reading */
-+		meta_file = dentry_open(meta_dentry, meta_mnt, 0x0);
-+		if(!meta_file || IS_ERR(meta_file)) {
-+			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                          ERROR opening META file.\n");
-+			goto out_err;
-+		}
-+
-+		/* check if fs supports reading */
-+		if(!meta_file->f_op->read) {
-+			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                          ERROR, fs does not support reading.\n");
-+			goto out_err_close;
-+		}
-+
-+		/* allocate a page for transfering the data */
-+		buf = (void *) __get_free_page(GFP_KERNEL);
-+		if(!buf) {
-+			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                          ERROR, out of mem.\n");
-+			goto out_err_close;
-+		}
-+		meta_file->f_pos = 0;
-+		old_fs = get_fs();
-+		set_fs(KERNEL_DS);
-+		do {
-+			char *c;
-+			bytes = meta_file->f_op->read(meta_file, buf, PAGE_SIZE, &meta_file->f_pos);
-+			if(bytes == PAGE_SIZE) {
-+				/* trim a cut off filename and adjust f_pos to get it next time */
-+				for(c = (char*) buf+PAGE_SIZE;
-+				    *c != '\n';
-+				    c--, bytes--, meta_file->f_pos--);
-+			}
-+			entry = (char *) buf;
-+			while(entry < (char *) buf+bytes) {
-+
-+				char *old_path;
-+				char *dir_name;
-+				int old_len, new_len;
-+
-+				/* len without '\n'*/
-+				len = (int) (strchr(entry, '\n') - entry);
-+				switch (*entry) {
-+				case 'D':
-+					/* format: "D filename" */
-+					meta_list_add_d_entry(dentry,
-+							      entry+2,
-+							      len-2);
-+					break;
-+				case 'R':
-+					/* format: "R path/xy/dir newDir" */
-+					old_path = entry+2;
-+					dir_name = strchr(old_path, ' ') + 1;
-+					old_len =  dir_name - old_path - 1;
-+					new_len = ((int) entry) + len - ((int ) dir_name);
-+					meta_list_add_r_entry(dentry,
-+							      old_path,
-+							      old_len,
-+							      dir_name,
-+							      new_len);
-+					break;
-+				default:
-+					/* unknown entry type detected */
-+					break;
-+				}
-+				entry += len+1;
-+			}
-+
-+		} while(meta_file->f_pos < meta_dentry->d_inode->i_size);
-+
-+		free_page((unsigned long) buf);
-+		set_fs(old_fs);
-+		fput(meta_file);
-+	}
-+	goto out_ok;
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out_err:
-+	mntput(meta_mnt);
-+	dput(meta_dentry);
-+	return -1;
-+ out_ok:
-+	return 1; /* check this!!! inode_info->wol_size; */
-+}
-+
-+/* cleanups up all lists and free's the mem by dentry */
-+int meta_put_lists(dentry_t *dentry)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk("mini_fo: meta_put_lists: invalid dentry passed.\n");
-+		return -1;
-+	}
-+	return __meta_put_lists(dentry->d_inode);
-+}
-+
-+/* cleanups up all lists and free's the mem by inode */
-+int __meta_put_lists(inode_t *inode)
-+{
-+	int err = 0;
-+	if(!inode || !itopd(inode)) {
-+		printk("mini_fo: __meta_put_lists: invalid inode passed.\n");
-+		return -1;
-+	}
-+	err = __meta_put_d_list(inode);
-+	err |= __meta_put_r_list(inode);
-+	return err;
-+}
-+
-+int meta_sync_lists(dentry_t *dentry)
-+{
-+	int err = 0;
-+	if(!dentry || !dentry->d_inode) {
-+		printk("mini_fo: meta_sync_lists: \
-+                        invalid dentry passed.\n");
-+		return -1;
-+	}
-+	err = meta_sync_d_list(dentry, 0);
-+	err |= meta_sync_r_list(dentry, 1);
-+	return err;
-+}
-+
-+
-+/* remove all D entries from the renamed list and free the mem */
-+int __meta_put_d_list(inode_t *inode)
-+{
-+	struct list_head *tmp;
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: __meta_put_d_list: \
-+                                  invalid inode passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(inode);
-+
-+        /* nuke the DELETED-list */
-+        if(inode_info->deleted_list_size <= 0)
-+		return 0;
-+
-+	while(!list_empty(&inode_info->deleted_list)) {
-+		tmp = inode_info->deleted_list.next;
-+		list_del(tmp);
-+		del_entry = list_entry(tmp, struct deleted_entry, list);
-+		kfree(del_entry->name);
-+		kfree(del_entry);
-+	}
-+	inode_info->deleted_list_size = 0;
-+
-+	return 0;
-+}
-+
-+/* remove all R entries from the renamed list and free the mem */
-+int __meta_put_r_list(inode_t *inode)
-+{
-+	struct list_head *tmp;
-+	struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: meta_put_r_list: invalid inode.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(inode);
-+
-+        /* nuke the RENAMED-list */
-+        if(inode_info->renamed_list_size <= 0)
-+		return 0;
-+
-+	while(!list_empty(&inode_info->renamed_list)) {
-+		tmp = inode_info->renamed_list.next;
-+		list_del(tmp);
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		kfree(ren_entry->new_name);
-+		kfree(ren_entry->old_name);
-+		kfree(ren_entry);
-+	}
-+	inode_info->renamed_list_size = 0;
-+
-+	return 0;
-+}
-+
-+int meta_add_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	int err = 0;
-+	err = meta_list_add_d_entry(dentry, name, len);
-+	err |= meta_write_d_entry(dentry,name,len);
-+	return err;
-+}
-+
-+/* add a D entry to the deleted list */
-+int meta_list_add_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_list_add_d_entry: \
-+                                  invalid dentry passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->deleted_list_size < 0)
-+                return -1;
-+
-+        del_entry = (struct deleted_entry *)
-+		kmalloc(sizeof(struct deleted_entry), GFP_KERNEL);
-+        del_entry->name = (char*) kmalloc(len, GFP_KERNEL);
-+        if(!del_entry || !del_entry->name) {
-+                printk(KERN_CRIT "mini_fo: meta_list_add_d_entry: \
-+                                  out of mem.\n");
-+		kfree(del_entry->name);
-+		kfree(del_entry);
-+                return -ENOMEM;
-+        }
-+
-+        strncpy(del_entry->name, name, len);
-+        del_entry->len = len;
-+
-+        list_add(&del_entry->list, &inode_info->deleted_list);
-+        inode_info->deleted_list_size++;
-+        return 0;
-+}
-+
-+int meta_add_r_entry(dentry_t *dentry,
-+			  const char *old_name, int old_len,
-+			  const char *new_name, int new_len)
-+{
-+	int err = 0;
-+	err = meta_list_add_r_entry(dentry,
-+				    old_name, old_len,
-+				    new_name, new_len);
-+	err |= meta_write_r_entry(dentry,
-+				  old_name, old_len,
-+				  new_name, new_len);
-+	return err;
-+}
-+
-+/* add a R entry to the renamed list */
-+int meta_list_add_r_entry(dentry_t *dentry,
-+			  const char *old_name, int old_len,
-+			  const char *new_name, int new_len)
-+{
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_list_add_r_entry: \
-+                                  invalid dentry passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->renamed_list_size < 0)
-+                return -1;
-+
-+        ren_entry = (struct renamed_entry *)
-+		kmalloc(sizeof(struct renamed_entry), GFP_KERNEL);
-+        ren_entry->old_name = (char*) kmalloc(old_len, GFP_KERNEL);
-+        ren_entry->new_name = (char*) kmalloc(new_len, GFP_KERNEL);
-+
-+        if(!ren_entry || !ren_entry->old_name || !ren_entry->new_name) {
-+                printk(KERN_CRIT "mini_fo: meta_list_add_r_entry: \
-+                                  out of mem.\n");
-+		kfree(ren_entry->new_name);
-+		kfree(ren_entry->old_name);
-+		kfree(ren_entry);
-+                return -ENOMEM;
-+        }
-+
-+        strncpy(ren_entry->old_name, old_name, old_len);
-+        ren_entry->old_len = old_len;
-+        strncpy(ren_entry->new_name, new_name, new_len);
-+        ren_entry->new_len = new_len;
-+
-+        list_add(&ren_entry->list, &inode_info->renamed_list);
-+        inode_info->renamed_list_size++;
-+        return 0;
-+}
-+
-+
-+int meta_remove_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	int err = 0;
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT
-+		       "mini_fo: meta_remove_r_entry: \
-+                        invalid dentry passed.\n");
-+		return -1;
-+	}
-+
-+	err = meta_list_remove_r_entry(dentry, name, len);
-+	err |= meta_sync_lists(dentry);
-+	return err;
-+}
-+
-+int meta_list_remove_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT
-+		       "mini_fo: meta_list_remove_r_entry: \
-+                        invalid dentry passed.\n");
-+		return -1;
-+	}
-+	return __meta_list_remove_r_entry(dentry->d_inode, name, len);
-+}
-+
-+int __meta_list_remove_r_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode))
-+		printk(KERN_CRIT
-+		       "mini_fo: __meta_list_remove_r_entry: \
-+                        invalid inode passed.\n");
-+	inode_info = itopd(inode);
-+
-+        if(inode_info->renamed_list_size < 0)
-+                return -1;
-+        if(inode_info->renamed_list_size == 0)
-+                return 1;
-+
-+	list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		if(ren_entry->new_len != len)
-+			continue;
-+
-+		if(!strncmp(ren_entry->new_name, name, len)) {
-+			list_del(tmp);
-+			kfree(ren_entry->new_name);
-+			kfree(ren_entry->old_name);
-+			kfree(ren_entry);
-+			inode_info->renamed_list_size--;
-+			return 0;
-+		}
-+	}
-+	return 1;
-+}
-+
-+
-+/* append a single D entry to the meta file */
-+int meta_write_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	dentry_t *meta_dentry = 0;
-+        file_t *meta_file = 0;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err;
-+        struct vfsmount *meta_mnt = 0;
-+        char *buf;
-+
-+	err = 0;
-+
-+	if(itopd(dentry->d_inode)->deleted_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	if(dtopd(dentry)->state == UNMODIFIED) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry), strlen (META_FILENAME));
-+
-+	/* We need to create a META-file */
-+        if(!meta_dentry->d_inode) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry,
-+			   S_IRUSR | S_IWUSR,
-+			   NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry,
-+			   S_IRUSR | S_IWUSR);
-+#endif
-+	}
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  ERROR opening meta file.\n");
-+                mntput(meta_mnt); /* $%& is this necessary? */
-+                dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* size: len for name, 1 for \n and 2 for "D " */
-+	buf = (char *) kmalloc(len+3, GFP_KERNEL);
-+	if (!buf) {
-+		printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  out of mem.\n");
-+		return -ENOMEM;
-+	}
-+
-+	buf[0] = 'D';
-+	buf[1] = ' ';
-+	strncpy(buf+2, name, len);
-+	buf[len+2] = '\n';
-+	bytes = meta_file->f_op->write(meta_file, buf, len+3,
-+				       &meta_file->f_pos);
-+	if(bytes != len+3) {
-+		printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  ERROR writing.\n");
-+		err = -1;
-+	}
-+	kfree(buf);
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+}
-+
-+/* append a single R entry to the meta file */
-+int meta_write_r_entry(dentry_t *dentry,
-+		       const char *old_name, int old_len,
-+		       const char *new_name, int new_len)
-+{
-+	dentry_t *meta_dentry = 0;
-+        file_t *meta_file = 0;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err, buf_len;
-+	struct vfsmount *meta_mnt = 0;
-+        char *buf;
-+
-+
-+	err = 0;
-+
-+	if(itopd(dentry->d_inode)->renamed_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* build the storage structure? */
-+	if(dtopd(dentry)->state == UNMODIFIED) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry),
-+				     strlen (META_FILENAME));
-+        if(!meta_dentry->d_inode) {
-+                /* We need to create a META-file */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR, NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR);
-+#endif
-+	}
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-+                                  ERROR opening meta file.\n");
-+                mntput(meta_mnt);
-+                dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* size: 2 for "R ", old_len+new_len for names, 1 blank+1 \n */
-+	buf_len = old_len + new_len + 4;
-+	buf = (char *) kmalloc(buf_len, GFP_KERNEL);
-+	if (!buf) {
-+		printk(KERN_CRIT "mini_fo: meta_write_r_entry: out of mem.\n");
-+		return -ENOMEM;
-+	}
-+
-+	buf[0] = 'R';
-+	buf[1] = ' ';
-+	strncpy(buf + 2, old_name, old_len);
-+	buf[old_len + 2] = ' ';
-+	strncpy(buf + old_len + 3, new_name, new_len);
-+	buf[buf_len -1] = '\n';
-+	bytes = meta_file->f_op->write(meta_file, buf, buf_len, &meta_file->f_pos);
-+	if(bytes != buf_len) {
-+		printk(KERN_CRIT "mini_fo: meta_write_r_entry: ERROR writing.\n");
-+		err = -1;
-+	}
-+
-+	kfree(buf);
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+}
-+
-+/* sync D list to disk, append data if app_flag is 1 */
-+/* check the meta_mnt, which seems not to be used (properly)  */
-+
-+int meta_sync_d_list(dentry_t *dentry, int app_flag)
-+{
-+	dentry_t *meta_dentry;
-+        file_t *meta_file;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err;
-+        struct vfsmount *meta_mnt;
-+        char *buf;
-+
-+	struct list_head *tmp;
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	err = 0;
-+	meta_file=0;
-+	meta_mnt=0;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                  invalid inode passed.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->deleted_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* ok, there is something to sync */
-+
-+	/* build the storage structure? */
-+        if(!dtohd2(dentry) && !itohi2(dentry->d_inode)) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry),
-+				     strlen(META_FILENAME));
-+        if(!meta_dentry->d_inode) {
-+                /* We need to create a META-file */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR, NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR);
-+#endif
-+		app_flag = 0;
-+	}
-+	/* need we truncate the meta file? */
-+	if(!app_flag) {
-+		struct iattr newattrs;
-+                newattrs.ia_size = 0;
-+                newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                down(&meta_dentry->d_inode->i_sem);
-+#endif
-+                err = notify_change(meta_dentry, &newattrs);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                up(&meta_dentry->d_inode->i_sem);
-+#endif
-+
-+                if(err || meta_dentry->d_inode->i_size != 0) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          ERROR truncating meta file.\n");
-+                        goto out_err_close;
-+		}
-+	}
-+
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                  ERROR opening meta file.\n");
-+		/* we don't mntget so we dont't mntput (for now)
-+		 * mntput(meta_mnt);
-+		 */
-+		dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* here we go... */
-+        list_for_each(tmp, &inode_info->deleted_list) {
-+		del_entry = list_entry(tmp, struct deleted_entry, list);
-+
-+		/* size: len for name, 1 for \n and 2 for "D " */
-+		buf = (char *) kmalloc(del_entry->len+3, GFP_KERNEL);
-+		if (!buf) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          out of mem.\n");
-+			return -ENOMEM;
-+		}
-+
-+		buf[0] = 'D';
-+		buf[1] = ' ';
-+		strncpy(buf+2, del_entry->name, del_entry->len);
-+		buf[del_entry->len+2] = '\n';
-+		bytes = meta_file->f_op->write(meta_file, buf,
-+					       del_entry->len+3,
-+					       &meta_file->f_pos);
-+		if(bytes != del_entry->len+3) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          ERROR writing.\n");
-+			err |= -1;
-+		}
-+		kfree(buf);
-+	}
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+
-+}
-+
-+int meta_sync_r_list(dentry_t *dentry, int app_flag)
-+{
-+	dentry_t *meta_dentry;
-+        file_t *meta_file;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err, buf_len;
-+        struct vfsmount *meta_mnt;
-+        char *buf;
-+
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	err = 0;
-+	meta_file=0;
-+	meta_mnt=0;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                  invalid dentry passed.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->deleted_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* ok, there is something to sync */
-+
-+	/* build the storage structure? */
-+        if(!dtohd2(dentry) && !itohi2(dentry->d_inode)) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry),
-+				     strlen(META_FILENAME));
-+        if(!meta_dentry->d_inode) {
-+                /* We need to create a META-file */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR, NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR);
-+#endif
-+		app_flag = 0;
-+	}
-+	/* need we truncate the meta file? */
-+	if(!app_flag) {
-+		struct iattr newattrs;
-+                newattrs.ia_size = 0;
-+                newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                down(&meta_dentry->d_inode->i_sem);
-+#endif
-+                err = notify_change(meta_dentry, &newattrs);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                up(&meta_dentry->d_inode->i_sem);
-+#endif
-+                if(err || meta_dentry->d_inode->i_size != 0) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          ERROR truncating meta file.\n");
-+                        goto out_err_close;
-+		}
-+	}
-+
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                  ERROR opening meta file.\n");
-+		/* we don't mntget so we dont't mntput (for now)
-+		 * mntput(meta_mnt);
-+		 */
-+		dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* here we go... */
-+        list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		/* size:
-+		 * 2 for "R ", old_len+new_len for names, 1 blank+1 \n */
-+		buf_len = ren_entry->old_len + ren_entry->new_len + 4;
-+		buf = (char *) kmalloc(buf_len, GFP_KERNEL);
-+		if (!buf) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          out of mem.\n");
-+			return -ENOMEM;
-+		}
-+		buf[0] = 'R';
-+		buf[1] = ' ';
-+		strncpy(buf + 2, ren_entry->old_name, ren_entry->old_len);
-+		buf[ren_entry->old_len + 2] = ' ';
-+		strncpy(buf + ren_entry->old_len + 3,
-+			ren_entry->new_name, ren_entry->new_len);
-+		buf[buf_len - 1] = '\n';
-+		bytes = meta_file->f_op->write(meta_file, buf,
-+					       buf_len, &meta_file->f_pos);
-+		if(bytes != buf_len) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          ERROR writing.\n");
-+			err |= -1;
-+		}
-+		kfree(buf);
-+	}
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+}
-+
-+int meta_check_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode)
-+		printk(KERN_CRIT "mini_fo: meta_check_d_dentry: \
-+                                  invalid dentry passed.\n");
-+	return __meta_check_d_entry(dentry->d_inode, name, len);
-+}
-+
-+int __meta_check_d_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode))
-+		printk(KERN_CRIT "mini_fo: __meta_check_d_dentry: \
-+                                  invalid inode passed.\n");
-+
-+        inode_info = itopd(inode);
-+
-+        if(inode_info->deleted_list_size <= 0)
-+                return 0;
-+
-+        list_for_each(tmp, &inode_info->deleted_list) {
-+		del_entry = list_entry(tmp, struct deleted_entry, list);
-+		if(del_entry->len != len)
-+			continue;
-+
-+		if(!strncmp(del_entry->name, name, len))
-+			return 1;
-+	}
-+	return 0;
-+}
-+
-+/*
-+ * check if file has been renamed and return path to orig. base dir.
-+ * Implements no error return values so far, what of course sucks.
-+ * String is null terminated.'
-+ */
-+char* meta_check_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry: \
-+                                  invalid dentry passed.\n");
-+		return NULL;
-+	}
-+	return __meta_check_r_entry(dentry->d_inode, name, len);
-+}
-+
-+char* __meta_check_r_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+	char *old_path;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry: \
-+                                  invalid inode passed.\n");
-+		return NULL;
-+	}
-+	inode_info = itopd(inode);
-+
-+        if(inode_info->renamed_list_size <= 0)
-+                return NULL;
-+
-+        list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		if(ren_entry->new_len != len)
-+			continue;
-+
-+		if(!strncmp(ren_entry->new_name, name, len)) {
-+			old_path = (char *)
-+				kmalloc(ren_entry->old_len+1, GFP_KERNEL);
-+			strncpy(old_path,
-+				ren_entry->old_name,
-+				ren_entry->old_len);
-+			old_path[ren_entry->old_len]='\0';
-+			return old_path;
-+		}
-+	}
-+	return NULL;
-+}
-+
-+/*
-+ * This version only checks if entry exists and return:
-+ *     1 if exists,
-+ *     0 if not,
-+ *    -1 if error.
-+ */
-+int meta_is_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry [2]: \
-+                                  invalid dentry passed.\n");
-+		return -1;
-+	}
-+	return __meta_is_r_entry(dentry->d_inode, name, len);
-+}
-+
-+int __meta_is_r_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry [2]: \
-+                                  invalid inode passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(inode);
-+
-+        if(inode_info->renamed_list_size <= 0)
-+                return -1;
-+
-+        list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		if(ren_entry->new_len != len)
-+			continue;
-+
-+		if(!strncmp(ren_entry->new_name, name, len))
-+			return 1;
-+	}
-+	return 0;
-+}
-+
---- /dev/null
-+++ b/fs/mini_fo/mini_fo.h
-@@ -0,0 +1,510 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifndef __MINI_FO_H_
-+#define __MINI_FO_H_
-+
-+#ifdef __KERNEL__
-+
-+/* META stuff */
-+#define META_FILENAME "META_dAfFgHE39ktF3HD2sr"
-+
-+/* use xattrs? */
-+#define XATTR
-+
-+/* File attributes that when changed, result in a file beeing copied to storage */
-+#define COPY_FLAGS ATTR_MODE | ATTR_UID | ATTR_GID | ATTR_SIZE
-+
-+/*
-+ * mini_fo filestates
-+ */
-+#define MODIFIED       1
-+#define UNMODIFIED     2
-+#define CREATED        3
-+#define DEL_REWRITTEN  4
-+#define DELETED        5
-+#define NON_EXISTANT   6
-+
-+/* fist file systems superblock magic */
-+# define MINI_FO_SUPER_MAGIC 0xf15f
-+
-+/*
-+ * STRUCTURES:
-+ */
-+
-+/* mini_fo inode data in memory */
-+struct mini_fo_inode_info {
-+	inode_t *wii_inode;
-+	inode_t *wii_inode2; /* pointer to storage inode */
-+
-+	/* META-data lists */
-+	/* deleted list, ex wol */
-+	struct list_head deleted_list;
-+	int deleted_list_size;
-+
-+	/* renamed list */
-+	struct list_head renamed_list;
-+	int renamed_list_size;
-+
-+	/* add other lists here ... */
-+};
-+
-+/* mini_fo dentry data in memory */
-+struct mini_fo_dentry_info {
-+	dentry_t *wdi_dentry;
-+	dentry_t *wdi_dentry2; /* pointer to  storage dentry */
-+	unsigned int state;  /* state of the mini_fo dentry */
-+};
-+
-+
-+/* mini_fo super-block data in memory */
-+struct mini_fo_sb_info {
-+	super_block_t *wsi_sb, *wsi_sb2; /* mk: might point to the same sb */
-+	struct vfsmount *hidden_mnt, *hidden_mnt2;
-+	dentry_t *base_dir_dentry;
-+	dentry_t *storage_dir_dentry;
-+	;
-+};
-+
-+/* readdir_data, readdir helper struct */
-+struct readdir_data {
-+	struct list_head ndl_list; /* linked list head ptr */
-+	int ndl_size; /* list size */
-+	int sto_done; /* flag to show that the storage dir entries have
-+		       * all been read an now follow base entries */
-+};
-+
-+/* file private data. */
-+struct mini_fo_file_info {
-+	struct file *wfi_file;
-+	struct file *wfi_file2; /* pointer to storage file */
-+	struct readdir_data rd;
-+};
-+
-+/* struct ndl_entry */
-+struct ndl_entry {
-+	struct list_head list;
-+	char *name;
-+	int len;
-+};
-+
-+/********************************
-+ *  META-data structures
-+ ********************************/
-+
-+/* deleted entry */
-+struct deleted_entry {
-+	struct list_head list;
-+	char *name;
-+	int len;
-+};
-+
-+/* renamed entry */
-+struct renamed_entry {
-+	struct list_head list;
-+	char *old_name;     /* old directory with full path */
-+	int old_len;        /* length of above string */
-+	char *new_name;     /* new directory name */
-+	int new_len;        /* length of above string */
-+};
-+
-+/* attr_change entry */
-+struct attr_change_entry {
-+	struct list_head list;
-+	char *name;
-+	int len;
-+};
-+
-+/* link entry */
-+struct link_entry {
-+	struct list_head list;
-+	int links_moved;
-+	int inum_base;
-+	int inum_sto;
-+	char *weird_name;
-+	int weird_name_len;
-+};
-+
-+
-+/* Some other stuff required for mini_fo_filldir64, copied from
-+ * fs/readdir.c
-+ */
-+
-+#define ROUND_UP64(x) (((x)+sizeof(u64)-1) & ~(sizeof(u64)-1))
-+#define NAME_OFFSET(de) ((int) ((de)->d_name - (char *) (de)))
-+
-+
-+struct linux_dirent64 {
-+        u64             d_ino;
-+        s64             d_off;
-+        unsigned short  d_reclen;
-+        unsigned char   d_type;
-+        char            d_name[0];
-+};
-+
-+
-+struct getdents_callback64 {
-+        struct linux_dirent64 * current_dir;
-+        struct linux_dirent64 * previous;
-+        int count;
-+        int error;
-+};
-+
-+struct linux_dirent {
-+	unsigned long   d_ino;
-+	unsigned long   d_off;
-+	unsigned short  d_reclen;
-+	char            d_name[1];
-+};
-+
-+struct getdents_callback {
-+	struct linux_dirent * current_dir;
-+	struct linux_dirent * previous;
-+	int count;
-+	int error;
-+};
-+
-+
-+/*
-+ * MACROS:
-+ */
-+
-+/* file TO private_data */
-+# define ftopd(file) ((struct mini_fo_file_info *)((file)->private_data))
-+# define __ftopd(file) ((file)->private_data)
-+/* file TO hidden_file */
-+# define ftohf(file) ((ftopd(file))->wfi_file)
-+# define ftohf2(file) ((ftopd(file))->wfi_file2)
-+
-+/* inode TO private_data */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+# define itopd(ino) ((struct mini_fo_inode_info *)(ino)->i_private)
-+# define __itopd(ino) ((ino)->i_private)
-+#else
-+# define itopd(ino) ((struct mini_fo_inode_info *)(ino)->u.generic_ip)
-+# define __itopd(ino) ((ino)->u.generic_ip)
-+#endif
-+/* inode TO hidden_inode */
-+# define itohi(ino) (itopd(ino)->wii_inode)
-+# define itohi2(ino) (itopd(ino)->wii_inode2)
-+
-+/* superblock TO private_data */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+# define stopd(super) ((struct mini_fo_sb_info *)(super)->s_fs_info)
-+# define __stopd(super) ((super)->s_fs_info)
-+#else
-+# define stopd(super) ((struct mini_fo_sb_info *)(super)->u.generic_sbp)
-+# define __stopd(super) ((super)->u.generic_sbp)
-+#endif
-+
-+/* unused? # define vfs2priv stopd */
-+/* superblock TO hidden_superblock */
-+
-+# define stohs(super) (stopd(super)->wsi_sb)
-+# define stohs2(super) (stopd(super)->wsi_sb2)
-+
-+/* dentry TO private_data */
-+# define dtopd(dentry) ((struct mini_fo_dentry_info *)(dentry)->d_fsdata)
-+# define __dtopd(dentry) ((dentry)->d_fsdata)
-+/* dentry TO hidden_dentry */
-+# define dtohd(dent) (dtopd(dent)->wdi_dentry)
-+# define dtohd2(dent) (dtopd(dent)->wdi_dentry2)
-+
-+/* dentry to state */
-+# define dtost(dent) (dtopd(dent)->state)
-+# define sbt(sb) ((sb)->s_type->name)
-+
-+#define IS_WRITE_FLAG(flag) (flag & (O_RDWR | O_WRONLY | O_APPEND))
-+#define IS_COPY_FLAG(flag) (flag & (COPY_FLAGS))
-+
-+/* macros to simplify non-SCA code */
-+#  define MALLOC_PAGE_POINTERS(hidden_pages, num_hidden_pages)
-+#  define MALLOC_PAGEDATA_POINTERS(hidden_pages_data, num_hidden_pages)
-+#  define FREE_PAGE_POINTERS(hidden_pages, num)
-+#  define FREE_PAGEDATA_POINTERS(hidden_pages_data, num)
-+#  define FOR_EACH_PAGE
-+#  define CURRENT_HIDDEN_PAGE hidden_page
-+#  define CURRENT_HIDDEN_PAGEDATA hidden_page_data
-+#  define CURRENT_HIDDEN_PAGEINDEX page->index
-+
-+/*
-+ * EXTERNALS:
-+ */
-+extern struct file_operations mini_fo_main_fops;
-+extern struct file_operations mini_fo_dir_fops;
-+extern struct inode_operations mini_fo_main_iops;
-+extern struct inode_operations mini_fo_dir_iops;
-+extern struct inode_operations mini_fo_symlink_iops;
-+extern struct super_operations mini_fo_sops;
-+extern struct dentry_operations mini_fo_dops;
-+extern struct vm_operations_struct mini_fo_shared_vmops;
-+extern struct vm_operations_struct mini_fo_private_vmops;
-+extern struct address_space_operations mini_fo_aops;
-+
-+#if 0 /* unused by mini_fo */
-+extern int mini_fo_interpose(dentry_t *hidden_dentry, dentry_t *this_dentry, super_block_t *sb, int flag);
-+#if defined(FIST_FILTER_DATA) || defined(FIST_FILTER_SCA)
-+extern page_t *mini_fo_get1page(file_t *file, int index);
-+extern int mini_fo_fill_zeros(file_t *file, page_t *page, unsigned from);
-+# endif /* FIST_FILTER_DATA || FIST_FILTER_SCA */
-+
-+
-+#  define mini_fo_hidden_dentry(d) __mini_fo_hidden_dentry(__FILE__,__FUNCTION__,__LINE__,(d))
-+#  define mini_fo_hidden_sto_dentry(d) __mini_fo_hidden_sto_dentry(__FILE__,__FUNCTION__,__LINE__,(d))
-+
-+extern dentry_t *__mini_fo_hidden_dentry(char *file, char *func, int line, dentry_t *this_dentry);
-+extern dentry_t *__mini_fo_hidden_sto_dentry(char *file, char *func, int line, dentry_t *this_dentry);
-+
-+extern int mini_fo_read_file(const char *filename, void *buf, int len);
-+extern int mini_fo_write_file(const char *filename, void *buf, int len);
-+extern dentry_t *fist_lookup(dentry_t *dir, const char *name, vnode_t **out, uid_t uid, gid_t gid);
-+#endif /* unused by mini_fo */
-+
-+/* state transition functions */
-+extern int nondir_unmod_to_mod(dentry_t *dentry, int cp_flag);
-+extern int nondir_del_rew_to_del(dentry_t *dentry);
-+extern int nondir_creat_to_del(dentry_t *dentry);
-+extern int nondir_mod_to_del(dentry_t *dentry);
-+extern int nondir_unmod_to_del(dentry_t *dentry);
-+
-+extern int dir_unmod_to_mod(dentry_t *dentry);
-+
-+/* rename specials */
-+extern int rename_directory(inode_t *old_dir, dentry_t *old_dentry, inode_t *new_dir, dentry_t *new_dentry);
-+extern int rename_nondir(inode_t *old_dir, dentry_t *old_dentry, inode_t *new_dir, dentry_t *new_dentry);
-+
-+/* misc stuff */
-+extern int mini_fo_tri_interpose(dentry_t *hidden_dentry,
-+				 dentry_t *hidden_sto_dentry,
-+				 dentry_t *dentry,
-+				 super_block_t *sb, int flag);
-+
-+extern int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
-+			   dentry_t *src_dentry, struct vfsmount *src_mnt);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
-+
-+extern int create_sto_nod(dentry_t *dentry, int mode, dev_t dev);
-+extern int create_sto_reg_file(dentry_t *dentry, int mode, struct nameidata *nd);
-+#else
-+extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode);
-+
-+extern int create_sto_nod(dentry_t *dentry, int mode, int dev);
-+extern int create_sto_reg_file(dentry_t *dentry, int mode);
-+#endif
-+
-+extern int create_sto_dir(dentry_t *dentry, int mode);
-+
-+extern int exists_in_storage(dentry_t *dentry);
-+extern int is_mini_fo_existant(dentry_t *dentry);
-+extern int get_neg_sto_dentry(dentry_t *dentry);
-+extern int build_sto_structure(dentry_t *dir, dentry_t *dentry);
-+extern int get_mini_fo_bpath(dentry_t *dentry, char **bpath, int *bpath_len);
-+extern dentry_t *bpath_walk(super_block_t *sb, char *bpath);
-+extern int bpath_put(dentry_t *dentry);
-+
-+/* check_mini_fo types functions */
-+extern int check_mini_fo_dentry(dentry_t *dentry);
-+extern int check_mini_fo_file(file_t *file);
-+extern int check_mini_fo_inode(inode_t *inode);
-+
-+/* General meta functions, can be called from outside of meta.c */
-+extern int meta_build_lists(dentry_t *dentry);
-+extern int meta_put_lists(dentry_t *dentry);
-+extern int __meta_put_lists(inode_t *inode);
-+
-+extern int meta_add_d_entry(dentry_t *dentry, const char *name, int len);
-+extern int meta_add_r_entry(dentry_t *dentry,
-+			    const char *old_name, int old_len,
-+			    const char *new_name, int new_len);
-+
-+extern int meta_remove_r_entry(dentry_t *dentry, const char *name, int len);
-+
-+extern int meta_check_d_entry(dentry_t *dentry, const char *name, int len);
-+extern int __meta_check_d_entry(inode_t *inode, const char *name, int len);
-+
-+extern char* meta_check_r_entry(dentry_t *dentry, const char *name, int len);
-+extern char* __meta_check_r_entry(inode_t *inode, const char *name, int len);
-+extern int meta_is_r_entry(dentry_t *dentry, const char *name, int len);
-+extern int __meta_is_r_entry(inode_t *inode, const char *name, int len);
-+
-+/* Specific meta functions, should be called only inside meta.c */
-+extern int __meta_put_d_list(inode_t *inode);
-+extern int __meta_put_r_list(inode_t *inode);
-+
-+extern int meta_list_add_d_entry(dentry_t *dentry,
-+				 const char *name, int len);
-+extern int meta_list_add_r_entry(dentry_t *dentry,
-+				 const char *old_name, int old_len,
-+				 const char *new_name, int new_len);
-+
-+extern int meta_list_remove_r_entry(dentry_t *dentry,
-+				    const char *name, int len);
-+
-+extern int __meta_list_remove_r_entry(inode_t *inode,
-+				      const char *name, int len);
-+
-+extern int meta_write_d_entry(dentry_t *dentry, const char *name, int len);
-+extern int meta_write_r_entry(dentry_t *dentry,
-+			      const char *old_name, int old_len,
-+			      const char *new_name, int new_len);
-+
-+extern int meta_sync_lists(dentry_t *dentry);
-+extern int meta_sync_d_list(dentry_t *dentry, int app_flag);
-+extern int meta_sync_r_list(dentry_t *dentry, int app_flag);
-+
-+/* ndl stuff */
-+extern int ndl_add_entry(struct readdir_data *rd, const char *name, int len);
-+extern void ndl_put_list(struct readdir_data *rd);
-+extern int ndl_check_entry(struct readdir_data *rd,
-+			   const char *name, int len);
-+
-+
-+# define copy_inode_size(dst, src) \
-+    dst->i_size = src->i_size; \
-+    dst->i_blocks = src->i_blocks;
-+
-+static inline void
-+fist_copy_attr_atime(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_atime = src->i_atime;
-+}
-+static inline void
-+fist_copy_attr_times(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_atime = src->i_atime;
-+	dest->i_mtime = src->i_mtime;
-+	dest->i_ctime = src->i_ctime;
-+}
-+static inline void
-+fist_copy_attr_timesizes(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_atime = src->i_atime;
-+	dest->i_mtime = src->i_mtime;
-+	dest->i_ctime = src->i_ctime;
-+	copy_inode_size(dest, src);
-+}
-+static inline void
-+fist_copy_attr_all(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_mode = src->i_mode;
-+	dest->i_nlink = src->i_nlink;
-+	dest->i_uid = src->i_uid;
-+	dest->i_gid = src->i_gid;
-+	dest->i_rdev = src->i_rdev;
-+	dest->i_atime = src->i_atime;
-+	dest->i_mtime = src->i_mtime;
-+	dest->i_ctime = src->i_ctime;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-+	dest->i_blksize = src->i_blksize;
-+#endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,12)
-+	dest->i_blkbits = src->i_blkbits;
-+# endif /* linux 2.4.12 and newer */
-+	copy_inode_size(dest, src);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	dest->i_attr_flags = src->i_attr_flags;
-+#else
-+	dest->i_flags = src->i_flags;
-+#endif
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+/* copied from linux/fs.h */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+static inline void double_lock(struct dentry *d1, struct dentry *d2)
-+{
-+	struct mutex *m1 = &d1->d_inode->i_mutex;
-+	struct mutex *m2 = &d2->d_inode->i_mutex;
-+	if (m1 != m2) {
-+		if ((unsigned long) m1 < (unsigned long) m2) {
-+			struct mutex *tmp = m2;
-+			m2 = m1; m1 = tmp;
-+		}
-+		mutex_lock(m1);
-+	}
-+	mutex_lock(m2);
-+}
-+
-+static inline void double_unlock(struct dentry *d1, struct dentry *d2)
-+{
-+	struct mutex *m1 = &d1->d_inode->i_mutex;
-+	struct mutex *m2 = &d2->d_inode->i_mutex;
-+	mutex_unlock(m1);
-+	if (m1 != m2)
-+		mutex_unlock(m2);
-+	dput(d1);
-+	dput(d2);
-+}
-+
-+#else
-+static inline void double_down(struct semaphore *s1, struct semaphore *s2)
-+{
-+        if (s1 != s2) {
-+                if ((unsigned long) s1 < (unsigned long) s2) {
-+                        struct semaphore *tmp = s2;
-+                        s2 = s1; s1 = tmp;
-+                }
-+                down(s1);
-+        }
-+        down(s2);
-+}
-+
-+static inline void double_up(struct semaphore *s1, struct semaphore *s2)
-+{
-+        up(s1);
-+        if (s1 != s2)
-+                up(s2);
-+}
-+
-+static inline void double_lock(struct dentry *d1, struct dentry *d2)
-+{
-+        double_down(&d1->d_inode->i_sem, &d2->d_inode->i_sem);
-+}
-+
-+static inline void double_unlock(struct dentry *d1, struct dentry *d2)
-+{
-+        double_up(&d1->d_inode->i_sem,&d2->d_inode->i_sem);
-+        dput(d1);
-+        dput(d2);
-+}
-+#endif   /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) */
-+#endif  /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
-+#endif /* __KERNEL__ */
-+
-+/*
-+ * Definitions for user and kernel code
-+ */
-+
-+/* ioctls */
-+
-+#endif	/* not __MINI_FO_H_ */
---- /dev/null
-+++ b/fs/mini_fo/mini_fo-merge
-@@ -0,0 +1,180 @@
-+#!/bin/bash
-+#
-+# Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
-+# 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.
-+#
-+
-+BASE=
-+STO=
-+HELP=
-+DRYRUN=
-+VERBOSE=
-+TMP="/tmp/"
-+META_NAME="META_dAfFgHE39ktF3HD2sr"
-+SKIP_DEL_LIST="skip-delete-list.mini_fo-merge"
-+
-+COMMAND=
-+exec_command()
-+{
-+    if [ x$DRYRUN == "xset" ]; then
-+	echo "  would run: $COMMAND"
-+    elif ! [ x$DRYRUN == "xset" ]; then
-+	if [ x$VERBOSE == "xset" ]; then
-+	    echo "  running: $COMMAND"
-+	fi
-+	eval $COMMAND
-+    fi
-+}
-+
-+usage()
-+{
-+cat <<EOF
-+
-+USAGE: $0 -b <base dir> -s <storage dir>
-+Version 0.1
-+
-+This script merges the contents of a mini_fo storage file system back
-+to the base file system.
-+
-+!!! Warning: This will modify the base filesystem and can destroy data
-+             if used wrongly.
-+
-+Options:
-+     -b <base dir>
-+          the directory of the base file system.
-+
-+     -s <storage dir>
-+          the directory of the storage file system.
-+
-+     -d   dry run, will not change anything and print the commands that
-+          would be executed.
-+
-+     -t   tmp dir for storing temporary file. default: $TMP
-+
-+     -v   show what operations are performed.
-+
-+     -h   displays this message.
-+
-+EOF
-+}
-+
-+# parse parameters
-+while getopts hdvt:b:s: OPTS
-+  do
-+  case $OPTS in
-+      h)  HELP="set";;
-+      d)  DRYRUN="set";;
-+      v)  VERBOSE="set";;
-+      b)  BASE="$OPTARG";;
-+      s)  STO="$OPTARG";;
-+      t)  TMP="$OPTARG";;
-+      ?)  usage
-+	  exit 1;;
-+  esac
-+done
-+
-+if [ "x$HELP" == "xset" ]; then
-+    usage
-+    exit -1
-+fi
-+
-+if ! [ -d "$BASE" ] || ! [ -d "$STO" ]; then
-+    echo -e "$0:\n Error, -s and/or -b argument missing. type $0 -h for help."
-+    exit -1;
-+fi
-+
-+# get full paths
-+pushd $STO; STO=`pwd`; popd
-+pushd $BASE; BASE=`pwd`; popd
-+TMP=${TMP%/}
-+
-+
-+cat<<EOF
-+###############################################################################
-+# mini_fo-merge
-+#
-+# base dir:       $BASE
-+# storage dir:    $STO
-+# meta filename:  $META_NAME
-+# dry run:        $DRYRUN
-+# verbose:        $VERBOSE
-+# tmp files:      $TMP
-+###############################################################################
-+
-+EOF
-+
-+rm $TMP/$SKIP_DEL_LIST
-+
-+# first process all renamed dirs
-+echo "Merging renamed directories..."
-+pushd $STO &> /dev/null
-+find . -name $META_NAME -type f -print0  | xargs -0 -e grep  -e '^R ' | tr -s ':R' ' ' | while read ENTRY; do
-+    echo "entry: $ENTRY"
-+    META_FILE=`echo $ENTRY | cut -d ' ' -f 1`
-+    OLD_B_DIR=`echo $ENTRY | cut -d ' ' -f 2 | sed -e 's/\///'`
-+    NEW_NAME=`echo $ENTRY | cut -d ' ' -f 3`
-+    NEW_B_DIR=`echo $META_FILE | sed -e "s/$META_NAME/$NEW_NAME/" | sed -e 's/^\.\///'`
-+    echo "META_FILE: $META_FILE"
-+    echo "OLD_B_DIR: $OLD_B_DIR"
-+    echo "NEW_NAME: $NEW_NAME"
-+    echo  "NEW_B_DIR: $NEW_B_DIR"
-+
-+    pushd $BASE &> /dev/null
-+    # remove an existing dir in storage
-+    COMMAND="rm -rf $NEW_B_DIR"; exec_command
-+    COMMAND="cp -R $OLD_B_DIR $NEW_B_DIR"; exec_command
-+    echo ""
-+    popd &> /dev/null
-+
-+    # remember this dir to exclude it from deleting later
-+    echo $NEW_B_DIR >> $TMP/$SKIP_DEL_LIST
-+done
-+
-+# delete all whiteouted files from base
-+echo -e "\nDeleting whiteout'ed files from base file system..."
-+find . -name $META_NAME -type f -print0  | xargs -0 -e grep  -e '^D ' | sed -e 's/:D//' | while read ENTRY; do
-+    META_FILE=`echo $ENTRY | cut -d ' ' -f 1`
-+    DEL_NAME=`echo $ENTRY | cut -d ' ' -f 2`
-+    DEL_FILE=`echo $META_FILE | sed -e "s/$META_NAME/$DEL_NAME/" | sed -e 's/^\.\///'`
-+    grep -x $DEL_FILE $TMP/$SKIP_DEL_LIST &> /dev/null
-+    if [ $? -ne 0 ]; then
-+	pushd $BASE &> /dev/null
-+	COMMAND="rm -rf $DEL_FILE"; exec_command
-+	popd &> /dev/null
-+    else
-+	echo "  excluding: $DEL_FILE as in skip-del-list."
-+    fi
-+done
-+
-+# create all dirs and update permissions
-+echo -e "\nSetting up directory structures in base file system..."
-+find . -type d | sed -e 's/^\.\///' | while read DIR; do
-+    PERMS=`stat -c %a $DIR`
-+    DIR_UID=`stat -c %u $DIR`
-+    DIR_GID=`stat -c %g $DIR`
-+    pushd $BASE &> /dev/null
-+    if ! [ -d $DIR ]; then
-+	COMMAND="mkdir -p $DIR"; exec_command
-+    fi
-+    COMMAND="chmod $PERMS $DIR"; exec_command
-+    COMMAND="chown $DIR_UID:$DIR_GID $DIR"; exec_command
-+    popd &> /dev/null
-+done
-+
-+# merge all non-directory files
-+echo -e "\nMerging all non-directory files...."
-+for i in b c p f l s; do
-+    find . -type $i | sed -e 's/^\.\///' | grep -v "$META_NAME" | while read FILE; do
-+	pushd $BASE #&> /dev/null
-+	COMMAND="cp -df $STO/$FILE $BASE/$FILE"; exec_command
-+	popd &> /dev/null
-+    done
-+done
-+popd &> /dev/null
-+
-+#rm $TMP/$SKIP_DEL_LIST
-+
-+echo "Done!"
---- /dev/null
-+++ b/fs/mini_fo/mini_fo-overlay
-@@ -0,0 +1,130 @@
-+#!/bin/bash
-+#
-+# Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
-+# 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.
-+#
-+
-+HELP=
-+SUFF=
-+MNTP=
-+MNT_DIR="/mnt"
-+STO=
-+STO_DIR="/tmp"
-+BASE=
-+
-+usage()
-+{
-+cat <<EOF
-+
-+Usage: $0 [-s suffix] [-d sto_dir_dir] [-m mount point] base_dir
-+Version 0.1
-+
-+This script overlays the given base directory using the mini_fo file
-+system. If only the base directory base_dir is given, $0
-+will use a storage directory called "sto-<base_dir_name>" in $STO_DIR,
-+and mount point "mini_fo-<base_dir_dir>" in $MNT_DIR.
-+
-+Options:
-+     -s <suffix>
-+          add given suffix to storage directory and the mount
-+          point. This is usefull for overlaying one base directory
-+          several times and avoiding conflicts with storage directory
-+          names and mount points.
-+
-+     -d <sto_dir_dir>
-+          change the directory in which the storage directory will be
-+          created (default is currently "$STO_DIR".
-+
-+     -m <mount point>
-+          use an alternative directory to create the mini_fo
-+          mountpoint (default is currently "$MNT_DIR".
-+
-+     -h   displays this message.
-+
-+EOF
-+exit 1;
-+}
-+
-+while getopts hm:s:d: OPTS
-+  do
-+  case $OPTS in
-+      s)  SUFF="$OPTARG";;
-+      d)  STO_DIR="$OPTARG";;
-+      m)  MNT_DIR="$OPTARG";;
-+      h)  HELP="set";;
-+      ?)  usage
-+	  exit 1;;
-+  esac
-+done
-+shift $(($OPTIND - 1))
-+
-+BASE="$1"
-+
-+if [ "x$HELP" == "xset" ]; then
-+    usage
-+    exit -1
-+fi
-+
-+# fix suffix
-+if [ "x$SUFF" != "x" ]; then
-+    SUFF="-$SUFF"
-+fi
-+
-+# kill trailing slashes
-+MNT_DIR=${MNT_DIR%/}
-+STO_DIR=${STO_DIR%/}
-+BASE=${BASE%/}
-+
-+
-+if ! [ -d "$BASE" ]; then
-+    echo "invalid base dir $BASE, run $0 -h for help."
-+    exit -1
-+fi
-+
-+# check opts
-+if ! [ -d "$MNT_DIR" ]; then
-+    echo "invalid mount dir $MNT_DIR, run $0 -h for help."
-+    exit -1
-+fi
-+
-+if ! [ -d "$STO_DIR" ]; then
-+    echo "invalid sto_dir_dir $STO_DIR, run $0 -h for help."
-+    exit -1
-+fi
-+
-+MNTP="$MNT_DIR/mini_fo-`basename $BASE`$SUFF"
-+STO="$STO_DIR/sto-`basename $BASE`$SUFF"
-+
-+# create the mount point if it doesn't exist
-+mkdir -p $MNTP
-+if [ $? -ne 0 ]; then
-+    echo "Error, failed to create mount point $MNTP"
-+fi
-+
-+mkdir -p $STO
-+if [ $? -ne 0 ]; then
-+    echo "Error, failed to create storage dir $STO"
-+fi
-+
-+# check if fs is already mounted
-+mount | grep mini_fo | grep $MNTP &> /dev/null
-+if [ $? -eq 0 ]; then
-+    echo "Error, existing mini_fo mount at $MNTP."
-+    exit -1
-+fi
-+
-+mount | grep mini_fo | grep $STO &> /dev/null
-+if [ $? -eq 0 ]; then
-+    echo "Error, $STO seems to be used already."
-+    exit -1
-+fi
-+
-+# mount
-+mount -t mini_fo -o base=$BASE,sto=$STO $BASE $MNTP
-+
-+if [ $? -ne 0 ]; then
-+    echo "Error, mounting failed, maybe no permisson to mount?"
-+fi
---- /dev/null
-+++ b/fs/mini_fo/mmap.c
-@@ -0,0 +1,637 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+
-+#ifdef FIST_COUNT_WRITES
-+/* for counting writes in the middle vs. regular writes */
-+unsigned long count_writes = 0, count_writes_middle = 0;
-+#endif /* FIST_COUNT_WRITES */
-+
-+/* forward declaration of commit write and prepare write */
-+STATIC int mini_fo_commit_write(file_t *file, page_t *page, unsigned from, unsigned to);
-+STATIC int mini_fo_prepare_write(file_t *file, page_t *page, unsigned from, unsigned to);
-+
-+
-+/*
-+ * Function for handling creation of holes when lseek-ing past the
-+ * end of the file and then writing some data.
-+ */
-+int
-+mini_fo_fill_zeros(file_t* file, page_t *page, unsigned from)
-+{
-+	int err = 0;
-+	dentry_t *dentry = file->f_dentry;
-+	inode_t *inode = dentry->d_inode;
-+	page_t *tmp_page;
-+	int index;
-+
-+	print_entry_location();
-+
-+	for (index = inode->i_size >> PAGE_CACHE_SHIFT; index < page->index; index++) {
-+		tmp_page = mini_fo_get1page(file, index);
-+		if (IS_ERR(tmp_page)) {
-+			err = PTR_ERR(tmp_page);
-+			goto out;
-+		}
-+
-+		/*
-+		 * zero out rest of the contents of the page between the appropriate
-+		 * offsets.
-+		 */
-+		memset((char*)page_address(tmp_page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, PAGE_CACHE_SIZE - (inode->i_size & ~PAGE_CACHE_MASK));
-+
-+		if (! (err = mini_fo_prepare_write(file, tmp_page, 0, PAGE_CACHE_SIZE)))
-+			err = mini_fo_commit_write(file, tmp_page, 0, PAGE_CACHE_SIZE);
-+
-+		page_cache_release(tmp_page);
-+		if (err < 0)
-+			goto out;
-+		if (current->need_resched)
-+			schedule();
-+	}
-+
-+	/* zero out appropriate parts of last page */
-+
-+	/*
-+	 * if the encoding type is block, then adjust the 'from' (where the
-+	 * zeroing will start) offset appropriately
-+	 */
-+	from = from & (~(FIST_ENCODING_BLOCKSIZE - 1));
-+
-+	if ((from - (inode->i_size & ~PAGE_CACHE_MASK)) > 0) {
-+
-+		memset((char*)page_address(page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, from - (inode->i_size & ~PAGE_CACHE_MASK));
-+		if (! (err = mini_fo_prepare_write(file, page, 0, PAGE_CACHE_SIZE)))
-+			err = mini_fo_commit_write(file, page, 0, PAGE_CACHE_SIZE);
-+
-+		if (err < 0)
-+			goto out;
-+		if (current->need_resched)
-+			schedule();
-+	}
-+
-+ out:
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+
-+STATIC int
-+mini_fo_writepage(page_t *page)
-+{
-+	int err = -EIO;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	page_t *hidden_page;
-+	char *kaddr, *hidden_kaddr;
-+
-+	print_entry_location();
-+
-+	inode = page->mapping->host;
-+	hidden_inode = itohi(inode);
-+
-+	/*
-+	 * writepage is called when shared mmap'ed files need to write
-+	 * their pages, while prepare/commit_write are called from the
-+	 * non-paged write() interface.  (However, in 2.3 the two interfaces
-+	 * share the same cache, while in 2.2 they didn't.)
-+	 *
-+	 * So we pretty much have to duplicate much of what commit_write does.
-+	 */
-+
-+	/* find lower page (returns a locked page) */
-+	hidden_page = grab_cache_page(hidden_inode->i_mapping, page->index);
-+	if (!hidden_page)
-+		goto out;
-+
-+	/* get page address, and encode it */
-+	kaddr = (char *) kmap(page);
-+	hidden_kaddr = (char*) kmap(hidden_page);
-+	mini_fo_encode_block(kaddr, hidden_kaddr, PAGE_CACHE_SIZE, inode, inode->i_sb, page->index);
-+	/* if encode_block could fail, then return error */
-+	kunmap(page);
-+	kunmap(hidden_page);
-+
-+	/* call lower writepage (expects locked page) */
-+	err = hidden_inode->i_mapping->a_ops->writepage(hidden_page);
-+
-+	/*
-+	 * update mtime and ctime of lower level file system
-+	 * mini_fo' mtime and ctime are updated by generic_file_write
-+	 */
-+	hidden_inode->i_mtime = hidden_inode->i_ctime = CURRENT_TIME;
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,1)
-+	UnlockPage(hidden_page);	/* b/c grab_cache_page locked it */
-+# endif /* kernel older than 2.4.1 */
-+	page_cache_release(hidden_page); /* b/c grab_cache_page increased refcnt */
-+
-+	if (err)
-+		ClearPageUptodate(page);
-+	else
-+		SetPageUptodate(page);
-+ out:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,1)
-+	UnlockPage(page);
-+# endif /* kernel 2.4.1 and newer */
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+/*
-+ * get one page from cache or lower f/s, return error otherwise.
-+ * returns unlocked, up-to-date page (if ok), with increased refcnt.
-+ */
-+page_t *
-+mini_fo_get1page(file_t *file, int index)
-+{
-+	page_t *page;
-+	dentry_t *dentry;
-+	inode_t *inode;
-+	struct address_space *mapping;
-+	int err;
-+
-+	print_entry_location();
-+
-+	dentry = file->f_dentry; /* CPW: Moved below print_entry_location */
-+	inode = dentry->d_inode;
-+	mapping = inode->i_mapping;
-+
-+	fist_dprint(8, "%s: read page index %d pid %d\n", __FUNCTION__, index, current->pid);
-+	if (index < 0) {
-+		printk("%s BUG: index=%d\n", __FUNCTION__, index);
-+		page = ERR_PTR(-EIO);
-+		goto out;
-+	}
-+	page = read_cache_page(mapping,
-+			       index,
-+			       (filler_t *) mapping->a_ops->readpage,
-+			       (void *) file);
-+	if (IS_ERR(page))
-+		goto out;
-+	wait_on_page(page);
-+	if (!Page_Uptodate(page)) {
-+		lock_page(page);
-+		err = mapping->a_ops->readpage(file, page);
-+		if (err) {
-+			page = ERR_PTR(err);
-+			goto out;
-+		}
-+		wait_on_page(page);
-+		if (!Page_Uptodate(page)) {
-+			page = ERR_PTR(-EIO);
-+			goto out;
-+		}
-+	}
-+
-+ out:
-+	print_exit_pointer(page);
-+	return page;
-+}
-+
-+
-+/*
-+ * get one page from cache or lower f/s, return error otherwise.
-+ * similar to get1page, but doesn't guarantee that it will return
-+ * an unlocked page.
-+ */
-+page_t *
-+mini_fo_get1page_cached(file_t *file, int index)
-+{
-+	page_t *page;
-+	dentry_t *dentry;
-+	inode_t *inode;
-+	struct address_space *mapping;
-+	int err;
-+
-+	print_entry_location();
-+
-+	dentry = file->f_dentry; /* CPW: Moved below print_entry_location */
-+	inode = dentry->d_inode;
-+	mapping = inode->i_mapping;
-+
-+	fist_dprint(8, "%s: read page index %d pid %d\n", __FUNCTION__, index, current->pid);
-+	if (index < 0) {
-+		printk("%s BUG: index=%d\n", __FUNCTION__, index);
-+		page = ERR_PTR(-EIO);
-+		goto out;
-+	}
-+	page = read_cache_page(mapping,
-+			       index,
-+			       (filler_t *) mapping->a_ops->readpage,
-+			       (void *) file);
-+	if (IS_ERR(page))
-+		goto out;
-+
-+ out:
-+	print_exit_pointer(page);
-+	return page;
-+}
-+
-+
-+/*
-+ * readpage is called from generic_page_read and the fault handler.
-+ * If your file system uses generic_page_read for the read op, it
-+ * must implement readpage.
-+ *
-+ * Readpage expects a locked page, and must unlock it.
-+ */
-+STATIC int
-+mini_fo_do_readpage(file_t *file, page_t *page)
-+{
-+	int err = -EIO;
-+	dentry_t *dentry;
-+	file_t *hidden_file = NULL;
-+	dentry_t *hidden_dentry;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	char *page_data;
-+	page_t *hidden_page;
-+	char *hidden_page_data;
-+	int real_size;
-+
-+	print_entry_location();
-+
-+	dentry = file->f_dentry; /* CPW: Moved below print_entry_location */
-+	if (ftopd(file) != NULL)
-+		hidden_file = ftohf(file);
-+	hidden_dentry = dtohd(dentry);
-+	inode = dentry->d_inode;
-+	hidden_inode = itohi(inode);
-+
-+	fist_dprint(7, "%s: requesting page %d from file %s\n", __FUNCTION__, page->index, dentry->d_name.name);
-+
-+	MALLOC_PAGE_POINTERS(hidden_pages, num_hidden_pages);
-+	MALLOC_PAGEDATA_POINTERS(hidden_pages_data, num_hidden_pages);
-+	FOR_EACH_PAGE
-+		CURRENT_HIDDEN_PAGE = NULL;
-+
-+	/* find lower page (returns a locked page) */
-+	FOR_EACH_PAGE {
-+		fist_dprint(8, "%s: Current page index = %d\n", __FUNCTION__, CURRENT_HIDDEN_PAGEINDEX);
-+		CURRENT_HIDDEN_PAGE = read_cache_page(hidden_inode->i_mapping,
-+						      CURRENT_HIDDEN_PAGEINDEX,
-+						      (filler_t *) hidden_inode->i_mapping->a_ops->readpage,
-+						      (void *) hidden_file);
-+		if (IS_ERR(CURRENT_HIDDEN_PAGE)) {
-+			err = PTR_ERR(CURRENT_HIDDEN_PAGE);
-+			CURRENT_HIDDEN_PAGE = NULL;
-+			goto out_release;
-+		}
-+	}
-+
-+	/*
-+	 * wait for the page data to show up
-+	 * (signaled by readpage as unlocking the page)
-+	 */
-+	FOR_EACH_PAGE {
-+		wait_on_page(CURRENT_HIDDEN_PAGE);
-+		if (!Page_Uptodate(CURRENT_HIDDEN_PAGE)) {
-+			/*
-+			 * call readpage() again if we returned from wait_on_page with a
-+			 * page that's not up-to-date; that can happen when a partial
-+			 * page has a few buffers which are ok, but not the whole
-+			 * page.
-+			 */
-+			lock_page(CURRENT_HIDDEN_PAGE);
-+			err = hidden_inode->i_mapping->a_ops->readpage(hidden_file,
-+								       CURRENT_HIDDEN_PAGE);
-+			if (err) {
-+				CURRENT_HIDDEN_PAGE = NULL;
-+				goto out_release;
-+			}
-+			wait_on_page(CURRENT_HIDDEN_PAGE);
-+			if (!Page_Uptodate(CURRENT_HIDDEN_PAGE)) {
-+				err = -EIO;
-+				goto out_release;
-+			}
-+		}
-+	}
-+
-+	/* map pages, get their addresses */
-+	page_data = (char *) kmap(page);
-+	FOR_EACH_PAGE
-+		CURRENT_HIDDEN_PAGEDATA = (char *) kmap(CURRENT_HIDDEN_PAGE);
-+
-+	/* if decode_block could fail, then return error */
-+	err = 0;
-+	real_size = hidden_inode->i_size - (page->index << PAGE_CACHE_SHIFT);
-+	if (real_size <= 0)
-+		memset(page_data, 0, PAGE_CACHE_SIZE);
-+	else if (real_size < PAGE_CACHE_SIZE) {
-+		mini_fo_decode_block(hidden_page_data, page_data, real_size, inode, inode->i_sb, page->index);
-+		memset(page_data + real_size, 0, PAGE_CACHE_SIZE - real_size);
-+	} else
-+		mini_fo_decode_block(hidden_page_data, page_data, PAGE_CACHE_SIZE, inode, inode->i_sb, page->index);
-+
-+	FOR_EACH_PAGE
-+		kunmap(CURRENT_HIDDEN_PAGE);
-+	kunmap(page);
-+
-+ out_release:
-+	FOR_EACH_PAGE
-+		if (CURRENT_HIDDEN_PAGE)
-+			page_cache_release(CURRENT_HIDDEN_PAGE); /* undo read_cache_page */
-+
-+	FREE_PAGE_POINTERS(hidden_pages, num_hidden_pages);
-+	FREE_PAGEDATA_POINTERS(hidden_pages_data, num_hidden_pages);
-+
-+ out:
-+	if (err == 0)
-+		SetPageUptodate(page);
-+	else
-+		ClearPageUptodate(page);
-+
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_readpage(file_t *file, page_t *page)
-+{
-+	int err;
-+	print_entry_location();
-+
-+	err = mini_fo_do_readpage(file, page);
-+
-+	/*
-+	 * we have to unlock our page, b/c we _might_ have gotten a locked page.
-+	 * but we no longer have to wakeup on our page here, b/c UnlockPage does
-+	 * it
-+	 */
-+	UnlockPage(page);
-+
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_prepare_write(file_t *file, page_t *page, unsigned from, unsigned to)
-+{
-+	int err = 0;
-+
-+	print_entry_location();
-+
-+	/*
-+	 * we call kmap(page) only here, and do the kunmap
-+	 * and the actual downcalls, including unlockpage and uncache
-+	 * in commit_write.
-+	 */
-+	kmap(page);
-+
-+	/* fast path for whole page writes */
-+	if (from == 0 && to == PAGE_CACHE_SIZE)
-+		goto out;
-+	/* read the page to "revalidate" our data */
-+	/* call the helper function which doesn't unlock the page */
-+	if (!Page_Uptodate(page))
-+		err = mini_fo_do_readpage(file, page);
-+
-+ out:
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+
-+STATIC int
-+mini_fo_commit_write(file_t *file, page_t *page, unsigned from, unsigned to)
-+{
-+	int err = -ENOMEM;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	page_t *hidden_page;
-+	file_t *hidden_file = NULL;
-+	loff_t pos;
-+	unsigned bytes = to - from;
-+	unsigned hidden_from, hidden_to, hidden_bytes;
-+
-+	print_entry_location();
-+
-+	inode = page->mapping->host; /* CPW: Moved below print_entry_location */
-+	hidden_inode = itohi(inode);
-+
-+	ASSERT(file != NULL);
-+	/*
-+	 * here we have a kmapped page, with data from the user copied
-+	 * into it.  we need to encode_block it, and then call the lower
-+	 * commit_write.  We also need to simulate same behavior of
-+	 * generic_file_write, and call prepare_write on the lower f/s first.
-+	 */
-+#ifdef FIST_COUNT_WRITES
-+	count_writes++;
-+# endif /* FIST_COUNT_WRITES */
-+
-+	/* this is append and/or extend -- we can't have holes so fill them in */
-+	if (page->index > (hidden_inode->i_size >> PAGE_CACHE_SHIFT)) {
-+		page_t *tmp_page;
-+		int index;
-+		for (index = hidden_inode->i_size >> PAGE_CACHE_SHIFT; index < page->index; index++) {
-+			tmp_page = mini_fo_get1page(file, index);
-+			if (IS_ERR(tmp_page)) {
-+				err = PTR_ERR(tmp_page);
-+				goto out;
-+			}
-+			/* zero out the contents of the page at the appropriate offsets */
-+			memset((char*)page_address(tmp_page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, PAGE_CACHE_SIZE - (inode->i_size & ~PAGE_CACHE_MASK));
-+			if (!(err = mini_fo_prepare_write(file, tmp_page, 0, PAGE_CACHE_SIZE)))
-+				err = mini_fo_commit_write(file, tmp_page, 0, PAGE_CACHE_SIZE);
-+			page_cache_release(tmp_page);
-+			if (err < 0)
-+				goto out;
-+			if (current->need_resched)
-+				schedule();
-+		}
-+	}
-+
-+	if (ftopd(file) != NULL)
-+		hidden_file = ftohf(file);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_inode->i_mutex);
-+#else
-+	down(&hidden_inode->i_sem);
-+#endif
-+	/* find lower page (returns a locked page) */
-+	hidden_page = grab_cache_page(hidden_inode->i_mapping, page->index);
-+	if (!hidden_page)
-+		goto out;
-+
-+#if FIST_ENCODING_BLOCKSIZE > 1
-+#  error encoding_blocksize greater than 1 is not yet supported
-+# endif /* FIST_ENCODING_BLOCKSIZE > 1 */
-+
-+	hidden_from = from & (~(FIST_ENCODING_BLOCKSIZE - 1));
-+	hidden_to = ((to + FIST_ENCODING_BLOCKSIZE - 1) & (~(FIST_ENCODING_BLOCKSIZE - 1)));
-+	if ((page->index << PAGE_CACHE_SHIFT) + to > hidden_inode->i_size) {
-+
-+		/*
-+		 * if this call to commit_write had introduced holes and the code
-+		 * for handling holes was invoked, then the beginning of this page
-+		 * must be zeroed out
-+		 * zero out bytes from 'size_of_file%pagesize' to 'from'.
-+		 */
-+		if ((hidden_from - (inode->i_size & ~PAGE_CACHE_MASK)) > 0)
-+			memset((char*)page_address(page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, hidden_from - (inode->i_size & ~PAGE_CACHE_MASK));
-+
-+	}
-+	hidden_bytes = hidden_to - hidden_from;
-+
-+	/* call lower prepare_write */
-+	err = -EINVAL;
-+	if (hidden_inode->i_mapping &&
-+	    hidden_inode->i_mapping->a_ops &&
-+	    hidden_inode->i_mapping->a_ops->prepare_write)
-+		err = hidden_inode->i_mapping->a_ops->prepare_write(hidden_file,
-+								    hidden_page,
-+								    hidden_from,
-+								    hidden_to);
-+	if (err)
-+		/* don't leave locked pages behind, esp. on an ENOSPC */
-+		goto out_unlock;
-+
-+	fist_dprint(8, "%s: encoding %d bytes\n", __FUNCTION__, hidden_bytes);
-+	mini_fo_encode_block((char *) page_address(page) + hidden_from, (char*) page_address(hidden_page) + hidden_from, hidden_bytes, inode, inode->i_sb, page->index);
-+	/* if encode_block could fail, then goto unlock and return error */
-+
-+	/* call lower commit_write */
-+	err = hidden_inode->i_mapping->a_ops->commit_write(hidden_file,
-+							   hidden_page,
-+							   hidden_from,
-+							   hidden_to);
-+
-+	if (err < 0)
-+		goto out_unlock;
-+
-+	err = bytes;	/* convert error to no. of bytes */
-+
-+	inode->i_blocks = hidden_inode->i_blocks;
-+	/* we may have to update i_size */
-+	pos = (page->index << PAGE_CACHE_SHIFT) + to;
-+	if (pos > inode->i_size)
-+		inode->i_size = pos;
-+
-+	/*
-+	 * update mtime and ctime of lower level file system
-+	 * mini_fo' mtime and ctime are updated by generic_file_write
-+	 */
-+	hidden_inode->i_mtime = hidden_inode->i_ctime = CURRENT_TIME;
-+
-+	mark_inode_dirty_sync(inode);
-+
-+ out_unlock:
-+	UnlockPage(hidden_page);
-+	page_cache_release(hidden_page);
-+	kunmap(page);		/* kmap was done in prepare_write */
-+ out:
-+	/* we must set our page as up-to-date */
-+	if (err < 0)
-+		ClearPageUptodate(page);
-+	else
-+		SetPageUptodate(page);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_inode->i_mutex);
-+#else
-+	up(&hidden_inode->i_sem);
-+#endif
-+	print_exit_status(err);
-+	return err;			/* assume all is ok */
-+}
-+
-+
-+STATIC int
-+mini_fo_bmap(struct address_space *mapping, long block)
-+{
-+	int err = 0;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+
-+	print_entry_location();
-+
-+	inode = (inode_t *) mapping->host;
-+	hidden_inode = itohi(inode);
-+
-+	if (hidden_inode->i_mapping->a_ops->bmap)
-+		err = hidden_inode->i_mapping->a_ops->bmap(hidden_inode->i_mapping, block);
-+	print_exit_location();
-+	return err;
-+}
-+
-+
-+/*
-+ * This function is copied verbatim from mm/filemap.c.
-+ * XXX: It should be simply moved to some header file instead -- bug Al about it!
-+ */
-+static inline int sync_page(struct page *page)
-+{
-+	struct address_space *mapping = page->mapping;
-+
-+	if (mapping && mapping->a_ops && mapping->a_ops->sync_page)
-+		return mapping->a_ops->sync_page(page);
-+	return 0;
-+}
-+
-+
-+/*
-+ * XXX: we may not need this function if not FIST_FILTER_DATA.
-+ * FIXME: for FIST_FILTER_SCA, get all lower pages and sync them each.
-+ */
-+STATIC int
-+mini_fo_sync_page(page_t *page)
-+{
-+	int err = 0;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	page_t *hidden_page;
-+
-+	print_entry_location();
-+
-+	inode = page->mapping->host; /* CPW: Moved below print_entry_location */
-+	hidden_inode = itohi(inode);
-+
-+	/* find lower page (returns a locked page) */
-+	hidden_page = grab_cache_page(hidden_inode->i_mapping, page->index);
-+	if (!hidden_page)
-+		goto out;
-+
-+	err = sync_page(hidden_page);
-+
-+	UnlockPage(hidden_page);	/* b/c grab_cache_page locked it */
-+	page_cache_release(hidden_page); /* b/c grab_cache_page increased refcnt */
-+
-+ out:
-+	print_exit_status(err);
-+	return err;
-+}
---- /dev/null
-+++ b/fs/mini_fo/README
-@@ -0,0 +1,163 @@
-+README for the mini_fo overlay file system
-+=========================================
-+
-+
-+WHAT IS MINI_FO?
-+----------------
-+
-+mini_fo is a virtual kernel file system that can make read-only
-+file systems writable. This is done by redirecting modifying operations
-+to a writeable location called "storage directory", and leaving the
-+original data in the "base directory" untouched. When reading, the
-+file system merges the modifed and original data so that only the
-+newest versions will appear. This occurs transparently to the user,
-+who can access the data like on any other read-write file system.
-+
-+Base and storage directories may be located on the same or on
-+different partitions and may be of different file system types. While
-+the storage directory obviously needs to be writable, the base may or
-+may not be writable, what doesn't matter as it will no be modified
-+anyway.
-+
-+
-+WHAT IS GOOD FOR?
-+-----------------
-+
-+The primary purpose of the mini_fo file system is to allow easy
-+software updates to embedded systems, that often store their root
-+file system in a read-only flash file system, but there are many
-+more as for example sandboxing, or for allowing live-cds to
-+permanently store information.
-+
-+
-+BUILDING
-+--------
-+This should be simple. Adjust the Makefile to point to the correct
-+kernel headers you want to build the module for. Then:
-+
-+    # make
-+
-+should build "mini_fo.o" for a 2.4 kernel or "mini_fo.ko" for a 2.6
-+kernel.
-+
-+If you are building the module for you current kernel, you can install
-+the module (as root):
-+
-+    # make install
-+
-+or uninstall with
-+
-+    # make uninstall
-+
-+
-+USING THE FILE SYSTEM
-+--------------------
-+
-+the general mount syntax is:
-+
-+   mount -t mini_fo -o base=<base directory>,sto=<storage directory>\
-+                            <base directory> <mount point>
-+
-+Example:
-+
-+You have mounted a cdrom to /mnt/cdrom and want to modifiy some files
-+on it:
-+
-+load the module (as root)
-+
-+    # insmod mini_fo.o for a 2.4 kernel or
-+
-+    # insmod mini_fo.ko for a 2.6 kernel
-+
-+
-+create a storage dir in tmp and a mountpoint for mini_fo:
-+
-+    # mkdir /tmp/sto
-+    # mkdir /mnt/mini_fo
-+
-+and mount the mini_fo file system:
-+
-+    # mount -t mini_fo -o base=/mnt/cdrom,sto=/tmp/sto /mnt/cdrom /mnt/mini_fo
-+
-+
-+Now the data stored on the cd can be accessed via the mini_fo
-+mountpoint just like any read-write file system, files can be modified
-+and deleted, new ones can be created and so on. When done unmount the
-+file system:
-+
-+    # unmount /mnt/mini_fo
-+
-+Note that if the file system is mounted again using the same storage
-+file system, of course it will appear in the modified state again. If
-+you remount it using an new empty storage directory, it will be
-+unmodified. Therefore by executing:
-+
-+    # cd /tmp/sto
-+    # rm -rf *
-+
-+you can nuke all the changes you made to the original file system. But
-+ remember NEVER do this while the mini_fo file system is mounted!
-+
-+
-+Alternatively you can use the mini_fo-overlay bash script, that
-+simplifies managing mini_fo mounts. See TOOLS Section.
-+
-+
-+TOOLS
-+-----
-+
-+mini_fo-merge (experimental):
-+
-+This is a bash script that will merge changes contained in the storage
-+directory back to the base directory. This allows mini_fo to function
-+as a cache file system by overlaying a slow (network, ...) file system
-+and using a fast (ramdisk, ...) as storage. When done, changes can be
-+merged back to the (slow) base with mini_fo-merge. See "mini_fo-merge
-+-h" for details.
-+
-+It can be usefull for merging changes back after a successfull test
-+(patches, software updates...)
-+
-+
-+mini_fo-overlay:
-+
-+This bash script simplifies managing one or more mini_fo mounts. For
-+overlaying a directory called "basedir1", you can just call:
-+
-+    # mini_fo-overlay basedir1
-+
-+This will mount mini_fo with "basedir1" as base, "/tmp/sto-basedir1/"
-+as storage to "/mnt/mini_fo-basedir1/". It has more options though,
-+type "mini_fo-overlay -h" for details.
-+
-+
-+DOCUMENTATION, REPORTING BUGS, GETTING HELP
-+-------------------------------------------
-+
-+Please visit the mini_fo project page at:
-+
-+http://www.denx.de/twiki/bin/view/Know/MiniFOHome
-+
-+
-+WARNINGS
-+--------
-+
-+Never modify the base or the storage directorys while the mini_fo
-+file system is mounted, or you might crash you system. Simply accessing
-+and reading should not cause any trouble.
-+
-+Exporting a mini_fo mount point via NFS has not been tested, and may
-+or may not work.
-+
-+Check the RELEASE_NOTES for details on bugs and features.
-+
-+
-+
-+Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+
-+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.
-+
-+
---- /dev/null
-+++ b/fs/mini_fo/RELEASE_NOTES
-@@ -0,0 +1,111 @@
-+Release:	mini_fo-0.6.1 (v0-6-1)
-+Date:		21.09.2005
-+
-+
-+Changes:
-+--------
-+v0-6-1:
-+
-+- bugfixes (see ChangeLog)
-+
-+- two helper scripts "mini_fo_merge" and "mini_fo_overlay" (see
-+  README for details).
-+
-+v0-6-0:
-+
-+- Support for 2.4 and 2.6 (see Makefile)
-+
-+- Partial hard link support (creating works as expected, but already
-+  existing links in the base file system will be treated as if they
-+  were individual files).
-+
-+- Various bugfixes and cleanups.
-+
-+
-+v0-6-0-pre1:
-+
-+- This is mini_fo-0-6-0-pre1! This release is a complete rewrite of
-+  many vital mini_fo parts such as the old whiteout list code which
-+  has been replaced by the new META subsystem.
-+
-+- Light weight directory renaming implemented. This means if a
-+  directory is renamed via the mini_fo filesystem this will no longer
-+  result in a complete copy in storage, instead only one empty
-+  directory will be created. All base filed contained in the original
-+  directory stay there until modified.
-+
-+- Special files (creating, renaming, deleting etc.) now working.
-+
-+- Many bugfixes and cleanup, mini_fo is now a lot more stable.
-+
-+
-+v0-5-10:
-+
-+- Final release of the 0-5-* versions. Next will be a complete rewrite
-+  of many features. This release contains several bugfixes related to
-+  directory renaming.
-+
-+
-+v0-5-10-pre6:
-+
-+- Lots of cleanup and several bugfixes related to directory deleting
-+
-+- Directory renaming suddenly works, what is most likely due to the
-+  fact tha that "mv" is smart: if the classic rename doesn't work it
-+  will assume that source and target file are on different fs and will
-+  copy the directory and try to remove the source directory. Until
-+  directory removing wasn't implemented, it would fail to do this and
-+  rollback.
-+  So, directory renaming works for now, but it doesn't yet do what you
-+  would expect from a overlay fs, so use with care.
-+
-+
-+v0-5-10-pre5:
-+
-+- implemented directory deleting
-+- made parsing of mount options more stable
-+- New format of mount options! (See README)
-+- I can't reproduce the unknown panic with 2.4.25 anymore, so I'll
-+  happily assume it never existed!
-+
-+
-+Implemented features:
-+---------------------
-+
-+- creating hard links (see BUGS on already existing hard links)
-+- lightweight directory renaming
-+- renaming device files, pipes, sockets, etc.
-+- creating, renaming, deleting of special files
-+- deleting directorys
-+- general directory reading (simple "ls" )
-+- creating files in existing directorys
-+- creating directorys
-+- renaming files.
-+- reading and writing files (involves opening)
-+- appending to files (creates copy in storage)
-+- deleting files
-+- llseek works too, what allows editors to work
-+- persistency (a deleted file stay deleted over remounts)
-+- use of symbolic links
-+- creating of device files
-+
-+
-+Not (yet) implemented features:
-+-------------------------------
-+
-+- full hard link support.
-+
-+
-+
-+BUGS:
-+-----
-+
-+Hard links in the base file system will be treated as individual
-+files, not as links to one inode.
-+
-+The main problem with hard links isn't allowing to create them, but
-+their pure existence. If you modify a base hard link, the changes made
-+will only show up on this link, the other link will remain in the
-+original state. I hope to fix this someday. Please note that this does
-+not effect the special hard links '.' and '..', that are handled
-+seperately by the lower fs.
---- /dev/null
-+++ b/fs/mini_fo/state.c
-@@ -0,0 +1,620 @@
-+/*
-+ * Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+
-+/* create the storage file, setup new states */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+int create_sto_reg_file(dentry_t *dentry, int mode, struct nameidata *nd)
-+#else
-+int create_sto_reg_file(dentry_t *dentry, int mode)
-+#endif
-+{
-+	int err = 0;
-+	inode_t *dir;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	if(exists_in_storage(dentry)) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: wrong type or state.\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if (err) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: ERROR getting neg. sto dentry.\n");
-+		goto out;
-+	}
-+
-+	dir = dentry->d_parent->d_inode;
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* lock parent */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+        down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+        if (IS_ERR(hidden_sto_dir_dentry))
-+                goto out;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+			 hidden_sto_dentry,
-+			 mode, nd);
-+#else
-+	err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+			 hidden_sto_dentry,
-+			 mode);
-+#endif
-+        if(err) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: ERROR creating sto file.\n");
-+                goto out_lock;
-+	}
-+
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: ERROR creating sto file [2].\n");
-+                err = -EINVAL;
-+                goto out_lock;
-+        }
-+
-+        /* interpose the new inode */
-+        if(dtost(dentry) == DELETED) {
-+                dtost(dentry) = DEL_REWRITTEN;
-+                err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        }
-+        else if(dtost(dentry) == NON_EXISTANT) {
-+                dtost(dentry) = CREATED;
-+                err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        }
-+        else if(dtost(dentry) == UNMODIFIED) {
-+                dtost(dentry) = MODIFIED;
-+                /* interpose on new inode */
-+                if(itohi2(dentry->d_inode) != NULL) {
-+                        printk(KERN_CRIT "mini_fo: create_sto_file: invalid inode detected.\n");
-+                        err = -EINVAL;
-+                        goto out_lock;
-+                }
-+                itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	}
-+	fist_copy_attr_timesizes(dentry->d_parent->d_inode,
-+				 hidden_sto_dir_dentry->d_inode);
-+
-+ out_lock:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+        dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+/* create the sto dir, setup states */
-+int create_sto_dir(dentry_t *dentry, int mode)
-+{
-+	int err = 0;
-+	inode_t *dir;
-+	dentry_t *hidden_sto_dentry;
-+        dentry_t *hidden_sto_dir_dentry;
-+
-+	/* had to take the "!S_ISDIR(mode))" check out, because it failed */
-+	if(exists_in_storage(dentry)) {
-+                printk(KERN_CRIT "mini_fo: create_sto_dir: wrong type or state.\\
-+n");
-+                err = -EINVAL;
-+                goto out;
-+        }
-+
-+	err = get_neg_sto_dentry(dentry);
-+	if(err) {
-+		err = -EINVAL;
-+		goto out;
-+	}
-+
-+	dir = dentry->d_parent->d_inode;
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+	if (IS_ERR(hidden_sto_dir_dentry))
-+		goto out;
-+
-+	err = vfs_mkdir(hidden_sto_dir_dentry->d_inode,
-+			hidden_sto_dentry,
-+			mode);
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo: create_sto_dir: ERROR creating sto dir.\n");
-+		goto out_lock;
-+	}
-+
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: create_sto_dir: ERROR creating sto dir [2].\n");
-+		err = -EINVAL;
-+		goto out_lock;
-+	}
-+
-+	/* interpose the new inode */
-+	if(dtost(dentry) == DELETED) {
-+		dtost(dentry) = DEL_REWRITTEN;
-+		err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtopd(dentry)->state == NON_EXISTANT) {
-+		dtopd(dentry)->state = CREATED;
-+		err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtopd(dentry)->state == UNMODIFIED) {
-+		dtopd(dentry)->state = MODIFIED;
-+		/* interpose on new inode */
-+		if(itohi2(dentry->d_inode) != NULL) {
-+			printk(KERN_CRIT "mini_fo:  create_sto_dir: ERROR, invalid inode detected.\n");
-+			err = -EINVAL;
-+			goto out_lock;
-+		}
-+		itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	}
-+
-+	fist_copy_attr_timesizes(dir, hidden_sto_dir_dentry->d_inode);
-+
-+	/* initalize the wol list */
-+	itopd(dentry->d_inode)->deleted_list_size = -1;
-+	itopd(dentry->d_inode)->renamed_list_size = -1;
-+	meta_build_lists(dentry);
-+
-+
-+ out_lock:
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+int create_sto_nod(dentry_t *dentry, int mode, dev_t dev)
-+#else
-+int create_sto_nod(dentry_t *dentry, int mode, int dev)
-+#endif
-+{
-+	int err = 0;
-+	inode_t *dir;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	if(exists_in_storage(dentry)) {
-+		err = -EEXIST;
-+		goto out;
-+	}
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if (err) {
-+                printk(KERN_CRIT "mini_fo: create_sto_nod: ERROR getting neg. sto dentry.\n");
-+                goto out;
-+        }
-+
-+	dir = dentry->d_parent->d_inode;
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* lock parent */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+	if (IS_ERR(hidden_sto_dir_dentry))
-+		goto out;
-+
-+	err = vfs_mknod(hidden_sto_dir_dentry->d_inode, hidden_sto_dentry, mode, dev);
-+	if(err)
-+		goto out_lock;
-+
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: create_sto_nod: creating storage inode failed [1].\n");
-+		err = -EINVAL; /* return something indicating failure */
-+		goto out_lock;
-+	}
-+
-+	/* interpose the new inode */
-+	if(dtost(dentry) == DELETED) {
-+		dtost(dentry) = DEL_REWRITTEN;
-+		err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtost(dentry) == NON_EXISTANT) {
-+		dtost(dentry) = CREATED;
-+		err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtost(dentry) == UNMODIFIED) {
-+		dtost(dentry) = MODIFIED;
-+		/* interpose on new inode */
-+		if(itohi2(dentry->d_inode) != NULL) {
-+			printk(KERN_CRIT "mini_fo: create_sto_nod: error, invalid inode detected.\n");
-+			err = -EINVAL;
-+			goto out_lock;
-+		}
-+		itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	}
-+
-+	fist_copy_attr_timesizes(dir, hidden_sto_dir_dentry->d_inode);
-+
-+ out_lock:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+
-+/* unimplemented (and possibly not usefull):
-+
-+   nondir-del_to_del_rew
-+   nondir-non_exist_to_creat
-+
-+   dir-unmod_to_del
-+   dir-mod_to_del
-+   dir-creat_to_del
-+   dir-del_rew_to_del
-+   dir-del_to_del_rew
-+   dir-non_exist_to_creat
-+*/
-+
-+
-+/* bring a file of any type from state UNMODIFIED to MODIFIED */
-+int nondir_unmod_to_mod(dentry_t *dentry, int cp_flag)
-+{
-+	int err = 0;
-+	struct vfsmount *tgt_mnt;
-+	struct vfsmount *src_mnt;
-+	dentry_t *tgt_dentry;
-+	dentry_t *src_dentry;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if((dtost(dentry) != UNMODIFIED) ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if (err) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  ERROR getting neg. sto dentry.\n");
-+		goto out;
-+	}
-+
-+	/* create sto file */
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* lock parent */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+        down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+        if (IS_ERR(hidden_sto_dir_dentry))
-+                goto out;
-+
-+	/* handle different types of nondirs */
-+	if(S_ISCHR(dentry->d_inode->i_mode) ||
-+	   S_ISBLK(dentry->d_inode->i_mode)) {
-+		err = vfs_mknod(hidden_sto_dir_dentry->d_inode,
-+				hidden_sto_dentry,
-+				dtohd(dentry)->d_inode->i_mode,
-+				dtohd(dentry)->d_inode->i_rdev);
-+	}
-+
-+	else if(S_ISREG(dentry->d_inode->i_mode)) {
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+				 hidden_sto_dentry,
-+				 dtohd(dentry)->d_inode->i_mode, NULL);
-+#else
-+		err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+				 hidden_sto_dentry,
-+				 dtohd(dentry)->d_inode->i_mode);
-+#endif
-+	}
-+        if(err) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  ERROR creating sto file.\n");
-+                goto out_lock;
-+	}
-+
-+	/* interpose on new inode */
-+	if(itohi2(dentry->d_inode) != NULL) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  ERROR, invalid inode detected.\n");
-+		err = -EINVAL;
-+		goto out_lock;
-+	}
-+
-+	itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+
-+        fist_copy_attr_timesizes(dentry->d_parent->d_inode,
-+				 hidden_sto_dir_dentry->d_inode);
-+	dtost(dentry) = MODIFIED;
-+
-+	/* copy contents if regular file and cp_flag = 1 */
-+	if((cp_flag == 1) && S_ISREG(dentry->d_inode->i_mode)) {
-+
-+		/* unlock first */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		dput(hidden_sto_dir_dentry);
-+
-+		tgt_dentry = dtohd2(dentry);
-+		tgt_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+		src_dentry = dtohd(dentry);
-+		src_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt;
-+
-+		err = mini_fo_cp_cont(tgt_dentry, tgt_mnt,
-+				      src_dentry, src_mnt);
-+		if(err) {
-+			printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                          ERROR copying contents.\n");
-+		}
-+		goto out;
-+	}
-+
-+ out_lock:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+        dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+/* this function is currently identical to nondir_creat_to_del */
-+int nondir_del_rew_to_del(dentry_t *dentry)
-+{
-+	return nondir_creat_to_del(dentry);
-+}
-+
-+int nondir_creat_to_del(dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	inode_t *hidden_sto_dir_inode;
-+	dentry_t *hidden_sto_dir_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	/* for now this function serves for both state DEL_REWRITTEN and
-+	 * CREATED */
-+	if(!(dtost(dentry) == CREATED || (dtost(dentry) == DEL_REWRITTEN)) ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_mod_to_del/del_rew_to_del: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	hidden_sto_dir_inode = itohi2(dentry->d_parent->d_inode);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	/* avoid destroying the hidden inode if the file is in use */
-+	dget(hidden_sto_dentry);
-+	err = vfs_unlink(hidden_sto_dir_inode, hidden_sto_dentry);
-+	dput(hidden_sto_dentry);
-+	if(!err)
-+		d_delete(hidden_sto_dentry);
-+
-+	/* propagate number of hard-links */
-+	dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+
-+	dtost(dentry) = NON_EXISTANT;
-+
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+int nondir_mod_to_del(dentry_t *dentry)
-+{
-+	int err;
-+	dentry_t *hidden_sto_dentry;
-+	inode_t *hidden_sto_dir_inode;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) != MODIFIED ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_mod_to_del: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	hidden_sto_dir_inode = itohi2(dentry->d_parent->d_inode);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* was hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	/* avoid destroying the hidden inode if the file is in use */
-+	dget(hidden_sto_dentry);
-+	err = vfs_unlink(hidden_sto_dir_inode, hidden_sto_dentry);
-+	dput(hidden_sto_dentry);
-+	if(!err)
-+		d_delete(hidden_sto_dentry);
-+
-+	/* propagate number of hard-links */
-+	dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+
-+	/* dput base dentry, this will relase the inode and free the
-+	 * dentry, as we will never need it again. */
-+	dput(dtohd(dentry));
-+	dtohd(dentry) = NULL;
-+	dtost(dentry) = DELETED;
-+
-+	/* add deleted file to META-file */
-+	meta_add_d_entry(dentry->d_parent,
-+			 dentry->d_name.name,
-+			 dentry->d_name.len);
-+
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+int nondir_unmod_to_del(dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) != UNMODIFIED ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_del: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	 /* next we have to get a negative dentry for the storage file */
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if(err)
-+		goto out;
-+
-+	/* add deleted file to META lists */
-+	err = meta_add_d_entry(dentry->d_parent,
-+			       dentry->d_name.name,
-+			       dentry->d_name.len);
-+
-+	if(err)
-+		goto out;
-+
-+	/* dput base dentry, this will relase the inode and free the
-+	 * dentry, as we will never need it again. */
-+	dput(dtohd(dentry));
-+	dtohd(dentry) = NULL;
-+	dtost(dentry) = DELETED;
-+
-+ out:
-+	return err;
-+}
-+
-+/* bring a dir from state UNMODIFIED to MODIFIED */
-+int dir_unmod_to_mod(dentry_t *dentry)
-+{
-+	int err;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) != UNMODIFIED ||
-+	   !S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: dir_unmod_to_mod: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* this creates our dir incl. sto. structure */
-+	err = build_sto_structure(dentry->d_parent, dentry);
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo: dir_unmod_to_mod: \
-+                                  build_sto_structure failed.\n");
-+		goto out;
-+	}
-+ out:
-+	return err;
-+}
-+
---- /dev/null
-+++ b/fs/mini_fo/super.c
-@@ -0,0 +1,281 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+
-+STATIC void
-+mini_fo_read_inode(inode_t *inode)
-+{
-+	static struct address_space_operations mini_fo_empty_aops;
-+
-+	__itopd(inode) = kmalloc(sizeof(struct mini_fo_inode_info), GFP_KERNEL);
-+	if (!itopd(inode)) {
-+		printk("<0>%s:%s:%d: No kernel memory!\n", __FILE__, __FUNCTION__, __LINE__);
-+		ASSERT(NULL);
-+	}
-+	itohi(inode) = NULL;
-+	itohi2(inode) = NULL;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	inode->i_version++;
-+#else
-+	inode->i_version = ++event;	/* increment inode version */
-+#endif
-+	inode->i_op = &mini_fo_main_iops;
-+	inode->i_fop = &mini_fo_main_fops;
-+#if 0
-+	/*
-+	 * XXX: To export a file system via NFS, it has to have the
-+	 * FS_REQUIRES_DEV flag, so turn it on.  But should we inherit it from
-+	 * the lower file system, or can we allow our file system to be exported
-+	 * even if the lower one cannot be natively exported.
-+	 */
-+	inode->i_sb->s_type->fs_flags |= FS_REQUIRES_DEV;
-+	/*
-+	 * OK, the above was a hack, which is now turned off because it may
-+	 * cause a panic/oops on some systems.  The correct way to export a
-+	 * "nodev" filesystem is via using nfs-utils > 1.0 and the "fsid=" export
-+	 * parameter, which requires 2.4.20 or later.
-+	 */
-+#endif
-+	/* I don't think ->a_ops is ever allowed to be NULL */
-+	inode->i_mapping->a_ops = &mini_fo_empty_aops;
-+}
-+
-+
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+/*
-+ * No need to call write_inode() on the lower inode, as it
-+ * will have been marked 'dirty' anyway. But we might need
-+ * to write some of our own stuff to disk.
-+ */
-+STATIC void
-+mini_fo_write_inode(inode_t *inode, int sync)
-+{
-+	print_entry_location();
-+	print_exit_location();
-+}
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+
-+
-+STATIC void
-+mini_fo_put_inode(inode_t *inode)
-+{
-+	/*
-+	 * This is really funky stuff:
-+	 * Basically, if i_count == 1, iput will then decrement it and this inode will be destroyed.
-+	 * It is currently holding a reference to the hidden inode.
-+	 * Therefore, it needs to release that reference by calling iput on the hidden inode.
-+	 * iput() _will_ do it for us (by calling our clear_inode), but _only_ if i_nlink == 0.
-+	 * The problem is, NFS keeps i_nlink == 1 for silly_rename'd files.
-+	 * So we must for our i_nlink to 0 here to trick iput() into calling our clear_inode.
-+	 */
-+	if (atomic_read(&inode->i_count) == 1)
-+		inode->i_nlink = 0;
-+}
-+
-+
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+/*
-+ * we now define delete_inode, because there are two VFS paths that may
-+ * destroy an inode: one of them calls clear inode before doing everything
-+ * else that's needed, and the other is fine.  This way we truncate the inode
-+ * size (and its pages) and then clear our own inode, which will do an iput
-+ * on our and the lower inode.
-+ */
-+STATIC void
-+mini_fo_delete_inode(inode_t *inode)
-+{
-+	print_entry_location();
-+
-+	fist_checkinode(inode, "mini_fo_delete_inode IN");
-+	inode->i_size = 0;		/* every f/s seems to do that */
-+	clear_inode(inode);
-+
-+	print_exit_location();
-+}
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+
-+
-+/* final actions when unmounting a file system */
-+STATIC void
-+mini_fo_put_super(super_block_t *sb)
-+{
-+	if (stopd(sb)) {
-+		mntput(stopd(sb)->hidden_mnt);
-+		mntput(stopd(sb)->hidden_mnt2);
-+
-+		/* mk: no! dput(stopd(sb)->base_dir_dentry);
-+		   dput(stopd(sb)->storage_dir_dentry); */
-+
-+		kfree(stopd(sb));
-+		__stopd(sb) = NULL;
-+	}
-+}
-+
-+
-+#ifdef NOT_NEEDED
-+/*
-+ * This is called in do_umount before put_super.
-+ * The superblock lock is not held yet.
-+ * We probably do not need to define this or call write_super
-+ * on the hidden_sb, because sync_supers() will get to hidden_sb
-+ * sooner or later.  But it is also called from file_fsync()...
-+ */
-+STATIC void
-+mini_fo_write_super(super_block_t *sb)
-+{
-+	return;
-+}
-+#endif /* NOT_NEEDED */
-+
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_statfs(struct dentry *d, struct kstatfs *buf)
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_statfs(super_block_t *sb, struct kstatfs *buf)
-+#else
-+mini_fo_statfs(super_block_t *sb, struct statfs *buf)
-+#endif
-+{
-+	int err = 0;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+	struct dentry *hidden_d;
-+
-+	hidden_d = dtohd(d);
-+	err = vfs_statfs(hidden_d, buf);
-+#else
-+	super_block_t *hidden_sb;
-+
-+	hidden_sb = stohs(sb);
-+	err = vfs_statfs(hidden_sb, buf);
-+#endif
-+
-+	return err;
-+}
-+
-+
-+/*
-+ * XXX: not implemented.  This is not allowed yet.
-+ * Should we call this on the hidden_sb?  Probably not.
-+ */
-+STATIC int
-+mini_fo_remount_fs(super_block_t *sb, int *flags, char *data)
-+{
-+	//printk(KERN_CRIT "mini_fo_remount_fs: WARNING, this function is umimplemented.\n");
-+	return -ENOSYS;
-+}
-+
-+
-+/*
-+ * Called by iput() when the inode reference count reached zero
-+ * and the inode is not hashed anywhere.  Used to clear anything
-+ * that needs to be, before the inode is completely destroyed and put
-+ * on the inode free list.
-+ */
-+STATIC void
-+mini_fo_clear_inode(inode_t *inode)
-+{
-+	/*
-+	 * Decrement a reference to a hidden_inode, which was incremented
-+	 * by our read_inode when it was created initially.
-+	 */
-+
-+	/* release the wol_list */
-+	if(S_ISDIR(inode->i_mode)) {
-+		__meta_put_lists(inode);
-+	}
-+
-+	/* mk: fan out fun */
-+	if(itohi(inode))
-+		iput(itohi(inode));
-+	if(itohi2(inode))
-+		iput(itohi2(inode));
-+
-+	// XXX: why this assertion fails?
-+	// because it doesn't like us
-+	// ASSERT((inode->i_state & I_DIRTY) == 0);
-+	kfree(itopd(inode));
-+	__itopd(inode) = NULL;
-+}
-+
-+
-+/*
-+ * Called in do_umount() if the MNT_FORCE flag was used and this
-+ * function is defined.  See comment in linux/fs/super.c:do_umount().
-+ * Used only in nfs, to kill any pending RPC tasks, so that subsequent
-+ * code can actually succeed and won't leave tasks that need handling.
-+ *
-+ * PS. I wonder if this is somehow useful to undo damage that was
-+ * left in the kernel after a user level file server (such as amd)
-+ * dies.
-+ */
-+STATIC void
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_umount_begin(struct vfsmount *mnt, int flags)
-+{
-+	struct vfsmount *hidden_mnt;
-+
-+	hidden_mnt = stopd(mnt->mnt_sb)->hidden_mnt;
-+
-+	if (hidden_mnt->mnt_sb->s_op->umount_begin)
-+		hidden_mnt->mnt_sb->s_op->umount_begin(hidden_mnt, flags);
-+
-+}
-+#else
-+mini_fo_umount_begin(super_block_t *sb)
-+{
-+	super_block_t *hidden_sb;
-+
-+	hidden_sb = stohs(sb);
-+
-+	if (hidden_sb->s_op->umount_begin)
-+		hidden_sb->s_op->umount_begin(hidden_sb);
-+
-+}
-+#endif
-+
-+
-+struct super_operations mini_fo_sops =
-+{
-+	read_inode:		mini_fo_read_inode,
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+	write_inode:	mini_fo_write_inode,
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+	put_inode:		mini_fo_put_inode,
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+	delete_inode:	mini_fo_delete_inode,
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+	put_super:		mini_fo_put_super,
-+	statfs:		mini_fo_statfs,
-+	remount_fs:		mini_fo_remount_fs,
-+	clear_inode:	mini_fo_clear_inode,
-+	umount_begin:	mini_fo_umount_begin,
-+};
---- /dev/null
-+++ b/fs/mini_fo/Kconfig
-@@ -0,0 +1,3 @@
-+config MINI_FO
-+	tristate "Mini fanout overlay filesystem"
-+
diff --git a/target/linux/generic-2.6/patches-2.6.31/210-mini_fo_2.6.25_fixes.patch b/target/linux/generic-2.6/patches-2.6.31/210-mini_fo_2.6.25_fixes.patch
deleted file mode 100644
index d71e3b6fa..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/210-mini_fo_2.6.25_fixes.patch
+++ /dev/null
@@ -1,143 +0,0 @@
---- a/fs/mini_fo/main.c
-+++ b/fs/mini_fo/main.c
-@@ -79,6 +79,7 @@ mini_fo_tri_interpose(dentry_t *hidden_d
- 	 * of the new inode's fields
- 	 */
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
- 	/*
- 	 * original: inode = iget(sb, hidden_inode->i_ino);
- 	 */
-@@ -87,6 +88,13 @@ mini_fo_tri_interpose(dentry_t *hidden_d
- 		err = -EACCES;		/* should be impossible??? */
- 		goto out;
- 	}
-+#else
-+	inode = mini_fo_iget(sb, iunique(sb, 25));
-+	if (IS_ERR(inode)) {
-+		err = PTR_ERR(inode);
-+		goto out;
-+	}
-+#endif
- 
- 	/*
- 	 * interpose the inode if not already interposed
-@@ -184,9 +192,9 @@ mini_fo_parse_options(super_block_t *sb,
- 				hidden_root = ERR_PTR(err);
- 				goto out;
- 			}
--			hidden_root = nd.dentry;
--			stopd(sb)->base_dir_dentry = nd.dentry;
--			stopd(sb)->hidden_mnt = nd.mnt;
-+			hidden_root = nd_get_dentry(&nd);
-+			stopd(sb)->base_dir_dentry = nd_get_dentry(&nd);
-+			stopd(sb)->hidden_mnt = nd_get_mnt(&nd);
- 
- 		} else if(!strncmp("sto=", options, 4)) {
- 			/* parse the storage dir */
-@@ -204,9 +212,9 @@ mini_fo_parse_options(super_block_t *sb,
- 				hidden_root2 = ERR_PTR(err);
- 				goto out;
- 			}
--			hidden_root2 = nd2.dentry;
--			stopd(sb)->storage_dir_dentry = nd2.dentry;
--			stopd(sb)->hidden_mnt2 = nd2.mnt;
-+			hidden_root2 = nd_get_dentry(&nd2);
-+			stopd(sb)->storage_dir_dentry = nd_get_dentry(&nd2);
-+			stopd(sb)->hidden_mnt2 = nd_get_mnt(&nd2);
- 			stohs2(sb) = hidden_root2->d_sb;
- 
- 			/* validate storage dir, this is done in
---- a/fs/mini_fo/mini_fo.h
-+++ b/fs/mini_fo/mini_fo.h
-@@ -302,6 +302,10 @@ extern int mini_fo_tri_interpose(dentry_
- extern int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
- 			   dentry_t *src_dentry, struct vfsmount *src_mnt);
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
-+extern struct inode *mini_fo_iget(struct super_block *sb, unsigned long ino);
-+#endif
-+
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
- 
-@@ -501,6 +505,29 @@ static inline void double_unlock(struct 
- #endif  /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
- #endif /* __KERNEL__ */
- 
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
-+static inline dentry_t *nd_get_dentry(struct nameidata *nd)
-+{
-+	return (nd->path.dentry);
-+}
-+
-+static inline struct vfsmount *nd_get_mnt(struct nameidata *nd)
-+{
-+	return (nd->path.mnt);
-+}
-+#else
-+static inline dentry_t *nd_get_dentry(struct nameidata *nd)
-+{
-+	return (nd->dentry);
-+}
-+
-+static inline struct vfsmount *nd_get_mnt(struct nameidata *nd)
-+{
-+	return (nd->mnt);
-+}
-+#endif
-+
- /*
-  * Definitions for user and kernel code
-  */
---- a/fs/mini_fo/super.c
-+++ b/fs/mini_fo/super.c
-@@ -262,10 +262,31 @@ mini_fo_umount_begin(super_block_t *sb)
- }
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
-+struct inode *
-+mini_fo_iget(struct super_block *sb, unsigned long ino)
-+{
-+	struct inode *inode;
-+
-+	inode = iget_locked(sb, ino);
-+	if (!inode)
-+		return ERR_PTR(-ENOMEM);
-+
-+	if (!(inode->i_state & I_NEW))
-+		return inode;
-+
-+	mini_fo_read_inode(inode);
-+
-+	unlock_new_inode(inode);
-+	return inode;
-+}
-+#endif /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25) */
- 
- struct super_operations mini_fo_sops =
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
- 	read_inode:		mini_fo_read_inode,
-+#endif
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
- 	write_inode:	mini_fo_write_inode,
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
---- a/fs/mini_fo/aux.c
-+++ b/fs/mini_fo/aux.c
-@@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb, 
- 	err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
- 
- 	/* validate */
--	if (err || !nd.dentry || !nd.dentry->d_inode) {
-+	if (err || !nd_get_dentry(&nd) || !nd_get_dentry(&nd)->d_inode) {
- 		printk(KERN_CRIT "mini_fo: bpath_walk: path_walk failed.\n");
- 		return NULL;
- 	}
--	return nd.dentry;
-+	return nd_get_dentry(&nd);
- }
- 
- 
diff --git a/target/linux/generic-2.6/patches-2.6.31/211-mini_fo_2.6.25_dentry_open_war.patch b/target/linux/generic-2.6/patches-2.6.31/211-mini_fo_2.6.25_dentry_open_war.patch
deleted file mode 100644
index 48a19429b..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/211-mini_fo_2.6.25_dentry_open_war.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- a/fs/mini_fo/meta.c
-+++ b/fs/mini_fo/meta.c
-@@ -442,6 +442,11 @@ int meta_write_d_entry(dentry_t *dentry,
- 			   S_IRUSR | S_IWUSR);
- #endif
- 	}
-+
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-@@ -535,6 +540,11 @@ int meta_write_r_entry(dentry_t *dentry,
- 			   meta_dentry, S_IRUSR | S_IWUSR);
- #endif
- 	}
-+
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-@@ -671,14 +681,16 @@ int meta_sync_d_list(dentry_t *dentry, i
- 		}
- 	}
- 
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-                                   ERROR opening meta file.\n");
--		/* we don't mntget so we dont't mntput (for now)
--		 * mntput(meta_mnt);
--		 */
-+		mntput(meta_mnt);
- 		dput(meta_dentry);
- 		err = -1;
-                 goto out;
-@@ -811,14 +823,16 @@ int meta_sync_r_list(dentry_t *dentry, i
- 		}
- 	}
- 
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-                                   ERROR opening meta file.\n");
--		/* we don't mntget so we dont't mntput (for now)
--		 * mntput(meta_mnt);
--		 */
-+		mntput(meta_mnt);
- 		dput(meta_dentry);
- 		err = -1;
-                 goto out;
diff --git a/target/linux/generic-2.6/patches-2.6.31/212-mini_fo_2.6.26_fixes.patch b/target/linux/generic-2.6/patches-2.6.31/212-mini_fo_2.6.26_fixes.patch
deleted file mode 100644
index 8bd9ba324..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/212-mini_fo_2.6.26_fixes.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/fs/mini_fo/super.c
-+++ b/fs/mini_fo/super.c
-@@ -84,6 +84,7 @@ mini_fo_write_inode(inode_t *inode, int 
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
- 
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
- STATIC void
- mini_fo_put_inode(inode_t *inode)
- {
-@@ -99,6 +100,7 @@ mini_fo_put_inode(inode_t *inode)
- 	if (atomic_read(&inode->i_count) == 1)
- 		inode->i_nlink = 0;
- }
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */
- 
- 
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-@@ -238,7 +240,7 @@ mini_fo_clear_inode(inode_t *inode)
-  * dies.
-  */
- STATIC void
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26))
- mini_fo_umount_begin(struct vfsmount *mnt, int flags)
- {
- 	struct vfsmount *hidden_mnt;
-@@ -290,7 +292,9 @@ struct super_operations mini_fo_sops =
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
- 	write_inode:	mini_fo_write_inode,
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
- 	put_inode:		mini_fo_put_inode,
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
- 	delete_inode:	mini_fo_delete_inode,
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
diff --git a/target/linux/generic-2.6/patches-2.6.31/213-mini_fo_2.6.27_fixes.patch b/target/linux/generic-2.6/patches-2.6.31/213-mini_fo_2.6.27_fixes.patch
deleted file mode 100644
index f92c18b25..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/213-mini_fo_2.6.27_fixes.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/fs/mini_fo/inode.c
-+++ b/fs/mini_fo/inode.c
-@@ -439,7 +439,7 @@ mini_fo_symlink(inode_t *dir, dentry_t *
- 	int err=0;
- 	dentry_t *hidden_sto_dentry;
- 	dentry_t *hidden_sto_dir_dentry;
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
-         umode_t mode;
- #endif
- 
-@@ -466,7 +466,7 @@ mini_fo_symlink(inode_t *dir, dentry_t *
- 	down(&hidden_sto_dir_dentry->d_inode->i_sem);
- #endif
- 
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
- 	mode = S_IALLUGO;
- 	err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
- 			  hidden_sto_dentry, symname, mode);
-@@ -1128,7 +1128,7 @@ void mini_fo_put_link(struct dentry *den
- #endif
- 
- STATIC int
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
- mini_fo_permission(inode_t *inode, int mask, struct nameidata *nd)
- #else
- mini_fo_permission(inode_t *inode, int mask)
-@@ -1150,8 +1150,9 @@ mini_fo_permission(inode_t *inode, int m
- 	 *	if (err)
- 	 *		goto out;
- 	 */
--
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
-+	err = inode_permission(hidden_inode, mask);
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- 	err = permission(hidden_inode, mask, nd);
- #else
- 	err = permission(hidden_inode, mask);
diff --git a/target/linux/generic-2.6/patches-2.6.31/214-mini_fo_2.6.29.patch b/target/linux/generic-2.6/patches-2.6.31/214-mini_fo_2.6.29.patch
deleted file mode 100644
index 63d704bf5..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/214-mini_fo_2.6.29.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- a/fs/mini_fo/aux.c
-+++ b/fs/mini_fo/aux.c
-@@ -236,7 +236,7 @@ int mini_fo_cp_cont(dentry_t *tgt_dentry
- 	mntget(src_mnt);
- 
- 	/* open file write only */
--	tgt_file = dentry_open(tgt_dentry, tgt_mnt, 0x1);
-+	tgt_file = dentry_open(tgt_dentry, tgt_mnt, 0x1, current_cred());
- 	if(!tgt_file || IS_ERR(tgt_file)) {
- 		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening target file.\n");
- 		err = PTR_ERR(tgt_file);
-@@ -244,7 +244,7 @@ int mini_fo_cp_cont(dentry_t *tgt_dentry
- 	}
- 
- 	/* open file read only */
--	src_file = dentry_open(src_dentry, src_mnt, 0x0);
-+	src_file = dentry_open(src_dentry, src_mnt, 0x0, current_cred());
- 	if(!src_file || IS_ERR(src_file)) {
- 		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening source file.\n");
- 		err = PTR_ERR(src_file);
---- a/fs/mini_fo/file.c
-+++ b/fs/mini_fo/file.c
-@@ -437,7 +437,7 @@ mini_fo_open(inode_t *inode, file_t *fil
- 			mntget(stopd(inode->i_sb)->hidden_mnt);
- 			hidden_file = dentry_open(hidden_dentry,
- 						  stopd(inode->i_sb)->hidden_mnt,
--						  hidden_flags);
-+						  hidden_flags, file->f_cred);
- 			if (IS_ERR(hidden_file)) {
- 				err = PTR_ERR(hidden_file);
- 				dput(hidden_dentry);
-@@ -479,7 +479,7 @@ mini_fo_open(inode_t *inode, file_t *fil
- 			mntget(stopd(inode->i_sb)->hidden_mnt);
- 			hidden_file = dentry_open(hidden_dentry,
- 						  stopd(inode->i_sb)->hidden_mnt,
--						  hidden_flags);
-+						  hidden_flags, file->f_cred);
- 			if (IS_ERR(hidden_file)) {
- 				err = PTR_ERR(hidden_file);
- 				dput(hidden_dentry);
-@@ -512,7 +512,7 @@ mini_fo_open(inode_t *inode, file_t *fil
- 	mntget(stopd(inode->i_sb)->hidden_mnt2);
- 	hidden_sto_file = dentry_open(hidden_sto_dentry,
- 				      stopd(inode->i_sb)->hidden_mnt2,
--				      hidden_flags);
-+				      hidden_flags, file->f_cred);
- 
- 	/* dentry_open dputs the dentry if it fails */
- 	if (IS_ERR(hidden_sto_file)) {
---- a/fs/mini_fo/meta.c
-+++ b/fs/mini_fo/meta.c
-@@ -56,7 +56,7 @@ int meta_build_lists(dentry_t *dentry)
- 
- 
- 		/* open META-file for reading */
--		meta_file = dentry_open(meta_dentry, meta_mnt, 0x0);
-+		meta_file = dentry_open(meta_dentry, meta_mnt, 0x0, current_cred());
- 		if(!meta_file || IS_ERR(meta_file)) {
- 			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-                                           ERROR opening META file.\n");
-@@ -448,7 +448,7 @@ int meta_write_d_entry(dentry_t *dentry,
- 	mntget(meta_mnt);
- 
-         /* open META-file for writing */
--        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-                                   ERROR opening meta file.\n");
-@@ -546,7 +546,7 @@ int meta_write_r_entry(dentry_t *dentry,
- 	mntget(meta_mnt);
- 
-         /* open META-file for writing */
--        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-                                   ERROR opening meta file.\n");
-@@ -686,7 +686,7 @@ int meta_sync_d_list(dentry_t *dentry, i
- 	mntget(meta_mnt);
- 
-         /* open META-file for writing */
--        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-                                   ERROR opening meta file.\n");
-@@ -828,7 +828,7 @@ int meta_sync_r_list(dentry_t *dentry, i
- 	mntget(meta_mnt);
- 
-         /* open META-file for writing */
--        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-                                   ERROR opening meta file.\n");
diff --git a/target/linux/generic-2.6/patches-2.6.31/215-mini_fo_2.6.30.patch b/target/linux/generic-2.6/patches-2.6.31/215-mini_fo_2.6.30.patch
deleted file mode 100644
index 2d2092061..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/215-mini_fo_2.6.30.patch
+++ /dev/null
@@ -1,157 +0,0 @@
---- a/fs/mini_fo/aux.c
-+++ b/fs/mini_fo/aux.c
-@@ -86,8 +86,10 @@ int get_neg_sto_dentry(dentry_t *dentry)
- 	len = dentry->d_name.len;
- 	name = dentry->d_name.name;
- 
-+	mutex_lock(&dtohd2(dentry->d_parent)->d_inode->i_mutex);
- 	dtohd2(dentry) =
- 		lookup_one_len(name, dtohd2(dentry->d_parent), len);
-+	mutex_unlock(&dtohd2(dentry->d_parent)->d_inode->i_mutex);
- 
-  out:
- 	return err;
-@@ -426,7 +428,9 @@ int build_sto_structure(dentry_t *dir, d
- 		const unsigned char *name;
- 		len = dtohd(dentry)->d_name.len;
- 		name = dtohd(dentry)->d_name.name;
-+		mutex_lock(&dtohd2(dir)->d_inode->i_mutex);
- 		hidden_sto_dentry = lookup_one_len(name, dtohd2(dir), len);
-+		mutex_unlock(&dtohd2(dir)->d_inode->i_mutex);
- 		dtohd2(dentry) = hidden_sto_dentry;
- 	}
- 
---- a/fs/mini_fo/inode.c
-+++ b/fs/mini_fo/inode.c
-@@ -113,17 +113,23 @@ mini_fo_lookup(inode_t *dir, dentry_t *d
- 		hidden_dir_dentry = hidden_dentry->d_parent;
- 		kfree(bpath);
- 	}
--	else if(hidden_dir_dentry && hidden_dir_dentry->d_inode)
-+	else if(hidden_dir_dentry && hidden_dir_dentry->d_inode) {
-+		mutex_lock(&hidden_dir_dentry->d_inode->i_mutex);
- 		hidden_dentry =
- 			lookup_one_len(name, hidden_dir_dentry, namelen);
--	else
-+		mutex_unlock(&hidden_dir_dentry->d_inode->i_mutex);
-+	} else {
- 		hidden_dentry = NULL;
-+	}
- 
--	if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode)
-+	if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode) {
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
- 		hidden_sto_dentry =
- 			lookup_one_len(name, hidden_sto_dir_dentry, namelen);
--	else
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+	} else {
- 		hidden_sto_dentry =  NULL;
-+	}
- 
- 	/* catch error in lookup */
- 	if (IS_ERR(hidden_dentry) || IS_ERR(hidden_sto_dentry)) {
-@@ -553,9 +559,11 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
- #endif
- 
- 		/* Delete an old WOL file contained in the storage dir */
-+		mutex_lock(&hidden_sto_dentry->d_inode->i_mutex);
- 		meta_dentry = lookup_one_len(META_FILENAME,
- 					     hidden_sto_dentry,
- 					     strlen(META_FILENAME));
-+		mutex_unlock(&hidden_sto_dentry->d_inode->i_mutex);
- 		if(meta_dentry->d_inode) {
- 			err = vfs_unlink(hidden_sto_dentry->d_inode, meta_dentry);
- 			dput(meta_dentry);
-@@ -643,9 +651,11 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
- #endif
- 
- 		/* Delete an old WOL file contained in the storage dir */
-+		mutex_lock(&hidden_sto_dentry->d_inode->i_mutex);
- 		meta_dentry = lookup_one_len(META_FILENAME,
- 					     hidden_sto_dentry,
- 					     strlen(META_FILENAME));
-+		mutex_unlock(&hidden_sto_dentry->d_inode->i_mutex);
- 		if(meta_dentry->d_inode) {
- 			/* is this necessary? dget(meta_dentry); */
- 			err = vfs_unlink(hidden_sto_dentry->d_inode,
-@@ -688,9 +698,11 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
- #endif
- 
- 		/* Delete an old WOL file contained in the storage dir */
-+		mutex_lock(&hidden_sto_dentry->d_inode->i_mutex);
- 		meta_dentry = lookup_one_len(META_FILENAME,
- 					     hidden_sto_dentry,
- 					     strlen(META_FILENAME));
-+		mutex_unlock(&hidden_sto_dentry->d_inode->i_mutex);
- 		if(meta_dentry->d_inode) {
- 			/* is this necessary? dget(meta_dentry); */
- 			err = vfs_unlink(hidden_sto_dentry->d_inode,
---- a/fs/mini_fo/meta.c
-+++ b/fs/mini_fo/meta.c
-@@ -43,9 +43,11 @@ int meta_build_lists(dentry_t *dentry)
- 
-   	/* might there be a META-file? */
- 	if(dtohd2(dentry) && dtohd2(dentry)->d_inode) {
-+		mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 		meta_dentry = lookup_one_len(META_FILENAME,
- 					     dtohd2(dentry),
- 					     strlen(META_FILENAME));
-+		mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
- 		if(!meta_dentry->d_inode) {
- 			dput(meta_dentry);
- 			goto out_ok;
-@@ -426,8 +428,11 @@ int meta_write_d_entry(dentry_t *dentry,
- 			goto out;
-                 }
-         }
-+
-+	mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 	meta_dentry = lookup_one_len(META_FILENAME,
- 				     dtohd2(dentry), strlen (META_FILENAME));
-+	mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
- 
- 	/* We need to create a META-file */
-         if(!meta_dentry->d_inode) {
-@@ -527,9 +532,13 @@ int meta_write_r_entry(dentry_t *dentry,
- 			goto out;
-                 }
-         }
-+
-+	mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 	meta_dentry = lookup_one_len(META_FILENAME,
- 				     dtohd2(dentry),
- 				     strlen (META_FILENAME));
-+	mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
-+
-         if(!meta_dentry->d_inode) {
-                 /* We need to create a META-file */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-@@ -641,9 +650,13 @@ int meta_sync_d_list(dentry_t *dentry, i
- 			goto out;
-                 }
-         }
-+
-+	mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 	meta_dentry = lookup_one_len(META_FILENAME,
- 				     dtohd2(dentry),
- 				     strlen(META_FILENAME));
-+	mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
-+
-         if(!meta_dentry->d_inode) {
-                 /* We need to create a META-file */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-@@ -784,9 +797,13 @@ int meta_sync_r_list(dentry_t *dentry, i
- 			goto out;
-                 }
-         }
-+
-+	mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 	meta_dentry = lookup_one_len(META_FILENAME,
- 				     dtohd2(dentry),
- 				     strlen(META_FILENAME));
-+	mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
-+
-         if(!meta_dentry->d_inode) {
-                 /* We need to create a META-file */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
diff --git a/target/linux/generic-2.6/patches-2.6.31/216-mini_fo_locking.patch b/target/linux/generic-2.6/patches-2.6.31/216-mini_fo_locking.patch
deleted file mode 100644
index 4f075920f..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/216-mini_fo_locking.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/fs/mini_fo/state.c
-+++ b/fs/mini_fo/state.c
-@@ -537,17 +537,17 @@ int nondir_mod_to_del(dentry_t *dentry)
- 	dtohd(dentry) = NULL;
- 	dtost(dentry) = DELETED;
- 
--	/* add deleted file to META-file */
--	meta_add_d_entry(dentry->d_parent,
--			 dentry->d_name.name,
--			 dentry->d_name.len);
--
- 	/* was: unlock_dir(hidden_sto_dir_dentry); */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
- 	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
- #else
- 	up(&hidden_sto_dir_dentry->d_inode->i_sem);
- #endif
-+	/* add deleted file to META-file */
-+	meta_add_d_entry(dentry->d_parent,
-+			 dentry->d_name.name,
-+			 dentry->d_name.len);
-+
- 	dput(hidden_sto_dir_dentry);
- 
-  out:
diff --git a/target/linux/generic-2.6/patches-2.6.31/219-kobject_uevent.patch b/target/linux/generic-2.6/patches-2.6.31/219-kobject_uevent.patch
deleted file mode 100644
index 7e00b224c..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/219-kobject_uevent.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/lib/kobject_uevent.c
-+++ b/lib/kobject_uevent.c
-@@ -29,7 +29,8 @@ u64 uevent_seqnum;
- char uevent_helper[UEVENT_HELPER_PATH_LEN] = CONFIG_UEVENT_HELPER_PATH;
- static DEFINE_SPINLOCK(sequence_lock);
- #if defined(CONFIG_NET)
--static struct sock *uevent_sock;
-+struct sock *uevent_sock = NULL;
-+EXPORT_SYMBOL_GPL(uevent_sock);
- #endif
- 
- /* the strings here must match the enum in include/linux/kobject.h */
-@@ -42,6 +43,18 @@ static const char *kobject_actions[] = {
- 	[KOBJ_OFFLINE] =	"offline",
- };
- 
-+u64 uevent_next_seqnum(void)
-+{
-+	u64 seq;
-+
-+	spin_lock(&sequence_lock);
-+	seq = ++uevent_seqnum;
-+	spin_unlock(&sequence_lock);
-+
-+	return seq;
-+}
-+EXPORT_SYMBOL_GPL(uevent_next_seqnum);
-+
- /**
-  * kobject_action_type - translate action string to numeric type
-  *
-@@ -201,9 +214,7 @@ int kobject_uevent_env(struct kobject *k
- 		kobj->state_remove_uevent_sent = 1;
- 
- 	/* we will send an event, so request a new sequence number */
--	spin_lock(&sequence_lock);
--	seq = ++uevent_seqnum;
--	spin_unlock(&sequence_lock);
-+	seq = uevent_next_seqnum();
- 	retval = add_uevent_var(env, "SEQNUM=%llu", (unsigned long long)seq);
- 	if (retval)
- 		goto exit;
diff --git a/target/linux/generic-2.6/patches-2.6.31/220-sound_kconfig.patch b/target/linux/generic-2.6/patches-2.6.31/220-sound_kconfig.patch
deleted file mode 100644
index f374009a6..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/220-sound_kconfig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/sound/core/Kconfig
-+++ b/sound/core/Kconfig
-@@ -7,7 +7,7 @@ config SND_PCM
- 	select SND_TIMER
- 
- config SND_HWDEP
--	tristate
-+	tristate "Sound hardware support"
- 
- config SND_RAWMIDI
- 	tristate
diff --git a/target/linux/generic-2.6/patches-2.6.31/221-binfmt_elf_gcc4.1.patch b/target/linux/generic-2.6/patches-2.6.31/221-binfmt_elf_gcc4.1.patch
deleted file mode 100644
index fa891e0f3..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/221-binfmt_elf_gcc4.1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/fs/binfmt_elf.c
-+++ b/fs/binfmt_elf.c
-@@ -1193,7 +1193,7 @@ static unsigned long vma_dump_size(struc
- 	if (FILTER(ELF_HEADERS) &&
- 	    vma->vm_pgoff == 0 && (vma->vm_flags & VM_READ)) {
- 		u32 __user *header = (u32 __user *) vma->vm_start;
--		u32 word;
-+		u32 word = 0;
- 		mm_segment_t fs = get_fs();
- 		/*
- 		 * Doing it this way gets the constant folded by GCC.
diff --git a/target/linux/generic-2.6/patches-2.6.31/222-partial_eraseblock_write.patch b/target/linux/generic-2.6/patches-2.6.31/222-partial_eraseblock_write.patch
deleted file mode 100644
index d3234f004..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/222-partial_eraseblock_write.patch
+++ /dev/null
@@ -1,146 +0,0 @@
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -21,6 +21,8 @@
- #include <linux/root_dev.h>
- #include <linux/magic.h>
- 
-+#define MTD_ERASE_PARTIAL	0x8000 /* partition only covers parts of an erase block */
-+
- /* Our partition linked list */
- static LIST_HEAD(mtd_partitions);
- 
-@@ -226,13 +228,60 @@ static int part_erase(struct mtd_info *m
- 		return -EROFS;
- 	if (instr->addr >= mtd->size)
- 		return -EINVAL;
-+
-+	instr->partial_start = false;
-+	if (mtd->flags & MTD_ERASE_PARTIAL) {
-+		size_t readlen = 0;
-+		u64 mtd_ofs;
-+
-+		instr->erase_buf = kmalloc(part->master->erasesize, GFP_ATOMIC);
-+		if (!instr->erase_buf)
-+			return -ENOMEM;
-+
-+		mtd_ofs = part->offset + instr->addr;
-+		instr->erase_buf_ofs = do_div(mtd_ofs, part->master->erasesize);
-+
-+		if (instr->erase_buf_ofs > 0) {
-+			instr->addr -= instr->erase_buf_ofs;
-+			ret = part->master->read(part->master,
-+				instr->addr + part->offset,
-+				part->master->erasesize,
-+				&readlen, instr->erase_buf);
-+
-+			instr->partial_start = true;
-+		} else {
-+			mtd_ofs = part->offset + part->mtd.size;
-+			instr->erase_buf_ofs = part->master->erasesize -
-+				do_div(mtd_ofs, part->master->erasesize);
-+
-+			if (instr->erase_buf_ofs > 0) {
-+				instr->len += instr->erase_buf_ofs;
-+				ret = part->master->read(part->master,
-+					part->offset + instr->addr +
-+					instr->len - part->master->erasesize,
-+					part->master->erasesize, &readlen,
-+					instr->erase_buf);
-+			} else {
-+				ret = 0;
-+			}
-+		}
-+		if (ret < 0) {
-+			kfree(instr->erase_buf);
-+			return ret;
-+		}
-+
-+	}
-+
- 	instr->addr += part->offset;
- 	ret = part->master->erase(part->master, instr);
- 	if (ret) {
- 		if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
- 			instr->fail_addr -= part->offset;
- 		instr->addr -= part->offset;
-+		if (mtd->flags & MTD_ERASE_PARTIAL)
-+			kfree(instr->erase_buf);
- 	}
-+
- 	return ret;
- }
- 
-@@ -240,7 +289,25 @@ void mtd_erase_callback(struct erase_inf
- {
- 	if (instr->mtd->erase == part_erase) {
- 		struct mtd_part *part = PART(instr->mtd);
-+		size_t wrlen = 0;
- 
-+		if (instr->mtd->flags & MTD_ERASE_PARTIAL) {
-+			if (instr->partial_start) {
-+				part->master->write(part->master,
-+					instr->addr, instr->erase_buf_ofs,
-+					&wrlen, instr->erase_buf);
-+				instr->addr += instr->erase_buf_ofs;
-+			} else {
-+				instr->len -= instr->erase_buf_ofs;
-+				part->master->write(part->master,
-+					instr->addr + instr->len,
-+					instr->erase_buf_ofs, &wrlen,
-+					instr->erase_buf +
-+					part->master->erasesize -
-+					instr->erase_buf_ofs);
-+			}
-+			kfree(instr->erase_buf);
-+		}
- 		if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
- 			instr->fail_addr -= part->offset;
- 		instr->addr -= part->offset;
-@@ -472,18 +539,24 @@ static struct mtd_part *add_one_partitio
- 	if ((slave->mtd.flags & MTD_WRITEABLE) &&
- 	    mtd_mod_by_eb(slave->offset, &slave->mtd)) {
- 		/* Doesn't start on a boundary of major erase size */
--		/* FIXME: Let it be writable if it is on a boundary of
--		 * _minor_ erase size though */
--		slave->mtd.flags &= ~MTD_WRITEABLE;
--		printk(KERN_WARNING"mtd: partition \"%s\" doesn't start on an erase block boundary -- force read-only\n",
--			part->name);
-+		slave->mtd.flags |= MTD_ERASE_PARTIAL;
-+		if (((u32) slave->mtd.size) > master->erasesize)
-+			slave->mtd.flags &= ~MTD_WRITEABLE;
-+		else
-+			slave->mtd.erasesize = slave->mtd.size;
- 	}
- 	if ((slave->mtd.flags & MTD_WRITEABLE) &&
--	    mtd_mod_by_eb(slave->mtd.size, &slave->mtd)) {
--		slave->mtd.flags &= ~MTD_WRITEABLE;
--		printk(KERN_WARNING"mtd: partition \"%s\" doesn't end on an erase block -- force read-only\n",
--			part->name);
--	}
-+	    mtd_mod_by_eb(slave->offset + slave->mtd.size, &slave->mtd)) {
-+		slave->mtd.flags |= MTD_ERASE_PARTIAL;
-+
-+		if ((u32) slave->mtd.size > master->erasesize)
-+			slave->mtd.flags &= ~MTD_WRITEABLE;
-+		else
-+			slave->mtd.erasesize = slave->mtd.size;
-+	}
-+	if ((slave->mtd.flags & (MTD_ERASE_PARTIAL|MTD_WRITEABLE)) == MTD_ERASE_PARTIAL)
-+		printk(KERN_WARNING"mtd: partition \"%s\" must either start or end on erase block boundary or be smaller than an erase block -- forcing read-only\n",
-+				part->name);
- 
- 	slave->mtd.ecclayout = master->ecclayout;
- 	if (master->block_isbad) {
---- a/include/linux/mtd/mtd.h
-+++ b/include/linux/mtd/mtd.h
-@@ -46,6 +46,10 @@ struct erase_info {
- 	u_long priv;
- 	u_char state;
- 	struct erase_info *next;
-+
-+	u8 *erase_buf;
-+	u32 erase_buf_ofs;
-+	bool partial_start;
- };
- 
- struct mtd_erase_region_info {
diff --git a/target/linux/generic-2.6/patches-2.6.31/240-packet_socket_type.patch b/target/linux/generic-2.6/patches-2.6.31/240-packet_socket_type.patch
deleted file mode 100644
index 92553de0f..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/240-packet_socket_type.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-This patch allows the user to specify desired packet types (outgoing,
-broadcast, unicast, etc.) on packet sockets via setsockopt.
-This can reduce the load in situations where only a limited number
-of packet types are necessary
-
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-
---- a/include/linux/if_packet.h
-+++ b/include/linux/if_packet.h
-@@ -31,6 +31,8 @@ struct sockaddr_ll
- /* These ones are invisible by user level */
- #define PACKET_LOOPBACK		5		/* MC/BRD frame looped back */
- #define PACKET_FASTROUTE	6		/* Fastrouted frame	*/
-+#define PACKET_MASK_ANY		0xffffffff	/* mask for packet type bits */
-+
- 
- /* Packet socket options */
- 
-@@ -48,6 +50,7 @@ struct sockaddr_ll
- #define PACKET_RESERVE			12
- #define PACKET_TX_RING			13
- #define PACKET_LOSS			14
-+#define PACKET_RECV_TYPE		15
- 
- struct tpacket_stats
- {
---- a/net/packet/af_packet.c
-+++ b/net/packet/af_packet.c
-@@ -206,6 +206,7 @@ struct packet_sock {
- 	unsigned int		tp_reserve;
- 	unsigned int		tp_loss:1;
- #endif
-+	unsigned int		pkt_type;
- };
- 
- struct packet_skb_cb {
-@@ -343,6 +344,7 @@ static int packet_rcv_spkt(struct sk_buf
- {
- 	struct sock *sk;
- 	struct sockaddr_pkt *spkt;
-+	struct packet_sock *po;
- 
- 	/*
- 	 *	When we registered the protocol we saved the socket in the data
-@@ -350,6 +352,7 @@ static int packet_rcv_spkt(struct sk_buf
- 	 */
- 
- 	sk = pt->af_packet_priv;
-+	po = pkt_sk(sk);
- 
- 	/*
- 	 *	Yank back the headers [hope the device set this
-@@ -362,7 +365,7 @@ static int packet_rcv_spkt(struct sk_buf
- 	 *	so that this procedure is noop.
- 	 */
- 
--	if (skb->pkt_type == PACKET_LOOPBACK)
-+	if (!(po->pkt_type & (1 << skb->pkt_type)))
- 		goto out;
- 
- 	if (dev_net(dev) != sock_net(sk))
-@@ -546,12 +549,12 @@ static int packet_rcv(struct sk_buff *sk
- 	int skb_len = skb->len;
- 	unsigned int snaplen, res;
- 
--	if (skb->pkt_type == PACKET_LOOPBACK)
--		goto drop;
--
- 	sk = pt->af_packet_priv;
- 	po = pkt_sk(sk);
- 
-+	if (!(po->pkt_type & (1 << skb->pkt_type)))
-+		goto drop;
-+
- 	if (dev_net(dev) != sock_net(sk))
- 		goto drop;
- 
-@@ -667,12 +670,12 @@ static int tpacket_rcv(struct sk_buff *s
- 	struct timeval tv;
- 	struct timespec ts;
- 
--	if (skb->pkt_type == PACKET_LOOPBACK)
--		goto drop;
--
- 	sk = pt->af_packet_priv;
- 	po = pkt_sk(sk);
- 
-+	if (!(po->pkt_type & (1 << skb->pkt_type)))
-+		goto drop;
-+
- 	if (dev_net(dev) != sock_net(sk))
- 		goto drop;
- 
-@@ -1387,6 +1390,7 @@ static int packet_create(struct net *net
- 	spin_lock_init(&po->bind_lock);
- 	mutex_init(&po->pg_vec_lock);
- 	po->prot_hook.func = packet_rcv;
-+	po->pkt_type = PACKET_MASK_ANY & ~(1 << PACKET_LOOPBACK);
- 
- 	if (sock->type == SOCK_PACKET)
- 		po->prot_hook.func = packet_rcv_spkt;
-@@ -1733,6 +1737,16 @@ packet_setsockopt(struct socket *sock, i
- 			ret = packet_mc_drop(sk, &mreq);
- 		return ret;
- 	}
-+	case PACKET_RECV_TYPE:
-+	{
-+		unsigned int val;
-+		if (optlen != sizeof(val))
-+			return -EINVAL;
-+		if (copy_from_user(&val, optval, sizeof(val)))
-+			return -EFAULT;
-+		po->pkt_type = val & ~PACKET_LOOPBACK;
-+		return 0;
-+	}
- 
- #ifdef CONFIG_PACKET_MMAP
- 	case PACKET_RX_RING:
-@@ -1878,6 +1892,13 @@ static int packet_getsockopt(struct sock
- 
- 		data = &val;
- 		break;
-+	case PACKET_RECV_TYPE:
-+		if (len > sizeof(unsigned int))
-+			len = sizeof(unsigned int);
-+		val = po->pkt_type;
-+
-+		data = &val;
-+		break;
- #ifdef CONFIG_PACKET_MMAP
- 	case PACKET_VERSION:
- 		if (len > sizeof(int))
diff --git a/target/linux/generic-2.6/patches-2.6.31/250-pppoe_header_pad.patch b/target/linux/generic-2.6/patches-2.6.31/250-pppoe_header_pad.patch
deleted file mode 100644
index 042546f31..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/250-pppoe_header_pad.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/drivers/net/pppoe.c
-+++ b/drivers/net/pppoe.c
-@@ -863,7 +863,7 @@ static int pppoe_sendmsg(struct kiocb *i
- 		goto end;
- 
- 
--	skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32,
-+	skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32 + NET_SKB_PAD,
- 			   0, GFP_KERNEL);
- 	if (!skb) {
- 		error = -ENOMEM;
-@@ -871,7 +871,7 @@ static int pppoe_sendmsg(struct kiocb *i
- 	}
- 
- 	/* Reserve space for headers. */
--	skb_reserve(skb, dev->hard_header_len);
-+	skb_reserve(skb, dev->hard_header_len + NET_SKB_PAD);
- 	skb_reset_network_header(skb);
- 
- 	skb->dev = dev;
diff --git a/target/linux/generic-2.6/patches-2.6.31/260-extend_pfifo_fast.patch b/target/linux/generic-2.6/patches-2.6.31/260-extend_pfifo_fast.patch
deleted file mode 100644
index f306e861f..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/260-extend_pfifo_fast.patch
+++ /dev/null
@@ -1,144 +0,0 @@
---- a/net/sched/sch_generic.c
-+++ b/net/sched/sch_generic.c
-@@ -391,16 +391,50 @@ static const u8 prio2band[TC_PRIO_MAX+1]
- 
- #define PFIFO_FAST_BANDS 3
- 
-+struct pfifo_fast_sched_data {
-+	struct tcf_proto *filter_list;
-+	struct sk_buff_head list[PFIFO_FAST_BANDS];
-+};
-+
- static inline struct sk_buff_head *prio2list(struct sk_buff *skb,
- 					     struct Qdisc *qdisc)
- {
--	struct sk_buff_head *list = qdisc_priv(qdisc);
-+	struct pfifo_fast_sched_data *q = qdisc_priv(qdisc);
-+	struct sk_buff_head *list = q->list;
- 	return list + prio2band[skb->priority & TC_PRIO_MAX];
- }
- 
-+static int pfifo_fast_filter(struct sk_buff *skb, struct Qdisc* qdisc)
-+{
-+#ifdef CONFIG_NET_CLS_ACT
-+	struct pfifo_fast_sched_data *q = qdisc_priv(qdisc);
-+	int result = 0, ret = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
-+	struct tcf_result res;
-+
-+	if (q->filter_list != NULL)
-+		result = tc_classify(skb, q->filter_list, &res);
-+	if (result >= 0) {
-+		switch (result) {
-+		case TC_ACT_STOLEN:
-+		case TC_ACT_QUEUED:
-+			ret = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
-+		case TC_ACT_SHOT:
-+			kfree_skb(skb);
-+			return ret;
-+		}
-+	}
-+#endif
-+	return 0;
-+}
-+
- static int pfifo_fast_enqueue(struct sk_buff *skb, struct Qdisc* qdisc)
- {
- 	struct sk_buff_head *list = prio2list(skb, qdisc);
-+	int ret;
-+
-+	ret = pfifo_fast_filter(skb, qdisc);
-+	if (ret)
-+		return ret;
- 
- 	if (skb_queue_len(list) < qdisc_dev(qdisc)->tx_queue_len) {
- 		qdisc->q.qlen++;
-@@ -412,8 +446,9 @@ static int pfifo_fast_enqueue(struct sk_
- 
- static struct sk_buff *pfifo_fast_dequeue(struct Qdisc* qdisc)
- {
-+	struct pfifo_fast_sched_data *q = qdisc_priv(qdisc);
-+	struct sk_buff_head *list = q->list;
- 	int prio;
--	struct sk_buff_head *list = qdisc_priv(qdisc);
- 
- 	for (prio = 0; prio < PFIFO_FAST_BANDS; prio++) {
- 		if (!skb_queue_empty(list + prio)) {
-@@ -440,8 +475,9 @@ static struct sk_buff *pfifo_fast_peek(s
- 
- static void pfifo_fast_reset(struct Qdisc* qdisc)
- {
-+	struct pfifo_fast_sched_data *q = qdisc_priv(qdisc);
-+	struct sk_buff_head *list = q->list;
- 	int prio;
--	struct sk_buff_head *list = qdisc_priv(qdisc);
- 
- 	for (prio = 0; prio < PFIFO_FAST_BANDS; prio++)
- 		__qdisc_reset_queue(qdisc, list + prio);
-@@ -464,8 +500,9 @@ nla_put_failure:
- 
- static int pfifo_fast_init(struct Qdisc *qdisc, struct nlattr *opt)
- {
-+	struct pfifo_fast_sched_data *q = qdisc_priv(qdisc);
-+	struct sk_buff_head *list = q->list;
- 	int prio;
--	struct sk_buff_head *list = qdisc_priv(qdisc);
- 
- 	for (prio = 0; prio < PFIFO_FAST_BANDS; prio++)
- 		skb_queue_head_init(list + prio);
-@@ -473,9 +510,36 @@ static int pfifo_fast_init(struct Qdisc 
- 	return 0;
- }
- 
-+static int pfifo_fast_change_class(struct Qdisc *qdisc, u32 classid, u32 parentid,
-+			    struct nlattr **tca, unsigned long *arg)
-+{
-+	return -EOPNOTSUPP;
-+}
-+
-+static unsigned long pfifo_fast_get(struct Qdisc *qdisc, u32 classid)
-+{
-+	return 0;
-+}
-+
-+static struct tcf_proto **pfifo_fast_find_tcf(struct Qdisc *qdisc, unsigned long cl)
-+{
-+	struct pfifo_fast_sched_data *q = qdisc_priv(qdisc);
-+
-+	if (cl)
-+		return NULL;
-+	return &q->filter_list;
-+}
-+
-+static const struct Qdisc_class_ops pfifo_fast_class_ops = {
-+	.get		=	pfifo_fast_get,
-+	.change		=	pfifo_fast_change_class,
-+	.tcf_chain	=	pfifo_fast_find_tcf,
-+};
-+
- static struct Qdisc_ops pfifo_fast_ops __read_mostly = {
- 	.id		=	"pfifo_fast",
--	.priv_size	=	PFIFO_FAST_BANDS * sizeof(struct sk_buff_head),
-+	.cl_ops		=	&pfifo_fast_class_ops,
-+	.priv_size	=	sizeof(struct pfifo_fast_sched_data),
- 	.enqueue	=	pfifo_fast_enqueue,
- 	.dequeue	=	pfifo_fast_dequeue,
- 	.peek		=	pfifo_fast_peek,
-@@ -757,3 +821,18 @@ void dev_shutdown(struct net_device *dev
- 	shutdown_scheduler_queue(dev, &dev->rx_queue, &noop_qdisc);
- 	WARN_ON(timer_pending(&dev->watchdog_timer));
- }
-+
-+#ifdef CONFIG_NET_SCHED
-+static int __init sch_generic_init(void)
-+{
-+	return register_qdisc(&pfifo_fast_ops);
-+}
-+
-+static void __exit sch_generic_exit(void)
-+{
-+	unregister_qdisc(&pfifo_fast_ops);
-+}
-+
-+module_init(sch_generic_init)
-+module_exit(sch_generic_exit)
-+#endif
diff --git a/target/linux/generic-2.6/patches-2.6.31/270-sched_bfs.patch b/target/linux/generic-2.6/patches-2.6.31/270-sched_bfs.patch
deleted file mode 100644
index 9f30674ef..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/270-sched_bfs.patch
+++ /dev/null
@@ -1,6448 +0,0 @@
-This patch adds support for bfs v230, modified for diff size reduction
-
---- a/Documentation/sysctl/kernel.txt
-+++ b/Documentation/sysctl/kernel.txt
-@@ -27,6 +27,7 @@ show up in /proc/sys/kernel:
- - domainname
- - hostname
- - hotplug
-+- iso_cpu
- - java-appletviewer           [ binfmt_java, obsolete ]
- - java-interpreter            [ binfmt_java, obsolete ]
- - kstack_depth_to_print       [ X86 only ]
-@@ -49,6 +50,7 @@ show up in /proc/sys/kernel:
- - randomize_va_space
- - real-root-dev               ==> Documentation/initrd.txt
- - reboot-cmd                  [ SPARC only ]
-+- rr_interval
- - rtsig-max
- - rtsig-nr
- - sem
-@@ -171,6 +173,16 @@ Default value is "/sbin/hotplug".
- 
- ==============================================================
- 
-+iso_cpu: (BFS only)
-+
-+This sets the percentage cpu that the unprivileged SCHED_ISO tasks can
-+run effectively at realtime priority, averaged over a rolling five
-+seconds over the -whole- system, meaning all cpus.
-+
-+Set to 70 (percent) by default.
-+
-+==============================================================
-+
- l2cr: (PPC only)
- 
- This flag controls the L2 cache of G3 processor boards. If
-@@ -333,6 +345,19 @@ rebooting. ???
- 
- ==============================================================
- 
-+rr_interval: (BFS only)
-+
-+This is the smallest duration that any cpu process scheduling unit
-+will run for. Increasing this value can increase throughput of cpu
-+bound tasks substantially but at the expense of increased latencies
-+overall. This value is in milliseconds and the default value chosen
-+depends on the number of cpus available at scheduler initialisation
-+with a minimum of 6.
-+
-+Valid values are from 1-5000.
-+
-+==============================================================
-+
- rtsig-max & rtsig-nr:
- 
- The file rtsig-max can be used to tune the maximum number
---- a/include/linux/init_task.h
-+++ b/include/linux/init_task.h
-@@ -116,9 +116,10 @@ extern struct cred init_cred;
- 	.usage		= ATOMIC_INIT(2),				\
- 	.flags		= PF_KTHREAD,					\
- 	.lock_depth	= -1,						\
--	.prio		= MAX_PRIO-20,					\
-+	.prio		= NORMAL_PRIO,					\
- 	.static_prio	= MAX_PRIO-20,					\
--	.normal_prio	= MAX_PRIO-20,					\
-+	.normal_prio	= NORMAL_PRIO,					\
-+	.deadline	= 0,						\
- 	.policy		= SCHED_NORMAL,					\
- 	.cpus_allowed	= CPU_MASK_ALL,					\
- 	.mm		= NULL,						\
---- a/include/linux/sched.h
-+++ b/include/linux/sched.h
-@@ -36,9 +36,12 @@
- #define SCHED_FIFO		1
- #define SCHED_RR		2
- #define SCHED_BATCH		3
--/* SCHED_ISO: reserved but not implemented yet */
-+#define SCHED_ISO		4
- #define SCHED_IDLE		5
- 
-+#define SCHED_MAX		(SCHED_IDLE)
-+#define SCHED_RANGE(policy)	((policy) <= SCHED_MAX)
-+
- #ifdef __KERNEL__
- 
- struct sched_param {
-@@ -1090,10 +1093,13 @@ struct sched_entity {
- 	struct load_weight	load;		/* for load-balancing */
- 	struct rb_node		run_node;
- 	struct list_head	group_node;
-+#ifdef CONFIG_SCHED_CFS
- 	unsigned int		on_rq;
- 
- 	u64			exec_start;
-+#endif
- 	u64			sum_exec_runtime;
-+#ifdef CONFIG_SCHED_CFS
- 	u64			vruntime;
- 	u64			prev_sum_exec_runtime;
- 
-@@ -1145,6 +1151,7 @@ struct sched_entity {
- 	/* rq "owned" by this entity/group: */
- 	struct cfs_rq		*my_q;
- #endif
-+#endif
- };
- 
- struct sched_rt_entity {
-@@ -1172,17 +1179,19 @@ struct task_struct {
- 
- 	int lock_depth;		/* BKL lock depth */
- 
--#ifdef CONFIG_SMP
--#ifdef __ARCH_WANT_UNLOCKED_CTXSW
- 	int oncpu;
--#endif
--#endif
--
- 	int prio, static_prio, normal_prio;
- 	unsigned int rt_priority;
- 	const struct sched_class *sched_class;
- 	struct sched_entity se;
- 	struct sched_rt_entity rt;
-+	unsigned long deadline;
-+#ifdef CONFIG_SCHED_BFS
-+	int load_weight;	/* for niceness load balancing purposes */
-+	int first_time_slice;
-+	unsigned long long timestamp, last_ran;
-+	unsigned long utime_pc, stime_pc;
-+#endif
- 
- #ifdef CONFIG_PREEMPT_NOTIFIERS
- 	/* list of struct preempt_notifier: */
-@@ -1205,6 +1214,9 @@ struct task_struct {
- 
- 	unsigned int policy;
- 	cpumask_t cpus_allowed;
-+#ifdef CONFIG_HOTPLUG_CPU
-+	cpumask_t unplugged_mask;
-+#endif
- 
- #ifdef CONFIG_PREEMPT_RCU
- 	int rcu_read_lock_nesting;
-@@ -1497,11 +1509,19 @@ struct task_struct {
-  * priority to a value higher than any user task. Note:
-  * MAX_RT_PRIO must not be smaller than MAX_USER_RT_PRIO.
-  */
--
-+#define PRIO_RANGE		(40)
- #define MAX_USER_RT_PRIO	100
- #define MAX_RT_PRIO		MAX_USER_RT_PRIO
--
-+#ifdef CONFIG_SCHED_BFS
-+#define MAX_PRIO		(MAX_RT_PRIO + PRIO_RANGE)
-+#define ISO_PRIO		(MAX_RT_PRIO)
-+#define NORMAL_PRIO		(MAX_RT_PRIO + 1)
-+#define IDLE_PRIO		(MAX_RT_PRIO + 2)
-+#define PRIO_LIMIT		((IDLE_PRIO) + 1)
-+#else
- #define MAX_PRIO		(MAX_RT_PRIO + 40)
-+#define NORMAL_PRIO	(MAX_RT_PRIO - 20)
-+#endif
- #define DEFAULT_PRIO		(MAX_RT_PRIO + 20)
- 
- static inline int rt_prio(int prio)
-@@ -1785,7 +1805,7 @@ task_sched_runtime(struct task_struct *t
- extern unsigned long long thread_group_sched_runtime(struct task_struct *task);
- 
- /* sched_exec is called by processes performing an exec */
--#ifdef CONFIG_SMP
-+#if defined(CONFIG_SMP) && defined(CONFIG_SCHED_CFS)
- extern void sched_exec(void);
- #else
- #define sched_exec()   {}
---- a/init/Kconfig
-+++ b/init/Kconfig
-@@ -451,9 +451,22 @@ config LOG_BUF_SHIFT
- config HAVE_UNSTABLE_SCHED_CLOCK
- 	bool
- 
-+choice
-+	prompt "Scheduler"
-+	default SCHED_CFS
-+
-+	config SCHED_CFS
-+		bool "CFS"
-+
-+	config SCHED_BFS
-+		bool "BFS"
-+
-+endchoice
-+
- config GROUP_SCHED
- 	bool "Group CPU scheduler"
- 	depends on EXPERIMENTAL
-+	depends on SCHED_CFS
- 	default n
- 	help
- 	  This feature lets CPU scheduler recognize task groups and control CPU
-@@ -504,6 +517,7 @@ endchoice
- 
- menuconfig CGROUPS
- 	boolean "Control Group support"
-+	depends on SCHED_CFS
- 	help
- 	  This option adds support for grouping sets of processes together, for
- 	  use with process control subsystems such as Cpusets, CFS, memory
---- a/kernel/Makefile
-+++ b/kernel/Makefile
-@@ -2,7 +2,7 @@
- # Makefile for the linux kernel.
- #
- 
--obj-y     = sched.o fork.o exec_domain.o panic.o printk.o \
-+obj-y     = $(if $(CONFIG_SCHED_CFS),sched.o,sched_bfs.o) fork.o exec_domain.o panic.o printk.o \
- 	    cpu.o exit.o itimer.o time.o softirq.o resource.o \
- 	    sysctl.o capability.o ptrace.o timer.o user.o \
- 	    signal.o sys.o kmod.o workqueue.o pid.o \
-@@ -108,6 +108,7 @@ ifneq ($(CONFIG_SCHED_OMIT_FRAME_POINTER
- # I turn this off for IA-64 only.  Andreas Schwab says it's also needed on m68k
- # to get a correct value for the wait-channel (WCHAN in ps). --davidm
- CFLAGS_sched.o := $(PROFILING) -fno-omit-frame-pointer
-+CFLAGS_sched_bfs.o := $(PROFILING) -fno-omit-frame-pointer
- endif
- 
- $(obj)/configs.o: $(obj)/config_data.h
---- a/kernel/kthread.c
-+++ b/kernel/kthread.c
-@@ -16,7 +16,11 @@
- #include <linux/mutex.h>
- #include <trace/events/sched.h>
- 
-+#ifdef CONFIG_SCHED_BFS
-+#define KTHREAD_NICE_LEVEL (0)
-+#else
- #define KTHREAD_NICE_LEVEL (-5)
-+#endif
- 
- static DEFINE_SPINLOCK(kthread_create_lock);
- static LIST_HEAD(kthread_create_list);
---- /dev/null
-+++ b/kernel/sched_bfs.c
-@@ -0,0 +1,6105 @@
-+/*
-+ *  kernel/sched_bfs.c, was sched.c
-+ *
-+ *  Kernel scheduler and related syscalls
-+ *
-+ *  Copyright (C) 1991-2002  Linus Torvalds
-+ *
-+ *  1996-12-23  Modified by Dave Grothe to fix bugs in semaphores and
-+ *		make semaphores SMP safe
-+ *  1998-11-19	Implemented schedule_timeout() and related stuff
-+ *		by Andrea Arcangeli
-+ *  2002-01-04	New ultra-scalable O(1) scheduler by Ingo Molnar:
-+ *		hybrid priority-list and round-robin design with
-+ *		an array-switch method of distributing timeslices
-+ *		and per-CPU runqueues.  Cleanups and useful suggestions
-+ *		by Davide Libenzi, preemptible kernel bits by Robert Love.
-+ *  2003-09-03	Interactivity tuning by Con Kolivas.
-+ *  2004-04-02	Scheduler domains code by Nick Piggin
-+ *  2007-04-15  Work begun on replacing all interactivity tuning with a
-+ *              fair scheduling design by Con Kolivas.
-+ *  2007-05-05  Load balancing (smp-nice) and other improvements
-+ *              by Peter Williams
-+ *  2007-05-06  Interactivity improvements to CFS by Mike Galbraith
-+ *  2007-07-01  Group scheduling enhancements by Srivatsa Vaddagiri
-+ *  2007-11-29  RT balancing improvements by Steven Rostedt, Gregory Haskins,
-+ *              Thomas Gleixner, Mike Kravetz
-+ *  now		Brainfuck deadline scheduling policy by Con Kolivas deletes
-+ *              a whole lot of those previous things.
-+ */
-+
-+#include <linux/mm.h>
-+#include <linux/module.h>
-+#include <linux/nmi.h>
-+#include <linux/init.h>
-+#include <asm/uaccess.h>
-+#include <linux/highmem.h>
-+#include <linux/smp_lock.h>
-+#include <asm/mmu_context.h>
-+#include <linux/interrupt.h>
-+#include <linux/capability.h>
-+#include <linux/completion.h>
-+#include <linux/kernel_stat.h>
-+#include <linux/debug_locks.h>
-+#include <linux/perf_counter.h>
-+#include <linux/security.h>
-+#include <linux/notifier.h>
-+#include <linux/profile.h>
-+#include <linux/freezer.h>
-+#include <linux/vmalloc.h>
-+#include <linux/blkdev.h>
-+#include <linux/delay.h>
-+#include <linux/smp.h>
-+#include <linux/threads.h>
-+#include <linux/timer.h>
-+#include <linux/rcupdate.h>
-+#include <linux/cpu.h>
-+#include <linux/cpuset.h>
-+#include <linux/cpumask.h>
-+#include <linux/percpu.h>
-+#include <linux/kthread.h>
-+#include <linux/proc_fs.h>
-+#include <linux/seq_file.h>
-+#include <linux/syscalls.h>
-+#include <linux/times.h>
-+#include <linux/tsacct_kern.h>
-+#include <linux/kprobes.h>
-+#include <linux/delayacct.h>
-+#include <linux/reciprocal_div.h>
-+#include <linux/log2.h>
-+#include <linux/bootmem.h>
-+#include <linux/ftrace.h>
-+
-+#include <asm/tlb.h>
-+#include <asm/unistd.h>
-+
-+#define CREATE_TRACE_POINTS
-+#include <trace/events/sched.h>
-+
-+#define rt_prio(prio)		unlikely((prio) < MAX_RT_PRIO)
-+#define rt_task(p)		rt_prio((p)->prio)
-+#define rt_queue(rq)		rt_prio((rq)->rq_prio)
-+#define batch_task(p)		(unlikely((p)->policy == SCHED_BATCH))
-+#define is_rt_policy(policy)	((policy) == SCHED_FIFO || \
-+					(policy) == SCHED_RR)
-+#define has_rt_policy(p)	unlikely(is_rt_policy((p)->policy))
-+#define idleprio_task(p)	unlikely((p)->policy == SCHED_IDLE)
-+#define iso_task(p)		unlikely((p)->policy == SCHED_ISO)
-+#define iso_queue(rq)		unlikely((rq)->rq_policy == SCHED_ISO)
-+#define ISO_PERIOD		((5 * HZ * num_online_cpus()) + 1)
-+
-+/*
-+ * Convert user-nice values [ -20 ... 0 ... 19 ]
-+ * to static priority [ MAX_RT_PRIO..MAX_PRIO-1 ],
-+ * and back.
-+ */
-+#define NICE_TO_PRIO(nice)	(MAX_RT_PRIO + (nice) + 20)
-+#define PRIO_TO_NICE(prio)	((prio) - MAX_RT_PRIO - 20)
-+#define TASK_NICE(p)		PRIO_TO_NICE((p)->static_prio)
-+
-+/*
-+ * 'User priority' is the nice value converted to something we
-+ * can work with better when scaling various scheduler parameters,
-+ * it's a [ 0 ... 39 ] range.
-+ */
-+#define USER_PRIO(p)		((p)-MAX_RT_PRIO)
-+#define TASK_USER_PRIO(p)	USER_PRIO((p)->static_prio)
-+#define MAX_USER_PRIO		(USER_PRIO(MAX_PRIO))
-+#define SCHED_PRIO(p)		((p)+MAX_RT_PRIO)
-+
-+/* Some helpers for converting to/from various scales.*/
-+#define JIFFIES_TO_NS(TIME)	((TIME) * (1000000000 / HZ))
-+#define MS_TO_NS(TIME)		((TIME) * 1000000)
-+#define MS_TO_US(TIME)		((TIME) * 1000)
-+
-+#ifdef CONFIG_SMP
-+/*
-+ * Divide a load by a sched group cpu_power : (load / sg->__cpu_power)
-+ * Since cpu_power is a 'constant', we can use a reciprocal divide.
-+ */
-+static inline u32 sg_div_cpu_power(const struct sched_group *sg, u32 load)
-+{
-+	return reciprocal_divide(load, sg->reciprocal_cpu_power);
-+}
-+
-+/*
-+ * Each time a sched group cpu_power is changed,
-+ * we must compute its reciprocal value
-+ */
-+static inline void sg_inc_cpu_power(struct sched_group *sg, u32 val)
-+{
-+	sg->__cpu_power += val;
-+	sg->reciprocal_cpu_power = reciprocal_value(sg->__cpu_power);
-+}
-+#endif
-+
-+/*
-+ * This is the time all tasks within the same priority round robin.
-+ * Value is in ms and set to a minimum of 6ms. Scales with number of cpus.
-+ * Tunable via /proc interface.
-+ */
-+int rr_interval __read_mostly = 6;
-+
-+/*
-+ * sched_iso_cpu - sysctl which determines the cpu percentage SCHED_ISO tasks
-+ * are allowed to run five seconds as real time tasks. This is the total over
-+ * all online cpus.
-+ */
-+int sched_iso_cpu __read_mostly = 70;
-+
-+int prio_ratios[PRIO_RANGE] __read_mostly;
-+
-+static inline unsigned long timeslice(void)
-+{
-+	return MS_TO_US(rr_interval);
-+}
-+
-+struct global_rq {
-+	spinlock_t lock;
-+	unsigned long nr_running;
-+	unsigned long nr_uninterruptible;
-+	unsigned long long nr_switches;
-+	struct list_head queue[PRIO_LIMIT];
-+	DECLARE_BITMAP(prio_bitmap, PRIO_LIMIT + 1);
-+	unsigned long iso_ticks;
-+	unsigned short iso_refractory;
-+#ifdef CONFIG_SMP
-+	unsigned long qnr; /* queued not running */
-+	cpumask_t cpu_idle_map;
-+#endif
-+};
-+
-+static struct global_rq grq;
-+
-+/*
-+ * This is the main, per-CPU runqueue data structure.
-+ * All this is protected by the global_rq lock.
-+ */
-+struct rq {
-+#ifdef CONFIG_SMP
-+#ifdef CONFIG_NO_HZ
-+	unsigned char in_nohz_recently;
-+#endif
-+#endif
-+
-+	struct task_struct *curr, *idle;
-+	struct mm_struct *prev_mm;
-+	struct list_head queue; /* Place to store currently running task */
-+
-+	/* Stored data about rq->curr to work outside grq lock */
-+	unsigned long rq_deadline;
-+	unsigned int rq_policy;
-+	int rq_time_slice;
-+	int rq_prio;
-+
-+	/* Accurate timekeeping data */
-+	u64 timekeep_clock;
-+	unsigned long user_pc, nice_pc, irq_pc, softirq_pc, system_pc,
-+			iowait_pc, idle_pc;
-+	atomic_t nr_iowait;
-+
-+	int cpu;		/* cpu of this runqueue */
-+	int online;
-+
-+#ifdef CONFIG_SMP
-+	struct root_domain *rd;
-+	struct sched_domain *sd;
-+
-+	struct list_head migration_queue;
-+#endif
-+
-+	u64 clock;
-+#ifdef CONFIG_SCHEDSTATS
-+
-+	/* latency stats */
-+	struct sched_info rq_sched_info;
-+	unsigned long long rq_cpu_time;
-+	/* could above be rq->cfs_rq.exec_clock + rq->rt_rq.rt_runtime ? */
-+
-+	/* sys_sched_yield() stats */
-+	unsigned int yld_count;
-+
-+	/* schedule() stats */
-+	unsigned int sched_switch;
-+	unsigned int sched_count;
-+	unsigned int sched_goidle;
-+
-+	/* try_to_wake_up() stats */
-+	unsigned int ttwu_count;
-+	unsigned int ttwu_local;
-+
-+	/* BKL stats */
-+	unsigned int bkl_count;
-+#endif
-+};
-+
-+static DEFINE_PER_CPU(struct rq, runqueues) ____cacheline_aligned_in_smp;
-+static DEFINE_MUTEX(sched_hotcpu_mutex);
-+
-+#ifdef CONFIG_SMP
-+
-+/*
-+ * We add the notion of a root-domain which will be used to define per-domain
-+ * variables. Each exclusive cpuset essentially defines an island domain by
-+ * fully partitioning the member cpus from any other cpuset. Whenever a new
-+ * exclusive cpuset is created, we also create and attach a new root-domain
-+ * object.
-+ *
-+ */
-+struct root_domain {
-+	atomic_t refcount;
-+	cpumask_var_t span;
-+	cpumask_var_t online;
-+
-+	/*
-+	 * The "RT overload" flag: it gets set if a CPU has more than
-+	 * one runnable RT task.
-+	 */
-+	cpumask_var_t rto_mask;
-+	atomic_t rto_count;
-+#if defined(CONFIG_SCHED_MC) || defined(CONFIG_SCHED_SMT)
-+	/*
-+	 * Preferred wake up cpu nominated by sched_mc balance that will be
-+	 * used when most cpus are idle in the system indicating overall very
-+	 * low system utilisation. Triggered at POWERSAVINGS_BALANCE_WAKEUP(2)
-+	 */
-+	unsigned int sched_mc_preferred_wakeup_cpu;
-+#endif
-+};
-+
-+/*
-+ * By default the system creates a single root-domain with all cpus as
-+ * members (mimicking the global state we have today).
-+ */
-+static struct root_domain def_root_domain;
-+
-+#endif
-+
-+static inline int cpu_of(struct rq *rq)
-+{
-+#ifdef CONFIG_SMP
-+	return rq->cpu;
-+#else
-+	return 0;
-+#endif
-+}
-+
-+/*
-+ * The domain tree (rq->sd) is protected by RCU's quiescent state transition.
-+ * See detach_destroy_domains: synchronize_sched for details.
-+ *
-+ * The domain tree of any CPU may only be accessed from within
-+ * preempt-disabled sections.
-+ */
-+#define for_each_domain(cpu, __sd) \
-+	for (__sd = rcu_dereference(cpu_rq(cpu)->sd); __sd; __sd = __sd->parent)
-+
-+#define cpu_rq(cpu)		(&per_cpu(runqueues, (cpu)))
-+#define this_rq()		(&__get_cpu_var(runqueues))
-+#define task_rq(p)		cpu_rq(task_cpu(p))
-+#define cpu_curr(cpu)		(cpu_rq(cpu)->curr)
-+
-+#include "sched_stats.h"
-+
-+#ifndef prepare_arch_switch
-+# define prepare_arch_switch(next)	do { } while (0)
-+#endif
-+#ifndef finish_arch_switch
-+# define finish_arch_switch(prev)	do { } while (0)
-+#endif
-+
-+inline void update_rq_clock(struct rq *rq)
-+{
-+	rq->clock = sched_clock_cpu(cpu_of(rq));
-+}
-+
-+static inline int task_running(struct task_struct *p)
-+{
-+	return (!!p->oncpu);
-+}
-+
-+static inline void grq_lock(void)
-+	__acquires(grq.lock)
-+{
-+	smp_mb();
-+	spin_lock(&grq.lock);
-+}
-+
-+static inline void grq_unlock(void)
-+	__releases(grq.lock)
-+{
-+	spin_unlock(&grq.lock);
-+}
-+
-+static inline void grq_lock_irq(void)
-+	__acquires(grq.lock)
-+{
-+	smp_mb();
-+	spin_lock_irq(&grq.lock);
-+}
-+
-+static inline void time_lock_grq(struct rq *rq)
-+	__acquires(grq.lock)
-+{
-+	grq_lock();
-+	update_rq_clock(rq);
-+}
-+
-+static inline void grq_unlock_irq(void)
-+	__releases(grq.lock)
-+{
-+	spin_unlock_irq(&grq.lock);
-+}
-+
-+static inline void grq_lock_irqsave(unsigned long *flags)
-+	__acquires(grq.lock)
-+{
-+	smp_mb();
-+	spin_lock_irqsave(&grq.lock, *flags);
-+}
-+
-+static inline void grq_unlock_irqrestore(unsigned long *flags)
-+	__releases(grq.lock)
-+{
-+	spin_unlock_irqrestore(&grq.lock, *flags);
-+}
-+
-+static inline struct rq
-+*task_grq_lock(struct task_struct *p, unsigned long *flags)
-+	__acquires(grq.lock)
-+{
-+	grq_lock_irqsave(flags);
-+	return task_rq(p);
-+}
-+
-+static inline struct rq
-+*time_task_grq_lock(struct task_struct *p, unsigned long *flags)
-+	__acquires(grq.lock)
-+{
-+	struct rq *rq = task_grq_lock(p, flags);
-+	update_rq_clock(rq);
-+	return rq;
-+}
-+
-+static inline void task_grq_unlock(unsigned long *flags)
-+	__releases(grq.lock)
-+{
-+	grq_unlock_irqrestore(flags);
-+}
-+
-+/**
-+ * runqueue_is_locked
-+ *
-+ * Returns true if the global runqueue is locked.
-+ * This interface allows printk to be called with the runqueue lock
-+ * held and know whether or not it is OK to wake up the klogd.
-+ */
-+int runqueue_is_locked(void)
-+{
-+	return spin_is_locked(&grq.lock);
-+}
-+
-+void task_rq_unlock_wait(struct task_struct *p)
-+	__releases(grq.lock)
-+{
-+	smp_mb(); /* spin-unlock-wait is not a full memory barrier */
-+	spin_unlock_wait(&grq.lock);
-+}
-+
-+static inline void time_grq_lock(struct rq *rq, unsigned long *flags)
-+	__acquires(grq.lock)
-+{
-+	spin_lock_irqsave(&grq.lock, *flags);
-+	update_rq_clock(rq);
-+}
-+
-+static inline struct rq *__task_grq_lock(struct task_struct *p)
-+	__acquires(grq.lock)
-+{
-+	grq_lock();
-+	return task_rq(p);
-+}
-+
-+static inline void __task_grq_unlock(void)
-+	__releases(grq.lock)
-+{
-+	grq_unlock();
-+}
-+
-+#ifndef __ARCH_WANT_UNLOCKED_CTXSW
-+static inline void prepare_lock_switch(struct rq *rq, struct task_struct *next)
-+{
-+}
-+
-+static inline void finish_lock_switch(struct rq *rq, struct task_struct *prev)
-+{
-+#ifdef CONFIG_DEBUG_SPINLOCK
-+	/* this is a valid case when another task releases the spinlock */
-+	grq.lock.owner = current;
-+#endif
-+	/*
-+	 * If we are tracking spinlock dependencies then we have to
-+	 * fix up the runqueue lock - which gets 'carried over' from
-+	 * prev into current:
-+	 */
-+	spin_acquire(&grq.lock.dep_map, 0, 0, _THIS_IP_);
-+
-+	grq_unlock_irq();
-+}
-+
-+#else /* __ARCH_WANT_UNLOCKED_CTXSW */
-+
-+static inline void prepare_lock_switch(struct rq *rq, struct task_struct *next)
-+{
-+#ifdef __ARCH_WANT_INTERRUPTS_ON_CTXSW
-+	grq_unlock_irq();
-+#else
-+	grq_unlock();
-+#endif
-+}
-+
-+static inline void finish_lock_switch(struct rq *rq, struct task_struct *prev)
-+{
-+	smp_wmb();
-+#ifndef __ARCH_WANT_INTERRUPTS_ON_CTXSW
-+	local_irq_enable();
-+#endif
-+}
-+#endif /* __ARCH_WANT_UNLOCKED_CTXSW */
-+
-+/*
-+ * A task that is queued will be on the grq run list.
-+ * A task that is not running or queued will not be on the grq run list.
-+ * A task that is currently running will have ->oncpu set and be queued
-+ * temporarily in its own rq queue.
-+ * A task that is running and no longer queued will be seen only on
-+ * context switch exit.
-+ */
-+
-+static inline int task_queued(struct task_struct *p)
-+{
-+	return (!list_empty(&p->rt.run_list));
-+}
-+
-+static inline int task_queued_only(struct task_struct *p)
-+{
-+	return (!list_empty(&p->rt.run_list) && !task_running(p));
-+}
-+
-+/*
-+ * Removing from the global runqueue. Enter with grq locked.
-+ */
-+static void dequeue_task(struct task_struct *p)
-+{
-+	list_del_init(&p->rt.run_list);
-+	if (list_empty(grq.queue + p->prio))
-+		__clear_bit(p->prio, grq.prio_bitmap);
-+}
-+
-+static inline void reset_first_time_slice(struct task_struct *p)
-+{
-+	if (unlikely(p->first_time_slice))
-+		p->first_time_slice = 0;
-+}
-+
-+static int idleprio_suitable(struct task_struct *p)
-+{
-+	return (!freezing(p) && !signal_pending(p) &&
-+		!(task_contributes_to_load(p)) && !(p->flags & (PF_EXITING)));
-+}
-+
-+static int isoprio_suitable(void)
-+{
-+	return !grq.iso_refractory;
-+}
-+
-+/*
-+ * Adding to the global runqueue. Enter with grq locked.
-+ */
-+static void enqueue_task(struct task_struct *p)
-+{
-+	if (!rt_task(p)) {
-+		/* Check it hasn't gotten rt from PI */
-+		if ((idleprio_task(p) && idleprio_suitable(p)) ||
-+		   (iso_task(p) && isoprio_suitable()))
-+			p->prio = p->normal_prio;
-+		else
-+			p->prio = NORMAL_PRIO;
-+	}
-+	__set_bit(p->prio, grq.prio_bitmap);
-+	list_add_tail(&p->rt.run_list, grq.queue + p->prio);
-+	sched_info_queued(p);
-+}
-+
-+/* Only idle task does this as a real time task*/
-+static inline void enqueue_task_head(struct task_struct *p)
-+{
-+	__set_bit(p->prio, grq.prio_bitmap);
-+	list_add(&p->rt.run_list, grq.queue + p->prio);
-+	sched_info_queued(p);
-+}
-+
-+static inline void requeue_task(struct task_struct *p)
-+{
-+	sched_info_queued(p);
-+}
-+
-+static inline int pratio(struct task_struct *p)
-+{
-+	return prio_ratios[TASK_USER_PRIO(p)];
-+}
-+
-+/*
-+ * task_timeslice - all tasks of all priorities get the exact same timeslice
-+ * length. CPU distribution is handled by giving different deadlines to
-+ * tasks of different priorities.
-+ */
-+static inline int task_timeslice(struct task_struct *p)
-+{
-+	return (rr_interval * pratio(p) / 100);
-+}
-+
-+#ifdef CONFIG_SMP
-+static inline void inc_qnr(void)
-+{
-+	grq.qnr++;
-+}
-+
-+static inline void dec_qnr(void)
-+{
-+	grq.qnr--;
-+}
-+
-+static inline int queued_notrunning(void)
-+{
-+	return grq.qnr;
-+}
-+#else
-+static inline void inc_qnr(void)
-+{
-+}
-+
-+static inline void dec_qnr(void)
-+{
-+}
-+
-+static inline int queued_notrunning(void)
-+{
-+	return grq.nr_running;
-+}
-+#endif
-+
-+/*
-+ * activate_idle_task - move idle task to the _front_ of runqueue.
-+ */
-+static inline void activate_idle_task(struct task_struct *p)
-+{
-+	enqueue_task_head(p);
-+	grq.nr_running++;
-+	inc_qnr();
-+}
-+
-+static inline int normal_prio(struct task_struct *p)
-+{
-+	if (has_rt_policy(p))
-+		return MAX_RT_PRIO - 1 - p->rt_priority;
-+	if (idleprio_task(p))
-+		return IDLE_PRIO;
-+	if (iso_task(p))
-+		return ISO_PRIO;
-+	return NORMAL_PRIO;
-+}
-+
-+/*
-+ * Calculate the current priority, i.e. the priority
-+ * taken into account by the scheduler. This value might
-+ * be boosted by RT tasks as it will be RT if the task got
-+ * RT-boosted. If not then it returns p->normal_prio.
-+ */
-+static int effective_prio(struct task_struct *p)
-+{
-+	p->normal_prio = normal_prio(p);
-+	/*
-+	 * If we are RT tasks or we were boosted to RT priority,
-+	 * keep the priority unchanged. Otherwise, update priority
-+	 * to the normal priority:
-+	 */
-+	if (!rt_prio(p->prio))
-+		return p->normal_prio;
-+	return p->prio;
-+}
-+
-+/*
-+ * activate_task - move a task to the runqueue. Enter with grq locked. The rq
-+ * doesn't really matter but gives us the local clock.
-+ */
-+static void activate_task(struct task_struct *p, struct rq *rq)
-+{
-+	u64 now = rq->clock;
-+
-+	/*
-+	 * Sleep time is in units of nanosecs, so shift by 20 to get a
-+	 * milliseconds-range estimation of the amount of time that the task
-+	 * spent sleeping:
-+	 */
-+	if (unlikely(prof_on == SLEEP_PROFILING)) {
-+		if (p->state == TASK_UNINTERRUPTIBLE)
-+			profile_hits(SLEEP_PROFILING, (void *)get_wchan(p),
-+				     (now - p->timestamp) >> 20);
-+	}
-+
-+	p->prio = effective_prio(p);
-+	p->timestamp = now;
-+	if (task_contributes_to_load(p))
-+		grq.nr_uninterruptible--;
-+	enqueue_task(p);
-+	grq.nr_running++;
-+	inc_qnr();
-+}
-+
-+/*
-+ * deactivate_task - If it's running, it's not on the grq and we can just
-+ * decrement the nr_running.
-+ */
-+static inline void deactivate_task(struct task_struct *p)
-+{
-+	if (task_contributes_to_load(p))
-+		grq.nr_uninterruptible++;
-+	grq.nr_running--;
-+}
-+
-+#ifdef CONFIG_SMP
-+void set_task_cpu(struct task_struct *p, unsigned int cpu)
-+{
-+	trace_sched_migrate_task(p, cpu);
-+	/*
-+	 * After ->cpu is set up to a new value, task_grq_lock(p, ...) can be
-+	 * successfuly executed on another CPU. We must ensure that updates of
-+	 * per-task data have been completed by this moment.
-+	 */
-+	smp_wmb();
-+	task_thread_info(p)->cpu = cpu;
-+}
-+#endif
-+
-+/*
-+ * Move a task off the global queue and take it to a cpu for it will
-+ * become the running task.
-+ */
-+static inline void take_task(struct rq *rq, struct task_struct *p)
-+{
-+	set_task_cpu(p, rq->cpu);
-+	dequeue_task(p);
-+	list_add(&p->rt.run_list, &rq->queue);
-+	dec_qnr();
-+}
-+
-+/*
-+ * Returns a descheduling task to the grq runqueue unless it is being
-+ * deactivated.
-+ */
-+static inline void return_task(struct task_struct *p, int deactivate)
-+{
-+	list_del_init(&p->rt.run_list);
-+	if (deactivate)
-+		deactivate_task(p);
-+	else {
-+		inc_qnr();
-+		enqueue_task(p);
-+	}
-+}
-+
-+/*
-+ * resched_task - mark a task 'to be rescheduled now'.
-+ *
-+ * On UP this means the setting of the need_resched flag, on SMP it
-+ * might also involve a cross-CPU call to trigger the scheduler on
-+ * the target CPU.
-+ */
-+#ifdef CONFIG_SMP
-+
-+#ifndef tsk_is_polling
-+#define tsk_is_polling(t) test_tsk_thread_flag(t, TIF_POLLING_NRFLAG)
-+#endif
-+
-+static void resched_task(struct task_struct *p)
-+{
-+	int cpu;
-+
-+	assert_spin_locked(&grq.lock);
-+
-+	if (unlikely(test_tsk_thread_flag(p, TIF_NEED_RESCHED)))
-+		return;
-+
-+	set_tsk_thread_flag(p, TIF_NEED_RESCHED);
-+
-+	cpu = task_cpu(p);
-+	if (cpu == smp_processor_id())
-+		return;
-+
-+	/* NEED_RESCHED must be visible before we test polling */
-+	smp_mb();
-+	if (!tsk_is_polling(p))
-+		smp_send_reschedule(cpu);
-+}
-+
-+#else
-+static inline void resched_task(struct task_struct *p)
-+{
-+	assert_spin_locked(&grq.lock);
-+	set_tsk_need_resched(p);
-+}
-+#endif
-+
-+/**
-+ * task_curr - is this task currently executing on a CPU?
-+ * @p: the task in question.
-+ */
-+inline int task_curr(const struct task_struct *p)
-+{
-+	return cpu_curr(task_cpu(p)) == p;
-+}
-+
-+#ifdef CONFIG_SMP
-+struct migration_req {
-+	struct list_head list;
-+
-+	struct task_struct *task;
-+	int dest_cpu;
-+
-+	struct completion done;
-+};
-+
-+/*
-+ * wait_task_context_switch -	wait for a thread to complete at least one
-+ *				context switch.
-+ *
-+ * @p must not be current.
-+ */
-+void wait_task_context_switch(struct task_struct *p)
-+{
-+	unsigned long nvcsw, nivcsw, flags;
-+	int running;
-+	struct rq *rq;
-+
-+	nvcsw	= p->nvcsw;
-+	nivcsw	= p->nivcsw;
-+	for (;;) {
-+		/*
-+		 * The runqueue is assigned before the actual context
-+		 * switch. We need to take the runqueue lock.
-+		 *
-+		 * We could check initially without the lock but it is
-+		 * very likely that we need to take the lock in every
-+		 * iteration.
-+		 */
-+		rq = task_grq_lock(p, &flags);
-+		running = task_running(p);
-+		task_grq_unlock(&flags);
-+
-+		if (likely(!running))
-+			break;
-+		/*
-+		 * The switch count is incremented before the actual
-+		 * context switch. We thus wait for two switches to be
-+		 * sure at least one completed.
-+		 */
-+		if ((p->nvcsw - nvcsw) > 1)
-+			break;
-+		if ((p->nivcsw - nivcsw) > 1)
-+			break;
-+
-+		cpu_relax();
-+	}
-+}
-+
-+/*
-+ * wait_task_inactive - wait for a thread to unschedule.
-+ *
-+ * If @match_state is nonzero, it's the @p->state value just checked and
-+ * not expected to change.  If it changes, i.e. @p might have woken up,
-+ * then return zero.  When we succeed in waiting for @p to be off its CPU,
-+ * we return a positive number (its total switch count).  If a second call
-+ * a short while later returns the same number, the caller can be sure that
-+ * @p has remained unscheduled the whole time.
-+ *
-+ * The caller must ensure that the task *will* unschedule sometime soon,
-+ * else this function might spin for a *long* time. This function can't
-+ * be called with interrupts off, or it may introduce deadlock with
-+ * smp_call_function() if an IPI is sent by the same process we are
-+ * waiting to become inactive.
-+ */
-+unsigned long wait_task_inactive(struct task_struct *p, long match_state)
-+{
-+	unsigned long flags;
-+	int running, on_rq;
-+	unsigned long ncsw;
-+	struct rq *rq;
-+
-+	for (;;) {
-+		/*
-+		 * We do the initial early heuristics without holding
-+		 * any task-queue locks at all. We'll only try to get
-+		 * the runqueue lock when things look like they will
-+		 * work out!
-+		 */
-+		rq = task_rq(p);
-+
-+		/*
-+		 * If the task is actively running on another CPU
-+		 * still, just relax and busy-wait without holding
-+		 * any locks.
-+		 *
-+		 * NOTE! Since we don't hold any locks, it's not
-+		 * even sure that "rq" stays as the right runqueue!
-+		 * But we don't care, since this will
-+		 * return false if the runqueue has changed and p
-+		 * is actually now running somewhere else!
-+		 */
-+		while (task_running(p) && p == rq->curr) {
-+			if (match_state && unlikely(p->state != match_state))
-+				return 0;
-+			cpu_relax();
-+		}
-+
-+		/*
-+		 * Ok, time to look more closely! We need the grq
-+		 * lock now, to be *sure*. If we're wrong, we'll
-+		 * just go back and repeat.
-+		 */
-+		rq = task_grq_lock(p, &flags);
-+		trace_sched_wait_task(rq, p);
-+		running = task_running(p);
-+		on_rq = task_queued(p);
-+		ncsw = 0;
-+		if (!match_state || p->state == match_state)
-+			ncsw = p->nvcsw | LONG_MIN; /* sets MSB */
-+		task_grq_unlock(&flags);
-+
-+		/*
-+		 * If it changed from the expected state, bail out now.
-+		 */
-+		if (unlikely(!ncsw))
-+			break;
-+
-+		/*
-+		 * Was it really running after all now that we
-+		 * checked with the proper locks actually held?
-+		 *
-+		 * Oops. Go back and try again..
-+		 */
-+		if (unlikely(running)) {
-+			cpu_relax();
-+			continue;
-+		}
-+
-+		/*
-+		 * It's not enough that it's not actively running,
-+		 * it must be off the runqueue _entirely_, and not
-+		 * preempted!
-+		 *
-+		 * So if it was still runnable (but just not actively
-+		 * running right now), it's preempted, and we should
-+		 * yield - it could be a while.
-+		 */
-+		if (unlikely(on_rq)) {
-+			schedule_timeout_uninterruptible(1);
-+			continue;
-+		}
-+
-+		/*
-+		 * Ahh, all good. It wasn't running, and it wasn't
-+		 * runnable, which means that it will never become
-+		 * running in the future either. We're all done!
-+		 */
-+		break;
-+	}
-+
-+	return ncsw;
-+}
-+
-+/***
-+ * kick_process - kick a running thread to enter/exit the kernel
-+ * @p: the to-be-kicked thread
-+ *
-+ * Cause a process which is running on another CPU to enter
-+ * kernel-mode, without any delay. (to get signals handled.)
-+ *
-+ * NOTE: this function doesnt have to take the runqueue lock,
-+ * because all it wants to ensure is that the remote task enters
-+ * the kernel. If the IPI races and the task has been migrated
-+ * to another CPU then no harm is done and the purpose has been
-+ * achieved as well.
-+ */
-+void kick_process(struct task_struct *p)
-+{
-+	int cpu;
-+
-+	preempt_disable();
-+	cpu = task_cpu(p);
-+	if ((cpu != smp_processor_id()) && task_curr(p))
-+		smp_send_reschedule(cpu);
-+	preempt_enable();
-+}
-+EXPORT_SYMBOL_GPL(kick_process);
-+#endif
-+
-+#define rq_idle(rq)	((rq)->rq_prio == PRIO_LIMIT)
-+
-+/*
-+ * RT tasks preempt purely on priority. SCHED_NORMAL tasks preempt on the
-+ * basis of earlier deadlines. SCHED_BATCH and SCHED_IDLE don't preempt,
-+ * they cooperatively multitask.
-+ */
-+static inline int task_preempts_curr(struct task_struct *p, struct rq *rq)
-+{
-+	int preempts = 0;
-+
-+	if (p->prio < rq->rq_prio)
-+		preempts = 1;
-+	else if (p->policy == SCHED_NORMAL && (p->prio == rq->rq_prio &&
-+		 time_before(p->deadline, rq->rq_deadline)))
-+			preempts = 1;
-+	return preempts;
-+}
-+
-+/*
-+ * Wake up *any* suitable cpu to schedule this task.
-+ */
-+static void try_preempt(struct task_struct *p)
-+{
-+	struct rq *highest_prio_rq, *this_rq;
-+	unsigned long latest_deadline, cpu;
-+	int highest_prio;
-+	cpumask_t tmp;
-+
-+	/* Try the task's previous rq first and as a fallback */
-+	this_rq = task_rq(p);
-+
-+	if (cpu_isset(this_rq->cpu, p->cpus_allowed)) {
-+		highest_prio_rq = this_rq;
-+		/* If this_rq is idle, use that. */
-+		if (rq_idle(this_rq))
-+			goto found_rq;
-+	} else
-+		highest_prio_rq = cpu_rq(any_online_cpu(p->cpus_allowed));
-+	latest_deadline = this_rq->rq_deadline;
-+	highest_prio = this_rq->rq_prio;
-+
-+	cpus_and(tmp, cpu_online_map, p->cpus_allowed);
-+
-+	for_each_cpu_mask(cpu, tmp) {
-+		struct rq *rq;
-+		int rq_prio;
-+
-+		rq = cpu_rq(cpu);
-+
-+		if (rq_idle(rq)) {
-+			/* found an idle rq, use that one */
-+			highest_prio_rq = rq;
-+			goto found_rq;
-+		}
-+
-+		rq_prio = rq->rq_prio;
-+		if (rq_prio > highest_prio ||
-+			(rq_prio == highest_prio &&
-+			time_after(rq->rq_deadline, latest_deadline))) {
-+				highest_prio = rq_prio;
-+				latest_deadline = rq->rq_deadline;
-+				highest_prio_rq = rq;
-+		}
-+	}
-+
-+	if (!task_preempts_curr(p, highest_prio_rq))
-+		return;
-+found_rq:
-+	resched_task(highest_prio_rq->curr);
-+	return;
-+}
-+
-+/**
-+ * task_oncpu_function_call - call a function on the cpu on which a task runs
-+ * @p:		the task to evaluate
-+ * @func:	the function to be called
-+ * @info:	the function call argument
-+ *
-+ * Calls the function @func when the task is currently running. This might
-+ * be on the current CPU, which just calls the function directly
-+ */
-+void task_oncpu_function_call(struct task_struct *p,
-+			      void (*func) (void *info), void *info)
-+{
-+	int cpu;
-+
-+	preempt_disable();
-+	cpu = task_cpu(p);
-+	if (task_curr(p))
-+		smp_call_function_single(cpu, func, info, 1);
-+	preempt_enable();
-+}
-+
-+#ifdef CONFIG_SMP
-+static int suitable_idle_cpus(struct task_struct *p)
-+{
-+	return (cpus_intersects(p->cpus_allowed, grq.cpu_idle_map));
-+}
-+#else
-+static int suitable_idle_cpus(struct task_struct *p)
-+{
-+	return 0;
-+}
-+#endif
-+
-+/***
-+ * try_to_wake_up - wake up a thread
-+ * @p: the to-be-woken-up thread
-+ * @state: the mask of task states that can be woken
-+ * @sync: do a synchronous wakeup?
-+ *
-+ * Put it on the run-queue if it's not already there. The "current"
-+ * thread is always on the run-queue (except when the actual
-+ * re-schedule is in progress), and as such you're allowed to do
-+ * the simpler "current->state = TASK_RUNNING" to mark yourself
-+ * runnable without the overhead of this.
-+ *
-+ * returns failure only if the task is already active.
-+ */
-+static int try_to_wake_up(struct task_struct *p, unsigned int state, int sync)
-+{
-+	unsigned long flags;
-+	int success = 0;
-+	long old_state;
-+	struct rq *rq;
-+
-+	rq = time_task_grq_lock(p, &flags);
-+	old_state = p->state;
-+	if (!(old_state & state))
-+		goto out_unlock;
-+
-+	/*
-+	 * Note this catches tasks that are running and queued, but returns
-+	 * false during the context switch when they're running and no
-+	 * longer queued.
-+	 */
-+	if (task_queued(p))
-+		goto out_running;
-+
-+	activate_task(p, rq);
-+	/*
-+	 * Sync wakeups (i.e. those types of wakeups where the waker
-+	 * has indicated that it will leave the CPU in short order)
-+	 * don't trigger a preemption if there are no idle cpus,
-+	 * instead waiting for current to deschedule.
-+	 */
-+	if (!sync || (sync && suitable_idle_cpus(p)))
-+		try_preempt(p);
-+	success = 1;
-+
-+out_running:
-+	trace_sched_wakeup(rq, p, success);
-+	p->state = TASK_RUNNING;
-+out_unlock:
-+	task_grq_unlock(&flags);
-+	return success;
-+}
-+
-+/**
-+ * wake_up_process - Wake up a specific process
-+ * @p: The process to be woken up.
-+ *
-+ * Attempt to wake up the nominated process and move it to the set of runnable
-+ * processes.  Returns 1 if the process was woken up, 0 if it was already
-+ * running.
-+ *
-+ * It may be assumed that this function implies a write memory barrier before
-+ * changing the task state if and only if any tasks are woken up.
-+ */
-+int wake_up_process(struct task_struct *p)
-+{
-+	return try_to_wake_up(p, TASK_ALL, 0);
-+}
-+EXPORT_SYMBOL(wake_up_process);
-+
-+int wake_up_state(struct task_struct *p, unsigned int state)
-+{
-+	return try_to_wake_up(p, state, 0);
-+}
-+
-+/*
-+ * Perform scheduler related setup for a newly forked process p.
-+ * p is forked by current.
-+ */
-+void sched_fork(struct task_struct *p, int clone_flags)
-+{
-+	int cpu = get_cpu();
-+	struct rq *rq;
-+
-+#ifdef CONFIG_PREEMPT_NOTIFIERS
-+	INIT_HLIST_HEAD(&p->preempt_notifiers);
-+#endif
-+	/*
-+	 * We mark the process as running here, but have not actually
-+	 * inserted it onto the runqueue yet. This guarantees that
-+	 * nobody will actually run it, and a signal or other external
-+	 * event cannot wake it up and insert it on the runqueue either.
-+	 */
-+	p->state = TASK_RUNNING;
-+	set_task_cpu(p, cpu);
-+
-+	/* Should be reset in fork.c but done here for ease of bfs patching */
-+	p->se.sum_exec_runtime = p->stime_pc = p->utime_pc = 0;
-+
-+	/*
-+	 * Make sure we do not leak PI boosting priority to the child:
-+	 */
-+	p->prio = current->normal_prio;
-+
-+	INIT_LIST_HEAD(&p->rt.run_list);
-+#if defined(CONFIG_SCHEDSTATS) || defined(CONFIG_TASK_DELAY_ACCT)
-+	if (unlikely(sched_info_on()))
-+		memset(&p->sched_info, 0, sizeof(p->sched_info));
-+#endif
-+
-+	p->oncpu = 0;
-+
-+#ifdef CONFIG_PREEMPT
-+	/* Want to start with kernel preemption disabled. */
-+	task_thread_info(p)->preempt_count = 1;
-+#endif
-+	if (unlikely(p->policy == SCHED_FIFO))
-+		goto out;
-+	/*
-+	 * Share the timeslice between parent and child, thus the
-+	 * total amount of pending timeslices in the system doesn't change,
-+	 * resulting in more scheduling fairness. If it's negative, it won't
-+	 * matter since that's the same as being 0. current's time_slice is
-+	 * actually in rq_time_slice when it's running.
-+	 */
-+	local_irq_disable();
-+	rq = task_rq(current);
-+	if (likely(rq->rq_time_slice > 0)) {
-+		rq->rq_time_slice /= 2;
-+		/*
-+		 * The remainder of the first timeslice might be recovered by
-+		 * the parent if the child exits early enough.
-+		 */
-+		p->first_time_slice = 1;
-+	}
-+	p->rt.time_slice = rq->rq_time_slice;
-+	local_irq_enable();
-+out:
-+	put_cpu();
-+}
-+
-+/*
-+ * wake_up_new_task - wake up a newly created task for the first time.
-+ *
-+ * This function will do some initial scheduler statistics housekeeping
-+ * that must be done for every newly created context, then puts the task
-+ * on the runqueue and wakes it.
-+ */
-+void wake_up_new_task(struct task_struct *p, unsigned long clone_flags)
-+{
-+	struct task_struct *parent;
-+	unsigned long flags;
-+	struct rq *rq;
-+
-+	rq = time_task_grq_lock(p, &flags); ;
-+	parent = p->parent;
-+	BUG_ON(p->state != TASK_RUNNING);
-+	set_task_cpu(p, task_cpu(parent));
-+
-+	activate_task(p, rq);
-+	trace_sched_wakeup_new(rq, p, 1);
-+	if (!(clone_flags & CLONE_VM) && rq->curr == parent &&
-+		!suitable_idle_cpus(p)) {
-+		/*
-+		 * The VM isn't cloned, so we're in a good position to
-+		 * do child-runs-first in anticipation of an exec. This
-+		 * usually avoids a lot of COW overhead.
-+		 */
-+			resched_task(parent);
-+	} else
-+		try_preempt(p);
-+	task_grq_unlock(&flags);
-+}
-+
-+/*
-+ * Potentially available exiting-child timeslices are
-+ * retrieved here - this way the parent does not get
-+ * penalized for creating too many threads.
-+ *
-+ * (this cannot be used to 'generate' timeslices
-+ * artificially, because any timeslice recovered here
-+ * was given away by the parent in the first place.)
-+ */
-+void sched_exit(struct task_struct *p)
-+{
-+	struct task_struct *parent;
-+	unsigned long flags;
-+	struct rq *rq;
-+
-+	if (p->first_time_slice) {
-+		parent = p->parent;
-+		rq = task_grq_lock(parent, &flags);
-+		parent->rt.time_slice += p->rt.time_slice;
-+		if (unlikely(parent->rt.time_slice > timeslice()))
-+			parent->rt.time_slice = timeslice();
-+		task_grq_unlock(&flags);
-+	}
-+}
-+
-+#ifdef CONFIG_PREEMPT_NOTIFIERS
-+
-+/**
-+ * preempt_notifier_register - tell me when current is being preempted & rescheduled
-+ * @notifier: notifier struct to register
-+ */
-+void preempt_notifier_register(struct preempt_notifier *notifier)
-+{
-+	hlist_add_head(&notifier->link, &current->preempt_notifiers);
-+}
-+EXPORT_SYMBOL_GPL(preempt_notifier_register);
-+
-+/**
-+ * preempt_notifier_unregister - no longer interested in preemption notifications
-+ * @notifier: notifier struct to unregister
-+ *
-+ * This is safe to call from within a preemption notifier.
-+ */
-+void preempt_notifier_unregister(struct preempt_notifier *notifier)
-+{
-+	hlist_del(&notifier->link);
-+}
-+EXPORT_SYMBOL_GPL(preempt_notifier_unregister);
-+
-+static void fire_sched_in_preempt_notifiers(struct task_struct *curr)
-+{
-+	struct preempt_notifier *notifier;
-+	struct hlist_node *node;
-+
-+	hlist_for_each_entry(notifier, node, &curr->preempt_notifiers, link)
-+		notifier->ops->sched_in(notifier, raw_smp_processor_id());
-+}
-+
-+static void
-+fire_sched_out_preempt_notifiers(struct task_struct *curr,
-+				 struct task_struct *next)
-+{
-+	struct preempt_notifier *notifier;
-+	struct hlist_node *node;
-+
-+	hlist_for_each_entry(notifier, node, &curr->preempt_notifiers, link)
-+		notifier->ops->sched_out(notifier, next);
-+}
-+
-+#else /* !CONFIG_PREEMPT_NOTIFIERS */
-+
-+static void fire_sched_in_preempt_notifiers(struct task_struct *curr)
-+{
-+}
-+
-+static void
-+fire_sched_out_preempt_notifiers(struct task_struct *curr,
-+				 struct task_struct *next)
-+{
-+}
-+
-+#endif /* CONFIG_PREEMPT_NOTIFIERS */
-+
-+/**
-+ * prepare_task_switch - prepare to switch tasks
-+ * @rq: the runqueue preparing to switch
-+ * @next: the task we are going to switch to.
-+ *
-+ * This is called with the rq lock held and interrupts off. It must
-+ * be paired with a subsequent finish_task_switch after the context
-+ * switch.
-+ *
-+ * prepare_task_switch sets up locking and calls architecture specific
-+ * hooks.
-+ */
-+static inline void
-+prepare_task_switch(struct rq *rq, struct task_struct *prev,
-+		    struct task_struct *next)
-+{
-+	fire_sched_out_preempt_notifiers(prev, next);
-+	prepare_lock_switch(rq, next);
-+	prepare_arch_switch(next);
-+}
-+
-+/**
-+ * finish_task_switch - clean up after a task-switch
-+ * @rq: runqueue associated with task-switch
-+ * @prev: the thread we just switched away from.
-+ *
-+ * finish_task_switch must be called after the context switch, paired
-+ * with a prepare_task_switch call before the context switch.
-+ * finish_task_switch will reconcile locking set up by prepare_task_switch,
-+ * and do any other architecture-specific cleanup actions.
-+ *
-+ * Note that we may have delayed dropping an mm in context_switch(). If
-+ * so, we finish that here outside of the runqueue lock.  (Doing it
-+ * with the lock held can cause deadlocks; see schedule() for
-+ * details.)
-+ */
-+static inline void finish_task_switch(struct rq *rq, struct task_struct *prev)
-+	__releases(grq.lock)
-+{
-+	struct mm_struct *mm = rq->prev_mm;
-+	long prev_state;
-+
-+	rq->prev_mm = NULL;
-+
-+	/*
-+	 * A task struct has one reference for the use as "current".
-+	 * If a task dies, then it sets TASK_DEAD in tsk->state and calls
-+	 * schedule one last time. The schedule call will never return, and
-+	 * the scheduled task must drop that reference.
-+	 * The test for TASK_DEAD must occur while the runqueue locks are
-+	 * still held, otherwise prev could be scheduled on another cpu, die
-+	 * there before we look at prev->state, and then the reference would
-+	 * be dropped twice.
-+	 *		Manfred Spraul <manfred@colorfullife.com>
-+	 */
-+	prev_state = prev->state;
-+	finish_arch_switch(prev);
-+	perf_counter_task_sched_in(current, cpu_of(rq));
-+	finish_lock_switch(rq, prev);
-+
-+	fire_sched_in_preempt_notifiers(current);
-+	if (mm)
-+		mmdrop(mm);
-+	if (unlikely(prev_state == TASK_DEAD)) {
-+		/*
-+		 * Remove function-return probe instances associated with this
-+		 * task and put them back on the free list.
-+	 	 */
-+		kprobe_flush_task(prev);
-+		put_task_struct(prev);
-+	}
-+}
-+
-+/**
-+ * schedule_tail - first thing a freshly forked thread must call.
-+ * @prev: the thread we just switched away from.
-+ */
-+asmlinkage void schedule_tail(struct task_struct *prev)
-+	__releases(grq.lock)
-+{
-+	struct rq *rq = this_rq();
-+
-+	finish_task_switch(rq, prev);
-+#ifdef __ARCH_WANT_UNLOCKED_CTXSW
-+	/* In this case, finish_task_switch does not reenable preemption */
-+	preempt_enable();
-+#endif
-+	if (current->set_child_tid)
-+		put_user(current->pid, current->set_child_tid);
-+}
-+
-+/*
-+ * context_switch - switch to the new MM and the new
-+ * thread's register state.
-+ */
-+static inline void
-+context_switch(struct rq *rq, struct task_struct *prev,
-+	       struct task_struct *next)
-+{
-+	struct mm_struct *mm, *oldmm;
-+
-+	prepare_task_switch(rq, prev, next);
-+	trace_sched_switch(rq, prev, next);
-+	mm = next->mm;
-+	oldmm = prev->active_mm;
-+	/*
-+	 * For paravirt, this is coupled with an exit in switch_to to
-+	 * combine the page table reload and the switch backend into
-+	 * one hypercall.
-+	 */
-+	arch_start_context_switch(prev);
-+
-+	if (unlikely(!mm)) {
-+		next->active_mm = oldmm;
-+		atomic_inc(&oldmm->mm_count);
-+		enter_lazy_tlb(oldmm, next);
-+	} else
-+		switch_mm(oldmm, mm, next);
-+
-+	if (unlikely(!prev->mm)) {
-+		prev->active_mm = NULL;
-+		rq->prev_mm = oldmm;
-+	}
-+	/*
-+	 * Since the runqueue lock will be released by the next
-+	 * task (which is an invalid locking op but in the case
-+	 * of the scheduler it's an obvious special-case), so we
-+	 * do an early lockdep release here:
-+	 */
-+#ifndef __ARCH_WANT_UNLOCKED_CTXSW
-+	spin_release(&grq.lock.dep_map, 1, _THIS_IP_);
-+#endif
-+
-+	/* Here we just switch the register state and the stack. */
-+	switch_to(prev, next, prev);
-+
-+	barrier();
-+	/*
-+	 * this_rq must be evaluated again because prev may have moved
-+	 * CPUs since it called schedule(), thus the 'rq' on its stack
-+	 * frame will be invalid.
-+	 */
-+	finish_task_switch(this_rq(), prev);
-+}
-+
-+/*
-+ * nr_running, nr_uninterruptible and nr_context_switches:
-+ *
-+ * externally visible scheduler statistics: current number of runnable
-+ * threads, current number of uninterruptible-sleeping threads, total
-+ * number of context switches performed since bootup. All are measured
-+ * without grabbing the grq lock but the occasional inaccurate result
-+ * doesn't matter so long as it's positive.
-+ */
-+unsigned long nr_running(void)
-+{
-+	long nr = grq.nr_running;
-+
-+	if (unlikely(nr < 0))
-+		nr = 0;
-+	return (unsigned long)nr;
-+}
-+
-+unsigned long nr_uninterruptible(void)
-+{
-+	unsigned long nu = grq.nr_uninterruptible;
-+
-+	if (unlikely(nu < 0))
-+		nu = 0;
-+	return nu;
-+}
-+
-+unsigned long long nr_context_switches(void)
-+{
-+	long long ns = grq.nr_switches;
-+
-+	/* This is of course impossible */
-+	if (unlikely(ns < 0))
-+		ns = 1;
-+	return (long long)ns;
-+}
-+
-+unsigned long nr_iowait(void)
-+{
-+	unsigned long i, sum = 0;
-+
-+	for_each_possible_cpu(i)
-+		sum += atomic_read(&cpu_rq(i)->nr_iowait);
-+
-+	return sum;
-+}
-+
-+unsigned long nr_active(void)
-+{
-+	return nr_running() + nr_uninterruptible();
-+}
-+
-+/* Variables and functions for calc_load */
-+static unsigned long calc_load_update;
-+unsigned long avenrun[3];
-+EXPORT_SYMBOL(avenrun);
-+
-+/**
-+ * get_avenrun - get the load average array
-+ * @loads:	pointer to dest load array
-+ * @offset:	offset to add
-+ * @shift:	shift count to shift the result left
-+ *
-+ * These values are estimates at best, so no need for locking.
-+ */
-+void get_avenrun(unsigned long *loads, unsigned long offset, int shift)
-+{
-+	loads[0] = (avenrun[0] + offset) << shift;
-+	loads[1] = (avenrun[1] + offset) << shift;
-+	loads[2] = (avenrun[2] + offset) << shift;
-+}
-+
-+static unsigned long
-+calc_load(unsigned long load, unsigned long exp, unsigned long active)
-+{
-+	load *= exp;
-+	load += active * (FIXED_1 - exp);
-+	return load >> FSHIFT;
-+}
-+
-+/*
-+ * calc_load - update the avenrun load estimates every LOAD_FREQ seconds.
-+ */
-+void calc_global_load(void)
-+{
-+	long active;
-+
-+	if (time_before(jiffies, calc_load_update))
-+		return;
-+	active = nr_active() * FIXED_1;
-+
-+	avenrun[0] = calc_load(avenrun[0], EXP_1, active);
-+	avenrun[1] = calc_load(avenrun[1], EXP_5, active);
-+	avenrun[2] = calc_load(avenrun[2], EXP_15, active);
-+
-+	calc_load_update = jiffies + LOAD_FREQ;
-+}
-+
-+DEFINE_PER_CPU(struct kernel_stat, kstat);
-+
-+EXPORT_PER_CPU_SYMBOL(kstat);
-+
-+/*
-+ * On each tick, see what percentage of that tick was attributed to each
-+ * component and add the percentage to the _pc values. Once a _pc value has
-+ * accumulated one tick's worth, account for that. This means the total
-+ * percentage of load components will always be 100 per tick.
-+ */
-+static void pc_idle_time(struct rq *rq, unsigned long pc)
-+{
-+	struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
-+	cputime64_t tmp = cputime_to_cputime64(jiffies_to_cputime(1));
-+
-+	if (atomic_read(&rq->nr_iowait) > 0) {
-+		rq->iowait_pc += pc;
-+		if (rq->iowait_pc >= 100) {
-+			rq->iowait_pc %= 100;
-+			cpustat->iowait = cputime64_add(cpustat->iowait, tmp);
-+		}
-+	} else {
-+		rq->idle_pc += pc;
-+		if (rq->idle_pc >= 100) {
-+			rq->idle_pc %= 100;
-+			cpustat->idle = cputime64_add(cpustat->idle, tmp);
-+		}
-+	}
-+}
-+
-+static void
-+pc_system_time(struct rq *rq, struct task_struct *p, int hardirq_offset,
-+	       unsigned long pc, unsigned long ns)
-+{
-+	struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
-+	cputime_t one_jiffy = jiffies_to_cputime(1);
-+	cputime_t one_jiffy_scaled = cputime_to_scaled(one_jiffy);
-+	cputime64_t tmp = cputime_to_cputime64(one_jiffy);
-+
-+	p->stime_pc += pc;
-+	if (p->stime_pc >= 100) {
-+		p->stime_pc -= 100;
-+		p->stime = cputime_add(p->stime, one_jiffy);
-+		p->stimescaled = cputime_add(p->stimescaled, one_jiffy_scaled);
-+		account_group_system_time(p, one_jiffy);
-+		acct_update_integrals(p);
-+	}
-+	p->se.sum_exec_runtime += ns;
-+
-+	if (hardirq_count() - hardirq_offset)
-+		rq->irq_pc += pc;
-+	else if (softirq_count()) {
-+		rq->softirq_pc += pc;
-+		if (rq->softirq_pc >= 100) {
-+			rq->softirq_pc %= 100;
-+			cpustat->softirq = cputime64_add(cpustat->softirq, tmp);
-+		}
-+	} else {
-+		rq->system_pc += pc;
-+		if (rq->system_pc >= 100) {
-+			rq->system_pc %= 100;
-+			cpustat->system = cputime64_add(cpustat->system, tmp);
-+		}
-+	}
-+}
-+
-+static void pc_user_time(struct rq *rq, struct task_struct *p,
-+			 unsigned long pc, unsigned long ns)
-+{
-+	struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
-+	cputime_t one_jiffy = jiffies_to_cputime(1);
-+	cputime_t one_jiffy_scaled = cputime_to_scaled(one_jiffy);
-+	cputime64_t tmp = cputime_to_cputime64(one_jiffy);
-+
-+	p->utime_pc += pc;
-+	if (p->utime_pc >= 100) {
-+		p->utime_pc -= 100;
-+		p->utime = cputime_add(p->utime, one_jiffy);
-+		p->utimescaled = cputime_add(p->utimescaled, one_jiffy_scaled);
-+		account_group_user_time(p, one_jiffy);
-+		acct_update_integrals(p);
-+	}
-+	p->se.sum_exec_runtime += ns;
-+
-+	if (TASK_NICE(p) > 0 || idleprio_task(p)) {
-+		rq->nice_pc += pc;
-+		if (rq->nice_pc >= 100) {
-+			rq->nice_pc %= 100;
-+			cpustat->nice = cputime64_add(cpustat->nice, tmp);
-+		}
-+	} else {
-+		rq->user_pc += pc;
-+		if (rq->user_pc >= 100) {
-+			rq->user_pc %= 100;
-+			cpustat->user = cputime64_add(cpustat->user, tmp);
-+		}
-+	}
-+}
-+
-+/* Convert nanoseconds to percentage of one tick. */
-+#define NS_TO_PC(NS)	(NS * 100 / JIFFIES_TO_NS(1))
-+
-+/*
-+ * This is called on clock ticks and on context switches.
-+ * Bank in p->se.sum_exec_runtime the ns elapsed since the last tick or switch.
-+ * CPU scheduler quota accounting is also performed here in microseconds.
-+ * The value returned from sched_clock() occasionally gives bogus values so
-+ * some sanity checking is required. Time is supposed to be banked all the
-+ * time so default to half a tick to make up for when sched_clock reverts
-+ * to just returning jiffies, and for hardware that can't do tsc.
-+ */
-+static void
-+update_cpu_clock(struct rq *rq, struct task_struct *p, int tick)
-+{
-+	long time_diff = rq->clock - p->last_ran;
-+	long account_ns = rq->clock - rq->timekeep_clock;
-+	struct task_struct *idle = rq->idle;
-+	unsigned long account_pc;
-+
-+	/*
-+	 * There should be less than or equal to one jiffy worth, and not
-+	 * negative/overflow. time_diff is only used for internal scheduler
-+	 * time_slice accounting.
-+	 */
-+	if (time_diff <= 0)
-+		time_diff = JIFFIES_TO_NS(1) / 2;
-+	else if (time_diff > JIFFIES_TO_NS(1))
-+		time_diff = JIFFIES_TO_NS(1);
-+
-+	if (unlikely(account_ns < 0))
-+		account_ns = 0;
-+
-+	account_pc = NS_TO_PC(account_ns);
-+
-+	if (tick) {
-+		int user_tick = user_mode(get_irq_regs());
-+
-+		/* Accurate tick timekeeping */
-+		if (user_tick)
-+			pc_user_time(rq, p, account_pc, account_ns);
-+		else if (p != idle || (irq_count() != HARDIRQ_OFFSET))
-+			pc_system_time(rq, p, HARDIRQ_OFFSET,
-+				       account_pc, account_ns);
-+		else
-+			pc_idle_time(rq, account_pc);
-+	} else {
-+		/* Accurate subtick timekeeping */
-+		if (p == idle)
-+			pc_idle_time(rq, account_pc);
-+		else
-+			pc_user_time(rq, p, account_pc, account_ns);
-+	}
-+
-+	/* time_slice accounting is done in usecs to avoid overflow on 32bit */
-+	if (rq->rq_policy != SCHED_FIFO && p != idle)
-+		rq->rq_time_slice -= time_diff / 1000;
-+	p->last_ran = rq->timekeep_clock = rq->clock;
-+}
-+
-+/*
-+ * Return any ns on the sched_clock that have not yet been accounted in
-+ * @p in case that task is currently running.
-+ *
-+ * Called with task_grq_lock() held on @rq.
-+ */
-+static u64 do_task_delta_exec(struct task_struct *p, struct rq *rq)
-+{
-+	u64 ns = 0;
-+
-+	if (p == rq->curr) {
-+		update_rq_clock(rq);
-+		ns = rq->clock - p->last_ran;
-+		if ((s64)ns < 0)
-+			ns = 0;
-+	}
-+
-+	return ns;
-+}
-+
-+unsigned long long task_delta_exec(struct task_struct *p)
-+{
-+	unsigned long flags;
-+	struct rq *rq;
-+	u64 ns = 0;
-+
-+	rq = task_grq_lock(p, &flags);
-+	ns = do_task_delta_exec(p, rq);
-+	task_grq_unlock(&flags);
-+
-+	return ns;
-+}
-+
-+/*
-+ * Return accounted runtime for the task.
-+ * In case the task is currently running, return the runtime plus current's
-+ * pending runtime that have not been accounted yet.
-+ */
-+unsigned long long task_sched_runtime(struct task_struct *p)
-+{
-+	unsigned long flags;
-+	struct rq *rq;
-+	u64 ns = 0;
-+
-+	rq = task_grq_lock(p, &flags);
-+	ns = p->se.sum_exec_runtime + do_task_delta_exec(p, rq);
-+	task_grq_unlock(&flags);
-+
-+	return ns;
-+}
-+
-+/*
-+ * Return sum_exec_runtime for the thread group.
-+ * In case the task is currently running, return the sum plus current's
-+ * pending runtime that have not been accounted yet.
-+ *
-+ * Note that the thread group might have other running tasks as well,
-+ * so the return value not includes other pending runtime that other
-+ * running tasks might have.
-+ */
-+unsigned long long thread_group_sched_runtime(struct task_struct *p)
-+{
-+	struct task_cputime totals;
-+	unsigned long flags;
-+	struct rq *rq;
-+	u64 ns;
-+
-+	rq = task_grq_lock(p, &flags);
-+	thread_group_cputime(p, &totals);
-+	ns = totals.sum_exec_runtime + do_task_delta_exec(p, rq);
-+	task_grq_unlock(&flags);
-+
-+	return ns;
-+}
-+
-+/* Compatibility crap for removal */
-+void account_user_time(struct task_struct *p, cputime_t cputime,
-+		       cputime_t cputime_scaled)
-+{
-+}
-+
-+void account_idle_time(cputime_t cputime)
-+{
-+}
-+
-+/*
-+ * Account guest cpu time to a process.
-+ * @p: the process that the cpu time gets accounted to
-+ * @cputime: the cpu time spent in virtual machine since the last update
-+ * @cputime_scaled: cputime scaled by cpu frequency
-+ */
-+static void account_guest_time(struct task_struct *p, cputime_t cputime,
-+			       cputime_t cputime_scaled)
-+{
-+	cputime64_t tmp;
-+	struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
-+
-+	tmp = cputime_to_cputime64(cputime);
-+
-+	/* Add guest time to process. */
-+	p->utime = cputime_add(p->utime, cputime);
-+	p->utimescaled = cputime_add(p->utimescaled, cputime_scaled);
-+	account_group_user_time(p, cputime);
-+	p->gtime = cputime_add(p->gtime, cputime);
-+
-+	/* Add guest time to cpustat. */
-+	cpustat->user = cputime64_add(cpustat->user, tmp);
-+	cpustat->guest = cputime64_add(cpustat->guest, tmp);
-+}
-+
-+/*
-+ * Account system cpu time to a process.
-+ * @p: the process that the cpu time gets accounted to
-+ * @hardirq_offset: the offset to subtract from hardirq_count()
-+ * @cputime: the cpu time spent in kernel space since the last update
-+ * @cputime_scaled: cputime scaled by cpu frequency
-+ * This is for guest only now.
-+ */
-+void account_system_time(struct task_struct *p, int hardirq_offset,
-+			 cputime_t cputime, cputime_t cputime_scaled)
-+{
-+
-+	if ((p->flags & PF_VCPU) && (irq_count() - hardirq_offset == 0))
-+		account_guest_time(p, cputime, cputime_scaled);
-+}
-+
-+/*
-+ * Account for involuntary wait time.
-+ * @steal: the cpu time spent in involuntary wait
-+ */
-+void account_steal_time(cputime_t cputime)
-+{
-+	struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
-+	cputime64_t cputime64 = cputime_to_cputime64(cputime);
-+
-+	cpustat->steal = cputime64_add(cpustat->steal, cputime64);
-+}
-+
-+/*
-+ * Account for idle time.
-+ * @cputime: the cpu time spent in idle wait
-+ */
-+static void account_idle_times(cputime_t cputime)
-+{
-+	struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
-+	cputime64_t cputime64 = cputime_to_cputime64(cputime);
-+	struct rq *rq = this_rq();
-+
-+	if (atomic_read(&rq->nr_iowait) > 0)
-+		cpustat->iowait = cputime64_add(cpustat->iowait, cputime64);
-+	else
-+		cpustat->idle = cputime64_add(cpustat->idle, cputime64);
-+}
-+
-+#ifndef CONFIG_VIRT_CPU_ACCOUNTING
-+
-+void account_process_tick(struct task_struct *p, int user_tick)
-+{
-+}
-+
-+/*
-+ * Account multiple ticks of steal time.
-+ * @p: the process from which the cpu time has been stolen
-+ * @ticks: number of stolen ticks
-+ */
-+void account_steal_ticks(unsigned long ticks)
-+{
-+	account_steal_time(jiffies_to_cputime(ticks));
-+}
-+
-+/*
-+ * Account multiple ticks of idle time.
-+ * @ticks: number of stolen ticks
-+ */
-+void account_idle_ticks(unsigned long ticks)
-+{
-+	account_idle_times(jiffies_to_cputime(ticks));
-+}
-+#endif
-+
-+/*
-+ * Functions to test for when SCHED_ISO tasks have used their allocated
-+ * quota as real time scheduling and convert them back to SCHED_NORMAL.
-+ * Where possible, the data is tested lockless, to avoid grabbing grq_lock
-+ * because the occasional inaccurate result won't matter. However the
-+ * data is only ever modified under lock.
-+ */
-+static void set_iso_refractory(void)
-+{
-+	grq_lock();
-+	grq.iso_refractory = 1;
-+	grq_unlock();
-+}
-+
-+static void clear_iso_refractory(void)
-+{
-+	grq_lock();
-+	grq.iso_refractory = 0;
-+	grq_unlock();
-+}
-+
-+/*
-+ * Test if SCHED_ISO tasks have run longer than their alloted period as RT
-+ * tasks and set the refractory flag if necessary. There is 10% hysteresis
-+ * for unsetting the flag.
-+ */
-+static unsigned int test_ret_isorefractory(struct rq *rq)
-+{
-+	if (likely(!grq.iso_refractory)) {
-+		if (grq.iso_ticks / ISO_PERIOD > sched_iso_cpu)
-+			set_iso_refractory();
-+	} else {
-+		if (grq.iso_ticks / ISO_PERIOD < (sched_iso_cpu * 90 / 100))
-+			clear_iso_refractory();
-+	}
-+	return grq.iso_refractory;
-+}
-+
-+static void iso_tick(void)
-+{
-+	grq_lock();
-+	grq.iso_ticks += 100;
-+	grq_unlock();
-+}
-+
-+/* No SCHED_ISO task was running so decrease rq->iso_ticks */
-+static inline void no_iso_tick(void)
-+{
-+	if (grq.iso_ticks) {
-+		grq_lock();
-+		grq.iso_ticks = grq.iso_ticks * (ISO_PERIOD - 1) / ISO_PERIOD;
-+		grq_unlock();
-+	}
-+}
-+
-+static int rq_running_iso(struct rq *rq)
-+{
-+	return rq->rq_prio == ISO_PRIO;
-+}
-+
-+/* This manages tasks that have run out of timeslice during a scheduler_tick */
-+static void task_running_tick(struct rq *rq)
-+{
-+	struct task_struct *p;
-+
-+	/*
-+	 * If a SCHED_ISO task is running we increment the iso_ticks. In
-+	 * order to prevent SCHED_ISO tasks from causing starvation in the
-+	 * presence of true RT tasks we account those as iso_ticks as well.
-+	 */
-+	if ((rt_queue(rq) || (iso_queue(rq) && !grq.iso_refractory))) {
-+		if (grq.iso_ticks <= (ISO_PERIOD * 100) - 100)
-+			iso_tick();
-+	} else
-+		no_iso_tick();
-+
-+	if (iso_queue(rq)) {
-+		if (unlikely(test_ret_isorefractory(rq))) {
-+			if (rq_running_iso(rq)) {
-+				/*
-+				 * SCHED_ISO task is running as RT and limit
-+				 * has been hit. Force it to reschedule as
-+				 * SCHED_NORMAL by zeroing its time_slice
-+				 */
-+				rq->rq_time_slice = 0;
-+			}
-+		}
-+	}
-+
-+	/* SCHED_FIFO tasks never run out of timeslice. */
-+	if (rq_idle(rq) || rq->rq_time_slice > 0 || rq->rq_policy == SCHED_FIFO)
-+		return;
-+
-+	/* p->rt.time_slice <= 0. We only modify task_struct under grq lock */
-+	grq_lock();
-+	p = rq->curr;
-+	if (likely(task_running(p))) {
-+		requeue_task(p);
-+		set_tsk_need_resched(p);
-+	}
-+	grq_unlock();
-+}
-+
-+void wake_up_idle_cpu(int cpu);
-+
-+/*
-+ * This function gets called by the timer code, with HZ frequency.
-+ * We call it with interrupts disabled. The data modified is all
-+ * local to struct rq so we don't need to grab grq lock.
-+ */
-+void scheduler_tick(void)
-+{
-+	int cpu = smp_processor_id();
-+	struct rq *rq = cpu_rq(cpu);
-+
-+	sched_clock_tick();
-+	update_rq_clock(rq);
-+	update_cpu_clock(rq, rq->curr, 1);
-+	if (!rq_idle(rq))
-+		task_running_tick(rq);
-+	else {
-+		no_iso_tick();
-+		if (unlikely(queued_notrunning()))
-+			set_tsk_need_resched(rq->idle);
-+	}
-+}
-+
-+notrace unsigned long get_parent_ip(unsigned long addr)
-+{
-+	if (in_lock_functions(addr)) {
-+		addr = CALLER_ADDR2;
-+		if (in_lock_functions(addr))
-+			addr = CALLER_ADDR3;
-+	}
-+	return addr;
-+}
-+
-+#if defined(CONFIG_PREEMPT) && (defined(CONFIG_DEBUG_PREEMPT) || \
-+				defined(CONFIG_PREEMPT_TRACER))
-+void __kprobes add_preempt_count(int val)
-+{
-+#ifdef CONFIG_DEBUG_PREEMPT
-+	/*
-+	 * Underflow?
-+	 */
-+	if (DEBUG_LOCKS_WARN_ON((preempt_count() < 0)))
-+		return;
-+#endif
-+	preempt_count() += val;
-+#ifdef CONFIG_DEBUG_PREEMPT
-+	/*
-+	 * Spinlock count overflowing soon?
-+	 */
-+	DEBUG_LOCKS_WARN_ON((preempt_count() & PREEMPT_MASK) >=
-+				PREEMPT_MASK - 10);
-+#endif
-+	if (preempt_count() == val)
-+		trace_preempt_off(CALLER_ADDR0, get_parent_ip(CALLER_ADDR1));
-+}
-+EXPORT_SYMBOL(add_preempt_count);
-+
-+void __kprobes sub_preempt_count(int val)
-+{
-+#ifdef CONFIG_DEBUG_PREEMPT
-+	/*
-+	 * Underflow?
-+	 */
-+	if (DEBUG_LOCKS_WARN_ON(val > preempt_count()))
-+		return;
-+	/*
-+	 * Is the spinlock portion underflowing?
-+	 */
-+	if (DEBUG_LOCKS_WARN_ON((val < PREEMPT_MASK) &&
-+			!(preempt_count() & PREEMPT_MASK)))
-+		return;
-+#endif
-+
-+	if (preempt_count() == val)
-+		trace_preempt_on(CALLER_ADDR0, get_parent_ip(CALLER_ADDR1));
-+	preempt_count() -= val;
-+}
-+EXPORT_SYMBOL(sub_preempt_count);
-+#endif
-+
-+/*
-+ * Deadline is "now" in jiffies + (offset by priority). Setting the deadline
-+ * is the key to everything. It distributes cpu fairly amongst tasks of the
-+ * same nice value, it proportions cpu according to nice level, it means the
-+ * task that last woke up the longest ago has the earliest deadline, thus
-+ * ensuring that interactive tasks get low latency on wake up.
-+ */
-+static inline int prio_deadline_diff(struct task_struct *p)
-+{
-+	return (pratio(p) * rr_interval * HZ / 1000 / 100) ? : 1;
-+}
-+
-+static inline int longest_deadline(void)
-+{
-+	return (prio_ratios[39] * rr_interval * HZ / 1000 / 100);
-+}
-+
-+/*
-+ * SCHED_IDLE tasks still have a deadline set, but offset by to nice +19.
-+ * This allows nice levels to work between IDLEPRIO tasks and gives a
-+ * deadline longer than nice +19 for when they're scheduled as SCHED_NORMAL
-+ * tasks.
-+ */
-+static inline void time_slice_expired(struct task_struct *p)
-+{
-+	reset_first_time_slice(p);
-+	p->rt.time_slice = timeslice();
-+	p->deadline = jiffies + prio_deadline_diff(p);
-+	if (idleprio_task(p))
-+		p->deadline += longest_deadline();
-+}
-+
-+static inline void check_deadline(struct task_struct *p)
-+{
-+	if (p->rt.time_slice <= 0)
-+		time_slice_expired(p);
-+}
-+
-+/*
-+ * O(n) lookup of all tasks in the global runqueue. The real brainfuck
-+ * of lock contention and O(n). It's not really O(n) as only the queued,
-+ * but not running tasks are scanned, and is O(n) queued in the worst case
-+ * scenario only because the right task can be found before scanning all of
-+ * them.
-+ * Tasks are selected in this order:
-+ * Real time tasks are selected purely by their static priority and in the
-+ * order they were queued, so the lowest value idx, and the first queued task
-+ * of that priority value is chosen.
-+ * If no real time tasks are found, the SCHED_ISO priority is checked, and
-+ * all SCHED_ISO tasks have the same priority value, so they're selected by
-+ * the earliest deadline value.
-+ * If no SCHED_ISO tasks are found, SCHED_NORMAL tasks are selected by the
-+ * earliest deadline.
-+ * Finally if no SCHED_NORMAL tasks are found, SCHED_IDLEPRIO tasks are
-+ * selected by the earliest deadline.
-+ */
-+static inline struct
-+task_struct *earliest_deadline_task(struct rq *rq, struct task_struct *idle)
-+{
-+	unsigned long dl, earliest_deadline = 0; /* Initialise to silence compiler */
-+	struct task_struct *p, *edt;
-+	unsigned int cpu = rq->cpu;
-+	struct list_head *queue;
-+	int idx = 0;
-+
-+	edt = idle;
-+retry:
-+	idx = find_next_bit(grq.prio_bitmap, PRIO_LIMIT, idx);
-+	if (idx >= PRIO_LIMIT)
-+		goto out;
-+	queue = &grq.queue[idx];
-+	list_for_each_entry(p, queue, rt.run_list) {
-+		/* Make sure cpu affinity is ok */
-+		if (!cpu_isset(cpu, p->cpus_allowed))
-+			continue;
-+		if (idx < MAX_RT_PRIO) {
-+			/* We found an rt task */
-+			edt = p;
-+			goto out_take;
-+		}
-+
-+		/*
-+		 * No rt task, select the earliest deadline task now.
-+		 * On the 1st run the 2nd condition is never used, so
-+		 * there is no need to initialise earliest_deadline
-+		 * before. Normalise all old deadlines to now.
-+		 */
-+		if (time_before(p->deadline, jiffies))
-+			dl = jiffies;
-+		else
-+			dl = p->deadline;
-+
-+		if (edt == idle ||
-+		    time_before(dl, earliest_deadline)) {
-+			earliest_deadline = dl;
-+			edt = p;
-+		}
-+	}
-+	if (edt == idle) {
-+		if (++idx < PRIO_LIMIT)
-+			goto retry;
-+		goto out;
-+	}
-+out_take:
-+	take_task(rq, edt);
-+out:
-+	return edt;
-+}
-+
-+#ifdef CONFIG_SMP
-+static inline void set_cpuidle_map(unsigned long cpu)
-+{
-+	cpu_set(cpu, grq.cpu_idle_map);
-+}
-+
-+static inline void clear_cpuidle_map(unsigned long cpu)
-+{
-+	cpu_clear(cpu, grq.cpu_idle_map);
-+}
-+
-+#else /* CONFIG_SMP */
-+static inline void set_cpuidle_map(unsigned long cpu)
-+{
-+}
-+
-+static inline void clear_cpuidle_map(unsigned long cpu)
-+{
-+}
-+#endif /* !CONFIG_SMP */
-+
-+/*
-+ * Print scheduling while atomic bug:
-+ */
-+static noinline void __schedule_bug(struct task_struct *prev)
-+{
-+	struct pt_regs *regs = get_irq_regs();
-+
-+	printk(KERN_ERR "BUG: scheduling while atomic: %s/%d/0x%08x\n",
-+		prev->comm, prev->pid, preempt_count());
-+
-+	debug_show_held_locks(prev);
-+	print_modules();
-+	if (irqs_disabled())
-+		print_irqtrace_events(prev);
-+
-+	if (regs)
-+		show_regs(regs);
-+	else
-+		dump_stack();
-+}
-+
-+/*
-+ * Various schedule()-time debugging checks and statistics:
-+ */
-+static inline void schedule_debug(struct task_struct *prev)
-+{
-+	/*
-+	 * Test if we are atomic. Since do_exit() needs to call into
-+	 * schedule() atomically, we ignore that path for now.
-+	 * Otherwise, whine if we are scheduling when we should not be.
-+	 */
-+	if (unlikely(in_atomic_preempt_off() && !prev->exit_state))
-+		__schedule_bug(prev);
-+
-+	profile_hit(SCHED_PROFILING, __builtin_return_address(0));
-+
-+	schedstat_inc(this_rq(), sched_count);
-+#ifdef CONFIG_SCHEDSTATS
-+	if (unlikely(prev->lock_depth >= 0)) {
-+		schedstat_inc(this_rq(), bkl_count);
-+		schedstat_inc(prev, sched_info.bkl_count);
-+	}
-+#endif
-+}
-+
-+/*
-+ * schedule() is the main scheduler function.
-+ */
-+asmlinkage void __sched __schedule(void)
-+{
-+	struct task_struct *prev, *next, *idle;
-+	int deactivate = 0, cpu;
-+	long *switch_count;
-+	struct rq *rq;
-+	u64 now;
-+
-+	cpu = smp_processor_id();
-+	rq = this_rq();
-+	rcu_qsctr_inc(cpu);
-+	prev = rq->curr;
-+	switch_count = &prev->nivcsw;
-+
-+	release_kernel_lock(prev);
-+need_resched_nonpreemptible:
-+
-+	schedule_debug(prev);
-+	idle = rq->idle;
-+	/*
-+	 * The idle thread is not allowed to schedule!
-+	 * Remove this check after it has been exercised a bit.
-+	 */
-+	if (unlikely(prev == idle) && prev->state != TASK_RUNNING) {
-+		printk(KERN_ERR "bad: scheduling from the idle thread!\n");
-+		dump_stack();
-+	}
-+
-+	grq_lock_irq();
-+	update_rq_clock(rq);
-+	now = rq->clock;
-+	update_cpu_clock(rq, prev, 0);
-+
-+	clear_tsk_need_resched(prev);
-+
-+	if (prev->state && !(preempt_count() & PREEMPT_ACTIVE)) {
-+		if (unlikely(signal_pending_state(prev->state, prev)))
-+			prev->state = TASK_RUNNING;
-+		else
-+			deactivate = 1;
-+		switch_count = &prev->nvcsw;
-+	}
-+
-+	if (prev != idle) {
-+		/* Update all the information stored on struct rq */
-+		prev->rt.time_slice = rq->rq_time_slice;
-+		prev->deadline = rq->rq_deadline;
-+		check_deadline(prev);
-+		return_task(prev, deactivate);
-+	}
-+
-+	if (likely(queued_notrunning())) {
-+		next = earliest_deadline_task(rq, idle);
-+	} else {
-+		next = idle;
-+		schedstat_inc(rq, sched_goidle);
-+	}
-+
-+	if (next == rq->idle)
-+		set_cpuidle_map(cpu);
-+	else
-+		clear_cpuidle_map(cpu);
-+
-+	prefetch(next);
-+	prefetch_stack(next);
-+
-+	prev->timestamp = prev->last_ran = now;
-+
-+	if (likely(prev != next)) {
-+		rq->rq_time_slice = next->rt.time_slice;
-+		rq->rq_deadline = next->deadline;
-+		rq->rq_prio = next->prio;
-+
-+		sched_info_switch(prev, next);
-+		grq.nr_switches++;
-+		next->oncpu = 1;
-+		prev->oncpu = 0;
-+		rq->curr = next;
-+		++*switch_count;
-+
-+		context_switch(rq, prev, next); /* unlocks the rq */
-+		/*
-+		 * the context switch might have flipped the stack from under
-+		 * us, hence refresh the local variables.
-+		 */
-+		cpu = smp_processor_id();
-+		rq = cpu_rq(cpu);
-+	} else
-+		grq_unlock_irq();
-+
-+	if (unlikely(reacquire_kernel_lock(current) < 0))
-+		goto need_resched_nonpreemptible;
-+}
-+
-+asmlinkage void __sched schedule(void)
-+{
-+need_resched:
-+	preempt_disable();
-+	__schedule();
-+	preempt_enable_no_resched();
-+	if (unlikely(test_thread_flag(TIF_NEED_RESCHED)))
-+		goto need_resched;
-+}
-+EXPORT_SYMBOL(schedule);
-+
-+#ifdef CONFIG_SMP
-+int mutex_spin_on_owner(struct mutex *lock, struct thread_info *owner)
-+{
-+	return 0;
-+}
-+#endif
-+
-+#ifdef CONFIG_PREEMPT
-+/*
-+ * this is the entry point to schedule() from in-kernel preemption
-+ * off of preempt_enable. Kernel preemptions off return from interrupt
-+ * occur there and call schedule directly.
-+ */
-+asmlinkage void __sched preempt_schedule(void)
-+{
-+	struct thread_info *ti = current_thread_info();
-+
-+	/*
-+	 * If there is a non-zero preempt_count or interrupts are disabled,
-+	 * we do not want to preempt the current task. Just return..
-+	 */
-+	if (likely(ti->preempt_count || irqs_disabled()))
-+		return;
-+
-+	do {
-+		add_preempt_count(PREEMPT_ACTIVE);
-+		schedule();
-+		sub_preempt_count(PREEMPT_ACTIVE);
-+
-+		/*
-+		 * Check again in case we missed a preemption opportunity
-+		 * between schedule and now.
-+		 */
-+		barrier();
-+	} while (need_resched());
-+}
-+EXPORT_SYMBOL(preempt_schedule);
-+
-+/*
-+ * this is the entry point to schedule() from kernel preemption
-+ * off of irq context.
-+ * Note, that this is called and return with irqs disabled. This will
-+ * protect us against recursive calling from irq.
-+ */
-+asmlinkage void __sched preempt_schedule_irq(void)
-+{
-+	struct thread_info *ti = current_thread_info();
-+
-+	/* Catch callers which need to be fixed */
-+	BUG_ON(ti->preempt_count || !irqs_disabled());
-+
-+	do {
-+		add_preempt_count(PREEMPT_ACTIVE);
-+		local_irq_enable();
-+		schedule();
-+		local_irq_disable();
-+		sub_preempt_count(PREEMPT_ACTIVE);
-+
-+		/*
-+		 * Check again in case we missed a preemption opportunity
-+		 * between schedule and now.
-+		 */
-+		barrier();
-+	} while (need_resched());
-+}
-+
-+#endif /* CONFIG_PREEMPT */
-+
-+int default_wake_function(wait_queue_t *curr, unsigned mode, int sync,
-+			  void *key)
-+{
-+	return try_to_wake_up(curr->private, mode, sync);
-+}
-+EXPORT_SYMBOL(default_wake_function);
-+
-+/*
-+ * The core wakeup function.  Non-exclusive wakeups (nr_exclusive == 0) just
-+ * wake everything up.  If it's an exclusive wakeup (nr_exclusive == small +ve
-+ * number) then we wake all the non-exclusive tasks and one exclusive task.
-+ *
-+ * There are circumstances in which we can try to wake a task which has already
-+ * started to run but is not in state TASK_RUNNING.  try_to_wake_up() returns
-+ * zero in this (rare) case, and we handle it by continuing to scan the queue.
-+ */
-+void __wake_up_common(wait_queue_head_t *q, unsigned int mode,
-+		      int nr_exclusive, int sync, void *key)
-+{
-+	struct list_head *tmp, *next;
-+
-+	list_for_each_safe(tmp, next, &q->task_list) {
-+		wait_queue_t *curr = list_entry(tmp, wait_queue_t, task_list);
-+		unsigned flags = curr->flags;
-+
-+		if (curr->func(curr, mode, sync, key) &&
-+				(flags & WQ_FLAG_EXCLUSIVE) && !--nr_exclusive)
-+			break;
-+	}
-+}
-+
-+/**
-+ * __wake_up - wake up threads blocked on a waitqueue.
-+ * @q: the waitqueue
-+ * @mode: which threads
-+ * @nr_exclusive: how many wake-one or wake-many threads to wake up
-+ * @key: is directly passed to the wakeup function
-+ *
-+ * It may be assumed that this function implies a write memory barrier before
-+ * changing the task state if and only if any tasks are woken up.
-+ */
-+void __wake_up(wait_queue_head_t *q, unsigned int mode,
-+			int nr_exclusive, void *key)
-+{
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&q->lock, flags);
-+	__wake_up_common(q, mode, nr_exclusive, 0, key);
-+	spin_unlock_irqrestore(&q->lock, flags);
-+}
-+EXPORT_SYMBOL(__wake_up);
-+
-+/*
-+ * Same as __wake_up but called with the spinlock in wait_queue_head_t held.
-+ */
-+void __wake_up_locked(wait_queue_head_t *q, unsigned int mode)
-+{
-+	__wake_up_common(q, mode, 1, 0, NULL);
-+}
-+
-+void __wake_up_locked_key(wait_queue_head_t *q, unsigned int mode, void *key)
-+{
-+	__wake_up_common(q, mode, 1, 0, key);
-+}
-+
-+/**
-+ * __wake_up_sync_key - wake up threads blocked on a waitqueue.
-+ * @q: the waitqueue
-+ * @mode: which threads
-+ * @nr_exclusive: how many wake-one or wake-many threads to wake up
-+ * @key: opaque value to be passed to wakeup targets
-+ *
-+ * The sync wakeup differs that the waker knows that it will schedule
-+ * away soon, so while the target thread will be woken up, it will not
-+ * be migrated to another CPU - ie. the two threads are 'synchronized'
-+ * with each other. This can prevent needless bouncing between CPUs.
-+ *
-+ * On UP it can prevent extra preemption.
-+ *
-+ * It may be assumed that this function implies a write memory barrier before
-+ * changing the task state if and only if any tasks are woken up.
-+ */
-+void __wake_up_sync_key(wait_queue_head_t *q, unsigned int mode,
-+			int nr_exclusive, void *key)
-+{
-+	unsigned long flags;
-+	int sync = 1;
-+
-+	if (unlikely(!q))
-+		return;
-+
-+	if (unlikely(!nr_exclusive))
-+		sync = 0;
-+
-+	spin_lock_irqsave(&q->lock, flags);
-+	__wake_up_common(q, mode, nr_exclusive, sync, key);
-+	spin_unlock_irqrestore(&q->lock, flags);
-+}
-+EXPORT_SYMBOL_GPL(__wake_up_sync_key);
-+
-+/**
-+ * __wake_up_sync - wake up threads blocked on a waitqueue.
-+ * @q: the waitqueue
-+ * @mode: which threads
-+ * @nr_exclusive: how many wake-one or wake-many threads to wake up
-+ *
-+ * The sync wakeup differs that the waker knows that it will schedule
-+ * away soon, so while the target thread will be woken up, it will not
-+ * be migrated to another CPU - ie. the two threads are 'synchronized'
-+ * with each other. This can prevent needless bouncing between CPUs.
-+ *
-+ * On UP it can prevent extra preemption.
-+ */
-+void __wake_up_sync(wait_queue_head_t *q, unsigned int mode, int nr_exclusive)
-+{
-+	unsigned long flags;
-+	int sync = 1;
-+
-+	if (unlikely(!q))
-+		return;
-+
-+	if (unlikely(!nr_exclusive))
-+		sync = 0;
-+
-+	spin_lock_irqsave(&q->lock, flags);
-+	__wake_up_common(q, mode, nr_exclusive, sync, NULL);
-+	spin_unlock_irqrestore(&q->lock, flags);
-+}
-+EXPORT_SYMBOL_GPL(__wake_up_sync);	/* For internal use only */
-+
-+/**
-+ * complete: - signals a single thread waiting on this completion
-+ * @x:  holds the state of this particular completion
-+ *
-+ * This will wake up a single thread waiting on this completion. Threads will be
-+ * awakened in the same order in which they were queued.
-+ *
-+ * See also complete_all(), wait_for_completion() and related routines.
-+ *
-+ * It may be assumed that this function implies a write memory barrier before
-+ * changing the task state if and only if any tasks are woken up.
-+ */
-+void complete(struct completion *x)
-+{
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&x->wait.lock, flags);
-+	x->done++;
-+	__wake_up_common(&x->wait, TASK_NORMAL, 1, 0, NULL);
-+	spin_unlock_irqrestore(&x->wait.lock, flags);
-+}
-+EXPORT_SYMBOL(complete);
-+
-+/**
-+ * complete_all: - signals all threads waiting on this completion
-+ * @x:  holds the state of this particular completion
-+ *
-+ * This will wake up all threads waiting on this particular completion event.
-+ *
-+ * It may be assumed that this function implies a write memory barrier before
-+ * changing the task state if and only if any tasks are woken up.
-+ */
-+void complete_all(struct completion *x)
-+{
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&x->wait.lock, flags);
-+	x->done += UINT_MAX/2;
-+	__wake_up_common(&x->wait, TASK_NORMAL, 0, 0, NULL);
-+	spin_unlock_irqrestore(&x->wait.lock, flags);
-+}
-+EXPORT_SYMBOL(complete_all);
-+
-+static inline long __sched
-+do_wait_for_common(struct completion *x, long timeout, int state)
-+{
-+	if (!x->done) {
-+		DECLARE_WAITQUEUE(wait, current);
-+
-+		wait.flags |= WQ_FLAG_EXCLUSIVE;
-+		__add_wait_queue_tail(&x->wait, &wait);
-+		do {
-+			if (signal_pending_state(state, current)) {
-+				timeout = -ERESTARTSYS;
-+				break;
-+			}
-+			__set_current_state(state);
-+			spin_unlock_irq(&x->wait.lock);
-+			timeout = schedule_timeout(timeout);
-+			spin_lock_irq(&x->wait.lock);
-+		} while (!x->done && timeout);
-+		__remove_wait_queue(&x->wait, &wait);
-+		if (!x->done)
-+			return timeout;
-+	}
-+	x->done--;
-+	return timeout ?: 1;
-+}
-+
-+static long __sched
-+wait_for_common(struct completion *x, long timeout, int state)
-+{
-+	might_sleep();
-+
-+	spin_lock_irq(&x->wait.lock);
-+	timeout = do_wait_for_common(x, timeout, state);
-+	spin_unlock_irq(&x->wait.lock);
-+	return timeout;
-+}
-+
-+/**
-+ * wait_for_completion: - waits for completion of a task
-+ * @x:  holds the state of this particular completion
-+ *
-+ * This waits to be signaled for completion of a specific task. It is NOT
-+ * interruptible and there is no timeout.
-+ *
-+ * See also similar routines (i.e. wait_for_completion_timeout()) with timeout
-+ * and interrupt capability. Also see complete().
-+ */
-+void __sched wait_for_completion(struct completion *x)
-+{
-+	wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_UNINTERRUPTIBLE);
-+}
-+EXPORT_SYMBOL(wait_for_completion);
-+
-+/**
-+ * wait_for_completion_timeout: - waits for completion of a task (w/timeout)
-+ * @x:  holds the state of this particular completion
-+ * @timeout:  timeout value in jiffies
-+ *
-+ * This waits for either a completion of a specific task to be signaled or for a
-+ * specified timeout to expire. The timeout is in jiffies. It is not
-+ * interruptible.
-+ */
-+unsigned long __sched
-+wait_for_completion_timeout(struct completion *x, unsigned long timeout)
-+{
-+	return wait_for_common(x, timeout, TASK_UNINTERRUPTIBLE);
-+}
-+EXPORT_SYMBOL(wait_for_completion_timeout);
-+
-+/**
-+ * wait_for_completion_interruptible: - waits for completion of a task (w/intr)
-+ * @x:  holds the state of this particular completion
-+ *
-+ * This waits for completion of a specific task to be signaled. It is
-+ * interruptible.
-+ */
-+int __sched wait_for_completion_interruptible(struct completion *x)
-+{
-+	long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_INTERRUPTIBLE);
-+	if (t == -ERESTARTSYS)
-+		return t;
-+	return 0;
-+}
-+EXPORT_SYMBOL(wait_for_completion_interruptible);
-+
-+/**
-+ * wait_for_completion_interruptible_timeout: - waits for completion (w/(to,intr))
-+ * @x:  holds the state of this particular completion
-+ * @timeout:  timeout value in jiffies
-+ *
-+ * This waits for either a completion of a specific task to be signaled or for a
-+ * specified timeout to expire. It is interruptible. The timeout is in jiffies.
-+ */
-+unsigned long __sched
-+wait_for_completion_interruptible_timeout(struct completion *x,
-+					  unsigned long timeout)
-+{
-+	return wait_for_common(x, timeout, TASK_INTERRUPTIBLE);
-+}
-+EXPORT_SYMBOL(wait_for_completion_interruptible_timeout);
-+
-+/**
-+ * wait_for_completion_killable: - waits for completion of a task (killable)
-+ * @x:  holds the state of this particular completion
-+ *
-+ * This waits to be signaled for completion of a specific task. It can be
-+ * interrupted by a kill signal.
-+ */
-+int __sched wait_for_completion_killable(struct completion *x)
-+{
-+	long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_KILLABLE);
-+	if (t == -ERESTARTSYS)
-+		return t;
-+	return 0;
-+}
-+EXPORT_SYMBOL(wait_for_completion_killable);
-+
-+/**
-+ *	try_wait_for_completion - try to decrement a completion without blocking
-+ *	@x:	completion structure
-+ *
-+ *	Returns: 0 if a decrement cannot be done without blocking
-+ *		 1 if a decrement succeeded.
-+ *
-+ *	If a completion is being used as a counting completion,
-+ *	attempt to decrement the counter without blocking. This
-+ *	enables us to avoid waiting if the resource the completion
-+ *	is protecting is not available.
-+ */
-+bool try_wait_for_completion(struct completion *x)
-+{
-+	int ret = 1;
-+
-+	spin_lock_irq(&x->wait.lock);
-+	if (!x->done)
-+		ret = 0;
-+	else
-+		x->done--;
-+	spin_unlock_irq(&x->wait.lock);
-+	return ret;
-+}
-+EXPORT_SYMBOL(try_wait_for_completion);
-+
-+/**
-+ *	completion_done - Test to see if a completion has any waiters
-+ *	@x:	completion structure
-+ *
-+ *	Returns: 0 if there are waiters (wait_for_completion() in progress)
-+ *		 1 if there are no waiters.
-+ *
-+ */
-+bool completion_done(struct completion *x)
-+{
-+	int ret = 1;
-+
-+	spin_lock_irq(&x->wait.lock);
-+	if (!x->done)
-+		ret = 0;
-+	spin_unlock_irq(&x->wait.lock);
-+	return ret;
-+}
-+EXPORT_SYMBOL(completion_done);
-+
-+static long __sched
-+sleep_on_common(wait_queue_head_t *q, int state, long timeout)
-+{
-+	unsigned long flags;
-+	wait_queue_t wait;
-+
-+	init_waitqueue_entry(&wait, current);
-+
-+	__set_current_state(state);
-+
-+	spin_lock_irqsave(&q->lock, flags);
-+	__add_wait_queue(q, &wait);
-+	spin_unlock(&q->lock);
-+	timeout = schedule_timeout(timeout);
-+	spin_lock_irq(&q->lock);
-+	__remove_wait_queue(q, &wait);
-+	spin_unlock_irqrestore(&q->lock, flags);
-+
-+	return timeout;
-+}
-+
-+void __sched interruptible_sleep_on(wait_queue_head_t *q)
-+{
-+	sleep_on_common(q, TASK_INTERRUPTIBLE, MAX_SCHEDULE_TIMEOUT);
-+}
-+EXPORT_SYMBOL(interruptible_sleep_on);
-+
-+long __sched
-+interruptible_sleep_on_timeout(wait_queue_head_t *q, long timeout)
-+{
-+	return sleep_on_common(q, TASK_INTERRUPTIBLE, timeout);
-+}
-+EXPORT_SYMBOL(interruptible_sleep_on_timeout);
-+
-+void __sched sleep_on(wait_queue_head_t *q)
-+{
-+	sleep_on_common(q, TASK_UNINTERRUPTIBLE, MAX_SCHEDULE_TIMEOUT);
-+}
-+EXPORT_SYMBOL(sleep_on);
-+
-+long __sched sleep_on_timeout(wait_queue_head_t *q, long timeout)
-+{
-+	return sleep_on_common(q, TASK_UNINTERRUPTIBLE, timeout);
-+}
-+EXPORT_SYMBOL(sleep_on_timeout);
-+
-+#ifdef CONFIG_RT_MUTEXES
-+
-+/*
-+ * rt_mutex_setprio - set the current priority of a task
-+ * @p: task
-+ * @prio: prio value (kernel-internal form)
-+ *
-+ * This function changes the 'effective' priority of a task. It does
-+ * not touch ->normal_prio like __setscheduler().
-+ *
-+ * Used by the rt_mutex code to implement priority inheritance logic.
-+ */
-+void rt_mutex_setprio(struct task_struct *p, int prio)
-+{
-+	unsigned long flags;
-+	int queued, oldprio;
-+	struct rq *rq;
-+
-+	BUG_ON(prio < 0 || prio > MAX_PRIO);
-+
-+	rq = time_task_grq_lock(p, &flags);
-+
-+	oldprio = p->prio;
-+	queued = task_queued_only(p);
-+	if (queued)
-+		dequeue_task(p);
-+	p->prio = prio;
-+	if (task_running(p) && prio > oldprio)
-+		resched_task(p);
-+	if (queued) {
-+		enqueue_task(p);
-+		try_preempt(p);
-+	}
-+
-+	task_grq_unlock(&flags);
-+}
-+
-+#endif
-+
-+/*
-+ * Adjust the deadline for when the priority is to change, before it's
-+ * changed.
-+ */
-+static void adjust_deadline(struct task_struct *p, int new_prio)
-+{
-+	p->deadline += (prio_ratios[USER_PRIO(new_prio)] - pratio(p)) *
-+			rr_interval * HZ / 1000 / 100;
-+}
-+
-+void set_user_nice(struct task_struct *p, long nice)
-+{
-+	int queued, new_static;
-+	unsigned long flags;
-+	struct rq *rq;
-+
-+	if (TASK_NICE(p) == nice || nice < -20 || nice > 19)
-+		return;
-+	new_static = NICE_TO_PRIO(nice);
-+	/*
-+	 * We have to be careful, if called from sys_setpriority(),
-+	 * the task might be in the middle of scheduling on another CPU.
-+	 */
-+	rq = time_task_grq_lock(p, &flags);
-+	/*
-+	 * The RT priorities are set via sched_setscheduler(), but we still
-+	 * allow the 'normal' nice value to be set - but as expected
-+	 * it wont have any effect on scheduling until the task is
-+	 * not SCHED_NORMAL/SCHED_BATCH:
-+	 */
-+	if (has_rt_policy(p)) {
-+		p->static_prio = new_static;
-+		goto out_unlock;
-+	}
-+	queued = task_queued_only(p);
-+	/*
-+	 * If p is actually running, we don't need to do anything when
-+	 * changing the priority because the grq is unaffected.
-+	 */
-+	if (queued)
-+		dequeue_task(p);
-+
-+	adjust_deadline(p, new_static);
-+	p->static_prio = new_static;
-+	p->prio = effective_prio(p);
-+
-+	if (queued) {
-+		enqueue_task(p);
-+		try_preempt(p);
-+	}
-+
-+	/* Just resched the task, schedule() will know what to do. */
-+	if (task_running(p))
-+		resched_task(p);
-+out_unlock:
-+	task_grq_unlock(&flags);
-+}
-+EXPORT_SYMBOL(set_user_nice);
-+
-+/*
-+ * can_nice - check if a task can reduce its nice value
-+ * @p: task
-+ * @nice: nice value
-+ */
-+int can_nice(const struct task_struct *p, const int nice)
-+{
-+	/* convert nice value [19,-20] to rlimit style value [1,40] */
-+	int nice_rlim = 20 - nice;
-+
-+	return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
-+		capable(CAP_SYS_NICE));
-+}
-+
-+#ifdef __ARCH_WANT_SYS_NICE
-+
-+/*
-+ * sys_nice - change the priority of the current process.
-+ * @increment: priority increment
-+ *
-+ * sys_setpriority is a more generic, but much slower function that
-+ * does similar things.
-+ */
-+SYSCALL_DEFINE1(nice, int, increment)
-+{
-+	long nice, retval;
-+
-+	/*
-+	 * Setpriority might change our priority at the same moment.
-+	 * We don't have to worry. Conceptually one call occurs first
-+	 * and we have a single winner.
-+	 */
-+	if (increment < -40)
-+		increment = -40;
-+	if (increment > 40)
-+		increment = 40;
-+
-+	nice = TASK_NICE(current) + increment;
-+	if (nice < -20)
-+		nice = -20;
-+	if (nice > 19)
-+		nice = 19;
-+
-+	if (increment < 0 && !can_nice(current, nice))
-+		return -EPERM;
-+
-+	retval = security_task_setnice(current, nice);
-+	if (retval)
-+		return retval;
-+
-+	set_user_nice(current, nice);
-+	return 0;
-+}
-+
-+#endif
-+
-+/**
-+ * task_prio - return the priority value of a given task.
-+ * @p: the task in question.
-+ *
-+ * This is the priority value as seen by users in /proc.
-+ * RT tasks are offset by -100. Normal tasks are centered
-+ * around 1, value goes from 0 (SCHED_ISO) up to 82 (nice +19
-+ * SCHED_IDLE).
-+ */
-+int task_prio(const struct task_struct *p)
-+{
-+	int delta, prio = p->prio - MAX_RT_PRIO;
-+
-+	/* rt tasks and iso tasks */
-+	if (prio <= 0)
-+		goto out;
-+
-+	delta = (p->deadline - jiffies) * 40 / longest_deadline();
-+	if (delta > 0 && delta <= 80)
-+		prio += delta;
-+out:
-+	return prio;
-+}
-+
-+/**
-+ * task_nice - return the nice value of a given task.
-+ * @p: the task in question.
-+ */
-+int task_nice(const struct task_struct *p)
-+{
-+	return TASK_NICE(p);
-+}
-+EXPORT_SYMBOL_GPL(task_nice);
-+
-+/**
-+ * idle_cpu - is a given cpu idle currently?
-+ * @cpu: the processor in question.
-+ */
-+int idle_cpu(int cpu)
-+{
-+	return cpu_curr(cpu) == cpu_rq(cpu)->idle;
-+}
-+
-+/**
-+ * idle_task - return the idle task for a given cpu.
-+ * @cpu: the processor in question.
-+ */
-+struct task_struct *idle_task(int cpu)
-+{
-+	return cpu_rq(cpu)->idle;
-+}
-+
-+/**
-+ * find_process_by_pid - find a process with a matching PID value.
-+ * @pid: the pid in question.
-+ */
-+static inline struct task_struct *find_process_by_pid(pid_t pid)
-+{
-+	return pid ? find_task_by_vpid(pid) : current;
-+}
-+
-+/* Actually do priority change: must hold grq lock. */
-+static void __setscheduler(struct task_struct *p, int policy, int prio)
-+{
-+	BUG_ON(task_queued_only(p));
-+
-+	p->policy = policy;
-+	p->rt_priority = prio;
-+	p->normal_prio = normal_prio(p);
-+	/* we are holding p->pi_lock already */
-+	p->prio = rt_mutex_getprio(p);
-+	/*
-+	 * Reschedule if running. schedule() will know if it can continue
-+	 * running or not.
-+	 */
-+	if (task_running(p))
-+		resched_task(p);
-+}
-+
-+/*
-+ * check the target process has a UID that matches the current process's
-+ */
-+static bool check_same_owner(struct task_struct *p)
-+{
-+	const struct cred *cred = current_cred(), *pcred;
-+	bool match;
-+
-+	rcu_read_lock();
-+	pcred = __task_cred(p);
-+	match = (cred->euid == pcred->euid ||
-+		 cred->euid == pcred->uid);
-+	rcu_read_unlock();
-+	return match;
-+}
-+
-+static int __sched_setscheduler(struct task_struct *p, int policy,
-+		       struct sched_param *param, bool user)
-+{
-+	struct sched_param zero_param = { .sched_priority = 0 };
-+	int queued, retval, oldprio, oldpolicy = -1;
-+	unsigned long flags, rlim_rtprio = 0;
-+	struct rq *rq;
-+
-+	/* may grab non-irq protected spin_locks */
-+	BUG_ON(in_interrupt());
-+
-+	if (is_rt_policy(policy) && !capable(CAP_SYS_NICE)) {
-+		unsigned long lflags;
-+
-+		if (!lock_task_sighand(p, &lflags))
-+			return -ESRCH;
-+		rlim_rtprio = p->signal->rlim[RLIMIT_RTPRIO].rlim_cur;
-+		unlock_task_sighand(p, &lflags);
-+		if (rlim_rtprio)
-+			goto recheck;
-+		/*
-+		 * If the caller requested an RT policy without having the
-+		 * necessary rights, we downgrade the policy to SCHED_ISO.
-+		 * We also set the parameter to zero to pass the checks.
-+		 */
-+		policy = SCHED_ISO;
-+		param = &zero_param;
-+	}
-+recheck:
-+	/* double check policy once rq lock held */
-+	if (policy < 0)
-+		policy = oldpolicy = p->policy;
-+	else if (!SCHED_RANGE(policy))
-+		return -EINVAL;
-+	/*
-+	 * Valid priorities for SCHED_FIFO and SCHED_RR are
-+	 * 1..MAX_USER_RT_PRIO-1, valid priority for SCHED_NORMAL and
-+	 * SCHED_BATCH is 0.
-+	 */
-+	if (param->sched_priority < 0 ||
-+	    (p->mm && param->sched_priority > MAX_USER_RT_PRIO-1) ||
-+	    (!p->mm && param->sched_priority > MAX_RT_PRIO-1))
-+		return -EINVAL;
-+	if (is_rt_policy(policy) != (param->sched_priority != 0))
-+		return -EINVAL;
-+
-+	/*
-+	 * Allow unprivileged RT tasks to decrease priority:
-+	 */
-+	if (user && !capable(CAP_SYS_NICE)) {
-+		if (is_rt_policy(policy)) {
-+			/* can't set/change the rt policy */
-+			if (policy != p->policy && !rlim_rtprio)
-+				return -EPERM;
-+
-+			/* can't increase priority */
-+			if (param->sched_priority > p->rt_priority &&
-+			    param->sched_priority > rlim_rtprio)
-+				return -EPERM;
-+		} else {
-+			switch (p->policy) {
-+				/*
-+				 * Can only downgrade policies but not back to
-+				 * SCHED_NORMAL
-+				 */
-+				case SCHED_ISO:
-+					if (policy == SCHED_ISO)
-+						goto out;
-+					if (policy == SCHED_NORMAL)
-+						return -EPERM;
-+					break;
-+				case SCHED_BATCH:
-+					if (policy == SCHED_BATCH)
-+						goto out;
-+					if (policy != SCHED_IDLE)
-+					    	return -EPERM;
-+					break;
-+				case SCHED_IDLE:
-+					if (policy == SCHED_IDLE)
-+						goto out;
-+					return -EPERM;
-+				default:
-+					break;
-+			}
-+		}
-+
-+		/* can't change other user's priorities */
-+		if (!check_same_owner(p))
-+			return -EPERM;
-+	}
-+
-+	retval = security_task_setscheduler(p, policy, param);
-+	if (retval)
-+		return retval;
-+	/*
-+	 * make sure no PI-waiters arrive (or leave) while we are
-+	 * changing the priority of the task:
-+	 */
-+	spin_lock_irqsave(&p->pi_lock, flags);
-+	/*
-+	 * To be able to change p->policy safely, the apropriate
-+	 * runqueue lock must be held.
-+	 */
-+	rq = __task_grq_lock(p);
-+	/* recheck policy now with rq lock held */
-+	if (unlikely(oldpolicy != -1 && oldpolicy != p->policy)) {
-+		__task_grq_unlock();
-+		spin_unlock_irqrestore(&p->pi_lock, flags);
-+		policy = oldpolicy = -1;
-+		goto recheck;
-+	}
-+	update_rq_clock(rq);
-+	queued = task_queued_only(p);
-+	if (queued)
-+		dequeue_task(p);
-+	oldprio = p->prio;
-+	__setscheduler(p, policy, param->sched_priority);
-+	if (queued) {
-+		enqueue_task(p);
-+		try_preempt(p);
-+	}
-+	__task_grq_unlock();
-+	spin_unlock_irqrestore(&p->pi_lock, flags);
-+
-+	rt_mutex_adjust_pi(p);
-+out:
-+	return 0;
-+}
-+
-+/**
-+ * sched_setscheduler - change the scheduling policy and/or RT priority of a thread.
-+ * @p: the task in question.
-+ * @policy: new policy.
-+ * @param: structure containing the new RT priority.
-+ *
-+ * NOTE that the task may be already dead.
-+ */
-+int sched_setscheduler(struct task_struct *p, int policy,
-+		       struct sched_param *param)
-+{
-+	return __sched_setscheduler(p, policy, param, true);
-+}
-+
-+EXPORT_SYMBOL_GPL(sched_setscheduler);
-+
-+/**
-+ * sched_setscheduler_nocheck - change the scheduling policy and/or RT priority of a thread from kernelspace.
-+ * @p: the task in question.
-+ * @policy: new policy.
-+ * @param: structure containing the new RT priority.
-+ *
-+ * Just like sched_setscheduler, only don't bother checking if the
-+ * current context has permission.  For example, this is needed in
-+ * stop_machine(): we create temporary high priority worker threads,
-+ * but our caller might not have that capability.
-+ */
-+int sched_setscheduler_nocheck(struct task_struct *p, int policy,
-+			       struct sched_param *param)
-+{
-+	return __sched_setscheduler(p, policy, param, false);
-+}
-+
-+static int
-+do_sched_setscheduler(pid_t pid, int policy, struct sched_param __user *param)
-+{
-+	struct sched_param lparam;
-+	struct task_struct *p;
-+	int retval;
-+
-+	if (!param || pid < 0)
-+		return -EINVAL;
-+	if (copy_from_user(&lparam, param, sizeof(struct sched_param)))
-+		return -EFAULT;
-+
-+	rcu_read_lock();
-+	retval = -ESRCH;
-+	p = find_process_by_pid(pid);
-+	if (p != NULL)
-+		retval = sched_setscheduler(p, policy, &lparam);
-+	rcu_read_unlock();
-+
-+	return retval;
-+}
-+
-+/**
-+ * sys_sched_setscheduler - set/change the scheduler policy and RT priority
-+ * @pid: the pid in question.
-+ * @policy: new policy.
-+ * @param: structure containing the new RT priority.
-+ */
-+asmlinkage long sys_sched_setscheduler(pid_t pid, int policy,
-+				       struct sched_param __user *param)
-+{
-+	/* negative values for policy are not valid */
-+	if (policy < 0)
-+		return -EINVAL;
-+
-+	return do_sched_setscheduler(pid, policy, param);
-+}
-+
-+/**
-+ * sys_sched_setparam - set/change the RT priority of a thread
-+ * @pid: the pid in question.
-+ * @param: structure containing the new RT priority.
-+ */
-+SYSCALL_DEFINE2(sched_setparam, pid_t, pid, struct sched_param __user *, param)
-+{
-+	return do_sched_setscheduler(pid, -1, param);
-+}
-+
-+/**
-+ * sys_sched_getscheduler - get the policy (scheduling class) of a thread
-+ * @pid: the pid in question.
-+ */
-+SYSCALL_DEFINE1(sched_getscheduler, pid_t, pid)
-+{
-+	struct task_struct *p;
-+	int retval = -EINVAL;
-+
-+	if (pid < 0)
-+		goto out_nounlock;
-+
-+	retval = -ESRCH;
-+	read_lock(&tasklist_lock);
-+	p = find_process_by_pid(pid);
-+	if (p) {
-+		retval = security_task_getscheduler(p);
-+		if (!retval)
-+			retval = p->policy;
-+	}
-+	read_unlock(&tasklist_lock);
-+
-+out_nounlock:
-+	return retval;
-+}
-+
-+/**
-+ * sys_sched_getscheduler - get the RT priority of a thread
-+ * @pid: the pid in question.
-+ * @param: structure containing the RT priority.
-+ */
-+SYSCALL_DEFINE2(sched_getparam, pid_t, pid, struct sched_param __user *, param)
-+{
-+	struct sched_param lp;
-+	struct task_struct *p;
-+	int retval = -EINVAL;
-+
-+	if (!param || pid < 0)
-+		goto out_nounlock;
-+
-+	read_lock(&tasklist_lock);
-+	p = find_process_by_pid(pid);
-+	retval = -ESRCH;
-+	if (!p)
-+		goto out_unlock;
-+
-+	retval = security_task_getscheduler(p);
-+	if (retval)
-+		goto out_unlock;
-+
-+	lp.sched_priority = p->rt_priority;
-+	read_unlock(&tasklist_lock);
-+
-+	/*
-+	 * This one might sleep, we cannot do it with a spinlock held ...
-+	 */
-+	retval = copy_to_user(param, &lp, sizeof(*param)) ? -EFAULT : 0;
-+
-+out_nounlock:
-+	return retval;
-+
-+out_unlock:
-+	read_unlock(&tasklist_lock);
-+	return retval;
-+}
-+
-+long sched_setaffinity(pid_t pid, const struct cpumask *in_mask)
-+{
-+	cpumask_var_t cpus_allowed, new_mask;
-+	struct task_struct *p;
-+	int retval;
-+
-+	get_online_cpus();
-+	read_lock(&tasklist_lock);
-+
-+	p = find_process_by_pid(pid);
-+	if (!p) {
-+		read_unlock(&tasklist_lock);
-+		put_online_cpus();
-+		return -ESRCH;
-+	}
-+
-+	/*
-+	 * It is not safe to call set_cpus_allowed with the
-+	 * tasklist_lock held. We will bump the task_struct's
-+	 * usage count and then drop tasklist_lock.
-+	 */
-+	get_task_struct(p);
-+	read_unlock(&tasklist_lock);
-+
-+	if (!alloc_cpumask_var(&cpus_allowed, GFP_KERNEL)) {
-+		retval = -ENOMEM;
-+		goto out_put_task;
-+	}
-+	if (!alloc_cpumask_var(&new_mask, GFP_KERNEL)) {
-+		retval = -ENOMEM;
-+		goto out_free_cpus_allowed;
-+	}
-+	retval = -EPERM;
-+	if (!check_same_owner(p) && !capable(CAP_SYS_NICE))
-+		goto out_unlock;
-+
-+	retval = security_task_setscheduler(p, 0, NULL);
-+	if (retval)
-+		goto out_unlock;
-+
-+	cpuset_cpus_allowed(p, cpus_allowed);
-+	cpumask_and(new_mask, in_mask, cpus_allowed);
-+again:
-+	retval = set_cpus_allowed_ptr(p, new_mask);
-+
-+	if (!retval) {
-+		cpuset_cpus_allowed(p, cpus_allowed);
-+		if (!cpumask_subset(new_mask, cpus_allowed)) {
-+			/*
-+			 * We must have raced with a concurrent cpuset
-+			 * update. Just reset the cpus_allowed to the
-+			 * cpuset's cpus_allowed
-+			 */
-+			cpumask_copy(new_mask, cpus_allowed);
-+			goto again;
-+		}
-+	}
-+out_unlock:
-+	free_cpumask_var(new_mask);
-+out_free_cpus_allowed:
-+	free_cpumask_var(cpus_allowed);
-+out_put_task:
-+	put_task_struct(p);
-+	put_online_cpus();
-+	return retval;
-+}
-+
-+static int get_user_cpu_mask(unsigned long __user *user_mask_ptr, unsigned len,
-+			     cpumask_t *new_mask)
-+{
-+	if (len < sizeof(cpumask_t)) {
-+		memset(new_mask, 0, sizeof(cpumask_t));
-+	} else if (len > sizeof(cpumask_t)) {
-+		len = sizeof(cpumask_t);
-+	}
-+	return copy_from_user(new_mask, user_mask_ptr, len) ? -EFAULT : 0;
-+}
-+
-+
-+/**
-+ * sys_sched_setaffinity - set the cpu affinity of a process
-+ * @pid: pid of the process
-+ * @len: length in bytes of the bitmask pointed to by user_mask_ptr
-+ * @user_mask_ptr: user-space pointer to the new cpu mask
-+ */
-+SYSCALL_DEFINE3(sched_setaffinity, pid_t, pid, unsigned int, len,
-+		unsigned long __user *, user_mask_ptr)
-+{
-+	cpumask_var_t new_mask;
-+	int retval;
-+
-+	if (!alloc_cpumask_var(&new_mask, GFP_KERNEL))
-+		return -ENOMEM;
-+
-+	retval = get_user_cpu_mask(user_mask_ptr, len, new_mask);
-+	if (retval == 0)
-+		retval = sched_setaffinity(pid, new_mask);
-+	free_cpumask_var(new_mask);
-+	return retval;
-+}
-+
-+long sched_getaffinity(pid_t pid, cpumask_t *mask)
-+{
-+	struct task_struct *p;
-+	int retval;
-+
-+	mutex_lock(&sched_hotcpu_mutex);
-+	read_lock(&tasklist_lock);
-+
-+	retval = -ESRCH;
-+	p = find_process_by_pid(pid);
-+	if (!p)
-+		goto out_unlock;
-+
-+	retval = security_task_getscheduler(p);
-+	if (retval)
-+		goto out_unlock;
-+
-+	cpus_and(*mask, p->cpus_allowed, cpu_online_map);
-+
-+out_unlock:
-+	read_unlock(&tasklist_lock);
-+	mutex_unlock(&sched_hotcpu_mutex);
-+	if (retval)
-+		return retval;
-+
-+	return 0;
-+}
-+
-+/**
-+ * sys_sched_getaffinity - get the cpu affinity of a process
-+ * @pid: pid of the process
-+ * @len: length in bytes of the bitmask pointed to by user_mask_ptr
-+ * @user_mask_ptr: user-space pointer to hold the current cpu mask
-+ */
-+SYSCALL_DEFINE3(sched_getaffinity, pid_t, pid, unsigned int, len,
-+		unsigned long __user *, user_mask_ptr)
-+{
-+	int ret;
-+	cpumask_var_t mask;
-+
-+	if (len < cpumask_size())
-+		return -EINVAL;
-+
-+	if (!alloc_cpumask_var(&mask, GFP_KERNEL))
-+		return -ENOMEM;
-+
-+	ret = sched_getaffinity(pid, mask);
-+	if (ret == 0) {
-+		if (copy_to_user(user_mask_ptr, mask, cpumask_size()))
-+			ret = -EFAULT;
-+		else
-+			ret = cpumask_size();
-+	}
-+	free_cpumask_var(mask);
-+
-+	return ret;
-+}
-+
-+/**
-+ * sys_sched_yield - yield the current processor to other threads.
-+ *
-+ * This function yields the current CPU to other tasks. It does this by
-+ * refilling the timeslice, resetting the deadline and scheduling away.
-+ */
-+SYSCALL_DEFINE0(sched_yield)
-+{
-+	struct task_struct *p;
-+
-+	grq_lock_irq();
-+	p = current;
-+	schedstat_inc(this_rq(), yld_count);
-+	update_rq_clock(task_rq(p));
-+	time_slice_expired(p);
-+	requeue_task(p);
-+
-+	/*
-+	 * Since we are going to call schedule() anyway, there's
-+	 * no need to preempt or enable interrupts:
-+	 */
-+	__release(grq.lock);
-+	spin_release(&grq.lock.dep_map, 1, _THIS_IP_);
-+	_raw_spin_unlock(&grq.lock);
-+	preempt_enable_no_resched();
-+
-+	schedule();
-+
-+	return 0;
-+}
-+
-+static inline int should_resched(void)
-+{
-+	return need_resched() && !(preempt_count() & PREEMPT_ACTIVE);
-+}
-+
-+static void __cond_resched(void)
-+{
-+#ifdef CONFIG_DEBUG_SPINLOCK_SLEEP
-+	__might_sleep(__FILE__, __LINE__);
-+#endif
-+	/*
-+	 * The BKS might be reacquired before we have dropped
-+	 * PREEMPT_ACTIVE, which could trigger a second
-+	 * cond_resched() call.
-+	 */
-+	do {
-+		add_preempt_count(PREEMPT_ACTIVE);
-+		schedule();
-+		sub_preempt_count(PREEMPT_ACTIVE);
-+	} while (need_resched());
-+}
-+
-+int __sched _cond_resched(void)
-+{
-+	if (should_resched()) {
-+		__cond_resched();
-+		return 1;
-+	}
-+	return 0;
-+}
-+EXPORT_SYMBOL(_cond_resched);
-+
-+/*
-+ * cond_resched_lock() - if a reschedule is pending, drop the given lock,
-+ * call schedule, and on return reacquire the lock.
-+ *
-+ * This works OK both with and without CONFIG_PREEMPT.  We do strange low-level
-+ * operations here to prevent schedule() from being called twice (once via
-+ * spin_unlock(), once by hand).
-+ */
-+int cond_resched_lock(spinlock_t *lock)
-+{
-+	int resched = should_resched();
-+	int ret = 0;
-+
-+	if (spin_needbreak(lock) || resched) {
-+		spin_unlock(lock);
-+		if (resched)
-+			__cond_resched();
-+		else
-+			cpu_relax();
-+		ret = 1;
-+		spin_lock(lock);
-+	}
-+	return ret;
-+}
-+EXPORT_SYMBOL(cond_resched_lock);
-+
-+int __sched cond_resched_softirq(void)
-+{
-+	BUG_ON(!in_softirq());
-+
-+	if (should_resched()) {
-+		local_bh_enable();
-+		__cond_resched();
-+		local_bh_disable();
-+		return 1;
-+	}
-+	return 0;
-+}
-+EXPORT_SYMBOL(cond_resched_softirq);
-+
-+/**
-+ * yield - yield the current processor to other threads.
-+ *
-+ * This is a shortcut for kernel-space yielding - it marks the
-+ * thread runnable and calls sys_sched_yield().
-+ */
-+void __sched yield(void)
-+{
-+	set_current_state(TASK_RUNNING);
-+	sys_sched_yield();
-+}
-+EXPORT_SYMBOL(yield);
-+
-+/*
-+ * This task is about to go to sleep on IO.  Increment rq->nr_iowait so
-+ * that process accounting knows that this is a task in IO wait state.
-+ *
-+ * But don't do that if it is a deliberate, throttling IO wait (this task
-+ * has set its backing_dev_info: the queue against which it should throttle)
-+ */
-+void __sched io_schedule(void)
-+{
-+	struct rq *rq = &__raw_get_cpu_var(runqueues);
-+
-+	delayacct_blkio_start();
-+	atomic_inc(&rq->nr_iowait);
-+	schedule();
-+	atomic_dec(&rq->nr_iowait);
-+	delayacct_blkio_end();
-+}
-+EXPORT_SYMBOL(io_schedule);
-+
-+long __sched io_schedule_timeout(long timeout)
-+{
-+	struct rq *rq = &__raw_get_cpu_var(runqueues);
-+	long ret;
-+
-+	delayacct_blkio_start();
-+	atomic_inc(&rq->nr_iowait);
-+	ret = schedule_timeout(timeout);
-+	atomic_dec(&rq->nr_iowait);
-+	delayacct_blkio_end();
-+	return ret;
-+}
-+
-+/**
-+ * sys_sched_get_priority_max - return maximum RT priority.
-+ * @policy: scheduling class.
-+ *
-+ * this syscall returns the maximum rt_priority that can be used
-+ * by a given scheduling class.
-+ */
-+SYSCALL_DEFINE1(sched_get_priority_max, int, policy)
-+{
-+	int ret = -EINVAL;
-+
-+	switch (policy) {
-+	case SCHED_FIFO:
-+	case SCHED_RR:
-+		ret = MAX_USER_RT_PRIO-1;
-+		break;
-+	case SCHED_NORMAL:
-+	case SCHED_BATCH:
-+	case SCHED_ISO:
-+	case SCHED_IDLE:
-+		ret = 0;
-+		break;
-+	}
-+	return ret;
-+}
-+
-+/**
-+ * sys_sched_get_priority_min - return minimum RT priority.
-+ * @policy: scheduling class.
-+ *
-+ * this syscall returns the minimum rt_priority that can be used
-+ * by a given scheduling class.
-+ */
-+SYSCALL_DEFINE1(sched_get_priority_min, int, policy)
-+{
-+	int ret = -EINVAL;
-+
-+	switch (policy) {
-+	case SCHED_FIFO:
-+	case SCHED_RR:
-+		ret = 1;
-+		break;
-+	case SCHED_NORMAL:
-+	case SCHED_BATCH:
-+	case SCHED_ISO:
-+	case SCHED_IDLE:
-+		ret = 0;
-+		break;
-+	}
-+	return ret;
-+}
-+
-+/**
-+ * sys_sched_rr_get_interval - return the default timeslice of a process.
-+ * @pid: pid of the process.
-+ * @interval: userspace pointer to the timeslice value.
-+ *
-+ * this syscall writes the default timeslice value of a given process
-+ * into the user-space timespec buffer. A value of '0' means infinity.
-+ */
-+SYSCALL_DEFINE2(sched_rr_get_interval, pid_t, pid,
-+		struct timespec __user *, interval)
-+{
-+	struct task_struct *p;
-+	int retval = -EINVAL;
-+	struct timespec t;
-+
-+	if (pid < 0)
-+		goto out_nounlock;
-+
-+	retval = -ESRCH;
-+	read_lock(&tasklist_lock);
-+	p = find_process_by_pid(pid);
-+	if (!p)
-+		goto out_unlock;
-+
-+	retval = security_task_getscheduler(p);
-+	if (retval)
-+		goto out_unlock;
-+
-+	t = ns_to_timespec(p->policy == SCHED_FIFO ? 0 :
-+			   MS_TO_NS(task_timeslice(p)));
-+	read_unlock(&tasklist_lock);
-+	retval = copy_to_user(interval, &t, sizeof(t)) ? -EFAULT : 0;
-+out_nounlock:
-+	return retval;
-+out_unlock:
-+	read_unlock(&tasklist_lock);
-+	return retval;
-+}
-+
-+static const char stat_nam[] = TASK_STATE_TO_CHAR_STR;
-+
-+void sched_show_task(struct task_struct *p)
-+{
-+	unsigned long free = 0;
-+	unsigned state;
-+
-+	state = p->state ? __ffs(p->state) + 1 : 0;
-+	printk(KERN_INFO "%-13.13s %c", p->comm,
-+		state < sizeof(stat_nam) - 1 ? stat_nam[state] : '?');
-+#if BITS_PER_LONG == 32
-+	if (state == TASK_RUNNING)
-+		printk(KERN_CONT " running  ");
-+	else
-+		printk(KERN_CONT " %08lx ", thread_saved_pc(p));
-+#else
-+	if (state == TASK_RUNNING)
-+		printk(KERN_CONT "  running task    ");
-+	else
-+		printk(KERN_CONT " %016lx ", thread_saved_pc(p));
-+#endif
-+#ifdef CONFIG_DEBUG_STACK_USAGE
-+	free = stack_not_used(p);
-+#endif
-+	printk(KERN_CONT "%5lu %5d %6d 0x%08lx\n", free,
-+		task_pid_nr(p), task_pid_nr(p->real_parent),
-+		(unsigned long)task_thread_info(p)->flags);
-+
-+	show_stack(p, NULL);
-+}
-+
-+void show_state_filter(unsigned long state_filter)
-+{
-+	struct task_struct *g, *p;
-+
-+#if BITS_PER_LONG == 32
-+	printk(KERN_INFO
-+		"  task                PC stack   pid father\n");
-+#else
-+	printk(KERN_INFO
-+		"  task                        PC stack   pid father\n");
-+#endif
-+	read_lock(&tasklist_lock);
-+	do_each_thread(g, p) {
-+		/*
-+		 * reset the NMI-timeout, listing all files on a slow
-+		 * console might take alot of time:
-+		 */
-+		touch_nmi_watchdog();
-+		if (!state_filter || (p->state & state_filter))
-+			sched_show_task(p);
-+	} while_each_thread(g, p);
-+
-+	touch_all_softlockup_watchdogs();
-+
-+	read_unlock(&tasklist_lock);
-+	/*
-+	 * Only show locks if all tasks are dumped:
-+	 */
-+	if (state_filter == -1)
-+		debug_show_all_locks();
-+}
-+
-+/**
-+ * init_idle - set up an idle thread for a given CPU
-+ * @idle: task in question
-+ * @cpu: cpu the idle task belongs to
-+ *
-+ * NOTE: this function does not set the idle thread's NEED_RESCHED
-+ * flag, to make booting more robust.
-+ */
-+void __cpuinit init_idle(struct task_struct *idle, int cpu)
-+{
-+	struct rq *rq = cpu_rq(cpu);
-+	unsigned long flags;
-+
-+	time_grq_lock(rq, &flags);
-+	idle->timestamp = idle->last_ran = rq->clock;
-+	idle->state = TASK_RUNNING;
-+	/* Setting prio to illegal value shouldn't matter when never queued */
-+	idle->prio = rq->rq_prio = PRIO_LIMIT;
-+	rq->rq_deadline = idle->deadline;
-+	rq->rq_policy = idle->policy;
-+	rq->rq_time_slice = idle->rt.time_slice;
-+	idle->cpus_allowed = cpumask_of_cpu(cpu);
-+	set_task_cpu(idle, cpu);
-+	rq->curr = rq->idle = idle;
-+	idle->oncpu = 1;
-+	set_cpuidle_map(cpu);
-+#ifdef CONFIG_HOTPLUG_CPU
-+	idle->unplugged_mask = CPU_MASK_NONE;
-+#endif
-+	grq_unlock_irqrestore(&flags);
-+
-+	/* Set the preempt count _outside_ the spinlocks! */
-+#if defined(CONFIG_PREEMPT) && !defined(CONFIG_PREEMPT_BKL)
-+	task_thread_info(idle)->preempt_count = (idle->lock_depth >= 0);
-+#else
-+	task_thread_info(idle)->preempt_count = 0;
-+#endif
-+	ftrace_graph_init_task(idle);
-+}
-+
-+/*
-+ * In a system that switches off the HZ timer nohz_cpu_mask
-+ * indicates which cpus entered this state. This is used
-+ * in the rcu update to wait only for active cpus. For system
-+ * which do not switch off the HZ timer nohz_cpu_mask should
-+ * always be CPU_BITS_NONE.
-+ */
-+cpumask_var_t nohz_cpu_mask;
-+
-+#ifdef CONFIG_SMP
-+#ifdef CONFIG_NO_HZ
-+static struct {
-+	atomic_t load_balancer;
-+	cpumask_var_t cpu_mask;
-+	cpumask_var_t ilb_grp_nohz_mask;
-+} nohz ____cacheline_aligned = {
-+	.load_balancer = ATOMIC_INIT(-1),
-+};
-+
-+int get_nohz_load_balancer(void)
-+{
-+	return atomic_read(&nohz.load_balancer);
-+}
-+
-+/*
-+ * This routine will try to nominate the ilb (idle load balancing)
-+ * owner among the cpus whose ticks are stopped. ilb owner will do the idle
-+ * load balancing on behalf of all those cpus. If all the cpus in the system
-+ * go into this tickless mode, then there will be no ilb owner (as there is
-+ * no need for one) and all the cpus will sleep till the next wakeup event
-+ * arrives...
-+ *
-+ * For the ilb owner, tick is not stopped. And this tick will be used
-+ * for idle load balancing. ilb owner will still be part of
-+ * nohz.cpu_mask..
-+ *
-+ * While stopping the tick, this cpu will become the ilb owner if there
-+ * is no other owner. And will be the owner till that cpu becomes busy
-+ * or if all cpus in the system stop their ticks at which point
-+ * there is no need for ilb owner.
-+ *
-+ * When the ilb owner becomes busy, it nominates another owner, during the
-+ * next busy scheduler_tick()
-+ */
-+int select_nohz_load_balancer(int stop_tick)
-+{
-+	int cpu = smp_processor_id();
-+
-+	if (stop_tick) {
-+		cpu_rq(cpu)->in_nohz_recently = 1;
-+
-+		if (!cpu_active(cpu)) {
-+			if (atomic_read(&nohz.load_balancer) != cpu)
-+				return 0;
-+
-+			/*
-+			 * If we are going offline and still the leader,
-+			 * give up!
-+			 */
-+			if (atomic_cmpxchg(&nohz.load_balancer, cpu, -1) != cpu)
-+				BUG();
-+
-+			return 0;
-+		}
-+
-+		cpumask_set_cpu(cpu, nohz.cpu_mask);
-+
-+		/* time for ilb owner also to sleep */
-+		if (cpumask_weight(nohz.cpu_mask) == num_online_cpus()) {
-+			if (atomic_read(&nohz.load_balancer) == cpu)
-+				atomic_set(&nohz.load_balancer, -1);
-+			return 0;
-+		}
-+
-+		if (atomic_read(&nohz.load_balancer) == -1) {
-+			/* make me the ilb owner */
-+			if (atomic_cmpxchg(&nohz.load_balancer, -1, cpu) == -1)
-+				return 1;
-+		} else if (atomic_read(&nohz.load_balancer) == cpu)
-+			return 1;
-+	} else {
-+		if (!cpumask_test_cpu(cpu, nohz.cpu_mask))
-+			return 0;
-+
-+		cpumask_clear_cpu(cpu, nohz.cpu_mask);
-+
-+		if (atomic_read(&nohz.load_balancer) == cpu)
-+			if (atomic_cmpxchg(&nohz.load_balancer, cpu, -1) != cpu)
-+				BUG();
-+	}
-+	return 0;
-+}
-+
-+/*
-+ * When add_timer_on() enqueues a timer into the timer wheel of an
-+ * idle CPU then this timer might expire before the next timer event
-+ * which is scheduled to wake up that CPU. In case of a completely
-+ * idle system the next event might even be infinite time into the
-+ * future. wake_up_idle_cpu() ensures that the CPU is woken up and
-+ * leaves the inner idle loop so the newly added timer is taken into
-+ * account when the CPU goes back to idle and evaluates the timer
-+ * wheel for the next timer event.
-+ */
-+void wake_up_idle_cpu(int cpu)
-+{
-+	struct task_struct *idle;
-+	struct rq *rq;
-+
-+	if (cpu == smp_processor_id())
-+		return;
-+
-+	rq = cpu_rq(cpu);
-+	idle = rq->idle;
-+
-+	/*
-+	 * This is safe, as this function is called with the timer
-+	 * wheel base lock of (cpu) held. When the CPU is on the way
-+	 * to idle and has not yet set rq->curr to idle then it will
-+	 * be serialized on the timer wheel base lock and take the new
-+	 * timer into account automatically.
-+	 */
-+	if (unlikely(rq->curr != idle))
-+		return;
-+
-+	/*
-+	 * We can set TIF_RESCHED on the idle task of the other CPU
-+	 * lockless. The worst case is that the other CPU runs the
-+	 * idle task through an additional NOOP schedule()
-+	 */
-+	set_tsk_need_resched(idle);
-+
-+	/* NEED_RESCHED must be visible before we test polling */
-+	smp_mb();
-+	if (!tsk_is_polling(idle))
-+		smp_send_reschedule(cpu);
-+}
-+
-+#endif /* CONFIG_NO_HZ */
-+
-+/*
-+ * Change a given task's CPU affinity. Migrate the thread to a
-+ * proper CPU and schedule it away if the CPU it's executing on
-+ * is removed from the allowed bitmask.
-+ *
-+ * NOTE: the caller must have a valid reference to the task, the
-+ * task must not exit() & deallocate itself prematurely. The
-+ * call is not atomic; no spinlocks may be held.
-+ */
-+int set_cpus_allowed_ptr(struct task_struct *p, const struct cpumask *new_mask)
-+{
-+	unsigned long flags;
-+	int running = 0;
-+	int queued = 0;
-+	struct rq *rq;
-+	int ret = 0;
-+
-+	rq = task_grq_lock(p, &flags);
-+	if (!cpumask_intersects(new_mask, cpu_online_mask)) {
-+		ret = -EINVAL;
-+		goto out;
-+	}
-+
-+	if (unlikely((p->flags & PF_THREAD_BOUND) && p != current &&
-+		     !cpumask_equal(&p->cpus_allowed, new_mask))) {
-+		ret = -EINVAL;
-+		goto out;
-+	}
-+
-+	queued = task_queued_only(p);
-+
-+	cpumask_copy(&p->cpus_allowed, new_mask);
-+	p->rt.nr_cpus_allowed = cpumask_weight(new_mask);
-+
-+	/* Can the task run on the task's current CPU? If so, we're done */
-+	if (cpumask_test_cpu(task_cpu(p), new_mask))
-+		goto out;
-+
-+	/* Reschedule the task, schedule() will know if it can keep running */
-+	if (task_running(p))
-+		running = 1;
-+	else
-+		set_task_cpu(p, cpumask_any_and(cpu_online_mask, new_mask));
-+
-+out:
-+	if (queued)
-+		try_preempt(p);
-+	task_grq_unlock(&flags);
-+
-+	/* This might be a flaky way of changing cpus! */
-+	if (running)
-+		schedule();
-+	return ret;
-+}
-+EXPORT_SYMBOL_GPL(set_cpus_allowed_ptr);
-+
-+#ifdef CONFIG_HOTPLUG_CPU
-+/* Schedules idle task to be the next runnable task on current CPU.
-+ * It does so by boosting its priority to highest possible.
-+ * Used by CPU offline code.
-+ */
-+void sched_idle_next(void)
-+{
-+	int this_cpu = smp_processor_id();
-+	struct rq *rq = cpu_rq(this_cpu);
-+	struct task_struct *idle = rq->idle;
-+	unsigned long flags;
-+
-+	/* cpu has to be offline */
-+	BUG_ON(cpu_online(this_cpu));
-+
-+	/*
-+	 * Strictly not necessary since rest of the CPUs are stopped by now
-+	 * and interrupts disabled on the current cpu.
-+	 */
-+	time_grq_lock(rq, &flags);
-+
-+	__setscheduler(idle, SCHED_FIFO, MAX_RT_PRIO - 1);
-+
-+	activate_idle_task(idle);
-+	set_tsk_need_resched(rq->curr);
-+
-+	grq_unlock_irqrestore(&flags);
-+}
-+
-+/*
-+ * Ensures that the idle task is using init_mm right before its cpu goes
-+ * offline.
-+ */
-+void idle_task_exit(void)
-+{
-+	struct mm_struct *mm = current->active_mm;
-+
-+	BUG_ON(cpu_online(smp_processor_id()));
-+
-+	if (mm != &init_mm)
-+		switch_mm(mm, &init_mm, current);
-+	mmdrop(mm);
-+}
-+
-+#endif /* CONFIG_HOTPLUG_CPU */
-+
-+#if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL)
-+
-+static struct ctl_table sd_ctl_dir[] = {
-+	{
-+		.procname	= "sched_domain",
-+		.mode		= 0555,
-+	},
-+	{0, },
-+};
-+
-+static struct ctl_table sd_ctl_root[] = {
-+	{
-+		.ctl_name	= CTL_KERN,
-+		.procname	= "kernel",
-+		.mode		= 0555,
-+		.child		= sd_ctl_dir,
-+	},
-+	{0, },
-+};
-+
-+static struct ctl_table *sd_alloc_ctl_entry(int n)
-+{
-+	struct ctl_table *entry =
-+		kcalloc(n, sizeof(struct ctl_table), GFP_KERNEL);
-+
-+	return entry;
-+}
-+
-+static void sd_free_ctl_entry(struct ctl_table **tablep)
-+{
-+	struct ctl_table *entry;
-+
-+	/*
-+	 * In the intermediate directories, both the child directory and
-+	 * procname are dynamically allocated and could fail but the mode
-+	 * will always be set. In the lowest directory the names are
-+	 * static strings and all have proc handlers.
-+	 */
-+	for (entry = *tablep; entry->mode; entry++) {
-+		if (entry->child)
-+			sd_free_ctl_entry(&entry->child);
-+		if (entry->proc_handler == NULL)
-+			kfree(entry->procname);
-+	}
-+
-+	kfree(*tablep);
-+	*tablep = NULL;
-+}
-+
-+static void
-+set_table_entry(struct ctl_table *entry,
-+		const char *procname, void *data, int maxlen,
-+		mode_t mode, proc_handler *proc_handler)
-+{
-+	entry->procname = procname;
-+	entry->data = data;
-+	entry->maxlen = maxlen;
-+	entry->mode = mode;
-+	entry->proc_handler = proc_handler;
-+}
-+
-+static struct ctl_table *
-+sd_alloc_ctl_domain_table(struct sched_domain *sd)
-+{
-+	struct ctl_table *table = sd_alloc_ctl_entry(13);
-+
-+	if (table == NULL)
-+		return NULL;
-+
-+	set_table_entry(&table[0], "min_interval", &sd->min_interval,
-+		sizeof(long), 0644, proc_doulongvec_minmax);
-+	set_table_entry(&table[1], "max_interval", &sd->max_interval,
-+		sizeof(long), 0644, proc_doulongvec_minmax);
-+	set_table_entry(&table[2], "busy_idx", &sd->busy_idx,
-+		sizeof(int), 0644, proc_dointvec_minmax);
-+	set_table_entry(&table[3], "idle_idx", &sd->idle_idx,
-+		sizeof(int), 0644, proc_dointvec_minmax);
-+	set_table_entry(&table[4], "newidle_idx", &sd->newidle_idx,
-+		sizeof(int), 0644, proc_dointvec_minmax);
-+	set_table_entry(&table[5], "wake_idx", &sd->wake_idx,
-+		sizeof(int), 0644, proc_dointvec_minmax);
-+	set_table_entry(&table[6], "forkexec_idx", &sd->forkexec_idx,
-+		sizeof(int), 0644, proc_dointvec_minmax);
-+	set_table_entry(&table[7], "busy_factor", &sd->busy_factor,
-+		sizeof(int), 0644, proc_dointvec_minmax);
-+	set_table_entry(&table[8], "imbalance_pct", &sd->imbalance_pct,
-+		sizeof(int), 0644, proc_dointvec_minmax);
-+	set_table_entry(&table[9], "cache_nice_tries",
-+		&sd->cache_nice_tries,
-+		sizeof(int), 0644, proc_dointvec_minmax);
-+	set_table_entry(&table[10], "flags", &sd->flags,
-+		sizeof(int), 0644, proc_dointvec_minmax);
-+	set_table_entry(&table[11], "name", sd->name,
-+		CORENAME_MAX_SIZE, 0444, proc_dostring);
-+	/* &table[12] is terminator */
-+
-+	return table;
-+}
-+
-+static ctl_table *sd_alloc_ctl_cpu_table(int cpu)
-+{
-+	struct ctl_table *entry, *table;
-+	struct sched_domain *sd;
-+	int domain_num = 0, i;
-+	char buf[32];
-+
-+	for_each_domain(cpu, sd)
-+		domain_num++;
-+	entry = table = sd_alloc_ctl_entry(domain_num + 1);
-+	if (table == NULL)
-+		return NULL;
-+
-+	i = 0;
-+	for_each_domain(cpu, sd) {
-+		snprintf(buf, 32, "domain%d", i);
-+		entry->procname = kstrdup(buf, GFP_KERNEL);
-+		entry->mode = 0555;
-+		entry->child = sd_alloc_ctl_domain_table(sd);
-+		entry++;
-+		i++;
-+	}
-+	return table;
-+}
-+
-+static struct ctl_table_header *sd_sysctl_header;
-+static void register_sched_domain_sysctl(void)
-+{
-+	int i, cpu_num = num_online_cpus();
-+	struct ctl_table *entry = sd_alloc_ctl_entry(cpu_num + 1);
-+	char buf[32];
-+
-+	WARN_ON(sd_ctl_dir[0].child);
-+	sd_ctl_dir[0].child = entry;
-+
-+	if (entry == NULL)
-+		return;
-+
-+	for_each_online_cpu(i) {
-+		snprintf(buf, 32, "cpu%d", i);
-+		entry->procname = kstrdup(buf, GFP_KERNEL);
-+		entry->mode = 0555;
-+		entry->child = sd_alloc_ctl_cpu_table(i);
-+		entry++;
-+	}
-+
-+	WARN_ON(sd_sysctl_header);
-+	sd_sysctl_header = register_sysctl_table(sd_ctl_root);
-+}
-+
-+/* may be called multiple times per register */
-+static void unregister_sched_domain_sysctl(void)
-+{
-+	if (sd_sysctl_header)
-+		unregister_sysctl_table(sd_sysctl_header);
-+	sd_sysctl_header = NULL;
-+	if (sd_ctl_dir[0].child)
-+		sd_free_ctl_entry(&sd_ctl_dir[0].child);
-+}
-+#else
-+static void register_sched_domain_sysctl(void)
-+{
-+}
-+static void unregister_sched_domain_sysctl(void)
-+{
-+}
-+#endif
-+
-+static void set_rq_online(struct rq *rq)
-+{
-+	if (!rq->online) {
-+		cpumask_set_cpu(rq->cpu, rq->rd->online);
-+		rq->online = 1;
-+	}
-+}
-+
-+static void set_rq_offline(struct rq *rq)
-+{
-+	if (rq->online) {
-+		cpumask_clear_cpu(rq->cpu, rq->rd->online);
-+		rq->online = 0;
-+	}
-+}
-+
-+#ifdef CONFIG_HOTPLUG_CPU
-+/*
-+ * This cpu is going down, so walk over the tasklist and find tasks that can
-+ * only run on this cpu and remove their affinity. Store their value in
-+ * unplugged_mask so it can be restored once their correct cpu is online. No
-+ * need to do anything special since they'll just move on next reschedule if
-+ * they're running.
-+ */
-+static void remove_cpu(unsigned long cpu)
-+{
-+	struct task_struct *p, *t;
-+
-+	read_lock(&tasklist_lock);
-+
-+	do_each_thread(t, p) {
-+		cpumask_t cpus_remaining;
-+
-+		cpus_and(cpus_remaining, p->cpus_allowed, cpu_online_map);
-+		cpu_clear(cpu, cpus_remaining);
-+		if (cpus_empty(cpus_remaining)) {
-+			p->unplugged_mask = p->cpus_allowed;
-+			p->cpus_allowed = cpu_possible_map;
-+		}
-+	} while_each_thread(t, p);
-+
-+	read_unlock(&tasklist_lock);
-+}
-+
-+/*
-+ * This cpu is coming up so add it to the cpus_allowed.
-+ */
-+static void add_cpu(unsigned long cpu)
-+{
-+	struct task_struct *p, *t;
-+
-+	read_lock(&tasklist_lock);
-+
-+	do_each_thread(t, p) {
-+		/* Have we taken all the cpus from the unplugged_mask back */
-+		if (cpus_empty(p->unplugged_mask))
-+			continue;
-+
-+		/* Was this cpu in the unplugged_mask mask */
-+		if (cpu_isset(cpu, p->unplugged_mask)) {
-+			cpu_set(cpu, p->cpus_allowed);
-+			if (cpus_subset(p->unplugged_mask, p->cpus_allowed)) {
-+				/*
-+				 * Have we set more than the unplugged_mask?
-+				 * If so, that means we have remnants set from
-+				 * the unplug/plug cycle and need to remove
-+				 * them. Then clear the unplugged_mask as we've
-+				 * set all the cpus back.
-+				 */
-+				p->cpus_allowed = p->unplugged_mask;
-+				cpus_clear(p->unplugged_mask);
-+			}
-+		}
-+	} while_each_thread(t, p);
-+
-+	read_unlock(&tasklist_lock);
-+}
-+#else
-+static void add_cpu(unsigned long cpu)
-+{
-+}
-+#endif
-+
-+/*
-+ * migration_call - callback that gets triggered when a CPU is added.
-+ */
-+static int __cpuinit
-+migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu)
-+{
-+	int cpu = (long)hcpu;
-+	unsigned long flags;
-+	struct rq *rq;
-+
-+	switch (action) {
-+
-+	case CPU_UP_PREPARE:
-+	case CPU_UP_PREPARE_FROZEN:
-+		break;
-+
-+	case CPU_ONLINE:
-+	case CPU_ONLINE_FROZEN:
-+		/* Update our root-domain */
-+		rq = cpu_rq(cpu);
-+		grq_lock_irqsave(&flags);
-+		if (rq->rd) {
-+			BUG_ON(!cpumask_test_cpu(cpu, rq->rd->span));
-+
-+			set_rq_online(rq);
-+		}
-+		add_cpu(cpu);
-+		grq_unlock_irqrestore(&flags);
-+		break;
-+
-+#ifdef CONFIG_HOTPLUG_CPU
-+	case CPU_UP_CANCELED:
-+	case CPU_UP_CANCELED_FROZEN:
-+		break;
-+
-+	case CPU_DEAD:
-+	case CPU_DEAD_FROZEN:
-+		cpuset_lock(); /* around calls to cpuset_cpus_allowed_lock() */
-+		rq = cpu_rq(cpu);
-+		/* Idle task back to normal (off runqueue, low prio) */
-+		grq_lock_irq();
-+		remove_cpu(cpu);
-+		deactivate_task(rq->idle);
-+		rq->idle->static_prio = MAX_PRIO;
-+		__setscheduler(rq->idle, SCHED_NORMAL, 0);
-+		rq->idle->prio = PRIO_LIMIT;
-+		update_rq_clock(rq);
-+		grq_unlock_irq();
-+		cpuset_unlock();
-+		break;
-+
-+	case CPU_DYING:
-+	case CPU_DYING_FROZEN:
-+		rq = cpu_rq(cpu);
-+		grq_lock_irqsave(&flags);
-+		if (rq->rd) {
-+			BUG_ON(!cpumask_test_cpu(cpu, rq->rd->span));
-+			set_rq_offline(rq);
-+		}
-+		grq_unlock_irqrestore(&flags);
-+		break;
-+#endif
-+	}
-+	return NOTIFY_OK;
-+}
-+
-+/*
-+ * Register at high priority so that task migration (migrate_all_tasks)
-+ * happens before everything else.  This has to be lower priority than
-+ * the notifier in the perf_counter subsystem, though.
-+ */
-+static struct notifier_block __cpuinitdata migration_notifier = {
-+	.notifier_call = migration_call,
-+	.priority = 10
-+};
-+
-+int __init migration_init(void)
-+{
-+	void *cpu = (void *)(long)smp_processor_id();
-+	int err;
-+
-+	/* Start one for the boot CPU: */
-+	err = migration_call(&migration_notifier, CPU_UP_PREPARE, cpu);
-+	BUG_ON(err == NOTIFY_BAD);
-+	migration_call(&migration_notifier, CPU_ONLINE, cpu);
-+	register_cpu_notifier(&migration_notifier);
-+
-+	return 0;
-+}
-+early_initcall(migration_init);
-+#endif
-+
-+/*
-+ * sched_domains_mutex serializes calls to arch_init_sched_domains,
-+ * detach_destroy_domains and partition_sched_domains.
-+ */
-+static DEFINE_MUTEX(sched_domains_mutex);
-+
-+#ifdef CONFIG_SMP
-+
-+#ifdef CONFIG_SCHED_DEBUG
-+
-+static int sched_domain_debug_one(struct sched_domain *sd, int cpu, int level,
-+				  struct cpumask *groupmask)
-+{
-+	struct sched_group *group = sd->groups;
-+	char str[256];
-+
-+	cpulist_scnprintf(str, sizeof(str), sched_domain_span(sd));
-+	cpumask_clear(groupmask);
-+
-+	printk(KERN_DEBUG "%*s domain %d: ", level, "", level);
-+
-+	if (!(sd->flags & SD_LOAD_BALANCE)) {
-+		printk("does not load-balance\n");
-+		if (sd->parent)
-+			printk(KERN_ERR "ERROR: !SD_LOAD_BALANCE domain"
-+					" has parent");
-+		return -1;
-+	}
-+
-+	printk(KERN_CONT "span %s level %s\n", str, sd->name);
-+
-+	if (!cpumask_test_cpu(cpu, sched_domain_span(sd))) {
-+		printk(KERN_ERR "ERROR: domain->span does not contain "
-+				"CPU%d\n", cpu);
-+	}
-+	if (!cpumask_test_cpu(cpu, sched_group_cpus(group))) {
-+		printk(KERN_ERR "ERROR: domain->groups does not contain"
-+				" CPU%d\n", cpu);
-+	}
-+
-+	printk(KERN_DEBUG "%*s groups:", level + 1, "");
-+	do {
-+		if (!group) {
-+			printk("\n");
-+			printk(KERN_ERR "ERROR: group is NULL\n");
-+			break;
-+		}
-+
-+		if (!group->__cpu_power) {
-+			printk(KERN_CONT "\n");
-+			printk(KERN_ERR "ERROR: domain->cpu_power not "
-+					"set\n");
-+			break;
-+		}
-+
-+		if (!cpumask_weight(sched_group_cpus(group))) {
-+			printk(KERN_CONT "\n");
-+			printk(KERN_ERR "ERROR: empty group\n");
-+			break;
-+		}
-+
-+		if (cpumask_intersects(groupmask, sched_group_cpus(group))) {
-+			printk(KERN_CONT "\n");
-+			printk(KERN_ERR "ERROR: repeated CPUs\n");
-+			break;
-+		}
-+
-+		cpumask_or(groupmask, groupmask, sched_group_cpus(group));
-+
-+		cpulist_scnprintf(str, sizeof(str), sched_group_cpus(group));
-+
-+		printk(KERN_CONT " %s", str);
-+		if (group->__cpu_power != SCHED_LOAD_SCALE) {
-+			printk(KERN_CONT " (__cpu_power = %d)",
-+				group->__cpu_power);
-+		}
-+
-+		group = group->next;
-+	} while (group != sd->groups);
-+	printk(KERN_CONT "\n");
-+
-+	if (!cpumask_equal(sched_domain_span(sd), groupmask))
-+		printk(KERN_ERR "ERROR: groups don't span domain->span\n");
-+
-+	if (sd->parent &&
-+	    !cpumask_subset(groupmask, sched_domain_span(sd->parent)))
-+		printk(KERN_ERR "ERROR: parent span is not a superset "
-+			"of domain->span\n");
-+	return 0;
-+}
-+
-+static void sched_domain_debug(struct sched_domain *sd, int cpu)
-+{
-+	cpumask_var_t groupmask;
-+	int level = 0;
-+
-+	if (!sd) {
-+		printk(KERN_DEBUG "CPU%d attaching NULL sched-domain.\n", cpu);
-+		return;
-+	}
-+
-+	printk(KERN_DEBUG "CPU%d attaching sched-domain:\n", cpu);
-+
-+	if (!alloc_cpumask_var(&groupmask, GFP_KERNEL)) {
-+		printk(KERN_DEBUG "Cannot load-balance (out of memory)\n");
-+		return;
-+	}
-+
-+	for (;;) {
-+		if (sched_domain_debug_one(sd, cpu, level, groupmask))
-+			break;
-+		level++;
-+		sd = sd->parent;
-+		if (!sd)
-+			break;
-+	}
-+	free_cpumask_var(groupmask);
-+}
-+#else /* !CONFIG_SCHED_DEBUG */
-+# define sched_domain_debug(sd, cpu) do { } while (0)
-+#endif /* CONFIG_SCHED_DEBUG */
-+
-+static int sd_degenerate(struct sched_domain *sd)
-+{
-+	if (cpumask_weight(sched_domain_span(sd)) == 1)
-+		return 1;
-+
-+	/* Following flags need at least 2 groups */
-+	if (sd->flags & (SD_LOAD_BALANCE |
-+			 SD_BALANCE_NEWIDLE |
-+			 SD_BALANCE_FORK |
-+			 SD_BALANCE_EXEC |
-+			 SD_SHARE_CPUPOWER |
-+			 SD_SHARE_PKG_RESOURCES)) {
-+		if (sd->groups != sd->groups->next)
-+			return 0;
-+	}
-+
-+	/* Following flags don't use groups */
-+	if (sd->flags & (SD_WAKE_IDLE |
-+			 SD_WAKE_AFFINE |
-+			 SD_WAKE_BALANCE))
-+		return 0;
-+
-+	return 1;
-+}
-+
-+static int
-+sd_parent_degenerate(struct sched_domain *sd, struct sched_domain *parent)
-+{
-+	unsigned long cflags = sd->flags, pflags = parent->flags;
-+
-+	if (sd_degenerate(parent))
-+		return 1;
-+
-+	if (!cpumask_equal(sched_domain_span(sd), sched_domain_span(parent)))
-+		return 0;
-+
-+	/* Does parent contain flags not in child? */
-+	/* WAKE_BALANCE is a subset of WAKE_AFFINE */
-+	if (cflags & SD_WAKE_AFFINE)
-+		pflags &= ~SD_WAKE_BALANCE;
-+	/* Flags needing groups don't count if only 1 group in parent */
-+	if (parent->groups == parent->groups->next) {
-+		pflags &= ~(SD_LOAD_BALANCE |
-+				SD_BALANCE_NEWIDLE |
-+				SD_BALANCE_FORK |
-+				SD_BALANCE_EXEC |
-+				SD_SHARE_CPUPOWER |
-+				SD_SHARE_PKG_RESOURCES);
-+		if (nr_node_ids == 1)
-+			pflags &= ~SD_SERIALIZE;
-+	}
-+	if (~cflags & pflags)
-+		return 0;
-+
-+	return 1;
-+}
-+
-+static void free_rootdomain(struct root_domain *rd)
-+{
-+	free_cpumask_var(rd->rto_mask);
-+	free_cpumask_var(rd->online);
-+	free_cpumask_var(rd->span);
-+	kfree(rd);
-+}
-+
-+static void rq_attach_root(struct rq *rq, struct root_domain *rd)
-+{
-+	struct root_domain *old_rd = NULL;
-+	unsigned long flags;
-+
-+	grq_lock_irqsave(&flags);
-+
-+	if (rq->rd) {
-+		old_rd = rq->rd;
-+
-+		if (cpumask_test_cpu(rq->cpu, old_rd->online))
-+			set_rq_offline(rq);
-+
-+		cpumask_clear_cpu(rq->cpu, old_rd->span);
-+
-+		/*
-+		 * If we dont want to free the old_rt yet then
-+		 * set old_rd to NULL to skip the freeing later
-+		 * in this function:
-+		 */
-+		if (!atomic_dec_and_test(&old_rd->refcount))
-+			old_rd = NULL;
-+	}
-+
-+	atomic_inc(&rd->refcount);
-+	rq->rd = rd;
-+
-+	cpumask_set_cpu(rq->cpu, rd->span);
-+	if (cpumask_test_cpu(rq->cpu, cpu_online_mask))
-+		set_rq_online(rq);
-+
-+	grq_unlock_irqrestore(&flags);
-+
-+	if (old_rd)
-+		free_rootdomain(old_rd);
-+}
-+
-+static int init_rootdomain(struct root_domain *rd, bool bootmem)
-+{
-+	gfp_t gfp = GFP_KERNEL;
-+
-+	memset(rd, 0, sizeof(*rd));
-+
-+	if (bootmem)
-+		gfp = GFP_NOWAIT;
-+
-+	if (!alloc_cpumask_var(&rd->span, gfp))
-+		goto out;
-+	if (!alloc_cpumask_var(&rd->online, gfp))
-+		goto free_span;
-+	if (!alloc_cpumask_var(&rd->rto_mask, gfp))
-+		goto free_online;
-+
-+	return 0;
-+
-+free_online:
-+	free_cpumask_var(rd->online);
-+free_span:
-+	free_cpumask_var(rd->span);
-+out:
-+	return -ENOMEM;
-+}
-+
-+static void init_defrootdomain(void)
-+{
-+	init_rootdomain(&def_root_domain, true);
-+
-+	atomic_set(&def_root_domain.refcount, 1);
-+}
-+
-+static struct root_domain *alloc_rootdomain(void)
-+{
-+	struct root_domain *rd;
-+
-+	rd = kmalloc(sizeof(*rd), GFP_KERNEL);
-+	if (!rd)
-+		return NULL;
-+
-+	if (init_rootdomain(rd, false) != 0) {
-+		kfree(rd);
-+		return NULL;
-+	}
-+
-+	return rd;
-+}
-+
-+/*
-+ * Attach the domain 'sd' to 'cpu' as its base domain. Callers must
-+ * hold the hotplug lock.
-+ */
-+static void
-+cpu_attach_domain(struct sched_domain *sd, struct root_domain *rd, int cpu)
-+{
-+	struct rq *rq = cpu_rq(cpu);
-+	struct sched_domain *tmp;
-+
-+	/* Remove the sched domains which do not contribute to scheduling. */
-+	for (tmp = sd; tmp; ) {
-+		struct sched_domain *parent = tmp->parent;
-+		if (!parent)
-+			break;
-+
-+		if (sd_parent_degenerate(tmp, parent)) {
-+			tmp->parent = parent->parent;
-+			if (parent->parent)
-+				parent->parent->child = tmp;
-+		} else
-+			tmp = tmp->parent;
-+	}
-+
-+	if (sd && sd_degenerate(sd)) {
-+		sd = sd->parent;
-+		if (sd)
-+			sd->child = NULL;
-+	}
-+
-+	sched_domain_debug(sd, cpu);
-+
-+	rq_attach_root(rq, rd);
-+	rcu_assign_pointer(rq->sd, sd);
-+}
-+
-+/* cpus with isolated domains */
-+static cpumask_var_t cpu_isolated_map;
-+
-+/* Setup the mask of cpus configured for isolated domains */
-+static int __init isolated_cpu_setup(char *str)
-+{
-+	cpulist_parse(str, cpu_isolated_map);
-+	return 1;
-+}
-+
-+__setup("isolcpus=", isolated_cpu_setup);
-+
-+/*
-+ * init_sched_build_groups takes the cpumask we wish to span, and a pointer
-+ * to a function which identifies what group(along with sched group) a CPU
-+ * belongs to. The return value of group_fn must be a >= 0 and < nr_cpu_ids
-+ * (due to the fact that we keep track of groups covered with a struct cpumask).
-+ *
-+ * init_sched_build_groups will build a circular linked list of the groups
-+ * covered by the given span, and will set each group's ->cpumask correctly,
-+ * and ->cpu_power to 0.
-+ */
-+static void
-+init_sched_build_groups(const struct cpumask *span,
-+			const struct cpumask *cpu_map,
-+			int (*group_fn)(int cpu, const struct cpumask *cpu_map,
-+					struct sched_group **sg,
-+					struct cpumask *tmpmask),
-+			struct cpumask *covered, struct cpumask *tmpmask)
-+{
-+	struct sched_group *first = NULL, *last = NULL;
-+	int i;
-+
-+	cpumask_clear(covered);
-+
-+	for_each_cpu(i, span) {
-+		struct sched_group *sg;
-+		int group = group_fn(i, cpu_map, &sg, tmpmask);
-+		int j;
-+
-+		if (cpumask_test_cpu(i, covered))
-+			continue;
-+
-+		cpumask_clear(sched_group_cpus(sg));
-+		sg->__cpu_power = 0;
-+
-+		for_each_cpu(j, span) {
-+			if (group_fn(j, cpu_map, NULL, tmpmask) != group)
-+				continue;
-+
-+			cpumask_set_cpu(j, covered);
-+			cpumask_set_cpu(j, sched_group_cpus(sg));
-+		}
-+		if (!first)
-+			first = sg;
-+		if (last)
-+			last->next = sg;
-+		last = sg;
-+	}
-+	last->next = first;
-+}
-+
-+#define SD_NODES_PER_DOMAIN 16
-+
-+#ifdef CONFIG_NUMA
-+
-+/**
-+ * find_next_best_node - find the next node to include in a sched_domain
-+ * @node: node whose sched_domain we're building
-+ * @used_nodes: nodes already in the sched_domain
-+ *
-+ * Find the next node to include in a given scheduling domain. Simply
-+ * finds the closest node not already in the @used_nodes map.
-+ *
-+ * Should use nodemask_t.
-+ */
-+static int find_next_best_node(int node, nodemask_t *used_nodes)
-+{
-+	int i, n, val, min_val, best_node = 0;
-+
-+	min_val = INT_MAX;
-+
-+	for (i = 0; i < nr_node_ids; i++) {
-+		/* Start at @node */
-+		n = (node + i) % nr_node_ids;
-+
-+		if (!nr_cpus_node(n))
-+			continue;
-+
-+		/* Skip already used nodes */
-+		if (node_isset(n, *used_nodes))
-+			continue;
-+
-+		/* Simple min distance search */
-+		val = node_distance(node, n);
-+
-+		if (val < min_val) {
-+			min_val = val;
-+			best_node = n;
-+		}
-+	}
-+
-+	node_set(best_node, *used_nodes);
-+	return best_node;
-+}
-+
-+/**
-+ * sched_domain_node_span - get a cpumask for a node's sched_domain
-+ * @node: node whose cpumask we're constructing
-+ * @span: resulting cpumask
-+ *
-+ * Given a node, construct a good cpumask for its sched_domain to span. It
-+ * should be one that prevents unnecessary balancing, but also spreads tasks
-+ * out optimally.
-+ */
-+static void sched_domain_node_span(int node, struct cpumask *span)
-+{
-+	nodemask_t used_nodes;
-+	int i;
-+
-+	cpumask_clear(span);
-+	nodes_clear(used_nodes);
-+
-+	cpumask_or(span, span, cpumask_of_node(node));
-+	node_set(node, used_nodes);
-+
-+	for (i = 1; i < SD_NODES_PER_DOMAIN; i++) {
-+		int next_node = find_next_best_node(node, &used_nodes);
-+
-+		cpumask_or(span, span, cpumask_of_node(next_node));
-+	}
-+}
-+#endif /* CONFIG_NUMA */
-+
-+int sched_smt_power_savings = 0, sched_mc_power_savings = 0;
-+
-+/*
-+ * The cpus mask in sched_group and sched_domain hangs off the end.
-+ *
-+ * ( See the the comments in include/linux/sched.h:struct sched_group
-+ *   and struct sched_domain. )
-+ */
-+struct static_sched_group {
-+	struct sched_group sg;
-+	DECLARE_BITMAP(cpus, CONFIG_NR_CPUS);
-+};
-+
-+struct static_sched_domain {
-+	struct sched_domain sd;
-+	DECLARE_BITMAP(span, CONFIG_NR_CPUS);
-+};
-+
-+/*
-+ * SMT sched-domains:
-+ */
-+#ifdef CONFIG_SCHED_SMT
-+static DEFINE_PER_CPU(struct static_sched_domain, cpu_domains);
-+static DEFINE_PER_CPU(struct static_sched_group, sched_group_cpus);
-+
-+static int
-+cpu_to_cpu_group(int cpu, const struct cpumask *cpu_map,
-+		 struct sched_group **sg, struct cpumask *unused)
-+{
-+	if (sg)
-+		*sg = &per_cpu(sched_group_cpus, cpu).sg;
-+	return cpu;
-+}
-+#endif /* CONFIG_SCHED_SMT */
-+
-+/*
-+ * multi-core sched-domains:
-+ */
-+#ifdef CONFIG_SCHED_MC
-+static DEFINE_PER_CPU(struct static_sched_domain, core_domains);
-+static DEFINE_PER_CPU(struct static_sched_group, sched_group_core);
-+#endif /* CONFIG_SCHED_MC */
-+
-+#if defined(CONFIG_SCHED_MC) && defined(CONFIG_SCHED_SMT)
-+static int
-+cpu_to_core_group(int cpu, const struct cpumask *cpu_map,
-+		  struct sched_group **sg, struct cpumask *mask)
-+{
-+	int group;
-+
-+	cpumask_and(mask, topology_thread_cpumask(cpu), cpu_map);
-+	group = cpumask_first(mask);
-+	if (sg)
-+		*sg = &per_cpu(sched_group_core, group).sg;
-+	return group;
-+}
-+#elif defined(CONFIG_SCHED_MC)
-+static int
-+cpu_to_core_group(int cpu, const struct cpumask *cpu_map,
-+		  struct sched_group **sg, struct cpumask *unused)
-+{
-+	if (sg)
-+		*sg = &per_cpu(sched_group_core, cpu).sg;
-+	return cpu;
-+}
-+#endif
-+
-+static DEFINE_PER_CPU(struct static_sched_domain, phys_domains);
-+static DEFINE_PER_CPU(struct static_sched_group, sched_group_phys);
-+
-+static int
-+cpu_to_phys_group(int cpu, const struct cpumask *cpu_map,
-+		  struct sched_group **sg, struct cpumask *mask)
-+{
-+	int group;
-+#ifdef CONFIG_SCHED_MC
-+	cpumask_and(mask, cpu_coregroup_mask(cpu), cpu_map);
-+	group = cpumask_first(mask);
-+#elif defined(CONFIG_SCHED_SMT)
-+	cpumask_and(mask, topology_thread_cpumask(cpu), cpu_map);
-+	group = cpumask_first(mask);
-+#else
-+	group = cpu;
-+#endif
-+	if (sg)
-+		*sg = &per_cpu(sched_group_phys, group).sg;
-+	return group;
-+}
-+
-+/**
-+ * group_first_cpu - Returns the first cpu in the cpumask of a sched_group.
-+ * @group: The group whose first cpu is to be returned.
-+ */
-+static inline unsigned int group_first_cpu(struct sched_group *group)
-+{
-+	return cpumask_first(sched_group_cpus(group));
-+}
-+
-+#ifdef CONFIG_NUMA
-+/*
-+ * The init_sched_build_groups can't handle what we want to do with node
-+ * groups, so roll our own. Now each node has its own list of groups which
-+ * gets dynamically allocated.
-+ */
-+static DEFINE_PER_CPU(struct static_sched_domain, node_domains);
-+static struct sched_group ***sched_group_nodes_bycpu;
-+
-+static DEFINE_PER_CPU(struct static_sched_domain, allnodes_domains);
-+static DEFINE_PER_CPU(struct static_sched_group, sched_group_allnodes);
-+
-+static int cpu_to_allnodes_group(int cpu, const struct cpumask *cpu_map,
-+				 struct sched_group **sg,
-+				 struct cpumask *nodemask)
-+{
-+	int group;
-+
-+	cpumask_and(nodemask, cpumask_of_node(cpu_to_node(cpu)), cpu_map);
-+	group = cpumask_first(nodemask);
-+
-+	if (sg)
-+		*sg = &per_cpu(sched_group_allnodes, group).sg;
-+	return group;
-+}
-+
-+static void init_numa_sched_groups_power(struct sched_group *group_head)
-+{
-+	struct sched_group *sg = group_head;
-+	int j;
-+
-+	if (!sg)
-+		return;
-+	do {
-+		for_each_cpu(j, sched_group_cpus(sg)) {
-+			struct sched_domain *sd;
-+
-+			sd = &per_cpu(phys_domains, j).sd;
-+			if (j != group_first_cpu(sd->groups)) {
-+				/*
-+				 * Only add "power" once for each
-+				 * physical package.
-+				 */
-+				continue;
-+			}
-+
-+			sg_inc_cpu_power(sg, sd->groups->__cpu_power);
-+		}
-+		sg = sg->next;
-+	} while (sg != group_head);
-+}
-+#endif /* CONFIG_NUMA */
-+
-+#ifdef CONFIG_NUMA
-+/* Free memory allocated for various sched_group structures */
-+static void free_sched_groups(const struct cpumask *cpu_map,
-+			      struct cpumask *nodemask)
-+{
-+	int cpu, i;
-+
-+	for_each_cpu(cpu, cpu_map) {
-+		struct sched_group **sched_group_nodes
-+			= sched_group_nodes_bycpu[cpu];
-+
-+		if (!sched_group_nodes)
-+			continue;
-+
-+		for (i = 0; i < nr_node_ids; i++) {
-+			struct sched_group *oldsg, *sg = sched_group_nodes[i];
-+
-+			cpumask_and(nodemask, cpumask_of_node(i), cpu_map);
-+			if (cpumask_empty(nodemask))
-+				continue;
-+
-+			if (sg == NULL)
-+				continue;
-+			sg = sg->next;
-+next_sg:
-+			oldsg = sg;
-+			sg = sg->next;
-+			kfree(oldsg);
-+			if (oldsg != sched_group_nodes[i])
-+				goto next_sg;
-+		}
-+		kfree(sched_group_nodes);
-+		sched_group_nodes_bycpu[cpu] = NULL;
-+	}
-+}
-+#else /* !CONFIG_NUMA */
-+static void free_sched_groups(const struct cpumask *cpu_map,
-+			      struct cpumask *nodemask)
-+{
-+}
-+#endif /* CONFIG_NUMA */
-+
-+/*
-+ * Initialize sched groups cpu_power.
-+ *
-+ * cpu_power indicates the capacity of sched group, which is used while
-+ * distributing the load between different sched groups in a sched domain.
-+ * Typically cpu_power for all the groups in a sched domain will be same unless
-+ * there are asymmetries in the topology. If there are asymmetries, group
-+ * having more cpu_power will pickup more load compared to the group having
-+ * less cpu_power.
-+ *
-+ * cpu_power will be a multiple of SCHED_LOAD_SCALE. This multiple represents
-+ * the maximum number of tasks a group can handle in the presence of other idle
-+ * or lightly loaded groups in the same sched domain.
-+ */
-+static void init_sched_groups_power(int cpu, struct sched_domain *sd)
-+{
-+	struct sched_domain *child;
-+	struct sched_group *group;
-+
-+	WARN_ON(!sd || !sd->groups);
-+
-+	if (cpu != group_first_cpu(sd->groups))
-+		return;
-+
-+	child = sd->child;
-+
-+	sd->groups->__cpu_power = 0;
-+
-+	/*
-+	 * For perf policy, if the groups in child domain share resources
-+	 * (for example cores sharing some portions of the cache hierarchy
-+	 * or SMT), then set this domain groups cpu_power such that each group
-+	 * can handle only one task, when there are other idle groups in the
-+	 * same sched domain.
-+	 */
-+	if (!child || (!(sd->flags & SD_POWERSAVINGS_BALANCE) &&
-+		       (child->flags &
-+			(SD_SHARE_CPUPOWER | SD_SHARE_PKG_RESOURCES)))) {
-+		sg_inc_cpu_power(sd->groups, SCHED_LOAD_SCALE);
-+		return;
-+	}
-+
-+	/*
-+	 * add cpu_power of each child group to this groups cpu_power
-+	 */
-+	group = child->groups;
-+	do {
-+		sg_inc_cpu_power(sd->groups, group->__cpu_power);
-+		group = group->next;
-+	} while (group != child->groups);
-+}
-+
-+/*
-+ * Initializers for schedule domains
-+ * Non-inlined to reduce accumulated stack pressure in build_sched_domains()
-+ */
-+
-+#ifdef CONFIG_SCHED_DEBUG
-+# define SD_INIT_NAME(sd, type)		sd->name = #type
-+#else
-+# define SD_INIT_NAME(sd, type)		do { } while (0)
-+#endif
-+
-+#define	SD_INIT(sd, type)	sd_init_##type(sd)
-+
-+#define SD_INIT_FUNC(type)	\
-+static noinline void sd_init_##type(struct sched_domain *sd)	\
-+{								\
-+	memset(sd, 0, sizeof(*sd));				\
-+	*sd = SD_##type##_INIT;					\
-+	sd->level = SD_LV_##type;				\
-+	SD_INIT_NAME(sd, type);					\
-+}
-+
-+SD_INIT_FUNC(CPU)
-+#ifdef CONFIG_NUMA
-+ SD_INIT_FUNC(ALLNODES)
-+ SD_INIT_FUNC(NODE)
-+#endif
-+#ifdef CONFIG_SCHED_SMT
-+ SD_INIT_FUNC(SIBLING)
-+#endif
-+#ifdef CONFIG_SCHED_MC
-+ SD_INIT_FUNC(MC)
-+#endif
-+
-+static int default_relax_domain_level = -1;
-+
-+static int __init setup_relax_domain_level(char *str)
-+{
-+	unsigned long val;
-+
-+	val = simple_strtoul(str, NULL, 0);
-+	if (val < SD_LV_MAX)
-+		default_relax_domain_level = val;
-+
-+	return 1;
-+}
-+__setup("relax_domain_level=", setup_relax_domain_level);
-+
-+static void set_domain_attribute(struct sched_domain *sd,
-+				 struct sched_domain_attr *attr)
-+{
-+	int request;
-+
-+	if (!attr || attr->relax_domain_level < 0) {
-+		if (default_relax_domain_level < 0)
-+			return;
-+		else
-+			request = default_relax_domain_level;
-+	} else
-+		request = attr->relax_domain_level;
-+	if (request < sd->level) {
-+		/* turn off idle balance on this domain */
-+		sd->flags &= ~(SD_WAKE_IDLE|SD_BALANCE_NEWIDLE);
-+	} else {
-+		/* turn on idle balance on this domain */
-+		sd->flags |= (SD_WAKE_IDLE_FAR|SD_BALANCE_NEWIDLE);
-+	}
-+}
-+
-+/*
-+ * Build sched domains for a given set of cpus and attach the sched domains
-+ * to the individual cpus
-+ */
-+static int __build_sched_domains(const struct cpumask *cpu_map,
-+				 struct sched_domain_attr *attr)
-+{
-+	int i, err = -ENOMEM;
-+	struct root_domain *rd;
-+	cpumask_var_t nodemask, this_sibling_map, this_core_map, send_covered,
-+		tmpmask;
-+#ifdef CONFIG_NUMA
-+	cpumask_var_t domainspan, covered, notcovered;
-+	struct sched_group **sched_group_nodes = NULL;
-+	int sd_allnodes = 0;
-+
-+	if (!alloc_cpumask_var(&domainspan, GFP_KERNEL))
-+		goto out;
-+	if (!alloc_cpumask_var(&covered, GFP_KERNEL))
-+		goto free_domainspan;
-+	if (!alloc_cpumask_var(&notcovered, GFP_KERNEL))
-+		goto free_covered;
-+#endif
-+
-+	if (!alloc_cpumask_var(&nodemask, GFP_KERNEL))
-+		goto free_notcovered;
-+	if (!alloc_cpumask_var(&this_sibling_map, GFP_KERNEL))
-+		goto free_nodemask;
-+	if (!alloc_cpumask_var(&this_core_map, GFP_KERNEL))
-+		goto free_this_sibling_map;
-+	if (!alloc_cpumask_var(&send_covered, GFP_KERNEL))
-+		goto free_this_core_map;
-+	if (!alloc_cpumask_var(&tmpmask, GFP_KERNEL))
-+		goto free_send_covered;
-+
-+#ifdef CONFIG_NUMA
-+	/*
-+	 * Allocate the per-node list of sched groups
-+	 */
-+	sched_group_nodes = kcalloc(nr_node_ids, sizeof(struct sched_group *),
-+				    GFP_KERNEL);
-+	if (!sched_group_nodes) {
-+		printk(KERN_WARNING "Can not alloc sched group node list\n");
-+		goto free_tmpmask;
-+	}
-+#endif
-+
-+	rd = alloc_rootdomain();
-+	if (!rd) {
-+		printk(KERN_WARNING "Cannot alloc root domain\n");
-+		goto free_sched_groups;
-+	}
-+
-+#ifdef CONFIG_NUMA
-+	sched_group_nodes_bycpu[cpumask_first(cpu_map)] = sched_group_nodes;
-+#endif
-+
-+	/*
-+	 * Set up domains for cpus specified by the cpu_map.
-+	 */
-+	for_each_cpu(i, cpu_map) {
-+		struct sched_domain *sd = NULL, *p;
-+
-+		cpumask_and(nodemask, cpumask_of_node(cpu_to_node(i)), cpu_map);
-+
-+#ifdef CONFIG_NUMA
-+		if (cpumask_weight(cpu_map) >
-+				SD_NODES_PER_DOMAIN*cpumask_weight(nodemask)) {
-+			sd = &per_cpu(allnodes_domains, i).sd;
-+			SD_INIT(sd, ALLNODES);
-+			set_domain_attribute(sd, attr);
-+			cpumask_copy(sched_domain_span(sd), cpu_map);
-+			cpu_to_allnodes_group(i, cpu_map, &sd->groups, tmpmask);
-+			p = sd;
-+			sd_allnodes = 1;
-+		} else
-+			p = NULL;
-+
-+		sd = &per_cpu(node_domains, i).sd;
-+		SD_INIT(sd, NODE);
-+		set_domain_attribute(sd, attr);
-+		sched_domain_node_span(cpu_to_node(i), sched_domain_span(sd));
-+		sd->parent = p;
-+		if (p)
-+			p->child = sd;
-+		cpumask_and(sched_domain_span(sd),
-+			    sched_domain_span(sd), cpu_map);
-+#endif
-+
-+		p = sd;
-+		sd = &per_cpu(phys_domains, i).sd;
-+		SD_INIT(sd, CPU);
-+		set_domain_attribute(sd, attr);
-+		cpumask_copy(sched_domain_span(sd), nodemask);
-+		sd->parent = p;
-+		if (p)
-+			p->child = sd;
-+		cpu_to_phys_group(i, cpu_map, &sd->groups, tmpmask);
-+
-+#ifdef CONFIG_SCHED_MC
-+		p = sd;
-+		sd = &per_cpu(core_domains, i).sd;
-+		SD_INIT(sd, MC);
-+		set_domain_attribute(sd, attr);
-+		cpumask_and(sched_domain_span(sd), cpu_map,
-+						   cpu_coregroup_mask(i));
-+		sd->parent = p;
-+		p->child = sd;
-+		cpu_to_core_group(i, cpu_map, &sd->groups, tmpmask);
-+#endif
-+
-+#ifdef CONFIG_SCHED_SMT
-+		p = sd;
-+		sd = &per_cpu(cpu_domains, i).sd;
-+		SD_INIT(sd, SIBLING);
-+		set_domain_attribute(sd, attr);
-+		cpumask_and(sched_domain_span(sd),
-+			    topology_thread_cpumask(i), cpu_map);
-+		sd->parent = p;
-+		p->child = sd;
-+		cpu_to_cpu_group(i, cpu_map, &sd->groups, tmpmask);
-+#endif
-+	}
-+
-+#ifdef CONFIG_SCHED_SMT
-+	/* Set up CPU (sibling) groups */
-+	for_each_cpu(i, cpu_map) {
-+		cpumask_and(this_sibling_map,
-+			    topology_thread_cpumask(i), cpu_map);
-+		if (i != cpumask_first(this_sibling_map))
-+			continue;
-+
-+		init_sched_build_groups(this_sibling_map, cpu_map,
-+					&cpu_to_cpu_group,
-+					send_covered, tmpmask);
-+	}
-+#endif
-+
-+#ifdef CONFIG_SCHED_MC
-+	/* Set up multi-core groups */
-+	for_each_cpu(i, cpu_map) {
-+		cpumask_and(this_core_map, cpu_coregroup_mask(i), cpu_map);
-+		if (i != cpumask_first(this_core_map))
-+			continue;
-+
-+		init_sched_build_groups(this_core_map, cpu_map,
-+					&cpu_to_core_group,
-+					send_covered, tmpmask);
-+	}
-+#endif
-+
-+	/* Set up physical groups */
-+	for (i = 0; i < nr_node_ids; i++) {
-+		cpumask_and(nodemask, cpumask_of_node(i), cpu_map);
-+		if (cpumask_empty(nodemask))
-+			continue;
-+
-+		init_sched_build_groups(nodemask, cpu_map,
-+					&cpu_to_phys_group,
-+					send_covered, tmpmask);
-+	}
-+
-+#ifdef CONFIG_NUMA
-+	/* Set up node groups */
-+	if (sd_allnodes) {
-+		init_sched_build_groups(cpu_map, cpu_map,
-+					&cpu_to_allnodes_group,
-+					send_covered, tmpmask);
-+	}
-+
-+	for (i = 0; i < nr_node_ids; i++) {
-+		/* Set up node groups */
-+		struct sched_group *sg, *prev;
-+		int j;
-+
-+		cpumask_clear(covered);
-+		cpumask_and(nodemask, cpumask_of_node(i), cpu_map);
-+		if (cpumask_empty(nodemask)) {
-+			sched_group_nodes[i] = NULL;
-+			continue;
-+		}
-+
-+		sched_domain_node_span(i, domainspan);
-+		cpumask_and(domainspan, domainspan, cpu_map);
-+
-+		sg = kmalloc_node(sizeof(struct sched_group) + cpumask_size(),
-+				  GFP_KERNEL, i);
-+		if (!sg) {
-+			printk(KERN_WARNING "Can not alloc domain group for "
-+				"node %d\n", i);
-+			goto error;
-+		}
-+		sched_group_nodes[i] = sg;
-+		for_each_cpu(j, nodemask) {
-+			struct sched_domain *sd;
-+
-+			sd = &per_cpu(node_domains, j).sd;
-+			sd->groups = sg;
-+		}
-+		sg->__cpu_power = 0;
-+		cpumask_copy(sched_group_cpus(sg), nodemask);
-+		sg->next = sg;
-+		cpumask_or(covered, covered, nodemask);
-+		prev = sg;
-+
-+		for (j = 0; j < nr_node_ids; j++) {
-+			int n = (i + j) % nr_node_ids;
-+
-+			cpumask_complement(notcovered, covered);
-+			cpumask_and(tmpmask, notcovered, cpu_map);
-+			cpumask_and(tmpmask, tmpmask, domainspan);
-+			if (cpumask_empty(tmpmask))
-+				break;
-+
-+			cpumask_and(tmpmask, tmpmask, cpumask_of_node(n));
-+			if (cpumask_empty(tmpmask))
-+				continue;
-+
-+			sg = kmalloc_node(sizeof(struct sched_group) +
-+					  cpumask_size(),
-+					  GFP_KERNEL, i);
-+			if (!sg) {
-+				printk(KERN_WARNING
-+				"Can not alloc domain group for node %d\n", j);
-+				goto error;
-+			}
-+			sg->__cpu_power = 0;
-+			cpumask_copy(sched_group_cpus(sg), tmpmask);
-+			sg->next = prev->next;
-+			cpumask_or(covered, covered, tmpmask);
-+			prev->next = sg;
-+			prev = sg;
-+		}
-+	}
-+#endif
-+
-+	/* Calculate CPU power for physical packages and nodes */
-+#ifdef CONFIG_SCHED_SMT
-+	for_each_cpu(i, cpu_map) {
-+		struct sched_domain *sd = &per_cpu(cpu_domains, i).sd;
-+
-+		init_sched_groups_power(i, sd);
-+	}
-+#endif
-+#ifdef CONFIG_SCHED_MC
-+	for_each_cpu(i, cpu_map) {
-+		struct sched_domain *sd = &per_cpu(core_domains, i).sd;
-+
-+		init_sched_groups_power(i, sd);
-+	}
-+#endif
-+
-+	for_each_cpu(i, cpu_map) {
-+		struct sched_domain *sd = &per_cpu(phys_domains, i).sd;
-+
-+		init_sched_groups_power(i, sd);
-+	}
-+
-+#ifdef CONFIG_NUMA
-+	for (i = 0; i < nr_node_ids; i++)
-+		init_numa_sched_groups_power(sched_group_nodes[i]);
-+
-+	if (sd_allnodes) {
-+		struct sched_group *sg;
-+
-+		cpu_to_allnodes_group(cpumask_first(cpu_map), cpu_map, &sg,
-+								tmpmask);
-+		init_numa_sched_groups_power(sg);
-+	}
-+#endif
-+
-+	/* Attach the domains */
-+	for_each_cpu(i, cpu_map) {
-+		struct sched_domain *sd;
-+#ifdef CONFIG_SCHED_SMT
-+		sd = &per_cpu(cpu_domains, i).sd;
-+#elif defined(CONFIG_SCHED_MC)
-+		sd = &per_cpu(core_domains, i).sd;
-+#else
-+		sd = &per_cpu(phys_domains, i).sd;
-+#endif
-+		cpu_attach_domain(sd, rd, i);
-+	}
-+
-+	err = 0;
-+
-+free_tmpmask:
-+	free_cpumask_var(tmpmask);
-+free_send_covered:
-+	free_cpumask_var(send_covered);
-+free_this_core_map:
-+	free_cpumask_var(this_core_map);
-+free_this_sibling_map:
-+	free_cpumask_var(this_sibling_map);
-+free_nodemask:
-+	free_cpumask_var(nodemask);
-+free_notcovered:
-+#ifdef CONFIG_NUMA
-+	free_cpumask_var(notcovered);
-+free_covered:
-+	free_cpumask_var(covered);
-+free_domainspan:
-+	free_cpumask_var(domainspan);
-+out:
-+#endif
-+	return err;
-+
-+free_sched_groups:
-+#ifdef CONFIG_NUMA
-+	kfree(sched_group_nodes);
-+#endif
-+	goto free_tmpmask;
-+
-+#ifdef CONFIG_NUMA
-+error:
-+	free_sched_groups(cpu_map, tmpmask);
-+	free_rootdomain(rd);
-+	goto free_tmpmask;
-+#endif
-+}
-+
-+static int build_sched_domains(const struct cpumask *cpu_map)
-+{
-+	return __build_sched_domains(cpu_map, NULL);
-+}
-+
-+static struct cpumask *doms_cur;	/* current sched domains */
-+static int ndoms_cur;		/* number of sched domains in 'doms_cur' */
-+static struct sched_domain_attr *dattr_cur;
-+				/* attribues of custom domains in 'doms_cur' */
-+
-+/*
-+ * Special case: If a kmalloc of a doms_cur partition (array of
-+ * cpumask) fails, then fallback to a single sched domain,
-+ * as determined by the single cpumask fallback_doms.
-+ */
-+static cpumask_var_t fallback_doms;
-+
-+/*
-+ * arch_update_cpu_topology lets virtualized architectures update the
-+ * cpu core maps. It is supposed to return 1 if the topology changed
-+ * or 0 if it stayed the same.
-+ */
-+int __attribute__((weak)) arch_update_cpu_topology(void)
-+{
-+	return 0;
-+}
-+
-+/*
-+ * Set up scheduler domains and groups. Callers must hold the hotplug lock.
-+ * For now this just excludes isolated cpus, but could be used to
-+ * exclude other special cases in the future.
-+ */
-+static int arch_init_sched_domains(const struct cpumask *cpu_map)
-+{
-+	int err;
-+
-+	arch_update_cpu_topology();
-+	ndoms_cur = 1;
-+	doms_cur = kmalloc(cpumask_size(), GFP_KERNEL);
-+	if (!doms_cur)
-+		doms_cur = fallback_doms;
-+	cpumask_andnot(doms_cur, cpu_map, cpu_isolated_map);
-+	dattr_cur = NULL;
-+	err = build_sched_domains(doms_cur);
-+	register_sched_domain_sysctl();
-+
-+	return err;
-+}
-+
-+static void arch_destroy_sched_domains(const struct cpumask *cpu_map,
-+				       struct cpumask *tmpmask)
-+{
-+	free_sched_groups(cpu_map, tmpmask);
-+}
-+
-+/*
-+ * Detach sched domains from a group of cpus specified in cpu_map
-+ * These cpus will now be attached to the NULL domain
-+ */
-+static void detach_destroy_domains(const struct cpumask *cpu_map)
-+{
-+	/* Save because hotplug lock held. */
-+	static DECLARE_BITMAP(tmpmask, CONFIG_NR_CPUS);
-+	int i;
-+
-+	for_each_cpu(i, cpu_map)
-+		cpu_attach_domain(NULL, &def_root_domain, i);
-+	synchronize_sched();
-+	arch_destroy_sched_domains(cpu_map, to_cpumask(tmpmask));
-+}
-+
-+/* handle null as "default" */
-+static int dattrs_equal(struct sched_domain_attr *cur, int idx_cur,
-+			struct sched_domain_attr *new, int idx_new)
-+{
-+	struct sched_domain_attr tmp;
-+
-+	/* fast path */
-+	if (!new && !cur)
-+		return 1;
-+
-+	tmp = SD_ATTR_INIT;
-+	return !memcmp(cur ? (cur + idx_cur) : &tmp,
-+			new ? (new + idx_new) : &tmp,
-+			sizeof(struct sched_domain_attr));
-+}
-+
-+/*
-+ * Partition sched domains as specified by the 'ndoms_new'
-+ * cpumasks in the array doms_new[] of cpumasks. This compares
-+ * doms_new[] to the current sched domain partitioning, doms_cur[].
-+ * It destroys each deleted domain and builds each new domain.
-+ *
-+ * 'doms_new' is an array of cpumask's of length 'ndoms_new'.
-+ * The masks don't intersect (don't overlap.) We should setup one
-+ * sched domain for each mask. CPUs not in any of the cpumasks will
-+ * not be load balanced. If the same cpumask appears both in the
-+ * current 'doms_cur' domains and in the new 'doms_new', we can leave
-+ * it as it is.
-+ *
-+ * The passed in 'doms_new' should be kmalloc'd. This routine takes
-+ * ownership of it and will kfree it when done with it. If the caller
-+ * failed the kmalloc call, then it can pass in doms_new == NULL &&
-+ * ndoms_new == 1, and partition_sched_domains() will fallback to
-+ * the single partition 'fallback_doms', it also forces the domains
-+ * to be rebuilt.
-+ *
-+ * If doms_new == NULL it will be replaced with cpu_online_mask.
-+ * ndoms_new == 0 is a special case for destroying existing domains,
-+ * and it will not create the default domain.
-+ *
-+ * Call with hotplug lock held
-+ */
-+/* FIXME: Change to struct cpumask *doms_new[] */
-+void partition_sched_domains(int ndoms_new, struct cpumask *doms_new,
-+			     struct sched_domain_attr *dattr_new)
-+{
-+	int i, j, n;
-+	int new_topology;
-+
-+	mutex_lock(&sched_domains_mutex);
-+
-+	/* always unregister in case we don't destroy any domains */
-+	unregister_sched_domain_sysctl();
-+
-+	/* Let architecture update cpu core mappings. */
-+	new_topology = arch_update_cpu_topology();
-+
-+	n = doms_new ? ndoms_new : 0;
-+
-+	/* Destroy deleted domains */
-+	for (i = 0; i < ndoms_cur; i++) {
-+		for (j = 0; j < n && !new_topology; j++) {
-+			if (cpumask_equal(&doms_cur[i], &doms_new[j])
-+			    && dattrs_equal(dattr_cur, i, dattr_new, j))
-+				goto match1;
-+		}
-+		/* no match - a current sched domain not in new doms_new[] */
-+		detach_destroy_domains(doms_cur + i);
-+match1:
-+		;
-+	}
-+
-+	if (doms_new == NULL) {
-+		ndoms_cur = 0;
-+		doms_new = fallback_doms;
-+		cpumask_andnot(&doms_new[0], cpu_online_mask, cpu_isolated_map);
-+		WARN_ON_ONCE(dattr_new);
-+	}
-+
-+	/* Build new domains */
-+	for (i = 0; i < ndoms_new; i++) {
-+		for (j = 0; j < ndoms_cur && !new_topology; j++) {
-+			if (cpumask_equal(&doms_new[i], &doms_cur[j])
-+			    && dattrs_equal(dattr_new, i, dattr_cur, j))
-+				goto match2;
-+		}
-+		/* no match - add a new doms_new */
-+		__build_sched_domains(doms_new + i,
-+					dattr_new ? dattr_new + i : NULL);
-+match2:
-+		;
-+	}
-+
-+	/* Remember the new sched domains */
-+	if (doms_cur != fallback_doms)
-+		kfree(doms_cur);
-+	kfree(dattr_cur);	/* kfree(NULL) is safe */
-+	doms_cur = doms_new;
-+	dattr_cur = dattr_new;
-+	ndoms_cur = ndoms_new;
-+
-+	register_sched_domain_sysctl();
-+
-+	mutex_unlock(&sched_domains_mutex);
-+}
-+
-+#if defined(CONFIG_SCHED_MC) || defined(CONFIG_SCHED_SMT)
-+static void arch_reinit_sched_domains(void)
-+{
-+	get_online_cpus();
-+
-+	/* Destroy domains first to force the rebuild */
-+	partition_sched_domains(0, NULL, NULL);
-+
-+	rebuild_sched_domains();
-+	put_online_cpus();
-+}
-+
-+static ssize_t sched_power_savings_store(const char *buf, size_t count, int smt)
-+{
-+	unsigned int level = 0;
-+
-+	if (sscanf(buf, "%u", &level) != 1)
-+		return -EINVAL;
-+
-+	/*
-+	 * level is always be positive so don't check for
-+	 * level < POWERSAVINGS_BALANCE_NONE which is 0
-+	 * What happens on 0 or 1 byte write,
-+	 * need to check for count as well?
-+	 */
-+
-+	if (level >= MAX_POWERSAVINGS_BALANCE_LEVELS)
-+		return -EINVAL;
-+
-+	if (smt)
-+		sched_smt_power_savings = level;
-+	else
-+		sched_mc_power_savings = level;
-+
-+	arch_reinit_sched_domains();
-+
-+	return count;
-+}
-+
-+#ifdef CONFIG_SCHED_MC
-+static ssize_t sched_mc_power_savings_show(struct sysdev_class *class,
-+					   char *page)
-+{
-+	return sprintf(page, "%u\n", sched_mc_power_savings);
-+}
-+static ssize_t sched_mc_power_savings_store(struct sysdev_class *class,
-+					    const char *buf, size_t count)
-+{
-+	return sched_power_savings_store(buf, count, 0);
-+}
-+static SYSDEV_CLASS_ATTR(sched_mc_power_savings, 0644,
-+			 sched_mc_power_savings_show,
-+			 sched_mc_power_savings_store);
-+#endif
-+
-+#ifdef CONFIG_SCHED_SMT
-+static ssize_t sched_smt_power_savings_show(struct sysdev_class *dev,
-+					    char *page)
-+{
-+	return sprintf(page, "%u\n", sched_smt_power_savings);
-+}
-+static ssize_t sched_smt_power_savings_store(struct sysdev_class *dev,
-+					     const char *buf, size_t count)
-+{
-+	return sched_power_savings_store(buf, count, 1);
-+}
-+static SYSDEV_CLASS_ATTR(sched_smt_power_savings, 0644,
-+		   sched_smt_power_savings_show,
-+		   sched_smt_power_savings_store);
-+#endif
-+
-+int __init sched_create_sysfs_power_savings_entries(struct sysdev_class *cls)
-+{
-+	int err = 0;
-+
-+#ifdef CONFIG_SCHED_SMT
-+	if (smt_capable())
-+		err = sysfs_create_file(&cls->kset.kobj,
-+					&attr_sched_smt_power_savings.attr);
-+#endif
-+#ifdef CONFIG_SCHED_MC
-+	if (!err && mc_capable())
-+		err = sysfs_create_file(&cls->kset.kobj,
-+					&attr_sched_mc_power_savings.attr);
-+#endif
-+	return err;
-+}
-+#endif /* CONFIG_SCHED_MC || CONFIG_SCHED_SMT */
-+
-+#ifndef CONFIG_CPUSETS
-+/*
-+ * Add online and remove offline CPUs from the scheduler domains.
-+ * When cpusets are enabled they take over this function.
-+ */
-+static int update_sched_domains(struct notifier_block *nfb,
-+				unsigned long action, void *hcpu)
-+{
-+	switch (action) {
-+	case CPU_ONLINE:
-+	case CPU_ONLINE_FROZEN:
-+	case CPU_DEAD:
-+	case CPU_DEAD_FROZEN:
-+		partition_sched_domains(1, NULL, NULL);
-+		return NOTIFY_OK;
-+
-+	default:
-+		return NOTIFY_DONE;
-+	}
-+}
-+#endif
-+
-+static int update_runtime(struct notifier_block *nfb,
-+				unsigned long action, void *hcpu)
-+{
-+	switch (action) {
-+	case CPU_DOWN_PREPARE:
-+	case CPU_DOWN_PREPARE_FROZEN:
-+		return NOTIFY_OK;
-+
-+	case CPU_DOWN_FAILED:
-+	case CPU_DOWN_FAILED_FROZEN:
-+	case CPU_ONLINE:
-+	case CPU_ONLINE_FROZEN:
-+		return NOTIFY_OK;
-+
-+	default:
-+		return NOTIFY_DONE;
-+	}
-+}
-+
-+void __init sched_init_smp(void)
-+{
-+	cpumask_var_t non_isolated_cpus;
-+
-+	alloc_cpumask_var(&non_isolated_cpus, GFP_KERNEL);
-+
-+#if defined(CONFIG_NUMA)
-+	sched_group_nodes_bycpu = kzalloc(nr_cpu_ids * sizeof(void **),
-+								GFP_KERNEL);
-+	BUG_ON(sched_group_nodes_bycpu == NULL);
-+#endif
-+	get_online_cpus();
-+	mutex_lock(&sched_domains_mutex);
-+	arch_init_sched_domains(cpu_online_mask);
-+	cpumask_andnot(non_isolated_cpus, cpu_possible_mask, cpu_isolated_map);
-+	if (cpumask_empty(non_isolated_cpus))
-+		cpumask_set_cpu(smp_processor_id(), non_isolated_cpus);
-+	mutex_unlock(&sched_domains_mutex);
-+	put_online_cpus();
-+
-+#ifndef CONFIG_CPUSETS
-+	/* XXX: Theoretical race here - CPU may be hotplugged now */
-+	hotcpu_notifier(update_sched_domains, 0);
-+#endif
-+
-+	/* RT runtime code needs to handle some hotplug events */
-+	hotcpu_notifier(update_runtime, 0);
-+
-+	/* Move init over to a non-isolated CPU */
-+	if (set_cpus_allowed_ptr(current, non_isolated_cpus) < 0)
-+		BUG();
-+	free_cpumask_var(non_isolated_cpus);
-+
-+	alloc_cpumask_var(&fallback_doms, GFP_KERNEL);
-+
-+	/*
-+	 * Assume that every added cpu gives us slightly less overall latency
-+	 * allowing us to increase the base rr_interval, but in a non linear
-+	 * fashion.
-+	 */
-+	rr_interval *= 1 + ilog2(num_online_cpus());
-+}
-+#else
-+void __init sched_init_smp(void)
-+{
-+}
-+#endif /* CONFIG_SMP */
-+
-+unsigned int sysctl_timer_migration = 1;
-+
-+int in_sched_functions(unsigned long addr)
-+{
-+	return in_lock_functions(addr) ||
-+		(addr >= (unsigned long)__sched_text_start
-+		&& addr < (unsigned long)__sched_text_end);
-+}
-+
-+void __init sched_init(void)
-+{
-+	int i;
-+	int highest_cpu = 0;
-+
-+	prio_ratios[0] = 100;
-+	for (i = 1 ; i < PRIO_RANGE ; i++)
-+		prio_ratios[i] = prio_ratios[i - 1] * 11 / 10;
-+
-+#ifdef CONFIG_SMP
-+	init_defrootdomain();
-+	cpus_clear(grq.cpu_idle_map);
-+#endif
-+	spin_lock_init(&grq.lock);
-+	for_each_possible_cpu(i) {
-+		struct rq *rq;
-+
-+		rq = cpu_rq(i);
-+		INIT_LIST_HEAD(&rq->queue);
-+		rq->rq_deadline = 0;
-+		rq->rq_prio = 0;
-+		rq->cpu = i;
-+		rq->user_pc = rq->nice_pc = rq->softirq_pc = rq->system_pc =
-+			      rq->iowait_pc = rq->idle_pc = 0;
-+#ifdef CONFIG_SMP
-+		rq->sd = NULL;
-+		rq->rd = NULL;
-+		rq->online = 0;
-+		INIT_LIST_HEAD(&rq->migration_queue);
-+		rq_attach_root(rq, &def_root_domain);
-+#endif
-+		atomic_set(&rq->nr_iowait, 0);
-+		highest_cpu = i;
-+	}
-+	grq.iso_ticks = grq.nr_running = grq.nr_uninterruptible = 0;
-+	for (i = 0; i < PRIO_LIMIT; i++)
-+		INIT_LIST_HEAD(grq.queue + i);
-+	bitmap_zero(grq.prio_bitmap, PRIO_LIMIT);
-+	/* delimiter for bitsearch */
-+	__set_bit(PRIO_LIMIT, grq.prio_bitmap);
-+
-+#ifdef CONFIG_SMP
-+	nr_cpu_ids = highest_cpu + 1;
-+#endif
-+
-+#ifdef CONFIG_PREEMPT_NOTIFIERS
-+	INIT_HLIST_HEAD(&init_task.preempt_notifiers);
-+#endif
-+
-+#ifdef CONFIG_RT_MUTEXES
-+	plist_head_init(&init_task.pi_waiters, &init_task.pi_lock);
-+#endif
-+
-+	/*
-+	 * The boot idle thread does lazy MMU switching as well:
-+	 */
-+	atomic_inc(&init_mm.mm_count);
-+	enter_lazy_tlb(&init_mm, current);
-+
-+	/*
-+	 * Make us the idle thread. Technically, schedule() should not be
-+	 * called from this thread, however somewhere below it might be,
-+	 * but because we are the idle thread, we just pick up running again
-+	 * when this runqueue becomes "idle".
-+	 */
-+	init_idle(current, smp_processor_id());
-+
-+	/* Allocate the nohz_cpu_mask if CONFIG_CPUMASK_OFFSTACK */
-+	alloc_cpumask_var(&nohz_cpu_mask, GFP_NOWAIT);
-+#ifdef CONFIG_SMP
-+#ifdef CONFIG_NO_HZ
-+	alloc_cpumask_var(&nohz.cpu_mask, GFP_NOWAIT);
-+	alloc_cpumask_var(&nohz.ilb_grp_nohz_mask, GFP_NOWAIT);
-+#endif
-+	alloc_cpumask_var(&cpu_isolated_map, GFP_NOWAIT);
-+#endif /* SMP */
-+	perf_counter_init();
-+}
-+
-+#ifdef CONFIG_DEBUG_SPINLOCK_SLEEP
-+void __might_sleep(char *file, int line)
-+{
-+#ifdef in_atomic
-+	static unsigned long prev_jiffy;	/* ratelimiting */
-+
-+	if ((in_atomic() || irqs_disabled()) &&
-+	    system_state == SYSTEM_RUNNING && !oops_in_progress) {
-+		if (time_before(jiffies, prev_jiffy + HZ) && prev_jiffy)
-+			return;
-+		prev_jiffy = jiffies;
-+		printk(KERN_ERR "BUG: sleeping function called from invalid"
-+				" context at %s:%d\n", file, line);
-+		printk("in_atomic():%d, irqs_disabled():%d\n",
-+			in_atomic(), irqs_disabled());
-+		debug_show_held_locks(current);
-+		if (irqs_disabled())
-+			print_irqtrace_events(current);
-+		dump_stack();
-+	}
-+#endif
-+}
-+EXPORT_SYMBOL(__might_sleep);
-+#endif
-+
-+#ifdef CONFIG_MAGIC_SYSRQ
-+void normalize_rt_tasks(void)
-+{
-+	struct task_struct *g, *p;
-+	unsigned long flags;
-+	struct rq *rq;
-+	int queued;
-+
-+	read_lock_irq(&tasklist_lock);
-+
-+	do_each_thread(g, p) {
-+		if (!rt_task(p) && !iso_task(p))
-+			continue;
-+
-+		spin_lock_irqsave(&p->pi_lock, flags);
-+		rq = __task_grq_lock(p);
-+		update_rq_clock(rq);
-+
-+		queued = task_queued_only(p);
-+		if (queued)
-+			dequeue_task(p);
-+		__setscheduler(p, SCHED_NORMAL, 0);
-+		if (task_running(p))
-+			resched_task(p);
-+		if (queued) {
-+			enqueue_task(p);
-+			try_preempt(p);
-+		}
-+
-+		__task_grq_unlock();
-+		spin_unlock_irqrestore(&p->pi_lock, flags);
-+	} while_each_thread(g, p);
-+
-+	read_unlock_irq(&tasklist_lock);
-+}
-+#endif /* CONFIG_MAGIC_SYSRQ */
-+
-+#ifdef CONFIG_IA64
-+/*
-+ * These functions are only useful for the IA64 MCA handling.
-+ *
-+ * They can only be called when the whole system has been
-+ * stopped - every CPU needs to be quiescent, and no scheduling
-+ * activity can take place. Using them for anything else would
-+ * be a serious bug, and as a result, they aren't even visible
-+ * under any other configuration.
-+ */
-+
-+/**
-+ * curr_task - return the current task for a given cpu.
-+ * @cpu: the processor in question.
-+ *
-+ * ONLY VALID WHEN THE WHOLE SYSTEM IS STOPPED!
-+ */
-+struct task_struct *curr_task(int cpu)
-+{
-+	return cpu_curr(cpu);
-+}
-+
-+/**
-+ * set_curr_task - set the current task for a given cpu.
-+ * @cpu: the processor in question.
-+ * @p: the task pointer to set.
-+ *
-+ * Description: This function must only be used when non-maskable interrupts
-+ * are serviced on a separate stack.  It allows the architecture to switch the
-+ * notion of the current task on a cpu in a non-blocking manner.  This function
-+ * must be called with all CPU's synchronized, and interrupts disabled, the
-+ * and caller must save the original value of the current task (see
-+ * curr_task() above) and restore that value before reenabling interrupts and
-+ * re-starting the system.
-+ *
-+ * ONLY VALID WHEN THE WHOLE SYSTEM IS STOPPED!
-+ */
-+void set_curr_task(int cpu, struct task_struct *p)
-+{
-+	cpu_curr(cpu) = p;
-+}
-+
-+#endif
-+
-+/*
-+ * Use precise platform statistics if available:
-+ */
-+#ifdef CONFIG_VIRT_CPU_ACCOUNTING
-+cputime_t task_utime(struct task_struct *p)
-+{
-+	return p->utime;
-+}
-+
-+cputime_t task_stime(struct task_struct *p)
-+{
-+	return p->stime;
-+}
-+#else
-+cputime_t task_utime(struct task_struct *p)
-+{
-+	clock_t utime = cputime_to_clock_t(p->utime),
-+		total = utime + cputime_to_clock_t(p->stime);
-+	u64 temp;
-+
-+	temp = (u64)nsec_to_clock_t(p->se.sum_exec_runtime);
-+
-+	if (total) {
-+		temp *= utime;
-+		do_div(temp, total);
-+	}
-+	utime = (clock_t)temp;
-+
-+	p->prev_utime = max(p->prev_utime, clock_t_to_cputime(utime));
-+	return p->prev_utime;
-+}
-+
-+cputime_t task_stime(struct task_struct *p)
-+{
-+	clock_t stime;
-+
-+	stime = nsec_to_clock_t(p->se.sum_exec_runtime) -
-+			cputime_to_clock_t(task_utime(p));
-+
-+	if (stime >= 0)
-+		p->prev_stime = max(p->prev_stime, clock_t_to_cputime(stime));
-+
-+	return p->prev_stime;
-+}
-+#endif
-+
-+inline cputime_t task_gtime(struct task_struct *p)
-+{
-+	return p->gtime;
-+}
-+
-+void __cpuinit init_idle_bootup_task(struct task_struct *idle)
-+{}
-+
-+#ifdef CONFIG_SCHED_DEBUG
-+void proc_sched_show_task(struct task_struct *p, struct seq_file *m)
-+{}
-+
-+void proc_sched_set_task(struct task_struct *p)
-+{}
-+#endif
---- a/kernel/sysctl.c
-+++ b/kernel/sysctl.c
-@@ -86,6 +86,8 @@ extern int percpu_pagelist_fraction;
- extern int compat_log;
- extern int latencytop_enabled;
- extern int sysctl_nr_open_min, sysctl_nr_open_max;
-+extern int rr_interval;
-+extern int sched_iso_cpu;
- #ifndef CONFIG_MMU
- extern int sysctl_nr_trim_pages;
- #endif
-@@ -103,7 +105,8 @@ static int zero;
- static int __maybe_unused one = 1;
- static int __maybe_unused two = 2;
- static unsigned long one_ul = 1;
--static int one_hundred = 100;
-+static int __read_mostly one_hundred = 100;
-+static int __maybe_unused __read_mostly five_thousand = 5000;
- 
- /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
- static unsigned long dirty_bytes_min = 2 * PAGE_SIZE;
-@@ -238,7 +241,7 @@ static struct ctl_table root_table[] = {
- 	{ .ctl_name = 0 }
- };
- 
--#ifdef CONFIG_SCHED_DEBUG
-+#if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SCHED_CFS)
- static int min_sched_granularity_ns = 100000;		/* 100 usecs */
- static int max_sched_granularity_ns = NSEC_PER_SEC;	/* 1 second */
- static int min_wakeup_granularity_ns;			/* 0 usecs */
-@@ -246,7 +249,7 @@ static int max_wakeup_granularity_ns = N
- #endif
- 
- static struct ctl_table kern_table[] = {
--#ifdef CONFIG_SCHED_DEBUG
-+#if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SCHED_CFS)
- 	{
- 		.ctl_name	= CTL_UNNUMBERED,
- 		.procname	= "sched_min_granularity_ns",
-@@ -342,6 +345,7 @@ static struct ctl_table kern_table[] = {
- 		.extra2		= &one,
- 	},
- #endif
-+#ifdef CONFIG_SCHED_CFS
- 	{
- 		.ctl_name	= CTL_UNNUMBERED,
- 		.procname	= "sched_rt_period_us",
-@@ -366,6 +370,7 @@ static struct ctl_table kern_table[] = {
- 		.mode		= 0644,
- 		.proc_handler	= &proc_dointvec,
- 	},
-+#endif
- #ifdef CONFIG_PROVE_LOCKING
- 	{
- 		.ctl_name	= CTL_UNNUMBERED,
-@@ -798,6 +803,30 @@ static struct ctl_table kern_table[] = {
- 		.proc_handler	= &proc_dointvec,
- 	},
- #endif
-+#ifdef CONFIG_SCHED_BFS
-+	{
-+		.ctl_name	= CTL_UNNUMBERED,
-+		.procname	= "rr_interval",
-+		.data		= &rr_interval,
-+		.maxlen		= sizeof (int),
-+		.mode		= 0644,
-+		.proc_handler	= &proc_dointvec_minmax,
-+		.strategy	= &sysctl_intvec,
-+		.extra1		= &one,
-+		.extra2		= &five_thousand,
-+	},
-+	{
-+		.ctl_name	= CTL_UNNUMBERED,
-+		.procname	= "iso_cpu",
-+		.data		= &sched_iso_cpu,
-+		.maxlen		= sizeof (int),
-+		.mode		= 0644,
-+		.proc_handler	= &proc_dointvec_minmax,
-+		.strategy	= &sysctl_intvec,
-+		.extra1		= &zero,
-+		.extra2		= &one_hundred,
-+	},
-+#endif
- #if defined(CONFIG_S390) && defined(CONFIG_SMP)
- 	{
- 		.ctl_name	= KERN_SPIN_RETRY,
---- a/kernel/workqueue.c
-+++ b/kernel/workqueue.c
-@@ -317,7 +317,9 @@ static int worker_thread(void *__cwq)
- 	if (cwq->wq->freezeable)
- 		set_freezable();
- 
-+#ifdef CONFIG_SCHED_CFS
- 	set_user_nice(current, -5);
-+#endif
- 
- 	for (;;) {
- 		prepare_to_wait(&cwq->more_work, &wait, TASK_INTERRUPTIBLE);
diff --git a/target/linux/generic-2.6/patches-2.6.31/400-ledtrig_morse.patch b/target/linux/generic-2.6/patches-2.6.31/400-ledtrig_morse.patch
deleted file mode 100644
index 18c504f3d..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/400-ledtrig_morse.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -297,4 +297,8 @@ config LEDS_TRIGGER_DEFAULT_ON
- comment "iptables trigger is under Netfilter config (LED target)"
- 	depends on LEDS_TRIGGERS
- 
-+config LEDS_TRIGGER_MORSE
-+	tristate "LED Morse Trigger"
-+	depends on LEDS_TRIGGERS
-+
- endif # NEW_LEDS
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -39,3 +39,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)	+= 
- obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)	+= ledtrig-backlight.o
- obj-$(CONFIG_LEDS_TRIGGER_GPIO)		+= ledtrig-gpio.o
- obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o
-+obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
diff --git a/target/linux/generic-2.6/patches-2.6.31/402-ledtrig_netdev.patch b/target/linux/generic-2.6/patches-2.6.31/402-ledtrig_netdev.patch
deleted file mode 100644
index 0f5478e0d..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/402-ledtrig_netdev.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -301,4 +301,11 @@ config LEDS_TRIGGER_MORSE
- 	tristate "LED Morse Trigger"
- 	depends on LEDS_TRIGGERS
- 
-+config LEDS_TRIGGER_NETDEV
-+	tristate "LED Netdev Trigger"
-+	depends on NET && LEDS_TRIGGERS
-+	help
-+	  This allows LEDs to be controlled by network device activity.
-+	  If unsure, say Y.
-+
- endif # NEW_LEDS
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -40,3 +40,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)	+= 
- obj-$(CONFIG_LEDS_TRIGGER_GPIO)		+= ledtrig-gpio.o
- obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o
- obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
-+obj-$(CONFIG_LEDS_TRIGGER_NETDEV)      += ledtrig-netdev.o
diff --git a/target/linux/generic-2.6/patches-2.6.31/410-gpio_buttons.patch b/target/linux/generic-2.6/patches-2.6.31/410-gpio_buttons.patch
deleted file mode 100644
index 688f6fe10..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/410-gpio_buttons.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/drivers/input/misc/Kconfig
-+++ b/drivers/input/misc/Kconfig
-@@ -269,4 +269,21 @@ config INPUT_DM355EVM
- 
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called dm355evm_keys.
-+
-+config INPUT_GPIO_BUTTONS
-+	tristate "Polled GPIO buttons interface"
-+	depends on GENERIC_GPIO
-+	select INPUT_POLLDEV
-+	help
-+	  This driver implements support for buttons connected
-+	  to GPIO pins of various CPUs (and some other chips).
-+
-+	  Say Y here if your device has buttons connected
-+	  directly to such GPIO pins.  Your board-specific
-+	  setup logic must also provide a platform device,
-+	  with configuration data saying which GPIOs are used.
-+
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called gpio-buttons.
-+
- endif
---- a/drivers/input/misc/Makefile
-+++ b/drivers/input/misc/Makefile
-@@ -26,3 +26,4 @@ obj-$(CONFIG_INPUT_TWL4030_PWRBUTTON)	+=
- obj-$(CONFIG_INPUT_UINPUT)		+= uinput.o
- obj-$(CONFIG_INPUT_WISTRON_BTNS)	+= wistron_btns.o
- obj-$(CONFIG_INPUT_YEALINK)		+= yealink.o
-+obj-$(CONFIG_INPUT_GPIO_BUTTONS)	+= gpio_buttons.o
diff --git a/target/linux/generic-2.6/patches-2.6.31/420-gpiodev.patch b/target/linux/generic-2.6/patches-2.6.31/420-gpiodev.patch
deleted file mode 100644
index 5a364d69a..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/420-gpiodev.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/drivers/char/Kconfig
-+++ b/drivers/char/Kconfig
-@@ -1029,6 +1029,14 @@ config CS5535_GPIO
- 
- 	  If compiled as a module, it will be called cs5535_gpio.
- 
-+config GPIO_DEVICE
-+	tristate "GPIO device support"
-+	depends on GENERIC_GPIO
-+	help
-+	  Say Y to enable Linux GPIO device support.  This allows control of
-+	  GPIO pins using a character device
-+
-+
- config RAW_DRIVER
- 	tristate "RAW driver (/dev/raw/rawN)"
- 	depends on BLOCK
---- a/drivers/char/Makefile
-+++ b/drivers/char/Makefile
-@@ -95,6 +95,7 @@ obj-$(CONFIG_SCx200_GPIO)	+= scx200_gpio
- obj-$(CONFIG_PC8736x_GPIO)	+= pc8736x_gpio.o
- obj-$(CONFIG_NSC_GPIO)		+= nsc_gpio.o
- obj-$(CONFIG_CS5535_GPIO)	+= cs5535_gpio.o
-+obj-$(CONFIG_GPIO_DEVICE)	+= gpio_dev.o
- obj-$(CONFIG_GPIO_TB0219)	+= tb0219.o
- obj-$(CONFIG_TELCLOCK)		+= tlclk.o
- 
diff --git a/target/linux/generic-2.6/patches-2.6.31/430-scsi_header_fix.patch b/target/linux/generic-2.6/patches-2.6.31/430-scsi_header_fix.patch
deleted file mode 100644
index 575bec92d..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/430-scsi_header_fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/include/scsi/scsi.h
-+++ b/include/scsi/scsi.h
-@@ -142,10 +142,10 @@ struct scsi_cmnd;
- 
- /* defined in T10 SCSI Primary Commands-2 (SPC2) */
- struct scsi_varlen_cdb_hdr {
--	u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
--	u8 control;
--	u8 misc[5];
--	u8 additional_cdb_length;         /* total cdb length - 8 */
-+	__u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
-+	__u8 control;
-+	__u8 misc[5];
-+	__u8 additional_cdb_length;         /* total cdb length - 8 */
- 	__be16 service_action;
- 	/* service specific data follows */
- };
diff --git a/target/linux/generic-2.6/patches-2.6.31/510-yaffs_support.patch b/target/linux/generic-2.6/patches-2.6.31/510-yaffs_support.patch
deleted file mode 100644
index 08a1efc29..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/510-yaffs_support.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/fs/Kconfig
-+++ b/fs/Kconfig
-@@ -188,6 +188,7 @@ source "fs/sysv/Kconfig"
- source "fs/ufs/Kconfig"
- source "fs/exofs/Kconfig"
- source "fs/nilfs2/Kconfig"
-+source "fs/yaffs2/Kconfig"
- 
- endif # MISC_FILESYSTEMS
- 
---- a/fs/Makefile
-+++ b/fs/Makefile
-@@ -125,3 +125,4 @@ obj-$(CONFIG_OCFS2_FS)		+= ocfs2/
- obj-$(CONFIG_BTRFS_FS)		+= btrfs/
- obj-$(CONFIG_GFS2_FS)           += gfs2/
- obj-$(CONFIG_EXOFS_FS)          += exofs/
-+obj-$(CONFIG_YAFFS_FS)		+= yaffs2/
diff --git a/target/linux/generic-2.6/patches-2.6.31/511-yaffs-cvs-2009-04-24.patch b/target/linux/generic-2.6/patches-2.6.31/511-yaffs-cvs-2009-04-24.patch
deleted file mode 100644
index 5c70e79a0..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/511-yaffs-cvs-2009-04-24.patch
+++ /dev/null
@@ -1,12344 +0,0 @@
---- a/fs/yaffs2/devextras.h
-+++ b/fs/yaffs2/devextras.h
-@@ -14,194 +14,135 @@
-  */
- 
- /*
-- * This file is just holds extra declarations used during development.
-- * Most of these are from kernel includes placed here so we can use them in
-- * applications.
-+ * This file is just holds extra declarations of macros that would normally
-+ * be providesd in the Linux kernel. These macros have been written from
-+ * scratch but are functionally equivalent to the Linux ones.
-  *
-  */
- 
- #ifndef __EXTRAS_H__
- #define __EXTRAS_H__
- 
--#if defined WIN32
--#define __inline__ __inline
--#define new newHack
--#endif
--
--#if !(defined __KERNEL__) || (defined WIN32)
- 
--/* User space defines */
-+#if !(defined __KERNEL__)
- 
-+/* Definition of types */
- typedef unsigned char __u8;
- typedef unsigned short __u16;
- typedef unsigned __u32;
- 
-+#endif
-+
- /*
-- * Simple doubly linked list implementation.
-- *
-- * Some of the internal functions ("__xxx") are useful when
-- * manipulating whole lists rather than single entries, as
-- * sometimes we already know the next/prev entries and we can
-- * generate better code by using them directly rather than
-- * using the generic single-entry routines.
-+ * This is a simple doubly linked list implementation that matches the
-+ * way the Linux kernel doubly linked list implementation works.
-  */
- 
--#define prefetch(x) 1
--
--struct list_head {
--	struct list_head *next, *prev;
-+struct ylist_head {
-+	struct ylist_head *next; /* next in chain */
-+	struct ylist_head *prev; /* previous in chain */
- };
- 
--#define LIST_HEAD_INIT(name) { &(name), &(name) }
- 
--#define LIST_HEAD(name) \
--	struct list_head name = LIST_HEAD_INIT(name)
-+/* Initialise a static list */
-+#define YLIST_HEAD(name) \
-+struct ylist_head name = { &(name), &(name)}
-+
- 
--#define INIT_LIST_HEAD(ptr) do { \
--	(ptr)->next = (ptr); (ptr)->prev = (ptr); \
-+
-+/* Initialise a list head to an empty list */
-+#define YINIT_LIST_HEAD(p) \
-+do { \
-+	(p)->next = (p);\
-+	(p)->prev = (p); \
- } while (0)
- 
--/*
-- * Insert a new entry between two known consecutive entries.
-- *
-- * This is only for internal list manipulation where we know
-- * the prev/next entries already!
-- */
--static __inline__ void __list_add(struct list_head *new,
--				  struct list_head *prev,
--				  struct list_head *next)
--{
--	next->prev = new;
--	new->next = next;
--	new->prev = prev;
--	prev->next = new;
--}
- 
--/**
-- * list_add - add a new entry
-- * @new: new entry to be added
-- * @head: list head to add it after
-- *
-- * Insert a new entry after the specified head.
-- * This is good for implementing stacks.
-- */
--static __inline__ void list_add(struct list_head *new, struct list_head *head)
-+/* Add an element to a list */
-+static __inline__ void ylist_add(struct ylist_head *newEntry,
-+				struct ylist_head *list)
- {
--	__list_add(new, head, head->next);
--}
-+	struct ylist_head *listNext = list->next;
-+
-+	list->next = newEntry;
-+	newEntry->prev = list;
-+	newEntry->next = listNext;
-+	listNext->prev = newEntry;
- 
--/**
-- * list_add_tail - add a new entry
-- * @new: new entry to be added
-- * @head: list head to add it before
-- *
-- * Insert a new entry before the specified head.
-- * This is useful for implementing queues.
-- */
--static __inline__ void list_add_tail(struct list_head *new,
--				     struct list_head *head)
--{
--	__list_add(new, head->prev, head);
- }
- 
--/*
-- * Delete a list entry by making the prev/next entries
-- * point to each other.
-- *
-- * This is only for internal list manipulation where we know
-- * the prev/next entries already!
-- */
--static __inline__ void __list_del(struct list_head *prev,
--				  struct list_head *next)
-+static __inline__ void ylist_add_tail(struct ylist_head *newEntry,
-+				 struct ylist_head *list)
- {
--	next->prev = prev;
--	prev->next = next;
-+	struct ylist_head *listPrev = list->prev;
-+
-+	list->prev = newEntry;
-+	newEntry->next = list;
-+	newEntry->prev = listPrev;
-+	listPrev->next = newEntry;
-+
- }
- 
--/**
-- * list_del - deletes entry from list.
-- * @entry: the element to delete from the list.
-- * Note: list_empty on entry does not return true after this, the entry is
-- * in an undefined state.
-- */
--static __inline__ void list_del(struct list_head *entry)
-+
-+/* Take an element out of its current list, with or without
-+ * reinitialising the links.of the entry*/
-+static __inline__ void ylist_del(struct ylist_head *entry)
- {
--	__list_del(entry->prev, entry->next);
-+	struct ylist_head *listNext = entry->next;
-+	struct ylist_head *listPrev = entry->prev;
-+
-+	listNext->prev = listPrev;
-+	listPrev->next = listNext;
-+
- }
- 
--/**
-- * list_del_init - deletes entry from list and reinitialize it.
-- * @entry: the element to delete from the list.
-- */
--static __inline__ void list_del_init(struct list_head *entry)
-+static __inline__ void ylist_del_init(struct ylist_head *entry)
- {
--	__list_del(entry->prev, entry->next);
--	INIT_LIST_HEAD(entry);
-+	ylist_del(entry);
-+	entry->next = entry->prev = entry;
- }
- 
--/**
-- * list_empty - tests whether a list is empty
-- * @head: the list to test.
-- */
--static __inline__ int list_empty(struct list_head *head)
-+
-+/* Test if the list is empty */
-+static __inline__ int ylist_empty(struct ylist_head *entry)
- {
--	return head->next == head;
-+	return (entry->next == entry);
- }
- 
--/**
-- * list_splice - join two lists
-- * @list: the new list to add.
-- * @head: the place to add it in the first list.
-+
-+/* ylist_entry takes a pointer to a list entry and offsets it to that
-+ * we can find a pointer to the object it is embedded in.
-  */
--static __inline__ void list_splice(struct list_head *list,
--				   struct list_head *head)
--{
--	struct list_head *first = list->next;
- 
--	if (first != list) {
--		struct list_head *last = list->prev;
--		struct list_head *at = head->next;
--
--		first->prev = head;
--		head->next = first;
--
--		last->next = at;
--		at->prev = last;
--	}
--}
- 
--/**
-- * list_entry - get the struct for this entry
-- * @ptr:	the &struct list_head pointer.
-- * @type:	the type of the struct this is embedded in.
-- * @member:	the name of the list_struct within the struct.
-- */
--#define list_entry(ptr, type, member) \
--	((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member)))
--
--/**
-- * list_for_each	-	iterate over a list
-- * @pos:	the &struct list_head to use as a loop counter.
-- * @head:	the head for your list.
-- */
--#define list_for_each(pos, head) \
--	for (pos = (head)->next, prefetch(pos->next); pos != (head); \
--        	pos = pos->next, prefetch(pos->next))
--
--/**
-- * list_for_each_safe	-	iterate over a list safe against removal
-- *                              of list entry
-- * @pos:	the &struct list_head to use as a loop counter.
-- * @n:		another &struct list_head to use as temporary storage
-- * @head:	the head for your list.
-- */
--#define list_for_each_safe(pos, n, head) \
--	for (pos = (head)->next, n = pos->next; pos != (head); \
--		pos = n, n = pos->next)
-+#define ylist_entry(entry, type, member) \
-+	((type *)((char *)(entry)-(unsigned long)(&((type *)NULL)->member)))
- 
--/*
-- * File types
-+
-+/* ylist_for_each and list_for_each_safe  iterate over lists.
-+ * ylist_for_each_safe uses temporary storage to make the list delete safe
-  */
-+
-+#define ylist_for_each(itervar, list) \
-+	for (itervar = (list)->next; itervar != (list); itervar = itervar->next)
-+
-+#define ylist_for_each_safe(itervar, saveVar, list) \
-+	for (itervar = (list)->next, saveVar = (list)->next->next; \
-+		itervar != (list); itervar = saveVar, saveVar = saveVar->next)
-+
-+
-+#if !(defined __KERNEL__)
-+
-+
-+#ifndef WIN32
-+#include <sys/stat.h>
-+#endif
-+
-+
-+#ifdef CONFIG_YAFFS_PROVIDE_DEFS
-+/* File types */
-+
-+
- #define DT_UNKNOWN	0
- #define DT_FIFO		1
- #define DT_CHR		2
-@@ -212,6 +153,7 @@ static __inline__ void list_splice(struc
- #define DT_SOCK		12
- #define DT_WHT		14
- 
-+
- #ifndef WIN32
- #include <sys/stat.h>
- #endif
-@@ -227,10 +169,6 @@ static __inline__ void list_splice(struc
- #define ATTR_ATIME	16
- #define ATTR_MTIME	32
- #define ATTR_CTIME	64
--#define ATTR_ATIME_SET	128
--#define ATTR_MTIME_SET	256
--#define ATTR_FORCE	512	/* Not a change, but a change it */
--#define ATTR_ATTR_FLAG	1024
- 
- struct iattr {
- 	unsigned int ia_valid;
-@@ -244,21 +182,15 @@ struct iattr {
- 	unsigned int ia_attr_flags;
- };
- 
--#define KERN_DEBUG
-+#endif
- 
- #else
- 
--#ifndef WIN32
- #include <linux/types.h>
--#include <linux/list.h>
- #include <linux/fs.h>
- #include <linux/stat.h>
--#endif
- 
- #endif
- 
--#if defined WIN32
--#undef new
--#endif
- 
- #endif
---- a/fs/yaffs2/Kconfig
-+++ b/fs/yaffs2/Kconfig
-@@ -5,7 +5,7 @@
- config YAFFS_FS
- 	tristate "YAFFS2 file system support"
- 	default n
--	depends on MTD
-+	depends on MTD_BLOCK
- 	select YAFFS_YAFFS1
- 	select YAFFS_YAFFS2
- 	help
-@@ -43,7 +43,8 @@ config YAFFS_9BYTE_TAGS
- 	  format that you need to continue to support.  New data written
- 	  also uses the older-style format.  Note: Use of this option
- 	  generally requires that MTD's oob layout be adjusted to use the
--	  older-style format.  See notes on tags formats and MTD versions.
-+	  older-style format.  See notes on tags formats and MTD versions
-+	  in yaffs_mtdif1.c.
- 
- 	  If unsure, say N.
- 
-@@ -109,26 +110,6 @@ config YAFFS_DISABLE_LAZY_LOAD
- 
- 	  If unsure, say N.
- 
--config YAFFS_CHECKPOINT_RESERVED_BLOCKS
--	int "Reserved blocks for checkpointing"
--	depends on YAFFS_YAFFS2
--	default 10
--	help
--          Give the number of Blocks to reserve for checkpointing.
--	  Checkpointing saves the state at unmount so that mounting is
--	  much faster as a scan of all the flash to regenerate this state
--	  is not needed.  These Blocks are reserved per partition, so if
--	  you have very small partitions the default (10) may be a mess
--	  for you.  You can set this value to 0, but that does not mean
--	  checkpointing is disabled at all. There only won't be any
--	  specially reserved blocks for checkpointing, so if there is
--	  enough free space on the filesystem, it will be used for
--	  checkpointing.
--
--	  If unsure, leave at default (10), but don't wonder if there are
--	  always 2MB used on your large page device partition (10 x 2k
--	  pagesize). When using small partitions or when being very small
--	  on space, you probably want to set this to zero.
- 
- config YAFFS_DISABLE_WIDE_TNODES
- 	bool "Turn off wide tnodes"
---- a/fs/yaffs2/Makefile
-+++ b/fs/yaffs2/Makefile
-@@ -5,7 +5,6 @@
- obj-$(CONFIG_YAFFS_FS) += yaffs.o
- 
- yaffs-y := yaffs_ecc.o yaffs_fs.o yaffs_guts.o yaffs_checkptrw.o
--yaffs-y += yaffs_packedtags2.o yaffs_nand.o yaffs_qsort.o
-+yaffs-y += yaffs_packedtags1.o yaffs_packedtags2.o yaffs_nand.o yaffs_qsort.o
- yaffs-y += yaffs_tagscompat.o yaffs_tagsvalidity.o
--yaffs-y += yaffs_mtdif1.o yaffs_packedtags1.o
--yaffs-y += yaffs_mtdif.o yaffs_mtdif2.o
-+yaffs-y += yaffs_mtdif.o yaffs_mtdif1.o yaffs_mtdif2.o
---- a/fs/yaffs2/moduleconfig.h
-+++ b/fs/yaffs2/moduleconfig.h
-@@ -27,12 +27,12 @@
- 
- /* Default: Not selected */
- /* Meaning: Yaffs does its own ECC, rather than using MTD ECC */
--//#define CONFIG_YAFFS_DOES_ECC
-+/* #define CONFIG_YAFFS_DOES_ECC */
- 
- /* Default: Not selected */
- /* Meaning: ECC byte order is 'wrong'.  Only meaningful if */
- /*          CONFIG_YAFFS_DOES_ECC is set */
--//#define CONFIG_YAFFS_ECC_WRONG_ORDER
-+/* #define CONFIG_YAFFS_ECC_WRONG_ORDER */
- 
- /* Default: Selected */
- /* Meaning: Disables testing whether chunks are erased before writing to them*/
-@@ -54,11 +54,11 @@ that you need to continue to support.  N
- older-style format.
- Note: Use of this option generally requires that MTD's oob layout be
- adjusted to use the older-style format.  See notes on tags formats and
--MTD versions.
-+MTD versions in yaffs_mtdif1.c.
- */
- /* Default: Not selected */
- /* Meaning: Use older-style on-NAND data format with pageStatus byte */
--#define CONFIG_YAFFS_9BYTE_TAGS
-+/* #define CONFIG_YAFFS_9BYTE_TAGS */
- 
- #endif /* YAFFS_OUT_OF_TREE */
- 
---- a/fs/yaffs2/yaffs_checkptrw.c
-+++ b/fs/yaffs2/yaffs_checkptrw.c
-@@ -12,48 +12,43 @@
-  */
- 
- const char *yaffs_checkptrw_c_version =
--    "$Id: yaffs_checkptrw.c,v 1.14 2007-05-15 20:07:40 charles Exp $";
-+	"$Id: yaffs_checkptrw.c,v 1.18 2009-03-06 17:20:49 wookey Exp $";
- 
- 
- #include "yaffs_checkptrw.h"
--
-+#include "yaffs_getblockinfo.h"
- 
- static int yaffs_CheckpointSpaceOk(yaffs_Device *dev)
- {
--
- 	int blocksAvailable = dev->nErasedBlocks - dev->nReservedBlocks;
- 
- 	T(YAFFS_TRACE_CHECKPOINT,
- 		(TSTR("checkpt blocks available = %d" TENDSTR),
- 		blocksAvailable));
- 
--
- 	return (blocksAvailable <= 0) ? 0 : 1;
- }
- 
- 
- static int yaffs_CheckpointErase(yaffs_Device *dev)
- {
--
- 	int i;
- 
--
--	if(!dev->eraseBlockInNAND)
-+	if (!dev->eraseBlockInNAND)
- 		return 0;
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checking blocks %d to %d"TENDSTR),
--		dev->internalStartBlock,dev->internalEndBlock));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checking blocks %d to %d"TENDSTR),
-+		dev->internalStartBlock, dev->internalEndBlock));
- 
--	for(i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
--		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
--		if(bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT){
--			T(YAFFS_TRACE_CHECKPOINT,(TSTR("erasing checkpt block %d"TENDSTR),i));
--			if(dev->eraseBlockInNAND(dev,i- dev->blockOffset /* realign */)){
-+	for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
-+		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
-+		if (bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT) {
-+			T(YAFFS_TRACE_CHECKPOINT, (TSTR("erasing checkpt block %d"TENDSTR), i));
-+			if (dev->eraseBlockInNAND(dev, i - dev->blockOffset /* realign */)) {
- 				bi->blockState = YAFFS_BLOCK_STATE_EMPTY;
- 				dev->nErasedBlocks++;
- 				dev->nFreeChunks += dev->nChunksPerBlock;
--			}
--			else {
--				dev->markNANDBlockBad(dev,i);
-+			} else {
-+				dev->markNANDBlockBad(dev, i);
- 				bi->blockState = YAFFS_BLOCK_STATE_DEAD;
- 			}
- 		}
-@@ -71,23 +66,23 @@ static void yaffs_CheckpointFindNextEras
- 	int blocksAvailable = dev->nErasedBlocks - dev->nReservedBlocks;
- 	T(YAFFS_TRACE_CHECKPOINT,
- 		(TSTR("allocating checkpt block: erased %d reserved %d avail %d next %d "TENDSTR),
--		dev->nErasedBlocks,dev->nReservedBlocks,blocksAvailable,dev->checkpointNextBlock));
-+		dev->nErasedBlocks, dev->nReservedBlocks, blocksAvailable, dev->checkpointNextBlock));
- 
--	if(dev->checkpointNextBlock >= 0 &&
--	   dev->checkpointNextBlock <= dev->internalEndBlock &&
--	   blocksAvailable > 0){
--
--		for(i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++){
--			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
--			if(bi->blockState == YAFFS_BLOCK_STATE_EMPTY){
-+	if (dev->checkpointNextBlock >= 0 &&
-+			dev->checkpointNextBlock <= dev->internalEndBlock &&
-+			blocksAvailable > 0) {
-+
-+		for (i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++) {
-+			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
-+			if (bi->blockState == YAFFS_BLOCK_STATE_EMPTY) {
- 				dev->checkpointNextBlock = i + 1;
- 				dev->checkpointCurrentBlock = i;
--				T(YAFFS_TRACE_CHECKPOINT,(TSTR("allocating checkpt block %d"TENDSTR),i));
-+				T(YAFFS_TRACE_CHECKPOINT, (TSTR("allocating checkpt block %d"TENDSTR), i));
- 				return;
- 			}
- 		}
- 	}
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("out of checkpt blocks"TENDSTR)));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("out of checkpt blocks"TENDSTR)));
- 
- 	dev->checkpointNextBlock = -1;
- 	dev->checkpointCurrentBlock = -1;
-@@ -98,30 +93,31 @@ static void yaffs_CheckpointFindNextChec
- 	int  i;
- 	yaffs_ExtendedTags tags;
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("find next checkpt block: start:  blocks %d next %d" TENDSTR),
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("find next checkpt block: start:  blocks %d next %d" TENDSTR),
- 		dev->blocksInCheckpoint, dev->checkpointNextBlock));
- 
--	if(dev->blocksInCheckpoint < dev->checkpointMaxBlocks)
--		for(i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++){
-+	if (dev->blocksInCheckpoint < dev->checkpointMaxBlocks)
-+		for (i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++) {
- 			int chunk = i * dev->nChunksPerBlock;
- 			int realignedChunk = chunk - dev->chunkOffset;
- 
--			dev->readChunkWithTagsFromNAND(dev,realignedChunk,NULL,&tags);
--			T(YAFFS_TRACE_CHECKPOINT,(TSTR("find next checkpt block: search: block %d oid %d seq %d eccr %d" TENDSTR),
--				i, tags.objectId,tags.sequenceNumber,tags.eccResult));
-+			dev->readChunkWithTagsFromNAND(dev, realignedChunk,
-+					NULL, &tags);
-+			T(YAFFS_TRACE_CHECKPOINT, (TSTR("find next checkpt block: search: block %d oid %d seq %d eccr %d" TENDSTR),
-+				i, tags.objectId, tags.sequenceNumber, tags.eccResult));
- 
--			if(tags.sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA){
-+			if (tags.sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA) {
- 				/* Right kind of block */
- 				dev->checkpointNextBlock = tags.objectId;
- 				dev->checkpointCurrentBlock = i;
- 				dev->checkpointBlockList[dev->blocksInCheckpoint] = i;
- 				dev->blocksInCheckpoint++;
--				T(YAFFS_TRACE_CHECKPOINT,(TSTR("found checkpt block %d"TENDSTR),i));
-+				T(YAFFS_TRACE_CHECKPOINT, (TSTR("found checkpt block %d"TENDSTR), i));
- 				return;
- 			}
- 		}
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("found no more checkpt blocks"TENDSTR)));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("found no more checkpt blocks"TENDSTR)));
- 
- 	dev->checkpointNextBlock = -1;
- 	dev->checkpointCurrentBlock = -1;
-@@ -133,17 +129,17 @@ int yaffs_CheckpointOpen(yaffs_Device *d
- 
- 	/* Got the functions we need? */
- 	if (!dev->writeChunkWithTagsToNAND ||
--	    !dev->readChunkWithTagsFromNAND ||
--	    !dev->eraseBlockInNAND ||
--	    !dev->markNANDBlockBad)
-+			!dev->readChunkWithTagsFromNAND ||
-+			!dev->eraseBlockInNAND ||
-+			!dev->markNANDBlockBad)
- 		return 0;
- 
--	if(forWriting && !yaffs_CheckpointSpaceOk(dev))
-+	if (forWriting && !yaffs_CheckpointSpaceOk(dev))
- 		return 0;
- 
--	if(!dev->checkpointBuffer)
--		dev->checkpointBuffer = YMALLOC_DMA(dev->nDataBytesPerChunk);
--	if(!dev->checkpointBuffer)
-+	if (!dev->checkpointBuffer)
-+		dev->checkpointBuffer = YMALLOC_DMA(dev->totalBytesPerChunk);
-+	if (!dev->checkpointBuffer)
- 		return 0;
- 
- 
-@@ -159,12 +155,10 @@ int yaffs_CheckpointOpen(yaffs_Device *d
- 	dev->checkpointNextBlock = dev->internalStartBlock;
- 
- 	/* Erase all the blocks in the checkpoint area */
--	if(forWriting){
--		memset(dev->checkpointBuffer,0,dev->nDataBytesPerChunk);
-+	if (forWriting) {
-+		memset(dev->checkpointBuffer, 0, dev->nDataBytesPerChunk);
- 		dev->checkpointByteOffset = 0;
- 		return yaffs_CheckpointErase(dev);
--
--
- 	} else {
- 		int i;
- 		/* Set to a value that will kick off a read */
-@@ -174,7 +168,7 @@ int yaffs_CheckpointOpen(yaffs_Device *d
- 		dev->blocksInCheckpoint = 0;
- 		dev->checkpointMaxBlocks = (dev->internalEndBlock - dev->internalStartBlock)/16 + 2;
- 		dev->checkpointBlockList = YMALLOC(sizeof(int) * dev->checkpointMaxBlocks);
--		for(i = 0; i < dev->checkpointMaxBlocks; i++)
-+		for (i = 0; i < dev->checkpointMaxBlocks; i++)
- 			dev->checkpointBlockList[i] = -1;
- 	}
- 
-@@ -191,18 +185,17 @@ int yaffs_GetCheckpointSum(yaffs_Device 
- 
- static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev)
- {
--
- 	int chunk;
- 	int realignedChunk;
- 
- 	yaffs_ExtendedTags tags;
- 
--	if(dev->checkpointCurrentBlock < 0){
-+	if (dev->checkpointCurrentBlock < 0) {
- 		yaffs_CheckpointFindNextErasedBlock(dev);
- 		dev->checkpointCurrentChunk = 0;
- 	}
- 
--	if(dev->checkpointCurrentBlock < 0)
-+	if (dev->checkpointCurrentBlock < 0)
- 		return 0;
- 
- 	tags.chunkDeleted = 0;
-@@ -210,10 +203,10 @@ static int yaffs_CheckpointFlushBuffer(y
- 	tags.chunkId = dev->checkpointPageSequence + 1;
- 	tags.sequenceNumber =  YAFFS_SEQUENCE_CHECKPOINT_DATA;
- 	tags.byteCount = dev->nDataBytesPerChunk;
--	if(dev->checkpointCurrentChunk == 0){
-+	if (dev->checkpointCurrentChunk == 0) {
- 		/* First chunk we write for the block? Set block state to
- 		   checkpoint */
--		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,dev->checkpointCurrentBlock);
-+		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, dev->checkpointCurrentBlock);
- 		bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT;
- 		dev->blocksInCheckpoint++;
- 	}
-@@ -221,28 +214,29 @@ static int yaffs_CheckpointFlushBuffer(y
- 	chunk = dev->checkpointCurrentBlock * dev->nChunksPerBlock + dev->checkpointCurrentChunk;
- 
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint wite buffer nand %d(%d:%d) objid %d chId %d" TENDSTR),
--		chunk, dev->checkpointCurrentBlock, dev->checkpointCurrentChunk,tags.objectId,tags.chunkId));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint wite buffer nand %d(%d:%d) objid %d chId %d" TENDSTR),
-+		chunk, dev->checkpointCurrentBlock, dev->checkpointCurrentChunk, tags.objectId, tags.chunkId));
- 
- 	realignedChunk = chunk - dev->chunkOffset;
- 
--	dev->writeChunkWithTagsToNAND(dev,realignedChunk,dev->checkpointBuffer,&tags);
-+	dev->writeChunkWithTagsToNAND(dev, realignedChunk,
-+			dev->checkpointBuffer, &tags);
- 	dev->checkpointByteOffset = 0;
- 	dev->checkpointPageSequence++;
- 	dev->checkpointCurrentChunk++;
--	if(dev->checkpointCurrentChunk >= dev->nChunksPerBlock){
-+	if (dev->checkpointCurrentChunk >= dev->nChunksPerBlock) {
- 		dev->checkpointCurrentChunk = 0;
- 		dev->checkpointCurrentBlock = -1;
- 	}
--	memset(dev->checkpointBuffer,0,dev->nDataBytesPerChunk);
-+	memset(dev->checkpointBuffer, 0, dev->nDataBytesPerChunk);
- 
- 	return 1;
- }
- 
- 
--int yaffs_CheckpointWrite(yaffs_Device *dev,const void *data, int nBytes)
-+int yaffs_CheckpointWrite(yaffs_Device *dev, const void *data, int nBytes)
- {
--	int i=0;
-+	int i = 0;
- 	int ok = 1;
- 
- 
-@@ -250,17 +244,14 @@ int yaffs_CheckpointWrite(yaffs_Device *
- 
- 
- 
--	if(!dev->checkpointBuffer)
-+	if (!dev->checkpointBuffer)
- 		return 0;
- 
--	if(!dev->checkpointOpenForWrite)
-+	if (!dev->checkpointOpenForWrite)
- 		return -1;
- 
--	while(i < nBytes && ok) {
--
--
--
--		dev->checkpointBuffer[dev->checkpointByteOffset] = *dataBytes ;
-+	while (i < nBytes && ok) {
-+		dev->checkpointBuffer[dev->checkpointByteOffset] = *dataBytes;
- 		dev->checkpointSum += *dataBytes;
- 		dev->checkpointXor ^= *dataBytes;
- 
-@@ -270,18 +261,17 @@ int yaffs_CheckpointWrite(yaffs_Device *
- 		dev->checkpointByteCount++;
- 
- 
--		if(dev->checkpointByteOffset < 0 ||
-+		if (dev->checkpointByteOffset < 0 ||
- 		   dev->checkpointByteOffset >= dev->nDataBytesPerChunk)
- 			ok = yaffs_CheckpointFlushBuffer(dev);
--
- 	}
- 
--	return 	i;
-+	return i;
- }
- 
- int yaffs_CheckpointRead(yaffs_Device *dev, void *data, int nBytes)
- {
--	int i=0;
-+	int i = 0;
- 	int ok = 1;
- 	yaffs_ExtendedTags tags;
- 
-@@ -291,52 +281,54 @@ int yaffs_CheckpointRead(yaffs_Device *d
- 
- 	__u8 *dataBytes = (__u8 *)data;
- 
--	if(!dev->checkpointBuffer)
-+	if (!dev->checkpointBuffer)
- 		return 0;
- 
--	if(dev->checkpointOpenForWrite)
-+	if (dev->checkpointOpenForWrite)
- 		return -1;
- 
--	while(i < nBytes && ok) {
-+	while (i < nBytes && ok) {
- 
- 
--		if(dev->checkpointByteOffset < 0 ||
--		   dev->checkpointByteOffset >= dev->nDataBytesPerChunk) {
-+		if (dev->checkpointByteOffset < 0 ||
-+			dev->checkpointByteOffset >= dev->nDataBytesPerChunk) {
- 
--		   	if(dev->checkpointCurrentBlock < 0){
-+			if (dev->checkpointCurrentBlock < 0) {
- 				yaffs_CheckpointFindNextCheckpointBlock(dev);
- 				dev->checkpointCurrentChunk = 0;
- 			}
- 
--			if(dev->checkpointCurrentBlock < 0)
-+			if (dev->checkpointCurrentBlock < 0)
- 				ok = 0;
- 			else {
--
--				chunk = dev->checkpointCurrentBlock * dev->nChunksPerBlock +
--				          dev->checkpointCurrentChunk;
-+				chunk = dev->checkpointCurrentBlock *
-+					dev->nChunksPerBlock +
-+					dev->checkpointCurrentChunk;
- 
- 				realignedChunk = chunk - dev->chunkOffset;
- 
--	   			/* read in the next chunk */
--	   			/* printf("read checkpoint page %d\n",dev->checkpointPage); */
--				dev->readChunkWithTagsFromNAND(dev, realignedChunk,
--							       dev->checkpointBuffer,
--							      &tags);
--
--				if(tags.chunkId != (dev->checkpointPageSequence + 1) ||
--				   tags.sequenceNumber != YAFFS_SEQUENCE_CHECKPOINT_DATA)
--				   ok = 0;
-+				/* read in the next chunk */
-+				/* printf("read checkpoint page %d\n",dev->checkpointPage); */
-+				dev->readChunkWithTagsFromNAND(dev,
-+						realignedChunk,
-+						dev->checkpointBuffer,
-+						&tags);
-+
-+				if (tags.chunkId != (dev->checkpointPageSequence + 1) ||
-+					tags.eccResult > YAFFS_ECC_RESULT_FIXED ||
-+					tags.sequenceNumber != YAFFS_SEQUENCE_CHECKPOINT_DATA)
-+					ok = 0;
- 
- 				dev->checkpointByteOffset = 0;
- 				dev->checkpointPageSequence++;
- 				dev->checkpointCurrentChunk++;
- 
--				if(dev->checkpointCurrentChunk >= dev->nChunksPerBlock)
-+				if (dev->checkpointCurrentChunk >= dev->nChunksPerBlock)
- 					dev->checkpointCurrentBlock = -1;
- 			}
- 		}
- 
--		if(ok){
-+		if (ok) {
- 			*dataBytes = dev->checkpointBuffer[dev->checkpointByteOffset];
- 			dev->checkpointSum += *dataBytes;
- 			dev->checkpointXor ^= *dataBytes;
-@@ -353,17 +345,17 @@ int yaffs_CheckpointRead(yaffs_Device *d
- int yaffs_CheckpointClose(yaffs_Device *dev)
- {
- 
--	if(dev->checkpointOpenForWrite){
--		if(dev->checkpointByteOffset != 0)
-+	if (dev->checkpointOpenForWrite) {
-+		if (dev->checkpointByteOffset != 0)
- 			yaffs_CheckpointFlushBuffer(dev);
- 	} else {
- 		int i;
--		for(i = 0; i < dev->blocksInCheckpoint && dev->checkpointBlockList[i] >= 0; i++){
--			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,dev->checkpointBlockList[i]);
--			if(bi->blockState == YAFFS_BLOCK_STATE_EMPTY)
-+		for (i = 0; i < dev->blocksInCheckpoint && dev->checkpointBlockList[i] >= 0; i++) {
-+			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, dev->checkpointBlockList[i]);
-+			if (bi->blockState == YAFFS_BLOCK_STATE_EMPTY)
- 				bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT;
- 			else {
--				// Todo this looks odd...
-+				/* Todo this looks odd... */
- 			}
- 		}
- 		YFREE(dev->checkpointBlockList);
-@@ -374,27 +366,25 @@ int yaffs_CheckpointClose(yaffs_Device *
- 	dev->nErasedBlocks -= dev->blocksInCheckpoint;
- 
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint byte count %d" TENDSTR),
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint byte count %d" TENDSTR),
- 			dev->checkpointByteCount));
- 
--	if(dev->checkpointBuffer){
-+	if (dev->checkpointBuffer) {
- 		/* free the buffer */
- 		YFREE(dev->checkpointBuffer);
- 		dev->checkpointBuffer = NULL;
- 		return 1;
--	}
--	else
-+	} else
- 		return 0;
--
- }
- 
- int yaffs_CheckpointInvalidateStream(yaffs_Device *dev)
- {
- 	/* Erase the first checksum block */
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint invalidate"TENDSTR)));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint invalidate"TENDSTR)));
- 
--	if(!yaffs_CheckpointSpaceOk(dev))
-+	if (!yaffs_CheckpointSpaceOk(dev))
- 		return 0;
- 
- 	return yaffs_CheckpointErase(dev);
---- a/fs/yaffs2/yaffs_checkptrw.h
-+++ b/fs/yaffs2/yaffs_checkptrw.h
-@@ -20,9 +20,9 @@
- 
- int yaffs_CheckpointOpen(yaffs_Device *dev, int forWriting);
- 
--int yaffs_CheckpointWrite(yaffs_Device *dev,const void *data, int nBytes);
-+int yaffs_CheckpointWrite(yaffs_Device *dev, const void *data, int nBytes);
- 
--int yaffs_CheckpointRead(yaffs_Device *dev,void *data, int nBytes);
-+int yaffs_CheckpointRead(yaffs_Device *dev, void *data, int nBytes);
- 
- int yaffs_GetCheckpointSum(yaffs_Device *dev, __u32 *sum);
- 
---- a/fs/yaffs2/yaffs_ecc.c
-+++ b/fs/yaffs2/yaffs_ecc.c
-@@ -29,7 +29,7 @@
-  */
- 
- const char *yaffs_ecc_c_version =
--    "$Id: yaffs_ecc.c,v 1.9 2007-02-14 01:09:06 wookey Exp $";
-+	"$Id: yaffs_ecc.c,v 1.11 2009-03-06 17:20:50 wookey Exp $";
- 
- #include "yportenv.h"
- 
-@@ -109,12 +109,10 @@ void yaffs_ECCCalculate(const unsigned c
- 		b = column_parity_table[*data++];
- 		col_parity ^= b;
- 
--		if (b & 0x01)	// odd number of bits in the byte
--		{
-+		if (b & 0x01) {		/* odd number of bits in the byte */
- 			line_parity ^= i;
- 			line_parity_prime ^= ~i;
- 		}
--
- 	}
- 
- 	ecc[2] = (~col_parity) | 0x03;
-@@ -158,7 +156,7 @@ void yaffs_ECCCalculate(const unsigned c
- 	ecc[0] = ~t;
- 
- #ifdef CONFIG_YAFFS_ECC_WRONG_ORDER
--	// Swap the bytes into the wrong order
-+	/* Swap the bytes into the wrong order */
- 	t = ecc[0];
- 	ecc[0] = ecc[1];
- 	ecc[1] = t;
-@@ -189,7 +187,7 @@ int yaffs_ECCCorrect(unsigned char *data
- 		unsigned bit;
- 
- #ifdef CONFIG_YAFFS_ECC_WRONG_ORDER
--		// swap the bytes to correct for the wrong order
-+		/* swap the bytes to correct for the wrong order */
- 		unsigned char t;
- 
- 		t = d0;
-@@ -251,7 +249,7 @@ int yaffs_ECCCorrect(unsigned char *data
-  * ECCxxxOther does ECC calcs on arbitrary n bytes of data
-  */
- void yaffs_ECCCalculateOther(const unsigned char *data, unsigned nBytes,
--			     yaffs_ECCOther * eccOther)
-+				yaffs_ECCOther *eccOther)
- {
- 	unsigned int i;
- 
-@@ -278,8 +276,8 @@ void yaffs_ECCCalculateOther(const unsig
- }
- 
- int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes,
--			  yaffs_ECCOther * read_ecc,
--			  const yaffs_ECCOther * test_ecc)
-+			yaffs_ECCOther *read_ecc,
-+			const yaffs_ECCOther *test_ecc)
- {
- 	unsigned char cDelta;	/* column parity delta */
- 	unsigned lDelta;	/* line parity delta */
-@@ -294,8 +292,7 @@ int yaffs_ECCCorrectOther(unsigned char 
- 		return 0; /* no error */
- 
- 	if (lDelta == ~lDeltaPrime &&
--	    (((cDelta ^ (cDelta >> 1)) & 0x15) == 0x15))
--	{
-+	    (((cDelta ^ (cDelta >> 1)) & 0x15) == 0x15)) {
- 		/* Single bit (recoverable) error in data */
- 
- 		bit = 0;
-@@ -307,7 +304,7 @@ int yaffs_ECCCorrectOther(unsigned char 
- 		if (cDelta & 0x02)
- 			bit |= 0x01;
- 
--		if(lDelta >= nBytes)
-+		if (lDelta >= nBytes)
- 			return -1;
- 
- 		data[lDelta] ^= (1 << bit);
-@@ -316,7 +313,7 @@ int yaffs_ECCCorrectOther(unsigned char 
- 	}
- 
- 	if ((yaffs_CountBits32(lDelta) + yaffs_CountBits32(lDeltaPrime) +
--	     yaffs_CountBits(cDelta)) == 1) {
-+			yaffs_CountBits(cDelta)) == 1) {
- 		/* Reccoverable error in ecc */
- 
- 		*read_ecc = *test_ecc;
-@@ -326,6 +323,4 @@ int yaffs_ECCCorrectOther(unsigned char 
- 	/* Unrecoverable error */
- 
- 	return -1;
--
- }
--
---- a/fs/yaffs2/yaffs_ecc.h
-+++ b/fs/yaffs2/yaffs_ecc.h
-@@ -13,15 +13,15 @@
-  * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
-  */
- 
-- /*
--  * This code implements the ECC algorithm used in SmartMedia.
--  *
--  * The ECC comprises 22 bits of parity information and is stuffed into 3 bytes.
--  * The two unused bit are set to 1.
--  * The ECC can correct single bit errors in a 256-byte page of data. Thus, two such ECC
--  * blocks are used on a 512-byte NAND page.
--  *
--  */
-+/*
-+ * This code implements the ECC algorithm used in SmartMedia.
-+ *
-+ * The ECC comprises 22 bits of parity information and is stuffed into 3 bytes.
-+ * The two unused bit are set to 1.
-+ * The ECC can correct single bit errors in a 256-byte page of data. Thus, two such ECC
-+ * blocks are used on a 512-byte NAND page.
-+ *
-+ */
- 
- #ifndef __YAFFS_ECC_H__
- #define __YAFFS_ECC_H__
-@@ -34,11 +34,11 @@ typedef struct {
- 
- void yaffs_ECCCalculate(const unsigned char *data, unsigned char *ecc);
- int yaffs_ECCCorrect(unsigned char *data, unsigned char *read_ecc,
--		     const unsigned char *test_ecc);
-+		const unsigned char *test_ecc);
- 
- void yaffs_ECCCalculateOther(const unsigned char *data, unsigned nBytes,
--			     yaffs_ECCOther * ecc);
-+			yaffs_ECCOther *ecc);
- int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes,
--			  yaffs_ECCOther * read_ecc,
--			  const yaffs_ECCOther * test_ecc);
-+			yaffs_ECCOther *read_ecc,
-+			const yaffs_ECCOther *test_ecc);
- #endif
---- a/fs/yaffs2/yaffs_fs.c
-+++ b/fs/yaffs2/yaffs_fs.c
-@@ -1,7 +1,7 @@
- /*
-  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
-  *
-- * Copyright (C) 2002-2007 Aleph One Ltd.
-+ * Copyright (C) 2002-2009 Aleph One Ltd.
-  *   for Toby Churchill Ltd and Brightstar Engineering
-  *
-  * Created by Charles Manning <charles@aleph1.co.uk>
-@@ -32,18 +32,17 @@
-  */
- 
- const char *yaffs_fs_c_version =
--    "$Id: yaffs_fs.c,v 1.63 2007-09-19 20:35:40 imcd Exp $";
-+    "$Id: yaffs_fs.c,v 1.79 2009-03-17 01:12:00 wookey Exp $";
- extern const char *yaffs_guts_c_version;
- 
- #include <linux/version.h>
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
- #include <linux/config.h>
- #endif
- #include <linux/kernel.h>
- #include <linux/module.h>
- #include <linux/slab.h>
- #include <linux/init.h>
--#include <linux/list.h>
- #include <linux/fs.h>
- #include <linux/proc_fs.h>
- #include <linux/smp_lock.h>
-@@ -53,10 +52,12 @@ extern const char *yaffs_guts_c_version;
- #include <linux/string.h>
- #include <linux/ctype.h>
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#include "asm/div64.h"
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 
- #include <linux/statfs.h>	/* Added NCB 15-8-2003 */
--#include <asm/statfs.h>
-+#include <linux/statfs.h>
- #define UnlockPage(p) unlock_page(p)
- #define Page_Uptodate(page)	test_bit(PG_uptodate, &(page)->flags)
- 
-@@ -69,22 +70,45 @@ extern const char *yaffs_guts_c_version;
- #define	BDEVNAME_SIZE		0
- #define	yaffs_devname(sb, buf)	kdevname(sb->s_dev)
- 
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0))
- /* added NCB 26/5/2006 for 2.4.25-vrs2-tcl1 kernel */
- #define __user
- #endif
- 
- #endif
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26))
-+#define YPROC_ROOT  (&proc_root)
-+#else
-+#define YPROC_ROOT  NULL
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- #define WRITE_SIZE_STR "writesize"
--#define WRITE_SIZE(mtd) (mtd)->writesize
-+#define WRITE_SIZE(mtd) ((mtd)->writesize)
- #else
- #define WRITE_SIZE_STR "oobblock"
--#define WRITE_SIZE(mtd) (mtd)->oobblock
-+#define WRITE_SIZE(mtd) ((mtd)->oobblock)
- #endif
- 
--#include <asm/uaccess.h>
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 27))
-+#define YAFFS_USE_WRITE_BEGIN_END 1
-+#else
-+#define YAFFS_USE_WRITE_BEGIN_END 0
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 28))
-+static uint32_t YCALCBLOCKS(uint64_t partition_size, uint32_t block_size)
-+{
-+	uint64_t result = partition_size;
-+	do_div(result, block_size);
-+	return (uint32_t)result;
-+}
-+#else
-+#define YCALCBLOCKS(s, b) ((s)/(b))
-+#endif
-+
-+#include <linux/uaccess.h>
- 
- #include "yportenv.h"
- #include "yaffs_guts.h"
-@@ -96,28 +120,44 @@ extern const char *yaffs_guts_c_version;
- 
- unsigned int yaffs_traceMask = YAFFS_TRACE_BAD_BLOCKS;
- unsigned int yaffs_wr_attempts = YAFFS_WR_ATTEMPTS;
-+unsigned int yaffs_auto_checkpoint = 1;
- 
- /* Module Parameters */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
--module_param(yaffs_traceMask,uint,0644);
--module_param(yaffs_wr_attempts,uint,0644);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+module_param(yaffs_traceMask, uint, 0644);
-+module_param(yaffs_wr_attempts, uint, 0644);
-+module_param(yaffs_auto_checkpoint, uint, 0644);
-+#else
-+MODULE_PARM(yaffs_traceMask, "i");
-+MODULE_PARM(yaffs_wr_attempts, "i");
-+MODULE_PARM(yaffs_auto_checkpoint, "i");
-+#endif
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25))
-+/* use iget and read_inode */
-+#define Y_IGET(sb, inum) iget((sb), (inum))
-+static void yaffs_read_inode(struct inode *inode);
-+
- #else
--MODULE_PARM(yaffs_traceMask,"i");
--MODULE_PARM(yaffs_wr_attempts,"i");
-+/* Call local equivalent */
-+#define YAFFS_USE_OWN_IGET
-+#define Y_IGET(sb, inum) yaffs_iget((sb), (inum))
-+
-+static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino);
- #endif
- 
- /*#define T(x) printk x */
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18))
--#define yaffs_InodeToObjectLV(iptr) (iptr)->i_private
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18))
-+#define yaffs_InodeToObjectLV(iptr) ((iptr)->i_private)
- #else
--#define yaffs_InodeToObjectLV(iptr) (iptr)->u.generic_ip
-+#define yaffs_InodeToObjectLV(iptr) ((iptr)->u.generic_ip)
- #endif
- 
- #define yaffs_InodeToObject(iptr) ((yaffs_Object *)(yaffs_InodeToObjectLV(iptr)))
- #define yaffs_DentryToObject(dptr) yaffs_InodeToObject((dptr)->d_inode)
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- #define yaffs_SuperToDevice(sb)	((yaffs_Device *)sb->s_fs_info)
- #else
- #define yaffs_SuperToDevice(sb)	((yaffs_Device *)sb->u.generic_sbp)
-@@ -126,47 +166,49 @@ MODULE_PARM(yaffs_wr_attempts,"i");
- static void yaffs_put_super(struct super_block *sb);
- 
- static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
--				loff_t * pos);
-+				loff_t *pos);
-+static ssize_t yaffs_hold_space(struct file *f);
-+static void yaffs_release_space(struct file *f);
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_file_flush(struct file *file, fl_owner_t id);
- #else
- static int yaffs_file_flush(struct file *file);
- #endif
- 
- static int yaffs_sync_object(struct file *file, struct dentry *dentry,
--			     int datasync);
-+				int datasync);
- 
- static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir);
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
- 			struct nameidata *n);
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
--				   struct nameidata *n);
-+					struct nameidata *n);
- #else
- static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode);
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry);
- #endif
- static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
--		      struct dentry *dentry);
-+			struct dentry *dentry);
- static int yaffs_unlink(struct inode *dir, struct dentry *dentry);
- static int yaffs_symlink(struct inode *dir, struct dentry *dentry,
--			 const char *symname);
-+			const char *symname);
- static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode);
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
--		       dev_t dev);
-+			dev_t dev);
- #else
- static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
--		       int dev);
-+			int dev);
- #endif
- static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry,
- 			struct inode *new_dir, struct dentry *new_dentry);
- static int yaffs_setattr(struct dentry *dentry, struct iattr *attr);
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_sync_fs(struct super_block *sb, int wait);
- static void yaffs_write_super(struct super_block *sb);
- #else
-@@ -174,33 +216,47 @@ static int yaffs_sync_fs(struct super_bl
- static int yaffs_write_super(struct super_block *sb);
- #endif
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf);
--#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf);
- #else
- static int yaffs_statfs(struct super_block *sb, struct statfs *buf);
- #endif
--static void yaffs_read_inode(struct inode *inode);
- 
-+#ifdef YAFFS_HAS_PUT_INODE
- static void yaffs_put_inode(struct inode *inode);
-+#endif
-+
- static void yaffs_delete_inode(struct inode *);
- static void yaffs_clear_inode(struct inode *);
- 
- static int yaffs_readpage(struct file *file, struct page *page);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_writepage(struct page *page, struct writeback_control *wbc);
- #else
- static int yaffs_writepage(struct page *page);
- #endif
-+
-+
-+#if (YAFFS_USE_WRITE_BEGIN_END != 0)
-+static int yaffs_write_begin(struct file *filp, struct address_space *mapping,
-+				loff_t pos, unsigned len, unsigned flags,
-+				struct page **pagep, void **fsdata);
-+static int yaffs_write_end(struct file *filp, struct address_space *mapping,
-+				loff_t pos, unsigned len, unsigned copied,
-+				struct page *pg, void *fsdadata);
-+#else
- static int yaffs_prepare_write(struct file *f, struct page *pg,
--			       unsigned offset, unsigned to);
-+				unsigned offset, unsigned to);
- static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
--			      unsigned to);
-+				unsigned to);
- 
--static int yaffs_readlink(struct dentry *dentry, char __user * buffer,
--			  int buflen);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
-+#endif
-+
-+static int yaffs_readlink(struct dentry *dentry, char __user *buffer,
-+				int buflen);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
- static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
- #else
- static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
-@@ -209,12 +265,17 @@ static int yaffs_follow_link(struct dent
- static struct address_space_operations yaffs_file_address_operations = {
- 	.readpage = yaffs_readpage,
- 	.writepage = yaffs_writepage,
-+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-+	.write_begin = yaffs_write_begin,
-+	.write_end = yaffs_write_end,
-+#else
- 	.prepare_write = yaffs_prepare_write,
- 	.commit_write = yaffs_commit_write,
-+#endif
- };
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,22))
--static struct file_operations yaffs_file_operations = {
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 22))
-+static const struct file_operations yaffs_file_operations = {
- 	.read = do_sync_read,
- 	.write = do_sync_write,
- 	.aio_read = generic_file_aio_read,
-@@ -224,11 +285,12 @@ static struct file_operations yaffs_file
- 	.fsync = yaffs_sync_object,
- 	.splice_read = generic_file_splice_read,
- 	.splice_write = generic_file_splice_write,
-+	.llseek = generic_file_llseek,
- };
- 
--#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18))
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18))
- 
--static struct file_operations yaffs_file_operations = {
-+static const struct file_operations yaffs_file_operations = {
- 	.read = do_sync_read,
- 	.write = do_sync_write,
- 	.aio_read = generic_file_aio_read,
-@@ -241,29 +303,29 @@ static struct file_operations yaffs_file
- 
- #else
- 
--static struct file_operations yaffs_file_operations = {
-+static const struct file_operations yaffs_file_operations = {
- 	.read = generic_file_read,
- 	.write = generic_file_write,
- 	.mmap = generic_file_mmap,
- 	.flush = yaffs_file_flush,
- 	.fsync = yaffs_sync_object,
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 	.sendfile = generic_file_sendfile,
- #endif
- };
- #endif
- 
--static struct inode_operations yaffs_file_inode_operations = {
-+static const struct inode_operations yaffs_file_inode_operations = {
- 	.setattr = yaffs_setattr,
- };
- 
--static struct inode_operations yaffs_symlink_inode_operations = {
-+static const struct inode_operations yaffs_symlink_inode_operations = {
- 	.readlink = yaffs_readlink,
- 	.follow_link = yaffs_follow_link,
- 	.setattr = yaffs_setattr,
- };
- 
--static struct inode_operations yaffs_dir_inode_operations = {
-+static const struct inode_operations yaffs_dir_inode_operations = {
- 	.create = yaffs_create,
- 	.lookup = yaffs_lookup,
- 	.link = yaffs_link,
-@@ -276,16 +338,21 @@ static struct inode_operations yaffs_dir
- 	.setattr = yaffs_setattr,
- };
- 
--static struct file_operations yaffs_dir_operations = {
-+static const struct file_operations yaffs_dir_operations = {
- 	.read = generic_read_dir,
- 	.readdir = yaffs_readdir,
- 	.fsync = yaffs_sync_object,
- };
- 
--static struct super_operations yaffs_super_ops = {
-+static const struct super_operations yaffs_super_ops = {
- 	.statfs = yaffs_statfs,
-+
-+#ifndef YAFFS_USE_OWN_IGET
- 	.read_inode = yaffs_read_inode,
-+#endif
-+#ifdef YAFFS_HAS_PUT_INODE
- 	.put_inode = yaffs_put_inode,
-+#endif
- 	.put_super = yaffs_put_super,
- 	.delete_inode = yaffs_delete_inode,
- 	.clear_inode = yaffs_clear_inode,
-@@ -293,22 +360,21 @@ static struct super_operations yaffs_sup
- 	.write_super = yaffs_write_super,
- };
- 
--static void yaffs_GrossLock(yaffs_Device * dev)
-+static void yaffs_GrossLock(yaffs_Device *dev)
- {
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs locking\n"));
--
-+	T(YAFFS_TRACE_OS, ("yaffs locking %p\n", current));
- 	down(&dev->grossLock);
-+	T(YAFFS_TRACE_OS, ("yaffs locked %p\n", current));
- }
- 
--static void yaffs_GrossUnlock(yaffs_Device * dev)
-+static void yaffs_GrossUnlock(yaffs_Device *dev)
- {
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs unlocking\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs unlocking %p\n", current));
- 	up(&dev->grossLock);
--
- }
- 
--static int yaffs_readlink(struct dentry *dentry, char __user * buffer,
--			  int buflen)
-+static int yaffs_readlink(struct dentry *dentry, char __user *buffer,
-+			int buflen)
- {
- 	unsigned char *alias;
- 	int ret;
-@@ -329,7 +395,7 @@ static int yaffs_readlink(struct dentry 
- 	return ret;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
- static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
- #else
- static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
-@@ -345,32 +411,31 @@ static int yaffs_follow_link(struct dent
- 
- 	yaffs_GrossUnlock(dev);
- 
--	if (!alias)
--        {
-+	if (!alias) {
- 		ret = -ENOMEM;
- 		goto out;
--        }
-+	}
- 
- 	ret = vfs_follow_link(nd, alias);
- 	kfree(alias);
- out:
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
--	return ERR_PTR (ret);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
-+	return ERR_PTR(ret);
- #else
- 	return ret;
- #endif
- }
- 
- struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,
--			      yaffs_Object * obj);
-+				yaffs_Object *obj);
- 
- /*
-  * Lookup is used to find objects in the fs
-  */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
--				   struct nameidata *n)
-+				struct nameidata *n)
- #else
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry)
- #endif
-@@ -383,12 +448,11 @@ static struct dentry *yaffs_lookup(struc
- 	yaffs_GrossLock(dev);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_lookup for %d:%s\n",
--	   yaffs_InodeToObject(dir)->objectId, dentry->d_name.name));
-+		("yaffs_lookup for %d:%s\n",
-+		yaffs_InodeToObject(dir)->objectId, dentry->d_name.name));
- 
--	obj =
--	    yaffs_FindObjectByName(yaffs_InodeToObject(dir),
--				   dentry->d_name.name);
-+	obj = yaffs_FindObjectByName(yaffs_InodeToObject(dir),
-+					dentry->d_name.name);
- 
- 	obj = yaffs_GetEquivalentObject(obj);	/* in case it was a hardlink */
- 
-@@ -397,13 +461,13 @@ static struct dentry *yaffs_lookup(struc
- 
- 	if (obj) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_lookup found %d\n", obj->objectId));
-+			("yaffs_lookup found %d\n", obj->objectId));
- 
- 		inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
- 
- 		if (inode) {
- 			T(YAFFS_TRACE_OS,
--			  (KERN_DEBUG "yaffs_loookup dentry \n"));
-+				("yaffs_loookup dentry \n"));
- /* #if 0 asserted by NCB for 2.5/6 compatability - falls through to
-  * d_add even if NULL inode */
- #if 0
-@@ -416,7 +480,7 @@ static struct dentry *yaffs_lookup(struc
- 		}
- 
- 	} else {
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_lookup not found\n"));
-+		T(YAFFS_TRACE_OS, ("yaffs_lookup not found\n"));
- 
- 	}
- 
-@@ -425,20 +489,22 @@ static struct dentry *yaffs_lookup(struc
- 	d_add(dentry, inode);
- 
- 	return NULL;
--	/*      return (ERR_PTR(-EIO)); */
--
- }
- 
-+
-+#ifdef YAFFS_HAS_PUT_INODE
-+
- /* For now put inode is just for debugging
-  * Put inode is called when the inode **structure** is put.
-  */
- static void yaffs_put_inode(struct inode *inode)
- {
- 	T(YAFFS_TRACE_OS,
--	  ("yaffs_put_inode: ino %d, count %d\n", (int)inode->i_ino,
--	   atomic_read(&inode->i_count)));
-+		("yaffs_put_inode: ino %d, count %d\n", (int)inode->i_ino,
-+		atomic_read(&inode->i_count)));
- 
- }
-+#endif
- 
- /* clear is called to tell the fs to release any per-inode data it holds */
- static void yaffs_clear_inode(struct inode *inode)
-@@ -449,9 +515,9 @@ static void yaffs_clear_inode(struct ino
- 	obj = yaffs_InodeToObject(inode);
- 
- 	T(YAFFS_TRACE_OS,
--	  ("yaffs_clear_inode: ino %d, count %d %s\n", (int)inode->i_ino,
--	   atomic_read(&inode->i_count),
--	   obj ? "object exists" : "null object"));
-+		("yaffs_clear_inode: ino %d, count %d %s\n", (int)inode->i_ino,
-+		atomic_read(&inode->i_count),
-+		obj ? "object exists" : "null object"));
- 
- 	if (obj) {
- 		dev = obj->myDev;
-@@ -486,23 +552,23 @@ static void yaffs_delete_inode(struct in
- 	yaffs_Device *dev;
- 
- 	T(YAFFS_TRACE_OS,
--	  ("yaffs_delete_inode: ino %d, count %d %s\n", (int)inode->i_ino,
--	   atomic_read(&inode->i_count),
--	   obj ? "object exists" : "null object"));
-+		("yaffs_delete_inode: ino %d, count %d %s\n", (int)inode->i_ino,
-+		atomic_read(&inode->i_count),
-+		obj ? "object exists" : "null object"));
- 
- 	if (obj) {
- 		dev = obj->myDev;
- 		yaffs_GrossLock(dev);
--		yaffs_DeleteFile(obj);
-+		yaffs_DeleteObject(obj);
- 		yaffs_GrossUnlock(dev);
- 	}
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
--        truncate_inode_pages (&inode->i_data, 0);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
-+	truncate_inode_pages(&inode->i_data, 0);
- #endif
- 	clear_inode(inode);
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_file_flush(struct file *file, fl_owner_t id)
- #else
- static int yaffs_file_flush(struct file *file)
-@@ -513,8 +579,8 @@ static int yaffs_file_flush(struct file 
- 	yaffs_Device *dev = obj->myDev;
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_file_flush object %d (%s)\n", obj->objectId,
--	   obj->dirty ? "dirty" : "clean"));
-+		("yaffs_file_flush object %d (%s)\n", obj->objectId,
-+		obj->dirty ? "dirty" : "clean"));
- 
- 	yaffs_GrossLock(dev);
- 
-@@ -535,15 +601,15 @@ static int yaffs_readpage_nolock(struct 
- 
- 	yaffs_Device *dev;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_readpage at %08x, size %08x\n",
--			   (unsigned)(pg->index << PAGE_CACHE_SHIFT),
--			   (unsigned)PAGE_CACHE_SIZE));
-+	T(YAFFS_TRACE_OS, ("yaffs_readpage at %08x, size %08x\n",
-+			(unsigned)(pg->index << PAGE_CACHE_SHIFT),
-+			(unsigned)PAGE_CACHE_SIZE));
- 
- 	obj = yaffs_DentryToObject(f->f_dentry);
- 
- 	dev = obj->myDev;
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 	BUG_ON(!PageLocked(pg));
- #else
- 	if (!PageLocked(pg))
-@@ -555,9 +621,9 @@ static int yaffs_readpage_nolock(struct 
- 
- 	yaffs_GrossLock(dev);
- 
--	ret =
--	    yaffs_ReadDataFromFile(obj, pg_buf, pg->index << PAGE_CACHE_SHIFT,
--				   PAGE_CACHE_SIZE);
-+	ret = yaffs_ReadDataFromFile(obj, pg_buf,
-+				pg->index << PAGE_CACHE_SHIFT,
-+				PAGE_CACHE_SIZE);
- 
- 	yaffs_GrossUnlock(dev);
- 
-@@ -575,7 +641,7 @@ static int yaffs_readpage_nolock(struct 
- 	flush_dcache_page(pg);
- 	kunmap(pg);
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_readpage done\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_readpage done\n"));
- 	return ret;
- }
- 
-@@ -593,7 +659,7 @@ static int yaffs_readpage(struct file *f
- 
- /* writepage inspired by/stolen from smbfs */
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_writepage(struct page *page, struct writeback_control *wbc)
- #else
- static int yaffs_writepage(struct page *page)
-@@ -616,12 +682,11 @@ static int yaffs_writepage(struct page *
- 
- 	if (offset > inode->i_size) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG
--		   "yaffs_writepage at %08x, inode size = %08x!!!\n",
--		   (unsigned)(page->index << PAGE_CACHE_SHIFT),
--		   (unsigned)inode->i_size));
-+			("yaffs_writepage at %08x, inode size = %08x!!!\n",
-+			(unsigned)(page->index << PAGE_CACHE_SHIFT),
-+			(unsigned)inode->i_size));
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "                -> don't care!!\n"));
-+			("                -> don't care!!\n"));
- 		unlock_page(page);
- 		return 0;
- 	}
-@@ -629,11 +694,10 @@ static int yaffs_writepage(struct page *
- 	end_index = inode->i_size >> PAGE_CACHE_SHIFT;
- 
- 	/* easy case */
--	if (page->index < end_index) {
-+	if (page->index < end_index)
- 		nBytes = PAGE_CACHE_SIZE;
--	} else {
-+	else
- 		nBytes = inode->i_size & (PAGE_CACHE_SIZE - 1);
--	}
- 
- 	get_page(page);
- 
-@@ -643,19 +707,18 @@ static int yaffs_writepage(struct page *
- 	yaffs_GrossLock(obj->myDev);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_writepage at %08x, size %08x\n",
--	   (unsigned)(page->index << PAGE_CACHE_SHIFT), nBytes));
-+		("yaffs_writepage at %08x, size %08x\n",
-+		(unsigned)(page->index << PAGE_CACHE_SHIFT), nBytes));
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "writepag0: obj = %05x, ino = %05x\n",
--	   (int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
-+		("writepag0: obj = %05x, ino = %05x\n",
-+		(int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
- 
--	nWritten =
--	    yaffs_WriteDataToFile(obj, buffer, page->index << PAGE_CACHE_SHIFT,
--				  nBytes, 0);
-+	nWritten = yaffs_WriteDataToFile(obj, buffer,
-+			page->index << PAGE_CACHE_SHIFT, nBytes, 0);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "writepag1: obj = %05x, ino = %05x\n",
--	   (int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
-+		("writepag1: obj = %05x, ino = %05x\n",
-+		(int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
- 
- 	yaffs_GrossUnlock(obj->myDev);
- 
-@@ -667,100 +730,207 @@ static int yaffs_writepage(struct page *
- 	return (nWritten == nBytes) ? 0 : -ENOSPC;
- }
- 
-+
-+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-+static int yaffs_write_begin(struct file *filp, struct address_space *mapping,
-+				loff_t pos, unsigned len, unsigned flags,
-+				struct page **pagep, void **fsdata)
-+{
-+	struct page *pg = NULL;
-+	pgoff_t index = pos >> PAGE_CACHE_SHIFT;
-+	uint32_t offset = pos & (PAGE_CACHE_SIZE - 1);
-+	uint32_t to = offset + len;
-+
-+	int ret = 0;
-+	int space_held = 0;
-+
-+	T(YAFFS_TRACE_OS, ("start yaffs_write_begin\n"));
-+	/* Get a page */
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 28)
-+	pg = grab_cache_page_write_begin(mapping, index, flags);
-+#else
-+	pg = __grab_cache_page(mapping, index);
-+#endif
-+
-+	*pagep = pg;
-+	if (!pg) {
-+		ret =  -ENOMEM;
-+		goto out;
-+	}
-+	/* Get fs space */
-+	space_held = yaffs_hold_space(filp);
-+
-+	if (!space_held) {
-+		ret = -ENOSPC;
-+		goto out;
-+	}
-+
-+	/* Update page if required */
-+
-+	if (!Page_Uptodate(pg) && (offset || to < PAGE_CACHE_SIZE))
-+		ret = yaffs_readpage_nolock(filp, pg);
-+
-+	if (ret)
-+		goto out;
-+
-+	/* Happy path return */
-+	T(YAFFS_TRACE_OS, ("end yaffs_write_begin - ok\n"));
-+
-+	return 0;
-+
-+out:
-+	T(YAFFS_TRACE_OS, ("end yaffs_write_begin fail returning %d\n", ret));
-+	if (space_held)
-+		yaffs_release_space(filp);
-+	if (pg) {
-+		unlock_page(pg);
-+		page_cache_release(pg);
-+	}
-+	return ret;
-+}
-+
-+#else
-+
- static int yaffs_prepare_write(struct file *f, struct page *pg,
--			       unsigned offset, unsigned to)
-+				unsigned offset, unsigned to)
- {
-+	T(YAFFS_TRACE_OS, ("yaffs_prepair_write\n"));
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_prepair_write\n"));
- 	if (!Page_Uptodate(pg) && (offset || to < PAGE_CACHE_SIZE))
- 		return yaffs_readpage_nolock(f, pg);
--
- 	return 0;
-+}
-+#endif
-+
-+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-+static int yaffs_write_end(struct file *filp, struct address_space *mapping,
-+				loff_t pos, unsigned len, unsigned copied,
-+				struct page *pg, void *fsdadata)
-+{
-+	int ret = 0;
-+	void *addr, *kva;
-+	uint32_t offset_into_page = pos & (PAGE_CACHE_SIZE - 1);
-+
-+	kva = kmap(pg);
-+	addr = kva + offset_into_page;
-+
-+	T(YAFFS_TRACE_OS,
-+		("yaffs_write_end addr %x pos %x nBytes %d\n",
-+		(unsigned) addr,
-+		(int)pos, copied));
-+
-+	ret = yaffs_file_write(filp, addr, copied, &pos);
-+
-+	if (ret != copied) {
-+		T(YAFFS_TRACE_OS,
-+			("yaffs_write_end not same size ret %d  copied %d\n",
-+			ret, copied));
-+		SetPageError(pg);
-+		ClearPageUptodate(pg);
-+	} else {
-+		SetPageUptodate(pg);
-+	}
-+
-+	kunmap(pg);
- 
-+	yaffs_release_space(filp);
-+	unlock_page(pg);
-+	page_cache_release(pg);
-+	return ret;
- }
-+#else
- 
- static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
--			      unsigned to)
-+				unsigned to)
- {
-+	void *addr, *kva;
- 
--	void *addr = page_address(pg) + offset;
- 	loff_t pos = (((loff_t) pg->index) << PAGE_CACHE_SHIFT) + offset;
- 	int nBytes = to - offset;
- 	int nWritten;
- 
- 	unsigned spos = pos;
--	unsigned saddr = (unsigned)addr;
-+	unsigned saddr;
-+
-+	kva = kmap(pg);
-+	addr = kva + offset;
-+
-+	saddr = (unsigned) addr;
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_commit_write addr %x pos %x nBytes %d\n", saddr,
--	   spos, nBytes));
-+		("yaffs_commit_write addr %x pos %x nBytes %d\n",
-+		saddr, spos, nBytes));
- 
- 	nWritten = yaffs_file_write(f, addr, nBytes, &pos);
- 
- 	if (nWritten != nBytes) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG
--		   "yaffs_commit_write not same size nWritten %d  nBytes %d\n",
--		   nWritten, nBytes));
-+			("yaffs_commit_write not same size nWritten %d  nBytes %d\n",
-+			nWritten, nBytes));
- 		SetPageError(pg);
- 		ClearPageUptodate(pg);
- 	} else {
- 		SetPageUptodate(pg);
- 	}
- 
-+	kunmap(pg);
-+
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_commit_write returning %d\n",
--	   nWritten == nBytes ? 0 : nWritten));
-+		("yaffs_commit_write returning %d\n",
-+		nWritten == nBytes ? 0 : nWritten));
- 
- 	return nWritten == nBytes ? 0 : nWritten;
--
- }
-+#endif
-+
- 
--static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object * obj)
-+static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object *obj)
- {
- 	if (inode && obj) {
- 
- 
- 		/* Check mode against the variant type and attempt to repair if broken. */
-- 		__u32 mode = obj->yst_mode;
-- 		switch( obj->variantType ){
-- 		case YAFFS_OBJECT_TYPE_FILE :
-- 		        if( ! S_ISREG(mode) ){
-- 			        obj->yst_mode &= ~S_IFMT;
-- 			        obj->yst_mode |= S_IFREG;
-- 			}
--
-- 			break;
-- 		case YAFFS_OBJECT_TYPE_SYMLINK :
-- 		        if( ! S_ISLNK(mode) ){
-- 			        obj->yst_mode &= ~S_IFMT;
-- 				obj->yst_mode |= S_IFLNK;
-- 			}
--
-- 			break;
-- 		case YAFFS_OBJECT_TYPE_DIRECTORY :
-- 		        if( ! S_ISDIR(mode) ){
-- 			        obj->yst_mode &= ~S_IFMT;
-- 			        obj->yst_mode |= S_IFDIR;
-- 			}
--
-- 			break;
-- 		case YAFFS_OBJECT_TYPE_UNKNOWN :
-- 		case YAFFS_OBJECT_TYPE_HARDLINK :
-- 		case YAFFS_OBJECT_TYPE_SPECIAL :
-- 		default:
-- 		        /* TODO? */
-- 		        break;
-- 		}
-+		__u32 mode = obj->yst_mode;
-+		switch (obj->variantType) {
-+		case YAFFS_OBJECT_TYPE_FILE:
-+			if (!S_ISREG(mode)) {
-+				obj->yst_mode &= ~S_IFMT;
-+				obj->yst_mode |= S_IFREG;
-+			}
-+
-+			break;
-+		case YAFFS_OBJECT_TYPE_SYMLINK:
-+			if (!S_ISLNK(mode)) {
-+				obj->yst_mode &= ~S_IFMT;
-+				obj->yst_mode |= S_IFLNK;
-+			}
-+
-+			break;
-+		case YAFFS_OBJECT_TYPE_DIRECTORY:
-+			if (!S_ISDIR(mode)) {
-+				obj->yst_mode &= ~S_IFMT;
-+				obj->yst_mode |= S_IFDIR;
-+			}
-+
-+			break;
-+		case YAFFS_OBJECT_TYPE_UNKNOWN:
-+		case YAFFS_OBJECT_TYPE_HARDLINK:
-+		case YAFFS_OBJECT_TYPE_SPECIAL:
-+		default:
-+			/* TODO? */
-+			break;
-+		}
-+
-+		inode->i_flags |= S_NOATIME;
- 
- 		inode->i_ino = obj->objectId;
- 		inode->i_mode = obj->yst_mode;
- 		inode->i_uid = obj->yst_uid;
- 		inode->i_gid = obj->yst_gid;
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
- 		inode->i_blksize = inode->i_sb->s_blocksize;
- #endif
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 
- 		inode->i_rdev = old_decode_dev(obj->yst_rdev);
- 		inode->i_atime.tv_sec = (time_t) (obj->yst_atime);
-@@ -781,26 +951,25 @@ static void yaffs_FillInodeFromObject(st
- 		inode->i_nlink = yaffs_GetObjectLinkCount(obj);
- 
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG
--		   "yaffs_FillInode mode %x uid %d gid %d size %d count %d\n",
--		   inode->i_mode, inode->i_uid, inode->i_gid,
--		   (int)inode->i_size, atomic_read(&inode->i_count)));
-+			("yaffs_FillInode mode %x uid %d gid %d size %d count %d\n",
-+			inode->i_mode, inode->i_uid, inode->i_gid,
-+			(int)inode->i_size, atomic_read(&inode->i_count)));
- 
- 		switch (obj->yst_mode & S_IFMT) {
- 		default:	/* fifo, device or socket */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 			init_special_inode(inode, obj->yst_mode,
--					   old_decode_dev(obj->yst_rdev));
-+					old_decode_dev(obj->yst_rdev));
- #else
- 			init_special_inode(inode, obj->yst_mode,
--					   (dev_t) (obj->yst_rdev));
-+					(dev_t) (obj->yst_rdev));
- #endif
- 			break;
- 		case S_IFREG:	/* file */
- 			inode->i_op = &yaffs_file_inode_operations;
- 			inode->i_fop = &yaffs_file_operations;
- 			inode->i_mapping->a_ops =
--			    &yaffs_file_address_operations;
-+				&yaffs_file_address_operations;
- 			break;
- 		case S_IFDIR:	/* directory */
- 			inode->i_op = &yaffs_dir_inode_operations;
-@@ -817,34 +986,36 @@ static void yaffs_FillInodeFromObject(st
- 
- 	} else {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_FileInode invalid parameters\n"));
-+			("yaffs_FileInode invalid parameters\n"));
- 	}
- 
- }
- 
- struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,
--			      yaffs_Object * obj)
-+				yaffs_Object *obj)
- {
- 	struct inode *inode;
- 
- 	if (!sb) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_get_inode for NULL super_block!!\n"));
-+			("yaffs_get_inode for NULL super_block!!\n"));
- 		return NULL;
- 
- 	}
- 
- 	if (!obj) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_get_inode for NULL object!!\n"));
-+			("yaffs_get_inode for NULL object!!\n"));
- 		return NULL;
- 
- 	}
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_get_inode for object %d\n", obj->objectId));
-+		("yaffs_get_inode for object %d\n", obj->objectId));
- 
--	inode = iget(sb, obj->objectId);
-+	inode = Y_IGET(sb, obj->objectId);
-+	if (IS_ERR(inode))
-+		return NULL;
- 
- 	/* NB Side effect: iget calls back to yaffs_read_inode(). */
- 	/* iget also increments the inode's i_count */
-@@ -854,7 +1025,7 @@ struct inode *yaffs_get_inode(struct sup
- }
- 
- static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
--				loff_t * pos)
-+				loff_t *pos)
- {
- 	yaffs_Object *obj;
- 	int nWritten, ipos;
-@@ -869,28 +1040,26 @@ static ssize_t yaffs_file_write(struct f
- 
- 	inode = f->f_dentry->d_inode;
- 
--	if (!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND) {
-+	if (!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND)
- 		ipos = inode->i_size;
--	} else {
-+	else
- 		ipos = *pos;
--	}
- 
--	if (!obj) {
-+	if (!obj)
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_file_write: hey obj is null!\n"));
--	} else {
-+			("yaffs_file_write: hey obj is null!\n"));
-+	else
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG
--		   "yaffs_file_write about to write writing %d bytes"
--		   "to object %d at %d\n",
--		   n, obj->objectId, ipos));
--	}
-+			("yaffs_file_write about to write writing %zu bytes"
-+			"to object %d at %d\n",
-+			n, obj->objectId, ipos));
- 
- 	nWritten = yaffs_WriteDataToFile(obj, buf, ipos, n, 0);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_file_write writing %d bytes, %d written at %d\n",
--	   n, nWritten, ipos));
-+		("yaffs_file_write writing %zu bytes, %d written at %d\n",
-+		n, nWritten, ipos));
-+
- 	if (nWritten > 0) {
- 		ipos += nWritten;
- 		*pos = ipos;
-@@ -899,10 +1068,9 @@ static ssize_t yaffs_file_write(struct f
- 			inode->i_blocks = (ipos + 511) >> 9;
- 
- 			T(YAFFS_TRACE_OS,
--			  (KERN_DEBUG
--			   "yaffs_file_write size updated to %d bytes, "
--			   "%d blocks\n",
--			   ipos, (int)(inode->i_blocks)));
-+				("yaffs_file_write size updated to %d bytes, "
-+				"%d blocks\n",
-+				ipos, (int)(inode->i_blocks)));
- 		}
- 
- 	}
-@@ -910,13 +1078,54 @@ static ssize_t yaffs_file_write(struct f
- 	return nWritten == 0 ? -ENOSPC : nWritten;
- }
- 
-+/* Space holding and freeing is done to ensure we have space available for write_begin/end */
-+/* For now we just assume few parallel writes and check against a small number. */
-+/* Todo: need to do this with a counter to handle parallel reads better */
-+
-+static ssize_t yaffs_hold_space(struct file *f)
-+{
-+	yaffs_Object *obj;
-+	yaffs_Device *dev;
-+
-+	int nFreeChunks;
-+
-+
-+	obj = yaffs_DentryToObject(f->f_dentry);
-+
-+	dev = obj->myDev;
-+
-+	yaffs_GrossLock(dev);
-+
-+	nFreeChunks = yaffs_GetNumberOfFreeChunks(dev);
-+
-+	yaffs_GrossUnlock(dev);
-+
-+	return (nFreeChunks > 20) ? 1 : 0;
-+}
-+
-+static void yaffs_release_space(struct file *f)
-+{
-+	yaffs_Object *obj;
-+	yaffs_Device *dev;
-+
-+
-+	obj = yaffs_DentryToObject(f->f_dentry);
-+
-+	dev = obj->myDev;
-+
-+	yaffs_GrossLock(dev);
-+
-+
-+	yaffs_GrossUnlock(dev);
-+}
-+
- static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
- {
- 	yaffs_Object *obj;
- 	yaffs_Device *dev;
- 	struct inode *inode = f->f_dentry->d_inode;
- 	unsigned long offset, curoffs;
--	struct list_head *i;
-+	struct ylist_head *i;
- 	yaffs_Object *l;
- 
- 	char name[YAFFS_MAX_NAME_LENGTH + 1];
-@@ -932,24 +1141,20 @@ static int yaffs_readdir(struct file *f,
- 
- 	if (offset == 0) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_readdir: entry . ino %d \n",
--		   (int)inode->i_ino));
--		if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR)
--		    < 0) {
-+			("yaffs_readdir: entry . ino %d \n",
-+			(int)inode->i_ino));
-+		if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR) < 0)
- 			goto out;
--		}
- 		offset++;
- 		f->f_pos++;
- 	}
- 	if (offset == 1) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_readdir: entry .. ino %d \n",
--		   (int)f->f_dentry->d_parent->d_inode->i_ino));
--		if (filldir
--		    (dirent, "..", 2, offset,
--		     f->f_dentry->d_parent->d_inode->i_ino, DT_DIR) < 0) {
-+			("yaffs_readdir: entry .. ino %d \n",
-+			(int)f->f_dentry->d_parent->d_inode->i_ino));
-+		if (filldir(dirent, "..", 2, offset,
-+			f->f_dentry->d_parent->d_inode->i_ino, DT_DIR) < 0)
- 			goto out;
--		}
- 		offset++;
- 		f->f_pos++;
- 	}
-@@ -965,35 +1170,32 @@ static int yaffs_readdir(struct file *f,
- 		f->f_version = inode->i_version;
- 	}
- 
--	list_for_each(i, &obj->variant.directoryVariant.children) {
-+	ylist_for_each(i, &obj->variant.directoryVariant.children) {
- 		curoffs++;
- 		if (curoffs >= offset) {
--			l = list_entry(i, yaffs_Object, siblings);
-+			l = ylist_entry(i, yaffs_Object, siblings);
- 
- 			yaffs_GetObjectName(l, name,
- 					    YAFFS_MAX_NAME_LENGTH + 1);
- 			T(YAFFS_TRACE_OS,
--			  (KERN_DEBUG "yaffs_readdir: %s inode %d\n", name,
-+			  ("yaffs_readdir: %s inode %d\n", name,
- 			   yaffs_GetObjectInode(l)));
- 
- 			if (filldir(dirent,
--				    name,
--				    strlen(name),
--				    offset,
--				    yaffs_GetObjectInode(l),
--				    yaffs_GetObjectType(l))
--			    < 0) {
-+					name,
-+					strlen(name),
-+					offset,
-+					yaffs_GetObjectInode(l),
-+					yaffs_GetObjectType(l)) < 0)
- 				goto up_and_out;
--			}
- 
- 			offset++;
- 			f->f_pos++;
- 		}
- 	}
- 
--      up_and_out:
--      out:
--
-+up_and_out:
-+out:
- 	yaffs_GrossUnlock(dev);
- 
- 	return 0;
-@@ -1002,12 +1204,19 @@ static int yaffs_readdir(struct file *f,
- /*
-  * File creation. Allocate an inode, and we're done..
-  */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
-+#define YCRED(x) x
-+#else
-+#define YCRED(x) (x->cred)
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
--		       dev_t rdev)
-+			dev_t rdev)
- #else
- static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
--		       int rdev)
-+			int rdev)
- #endif
- {
- 	struct inode *inode;
-@@ -1018,25 +1227,25 @@ static int yaffs_mknod(struct inode *dir
- 	yaffs_Object *parent = yaffs_InodeToObject(dir);
- 
- 	int error = -ENOSPC;
--	uid_t uid = current->fsuid;
--	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid;
-+	uid_t uid = YCRED(current)->fsuid;
-+	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
- 
--	if((dir->i_mode & S_ISGID) && S_ISDIR(mode))
-+	if ((dir->i_mode & S_ISGID) && S_ISDIR(mode))
- 		mode |= S_ISGID;
- 
- 	if (parent) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod: parent object %d type %d\n",
--		   parent->objectId, parent->variantType));
-+			("yaffs_mknod: parent object %d type %d\n",
-+			parent->objectId, parent->variantType));
- 	} else {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod: could not get parent object\n"));
-+			("yaffs_mknod: could not get parent object\n"));
- 		return -EPERM;
- 	}
- 
- 	T(YAFFS_TRACE_OS, ("yaffs_mknod: making oject for %s, "
--			   "mode %x dev %x\n",
--			   dentry->d_name.name, mode, rdev));
-+			"mode %x dev %x\n",
-+			dentry->d_name.name, mode, rdev));
- 
- 	dev = parent->myDev;
- 
-@@ -1045,33 +1254,28 @@ static int yaffs_mknod(struct inode *dir
- 	switch (mode & S_IFMT) {
- 	default:
- 		/* Special (socket, fifo, device...) */
--		T(YAFFS_TRACE_OS, (KERN_DEBUG
--				   "yaffs_mknod: making special\n"));
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
--		obj =
--		    yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
--				       gid, old_encode_dev(rdev));
--#else
--		obj =
--		    yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
--				       gid, rdev);
-+		T(YAFFS_TRACE_OS, ("yaffs_mknod: making special\n"));
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+		obj = yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
-+				gid, old_encode_dev(rdev));
-+#else
-+		obj = yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
-+				gid, rdev);
- #endif
- 		break;
- 	case S_IFREG:		/* file          */
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_mknod: making file\n"));
--		obj =
--		    yaffs_MknodFile(parent, dentry->d_name.name, mode, uid,
--				    gid);
-+		T(YAFFS_TRACE_OS, ("yaffs_mknod: making file\n"));
-+		obj = yaffs_MknodFile(parent, dentry->d_name.name, mode, uid,
-+				gid);
- 		break;
- 	case S_IFDIR:		/* directory */
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod: making directory\n"));
--		obj =
--		    yaffs_MknodDirectory(parent, dentry->d_name.name, mode,
--					 uid, gid);
-+			("yaffs_mknod: making directory\n"));
-+		obj = yaffs_MknodDirectory(parent, dentry->d_name.name, mode,
-+					uid, gid);
- 		break;
- 	case S_IFLNK:		/* symlink */
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_mknod: making file\n"));
-+		T(YAFFS_TRACE_OS, ("yaffs_mknod: making symlink\n"));
- 		obj = NULL;	/* Do we ever get here? */
- 		break;
- 	}
-@@ -1083,12 +1287,12 @@ static int yaffs_mknod(struct inode *dir
- 		inode = yaffs_get_inode(dir->i_sb, mode, rdev, obj);
- 		d_instantiate(dentry, inode);
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod created object %d count = %d\n",
--		   obj->objectId, atomic_read(&inode->i_count)));
-+			("yaffs_mknod created object %d count = %d\n",
-+			obj->objectId, atomic_read(&inode->i_count)));
- 		error = 0;
- 	} else {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod failed making object\n"));
-+			("yaffs_mknod failed making object\n"));
- 		error = -ENOMEM;
- 	}
- 
-@@ -1098,25 +1302,19 @@ static int yaffs_mknod(struct inode *dir
- static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
- {
- 	int retVal;
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_mkdir\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_mkdir\n"));
- 	retVal = yaffs_mknod(dir, dentry, mode | S_IFDIR, 0);
--#if 0
--	/* attempt to fix dir bug - didn't work */
--	if (!retVal) {
--		dget(dentry);
--	}
--#endif
- 	return retVal;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
- 			struct nameidata *n)
- #else
- static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode)
- #endif
- {
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_create\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_create\n"));
- 	return yaffs_mknod(dir, dentry, mode | S_IFREG, 0);
- }
- 
-@@ -1127,8 +1325,8 @@ static int yaffs_unlink(struct inode *di
- 	yaffs_Device *dev;
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_unlink %d:%s\n", (int)(dir->i_ino),
--	   dentry->d_name.name));
-+		("yaffs_unlink %d:%s\n", (int)(dir->i_ino),
-+		dentry->d_name.name));
- 
- 	dev = yaffs_InodeToObject(dir)->myDev;
- 
-@@ -1151,82 +1349,74 @@ static int yaffs_unlink(struct inode *di
-  * Create a link...
-  */
- static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
--		      struct dentry *dentry)
-+			struct dentry *dentry)
- {
- 	struct inode *inode = old_dentry->d_inode;
- 	yaffs_Object *obj = NULL;
- 	yaffs_Object *link = NULL;
- 	yaffs_Device *dev;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_link\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_link\n"));
- 
- 	obj = yaffs_InodeToObject(inode);
- 	dev = obj->myDev;
- 
- 	yaffs_GrossLock(dev);
- 
--	if (!S_ISDIR(inode->i_mode))	/* Don't link directories */
--	{
--		link =
--		    yaffs_Link(yaffs_InodeToObject(dir), dentry->d_name.name,
--			       obj);
--	}
-+	if (!S_ISDIR(inode->i_mode))		/* Don't link directories */
-+		link = yaffs_Link(yaffs_InodeToObject(dir), dentry->d_name.name,
-+			obj);
- 
- 	if (link) {
- 		old_dentry->d_inode->i_nlink = yaffs_GetObjectLinkCount(obj);
- 		d_instantiate(dentry, old_dentry->d_inode);
- 		atomic_inc(&old_dentry->d_inode->i_count);
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_link link count %d i_count %d\n",
--		   old_dentry->d_inode->i_nlink,
--		   atomic_read(&old_dentry->d_inode->i_count)));
--
-+			("yaffs_link link count %d i_count %d\n",
-+			old_dentry->d_inode->i_nlink,
-+			atomic_read(&old_dentry->d_inode->i_count)));
- 	}
- 
- 	yaffs_GrossUnlock(dev);
- 
--	if (link) {
--
-+	if (link)
- 		return 0;
--	}
- 
- 	return -EPERM;
- }
- 
- static int yaffs_symlink(struct inode *dir, struct dentry *dentry,
--			 const char *symname)
-+				const char *symname)
- {
- 	yaffs_Object *obj;
- 	yaffs_Device *dev;
--	uid_t uid = current->fsuid;
--	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid;
-+	uid_t uid = YCRED(current)->fsuid;
-+	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_symlink\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_symlink\n"));
- 
- 	dev = yaffs_InodeToObject(dir)->myDev;
- 	yaffs_GrossLock(dev);
- 	obj = yaffs_MknodSymLink(yaffs_InodeToObject(dir), dentry->d_name.name,
--				 S_IFLNK | S_IRWXUGO, uid, gid, symname);
-+				S_IFLNK | S_IRWXUGO, uid, gid, symname);
- 	yaffs_GrossUnlock(dev);
- 
- 	if (obj) {
--
- 		struct inode *inode;
- 
- 		inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
- 		d_instantiate(dentry, inode);
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "symlink created OK\n"));
-+		T(YAFFS_TRACE_OS, ("symlink created OK\n"));
- 		return 0;
- 	} else {
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "symlink not created\n"));
--
-+		T(YAFFS_TRACE_OS, ("symlink not created\n"));
- 	}
- 
- 	return -ENOMEM;
- }
- 
- static int yaffs_sync_object(struct file *file, struct dentry *dentry,
--			     int datasync)
-+				int datasync)
- {
- 
- 	yaffs_Object *obj;
-@@ -1236,7 +1426,7 @@ static int yaffs_sync_object(struct file
- 
- 	dev = obj->myDev;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_sync_object\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_sync_object\n"));
- 	yaffs_GrossLock(dev);
- 	yaffs_FlushFile(obj, 1);
- 	yaffs_GrossUnlock(dev);
-@@ -1255,41 +1445,36 @@ static int yaffs_rename(struct inode *ol
- 	int retVal = YAFFS_FAIL;
- 	yaffs_Object *target;
- 
--        T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_rename\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_rename\n"));
- 	dev = yaffs_InodeToObject(old_dir)->myDev;
- 
- 	yaffs_GrossLock(dev);
- 
- 	/* Check if the target is an existing directory that is not empty. */
--	target =
--	    yaffs_FindObjectByName(yaffs_InodeToObject(new_dir),
--				   new_dentry->d_name.name);
-+	target = yaffs_FindObjectByName(yaffs_InodeToObject(new_dir),
-+				new_dentry->d_name.name);
- 
- 
- 
--	if (target &&
--	    target->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
--	    !list_empty(&target->variant.directoryVariant.children)) {
-+	if (target && target->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
-+		!ylist_empty(&target->variant.directoryVariant.children)) {
- 
--	        T(YAFFS_TRACE_OS, (KERN_DEBUG "target is non-empty dir\n"));
-+		T(YAFFS_TRACE_OS, ("target is non-empty dir\n"));
- 
- 		retVal = YAFFS_FAIL;
- 	} else {
--
- 		/* Now does unlinking internally using shadowing mechanism */
--	        T(YAFFS_TRACE_OS, (KERN_DEBUG "calling yaffs_RenameObject\n"));
--
--		retVal =
--		    yaffs_RenameObject(yaffs_InodeToObject(old_dir),
--				       old_dentry->d_name.name,
--				       yaffs_InodeToObject(new_dir),
--				       new_dentry->d_name.name);
-+		T(YAFFS_TRACE_OS, ("calling yaffs_RenameObject\n"));
- 
-+		retVal = yaffs_RenameObject(yaffs_InodeToObject(old_dir),
-+				old_dentry->d_name.name,
-+				yaffs_InodeToObject(new_dir),
-+				new_dentry->d_name.name);
- 	}
- 	yaffs_GrossUnlock(dev);
- 
- 	if (retVal == YAFFS_OK) {
--		if(target) {
-+		if (target) {
- 			new_dentry->d_inode->i_nlink--;
- 			mark_inode_dirty(new_dentry->d_inode);
- 		}
-@@ -1298,7 +1483,6 @@ static int yaffs_rename(struct inode *ol
- 	} else {
- 		return -ENOTEMPTY;
- 	}
--
- }
- 
- static int yaffs_setattr(struct dentry *dentry, struct iattr *attr)
-@@ -1308,15 +1492,15 @@ static int yaffs_setattr(struct dentry *
- 	yaffs_Device *dev;
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_setattr of object %d\n",
--	   yaffs_InodeToObject(inode)->objectId));
--
--	if ((error = inode_change_ok(inode, attr)) == 0) {
-+		("yaffs_setattr of object %d\n",
-+		yaffs_InodeToObject(inode)->objectId));
- 
-+	error = inode_change_ok(inode, attr);
-+	if (error == 0) {
- 		dev = yaffs_InodeToObject(inode)->myDev;
- 		yaffs_GrossLock(dev);
- 		if (yaffs_SetAttributes(yaffs_InodeToObject(inode), attr) ==
--		    YAFFS_OK) {
-+				YAFFS_OK) {
- 			error = 0;
- 		} else {
- 			error = -EPERM;
-@@ -1328,12 +1512,12 @@ static int yaffs_setattr(struct dentry *
- 	return error;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf)
- {
- 	yaffs_Device *dev = yaffs_DentryToObject(dentry)->myDev;
- 	struct super_block *sb = dentry->d_sb;
--#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf)
- {
- 	yaffs_Device *dev = yaffs_SuperToDevice(sb);
-@@ -1343,32 +1527,53 @@ static int yaffs_statfs(struct super_blo
- 	yaffs_Device *dev = yaffs_SuperToDevice(sb);
- #endif
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_statfs\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_statfs\n"));
- 
- 	yaffs_GrossLock(dev);
- 
- 	buf->f_type = YAFFS_MAGIC;
- 	buf->f_bsize = sb->s_blocksize;
- 	buf->f_namelen = 255;
--	if (sb->s_blocksize > dev->nDataBytesPerChunk) {
-+
-+	if (dev->nDataBytesPerChunk & (dev->nDataBytesPerChunk - 1)) {
-+		/* Do this if chunk size is not a power of 2 */
-+
-+		uint64_t bytesInDev;
-+		uint64_t bytesFree;
-+
-+		bytesInDev = ((uint64_t)((dev->endBlock - dev->startBlock + 1))) *
-+			((uint64_t)(dev->nChunksPerBlock * dev->nDataBytesPerChunk));
-+
-+		do_div(bytesInDev, sb->s_blocksize); /* bytesInDev becomes the number of blocks */
-+		buf->f_blocks = bytesInDev;
-+
-+		bytesFree  = ((uint64_t)(yaffs_GetNumberOfFreeChunks(dev))) *
-+			((uint64_t)(dev->nDataBytesPerChunk));
-+
-+		do_div(bytesFree, sb->s_blocksize);
-+
-+		buf->f_bfree = bytesFree;
-+
-+	} else if (sb->s_blocksize > dev->nDataBytesPerChunk) {
- 
- 		buf->f_blocks =
--		    (dev->endBlock - dev->startBlock +
--		     1) * dev->nChunksPerBlock / (sb->s_blocksize /
--						  dev->nDataBytesPerChunk);
-+			(dev->endBlock - dev->startBlock + 1) *
-+			dev->nChunksPerBlock /
-+			(sb->s_blocksize / dev->nDataBytesPerChunk);
- 		buf->f_bfree =
--		    yaffs_GetNumberOfFreeChunks(dev) / (sb->s_blocksize /
--							dev->nDataBytesPerChunk);
-+			yaffs_GetNumberOfFreeChunks(dev) /
-+			(sb->s_blocksize / dev->nDataBytesPerChunk);
- 	} else {
--
- 		buf->f_blocks =
--		    (dev->endBlock - dev->startBlock +
--		     1) * dev->nChunksPerBlock * (dev->nDataBytesPerChunk /
--						  sb->s_blocksize);
-+			(dev->endBlock - dev->startBlock + 1) *
-+			dev->nChunksPerBlock *
-+			(dev->nDataBytesPerChunk / sb->s_blocksize);
-+
- 		buf->f_bfree =
--		    yaffs_GetNumberOfFreeChunks(dev) * (dev->nDataBytesPerChunk /
--							sb->s_blocksize);
-+			yaffs_GetNumberOfFreeChunks(dev) *
-+			(dev->nDataBytesPerChunk / sb->s_blocksize);
- 	}
-+
- 	buf->f_files = 0;
- 	buf->f_ffree = 0;
- 	buf->f_bavail = buf->f_bfree;
-@@ -1378,18 +1583,19 @@ static int yaffs_statfs(struct super_blo
- }
- 
- 
--/**
- static int yaffs_do_sync_fs(struct super_block *sb)
- {
- 
- 	yaffs_Device *dev = yaffs_SuperToDevice(sb);
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_do_sync_fs\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_do_sync_fs\n"));
- 
--	if(sb->s_dirt) {
-+	if (sb->s_dirt) {
- 		yaffs_GrossLock(dev);
- 
--		if(dev)
-+		if (dev) {
-+			yaffs_FlushEntireDeviceCache(dev);
- 			yaffs_CheckpointSave(dev);
-+		}
- 
- 		yaffs_GrossUnlock(dev);
- 
-@@ -1397,35 +1603,73 @@ static int yaffs_do_sync_fs(struct super
- 	}
- 	return 0;
- }
--**/
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static void yaffs_write_super(struct super_block *sb)
- #else
- static int yaffs_write_super(struct super_block *sb)
- #endif
- {
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_write_super\n"));
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18))
--	return 0; /* yaffs_do_sync_fs(sb);*/
-+	T(YAFFS_TRACE_OS, ("yaffs_write_super\n"));
-+	if (yaffs_auto_checkpoint >= 2)
-+		yaffs_do_sync_fs(sb);
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18))
-+	return 0;
- #endif
- }
- 
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_sync_fs(struct super_block *sb, int wait)
- #else
- static int yaffs_sync_fs(struct super_block *sb)
- #endif
- {
-+	T(YAFFS_TRACE_OS, ("yaffs_sync_fs\n"));
-+
-+	if (yaffs_auto_checkpoint >= 1)
-+		yaffs_do_sync_fs(sb);
-+
-+	return 0;
-+}
-+
-+#ifdef YAFFS_USE_OWN_IGET
-+
-+static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino)
-+{
-+	struct inode *inode;
-+	yaffs_Object *obj;
-+	yaffs_Device *dev = yaffs_SuperToDevice(sb);
-+
-+	T(YAFFS_TRACE_OS,
-+		("yaffs_iget for %lu\n", ino));
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_sync_fs\n"));
-+	inode = iget_locked(sb, ino);
-+	if (!inode)
-+		return ERR_PTR(-ENOMEM);
-+	if (!(inode->i_state & I_NEW))
-+		return inode;
-+
-+	/* NB This is called as a side effect of other functions, but
-+	 * we had to release the lock to prevent deadlocks, so
-+	 * need to lock again.
-+	 */
- 
--	return 0; /* yaffs_do_sync_fs(sb);*/
-+	yaffs_GrossLock(dev);
- 
-+	obj = yaffs_FindObjectByNumber(dev, inode->i_ino);
-+
-+	yaffs_FillInodeFromObject(inode, obj);
-+
-+	yaffs_GrossUnlock(dev);
-+
-+	unlock_new_inode(inode);
-+	return inode;
- }
- 
-+#else
- 
- static void yaffs_read_inode(struct inode *inode)
- {
-@@ -1438,7 +1682,7 @@ static void yaffs_read_inode(struct inod
- 	yaffs_Device *dev = yaffs_SuperToDevice(inode->i_sb);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_read_inode for %d\n", (int)inode->i_ino));
-+		("yaffs_read_inode for %d\n", (int)inode->i_ino));
- 
- 	yaffs_GrossLock(dev);
- 
-@@ -1449,18 +1693,20 @@ static void yaffs_read_inode(struct inod
- 	yaffs_GrossUnlock(dev);
- }
- 
--static LIST_HEAD(yaffs_dev_list);
-+#endif
-+
-+static YLIST_HEAD(yaffs_dev_list);
- 
--#if 0 // not used
-+#if 0 /* not used */
- static int yaffs_remount_fs(struct super_block *sb, int *flags, char *data)
- {
- 	yaffs_Device    *dev = yaffs_SuperToDevice(sb);
- 
--	if( *flags & MS_RDONLY ) {
-+	if (*flags & MS_RDONLY) {
- 		struct mtd_info *mtd = yaffs_SuperToDevice(sb)->genericDevice;
- 
- 		T(YAFFS_TRACE_OS,
--			(KERN_DEBUG "yaffs_remount_fs: %s: RO\n", dev->name ));
-+			("yaffs_remount_fs: %s: RO\n", dev->name));
- 
- 		yaffs_GrossLock(dev);
- 
-@@ -1472,10 +1718,9 @@ static int yaffs_remount_fs(struct super
- 			mtd->sync(mtd);
- 
- 		yaffs_GrossUnlock(dev);
--	}
--	else {
-+	} else {
- 		T(YAFFS_TRACE_OS,
--			(KERN_DEBUG "yaffs_remount_fs: %s: RW\n", dev->name ));
-+			("yaffs_remount_fs: %s: RW\n", dev->name));
- 	}
- 
- 	return 0;
-@@ -1486,7 +1731,7 @@ static void yaffs_put_super(struct super
- {
- 	yaffs_Device *dev = yaffs_SuperToDevice(sb);
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_put_super\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_put_super\n"));
- 
- 	yaffs_GrossLock(dev);
- 
-@@ -1494,18 +1739,17 @@ static void yaffs_put_super(struct super
- 
- 	yaffs_CheckpointSave(dev);
- 
--	if (dev->putSuperFunc) {
-+	if (dev->putSuperFunc)
- 		dev->putSuperFunc(sb);
--	}
- 
- 	yaffs_Deinitialise(dev);
- 
- 	yaffs_GrossUnlock(dev);
- 
- 	/* we assume this is protected by lock_kernel() in mount/umount */
--	list_del(&dev->devList);
-+	ylist_del(&dev->devList);
- 
--	if(dev->spareBuffer){
-+	if (dev->spareBuffer) {
- 		YFREE(dev->spareBuffer);
- 		dev->spareBuffer = NULL;
- 	}
-@@ -1516,12 +1760,10 @@ static void yaffs_put_super(struct super
- 
- static void yaffs_MTDPutSuper(struct super_block *sb)
- {
--
- 	struct mtd_info *mtd = yaffs_SuperToDevice(sb)->genericDevice;
- 
--	if (mtd->sync) {
-+	if (mtd->sync)
- 		mtd->sync(mtd);
--	}
- 
- 	put_mtd_device(mtd);
- }
-@@ -1531,9 +1773,9 @@ static void yaffs_MarkSuperBlockDirty(vo
- {
- 	struct super_block *sb = (struct super_block *)vsb;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_MarkSuperBlockDirty() sb = %p\n",sb));
--//	if(sb)
--//		sb->s_dirt = 1;
-+	T(YAFFS_TRACE_OS, ("yaffs_MarkSuperBlockDirty() sb = %p\n", sb));
-+	if (sb)
-+		sb->s_dirt = 1;
- }
- 
- typedef struct {
-@@ -1546,48 +1788,48 @@ typedef struct {
- #define MAX_OPT_LEN 20
- static int yaffs_parse_options(yaffs_options *options, const char *options_str)
- {
--	char cur_opt[MAX_OPT_LEN+1];
-+	char cur_opt[MAX_OPT_LEN + 1];
- 	int p;
- 	int error = 0;
- 
- 	/* Parse through the options which is a comma seperated list */
- 
--	while(options_str && *options_str && !error){
--		memset(cur_opt,0,MAX_OPT_LEN+1);
-+	while (options_str && *options_str && !error) {
-+		memset(cur_opt, 0, MAX_OPT_LEN + 1);
- 		p = 0;
- 
--		while(*options_str && *options_str != ','){
--			if(p < MAX_OPT_LEN){
-+		while (*options_str && *options_str != ',') {
-+			if (p < MAX_OPT_LEN) {
- 				cur_opt[p] = *options_str;
- 				p++;
- 			}
- 			options_str++;
- 		}
- 
--		if(!strcmp(cur_opt,"inband-tags"))
-+		if (!strcmp(cur_opt, "inband-tags"))
- 			options->inband_tags = 1;
--		else if(!strcmp(cur_opt,"no-cache"))
-+		else if (!strcmp(cur_opt, "no-cache"))
- 			options->no_cache = 1;
--		else if(!strcmp(cur_opt,"no-checkpoint-read"))
-+		else if (!strcmp(cur_opt, "no-checkpoint-read"))
- 			options->skip_checkpoint_read = 1;
--		else if(!strcmp(cur_opt,"no-checkpoint-write"))
-+		else if (!strcmp(cur_opt, "no-checkpoint-write"))
- 			options->skip_checkpoint_write = 1;
--		else if(!strcmp(cur_opt,"no-checkpoint")){
-+		else if (!strcmp(cur_opt, "no-checkpoint")) {
- 			options->skip_checkpoint_read = 1;
- 			options->skip_checkpoint_write = 1;
- 		} else {
--			printk(KERN_INFO "yaffs: Bad mount option \"%s\"\n",cur_opt);
-+			printk(KERN_INFO "yaffs: Bad mount option \"%s\"\n",
-+					cur_opt);
- 			error = 1;
- 		}
--
- 	}
- 
- 	return error;
- }
- 
- static struct super_block *yaffs_internal_read_super(int yaffsVersion,
--						     struct super_block *sb,
--						     void *data, int silent)
-+						struct super_block *sb,
-+						void *data, int silent)
- {
- 	int nBlocks;
- 	struct inode *inode = NULL;
-@@ -1602,6 +1844,7 @@ static struct super_block *yaffs_interna
- 
- 	sb->s_magic = YAFFS_MAGIC;
- 	sb->s_op = &yaffs_super_ops;
-+	sb->s_flags |= MS_NOATIME;
- 
- 	if (!sb)
- 		printk(KERN_INFO "yaffs: sb is NULL\n");
-@@ -1614,14 +1857,14 @@ static struct super_block *yaffs_interna
- 		       sb->s_dev,
- 		       yaffs_devname(sb, devname_buf));
- 
--	if(!data_str)
-+	if (!data_str)
- 		data_str = "";
- 
--	printk(KERN_INFO "yaffs: passed flags \"%s\"\n",data_str);
-+	printk(KERN_INFO "yaffs: passed flags \"%s\"\n", data_str);
- 
--	memset(&options,0,sizeof(options));
-+	memset(&options, 0, sizeof(options));
- 
--	if(yaffs_parse_options(&options,data_str)){
-+	if (yaffs_parse_options(&options, data_str)) {
- 		/* Option parsing failed */
- 		return NULL;
- 	}
-@@ -1645,9 +1888,9 @@ static struct super_block *yaffs_interna
- 			       yaffs_devname(sb, devname_buf)));
- 
- 	/* Check it's an mtd device..... */
--	if (MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR) {
-+	if (MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR)
- 		return NULL;	/* This isn't an mtd device */
--	}
-+
- 	/* Get the device */
- 	mtd = get_mtd_device(NULL, MINOR(sb->s_dev));
- 	if (!mtd) {
-@@ -1673,29 +1916,23 @@ static struct super_block *yaffs_interna
- 	T(YAFFS_TRACE_OS, (" %s %d\n", WRITE_SIZE_STR, WRITE_SIZE(mtd)));
- 	T(YAFFS_TRACE_OS, (" oobsize %d\n", mtd->oobsize));
- 	T(YAFFS_TRACE_OS, (" erasesize %d\n", mtd->erasesize));
--	T(YAFFS_TRACE_OS, (" size %d\n", mtd->size));
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
-+	T(YAFFS_TRACE_OS, (" size %u\n", mtd->size));
-+#else
-+	T(YAFFS_TRACE_OS, (" size %lld\n", mtd->size));
-+#endif
- 
- #ifdef CONFIG_YAFFS_AUTO_YAFFS2
- 
--	if (yaffsVersion == 1 &&
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--	    mtd->writesize >= 2048) {
--#else
--	    mtd->oobblock >= 2048) {
--#endif
--	    T(YAFFS_TRACE_ALWAYS,("yaffs: auto selecting yaffs2\n"));
--	    yaffsVersion = 2;
-+	if (yaffsVersion == 1 && WRITE_SIZE(mtd) >= 2048) {
-+		T(YAFFS_TRACE_ALWAYS, ("yaffs: auto selecting yaffs2\n"));
-+		yaffsVersion = 2;
- 	}
- 
- 	/* Added NCB 26/5/2006 for completeness */
--	if (yaffsVersion == 2 &&
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--	    mtd->writesize == 512) {
--#else
--	    mtd->oobblock == 512) {
--#endif
--	    T(YAFFS_TRACE_ALWAYS,("yaffs: auto selecting yaffs1\n"));
--	    yaffsVersion = 1;
-+	if (yaffsVersion == 2 && !options.inband_tags && WRITE_SIZE(mtd) == 512) {
-+		T(YAFFS_TRACE_ALWAYS, ("yaffs: auto selecting yaffs1\n"));
-+		yaffsVersion = 1;
- 	}
- 
- #endif
-@@ -1707,7 +1944,7 @@ static struct super_block *yaffs_interna
- 		    !mtd->block_markbad ||
- 		    !mtd->read ||
- 		    !mtd->write ||
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- 		    !mtd->read_oob || !mtd->write_oob) {
- #else
- 		    !mtd->write_ecc ||
-@@ -1719,12 +1956,9 @@ static struct super_block *yaffs_interna
- 			return NULL;
- 		}
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--		if (mtd->writesize < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
--#else
--		if (mtd->oobblock < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
--#endif
--		    mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) {
-+		if ((WRITE_SIZE(mtd) < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
-+		    mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) &&
-+		    !options.inband_tags) {
- 			T(YAFFS_TRACE_ALWAYS,
- 			  ("yaffs: MTD device does not have the "
- 			   "right page sizes\n"));
-@@ -1735,7 +1969,7 @@ static struct super_block *yaffs_interna
- 		if (!mtd->erase ||
- 		    !mtd->read ||
- 		    !mtd->write ||
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- 		    !mtd->read_oob || !mtd->write_oob) {
- #else
- 		    !mtd->write_ecc ||
-@@ -1761,7 +1995,7 @@ static struct super_block *yaffs_interna
- 	 * Set the yaffs_Device up for mtd
- 	 */
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 	sb->s_fs_info = dev = kmalloc(sizeof(yaffs_Device), GFP_KERNEL);
- #else
- 	sb->u.generic_sbp = dev = kmalloc(sizeof(yaffs_Device), GFP_KERNEL);
-@@ -1780,13 +2014,15 @@ static struct super_block *yaffs_interna
- 
- 	/* Set up the memory size parameters.... */
- 
--	nBlocks = mtd->size / (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK);
-+	nBlocks = YCALCBLOCKS(mtd->size, (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK));
-+
- 	dev->startBlock = 0;
- 	dev->endBlock = nBlocks - 1;
- 	dev->nChunksPerBlock = YAFFS_CHUNKS_PER_BLOCK;
--	dev->nDataBytesPerChunk = YAFFS_BYTES_PER_CHUNK;
-+	dev->totalBytesPerChunk = YAFFS_BYTES_PER_CHUNK;
- 	dev->nReservedBlocks = 5;
- 	dev->nShortOpCaches = (options.no_cache) ? 0 : 10;
-+	dev->inbandTags = options.inband_tags;
- 
- 	/* ... and the functions. */
- 	if (yaffsVersion == 2) {
-@@ -1798,20 +2034,19 @@ static struct super_block *yaffs_interna
- 		dev->queryNANDBlock = nandmtd2_QueryNANDBlock;
- 		dev->spareBuffer = YMALLOC(mtd->oobsize);
- 		dev->isYaffs2 = 1;
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--		dev->nDataBytesPerChunk = mtd->writesize;
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+		dev->totalBytesPerChunk = mtd->writesize;
- 		dev->nChunksPerBlock = mtd->erasesize / mtd->writesize;
- #else
--		dev->nDataBytesPerChunk = mtd->oobblock;
-+		dev->totalBytesPerChunk = mtd->oobblock;
- 		dev->nChunksPerBlock = mtd->erasesize / mtd->oobblock;
- #endif
--		nBlocks = mtd->size / mtd->erasesize;
-+		nBlocks = YCALCBLOCKS(mtd->size, mtd->erasesize);
- 
--		dev->nCheckpointReservedBlocks = CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS;
- 		dev->startBlock = 0;
- 		dev->endBlock = nBlocks - 1;
- 	} else {
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- 		/* use the MTD interface in yaffs_mtdif1.c */
- 		dev->writeChunkWithTagsToNAND =
- 			nandmtd1_WriteChunkWithTagsToNAND;
-@@ -1847,7 +2082,7 @@ static struct super_block *yaffs_interna
- 	dev->skipCheckpointWrite = options.skip_checkpoint_write;
- 
- 	/* we assume this is protected by lock_kernel() in mount/umount */
--	list_add_tail(&dev->devList, &yaffs_dev_list);
-+	ylist_add_tail(&dev->devList, &yaffs_dev_list);
- 
- 	init_MUTEX(&dev->grossLock);
- 
-@@ -1884,20 +2119,23 @@ static struct super_block *yaffs_interna
- 		return NULL;
- 	}
- 	sb->s_root = root;
-+	sb->s_dirt = !dev->isCheckpointed;
-+	T(YAFFS_TRACE_ALWAYS,
-+	  ("yaffs_read_super: isCheckpointed %d\n", dev->isCheckpointed));
- 
- 	T(YAFFS_TRACE_OS, ("yaffs_read_super: done\n"));
- 	return sb;
- }
- 
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_internal_read_super_mtd(struct super_block *sb, void *data,
- 					 int silent)
- {
- 	return yaffs_internal_read_super(1, sb, data, silent) ? 0 : -EINVAL;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_read_super(struct file_system_type *fs,
- 			    int flags, const char *dev_name,
- 			    void *data, struct vfsmount *mnt)
-@@ -1938,14 +2176,14 @@ static DECLARE_FSTYPE(yaffs_fs_type, "ya
- 
- #ifdef CONFIG_YAFFS_YAFFS2
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs2_internal_read_super_mtd(struct super_block *sb, void *data,
- 					  int silent)
- {
- 	return yaffs_internal_read_super(2, sb, data, silent) ? 0 : -EINVAL;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs2_read_super(struct file_system_type *fs,
- 			int flags, const char *dev_name, void *data,
- 			struct vfsmount *mnt)
-@@ -1990,12 +2228,12 @@ static char *yaffs_dump_dev(char *buf, y
- {
- 	buf += sprintf(buf, "startBlock......... %d\n", dev->startBlock);
- 	buf += sprintf(buf, "endBlock........... %d\n", dev->endBlock);
-+	buf += sprintf(buf, "totalBytesPerChunk. %d\n", dev->totalBytesPerChunk);
- 	buf += sprintf(buf, "nDataBytesPerChunk. %d\n", dev->nDataBytesPerChunk);
- 	buf += sprintf(buf, "chunkGroupBits..... %d\n", dev->chunkGroupBits);
- 	buf += sprintf(buf, "chunkGroupSize..... %d\n", dev->chunkGroupSize);
- 	buf += sprintf(buf, "nErasedBlocks...... %d\n", dev->nErasedBlocks);
- 	buf += sprintf(buf, "nReservedBlocks.... %d\n", dev->nReservedBlocks);
--	buf += sprintf(buf, "nCheckptResBlocks.. %d\n", dev->nCheckpointReservedBlocks);
- 	buf += sprintf(buf, "blocksInCheckpoint. %d\n", dev->blocksInCheckpoint);
- 	buf += sprintf(buf, "nTnodesCreated..... %d\n", dev->nTnodesCreated);
- 	buf += sprintf(buf, "nFreeTnodes........ %d\n", dev->nFreeTnodes);
-@@ -2006,10 +2244,8 @@ static char *yaffs_dump_dev(char *buf, y
- 	buf += sprintf(buf, "nPageReads......... %d\n", dev->nPageReads);
- 	buf += sprintf(buf, "nBlockErasures..... %d\n", dev->nBlockErasures);
- 	buf += sprintf(buf, "nGCCopies.......... %d\n", dev->nGCCopies);
--	buf +=
--	    sprintf(buf, "garbageCollections. %d\n", dev->garbageCollections);
--	buf +=
--	    sprintf(buf, "passiveGCs......... %d\n",
-+	buf += sprintf(buf, "garbageCollections. %d\n", dev->garbageCollections);
-+	buf += sprintf(buf, "passiveGCs......... %d\n",
- 		    dev->passiveGarbageCollections);
- 	buf += sprintf(buf, "nRetriedWrites..... %d\n", dev->nRetriedWrites);
- 	buf += sprintf(buf, "nShortOpCaches..... %d\n", dev->nShortOpCaches);
-@@ -2025,6 +2261,7 @@ static char *yaffs_dump_dev(char *buf, y
- 	    sprintf(buf, "nBackgroudDeletions %d\n", dev->nBackgroundDeletions);
- 	buf += sprintf(buf, "useNANDECC......... %d\n", dev->useNANDECC);
- 	buf += sprintf(buf, "isYaffs2........... %d\n", dev->isYaffs2);
-+	buf += sprintf(buf, "inbandTags......... %d\n", dev->inbandTags);
- 
- 	return buf;
- }
-@@ -2033,7 +2270,7 @@ static int yaffs_proc_read(char *page,
- 			   char **start,
- 			   off_t offset, int count, int *eof, void *data)
- {
--	struct list_head *item;
-+	struct ylist_head *item;
- 	char *buf = page;
- 	int step = offset;
- 	int n = 0;
-@@ -2057,8 +2294,8 @@ static int yaffs_proc_read(char *page,
- 	lock_kernel();
- 
- 	/* Locate and print the Nth entry.  Order N-squared but N is small. */
--	list_for_each(item, &yaffs_dev_list) {
--		yaffs_Device *dev = list_entry(item, yaffs_Device, devList);
-+	ylist_for_each(item, &yaffs_dev_list) {
-+		yaffs_Device *dev = ylist_entry(item, yaffs_Device, devList);
- 		if (n < step) {
- 			n++;
- 			continue;
-@@ -2119,7 +2356,7 @@ static int yaffs_proc_write(struct file 
- 	char *end;
- 	char *mask_name;
- 	const char *x;
--	char substring[MAX_MASK_NAME_LENGTH+1];
-+	char substring[MAX_MASK_NAME_LENGTH + 1];
- 	int i;
- 	int done = 0;
- 	int add, len = 0;
-@@ -2129,9 +2366,8 @@ static int yaffs_proc_write(struct file 
- 
- 	while (!done && (pos < count)) {
- 		done = 1;
--		while ((pos < count) && isspace(buf[pos])) {
-+		while ((pos < count) && isspace(buf[pos]))
- 			pos++;
--		}
- 
- 		switch (buf[pos]) {
- 		case '+':
-@@ -2148,20 +2384,21 @@ static int yaffs_proc_write(struct file 
- 		mask_name = NULL;
- 
- 		mask_bitfield = simple_strtoul(buf + pos, &end, 0);
-+
- 		if (end > buf + pos) {
- 			mask_name = "numeral";
- 			len = end - (buf + pos);
- 			pos += len;
- 			done = 0;
- 		} else {
--			for(x = buf + pos, i = 0;
--			    (*x == '_' || (*x >='a' && *x <= 'z')) &&
--			    i <MAX_MASK_NAME_LENGTH; x++, i++, pos++)
--			    substring[i] = *x;
-+			for (x = buf + pos, i = 0;
-+			    (*x == '_' || (*x >= 'a' && *x <= 'z')) &&
-+			    i < MAX_MASK_NAME_LENGTH; x++, i++, pos++)
-+				substring[i] = *x;
- 			substring[i] = '\0';
- 
- 			for (i = 0; mask_flags[i].mask_name != NULL; i++) {
--				if(strcmp(substring,mask_flags[i].mask_name) == 0){
-+				if (strcmp(substring, mask_flags[i].mask_name) == 0) {
- 					mask_name = mask_flags[i].mask_name;
- 					mask_bitfield = mask_flags[i].mask_bitfield;
- 					done = 0;
-@@ -2172,7 +2409,7 @@ static int yaffs_proc_write(struct file 
- 
- 		if (mask_name != NULL) {
- 			done = 0;
--			switch(add) {
-+			switch (add) {
- 			case '-':
- 				rg &= ~mask_bitfield;
- 				break;
-@@ -2191,13 +2428,13 @@ static int yaffs_proc_write(struct file 
- 
- 	yaffs_traceMask = rg | YAFFS_TRACE_ALWAYS;
- 
--	printk("new trace = 0x%08X\n",yaffs_traceMask);
-+	printk(KERN_DEBUG "new trace = 0x%08X\n", yaffs_traceMask);
- 
- 	if (rg & YAFFS_TRACE_ALWAYS) {
- 		for (i = 0; mask_flags[i].mask_name != NULL; i++) {
- 			char flag;
- 			flag = ((rg & mask_flags[i].mask_bitfield) == mask_flags[i].mask_bitfield) ? '+' : '-';
--			printk("%c%s\n", flag, mask_flags[i].mask_name);
-+			printk(KERN_DEBUG "%c%s\n", flag, mask_flags[i].mask_name);
- 		}
- 	}
- 
-@@ -2211,12 +2448,8 @@ struct file_system_to_install {
- };
- 
- static struct file_system_to_install fs_to_install[] = {
--//#ifdef CONFIG_YAFFS_YAFFS1
- 	{&yaffs_fs_type, 0},
--//#endif
--//#ifdef CONFIG_YAFFS_YAFFS2
- 	{&yaffs2_fs_type, 0},
--//#endif
- 	{NULL, 0}
- };
- 
-@@ -2231,15 +2464,14 @@ static int __init init_yaffs_fs(void)
- 	/* Install the proc_fs entry */
- 	my_proc_entry = create_proc_entry("yaffs",
- 					       S_IRUGO | S_IFREG,
--					       &proc_root);
-+					       YPROC_ROOT);
- 
- 	if (my_proc_entry) {
- 		my_proc_entry->write_proc = yaffs_proc_write;
- 		my_proc_entry->read_proc = yaffs_proc_read;
- 		my_proc_entry->data = NULL;
--	} else {
-+	} else
- 		return -ENOMEM;
--	}
- 
- 	/* Now add the file system entries */
- 
-@@ -2247,9 +2479,8 @@ static int __init init_yaffs_fs(void)
- 
- 	while (fsinst->fst && !error) {
- 		error = register_filesystem(fsinst->fst);
--		if (!error) {
-+		if (!error)
- 			fsinst->installed = 1;
--		}
- 		fsinst++;
- 	}
- 
-@@ -2277,7 +2508,7 @@ static void __exit exit_yaffs_fs(void)
- 	T(YAFFS_TRACE_ALWAYS, ("yaffs " __DATE__ " " __TIME__
- 			       " removing. \n"));
- 
--	remove_proc_entry("yaffs", &proc_root);
-+	remove_proc_entry("yaffs", YPROC_ROOT);
- 
- 	fsinst = fs_to_install;
- 
-@@ -2288,7 +2519,6 @@ static void __exit exit_yaffs_fs(void)
- 		}
- 		fsinst++;
- 	}
--
- }
- 
- module_init(init_yaffs_fs)
---- /dev/null
-+++ b/fs/yaffs2/yaffs_getblockinfo.h
-@@ -0,0 +1,34 @@
-+/*
-+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
-+ *
-+ * Copyright (C) 2002-2007 Aleph One Ltd.
-+ *   for Toby Churchill Ltd and Brightstar Engineering
-+ *
-+ * Created by Charles Manning <charles@aleph1.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 2.1 as
-+ * published by the Free Software Foundation.
-+ *
-+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
-+ */
-+
-+#ifndef __YAFFS_GETBLOCKINFO_H__
-+#define __YAFFS_GETBLOCKINFO_H__
-+
-+#include "yaffs_guts.h"
-+
-+/* Function to manipulate block info */
-+static Y_INLINE yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blk)
-+{
-+	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
-+		T(YAFFS_TRACE_ERROR,
-+		  (TSTR
-+		   ("**>> yaffs: getBlockInfo block %d is not valid" TENDSTR),
-+		   blk));
-+		YBUG();
-+	}
-+	return &dev->blockInfo[blk - dev->internalStartBlock];
-+}
-+
-+#endif
---- a/fs/yaffs2/yaffs_guts.c
-+++ b/fs/yaffs2/yaffs_guts.c
-@@ -12,16 +12,17 @@
-  */
- 
- const char *yaffs_guts_c_version =
--    "$Id: yaffs_guts.c,v 1.49 2007-05-15 20:07:40 charles Exp $";
-+    "$Id: yaffs_guts.c,v 1.82 2009-03-09 04:24:17 charles Exp $";
- 
- #include "yportenv.h"
- 
- #include "yaffsinterface.h"
- #include "yaffs_guts.h"
- #include "yaffs_tagsvalidity.h"
-+#include "yaffs_getblockinfo.h"
- 
- #include "yaffs_tagscompat.h"
--#ifndef  CONFIG_YAFFS_USE_OWN_SORT
-+#ifndef CONFIG_YAFFS_USE_OWN_SORT
- #include "yaffs_qsort.h"
- #endif
- #include "yaffs_nand.h"
-@@ -32,116 +33,116 @@ const char *yaffs_guts_c_version =
- #include "yaffs_packedtags2.h"
- 
- 
--#ifdef CONFIG_YAFFS_WINCE
--void yfsd_LockYAFFS(BOOL fsLockOnly);
--void yfsd_UnlockYAFFS(BOOL fsLockOnly);
--#endif
--
- #define YAFFS_PASSIVE_GC_CHUNKS 2
- 
- #include "yaffs_ecc.h"
- 
- 
- /* Robustification (if it ever comes about...) */
--static void yaffs_RetireBlock(yaffs_Device * dev, int blockInNAND);
--static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND, int erasedOk);
--static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
--				     const __u8 * data,
--				     const yaffs_ExtendedTags * tags);
--static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
--				    const yaffs_ExtendedTags * tags);
-+static void yaffs_RetireBlock(yaffs_Device *dev, int blockInNAND);
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND,
-+		int erasedOk);
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+				const __u8 *data,
-+				const yaffs_ExtendedTags *tags);
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+				const yaffs_ExtendedTags *tags);
- 
- /* Other local prototypes */
--static int yaffs_UnlinkObject( yaffs_Object *obj);
-+static int yaffs_UnlinkObject(yaffs_Object *obj);
- static int yaffs_ObjectHasCachedWriteData(yaffs_Object *obj);
- 
- static void yaffs_HardlinkFixup(yaffs_Device *dev, yaffs_Object *hardList);
- 
--static int yaffs_WriteNewChunkWithTagsToNAND(yaffs_Device * dev,
--					     const __u8 * buffer,
--					     yaffs_ExtendedTags * tags,
--					     int useReserve);
--static int yaffs_PutChunkIntoFile(yaffs_Object * in, int chunkInInode,
--				  int chunkInNAND, int inScan);
--
--static yaffs_Object *yaffs_CreateNewObject(yaffs_Device * dev, int number,
--					   yaffs_ObjectType type);
--static void yaffs_AddObjectToDirectory(yaffs_Object * directory,
--				       yaffs_Object * obj);
--static int yaffs_UpdateObjectHeader(yaffs_Object * in, const YCHAR * name,
--				    int force, int isShrink, int shadows);
--static void yaffs_RemoveObjectFromDirectory(yaffs_Object * obj);
-+static int yaffs_WriteNewChunkWithTagsToNAND(yaffs_Device *dev,
-+					const __u8 *buffer,
-+					yaffs_ExtendedTags *tags,
-+					int useReserve);
-+static int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode,
-+				int chunkInNAND, int inScan);
-+
-+static yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev, int number,
-+					yaffs_ObjectType type);
-+static void yaffs_AddObjectToDirectory(yaffs_Object *directory,
-+				yaffs_Object *obj);
-+static int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name,
-+				int force, int isShrink, int shadows);
-+static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj);
- static int yaffs_CheckStructures(void);
--static int yaffs_DeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, __u32 level,
--			      int chunkOffset, int *limit);
--static int yaffs_DoGenericObjectDeletion(yaffs_Object * in);
--
--static yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blockNo);
--
--static __u8 *yaffs_GetTempBuffer(yaffs_Device * dev, int lineNo);
--static void yaffs_ReleaseTempBuffer(yaffs_Device * dev, __u8 * buffer,
--				    int lineNo);
-+static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level,
-+			int chunkOffset, int *limit);
-+static int yaffs_DoGenericObjectDeletion(yaffs_Object *in);
-+
-+static yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device *dev, int blockNo);
- 
--static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
--				  int chunkInNAND);
- 
--static int yaffs_UnlinkWorker(yaffs_Object * obj);
--static void yaffs_DestroyObject(yaffs_Object * obj);
-+static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
-+				int chunkInNAND);
- 
--static int yaffs_TagsMatch(const yaffs_ExtendedTags * tags, int objectId,
--			   int chunkInObject);
-+static int yaffs_UnlinkWorker(yaffs_Object *obj);
- 
--loff_t yaffs_GetFileSize(yaffs_Object * obj);
-+static int yaffs_TagsMatch(const yaffs_ExtendedTags *tags, int objectId,
-+			int chunkInObject);
- 
--static int yaffs_AllocateChunk(yaffs_Device * dev, int useReserve, yaffs_BlockInfo **blockUsedPtr);
-+static int yaffs_AllocateChunk(yaffs_Device *dev, int useReserve,
-+				yaffs_BlockInfo **blockUsedPtr);
- 
--static void yaffs_VerifyFreeChunks(yaffs_Device * dev);
-+static void yaffs_VerifyFreeChunks(yaffs_Device *dev);
- 
- static void yaffs_CheckObjectDetailsLoaded(yaffs_Object *in);
- 
-+static void yaffs_VerifyDirectory(yaffs_Object *directory);
- #ifdef YAFFS_PARANOID
--static int yaffs_CheckFileSanity(yaffs_Object * in);
-+static int yaffs_CheckFileSanity(yaffs_Object *in);
- #else
- #define yaffs_CheckFileSanity(in)
- #endif
- 
--static void yaffs_InvalidateWholeChunkCache(yaffs_Object * in);
--static void yaffs_InvalidateChunkCache(yaffs_Object * object, int chunkId);
-+static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in);
-+static void yaffs_InvalidateChunkCache(yaffs_Object *object, int chunkId);
- 
- static void yaffs_InvalidateCheckpoint(yaffs_Device *dev);
- 
--static int yaffs_FindChunkInFile(yaffs_Object * in, int chunkInInode,
--				 yaffs_ExtendedTags * tags);
-+static int yaffs_FindChunkInFile(yaffs_Object *in, int chunkInInode,
-+				yaffs_ExtendedTags *tags);
- 
--static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos);
--static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device * dev,
--					  yaffs_FileStructure * fStruct,
--					  __u32 chunkId);
-+static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn,
-+		unsigned pos);
-+static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev,
-+					yaffs_FileStructure *fStruct,
-+					__u32 chunkId);
- 
- 
- /* Function to calculate chunk and offset */
- 
--static void yaffs_AddrToChunk(yaffs_Device *dev, loff_t addr, __u32 *chunk, __u32 *offset)
-+static void yaffs_AddrToChunk(yaffs_Device *dev, loff_t addr, int *chunkOut,
-+		__u32 *offsetOut)
- {
--	if(dev->chunkShift){
--		/* Easy-peasy power of 2 case */
--		*chunk  = (__u32)(addr >> dev->chunkShift);
--		*offset = (__u32)(addr & dev->chunkMask);
--	}
--	else if(dev->crumbsPerChunk)
--	{
--		/* Case where we're using "crumbs" */
--		*offset = (__u32)(addr & dev->crumbMask);
--		addr >>= dev->crumbShift;
--		*chunk = ((__u32)addr)/dev->crumbsPerChunk;
--		*offset += ((addr - (*chunk * dev->crumbsPerChunk)) << dev->crumbShift);
-+	int chunk;
-+	__u32 offset;
-+
-+	chunk  = (__u32)(addr >> dev->chunkShift);
-+
-+	if (dev->chunkDiv == 1) {
-+		/* easy power of 2 case */
-+		offset = (__u32)(addr & dev->chunkMask);
-+	} else {
-+		/* Non power-of-2 case */
-+
-+		loff_t chunkBase;
-+
-+		chunk /= dev->chunkDiv;
-+
-+		chunkBase = ((loff_t)chunk) * dev->nDataBytesPerChunk;
-+		offset = (__u32)(addr - chunkBase);
- 	}
--	else
--		YBUG();
-+
-+	*chunkOut = chunk;
-+	*offsetOut = offset;
- }
- 
--/* Function to return the number of shifts for a power of 2 greater than or equal
-- * to the given number
-+/* Function to return the number of shifts for a power of 2 greater than or
-+ * equal to the given number
-  * Note we don't try to cater for all possible numbers and this does not have to
-  * be hellishly efficient.
-  */
-@@ -153,13 +154,14 @@ static __u32 ShiftsGE(__u32 x)
- 
- 	nShifts = extraBits = 0;
- 
--	while(x>1){
--		if(x & 1) extraBits++;
--		x>>=1;
-+	while (x > 1) {
-+		if (x & 1)
-+			extraBits++;
-+		x >>= 1;
- 		nShifts++;
- 	}
- 
--	if(extraBits)
-+	if (extraBits)
- 		nShifts++;
- 
- 	return nShifts;
-@@ -168,16 +170,17 @@ static __u32 ShiftsGE(__u32 x)
- /* Function to return the number of shifts to get a 1 in bit 0
-  */
- 
--static __u32 ShiftDiv(__u32 x)
-+static __u32 Shifts(__u32 x)
- {
- 	int nShifts;
- 
- 	nShifts =  0;
- 
--	if(!x) return 0;
-+	if (!x)
-+		return 0;
- 
--	while( !(x&1)){
--		x>>=1;
-+	while (!(x&1)) {
-+		x >>= 1;
- 		nShifts++;
- 	}
- 
-@@ -195,21 +198,25 @@ static int yaffs_InitialiseTempBuffers(y
- 	int i;
- 	__u8 *buf = (__u8 *)1;
- 
--	memset(dev->tempBuffer,0,sizeof(dev->tempBuffer));
-+	memset(dev->tempBuffer, 0, sizeof(dev->tempBuffer));
- 
- 	for (i = 0; buf && i < YAFFS_N_TEMP_BUFFERS; i++) {
- 		dev->tempBuffer[i].line = 0;	/* not in use */
- 		dev->tempBuffer[i].buffer = buf =
--		    YMALLOC_DMA(dev->nDataBytesPerChunk);
-+		    YMALLOC_DMA(dev->totalBytesPerChunk);
- 	}
- 
- 	return buf ? YAFFS_OK : YAFFS_FAIL;
--
- }
- 
--static __u8 *yaffs_GetTempBuffer(yaffs_Device * dev, int lineNo)
-+__u8 *yaffs_GetTempBuffer(yaffs_Device *dev, int lineNo)
- {
- 	int i, j;
-+
-+	dev->tempInUse++;
-+	if (dev->tempInUse > dev->maxTemp)
-+		dev->maxTemp = dev->tempInUse;
-+
- 	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
- 		if (dev->tempBuffer[i].line == 0) {
- 			dev->tempBuffer[i].line = lineNo;
-@@ -227,9 +234,9 @@ static __u8 *yaffs_GetTempBuffer(yaffs_D
- 	T(YAFFS_TRACE_BUFFERS,
- 	  (TSTR("Out of temp buffers at line %d, other held by lines:"),
- 	   lineNo));
--	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
-+	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++)
- 		T(YAFFS_TRACE_BUFFERS, (TSTR(" %d "), dev->tempBuffer[i].line));
--	}
-+
- 	T(YAFFS_TRACE_BUFFERS, (TSTR(" " TENDSTR)));
- 
- 	/*
-@@ -242,10 +249,13 @@ static __u8 *yaffs_GetTempBuffer(yaffs_D
- 
- }
- 
--static void yaffs_ReleaseTempBuffer(yaffs_Device * dev, __u8 * buffer,
-+void yaffs_ReleaseTempBuffer(yaffs_Device *dev, __u8 *buffer,
- 				    int lineNo)
- {
- 	int i;
-+
-+	dev->tempInUse--;
-+
- 	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
- 		if (dev->tempBuffer[i].buffer == buffer) {
- 			dev->tempBuffer[i].line = 0;
-@@ -267,27 +277,26 @@ static void yaffs_ReleaseTempBuffer(yaff
- /*
-  * Determine if we have a managed buffer.
-  */
--int yaffs_IsManagedTempBuffer(yaffs_Device * dev, const __u8 * buffer)
-+int yaffs_IsManagedTempBuffer(yaffs_Device *dev, const __u8 *buffer)
- {
- 	int i;
-+
- 	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
- 		if (dev->tempBuffer[i].buffer == buffer)
- 			return 1;
-+	}
- 
-+	for (i = 0; i < dev->nShortOpCaches; i++) {
-+		if (dev->srCache[i].data == buffer)
-+			return 1;
- 	}
- 
--    for (i = 0; i < dev->nShortOpCaches; i++) {
--        if( dev->srCache[i].data == buffer )
--            return 1;
--
--    }
--
--    if (buffer == dev->checkpointBuffer)
--      return 1;
--
--    T(YAFFS_TRACE_ALWAYS,
--	  (TSTR("yaffs: unmaged buffer detected.\n" TENDSTR)));
--    return 0;
-+	if (buffer == dev->checkpointBuffer)
-+		return 1;
-+
-+	T(YAFFS_TRACE_ALWAYS,
-+		(TSTR("yaffs: unmaged buffer detected.\n" TENDSTR)));
-+	return 0;
- }
- 
- 
-@@ -296,62 +305,63 @@ int yaffs_IsManagedTempBuffer(yaffs_Devi
-  * Chunk bitmap manipulations
-  */
- 
--static Y_INLINE __u8 *yaffs_BlockBits(yaffs_Device * dev, int blk)
-+static Y_INLINE __u8 *yaffs_BlockBits(yaffs_Device *dev, int blk)
- {
- 	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
- 		T(YAFFS_TRACE_ERROR,
--		  (TSTR("**>> yaffs: BlockBits block %d is not valid" TENDSTR),
--		   blk));
-+			(TSTR("**>> yaffs: BlockBits block %d is not valid" TENDSTR),
-+			blk));
- 		YBUG();
- 	}
- 	return dev->chunkBits +
--	    (dev->chunkBitmapStride * (blk - dev->internalStartBlock));
-+		(dev->chunkBitmapStride * (blk - dev->internalStartBlock));
- }
- 
- static Y_INLINE void yaffs_VerifyChunkBitId(yaffs_Device *dev, int blk, int chunk)
- {
--	if(blk < dev->internalStartBlock || blk > dev->internalEndBlock ||
--	   chunk < 0 || chunk >= dev->nChunksPerBlock) {
--	   T(YAFFS_TRACE_ERROR,
--	    (TSTR("**>> yaffs: Chunk Id (%d:%d) invalid"TENDSTR),blk,chunk));
--	    YBUG();
-+	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock ||
-+			chunk < 0 || chunk >= dev->nChunksPerBlock) {
-+		T(YAFFS_TRACE_ERROR,
-+		(TSTR("**>> yaffs: Chunk Id (%d:%d) invalid"TENDSTR),
-+			blk, chunk));
-+		YBUG();
- 	}
- }
- 
--static Y_INLINE void yaffs_ClearChunkBits(yaffs_Device * dev, int blk)
-+static Y_INLINE void yaffs_ClearChunkBits(yaffs_Device *dev, int blk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 
- 	memset(blkBits, 0, dev->chunkBitmapStride);
- }
- 
--static Y_INLINE void yaffs_ClearChunkBit(yaffs_Device * dev, int blk, int chunk)
-+static Y_INLINE void yaffs_ClearChunkBit(yaffs_Device *dev, int blk, int chunk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 
--	yaffs_VerifyChunkBitId(dev,blk,chunk);
-+	yaffs_VerifyChunkBitId(dev, blk, chunk);
- 
- 	blkBits[chunk / 8] &= ~(1 << (chunk & 7));
- }
- 
--static Y_INLINE void yaffs_SetChunkBit(yaffs_Device * dev, int blk, int chunk)
-+static Y_INLINE void yaffs_SetChunkBit(yaffs_Device *dev, int blk, int chunk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 
--	yaffs_VerifyChunkBitId(dev,blk,chunk);
-+	yaffs_VerifyChunkBitId(dev, blk, chunk);
- 
- 	blkBits[chunk / 8] |= (1 << (chunk & 7));
- }
- 
--static Y_INLINE int yaffs_CheckChunkBit(yaffs_Device * dev, int blk, int chunk)
-+static Y_INLINE int yaffs_CheckChunkBit(yaffs_Device *dev, int blk, int chunk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
--	yaffs_VerifyChunkBitId(dev,blk,chunk);
-+	yaffs_VerifyChunkBitId(dev, blk, chunk);
- 
- 	return (blkBits[chunk / 8] & (1 << (chunk & 7))) ? 1 : 0;
- }
- 
--static Y_INLINE int yaffs_StillSomeChunkBits(yaffs_Device * dev, int blk)
-+static Y_INLINE int yaffs_StillSomeChunkBits(yaffs_Device *dev, int blk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 	int i;
-@@ -363,17 +373,17 @@ static Y_INLINE int yaffs_StillSomeChunk
- 	return 0;
- }
- 
--static int yaffs_CountChunkBits(yaffs_Device * dev, int blk)
-+static int yaffs_CountChunkBits(yaffs_Device *dev, int blk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 	int i;
- 	int n = 0;
- 	for (i = 0; i < dev->chunkBitmapStride; i++) {
- 		__u8 x = *blkBits;
--		while(x){
--			if(x & 1)
-+		while (x) {
-+			if (x & 1)
- 				n++;
--			x >>=1;
-+			x >>= 1;
- 		}
- 
- 		blkBits++;
-@@ -400,7 +410,7 @@ static int yaffs_SkipNANDVerification(ya
- 	return !(yaffs_traceMask & (YAFFS_TRACE_VERIFY_NAND));
- }
- 
--static const char * blockStateName[] = {
-+static const char *blockStateName[] = {
- "Unknown",
- "Needs scanning",
- "Scanning",
-@@ -413,64 +423,65 @@ static const char * blockStateName[] = {
- "Dead"
- };
- 
--static void yaffs_VerifyBlock(yaffs_Device *dev,yaffs_BlockInfo *bi,int n)
-+static void yaffs_VerifyBlock(yaffs_Device *dev, yaffs_BlockInfo *bi, int n)
- {
- 	int actuallyUsed;
- 	int inUse;
- 
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
- 	/* Report illegal runtime states */
--	if(bi->blockState <0 || bi->blockState >= YAFFS_NUMBER_OF_BLOCK_STATES)
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has undefined state %d"TENDSTR),n,bi->blockState));
-+	if (bi->blockState >= YAFFS_NUMBER_OF_BLOCK_STATES)
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has undefined state %d"TENDSTR), n, bi->blockState));
- 
--	switch(bi->blockState){
--	 case YAFFS_BLOCK_STATE_UNKNOWN:
--	 case YAFFS_BLOCK_STATE_SCANNING:
--	 case YAFFS_BLOCK_STATE_NEEDS_SCANNING:
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has bad run-state %s"TENDSTR),
--		n,blockStateName[bi->blockState]));
-+	switch (bi->blockState) {
-+	case YAFFS_BLOCK_STATE_UNKNOWN:
-+	case YAFFS_BLOCK_STATE_SCANNING:
-+	case YAFFS_BLOCK_STATE_NEEDS_SCANNING:
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has bad run-state %s"TENDSTR),
-+		n, blockStateName[bi->blockState]));
- 	}
- 
- 	/* Check pages in use and soft deletions are legal */
- 
- 	actuallyUsed = bi->pagesInUse - bi->softDeletions;
- 
--	if(bi->pagesInUse < 0 || bi->pagesInUse > dev->nChunksPerBlock ||
-+	if (bi->pagesInUse < 0 || bi->pagesInUse > dev->nChunksPerBlock ||
- 	   bi->softDeletions < 0 || bi->softDeletions > dev->nChunksPerBlock ||
- 	   actuallyUsed < 0 || actuallyUsed > dev->nChunksPerBlock)
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has illegal values pagesInUsed %d softDeletions %d"TENDSTR),
--		n,bi->pagesInUse,bi->softDeletions));
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has illegal values pagesInUsed %d softDeletions %d"TENDSTR),
-+		n, bi->pagesInUse, bi->softDeletions));
- 
- 
- 	/* Check chunk bitmap legal */
--	inUse = yaffs_CountChunkBits(dev,n);
--	if(inUse != bi->pagesInUse)
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has inconsistent values pagesInUse %d counted chunk bits %d"TENDSTR),
--			n,bi->pagesInUse,inUse));
-+	inUse = yaffs_CountChunkBits(dev, n);
-+	if (inUse != bi->pagesInUse)
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has inconsistent values pagesInUse %d counted chunk bits %d"TENDSTR),
-+			n, bi->pagesInUse, inUse));
- 
- 	/* Check that the sequence number is valid.
- 	 * Ten million is legal, but is very unlikely
- 	 */
--	if(dev->isYaffs2 &&
-+	if (dev->isYaffs2 &&
- 	   (bi->blockState == YAFFS_BLOCK_STATE_ALLOCATING || bi->blockState == YAFFS_BLOCK_STATE_FULL) &&
--	   (bi->sequenceNumber < YAFFS_LOWEST_SEQUENCE_NUMBER || bi->sequenceNumber > 10000000 ))
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has suspect sequence number of %d"TENDSTR),
--		n,bi->sequenceNumber));
--
-+	   (bi->sequenceNumber < YAFFS_LOWEST_SEQUENCE_NUMBER || bi->sequenceNumber > 10000000))
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has suspect sequence number of %d"TENDSTR),
-+		n, bi->sequenceNumber));
- }
- 
--static void yaffs_VerifyCollectedBlock(yaffs_Device *dev,yaffs_BlockInfo *bi,int n)
-+static void yaffs_VerifyCollectedBlock(yaffs_Device *dev, yaffs_BlockInfo *bi,
-+		int n)
- {
--	yaffs_VerifyBlock(dev,bi,n);
-+	yaffs_VerifyBlock(dev, bi, n);
- 
- 	/* After collection the block should be in the erased state */
--	/* TODO: This will need to change if we do partial gc */
-+	/* This will need to change if we do partial gc */
- 
--	if(bi->blockState != YAFFS_BLOCK_STATE_EMPTY){
--		T(YAFFS_TRACE_ERROR,(TSTR("Block %d is in state %d after gc, should be erased"TENDSTR),
--			n,bi->blockState));
-+	if (bi->blockState != YAFFS_BLOCK_STATE_COLLECTING &&
-+			bi->blockState != YAFFS_BLOCK_STATE_EMPTY) {
-+		T(YAFFS_TRACE_ERROR, (TSTR("Block %d is in state %d after gc, should be erased"TENDSTR),
-+			n, bi->blockState));
- 	}
- }
- 
-@@ -480,52 +491,49 @@ static void yaffs_VerifyBlocks(yaffs_Dev
- 	int nBlocksPerState[YAFFS_NUMBER_OF_BLOCK_STATES];
- 	int nIllegalBlockStates = 0;
- 
--
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
--	memset(nBlocksPerState,0,sizeof(nBlocksPerState));
--
-+	memset(nBlocksPerState, 0, sizeof(nBlocksPerState));
- 
--	for(i = dev->internalStartBlock; i <= dev->internalEndBlock; i++){
--		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
--		yaffs_VerifyBlock(dev,bi,i);
-+	for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
-+		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
-+		yaffs_VerifyBlock(dev, bi, i);
- 
--		if(bi->blockState >=0 && bi->blockState < YAFFS_NUMBER_OF_BLOCK_STATES)
-+		if (bi->blockState < YAFFS_NUMBER_OF_BLOCK_STATES)
- 			nBlocksPerState[bi->blockState]++;
- 		else
- 			nIllegalBlockStates++;
--
- 	}
- 
--	T(YAFFS_TRACE_VERIFY,(TSTR(""TENDSTR)));
--	T(YAFFS_TRACE_VERIFY,(TSTR("Block summary"TENDSTR)));
-+	T(YAFFS_TRACE_VERIFY, (TSTR(""TENDSTR)));
-+	T(YAFFS_TRACE_VERIFY, (TSTR("Block summary"TENDSTR)));
- 
--	T(YAFFS_TRACE_VERIFY,(TSTR("%d blocks have illegal states"TENDSTR),nIllegalBlockStates));
--	if(nBlocksPerState[YAFFS_BLOCK_STATE_ALLOCATING] > 1)
--		T(YAFFS_TRACE_VERIFY,(TSTR("Too many allocating blocks"TENDSTR)));
-+	T(YAFFS_TRACE_VERIFY, (TSTR("%d blocks have illegal states"TENDSTR), nIllegalBlockStates));
-+	if (nBlocksPerState[YAFFS_BLOCK_STATE_ALLOCATING] > 1)
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Too many allocating blocks"TENDSTR)));
- 
--	for(i = 0; i < YAFFS_NUMBER_OF_BLOCK_STATES; i++)
-+	for (i = 0; i < YAFFS_NUMBER_OF_BLOCK_STATES; i++)
- 		T(YAFFS_TRACE_VERIFY,
- 		  (TSTR("%s %d blocks"TENDSTR),
--		  blockStateName[i],nBlocksPerState[i]));
-+		  blockStateName[i], nBlocksPerState[i]));
- 
--	if(dev->blocksInCheckpoint != nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT])
-+	if (dev->blocksInCheckpoint != nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT])
- 		T(YAFFS_TRACE_VERIFY,
- 		 (TSTR("Checkpoint block count wrong dev %d count %d"TENDSTR),
- 		 dev->blocksInCheckpoint, nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT]));
- 
--	if(dev->nErasedBlocks != nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY])
-+	if (dev->nErasedBlocks != nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY])
- 		T(YAFFS_TRACE_VERIFY,
- 		 (TSTR("Erased block count wrong dev %d count %d"TENDSTR),
- 		 dev->nErasedBlocks, nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY]));
- 
--	if(nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING] > 1)
-+	if (nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING] > 1)
- 		T(YAFFS_TRACE_VERIFY,
- 		 (TSTR("Too many collecting blocks %d (max is 1)"TENDSTR),
- 		 nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING]));
- 
--	T(YAFFS_TRACE_VERIFY,(TSTR(""TENDSTR)));
-+	T(YAFFS_TRACE_VERIFY, (TSTR(""TENDSTR)));
- 
- }
- 
-@@ -535,26 +543,26 @@ static void yaffs_VerifyBlocks(yaffs_Dev
-  */
- static void yaffs_VerifyObjectHeader(yaffs_Object *obj, yaffs_ObjectHeader *oh, yaffs_ExtendedTags *tags, int parentCheck)
- {
--	if(yaffs_SkipVerification(obj->myDev))
-+	if (obj && yaffs_SkipVerification(obj->myDev))
- 		return;
- 
--	if(!(tags && obj && oh)){
--	 	T(YAFFS_TRACE_VERIFY,
--		 		(TSTR("Verifying object header tags %x obj %x oh %x"TENDSTR),
--		 		(__u32)tags,(__u32)obj,(__u32)oh));
-+	if (!(tags && obj && oh)) {
-+		T(YAFFS_TRACE_VERIFY,
-+				(TSTR("Verifying object header tags %x obj %x oh %x"TENDSTR),
-+				(__u32)tags, (__u32)obj, (__u32)oh));
- 		return;
- 	}
- 
--	if(oh->type <= YAFFS_OBJECT_TYPE_UNKNOWN ||
--	   oh->type > YAFFS_OBJECT_TYPE_MAX)
--	 	T(YAFFS_TRACE_VERIFY,
--		 (TSTR("Obj %d header type is illegal value 0x%x"TENDSTR),
--		 tags->objectId, oh->type));
--
--	if(tags->objectId != obj->objectId)
--	 	T(YAFFS_TRACE_VERIFY,
--		 (TSTR("Obj %d header mismatch objectId %d"TENDSTR),
--		 tags->objectId, obj->objectId));
-+	if (oh->type <= YAFFS_OBJECT_TYPE_UNKNOWN ||
-+			oh->type > YAFFS_OBJECT_TYPE_MAX)
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d header type is illegal value 0x%x"TENDSTR),
-+			tags->objectId, oh->type));
-+
-+	if (tags->objectId != obj->objectId)
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d header mismatch objectId %d"TENDSTR),
-+			tags->objectId, obj->objectId));
- 
- 
- 	/*
-@@ -563,46 +571,43 @@ static void yaffs_VerifyObjectHeader(yaf
- 	 * Tests do not apply to the root object.
- 	 */
- 
--	if(parentCheck && tags->objectId > 1 && !obj->parent)
--	 	T(YAFFS_TRACE_VERIFY,
--		 (TSTR("Obj %d header mismatch parentId %d obj->parent is NULL"TENDSTR),
--	 	 tags->objectId, oh->parentObjectId));
--
--
--	if(parentCheck && obj->parent &&
--	   oh->parentObjectId != obj->parent->objectId &&
--	   (oh->parentObjectId != YAFFS_OBJECTID_UNLINKED ||
--	    obj->parent->objectId != YAFFS_OBJECTID_DELETED))
--	 	T(YAFFS_TRACE_VERIFY,
--		 (TSTR("Obj %d header mismatch parentId %d parentObjectId %d"TENDSTR),
--	 	 tags->objectId, oh->parentObjectId, obj->parent->objectId));
-+	if (parentCheck && tags->objectId > 1 && !obj->parent)
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d header mismatch parentId %d obj->parent is NULL"TENDSTR),
-+			tags->objectId, oh->parentObjectId));
- 
-+	if (parentCheck && obj->parent &&
-+			oh->parentObjectId != obj->parent->objectId &&
-+			(oh->parentObjectId != YAFFS_OBJECTID_UNLINKED ||
-+			obj->parent->objectId != YAFFS_OBJECTID_DELETED))
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d header mismatch parentId %d parentObjectId %d"TENDSTR),
-+			tags->objectId, oh->parentObjectId, obj->parent->objectId));
- 
--	if(tags->objectId > 1 && oh->name[0] == 0) /* Null name */
-+	if (tags->objectId > 1 && oh->name[0] == 0) /* Null name */
- 		T(YAFFS_TRACE_VERIFY,
--		(TSTR("Obj %d header name is NULL"TENDSTR),
--		 obj->objectId));
-+			(TSTR("Obj %d header name is NULL"TENDSTR),
-+			obj->objectId));
- 
--	if(tags->objectId > 1 && ((__u8)(oh->name[0])) == 0xff) /* Trashed name */
-+	if (tags->objectId > 1 && ((__u8)(oh->name[0])) == 0xff) /* Trashed name */
- 		T(YAFFS_TRACE_VERIFY,
--		(TSTR("Obj %d header name is 0xFF"TENDSTR),
--		 obj->objectId));
-+			(TSTR("Obj %d header name is 0xFF"TENDSTR),
-+			obj->objectId));
- }
- 
- 
- 
--static int yaffs_VerifyTnodeWorker(yaffs_Object * obj, yaffs_Tnode * tn,
--				  	__u32 level, int chunkOffset)
-+static int yaffs_VerifyTnodeWorker(yaffs_Object *obj, yaffs_Tnode *tn,
-+					__u32 level, int chunkOffset)
- {
- 	int i;
- 	yaffs_Device *dev = obj->myDev;
- 	int ok = 1;
--	int nTnodeBytes = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
- 
- 	if (tn) {
- 		if (level > 0) {
- 
--			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++){
-+			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++) {
- 				if (tn->internal[i]) {
- 					ok = yaffs_VerifyTnodeWorker(obj,
- 							tn->internal[i],
-@@ -611,20 +616,19 @@ static int yaffs_VerifyTnodeWorker(yaffs
- 				}
- 			}
- 		} else if (level == 0) {
--			int i;
- 			yaffs_ExtendedTags tags;
- 			__u32 objectId = obj->objectId;
- 
- 			chunkOffset <<=  YAFFS_TNODES_LEVEL0_BITS;
- 
--			for(i = 0; i < YAFFS_NTNODES_LEVEL0; i++){
--				__u32 theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
-+			for (i = 0; i < YAFFS_NTNODES_LEVEL0; i++) {
-+				__u32 theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
- 
--				if(theChunk > 0){
-+				if (theChunk > 0) {
- 					/* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),tags.objectId,tags.chunkId,theChunk)); */
--					yaffs_ReadChunkWithTagsFromNAND(dev,theChunk,NULL, &tags);
--					if(tags.objectId != objectId || tags.chunkId != chunkOffset){
--						T(~0,(TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
-+					yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL, &tags);
-+					if (tags.objectId != objectId || tags.chunkId != chunkOffset) {
-+						T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
- 							objectId, chunkOffset, theChunk,
- 							tags.objectId, tags.chunkId));
- 					}
-@@ -646,13 +650,15 @@ static void yaffs_VerifyFile(yaffs_Objec
- 	__u32 lastChunk;
- 	__u32 x;
- 	__u32 i;
--	int ok;
- 	yaffs_Device *dev;
- 	yaffs_ExtendedTags tags;
- 	yaffs_Tnode *tn;
- 	__u32 objectId;
- 
--	if(obj && yaffs_SkipVerification(obj->myDev))
-+	if (!obj)
-+		return;
-+
-+	if (yaffs_SkipVerification(obj->myDev))
- 		return;
- 
- 	dev = obj->myDev;
-@@ -662,17 +668,17 @@ static void yaffs_VerifyFile(yaffs_Objec
- 	lastChunk =  obj->variant.fileVariant.fileSize / dev->nDataBytesPerChunk + 1;
- 	x = lastChunk >> YAFFS_TNODES_LEVEL0_BITS;
- 	requiredTallness = 0;
--	while (x> 0) {
-+	while (x > 0) {
- 		x >>= YAFFS_TNODES_INTERNAL_BITS;
- 		requiredTallness++;
- 	}
- 
- 	actualTallness = obj->variant.fileVariant.topLevel;
- 
--	if(requiredTallness > actualTallness )
-+	if (requiredTallness > actualTallness)
- 		T(YAFFS_TRACE_VERIFY,
- 		(TSTR("Obj %d had tnode tallness %d, needs to be %d"TENDSTR),
--		 obj->objectId,actualTallness, requiredTallness));
-+		 obj->objectId, actualTallness, requiredTallness));
- 
- 
- 	/* Check that the chunks in the tnode tree are all correct.
-@@ -680,39 +686,31 @@ static void yaffs_VerifyFile(yaffs_Objec
- 	 * checking the tags for every chunk match.
- 	 */
- 
--	if(yaffs_SkipNANDVerification(dev))
-+	if (yaffs_SkipNANDVerification(dev))
- 		return;
- 
--	for(i = 1; i <= lastChunk; i++){
--		tn = yaffs_FindLevel0Tnode(dev, &obj->variant.fileVariant,i);
-+	for (i = 1; i <= lastChunk; i++) {
-+		tn = yaffs_FindLevel0Tnode(dev, &obj->variant.fileVariant, i);
- 
- 		if (tn) {
--			__u32 theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
--			if(theChunk > 0){
-+			__u32 theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
-+			if (theChunk > 0) {
- 				/* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),objectId,i,theChunk)); */
--				yaffs_ReadChunkWithTagsFromNAND(dev,theChunk,NULL, &tags);
--				if(tags.objectId != objectId || tags.chunkId != i){
--					T(~0,(TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
-+				yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL, &tags);
-+				if (tags.objectId != objectId || tags.chunkId != i) {
-+					T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
- 						objectId, i, theChunk,
- 						tags.objectId, tags.chunkId));
- 				}
- 			}
- 		}
--
- 	}
--
- }
- 
--static void yaffs_VerifyDirectory(yaffs_Object *obj)
--{
--	if(obj && yaffs_SkipVerification(obj->myDev))
--		return;
--
--}
- 
- static void yaffs_VerifyHardLink(yaffs_Object *obj)
- {
--	if(obj && yaffs_SkipVerification(obj->myDev))
-+	if (obj && yaffs_SkipVerification(obj->myDev))
- 		return;
- 
- 	/* Verify sane equivalent object */
-@@ -720,7 +718,7 @@ static void yaffs_VerifyHardLink(yaffs_O
- 
- static void yaffs_VerifySymlink(yaffs_Object *obj)
- {
--	if(obj && yaffs_SkipVerification(obj->myDev))
-+	if (obj && yaffs_SkipVerification(obj->myDev))
- 		return;
- 
- 	/* Verify symlink string */
-@@ -728,7 +726,7 @@ static void yaffs_VerifySymlink(yaffs_Ob
- 
- static void yaffs_VerifySpecial(yaffs_Object *obj)
- {
--	if(obj && yaffs_SkipVerification(obj->myDev))
-+	if (obj && yaffs_SkipVerification(obj->myDev))
- 		return;
- }
- 
-@@ -740,14 +738,19 @@ static void yaffs_VerifyObject(yaffs_Obj
- 	__u32 chunkMax;
- 
- 	__u32 chunkIdOk;
--	__u32 chunkIsLive;
-+	__u32 chunkInRange;
-+	__u32 chunkShouldNotBeDeleted;
-+	__u32 chunkValid;
-+
-+	if (!obj)
-+		return;
- 
--	if(!obj)
-+	if (obj->beingCreated)
- 		return;
- 
- 	dev = obj->myDev;
- 
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
- 	/* Check sane object header chunk */
-@@ -755,50 +758,54 @@ static void yaffs_VerifyObject(yaffs_Obj
- 	chunkMin = dev->internalStartBlock * dev->nChunksPerBlock;
- 	chunkMax = (dev->internalEndBlock+1) * dev->nChunksPerBlock - 1;
- 
--	chunkIdOk = (obj->chunkId >= chunkMin && obj->chunkId <= chunkMax);
--	chunkIsLive = chunkIdOk &&
-+	chunkInRange = (((unsigned)(obj->hdrChunk)) >= chunkMin && ((unsigned)(obj->hdrChunk)) <= chunkMax);
-+	chunkIdOk = chunkInRange || obj->hdrChunk == 0;
-+	chunkValid = chunkInRange &&
- 			yaffs_CheckChunkBit(dev,
--					    obj->chunkId / dev->nChunksPerBlock,
--					    obj->chunkId % dev->nChunksPerBlock);
--	if(!obj->fake &&
--	    (!chunkIdOk || !chunkIsLive)) {
--	   T(YAFFS_TRACE_VERIFY,
--	   (TSTR("Obj %d has chunkId %d %s %s"TENDSTR),
--	   obj->objectId,obj->chunkId,
--	   chunkIdOk ? "" : ",out of range",
--	   chunkIsLive || !chunkIdOk ? "" : ",marked as deleted"));
-+					obj->hdrChunk / dev->nChunksPerBlock,
-+					obj->hdrChunk % dev->nChunksPerBlock);
-+	chunkShouldNotBeDeleted = chunkInRange && !chunkValid;
-+
-+	if (!obj->fake &&
-+			(!chunkIdOk || chunkShouldNotBeDeleted)) {
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d has chunkId %d %s %s"TENDSTR),
-+			obj->objectId, obj->hdrChunk,
-+			chunkIdOk ? "" : ",out of range",
-+			chunkShouldNotBeDeleted ? ",marked as deleted" : ""));
- 	}
- 
--	if(chunkIdOk && chunkIsLive &&!yaffs_SkipNANDVerification(dev)) {
-+	if (chunkValid && !yaffs_SkipNANDVerification(dev)) {
- 		yaffs_ExtendedTags tags;
- 		yaffs_ObjectHeader *oh;
--		__u8 *buffer = yaffs_GetTempBuffer(dev,__LINE__);
-+		__u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
- 
- 		oh = (yaffs_ObjectHeader *)buffer;
- 
--		yaffs_ReadChunkWithTagsFromNAND(dev, obj->chunkId,buffer, &tags);
-+		yaffs_ReadChunkWithTagsFromNAND(dev, obj->hdrChunk, buffer,
-+				&tags);
- 
--		yaffs_VerifyObjectHeader(obj,oh,&tags,1);
-+		yaffs_VerifyObjectHeader(obj, oh, &tags, 1);
- 
--		yaffs_ReleaseTempBuffer(dev,buffer,__LINE__);
-+		yaffs_ReleaseTempBuffer(dev, buffer, __LINE__);
- 	}
- 
- 	/* Verify it has a parent */
--	if(obj && !obj->fake &&
--	   (!obj->parent || obj->parent->myDev != dev)){
--	   T(YAFFS_TRACE_VERIFY,
--	   (TSTR("Obj %d has parent pointer %p which does not look like an object"TENDSTR),
--	   obj->objectId,obj->parent));
-+	if (obj && !obj->fake &&
-+			(!obj->parent || obj->parent->myDev != dev)) {
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d has parent pointer %p which does not look like an object"TENDSTR),
-+			obj->objectId, obj->parent));
- 	}
- 
- 	/* Verify parent is a directory */
--	if(obj->parent && obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY){
--	   T(YAFFS_TRACE_VERIFY,
--	   (TSTR("Obj %d's parent is not a directory (type %d)"TENDSTR),
--	   obj->objectId,obj->parent->variantType));
-+	if (obj->parent && obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d's parent is not a directory (type %d)"TENDSTR),
-+			obj->objectId, obj->parent->variantType));
- 	}
- 
--	switch(obj->variantType){
-+	switch (obj->variantType) {
- 	case YAFFS_OBJECT_TYPE_FILE:
- 		yaffs_VerifyFile(obj);
- 		break;
-@@ -818,33 +825,30 @@ static void yaffs_VerifyObject(yaffs_Obj
- 	default:
- 		T(YAFFS_TRACE_VERIFY,
- 		(TSTR("Obj %d has illegaltype %d"TENDSTR),
--		obj->objectId,obj->variantType));
-+		obj->objectId, obj->variantType));
- 		break;
- 	}
--
--
- }
- 
- static void yaffs_VerifyObjects(yaffs_Device *dev)
- {
- 	yaffs_Object *obj;
- 	int i;
--	struct list_head *lh;
-+	struct ylist_head *lh;
- 
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
- 	/* Iterate through the objects in each hash entry */
- 
--	 for(i = 0; i <  YAFFS_NOBJECT_BUCKETS; i++){
--	 	list_for_each(lh, &dev->objectBucket[i].list) {
-+	for (i = 0; i <  YAFFS_NOBJECT_BUCKETS; i++) {
-+		ylist_for_each(lh, &dev->objectBucket[i].list) {
- 			if (lh) {
--				obj = list_entry(lh, yaffs_Object, hashLink);
-+				obj = ylist_entry(lh, yaffs_Object, hashLink);
- 				yaffs_VerifyObject(obj);
- 			}
- 		}
--	 }
--
-+	}
- }
- 
- 
-@@ -855,19 +859,20 @@ static void yaffs_VerifyObjects(yaffs_De
- static Y_INLINE int yaffs_HashFunction(int n)
- {
- 	n = abs(n);
--	return (n % YAFFS_NOBJECT_BUCKETS);
-+	return n % YAFFS_NOBJECT_BUCKETS;
- }
- 
- /*
-- * Access functions to useful fake objects
-+ * Access functions to useful fake objects.
-+ * Note that root might have a presence in NAND if permissions are set.
-  */
- 
--yaffs_Object *yaffs_Root(yaffs_Device * dev)
-+yaffs_Object *yaffs_Root(yaffs_Device *dev)
- {
- 	return dev->rootDir;
- }
- 
--yaffs_Object *yaffs_LostNFound(yaffs_Device * dev)
-+yaffs_Object *yaffs_LostNFound(yaffs_Device *dev)
- {
- 	return dev->lostNFoundDir;
- }
-@@ -877,7 +882,7 @@ yaffs_Object *yaffs_LostNFound(yaffs_Dev
-  *  Erased NAND checking functions
-  */
- 
--int yaffs_CheckFF(__u8 * buffer, int nBytes)
-+int yaffs_CheckFF(__u8 *buffer, int nBytes)
- {
- 	/* Horrible, slow implementation */
- 	while (nBytes--) {
-@@ -889,9 +894,8 @@ int yaffs_CheckFF(__u8 * buffer, int nBy
- }
- 
- static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
--				  int chunkInNAND)
-+				int chunkInNAND)
- {
--
- 	int retval = YAFFS_OK;
- 	__u8 *data = yaffs_GetTempBuffer(dev, __LINE__);
- 	yaffs_ExtendedTags tags;
-@@ -899,10 +903,9 @@ static int yaffs_CheckChunkErased(struct
- 
- 	result = yaffs_ReadChunkWithTagsFromNAND(dev, chunkInNAND, data, &tags);
- 
--	if(tags.eccResult > YAFFS_ECC_RESULT_NO_ERROR)
-+	if (tags.eccResult > YAFFS_ECC_RESULT_NO_ERROR)
- 		retval = YAFFS_FAIL;
- 
--
- 	if (!yaffs_CheckFF(data, dev->nDataBytesPerChunk) || tags.chunkUsed) {
- 		T(YAFFS_TRACE_NANDACCESS,
- 		  (TSTR("Chunk %d not erased" TENDSTR), chunkInNAND));
-@@ -915,11 +918,10 @@ static int yaffs_CheckChunkErased(struct
- 
- }
- 
--
- static int yaffs_WriteNewChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev,
--					     const __u8 * data,
--					     yaffs_ExtendedTags * tags,
--					     int useReserve)
-+					const __u8 *data,
-+					yaffs_ExtendedTags *tags,
-+					int useReserve)
- {
- 	int attempts = 0;
- 	int writeOk = 0;
-@@ -972,7 +974,7 @@ static int yaffs_WriteNewChunkWithTagsTo
- 			erasedOk = yaffs_CheckChunkErased(dev, chunk);
- 			if (erasedOk != YAFFS_OK) {
- 				T(YAFFS_TRACE_ERROR,
--				(TSTR ("**>> yaffs chunk %d was not erased"
-+				(TSTR("**>> yaffs chunk %d was not erased"
- 				TENDSTR), chunk));
- 
- 				/* try another chunk */
-@@ -992,7 +994,11 @@ static int yaffs_WriteNewChunkWithTagsTo
- 		/* Copy the data into the robustification buffer */
- 		yaffs_HandleWriteChunkOk(dev, chunk, data, tags);
- 
--	} while (writeOk != YAFFS_OK && attempts < yaffs_wr_attempts);
-+	} while (writeOk != YAFFS_OK &&
-+		(yaffs_wr_attempts <= 0 || attempts <= yaffs_wr_attempts));
-+
-+	if (!writeOk)
-+		chunk = -1;
- 
- 	if (attempts > 1) {
- 		T(YAFFS_TRACE_ERROR,
-@@ -1009,13 +1015,35 @@ static int yaffs_WriteNewChunkWithTagsTo
-  * Block retiring for handling a broken block.
-  */
- 
--static void yaffs_RetireBlock(yaffs_Device * dev, int blockInNAND)
-+static void yaffs_RetireBlock(yaffs_Device *dev, int blockInNAND)
- {
- 	yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockInNAND);
- 
- 	yaffs_InvalidateCheckpoint(dev);
- 
--	yaffs_MarkBlockBad(dev, blockInNAND);
-+	if (yaffs_MarkBlockBad(dev, blockInNAND) != YAFFS_OK) {
-+		if (yaffs_EraseBlockInNAND(dev, blockInNAND) != YAFFS_OK) {
-+			T(YAFFS_TRACE_ALWAYS, (TSTR(
-+				"yaffs: Failed to mark bad and erase block %d"
-+				TENDSTR), blockInNAND));
-+		} else {
-+			yaffs_ExtendedTags tags;
-+			int chunkId = blockInNAND * dev->nChunksPerBlock;
-+
-+			__u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
-+
-+			memset(buffer, 0xff, dev->nDataBytesPerChunk);
-+			yaffs_InitialiseTags(&tags);
-+			tags.sequenceNumber = YAFFS_SEQUENCE_BAD_BLOCK;
-+			if (dev->writeChunkWithTagsToNAND(dev, chunkId -
-+				dev->chunkOffset, buffer, &tags) != YAFFS_OK)
-+				T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: Failed to "
-+					TCONT("write bad block marker to block %d")
-+					TENDSTR), blockInNAND));
-+
-+			yaffs_ReleaseTempBuffer(dev, buffer, __LINE__);
-+		}
-+	}
- 
- 	bi->blockState = YAFFS_BLOCK_STATE_DEAD;
- 	bi->gcPrioritise = 0;
-@@ -1029,49 +1057,45 @@ static void yaffs_RetireBlock(yaffs_Devi
-  *
-  */
- 
--static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
--				     const __u8 * data,
--				     const yaffs_ExtendedTags * tags)
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+				const __u8 *data,
-+				const yaffs_ExtendedTags *tags)
- {
- }
- 
--static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
--				    const yaffs_ExtendedTags * tags)
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+				const yaffs_ExtendedTags *tags)
- {
- }
- 
- void yaffs_HandleChunkError(yaffs_Device *dev, yaffs_BlockInfo *bi)
- {
--	if(!bi->gcPrioritise){
-+	if (!bi->gcPrioritise) {
- 		bi->gcPrioritise = 1;
- 		dev->hasPendingPrioritisedGCs = 1;
--		bi->chunkErrorStrikes ++;
-+		bi->chunkErrorStrikes++;
- 
--		if(bi->chunkErrorStrikes > 3){
-+		if (bi->chunkErrorStrikes > 3) {
- 			bi->needsRetiring = 1; /* Too many stikes, so retire this */
- 			T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: Block struck out" TENDSTR)));
- 
- 		}
--
- 	}
- }
- 
--static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND, int erasedOk)
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND,
-+		int erasedOk)
- {
--
- 	int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
- 	yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockInNAND);
- 
--	yaffs_HandleChunkError(dev,bi);
-+	yaffs_HandleChunkError(dev, bi);
- 
--
--	if(erasedOk ) {
-+	if (erasedOk) {
- 		/* Was an actual write failure, so mark the block for retirement  */
- 		bi->needsRetiring = 1;
- 		T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
- 		  (TSTR("**>> Block %d needs retiring" TENDSTR), blockInNAND));
--
--
- 	}
- 
- 	/* Delete the chunk */
-@@ -1081,12 +1105,12 @@ static void yaffs_HandleWriteChunkError(
- 
- /*---------------- Name handling functions ------------*/
- 
--static __u16 yaffs_CalcNameSum(const YCHAR * name)
-+static __u16 yaffs_CalcNameSum(const YCHAR *name)
- {
- 	__u16 sum = 0;
- 	__u16 i = 1;
- 
--	YUCHAR *bname = (YUCHAR *) name;
-+	const YUCHAR *bname = (const YUCHAR *) name;
- 	if (bname) {
- 		while ((*bname) && (i < (YAFFS_MAX_NAME_LENGTH/2))) {
- 
-@@ -1102,14 +1126,14 @@ static __u16 yaffs_CalcNameSum(const YCH
- 	return sum;
- }
- 
--static void yaffs_SetObjectName(yaffs_Object * obj, const YCHAR * name)
-+static void yaffs_SetObjectName(yaffs_Object *obj, const YCHAR *name)
- {
- #ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
--	if (name && yaffs_strlen(name) <= YAFFS_SHORT_NAME_LENGTH) {
-+	memset(obj->shortName, 0, sizeof(YCHAR) * (YAFFS_SHORT_NAME_LENGTH+1));
-+	if (name && yaffs_strlen(name) <= YAFFS_SHORT_NAME_LENGTH)
- 		yaffs_strcpy(obj->shortName, name);
--	} else {
-+	else
- 		obj->shortName[0] = _Y('\0');
--	}
- #endif
- 	obj->sum = yaffs_CalcNameSum(name);
- }
-@@ -1126,7 +1150,7 @@ static void yaffs_SetObjectName(yaffs_Ob
-  * Don't use this function directly
-  */
- 
--static int yaffs_CreateTnodes(yaffs_Device * dev, int nTnodes)
-+static int yaffs_CreateTnodes(yaffs_Device *dev, int nTnodes)
- {
- 	int i;
- 	int tnodeSize;
-@@ -1143,6 +1167,9 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 	 * Must be a multiple of 32-bits  */
- 	tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
- 
-+	if (tnodeSize < sizeof(yaffs_Tnode))
-+		tnodeSize = sizeof(yaffs_Tnode);
-+
- 	/* make these things */
- 
- 	newTnodes = YMALLOC(nTnodes * tnodeSize);
-@@ -1150,7 +1177,7 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 
- 	if (!newTnodes) {
- 		T(YAFFS_TRACE_ERROR,
--		  (TSTR("yaffs: Could not allocate Tnodes" TENDSTR)));
-+			(TSTR("yaffs: Could not allocate Tnodes" TENDSTR)));
- 		return YAFFS_FAIL;
- 	}
- 
-@@ -1170,7 +1197,7 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 	dev->freeTnodes = newTnodes;
- #else
- 	/* New hookup for wide tnodes */
--	for(i = 0; i < nTnodes -1; i++) {
-+	for (i = 0; i < nTnodes - 1; i++) {
- 		curr = (yaffs_Tnode *) &mem[i * tnodeSize];
- 		next = (yaffs_Tnode *) &mem[(i+1) * tnodeSize];
- 		curr->internal[0] = next;
-@@ -1197,7 +1224,6 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 		  (TSTR
- 		   ("yaffs: Could not add tnodes to management list" TENDSTR)));
- 		   return YAFFS_FAIL;
--
- 	} else {
- 		tnl->tnodes = newTnodes;
- 		tnl->next = dev->allocatedTnodeList;
-@@ -1211,14 +1237,13 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 
- /* GetTnode gets us a clean tnode. Tries to make allocate more if we run out */
- 
--static yaffs_Tnode *yaffs_GetTnodeRaw(yaffs_Device * dev)
-+static yaffs_Tnode *yaffs_GetTnodeRaw(yaffs_Device *dev)
- {
- 	yaffs_Tnode *tn = NULL;
- 
- 	/* If there are none left make more */
--	if (!dev->freeTnodes) {
-+	if (!dev->freeTnodes)
- 		yaffs_CreateTnodes(dev, YAFFS_ALLOCATION_NTNODES);
--	}
- 
- 	if (dev->freeTnodes) {
- 		tn = dev->freeTnodes;
-@@ -1233,21 +1258,27 @@ static yaffs_Tnode *yaffs_GetTnodeRaw(ya
- 		dev->nFreeTnodes--;
- 	}
- 
-+	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
-+
- 	return tn;
- }
- 
--static yaffs_Tnode *yaffs_GetTnode(yaffs_Device * dev)
-+static yaffs_Tnode *yaffs_GetTnode(yaffs_Device *dev)
- {
- 	yaffs_Tnode *tn = yaffs_GetTnodeRaw(dev);
-+	int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
- 
--	if(tn)
--		memset(tn, 0, (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
-+	if (tnodeSize < sizeof(yaffs_Tnode))
-+		tnodeSize = sizeof(yaffs_Tnode);
-+
-+	if (tn)
-+		memset(tn, 0, tnodeSize);
- 
- 	return tn;
- }
- 
- /* FreeTnode frees up a tnode and puts it back on the free list */
--static void yaffs_FreeTnode(yaffs_Device * dev, yaffs_Tnode * tn)
-+static void yaffs_FreeTnode(yaffs_Device *dev, yaffs_Tnode *tn)
- {
- 	if (tn) {
- #ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG
-@@ -1262,9 +1293,10 @@ static void yaffs_FreeTnode(yaffs_Device
- 		dev->freeTnodes = tn;
- 		dev->nFreeTnodes++;
- 	}
-+	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
- }
- 
--static void yaffs_DeinitialiseTnodes(yaffs_Device * dev)
-+static void yaffs_DeinitialiseTnodes(yaffs_Device *dev)
- {
- 	/* Free the list of allocated tnodes */
- 	yaffs_TnodeList *tmp;
-@@ -1282,71 +1314,72 @@ static void yaffs_DeinitialiseTnodes(yaf
- 	dev->nFreeTnodes = 0;
- }
- 
--static void yaffs_InitialiseTnodes(yaffs_Device * dev)
-+static void yaffs_InitialiseTnodes(yaffs_Device *dev)
- {
- 	dev->allocatedTnodeList = NULL;
- 	dev->freeTnodes = NULL;
- 	dev->nFreeTnodes = 0;
- 	dev->nTnodesCreated = 0;
--
- }
- 
- 
--void yaffs_PutLevel0Tnode(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos, unsigned val)
-+void yaffs_PutLevel0Tnode(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos,
-+		unsigned val)
- {
--  __u32 *map = (__u32 *)tn;
--  __u32 bitInMap;
--  __u32 bitInWord;
--  __u32 wordInMap;
--  __u32 mask;
-+	__u32 *map = (__u32 *)tn;
-+	__u32 bitInMap;
-+	__u32 bitInWord;
-+	__u32 wordInMap;
-+	__u32 mask;
- 
--  pos &= YAFFS_TNODES_LEVEL0_MASK;
--  val >>= dev->chunkGroupBits;
-+	pos &= YAFFS_TNODES_LEVEL0_MASK;
-+	val >>= dev->chunkGroupBits;
- 
--  bitInMap = pos * dev->tnodeWidth;
--  wordInMap = bitInMap /32;
--  bitInWord = bitInMap & (32 -1);
-+	bitInMap = pos * dev->tnodeWidth;
-+	wordInMap = bitInMap / 32;
-+	bitInWord = bitInMap & (32 - 1);
- 
--  mask = dev->tnodeMask << bitInWord;
-+	mask = dev->tnodeMask << bitInWord;
- 
--  map[wordInMap] &= ~mask;
--  map[wordInMap] |= (mask & (val << bitInWord));
-+	map[wordInMap] &= ~mask;
-+	map[wordInMap] |= (mask & (val << bitInWord));
- 
--  if(dev->tnodeWidth > (32-bitInWord)) {
--    bitInWord = (32 - bitInWord);
--    wordInMap++;;
--    mask = dev->tnodeMask >> (/*dev->tnodeWidth -*/ bitInWord);
--    map[wordInMap] &= ~mask;
--    map[wordInMap] |= (mask & (val >> bitInWord));
--  }
-+	if (dev->tnodeWidth > (32 - bitInWord)) {
-+		bitInWord = (32 - bitInWord);
-+		wordInMap++;;
-+		mask = dev->tnodeMask >> (/*dev->tnodeWidth -*/ bitInWord);
-+		map[wordInMap] &= ~mask;
-+		map[wordInMap] |= (mask & (val >> bitInWord));
-+	}
- }
- 
--static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos)
-+static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn,
-+		unsigned pos)
- {
--  __u32 *map = (__u32 *)tn;
--  __u32 bitInMap;
--  __u32 bitInWord;
--  __u32 wordInMap;
--  __u32 val;
-+	__u32 *map = (__u32 *)tn;
-+	__u32 bitInMap;
-+	__u32 bitInWord;
-+	__u32 wordInMap;
-+	__u32 val;
- 
--  pos &= YAFFS_TNODES_LEVEL0_MASK;
-+	pos &= YAFFS_TNODES_LEVEL0_MASK;
- 
--  bitInMap = pos * dev->tnodeWidth;
--  wordInMap = bitInMap /32;
--  bitInWord = bitInMap & (32 -1);
-+	bitInMap = pos * dev->tnodeWidth;
-+	wordInMap = bitInMap / 32;
-+	bitInWord = bitInMap & (32 - 1);
- 
--  val = map[wordInMap] >> bitInWord;
-+	val = map[wordInMap] >> bitInWord;
- 
--  if(dev->tnodeWidth > (32-bitInWord)) {
--    bitInWord = (32 - bitInWord);
--    wordInMap++;;
--    val |= (map[wordInMap] << bitInWord);
--  }
-+	if	(dev->tnodeWidth > (32 - bitInWord)) {
-+		bitInWord = (32 - bitInWord);
-+		wordInMap++;;
-+		val |= (map[wordInMap] << bitInWord);
-+	}
- 
--  val &= dev->tnodeMask;
--  val <<= dev->chunkGroupBits;
-+	val &= dev->tnodeMask;
-+	val <<= dev->chunkGroupBits;
- 
--  return val;
-+	return val;
- }
- 
- /* ------------------- End of individual tnode manipulation -----------------*/
-@@ -1357,24 +1390,21 @@ static __u32 yaffs_GetChunkGroupBase(yaf
-  */
- 
- /* FindLevel0Tnode finds the level 0 tnode, if one exists. */
--static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device * dev,
--					  yaffs_FileStructure * fStruct,
--					  __u32 chunkId)
-+static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev,
-+					yaffs_FileStructure *fStruct,
-+					__u32 chunkId)
- {
--
- 	yaffs_Tnode *tn = fStruct->top;
- 	__u32 i;
- 	int requiredTallness;
- 	int level = fStruct->topLevel;
- 
- 	/* Check sane level and chunk Id */
--	if (level < 0 || level > YAFFS_TNODES_MAX_LEVEL) {
-+	if (level < 0 || level > YAFFS_TNODES_MAX_LEVEL)
- 		return NULL;
--	}
- 
--	if (chunkId > YAFFS_MAX_CHUNK_ID) {
-+	if (chunkId > YAFFS_MAX_CHUNK_ID)
- 		return NULL;
--	}
- 
- 	/* First check we're tall enough (ie enough topLevel) */
- 
-@@ -1385,22 +1415,17 @@ static yaffs_Tnode *yaffs_FindLevel0Tnod
- 		requiredTallness++;
- 	}
- 
--	if (requiredTallness > fStruct->topLevel) {
--		/* Not tall enough, so we can't find it, return NULL. */
--		return NULL;
--	}
-+	if (requiredTallness > fStruct->topLevel)
-+		return NULL; /* Not tall enough, so we can't find it */
- 
- 	/* Traverse down to level 0 */
- 	while (level > 0 && tn) {
--		tn = tn->
--		    internal[(chunkId >>
--			       ( YAFFS_TNODES_LEVEL0_BITS +
--			         (level - 1) *
--			         YAFFS_TNODES_INTERNAL_BITS)
--			      ) &
--			     YAFFS_TNODES_INTERNAL_MASK];
-+		tn = tn->internal[(chunkId >>
-+			(YAFFS_TNODES_LEVEL0_BITS +
-+				(level - 1) *
-+				YAFFS_TNODES_INTERNAL_BITS)) &
-+			YAFFS_TNODES_INTERNAL_MASK];
- 		level--;
--
- 	}
- 
- 	return tn;
-@@ -1417,12 +1442,11 @@ static yaffs_Tnode *yaffs_FindLevel0Tnod
-  *  be plugged into the ttree.
-  */
- 
--static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device * dev,
--					       yaffs_FileStructure * fStruct,
--					       __u32 chunkId,
--					       yaffs_Tnode *passedTn)
-+static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device *dev,
-+					yaffs_FileStructure *fStruct,
-+					__u32 chunkId,
-+					yaffs_Tnode *passedTn)
- {
--
- 	int requiredTallness;
- 	int i;
- 	int l;
-@@ -1432,13 +1456,11 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
- 
- 
- 	/* Check sane level and page Id */
--	if (fStruct->topLevel < 0 || fStruct->topLevel > YAFFS_TNODES_MAX_LEVEL) {
-+	if (fStruct->topLevel < 0 || fStruct->topLevel > YAFFS_TNODES_MAX_LEVEL)
- 		return NULL;
--	}
- 
--	if (chunkId > YAFFS_MAX_CHUNK_ID) {
-+	if (chunkId > YAFFS_MAX_CHUNK_ID)
- 		return NULL;
--	}
- 
- 	/* First check we're tall enough (ie enough topLevel) */
- 
-@@ -1451,7 +1473,7 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
- 
- 
- 	if (requiredTallness > fStruct->topLevel) {
--		/* Not tall enough,gotta make the tree taller */
-+		/* Not tall enough, gotta make the tree taller */
- 		for (i = fStruct->topLevel; i < requiredTallness; i++) {
- 
- 			tn = yaffs_GetTnode(dev);
-@@ -1473,27 +1495,27 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
- 	l = fStruct->topLevel;
- 	tn = fStruct->top;
- 
--	if(l > 0) {
-+	if (l > 0) {
- 		while (l > 0 && tn) {
- 			x = (chunkId >>
--			     ( YAFFS_TNODES_LEVEL0_BITS +
-+			     (YAFFS_TNODES_LEVEL0_BITS +
- 			      (l - 1) * YAFFS_TNODES_INTERNAL_BITS)) &
- 			    YAFFS_TNODES_INTERNAL_MASK;
- 
- 
--			if((l>1) && !tn->internal[x]){
-+			if ((l > 1) && !tn->internal[x]) {
- 				/* Add missing non-level-zero tnode */
- 				tn->internal[x] = yaffs_GetTnode(dev);
- 
--			} else if(l == 1) {
-+			} else if (l == 1) {
- 				/* Looking from level 1 at level 0 */
--			 	if (passedTn) {
-+				if (passedTn) {
- 					/* If we already have one, then release it.*/
--					if(tn->internal[x])
--						yaffs_FreeTnode(dev,tn->internal[x]);
-+					if (tn->internal[x])
-+						yaffs_FreeTnode(dev, tn->internal[x]);
- 					tn->internal[x] = passedTn;
- 
--				} else if(!tn->internal[x]) {
-+				} else if (!tn->internal[x]) {
- 					/* Don't have one, none passed in */
- 					tn->internal[x] = yaffs_GetTnode(dev);
- 				}
-@@ -1504,31 +1526,29 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
- 		}
- 	} else {
- 		/* top is level 0 */
--		if(passedTn) {
--			memcpy(tn,passedTn,(dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
--			yaffs_FreeTnode(dev,passedTn);
-+		if (passedTn) {
-+			memcpy(tn, passedTn, (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
-+			yaffs_FreeTnode(dev, passedTn);
- 		}
- 	}
- 
- 	return tn;
- }
- 
--static int yaffs_FindChunkInGroup(yaffs_Device * dev, int theChunk,
--				  yaffs_ExtendedTags * tags, int objectId,
--				  int chunkInInode)
-+static int yaffs_FindChunkInGroup(yaffs_Device *dev, int theChunk,
-+				yaffs_ExtendedTags *tags, int objectId,
-+				int chunkInInode)
- {
- 	int j;
- 
- 	for (j = 0; theChunk && j < dev->chunkGroupSize; j++) {
--		if (yaffs_CheckChunkBit
--		    (dev, theChunk / dev->nChunksPerBlock,
--		     theChunk % dev->nChunksPerBlock)) {
-+		if (yaffs_CheckChunkBit(dev, theChunk / dev->nChunksPerBlock,
-+				theChunk % dev->nChunksPerBlock)) {
- 			yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL,
- 							tags);
- 			if (yaffs_TagsMatch(tags, objectId, chunkInInode)) {
- 				/* found it; */
- 				return theChunk;
--
- 			}
- 		}
- 		theChunk++;
-@@ -1543,7 +1563,7 @@ static int yaffs_FindChunkInGroup(yaffs_
-  * Returns 0 if it stopped early due to hitting the limit and the delete is incomplete.
-  */
- 
--static int yaffs_DeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, __u32 level,
-+static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level,
- 			      int chunkOffset, int *limit)
- {
- 	int i;
-@@ -1557,7 +1577,6 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 
- 	if (tn) {
- 		if (level > 0) {
--
- 			for (i = YAFFS_NTNODES_INTERNAL - 1; allDone && i >= 0;
- 			     i--) {
- 				if (tn->internal[i]) {
-@@ -1565,17 +1584,17 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 						allDone = 0;
- 					} else {
- 						allDone =
--						    yaffs_DeleteWorker(in,
--								       tn->
--								       internal
--								       [i],
--								       level -
--								       1,
--								       (chunkOffset
-+							yaffs_DeleteWorker(in,
-+								tn->
-+								internal
-+								[i],
-+								level -
-+								1,
-+								(chunkOffset
- 									<<
- 									YAFFS_TNODES_INTERNAL_BITS)
--								       + i,
--								       limit);
-+								+ i,
-+								limit);
- 					}
- 					if (allDone) {
- 						yaffs_FreeTnode(dev,
-@@ -1584,27 +1603,25 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 						tn->internal[i] = NULL;
- 					}
- 				}
--
- 			}
- 			return (allDone) ? 1 : 0;
- 		} else if (level == 0) {
- 			int hitLimit = 0;
- 
- 			for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0 && !hitLimit;
--			     i--) {
--			        theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
-+					i--) {
-+				theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
- 				if (theChunk) {
- 
--					chunkInInode =
--					    (chunkOffset <<
--					     YAFFS_TNODES_LEVEL0_BITS) + i;
-+					chunkInInode = (chunkOffset <<
-+						YAFFS_TNODES_LEVEL0_BITS) + i;
- 
- 					foundChunk =
--					    yaffs_FindChunkInGroup(dev,
--								   theChunk,
--								   &tags,
--								   in->objectId,
--								   chunkInInode);
-+						yaffs_FindChunkInGroup(dev,
-+								theChunk,
-+								&tags,
-+								in->objectId,
-+								chunkInInode);
- 
- 					if (foundChunk > 0) {
- 						yaffs_DeleteChunk(dev,
-@@ -1613,14 +1630,13 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 						in->nDataChunks--;
- 						if (limit) {
- 							*limit = *limit - 1;
--							if (*limit <= 0) {
-+							if (*limit <= 0)
- 								hitLimit = 1;
--							}
- 						}
- 
- 					}
- 
--					yaffs_PutLevel0Tnode(dev,tn,i,0);
-+					yaffs_PutLevel0Tnode(dev, tn, i, 0);
- 				}
- 
- 			}
-@@ -1634,9 +1650,8 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 
- }
- 
--static void yaffs_SoftDeleteChunk(yaffs_Device * dev, int chunk)
-+static void yaffs_SoftDeleteChunk(yaffs_Device *dev, int chunk)
- {
--
- 	yaffs_BlockInfo *theBlock;
- 
- 	T(YAFFS_TRACE_DELETION, (TSTR("soft delete chunk %d" TENDSTR), chunk));
-@@ -1654,7 +1669,7 @@ static void yaffs_SoftDeleteChunk(yaffs_
-  * Thus, essentially this is the same as DeleteWorker except that the chunks are soft deleted.
-  */
- 
--static int yaffs_SoftDeleteWorker(yaffs_Object * in, yaffs_Tnode * tn,
-+static int yaffs_SoftDeleteWorker(yaffs_Object *in, yaffs_Tnode *tn,
- 				  __u32 level, int chunkOffset)
- {
- 	int i;
-@@ -1691,14 +1706,14 @@ static int yaffs_SoftDeleteWorker(yaffs_
- 		} else if (level == 0) {
- 
- 			for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0; i--) {
--				theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
-+				theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
- 				if (theChunk) {
- 					/* Note this does not find the real chunk, only the chunk group.
- 					 * We make an assumption that a chunk group is not larger than
- 					 * a block.
- 					 */
- 					yaffs_SoftDeleteChunk(dev, theChunk);
--					yaffs_PutLevel0Tnode(dev,tn,i,0);
-+					yaffs_PutLevel0Tnode(dev, tn, i, 0);
- 				}
- 
- 			}
-@@ -1712,7 +1727,7 @@ static int yaffs_SoftDeleteWorker(yaffs_
- 
- }
- 
--static void yaffs_SoftDeleteFile(yaffs_Object * obj)
-+static void yaffs_SoftDeleteFile(yaffs_Object *obj)
- {
- 	if (obj->deleted &&
- 	    obj->variantType == YAFFS_OBJECT_TYPE_FILE && !obj->softDeleted) {
-@@ -1746,8 +1761,8 @@ static void yaffs_SoftDeleteFile(yaffs_O
-  * by a special case.
-  */
- 
--static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device * dev, yaffs_Tnode * tn,
--				      __u32 level, int del0)
-+static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device *dev, yaffs_Tnode *tn,
-+				__u32 level, int del0)
- {
- 	int i;
- 	int hasData;
-@@ -1763,9 +1778,8 @@ static yaffs_Tnode *yaffs_PruneWorker(ya
- 						      (i == 0) ? del0 : 1);
- 			}
- 
--			if (tn->internal[i]) {
-+			if (tn->internal[i])
- 				hasData++;
--			}
- 		}
- 
- 		if (hasData == 0 && del0) {
-@@ -1781,8 +1795,8 @@ static yaffs_Tnode *yaffs_PruneWorker(ya
- 
- }
- 
--static int yaffs_PruneFileStructure(yaffs_Device * dev,
--				    yaffs_FileStructure * fStruct)
-+static int yaffs_PruneFileStructure(yaffs_Device *dev,
-+				yaffs_FileStructure *fStruct)
- {
- 	int i;
- 	int hasData;
-@@ -1805,9 +1819,8 @@ static int yaffs_PruneFileStructure(yaff
- 
- 			hasData = 0;
- 			for (i = 1; i < YAFFS_NTNODES_INTERNAL; i++) {
--				if (tn->internal[i]) {
-+				if (tn->internal[i])
- 					hasData++;
--				}
- 			}
- 
- 			if (!hasData) {
-@@ -1828,7 +1841,7 @@ static int yaffs_PruneFileStructure(yaff
- /* yaffs_CreateFreeObjects creates a bunch more objects and
-  * adds them to the object free list.
-  */
--static int yaffs_CreateFreeObjects(yaffs_Device * dev, int nObjects)
-+static int yaffs_CreateFreeObjects(yaffs_Device *dev, int nObjects)
- {
- 	int i;
- 	yaffs_Object *newObjects;
-@@ -1842,9 +1855,9 @@ static int yaffs_CreateFreeObjects(yaffs
- 	list = YMALLOC(sizeof(yaffs_ObjectList));
- 
- 	if (!newObjects || !list) {
--		if(newObjects)
-+		if (newObjects)
- 			YFREE(newObjects);
--		if(list)
-+		if (list)
- 			YFREE(list);
- 		T(YAFFS_TRACE_ALLOCATE,
- 		  (TSTR("yaffs: Could not allocate more objects" TENDSTR)));
-@@ -1854,7 +1867,7 @@ static int yaffs_CreateFreeObjects(yaffs
- 	/* Hook them into the free list */
- 	for (i = 0; i < nObjects - 1; i++) {
- 		newObjects[i].siblings.next =
--		    (struct list_head *)(&newObjects[i + 1]);
-+				(struct ylist_head *)(&newObjects[i + 1]);
- 	}
- 
- 	newObjects[nObjects - 1].siblings.next = (void *)dev->freeObjects;
-@@ -1873,85 +1886,109 @@ static int yaffs_CreateFreeObjects(yaffs
- 
- 
- /* AllocateEmptyObject gets us a clean Object. Tries to make allocate more if we run out */
--static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device * dev)
-+static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device *dev)
- {
- 	yaffs_Object *tn = NULL;
- 
-+#ifdef VALGRIND_TEST
-+	tn = YMALLOC(sizeof(yaffs_Object));
-+#else
- 	/* If there are none left make more */
--	if (!dev->freeObjects) {
-+	if (!dev->freeObjects)
- 		yaffs_CreateFreeObjects(dev, YAFFS_ALLOCATION_NOBJECTS);
--	}
- 
- 	if (dev->freeObjects) {
- 		tn = dev->freeObjects;
- 		dev->freeObjects =
--		    (yaffs_Object *) (dev->freeObjects->siblings.next);
-+			(yaffs_Object *) (dev->freeObjects->siblings.next);
- 		dev->nFreeObjects--;
--
-+	}
-+#endif
-+	if (tn) {
- 		/* Now sweeten it up... */
- 
- 		memset(tn, 0, sizeof(yaffs_Object));
-+		tn->beingCreated = 1;
-+
- 		tn->myDev = dev;
--		tn->chunkId = -1;
-+		tn->hdrChunk = 0;
- 		tn->variantType = YAFFS_OBJECT_TYPE_UNKNOWN;
--		INIT_LIST_HEAD(&(tn->hardLinks));
--		INIT_LIST_HEAD(&(tn->hashLink));
--		INIT_LIST_HEAD(&tn->siblings);
-+		YINIT_LIST_HEAD(&(tn->hardLinks));
-+		YINIT_LIST_HEAD(&(tn->hashLink));
-+		YINIT_LIST_HEAD(&tn->siblings);
-+
-+
-+		/* Now make the directory sane */
-+		if (dev->rootDir) {
-+			tn->parent = dev->rootDir;
-+			ylist_add(&(tn->siblings), &dev->rootDir->variant.directoryVariant.children);
-+		}
- 
- 		/* Add it to the lost and found directory.
- 		 * NB Can't put root or lostNFound in lostNFound so
- 		 * check if lostNFound exists first
- 		 */
--		if (dev->lostNFoundDir) {
-+		if (dev->lostNFoundDir)
- 			yaffs_AddObjectToDirectory(dev->lostNFoundDir, tn);
--		}
-+
-+		tn->beingCreated = 0;
- 	}
- 
-+	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
-+
- 	return tn;
- }
- 
--static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device * dev, int number,
-+static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device *dev, int number,
- 					       __u32 mode)
- {
- 
- 	yaffs_Object *obj =
- 	    yaffs_CreateNewObject(dev, number, YAFFS_OBJECT_TYPE_DIRECTORY);
- 	if (obj) {
--		obj->fake = 1;		/* it is fake so it has no NAND presence... */
-+		obj->fake = 1;		/* it is fake so it might have no NAND presence... */
- 		obj->renameAllowed = 0;	/* ... and we're not allowed to rename it... */
- 		obj->unlinkAllowed = 0;	/* ... or unlink it */
- 		obj->deleted = 0;
- 		obj->unlinked = 0;
- 		obj->yst_mode = mode;
- 		obj->myDev = dev;
--		obj->chunkId = 0;	/* Not a valid chunk. */
-+		obj->hdrChunk = 0;	/* Not a valid chunk. */
- 	}
- 
- 	return obj;
- 
- }
- 
--static void yaffs_UnhashObject(yaffs_Object * tn)
-+static void yaffs_UnhashObject(yaffs_Object *tn)
- {
- 	int bucket;
- 	yaffs_Device *dev = tn->myDev;
- 
- 	/* If it is still linked into the bucket list, free from the list */
--	if (!list_empty(&tn->hashLink)) {
--		list_del_init(&tn->hashLink);
-+	if (!ylist_empty(&tn->hashLink)) {
-+		ylist_del_init(&tn->hashLink);
- 		bucket = yaffs_HashFunction(tn->objectId);
- 		dev->objectBucket[bucket].count--;
- 	}
--
- }
- 
- /*  FreeObject frees up a Object and puts it back on the free list */
--static void yaffs_FreeObject(yaffs_Object * tn)
-+static void yaffs_FreeObject(yaffs_Object *tn)
- {
--
- 	yaffs_Device *dev = tn->myDev;
- 
--#ifdef  __KERNEL__
-+#ifdef __KERNEL__
-+	T(YAFFS_TRACE_OS, (TSTR("FreeObject %p inode %p"TENDSTR), tn, tn->myInode));
-+#endif
-+
-+	if (tn->parent)
-+		YBUG();
-+	if (!ylist_empty(&tn->siblings))
-+		YBUG();
-+
-+
-+#ifdef __KERNEL__
- 	if (tn->myInode) {
- 		/* We're still hooked up to a cached inode.
- 		 * Don't delete now, but mark for later deletion
-@@ -1963,24 +2000,28 @@ static void yaffs_FreeObject(yaffs_Objec
- 
- 	yaffs_UnhashObject(tn);
- 
-+#ifdef VALGRIND_TEST
-+	YFREE(tn);
-+#else
- 	/* Link into the free list. */
--	tn->siblings.next = (struct list_head *)(dev->freeObjects);
-+	tn->siblings.next = (struct ylist_head *)(dev->freeObjects);
- 	dev->freeObjects = tn;
- 	dev->nFreeObjects++;
-+#endif
-+	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
- }
- 
- #ifdef __KERNEL__
- 
--void yaffs_HandleDeferedFree(yaffs_Object * obj)
-+void yaffs_HandleDeferedFree(yaffs_Object *obj)
- {
--	if (obj->deferedFree) {
-+	if (obj->deferedFree)
- 		yaffs_FreeObject(obj);
--	}
- }
- 
- #endif
- 
--static void yaffs_DeinitialiseObjects(yaffs_Device * dev)
-+static void yaffs_DeinitialiseObjects(yaffs_Device *dev)
- {
- 	/* Free the list of allocated Objects */
- 
-@@ -1998,7 +2039,7 @@ static void yaffs_DeinitialiseObjects(ya
- 	dev->nFreeObjects = 0;
- }
- 
--static void yaffs_InitialiseObjects(yaffs_Device * dev)
-+static void yaffs_InitialiseObjects(yaffs_Device *dev)
- {
- 	int i;
- 
-@@ -2007,15 +2048,14 @@ static void yaffs_InitialiseObjects(yaff
- 	dev->nFreeObjects = 0;
- 
- 	for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) {
--		INIT_LIST_HEAD(&dev->objectBucket[i].list);
-+		YINIT_LIST_HEAD(&dev->objectBucket[i].list);
- 		dev->objectBucket[i].count = 0;
- 	}
--
- }
- 
--static int yaffs_FindNiceObjectBucket(yaffs_Device * dev)
-+static int yaffs_FindNiceObjectBucket(yaffs_Device *dev)
- {
--	static int x = 0;
-+	static int x;
- 	int i;
- 	int l = 999;
- 	int lowest = 999999;
-@@ -2049,7 +2089,7 @@ static int yaffs_FindNiceObjectBucket(ya
- 	return l;
- }
- 
--static int yaffs_CreateNewObjectNumber(yaffs_Device * dev)
-+static int yaffs_CreateNewObjectNumber(yaffs_Device *dev)
- {
- 	int bucket = yaffs_FindNiceObjectBucket(dev);
- 
-@@ -2058,7 +2098,7 @@ static int yaffs_CreateNewObjectNumber(y
- 	 */
- 
- 	int found = 0;
--	struct list_head *i;
-+	struct ylist_head *i;
- 
- 	__u32 n = (__u32) bucket;
- 
-@@ -2068,41 +2108,38 @@ static int yaffs_CreateNewObjectNumber(y
- 		found = 1;
- 		n += YAFFS_NOBJECT_BUCKETS;
- 		if (1 || dev->objectBucket[bucket].count > 0) {
--			list_for_each(i, &dev->objectBucket[bucket].list) {
-+			ylist_for_each(i, &dev->objectBucket[bucket].list) {
- 				/* If there is already one in the list */
--				if (i
--				    && list_entry(i, yaffs_Object,
--						  hashLink)->objectId == n) {
-+				if (i && ylist_entry(i, yaffs_Object,
-+						hashLink)->objectId == n) {
- 					found = 0;
- 				}
- 			}
- 		}
- 	}
- 
--
- 	return n;
- }
- 
--static void yaffs_HashObject(yaffs_Object * in)
-+static void yaffs_HashObject(yaffs_Object *in)
- {
- 	int bucket = yaffs_HashFunction(in->objectId);
- 	yaffs_Device *dev = in->myDev;
- 
--	list_add(&in->hashLink, &dev->objectBucket[bucket].list);
-+	ylist_add(&in->hashLink, &dev->objectBucket[bucket].list);
- 	dev->objectBucket[bucket].count++;
--
- }
- 
--yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device * dev, __u32 number)
-+yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev, __u32 number)
- {
- 	int bucket = yaffs_HashFunction(number);
--	struct list_head *i;
-+	struct ylist_head *i;
- 	yaffs_Object *in;
- 
--	list_for_each(i, &dev->objectBucket[bucket].list) {
-+	ylist_for_each(i, &dev->objectBucket[bucket].list) {
- 		/* Look if it is in the list */
- 		if (i) {
--			in = list_entry(i, yaffs_Object, hashLink);
-+			in = ylist_entry(i, yaffs_Object, hashLink);
- 			if (in->objectId == number) {
- #ifdef __KERNEL__
- 				/* Don't tell the VFS about this one if it is defered free */
-@@ -2118,31 +2155,27 @@ yaffs_Object *yaffs_FindObjectByNumber(y
- 	return NULL;
- }
- 
--yaffs_Object *yaffs_CreateNewObject(yaffs_Device * dev, int number,
-+yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev, int number,
- 				    yaffs_ObjectType type)
- {
--
- 	yaffs_Object *theObject;
--	yaffs_Tnode *tn;
-+	yaffs_Tnode *tn = NULL;
- 
--	if (number < 0) {
-+	if (number < 0)
- 		number = yaffs_CreateNewObjectNumber(dev);
--	}
- 
- 	theObject = yaffs_AllocateEmptyObject(dev);
--	if(!theObject)
-+	if (!theObject)
- 		return NULL;
- 
--	if(type == YAFFS_OBJECT_TYPE_FILE){
-+	if (type == YAFFS_OBJECT_TYPE_FILE) {
- 		tn = yaffs_GetTnode(dev);
--		if(!tn){
-+		if (!tn) {
- 			yaffs_FreeObject(theObject);
- 			return NULL;
- 		}
- 	}
- 
--
--
- 	if (theObject) {
- 		theObject->fake = 0;
- 		theObject->renameAllowed = 1;
-@@ -2171,8 +2204,8 @@ yaffs_Object *yaffs_CreateNewObject(yaff
- 			theObject->variant.fileVariant.top = tn;
- 			break;
- 		case YAFFS_OBJECT_TYPE_DIRECTORY:
--			INIT_LIST_HEAD(&theObject->variant.directoryVariant.
--				       children);
-+			YINIT_LIST_HEAD(&theObject->variant.directoryVariant.
-+					children);
- 			break;
- 		case YAFFS_OBJECT_TYPE_SYMLINK:
- 		case YAFFS_OBJECT_TYPE_HARDLINK:
-@@ -2188,32 +2221,30 @@ yaffs_Object *yaffs_CreateNewObject(yaff
- 	return theObject;
- }
- 
--static yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device * dev,
-+static yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device *dev,
- 						      int number,
- 						      yaffs_ObjectType type)
- {
- 	yaffs_Object *theObject = NULL;
- 
--	if (number > 0) {
-+	if (number > 0)
- 		theObject = yaffs_FindObjectByNumber(dev, number);
--	}
- 
--	if (!theObject) {
-+	if (!theObject)
- 		theObject = yaffs_CreateNewObject(dev, number, type);
--	}
- 
- 	return theObject;
- 
- }
- 
- 
--static YCHAR *yaffs_CloneString(const YCHAR * str)
-+static YCHAR *yaffs_CloneString(const YCHAR *str)
- {
- 	YCHAR *newStr = NULL;
- 
- 	if (str && *str) {
- 		newStr = YMALLOC((yaffs_strlen(str) + 1) * sizeof(YCHAR));
--		if(newStr)
-+		if (newStr)
- 			yaffs_strcpy(newStr, str);
- 	}
- 
-@@ -2229,29 +2260,31 @@ static YCHAR *yaffs_CloneString(const YC
-  */
- 
- static yaffs_Object *yaffs_MknodObject(yaffs_ObjectType type,
--				       yaffs_Object * parent,
--				       const YCHAR * name,
-+				       yaffs_Object *parent,
-+				       const YCHAR *name,
- 				       __u32 mode,
- 				       __u32 uid,
- 				       __u32 gid,
--				       yaffs_Object * equivalentObject,
--				       const YCHAR * aliasString, __u32 rdev)
-+				       yaffs_Object *equivalentObject,
-+				       const YCHAR *aliasString, __u32 rdev)
- {
- 	yaffs_Object *in;
--	YCHAR *str;
-+	YCHAR *str = NULL;
- 
- 	yaffs_Device *dev = parent->myDev;
- 
- 	/* Check if the entry exists. If it does then fail the call since we don't want a dup.*/
--	if (yaffs_FindObjectByName(parent, name)) {
-+	if (yaffs_FindObjectByName(parent, name))
- 		return NULL;
--	}
- 
- 	in = yaffs_CreateNewObject(dev, -1, type);
- 
--	if(type == YAFFS_OBJECT_TYPE_SYMLINK){
-+	if (!in)
-+		return YAFFS_FAIL;
-+
-+	if (type == YAFFS_OBJECT_TYPE_SYMLINK) {
- 		str = yaffs_CloneString(aliasString);
--		if(!str){
-+		if (!str) {
- 			yaffs_FreeObject(in);
- 			return NULL;
- 		}
-@@ -2260,7 +2293,7 @@ static yaffs_Object *yaffs_MknodObject(y
- 
- 
- 	if (in) {
--		in->chunkId = -1;
-+		in->hdrChunk = 0;
- 		in->valid = 1;
- 		in->variantType = type;
- 
-@@ -2293,10 +2326,10 @@ static yaffs_Object *yaffs_MknodObject(y
- 			break;
- 		case YAFFS_OBJECT_TYPE_HARDLINK:
- 			in->variant.hardLinkVariant.equivalentObject =
--			    equivalentObject;
-+				equivalentObject;
- 			in->variant.hardLinkVariant.equivalentObjectId =
--			    equivalentObject->objectId;
--			list_add(&in->hardLinks, &equivalentObject->hardLinks);
-+				equivalentObject->objectId;
-+			ylist_add(&in->hardLinks, &equivalentObject->hardLinks);
- 			break;
- 		case YAFFS_OBJECT_TYPE_FILE:
- 		case YAFFS_OBJECT_TYPE_DIRECTORY:
-@@ -2308,7 +2341,7 @@ static yaffs_Object *yaffs_MknodObject(y
- 
- 		if (yaffs_UpdateObjectHeader(in, name, 0, 0, 0) < 0) {
- 			/* Could not create the object header, fail the creation */
--			yaffs_DestroyObject(in);
-+			yaffs_DeleteObject(in);
- 			in = NULL;
- 		}
- 
-@@ -2317,38 +2350,38 @@ static yaffs_Object *yaffs_MknodObject(y
- 	return in;
- }
- 
--yaffs_Object *yaffs_MknodFile(yaffs_Object * parent, const YCHAR * name,
--			      __u32 mode, __u32 uid, __u32 gid)
-+yaffs_Object *yaffs_MknodFile(yaffs_Object *parent, const YCHAR *name,
-+			__u32 mode, __u32 uid, __u32 gid)
- {
- 	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_FILE, parent, name, mode,
--				 uid, gid, NULL, NULL, 0);
-+				uid, gid, NULL, NULL, 0);
- }
- 
--yaffs_Object *yaffs_MknodDirectory(yaffs_Object * parent, const YCHAR * name,
--				   __u32 mode, __u32 uid, __u32 gid)
-+yaffs_Object *yaffs_MknodDirectory(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid)
- {
- 	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_DIRECTORY, parent, name,
- 				 mode, uid, gid, NULL, NULL, 0);
- }
- 
--yaffs_Object *yaffs_MknodSpecial(yaffs_Object * parent, const YCHAR * name,
--				 __u32 mode, __u32 uid, __u32 gid, __u32 rdev)
-+yaffs_Object *yaffs_MknodSpecial(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid, __u32 rdev)
- {
- 	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SPECIAL, parent, name, mode,
- 				 uid, gid, NULL, NULL, rdev);
- }
- 
--yaffs_Object *yaffs_MknodSymLink(yaffs_Object * parent, const YCHAR * name,
--				 __u32 mode, __u32 uid, __u32 gid,
--				 const YCHAR * alias)
-+yaffs_Object *yaffs_MknodSymLink(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid,
-+				const YCHAR *alias)
- {
- 	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SYMLINK, parent, name, mode,
--				 uid, gid, NULL, alias, 0);
-+				uid, gid, NULL, alias, 0);
- }
- 
- /* yaffs_Link returns the object id of the equivalent object.*/
--yaffs_Object *yaffs_Link(yaffs_Object * parent, const YCHAR * name,
--			 yaffs_Object * equivalentObject)
-+yaffs_Object *yaffs_Link(yaffs_Object *parent, const YCHAR *name,
-+			yaffs_Object *equivalentObject)
- {
- 	/* Get the real object in case we were fed a hard link as an equivalent object */
- 	equivalentObject = yaffs_GetEquivalentObject(equivalentObject);
-@@ -2363,33 +2396,31 @@ yaffs_Object *yaffs_Link(yaffs_Object * 
- 
- }
- 
--static int yaffs_ChangeObjectName(yaffs_Object * obj, yaffs_Object * newDir,
--				  const YCHAR * newName, int force, int shadows)
-+static int yaffs_ChangeObjectName(yaffs_Object *obj, yaffs_Object *newDir,
-+				const YCHAR *newName, int force, int shadows)
- {
- 	int unlinkOp;
- 	int deleteOp;
- 
- 	yaffs_Object *existingTarget;
- 
--	if (newDir == NULL) {
-+	if (newDir == NULL)
- 		newDir = obj->parent;	/* use the old directory */
--	}
- 
- 	if (newDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
- 		T(YAFFS_TRACE_ALWAYS,
- 		  (TSTR
--		   ("tragendy: yaffs_ChangeObjectName: newDir is not a directory"
-+		   ("tragedy: yaffs_ChangeObjectName: newDir is not a directory"
- 		    TENDSTR)));
- 		YBUG();
- 	}
- 
- 	/* TODO: Do we need this different handling for YAFFS2 and YAFFS1?? */
--	if (obj->myDev->isYaffs2) {
-+	if (obj->myDev->isYaffs2)
- 		unlinkOp = (newDir == obj->myDev->unlinkedDir);
--	} else {
-+	else
- 		unlinkOp = (newDir == obj->myDev->unlinkedDir
- 			    && obj->variantType == YAFFS_OBJECT_TYPE_FILE);
--	}
- 
- 	deleteOp = (newDir == obj->myDev->deletedDir);
- 
-@@ -2415,40 +2446,40 @@ static int yaffs_ChangeObjectName(yaffs_
- 			obj->unlinked = 1;
- 
- 		/* If it is a deletion then we mark it as a shrink for gc purposes. */
--		if (yaffs_UpdateObjectHeader(obj, newName, 0, deleteOp, shadows)>= 0)
-+		if (yaffs_UpdateObjectHeader(obj, newName, 0, deleteOp, shadows) >= 0)
- 			return YAFFS_OK;
- 	}
- 
- 	return YAFFS_FAIL;
- }
- 
--int yaffs_RenameObject(yaffs_Object * oldDir, const YCHAR * oldName,
--		       yaffs_Object * newDir, const YCHAR * newName)
-+int yaffs_RenameObject(yaffs_Object *oldDir, const YCHAR *oldName,
-+		yaffs_Object *newDir, const YCHAR *newName)
- {
--	yaffs_Object *obj;
--	yaffs_Object *existingTarget;
-+	yaffs_Object *obj = NULL;
-+	yaffs_Object *existingTarget = NULL;
- 	int force = 0;
- 
-+
-+	if (!oldDir || oldDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
-+		YBUG();
-+	if (!newDir || newDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
-+		YBUG();
-+
- #ifdef CONFIG_YAFFS_CASE_INSENSITIVE
- 	/* Special case for case insemsitive systems (eg. WinCE).
- 	 * While look-up is case insensitive, the name isn't.
- 	 * Therefore we might want to change x.txt to X.txt
- 	*/
--	if (oldDir == newDir && yaffs_strcmp(oldName, newName) == 0) {
-+	if (oldDir == newDir && yaffs_strcmp(oldName, newName) == 0)
- 		force = 1;
--	}
- #endif
- 
-+	else if (yaffs_strlen(newName) > YAFFS_MAX_NAME_LENGTH)
-+		/* ENAMETOOLONG */
-+		return YAFFS_FAIL;
-+
- 	obj = yaffs_FindObjectByName(oldDir, oldName);
--	/* Check new name to long. */
--	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK &&
--	    yaffs_strlen(newName) > YAFFS_MAX_ALIAS_LENGTH)
--	  /* ENAMETOOLONG */
--	  return YAFFS_FAIL;
--	else if (obj->variantType != YAFFS_OBJECT_TYPE_SYMLINK &&
--		 yaffs_strlen(newName) > YAFFS_MAX_NAME_LENGTH)
--	  /* ENAMETOOLONG */
--	  return YAFFS_FAIL;
- 
- 	if (obj && obj->renameAllowed) {
- 
-@@ -2456,8 +2487,8 @@ int yaffs_RenameObject(yaffs_Object * ol
- 
- 		existingTarget = yaffs_FindObjectByName(newDir, newName);
- 		if (existingTarget &&
--		    existingTarget->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
--		    !list_empty(&existingTarget->variant.directoryVariant.children)) {
-+			existingTarget->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
-+			!ylist_empty(&existingTarget->variant.directoryVariant.children)) {
- 			/* There is a target that is a non-empty directory, so we fail */
- 			return YAFFS_FAIL;	/* EEXIST or ENOTEMPTY */
- 		} else if (existingTarget && existingTarget != obj) {
-@@ -2465,7 +2496,7 @@ int yaffs_RenameObject(yaffs_Object * ol
- 			 * but only if it isn't the same object
- 			 */
- 			yaffs_ChangeObjectName(obj, newDir, newName, force,
--					       existingTarget->objectId);
-+						existingTarget->objectId);
- 			yaffs_UnlinkObject(existingTarget);
- 		}
- 
-@@ -2476,7 +2507,7 @@ int yaffs_RenameObject(yaffs_Object * ol
- 
- /*------------------------- Block Management and Page Allocation ----------------*/
- 
--static int yaffs_InitialiseBlocks(yaffs_Device * dev)
-+static int yaffs_InitialiseBlocks(yaffs_Device *dev)
- {
- 	int nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1;
- 
-@@ -2487,23 +2518,20 @@ static int yaffs_InitialiseBlocks(yaffs_
- 
- 	/* If the first allocation strategy fails, thry the alternate one */
- 	dev->blockInfo = YMALLOC(nBlocks * sizeof(yaffs_BlockInfo));
--	if(!dev->blockInfo){
-+	if (!dev->blockInfo) {
- 		dev->blockInfo = YMALLOC_ALT(nBlocks * sizeof(yaffs_BlockInfo));
- 		dev->blockInfoAlt = 1;
--	}
--	else
-+	} else
- 		dev->blockInfoAlt = 0;
- 
--	if(dev->blockInfo){
--
-+	if (dev->blockInfo) {
- 		/* Set up dynamic blockinfo stuff. */
- 		dev->chunkBitmapStride = (dev->nChunksPerBlock + 7) / 8; /* round up bytes */
- 		dev->chunkBits = YMALLOC(dev->chunkBitmapStride * nBlocks);
--		if(!dev->chunkBits){
-+		if (!dev->chunkBits) {
- 			dev->chunkBits = YMALLOC_ALT(dev->chunkBitmapStride * nBlocks);
- 			dev->chunkBitsAlt = 1;
--		}
--		else
-+		} else
- 			dev->chunkBitsAlt = 0;
- 	}
- 
-@@ -2514,30 +2542,29 @@ static int yaffs_InitialiseBlocks(yaffs_
- 	}
- 
- 	return YAFFS_FAIL;
--
- }
- 
--static void yaffs_DeinitialiseBlocks(yaffs_Device * dev)
-+static void yaffs_DeinitialiseBlocks(yaffs_Device *dev)
- {
--	if(dev->blockInfoAlt && dev->blockInfo)
-+	if (dev->blockInfoAlt && dev->blockInfo)
- 		YFREE_ALT(dev->blockInfo);
--	else if(dev->blockInfo)
-+	else if (dev->blockInfo)
- 		YFREE(dev->blockInfo);
- 
- 	dev->blockInfoAlt = 0;
- 
- 	dev->blockInfo = NULL;
- 
--	if(dev->chunkBitsAlt && dev->chunkBits)
-+	if (dev->chunkBitsAlt && dev->chunkBits)
- 		YFREE_ALT(dev->chunkBits);
--	else if(dev->chunkBits)
-+	else if (dev->chunkBits)
- 		YFREE(dev->chunkBits);
- 	dev->chunkBitsAlt = 0;
- 	dev->chunkBits = NULL;
- }
- 
--static int yaffs_BlockNotDisqualifiedFromGC(yaffs_Device * dev,
--					    yaffs_BlockInfo * bi)
-+static int yaffs_BlockNotDisqualifiedFromGC(yaffs_Device *dev,
-+					yaffs_BlockInfo *bi)
- {
- 	int i;
- 	__u32 seq;
-@@ -2556,7 +2583,7 @@ static int yaffs_BlockNotDisqualifiedFro
- 		seq = dev->sequenceNumber;
- 
- 		for (i = dev->internalStartBlock; i <= dev->internalEndBlock;
--		     i++) {
-+				i++) {
- 			b = yaffs_GetBlockInfo(dev, i);
- 			if (b->blockState == YAFFS_BLOCK_STATE_FULL &&
- 			    (b->pagesInUse - b->softDeletions) <
-@@ -2571,38 +2598,36 @@ static int yaffs_BlockNotDisqualifiedFro
- 	 * discarded pages.
- 	 */
- 	return (bi->sequenceNumber <= dev->oldestDirtySequence);
--
- }
- 
- /* FindDiretiestBlock is used to select the dirtiest block (or close enough)
-  * for garbage collection.
-  */
- 
--static int yaffs_FindBlockForGarbageCollection(yaffs_Device * dev,
--					       int aggressive)
-+static int yaffs_FindBlockForGarbageCollection(yaffs_Device *dev,
-+					int aggressive)
- {
--
- 	int b = dev->currentDirtyChecker;
- 
- 	int i;
- 	int iterations;
- 	int dirtiest = -1;
- 	int pagesInUse = 0;
--	int prioritised=0;
-+	int prioritised = 0;
- 	yaffs_BlockInfo *bi;
- 	int pendingPrioritisedExist = 0;
- 
- 	/* First let's see if we need to grab a prioritised block */
--	if(dev->hasPendingPrioritisedGCs){
--		for(i = dev->internalStartBlock; i < dev->internalEndBlock && !prioritised; i++){
-+	if (dev->hasPendingPrioritisedGCs) {
-+		for (i = dev->internalStartBlock; i < dev->internalEndBlock && !prioritised; i++) {
- 
- 			bi = yaffs_GetBlockInfo(dev, i);
--			//yaffs_VerifyBlock(dev,bi,i);
-+			/* yaffs_VerifyBlock(dev,bi,i); */
- 
--			if(bi->gcPrioritise) {
-+			if (bi->gcPrioritise) {
- 				pendingPrioritisedExist = 1;
--				if(bi->blockState == YAFFS_BLOCK_STATE_FULL &&
--				   yaffs_BlockNotDisqualifiedFromGC(dev, bi)){
-+				if (bi->blockState == YAFFS_BLOCK_STATE_FULL &&
-+				   yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
- 					pagesInUse = (bi->pagesInUse - bi->softDeletions);
- 					dirtiest = i;
- 					prioritised = 1;
-@@ -2611,7 +2636,7 @@ static int yaffs_FindBlockForGarbageColl
- 			}
- 		}
- 
--		if(!pendingPrioritisedExist) /* None found, so we can clear this */
-+		if (!pendingPrioritisedExist) /* None found, so we can clear this */
- 			dev->hasPendingPrioritisedGCs = 0;
- 	}
- 
-@@ -2623,31 +2648,28 @@ static int yaffs_FindBlockForGarbageColl
- 
- 	dev->nonAggressiveSkip--;
- 
--	if (!aggressive && (dev->nonAggressiveSkip > 0)) {
-+	if (!aggressive && (dev->nonAggressiveSkip > 0))
- 		return -1;
--	}
- 
--	if(!prioritised)
-+	if (!prioritised)
- 		pagesInUse =
--	    		(aggressive) ? dev->nChunksPerBlock : YAFFS_PASSIVE_GC_CHUNKS + 1;
-+			(aggressive) ? dev->nChunksPerBlock : YAFFS_PASSIVE_GC_CHUNKS + 1;
- 
--	if (aggressive) {
-+	if (aggressive)
- 		iterations =
- 		    dev->internalEndBlock - dev->internalStartBlock + 1;
--	} else {
-+	else {
- 		iterations =
- 		    dev->internalEndBlock - dev->internalStartBlock + 1;
- 		iterations = iterations / 16;
--		if (iterations > 200) {
-+		if (iterations > 200)
- 			iterations = 200;
--		}
- 	}
- 
- 	for (i = 0; i <= iterations && pagesInUse > 0 && !prioritised; i++) {
- 		b++;
--		if (b < dev->internalStartBlock || b > dev->internalEndBlock) {
-+		if (b < dev->internalStartBlock || b > dev->internalEndBlock)
- 			b = dev->internalStartBlock;
--		}
- 
- 		if (b < dev->internalStartBlock || b > dev->internalEndBlock) {
- 			T(YAFFS_TRACE_ERROR,
-@@ -2657,17 +2679,9 @@ static int yaffs_FindBlockForGarbageColl
- 
- 		bi = yaffs_GetBlockInfo(dev, b);
- 
--#if 0
--		if (bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT) {
--			dirtiest = b;
--			pagesInUse = 0;
--		}
--		else
--#endif
--
- 		if (bi->blockState == YAFFS_BLOCK_STATE_FULL &&
--		       (bi->pagesInUse - bi->softDeletions) < pagesInUse &&
--		        yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
-+			(bi->pagesInUse - bi->softDeletions) < pagesInUse &&
-+				yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
- 			dirtiest = b;
- 			pagesInUse = (bi->pagesInUse - bi->softDeletions);
- 		}
-@@ -2678,19 +2692,18 @@ static int yaffs_FindBlockForGarbageColl
- 	if (dirtiest > 0) {
- 		T(YAFFS_TRACE_GC,
- 		  (TSTR("GC Selected block %d with %d free, prioritised:%d" TENDSTR), dirtiest,
--		   dev->nChunksPerBlock - pagesInUse,prioritised));
-+		   dev->nChunksPerBlock - pagesInUse, prioritised));
- 	}
- 
- 	dev->oldestDirtySequence = 0;
- 
--	if (dirtiest > 0) {
-+	if (dirtiest > 0)
- 		dev->nonAggressiveSkip = 4;
--	}
- 
- 	return dirtiest;
- }
- 
--static void yaffs_BlockBecameDirty(yaffs_Device * dev, int blockNo)
-+static void yaffs_BlockBecameDirty(yaffs_Device *dev, int blockNo)
- {
- 	yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockNo);
- 
-@@ -2752,7 +2765,7 @@ static void yaffs_BlockBecameDirty(yaffs
- 	}
- }
- 
--static int yaffs_FindBlockForAllocation(yaffs_Device * dev)
-+static int yaffs_FindBlockForAllocation(yaffs_Device *dev)
- {
- 	int i;
- 
-@@ -2763,7 +2776,7 @@ static int yaffs_FindBlockForAllocation(
- 		 * Can't get space to gc
- 		 */
- 		T(YAFFS_TRACE_ERROR,
--		  (TSTR("yaffs tragedy: no more eraased blocks" TENDSTR)));
-+		  (TSTR("yaffs tragedy: no more erased blocks" TENDSTR)));
- 
- 		return -1;
- 	}
-@@ -2794,31 +2807,74 @@ static int yaffs_FindBlockForAllocation(
- 
- 	T(YAFFS_TRACE_ALWAYS,
- 	  (TSTR
--	   ("yaffs tragedy: no more eraased blocks, but there should have been %d"
-+	   ("yaffs tragedy: no more erased blocks, but there should have been %d"
- 	    TENDSTR), dev->nErasedBlocks));
- 
- 	return -1;
- }
- 
- 
--// Check if there's space to allocate...
--// Thinks.... do we need top make this ths same as yaffs_GetFreeChunks()?
--static int yaffs_CheckSpaceForAllocation(yaffs_Device * dev)
-+
-+static int yaffs_CalcCheckpointBlocksRequired(yaffs_Device *dev)
-+{
-+	if (!dev->nCheckpointBlocksRequired &&
-+	   dev->isYaffs2) {
-+		/* Not a valid value so recalculate */
-+		int nBytes = 0;
-+		int nBlocks;
-+		int devBlocks = (dev->endBlock - dev->startBlock + 1);
-+		int tnodeSize;
-+
-+		tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-+
-+		if (tnodeSize < sizeof(yaffs_Tnode))
-+			tnodeSize = sizeof(yaffs_Tnode);
-+
-+		nBytes += sizeof(yaffs_CheckpointValidity);
-+		nBytes += sizeof(yaffs_CheckpointDevice);
-+		nBytes += devBlocks * sizeof(yaffs_BlockInfo);
-+		nBytes += devBlocks * dev->chunkBitmapStride;
-+		nBytes += (sizeof(yaffs_CheckpointObject) + sizeof(__u32)) * (dev->nObjectsCreated - dev->nFreeObjects);
-+		nBytes += (tnodeSize + sizeof(__u32)) * (dev->nTnodesCreated - dev->nFreeTnodes);
-+		nBytes += sizeof(yaffs_CheckpointValidity);
-+		nBytes += sizeof(__u32); /* checksum*/
-+
-+		/* Round up and add 2 blocks to allow for some bad blocks, so add 3 */
-+
-+		nBlocks = (nBytes/(dev->nDataBytesPerChunk * dev->nChunksPerBlock)) + 3;
-+
-+		dev->nCheckpointBlocksRequired = nBlocks;
-+	}
-+
-+	return dev->nCheckpointBlocksRequired;
-+}
-+
-+/*
-+ * Check if there's space to allocate...
-+ * Thinks.... do we need top make this ths same as yaffs_GetFreeChunks()?
-+ */
-+static int yaffs_CheckSpaceForAllocation(yaffs_Device *dev)
- {
- 	int reservedChunks;
- 	int reservedBlocks = dev->nReservedBlocks;
- 	int checkpointBlocks;
- 
--	checkpointBlocks =  dev->nCheckpointReservedBlocks - dev->blocksInCheckpoint;
--	if(checkpointBlocks < 0)
-+	if (dev->isYaffs2) {
-+		checkpointBlocks =  yaffs_CalcCheckpointBlocksRequired(dev) -
-+				    dev->blocksInCheckpoint;
-+		if (checkpointBlocks < 0)
-+			checkpointBlocks = 0;
-+	} else {
- 		checkpointBlocks = 0;
-+	}
- 
- 	reservedChunks = ((reservedBlocks + checkpointBlocks) * dev->nChunksPerBlock);
- 
- 	return (dev->nFreeChunks > reservedChunks);
- }
- 
--static int yaffs_AllocateChunk(yaffs_Device * dev, int useReserve, yaffs_BlockInfo **blockUsedPtr)
-+static int yaffs_AllocateChunk(yaffs_Device *dev, int useReserve,
-+		yaffs_BlockInfo **blockUsedPtr)
- {
- 	int retVal;
- 	yaffs_BlockInfo *bi;
-@@ -2835,7 +2891,7 @@ static int yaffs_AllocateChunk(yaffs_Dev
- 	}
- 
- 	if (dev->nErasedBlocks < dev->nReservedBlocks
--	    && dev->allocationPage == 0) {
-+			&& dev->allocationPage == 0) {
- 		T(YAFFS_TRACE_ALLOCATE, (TSTR("Allocating reserve" TENDSTR)));
- 	}
- 
-@@ -2844,10 +2900,10 @@ static int yaffs_AllocateChunk(yaffs_Dev
- 		bi = yaffs_GetBlockInfo(dev, dev->allocationBlock);
- 
- 		retVal = (dev->allocationBlock * dev->nChunksPerBlock) +
--		    dev->allocationPage;
-+			dev->allocationPage;
- 		bi->pagesInUse++;
- 		yaffs_SetChunkBit(dev, dev->allocationBlock,
--				  dev->allocationPage);
-+				dev->allocationPage);
- 
- 		dev->allocationPage++;
- 
-@@ -2859,43 +2915,43 @@ static int yaffs_AllocateChunk(yaffs_Dev
- 			dev->allocationBlock = -1;
- 		}
- 
--		if(blockUsedPtr)
-+		if (blockUsedPtr)
- 			*blockUsedPtr = bi;
- 
- 		return retVal;
- 	}
- 
- 	T(YAFFS_TRACE_ERROR,
--	  (TSTR("!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!" TENDSTR)));
-+			(TSTR("!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!" TENDSTR)));
- 
- 	return -1;
- }
- 
--static int yaffs_GetErasedChunks(yaffs_Device * dev)
-+static int yaffs_GetErasedChunks(yaffs_Device *dev)
- {
- 	int n;
- 
- 	n = dev->nErasedBlocks * dev->nChunksPerBlock;
- 
--	if (dev->allocationBlock > 0) {
-+	if (dev->allocationBlock > 0)
- 		n += (dev->nChunksPerBlock - dev->allocationPage);
--	}
- 
- 	return n;
- 
- }
- 
--static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block)
-+static int yaffs_GarbageCollectBlock(yaffs_Device *dev, int block,
-+		int wholeBlock)
- {
- 	int oldChunk;
- 	int newChunk;
--	int chunkInBlock;
- 	int markNAND;
- 	int retVal = YAFFS_OK;
- 	int cleanups = 0;
- 	int i;
- 	int isCheckpointBlock;
- 	int matchingChunk;
-+	int maxCopies;
- 
- 	int chunksBefore = yaffs_GetErasedChunks(dev);
- 	int chunksAfter;
-@@ -2911,8 +2967,11 @@ static int yaffs_GarbageCollectBlock(yaf
- 	bi->blockState = YAFFS_BLOCK_STATE_COLLECTING;
- 
- 	T(YAFFS_TRACE_TRACING,
--	  (TSTR("Collecting block %d, in use %d, shrink %d, " TENDSTR), block,
--	   bi->pagesInUse, bi->hasShrinkHeader));
-+			(TSTR("Collecting block %d, in use %d, shrink %d, wholeBlock %d" TENDSTR),
-+			 block,
-+			 bi->pagesInUse,
-+			 bi->hasShrinkHeader,
-+			 wholeBlock));
- 
- 	/*yaffs_VerifyFreeChunks(dev); */
- 
-@@ -2926,26 +2985,33 @@ static int yaffs_GarbageCollectBlock(yaf
- 	dev->isDoingGC = 1;
- 
- 	if (isCheckpointBlock ||
--	    !yaffs_StillSomeChunkBits(dev, block)) {
-+			!yaffs_StillSomeChunkBits(dev, block)) {
- 		T(YAFFS_TRACE_TRACING,
--		  (TSTR
--		   ("Collecting block %d that has no chunks in use" TENDSTR),
--		   block));
-+				(TSTR
-+				 ("Collecting block %d that has no chunks in use" TENDSTR),
-+				 block));
- 		yaffs_BlockBecameDirty(dev, block);
- 	} else {
- 
- 		__u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
- 
--		yaffs_VerifyBlock(dev,bi,block);
-+		yaffs_VerifyBlock(dev, bi, block);
- 
--		for (chunkInBlock = 0, oldChunk = block * dev->nChunksPerBlock;
--		     chunkInBlock < dev->nChunksPerBlock
--		     && yaffs_StillSomeChunkBits(dev, block);
--		     chunkInBlock++, oldChunk++) {
--			if (yaffs_CheckChunkBit(dev, block, chunkInBlock)) {
-+		maxCopies = (wholeBlock) ? dev->nChunksPerBlock : 10;
-+		oldChunk = block * dev->nChunksPerBlock + dev->gcChunk;
-+
-+		for (/* init already done */;
-+		     retVal == YAFFS_OK &&
-+		     dev->gcChunk < dev->nChunksPerBlock &&
-+		     (bi->blockState == YAFFS_BLOCK_STATE_COLLECTING) &&
-+		     maxCopies > 0;
-+		     dev->gcChunk++, oldChunk++) {
-+			if (yaffs_CheckChunkBit(dev, block, dev->gcChunk)) {
- 
- 				/* This page is in use and might need to be copied off */
- 
-+				maxCopies--;
-+
- 				markNAND = 1;
- 
- 				yaffs_InitialiseTags(&tags);
-@@ -2959,22 +3025,22 @@ static int yaffs_GarbageCollectBlock(yaf
- 
- 				T(YAFFS_TRACE_GC_DETAIL,
- 				  (TSTR
--				   ("Collecting page %d, %d %d %d " TENDSTR),
--				   chunkInBlock, tags.objectId, tags.chunkId,
-+				   ("Collecting chunk in block %d, %d %d %d " TENDSTR),
-+				   dev->gcChunk, tags.objectId, tags.chunkId,
- 				   tags.byteCount));
- 
--				if(object && !yaffs_SkipVerification(dev)){
--					if(tags.chunkId == 0)
--						matchingChunk = object->chunkId;
--					else if(object->softDeleted)
-+				if (object && !yaffs_SkipVerification(dev)) {
-+					if (tags.chunkId == 0)
-+						matchingChunk = object->hdrChunk;
-+					else if (object->softDeleted)
- 						matchingChunk = oldChunk; /* Defeat the test */
- 					else
--						matchingChunk = yaffs_FindChunkInFile(object,tags.chunkId,NULL);
-+						matchingChunk = yaffs_FindChunkInFile(object, tags.chunkId, NULL);
- 
--					if(oldChunk != matchingChunk)
-+					if (oldChunk != matchingChunk)
- 						T(YAFFS_TRACE_ERROR,
- 						  (TSTR("gc: page in gc mismatch: %d %d %d %d"TENDSTR),
--						  oldChunk,matchingChunk,tags.objectId, tags.chunkId));
-+						  oldChunk, matchingChunk, tags.objectId, tags.chunkId));
- 
- 				}
- 
-@@ -2986,9 +3052,11 @@ static int yaffs_GarbageCollectBlock(yaf
- 					    tags.objectId, tags.chunkId, tags.byteCount));
- 				}
- 
--				if (object && object->deleted
--				    && tags.chunkId != 0) {
--					/* Data chunk in a deleted file, throw it away
-+				if (object &&
-+				    object->deleted &&
-+				    object->softDeleted &&
-+				    tags.chunkId != 0) {
-+					/* Data chunk in a soft deleted file, throw it away
- 					 * It's a soft deleted data chunk,
- 					 * No need to copy this, just forget about it and
- 					 * fix up the object.
-@@ -3003,13 +3071,12 @@ static int yaffs_GarbageCollectBlock(yaf
- 						cleanups++;
- 					}
- 					markNAND = 0;
--				} else if (0
--					   /* Todo object && object->deleted && object->nDataChunks == 0 */
--					   ) {
-+				} else if (0) {
-+					/* Todo object && object->deleted && object->nDataChunks == 0 */
- 					/* Deleted object header with no data chunks.
- 					 * Can be discarded and the file deleted.
- 					 */
--					object->chunkId = 0;
-+					object->hdrChunk = 0;
- 					yaffs_FreeTnode(object->myDev,
- 							object->variant.
- 							fileVariant.top);
-@@ -3031,17 +3098,14 @@ static int yaffs_GarbageCollectBlock(yaf
- 						 * We need to nuke the shrinkheader flags first
- 						 * We no longer want the shrinkHeader flag since its work is done
- 						 * and if it is left in place it will mess up scanning.
--						 * Also, clear out any shadowing stuff
- 						 */
- 
- 						yaffs_ObjectHeader *oh;
- 						oh = (yaffs_ObjectHeader *)buffer;
- 						oh->isShrink = 0;
--						oh->shadowsObject = -1;
--						tags.extraShadows = 0;
- 						tags.extraIsShrinkHeader = 0;
- 
--						yaffs_VerifyObjectHeader(object,oh,&tags,1);
-+						yaffs_VerifyObjectHeader(object, oh, &tags, 1);
- 					}
- 
- 					newChunk =
-@@ -3055,7 +3119,7 @@ static int yaffs_GarbageCollectBlock(yaf
- 
- 						if (tags.chunkId == 0) {
- 							/* It's a header */
--							object->chunkId =  newChunk;
-+							object->hdrChunk =  newChunk;
- 							object->serial =   tags.serialNumber;
- 						} else {
- 							/* It's a data chunk */
-@@ -3067,7 +3131,8 @@ static int yaffs_GarbageCollectBlock(yaf
- 					}
- 				}
- 
--				yaffs_DeleteChunk(dev, oldChunk, markNAND, __LINE__);
-+				if (retVal == YAFFS_OK)
-+					yaffs_DeleteChunk(dev, oldChunk, markNAND, __LINE__);
- 
- 			}
- 		}
-@@ -3098,18 +3163,25 @@ static int yaffs_GarbageCollectBlock(yaf
- 
- 	}
- 
--	yaffs_VerifyCollectedBlock(dev,bi,block);
-+	yaffs_VerifyCollectedBlock(dev, bi, block);
- 
--	if (chunksBefore >= (chunksAfter = yaffs_GetErasedChunks(dev))) {
-+	chunksAfter = yaffs_GetErasedChunks(dev);
-+	if (chunksBefore >= chunksAfter) {
- 		T(YAFFS_TRACE_GC,
- 		  (TSTR
- 		   ("gc did not increase free chunks before %d after %d"
- 		    TENDSTR), chunksBefore, chunksAfter));
- 	}
- 
-+	/* If the gc completed then clear the current gcBlock so that we find another. */
-+	if (bi->blockState != YAFFS_BLOCK_STATE_COLLECTING) {
-+		dev->gcBlock = -1;
-+		dev->gcChunk = 0;
-+	}
-+
- 	dev->isDoingGC = 0;
- 
--	return YAFFS_OK;
-+	return retVal;
- }
- 
- /* New garbage collector
-@@ -3121,7 +3193,7 @@ static int yaffs_GarbageCollectBlock(yaf
-  * The idea is to help clear out space in a more spread-out manner.
-  * Dunno if it really does anything useful.
-  */
--static int yaffs_CheckGarbageCollection(yaffs_Device * dev)
-+static int yaffs_CheckGarbageCollection(yaffs_Device *dev)
- {
- 	int block;
- 	int aggressive;
-@@ -3142,8 +3214,8 @@ static int yaffs_CheckGarbageCollection(
- 	do {
- 		maxTries++;
- 
--		checkpointBlockAdjust = (dev->nCheckpointReservedBlocks - dev->blocksInCheckpoint);
--		if(checkpointBlockAdjust < 0)
-+		checkpointBlockAdjust = yaffs_CalcCheckpointBlocksRequired(dev) - dev->blocksInCheckpoint;
-+		if (checkpointBlockAdjust < 0)
- 			checkpointBlockAdjust = 0;
- 
- 		if (dev->nErasedBlocks < (dev->nReservedBlocks + checkpointBlockAdjust + 2)) {
-@@ -3154,20 +3226,24 @@ static int yaffs_CheckGarbageCollection(
- 			aggressive = 0;
- 		}
- 
--		block = yaffs_FindBlockForGarbageCollection(dev, aggressive);
-+		if (dev->gcBlock <= 0) {
-+			dev->gcBlock = yaffs_FindBlockForGarbageCollection(dev, aggressive);
-+			dev->gcChunk = 0;
-+		}
-+
-+		block = dev->gcBlock;
- 
- 		if (block > 0) {
- 			dev->garbageCollections++;
--			if (!aggressive) {
-+			if (!aggressive)
- 				dev->passiveGarbageCollections++;
--			}
- 
- 			T(YAFFS_TRACE_GC,
- 			  (TSTR
- 			   ("yaffs: GC erasedBlocks %d aggressive %d" TENDSTR),
- 			   dev->nErasedBlocks, aggressive));
- 
--			gcOk = yaffs_GarbageCollectBlock(dev, block);
-+			gcOk = yaffs_GarbageCollectBlock(dev, block, aggressive);
- 		}
- 
- 		if (dev->nErasedBlocks < (dev->nReservedBlocks) && block > 0) {
-@@ -3176,15 +3252,16 @@ static int yaffs_CheckGarbageCollection(
- 			   ("yaffs: GC !!!no reclaim!!! erasedBlocks %d after try %d block %d"
- 			    TENDSTR), dev->nErasedBlocks, maxTries, block));
- 		}
--	} while ((dev->nErasedBlocks < dev->nReservedBlocks) && (block > 0)
--		 && (maxTries < 2));
-+	} while ((dev->nErasedBlocks < dev->nReservedBlocks) &&
-+		 (block > 0) &&
-+		 (maxTries < 2));
- 
- 	return aggressive ? gcOk : YAFFS_OK;
- }
- 
- /*-------------------------  TAGS --------------------------------*/
- 
--static int yaffs_TagsMatch(const yaffs_ExtendedTags * tags, int objectId,
-+static int yaffs_TagsMatch(const yaffs_ExtendedTags *tags, int objectId,
- 			   int chunkInObject)
- {
- 	return (tags->chunkId == chunkInObject &&
-@@ -3195,8 +3272,8 @@ static int yaffs_TagsMatch(const yaffs_E
- 
- /*-------------------- Data file manipulation -----------------*/
- 
--static int yaffs_FindChunkInFile(yaffs_Object * in, int chunkInInode,
--				 yaffs_ExtendedTags * tags)
-+static int yaffs_FindChunkInFile(yaffs_Object *in, int chunkInInode,
-+				 yaffs_ExtendedTags *tags)
- {
- 	/*Get the Tnode, then get the level 0 offset chunk offset */
- 	yaffs_Tnode *tn;
-@@ -3214,7 +3291,7 @@ static int yaffs_FindChunkInFile(yaffs_O
- 	tn = yaffs_FindLevel0Tnode(dev, &in->variant.fileVariant, chunkInInode);
- 
- 	if (tn) {
--		theChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode);
-+		theChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
- 
- 		retVal =
- 		    yaffs_FindChunkInGroup(dev, theChunk, tags, in->objectId,
-@@ -3223,8 +3300,8 @@ static int yaffs_FindChunkInFile(yaffs_O
- 	return retVal;
- }
- 
--static int yaffs_FindAndDeleteChunkInFile(yaffs_Object * in, int chunkInInode,
--					  yaffs_ExtendedTags * tags)
-+static int yaffs_FindAndDeleteChunkInFile(yaffs_Object *in, int chunkInInode,
-+					  yaffs_ExtendedTags *tags)
- {
- 	/* Get the Tnode, then get the level 0 offset chunk offset */
- 	yaffs_Tnode *tn;
-@@ -3243,29 +3320,23 @@ static int yaffs_FindAndDeleteChunkInFil
- 
- 	if (tn) {
- 
--		theChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode);
-+		theChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
- 
- 		retVal =
- 		    yaffs_FindChunkInGroup(dev, theChunk, tags, in->objectId,
- 					   chunkInInode);
- 
- 		/* Delete the entry in the filestructure (if found) */
--		if (retVal != -1) {
--			yaffs_PutLevel0Tnode(dev,tn,chunkInInode,0);
--		}
--	} else {
--		/*T(("No level 0 found for %d\n", chunkInInode)); */
-+		if (retVal != -1)
-+			yaffs_PutLevel0Tnode(dev, tn, chunkInInode, 0);
- 	}
- 
--	if (retVal == -1) {
--		/* T(("Could not find %d to delete\n",chunkInInode)); */
--	}
- 	return retVal;
- }
- 
- #ifdef YAFFS_PARANOID
- 
--static int yaffs_CheckFileSanity(yaffs_Object * in)
-+static int yaffs_CheckFileSanity(yaffs_Object *in)
- {
- 	int chunk;
- 	int nChunks;
-@@ -3278,10 +3349,8 @@ static int yaffs_CheckFileSanity(yaffs_O
- 	int theChunk;
- 	int chunkDeleted;
- 
--	if (in->variantType != YAFFS_OBJECT_TYPE_FILE) {
--		/* T(("Object not a file\n")); */
-+	if (in->variantType != YAFFS_OBJECT_TYPE_FILE)
- 		return YAFFS_FAIL;
--	}
- 
- 	objId = in->objectId;
- 	fSize = in->variant.fileVariant.fileSize;
-@@ -3294,7 +3363,7 @@ static int yaffs_CheckFileSanity(yaffs_O
- 
- 		if (tn) {
- 
--			theChunk = yaffs_GetChunkGroupBase(dev,tn,chunk);
-+			theChunk = yaffs_GetChunkGroupBase(dev, tn, chunk);
- 
- 			if (yaffs_CheckChunkBits
- 			    (dev, theChunk / dev->nChunksPerBlock,
-@@ -3323,7 +3392,7 @@ static int yaffs_CheckFileSanity(yaffs_O
- 
- #endif
- 
--static int yaffs_PutChunkIntoFile(yaffs_Object * in, int chunkInInode,
-+static int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode,
- 				  int chunkInNAND, int inScan)
- {
- 	/* NB inScan is zero unless scanning.
-@@ -3358,11 +3427,10 @@ static int yaffs_PutChunkIntoFile(yaffs_
- 					&in->variant.fileVariant,
- 					chunkInInode,
- 					NULL);
--	if (!tn) {
-+	if (!tn)
- 		return YAFFS_FAIL;
--	}
- 
--	existingChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode);
-+	existingChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
- 
- 	if (inScan != 0) {
- 		/* If we're scanning then we need to test for duplicates
-@@ -3374,7 +3442,7 @@ static int yaffs_PutChunkIntoFile(yaffs_
- 		 * Update: For backward scanning we don't need to re-read tags so this is quite cheap.
- 		 */
- 
--		if (existingChunk != 0) {
-+		if (existingChunk > 0) {
- 			/* NB Right now existing chunk will not be real chunkId if the device >= 32MB
- 			 *    thus we have to do a FindChunkInFile to get the real chunk id.
- 			 *
-@@ -3411,8 +3479,10 @@ static int yaffs_PutChunkIntoFile(yaffs_
- 			 * not be loaded during a scan
- 			 */
- 
--			newSerial = newTags.serialNumber;
--			existingSerial = existingTags.serialNumber;
-+			if (inScan > 0) {
-+				newSerial = newTags.serialNumber;
-+				existingSerial = existingTags.serialNumber;
-+			}
- 
- 			if ((inScan > 0) &&
- 			    (in->myDev->isYaffs2 ||
-@@ -3437,24 +3507,23 @@ static int yaffs_PutChunkIntoFile(yaffs_
- 
- 	}
- 
--	if (existingChunk == 0) {
-+	if (existingChunk == 0)
- 		in->nDataChunks++;
--	}
- 
--	yaffs_PutLevel0Tnode(dev,tn,chunkInInode,chunkInNAND);
-+	yaffs_PutLevel0Tnode(dev, tn, chunkInInode, chunkInNAND);
- 
- 	return YAFFS_OK;
- }
- 
--static int yaffs_ReadChunkDataFromObject(yaffs_Object * in, int chunkInInode,
--					 __u8 * buffer)
-+static int yaffs_ReadChunkDataFromObject(yaffs_Object *in, int chunkInInode,
-+					__u8 *buffer)
- {
- 	int chunkInNAND = yaffs_FindChunkInFile(in, chunkInInode, NULL);
- 
--	if (chunkInNAND >= 0) {
-+	if (chunkInNAND >= 0)
- 		return yaffs_ReadChunkWithTagsFromNAND(in->myDev, chunkInNAND,
--						       buffer,NULL);
--	} else {
-+						buffer, NULL);
-+	else {
- 		T(YAFFS_TRACE_NANDACCESS,
- 		  (TSTR("Chunk %d not found zero instead" TENDSTR),
- 		   chunkInNAND));
-@@ -3465,7 +3534,7 @@ static int yaffs_ReadChunkDataFromObject
- 
- }
- 
--void yaffs_DeleteChunk(yaffs_Device * dev, int chunkId, int markNAND, int lyn)
-+void yaffs_DeleteChunk(yaffs_Device *dev, int chunkId, int markNAND, int lyn)
- {
- 	int block;
- 	int page;
-@@ -3475,16 +3544,15 @@ void yaffs_DeleteChunk(yaffs_Device * de
- 	if (chunkId <= 0)
- 		return;
- 
--
- 	dev->nDeletions++;
- 	block = chunkId / dev->nChunksPerBlock;
- 	page = chunkId % dev->nChunksPerBlock;
- 
- 
--	if(!yaffs_CheckChunkBit(dev,block,page))
-+	if (!yaffs_CheckChunkBit(dev, block, page))
- 		T(YAFFS_TRACE_VERIFY,
--		 	(TSTR("Deleting invalid chunk %d"TENDSTR),
--		 	 chunkId));
-+			(TSTR("Deleting invalid chunk %d"TENDSTR),
-+			 chunkId));
- 
- 	bi = yaffs_GetBlockInfo(dev, block);
- 
-@@ -3524,14 +3592,12 @@ void yaffs_DeleteChunk(yaffs_Device * de
- 			yaffs_BlockBecameDirty(dev, block);
- 		}
- 
--	} else {
--		/* T(("Bad news deleting chunk %d\n",chunkId)); */
- 	}
- 
- }
- 
--static int yaffs_WriteChunkDataToObject(yaffs_Object * in, int chunkInInode,
--					const __u8 * buffer, int nBytes,
-+static int yaffs_WriteChunkDataToObject(yaffs_Object *in, int chunkInInode,
-+					const __u8 *buffer, int nBytes,
- 					int useReserve)
- {
- 	/* Find old chunk Need to do this to get serial number
-@@ -3561,6 +3627,12 @@ static int yaffs_WriteChunkDataToObject(
- 	    (prevChunkId >= 0) ? prevTags.serialNumber + 1 : 1;
- 	newTags.byteCount = nBytes;
- 
-+	if (nBytes < 1 || nBytes > dev->totalBytesPerChunk) {
-+		T(YAFFS_TRACE_ERROR,
-+		(TSTR("Writing %d bytes to chunk!!!!!!!!!" TENDSTR), nBytes));
-+		YBUG();
-+	}
-+
- 	newChunkId =
- 	    yaffs_WriteNewChunkWithTagsToNAND(dev, buffer, &newTags,
- 					      useReserve);
-@@ -3568,11 +3640,9 @@ static int yaffs_WriteChunkDataToObject(
- 	if (newChunkId >= 0) {
- 		yaffs_PutChunkIntoFile(in, chunkInInode, newChunkId, 0);
- 
--		if (prevChunkId >= 0) {
-+		if (prevChunkId >= 0)
- 			yaffs_DeleteChunk(dev, prevChunkId, 1, __LINE__);
- 
--		}
--
- 		yaffs_CheckFileSanity(in);
- 	}
- 	return newChunkId;
-@@ -3582,7 +3652,7 @@ static int yaffs_WriteChunkDataToObject(
- /* UpdateObjectHeader updates the header on NAND for an object.
-  * If name is not NULL, then that new name is used.
-  */
--int yaffs_UpdateObjectHeader(yaffs_Object * in, const YCHAR * name, int force,
-+int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name, int force,
- 			     int isShrink, int shadows)
- {
- 
-@@ -3603,9 +3673,12 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 
- 	yaffs_ObjectHeader *oh = NULL;
- 
--	yaffs_strcpy(oldName,"silly old name");
-+	yaffs_strcpy(oldName, _Y("silly old name"));
- 
--	if (!in->fake || force) {
-+
-+	if (!in->fake ||
-+		in == dev->rootDir || /* The rootDir should also be saved */
-+		force) {
- 
- 		yaffs_CheckGarbageCollection(dev);
- 		yaffs_CheckObjectDetailsLoaded(in);
-@@ -3613,13 +3686,13 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 		buffer = yaffs_GetTempBuffer(in->myDev, __LINE__);
- 		oh = (yaffs_ObjectHeader *) buffer;
- 
--		prevChunkId = in->chunkId;
-+		prevChunkId = in->hdrChunk;
- 
--		if (prevChunkId >= 0) {
-+		if (prevChunkId > 0) {
- 			result = yaffs_ReadChunkWithTagsFromNAND(dev, prevChunkId,
- 							buffer, &oldTags);
- 
--			yaffs_VerifyObjectHeader(in,oh,&oldTags,0);
-+			yaffs_VerifyObjectHeader(in, oh, &oldTags, 0);
- 
- 			memcpy(oldName, oh->name, sizeof(oh->name));
- 		}
-@@ -3628,7 +3701,7 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 
- 		oh->type = in->variantType;
- 		oh->yst_mode = in->yst_mode;
--		oh->shadowsObject = shadows;
-+		oh->shadowsObject = oh->inbandShadowsObject = shadows;
- 
- #ifdef CONFIG_YAFFS_WINCE
- 		oh->win_atime[0] = in->win_atime[0];
-@@ -3645,20 +3718,18 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 		oh->yst_ctime = in->yst_ctime;
- 		oh->yst_rdev = in->yst_rdev;
- #endif
--		if (in->parent) {
-+		if (in->parent)
- 			oh->parentObjectId = in->parent->objectId;
--		} else {
-+		else
- 			oh->parentObjectId = 0;
--		}
- 
- 		if (name && *name) {
- 			memset(oh->name, 0, sizeof(oh->name));
- 			yaffs_strncpy(oh->name, name, YAFFS_MAX_NAME_LENGTH);
--		} else if (prevChunkId>=0) {
-+		} else if (prevChunkId >= 0)
- 			memcpy(oh->name, oldName, sizeof(oh->name));
--		} else {
-+		else
- 			memset(oh->name, 0, sizeof(oh->name));
--		}
- 
- 		oh->isShrink = isShrink;
- 
-@@ -3708,7 +3779,7 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 		newTags.extraShadows = (oh->shadowsObject > 0) ? 1 : 0;
- 		newTags.extraObjectType = in->variantType;
- 
--		yaffs_VerifyObjectHeader(in,oh,&newTags,1);
-+		yaffs_VerifyObjectHeader(in, oh, &newTags, 1);
- 
- 		/* Create new chunk in NAND */
- 		newChunkId =
-@@ -3717,20 +3788,20 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 
- 		if (newChunkId >= 0) {
- 
--			in->chunkId = newChunkId;
-+			in->hdrChunk = newChunkId;
- 
- 			if (prevChunkId >= 0) {
- 				yaffs_DeleteChunk(dev, prevChunkId, 1,
- 						  __LINE__);
- 			}
- 
--			if(!yaffs_ObjectHasCachedWriteData(in))
-+			if (!yaffs_ObjectHasCachedWriteData(in))
- 				in->dirty = 0;
- 
- 			/* If this was a shrink, then mark the block that the chunk lives on */
- 			if (isShrink) {
- 				bi = yaffs_GetBlockInfo(in->myDev,
--							newChunkId /in->myDev->	nChunksPerBlock);
-+					newChunkId / in->myDev->nChunksPerBlock);
- 				bi->hasShrinkHeader = 1;
- 			}
- 
-@@ -3766,7 +3837,7 @@ static int yaffs_ObjectHasCachedWriteDat
- 	yaffs_ChunkCache *cache;
- 	int nCaches = obj->myDev->nShortOpCaches;
- 
--	for(i = 0; i < nCaches; i++){
-+	for (i = 0; i < nCaches; i++) {
- 		cache = &dev->srCache[i];
- 		if (cache->object == obj &&
- 		    cache->dirty)
-@@ -3777,7 +3848,7 @@ static int yaffs_ObjectHasCachedWriteDat
- }
- 
- 
--static void yaffs_FlushFilesChunkCache(yaffs_Object * obj)
-+static void yaffs_FlushFilesChunkCache(yaffs_Object *obj)
- {
- 	yaffs_Device *dev = obj->myDev;
- 	int lowest = -99;	/* Stop compiler whining. */
-@@ -3844,16 +3915,16 @@ void yaffs_FlushEntireDeviceCache(yaffs_
- 	 */
- 	do {
- 		obj = NULL;
--		for( i = 0; i < nCaches && !obj; i++) {
-+		for (i = 0; i < nCaches && !obj; i++) {
- 			if (dev->srCache[i].object &&
- 			    dev->srCache[i].dirty)
- 				obj = dev->srCache[i].object;
- 
- 		}
--		if(obj)
-+		if (obj)
- 			yaffs_FlushFilesChunkCache(obj);
- 
--	} while(obj);
-+	} while (obj);
- 
- }
- 
-@@ -3863,41 +3934,21 @@ void yaffs_FlushEntireDeviceCache(yaffs_
-  * Then look for the least recently used non-dirty one.
-  * Then look for the least recently used dirty one...., flush and look again.
-  */
--static yaffs_ChunkCache *yaffs_GrabChunkCacheWorker(yaffs_Device * dev)
-+static yaffs_ChunkCache *yaffs_GrabChunkCacheWorker(yaffs_Device *dev)
- {
- 	int i;
--	int usage;
--	int theOne;
- 
- 	if (dev->nShortOpCaches > 0) {
- 		for (i = 0; i < dev->nShortOpCaches; i++) {
- 			if (!dev->srCache[i].object)
- 				return &dev->srCache[i];
- 		}
-+	}
- 
--		return NULL;
-+	return NULL;
-+}
- 
--		theOne = -1;
--		usage = 0;	/* just to stop the compiler grizzling */
--
--		for (i = 0; i < dev->nShortOpCaches; i++) {
--			if (!dev->srCache[i].dirty &&
--			    ((dev->srCache[i].lastUse < usage && theOne >= 0) ||
--			     theOne < 0)) {
--				usage = dev->srCache[i].lastUse;
--				theOne = i;
--			}
--		}
--
--
--		return theOne >= 0 ? &dev->srCache[theOne] : NULL;
--	} else {
--		return NULL;
--	}
--
--}
--
--static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device * dev)
-+static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device *dev)
- {
- 	yaffs_ChunkCache *cache;
- 	yaffs_Object *theObj;
-@@ -3927,8 +3978,7 @@ static yaffs_ChunkCache *yaffs_GrabChunk
- 			for (i = 0; i < dev->nShortOpCaches; i++) {
- 				if (dev->srCache[i].object &&
- 				    !dev->srCache[i].locked &&
--				    (dev->srCache[i].lastUse < usage || !cache))
--				{
-+				    (dev->srCache[i].lastUse < usage || !cache)) {
- 					usage = dev->srCache[i].lastUse;
- 					theObj = dev->srCache[i].object;
- 					cache = &dev->srCache[i];
-@@ -3950,7 +4000,7 @@ static yaffs_ChunkCache *yaffs_GrabChunk
- }
- 
- /* Find a cached chunk */
--static yaffs_ChunkCache *yaffs_FindChunkCache(const yaffs_Object * obj,
-+static yaffs_ChunkCache *yaffs_FindChunkCache(const yaffs_Object *obj,
- 					      int chunkId)
- {
- 	yaffs_Device *dev = obj->myDev;
-@@ -3969,7 +4019,7 @@ static yaffs_ChunkCache *yaffs_FindChunk
- }
- 
- /* Mark the chunk for the least recently used algorithym */
--static void yaffs_UseChunkCache(yaffs_Device * dev, yaffs_ChunkCache * cache,
-+static void yaffs_UseChunkCache(yaffs_Device *dev, yaffs_ChunkCache *cache,
- 				int isAWrite)
- {
- 
-@@ -3977,9 +4027,9 @@ static void yaffs_UseChunkCache(yaffs_De
- 		if (dev->srLastUse < 0 || dev->srLastUse > 100000000) {
- 			/* Reset the cache usages */
- 			int i;
--			for (i = 1; i < dev->nShortOpCaches; i++) {
-+			for (i = 1; i < dev->nShortOpCaches; i++)
- 				dev->srCache[i].lastUse = 0;
--			}
-+
- 			dev->srLastUse = 0;
- 		}
- 
-@@ -3987,9 +4037,8 @@ static void yaffs_UseChunkCache(yaffs_De
- 
- 		cache->lastUse = dev->srLastUse;
- 
--		if (isAWrite) {
-+		if (isAWrite)
- 			cache->dirty = 1;
--		}
- 	}
- }
- 
-@@ -3997,21 +4046,20 @@ static void yaffs_UseChunkCache(yaffs_De
-  * Do this when a whole page gets written,
-  * ie the short cache for this page is no longer valid.
-  */
--static void yaffs_InvalidateChunkCache(yaffs_Object * object, int chunkId)
-+static void yaffs_InvalidateChunkCache(yaffs_Object *object, int chunkId)
- {
- 	if (object->myDev->nShortOpCaches > 0) {
- 		yaffs_ChunkCache *cache = yaffs_FindChunkCache(object, chunkId);
- 
--		if (cache) {
-+		if (cache)
- 			cache->object = NULL;
--		}
- 	}
- }
- 
- /* Invalidate all the cache pages associated with this object
-  * Do this whenever ther file is deleted or resized.
-  */
--static void yaffs_InvalidateWholeChunkCache(yaffs_Object * in)
-+static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in)
- {
- 	int i;
- 	yaffs_Device *dev = in->myDev;
-@@ -4019,9 +4067,8 @@ static void yaffs_InvalidateWholeChunkCa
- 	if (dev->nShortOpCaches > 0) {
- 		/* Invalidate it. */
- 		for (i = 0; i < dev->nShortOpCaches; i++) {
--			if (dev->srCache[i].object == in) {
-+			if (dev->srCache[i].object == in)
- 				dev->srCache[i].object = NULL;
--			}
- 		}
- 	}
- }
-@@ -4029,18 +4076,18 @@ static void yaffs_InvalidateWholeChunkCa
- /*--------------------- Checkpointing --------------------*/
- 
- 
--static int yaffs_WriteCheckpointValidityMarker(yaffs_Device *dev,int head)
-+static int yaffs_WriteCheckpointValidityMarker(yaffs_Device *dev, int head)
- {
- 	yaffs_CheckpointValidity cp;
- 
--	memset(&cp,0,sizeof(cp));
-+	memset(&cp, 0, sizeof(cp));
- 
- 	cp.structType = sizeof(cp);
- 	cp.magic = YAFFS_MAGIC;
- 	cp.version = YAFFS_CHECKPOINT_VERSION;
- 	cp.head = (head) ? 1 : 0;
- 
--	return (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp))?
-+	return (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp)) ?
- 		1 : 0;
- }
- 
-@@ -4049,9 +4096,9 @@ static int yaffs_ReadCheckpointValidityM
- 	yaffs_CheckpointValidity cp;
- 	int ok;
- 
--	ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp));
-+	ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
- 
--	if(ok)
-+	if (ok)
- 		ok = (cp.structType == sizeof(cp)) &&
- 		     (cp.magic == YAFFS_MAGIC) &&
- 		     (cp.version == YAFFS_CHECKPOINT_VERSION) &&
-@@ -4100,21 +4147,21 @@ static int yaffs_WriteCheckpointDevice(y
- 	int ok;
- 
- 	/* Write device runtime values*/
--	yaffs_DeviceToCheckpointDevice(&cp,dev);
-+	yaffs_DeviceToCheckpointDevice(&cp, dev);
- 	cp.structType = sizeof(cp);
- 
--	ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
-+	ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
- 
- 	/* Write block info */
--	if(ok) {
-+	if (ok) {
- 		nBytes = nBlocks * sizeof(yaffs_BlockInfo);
--		ok = (yaffs_CheckpointWrite(dev,dev->blockInfo,nBytes) == nBytes);
-+		ok = (yaffs_CheckpointWrite(dev, dev->blockInfo, nBytes) == nBytes);
- 	}
- 
- 	/* Write chunk bits */
--	if(ok) {
-+	if (ok) {
- 		nBytes = nBlocks * dev->chunkBitmapStride;
--		ok = (yaffs_CheckpointWrite(dev,dev->chunkBits,nBytes) == nBytes);
-+		ok = (yaffs_CheckpointWrite(dev, dev->chunkBits, nBytes) == nBytes);
- 	}
- 	return	 ok ? 1 : 0;
- 
-@@ -4128,25 +4175,25 @@ static int yaffs_ReadCheckpointDevice(ya
- 
- 	int ok;
- 
--	ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp));
--	if(!ok)
-+	ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
-+	if (!ok)
- 		return 0;
- 
--	if(cp.structType != sizeof(cp))
-+	if (cp.structType != sizeof(cp))
- 		return 0;
- 
- 
--	yaffs_CheckpointDeviceToDevice(dev,&cp);
-+	yaffs_CheckpointDeviceToDevice(dev, &cp);
- 
- 	nBytes = nBlocks * sizeof(yaffs_BlockInfo);
- 
--	ok = (yaffs_CheckpointRead(dev,dev->blockInfo,nBytes) == nBytes);
-+	ok = (yaffs_CheckpointRead(dev, dev->blockInfo, nBytes) == nBytes);
- 
--	if(!ok)
-+	if (!ok)
- 		return 0;
- 	nBytes = nBlocks * dev->chunkBitmapStride;
- 
--	ok = (yaffs_CheckpointRead(dev,dev->chunkBits,nBytes) == nBytes);
-+	ok = (yaffs_CheckpointRead(dev, dev->chunkBits, nBytes) == nBytes);
- 
- 	return ok ? 1 : 0;
- }
-@@ -4157,7 +4204,7 @@ static void yaffs_ObjectToCheckpointObje
- 
- 	cp->objectId = obj->objectId;
- 	cp->parentId = (obj->parent) ? obj->parent->objectId : 0;
--	cp->chunkId = obj->chunkId;
-+	cp->hdrChunk = obj->hdrChunk;
- 	cp->variantType = obj->variantType;
- 	cp->deleted = obj->deleted;
- 	cp->softDeleted = obj->softDeleted;
-@@ -4168,20 +4215,28 @@ static void yaffs_ObjectToCheckpointObje
- 	cp->serial = obj->serial;
- 	cp->nDataChunks = obj->nDataChunks;
- 
--	if(obj->variantType == YAFFS_OBJECT_TYPE_FILE)
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
- 		cp->fileSizeOrEquivalentObjectId = obj->variant.fileVariant.fileSize;
--	else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
-+	else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
- 		cp->fileSizeOrEquivalentObjectId = obj->variant.hardLinkVariant.equivalentObjectId;
- }
- 
--static void yaffs_CheckpointObjectToObject( yaffs_Object *obj,yaffs_CheckpointObject *cp)
-+static int yaffs_CheckpointObjectToObject(yaffs_Object *obj, yaffs_CheckpointObject *cp)
- {
- 
- 	yaffs_Object *parent;
- 
-+	if (obj->variantType != cp->variantType) {
-+		T(YAFFS_TRACE_ERROR, (TSTR("Checkpoint read object %d type %d "
-+			TCONT("chunk %d does not match existing object type %d")
-+			TENDSTR), cp->objectId, cp->variantType, cp->hdrChunk,
-+			obj->variantType));
-+		return 0;
-+	}
-+
- 	obj->objectId = cp->objectId;
- 
--	if(cp->parentId)
-+	if (cp->parentId)
- 		parent = yaffs_FindOrCreateObjectByNumber(
- 					obj->myDev,
- 					cp->parentId,
-@@ -4189,10 +4244,19 @@ static void yaffs_CheckpointObjectToObje
- 	else
- 		parent = NULL;
- 
--	if(parent)
-+	if (parent) {
-+		if (parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+			T(YAFFS_TRACE_ALWAYS, (TSTR("Checkpoint read object %d parent %d type %d"
-+				TCONT(" chunk %d Parent type, %d, not directory")
-+				TENDSTR),
-+				cp->objectId, cp->parentId, cp->variantType,
-+				cp->hdrChunk, parent->variantType));
-+			return 0;
-+		}
- 		yaffs_AddObjectToDirectory(parent, obj);
-+	}
- 
--	obj->chunkId = cp->chunkId;
-+	obj->hdrChunk = cp->hdrChunk;
- 	obj->variantType = cp->variantType;
- 	obj->deleted = cp->deleted;
- 	obj->softDeleted = cp->softDeleted;
-@@ -4203,29 +4267,34 @@ static void yaffs_CheckpointObjectToObje
- 	obj->serial = cp->serial;
- 	obj->nDataChunks = cp->nDataChunks;
- 
--	if(obj->variantType == YAFFS_OBJECT_TYPE_FILE)
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
- 		obj->variant.fileVariant.fileSize = cp->fileSizeOrEquivalentObjectId;
--	else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
-+	else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
- 		obj->variant.hardLinkVariant.equivalentObjectId = cp->fileSizeOrEquivalentObjectId;
- 
--	if(obj->objectId >= YAFFS_NOBJECT_BUCKETS)
-+	if (obj->hdrChunk > 0)
- 		obj->lazyLoaded = 1;
-+	return 1;
- }
- 
- 
- 
--static int yaffs_CheckpointTnodeWorker(yaffs_Object * in, yaffs_Tnode * tn,
--				  	__u32 level, int chunkOffset)
-+static int yaffs_CheckpointTnodeWorker(yaffs_Object *in, yaffs_Tnode *tn,
-+					__u32 level, int chunkOffset)
- {
- 	int i;
- 	yaffs_Device *dev = in->myDev;
- 	int ok = 1;
--	int nTnodeBytes = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-+	int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-+
-+	if (tnodeSize < sizeof(yaffs_Tnode))
-+		tnodeSize = sizeof(yaffs_Tnode);
-+
- 
- 	if (tn) {
- 		if (level > 0) {
- 
--			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++){
-+			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++) {
- 				if (tn->internal[i]) {
- 					ok = yaffs_CheckpointTnodeWorker(in,
- 							tn->internal[i],
-@@ -4235,10 +4304,9 @@ static int yaffs_CheckpointTnodeWorker(y
- 			}
- 		} else if (level == 0) {
- 			__u32 baseOffset = chunkOffset <<  YAFFS_TNODES_LEVEL0_BITS;
--			/* printf("write tnode at %d\n",baseOffset); */
--			ok = (yaffs_CheckpointWrite(dev,&baseOffset,sizeof(baseOffset)) == sizeof(baseOffset));
--			if(ok)
--				ok = (yaffs_CheckpointWrite(dev,tn,nTnodeBytes) == nTnodeBytes);
-+			ok = (yaffs_CheckpointWrite(dev, &baseOffset, sizeof(baseOffset)) == sizeof(baseOffset));
-+			if (ok)
-+				ok = (yaffs_CheckpointWrite(dev, tn, tnodeSize) == tnodeSize);
- 		}
- 	}
- 
-@@ -4251,13 +4319,13 @@ static int yaffs_WriteCheckpointTnodes(y
- 	__u32 endMarker = ~0;
- 	int ok = 1;
- 
--	if(obj->variantType == YAFFS_OBJECT_TYPE_FILE){
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
- 		ok = yaffs_CheckpointTnodeWorker(obj,
- 					    obj->variant.fileVariant.top,
- 					    obj->variant.fileVariant.topLevel,
- 					    0);
--		if(ok)
--			ok = (yaffs_CheckpointWrite(obj->myDev,&endMarker,sizeof(endMarker)) ==
-+		if (ok)
-+			ok = (yaffs_CheckpointWrite(obj->myDev, &endMarker, sizeof(endMarker)) ==
- 				sizeof(endMarker));
- 	}
- 
-@@ -4272,38 +4340,38 @@ static int yaffs_ReadCheckpointTnodes(ya
- 	yaffs_FileStructure *fileStructPtr = &obj->variant.fileVariant;
- 	yaffs_Tnode *tn;
- 	int nread = 0;
-+	int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
- 
--	ok = (yaffs_CheckpointRead(dev,&baseChunk,sizeof(baseChunk)) == sizeof(baseChunk));
-+	if (tnodeSize < sizeof(yaffs_Tnode))
-+		tnodeSize = sizeof(yaffs_Tnode);
- 
--	while(ok && (~baseChunk)){
-+	ok = (yaffs_CheckpointRead(dev, &baseChunk, sizeof(baseChunk)) == sizeof(baseChunk));
-+
-+	while (ok && (~baseChunk)) {
- 		nread++;
- 		/* Read level 0 tnode */
- 
- 
--		/* printf("read  tnode at %d\n",baseChunk); */
- 		tn = yaffs_GetTnodeRaw(dev);
--		if(tn)
--			ok = (yaffs_CheckpointRead(dev,tn,(dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8) ==
--			      (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
-+		if (tn)
-+			ok = (yaffs_CheckpointRead(dev, tn, tnodeSize) == tnodeSize);
- 		else
- 			ok = 0;
- 
--		if(tn && ok){
-+		if (tn && ok)
- 			ok = yaffs_AddOrFindLevel0Tnode(dev,
--					       		fileStructPtr,
--					       		baseChunk,
--					       		tn) ? 1 : 0;
-+							fileStructPtr,
-+							baseChunk,
-+							tn) ? 1 : 0;
- 
--		}
--
--		if(ok)
--			ok = (yaffs_CheckpointRead(dev,&baseChunk,sizeof(baseChunk)) == sizeof(baseChunk));
-+		if (ok)
-+			ok = (yaffs_CheckpointRead(dev, &baseChunk, sizeof(baseChunk)) == sizeof(baseChunk));
- 
- 	}
- 
--	T(YAFFS_TRACE_CHECKPOINT,(
-+	T(YAFFS_TRACE_CHECKPOINT, (
- 		TSTR("Checkpoint read tnodes %d records, last %d. ok %d" TENDSTR),
--		nread,baseChunk,ok));
-+		nread, baseChunk, ok));
- 
- 	return ok ? 1 : 0;
- }
-@@ -4315,41 +4383,40 @@ static int yaffs_WriteCheckpointObjects(
- 	yaffs_CheckpointObject cp;
- 	int i;
- 	int ok = 1;
--	struct list_head *lh;
-+	struct ylist_head *lh;
- 
- 
- 	/* Iterate through the objects in each hash entry,
- 	 * dumping them to the checkpointing stream.
- 	 */
- 
--	 for(i = 0; ok &&  i <  YAFFS_NOBJECT_BUCKETS; i++){
--	 	list_for_each(lh, &dev->objectBucket[i].list) {
-+	for (i = 0; ok &&  i <  YAFFS_NOBJECT_BUCKETS; i++) {
-+		ylist_for_each(lh, &dev->objectBucket[i].list) {
- 			if (lh) {
--				obj = list_entry(lh, yaffs_Object, hashLink);
-+				obj = ylist_entry(lh, yaffs_Object, hashLink);
- 				if (!obj->deferedFree) {
--					yaffs_ObjectToCheckpointObject(&cp,obj);
-+					yaffs_ObjectToCheckpointObject(&cp, obj);
- 					cp.structType = sizeof(cp);
- 
--					T(YAFFS_TRACE_CHECKPOINT,(
-+					T(YAFFS_TRACE_CHECKPOINT, (
- 						TSTR("Checkpoint write object %d parent %d type %d chunk %d obj addr %x" TENDSTR),
--						cp.objectId,cp.parentId,cp.variantType,cp.chunkId,(unsigned) obj));
-+						cp.objectId, cp.parentId, cp.variantType, cp.hdrChunk, (unsigned) obj));
- 
--					ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
-+					ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
- 
--					if(ok && obj->variantType == YAFFS_OBJECT_TYPE_FILE){
-+					if (ok && obj->variantType == YAFFS_OBJECT_TYPE_FILE)
- 						ok = yaffs_WriteCheckpointTnodes(obj);
--					}
- 				}
- 			}
- 		}
--	 }
-+	}
- 
--	 /* Dump end of list */
--	memset(&cp,0xFF,sizeof(yaffs_CheckpointObject));
-+	/* Dump end of list */
-+	memset(&cp, 0xFF, sizeof(yaffs_CheckpointObject));
- 	cp.structType = sizeof(cp);
- 
--	if(ok)
--		ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
-+	if (ok)
-+		ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
- 
- 	return ok ? 1 : 0;
- }
-@@ -4362,38 +4429,39 @@ static int yaffs_ReadCheckpointObjects(y
- 	int done = 0;
- 	yaffs_Object *hardList = NULL;
- 
--	while(ok && !done) {
--		ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp));
--		if(cp.structType != sizeof(cp)) {
--			T(YAFFS_TRACE_CHECKPOINT,(TSTR("struct size %d instead of %d ok %d"TENDSTR),
--				cp.structType,sizeof(cp),ok));
-+	while (ok && !done) {
-+		ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
-+		if (cp.structType != sizeof(cp)) {
-+			T(YAFFS_TRACE_CHECKPOINT, (TSTR("struct size %d instead of %d ok %d"TENDSTR),
-+				cp.structType, sizeof(cp), ok));
- 			ok = 0;
- 		}
- 
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("Checkpoint read object %d parent %d type %d chunk %d " TENDSTR),
--			cp.objectId,cp.parentId,cp.variantType,cp.chunkId));
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("Checkpoint read object %d parent %d type %d chunk %d " TENDSTR),
-+			cp.objectId, cp.parentId, cp.variantType, cp.hdrChunk));
- 
--		if(ok && cp.objectId == ~0)
-+		if (ok && cp.objectId == ~0)
- 			done = 1;
--		else if(ok){
--			obj = yaffs_FindOrCreateObjectByNumber(dev,cp.objectId, cp.variantType);
--			if(obj) {
--				yaffs_CheckpointObjectToObject(obj,&cp);
--				if(obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
-+		else if (ok) {
-+			obj = yaffs_FindOrCreateObjectByNumber(dev, cp.objectId, cp.variantType);
-+			if (obj) {
-+				ok = yaffs_CheckpointObjectToObject(obj, &cp);
-+				if (!ok)
-+					break;
-+				if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
- 					ok = yaffs_ReadCheckpointTnodes(obj);
--				} else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
-+				} else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
- 					obj->hardLinks.next =
--						    (struct list_head *)
--						    hardList;
-+						(struct ylist_head *) hardList;
- 					hardList = obj;
- 				}
--
--			}
-+			} else
-+				ok = 0;
- 		}
- 	}
- 
--	if(ok)
--		yaffs_HardlinkFixup(dev,hardList);
-+	if (ok)
-+		yaffs_HardlinkFixup(dev, hardList);
- 
- 	return ok ? 1 : 0;
- }
-@@ -4403,11 +4471,11 @@ static int yaffs_WriteCheckpointSum(yaff
- 	__u32 checkpointSum;
- 	int ok;
- 
--	yaffs_GetCheckpointSum(dev,&checkpointSum);
-+	yaffs_GetCheckpointSum(dev, &checkpointSum);
- 
--	ok = (yaffs_CheckpointWrite(dev,&checkpointSum,sizeof(checkpointSum)) == sizeof(checkpointSum));
-+	ok = (yaffs_CheckpointWrite(dev, &checkpointSum, sizeof(checkpointSum)) == sizeof(checkpointSum));
- 
--	if(!ok)
-+	if (!ok)
- 		return 0;
- 
- 	return 1;
-@@ -4419,14 +4487,14 @@ static int yaffs_ReadCheckpointSum(yaffs
- 	__u32 checkpointSum1;
- 	int ok;
- 
--	yaffs_GetCheckpointSum(dev,&checkpointSum0);
-+	yaffs_GetCheckpointSum(dev, &checkpointSum0);
- 
--	ok = (yaffs_CheckpointRead(dev,&checkpointSum1,sizeof(checkpointSum1)) == sizeof(checkpointSum1));
-+	ok = (yaffs_CheckpointRead(dev, &checkpointSum1, sizeof(checkpointSum1)) == sizeof(checkpointSum1));
- 
--	if(!ok)
-+	if (!ok)
- 		return 0;
- 
--	if(checkpointSum0 != checkpointSum1)
-+	if (checkpointSum0 != checkpointSum1)
- 		return 0;
- 
- 	return 1;
-@@ -4435,46 +4503,43 @@ static int yaffs_ReadCheckpointSum(yaffs
- 
- static int yaffs_WriteCheckpointData(yaffs_Device *dev)
- {
--
- 	int ok = 1;
- 
--	if(dev->skipCheckpointWrite || !dev->isYaffs2){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("skipping checkpoint write" TENDSTR)));
-+	if (dev->skipCheckpointWrite || !dev->isYaffs2) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("skipping checkpoint write" TENDSTR)));
- 		ok = 0;
- 	}
- 
--	if(ok)
--		ok = yaffs_CheckpointOpen(dev,1);
-+	if (ok)
-+		ok = yaffs_CheckpointOpen(dev, 1);
- 
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint validity" TENDSTR)));
--		ok = yaffs_WriteCheckpointValidityMarker(dev,1);
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint validity" TENDSTR)));
-+		ok = yaffs_WriteCheckpointValidityMarker(dev, 1);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint device" TENDSTR)));
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint device" TENDSTR)));
- 		ok = yaffs_WriteCheckpointDevice(dev);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint objects" TENDSTR)));
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint objects" TENDSTR)));
- 		ok = yaffs_WriteCheckpointObjects(dev);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint validity" TENDSTR)));
--		ok = yaffs_WriteCheckpointValidityMarker(dev,0);
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint validity" TENDSTR)));
-+		ok = yaffs_WriteCheckpointValidityMarker(dev, 0);
- 	}
- 
--	if(ok){
-+	if (ok)
- 		ok = yaffs_WriteCheckpointSum(dev);
--	}
--
- 
--	if(!yaffs_CheckpointClose(dev))
--		 ok = 0;
-+	if (!yaffs_CheckpointClose(dev))
-+		ok = 0;
- 
--	if(ok)
--	    	dev->isCheckpointed = 1;
--	 else
--	 	dev->isCheckpointed = 0;
-+	if (ok)
-+		dev->isCheckpointed = 1;
-+	else
-+		dev->isCheckpointed = 0;
- 
- 	return dev->isCheckpointed;
- }
-@@ -4483,43 +4548,43 @@ static int yaffs_ReadCheckpointData(yaff
- {
- 	int ok = 1;
- 
--	if(dev->skipCheckpointRead || !dev->isYaffs2){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("skipping checkpoint read" TENDSTR)));
-+	if (dev->skipCheckpointRead || !dev->isYaffs2) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("skipping checkpoint read" TENDSTR)));
- 		ok = 0;
- 	}
- 
--	if(ok)
--		ok = yaffs_CheckpointOpen(dev,0); /* open for read */
-+	if (ok)
-+		ok = yaffs_CheckpointOpen(dev, 0); /* open for read */
- 
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint validity" TENDSTR)));
--		ok = yaffs_ReadCheckpointValidityMarker(dev,1);
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint validity" TENDSTR)));
-+		ok = yaffs_ReadCheckpointValidityMarker(dev, 1);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint device" TENDSTR)));
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint device" TENDSTR)));
- 		ok = yaffs_ReadCheckpointDevice(dev);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint objects" TENDSTR)));
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint objects" TENDSTR)));
- 		ok = yaffs_ReadCheckpointObjects(dev);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint validity" TENDSTR)));
--		ok = yaffs_ReadCheckpointValidityMarker(dev,0);
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint validity" TENDSTR)));
-+		ok = yaffs_ReadCheckpointValidityMarker(dev, 0);
- 	}
- 
--	if(ok){
-+	if (ok) {
- 		ok = yaffs_ReadCheckpointSum(dev);
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint checksum %d" TENDSTR),ok));
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint checksum %d" TENDSTR), ok));
- 	}
- 
--	if(!yaffs_CheckpointClose(dev))
-+	if (!yaffs_CheckpointClose(dev))
- 		ok = 0;
- 
--	if(ok)
--	    	dev->isCheckpointed = 1;
--	 else
--	 	dev->isCheckpointed = 0;
-+	if (ok)
-+		dev->isCheckpointed = 1;
-+	else
-+		dev->isCheckpointed = 0;
- 
- 	return ok ? 1 : 0;
- 
-@@ -4527,11 +4592,11 @@ static int yaffs_ReadCheckpointData(yaff
- 
- static void yaffs_InvalidateCheckpoint(yaffs_Device *dev)
- {
--	if(dev->isCheckpointed ||
--	   dev->blocksInCheckpoint > 0){
-+	if (dev->isCheckpointed ||
-+			dev->blocksInCheckpoint > 0) {
- 		dev->isCheckpointed = 0;
- 		yaffs_CheckpointInvalidateStream(dev);
--		if(dev->superBlock && dev->markSuperBlockDirty)
-+		if (dev->superBlock && dev->markSuperBlockDirty)
- 			dev->markSuperBlockDirty(dev->superBlock);
- 	}
- }
-@@ -4540,18 +4605,18 @@ static void yaffs_InvalidateCheckpoint(y
- int yaffs_CheckpointSave(yaffs_Device *dev)
- {
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("save entry: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("save entry: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
- 
- 	yaffs_VerifyObjects(dev);
- 	yaffs_VerifyBlocks(dev);
- 	yaffs_VerifyFreeChunks(dev);
- 
--	if(!dev->isCheckpointed) {
-+	if (!dev->isCheckpointed) {
- 		yaffs_InvalidateCheckpoint(dev);
- 		yaffs_WriteCheckpointData(dev);
- 	}
- 
--	T(YAFFS_TRACE_ALWAYS,(TSTR("save exit: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-+	T(YAFFS_TRACE_ALWAYS, (TSTR("save exit: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
- 
- 	return dev->isCheckpointed;
- }
-@@ -4559,17 +4624,17 @@ int yaffs_CheckpointSave(yaffs_Device *d
- int yaffs_CheckpointRestore(yaffs_Device *dev)
- {
- 	int retval;
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("restore entry: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("restore entry: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
- 
- 	retval = yaffs_ReadCheckpointData(dev);
- 
--	if(dev->isCheckpointed){
-+	if (dev->isCheckpointed) {
- 		yaffs_VerifyObjects(dev);
- 		yaffs_VerifyBlocks(dev);
- 		yaffs_VerifyFreeChunks(dev);
- 	}
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("restore exit: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("restore exit: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
- 
- 	return retval;
- }
-@@ -4584,12 +4649,12 @@ int yaffs_CheckpointRestore(yaffs_Device
-  * Curve-balls: the first chunk might also be the last chunk.
-  */
- 
--int yaffs_ReadDataFromFile(yaffs_Object * in, __u8 * buffer, loff_t offset,
--			   int nBytes)
-+int yaffs_ReadDataFromFile(yaffs_Object *in, __u8 *buffer, loff_t offset,
-+			int nBytes)
- {
- 
- 	int chunk;
--	int start;
-+	__u32 start;
- 	int nToCopy;
- 	int n = nBytes;
- 	int nDone = 0;
-@@ -4600,27 +4665,26 @@ int yaffs_ReadDataFromFile(yaffs_Object 
- 	dev = in->myDev;
- 
- 	while (n > 0) {
--		//chunk = offset / dev->nDataBytesPerChunk + 1;
--		//start = offset % dev->nDataBytesPerChunk;
--		yaffs_AddrToChunk(dev,offset,&chunk,&start);
-+		/* chunk = offset / dev->nDataBytesPerChunk + 1; */
-+		/* start = offset % dev->nDataBytesPerChunk; */
-+		yaffs_AddrToChunk(dev, offset, &chunk, &start);
- 		chunk++;
- 
- 		/* OK now check for the curveball where the start and end are in
- 		 * the same chunk.
- 		 */
--		if ((start + n) < dev->nDataBytesPerChunk) {
-+		if ((start + n) < dev->nDataBytesPerChunk)
- 			nToCopy = n;
--		} else {
-+		else
- 			nToCopy = dev->nDataBytesPerChunk - start;
--		}
- 
- 		cache = yaffs_FindChunkCache(in, chunk);
- 
- 		/* If the chunk is already in the cache or it is less than a whole chunk
--		 * then use the cache (if there is caching)
-+		 * or we're using inband tags then use the cache (if there is caching)
- 		 * else bypass the cache.
- 		 */
--		if (cache || nToCopy != dev->nDataBytesPerChunk) {
-+		if (cache || nToCopy != dev->nDataBytesPerChunk || dev->inbandTags) {
- 			if (dev->nShortOpCaches > 0) {
- 
- 				/* If we can't find the data in the cache, then load it up. */
-@@ -4641,14 +4705,9 @@ int yaffs_ReadDataFromFile(yaffs_Object 
- 
- 				cache->locked = 1;
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_UnlockYAFFS(TRUE);
--#endif
-+
- 				memcpy(buffer, &cache->data[start], nToCopy);
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_LockYAFFS(TRUE);
--#endif
- 				cache->locked = 0;
- 			} else {
- 				/* Read into the local buffer then copy..*/
-@@ -4657,41 +4716,19 @@ int yaffs_ReadDataFromFile(yaffs_Object 
- 				    yaffs_GetTempBuffer(dev, __LINE__);
- 				yaffs_ReadChunkDataFromObject(in, chunk,
- 							      localBuffer);
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_UnlockYAFFS(TRUE);
--#endif
-+
- 				memcpy(buffer, &localBuffer[start], nToCopy);
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_LockYAFFS(TRUE);
--#endif
-+
- 				yaffs_ReleaseTempBuffer(dev, localBuffer,
- 							__LINE__);
- 			}
- 
- 		} else {
--#ifdef CONFIG_YAFFS_WINCE
--			__u8 *localBuffer = yaffs_GetTempBuffer(dev, __LINE__);
--
--			/* Under WinCE can't do direct transfer. Need to use a local buffer.
--			 * This is because we otherwise screw up WinCE's memory mapper
--			 */
--			yaffs_ReadChunkDataFromObject(in, chunk, localBuffer);
--
--#ifdef CONFIG_YAFFS_WINCE
--			yfsd_UnlockYAFFS(TRUE);
--#endif
--			memcpy(buffer, localBuffer, dev->nDataBytesPerChunk);
- 
--#ifdef CONFIG_YAFFS_WINCE
--			yfsd_LockYAFFS(TRUE);
--			yaffs_ReleaseTempBuffer(dev, localBuffer, __LINE__);
--#endif
--
--#else
- 			/* A full chunk. Read directly into the supplied buffer. */
- 			yaffs_ReadChunkDataFromObject(in, chunk, buffer);
--#endif
-+
- 		}
- 
- 		n -= nToCopy;
-@@ -4704,28 +4741,37 @@ int yaffs_ReadDataFromFile(yaffs_Object 
- 	return nDone;
- }
- 
--int yaffs_WriteDataToFile(yaffs_Object * in, const __u8 * buffer, loff_t offset,
--			  int nBytes, int writeThrough)
-+int yaffs_WriteDataToFile(yaffs_Object *in, const __u8 *buffer, loff_t offset,
-+			int nBytes, int writeThrough)
- {
- 
- 	int chunk;
--	int start;
-+	__u32 start;
- 	int nToCopy;
- 	int n = nBytes;
- 	int nDone = 0;
- 	int nToWriteBack;
- 	int startOfWrite = offset;
- 	int chunkWritten = 0;
--	int nBytesRead;
-+	__u32 nBytesRead;
-+	__u32 chunkStart;
- 
- 	yaffs_Device *dev;
- 
- 	dev = in->myDev;
- 
- 	while (n > 0 && chunkWritten >= 0) {
--		//chunk = offset / dev->nDataBytesPerChunk + 1;
--		//start = offset % dev->nDataBytesPerChunk;
--		yaffs_AddrToChunk(dev,offset,&chunk,&start);
-+		/* chunk = offset / dev->nDataBytesPerChunk + 1; */
-+		/* start = offset % dev->nDataBytesPerChunk; */
-+		yaffs_AddrToChunk(dev, offset, &chunk, &start);
-+
-+		if (chunk * dev->nDataBytesPerChunk + start != offset ||
-+				start >= dev->nDataBytesPerChunk) {
-+			T(YAFFS_TRACE_ERROR, (
-+			   TSTR("AddrToChunk of offset %d gives chunk %d start %d"
-+			   TENDSTR),
-+			   (int)offset, chunk, start));
-+		}
- 		chunk++;
- 
- 		/* OK now check for the curveball where the start and end are in
-@@ -4740,25 +4786,32 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 			 * we need to write back as much as was there before.
- 			 */
- 
--			nBytesRead =
--			    in->variant.fileVariant.fileSize -
--			    ((chunk - 1) * dev->nDataBytesPerChunk);
-+			chunkStart = ((chunk - 1) * dev->nDataBytesPerChunk);
-+
-+			if (chunkStart > in->variant.fileVariant.fileSize)
-+				nBytesRead = 0; /* Past end of file */
-+			else
-+				nBytesRead = in->variant.fileVariant.fileSize - chunkStart;
- 
--			if (nBytesRead > dev->nDataBytesPerChunk) {
-+			if (nBytesRead > dev->nDataBytesPerChunk)
- 				nBytesRead = dev->nDataBytesPerChunk;
--			}
- 
- 			nToWriteBack =
- 			    (nBytesRead >
- 			     (start + n)) ? nBytesRead : (start + n);
- 
-+			if (nToWriteBack < 0 || nToWriteBack > dev->nDataBytesPerChunk)
-+				YBUG();
-+
- 		} else {
- 			nToCopy = dev->nDataBytesPerChunk - start;
- 			nToWriteBack = dev->nDataBytesPerChunk;
- 		}
- 
--		if (nToCopy != dev->nDataBytesPerChunk) {
--			/* An incomplete start or end chunk (or maybe both start and end chunk) */
-+		if (nToCopy != dev->nDataBytesPerChunk || dev->inbandTags) {
-+			/* An incomplete start or end chunk (or maybe both start and end chunk),
-+			 * or we're using inband tags, so we want to use the cache buffers.
-+			 */
- 			if (dev->nShortOpCaches > 0) {
- 				yaffs_ChunkCache *cache;
- 				/* If we can't find the data in the cache, then load the cache */
-@@ -4775,10 +4828,9 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 					yaffs_ReadChunkDataFromObject(in, chunk,
- 								      cache->
- 								      data);
--				}
--				else if(cache &&
--				        !cache->dirty &&
--					!yaffs_CheckSpaceForAllocation(in->myDev)){
-+				} else if (cache &&
-+					!cache->dirty &&
-+					!yaffs_CheckSpaceForAllocation(in->myDev)) {
- 					/* Drop the cache if it was a read cache item and
- 					 * no space check has been made for it.
- 					 */
-@@ -4788,16 +4840,12 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 				if (cache) {
- 					yaffs_UseChunkCache(dev, cache, 1);
- 					cache->locked = 1;
--#ifdef CONFIG_YAFFS_WINCE
--					yfsd_UnlockYAFFS(TRUE);
--#endif
-+
- 
- 					memcpy(&cache->data[start], buffer,
- 					       nToCopy);
- 
--#ifdef CONFIG_YAFFS_WINCE
--					yfsd_LockYAFFS(TRUE);
--#endif
-+
- 					cache->locked = 0;
- 					cache->nBytes = nToWriteBack;
- 
-@@ -4825,15 +4873,10 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 				yaffs_ReadChunkDataFromObject(in, chunk,
- 							      localBuffer);
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_UnlockYAFFS(TRUE);
--#endif
-+
- 
- 				memcpy(&localBuffer[start], buffer, nToCopy);
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_LockYAFFS(TRUE);
--#endif
- 				chunkWritten =
- 				    yaffs_WriteChunkDataToObject(in, chunk,
- 								 localBuffer,
-@@ -4846,31 +4889,15 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 			}
- 
- 		} else {
--
--#ifdef CONFIG_YAFFS_WINCE
--			/* Under WinCE can't do direct transfer. Need to use a local buffer.
--			 * This is because we otherwise screw up WinCE's memory mapper
--			 */
--			__u8 *localBuffer = yaffs_GetTempBuffer(dev, __LINE__);
--#ifdef CONFIG_YAFFS_WINCE
--			yfsd_UnlockYAFFS(TRUE);
--#endif
--			memcpy(localBuffer, buffer, dev->nDataBytesPerChunk);
--#ifdef CONFIG_YAFFS_WINCE
--			yfsd_LockYAFFS(TRUE);
--#endif
--			chunkWritten =
--			    yaffs_WriteChunkDataToObject(in, chunk, localBuffer,
--							 dev->nDataBytesPerChunk,
--							 0);
--			yaffs_ReleaseTempBuffer(dev, localBuffer, __LINE__);
--#else
- 			/* A full chunk. Write directly from the supplied buffer. */
-+
-+
-+
- 			chunkWritten =
- 			    yaffs_WriteChunkDataToObject(in, chunk, buffer,
- 							 dev->nDataBytesPerChunk,
- 							 0);
--#endif
-+
- 			/* Since we've overwritten the cached data, we better invalidate it. */
- 			yaffs_InvalidateChunkCache(in, chunk);
- 		}
-@@ -4886,9 +4913,8 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 
- 	/* Update file object */
- 
--	if ((startOfWrite + nDone) > in->variant.fileVariant.fileSize) {
-+	if ((startOfWrite + nDone) > in->variant.fileVariant.fileSize)
- 		in->variant.fileVariant.fileSize = (startOfWrite + nDone);
--	}
- 
- 	in->dirty = 1;
- 
-@@ -4898,7 +4924,7 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 
- /* ---------------------- File resizing stuff ------------------ */
- 
--static void yaffs_PruneResizedChunks(yaffs_Object * in, int newSize)
-+static void yaffs_PruneResizedChunks(yaffs_Object *in, int newSize)
- {
- 
- 	yaffs_Device *dev = in->myDev;
-@@ -4939,11 +4965,11 @@ static void yaffs_PruneResizedChunks(yaf
- 
- }
- 
--int yaffs_ResizeFile(yaffs_Object * in, loff_t newSize)
-+int yaffs_ResizeFile(yaffs_Object *in, loff_t newSize)
- {
- 
- 	int oldFileSize = in->variant.fileVariant.fileSize;
--	int newSizeOfPartialChunk;
-+	__u32 newSizeOfPartialChunk;
- 	int newFullChunks;
- 
- 	yaffs_Device *dev = in->myDev;
-@@ -4955,13 +4981,11 @@ int yaffs_ResizeFile(yaffs_Object * in, 
- 
- 	yaffs_CheckGarbageCollection(dev);
- 
--	if (in->variantType != YAFFS_OBJECT_TYPE_FILE) {
--		return yaffs_GetFileSize(in);
--	}
-+	if (in->variantType != YAFFS_OBJECT_TYPE_FILE)
-+		return YAFFS_FAIL;
- 
--	if (newSize == oldFileSize) {
--		return oldFileSize;
--	}
-+	if (newSize == oldFileSize)
-+		return YAFFS_OK;
- 
- 	if (newSize < oldFileSize) {
- 
-@@ -4994,21 +5018,20 @@ int yaffs_ResizeFile(yaffs_Object * in, 
- 	}
- 
- 
--
- 	/* Write a new object header.
- 	 * show we've shrunk the file, if need be
- 	 * Do this only if the file is not in the deleted directories.
- 	 */
--	if (in->parent->objectId != YAFFS_OBJECTID_UNLINKED &&
--	    in->parent->objectId != YAFFS_OBJECTID_DELETED) {
-+	if (in->parent &&
-+	    in->parent->objectId != YAFFS_OBJECTID_UNLINKED &&
-+	    in->parent->objectId != YAFFS_OBJECTID_DELETED)
- 		yaffs_UpdateObjectHeader(in, NULL, 0,
- 					 (newSize < oldFileSize) ? 1 : 0, 0);
--	}
- 
--	return newSize;
-+	return YAFFS_OK;
- }
- 
--loff_t yaffs_GetFileSize(yaffs_Object * obj)
-+loff_t yaffs_GetFileSize(yaffs_Object *obj)
- {
- 	obj = yaffs_GetEquivalentObject(obj);
- 
-@@ -5024,7 +5047,7 @@ loff_t yaffs_GetFileSize(yaffs_Object * 
- 
- 
- 
--int yaffs_FlushFile(yaffs_Object * in, int updateTime)
-+int yaffs_FlushFile(yaffs_Object *in, int updateTime)
- {
- 	int retVal;
- 	if (in->dirty) {
-@@ -5039,9 +5062,8 @@ int yaffs_FlushFile(yaffs_Object * in, i
- #endif
- 		}
- 
--		retVal =
--		    (yaffs_UpdateObjectHeader(in, NULL, 0, 0, 0) >=
--		     0) ? YAFFS_OK : YAFFS_FAIL;
-+		retVal = (yaffs_UpdateObjectHeader(in, NULL, 0, 0, 0) >=
-+			0) ? YAFFS_OK : YAFFS_FAIL;
- 	} else {
- 		retVal = YAFFS_OK;
- 	}
-@@ -5050,7 +5072,7 @@ int yaffs_FlushFile(yaffs_Object * in, i
- 
- }
- 
--static int yaffs_DoGenericObjectDeletion(yaffs_Object * in)
-+static int yaffs_DoGenericObjectDeletion(yaffs_Object *in)
- {
- 
- 	/* First off, invalidate the file's data in the cache, without flushing. */
-@@ -5058,13 +5080,13 @@ static int yaffs_DoGenericObjectDeletion
- 
- 	if (in->myDev->isYaffs2 && (in->parent != in->myDev->deletedDir)) {
- 		/* Move to the unlinked directory so we have a record that it was deleted. */
--		yaffs_ChangeObjectName(in, in->myDev->deletedDir,"deleted", 0, 0);
-+		yaffs_ChangeObjectName(in, in->myDev->deletedDir, _Y("deleted"), 0, 0);
- 
- 	}
- 
- 	yaffs_RemoveObjectFromDirectory(in);
--	yaffs_DeleteChunk(in->myDev, in->chunkId, 1, __LINE__);
--	in->chunkId = -1;
-+	yaffs_DeleteChunk(in->myDev, in->hdrChunk, 1, __LINE__);
-+	in->hdrChunk = 0;
- 
- 	yaffs_FreeObject(in);
- 	return YAFFS_OK;
-@@ -5075,62 +5097,63 @@ static int yaffs_DoGenericObjectDeletion
-  * and the inode associated with the file.
-  * It does not delete the links associated with the file.
-  */
--static int yaffs_UnlinkFile(yaffs_Object * in)
-+static int yaffs_UnlinkFileIfNeeded(yaffs_Object *in)
- {
- 
- 	int retVal;
- 	int immediateDeletion = 0;
- 
--	if (1) {
- #ifdef __KERNEL__
--		if (!in->myInode) {
--			immediateDeletion = 1;
--
--		}
-+	if (!in->myInode)
-+		immediateDeletion = 1;
- #else
--		if (in->inUse <= 0) {
--			immediateDeletion = 1;
--
--		}
-+	if (in->inUse <= 0)
-+		immediateDeletion = 1;
- #endif
--		if (immediateDeletion) {
--			retVal =
--			    yaffs_ChangeObjectName(in, in->myDev->deletedDir,
--						   "deleted", 0, 0);
--			T(YAFFS_TRACE_TRACING,
--			  (TSTR("yaffs: immediate deletion of file %d" TENDSTR),
--			   in->objectId));
--			in->deleted = 1;
--			in->myDev->nDeletedFiles++;
--			if (0 && in->myDev->isYaffs2) {
--				yaffs_ResizeFile(in, 0);
--			}
--			yaffs_SoftDeleteFile(in);
--		} else {
--			retVal =
--			    yaffs_ChangeObjectName(in, in->myDev->unlinkedDir,
--						   "unlinked", 0, 0);
--		}
- 
-+	if (immediateDeletion) {
-+		retVal =
-+		    yaffs_ChangeObjectName(in, in->myDev->deletedDir,
-+					   _Y("deleted"), 0, 0);
-+		T(YAFFS_TRACE_TRACING,
-+		  (TSTR("yaffs: immediate deletion of file %d" TENDSTR),
-+		   in->objectId));
-+		in->deleted = 1;
-+		in->myDev->nDeletedFiles++;
-+		if (1 || in->myDev->isYaffs2)
-+			yaffs_ResizeFile(in, 0);
-+		yaffs_SoftDeleteFile(in);
-+	} else {
-+		retVal =
-+		    yaffs_ChangeObjectName(in, in->myDev->unlinkedDir,
-+					   _Y("unlinked"), 0, 0);
- 	}
-+
-+
- 	return retVal;
- }
- 
--int yaffs_DeleteFile(yaffs_Object * in)
-+int yaffs_DeleteFile(yaffs_Object *in)
- {
- 	int retVal = YAFFS_OK;
-+	int deleted = in->deleted;
-+
-+	yaffs_ResizeFile(in, 0);
- 
- 	if (in->nDataChunks > 0) {
--		/* Use soft deletion if there is data in the file */
--		if (!in->unlinked) {
--			retVal = yaffs_UnlinkFile(in);
--		}
-+		/* Use soft deletion if there is data in the file.
-+		 * That won't be the case if it has been resized to zero.
-+		 */
-+		if (!in->unlinked)
-+			retVal = yaffs_UnlinkFileIfNeeded(in);
-+
- 		if (retVal == YAFFS_OK && in->unlinked && !in->deleted) {
- 			in->deleted = 1;
-+			deleted = 1;
- 			in->myDev->nDeletedFiles++;
- 			yaffs_SoftDeleteFile(in);
- 		}
--		return in->deleted ? YAFFS_OK : YAFFS_FAIL;
-+		return deleted ? YAFFS_OK : YAFFS_FAIL;
- 	} else {
- 		/* The file has no data chunks so we toss it immediately */
- 		yaffs_FreeTnode(in->myDev, in->variant.fileVariant.top);
-@@ -5141,62 +5164,75 @@ int yaffs_DeleteFile(yaffs_Object * in)
- 	}
- }
- 
--static int yaffs_DeleteDirectory(yaffs_Object * in)
-+static int yaffs_DeleteDirectory(yaffs_Object *in)
- {
- 	/* First check that the directory is empty. */
--	if (list_empty(&in->variant.directoryVariant.children)) {
-+	if (ylist_empty(&in->variant.directoryVariant.children))
- 		return yaffs_DoGenericObjectDeletion(in);
--	}
- 
- 	return YAFFS_FAIL;
- 
- }
- 
--static int yaffs_DeleteSymLink(yaffs_Object * in)
-+static int yaffs_DeleteSymLink(yaffs_Object *in)
- {
- 	YFREE(in->variant.symLinkVariant.alias);
- 
- 	return yaffs_DoGenericObjectDeletion(in);
- }
- 
--static int yaffs_DeleteHardLink(yaffs_Object * in)
-+static int yaffs_DeleteHardLink(yaffs_Object *in)
- {
- 	/* remove this hardlink from the list assocaited with the equivalent
- 	 * object
- 	 */
--	list_del(&in->hardLinks);
-+	ylist_del_init(&in->hardLinks);
- 	return yaffs_DoGenericObjectDeletion(in);
- }
- 
--static void yaffs_DestroyObject(yaffs_Object * obj)
-+int yaffs_DeleteObject(yaffs_Object *obj)
- {
-+int retVal = -1;
- 	switch (obj->variantType) {
- 	case YAFFS_OBJECT_TYPE_FILE:
--		yaffs_DeleteFile(obj);
-+		retVal = yaffs_DeleteFile(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_DIRECTORY:
--		yaffs_DeleteDirectory(obj);
-+		return yaffs_DeleteDirectory(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_SYMLINK:
--		yaffs_DeleteSymLink(obj);
-+		retVal = yaffs_DeleteSymLink(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_HARDLINK:
--		yaffs_DeleteHardLink(obj);
-+		retVal = yaffs_DeleteHardLink(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_SPECIAL:
--		yaffs_DoGenericObjectDeletion(obj);
-+		retVal = yaffs_DoGenericObjectDeletion(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_UNKNOWN:
-+		retVal = 0;
- 		break;		/* should not happen. */
- 	}
-+
-+	return retVal;
- }
- 
--static int yaffs_UnlinkWorker(yaffs_Object * obj)
-+static int yaffs_UnlinkWorker(yaffs_Object *obj)
- {
- 
-+	int immediateDeletion = 0;
-+
-+#ifdef __KERNEL__
-+	if (!obj->myInode)
-+		immediateDeletion = 1;
-+#else
-+	if (obj->inUse <= 0)
-+		immediateDeletion = 1;
-+#endif
-+
- 	if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
- 		return yaffs_DeleteHardLink(obj);
--	} else if (!list_empty(&obj->hardLinks)) {
-+	} else if (!ylist_empty(&obj->hardLinks)) {
- 		/* Curve ball: We're unlinking an object that has a hardlink.
- 		 *
- 		 * This problem arises because we are not strictly following
-@@ -5215,24 +5251,24 @@ static int yaffs_UnlinkWorker(yaffs_Obje
- 		int retVal;
- 		YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
- 
--		hl = list_entry(obj->hardLinks.next, yaffs_Object, hardLinks);
-+		hl = ylist_entry(obj->hardLinks.next, yaffs_Object, hardLinks);
- 
--		list_del_init(&hl->hardLinks);
--		list_del_init(&hl->siblings);
-+		ylist_del_init(&hl->hardLinks);
-+		ylist_del_init(&hl->siblings);
- 
- 		yaffs_GetObjectName(hl, name, YAFFS_MAX_NAME_LENGTH + 1);
- 
- 		retVal = yaffs_ChangeObjectName(obj, hl->parent, name, 0, 0);
- 
--		if (retVal == YAFFS_OK) {
-+		if (retVal == YAFFS_OK)
- 			retVal = yaffs_DoGenericObjectDeletion(hl);
--		}
-+
- 		return retVal;
- 
--	} else {
-+	} else if (immediateDeletion) {
- 		switch (obj->variantType) {
- 		case YAFFS_OBJECT_TYPE_FILE:
--			return yaffs_UnlinkFile(obj);
-+			return yaffs_DeleteFile(obj);
- 			break;
- 		case YAFFS_OBJECT_TYPE_DIRECTORY:
- 			return yaffs_DeleteDirectory(obj);
-@@ -5248,21 +5284,22 @@ static int yaffs_UnlinkWorker(yaffs_Obje
- 		default:
- 			return YAFFS_FAIL;
- 		}
--	}
-+	} else
-+		return yaffs_ChangeObjectName(obj, obj->myDev->unlinkedDir,
-+					   _Y("unlinked"), 0, 0);
- }
- 
- 
--static int yaffs_UnlinkObject( yaffs_Object *obj)
-+static int yaffs_UnlinkObject(yaffs_Object *obj)
- {
- 
--	if (obj && obj->unlinkAllowed) {
-+	if (obj && obj->unlinkAllowed)
- 		return yaffs_UnlinkWorker(obj);
--	}
- 
- 	return YAFFS_FAIL;
- 
- }
--int yaffs_Unlink(yaffs_Object * dir, const YCHAR * name)
-+int yaffs_Unlink(yaffs_Object *dir, const YCHAR *name)
- {
- 	yaffs_Object *obj;
- 
-@@ -5272,8 +5309,8 @@ int yaffs_Unlink(yaffs_Object * dir, con
- 
- /*----------------------- Initialisation Scanning ---------------------- */
- 
--static void yaffs_HandleShadowedObject(yaffs_Device * dev, int objId,
--				       int backwardScanning)
-+static void yaffs_HandleShadowedObject(yaffs_Device *dev, int objId,
-+				int backwardScanning)
- {
- 	yaffs_Object *obj;
- 
-@@ -5286,9 +5323,8 @@ static void yaffs_HandleShadowedObject(y
- 		/* Handle YAFFS2 case (backward scanning)
- 		 * If the shadowed object exists then ignore.
- 		 */
--		if (yaffs_FindObjectByNumber(dev, objId)) {
-+		if (yaffs_FindObjectByNumber(dev, objId))
- 			return;
--		}
- 	}
- 
- 	/* Let's create it (if it does not exist) assuming it is a file so that it can do shrinking etc.
-@@ -5297,6 +5333,8 @@ static void yaffs_HandleShadowedObject(y
- 	obj =
- 	    yaffs_FindOrCreateObjectByNumber(dev, objId,
- 					     YAFFS_OBJECT_TYPE_FILE);
-+	if (!obj)
-+		return;
- 	yaffs_AddObjectToDirectory(dev->unlinkedDir, obj);
- 	obj->variant.fileVariant.shrinkSize = 0;
- 	obj->valid = 1;		/* So that we don't read any other info for this file */
-@@ -5325,44 +5363,77 @@ static void yaffs_HardlinkFixup(yaffs_De
- 		if (in) {
- 			/* Add the hardlink pointers */
- 			hl->variant.hardLinkVariant.equivalentObject = in;
--			list_add(&hl->hardLinks, &in->hardLinks);
-+			ylist_add(&hl->hardLinks, &in->hardLinks);
- 		} else {
- 			/* Todo Need to report/handle this better.
- 			 * Got a problem... hardlink to a non-existant object
- 			 */
- 			hl->variant.hardLinkVariant.equivalentObject = NULL;
--			INIT_LIST_HEAD(&hl->hardLinks);
-+			YINIT_LIST_HEAD(&hl->hardLinks);
- 
- 		}
--
- 	}
-+}
-+
-+
- 
-+
-+
-+static int ybicmp(const void *a, const void *b)
-+{
-+	register int aseq = ((yaffs_BlockIndex *)a)->seq;
-+	register int bseq = ((yaffs_BlockIndex *)b)->seq;
-+	register int ablock = ((yaffs_BlockIndex *)a)->block;
-+	register int bblock = ((yaffs_BlockIndex *)b)->block;
-+	if (aseq == bseq)
-+		return ablock - bblock;
-+	else
-+		return aseq - bseq;
- }
- 
- 
-+struct yaffs_ShadowFixerStruct {
-+	int objectId;
-+	int shadowedId;
-+	struct yaffs_ShadowFixerStruct *next;
-+};
-+
- 
-+static void yaffs_StripDeletedObjects(yaffs_Device *dev)
-+{
-+	/*
-+	*  Sort out state of unlinked and deleted objects after scanning.
-+	*/
-+	struct ylist_head *i;
-+	struct ylist_head *n;
-+	yaffs_Object *l;
- 
-+	/* Soft delete all the unlinked files */
-+	ylist_for_each_safe(i, n,
-+		&dev->unlinkedDir->variant.directoryVariant.children) {
-+		if (i) {
-+			l = ylist_entry(i, yaffs_Object, siblings);
-+			yaffs_DeleteObject(l);
-+		}
-+	}
- 
--static int ybicmp(const void *a, const void *b){
--    register int aseq = ((yaffs_BlockIndex *)a)->seq;
--    register int bseq = ((yaffs_BlockIndex *)b)->seq;
--    register int ablock = ((yaffs_BlockIndex *)a)->block;
--    register int bblock = ((yaffs_BlockIndex *)b)->block;
--    if( aseq == bseq )
--        return ablock - bblock;
--    else
--        return aseq - bseq;
-+	ylist_for_each_safe(i, n,
-+		&dev->deletedDir->variant.directoryVariant.children) {
-+		if (i) {
-+			l = ylist_entry(i, yaffs_Object, siblings);
-+			yaffs_DeleteObject(l);
-+		}
-+	}
- 
- }
- 
--static int yaffs_Scan(yaffs_Device * dev)
-+static int yaffs_Scan(yaffs_Device *dev)
- {
- 	yaffs_ExtendedTags tags;
- 	int blk;
- 	int blockIterator;
- 	int startIterator;
- 	int endIterator;
--	int nBlocksToScan = 0;
- 	int result;
- 
- 	int chunk;
-@@ -5371,26 +5442,19 @@ static int yaffs_Scan(yaffs_Device * dev
- 	yaffs_BlockState state;
- 	yaffs_Object *hardList = NULL;
- 	yaffs_BlockInfo *bi;
--	int sequenceNumber;
-+	__u32 sequenceNumber;
- 	yaffs_ObjectHeader *oh;
- 	yaffs_Object *in;
- 	yaffs_Object *parent;
--	int nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1;
- 
- 	int alloc_failed = 0;
- 
-+	struct yaffs_ShadowFixerStruct *shadowFixerList = NULL;
-+
- 
- 	__u8 *chunkData;
- 
--	yaffs_BlockIndex *blockIndex = NULL;
- 
--	if (dev->isYaffs2) {
--		T(YAFFS_TRACE_SCAN,
--		  (TSTR("yaffs_Scan is not for YAFFS2!" TENDSTR)));
--		return YAFFS_FAIL;
--	}
--
--	//TODO  Throw all the yaffs2 stuuf out of yaffs_Scan since it is only for yaffs1 format.
- 
- 	T(YAFFS_TRACE_SCAN,
- 	  (TSTR("yaffs_Scan starts  intstartblk %d intendblk %d..." TENDSTR),
-@@ -5400,12 +5464,6 @@ static int yaffs_Scan(yaffs_Device * dev
- 
- 	dev->sequenceNumber = YAFFS_LOWEST_SEQUENCE_NUMBER;
- 
--	if (dev->isYaffs2) {
--		blockIndex = YMALLOC(nBlocks * sizeof(yaffs_BlockIndex));
--		if(!blockIndex)
--			return YAFFS_FAIL;
--	}
--
- 	/* Scan all the blocks to determine their state */
- 	for (blk = dev->internalStartBlock; blk <= dev->internalEndBlock; blk++) {
- 		bi = yaffs_GetBlockInfo(dev, blk);
-@@ -5418,6 +5476,9 @@ static int yaffs_Scan(yaffs_Device * dev
- 		bi->blockState = state;
- 		bi->sequenceNumber = sequenceNumber;
- 
-+		if (bi->sequenceNumber == YAFFS_SEQUENCE_BAD_BLOCK)
-+			bi->blockState = state = YAFFS_BLOCK_STATE_DEAD;
-+
- 		T(YAFFS_TRACE_SCAN_DEBUG,
- 		  (TSTR("Block scanning block %d state %d seq %d" TENDSTR), blk,
- 		   state, sequenceNumber));
-@@ -5430,70 +5491,21 @@ static int yaffs_Scan(yaffs_Device * dev
- 			  (TSTR("Block empty " TENDSTR)));
- 			dev->nErasedBlocks++;
- 			dev->nFreeChunks += dev->nChunksPerBlock;
--		} else if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
--
--			/* Determine the highest sequence number */
--			if (dev->isYaffs2 &&
--			    sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
--			    sequenceNumber < YAFFS_HIGHEST_SEQUENCE_NUMBER) {
--
--				blockIndex[nBlocksToScan].seq = sequenceNumber;
--				blockIndex[nBlocksToScan].block = blk;
--
--				nBlocksToScan++;
--
--				if (sequenceNumber >= dev->sequenceNumber) {
--					dev->sequenceNumber = sequenceNumber;
--				}
--			} else if (dev->isYaffs2) {
--				/* TODO: Nasty sequence number! */
--				T(YAFFS_TRACE_SCAN,
--				  (TSTR
--				   ("Block scanning block %d has bad sequence number %d"
--				    TENDSTR), blk, sequenceNumber));
--
--			}
- 		}
- 	}
- 
--	/* Sort the blocks
--	 * Dungy old bubble sort for now...
--	 */
--	if (dev->isYaffs2) {
--		yaffs_BlockIndex temp;
--		int i;
--		int j;
--
--		for (i = 0; i < nBlocksToScan; i++)
--			for (j = i + 1; j < nBlocksToScan; j++)
--				if (blockIndex[i].seq > blockIndex[j].seq) {
--					temp = blockIndex[j];
--					blockIndex[j] = blockIndex[i];
--					blockIndex[i] = temp;
--				}
--	}
--
--	/* Now scan the blocks looking at the data. */
--	if (dev->isYaffs2) {
--		startIterator = 0;
--		endIterator = nBlocksToScan - 1;
--		T(YAFFS_TRACE_SCAN_DEBUG,
--		  (TSTR("%d blocks to be scanned" TENDSTR), nBlocksToScan));
--	} else {
--		startIterator = dev->internalStartBlock;
--		endIterator = dev->internalEndBlock;
--	}
-+	startIterator = dev->internalStartBlock;
-+	endIterator = dev->internalEndBlock;
- 
- 	/* For each block.... */
- 	for (blockIterator = startIterator; !alloc_failed && blockIterator <= endIterator;
- 	     blockIterator++) {
- 
--		if (dev->isYaffs2) {
--			/* get the block to scan in the correct order */
--			blk = blockIndex[blockIterator].block;
--		} else {
--			blk = blockIterator;
--		}
-+		YYIELD();
-+
-+		YYIELD();
-+
-+		blk = blockIterator;
- 
- 		bi = yaffs_GetBlockInfo(dev, blk);
- 		state = bi->blockState;
-@@ -5511,7 +5523,7 @@ static int yaffs_Scan(yaffs_Device * dev
- 
- 			/* Let's have a good look at this chunk... */
- 
--			if (!dev->isYaffs2 && tags.chunkDeleted) {
-+			if (tags.eccResult == YAFFS_ECC_RESULT_UNFIXED || tags.chunkDeleted) {
- 				/* YAFFS1 only...
- 				 * A deleted chunk
- 				 */
-@@ -5540,18 +5552,6 @@ static int yaffs_Scan(yaffs_Device * dev
- 					dev->allocationBlockFinder = blk;
- 					/* Set it to here to encourage the allocator to go forth from here. */
- 
--					/* Yaffs2 sanity check:
--					 * This should be the one with the highest sequence number
--					 */
--					if (dev->isYaffs2
--					    && (dev->sequenceNumber !=
--						bi->sequenceNumber)) {
--						T(YAFFS_TRACE_ALWAYS,
--						  (TSTR
--						   ("yaffs: Allocation block %d was not highest sequence id:"
--						    " block seq = %d, dev seq = %d"
--						    TENDSTR), blk,bi->sequenceNumber,dev->sequenceNumber));
--					}
- 				}
- 
- 				dev->nFreeChunks += (dev->nChunksPerBlock - c);
-@@ -5570,11 +5570,11 @@ static int yaffs_Scan(yaffs_Device * dev
- 				 * the same chunkId).
- 				 */
- 
--				if(!in)
-+				if (!in)
- 					alloc_failed = 1;
- 
--				if(in){
--					if(!yaffs_PutChunkIntoFile(in, tags.chunkId, chunk,1))
-+				if (in) {
-+					if (!yaffs_PutChunkIntoFile(in, tags.chunkId, chunk, 1))
- 						alloc_failed = 1;
- 				}
- 
-@@ -5617,7 +5617,7 @@ static int yaffs_Scan(yaffs_Device * dev
- 					 * deleted, and worse still it has changed type. Delete the old object.
- 					 */
- 
--					yaffs_DestroyObject(in);
-+					yaffs_DeleteObject(in);
- 
- 					in = 0;
- 				}
-@@ -5627,14 +5627,20 @@ static int yaffs_Scan(yaffs_Device * dev
- 								      objectId,
- 								      oh->type);
- 
--				if(!in)
-+				if (!in)
- 					alloc_failed = 1;
- 
- 				if (in && oh->shadowsObject > 0) {
--					yaffs_HandleShadowedObject(dev,
--								   oh->
--								   shadowsObject,
--								   0);
-+
-+					struct yaffs_ShadowFixerStruct *fixer;
-+					fixer = YMALLOC(sizeof(struct yaffs_ShadowFixerStruct));
-+					if (fixer) {
-+						fixer->next = shadowFixerList;
-+						shadowFixerList = fixer;
-+						fixer->objectId = tags.objectId;
-+						fixer->shadowedId = oh->shadowsObject;
-+					}
-+
- 				}
- 
- 				if (in && in->valid) {
-@@ -5643,12 +5649,10 @@ static int yaffs_Scan(yaffs_Device * dev
- 					unsigned existingSerial = in->serial;
- 					unsigned newSerial = tags.serialNumber;
- 
--					if (dev->isYaffs2 ||
--					    ((existingSerial + 1) & 3) ==
--					    newSerial) {
-+					if (((existingSerial + 1) & 3) == newSerial) {
- 						/* Use new one - destroy the exisiting one */
- 						yaffs_DeleteChunk(dev,
--								  in->chunkId,
-+								  in->hdrChunk,
- 								  1, __LINE__);
- 						in->valid = 0;
- 					} else {
-@@ -5681,7 +5685,8 @@ static int yaffs_Scan(yaffs_Device * dev
- 					in->yst_ctime = oh->yst_ctime;
- 					in->yst_rdev = oh->yst_rdev;
- #endif
--					in->chunkId = chunk;
-+					in->hdrChunk = chunk;
-+					in->serial = tags.serialNumber;
- 
- 				} else if (in && !in->valid) {
- 					/* we need to load this info */
-@@ -5705,7 +5710,8 @@ static int yaffs_Scan(yaffs_Device * dev
- 					in->yst_ctime = oh->yst_ctime;
- 					in->yst_rdev = oh->yst_rdev;
- #endif
--					in->chunkId = chunk;
-+					in->hdrChunk = chunk;
-+					in->serial = tags.serialNumber;
- 
- 					yaffs_SetObjectName(in, oh->name);
- 					in->dirty = 0;
-@@ -5718,25 +5724,25 @@ static int yaffs_Scan(yaffs_Device * dev
- 					    yaffs_FindOrCreateObjectByNumber
- 					    (dev, oh->parentObjectId,
- 					     YAFFS_OBJECT_TYPE_DIRECTORY);
--					if (parent->variantType ==
-+					if (!parent)
-+						alloc_failed = 1;
-+					if (parent && parent->variantType ==
- 					    YAFFS_OBJECT_TYPE_UNKNOWN) {
- 						/* Set up as a directory */
- 						parent->variantType =
--						    YAFFS_OBJECT_TYPE_DIRECTORY;
--						INIT_LIST_HEAD(&parent->variant.
--							       directoryVariant.
--							       children);
--					} else if (parent->variantType !=
--						   YAFFS_OBJECT_TYPE_DIRECTORY)
--					{
-+							YAFFS_OBJECT_TYPE_DIRECTORY;
-+						YINIT_LIST_HEAD(&parent->variant.
-+								directoryVariant.
-+								children);
-+					} else if (!parent || parent->variantType !=
-+						   YAFFS_OBJECT_TYPE_DIRECTORY) {
- 						/* Hoosterman, another problem....
- 						 * We're trying to use a non-directory as a directory
- 						 */
- 
- 						T(YAFFS_TRACE_ERROR,
- 						  (TSTR
--						   ("yaffs tragedy: attempting to use non-directory as"
--						    " a directory in scan. Put in lost+found."
-+						   ("yaffs tragedy: attempting to use non-directory as a directory in scan. Put in lost+found."
- 						    TENDSTR)));
- 						parent = dev->lostNFoundDir;
- 					}
-@@ -5760,15 +5766,6 @@ static int yaffs_Scan(yaffs_Device * dev
- 						/* Todo got a problem */
- 						break;
- 					case YAFFS_OBJECT_TYPE_FILE:
--						if (dev->isYaffs2
--						    && oh->isShrink) {
--							/* Prune back the shrunken chunks */
--							yaffs_PruneResizedChunks
--							    (in, oh->fileSize);
--							/* Mark the block as having a shrinkHeader */
--							bi->hasShrinkHeader = 1;
--						}
--
- 						if (dev->useHeaderFileSize)
- 
- 							in->variant.fileVariant.
-@@ -5778,11 +5775,11 @@ static int yaffs_Scan(yaffs_Device * dev
- 						break;
- 					case YAFFS_OBJECT_TYPE_HARDLINK:
- 						in->variant.hardLinkVariant.
--						    equivalentObjectId =
--						    oh->equivalentObjectId;
-+							equivalentObjectId =
-+							oh->equivalentObjectId;
- 						in->hardLinks.next =
--						    (struct list_head *)
--						    hardList;
-+							(struct ylist_head *)
-+							hardList;
- 						hardList = in;
- 						break;
- 					case YAFFS_OBJECT_TYPE_DIRECTORY:
-@@ -5794,15 +5791,17 @@ static int yaffs_Scan(yaffs_Device * dev
- 					case YAFFS_OBJECT_TYPE_SYMLINK:
- 						in->variant.symLinkVariant.alias =
- 						    yaffs_CloneString(oh->alias);
--						if(!in->variant.symLinkVariant.alias)
-+						if (!in->variant.symLinkVariant.alias)
- 							alloc_failed = 1;
- 						break;
- 					}
- 
-+/*
- 					if (parent == dev->deletedDir) {
- 						yaffs_DestroyObject(in);
- 						bi->hasShrinkHeader = 1;
- 					}
-+*/
- 				}
- 			}
- 		}
-@@ -5823,10 +5822,6 @@ static int yaffs_Scan(yaffs_Device * dev
- 
- 	}
- 
--	if (blockIndex) {
--		YFREE(blockIndex);
--	}
--
- 
- 	/* Ok, we've done all the scanning.
- 	 * Fix up the hard link chains.
-@@ -5834,32 +5829,36 @@ static int yaffs_Scan(yaffs_Device * dev
- 	 * hardlinks.
- 	 */
- 
--	yaffs_HardlinkFixup(dev,hardList);
-+	yaffs_HardlinkFixup(dev, hardList);
- 
--	/* Handle the unlinked files. Since they were left in an unlinked state we should
--	 * just delete them.
--	 */
-+	/* Fix up any shadowed objects */
- 	{
--		struct list_head *i;
--		struct list_head *n;
-+		struct yaffs_ShadowFixerStruct *fixer;
-+		yaffs_Object *obj;
- 
--		yaffs_Object *l;
--		/* Soft delete all the unlinked files */
--		list_for_each_safe(i, n,
--				   &dev->unlinkedDir->variant.directoryVariant.
--				   children) {
--			if (i) {
--				l = list_entry(i, yaffs_Object, siblings);
--				yaffs_DestroyObject(l);
--			}
-+		while (shadowFixerList) {
-+			fixer = shadowFixerList;
-+			shadowFixerList = fixer->next;
-+			/* Complete the rename transaction by deleting the shadowed object
-+			 * then setting the object header to unshadowed.
-+			 */
-+			obj = yaffs_FindObjectByNumber(dev, fixer->shadowedId);
-+			if (obj)
-+				yaffs_DeleteObject(obj);
-+
-+			obj = yaffs_FindObjectByNumber(dev, fixer->objectId);
-+
-+			if (obj)
-+				yaffs_UpdateObjectHeader(obj, NULL, 1, 0, 0);
-+
-+			YFREE(fixer);
- 		}
- 	}
- 
- 	yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
- 
--	if(alloc_failed){
-+	if (alloc_failed)
- 		return YAFFS_FAIL;
--	}
- 
- 	T(YAFFS_TRACE_SCAN, (TSTR("yaffs_Scan ends" TENDSTR)));
- 
-@@ -5871,25 +5870,27 @@ static void yaffs_CheckObjectDetailsLoad
- {
- 	__u8 *chunkData;
- 	yaffs_ObjectHeader *oh;
--	yaffs_Device *dev = in->myDev;
-+	yaffs_Device *dev;
- 	yaffs_ExtendedTags tags;
- 	int result;
- 	int alloc_failed = 0;
- 
--	if(!in)
-+	if (!in)
- 		return;
- 
-+	dev = in->myDev;
-+
- #if 0
--	T(YAFFS_TRACE_SCAN,(TSTR("details for object %d %s loaded" TENDSTR),
-+	T(YAFFS_TRACE_SCAN, (TSTR("details for object %d %s loaded" TENDSTR),
- 		in->objectId,
- 		in->lazyLoaded ? "not yet" : "already"));
- #endif
- 
--	if(in->lazyLoaded){
-+	if (in->lazyLoaded && in->hdrChunk > 0) {
- 		in->lazyLoaded = 0;
- 		chunkData = yaffs_GetTempBuffer(dev, __LINE__);
- 
--		result = yaffs_ReadChunkWithTagsFromNAND(dev,in->chunkId,chunkData,&tags);
-+		result = yaffs_ReadChunkWithTagsFromNAND(dev, in->hdrChunk, chunkData, &tags);
- 		oh = (yaffs_ObjectHeader *) chunkData;
- 
- 		in->yst_mode = oh->yst_mode;
-@@ -5911,18 +5912,18 @@ static void yaffs_CheckObjectDetailsLoad
- #endif
- 		yaffs_SetObjectName(in, oh->name);
- 
--		if(in->variantType == YAFFS_OBJECT_TYPE_SYMLINK){
--			 in->variant.symLinkVariant.alias =
-+		if (in->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
-+			in->variant.symLinkVariant.alias =
- 						    yaffs_CloneString(oh->alias);
--			if(!in->variant.symLinkVariant.alias)
-+			if (!in->variant.symLinkVariant.alias)
- 				alloc_failed = 1; /* Not returned to caller */
- 		}
- 
--		yaffs_ReleaseTempBuffer(dev,chunkData, __LINE__);
-+		yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
- 	}
- }
- 
--static int yaffs_ScanBackwards(yaffs_Device * dev)
-+static int yaffs_ScanBackwards(yaffs_Device *dev)
- {
- 	yaffs_ExtendedTags tags;
- 	int blk;
-@@ -5938,7 +5939,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 	yaffs_BlockState state;
- 	yaffs_Object *hardList = NULL;
- 	yaffs_BlockInfo *bi;
--	int sequenceNumber;
-+	__u32 sequenceNumber;
- 	yaffs_ObjectHeader *oh;
- 	yaffs_Object *in;
- 	yaffs_Object *parent;
-@@ -5972,12 +5973,12 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 	blockIndex = YMALLOC(nBlocks * sizeof(yaffs_BlockIndex));
- 
--	if(!blockIndex) {
-+	if (!blockIndex) {
- 		blockIndex = YMALLOC_ALT(nBlocks * sizeof(yaffs_BlockIndex));
- 		altBlockIndex = 1;
- 	}
- 
--	if(!blockIndex) {
-+	if (!blockIndex) {
- 		T(YAFFS_TRACE_SCAN,
- 		  (TSTR("yaffs_Scan() could not allocate block index!" TENDSTR)));
- 		return YAFFS_FAIL;
-@@ -5999,15 +6000,17 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 		bi->blockState = state;
- 		bi->sequenceNumber = sequenceNumber;
- 
--		if(bi->sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA)
-+		if (bi->sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA)
- 			bi->blockState = state = YAFFS_BLOCK_STATE_CHECKPOINT;
-+		if (bi->sequenceNumber == YAFFS_SEQUENCE_BAD_BLOCK)
-+			bi->blockState = state = YAFFS_BLOCK_STATE_DEAD;
- 
- 		T(YAFFS_TRACE_SCAN_DEBUG,
- 		  (TSTR("Block scanning block %d state %d seq %d" TENDSTR), blk,
- 		   state, sequenceNumber));
- 
- 
--		if(state == YAFFS_BLOCK_STATE_CHECKPOINT){
-+		if (state == YAFFS_BLOCK_STATE_CHECKPOINT) {
- 			dev->blocksInCheckpoint++;
- 
- 		} else if (state == YAFFS_BLOCK_STATE_DEAD) {
-@@ -6021,8 +6024,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 		} else if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
- 
- 			/* Determine the highest sequence number */
--			if (dev->isYaffs2 &&
--			    sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
-+			if (sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
- 			    sequenceNumber < YAFFS_HIGHEST_SEQUENCE_NUMBER) {
- 
- 				blockIndex[nBlocksToScan].seq = sequenceNumber;
-@@ -6030,10 +6032,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 				nBlocksToScan++;
- 
--				if (sequenceNumber >= dev->sequenceNumber) {
-+				if (sequenceNumber >= dev->sequenceNumber)
- 					dev->sequenceNumber = sequenceNumber;
--				}
--			} else if (dev->isYaffs2) {
-+			} else {
- 				/* TODO: Nasty sequence number! */
- 				T(YAFFS_TRACE_SCAN,
- 				  (TSTR
-@@ -6053,11 +6054,13 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 	/* Sort the blocks */
- #ifndef CONFIG_YAFFS_USE_OWN_SORT
--	yaffs_qsort(blockIndex, nBlocksToScan,
--		sizeof(yaffs_BlockIndex), ybicmp);
-+	{
-+		/* Use qsort now. */
-+		yaffs_qsort(blockIndex, nBlocksToScan, sizeof(yaffs_BlockIndex), ybicmp);
-+	}
- #else
- 	{
--	 	/* Dungy old bubble sort... */
-+		/* Dungy old bubble sort... */
- 
- 		yaffs_BlockIndex temp;
- 		int i;
-@@ -6075,7 +6078,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 	YYIELD();
- 
--    	T(YAFFS_TRACE_SCAN, (TSTR("...done" TENDSTR)));
-+	T(YAFFS_TRACE_SCAN, (TSTR("...done" TENDSTR)));
- 
- 	/* Now scan the blocks looking at the data. */
- 	startIterator = 0;
-@@ -6085,10 +6088,10 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 	/* For each block.... backwards */
- 	for (blockIterator = endIterator; !alloc_failed && blockIterator >= startIterator;
--	     blockIterator--) {
--	        /* Cooperative multitasking! This loop can run for so
-+			blockIterator--) {
-+		/* Cooperative multitasking! This loop can run for so
- 		   long that watchdog timers expire. */
--	        YYIELD();
-+		YYIELD();
- 
- 		/* get the block to scan in the correct order */
- 		blk = blockIndex[blockIterator].block;
-@@ -6127,10 +6130,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 				 * this is the one being allocated from
- 				 */
- 
--				if(foundChunksInBlock)
--				{
-+				if (foundChunksInBlock) {
- 					/* This is a chunk that was skipped due to failing the erased check */
--
- 				} else if (c == 0) {
- 					/* We're looking at the first chunk in the block so the block is unused */
- 					state = YAFFS_BLOCK_STATE_EMPTY;
-@@ -6138,7 +6139,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 				} else {
- 					if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING ||
- 					    state == YAFFS_BLOCK_STATE_ALLOCATING) {
--					    	if(dev->sequenceNumber == bi->sequenceNumber) {
-+						if (dev->sequenceNumber == bi->sequenceNumber) {
- 							/* this is the block being allocated from */
- 
- 							T(YAFFS_TRACE_SCAN,
-@@ -6150,27 +6151,31 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 							dev->allocationBlock = blk;
- 							dev->allocationPage = c;
- 							dev->allocationBlockFinder = blk;
--						}
--						else {
-+						} else {
- 							/* This is a partially written block that is not
- 							 * the current allocation block. This block must have
- 							 * had a write failure, so set up for retirement.
- 							 */
- 
--							 bi->needsRetiring = 1;
-+							 /* bi->needsRetiring = 1; ??? TODO */
- 							 bi->gcPrioritise = 1;
- 
- 							 T(YAFFS_TRACE_ALWAYS,
--							 (TSTR("Partially written block %d being set for retirement" TENDSTR),
-+							 (TSTR("Partially written block %d detected" TENDSTR),
- 							 blk));
- 						}
--
- 					}
--
- 				}
- 
- 				dev->nFreeChunks++;
- 
-+			} else if (tags.eccResult == YAFFS_ECC_RESULT_UNFIXED) {
-+				T(YAFFS_TRACE_SCAN,
-+				  (TSTR(" Unfixed ECC in chunk(%d:%d), chunk ignored"TENDSTR),
-+				  blk, c));
-+
-+				  dev->nFreeChunks++;
-+
- 			} else if (tags.chunkId > 0) {
- 				/* chunkId > 0 so it is a data chunk... */
- 				unsigned int endpos;
-@@ -6187,7 +6192,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 								      tags.
- 								      objectId,
- 								      YAFFS_OBJECT_TYPE_FILE);
--				if(!in){
-+				if (!in) {
- 					/* Out of memory */
- 					alloc_failed = 1;
- 				}
-@@ -6197,8 +6202,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 				    && chunkBase <
- 				    in->variant.fileVariant.shrinkSize) {
- 					/* This has not been invalidated by a resize */
--					if(!yaffs_PutChunkIntoFile(in, tags.chunkId,
--							       chunk, -1)){
-+					if (!yaffs_PutChunkIntoFile(in, tags.chunkId,
-+							       chunk, -1)) {
- 						alloc_failed = 1;
- 					}
- 
-@@ -6221,7 +6226,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						    scannedFileSize;
- 					}
- 
--				} else if(in) {
-+				} else if (in) {
- 					/* This chunk has been invalidated by a resize, so delete */
- 					yaffs_DeleteChunk(dev, chunk, 1, __LINE__);
- 
-@@ -6242,6 +6247,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 					in = yaffs_FindOrCreateObjectByNumber
- 					    (dev, tags.objectId,
- 					     tags.extraObjectType);
-+					if (!in)
-+						alloc_failed = 1;
- 				}
- 
- 				if (!in ||
-@@ -6251,8 +6258,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 				    tags.extraShadows ||
- 				    (!in->valid &&
- 				    (tags.objectId == YAFFS_OBJECTID_ROOT ||
--				     tags.objectId == YAFFS_OBJECTID_LOSTNFOUND))
--				    ) {
-+				     tags.objectId == YAFFS_OBJECTID_LOSTNFOUND))) {
- 
- 					/* If we don't have  valid info then we need to read the chunk
- 					 * TODO In future we can probably defer reading the chunk and
-@@ -6266,8 +6272,17 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 					oh = (yaffs_ObjectHeader *) chunkData;
- 
--					if (!in)
-+					if (dev->inbandTags) {
-+						/* Fix up the header if they got corrupted by inband tags */
-+						oh->shadowsObject = oh->inbandShadowsObject;
-+						oh->isShrink = oh->inbandIsShrink;
-+					}
-+
-+					if (!in) {
- 						in = yaffs_FindOrCreateObjectByNumber(dev, tags.objectId, oh->type);
-+						if (!in)
-+							alloc_failed = 1;
-+					}
- 
- 				}
- 
-@@ -6275,10 +6290,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 					/* TODO Hoosterman we have a problem! */
- 					T(YAFFS_TRACE_ERROR,
- 					  (TSTR
--					   ("yaffs tragedy: Could not make object for object  %d  "
--					    "at chunk %d during scan"
-+					   ("yaffs tragedy: Could not make object for object  %d at chunk %d during scan"
- 					    TENDSTR), tags.objectId, chunk));
--
-+					continue;
- 				}
- 
- 				if (in->valid) {
-@@ -6289,10 +6303,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 					if ((in->variantType == YAFFS_OBJECT_TYPE_FILE) &&
- 					     ((oh &&
--					       oh-> type == YAFFS_OBJECT_TYPE_FILE)||
-+					       oh->type == YAFFS_OBJECT_TYPE_FILE) ||
- 					      (tags.extraHeaderInfoAvailable  &&
--					       tags.extraObjectType == YAFFS_OBJECT_TYPE_FILE))
--					    ) {
-+					       tags.extraObjectType == YAFFS_OBJECT_TYPE_FILE))) {
- 						__u32 thisSize =
- 						    (oh) ? oh->fileSize : tags.
- 						    extraFileLength;
-@@ -6300,7 +6313,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						    (oh) ? oh->
- 						    parentObjectId : tags.
- 						    extraParentObjectId;
--						unsigned isShrink =
-+
-+
-+						isShrink =
- 						    (oh) ? oh->isShrink : tags.
- 						    extraIsShrinkHeader;
- 
-@@ -6323,9 +6338,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 							    thisSize;
- 						}
- 
--						if (isShrink) {
-+						if (isShrink)
- 							bi->hasShrinkHeader = 1;
--						}
- 
- 					}
- 					/* Use existing - destroy this one. */
-@@ -6333,6 +6347,17 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 				}
- 
-+				if (!in->valid && in->variantType !=
-+				    (oh ? oh->type : tags.extraObjectType))
-+					T(YAFFS_TRACE_ERROR, (
-+						TSTR("yaffs tragedy: Bad object type, "
-+					    TCONT("%d != %d, for object %d at chunk ")
-+					    TCONT("%d during scan")
-+						TENDSTR), oh ?
-+					    oh->type : tags.extraObjectType,
-+					    in->variantType, tags.objectId,
-+					    chunk));
-+
- 				if (!in->valid &&
- 				    (tags.objectId == YAFFS_OBJECTID_ROOT ||
- 				     tags.objectId ==
-@@ -6340,7 +6365,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 					/* We only load some info, don't fiddle with directory structure */
- 					in->valid = 1;
- 
--					if(oh) {
-+					if (oh) {
- 						in->variantType = oh->type;
- 
- 						in->yst_mode = oh->yst_mode;
-@@ -6365,15 +6390,15 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						in->lazyLoaded = 1;
- 					}
- 
--					in->chunkId = chunk;
-+					in->hdrChunk = chunk;
- 
- 				} else if (!in->valid) {
- 					/* we need to load this info */
- 
- 					in->valid = 1;
--					in->chunkId = chunk;
-+					in->hdrChunk = chunk;
- 
--					if(oh) {
-+					if (oh) {
- 						in->variantType = oh->type;
- 
- 						in->yst_mode = oh->yst_mode;
-@@ -6403,20 +6428,19 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						yaffs_SetObjectName(in, oh->name);
- 						parent =
- 						    yaffs_FindOrCreateObjectByNumber
--					    		(dev, oh->parentObjectId,
--					     		 YAFFS_OBJECT_TYPE_DIRECTORY);
-+							(dev, oh->parentObjectId,
-+							 YAFFS_OBJECT_TYPE_DIRECTORY);
- 
- 						 fileSize = oh->fileSize;
-- 						 isShrink = oh->isShrink;
-+						 isShrink = oh->isShrink;
- 						 equivalentObjectId = oh->equivalentObjectId;
- 
--					}
--					else {
-+					} else {
- 						in->variantType = tags.extraObjectType;
- 						parent =
- 						    yaffs_FindOrCreateObjectByNumber
--					    		(dev, tags.extraParentObjectId,
--					     		 YAFFS_OBJECT_TYPE_DIRECTORY);
-+							(dev, tags.extraParentObjectId,
-+							 YAFFS_OBJECT_TYPE_DIRECTORY);
- 						 fileSize = tags.extraFileLength;
- 						 isShrink = tags.extraIsShrinkHeader;
- 						 equivalentObjectId = tags.extraEquivalentObjectId;
-@@ -6425,29 +6449,30 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 					}
- 					in->dirty = 0;
- 
-+					if (!parent)
-+						alloc_failed = 1;
-+
- 					/* directory stuff...
- 					 * hook up to parent
- 					 */
- 
--					if (parent->variantType ==
-+					if (parent && parent->variantType ==
- 					    YAFFS_OBJECT_TYPE_UNKNOWN) {
- 						/* Set up as a directory */
- 						parent->variantType =
--						    YAFFS_OBJECT_TYPE_DIRECTORY;
--						INIT_LIST_HEAD(&parent->variant.
--							       directoryVariant.
--							       children);
--					} else if (parent->variantType !=
--						   YAFFS_OBJECT_TYPE_DIRECTORY)
--					{
-+							YAFFS_OBJECT_TYPE_DIRECTORY;
-+						YINIT_LIST_HEAD(&parent->variant.
-+							directoryVariant.
-+							children);
-+					} else if (!parent || parent->variantType !=
-+						   YAFFS_OBJECT_TYPE_DIRECTORY) {
- 						/* Hoosterman, another problem....
- 						 * We're trying to use a non-directory as a directory
- 						 */
- 
- 						T(YAFFS_TRACE_ERROR,
- 						  (TSTR
--						   ("yaffs tragedy: attempting to use non-directory as"
--						    " a directory in scan. Put in lost+found."
-+						   ("yaffs tragedy: attempting to use non-directory as a directory in scan. Put in lost+found."
- 						    TENDSTR)));
- 						parent = dev->lostNFoundDir;
- 					}
-@@ -6494,12 +6519,12 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 						break;
- 					case YAFFS_OBJECT_TYPE_HARDLINK:
--						if(!itsUnlinked) {
--						  in->variant.hardLinkVariant.equivalentObjectId =
--						    equivalentObjectId;
--						  in->hardLinks.next =
--						    (struct list_head *) hardList;
--						  hardList = in;
-+						if (!itsUnlinked) {
-+							in->variant.hardLinkVariant.equivalentObjectId =
-+								equivalentObjectId;
-+							in->hardLinks.next =
-+								(struct ylist_head *) hardList;
-+							hardList = in;
- 						}
- 						break;
- 					case YAFFS_OBJECT_TYPE_DIRECTORY:
-@@ -6509,12 +6534,11 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						/* Do nothing */
- 						break;
- 					case YAFFS_OBJECT_TYPE_SYMLINK:
--						if(oh){
--						   in->variant.symLinkVariant.alias =
--						    yaffs_CloneString(oh->
--								      alias);
--						   if(!in->variant.symLinkVariant.alias)
--						   	alloc_failed = 1;
-+						if (oh) {
-+							in->variant.symLinkVariant.alias =
-+								yaffs_CloneString(oh->alias);
-+							if (!in->variant.symLinkVariant.alias)
-+								alloc_failed = 1;
- 						}
- 						break;
- 					}
-@@ -6551,75 +6575,129 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 	 * We should now have scanned all the objects, now it's time to add these
- 	 * hardlinks.
- 	 */
--	yaffs_HardlinkFixup(dev,hardList);
-+	yaffs_HardlinkFixup(dev, hardList);
- 
- 
--	/*
--	*  Sort out state of unlinked and deleted objects.
--	*/
--	{
--		struct list_head *i;
--		struct list_head *n;
-+	yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
- 
--		yaffs_Object *l;
-+	if (alloc_failed)
-+		return YAFFS_FAIL;
- 
--		/* Soft delete all the unlinked files */
--		list_for_each_safe(i, n,
--				   &dev->unlinkedDir->variant.directoryVariant.
--				   children) {
--			if (i) {
--				l = list_entry(i, yaffs_Object, siblings);
--				yaffs_DestroyObject(l);
--			}
--		}
-+	T(YAFFS_TRACE_SCAN, (TSTR("yaffs_ScanBackwards ends" TENDSTR)));
- 
--		/* Soft delete all the deletedDir files */
--		list_for_each_safe(i, n,
--				   &dev->deletedDir->variant.directoryVariant.
--				   children) {
--			if (i) {
--				l = list_entry(i, yaffs_Object, siblings);
--				yaffs_DestroyObject(l);
-+	return YAFFS_OK;
-+}
- 
--			}
-+/*------------------------------  Directory Functions ----------------------------- */
-+
-+static void yaffs_VerifyObjectInDirectory(yaffs_Object *obj)
-+{
-+	struct ylist_head *lh;
-+	yaffs_Object *listObj;
-+
-+	int count = 0;
-+
-+	if (!obj) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("No object to verify" TENDSTR)));
-+		YBUG();
-+		return;
-+	}
-+
-+	if (yaffs_SkipVerification(obj->myDev))
-+		return;
-+
-+	if (!obj->parent) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("Object does not have parent" TENDSTR)));
-+		YBUG();
-+		return;
-+	}
-+
-+	if (obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("Parent is not directory" TENDSTR)));
-+		YBUG();
-+	}
-+
-+	/* Iterate through the objects in each hash entry */
-+
-+	ylist_for_each(lh, &obj->parent->variant.directoryVariant.children) {
-+		if (lh) {
-+			listObj = ylist_entry(lh, yaffs_Object, siblings);
-+			yaffs_VerifyObject(listObj);
-+			if (obj == listObj)
-+				count++;
- 		}
-+	 }
-+
-+	if (count != 1) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory %d times" TENDSTR), count));
-+		YBUG();
- 	}
-+}
- 
--	yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
-+static void yaffs_VerifyDirectory(yaffs_Object *directory)
-+{
-+	struct ylist_head *lh;
-+	yaffs_Object *listObj;
- 
--	if(alloc_failed){
--		return YAFFS_FAIL;
-+	if (!directory) {
-+		YBUG();
-+		return;
- 	}
- 
--	T(YAFFS_TRACE_SCAN, (TSTR("yaffs_ScanBackwards ends" TENDSTR)));
-+	if (yaffs_SkipFullVerification(directory->myDev))
-+		return;
- 
--	return YAFFS_OK;
-+	if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("Directory has wrong type: %d" TENDSTR), directory->variantType));
-+		YBUG();
-+	}
-+
-+	/* Iterate through the objects in each hash entry */
-+
-+	ylist_for_each(lh, &directory->variant.directoryVariant.children) {
-+		if (lh) {
-+			listObj = ylist_entry(lh, yaffs_Object, siblings);
-+			if (listObj->parent != directory) {
-+				T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory list has wrong parent %p" TENDSTR), listObj->parent));
-+				YBUG();
-+			}
-+			yaffs_VerifyObjectInDirectory(listObj);
-+		}
-+	}
- }
- 
--/*------------------------------  Directory Functions ----------------------------- */
- 
--static void yaffs_RemoveObjectFromDirectory(yaffs_Object * obj)
-+static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj)
- {
- 	yaffs_Device *dev = obj->myDev;
-+	yaffs_Object *parent;
-+
-+	yaffs_VerifyObjectInDirectory(obj);
-+	parent = obj->parent;
-+
-+	yaffs_VerifyDirectory(parent);
- 
--	if(dev && dev->removeObjectCallback)
-+	if (dev && dev->removeObjectCallback)
- 		dev->removeObjectCallback(obj);
- 
--	list_del_init(&obj->siblings);
-+
-+	ylist_del_init(&obj->siblings);
- 	obj->parent = NULL;
-+
-+	yaffs_VerifyDirectory(parent);
- }
- 
- 
--static void yaffs_AddObjectToDirectory(yaffs_Object * directory,
--				       yaffs_Object * obj)
-+static void yaffs_AddObjectToDirectory(yaffs_Object *directory,
-+					yaffs_Object *obj)
- {
--
- 	if (!directory) {
- 		T(YAFFS_TRACE_ALWAYS,
- 		  (TSTR
- 		   ("tragedy: Trying to add an object to a null pointer directory"
- 		    TENDSTR)));
- 		YBUG();
-+		return;
- 	}
- 	if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
- 		T(YAFFS_TRACE_ALWAYS,
-@@ -6631,37 +6709,42 @@ static void yaffs_AddObjectToDirectory(y
- 
- 	if (obj->siblings.prev == NULL) {
- 		/* Not initialised */
--		INIT_LIST_HEAD(&obj->siblings);
--
--	} else if (!list_empty(&obj->siblings)) {
--		/* If it is holed up somewhere else, un hook it */
--		yaffs_RemoveObjectFromDirectory(obj);
-+		YBUG();
- 	}
-+
-+
-+	yaffs_VerifyDirectory(directory);
-+
-+	yaffs_RemoveObjectFromDirectory(obj);
-+
-+
- 	/* Now add it */
--	list_add(&obj->siblings, &directory->variant.directoryVariant.children);
-+	ylist_add(&obj->siblings, &directory->variant.directoryVariant.children);
- 	obj->parent = directory;
- 
- 	if (directory == obj->myDev->unlinkedDir
--	    || directory == obj->myDev->deletedDir) {
-+			|| directory == obj->myDev->deletedDir) {
- 		obj->unlinked = 1;
- 		obj->myDev->nUnlinkedFiles++;
- 		obj->renameAllowed = 0;
- 	}
-+
-+	yaffs_VerifyDirectory(directory);
-+	yaffs_VerifyObjectInDirectory(obj);
- }
- 
--yaffs_Object *yaffs_FindObjectByName(yaffs_Object * directory,
--				     const YCHAR * name)
-+yaffs_Object *yaffs_FindObjectByName(yaffs_Object *directory,
-+				     const YCHAR *name)
- {
- 	int sum;
- 
--	struct list_head *i;
-+	struct ylist_head *i;
- 	YCHAR buffer[YAFFS_MAX_NAME_LENGTH + 1];
- 
- 	yaffs_Object *l;
- 
--	if (!name) {
-+	if (!name)
- 		return NULL;
--	}
- 
- 	if (!directory) {
- 		T(YAFFS_TRACE_ALWAYS,
-@@ -6669,6 +6752,7 @@ yaffs_Object *yaffs_FindObjectByName(yaf
- 		   ("tragedy: yaffs_FindObjectByName: null pointer directory"
- 		    TENDSTR)));
- 		YBUG();
-+		return NULL;
- 	}
- 	if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
- 		T(YAFFS_TRACE_ALWAYS,
-@@ -6679,28 +6763,27 @@ yaffs_Object *yaffs_FindObjectByName(yaf
- 
- 	sum = yaffs_CalcNameSum(name);
- 
--	list_for_each(i, &directory->variant.directoryVariant.children) {
-+	ylist_for_each(i, &directory->variant.directoryVariant.children) {
- 		if (i) {
--			l = list_entry(i, yaffs_Object, siblings);
-+			l = ylist_entry(i, yaffs_Object, siblings);
-+
-+			if (l->parent != directory)
-+				YBUG();
- 
- 			yaffs_CheckObjectDetailsLoaded(l);
- 
- 			/* Special case for lost-n-found */
- 			if (l->objectId == YAFFS_OBJECTID_LOSTNFOUND) {
--				if (yaffs_strcmp(name, YAFFS_LOSTNFOUND_NAME) == 0) {
-+				if (yaffs_strcmp(name, YAFFS_LOSTNFOUND_NAME) == 0)
- 					return l;
--				}
--			} else if (yaffs_SumCompare(l->sum, sum) || l->chunkId <= 0)
--			{
--				/* LostnFound cunk called Objxxx
-+			} else if (yaffs_SumCompare(l->sum, sum) || l->hdrChunk <= 0) {
-+				/* LostnFound chunk called Objxxx
- 				 * Do a real check
- 				 */
- 				yaffs_GetObjectName(l, buffer,
- 						    YAFFS_MAX_NAME_LENGTH);
--				if (yaffs_strncmp(name, buffer,YAFFS_MAX_NAME_LENGTH) == 0) {
-+				if (yaffs_strncmp(name, buffer, YAFFS_MAX_NAME_LENGTH) == 0)
- 					return l;
--				}
--
- 			}
- 		}
- 	}
-@@ -6710,10 +6793,10 @@ yaffs_Object *yaffs_FindObjectByName(yaf
- 
- 
- #if 0
--int yaffs_ApplyToDirectoryChildren(yaffs_Object * theDir,
--				   int (*fn) (yaffs_Object *))
-+int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir,
-+					int (*fn) (yaffs_Object *))
- {
--	struct list_head *i;
-+	struct ylist_head *i;
- 	yaffs_Object *l;
- 
- 	if (!theDir) {
-@@ -6722,20 +6805,21 @@ int yaffs_ApplyToDirectoryChildren(yaffs
- 		   ("tragedy: yaffs_FindObjectByName: null pointer directory"
- 		    TENDSTR)));
- 		YBUG();
-+		return YAFFS_FAIL;
- 	}
- 	if (theDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
- 		T(YAFFS_TRACE_ALWAYS,
- 		  (TSTR
- 		   ("tragedy: yaffs_FindObjectByName: non-directory" TENDSTR)));
- 		YBUG();
-+		return YAFFS_FAIL;
- 	}
- 
--	list_for_each(i, &theDir->variant.directoryVariant.children) {
-+	ylist_for_each(i, &theDir->variant.directoryVariant.children) {
- 		if (i) {
--			l = list_entry(i, yaffs_Object, siblings);
--			if (l && !fn(l)) {
-+			l = ylist_entry(i, yaffs_Object, siblings);
-+			if (l && !fn(l))
- 				return YAFFS_FAIL;
--			}
- 		}
- 	}
- 
-@@ -6748,7 +6832,7 @@ int yaffs_ApplyToDirectoryChildren(yaffs
-  * actual object.
-  */
- 
--yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object * obj)
-+yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj)
- {
- 	if (obj && obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
- 		/* We want the object id of the equivalent object, not this one */
-@@ -6756,10 +6840,9 @@ yaffs_Object *yaffs_GetEquivalentObject(
- 		yaffs_CheckObjectDetailsLoaded(obj);
- 	}
- 	return obj;
--
- }
- 
--int yaffs_GetObjectName(yaffs_Object * obj, YCHAR * name, int buffSize)
-+int yaffs_GetObjectName(yaffs_Object *obj, YCHAR *name, int buffSize)
- {
- 	memset(name, 0, buffSize * sizeof(YCHAR));
- 
-@@ -6767,18 +6850,26 @@ int yaffs_GetObjectName(yaffs_Object * o
- 
- 	if (obj->objectId == YAFFS_OBJECTID_LOSTNFOUND) {
- 		yaffs_strncpy(name, YAFFS_LOSTNFOUND_NAME, buffSize - 1);
--	} else if (obj->chunkId <= 0) {
-+	} else if (obj->hdrChunk <= 0) {
- 		YCHAR locName[20];
-+		YCHAR numString[20];
-+		YCHAR *x = &numString[19];
-+		unsigned v = obj->objectId;
-+		numString[19] = 0;
-+		while (v > 0) {
-+			x--;
-+			*x = '0' + (v % 10);
-+			v /= 10;
-+		}
- 		/* make up a name */
--		yaffs_sprintf(locName, _Y("%s%d"), YAFFS_LOSTNFOUND_PREFIX,
--			      obj->objectId);
-+		yaffs_strcpy(locName, YAFFS_LOSTNFOUND_PREFIX);
-+		yaffs_strcat(locName, x);
- 		yaffs_strncpy(name, locName, buffSize - 1);
- 
- 	}
- #ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
--	else if (obj->shortName[0]) {
-+	else if (obj->shortName[0])
- 		yaffs_strcpy(name, obj->shortName);
--	}
- #endif
- 	else {
- 		int result;
-@@ -6788,9 +6879,9 @@ int yaffs_GetObjectName(yaffs_Object * o
- 
- 		memset(buffer, 0, obj->myDev->nDataBytesPerChunk);
- 
--		if (obj->chunkId >= 0) {
-+		if (obj->hdrChunk > 0) {
- 			result = yaffs_ReadChunkWithTagsFromNAND(obj->myDev,
--							obj->chunkId, buffer,
-+							obj->hdrChunk, buffer,
- 							NULL);
- 		}
- 		yaffs_strncpy(name, oh->name, buffSize - 1);
-@@ -6801,46 +6892,43 @@ int yaffs_GetObjectName(yaffs_Object * o
- 	return yaffs_strlen(name);
- }
- 
--int yaffs_GetObjectFileLength(yaffs_Object * obj)
-+int yaffs_GetObjectFileLength(yaffs_Object *obj)
- {
--
- 	/* Dereference any hard linking */
- 	obj = yaffs_GetEquivalentObject(obj);
- 
--	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
- 		return obj->variant.fileVariant.fileSize;
--	}
--	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
- 		return yaffs_strlen(obj->variant.symLinkVariant.alias);
--	} else {
-+	else {
- 		/* Only a directory should drop through to here */
- 		return obj->myDev->nDataBytesPerChunk;
- 	}
- }
- 
--int yaffs_GetObjectLinkCount(yaffs_Object * obj)
-+int yaffs_GetObjectLinkCount(yaffs_Object *obj)
- {
- 	int count = 0;
--	struct list_head *i;
-+	struct ylist_head *i;
- 
--	if (!obj->unlinked) {
--		count++;	/* the object itself */
--	}
--	list_for_each(i, &obj->hardLinks) {
--		count++;	/* add the hard links; */
--	}
--	return count;
-+	if (!obj->unlinked)
-+		count++;		/* the object itself */
-+
-+	ylist_for_each(i, &obj->hardLinks)
-+		count++;		/* add the hard links; */
- 
-+	return count;
- }
- 
--int yaffs_GetObjectInode(yaffs_Object * obj)
-+int yaffs_GetObjectInode(yaffs_Object *obj)
- {
- 	obj = yaffs_GetEquivalentObject(obj);
- 
- 	return obj->objectId;
- }
- 
--unsigned yaffs_GetObjectType(yaffs_Object * obj)
-+unsigned yaffs_GetObjectType(yaffs_Object *obj)
- {
- 	obj = yaffs_GetEquivalentObject(obj);
- 
-@@ -6872,19 +6960,18 @@ unsigned yaffs_GetObjectType(yaffs_Objec
- 	}
- }
- 
--YCHAR *yaffs_GetSymlinkAlias(yaffs_Object * obj)
-+YCHAR *yaffs_GetSymlinkAlias(yaffs_Object *obj)
- {
- 	obj = yaffs_GetEquivalentObject(obj);
--	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
- 		return yaffs_CloneString(obj->variant.symLinkVariant.alias);
--	} else {
-+	else
- 		return yaffs_CloneString(_Y(""));
--	}
- }
- 
- #ifndef CONFIG_YAFFS_WINCE
- 
--int yaffs_SetAttributes(yaffs_Object * obj, struct iattr *attr)
-+int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr)
- {
- 	unsigned int valid = attr->ia_valid;
- 
-@@ -6910,7 +6997,7 @@ int yaffs_SetAttributes(yaffs_Object * o
- 	return YAFFS_OK;
- 
- }
--int yaffs_GetAttributes(yaffs_Object * obj, struct iattr *attr)
-+int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr)
- {
- 	unsigned int valid = 0;
- 
-@@ -6934,13 +7021,12 @@ int yaffs_GetAttributes(yaffs_Object * o
- 	attr->ia_valid = valid;
- 
- 	return YAFFS_OK;
--
- }
- 
- #endif
- 
- #if 0
--int yaffs_DumpObject(yaffs_Object * obj)
-+int yaffs_DumpObject(yaffs_Object *obj)
- {
- 	YCHAR name[257];
- 
-@@ -6951,7 +7037,7 @@ int yaffs_DumpObject(yaffs_Object * obj)
- 	   ("Object %d, inode %d \"%s\"\n dirty %d valid %d serial %d sum %d"
- 	    " chunk %d type %d size %d\n"
- 	    TENDSTR), obj->objectId, yaffs_GetObjectInode(obj), name,
--	   obj->dirty, obj->valid, obj->serial, obj->sum, obj->chunkId,
-+	   obj->dirty, obj->valid, obj->serial, obj->sum, obj->hdrChunk,
- 	   yaffs_GetObjectType(obj), yaffs_GetObjectFileLength(obj)));
- 
- 	return YAFFS_OK;
-@@ -6960,7 +7046,7 @@ int yaffs_DumpObject(yaffs_Object * obj)
- 
- /*---------------------------- Initialisation code -------------------------------------- */
- 
--static int yaffs_CheckDevFunctions(const yaffs_Device * dev)
-+static int yaffs_CheckDevFunctions(const yaffs_Device *dev)
- {
- 
- 	/* Common functions, gotta have */
-@@ -7011,7 +7097,7 @@ static int yaffs_CreateInitialDirectorie
- 	    yaffs_CreateFakeDirectory(dev, YAFFS_OBJECTID_LOSTNFOUND,
- 				      YAFFS_LOSTNFOUND_MODE | S_IFDIR);
- 
--	if(dev->lostNFoundDir && dev->rootDir && dev->unlinkedDir && dev->deletedDir){
-+	if (dev->lostNFoundDir && dev->rootDir && dev->unlinkedDir && dev->deletedDir) {
- 		yaffs_AddObjectToDirectory(dev->rootDir, dev->lostNFoundDir);
- 		return YAFFS_OK;
- 	}
-@@ -7019,7 +7105,7 @@ static int yaffs_CreateInitialDirectorie
- 	return YAFFS_FAIL;
- }
- 
--int yaffs_GutsInitialise(yaffs_Device * dev)
-+int yaffs_GutsInitialise(yaffs_Device *dev)
- {
- 	int init_failed = 0;
- 	unsigned x;
-@@ -7040,6 +7126,8 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 	dev->chunkOffset = 0;
- 	dev->nFreeChunks = 0;
- 
-+	dev->gcBlock = -1;
-+
- 	if (dev->startBlock == 0) {
- 		dev->internalStartBlock = dev->startBlock + 1;
- 		dev->internalEndBlock = dev->endBlock + 1;
-@@ -7049,18 +7137,18 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 
- 	/* Check geometry parameters. */
- 
--	if ((dev->isYaffs2 && dev->nDataBytesPerChunk < 1024) ||
--	    (!dev->isYaffs2 && dev->nDataBytesPerChunk != 512) ||
-+	if ((!dev->inbandTags && dev->isYaffs2 && dev->totalBytesPerChunk < 1024) ||
-+	    (!dev->isYaffs2 && dev->totalBytesPerChunk < 512) ||
-+	    (dev->inbandTags && !dev->isYaffs2) ||
- 	     dev->nChunksPerBlock < 2 ||
- 	     dev->nReservedBlocks < 2 ||
- 	     dev->internalStartBlock <= 0 ||
- 	     dev->internalEndBlock <= 0 ||
--	     dev->internalEndBlock <= (dev->internalStartBlock + dev->nReservedBlocks + 2)	// otherwise it is too small
--	    ) {
-+	     dev->internalEndBlock <= (dev->internalStartBlock + dev->nReservedBlocks + 2)) {	/* otherwise it is too small */
- 		T(YAFFS_TRACE_ALWAYS,
- 		  (TSTR
--		   ("yaffs: NAND geometry problems: chunk size %d, type is yaffs%s "
--		    TENDSTR), dev->nDataBytesPerChunk, dev->isYaffs2 ? "2" : ""));
-+		   ("yaffs: NAND geometry problems: chunk size %d, type is yaffs%s, inbandTags %d "
-+		    TENDSTR), dev->totalBytesPerChunk, dev->isYaffs2 ? "2" : "", dev->inbandTags));
- 		return YAFFS_FAIL;
- 	}
- 
-@@ -7070,6 +7158,12 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 		return YAFFS_FAIL;
- 	}
- 
-+	/* Sort out space for inband tags, if required */
-+	if (dev->inbandTags)
-+		dev->nDataBytesPerChunk = dev->totalBytesPerChunk - sizeof(yaffs_PackedTags2TagsPart);
-+	else
-+		dev->nDataBytesPerChunk = dev->totalBytesPerChunk;
-+
- 	/* Got the right mix of functions? */
- 	if (!yaffs_CheckDevFunctions(dev)) {
- 		/* Function missing */
-@@ -7097,31 +7191,18 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 
- 	dev->isMounted = 1;
- 
--
--
- 	/* OK now calculate a few things for the device */
- 
- 	/*
- 	 *  Calculate all the chunk size manipulation numbers:
- 	 */
--	 /* Start off assuming it is a power of 2 */
--	 dev->chunkShift = ShiftDiv(dev->nDataBytesPerChunk);
--	 dev->chunkMask = (1<<dev->chunkShift) - 1;
--
--	 if(dev->nDataBytesPerChunk == (dev->chunkMask + 1)){
--	 	/* Yes it is a power of 2, disable crumbs */
--		dev->crumbMask = 0;
--		dev->crumbShift = 0;
--		dev->crumbsPerChunk = 0;
--	 } else {
--	 	/* Not a power of 2, use crumbs instead */
--		dev->crumbShift = ShiftDiv(sizeof(yaffs_PackedTags2TagsPart));
--		dev->crumbMask = (1<<dev->crumbShift)-1;
--		dev->crumbsPerChunk = dev->nDataBytesPerChunk/(1 << dev->crumbShift);
--		dev->chunkShift = 0;
--		dev->chunkMask = 0;
--	}
--
-+	x = dev->nDataBytesPerChunk;
-+	/* We always use dev->chunkShift and dev->chunkDiv */
-+	dev->chunkShift = Shifts(x);
-+	x >>= dev->chunkShift;
-+	dev->chunkDiv = x;
-+	/* We only use chunk mask if chunkDiv is 1 */
-+	dev->chunkMask = (1<<dev->chunkShift) - 1;
- 
- 	/*
- 	 * Calculate chunkGroupBits.
-@@ -7133,16 +7214,15 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 	bits = ShiftsGE(x);
- 
- 	/* Set up tnode width if wide tnodes are enabled. */
--	if(!dev->wideTnodesDisabled){
-+	if (!dev->wideTnodesDisabled) {
- 		/* bits must be even so that we end up with 32-bit words */
--		if(bits & 1)
-+		if (bits & 1)
- 			bits++;
--		if(bits < 16)
-+		if (bits < 16)
- 			dev->tnodeWidth = 16;
- 		else
- 			dev->tnodeWidth = bits;
--	}
--	else
-+	} else
- 		dev->tnodeWidth = 16;
- 
- 	dev->tnodeMask = (1<<dev->tnodeWidth)-1;
-@@ -7193,7 +7273,7 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 	dev->hasPendingPrioritisedGCs = 1; /* Assume the worst for now, will get fixed on first GC */
- 
- 	/* Initialise temporary buffers and caches. */
--	if(!yaffs_InitialiseTempBuffers(dev))
-+	if (!yaffs_InitialiseTempBuffers(dev))
- 		init_failed = 1;
- 
- 	dev->srCache = NULL;
-@@ -7203,25 +7283,26 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 	if (!init_failed &&
- 	    dev->nShortOpCaches > 0) {
- 		int i;
--		__u8 *buf;
-+		void *buf;
- 		int srCacheBytes = dev->nShortOpCaches * sizeof(yaffs_ChunkCache);
- 
--		if (dev->nShortOpCaches > YAFFS_MAX_SHORT_OP_CACHES) {
-+		if (dev->nShortOpCaches > YAFFS_MAX_SHORT_OP_CACHES)
- 			dev->nShortOpCaches = YAFFS_MAX_SHORT_OP_CACHES;
--		}
- 
--		buf = dev->srCache =  YMALLOC(srCacheBytes);
-+		dev->srCache =  YMALLOC(srCacheBytes);
- 
--		if(dev->srCache)
--			memset(dev->srCache,0,srCacheBytes);
-+		buf = (__u8 *) dev->srCache;
-+
-+		if (dev->srCache)
-+			memset(dev->srCache, 0, srCacheBytes);
- 
- 		for (i = 0; i < dev->nShortOpCaches && buf; i++) {
- 			dev->srCache[i].object = NULL;
- 			dev->srCache[i].lastUse = 0;
- 			dev->srCache[i].dirty = 0;
--			dev->srCache[i].data = buf = YMALLOC_DMA(dev->nDataBytesPerChunk);
-+			dev->srCache[i].data = buf = YMALLOC_DMA(dev->totalBytesPerChunk);
- 		}
--		if(!buf)
-+		if (!buf)
- 			init_failed = 1;
- 
- 		dev->srLastUse = 0;
-@@ -7229,29 +7310,30 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 
- 	dev->cacheHits = 0;
- 
--	if(!init_failed){
-+	if (!init_failed) {
- 		dev->gcCleanupList = YMALLOC(dev->nChunksPerBlock * sizeof(__u32));
--		if(!dev->gcCleanupList)
-+		if (!dev->gcCleanupList)
- 			init_failed = 1;
- 	}
- 
--	if (dev->isYaffs2) {
-+	if (dev->isYaffs2)
- 		dev->useHeaderFileSize = 1;
--	}
--	if(!init_failed && !yaffs_InitialiseBlocks(dev))
-+
-+	if (!init_failed && !yaffs_InitialiseBlocks(dev))
- 		init_failed = 1;
- 
- 	yaffs_InitialiseTnodes(dev);
- 	yaffs_InitialiseObjects(dev);
- 
--	if(!init_failed && !yaffs_CreateInitialDirectories(dev))
-+	if (!init_failed && !yaffs_CreateInitialDirectories(dev))
- 		init_failed = 1;
- 
- 
--	if(!init_failed){
-+	if (!init_failed) {
- 		/* Now scan the flash. */
- 		if (dev->isYaffs2) {
--			if(yaffs_CheckpointRestore(dev)) {
-+			if (yaffs_CheckpointRestore(dev)) {
-+				yaffs_CheckObjectDetailsLoaded(dev->rootDir);
- 				T(YAFFS_TRACE_ALWAYS,
- 				  (TSTR("yaffs: restored from checkpoint" TENDSTR)));
- 			} else {
-@@ -7273,24 +7355,25 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 				dev->nBackgroundDeletions = 0;
- 				dev->oldestDirtySequence = 0;
- 
--				if(!init_failed && !yaffs_InitialiseBlocks(dev))
-+				if (!init_failed && !yaffs_InitialiseBlocks(dev))
- 					init_failed = 1;
- 
- 				yaffs_InitialiseTnodes(dev);
- 				yaffs_InitialiseObjects(dev);
- 
--				if(!init_failed && !yaffs_CreateInitialDirectories(dev))
-+				if (!init_failed && !yaffs_CreateInitialDirectories(dev))
- 					init_failed = 1;
- 
--				if(!init_failed && !yaffs_ScanBackwards(dev))
-+				if (!init_failed && !yaffs_ScanBackwards(dev))
- 					init_failed = 1;
- 			}
--		}else
--			if(!yaffs_Scan(dev))
-+		} else if (!yaffs_Scan(dev))
- 				init_failed = 1;
-+
-+		yaffs_StripDeletedObjects(dev);
- 	}
- 
--	if(init_failed){
-+	if (init_failed) {
- 		/* Clean up the mess */
- 		T(YAFFS_TRACE_TRACING,
- 		  (TSTR("yaffs: yaffs_GutsInitialise() aborted.\n" TENDSTR)));
-@@ -7318,7 +7401,7 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 
- }
- 
--void yaffs_Deinitialise(yaffs_Device * dev)
-+void yaffs_Deinitialise(yaffs_Device *dev)
- {
- 	if (dev->isMounted) {
- 		int i;
-@@ -7330,7 +7413,7 @@ void yaffs_Deinitialise(yaffs_Device * d
- 		    dev->srCache) {
- 
- 			for (i = 0; i < dev->nShortOpCaches; i++) {
--				if(dev->srCache[i].data)
-+				if (dev->srCache[i].data)
- 					YFREE(dev->srCache[i].data);
- 				dev->srCache[i].data = NULL;
- 			}
-@@ -7341,16 +7424,17 @@ void yaffs_Deinitialise(yaffs_Device * d
- 
- 		YFREE(dev->gcCleanupList);
- 
--		for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
-+		for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++)
- 			YFREE(dev->tempBuffer[i].buffer);
--		}
- 
- 		dev->isMounted = 0;
--	}
- 
-+		if (dev->deinitialiseNAND)
-+			dev->deinitialiseNAND(dev);
-+	}
- }
- 
--static int yaffs_CountFreeChunks(yaffs_Device * dev)
-+static int yaffs_CountFreeChunks(yaffs_Device *dev)
- {
- 	int nFree;
- 	int b;
-@@ -7358,7 +7442,7 @@ static int yaffs_CountFreeChunks(yaffs_D
- 	yaffs_BlockInfo *blk;
- 
- 	for (nFree = 0, b = dev->internalStartBlock; b <= dev->internalEndBlock;
--	     b++) {
-+			b++) {
- 		blk = yaffs_GetBlockInfo(dev, b);
- 
- 		switch (blk->blockState) {
-@@ -7373,19 +7457,19 @@ static int yaffs_CountFreeChunks(yaffs_D
- 		default:
- 			break;
- 		}
--
- 	}
- 
- 	return nFree;
- }
- 
--int yaffs_GetNumberOfFreeChunks(yaffs_Device * dev)
-+int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev)
- {
- 	/* This is what we report to the outside world */
- 
- 	int nFree;
- 	int nDirtyCacheChunks;
- 	int blocksForCheckpoint;
-+	int i;
- 
- #if 1
- 	nFree = dev->nFreeChunks;
-@@ -7397,12 +7481,9 @@ int yaffs_GetNumberOfFreeChunks(yaffs_De
- 
- 	/* Now count the number of dirty chunks in the cache and subtract those */
- 
--	{
--		int i;
--		for (nDirtyCacheChunks = 0, i = 0; i < dev->nShortOpCaches; i++) {
--			if (dev->srCache[i].dirty)
--				nDirtyCacheChunks++;
--		}
-+	for (nDirtyCacheChunks = 0, i = 0; i < dev->nShortOpCaches; i++) {
-+		if (dev->srCache[i].dirty)
-+			nDirtyCacheChunks++;
- 	}
- 
- 	nFree -= nDirtyCacheChunks;
-@@ -7410,8 +7491,8 @@ int yaffs_GetNumberOfFreeChunks(yaffs_De
- 	nFree -= ((dev->nReservedBlocks + 1) * dev->nChunksPerBlock);
- 
- 	/* Now we figure out how much to reserve for the checkpoint and report that... */
--	blocksForCheckpoint = dev->nCheckpointReservedBlocks - dev->blocksInCheckpoint;
--	if(blocksForCheckpoint < 0)
-+	blocksForCheckpoint = yaffs_CalcCheckpointBlocksRequired(dev) - dev->blocksInCheckpoint;
-+	if (blocksForCheckpoint < 0)
- 		blocksForCheckpoint = 0;
- 
- 	nFree -= (blocksForCheckpoint * dev->nChunksPerBlock);
-@@ -7425,12 +7506,12 @@ int yaffs_GetNumberOfFreeChunks(yaffs_De
- 
- static int yaffs_freeVerificationFailures;
- 
--static void yaffs_VerifyFreeChunks(yaffs_Device * dev)
-+static void yaffs_VerifyFreeChunks(yaffs_Device *dev)
- {
- 	int counted;
- 	int difference;
- 
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
- 	counted = yaffs_CountFreeChunks(dev);
-@@ -7447,23 +7528,25 @@ static void yaffs_VerifyFreeChunks(yaffs
- 
- /*---------------------------------------- YAFFS test code ----------------------*/
- 
--#define yaffs_CheckStruct(structure,syze, name) \
--           if(sizeof(structure) != syze) \
--	       { \
--	         T(YAFFS_TRACE_ALWAYS,(TSTR("%s should be %d but is %d\n" TENDSTR),\
--		 name,syze,sizeof(structure))); \
--	         return YAFFS_FAIL; \
--		}
-+#define yaffs_CheckStruct(structure, syze, name) \
-+	do { \
-+		if (sizeof(structure) != syze) { \
-+			T(YAFFS_TRACE_ALWAYS, (TSTR("%s should be %d but is %d\n" TENDSTR),\
-+				name, syze, sizeof(structure))); \
-+			return YAFFS_FAIL; \
-+		} \
-+	} while (0)
- 
- static int yaffs_CheckStructures(void)
- {
--/*      yaffs_CheckStruct(yaffs_Tags,8,"yaffs_Tags") */
--/*      yaffs_CheckStruct(yaffs_TagsUnion,8,"yaffs_TagsUnion") */
--/*      yaffs_CheckStruct(yaffs_Spare,16,"yaffs_Spare") */
-+/*      yaffs_CheckStruct(yaffs_Tags,8,"yaffs_Tags"); */
-+/*      yaffs_CheckStruct(yaffs_TagsUnion,8,"yaffs_TagsUnion"); */
-+/*      yaffs_CheckStruct(yaffs_Spare,16,"yaffs_Spare"); */
- #ifndef CONFIG_YAFFS_TNODE_LIST_DEBUG
--	yaffs_CheckStruct(yaffs_Tnode, 2 * YAFFS_NTNODES_LEVEL0, "yaffs_Tnode")
-+	yaffs_CheckStruct(yaffs_Tnode, 2 * YAFFS_NTNODES_LEVEL0, "yaffs_Tnode");
- #endif
--	    yaffs_CheckStruct(yaffs_ObjectHeader, 512, "yaffs_ObjectHeader")
--
--	    return YAFFS_OK;
-+#ifndef CONFIG_YAFFS_WINCE
-+	yaffs_CheckStruct(yaffs_ObjectHeader, 512, "yaffs_ObjectHeader");
-+#endif
-+	return YAFFS_OK;
- }
---- a/fs/yaffs2/yaffs_guts.h
-+++ b/fs/yaffs2/yaffs_guts.h
-@@ -90,7 +90,7 @@
- 
- #define YAFFS_MAX_SHORT_OP_CACHES	20
- 
--#define YAFFS_N_TEMP_BUFFERS		4
-+#define YAFFS_N_TEMP_BUFFERS		6
- 
- /* We limit the number attempts at sucessfully saving a chunk of data.
-  * Small-page devices have 32 pages per block; large-page devices have 64.
-@@ -108,6 +108,9 @@
- #define YAFFS_LOWEST_SEQUENCE_NUMBER	0x00001000
- #define YAFFS_HIGHEST_SEQUENCE_NUMBER	0xEFFFFF00
- 
-+/* Special sequence number for bad block that failed to be marked bad */
-+#define YAFFS_SEQUENCE_BAD_BLOCK	0xFFFF0000
-+
- /* ChunkCache is used for short read/write operations.*/
- typedef struct {
- 	struct yaffs_ObjectStruct *object;
-@@ -134,11 +137,10 @@ typedef struct {
- typedef struct {
- 	unsigned chunkId:20;
- 	unsigned serialNumber:2;
--	unsigned byteCount:10;
-+	unsigned byteCountLSB:10;
- 	unsigned objectId:18;
- 	unsigned ecc:12;
--	unsigned unusedStuff:2;
--
-+	unsigned byteCountMSB:2;
- } yaffs_Tags;
- 
- typedef union {
-@@ -277,13 +279,13 @@ typedef struct {
- 
- 	int softDeletions:10;	/* number of soft deleted pages */
- 	int pagesInUse:10;	/* number of pages in use */
--	yaffs_BlockState blockState:4;	/* One of the above block states */
-+	unsigned blockState:4;	/* One of the above block states. NB use unsigned because enum is sometimes an int */
- 	__u32 needsRetiring:1;	/* Data has failed on this block, need to get valid data off */
--                        	/* and retire the block. */
--	__u32 skipErasedCheck: 1; /* If this is set we can skip the erased check on this block */
--	__u32 gcPrioritise: 1; 	/* An ECC check or blank check has failed on this block.
-+				/* and retire the block. */
-+	__u32 skipErasedCheck:1; /* If this is set we can skip the erased check on this block */
-+	__u32 gcPrioritise:1; 	/* An ECC check or blank check has failed on this block.
- 				   It should be prioritised for GC */
--        __u32 chunkErrorStrikes:3; /* How many times we've had ecc etc failures on this block and tried to reuse it */
-+	__u32 chunkErrorStrikes:3; /* How many times we've had ecc etc failures on this block and tried to reuse it */
- 
- #ifdef CONFIG_YAFFS_YAFFS2
- 	__u32 hasShrinkHeader:1; /* This block has at least one shrink object header */
-@@ -300,11 +302,11 @@ typedef struct {
- 
- 	/* Apply to everything  */
- 	int parentObjectId;
--	__u16 sum__NoLongerUsed;	/* checksum of name. No longer used */
-+	__u16 sum__NoLongerUsed;        /* checksum of name. No longer used */
- 	YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
- 
--	/* Thes following apply to directories, files, symlinks - not hard links */
--	__u32 yst_mode;		/* protection */
-+	/* The following apply to directories, files, symlinks - not hard links */
-+	__u32 yst_mode;         /* protection */
- 
- #ifdef CONFIG_YAFFS_WINCE
- 	__u32 notForWinCE[5];
-@@ -331,11 +333,14 @@ typedef struct {
- 	__u32 win_ctime[2];
- 	__u32 win_atime[2];
- 	__u32 win_mtime[2];
--	__u32 roomToGrow[4];
- #else
--	__u32 roomToGrow[10];
-+	__u32 roomToGrow[6];
-+
- #endif
-+	__u32 inbandShadowsObject;
-+	__u32 inbandIsShrink;
- 
-+	__u32 reservedSpace[2];
- 	int shadowsObject;	/* This object header shadows the specified object if > 0 */
- 
- 	/* isShrink applies to object headers written when we shrink the file (ie resize) */
-@@ -381,7 +386,7 @@ typedef struct {
- } yaffs_FileStructure;
- 
- typedef struct {
--	struct list_head children;	/* list of child links */
-+	struct ylist_head children;     /* list of child links */
- } yaffs_DirectoryStructure;
- 
- typedef struct {
-@@ -418,23 +423,24 @@ struct yaffs_ObjectStruct {
- 				 * still in the inode cache. Free of object is defered.
- 				 * until the inode is released.
- 				 */
-+	__u8 beingCreated:1;	/* This object is still being created so skip some checks. */
- 
- 	__u8 serial;		/* serial number of chunk in NAND. Cached here */
- 	__u16 sum;		/* sum of the name to speed searching */
- 
--	struct yaffs_DeviceStruct *myDev;	/* The device I'm on */
-+	struct yaffs_DeviceStruct *myDev;       /* The device I'm on */
- 
--	struct list_head hashLink;	/* list of objects in this hash bucket */
-+	struct ylist_head hashLink;     /* list of objects in this hash bucket */
- 
--	struct list_head hardLinks;	/* all the equivalent hard linked objects */
-+	struct ylist_head hardLinks;    /* all the equivalent hard linked objects */
- 
- 	/* directory structure stuff */
- 	/* also used for linking up the free list */
- 	struct yaffs_ObjectStruct *parent;
--	struct list_head siblings;
-+	struct ylist_head siblings;
- 
- 	/* Where's my object header in NAND? */
--	int chunkId;
-+	int hdrChunk;
- 
- 	int nDataChunks;	/* Number of data chunks attached to the file. */
- 
-@@ -485,7 +491,7 @@ struct yaffs_ObjectList_struct {
- typedef struct yaffs_ObjectList_struct yaffs_ObjectList;
- 
- typedef struct {
--	struct list_head list;
-+	struct ylist_head list;
- 	int count;
- } yaffs_ObjectBucket;
- 
-@@ -495,11 +501,10 @@ typedef struct {
-  */
- 
- typedef struct {
--        int structType;
-+	int structType;
- 	__u32 objectId;
- 	__u32 parentId;
--	int chunkId;
--
-+	int hdrChunk;
- 	yaffs_ObjectType variantType:3;
- 	__u8 deleted:1;
- 	__u8 softDeleted:1;
-@@ -511,8 +516,7 @@ typedef struct {
- 
- 	int nDataChunks;
- 	__u32 fileSizeOrEquivalentObjectId;
--
--}yaffs_CheckpointObject;
-+} yaffs_CheckpointObject;
- 
- /*--------------------- Temporary buffers ----------------
-  *
-@@ -528,13 +532,13 @@ typedef struct {
- /*----------------- Device ---------------------------------*/
- 
- struct yaffs_DeviceStruct {
--	struct list_head devList;
-+	struct ylist_head devList;
- 	const char *name;
- 
- 	/* Entry parameters set up way early. Yaffs sets up the rest.*/
- 	int nDataBytesPerChunk;	/* Should be a power of 2 >= 512 */
- 	int nChunksPerBlock;	/* does not need to be a power of 2 */
--	int nBytesPerSpare;	/* spare area size */
-+	int spareBytesPerChunk;	/* spare area size */
- 	int startBlock;		/* Start block we're allowed to use */
- 	int endBlock;		/* End block we're allowed to use */
- 	int nReservedBlocks;	/* We want this tuneable so that we can reduce */
-@@ -544,9 +548,7 @@ struct yaffs_DeviceStruct {
- 	/* Stuff used by the shared space checkpointing mechanism */
- 	/* If this value is zero, then this mechanism is disabled */
- 
--	int nCheckpointReservedBlocks; /* Blocks to reserve for checkpoint data */
--
--
-+/*	int nCheckpointReservedBlocks; */ /* Blocks to reserve for checkpoint data */
- 
- 
- 	int nShortOpCaches;	/* If <= 0, then short op caching is disabled, else
-@@ -560,30 +562,31 @@ struct yaffs_DeviceStruct {
- 	void *genericDevice;	/* Pointer to device context
- 				 * On an mtd this holds the mtd pointer.
- 				 */
--        void *superBlock;
-+	void *superBlock;
- 
- 	/* NAND access functions (Must be set before calling YAFFS)*/
- 
--	int (*writeChunkToNAND) (struct yaffs_DeviceStruct * dev,
--				 int chunkInNAND, const __u8 * data,
--				 const yaffs_Spare * spare);
--	int (*readChunkFromNAND) (struct yaffs_DeviceStruct * dev,
--				  int chunkInNAND, __u8 * data,
--				  yaffs_Spare * spare);
--	int (*eraseBlockInNAND) (struct yaffs_DeviceStruct * dev,
--				 int blockInNAND);
--	int (*initialiseNAND) (struct yaffs_DeviceStruct * dev);
-+	int (*writeChunkToNAND) (struct yaffs_DeviceStruct *dev,
-+					int chunkInNAND, const __u8 *data,
-+					const yaffs_Spare *spare);
-+	int (*readChunkFromNAND) (struct yaffs_DeviceStruct *dev,
-+					int chunkInNAND, __u8 *data,
-+					yaffs_Spare *spare);
-+	int (*eraseBlockInNAND) (struct yaffs_DeviceStruct *dev,
-+					int blockInNAND);
-+	int (*initialiseNAND) (struct yaffs_DeviceStruct *dev);
-+	int (*deinitialiseNAND) (struct yaffs_DeviceStruct *dev);
- 
- #ifdef CONFIG_YAFFS_YAFFS2
--	int (*writeChunkWithTagsToNAND) (struct yaffs_DeviceStruct * dev,
--					 int chunkInNAND, const __u8 * data,
--					 const yaffs_ExtendedTags * tags);
--	int (*readChunkWithTagsFromNAND) (struct yaffs_DeviceStruct * dev,
--					  int chunkInNAND, __u8 * data,
--					  yaffs_ExtendedTags * tags);
--	int (*markNANDBlockBad) (struct yaffs_DeviceStruct * dev, int blockNo);
--	int (*queryNANDBlock) (struct yaffs_DeviceStruct * dev, int blockNo,
--			       yaffs_BlockState * state, int *sequenceNumber);
-+	int (*writeChunkWithTagsToNAND) (struct yaffs_DeviceStruct *dev,
-+					 int chunkInNAND, const __u8 *data,
-+					 const yaffs_ExtendedTags *tags);
-+	int (*readChunkWithTagsFromNAND) (struct yaffs_DeviceStruct *dev,
-+					  int chunkInNAND, __u8 *data,
-+					  yaffs_ExtendedTags *tags);
-+	int (*markNANDBlockBad) (struct yaffs_DeviceStruct *dev, int blockNo);
-+	int (*queryNANDBlock) (struct yaffs_DeviceStruct *dev, int blockNo,
-+			       yaffs_BlockState *state, __u32 *sequenceNumber);
- #endif
- 
- 	int isYaffs2;
-@@ -595,10 +598,12 @@ struct yaffs_DeviceStruct {
- 	void (*removeObjectCallback)(struct yaffs_ObjectStruct *obj);
- 
- 	/* Callback to mark the superblock dirsty */
--	void (*markSuperBlockDirty)(void * superblock);
-+	void (*markSuperBlockDirty)(void *superblock);
- 
- 	int wideTnodesDisabled; /* Set to disable wide tnodes */
- 
-+	YCHAR *pathDividers;	/* String of legal path dividers */
-+
- 
- 	/* End of stuff that must be set before initialisation. */
- 
-@@ -615,16 +620,14 @@ struct yaffs_DeviceStruct {
- 	__u32 tnodeWidth;
- 	__u32 tnodeMask;
- 
--	/* Stuff to support various file offses to chunk/offset translations */
--	/* "Crumbs" for nDataBytesPerChunk not being a power of 2 */
--	__u32 crumbMask;
--	__u32 crumbShift;
--	__u32 crumbsPerChunk;
--
--	/* Straight shifting for nDataBytesPerChunk being a power of 2 */
--	__u32 chunkShift;
--	__u32 chunkMask;
--
-+	/* Stuff for figuring out file offset to chunk conversions */
-+	__u32 chunkShift; /* Shift value */
-+	__u32 chunkDiv;   /* Divisor after shifting: 1 for power-of-2 sizes */
-+	__u32 chunkMask;  /* Mask to use for power-of-2 case */
-+
-+	/* Stuff to handle inband tags */
-+	int inbandTags;
-+	__u32 totalBytesPerChunk;
- 
- #ifdef __KERNEL__
- 
-@@ -633,7 +636,7 @@ struct yaffs_DeviceStruct {
- 	__u8 *spareBuffer;	/* For mtdif2 use. Don't know the size of the buffer
- 				 * at compile time so we have to allocate it.
- 				 */
--	void (*putSuperFunc) (struct super_block * sb);
-+	void (*putSuperFunc) (struct super_block *sb);
- #endif
- 
- 	int isMounted;
-@@ -663,6 +666,8 @@ struct yaffs_DeviceStruct {
- 	__u32 checkpointSum;
- 	__u32 checkpointXor;
- 
-+	int nCheckpointBlocksRequired; /* Number of blocks needed to store current checkpoint set */
-+
- 	/* Block Info */
- 	yaffs_BlockInfo *blockInfo;
- 	__u8 *chunkBits;	/* bitmap of chunks in use */
-@@ -684,11 +689,15 @@ struct yaffs_DeviceStruct {
- 	yaffs_TnodeList *allocatedTnodeList;
- 
- 	int isDoingGC;
-+	int gcBlock;
-+	int gcChunk;
- 
- 	int nObjectsCreated;
- 	yaffs_Object *freeObjects;
- 	int nFreeObjects;
- 
-+	int nHardLinks;
-+
- 	yaffs_ObjectList *allocatedObjectList;
- 
- 	yaffs_ObjectBucket objectBucket[YAFFS_NOBJECT_BUCKETS];
-@@ -745,8 +754,10 @@ struct yaffs_DeviceStruct {
- 	int nBackgroundDeletions;	/* Count of background deletions. */
- 
- 
-+	/* Temporary buffer management */
- 	yaffs_TempBuffer tempBuffer[YAFFS_N_TEMP_BUFFERS];
- 	int maxTemp;
-+	int tempInUse;
- 	int unmanagedTempAllocations;
- 	int unmanagedTempDeallocations;
- 
-@@ -758,9 +769,9 @@ struct yaffs_DeviceStruct {
- 
- typedef struct yaffs_DeviceStruct yaffs_Device;
- 
--/* The static layout of bllock usage etc is stored in the super block header */
-+/* The static layout of block usage etc is stored in the super block header */
- typedef struct {
--        int StructType;
-+	int StructType;
- 	int version;
- 	int checkpointStartBlock;
- 	int checkpointEndBlock;
-@@ -773,7 +784,7 @@ typedef struct {
-  * must be preserved over unmount/mount cycles.
-  */
- typedef struct {
--        int structType;
-+	int structType;
- 	int nErasedBlocks;
- 	int allocationBlock;	/* Current block being allocated off */
- 	__u32 allocationPage;
-@@ -791,57 +802,45 @@ typedef struct {
- 
- 
- typedef struct {
--    int structType;
--    __u32 magic;
--    __u32 version;
--    __u32 head;
-+	int structType;
-+	__u32 magic;
-+	__u32 version;
-+	__u32 head;
- } yaffs_CheckpointValidity;
- 
--/* Function to manipulate block info */
--static Y_INLINE yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blk)
--{
--	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
--		T(YAFFS_TRACE_ERROR,
--		  (TSTR
--		   ("**>> yaffs: getBlockInfo block %d is not valid" TENDSTR),
--		   blk));
--		YBUG();
--	}
--	return &dev->blockInfo[blk - dev->internalStartBlock];
--}
- 
- /*----------------------- YAFFS Functions -----------------------*/
- 
--int yaffs_GutsInitialise(yaffs_Device * dev);
--void yaffs_Deinitialise(yaffs_Device * dev);
-+int yaffs_GutsInitialise(yaffs_Device *dev);
-+void yaffs_Deinitialise(yaffs_Device *dev);
- 
--int yaffs_GetNumberOfFreeChunks(yaffs_Device * dev);
-+int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev);
- 
--int yaffs_RenameObject(yaffs_Object * oldDir, const YCHAR * oldName,
--		       yaffs_Object * newDir, const YCHAR * newName);
-+int yaffs_RenameObject(yaffs_Object *oldDir, const YCHAR *oldName,
-+		       yaffs_Object *newDir, const YCHAR *newName);
- 
--int yaffs_Unlink(yaffs_Object * dir, const YCHAR * name);
--int yaffs_DeleteFile(yaffs_Object * obj);
-+int yaffs_Unlink(yaffs_Object *dir, const YCHAR *name);
-+int yaffs_DeleteObject(yaffs_Object *obj);
- 
--int yaffs_GetObjectName(yaffs_Object * obj, YCHAR * name, int buffSize);
--int yaffs_GetObjectFileLength(yaffs_Object * obj);
--int yaffs_GetObjectInode(yaffs_Object * obj);
--unsigned yaffs_GetObjectType(yaffs_Object * obj);
--int yaffs_GetObjectLinkCount(yaffs_Object * obj);
-+int yaffs_GetObjectName(yaffs_Object *obj, YCHAR *name, int buffSize);
-+int yaffs_GetObjectFileLength(yaffs_Object *obj);
-+int yaffs_GetObjectInode(yaffs_Object *obj);
-+unsigned yaffs_GetObjectType(yaffs_Object *obj);
-+int yaffs_GetObjectLinkCount(yaffs_Object *obj);
- 
--int yaffs_SetAttributes(yaffs_Object * obj, struct iattr *attr);
--int yaffs_GetAttributes(yaffs_Object * obj, struct iattr *attr);
-+int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr);
-+int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr);
- 
- /* File operations */
--int yaffs_ReadDataFromFile(yaffs_Object * obj, __u8 * buffer, loff_t offset,
--			   int nBytes);
--int yaffs_WriteDataToFile(yaffs_Object * obj, const __u8 * buffer, loff_t offset,
--			  int nBytes, int writeThrough);
--int yaffs_ResizeFile(yaffs_Object * obj, loff_t newSize);
--
--yaffs_Object *yaffs_MknodFile(yaffs_Object * parent, const YCHAR * name,
--			      __u32 mode, __u32 uid, __u32 gid);
--int yaffs_FlushFile(yaffs_Object * obj, int updateTime);
-+int yaffs_ReadDataFromFile(yaffs_Object *obj, __u8 *buffer, loff_t offset,
-+				int nBytes);
-+int yaffs_WriteDataToFile(yaffs_Object *obj, const __u8 *buffer, loff_t offset,
-+				int nBytes, int writeThrough);
-+int yaffs_ResizeFile(yaffs_Object *obj, loff_t newSize);
-+
-+yaffs_Object *yaffs_MknodFile(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid);
-+int yaffs_FlushFile(yaffs_Object *obj, int updateTime);
- 
- /* Flushing and checkpointing */
- void yaffs_FlushEntireDeviceCache(yaffs_Device *dev);
-@@ -850,33 +849,33 @@ int yaffs_CheckpointSave(yaffs_Device *d
- int yaffs_CheckpointRestore(yaffs_Device *dev);
- 
- /* Directory operations */
--yaffs_Object *yaffs_MknodDirectory(yaffs_Object * parent, const YCHAR * name,
--				   __u32 mode, __u32 uid, __u32 gid);
--yaffs_Object *yaffs_FindObjectByName(yaffs_Object * theDir, const YCHAR * name);
--int yaffs_ApplyToDirectoryChildren(yaffs_Object * theDir,
-+yaffs_Object *yaffs_MknodDirectory(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid);
-+yaffs_Object *yaffs_FindObjectByName(yaffs_Object *theDir, const YCHAR *name);
-+int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir,
- 				   int (*fn) (yaffs_Object *));
- 
--yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device * dev, __u32 number);
-+yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev, __u32 number);
- 
- /* Link operations */
--yaffs_Object *yaffs_Link(yaffs_Object * parent, const YCHAR * name,
--			 yaffs_Object * equivalentObject);
-+yaffs_Object *yaffs_Link(yaffs_Object *parent, const YCHAR *name,
-+			 yaffs_Object *equivalentObject);
- 
--yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object * obj);
-+yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj);
- 
- /* Symlink operations */
--yaffs_Object *yaffs_MknodSymLink(yaffs_Object * parent, const YCHAR * name,
-+yaffs_Object *yaffs_MknodSymLink(yaffs_Object *parent, const YCHAR *name,
- 				 __u32 mode, __u32 uid, __u32 gid,
--				 const YCHAR * alias);
--YCHAR *yaffs_GetSymlinkAlias(yaffs_Object * obj);
-+				 const YCHAR *alias);
-+YCHAR *yaffs_GetSymlinkAlias(yaffs_Object *obj);
- 
- /* Special inodes (fifos, sockets and devices) */
--yaffs_Object *yaffs_MknodSpecial(yaffs_Object * parent, const YCHAR * name,
-+yaffs_Object *yaffs_MknodSpecial(yaffs_Object *parent, const YCHAR *name,
- 				 __u32 mode, __u32 uid, __u32 gid, __u32 rdev);
- 
- /* Special directories */
--yaffs_Object *yaffs_Root(yaffs_Device * dev);
--yaffs_Object *yaffs_LostNFound(yaffs_Device * dev);
-+yaffs_Object *yaffs_Root(yaffs_Device *dev);
-+yaffs_Object *yaffs_LostNFound(yaffs_Device *dev);
- 
- #ifdef CONFIG_YAFFS_WINCE
- /* CONFIG_YAFFS_WINCE special stuff */
-@@ -885,18 +884,21 @@ void yfsd_WinFileTimeNow(__u32 target[2]
- 
- #ifdef __KERNEL__
- 
--void yaffs_HandleDeferedFree(yaffs_Object * obj);
-+void yaffs_HandleDeferedFree(yaffs_Object *obj);
- #endif
- 
- /* Debug dump  */
--int yaffs_DumpObject(yaffs_Object * obj);
-+int yaffs_DumpObject(yaffs_Object *obj);
- 
--void yaffs_GutsTest(yaffs_Device * dev);
-+void yaffs_GutsTest(yaffs_Device *dev);
- 
- /* A few useful functions */
--void yaffs_InitialiseTags(yaffs_ExtendedTags * tags);
--void yaffs_DeleteChunk(yaffs_Device * dev, int chunkId, int markNAND, int lyn);
--int yaffs_CheckFF(__u8 * buffer, int nBytes);
-+void yaffs_InitialiseTags(yaffs_ExtendedTags *tags);
-+void yaffs_DeleteChunk(yaffs_Device *dev, int chunkId, int markNAND, int lyn);
-+int yaffs_CheckFF(__u8 *buffer, int nBytes);
- void yaffs_HandleChunkError(yaffs_Device *dev, yaffs_BlockInfo *bi);
- 
-+__u8 *yaffs_GetTempBuffer(yaffs_Device *dev, int lineNo);
-+void yaffs_ReleaseTempBuffer(yaffs_Device *dev, __u8 *buffer, int lineNo);
-+
- #endif
---- a/fs/yaffs2/yaffs_mtdif1.c
-+++ b/fs/yaffs2/yaffs_mtdif1.c
-@@ -26,7 +26,7 @@
- #include "yportenv.h"
- #include "yaffs_guts.h"
- #include "yaffs_packedtags1.h"
--#include "yaffs_tagscompat.h"	// for yaffs_CalcTagsECC
-+#include "yaffs_tagscompat.h"	/* for yaffs_CalcTagsECC */
- 
- #include "linux/kernel.h"
- #include "linux/version.h"
-@@ -34,9 +34,9 @@
- #include "linux/mtd/mtd.h"
- 
- /* Don't compile this module if we don't have MTD's mtd_oob_ops interface */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 
--const char *yaffs_mtdif1_c_version = "$Id: yaffs_mtdif1.c,v 1.3 2007/05/15 20:16:11 ian Exp $";
-+const char *yaffs_mtdif1_c_version = "$Id: yaffs_mtdif1.c,v 1.10 2009-03-09 07:41:10 charles Exp $";
- 
- #ifndef CONFIG_YAFFS_9BYTE_TAGS
- # define YTAG1_SIZE 8
-@@ -89,9 +89,9 @@ static struct nand_ecclayout nand_oob_16
-  * Returns YAFFS_OK or YAFFS_FAIL.
-  */
- int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device *dev,
--	int chunkInNAND, const __u8 * data, const yaffs_ExtendedTags * etags)
-+	int chunkInNAND, const __u8 *data, const yaffs_ExtendedTags *etags)
- {
--	struct mtd_info * mtd = dev->genericDevice;
-+	struct mtd_info *mtd = dev->genericDevice;
- 	int chunkBytes = dev->nDataBytesPerChunk;
- 	loff_t addr = ((loff_t)chunkInNAND) * chunkBytes;
- 	struct mtd_oob_ops ops;
-@@ -146,7 +146,7 @@ int nandmtd1_WriteChunkWithTagsToNAND(ya
- 
- /* Return with empty ExtendedTags but add eccResult.
-  */
--static int rettags(yaffs_ExtendedTags * etags, int eccResult, int retval)
-+static int rettags(yaffs_ExtendedTags *etags, int eccResult, int retval)
- {
- 	if (etags) {
- 		memset(etags, 0, sizeof(*etags));
-@@ -169,9 +169,9 @@ static int rettags(yaffs_ExtendedTags * 
-  * Returns YAFFS_OK or YAFFS_FAIL.
-  */
- int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev,
--	int chunkInNAND, __u8 * data, yaffs_ExtendedTags * etags)
-+	int chunkInNAND, __u8 *data, yaffs_ExtendedTags *etags)
- {
--	struct mtd_info * mtd = dev->genericDevice;
-+	struct mtd_info *mtd = dev->genericDevice;
- 	int chunkBytes = dev->nDataBytesPerChunk;
- 	loff_t addr = ((loff_t)chunkInNAND) * chunkBytes;
- 	int eccres = YAFFS_ECC_RESULT_NO_ERROR;
-@@ -189,7 +189,7 @@ int nandmtd1_ReadChunkWithTagsFromNAND(y
- 	ops.datbuf = data;
- 	ops.oobbuf = (__u8 *)&pt1;
- 
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20))
-+#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 20))
- 	/* In MTD 2.6.18 to 2.6.19 nand_base.c:nand_do_read_oob() has a bug;
- 	 * help it out with ops.len = ops.ooblen when ops.datbuf == NULL.
- 	 */
-@@ -284,11 +284,11 @@ int nandmtd1_ReadChunkWithTagsFromNAND(y
-  */
- int nandmtd1_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo)
- {
--	struct mtd_info * mtd = dev->genericDevice;
-+	struct mtd_info *mtd = dev->genericDevice;
- 	int blocksize = dev->nChunksPerBlock * dev->nDataBytesPerChunk;
- 	int retval;
- 
--	yaffs_trace(YAFFS_TRACE_BAD_BLOCKS, "marking block %d bad", blockNo);
-+	yaffs_trace(YAFFS_TRACE_BAD_BLOCKS, "marking block %d bad\n", blockNo);
- 
- 	retval = mtd->block_markbad(mtd, (loff_t)blocksize * blockNo);
- 	return (retval) ? YAFFS_FAIL : YAFFS_OK;
-@@ -298,7 +298,7 @@ int nandmtd1_MarkNANDBlockBad(struct yaf
-  *
-  * Returns YAFFS_OK or YAFFS_FAIL.
-  */
--static int nandmtd1_TestPrerequists(struct mtd_info * mtd)
-+static int nandmtd1_TestPrerequists(struct mtd_info *mtd)
- {
- 	/* 2.6.18 has mtd->ecclayout->oobavail */
- 	/* 2.6.21 has mtd->ecclayout->oobavail and mtd->oobavail */
-@@ -323,10 +323,11 @@ static int nandmtd1_TestPrerequists(stru
-  * Always returns YAFFS_OK.
-  */
- int nandmtd1_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--	yaffs_BlockState * pState, int *pSequenceNumber)
-+	yaffs_BlockState *pState, __u32 *pSequenceNumber)
- {
--	struct mtd_info * mtd = dev->genericDevice;
-+	struct mtd_info *mtd = dev->genericDevice;
- 	int chunkNo = blockNo * dev->nChunksPerBlock;
-+	loff_t addr = (loff_t)chunkNo * dev->nDataBytesPerChunk;
- 	yaffs_ExtendedTags etags;
- 	int state = YAFFS_BLOCK_STATE_DEAD;
- 	int seqnum = 0;
-@@ -335,21 +336,22 @@ int nandmtd1_QueryNANDBlock(struct yaffs
- 	/* We don't yet have a good place to test for MTD config prerequists.
- 	 * Do it here as we are called during the initial scan.
- 	 */
--	if (nandmtd1_TestPrerequists(mtd) != YAFFS_OK) {
-+	if (nandmtd1_TestPrerequists(mtd) != YAFFS_OK)
- 		return YAFFS_FAIL;
--	}
- 
- 	retval = nandmtd1_ReadChunkWithTagsFromNAND(dev, chunkNo, NULL, &etags);
-+	etags.blockBad = (mtd->block_isbad)(mtd, addr);
- 	if (etags.blockBad) {
- 		yaffs_trace(YAFFS_TRACE_BAD_BLOCKS,
--			"block %d is marked bad", blockNo);
-+			"block %d is marked bad\n", blockNo);
- 		state = YAFFS_BLOCK_STATE_DEAD;
--	}
--	else if (etags.chunkUsed) {
-+	} else if (etags.eccResult != YAFFS_ECC_RESULT_NO_ERROR) {
-+		/* bad tags, need to look more closely */
-+		state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
-+	} else if (etags.chunkUsed) {
- 		state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
- 		seqnum = etags.sequenceNumber;
--	}
--	else {
-+	} else {
- 		state = YAFFS_BLOCK_STATE_EMPTY;
- 	}
- 
-@@ -360,4 +362,4 @@ int nandmtd1_QueryNANDBlock(struct yaffs
- 	return YAFFS_OK;
- }
- 
--#endif /*KERNEL_VERSION*/
-+#endif /*MTD_VERSION*/
---- a/fs/yaffs2/yaffs_mtdif1.h
-+++ b/fs/yaffs2/yaffs_mtdif1.h
-@@ -14,15 +14,15 @@
- #ifndef __YAFFS_MTDIF1_H__
- #define __YAFFS_MTDIF1_H__
- 
--int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
--	const __u8 * data, const yaffs_ExtendedTags * tags);
-+int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
-+	const __u8 *data, const yaffs_ExtendedTags *tags);
- 
--int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--	__u8 * data, yaffs_ExtendedTags * tags);
-+int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+	__u8 *data, yaffs_ExtendedTags *tags);
- 
- int nandmtd1_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
- 
- int nandmtd1_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--	yaffs_BlockState * state, int *sequenceNumber);
-+	yaffs_BlockState *state, __u32 *sequenceNumber);
- 
- #endif
---- a/fs/yaffs2/yaffs_mtdif2.c
-+++ b/fs/yaffs2/yaffs_mtdif2.c
-@@ -14,7 +14,7 @@
- /* mtd interface for YAFFS2 */
- 
- const char *yaffs_mtdif2_c_version =
--    "$Id: yaffs_mtdif2.c,v 1.17 2007-02-14 01:09:06 wookey Exp $";
-+	"$Id: yaffs_mtdif2.c,v 1.23 2009-03-06 17:20:53 wookey Exp $";
- 
- #include "yportenv.h"
- 
-@@ -27,19 +27,23 @@ const char *yaffs_mtdif2_c_version =
- 
- #include "yaffs_packedtags2.h"
- 
--int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
--				      const __u8 * data,
--				      const yaffs_ExtendedTags * tags)
-+/* NB For use with inband tags....
-+ * We assume that the data buffer is of size totalBytersPerChunk so that we can also
-+ * use it to load the tags.
-+ */
-+int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
-+				      const __u8 *data,
-+				      const yaffs_ExtendedTags *tags)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	struct mtd_oob_ops ops;
- #else
- 	size_t dummy;
- #endif
- 	int retval = 0;
- 
--	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
-+	loff_t addr;
- 
- 	yaffs_PackedTags2 pt;
- 
-@@ -48,46 +52,40 @@ int nandmtd2_WriteChunkWithTagsToNAND(ya
- 	   ("nandmtd2_WriteChunkWithTagsToNAND chunk %d data %p tags %p"
- 	    TENDSTR), chunkInNAND, data, tags));
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--	if (tags)
--		yaffs_PackTags2(&pt, tags);
--	else
--		BUG(); /* both tags and data should always be present */
- 
--	if (data) {
--		ops.mode = MTD_OOB_AUTO;
--		ops.ooblen = sizeof(pt);
--		ops.len = dev->nDataBytesPerChunk;
--		ops.ooboffs = 0;
--		ops.datbuf = (__u8 *)data;
--		ops.oobbuf = (void *)&pt;
--		retval = mtd->write_oob(mtd, addr, &ops);
-+	addr  = ((loff_t) chunkInNAND) * dev->totalBytesPerChunk;
-+
-+	/* For yaffs2 writing there must be both data and tags.
-+	 * If we're using inband tags, then the tags are stuffed into
-+	 * the end of the data buffer.
-+	 */
-+	if (!data || !tags)
-+		BUG();
-+	else if (dev->inbandTags) {
-+		yaffs_PackedTags2TagsPart *pt2tp;
-+		pt2tp = (yaffs_PackedTags2TagsPart *)(data + dev->nDataBytesPerChunk);
-+		yaffs_PackTags2TagsPart(pt2tp, tags);
- 	} else
--		BUG(); /* both tags and data should always be present */
--#else
--	if (tags) {
- 		yaffs_PackTags2(&pt, tags);
--	}
- 
--	if (data && tags) {
--		if (dev->useNANDECC)
--			retval =
--			    mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
--					   &dummy, data, (__u8 *) & pt, NULL);
--		else
--			retval =
--			    mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
--					   &dummy, data, (__u8 *) & pt, NULL);
--	} else {
--		if (data)
--			retval =
--			    mtd->write(mtd, addr, dev->nDataBytesPerChunk, &dummy,
--				       data);
--		if (tags)
--			retval =
--			    mtd->write_oob(mtd, addr, mtd->oobsize, &dummy,
--					   (__u8 *) & pt);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+	ops.mode = MTD_OOB_AUTO;
-+	ops.ooblen = (dev->inbandTags) ? 0 : sizeof(pt);
-+	ops.len = dev->totalBytesPerChunk;
-+	ops.ooboffs = 0;
-+	ops.datbuf = (__u8 *)data;
-+	ops.oobbuf = (dev->inbandTags) ? NULL : (void *)&pt;
-+	retval = mtd->write_oob(mtd, addr, &ops);
- 
-+#else
-+	if (!dev->inbandTags) {
-+		retval =
-+		    mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
-+				   &dummy, data, (__u8 *) &pt, NULL);
-+	} else {
-+		retval =
-+		    mtd->write(mtd, addr, dev->totalBytesPerChunk, &dummy,
-+			       data);
- 	}
- #endif
- 
-@@ -97,17 +95,18 @@ int nandmtd2_WriteChunkWithTagsToNAND(ya
- 		return YAFFS_FAIL;
- }
- 
--int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--				       __u8 * data, yaffs_ExtendedTags * tags)
-+int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+				       __u8 *data, yaffs_ExtendedTags *tags)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	struct mtd_oob_ops ops;
- #endif
- 	size_t dummy;
- 	int retval = 0;
-+	int localData = 0;
- 
--	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
-+	loff_t addr = ((loff_t) chunkInNAND) * dev->totalBytesPerChunk;
- 
- 	yaffs_PackedTags2 pt;
- 
-@@ -116,9 +115,20 @@ int nandmtd2_ReadChunkWithTagsFromNAND(y
- 	   ("nandmtd2_ReadChunkWithTagsFromNAND chunk %d data %p tags %p"
- 	    TENDSTR), chunkInNAND, data, tags));
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--	if (data && !tags)
--		retval = mtd->read(mtd, addr, dev->nDataBytesPerChunk,
-+	if (dev->inbandTags) {
-+
-+		if (!data) {
-+			localData = 1;
-+			data = yaffs_GetTempBuffer(dev, __LINE__);
-+		}
-+
-+
-+	}
-+
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+	if (dev->inbandTags || (data && !tags))
-+		retval = mtd->read(mtd, addr, dev->totalBytesPerChunk,
- 				&dummy, data);
- 	else if (tags) {
- 		ops.mode = MTD_OOB_AUTO;
-@@ -130,38 +140,42 @@ int nandmtd2_ReadChunkWithTagsFromNAND(y
- 		retval = mtd->read_oob(mtd, addr, &ops);
- 	}
- #else
--	if (data && tags) {
--		if (dev->useNANDECC) {
--			retval =
--			    mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
--					  &dummy, data, dev->spareBuffer,
--					  NULL);
--		} else {
--			retval =
--			    mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
-+	if (!dev->inbandTags && data && tags) {
-+
-+		retval = mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
- 					  &dummy, data, dev->spareBuffer,
- 					  NULL);
--		}
- 	} else {
- 		if (data)
- 			retval =
- 			    mtd->read(mtd, addr, dev->nDataBytesPerChunk, &dummy,
- 				      data);
--		if (tags)
-+		if (!dev->inbandTags && tags)
- 			retval =
- 			    mtd->read_oob(mtd, addr, mtd->oobsize, &dummy,
- 					  dev->spareBuffer);
- 	}
- #endif
- 
--	memcpy(&pt, dev->spareBuffer, sizeof(pt));
- 
--	if (tags)
--		yaffs_UnpackTags2(tags, &pt);
-+	if (dev->inbandTags) {
-+		if (tags) {
-+			yaffs_PackedTags2TagsPart *pt2tp;
-+			pt2tp = (yaffs_PackedTags2TagsPart *)&data[dev->nDataBytesPerChunk];
-+			yaffs_UnpackTags2TagsPart(tags, pt2tp);
-+		}
-+	} else {
-+		if (tags) {
-+			memcpy(&pt, dev->spareBuffer, sizeof(pt));
-+			yaffs_UnpackTags2(tags, &pt);
-+		}
-+	}
- 
--	if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
--		tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
-+	if (localData)
-+		yaffs_ReleaseTempBuffer(dev, data, __LINE__);
- 
-+	if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
-+		tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
- 	if (retval == 0)
- 		return YAFFS_OK;
- 	else
-@@ -178,7 +192,7 @@ int nandmtd2_MarkNANDBlockBad(struct yaf
- 	retval =
- 	    mtd->block_markbad(mtd,
- 			       blockNo * dev->nChunksPerBlock *
--			       dev->nDataBytesPerChunk);
-+			       dev->totalBytesPerChunk);
- 
- 	if (retval == 0)
- 		return YAFFS_OK;
-@@ -188,7 +202,7 @@ int nandmtd2_MarkNANDBlockBad(struct yaf
- }
- 
- int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--			    yaffs_BlockState * state, int *sequenceNumber)
-+			    yaffs_BlockState *state, __u32 *sequenceNumber)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
- 	int retval;
-@@ -198,7 +212,7 @@ int nandmtd2_QueryNANDBlock(struct yaffs
- 	retval =
- 	    mtd->block_isbad(mtd,
- 			     blockNo * dev->nChunksPerBlock *
--			     dev->nDataBytesPerChunk);
-+			     dev->totalBytesPerChunk);
- 
- 	if (retval) {
- 		T(YAFFS_TRACE_MTD, (TSTR("block is bad" TENDSTR)));
---- a/fs/yaffs2/yaffs_mtdif2.h
-+++ b/fs/yaffs2/yaffs_mtdif2.h
-@@ -17,13 +17,13 @@
- #define __YAFFS_MTDIF2_H__
- 
- #include "yaffs_guts.h"
--int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
--				      const __u8 * data,
--				      const yaffs_ExtendedTags * tags);
--int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--				       __u8 * data, yaffs_ExtendedTags * tags);
-+int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
-+				const __u8 *data,
-+				const yaffs_ExtendedTags *tags);
-+int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+				__u8 *data, yaffs_ExtendedTags *tags);
- int nandmtd2_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
- int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--			    yaffs_BlockState * state, int *sequenceNumber);
-+			yaffs_BlockState *state, __u32 *sequenceNumber);
- 
- #endif
---- a/fs/yaffs2/yaffs_mtdif.c
-+++ b/fs/yaffs2/yaffs_mtdif.c
-@@ -12,7 +12,7 @@
-  */
- 
- const char *yaffs_mtdif_c_version =
--    "$Id: yaffs_mtdif.c,v 1.19 2007-02-14 01:09:06 wookey Exp $";
-+	"$Id: yaffs_mtdif.c,v 1.22 2009-03-06 17:20:51 wookey Exp $";
- 
- #include "yportenv.h"
- 
-@@ -24,7 +24,7 @@ const char *yaffs_mtdif_c_version =
- #include "linux/time.h"
- #include "linux/mtd/nand.h"
- 
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18))
-+#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 18))
- static struct nand_oobinfo yaffs_oobinfo = {
- 	.useecc = 1,
- 	.eccbytes = 6,
-@@ -36,7 +36,7 @@ static struct nand_oobinfo yaffs_noeccin
- };
- #endif
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- static inline void translate_spare2oob(const yaffs_Spare *spare, __u8 *oob)
- {
- 	oob[0] = spare->tagByte0;
-@@ -45,8 +45,8 @@ static inline void translate_spare2oob(c
- 	oob[3] = spare->tagByte3;
- 	oob[4] = spare->tagByte4;
- 	oob[5] = spare->tagByte5 & 0x3f;
--	oob[5] |= spare->blockStatus == 'Y' ? 0: 0x80;
--	oob[5] |= spare->pageStatus == 0 ? 0: 0x40;
-+	oob[5] |= spare->blockStatus == 'Y' ? 0 : 0x80;
-+	oob[5] |= spare->pageStatus == 0 ? 0 : 0x40;
- 	oob[6] = spare->tagByte6;
- 	oob[7] = spare->tagByte7;
- }
-@@ -71,18 +71,18 @@ static inline void translate_oob2spare(y
- }
- #endif
- 
--int nandmtd_WriteChunkToNAND(yaffs_Device * dev, int chunkInNAND,
--			     const __u8 * data, const yaffs_Spare * spare)
-+int nandmtd_WriteChunkToNAND(yaffs_Device *dev, int chunkInNAND,
-+			     const __u8 *data, const yaffs_Spare *spare)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	struct mtd_oob_ops ops;
- #endif
- 	size_t dummy;
- 	int retval = 0;
- 
- 	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	__u8 spareAsBytes[8]; /* OOB */
- 
- 	if (data && !spare)
-@@ -135,18 +135,18 @@ int nandmtd_WriteChunkToNAND(yaffs_Devic
- 		return YAFFS_FAIL;
- }
- 
--int nandmtd_ReadChunkFromNAND(yaffs_Device * dev, int chunkInNAND, __u8 * data,
--			      yaffs_Spare * spare)
-+int nandmtd_ReadChunkFromNAND(yaffs_Device *dev, int chunkInNAND, __u8 *data,
-+			      yaffs_Spare *spare)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	struct mtd_oob_ops ops;
- #endif
- 	size_t dummy;
- 	int retval = 0;
- 
- 	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	__u8 spareAsBytes[8]; /* OOB */
- 
- 	if (data && !spare)
-@@ -205,7 +205,7 @@ int nandmtd_ReadChunkFromNAND(yaffs_Devi
- 		return YAFFS_FAIL;
- }
- 
--int nandmtd_EraseBlockInNAND(yaffs_Device * dev, int blockNumber)
-+int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
- 	__u32 addr =
-@@ -234,7 +234,7 @@ int nandmtd_EraseBlockInNAND(yaffs_Devic
- 		return YAFFS_FAIL;
- }
- 
--int nandmtd_InitialiseNAND(yaffs_Device * dev)
-+int nandmtd_InitialiseNAND(yaffs_Device *dev)
- {
- 	return YAFFS_OK;
- }
---- a/fs/yaffs2/yaffs_mtdif.h
-+++ b/fs/yaffs2/yaffs_mtdif.h
-@@ -18,10 +18,15 @@
- 
- #include "yaffs_guts.h"
- 
--int nandmtd_WriteChunkToNAND(yaffs_Device * dev, int chunkInNAND,
--			     const __u8 * data, const yaffs_Spare * spare);
--int nandmtd_ReadChunkFromNAND(yaffs_Device * dev, int chunkInNAND, __u8 * data,
--			      yaffs_Spare * spare);
--int nandmtd_EraseBlockInNAND(yaffs_Device * dev, int blockNumber);
--int nandmtd_InitialiseNAND(yaffs_Device * dev);
-+#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 18))
-+extern struct nand_oobinfo yaffs_oobinfo;
-+extern struct nand_oobinfo yaffs_noeccinfo;
-+#endif
-+
-+int nandmtd_WriteChunkToNAND(yaffs_Device *dev, int chunkInNAND,
-+			const __u8 *data, const yaffs_Spare *spare);
-+int nandmtd_ReadChunkFromNAND(yaffs_Device *dev, int chunkInNAND, __u8 *data,
-+			yaffs_Spare *spare);
-+int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber);
-+int nandmtd_InitialiseNAND(yaffs_Device *dev);
- #endif
---- a/fs/yaffs2/yaffs_nand.c
-+++ b/fs/yaffs2/yaffs_nand.c
-@@ -12,16 +12,17 @@
-  */
- 
- const char *yaffs_nand_c_version =
--    "$Id: yaffs_nand.c,v 1.7 2007-02-14 01:09:06 wookey Exp $";
-+	"$Id: yaffs_nand.c,v 1.10 2009-03-06 17:20:54 wookey Exp $";
- 
- #include "yaffs_nand.h"
- #include "yaffs_tagscompat.h"
- #include "yaffs_tagsvalidity.h"
- 
-+#include "yaffs_getblockinfo.h"
- 
--int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--					   __u8 * buffer,
--					   yaffs_ExtendedTags * tags)
-+int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+					   __u8 *buffer,
-+					   yaffs_ExtendedTags *tags)
- {
- 	int result;
- 	yaffs_ExtendedTags localTags;
-@@ -29,7 +30,7 @@ int yaffs_ReadChunkWithTagsFromNAND(yaff
- 	int realignedChunkInNAND = chunkInNAND - dev->chunkOffset;
- 
- 	/* If there are no tags provided, use local tags to get prioritised gc working */
--	if(!tags)
-+	if (!tags)
- 		tags = &localTags;
- 
- 	if (dev->readChunkWithTagsFromNAND)
-@@ -40,20 +41,20 @@ int yaffs_ReadChunkWithTagsFromNAND(yaff
- 									realignedChunkInNAND,
- 									buffer,
- 									tags);
--	if(tags &&
--	   tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR){
-+	if (tags &&
-+	   tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR) {
- 
- 		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, chunkInNAND/dev->nChunksPerBlock);
--                yaffs_HandleChunkError(dev,bi);
-+		yaffs_HandleChunkError(dev, bi);
- 	}
- 
- 	return result;
- }
- 
--int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev,
-+int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,
- 						   int chunkInNAND,
--						   const __u8 * buffer,
--						   yaffs_ExtendedTags * tags)
-+						   const __u8 *buffer,
-+						   yaffs_ExtendedTags *tags)
- {
- 	chunkInNAND -= dev->chunkOffset;
- 
-@@ -84,7 +85,7 @@ int yaffs_WriteChunkWithTagsToNAND(yaffs
- 								       tags);
- }
- 
--int yaffs_MarkBlockBad(yaffs_Device * dev, int blockNo)
-+int yaffs_MarkBlockBad(yaffs_Device *dev, int blockNo)
- {
- 	blockNo -= dev->blockOffset;
- 
-@@ -95,10 +96,10 @@ int yaffs_MarkBlockBad(yaffs_Device * de
- 		return yaffs_TagsCompatabilityMarkNANDBlockBad(dev, blockNo);
- }
- 
--int yaffs_QueryInitialBlockState(yaffs_Device * dev,
-+int yaffs_QueryInitialBlockState(yaffs_Device *dev,
- 						 int blockNo,
--						 yaffs_BlockState * state,
--						 unsigned *sequenceNumber)
-+						 yaffs_BlockState *state,
-+						 __u32 *sequenceNumber)
- {
- 	blockNo -= dev->blockOffset;
- 
---- a/fs/yaffs2/yaffs_nandemul2k.h
-+++ b/fs/yaffs2/yaffs_nandemul2k.h
-@@ -21,14 +21,14 @@
- #include "yaffs_guts.h"
- 
- int nandemul2k_WriteChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev,
--					int chunkInNAND, const __u8 * data,
--					yaffs_ExtendedTags * tags);
-+					int chunkInNAND, const __u8 *data,
-+					const yaffs_ExtendedTags *tags);
- int nandemul2k_ReadChunkWithTagsFromNAND(struct yaffs_DeviceStruct *dev,
--					 int chunkInNAND, __u8 * data,
--					 yaffs_ExtendedTags * tags);
-+					 int chunkInNAND, __u8 *data,
-+					 yaffs_ExtendedTags *tags);
- int nandemul2k_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
- int nandemul2k_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--			      yaffs_BlockState * state, int *sequenceNumber);
-+			      yaffs_BlockState *state, __u32 *sequenceNumber);
- int nandemul2k_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
- 				int blockInNAND);
- int nandemul2k_InitialiseNAND(struct yaffs_DeviceStruct *dev);
---- a/fs/yaffs2/yaffs_nand.h
-+++ b/fs/yaffs2/yaffs_nand.h
-@@ -19,21 +19,21 @@
- 
- 
- 
--int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--					   __u8 * buffer,
--					   yaffs_ExtendedTags * tags);
--
--int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev,
--						   int chunkInNAND,
--						   const __u8 * buffer,
--						   yaffs_ExtendedTags * tags);
--
--int yaffs_MarkBlockBad(yaffs_Device * dev, int blockNo);
--
--int yaffs_QueryInitialBlockState(yaffs_Device * dev,
--						 int blockNo,
--						 yaffs_BlockState * state,
--						 unsigned *sequenceNumber);
-+int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+					__u8 *buffer,
-+					yaffs_ExtendedTags *tags);
-+
-+int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,
-+						int chunkInNAND,
-+						const __u8 *buffer,
-+						yaffs_ExtendedTags *tags);
-+
-+int yaffs_MarkBlockBad(yaffs_Device *dev, int blockNo);
-+
-+int yaffs_QueryInitialBlockState(yaffs_Device *dev,
-+						int blockNo,
-+						yaffs_BlockState *state,
-+						unsigned *sequenceNumber);
- 
- int yaffs_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
- 				  int blockInNAND);
---- a/fs/yaffs2/yaffs_packedtags1.c
-+++ b/fs/yaffs2/yaffs_packedtags1.c
-@@ -14,7 +14,7 @@
- #include "yaffs_packedtags1.h"
- #include "yportenv.h"
- 
--void yaffs_PackTags1(yaffs_PackedTags1 * pt, const yaffs_ExtendedTags * t)
-+void yaffs_PackTags1(yaffs_PackedTags1 *pt, const yaffs_ExtendedTags *t)
- {
- 	pt->chunkId = t->chunkId;
- 	pt->serialNumber = t->serialNumber;
-@@ -27,7 +27,7 @@ void yaffs_PackTags1(yaffs_PackedTags1 *
- 
- }
- 
--void yaffs_UnpackTags1(yaffs_ExtendedTags * t, const yaffs_PackedTags1 * pt)
-+void yaffs_UnpackTags1(yaffs_ExtendedTags *t, const yaffs_PackedTags1 *pt)
- {
- 	static const __u8 allFF[] =
- 	    { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-@@ -35,9 +35,8 @@ void yaffs_UnpackTags1(yaffs_ExtendedTag
- 
- 	if (memcmp(allFF, pt, sizeof(yaffs_PackedTags1))) {
- 		t->blockBad = 0;
--		if (pt->shouldBeFF != 0xFFFFFFFF) {
-+		if (pt->shouldBeFF != 0xFFFFFFFF)
- 			t->blockBad = 1;
--		}
- 		t->chunkUsed = 1;
- 		t->objectId = pt->objectId;
- 		t->chunkId = pt->chunkId;
-@@ -47,6 +46,5 @@ void yaffs_UnpackTags1(yaffs_ExtendedTag
- 		t->serialNumber = pt->serialNumber;
- 	} else {
- 		memset(t, 0, sizeof(yaffs_ExtendedTags));
--
- 	}
- }
---- a/fs/yaffs2/yaffs_packedtags1.h
-+++ b/fs/yaffs2/yaffs_packedtags1.h
-@@ -32,6 +32,6 @@ typedef struct {
- 
- } yaffs_PackedTags1;
- 
--void yaffs_PackTags1(yaffs_PackedTags1 * pt, const yaffs_ExtendedTags * t);
--void yaffs_UnpackTags1(yaffs_ExtendedTags * t, const yaffs_PackedTags1 * pt);
-+void yaffs_PackTags1(yaffs_PackedTags1 *pt, const yaffs_ExtendedTags *t);
-+void yaffs_UnpackTags1(yaffs_ExtendedTags *t, const yaffs_PackedTags1 *pt);
- #endif
---- a/fs/yaffs2/yaffs_packedtags2.c
-+++ b/fs/yaffs2/yaffs_packedtags2.c
-@@ -37,60 +37,68 @@
- #define EXTRA_OBJECT_TYPE_SHIFT (28)
- #define EXTRA_OBJECT_TYPE_MASK  ((0x0F) << EXTRA_OBJECT_TYPE_SHIFT)
- 
--static void yaffs_DumpPackedTags2(const yaffs_PackedTags2 * pt)
-+
-+static void yaffs_DumpPackedTags2TagsPart(const yaffs_PackedTags2TagsPart *ptt)
- {
- 	T(YAFFS_TRACE_MTD,
- 	  (TSTR("packed tags obj %d chunk %d byte %d seq %d" TENDSTR),
--	   pt->t.objectId, pt->t.chunkId, pt->t.byteCount,
--	   pt->t.sequenceNumber));
-+	   ptt->objectId, ptt->chunkId, ptt->byteCount,
-+	   ptt->sequenceNumber));
-+}
-+static void yaffs_DumpPackedTags2(const yaffs_PackedTags2 *pt)
-+{
-+	yaffs_DumpPackedTags2TagsPart(&pt->t);
- }
- 
--static void yaffs_DumpTags2(const yaffs_ExtendedTags * t)
-+static void yaffs_DumpTags2(const yaffs_ExtendedTags *t)
- {
- 	T(YAFFS_TRACE_MTD,
- 	  (TSTR
--	   ("ext.tags eccres %d blkbad %d chused %d obj %d chunk%d byte "
--	    "%d del %d ser %d seq %d"
-+	   ("ext.tags eccres %d blkbad %d chused %d obj %d chunk%d byte %d del %d ser %d seq %d"
- 	    TENDSTR), t->eccResult, t->blockBad, t->chunkUsed, t->objectId,
- 	   t->chunkId, t->byteCount, t->chunkDeleted, t->serialNumber,
- 	   t->sequenceNumber));
- 
- }
- 
--void yaffs_PackTags2(yaffs_PackedTags2 * pt, const yaffs_ExtendedTags * t)
-+void yaffs_PackTags2TagsPart(yaffs_PackedTags2TagsPart *ptt,
-+		const yaffs_ExtendedTags *t)
- {
--	pt->t.chunkId = t->chunkId;
--	pt->t.sequenceNumber = t->sequenceNumber;
--	pt->t.byteCount = t->byteCount;
--	pt->t.objectId = t->objectId;
-+	ptt->chunkId = t->chunkId;
-+	ptt->sequenceNumber = t->sequenceNumber;
-+	ptt->byteCount = t->byteCount;
-+	ptt->objectId = t->objectId;
- 
- 	if (t->chunkId == 0 && t->extraHeaderInfoAvailable) {
- 		/* Store the extra header info instead */
- 		/* We save the parent object in the chunkId */
--		pt->t.chunkId = EXTRA_HEADER_INFO_FLAG
-+		ptt->chunkId = EXTRA_HEADER_INFO_FLAG
- 			| t->extraParentObjectId;
--		if (t->extraIsShrinkHeader) {
--			pt->t.chunkId |= EXTRA_SHRINK_FLAG;
--		}
--		if (t->extraShadows) {
--			pt->t.chunkId |= EXTRA_SHADOWS_FLAG;
--		}
-+		if (t->extraIsShrinkHeader)
-+			ptt->chunkId |= EXTRA_SHRINK_FLAG;
-+		if (t->extraShadows)
-+			ptt->chunkId |= EXTRA_SHADOWS_FLAG;
- 
--		pt->t.objectId &= ~EXTRA_OBJECT_TYPE_MASK;
--		pt->t.objectId |=
-+		ptt->objectId &= ~EXTRA_OBJECT_TYPE_MASK;
-+		ptt->objectId |=
- 		    (t->extraObjectType << EXTRA_OBJECT_TYPE_SHIFT);
- 
--		if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK) {
--			pt->t.byteCount = t->extraEquivalentObjectId;
--		} else if (t->extraObjectType == YAFFS_OBJECT_TYPE_FILE) {
--			pt->t.byteCount = t->extraFileLength;
--		} else {
--			pt->t.byteCount = 0;
--		}
-+		if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK)
-+			ptt->byteCount = t->extraEquivalentObjectId;
-+		else if (t->extraObjectType == YAFFS_OBJECT_TYPE_FILE)
-+			ptt->byteCount = t->extraFileLength;
-+		else
-+			ptt->byteCount = 0;
- 	}
- 
--	yaffs_DumpPackedTags2(pt);
-+	yaffs_DumpPackedTags2TagsPart(ptt);
- 	yaffs_DumpTags2(t);
-+}
-+
-+
-+void yaffs_PackTags2(yaffs_PackedTags2 *pt, const yaffs_ExtendedTags *t)
-+{
-+	yaffs_PackTags2TagsPart(&pt->t, t);
- 
- #ifndef YAFFS_IGNORE_TAGS_ECC
- 	{
-@@ -101,82 +109,98 @@ void yaffs_PackTags2(yaffs_PackedTags2 *
- #endif
- }
- 
--void yaffs_UnpackTags2(yaffs_ExtendedTags * t, yaffs_PackedTags2 * pt)
-+
-+void yaffs_UnpackTags2TagsPart(yaffs_ExtendedTags *t,
-+		yaffs_PackedTags2TagsPart *ptt)
- {
- 
- 	memset(t, 0, sizeof(yaffs_ExtendedTags));
- 
- 	yaffs_InitialiseTags(t);
- 
--	if (pt->t.sequenceNumber != 0xFFFFFFFF) {
--		/* Page is in use */
--#ifdef YAFFS_IGNORE_TAGS_ECC
--		{
--			t->eccResult = YAFFS_ECC_RESULT_NO_ERROR;
--		}
--#else
--		{
--			yaffs_ECCOther ecc;
--			int result;
--			yaffs_ECCCalculateOther((unsigned char *)&pt->t,
--						sizeof
--						(yaffs_PackedTags2TagsPart),
--						&ecc);
--			result =
--			    yaffs_ECCCorrectOther((unsigned char *)&pt->t,
--						  sizeof
--						  (yaffs_PackedTags2TagsPart),
--						  &pt->ecc, &ecc);
--			switch(result){
--				case 0:
--					t->eccResult = YAFFS_ECC_RESULT_NO_ERROR;
--					break;
--				case 1:
--					t->eccResult = YAFFS_ECC_RESULT_FIXED;
--					break;
--				case -1:
--					t->eccResult = YAFFS_ECC_RESULT_UNFIXED;
--					break;
--				default:
--					t->eccResult = YAFFS_ECC_RESULT_UNKNOWN;
--			}
--		}
--#endif
-+	if (ptt->sequenceNumber != 0xFFFFFFFF) {
- 		t->blockBad = 0;
- 		t->chunkUsed = 1;
--		t->objectId = pt->t.objectId;
--		t->chunkId = pt->t.chunkId;
--		t->byteCount = pt->t.byteCount;
-+		t->objectId = ptt->objectId;
-+		t->chunkId = ptt->chunkId;
-+		t->byteCount = ptt->byteCount;
- 		t->chunkDeleted = 0;
- 		t->serialNumber = 0;
--		t->sequenceNumber = pt->t.sequenceNumber;
-+		t->sequenceNumber = ptt->sequenceNumber;
- 
- 		/* Do extra header info stuff */
- 
--		if (pt->t.chunkId & EXTRA_HEADER_INFO_FLAG) {
-+		if (ptt->chunkId & EXTRA_HEADER_INFO_FLAG) {
- 			t->chunkId = 0;
- 			t->byteCount = 0;
- 
- 			t->extraHeaderInfoAvailable = 1;
- 			t->extraParentObjectId =
--			    pt->t.chunkId & (~(ALL_EXTRA_FLAGS));
-+			    ptt->chunkId & (~(ALL_EXTRA_FLAGS));
- 			t->extraIsShrinkHeader =
--			    (pt->t.chunkId & EXTRA_SHRINK_FLAG) ? 1 : 0;
-+			    (ptt->chunkId & EXTRA_SHRINK_FLAG) ? 1 : 0;
- 			t->extraShadows =
--			    (pt->t.chunkId & EXTRA_SHADOWS_FLAG) ? 1 : 0;
-+			    (ptt->chunkId & EXTRA_SHADOWS_FLAG) ? 1 : 0;
- 			t->extraObjectType =
--			    pt->t.objectId >> EXTRA_OBJECT_TYPE_SHIFT;
-+			    ptt->objectId >> EXTRA_OBJECT_TYPE_SHIFT;
- 			t->objectId &= ~EXTRA_OBJECT_TYPE_MASK;
- 
--			if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK) {
--				t->extraEquivalentObjectId = pt->t.byteCount;
--			} else {
--				t->extraFileLength = pt->t.byteCount;
-+			if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK)
-+				t->extraEquivalentObjectId = ptt->byteCount;
-+			else
-+				t->extraFileLength = ptt->byteCount;
-+		}
-+	}
-+
-+	yaffs_DumpPackedTags2TagsPart(ptt);
-+	yaffs_DumpTags2(t);
-+
-+}
-+
-+
-+void yaffs_UnpackTags2(yaffs_ExtendedTags *t, yaffs_PackedTags2 *pt)
-+{
-+
-+	yaffs_ECCResult eccResult = YAFFS_ECC_RESULT_NO_ERROR;
-+
-+	if (pt->t.sequenceNumber != 0xFFFFFFFF) {
-+		/* Page is in use */
-+#ifndef YAFFS_IGNORE_TAGS_ECC
-+		{
-+			yaffs_ECCOther ecc;
-+			int result;
-+			yaffs_ECCCalculateOther((unsigned char *)&pt->t,
-+						sizeof
-+						(yaffs_PackedTags2TagsPart),
-+						&ecc);
-+			result =
-+			    yaffs_ECCCorrectOther((unsigned char *)&pt->t,
-+						  sizeof
-+						  (yaffs_PackedTags2TagsPart),
-+						  &pt->ecc, &ecc);
-+			switch (result) {
-+			case 0:
-+				eccResult = YAFFS_ECC_RESULT_NO_ERROR;
-+				break;
-+			case 1:
-+				eccResult = YAFFS_ECC_RESULT_FIXED;
-+				break;
-+			case -1:
-+				eccResult = YAFFS_ECC_RESULT_UNFIXED;
-+				break;
-+			default:
-+				eccResult = YAFFS_ECC_RESULT_UNKNOWN;
- 			}
- 		}
-+#endif
- 	}
- 
-+	yaffs_UnpackTags2TagsPart(t, &pt->t);
-+
-+	t->eccResult = eccResult;
-+
- 	yaffs_DumpPackedTags2(pt);
- 	yaffs_DumpTags2(t);
- 
- }
-+
---- a/fs/yaffs2/yaffs_packedtags2.h
-+++ b/fs/yaffs2/yaffs_packedtags2.h
-@@ -33,6 +33,11 @@ typedef struct {
- 	yaffs_ECCOther ecc;
- } yaffs_PackedTags2;
- 
--void yaffs_PackTags2(yaffs_PackedTags2 * pt, const yaffs_ExtendedTags * t);
--void yaffs_UnpackTags2(yaffs_ExtendedTags * t, yaffs_PackedTags2 * pt);
-+/* Full packed tags with ECC, used for oob tags */
-+void yaffs_PackTags2(yaffs_PackedTags2 *pt, const yaffs_ExtendedTags *t);
-+void yaffs_UnpackTags2(yaffs_ExtendedTags *t, yaffs_PackedTags2 *pt);
-+
-+/* Only the tags part (no ECC for use with inband tags */
-+void yaffs_PackTags2TagsPart(yaffs_PackedTags2TagsPart *pt, const yaffs_ExtendedTags *t);
-+void yaffs_UnpackTags2TagsPart(yaffs_ExtendedTags *t, yaffs_PackedTags2TagsPart *pt);
- #endif
---- a/fs/yaffs2/yaffs_qsort.c
-+++ b/fs/yaffs2/yaffs_qsort.c
-@@ -28,12 +28,12 @@
-  */
- 
- #include "yportenv.h"
--//#include <linux/string.h>
-+/* #include <linux/string.h> */
- 
- /*
-  * Qsort routine from Bentley & McIlroy's "Engineering a Sort Function".
-  */
--#define swapcode(TYPE, parmi, parmj, n) { 		\
-+#define swapcode(TYPE, parmi, parmj, n) do { 		\
- 	long i = (n) / sizeof (TYPE); 			\
- 	register TYPE *pi = (TYPE *) (parmi); 		\
- 	register TYPE *pj = (TYPE *) (parmj); 		\
-@@ -41,28 +41,29 @@
- 		register TYPE	t = *pi;		\
- 		*pi++ = *pj;				\
- 		*pj++ = t;				\
--        } while (--i > 0);				\
--}
-+	} while (--i > 0);				\
-+} while (0)
- 
- #define SWAPINIT(a, es) swaptype = ((char *)a - (char *)0) % sizeof(long) || \
--	es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1;
-+	es % sizeof(long) ? 2 : es == sizeof(long) ? 0 : 1;
- 
- static __inline void
- swapfunc(char *a, char *b, int n, int swaptype)
- {
- 	if (swaptype <= 1)
--		swapcode(long, a, b, n)
-+		swapcode(long, a, b, n);
- 	else
--		swapcode(char, a, b, n)
-+		swapcode(char, a, b, n);
- }
- 
--#define swap(a, b)					\
-+#define yswap(a, b) do {					\
- 	if (swaptype == 0) {				\
- 		long t = *(long *)(a);			\
- 		*(long *)(a) = *(long *)(b);		\
- 		*(long *)(b) = t;			\
- 	} else						\
--		swapfunc(a, b, es, swaptype)
-+		swapfunc(a, b, es, swaptype);		\
-+} while (0)
- 
- #define vecswap(a, b, n) 	if ((n) > 0) swapfunc(a, b, n, swaptype)
- 
-@@ -70,12 +71,12 @@ static __inline char *
- med3(char *a, char *b, char *c, int (*cmp)(const void *, const void *))
- {
- 	return cmp(a, b) < 0 ?
--	       (cmp(b, c) < 0 ? b : (cmp(a, c) < 0 ? c : a ))
--              :(cmp(b, c) > 0 ? b : (cmp(a, c) < 0 ? a : c ));
-+		(cmp(b, c) < 0 ? b : (cmp(a, c) < 0 ? c : a))
-+		: (cmp(b, c) > 0 ? b : (cmp(a, c) < 0 ? a : c));
- }
- 
- #ifndef min
--#define min(a,b) (((a) < (b)) ? (a) : (b))
-+#define min(a, b) (((a) < (b)) ? (a) : (b))
- #endif
- 
- void
-@@ -92,7 +93,7 @@ loop:	SWAPINIT(a, es);
- 		for (pm = (char *)a + es; pm < (char *) a + n * es; pm += es)
- 			for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
- 			     pl -= es)
--				swap(pl, pl - es);
-+				yswap(pl, pl - es);
- 		return;
- 	}
- 	pm = (char *)a + (n / 2) * es;
-@@ -107,7 +108,7 @@ loop:	SWAPINIT(a, es);
- 		}
- 		pm = med3(pl, pm, pn, cmp);
- 	}
--	swap(a, pm);
-+	yswap(a, pm);
- 	pa = pb = (char *)a + es;
- 
- 	pc = pd = (char *)a + (n - 1) * es;
-@@ -115,7 +116,7 @@ loop:	SWAPINIT(a, es);
- 		while (pb <= pc && (r = cmp(pb, a)) <= 0) {
- 			if (r == 0) {
- 				swap_cnt = 1;
--				swap(pa, pb);
-+				yswap(pa, pb);
- 				pa += es;
- 			}
- 			pb += es;
-@@ -123,14 +124,14 @@ loop:	SWAPINIT(a, es);
- 		while (pb <= pc && (r = cmp(pc, a)) >= 0) {
- 			if (r == 0) {
- 				swap_cnt = 1;
--				swap(pc, pd);
-+				yswap(pc, pd);
- 				pd -= es;
- 			}
- 			pc -= es;
- 		}
- 		if (pb > pc)
- 			break;
--		swap(pb, pc);
-+		yswap(pb, pc);
- 		swap_cnt = 1;
- 		pb += es;
- 		pc -= es;
-@@ -139,7 +140,7 @@ loop:	SWAPINIT(a, es);
- 		for (pm = (char *) a + es; pm < (char *) a + n * es; pm += es)
- 			for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
- 			     pl -= es)
--				swap(pl, pl - es);
-+				yswap(pl, pl - es);
- 		return;
- 	}
- 
-@@ -148,9 +149,11 @@ loop:	SWAPINIT(a, es);
- 	vecswap(a, pb - r, r);
- 	r = min((long)(pd - pc), (long)(pn - pd - es));
- 	vecswap(pb, pn - r, r);
--	if ((r = pb - pa) > es)
-+	r = pb - pa;
-+	if (r > es)
- 		yaffs_qsort(a, r / es, es, cmp);
--	if ((r = pd - pc) > es) {
-+	r = pd - pc;
-+	if (r > es) {
- 		/* Iterate rather than recurse to save stack space */
- 		a = pn - r;
- 		n = r / es;
---- a/fs/yaffs2/yaffs_qsort.h
-+++ b/fs/yaffs2/yaffs_qsort.h
-@@ -17,7 +17,7 @@
- #ifndef __YAFFS_QSORT_H__
- #define __YAFFS_QSORT_H__
- 
--extern void yaffs_qsort (void *const base, size_t total_elems, size_t size,
--                   int (*cmp)(const void *, const void *));
-+extern void yaffs_qsort(void *const base, size_t total_elems, size_t size,
-+			int (*cmp)(const void *, const void *));
- 
- #endif
---- a/fs/yaffs2/yaffs_tagscompat.c
-+++ b/fs/yaffs2/yaffs_tagscompat.c
-@@ -14,16 +14,17 @@
- #include "yaffs_guts.h"
- #include "yaffs_tagscompat.h"
- #include "yaffs_ecc.h"
-+#include "yaffs_getblockinfo.h"
- 
--static void yaffs_HandleReadDataError(yaffs_Device * dev, int chunkInNAND);
-+static void yaffs_HandleReadDataError(yaffs_Device *dev, int chunkInNAND);
- #ifdef NOTYET
--static void yaffs_CheckWrittenBlock(yaffs_Device * dev, int chunkInNAND);
--static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
--				     const __u8 * data,
--				     const yaffs_Spare * spare);
--static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
--				    const yaffs_Spare * spare);
--static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND);
-+static void yaffs_CheckWrittenBlock(yaffs_Device *dev, int chunkInNAND);
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+				     const __u8 *data,
-+				     const yaffs_Spare *spare);
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+				    const yaffs_Spare *spare);
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND);
- #endif
- 
- static const char yaffs_countBitsTable[256] = {
-@@ -54,13 +55,13 @@ int yaffs_CountBits(__u8 x)
- 
- /********** Tags ECC calculations  *********/
- 
--void yaffs_CalcECC(const __u8 * data, yaffs_Spare * spare)
-+void yaffs_CalcECC(const __u8 *data, yaffs_Spare *spare)
- {
- 	yaffs_ECCCalculate(data, spare->ecc1);
- 	yaffs_ECCCalculate(&data[256], spare->ecc2);
- }
- 
--void yaffs_CalcTagsECC(yaffs_Tags * tags)
-+void yaffs_CalcTagsECC(yaffs_Tags *tags)
- {
- 	/* Calculate an ecc */
- 
-@@ -74,9 +75,8 @@ void yaffs_CalcTagsECC(yaffs_Tags * tags
- 	for (i = 0; i < 8; i++) {
- 		for (j = 1; j & 0xff; j <<= 1) {
- 			bit++;
--			if (b[i] & j) {
-+			if (b[i] & j)
- 				ecc ^= bit;
--			}
- 		}
- 	}
- 
-@@ -84,7 +84,7 @@ void yaffs_CalcTagsECC(yaffs_Tags * tags
- 
- }
- 
--int yaffs_CheckECCOnTags(yaffs_Tags * tags)
-+int yaffs_CheckECCOnTags(yaffs_Tags *tags)
- {
- 	unsigned ecc = tags->ecc;
- 
-@@ -115,8 +115,8 @@ int yaffs_CheckECCOnTags(yaffs_Tags * ta
- 
- /********** Tags **********/
- 
--static void yaffs_LoadTagsIntoSpare(yaffs_Spare * sparePtr,
--				    yaffs_Tags * tagsPtr)
-+static void yaffs_LoadTagsIntoSpare(yaffs_Spare *sparePtr,
-+				yaffs_Tags *tagsPtr)
- {
- 	yaffs_TagsUnion *tu = (yaffs_TagsUnion *) tagsPtr;
- 
-@@ -132,8 +132,8 @@ static void yaffs_LoadTagsIntoSpare(yaff
- 	sparePtr->tagByte7 = tu->asBytes[7];
- }
- 
--static void yaffs_GetTagsFromSpare(yaffs_Device * dev, yaffs_Spare * sparePtr,
--				   yaffs_Tags * tagsPtr)
-+static void yaffs_GetTagsFromSpare(yaffs_Device *dev, yaffs_Spare *sparePtr,
-+				yaffs_Tags *tagsPtr)
- {
- 	yaffs_TagsUnion *tu = (yaffs_TagsUnion *) tagsPtr;
- 	int result;
-@@ -148,21 +148,20 @@ static void yaffs_GetTagsFromSpare(yaffs
- 	tu->asBytes[7] = sparePtr->tagByte7;
- 
- 	result = yaffs_CheckECCOnTags(tagsPtr);
--	if (result > 0) {
-+	if (result > 0)
- 		dev->tagsEccFixed++;
--	} else if (result < 0) {
-+	else if (result < 0)
- 		dev->tagsEccUnfixed++;
--	}
- }
- 
--static void yaffs_SpareInitialise(yaffs_Spare * spare)
-+static void yaffs_SpareInitialise(yaffs_Spare *spare)
- {
- 	memset(spare, 0xFF, sizeof(yaffs_Spare));
- }
- 
- static int yaffs_WriteChunkToNAND(struct yaffs_DeviceStruct *dev,
--				  int chunkInNAND, const __u8 * data,
--				  yaffs_Spare * spare)
-+				int chunkInNAND, const __u8 *data,
-+				yaffs_Spare *spare)
- {
- 	if (chunkInNAND < dev->startBlock * dev->nChunksPerBlock) {
- 		T(YAFFS_TRACE_ERROR,
-@@ -177,9 +176,9 @@ static int yaffs_WriteChunkToNAND(struct
- 
- static int yaffs_ReadChunkFromNAND(struct yaffs_DeviceStruct *dev,
- 				   int chunkInNAND,
--				   __u8 * data,
--				   yaffs_Spare * spare,
--				   yaffs_ECCResult * eccResult,
-+				   __u8 *data,
-+				   yaffs_Spare *spare,
-+				   yaffs_ECCResult *eccResult,
- 				   int doErrorCorrection)
- {
- 	int retVal;
-@@ -252,9 +251,11 @@ static int yaffs_ReadChunkFromNAND(struc
- 		/* Must allocate enough memory for spare+2*sizeof(int) */
- 		/* for ecc results from device. */
- 		struct yaffs_NANDSpare nspare;
--		retVal =
--		    dev->readChunkFromNAND(dev, chunkInNAND, data,
--					   (yaffs_Spare *) & nspare);
-+
-+		memset(&nspare, 0, sizeof(nspare));
-+
-+		retVal = dev->readChunkFromNAND(dev, chunkInNAND, data,
-+					(yaffs_Spare *) &nspare);
- 		memcpy(spare, &nspare, sizeof(yaffs_Spare));
- 		if (data && doErrorCorrection) {
- 			if (nspare.eccres1 > 0) {
-@@ -302,8 +303,7 @@ static int yaffs_ReadChunkFromNAND(struc
- static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
- 				  int chunkInNAND)
- {
--
--	static int init = 0;
-+	static int init;
- 	static __u8 cmpbuf[YAFFS_BYTES_PER_CHUNK];
- 	static __u8 data[YAFFS_BYTES_PER_CHUNK];
- 	/* Might as well always allocate the larger size for */
-@@ -331,12 +331,12 @@ static int yaffs_CheckChunkErased(struct
-  * Functions for robustisizing
-  */
- 
--static void yaffs_HandleReadDataError(yaffs_Device * dev, int chunkInNAND)
-+static void yaffs_HandleReadDataError(yaffs_Device *dev, int chunkInNAND)
- {
- 	int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
- 
- 	/* Mark the block for retirement */
--	yaffs_GetBlockInfo(dev, blockInNAND)->needsRetiring = 1;
-+	yaffs_GetBlockInfo(dev, blockInNAND + dev->blockOffset)->needsRetiring = 1;
- 	T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
- 	  (TSTR("**>>Block %d marked for retirement" TENDSTR), blockInNAND));
- 
-@@ -348,22 +348,22 @@ static void yaffs_HandleReadDataError(ya
- }
- 
- #ifdef NOTYET
--static void yaffs_CheckWrittenBlock(yaffs_Device * dev, int chunkInNAND)
-+static void yaffs_CheckWrittenBlock(yaffs_Device *dev, int chunkInNAND)
- {
- }
- 
--static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
--				     const __u8 * data,
--				     const yaffs_Spare * spare)
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+				     const __u8 *data,
-+				     const yaffs_Spare *spare)
- {
- }
- 
--static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
--				    const yaffs_Spare * spare)
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+				    const yaffs_Spare *spare)
- {
- }
- 
--static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND)
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND)
- {
- 	int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
- 
-@@ -373,8 +373,8 @@ static void yaffs_HandleWriteChunkError(
- 	yaffs_DeleteChunk(dev, chunkInNAND, 1, __LINE__);
- }
- 
--static int yaffs_VerifyCompare(const __u8 * d0, const __u8 * d1,
--			       const yaffs_Spare * s0, const yaffs_Spare * s1)
-+static int yaffs_VerifyCompare(const __u8 *d0, const __u8 *d1,
-+			       const yaffs_Spare *s0, const yaffs_Spare *s1)
- {
- 
- 	if (memcmp(d0, d1, YAFFS_BYTES_PER_CHUNK) != 0 ||
-@@ -398,28 +398,35 @@ static int yaffs_VerifyCompare(const __u
- }
- #endif				/* NOTYET */
- 
--int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device * dev,
--						    int chunkInNAND,
--						    const __u8 * data,
--						    const yaffs_ExtendedTags *
--						    eTags)
-+int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device *dev,
-+						int chunkInNAND,
-+						const __u8 *data,
-+						const yaffs_ExtendedTags *eTags)
- {
- 	yaffs_Spare spare;
- 	yaffs_Tags tags;
- 
- 	yaffs_SpareInitialise(&spare);
- 
--	if (eTags->chunkDeleted) {
-+	if (eTags->chunkDeleted)
- 		spare.pageStatus = 0;
--	} else {
-+	else {
- 		tags.objectId = eTags->objectId;
- 		tags.chunkId = eTags->chunkId;
--		tags.byteCount = eTags->byteCount;
-+
-+		tags.byteCountLSB = eTags->byteCount & 0x3ff;
-+
-+		if (dev->nDataBytesPerChunk >= 1024)
-+			tags.byteCountMSB = (eTags->byteCount >> 10) & 3;
-+		else
-+			tags.byteCountMSB = 3;
-+
-+
- 		tags.serialNumber = eTags->serialNumber;
- 
--		if (!dev->useNANDECC && data) {
-+		if (!dev->useNANDECC && data)
- 			yaffs_CalcECC(data, &spare);
--		}
-+
- 		yaffs_LoadTagsIntoSpare(&spare, &tags);
- 
- 	}
-@@ -427,15 +434,15 @@ int yaffs_TagsCompatabilityWriteChunkWit
- 	return yaffs_WriteChunkToNAND(dev, chunkInNAND, data, &spare);
- }
- 
--int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device * dev,
-+int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device *dev,
- 						     int chunkInNAND,
--						     __u8 * data,
--						     yaffs_ExtendedTags * eTags)
-+						     __u8 *data,
-+						     yaffs_ExtendedTags *eTags)
- {
- 
- 	yaffs_Spare spare;
- 	yaffs_Tags tags;
--	yaffs_ECCResult eccResult;
-+	yaffs_ECCResult eccResult = YAFFS_ECC_RESULT_UNKNOWN;
- 
- 	static yaffs_Spare spareFF;
- 	static int init;
-@@ -466,7 +473,11 @@ int yaffs_TagsCompatabilityReadChunkWith
- 
- 				eTags->objectId = tags.objectId;
- 				eTags->chunkId = tags.chunkId;
--				eTags->byteCount = tags.byteCount;
-+				eTags->byteCount = tags.byteCountLSB;
-+
-+				if (dev->nDataBytesPerChunk >= 1024)
-+					eTags->byteCount |= (((unsigned) tags.byteCountMSB) << 10);
-+
- 				eTags->serialNumber = tags.serialNumber;
- 			}
- 		}
-@@ -497,9 +508,9 @@ int yaffs_TagsCompatabilityMarkNANDBlock
- }
- 
- int yaffs_TagsCompatabilityQueryNANDBlock(struct yaffs_DeviceStruct *dev,
--					  int blockNo, yaffs_BlockState *
--					  state,
--					  int *sequenceNumber)
-+					  int blockNo,
-+					  yaffs_BlockState *state,
-+					  __u32 *sequenceNumber)
- {
- 
- 	yaffs_Spare spare0, spare1;
---- a/fs/yaffs2/yaffs_tagscompat.h
-+++ b/fs/yaffs2/yaffs_tagscompat.h
-@@ -17,24 +17,23 @@
- #define __YAFFS_TAGSCOMPAT_H__
- 
- #include "yaffs_guts.h"
--int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device * dev,
--						    int chunkInNAND,
--						    const __u8 * data,
--						    const yaffs_ExtendedTags *
--						    tags);
--int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device * dev,
--						     int chunkInNAND,
--						     __u8 * data,
--						     yaffs_ExtendedTags *
--						     tags);
-+int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device *dev,
-+						int chunkInNAND,
-+						const __u8 *data,
-+						const yaffs_ExtendedTags *tags);
-+int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device *dev,
-+						int chunkInNAND,
-+						__u8 *data,
-+						yaffs_ExtendedTags *tags);
- int yaffs_TagsCompatabilityMarkNANDBlockBad(struct yaffs_DeviceStruct *dev,
- 					    int blockNo);
- int yaffs_TagsCompatabilityQueryNANDBlock(struct yaffs_DeviceStruct *dev,
--					  int blockNo, yaffs_BlockState *
--					  state, int *sequenceNumber);
-+					  int blockNo,
-+					  yaffs_BlockState *state,
-+					  __u32 *sequenceNumber);
- 
--void yaffs_CalcTagsECC(yaffs_Tags * tags);
--int yaffs_CheckECCOnTags(yaffs_Tags * tags);
-+void yaffs_CalcTagsECC(yaffs_Tags *tags);
-+int yaffs_CheckECCOnTags(yaffs_Tags *tags);
- int yaffs_CountBits(__u8 byte);
- 
- #endif
---- a/fs/yaffs2/yaffs_tagsvalidity.c
-+++ b/fs/yaffs2/yaffs_tagsvalidity.c
-@@ -13,14 +13,14 @@
- 
- #include "yaffs_tagsvalidity.h"
- 
--void yaffs_InitialiseTags(yaffs_ExtendedTags * tags)
-+void yaffs_InitialiseTags(yaffs_ExtendedTags *tags)
- {
- 	memset(tags, 0, sizeof(yaffs_ExtendedTags));
- 	tags->validMarker0 = 0xAAAAAAAA;
- 	tags->validMarker1 = 0x55555555;
- }
- 
--int yaffs_ValidateTags(yaffs_ExtendedTags * tags)
-+int yaffs_ValidateTags(yaffs_ExtendedTags *tags)
- {
- 	return (tags->validMarker0 == 0xAAAAAAAA &&
- 		tags->validMarker1 == 0x55555555);
---- a/fs/yaffs2/yaffs_tagsvalidity.h
-+++ b/fs/yaffs2/yaffs_tagsvalidity.h
-@@ -19,6 +19,6 @@
- 
- #include "yaffs_guts.h"
- 
--void yaffs_InitialiseTags(yaffs_ExtendedTags * tags);
--int yaffs_ValidateTags(yaffs_ExtendedTags * tags);
-+void yaffs_InitialiseTags(yaffs_ExtendedTags *tags);
-+int yaffs_ValidateTags(yaffs_ExtendedTags *tags);
- #endif
---- a/fs/yaffs2/yportenv.h
-+++ b/fs/yaffs2/yportenv.h
-@@ -17,17 +17,28 @@
- #ifndef __YPORTENV_H__
- #define __YPORTENV_H__
- 
-+/*
-+ * Define the MTD version in terms of Linux Kernel versions
-+ * This allows yaffs to be used independantly of the kernel
-+ * as well as with it.
-+ */
-+
-+#define MTD_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c))
-+
- #if defined CONFIG_YAFFS_WINCE
- 
- #include "ywinceenv.h"
- 
--#elif  defined __KERNEL__
-+#elif defined __KERNEL__
- 
- #include "moduleconfig.h"
- 
- /* Linux kernel */
-+
- #include <linux/version.h>
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
-+#define MTD_VERSION_CODE LINUX_VERSION_CODE
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
- #include <linux/config.h>
- #endif
- #include <linux/kernel.h>
-@@ -40,12 +51,13 @@
- #define YCHAR char
- #define YUCHAR unsigned char
- #define _Y(x)     x
--#define yaffs_strcpy(a,b)    strcpy(a,b)
--#define yaffs_strncpy(a,b,c) strncpy(a,b,c)
--#define yaffs_strncmp(a,b,c) strncmp(a,b,c)
--#define yaffs_strlen(s)	     strlen(s)
--#define yaffs_sprintf	     sprintf
--#define yaffs_toupper(a)     toupper(a)
-+#define yaffs_strcat(a, b)     strcat(a, b)
-+#define yaffs_strcpy(a, b)     strcpy(a, b)
-+#define yaffs_strncpy(a, b, c) strncpy(a, b, c)
-+#define yaffs_strncmp(a, b, c) strncmp(a, b, c)
-+#define yaffs_strlen(s)	       strlen(s)
-+#define yaffs_sprintf	       sprintf
-+#define yaffs_toupper(a)       toupper(a)
- 
- #define Y_INLINE inline
- 
-@@ -53,19 +65,19 @@
- #define YAFFS_LOSTNFOUND_PREFIX		"obj"
- 
- /* #define YPRINTF(x) printk x */
--#define YMALLOC(x) kmalloc(x,GFP_KERNEL)
-+#define YMALLOC(x) kmalloc(x, GFP_NOFS)
- #define YFREE(x)   kfree(x)
- #define YMALLOC_ALT(x) vmalloc(x)
- #define YFREE_ALT(x)   vfree(x)
- #define YMALLOC_DMA(x) YMALLOC(x)
- 
--// KR - added for use in scan so processes aren't blocked indefinitely.
-+/* KR - added for use in scan so processes aren't blocked indefinitely. */
- #define YYIELD() schedule()
- 
- #define YAFFS_ROOT_MODE			0666
- #define YAFFS_LOSTNFOUND_MODE		0666
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- #define Y_CURRENT_TIME CURRENT_TIME.tv_sec
- #define Y_TIME_CONVERT(x) (x).tv_sec
- #else
-@@ -73,11 +85,12 @@
- #define Y_TIME_CONVERT(x) (x)
- #endif
- 
--#define yaffs_SumCompare(x,y) ((x) == (y))
--#define yaffs_strcmp(a,b) strcmp(a,b)
-+#define yaffs_SumCompare(x, y) ((x) == (y))
-+#define yaffs_strcmp(a, b) strcmp(a, b)
- 
- #define TENDSTR "\n"
- #define TSTR(x) KERN_WARNING x
-+#define TCONT(x) x
- #define TOUT(p) printk p
- 
- #define yaffs_trace(mask, fmt, args...) \
-@@ -90,6 +103,8 @@
- 
- #elif defined CONFIG_YAFFS_DIRECT
- 
-+#define MTD_VERSION_CODE MTD_VERSION(2, 6, 22)
-+
- /* Direct interface */
- #include "ydirectenv.h"
- 
-@@ -111,11 +126,12 @@
- #define YCHAR char
- #define YUCHAR unsigned char
- #define _Y(x)     x
--#define yaffs_strcpy(a,b)    strcpy(a,b)
--#define yaffs_strncpy(a,b,c) strncpy(a,b,c)
--#define yaffs_strlen(s)	     strlen(s)
--#define yaffs_sprintf	     sprintf
--#define yaffs_toupper(a)     toupper(a)
-+#define yaffs_strcat(a, b)     strcat(a, b)
-+#define yaffs_strcpy(a, b)     strcpy(a, b)
-+#define yaffs_strncpy(a, b, c) strncpy(a, b, c)
-+#define yaffs_strlen(s)	       strlen(s)
-+#define yaffs_sprintf	       sprintf
-+#define yaffs_toupper(a)       toupper(a)
- 
- #define Y_INLINE inline
- 
-@@ -133,8 +149,8 @@
- #define YAFFS_ROOT_MODE				0666
- #define YAFFS_LOSTNFOUND_MODE		0666
- 
--#define yaffs_SumCompare(x,y) ((x) == (y))
--#define yaffs_strcmp(a,b) strcmp(a,b)
-+#define yaffs_SumCompare(x, y) ((x) == (y))
-+#define yaffs_strcmp(a, b) strcmp(a, b)
- 
- #else
- /* Should have specified a configuration type */
-@@ -178,10 +194,10 @@ extern unsigned int yaffs_wr_attempts;
- #define YAFFS_TRACE_ALWAYS		0xF0000000
- 
- 
--#define T(mask,p) do{ if((mask) & (yaffs_traceMask | YAFFS_TRACE_ALWAYS)) TOUT(p);} while(0)
-+#define T(mask, p) do { if ((mask) & (yaffs_traceMask | YAFFS_TRACE_ALWAYS)) TOUT(p); } while (0)
- 
--#ifndef CONFIG_YAFFS_WINCE
--#define YBUG() T(YAFFS_TRACE_BUG,(TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR),__LINE__))
-+#ifndef YBUG
-+#define YBUG() do {T(YAFFS_TRACE_BUG, (TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR), __LINE__)); } while (0)
- #endif
- 
- #endif
diff --git a/target/linux/generic-2.6/patches-2.6.31/600-phy_extension.patch b/target/linux/generic-2.6/patches-2.6.31/600-phy_extension.patch
deleted file mode 100644
index 473812895..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/600-phy_extension.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- a/drivers/net/phy/phy.c
-+++ b/drivers/net/phy/phy.c
-@@ -299,6 +299,50 @@ int phy_ethtool_gset(struct phy_device *
- }
- EXPORT_SYMBOL(phy_ethtool_gset);
- 
-+int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr)
-+{
-+	u32 cmd;
-+	int tmp;
-+	struct ethtool_cmd ecmd = { ETHTOOL_GSET };
-+	struct ethtool_value edata = { ETHTOOL_GLINK };
-+
-+	if (get_user(cmd, (u32 *) useraddr))
-+		return -EFAULT;
-+
-+	switch (cmd) {
-+	case ETHTOOL_GSET:
-+		phy_ethtool_gset(phydev, &ecmd);
-+		if (copy_to_user(useraddr, &ecmd, sizeof(ecmd)))
-+			return -EFAULT;
-+		return 0;
-+
-+	case ETHTOOL_SSET:
-+		if (copy_from_user(&ecmd, useraddr, sizeof(ecmd)))
-+			return -EFAULT;
-+		return phy_ethtool_sset(phydev, &ecmd);
-+
-+	case ETHTOOL_NWAY_RST:
-+		/* if autoneg is off, it's an error */
-+		tmp = phy_read(phydev, MII_BMCR);
-+		if (tmp & BMCR_ANENABLE) {
-+			tmp |= (BMCR_ANRESTART);
-+			phy_write(phydev, MII_BMCR, tmp);
-+			return 0;
-+		}
-+		return -EINVAL;
-+
-+	case ETHTOOL_GLINK:
-+		edata.data = (phy_read(phydev,
-+				MII_BMSR) & BMSR_LSTATUS) ? 1 : 0;
-+		if (copy_to_user(useraddr, &edata, sizeof(edata)))
-+			return -EFAULT;
-+		return 0;
-+	}
-+
-+	return -EOPNOTSUPP;
-+}
-+EXPORT_SYMBOL(phy_ethtool_ioctl);
-+
- /**
-  * phy_mii_ioctl - generic PHY MII ioctl interface
-  * @phydev: the phy_device struct
-@@ -355,8 +399,8 @@ int phy_mii_ioctl(struct phy_device *phy
- 		}
- 
- 		phy_write(phydev, mii_data->reg_num, val);
--		
--		if (mii_data->reg_num == MII_BMCR 
-+
-+		if (mii_data->reg_num == MII_BMCR
- 				&& val & BMCR_RESET
- 				&& phydev->drv->config_init) {
- 			phy_scan_fixups(phydev);
-@@ -471,7 +515,7 @@ static void phy_force_reduction(struct p
- 	int idx;
- 
- 	idx = phy_find_setting(phydev->speed, phydev->duplex);
--	
-+
- 	idx++;
- 
- 	idx = phy_find_valid(idx, phydev->supported);
---- a/include/linux/phy.h
-+++ b/include/linux/phy.h
-@@ -489,6 +489,7 @@ void phy_start_machine(struct phy_device
- void phy_stop_machine(struct phy_device *phydev);
- int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
- int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);
-+int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr);
- int phy_mii_ioctl(struct phy_device *phydev,
- 		struct mii_ioctl_data *mii_data, int cmd);
- int phy_start_interrupts(struct phy_device *phydev);
diff --git a/target/linux/generic-2.6/patches-2.6.31/620-phy_adm6996.patch b/target/linux/generic-2.6/patches-2.6.31/620-phy_adm6996.patch
deleted file mode 100644
index 8f61d95c2..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/620-phy_adm6996.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -82,6 +82,11 @@ config LSI_ET1011C_PHY
- 	---help---
- 	  Supports the LSI ET1011C PHY.
- 
-+config ADM6996_PHY
-+	tristate "Driver for ADM6996 switches"
-+	---help---
-+	  Currently supports the ADM6996F switch
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -12,6 +12,7 @@ obj-$(CONFIG_SMSC_PHY)		+= smsc.o
- obj-$(CONFIG_VITESSE_PHY)	+= vitesse.o
- obj-$(CONFIG_BROADCOM_PHY)	+= broadcom.o
- obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
-+obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/target/linux/generic-2.6/patches-2.6.31/630-phy_packets.patch b/target/linux/generic-2.6/patches-2.6.31/630-phy_packets.patch
deleted file mode 100644
index 82f67bcee..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/630-phy_packets.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/drivers/net/phy/phy_device.c
-+++ b/drivers/net/phy/phy_device.c
-@@ -146,6 +146,18 @@ int phy_scan_fixups(struct phy_device *p
- }
- EXPORT_SYMBOL(phy_scan_fixups);
- 
-+static int generic_receive_skb(struct sk_buff *skb)
-+{
-+	skb->protocol = eth_type_trans(skb, skb->dev);
-+	return netif_receive_skb(skb);
-+}
-+
-+static int generic_rx(struct sk_buff *skb)
-+{
-+	skb->protocol = eth_type_trans(skb, skb->dev);
-+	return netif_rx(skb);
-+}
-+
- struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)
- {
- 	struct phy_device *dev;
-@@ -175,6 +187,8 @@ struct phy_device* phy_device_create(str
- 	dev_set_name(&dev->dev, PHY_ID_FMT, bus->id, addr);
- 
- 	dev->state = PHY_DOWN;
-+	dev->netif_receive_skb = &generic_receive_skb;
-+	dev->netif_rx = &generic_rx;
- 
- 	mutex_init(&dev->lock);
- 
---- a/include/linux/phy.h
-+++ b/include/linux/phy.h
-@@ -325,6 +325,20 @@ struct phy_device {
- 	void (*adjust_link)(struct net_device *dev);
- 
- 	void (*adjust_state)(struct net_device *dev);
-+
-+	/*
-+	 * By default these point to the original functions
-+	 * with the same name. adding them to the phy_device
-+	 * allows the phy driver to override them for packet
-+	 * mangling if the ethernet driver supports it
-+	 * This is required to support some really horrible
-+	 * switches such as the Marvell 88E6060
-+	 */
-+	int (*netif_receive_skb)(struct sk_buff *skb);
-+	int (*netif_rx)(struct sk_buff *skb);
-+
-+	/* alignment offset for packets */
-+	int pkt_align;
- };
- #define to_phy_device(d) container_of(d, struct phy_device, dev)
- 
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -804,6 +804,7 @@ struct net_device
- 	void			*ax25_ptr;	/* AX.25 specific data */
- 	struct wireless_dev	*ieee80211_ptr;	/* IEEE 802.11 specific data,
- 						   assign before registering */
-+	void			*phy_ptr; /* PHY device specific data */
- 
- /*
-  * Cache line mostly used on receive path (including eth_type_trans())
diff --git a/target/linux/generic-2.6/patches-2.6.31/640-br2684_backport_routed.patch b/target/linux/generic-2.6/patches-2.6.31/640-br2684_backport_routed.patch
deleted file mode 100644
index 1623e7f9b..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/640-br2684_backport_routed.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-commit 2e302ebfeac04beb5a5d6af1ac583c6a1fb76d1a
-Author: chas williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
-Date:   Fri Dec 4 11:06:32 2009 +0000
-
-    atm: [br2684] allow routed mode operation again
-    
-    in routed mode, we don't have a hardware address so netdev_ops doesnt
-    need to validate our hardware address via .ndo_validate_addr
-    
-    Reported-by: Manuel Fuentes <mfuentes@agenciaefe.com>
-    Signed-off-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
-    Signed-off-by: David S. Miller <davem@davemloft.net>
-
---- a/net/atm/br2684.c
-+++ b/net/atm/br2684.c
-@@ -536,6 +536,12 @@ static const struct net_device_ops br268
- 	.ndo_validate_addr	= eth_validate_addr,
- };
- 
-+static const struct net_device_ops br2684_netdev_ops_routed = {
-+	.ndo_start_xmit 	= br2684_start_xmit,
-+	.ndo_set_mac_address	= br2684_mac_addr,
-+	.ndo_change_mtu		= eth_change_mtu
-+};
-+
- static void br2684_setup(struct net_device *netdev)
- {
- 	struct br2684_dev *brdev = BRPRIV(netdev);
-@@ -551,11 +557,10 @@ static void br2684_setup(struct net_devi
- static void br2684_setup_routed(struct net_device *netdev)
- {
- 	struct br2684_dev *brdev = BRPRIV(netdev);
--	brdev->net_dev = netdev;
- 
-+	brdev->net_dev = netdev;
- 	netdev->hard_header_len = 0;
--
--	netdev->netdev_ops = &br2684_netdev_ops;
-+	netdev->netdev_ops = &br2684_netdev_ops_routed;
- 	netdev->addr_len = 0;
- 	netdev->mtu = 1500;
- 	netdev->type = ARPHRD_PPP;
diff --git a/target/linux/generic-2.6/patches-2.6.31/650-swconfig.patch b/target/linux/generic-2.6/patches-2.6.31/650-swconfig.patch
deleted file mode 100644
index 6825037ce..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/650-swconfig.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -13,6 +13,12 @@ menuconfig PHYLIB
- 
- if PHYLIB
- 
-+config SWCONFIG
-+	tristate "Switch configuration API"
-+	---help---
-+	  Switch configuration API using netlink. This allows
-+	  you to configure the VLAN features of certain switches.
-+
- comment "MII PHY device drivers"
- 
- config MARVELL_PHY
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -3,6 +3,7 @@
- libphy-objs			:= phy.o phy_device.o mdio_bus.o
- 
- obj-$(CONFIG_PHYLIB)		+= libphy.o
-+obj-$(CONFIG_SWCONFIG)		+= swconfig.o
- obj-$(CONFIG_MARVELL_PHY)	+= marvell.o
- obj-$(CONFIG_DAVICOM_PHY)	+= davicom.o
- obj-$(CONFIG_CICADA_PHY)	+= cicada.o
diff --git a/target/linux/generic-2.6/patches-2.6.31/660-phy_mvswitch.patch b/target/linux/generic-2.6/patches-2.6.31/660-phy_mvswitch.patch
deleted file mode 100644
index 731f30301..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/660-phy_mvswitch.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -93,6 +93,9 @@ config ADM6996_PHY
- 	---help---
- 	  Currently supports the ADM6996F switch
- 
-+config MVSWITCH_PHY
-+	tristate "Driver for Marvell 88E6060 switches"
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -14,6 +14,7 @@ obj-$(CONFIG_VITESSE_PHY)	+= vitesse.o
- obj-$(CONFIG_BROADCOM_PHY)	+= broadcom.o
- obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
- obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
-+obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/target/linux/generic-2.6/patches-2.6.31/670-phy_ip175c.patch b/target/linux/generic-2.6/patches-2.6.31/670-phy_ip175c.patch
deleted file mode 100644
index 461df5046..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/670-phy_ip175c.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -96,6 +96,10 @@ config ADM6996_PHY
- config MVSWITCH_PHY
- 	tristate "Driver for Marvell 88E6060 switches"
- 
-+config IP175C_PHY
-+	tristate "Driver for IC+ IP175C/IP178C switches"
-+	select SWCONFIG
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -15,6 +15,7 @@ obj-$(CONFIG_BROADCOM_PHY)	+= broadcom.o
- obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
- obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
- obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
-+obj-$(CONFIG_IP175C_PHY)	+= ip175c.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/target/linux/generic-2.6/patches-2.6.31/680-phy_ar8216.patch b/target/linux/generic-2.6/patches-2.6.31/680-phy_ar8216.patch
deleted file mode 100644
index d9d3ce772..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/680-phy_ar8216.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -100,6 +100,10 @@ config IP175C_PHY
- 	tristate "Driver for IC+ IP175C/IP178C switches"
- 	select SWCONFIG
- 
-+config AR8216_PHY
-+	tristate "Driver for Atheros AR8216 switches"
-+	select SWCONFIG
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -17,6 +17,7 @@ obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
- obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
- obj-$(CONFIG_IP175C_PHY)	+= ip175c.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
-+obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
- obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/target/linux/generic-2.6/patches-2.6.31/690-phy_rtl8306.patch b/target/linux/generic-2.6/patches-2.6.31/690-phy_rtl8306.patch
deleted file mode 100644
index bfebbcff5..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/690-phy_rtl8306.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -104,6 +104,10 @@ config AR8216_PHY
- 	tristate "Driver for Atheros AR8216 switches"
- 	select SWCONFIG
- 
-+config RTL8306_PHY
-+	tristate "Driver for Realtek RTL8306S switches"
-+	select SWCONFIG
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -18,6 +18,7 @@ obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
- obj-$(CONFIG_IP175C_PHY)	+= ip175c.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
-+obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
- obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/target/linux/generic-2.6/patches-2.6.31/691-phy_rtl8366.patch b/target/linux/generic-2.6/patches-2.6.31/691-phy_rtl8366.patch
deleted file mode 100644
index 4ce0520b1..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/691-phy_rtl8366.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -135,4 +135,29 @@ config MDIO_GPIO
- 	  To compile this driver as a module, choose M here: the module
- 	  will be called mdio-gpio.
- 
-+config RTL8366_SMI
-+	tristate "Driver for the RTL8366 SMI interface"
-+	depends on GENERIC_GPIO
-+	---help---
-+	  This module implements the SMI interface protocol which is used
-+	  by some RTL8366 ethernet switch devices via the generic GPIO API.
-+
-+if RTL8366_SMI
-+
-+config RTL8366S_PHY
-+	tristate "Driver for the Realtek RTL8366S switch"
-+	select SWCONFIG
-+
-+config RTL8366RB_PHY
-+	tristate "Driver for the Realtek RTL8366RB switch"
-+	select SWCONFIG
-+
-+config RTL8366S_PHY_DEBUG_FS
-+	bool "RTL8366 switch driver DEBUG_FS support"
-+	depends on RTL8366S_PHY || RTL8366RB_PHY
-+	depends on DEBUG_FS
-+	default n
-+
-+endif # RTL8366_SMI
-+
- endif # PHYLIB
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -19,6 +19,9 @@ obj-$(CONFIG_IP175C_PHY)	+= ip175c.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
- obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
-+obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi.o
-+obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o
-+obj-$(CONFIG_RTL8366RB_PHY)	+= rtl8366rb.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
- obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/target/linux/generic-2.6/patches-2.6.31/700-rtc7301.patch b/target/linux/generic-2.6/patches-2.6.31/700-rtc7301.patch
deleted file mode 100644
index 6e6665440..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/700-rtc7301.patch
+++ /dev/null
@@ -1,250 +0,0 @@
---- a/drivers/rtc/Kconfig
-+++ b/drivers/rtc/Kconfig
-@@ -535,6 +535,15 @@ config RTC_DRV_PCF50633
- 	  If you say yes here you get support for the RTC subsystem of the
- 	  NXP PCF50633 used in embedded systems.
- 
-+config RTC_DRV_RTC7301
-+	tristate "Epson RTC-7301 SF/DG"
-+	help
-+	  If you say Y here you will get support for the
-+	  Epson RTC-7301 SF/DG RTC chips.
-+
-+	  This driver can also be built as a module. If so, the module
-+	  will be called rtc-7301.
-+
- comment "on-CPU RTC drivers"
- 
- config RTC_DRV_OMAP
---- a/drivers/rtc/Makefile
-+++ b/drivers/rtc/Makefile
-@@ -62,6 +62,7 @@ obj-$(CONFIG_RTC_DRV_R9701)	+= rtc-r9701
- obj-$(CONFIG_RTC_DRV_RS5C313)	+= rtc-rs5c313.o
- obj-$(CONFIG_RTC_DRV_RS5C348)	+= rtc-rs5c348.o
- obj-$(CONFIG_RTC_DRV_RS5C372)	+= rtc-rs5c372.o
-+obj-$(CONFIG_RTC_DRV_RTC7301)	+= rtc-rtc7301.o
- obj-$(CONFIG_RTC_DRV_RX8025)	+= rtc-rx8025.o
- obj-$(CONFIG_RTC_DRV_RX8581)	+= rtc-rx8581.o
- obj-$(CONFIG_RTC_DRV_S35390A)	+= rtc-s35390a.o
---- /dev/null
-+++ b/drivers/rtc/rtc-rtc7301.c
-@@ -0,0 +1,219 @@
-+/*
-+ * Driver for Epson RTC-7301SF/DG
-+ *
-+ * Copyright (C) 2009 Jose Vasconcellos
-+ *
-+ * 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.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/rtc.h>
-+#include <linux/platform_device.h>
-+#include <linux/io.h>
-+#include <linux/delay.h>
-+#include <linux/bcd.h>
-+
-+#define RTC_NAME "rtc7301"
-+#define RTC_VERSION "0.1"
-+
-+/* Epson RTC-7301 register addresses */
-+#define RTC7301_SEC		0x00
-+#define RTC7301_SEC10		0x01
-+#define RTC7301_MIN		0x02
-+#define RTC7301_MIN10		0x03
-+#define RTC7301_HOUR		0x04
-+#define RTC7301_HOUR10		0x05
-+#define RTC7301_WEEKDAY		0x06
-+#define RTC7301_DAY		0x07
-+#define RTC7301_DAY10		0x08
-+#define RTC7301_MON		0x09
-+#define RTC7301_MON10		0x0A
-+#define RTC7301_YEAR		0x0B
-+#define RTC7301_YEAR10		0x0C
-+#define RTC7301_YEAR100		0x0D
-+#define RTC7301_YEAR1000	0x0E
-+#define RTC7301_CTRLREG		0x0F
-+
-+static uint8_t __iomem *rtc7301_base;
-+
-+#define read_reg(offset) (readb(rtc7301_base + offset) & 0xf)
-+#define write_reg(offset, data) writeb(data, rtc7301_base + (offset))
-+
-+#define rtc7301_isbusy() (read_reg(RTC7301_CTRLREG) & 1)
-+
-+static void rtc7301_init_settings(void)
-+{
-+	int i;
-+
-+	write_reg(RTC7301_CTRLREG, 2);
-+	write_reg(RTC7301_YEAR1000, 2);
-+	udelay(122);
-+
-+	/* bank 1 */
-+	write_reg(RTC7301_CTRLREG, 6);
-+	for (i=0; i<15; i++)
-+		write_reg(i, 0);
-+
-+	/* bank 2 */
-+	write_reg(RTC7301_CTRLREG, 14);
-+	for (i=0; i<15; i++)
-+		write_reg(i, 0);
-+	write_reg(RTC7301_CTRLREG, 0);
-+}
-+
-+static int rtc7301_get_datetime(struct device *dev, struct rtc_time *dt)
-+{
-+	int cnt;
-+	uint8_t buf[16];
-+
-+	cnt = 0;
-+	while (rtc7301_isbusy()) {
-+		udelay(244);
-+		if (cnt++ > 100) {
-+			dev_err(dev, "%s: timeout error %x\n", __func__, rtc7301_base[RTC7301_CTRLREG]);
-+			return -EIO;
-+		}
-+	}
-+
-+	for (cnt=0; cnt<16; cnt++)
-+		buf[cnt] = read_reg(cnt);
-+
-+	if (buf[RTC7301_SEC10] & 8) {
-+		dev_err(dev, "%s: RTC not set\n", __func__);
-+		return -EINVAL;
-+	}
-+
-+	memset(dt, 0, sizeof(*dt));
-+
-+	dt->tm_sec =  buf[RTC7301_SEC] + buf[RTC7301_SEC10]*10;
-+	dt->tm_min =  buf[RTC7301_MIN] + buf[RTC7301_MIN10]*10;
-+	dt->tm_hour = buf[RTC7301_HOUR] + buf[RTC7301_HOUR10]*10;
-+
-+	dt->tm_mday = buf[RTC7301_DAY] + buf[RTC7301_DAY10]*10;
-+	dt->tm_mon =  buf[RTC7301_MON] + buf[RTC7301_MON10]*10 - 1;
-+	dt->tm_year = buf[RTC7301_YEAR] + buf[RTC7301_YEAR10]*10 +
-+		      buf[RTC7301_YEAR100]*100 +
-+		      ((buf[RTC7301_YEAR1000] & 3)*1000) - 1900;
-+
-+	/* the rtc device may contain illegal values on power up
-+	 * according to the data sheet. make sure they are valid.
-+	 */
-+
-+	return rtc_valid_tm(dt);
-+}
-+
-+static int rtc7301_set_datetime(struct device *dev, struct rtc_time *dt)
-+{
-+	int data;
-+
-+	data = dt->tm_year + 1900;
-+	if (data >= 2100 || data < 1900)
-+		return -EINVAL;
-+
-+	write_reg(RTC7301_CTRLREG, 2);
-+       	udelay(122);
-+
-+	data = bin2bcd(dt->tm_sec);
-+	write_reg(RTC7301_SEC, data);
-+	write_reg(RTC7301_SEC10, (data >> 4));
-+
-+	data = bin2bcd(dt->tm_min);
-+	write_reg(RTC7301_MIN, data );
-+	write_reg(RTC7301_MIN10, (data >> 4));
-+
-+	data = bin2bcd(dt->tm_hour);
-+	write_reg(RTC7301_HOUR, data);
-+	write_reg(RTC7301_HOUR10, (data >> 4));
-+
-+	data = bin2bcd(dt->tm_mday);
-+	write_reg(RTC7301_DAY, data);
-+	write_reg(RTC7301_DAY10, (data>> 4));
-+
-+	data = bin2bcd(dt->tm_mon + 1);
-+	write_reg(RTC7301_MON, data);
-+	write_reg(RTC7301_MON10, (data >> 4));
-+
-+	data = bin2bcd(dt->tm_year % 100);
-+	write_reg(RTC7301_YEAR, data);
-+	write_reg(RTC7301_YEAR10, (data >> 4));
-+	data = bin2bcd((1900 + dt->tm_year) / 100);
-+	write_reg(RTC7301_YEAR100, data);
-+
-+	data = bin2bcd(dt->tm_wday);
-+	write_reg(RTC7301_WEEKDAY, data);
-+
-+	write_reg(RTC7301_CTRLREG, 0);
-+
-+	return 0;
-+}
-+
-+static const struct rtc_class_ops rtc7301_rtc_ops = {
-+	.read_time	= rtc7301_get_datetime,
-+	.set_time	= rtc7301_set_datetime,
-+};
-+
-+static int __devinit rtc7301_probe(struct platform_device *pdev)
-+{
-+	struct rtc_device *rtc;
-+	struct resource *res;
-+
-+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if (!res)
-+		return -ENOENT;
-+
-+	rtc7301_base = ioremap_nocache(res->start, 0x1000 /*res->end - res->start + 1*/);
-+	if (!rtc7301_base)
-+		return -EINVAL;
-+
-+	rtc = rtc_device_register(RTC_NAME, &pdev->dev,
-+				&rtc7301_rtc_ops, THIS_MODULE);
-+	if (IS_ERR(rtc)) {
-+		iounmap(rtc7301_base);
-+		return PTR_ERR(rtc);
-+	}
-+
-+	platform_set_drvdata(pdev, rtc);
-+
-+	rtc7301_init_settings();
-+	return 0;
-+}
-+
-+static int __devexit rtc7301_remove(struct platform_device *pdev)
-+{
-+	struct rtc_device *rtc = platform_get_drvdata(pdev);
-+
-+	if (rtc)
-+		rtc_device_unregister(rtc);
-+	if (rtc7301_base)
-+		iounmap(rtc7301_base);
-+	return 0;
-+}
-+
-+static struct platform_driver rtc7301_driver = {
-+	.driver = {
-+		.name	= RTC_NAME,
-+		.owner	= THIS_MODULE,
-+	},
-+	.probe	= rtc7301_probe,
-+	.remove = __devexit_p(rtc7301_remove),
-+};
-+
-+static __init int rtc7301_init(void)
-+{
-+	return platform_driver_register(&rtc7301_driver);
-+}
-+module_init(rtc7301_init);
-+
-+static __exit void rtc7301_exit(void)
-+{
-+	platform_driver_unregister(&rtc7301_driver);
-+}
-+module_exit(rtc7301_exit);
-+
-+MODULE_DESCRIPTION("Epson 7301 RTC driver");
-+MODULE_AUTHOR("Jose Vasconcellos <jvasco@verizon.net>");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS("platform:" RTC_NAME);
-+MODULE_VERSION(RTC_VERSION);
diff --git a/target/linux/generic-2.6/patches-2.6.31/750-glamo-headers.patch b/target/linux/generic-2.6/patches-2.6.31/750-glamo-headers.patch
deleted file mode 100644
index 419d98a42..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/750-glamo-headers.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/include/linux/fb.h
-+++ b/include/linux/fb.h
-@@ -124,6 +124,7 @@ struct dentry;
- #define FB_ACCEL_TRIDENT_BLADE3D 52	/* Trident Blade3D		*/
- #define FB_ACCEL_TRIDENT_BLADEXP 53	/* Trident BladeXP		*/
- #define FB_ACCEL_CIRRUS_ALPINE   53	/* Cirrus Logic 543x/544x/5480	*/
-+#define FB_ACCEL_GLAMO		50	/* SMedia Glamo                 */
- #define FB_ACCEL_NEOMAGIC_NM2070 90	/* NeoMagic NM2070              */
- #define FB_ACCEL_NEOMAGIC_NM2090 91	/* NeoMagic NM2090              */
- #define FB_ACCEL_NEOMAGIC_NM2093 92	/* NeoMagic NM2093              */
---- a/include/linux/Kbuild
-+++ b/include/linux/Kbuild
-@@ -76,6 +76,8 @@ header-y += genetlink.h
- header-y += gen_stats.h
- header-y += gfs2_ondisk.h
- header-y += gigaset_dev.h
-+header-y += glamofb.h
-+header-y += glamo-engine.h
- header-y += hysdn_if.h
- header-y += i2o-dev.h
- header-y += i8k.h
diff --git a/target/linux/generic-2.6/patches-2.6.31/780-fix-race-in-snd_soc_jack_add_gpios.patch b/target/linux/generic-2.6/patches-2.6.31/780-fix-race-in-snd_soc_jack_add_gpios.patch
deleted file mode 100644
index b7214b9d6..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/780-fix-race-in-snd_soc_jack_add_gpios.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit 5ced436d549d911ce610ea47d85f71fae5bbfce4
-Author: Lars-Peter Clausen <lars@metafoo.de>
-Date:   Fri Jul 31 18:26:48 2009 +0200
-
-    ASoC: jack: Fix race in snd_soc_jack_add_gpios
-    
-    The irq can fire as soon as it has been requested, thus all fields accessed
-    from within the irq handler must be initialized prior to requesting the irq.
-    
-    Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
-
---- a/sound/soc/soc-jack.c
-+++ b/sound/soc/soc-jack.c
-@@ -220,6 +220,9 @@ int snd_soc_jack_add_gpios(struct snd_so
- 		if (ret)
- 			goto err;
- 
-+		INIT_WORK(&gpios[i].work, gpio_work);
-+		gpios[i].jack = jack;
-+
- 		ret = request_irq(gpio_to_irq(gpios[i].gpio),
- 				gpio_handler,
- 				IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
-@@ -227,9 +230,6 @@ int snd_soc_jack_add_gpios(struct snd_so
- 				&gpios[i]);
- 		if (ret)
- 			goto err;
--
--		INIT_WORK(&gpios[i].work, gpio_work);
--		gpios[i].jack = jack;
- 	}
- 
- 	return 0;
diff --git a/target/linux/generic-2.6/patches-2.6.31/801-usb_serial_endpoint_size.patch b/target/linux/generic-2.6/patches-2.6.31/801-usb_serial_endpoint_size.patch
deleted file mode 100644
index 41b3848f4..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/801-usb_serial_endpoint_size.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/drivers/usb/serial/usb-serial.c
-+++ b/drivers/usb/serial/usb-serial.c
-@@ -60,6 +60,7 @@ static struct usb_driver usb_serial_driv
-    drivers depend on it.
- */
- 
-+static ushort maxSize = 0;
- static int debug;
- /* initially all NULL */
- static struct usb_serial *serial_table[SERIAL_TTY_MINORS];
-@@ -947,7 +948,7 @@ int usb_serial_probe(struct usb_interfac
- 			dev_err(&interface->dev, "No free urbs available\n");
- 			goto probe_error;
- 		}
--		buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
-+		buffer_size = (endpoint->wMaxPacketSize > maxSize) ? endpoint->wMaxPacketSize : maxSize;
- 		port->bulk_in_size = buffer_size;
- 		port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
- 		port->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL);
-@@ -1381,3 +1382,5 @@ MODULE_LICENSE("GPL");
- 
- module_param(debug, bool, S_IRUGO | S_IWUSR);
- MODULE_PARM_DESC(debug, "Debug enabled or not");
-+module_param(maxSize, ushort,0);
-+MODULE_PARM_DESC(maxSize,"User specified USB endpoint size");
diff --git a/target/linux/generic-2.6/patches-2.6.31/840-unable_to_open_console.patch b/target/linux/generic-2.6/patches-2.6.31/840-unable_to_open_console.patch
deleted file mode 100644
index b90a247a8..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/840-unable_to_open_console.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/init/main.c
-+++ b/init/main.c
-@@ -839,7 +839,7 @@ static noinline int init_post(void)
- 	numa_default_policy();
- 
- 	if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
--		printk(KERN_WARNING "Warning: unable to open an initial console.\n");
-+		printk(KERN_WARNING "Please be patient, while OpenWrt loads ...\n");
- 
- 	(void) sys_dup(0);
- 	(void) sys_dup(0);
diff --git a/target/linux/generic-2.6/patches-2.6.31/902-darwin_scripts_include.patch b/target/linux/generic-2.6/patches-2.6.31/902-darwin_scripts_include.patch
deleted file mode 100644
index fc64c17d5..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/902-darwin_scripts_include.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- a/scripts/genksyms/parse.c_shipped
-+++ b/scripts/genksyms/parse.c_shipped
-@@ -160,7 +160,9 @@
- 
- 
- #include <assert.h>
-+#ifndef __APPLE__
- #include <malloc.h>
-+#endif
- #include "genksyms.h"
- 
- static int is_typedef;
---- a/scripts/genksyms/parse.y
-+++ b/scripts/genksyms/parse.y
-@@ -24,7 +24,9 @@
- %{
- 
- #include <assert.h>
-+#ifndef __APPLE__
- #include <malloc.h>
-+#endif
- #include "genksyms.h"
- 
- static int is_typedef;
---- a/scripts/kallsyms.c
-+++ b/scripts/kallsyms.c
-@@ -22,6 +22,35 @@
- #include <stdlib.h>
- #include <string.h>
- #include <ctype.h>
-+#ifdef __APPLE__
-+/* Darwin has no memmem implementation, this one is ripped of the uClibc-0.9.28 source */
-+void *memmem (const void *haystack, size_t haystack_len,
-+                          const void *needle,  size_t needle_len)
-+{
-+  const char *begin;
-+  const char *const last_possible
-+    = (const char *) haystack + haystack_len - needle_len;
-+
-+  if (needle_len == 0)
-+    /* The first occurrence of the empty string is deemed to occur at
-+       the beginning of the string.  */
-+    return (void *) haystack;
-+
-+  /* Sanity check, otherwise the loop might search through the whole
-+     memory.  */
-+  if (__builtin_expect (haystack_len < needle_len, 0))
-+    return NULL;
-+
-+  for (begin = (const char *) haystack; begin <= last_possible; ++begin)
-+    if (begin[0] == ((const char *) needle)[0] &&
-+        !memcmp ((const void *) &begin[1],
-+                 (const void *) ((const char *) needle + 1),
-+                 needle_len - 1))
-+      return (void *) begin;
-+
-+  return NULL;
-+}
-+#endif
- 
- #ifndef ARRAY_SIZE
- #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
---- a/scripts/kconfig/Makefile
-+++ b/scripts/kconfig/Makefile
-@@ -97,6 +97,9 @@ check-lxdialog  := $(srctree)/$(src)/lxd
- # we really need to do so. (Do not call gcc as part of make mrproper)
- HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
- HOST_LOADLIBES   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
-+ifeq ($(shell uname -s),Darwin)
-+HOST_LOADLIBES  += -lncurses
-+endif
- 
- HOST_EXTRACFLAGS += -DLOCALE
- 
---- a/scripts/mod/mk_elfconfig.c
-+++ b/scripts/mod/mk_elfconfig.c
-@@ -1,7 +1,11 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#ifndef __APPLE__
- #include <elf.h>
-+#else
-+#include "../../../../../tools/sstrip/include/elf.h"
-+#endif
- 
- int
- main(int argc, char **argv)
---- a/scripts/mod/modpost.h
-+++ b/scripts/mod/modpost.h
-@@ -7,7 +7,11 @@
- #include <sys/mman.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#if !(defined(__APPLE__) || defined(__CYGWIN__))
- #include <elf.h>
-+#else
-+#include "../../../../../tools/sstrip/include/elf.h"
-+#endif
- 
- #include "elfconfig.h"
- 
diff --git a/target/linux/generic-2.6/patches-2.6.31/903-hostap_txpower.patch b/target/linux/generic-2.6/patches-2.6.31/903-hostap_txpower.patch
deleted file mode 100644
index 197d0a1e3..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/903-hostap_txpower.patch
+++ /dev/null
@@ -1,154 +0,0 @@
---- a/drivers/net/wireless/hostap/hostap_ap.c
-+++ b/drivers/net/wireless/hostap/hostap_ap.c
-@@ -2335,13 +2335,13 @@ int prism2_ap_get_sta_qual(local_info_t 
- 		addr[count].sa_family = ARPHRD_ETHER;
- 		memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
- 		if (sta->last_rx_silence == 0)
--			qual[count].qual = sta->last_rx_signal < 27 ?
--				0 : (sta->last_rx_signal - 27) * 92 / 127;
-+                        qual[count].qual = (sta->last_rx_signal - 156) == 0 ?
-+                                0 : (sta->last_rx_signal - 156) * 92 / 64;
- 		else
--			qual[count].qual = sta->last_rx_signal -
--				sta->last_rx_silence - 35;
--		qual[count].level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
--		qual[count].noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
-+                        qual[count].qual = (sta->last_rx_signal -
-+                                sta->last_rx_silence) * 92 / 64;
-+                qual[count].level = sta->last_rx_signal;
-+                qual[count].noise = sta->last_rx_silence;
- 		qual[count].updated = sta->last_rx_updated;
- 
- 		sta->last_rx_updated = IW_QUAL_DBM;
-@@ -2407,13 +2407,13 @@ int prism2_ap_translate_scan(struct net_
- 		memset(&iwe, 0, sizeof(iwe));
- 		iwe.cmd = IWEVQUAL;
- 		if (sta->last_rx_silence == 0)
--			iwe.u.qual.qual = sta->last_rx_signal < 27 ?
--				0 : (sta->last_rx_signal - 27) * 92 / 127;
-+	                iwe.u.qual.qual = (sta->last_rx_signal -156) == 0 ?
-+	                        0 : (sta->last_rx_signal - 156) * 92 / 64;
- 		else
--			iwe.u.qual.qual = sta->last_rx_signal -
--				sta->last_rx_silence - 35;
--		iwe.u.qual.level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
--		iwe.u.qual.noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
-+                        iwe.u.qual.qual = (sta->last_rx_signal -
-+                                sta->last_rx_silence) * 92 / 64;
-+                iwe.u.qual.level = sta->last_rx_signal;
-+                iwe.u.qual.noise = sta->last_rx_silence;
- 		iwe.u.qual.updated = sta->last_rx_updated;
- 		iwe.len = IW_EV_QUAL_LEN;
- 		current_ev = iwe_stream_add_event(info, current_ev, end_buf,
---- a/drivers/net/wireless/hostap/hostap_config.h
-+++ b/drivers/net/wireless/hostap/hostap_config.h
-@@ -45,4 +45,9 @@
-  */
- /* #define PRISM2_NO_STATION_MODES */
- 
-+/* Enable TX power Setting functions
-+ * (min att = -128 , max att =  127)
-+ */
-+#define RAW_TXPOWER_SETTING
-+
- #endif /* HOSTAP_CONFIG_H */
---- a/drivers/net/wireless/hostap/hostap.h
-+++ b/drivers/net/wireless/hostap/hostap.h
-@@ -90,6 +90,7 @@ extern const struct iw_handler_def hosta
- extern const struct ethtool_ops prism2_ethtool_ops;
- 
- int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
-+int hostap_restore_power(struct net_device *dev);
- 
- 
- #endif /* HOSTAP_H */
---- a/drivers/net/wireless/hostap/hostap_hw.c
-+++ b/drivers/net/wireless/hostap/hostap_hw.c
-@@ -932,6 +932,7 @@ static int hfa384x_set_rid(struct net_de
- 			prism2_hw_reset(dev);
- 	}
- 
-+	hostap_restore_power(dev);
- 	return res;
- }
- 
---- a/drivers/net/wireless/hostap/hostap_info.c
-+++ b/drivers/net/wireless/hostap/hostap_info.c
-@@ -431,6 +431,11 @@ static void handle_info_queue_linkstatus
- 	}
- 
- 	/* Get BSSID if we have a valid AP address */
-+
-+	if ( val == HFA384X_LINKSTATUS_CONNECTED ||
-+	     val == HFA384X_LINKSTATUS_DISCONNECTED )
-+			hostap_restore_power(local->dev);
-+
- 	if (connected) {
- 		netif_carrier_on(local->dev);
- 		netif_carrier_on(local->ddev);
---- a/drivers/net/wireless/hostap/hostap_ioctl.c
-+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
-@@ -1475,23 +1475,20 @@ static int prism2_txpower_hfa386x_to_dBm
- 		val = 255;
- 
- 	tmp = val;
--	tmp >>= 2;
- 
--	return -12 - tmp;
-+	return tmp;
- }
- 
- static u16 prism2_txpower_dBm_to_hfa386x(int val)
- {
- 	signed char tmp;
- 
--	if (val > 20)
--		return 128;
--	else if (val < -43)
-+	if (val > 127)
- 		return 127;
-+	else if (val < -128)
-+		return 128;
- 
- 	tmp = val;
--	tmp = -12 - tmp;
--	tmp <<= 2;
- 
- 	return (unsigned char) tmp;
- }
-@@ -4055,3 +4052,35 @@ int hostap_ioctl(struct net_device *dev,
- 
- 	return ret;
- }
-+
-+/* BUG FIX: Restore power setting value when lost due to F/W bug */
-+
-+int hostap_restore_power(struct net_device *dev)
-+{
-+        struct hostap_interface *iface = netdev_priv(dev);
-+       local_info_t *local = iface->local;
-+
-+       u16 val;
-+       int ret = 0;
-+
-+       if (local->txpower_type == PRISM2_TXPOWER_OFF) {
-+                       val = 0xff; /* use all standby and sleep modes */
-+                       ret = local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
-+                                              HFA386X_CR_A_D_TEST_MODES2,
-+                                              &val, NULL);
-+       }
-+
-+#ifdef RAW_TXPOWER_SETTING
-+       if (local->txpower_type == PRISM2_TXPOWER_FIXED) {
-+               val = HFA384X_TEST_CFG_BIT_ALC;
-+               local->func->cmd(dev, HFA384X_CMDCODE_TEST |
-+                                (HFA384X_TEST_CFG_BITS << 8), 0, &val, NULL);
-+               val = prism2_txpower_dBm_to_hfa386x(local->txpower);
-+               ret = (local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
-+                            HFA386X_CR_MANUAL_TX_POWER, &val, NULL));
-+       }
-+#endif /* RAW_TXPOWER_SETTING */
-+       return (ret ? -EOPNOTSUPP : 0);
-+}
-+
-+EXPORT_SYMBOL(hostap_restore_power);
diff --git a/target/linux/generic-2.6/patches-2.6.31/903-stddef_include.patch b/target/linux/generic-2.6/patches-2.6.31/903-stddef_include.patch
deleted file mode 100644
index 7fe248d8d..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/903-stddef_include.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/include/linux/stddef.h
-+++ b/include/linux/stddef.h
-@@ -16,6 +16,7 @@ enum {
- 	false	= 0,
- 	true	= 1
- };
-+#endif /* __KERNEL__ */
- 
- #undef offsetof
- #ifdef __compiler_offsetof
-@@ -23,6 +24,5 @@ enum {
- #else
- #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
- #endif
--#endif /* __KERNEL__ */
- 
- #endif
diff --git a/target/linux/generic-2.6/patches-2.6.31/905-i386_build.patch b/target/linux/generic-2.6/patches-2.6.31/905-i386_build.patch
deleted file mode 100644
index c701fdaa9..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/905-i386_build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/arch/x86/boot/tools/build.c
-+++ b/arch/x86/boot/tools/build.c
-@@ -29,7 +29,6 @@
- #include <stdarg.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--#include <sys/sysmacros.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/mman.h>
diff --git a/target/linux/generic-2.6/patches-2.6.31/920-01-hotpluggable-spi-gpio.patch b/target/linux/generic-2.6/patches-2.6.31/920-01-hotpluggable-spi-gpio.patch
deleted file mode 100644
index b10bc9a65..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/920-01-hotpluggable-spi-gpio.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Fix spi-gpio for hotplug.
-
---mb
-
-
-
---- a/drivers/spi/spi_gpio.c
-+++ b/drivers/spi/spi_gpio.c
-@@ -218,7 +218,7 @@ static void spi_gpio_cleanup(struct spi_
- 	spi_bitbang_cleanup(spi);
- }
- 
--static int __init spi_gpio_alloc(unsigned pin, const char *label, bool is_in)
-+static int __devinit spi_gpio_alloc(unsigned pin, const char *label, bool is_in)
- {
- 	int value;
- 
-@@ -232,7 +232,7 @@ static int __init spi_gpio_alloc(unsigne
- 	return value;
- }
- 
--static int __init
-+static int __devinit
- spi_gpio_request(struct spi_gpio_platform_data *pdata, const char *label)
- {
- 	int value;
-@@ -261,7 +261,7 @@ done:
- 	return value;
- }
- 
--static int __init spi_gpio_probe(struct platform_device *pdev)
-+static int __devinit spi_gpio_probe(struct platform_device *pdev)
- {
- 	int				status;
- 	struct spi_master		*master;
-@@ -317,7 +317,7 @@ gpio_free:
- 	return status;
- }
- 
--static int __exit spi_gpio_remove(struct platform_device *pdev)
-+static int __devexit spi_gpio_remove(struct platform_device *pdev)
- {
- 	struct spi_gpio			*spi_gpio;
- 	struct spi_gpio_platform_data	*pdata;
-@@ -344,12 +344,13 @@ MODULE_ALIAS("platform:" DRIVER_NAME);
- static struct platform_driver spi_gpio_driver = {
- 	.driver.name	= DRIVER_NAME,
- 	.driver.owner	= THIS_MODULE,
--	.remove		= __exit_p(spi_gpio_remove),
-+	.probe		= spi_gpio_probe,
-+	.remove		= __devexit_p(spi_gpio_remove),
- };
- 
- static int __init spi_gpio_init(void)
- {
--	return platform_driver_probe(&spi_gpio_driver, spi_gpio_probe);
-+	return platform_driver_register(&spi_gpio_driver);
- }
- module_init(spi_gpio_init);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.31/920-04-spi-gpio-implement-spi-delay.patch b/target/linux/generic-2.6/patches-2.6.31/920-04-spi-gpio-implement-spi-delay.patch
deleted file mode 100644
index 19032881b..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/920-04-spi-gpio-implement-spi-delay.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Implement the SPI-GPIO delay function for busses that need speed limitation.
-
---mb
-
-
-
---- a/drivers/spi/spi_gpio.c
-+++ b/drivers/spi/spi_gpio.c
-@@ -21,6 +21,7 @@
- #include <linux/init.h>
- #include <linux/platform_device.h>
- #include <linux/gpio.h>
-+#include <linux/delay.h>
- 
- #include <linux/spi/spi.h>
- #include <linux/spi/spi_bitbang.h>
-@@ -69,6 +70,7 @@ struct spi_gpio {
-  *		#define	SPI_MOSI_GPIO	120
-  *		#define	SPI_SCK_GPIO	121
-  *		#define	SPI_N_CHIPSEL	4
-+ *		#undef NEED_SPIDELAY
-  *		#include "spi_gpio.c"
-  */
- 
-@@ -76,6 +78,7 @@ struct spi_gpio {
- #define DRIVER_NAME	"spi_gpio"
- 
- #define GENERIC_BITBANG	/* vs tight inlines */
-+#define NEED_SPIDELAY	1
- 
- /* all functions referencing these symbols must define pdata */
- #define SPI_MISO_GPIO	((pdata)->miso)
-@@ -120,12 +123,20 @@ static inline int getmiso(const struct s
- #undef pdata
- 
- /*
-- * NOTE:  this clocks "as fast as we can".  It "should" be a function of the
-- * requested device clock.  Software overhead means we usually have trouble
-- * reaching even one Mbit/sec (except when we can inline bitops), so for now
-- * we'll just assume we never need additional per-bit slowdowns.
-+ * NOTE:  to clock "as fast as we can", set spi_device.max_speed_hz
-+ * and spi_transfer.speed_hz to 0.
-+ * Otherwise this is a function of the requested device clock.
-+ * Software overhead means we usually have trouble
-+ * reaching even one Mbit/sec (except when we can inline bitops). So on small
-+ * embedded devices with fast SPI slaves you usually don't need a delay.
-  */
--#define spidelay(nsecs)	do {} while (0)
-+static inline void spidelay(unsigned nsecs)
-+{
-+#ifdef NEED_SPIDELAY
-+	if (unlikely(nsecs))
-+		ndelay(nsecs);
-+#endif /* NEED_SPIDELAY */
-+}
- 
- #define	EXPAND_BITBANG_TXRX
- #include <linux/spi/spi_bitbang.h>
diff --git a/target/linux/generic-2.6/patches-2.6.31/921-gpio_spi_driver.patch b/target/linux/generic-2.6/patches-2.6.31/921-gpio_spi_driver.patch
deleted file mode 100644
index 90e40e705..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/921-gpio_spi_driver.patch
+++ /dev/null
@@ -1,366 +0,0 @@
-THIS CODE IS DEPRECATED.
-
-Please use the new mainline SPI-GPIO driver, as of 2.6.29.
-
---mb
-
-
-
---- /dev/null
-+++ b/include/linux/spi/spi_gpio_old.h
-@@ -0,0 +1,73 @@
-+/*
-+ * spi_gpio interface to platform code
-+ *
-+ * Copyright (c) 2008 Piotr Skamruk
-+ * Copyright (c) 2008 Michael Buesch
-+ *
-+ * 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 _LINUX_SPI_SPI_GPIO
-+#define _LINUX_SPI_SPI_GPIO
-+
-+#include <linux/types.h>
-+#include <linux/spi/spi.h>
-+
-+
-+/**
-+ * struct spi_gpio_platform_data - Data definitions for a SPI-GPIO device.
-+ *
-+ * This structure holds information about a GPIO-based SPI device.
-+ *
-+ * @pin_clk: The GPIO pin number of the CLOCK pin.
-+ *
-+ * @pin_miso: The GPIO pin number of the MISO pin.
-+ *
-+ * @pin_mosi: The GPIO pin number of the MOSI pin.
-+ *
-+ * @pin_cs: The GPIO pin number of the CHIPSELECT pin.
-+ *
-+ * @cs_activelow: If true, the chip is selected when the CS line is low.
-+ *
-+ * @no_spi_delay: If true, no delay is done in the lowlevel bitbanging.
-+ *                Note that doing no delay is not standards compliant,
-+ *                but it might be needed to speed up transfers on some
-+ *                slow embedded machines.
-+ *
-+ * @boardinfo_setup: This callback is called after the
-+ *                   SPI master device was registered, but before the
-+ *                   device is registered.
-+ * @boardinfo_setup_data: Data argument passed to boardinfo_setup().
-+ */
-+struct spi_gpio_platform_data {
-+	unsigned int pin_clk;
-+	unsigned int pin_miso;
-+	unsigned int pin_mosi;
-+	unsigned int pin_cs;
-+	bool cs_activelow;
-+	bool no_spi_delay;
-+	int (*boardinfo_setup)(struct spi_board_info *bi,
-+			       struct spi_master *master,
-+			       void *data);
-+	void *boardinfo_setup_data;
-+};
-+
-+/**
-+ * SPI_GPIO_PLATDEV_NAME - The platform device name string.
-+ *
-+ * The name string that has to be used for platform_device_alloc
-+ * when allocating a spi-gpio device.
-+ */
-+#define SPI_GPIO_PLATDEV_NAME	"spi-gpio"
-+
-+/**
-+ * spi_gpio_next_id - Get another platform device ID number.
-+ *
-+ * This returns the next platform device ID number that has to be used
-+ * for platform_device_alloc. The ID is opaque and should not be used for
-+ * anything else.
-+ */
-+int spi_gpio_next_id(void);
-+
-+#endif /* _LINUX_SPI_SPI_GPIO */
---- /dev/null
-+++ b/drivers/spi/spi_gpio_old.c
-@@ -0,0 +1,251 @@
-+/*
-+ * Bitbanging SPI bus driver using GPIO API
-+ *
-+ * Copyright (c) 2008 Piotr Skamruk
-+ * Copyright (c) 2008 Michael Buesch
-+ *
-+ * based on spi_s3c2410_gpio.c
-+ *   Copyright (c) 2006 Ben Dooks
-+ *   Copyright (c) 2006 Simtec Electronics
-+ * and on i2c-gpio.c
-+ *   Copyright (C) 2007 Atmel Corporation
-+ *
-+ * 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.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/delay.h>
-+#include <linux/spinlock.h>
-+#include <linux/workqueue.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/spi/spi.h>
-+#include <linux/spi/spi_bitbang.h>
-+#include <linux/spi/spi_gpio_old.h>
-+#include <linux/gpio.h>
-+#include <asm/atomic.h>
-+
-+
-+struct spi_gpio {
-+	struct spi_bitbang bitbang;
-+	struct spi_gpio_platform_data *info;
-+	struct platform_device *pdev;
-+	struct spi_board_info bi;
-+};
-+
-+
-+static inline struct spi_gpio *spidev_to_sg(struct spi_device *dev)
-+{
-+	return dev->controller_data;
-+}
-+
-+static inline void setsck(struct spi_device *dev, int val)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+	gpio_set_value(sp->info->pin_clk, val ? 1 : 0);
-+}
-+
-+static inline void setmosi(struct spi_device *dev, int val)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+	gpio_set_value(sp->info->pin_mosi, val ? 1 : 0);
-+}
-+
-+static inline u32 getmiso(struct spi_device *dev)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+	return gpio_get_value(sp->info->pin_miso) ? 1 : 0;
-+}
-+
-+static inline void do_spidelay(struct spi_device *dev, unsigned nsecs)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+
-+	if (!sp->info->no_spi_delay)
-+		ndelay(nsecs);
-+}
-+
-+#define spidelay(nsecs) do {					\
-+	/* Steal the spi_device pointer from our caller.	\
-+	 * The bitbang-API should probably get fixed here... */	\
-+	do_spidelay(spi, nsecs);				\
-+  } while (0)
-+
-+#define EXPAND_BITBANG_TXRX
-+#include <linux/spi/spi_bitbang.h>
-+
-+static u32 spi_gpio_txrx_mode0(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha0(spi, nsecs, 0, word, bits);
-+}
-+
-+static u32 spi_gpio_txrx_mode1(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha1(spi, nsecs, 0, word, bits);
-+}
-+
-+static u32 spi_gpio_txrx_mode2(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha0(spi, nsecs, 1, word, bits);
-+}
-+
-+static u32 spi_gpio_txrx_mode3(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha1(spi, nsecs, 1, word, bits);
-+}
-+
-+static void spi_gpio_chipselect(struct spi_device *dev, int on)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+
-+	if (sp->info->cs_activelow)
-+		on = !on;
-+	gpio_set_value(sp->info->pin_cs, on ? 1 : 0);
-+}
-+
-+static int spi_gpio_probe(struct platform_device *pdev)
-+{
-+	struct spi_master *master;
-+	struct spi_gpio_platform_data *pdata;
-+	struct spi_gpio *sp;
-+	struct spi_device *spidev;
-+	int err;
-+
-+	pdata = pdev->dev.platform_data;
-+	if (!pdata)
-+		return -ENXIO;
-+
-+	err = -ENOMEM;
-+	master = spi_alloc_master(&pdev->dev, sizeof(struct spi_gpio));
-+	if (!master)
-+		goto err_alloc_master;
-+
-+	sp = spi_master_get_devdata(master);
-+	platform_set_drvdata(pdev, sp);
-+	sp->info = pdata;
-+
-+	err = gpio_request(pdata->pin_clk, "spi_clock");
-+	if (err)
-+		goto err_request_clk;
-+	err = gpio_request(pdata->pin_mosi, "spi_mosi");
-+	if (err)
-+		goto err_request_mosi;
-+	err = gpio_request(pdata->pin_miso, "spi_miso");
-+	if (err)
-+		goto err_request_miso;
-+	err = gpio_request(pdata->pin_cs, "spi_cs");
-+	if (err)
-+		goto err_request_cs;
-+
-+	sp->bitbang.master = spi_master_get(master);
-+	sp->bitbang.master->bus_num = -1;
-+	sp->bitbang.master->num_chipselect = 1;
-+	sp->bitbang.chipselect = spi_gpio_chipselect;
-+	sp->bitbang.txrx_word[SPI_MODE_0] = spi_gpio_txrx_mode0;
-+	sp->bitbang.txrx_word[SPI_MODE_1] = spi_gpio_txrx_mode1;
-+	sp->bitbang.txrx_word[SPI_MODE_2] = spi_gpio_txrx_mode2;
-+	sp->bitbang.txrx_word[SPI_MODE_3] = spi_gpio_txrx_mode3;
-+
-+	gpio_direction_output(pdata->pin_clk, 0);
-+	gpio_direction_output(pdata->pin_mosi, 0);
-+	gpio_direction_output(pdata->pin_cs,
-+			      pdata->cs_activelow ? 1 : 0);
-+	gpio_direction_input(pdata->pin_miso);
-+
-+	err = spi_bitbang_start(&sp->bitbang);
-+	if (err)
-+		goto err_no_bitbang;
-+	err = pdata->boardinfo_setup(&sp->bi, master,
-+				     pdata->boardinfo_setup_data);
-+	if (err)
-+		goto err_bi_setup;
-+	sp->bi.controller_data = sp;
-+	spidev = spi_new_device(master, &sp->bi);
-+	if (!spidev)
-+		goto err_new_dev;
-+
-+	return 0;
-+
-+err_new_dev:
-+err_bi_setup:
-+	spi_bitbang_stop(&sp->bitbang);
-+err_no_bitbang:
-+	spi_master_put(sp->bitbang.master);
-+	gpio_free(pdata->pin_cs);
-+err_request_cs:
-+	gpio_free(pdata->pin_miso);
-+err_request_miso:
-+	gpio_free(pdata->pin_mosi);
-+err_request_mosi:
-+	gpio_free(pdata->pin_clk);
-+err_request_clk:
-+	kfree(master);
-+
-+err_alloc_master:
-+	return err;
-+}
-+
-+static int __devexit spi_gpio_remove(struct platform_device *pdev)
-+{
-+	struct spi_gpio *sp;
-+	struct spi_gpio_platform_data *pdata;
-+
-+	pdata = pdev->dev.platform_data;
-+	sp = platform_get_drvdata(pdev);
-+
-+	gpio_free(pdata->pin_clk);
-+	gpio_free(pdata->pin_mosi);
-+	gpio_free(pdata->pin_miso);
-+	gpio_free(pdata->pin_cs);
-+	spi_bitbang_stop(&sp->bitbang);
-+	spi_master_put(sp->bitbang.master);
-+
-+	return 0;
-+}
-+
-+static struct platform_driver spi_gpio_driver = {
-+	.driver		= {
-+		.name	= SPI_GPIO_PLATDEV_NAME,
-+		.owner	= THIS_MODULE,
-+	},
-+	.probe		= spi_gpio_probe,
-+	.remove		= __devexit_p(spi_gpio_remove),
-+};
-+
-+int spi_gpio_next_id(void)
-+{
-+	static atomic_t counter = ATOMIC_INIT(-1);
-+
-+	return atomic_inc_return(&counter);
-+}
-+EXPORT_SYMBOL(spi_gpio_next_id);
-+
-+static int __init spi_gpio_init(void)
-+{
-+	int err;
-+
-+	err = platform_driver_register(&spi_gpio_driver);
-+	if (err)
-+		printk(KERN_ERR "spi-gpio: register failed: %d\n", err);
-+
-+	return err;
-+}
-+module_init(spi_gpio_init);
-+
-+static void __exit spi_gpio_exit(void)
-+{
-+	platform_driver_unregister(&spi_gpio_driver);
-+}
-+module_exit(spi_gpio_exit);
-+
-+MODULE_AUTHOR("Piot Skamruk <piotr.skamruk at gmail.com>");
-+MODULE_AUTHOR("Michael Buesch");
-+MODULE_DESCRIPTION("Platform independent GPIO bitbanging SPI driver");
-+MODULE_LICENSE("GPL v2");
---- a/drivers/spi/Kconfig
-+++ b/drivers/spi/Kconfig
-@@ -116,6 +116,15 @@ config SPI_GPIO
- 	  GPIO operations, you should be able to leverage that for better
- 	  speed with a custom version of this driver; see the source code.
- 
-+config SPI_GPIO_OLD
-+	tristate "Old GPIO API based bitbanging SPI controller (DEPRECATED)"
-+	depends on SPI_MASTER && GENERIC_GPIO
-+	select SPI_BITBANG
-+	help
-+	  This code is deprecated. Please use the new mainline SPI-GPIO driver.
-+
-+	  If unsure, say N.
-+
- config SPI_IMX
- 	tristate "Freescale iMX SPI controller"
- 	depends on ARCH_MX1 && EXPERIMENTAL
---- a/drivers/spi/Makefile
-+++ b/drivers/spi/Makefile
-@@ -17,6 +17,7 @@ obj-$(CONFIG_SPI_BITBANG)		+= spi_bitban
- obj-$(CONFIG_SPI_AU1550)		+= au1550_spi.o
- obj-$(CONFIG_SPI_BUTTERFLY)		+= spi_butterfly.o
- obj-$(CONFIG_SPI_GPIO)			+= spi_gpio.o
-+obj-$(CONFIG_SPI_GPIO_OLD)		+= spi_gpio_old.o
- obj-$(CONFIG_SPI_IMX)			+= spi_imx.o
- obj-$(CONFIG_SPI_LM70_LLP)		+= spi_lm70llp.o
- obj-$(CONFIG_SPI_PXA2XX)		+= pxa2xx_spi.o
diff --git a/target/linux/generic-2.6/patches-2.6.31/922-gpiommc.patch b/target/linux/generic-2.6/patches-2.6.31/922-gpiommc.patch
deleted file mode 100644
index 10d09624d..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/922-gpiommc.patch
+++ /dev/null
@@ -1,843 +0,0 @@
---- /dev/null
-+++ b/drivers/mmc/host/gpiommc.c
-@@ -0,0 +1,608 @@
-+/*
-+ * Driver an MMC/SD card on a bitbanging GPIO SPI bus.
-+ * This module hooks up the mmc_spi and spi_gpio modules and also
-+ * provides a configfs interface.
-+ *
-+ * Copyright 2008 Michael Buesch <mb@bu3sch.de>
-+ *
-+ * Licensed under the GNU/GPL. See COPYING for details.
-+ */
-+
-+#include <linux/mmc/gpiommc.h>
-+#include <linux/platform_device.h>
-+#include <linux/list.h>
-+#include <linux/mutex.h>
-+#include <linux/spi/spi_gpio_old.h>
-+#include <linux/configfs.h>
-+#include <linux/gpio.h>
-+#include <asm/atomic.h>
-+
-+
-+#define PFX				"gpio-mmc: "
-+
-+
-+struct gpiommc_device {
-+	struct platform_device *pdev;
-+	struct platform_device *spi_pdev;
-+	struct spi_board_info boardinfo;
-+};
-+
-+
-+MODULE_DESCRIPTION("GPIO based MMC driver");
-+MODULE_AUTHOR("Michael Buesch");
-+MODULE_LICENSE("GPL");
-+
-+
-+static int gpiommc_boardinfo_setup(struct spi_board_info *bi,
-+				   struct spi_master *master,
-+				   void *data)
-+{
-+	struct gpiommc_device *d = data;
-+	struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
-+
-+	/* Bind the SPI master to the MMC-SPI host driver. */
-+	strlcpy(bi->modalias, "mmc_spi", sizeof(bi->modalias));
-+
-+	bi->max_speed_hz = pdata->max_bus_speed;
-+	bi->bus_num = master->bus_num;
-+	bi->mode = pdata->mode;
-+
-+	return 0;
-+}
-+
-+static int gpiommc_probe(struct platform_device *pdev)
-+{
-+	struct gpiommc_platform_data *mmc_pdata = pdev->dev.platform_data;
-+	struct spi_gpio_platform_data spi_pdata;
-+	struct gpiommc_device *d;
-+	int err;
-+
-+	err = -ENXIO;
-+	if (!mmc_pdata)
-+		goto error;
-+
-+#ifdef CONFIG_MMC_SPI_MODULE
-+	err = request_module("mmc_spi");
-+	if (err) {
-+		printk(KERN_WARNING PFX
-+		       "Failed to request mmc_spi module.\n");
-+	}
-+#endif /* CONFIG_MMC_SPI_MODULE */
-+
-+	/* Allocate the GPIO-MMC device */
-+	err = -ENOMEM;
-+	d = kzalloc(sizeof(*d), GFP_KERNEL);
-+	if (!d)
-+		goto error;
-+	d->pdev = pdev;
-+
-+	/* Create the SPI-GPIO device */
-+	d->spi_pdev = platform_device_alloc(SPI_GPIO_PLATDEV_NAME,
-+					    spi_gpio_next_id());
-+	if (!d->spi_pdev)
-+		goto err_free_d;
-+
-+	memset(&spi_pdata, 0, sizeof(spi_pdata));
-+	spi_pdata.pin_clk = mmc_pdata->pins.gpio_clk;
-+	spi_pdata.pin_miso = mmc_pdata->pins.gpio_do;
-+	spi_pdata.pin_mosi = mmc_pdata->pins.gpio_di;
-+	spi_pdata.pin_cs = mmc_pdata->pins.gpio_cs;
-+	spi_pdata.cs_activelow = mmc_pdata->pins.cs_activelow;
-+	spi_pdata.no_spi_delay = mmc_pdata->no_spi_delay;
-+	spi_pdata.boardinfo_setup = gpiommc_boardinfo_setup;
-+	spi_pdata.boardinfo_setup_data = d;
-+
-+	err = platform_device_add_data(d->spi_pdev, &spi_pdata,
-+				       sizeof(spi_pdata));
-+	if (err)
-+		goto err_free_pdev;
-+	err = platform_device_add(d->spi_pdev);
-+	if (err)
-+		goto err_free_pdata;
-+	platform_set_drvdata(pdev, d);
-+
-+	printk(KERN_INFO PFX "MMC-Card \"%s\" "
-+	       "attached to GPIO pins di=%u, do=%u, clk=%u, cs=%u\n",
-+	       mmc_pdata->name, mmc_pdata->pins.gpio_di,
-+	       mmc_pdata->pins.gpio_do,
-+	       mmc_pdata->pins.gpio_clk,
-+	       mmc_pdata->pins.gpio_cs);
-+
-+	return 0;
-+
-+err_free_pdata:
-+	kfree(d->spi_pdev->dev.platform_data);
-+	d->spi_pdev->dev.platform_data = NULL;
-+err_free_pdev:
-+	platform_device_put(d->spi_pdev);
-+err_free_d:
-+	kfree(d);
-+error:
-+	return err;
-+}
-+
-+static int gpiommc_remove(struct platform_device *pdev)
-+{
-+	struct gpiommc_device *d = platform_get_drvdata(pdev);
-+	struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
-+
-+	platform_device_unregister(d->spi_pdev);
-+	printk(KERN_INFO PFX "GPIO based MMC-Card \"%s\" removed\n",
-+	       pdata->name);
-+	platform_device_put(d->spi_pdev);
-+
-+	return 0;
-+}
-+
-+#ifdef CONFIG_GPIOMMC_CONFIGFS
-+
-+/* A device that was created through configfs */
-+struct gpiommc_configfs_device {
-+	struct config_item item;
-+	/* The platform device, after registration. */
-+	struct platform_device *pdev;
-+	/* The configuration */
-+	struct gpiommc_platform_data pdata;
-+};
-+
-+#define GPIO_INVALID	-1
-+
-+static inline bool gpiommc_is_registered(struct gpiommc_configfs_device *dev)
-+{
-+	return (dev->pdev != NULL);
-+}
-+
-+static inline struct gpiommc_configfs_device *ci_to_gpiommc(struct config_item *item)
-+{
-+	return item ? container_of(item, struct gpiommc_configfs_device, item) : NULL;
-+}
-+
-+static struct configfs_attribute gpiommc_attr_DI = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_data_in",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_DO = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_data_out",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_CLK = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_clock",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_CS = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_chipselect",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_CS_activelow = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_chipselect_activelow",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_spimode = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "spi_mode",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_spidelay = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "spi_delay",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_max_bus_speed = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "max_bus_speed",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_register = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "register",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute *gpiommc_config_attrs[] = {
-+	&gpiommc_attr_DI,
-+	&gpiommc_attr_DO,
-+	&gpiommc_attr_CLK,
-+	&gpiommc_attr_CS,
-+	&gpiommc_attr_CS_activelow,
-+	&gpiommc_attr_spimode,
-+	&gpiommc_attr_spidelay,
-+	&gpiommc_attr_max_bus_speed,
-+	&gpiommc_attr_register,
-+	NULL,
-+};
-+
-+static ssize_t gpiommc_config_attr_show(struct config_item *item,
-+					struct configfs_attribute *attr,
-+					char *page)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+	ssize_t count = 0;
-+	unsigned int gpio;
-+	int err = 0;
-+
-+	if (attr == &gpiommc_attr_DI) {
-+		gpio = dev->pdata.pins.gpio_di;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_DO) {
-+		gpio = dev->pdata.pins.gpio_do;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CLK) {
-+		gpio = dev->pdata.pins.gpio_clk;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS) {
-+		gpio = dev->pdata.pins.gpio_cs;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS_activelow) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 dev->pdata.pins.cs_activelow);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spimode) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 dev->pdata.mode);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spidelay) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 !dev->pdata.no_spi_delay);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_max_bus_speed) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 dev->pdata.max_bus_speed);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_register) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 gpiommc_is_registered(dev));
-+		goto out;
-+	}
-+	WARN_ON(1);
-+	err = -ENOSYS;
-+out:
-+	return err ? err : count;
-+}
-+
-+static int gpiommc_do_register(struct gpiommc_configfs_device *dev,
-+			       const char *name)
-+{
-+	int err;
-+
-+	if (gpiommc_is_registered(dev))
-+		return 0;
-+
-+	if (!gpio_is_valid(dev->pdata.pins.gpio_di) ||
-+	    !gpio_is_valid(dev->pdata.pins.gpio_do) ||
-+	    !gpio_is_valid(dev->pdata.pins.gpio_clk) ||
-+	    !gpio_is_valid(dev->pdata.pins.gpio_cs)) {
-+		printk(KERN_ERR PFX
-+		       "configfs: Invalid GPIO pin number(s)\n");
-+		return -EINVAL;
-+	}
-+
-+	strlcpy(dev->pdata.name, name,
-+		sizeof(dev->pdata.name));
-+
-+	dev->pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME,
-+					  gpiommc_next_id());
-+	if (!dev->pdev)
-+		return -ENOMEM;
-+	err = platform_device_add_data(dev->pdev, &dev->pdata,
-+				       sizeof(dev->pdata));
-+	if (err) {
-+		platform_device_put(dev->pdev);
-+		return err;
-+	}
-+	err = platform_device_add(dev->pdev);
-+	if (err) {
-+		platform_device_put(dev->pdev);
-+		return err;
-+	}
-+
-+	return 0;
-+}
-+
-+static void gpiommc_do_unregister(struct gpiommc_configfs_device *dev)
-+{
-+	if (!gpiommc_is_registered(dev))
-+		return;
-+
-+	platform_device_unregister(dev->pdev);
-+	dev->pdev = NULL;
-+}
-+
-+static ssize_t gpiommc_config_attr_store(struct config_item *item,
-+					 struct configfs_attribute *attr,
-+					 const char *page, size_t count)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+	int err = -EINVAL;
-+	unsigned long data;
-+
-+	if (attr == &gpiommc_attr_register) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data == 1)
-+			err = gpiommc_do_register(dev, item->ci_name);
-+		if (data == 0) {
-+			gpiommc_do_unregister(dev);
-+			err = 0;
-+		}
-+		goto out;
-+	}
-+
-+	if (gpiommc_is_registered(dev)) {
-+		/* The rest of the config parameters can only be set
-+		 * as long as the device is not registered, yet. */
-+		err = -EBUSY;
-+		goto out;
-+	}
-+
-+	if (attr == &gpiommc_attr_DI) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_di = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_DO) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_do = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CLK) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_clk = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_cs = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS_activelow) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data != 0 && data != 1)
-+			goto out;
-+		dev->pdata.pins.cs_activelow = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spimode) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		switch (data) {
-+		case 0:
-+			dev->pdata.mode = SPI_MODE_0;
-+			break;
-+		case 1:
-+			dev->pdata.mode = SPI_MODE_1;
-+			break;
-+		case 2:
-+			dev->pdata.mode = SPI_MODE_2;
-+			break;
-+		case 3:
-+			dev->pdata.mode = SPI_MODE_3;
-+			break;
-+		default:
-+			goto out;
-+		}
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spidelay) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data != 0 && data != 1)
-+			goto out;
-+		dev->pdata.no_spi_delay = !data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_max_bus_speed) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data > UINT_MAX)
-+			goto out;
-+		dev->pdata.max_bus_speed = data;
-+		err = 0;
-+		goto out;
-+	}
-+	WARN_ON(1);
-+	err = -ENOSYS;
-+out:
-+	return err ? err : count;
-+}
-+
-+static void gpiommc_config_item_release(struct config_item *item)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+
-+	kfree(dev);
-+}
-+
-+static struct configfs_item_operations gpiommc_config_item_ops = {
-+	.release		= gpiommc_config_item_release,
-+	.show_attribute		= gpiommc_config_attr_show,
-+	.store_attribute	= gpiommc_config_attr_store,
-+};
-+
-+static struct config_item_type gpiommc_dev_ci_type = {
-+	.ct_item_ops	= &gpiommc_config_item_ops,
-+	.ct_attrs	= gpiommc_config_attrs,
-+	.ct_owner	= THIS_MODULE,
-+};
-+
-+static struct config_item *gpiommc_make_item(struct config_group *group,
-+					     const char *name)
-+{
-+	struct gpiommc_configfs_device *dev;
-+
-+	if (strlen(name) > GPIOMMC_MAX_NAMELEN) {
-+		printk(KERN_ERR PFX "configfs: device name too long\n");
-+		return NULL;
-+	}
-+
-+	dev = kzalloc(sizeof(*dev), GFP_KERNEL);
-+	if (!dev)
-+		return NULL;
-+
-+	config_item_init_type_name(&dev->item, name,
-+				   &gpiommc_dev_ci_type);
-+
-+	/* Assign default configuration */
-+	dev->pdata.pins.gpio_di = GPIO_INVALID;
-+	dev->pdata.pins.gpio_do = GPIO_INVALID;
-+	dev->pdata.pins.gpio_clk = GPIO_INVALID;
-+	dev->pdata.pins.gpio_cs = GPIO_INVALID;
-+	dev->pdata.pins.cs_activelow = 1;
-+	dev->pdata.mode = SPI_MODE_0;
-+	dev->pdata.no_spi_delay = 0;
-+	dev->pdata.max_bus_speed = 5000000; /* 5 MHz */
-+
-+	return &(dev->item);
-+}
-+
-+static void gpiommc_drop_item(struct config_group *group,
-+			      struct config_item *item)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+
-+	gpiommc_do_unregister(dev);
-+	kfree(dev);
-+}
-+
-+static struct configfs_group_operations gpiommc_ct_group_ops = {
-+	.make_item	= gpiommc_make_item,
-+	.drop_item	= gpiommc_drop_item,
-+};
-+
-+static struct config_item_type gpiommc_ci_type = {
-+	.ct_group_ops	= &gpiommc_ct_group_ops,
-+	.ct_owner	= THIS_MODULE,
-+};
-+
-+static struct configfs_subsystem gpiommc_subsys = {
-+	.su_group = {
-+		.cg_item = {
-+			.ci_namebuf = GPIOMMC_PLATDEV_NAME,
-+			.ci_type = &gpiommc_ci_type,
-+		},
-+	},
-+	.su_mutex = __MUTEX_INITIALIZER(gpiommc_subsys.su_mutex),
-+};
-+
-+#endif /* CONFIG_GPIOMMC_CONFIGFS */
-+
-+static struct platform_driver gpiommc_plat_driver = {
-+	.probe	= gpiommc_probe,
-+	.remove	= gpiommc_remove,
-+	.driver	= {
-+		.name	= GPIOMMC_PLATDEV_NAME,
-+		.owner	= THIS_MODULE,
-+	},
-+};
-+
-+int gpiommc_next_id(void)
-+{
-+	static atomic_t counter = ATOMIC_INIT(-1);
-+
-+	return atomic_inc_return(&counter);
-+}
-+EXPORT_SYMBOL(gpiommc_next_id);
-+
-+static int __init gpiommc_modinit(void)
-+{
-+	int err;
-+
-+	err = platform_driver_register(&gpiommc_plat_driver);
-+	if (err)
-+		return err;
-+
-+#ifdef CONFIG_GPIOMMC_CONFIGFS
-+	config_group_init(&gpiommc_subsys.su_group);
-+	err = configfs_register_subsystem(&gpiommc_subsys);
-+	if (err) {
-+		platform_driver_unregister(&gpiommc_plat_driver);
-+		return err;
-+	}
-+#endif /* CONFIG_GPIOMMC_CONFIGFS */
-+
-+	return 0;
-+}
-+module_init(gpiommc_modinit);
-+
-+static void __exit gpiommc_modexit(void)
-+{
-+#ifdef CONFIG_GPIOMMC_CONFIGFS
-+	configfs_unregister_subsystem(&gpiommc_subsys);
-+#endif
-+	platform_driver_unregister(&gpiommc_plat_driver);
-+}
-+module_exit(gpiommc_modexit);
---- a/drivers/mmc/host/Kconfig
-+++ b/drivers/mmc/host/Kconfig
-@@ -278,6 +278,31 @@ config MMC_TMIO
- 	  This provides support for the SD/MMC cell found in TC6393XB,
- 	  T7L66XB and also HTC ASIC3
- 
-+config GPIOMMC
-+	tristate "MMC/SD over GPIO-based SPI"
-+	depends on MMC && MMC_SPI && SPI_GPIO_OLD
-+	help
-+	  This driver hooks up the mmc_spi and spi_gpio modules so that
-+	  MMC/SD cards can be used on a GPIO based bus by bitbanging
-+	  the SPI protocol in software.
-+
-+	  This driver provides a configfs interface to dynamically create
-+	  and destroy GPIO-based MMC/SD card devices. It also provides
-+	  a platform device interface API.
-+	  See Documentation/gpiommc.txt for details.
-+
-+	  The module will be called gpiommc.
-+
-+	  If unsure, say N.
-+
-+config GPIOMMC_CONFIGFS
-+	bool
-+	depends on GPIOMMC && CONFIGFS_FS
-+	default y
-+	help
-+	  This option automatically enables configfs support for gpiommc
-+	  if configfs is available.
-+
- config MMC_CB710
- 	tristate "ENE CB710 MMC/SD Interface support"
- 	depends on PCI
---- a/drivers/mmc/host/Makefile
-+++ b/drivers/mmc/host/Makefile
-@@ -33,6 +33,7 @@ obj-$(CONFIG_MMC_SDRICOH_CS)	+= sdricoh_
- obj-$(CONFIG_MMC_TMIO)		+= tmio_mmc.o
- obj-$(CONFIG_MMC_CB710)	+= cb710-mmc.o
- obj-$(CONFIG_MMC_VIA_SDMMC)	+= via-sdmmc.o
-+obj-$(CONFIG_GPIOMMC)		+= gpiommc.o
- 
- ifeq ($(CONFIG_CB710_DEBUG),y)
- 	CFLAGS-cb710-mmc	+= -DDEBUG
---- /dev/null
-+++ b/include/linux/mmc/gpiommc.h
-@@ -0,0 +1,71 @@
-+/*
-+ * Device driver for MMC/SD cards driven over a GPIO bus.
-+ *
-+ * Copyright (c) 2008 Michael Buesch
-+ *
-+ * Licensed under the GNU/GPL version 2.
-+ */
-+#ifndef LINUX_GPIOMMC_H_
-+#define LINUX_GPIOMMC_H_
-+
-+#include <linux/types.h>
-+
-+
-+#define GPIOMMC_MAX_NAMELEN		15
-+#define GPIOMMC_MAX_NAMELEN_STR		__stringify(GPIOMMC_MAX_NAMELEN)
-+
-+/**
-+ * struct gpiommc_pins - Hardware pin assignments
-+ *
-+ * @gpio_di: The GPIO number of the DATA IN pin
-+ * @gpio_do: The GPIO number of the DATA OUT pin
-+ * @gpio_clk: The GPIO number of the CLOCK pin
-+ * @gpio_cs: The GPIO number of the CHIPSELECT pin
-+ * @cs_activelow: If true, the chip is considered selected if @gpio_cs is low.
-+ */
-+struct gpiommc_pins {
-+	unsigned int gpio_di;
-+	unsigned int gpio_do;
-+	unsigned int gpio_clk;
-+	unsigned int gpio_cs;
-+	bool cs_activelow;
-+};
-+
-+/**
-+ * struct gpiommc_platform_data - Platform data for a MMC-over-SPI-GPIO device.
-+ *
-+ * @name: The unique name string of the device.
-+ * @pins: The hardware pin assignments.
-+ * @mode: The hardware mode. This is either SPI_MODE_0,
-+ *        SPI_MODE_1, SPI_MODE_2 or SPI_MODE_3. See the SPI documentation.
-+ * @no_spi_delay: Do not use delays in the lowlevel SPI bitbanging code.
-+ *                This is not standards compliant, but may be required for some
-+ *                embedded machines to gain reasonable speed.
-+ * @max_bus_speed: The maximum speed of the SPI bus, in Hertz.
-+ */
-+struct gpiommc_platform_data {
-+	char name[GPIOMMC_MAX_NAMELEN + 1];
-+	struct gpiommc_pins pins;
-+	u8 mode;
-+	bool no_spi_delay;
-+	unsigned int max_bus_speed;
-+};
-+
-+/**
-+ * GPIOMMC_PLATDEV_NAME - The platform device name string.
-+ *
-+ * The name string that has to be used for platform_device_alloc
-+ * when allocating a gpiommc device.
-+ */
-+#define GPIOMMC_PLATDEV_NAME	"gpiommc"
-+
-+/**
-+ * gpiommc_next_id - Get another platform device ID number.
-+ *
-+ * This returns the next platform device ID number that has to be used
-+ * for platform_device_alloc. The ID is opaque and should not be used for
-+ * anything else.
-+ */
-+int gpiommc_next_id(void);
-+
-+#endif /* LINUX_GPIOMMC_H_ */
---- /dev/null
-+++ b/Documentation/gpiommc.txt
-@@ -0,0 +1,97 @@
-+GPIOMMC - Driver for an MMC/SD card on a bitbanging GPIO SPI bus
-+================================================================
-+
-+The gpiommc module hooks up the mmc_spi and spi_gpio modules for running an
-+MMC or SD card on GPIO pins.
-+
-+Two interfaces for registering a new MMC/SD card device are provided:
-+A static platform-device based mechanism and a dynamic configfs based interface.
-+
-+
-+Registering devices via platform-device
-+=======================================
-+
-+The platform-device interface is used for registering MMC/SD devices that are
-+part of the hardware platform. This is most useful only for embedded machines
-+with MMC/SD devices statically connected to the platform GPIO bus.
-+
-+The data structures are declared in <linux/mmc/gpiommc.h>.
-+
-+To register a new device, define an instance of struct gpiommc_platform_data.
-+This structure holds any information about how the device is hooked up to the
-+GPIO pins and what hardware modes the device supports. See the docbook-style
-+documentation in the header file for more information on the struct fields.
-+
-+Then allocate a new instance of a platform device by doing:
-+
-+	pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME, gpiommc_next_id());
-+
-+This will allocate the platform device data structures and hook it up to the
-+gpiommc driver.
-+Then add the gpiommc_platform_data to the platform device.
-+
-+	err = platform_device_add_data(pdev, pdata, sizeof(struct gpiommc_platform_data));
-+
-+You may free the local instance of struct gpiommc_platform_data now. (So the
-+struct may be allocated on the stack, too).
-+Now simply register the platform device.
-+
-+	err = platform_device_add(pdev);
-+
-+Done. The gpiommc probe routine will be invoked now and you should see a kernel
-+log message for the added device.
-+
-+
-+Registering devices via configfs
-+================================
-+
-+MMC/SD cards connected via GPIO often are a pretty dynamic thing, as for example
-+selfmade hacks for soldering an MMC/SD card to standard GPIO pins on embedded
-+hardware are a common situation.
-+So we provide a dynamic interface to conveniently handle adding and removing
-+devices from userspace, without the need to recompile the kernel.
-+
-+The "gpiommc" subdirectory at the configfs mountpoint is used for handling
-+the dynamic configuration.
-+
-+To create a new device, it must first be allocated with mkdir.
-+The following command will allocate a device named "my_mmc":
-+	mkdir /config/gpiommc/my_mmc
-+
-+There are several configuration files available in the new
-+/config/gpiommc/my_mmc/ directory:
-+
-+gpio_data_in			= The SPI data-IN GPIO pin number.
-+gpio_data_out			= The SPI data-OUT GPIO pin number.
-+gpio_clock			= The SPI Clock GPIO pin number.
-+gpio_chipselect			= The SPI Chipselect GPIO pin number.
-+gpio_chipselect_activelow	= Boolean. If 0, Chipselect is active-HIGH.
-+				  If 1, Chipselect is active-LOW.
-+spi_mode			= The SPI data mode. Can be 0-3.
-+spi_delay			= Enable all delays in the lowlevel bitbanging.
-+max_bus_speed			= The maximum SPI bus speed. In Hertz.
-+
-+register			= Not a configuration parameter.
-+				  Used to register the configured card
-+				  with the kernel.
-+
-+The device must first get configured and then registered by writing "1" to
-+the "register" file.
-+The configuration parameters "gpio_data_in", "gpio_data_out", "gpio_clock"
-+and "gpio_chipselect" are essential and _must_ be configured before writing
-+"1" to the "register" file. The registration will fail, otherwise.
-+
-+The default values for the other parameters are:
-+gpio_chipselect_activelow	= 1		(CS active-LOW)
-+spi_mode			= 0		(SPI_MODE_0)
-+spi_delay			= 1		(enabled)
-+max_bus_speed			= 5000000	(5 Mhz)
-+
-+Configuration values can not be changed after registration. To unregister
-+the device, write a "0" to the "register" file. The configuration can be
-+changed again after unregistering.
-+
-+To completely remove the device, simply rmdir the directory
-+(/config/gpiommc/my_mmc in this example).
-+There's no need to first unregister the device before removing it. That will
-+be done automatically.
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -2266,6 +2266,11 @@ T:	git git://git.kernel.org/pub/scm/linu
- S:	Maintained
- F:	drivers/media/video/gspca/
- 
-+GPIOMMC DRIVER
-+P:	Michael Buesch
-+M:	mb@bu3sch.de
-+S:	Maintained
-+
- HARDWARE MONITORING
- L:	lm-sensors@lm-sensors.org
- W:	http://www.lm-sensors.org/
diff --git a/target/linux/generic-2.6/patches-2.6.31/923-gpiommc-configfs-locking.patch b/target/linux/generic-2.6/patches-2.6.31/923-gpiommc-configfs-locking.patch
deleted file mode 100644
index 2e4e820b2..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/923-gpiommc-configfs-locking.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-The gpiommc configfs context structure needs locking, as configfs
-does not lock access between files.
-
---- a/drivers/mmc/host/gpiommc.c
-+++ b/drivers/mmc/host/gpiommc.c
-@@ -143,6 +143,8 @@ struct gpiommc_configfs_device {
- 	struct platform_device *pdev;
- 	/* The configuration */
- 	struct gpiommc_platform_data pdata;
-+	/* Mutex to protect this structure */
-+	struct mutex mutex;
- };
- 
- #define GPIO_INVALID	-1
-@@ -233,6 +235,8 @@ static ssize_t gpiommc_config_attr_show(
- 	unsigned int gpio;
- 	int err = 0;
- 
-+	mutex_lock(&dev->mutex);
-+
- 	if (attr == &gpiommc_attr_DI) {
- 		gpio = dev->pdata.pins.gpio_di;
- 		if (gpio == GPIO_INVALID)
-@@ -293,6 +297,8 @@ static ssize_t gpiommc_config_attr_show(
- 	WARN_ON(1);
- 	err = -ENOSYS;
- out:
-+	mutex_unlock(&dev->mutex);
-+
- 	return err ? err : count;
- }
- 
-@@ -352,6 +358,8 @@ static ssize_t gpiommc_config_attr_store
- 	int err = -EINVAL;
- 	unsigned long data;
- 
-+	mutex_lock(&dev->mutex);
-+
- 	if (attr == &gpiommc_attr_register) {
- 		err = strict_strtoul(page, 10, &data);
- 		if (err)
-@@ -477,6 +485,8 @@ static ssize_t gpiommc_config_attr_store
- 	WARN_ON(1);
- 	err = -ENOSYS;
- out:
-+	mutex_unlock(&dev->mutex);
-+
- 	return err ? err : count;
- }
- 
-@@ -513,6 +523,7 @@ static struct config_item *gpiommc_make_
- 	if (!dev)
- 		return NULL;
- 
-+	mutex_init(&dev->mutex);
- 	config_item_init_type_name(&dev->item, name,
- 				   &gpiommc_dev_ci_type);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.31/924-cs5535_gpio.patch b/target/linux/generic-2.6/patches-2.6.31/924-cs5535_gpio.patch
deleted file mode 100644
index 453affe58..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/924-cs5535_gpio.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- a/drivers/char/cs5535_gpio.c
-+++ b/drivers/char/cs5535_gpio.c
-@@ -15,6 +15,7 @@
- #include <linux/kernel.h>
- #include <linux/init.h>
- #include <linux/cdev.h>
-+#include <linux/device.h>
- #include <linux/ioport.h>
- #include <linux/pci.h>
- #include <linux/smp_lock.h>
-@@ -48,6 +49,7 @@ static struct pci_device_id divil_pci[] 
- MODULE_DEVICE_TABLE(pci, divil_pci);
- 
- static struct cdev cs5535_gpio_cdev;
-+static struct class *cs5535_gpio_class;
- 
- /* reserve 32 entries even though some aren't usable */
- #define CS5535_GPIO_COUNT	32
-@@ -66,9 +68,14 @@ static struct gpio_regmap rm[] =
- 	{ 0x30, 0x00, '1', '0' },	/* GPIOx_READ_BACK / GPIOx_OUT_VAL */
- 	{ 0x20, 0x20, 'I', 'i' },	/* GPIOx_IN_EN */
- 	{ 0x04, 0x04, 'O', 'o' },	/* GPIOx_OUT_EN */
-+	{ 0x10, 0x10, 'A', 'a' },	/* GPIOx_OUT_AUX1_SEL */
-+	{ 0x14, 0x14, 'B', 'b' },	/* GPIOx_OUT_AUX2_SEL */
- 	{ 0x08, 0x08, 't', 'T' },	/* GPIOx_OUT_OD_EN */
- 	{ 0x18, 0x18, 'P', 'p' },	/* GPIOx_OUT_PU_EN */
- 	{ 0x1c, 0x1c, 'D', 'd' },	/* GPIOx_OUT_PD_EN */
-+	{ 0x24, 0x24, 'N', 'n' },	/* GPIOx_IN_INV_EN */
-+	{ 0x0c, 0x0c, 'X', 'x' },	/* GPIOx_OUT_INV_EN */
-+	{ 0x00, 0x00, 'H', 'L' },	/* GPIOx_OUT_VAL */
- };
- 
- 
-@@ -177,7 +184,7 @@ static int __init cs5535_gpio_init(void)
- {
- 	dev_t	dev_id;
- 	u32	low, hi;
--	int	retval;
-+	int	retval, i;
- 
- 	if (pci_dev_present(divil_pci) == 0) {
- 		printk(KERN_WARNING NAME ": DIVIL not found\n");
-@@ -232,23 +239,54 @@ static int __init cs5535_gpio_init(void)
- 		major = MAJOR(dev_id);
- 	}
- 
--	if (retval) {
--		release_region(gpio_base, CS5535_GPIO_SIZE);
--		return -1;
--	}
-+	if (retval)
-+		goto error;
- 
- 	printk(KERN_DEBUG NAME ": base=%#x mask=%#lx major=%d\n",
- 	       gpio_base, mask, major);
- 
- 	cdev_init(&cs5535_gpio_cdev, &cs5535_gpio_fops);
--	cdev_add(&cs5535_gpio_cdev, dev_id, CS5535_GPIO_COUNT);
-+	retval = cdev_add(&cs5535_gpio_cdev, dev_id, CS5535_GPIO_COUNT);
-+	if (retval) {
-+		kobject_put(&cs5535_gpio_cdev.kobj);
-+		goto error_region;
-+	}
-+
-+	cs5535_gpio_class = class_create(THIS_MODULE, "cs5535_gpio");
-+	if (IS_ERR(cs5535_gpio_class)) {
-+		printk(KERN_ERR "Error creating cs5535_gpio class\n");
-+		cdev_del(&cs5535_gpio_cdev);
-+		retval = PTR_ERR(cs5535_gpio_class);
-+		goto error_region;
-+	}
-+
-+	for (i = 0; i < CS5535_GPIO_COUNT; i++) {
-+		if (mask & (1<<i)) {
-+			device_create(cs5535_gpio_class, NULL, MKDEV(major, i), NULL, "cs5535_gpio%d", i);
-+		}
-+	}
- 
- 	return 0;
-+
-+error_region:
-+	unregister_chrdev_region(dev_id, CS5535_GPIO_COUNT);
-+error:
-+	release_region(gpio_base, CS5535_GPIO_SIZE);
-+	return retval;
- }
- 
- static void __exit cs5535_gpio_cleanup(void)
- {
- 	dev_t dev_id = MKDEV(major, 0);
-+	int i;
-+
-+	for (i = 0; i < CS5535_GPIO_COUNT; i++) {
-+		if (mask & (1<<i)) {
-+			device_destroy(cs5535_gpio_class, MKDEV(major, i));
-+		}
-+	}
-+
-+	class_destroy(cs5535_gpio_class);
- 
- 	cdev_del(&cs5535_gpio_cdev);
- 	unregister_chrdev_region(dev_id, CS5535_GPIO_COUNT);
diff --git a/target/linux/generic-2.6/patches-2.6.31/925-modify-i2c-gpio-initcall-level.patch b/target/linux/generic-2.6/patches-2.6.31/925-modify-i2c-gpio-initcall-level.patch
deleted file mode 100644
index 1708e33d0..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/925-modify-i2c-gpio-initcall-level.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/drivers/i2c/busses/i2c-gpio.c
-+++ b/drivers/i2c/busses/i2c-gpio.c
-@@ -210,7 +210,7 @@ static int __init i2c_gpio_init(void)
- 
- 	return ret;
- }
--module_init(i2c_gpio_init);
-+subsys_initcall(i2c_gpio_init);
- 
- static void __exit i2c_gpio_exit(void)
- {
diff --git a/target/linux/generic-2.6/patches-2.6.31/940-wireless_mesh_header.patch b/target/linux/generic-2.6/patches-2.6.31/940-wireless_mesh_header.patch
deleted file mode 100644
index 73e49a0ff..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/940-wireless_mesh_header.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -100,7 +100,7 @@ struct wireless_dev;
-  */
- 
- #if defined(CONFIG_WLAN_80211) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
--# if defined(CONFIG_MAC80211_MESH)
-+# if 1 || defined(CONFIG_MAC80211_MESH)
- #  define LL_MAX_HEADER 128
- # else
- #  define LL_MAX_HEADER 96
---- a/include/linux/skbuff.h
-+++ b/include/linux/skbuff.h
-@@ -389,7 +389,7 @@ struct sk_buff {
- #ifdef CONFIG_IPV6_NDISC_NODETYPE
- 	__u8			ndisc_nodetype:2;
- #endif
--#if defined(CONFIG_MAC80211) || defined(CONFIG_MAC80211_MODULE)
-+#if 1
- 	__u8			do_not_encrypt:1;
- #endif
- 	kmemcheck_bitfield_end(flags2);
diff --git a/target/linux/generic-2.6/patches-2.6.31/941-ssb_update.patch b/target/linux/generic-2.6/patches-2.6.31/941-ssb_update.patch
deleted file mode 100644
index c3f179edb..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/941-ssb_update.patch
+++ /dev/null
@@ -1,505 +0,0 @@
---- a/drivers/ssb/driver_chipcommon_pmu.c
-+++ b/drivers/ssb/driver_chipcommon_pmu.c
-@@ -28,6 +28,21 @@ static void ssb_chipco_pll_write(struct 
- 	chipco_write32(cc, SSB_CHIPCO_PLLCTL_DATA, value);
- }
- 
-+static void ssb_chipco_regctl_maskset(struct ssb_chipcommon *cc,
-+				   u32 offset, u32 mask, u32 set)
-+{
-+	u32 value;
-+
-+	chipco_read32(cc, SSB_CHIPCO_REGCTL_ADDR);
-+	chipco_write32(cc, SSB_CHIPCO_REGCTL_ADDR, offset);
-+	chipco_read32(cc, SSB_CHIPCO_REGCTL_ADDR);
-+	value = chipco_read32(cc, SSB_CHIPCO_REGCTL_DATA);
-+	value &= mask;
-+	value |= set;
-+	chipco_write32(cc, SSB_CHIPCO_REGCTL_DATA, value);
-+	chipco_read32(cc, SSB_CHIPCO_REGCTL_DATA);
-+}
-+
- struct pmu0_plltab_entry {
- 	u16 freq;	/* Crystal frequency in kHz.*/
- 	u8 xf;		/* Crystal frequency value for PMU control */
-@@ -506,3 +521,82 @@ void ssb_pmu_init(struct ssb_chipcommon 
- 	ssb_pmu_pll_init(cc);
- 	ssb_pmu_resources_init(cc);
- }
-+
-+void ssb_pmu_set_ldo_voltage(struct ssb_chipcommon *cc,
-+			     enum ssb_pmu_ldo_volt_id id, u32 voltage)
-+{
-+	struct ssb_bus *bus = cc->dev->bus;
-+	u32 addr, shift, mask;
-+
-+	switch (bus->chip_id) {
-+	case 0x4328:
-+	case 0x5354:
-+		switch (id) {
-+		case LDO_VOLT1:
-+			addr = 2;
-+			shift = 25;
-+			mask = 0xF;
-+			break;
-+		case LDO_VOLT2:
-+			addr = 3;
-+			shift = 1;
-+			mask = 0xF;
-+			break;
-+		case LDO_VOLT3:
-+			addr = 3;
-+			shift = 9;
-+			mask = 0xF;
-+			break;
-+		case LDO_PAREF:
-+			addr = 3;
-+			shift = 17;
-+			mask = 0x3F;
-+			break;
-+		default:
-+			SSB_WARN_ON(1);
-+			return;
-+		}
-+		break;
-+	case 0x4312:
-+		if (SSB_WARN_ON(id != LDO_PAREF))
-+			return;
-+		addr = 0;
-+		shift = 21;
-+		mask = 0x3F;
-+		break;
-+	default:
-+		return;
-+	}
-+
-+	ssb_chipco_regctl_maskset(cc, addr, ~(mask << shift),
-+				  (voltage & mask) << shift);
-+}
-+
-+void ssb_pmu_set_ldo_paref(struct ssb_chipcommon *cc, bool on)
-+{
-+	struct ssb_bus *bus = cc->dev->bus;
-+	int ldo;
-+
-+	switch (bus->chip_id) {
-+	case 0x4312:
-+		ldo = SSB_PMURES_4312_PA_REF_LDO;
-+		break;
-+	case 0x4328:
-+		ldo = SSB_PMURES_4328_PA_REF_LDO;
-+		break;
-+	case 0x5354:
-+		ldo = SSB_PMURES_5354_PA_REF_LDO;
-+		break;
-+	default:
-+		return;
-+	}
-+
-+	if (on)
-+		chipco_set32(cc, SSB_CHIPCO_PMU_MINRES_MSK, 1 << ldo);
-+	else
-+		chipco_mask32(cc, SSB_CHIPCO_PMU_MINRES_MSK, ~(1 << ldo));
-+	chipco_read32(cc, SSB_CHIPCO_PMU_MINRES_MSK); //SPEC FIXME found via mmiotrace - dummy read?
-+}
-+
-+EXPORT_SYMBOL(ssb_pmu_set_ldo_voltage);
-+EXPORT_SYMBOL(ssb_pmu_set_ldo_paref);
---- a/drivers/ssb/main.c
-+++ b/drivers/ssb/main.c
-@@ -469,6 +469,8 @@ static int ssb_devices_register(struct s
- 			dev->parent = &bus->host_pcmcia->dev;
- #endif
- 			break;
-+		case SSB_BUSTYPE_SDIO:
-+			break;
- 		case SSB_BUSTYPE_SSB:
- 			dev->dma_mask = &dev->coherent_dma_mask;
- 			break;
-@@ -1358,8 +1360,10 @@ static int __init ssb_modinit(void)
- 	ssb_buses_lock();
- 	err = ssb_attach_queued_buses();
- 	ssb_buses_unlock();
--	if (err)
-+	if (err) {
- 		bus_unregister(&ssb_bustype);
-+		goto out;
-+	}
- 
- 	err = b43_pci_ssb_bridge_init();
- 	if (err) {
-@@ -1375,7 +1379,7 @@ static int __init ssb_modinit(void)
- 		/* don't fail SSB init because of this */
- 		err = 0;
- 	}
--
-+out:
- 	return err;
- }
- /* ssb must be initialized after PCI but before the ssb drivers.
---- a/drivers/ssb/pci.c
-+++ b/drivers/ssb/pci.c
-@@ -169,8 +169,14 @@ err_pci:
- /* Get the word-offset for a SSB_SPROM_XXX define. */
- #define SPOFF(offset)	(((offset) - SSB_SPROM_BASE) / sizeof(u16))
- /* Helper to extract some _offset, which is one of the SSB_SPROM_XXX defines. */
--#define SPEX(_outvar, _offset, _mask, _shift)	\
-+#define SPEX16(_outvar, _offset, _mask, _shift)	\
- 	out->_outvar = ((in[SPOFF(_offset)] & (_mask)) >> (_shift))
-+#define SPEX32(_outvar, _offset, _mask, _shift)	\
-+	out->_outvar = ((((u32)in[SPOFF((_offset)+2)] << 16 | \
-+			   in[SPOFF(_offset)]) & (_mask)) >> (_shift))
-+#define SPEX(_outvar, _offset, _mask, _shift) \
-+	SPEX16(_outvar, _offset, _mask, _shift)
-+
- 
- static inline u8 ssb_crc8(u8 crc, u8 data)
- {
-@@ -474,12 +480,14 @@ static void sprom_extract_r8(struct ssb_
- 
- 	/* extract the MAC address */
- 	for (i = 0; i < 3; i++) {
--		v = in[SPOFF(SSB_SPROM1_IL0MAC) + i];
-+		v = in[SPOFF(SSB_SPROM8_IL0MAC) + i];
- 		*(((__be16 *)out->il0mac) + i) = cpu_to_be16(v);
- 	}
- 	SPEX(country_code, SSB_SPROM8_CCODE, 0xFFFF, 0);
- 	SPEX(boardflags_lo, SSB_SPROM8_BFLLO, 0xFFFF, 0);
- 	SPEX(boardflags_hi, SSB_SPROM8_BFLHI, 0xFFFF, 0);
-+	SPEX(boardflags2_lo, SSB_SPROM8_BFL2LO, 0xFFFF, 0);
-+	SPEX(boardflags2_hi, SSB_SPROM8_BFL2HI, 0xFFFF, 0);
- 	SPEX(ant_available_a, SSB_SPROM8_ANTAVAIL, SSB_SPROM8_ANTAVAIL_A,
- 	     SSB_SPROM8_ANTAVAIL_A_SHIFT);
- 	SPEX(ant_available_bg, SSB_SPROM8_ANTAVAIL, SSB_SPROM8_ANTAVAIL_BG,
-@@ -490,12 +498,55 @@ static void sprom_extract_r8(struct ssb_
- 	SPEX(maxpwr_a, SSB_SPROM8_MAXP_A, SSB_SPROM8_MAXP_A_MASK, 0);
- 	SPEX(itssi_a, SSB_SPROM8_MAXP_A, SSB_SPROM8_ITSSI_A,
- 	     SSB_SPROM8_ITSSI_A_SHIFT);
-+	SPEX(maxpwr_ah, SSB_SPROM8_MAXP_AHL, SSB_SPROM8_MAXP_AH_MASK, 0);
-+	SPEX(maxpwr_al, SSB_SPROM8_MAXP_AHL, SSB_SPROM8_MAXP_AL_MASK,
-+	     SSB_SPROM8_MAXP_AL_SHIFT);
- 	SPEX(gpio0, SSB_SPROM8_GPIOA, SSB_SPROM8_GPIOA_P0, 0);
- 	SPEX(gpio1, SSB_SPROM8_GPIOA, SSB_SPROM8_GPIOA_P1,
- 	     SSB_SPROM8_GPIOA_P1_SHIFT);
- 	SPEX(gpio2, SSB_SPROM8_GPIOB, SSB_SPROM8_GPIOB_P2, 0);
- 	SPEX(gpio3, SSB_SPROM8_GPIOB, SSB_SPROM8_GPIOB_P3,
- 	     SSB_SPROM8_GPIOB_P3_SHIFT);
-+	SPEX(tri2g, SSB_SPROM8_TRI25G, SSB_SPROM8_TRI2G, 0);
-+	SPEX(tri5g, SSB_SPROM8_TRI25G, SSB_SPROM8_TRI5G,
-+	     SSB_SPROM8_TRI5G_SHIFT);
-+	SPEX(tri5gl, SSB_SPROM8_TRI5GHL, SSB_SPROM8_TRI5GL, 0);
-+	SPEX(tri5gh, SSB_SPROM8_TRI5GHL, SSB_SPROM8_TRI5GH,
-+	     SSB_SPROM8_TRI5GH_SHIFT);
-+	SPEX(rxpo2g, SSB_SPROM8_RXPO, SSB_SPROM8_RXPO2G, 0);
-+	SPEX(rxpo5g, SSB_SPROM8_RXPO, SSB_SPROM8_RXPO5G,
-+	     SSB_SPROM8_RXPO5G_SHIFT);
-+	SPEX(rssismf2g, SSB_SPROM8_RSSIPARM2G, SSB_SPROM8_RSSISMF2G, 0);
-+	SPEX(rssismc2g, SSB_SPROM8_RSSIPARM2G, SSB_SPROM8_RSSISMC2G,
-+	     SSB_SPROM8_RSSISMC2G_SHIFT);
-+	SPEX(rssisav2g, SSB_SPROM8_RSSIPARM2G, SSB_SPROM8_RSSISAV2G,
-+	     SSB_SPROM8_RSSISAV2G_SHIFT);
-+	SPEX(bxa2g, SSB_SPROM8_RSSIPARM2G, SSB_SPROM8_BXA2G,
-+	     SSB_SPROM8_BXA2G_SHIFT);
-+	SPEX(rssismf5g, SSB_SPROM8_RSSIPARM5G, SSB_SPROM8_RSSISMF5G, 0);
-+	SPEX(rssismc5g, SSB_SPROM8_RSSIPARM5G, SSB_SPROM8_RSSISMC5G,
-+	     SSB_SPROM8_RSSISMC5G_SHIFT);
-+	SPEX(rssisav5g, SSB_SPROM8_RSSIPARM5G, SSB_SPROM8_RSSISAV5G,
-+	     SSB_SPROM8_RSSISAV5G_SHIFT);
-+	SPEX(bxa5g, SSB_SPROM8_RSSIPARM5G, SSB_SPROM8_BXA5G,
-+	     SSB_SPROM8_BXA5G_SHIFT);
-+	SPEX(pa0b0, SSB_SPROM8_PA0B0, 0xFFFF, 0);
-+	SPEX(pa0b1, SSB_SPROM8_PA0B1, 0xFFFF, 0);
-+	SPEX(pa0b2, SSB_SPROM8_PA0B2, 0xFFFF, 0);
-+	SPEX(pa1b0, SSB_SPROM8_PA1B0, 0xFFFF, 0);
-+	SPEX(pa1b1, SSB_SPROM8_PA1B1, 0xFFFF, 0);
-+	SPEX(pa1b2, SSB_SPROM8_PA1B2, 0xFFFF, 0);
-+	SPEX(pa1lob0, SSB_SPROM8_PA1LOB0, 0xFFFF, 0);
-+	SPEX(pa1lob1, SSB_SPROM8_PA1LOB1, 0xFFFF, 0);
-+	SPEX(pa1lob2, SSB_SPROM8_PA1LOB2, 0xFFFF, 0);
-+	SPEX(pa1hib0, SSB_SPROM8_PA1HIB0, 0xFFFF, 0);
-+	SPEX(pa1hib1, SSB_SPROM8_PA1HIB1, 0xFFFF, 0);
-+	SPEX(pa1hib2, SSB_SPROM8_PA1HIB2, 0xFFFF, 0);
-+	SPEX(cck2gpo, SSB_SPROM8_CCK2GPO, 0xFFFF, 0);
-+	SPEX32(ofdm2gpo, SSB_SPROM8_OFDM2GPO, 0xFFFFFFFF, 0);
-+	SPEX32(ofdm5glpo, SSB_SPROM8_OFDM5GLPO, 0xFFFFFFFF, 0);
-+	SPEX32(ofdm5gpo, SSB_SPROM8_OFDM5GPO, 0xFFFFFFFF, 0);
-+	SPEX32(ofdm5ghpo, SSB_SPROM8_OFDM5GHPO, 0xFFFFFFFF, 0);
- 
- 	/* Extract the antenna gain values. */
- 	SPEX(antenna_gain.ghz24.a0, SSB_SPROM8_AGAIN01,
-@@ -549,6 +600,7 @@ static int sprom_extract(struct ssb_bus 
- 			ssb_printk(KERN_WARNING PFX "Unsupported SPROM"
- 				   "  revision %d detected. Will extract"
- 				   " v1\n", out->revision);
-+			out->revision = 1;
- 			sprom_extract_r123(out, in);
- 		}
- 	}
---- a/drivers/ssb/scan.c
-+++ b/drivers/ssb/scan.c
-@@ -175,6 +175,8 @@ static u32 scan_read32(struct ssb_bus *b
- 		} else
- 			ssb_pcmcia_switch_segment(bus, 0);
- 		break;
-+	case SSB_BUSTYPE_SDIO:
-+		break;
- 	}
- 	return readl(bus->mmio + offset);
- }
-@@ -188,6 +190,8 @@ static int scan_switchcore(struct ssb_bu
- 		return ssb_pci_switch_coreidx(bus, coreidx);
- 	case SSB_BUSTYPE_PCMCIA:
- 		return ssb_pcmcia_switch_coreidx(bus, coreidx);
-+	case SSB_BUSTYPE_SDIO:
-+		break;
- 	}
- 	return 0;
- }
-@@ -206,6 +210,8 @@ void ssb_iounmap(struct ssb_bus *bus)
- 		SSB_BUG_ON(1); /* Can't reach this code. */
- #endif
- 		break;
-+	case SSB_BUSTYPE_SDIO:
-+		break;
- 	}
- 	bus->mmio = NULL;
- 	bus->mapped_device = NULL;
-@@ -230,6 +236,8 @@ static void __iomem *ssb_ioremap(struct 
- 		SSB_BUG_ON(1); /* Can't reach this code. */
- #endif
- 		break;
-+	case SSB_BUSTYPE_SDIO:
-+		break;
- 	}
- 
- 	return mmio;
---- a/include/linux/ssb/ssb.h
-+++ b/include/linux/ssb/ssb.h
-@@ -27,24 +27,54 @@ struct ssb_sprom {
- 	u8 et1mdcport;		/* MDIO for enet1 */
- 	u8 board_rev;		/* Board revision number from SPROM. */
- 	u8 country_code;	/* Country Code */
--	u8 ant_available_a;	/* A-PHY antenna available bits (up to 4) */
--	u8 ant_available_bg;	/* B/G-PHY antenna available bits (up to 4) */
-+	u8 ant_available_a;	/* 2GHz antenna available bits (up to 4) */
-+	u8 ant_available_bg;	/* 5GHz antenna available bits (up to 4) */
- 	u16 pa0b0;
- 	u16 pa0b1;
- 	u16 pa0b2;
- 	u16 pa1b0;
- 	u16 pa1b1;
- 	u16 pa1b2;
-+	u16 pa1lob0;
-+	u16 pa1lob1;
-+	u16 pa1lob2;
-+	u16 pa1hib0;
-+	u16 pa1hib1;
-+	u16 pa1hib2;
- 	u8 gpio0;		/* GPIO pin 0 */
- 	u8 gpio1;		/* GPIO pin 1 */
- 	u8 gpio2;		/* GPIO pin 2 */
- 	u8 gpio3;		/* GPIO pin 3 */
--	u16 maxpwr_a;		/* A-PHY Amplifier Max Power (in dBm Q5.2) */
--	u16 maxpwr_bg;		/* B/G-PHY Amplifier Max Power (in dBm Q5.2) */
-+	u16 maxpwr_bg;		/* 2.4GHz Amplifier Max Power (in dBm Q5.2) */
-+	u16 maxpwr_al;		/* 5.2GHz Amplifier Max Power (in dBm Q5.2) */
-+	u16 maxpwr_a;		/* 5.3GHz Amplifier Max Power (in dBm Q5.2) */
-+	u16 maxpwr_ah;		/* 5.8GHz Amplifier Max Power (in dBm Q5.2) */
- 	u8 itssi_a;		/* Idle TSSI Target for A-PHY */
- 	u8 itssi_bg;		/* Idle TSSI Target for B/G-PHY */
--	u16 boardflags_lo;	/* Boardflags (low 16 bits) */
--	u16 boardflags_hi;	/* Boardflags (high 16 bits) */
-+	u8 tri2g;		/* 2.4GHz TX isolation */
-+	u8 tri5gl;		/* 5.2GHz TX isolation */
-+	u8 tri5g;		/* 5.3GHz TX isolation */
-+	u8 tri5gh;		/* 5.8GHz TX isolation */
-+	u8 rxpo2g;		/* 2GHz RX power offset */
-+	u8 rxpo5g;		/* 5GHz RX power offset */
-+	u8 rssisav2g;		/* 2GHz RSSI params */
-+	u8 rssismc2g;
-+	u8 rssismf2g;
-+	u8 bxa2g;		/* 2GHz BX arch */
-+	u8 rssisav5g;		/* 5GHz RSSI params */
-+	u8 rssismc5g;
-+	u8 rssismf5g;
-+	u8 bxa5g;		/* 5GHz BX arch */
-+	u16 cck2gpo;		/* CCK power offset */
-+	u32 ofdm2gpo;		/* 2.4GHz OFDM power offset */
-+	u32 ofdm5glpo;		/* 5.2GHz OFDM power offset */
-+	u32 ofdm5gpo;		/* 5.3GHz OFDM power offset */
-+	u32 ofdm5ghpo;		/* 5.8GHz OFDM power offset */
-+	u16 boardflags_lo;	/* Board flags (bits 0-15) */
-+	u16 boardflags_hi;	/* Board flags (bits 16-31) */
-+	u16 boardflags2_lo;	/* Board flags (bits 32-47) */
-+	u16 boardflags2_hi;	/* Board flags (bits 48-63) */
-+	/* TODO store board flags in a single u64 */
- 
- 	/* Antenna gain values for up to 4 antennas
- 	 * on each band. Values in dBm/4 (Q5.2). Negative gain means the
-@@ -58,7 +88,7 @@ struct ssb_sprom {
- 		} ghz5;		/* 5GHz band */
- 	} antenna_gain;
- 
--	/* TODO - add any parameters needed from rev 2, 3, or 4 SPROMs */
-+	/* TODO - add any parameters needed from rev 2, 3, 4, 5 or 8 SPROMs */
- };
- 
- /* Information about the PCB the circuitry is soldered on. */
-@@ -208,6 +238,7 @@ enum ssb_bustype {
- 	SSB_BUSTYPE_SSB,	/* This SSB bus is the system bus */
- 	SSB_BUSTYPE_PCI,	/* SSB is connected to PCI bus */
- 	SSB_BUSTYPE_PCMCIA,	/* SSB is connected to PCMCIA bus */
-+	SSB_BUSTYPE_SDIO,	/* SSB is connected to SDIO bus */
- };
- 
- /* board_vendor */
-@@ -240,8 +271,12 @@ struct ssb_bus {
- 
- 	/* The core in the basic address register window. (PCI bus only) */
- 	struct ssb_device *mapped_device;
--	/* Currently mapped PCMCIA segment. (bustype == SSB_BUSTYPE_PCMCIA only) */
--	u8 mapped_pcmcia_seg;
-+	union {
-+		/* Currently mapped PCMCIA segment. (bustype == SSB_BUSTYPE_PCMCIA only) */
-+		u8 mapped_pcmcia_seg;
-+		/* Current SSB base address window for SDIO. */
-+		u32 sdio_sbaddr;
-+	};
- 	/* Lock for core and segment switching.
- 	 * On PCMCIA-host busses this is used to protect the whole MMIO access. */
- 	spinlock_t bar_lock;
-@@ -252,6 +287,11 @@ struct ssb_bus {
- 	struct pci_dev *host_pci;
- 	/* Pointer to the PCMCIA device (only if bustype == SSB_BUSTYPE_PCMCIA). */
- 	struct pcmcia_device *host_pcmcia;
-+	/* Pointer to the SDIO device (only if bustype == SSB_BUSTYPE_SDIO). */
-+	struct sdio_func *host_sdio;
-+
-+	/* See enum ssb_quirks */
-+	unsigned int quirks;
- 
- #ifdef CONFIG_SSB_SPROM
- 	/* Mutex to protect the SPROM writing. */
-@@ -306,6 +346,11 @@ struct ssb_bus {
- #endif /* DEBUG */
- };
- 
-+enum ssb_quirks {
-+	/* SDIO connected card requires performing a read after writing a 32-bit value */
-+	SSB_QUIRK_SDIO_READ_AFTER_WRITE32	= (1 << 0),
-+};
-+
- /* The initialization-invariants. */
- struct ssb_init_invariants {
- 	/* Versioning information about the PCB. */
---- a/include/linux/ssb/ssb_driver_chipcommon.h
-+++ b/include/linux/ssb/ssb_driver_chipcommon.h
-@@ -629,5 +629,15 @@ extern int ssb_chipco_serial_init(struct
- /* PMU support */
- extern void ssb_pmu_init(struct ssb_chipcommon *cc);
- 
-+enum ssb_pmu_ldo_volt_id {
-+	LDO_PAREF = 0,
-+	LDO_VOLT1,
-+	LDO_VOLT2,
-+	LDO_VOLT3,
-+};
-+
-+void ssb_pmu_set_ldo_voltage(struct ssb_chipcommon *cc,
-+			     enum ssb_pmu_ldo_volt_id id, u32 voltage);
-+void ssb_pmu_set_ldo_paref(struct ssb_chipcommon *cc, bool on);
- 
- #endif /* LINUX_SSB_CHIPCO_H_ */
---- a/include/linux/ssb/ssb_regs.h
-+++ b/include/linux/ssb/ssb_regs.h
-@@ -162,7 +162,7 @@
- 
- /* SPROM shadow area. If not otherwise noted, fields are
-  * two bytes wide. Note that the SPROM can _only_ be read
-- * in two-byte quantinies.
-+ * in two-byte quantities.
-  */
- #define SSB_SPROMSIZE_WORDS		64
- #define SSB_SPROMSIZE_BYTES		(SSB_SPROMSIZE_WORDS * sizeof(u16))
-@@ -327,8 +327,11 @@
- #define  SSB_SPROM5_GPIOB_P3_SHIFT	8
- 
- /* SPROM Revision 8 */
--#define SSB_SPROM8_BFLLO		0x1084	/* Boardflags (low 16 bits) */
--#define SSB_SPROM8_BFLHI		0x1086	/* Boardflags Hi */
-+#define SSB_SPROM8_BOARDREV		0x1082	/* Board revision */
-+#define SSB_SPROM8_BFLLO		0x1084	/* Board flags (bits 0-15) */
-+#define SSB_SPROM8_BFLHI		0x1086	/* Board flags (bits 16-31) */
-+#define SSB_SPROM8_BFL2LO		0x1088	/* Board flags (bits 32-47) */
-+#define SSB_SPROM8_BFL2HI		0x108A	/* Board flags (bits 48-63) */
- #define SSB_SPROM8_IL0MAC		0x108C	/* 6 byte MAC address */
- #define SSB_SPROM8_CCODE		0x1092	/* 2 byte country code */
- #define SSB_SPROM8_ANTAVAIL		0x109C  /* Antenna available bitfields*/
-@@ -354,14 +357,63 @@
- #define  SSB_SPROM8_GPIOB_P2		0x00FF	/* Pin 2 */
- #define  SSB_SPROM8_GPIOB_P3		0xFF00	/* Pin 3 */
- #define  SSB_SPROM8_GPIOB_P3_SHIFT	8
--#define SSB_SPROM8_MAXP_BG		0x10C0  /* Max Power BG in path 1 */
--#define  SSB_SPROM8_MAXP_BG_MASK	0x00FF  /* Mask for Max Power BG */
-+#define SSB_SPROM8_RSSIPARM2G		0x10A4	/* RSSI params for 2GHz */
-+#define  SSB_SPROM8_RSSISMF2G		0x000F
-+#define  SSB_SPROM8_RSSISMC2G		0x00F0
-+#define  SSB_SPROM8_RSSISMC2G_SHIFT	4
-+#define  SSB_SPROM8_RSSISAV2G		0x0700
-+#define  SSB_SPROM8_RSSISAV2G_SHIFT	8
-+#define  SSB_SPROM8_BXA2G		0x1800
-+#define  SSB_SPROM8_BXA2G_SHIFT		11
-+#define SSB_SPROM8_RSSIPARM5G		0x10A6	/* RSSI params for 5GHz */
-+#define  SSB_SPROM8_RSSISMF5G		0x000F
-+#define  SSB_SPROM8_RSSISMC5G		0x00F0
-+#define  SSB_SPROM8_RSSISMC5G_SHIFT	4
-+#define  SSB_SPROM8_RSSISAV5G		0x0700
-+#define  SSB_SPROM8_RSSISAV5G_SHIFT	8
-+#define  SSB_SPROM8_BXA5G		0x1800
-+#define  SSB_SPROM8_BXA5G_SHIFT		11
-+#define SSB_SPROM8_TRI25G		0x10A8	/* TX isolation 2.4&5.3GHz */
-+#define  SSB_SPROM8_TRI2G		0x00FF	/* TX isolation 2.4GHz */
-+#define  SSB_SPROM8_TRI5G		0xFF00	/* TX isolation 5.3GHz */
-+#define  SSB_SPROM8_TRI5G_SHIFT		8
-+#define SSB_SPROM8_TRI5GHL		0x10AA	/* TX isolation 5.2/5.8GHz */
-+#define  SSB_SPROM8_TRI5GL		0x00FF	/* TX isolation 5.2GHz */
-+#define  SSB_SPROM8_TRI5GH		0xFF00	/* TX isolation 5.8GHz */
-+#define  SSB_SPROM8_TRI5GH_SHIFT	8
-+#define SSB_SPROM8_RXPO			0x10AC  /* RX power offsets */
-+#define  SSB_SPROM8_RXPO2G		0x00FF	/* 2GHz RX power offset */
-+#define  SSB_SPROM8_RXPO5G		0xFF00	/* 5GHz RX power offset */
-+#define  SSB_SPROM8_RXPO5G_SHIFT	8
-+#define SSB_SPROM8_MAXP_BG		0x10C0  /* Max Power 2GHz in path 1 */
-+#define  SSB_SPROM8_MAXP_BG_MASK	0x00FF  /* Mask for Max Power 2GHz */
- #define  SSB_SPROM8_ITSSI_BG		0xFF00	/* Mask for path 1 itssi_bg */
- #define  SSB_SPROM8_ITSSI_BG_SHIFT	8
--#define SSB_SPROM8_MAXP_A		0x10C8  /* Max Power A in path 1 */
--#define  SSB_SPROM8_MAXP_A_MASK		0x00FF  /* Mask for Max Power A */
-+#define SSB_SPROM8_PA0B0		0x10C2	/* 2GHz power amp settings */
-+#define SSB_SPROM8_PA0B1		0x10C4
-+#define SSB_SPROM8_PA0B2		0x10C6
-+#define SSB_SPROM8_MAXP_A		0x10C8  /* Max Power 5.3GHz */
-+#define  SSB_SPROM8_MAXP_A_MASK		0x00FF  /* Mask for Max Power 5.3GHz */
- #define  SSB_SPROM8_ITSSI_A		0xFF00	/* Mask for path 1 itssi_a */
- #define  SSB_SPROM8_ITSSI_A_SHIFT	8
-+#define SSB_SPROM8_MAXP_AHL		0x10CA  /* Max Power 5.2/5.8GHz */
-+#define  SSB_SPROM8_MAXP_AH_MASK	0x00FF  /* Mask for Max Power 5.8GHz */
-+#define  SSB_SPROM8_MAXP_AL_MASK	0xFF00  /* Mask for Max Power 5.2GHz */
-+#define  SSB_SPROM8_MAXP_AL_SHIFT	8
-+#define SSB_SPROM8_PA1B0		0x10CC	/* 5.3GHz power amp settings */
-+#define SSB_SPROM8_PA1B1		0x10CE
-+#define SSB_SPROM8_PA1B2		0x10D0
-+#define SSB_SPROM8_PA1LOB0		0x10D2	/* 5.2GHz power amp settings */
-+#define SSB_SPROM8_PA1LOB1		0x10D4
-+#define SSB_SPROM8_PA1LOB2		0x10D6
-+#define SSB_SPROM8_PA1HIB0		0x10D8	/* 5.8GHz power amp settings */
-+#define SSB_SPROM8_PA1HIB1		0x10DA
-+#define SSB_SPROM8_PA1HIB2		0x10DC
-+#define SSB_SPROM8_CCK2GPO		0x1140	/* CCK power offset */
-+#define SSB_SPROM8_OFDM2GPO		0x1142	/* 2.4GHz OFDM power offset */
-+#define SSB_SPROM8_OFDM5GPO		0x1146	/* 5.3GHz OFDM power offset */
-+#define SSB_SPROM8_OFDM5GLPO		0x114A	/* 5.2GHz OFDM power offset */
-+#define SSB_SPROM8_OFDM5GHPO		0x114E	/* 5.8GHz OFDM power offset */
- 
- /* Values for SSB_SPROM1_BINF_CCODE */
- enum {
diff --git a/target/linux/generic-2.6/patches-2.6.31/951-revert_gcc4_4_fixes.patch b/target/linux/generic-2.6/patches-2.6.31/951-revert_gcc4_4_fixes.patch
deleted file mode 100644
index 1bf19cc76..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/951-revert_gcc4_4_fixes.patch
+++ /dev/null
@@ -1,524 +0,0 @@
---- a/arch/powerpc/boot/crtsavres.S
-+++ /dev/null
-@@ -1,233 +0,0 @@
--/*
-- * Special support for eabi and SVR4
-- *
-- *   Copyright (C) 1995, 1996, 1998, 2000, 2001 Free Software Foundation, Inc.
-- *   Copyright 2008 Freescale Semiconductor, Inc.
-- *   Written By Michael Meissner
-- *
-- * Based on gcc/config/rs6000/crtsavres.asm from gcc
-- *
-- * This file 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, or (at your option) any
-- * later version.
-- *
-- * In addition to the permissions in the GNU General Public License, the
-- * Free Software Foundation gives you unlimited permission to link the
-- * compiled version of this file with other programs, and to distribute
-- * those programs without any restriction coming from the use of this
-- * file.  (The General Public License restrictions do apply in other
-- * respects; for example, they cover modification of the file, and
-- * distribution when not linked into another program.)
-- *
-- * This file is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; see the file COPYING.  If not, write to
-- * the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-- * Boston, MA 02110-1301, USA.
-- *
-- *    As a special exception, if you link this library with files
-- *    compiled with GCC to produce an executable, this does not cause
-- *    the resulting executable to be covered by the GNU General Public License.
-- *    This exception does not however invalidate any other reasons why
-- *    the executable file might be covered by the GNU General Public License.
-- */
--
--	.file	"crtsavres.S"
--	.section ".text"
--
--/* On PowerPC64 Linux, these functions are provided by the linker.  */
--#ifndef __powerpc64__
--
--#define _GLOBAL(name) \
--	.type name,@function; \
--	.globl name; \
--name:
--
--/* Routines for saving integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer save area.  */
--
--_GLOBAL(_savegpr_14)
--_GLOBAL(_save32gpr_14)
--	stw	14,-72(11)	/* save gp registers */
--_GLOBAL(_savegpr_15)
--_GLOBAL(_save32gpr_15)
--	stw	15,-68(11)
--_GLOBAL(_savegpr_16)
--_GLOBAL(_save32gpr_16)
--	stw	16,-64(11)
--_GLOBAL(_savegpr_17)
--_GLOBAL(_save32gpr_17)
--	stw	17,-60(11)
--_GLOBAL(_savegpr_18)
--_GLOBAL(_save32gpr_18)
--	stw	18,-56(11)
--_GLOBAL(_savegpr_19)
--_GLOBAL(_save32gpr_19)
--	stw	19,-52(11)
--_GLOBAL(_savegpr_20)
--_GLOBAL(_save32gpr_20)
--	stw	20,-48(11)
--_GLOBAL(_savegpr_21)
--_GLOBAL(_save32gpr_21)
--	stw	21,-44(11)
--_GLOBAL(_savegpr_22)
--_GLOBAL(_save32gpr_22)
--	stw	22,-40(11)
--_GLOBAL(_savegpr_23)
--_GLOBAL(_save32gpr_23)
--	stw	23,-36(11)
--_GLOBAL(_savegpr_24)
--_GLOBAL(_save32gpr_24)
--	stw	24,-32(11)
--_GLOBAL(_savegpr_25)
--_GLOBAL(_save32gpr_25)
--	stw	25,-28(11)
--_GLOBAL(_savegpr_26)
--_GLOBAL(_save32gpr_26)
--	stw	26,-24(11)
--_GLOBAL(_savegpr_27)
--_GLOBAL(_save32gpr_27)
--	stw	27,-20(11)
--_GLOBAL(_savegpr_28)
--_GLOBAL(_save32gpr_28)
--	stw	28,-16(11)
--_GLOBAL(_savegpr_29)
--_GLOBAL(_save32gpr_29)
--	stw	29,-12(11)
--_GLOBAL(_savegpr_30)
--_GLOBAL(_save32gpr_30)
--	stw	30,-8(11)
--_GLOBAL(_savegpr_31)
--_GLOBAL(_save32gpr_31)
--	stw	31,-4(11)
--	blr
--
--/* Routines for restoring integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer restore area.  */
--
--_GLOBAL(_restgpr_14)
--_GLOBAL(_rest32gpr_14)
--	lwz	14,-72(11)	/* restore gp registers */
--_GLOBAL(_restgpr_15)
--_GLOBAL(_rest32gpr_15)
--	lwz	15,-68(11)
--_GLOBAL(_restgpr_16)
--_GLOBAL(_rest32gpr_16)
--	lwz	16,-64(11)
--_GLOBAL(_restgpr_17)
--_GLOBAL(_rest32gpr_17)
--	lwz	17,-60(11)
--_GLOBAL(_restgpr_18)
--_GLOBAL(_rest32gpr_18)
--	lwz	18,-56(11)
--_GLOBAL(_restgpr_19)
--_GLOBAL(_rest32gpr_19)
--	lwz	19,-52(11)
--_GLOBAL(_restgpr_20)
--_GLOBAL(_rest32gpr_20)
--	lwz	20,-48(11)
--_GLOBAL(_restgpr_21)
--_GLOBAL(_rest32gpr_21)
--	lwz	21,-44(11)
--_GLOBAL(_restgpr_22)
--_GLOBAL(_rest32gpr_22)
--	lwz	22,-40(11)
--_GLOBAL(_restgpr_23)
--_GLOBAL(_rest32gpr_23)
--	lwz	23,-36(11)
--_GLOBAL(_restgpr_24)
--_GLOBAL(_rest32gpr_24)
--	lwz	24,-32(11)
--_GLOBAL(_restgpr_25)
--_GLOBAL(_rest32gpr_25)
--	lwz	25,-28(11)
--_GLOBAL(_restgpr_26)
--_GLOBAL(_rest32gpr_26)
--	lwz	26,-24(11)
--_GLOBAL(_restgpr_27)
--_GLOBAL(_rest32gpr_27)
--	lwz	27,-20(11)
--_GLOBAL(_restgpr_28)
--_GLOBAL(_rest32gpr_28)
--	lwz	28,-16(11)
--_GLOBAL(_restgpr_29)
--_GLOBAL(_rest32gpr_29)
--	lwz	29,-12(11)
--_GLOBAL(_restgpr_30)
--_GLOBAL(_rest32gpr_30)
--	lwz	30,-8(11)
--_GLOBAL(_restgpr_31)
--_GLOBAL(_rest32gpr_31)
--	lwz	31,-4(11)
--	blr
--
--/* Routines for restoring integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer restore area.  */
--
--_GLOBAL(_restgpr_14_x)
--_GLOBAL(_rest32gpr_14_x)
--	lwz	14,-72(11)	/* restore gp registers */
--_GLOBAL(_restgpr_15_x)
--_GLOBAL(_rest32gpr_15_x)
--	lwz	15,-68(11)
--_GLOBAL(_restgpr_16_x)
--_GLOBAL(_rest32gpr_16_x)
--	lwz	16,-64(11)
--_GLOBAL(_restgpr_17_x)
--_GLOBAL(_rest32gpr_17_x)
--	lwz	17,-60(11)
--_GLOBAL(_restgpr_18_x)
--_GLOBAL(_rest32gpr_18_x)
--	lwz	18,-56(11)
--_GLOBAL(_restgpr_19_x)
--_GLOBAL(_rest32gpr_19_x)
--	lwz	19,-52(11)
--_GLOBAL(_restgpr_20_x)
--_GLOBAL(_rest32gpr_20_x)
--	lwz	20,-48(11)
--_GLOBAL(_restgpr_21_x)
--_GLOBAL(_rest32gpr_21_x)
--	lwz	21,-44(11)
--_GLOBAL(_restgpr_22_x)
--_GLOBAL(_rest32gpr_22_x)
--	lwz	22,-40(11)
--_GLOBAL(_restgpr_23_x)
--_GLOBAL(_rest32gpr_23_x)
--	lwz	23,-36(11)
--_GLOBAL(_restgpr_24_x)
--_GLOBAL(_rest32gpr_24_x)
--	lwz	24,-32(11)
--_GLOBAL(_restgpr_25_x)
--_GLOBAL(_rest32gpr_25_x)
--	lwz	25,-28(11)
--_GLOBAL(_restgpr_26_x)
--_GLOBAL(_rest32gpr_26_x)
--	lwz	26,-24(11)
--_GLOBAL(_restgpr_27_x)
--_GLOBAL(_rest32gpr_27_x)
--	lwz	27,-20(11)
--_GLOBAL(_restgpr_28_x)
--_GLOBAL(_rest32gpr_28_x)
--	lwz	28,-16(11)
--_GLOBAL(_restgpr_29_x)
--_GLOBAL(_rest32gpr_29_x)
--	lwz	29,-12(11)
--_GLOBAL(_restgpr_30_x)
--_GLOBAL(_rest32gpr_30_x)
--	lwz	30,-8(11)
--_GLOBAL(_restgpr_31_x)
--_GLOBAL(_rest32gpr_31_x)
--	lwz	0,4(11)
--	lwz	31,-4(11)
--	mtlr	0
--	mr	1,11
--	blr
--#endif
---- a/arch/powerpc/boot/Makefile
-+++ b/arch/powerpc/boot/Makefile
-@@ -59,7 +59,7 @@ libfdtheader := fdt.h libfdt.h libfdt_in
- $(addprefix $(obj)/,$(libfdt) libfdt-wrapper.o simpleboot.o): \
- 	$(addprefix $(obj)/,$(libfdtheader))
- 
--src-wlib := string.S crt0.S crtsavres.S stdio.c main.c \
-+src-wlib := string.S crt0.S stdio.c main.c \
- 		$(libfdt) libfdt-wrapper.c \
- 		ns16550.c serial.c simple_alloc.c div64.S util.S \
- 		gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \
---- a/arch/powerpc/kernel/prom_init_check.sh
-+++ b/arch/powerpc/kernel/prom_init_check.sh
-@@ -48,20 +48,6 @@ do
- 		fi
- 	done
- 
--	# ignore register save/restore funcitons
--	if [ "${UNDEF:0:9}" = "_restgpr_" ]; then
--		OK=1
--	fi
--	if [ "${UNDEF:0:11}" = "_rest32gpr_" ]; then
--		OK=1
--	fi
--	if [ "${UNDEF:0:9}" = "_savegpr_" ]; then
--		OK=1
--	fi
--	if [ "${UNDEF:0:11}" = "_save32gpr_" ]; then
--		OK=1
--	fi
--
- 	if [ $OK -eq 0 ]; then
- 		ERROR=1
- 		echo "Error: External symbol '$UNDEF' referenced" \
---- a/arch/powerpc/lib/crtsavres.S
-+++ /dev/null
-@@ -1,229 +0,0 @@
--/*
-- * Special support for eabi and SVR4
-- *
-- *   Copyright (C) 1995, 1996, 1998, 2000, 2001 Free Software Foundation, Inc.
-- *   Copyright 2008 Freescale Semiconductor, Inc.
-- *   Written By Michael Meissner
-- *
-- * Based on gcc/config/rs6000/crtsavres.asm from gcc
-- *
-- * This file 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, or (at your option) any
-- * later version.
-- *
-- * In addition to the permissions in the GNU General Public License, the
-- * Free Software Foundation gives you unlimited permission to link the
-- * compiled version of this file with other programs, and to distribute
-- * those programs without any restriction coming from the use of this
-- * file.  (The General Public License restrictions do apply in other
-- * respects; for example, they cover modification of the file, and
-- * distribution when not linked into another program.)
-- *
-- * This file is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; see the file COPYING.  If not, write to
-- * the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-- * Boston, MA 02110-1301, USA.
-- *
-- *    As a special exception, if you link this library with files
-- *    compiled with GCC to produce an executable, this does not cause
-- *    the resulting executable to be covered by the GNU General Public License.
-- *    This exception does not however invalidate any other reasons why
-- *    the executable file might be covered by the GNU General Public License.
-- */
--
--#include <asm/ppc_asm.h>
--
--	.file	"crtsavres.S"
--	.section ".text"
--
--#ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
--
--/* Routines for saving integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer save area.  */
--
--_GLOBAL(_savegpr_14)
--_GLOBAL(_save32gpr_14)
--	stw	14,-72(11)	/* save gp registers */
--_GLOBAL(_savegpr_15)
--_GLOBAL(_save32gpr_15)
--	stw	15,-68(11)
--_GLOBAL(_savegpr_16)
--_GLOBAL(_save32gpr_16)
--	stw	16,-64(11)
--_GLOBAL(_savegpr_17)
--_GLOBAL(_save32gpr_17)
--	stw	17,-60(11)
--_GLOBAL(_savegpr_18)
--_GLOBAL(_save32gpr_18)
--	stw	18,-56(11)
--_GLOBAL(_savegpr_19)
--_GLOBAL(_save32gpr_19)
--	stw	19,-52(11)
--_GLOBAL(_savegpr_20)
--_GLOBAL(_save32gpr_20)
--	stw	20,-48(11)
--_GLOBAL(_savegpr_21)
--_GLOBAL(_save32gpr_21)
--	stw	21,-44(11)
--_GLOBAL(_savegpr_22)
--_GLOBAL(_save32gpr_22)
--	stw	22,-40(11)
--_GLOBAL(_savegpr_23)
--_GLOBAL(_save32gpr_23)
--	stw	23,-36(11)
--_GLOBAL(_savegpr_24)
--_GLOBAL(_save32gpr_24)
--	stw	24,-32(11)
--_GLOBAL(_savegpr_25)
--_GLOBAL(_save32gpr_25)
--	stw	25,-28(11)
--_GLOBAL(_savegpr_26)
--_GLOBAL(_save32gpr_26)
--	stw	26,-24(11)
--_GLOBAL(_savegpr_27)
--_GLOBAL(_save32gpr_27)
--	stw	27,-20(11)
--_GLOBAL(_savegpr_28)
--_GLOBAL(_save32gpr_28)
--	stw	28,-16(11)
--_GLOBAL(_savegpr_29)
--_GLOBAL(_save32gpr_29)
--	stw	29,-12(11)
--_GLOBAL(_savegpr_30)
--_GLOBAL(_save32gpr_30)
--	stw	30,-8(11)
--_GLOBAL(_savegpr_31)
--_GLOBAL(_save32gpr_31)
--	stw	31,-4(11)
--	blr
--
--/* Routines for restoring integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer restore area.  */
--
--_GLOBAL(_restgpr_14)
--_GLOBAL(_rest32gpr_14)
--	lwz	14,-72(11)	/* restore gp registers */
--_GLOBAL(_restgpr_15)
--_GLOBAL(_rest32gpr_15)
--	lwz	15,-68(11)
--_GLOBAL(_restgpr_16)
--_GLOBAL(_rest32gpr_16)
--	lwz	16,-64(11)
--_GLOBAL(_restgpr_17)
--_GLOBAL(_rest32gpr_17)
--	lwz	17,-60(11)
--_GLOBAL(_restgpr_18)
--_GLOBAL(_rest32gpr_18)
--	lwz	18,-56(11)
--_GLOBAL(_restgpr_19)
--_GLOBAL(_rest32gpr_19)
--	lwz	19,-52(11)
--_GLOBAL(_restgpr_20)
--_GLOBAL(_rest32gpr_20)
--	lwz	20,-48(11)
--_GLOBAL(_restgpr_21)
--_GLOBAL(_rest32gpr_21)
--	lwz	21,-44(11)
--_GLOBAL(_restgpr_22)
--_GLOBAL(_rest32gpr_22)
--	lwz	22,-40(11)
--_GLOBAL(_restgpr_23)
--_GLOBAL(_rest32gpr_23)
--	lwz	23,-36(11)
--_GLOBAL(_restgpr_24)
--_GLOBAL(_rest32gpr_24)
--	lwz	24,-32(11)
--_GLOBAL(_restgpr_25)
--_GLOBAL(_rest32gpr_25)
--	lwz	25,-28(11)
--_GLOBAL(_restgpr_26)
--_GLOBAL(_rest32gpr_26)
--	lwz	26,-24(11)
--_GLOBAL(_restgpr_27)
--_GLOBAL(_rest32gpr_27)
--	lwz	27,-20(11)
--_GLOBAL(_restgpr_28)
--_GLOBAL(_rest32gpr_28)
--	lwz	28,-16(11)
--_GLOBAL(_restgpr_29)
--_GLOBAL(_rest32gpr_29)
--	lwz	29,-12(11)
--_GLOBAL(_restgpr_30)
--_GLOBAL(_rest32gpr_30)
--	lwz	30,-8(11)
--_GLOBAL(_restgpr_31)
--_GLOBAL(_rest32gpr_31)
--	lwz	31,-4(11)
--	blr
--
--/* Routines for restoring integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer restore area.  */
--
--_GLOBAL(_restgpr_14_x)
--_GLOBAL(_rest32gpr_14_x)
--	lwz	14,-72(11)	/* restore gp registers */
--_GLOBAL(_restgpr_15_x)
--_GLOBAL(_rest32gpr_15_x)
--	lwz	15,-68(11)
--_GLOBAL(_restgpr_16_x)
--_GLOBAL(_rest32gpr_16_x)
--	lwz	16,-64(11)
--_GLOBAL(_restgpr_17_x)
--_GLOBAL(_rest32gpr_17_x)
--	lwz	17,-60(11)
--_GLOBAL(_restgpr_18_x)
--_GLOBAL(_rest32gpr_18_x)
--	lwz	18,-56(11)
--_GLOBAL(_restgpr_19_x)
--_GLOBAL(_rest32gpr_19_x)
--	lwz	19,-52(11)
--_GLOBAL(_restgpr_20_x)
--_GLOBAL(_rest32gpr_20_x)
--	lwz	20,-48(11)
--_GLOBAL(_restgpr_21_x)
--_GLOBAL(_rest32gpr_21_x)
--	lwz	21,-44(11)
--_GLOBAL(_restgpr_22_x)
--_GLOBAL(_rest32gpr_22_x)
--	lwz	22,-40(11)
--_GLOBAL(_restgpr_23_x)
--_GLOBAL(_rest32gpr_23_x)
--	lwz	23,-36(11)
--_GLOBAL(_restgpr_24_x)
--_GLOBAL(_rest32gpr_24_x)
--	lwz	24,-32(11)
--_GLOBAL(_restgpr_25_x)
--_GLOBAL(_rest32gpr_25_x)
--	lwz	25,-28(11)
--_GLOBAL(_restgpr_26_x)
--_GLOBAL(_rest32gpr_26_x)
--	lwz	26,-24(11)
--_GLOBAL(_restgpr_27_x)
--_GLOBAL(_rest32gpr_27_x)
--	lwz	27,-20(11)
--_GLOBAL(_restgpr_28_x)
--_GLOBAL(_rest32gpr_28_x)
--	lwz	28,-16(11)
--_GLOBAL(_restgpr_29_x)
--_GLOBAL(_rest32gpr_29_x)
--	lwz	29,-12(11)
--_GLOBAL(_restgpr_30_x)
--_GLOBAL(_rest32gpr_30_x)
--	lwz	30,-8(11)
--_GLOBAL(_restgpr_31_x)
--_GLOBAL(_rest32gpr_31_x)
--	lwz	0,4(11)
--	lwz	31,-4(11)
--	mtlr	0
--	mr	1,11
--	blr
--#endif
---- a/arch/powerpc/lib/Makefile
-+++ b/arch/powerpc/lib/Makefile
-@@ -13,7 +13,7 @@ CFLAGS_REMOVE_feature-fixups.o = -pg
- 
- obj-y			:= string.o alloc.o \
- 			   checksum_$(CONFIG_WORD_SIZE).o
--obj-$(CONFIG_PPC32)	+= div64.o copy_32.o crtsavres.o
-+obj-$(CONFIG_PPC32)	+= div64.o copy_32.o
- obj-$(CONFIG_HAS_IOMEM)	+= devres.o
- 
- obj-$(CONFIG_PPC64)	+= copypage_64.o copyuser_64.o \
---- a/arch/powerpc/Makefile
-+++ b/arch/powerpc/Makefile
-@@ -92,8 +92,6 @@ endif
- else
- 	KBUILD_CFLAGS += $(call cc-option,-mtune=power4)
- endif
--else
--LDFLAGS_MODULE	+= arch/powerpc/lib/crtsavres.o
- endif
- 
- ifeq ($(CONFIG_TUNE_CELL),y)
diff --git a/target/linux/generic-2.6/patches-2.6.31/970-ocf_kbuild_integration.patch b/target/linux/generic-2.6/patches-2.6.31/970-ocf_kbuild_integration.patch
deleted file mode 100644
index a6d86ce44..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/970-ocf_kbuild_integration.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -788,6 +788,8 @@ config CRYPTO_ANSI_CPRNG
- 	  for cryptographic modules.  Uses the Algorithm specified in
- 	  ANSI X9.31 A.2.4
- 
-+source "crypto/ocf/Kconfig"
-+
- source "drivers/crypto/Kconfig"
- 
- endif	# if CRYPTO
---- a/crypto/Makefile
-+++ b/crypto/Makefile
-@@ -85,6 +85,11 @@ obj-$(CONFIG_CRYPTO_ANSI_CPRNG) += ansi_
- obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o
- 
- #
-+# OCF
-+#
-+obj-$(CONFIG_OCF_OCF) += ocf/
-+
-+#
- # generic algorithms and the async_tx api
- #
- obj-$(CONFIG_XOR_BLOCKS) += xor.o
diff --git a/target/linux/generic-2.6/patches-2.6.31/971-ocf_20080917.patch b/target/linux/generic-2.6/patches-2.6.31/971-ocf_20080917.patch
deleted file mode 100644
index 29b15d5f8..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/971-ocf_20080917.patch
+++ /dev/null
@@ -1,152 +0,0 @@
---- a/drivers/char/random.c
-+++ b/drivers/char/random.c
-@@ -129,6 +129,9 @@
-  *                                unsigned int value);
-  * 	void add_interrupt_randomness(int irq);
-  *
-+ *      void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
-+ *      int random_input_wait(void);
-+ *
-  * add_input_randomness() uses the input layer interrupt timing, as well as
-  * the event type information from the hardware.
-  *
-@@ -140,6 +143,13 @@
-  * a better measure, since the timing of the disk interrupts are more
-  * unpredictable.
-  *
-+ * random_input_words() just provides a raw block of entropy to the input
-+ * pool, such as from a hardware entropy generator.
-+ *
-+ * random_input_wait() suspends the caller until such time as the
-+ * entropy pool falls below the write threshold, and returns a count of how
-+ * much entropy (in bits) is needed to sustain the pool.
-+ *
-  * All of these routines try to estimate how many bits of randomness a
-  * particular randomness source.  They do this by keeping track of the
-  * first and second order deltas of the event timings.
-@@ -712,6 +722,61 @@ void add_disk_randomness(struct gendisk 
- }
- #endif
- 
-+/*
-+ * random_input_words - add bulk entropy to pool
-+ *
-+ * @buf: buffer to add
-+ * @wordcount: number of __u32 words to add
-+ * @ent_count: total amount of entropy (in bits) to credit
-+ *
-+ * this provides bulk input of entropy to the input pool
-+ *
-+ */
-+void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
-+{
-+	mix_pool_bytes(&input_pool, buf, wordcount*4);
-+
-+	credit_entropy_bits(&input_pool, ent_count);
-+
-+	DEBUG_ENT("crediting %d bits => %d\n",
-+		  ent_count, input_pool.entropy_count);
-+	/*
-+	 * Wake up waiting processes if we have enough
-+	 * entropy.
-+	 */
-+	if (input_pool.entropy_count >= random_read_wakeup_thresh)
-+		wake_up_interruptible(&random_read_wait);
-+}
-+EXPORT_SYMBOL(random_input_words);
-+
-+/*
-+ * random_input_wait - wait until random needs entropy
-+ *
-+ * this function sleeps until the /dev/random subsystem actually
-+ * needs more entropy, and then return the amount of entropy
-+ * that it would be nice to have added to the system.
-+ */
-+int random_input_wait(void)
-+{
-+	int count;
-+
-+	wait_event_interruptible(random_write_wait, 
-+			 input_pool.entropy_count < random_write_wakeup_thresh);
-+
-+	count = random_write_wakeup_thresh - input_pool.entropy_count;
-+
-+        /* likely we got woken up due to a signal */
-+	if (count <= 0) count = random_read_wakeup_thresh; 
-+
-+	DEBUG_ENT("requesting %d bits from input_wait()er %d<%d\n",
-+		  count,
-+		  input_pool.entropy_count, random_write_wakeup_thresh);
-+
-+	return count;
-+}
-+EXPORT_SYMBOL(random_input_wait);
-+
-+
- #define EXTRACT_SIZE 10
- 
- /*********************************************************************
---- a/fs/fcntl.c
-+++ b/fs/fcntl.c
-@@ -141,6 +141,7 @@ SYSCALL_DEFINE1(dup, unsigned int, filde
- 	}
- 	return ret;
- }
-+EXPORT_SYMBOL(sys_dup);
- 
- #define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME)
- 
---- a/include/linux/miscdevice.h
-+++ b/include/linux/miscdevice.h
-@@ -12,6 +12,7 @@
- #define APOLLO_MOUSE_MINOR	7
- #define PC110PAD_MINOR		9
- /*#define ADB_MOUSE_MINOR	10	FIXME OBSOLETE */
-+#define CRYPTODEV_MINOR		70	/* /dev/crypto */
- #define WATCHDOG_MINOR		130	/* Watchdog timer     */
- #define TEMP_MINOR		131	/* Temperature Sensor */
- #define RTC_MINOR		135
---- a/include/linux/random.h
-+++ b/include/linux/random.h
-@@ -34,6 +34,30 @@
- /* Clear the entropy pool and associated counters.  (Superuser only.) */
- #define RNDCLEARPOOL	_IO( 'R', 0x06 )
- 
-+#ifdef CONFIG_FIPS_RNG
-+
-+/* Size of seed value - equal to AES blocksize */
-+#define AES_BLOCK_SIZE_BYTES	16
-+#define SEED_SIZE_BYTES			AES_BLOCK_SIZE_BYTES
-+/* Size of AES key */
-+#define KEY_SIZE_BYTES		16
-+
-+/* ioctl() structure used by FIPS 140-2 Tests */
-+struct rand_fips_test {
-+	unsigned char key[KEY_SIZE_BYTES];			/* Input */
-+	unsigned char datetime[SEED_SIZE_BYTES];	/* Input */
-+	unsigned char seed[SEED_SIZE_BYTES];		/* Input */
-+	unsigned char result[SEED_SIZE_BYTES];		/* Output */
-+};
-+
-+/* FIPS 140-2 RNG Variable Seed Test. (Superuser only.) */
-+#define RNDFIPSVST	_IOWR('R', 0x10, struct rand_fips_test)
-+
-+/* FIPS 140-2 RNG Monte Carlo Test. (Superuser only.) */
-+#define RNDFIPSMCT	_IOWR('R', 0x11, struct rand_fips_test)
-+
-+#endif /* #ifdef CONFIG_FIPS_RNG */
-+
- struct rand_pool_info {
- 	int	entropy_count;
- 	int	buf_size;
-@@ -50,6 +74,10 @@ extern void add_input_randomness(unsigne
- 				 unsigned int value);
- extern void add_interrupt_randomness(int irq);
- 
-+extern void random_input_words(__u32 *buf, size_t wordcount, int ent_count);
-+extern int random_input_wait(void);
-+#define HAS_RANDOM_INPUT_WAIT 1
-+
- extern void get_random_bytes(void *buf, int nbytes);
- void generate_random_uuid(unsigned char uuid_out[16]);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.31/972-ocf_compile_fix.patch b/target/linux/generic-2.6/patches-2.6.31/972-ocf_compile_fix.patch
deleted file mode 100644
index a3fa22681..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/972-ocf_compile_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/crypto/ocf/cryptosoft.c
-+++ b/crypto/ocf/cryptosoft.c
-@@ -47,7 +47,7 @@
- #include <linux/mm.h>
- #include <linux/skbuff.h>
- #include <linux/random.h>
--#include <asm/scatterlist.h>
-+#include <linux/scatterlist.h>
- 
- #include <cryptodev.h>
- #include <uio.h>
diff --git a/target/linux/generic-2.6/patches-2.6.31/973-ocf_2.6.27_fix.patch b/target/linux/generic-2.6/patches-2.6.31/973-ocf_2.6.27_fix.patch
deleted file mode 100644
index ecb9bef51..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/973-ocf_2.6.27_fix.patch
+++ /dev/null
@@ -1,197 +0,0 @@
---- a/crypto/ocf/random.c
-+++ b/crypto/ocf/random.c
-@@ -49,6 +49,7 @@
- #include <linux/unistd.h>
- #include <linux/poll.h>
- #include <linux/random.h>
-+#include <linux/kthread.h>
- #include <cryptodev.h>
- 
- #ifdef CONFIG_OCF_FIPS
-@@ -81,7 +82,7 @@ struct random_op {
- 
- static int random_proc(void *arg);
- 
--static pid_t		randomproc = (pid_t) -1;
-+static struct task_struct *random_task;
- static spinlock_t	random_lock;
- 
- /*
-@@ -141,13 +142,18 @@ crypto_rregister(
- 	spin_lock_irqsave(&random_lock, flags);
- 	list_add_tail(&rops->random_list, &random_ops);
- 	if (!started) {
--		randomproc = kernel_thread(random_proc, NULL, CLONE_FS|CLONE_FILES);
--		if (randomproc < 0) {
--			ret = randomproc;
-+		struct task_struct *t;
-+
-+		t = kthread_create(random_proc, NULL, "ocf-random");
-+		if (IS_ERR(t)) {
-+			ret = PTR_ERR(t);
- 			printk("crypto: crypto_rregister cannot start random thread; "
- 					"error %d", ret);
--		} else
-+		} else {
-+			random_task = t;
-+			wake_up_process(t);
- 			started = 1;
-+		}
- 	}
- 	spin_unlock_irqrestore(&random_lock, flags);
- 
-@@ -172,7 +178,7 @@ crypto_runregister_all(u_int32_t driveri
- 
- 	spin_lock_irqsave(&random_lock, flags);
- 	if (list_empty(&random_ops) && started)
--		kill_proc(randomproc, SIGKILL, 1);
-+		send_sig(SIGKILL, random_task, 1);
- 	spin_unlock_irqrestore(&random_lock, flags);
- 	return(0);
- }
-@@ -308,7 +314,7 @@ random_proc(void *arg)
- 
- bad_alloc:
- 	spin_lock_irq(&random_lock);
--	randomproc = (pid_t) -1;
-+	random_task = NULL;
- 	started = 0;
- 	spin_unlock_irq(&random_lock);
- 
---- a/crypto/ocf/crypto.c
-+++ b/crypto/ocf/crypto.c
-@@ -74,6 +74,7 @@ __FBSDID("$FreeBSD: src/sys/opencrypto/c
- #include <linux/sched.h>
- #include <linux/spinlock.h>
- #include <linux/version.h>
-+#include <linux/kthread.h>
- #include <cryptodev.h>
- 
- /*
-@@ -255,10 +256,10 @@ module_param(crypto_devallowsoft, int, 0
- MODULE_PARM_DESC(crypto_devallowsoft,
- 	   "Enable/disable use of software crypto support");
- 
--static pid_t	cryptoproc = (pid_t) -1;
-+static struct task_struct *crypto_task;
- static struct	completion cryptoproc_exited;
- static DECLARE_WAIT_QUEUE_HEAD(cryptoproc_wait);
--static pid_t	cryptoretproc = (pid_t) -1;
-+static struct task_struct *cryptoret_task;
- static struct	completion cryptoretproc_exited;
- static DECLARE_WAIT_QUEUE_HEAD(cryptoretproc_wait);
- 
-@@ -1401,7 +1402,7 @@ crypto_proc(void *arg)
- 			wait_event_interruptible(cryptoproc_wait,
- 					!(list_empty(&crp_q) || crypto_all_qblocked) ||
- 					!(list_empty(&crp_kq) || crypto_all_kqblocked) ||
--					cryptoproc == (pid_t) -1);
-+					crypto_task == NULL);
- 			crp_sleep = 0;
- 			if (signal_pending (current)) {
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-@@ -1414,7 +1415,7 @@ crypto_proc(void *arg)
- 			}
- 			CRYPTO_Q_LOCK();
- 			dprintk("%s - awake\n", __FUNCTION__);
--			if (cryptoproc == (pid_t) -1)
-+			if (crypto_task == NULL)
- 				break;
- 			cryptostats.cs_intrs++;
- 		}
-@@ -1470,7 +1471,7 @@ crypto_ret_proc(void *arg)
- 			dprintk("%s - sleeping\n", __FUNCTION__);
- 			CRYPTO_RETQ_UNLOCK();
- 			wait_event_interruptible(cryptoretproc_wait,
--					cryptoretproc == (pid_t) -1 ||
-+					cryptoret_task == NULL ||
- 					!list_empty(&crp_ret_q) ||
- 					!list_empty(&crp_ret_kq));
- 			if (signal_pending (current)) {
-@@ -1484,7 +1485,7 @@ crypto_ret_proc(void *arg)
- 			}
- 			CRYPTO_RETQ_LOCK();
- 			dprintk("%s - awake\n", __FUNCTION__);
--			if (cryptoretproc == (pid_t) -1) {
-+			if (cryptoret_task == NULL) {
- 				dprintk("%s - EXITING!\n", __FUNCTION__);
- 				break;
- 			}
-@@ -1597,6 +1598,7 @@ DB_SHOW_COMMAND(kcrypto, db_show_kcrypto
- static int
- crypto_init(void)
- {
-+	struct task_struct *t;
- 	int error;
- 
- 	dprintk("%s(0x%x)\n", __FUNCTION__, (int) crypto_init);
-@@ -1643,23 +1645,27 @@ crypto_init(void)
- 	init_completion(&cryptoproc_exited);
- 	init_completion(&cryptoretproc_exited);
- 
--	cryptoproc = 0; /* to avoid race condition where proc runs first */
--	cryptoproc = kernel_thread(crypto_proc, NULL, CLONE_FS|CLONE_FILES);
--	if (cryptoproc < 0) {
--		error = cryptoproc;
-+	crypto_task = NULL; /* to avoid race condition where proc runs first */
-+	t = kthread_create(crypto_proc, NULL, "ocf-crypto");
-+	if (IS_ERR(t)) {
-+		error = PTR_ERR(t);
- 		printk("crypto: crypto_init cannot start crypto thread; error %d",
- 			error);
- 		goto bad;
- 	}
-+	wake_up_process(t);
-+	crypto_task = t;
- 
--	cryptoretproc = 0; /* to avoid race condition where proc runs first */
--	cryptoretproc = kernel_thread(crypto_ret_proc, NULL, CLONE_FS|CLONE_FILES);
--	if (cryptoretproc < 0) {
--		error = cryptoretproc;
-+	cryptoret_task = NULL; /* to avoid race condition where proc runs first */
-+	t = kthread_create(crypto_ret_proc, NULL, "ocf-cryptoret");
-+	if (IS_ERR(t)) {
-+		error = PTR_ERR(t);
- 		printk("crypto: crypto_init cannot start cryptoret thread; error %d",
- 				error);
- 		goto bad;
- 	}
-+	wake_up_process(t);
-+	cryptoret_task = t;
- 
- 	return 0;
- bad:
-@@ -1671,7 +1677,7 @@ bad:
- static void
- crypto_exit(void)
- {
--	pid_t p;
-+	struct task_struct *t;
- 	unsigned long d_flags;
- 
- 	dprintk("%s()\n", __FUNCTION__);
-@@ -1681,18 +1687,18 @@ crypto_exit(void)
- 	 */
- 
- 	CRYPTO_DRIVER_LOCK();
--	p = cryptoproc;
--	cryptoproc = (pid_t) -1;
--	kill_proc(p, SIGTERM, 1);
-+	t = crypto_task;
-+	crypto_task = NULL;
-+	send_sig(SIGTERM, t, 1);
- 	wake_up_interruptible(&cryptoproc_wait);
- 	CRYPTO_DRIVER_UNLOCK();
- 
- 	wait_for_completion(&cryptoproc_exited);
- 
- 	CRYPTO_DRIVER_LOCK();
--	p = cryptoretproc;
--	cryptoretproc = (pid_t) -1;
--	kill_proc(p, SIGTERM, 1);
-+	t = cryptoret_task;
-+	cryptoret_task = NULL;
-+	send_sig(SIGTERM, t, 1);
- 	wake_up_interruptible(&cryptoretproc_wait);
- 	CRYPTO_DRIVER_UNLOCK();
- 
diff --git a/target/linux/generic-2.6/patches-2.6.31/974-ssb_b43_default_on.patch b/target/linux/generic-2.6/patches-2.6.31/974-ssb_b43_default_on.patch
deleted file mode 100644
index 98dde2a3c..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/974-ssb_b43_default_on.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/drivers/ssb/Kconfig
-+++ b/drivers/ssb/Kconfig
-@@ -49,7 +49,7 @@ config SSB_PCIHOST
- config SSB_B43_PCI_BRIDGE
- 	bool
- 	depends on SSB_PCIHOST
--	default n
-+	default y
- 
- config SSB_PCMCIAHOST_POSSIBLE
- 	bool
diff --git a/target/linux/generic-2.6/patches-2.6.31/977-textsearch_kconfig_hacks.patch b/target/linux/generic-2.6/patches-2.6.31/977-textsearch_kconfig_hacks.patch
deleted file mode 100644
index 94d6b91d8..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/977-textsearch_kconfig_hacks.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -152,16 +152,16 @@ config REED_SOLOMON_DEC16
- # Textsearch support is select'ed if needed
- #
- config TEXTSEARCH
--	boolean
-+	boolean	"Textsearch support"
- 
- config TEXTSEARCH_KMP
--	tristate
-+	tristate "Textsearch KMP"
- 
- config TEXTSEARCH_BM
--	tristate
-+	tristate "Textsearch BM"
- 
- config TEXTSEARCH_FSM
--	tristate
-+	tristate "Textsearch FSM"
- 
- config HAS_IOMEM
- 	boolean
diff --git a/target/linux/generic-2.6/patches-2.6.31/978-lib80211_kconfig_hacks.patch b/target/linux/generic-2.6/patches-2.6.31/978-lib80211_kconfig_hacks.patch
deleted file mode 100644
index 696ad5560..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/978-lib80211_kconfig_hacks.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/net/wireless/Kconfig
-+++ b/net/wireless/Kconfig
-@@ -72,13 +72,13 @@ config LIB80211
- 	  you want this built into your kernel.
- 
- config LIB80211_CRYPT_WEP
--	tristate
-+	tristate "LIB80211_CRYPT_WEP"
- 
- config LIB80211_CRYPT_CCMP
--	tristate
-+	tristate "LIB80211_CRYPT_CCMP"
- 
- config LIB80211_CRYPT_TKIP
--	tristate
-+	tristate "LIB80211_CRYPT_TKIP"
- 
- config LIB80211_DEBUG
- 	bool "lib80211 debugging messages"
diff --git a/target/linux/generic-2.6/patches-2.6.31/979-crypto_add_kconfig_prompts.patch b/target/linux/generic-2.6/patches-2.6.31/979-crypto_add_kconfig_prompts.patch
deleted file mode 100644
index 03ad2a859..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/979-crypto_add_kconfig_prompts.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -30,7 +30,7 @@ config CRYPTO_FIPS
- 	  this is.
- 
- config CRYPTO_ALGAPI
--	tristate
-+	tristate "ALGAPI"
- 	select CRYPTO_ALGAPI2
- 	help
- 	  This option provides the API for cryptographic algorithms.
-@@ -39,7 +39,7 @@ config CRYPTO_ALGAPI2
- 	tristate
- 
- config CRYPTO_AEAD
--	tristate
-+	tristate "AEAD"
- 	select CRYPTO_AEAD2
- 	select CRYPTO_ALGAPI
- 
-@@ -48,7 +48,7 @@ config CRYPTO_AEAD2
- 	select CRYPTO_ALGAPI2
- 
- config CRYPTO_BLKCIPHER
--	tristate
-+	tristate "BLKCIPHER"
- 	select CRYPTO_BLKCIPHER2
- 	select CRYPTO_ALGAPI
- 
-@@ -59,7 +59,7 @@ config CRYPTO_BLKCIPHER2
- 	select CRYPTO_WORKQUEUE
- 
- config CRYPTO_HASH
--	tristate
-+	tristate "HASH"
- 	select CRYPTO_HASH2
- 	select CRYPTO_ALGAPI
- 
-@@ -68,7 +68,7 @@ config CRYPTO_HASH2
- 	select CRYPTO_ALGAPI2
- 
- config CRYPTO_RNG
--	tristate
-+	tristate "RNG"
- 	select CRYPTO_RNG2
- 	select CRYPTO_ALGAPI
- 
diff --git a/target/linux/generic-2.6/patches-2.6.31/980-vm_exports.patch b/target/linux/generic-2.6/patches-2.6.31/980-vm_exports.patch
deleted file mode 100644
index 3f1848b9e..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/980-vm_exports.patch
+++ /dev/null
@@ -1,135 +0,0 @@
---- a/mm/shmem.c
-+++ b/mm/shmem.c
-@@ -2602,6 +2602,16 @@ int shmem_unuse(swp_entry_t entry, struc
- 
- /* common code */
- 
-+void shmem_set_file(struct vm_area_struct *vma, struct file *file)
-+{
-+	ima_counts_get(file);
-+	if (vma->vm_file)
-+		fput(vma->vm_file);
-+	vma->vm_file = file;
-+	vma->vm_ops = &shmem_vm_ops;
-+}
-+EXPORT_SYMBOL_GPL(shmem_set_file);
-+
- /**
-  * shmem_file_setup - get an unlinked file living in tmpfs
-  * @name: name for dentry (to be seen in /proc/<pid>/maps
-@@ -2681,10 +2691,7 @@ int shmem_zero_setup(struct vm_area_stru
- 	if (IS_ERR(file))
- 		return PTR_ERR(file);
- 
--	if (vma->vm_file)
--		fput(vma->vm_file);
--	vma->vm_file = file;
--	vma->vm_ops = &shmem_vm_ops;
-+	shmem_set_file(vma, file);
- 	return 0;
- }
- 
---- a/fs/file.c
-+++ b/fs/file.c
-@@ -270,6 +270,7 @@ int expand_files(struct files_struct *fi
- 	/* All good, so we try */
- 	return expand_fdtable(files, nr);
- }
-+EXPORT_SYMBOL_GPL(expand_files);
- 
- static int count_open_files(struct fdtable *fdt)
- {
---- a/kernel/exit.c
-+++ b/kernel/exit.c
-@@ -507,6 +507,7 @@ struct files_struct *get_files_struct(st
- 
- 	return files;
- }
-+EXPORT_SYMBOL_GPL(get_files_struct);
- 
- void put_files_struct(struct files_struct *files)
- {
-@@ -526,6 +527,7 @@ void put_files_struct(struct files_struc
- 		free_fdtable(fdt);
- 	}
- }
-+EXPORT_SYMBOL_GPL(put_files_struct);
- 
- void reset_files_struct(struct files_struct *files)
- {
---- a/kernel/fork.c
-+++ b/kernel/fork.c
-@@ -159,6 +159,7 @@ void __put_task_struct(struct task_struc
- 	if (!profile_handoff_task(tsk))
- 		free_task(tsk);
- }
-+EXPORT_SYMBOL_GPL(__put_task_struct);
- 
- /*
-  * macro override instead of weak attribute alias, to workaround
---- a/kernel/sched.c
-+++ b/kernel/sched.c
-@@ -5981,6 +5981,7 @@ int can_nice(const struct task_struct *p
- 	return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
- 		capable(CAP_SYS_NICE));
- }
-+EXPORT_SYMBOL_GPL(can_nice);
- 
- #ifdef __ARCH_WANT_SYS_NICE
- 
---- a/mm/memory.c
-+++ b/mm/memory.c
-@@ -1064,6 +1064,7 @@ unsigned long zap_page_range(struct vm_a
- 		tlb_finish_mmu(tlb, address, end);
- 	return end;
- }
-+EXPORT_SYMBOL_GPL(zap_page_range);
- 
- /**
-  * zap_vma_ptes - remove ptes mapping the vma
-@@ -2490,6 +2491,7 @@ int vmtruncate_range(struct inode *inode
- 
- 	return 0;
- }
-+EXPORT_SYMBOL_GPL(vmtruncate_range);
- 
- /*
-  * We enter with non-exclusive mmap_sem (to exclude vma changes,
---- a/mm/vmalloc.c
-+++ b/mm/vmalloc.c
-@@ -1101,6 +1101,7 @@ void unmap_kernel_range(unsigned long ad
- 	vunmap_page_range(addr, end);
- 	flush_tlb_kernel_range(addr, end);
- }
-+EXPORT_SYMBOL_GPL(unmap_kernel_range);
- 
- int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
- {
-@@ -1214,6 +1215,7 @@ struct vm_struct *get_vm_area(unsigned l
- 	return __get_vm_area_node(size, flags, VMALLOC_START, VMALLOC_END,
- 				-1, GFP_KERNEL, __builtin_return_address(0));
- }
-+EXPORT_SYMBOL_GPL(get_vm_area);
- 
- struct vm_struct *get_vm_area_caller(unsigned long size, unsigned long flags,
- 				void *caller)
---- a/include/linux/mm.h
-+++ b/include/linux/mm.h
-@@ -711,6 +711,7 @@ static inline int shmem_lock(struct file
- #endif
- struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags);
- 
-+void shmem_set_file(struct vm_area_struct *vma, struct file *file);
- int shmem_zero_setup(struct vm_area_struct *);
- 
- #ifndef CONFIG_MMU
---- a/kernel/signal.c
-+++ b/kernel/signal.c
-@@ -1062,6 +1062,7 @@ struct sighand_struct *lock_task_sighand
- 
- 	return sighand;
- }
-+EXPORT_SYMBOL(lock_task_sighand);
- 
- /*
-  * send signal info to all the members of a group
diff --git a/target/linux/generic-2.6/patches-2.6.31/985-cris-headers.patch b/target/linux/generic-2.6/patches-2.6.31/985-cris-headers.patch
deleted file mode 100644
index 73ede933b..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/985-cris-headers.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/arch/cris/include/arch-v10/arch/Kbuild
-+++ b/arch/cris/include/arch-v10/arch/Kbuild
-@@ -1,3 +1,5 @@
-+header-y += elf.h
-+header-y += ptrace.h
- header-y += user.h
- header-y += svinto.h
- header-y += sv_addr_ag.h
---- a/arch/cris/include/asm/Kbuild
-+++ b/arch/cris/include/asm/Kbuild
-@@ -1,11 +1,14 @@
- include include/asm-generic/Kbuild.asm
- 
--header-y += arch-v10/
--header-y += arch-v32/
-+header-y += ../arch-v10/arch/
-+header-y += ../arch-v32/arch/
- 
-+header-y += elf.h
- header-y += ethernet.h
-+header-y += page.h
- header-y += rtc.h
- header-y += sync_serial.h
-+header-y += user.h
- 
- unifdef-y += etraxgpio.h
- unifdef-y += rs485.h
diff --git a/target/linux/generic-2.6/patches-2.6.31/991-ppc4xx_optimization.patch b/target/linux/generic-2.6/patches-2.6.31/991-ppc4xx_optimization.patch
deleted file mode 100644
index 39d5fb0d0..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/991-ppc4xx_optimization.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Upstream doesn't optimize the kernel and bootwrappers for ppc44x because
-they still want to support gcc 3.3 -- well, we don't.
-
---- a/arch/powerpc/Makefile
-+++ b/arch/powerpc/Makefile
-@@ -123,7 +123,8 @@ ifeq ($(CONFIG_FUNCTION_TRACER),y)
- KBUILD_CFLAGS		+= -mno-sched-epilog
- endif
- 
--cpu-as-$(CONFIG_4xx)		+= -Wa,-m405
-+cpu-as-$(CONFIG_40x)		+= -Wa,-m405
-+cpu-as-$(CONFIG_44x)		+= -Wa,-m440
- cpu-as-$(CONFIG_6xx)		+= -Wa,-maltivec
- cpu-as-$(CONFIG_POWER4)		+= -Wa,-maltivec
- cpu-as-$(CONFIG_E500)		+= -Wa,-me500
---- a/arch/powerpc/boot/Makefile
-+++ b/arch/powerpc/boot/Makefile
-@@ -38,9 +38,9 @@ BOOTCFLAGS	+= -I$(obj) -I$(srctree)/$(ob
- DTS_FLAGS	?= -p 1024
- 
- $(obj)/4xx.o: BOOTCFLAGS += -mcpu=405
--$(obj)/ebony.o: BOOTCFLAGS += -mcpu=405
--$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405
--$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405
-+$(obj)/ebony.o: BOOTCFLAGS += -mcpu=440
-+$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=440
-+$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=440
- $(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405
- $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
- $(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405
diff --git a/target/linux/generic-2.6/patches-2.6.31/998-openwrt_lzma_options.patch b/target/linux/generic-2.6/patches-2.6.31/998-openwrt_lzma_options.patch
deleted file mode 100644
index 08bb83a43..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/998-openwrt_lzma_options.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/scripts/Makefile.lib
-+++ b/scripts/Makefile.lib
-@@ -228,7 +228,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) 
- 
- quiet_cmd_lzma = LZMA    $@
- cmd_lzma = (cat $(filter-out FORCE,$^) | \
--	lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
-+	lzma e -lc1 -lp2 -pb2 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
- 	(rm -f $@ ; false)
- 
- quiet_cmd_lzo = LZO    $@
---- a/scripts/gen_initramfs_list.sh
-+++ b/scripts/gen_initramfs_list.sh
-@@ -225,7 +225,7 @@ cpio_list=
- output="/dev/stdout"
- output_file=""
- is_cpio_compressed=
--compr="gzip -9 -f"
-+compr="gzip -9 -f -"
- 
- arg="$1"
- case "$arg" in
-@@ -239,9 +239,9 @@ case "$arg" in
- 		output_file="$1"
- 		cpio_list="$(mktemp ${TMPDIR:-/tmp}/cpiolist.XXXXXX)"
- 		output=${cpio_list}
--		echo "$output_file" | grep -q "\.gz$" && compr="gzip -9 -f"
--		echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f"
--		echo "$output_file" | grep -q "\.lzma$" && compr="lzma -9 -f"
-+		echo "$output_file" | grep -q "\.gz$" && compr="gzip -9 -f -"
-+		echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f -"
-+		echo "$output_file" | grep -q "\.lzma$" && compr="lzma e -lc1 -lp2 -pb2 -eos -si -so"
- 		echo "$output_file" | grep -q "\.cpio$" && compr="cat"
- 		shift
- 		;;
-@@ -292,7 +292,7 @@ if [ ! -z ${output_file} ]; then
- 	if [ "${is_cpio_compressed}" = "compressed" ]; then
- 		cat ${cpio_tfile} > ${output_file}
- 	else
--		(cat ${cpio_tfile} | ${compr}  - > ${output_file}) \
-+		(cat ${cpio_tfile} | ${compr} > ${output_file}) \
- 		|| (rm -f ${output_file} ; false)
- 	fi
- 	[ -z ${cpio_file} ] && rm ${cpio_tfile}
diff --git a/target/linux/generic-2.6/patches-2.6.31/999-use_preinit_as_init.patch b/target/linux/generic-2.6/patches-2.6.31/999-use_preinit_as_init.patch
deleted file mode 100644
index c85113ddd..000000000
--- a/target/linux/generic-2.6/patches-2.6.31/999-use_preinit_as_init.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/init/main.c
-+++ b/init/main.c
-@@ -863,10 +863,7 @@ static noinline int init_post(void)
- 		printk(KERN_WARNING "Failed to execute %s.  Attempting "
- 					"defaults...\n", execute_command);
- 	}
--	run_init_process("/sbin/init");
--	run_init_process("/etc/init");
--	run_init_process("/bin/init");
--	run_init_process("/bin/sh");
-+	run_init_process("/etc/preinit");
- 
- 	panic("No init found.  Try passing init= option to kernel.");
- }
diff --git a/target/linux/generic-2.6/patches-2.6.32/975-ssb_update.patch b/target/linux/generic-2.6/patches-2.6.32/975-ssb_update.patch
new file mode 100644
index 000000000..f48c58052
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.32/975-ssb_update.patch
@@ -0,0 +1,1231 @@
+--- a/drivers/ssb/driver_chipcommon.c
++++ b/drivers/ssb/driver_chipcommon.c
+@@ -233,6 +233,8 @@ void ssb_chipcommon_init(struct ssb_chip
+ {
+ 	if (!cc->dev)
+ 		return; /* We don't have a ChipCommon */
++	if (cc->dev->id.revision >= 11)
++		cc->status = chipco_read32(cc, SSB_CHIPCO_CHIPSTAT);
+ 	ssb_pmu_init(cc);
+ 	chipco_powercontrol_init(cc);
+ 	ssb_chipco_set_clockmode(cc, SSB_CLKMODE_FAST);
+@@ -370,6 +372,7 @@ u32 ssb_chipco_gpio_control(struct ssb_c
+ {
+ 	return chipco_write32_masked(cc, SSB_CHIPCO_GPIOCTL, mask, value);
+ }
++EXPORT_SYMBOL(ssb_chipco_gpio_control);
+ 
+ u32 ssb_chipco_gpio_intmask(struct ssb_chipcommon *cc, u32 mask, u32 value)
+ {
+--- a/drivers/ssb/driver_chipcommon_pmu.c
++++ b/drivers/ssb/driver_chipcommon_pmu.c
+@@ -332,6 +332,12 @@ static void ssb_pmu_pll_init(struct ssb_
+ 	case 0x5354:
+ 		ssb_pmu0_pllinit_r0(cc, crystalfreq);
+ 		break;
++	case 0x4322:
++		if (cc->pmu.rev == 2) {
++			chipco_write32(cc, SSB_CHIPCO_PLLCTL_ADDR, 0x0000000A);
++			chipco_write32(cc, SSB_CHIPCO_PLLCTL_DATA, 0x380005C0);
++		}
++		break;
+ 	default:
+ 		ssb_printk(KERN_ERR PFX
+ 			   "ERROR: PLL init unknown for device %04X\n",
+@@ -417,6 +423,7 @@ static void ssb_pmu_resources_init(struc
+ 
+ 	switch (bus->chip_id) {
+ 	case 0x4312:
++	case 0x4322:
+ 		/* We keep the default settings:
+ 		 * min_msk = 0xCBB
+ 		 * max_msk = 0x7FFFF
+--- a/drivers/ssb/driver_gige.c
++++ b/drivers/ssb/driver_gige.c
+@@ -12,6 +12,7 @@
+ #include <linux/ssb/ssb_driver_gige.h>
+ #include <linux/pci.h>
+ #include <linux/pci_regs.h>
++#include <linux/slab.h>
+ 
+ 
+ /*
+--- a/drivers/ssb/driver_mipscore.c
++++ b/drivers/ssb/driver_mipscore.c
+@@ -270,7 +270,6 @@ void ssb_mipscore_init(struct ssb_mipsco
+ 				set_irq(dev, irq++);
+ 			}
+ 			break;
+-			/* fallthrough */
+ 		case SSB_DEV_PCI:
+ 		case SSB_DEV_ETHERNET:
+ 		case SSB_DEV_ETHERNET_GBIT:
+@@ -281,6 +280,10 @@ void ssb_mipscore_init(struct ssb_mipsco
+ 				set_irq(dev, irq++);
+ 				break;
+ 			}
++			/* fallthrough */
++		case SSB_DEV_EXTIF:
++			set_irq(dev, 0);
++			break;
+ 		}
+ 	}
+ 	ssb_dprintk(KERN_INFO PFX "after irq reconfiguration\n");
+--- a/drivers/ssb/driver_pcicore.c
++++ b/drivers/ssb/driver_pcicore.c
+@@ -246,20 +246,12 @@ static struct pci_controller ssb_pcicore
+ 	.pci_ops	= &ssb_pcicore_pciops,
+ 	.io_resource	= &ssb_pcicore_io_resource,
+ 	.mem_resource	= &ssb_pcicore_mem_resource,
+-	.mem_offset	= 0x24000000,
+ };
+ 
+-static u32 ssb_pcicore_pcibus_iobase = 0x100;
+-static u32 ssb_pcicore_pcibus_membase = SSB_PCI_DMA;
+-
+ /* This function is called when doing a pci_enable_device().
+  * We must first check if the device is a device on the PCI-core bridge. */
+ int ssb_pcicore_plat_dev_init(struct pci_dev *d)
+ {
+-	struct resource *res;
+-	int pos, size;
+-	u32 *base;
+-
+ 	if (d->bus->ops != &ssb_pcicore_pciops) {
+ 		/* This is not a device on the PCI-core bridge. */
+ 		return -ENODEV;
+@@ -268,27 +260,6 @@ int ssb_pcicore_plat_dev_init(struct pci
+ 	ssb_printk(KERN_INFO "PCI: Fixing up device %s\n",
+ 		   pci_name(d));
+ 
+-	/* Fix up resource bases */
+-	for (pos = 0; pos < 6; pos++) {
+-		res = &d->resource[pos];
+-		if (res->flags & IORESOURCE_IO)
+-			base = &ssb_pcicore_pcibus_iobase;
+-		else
+-			base = &ssb_pcicore_pcibus_membase;
+-		res->flags |= IORESOURCE_PCI_FIXED;
+-		if (res->end) {
+-			size = res->end - res->start + 1;
+-			if (*base & (size - 1))
+-				*base = (*base + size) & ~(size - 1);
+-			res->start = *base;
+-			res->end = res->start + size - 1;
+-			*base += size;
+-			pci_write_config_dword(d, PCI_BASE_ADDRESS_0 + (pos << 2), res->start);
+-		}
+-		/* Fix up PCI bridge BAR0 only */
+-		if (d->bus->number == 0 && PCI_SLOT(d->devfn) == 0)
+-			break;
+-	}
+ 	/* Fix up interrupt lines */
+ 	d->irq = ssb_mips_irq(extpci_core->dev) + 2;
+ 	pci_write_config_byte(d, PCI_INTERRUPT_LINE, d->irq);
+@@ -551,13 +522,13 @@ int ssb_pcicore_dev_irqvecs_enable(struc
+ 	might_sleep_if(pdev->id.coreid != SSB_DEV_PCI);
+ 
+ 	/* Enable interrupts for this device. */
+-	if (bus->host_pci &&
+-	    ((pdev->id.revision >= 6) || (pdev->id.coreid == SSB_DEV_PCIE))) {
++	if ((pdev->id.revision >= 6) || (pdev->id.coreid == SSB_DEV_PCIE)) {
+ 		u32 coremask;
+ 
+ 		/* Calculate the "coremask" for the device. */
+ 		coremask = (1 << dev->core_index);
+ 
++		SSB_WARN_ON(bus->bustype != SSB_BUSTYPE_PCI);
+ 		err = pci_read_config_dword(bus->host_pci, SSB_PCI_IRQMASK, &tmp);
+ 		if (err)
+ 			goto out;
+--- a/drivers/ssb/main.c
++++ b/drivers/ssb/main.c
+@@ -18,6 +18,7 @@
+ #include <linux/dma-mapping.h>
+ #include <linux/pci.h>
+ #include <linux/mmc/sdio_func.h>
++#include <linux/slab.h>
+ 
+ #include <pcmcia/cs_types.h>
+ #include <pcmcia/cs.h>
+@@ -140,6 +141,19 @@ static void ssb_device_put(struct ssb_de
+ 		put_device(dev->dev);
+ }
+ 
++static inline struct ssb_driver *ssb_driver_get(struct ssb_driver *drv)
++{
++	if (drv)
++		get_driver(&drv->drv);
++	return drv;
++}
++
++static inline void ssb_driver_put(struct ssb_driver *drv)
++{
++	if (drv)
++		put_driver(&drv->drv);
++}
++
+ static int ssb_device_resume(struct device *dev)
+ {
+ 	struct ssb_device *ssb_dev = dev_to_ssb_dev(dev);
+@@ -210,90 +224,81 @@ int ssb_bus_suspend(struct ssb_bus *bus)
+ EXPORT_SYMBOL(ssb_bus_suspend);
+ 
+ #ifdef CONFIG_SSB_SPROM
+-int ssb_devices_freeze(struct ssb_bus *bus)
++/** ssb_devices_freeze - Freeze all devices on the bus.
++ *
++ * After freezing no device driver will be handling a device
++ * on this bus anymore. ssb_devices_thaw() must be called after
++ * a successful freeze to reactivate the devices.
++ *
++ * @bus: The bus.
++ * @ctx: Context structure. Pass this to ssb_devices_thaw().
++ */
++int ssb_devices_freeze(struct ssb_bus *bus, struct ssb_freeze_context *ctx)
+ {
+-	struct ssb_device *dev;
+-	struct ssb_driver *drv;
+-	int err = 0;
+-	int i;
+-	pm_message_t state = PMSG_FREEZE;
++	struct ssb_device *sdev;
++	struct ssb_driver *sdrv;
++	unsigned int i;
++
++	memset(ctx, 0, sizeof(*ctx));
++	ctx->bus = bus;
++	SSB_WARN_ON(bus->nr_devices > ARRAY_SIZE(ctx->device_frozen));
+ 
+-	/* First check that we are capable to freeze all devices. */
+ 	for (i = 0; i < bus->nr_devices; i++) {
+-		dev = &(bus->devices[i]);
+-		if (!dev->dev ||
+-		    !dev->dev->driver ||
+-		    !device_is_registered(dev->dev))
+-			continue;
+-		drv = drv_to_ssb_drv(dev->dev->driver);
+-		if (!drv)
++		sdev = ssb_device_get(&bus->devices[i]);
++
++		if (!sdev->dev || !sdev->dev->driver ||
++		    !device_is_registered(sdev->dev)) {
++			ssb_device_put(sdev);
+ 			continue;
+-		if (!drv->suspend) {
+-			/* Nope, can't suspend this one. */
+-			return -EOPNOTSUPP;
+ 		}
+-	}
+-	/* Now suspend all devices */
+-	for (i = 0; i < bus->nr_devices; i++) {
+-		dev = &(bus->devices[i]);
+-		if (!dev->dev ||
+-		    !dev->dev->driver ||
+-		    !device_is_registered(dev->dev))
++		sdrv = ssb_driver_get(drv_to_ssb_drv(sdev->dev->driver));
++		if (!sdrv || SSB_WARN_ON(!sdrv->remove)) {
++			ssb_device_put(sdev);
+ 			continue;
+-		drv = drv_to_ssb_drv(dev->dev->driver);
+-		if (!drv)
+-			continue;
+-		err = drv->suspend(dev, state);
+-		if (err) {
+-			ssb_printk(KERN_ERR PFX "Failed to freeze device %s\n",
+-				   dev_name(dev->dev));
+-			goto err_unwind;
+ 		}
++		sdrv->remove(sdev);
++		ctx->device_frozen[i] = 1;
+ 	}
+ 
+ 	return 0;
+-err_unwind:
+-	for (i--; i >= 0; i--) {
+-		dev = &(bus->devices[i]);
+-		if (!dev->dev ||
+-		    !dev->dev->driver ||
+-		    !device_is_registered(dev->dev))
+-			continue;
+-		drv = drv_to_ssb_drv(dev->dev->driver);
+-		if (!drv)
+-			continue;
+-		if (drv->resume)
+-			drv->resume(dev);
+-	}
+-	return err;
+ }
+ 
+-int ssb_devices_thaw(struct ssb_bus *bus)
++/** ssb_devices_thaw - Unfreeze all devices on the bus.
++ *
++ * This will re-attach the device drivers and re-init the devices.
++ *
++ * @ctx: The context structure from ssb_devices_freeze()
++ */
++int ssb_devices_thaw(struct ssb_freeze_context *ctx)
+ {
+-	struct ssb_device *dev;
+-	struct ssb_driver *drv;
+-	int err;
+-	int i;
++	struct ssb_bus *bus = ctx->bus;
++	struct ssb_device *sdev;
++	struct ssb_driver *sdrv;
++	unsigned int i;
++	int err, result = 0;
+ 
+ 	for (i = 0; i < bus->nr_devices; i++) {
+-		dev = &(bus->devices[i]);
+-		if (!dev->dev ||
+-		    !dev->dev->driver ||
+-		    !device_is_registered(dev->dev))
++		if (!ctx->device_frozen[i])
+ 			continue;
+-		drv = drv_to_ssb_drv(dev->dev->driver);
+-		if (!drv)
++		sdev = &bus->devices[i];
++
++		if (SSB_WARN_ON(!sdev->dev || !sdev->dev->driver))
+ 			continue;
+-		if (SSB_WARN_ON(!drv->resume))
++		sdrv = drv_to_ssb_drv(sdev->dev->driver);
++		if (SSB_WARN_ON(!sdrv || !sdrv->probe))
+ 			continue;
+-		err = drv->resume(dev);
++
++		err = sdrv->probe(sdev, &sdev->id);
+ 		if (err) {
+ 			ssb_printk(KERN_ERR PFX "Failed to thaw device %s\n",
+-				   dev_name(dev->dev));
++				   dev_name(sdev->dev));
++			result = err;
+ 		}
++		ssb_driver_put(sdrv);
++		ssb_device_put(sdev);
+ 	}
+ 
+-	return 0;
++	return result;
+ }
+ #endif /* CONFIG_SSB_SPROM */
+ 
+@@ -490,8 +495,7 @@ static int ssb_devices_register(struct s
+ #endif
+ 			break;
+ 		case SSB_BUSTYPE_SDIO:
+-#ifdef CONFIG_SSB_SDIO
+-			sdev->irq = bus->host_sdio->dev.irq;
++#ifdef CONFIG_SSB_SDIOHOST
+ 			dev->parent = &bus->host_sdio->dev;
+ #endif
+ 			break;
+@@ -830,6 +834,9 @@ int ssb_bus_pcibus_register(struct ssb_b
+ 	if (!err) {
+ 		ssb_printk(KERN_INFO PFX "Sonics Silicon Backplane found on "
+ 			   "PCI device %s\n", dev_name(&host_pci->dev));
++	} else {
++		ssb_printk(KERN_ERR PFX "Failed to register PCI version"
++			   " of SSB with error %d\n", err);
+ 	}
+ 
+ 	return err;
+--- a/drivers/ssb/pci.c
++++ b/drivers/ssb/pci.c
+@@ -17,6 +17,7 @@
+ 
+ #include <linux/ssb/ssb.h>
+ #include <linux/ssb/ssb_regs.h>
++#include <linux/slab.h>
+ #include <linux/pci.h>
+ #include <linux/delay.h>
+ 
+@@ -167,7 +168,7 @@ err_pci:
+ }
+ 
+ /* Get the word-offset for a SSB_SPROM_XXX define. */
+-#define SPOFF(offset)	(((offset) - SSB_SPROM_BASE) / sizeof(u16))
++#define SPOFF(offset)	((offset) / sizeof(u16))
+ /* Helper to extract some _offset, which is one of the SSB_SPROM_XXX defines. */
+ #define SPEX16(_outvar, _offset, _mask, _shift)	\
+ 	out->_outvar = ((in[SPOFF(_offset)] & (_mask)) >> (_shift))
+@@ -253,7 +254,7 @@ static int sprom_do_read(struct ssb_bus 
+ 	int i;
+ 
+ 	for (i = 0; i < bus->sprom_size; i++)
+-		sprom[i] = ioread16(bus->mmio + SSB_SPROM_BASE + (i * 2));
++		sprom[i] = ioread16(bus->mmio + bus->sprom_offset + (i * 2));
+ 
+ 	return 0;
+ }
+@@ -284,7 +285,7 @@ static int sprom_do_write(struct ssb_bus
+ 			ssb_printk("75%%");
+ 		else if (i % 2)
+ 			ssb_printk(".");
+-		writew(sprom[i], bus->mmio + SSB_SPROM_BASE + (i * 2));
++		writew(sprom[i], bus->mmio + bus->sprom_offset + (i * 2));
+ 		mmiowb();
+ 		msleep(20);
+ 	}
+@@ -620,6 +621,14 @@ static int ssb_pci_sprom_get(struct ssb_
+ 	int err = -ENOMEM;
+ 	u16 *buf;
+ 
++	if (!ssb_is_sprom_available(bus)) {
++		ssb_printk(KERN_ERR PFX "No SPROM available!\n");
++		return -ENODEV;
++	}
++
++	bus->sprom_offset = (bus->chipco.dev->id.revision < 31) ?
++		SSB_SPROM_BASE1 : SSB_SPROM_BASE31;
++
+ 	buf = kcalloc(SSB_SPROMSIZE_WORDS_R123, sizeof(u16), GFP_KERNEL);
+ 	if (!buf)
+ 		goto out;
+--- a/drivers/ssb/pcihost_wrapper.c
++++ b/drivers/ssb/pcihost_wrapper.c
+@@ -12,6 +12,7 @@
+  */
+ 
+ #include <linux/pci.h>
++#include <linux/slab.h>
+ #include <linux/ssb/ssb.h>
+ 
+ 
+--- a/drivers/ssb/pcmcia.c
++++ b/drivers/ssb/pcmcia.c
+@@ -617,136 +617,140 @@ static int ssb_pcmcia_sprom_check_crc(co
+ 	}						\
+   } while (0)
+ 
+-int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
+-			      struct ssb_init_invariants *iv)
++static int ssb_pcmcia_get_mac(struct pcmcia_device *p_dev,
++			tuple_t *tuple,
++			void *priv)
++{
++	struct ssb_sprom *sprom = priv;
++
++	if (tuple->TupleData[0] != CISTPL_FUNCE_LAN_NODE_ID)
++		return -EINVAL;
++	if (tuple->TupleDataLen != ETH_ALEN + 2)
++		return -EINVAL;
++	if (tuple->TupleData[1] != ETH_ALEN)
++		return -EINVAL;
++	memcpy(sprom->il0mac, &tuple->TupleData[2], ETH_ALEN);
++	return 0;
++};
++
++static int ssb_pcmcia_do_get_invariants(struct pcmcia_device *p_dev,
++					tuple_t *tuple,
++					void *priv)
+ {
+-	tuple_t tuple;
+-	int res;
+-	unsigned char buf[32];
++	struct ssb_init_invariants *iv = priv;
+ 	struct ssb_sprom *sprom = &iv->sprom;
+ 	struct ssb_boardinfo *bi = &iv->boardinfo;
+ 	const char *error_description;
+ 
++	GOTO_ERROR_ON(tuple->TupleDataLen < 1, "VEN tpl < 1");
++	switch (tuple->TupleData[0]) {
++	case SSB_PCMCIA_CIS_ID:
++		GOTO_ERROR_ON((tuple->TupleDataLen != 5) &&
++			      (tuple->TupleDataLen != 7),
++			      "id tpl size");
++		bi->vendor = tuple->TupleData[1] |
++			((u16)tuple->TupleData[2] << 8);
++		break;
++	case SSB_PCMCIA_CIS_BOARDREV:
++		GOTO_ERROR_ON(tuple->TupleDataLen != 2,
++			"boardrev tpl size");
++		sprom->board_rev = tuple->TupleData[1];
++		break;
++	case SSB_PCMCIA_CIS_PA:
++		GOTO_ERROR_ON((tuple->TupleDataLen != 9) &&
++			(tuple->TupleDataLen != 10),
++			"pa tpl size");
++		sprom->pa0b0 = tuple->TupleData[1] |
++			((u16)tuple->TupleData[2] << 8);
++		sprom->pa0b1 = tuple->TupleData[3] |
++			((u16)tuple->TupleData[4] << 8);
++		sprom->pa0b2 = tuple->TupleData[5] |
++			((u16)tuple->TupleData[6] << 8);
++		sprom->itssi_a = tuple->TupleData[7];
++		sprom->itssi_bg = tuple->TupleData[7];
++		sprom->maxpwr_a = tuple->TupleData[8];
++		sprom->maxpwr_bg = tuple->TupleData[8];
++		break;
++	case SSB_PCMCIA_CIS_OEMNAME:
++		/* We ignore this. */
++		break;
++	case SSB_PCMCIA_CIS_CCODE:
++		GOTO_ERROR_ON(tuple->TupleDataLen != 2,
++			"ccode tpl size");
++		sprom->country_code = tuple->TupleData[1];
++		break;
++	case SSB_PCMCIA_CIS_ANTENNA:
++		GOTO_ERROR_ON(tuple->TupleDataLen != 2,
++			"ant tpl size");
++		sprom->ant_available_a = tuple->TupleData[1];
++		sprom->ant_available_bg = tuple->TupleData[1];
++		break;
++	case SSB_PCMCIA_CIS_ANTGAIN:
++		GOTO_ERROR_ON(tuple->TupleDataLen != 2,
++			"antg tpl size");
++		sprom->antenna_gain.ghz24.a0 = tuple->TupleData[1];
++		sprom->antenna_gain.ghz24.a1 = tuple->TupleData[1];
++		sprom->antenna_gain.ghz24.a2 = tuple->TupleData[1];
++		sprom->antenna_gain.ghz24.a3 = tuple->TupleData[1];
++		sprom->antenna_gain.ghz5.a0 = tuple->TupleData[1];
++		sprom->antenna_gain.ghz5.a1 = tuple->TupleData[1];
++		sprom->antenna_gain.ghz5.a2 = tuple->TupleData[1];
++		sprom->antenna_gain.ghz5.a3 = tuple->TupleData[1];
++		break;
++	case SSB_PCMCIA_CIS_BFLAGS:
++		GOTO_ERROR_ON((tuple->TupleDataLen != 3) &&
++			(tuple->TupleDataLen != 5),
++			"bfl tpl size");
++		sprom->boardflags_lo = tuple->TupleData[1] |
++			((u16)tuple->TupleData[2] << 8);
++		break;
++	case SSB_PCMCIA_CIS_LEDS:
++		GOTO_ERROR_ON(tuple->TupleDataLen != 5,
++			"leds tpl size");
++		sprom->gpio0 = tuple->TupleData[1];
++		sprom->gpio1 = tuple->TupleData[2];
++		sprom->gpio2 = tuple->TupleData[3];
++		sprom->gpio3 = tuple->TupleData[4];
++		break;
++	}
++	return -ENOSPC; /* continue with next entry */
++
++error:
++	ssb_printk(KERN_ERR PFX
++		   "PCMCIA: Failed to fetch device invariants: %s\n",
++		   error_description);
++	return -ENODEV;
++}
++
++
++int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
++			      struct ssb_init_invariants *iv)
++{
++	struct ssb_sprom *sprom = &iv->sprom;
++	int res;
++
+ 	memset(sprom, 0xFF, sizeof(*sprom));
+ 	sprom->revision = 1;
+ 	sprom->boardflags_lo = 0;
+ 	sprom->boardflags_hi = 0;
+ 
+ 	/* First fetch the MAC address. */
+-	memset(&tuple, 0, sizeof(tuple));
+-	tuple.DesiredTuple = CISTPL_FUNCE;
+-	tuple.TupleData = buf;
+-	tuple.TupleDataMax = sizeof(buf);
+-	res = pcmcia_get_first_tuple(bus->host_pcmcia, &tuple);
+-	GOTO_ERROR_ON(res != 0, "MAC first tpl");
+-	res = pcmcia_get_tuple_data(bus->host_pcmcia, &tuple);
+-	GOTO_ERROR_ON(res != 0, "MAC first tpl data");
+-	while (1) {
+-		GOTO_ERROR_ON(tuple.TupleDataLen < 1, "MAC tpl < 1");
+-		if (tuple.TupleData[0] == CISTPL_FUNCE_LAN_NODE_ID)
+-			break;
+-		res = pcmcia_get_next_tuple(bus->host_pcmcia, &tuple);
+-		GOTO_ERROR_ON(res != 0, "MAC next tpl");
+-		res = pcmcia_get_tuple_data(bus->host_pcmcia, &tuple);
+-		GOTO_ERROR_ON(res != 0, "MAC next tpl data");
++	res = pcmcia_loop_tuple(bus->host_pcmcia, CISTPL_FUNCE,
++				ssb_pcmcia_get_mac, sprom);
++	if (res != 0) {
++		ssb_printk(KERN_ERR PFX
++			"PCMCIA: Failed to fetch MAC address\n");
++		return -ENODEV;
+ 	}
+-	GOTO_ERROR_ON(tuple.TupleDataLen != ETH_ALEN + 2, "MAC tpl size");
+-	memcpy(sprom->il0mac, &tuple.TupleData[2], ETH_ALEN);
+ 
+ 	/* Fetch the vendor specific tuples. */
+-	memset(&tuple, 0, sizeof(tuple));
+-	tuple.DesiredTuple = SSB_PCMCIA_CIS;
+-	tuple.TupleData = buf;
+-	tuple.TupleDataMax = sizeof(buf);
+-	res = pcmcia_get_first_tuple(bus->host_pcmcia, &tuple);
+-	GOTO_ERROR_ON(res != 0, "VEN first tpl");
+-	res = pcmcia_get_tuple_data(bus->host_pcmcia, &tuple);
+-	GOTO_ERROR_ON(res != 0, "VEN first tpl data");
+-	while (1) {
+-		GOTO_ERROR_ON(tuple.TupleDataLen < 1, "VEN tpl < 1");
+-		switch (tuple.TupleData[0]) {
+-		case SSB_PCMCIA_CIS_ID:
+-			GOTO_ERROR_ON((tuple.TupleDataLen != 5) &&
+-				      (tuple.TupleDataLen != 7),
+-				      "id tpl size");
+-			bi->vendor = tuple.TupleData[1] |
+-			       ((u16)tuple.TupleData[2] << 8);
+-			break;
+-		case SSB_PCMCIA_CIS_BOARDREV:
+-			GOTO_ERROR_ON(tuple.TupleDataLen != 2,
+-				      "boardrev tpl size");
+-			sprom->board_rev = tuple.TupleData[1];
+-			break;
+-		case SSB_PCMCIA_CIS_PA:
+-			GOTO_ERROR_ON((tuple.TupleDataLen != 9) &&
+-				      (tuple.TupleDataLen != 10),
+-				      "pa tpl size");
+-			sprom->pa0b0 = tuple.TupleData[1] |
+-				 ((u16)tuple.TupleData[2] << 8);
+-			sprom->pa0b1 = tuple.TupleData[3] |
+-				 ((u16)tuple.TupleData[4] << 8);
+-			sprom->pa0b2 = tuple.TupleData[5] |
+-				 ((u16)tuple.TupleData[6] << 8);
+-			sprom->itssi_a = tuple.TupleData[7];
+-			sprom->itssi_bg = tuple.TupleData[7];
+-			sprom->maxpwr_a = tuple.TupleData[8];
+-			sprom->maxpwr_bg = tuple.TupleData[8];
+-			break;
+-		case SSB_PCMCIA_CIS_OEMNAME:
+-			/* We ignore this. */
+-			break;
+-		case SSB_PCMCIA_CIS_CCODE:
+-			GOTO_ERROR_ON(tuple.TupleDataLen != 2,
+-				      "ccode tpl size");
+-			sprom->country_code = tuple.TupleData[1];
+-			break;
+-		case SSB_PCMCIA_CIS_ANTENNA:
+-			GOTO_ERROR_ON(tuple.TupleDataLen != 2,
+-				      "ant tpl size");
+-			sprom->ant_available_a = tuple.TupleData[1];
+-			sprom->ant_available_bg = tuple.TupleData[1];
+-			break;
+-		case SSB_PCMCIA_CIS_ANTGAIN:
+-			GOTO_ERROR_ON(tuple.TupleDataLen != 2,
+-				      "antg tpl size");
+-			sprom->antenna_gain.ghz24.a0 = tuple.TupleData[1];
+-			sprom->antenna_gain.ghz24.a1 = tuple.TupleData[1];
+-			sprom->antenna_gain.ghz24.a2 = tuple.TupleData[1];
+-			sprom->antenna_gain.ghz24.a3 = tuple.TupleData[1];
+-			sprom->antenna_gain.ghz5.a0 = tuple.TupleData[1];
+-			sprom->antenna_gain.ghz5.a1 = tuple.TupleData[1];
+-			sprom->antenna_gain.ghz5.a2 = tuple.TupleData[1];
+-			sprom->antenna_gain.ghz5.a3 = tuple.TupleData[1];
+-			break;
+-		case SSB_PCMCIA_CIS_BFLAGS:
+-			GOTO_ERROR_ON((tuple.TupleDataLen != 3) &&
+-				      (tuple.TupleDataLen != 5),
+-				      "bfl tpl size");
+-			sprom->boardflags_lo = tuple.TupleData[1] |
+-					 ((u16)tuple.TupleData[2] << 8);
+-			break;
+-		case SSB_PCMCIA_CIS_LEDS:
+-			GOTO_ERROR_ON(tuple.TupleDataLen != 5,
+-				      "leds tpl size");
+-			sprom->gpio0 = tuple.TupleData[1];
+-			sprom->gpio1 = tuple.TupleData[2];
+-			sprom->gpio2 = tuple.TupleData[3];
+-			sprom->gpio3 = tuple.TupleData[4];
+-			break;
+-		}
+-		res = pcmcia_get_next_tuple(bus->host_pcmcia, &tuple);
+-		if (res == -ENOSPC)
+-			break;
+-		GOTO_ERROR_ON(res != 0, "VEN next tpl");
+-		res = pcmcia_get_tuple_data(bus->host_pcmcia, &tuple);
+-		GOTO_ERROR_ON(res != 0, "VEN next tpl data");
+-	}
++	res = pcmcia_loop_tuple(bus->host_pcmcia, SSB_PCMCIA_CIS,
++				ssb_pcmcia_do_get_invariants, sprom);
++	if ((res == 0) || (res == -ENOSPC))
++		return 0;
+ 
+-	return 0;
+-error:
+ 	ssb_printk(KERN_ERR PFX
+-		   "PCMCIA: Failed to fetch device invariants: %s\n",
+-		   error_description);
++			"PCMCIA: Failed to fetch device invariants\n");
+ 	return -ENODEV;
+ }
+ 
+--- a/drivers/ssb/scan.c
++++ b/drivers/ssb/scan.c
+@@ -354,7 +354,7 @@ int ssb_bus_scan(struct ssb_bus *bus,
+ 		dev->bus = bus;
+ 		dev->ops = bus->ops;
+ 
+-		ssb_dprintk(KERN_INFO PFX
++		printk(KERN_DEBUG PFX
+ 			    "Core %d found: %s "
+ 			    "(cc 0x%03X, rev 0x%02X, vendor 0x%04X)\n",
+ 			    i, ssb_core_name(dev->id.coreid),
+--- a/drivers/ssb/sprom.c
++++ b/drivers/ssb/sprom.c
+@@ -14,6 +14,7 @@
+ #include "ssb_private.h"
+ 
+ #include <linux/ctype.h>
++#include <linux/slab.h>
+ 
+ 
+ static const struct ssb_sprom *fallback_sprom;
+@@ -102,6 +103,7 @@ ssize_t ssb_attr_sprom_store(struct ssb_
+ 	u16 *sprom;
+ 	int res = 0, err = -ENOMEM;
+ 	size_t sprom_size_words = bus->sprom_size;
++	struct ssb_freeze_context freeze;
+ 
+ 	sprom = kcalloc(bus->sprom_size, sizeof(u16), GFP_KERNEL);
+ 	if (!sprom)
+@@ -123,18 +125,13 @@ ssize_t ssb_attr_sprom_store(struct ssb_
+ 	err = -ERESTARTSYS;
+ 	if (mutex_lock_interruptible(&bus->sprom_mutex))
+ 		goto out_kfree;
+-	err = ssb_devices_freeze(bus);
+-	if (err == -EOPNOTSUPP) {
+-		ssb_printk(KERN_ERR PFX "SPROM write: Could not freeze devices. "
+-			   "No suspend support. Is CONFIG_PM enabled?\n");
+-		goto out_unlock;
+-	}
++	err = ssb_devices_freeze(bus, &freeze);
+ 	if (err) {
+ 		ssb_printk(KERN_ERR PFX "SPROM write: Could not freeze all devices\n");
+ 		goto out_unlock;
+ 	}
+ 	res = sprom_write(bus, sprom);
+-	err = ssb_devices_thaw(bus);
++	err = ssb_devices_thaw(&freeze);
+ 	if (err)
+ 		ssb_printk(KERN_ERR PFX "SPROM write: Could not thaw all devices\n");
+ out_unlock:
+@@ -179,3 +176,17 @@ const struct ssb_sprom *ssb_get_fallback
+ {
+ 	return fallback_sprom;
+ }
++
++/* http://bcm-v4.sipsolutions.net/802.11/IsSpromAvailable */
++bool ssb_is_sprom_available(struct ssb_bus *bus)
++{
++	/* status register only exists on chipcomon rev >= 11 and we need check
++	   for >= 31 only */
++	/* this routine differs from specs as we do not access SPROM directly
++	   on PCMCIA */
++	if (bus->bustype == SSB_BUSTYPE_PCI &&
++	    bus->chipco.dev->id.revision >= 31)
++		return bus->chipco.capabilities & SSB_CHIPCO_CAP_SPROM;
++
++	return true;
++}
+--- a/drivers/ssb/ssb_private.h
++++ b/drivers/ssb/ssb_private.h
+@@ -176,19 +176,27 @@ extern const struct ssb_sprom *ssb_get_f
+ 
+ /* core.c */
+ extern u32 ssb_calc_clock_rate(u32 plltype, u32 n, u32 m);
+-extern int ssb_devices_freeze(struct ssb_bus *bus);
+-extern int ssb_devices_thaw(struct ssb_bus *bus);
+ extern struct ssb_bus *ssb_pci_dev_to_bus(struct pci_dev *pdev);
+ int ssb_for_each_bus_call(unsigned long data,
+ 			  int (*func)(struct ssb_bus *bus, unsigned long data));
+ extern struct ssb_bus *ssb_pcmcia_dev_to_bus(struct pcmcia_device *pdev);
+ 
++struct ssb_freeze_context {
++	/* Pointer to the bus */
++	struct ssb_bus *bus;
++	/* Boolean list to indicate whether a device is frozen on this bus. */
++	bool device_frozen[SSB_MAX_NR_CORES];
++};
++extern int ssb_devices_freeze(struct ssb_bus *bus, struct ssb_freeze_context *ctx);
++extern int ssb_devices_thaw(struct ssb_freeze_context *ctx);
++
++
+ 
+ /* b43_pci_bridge.c */
+ #ifdef CONFIG_SSB_B43_PCI_BRIDGE
+ extern int __init b43_pci_ssb_bridge_init(void);
+ extern void __exit b43_pci_ssb_bridge_exit(void);
+-#else /* CONFIG_SSB_B43_PCI_BRIDGR */
++#else /* CONFIG_SSB_B43_PCI_BRIDGE */
+ static inline int b43_pci_ssb_bridge_init(void)
+ {
+ 	return 0;
+@@ -196,6 +204,6 @@ static inline int b43_pci_ssb_bridge_ini
+ static inline void b43_pci_ssb_bridge_exit(void)
+ {
+ }
+-#endif /* CONFIG_SSB_PCIHOST */
++#endif /* CONFIG_SSB_B43_PCI_BRIDGE */
+ 
+ #endif /* LINUX_SSB_PRIVATE_H_ */
+--- a/include/linux/ssb/ssb.h
++++ b/include/linux/ssb/ssb.h
+@@ -269,7 +269,8 @@ struct ssb_bus {
+ 
+ 	const struct ssb_bus_ops *ops;
+ 
+-	/* The core in the basic address register window. (PCI bus only) */
++	/* The core currently mapped into the MMIO window.
++	 * Not valid on all host-buses. So don't use outside of SSB. */
+ 	struct ssb_device *mapped_device;
+ 	union {
+ 		/* Currently mapped PCMCIA segment. (bustype == SSB_BUSTYPE_PCMCIA only) */
+@@ -281,14 +282,17 @@ struct ssb_bus {
+ 	 * On PCMCIA-host busses this is used to protect the whole MMIO access. */
+ 	spinlock_t bar_lock;
+ 
+-	/* The bus this backplane is running on. */
++	/* The host-bus this backplane is running on. */
+ 	enum ssb_bustype bustype;
+-	/* Pointer to the PCI bus (only valid if bustype == SSB_BUSTYPE_PCI). */
+-	struct pci_dev *host_pci;
+-	/* Pointer to the PCMCIA device (only if bustype == SSB_BUSTYPE_PCMCIA). */
+-	struct pcmcia_device *host_pcmcia;
+-	/* Pointer to the SDIO device (only if bustype == SSB_BUSTYPE_SDIO). */
+-	struct sdio_func *host_sdio;
++	/* Pointers to the host-bus. Check bustype before using any of these pointers. */
++	union {
++		/* Pointer to the PCI bus (only valid if bustype == SSB_BUSTYPE_PCI). */
++		struct pci_dev *host_pci;
++		/* Pointer to the PCMCIA device (only if bustype == SSB_BUSTYPE_PCMCIA). */
++		struct pcmcia_device *host_pcmcia;
++		/* Pointer to the SDIO device (only if bustype == SSB_BUSTYPE_SDIO). */
++		struct sdio_func *host_sdio;
++	};
+ 
+ 	/* See enum ssb_quirks */
+ 	unsigned int quirks;
+@@ -301,6 +305,7 @@ struct ssb_bus {
+ 	/* ID information about the Chip. */
+ 	u16 chip_id;
+ 	u16 chip_rev;
++	u16 sprom_offset;
+ 	u16 sprom_size;		/* number of words in sprom */
+ 	u8 chip_package;
+ 
+@@ -390,6 +395,9 @@ extern int ssb_bus_sdiobus_register(stru
+ 
+ extern void ssb_bus_unregister(struct ssb_bus *bus);
+ 
++/* Does the device have an SPROM? */
++extern bool ssb_is_sprom_available(struct ssb_bus *bus);
++
+ /* Set a fallback SPROM.
+  * See kdoc at the function definition for complete documentation. */
+ extern int ssb_arch_set_fallback_sprom(const struct ssb_sprom *sprom);
+--- a/include/linux/ssb/ssb_driver_chipcommon.h
++++ b/include/linux/ssb/ssb_driver_chipcommon.h
+@@ -53,6 +53,7 @@
+ #define  SSB_CHIPCO_CAP_64BIT		0x08000000	/* 64-bit Backplane */
+ #define  SSB_CHIPCO_CAP_PMU		0x10000000	/* PMU available (rev >= 20) */
+ #define  SSB_CHIPCO_CAP_ECI		0x20000000	/* ECI available (rev >= 20) */
++#define  SSB_CHIPCO_CAP_SPROM		0x40000000	/* SPROM present */
+ #define SSB_CHIPCO_CORECTL		0x0008
+ #define  SSB_CHIPCO_CORECTL_UARTCLK0	0x00000001	/* Drive UART with internal clock */
+ #define	 SSB_CHIPCO_CORECTL_SE		0x00000002	/* sync clk out enable (corerev >= 3) */
+@@ -385,6 +386,7 @@
+ 
+ 
+ /** Chip specific Chip-Status register contents. */
++#define SSB_CHIPCO_CHST_4322_SPROM_EXISTS	0x00000040 /* SPROM present */
+ #define SSB_CHIPCO_CHST_4325_SPROM_OTP_SEL	0x00000003
+ #define SSB_CHIPCO_CHST_4325_DEFCIS_SEL		0 /* OTP is powered up, use def. CIS, no SPROM */
+ #define SSB_CHIPCO_CHST_4325_SPROM_SEL		1 /* OTP is powered up, SPROM is present */
+@@ -398,6 +400,18 @@
+ #define SSB_CHIPCO_CHST_4325_RCAL_VALUE_SHIFT	4
+ #define SSB_CHIPCO_CHST_4325_PMUTOP_2B 		0x00000200 /* 1 for 2b, 0 for to 2a */
+ 
++/** Macros to determine SPROM presence based on Chip-Status register. */
++#define SSB_CHIPCO_CHST_4312_SPROM_PRESENT(status) \
++	((status & SSB_CHIPCO_CHST_4325_SPROM_OTP_SEL) != \
++		SSB_CHIPCO_CHST_4325_OTP_SEL)
++#define SSB_CHIPCO_CHST_4322_SPROM_PRESENT(status) \
++	(status & SSB_CHIPCO_CHST_4322_SPROM_EXISTS)
++#define SSB_CHIPCO_CHST_4325_SPROM_PRESENT(status) \
++	(((status & SSB_CHIPCO_CHST_4325_SPROM_OTP_SEL) != \
++		SSB_CHIPCO_CHST_4325_DEFCIS_SEL) && \
++	 ((status & SSB_CHIPCO_CHST_4325_SPROM_OTP_SEL) != \
++		SSB_CHIPCO_CHST_4325_OTP_SEL))
++
+ 
+ 
+ /** Clockcontrol masks and values **/
+@@ -564,6 +578,7 @@ struct ssb_chipcommon_pmu {
+ struct ssb_chipcommon {
+ 	struct ssb_device *dev;
+ 	u32 capabilities;
++	u32 status;
+ 	/* Fast Powerup Delay constant */
+ 	u16 fast_pwrup_delay;
+ 	struct ssb_chipcommon_pmu pmu;
+--- a/include/linux/ssb/ssb_regs.h
++++ b/include/linux/ssb/ssb_regs.h
+@@ -170,26 +170,27 @@
+ #define SSB_SPROMSIZE_WORDS_R4		220
+ #define SSB_SPROMSIZE_BYTES_R123	(SSB_SPROMSIZE_WORDS_R123 * sizeof(u16))
+ #define SSB_SPROMSIZE_BYTES_R4		(SSB_SPROMSIZE_WORDS_R4 * sizeof(u16))
+-#define SSB_SPROM_BASE			0x1000
+-#define SSB_SPROM_REVISION		0x107E
++#define SSB_SPROM_BASE1			0x1000
++#define SSB_SPROM_BASE31		0x0800
++#define SSB_SPROM_REVISION		0x007E
+ #define  SSB_SPROM_REVISION_REV		0x00FF	/* SPROM Revision number */
+ #define  SSB_SPROM_REVISION_CRC		0xFF00	/* SPROM CRC8 value */
+ #define  SSB_SPROM_REVISION_CRC_SHIFT	8
+ 
+ /* SPROM Revision 1 */
+-#define SSB_SPROM1_SPID			0x1004	/* Subsystem Product ID for PCI */
+-#define SSB_SPROM1_SVID			0x1006	/* Subsystem Vendor ID for PCI */
+-#define SSB_SPROM1_PID			0x1008	/* Product ID for PCI */
+-#define SSB_SPROM1_IL0MAC		0x1048	/* 6 bytes MAC address for 802.11b/g */
+-#define SSB_SPROM1_ET0MAC		0x104E	/* 6 bytes MAC address for Ethernet */
+-#define SSB_SPROM1_ET1MAC		0x1054	/* 6 bytes MAC address for 802.11a */
+-#define SSB_SPROM1_ETHPHY		0x105A	/* Ethernet PHY settings */
++#define SSB_SPROM1_SPID			0x0004	/* Subsystem Product ID for PCI */
++#define SSB_SPROM1_SVID			0x0006	/* Subsystem Vendor ID for PCI */
++#define SSB_SPROM1_PID			0x0008	/* Product ID for PCI */
++#define SSB_SPROM1_IL0MAC		0x0048	/* 6 bytes MAC address for 802.11b/g */
++#define SSB_SPROM1_ET0MAC		0x004E	/* 6 bytes MAC address for Ethernet */
++#define SSB_SPROM1_ET1MAC		0x0054	/* 6 bytes MAC address for 802.11a */
++#define SSB_SPROM1_ETHPHY		0x005A	/* Ethernet PHY settings */
+ #define  SSB_SPROM1_ETHPHY_ET0A		0x001F	/* MII Address for enet0 */
+ #define  SSB_SPROM1_ETHPHY_ET1A		0x03E0	/* MII Address for enet1 */
+ #define  SSB_SPROM1_ETHPHY_ET1A_SHIFT	5
+ #define  SSB_SPROM1_ETHPHY_ET0M		(1<<14)	/* MDIO for enet0 */
+ #define  SSB_SPROM1_ETHPHY_ET1M		(1<<15)	/* MDIO for enet1 */
+-#define SSB_SPROM1_BINF			0x105C	/* Board info */
++#define SSB_SPROM1_BINF			0x005C	/* Board info */
+ #define  SSB_SPROM1_BINF_BREV		0x00FF	/* Board Revision */
+ #define  SSB_SPROM1_BINF_CCODE		0x0F00	/* Country Code */
+ #define  SSB_SPROM1_BINF_CCODE_SHIFT	8
+@@ -197,63 +198,63 @@
+ #define  SSB_SPROM1_BINF_ANTBG_SHIFT	12
+ #define  SSB_SPROM1_BINF_ANTA		0xC000	/* Available A-PHY antennas */
+ #define  SSB_SPROM1_BINF_ANTA_SHIFT	14
+-#define SSB_SPROM1_PA0B0		0x105E
+-#define SSB_SPROM1_PA0B1		0x1060
+-#define SSB_SPROM1_PA0B2		0x1062
+-#define SSB_SPROM1_GPIOA		0x1064	/* General Purpose IO pins 0 and 1 */
++#define SSB_SPROM1_PA0B0		0x005E
++#define SSB_SPROM1_PA0B1		0x0060
++#define SSB_SPROM1_PA0B2		0x0062
++#define SSB_SPROM1_GPIOA		0x0064	/* General Purpose IO pins 0 and 1 */
+ #define  SSB_SPROM1_GPIOA_P0		0x00FF	/* Pin 0 */
+ #define  SSB_SPROM1_GPIOA_P1		0xFF00	/* Pin 1 */
+ #define  SSB_SPROM1_GPIOA_P1_SHIFT	8
+-#define SSB_SPROM1_GPIOB		0x1066	/* General Purpuse IO pins 2 and 3 */
++#define SSB_SPROM1_GPIOB		0x0066	/* General Purpuse IO pins 2 and 3 */
+ #define  SSB_SPROM1_GPIOB_P2		0x00FF	/* Pin 2 */
+ #define  SSB_SPROM1_GPIOB_P3		0xFF00	/* Pin 3 */
+ #define  SSB_SPROM1_GPIOB_P3_SHIFT	8
+-#define SSB_SPROM1_MAXPWR		0x1068	/* Power Amplifier Max Power */
++#define SSB_SPROM1_MAXPWR		0x0068	/* Power Amplifier Max Power */
+ #define  SSB_SPROM1_MAXPWR_BG		0x00FF	/* B-PHY and G-PHY (in dBm Q5.2) */
+ #define  SSB_SPROM1_MAXPWR_A		0xFF00	/* A-PHY (in dBm Q5.2) */
+ #define  SSB_SPROM1_MAXPWR_A_SHIFT	8
+-#define SSB_SPROM1_PA1B0		0x106A
+-#define SSB_SPROM1_PA1B1		0x106C
+-#define SSB_SPROM1_PA1B2		0x106E
+-#define SSB_SPROM1_ITSSI		0x1070	/* Idle TSSI Target */
++#define SSB_SPROM1_PA1B0		0x006A
++#define SSB_SPROM1_PA1B1		0x006C
++#define SSB_SPROM1_PA1B2		0x006E
++#define SSB_SPROM1_ITSSI		0x0070	/* Idle TSSI Target */
+ #define  SSB_SPROM1_ITSSI_BG		0x00FF	/* B-PHY and G-PHY*/
+ #define  SSB_SPROM1_ITSSI_A		0xFF00	/* A-PHY */
+ #define  SSB_SPROM1_ITSSI_A_SHIFT	8
+-#define SSB_SPROM1_BFLLO		0x1072	/* Boardflags (low 16 bits) */
+-#define SSB_SPROM1_AGAIN		0x1074	/* Antenna Gain (in dBm Q5.2) */
++#define SSB_SPROM1_BFLLO		0x0072	/* Boardflags (low 16 bits) */
++#define SSB_SPROM1_AGAIN		0x0074	/* Antenna Gain (in dBm Q5.2) */
+ #define  SSB_SPROM1_AGAIN_BG		0x00FF	/* B-PHY and G-PHY */
+ #define  SSB_SPROM1_AGAIN_BG_SHIFT	0
+ #define  SSB_SPROM1_AGAIN_A		0xFF00	/* A-PHY */
+ #define  SSB_SPROM1_AGAIN_A_SHIFT	8
+ 
+ /* SPROM Revision 2 (inherits from rev 1) */
+-#define SSB_SPROM2_BFLHI		0x1038	/* Boardflags (high 16 bits) */
+-#define SSB_SPROM2_MAXP_A		0x103A	/* A-PHY Max Power */
++#define SSB_SPROM2_BFLHI		0x0038	/* Boardflags (high 16 bits) */
++#define SSB_SPROM2_MAXP_A		0x003A	/* A-PHY Max Power */
+ #define  SSB_SPROM2_MAXP_A_HI		0x00FF	/* Max Power High */
+ #define  SSB_SPROM2_MAXP_A_LO		0xFF00	/* Max Power Low */
+ #define  SSB_SPROM2_MAXP_A_LO_SHIFT	8
+-#define SSB_SPROM2_PA1LOB0		0x103C	/* A-PHY PowerAmplifier Low Settings */
+-#define SSB_SPROM2_PA1LOB1		0x103E	/* A-PHY PowerAmplifier Low Settings */
+-#define SSB_SPROM2_PA1LOB2		0x1040	/* A-PHY PowerAmplifier Low Settings */
+-#define SSB_SPROM2_PA1HIB0		0x1042	/* A-PHY PowerAmplifier High Settings */
+-#define SSB_SPROM2_PA1HIB1		0x1044	/* A-PHY PowerAmplifier High Settings */
+-#define SSB_SPROM2_PA1HIB2		0x1046	/* A-PHY PowerAmplifier High Settings */
+-#define SSB_SPROM2_OPO			0x1078	/* OFDM Power Offset from CCK Level */
++#define SSB_SPROM2_PA1LOB0		0x003C	/* A-PHY PowerAmplifier Low Settings */
++#define SSB_SPROM2_PA1LOB1		0x003E	/* A-PHY PowerAmplifier Low Settings */
++#define SSB_SPROM2_PA1LOB2		0x0040	/* A-PHY PowerAmplifier Low Settings */
++#define SSB_SPROM2_PA1HIB0		0x0042	/* A-PHY PowerAmplifier High Settings */
++#define SSB_SPROM2_PA1HIB1		0x0044	/* A-PHY PowerAmplifier High Settings */
++#define SSB_SPROM2_PA1HIB2		0x0046	/* A-PHY PowerAmplifier High Settings */
++#define SSB_SPROM2_OPO			0x0078	/* OFDM Power Offset from CCK Level */
+ #define  SSB_SPROM2_OPO_VALUE		0x00FF
+ #define  SSB_SPROM2_OPO_UNUSED		0xFF00
+-#define SSB_SPROM2_CCODE		0x107C	/* Two char Country Code */
++#define SSB_SPROM2_CCODE		0x007C	/* Two char Country Code */
+ 
+ /* SPROM Revision 3 (inherits most data from rev 2) */
+-#define SSB_SPROM3_IL0MAC		0x104A	/* 6 bytes MAC address for 802.11b/g */
+-#define SSB_SPROM3_OFDMAPO		0x102C	/* A-PHY OFDM Mid Power Offset (4 bytes, BigEndian) */
+-#define SSB_SPROM3_OFDMALPO		0x1030	/* A-PHY OFDM Low Power Offset (4 bytes, BigEndian) */
+-#define SSB_SPROM3_OFDMAHPO		0x1034	/* A-PHY OFDM High Power Offset (4 bytes, BigEndian) */
+-#define SSB_SPROM3_GPIOLDC		0x1042	/* GPIO LED Powersave Duty Cycle (4 bytes, BigEndian) */
++#define SSB_SPROM3_OFDMAPO		0x002C	/* A-PHY OFDM Mid Power Offset (4 bytes, BigEndian) */
++#define SSB_SPROM3_OFDMALPO		0x0030	/* A-PHY OFDM Low Power Offset (4 bytes, BigEndian) */
++#define SSB_SPROM3_OFDMAHPO		0x0034	/* A-PHY OFDM High Power Offset (4 bytes, BigEndian) */
++#define SSB_SPROM3_GPIOLDC		0x0042	/* GPIO LED Powersave Duty Cycle (4 bytes, BigEndian) */
+ #define  SSB_SPROM3_GPIOLDC_OFF		0x0000FF00	/* Off Count */
+ #define  SSB_SPROM3_GPIOLDC_OFF_SHIFT	8
+ #define  SSB_SPROM3_GPIOLDC_ON		0x00FF0000	/* On Count */
+ #define  SSB_SPROM3_GPIOLDC_ON_SHIFT	16
+-#define SSB_SPROM3_CCKPO		0x1078	/* CCK Power Offset */
++#define SSB_SPROM3_IL0MAC		0x004A	/* 6 bytes MAC address for 802.11b/g */
++#define SSB_SPROM3_CCKPO		0x0078	/* CCK Power Offset */
+ #define  SSB_SPROM3_CCKPO_1M		0x000F	/* 1M Rate PO */
+ #define  SSB_SPROM3_CCKPO_2M		0x00F0	/* 2M Rate PO */
+ #define  SSB_SPROM3_CCKPO_2M_SHIFT	4
+@@ -264,100 +265,100 @@
+ #define  SSB_SPROM3_OFDMGPO		0x107A	/* G-PHY OFDM Power Offset (4 bytes, BigEndian) */
+ 
+ /* SPROM Revision 4 */
+-#define SSB_SPROM4_IL0MAC		0x104C	/* 6 byte MAC address for a/b/g/n */
+-#define SSB_SPROM4_ETHPHY		0x105A	/* Ethernet PHY settings ?? */
++#define SSB_SPROM4_BFLLO		0x0044	/* Boardflags (low 16 bits) */
++#define SSB_SPROM4_BFLHI		0x0046  /* Board Flags Hi */
++#define SSB_SPROM4_IL0MAC		0x004C	/* 6 byte MAC address for a/b/g/n */
++#define SSB_SPROM4_CCODE		0x0052	/* Country Code (2 bytes) */
++#define SSB_SPROM4_GPIOA		0x0056	/* Gen. Purpose IO # 0 and 1 */
++#define  SSB_SPROM4_GPIOA_P0		0x00FF	/* Pin 0 */
++#define  SSB_SPROM4_GPIOA_P1		0xFF00	/* Pin 1 */
++#define  SSB_SPROM4_GPIOA_P1_SHIFT	8
++#define SSB_SPROM4_GPIOB		0x0058	/* Gen. Purpose IO # 2 and 3 */
++#define  SSB_SPROM4_GPIOB_P2		0x00FF	/* Pin 2 */
++#define  SSB_SPROM4_GPIOB_P3		0xFF00	/* Pin 3 */
++#define  SSB_SPROM4_GPIOB_P3_SHIFT	8
++#define SSB_SPROM4_ETHPHY		0x005A	/* Ethernet PHY settings ?? */
+ #define  SSB_SPROM4_ETHPHY_ET0A		0x001F	/* MII Address for enet0 */
+ #define  SSB_SPROM4_ETHPHY_ET1A		0x03E0	/* MII Address for enet1 */
+ #define  SSB_SPROM4_ETHPHY_ET1A_SHIFT	5
+ #define  SSB_SPROM4_ETHPHY_ET0M		(1<<14)	/* MDIO for enet0 */
+ #define  SSB_SPROM4_ETHPHY_ET1M		(1<<15)	/* MDIO for enet1 */
+-#define SSB_SPROM4_CCODE		0x1052	/* Country Code (2 bytes) */
+-#define SSB_SPROM4_ANTAVAIL		0x105D  /* Antenna available bitfields */
+-#define SSB_SPROM4_ANTAVAIL_A		0x00FF	/* A-PHY bitfield */
+-#define SSB_SPROM4_ANTAVAIL_A_SHIFT	0
+-#define SSB_SPROM4_ANTAVAIL_BG		0xFF00	/* B-PHY and G-PHY bitfield */
+-#define SSB_SPROM4_ANTAVAIL_BG_SHIFT	8
+-#define SSB_SPROM4_BFLLO		0x1044	/* Boardflags (low 16 bits) */
+-#define SSB_SPROM4_AGAIN01		0x105E	/* Antenna Gain (in dBm Q5.2) */
++#define SSB_SPROM4_ANTAVAIL		0x005D  /* Antenna available bitfields */
++#define  SSB_SPROM4_ANTAVAIL_A		0x00FF	/* A-PHY bitfield */
++#define  SSB_SPROM4_ANTAVAIL_A_SHIFT	0
++#define  SSB_SPROM4_ANTAVAIL_BG		0xFF00	/* B-PHY and G-PHY bitfield */
++#define  SSB_SPROM4_ANTAVAIL_BG_SHIFT	8
++#define SSB_SPROM4_AGAIN01		0x005E	/* Antenna Gain (in dBm Q5.2) */
+ #define  SSB_SPROM4_AGAIN0		0x00FF	/* Antenna 0 */
+ #define  SSB_SPROM4_AGAIN0_SHIFT	0
+ #define  SSB_SPROM4_AGAIN1		0xFF00	/* Antenna 1 */
+ #define  SSB_SPROM4_AGAIN1_SHIFT	8
+-#define SSB_SPROM4_AGAIN23		0x1060
++#define SSB_SPROM4_AGAIN23		0x0060
+ #define  SSB_SPROM4_AGAIN2		0x00FF	/* Antenna 2 */
+ #define  SSB_SPROM4_AGAIN2_SHIFT	0
+ #define  SSB_SPROM4_AGAIN3		0xFF00	/* Antenna 3 */
+ #define  SSB_SPROM4_AGAIN3_SHIFT	8
+-#define SSB_SPROM4_BFLHI		0x1046  /* Board Flags Hi */
+-#define SSB_SPROM4_MAXP_BG		0x1080  /* Max Power BG in path 1 */
++#define SSB_SPROM4_MAXP_BG		0x0080  /* Max Power BG in path 1 */
+ #define  SSB_SPROM4_MAXP_BG_MASK	0x00FF  /* Mask for Max Power BG */
+ #define  SSB_SPROM4_ITSSI_BG		0xFF00	/* Mask for path 1 itssi_bg */
+ #define  SSB_SPROM4_ITSSI_BG_SHIFT	8
+-#define SSB_SPROM4_MAXP_A		0x108A  /* Max Power A in path 1 */
++#define SSB_SPROM4_MAXP_A		0x008A  /* Max Power A in path 1 */
+ #define  SSB_SPROM4_MAXP_A_MASK		0x00FF  /* Mask for Max Power A */
+ #define  SSB_SPROM4_ITSSI_A		0xFF00	/* Mask for path 1 itssi_a */
+ #define  SSB_SPROM4_ITSSI_A_SHIFT	8
+-#define SSB_SPROM4_GPIOA		0x1056	/* Gen. Purpose IO # 0 and 1 */
+-#define  SSB_SPROM4_GPIOA_P0		0x00FF	/* Pin 0 */
+-#define  SSB_SPROM4_GPIOA_P1		0xFF00	/* Pin 1 */
+-#define  SSB_SPROM4_GPIOA_P1_SHIFT	8
+-#define SSB_SPROM4_GPIOB		0x1058	/* Gen. Purpose IO # 2 and 3 */
+-#define  SSB_SPROM4_GPIOB_P2		0x00FF	/* Pin 2 */
+-#define  SSB_SPROM4_GPIOB_P3		0xFF00	/* Pin 3 */
+-#define  SSB_SPROM4_GPIOB_P3_SHIFT	8
+-#define SSB_SPROM4_PA0B0		0x1082	/* The paXbY locations are */
+-#define SSB_SPROM4_PA0B1		0x1084	/*   only guesses */
+-#define SSB_SPROM4_PA0B2		0x1086
+-#define SSB_SPROM4_PA1B0		0x108E
+-#define SSB_SPROM4_PA1B1		0x1090
+-#define SSB_SPROM4_PA1B2		0x1092
++#define SSB_SPROM4_PA0B0		0x0082	/* The paXbY locations are */
++#define SSB_SPROM4_PA0B1		0x0084	/*   only guesses */
++#define SSB_SPROM4_PA0B2		0x0086
++#define SSB_SPROM4_PA1B0		0x008E
++#define SSB_SPROM4_PA1B1		0x0090
++#define SSB_SPROM4_PA1B2		0x0092
+ 
+ /* SPROM Revision 5 (inherits most data from rev 4) */
+-#define SSB_SPROM5_BFLLO		0x104A	/* Boardflags (low 16 bits) */
+-#define SSB_SPROM5_BFLHI		0x104C  /* Board Flags Hi */
+-#define SSB_SPROM5_IL0MAC		0x1052	/* 6 byte MAC address for a/b/g/n */
+-#define SSB_SPROM5_CCODE		0x1044	/* Country Code (2 bytes) */
+-#define SSB_SPROM5_GPIOA		0x1076	/* Gen. Purpose IO # 0 and 1 */
++#define SSB_SPROM5_CCODE		0x0044	/* Country Code (2 bytes) */
++#define SSB_SPROM5_BFLLO		0x004A	/* Boardflags (low 16 bits) */
++#define SSB_SPROM5_BFLHI		0x004C  /* Board Flags Hi */
++#define SSB_SPROM5_IL0MAC		0x0052	/* 6 byte MAC address for a/b/g/n */
++#define SSB_SPROM5_GPIOA		0x0076	/* Gen. Purpose IO # 0 and 1 */
+ #define  SSB_SPROM5_GPIOA_P0		0x00FF	/* Pin 0 */
+ #define  SSB_SPROM5_GPIOA_P1		0xFF00	/* Pin 1 */
+ #define  SSB_SPROM5_GPIOA_P1_SHIFT	8
+-#define SSB_SPROM5_GPIOB		0x1078	/* Gen. Purpose IO # 2 and 3 */
++#define SSB_SPROM5_GPIOB		0x0078	/* Gen. Purpose IO # 2 and 3 */
+ #define  SSB_SPROM5_GPIOB_P2		0x00FF	/* Pin 2 */
+ #define  SSB_SPROM5_GPIOB_P3		0xFF00	/* Pin 3 */
+ #define  SSB_SPROM5_GPIOB_P3_SHIFT	8
+ 
+ /* SPROM Revision 8 */
+-#define SSB_SPROM8_BOARDREV		0x1082	/* Board revision */
+-#define SSB_SPROM8_BFLLO		0x1084	/* Board flags (bits 0-15) */
+-#define SSB_SPROM8_BFLHI		0x1086	/* Board flags (bits 16-31) */
+-#define SSB_SPROM8_BFL2LO		0x1088	/* Board flags (bits 32-47) */
+-#define SSB_SPROM8_BFL2HI		0x108A	/* Board flags (bits 48-63) */
+-#define SSB_SPROM8_IL0MAC		0x108C	/* 6 byte MAC address */
+-#define SSB_SPROM8_CCODE		0x1092	/* 2 byte country code */
+-#define SSB_SPROM8_ANTAVAIL		0x109C  /* Antenna available bitfields*/
+-#define SSB_SPROM8_ANTAVAIL_A		0xFF00	/* A-PHY bitfield */
+-#define SSB_SPROM8_ANTAVAIL_A_SHIFT	8
+-#define SSB_SPROM8_ANTAVAIL_BG		0x00FF	/* B-PHY and G-PHY bitfield */
+-#define SSB_SPROM8_ANTAVAIL_BG_SHIFT	0
+-#define SSB_SPROM8_AGAIN01		0x109E	/* Antenna Gain (in dBm Q5.2) */
++#define SSB_SPROM8_BOARDREV		0x0082	/* Board revision */
++#define SSB_SPROM8_BFLLO		0x0084	/* Board flags (bits 0-15) */
++#define SSB_SPROM8_BFLHI		0x0086	/* Board flags (bits 16-31) */
++#define SSB_SPROM8_BFL2LO		0x0088	/* Board flags (bits 32-47) */
++#define SSB_SPROM8_BFL2HI		0x008A	/* Board flags (bits 48-63) */
++#define SSB_SPROM8_IL0MAC		0x008C	/* 6 byte MAC address */
++#define SSB_SPROM8_CCODE		0x0092	/* 2 byte country code */
++#define SSB_SPROM8_GPIOA		0x0096	/*Gen. Purpose IO # 0 and 1 */
++#define  SSB_SPROM8_GPIOA_P0		0x00FF	/* Pin 0 */
++#define  SSB_SPROM8_GPIOA_P1		0xFF00	/* Pin 1 */
++#define  SSB_SPROM8_GPIOA_P1_SHIFT	8
++#define SSB_SPROM8_GPIOB		0x0098	/* Gen. Purpose IO # 2 and 3 */
++#define  SSB_SPROM8_GPIOB_P2		0x00FF	/* Pin 2 */
++#define  SSB_SPROM8_GPIOB_P3		0xFF00	/* Pin 3 */
++#define  SSB_SPROM8_GPIOB_P3_SHIFT	8
++#define SSB_SPROM8_ANTAVAIL		0x009C  /* Antenna available bitfields*/
++#define  SSB_SPROM8_ANTAVAIL_A		0xFF00	/* A-PHY bitfield */
++#define  SSB_SPROM8_ANTAVAIL_A_SHIFT	8
++#define  SSB_SPROM8_ANTAVAIL_BG		0x00FF	/* B-PHY and G-PHY bitfield */
++#define  SSB_SPROM8_ANTAVAIL_BG_SHIFT	0
++#define SSB_SPROM8_AGAIN01		0x009E	/* Antenna Gain (in dBm Q5.2) */
+ #define  SSB_SPROM8_AGAIN0		0x00FF	/* Antenna 0 */
+ #define  SSB_SPROM8_AGAIN0_SHIFT	0
+ #define  SSB_SPROM8_AGAIN1		0xFF00	/* Antenna 1 */
+ #define  SSB_SPROM8_AGAIN1_SHIFT	8
+-#define SSB_SPROM8_AGAIN23		0x10A0
++#define SSB_SPROM8_AGAIN23		0x00A0
+ #define  SSB_SPROM8_AGAIN2		0x00FF	/* Antenna 2 */
+ #define  SSB_SPROM8_AGAIN2_SHIFT	0
+ #define  SSB_SPROM8_AGAIN3		0xFF00	/* Antenna 3 */
+ #define  SSB_SPROM8_AGAIN3_SHIFT	8
+-#define SSB_SPROM8_GPIOA		0x1096	/*Gen. Purpose IO # 0 and 1 */
+-#define  SSB_SPROM8_GPIOA_P0		0x00FF	/* Pin 0 */
+-#define  SSB_SPROM8_GPIOA_P1		0xFF00	/* Pin 1 */
+-#define  SSB_SPROM8_GPIOA_P1_SHIFT	8
+-#define SSB_SPROM8_GPIOB		0x1098	/* Gen. Purpose IO # 2 and 3 */
+-#define  SSB_SPROM8_GPIOB_P2		0x00FF	/* Pin 2 */
+-#define  SSB_SPROM8_GPIOB_P3		0xFF00	/* Pin 3 */
+-#define  SSB_SPROM8_GPIOB_P3_SHIFT	8
+-#define SSB_SPROM8_RSSIPARM2G		0x10A4	/* RSSI params for 2GHz */
++#define SSB_SPROM8_RSSIPARM2G		0x00A4	/* RSSI params for 2GHz */
+ #define  SSB_SPROM8_RSSISMF2G		0x000F
+ #define  SSB_SPROM8_RSSISMC2G		0x00F0
+ #define  SSB_SPROM8_RSSISMC2G_SHIFT	4
+@@ -365,7 +366,7 @@
+ #define  SSB_SPROM8_RSSISAV2G_SHIFT	8
+ #define  SSB_SPROM8_BXA2G		0x1800
+ #define  SSB_SPROM8_BXA2G_SHIFT		11
+-#define SSB_SPROM8_RSSIPARM5G		0x10A6	/* RSSI params for 5GHz */
++#define SSB_SPROM8_RSSIPARM5G		0x00A6	/* RSSI params for 5GHz */
+ #define  SSB_SPROM8_RSSISMF5G		0x000F
+ #define  SSB_SPROM8_RSSISMC5G		0x00F0
+ #define  SSB_SPROM8_RSSISMC5G_SHIFT	4
+@@ -373,47 +374,47 @@
+ #define  SSB_SPROM8_RSSISAV5G_SHIFT	8
+ #define  SSB_SPROM8_BXA5G		0x1800
+ #define  SSB_SPROM8_BXA5G_SHIFT		11
+-#define SSB_SPROM8_TRI25G		0x10A8	/* TX isolation 2.4&5.3GHz */
++#define SSB_SPROM8_TRI25G		0x00A8	/* TX isolation 2.4&5.3GHz */
+ #define  SSB_SPROM8_TRI2G		0x00FF	/* TX isolation 2.4GHz */
+ #define  SSB_SPROM8_TRI5G		0xFF00	/* TX isolation 5.3GHz */
+ #define  SSB_SPROM8_TRI5G_SHIFT		8
+-#define SSB_SPROM8_TRI5GHL		0x10AA	/* TX isolation 5.2/5.8GHz */
++#define SSB_SPROM8_TRI5GHL		0x00AA	/* TX isolation 5.2/5.8GHz */
+ #define  SSB_SPROM8_TRI5GL		0x00FF	/* TX isolation 5.2GHz */
+ #define  SSB_SPROM8_TRI5GH		0xFF00	/* TX isolation 5.8GHz */
+ #define  SSB_SPROM8_TRI5GH_SHIFT	8
+-#define SSB_SPROM8_RXPO			0x10AC  /* RX power offsets */
++#define SSB_SPROM8_RXPO			0x00AC  /* RX power offsets */
+ #define  SSB_SPROM8_RXPO2G		0x00FF	/* 2GHz RX power offset */
+ #define  SSB_SPROM8_RXPO5G		0xFF00	/* 5GHz RX power offset */
+ #define  SSB_SPROM8_RXPO5G_SHIFT	8
+-#define SSB_SPROM8_MAXP_BG		0x10C0  /* Max Power 2GHz in path 1 */
++#define SSB_SPROM8_MAXP_BG		0x00C0  /* Max Power 2GHz in path 1 */
+ #define  SSB_SPROM8_MAXP_BG_MASK	0x00FF  /* Mask for Max Power 2GHz */
+ #define  SSB_SPROM8_ITSSI_BG		0xFF00	/* Mask for path 1 itssi_bg */
+ #define  SSB_SPROM8_ITSSI_BG_SHIFT	8
+-#define SSB_SPROM8_PA0B0		0x10C2	/* 2GHz power amp settings */
+-#define SSB_SPROM8_PA0B1		0x10C4
+-#define SSB_SPROM8_PA0B2		0x10C6
+-#define SSB_SPROM8_MAXP_A		0x10C8  /* Max Power 5.3GHz */
++#define SSB_SPROM8_PA0B0		0x00C2	/* 2GHz power amp settings */
++#define SSB_SPROM8_PA0B1		0x00C4
++#define SSB_SPROM8_PA0B2		0x00C6
++#define SSB_SPROM8_MAXP_A		0x00C8  /* Max Power 5.3GHz */
+ #define  SSB_SPROM8_MAXP_A_MASK		0x00FF  /* Mask for Max Power 5.3GHz */
+ #define  SSB_SPROM8_ITSSI_A		0xFF00	/* Mask for path 1 itssi_a */
+ #define  SSB_SPROM8_ITSSI_A_SHIFT	8
+-#define SSB_SPROM8_MAXP_AHL		0x10CA  /* Max Power 5.2/5.8GHz */
++#define SSB_SPROM8_MAXP_AHL		0x00CA  /* Max Power 5.2/5.8GHz */
+ #define  SSB_SPROM8_MAXP_AH_MASK	0x00FF  /* Mask for Max Power 5.8GHz */
+ #define  SSB_SPROM8_MAXP_AL_MASK	0xFF00  /* Mask for Max Power 5.2GHz */
+ #define  SSB_SPROM8_MAXP_AL_SHIFT	8
+-#define SSB_SPROM8_PA1B0		0x10CC	/* 5.3GHz power amp settings */
+-#define SSB_SPROM8_PA1B1		0x10CE
+-#define SSB_SPROM8_PA1B2		0x10D0
+-#define SSB_SPROM8_PA1LOB0		0x10D2	/* 5.2GHz power amp settings */
+-#define SSB_SPROM8_PA1LOB1		0x10D4
+-#define SSB_SPROM8_PA1LOB2		0x10D6
+-#define SSB_SPROM8_PA1HIB0		0x10D8	/* 5.8GHz power amp settings */
+-#define SSB_SPROM8_PA1HIB1		0x10DA
+-#define SSB_SPROM8_PA1HIB2		0x10DC
+-#define SSB_SPROM8_CCK2GPO		0x1140	/* CCK power offset */
+-#define SSB_SPROM8_OFDM2GPO		0x1142	/* 2.4GHz OFDM power offset */
+-#define SSB_SPROM8_OFDM5GPO		0x1146	/* 5.3GHz OFDM power offset */
+-#define SSB_SPROM8_OFDM5GLPO		0x114A	/* 5.2GHz OFDM power offset */
+-#define SSB_SPROM8_OFDM5GHPO		0x114E	/* 5.8GHz OFDM power offset */
++#define SSB_SPROM8_PA1B0		0x00CC	/* 5.3GHz power amp settings */
++#define SSB_SPROM8_PA1B1		0x00CE
++#define SSB_SPROM8_PA1B2		0x00D0
++#define SSB_SPROM8_PA1LOB0		0x00D2	/* 5.2GHz power amp settings */
++#define SSB_SPROM8_PA1LOB1		0x00D4
++#define SSB_SPROM8_PA1LOB2		0x00D6
++#define SSB_SPROM8_PA1HIB0		0x00D8	/* 5.8GHz power amp settings */
++#define SSB_SPROM8_PA1HIB1		0x00DA
++#define SSB_SPROM8_PA1HIB2		0x00DC
++#define SSB_SPROM8_CCK2GPO		0x0140	/* CCK power offset */
++#define SSB_SPROM8_OFDM2GPO		0x0142	/* 2.4GHz OFDM power offset */
++#define SSB_SPROM8_OFDM5GPO		0x0146	/* 5.3GHz OFDM power offset */
++#define SSB_SPROM8_OFDM5GLPO		0x014A	/* 5.2GHz OFDM power offset */
++#define SSB_SPROM8_OFDM5GHPO		0x014E	/* 5.8GHz OFDM power offset */
+ 
+ /* Values for SSB_SPROM1_BINF_CCODE */
+ enum {
diff --git a/target/linux/generic-2.6/patches-2.6.33/001-squashfs_move_zlib_decomp.patch b/target/linux/generic-2.6/patches-2.6.33/001-squashfs_move_zlib_decomp.patch
deleted file mode 100644
index 94096791f..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/001-squashfs_move_zlib_decomp.patch
+++ /dev/null
@@ -1,244 +0,0 @@
-From 6c4419d997d4431bb62e73475cd6b084e83efbd1 Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Tue, 22 Sep 2009 19:25:24 +0100
-Subject: [PATCH] Squashfs: move zlib decompression wrapper code into a separate file
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/Makefile       |    2 +-
- fs/squashfs/block.c        |   74 ++----------------------------
- fs/squashfs/squashfs.h     |    4 ++
- fs/squashfs/zlib_wrapper.c |  109 ++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 118 insertions(+), 71 deletions(-)
- create mode 100644 fs/squashfs/zlib_wrapper.c
-
---- a/fs/squashfs/Makefile
-+++ b/fs/squashfs/Makefile
-@@ -4,4 +4,4 @@
- 
- obj-$(CONFIG_SQUASHFS) += squashfs.o
- squashfs-y += block.o cache.o dir.o export.o file.o fragment.o id.o inode.o
--squashfs-y += namei.o super.o symlink.o
-+squashfs-y += namei.o super.o symlink.o zlib_wrapper.o
---- a/fs/squashfs/block.c
-+++ b/fs/squashfs/block.c
-@@ -29,7 +29,6 @@
- #include <linux/fs.h>
- #include <linux/vfs.h>
- #include <linux/slab.h>
--#include <linux/mutex.h>
- #include <linux/string.h>
- #include <linux/buffer_head.h>
- #include <linux/zlib.h>
-@@ -153,72 +152,10 @@ int squashfs_read_data(struct super_bloc
- 	}
- 
- 	if (compressed) {
--		int zlib_err = 0, zlib_init = 0;
--
--		/*
--		 * Uncompress block.
--		 */
--
--		mutex_lock(&msblk->read_data_mutex);
--
--		msblk->stream.avail_out = 0;
--		msblk->stream.avail_in = 0;
--
--		bytes = length;
--		do {
--			if (msblk->stream.avail_in == 0 && k < b) {
--				avail = min(bytes, msblk->devblksize - offset);
--				bytes -= avail;
--				wait_on_buffer(bh[k]);
--				if (!buffer_uptodate(bh[k]))
--					goto release_mutex;
--
--				if (avail == 0) {
--					offset = 0;
--					put_bh(bh[k++]);
--					continue;
--				}
--
--				msblk->stream.next_in = bh[k]->b_data + offset;
--				msblk->stream.avail_in = avail;
--				offset = 0;
--			}
--
--			if (msblk->stream.avail_out == 0 && page < pages) {
--				msblk->stream.next_out = buffer[page++];
--				msblk->stream.avail_out = PAGE_CACHE_SIZE;
--			}
--
--			if (!zlib_init) {
--				zlib_err = zlib_inflateInit(&msblk->stream);
--				if (zlib_err != Z_OK) {
--					ERROR("zlib_inflateInit returned"
--						" unexpected result 0x%x,"
--						" srclength %d\n", zlib_err,
--						srclength);
--					goto release_mutex;
--				}
--				zlib_init = 1;
--			}
--
--			zlib_err = zlib_inflate(&msblk->stream, Z_SYNC_FLUSH);
--
--			if (msblk->stream.avail_in == 0 && k < b)
--				put_bh(bh[k++]);
--		} while (zlib_err == Z_OK);
--
--		if (zlib_err != Z_STREAM_END) {
--			ERROR("zlib_inflate error, data probably corrupt\n");
--			goto release_mutex;
--		}
--
--		zlib_err = zlib_inflateEnd(&msblk->stream);
--		if (zlib_err != Z_OK) {
--			ERROR("zlib_inflate error, data probably corrupt\n");
--			goto release_mutex;
--		}
--		length = msblk->stream.total_out;
--		mutex_unlock(&msblk->read_data_mutex);
-+		length = zlib_uncompress(msblk, buffer, bh, b, offset, length,
-+			srclength, pages);
-+		if (length < 0)
-+			goto read_failure;
- 	} else {
- 		/*
- 		 * Block is uncompressed.
-@@ -255,9 +192,6 @@ int squashfs_read_data(struct super_bloc
- 	kfree(bh);
- 	return length;
- 
--release_mutex:
--	mutex_unlock(&msblk->read_data_mutex);
--
- block_release:
- 	for (; k < b; k++)
- 		put_bh(bh[k]);
---- a/fs/squashfs/squashfs.h
-+++ b/fs/squashfs/squashfs.h
-@@ -70,6 +70,10 @@ extern struct inode *squashfs_iget(struc
- 				unsigned int);
- extern int squashfs_read_inode(struct inode *, long long);
- 
-+/* zlib_wrapper.c */
-+extern int zlib_uncompress(struct squashfs_sb_info *, void **,
-+				struct buffer_head **, int, int, int, int, int);
-+
- /*
-  * Inodes and files operations
-  */
---- /dev/null
-+++ b/fs/squashfs/zlib_wrapper.c
-@@ -0,0 +1,109 @@
-+/*
-+ * Squashfs - a compressed read only filesystem for Linux
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-+ * Phillip Lougher <phillip@lougher.demon.co.uk>
-+ *
-+ * 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,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ *
-+ * zlib_wrapper.c
-+ */
-+
-+
-+#include <linux/mutex.h>
-+#include <linux/buffer_head.h>
-+#include <linux/zlib.h>
-+
-+#include "squashfs_fs.h"
-+#include "squashfs_fs_sb.h"
-+#include "squashfs_fs_i.h"
-+#include "squashfs.h"
-+
-+int zlib_uncompress(struct squashfs_sb_info *msblk, void **buffer,
-+	struct buffer_head **bh, int b, int offset, int length, int srclength,
-+	int pages)
-+{
-+	int zlib_err = 0, zlib_init = 0;
-+	int avail, bytes, k = 0, page = 0;
-+
-+	mutex_lock(&msblk->read_data_mutex);
-+
-+	msblk->stream.avail_out = 0;
-+	msblk->stream.avail_in = 0;
-+
-+	bytes = length;
-+	do {
-+		if (msblk->stream.avail_in == 0 && k < b) {
-+			avail = min(bytes, msblk->devblksize - offset);
-+			bytes -= avail;
-+			wait_on_buffer(bh[k]);
-+			if (!buffer_uptodate(bh[k]))
-+				goto release_mutex;
-+
-+			if (avail == 0) {
-+				offset = 0;
-+				put_bh(bh[k++]);
-+				continue;
-+			}
-+
-+			msblk->stream.next_in = bh[k]->b_data + offset;
-+			msblk->stream.avail_in = avail;
-+			offset = 0;
-+		}
-+
-+		if (msblk->stream.avail_out == 0 && page < pages) {
-+			msblk->stream.next_out = buffer[page++];
-+			msblk->stream.avail_out = PAGE_CACHE_SIZE;
-+		}
-+
-+		if (!zlib_init) {
-+			zlib_err = zlib_inflateInit(&msblk->stream);
-+			if (zlib_err != Z_OK) {
-+				ERROR("zlib_inflateInit returned unexpected "
-+					"result 0x%x, srclength %d\n",
-+					zlib_err, srclength);
-+				goto release_mutex;
-+			}
-+			zlib_init = 1;
-+		}
-+
-+		zlib_err = zlib_inflate(&msblk->stream, Z_SYNC_FLUSH);
-+
-+		if (msblk->stream.avail_in == 0 && k < b)
-+			put_bh(bh[k++]);
-+	} while (zlib_err == Z_OK);
-+
-+	if (zlib_err != Z_STREAM_END) {
-+		ERROR("zlib_inflate error, data probably corrupt\n");
-+		goto release_mutex;
-+	}
-+
-+	zlib_err = zlib_inflateEnd(&msblk->stream);
-+	if (zlib_err != Z_OK) {
-+		ERROR("zlib_inflate error, data probably corrupt\n");
-+		goto release_mutex;
-+	}
-+
-+	mutex_unlock(&msblk->read_data_mutex);
-+	return msblk->stream.total_out;
-+
-+release_mutex:
-+	mutex_unlock(&msblk->read_data_mutex);
-+
-+	for (; k < b; k++)
-+		put_bh(bh[k]);
-+
-+	return -EIO;
-+}
diff --git a/target/linux/generic-2.6/patches-2.6.33/002-squashfs_factor_out_remaining_zlib.patch b/target/linux/generic-2.6/patches-2.6.33/002-squashfs_factor_out_remaining_zlib.patch
deleted file mode 100644
index eacbb97ae..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/002-squashfs_factor_out_remaining_zlib.patch
+++ /dev/null
@@ -1,317 +0,0 @@
-From 37c44e85fd49676ec15ccaeea065662c1fbcda7d Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Wed, 23 Sep 2009 19:04:49 +0100
-Subject: [PATCH] Squashfs: Factor out remaining zlib dependencies into separate wrapper file
-
-Move zlib buffer init/destroy code into separate wrapper file.  Also
-make zlib z_stream field a void * removing the need to include zlib.h
-for most files.
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/block.c          |    1 -
- fs/squashfs/cache.c          |    1 -
- fs/squashfs/dir.c            |    1 -
- fs/squashfs/export.c         |    1 -
- fs/squashfs/file.c           |    1 -
- fs/squashfs/fragment.c       |    1 -
- fs/squashfs/id.c             |    1 -
- fs/squashfs/inode.c          |    1 -
- fs/squashfs/namei.c          |    1 -
- fs/squashfs/squashfs.h       |    2 +
- fs/squashfs/squashfs_fs_sb.h |    2 +-
- fs/squashfs/super.c          |   14 +++------
- fs/squashfs/symlink.c        |    1 -
- fs/squashfs/zlib_wrapper.c   |   56 ++++++++++++++++++++++++++++++++---------
- 14 files changed, 51 insertions(+), 33 deletions(-)
-
---- a/fs/squashfs/block.c
-+++ b/fs/squashfs/block.c
-@@ -31,7 +31,6 @@
- #include <linux/slab.h>
- #include <linux/string.h>
- #include <linux/buffer_head.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/cache.c
-+++ b/fs/squashfs/cache.c
-@@ -51,7 +51,6 @@
- #include <linux/sched.h>
- #include <linux/spinlock.h>
- #include <linux/wait.h>
--#include <linux/zlib.h>
- #include <linux/pagemap.h>
- 
- #include "squashfs_fs.h"
---- a/fs/squashfs/dir.c
-+++ b/fs/squashfs/dir.c
-@@ -30,7 +30,6 @@
- #include <linux/fs.h>
- #include <linux/vfs.h>
- #include <linux/slab.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/export.c
-+++ b/fs/squashfs/export.c
-@@ -39,7 +39,6 @@
- #include <linux/vfs.h>
- #include <linux/dcache.h>
- #include <linux/exportfs.h>
--#include <linux/zlib.h>
- #include <linux/slab.h>
- 
- #include "squashfs_fs.h"
---- a/fs/squashfs/file.c
-+++ b/fs/squashfs/file.c
-@@ -47,7 +47,6 @@
- #include <linux/string.h>
- #include <linux/pagemap.h>
- #include <linux/mutex.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/fragment.c
-+++ b/fs/squashfs/fragment.c
-@@ -36,7 +36,6 @@
- #include <linux/fs.h>
- #include <linux/vfs.h>
- #include <linux/slab.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/id.c
-+++ b/fs/squashfs/id.c
-@@ -34,7 +34,6 @@
- #include <linux/fs.h>
- #include <linux/vfs.h>
- #include <linux/slab.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/inode.c
-+++ b/fs/squashfs/inode.c
-@@ -40,7 +40,6 @@
- 
- #include <linux/fs.h>
- #include <linux/vfs.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/namei.c
-+++ b/fs/squashfs/namei.c
-@@ -57,7 +57,6 @@
- #include <linux/slab.h>
- #include <linux/string.h>
- #include <linux/dcache.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/squashfs.h
-+++ b/fs/squashfs/squashfs.h
-@@ -71,6 +71,8 @@ extern struct inode *squashfs_iget(struc
- extern int squashfs_read_inode(struct inode *, long long);
- 
- /* zlib_wrapper.c */
-+extern void *zlib_init(void);
-+extern void zlib_free(void *);
- extern int zlib_uncompress(struct squashfs_sb_info *, void **,
- 				struct buffer_head **, int, int, int, int, int);
- 
---- a/fs/squashfs/squashfs_fs_sb.h
-+++ b/fs/squashfs/squashfs_fs_sb.h
-@@ -64,7 +64,7 @@ struct squashfs_sb_info {
- 	struct mutex		read_data_mutex;
- 	struct mutex		meta_index_mutex;
- 	struct meta_index	*meta_index;
--	z_stream		stream;
-+	void			*stream;
- 	__le64			*inode_lookup_table;
- 	u64			inode_table;
- 	u64			directory_table;
---- a/fs/squashfs/super.c
-+++ b/fs/squashfs/super.c
-@@ -35,7 +35,6 @@
- #include <linux/pagemap.h>
- #include <linux/init.h>
- #include <linux/module.h>
--#include <linux/zlib.h>
- #include <linux/magic.h>
- 
- #include "squashfs_fs.h"
-@@ -87,12 +86,9 @@ static int squashfs_fill_super(struct su
- 	}
- 	msblk = sb->s_fs_info;
- 
--	msblk->stream.workspace = kmalloc(zlib_inflate_workspacesize(),
--		GFP_KERNEL);
--	if (msblk->stream.workspace == NULL) {
--		ERROR("Failed to allocate zlib workspace\n");
-+	msblk->stream = zlib_init();
-+	if (msblk->stream == NULL)
- 		goto failure;
--	}
- 
- 	sblk = kzalloc(sizeof(*sblk), GFP_KERNEL);
- 	if (sblk == NULL) {
-@@ -292,17 +288,17 @@ failed_mount:
- 	squashfs_cache_delete(msblk->block_cache);
- 	squashfs_cache_delete(msblk->fragment_cache);
- 	squashfs_cache_delete(msblk->read_page);
-+	zlib_free(msblk->stream);
- 	kfree(msblk->inode_lookup_table);
- 	kfree(msblk->fragment_index);
- 	kfree(msblk->id_table);
--	kfree(msblk->stream.workspace);
- 	kfree(sb->s_fs_info);
- 	sb->s_fs_info = NULL;
- 	kfree(sblk);
- 	return err;
- 
- failure:
--	kfree(msblk->stream.workspace);
-+	zlib_free(msblk->stream);
- 	kfree(sb->s_fs_info);
- 	sb->s_fs_info = NULL;
- 	return -ENOMEM;
-@@ -346,10 +342,10 @@ static void squashfs_put_super(struct su
- 		squashfs_cache_delete(sbi->block_cache);
- 		squashfs_cache_delete(sbi->fragment_cache);
- 		squashfs_cache_delete(sbi->read_page);
-+		zlib_free(sbi->stream);
- 		kfree(sbi->id_table);
- 		kfree(sbi->fragment_index);
- 		kfree(sbi->meta_index);
--		kfree(sbi->stream.workspace);
- 		kfree(sb->s_fs_info);
- 		sb->s_fs_info = NULL;
- 	}
---- a/fs/squashfs/symlink.c
-+++ b/fs/squashfs/symlink.c
-@@ -36,7 +36,6 @@
- #include <linux/slab.h>
- #include <linux/string.h>
- #include <linux/pagemap.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/zlib_wrapper.c
-+++ b/fs/squashfs/zlib_wrapper.c
-@@ -31,21 +31,51 @@
- #include "squashfs_fs_i.h"
- #include "squashfs.h"
- 
-+void *zlib_init()
-+{
-+	z_stream *stream = kmalloc(sizeof(z_stream), GFP_KERNEL);
-+	if (stream == NULL)
-+		goto failed;
-+	stream->workspace = kmalloc(zlib_inflate_workspacesize(),
-+		GFP_KERNEL);
-+	if (stream->workspace == NULL)
-+		goto failed;
-+
-+	return stream;
-+
-+failed:
-+	ERROR("Failed to allocate zlib workspace\n");
-+	kfree(stream);
-+	return NULL;
-+}
-+
-+
-+void zlib_free(void *strm)
-+{
-+	z_stream *stream = strm;
-+
-+	if (stream)
-+		kfree(stream->workspace);
-+	kfree(stream);
-+}
-+
-+
- int zlib_uncompress(struct squashfs_sb_info *msblk, void **buffer,
- 	struct buffer_head **bh, int b, int offset, int length, int srclength,
- 	int pages)
- {
- 	int zlib_err = 0, zlib_init = 0;
- 	int avail, bytes, k = 0, page = 0;
-+	z_stream *stream = msblk->stream;
- 
- 	mutex_lock(&msblk->read_data_mutex);
- 
--	msblk->stream.avail_out = 0;
--	msblk->stream.avail_in = 0;
-+	stream->avail_out = 0;
-+	stream->avail_in = 0;
- 
- 	bytes = length;
- 	do {
--		if (msblk->stream.avail_in == 0 && k < b) {
-+		if (stream->avail_in == 0 && k < b) {
- 			avail = min(bytes, msblk->devblksize - offset);
- 			bytes -= avail;
- 			wait_on_buffer(bh[k]);
-@@ -58,18 +88,18 @@ int zlib_uncompress(struct squashfs_sb_i
- 				continue;
- 			}
- 
--			msblk->stream.next_in = bh[k]->b_data + offset;
--			msblk->stream.avail_in = avail;
-+			stream->next_in = bh[k]->b_data + offset;
-+			stream->avail_in = avail;
- 			offset = 0;
- 		}
- 
--		if (msblk->stream.avail_out == 0 && page < pages) {
--			msblk->stream.next_out = buffer[page++];
--			msblk->stream.avail_out = PAGE_CACHE_SIZE;
-+		if (stream->avail_out == 0 && page < pages) {
-+			stream->next_out = buffer[page++];
-+			stream->avail_out = PAGE_CACHE_SIZE;
- 		}
- 
- 		if (!zlib_init) {
--			zlib_err = zlib_inflateInit(&msblk->stream);
-+			zlib_err = zlib_inflateInit(stream);
- 			if (zlib_err != Z_OK) {
- 				ERROR("zlib_inflateInit returned unexpected "
- 					"result 0x%x, srclength %d\n",
-@@ -79,9 +109,9 @@ int zlib_uncompress(struct squashfs_sb_i
- 			zlib_init = 1;
- 		}
- 
--		zlib_err = zlib_inflate(&msblk->stream, Z_SYNC_FLUSH);
-+		zlib_err = zlib_inflate(stream, Z_SYNC_FLUSH);
- 
--		if (msblk->stream.avail_in == 0 && k < b)
-+		if (stream->avail_in == 0 && k < b)
- 			put_bh(bh[k++]);
- 	} while (zlib_err == Z_OK);
- 
-@@ -90,14 +120,14 @@ int zlib_uncompress(struct squashfs_sb_i
- 		goto release_mutex;
- 	}
- 
--	zlib_err = zlib_inflateEnd(&msblk->stream);
-+	zlib_err = zlib_inflateEnd(stream);
- 	if (zlib_err != Z_OK) {
- 		ERROR("zlib_inflate error, data probably corrupt\n");
- 		goto release_mutex;
- 	}
- 
- 	mutex_unlock(&msblk->read_data_mutex);
--	return msblk->stream.total_out;
-+	return stream->total_out;
- 
- release_mutex:
- 	mutex_unlock(&msblk->read_data_mutex);
diff --git a/target/linux/generic-2.6/patches-2.6.33/003-squashfs_add_decompressor_framework.patch b/target/linux/generic-2.6/patches-2.6.33/003-squashfs_add_decompressor_framework.patch
deleted file mode 100644
index fdf0d407a..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/003-squashfs_add_decompressor_framework.patch
+++ /dev/null
@@ -1,426 +0,0 @@
-From 327fbf47a419befc6bff74f3ca42d2b6f0841903 Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Tue, 6 Oct 2009 04:04:15 +0100
-Subject: [PATCH] Squashfs: add a decompressor framework
-
-This adds a decompressor framework which allows multiple compression
-algorithms to be cleanly supported.
-
-Also update zlib wrapper and other code to use the new framework.
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/Makefile         |    2 +-
- fs/squashfs/block.c          |    6 ++--
- fs/squashfs/decompressor.c   |   58 ++++++++++++++++++++++++++++++++++++++++++
- fs/squashfs/decompressor.h   |   55 +++++++++++++++++++++++++++++++++++++++
- fs/squashfs/squashfs.h       |   14 +++++-----
- fs/squashfs/squashfs_fs_sb.h |   41 +++++++++++++++--------------
- fs/squashfs/super.c          |   45 ++++++++++++++++++-------------
- fs/squashfs/zlib_wrapper.c   |   17 ++++++++++--
- 8 files changed, 185 insertions(+), 53 deletions(-)
- create mode 100644 fs/squashfs/decompressor.c
- create mode 100644 fs/squashfs/decompressor.h
-
---- a/fs/squashfs/Makefile
-+++ b/fs/squashfs/Makefile
-@@ -4,4 +4,4 @@
- 
- obj-$(CONFIG_SQUASHFS) += squashfs.o
- squashfs-y += block.o cache.o dir.o export.o file.o fragment.o id.o inode.o
--squashfs-y += namei.o super.o symlink.o zlib_wrapper.o
-+squashfs-y += namei.o super.o symlink.o zlib_wrapper.o decompressor.o
---- a/fs/squashfs/block.c
-+++ b/fs/squashfs/block.c
-@@ -36,7 +36,7 @@
- #include "squashfs_fs_sb.h"
- #include "squashfs_fs_i.h"
- #include "squashfs.h"
--
-+#include "decompressor.h"
- /*
-  * Read the metadata block length, this is stored in the first two
-  * bytes of the metadata block.
-@@ -151,8 +151,8 @@ int squashfs_read_data(struct super_bloc
- 	}
- 
- 	if (compressed) {
--		length = zlib_uncompress(msblk, buffer, bh, b, offset, length,
--			srclength, pages);
-+		length = squashfs_decompress(msblk, buffer, bh, b, offset,
-+			length, srclength, pages);
- 		if (length < 0)
- 			goto read_failure;
- 	} else {
---- /dev/null
-+++ b/fs/squashfs/decompressor.c
-@@ -0,0 +1,58 @@
-+/*
-+ * Squashfs - a compressed read only filesystem for Linux
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-+ * Phillip Lougher <phillip@lougher.demon.co.uk>
-+ *
-+ * 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,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ *
-+ * decompressor.c
-+ */
-+
-+#include <linux/types.h>
-+#include <linux/mutex.h>
-+#include <linux/buffer_head.h>
-+
-+#include "squashfs_fs.h"
-+#include "squashfs_fs_sb.h"
-+#include "squashfs_fs_i.h"
-+#include "decompressor.h"
-+#include "squashfs.h"
-+
-+/*
-+ * This file (and decompressor.h) implements a decompressor framework for
-+ * Squashfs, allowing multiple decompressors to be easily supported
-+ */
-+
-+static const struct squashfs_decompressor squashfs_unknown_comp_ops = {
-+	NULL, NULL, NULL, 0, "unknown", 0
-+};
-+
-+static const struct squashfs_decompressor *decompressor[] = {
-+	&squashfs_zlib_comp_ops,
-+	&squashfs_unknown_comp_ops
-+};
-+
-+
-+const struct squashfs_decompressor *squashfs_lookup_decompressor(int id)
-+{
-+	int i;
-+
-+	for (i = 0; decompressor[i]->id; i++)
-+		if (id == decompressor[i]->id)
-+			break;
-+
-+	return decompressor[i];
-+}
---- /dev/null
-+++ b/fs/squashfs/decompressor.h
-@@ -0,0 +1,55 @@
-+#ifndef DECOMPRESSOR_H
-+#define DECOMPRESSOR_H
-+/*
-+ * Squashfs - a compressed read only filesystem for Linux
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-+ * Phillip Lougher <phillip@lougher.demon.co.uk>
-+ *
-+ * 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,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ *
-+ * decompressor.h
-+ */
-+
-+struct squashfs_decompressor {
-+	void	*(*init)(void);
-+	void	(*free)(void *);
-+	int	(*decompress)(struct squashfs_sb_info *, void **,
-+		struct buffer_head **, int, int, int, int, int);
-+	int	id;
-+	char	*name;
-+	int	supported;
-+};
-+
-+static inline void *squashfs_decompressor_init(struct squashfs_sb_info *msblk)
-+{
-+	return msblk->decompressor->init();
-+}
-+
-+static inline void squashfs_decompressor_free(struct squashfs_sb_info *msblk,
-+	void *s)
-+{
-+	if (msblk->decompressor)
-+		msblk->decompressor->free(s);
-+}
-+
-+static inline int squashfs_decompress(struct squashfs_sb_info *msblk,
-+	void **buffer, struct buffer_head **bh, int b, int offset, int length,
-+	int srclength, int pages)
-+{
-+	return msblk->decompressor->decompress(msblk, buffer, bh, b, offset,
-+		length, srclength, pages);
-+}
-+#endif
---- a/fs/squashfs/squashfs.h
-+++ b/fs/squashfs/squashfs.h
-@@ -51,6 +51,9 @@ extern struct squashfs_cache_entry *squa
- 				u64, int);
- extern int squashfs_read_table(struct super_block *, void *, u64, int);
- 
-+/* decompressor.c */
-+extern const struct squashfs_decompressor *squashfs_lookup_decompressor(int);
-+
- /* export.c */
- extern __le64 *squashfs_read_inode_lookup_table(struct super_block *, u64,
- 				unsigned int);
-@@ -70,14 +73,8 @@ extern struct inode *squashfs_iget(struc
- 				unsigned int);
- extern int squashfs_read_inode(struct inode *, long long);
- 
--/* zlib_wrapper.c */
--extern void *zlib_init(void);
--extern void zlib_free(void *);
--extern int zlib_uncompress(struct squashfs_sb_info *, void **,
--				struct buffer_head **, int, int, int, int, int);
--
- /*
-- * Inodes and files operations
-+ * Inodes, files and decompressor operations
-  */
- 
- /* dir.c */
-@@ -94,3 +91,6 @@ extern const struct inode_operations squ
- 
- /* symlink.c */
- extern const struct address_space_operations squashfs_symlink_aops;
-+
-+/* zlib_wrapper.c */
-+extern const struct squashfs_decompressor squashfs_zlib_comp_ops;
---- a/fs/squashfs/squashfs_fs_sb.h
-+++ b/fs/squashfs/squashfs_fs_sb.h
-@@ -52,25 +52,26 @@ struct squashfs_cache_entry {
- };
- 
- struct squashfs_sb_info {
--	int			devblksize;
--	int			devblksize_log2;
--	struct squashfs_cache	*block_cache;
--	struct squashfs_cache	*fragment_cache;
--	struct squashfs_cache	*read_page;
--	int			next_meta_index;
--	__le64			*id_table;
--	__le64			*fragment_index;
--	unsigned int		*fragment_index_2;
--	struct mutex		read_data_mutex;
--	struct mutex		meta_index_mutex;
--	struct meta_index	*meta_index;
--	void			*stream;
--	__le64			*inode_lookup_table;
--	u64			inode_table;
--	u64			directory_table;
--	unsigned int		block_size;
--	unsigned short		block_log;
--	long long		bytes_used;
--	unsigned int		inodes;
-+	const struct squashfs_decompressor	*decompressor;
-+	int					devblksize;
-+	int					devblksize_log2;
-+	struct squashfs_cache			*block_cache;
-+	struct squashfs_cache			*fragment_cache;
-+	struct squashfs_cache			*read_page;
-+	int					next_meta_index;
-+	__le64					*id_table;
-+	__le64					*fragment_index;
-+	unsigned int				*fragment_index_2;
-+	struct mutex				read_data_mutex;
-+	struct mutex				meta_index_mutex;
-+	struct meta_index			*meta_index;
-+	void					*stream;
-+	__le64					*inode_lookup_table;
-+	u64					inode_table;
-+	u64					directory_table;
-+	unsigned int				block_size;
-+	unsigned short				block_log;
-+	long long				bytes_used;
-+	unsigned int				inodes;
- };
- #endif
---- a/fs/squashfs/super.c
-+++ b/fs/squashfs/super.c
-@@ -41,27 +41,35 @@
- #include "squashfs_fs_sb.h"
- #include "squashfs_fs_i.h"
- #include "squashfs.h"
-+#include "decompressor.h"
- 
- static struct file_system_type squashfs_fs_type;
- static const struct super_operations squashfs_super_ops;
- 
--static int supported_squashfs_filesystem(short major, short minor, short comp)
-+static const struct squashfs_decompressor *supported_squashfs_filesystem(short
-+	major, short minor, short id)
- {
-+	const struct squashfs_decompressor *decompressor;
-+
- 	if (major < SQUASHFS_MAJOR) {
- 		ERROR("Major/Minor mismatch, older Squashfs %d.%d "
- 			"filesystems are unsupported\n", major, minor);
--		return -EINVAL;
-+		return NULL;
- 	} else if (major > SQUASHFS_MAJOR || minor > SQUASHFS_MINOR) {
- 		ERROR("Major/Minor mismatch, trying to mount newer "
- 			"%d.%d filesystem\n", major, minor);
- 		ERROR("Please update your kernel\n");
--		return -EINVAL;
-+		return NULL;
- 	}
- 
--	if (comp != ZLIB_COMPRESSION)
--		return -EINVAL;
-+	decompressor = squashfs_lookup_decompressor(id);
-+	if (!decompressor->supported) {
-+		ERROR("Filesystem uses \"%s\" compression. This is not "
-+			"supported\n", decompressor->name);
-+		return NULL;
-+	}
- 
--	return 0;
-+	return decompressor;
- }
- 
- 
-@@ -86,10 +94,6 @@ static int squashfs_fill_super(struct su
- 	}
- 	msblk = sb->s_fs_info;
- 
--	msblk->stream = zlib_init();
--	if (msblk->stream == NULL)
--		goto failure;
--
- 	sblk = kzalloc(sizeof(*sblk), GFP_KERNEL);
- 	if (sblk == NULL) {
- 		ERROR("Failed to allocate squashfs_super_block\n");
-@@ -116,25 +120,25 @@ static int squashfs_fill_super(struct su
- 		goto failed_mount;
- 	}
- 
-+	err = -EINVAL;
-+
- 	/* Check it is a SQUASHFS superblock */
- 	sb->s_magic = le32_to_cpu(sblk->s_magic);
- 	if (sb->s_magic != SQUASHFS_MAGIC) {
- 		if (!silent)
- 			ERROR("Can't find a SQUASHFS superblock on %s\n",
- 						bdevname(sb->s_bdev, b));
--		err = -EINVAL;
- 		goto failed_mount;
- 	}
- 
--	/* Check the MAJOR & MINOR versions and compression type */
--	err = supported_squashfs_filesystem(le16_to_cpu(sblk->s_major),
-+	/* Check the MAJOR & MINOR versions and lookup compression type */
-+	msblk->decompressor = supported_squashfs_filesystem(
-+			le16_to_cpu(sblk->s_major),
- 			le16_to_cpu(sblk->s_minor),
- 			le16_to_cpu(sblk->compression));
--	if (err < 0)
-+	if (msblk->decompressor == NULL)
- 		goto failed_mount;
- 
--	err = -EINVAL;
--
- 	/*
- 	 * Check if there's xattrs in the filesystem.  These are not
- 	 * supported in this version, so warn that they will be ignored.
-@@ -201,6 +205,10 @@ static int squashfs_fill_super(struct su
- 
- 	err = -ENOMEM;
- 
-+	msblk->stream = squashfs_decompressor_init(msblk);
-+	if (msblk->stream == NULL)
-+		goto failed_mount;
-+
- 	msblk->block_cache = squashfs_cache_init("metadata",
- 			SQUASHFS_CACHED_BLKS, SQUASHFS_METADATA_SIZE);
- 	if (msblk->block_cache == NULL)
-@@ -288,7 +296,7 @@ failed_mount:
- 	squashfs_cache_delete(msblk->block_cache);
- 	squashfs_cache_delete(msblk->fragment_cache);
- 	squashfs_cache_delete(msblk->read_page);
--	zlib_free(msblk->stream);
-+	squashfs_decompressor_free(msblk, msblk->stream);
- 	kfree(msblk->inode_lookup_table);
- 	kfree(msblk->fragment_index);
- 	kfree(msblk->id_table);
-@@ -298,7 +306,6 @@ failed_mount:
- 	return err;
- 
- failure:
--	zlib_free(msblk->stream);
- 	kfree(sb->s_fs_info);
- 	sb->s_fs_info = NULL;
- 	return -ENOMEM;
-@@ -342,7 +349,7 @@ static void squashfs_put_super(struct su
- 		squashfs_cache_delete(sbi->block_cache);
- 		squashfs_cache_delete(sbi->fragment_cache);
- 		squashfs_cache_delete(sbi->read_page);
--		zlib_free(sbi->stream);
-+		squashfs_decompressor_free(sbi, sbi->stream);
- 		kfree(sbi->id_table);
- 		kfree(sbi->fragment_index);
- 		kfree(sbi->meta_index);
---- a/fs/squashfs/zlib_wrapper.c
-+++ b/fs/squashfs/zlib_wrapper.c
-@@ -30,8 +30,9 @@
- #include "squashfs_fs_sb.h"
- #include "squashfs_fs_i.h"
- #include "squashfs.h"
-+#include "decompressor.h"
- 
--void *zlib_init()
-+static void *zlib_init(void)
- {
- 	z_stream *stream = kmalloc(sizeof(z_stream), GFP_KERNEL);
- 	if (stream == NULL)
-@@ -50,7 +51,7 @@ failed:
- }
- 
- 
--void zlib_free(void *strm)
-+static void zlib_free(void *strm)
- {
- 	z_stream *stream = strm;
- 
-@@ -60,7 +61,7 @@ void zlib_free(void *strm)
- }
- 
- 
--int zlib_uncompress(struct squashfs_sb_info *msblk, void **buffer,
-+static int zlib_uncompress(struct squashfs_sb_info *msblk, void **buffer,
- 	struct buffer_head **bh, int b, int offset, int length, int srclength,
- 	int pages)
- {
-@@ -137,3 +138,13 @@ release_mutex:
- 
- 	return -EIO;
- }
-+
-+const struct squashfs_decompressor squashfs_zlib_comp_ops = {
-+	.init = zlib_init,
-+	.free = zlib_free,
-+	.decompress = zlib_uncompress,
-+	.id = ZLIB_COMPRESSION,
-+	.name = "zlib",
-+	.supported = 1
-+};
-+
diff --git a/target/linux/generic-2.6/patches-2.6.33/004-squashfs_add_decompressor_lzma_lzo.patch b/target/linux/generic-2.6/patches-2.6.33/004-squashfs_add_decompressor_lzma_lzo.patch
deleted file mode 100644
index a378c0005..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/004-squashfs_add_decompressor_lzma_lzo.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 1885ca0a1973944684f252094a703b7c80dfc974 Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Wed, 14 Oct 2009 03:58:11 +0100
-Subject: [PATCH] Squashfs: add decompressor entries for lzma and lzo
-
-Add knowledge of lzma/lzo compression formats to the decompressor
-framework.  For now these are added as unsupported.  Without
-these entries lzma/lzo compressed filesystems will be flagged as
-having unknown compression which is undesirable.
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/decompressor.c |   10 ++++++++++
- fs/squashfs/squashfs_fs.h  |    4 +++-
- 2 files changed, 13 insertions(+), 1 deletions(-)
-
---- a/fs/squashfs/decompressor.c
-+++ b/fs/squashfs/decompressor.c
-@@ -36,12 +36,22 @@
-  * Squashfs, allowing multiple decompressors to be easily supported
-  */
- 
-+static const struct squashfs_decompressor squashfs_lzma_unsupported_comp_ops = {
-+	NULL, NULL, NULL, LZMA_COMPRESSION, "lzma", 0
-+};
-+
-+static const struct squashfs_decompressor squashfs_lzo_unsupported_comp_ops = {
-+	NULL, NULL, NULL, LZO_COMPRESSION, "lzo", 0
-+};
-+
- static const struct squashfs_decompressor squashfs_unknown_comp_ops = {
- 	NULL, NULL, NULL, 0, "unknown", 0
- };
- 
- static const struct squashfs_decompressor *decompressor[] = {
- 	&squashfs_zlib_comp_ops,
-+	&squashfs_lzma_unsupported_comp_ops,
-+	&squashfs_lzo_unsupported_comp_ops,
- 	&squashfs_unknown_comp_ops
- };
- 
---- a/fs/squashfs/squashfs_fs.h
-+++ b/fs/squashfs/squashfs_fs.h
-@@ -211,7 +211,9 @@ struct meta_index {
- /*
-  * definitions for structures on disk
-  */
--#define ZLIB_COMPRESSION	 1
-+#define ZLIB_COMPRESSION	1
-+#define LZMA_COMPRESSION	2
-+#define LZO_COMPRESSION		3
- 
- struct squashfs_super_block {
- 	__le32			s_magic;
diff --git a/target/linux/generic-2.6/patches-2.6.33/005-squashfs_extra_parameter.patch b/target/linux/generic-2.6/patches-2.6.33/005-squashfs_extra_parameter.patch
deleted file mode 100644
index 099168134..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/005-squashfs_extra_parameter.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 5f393ede3ddb5dd4cc2a9f243182fac45f1ce10b Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Wed, 14 Oct 2009 04:07:54 +0100
-Subject: [PATCH] Squashfs: add an extra parameter to the decompressor init function
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/decompressor.h |    4 ++--
- fs/squashfs/zlib_wrapper.c |    2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
---- a/fs/squashfs/decompressor.h
-+++ b/fs/squashfs/decompressor.h
-@@ -24,7 +24,7 @@
-  */
- 
- struct squashfs_decompressor {
--	void	*(*init)(void);
-+	void	*(*init)(struct squashfs_sb_info *);
- 	void	(*free)(void *);
- 	int	(*decompress)(struct squashfs_sb_info *, void **,
- 		struct buffer_head **, int, int, int, int, int);
-@@ -35,7 +35,7 @@ struct squashfs_decompressor {
- 
- static inline void *squashfs_decompressor_init(struct squashfs_sb_info *msblk)
- {
--	return msblk->decompressor->init();
-+	return msblk->decompressor->init(msblk);
- }
- 
- static inline void squashfs_decompressor_free(struct squashfs_sb_info *msblk,
---- a/fs/squashfs/zlib_wrapper.c
-+++ b/fs/squashfs/zlib_wrapper.c
-@@ -32,7 +32,7 @@
- #include "squashfs.h"
- #include "decompressor.h"
- 
--static void *zlib_init(void)
-+static void *zlib_init(struct squashfs_sb_info *dummy)
- {
- 	z_stream *stream = kmalloc(sizeof(z_stream), GFP_KERNEL);
- 	if (stream == NULL)
diff --git a/target/linux/generic-2.6/patches-2.6.33/006-squashfs_add_lzma.patch b/target/linux/generic-2.6/patches-2.6.33/006-squashfs_add_lzma.patch
deleted file mode 100644
index 9fd57970f..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/006-squashfs_add_lzma.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-From f49e1efdd179d54e814ff2a8e8f469496583062c Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Tue, 20 Oct 2009 10:54:36 +0100
-Subject: [PATCH] Squashfs: add LZMA compression
-
-Add support for LZMA compressed filesystems.  This is an initial
-implementation.
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/Kconfig        |    5 ++
- fs/squashfs/Makefile       |    1 +
- fs/squashfs/decompressor.c |    4 +
- fs/squashfs/lzma_wrapper.c |  151 ++++++++++++++++++++++++++++++++++++++++++++
- fs/squashfs/squashfs.h     |    3 +
- 5 files changed, 164 insertions(+), 0 deletions(-)
- create mode 100644 fs/squashfs/lzma_wrapper.c
-
---- a/fs/squashfs/Kconfig
-+++ b/fs/squashfs/Kconfig
-@@ -26,6 +26,11 @@ config SQUASHFS
- 
- 	  If unsure, say N.
- 
-+config SQUASHFS_LZMA
-+	bool "Include support for LZMA compressed file systems"
-+	depends on SQUASHFS
-+	select DECOMPRESS_LZMA
-+
- config SQUASHFS_EMBEDDED
- 
- 	bool "Additional option for memory-constrained systems" 
---- a/fs/squashfs/Makefile
-+++ b/fs/squashfs/Makefile
-@@ -5,3 +5,4 @@
- obj-$(CONFIG_SQUASHFS) += squashfs.o
- squashfs-y += block.o cache.o dir.o export.o file.o fragment.o id.o inode.o
- squashfs-y += namei.o super.o symlink.o zlib_wrapper.o decompressor.o
-+squashfs-$(CONFIG_SQUASHFS_LZMA) += lzma_wrapper.o
---- a/fs/squashfs/decompressor.c
-+++ b/fs/squashfs/decompressor.c
-@@ -50,7 +50,11 @@ static const struct squashfs_decompresso
- 
- static const struct squashfs_decompressor *decompressor[] = {
- 	&squashfs_zlib_comp_ops,
-+#ifdef CONFIG_SQUASHFS_LZMA
-+	&squashfs_lzma_comp_ops,
-+#else
- 	&squashfs_lzma_unsupported_comp_ops,
-+#endif
- 	&squashfs_lzo_unsupported_comp_ops,
- 	&squashfs_unknown_comp_ops
- };
---- /dev/null
-+++ b/fs/squashfs/lzma_wrapper.c
-@@ -0,0 +1,151 @@
-+/*
-+ * Squashfs - a compressed read only filesystem for Linux
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-+ * Phillip Lougher <phillip@lougher.demon.co.uk>
-+ *
-+ * 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,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ *
-+ * lzma_wrapper.c
-+ */
-+
-+#include <asm/unaligned.h>
-+#include <linux/buffer_head.h>
-+#include <linux/mutex.h>
-+#include <linux/vmalloc.h>
-+#include <linux/decompress/unlzma.h>
-+
-+#include "squashfs_fs.h"
-+#include "squashfs_fs_sb.h"
-+#include "squashfs_fs_i.h"
-+#include "squashfs.h"
-+#include "decompressor.h"
-+
-+struct squashfs_lzma {
-+	void	*input;
-+	void	*output;
-+};
-+
-+/* decompress_unlzma.c is currently non re-entrant... */
-+DEFINE_MUTEX(lzma_mutex);
-+
-+/* decompress_unlzma.c doesn't provide any context in its callbacks... */
-+static int lzma_error;
-+
-+static void error(char *m)
-+{
-+	ERROR("unlzma error: %s\n", m);
-+	lzma_error = 1;
-+}
-+
-+	
-+static void *lzma_init(struct squashfs_sb_info *msblk)
-+{
-+	struct squashfs_lzma *stream = kzalloc(sizeof(*stream), GFP_KERNEL);
-+	if (stream == NULL)
-+		goto failed;
-+	stream->input = vmalloc(msblk->block_size);
-+	if (stream->input == NULL)
-+		goto failed;
-+	stream->output = vmalloc(msblk->block_size);
-+	if (stream->output == NULL)
-+		goto failed2;
-+
-+	return stream;
-+
-+failed2:
-+	vfree(stream->input);
-+failed:
-+	ERROR("failed to allocate lzma workspace\n");
-+	kfree(stream);
-+	return NULL;
-+}
-+
-+
-+static void lzma_free(void *strm)
-+{
-+	struct squashfs_lzma *stream = strm;
-+
-+	if (stream) {
-+		vfree(stream->input);
-+		vfree(stream->output);
-+	}
-+	kfree(stream);
-+}
-+
-+
-+static int lzma_uncompress(struct squashfs_sb_info *msblk, void **buffer,
-+	struct buffer_head **bh, int b, int offset, int length, int srclength,
-+	int pages)
-+{
-+	struct squashfs_lzma *stream = msblk->stream;
-+	void *buff = stream->input;
-+	int avail, i, bytes = length, res;
-+
-+	mutex_lock(&lzma_mutex);
-+
-+	for (i = 0; i < b; i++) {
-+		wait_on_buffer(bh[i]);
-+		if (!buffer_uptodate(bh[i]))
-+			goto block_release;
-+
-+		avail = min(bytes, msblk->devblksize - offset);
-+		memcpy(buff, bh[i]->b_data + offset, avail);
-+		buff += avail;
-+		bytes -= avail;
-+		offset = 0;
-+		put_bh(bh[i]);
-+	}
-+
-+	lzma_error = 0;
-+	res = unlzma(stream->input, length, NULL, NULL, stream->output, NULL,
-+							error);
-+	if (res || lzma_error)
-+		goto failed;
-+
-+	/* uncompressed size is stored in the LZMA header (5 byte offset) */
-+	res = bytes = get_unaligned_le32(stream->input + 5);
-+	for (i = 0, buff = stream->output; bytes && i < pages; i++) {
-+		avail = min_t(int, bytes, PAGE_CACHE_SIZE);
-+		memcpy(buffer[i], buff, avail);
-+		buff += avail;
-+		bytes -= avail;
-+	}
-+	if (bytes)
-+		goto failed;
-+
-+	mutex_unlock(&lzma_mutex);
-+	return res;
-+
-+block_release:
-+	for (; i < b; i++)
-+		put_bh(bh[i]);
-+
-+failed:
-+	mutex_unlock(&lzma_mutex);
-+
-+	ERROR("lzma decompression failed, data probably corrupt\n");
-+	return -EIO;
-+}
-+
-+const struct squashfs_decompressor squashfs_lzma_comp_ops = {
-+	.init = lzma_init,
-+	.free = lzma_free,
-+	.decompress = lzma_uncompress,
-+	.id = LZMA_COMPRESSION,
-+	.name = "lzma",
-+	.supported = 1
-+};
-+
---- a/fs/squashfs/squashfs.h
-+++ b/fs/squashfs/squashfs.h
-@@ -94,3 +94,6 @@ extern const struct address_space_operat
- 
- /* zlib_wrapper.c */
- extern const struct squashfs_decompressor squashfs_zlib_comp_ops;
-+
-+/* lzma wrapper.c */
-+extern const struct squashfs_decompressor squashfs_lzma_comp_ops;
diff --git a/target/linux/generic-2.6/patches-2.6.33/007-squashfs_make_lzma_available.patch b/target/linux/generic-2.6/patches-2.6.33/007-squashfs_make_lzma_available.patch
deleted file mode 100644
index c1a105d0d..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/007-squashfs_make_lzma_available.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-From fdf23ed283bc6ef5c25076ce2065f892120ff556 Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Thu, 22 Oct 2009 04:57:38 +0100
-Subject: [PATCH] Squashfs: Make unlzma available to non initramfs/initrd code
-
-Add a config option DECOMPRESS_LZMA_NEEDED which allows subsystems to
-specify they need the unlzma code.  Normally decompress_unlzma.c is
-compiled with __init and unlzma is not exported to modules.
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/Kconfig                   |    1 +
- include/linux/decompress/bunzip2_mm.h |   12 ++++++++++++
- include/linux/decompress/inflate_mm.h |   12 ++++++++++++
- include/linux/decompress/mm.h         |    3 ---
- include/linux/decompress/unlzma_mm.h  |   20 ++++++++++++++++++++
- lib/Kconfig                           |    3 +++
- lib/decompress_bunzip2.c              |    1 +
- lib/decompress_inflate.c              |    1 +
- lib/decompress_unlzma.c               |    5 ++++-
- 9 files changed, 54 insertions(+), 4 deletions(-)
- create mode 100644 include/linux/decompress/bunzip2_mm.h
- create mode 100644 include/linux/decompress/inflate_mm.h
- create mode 100644 include/linux/decompress/unlzma_mm.h
-
---- a/fs/squashfs/Kconfig
-+++ b/fs/squashfs/Kconfig
-@@ -30,6 +30,7 @@ config SQUASHFS_LZMA
- 	bool "Include support for LZMA compressed file systems"
- 	depends on SQUASHFS
- 	select DECOMPRESS_LZMA
-+	select DECOMPRESS_LZMA_NEEDED
- 
- config SQUASHFS_EMBEDDED
- 
---- /dev/null
-+++ b/include/linux/decompress/bunzip2_mm.h
-@@ -0,0 +1,12 @@
-+#ifndef BUNZIP2_MM_H
-+#define BUNZIP2_MM_H
-+
-+#ifdef STATIC
-+/* Code active when included from pre-boot environment: */
-+#define INIT
-+#else
-+/* Compile for initramfs/initrd code only */
-+#define INIT __init
-+#endif
-+
-+#endif
---- /dev/null
-+++ b/include/linux/decompress/inflate_mm.h
-@@ -0,0 +1,12 @@
-+#ifndef INFLATE_MM_H
-+#define INFLATE_MM_H
-+
-+#ifdef STATIC
-+/* Code active when included from pre-boot environment: */
-+#define INIT
-+#else
-+/* Compile for initramfs/initrd code only */
-+#define INIT __init
-+#endif
-+
-+#endif
---- a/include/linux/decompress/mm.h
-+++ b/include/linux/decompress/mm.h
-@@ -63,8 +63,6 @@ static void free(void *where)
- 
- #define set_error_fn(x)
- 
--#define INIT
--
- #else /* STATIC */
- 
- /* Code active when compiled standalone for use when loading ramdisk: */
-@@ -87,7 +85,6 @@ static void free(void *where)
- static void(*error)(char *m);
- #define set_error_fn(x) error = x;
- 
--#define INIT __init
- #define STATIC
- 
- #include <linux/init.h>
---- /dev/null
-+++ b/include/linux/decompress/unlzma_mm.h
-@@ -0,0 +1,20 @@
-+#ifndef UNLZMA_MM_H
-+#define UNLZMA_MM_H
-+
-+#ifdef STATIC
-+
-+/* Code active when included from pre-boot environment: */
-+#define INIT
-+
-+#elif defined(CONFIG_DECOMPRESS_LZMA_NEEDED)
-+
-+/* Make it available to non initramfs/initrd code */
-+#define INIT
-+#include <linux/module.h>
-+#else
-+
-+/* Compile for initramfs/initrd code only */
-+#define INIT __init
-+#endif
-+
-+#endif
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -121,6 +121,9 @@ config DECOMPRESS_LZO
- 	select LZO_DECOMPRESS
- 	tristate
- 
-+config DECOMPRESS_LZMA_NEEDED
-+	 boolean
-+
- #
- # Generic allocator support is selected if needed
- #
---- a/lib/decompress_bunzip2.c
-+++ b/lib/decompress_bunzip2.c
-@@ -52,6 +52,7 @@
- #include <linux/slab.h>
- #endif /* STATIC */
- 
-+#include <linux/decompress/bunzip2_mm.h>
- #include <linux/decompress/mm.h>
- 
- #ifndef INT_MAX
---- a/lib/decompress_inflate.c
-+++ b/lib/decompress_inflate.c
-@@ -23,6 +23,7 @@
- 
- #endif /* STATIC */
- 
-+#include <linux/decompress/inflate_mm.h>
- #include <linux/decompress/mm.h>
- 
- #define GZIP_IOBUF_SIZE (16*1024)
---- a/lib/decompress_unlzma.c
-+++ b/lib/decompress_unlzma.c
-@@ -36,6 +36,7 @@
- #include <linux/slab.h>
- #endif /* STATIC */
- 
-+#include <linux/decompress/unlzma_mm.h>
- #include <linux/decompress/mm.h>
- 
- #define	MIN(a, b) (((a) < (b)) ? (a) : (b))
-@@ -531,7 +532,7 @@ static inline void INIT process_bit1(str
- 
- 
- 
--STATIC inline int INIT unlzma(unsigned char *buf, int in_len,
-+STATIC int INIT unlzma(unsigned char *buf, int in_len,
- 			      int(*fill)(void*, unsigned int),
- 			      int(*flush)(void*, unsigned int),
- 			      unsigned char *output,
-@@ -664,4 +665,6 @@ STATIC int INIT decompress(unsigned char
- {
- 	return unlzma(buf, in_len - 4, fill, flush, output, posp, error_fn);
- }
-+#elif defined(CONFIG_DECOMPRESS_LZMA_NEEDED)
-+EXPORT_SYMBOL(unlzma);
- #endif
diff --git a/target/linux/generic-2.6/patches-2.6.33/011-mips_boot.patch b/target/linux/generic-2.6/patches-2.6.33/011-mips_boot.patch
deleted file mode 100644
index c2a043acd..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/011-mips_boot.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/mips/kernel/head.S
-+++ b/arch/mips/kernel/head.S
-@@ -121,6 +121,8 @@
- #endif
- 	.endm
- 
-+	j kernel_entry
-+	nop
- #ifndef CONFIG_NO_EXCEPT_FILL
- 	/*
- 	 * Reserved space for exception handlers.
diff --git a/target/linux/generic-2.6/patches-2.6.33/012-extra_optimization.patch b/target/linux/generic-2.6/patches-2.6.33/012-extra_optimization.patch
deleted file mode 100644
index 0b5174cbb..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/012-extra_optimization.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -529,7 +529,7 @@ all: vmlinux
- ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
- KBUILD_CFLAGS	+= -Os
- else
--KBUILD_CFLAGS	+= -O2
-+KBUILD_CFLAGS	+= -O2 -fno-reorder-blocks -fno-tree-ch
- endif
- 
- include $(srctree)/arch/$(SRCARCH)/Makefile
-@@ -567,6 +567,9 @@ endif
- NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
- CHECKFLAGS     += $(NOSTDINC_FLAGS)
- 
-+# improve gcc optimization
-+CFLAGS += $(call cc-option,-funit-at-a-time,)
-+
- # warn about C99 declaration after statement
- KBUILD_CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)
- 
diff --git a/target/linux/generic-2.6/patches-2.6.33/013-gcc4_inline_fix.patch b/target/linux/generic-2.6/patches-2.6.33/013-gcc4_inline_fix.patch
deleted file mode 100644
index 77ab40543..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/013-gcc4_inline_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/mips/include/asm/system.h
-+++ b/arch/mips/include/asm/system.h
-@@ -194,7 +194,7 @@ extern __u64 __xchg_u64_unsupported_on_3
- #define __xchg_u64 __xchg_u64_unsupported_on_32bit_kernels
- #endif
- 
--static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
-+static __always_inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
- {
- 	switch (size) {
- 	case 4:
diff --git a/target/linux/generic-2.6/patches-2.6.33/014-samsung_flash b/target/linux/generic-2.6/patches-2.6.33/014-samsung_flash
deleted file mode 100644
index e2a456915..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/014-samsung_flash
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -51,6 +51,7 @@
- #define SST49LF040B	        0x0050
- #define SST49LF008A		0x005a
- #define AT49BV6416		0x00d6
-+#define MANUFACTURER_SAMSUNG	0x00ec
- 
- static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
- static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
-@@ -375,12 +376,19 @@ struct mtd_info *cfi_cmdset_0002(struct
- 
- 		if (extp->MajorVersion != '1' ||
- 		    (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
--			printk(KERN_ERR "  Unknown Amd/Fujitsu Extended Query "
--			       "version %c.%c.\n",  extp->MajorVersion,
--			       extp->MinorVersion);
--			kfree(extp);
--			kfree(mtd);
--			return NULL;
-+		        if (cfi->mfr == MANUFACTURER_SAMSUNG &&
-+			    (extp->MajorVersion == '3' && extp->MinorVersion == '3')) {
-+			    printk(KERN_NOTICE "  Newer Samsung flash detected, "
-+			           "should be compatibile with Amd/Fujitsu.\n");
-+		        }
-+		        else {
-+			    printk(KERN_ERR "  Unknown Amd/Fujitsu Extended Query "
-+			           "version %c.%c.\n",  extp->MajorVersion,
-+			           extp->MinorVersion);
-+			    kfree(extp);
-+			    kfree(mtd);
-+			    return NULL;
-+		        }
- 		}
- 
- 		/* Install our own private info structure */
diff --git a/target/linux/generic-2.6/patches-2.6.33/020-mips_multi_machine_support.patch b/target/linux/generic-2.6/patches-2.6.33/020-mips_multi_machine_support.patch
deleted file mode 100644
index 589fa4fbf..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/020-mips_multi_machine_support.patch
+++ /dev/null
@@ -1,173 +0,0 @@
---- /dev/null
-+++ b/arch/mips/include/asm/mips_machine.h
-@@ -0,0 +1,47 @@
-+/*
-+ *  Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
-+ *
-+ *  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 __ASM_MIPS_MACHINE_H
-+#define __ASM_MIPS_MACHINE_H
-+
-+#include <linux/init.h>
-+#include <linux/list.h>
-+
-+struct mips_machine {
-+	unsigned long		mach_type;
-+	void			(*mach_setup)(void);
-+	char			*mach_name;
-+	struct list_head	list;
-+};
-+
-+void mips_machine_register(struct mips_machine *) __init;
-+void mips_machine_setup(unsigned long machtype) __init;
-+void mips_machine_set_name(char *name) __init;
-+
-+extern char *mips_machine_name;
-+
-+#define MIPS_MACHINE(_type, _name, _setup) 			\
-+static char machine_name_##_type[] __initdata = _name;		\
-+static struct mips_machine machine_##_type __initdata =		\
-+{								\
-+	.mach_type	= _type,				\
-+	.mach_name	= machine_name_##_type,			\
-+	.mach_setup	= _setup,				\
-+};								\
-+								\
-+static int __init register_machine_##_type(void)		\
-+{								\
-+	mips_machine_register(&machine_##_type);		\
-+	return 0;						\
-+}								\
-+								\
-+pure_initcall(register_machine_##_type)
-+
-+#endif /* __ASM_MIPS_MACHINE_H */
-+
---- /dev/null
-+++ b/arch/mips/kernel/mips_machine.c
-@@ -0,0 +1,74 @@
-+/*
-+ *  Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
-+ *
-+ *  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.
-+ *
-+ */
-+#include <linux/mm.h>
-+
-+#include <asm/mips_machine.h>
-+#include <asm/bootinfo.h>
-+
-+static struct list_head mips_machines __initdata =
-+		LIST_HEAD_INIT(mips_machines);
-+
-+char *mips_machine_name = "Unknown";
-+
-+static struct mips_machine * __init mips_machine_find(unsigned long machtype)
-+{
-+	struct list_head *this;
-+
-+	list_for_each(this, &mips_machines) {
-+		struct mips_machine *mach;
-+
-+		mach = list_entry(this, struct mips_machine, list);
-+		if (mach->mach_type == machtype)
-+			return mach;
-+	}
-+
-+	return NULL;
-+}
-+
-+void __init mips_machine_register(struct mips_machine *mach)
-+{
-+	list_add_tail(&mach->list, &mips_machines);
-+}
-+
-+void __init mips_machine_set_name(char *name)
-+{
-+	unsigned int len;
-+	char *p;
-+
-+	if (name == NULL)
-+		return;
-+
-+	len = strlen(name);
-+	p = kmalloc(len + 1, GFP_KERNEL);
-+	if (p) {
-+		strncpy(p, name, len);
-+		p[len] = '\0';
-+		mips_machine_name = p;
-+	} else {
-+		printk(KERN_WARNING "MIPS: no memory for machine_name\n");
-+	}
-+}
-+
-+void __init mips_machine_setup(unsigned long machtype)
-+{
-+	struct mips_machine *mach;
-+
-+	mach = mips_machine_find(machtype);
-+	if (!mach) {
-+		printk(KERN_ALERT "MIPS: no machine registered for "
-+			"machtype %lu\n", machtype);
-+		return;
-+	}
-+
-+	mips_machine_set_name(mach->mach_name);
-+	printk(KERN_INFO "MIPS: machine is %s\n", mips_machine_name);
-+
-+	if (mach->mach_setup)
-+		mach->mach_setup();
-+}
---- a/arch/mips/kernel/Makefile
-+++ b/arch/mips/kernel/Makefile
-@@ -93,6 +93,7 @@ obj-$(CONFIG_GPIO_TXX9)		+= gpio_txx9.o
- 
- obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o
- obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
-+obj-$(CONFIG_MIPS_MACHINE)	+= mips_machine.o
- 
- CFLAGS_cpu-bugs64.o	= $(shell if $(CC) $(KBUILD_CFLAGS) -Wa,-mdaddi -c -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-DHAVE_AS_SET_DADDI"; fi)
- 
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -851,6 +851,9 @@ config MIPS_DISABLE_OBSOLETE_IDE
- config SYNC_R4K
- 	bool
- 
-+config MIPS_MACHINE
-+	def_bool n
-+
- config NO_IOPORT
- 	def_bool n
- 
---- a/arch/mips/kernel/proc.c
-+++ b/arch/mips/kernel/proc.c
-@@ -12,6 +12,7 @@
- #include <asm/cpu-features.h>
- #include <asm/mipsregs.h>
- #include <asm/processor.h>
-+#include <asm/mips_machine.h>
- 
- unsigned int vced_count, vcei_count;
- 
-@@ -31,8 +32,12 @@ static int show_cpuinfo(struct seq_file
- 	/*
- 	 * For the first processor also print the system type
- 	 */
--	if (n == 0)
-+	if (n == 0) {
- 		seq_printf(m, "system type\t\t: %s\n", get_system_type());
-+#ifdef CONFIG_MIPS_MACHINE
-+		seq_printf(m, "machine\t\t\t: %s\n", mips_machine_name);
-+#endif
-+	}
- 
- 	seq_printf(m, "processor\t\t: %ld\n", n);
- 	sprintf(fmt, "cpu model\t\t: %%s V%%d.%%d%s\n",
diff --git a/target/linux/generic-2.6/patches-2.6.33/021-mips_image_cmdline_hack.patch b/target/linux/generic-2.6/patches-2.6.33/021-mips_image_cmdline_hack.patch
deleted file mode 100644
index 00de8d545..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/021-mips_image_cmdline_hack.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -854,6 +854,10 @@ config SYNC_R4K
- config MIPS_MACHINE
- 	def_bool n
- 
-+config IMAGE_CMDLINE_HACK
-+	bool "OpenWrt specific image command line hack"
-+	default n
-+
- config NO_IOPORT
- 	def_bool n
- 
---- a/arch/mips/kernel/head.S
-+++ b/arch/mips/kernel/head.S
-@@ -143,6 +143,12 @@ FEXPORT(__kernel_entry)
- 	j	kernel_entry
- #endif
- 
-+#ifdef CONFIG_IMAGE_CMDLINE_HACK
-+	.ascii	"CMDLINE:"
-+EXPORT(__image_cmdline)
-+	.fill	0x400
-+#endif /* CONFIG_IMAGE_CMDLINE_HACK */
-+
- 	__REF
- 
- NESTED(kernel_entry, 16, sp)			# kernel entry point
diff --git a/target/linux/generic-2.6/patches-2.6.33/022-mips_use_generic_thread_info_allocator.patch b/target/linux/generic-2.6/patches-2.6.33/022-mips_use_generic_thread_info_allocator.patch
deleted file mode 100644
index 786afd1dc..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/022-mips_use_generic_thread_info_allocator.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/arch/mips/include/asm/thread_info.h
-+++ b/arch/mips/include/asm/thread_info.h
-@@ -83,6 +83,7 @@ register struct thread_info *__current_t
- #define THREAD_SIZE (PAGE_SIZE << THREAD_SIZE_ORDER)
- #define THREAD_MASK (THREAD_SIZE - 1UL)
- 
-+#if 0
- #define __HAVE_ARCH_THREAD_INFO_ALLOCATOR
- 
- #ifdef CONFIG_DEBUG_STACK_USAGE
-@@ -92,6 +93,7 @@ register struct thread_info *__current_t
- #endif
- 
- #define free_thread_info(info) kfree(info)
-+#endif
- 
- #endif /* !__ASSEMBLY__ */
- 
diff --git a/target/linux/generic-2.6/patches-2.6.33/025-mips_disable_fpu.patch b/target/linux/generic-2.6/patches-2.6.33/025-mips_disable_fpu.patch
deleted file mode 100644
index e6b764e2d..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/025-mips_disable_fpu.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-MIPS: allow disabling the kernel FPU emulator
-
-This patch allows turning off the in-kernel Algorithmics
-FPU emulator support, which allows one to save a couple of
-precious blocks on an embedded system.
-
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -839,6 +839,17 @@ config I8259
- config MIPS_BONITO64
- 	bool
- 
-+config MIPS_FPU_EMU
-+	bool "Enable FPU emulation"
-+	default y
-+	help
-+	   This option allows building a kernel with or without the Algorithmics
-+	   FPU emulator enabled. Turning off this option results in a kernel which
-+	   does not catch floating operations exceptions. Make sure that your toolchain
-+	   is configured to enable software floating point emulation in that case.
-+		
-+	   If unsure say Y here.
-+
- config MIPS_MSC
- 	bool
- 
---- a/arch/mips/math-emu/Makefile
-+++ b/arch/mips/math-emu/Makefile
-@@ -2,12 +2,14 @@
- # Makefile for the Linux/MIPS kernel FPU emulation.
- #
- 
--obj-y	:= cp1emu.o ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
-+obj-y	:=	kernel_linkage.o dsemul.o cp1emu.o
-+
-+obj-$(CONFIG_MIPS_FPU_EMU)	+= ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
- 	   ieee754xcpt.o dp_frexp.o dp_modf.o dp_div.o dp_mul.o dp_sub.o \
- 	   dp_add.o dp_fsp.o dp_cmp.o dp_logb.o dp_scalb.o dp_simple.o \
- 	   dp_tint.o dp_fint.o dp_tlong.o dp_flong.o sp_frexp.o sp_modf.o \
- 	   sp_div.o sp_mul.o sp_sub.o sp_add.o sp_fdp.o sp_cmp.o sp_logb.o \
- 	   sp_scalb.o sp_simple.o sp_tint.o sp_fint.o sp_tlong.o sp_flong.o \
--	   dp_sqrt.o sp_sqrt.o kernel_linkage.o dsemul.o
-+	   dp_sqrt.o sp_sqrt.o
- 
- EXTRA_CFLAGS += -Werror
---- a/arch/mips/math-emu/cp1emu.c
-+++ b/arch/mips/math-emu/cp1emu.c
-@@ -58,7 +58,11 @@
- #define __mips 4
- 
- /* Function which emulates a floating point instruction. */
-+#ifdef CONFIG_DEBUG_FS
-+DEFINE_PER_CPU(struct mips_fpu_emulator_stats, fpuemustats);
-+#endif
- 
-+#ifdef CONFIG_MIPS_FPU_EMU
- static int fpu_emu(struct pt_regs *, struct mips_fpu_struct *,
- 	mips_instruction);
- 
-@@ -69,10 +73,6 @@ static int fpux_emu(struct pt_regs *,
- 
- /* Further private data for which no space exists in mips_fpu_struct */
- 
--#ifdef CONFIG_DEBUG_FS
--DEFINE_PER_CPU(struct mips_fpu_emulator_stats, fpuemustats);
--#endif
--
- /* Control registers */
- 
- #define FPCREG_RID	0	/* $0  = revision id */
-@@ -1277,7 +1277,6 @@ int fpu_emulator_cop1Handler(struct pt_r
- 
- 	return sig;
- }
--
- #ifdef CONFIG_DEBUG_FS
- 
- static int fpuemu_stat_get(void *data, u64 *val)
-@@ -1326,4 +1325,11 @@ static int __init debugfs_fpuemu(void)
- 	return 0;
- }
- __initcall(debugfs_fpuemu);
--#endif
-+#endif /* CONFIG_DEBUGFS */
-+#else
-+int fpu_emulator_cop1Handler(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
-+        int has_fpu)
-+{
-+	return 0;
-+}
-+#endif /* CONFIG_MIPS_FPU_EMU */
---- a/arch/mips/math-emu/dsemul.c
-+++ b/arch/mips/math-emu/dsemul.c
-@@ -109,6 +109,7 @@ int mips_dsemul(struct pt_regs *regs, mi
- 	return SIGILL;		/* force out of emulation loop */
- }
- 
-+#ifdef CONFIG_MIPS_FPU_EMU
- int do_dsemulret(struct pt_regs *xcp)
- {
- 	struct emuframe __user *fr;
-@@ -165,3 +166,9 @@ int do_dsemulret(struct pt_regs *xcp)
- 
- 	return 1;
- }
-+#else
-+int do_dsemulret(struct pt_regs *xcp)
-+{
-+	return 0;
-+}
-+#endif /* CONFIG_MIPS_FPU_EMU */
---- a/arch/mips/math-emu/kernel_linkage.c
-+++ b/arch/mips/math-emu/kernel_linkage.c
-@@ -29,6 +29,7 @@
- 
- #define SIGNALLING_NAN 0x7ff800007ff80000LL
- 
-+#ifdef CONFIG_MIPS_FPU_EMU
- void fpu_emulator_init_fpu(void)
- {
- 	static int first = 1;
-@@ -112,4 +113,36 @@ int fpu_emulator_restore_context32(struc
- 
- 	return err;
- }
--#endif
-+#endif	/* CONFIG_64BIT */
-+#else
-+
-+void fpu_emulator_init_fpu(void)
-+{
-+	printk(KERN_INFO "FPU emulator disabled, make sure your toolchain"
-+		"was compiled with software floating point support (soft-float)\n");
-+	return;
-+}
-+
-+int fpu_emulator_save_context(struct sigcontext __user *sc)
-+{
-+	return 0;
-+}
-+
-+int fpu_emulator_restore_context(struct sigcontext __user *sc)
-+{
-+	return 0;
-+}
-+
-+int fpu_emulator_save_context32(struct sigcontext32 __user *sc)
-+{
-+	return 0;
-+}
-+
-+int fpu_emulator_restore_context32(struct sigcontext32 __user *sc)
-+{
-+	return 0;
-+}
-+
-+#ifdef CONFIG_64BIT
-+#endif	/* CONFIG_64BIT */
-+#endif /* CONFIG_MIPS_FPU_EMU */
diff --git a/target/linux/generic-2.6/patches-2.6.33/027-mips_module_reloc.patch b/target/linux/generic-2.6/patches-2.6.33/027-mips_module_reloc.patch
deleted file mode 100644
index 024e7f16c..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/027-mips_module_reloc.patch
+++ /dev/null
@@ -1,368 +0,0 @@
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -93,7 +93,7 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin
- cflags-y			+= -G 0 -mno-abicalls -fno-pic -pipe
- cflags-y			+= -msoft-float
- LDFLAGS_vmlinux			+= -G 0 -static -n -nostdlib
--MODFLAGS			+= -mlong-calls
-+MODFLAGS			+= -mno-long-calls
- 
- cflags-y += -ffreestanding
- 
---- a/arch/mips/include/asm/module.h
-+++ b/arch/mips/include/asm/module.h
-@@ -9,6 +9,11 @@ struct mod_arch_specific {
- 	struct list_head dbe_list;
- 	const struct exception_table_entry *dbe_start;
- 	const struct exception_table_entry *dbe_end;
-+
-+	void *phys_plt_tbl;
-+	void *virt_plt_tbl;
-+	unsigned int phys_plt_offset;
-+	unsigned int virt_plt_offset;
- };
- 
- typedef uint8_t Elf64_Byte;		/* Type for a 8-bit quantity.  */
---- a/arch/mips/kernel/module.c
-+++ b/arch/mips/kernel/module.c
-@@ -43,6 +43,117 @@ static struct mips_hi16 *mips_hi16_list;
- static LIST_HEAD(dbe_list);
- static DEFINE_SPINLOCK(dbe_lock);
- 
-+/*
-+ * Get the potential max trampolines size required of the init and
-+ * non-init sections. Only used if we cannot find enough contiguous
-+ * physically mapped memory to put the module into.
-+ */
-+static unsigned int
-+get_plt_size(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,
-+             const char *secstrings, unsigned int symindex, bool is_init)
-+{
-+	unsigned long ret = 0;
-+	unsigned int i, j;
-+	Elf_Sym *syms;
-+
-+	/* Everything marked ALLOC (this includes the exported symbols) */
-+	for (i = 1; i < hdr->e_shnum; ++i) {
-+		unsigned int info = sechdrs[i].sh_info;
-+
-+		if (sechdrs[i].sh_type != SHT_REL
-+		    && sechdrs[i].sh_type != SHT_RELA)
-+			continue;
-+
-+		/* Not a valid relocation section? */
-+		if (info >= hdr->e_shnum)
-+			continue;
-+
-+		/* Don't bother with non-allocated sections */
-+		if (!(sechdrs[info].sh_flags & SHF_ALLOC))
-+			continue;
-+
-+		/* If it's called *.init*, and we're not init, we're
-+                   not interested */
-+		if ((strstr(secstrings + sechdrs[i].sh_name, ".init") != 0)
-+		    != is_init)
-+			continue;
-+
-+		syms = (Elf_Sym *) sechdrs[symindex].sh_addr;
-+		if (sechdrs[i].sh_type == SHT_REL) {
-+			Elf_Mips_Rel *rel = (void *) sechdrs[i].sh_addr;
-+			unsigned int size = sechdrs[i].sh_size / sizeof(*rel);
-+
-+			for (j = 0; j < size; ++j) {
-+				Elf_Sym *sym;
-+
-+				if (ELF_MIPS_R_TYPE(rel[j]) != R_MIPS_26)
-+					continue;
-+
-+				sym = syms + ELF_MIPS_R_SYM(rel[j]);
-+				if (!is_init && sym->st_shndx != SHN_UNDEF)
-+					continue;
-+
-+				ret += 4 * sizeof(int);
-+			}
-+		} else {
-+			Elf_Mips_Rela *rela = (void *) sechdrs[i].sh_addr;
-+			unsigned int size = sechdrs[i].sh_size / sizeof(*rela);
-+
-+			for (j = 0; j < size; ++j) {
-+				Elf_Sym *sym;
-+
-+				if (ELF_MIPS_R_TYPE(rela[j]) != R_MIPS_26)
-+					continue;
-+
-+				sym = syms + ELF_MIPS_R_SYM(rela[j]);
-+				if (!is_init && sym->st_shndx != SHN_UNDEF)
-+					continue;
-+
-+				ret += 4 * sizeof(int);
-+			}
-+		}
-+	}
-+
-+	return ret;
-+}
-+
-+#ifndef MODULE_START
-+static void *alloc_phys(unsigned long size)
-+{
-+	unsigned order;
-+	struct page *page;
-+	struct page *p;
-+
-+	size = PAGE_ALIGN(size);
-+	order = get_order(size);
-+
-+	page = alloc_pages(GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN |
-+			__GFP_THISNODE, order);
-+	if (!page)
-+		return NULL;
-+
-+	split_page(page, order);
-+
-+	for (p = page + (size >> PAGE_SHIFT); p < page + (1 << order); ++p)
-+		__free_page(p);
-+
-+	return page_address(page);
-+}
-+#endif
-+
-+static void free_phys(void *ptr, unsigned long size)
-+{
-+	struct page *page;
-+	struct page *end;
-+
-+	page = virt_to_page(ptr);
-+	end = page + (PAGE_ALIGN(size) >> PAGE_SHIFT);
-+
-+	for (; page < end; ++page)
-+		__free_page(page);
-+}
-+
-+
- void *module_alloc(unsigned long size)
- {
- #ifdef MODULE_START
-@@ -58,21 +169,99 @@ void *module_alloc(unsigned long size)
- 
- 	return __vmalloc_area(area, GFP_KERNEL, PAGE_KERNEL);
- #else
-+	void *ptr;
-+
- 	if (size == 0)
- 		return NULL;
--	return vmalloc(size);
-+
-+	ptr = alloc_phys(size);
-+
-+	/* If we failed to allocate physically contiguous memory,
-+	 * fall back to regular vmalloc. The module loader code will
-+	 * create jump tables to handle long jumps */
-+	if (!ptr)
-+		return vmalloc(size);
-+
-+	return ptr;
-+#endif
-+}
-+
-+static inline bool is_phys_addr(void *ptr)
-+{
-+#ifdef CONFIG_64BIT
-+	return (KSEGX((unsigned long)ptr) == CKSEG0);
-+#else
-+	return (KSEGX(ptr) == KSEG0);
- #endif
- }
- 
- /* Free memory returned from module_alloc */
- void module_free(struct module *mod, void *module_region)
- {
--	vfree(module_region);
-+	if (is_phys_addr(module_region)) {
-+		if (mod->module_init == module_region)
-+			free_phys(module_region, mod->init_size);
-+		else if (mod->module_core == module_region)
-+			free_phys(module_region, mod->core_size);
-+		else
-+			BUG();
-+	} else {
-+		vfree(module_region);
-+	}
-+}
-+
-+static void *__module_alloc(int size, bool phys)
-+{
-+	void *ptr;
-+
-+	if (phys)
-+		ptr = kmalloc(size, GFP_KERNEL);
-+	else
-+		ptr = vmalloc(size);
-+	return ptr;
-+}
-+
-+static void __module_free(void *ptr)
-+{
-+	if (is_phys_addr(ptr))
-+		kfree(ptr);
-+	else
-+		vfree(ptr);
- }
- 
- int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
- 			      char *secstrings, struct module *mod)
- {
-+	unsigned int symindex = 0;
-+	unsigned int core_size, init_size;
-+	int i;
-+
-+	for (i = 1; i < hdr->e_shnum; i++)
-+		if (sechdrs[i].sh_type == SHT_SYMTAB)
-+			symindex = i;
-+
-+	core_size = get_plt_size(hdr, sechdrs, secstrings, symindex, false);
-+	init_size = get_plt_size(hdr, sechdrs, secstrings, symindex, true);
-+
-+	mod->arch.phys_plt_offset = 0;
-+	mod->arch.virt_plt_offset = 0;
-+	mod->arch.phys_plt_tbl = NULL;
-+	mod->arch.virt_plt_tbl = NULL;
-+
-+	if ((core_size + init_size) == 0)
-+		return 0;
-+
-+	mod->arch.phys_plt_tbl = __module_alloc(core_size + init_size, 1);
-+	if (!mod->arch.phys_plt_tbl)
-+		return -ENOMEM;
-+
-+	mod->arch.virt_plt_tbl = __module_alloc(core_size + init_size, 0);
-+	if (!mod->arch.virt_plt_tbl) {
-+		__module_free(mod->arch.phys_plt_tbl);
-+		mod->arch.phys_plt_tbl = NULL;
-+		return -ENOMEM;
-+	}
-+
- 	return 0;
- }
- 
-@@ -95,28 +284,36 @@ static int apply_r_mips_32_rela(struct m
- 	return 0;
- }
- 
--static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
-+static Elf_Addr add_plt_entry_to(unsigned *plt_offset,
-+				 void *start, Elf_Addr v)
- {
--	if (v % 4) {
--		pr_err("module %s: dangerous R_MIPS_26 REL relocation\n",
--		       me->name);
--		return -ENOEXEC;
--	}
-+	unsigned *tramp = start + *plt_offset;
-+	*plt_offset += 4 * sizeof(int);
- 
--	if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
--		printk(KERN_ERR
--		       "module %s: relocation overflow\n",
--		       me->name);
--		return -ENOEXEC;
--	}
-+	/* adjust carry for addiu */
-+	if (v & 0x00008000)
-+		v += 0x10000;
- 
--	*location = (*location & ~0x03ffffff) |
--	            ((*location + (v >> 2)) & 0x03ffffff);
-+	tramp[0] = 0x3c190000 | (v >> 16);      /* lui t9, hi16 */
-+	tramp[1] = 0x27390000 | (v & 0xffff);   /* addiu t9, t9, lo16 */
-+	tramp[2] = 0x03200008;                  /* jr t9 */
-+	tramp[3] = 0x00000000;                  /* nop */
- 
--	return 0;
-+	return (Elf_Addr) tramp;
- }
- 
--static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)
-+static Elf_Addr add_plt_entry(struct module *me, void *location, Elf_Addr v)
-+{
-+	if (is_phys_addr(location))
-+		return add_plt_entry_to(&me->arch.phys_plt_offset,
-+				me->arch.phys_plt_tbl, v);
-+	else
-+		return add_plt_entry_to(&me->arch.virt_plt_offset,
-+				me->arch.virt_plt_tbl, v);
-+
-+}
-+
-+static int set_r_mips_26(struct module *me, u32 *location, u32 ofs, Elf_Addr v)
- {
- 	if (v % 4) {
- 		pr_err("module %s: dangerous R_MIPS_26 RELArelocation\n",
-@@ -125,17 +322,31 @@ static int apply_r_mips_26_rela(struct m
- 	}
- 
- 	if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
--		printk(KERN_ERR
-+	    v = add_plt_entry(me, location, v + (ofs << 2));
-+		if (!v) {
-+			printk(KERN_ERR
- 		       "module %s: relocation overflow\n",
- 		       me->name);
--		return -ENOEXEC;
-+			return -ENOEXEC;
-+		}
-+		ofs = 0;
- 	}
- 
--	*location = (*location & ~0x03ffffff) | ((v >> 2) & 0x03ffffff);
-+	*location = (*location & ~0x03ffffff) | ((ofs + (v >> 2)) & 0x03ffffff);
- 
- 	return 0;
- }
- 
-+static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
-+{
-+	return set_r_mips_26(me, location, *location & 0x03ffffff, v);
-+}
-+
-+static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)
-+{
-+	return set_r_mips_26(me, location, 0, v);
-+}
-+
- static int apply_r_mips_hi16_rel(struct module *me, u32 *location, Elf_Addr v)
- {
- 	struct mips_hi16 *n;
-@@ -400,11 +611,32 @@ int module_finalize(const Elf_Ehdr *hdr,
- 		list_add(&me->arch.dbe_list, &dbe_list);
- 		spin_unlock_irq(&dbe_lock);
- 	}
-+
-+	/* Get rid of the fixup trampoline if we're running the module
-+	 * from physically mapped address space */
-+	if (me->arch.phys_plt_offset == 0) {
-+		__module_free(me->arch.phys_plt_tbl);
-+		me->arch.phys_plt_tbl = NULL;
-+	}
-+	if (me->arch.virt_plt_offset == 0) {
-+		__module_free(me->arch.virt_plt_tbl);
-+		me->arch.virt_plt_tbl = NULL;
-+	}
-+
- 	return 0;
- }
- 
- void module_arch_cleanup(struct module *mod)
- {
-+	if (mod->arch.phys_plt_tbl) {
-+		__module_free(mod->arch.phys_plt_tbl);
-+		mod->arch.phys_plt_tbl = NULL;
-+	}
-+	if (mod->arch.virt_plt_tbl) {
-+		__module_free(mod->arch.virt_plt_tbl);
-+		mod->arch.virt_plt_tbl = NULL;
-+	}
-+
- 	spin_lock_irq(&dbe_lock);
- 	list_del(&mod->arch.dbe_list);
- 	spin_unlock_irq(&dbe_lock);
diff --git a/target/linux/generic-2.6/patches-2.6.33/028-module_exports.patch b/target/linux/generic-2.6/patches-2.6.33/028-module_exports.patch
deleted file mode 100644
index c56fbb79d..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/028-module_exports.patch
+++ /dev/null
@@ -1,119 +0,0 @@
---- a/include/asm-generic/vmlinux.lds.h
-+++ b/include/asm-generic/vmlinux.lds.h
-@@ -52,6 +52,27 @@
- #define LOAD_OFFSET 0
- #endif
- 
-+#ifndef SYMTAB_KEEP_STR
-+#define SYMTAB_KEEP_STR *(__ksymtab_strings.*)
-+#define SYMTAB_DISCARD_STR
-+#else
-+#define SYMTAB_DISCARD_STR *(__ksymtab_strings.*)
-+#endif
-+
-+#ifndef SYMTAB_KEEP
-+#define SYMTAB_KEEP *(__ksymtab.*)
-+#define SYMTAB_DISCARD
-+#else
-+#define SYMTAB_DISCARD *(__ksymtab.*)
-+#endif
-+
-+#ifndef SYMTAB_KEEP_GPL
-+#define SYMTAB_KEEP_GPL *(__ksymtab_gpl.*)
-+#define SYMTAB_DISCARD_GPL
-+#else
-+#define SYMTAB_DISCARD_GPL *(__ksymtab_gpl.*)
-+#endif
-+
- #ifndef SYMBOL_PREFIX
- #define VMLINUX_SYMBOL(sym) sym
- #else
-@@ -258,35 +279,35 @@
- 	/* Kernel symbol table: Normal symbols */			\
- 	__ksymtab         : AT(ADDR(__ksymtab) - LOAD_OFFSET) {		\
- 		VMLINUX_SYMBOL(__start___ksymtab) = .;			\
--		*(__ksymtab)						\
-+		SYMTAB_KEEP						\
- 		VMLINUX_SYMBOL(__stop___ksymtab) = .;			\
- 	}								\
- 									\
- 	/* Kernel symbol table: GPL-only symbols */			\
- 	__ksymtab_gpl     : AT(ADDR(__ksymtab_gpl) - LOAD_OFFSET) {	\
- 		VMLINUX_SYMBOL(__start___ksymtab_gpl) = .;		\
--		*(__ksymtab_gpl)					\
-+		SYMTAB_KEEP_GPL						\
- 		VMLINUX_SYMBOL(__stop___ksymtab_gpl) = .;		\
- 	}								\
- 									\
- 	/* Kernel symbol table: Normal unused symbols */		\
- 	__ksymtab_unused  : AT(ADDR(__ksymtab_unused) - LOAD_OFFSET) {	\
- 		VMLINUX_SYMBOL(__start___ksymtab_unused) = .;		\
--		*(__ksymtab_unused)					\
-+		*(__ksymtab_unused.*)					\
- 		VMLINUX_SYMBOL(__stop___ksymtab_unused) = .;		\
- 	}								\
- 									\
- 	/* Kernel symbol table: GPL-only unused symbols */		\
- 	__ksymtab_unused_gpl : AT(ADDR(__ksymtab_unused_gpl) - LOAD_OFFSET) { \
- 		VMLINUX_SYMBOL(__start___ksymtab_unused_gpl) = .;	\
--		*(__ksymtab_unused_gpl)					\
-+		*(__ksymtab_unused_gpl.*)				\
- 		VMLINUX_SYMBOL(__stop___ksymtab_unused_gpl) = .;	\
- 	}								\
- 									\
- 	/* Kernel symbol table: GPL-future-only symbols */		\
- 	__ksymtab_gpl_future : AT(ADDR(__ksymtab_gpl_future) - LOAD_OFFSET) { \
- 		VMLINUX_SYMBOL(__start___ksymtab_gpl_future) = .;	\
--		*(__ksymtab_gpl_future)					\
-+		*(__ksymtab_gpl_future.*)				\
- 		VMLINUX_SYMBOL(__stop___ksymtab_gpl_future) = .;	\
- 	}								\
- 									\
-@@ -327,7 +348,7 @@
- 									\
- 	/* Kernel symbol table: strings */				\
-         __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) {	\
--		*(__ksymtab_strings)					\
-+		SYMTAB_KEEP_STR						\
- 	}								\
- 									\
- 	/* __*init sections */						\
-@@ -642,6 +663,9 @@
- 	EXIT_TEXT							\
- 	EXIT_DATA							\
- 	EXIT_CALL							\
-+	SYMTAB_DISCARD							\
-+	SYMTAB_DISCARD_GPL						\
-+	SYMTAB_DISCARD_STR						\
- 	*(.discard)							\
- 	}
- 
---- a/include/linux/module.h
-+++ b/include/linux/module.h
-@@ -194,16 +194,24 @@ void *__symbol_get_gpl(const char *symbo
- #define __CRC_SYMBOL(sym, sec)
- #endif
- 
-+#ifdef MODULE
-+#define __EXPORT_SUFFIX(sym)
-+#else
-+#define __EXPORT_SUFFIX(sym) "." #sym
-+#endif
-+
- /* For every exported symbol, place a struct in the __ksymtab section */
- #define __EXPORT_SYMBOL(sym, sec)				\
- 	extern typeof(sym) sym;					\
- 	__CRC_SYMBOL(sym, sec)					\
- 	static const char __kstrtab_##sym[]			\
--	__attribute__((section("__ksymtab_strings"), aligned(1))) \
-+	__attribute__((section("__ksymtab_strings"		\
-+	  __EXPORT_SUFFIX(sym)), aligned(1)))			\
- 	= MODULE_SYMBOL_PREFIX #sym;                    	\
- 	static const struct kernel_symbol __ksymtab_##sym	\
- 	__used							\
--	__attribute__((section("__ksymtab" sec), unused))	\
-+	__attribute__((section("__ksymtab" sec			\
-+	  __EXPORT_SUFFIX(sym)), unused))			\
- 	= { (unsigned long)&sym, __kstrtab_##sym }
- 
- #define EXPORT_SYMBOL(sym)					\
diff --git a/target/linux/generic-2.6/patches-2.6.33/029-arm_module_unresolved_weak_sym.patch b/target/linux/generic-2.6/patches-2.6.33/029-arm_module_unresolved_weak_sym.patch
deleted file mode 100644
index 8a3b2e23c..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/029-arm_module_unresolved_weak_sym.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/arch/arm/kernel/module.c
-+++ b/arch/arm/kernel/module.c
-@@ -121,6 +121,10 @@ apply_relocate(Elf32_Shdr *sechdrs, cons
- 			return -ENOEXEC;
- 		}
- 
-+		if ((IS_ERR_VALUE(sym->st_value) || !sym->st_value) &&
-+		    ELF_ST_BIND(sym->st_info) == STB_WEAK)
-+			continue;
-+
- 		loc = dstsec->sh_addr + rel->r_offset;
- 
- 		switch (ELF32_R_TYPE(rel->r_info)) {
diff --git a/target/linux/generic-2.6/patches-2.6.33/030-pci_disable_common_quirks.patch b/target/linux/generic-2.6/patches-2.6.33/030-pci_disable_common_quirks.patch
deleted file mode 100644
index 492d46d4d..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/030-pci_disable_common_quirks.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/drivers/pci/Kconfig
-+++ b/drivers/pci/Kconfig
-@@ -51,6 +51,12 @@ config PCI_STUB
- 
- 	  When in doubt, say N.
- 
-+config PCI_DISABLE_COMMON_QUIRKS
-+	bool "PCI disable common quirks"
-+	depends on PCI
-+	help
-+	  If you don't know what to do here, say N.
-+
- config HT_IRQ
- 	bool "Interrupts on hypertransport devices"
- 	default y
---- a/drivers/pci/quirks.c
-+++ b/drivers/pci/quirks.c
-@@ -96,6 +96,7 @@ static void __devinit quirk_resource_ali
- }
- DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, quirk_resource_alignment);
- 
-+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
- /* The Mellanox Tavor device gives false positive parity errors
-  * Mark this device with a broken_parity_status, to allow
-  * PCI scanning code to "skip" this now blacklisted device.
-@@ -1905,7 +1906,9 @@ static void __devinit fixup_rev1_53c810(
- 	}
- }
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
-+#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
- 
-+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
- /* Enable 1k I/O space granularity on the Intel P64H2 */
- static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
- {
-@@ -2537,6 +2540,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov);
- 
- #endif	/* CONFIG_PCI_IOV */
-+#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
- 
- static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f,
- 			  struct pci_fixup *end)
diff --git a/target/linux/generic-2.6/patches-2.6.33/031-ppc_gcc_build_fix.patch b/target/linux/generic-2.6/patches-2.6.33/031-ppc_gcc_build_fix.patch
deleted file mode 100644
index 60027948e..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/031-ppc_gcc_build_fix.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-GCC 4.4.x looks to be adding support for generating out-of-line register
-saves/restores based on:
-
-http://gcc.gnu.org/ml/gcc-patches/2008-04/msg01678.html
-
-This breaks the kernel build as we'd have to link with libgcc to get the
-implementation of the register save/restores.
-
-To workaround this issue, we just stole the save/restore code from gcc
-and simplified it down for our needs (integer only).  We only do this if
-PPC32 as gcc makes believe the linker on ppc64 will deal with this and
-only if CONFIG_CC_OPTIMIZE_FOR_SIZE is set (thus -Os).
-
-Signed-off-by: Kumar Gala <[EMAIL PROTECTED]>
----
-
-If someone using cutting edge toolchains for ppc64 could test and make
-sure if we enable CONFIG_CC_OPTIMIZE_FOR_SIZE things work that would be
-nice.
-
-- k
-
- arch/powerpc/kernel/misc_32.S   |   77 +++++++++++++++++++++++++++
- arch/powerpc/kernel/ppc_ksyms.c |  111 +++++++++++++++++++++++++++++++++++++++
- 2 files changed, 188 insertions(+), 0 deletions(-)
-
---- a/arch/powerpc/kernel/misc_32.S
-+++ b/arch/powerpc/kernel/misc_32.S
-@@ -802,3 +802,80 @@ relocate_new_kernel_end:
- relocate_new_kernel_size:
- 	.long relocate_new_kernel_end - relocate_new_kernel
- #endif
-+
-+#if defined(CONFIG_PPC32) && defined(CONFIG_CC_OPTIMIZE_FOR_SIZE)
-+/* Routines for saving integer registers, called by the compiler.  */
-+/* Called with r11 pointing to the stack header word of the caller of the */
-+/* function, just beyond the end of the integer save area.  */
-+
-+_GLOBAL(_savegpr_14)   stw     14,-72(11)      /* save gp registers */
-+_GLOBAL(_savegpr_15)   stw     15,-68(11)
-+_GLOBAL(_savegpr_16)   stw     16,-64(11)
-+_GLOBAL(_savegpr_17)   stw     17,-60(11)
-+_GLOBAL(_savegpr_18)   stw     18,-56(11)
-+_GLOBAL(_savegpr_19)   stw     19,-52(11)
-+_GLOBAL(_savegpr_20)   stw     20,-48(11)
-+_GLOBAL(_savegpr_21)   stw     21,-44(11)
-+_GLOBAL(_savegpr_22)   stw     22,-40(11)
-+_GLOBAL(_savegpr_23)   stw     23,-36(11)
-+_GLOBAL(_savegpr_24)   stw     24,-32(11)
-+_GLOBAL(_savegpr_25)   stw     25,-28(11)
-+_GLOBAL(_savegpr_26)   stw     26,-24(11)
-+_GLOBAL(_savegpr_27)   stw     27,-20(11)
-+_GLOBAL(_savegpr_28)   stw     28,-16(11)
-+_GLOBAL(_savegpr_29)   stw     29,-12(11)
-+_GLOBAL(_savegpr_30)   stw     30,-8(11)
-+_GLOBAL(_savegpr_31)   stw     31,-4(11)
-+                       blr
-+
-+/* Routines for restoring integer registers, called by the compiler.  */
-+/* Called with r11 pointing to the stack header word of the caller of the */
-+/* function, just beyond the end of the integer restore area.  */
-+
-+_GLOBAL(_restgpr_14)   lwz     14,-72(11)      /* restore gp registers */
-+_GLOBAL(_restgpr_15)   lwz     15,-68(11)
-+_GLOBAL(_restgpr_16)   lwz     16,-64(11)
-+_GLOBAL(_restgpr_17)   lwz     17,-60(11)
-+_GLOBAL(_restgpr_18)   lwz     18,-56(11)
-+_GLOBAL(_restgpr_19)   lwz     19,-52(11)
-+_GLOBAL(_restgpr_20)   lwz     20,-48(11)
-+_GLOBAL(_restgpr_21)   lwz     21,-44(11)
-+_GLOBAL(_restgpr_22)   lwz     22,-40(11)
-+_GLOBAL(_restgpr_23)   lwz     23,-36(11)
-+_GLOBAL(_restgpr_24)   lwz     24,-32(11)
-+_GLOBAL(_restgpr_25)   lwz     25,-28(11)
-+_GLOBAL(_restgpr_26)   lwz     26,-24(11)
-+_GLOBAL(_restgpr_27)   lwz     27,-20(11)
-+_GLOBAL(_restgpr_28)   lwz     28,-16(11)
-+_GLOBAL(_restgpr_29)   lwz     29,-12(11)
-+_GLOBAL(_restgpr_30)   lwz     30,-8(11)
-+_GLOBAL(_restgpr_31)   lwz     31,-4(11)
-+                       blr
-+
-+/* Routines for restoring integer registers, called by the compiler.  */
-+/* Called with r11 pointing to the stack header word of the caller of the */
-+/* function, just beyond the end of the integer restore area.  */
-+
-+_GLOBAL(_restgpr_14_x) lwz     14,-72(11)      /* restore gp registers */
-+_GLOBAL(_restgpr_15_x) lwz     15,-68(11)
-+_GLOBAL(_restgpr_16_x) lwz     16,-64(11)
-+_GLOBAL(_restgpr_17_x) lwz     17,-60(11)
-+_GLOBAL(_restgpr_18_x) lwz     18,-56(11)
-+_GLOBAL(_restgpr_19_x) lwz     19,-52(11)
-+_GLOBAL(_restgpr_20_x) lwz     20,-48(11)
-+_GLOBAL(_restgpr_21_x) lwz     21,-44(11)
-+_GLOBAL(_restgpr_22_x) lwz     22,-40(11)
-+_GLOBAL(_restgpr_23_x) lwz     23,-36(11)
-+_GLOBAL(_restgpr_24_x) lwz     24,-32(11)
-+_GLOBAL(_restgpr_25_x) lwz     25,-28(11)
-+_GLOBAL(_restgpr_26_x) lwz     26,-24(11)
-+_GLOBAL(_restgpr_27_x) lwz     27,-20(11)
-+_GLOBAL(_restgpr_28_x) lwz     28,-16(11)
-+_GLOBAL(_restgpr_29_x) lwz     29,-12(11)
-+_GLOBAL(_restgpr_30_x) lwz     30,-8(11)
-+_GLOBAL(_restgpr_31_x) lwz     0,4(11)
-+                       lwz     31,-4(11)
-+                       mtlr    0
-+                       mr      1,11
-+                       blr
-+#endif
---- a/arch/powerpc/kernel/ppc_ksyms.c
-+++ b/arch/powerpc/kernel/ppc_ksyms.c
-@@ -185,3 +185,114 @@ EXPORT_SYMBOL(__mtdcr);
- EXPORT_SYMBOL(__mfdcr);
- #endif
- EXPORT_SYMBOL(empty_zero_page);
-+
-+#if defined(CONFIG_PPC32) && defined(CONFIG_CC_OPTIMIZE_FOR_SIZE)
-+void _savegpr_14(void);
-+void _savegpr_15(void);
-+void _savegpr_16(void);
-+void _savegpr_17(void);
-+void _savegpr_18(void);
-+void _savegpr_19(void);
-+void _savegpr_20(void);
-+void _savegpr_21(void);
-+void _savegpr_22(void);
-+void _savegpr_23(void);
-+void _savegpr_24(void);
-+void _savegpr_25(void);
-+void _savegpr_26(void);
-+void _savegpr_27(void);
-+void _savegpr_28(void);
-+void _savegpr_29(void);
-+void _savegpr_30(void);
-+void _savegpr_31(void);
-+void _restgpr_14(void);
-+void _restgpr_15(void);
-+void _restgpr_16(void);
-+void _restgpr_17(void);
-+void _restgpr_18(void);
-+void _restgpr_19(void);
-+void _restgpr_20(void);
-+void _restgpr_21(void);
-+void _restgpr_22(void);
-+void _restgpr_23(void);
-+void _restgpr_24(void);
-+void _restgpr_25(void);
-+void _restgpr_26(void);
-+void _restgpr_27(void);
-+void _restgpr_28(void);
-+void _restgpr_29(void);
-+void _restgpr_30(void);
-+void _restgpr_31(void);
-+void _restgpr_14_x(void);
-+void _restgpr_15_x(void);
-+void _restgpr_16_x(void);
-+void _restgpr_17_x(void);
-+void _restgpr_18_x(void);
-+void _restgpr_19_x(void);
-+void _restgpr_20_x(void);
-+void _restgpr_21_x(void);
-+void _restgpr_22_x(void);
-+void _restgpr_23_x(void);
-+void _restgpr_24_x(void);
-+void _restgpr_25_x(void);
-+void _restgpr_26_x(void);
-+void _restgpr_27_x(void);
-+void _restgpr_28_x(void);
-+void _restgpr_29_x(void);
-+void _restgpr_30_x(void);
-+void _restgpr_31_x(void);
-+EXPORT_SYMBOL(_savegpr_14);
-+EXPORT_SYMBOL(_savegpr_15);
-+EXPORT_SYMBOL(_savegpr_16);
-+EXPORT_SYMBOL(_savegpr_17);
-+EXPORT_SYMBOL(_savegpr_18);
-+EXPORT_SYMBOL(_savegpr_19);
-+EXPORT_SYMBOL(_savegpr_20);
-+EXPORT_SYMBOL(_savegpr_21);
-+EXPORT_SYMBOL(_savegpr_22);
-+EXPORT_SYMBOL(_savegpr_23);
-+EXPORT_SYMBOL(_savegpr_24);
-+EXPORT_SYMBOL(_savegpr_25);
-+EXPORT_SYMBOL(_savegpr_26);
-+EXPORT_SYMBOL(_savegpr_27);
-+EXPORT_SYMBOL(_savegpr_28);
-+EXPORT_SYMBOL(_savegpr_29);
-+EXPORT_SYMBOL(_savegpr_30);
-+EXPORT_SYMBOL(_savegpr_31);
-+EXPORT_SYMBOL(_restgpr_14);
-+EXPORT_SYMBOL(_restgpr_15);
-+EXPORT_SYMBOL(_restgpr_16);
-+EXPORT_SYMBOL(_restgpr_17);
-+EXPORT_SYMBOL(_restgpr_18);
-+EXPORT_SYMBOL(_restgpr_19);
-+EXPORT_SYMBOL(_restgpr_20);
-+EXPORT_SYMBOL(_restgpr_21);
-+EXPORT_SYMBOL(_restgpr_22);
-+EXPORT_SYMBOL(_restgpr_23);
-+EXPORT_SYMBOL(_restgpr_24);
-+EXPORT_SYMBOL(_restgpr_25);
-+EXPORT_SYMBOL(_restgpr_26);
-+EXPORT_SYMBOL(_restgpr_27);
-+EXPORT_SYMBOL(_restgpr_28);
-+EXPORT_SYMBOL(_restgpr_29);
-+EXPORT_SYMBOL(_restgpr_30);
-+EXPORT_SYMBOL(_restgpr_31);
-+EXPORT_SYMBOL(_restgpr_14_x);
-+EXPORT_SYMBOL(_restgpr_15_x);
-+EXPORT_SYMBOL(_restgpr_16_x);
-+EXPORT_SYMBOL(_restgpr_17_x);
-+EXPORT_SYMBOL(_restgpr_18_x);
-+EXPORT_SYMBOL(_restgpr_19_x);
-+EXPORT_SYMBOL(_restgpr_20_x);
-+EXPORT_SYMBOL(_restgpr_21_x);
-+EXPORT_SYMBOL(_restgpr_22_x);
-+EXPORT_SYMBOL(_restgpr_23_x);
-+EXPORT_SYMBOL(_restgpr_24_x);
-+EXPORT_SYMBOL(_restgpr_25_x);
-+EXPORT_SYMBOL(_restgpr_26_x);
-+EXPORT_SYMBOL(_restgpr_27_x);
-+EXPORT_SYMBOL(_restgpr_28_x);
-+EXPORT_SYMBOL(_restgpr_29_x);
-+EXPORT_SYMBOL(_restgpr_30_x);
-+EXPORT_SYMBOL(_restgpr_31_x);
-+#endif /* CONFIG_PPC32 && CONFIG_CC_OPTIMIZE_FOR_SIZE */
diff --git a/target/linux/generic-2.6/patches-2.6.33/060-block2mtd_init.patch b/target/linux/generic-2.6/patches-2.6.33/060-block2mtd_init.patch
deleted file mode 100644
index 8feec96a1..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/060-block2mtd_init.patch
+++ /dev/null
@@ -1,120 +0,0 @@
---- a/drivers/mtd/devices/block2mtd.c
-+++ b/drivers/mtd/devices/block2mtd.c
-@@ -14,6 +14,7 @@
- #include <linux/list.h>
- #include <linux/init.h>
- #include <linux/mtd/mtd.h>
-+#include <linux/mtd/partitions.h>
- #include <linux/buffer_head.h>
- #include <linux/mutex.h>
- #include <linux/mount.h>
-@@ -232,10 +233,11 @@ static void block2mtd_free_device(struct
- 
- 
- /* FIXME: ensure that mtd->size % erase_size == 0 */
--static struct block2mtd_dev *add_device(char *devname, int erase_size)
-+static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname)
- {
- 	struct block_device *bdev;
- 	struct block2mtd_dev *dev;
-+	struct mtd_partition *part;
- 	char *name;
- 
- 	if (!devname)
-@@ -273,17 +275,17 @@ static struct block2mtd_dev *add_device(
- 
- 	mutex_init(&dev->write_mutex);
- 
--	/* Setup the MTD structure */
--	/* make the name contain the block device in */
--	name = kmalloc(sizeof("block2mtd: ") + strlen(devname) + 1,
--			GFP_KERNEL);
-+	if (!mtdname)
-+		mtdname = devname;
-+
-+	name = kmalloc(strlen(mtdname) + 1, GFP_KERNEL);
- 	if (!name)
- 		goto devinit_err;
- 
--	sprintf(name, "block2mtd: %s", devname);
-+	strcpy(name, mtdname);
- 	dev->mtd.name = name;
- 
--	dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK;
-+	dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK & ~(erase_size - 1);
- 	dev->mtd.erasesize = erase_size;
- 	dev->mtd.writesize = 1;
- 	dev->mtd.type = MTD_RAM;
-@@ -296,14 +298,17 @@ static struct block2mtd_dev *add_device(
- 	dev->mtd.priv = dev;
- 	dev->mtd.owner = THIS_MODULE;
- 
--	if (add_mtd_device(&dev->mtd)) {
-+	part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
-+	part->name = dev->mtd.name;
-+	part->offset = 0;
-+	part->size = dev->mtd.size;
-+	if (add_mtd_partitions(&dev->mtd, part, 1)) {
- 		/* Device didnt get added, so free the entry */
- 		goto devinit_err;
- 	}
- 	list_add(&dev->list, &blkmtd_device_list);
- 	INFO("mtd%d: [%s] erase_size = %dKiB [%d]", dev->mtd.index,
--			dev->mtd.name + strlen("block2mtd: "),
--			dev->mtd.erasesize >> 10, dev->mtd.erasesize);
-+			mtdname, dev->mtd.erasesize >> 10, dev->mtd.erasesize);
- 	return dev;
- 
- devinit_err:
-@@ -376,9 +381,9 @@ static char block2mtd_paramline[80 + 12]
- 
- static int block2mtd_setup2(const char *val)
- {
--	char buf[80 + 12]; /* 80 for device, 12 for erase size */
-+	char buf[80 + 12 + 80]; /* 80 for device, 12 for erase size, 80 for name */
- 	char *str = buf;
--	char *token[2];
-+	char *token[3];
- 	char *name;
- 	size_t erase_size = PAGE_SIZE;
- 	int i, ret;
-@@ -389,7 +394,7 @@ static int block2mtd_setup2(const char *
- 	strcpy(str, val);
- 	kill_final_newline(str);
- 
--	for (i = 0; i < 2; i++)
-+	for (i = 0; i < 3; i++)
- 		token[i] = strsep(&str, ",");
- 
- 	if (str)
-@@ -408,8 +413,10 @@ static int block2mtd_setup2(const char *
- 			parse_err("illegal erase size");
- 		}
- 	}
-+	if (token[2] && (strlen(token[2]) + 1 > 80))
-+		parse_err("mtd device name too long");
- 
--	add_device(name, erase_size);
-+	add_device(name, erase_size, token[2]);
- 
- 	return 0;
- }
-@@ -443,7 +450,7 @@ static int block2mtd_setup(const char *v
- 
- 
- module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
--MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>]\"");
-+MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>]]\"");
- 
- static int __init block2mtd_init(void)
- {
---- a/fs/partitions/check.c
-+++ b/fs/partitions/check.c
-@@ -637,6 +637,7 @@ try_scan:
- 	kfree(state);
- 	return 0;
- }
-+EXPORT_SYMBOL(rescan_partitions);
- 
- unsigned char *read_dev_sector(struct block_device *bdev, sector_t n, Sector *p)
- {
diff --git a/target/linux/generic-2.6/patches-2.6.33/065-rootfs_split.patch b/target/linux/generic-2.6/patches-2.6.33/065-rootfs_split.patch
deleted file mode 100644
index 22b3f5e90..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/065-rootfs_split.patch
+++ /dev/null
@@ -1,625 +0,0 @@
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -53,6 +53,16 @@ config MTD_PARTITIONS
- 	  devices. Partitioning on NFTL 'devices' is a different - that's the
- 	  'normal' form of partitioning used on a block device.
- 
-+config MTD_ROOTFS_ROOT_DEV
-+	bool "Automatically set 'rootfs' partition to be root filesystem"
-+	depends on MTD_PARTITIONS
-+	default y
-+
-+config MTD_ROOTFS_SPLIT
-+	bool "Automatically split 'rootfs' partition for squashfs"
-+	depends on MTD_PARTITIONS
-+	default y
-+
- config MTD_REDBOOT_PARTS
- 	tristate "RedBoot partition table parsing"
- 	depends on MTD_PARTITIONS
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -18,6 +18,8 @@
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
- #include <linux/mtd/compatmac.h>
-+#include <linux/root_dev.h>
-+#include <linux/magic.h>
- 
- /* Our partition linked list */
- static LIST_HEAD(mtd_partitions);
-@@ -35,7 +37,7 @@ struct mtd_part {
-  * the pointer to that structure with this macro.
-  */
- #define PART(x)  ((struct mtd_part *)(x))
--
-+#define IS_PART(mtd) (mtd->read == part_read)
- 
- /*
-  * MTD methods which simply translate the effective address and pass through
-@@ -503,6 +505,150 @@ out_register:
- 	return slave;
- }
- 
-+#ifdef CONFIG_MTD_ROOTFS_SPLIT
-+#define ROOTFS_SPLIT_NAME "rootfs_data"
-+#define ROOTFS_REMOVED_NAME "<removed>"
-+
-+struct squashfs_super_block {
-+	__le32 s_magic;
-+	__le32 pad0[9];
-+	__le64 bytes_used;
-+};
-+
-+
-+static int split_squashfs(struct mtd_info *master, int offset, int *split_offset)
-+{
-+	struct squashfs_super_block sb;
-+	int len, ret;
-+
-+	ret = master->read(master, offset, sizeof(sb), &len, (void *) &sb);
-+	if (ret || (len != sizeof(sb))) {
-+		printk(KERN_ALERT "split_squashfs: error occured while reading "
-+			"from \"%s\"\n", master->name);
-+		return -EINVAL;
-+	}
-+
-+	if (SQUASHFS_MAGIC != le32_to_cpu(sb.s_magic) ) {
-+		printk(KERN_ALERT "split_squashfs: no squashfs found in \"%s\"\n",
-+			master->name);
-+		*split_offset = 0;
-+		return 0;
-+	}
-+
-+	if (le64_to_cpu((sb.bytes_used)) <= 0) {
-+		printk(KERN_ALERT "split_squashfs: squashfs is empty in \"%s\"\n",
-+			master->name);
-+		*split_offset = 0;
-+		return 0;
-+	}
-+
-+	len = (u32) le64_to_cpu(sb.bytes_used);
-+	len += (offset & 0x000fffff);
-+	len +=  (master->erasesize - 1);
-+	len &= ~(master->erasesize - 1);
-+	len -= (offset & 0x000fffff);
-+	*split_offset = offset + len;
-+
-+	return 0;
-+}
-+
-+static int split_rootfs_data(struct mtd_info *master, struct mtd_info *rpart, const struct mtd_partition *part)
-+{
-+	struct mtd_partition *dpart;
-+	struct mtd_part *slave = NULL;
-+	int split_offset = 0;
-+	int ret;
-+
-+	ret = split_squashfs(master, part->offset, &split_offset);
-+	if (ret)
-+		return ret;
-+
-+	if (split_offset <= 0)
-+		return 0;
-+
-+	dpart = kmalloc(sizeof(*part)+sizeof(ROOTFS_SPLIT_NAME)+1, GFP_KERNEL);
-+	if (dpart == NULL) {
-+		printk(KERN_INFO "split_squashfs: no memory for partition \"%s\"\n",
-+			ROOTFS_SPLIT_NAME);
-+		return -ENOMEM;
-+	}
-+
-+	memcpy(dpart, part, sizeof(*part));
-+	dpart->name = (unsigned char *)&dpart[1];
-+	strcpy(dpart->name, ROOTFS_SPLIT_NAME);
-+
-+	dpart->size -= split_offset - dpart->offset;
-+	dpart->offset = split_offset;
-+
-+	if (dpart == NULL)
-+		return 1;
-+
-+	printk(KERN_INFO "mtd: partition \"%s\" created automatically, ofs=%llX, len=%llX \n",
-+		ROOTFS_SPLIT_NAME, dpart->offset, dpart->size);
-+
-+	slave = add_one_partition(master, dpart, 0, split_offset);
-+	if (!slave) {
-+		kfree(dpart);
-+		return -ENOMEM;
-+	}
-+	rpart->split = &slave->mtd;
-+
-+	return 0;
-+}
-+
-+static int refresh_rootfs_split(struct mtd_info *mtd)
-+{
-+	struct mtd_partition tpart;
-+	struct mtd_part *part;
-+	char *name;
-+	//int index = 0;
-+	int offset, size;
-+	int ret;
-+
-+	part = PART(mtd);
-+
-+	/* check for the new squashfs offset first */
-+	ret = split_squashfs(part->master, part->offset, &offset);
-+	if (ret)
-+		return ret;
-+
-+	if ((offset > 0) && !mtd->split) {
-+		printk(KERN_INFO "%s: creating new split partition for \"%s\"\n", __func__, mtd->name);
-+		/* if we don't have a rootfs split partition, create a new one */
-+		tpart.name = (char *) mtd->name;
-+		tpart.size = mtd->size;
-+		tpart.offset = part->offset;
-+
-+		return split_rootfs_data(part->master, &part->mtd, &tpart);
-+	} else if ((offset > 0) && mtd->split) {
-+		/* update the offsets of the existing partition */
-+		size = mtd->size + part->offset - offset;
-+
-+		part = PART(mtd->split);
-+		part->offset = offset;
-+		part->mtd.size = size;
-+		printk(KERN_INFO "%s: %s partition \"" ROOTFS_SPLIT_NAME "\", offset: 0x%06x (0x%06x)\n",
-+			__func__, (!strcmp(part->mtd.name, ROOTFS_SPLIT_NAME) ? "updating" : "creating"),
-+			(u32) part->offset, (u32) part->mtd.size);
-+		name = kmalloc(sizeof(ROOTFS_SPLIT_NAME) + 1, GFP_KERNEL);
-+		strcpy(name, ROOTFS_SPLIT_NAME);
-+		part->mtd.name = name;
-+	} else if ((offset <= 0) && mtd->split) {
-+		printk(KERN_INFO "%s: removing partition \"%s\"\n", __func__, mtd->split->name);
-+
-+		/* mark existing partition as removed */
-+		part = PART(mtd->split);
-+		name = kmalloc(sizeof(ROOTFS_SPLIT_NAME) + 1, GFP_KERNEL);
-+		strcpy(name, ROOTFS_REMOVED_NAME);
-+		part->mtd.name = name;
-+		part->offset = 0;
-+		part->mtd.size = 0;
-+	}
-+
-+	return 0;
-+}
-+#endif /* CONFIG_MTD_ROOTFS_SPLIT */
-+
- /*
-  * This function, given a master MTD object and a partition table, creates
-  * and registers slave MTD objects which are bound to the master according to
-@@ -518,7 +664,7 @@ int add_mtd_partitions(struct mtd_info *
- {
- 	struct mtd_part *slave;
- 	uint64_t cur_offset = 0;
--	int i;
-+	int i, ret;
- 
- 	printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
- 
-@@ -526,6 +672,21 @@ int add_mtd_partitions(struct mtd_info *
- 		slave = add_one_partition(master, parts + i, i, cur_offset);
- 		if (!slave)
- 			return -ENOMEM;
-+
-+		if (!strcmp(parts[i].name, "rootfs")) {
-+#ifdef CONFIG_MTD_ROOTFS_ROOT_DEV
-+			if (ROOT_DEV == 0) {
-+				printk(KERN_NOTICE "mtd: partition \"rootfs\" "
-+					"set to be root filesystem\n");
-+				ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, slave->mtd.index);
-+			}
-+#endif
-+#ifdef CONFIG_MTD_ROOTFS_SPLIT
-+			ret = split_rootfs_data(master, &slave->mtd, &parts[i]);
-+			/* if (ret == 0)
-+				j++; */
-+#endif
-+		}
- 		cur_offset = slave->offset + slave->mtd.size;
- 	}
- 
-@@ -533,6 +694,32 @@ int add_mtd_partitions(struct mtd_info *
- }
- EXPORT_SYMBOL(add_mtd_partitions);
- 
-+int refresh_mtd_partitions(struct mtd_info *mtd)
-+{
-+	int ret = 0;
-+
-+	if (IS_PART(mtd)) {
-+		struct mtd_part *part;
-+		struct mtd_info *master;
-+
-+		part = PART(mtd);
-+		master = part->master;
-+		if (master->refresh_device)
-+			ret = master->refresh_device(master);
-+	}
-+
-+	if (!ret && mtd->refresh_device)
-+		ret = mtd->refresh_device(mtd);
-+
-+#ifdef CONFIG_MTD_ROOTFS_SPLIT
-+	if (!ret && IS_PART(mtd) && !strcmp(mtd->name, "rootfs"))
-+		refresh_rootfs_split(mtd);
-+#endif
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL_GPL(refresh_mtd_partitions);
-+
- static DEFINE_SPINLOCK(part_parser_lock);
- static LIST_HEAD(part_parsers);
- 
---- a/drivers/mtd/devices/block2mtd.c
-+++ b/drivers/mtd/devices/block2mtd.c
-@@ -29,6 +29,8 @@ struct block2mtd_dev {
- 	struct block_device *blkdev;
- 	struct mtd_info mtd;
- 	struct mutex write_mutex;
-+	rwlock_t bdev_mutex;
-+	char devname[0];
- };
- 
- 
-@@ -81,6 +83,12 @@ static int block2mtd_erase(struct mtd_in
- 	size_t len = instr->len;
- 	int err;
- 
-+	read_lock(&dev->bdev_mutex);
-+	if (!dev->blkdev) {
-+		err = -EINVAL;
-+		goto done;
-+	}
-+
- 	instr->state = MTD_ERASING;
- 	mutex_lock(&dev->write_mutex);
- 	err = _block2mtd_erase(dev, from, len);
-@@ -93,6 +101,10 @@ static int block2mtd_erase(struct mtd_in
- 
- 	instr->state = MTD_ERASE_DONE;
- 	mtd_erase_callback(instr);
-+
-+done:
-+	read_unlock(&dev->bdev_mutex);
-+
- 	return err;
- }
- 
-@@ -104,10 +116,14 @@ static int block2mtd_read(struct mtd_inf
- 	struct page *page;
- 	int index = from >> PAGE_SHIFT;
- 	int offset = from & (PAGE_SIZE-1);
--	int cpylen;
-+	int cpylen, err = 0;
-+
-+	read_lock(&dev->bdev_mutex);
-+	if (!dev->blkdev || (from > mtd->size)) {
-+		err = -EINVAL;
-+		goto done;
-+	}
- 
--	if (from > mtd->size)
--		return -EINVAL;
- 	if (from + len > mtd->size)
- 		len = mtd->size - from;
- 
-@@ -122,10 +138,14 @@ static int block2mtd_read(struct mtd_inf
- 		len = len - cpylen;
- 
- 		page = page_read(dev->blkdev->bd_inode->i_mapping, index);
--		if (!page)
--			return -ENOMEM;
--		if (IS_ERR(page))
--			return PTR_ERR(page);
-+		if (!page) {
-+			err = -ENOMEM;
-+			goto done;
-+		}
-+		if (IS_ERR(page)) {
-+			err = PTR_ERR(page);
-+			goto done;
-+		}
- 
- 		memcpy(buf, page_address(page) + offset, cpylen);
- 		page_cache_release(page);
-@@ -136,7 +156,10 @@ static int block2mtd_read(struct mtd_inf
- 		offset = 0;
- 		index++;
- 	}
--	return 0;
-+
-+done:
-+	read_unlock(&dev->bdev_mutex);
-+	return err;
- }
- 
- 
-@@ -188,12 +211,22 @@ static int block2mtd_write(struct mtd_in
- 		size_t *retlen, const u_char *buf)
- {
- 	struct block2mtd_dev *dev = mtd->priv;
--	int err;
-+	int err = 0;
-+
-+	read_lock(&dev->bdev_mutex);
-+	if (!dev->blkdev) {
-+		err = -EINVAL;
-+		goto done;
-+	}
- 
- 	if (!len)
--		return 0;
--	if (to >= mtd->size)
--		return -ENOSPC;
-+		goto done;
-+
-+	if (to >= mtd->size) {
-+		err = -ENOSPC;
-+		goto done;
-+	}
-+
- 	if (to + len > mtd->size)
- 		len = mtd->size - to;
- 
-@@ -202,6 +235,9 @@ static int block2mtd_write(struct mtd_in
- 	mutex_unlock(&dev->write_mutex);
- 	if (err > 0)
- 		err = 0;
-+
-+done:
-+	read_unlock(&dev->bdev_mutex);
- 	return err;
- }
- 
-@@ -210,52 +246,29 @@ static int block2mtd_write(struct mtd_in
- static void block2mtd_sync(struct mtd_info *mtd)
- {
- 	struct block2mtd_dev *dev = mtd->priv;
--	sync_blockdev(dev->blkdev);
--	return;
--}
--
--
--static void block2mtd_free_device(struct block2mtd_dev *dev)
--{
--	if (!dev)
--		return;
--
--	kfree(dev->mtd.name);
- 
--	if (dev->blkdev) {
--		invalidate_mapping_pages(dev->blkdev->bd_inode->i_mapping,
--					0, -1);
--		close_bdev_exclusive(dev->blkdev, FMODE_READ|FMODE_WRITE);
--	}
-+	read_lock(&dev->bdev_mutex);
-+	if (dev->blkdev)
-+		sync_blockdev(dev->blkdev);
-+	read_unlock(&dev->bdev_mutex);
- 
--	kfree(dev);
-+	return;
- }
- 
- 
--/* FIXME: ensure that mtd->size % erase_size == 0 */
--static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname)
-+static int _open_bdev(struct block2mtd_dev *dev)
- {
- 	struct block_device *bdev;
--	struct block2mtd_dev *dev;
--	struct mtd_partition *part;
--	char *name;
--
--	if (!devname)
--		return NULL;
--
--	dev = kzalloc(sizeof(struct block2mtd_dev), GFP_KERNEL);
--	if (!dev)
--		return NULL;
- 
- 	/* Get a handle on the device */
--	bdev = open_bdev_exclusive(devname, FMODE_READ|FMODE_WRITE, NULL);
-+	bdev = open_bdev_exclusive(dev->devname, FMODE_READ|FMODE_WRITE, NULL);
- #ifndef MODULE
- 	if (IS_ERR(bdev)) {
- 
- 		/* We might not have rootfs mounted at this point. Try
- 		   to resolve the device name by other means. */
- 
--		dev_t devt = name_to_dev_t(devname);
-+		dev_t devt = name_to_dev_t(dev->devname);
- 		if (devt) {
- 			bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
- 		}
-@@ -263,17 +276,98 @@ static struct block2mtd_dev *add_device(
- #endif
- 
- 	if (IS_ERR(bdev)) {
--		ERROR("error: cannot open device %s", devname);
--		goto devinit_err;
-+		ERROR("error: cannot open device %s", dev->devname);
-+		return 1;
- 	}
- 	dev->blkdev = bdev;
- 
- 	if (MAJOR(bdev->bd_dev) == MTD_BLOCK_MAJOR) {
- 		ERROR("attempting to use an MTD device as a block device");
--		goto devinit_err;
-+		return 1;
- 	}
- 
-+	return 0;
-+}
-+
-+static void _close_bdev(struct block2mtd_dev *dev)
-+{
-+	struct block_device *bdev;
-+
-+	if (!dev->blkdev)
-+		return;
-+
-+	bdev = dev->blkdev;
-+	invalidate_mapping_pages(dev->blkdev->bd_inode->i_mapping, 0, -1);
-+	close_bdev_exclusive(dev->blkdev, FMODE_READ|FMODE_WRITE);
-+	dev->blkdev = NULL;
-+}
-+
-+static void block2mtd_free_device(struct block2mtd_dev *dev)
-+{
-+	if (!dev)
-+		return;
-+
-+	kfree(dev->mtd.name);
-+	_close_bdev(dev);
-+	kfree(dev);
-+}
-+
-+
-+static int block2mtd_refresh(struct mtd_info *mtd)
-+{
-+	struct block2mtd_dev *dev = mtd->priv;
-+	struct block_device *bdev;
-+	dev_t devt;
-+	int err = 0;
-+
-+	/* no other mtd function can run at this point */
-+	write_lock(&dev->bdev_mutex);
-+
-+	/* get the device number for the whole disk */
-+	devt = MKDEV(MAJOR(dev->blkdev->bd_dev), 0);
-+
-+	/* close the old block device */
-+	_close_bdev(dev);
-+
-+	/* open the whole disk, issue a partition rescan, then */
-+	bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
-+	if (!bdev || !bdev->bd_disk)
-+		err = -EINVAL;
-+#ifndef CONFIG_MTD_BLOCK2MTD_MODULE
-+	else
-+		err = rescan_partitions(bdev->bd_disk, bdev);
-+#endif
-+	if (bdev)
-+		close_bdev_exclusive(bdev, FMODE_READ|FMODE_WRITE);
-+
-+	/* try to open the partition block device again */
-+	_open_bdev(dev);
-+	write_unlock(&dev->bdev_mutex);
-+
-+	return err;
-+}
-+
-+/* FIXME: ensure that mtd->size % erase_size == 0 */
-+static struct block2mtd_dev *add_device(char *devname, int erase_size, char *mtdname)
-+{
-+	struct block2mtd_dev *dev;
-+	struct mtd_partition *part;
-+	char *name;
-+
-+	if (!devname)
-+		return NULL;
-+
-+	dev = kzalloc(sizeof(struct block2mtd_dev) + strlen(devname) + 1, GFP_KERNEL);
-+	if (!dev)
-+		return NULL;
-+
-+	strcpy(dev->devname, devname);
-+
-+	if (_open_bdev(dev))
-+		goto devinit_err;
-+
- 	mutex_init(&dev->write_mutex);
-+	rwlock_init(&dev->bdev_mutex);
- 
- 	if (!mtdname)
- 		mtdname = devname;
-@@ -297,6 +391,7 @@ static struct block2mtd_dev *add_device(
- 	dev->mtd.read = block2mtd_read;
- 	dev->mtd.priv = dev;
- 	dev->mtd.owner = THIS_MODULE;
-+	dev->mtd.refresh_device = block2mtd_refresh;
- 
- 	part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
- 	part->name = dev->mtd.name;
---- a/drivers/mtd/mtdchar.c
-+++ b/drivers/mtd/mtdchar.c
-@@ -18,6 +18,7 @@
- 
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/compatmac.h>
-+#include <linux/mtd/partitions.h>
- 
- #include <asm/uaccess.h>
- 
-@@ -814,6 +815,13 @@ static int mtd_ioctl(struct inode *inode
- 		file->f_pos = 0;
- 		break;
- 	}
-+#ifdef CONFIG_MTD_PARTITIONS
-+	case MTDREFRESH:
-+	{
-+		ret = refresh_mtd_partitions(mtd);
-+		break;
-+	}
-+#endif
- 
- 	default:
- 		ret = -ENOTTY;
---- a/include/linux/mtd/mtd.h
-+++ b/include/linux/mtd/mtd.h
-@@ -101,6 +101,7 @@ struct mtd_oob_ops {
- 	uint8_t		*oobbuf;
- };
- 
-+struct mtd_info;
- struct mtd_info {
- 	u_char type;
- 	uint32_t flags;
-@@ -241,6 +242,9 @@ struct mtd_info {
- 	struct device dev;
- 	int usecount;
- 
-+	int (*refresh_device)(struct mtd_info *mtd);
-+	struct mtd_info *split;
-+
- 	/* If the driver is something smart, like UBI, it may need to maintain
- 	 * its own reference counting. The below functions are only for driver.
- 	 * The driver may register its callbacks. These callbacks are not
---- a/include/linux/mtd/partitions.h
-+++ b/include/linux/mtd/partitions.h
-@@ -34,12 +34,14 @@
-  * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
-  */
- 
-+struct mtd_partition;
- struct mtd_partition {
- 	char *name;			/* identifier string */
- 	uint64_t size;			/* partition size */
- 	uint64_t offset;		/* offset within the master MTD space */
- 	uint32_t mask_flags;		/* master MTD flags to mask out for this partition */
- 	struct nand_ecclayout *ecclayout;	/* out of band layout for this partition (NAND only)*/
-+	int (*refresh_partition)(struct mtd_info *);
- };
- 
- #define MTDPART_OFS_NXTBLK	(-2)
-@@ -51,6 +53,7 @@ struct mtd_info;
- 
- int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int);
- int del_mtd_partitions(struct mtd_info *);
-+int refresh_mtd_partitions(struct mtd_info *);
- 
- /*
-  * Functions dealing with the various ways of partitioning the space
---- a/include/mtd/mtd-abi.h
-+++ b/include/mtd/mtd-abi.h
-@@ -110,6 +110,7 @@ struct otp_info {
- #define MEMERASE64		_IOW('M', 20, struct erase_info_user64)
- #define MEMWRITEOOB64		_IOWR('M', 21, struct mtd_oob_buf64)
- #define MEMREADOOB64		_IOWR('M', 22, struct mtd_oob_buf64)
-+#define MTDREFRESH		_IO('M', 23)
- 
- /*
-  * Obsolete legacy interface. Keep it in order not to break userspace
diff --git a/target/linux/generic-2.6/patches-2.6.33/066-block2mtd_probe.patch b/target/linux/generic-2.6/patches-2.6.33/066-block2mtd_probe.patch
deleted file mode 100644
index b2b1a347f..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/066-block2mtd_probe.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/drivers/mtd/devices/block2mtd.c
-+++ b/drivers/mtd/devices/block2mtd.c
-@@ -268,6 +268,7 @@ static int _open_bdev(struct block2mtd_d
- 		/* We might not have rootfs mounted at this point. Try
- 		   to resolve the device name by other means. */
- 
-+		wait_for_device_probe();
- 		dev_t devt = name_to_dev_t(dev->devname);
- 		if (devt) {
- 			bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
diff --git a/target/linux/generic-2.6/patches-2.6.33/070-redboot_space.patch b/target/linux/generic-2.6/patches-2.6.33/070-redboot_space.patch
deleted file mode 100644
index 6ace83c01..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/070-redboot_space.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/drivers/mtd/redboot.c
-+++ b/drivers/mtd/redboot.c
-@@ -249,14 +249,21 @@ static int parse_redboot_partitions(stru
- #endif
- 		names += strlen(names)+1;
- 
--#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
- 		if(fl->next && fl->img->flash_base + fl->img->size + master->erasesize <= fl->next->img->flash_base) {
--			i++;
--			parts[i].offset = parts[i-1].size + parts[i-1].offset;
--			parts[i].size = fl->next->img->flash_base - parts[i].offset;
--			parts[i].name = nullname;
--		}
-+			if (!strcmp(parts[i].name, "rootfs")) {
-+				parts[i].size = fl->next->img->flash_base;
-+				parts[i].size &= ~(master->erasesize - 1);
-+				parts[i].size -= parts[i].offset;
-+#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
-+				nrparts--;
-+			} else {
-+				i++;
-+				parts[i].offset = parts[i-1].size + parts[i-1].offset;
-+				parts[i].size = fl->next->img->flash_base - parts[i].offset;
-+				parts[i].name = nullname;
- #endif
-+			}
-+		}
- 		tmp_fl = fl;
- 		fl = fl->next;
- 		kfree(tmp_fl);
diff --git a/target/linux/generic-2.6/patches-2.6.33/071-redboot_boardconfig.patch b/target/linux/generic-2.6/patches-2.6.33/071-redboot_boardconfig.patch
deleted file mode 100644
index f9bc4fe36..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/071-redboot_boardconfig.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/drivers/mtd/redboot.c
-+++ b/drivers/mtd/redboot.c
-@@ -11,6 +11,8 @@
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
- 
-+#define BOARD_CONFIG_PART		"boardconfig"
-+
- struct fis_image_desc {
-     unsigned char name[16];      // Null terminated name
-     uint32_t	  flash_base;    // Address within FLASH of image
-@@ -41,6 +43,7 @@ static int parse_redboot_partitions(stru
-                              struct mtd_partition **pparts,
-                              unsigned long fis_origin)
- {
-+	unsigned long max_offset = 0;
- 	int nrparts = 0;
- 	struct fis_image_desc *buf;
- 	struct mtd_partition *parts;
-@@ -209,14 +212,14 @@ static int parse_redboot_partitions(stru
- 		}
- 	}
- #endif
--	parts = kzalloc(sizeof(*parts)*nrparts + nulllen + namelen, GFP_KERNEL);
-+	parts = kzalloc(sizeof(*parts) * (nrparts + 1) + nulllen + namelen + sizeof(BOARD_CONFIG_PART), GFP_KERNEL);
- 
- 	if (!parts) {
- 		ret = -ENOMEM;
- 		goto out;
- 	}
- 
--	nullname = (char *)&parts[nrparts];
-+	nullname = (char *)&parts[nrparts + 1];
- #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
- 	if (nulllen > 0) {
- 		strcpy(nullname, nullstring);
-@@ -235,6 +238,8 @@ static int parse_redboot_partitions(stru
- 	}
- #endif
- 	for ( ; i<nrparts; i++) {
-+		if(max_offset < buf[i].flash_base + buf[i].size)
-+			max_offset = buf[i].flash_base + buf[i].size;
- 		parts[i].size = fl->img->size;
- 		parts[i].offset = fl->img->flash_base;
- 		parts[i].name = names;
-@@ -268,6 +273,14 @@ static int parse_redboot_partitions(stru
- 		fl = fl->next;
- 		kfree(tmp_fl);
- 	}
-+	if(master->size - max_offset >= master->erasesize)
-+	{
-+		parts[nrparts].size = master->size - max_offset;
-+		parts[nrparts].offset = max_offset;
-+		parts[nrparts].name = names;
-+		strcpy(names, BOARD_CONFIG_PART);
-+		nrparts++;
-+	}
- 	ret = nrparts;
- 	*pparts = parts;
-  out:
diff --git a/target/linux/generic-2.6/patches-2.6.33/080-mtd_plat_nand_chip_fixup.patch b/target/linux/generic-2.6/patches-2.6.33/080-mtd_plat_nand_chip_fixup.patch
deleted file mode 100644
index 16ce76ce8..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/080-mtd_plat_nand_chip_fixup.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/include/linux/mtd/nand.h
-+++ b/include/linux/mtd/nand.h
-@@ -491,6 +491,7 @@ struct platform_nand_chip {
- 	int			chip_delay;
- 	unsigned int		options;
- 	const char		**part_probe_types;
-+	int			(*chip_fixup)(struct mtd_info *mtd);
- 	void			(*set_parts)(uint64_t size,
- 					struct platform_nand_chip *chip);
- 	void			*priv;
---- a/drivers/mtd/nand/plat_nand.c
-+++ b/drivers/mtd/nand/plat_nand.c
-@@ -91,7 +91,18 @@ static int __devinit plat_nand_probe(str
- 	}
- 
- 	/* Scan to find existance of the device */
--	if (nand_scan(&data->mtd, 1)) {
-+	if (nand_scan_ident(&data->mtd, 1)) {
-+		res = -ENXIO;
-+		goto out;
-+	}
-+
-+	if (pdata->chip.chip_fixup) {
-+		res = pdata->chip.chip_fixup(&data->mtd);
-+		if (res)
-+			goto out;
-+	}
-+
-+	if (nand_scan_tail(&data->mtd)) {
- 		err = -ENXIO;
- 		goto out;
- 	}
diff --git a/target/linux/generic-2.6/patches-2.6.33/081-mtd_myloader_partition_parser.patch b/target/linux/generic-2.6/patches-2.6.33/081-mtd_myloader_partition_parser.patch
deleted file mode 100644
index 61b822ee8..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/081-mtd_myloader_partition_parser.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -181,6 +181,22 @@ config MTD_AR7_PARTS
- 	---help---
- 	  TI AR7 partitioning support
- 
-+config MTD_MYLOADER_PARTS
-+	tristate "MyLoader partition parsing"
-+	depends on MTD_PARTITIONS && (ADM5120 || ATHEROS_AR231X || ATHEROS_AR71XX)
-+	---help---
-+	  MyLoader is a bootloader which allows the user to define partitions
-+	  in flash devices, by putting a table in the second erase block
-+	  on the device, similar to a partition table. This table gives the 
-+	  offsets and lengths of the user defined partitions.
-+
-+	  If you need code which can detect and parse these tables, and
-+	  register MTD 'partitions' corresponding to each image detected,
-+	  enable this option.
-+
-+	  You will still need the parsing functions to be called by the driver
-+	  for your particular device. It won't happen automatically.
-+
- comment "User Modules And Translation Layers"
- 
- config MTD_CHAR
---- a/drivers/mtd/Makefile
-+++ b/drivers/mtd/Makefile
-@@ -13,6 +13,7 @@ obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdli
- obj-$(CONFIG_MTD_AFS_PARTS)	+= afs.o
- obj-$(CONFIG_MTD_AR7_PARTS)	+= ar7part.o
- obj-$(CONFIG_MTD_OF_PARTS)      += ofpart.o
-+obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
- 
- # 'Users' - code which presents functionality to userspace.
- obj-$(CONFIG_MTD_CHAR)		+= mtdchar.o
diff --git a/target/linux/generic-2.6/patches-2.6.33/082-mtd_info_move_forward_decl.patch b/target/linux/generic-2.6/patches-2.6.33/082-mtd_info_move_forward_decl.patch
deleted file mode 100644
index 13f0a217d..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/082-mtd_info_move_forward_decl.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/include/linux/mtd/partitions.h
-+++ b/include/linux/mtd/partitions.h
-@@ -33,6 +33,7 @@
-  * Note: writeable partitions require their size and offset be
-  * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
-  */
-+struct mtd_info;
- 
- struct mtd_partition;
- struct mtd_partition {
-@@ -49,7 +50,6 @@ struct mtd_partition {
- #define MTDPART_SIZ_FULL	(0)
- 
- 
--struct mtd_info;
- 
- int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int);
- int del_mtd_partitions(struct mtd_info *);
diff --git a/target/linux/generic-2.6/patches-2.6.33/083-mtd_fix_nand_correct_data_return_code.patch b/target/linux/generic-2.6/patches-2.6.33/083-mtd_fix_nand_correct_data_return_code.patch
deleted file mode 100644
index f630059e8..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/083-mtd_fix_nand_correct_data_return_code.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/drivers/mtd/nand/nand_ecc.c
-+++ b/drivers/mtd/nand/nand_ecc.c
-@@ -507,8 +507,7 @@ int __nand_correct_data(unsigned char *b
- 	if ((bitsperbyte[b0] + bitsperbyte[b1] + bitsperbyte[b2]) == 1)
- 		return 1;	/* error in ecc data; no action needed */
- 
--	printk(KERN_ERR "uncorrectable error : ");
--	return -1;
-+	return -EBADMSG;
- }
- EXPORT_SYMBOL(__nand_correct_data);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.33/084-mtd_m25p80_add_pm25lv_flash_support.patch b/target/linux/generic-2.6/patches-2.6.33/084-mtd_m25p80_add_pm25lv_flash_support.patch
deleted file mode 100644
index 54cc6bbe5..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/084-mtd_m25p80_add_pm25lv_flash_support.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -645,6 +645,10 @@ static const struct spi_device_id m25p_i
- 	{ "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
- 	{ "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
- 
-+	/* PMC -- pm25x "blocks" are 32K, sectors are 4K */
-+	{ "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K) },
-+	{ "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K) },
-+
- 	/* Spansion -- single (large) sector size only, at least
- 	 * for the chips listed here (without boot sectors).
- 	 */
diff --git a/target/linux/generic-2.6/patches-2.6.33/085-mtd_m25p80_add_en25pxx_support.patch b/target/linux/generic-2.6/patches-2.6.33/085-mtd_m25p80_add_en25pxx_support.patch
deleted file mode 100644
index 607430bb2..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/085-mtd_m25p80_add_en25pxx_support.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -645,6 +645,10 @@ static const struct spi_device_id m25p_i
- 	{ "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
- 	{ "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
- 
-+	/* EON -- en25pxx */
-+	{ "en25p32", INFO(0x1c2016, 0, 64 * 1024,  64, 0) },
-+	{ "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) },
-+
- 	/* PMC -- pm25x "blocks" are 32K, sectors are 4K */
- 	{ "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K) },
- 	{ "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K) },
diff --git a/target/linux/generic-2.6/patches-2.6.33/086-mtd_m25p80_add_xxxs33b_support.patch b/target/linux/generic-2.6/patches-2.6.33/086-mtd_m25p80_add_xxxs33b_support.patch
deleted file mode 100644
index 2f6d89927..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/086-mtd_m25p80_add_xxxs33b_support.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -649,6 +649,11 @@ static const struct spi_device_id m25p_i
- 	{ "en25p32", INFO(0x1c2016, 0, 64 * 1024,  64, 0) },
- 	{ "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) },
- 
-+	/* Numonyx -- xxxs33b */
-+	{ "160s33b",  INFO(0x898911, 0, 64 * 1024,  64, 0) },
-+	{ "320s33b",  INFO(0x898912, 0, 64 * 1024, 128, 0) },
-+	{ "640s33b",  INFO(0x898913, 0, 64 * 1024, 256, 0) },
-+
- 	/* PMC -- pm25x "blocks" are 32K, sectors are 4K */
- 	{ "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K) },
- 	{ "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K) },
-@@ -833,11 +838,12 @@ static int __devinit m25p_probe(struct s
- 	dev_set_drvdata(&spi->dev, flash);
- 
- 	/*
--	 * Atmel and SST serial flash tend to power
-+	 * Atmel, SST and Intel/Numonyx serial flash tend to power
- 	 * up with the software protection bits set
- 	 */
- 
- 	if (info->jedec_id >> 16 == 0x1f ||
-+	    info->jedec_id >> 16 == 0x89 ||
- 	    info->jedec_id >> 16 == 0xbf) {
- 		write_enable(flash);
- 		write_sr(flash, 0);
diff --git a/target/linux/generic-2.6/patches-2.6.33/087-mtd-m25p80-add-w25q32-chip-support.patch b/target/linux/generic-2.6/patches-2.6.33/087-mtd-m25p80-add-w25q32-chip-support.patch
deleted file mode 100644
index 8d32ec2c5..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/087-mtd-m25p80-add-w25q32-chip-support.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -706,6 +706,7 @@ static const struct spi_device_id m25p_i
- 	{ "w25x80", INFO(0xef3014, 0, 64 * 1024,  16, SECT_4K) },
- 	{ "w25x16", INFO(0xef3015, 0, 64 * 1024,  32, SECT_4K) },
- 	{ "w25x32", INFO(0xef3016, 0, 64 * 1024,  64, SECT_4K) },
-+	{ "w25q32", INFO(0xef4016, 0, 64 * 1024,  64, SECT_4K) },
- 	{ "w25x64", INFO(0xef3017, 0, 64 * 1024, 128, SECT_4K) },
- 
- 	/* Catalyst / On Semiconductor -- non-JEDEC */
diff --git a/target/linux/generic-2.6/patches-2.6.33/100-netfilter_layer7_2.21.patch b/target/linux/generic-2.6/patches-2.6.33/100-netfilter_layer7_2.21.patch
deleted file mode 100644
index de9c63c35..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/100-netfilter_layer7_2.21.patch
+++ /dev/null
@@ -1,2132 +0,0 @@
---- /dev/null
-+++ b/include/linux/netfilter/xt_layer7.h
-@@ -0,0 +1,13 @@
-+#ifndef _XT_LAYER7_H
-+#define _XT_LAYER7_H
-+
-+#define MAX_PATTERN_LEN 8192
-+#define MAX_PROTOCOL_LEN 256
-+
-+struct xt_layer7_info {
-+    char protocol[MAX_PROTOCOL_LEN];
-+    char pattern[MAX_PATTERN_LEN];
-+    u_int8_t invert;
-+};
-+
-+#endif /* _XT_LAYER7_H */
---- a/include/net/netfilter/nf_conntrack.h
-+++ b/include/net/netfilter/nf_conntrack.h
-@@ -116,6 +116,22 @@ struct nf_conn {
- 	u_int32_t secmark;
- #endif
- 
-+#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || \
-+    defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
-+	struct {
-+		/*
-+		 * e.g. "http". NULL before decision. "unknown" after decision
-+		 * if no match.
-+		 */
-+		char *app_proto;
-+		/*
-+		 * application layer data so far. NULL after match decision.
-+		 */
-+		char *app_data;
-+		unsigned int app_data_len;
-+	} layer7;
-+#endif
-+
- 	/* Storage reserved for other modules: */
- 	union nf_conntrack_proto proto;
- 
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -858,6 +858,27 @@ config NETFILTER_XT_MATCH_STATE
- 
- 	  To compile it as a module, choose M here.  If unsure, say N.
- 
-+config NETFILTER_XT_MATCH_LAYER7
-+	tristate '"layer7" match support'
-+	depends on NETFILTER_XTABLES
-+	depends on EXPERIMENTAL && (IP_NF_CONNTRACK || NF_CONNTRACK)
-+       depends on NF_CT_ACCT
-+	help
-+	  Say Y if you want to be able to classify connections (and their
-+	  packets) based on regular expression matching of their application
-+	  layer data.   This is one way to classify applications such as
-+	  peer-to-peer filesharing systems that do not always use the same
-+	  port.
-+
-+	  To compile it as a module, choose M here.  If unsure, say N.
-+
-+config NETFILTER_XT_MATCH_LAYER7_DEBUG
-+        bool 'Layer 7 debugging output'
-+        depends on NETFILTER_XT_MATCH_LAYER7
-+        help
-+          Say Y to get lots of debugging output.
-+
-+
- config NETFILTER_XT_MATCH_STATISTIC
- 	tristate '"statistic" match support'
- 	depends on NETFILTER_ADVANCED
---- a/net/netfilter/Makefile
-+++ b/net/netfilter/Makefile
-@@ -89,6 +89,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT)
- obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
-+obj-$(CONFIG_NETFILTER_XT_MATCH_LAYER7) += xt_layer7.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_STATISTIC) += xt_statistic.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) += xt_string.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
---- a/net/netfilter/nf_conntrack_core.c
-+++ b/net/netfilter/nf_conntrack_core.c
-@@ -201,6 +201,14 @@ destroy_conntrack(struct nf_conntrack *n
- 	 * too. */
- 	nf_ct_remove_expectations(ct);
- 
-+	#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
-+	if(ct->layer7.app_proto)
-+		kfree(ct->layer7.app_proto);
-+	if(ct->layer7.app_data)
-+	kfree(ct->layer7.app_data);
-+	#endif
-+
-+
- 	/* We overload first tuple to link into unconfirmed list. */
- 	if (!nf_ct_is_confirmed(ct)) {
- 		BUG_ON(hlist_nulls_unhashed(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnnode));
---- a/net/netfilter/nf_conntrack_standalone.c
-+++ b/net/netfilter/nf_conntrack_standalone.c
-@@ -171,6 +171,12 @@ static int ct_seq_show(struct seq_file *
- 		goto release;
- #endif
- 
-+#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
-+	if(ct->layer7.app_proto &&
-+           seq_printf(s, "l7proto=%s ", ct->layer7.app_proto))
-+		return -ENOSPC;
-+#endif
-+
- 	if (seq_printf(s, "use=%u\n", atomic_read(&ct->ct_general.use)))
- 		goto release;
- 
---- /dev/null
-+++ b/net/netfilter/regexp/regexp.c
-@@ -0,0 +1,1197 @@
-+/*
-+ * regcomp and regexec -- regsub and regerror are elsewhere
-+ * @(#)regexp.c	1.3 of 18 April 87
-+ *
-+ *	Copyright (c) 1986 by University of Toronto.
-+ *	Written by Henry Spencer.  Not derived from licensed software.
-+ *
-+ *	Permission is granted to anyone to use this software for any
-+ *	purpose on any computer system, and to redistribute it freely,
-+ *	subject to the following restrictions:
-+ *
-+ *	1. The author is not responsible for the consequences of use of
-+ *		this software, no matter how awful, even if they arise
-+ *		from defects in it.
-+ *
-+ *	2. The origin of this software must not be misrepresented, either
-+ *		by explicit claim or by omission.
-+ *
-+ *	3. Altered versions must be plainly marked as such, and must not
-+ *		be misrepresented as being the original software.
-+ *
-+ * Beware that some of this code is subtly aware of the way operator
-+ * precedence is structured in regular expressions.  Serious changes in
-+ * regular-expression syntax might require a total rethink.
-+ *
-+ * This code was modified by Ethan Sommer to work within the kernel
-+ * (it now uses kmalloc etc..)
-+ *
-+ * Modified slightly by Matthew Strait to use more modern C.
-+ */
-+
-+#include "regexp.h"
-+#include "regmagic.h"
-+
-+/* added by ethan and matt.  Lets it work in both kernel and user space.
-+(So iptables can use it, for instance.)  Yea, it goes both ways... */
-+#if __KERNEL__
-+  #define malloc(foo) kmalloc(foo,GFP_ATOMIC)
-+#else
-+  #define printk(format,args...) printf(format,##args)
-+#endif
-+
-+void regerror(char * s)
-+{
-+        printk("<3>Regexp: %s\n", s);
-+        /* NOTREACHED */
-+}
-+
-+/*
-+ * The "internal use only" fields in regexp.h are present to pass info from
-+ * compile to execute that permits the execute phase to run lots faster on
-+ * simple cases.  They are:
-+ *
-+ * regstart	char that must begin a match; '\0' if none obvious
-+ * reganch	is the match anchored (at beginning-of-line only)?
-+ * regmust	string (pointer into program) that match must include, or NULL
-+ * regmlen	length of regmust string
-+ *
-+ * Regstart and reganch permit very fast decisions on suitable starting points
-+ * for a match, cutting down the work a lot.  Regmust permits fast rejection
-+ * of lines that cannot possibly match.  The regmust tests are costly enough
-+ * that regcomp() supplies a regmust only if the r.e. contains something
-+ * potentially expensive (at present, the only such thing detected is * or +
-+ * at the start of the r.e., which can involve a lot of backup).  Regmlen is
-+ * supplied because the test in regexec() needs it and regcomp() is computing
-+ * it anyway.
-+ */
-+
-+/*
-+ * Structure for regexp "program".  This is essentially a linear encoding
-+ * of a nondeterministic finite-state machine (aka syntax charts or
-+ * "railroad normal form" in parsing technology).  Each node is an opcode
-+ * plus a "next" pointer, possibly plus an operand.  "Next" pointers of
-+ * all nodes except BRANCH implement concatenation; a "next" pointer with
-+ * a BRANCH on both ends of it is connecting two alternatives.  (Here we
-+ * have one of the subtle syntax dependencies:  an individual BRANCH (as
-+ * opposed to a collection of them) is never concatenated with anything
-+ * because of operator precedence.)  The operand of some types of node is
-+ * a literal string; for others, it is a node leading into a sub-FSM.  In
-+ * particular, the operand of a BRANCH node is the first node of the branch.
-+ * (NB this is *not* a tree structure:  the tail of the branch connects
-+ * to the thing following the set of BRANCHes.)  The opcodes are:
-+ */
-+
-+/* definition	number	opnd?	meaning */
-+#define	END	0	/* no	End of program. */
-+#define	BOL	1	/* no	Match "" at beginning of line. */
-+#define	EOL	2	/* no	Match "" at end of line. */
-+#define	ANY	3	/* no	Match any one character. */
-+#define	ANYOF	4	/* str	Match any character in this string. */
-+#define	ANYBUT	5	/* str	Match any character not in this string. */
-+#define	BRANCH	6	/* node	Match this alternative, or the next... */
-+#define	BACK	7	/* no	Match "", "next" ptr points backward. */
-+#define	EXACTLY	8	/* str	Match this string. */
-+#define	NOTHING	9	/* no	Match empty string. */
-+#define	STAR	10	/* node	Match this (simple) thing 0 or more times. */
-+#define	PLUS	11	/* node	Match this (simple) thing 1 or more times. */
-+#define	OPEN	20	/* no	Mark this point in input as start of #n. */
-+			/*	OPEN+1 is number 1, etc. */
-+#define	CLOSE	30	/* no	Analogous to OPEN. */
-+
-+/*
-+ * Opcode notes:
-+ *
-+ * BRANCH	The set of branches constituting a single choice are hooked
-+ *		together with their "next" pointers, since precedence prevents
-+ *		anything being concatenated to any individual branch.  The
-+ *		"next" pointer of the last BRANCH in a choice points to the
-+ *		thing following the whole choice.  This is also where the
-+ *		final "next" pointer of each individual branch points; each
-+ *		branch starts with the operand node of a BRANCH node.
-+ *
-+ * BACK		Normal "next" pointers all implicitly point forward; BACK
-+ *		exists to make loop structures possible.
-+ *
-+ * STAR,PLUS	'?', and complex '*' and '+', are implemented as circular
-+ *		BRANCH structures using BACK.  Simple cases (one character
-+ *		per match) are implemented with STAR and PLUS for speed
-+ *		and to minimize recursive plunges.
-+ *
-+ * OPEN,CLOSE	...are numbered at compile time.
-+ */
-+
-+/*
-+ * A node is one char of opcode followed by two chars of "next" pointer.
-+ * "Next" pointers are stored as two 8-bit pieces, high order first.  The
-+ * value is a positive offset from the opcode of the node containing it.
-+ * An operand, if any, simply follows the node.  (Note that much of the
-+ * code generation knows about this implicit relationship.)
-+ *
-+ * Using two bytes for the "next" pointer is vast overkill for most things,
-+ * but allows patterns to get big without disasters.
-+ */
-+#define	OP(p)	(*(p))
-+#define	NEXT(p)	(((*((p)+1)&0377)<<8) + (*((p)+2)&0377))
-+#define	OPERAND(p)	((p) + 3)
-+
-+/*
-+ * See regmagic.h for one further detail of program structure.
-+ */
-+
-+
-+/*
-+ * Utility definitions.
-+ */
-+#ifndef CHARBITS
-+#define	UCHARAT(p)	((int)*(unsigned char *)(p))
-+#else
-+#define	UCHARAT(p)	((int)*(p)&CHARBITS)
-+#endif
-+
-+#define	FAIL(m)	{ regerror(m); return(NULL); }
-+#define	ISMULT(c)	((c) == '*' || (c) == '+' || (c) == '?')
-+#define	META	"^$.[()|?+*\\"
-+
-+/*
-+ * Flags to be passed up and down.
-+ */
-+#define	HASWIDTH	01	/* Known never to match null string. */
-+#define	SIMPLE		02	/* Simple enough to be STAR/PLUS operand. */
-+#define	SPSTART		04	/* Starts with * or +. */
-+#define	WORST		0	/* Worst case. */
-+
-+/*
-+ * Global work variables for regcomp().
-+ */
-+struct match_globals {
-+char *reginput;		/* String-input pointer. */
-+char *regbol;		/* Beginning of input, for ^ check. */
-+char **regstartp;	/* Pointer to startp array. */
-+char **regendp;		/* Ditto for endp. */
-+char *regparse;		/* Input-scan pointer. */
-+int regnpar;		/* () count. */
-+char regdummy;
-+char *regcode;		/* Code-emit pointer; &regdummy = don't. */
-+long regsize;		/* Code size. */
-+};
-+
-+/*
-+ * Forward declarations for regcomp()'s friends.
-+ */
-+#ifndef STATIC
-+#define	STATIC	static
-+#endif
-+STATIC char *reg(struct match_globals *g, int paren,int *flagp);
-+STATIC char *regbranch(struct match_globals *g, int *flagp);
-+STATIC char *regpiece(struct match_globals *g, int *flagp);
-+STATIC char *regatom(struct match_globals *g, int *flagp);
-+STATIC char *regnode(struct match_globals *g, char op);
-+STATIC char *regnext(struct match_globals *g, char *p);
-+STATIC void regc(struct match_globals *g, char b);
-+STATIC void reginsert(struct match_globals *g, char op, char *opnd);
-+STATIC void regtail(struct match_globals *g, char *p, char *val);
-+STATIC void regoptail(struct match_globals *g, char *p, char *val);
-+
-+
-+__kernel_size_t my_strcspn(const char *s1,const char *s2)
-+{
-+        char *scan1;
-+        char *scan2;
-+        int count;
-+
-+        count = 0;
-+        for (scan1 = (char *)s1; *scan1 != '\0'; scan1++) {
-+                for (scan2 = (char *)s2; *scan2 != '\0';)       /* ++ moved down. */
-+                        if (*scan1 == *scan2++)
-+                                return(count);
-+                count++;
-+        }
-+        return(count);
-+}
-+
-+/*
-+ - regcomp - compile a regular expression into internal code
-+ *
-+ * We can't allocate space until we know how big the compiled form will be,
-+ * but we can't compile it (and thus know how big it is) until we've got a
-+ * place to put the code.  So we cheat:  we compile it twice, once with code
-+ * generation turned off and size counting turned on, and once "for real".
-+ * This also means that we don't allocate space until we are sure that the
-+ * thing really will compile successfully, and we never have to move the
-+ * code and thus invalidate pointers into it.  (Note that it has to be in
-+ * one piece because free() must be able to free it all.)
-+ *
-+ * Beware that the optimization-preparation code in here knows about some
-+ * of the structure of the compiled regexp.
-+ */
-+regexp *
-+regcomp(char *exp,int *patternsize)
-+{
-+	register regexp *r;
-+	register char *scan;
-+	register char *longest;
-+	register int len;
-+	int flags;
-+	struct match_globals g;
-+	
-+	/* commented out by ethan
-+	   extern char *malloc();
-+	*/
-+
-+	if (exp == NULL)
-+		FAIL("NULL argument");
-+
-+	/* First pass: determine size, legality. */
-+	g.regparse = exp;
-+	g.regnpar = 1;
-+	g.regsize = 0L;
-+	g.regcode = &g.regdummy;
-+	regc(&g, MAGIC);
-+	if (reg(&g, 0, &flags) == NULL)
-+		return(NULL);
-+
-+	/* Small enough for pointer-storage convention? */
-+	if (g.regsize >= 32767L)		/* Probably could be 65535L. */
-+		FAIL("regexp too big");
-+
-+	/* Allocate space. */
-+	*patternsize=sizeof(regexp) + (unsigned)g.regsize;
-+	r = (regexp *)malloc(sizeof(regexp) + (unsigned)g.regsize);
-+	if (r == NULL)
-+		FAIL("out of space");
-+
-+	/* Second pass: emit code. */
-+	g.regparse = exp;
-+	g.regnpar = 1;
-+	g.regcode = r->program;
-+	regc(&g, MAGIC);
-+	if (reg(&g, 0, &flags) == NULL)
-+		return(NULL);
-+
-+	/* Dig out information for optimizations. */
-+	r->regstart = '\0';	/* Worst-case defaults. */
-+	r->reganch = 0;
-+	r->regmust = NULL;
-+	r->regmlen = 0;
-+	scan = r->program+1;			/* First BRANCH. */
-+	if (OP(regnext(&g, scan)) == END) {		/* Only one top-level choice. */
-+		scan = OPERAND(scan);
-+
-+		/* Starting-point info. */
-+		if (OP(scan) == EXACTLY)
-+			r->regstart = *OPERAND(scan);
-+		else if (OP(scan) == BOL)
-+			r->reganch++;
-+
-+		/*
-+		 * If there's something expensive in the r.e., find the
-+		 * longest literal string that must appear and make it the
-+		 * regmust.  Resolve ties in favor of later strings, since
-+		 * the regstart check works with the beginning of the r.e.
-+		 * and avoiding duplication strengthens checking.  Not a
-+		 * strong reason, but sufficient in the absence of others.
-+		 */
-+		if (flags&SPSTART) {
-+			longest = NULL;
-+			len = 0;
-+			for (; scan != NULL; scan = regnext(&g, scan))
-+				if (OP(scan) == EXACTLY && strlen(OPERAND(scan)) >= len) {
-+					longest = OPERAND(scan);
-+					len = strlen(OPERAND(scan));
-+				}
-+			r->regmust = longest;
-+			r->regmlen = len;
-+		}
-+	}
-+
-+	return(r);
-+}
-+
-+/*
-+ - reg - regular expression, i.e. main body or parenthesized thing
-+ *
-+ * Caller must absorb opening parenthesis.
-+ *
-+ * Combining parenthesis handling with the base level of regular expression
-+ * is a trifle forced, but the need to tie the tails of the branches to what
-+ * follows makes it hard to avoid.
-+ */
-+static char *
-+reg(struct match_globals *g, int paren, int *flagp /* Parenthesized? */ )
-+{
-+	register char *ret;
-+	register char *br;
-+	register char *ender;
-+	register int parno = 0; /* 0 makes gcc happy */
-+	int flags;
-+
-+	*flagp = HASWIDTH;	/* Tentatively. */
-+
-+	/* Make an OPEN node, if parenthesized. */
-+	if (paren) {
-+		if (g->regnpar >= NSUBEXP)
-+			FAIL("too many ()");
-+		parno = g->regnpar;
-+		g->regnpar++;
-+		ret = regnode(g, OPEN+parno);
-+	} else
-+		ret = NULL;
-+
-+	/* Pick up the branches, linking them together. */
-+	br = regbranch(g, &flags);
-+	if (br == NULL)
-+		return(NULL);
-+	if (ret != NULL)
-+		regtail(g, ret, br);	/* OPEN -> first. */
-+	else
-+		ret = br;
-+	if (!(flags&HASWIDTH))
-+		*flagp &= ~HASWIDTH;
-+	*flagp |= flags&SPSTART;
-+	while (*g->regparse == '|') {
-+		g->regparse++;
-+		br = regbranch(g, &flags);
-+		if (br == NULL)
-+			return(NULL);
-+		regtail(g, ret, br);	/* BRANCH -> BRANCH. */
-+		if (!(flags&HASWIDTH))
-+			*flagp &= ~HASWIDTH;
-+		*flagp |= flags&SPSTART;
-+	}
-+
-+	/* Make a closing node, and hook it on the end. */
-+	ender = regnode(g, (paren) ? CLOSE+parno : END);	
-+	regtail(g, ret, ender);
-+
-+	/* Hook the tails of the branches to the closing node. */
-+	for (br = ret; br != NULL; br = regnext(g, br))
-+		regoptail(g, br, ender);
-+
-+	/* Check for proper termination. */
-+	if (paren && *g->regparse++ != ')') {
-+		FAIL("unmatched ()");
-+	} else if (!paren && *g->regparse != '\0') {
-+		if (*g->regparse == ')') {
-+			FAIL("unmatched ()");
-+		} else
-+			FAIL("junk on end");	/* "Can't happen". */
-+		/* NOTREACHED */
-+	}
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regbranch - one alternative of an | operator
-+ *
-+ * Implements the concatenation operator.
-+ */
-+static char *
-+regbranch(struct match_globals *g, int *flagp)
-+{
-+	register char *ret;
-+	register char *chain;
-+	register char *latest;
-+	int flags;
-+
-+	*flagp = WORST;		/* Tentatively. */
-+
-+	ret = regnode(g, BRANCH);
-+	chain = NULL;
-+	while (*g->regparse != '\0' && *g->regparse != '|' && *g->regparse != ')') {
-+		latest = regpiece(g, &flags);
-+		if (latest == NULL)
-+			return(NULL);
-+		*flagp |= flags&HASWIDTH;
-+		if (chain == NULL)	/* First piece. */
-+			*flagp |= flags&SPSTART;
-+		else
-+			regtail(g, chain, latest);
-+		chain = latest;
-+	}
-+	if (chain == NULL)	/* Loop ran zero times. */
-+		(void) regnode(g, NOTHING);
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regpiece - something followed by possible [*+?]
-+ *
-+ * Note that the branching code sequences used for ? and the general cases
-+ * of * and + are somewhat optimized:  they use the same NOTHING node as
-+ * both the endmarker for their branch list and the body of the last branch.
-+ * It might seem that this node could be dispensed with entirely, but the
-+ * endmarker role is not redundant.
-+ */
-+static char *
-+regpiece(struct match_globals *g, int *flagp)
-+{
-+	register char *ret;
-+	register char op;
-+	register char *next;
-+	int flags;
-+
-+	ret = regatom(g, &flags);
-+	if (ret == NULL)
-+		return(NULL);
-+
-+	op = *g->regparse;
-+	if (!ISMULT(op)) {
-+		*flagp = flags;
-+		return(ret);
-+	}
-+
-+	if (!(flags&HASWIDTH) && op != '?')
-+		FAIL("*+ operand could be empty");
-+	*flagp = (op != '+') ? (WORST|SPSTART) : (WORST|HASWIDTH);
-+
-+	if (op == '*' && (flags&SIMPLE))
-+		reginsert(g, STAR, ret);
-+	else if (op == '*') {
-+		/* Emit x* as (x&|), where & means "self". */
-+		reginsert(g, BRANCH, ret);			/* Either x */
-+		regoptail(g, ret, regnode(g, BACK));		/* and loop */
-+		regoptail(g, ret, ret);			/* back */
-+		regtail(g, ret, regnode(g, BRANCH));		/* or */
-+		regtail(g, ret, regnode(g, NOTHING));		/* null. */
-+	} else if (op == '+' && (flags&SIMPLE))
-+		reginsert(g, PLUS, ret);
-+	else if (op == '+') {
-+		/* Emit x+ as x(&|), where & means "self". */
-+		next = regnode(g, BRANCH);			/* Either */
-+		regtail(g, ret, next);
-+		regtail(g, regnode(g, BACK), ret);		/* loop back */
-+		regtail(g, next, regnode(g, BRANCH));		/* or */
-+		regtail(g, ret, regnode(g, NOTHING));		/* null. */
-+	} else if (op == '?') {
-+		/* Emit x? as (x|) */
-+		reginsert(g, BRANCH, ret);			/* Either x */
-+		regtail(g, ret, regnode(g, BRANCH));		/* or */
-+		next = regnode(g, NOTHING);		/* null. */
-+		regtail(g, ret, next);
-+		regoptail(g, ret, next);
-+	}
-+	g->regparse++;
-+	if (ISMULT(*g->regparse))
-+		FAIL("nested *?+");
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regatom - the lowest level
-+ *
-+ * Optimization:  gobbles an entire sequence of ordinary characters so that
-+ * it can turn them into a single node, which is smaller to store and
-+ * faster to run.  Backslashed characters are exceptions, each becoming a
-+ * separate node; the code is simpler that way and it's not worth fixing.
-+ */
-+static char *
-+regatom(struct match_globals *g, int *flagp)
-+{
-+	register char *ret;
-+	int flags;
-+
-+	*flagp = WORST;		/* Tentatively. */
-+
-+	switch (*g->regparse++) {
-+	case '^':
-+		ret = regnode(g, BOL);
-+		break;
-+	case '$':
-+		ret = regnode(g, EOL);
-+		break;
-+	case '.':
-+		ret = regnode(g, ANY);
-+		*flagp |= HASWIDTH|SIMPLE;
-+		break;
-+	case '[': {
-+			register int class;
-+			register int classend;
-+
-+			if (*g->regparse == '^') {	/* Complement of range. */
-+				ret = regnode(g, ANYBUT);
-+				g->regparse++;
-+			} else
-+				ret = regnode(g, ANYOF);
-+			if (*g->regparse == ']' || *g->regparse == '-')
-+				regc(g, *g->regparse++);
-+			while (*g->regparse != '\0' && *g->regparse != ']') {
-+				if (*g->regparse == '-') {
-+					g->regparse++;
-+					if (*g->regparse == ']' || *g->regparse == '\0')
-+						regc(g, '-');
-+					else {
-+						class = UCHARAT(g->regparse-2)+1;
-+						classend = UCHARAT(g->regparse);
-+						if (class > classend+1)
-+							FAIL("invalid [] range");
-+						for (; class <= classend; class++)
-+							regc(g, class);
-+						g->regparse++;
-+					}
-+				} else
-+					regc(g, *g->regparse++);
-+			}
-+			regc(g, '\0');
-+			if (*g->regparse != ']')
-+				FAIL("unmatched []");
-+			g->regparse++;
-+			*flagp |= HASWIDTH|SIMPLE;
-+		}
-+		break;
-+	case '(':
-+		ret = reg(g, 1, &flags);
-+		if (ret == NULL)
-+			return(NULL);
-+		*flagp |= flags&(HASWIDTH|SPSTART);
-+		break;
-+	case '\0':
-+	case '|':
-+	case ')':
-+		FAIL("internal urp");	/* Supposed to be caught earlier. */
-+		break;
-+	case '?':
-+	case '+':
-+	case '*':
-+		FAIL("?+* follows nothing");
-+		break;
-+	case '\\':
-+		if (*g->regparse == '\0')
-+			FAIL("trailing \\");
-+		ret = regnode(g, EXACTLY);
-+		regc(g, *g->regparse++);
-+		regc(g, '\0');
-+		*flagp |= HASWIDTH|SIMPLE;
-+		break;
-+	default: {
-+			register int len;
-+			register char ender;
-+
-+			g->regparse--;
-+			len = my_strcspn((const char *)g->regparse, (const char *)META);
-+			if (len <= 0)
-+				FAIL("internal disaster");
-+			ender = *(g->regparse+len);
-+			if (len > 1 && ISMULT(ender))
-+				len--;		/* Back off clear of ?+* operand. */
-+			*flagp |= HASWIDTH;
-+			if (len == 1)
-+				*flagp |= SIMPLE;
-+			ret = regnode(g, EXACTLY);
-+			while (len > 0) {
-+				regc(g, *g->regparse++);
-+				len--;
-+			}
-+			regc(g, '\0');
-+		}
-+		break;
-+	}
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regnode - emit a node
-+ */
-+static char *			/* Location. */
-+regnode(struct match_globals *g, char op)
-+{
-+	register char *ret;
-+	register char *ptr;
-+
-+	ret = g->regcode;
-+	if (ret == &g->regdummy) {
-+		g->regsize += 3;
-+		return(ret);
-+	}
-+
-+	ptr = ret;
-+	*ptr++ = op;
-+	*ptr++ = '\0';		/* Null "next" pointer. */
-+	*ptr++ = '\0';
-+	g->regcode = ptr;
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regc - emit (if appropriate) a byte of code
-+ */
-+static void
-+regc(struct match_globals *g, char b)
-+{
-+	if (g->regcode != &g->regdummy)
-+		*g->regcode++ = b;
-+	else
-+		g->regsize++;
-+}
-+
-+/*
-+ - reginsert - insert an operator in front of already-emitted operand
-+ *
-+ * Means relocating the operand.
-+ */
-+static void
-+reginsert(struct match_globals *g, char op, char* opnd)
-+{
-+	register char *src;
-+	register char *dst;
-+	register char *place;
-+
-+	if (g->regcode == &g->regdummy) {
-+		g->regsize += 3;
-+		return;
-+	}
-+
-+	src = g->regcode;
-+	g->regcode += 3;
-+	dst = g->regcode;
-+	while (src > opnd)
-+		*--dst = *--src;
-+
-+	place = opnd;		/* Op node, where operand used to be. */
-+	*place++ = op;
-+	*place++ = '\0';
-+	*place++ = '\0';
-+}
-+
-+/*
-+ - regtail - set the next-pointer at the end of a node chain
-+ */
-+static void
-+regtail(struct match_globals *g, char *p, char *val)
-+{
-+	register char *scan;
-+	register char *temp;
-+	register int offset;
-+
-+	if (p == &g->regdummy)
-+		return;
-+
-+	/* Find last node. */
-+	scan = p;
-+	for (;;) {
-+		temp = regnext(g, scan);
-+		if (temp == NULL)
-+			break;
-+		scan = temp;
-+	}
-+
-+	if (OP(scan) == BACK)
-+		offset = scan - val;
-+	else
-+		offset = val - scan;
-+	*(scan+1) = (offset>>8)&0377;
-+	*(scan+2) = offset&0377;
-+}
-+
-+/*
-+ - regoptail - regtail on operand of first argument; nop if operandless
-+ */
-+static void
-+regoptail(struct match_globals *g, char *p, char *val)
-+{
-+	/* "Operandless" and "op != BRANCH" are synonymous in practice. */
-+	if (p == NULL || p == &g->regdummy || OP(p) != BRANCH)
-+		return;
-+	regtail(g, OPERAND(p), val);
-+}
-+
-+/*
-+ * regexec and friends
-+ */
-+
-+
-+/*
-+ * Forwards.
-+ */
-+STATIC int regtry(struct match_globals *g, regexp *prog, char *string);
-+STATIC int regmatch(struct match_globals *g, char *prog);
-+STATIC int regrepeat(struct match_globals *g, char *p);
-+
-+#ifdef DEBUG
-+int regnarrate = 0;
-+void regdump();
-+STATIC char *regprop(char *op);
-+#endif
-+
-+/*
-+ - regexec - match a regexp against a string
-+ */
-+int
-+regexec(regexp *prog, char *string)
-+{
-+	register char *s;
-+	struct match_globals g;
-+
-+	/* Be paranoid... */
-+	if (prog == NULL || string == NULL) {
-+		printk("<3>Regexp: NULL parameter\n");
-+		return(0);
-+	}
-+
-+	/* Check validity of program. */
-+	if (UCHARAT(prog->program) != MAGIC) {
-+		printk("<3>Regexp: corrupted program\n");
-+		return(0);
-+	}
-+
-+	/* If there is a "must appear" string, look for it. */
-+	if (prog->regmust != NULL) {
-+		s = string;
-+		while ((s = strchr(s, prog->regmust[0])) != NULL) {
-+			if (strncmp(s, prog->regmust, prog->regmlen) == 0)
-+				break;	/* Found it. */
-+			s++;
-+		}
-+		if (s == NULL)	/* Not present. */
-+			return(0);
-+	}
-+
-+	/* Mark beginning of line for ^ . */
-+	g.regbol = string;
-+
-+	/* Simplest case:  anchored match need be tried only once. */
-+	if (prog->reganch)
-+		return(regtry(&g, prog, string));
-+
-+	/* Messy cases:  unanchored match. */
-+	s = string;
-+	if (prog->regstart != '\0')
-+		/* We know what char it must start with. */
-+		while ((s = strchr(s, prog->regstart)) != NULL) {
-+			if (regtry(&g, prog, s))
-+				return(1);
-+			s++;
-+		}
-+	else
-+		/* We don't -- general case. */
-+		do {
-+			if (regtry(&g, prog, s))
-+				return(1);
-+		} while (*s++ != '\0');
-+
-+	/* Failure. */
-+	return(0);
-+}
-+
-+/*
-+ - regtry - try match at specific point
-+ */
-+static int			/* 0 failure, 1 success */
-+regtry(struct match_globals *g, regexp *prog, char *string)
-+{
-+	register int i;
-+	register char **sp;
-+	register char **ep;
-+
-+	g->reginput = string;
-+	g->regstartp = prog->startp;
-+	g->regendp = prog->endp;
-+
-+	sp = prog->startp;
-+	ep = prog->endp;
-+	for (i = NSUBEXP; i > 0; i--) {
-+		*sp++ = NULL;
-+		*ep++ = NULL;
-+	}
-+	if (regmatch(g, prog->program + 1)) {
-+		prog->startp[0] = string;
-+		prog->endp[0] = g->reginput;
-+		return(1);
-+	} else
-+		return(0);
-+}
-+
-+/*
-+ - regmatch - main matching routine
-+ *
-+ * Conceptually the strategy is simple:  check to see whether the current
-+ * node matches, call self recursively to see whether the rest matches,
-+ * and then act accordingly.  In practice we make some effort to avoid
-+ * recursion, in particular by going through "ordinary" nodes (that don't
-+ * need to know whether the rest of the match failed) by a loop instead of
-+ * by recursion.
-+ */
-+static int			/* 0 failure, 1 success */
-+regmatch(struct match_globals *g, char *prog)
-+{
-+	register char *scan = prog; /* Current node. */
-+	char *next;		    /* Next node. */
-+
-+#ifdef DEBUG
-+	if (scan != NULL && regnarrate)
-+		fprintf(stderr, "%s(\n", regprop(scan));
-+#endif
-+	while (scan != NULL) {
-+#ifdef DEBUG
-+		if (regnarrate)
-+			fprintf(stderr, "%s...\n", regprop(scan));
-+#endif
-+		next = regnext(g, scan);
-+
-+		switch (OP(scan)) {
-+		case BOL:
-+			if (g->reginput != g->regbol)
-+				return(0);
-+			break;
-+		case EOL:
-+			if (*g->reginput != '\0')
-+				return(0);
-+			break;
-+		case ANY:
-+			if (*g->reginput == '\0')
-+				return(0);
-+			g->reginput++;
-+			break;
-+		case EXACTLY: {
-+				register int len;
-+				register char *opnd;
-+
-+				opnd = OPERAND(scan);
-+				/* Inline the first character, for speed. */
-+				if (*opnd != *g->reginput)
-+					return(0);
-+				len = strlen(opnd);
-+				if (len > 1 && strncmp(opnd, g->reginput, len) != 0)
-+					return(0);
-+				g->reginput += len;
-+			}
-+			break;
-+		case ANYOF:
-+			if (*g->reginput == '\0' || strchr(OPERAND(scan), *g->reginput) == NULL)
-+				return(0);
-+			g->reginput++;
-+			break;
-+		case ANYBUT:
-+			if (*g->reginput == '\0' || strchr(OPERAND(scan), *g->reginput) != NULL)
-+				return(0);
-+			g->reginput++;
-+			break;
-+		case NOTHING:
-+		case BACK:
-+			break;
-+		case OPEN+1:
-+		case OPEN+2:
-+		case OPEN+3:
-+		case OPEN+4:
-+		case OPEN+5:
-+		case OPEN+6:
-+		case OPEN+7:
-+		case OPEN+8:
-+		case OPEN+9: {
-+				register int no;
-+				register char *save;
-+
-+				no = OP(scan) - OPEN;
-+				save = g->reginput;
-+
-+				if (regmatch(g, next)) {
-+					/*
-+					 * Don't set startp if some later
-+					 * invocation of the same parentheses
-+					 * already has.
-+					 */
-+					if (g->regstartp[no] == NULL)
-+						g->regstartp[no] = save;
-+					return(1);
-+				} else
-+					return(0);
-+			}
-+			break;
-+		case CLOSE+1:
-+		case CLOSE+2:
-+		case CLOSE+3:
-+		case CLOSE+4:
-+		case CLOSE+5:
-+		case CLOSE+6:
-+		case CLOSE+7:
-+		case CLOSE+8:
-+		case CLOSE+9:
-+			{
-+				register int no;
-+				register char *save;
-+
-+				no = OP(scan) - CLOSE;
-+				save = g->reginput;
-+
-+				if (regmatch(g, next)) {
-+					/*
-+					 * Don't set endp if some later
-+					 * invocation of the same parentheses
-+					 * already has.
-+					 */
-+					if (g->regendp[no] == NULL)
-+						g->regendp[no] = save;
-+					return(1);
-+				} else
-+					return(0);
-+			}
-+			break;
-+		case BRANCH: {
-+				register char *save;
-+
-+				if (OP(next) != BRANCH)		/* No choice. */
-+					next = OPERAND(scan);	/* Avoid recursion. */
-+				else {
-+					do {
-+						save = g->reginput;
-+						if (regmatch(g, OPERAND(scan)))
-+							return(1);
-+						g->reginput = save;
-+						scan = regnext(g, scan);
-+					} while (scan != NULL && OP(scan) == BRANCH);
-+					return(0);
-+					/* NOTREACHED */
-+				}
-+			}
-+			break;
-+		case STAR:
-+		case PLUS: {
-+				register char nextch;
-+				register int no;
-+				register char *save;
-+				register int min;
-+
-+				/*
-+				 * Lookahead to avoid useless match attempts
-+				 * when we know what character comes next.
-+				 */
-+				nextch = '\0';
-+				if (OP(next) == EXACTLY)
-+					nextch = *OPERAND(next);
-+				min = (OP(scan) == STAR) ? 0 : 1;
-+				save = g->reginput;
-+				no = regrepeat(g, OPERAND(scan));
-+				while (no >= min) {
-+					/* If it could work, try it. */
-+					if (nextch == '\0' || *g->reginput == nextch)
-+						if (regmatch(g, next))
-+							return(1);
-+					/* Couldn't or didn't -- back up. */
-+					no--;
-+					g->reginput = save + no;
-+				}
-+				return(0);
-+			}
-+			break;
-+		case END:
-+			return(1);	/* Success! */
-+			break;
-+		default:
-+			printk("<3>Regexp: memory corruption\n");
-+			return(0);
-+			break;
-+		}
-+
-+		scan = next;
-+	}
-+
-+	/*
-+	 * We get here only if there's trouble -- normally "case END" is
-+	 * the terminating point.
-+	 */
-+	printk("<3>Regexp: corrupted pointers\n");
-+	return(0);
-+}
-+
-+/*
-+ - regrepeat - repeatedly match something simple, report how many
-+ */
-+static int
-+regrepeat(struct match_globals *g, char *p)
-+{
-+	register int count = 0;
-+	register char *scan;
-+	register char *opnd;
-+
-+	scan = g->reginput;
-+	opnd = OPERAND(p);
-+	switch (OP(p)) {
-+	case ANY:
-+		count = strlen(scan);
-+		scan += count;
-+		break;
-+	case EXACTLY:
-+		while (*opnd == *scan) {
-+			count++;
-+			scan++;
-+		}
-+		break;
-+	case ANYOF:
-+		while (*scan != '\0' && strchr(opnd, *scan) != NULL) {
-+			count++;
-+			scan++;
-+		}
-+		break;
-+	case ANYBUT:
-+		while (*scan != '\0' && strchr(opnd, *scan) == NULL) {
-+			count++;
-+			scan++;
-+		}
-+		break;
-+	default:		/* Oh dear.  Called inappropriately. */
-+		printk("<3>Regexp: internal foulup\n");
-+		count = 0;	/* Best compromise. */
-+		break;
-+	}
-+	g->reginput = scan;
-+
-+	return(count);
-+}
-+
-+/*
-+ - regnext - dig the "next" pointer out of a node
-+ */
-+static char*
-+regnext(struct match_globals *g, char *p)
-+{
-+	register int offset;
-+
-+	if (p == &g->regdummy)
-+		return(NULL);
-+
-+	offset = NEXT(p);
-+	if (offset == 0)
-+		return(NULL);
-+
-+	if (OP(p) == BACK)
-+		return(p-offset);
-+	else
-+		return(p+offset);
-+}
-+
-+#ifdef DEBUG
-+
-+STATIC char *regprop();
-+
-+/*
-+ - regdump - dump a regexp onto stdout in vaguely comprehensible form
-+ */
-+void
-+regdump(regexp *r)
-+{
-+	register char *s;
-+	register char op = EXACTLY;	/* Arbitrary non-END op. */
-+	register char *next;
-+	/* extern char *strchr(); */
-+
-+
-+	s = r->program + 1;
-+	while (op != END) {	/* While that wasn't END last time... */
-+		op = OP(s);
-+		printf("%2d%s", s-r->program, regprop(s));	/* Where, what. */
-+		next = regnext(s);
-+		if (next == NULL)		/* Next ptr. */
-+			printf("(0)");
-+		else
-+			printf("(%d)", (s-r->program)+(next-s));
-+		s += 3;
-+		if (op == ANYOF || op == ANYBUT || op == EXACTLY) {
-+			/* Literal string, where present. */
-+			while (*s != '\0') {
-+				putchar(*s);
-+				s++;
-+			}
-+			s++;
-+		}
-+		putchar('\n');
-+	}
-+
-+	/* Header fields of interest. */
-+	if (r->regstart != '\0')
-+		printf("start `%c' ", r->regstart);
-+	if (r->reganch)
-+		printf("anchored ");
-+	if (r->regmust != NULL)
-+		printf("must have \"%s\"", r->regmust);
-+	printf("\n");
-+}
-+
-+/*
-+ - regprop - printable representation of opcode
-+ */
-+static char *
-+regprop(char *op)
-+{
-+#define BUFLEN 50
-+	register char *p;
-+	static char buf[BUFLEN];
-+
-+	strcpy(buf, ":");
-+
-+	switch (OP(op)) {
-+	case BOL:
-+		p = "BOL";
-+		break;
-+	case EOL:
-+		p = "EOL";
-+		break;
-+	case ANY:
-+		p = "ANY";
-+		break;
-+	case ANYOF:
-+		p = "ANYOF";
-+		break;
-+	case ANYBUT:
-+		p = "ANYBUT";
-+		break;
-+	case BRANCH:
-+		p = "BRANCH";
-+		break;
-+	case EXACTLY:
-+		p = "EXACTLY";
-+		break;
-+	case NOTHING:
-+		p = "NOTHING";
-+		break;
-+	case BACK:
-+		p = "BACK";
-+		break;
-+	case END:
-+		p = "END";
-+		break;
-+	case OPEN+1:
-+	case OPEN+2:
-+	case OPEN+3:
-+	case OPEN+4:
-+	case OPEN+5:
-+	case OPEN+6:
-+	case OPEN+7:
-+	case OPEN+8:
-+	case OPEN+9:
-+		snprintf(buf+strlen(buf),BUFLEN-strlen(buf), "OPEN%d", OP(op)-OPEN);
-+		p = NULL;
-+		break;
-+	case CLOSE+1:
-+	case CLOSE+2:
-+	case CLOSE+3:
-+	case CLOSE+4:
-+	case CLOSE+5:
-+	case CLOSE+6:
-+	case CLOSE+7:
-+	case CLOSE+8:
-+	case CLOSE+9:
-+		snprintf(buf+strlen(buf),BUFLEN-strlen(buf), "CLOSE%d", OP(op)-CLOSE);
-+		p = NULL;
-+		break;
-+	case STAR:
-+		p = "STAR";
-+		break;
-+	case PLUS:
-+		p = "PLUS";
-+		break;
-+	default:
-+		printk("<3>Regexp: corrupted opcode\n");
-+		break;
-+	}
-+	if (p != NULL)
-+		strncat(buf, p, BUFLEN-strlen(buf));
-+	return(buf);
-+}
-+#endif
-+
-+
---- /dev/null
-+++ b/net/netfilter/regexp/regexp.h
-@@ -0,0 +1,41 @@
-+/*
-+ * Definitions etc. for regexp(3) routines.
-+ *
-+ * Caveat:  this is V8 regexp(3) [actually, a reimplementation thereof],
-+ * not the System V one.
-+ */
-+
-+#ifndef REGEXP_H
-+#define REGEXP_H
-+
-+
-+/*
-+http://www.opensource.apple.com/darwinsource/10.3/expect-1/expect/expect.h ,
-+which contains a version of this library, says:
-+
-+ *
-+ * NSUBEXP must be at least 10, and no greater than 117 or the parser
-+ * will not work properly.
-+ *
-+
-+However, it looks rather like this library is limited to 10.  If you think
-+otherwise, let us know.
-+*/
-+
-+#define NSUBEXP  10
-+typedef struct regexp {
-+	char *startp[NSUBEXP];
-+	char *endp[NSUBEXP];
-+	char regstart;		/* Internal use only. */
-+	char reganch;		/* Internal use only. */
-+	char *regmust;		/* Internal use only. */
-+	int regmlen;		/* Internal use only. */
-+	char program[1];	/* Unwarranted chumminess with compiler. */
-+} regexp;
-+
-+regexp * regcomp(char *exp, int *patternsize);
-+int regexec(regexp *prog, char *string);
-+void regsub(regexp *prog, char *source, char *dest);
-+void regerror(char *s);
-+
-+#endif
---- /dev/null
-+++ b/net/netfilter/regexp/regmagic.h
-@@ -0,0 +1,5 @@
-+/*
-+ * The first byte of the regexp internal "program" is actually this magic
-+ * number; the start node begins in the second byte.
-+ */
-+#define	MAGIC	0234
---- /dev/null
-+++ b/net/netfilter/regexp/regsub.c
-@@ -0,0 +1,95 @@
-+/*
-+ * regsub
-+ * @(#)regsub.c	1.3 of 2 April 86
-+ *
-+ *	Copyright (c) 1986 by University of Toronto.
-+ *	Written by Henry Spencer.  Not derived from licensed software.
-+ *
-+ *	Permission is granted to anyone to use this software for any
-+ *	purpose on any computer system, and to redistribute it freely,
-+ *	subject to the following restrictions:
-+ *
-+ *	1. The author is not responsible for the consequences of use of
-+ *		this software, no matter how awful, even if they arise
-+ *		from defects in it.
-+ *
-+ *	2. The origin of this software must not be misrepresented, either
-+ *		by explicit claim or by omission.
-+ *
-+ *	3. Altered versions must be plainly marked as such, and must not
-+ *		be misrepresented as being the original software.
-+ *
-+ *
-+ * This code was modified by Ethan Sommer to work within the kernel
-+ * (it now uses kmalloc etc..)
-+ *
-+ */
-+#include "regexp.h"
-+#include "regmagic.h"
-+#include <linux/string.h>
-+
-+
-+#ifndef CHARBITS
-+#define	UCHARAT(p)	((int)*(unsigned char *)(p))
-+#else
-+#define	UCHARAT(p)	((int)*(p)&CHARBITS)
-+#endif
-+
-+#if 0
-+//void regerror(char * s)
-+//{
-+//        printk("regexp(3): %s", s);
-+//        /* NOTREACHED */
-+//}
-+#endif
-+
-+/*
-+ - regsub - perform substitutions after a regexp match
-+ */
-+void
-+regsub(regexp * prog, char * source, char * dest)
-+{
-+	register char *src;
-+	register char *dst;
-+	register char c;
-+	register int no;
-+	register int len;
-+	
-+	/* Not necessary and gcc doesn't like it -MLS */
-+	/*extern char *strncpy();*/
-+
-+	if (prog == NULL || source == NULL || dest == NULL) {
-+		regerror("NULL parm to regsub");
-+		return;
-+	}
-+	if (UCHARAT(prog->program) != MAGIC) {
-+		regerror("damaged regexp fed to regsub");
-+		return;
-+	}
-+
-+	src = source;
-+	dst = dest;
-+	while ((c = *src++) != '\0') {
-+		if (c == '&')
-+			no = 0;
-+		else if (c == '\\' && '0' <= *src && *src <= '9')
-+			no = *src++ - '0';
-+		else
-+			no = -1;
-+
-+		if (no < 0) {	/* Ordinary character. */
-+			if (c == '\\' && (*src == '\\' || *src == '&'))
-+				c = *src++;
-+			*dst++ = c;
-+		} else if (prog->startp[no] != NULL && prog->endp[no] != NULL) {
-+			len = prog->endp[no] - prog->startp[no];
-+			(void) strncpy(dst, prog->startp[no], len);
-+			dst += len;
-+			if (len != 0 && *(dst-1) == '\0') {	/* strncpy hit NUL. */
-+				regerror("damaged match string");
-+				return;
-+			}
-+		}
-+	}
-+	*dst++ = '\0';
-+}
---- /dev/null
-+++ b/net/netfilter/xt_layer7.c
-@@ -0,0 +1,666 @@
-+/*
-+  Kernel module to match application layer (OSI layer 7) data in connections.
-+
-+  http://l7-filter.sf.net
-+
-+  (C) 2003-2009 Matthew Strait and Ethan Sommer.
-+
-+  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.
-+  http://www.gnu.org/licenses/gpl.txt
-+
-+  Based on ipt_string.c (C) 2000 Emmanuel Roger <winfield@freegates.be>,
-+  xt_helper.c (C) 2002 Harald Welte and cls_layer7.c (C) 2003 Matthew Strait,
-+  Ethan Sommer, Justin Levandoski.
-+*/
-+
-+#include <linux/spinlock.h>
-+#include <linux/version.h>
-+#include <net/ip.h>
-+#include <net/tcp.h>
-+#include <linux/module.h>
-+#include <linux/skbuff.h>
-+#include <linux/netfilter.h>
-+#include <net/netfilter/nf_conntrack.h>
-+#include <net/netfilter/nf_conntrack_core.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-+#include <net/netfilter/nf_conntrack_extend.h>
-+#include <net/netfilter/nf_conntrack_acct.h>
-+#endif
-+#include <linux/netfilter/x_tables.h>
-+#include <linux/netfilter/xt_layer7.h>
-+#include <linux/ctype.h>
-+#include <linux/proc_fs.h>
-+
-+#include "regexp/regexp.c"
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Matthew Strait <quadong@users.sf.net>, Ethan Sommer <sommere@users.sf.net>");
-+MODULE_DESCRIPTION("iptables application layer match module");
-+MODULE_ALIAS("ipt_layer7");
-+MODULE_VERSION("2.21");
-+
-+static int maxdatalen = 2048; // this is the default
-+module_param(maxdatalen, int, 0444);
-+MODULE_PARM_DESC(maxdatalen, "maximum bytes of data looked at by l7-filter");
-+#ifdef CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG
-+	#define DPRINTK(format,args...) printk(format,##args)
-+#else
-+	#define DPRINTK(format,args...)
-+#endif
-+
-+/* Number of packets whose data we look at.
-+This can be modified through /proc/net/layer7_numpackets */
-+static int num_packets = 10;
-+
-+static struct pattern_cache {
-+	char * regex_string;
-+	regexp * pattern;
-+	struct pattern_cache * next;
-+} * first_pattern_cache = NULL;
-+
-+DEFINE_SPINLOCK(l7_lock);
-+
-+static int total_acct_packets(struct nf_conn *ct)
-+{
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 26)
-+	BUG_ON(ct == NULL);
-+	return (ct->counters[IP_CT_DIR_ORIGINAL].packets + ct->counters[IP_CT_DIR_REPLY].packets);
-+#else
-+	struct nf_conn_counter *acct;
-+
-+	BUG_ON(ct == NULL);
-+	acct = nf_conn_acct_find(ct);
-+	if (!acct)
-+		return 0;
-+	return (acct[IP_CT_DIR_ORIGINAL].packets + acct[IP_CT_DIR_REPLY].packets);
-+#endif
-+}
-+
-+#ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
-+/* Converts an unfriendly string into a friendly one by
-+replacing unprintables with periods and all whitespace with " ". */
-+static char * friendly_print(unsigned char * s)
-+{
-+	char * f = kmalloc(strlen(s) + 1, GFP_ATOMIC);
-+	int i;
-+
-+	if(!f) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in "
-+					"friendly_print, bailing.\n");
-+		return NULL;
-+	}
-+
-+	for(i = 0; i < strlen(s); i++){
-+		if(isprint(s[i]) && s[i] < 128)	f[i] = s[i];
-+		else if(isspace(s[i]))		f[i] = ' ';
-+		else 				f[i] = '.';
-+	}
-+	f[i] = '\0';
-+	return f;
-+}
-+
-+static char dec2hex(int i)
-+{
-+	switch (i) {
-+		case 0 ... 9:
-+			return (i + '0');
-+			break;
-+		case 10 ... 15:
-+			return (i - 10 + 'a');
-+			break;
-+		default:
-+			if (net_ratelimit())
-+				printk("layer7: Problem in dec2hex\n");
-+			return '\0';
-+	}
-+}
-+
-+static char * hex_print(unsigned char * s)
-+{
-+	char * g = kmalloc(strlen(s)*3 + 1, GFP_ATOMIC);
-+	int i;
-+
-+	if(!g) {
-+	       if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in hex_print, "
-+					"bailing.\n");
-+	       return NULL;
-+	}
-+
-+	for(i = 0; i < strlen(s); i++) {
-+		g[i*3    ] = dec2hex(s[i]/16);
-+		g[i*3 + 1] = dec2hex(s[i]%16);
-+		g[i*3 + 2] = ' ';
-+	}
-+	g[i*3] = '\0';
-+
-+	return g;
-+}
-+#endif // DEBUG
-+
-+/* Use instead of regcomp.  As we expect to be seeing the same regexps over and
-+over again, it make sense to cache the results. */
-+static regexp * compile_and_cache(const char * regex_string, 
-+                                  const char * protocol)
-+{
-+	struct pattern_cache * node               = first_pattern_cache;
-+	struct pattern_cache * last_pattern_cache = first_pattern_cache;
-+	struct pattern_cache * tmp;
-+	unsigned int len;
-+
-+	while (node != NULL) {
-+		if (!strcmp(node->regex_string, regex_string))
-+		return node->pattern;
-+
-+		last_pattern_cache = node;/* points at the last non-NULL node */
-+		node = node->next;
-+	}
-+
-+	/* If we reach the end of the list, then we have not yet cached
-+	   the pattern for this regex. Let's do that now.
-+	   Be paranoid about running out of memory to avoid list corruption. */
-+	tmp = kmalloc(sizeof(struct pattern_cache), GFP_ATOMIC);
-+
-+	if(!tmp) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in "
-+					"compile_and_cache, bailing.\n");
-+		return NULL;
-+	}
-+
-+	tmp->regex_string  = kmalloc(strlen(regex_string) + 1, GFP_ATOMIC);
-+	tmp->pattern       = kmalloc(sizeof(struct regexp),    GFP_ATOMIC);
-+	tmp->next = NULL;
-+
-+	if(!tmp->regex_string || !tmp->pattern) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in "
-+					"compile_and_cache, bailing.\n");
-+		kfree(tmp->regex_string);
-+		kfree(tmp->pattern);
-+		kfree(tmp);
-+		return NULL;
-+	}
-+
-+	/* Ok.  The new node is all ready now. */
-+	node = tmp;
-+
-+	if(first_pattern_cache == NULL) /* list is empty */
-+		first_pattern_cache = node; /* make node the beginning */
-+	else
-+		last_pattern_cache->next = node; /* attach node to the end */
-+
-+	/* copy the string and compile the regex */
-+	len = strlen(regex_string);
-+	DPRINTK("About to compile this: \"%s\"\n", regex_string);
-+	node->pattern = regcomp((char *)regex_string, &len);
-+	if ( !node->pattern ) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: Error compiling regexp "
-+					"\"%s\" (%s)\n", 
-+					regex_string, protocol);
-+		/* pattern is now cached as NULL, so we won't try again. */
-+	}
-+
-+	strcpy(node->regex_string, regex_string);
-+	return node->pattern;
-+}
-+
-+static int can_handle(const struct sk_buff *skb)
-+{
-+	if(!ip_hdr(skb)) /* not IP */
-+		return 0;
-+	if(ip_hdr(skb)->protocol != IPPROTO_TCP &&
-+	   ip_hdr(skb)->protocol != IPPROTO_UDP &&
-+	   ip_hdr(skb)->protocol != IPPROTO_ICMP)
-+		return 0;
-+	return 1;
-+}
-+
-+/* Returns offset the into the skb->data that the application data starts */
-+static int app_data_offset(const struct sk_buff *skb)
-+{
-+	/* In case we are ported somewhere (ebtables?) where ip_hdr(skb)
-+	isn't set, this can be gotten from 4*(skb->data[0] & 0x0f) as well. */
-+	int ip_hl = 4*ip_hdr(skb)->ihl;
-+
-+	if( ip_hdr(skb)->protocol == IPPROTO_TCP ) {
-+		/* 12 == offset into TCP header for the header length field.
-+		Can't get this with skb->h.th->doff because the tcphdr
-+		struct doesn't get set when routing (this is confirmed to be
-+		true in Netfilter as well as QoS.) */
-+		int tcp_hl = 4*(skb->data[ip_hl + 12] >> 4);
-+
-+		return ip_hl + tcp_hl;
-+	} else if( ip_hdr(skb)->protocol == IPPROTO_UDP  ) {
-+		return ip_hl + 8; /* UDP header is always 8 bytes */
-+	} else if( ip_hdr(skb)->protocol == IPPROTO_ICMP ) {
-+		return ip_hl + 8; /* ICMP header is 8 bytes */
-+	} else {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: tried to handle unknown "
-+					"protocol!\n");
-+		return ip_hl + 8; /* something reasonable */
-+	}
-+}
-+
-+/* handles whether there's a match when we aren't appending data anymore */
-+static int match_no_append(struct nf_conn * conntrack, 
-+                           struct nf_conn * master_conntrack, 
-+                           enum ip_conntrack_info ctinfo,
-+                           enum ip_conntrack_info master_ctinfo,
-+                           const struct xt_layer7_info * info)
-+{
-+	/* If we're in here, throw the app data away */
-+	if(master_conntrack->layer7.app_data != NULL) {
-+
-+	#ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
-+		if(!master_conntrack->layer7.app_proto) {
-+			char * f = 
-+			  friendly_print(master_conntrack->layer7.app_data);
-+			char * g = 
-+			  hex_print(master_conntrack->layer7.app_data);
-+			DPRINTK("\nl7-filter gave up after %d bytes "
-+				"(%d packets):\n%s\n",
-+				strlen(f), total_acct_packets(master_conntrack), f);
-+			kfree(f);
-+			DPRINTK("In hex: %s\n", g);
-+			kfree(g);
-+		}
-+	#endif
-+
-+		kfree(master_conntrack->layer7.app_data);
-+		master_conntrack->layer7.app_data = NULL; /* don't free again */
-+	}
-+
-+	if(master_conntrack->layer7.app_proto){
-+		/* Here child connections set their .app_proto (for /proc) */
-+		if(!conntrack->layer7.app_proto) {
-+			conntrack->layer7.app_proto = 
-+			  kmalloc(strlen(master_conntrack->layer7.app_proto)+1, 
-+			    GFP_ATOMIC);
-+			if(!conntrack->layer7.app_proto){
-+				if (net_ratelimit())
-+					printk(KERN_ERR "layer7: out of memory "
-+							"in match_no_append, "
-+							"bailing.\n");
-+				return 1;
-+			}
-+			strcpy(conntrack->layer7.app_proto, 
-+				master_conntrack->layer7.app_proto);
-+		}
-+
-+		return (!strcmp(master_conntrack->layer7.app_proto, 
-+				info->protocol));
-+	}
-+	else {
-+		/* If not classified, set to "unknown" to distinguish from
-+		connections that are still being tested. */
-+		master_conntrack->layer7.app_proto = 
-+			kmalloc(strlen("unknown")+1, GFP_ATOMIC);
-+		if(!master_conntrack->layer7.app_proto){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in "
-+						"match_no_append, bailing.\n");
-+			return 1;
-+		}
-+		strcpy(master_conntrack->layer7.app_proto, "unknown");
-+		return 0;
-+	}
-+}
-+
-+/* add the new app data to the conntrack.  Return number of bytes added. */
-+static int add_data(struct nf_conn * master_conntrack,
-+                    char * app_data, int appdatalen)
-+{
-+	int length = 0, i;
-+	int oldlength = master_conntrack->layer7.app_data_len;
-+
-+	/* This is a fix for a race condition by Deti Fliegl. However, I'm not 
-+	   clear on whether the race condition exists or whether this really 
-+	   fixes it.  I might just be being dense... Anyway, if it's not really 
-+	   a fix, all it does is waste a very small amount of time. */
-+	if(!master_conntrack->layer7.app_data) return 0;
-+
-+	/* Strip nulls. Make everything lower case (our regex lib doesn't
-+	do case insensitivity).  Add it to the end of the current data. */
-+	for(i = 0; i < maxdatalen-oldlength-1 &&
-+		   i < appdatalen; i++) {
-+		if(app_data[i] != '\0') {
-+			/* the kernel version of tolower mungs 'upper ascii' */
-+			master_conntrack->layer7.app_data[length+oldlength] =
-+				isascii(app_data[i])? 
-+					tolower(app_data[i]) : app_data[i];
-+			length++;
-+		}
-+	}
-+
-+	master_conntrack->layer7.app_data[length+oldlength] = '\0';
-+	master_conntrack->layer7.app_data_len = length + oldlength;
-+
-+	return length;
-+}
-+
-+/* taken from drivers/video/modedb.c */
-+static int my_atoi(const char *s)
-+{
-+	int val = 0;
-+
-+	for (;; s++) {
-+		switch (*s) {
-+			case '0'...'9':
-+			val = 10*val+(*s-'0');
-+			break;
-+		default:
-+			return val;
-+		}
-+	}
-+}
-+
-+/* write out num_packets to userland. */
-+static int layer7_read_proc(char* page, char ** start, off_t off, int count,
-+                            int* eof, void * data)
-+{
-+	if(num_packets > 99 && net_ratelimit())
-+		printk(KERN_ERR "layer7: NOT REACHED. num_packets too big\n");
-+
-+	page[0] = num_packets/10 + '0';
-+	page[1] = num_packets%10 + '0';
-+	page[2] = '\n';
-+	page[3] = '\0';
-+
-+	*eof=1;
-+
-+	return 3;
-+}
-+
-+/* Read in num_packets from userland */
-+static int layer7_write_proc(struct file* file, const char* buffer,
-+                             unsigned long count, void *data)
-+{
-+	char * foo = kmalloc(count, GFP_ATOMIC);
-+
-+	if(!foo){
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory, bailing. "
-+					"num_packets unchanged.\n");
-+		return count;
-+	}
-+
-+	if(copy_from_user(foo, buffer, count)) {
-+		return -EFAULT;
-+	}
-+
-+
-+	num_packets = my_atoi(foo);
-+	kfree (foo);
-+
-+	/* This has an arbitrary limit to make the math easier. I'm lazy.
-+	But anyway, 99 is a LOT! If you want more, you're doing it wrong! */
-+	if(num_packets > 99) {
-+		printk(KERN_WARNING "layer7: num_packets can't be > 99.\n");
-+		num_packets = 99;
-+	} else if(num_packets < 1) {
-+		printk(KERN_WARNING "layer7: num_packets can't be < 1.\n");
-+		num_packets = 1;
-+	}
-+
-+	return count;
-+}
-+
-+static bool
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+match(const struct sk_buff *skbin, const struct xt_match_param *par)
-+#else
-+match(const struct sk_buff *skbin,
-+      const struct net_device *in,
-+      const struct net_device *out,
-+      const struct xt_match *match,
-+      const void *matchinfo,
-+      int offset,
-+      unsigned int protoff,
-+      bool *hotdrop)
-+#endif
-+{
-+	/* sidestep const without getting a compiler warning... */
-+	struct sk_buff * skb = (struct sk_buff *)skbin; 
-+
-+	const struct xt_layer7_info * info = 
-+	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+		par->matchinfo;
-+	#else
-+		matchinfo;
-+	#endif
-+
-+	enum ip_conntrack_info master_ctinfo, ctinfo;
-+	struct nf_conn *master_conntrack, *conntrack;
-+	unsigned char * app_data;
-+	unsigned int pattern_result, appdatalen;
-+	regexp * comppattern;
-+
-+	/* Be paranoid/incompetent - lock the entire match function. */
-+	spin_lock_bh(&l7_lock);
-+
-+	if(!can_handle(skb)){
-+		DPRINTK("layer7: This is some protocol I can't handle.\n");
-+		spin_unlock_bh(&l7_lock);
-+		return info->invert;
-+	}
-+
-+	/* Treat parent & all its children together as one connection, except
-+	for the purpose of setting conntrack->layer7.app_proto in the actual
-+	connection. This makes /proc/net/ip_conntrack more satisfying. */
-+	if(!(conntrack = nf_ct_get(skb, &ctinfo)) ||
-+	   !(master_conntrack=nf_ct_get(skb,&master_ctinfo))){
-+		DPRINTK("layer7: couldn't get conntrack.\n");
-+		spin_unlock_bh(&l7_lock);
-+		return info->invert;
-+	}
-+
-+	/* Try to get a master conntrack (and its master etc) for FTP, etc. */
-+	while (master_ct(master_conntrack) != NULL)
-+		master_conntrack = master_ct(master_conntrack);
-+
-+	/* if we've classified it or seen too many packets */
-+	if(total_acct_packets(master_conntrack) > num_packets ||
-+	   master_conntrack->layer7.app_proto) {
-+
-+		pattern_result = match_no_append(conntrack, master_conntrack, 
-+						 ctinfo, master_ctinfo, info);
-+
-+		/* skb->cb[0] == seen. Don't do things twice if there are 
-+		multiple l7 rules. I'm not sure that using cb for this purpose 
-+		is correct, even though it says "put your private variables 
-+		there". But it doesn't look like it is being used for anything
-+		else in the skbs that make it here. */
-+		skb->cb[0] = 1; /* marking it seen here's probably irrelevant */
-+
-+		spin_unlock_bh(&l7_lock);
-+		return (pattern_result ^ info->invert);
-+	}
-+
-+	if(skb_is_nonlinear(skb)){
-+		if(skb_linearize(skb) != 0){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: failed to linearize "
-+						"packet, bailing.\n");
-+			spin_unlock_bh(&l7_lock);
-+			return info->invert;
-+		}
-+	}
-+
-+	/* now that the skb is linearized, it's safe to set these. */
-+	app_data = skb->data + app_data_offset(skb);
-+	appdatalen = skb_tail_pointer(skb) - app_data;
-+
-+	/* the return value gets checked later, when we're ready to use it */
-+	comppattern = compile_and_cache(info->pattern, info->protocol);
-+
-+	/* On the first packet of a connection, allocate space for app data */
-+	if(total_acct_packets(master_conntrack) == 1 && !skb->cb[0] && 
-+	   !master_conntrack->layer7.app_data){
-+		master_conntrack->layer7.app_data = 
-+			kmalloc(maxdatalen, GFP_ATOMIC);
-+		if(!master_conntrack->layer7.app_data){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in "
-+						"match, bailing.\n");
-+			spin_unlock_bh(&l7_lock);
-+			return info->invert;
-+		}
-+
-+		master_conntrack->layer7.app_data[0] = '\0';
-+	}
-+
-+	/* Can be here, but unallocated, if numpackets is increased near
-+	the beginning of a connection */
-+	if(master_conntrack->layer7.app_data == NULL){
-+		spin_unlock_bh(&l7_lock);
-+		return info->invert; /* unmatched */
-+	}
-+
-+	if(!skb->cb[0]){
-+		int newbytes;
-+		newbytes = add_data(master_conntrack, app_data, appdatalen);
-+
-+		if(newbytes == 0) { /* didn't add any data */
-+			skb->cb[0] = 1;
-+			/* Didn't match before, not going to match now */
-+			spin_unlock_bh(&l7_lock);
-+			return info->invert;
-+		}
-+	}
-+
-+	/* If looking for "unknown", then never match.  "Unknown" means that
-+	we've given up; we're still trying with these packets. */
-+	if(!strcmp(info->protocol, "unknown")) {
-+		pattern_result = 0;
-+	/* If looking for "unset", then always match. "Unset" means that we
-+	haven't yet classified the connection. */
-+	} else if(!strcmp(info->protocol, "unset")) {
-+		pattern_result = 2;
-+		DPRINTK("layer7: matched unset: not yet classified "
-+			"(%d/%d packets)\n",
-+                        total_acct_packets(master_conntrack), num_packets);
-+	/* If the regexp failed to compile, don't bother running it */
-+	} else if(comppattern && 
-+		  regexec(comppattern, master_conntrack->layer7.app_data)){
-+		DPRINTK("layer7: matched %s\n", info->protocol);
-+		pattern_result = 1;
-+	} else pattern_result = 0;
-+
-+	if(pattern_result == 1) {
-+		master_conntrack->layer7.app_proto = 
-+			kmalloc(strlen(info->protocol)+1, GFP_ATOMIC);
-+		if(!master_conntrack->layer7.app_proto){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in "
-+						"match, bailing.\n");
-+			spin_unlock_bh(&l7_lock);
-+			return (pattern_result ^ info->invert);
-+		}
-+		strcpy(master_conntrack->layer7.app_proto, info->protocol);
-+	} else if(pattern_result > 1) { /* cleanup from "unset" */
-+		pattern_result = 1;
-+	}
-+
-+	/* mark the packet seen */
-+	skb->cb[0] = 1;
-+
-+	spin_unlock_bh(&l7_lock);
-+	return (pattern_result ^ info->invert);
-+}
-+
-+// load nf_conntrack_ipv4
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+static bool check(const struct xt_mtchk_param *par)
-+{
-+        if (nf_ct_l3proto_try_module_get(par->match->family) < 0) {
-+                printk(KERN_WARNING "can't load conntrack support for "
-+                                    "proto=%d\n", par->match->family);
-+#else
-+static bool check(const char *tablename, const void *inf,
-+		 const struct xt_match *match, void *matchinfo,
-+		 unsigned int hook_mask)
-+{
-+        if (nf_ct_l3proto_try_module_get(match->family) < 0) {
-+                printk(KERN_WARNING "can't load conntrack support for "
-+                                    "proto=%d\n", match->family);
-+#endif
-+                return 0;
-+        }
-+	return 1;
-+}
-+
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+	static void destroy(const struct xt_mtdtor_param *par)
-+	{
-+		nf_ct_l3proto_module_put(par->match->family);
-+	}
-+#else
-+	static void destroy(const struct xt_match *match, void *matchinfo)
-+	{
-+		nf_ct_l3proto_module_put(match->family);
-+	}
-+#endif
-+
-+static struct xt_match xt_layer7_match[] __read_mostly = {
-+{
-+	.name		= "layer7",
-+	.family		= AF_INET,
-+	.checkentry	= check,
-+	.match		= match,
-+	.destroy	= destroy,
-+	.matchsize	= sizeof(struct xt_layer7_info),
-+	.me		= THIS_MODULE
-+}
-+};
-+
-+static void layer7_cleanup_proc(void)
-+{
-+	remove_proc_entry("layer7_numpackets", init_net.proc_net);
-+}
-+
-+/* register the proc file */
-+static void layer7_init_proc(void)
-+{
-+	struct proc_dir_entry* entry;
-+	entry = create_proc_entry("layer7_numpackets", 0644, init_net.proc_net);
-+	entry->read_proc = layer7_read_proc;
-+	entry->write_proc = layer7_write_proc;
-+}
-+
-+static int __init xt_layer7_init(void)
-+{
-+	need_conntrack();
-+
-+	layer7_init_proc();
-+	if(maxdatalen < 1) {
-+		printk(KERN_WARNING "layer7: maxdatalen can't be < 1, "
-+			"using 1\n");
-+		maxdatalen = 1;
-+	}
-+	/* This is not a hard limit.  It's just here to prevent people from
-+	bringing their slow machines to a grinding halt. */
-+	else if(maxdatalen > 65536) {
-+		printk(KERN_WARNING "layer7: maxdatalen can't be > 65536, "
-+			"using 65536\n");
-+		maxdatalen = 65536;
-+	}
-+	return xt_register_matches(xt_layer7_match,
-+				   ARRAY_SIZE(xt_layer7_match));
-+}
-+
-+static void __exit xt_layer7_fini(void)
-+{
-+	layer7_cleanup_proc();
-+	xt_unregister_matches(xt_layer7_match, ARRAY_SIZE(xt_layer7_match));
-+}
-+
-+module_init(xt_layer7_init);
-+module_exit(xt_layer7_fini);
diff --git a/target/linux/generic-2.6/patches-2.6.33/101-netfilter_layer7_pktmatch.patch b/target/linux/generic-2.6/patches-2.6.33/101-netfilter_layer7_pktmatch.patch
deleted file mode 100644
index f65e301fd..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/101-netfilter_layer7_pktmatch.patch
+++ /dev/null
@@ -1,108 +0,0 @@
---- a/include/linux/netfilter/xt_layer7.h
-+++ b/include/linux/netfilter/xt_layer7.h
-@@ -8,6 +8,7 @@ struct xt_layer7_info {
-     char protocol[MAX_PROTOCOL_LEN];
-     char pattern[MAX_PATTERN_LEN];
-     u_int8_t invert;
-+    u_int8_t pkt;
- };
- 
- #endif /* _XT_LAYER7_H */
---- a/net/netfilter/xt_layer7.c
-+++ b/net/netfilter/xt_layer7.c
-@@ -314,33 +314,35 @@ static int match_no_append(struct nf_con
- }
- 
- /* add the new app data to the conntrack.  Return number of bytes added. */
--static int add_data(struct nf_conn * master_conntrack,
--                    char * app_data, int appdatalen)
-+static int add_datastr(char *target, int offset, char *app_data, int len)
- {
- 	int length = 0, i;
--	int oldlength = master_conntrack->layer7.app_data_len;
--
--	/* This is a fix for a race condition by Deti Fliegl. However, I'm not 
--	   clear on whether the race condition exists or whether this really 
--	   fixes it.  I might just be being dense... Anyway, if it's not really 
--	   a fix, all it does is waste a very small amount of time. */
--	if(!master_conntrack->layer7.app_data) return 0;
-+	if (!target) return 0;
- 
- 	/* Strip nulls. Make everything lower case (our regex lib doesn't
- 	do case insensitivity).  Add it to the end of the current data. */
--	for(i = 0; i < maxdatalen-oldlength-1 &&
--		   i < appdatalen; i++) {
-+ 	for(i = 0; i < maxdatalen-offset-1 && i < len; i++) {
- 		if(app_data[i] != '\0') {
- 			/* the kernel version of tolower mungs 'upper ascii' */
--			master_conntrack->layer7.app_data[length+oldlength] =
-+			target[length+offset] =
- 				isascii(app_data[i])? 
- 					tolower(app_data[i]) : app_data[i];
- 			length++;
- 		}
- 	}
-+	target[length+offset] = '\0';
-+
-+	return length;
-+}
-+
-+/* add the new app data to the conntrack.  Return number of bytes added. */
-+static int add_data(struct nf_conn * master_conntrack,
-+                    char * app_data, int appdatalen)
-+{
-+	int length;
- 
--	master_conntrack->layer7.app_data[length+oldlength] = '\0';
--	master_conntrack->layer7.app_data_len = length + oldlength;
-+	length = add_datastr(master_conntrack->layer7.app_data, master_conntrack->layer7.app_data_len, app_data, appdatalen);
-+	master_conntrack->layer7.app_data_len += length;
- 
- 	return length;
- }
-@@ -438,7 +440,7 @@ match(const struct sk_buff *skbin,
- 
- 	enum ip_conntrack_info master_ctinfo, ctinfo;
- 	struct nf_conn *master_conntrack, *conntrack;
--	unsigned char * app_data;
-+	unsigned char *app_data, *tmp_data;
- 	unsigned int pattern_result, appdatalen;
- 	regexp * comppattern;
- 
-@@ -466,8 +468,8 @@ match(const struct sk_buff *skbin,
- 		master_conntrack = master_ct(master_conntrack);
- 
- 	/* if we've classified it or seen too many packets */
--	if(total_acct_packets(master_conntrack) > num_packets ||
--	   master_conntrack->layer7.app_proto) {
-+	if(!info->pkt && (total_acct_packets(master_conntrack) > num_packets ||
-+	   master_conntrack->layer7.app_proto)) {
- 
- 		pattern_result = match_no_append(conntrack, master_conntrack, 
- 						 ctinfo, master_ctinfo, info);
-@@ -500,6 +502,25 @@ match(const struct sk_buff *skbin,
- 	/* the return value gets checked later, when we're ready to use it */
- 	comppattern = compile_and_cache(info->pattern, info->protocol);
- 
-+	if (info->pkt) {
-+		tmp_data = kmalloc(maxdatalen, GFP_ATOMIC);
-+		if(!tmp_data){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in match, bailing.\n");
-+			return info->invert;
-+		}
-+
-+		tmp_data[0] = '\0';
-+		add_datastr(tmp_data, 0, app_data, appdatalen);
-+		pattern_result = ((comppattern && regexec(comppattern, tmp_data)) ? 1 : 0);
-+
-+		kfree(tmp_data);
-+		tmp_data = NULL;
-+		spin_unlock_bh(&l7_lock);
-+
-+		return (pattern_result ^ info->invert);
-+	}
-+
- 	/* On the first packet of a connection, allocate space for app data */
- 	if(total_acct_packets(master_conntrack) == 1 && !skb->cb[0] && 
- 	   !master_conntrack->layer7.app_data){
diff --git a/target/linux/generic-2.6/patches-2.6.33/110-netfilter_match_speedup.patch b/target/linux/generic-2.6/patches-2.6.33/110-netfilter_match_speedup.patch
deleted file mode 100644
index ca64e6c3e..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/110-netfilter_match_speedup.patch
+++ /dev/null
@@ -1,144 +0,0 @@
---- a/include/linux/netfilter_ipv4/ip_tables.h
-+++ b/include/linux/netfilter_ipv4/ip_tables.h
-@@ -62,6 +62,7 @@ struct ipt_ip {
- #define IPT_F_FRAG		0x01	/* Set if rule is a fragment rule */
- #define IPT_F_GOTO		0x02	/* Set if jump is a goto */
- #define IPT_F_MASK		0x03	/* All possible flag bits mask. */
-+#define IPT_F_NO_DEF_MATCH	0x80	/* Internal: no default match rules present */
- 
- /* Values for "inv" field in struct ipt_ip. */
- #define IPT_INV_VIA_IN		0x01	/* Invert the sense of IN IFACE. */
---- a/net/ipv4/netfilter/ip_tables.c
-+++ b/net/ipv4/netfilter/ip_tables.c
-@@ -88,6 +88,9 @@ ip_packet_match(const struct iphdr *ip,
- 
- #define FWINV(bool, invflg) ((bool) ^ !!(ipinfo->invflags & (invflg)))
- 
-+	if (ipinfo->flags & IPT_F_NO_DEF_MATCH)
-+		return true;
-+
- 	if (FWINV((ip->saddr&ipinfo->smsk.s_addr) != ipinfo->src.s_addr,
- 		  IPT_INV_SRCIP) ||
- 	    FWINV((ip->daddr&ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr,
-@@ -138,13 +141,35 @@ ip_packet_match(const struct iphdr *ip,
- 		return false;
- 	}
- 
-+#undef FWINV
- 	return true;
- }
- 
- static bool
--ip_checkentry(const struct ipt_ip *ip)
-+ip_checkentry(struct ipt_ip *ip)
- {
--	if (ip->flags & ~IPT_F_MASK) {
-+#define FWINV(bool, invflg) ((bool) || (ip->invflags & (invflg)))
-+
-+	if (FWINV(ip->smsk.s_addr, IPT_INV_SRCIP) ||
-+		FWINV(ip->dmsk.s_addr, IPT_INV_DSTIP))
-+		goto has_match_rules;
-+
-+	if (FWINV(!!((const unsigned long *)ip->iniface_mask)[0],
-+		IPT_INV_VIA_IN) ||
-+	    FWINV(!!((const unsigned long *)ip->outiface_mask)[0],
-+		IPT_INV_VIA_OUT))
-+		goto has_match_rules;
-+
-+	if (FWINV(ip->proto, IPT_INV_PROTO))
-+		goto has_match_rules;
-+
-+	if (FWINV(ip->flags&IPT_F_FRAG, IPT_INV_FRAG))
-+		goto has_match_rules;
-+
-+	ip->flags |= IPT_F_NO_DEF_MATCH;
-+
-+has_match_rules:
-+	if (ip->flags & ~(IPT_F_MASK|IPT_F_NO_DEF_MATCH)) {
- 		duprintf("Unknown flag bits set: %08X\n",
- 			 ip->flags & ~IPT_F_MASK);
- 		return false;
-@@ -154,6 +179,8 @@ ip_checkentry(const struct ipt_ip *ip)
- 			 ip->invflags & ~IPT_INV_MASK);
- 		return false;
- 	}
-+
-+#undef FWINV
- 	return true;
- }
- 
-@@ -196,7 +223,6 @@ static inline bool unconditional(const s
- 	static const struct ipt_ip uncond;
- 
- 	return memcmp(ip, &uncond, sizeof(uncond)) == 0;
--#undef FWINV
- }
- 
- #if defined(CONFIG_NETFILTER_XT_TARGET_TRACE) || \
-@@ -321,8 +347,28 @@ ipt_do_table(struct sk_buff *skb,
- 	struct xt_match_param mtpar;
- 	struct xt_target_param tgpar;
- 
--	/* Initialization */
- 	ip = ip_hdr(skb);
-+
-+	IP_NF_ASSERT(table->valid_hooks & (1 << hook));
-+	xt_info_rdlock_bh();
-+	private = table->private;
-+	table_base = private->entries[smp_processor_id()];
-+	e = get_entry(table_base, private->hook_entry[hook]);
-+
-+	if (e->target_offset <= sizeof(struct ipt_entry) &&
-+		(e->ip.flags & IPT_F_NO_DEF_MATCH)) {
-+			struct ipt_entry_target *t = ipt_get_target(e);
-+			if (!t->u.kernel.target->target) {
-+				int v = ((struct ipt_standard_target *)t)->verdict;
-+				if ((v < 0) && (v != IPT_RETURN)) {
-+					ADD_COUNTER(e->counters, ntohs(ip->tot_len), 1);
-+					xt_info_rdunlock_bh();
-+					return (unsigned)(-v) - 1;
-+				}
-+			}
-+	}
-+
-+	/* Initialization */
- 	indev = in ? in->name : nulldevname;
- 	outdev = out ? out->name : nulldevname;
- 	/* We handle fragments by dealing with the first fragment as
-@@ -339,13 +385,6 @@ ipt_do_table(struct sk_buff *skb,
- 	mtpar.family  = tgpar.family = NFPROTO_IPV4;
- 	mtpar.hooknum = tgpar.hooknum = hook;
- 
--	IP_NF_ASSERT(table->valid_hooks & (1 << hook));
--	xt_info_rdlock_bh();
--	private = table->private;
--	table_base = private->entries[smp_processor_id()];
--
--	e = get_entry(table_base, private->hook_entry[hook]);
--
- 	/* For return from builtin chain */
- 	back = get_entry(table_base, private->underflow[hook]);
- 
-@@ -992,6 +1031,7 @@ copy_entries_to_user(unsigned int total_
- 		unsigned int i;
- 		const struct ipt_entry_match *m;
- 		const struct ipt_entry_target *t;
-+		u8 flags;
- 
- 		e = (struct ipt_entry *)(loc_cpu_entry + off);
- 		if (copy_to_user(userptr + off
-@@ -1001,6 +1041,14 @@ copy_entries_to_user(unsigned int total_
- 			ret = -EFAULT;
- 			goto free_counters;
- 		}
-+
-+		flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
-+		if (copy_to_user(userptr + off
-+				 + offsetof(struct ipt_entry, ip.flags),
-+				 &flags, sizeof(flags)) != 0) {
-+			ret = -EFAULT;
-+			goto free_counters;
-+		}
- 
- 		for (i = sizeof(struct ipt_entry);
- 		     i < e->target_offset;
diff --git a/target/linux/generic-2.6/patches-2.6.33/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.33/150-netfilter_imq.patch
deleted file mode 100644
index 98567618a..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/150-netfilter_imq.patch
+++ /dev/null
@@ -1,1337 +0,0 @@
---- /dev/null
-+++ b/drivers/net/imq.c
-@@ -0,0 +1,632 @@
-+/*
-+ *             Pseudo-driver for the intermediate queue device.
-+ *
-+ *             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.
-+ *
-+ * Authors:    Patrick McHardy, <kaber@trash.net>
-+ *
-+ *            The first version was written by Martin Devera, <devik@cdi.cz>
-+ *
-+ * Credits:    Jan Rafaj <imq2t@cedric.vabo.cz>
-+ *              - Update patch to 2.4.21
-+ *             Sebastian Strollo <sstrollo@nortelnetworks.com>
-+ *              - Fix "Dead-loop on netdevice imq"-issue
-+ *             Marcel Sebek <sebek64@post.cz>
-+ *              - Update to 2.6.2-rc1
-+ *
-+ *	       After some time of inactivity there is a group taking care
-+ *	       of IMQ again: http://www.linuximq.net
-+ *
-+ *
-+ *	       2004/06/30 - New version of IMQ patch to kernels <=2.6.7
-+ *             including the following changes:
-+ *
-+ *	       - Correction of ipv6 support "+"s issue (Hasso Tepper)
-+ *	       - Correction of imq_init_devs() issue that resulted in
-+ *	       kernel OOPS unloading IMQ as module (Norbert Buchmuller)
-+ *	       - Addition of functionality to choose number of IMQ devices
-+ *	       during kernel config (Andre Correa)
-+ *	       - Addition of functionality to choose how IMQ hooks on
-+ *	       PRE and POSTROUTING (after or before NAT) (Andre Correa)
-+ *	       - Cosmetic corrections (Norbert Buchmuller) (Andre Correa)
-+ *
-+ *
-+ *             2005/12/16 - IMQ versions between 2.6.7 and 2.6.13 were
-+ *             released with almost no problems. 2.6.14-x was released
-+ *             with some important changes: nfcache was removed; After
-+ *             some weeks of trouble we figured out that some IMQ fields
-+ *             in skb were missing in skbuff.c - skb_clone and copy_skb_header.
-+ *             These functions are correctly patched by this new patch version.
-+ *
-+ *             Thanks for all who helped to figure out all the problems with
-+ *             2.6.14.x: Patrick McHardy, Rune Kock, VeNoMouS, Max CtRiX,
-+ *             Kevin Shanahan, Richard Lucassen, Valery Dachev (hopefully
-+ *             I didn't forget anybody). I apologize again for my lack of time.
-+ *
-+ *
-+ *             2008/06/17 - 2.6.25 - Changed imq.c to use qdisc_run() instead 
-+ *             of qdisc_restart() and moved qdisc_run() to tasklet to avoid
-+ *             recursive locking. New initialization routines to fix 'rmmod' not
-+ *             working anymore. Used code from ifb.c. (Jussi Kivilinna)
-+ *
-+ *             2008/08/06 - 2.6.26 - (JK)
-+ *              - Replaced tasklet with 'netif_schedule()'.
-+ *              - Cleaned up and added comments for imq_nf_queue().
-+ *
-+ *             2009/04/12
-+ *              - Add skb_save_cb/skb_restore_cb helper functions for backuping
-+ *                control buffer. This is needed because qdisc-layer on kernels
-+ *                2.6.27 and newer overwrite control buffer. (Jussi Kivilinna)
-+ *              - Add better locking for IMQ device. Hopefully this will solve
-+ *                SMP issues. (Jussi Kivilinna)
-+ *              - Port to 2.6.27
-+ *              - Port to 2.6.28
-+ *              - Port to 2.6.29 + fix rmmod not working
-+ *
-+ *             2009/04/20 - (Jussi Kivilinna)
-+ *              - Use netdevice feature flags to avoid extra packet handling
-+ *                by core networking layer and possibly increase performance.
-+ *
-+ *             2009/09/26 - (Jussi Kivilinna)
-+ *              - Add imq_nf_reinject_lockless to fix deadlock with
-+ *                imq_nf_queue/imq_nf_reinject.
-+ *
-+ *             2009/12/08 - (Jussi Kivilinna)
-+ *              - Port to 2.6.32
-+ *              - Add check for skb->nf_queue_entry==NULL in imq_dev_xmit()
-+ *              - Also add better error checking for skb->nf_queue_entry usage
-+ *
-+ *	       Also, many thanks to pablo Sebastian Greco for making the initial
-+ *	       patch and to those who helped the testing.
-+ *
-+ *             More info at: http://www.linuximq.net/ (Andre Correa)
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/moduleparam.h>
-+#include <linux/list.h>
-+#include <linux/skbuff.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/rtnetlink.h>
-+#include <linux/if_arp.h>
-+#include <linux/netfilter.h>
-+#include <linux/netfilter_ipv4.h>
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	#include <linux/netfilter_ipv6.h>
-+#endif
-+#include <linux/imq.h>
-+#include <net/pkt_sched.h>
-+#include <net/netfilter/nf_queue.h>
-+
-+static nf_hookfn imq_nf_hook;
-+
-+static struct nf_hook_ops imq_ingress_ipv4 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET,
-+	.hooknum	= NF_INET_PRE_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	.priority	= NF_IP_PRI_MANGLE + 1
-+#else
-+	.priority	= NF_IP_PRI_NAT_DST + 1
-+#endif
-+};
-+
-+static struct nf_hook_ops imq_egress_ipv4 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET,
-+	.hooknum	= NF_INET_POST_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
-+	.priority	= NF_IP_PRI_LAST
-+#else
-+	.priority	= NF_IP_PRI_NAT_SRC - 1
-+#endif
-+};
-+
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+static struct nf_hook_ops imq_ingress_ipv6 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET6,
-+	.hooknum	= NF_INET_PRE_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	.priority	= NF_IP6_PRI_MANGLE + 1
-+#else
-+	.priority	= NF_IP6_PRI_NAT_DST + 1
-+#endif
-+};
-+
-+static struct nf_hook_ops imq_egress_ipv6 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET6,
-+	.hooknum	= NF_INET_POST_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
-+	.priority	= NF_IP6_PRI_LAST
-+#else
-+	.priority	= NF_IP6_PRI_NAT_SRC - 1
-+#endif
-+};
-+#endif
-+
-+#if defined(CONFIG_IMQ_NUM_DEVS)
-+static unsigned int numdevs = CONFIG_IMQ_NUM_DEVS;
-+#else
-+static unsigned int numdevs = IMQ_MAX_DEVS;
-+#endif
-+
-+static DEFINE_SPINLOCK(imq_nf_queue_lock);
-+
-+static struct net_device *imq_devs_cache[IMQ_MAX_DEVS];
-+
-+
-+static struct net_device_stats *imq_get_stats(struct net_device *dev)
-+{
-+	return &dev->stats;
-+}
-+
-+/* called for packets kfree'd in qdiscs at places other than enqueue */
-+static void imq_skb_destructor(struct sk_buff *skb)
-+{
-+	struct nf_queue_entry *entry = skb->nf_queue_entry;
-+
-+	skb->nf_queue_entry = NULL;
-+
-+	if (entry) {
-+		nf_queue_entry_release_refs(entry);
-+		kfree(entry);
-+	}
-+
-+	skb_restore_cb(skb); /* kfree backup */
-+}
-+
-+/* locking not needed when called from imq_nf_queue */
-+static void imq_nf_reinject_lockless(struct nf_queue_entry *entry,
-+						unsigned int verdict)
-+{
-+	int status;
-+
-+	if (!entry->next_outfn) {
-+		nf_reinject(entry, verdict);
-+		return;
-+	}
-+
-+	status = entry->next_outfn(entry, entry->next_queuenum);
-+	if (status < 0) {
-+		nf_queue_entry_release_refs(entry);
-+		kfree_skb(entry->skb);
-+		kfree(entry);
-+	}
-+}
-+
-+static void imq_nf_reinject(struct nf_queue_entry *entry, unsigned int verdict)
-+{
-+	int status;
-+
-+	if (!entry->next_outfn) {
-+		spin_lock_bh(&imq_nf_queue_lock);
-+		nf_reinject(entry, verdict);
-+		spin_unlock_bh(&imq_nf_queue_lock);
-+		return;
-+	}
-+
-+	rcu_read_lock();
-+	local_bh_disable();
-+	status = entry->next_outfn(entry, entry->next_queuenum);
-+	local_bh_enable();
-+	if (status < 0) {
-+		nf_queue_entry_release_refs(entry);
-+		kfree_skb(entry->skb);
-+		kfree(entry);
-+	}
-+
-+	rcu_read_unlock();
-+}
-+
-+static netdev_tx_t imq_dev_xmit(struct sk_buff *skb, struct net_device *dev)
-+{
-+	struct nf_queue_entry *entry = skb->nf_queue_entry;
-+
-+	skb->nf_queue_entry = NULL;
-+	dev->trans_start = jiffies;
-+
-+	dev->stats.tx_bytes += skb->len;
-+	dev->stats.tx_packets++;
-+
-+	if (entry == NULL) {
-+		/* We don't know what is going on here.. packet is queued for
-+		 * imq device, but (probably) not by us.
-+		 *
-+		 * If this packet was not send here by imq_nf_queue(), then
-+		 * skb_save_cb() was not used and skb_free() should not show:
-+		 *   WARNING: IMQ: kfree_skb: skb->cb_next:..
-+		 * and/or
-+		 *   WARNING: IMQ: kfree_skb: skb->nf_queue_entry...
-+		 *
-+		 * However if this message is shown, then IMQ is somehow broken
-+		 * and you should report this to linuximq.net.
-+		 */
-+
-+		/* imq_dev_xmit is black hole that eats all packets, report that
-+		 * we eat this packet happily and increase dropped counters.
-+		 */
-+
-+		dev->stats.tx_dropped++;
-+		dev_kfree_skb(skb);
-+
-+		return NETDEV_TX_OK;
-+	}
-+
-+	skb_restore_cb(skb); /* restore skb->cb */
-+
-+	skb->imq_flags = 0;
-+	skb->destructor = NULL;
-+
-+	imq_nf_reinject(entry, NF_ACCEPT);
-+
-+	return NETDEV_TX_OK;
-+}
-+
-+static int imq_nf_queue(struct nf_queue_entry *entry, unsigned queue_num)
-+{
-+	struct net_device *dev;
-+	struct sk_buff *skb_orig, *skb, *skb_shared;
-+	struct Qdisc *q;
-+	struct netdev_queue *txq;
-+	int users, index;
-+	int retval = -EINVAL;
-+
-+	index = entry->skb->imq_flags & IMQ_F_IFMASK;
-+	if (unlikely(index > numdevs - 1)) {
-+		if (net_ratelimit())
-+			printk(KERN_WARNING
-+			       "IMQ: invalid device specified, highest is %u\n",
-+			       numdevs - 1);
-+		retval = -EINVAL;
-+		goto out;
-+	}
-+
-+	/* check for imq device by index from cache */
-+	dev = imq_devs_cache[index];
-+	if (unlikely(!dev)) {
-+		char buf[8];
-+
-+		/* get device by name and cache result */
-+		snprintf(buf, sizeof(buf), "imq%d", index);
-+		dev = dev_get_by_name(&init_net, buf);
-+		if (!dev) {
-+			/* not found ?!*/
-+			BUG();
-+			retval = -ENODEV;
-+			goto out;
-+		}
-+
-+		imq_devs_cache[index] = dev;
-+		dev_put(dev);
-+	}
-+
-+	if (unlikely(!(dev->flags & IFF_UP))) {
-+		entry->skb->imq_flags = 0;
-+		imq_nf_reinject_lockless(entry, NF_ACCEPT);
-+		retval = 0;
-+		goto out;
-+	}
-+	dev->last_rx = jiffies;
-+
-+	skb = entry->skb;
-+	skb_orig = NULL;
-+
-+	/* skb has owner? => make clone */
-+	if (unlikely(skb->destructor)) {
-+		skb_orig = skb;
-+		skb = skb_clone(skb, GFP_ATOMIC);
-+		if (!skb) {
-+			retval = -ENOMEM;
-+			goto out;
-+		}
-+		entry->skb = skb;
-+	}
-+
-+	skb->nf_queue_entry = entry;
-+
-+	dev->stats.rx_bytes += skb->len;
-+	dev->stats.rx_packets++;
-+
-+	txq = dev_pick_tx(dev, skb);
-+
-+	q = rcu_dereference(txq->qdisc);
-+	if (unlikely(!q->enqueue))
-+		goto packet_not_eaten_by_imq_dev;
-+
-+	spin_lock_bh(qdisc_lock(q));
-+
-+	users = atomic_read(&skb->users);
-+
-+	skb_shared = skb_get(skb); /* increase reference count by one */
-+	skb_save_cb(skb_shared); /* backup skb->cb, as qdisc layer will
-+					overwrite it */
-+	qdisc_enqueue_root(skb_shared, q); /* might kfree_skb */
-+
-+	if (likely(atomic_read(&skb_shared->users) == users + 1)) {
-+		kfree_skb(skb_shared); /* decrease reference count by one */
-+
-+		skb->destructor = &imq_skb_destructor;
-+
-+		/* cloned? */
-+		if (skb_orig)
-+			kfree_skb(skb_orig); /* free original */
-+
-+		spin_unlock_bh(qdisc_lock(q));
-+
-+		/* schedule qdisc dequeue */
-+		__netif_schedule(q);
-+
-+		retval = 0;
-+		goto out;
-+	} else {
-+		skb_restore_cb(skb_shared); /* restore skb->cb */
-+		skb->nf_queue_entry = NULL;
-+		/* qdisc dropped packet and decreased skb reference count of
-+		 * skb, so we don't really want to and try refree as that would
-+		 * actually destroy the skb. */
-+		spin_unlock_bh(qdisc_lock(q));
-+		goto packet_not_eaten_by_imq_dev;
-+	}
-+
-+packet_not_eaten_by_imq_dev:
-+	/* cloned? restore original */
-+	if (skb_orig) {
-+		kfree_skb(skb);
-+		entry->skb = skb_orig;
-+	}
-+	retval = -1;
-+out:
-+	return retval;
-+}
-+
-+static struct nf_queue_handler nfqh = {
-+	.name  = "imq",
-+	.outfn = imq_nf_queue,
-+};
-+
-+static unsigned int imq_nf_hook(unsigned int hook, struct sk_buff *pskb,
-+				const struct net_device *indev,
-+				const struct net_device *outdev,
-+				int (*okfn)(struct sk_buff *))
-+{
-+	if (pskb->imq_flags & IMQ_F_ENQUEUE)
-+		return NF_QUEUE;
-+
-+	return NF_ACCEPT;
-+}
-+
-+static int imq_close(struct net_device *dev)
-+{
-+	netif_stop_queue(dev);
-+	return 0;
-+}
-+
-+static int imq_open(struct net_device *dev)
-+{
-+	netif_start_queue(dev);
-+	return 0;
-+}
-+
-+static const struct net_device_ops imq_netdev_ops = {
-+	.ndo_open		= imq_open,
-+	.ndo_stop		= imq_close,
-+	.ndo_start_xmit		= imq_dev_xmit,
-+	.ndo_get_stats		= imq_get_stats,
-+};
-+
-+static void imq_setup(struct net_device *dev)
-+{
-+	dev->netdev_ops		= &imq_netdev_ops;
-+	dev->type               = ARPHRD_VOID;
-+	dev->mtu                = 16000;
-+	dev->tx_queue_len       = 11000;
-+	dev->flags              = IFF_NOARP;
-+	dev->features           = NETIF_F_SG | NETIF_F_FRAGLIST |
-+				  NETIF_F_GSO | NETIF_F_HW_CSUM |
-+				  NETIF_F_HIGHDMA;
-+	dev->priv_flags		&= ~IFF_XMIT_DST_RELEASE;
-+}
-+
-+static int imq_validate(struct nlattr *tb[], struct nlattr *data[])
-+{
-+	int ret = 0;
-+
-+	if (tb[IFLA_ADDRESS]) {
-+		if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN) {
-+			ret = -EINVAL;
-+			goto end;
-+		}
-+		if (!is_valid_ether_addr(nla_data(tb[IFLA_ADDRESS]))) {
-+			ret = -EADDRNOTAVAIL;
-+			goto end;
-+		}
-+	}
-+	return 0;
-+end:
-+	printk(KERN_WARNING "IMQ: imq_validate failed (%d)\n", ret);
-+	return ret;
-+}
-+
-+static struct rtnl_link_ops imq_link_ops __read_mostly = {
-+	.kind		= "imq",
-+	.priv_size	= 0,
-+	.setup		= imq_setup,
-+	.validate	= imq_validate,
-+};
-+
-+static int __init imq_init_hooks(void)
-+{
-+	int err;
-+
-+	nf_register_queue_imq_handler(&nfqh);
-+
-+	err = nf_register_hook(&imq_ingress_ipv4);
-+	if (err)
-+		goto err1;
-+
-+	err = nf_register_hook(&imq_egress_ipv4);
-+	if (err)
-+		goto err2;
-+
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	err = nf_register_hook(&imq_ingress_ipv6);
-+	if (err)
-+		goto err3;
-+
-+	err = nf_register_hook(&imq_egress_ipv6);
-+	if (err)
-+		goto err4;
-+#endif
-+
-+	return 0;
-+
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+err4:
-+	nf_unregister_hook(&imq_ingress_ipv6);
-+err3:
-+	nf_unregister_hook(&imq_egress_ipv4);
-+#endif
-+err2:
-+	nf_unregister_hook(&imq_ingress_ipv4);
-+err1:
-+	nf_unregister_queue_imq_handler();
-+	return err;
-+}
-+
-+static int __init imq_init_one(int index)
-+{
-+	struct net_device *dev;
-+	int ret;
-+
-+	dev = alloc_netdev(0, "imq%d", imq_setup);
-+	if (!dev)
-+		return -ENOMEM;
-+
-+	ret = dev_alloc_name(dev, dev->name);
-+	if (ret < 0)
-+		goto fail;
-+
-+	dev->rtnl_link_ops = &imq_link_ops;
-+	ret = register_netdevice(dev);
-+	if (ret < 0)
-+		goto fail;
-+
-+	return 0;
-+fail:
-+	free_netdev(dev);
-+	return ret;
-+}
-+
-+static int __init imq_init_devs(void)
-+{
-+	int err, i;
-+
-+	if (numdevs < 1 || numdevs > IMQ_MAX_DEVS) {
-+		printk(KERN_ERR "IMQ: numdevs has to be betweed 1 and %u\n",
-+		       IMQ_MAX_DEVS);
-+		return -EINVAL;
-+	}
-+
-+	rtnl_lock();
-+	err = __rtnl_link_register(&imq_link_ops);
-+
-+	for (i = 0; i < numdevs && !err; i++)
-+		err = imq_init_one(i);
-+
-+	if (err) {
-+		__rtnl_link_unregister(&imq_link_ops);
-+		memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
-+	}
-+	rtnl_unlock();
-+
-+	return err;
-+}
-+
-+static int __init imq_init_module(void)
-+{
-+	int err;
-+
-+#if defined(CONFIG_IMQ_NUM_DEVS)
-+	BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS > 16);
-+	BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS < 2);
-+	BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS - 1 > IMQ_F_IFMASK);
-+#endif
-+
-+	err = imq_init_devs();
-+	if (err) {
-+		printk(KERN_ERR "IMQ: Error trying imq_init_devs(net)\n");
-+		return err;
-+	}
-+
-+	err = imq_init_hooks();
-+	if (err) {
-+		printk(KERN_ERR "IMQ: Error trying imq_init_hooks()\n");
-+		rtnl_link_unregister(&imq_link_ops);
-+		memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
-+		return err;
-+	}
-+
-+	printk(KERN_INFO "IMQ driver loaded successfully.\n");
-+
-+#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	printk(KERN_INFO "\tHooking IMQ before NAT on PREROUTING.\n");
-+#else
-+	printk(KERN_INFO "\tHooking IMQ after NAT on PREROUTING.\n");
-+#endif
-+#if defined(CONFIG_IMQ_BEHAVIOR_AB) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	printk(KERN_INFO "\tHooking IMQ before NAT on POSTROUTING.\n");
-+#else
-+	printk(KERN_INFO "\tHooking IMQ after NAT on POSTROUTING.\n");
-+#endif
-+
-+	return 0;
-+}
-+
-+static void __exit imq_unhook(void)
-+{
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	nf_unregister_hook(&imq_ingress_ipv6);
-+	nf_unregister_hook(&imq_egress_ipv6);
-+#endif
-+	nf_unregister_hook(&imq_ingress_ipv4);
-+	nf_unregister_hook(&imq_egress_ipv4);
-+
-+	nf_unregister_queue_imq_handler();
-+}
-+
-+static void __exit imq_cleanup_devs(void)
-+{
-+	rtnl_link_unregister(&imq_link_ops);
-+	memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
-+}
-+
-+static void __exit imq_exit_module(void)
-+{
-+	imq_unhook();
-+	imq_cleanup_devs();
-+	printk(KERN_INFO "IMQ driver unloaded successfully.\n");
-+}
-+
-+module_init(imq_init_module);
-+module_exit(imq_exit_module);
-+
-+module_param(numdevs, int, 0);
-+MODULE_PARM_DESC(numdevs, "number of IMQ devices (how many imq* devices will "
-+			"be created)");
-+MODULE_AUTHOR("http://www.linuximq.net");
-+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See "
-+			"http://www.linuximq.net/ for more information.");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS_RTNL_LINK("imq");
-+
---- a/drivers/net/Kconfig
-+++ b/drivers/net/Kconfig
-@@ -109,6 +109,129 @@ config EQUALIZER
- 	  To compile this driver as a module, choose M here: the module
- 	  will be called eql.  If unsure, say N.
- 
-+config IMQ
-+	tristate "IMQ (intermediate queueing device) support"
-+	depends on NETDEVICES && NETFILTER
-+	---help---
-+	  The IMQ device(s) is used as placeholder for QoS queueing
-+	  disciplines. Every packet entering/leaving the IP stack can be
-+	  directed through the IMQ device where it's enqueued/dequeued to the
-+	  attached qdisc. This allows you to treat network devices as classes
-+	  and distribute bandwidth among them. Iptables is used to specify
-+	  through which IMQ device, if any, packets travel.
-+
-+	  More information at: http://www.linuximq.net/
-+
-+	  To compile this driver as a module, choose M here: the module
-+	  will be called imq.  If unsure, say N.
-+
-+choice
-+	prompt "IMQ behavior (PRE/POSTROUTING)"
-+	depends on IMQ
-+	default IMQ_BEHAVIOR_AB
-+	help
-+
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		IMQ can work in any of the following ways:
-+
-+		    PREROUTING   |      POSTROUTING
-+		-----------------|-------------------
-+		#1  After NAT    |      After NAT
-+		#2  After NAT    |      Before NAT
-+		#3  Before NAT   |      After NAT
-+		#4  Before NAT   |      Before NAT
-+
-+		The default behavior is to hook before NAT on PREROUTING
-+		and after NAT on POSTROUTING (#3).
-+
-+		This settings are specially usefull when trying to use IMQ
-+		to shape NATed clients.
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_AA
-+	bool "IMQ AA"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   After NAT
-+		POSTROUTING:  After NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_AB
-+	bool "IMQ AB"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   After NAT
-+		POSTROUTING:  Before NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_BA
-+	bool "IMQ BA"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   Before NAT
-+		POSTROUTING:  After NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_BB
-+	bool "IMQ BB"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   Before NAT
-+		POSTROUTING:  Before NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+endchoice
-+
-+config IMQ_NUM_DEVS
-+
-+	int "Number of IMQ devices"
-+	range 2 16
-+	depends on IMQ
-+	default "16"
-+	help
-+
-+		This settings defines how many IMQ devices will be
-+		created.
-+
-+		The default value is 16.
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
- config TUN
- 	tristate "Universal TUN/TAP device driver support"
- 	select CRC32
---- a/drivers/net/Makefile
-+++ b/drivers/net/Makefile
-@@ -165,6 +165,7 @@ obj-$(CONFIG_SLHC) += slhc.o
- obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
- 
- obj-$(CONFIG_DUMMY) += dummy.o
-+obj-$(CONFIG_IMQ) += imq.o
- obj-$(CONFIG_IFB) += ifb.o
- obj-$(CONFIG_MACVLAN) += macvlan.o
- obj-$(CONFIG_DE600) += de600.o
---- /dev/null
-+++ b/include/linux/imq.h
-@@ -0,0 +1,13 @@
-+#ifndef _IMQ_H
-+#define _IMQ_H
-+
-+/* IFMASK (16 device indexes, 0 to 15) and flag(s) fit in 5 bits */
-+#define IMQ_F_BITS	5
-+
-+#define IMQ_F_IFMASK	0x0f
-+#define IMQ_F_ENQUEUE	0x10
-+
-+#define IMQ_MAX_DEVS	(IMQ_F_IFMASK + 1)
-+
-+#endif /* _IMQ_H */
-+
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -1168,6 +1168,7 @@ extern int		dev_alloc_name(struct net_de
- extern int		dev_open(struct net_device *dev);
- extern int		dev_close(struct net_device *dev);
- extern void		dev_disable_lro(struct net_device *dev);
-+extern struct netdev_queue *dev_pick_tx(struct net_device *dev, struct sk_buff *skb);
- extern int		dev_queue_xmit(struct sk_buff *skb);
- extern int		register_netdevice(struct net_device *dev);
- extern void		unregister_netdevice_queue(struct net_device *dev,
---- /dev/null
-+++ b/include/linux/netfilter/xt_IMQ.h
-@@ -0,0 +1,9 @@
-+#ifndef _XT_IMQ_H
-+#define _XT_IMQ_H
-+
-+struct xt_imq_info {
-+	unsigned int todev;     /* target imq device */
-+};
-+
-+#endif /* _XT_IMQ_H */
-+
---- /dev/null
-+++ b/include/linux/netfilter_ipv4/ipt_IMQ.h
-@@ -0,0 +1,10 @@
-+#ifndef _IPT_IMQ_H
-+#define _IPT_IMQ_H
-+
-+/* Backwards compatibility for old userspace */
-+#include <linux/netfilter/xt_IMQ.h>
-+
-+#define ipt_imq_info xt_imq_info
-+
-+#endif /* _IPT_IMQ_H */
-+
---- /dev/null
-+++ b/include/linux/netfilter_ipv6/ip6t_IMQ.h
-@@ -0,0 +1,10 @@
-+#ifndef _IP6T_IMQ_H
-+#define _IP6T_IMQ_H
-+
-+/* Backwards compatibility for old userspace */
-+#include <linux/netfilter/xt_IMQ.h>
-+
-+#define ip6t_imq_info xt_imq_info
-+
-+#endif /* _IP6T_IMQ_H */
-+
---- a/include/linux/skbuff.h
-+++ b/include/linux/skbuff.h
-@@ -29,6 +29,9 @@
- #include <linux/rcupdate.h>
- #include <linux/dmaengine.h>
- #include <linux/hrtimer.h>
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+#include <linux/imq.h>
-+#endif
- 
- /* Don't change this without changing skb_csum_unnecessary! */
- #define CHECKSUM_NONE 0
-@@ -323,6 +326,10 @@ struct sk_buff {
- 	char			cb[48] __aligned(8);
- 
- 	unsigned long		_skb_dst;
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	void			*cb_next;
-+#endif
-+
- #ifdef CONFIG_XFRM
- 	struct	sec_path	*sp;
- #endif
-@@ -357,6 +364,9 @@ struct sk_buff {
- 	struct nf_conntrack	*nfct;
- 	struct sk_buff		*nfct_reasm;
- #endif
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	struct nf_queue_entry	*nf_queue_entry;
-+#endif
- #ifdef CONFIG_BRIDGE_NETFILTER
- 	struct nf_bridge_info	*nf_bridge;
- #endif
-@@ -378,6 +388,10 @@ struct sk_buff {
- 
- 	/* 0/14 bit hole */
- 
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	__u8			imq_flags:IMQ_F_BITS;
-+#endif
-+
- #ifdef CONFIG_NET_DMA
- 	dma_cookie_t		dma_cookie;
- #endif
-@@ -426,6 +440,12 @@ static inline struct rtable *skb_rtable(
- 	return (struct rtable *)skb_dst(skb);
- }
- 
-+
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+extern int skb_save_cb(struct sk_buff *skb);
-+extern int skb_restore_cb(struct sk_buff *skb);
-+#endif
-+
- extern void kfree_skb(struct sk_buff *skb);
- extern void consume_skb(struct sk_buff *skb);
- extern void	       __kfree_skb(struct sk_buff *skb);
-@@ -1970,6 +1990,10 @@ static inline void __nf_copy(struct sk_b
- 	dst->nfct_reasm = src->nfct_reasm;
- 	nf_conntrack_get_reasm(src->nfct_reasm);
- #endif
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	dst->imq_flags = src->imq_flags;
-+	dst->nf_queue_entry = src->nf_queue_entry;
-+#endif
- #ifdef CONFIG_BRIDGE_NETFILTER
- 	dst->nf_bridge  = src->nf_bridge;
- 	nf_bridge_get(src->nf_bridge);
---- a/include/net/netfilter/nf_queue.h
-+++ b/include/net/netfilter/nf_queue.h
-@@ -13,6 +13,12 @@ struct nf_queue_entry {
- 	struct net_device	*indev;
- 	struct net_device	*outdev;
- 	int			(*okfn)(struct sk_buff *);
-+
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	int			(*next_outfn)(struct nf_queue_entry *entry,
-+					      unsigned int queuenum);
-+	unsigned int		next_queuenum;
-+#endif
- };
- 
- #define nf_queue_entry_reroute(x) ((void *)x + sizeof(struct nf_queue_entry))
-@@ -30,5 +36,11 @@ extern int nf_unregister_queue_handler(u
- 				       const struct nf_queue_handler *qh);
- extern void nf_unregister_queue_handlers(const struct nf_queue_handler *qh);
- extern void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict);
-+extern void nf_queue_entry_release_refs(struct nf_queue_entry *entry);
-+
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+extern void nf_register_queue_imq_handler(const struct nf_queue_handler *qh);
-+extern void nf_unregister_queue_imq_handler(void);
-+#endif
- 
- #endif /* _NF_QUEUE_H */
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -97,6 +97,9 @@
- #include <net/net_namespace.h>
- #include <net/sock.h>
- #include <linux/rtnetlink.h>
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+#include <linux/imq.h>
-+#endif
- #include <linux/proc_fs.h>
- #include <linux/seq_file.h>
- #include <linux/stat.h>
-@@ -1810,7 +1813,11 @@ int dev_hard_start_xmit(struct sk_buff *
- 	int rc = NETDEV_TX_OK;
- 
- 	if (likely(!skb->next)) {
--		if (!list_empty(&ptype_all))
-+		if (!list_empty(&ptype_all)
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+		    && !(skb->imq_flags & IMQ_F_ENQUEUE)
-+#endif
-+		    )
- 			dev_queue_xmit_nit(skb, dev);
- 
- 		if (netif_needs_gso(dev, skb)) {
-@@ -1912,8 +1919,7 @@ static inline u16 dev_cap_txqueue(struct
- 	return queue_index;
- }
- 
--static struct netdev_queue *dev_pick_tx(struct net_device *dev,
--					struct sk_buff *skb)
-+struct netdev_queue *dev_pick_tx(struct net_device *dev, struct sk_buff *skb)
- {
- 	u16 queue_index;
- 	struct sock *sk = skb->sk;
-@@ -1939,6 +1945,7 @@ static struct netdev_queue *dev_pick_tx(
- 	skb_set_queue_mapping(skb, queue_index);
- 	return netdev_get_tx_queue(dev, queue_index);
- }
-+EXPORT_SYMBOL(dev_pick_tx);
- 
- static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q,
- 				 struct net_device *dev,
---- a/net/core/skbuff.c
-+++ b/net/core/skbuff.c
-@@ -72,6 +72,9 @@
- 
- static struct kmem_cache *skbuff_head_cache __read_mostly;
- static struct kmem_cache *skbuff_fclone_cache __read_mostly;
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+static struct kmem_cache *skbuff_cb_store_cache __read_mostly;
-+#endif
- 
- static void sock_pipe_buf_release(struct pipe_inode_info *pipe,
- 				  struct pipe_buffer *buf)
-@@ -91,6 +94,83 @@ static int sock_pipe_buf_steal(struct pi
- 	return 1;
- }
- 
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+/* Control buffer save/restore for IMQ devices */
-+struct skb_cb_table {
-+	void			*cb_next;
-+	atomic_t		refcnt;
-+	char      		cb[48];
-+};
-+
-+static DEFINE_SPINLOCK(skb_cb_store_lock);
-+
-+int skb_save_cb(struct sk_buff *skb)
-+{
-+	struct skb_cb_table *next;
-+
-+	next = kmem_cache_alloc(skbuff_cb_store_cache, GFP_ATOMIC);
-+	if (!next)
-+		return -ENOMEM;
-+
-+	BUILD_BUG_ON(sizeof(skb->cb) != sizeof(next->cb));
-+
-+	memcpy(next->cb, skb->cb, sizeof(skb->cb));
-+	next->cb_next = skb->cb_next;
-+
-+	atomic_set(&next->refcnt, 1);
-+
-+	skb->cb_next = next;
-+	return 0;
-+}
-+EXPORT_SYMBOL(skb_save_cb);
-+
-+int skb_restore_cb(struct sk_buff *skb)
-+{
-+	struct skb_cb_table *next;
-+
-+	if (!skb->cb_next)
-+		return 0;
-+
-+	next = skb->cb_next;
-+
-+	BUILD_BUG_ON(sizeof(skb->cb) != sizeof(next->cb));
-+
-+	memcpy(skb->cb, next->cb, sizeof(skb->cb));
-+	skb->cb_next = next->cb_next;
-+
-+	spin_lock(&skb_cb_store_lock);
-+
-+	if (atomic_dec_and_test(&next->refcnt)) {
-+		kmem_cache_free(skbuff_cb_store_cache, next);
-+	}
-+
-+	spin_unlock(&skb_cb_store_lock);
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL(skb_restore_cb);
-+
-+static void skb_copy_stored_cb(struct sk_buff *new, const struct sk_buff *__old)
-+{
-+	struct skb_cb_table *next;
-+	struct sk_buff *old;
-+
-+	if (!__old->cb_next) {
-+		new->cb_next = NULL;
-+		return;
-+	}
-+
-+	spin_lock(&skb_cb_store_lock);
-+
-+	old = (struct sk_buff *)__old;
-+
-+	next = old->cb_next;
-+	atomic_inc(&next->refcnt);
-+	new->cb_next = next;
-+
-+	spin_unlock(&skb_cb_store_lock);
-+}
-+#endif
- 
- /* Pipe buffer operations for a socket. */
- static const struct pipe_buf_operations sock_pipe_buf_ops = {
-@@ -398,6 +478,26 @@ static void skb_release_head_state(struc
- 		WARN_ON(in_irq());
- 		skb->destructor(skb);
- 	}
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	/* This should not happen. When it does, avoid memleak by restoring
-+	the chain of cb-backups. */
-+	while(skb->cb_next != NULL) {
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "IMQ: kfree_skb: skb->cb_next: "
-+				"%08x\n", (unsigned int)skb->cb_next);
-+
-+		skb_restore_cb(skb);
-+	}
-+	/* This should not happen either, nf_queue_entry is nullified in
-+	 * imq_dev_xmit(). If we have non-NULL nf_queue_entry then we are
-+	 * leaking entry pointers, maybe memory. We don't know if this is
-+	 * pointer to already freed memory, or should this be freed.
-+	 * If this happens we need to add refcounting, etc for nf_queue_entry.
-+	 */
-+	if (skb->nf_queue_entry && net_ratelimit())
-+		printk(KERN_WARNING
-+				"IMQ: kfree_skb: skb->nf_queue_entry != NULL");
-+#endif
- #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
- 	nf_conntrack_put(skb->nfct);
- 	nf_conntrack_put_reasm(skb->nfct_reasm);
-@@ -538,6 +638,9 @@ static void __copy_skb_header(struct sk_
- 	new->sp			= secpath_get(old->sp);
- #endif
- 	memcpy(new->cb, old->cb, sizeof(old->cb));
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	skb_copy_stored_cb(new, old);
-+#endif
- 	new->csum		= old->csum;
- 	new->local_df		= old->local_df;
- 	new->pkt_type		= old->pkt_type;
-@@ -2779,6 +2882,13 @@ void __init skb_init(void)
- 						0,
- 						SLAB_HWCACHE_ALIGN|SLAB_PANIC,
- 						NULL);
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	skbuff_cb_store_cache = kmem_cache_create("skbuff_cb_store_cache",
-+						  sizeof(struct skb_cb_table),
-+						  0,
-+						  SLAB_HWCACHE_ALIGN|SLAB_PANIC,
-+						  NULL);
-+#endif
- }
- 
- /**
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -396,6 +396,18 @@ config NETFILTER_XT_TARGET_LED
- 	  For more information on the LEDs available on your system, see
- 	  Documentation/leds-class.txt
- 
-+config NETFILTER_XT_TARGET_IMQ
-+        tristate '"IMQ" target support'
-+	depends on NETFILTER_XTABLES
-+	depends on IP_NF_MANGLE || IP6_NF_MANGLE
-+	select IMQ
-+	default m if NETFILTER_ADVANCED=n
-+        help
-+          This option adds a `IMQ' target which is used to specify if and
-+          to which imq device packets should get enqueued/dequeued.
-+
-+          To compile it as a module, choose M here.  If unsure, say N.
-+
- config NETFILTER_XT_TARGET_MARK
- 	tristate '"MARK" target support'
- 	default m if NETFILTER_ADVANCED=n
---- a/net/netfilter/Makefile
-+++ b/net/netfilter/Makefile
-@@ -46,6 +46,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_CONNMAR
- obj-$(CONFIG_NETFILTER_XT_TARGET_CONNSECMARK) += xt_CONNSECMARK.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_HL) += xt_HL.o
-+obj-$(CONFIG_NETFILTER_XT_TARGET_IMQ) += xt_IMQ.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_LED) += xt_LED.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_MARK) += xt_MARK.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_NFLOG) += xt_NFLOG.o
---- a/net/netfilter/nf_queue.c
-+++ b/net/netfilter/nf_queue.c
-@@ -20,6 +20,26 @@ static const struct nf_queue_handler *qu
- 
- static DEFINE_MUTEX(queue_handler_mutex);
- 
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+static const struct nf_queue_handler *queue_imq_handler;
-+
-+void nf_register_queue_imq_handler(const struct nf_queue_handler *qh)
-+{
-+	mutex_lock(&queue_handler_mutex);
-+	rcu_assign_pointer(queue_imq_handler, qh);
-+	mutex_unlock(&queue_handler_mutex);
-+}
-+EXPORT_SYMBOL(nf_register_queue_imq_handler);
-+
-+void nf_unregister_queue_imq_handler(void)
-+{
-+	mutex_lock(&queue_handler_mutex);
-+	rcu_assign_pointer(queue_imq_handler, NULL);
-+	mutex_unlock(&queue_handler_mutex);
-+}
-+EXPORT_SYMBOL(nf_unregister_queue_imq_handler);
-+#endif
-+
- /* return EBUSY when somebody else is registered, return EEXIST if the
-  * same handler is registered, return 0 in case of success. */
- int nf_register_queue_handler(u_int8_t pf, const struct nf_queue_handler *qh)
-@@ -80,7 +100,7 @@ void nf_unregister_queue_handlers(const
- }
- EXPORT_SYMBOL_GPL(nf_unregister_queue_handlers);
- 
--static void nf_queue_entry_release_refs(struct nf_queue_entry *entry)
-+void nf_queue_entry_release_refs(struct nf_queue_entry *entry)
- {
- 	/* Release those devices we held, or Alexey will kill me. */
- 	if (entry->indev)
-@@ -100,6 +120,7 @@ static void nf_queue_entry_release_refs(
- 	/* Drop reference to owner of hook which queued us. */
- 	module_put(entry->elem->owner);
- }
-+EXPORT_SYMBOL_GPL(nf_queue_entry_release_refs);
- 
- /*
-  * Any packet that leaves via this function must come back
-@@ -121,12 +142,26 @@ static int __nf_queue(struct sk_buff *sk
- #endif
- 	const struct nf_afinfo *afinfo;
- 	const struct nf_queue_handler *qh;
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	const struct nf_queue_handler *qih = NULL;
-+#endif
- 
- 	/* QUEUE == DROP if noone is waiting, to be safe. */
- 	rcu_read_lock();
- 
- 	qh = rcu_dereference(queue_handler[pf]);
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	if (pf == PF_INET || pf == PF_INET6)
-+#else
-+	if (pf == PF_INET)
-+#endif
-+		qih = rcu_dereference(queue_imq_handler);
-+
-+	if (!qh && !qih)
-+#else /* !IMQ */
- 	if (!qh)
-+#endif
- 		goto err_unlock;
- 
- 	afinfo = nf_get_afinfo(pf);
-@@ -145,6 +180,10 @@ static int __nf_queue(struct sk_buff *sk
- 		.indev	= indev,
- 		.outdev	= outdev,
- 		.okfn	= okfn,
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+		.next_outfn = qh ? qh->outfn : NULL,
-+		.next_queuenum = queuenum,
-+#endif
- 	};
- 
- 	/* If it's going away, ignore hook. */
-@@ -170,8 +209,19 @@ static int __nf_queue(struct sk_buff *sk
- 	}
- #endif
- 	afinfo->saveroute(skb, entry);
-+
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	if (qih) {
-+		status = qih->outfn(entry, queuenum);
-+		goto imq_skip_queue;
-+	}
-+#endif
-+
- 	status = qh->outfn(entry, queuenum);
- 
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+imq_skip_queue:
-+#endif
- 	rcu_read_unlock();
- 
- 	if (status < 0) {
---- /dev/null
-+++ b/net/netfilter/xt_IMQ.c
-@@ -0,0 +1,73 @@
-+/*
-+ * This target marks packets to be enqueued to an imq device
-+ */
-+#include <linux/module.h>
-+#include <linux/skbuff.h>
-+#include <linux/netfilter/x_tables.h>
-+#include <linux/netfilter/xt_IMQ.h>
-+#include <linux/imq.h>
-+
-+static unsigned int imq_target(struct sk_buff *pskb,
-+				const struct xt_target_param *par)
-+{
-+	const struct xt_imq_info *mr = par->targinfo;
-+
-+	pskb->imq_flags = (mr->todev & IMQ_F_IFMASK) | IMQ_F_ENQUEUE;
-+
-+	return XT_CONTINUE;
-+}
-+
-+static bool imq_checkentry(const struct xt_tgchk_param *par)
-+{
-+	struct xt_imq_info *mr = par->targinfo;
-+
-+	if (mr->todev > IMQ_MAX_DEVS - 1) {
-+		printk(KERN_WARNING
-+		       "IMQ: invalid device specified, highest is %u\n",
-+		       IMQ_MAX_DEVS - 1);
-+		return 0;
-+	}
-+
-+	return 1;
-+}
-+
-+static struct xt_target xt_imq_reg[] __read_mostly = {
-+	{
-+		.name           = "IMQ",
-+		.family		= AF_INET,
-+		.checkentry     = imq_checkentry,
-+		.target         = imq_target,
-+		.targetsize	= sizeof(struct xt_imq_info),
-+		.table		= "mangle",
-+		.me             = THIS_MODULE
-+	},
-+	{
-+		.name           = "IMQ",
-+		.family		= AF_INET6,
-+		.checkentry     = imq_checkentry,
-+		.target         = imq_target,
-+		.targetsize	= sizeof(struct xt_imq_info),
-+		.table		= "mangle",
-+		.me             = THIS_MODULE
-+	},
-+};
-+
-+static int __init imq_init(void)
-+{
-+	return xt_register_targets(xt_imq_reg, ARRAY_SIZE(xt_imq_reg));
-+}
-+
-+static void __exit imq_fini(void)
-+{
-+	xt_unregister_targets(xt_imq_reg, ARRAY_SIZE(xt_imq_reg));
-+}
-+
-+module_init(imq_init);
-+module_exit(imq_fini);
-+
-+MODULE_AUTHOR("http://www.linuximq.net");
-+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS("ipt_IMQ");
-+MODULE_ALIAS("ip6t_IMQ");
-+
diff --git a/target/linux/generic-2.6/patches-2.6.33/180-netfilter_depends.patch b/target/linux/generic-2.6/patches-2.6.33/180-netfilter_depends.patch
deleted file mode 100644
index fc00d159c..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/180-netfilter_depends.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -160,7 +160,6 @@ config NF_CONNTRACK_FTP
- 
- config NF_CONNTRACK_H323
- 	tristate "H.323 protocol support"
--	depends on (IPV6 || IPV6=n)
- 	depends on NETFILTER_ADVANCED
- 	help
- 	  H.323 is a VoIP signalling protocol from ITU-T. As one of the most
-@@ -505,7 +504,6 @@ config NETFILTER_XT_TARGET_SECMARK
- 
- config NETFILTER_XT_TARGET_TCPMSS
- 	tristate '"TCPMSS" target support'
--	depends on (IPV6 || IPV6=n)
- 	default m if NETFILTER_ADVANCED=n
- 	---help---
- 	  This option adds a `TCPMSS' target, which allows you to alter the
diff --git a/target/linux/generic-2.6/patches-2.6.33/190-netfilter_rtsp.patch b/target/linux/generic-2.6/patches-2.6.33/190-netfilter_rtsp.patch
deleted file mode 100644
index 29e82084c..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/190-netfilter_rtsp.patch
+++ /dev/null
@@ -1,1366 +0,0 @@
---- /dev/null
-+++ b/include/linux/netfilter/nf_conntrack_rtsp.h
-@@ -0,0 +1,63 @@
-+/*
-+ * RTSP extension for IP connection tracking.
-+ * (C) 2003 by Tom Marshall <tmarshall at real.com>
-+ * based on ip_conntrack_irc.h
-+ *
-+ *      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.
-+ */
-+#ifndef _IP_CONNTRACK_RTSP_H
-+#define _IP_CONNTRACK_RTSP_H
-+
-+//#define IP_NF_RTSP_DEBUG 1
-+#define IP_NF_RTSP_VERSION "0.6.21"
-+
-+#ifdef __KERNEL__
-+/* port block types */
-+typedef enum {
-+    pb_single,  /* client_port=x */
-+    pb_range,   /* client_port=x-y */
-+    pb_discon   /* client_port=x/y (rtspbis) */
-+} portblock_t;
-+
-+/* We record seq number and length of rtsp headers here, all in host order. */
-+
-+/*
-+ * This structure is per expected connection.  It is a member of struct
-+ * ip_conntrack_expect.  The TCP SEQ for the conntrack expect is stored
-+ * there and we are expected to only store the length of the data which
-+ * needs replaced.  If a packet contains multiple RTSP messages, we create
-+ * one expected connection per message.
-+ *
-+ * We use these variables to mark the entire header block.  This may seem
-+ * like overkill, but the nature of RTSP requires it.  A header may appear
-+ * multiple times in a message.  We must treat two Transport headers the
-+ * same as one Transport header with two entries.
-+ */
-+struct ip_ct_rtsp_expect
-+{
-+    u_int32_t   len;        /* length of header block */
-+    portblock_t pbtype;     /* Type of port block that was requested */
-+    u_int16_t   loport;     /* Port that was requested, low or first */
-+    u_int16_t   hiport;     /* Port that was requested, high or second */
-+#if 0
-+    uint        method;     /* RTSP method */
-+    uint        cseq;       /* CSeq from request */
-+#endif
-+};
-+
-+extern unsigned int (*nf_nat_rtsp_hook)(struct sk_buff *skb,
-+				 enum ip_conntrack_info ctinfo,
-+				 unsigned int matchoff, unsigned int matchlen,
-+				 struct ip_ct_rtsp_expect *prtspexp,
-+				 struct nf_conntrack_expect *exp);
-+
-+extern void (*nf_nat_rtsp_hook_expectfn)(struct nf_conn *ct, struct nf_conntrack_expect *exp);
-+
-+#define RTSP_PORT   554
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _IP_CONNTRACK_RTSP_H */
---- /dev/null
-+++ b/include/linux/netfilter_helpers.h
-@@ -0,0 +1,133 @@
-+/*
-+ * Helpers for netfiler modules.  This file provides implementations for basic
-+ * functions such as strncasecmp(), etc.
-+ *
-+ * gcc will warn for defined but unused functions, so we only include the
-+ * functions requested.  The following macros are used:
-+ *   NF_NEED_STRNCASECMP        nf_strncasecmp()
-+ *   NF_NEED_STRTOU16           nf_strtou16()
-+ *   NF_NEED_STRTOU32           nf_strtou32()
-+ */
-+#ifndef _NETFILTER_HELPERS_H
-+#define _NETFILTER_HELPERS_H
-+
-+/* Only include these functions for kernel code. */
-+#ifdef __KERNEL__
-+
-+#include <linux/ctype.h>
-+#define iseol(c) ( (c) == '\r' || (c) == '\n' )
-+
-+/*
-+ * The standard strncasecmp()
-+ */
-+#ifdef NF_NEED_STRNCASECMP
-+static int
-+nf_strncasecmp(const char* s1, const char* s2, u_int32_t len)
-+{
-+    if (s1 == NULL || s2 == NULL)
-+    {
-+        if (s1 == NULL && s2 == NULL)
-+        {
-+            return 0;
-+        }
-+        return (s1 == NULL) ? -1 : 1;
-+    }
-+    while (len > 0 && tolower(*s1) == tolower(*s2))
-+    {
-+        len--;
-+        s1++;
-+        s2++;
-+    }
-+    return ( (len == 0) ? 0 : (tolower(*s1) - tolower(*s2)) );
-+}
-+#endif /* NF_NEED_STRNCASECMP */
-+
-+/*
-+ * Parse a string containing a 16-bit unsigned integer.
-+ * Returns the number of chars used, or zero if no number is found.
-+ */
-+#ifdef NF_NEED_STRTOU16
-+static int
-+nf_strtou16(const char* pbuf, u_int16_t* pval)
-+{
-+    int n = 0;
-+
-+    *pval = 0;
-+    while (isdigit(pbuf[n]))
-+    {
-+        *pval = (*pval * 10) + (pbuf[n] - '0');
-+        n++;
-+    }
-+
-+    return n;
-+}
-+#endif /* NF_NEED_STRTOU16 */
-+
-+/*
-+ * Parse a string containing a 32-bit unsigned integer.
-+ * Returns the number of chars used, or zero if no number is found.
-+ */
-+#ifdef NF_NEED_STRTOU32
-+static int
-+nf_strtou32(const char* pbuf, u_int32_t* pval)
-+{
-+    int n = 0;
-+
-+    *pval = 0;
-+    while (pbuf[n] >= '0' && pbuf[n] <= '9')
-+    {
-+        *pval = (*pval * 10) + (pbuf[n] - '0');
-+        n++;
-+    }
-+
-+    return n;
-+}
-+#endif /* NF_NEED_STRTOU32 */
-+
-+/*
-+ * Given a buffer and length, advance to the next line and mark the current
-+ * line.
-+ */
-+#ifdef NF_NEED_NEXTLINE
-+static int
-+nf_nextline(char* p, uint len, uint* poff, uint* plineoff, uint* plinelen)
-+{
-+    uint    off = *poff;
-+    uint    physlen = 0;
-+
-+    if (off >= len)
-+    {
-+        return 0;
-+    }
-+
-+    while (p[off] != '\n')
-+    {
-+        if (len-off <= 1)
-+        {
-+            return 0;
-+        }
-+
-+        physlen++;
-+        off++;
-+    }
-+
-+    /* if we saw a crlf, physlen needs adjusted */
-+    if (physlen > 0 && p[off] == '\n' && p[off-1] == '\r')
-+    {
-+        physlen--;
-+    }
-+
-+    /* advance past the newline */
-+    off++;
-+
-+    *plineoff = *poff;
-+    *plinelen = physlen;
-+    *poff = off;
-+
-+    return 1;
-+}
-+#endif /* NF_NEED_NEXTLINE */
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _NETFILTER_HELPERS_H */
---- /dev/null
-+++ b/include/linux/netfilter_mime.h
-@@ -0,0 +1,89 @@
-+/*
-+ * MIME functions for netfilter modules.  This file provides implementations
-+ * for basic MIME parsing.  MIME headers are used in many protocols, such as
-+ * HTTP, RTSP, SIP, etc.
-+ *
-+ * gcc will warn for defined but unused functions, so we only include the
-+ * functions requested.  The following macros are used:
-+ *   NF_NEED_MIME_NEXTLINE      nf_mime_nextline()
-+ */
-+#ifndef _NETFILTER_MIME_H
-+#define _NETFILTER_MIME_H
-+
-+/* Only include these functions for kernel code. */
-+#ifdef __KERNEL__
-+
-+#include <linux/ctype.h>
-+
-+/*
-+ * Given a buffer and length, advance to the next line and mark the current
-+ * line.  If the current line is empty, *plinelen will be set to zero.  If
-+ * not, it will be set to the actual line length (including CRLF).
-+ *
-+ * 'line' in this context means logical line (includes LWS continuations).
-+ * Returns 1 on success, 0 on failure.
-+ */
-+#ifdef NF_NEED_MIME_NEXTLINE
-+static int
-+nf_mime_nextline(char* p, uint len, uint* poff, uint* plineoff, uint* plinelen)
-+{
-+    uint    off = *poff;
-+    uint    physlen = 0;
-+    int     is_first_line = 1;
-+
-+    if (off >= len)
-+    {
-+        return 0;
-+    }
-+
-+    do
-+    {
-+        while (p[off] != '\n')
-+        {
-+            if (len-off <= 1)
-+            {
-+                return 0;
-+            }
-+
-+            physlen++;
-+            off++;
-+        }
-+
-+        /* if we saw a crlf, physlen needs adjusted */
-+        if (physlen > 0 && p[off] == '\n' && p[off-1] == '\r')
-+        {
-+            physlen--;
-+        }
-+
-+        /* advance past the newline */
-+        off++;
-+
-+        /* check for an empty line */
-+        if (physlen == 0)
-+        {
-+            break;
-+        }
-+
-+        /* check for colon on the first physical line */
-+        if (is_first_line)
-+        {
-+            is_first_line = 0;
-+            if (memchr(p+(*poff), ':', physlen) == NULL)
-+            {
-+                return 0;
-+            }
-+        }
-+    }
-+    while (p[off] == ' ' || p[off] == '\t');
-+
-+    *plineoff = *poff;
-+    *plinelen = (physlen == 0) ? 0 : (off - *poff);
-+    *poff = off;
-+
-+    return 1;
-+}
-+#endif /* NF_NEED_MIME_NEXTLINE */
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _NETFILTER_MIME_H */
---- a/net/ipv4/netfilter/Makefile
-+++ b/net/ipv4/netfilter/Makefile
-@@ -26,6 +26,7 @@ obj-$(CONFIG_NF_NAT_AMANDA) += nf_nat_am
- obj-$(CONFIG_NF_NAT_FTP) += nf_nat_ftp.o
- obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o
- obj-$(CONFIG_NF_NAT_IRC) += nf_nat_irc.o
-+obj-$(CONFIG_NF_NAT_RTSP) += nf_nat_rtsp.o
- obj-$(CONFIG_NF_NAT_PPTP) += nf_nat_pptp.o
- obj-$(CONFIG_NF_NAT_SIP) += nf_nat_sip.o
- obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -267,6 +267,16 @@ config NF_CONNTRACK_TFTP
- 
- 	  To compile it as a module, choose M here.  If unsure, say N.
- 
-+config NF_CONNTRACK_RTSP
-+	tristate "RTSP protocol support"
-+	depends on NF_CONNTRACK
-+	help
-+		Support the RTSP protocol.  This allows UDP transports to be setup
-+		properly, including RTP and RDT.
-+
-+		If you want to compile it as a module, say 'M' here and read
-+		Documentation/modules.txt.  If unsure, say 'Y'.
-+
- config NF_CT_NETLINK
- 	tristate 'Connection tracking netlink interface'
- 	select NETFILTER_NETLINK
---- a/net/netfilter/Makefile
-+++ b/net/netfilter/Makefile
-@@ -33,6 +33,7 @@ obj-$(CONFIG_NF_CONNTRACK_PPTP) += nf_co
- obj-$(CONFIG_NF_CONNTRACK_SANE) += nf_conntrack_sane.o
- obj-$(CONFIG_NF_CONNTRACK_SIP) += nf_conntrack_sip.o
- obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_conntrack_tftp.o
-+obj-$(CONFIG_NF_CONNTRACK_RTSP) += nf_conntrack_rtsp.o
- 
- # transparent proxy support
- obj-$(CONFIG_NETFILTER_TPROXY) += nf_tproxy_core.o
---- a/net/ipv4/netfilter/Kconfig
-+++ b/net/ipv4/netfilter/Kconfig
-@@ -257,6 +257,11 @@ config NF_NAT_IRC
- 	depends on NF_CONNTRACK && NF_NAT
- 	default NF_NAT && NF_CONNTRACK_IRC
- 
-+config NF_NAT_RTSP
-+	tristate
-+ 	depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT
-+ 	default NF_NAT && NF_CONNTRACK_RTSP
-+
- config NF_NAT_TFTP
- 	tristate
- 	depends on NF_CONNTRACK && NF_NAT
---- /dev/null
-+++ b/net/netfilter/nf_conntrack_rtsp.c
-@@ -0,0 +1,517 @@
-+/*
-+ * RTSP extension for IP connection tracking
-+ * (C) 2003 by Tom Marshall <tmarshall at real.com>
-+ * based on ip_conntrack_irc.c
-+ *
-+ *      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.
-+ *
-+ * Module load syntax:
-+ *   insmod nf_conntrack_rtsp.o ports=port1,port2,...port<MAX_PORTS>
-+ *                              max_outstanding=n setup_timeout=secs
-+ *
-+ * If no ports are specified, the default will be port 554.
-+ *
-+ * With max_outstanding you can define the maximum number of not yet
-+ * answered SETUP requests per RTSP session (default 8).
-+ * With setup_timeout you can specify how long the system waits for
-+ * an expected data channel (default 300 seconds).
-+ *
-+ * 2005-02-13: Harald Welte <laforge at netfilter.org>
-+ * 	- port to 2.6
-+ * 	- update to recent post-2.6.11 api changes
-+ * 2006-09-14: Steven Van Acker <deepstar at singularity.be>
-+ *      - removed calls to NAT code from conntrack helper: NAT no longer needed to use rtsp-conntrack
-+ * 2007-04-18: Michael Guntsche <mike at it-loops.com>
-+ * 			- Port to new NF API
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/netfilter.h>
-+#include <linux/ip.h>
-+#include <linux/inet.h>
-+#include <net/tcp.h>
-+
-+#include <net/netfilter/nf_conntrack.h>
-+#include <net/netfilter/nf_conntrack_expect.h>
-+#include <net/netfilter/nf_conntrack_helper.h>
-+#include <linux/netfilter/nf_conntrack_rtsp.h>
-+
-+#define NF_NEED_STRNCASECMP
-+#define NF_NEED_STRTOU16
-+#define NF_NEED_STRTOU32
-+#define NF_NEED_NEXTLINE
-+#include <linux/netfilter_helpers.h>
-+#define NF_NEED_MIME_NEXTLINE
-+#include <linux/netfilter_mime.h>
-+
-+#include <linux/ctype.h>
-+#define MAX_SIMUL_SETUP 8 /* XXX: use max_outstanding */
-+#define INFOP(fmt, args...) printk(KERN_INFO "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#if 0
-+#define DEBUGP(fmt, args...) printk(KERN_DEBUG "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#else
-+#define DEBUGP(fmt, args...)
-+#endif
-+
-+#define MAX_PORTS 8
-+static int ports[MAX_PORTS];
-+static int num_ports = 0;
-+static int max_outstanding = 8;
-+static unsigned int setup_timeout = 300;
-+
-+MODULE_AUTHOR("Tom Marshall <tmarshall at real.com>");
-+MODULE_DESCRIPTION("RTSP connection tracking module");
-+MODULE_LICENSE("GPL");
-+module_param_array(ports, int, &num_ports, 0400);
-+MODULE_PARM_DESC(ports, "port numbers of RTSP servers");
-+module_param(max_outstanding, int, 0400);
-+MODULE_PARM_DESC(max_outstanding, "max number of outstanding SETUP requests per RTSP session");
-+module_param(setup_timeout, int, 0400);
-+MODULE_PARM_DESC(setup_timeout, "timeout on for unestablished data channels");
-+
-+static char *rtsp_buffer;
-+static DEFINE_SPINLOCK(rtsp_buffer_lock);
-+
-+unsigned int (*nf_nat_rtsp_hook)(struct sk_buff *skb,
-+				 enum ip_conntrack_info ctinfo,
-+				 unsigned int matchoff, unsigned int matchlen,struct ip_ct_rtsp_expect* prtspexp,
-+				 struct nf_conntrack_expect *exp);
-+void (*nf_nat_rtsp_hook_expectfn)(struct nf_conn *ct, struct nf_conntrack_expect *exp);
-+
-+EXPORT_SYMBOL_GPL(nf_nat_rtsp_hook);
-+
-+/*
-+ * Max mappings we will allow for one RTSP connection (for RTP, the number
-+ * of allocated ports is twice this value).  Note that SMIL burns a lot of
-+ * ports so keep this reasonably high.  If this is too low, you will see a
-+ * lot of "no free client map entries" messages.
-+ */
-+#define MAX_PORT_MAPS 16
-+
-+/*** default port list was here in the masq code: 554, 3030, 4040 ***/
-+
-+#define SKIP_WSPACE(ptr,len,off) while(off < len && isspace(*(ptr+off))) { off++; }
-+
-+/*
-+ * Parse an RTSP packet.
-+ *
-+ * Returns zero if parsing failed.
-+ *
-+ * Parameters:
-+ *  IN      ptcp        tcp data pointer
-+ *  IN      tcplen      tcp data len
-+ *  IN/OUT  ptcpoff     points to current tcp offset
-+ *  OUT     phdrsoff    set to offset of rtsp headers
-+ *  OUT     phdrslen    set to length of rtsp headers
-+ *  OUT     pcseqoff    set to offset of CSeq header
-+ *  OUT     pcseqlen    set to length of CSeq header
-+ */
-+static int
-+rtsp_parse_message(char* ptcp, uint tcplen, uint* ptcpoff,
-+                   uint* phdrsoff, uint* phdrslen,
-+                   uint* pcseqoff, uint* pcseqlen,
-+                   uint* transoff, uint* translen)
-+{
-+	uint    entitylen = 0;
-+	uint    lineoff;
-+	uint    linelen;
-+
-+	if (!nf_nextline(ptcp, tcplen, ptcpoff, &lineoff, &linelen))
-+		return 0;
-+
-+	*phdrsoff = *ptcpoff;
-+	while (nf_mime_nextline(ptcp, tcplen, ptcpoff, &lineoff, &linelen)) {
-+		if (linelen == 0) {
-+			if (entitylen > 0)
-+				*ptcpoff += min(entitylen, tcplen - *ptcpoff);
-+			break;
-+		}
-+		if (lineoff+linelen > tcplen) {
-+			INFOP("!! overrun !!\n");
-+			break;
-+		}
-+
-+		if (nf_strncasecmp(ptcp+lineoff, "CSeq:", 5) == 0) {
-+			*pcseqoff = lineoff;
-+			*pcseqlen = linelen;
-+		}
-+
-+		if (nf_strncasecmp(ptcp+lineoff, "Transport:", 10) == 0) {
-+			*transoff = lineoff;
-+			*translen = linelen;
-+		}
-+
-+		if (nf_strncasecmp(ptcp+lineoff, "Content-Length:", 15) == 0) {
-+			uint off = lineoff+15;
-+			SKIP_WSPACE(ptcp+lineoff, linelen, off);
-+			nf_strtou32(ptcp+off, &entitylen);
-+		}
-+	}
-+	*phdrslen = (*ptcpoff) - (*phdrsoff);
-+
-+	return 1;
-+}
-+
-+/*
-+ * Find lo/hi client ports (if any) in transport header
-+ * In:
-+ *   ptcp, tcplen = packet
-+ *   tranoff, tranlen = buffer to search
-+ *
-+ * Out:
-+ *   pport_lo, pport_hi = lo/hi ports (host endian)
-+ *
-+ * Returns nonzero if any client ports found
-+ *
-+ * Note: it is valid (and expected) for the client to request multiple
-+ * transports, so we need to parse the entire line.
-+ */
-+static int
-+rtsp_parse_transport(char* ptran, uint tranlen,
-+                     struct ip_ct_rtsp_expect* prtspexp)
-+{
-+	int     rc = 0;
-+	uint    off = 0;
-+
-+	if (tranlen < 10 || !iseol(ptran[tranlen-1]) ||
-+	    nf_strncasecmp(ptran, "Transport:", 10) != 0) {
-+		INFOP("sanity check failed\n");
-+		return 0;
-+	}
-+
-+	DEBUGP("tran='%.*s'\n", (int)tranlen, ptran);
-+	off += 10;
-+	SKIP_WSPACE(ptran, tranlen, off);
-+
-+	/* Transport: tran;field;field=val,tran;field;field=val,... */
-+	while (off < tranlen) {
-+		const char* pparamend;
-+		uint        nextparamoff;
-+
-+		pparamend = memchr(ptran+off, ',', tranlen-off);
-+		pparamend = (pparamend == NULL) ? ptran+tranlen : pparamend+1;
-+		nextparamoff = pparamend-ptran;
-+
-+		while (off < nextparamoff) {
-+			const char* pfieldend;
-+			uint        nextfieldoff;
-+
-+			pfieldend = memchr(ptran+off, ';', nextparamoff-off);
-+			nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
-+
-+			if (strncmp(ptran+off, "client_port=", 12) == 0) {
-+				u_int16_t   port;
-+				uint        numlen;
-+
-+				off += 12;
-+				numlen = nf_strtou16(ptran+off, &port);
-+				off += numlen;
-+				if (prtspexp->loport != 0 && prtspexp->loport != port)
-+					DEBUGP("multiple ports found, port %hu ignored\n", port);
-+				else {
-+					DEBUGP("lo port found : %hu\n", port);
-+					prtspexp->loport = prtspexp->hiport = port;
-+					if (ptran[off] == '-') {
-+						off++;
-+						numlen = nf_strtou16(ptran+off, &port);
-+						off += numlen;
-+						prtspexp->pbtype = pb_range;
-+						prtspexp->hiport = port;
-+
-+						// If we have a range, assume rtp:
-+						// loport must be even, hiport must be loport+1
-+						if ((prtspexp->loport & 0x0001) != 0 ||
-+						    prtspexp->hiport != prtspexp->loport+1) {
-+							DEBUGP("incorrect range: %hu-%hu, correcting\n",
-+							       prtspexp->loport, prtspexp->hiport);
-+							prtspexp->loport &= 0xfffe;
-+							prtspexp->hiport = prtspexp->loport+1;
-+						}
-+					} else if (ptran[off] == '/') {
-+						off++;
-+						numlen = nf_strtou16(ptran+off, &port);
-+						off += numlen;
-+						prtspexp->pbtype = pb_discon;
-+						prtspexp->hiport = port;
-+					}
-+					rc = 1;
-+				}
-+			}
-+
-+			/*
-+			 * Note we don't look for the destination parameter here.
-+			 * If we are using NAT, the NAT module will handle it.  If not,
-+			 * and the client is sending packets elsewhere, the expectation
-+			 * will quietly time out.
-+			 */
-+
-+			off = nextfieldoff;
-+		}
-+
-+		off = nextparamoff;
-+	}
-+
-+	return rc;
-+}
-+
-+void expected(struct nf_conn *ct, struct nf_conntrack_expect *exp)
-+{
-+    if(nf_nat_rtsp_hook_expectfn) {
-+        nf_nat_rtsp_hook_expectfn(ct,exp);
-+    }
-+}
-+
-+/*** conntrack functions ***/
-+
-+/* outbound packet: client->server */
-+
-+static inline int
-+help_out(struct sk_buff *skb, unsigned char *rb_ptr, unsigned int datalen,
-+                struct nf_conn *ct, enum ip_conntrack_info ctinfo)
-+{
-+	struct ip_ct_rtsp_expect expinfo;
-+
-+	int dir = CTINFO2DIR(ctinfo);   /* = IP_CT_DIR_ORIGINAL */
-+	//struct  tcphdr* tcph = (void*)iph + iph->ihl * 4;
-+	//uint    tcplen = pktlen - iph->ihl * 4;
-+	char*   pdata = rb_ptr;
-+	//uint    datalen = tcplen - tcph->doff * 4;
-+	uint    dataoff = 0;
-+	int ret = NF_ACCEPT;
-+
-+	struct nf_conntrack_expect *exp;
-+
-+	__be16 be_loport;
-+
-+	memset(&expinfo, 0, sizeof(expinfo));
-+
-+	while (dataoff < datalen) {
-+		uint    cmdoff = dataoff;
-+		uint    hdrsoff = 0;
-+		uint    hdrslen = 0;
-+		uint    cseqoff = 0;
-+		uint    cseqlen = 0;
-+		uint    transoff = 0;
-+		uint    translen = 0;
-+		uint    off;
-+
-+		if (!rtsp_parse_message(pdata, datalen, &dataoff,
-+					&hdrsoff, &hdrslen,
-+					&cseqoff, &cseqlen,
-+					&transoff, &translen))
-+			break;      /* not a valid message */
-+
-+		if (strncmp(pdata+cmdoff, "SETUP ", 6) != 0)
-+			continue;   /* not a SETUP message */
-+		DEBUGP("found a setup message\n");
-+
-+		off = 0;
-+		if(translen) {
-+			rtsp_parse_transport(pdata+transoff, translen, &expinfo);
-+		}
-+
-+		if (expinfo.loport == 0) {
-+			DEBUGP("no udp transports found\n");
-+			continue;   /* no udp transports found */
-+		}
-+
-+		DEBUGP("udp transport found, ports=(%d,%hu,%hu)\n",
-+		       (int)expinfo.pbtype, expinfo.loport, expinfo.hiport);
-+
-+		exp = nf_ct_expect_alloc(ct);
-+		if (!exp) {
-+			ret = NF_DROP;
-+			goto out;
-+		}
-+
-+		be_loport = htons(expinfo.loport);
-+
-+		nf_ct_expect_init(exp, NF_CT_EXPECT_CLASS_DEFAULT,
-+			ct->tuplehash[!dir].tuple.src.l3num,
-+			&ct->tuplehash[!dir].tuple.src.u3, &ct->tuplehash[!dir].tuple.dst.u3,
-+			IPPROTO_UDP, NULL, &be_loport);
-+
-+		exp->master = ct;
-+
-+		exp->expectfn = expected;
-+		exp->flags = 0;
-+
-+		if (expinfo.pbtype == pb_range) {
-+			DEBUGP("Changing expectation mask to handle multiple ports\n");
-+			exp->mask.src.u.udp.port  = 0xfffe;
-+		}
-+
-+		DEBUGP("expect_related %u.%u.%u.%u:%u-%u.%u.%u.%u:%u\n",
-+		       NIPQUAD(exp->tuple.src.u3.ip),
-+		       ntohs(exp->tuple.src.u.udp.port),
-+		       NIPQUAD(exp->tuple.dst.u3.ip),
-+		       ntohs(exp->tuple.dst.u.udp.port));
-+
-+		if (nf_nat_rtsp_hook)
-+			/* pass the request off to the nat helper */
-+			ret = nf_nat_rtsp_hook(skb, ctinfo, hdrsoff, hdrslen, &expinfo, exp);
-+		else if (nf_ct_expect_related(exp) != 0) {
-+			INFOP("nf_ct_expect_related failed\n");
-+			ret  = NF_DROP;
-+		}
-+		nf_ct_expect_put(exp);
-+		goto out;
-+	}
-+out:
-+
-+	return ret;
-+}
-+
-+
-+static inline int
-+help_in(struct sk_buff *skb, size_t pktlen,
-+ struct nf_conn* ct, enum ip_conntrack_info ctinfo)
-+{
-+ return NF_ACCEPT;
-+}
-+
-+static int help(struct sk_buff *skb, unsigned int protoff,
-+		struct nf_conn *ct, enum ip_conntrack_info ctinfo)
-+{
-+	struct tcphdr _tcph, *th;
-+	unsigned int dataoff, datalen;
-+	char *rb_ptr;
-+	int ret = NF_DROP;
-+
-+	/* Until there's been traffic both ways, don't look in packets. */
-+	if (ctinfo != IP_CT_ESTABLISHED &&
-+	    ctinfo != IP_CT_ESTABLISHED + IP_CT_IS_REPLY) {
-+		DEBUGP("conntrackinfo = %u\n", ctinfo);
-+		return NF_ACCEPT;
-+	}
-+
-+	/* Not whole TCP header? */
-+	th = skb_header_pointer(skb, protoff, sizeof(_tcph), &_tcph);
-+
-+	if (!th)
-+		return NF_ACCEPT;
-+
-+	/* No data ? */
-+	dataoff = protoff + th->doff*4;
-+	datalen = skb->len - dataoff;
-+	if (dataoff >= skb->len)
-+		return NF_ACCEPT;
-+
-+	spin_lock_bh(&rtsp_buffer_lock);
-+	rb_ptr = skb_header_pointer(skb, dataoff,
-+				    skb->len - dataoff, rtsp_buffer);
-+	BUG_ON(rb_ptr == NULL);
-+
-+#if 0
-+	/* Checksum invalid?  Ignore. */
-+	/* FIXME: Source route IP option packets --RR */
-+	if (tcp_v4_check(tcph, tcplen, iph->saddr, iph->daddr,
-+			 csum_partial((char*)tcph, tcplen, 0)))
-+	{
-+		DEBUGP("bad csum: %p %u %u.%u.%u.%u %u.%u.%u.%u\n",
-+		       tcph, tcplen, NIPQUAD(iph->saddr), NIPQUAD(iph->daddr));
-+		return NF_ACCEPT;
-+	}
-+#endif
-+
-+	switch (CTINFO2DIR(ctinfo)) {
-+	case IP_CT_DIR_ORIGINAL:
-+		ret = help_out(skb, rb_ptr, datalen, ct, ctinfo);
-+		break;
-+	case IP_CT_DIR_REPLY:
-+		DEBUGP("IP_CT_DIR_REPLY\n");
-+		/* inbound packet: server->client */
-+		ret = NF_ACCEPT;
-+		break;
-+	}
-+
-+	spin_unlock_bh(&rtsp_buffer_lock);
-+
-+	return ret;
-+}
-+
-+static struct nf_conntrack_helper rtsp_helpers[MAX_PORTS];
-+static char rtsp_names[MAX_PORTS][10];
-+static struct nf_conntrack_expect_policy rtsp_expect_policy;
-+
-+/* This function is intentionally _NOT_ defined as __exit */
-+static void
-+fini(void)
-+{
-+	int i;
-+	for (i = 0; i < num_ports; i++) {
-+		DEBUGP("unregistering port %d\n", ports[i]);
-+		nf_conntrack_helper_unregister(&rtsp_helpers[i]);
-+	}
-+	kfree(rtsp_buffer);
-+}
-+
-+static int __init
-+init(void)
-+{
-+	int i, ret;
-+	struct nf_conntrack_helper *hlpr;
-+	char *tmpname;
-+
-+	printk("nf_conntrack_rtsp v" IP_NF_RTSP_VERSION " loading\n");
-+
-+	if (max_outstanding < 1) {
-+		printk("nf_conntrack_rtsp: max_outstanding must be a positive integer\n");
-+		return -EBUSY;
-+	}
-+	if (setup_timeout < 0) {
-+		printk("nf_conntrack_rtsp: setup_timeout must be a positive integer\n");
-+		return -EBUSY;
-+	}
-+
-+	rtsp_expect_policy.max_expected = max_outstanding;
-+	rtsp_expect_policy.timeout = setup_timeout;
-+
-+	rtsp_buffer = kmalloc(65536, GFP_KERNEL);
-+	if (!rtsp_buffer)
-+		return -ENOMEM;
-+
-+	/* If no port given, default to standard rtsp port */
-+	if (ports[0] == 0) {
-+		ports[0] = RTSP_PORT;
-+	}
-+
-+	for (i = 0; (i < MAX_PORTS) && ports[i]; i++) {
-+		hlpr = &rtsp_helpers[i];
-+		memset(hlpr, 0, sizeof(struct nf_conntrack_helper));
-+		hlpr->tuple.src.u.tcp.port = htons(ports[i]);
-+		hlpr->tuple.dst.protonum = IPPROTO_TCP;
-+		hlpr->expect_policy = &rtsp_expect_policy;
-+		hlpr->me = THIS_MODULE;
-+		hlpr->help = help;
-+
-+		tmpname = &rtsp_names[i][0];
-+		if (ports[i] == RTSP_PORT) {
-+			sprintf(tmpname, "rtsp");
-+		} else {
-+			sprintf(tmpname, "rtsp-%d", i);
-+		}
-+		hlpr->name = tmpname;
-+
-+		DEBUGP("port #%d: %d\n", i, ports[i]);
-+
-+		ret = nf_conntrack_helper_register(hlpr);
-+
-+		if (ret) {
-+			printk("nf_conntrack_rtsp: ERROR registering port %d\n", ports[i]);
-+			fini();
-+			return -EBUSY;
-+		}
-+		num_ports++;
-+	}
-+	return 0;
-+}
-+
-+module_init(init);
-+module_exit(fini);
-+
-+EXPORT_SYMBOL(nf_nat_rtsp_hook_expectfn);
-+
---- /dev/null
-+++ b/net/ipv4/netfilter/nf_nat_rtsp.c
-@@ -0,0 +1,496 @@
-+/*
-+ * RTSP extension for TCP NAT alteration
-+ * (C) 2003 by Tom Marshall <tmarshall at real.com>
-+ * based on ip_nat_irc.c
-+ *
-+ *      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.
-+ *
-+ * Module load syntax:
-+ *      insmod nf_nat_rtsp.o ports=port1,port2,...port<MAX_PORTS>
-+ *                           stunaddr=<address>
-+ *                           destaction=[auto|strip|none]
-+ *
-+ * If no ports are specified, the default will be port 554 only.
-+ *
-+ * stunaddr specifies the address used to detect that a client is using STUN.
-+ * If this address is seen in the destination parameter, it is assumed that
-+ * the client has already punched a UDP hole in the firewall, so we don't
-+ * mangle the client_port.  If none is specified, it is autodetected.  It
-+ * only needs to be set if you have multiple levels of NAT.  It should be
-+ * set to the external address that the STUN clients detect.  Note that in
-+ * this case, it will not be possible for clients to use UDP with servers
-+ * between the NATs.
-+ *
-+ * If no destaction is specified, auto is used.
-+ *   destaction=auto:  strip destination parameter if it is not stunaddr.
-+ *   destaction=strip: always strip destination parameter (not recommended).
-+ *   destaction=none:  do not touch destination parameter (not recommended).
-+ */
-+
-+#include <linux/module.h>
-+#include <net/tcp.h>
-+#include <net/netfilter/nf_nat_helper.h>
-+#include <net/netfilter/nf_nat_rule.h>
-+#include <linux/netfilter/nf_conntrack_rtsp.h>
-+#include <net/netfilter/nf_conntrack_expect.h>
-+
-+#include <linux/inet.h>
-+#include <linux/ctype.h>
-+#define NF_NEED_STRNCASECMP
-+#define NF_NEED_STRTOU16
-+#include <linux/netfilter_helpers.h>
-+#define NF_NEED_MIME_NEXTLINE
-+#include <linux/netfilter_mime.h>
-+
-+#define INFOP(fmt, args...) printk(KERN_INFO "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#if 0
-+#define DEBUGP(fmt, args...) printk(KERN_DEBUG "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#else
-+#define DEBUGP(fmt, args...)
-+#endif
-+
-+#define MAX_PORTS       8
-+#define DSTACT_AUTO     0
-+#define DSTACT_STRIP    1
-+#define DSTACT_NONE     2
-+
-+static char*    stunaddr = NULL;
-+static char*    destaction = NULL;
-+
-+static u_int32_t extip = 0;
-+static int       dstact = 0;
-+
-+MODULE_AUTHOR("Tom Marshall <tmarshall at real.com>");
-+MODULE_DESCRIPTION("RTSP network address translation module");
-+MODULE_LICENSE("GPL");
-+module_param(stunaddr, charp, 0644);
-+MODULE_PARM_DESC(stunaddr, "Address for detecting STUN");
-+module_param(destaction, charp, 0644);
-+MODULE_PARM_DESC(destaction, "Action for destination parameter (auto/strip/none)");
-+
-+#define SKIP_WSPACE(ptr,len,off) while(off < len && isspace(*(ptr+off))) { off++; }
-+
-+/*** helper functions ***/
-+
-+static void
-+get_skb_tcpdata(struct sk_buff* skb, char** pptcpdata, uint* ptcpdatalen)
-+{
-+    struct iphdr*   iph  = ip_hdr(skb);
-+    struct tcphdr*  tcph = (void *)iph + ip_hdrlen(skb);
-+
-+    *pptcpdata = (char*)tcph +  tcph->doff*4;
-+    *ptcpdatalen = ((char*)skb_transport_header(skb) + skb->len) - *pptcpdata;
-+}
-+
-+/*** nat functions ***/
-+
-+/*
-+ * Mangle the "Transport:" header:
-+ *   - Replace all occurences of "client_port=<spec>"
-+ *   - Handle destination parameter
-+ *
-+ * In:
-+ *   ct, ctinfo = conntrack context
-+ *   skb        = packet
-+ *   tranoff    = Transport header offset from TCP data
-+ *   tranlen    = Transport header length (incl. CRLF)
-+ *   rport_lo   = replacement low  port (host endian)
-+ *   rport_hi   = replacement high port (host endian)
-+ *
-+ * Returns packet size difference.
-+ *
-+ * Assumes that a complete transport header is present, ending with CR or LF
-+ */
-+static int
-+rtsp_mangle_tran(enum ip_conntrack_info ctinfo,
-+                 struct nf_conntrack_expect* exp,
-+								 struct ip_ct_rtsp_expect* prtspexp,
-+                 struct sk_buff* skb, uint tranoff, uint tranlen)
-+{
-+    char*       ptcp;
-+    uint        tcplen;
-+    char*       ptran;
-+    char        rbuf1[16];      /* Replacement buffer (one port) */
-+    uint        rbuf1len;       /* Replacement len (one port) */
-+    char        rbufa[16];      /* Replacement buffer (all ports) */
-+    uint        rbufalen;       /* Replacement len (all ports) */
-+    u_int32_t   newip;
-+    u_int16_t   loport, hiport;
-+    uint        off = 0;
-+    uint        diff;           /* Number of bytes we removed */
-+
-+    struct nf_conn *ct = exp->master;
-+    struct nf_conntrack_tuple *t;
-+
-+    char    szextaddr[15+1];
-+    uint    extaddrlen;
-+    int     is_stun;
-+
-+    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+    ptran = ptcp+tranoff;
-+
-+    if (tranoff+tranlen > tcplen || tcplen-tranoff < tranlen ||
-+        tranlen < 10 || !iseol(ptran[tranlen-1]) ||
-+        nf_strncasecmp(ptran, "Transport:", 10) != 0)
-+    {
-+        INFOP("sanity check failed\n");
-+        return 0;
-+    }
-+    off += 10;
-+    SKIP_WSPACE(ptcp+tranoff, tranlen, off);
-+
-+    newip = ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip;
-+    t = &exp->tuple;
-+    t->dst.u3.ip = newip;
-+
-+    extaddrlen = extip ? sprintf(szextaddr, "%u.%u.%u.%u", NIPQUAD(extip))
-+                       : sprintf(szextaddr, "%u.%u.%u.%u", NIPQUAD(newip));
-+    DEBUGP("stunaddr=%s (%s)\n", szextaddr, (extip?"forced":"auto"));
-+
-+    rbuf1len = rbufalen = 0;
-+    switch (prtspexp->pbtype)
-+    {
-+    case pb_single:
-+        for (loport = prtspexp->loport; loport != 0; loport++) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(loport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                DEBUGP("using port %hu\n", loport);
-+                break;
-+            }
-+        }
-+        if (loport != 0)
-+        {
-+            rbuf1len = sprintf(rbuf1, "%hu", loport);
-+            rbufalen = sprintf(rbufa, "%hu", loport);
-+        }
-+        break;
-+    case pb_range:
-+        for (loport = prtspexp->loport; loport != 0; loport += 2) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(loport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                hiport = loport + ~exp->mask.src.u.udp.port;
-+                DEBUGP("using ports %hu-%hu\n", loport, hiport);
-+                break;
-+            }
-+        }
-+        if (loport != 0)
-+        {
-+            rbuf1len = sprintf(rbuf1, "%hu", loport);
-+            rbufalen = sprintf(rbufa, "%hu-%hu", loport, loport+1);
-+        }
-+        break;
-+    case pb_discon:
-+        for (loport = prtspexp->loport; loport != 0; loport++) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(loport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                DEBUGP("using port %hu (1 of 2)\n", loport);
-+                break;
-+            }
-+        }
-+        for (hiport = prtspexp->hiport; hiport != 0; hiport++) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(hiport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                DEBUGP("using port %hu (2 of 2)\n", hiport);
-+                break;
-+            }
-+        }
-+        if (loport != 0 && hiport != 0)
-+        {
-+            rbuf1len = sprintf(rbuf1, "%hu", loport);
-+            if (hiport == loport+1)
-+            {
-+                rbufalen = sprintf(rbufa, "%hu-%hu", loport, hiport);
-+            }
-+            else
-+            {
-+                rbufalen = sprintf(rbufa, "%hu/%hu", loport, hiport);
-+            }
-+        }
-+        break;
-+    }
-+
-+    if (rbuf1len == 0)
-+    {
-+        return 0;   /* cannot get replacement port(s) */
-+    }
-+
-+    /* Transport: tran;field;field=val,tran;field;field=val,... */
-+    while (off < tranlen)
-+    {
-+        uint        saveoff;
-+        const char* pparamend;
-+        uint        nextparamoff;
-+
-+        pparamend = memchr(ptran+off, ',', tranlen-off);
-+        pparamend = (pparamend == NULL) ? ptran+tranlen : pparamend+1;
-+        nextparamoff = pparamend-ptcp;
-+
-+        /*
-+         * We pass over each param twice.  On the first pass, we look for a
-+         * destination= field.  It is handled by the security policy.  If it
-+         * is present, allowed, and equal to our external address, we assume
-+         * that STUN is being used and we leave the client_port= field alone.
-+         */
-+        is_stun = 0;
-+        saveoff = off;
-+        while (off < nextparamoff)
-+        {
-+            const char* pfieldend;
-+            uint        nextfieldoff;
-+
-+            pfieldend = memchr(ptran+off, ';', nextparamoff-off);
-+            nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
-+
-+            if (dstact != DSTACT_NONE && strncmp(ptran+off, "destination=", 12) == 0)
-+            {
-+                if (strncmp(ptran+off+12, szextaddr, extaddrlen) == 0)
-+                {
-+                    is_stun = 1;
-+                }
-+                if (dstact == DSTACT_STRIP || (dstact == DSTACT_AUTO && !is_stun))
-+                {
-+                    diff = nextfieldoff-off;
-+                    if (!nf_nat_mangle_tcp_packet(skb, ct, ctinfo,
-+                                                         off, diff, NULL, 0))
-+                    {
-+                        /* mangle failed, all we can do is bail */
-+			nf_ct_unexpect_related(exp);
-+                        return 0;
-+                    }
-+                    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+                    ptran = ptcp+tranoff;
-+                    tranlen -= diff;
-+                    nextparamoff -= diff;
-+                    nextfieldoff -= diff;
-+                }
-+            }
-+
-+            off = nextfieldoff;
-+        }
-+        if (is_stun)
-+        {
-+            continue;
-+        }
-+        off = saveoff;
-+        while (off < nextparamoff)
-+        {
-+            const char* pfieldend;
-+            uint        nextfieldoff;
-+
-+            pfieldend = memchr(ptran+off, ';', nextparamoff-off);
-+            nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
-+
-+            if (strncmp(ptran+off, "client_port=", 12) == 0)
-+            {
-+                u_int16_t   port;
-+                uint        numlen;
-+                uint        origoff;
-+                uint        origlen;
-+                char*       rbuf    = rbuf1;
-+                uint        rbuflen = rbuf1len;
-+
-+                off += 12;
-+                origoff = (ptran-ptcp)+off;
-+                origlen = 0;
-+                numlen = nf_strtou16(ptran+off, &port);
-+                off += numlen;
-+                origlen += numlen;
-+                if (port != prtspexp->loport)
-+                {
-+                    DEBUGP("multiple ports found, port %hu ignored\n", port);
-+                }
-+                else
-+                {
-+                    if (ptran[off] == '-' || ptran[off] == '/')
-+                    {
-+                        off++;
-+                        origlen++;
-+                        numlen = nf_strtou16(ptran+off, &port);
-+                        off += numlen;
-+                        origlen += numlen;
-+                        rbuf = rbufa;
-+                        rbuflen = rbufalen;
-+                    }
-+
-+                    /*
-+                     * note we cannot just memcpy() if the sizes are the same.
-+                     * the mangle function does skb resizing, checks for a
-+                     * cloned skb, and updates the checksums.
-+                     *
-+                     * parameter 4 below is offset from start of tcp data.
-+                     */
-+                    diff = origlen-rbuflen;
-+                    if (!nf_nat_mangle_tcp_packet(skb, ct, ctinfo,
-+                                              origoff, origlen, rbuf, rbuflen))
-+                    {
-+                        /* mangle failed, all we can do is bail */
-+			nf_ct_unexpect_related(exp);
-+                        return 0;
-+                    }
-+                    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+                    ptran = ptcp+tranoff;
-+                    tranlen -= diff;
-+                    nextparamoff -= diff;
-+                    nextfieldoff -= diff;
-+                }
-+            }
-+
-+            off = nextfieldoff;
-+        }
-+
-+        off = nextparamoff;
-+    }
-+
-+    return 1;
-+}
-+
-+static uint
-+help_out(struct sk_buff *skb, enum ip_conntrack_info ctinfo,
-+	 unsigned int matchoff, unsigned int matchlen, struct ip_ct_rtsp_expect* prtspexp,
-+	 struct nf_conntrack_expect* exp)
-+{
-+    char*   ptcp;
-+    uint    tcplen;
-+    uint    hdrsoff;
-+    uint    hdrslen;
-+    uint    lineoff;
-+    uint    linelen;
-+    uint    off;
-+
-+    //struct iphdr* iph = (struct iphdr*)skb->nh.iph;
-+    //struct tcphdr* tcph = (struct tcphdr*)((void*)iph + iph->ihl*4);
-+
-+    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+    hdrsoff = matchoff;//exp->seq - ntohl(tcph->seq);
-+    hdrslen = matchlen;
-+    off = hdrsoff;
-+    DEBUGP("NAT rtsp help_out\n");
-+
-+    while (nf_mime_nextline(ptcp, hdrsoff+hdrslen, &off, &lineoff, &linelen))
-+    {
-+        if (linelen == 0)
-+        {
-+            break;
-+        }
-+        if (off > hdrsoff+hdrslen)
-+        {
-+            INFOP("!! overrun !!");
-+            break;
-+        }
-+        DEBUGP("hdr: len=%u, %.*s", linelen, (int)linelen, ptcp+lineoff);
-+
-+        if (nf_strncasecmp(ptcp+lineoff, "Transport:", 10) == 0)
-+        {
-+            uint oldtcplen = tcplen;
-+	    DEBUGP("hdr: Transport\n");
-+            if (!rtsp_mangle_tran(ctinfo, exp, prtspexp, skb, lineoff, linelen))
-+            {
-+		DEBUGP("hdr: Transport mangle failed");
-+                break;
-+            }
-+            get_skb_tcpdata(skb, &ptcp, &tcplen);
-+            hdrslen -= (oldtcplen-tcplen);
-+            off -= (oldtcplen-tcplen);
-+            lineoff -= (oldtcplen-tcplen);
-+            linelen -= (oldtcplen-tcplen);
-+            DEBUGP("rep: len=%u, %.*s", linelen, (int)linelen, ptcp+lineoff);
-+        }
-+    }
-+
-+    return NF_ACCEPT;
-+}
-+
-+static unsigned int
-+help(struct sk_buff *skb, enum ip_conntrack_info ctinfo,
-+     unsigned int matchoff, unsigned int matchlen, struct ip_ct_rtsp_expect* prtspexp,
-+     struct nf_conntrack_expect* exp)
-+{
-+    int dir = CTINFO2DIR(ctinfo);
-+    int rc = NF_ACCEPT;
-+
-+    switch (dir)
-+    {
-+    case IP_CT_DIR_ORIGINAL:
-+        rc = help_out(skb, ctinfo, matchoff, matchlen, prtspexp, exp);
-+        break;
-+    case IP_CT_DIR_REPLY:
-+	DEBUGP("unmangle ! %u\n", ctinfo);
-+    	/* XXX: unmangle */
-+	rc = NF_ACCEPT;
-+        break;
-+    }
-+    //UNLOCK_BH(&ip_rtsp_lock);
-+
-+    return rc;
-+}
-+
-+static void expected(struct nf_conn* ct, struct nf_conntrack_expect *exp)
-+{
-+    struct nf_nat_multi_range_compat mr;
-+    u_int32_t newdstip, newsrcip, newip;
-+
-+    struct nf_conn *master = ct->master;
-+
-+    newdstip = master->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
-+    newsrcip = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
-+    //FIXME (how to port that ?)
-+    //code from 2.4 : newip = (HOOK2MANIP(hooknum) == IP_NAT_MANIP_SRC) ? newsrcip : newdstip;
-+    newip = newdstip;
-+
-+    DEBUGP("newsrcip=%u.%u.%u.%u, newdstip=%u.%u.%u.%u, newip=%u.%u.%u.%u\n",
-+           NIPQUAD(newsrcip), NIPQUAD(newdstip), NIPQUAD(newip));
-+
-+    mr.rangesize = 1;
-+    // We don't want to manip the per-protocol, just the IPs.
-+    mr.range[0].flags = IP_NAT_RANGE_MAP_IPS;
-+    mr.range[0].min_ip = mr.range[0].max_ip = newip;
-+
-+    nf_nat_setup_info(ct, &mr.range[0], IP_NAT_MANIP_DST);
-+}
-+
-+
-+static void __exit fini(void)
-+{
-+	nf_nat_rtsp_hook = NULL;
-+        nf_nat_rtsp_hook_expectfn = NULL;
-+	synchronize_net();
-+}
-+
-+static int __init init(void)
-+{
-+	printk("nf_nat_rtsp v" IP_NF_RTSP_VERSION " loading\n");
-+
-+	BUG_ON(nf_nat_rtsp_hook);
-+	nf_nat_rtsp_hook = help;
-+        nf_nat_rtsp_hook_expectfn = &expected;
-+
-+	if (stunaddr != NULL)
-+		extip = in_aton(stunaddr);
-+
-+	if (destaction != NULL) {
-+	        if (strcmp(destaction, "auto") == 0)
-+			dstact = DSTACT_AUTO;
-+
-+		if (strcmp(destaction, "strip") == 0)
-+			dstact = DSTACT_STRIP;
-+
-+		if (strcmp(destaction, "none") == 0)
-+			dstact = DSTACT_NONE;
-+	}
-+
-+	return 0;
-+}
-+
-+module_init(init);
-+module_exit(fini);
diff --git a/target/linux/generic-2.6/patches-2.6.33/200-sched_esfq.patch b/target/linux/generic-2.6/patches-2.6.33/200-sched_esfq.patch
deleted file mode 100644
index 1d513580b..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/200-sched_esfq.patch
+++ /dev/null
@@ -1,795 +0,0 @@
---- a/include/linux/pkt_sched.h
-+++ b/include/linux/pkt_sched.h
-@@ -173,8 +173,37 @@ struct tc_sfq_xstats {
-  *
-  *	The only reason for this is efficiency, it is possible
-  *	to change these parameters in compile time.
-+ *
-+ *	If you need to play with these values, use esfq instead.
-  */
- 
-+/* ESFQ section */
-+
-+enum
-+{
-+        /* traditional */
-+	TCA_SFQ_HASH_CLASSIC,
-+	TCA_SFQ_HASH_DST,
-+	TCA_SFQ_HASH_SRC,
-+	TCA_SFQ_HASH_FWMARK,
-+	/* conntrack */
-+	TCA_SFQ_HASH_CTORIGDST,
-+	TCA_SFQ_HASH_CTORIGSRC,
-+	TCA_SFQ_HASH_CTREPLDST,
-+	TCA_SFQ_HASH_CTREPLSRC,
-+	TCA_SFQ_HASH_CTNATCHG,
-+};
-+
-+struct tc_esfq_qopt
-+{
-+	unsigned	quantum;	/* Bytes per round allocated to flow */
-+	int		perturb_period;	/* Period of hash perturbation */
-+	__u32		limit;		/* Maximal packets in queue */
-+	unsigned	divisor;	/* Hash divisor  */
-+	unsigned	flows;		/* Maximal number of flows  */
-+	unsigned	hash_kind;	/* Hash function to use for flow identification */
-+};
-+
- /* RED section */
- 
- enum {
---- a/net/sched/Kconfig
-+++ b/net/sched/Kconfig
-@@ -137,6 +137,37 @@ config NET_SCH_SFQ
- 	  To compile this code as a module, choose M here: the
- 	  module will be called sch_sfq.
- 
-+config NET_SCH_ESFQ
-+	tristate "Enhanced Stochastic Fairness Queueing (ESFQ)"
-+	---help---
-+	  Say Y here if you want to use the Enhanced Stochastic Fairness
-+	  Queueing (ESFQ) packet scheduling algorithm for some of your network
-+	  devices or as a leaf discipline for a classful qdisc such as HTB or
-+	  CBQ (see the top of <file:net/sched/sch_esfq.c> for details and
-+	  references to the SFQ algorithm).
-+
-+	  This is an enchanced SFQ version which allows you to control some
-+	  hardcoded values in the SFQ scheduler.
-+
-+	  ESFQ also adds control of the hash function used to identify packet
-+	  flows. The original SFQ discipline hashes by connection; ESFQ add
-+	  several other hashing methods, such as by src IP or by dst IP, which
-+	  can be more fair to users in some networking situations.
-+
-+	  To compile this code as a module, choose M here: the
-+	  module will be called sch_esfq.
-+
-+config NET_SCH_ESFQ_NFCT
-+	bool "Connection Tracking Hash Types"
-+	depends on NET_SCH_ESFQ && NF_CONNTRACK
-+	---help---
-+	  Say Y here to enable support for hashing based on netfilter connection
-+	  tracking information. This is useful for a router that is also using
-+	  NAT to connect privately-addressed hosts to the Internet. If you want
-+	  to provide fair distribution of upstream bandwidth, ESFQ must use
-+	  connection tracking information, since all outgoing packets will share
-+	  the same source address.
-+
- config NET_SCH_TEQL
- 	tristate "True Link Equalizer (TEQL)"
- 	---help---
---- a/net/sched/Makefile
-+++ b/net/sched/Makefile
-@@ -24,6 +24,7 @@ obj-$(CONFIG_NET_SCH_GRED)	+= sch_gred.o
- obj-$(CONFIG_NET_SCH_INGRESS)	+= sch_ingress.o 
- obj-$(CONFIG_NET_SCH_DSMARK)	+= sch_dsmark.o
- obj-$(CONFIG_NET_SCH_SFQ)	+= sch_sfq.o
-+obj-$(CONFIG_NET_SCH_ESFQ)	+= sch_esfq.o
- obj-$(CONFIG_NET_SCH_TBF)	+= sch_tbf.o
- obj-$(CONFIG_NET_SCH_TEQL)	+= sch_teql.o
- obj-$(CONFIG_NET_SCH_PRIO)	+= sch_prio.o
---- /dev/null
-+++ b/net/sched/sch_esfq.c
-@@ -0,0 +1,702 @@
-+/*
-+ * net/sched/sch_esfq.c	Extended Stochastic Fairness Queueing discipline.
-+ *
-+ *		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.
-+ *
-+ * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
-+ *
-+ * Changes:	Alexander Atanasov, <alex@ssi.bg>
-+ *		Added dynamic depth,limit,divisor,hash_kind options.
-+ *		Added dst and src hashes.
-+ *
-+ * 		Alexander Clouter, <alex@digriz.org.uk>
-+ *		Ported ESFQ to Linux 2.6.
-+ *
-+ * 		Corey Hickey, <bugfood-c@fatooh.org>
-+ *		Maintenance of the Linux 2.6 port.
-+ *		Added fwmark hash (thanks to Robert Kurjata).
-+ *		Added usage of jhash.
-+ *		Added conntrack support.
-+ *		Added ctnatchg hash (thanks to Ben Pfountz).
-+ */
-+
-+#include <linux/module.h>
-+#include <asm/uaccess.h>
-+#include <asm/system.h>
-+#include <linux/bitops.h>
-+#include <linux/types.h>
-+#include <linux/kernel.h>
-+#include <linux/jiffies.h>
-+#include <linux/string.h>
-+#include <linux/mm.h>
-+#include <linux/socket.h>
-+#include <linux/sockios.h>
-+#include <linux/in.h>
-+#include <linux/errno.h>
-+#include <linux/interrupt.h>
-+#include <linux/if_ether.h>
-+#include <linux/inet.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/notifier.h>
-+#include <linux/init.h>
-+#include <net/ip.h>
-+#include <net/netlink.h>
-+#include <linux/ipv6.h>
-+#include <net/route.h>
-+#include <linux/skbuff.h>
-+#include <net/sock.h>
-+#include <net/pkt_sched.h>
-+#include <linux/jhash.h>
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+#include <net/netfilter/nf_conntrack.h>
-+#endif
-+
-+/*	Stochastic Fairness Queuing algorithm.
-+	For more comments look at sch_sfq.c.
-+	The difference is that you can change limit, depth,
-+	hash table size and choose alternate hash types.
-+
-+	classic:	same as in sch_sfq.c
-+	dst:		destination IP address
-+	src:		source IP address
-+	fwmark:		netfilter mark value
-+	ctorigdst:	original destination IP address
-+	ctorigsrc:	original source IP address
-+	ctrepldst:	reply destination IP address
-+	ctreplsrc:	reply source IP
-+
-+*/
-+
-+#define ESFQ_HEAD 0
-+#define ESFQ_TAIL 1
-+
-+/* This type should contain at least SFQ_DEPTH*2 values */
-+typedef unsigned int esfq_index;
-+
-+struct esfq_head
-+{
-+	esfq_index	next;
-+	esfq_index	prev;
-+};
-+
-+struct esfq_sched_data
-+{
-+/* Parameters */
-+	int		perturb_period;
-+	unsigned	quantum;	/* Allotment per round: MUST BE >= MTU */
-+	int		limit;
-+	unsigned	depth;
-+	unsigned	hash_divisor;
-+	unsigned	hash_kind;
-+/* Variables */
-+	struct timer_list perturb_timer;
-+	int		perturbation;
-+	esfq_index	tail;		/* Index of current slot in round */
-+	esfq_index	max_depth;	/* Maximal depth */
-+
-+	esfq_index	*ht;			/* Hash table */
-+	esfq_index	*next;			/* Active slots link */
-+	short		*allot;			/* Current allotment per slot */
-+	unsigned short	*hash;			/* Hash value indexed by slots */
-+	struct sk_buff_head	*qs;		/* Slot queue */
-+	struct esfq_head	*dep;		/* Linked list of slots, indexed by depth */
-+};
-+
-+/* This contains the info we will hash. */
-+struct esfq_packet_info
-+{
-+	u32	proto;		/* protocol or port */
-+	u32	src;		/* source from packet header */
-+	u32	dst;		/* destination from packet header */
-+	u32	ctorigsrc;	/* original source from conntrack */
-+	u32	ctorigdst;	/* original destination from conntrack */
-+	u32	ctreplsrc;	/* reply source from conntrack */
-+	u32	ctrepldst;	/* reply destination from conntrack */
-+	u32	mark;		/* netfilter mark (fwmark) */
-+};
-+
-+static __inline__ unsigned esfq_jhash_1word(struct esfq_sched_data *q,u32 a)
-+{
-+	return jhash_1word(a, q->perturbation) & (q->hash_divisor-1);
-+}
-+
-+static __inline__ unsigned esfq_jhash_2words(struct esfq_sched_data *q, u32 a, u32 b)
-+{
-+	return jhash_2words(a, b, q->perturbation) & (q->hash_divisor-1);
-+}
-+
-+static __inline__ unsigned esfq_jhash_3words(struct esfq_sched_data *q, u32 a, u32 b, u32 c)
-+{
-+	return jhash_3words(a, b, c, q->perturbation) & (q->hash_divisor-1);
-+}
-+
-+static unsigned esfq_hash(struct esfq_sched_data *q, struct sk_buff *skb)
-+{
-+	struct esfq_packet_info info;
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+	enum ip_conntrack_info ctinfo;
-+	struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
-+#endif
-+
-+	switch (skb->protocol) {
-+	case __constant_htons(ETH_P_IP):
-+	{
-+		struct iphdr *iph = ip_hdr(skb);
-+		info.dst = iph->daddr;
-+		info.src = iph->saddr;
-+		if (!(iph->frag_off&htons(IP_MF|IP_OFFSET)) &&
-+		    (iph->protocol == IPPROTO_TCP ||
-+		     iph->protocol == IPPROTO_UDP ||
-+		     iph->protocol == IPPROTO_SCTP ||
-+		     iph->protocol == IPPROTO_DCCP ||
-+		     iph->protocol == IPPROTO_ESP))
-+			info.proto = *(((u32*)iph) + iph->ihl);
-+		else
-+			info.proto = iph->protocol;
-+		break;
-+	}
-+	case __constant_htons(ETH_P_IPV6):
-+	{
-+		struct ipv6hdr *iph = ipv6_hdr(skb);
-+		/* Hash ipv6 addresses into a u32. This isn't ideal,
-+		 * but the code is simple. */
-+		info.dst = jhash2(iph->daddr.s6_addr32, 4, q->perturbation);
-+		info.src = jhash2(iph->saddr.s6_addr32, 4, q->perturbation);
-+		if (iph->nexthdr == IPPROTO_TCP ||
-+		    iph->nexthdr == IPPROTO_UDP ||
-+		    iph->nexthdr == IPPROTO_SCTP ||
-+		    iph->nexthdr == IPPROTO_DCCP ||
-+		    iph->nexthdr == IPPROTO_ESP)
-+			info.proto = *(u32*)&iph[1];
-+		else
-+			info.proto = iph->nexthdr;
-+		break;
-+	}
-+	default:
-+		info.dst   = (u32)(unsigned long)skb_dst(skb);
-+		info.src   = (u32)(unsigned long)skb->sk;
-+		info.proto = skb->protocol;
-+	}
-+
-+	info.mark = skb->mark;
-+
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+	/* defaults if there is no conntrack info */
-+	info.ctorigsrc = info.src;
-+	info.ctorigdst = info.dst;
-+	info.ctreplsrc = info.dst;
-+	info.ctrepldst = info.src;
-+	/* collect conntrack info */
-+	if (ct && ct != &nf_conntrack_untracked) {
-+		if (skb->protocol == __constant_htons(ETH_P_IP)) {
-+			info.ctorigsrc = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
-+			info.ctorigdst = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip;
-+			info.ctreplsrc = ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip;
-+			info.ctrepldst = ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip;
-+		}
-+		else if (skb->protocol == __constant_htons(ETH_P_IPV6)) {
-+			/* Again, hash ipv6 addresses into a single u32. */
-+			info.ctorigsrc = jhash2(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip6, 4, q->perturbation);
-+			info.ctorigdst = jhash2(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip6, 4, q->perturbation);
-+			info.ctreplsrc = jhash2(ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip6, 4, q->perturbation);
-+			info.ctrepldst = jhash2(ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip6, 4, q->perturbation);
-+		}
-+
-+	}
-+#endif
-+
-+	switch(q->hash_kind) {
-+	case TCA_SFQ_HASH_CLASSIC:
-+		return esfq_jhash_3words(q, info.dst, info.src, info.proto);
-+	case TCA_SFQ_HASH_DST:
-+		return esfq_jhash_1word(q, info.dst);
-+	case TCA_SFQ_HASH_SRC:
-+		return esfq_jhash_1word(q, info.src);
-+	case TCA_SFQ_HASH_FWMARK:
-+		return esfq_jhash_1word(q, info.mark);
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+	case TCA_SFQ_HASH_CTORIGDST:
-+		return esfq_jhash_1word(q, info.ctorigdst);
-+	case TCA_SFQ_HASH_CTORIGSRC:
-+		return esfq_jhash_1word(q, info.ctorigsrc);
-+	case TCA_SFQ_HASH_CTREPLDST:
-+		return esfq_jhash_1word(q, info.ctrepldst);
-+	case TCA_SFQ_HASH_CTREPLSRC:
-+		return esfq_jhash_1word(q, info.ctreplsrc);
-+	case TCA_SFQ_HASH_CTNATCHG:
-+	{
-+		if (info.ctorigdst == info.ctreplsrc)
-+			return esfq_jhash_1word(q, info.ctorigsrc);
-+		return esfq_jhash_1word(q, info.ctreplsrc);
-+	}
-+#endif
-+	default:
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "ESFQ: Unknown hash method. Falling back to classic.\n");
-+	}
-+	return esfq_jhash_3words(q, info.dst, info.src, info.proto);
-+}
-+
-+static inline void esfq_link(struct esfq_sched_data *q, esfq_index x)
-+{
-+	esfq_index p, n;
-+	int d = q->qs[x].qlen + q->depth;
-+
-+	p = d;
-+	n = q->dep[d].next;
-+	q->dep[x].next = n;
-+	q->dep[x].prev = p;
-+	q->dep[p].next = q->dep[n].prev = x;
-+}
-+
-+static inline void esfq_dec(struct esfq_sched_data *q, esfq_index x)
-+{
-+	esfq_index p, n;
-+
-+	n = q->dep[x].next;
-+	p = q->dep[x].prev;
-+	q->dep[p].next = n;
-+	q->dep[n].prev = p;
-+
-+	if (n == p && q->max_depth == q->qs[x].qlen + 1)
-+		q->max_depth--;
-+
-+	esfq_link(q, x);
-+}
-+
-+static inline void esfq_inc(struct esfq_sched_data *q, esfq_index x)
-+{
-+	esfq_index p, n;
-+	int d;
-+
-+	n = q->dep[x].next;
-+	p = q->dep[x].prev;
-+	q->dep[p].next = n;
-+	q->dep[n].prev = p;
-+	d = q->qs[x].qlen;
-+	if (q->max_depth < d)
-+		q->max_depth = d;
-+
-+	esfq_link(q, x);
-+}
-+
-+static unsigned int esfq_drop(struct Qdisc *sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_index d = q->max_depth;
-+	struct sk_buff *skb;
-+	unsigned int len;
-+
-+	/* Queue is full! Find the longest slot and
-+	   drop a packet from it */
-+
-+	if (d > 1) {
-+		esfq_index x = q->dep[d+q->depth].next;
-+		skb = q->qs[x].prev;
-+		len = skb->len;
-+		__skb_unlink(skb, &q->qs[x]);
-+		kfree_skb(skb);
-+		esfq_dec(q, x);
-+		sch->q.qlen--;
-+		sch->qstats.drops++;
-+		sch->qstats.backlog -= len;
-+		return len;
-+	}
-+
-+	if (d == 1) {
-+		/* It is difficult to believe, but ALL THE SLOTS HAVE LENGTH 1. */
-+		d = q->next[q->tail];
-+		q->next[q->tail] = q->next[d];
-+		q->allot[q->next[d]] += q->quantum;
-+		skb = q->qs[d].prev;
-+		len = skb->len;
-+		__skb_unlink(skb, &q->qs[d]);
-+		kfree_skb(skb);
-+		esfq_dec(q, d);
-+		sch->q.qlen--;
-+		q->ht[q->hash[d]] = q->depth;
-+		sch->qstats.drops++;
-+		sch->qstats.backlog -= len;
-+		return len;
-+	}
-+
-+	return 0;
-+}
-+
-+static void esfq_q_enqueue(struct sk_buff *skb, struct esfq_sched_data *q, unsigned int end)
-+{
-+	unsigned hash = esfq_hash(q, skb);
-+	unsigned depth = q->depth;
-+	esfq_index x;
-+
-+	x = q->ht[hash];
-+	if (x == depth) {
-+		q->ht[hash] = x = q->dep[depth].next;
-+		q->hash[x] = hash;
-+	}
-+
-+	if (end == ESFQ_TAIL)
-+		__skb_queue_tail(&q->qs[x], skb);
-+	else
-+		__skb_queue_head(&q->qs[x], skb);
-+
-+	esfq_inc(q, x);
-+	if (q->qs[x].qlen == 1) {		/* The flow is new */
-+		if (q->tail == depth) {	/* It is the first flow */
-+			q->tail = x;
-+			q->next[x] = x;
-+			q->allot[x] = q->quantum;
-+		} else {
-+			q->next[x] = q->next[q->tail];
-+			q->next[q->tail] = x;
-+			q->tail = x;
-+		}
-+	}
-+}
-+
-+static int esfq_enqueue(struct sk_buff *skb, struct Qdisc* sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_q_enqueue(skb, q, ESFQ_TAIL);
-+	sch->qstats.backlog += skb->len;
-+	if (++sch->q.qlen < q->limit-1) {
-+		sch->bstats.bytes += skb->len;
-+		sch->bstats.packets++;
-+		return 0;
-+	}
-+
-+	sch->qstats.drops++;
-+	esfq_drop(sch);
-+	return NET_XMIT_CN;
-+}
-+
-+static struct sk_buff *esfq_peek(struct Qdisc* sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_index a;
-+
-+	/* No active slots */
-+	if (q->tail == q->depth)
-+		return NULL;
-+
-+	a = q->next[q->tail];
-+	return skb_peek(&q->qs[a]);
-+}
-+
-+static struct sk_buff *esfq_q_dequeue(struct esfq_sched_data *q)
-+{
-+	struct sk_buff *skb;
-+	unsigned depth = q->depth;
-+	esfq_index a, old_a;
-+
-+	/* No active slots */
-+	if (q->tail == depth)
-+		return NULL;
-+
-+	a = old_a = q->next[q->tail];
-+
-+	/* Grab packet */
-+	skb = __skb_dequeue(&q->qs[a]);
-+	esfq_dec(q, a);
-+
-+	/* Is the slot empty? */
-+	if (q->qs[a].qlen == 0) {
-+		q->ht[q->hash[a]] = depth;
-+		a = q->next[a];
-+		if (a == old_a) {
-+			q->tail = depth;
-+			return skb;
-+		}
-+		q->next[q->tail] = a;
-+		q->allot[a] += q->quantum;
-+	} else if ((q->allot[a] -= skb->len) <= 0) {
-+		q->tail = a;
-+		a = q->next[a];
-+		q->allot[a] += q->quantum;
-+	}
-+
-+	return skb;
-+}
-+
-+static struct sk_buff *esfq_dequeue(struct Qdisc* sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	struct sk_buff *skb;
-+
-+	skb = esfq_q_dequeue(q);
-+	if (skb == NULL)
-+		return NULL;
-+	sch->q.qlen--;
-+	sch->qstats.backlog -= skb->len;
-+	return skb;
-+}
-+
-+static void esfq_q_destroy(struct esfq_sched_data *q)
-+{
-+	del_timer(&q->perturb_timer);
-+	if(q->ht)
-+		kfree(q->ht);
-+	if(q->dep)
-+		kfree(q->dep);
-+	if(q->next)
-+		kfree(q->next);
-+	if(q->allot)
-+		kfree(q->allot);
-+	if(q->hash)
-+		kfree(q->hash);
-+	if(q->qs)
-+		kfree(q->qs);
-+}
-+
-+static void esfq_destroy(struct Qdisc *sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_q_destroy(q);
-+}
-+
-+
-+static void esfq_reset(struct Qdisc* sch)
-+{
-+	struct sk_buff *skb;
-+
-+	while ((skb = esfq_dequeue(sch)) != NULL)
-+		kfree_skb(skb);
-+}
-+
-+static void esfq_perturbation(unsigned long arg)
-+{
-+	struct Qdisc *sch = (struct Qdisc*)arg;
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+
-+	q->perturbation = net_random()&0x1F;
-+
-+	if (q->perturb_period) {
-+		q->perturb_timer.expires = jiffies + q->perturb_period;
-+		add_timer(&q->perturb_timer);
-+	}
-+}
-+
-+static unsigned int esfq_check_hash(unsigned int kind)
-+{
-+	switch (kind) {
-+	case TCA_SFQ_HASH_CTORIGDST:
-+	case TCA_SFQ_HASH_CTORIGSRC:
-+	case TCA_SFQ_HASH_CTREPLDST:
-+	case TCA_SFQ_HASH_CTREPLSRC:
-+	case TCA_SFQ_HASH_CTNATCHG:
-+#ifndef CONFIG_NET_SCH_ESFQ_NFCT
-+	{
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "ESFQ: Conntrack hash types disabled in kernel config. Falling back to classic.\n");
-+		return TCA_SFQ_HASH_CLASSIC;
-+	}
-+#endif
-+	case TCA_SFQ_HASH_CLASSIC:
-+	case TCA_SFQ_HASH_DST:
-+	case TCA_SFQ_HASH_SRC:
-+	case TCA_SFQ_HASH_FWMARK:
-+		return kind;
-+	default:
-+	{
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "ESFQ: Unknown hash type. Falling back to classic.\n");
-+		return TCA_SFQ_HASH_CLASSIC;
-+	}
-+	}
-+}
-+
-+static int esfq_q_init(struct esfq_sched_data *q, struct nlattr *opt)
-+{
-+	struct tc_esfq_qopt *ctl = nla_data(opt);
-+	esfq_index p = ~0U/2;
-+	int i;
-+
-+	if (opt && opt->nla_len < nla_attr_size(sizeof(*ctl)))
-+		return -EINVAL;
-+
-+	q->perturbation = 0;
-+	q->hash_kind = TCA_SFQ_HASH_CLASSIC;
-+	q->max_depth = 0;
-+	if (opt == NULL) {
-+		q->perturb_period = 0;
-+		q->hash_divisor = 1024;
-+		q->tail = q->limit = q->depth = 128;
-+
-+	} else {
-+		struct tc_esfq_qopt *ctl = nla_data(opt);
-+		if (ctl->quantum)
-+			q->quantum = ctl->quantum;
-+		q->perturb_period = ctl->perturb_period*HZ;
-+		q->hash_divisor = ctl->divisor ? : 1024;
-+		q->tail = q->limit = q->depth = ctl->flows ? : 128;
-+
-+		if ( q->depth > p - 1 )
-+			return -EINVAL;
-+
-+		if (ctl->limit)
-+			q->limit = min_t(u32, ctl->limit, q->depth);
-+
-+		if (ctl->hash_kind) {
-+			q->hash_kind = esfq_check_hash(ctl->hash_kind);
-+		}
-+	}
-+
-+	q->ht = kmalloc(q->hash_divisor*sizeof(esfq_index), GFP_KERNEL);
-+	if (!q->ht)
-+		goto err_case;
-+	q->dep = kmalloc((1+q->depth*2)*sizeof(struct esfq_head), GFP_KERNEL);
-+	if (!q->dep)
-+		goto err_case;
-+	q->next = kmalloc(q->depth*sizeof(esfq_index), GFP_KERNEL);
-+	if (!q->next)
-+		goto err_case;
-+	q->allot = kmalloc(q->depth*sizeof(short), GFP_KERNEL);
-+	if (!q->allot)
-+		goto err_case;
-+	q->hash = kmalloc(q->depth*sizeof(unsigned short), GFP_KERNEL);
-+	if (!q->hash)
-+		goto err_case;
-+	q->qs = kmalloc(q->depth*sizeof(struct sk_buff_head), GFP_KERNEL);
-+	if (!q->qs)
-+		goto err_case;
-+
-+	for (i=0; i< q->hash_divisor; i++)
-+		q->ht[i] = q->depth;
-+	for (i=0; i<q->depth; i++) {
-+		skb_queue_head_init(&q->qs[i]);
-+		q->dep[i+q->depth].next = i+q->depth;
-+		q->dep[i+q->depth].prev = i+q->depth;
-+	}
-+
-+	for (i=0; i<q->depth; i++)
-+		esfq_link(q, i);
-+	return 0;
-+err_case:
-+	esfq_q_destroy(q);
-+	return -ENOBUFS;
-+}
-+
-+static int esfq_init(struct Qdisc *sch, struct nlattr *opt)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	int err;
-+
-+	q->quantum = psched_mtu(qdisc_dev(sch)); /* default */
-+	if ((err = esfq_q_init(q, opt)))
-+		return err;
-+
-+	init_timer(&q->perturb_timer);
-+	q->perturb_timer.data = (unsigned long)sch;
-+	q->perturb_timer.function = esfq_perturbation;
-+	if (q->perturb_period) {
-+		q->perturb_timer.expires = jiffies + q->perturb_period;
-+		add_timer(&q->perturb_timer);
-+	}
-+
-+	return 0;
-+}
-+
-+static int esfq_change(struct Qdisc *sch, struct nlattr *opt)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	struct esfq_sched_data new;
-+	struct sk_buff *skb;
-+	int err;
-+
-+	/* set up new queue */
-+	memset(&new, 0, sizeof(struct esfq_sched_data));
-+	new.quantum = psched_mtu(qdisc_dev(sch)); /* default */
-+	if ((err = esfq_q_init(&new, opt)))
-+		return err;
-+
-+	/* copy all packets from the old queue to the new queue */
-+	sch_tree_lock(sch);
-+	while ((skb = esfq_q_dequeue(q)) != NULL)
-+		esfq_q_enqueue(skb, &new, ESFQ_TAIL);
-+
-+	/* clean up the old queue */
-+	esfq_q_destroy(q);
-+
-+	/* copy elements of the new queue into the old queue */
-+	q->perturb_period = new.perturb_period;
-+	q->quantum        = new.quantum;
-+	q->limit          = new.limit;
-+	q->depth          = new.depth;
-+	q->hash_divisor   = new.hash_divisor;
-+	q->hash_kind      = new.hash_kind;
-+	q->tail           = new.tail;
-+	q->max_depth      = new.max_depth;
-+	q->ht    = new.ht;
-+	q->dep   = new.dep;
-+	q->next  = new.next;
-+	q->allot = new.allot;
-+	q->hash  = new.hash;
-+	q->qs    = new.qs;
-+
-+	/* finish up */
-+	if (q->perturb_period) {
-+		q->perturb_timer.expires = jiffies + q->perturb_period;
-+		add_timer(&q->perturb_timer);
-+	} else {
-+		q->perturbation = 0;
-+	}
-+	sch_tree_unlock(sch);
-+	return 0;
-+}
-+
-+static int esfq_dump(struct Qdisc *sch, struct sk_buff *skb)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	unsigned char *b = skb_tail_pointer(skb);
-+	struct tc_esfq_qopt opt;
-+
-+	opt.quantum = q->quantum;
-+	opt.perturb_period = q->perturb_period/HZ;
-+
-+	opt.limit = q->limit;
-+	opt.divisor = q->hash_divisor;
-+	opt.flows = q->depth;
-+	opt.hash_kind = q->hash_kind;
-+
-+	NLA_PUT(skb, TCA_OPTIONS, sizeof(opt), &opt);
-+
-+	return skb->len;
-+
-+nla_put_failure:
-+	nlmsg_trim(skb, b);
-+	return -1;
-+}
-+
-+static struct Qdisc_ops esfq_qdisc_ops =
-+{
-+	.next		=	NULL,
-+	.cl_ops		=	NULL,
-+	.id		=	"esfq",
-+	.priv_size	=	sizeof(struct esfq_sched_data),
-+	.enqueue	=	esfq_enqueue,
-+	.dequeue	=	esfq_dequeue,
-+	.peek		=	esfq_peek,
-+	.drop		=	esfq_drop,
-+	.init		=	esfq_init,
-+	.reset		=	esfq_reset,
-+	.destroy	=	esfq_destroy,
-+	.change		=	esfq_change,
-+	.dump		=	esfq_dump,
-+	.owner		=	THIS_MODULE,
-+};
-+
-+static int __init esfq_module_init(void)
-+{
-+	return register_qdisc(&esfq_qdisc_ops);
-+}
-+static void __exit esfq_module_exit(void)
-+{
-+	unregister_qdisc(&esfq_qdisc_ops);
-+}
-+module_init(esfq_module_init)
-+module_exit(esfq_module_exit)
-+MODULE_LICENSE("GPL");
diff --git a/target/linux/generic-2.6/patches-2.6.33/201-jhash3.patch b/target/linux/generic-2.6/patches-2.6.33/201-jhash3.patch
deleted file mode 100644
index 0218fa19c..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/201-jhash3.patch
+++ /dev/null
@@ -1,227 +0,0 @@
---- a/include/linux/jhash.h
-+++ b/include/linux/jhash.h
-@@ -3,80 +3,95 @@
- 
- /* jhash.h: Jenkins hash support.
-  *
-- * Copyright (C) 1996 Bob Jenkins (bob_jenkins@burtleburtle.net)
-+ * Copyright (C) 2006. Bob Jenkins (bob_jenkins@burtleburtle.net)
-  *
-  * http://burtleburtle.net/bob/hash/
-  *
-  * These are the credits from Bob's sources:
-  *
-- * lookup2.c, by Bob Jenkins, December 1996, Public Domain.
-- * hash(), hash2(), hash3, and mix() are externally useful functions.
-- * Routines to test the hash are included if SELF_TEST is defined.
-- * You can use this free for any purpose.  It has no warranty.
-+ * lookup3.c, by Bob Jenkins, May 2006, Public Domain.
-  *
-- * Copyright (C) 2003 David S. Miller (davem@redhat.com)
-+ * These are functions for producing 32-bit hashes for hash table lookup.
-+ * hashword(), hashlittle(), hashlittle2(), hashbig(), mix(), and final() 
-+ * are externally useful functions.  Routines to test the hash are included 
-+ * if SELF_TEST is defined.  You can use this free for any purpose.  It's in
-+ * the public domain.  It has no warranty.
-+ *
-+ * Copyright (C) 2009 Jozsef Kadlecsik (kadlec@blackhole.kfki.hu)
-  *
-  * I've modified Bob's hash to be useful in the Linux kernel, and
-- * any bugs present are surely my fault.  -DaveM
-+ * any bugs present are my fault.  Jozsef
-  */
- 
--/* NOTE: Arguments are modified. */
--#define __jhash_mix(a, b, c) \
-+#define __rot(x,k) (((x)<<(k)) | ((x)>>(32-(k))))
-+
-+/* __jhash_mix - mix 3 32-bit values reversibly. */
-+#define __jhash_mix(a,b,c) \
-+{ \
-+  a -= c;  a ^= __rot(c, 4);  c += b; \
-+  b -= a;  b ^= __rot(a, 6);  a += c; \
-+  c -= b;  c ^= __rot(b, 8);  b += a; \
-+  a -= c;  a ^= __rot(c,16);  c += b; \
-+  b -= a;  b ^= __rot(a,19);  a += c; \
-+  c -= b;  c ^= __rot(b, 4);  b += a; \
-+}
-+
-+/* __jhash_final - final mixing of 3 32-bit values (a,b,c) into c */
-+#define __jhash_final(a,b,c) \
- { \
--  a -= b; a -= c; a ^= (c>>13); \
--  b -= c; b -= a; b ^= (a<<8); \
--  c -= a; c -= b; c ^= (b>>13); \
--  a -= b; a -= c; a ^= (c>>12);  \
--  b -= c; b -= a; b ^= (a<<16); \
--  c -= a; c -= b; c ^= (b>>5); \
--  a -= b; a -= c; a ^= (c>>3);  \
--  b -= c; b -= a; b ^= (a<<10); \
--  c -= a; c -= b; c ^= (b>>15); \
-+  c ^= b; c -= __rot(b,14); \
-+  a ^= c; a -= __rot(c,11); \
-+  b ^= a; b -= __rot(a,25); \
-+  c ^= b; c -= __rot(b,16); \
-+  a ^= c; a -= __rot(c,4);  \
-+  b ^= a; b -= __rot(a,14); \
-+  c ^= b; c -= __rot(b,24); \
- }
- 
--/* The golden ration: an arbitrary value */
--#define JHASH_GOLDEN_RATIO	0x9e3779b9
-+/* An arbitrary initial parameter */
-+#define JHASH_GOLDEN_RATIO	0xdeadbeef
- 
- /* The most generic version, hashes an arbitrary sequence
-  * of bytes.  No alignment or length assumptions are made about
-- * the input key.
-+ * the input key. The result depends on endianness.
-  */
- static inline u32 jhash(const void *key, u32 length, u32 initval)
- {
--	u32 a, b, c, len;
-+	u32 a,b,c;
- 	const u8 *k = key;
- 
--	len = length;
--	a = b = JHASH_GOLDEN_RATIO;
--	c = initval;
--
--	while (len >= 12) {
--		a += (k[0] +((u32)k[1]<<8) +((u32)k[2]<<16) +((u32)k[3]<<24));
--		b += (k[4] +((u32)k[5]<<8) +((u32)k[6]<<16) +((u32)k[7]<<24));
--		c += (k[8] +((u32)k[9]<<8) +((u32)k[10]<<16)+((u32)k[11]<<24));
--
--		__jhash_mix(a,b,c);
-+	/* Set up the internal state */
-+	a = b = c = JHASH_GOLDEN_RATIO + length + initval;
- 
-+	/* all but the last block: affect some 32 bits of (a,b,c) */
-+	while (length > 12) {
-+    		a += (k[0] + ((u32)k[1]<<8) + ((u32)k[2]<<16) + ((u32)k[3]<<24));
-+		b += (k[4] + ((u32)k[5]<<8) + ((u32)k[6]<<16) + ((u32)k[7]<<24));
-+		c += (k[8] + ((u32)k[9]<<8) + ((u32)k[10]<<16) + ((u32)k[11]<<24));
-+		__jhash_mix(a, b, c);
-+		length -= 12;
- 		k += 12;
--		len -= 12;
- 	}
- 
--	c += length;
--	switch (len) {
--	case 11: c += ((u32)k[10]<<24);
--	case 10: c += ((u32)k[9]<<16);
--	case 9 : c += ((u32)k[8]<<8);
--	case 8 : b += ((u32)k[7]<<24);
--	case 7 : b += ((u32)k[6]<<16);
--	case 6 : b += ((u32)k[5]<<8);
-+	/* last block: affect all 32 bits of (c) */
-+	/* all the case statements fall through */
-+	switch (length) {
-+	case 12: c += (u32)k[11]<<24;
-+	case 11: c += (u32)k[10]<<16;
-+	case 10: c += (u32)k[9]<<8;
-+	case 9 : c += k[8];
-+	case 8 : b += (u32)k[7]<<24;
-+	case 7 : b += (u32)k[6]<<16;
-+	case 6 : b += (u32)k[5]<<8;
- 	case 5 : b += k[4];
--	case 4 : a += ((u32)k[3]<<24);
--	case 3 : a += ((u32)k[2]<<16);
--	case 2 : a += ((u32)k[1]<<8);
-+	case 4 : a += (u32)k[3]<<24;
-+	case 3 : a += (u32)k[2]<<16;
-+	case 2 : a += (u32)k[1]<<8;
- 	case 1 : a += k[0];
--	};
--
--	__jhash_mix(a,b,c);
-+		__jhash_final(a, b, c);
-+	case 0 :
-+		break;
-+	}
- 
- 	return c;
- }
-@@ -86,58 +101,57 @@ static inline u32 jhash(const void *key,
-  */
- static inline u32 jhash2(const u32 *k, u32 length, u32 initval)
- {
--	u32 a, b, c, len;
-+	u32 a, b, c;
- 
--	a = b = JHASH_GOLDEN_RATIO;
--	c = initval;
--	len = length;
-+	/* Set up the internal state */
-+	a = b = c = JHASH_GOLDEN_RATIO + (length<<2) + initval;
- 
--	while (len >= 3) {
-+	/* handle most of the key */
-+	while (length > 3) {
- 		a += k[0];
- 		b += k[1];
- 		c += k[2];
- 		__jhash_mix(a, b, c);
--		k += 3; len -= 3;
-+		length -= 3;
-+		k += 3;
- 	}
- 
--	c += length * 4;
--
--	switch (len) {
--	case 2 : b += k[1];
--	case 1 : a += k[0];
--	};
--
--	__jhash_mix(a,b,c);
-+	/* handle the last 3 u32's */
-+	/* all the case statements fall through */ 
-+	switch (length) {
-+	case 3: c += k[2];
-+	case 2: b += k[1];
-+	case 1: a += k[0];
-+		__jhash_final(a, b, c);
-+	case 0:     /* case 0: nothing left to add */
-+		break;
-+	}
- 
- 	return c;
- }
- 
--
- /* A special ultra-optimized versions that knows they are hashing exactly
-  * 3, 2 or 1 word(s).
-- *
-- * NOTE: In partilar the "c += length; __jhash_mix(a,b,c);" normally
-- *       done at the end is not done here.
-  */
- static inline u32 jhash_3words(u32 a, u32 b, u32 c, u32 initval)
- {
--	a += JHASH_GOLDEN_RATIO;
--	b += JHASH_GOLDEN_RATIO;
--	c += initval;
-+	a += JHASH_GOLDEN_RATIO + initval;
-+	b += JHASH_GOLDEN_RATIO + initval;
-+	c += JHASH_GOLDEN_RATIO + initval;
- 
--	__jhash_mix(a, b, c);
-+	__jhash_final(a, b, c);
- 
- 	return c;
- }
- 
- static inline u32 jhash_2words(u32 a, u32 b, u32 initval)
- {
--	return jhash_3words(a, b, 0, initval);
-+	return jhash_3words(0, a, b, initval);
- }
- 
- static inline u32 jhash_1word(u32 a, u32 initval)
- {
--	return jhash_3words(a, 0, 0, initval);
-+	return jhash_3words(0, 0, a, initval);
- }
- 
- #endif /* _LINUX_JHASH_H */
diff --git a/target/linux/generic-2.6/patches-2.6.33/202-mips_mem_functions_performance.patch b/target/linux/generic-2.6/patches-2.6.33/202-mips_mem_functions_performance.patch
deleted file mode 100644
index e4324717b..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/202-mips_mem_functions_performance.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- a/arch/mips/include/asm/string.h
-+++ b/arch/mips/include/asm/string.h
-@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__
- 
- #define __HAVE_ARCH_MEMSET
- extern void *memset(void *__s, int __c, size_t __count);
-+#define memset(__s, __c, len)					\
-+({								\
-+	size_t __len = (len);					\
-+	void *__ret;						\
-+	if (__builtin_constant_p(len) && __len >= 64)		\
-+		__ret = memset((__s), (__c), __len);		\
-+	else							\
-+		__ret = __builtin_memset((__s), (__c), __len);	\
-+	__ret;							\
-+})
- 
- #define __HAVE_ARCH_MEMCPY
- extern void *memcpy(void *__to, __const__ void *__from, size_t __n);
-+#define memcpy(dst, src, len)					\
-+({								\
-+	size_t __len = (len);					\
-+	void *__ret;						\
-+	if (__builtin_constant_p(len) && __len >= 64)		\
-+		__ret = memcpy((dst), (src), __len);		\
-+	else							\
-+		__ret = __builtin_memcpy((dst), (src), __len);	\
-+	__ret;							\
-+})
- 
- #define __HAVE_ARCH_MEMMOVE
- extern void *memmove(void *__dest, __const__ void *__src, size_t __n);
-+#define memmove(dst, src, len)					\
-+({								\
-+	size_t __len = (len);					\
-+	void *__ret;						\
-+	if (__builtin_constant_p(len) && __len >= 64)		\
-+		__ret = memmove((dst), (src), __len);		\
-+	else							\
-+		__ret = __builtin_memmove((dst), (src), __len);	\
-+	__ret;							\
-+})
-+
-+#define __HAVE_ARCH_MEMCMP
-+#define memcmp(src1, src2, len) __builtin_memcmp((src1), (src2), (len))
- 
- #endif /* _ASM_STRING_H */
---- a/arch/mips/lib/Makefile
-+++ b/arch/mips/lib/Makefile
-@@ -3,7 +3,7 @@
- #
- 
- lib-y	+= csum_partial.o delay.o memcpy.o memcpy-inatomic.o memset.o \
--	   strlen_user.o strncpy_user.o strnlen_user.o uncached.o
-+	   strlen_user.o strncpy_user.o strnlen_user.o uncached.o memcmp.o
- 
- obj-y			+= iomap.o
- obj-$(CONFIG_PCI)	+= iomap-pci.o
---- /dev/null
-+++ b/arch/mips/lib/memcmp.c
-@@ -0,0 +1,22 @@
-+/*
-+ *  copied from linux/lib/string.c
-+ *
-+ *  Copyright (C) 1991, 1992  Linus Torvalds
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/string.h>
-+
-+#undef memcmp
-+int memcmp(const void *cs, const void *ct, size_t count)
-+{
-+	const unsigned char *su1, *su2;
-+	int res = 0;
-+
-+	for (su1 = cs, su2 = ct; 0 < count; ++su1, ++su2, count--)
-+		if ((res = *su1 - *su2) != 0)
-+			break;
-+	return res;
-+}
-+EXPORT_SYMBOL(memcmp);
-+
diff --git a/target/linux/generic-2.6/patches-2.6.33/203-slab_maxsize.patch b/target/linux/generic-2.6/patches-2.6.33/203-slab_maxsize.patch
deleted file mode 100644
index 5bbf9f5f0..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/203-slab_maxsize.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/include/linux/slab.h
-+++ b/include/linux/slab.h
-@@ -124,8 +124,8 @@ int kmem_ptr_validate(struct kmem_cache
-  * to do various tricks to work around compiler limitations in order to
-  * ensure proper constant folding.
-  */
--#define KMALLOC_SHIFT_HIGH	((MAX_ORDER + PAGE_SHIFT - 1) <= 25 ? \
--				(MAX_ORDER + PAGE_SHIFT - 1) : 25)
-+#define KMALLOC_SHIFT_HIGH	((MAX_ORDER + PAGE_SHIFT - 1) <= 17 ? \
-+				(MAX_ORDER + PAGE_SHIFT - 1) : 17)
- 
- #define KMALLOC_MAX_SIZE	(1UL << KMALLOC_SHIFT_HIGH)
- #define KMALLOC_MAX_ORDER	(KMALLOC_SHIFT_HIGH - PAGE_SHIFT)
diff --git a/target/linux/generic-2.6/patches-2.6.33/204-jffs2_eofdetect.patch b/target/linux/generic-2.6/patches-2.6.33/204-jffs2_eofdetect.patch
deleted file mode 100644
index 16d3e1f8e..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/204-jffs2_eofdetect.patch
+++ /dev/null
@@ -1,132 +0,0 @@
---- a/fs/jffs2/build.c
-+++ b/fs/jffs2/build.c
-@@ -111,6 +111,17 @@ static int jffs2_build_filesystem(struct
- 	dbg_fsbuild("scanned flash completely\n");
- 	jffs2_dbg_dump_block_lists_nolock(c);
- 
-+	if (c->flags & (1 << 7)) {
-+		printk("%s(): unlocking the mtd device... ", __func__);
-+		if (c->mtd->unlock)
-+			c->mtd->unlock(c->mtd, 0, c->mtd->size);
-+		printk("done.\n");
-+
-+		printk("%s(): erasing all blocks after the end marker... ", __func__);
-+		jffs2_erase_pending_blocks(c, -1);
-+		printk("done.\n");
-+	}
-+
- 	dbg_fsbuild("pass 1 starting\n");
- 	c->flags |= JFFS2_SB_FLAG_BUILDING;
- 	/* Now scan the directory tree, increasing nlink according to every dirent found. */
---- a/fs/jffs2/scan.c
-+++ b/fs/jffs2/scan.c
-@@ -72,7 +72,7 @@ static int file_dirty(struct jffs2_sb_in
- 		return ret;
- 	if ((ret = jffs2_scan_dirty_space(c, jeb, jeb->free_size)))
- 		return ret;
--	/* Turned wasted size into dirty, since we apparently 
-+	/* Turned wasted size into dirty, since we apparently
- 	   think it's recoverable now. */
- 	jeb->dirty_size += jeb->wasted_size;
- 	c->dirty_size += jeb->wasted_size;
-@@ -144,8 +144,11 @@ int jffs2_scan_medium(struct jffs2_sb_in
- 		/* reset summary info for next eraseblock scan */
- 		jffs2_sum_reset_collected(s);
- 
--		ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
--						buf_size, s);
-+		if (c->flags & (1 << 7))
-+			ret = BLK_STATE_ALLFF;
-+		else
-+			ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
-+							buf_size, s);
- 
- 		if (ret < 0)
- 			goto out;
-@@ -400,7 +403,7 @@ static int jffs2_scan_xref_node(struct j
- 	if (!ref)
- 		return -ENOMEM;
- 
--	/* BEFORE jffs2_build_xattr_subsystem() called, 
-+	/* BEFORE jffs2_build_xattr_subsystem() called,
- 	 * and AFTER xattr_ref is marked as a dead xref,
- 	 * ref->xid is used to store 32bit xid, xd is not used
- 	 * ref->ino is used to store 32bit inode-number, ic is not used
-@@ -473,7 +476,7 @@ static int jffs2_scan_eraseblock (struct
- 		struct jffs2_sum_marker *sm;
- 		void *sumptr = NULL;
- 		uint32_t sumlen;
--	      
-+
- 		if (!buf_size) {
- 			/* XIP case. Just look, point at the summary if it's there */
- 			sm = (void *)buf + c->sector_size - sizeof(*sm);
-@@ -489,9 +492,9 @@ static int jffs2_scan_eraseblock (struct
- 				buf_len = sizeof(*sm);
- 
- 			/* Read as much as we want into the _end_ of the preallocated buffer */
--			err = jffs2_fill_scan_buf(c, buf + buf_size - buf_len, 
-+			err = jffs2_fill_scan_buf(c, buf + buf_size - buf_len,
- 						  jeb->offset + c->sector_size - buf_len,
--						  buf_len);				
-+						  buf_len);
- 			if (err)
- 				return err;
- 
-@@ -510,9 +513,9 @@ static int jffs2_scan_eraseblock (struct
- 				}
- 				if (buf_len < sumlen) {
- 					/* Need to read more so that the entire summary node is present */
--					err = jffs2_fill_scan_buf(c, sumptr, 
-+					err = jffs2_fill_scan_buf(c, sumptr,
- 								  jeb->offset + c->sector_size - sumlen,
--								  sumlen - buf_len);				
-+								  sumlen - buf_len);
- 					if (err)
- 						return err;
- 				}
-@@ -525,7 +528,7 @@ static int jffs2_scan_eraseblock (struct
- 
- 			if (buf_size && sumlen > buf_size)
- 				kfree(sumptr);
--			/* If it returns with a real error, bail. 
-+			/* If it returns with a real error, bail.
- 			   If it returns positive, that's a block classification
- 			   (i.e. BLK_STATE_xxx) so return that too.
- 			   If it returns zero, fall through to full scan. */
-@@ -546,6 +549,17 @@ static int jffs2_scan_eraseblock (struct
- 			return err;
- 	}
- 
-+	if ((buf[0] == 0xde) &&
-+		(buf[1] == 0xad) &&
-+		(buf[2] == 0xc0) &&
-+		(buf[3] == 0xde)) {
-+		/* end of filesystem. erase everything after this point */
-+		printk("%s(): End of filesystem marker found at 0x%x\n", __func__, jeb->offset);
-+		c->flags |= (1 << 7);
-+
-+		return BLK_STATE_ALLFF;
-+	}
-+
- 	/* We temporarily use 'ofs' as a pointer into the buffer/jeb */
- 	ofs = 0;
- 
-@@ -671,7 +685,7 @@ scan_more:
- 				scan_end = buf_len;
- 				goto more_empty;
- 			}
--			
-+
- 			/* See how much more there is to read in this eraseblock... */
- 			buf_len = min_t(uint32_t, buf_size, jeb->offset + c->sector_size - ofs);
- 			if (!buf_len) {
-@@ -907,7 +921,7 @@ scan_more:
- 
- 	D1(printk(KERN_DEBUG "Block at 0x%08x: free 0x%08x, dirty 0x%08x, unchecked 0x%08x, used 0x%08x, wasted 0x%08x\n",
- 		  jeb->offset,jeb->free_size, jeb->dirty_size, jeb->unchecked_size, jeb->used_size, jeb->wasted_size));
--	
-+
- 	/* mark_node_obsolete can add to wasted !! */
- 	if (jeb->wasted_size) {
- 		jeb->dirty_size += jeb->wasted_size;
diff --git a/target/linux/generic-2.6/patches-2.6.33/205-skb_padding.patch b/target/linux/generic-2.6/patches-2.6.33/205-skb_padding.patch
deleted file mode 100644
index 0928464ec..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/205-skb_padding.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/include/linux/skbuff.h
-+++ b/include/linux/skbuff.h
-@@ -1373,11 +1373,18 @@ static inline int skb_network_offset(con
-  *
-  * Various parts of the networking layer expect at least 32 bytes of
-  * headroom, you should not reduce this.
-+ *
-+ * This has been changed to 64 to acommodate for routing between ethernet
-+ * and wireless, but only for new allocations
-  */
- #ifndef NET_SKB_PAD
- #define NET_SKB_PAD	32
- #endif
- 
-+#ifndef NET_SKB_PAD_ALLOC
-+#define NET_SKB_PAD_ALLOC	64
-+#endif
-+
- extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
- 
- static inline void __skb_trim(struct sk_buff *skb, unsigned int len)
-@@ -1467,9 +1474,9 @@ static inline void __skb_queue_purge(str
- static inline struct sk_buff *__dev_alloc_skb(unsigned int length,
- 					      gfp_t gfp_mask)
- {
--	struct sk_buff *skb = alloc_skb(length + NET_SKB_PAD, gfp_mask);
-+	struct sk_buff *skb = alloc_skb(length + NET_SKB_PAD_ALLOC, gfp_mask);
- 	if (likely(skb))
--		skb_reserve(skb, NET_SKB_PAD);
-+		skb_reserve(skb, NET_SKB_PAD_ALLOC);
- 	return skb;
- }
- 
-@@ -1552,7 +1559,7 @@ static inline int __skb_cow(struct sk_bu
- 		delta = headroom - skb_headroom(skb);
- 
- 	if (delta || cloned)
--		return pskb_expand_head(skb, ALIGN(delta, NET_SKB_PAD), 0,
-+		return pskb_expand_head(skb, ALIGN(delta, NET_SKB_PAD_ALLOC), 0,
- 					GFP_ATOMIC);
- 	return 0;
- }
---- a/net/core/skbuff.c
-+++ b/net/core/skbuff.c
-@@ -339,9 +339,9 @@ struct sk_buff *__netdev_alloc_skb(struc
- 	int node = dev->dev.parent ? dev_to_node(dev->dev.parent) : -1;
- 	struct sk_buff *skb;
- 
--	skb = __alloc_skb(length + NET_SKB_PAD, gfp_mask, 0, node);
-+	skb = __alloc_skb(length + NET_SKB_PAD_ALLOC, gfp_mask, 0, node);
- 	if (likely(skb)) {
--		skb_reserve(skb, NET_SKB_PAD);
-+		skb_reserve(skb, NET_SKB_PAD_ALLOC);
- 		skb->dev = dev;
- 	}
- 	return skb;
diff --git a/target/linux/generic-2.6/patches-2.6.33/207-powerpc_asm_segment_h.patch b/target/linux/generic-2.6/patches-2.6.33/207-powerpc_asm_segment_h.patch
deleted file mode 100644
index 1272e82c7..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/207-powerpc_asm_segment_h.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- /dev/null
-+++ b/include/asm-powerpc/segment.h
-@@ -0,0 +1,6 @@
-+#ifndef _ASM_SEGMENT_H
-+#define _ASM_SEGMENT_H
-+
-+/* Only here because we have some old header files that expect it.. */
-+
-+#endif /* _ASM_SEGMENT_H */
diff --git a/target/linux/generic-2.6/patches-2.6.33/208-mips_oprofile_fix.patch b/target/linux/generic-2.6/patches-2.6.33/208-mips_oprofile_fix.patch
deleted file mode 100644
index 0cbf4ed32..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/208-mips_oprofile_fix.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -49,7 +49,9 @@ ifneq ($(SUBARCH),$(ARCH))
- endif
- 
- ifndef CONFIG_FUNCTION_TRACER
--cflags-y := -ffunction-sections
-+  ifndef CONFIG_PROFILING
-+    cflags-y := -ffunction-sections
-+  endif
- endif
- ifdef CONFIG_FUNCTION_GRAPH_TRACER
-   ifndef KBUILD_MCOUNT_RA_ADDRESS
---- a/arch/mips/oprofile/op_model_mipsxx.c
-+++ b/arch/mips/oprofile/op_model_mipsxx.c
-@@ -298,6 +298,11 @@ static void reset_counters(void *arg)
- 	}
- }
- 
-+static irqreturn_t mipsxx_perfcount_int(int irq, void *dev_id)
-+{
-+	return mipsxx_perfcount_handler();
-+}
-+
- static int __init mipsxx_init(void)
- {
- 	int counters;
-@@ -374,6 +379,10 @@ static int __init mipsxx_init(void)
- 	save_perf_irq = perf_irq;
- 	perf_irq = mipsxx_perfcount_handler;
- 
-+	if (cp0_perfcount_irq >= 0)
-+		return request_irq(cp0_perfcount_irq, mipsxx_perfcount_int,
-+			IRQF_SHARED, "Perfcounter", save_perf_irq);
-+
- 	return 0;
- }
- 
-@@ -381,6 +390,9 @@ static void mipsxx_exit(void)
- {
- 	int counters = op_model_mipsxx_ops.num_counters;
- 
-+	if (cp0_perfcount_irq >= 0)
-+		free_irq(cp0_perfcount_irq, save_perf_irq);
-+
- 	counters = counters_per_cpu_to_total(counters);
- 	on_each_cpu(reset_counters, (void *)(long)counters, 1);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.33/209-mini_fo.patch b/target/linux/generic-2.6/patches-2.6.33/209-mini_fo.patch
deleted file mode 100644
index b2625cd26..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/209-mini_fo.patch
+++ /dev/null
@@ -1,7782 +0,0 @@
---- a/fs/Kconfig
-+++ b/fs/Kconfig
-@@ -180,6 +180,7 @@ source "fs/ubifs/Kconfig"
- source "fs/cramfs/Kconfig"
- source "fs/squashfs/Kconfig"
- source "fs/freevxfs/Kconfig"
-+source "fs/mini_fo/Kconfig"
- source "fs/minix/Kconfig"
- source "fs/omfs/Kconfig"
- source "fs/hpfs/Kconfig"
---- a/fs/Makefile
-+++ b/fs/Makefile
-@@ -77,6 +77,7 @@ obj-$(CONFIG_SQUASHFS)		+= squashfs/
- obj-y				+= ramfs/
- obj-$(CONFIG_HUGETLBFS)		+= hugetlbfs/
- obj-$(CONFIG_CODA_FS)		+= coda/
-+obj-$(CONFIG_MINI_FO)		+= mini_fo/
- obj-$(CONFIG_MINIX_FS)		+= minix/
- obj-$(CONFIG_FAT_FS)		+= fat/
- obj-$(CONFIG_BFS_FS)		+= bfs/
---- /dev/null
-+++ b/fs/mini_fo/aux.c
-@@ -0,0 +1,577 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+/* check if file exists in storage  */
-+int exists_in_storage(dentry_t *dentry)
-+{
-+	check_mini_fo_dentry(dentry);
-+	if(dtost(dentry) == MODIFIED || dtost(dentry) == CREATED || dtost(dentry) == DEL_REWRITTEN)
-+		return 1;
-+	return 0;
-+}
-+
-+/* check if dentry is in an existing state */
-+int is_mini_fo_existant(dentry_t *dentry)
-+{
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) == DELETED || dtost(dentry) == NON_EXISTANT)
-+		return 0;
-+	else
-+		return 1;
-+}
-+
-+/*
-+ * This function will create a negative storage dentry for
-+ * dentry, what is required for many create like options.
-+ * It will create the storage structure if necessary.
-+ */
-+int get_neg_sto_dentry(dentry_t *dentry)
-+{
-+	int err = 0;
-+	unsigned int len;
-+	const unsigned char *name;
-+
-+	if(!dentry ||
-+	   !dtopd(dentry) ||
-+	   !(dtost(dentry) == UNMODIFIED ||
-+	     dtost(dentry) == NON_EXISTANT ||
-+	     dtost(dentry) == DELETED)) {
-+		printk(KERN_CRIT "mini_fo: get_neg_sto_dentry: invalid dentry passed.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	/* Have we got a neg. dentry already? */
-+	if(dtohd2(dentry)) {
-+		err = 0;
-+		goto out;
-+	}
-+	if(dtost(dentry->d_parent) == UNMODIFIED) {
-+		/* build sto struct */
-+		err = build_sto_structure(dentry->d_parent->d_parent, dentry->d_parent);
-+		if(err ||
-+		   dtost(dentry->d_parent) != MODIFIED) {
-+			printk(KERN_CRIT "mini_fo: get_neg_sto_dentry: ERROR building sto structure.\n");
-+			err = -1;
-+			goto out;
-+		}
-+	}
-+
-+	len = dentry->d_name.len;
-+	name = dentry->d_name.name;
-+
-+	dtohd2(dentry) =
-+		lookup_one_len(name, dtohd2(dentry->d_parent), len);
-+
-+ out:
-+	return err;
-+}
-+
-+int check_mini_fo_dentry(dentry_t *dentry)
-+{
-+ 	ASSERT(dentry != NULL);
-+	ASSERT(dtopd(dentry) != NULL);
-+	ASSERT((dtohd(dentry) != NULL) || (dtohd2(dentry) != NULL));
-+
-+/* 	if(dtost(dentry) == MODIFIED) { */
-+/* 		ASSERT(dentry->d_inode != NULL); */
-+/* 		ASSERT(dtohd(dentry) != NULL); */
-+/* 		ASSERT(dtohd(dentry)->d_inode != NULL); */
-+/* 		ASSERT(dtohd2(dentry) != NULL); */
-+/* 		ASSERT(dtohd2(dentry)->d_inode != NULL); */
-+/* 	} */
-+/* 	else if(dtost(dentry) == UNMODIFIED) { */
-+/* 		ASSERT(dentry->d_inode != NULL); */
-+/* 		ASSERT( */
-+/* 	} */
-+	return 0;
-+}
-+
-+int check_mini_fo_file(file_t *file)
-+{
-+	ASSERT(file != NULL);
-+	ASSERT(ftopd(file) != NULL);
-+	ASSERT(file->f_dentry != NULL);
-+
-+	/* violent checking, check depending of state and type
-+	 *	if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {}
-+	 */
-+	ASSERT((ftohf(file) != NULL) || (ftohf2(file) != NULL));
-+	return 0;
-+}
-+
-+int check_mini_fo_inode(inode_t *inode)
-+{
-+	ASSERT(inode != NULL);
-+	ASSERT(itopd(inode) != NULL);
-+	ASSERT((itohi(inode) != NULL) || (itohi2(inode) != NULL));
-+	return 0;
-+}
-+
-+/*
-+ * will walk a base path as provided by get_mini_fo_bpath and return
-+ * the (hopefully ;-) ) positive dentry of the renamed base dir.
-+ *
-+ * This does some work of path_init.
-+ */
-+dentry_t *bpath_walk(super_block_t *sb, char *bpath)
-+{
-+	int err;
-+        struct vfsmount *mnt;
-+	struct nameidata nd;
-+
-+	/* be paranoid */
-+	if(!bpath || bpath[0] != '/') {
-+		printk(KERN_CRIT "mini_fo: bpath_walk: Invalid string.\n");
-+		return NULL;
-+	}
-+	if(!sb || !stopd(sb)) {
-+		printk(KERN_CRIT "mini_fo: bpath_walk: Invalid sb.\n");
-+		return NULL;
-+	}
-+
-+	/* fix this: how do I reach this lock?
-+	 * read_lock(&current->fs->lock); */
-+	mnt = mntget(stopd(sb)->hidden_mnt);
-+	/* read_unlock(&current->fs->lock); */
-+
-+	err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
-+
-+	/* validate */
-+	if (err || !nd.dentry || !nd.dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: bpath_walk: path_walk failed.\n");
-+		return NULL;
-+	}
-+	return nd.dentry;
-+}
-+
-+
-+/* returns the full path of the basefile incl. its name */
-+int get_mini_fo_bpath(dentry_t *dentry, char **bpath, int *bpath_len)
-+{
-+	char *buf_walker;
-+	int len = 0;
-+	dentry_t *sky_walker;
-+
-+	if(!dentry || !dtohd(dentry)) {
-+		printk(KERN_CRIT "mini_fo: get_mini_fo_bpath: invalid dentry passed.\n");
-+		return -1;
-+	}
-+	sky_walker = dtohd(dentry);
-+
-+	do {
-+		len += sky_walker->d_name.len + 1 ; /* 1 for '/' */
-+		sky_walker = sky_walker->d_parent;
-+	} while(sky_walker != stopd(dentry->d_inode->i_sb)->base_dir_dentry);
-+
-+	/* 1 to oil the loop */
-+	*bpath = (char*)  kmalloc(len + 1, GFP_KERNEL);
-+	if(!*bpath) {
-+		printk(KERN_CRIT "mini_fo: get_mini_fo_bpath: out of mem.\n");
-+		return -1;
-+	}
-+	buf_walker = *bpath+len; /* put it on last char */
-+	*buf_walker = '\n';
-+	sky_walker = dtohd(dentry);
-+
-+	do {
-+		buf_walker -= sky_walker->d_name.len;
-+		strncpy(buf_walker,
-+			sky_walker->d_name.name,
-+			sky_walker->d_name.len);
-+		*(--buf_walker) = '/';
-+		sky_walker = sky_walker->d_parent;
-+	} while(sky_walker != stopd(dentry->d_inode->i_sb)->base_dir_dentry);
-+
-+	/* bpath_len doesn't count newline! */
-+	*bpath_len = len;
-+ 	return 0;
-+}
-+
-+int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
-+		    dentry_t *src_dentry, struct vfsmount *src_mnt)
-+{
-+	void *buf;
-+	mm_segment_t old_fs;
-+	file_t *tgt_file;
-+	file_t *src_file;
-+	int bytes, len, tmp, err;
-+	err = 0;
-+
-+	if(!(tgt_dentry->d_inode && src_dentry->d_inode)) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR, neg. dentry passed.\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+
-+	dget(tgt_dentry);
-+	dget(src_dentry);
-+	mntget(tgt_mnt);
-+	mntget(src_mnt);
-+
-+	/* open file write only */
-+	tgt_file = dentry_open(tgt_dentry, tgt_mnt, 0x1);
-+	if(!tgt_file || IS_ERR(tgt_file)) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening target file.\n");
-+		err = PTR_ERR(tgt_file);
-+		goto out_err;
-+	}
-+
-+	/* open file read only */
-+	src_file = dentry_open(src_dentry, src_mnt, 0x0);
-+	if(!src_file || IS_ERR(src_file)) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening source file.\n");
-+		err = PTR_ERR(src_file);
-+
-+		/* close target file */
-+		fput(tgt_file);
-+		goto out_err;
-+	}
-+
-+	/* check if the filesystem(s) support read respective write */
-+	if(!src_file->f_op->read || !tgt_file->f_op->write) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR, no fs read or write support.\n");
-+		err = -EPERM;
-+		goto out_close;
-+	}
-+
-+	/* allocate a page for transfering the data */
-+	buf = (void *) __get_free_page(GFP_KERNEL);
-+	if(!buf) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR, out of kernel mem.\n");
-+		goto out_err;
-+	}
-+
-+	tgt_file->f_pos = 0;
-+	src_file->f_pos = 0;
-+
-+	old_fs = get_fs();
-+	set_fs(KERNEL_DS);
-+
-+	/* Doing this I assume that a read operation will return a full
-+	 * buffer while there is still data to read, and a less than
-+	 * full buffer when all data has been read.
-+	 */
-+	bytes = len = PAGE_SIZE;
-+	while(bytes == len) {
-+		bytes = src_file->f_op->read(src_file, buf, len,
-+					     &src_file->f_pos);
-+		tmp = tgt_file->f_op->write(tgt_file, buf, bytes,
-+					    &tgt_file->f_pos);
-+		if(tmp != bytes) {
-+			printk(KERN_CRIT "mini_fo_cp_cont: ERROR writing.\n");
-+			goto out_close_unset;
-+		}
-+	}
-+
-+	free_page((unsigned long) buf);
-+	set_fs(old_fs);
-+	fput(tgt_file);
-+	fput(src_file);
-+	goto out;
-+
-+ out_close_unset:
-+	free_page((unsigned long) buf);
-+	set_fs(old_fs);
-+
-+ out_close:
-+	fput(tgt_file);
-+	fput(src_file);
-+
-+ out_err:
-+	dput(tgt_dentry);
-+	dput(src_dentry);
-+
-+	/* mk: not sure if this need to be done */
-+	mntput(tgt_mnt);
-+	mntput(src_mnt);
-+
-+ out:
-+	return err;
-+}
-+
-+/* mk:
-+ * ndl (no-duplicate list) stuff
-+ * This is used in mini_fo_readdir, to save the storage directory contents
-+ * and later when reading base, match them against the list in order
-+ * to avoid duplicates.
-+ */
-+
-+/* add a file specified by name and len to the ndl
-+ * Return values: 0 on success, <0 on failure.
-+ */
-+int ndl_add_entry(struct readdir_data *rd, const char *name, int len)
-+{
-+	struct ndl_entry *tmp_entry;
-+
-+	tmp_entry = (struct ndl_entry *)
-+		kmalloc(sizeof(struct ndl_entry), GFP_KERNEL);
-+	if(!tmp_entry) {
-+                printk(KERN_CRIT "mini_fo: ndl_add_entry: out of mem.\n");
-+                return -ENOMEM;
-+        }
-+        tmp_entry->name = (char*) kmalloc(len, GFP_KERNEL);
-+        if(!tmp_entry->name) {
-+                printk(KERN_CRIT "mini_fo: ndl_add_entry: out of mem.\n");
-+                return -ENOMEM;
-+        }
-+	strncpy(tmp_entry->name, name, len);
-+        tmp_entry->len = len;
-+
-+        list_add(&tmp_entry->list, &rd->ndl_list);
-+        rd->ndl_size++;
-+        return 0;
-+}
-+
-+/* delete all list entries and free memory */
-+void ndl_put_list(struct readdir_data *rd)
-+{
-+	struct list_head *tmp;
-+	struct ndl_entry *tmp_entry;
-+
-+	if(rd->ndl_size <= 0)
-+		return;
-+	while(!list_empty(&rd->ndl_list)) {
-+		tmp = rd->ndl_list.next;
-+                list_del(tmp);
-+                tmp_entry = list_entry(tmp, struct ndl_entry, list);
-+		kfree(tmp_entry->name);
-+                kfree(tmp_entry);
-+        }
-+	rd->ndl_size = 0;
-+}
-+
-+/* Check if a file specified by name and len is in the ndl
-+ * Return value: 0 if not in list, 1 if file is found in ndl.
-+ */
-+int ndl_check_entry(struct readdir_data *rd, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+	struct ndl_entry *tmp_entry;
-+
-+	if(rd->ndl_size <= 0)
-+		return 0;
-+
-+	list_for_each(tmp, &rd->ndl_list) {
-+                tmp_entry = list_entry(tmp, struct ndl_entry, list);
-+                if(tmp_entry->len != len)
-+                        continue;
-+                if(!strncmp(tmp_entry->name, name, len))
-+                        return 1;
-+        }
-+        return 0;
-+}
-+
-+/* mk:
-+ * Recursive function to create corresponding directorys in the storage fs.
-+ * The function will build the storage directorys up to dentry.
-+ */
-+int build_sto_structure(dentry_t *dir, dentry_t *dentry)
-+{
-+	int err;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	if(dentry->d_parent != dir) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: invalid parameter or meta data corruption [1].\n");
-+		return 1;
-+	}
-+
-+       	if(dtost(dir) != MODIFIED) {
-+		err = build_sto_structure(dir->d_parent, dentry->d_parent);
-+		if(err)
-+			return err;
-+	}
-+
-+	/* ok, coming back again. */
-+	check_mini_fo_dentry(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(!hidden_sto_dentry) {
-+		/*
-+		 * This is the case after creating the first
-+		 * hidden_sto_dentry.
-+		 * After one negative storage_dentry, all pointers to
-+		 * hidden_storage dentries are set to NULL. We need to
-+		 * create the negative dentry before we create the storage
-+		 * file.
-+		 */
-+		unsigned int len;
-+		const unsigned char *name;
-+		len = dtohd(dentry)->d_name.len;
-+		name = dtohd(dentry)->d_name.name;
-+		hidden_sto_dentry = lookup_one_len(name, dtohd2(dir), len);
-+		dtohd2(dentry) = hidden_sto_dentry;
-+	}
-+
-+	/* was:	hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	/* lets be safe */
-+	if(dtohd2(dir) != hidden_sto_dir_dentry) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: invalid parameter or meta data corruption [2].\n");
-+		return 1;
-+	}
-+
-+	/* check for errors in lock_parent */
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+	if(IS_ERR(hidden_sto_dir_dentry)) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: lock_parent failed.\n");
-+		return err;
-+	}
-+
-+	err = vfs_mkdir(hidden_sto_dir_dentry->d_inode,
-+			hidden_sto_dentry,
-+			dir->d_inode->i_mode);
-+
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: failed to create storage dir [1].\n");
-+		/* was: unlock_dir(dir); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&dir->d_inode->i_mutex);
-+#else
-+		up(&dir->d_inode->i_sem);
-+#endif
-+		dput(dir);
-+		return err;
-+	}
-+
-+	/* everything ok! */
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: failed to create storage dir [2].\n");
-+		/* was: unlock_dir(dir); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&dir->d_inode->i_mutex);
-+#else
-+		up(&dir->d_inode->i_sem);
-+#endif
-+		dput(dir);
-+		return 1;
-+	}
-+
-+	/* interpose the new inode and set new state */
-+	itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	dtopd(dentry)->state = MODIFIED;
-+
-+	/* initalize the wol list */
-+	itopd(dentry->d_inode)->deleted_list_size = -1;
-+	itopd(dentry->d_inode)->renamed_list_size = -1;
-+	meta_build_lists(dentry);
-+
-+	fist_copy_attr_all(dentry->d_inode, itohi2(dentry->d_inode));
-+	fist_copy_attr_timesizes(dir->d_inode,
-+				 hidden_sto_dir_dentry->d_inode);
-+	dir->d_inode->i_nlink++;
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+	return 0;
-+}
-+
-+
-+#if 0 /* unused */
-+
-+/*
-+ * Read "len" bytes from "filename" into "buf".
-+ * "buf" is in kernel space.
-+ */
-+int
-+mini_fo_read_file(const char *filename, void *buf, int len)
-+{
-+    file_t *filp;
-+    mm_segment_t oldfs;
-+    int bytes;
-+    /* Chroot? Maybe NULL isn't right here */
-+    filp = filp_open(filename, O_RDONLY, 0);
-+    if (!filp || IS_ERR(filp)) {
-+	printk("mini_fo_read_file err %d\n", (int) PTR_ERR(filp));
-+	return -1;  /* or do something else */
-+    }
-+
-+    if (!filp->f_op->read)
-+	return -2;  /* file(system) doesn't allow reads */
-+
-+    /* now read len bytes from offset 0 */
-+    filp->f_pos = 0;		/* start offset */
-+    oldfs = get_fs();
-+    set_fs(KERNEL_DS);
-+    bytes = filp->f_op->read(filp, buf, len, &filp->f_pos);
-+    set_fs(oldfs);
-+
-+    /* close the file */
-+    fput(filp);
-+
-+    return bytes;
-+}
-+
-+
-+
-+/*
-+ * Write "len" bytes from "buf" to "filename"
-+ * "buf" is in kernel space.
-+ */
-+int
-+mini_fo_write_file(const char *filename, void *buf, int len)
-+{
-+    file_t *filp;
-+    mm_segment_t oldfs;
-+    int bytes;
-+				/* Chroot? Maybe NULL isn't right here */
-+    filp = filp_open(filename, O_RDWR|O_CREAT, 0640);
-+    if (!filp || IS_ERR(filp)) {
-+	printk("mini_fo_write_file err %d\n", (int) PTR_ERR(filp));
-+	return -1;  /* or do something else */
-+    }
-+
-+    if (!filp->f_op->write)
-+	return -2;  /* file(system) doesn't allow writes */
-+
-+    /* now write len bytes from offset 0 */
-+    filp->f_pos = 0;		/* start offset */
-+    oldfs = get_fs();
-+    set_fs(KERNEL_DS);
-+    bytes = filp->f_op->write(filp, buf, len, &filp->f_pos);
-+    set_fs(oldfs);
-+
-+    /* close the file */
-+    fput(filp);
-+
-+    return bytes;
-+}
-+
-+#endif /* unused */
-+
---- /dev/null
-+++ b/fs/mini_fo/ChangeLog
-@@ -0,0 +1,281 @@
-+2006-01-24  Markus Klotzbuecher  <mk@mary.denx.de>
-+
-+	* Add tons of ugly ifdefs to Ed L. Cashin's mutex patch to
-+          retain backwards compatibility.
-+
-+2006-01-24  Ed L. Cashin <ecashin@coraid.com>
-+
-+	* Support for the new mutex infrastructure
-+	(7892f2f48d165a34b0b8130c8a195dfd807b8cb6)
-+
-+2005-10-15  Markus Klotzbuecher  <mk@localhost.localdomain>
-+
-+	* Bugfix for a serious memory leak in mini_fo_follow_link.
-+
-+2005-09-21  Markus Klotzbuecher  <mk@mary>
-+
-+	* new release 0.6.1
-+
-+	* fix of a compiler warning due to changes in 2.6.13
-+
-+2005-09-21  Klaus Wenninger  <klaus.wenninger@siemens.com>
-+
-+	* file.c: readdir: fix for a bug that caused directory entries
-+          to show up twice when using storage filesystems such as
-+          minixfs or pramfs.
-+
-+2005-06-30  Eric Lammerts <eric@lammerts.org>
-+
-+	* fix for an oops when overwriting a binary thats beeing
-+          executed.
-+
-+2005-06-09    <mk@mary>
-+
-+	* Renamed overlay to mini_fo-overlay.
-+
-+	* Added mini_fo-merge script to allow merging of storage and base
-+	after making modifications.
-+
-+2005-05-22  root  <mk@mary>
-+
-+	* Added overlay script that allows to easily mount mini_fo ontop
-+	of a given base directory
-+
-+2005-05-10    <mk@mary>
-+
-+	* inode.c: xattr functions return -EOPNOSUPP instead of
-+          -ENOSUPP, what confuses "ls -l"
-+
-+	* Changed license from LGPL to GPL.
-+
-+2005-05-08  root  <mk@mary>
-+
-+	* Makefile: clean it up and added make install and make
-+          uninstall.
-+
-+2005-05-06    <mk@mary>
-+
-+	* merged devel branch back to main. [v0-6-0-pre3]
-+
-+	* removed unused files print.c and fist_ioctl. [devel-0-0-18]
-+
-+	* ioctl: removed fist_ioctl stuff, that is not needed for
-+          now.
-+
-+2005-05-03    <mk@mary>
-+
-+	* file.c: simplified mini_fo_open and mini_fo_setattr using
-+          new state changing functions. [devel-0-0-17]
-+
-+	* inode.c: Fixed getattr state bug (see below) in 2.4 function
-+          mini_fo_inode revalidate.
-+
-+	* inode.c: found an other bug in mini_fo_getattr. States are not
-+	  reliable in this function, as a file can be opened, unlinked and
-+	  the getattr function called. This results in a deleted dentry
-+	  with an inode. Fix is to ignore states and simply use the inode
-+	  available.
-+
-+2005-04-29    <mk@mary>
-+
-+	* file.c: Bugfix and cleanup in fasync and fsync. [devel-0-0-16]
-+
-+	* file.c: do not use mini_fo_lock so the generic version is
-+          used (I guess).
-+
-+	* inode.c: getattr, never call getattr on lower files, as this
-+          will cause the inum to change.
-+
-+	* inode.c: rename_reg_file renamed to rename_nondir, as it
-+          doesn't matter as long it't not a dir. Removed all
-+          rename_dev_file etc.
-+
-+	* tagged as devel-0-0-15
-+
-+	* inode.c: added support for chosing support for extended
-+          attrs at compile time by XATTR define in mini_fo.h .
-+
-+	* inode.c: fixed mini_fo_getattr to use mini_fo inode and not
-+          lower again, what avoids inode number changes that confused
-+          rm again. This is the proper solution.
-+
-+2005-04-24    <mk@mary>
-+
-+	* all files: updated Copyright notive to 2005. [devel-0-0-14]
-+
-+	* inode.c: fixed mini_fo_getattr to not change the inode
-+          number, even if lower files change.
-+
-+	* super.c: fixed a bug that caused deleted base file to show
-+          up suddenly after some time, or after creating a special
-+          file. The problem was that after some time or after special
-+          file creating sync_sb_inodes is called by the vfs, that
-+          called our mini_fo_put_inode. There was (wrongly) called
-+          __meta_put_lists, that nuked the lists, although the inode
-+          was going to continue its life. Moving __meta_put_lists to
-+          mini_fo_clear_inode, where an inode is really destroyed,
-+          solved the problem.
-+
-+
-+2005-04-23    <mk@mary>
-+
-+	* state.c, aux.c: more cleaning up and
-+          simplifications. [devel-0-0-13]
-+
-+	* inode.c: implemented mini_fo_getattr, that was required for
-+          2.6 because inode_revalidate has been remove there, and the
-+	  old "du" bug returned.
-+
-+
-+2005-04-20    <mk@mary>
-+
-+	* aux.c: get_neg_sto_dentry(): allow to be called for dentries
-+          in state UNMODIFIED, NON_EXISTANT _and_ DELETED.
-+
-+2005-04-19    <mk@mary>
-+
-+	* Fixed a bug under 2.6 that caused files deleted via mini_fo
-+          not to be deleted properly and therefore the fs filled up
-+          untill no memory was left. [devel-0-0-12]
-+
-+	* Added basic hard link support. This means that creating
-+          hardlinks will work, but existing ones will be treated as
-+          individual files. [devel-0-0-11]
-+
-+2005-04-17    <mk@mary>
-+
-+	* Bugfixes
-+
-+2005-04-13  root  <mk@mary>
-+
-+	* Added file state.c for the state transition
-+          functions. Doesn't work very well yet, though...
-+
-+2005-04-12    <mk@mary>
-+
-+	* Porting to 2.6 started, which is easier than expected, also
-+          due to Olivier previous work.
-+
-+2005-04-08    <mk@mary>
-+
-+	* Fixed the bug that caused du to return invalid sizes of
-+          directory trees. The problem was that
-+          mini_fo_inode_revalidate didn't always copy the attributes
-+          from the base inode properly.
-+
-+2005-04-01  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Merged devel branch back to main trunk and updated the
-+          RELEASE notes. This will be 0-6-0-pre1.
-+
-+2005-03-31  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Fixed some bugs in rename_reg_file, that only showed up in
-+          the kernel compile test. Kernel compiles cleanly ontop of
-+          mini_fo, now also make mrproper etc. work. Seems pretty stable.
-+
-+2005-03-28  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Many, many directory renaming bugfixes and a lot of other
-+          cleanup. Dir renaming seems to work relatively stable.
-+
-+2005-03-22  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Finished implementing lightweight directory renaming. Some
-+          basic testing indicates it works fine.
-+	  Next is to implement testcases for the testsuite and confirm
-+          everything is really working ok.
-+
-+2005-03-18  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Finished implementing meta.c stuff required for directory
-+          renaming.
-+
-+2005-03-17  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Fixed all compile warnings + an extremly old bug that
-+          somehow crept in while reworking the wol stuff to the META
-+          system. Turning on -Werror again... :-)
-+
-+	* Fixed some bugs in the new rename_reg_file function.
-+
-+	* Rewrote mini_fo rename and split it into several
-+          subfunctions, that handle the different types
-+          seperately. Rewrote the regular file function aswell, as it
-+          was implemented somewhat inefficient.
-+
-+2005-03-16  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Implemented new META subsystem, removed old WOL stuff in favor
-+	  if it.
-+
-+	* After some basic testing everything seems ok...
-+
-+2005-03-11  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Renaming a non regular file caused trouble because I always
-+	  tried to copy the contents. Now I only do this for regular
-+	  files. mini_fo_rename still isn't implemented properly, renaming
-+	  of device files, symlinks etc. results in a empty regular file
-+	  instead of the proper type.
-+
-+	* Directory renaming suddenly works! What a surprise! I guess
-+          this is because renaming is implemented as making a copy and
-+          removing the original. Still this might not work
-+          everywhere...
-+
-+2005-03-09  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Bugfix, when a mini_fo directory that exists in storage
-+  	  (state: MODIFIED, CREATED and DEL_REWRITTEN) is deleted, a
-+  	  possibly existing WOL file contained in it needs to be
-+  	  deleted too.
-+
-+	* Starting cleanup: defined state names in order to get rid of
-+          the state numbers.
-+
-+2005-03-08  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Makefile fix, fist_ioctl was built against wrong sources if ARCH=um
-+
-+	* Fixed a bug in dentry.c, mini_fo_d_hash. In state 4 =
-+          DEL_REWRITTEN the hash was calculated from the base dentry,
-+          which was wrong and and caused assertions in
-+          __mini_fo_hidden_dentry to fail.
-+
-+2005-02-21    <mk@mary>
-+
-+	* Implemented directory deleting (inode.c)
-+
-+	* main.c: made mini_fo_parse_options a little more robust.
-+
-+2004-12-22    <mk@mary>
-+
-+	* Makefile cleanup and uml stuff, removed unneccessary files
-+
-+	* Created a new and hopefully more informative README
-+
-+	* CHANGELOG: created a new CHANGELOG and added old entries reversely
-+
-+
-+2004-10-24 Gleb Natapov <gleb@nbase.co.il>
-+
-+	* Fix: owner and group where not correctly copied from base to
-+          storage.
-+
-+
-+2004-10-05 Gleb Natapov <gleb@nbase.co.il>
-+
-+	* Implementation of fsync, fasync and lock mini_fo functions.
-+
-+
-+2004-09-29 Bob Lee <bob@pantasys.com>
-+
-+	* Fix of a serious pointer bug
-+
-+
-+2004-09-28 Gleb Natapov <gleb@nbase.co.il>
-+
-+	* Implementation of mini_fo_mknod and mini_fo_rename, support
-+          for device files.
-+
---- /dev/null
-+++ b/fs/mini_fo/dentry.c
-@@ -0,0 +1,244 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+/*
-+ * THIS IS A BOOLEAN FUNCTION: returns 1 if valid, 0 otherwise.
-+ */
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_d_revalidate(dentry_t *dentry, struct nameidata *nd)
-+#else
-+mini_fo_d_revalidate(dentry_t *dentry, int flags)
-+#endif
-+{
-+	int err1 = 1; /* valid = 1, invalid = 0 */
-+	int err2 = 1;
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	hidden_dentry  = dtohd(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(hidden_dentry &&
-+	   hidden_dentry->d_op &&
-+	   hidden_dentry->d_op->d_revalidate) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		err1 = hidden_dentry->d_op->d_revalidate(hidden_dentry, nd);
-+#else
-+		err1 = hidden_dentry->d_op->d_revalidate(hidden_dentry, flags);
-+#endif
-+	}
-+	if(hidden_sto_dentry &&
-+	   hidden_sto_dentry->d_op &&
-+	   hidden_sto_dentry->d_op->d_revalidate) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		err2 = hidden_sto_dentry->d_op->d_revalidate(hidden_sto_dentry,
-+							     nd);
-+#else
-+		err2 = hidden_sto_dentry->d_op->d_revalidate(hidden_sto_dentry,
-+							     flags);
-+#endif
-+	}
-+
-+	/* mk: if one of the lower level dentries are valid,
-+	 * the mini_fo dentry is too.
-+	 */
-+	return (err1 || err2);
-+}
-+
-+
-+STATIC int
-+mini_fo_d_hash(dentry_t *dentry, qstr_t *name)
-+{
-+	int err = 0;
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+	/* hidden_dentry = mini_fo_hidden_dentry(dentry);
-+	 * hidden_sto_dentry = mini_fo_hidden_sto_dentry(dentry); */
-+
-+	/* state 1, 3, 4, 5: build the hash for the storage dentry */
-+	if((dtopd(dentry)->state == MODIFIED) ||
-+	   (dtopd(dentry)->state == CREATED) ||
-+	   (dtopd(dentry)->state == DEL_REWRITTEN) ||
-+	   (dtopd(dentry)->state == DELETED)) {
-+		hidden_sto_dentry = dtohd2(dentry);
-+		if(hidden_sto_dentry &&
-+		   hidden_sto_dentry->d_op &&
-+		   hidden_sto_dentry->d_op->d_hash) {
-+			err = hidden_sto_dentry->d_op->d_hash(hidden_sto_dentry, name);
-+		}
-+		goto out;
-+	}
-+	/* state 2: build the hash for the base dentry */
-+	if(dtopd(dentry)->state == UNMODIFIED) {
-+		hidden_dentry = dtohd(dentry);
-+		if(hidden_dentry &&
-+		   hidden_dentry->d_op &&
-+		   hidden_dentry->d_op->d_hash) {
-+			err = hidden_dentry->d_op->d_hash(hidden_dentry, name);
-+		}
-+		goto out;
-+	}
-+	/* state 6: build hash for the dentry that exists */
-+	if(dtopd(dentry)->state == NON_EXISTANT) {
-+		hidden_sto_dentry = dtohd2(dentry);
-+		if(hidden_sto_dentry &&
-+		   hidden_sto_dentry->d_op &&
-+		   hidden_sto_dentry->d_op->d_hash) {
-+			err = hidden_sto_dentry->d_op->d_hash(hidden_sto_dentry, name);
-+			goto out;
-+		}
-+		hidden_dentry = dtohd(dentry);
-+		if(hidden_dentry &&
-+		   hidden_dentry->d_op &&
-+		   hidden_dentry->d_op->d_hash) {
-+			err = hidden_dentry->d_op->d_hash(hidden_dentry, name);
-+			goto out;
-+		}
-+	}
-+
-+	printk(KERN_CRIT "mini_fo: d_hash: invalid state detected.\n");
-+
-+ out:
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_d_compare(dentry_t *dentry, qstr_t *a, qstr_t *b)
-+{
-+	int err;
-+	dentry_t *hidden_dentry=NULL;
-+
-+	/* hidden_dentry = mini_fo_hidden_dentry(dentry); */
-+	if(dtohd2(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else if(dtohd(dentry))
-+		hidden_dentry = dtohd(dentry);
-+
-+	if (hidden_dentry && hidden_dentry->d_op && hidden_dentry->d_op->d_compare) {
-+		err = hidden_dentry->d_op->d_compare(hidden_dentry, a, b);
-+	} else {
-+		err = ((a->len != b->len) || memcmp(a->name, b->name, b->len));
-+	}
-+
-+	return err;
-+}
-+
-+
-+int
-+mini_fo_d_delete(dentry_t *dentry)
-+{
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+	int err = 0;
-+
-+	/* this could be a negative dentry, so check first */
-+	if (!dtopd(dentry)) {
-+		printk(KERN_CRIT "mini_fo_d_delete: negative dentry passed.\n");
-+		goto out;
-+	}
-+	hidden_dentry = dtohd(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(hidden_dentry) {
-+		if(hidden_dentry->d_op &&
-+		   hidden_dentry->d_op->d_delete) {
-+			err = hidden_dentry->d_op->d_delete(hidden_dentry);
-+		}
-+	}
-+	if(hidden_sto_dentry) {
-+		if(hidden_sto_dentry->d_op &&
-+		   hidden_sto_dentry->d_op->d_delete) {
-+			err = hidden_sto_dentry->d_op->d_delete(hidden_sto_dentry);
-+		}
-+	}
-+
-+ out:
-+	return err;
-+}
-+
-+
-+void
-+mini_fo_d_release(dentry_t *dentry)
-+{
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+
-+	/* this could be a negative dentry, so check first */
-+	if (!dtopd(dentry)) {
-+		printk(KERN_CRIT "mini_fo_d_release: no private data.\n");
-+		goto out;
-+	}
-+	hidden_dentry = dtohd(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(hidden_dentry) {
-+		/* decrement hidden dentry's counter and free its inode */
-+		dput(hidden_dentry);
-+	}
-+	if(hidden_sto_dentry) {
-+                /* decrement hidden dentry's counter and free its inode */
-+		dput(hidden_sto_dentry);
-+	}
-+
-+	/* free private data (mini_fo_dentry_info) here */
-+	kfree(dtopd(dentry));
-+	__dtopd(dentry) = NULL;	/* just to be safe */
-+ out:
-+	return;
-+}
-+
-+
-+/*
-+ * we don't really need mini_fo_d_iput, because dentry_iput will call iput() if
-+ * mini_fo_d_iput is not defined. We left this implemented for ease of
-+ * tracing/debugging.
-+ */
-+void
-+mini_fo_d_iput(dentry_t *dentry, inode_t *inode)
-+{
-+	iput(inode);
-+}
-+
-+
-+struct dentry_operations mini_fo_dops = {
-+	d_revalidate:	mini_fo_d_revalidate,
-+	d_hash:		mini_fo_d_hash,
-+	d_compare:		mini_fo_d_compare,
-+	d_release:		mini_fo_d_release,
-+	d_delete:		mini_fo_d_delete,
-+	d_iput:		mini_fo_d_iput,
-+};
---- /dev/null
-+++ b/fs/mini_fo/file.c
-@@ -0,0 +1,713 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+#define ROUND_UP(x) (((x)+sizeof(long)-1) & ~(sizeof(long)-1))
-+
-+/*******************
-+ * File Operations *
-+ *******************/
-+
-+STATIC loff_t
-+mini_fo_llseek(file_t *file, loff_t offset, int origin)
-+{
-+	loff_t err;
-+	file_t *hidden_file = NULL;
-+
-+	if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {
-+		/* Check if trying to llseek from a directory */
-+		err = -EISDIR;
-+		goto out;
-+	}
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	/* always set hidden position to this one */
-+	hidden_file->f_pos = file->f_pos;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	memcpy(&(hidden_file->f_ra),
-+	       &(file->f_ra),
-+	       sizeof(struct file_ra_state));
-+#else
-+	if (file->f_reada) { /* update readahead information if needed */
-+		hidden_file->f_reada = file->f_reada;
-+		hidden_file->f_ramax = file->f_ramax;
-+		hidden_file->f_raend = file->f_raend;
-+		hidden_file->f_ralen = file->f_ralen;
-+		hidden_file->f_rawin = file->f_rawin;
-+	}
-+#endif
-+	if (hidden_file->f_op && hidden_file->f_op->llseek)
-+		err = hidden_file->f_op->llseek(hidden_file, offset, origin);
-+	else
-+		err = generic_file_llseek(hidden_file, offset, origin);
-+
-+	if (err < 0)
-+		goto out;
-+
-+	if (err != file->f_pos) {
-+		file->f_pos = err;
-+		// ION maybe this?
-+		// 	file->f_pos = hidden_file->f_pos;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		file->f_reada = 0;
-+#endif
-+		file->f_version++;
-+	}
-+
-+ out:
-+	return err;
-+}
-+
-+
-+/* mk: fanout capable */
-+STATIC ssize_t
-+mini_fo_read(file_t *file, char *buf, size_t count, loff_t *ppos)
-+{
-+	int err = -EINVAL;
-+	file_t *hidden_file = NULL;
-+	loff_t pos = *ppos;
-+
-+	if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {
-+		/* Check if trying to read from a directory */
-+		/* printk(KERN_CRIT "mini_fo_read: ERROR: trying to read data from a directory.\n"); */
-+		err = -EISDIR;
-+		goto out;
-+	}
-+
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	if (!hidden_file->f_op || !hidden_file->f_op->read)
-+		goto out;
-+
-+	err = hidden_file->f_op->read(hidden_file, buf, count, &pos);
-+	*ppos = pos;
-+
-+	if (err >= 0) {
-+		/* atime should also be updated for reads of size zero or more */
-+		fist_copy_attr_atime(file->f_dentry->d_inode,
-+				     hidden_file->f_dentry->d_inode);
-+	}
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	/*
-+	 * MAJOR HACK
-+	 * because pread() does not have any way to tell us that it is
-+	 * our caller, then we don't know for sure if we have to update
-+	 * the file positions.  This hack relies on read() having passed us
-+	 * the "real" pointer of its struct file's f_pos field.
-+	 */
-+	if (ppos == &file->f_pos)
-+		hidden_file->f_pos = *ppos = pos;
-+	if (hidden_file->f_reada) { /* update readahead information if needed */
-+		file->f_reada = hidden_file->f_reada;
-+		file->f_ramax = hidden_file->f_ramax;
-+		file->f_raend = hidden_file->f_raend;
-+		file->f_ralen = hidden_file->f_ralen;
-+		file->f_rawin = hidden_file->f_rawin;
-+	}
-+#else
-+	memcpy(&(file->f_ra),&(hidden_file->f_ra),sizeof(struct file_ra_state));
-+#endif
-+
-+ out:
-+	return err;
-+}
-+
-+
-+/* this mini_fo_write() does not modify data pages! */
-+STATIC ssize_t
-+mini_fo_write(file_t *file, const char *buf, size_t count, loff_t *ppos)
-+{
-+	int err = -EINVAL;
-+	file_t *hidden_file = NULL;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	loff_t pos = *ppos;
-+
-+	/* mk: fan out: */
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			/* This is bad! We have no storage file to write to. This
-+			 * should never happen because if a file is opened for
-+			 * writing, a copy should have been made earlier.
-+			 */
-+			printk(KERN_CRIT "mini_fo: write : ERROR, no storage file to write.\n");
-+			err = -EINVAL;
-+			goto out;
-+		}
-+	}
-+
-+	inode = file->f_dentry->d_inode;
-+	hidden_inode = itohi2(inode);
-+	if(!hidden_inode) {
-+		printk(KERN_CRIT "mini_fo: write: no sto inode found, not good.\n");
-+		goto out;
-+	}
-+
-+	if (!hidden_file->f_op || !hidden_file->f_op->write)
-+		goto out;
-+
-+	/* adjust for append -- seek to the end of the file */
-+	if (file->f_flags & O_APPEND)
-+		pos = inode->i_size;
-+
-+	err = hidden_file->f_op->write(hidden_file, buf, count, &pos);
-+
-+	/*
-+	 * copy ctime and mtime from lower layer attributes
-+	 * atime is unchanged for both layers
-+	 */
-+	if (err >= 0)
-+		fist_copy_attr_times(inode, hidden_inode);
-+
-+	*ppos = pos;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	/*
-+	 * XXX: MAJOR HACK
-+	 *
-+	 * because pwrite() does not have any way to tell us that it is
-+	 * our caller, then we don't know for sure if we have to update
-+	 * the file positions.  This hack relies on write() having passed us
-+	 * the "real" pointer of its struct file's f_pos field.
-+	 */
-+	if (ppos == &file->f_pos)
-+		hidden_file->f_pos = *ppos = pos;
-+#endif
-+	/* update this inode's size */
-+	if (pos > inode->i_size)
-+		inode->i_size = pos;
-+
-+ out:
-+	return err;
-+}
-+
-+/* Global variable to hold a file_t pointer.
-+ * This serves to allow mini_fo_filldir function to know which file is
-+ * beeing read, which is required for two reasons:
-+ *
-+ *   - be able to call wol functions in order to avoid listing deleted
-+ *     base files.
-+ *   - if we're reading a directory which is in state 1, we need to
-+ *     maintain a list (in mini_fo_filldir) of which files allready
-+ *     have been copied to userspace,to detect files existing in base
-+ *     and storage and not list them twice.
-+ */
-+filldir_t mini_fo_filldir_orig;
-+file_t *mini_fo_filldir_file;
-+
-+/* mainly copied from fs/readdir.c */
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_filldir(void * __buf, const char * name, int namlen, loff_t offset,
-+		  u64 ino, unsigned int d_type)
-+#else
-+mini_fo_filldir(void * __buf, const char * name, int namlen, loff_t offset,
-+		  ino_t ino, unsigned int d_type)
-+#endif
-+{
-+	struct getdents_callback * buf = (struct getdents_callback *) __buf;
-+	file_t* file = mini_fo_filldir_file;
-+
-+	/* In theses states we filter meta files in storage (WOL) */
-+	if(file && (dtopd(file->f_dentry)->state == MODIFIED ||
-+		    dtopd(file->f_dentry)->state == CREATED ||
-+		    dtopd(file->f_dentry)->state == DEL_REWRITTEN)) {
-+
-+		int tmp = strlen(META_FILENAME);
-+		if(tmp  == namlen) {
-+			if(!strncmp(name, META_FILENAME, namlen))
-+				return 0;
-+		}
-+	}
-+
-+	/* check if we are merging the contents of storage and base */
-+	if(file && dtopd(file->f_dentry)->state == MODIFIED) {
-+		/* check if we are still reading storage contents, if
-+		 * yes, we just save the name of the file for duplicate
-+		 * checking later. */
-+
-+		if(!ftopd(file)->rd.sto_done) {
-+			/* put file into ndl list */
-+			if(ndl_add_entry(&ftopd(file)->rd, name, namlen))
-+				printk(KERN_CRIT "mini_fo_filldir: Error adding to ndl.\n");
-+		} else {
-+			/* check if file has been deleted */
-+			if(meta_check_d_entry(file->f_dentry, name, namlen))
-+				return 0;
-+
-+			/* do duplicate checking */
-+			if(ndl_check_entry(&ftopd(file)->rd, name, namlen))
-+				return 0;
-+		}
-+	}
-+
-+	return mini_fo_filldir_orig(buf, name, namlen, offset, ino, d_type);
-+}
-+
-+
-+STATIC int
-+mini_fo_readdir(file_t *file, void *dirent, filldir_t filldir)
-+{
-+	int err = 0;/* mk: ??? -ENOTDIR; */
-+	file_t *hidden_file = NULL;
-+	file_t *hidden_sto_file = NULL;
-+	inode_t *inode;
-+	struct getdents_callback *buf;
-+	int oldcount;
-+
-+#if defined(FIST_FILTER_NAME) || defined(FIST_FILTER_SCA)
-+	struct mini_fo_getdents_callback buf;
-+#endif /* FIST_FILTER_NAME || FIST_FILTER_SCA */
-+
-+	buf = (struct getdents_callback *) dirent;
-+	oldcount = buf->count;
-+	inode = file->f_dentry->d_inode;
-+	mini_fo_filldir_file = file;
-+	mini_fo_filldir_orig = filldir;
-+
-+	ftopd(file)->rd.sto_done = 0;
-+	do {
-+		if (ftopd(file) != NULL) {
-+			if(ftohf2(file)) {
-+				hidden_sto_file = ftohf2(file);
-+				err = vfs_readdir(hidden_sto_file, mini_fo_filldir, dirent);
-+				file->f_pos = hidden_sto_file->f_pos;
-+				if (err > 0)
-+					fist_copy_attr_atime(inode, hidden_sto_file->f_dentry->d_inode);
-+				/* not finshed yet, we'll be called again */
-+				if (buf->count != oldcount)
-+					break;
-+			}
-+
-+			ftopd(file)->rd.sto_done = 1;
-+
-+			if(ftohf(file)) {
-+				hidden_file = ftohf(file);
-+				err = vfs_readdir(hidden_file, mini_fo_filldir, dirent);
-+				file->f_pos = hidden_file->f_pos;
-+				if (err > 0)
-+					fist_copy_attr_atime(inode, hidden_file->f_dentry->d_inode);
-+			}
-+
-+		}
-+	} while (0);
-+
-+	/* mk:
-+	 * we need to check if all the directory data has been copied to userspace,
-+	 * or if we will be called again by userspace to complete the operation.
-+	 */
-+	if(buf->count == oldcount) {
-+		ndl_put_list(&ftopd(file)->rd);
-+	}
-+
-+	/* unset this, safe */
-+	mini_fo_filldir_file = NULL;
-+	return err;
-+}
-+
-+
-+STATIC unsigned int
-+mini_fo_poll(file_t *file, poll_table *wait)
-+{
-+	unsigned int mask = DEFAULT_POLLMASK;
-+	file_t *hidden_file = NULL;
-+
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	if (!hidden_file->f_op || !hidden_file->f_op->poll)
-+		goto out;
-+
-+	mask = hidden_file->f_op->poll(hidden_file, wait);
-+
-+ out:
-+	return mask;
-+}
-+
-+/* FIST-LITE special version of mmap */
-+STATIC int
-+mini_fo_mmap(file_t *file, vm_area_t *vma)
-+{
-+	int err = 0;
-+	file_t *hidden_file = NULL;
-+
-+	/* fanout capability */
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	ASSERT(hidden_file != NULL);
-+	ASSERT(hidden_file->f_op != NULL);
-+	ASSERT(hidden_file->f_op->mmap != NULL);
-+
-+	vma->vm_file = hidden_file;
-+	err = hidden_file->f_op->mmap(hidden_file, vma);
-+	get_file(hidden_file); /* make sure it doesn't get freed on us */
-+	fput(file);	       /* no need to keep extra ref on ours */
-+
-+	return err;
-+}
-+
-+
-+
-+STATIC int
-+mini_fo_open(inode_t *inode, file_t *file)
-+{
-+	int err = 0;
-+ 	int hidden_flags;
-+	file_t *hidden_file = NULL;
-+	dentry_t *hidden_dentry = NULL;
-+
-+	/* fanout stuff */
-+	file_t *hidden_sto_file = NULL;
-+	dentry_t *hidden_sto_dentry = NULL;
-+
-+	__ftopd(file) =
-+		kmalloc(sizeof(struct mini_fo_file_info), GFP_KERNEL);
-+	if (!ftopd(file)) {
-+		err = -ENOMEM;
-+		goto out;
-+	}
-+
-+	/* init the readdir_helper structure */
-+	INIT_LIST_HEAD(&ftopd(file)->rd.ndl_list);
-+	ftopd(file)->rd.ndl_size = 0;
-+
-+	/* In certain paths this could stay uninitalized and cause trouble */
-+	ftohf(file) = NULL;
-+	ftohf2(file) = NULL;
-+	hidden_flags = file->f_flags;
-+
-+	/* create storage files? */
-+	if(dtost(file->f_dentry) == UNMODIFIED) {
-+		if(!IS_WRITE_FLAG(file->f_flags)) {
-+			hidden_dentry = dtohd(file->f_dentry);
-+			dget(hidden_dentry);
-+			/* dentry_open will decrement mnt refcnt if err.
-+			 * otherwise fput() will do an mntput() for us upon file close. */
-+			mntget(stopd(inode->i_sb)->hidden_mnt);
-+			hidden_file = dentry_open(hidden_dentry,
-+						  stopd(inode->i_sb)->hidden_mnt,
-+						  hidden_flags);
-+			if (IS_ERR(hidden_file)) {
-+				err = PTR_ERR(hidden_file);
-+				dput(hidden_dentry);
-+				goto out;
-+			}
-+			ftohf(file) = hidden_file;	/* link two files */
-+			goto out;
-+		}
-+		else {
-+			if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {
-+				err = dir_unmod_to_mod(file->f_dentry);
-+			} else
-+				err = nondir_unmod_to_mod(file->f_dentry, 1);
-+
-+			if (err) {
-+				printk("mini_fo_open: ERROR creating storage file.\n");
-+				goto out;
-+			}
-+		}
-+	}
-+	hidden_sto_dentry = dtohd2(file->f_dentry);
-+	dget(hidden_sto_dentry);
-+
-+	if(dtopd(file->f_dentry)->state == MODIFIED) {
-+		/* Directorys are special, interpose on both lower level files */
-+		if(S_ISDIR(itohi(inode)->i_mode)) {
-+			/* check for invalid file types of lower level files */
-+			if(!(S_ISDIR(itohi(inode)->i_mode) && S_ISDIR(itohi2(inode)->i_mode))) {
-+				printk(KERN_CRIT "mini_fo_open: meta data corruption detected.\n");
-+				dput(hidden_sto_dentry);
-+				err = -EINVAL;
-+				goto out;
-+			}
-+
-+			/* lower level directorys are ok, open the base file */
-+			hidden_dentry = dtohd(file->f_dentry);
-+			dget(hidden_dentry);
-+
-+			mntget(stopd(inode->i_sb)->hidden_mnt);
-+			hidden_file = dentry_open(hidden_dentry,
-+						  stopd(inode->i_sb)->hidden_mnt,
-+						  hidden_flags);
-+			if (IS_ERR(hidden_file)) {
-+				err = PTR_ERR(hidden_file);
-+				dput(hidden_dentry);
-+				dput(hidden_sto_dentry);
-+				goto out;
-+			}
-+			ftohf(file) = hidden_file; /* link the two files */
-+		}
-+	}
-+
-+	if(!exists_in_storage(file->f_dentry)) {
-+		printk(KERN_CRIT "mini_fo_open: invalid file state detected.\n");
-+		err = -EINVAL;
-+		dput(hidden_sto_dentry);
-+
-+		/* If the base file has been opened, we need to close it here */
-+		if(ftohf(file)) {
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				hidden_file->f_op->flush(hidden_file, NULL);
-+#else
-+				hidden_file->f_op->flush(hidden_file);
-+#endif
-+			dput(hidden_dentry);
-+		}
-+		goto out;
-+	}
-+
-+	/* ok, now we can safely open the storage file */
-+	mntget(stopd(inode->i_sb)->hidden_mnt2);
-+	hidden_sto_file = dentry_open(hidden_sto_dentry,
-+				      stopd(inode->i_sb)->hidden_mnt2,
-+				      hidden_flags);
-+
-+	/* dentry_open dputs the dentry if it fails */
-+	if (IS_ERR(hidden_sto_file)) {
-+		err = PTR_ERR(hidden_sto_file);
-+		/* close base file if open */
-+		if(ftohf(file)) {
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				hidden_file->f_op->flush(hidden_file, NULL);
-+#else
-+				hidden_file->f_op->flush(hidden_file);
-+#endif
-+			dput(hidden_dentry);
-+		}
-+		goto out;
-+	}
-+	ftohf2(file) = hidden_sto_file; /* link storage file */
-+
-+ out:
-+	if (err < 0 && ftopd(file)) {
-+		kfree(ftopd(file));
-+	}
-+	return err;
-+}
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_flush(file_t *file, fl_owner_t id)
-+#else
-+mini_fo_flush(file_t *file)
-+#endif
-+{
-+	int err1 = 0;		/* assume ok (see open.c:close_fp) */
-+	int err2 = 0;
-+	file_t *hidden_file = NULL;
-+
-+	check_mini_fo_file(file);
-+
-+	/* mk: we don't do any state checking here, as its not worth the time.
-+	 * Just flush the lower level files if they exist.
-+	 */
-+	if(ftopd(file) != NULL) {
-+		if(ftohf(file) != NULL) {
-+			hidden_file = ftohf(file);
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				err1 = hidden_file->f_op->flush(hidden_file, id);
-+#else
-+				err1 = hidden_file->f_op->flush(hidden_file);
-+#endif
-+		}
-+		if(ftohf2(file) != NULL) {
-+			hidden_file = ftohf2(file);
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				err2 = hidden_file->f_op->flush(hidden_file, id);
-+#else
-+				err2 = hidden_file->f_op->flush(hidden_file);
-+#endif
-+		}
-+	}
-+	return (err1 | err2);
-+}
-+
-+
-+STATIC int
-+mini_fo_release(inode_t *inode, file_t *file)
-+{
-+	int err = 0;
-+	file_t *hidden_file = NULL;
-+
-+	if (ftopd(file) != NULL) {
-+		if(ftohf(file)) {
-+			hidden_file = ftohf(file);
-+			fput(hidden_file);
-+		}
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+			fput(hidden_file);
-+		}
-+		kfree(ftopd(file));
-+	}
-+	return err;
-+}
-+
-+STATIC int
-+mini_fo_fsync(file_t *file, dentry_t *dentry, int datasync)
-+{
-+	int err1 = 0;
-+	int err2 = 0;
-+	file_t *hidden_file = NULL;
-+	dentry_t *hidden_dentry;
-+
-+	check_mini_fo_file(file);
-+
-+	if ((hidden_file = ftohf(file)) != NULL) {
-+		hidden_dentry = dtohd(dentry);
-+		if (hidden_file->f_op && hidden_file->f_op->fsync) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+			err1 = hidden_file->f_op->fsync(hidden_file, hidden_dentry, datasync);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		}
-+	}
-+
-+	if ((hidden_file = ftohf2(file)) != NULL) {
-+		hidden_dentry = dtohd2(dentry);
-+		if (hidden_file->f_op && hidden_file->f_op->fsync) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+			err2 = hidden_file->f_op->fsync(hidden_file, hidden_dentry, datasync);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		}
-+	}
-+	else
-+		goto err;
-+
-+err:
-+	return (err1 || err2);
-+}
-+
-+
-+STATIC int
-+mini_fo_fasync(int fd, file_t *file, int flag)
-+{
-+	int err1 = 0;
-+	int err2 = 0;
-+
-+	file_t *hidden_file = NULL;
-+
-+	check_mini_fo_file(file);
-+
-+	if((hidden_file = ftohf(file)) != NULL) {
-+		err1 = hidden_file->f_op->fasync(fd, hidden_file, flag);
-+	}
-+	if((hidden_file = ftohf2(file)) != NULL) {
-+		err2 = hidden_file->f_op->fasync(fd, hidden_file, flag);
-+	}
-+
-+	return (err1 || err2);
-+}
-+
-+
-+
-+struct file_operations mini_fo_dir_fops =
-+	{
-+		read:	generic_read_dir,
-+		write:	mini_fo_write,
-+		readdir: mini_fo_readdir,
-+		poll:	mini_fo_poll,
-+		/* ioctl:	mini_fo_ioctl, */
-+		mmap:	mini_fo_mmap,
-+		open:	mini_fo_open,
-+		flush:	mini_fo_flush,
-+		release: mini_fo_release,
-+		fsync:	mini_fo_fsync,
-+		fasync:	mini_fo_fasync,
-+		/* not needed lock:	mini_fo_lock, */
-+		/* not needed: readv */
-+		/* not needed: writev */
-+		/* not implemented: sendpage */
-+		/* not implemented: get_unmapped_area */
-+	};
-+
-+struct file_operations mini_fo_main_fops =
-+	{
-+		llseek:	mini_fo_llseek,
-+		read:	mini_fo_read,
-+		write:	mini_fo_write,
-+		readdir: mini_fo_readdir,
-+		poll:	mini_fo_poll,
-+		/* ioctl:	mini_fo_ioctl, */
-+		mmap:	mini_fo_mmap,
-+		open:	mini_fo_open,
-+		flush:	mini_fo_flush,
-+		release: mini_fo_release,
-+		fsync:	mini_fo_fsync,
-+		fasync:	mini_fo_fasync,
-+		/* not needed: lock:	mini_fo_lock, */
-+		/* not needed: readv */
-+		/* not needed: writev */
-+		/* not implemented: sendpage */
-+		/* not implemented: get_unmapped_area */
-+	};
---- /dev/null
-+++ b/fs/mini_fo/fist.h
-@@ -0,0 +1,254 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifndef __FIST_H_
-+#define __FIST_H_
-+
-+/*
-+ * KERNEL ONLY CODE:
-+ */
-+#ifdef __KERNEL__
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
-+#include <linux/autoconf.h>
-+#else
-+#include <linux/config.h>
-+#endif
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+#ifdef CONFIG_MODVERSIONS
-+# define MODVERSIONS
-+# include <linux/modversions.h>
-+#endif /* CONFIG_MODVERSIONS */
-+#endif /* KERNEL_VERSION < 2.6.0 */
-+#include <linux/sched.h>
-+#include <linux/kernel.h>
-+#include <linux/mm.h>
-+#include <linux/string.h>
-+#include <linux/stat.h>
-+#include <linux/errno.h>
-+#include <linux/wait.h>
-+#include <linux/limits.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+#include <linux/locks.h>
-+#else
-+#include <linux/buffer_head.h>
-+#include <linux/pagemap.h>
-+#include <linux/namei.h>
-+#include <linux/module.h>
-+#include <linux/mount.h>
-+#include <linux/page-flags.h>
-+#include <linux/writeback.h>
-+#include <linux/statfs.h>
-+#endif
-+#include <linux/smp.h>
-+#include <linux/smp_lock.h>
-+#include <linux/file.h>
-+#include <linux/slab.h>
-+#include <linux/vmalloc.h>
-+#include <linux/poll.h>
-+#include <linux/list.h>
-+#include <linux/init.h>
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)
-+#include <linux/xattr.h>
-+#endif
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#include <linux/security.h>
-+#endif
-+
-+#include <linux/swap.h>
-+
-+#include <asm/system.h>
-+/* #include <asm/segment.h> */
-+#include <asm/mman.h>
-+#include <linux/seq_file.h>
-+
-+/*
-+ * MACROS:
-+ */
-+
-+/* those mapped to ATTR_* were copied from linux/fs.h */
-+#define FA_MODE		ATTR_MODE
-+#define FA_UID		ATTR_UID
-+#define FA_GID		ATTR_GID
-+#define FA_SIZE		ATTR_SIZE
-+#define FA_ATIME	ATTR_ATIME
-+#define FA_MTIME	ATTR_MTIME
-+#define FA_CTIME	ATTR_CTIME
-+#define FA_ATIME_SET	ATTR_ATIME_SET
-+#define FA_MTIME_SET	ATTR_MTIME_SET
-+#define FA_FORCE	ATTR_FORCE
-+#define FA_ATTR_FLAGS	ATTR_ATTR_FLAG
-+
-+/* must be greater than all other ATTR_* flags! */
-+#define FA_NLINK	2048
-+#define FA_BLKSIZE	4096
-+#define FA_BLOCKS	8192
-+#define FA_TIMES	(FA_ATIME|FA_MTIME|FA_CTIME)
-+#define FA_ALL		0
-+
-+/* macros to manage changes between kernels */
-+#define INODE_DATA(i)	(&(i)->i_data)
-+
-+#define MIN(x,y) ((x < y) ? (x) : (y))
-+#define MAX(x,y) ((x > y) ? (x) : (y))
-+#define MAXPATHLEN PATH_MAX
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,5)
-+# define lookup_one_len(a,b,c) lookup_one(a,b)
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,4,5) */
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,8)
-+# define generic_file_llseek default_llseek
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,4,8) */
-+
-+#ifndef SEEK_SET
-+# define SEEK_SET 0
-+#endif /* not SEEK_SET */
-+
-+#ifndef SEEK_CUR
-+# define SEEK_CUR 1
-+#endif /* not SEEK_CUR */
-+
-+#ifndef SEEK_END
-+# define SEEK_END 2
-+#endif /* not SEEK_END */
-+
-+#ifndef DEFAULT_POLLMASK
-+# define DEFAULT_POLLMASK (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)
-+#endif /* not DEFAULT_POLLMASK */
-+
-+/* XXX: fix this so fistgen generates kfree() code directly */
-+#define kfree_s(a,b) kfree(a)
-+
-+/*
-+ * TYPEDEFS:
-+ */
-+typedef struct dentry dentry_t;
-+typedef struct file file_t;
-+typedef struct inode inode_t;
-+typedef inode_t vnode_t;
-+typedef struct page page_t;
-+typedef struct qstr qstr_t;
-+typedef struct super_block super_block_t;
-+typedef super_block_t vfs_t;
-+typedef struct vm_area_struct vm_area_t;
-+
-+
-+/*
-+ * EXTERNALS:
-+ */
-+
-+#define FPPF(str,page) printk("PPF %s 0x%x/%d: Lck:%d Err:%d Ref:%d Upd:%d Other::%d:%d:%d:%d:\n", \
-+		str, \
-+		(int) page, \
-+		(int) page->index, \
-+		(PageLocked(page) ? 1 : 0), \
-+		(PageError(page) ? 1 : 0), \
-+		(PageReferenced(page) ? 1 : 0), \
-+		(Page_Uptodate(page) ? 1 : 0), \
-+		(PageDecrAfter(page) ? 1 : 0), \
-+		(PageSlab(page) ? 1 : 0), \
-+		(PageSwapCache(page) ? 1 : 0), \
-+		(PageReserved(page) ? 1 : 0) \
-+		)
-+#define EZKDBG printk("EZK %s:%d:%s\n",__FILE__,__LINE__,__FUNCTION__)
-+#if 0
-+# define EZKDBG1 printk("EZK %s:%d\n",__FILE__,__LINE__)
-+#else
-+# define EZKDBG1
-+#endif
-+
-+extern int fist_get_debug_value(void);
-+extern int fist_set_debug_value(int val);
-+#if 0 /* mini_fo doesn't need these */
-+extern void fist_dprint_internal(int level, char *str,...);
-+extern void fist_print_dentry(char *str, const dentry_t *dentry);
-+extern void fist_print_inode(char *str, const inode_t *inode);
-+extern void fist_print_file(char *str, const file_t *file);
-+extern void fist_print_buffer_flags(char *str, struct buffer_head *buffer);
-+extern void fist_print_page_flags(char *str, page_t *page);
-+extern void fist_print_page_bytes(char *str, page_t *page);
-+extern void fist_print_pte_flags(char *str, const page_t *page);
-+extern void fist_checkinode(inode_t *inode, char *msg);
-+extern void fist_print_sb(char *str, const super_block_t *sb);
-+
-+/* §$% by mk: special debug functions */
-+extern void fist_mk_print_dentry(char *str, const dentry_t *dentry);
-+extern void fist_mk_print_inode(char *str, const inode_t *inode);
-+
-+extern char *add_indent(void);
-+extern char *del_indent(void);
-+#endif/* mini_fo doesn't need these */
-+
-+
-+#define STATIC
-+#define ASSERT(EX)	\
-+do {	\
-+    if (!(EX)) {	\
-+	printk(KERN_CRIT "ASSERTION FAILED: %s at %s:%d (%s)\n", #EX,	\
-+	       __FILE__, __LINE__, __FUNCTION__);	\
-+	(*((char *)0))=0;	\
-+    }	\
-+} while (0)
-+/* same ASSERT, but tell me who was the caller of the function */
-+#define ASSERT2(EX)	\
-+do {	\
-+    if (!(EX)) {	\
-+	printk(KERN_CRIT "ASSERTION FAILED (caller): %s at %s:%d (%s)\n", #EX,	\
-+	       file, line, func);	\
-+	(*((char *)0))=0;	\
-+    }	\
-+} while (0)
-+
-+#if 0 /* mini_fo doesn't need these */
-+#define dprintk(format, args...) printk(KERN_DEBUG format, ##args)
-+#define fist_dprint(level, str, args...) fist_dprint_internal(level, KERN_DEBUG str, ## args)
-+#define print_entry_location() fist_dprint(4, "%sIN:  %s %s:%d\n", add_indent(), __FUNCTION__, __FILE__, __LINE__)
-+#define print_exit_location() fist_dprint(4, "%s OUT: %s %s:%d\n", del_indent(), __FUNCTION__, __FILE__, __LINE__)
-+#define print_exit_status(status) fist_dprint(4, "%s OUT: %s %s:%d, STATUS: %d\n", del_indent(), __FUNCTION__, __FILE__, __LINE__, status)
-+#define print_exit_pointer(status) \
-+do { \
-+  if (IS_ERR(status)) \
-+    fist_dprint(4, "%s OUT: %s %s:%d, RESULT: %ld\n", del_indent(), __FUNCTION__, __FILE__, __LINE__, PTR_ERR(status)); \
-+  else \
-+    fist_dprint(4, "%s OUT: %s %s:%d, RESULT: 0x%x\n", del_indent(), __FUNCTION__, __FILE__, __LINE__, PTR_ERR(status)); \
-+} while (0)
-+#endif/* mini_fo doesn't need these */
-+
-+#endif /* __KERNEL__ */
-+
-+
-+/*
-+ * DEFINITIONS FOR USER AND KERNEL CODE:
-+ * (Note: ioctl numbers 1--9 are reserved for fistgen, the rest
-+ *  are auto-generated automatically based on the user's .fist file.)
-+ */
-+# define FIST_IOCTL_GET_DEBUG_VALUE	_IOR(0x15, 1, int)
-+# define FIST_IOCTL_SET_DEBUG_VALUE	_IOW(0x15, 2, int)
-+
-+#endif /* not __FIST_H_ */
---- /dev/null
-+++ b/fs/mini_fo/inode.c
-@@ -0,0 +1,1564 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd)
-+#else
-+mini_fo_create(inode_t *dir, dentry_t *dentry, int mode)
-+#endif
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	err = create_sto_reg_file(dentry, mode, nd);
-+#else
-+	err = create_sto_reg_file(dentry, mode);
-+#endif
-+	check_mini_fo_dentry(dentry);
-+	return err;
-+}
-+
-+
-+STATIC dentry_t *
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_lookup(inode_t *dir, dentry_t *dentry, struct nameidata* nd)
-+#else
-+mini_fo_lookup(inode_t *dir, dentry_t *dentry)
-+#endif
-+{
-+	int err = 0;
-+	dentry_t *hidden_dir_dentry;
-+	dentry_t *hidden_dentry = NULL;
-+
-+	dentry_t *hidden_sto_dir_dentry;
-+	dentry_t *hidden_sto_dentry = NULL;
-+
-+	/* whiteout flag */
-+	int del_flag = 0;
-+	char *bpath = NULL;
-+
-+	const char *name;
-+	unsigned int namelen;
-+
-+	/* Don't allow lookups of META-files */
-+	namelen = strlen(META_FILENAME);
-+	if(namelen == dentry->d_name.len) {
-+		if(!strncmp(dentry->d_name.name, META_FILENAME, namelen)) {
-+			err = -ENOENT;
-+			goto out;
-+		}
-+	}
-+
-+	hidden_dir_dentry = dtohd(dentry->d_parent);
-+	hidden_sto_dir_dentry = dtohd2(dentry->d_parent);
-+
-+	name = dentry->d_name.name;
-+	namelen = dentry->d_name.len;
-+
-+	/* must initialize dentry operations */
-+	dentry->d_op = &mini_fo_dops;
-+
-+	/* setup the del_flag */
-+	del_flag = __meta_check_d_entry(dir, name, namelen);
-+	bpath = __meta_check_r_entry(dir, name, namelen);
-+
-+	/* perform the lookups of base and storage files:
-+	 *
-+	 * This caused some serious trouble, as a lookup_one_len passing
-+	 * a negative dentry oopses. Solution is to only do the lookup
-+	 * if the dentry is positive, else we set it to NULL
-+	 * More trouble, who said a *_dir_dentry can't be NULL?
-+	 */
-+	if(bpath) {
-+		/* Cross-Interposing (C), yeah! */
-+		hidden_dentry = bpath_walk(dir->i_sb, bpath);
-+		if(!hidden_dentry || !hidden_dentry->d_inode) {
-+			printk(KERN_CRIT "mini_fo_lookup: bpath_walk failed.\n");
-+			err= -EINVAL;
-+			goto out;
-+		}
-+
-+		/* this can be set up safely without fear of spaghetti
-+		 * interposing as it is only used for copying times */
-+		hidden_dir_dentry = hidden_dentry->d_parent;
-+		kfree(bpath);
-+	}
-+	else if(hidden_dir_dentry && hidden_dir_dentry->d_inode)
-+		hidden_dentry =
-+			lookup_one_len(name, hidden_dir_dentry, namelen);
-+	else
-+		hidden_dentry = NULL;
-+
-+	if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode)
-+		hidden_sto_dentry =
-+			lookup_one_len(name, hidden_sto_dir_dentry, namelen);
-+	else
-+		hidden_sto_dentry =  NULL;
-+
-+	/* catch error in lookup */
-+	if (IS_ERR(hidden_dentry) || IS_ERR(hidden_sto_dentry)) {
-+		/* mk: we need to call dput on the dentry, whose
-+		 * lookup_one_len operation failed, in order to avoid
-+		 * unmount trouble.
-+		 */
-+		if(IS_ERR(hidden_dentry)) {
-+			printk(KERN_CRIT "mini_fo_lookup: ERR from base dentry, lookup failed.\n");
-+			err = PTR_ERR(hidden_dentry);
-+		} else {
-+			dput(hidden_dentry);
-+		}
-+		if(IS_ERR(hidden_sto_dentry)) {
-+			printk(KERN_CRIT "mini_fo_lookup: ERR from storage dentry, lookup failed.\n");
-+			err = PTR_ERR(hidden_sto_dentry);
-+		} else {
-+			dput(hidden_sto_dentry);
-+		}
-+		goto out;
-+	}
-+
-+	/* allocate dentry private data */
-+	__dtopd(dentry) = (struct mini_fo_dentry_info *)
-+		kmalloc(sizeof(struct mini_fo_dentry_info), GFP_KERNEL);
-+
-+	if (!dtopd(dentry)) {
-+		err = -ENOMEM;
-+		goto out_dput;
-+	}
-+
-+	/* check for different states of the mini_fo file to be looked up. */
-+
-+	/* state 1, file has been modified */
-+	if(hidden_dentry && hidden_sto_dentry &&
-+	   hidden_dentry->d_inode && hidden_sto_dentry->d_inode && !del_flag) {
-+
-+		/* update parent directory's atime */
-+		fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+
-+		dtopd(dentry)->state = MODIFIED;
-+		dtohd(dentry) = hidden_dentry;
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		err = mini_fo_tri_interpose(hidden_dentry,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state1).\n");
-+			goto out_free;
-+		}
-+		goto out;
-+	}
-+	/* state 2, file is unmodified */
-+	if(hidden_dentry && hidden_dentry->d_inode && !del_flag) {
-+
-+		fist_copy_attr_atime(dir, hidden_dir_dentry->d_inode);
-+
-+		dtopd(dentry)->state = UNMODIFIED;
-+		dtohd(dentry) = hidden_dentry;
-+		dtohd2(dentry) = hidden_sto_dentry; /* could be negative */
-+
-+		err = mini_fo_tri_interpose(hidden_dentry,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state2).\n");
-+			goto out_free;
-+		}
-+		goto out;
-+	}
-+	/* state 3, file has been newly created */
-+	if(hidden_sto_dentry && hidden_sto_dentry->d_inode && !del_flag) {
-+
-+		fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+		dtopd(dentry)->state = CREATED;
-+		dtohd(dentry) = hidden_dentry; /* could be negative */
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		err = mini_fo_tri_interpose(hidden_dentry,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state3).\n");
-+			goto out_free;
-+		}
-+		goto out;
-+	}
-+
-+	/* state 4, file has deleted and created again. */
-+	if(hidden_dentry && hidden_sto_dentry &&
-+	   hidden_dentry->d_inode &&
-+	   hidden_sto_dentry->d_inode && del_flag) {
-+
-+		fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+		dtopd(dentry)->state = DEL_REWRITTEN;
-+		dtohd(dentry) = NULL;
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		err = mini_fo_tri_interpose(NULL,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state4).\n");
-+			goto out_free;
-+		}
-+		/* We will never need this dentry again, as the file has been
-+		 * deleted from base */
-+		dput(hidden_dentry);
-+		goto out;
-+	}
-+	/* state 5, file has been deleted in base */
-+	if(hidden_dentry && hidden_sto_dentry &&
-+	   hidden_dentry->d_inode &&
-+	   !hidden_sto_dentry->d_inode && del_flag) {
-+
-+		/* check which parents atime we need for updating */
-+		if(hidden_sto_dir_dentry->d_inode)
-+			fist_copy_attr_atime(dir,
-+					     hidden_sto_dir_dentry->d_inode);
-+		else
-+			fist_copy_attr_atime(dir,
-+					     hidden_dir_dentry->d_inode);
-+
-+		dtopd(dentry)->state = DELETED;
-+		dtohd(dentry) = NULL;
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		/* add negative dentry to dcache to speed up lookups */
-+		d_add(dentry, NULL);
-+		dput(hidden_dentry);
-+		goto out;
-+	}
-+	/* state 6, file does not exist */
-+	if(((hidden_dentry && !hidden_dentry->d_inode) ||
-+	    (hidden_sto_dentry && !hidden_sto_dentry->d_inode)) && !del_flag)
-+		{
-+			/* check which parents atime we need for updating */
-+			if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode)
-+				fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+			else
-+				fist_copy_attr_atime(dir, hidden_dir_dentry->d_inode);
-+
-+			dtopd(dentry)->state = NON_EXISTANT;
-+			dtohd(dentry) = hidden_dentry;
-+			dtohd2(dentry) = hidden_sto_dentry;
-+			d_add(dentry, NULL);
-+			goto out;
-+		}
-+
-+	/* if we get to here, were in an invalid state. bad. */
-+	printk(KERN_CRIT "mini_fo_lookup: ERROR, meta data corruption detected.\n");
-+
-+	/* end state checking */
-+ out_free:
-+	d_drop(dentry);		/* so that our bad dentry will get destroyed */
-+	kfree(dtopd(dentry));
-+	__dtopd(dentry) = NULL;	/* be safe */
-+
-+ out_dput:
-+	if(hidden_dentry)
-+		dput(hidden_dentry);
-+	if(hidden_sto_dentry)
-+		dput(hidden_sto_dentry); /* drops usage count and marks for release */
-+
-+ out:
-+	/* initalize wol if file exists and is directory */
-+	if(dentry->d_inode) {
-+		if(S_ISDIR(dentry->d_inode->i_mode)) {
-+			itopd(dentry->d_inode)->deleted_list_size = -1;
-+			itopd(dentry->d_inode)->renamed_list_size = -1;
-+			meta_build_lists(dentry);
-+		}
-+	}
-+	return ERR_PTR(err);
-+}
-+
-+
-+STATIC int
-+mini_fo_link(dentry_t *old_dentry, inode_t *dir, dentry_t *new_dentry)
-+{
-+	int err;
-+	dentry_t *hidden_old_dentry;
-+	dentry_t *hidden_new_dentry;
-+	dentry_t *hidden_dir_dentry;
-+
-+
-+	check_mini_fo_dentry(old_dentry);
-+	check_mini_fo_dentry(new_dentry);
-+	check_mini_fo_inode(dir);
-+
-+	/* no links to directorys and existing targets target allowed */
-+	if(S_ISDIR(old_dentry->d_inode->i_mode) ||
-+	   is_mini_fo_existant(new_dentry)) {
-+		err = -EPERM;
-+		goto out;
-+	}
-+
-+	/* bring it directly from unmod to del_rew */
-+	if(dtost(old_dentry) == UNMODIFIED) {
-+		err = nondir_unmod_to_mod(old_dentry, 1);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+		err = meta_add_d_entry(old_dentry->d_parent,
-+				       old_dentry->d_name.name,
-+				       old_dentry->d_name.len);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+		dput(dtohd(old_dentry));
-+		dtohd(old_dentry) = NULL;
-+		dtost(old_dentry) = DEL_REWRITTEN;
-+	}
-+
-+	err = get_neg_sto_dentry(new_dentry);
-+	if(err) {
-+		err = -EINVAL;
-+		goto out;
-+	}
-+
-+	hidden_old_dentry = dtohd2(old_dentry);
-+	hidden_new_dentry = dtohd2(new_dentry);
-+
-+	dget(hidden_old_dentry);
-+	dget(hidden_new_dentry);
-+
-+	/* was: hidden_dir_dentry = lock_parent(hidden_new_dentry); */
-+	hidden_dir_dentry = dget(hidden_new_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = vfs_link(hidden_old_dentry,
-+		       hidden_dir_dentry->d_inode,
-+		       hidden_new_dentry);
-+	if (err || !hidden_new_dentry->d_inode)
-+		goto out_lock;
-+
-+	dtost(new_dentry) = CREATED;
-+ 	err = mini_fo_tri_interpose(NULL, hidden_new_dentry, new_dentry, dir->i_sb, 0);
-+	if (err)
-+		goto out_lock;
-+
-+	fist_copy_attr_timesizes(dir, hidden_new_dentry->d_inode);
-+	/* propagate number of hard-links */
-+	old_dentry->d_inode->i_nlink = itohi2(old_dentry->d_inode)->i_nlink;
-+
-+ out_lock:
-+	/* was: unlock_dir(hidden_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_dir_dentry);
-+
-+	dput(hidden_new_dentry);
-+	dput(hidden_old_dentry);
-+	if (!new_dentry->d_inode)
-+		d_drop(new_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_unlink(inode_t *dir, dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	dget(dentry);
-+	if(dtopd(dentry)->state == MODIFIED) {
-+		err = nondir_mod_to_del(dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == UNMODIFIED) {
-+		err = nondir_unmod_to_del(dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == CREATED) {
-+		err = nondir_creat_to_del(dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == DEL_REWRITTEN) {
-+		err = nondir_del_rew_to_del(dentry);
-+		goto out;
-+	}
-+
-+	printk(KERN_CRIT "mini_fo_unlink: ERROR, invalid state detected.\n");
-+
-+ out:
-+	fist_copy_attr_times(dir, itohi2(dentry->d_parent->d_inode));
-+
-+	if(!err) {
-+		/* is this causing my pain? d_delete(dentry); */
-+		d_drop(dentry);
-+	}
-+
-+	dput(dentry);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_symlink(inode_t *dir, dentry_t *dentry, const char *symname)
-+{
-+	int err=0;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        umode_t mode;
-+#endif
-+
-+	/* Fail if the symlink file exists */
-+	if(!(dtost(dentry) == DELETED ||
-+	     dtost(dentry) == NON_EXISTANT)) {
-+		err = -EEXIST;
-+		goto out;
-+	}
-+
-+	err = get_neg_sto_dentry(dentry);
-+	if(err) {
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	dget(hidden_sto_dentry);
-+	/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	mode = S_IALLUGO;
-+	err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
-+			  hidden_sto_dentry, symname, mode);
-+#else
-+	err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
-+			  hidden_sto_dentry,
-+			  symname);
-+#endif
-+	if (err || !hidden_sto_dentry->d_inode)
-+                goto out_lock;
-+
-+        if(dtost(dentry) == DELETED) {
-+                dtost(dentry) = DEL_REWRITTEN;
-+                err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        } else if(dtost(dentry) == NON_EXISTANT) {
-+                dtost(dentry) = CREATED;
-+                err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        }
-+	fist_copy_attr_timesizes(dir, hidden_sto_dir_dentry->d_inode);
-+
-+ out_lock:
-+        /* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+
-+        dput(hidden_sto_dentry);
-+        if (!dentry->d_inode)
-+                d_drop(dentry);
-+ out:
-+        return err;
-+}
-+
-+STATIC int
-+mini_fo_mkdir(inode_t *dir, dentry_t *dentry, int mode)
-+{
-+	int err;
-+
-+	err = create_sto_dir(dentry, mode);
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_rmdir(inode_t *dir, dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+	dentry_t *meta_dentry;
-+	inode_t *hidden_sto_dir = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+	check_mini_fo_inode(dir);
-+
-+	dget(dentry);
-+	if(dtopd(dentry)->state == MODIFIED) {
-+		/* XXX: disabled, because it does not bother to check files on
-+		 * the original filesystem - just a hack, but better than simply
-+		 * removing it without testing */
-+		err = -EINVAL;
-+		goto out;
-+
-+		hidden_sto_dir = itohi2(dir);
-+		hidden_sto_dentry = dtohd2(dentry);
-+
-+		/* was:hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+		hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		/* Delete an old WOL file contained in the storage dir */
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     hidden_sto_dentry,
-+					     strlen(META_FILENAME));
-+		if(meta_dentry->d_inode) {
-+			err = vfs_unlink(hidden_sto_dentry->d_inode, meta_dentry);
-+			dput(meta_dentry);
-+			if(!err)
-+				d_delete(meta_dentry);
-+		}
-+
-+		err = vfs_rmdir(hidden_sto_dir, hidden_sto_dentry);
-+		dput(hidden_sto_dentry);
-+		if(!err)
-+			d_delete(hidden_sto_dentry);
-+
-+		/* propagate number of hard-links */
-+		dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+
-+		dput(dtohd(dentry));
-+
-+		dtohd(dentry) = NULL;
-+		dtopd(dentry)->state = DELETED;
-+
-+		/* carefull with R files */
-+		if( __meta_is_r_entry(dir,
-+				      dentry->d_name.name,
-+				      dentry->d_name.len) == 1) {
-+			err = meta_remove_r_entry(dentry->d_parent,
-+						  dentry->d_name.name,
-+						  dentry->d_name.len);
-+			if(err) {
-+				printk(KERN_CRIT "mini_fo: rmdir: meta_remove_r_entry failed.\n");
-+				goto out;
-+			}
-+		}
-+		else {
-+			/* ok, add deleted file to META */
-+			meta_add_d_entry(dentry->d_parent,
-+					 dentry->d_name.name,
-+					 dentry->d_name.len);
-+		}
-+		/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+		dput(hidden_sto_dir_dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == UNMODIFIED) {
-+		/* XXX: simply adding it to the delete list here is fscking dangerous!
-+		 * as a temporary hack, i will disable rmdir on unmodified directories
-+		 * for now.
-+		 */
-+		err = -EINVAL;
-+		goto out;
-+
-+		err = get_neg_sto_dentry(dentry);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+
-+		/* dput base dentry, this will relase the inode and free the
-+		 * dentry, as we will never need it again. */
-+		dput(dtohd(dentry));
-+		dtohd(dentry) = NULL;
-+		dtopd(dentry)->state = DELETED;
-+
-+		/* add deleted file to META-file */
-+		meta_add_d_entry(dentry->d_parent,
-+				 dentry->d_name.name,
-+				 dentry->d_name.len);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == CREATED) {
-+		hidden_sto_dir = itohi2(dir);
-+		hidden_sto_dentry = dtohd2(dentry);
-+
-+		/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
-+		hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		/* Delete an old WOL file contained in the storage dir */
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     hidden_sto_dentry,
-+					     strlen(META_FILENAME));
-+		if(meta_dentry->d_inode) {
-+			/* is this necessary? dget(meta_dentry); */
-+			err = vfs_unlink(hidden_sto_dentry->d_inode,
-+					 meta_dentry);
-+			dput(meta_dentry);
-+			if(!err)
-+				d_delete(meta_dentry);
-+		}
-+
-+		err = vfs_rmdir(hidden_sto_dir, hidden_sto_dentry);
-+		dput(hidden_sto_dentry);
-+		if(!err)
-+			d_delete(hidden_sto_dentry);
-+
-+		/* propagate number of hard-links */
-+		dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+		dtopd(dentry)->state = NON_EXISTANT;
-+
-+		/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+		dput(hidden_sto_dir_dentry);
-+
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == DEL_REWRITTEN) {
-+		hidden_sto_dir = itohi2(dir);
-+		hidden_sto_dentry = dtohd2(dentry);
-+
-+		/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
-+		hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		/* Delete an old WOL file contained in the storage dir */
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     hidden_sto_dentry,
-+					     strlen(META_FILENAME));
-+		if(meta_dentry->d_inode) {
-+			/* is this necessary? dget(meta_dentry); */
-+			err = vfs_unlink(hidden_sto_dentry->d_inode,
-+					 meta_dentry);
-+			dput(meta_dentry);
-+			if(!err)
-+				d_delete(meta_dentry);
-+		}
-+
-+		err = vfs_rmdir(hidden_sto_dir, hidden_sto_dentry);
-+		dput(hidden_sto_dentry);
-+		if(!err)
-+			d_delete(hidden_sto_dentry);
-+
-+		/* propagate number of hard-links */
-+		dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+		dtopd(dentry)->state = DELETED;
-+		/* was: unlock_dir(hidden_sto_dir_dentry); */
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+		dput(hidden_sto_dir_dentry);
-+		goto out;
-+	}
-+
-+	printk(KERN_CRIT "mini_fo_rmdir: ERROR, invalid state detected.\n");
-+
-+ out:
-+	if(!err) {
-+		d_drop(dentry);
-+	}
-+
-+	fist_copy_attr_times(dir, itohi2(dentry->d_parent->d_inode));
-+	dput(dentry);
-+
-+	return err;
-+}
-+
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_mknod(inode_t *dir, dentry_t *dentry, int mode, dev_t dev)
-+#else
-+mini_fo_mknod(inode_t *dir, dentry_t *dentry, int mode, int dev)
-+#endif
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	err = create_sto_nod(dentry, mode, dev);
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo_mknod: creating sto nod failed.\n");
-+		err = -EINVAL;
-+	}
-+
-+	check_mini_fo_dentry(dentry);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_rename(inode_t *old_dir, dentry_t *old_dentry,
-+	       inode_t *new_dir, dentry_t *new_dentry)
-+{
-+	/* dispatch */
-+	if(S_ISDIR(old_dentry->d_inode->i_mode))
-+		return rename_directory(old_dir, old_dentry, new_dir, new_dentry);
-+	return rename_nondir(old_dir, old_dentry, new_dir, new_dentry);
-+
-+}
-+
-+int rename_directory(inode_t *old_dir, dentry_t *old_dentry,
-+		     inode_t *new_dir, dentry_t *new_dentry)
-+{
-+	int err, bpath_len;
-+	char *bpath;
-+
-+	dentry_t *hidden_old_dentry;
-+	dentry_t *hidden_new_dentry;
-+	dentry_t *hidden_old_dir_dentry;
-+	dentry_t *hidden_new_dir_dentry;
-+
-+	err = 0;
-+	bpath = NULL;
-+	bpath_len = 0;
-+
-+	/* this is a test, chuck out if it works */
-+	if(!(dtopd(new_dentry)->state == DELETED ||
-+	     dtopd(new_dentry)->state == NON_EXISTANT)) {
-+		printk(KERN_CRIT "mini_fo: rename_directory: \
-+                                  uh, ah, new_dentry not negative.\n");
-+		/* return -1; */
-+	}
-+
-+	/* state = UNMODIFIED */
-+	if(dtopd(old_dentry)->state == UNMODIFIED) {
-+		err = dir_unmod_to_mod(old_dentry);
-+		if (err)
-+			goto out;
-+	}
-+
-+	/* state = MODIFIED */
-+	if(dtopd(old_dentry)->state == MODIFIED) {
-+		bpath = meta_check_r_entry(old_dentry->d_parent,
-+					   old_dentry->d_name.name,
-+					   old_dentry->d_name.len);
-+		if(bpath) {
-+			err = meta_remove_r_entry(old_dentry->d_parent,
-+						  old_dentry->d_name.name,
-+						  old_dentry->d_name.len);
-+			if(err) {
-+				printk(KERN_CRIT "mini_fo: rename_directory:\
-+                                                   meta_remove_r_entry \
-+                                                  failed.\n");
-+				goto out;
-+			}
-+			err = meta_add_r_entry(new_dentry->d_parent,
-+					       bpath,
-+					       strlen(bpath),
-+					       new_dentry->d_name.name,
-+					       new_dentry->d_name.len);
-+			kfree(bpath);
-+		}
-+		else {/* wol it */
-+			err = meta_add_d_entry(old_dentry->d_parent,
-+					       old_dentry->d_name.name,
-+					       old_dentry->d_name.len);
-+			if (err)
-+				goto out;
-+			/* put it on rename list */
-+			err = get_mini_fo_bpath(old_dentry,
-+						&bpath,
-+						&bpath_len);
-+			if (err)
-+				goto out;
-+			err = meta_add_r_entry(new_dentry->d_parent,
-+					       bpath, bpath_len,
-+					       new_dentry->d_name.name,
-+					       new_dentry->d_name.len);
-+			if (err)
-+				goto out;
-+		}
-+		/* no state change, MODIFIED stays MODIFIED */
-+	}
-+	/* state = CREATED */
-+	if(dtopd(old_dentry)->state == CREATED ||
-+	   dtopd(old_dentry)->state == DEL_REWRITTEN) {
-+		if(dtohd(old_dentry))
-+			dput(dtohd(old_dentry));
-+
-+		if(dtopd(new_dentry)->state == DELETED) {
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+			dtohd(old_dentry) = NULL;
-+		}
-+		else if(dtopd(new_dentry)->state == NON_EXISTANT) {
-+			dtopd(old_dentry)->state = CREATED;
-+			/* steal new dentry's neg. base dentry */
-+			dtohd(old_dentry) = dtohd(new_dentry);
-+			dtohd(new_dentry) = NULL;
-+		}
-+	}
-+	if(dtopd(new_dentry)->state == UNMODIFIED ||
-+	   dtopd(new_dentry)->state == NON_EXISTANT) {
-+		err = get_neg_sto_dentry(new_dentry);
-+		if(err)
-+			goto out;
-+	}
-+
-+	/* now move sto file */
-+	hidden_old_dentry = dtohd2(old_dentry);
-+	hidden_new_dentry = dtohd2(new_dentry);
-+
-+	dget(hidden_old_dentry);
-+	dget(hidden_new_dentry);
-+
-+	hidden_old_dir_dentry = dget(hidden_old_dentry->d_parent);
-+	hidden_new_dir_dentry = dget(hidden_new_dentry->d_parent);
-+	double_lock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+
-+	err = vfs_rename(hidden_old_dir_dentry->d_inode, hidden_old_dentry,
-+			 hidden_new_dir_dentry->d_inode, hidden_new_dentry);
-+	if(err)
-+		goto out_lock;
-+
-+	fist_copy_attr_all(new_dir, hidden_new_dir_dentry->d_inode);
-+	if (new_dir != old_dir)
-+		fist_copy_attr_all(old_dir,
-+				   hidden_old_dir_dentry->d_inode);
-+
-+ out_lock:
-+	/* double_unlock will dput the new/old parent dentries
-+	 * whose refcnts were incremented via get_parent above. */
-+	double_unlock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+	dput(hidden_new_dentry);
-+	dput(hidden_old_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+int rename_nondir(inode_t *old_dir, dentry_t *old_dentry,
-+		  inode_t *new_dir, dentry_t *new_dentry)
-+{
-+	int err=0;
-+
-+	check_mini_fo_dentry(old_dentry);
-+	check_mini_fo_dentry(new_dentry);
-+	check_mini_fo_inode(old_dir);
-+	check_mini_fo_inode(new_dir);
-+
-+	/* state: UNMODIFIED */
-+	if(dtost(old_dentry) == UNMODIFIED) {
-+		err = nondir_unmod_to_mod(old_dentry, 1);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+	}
-+
-+	/* the easy states */
-+	if(exists_in_storage(old_dentry)) {
-+
-+		dentry_t *hidden_old_dentry;
-+		dentry_t *hidden_new_dentry;
-+		dentry_t *hidden_old_dir_dentry;
-+		dentry_t *hidden_new_dir_dentry;
-+
-+		/* if old file is MODIFIED, add it to the deleted_list */
-+		if(dtopd(old_dentry)->state == MODIFIED) {
-+			meta_add_d_entry(old_dentry->d_parent,
-+					 old_dentry->d_name.name,
-+					 old_dentry->d_name.len);
-+
-+			dput(dtohd(old_dentry));
-+		}
-+		/* if old file is CREATED, we only release the base dentry */
-+		if(dtopd(old_dentry)->state == CREATED) {
-+			if(dtohd(old_dentry))
-+				dput(dtohd(old_dentry));
-+		}
-+
-+		/* now setup the new states (depends on new_dentry state) */
-+		/* new dentry state =  MODIFIED */
-+		if(dtopd(new_dentry)->state == MODIFIED) {
-+			meta_add_d_entry(new_dentry->d_parent,
-+					 new_dentry->d_name.name,
-+					 new_dentry->d_name.len);
-+
-+			/* new dentry will be d_put'ed later by the vfs
-+			 * so don't do it here
-+			 * dput(dtohd(new_dentry));
-+			 */
-+			dtohd(old_dentry) = NULL;
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+		}
-+		/* new dentry state =  UNMODIFIED */
-+		else if(dtopd(new_dentry)->state == UNMODIFIED) {
-+			if(get_neg_sto_dentry(new_dentry))
-+				return -EINVAL;
-+
-+			meta_add_d_entry(new_dentry->d_parent,
-+					 new_dentry->d_name.name,
-+					 new_dentry->d_name.len);
-+
-+			/* is this right??? */
-+			/*dput(dtohd(new_dentry));*/
-+			dtohd(old_dentry) = NULL;
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+		}
-+		/* new dentry state =  CREATED */
-+		else if(dtopd(new_dentry)->state == CREATED) {
-+			/* we keep the neg. base dentry (if exists) */
-+			dtohd(old_dentry) = dtohd(new_dentry);
-+			/* ...and set it to Null, or we'll get
-+			 * dcache.c:345 if it gets dput twice... */
-+			dtohd(new_dentry) = NULL;
-+			dtopd(old_dentry)->state = CREATED;
-+		}
-+		/* new dentry state =  NON_EXISTANT */
-+		else if(dtopd(new_dentry)->state == NON_EXISTANT) {
-+			if(get_neg_sto_dentry(new_dentry))
-+				return -EINVAL;
-+
-+			/* we keep the neg. base dentry (if exists) */
-+			dtohd(old_dentry) = dtohd(new_dentry);
-+			/* ...and set it to Null, or we'll get
-+			 * Dr. dcache.c:345 if it gets dput twice... */
-+			dtohd(new_dentry) = NULL;
-+			dtopd(old_dentry)->state = CREATED;
-+		}
-+		/* new dentry state =  DEL_REWRITTEN or DELETED */
-+		else if(dtopd(new_dentry)->state == DEL_REWRITTEN ||
-+			dtopd(new_dentry)->state == DELETED) {
-+			dtohd(old_dentry) = NULL;
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+		}
-+		else { /* not possible, uhh, ahh */
-+			printk(KERN_CRIT
-+			       "mini_fo: rename_reg_file: invalid state detected [1].\n");
-+			return -1;
-+		}
-+
-+		/* now we definitely have a sto file */
-+		hidden_old_dentry = dtohd2(old_dentry);
-+		hidden_new_dentry = dtohd2(new_dentry);
-+
-+		dget(hidden_old_dentry);
-+		dget(hidden_new_dentry);
-+
-+		hidden_old_dir_dentry = dget(hidden_old_dentry->d_parent);
-+		hidden_new_dir_dentry = dget(hidden_new_dentry->d_parent);
-+		double_lock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+
-+		err = vfs_rename(hidden_old_dir_dentry->d_inode,
-+				 hidden_old_dentry,
-+				 hidden_new_dir_dentry->d_inode,
-+				 hidden_new_dentry);
-+		if(err)
-+			goto out_lock;
-+
-+		fist_copy_attr_all(new_dir, hidden_new_dir_dentry->d_inode);
-+		if (new_dir != old_dir)
-+			fist_copy_attr_all(old_dir, hidden_old_dir_dentry->d_inode);
-+
-+	out_lock:
-+		/* double_unlock will dput the new/old parent dentries
-+		 * whose refcnts were incremented via get_parent above.
-+		 */
-+		double_unlock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+		dput(hidden_new_dentry);
-+		dput(hidden_old_dentry);
-+	out:
-+		return err;
-+	}
-+	else { /* invalid state */
-+		printk(KERN_CRIT "mini_fo: rename_reg_file: ERROR: invalid state detected [2].\n");
-+		return -1;
-+	}
-+}
-+
-+
-+STATIC int
-+mini_fo_readlink(dentry_t *dentry, char *buf, int bufsiz)
-+{
-+	int err=0;
-+	dentry_t *hidden_dentry = NULL;
-+
-+	if(dtohd2(dentry) && dtohd2(dentry)->d_inode) {
-+		hidden_dentry = dtohd2(dentry);
-+	} else if(dtohd(dentry) && dtohd(dentry)->d_inode) {
-+		hidden_dentry = dtohd(dentry);
-+	} else {
-+		goto out;
-+	}
-+
-+	if (!hidden_dentry->d_inode->i_op ||
-+	    !hidden_dentry->d_inode->i_op->readlink) {
-+		err = -EINVAL;		goto out;
-+	}
-+
-+	err = hidden_dentry->d_inode->i_op->readlink(hidden_dentry,
-+						     buf,
-+						     bufsiz);
-+	if (err > 0)
-+		fist_copy_attr_atime(dentry->d_inode, hidden_dentry->d_inode);
-+
-+ out:
-+	return err;
-+}
-+
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-+static int mini_fo_follow_link(dentry_t *dentry, struct nameidata *nd)
-+#else
-+static void* mini_fo_follow_link(dentry_t *dentry, struct nameidata *nd)
-+#endif
-+{
-+	char *buf;
-+	int len = PAGE_SIZE, err;
-+	mm_segment_t old_fs;
-+
-+	/* in 2.6 this is freed by mini_fo_put_link called by __do_follow_link */
-+	buf = kmalloc(len, GFP_KERNEL);
-+	if (!buf) {
-+		err = -ENOMEM;
-+		goto out;
-+	}
-+
-+	/* read the symlink, and then we will follow it */
-+	old_fs = get_fs();
-+	set_fs(KERNEL_DS);
-+	err = dentry->d_inode->i_op->readlink(dentry, buf, len);
-+	set_fs(old_fs);
-+	if (err < 0) {
-+		kfree(buf);
-+		buf = NULL;
-+		goto out;
-+	}
-+	buf[err] = 0;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        nd_set_link(nd, buf);
-+        err = 0;
-+#else
-+	err = vfs_follow_link(nd, buf);
-+#endif
-+
-+ out:
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	kfree(buf);
-+#endif
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-+        return err;
-+#else
-+        return ERR_PTR(err);
-+#endif
-+}
-+
-+STATIC
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-+void mini_fo_put_link(struct dentry *dentry, struct nameidata *nd)
-+#else
-+void mini_fo_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
-+#endif
-+{
-+        char *link;
-+        link = nd_get_link(nd);
-+        kfree(link);
-+}
-+#endif
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_permission(inode_t *inode, int mask, struct nameidata *nd)
-+#else
-+mini_fo_permission(inode_t *inode, int mask)
-+#endif
-+{
-+	inode_t *hidden_inode;
-+	int mode;
-+	int err;
-+
-+	if(itohi2(inode)) {
-+		hidden_inode = itohi2(inode);
-+	} else {
-+		hidden_inode = itohi(inode);
-+	}
-+	mode = inode->i_mode;
-+
-+	/* not really needed, as permission handles everything:
-+	 *	err = vfs_permission(inode, mask);
-+	 *	if (err)
-+	 *		goto out;
-+	 */
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	err = permission(hidden_inode, mask, nd);
-+#else
-+	err = permission(hidden_inode, mask);
-+#endif
-+
-+	/*  out: */
-+	return err;
-+}
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+STATIC int
-+mini_fo_inode_revalidate(dentry_t *dentry)
-+{
-+	int err = 0;
-+	dentry_t *hidden_dentry;
-+	inode_t *hidden_inode;
-+
-+	ASSERT(dentry->d_inode);
-+	ASSERT(itopd(dentry->d_inode));
-+
-+	if(itohi2(dentry->d_inode)) {
-+                hidden_dentry = dtohd2(dentry);
-+		hidden_inode = hidden_dentry->d_inode;
-+	} else if(itohi(dentry->d_inode)) {
-+                hidden_dentry = dtohd(dentry);
-+		hidden_inode = hidden_dentry->d_inode;
-+	} else {
-+                printk(KERN_CRIT "mini_fo_inode_revalidate: ERROR, invalid state detected.\n");
-+                err = -ENOENT;
-+                goto out;
-+        }
-+	if (hidden_inode && hidden_inode->i_op && hidden_inode->i_op->revalidate){
-+		err = hidden_inode->i_op->revalidate(hidden_dentry);
-+		if (err)
-+			goto out;
-+	}
-+	fist_copy_attr_all(dentry->d_inode, hidden_inode);
-+ out:
-+	return err;
-+}
-+#endif
-+
-+STATIC int
-+mini_fo_setattr(dentry_t *dentry, struct iattr *ia)
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(!is_mini_fo_existant(dentry)) {
-+		printk(KERN_CRIT "mini_fo_setattr: ERROR, invalid state detected [1].\n");
-+		goto out;
-+	}
-+
-+	if(dtost(dentry) == UNMODIFIED) {
-+		if(!IS_COPY_FLAG(ia->ia_valid))
-+			goto out; /* we ignore these changes to base */
-+
-+		if(S_ISDIR(dentry->d_inode->i_mode)) {
-+			err = dir_unmod_to_mod(dentry);
-+		} else {
-+			/* we copy contents if file is not beeing truncated */
-+			if(S_ISREG(dentry->d_inode->i_mode) &&
-+			   !(ia->ia_size == 0 && (ia->ia_valid & ATTR_SIZE))) {
-+				err = nondir_unmod_to_mod(dentry, 1);
-+			} else
-+				err = nondir_unmod_to_mod(dentry, 0);
-+		}
-+		if(err) {
-+			err = -EINVAL;
-+			printk(KERN_CRIT "mini_fo_setattr: ERROR changing states.\n");
-+			goto out;
-+		}
-+	}
-+	if(!exists_in_storage(dentry)) {
-+		printk(KERN_CRIT "mini_fo_setattr: ERROR, invalid state detected [2].\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	ASSERT(dentry->d_inode);
-+	ASSERT(dtohd2(dentry));
-+	ASSERT(itopd(dentry->d_inode));
-+	ASSERT(itohi2(dentry->d_inode));
-+
-+	err = notify_change(dtohd2(dentry), ia);
-+	fist_copy_attr_all(dentry->d_inode, itohi2(dentry->d_inode));
-+ out:
-+	return err;
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+STATIC int
-+mini_fo_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
-+{
-+	int err = 0;
-+        dentry_t *hidden_dentry;
-+
-+	ASSERT(dentry->d_inode);
-+	ASSERT(itopd(dentry->d_inode));
-+
-+	if(itohi2(dentry->d_inode)) {
-+                hidden_dentry = dtohd2(dentry);
-+	} else if(itohi(dentry->d_inode)) {
-+                hidden_dentry = dtohd(dentry);
-+	} else {
-+                printk(KERN_CRIT "mini_fo_getattr: ERROR, invalid state detected.\n");
-+                err = -ENOENT;
-+                goto out;
-+        }
-+	fist_copy_attr_all(dentry->d_inode, hidden_dentry->d_inode);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	generic_fillattr(dentry->d_inode, stat);
-+	if (!stat->blksize) {
-+		struct super_block *s = hidden_dentry->d_inode->i_sb;
-+		unsigned blocks;
-+		blocks = (stat->size+s->s_blocksize-1) >> s->s_blocksize_bits;
-+		stat->blocks = (s->s_blocksize / 512) * blocks;
-+		stat->blksize = s->s_blocksize;
-+	}
-+ out:
-+        return err;
-+}
-+#endif
-+
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+#if 0 /* no xattr_alloc() and xattr_free() */
-+/* This is lifted from fs/xattr.c */
-+static void *
-+xattr_alloc(size_t size, size_t limit)
-+{
-+	void *ptr;
-+
-+	if (size > limit)
-+		return ERR_PTR(-E2BIG);
-+
-+	if (!size)	/* size request, no buffer is needed */
-+		return NULL;
-+	else if (size <= PAGE_SIZE)
-+		ptr = kmalloc((unsigned long) size, GFP_KERNEL);
-+	else
-+		ptr = vmalloc((unsigned long) size);
-+	if (!ptr)
-+		return ERR_PTR(-ENOMEM);
-+	return ptr;
-+}
-+
-+static void
-+xattr_free(void *ptr, size_t size)
-+{
-+	if (!size)	/* size request, no buffer was needed */
-+		return;
-+	else if (size <= PAGE_SIZE)
-+		kfree(ptr);
-+	else
-+		vfree(ptr);
-+}
-+#endif /* no xattr_alloc() and xattr_free() */
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+mini_fo_getxattr(struct dentry *dentry, const char *name, void *value, size_t size) {
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+	/* Define these anyway so we don't need as much ifdef'ed code. */
-+	char *encoded_name = NULL;
-+	char *encoded_value = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->getxattr) {
-+		encoded_name = (char *)name;
-+		encoded_value = (char *)value;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->getxattr(hidden_dentry, encoded_name, encoded_value, size);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,21) \
-+     && LINUX_VERSION_CODE <= KERNEL_VERSION(2,4,23)) \
-+     || LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
-+mini_fo_setxattr(struct dentry *dentry, const char *name,
-+		 const void *value, size_t size, int flags)
-+#else
-+mini_fo_setxattr(struct dentry *dentry, const char *name,
-+		 void *value, size_t size, int flags)
-+#endif
-+
-+{
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+
-+	/* Define these anyway, so we don't have as much ifdef'ed code. */
-+	char *encoded_value = NULL;
-+	char *encoded_name = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->setxattr) {
-+		encoded_name = (char *)name;
-+		encoded_value = (char *)value;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->setxattr(hidden_dentry, encoded_name, encoded_value, size, flags);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+mini_fo_removexattr(struct dentry *dentry, const char *name) {
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+	char *encoded_name;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->removexattr) {
-+		encoded_name = (char *)name;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->removexattr(hidden_dentry, encoded_name);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+mini_fo_listxattr(struct dentry *dentry, char *list, size_t size) {
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+	char *encoded_list = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->listxattr) {
-+		encoded_list = list;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->listxattr(hidden_dentry, encoded_list, size);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+# endif /* defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)) */
-+
-+struct inode_operations mini_fo_symlink_iops =
-+	{
-+		readlink:	mini_fo_readlink,
-+		follow_link: mini_fo_follow_link,
-+		/* mk: permission:	mini_fo_permission, */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		revalidate:	mini_fo_inode_revalidate,
-+#endif
-+		setattr:	mini_fo_setattr,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		getattr:	mini_fo_getattr,
-+		put_link:       mini_fo_put_link,
-+#endif
-+
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+		setxattr:	mini_fo_setxattr,
-+		getxattr:	mini_fo_getxattr,
-+		listxattr:	mini_fo_listxattr,
-+		removexattr: mini_fo_removexattr
-+# endif /* defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)) */
-+	};
-+
-+struct inode_operations mini_fo_dir_iops =
-+	{
-+		create:	mini_fo_create,
-+		lookup:	mini_fo_lookup,
-+		link:	mini_fo_link,
-+		unlink:	mini_fo_unlink,
-+		symlink:	mini_fo_symlink,
-+		mkdir:	mini_fo_mkdir,
-+		rmdir:	mini_fo_rmdir,
-+		mknod:	mini_fo_mknod,
-+		rename:	mini_fo_rename,
-+		/* no readlink/follow_link for non-symlinks */
-+		// off because we have setattr
-+		//    truncate:	mini_fo_truncate,
-+		/* mk:permission:	mini_fo_permission, */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		revalidate:	mini_fo_inode_revalidate,
-+#endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		getattr:	mini_fo_getattr,
-+#endif
-+		setattr:	mini_fo_setattr,
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+		setxattr:	mini_fo_setxattr,
-+		getxattr:	mini_fo_getxattr,
-+		listxattr:	mini_fo_listxattr,
-+		removexattr: mini_fo_removexattr
-+# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */
-+	};
-+
-+struct inode_operations mini_fo_main_iops =
-+	{
-+		/* permission:	mini_fo_permission, */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		revalidate:	mini_fo_inode_revalidate,
-+#endif
-+		setattr:	mini_fo_setattr,
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		getattr:	mini_fo_getattr,
-+#endif
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+		setxattr:	mini_fo_setxattr,
-+		getxattr:	mini_fo_getxattr,
-+		listxattr:	mini_fo_listxattr,
-+		removexattr:    mini_fo_removexattr
-+# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */
-+	};
---- /dev/null
-+++ b/fs/mini_fo/main.c
-@@ -0,0 +1,423 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+#include <linux/module.h>
-+
-+/* This definition must only appear after we include <linux/module.h> */
-+#ifndef MODULE_LICENSE
-+# define MODULE_LICENSE(bison)
-+#endif /* not MODULE_LICENSE */
-+
-+/*
-+ * This is the mini_fo tri interpose function, which extends the
-+ * functionality of the regular interpose by interposing a higher
-+ * level inode on top of two lower level ones: the base filesystem
-+ * inode and the storage filesystem inode.
-+ *
-+ *  sb we pass is mini_fo's super_block
-+ */
-+int
-+mini_fo_tri_interpose(dentry_t *hidden_dentry,
-+		      dentry_t *hidden_sto_dentry,
-+		      dentry_t *dentry, super_block_t *sb, int flag)
-+{
-+	inode_t *hidden_inode = NULL;
-+	inode_t *hidden_sto_inode = NULL; /* store corresponding storage inode */
-+	int err = 0;
-+	inode_t *inode;
-+
-+	/* Pointer to hidden_sto_inode if exists, else to hidden_inode.
-+	 * This is used to copy the attributes of the correct inode. */
-+	inode_t *master_inode;
-+
-+	if(hidden_dentry)
-+		hidden_inode = hidden_dentry->d_inode;
-+	if(hidden_sto_dentry)
-+		hidden_sto_inode = hidden_sto_dentry->d_inode;
-+
-+	ASSERT(dentry->d_inode == NULL);
-+
-+	/* mk: One of the inodes associated with the dentrys is likely to
-+	 * be NULL, so carefull:
-+	 */
-+	ASSERT((hidden_inode != NULL) || (hidden_sto_inode != NULL));
-+
-+	if(hidden_sto_inode)
-+		master_inode = hidden_sto_inode;
-+	else
-+		master_inode = hidden_inode;
-+
-+	/*
-+	 * We allocate our new inode below, by calling iget.
-+	 * iget will call our read_inode which will initialize some
-+	 * of the new inode's fields
-+	 */
-+
-+	/*
-+	 * original: inode = iget(sb, hidden_inode->i_ino);
-+	 */
-+	inode = iget(sb, iunique(sb, 25));
-+	if (!inode) {
-+		err = -EACCES;		/* should be impossible??? */
-+		goto out;
-+	}
-+
-+	/*
-+	 * interpose the inode if not already interposed
-+	 *   this is possible if the inode is being reused
-+	 * XXX: what happens if we get_empty_inode() but there's another already?
-+	 * for now, ASSERT() that this can't happen; fix later.
-+	 */
-+	if (itohi(inode) != NULL) {
-+		printk(KERN_CRIT "mini_fo_tri_interpose: itohi(inode) != NULL.\n");
-+	}
-+	if (itohi2(inode) != NULL) {
-+		printk(KERN_CRIT "mini_fo_tri_interpose: itohi2(inode) != NULL.\n");
-+	}
-+
-+	/* mk: Carefull, igrab can't handle NULL inodes (ok, why should it?), so
-+	 * we need to check here:
-+	 */
-+	if(hidden_inode)
-+		itohi(inode) = igrab(hidden_inode);
-+	else
-+		itohi(inode) = NULL;
-+
-+	if(hidden_sto_inode)
-+		itohi2(inode) = igrab(hidden_sto_inode);
-+	else
-+		itohi2(inode) = NULL;
-+
-+
-+	/* Use different set of inode ops for symlinks & directories*/
-+	if (S_ISLNK(master_inode->i_mode))
-+		inode->i_op = &mini_fo_symlink_iops;
-+	else if (S_ISDIR(master_inode->i_mode))
-+		inode->i_op = &mini_fo_dir_iops;
-+
-+	/* Use different set of file ops for directories */
-+	if (S_ISDIR(master_inode->i_mode))
-+		inode->i_fop = &mini_fo_dir_fops;
-+
-+	/* properly initialize special inodes */
-+	if (S_ISBLK(master_inode->i_mode) || S_ISCHR(master_inode->i_mode) ||
-+	    S_ISFIFO(master_inode->i_mode) || S_ISSOCK(master_inode->i_mode)) {
-+		init_special_inode(inode, master_inode->i_mode, master_inode->i_rdev);
-+	}
-+
-+	/* Fix our inode's address operations to that of the lower inode */
-+	if (inode->i_mapping->a_ops != master_inode->i_mapping->a_ops) {
-+		inode->i_mapping->a_ops = master_inode->i_mapping->a_ops;
-+	}
-+
-+	/* only (our) lookup wants to do a d_add */
-+	if (flag)
-+		d_add(dentry, inode);
-+	else
-+		d_instantiate(dentry, inode);
-+
-+	ASSERT(dtopd(dentry) != NULL);
-+
-+	/* all well, copy inode attributes */
-+	fist_copy_attr_all(inode, master_inode);
-+
-+ out:
-+	return err;
-+}
-+
-+/* parse mount options "base=" and "sto=" */
-+dentry_t *
-+mini_fo_parse_options(super_block_t *sb, char *options)
-+{
-+	dentry_t *hidden_root = ERR_PTR(-EINVAL);
-+	dentry_t *hidden_root2 = ERR_PTR(-EINVAL);
-+	struct nameidata nd, nd2;
-+	char *name, *tmp, *end;
-+	int err = 0;
-+
-+	/* We don't want to go off the end of our arguments later on. */
-+	for (end = options; *end; end++);
-+
-+	while (options < end) {
-+		tmp = options;
-+		while (*tmp && *tmp != ',')
-+			tmp++;
-+		*tmp = '\0';
-+		if (!strncmp("base=", options, 5)) {
-+			name = options + 5;
-+			printk(KERN_INFO "mini_fo: using base directory: %s\n", name);
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+			if (path_init(name, LOOKUP_FOLLOW, &nd))
-+				err = path_walk(name, &nd);
-+#else
-+			err = path_lookup(name, LOOKUP_FOLLOW, &nd);
-+#endif
-+			if (err) {
-+				printk(KERN_CRIT "mini_fo: error accessing hidden directory '%s'\n", name);
-+				hidden_root = ERR_PTR(err);
-+				goto out;
-+			}
-+			hidden_root = nd.dentry;
-+			stopd(sb)->base_dir_dentry = nd.dentry;
-+			stopd(sb)->hidden_mnt = nd.mnt;
-+
-+		} else if(!strncmp("sto=", options, 4)) {
-+			/* parse the storage dir */
-+			name = options + 4;
-+			printk(KERN_INFO "mini_fo: using storage directory: %s\n", name);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+			if(path_init(name, LOOKUP_FOLLOW, &nd2))
-+				err = path_walk(name, &nd2);
-+#else
-+                        err = path_lookup(name, LOOKUP_FOLLOW, &nd2);
-+#endif
-+			if(err) {
-+				printk(KERN_CRIT "mini_fo: error accessing hidden storage directory '%s'\n", name);
-+
-+				hidden_root2 = ERR_PTR(err);
-+				goto out;
-+			}
-+			hidden_root2 = nd2.dentry;
-+			stopd(sb)->storage_dir_dentry = nd2.dentry;
-+			stopd(sb)->hidden_mnt2 = nd2.mnt;
-+			stohs2(sb) = hidden_root2->d_sb;
-+
-+			/* validate storage dir, this is done in
-+			 * mini_fo_read_super for the base directory.
-+			 */
-+			if (IS_ERR(hidden_root2)) {
-+				printk(KERN_WARNING "mini_fo_parse_options: storage dentry lookup failed (err = %ld)\n", PTR_ERR(hidden_root2));
-+				goto out;
-+			}
-+			if (!hidden_root2->d_inode) {
-+				printk(KERN_WARNING "mini_fo_parse_options: no storage dir to interpose on.\n");
-+				goto out;
-+			}
-+			stohs2(sb) = hidden_root2->d_sb;
-+		} else {
-+			printk(KERN_WARNING "mini_fo: unrecognized option '%s'\n", options);
-+			hidden_root = ERR_PTR(-EINVAL);
-+			goto out;
-+		}
-+		options = tmp + 1;
-+	}
-+
-+ out:
-+	if(IS_ERR(hidden_root2))
-+		return hidden_root2;
-+	return hidden_root;
-+}
-+
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+static int
-+#else
-+super_block_t *
-+#endif
-+mini_fo_read_super(super_block_t *sb, void *raw_data, int silent)
-+{
-+	dentry_t *hidden_root;
-+	int err = 0;
-+
-+	if (!raw_data) {
-+		printk(KERN_WARNING "mini_fo_read_super: missing argument\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	/*
-+	 * Allocate superblock private data
-+	 */
-+	__stopd(sb) = kmalloc(sizeof(struct mini_fo_sb_info), GFP_KERNEL);
-+	if (!stopd(sb)) {
-+		printk(KERN_WARNING "%s: out of memory\n", __FUNCTION__);
-+		err = -ENOMEM;
-+		goto out;
-+	}
-+	stohs(sb) = NULL;
-+
-+	hidden_root = mini_fo_parse_options(sb, raw_data);
-+	if (IS_ERR(hidden_root)) {
-+		printk(KERN_WARNING "mini_fo_read_super: lookup_dentry failed (err = %ld)\n", PTR_ERR(hidden_root));
-+		err = PTR_ERR(hidden_root);
-+		goto out_free;
-+	}
-+	if (!hidden_root->d_inode) {
-+		printk(KERN_WARNING "mini_fo_read_super: no directory to interpose on\n");
-+		goto out_free;
-+	}
-+	stohs(sb) = hidden_root->d_sb;
-+
-+	/*
-+	 * Linux 2.4.2-ac3 and beyond has code in
-+	 * mm/filemap.c:generic_file_write() that requires sb->s_maxbytes
-+	 * to be populated.  If not set, all write()s under that sb will
-+	 * return 0.
-+	 *
-+	 * Linux 2.4.4+ automatically sets s_maxbytes to MAX_NON_LFS;
-+	 * the filesystem should override it only if it supports LFS.
-+	 */
-+	/* non-SCA code is good to go with LFS */
-+	sb->s_maxbytes = hidden_root->d_sb->s_maxbytes;
-+
-+	sb->s_op = &mini_fo_sops;
-+	/*
-+	 * we can't use d_alloc_root if we want to use
-+	 * our own interpose function unchanged,
-+	 * so we simply replicate *most* of the code in d_alloc_root here
-+	 */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	sb->s_root = d_alloc(NULL, &(const struct qstr) { "/", 1, 0 });
-+#else
-+	sb->s_root = d_alloc(NULL, &(const struct qstr){hash: 0, name: "/", len : 1});
-+#endif
-+	if (IS_ERR(sb->s_root)) {
-+		printk(KERN_WARNING "mini_fo_read_super: d_alloc failed\n");
-+		err = -ENOMEM;
-+		goto out_dput;
-+	}
-+
-+	sb->s_root->d_op = &mini_fo_dops;
-+	sb->s_root->d_sb = sb;
-+	sb->s_root->d_parent = sb->s_root;
-+
-+	/* link the upper and lower dentries */
-+	__dtopd(sb->s_root) = (struct mini_fo_dentry_info *)
-+		kmalloc(sizeof(struct mini_fo_dentry_info), GFP_KERNEL);
-+	if (!dtopd(sb->s_root)) {
-+		err = -ENOMEM;
-+		goto out_dput2;
-+	}
-+	dtopd(sb->s_root)->state = MODIFIED;
-+	dtohd(sb->s_root) = hidden_root;
-+
-+	/* fanout relevant, interpose on storage root dentry too */
-+	dtohd2(sb->s_root) = stopd(sb)->storage_dir_dentry;
-+
-+	/* ...and call tri-interpose to interpose root dir inodes
-+	 * if (mini_fo_interpose(hidden_root, sb->s_root, sb, 0))
-+	 */
-+	if(mini_fo_tri_interpose(hidden_root, dtohd2(sb->s_root), sb->s_root, sb, 0))
-+		goto out_dput2;
-+
-+	/* initalize the wol list */
-+	itopd(sb->s_root->d_inode)->deleted_list_size = -1;
-+	itopd(sb->s_root->d_inode)->renamed_list_size = -1;
-+	meta_build_lists(sb->s_root);
-+
-+	goto out;
-+
-+ out_dput2:
-+	dput(sb->s_root);
-+ out_dput:
-+	dput(hidden_root);
-+	dput(dtohd2(sb->s_root)); /* release the hidden_sto_dentry too */
-+ out_free:
-+	kfree(stopd(sb));
-+	__stopd(sb) = NULL;
-+ out:
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        return err;
-+#else
-+        if (err) {
-+		return ERR_PTR(err);
-+        } else {
-+		return sb;
-+        }
-+#endif
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+static int mini_fo_get_sb(struct file_system_type *fs_type,
-+					  int flags, const char *dev_name,
-+					  void *raw_data, struct vfsmount *mnt)
-+{
-+	return get_sb_nodev(fs_type, flags, raw_data, mini_fo_read_super, mnt);
-+}
-+#else
-+static struct super_block *mini_fo_get_sb(struct file_system_type *fs_type,
-+					  int flags, const char *dev_name,
-+					  void *raw_data)
-+{
-+	return get_sb_nodev(fs_type, flags, raw_data, mini_fo_read_super);
-+}
-+#endif
-+
-+void mini_fo_kill_block_super(struct super_block *sb)
-+{
-+	generic_shutdown_super(sb);
-+	/*
-+	 *      XXX: BUG: Halcrow: Things get unstable sometime after this point:
-+	 *      lib/rwsem-spinlock.c:127: spin_is_locked on uninitialized
-+	 *      fs/fs-writeback.c:402: spin_lock(fs/super.c:a0381828) already
-+	 *      locked by fs/fs-writeback.c/402
-+	 *
-+	 *      Apparently, someone's not releasing a lock on sb_lock...
-+	 */
-+}
-+
-+static struct file_system_type mini_fo_fs_type = {
-+	.owner          = THIS_MODULE,
-+	.name           = "mini_fo",
-+	.get_sb         = mini_fo_get_sb,
-+	.kill_sb        = mini_fo_kill_block_super,
-+	.fs_flags       = 0,
-+};
-+
-+
-+#else
-+static DECLARE_FSTYPE(mini_fo_fs_type, "mini_fo", mini_fo_read_super, 0);
-+#endif
-+
-+static int __init init_mini_fo_fs(void)
-+{
-+	printk("Registering mini_fo version $Id$\n");
-+	return register_filesystem(&mini_fo_fs_type);
-+}
-+static void __exit exit_mini_fo_fs(void)
-+{
-+	printk("Unregistering mini_fo version $Id$\n");
-+	unregister_filesystem(&mini_fo_fs_type);
-+}
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+EXPORT_NO_SYMBOLS;
-+#endif
-+
-+MODULE_AUTHOR("Erez Zadok <ezk@cs.sunysb.edu>");
-+MODULE_DESCRIPTION("FiST-generated mini_fo filesystem");
-+MODULE_LICENSE("GPL");
-+
-+/* MODULE_PARM(fist_debug_var, "i"); */
-+/* MODULE_PARM_DESC(fist_debug_var, "Debug level"); */
-+
-+module_init(init_mini_fo_fs)
-+module_exit(exit_mini_fo_fs)
---- /dev/null
-+++ b/fs/mini_fo/Makefile
-@@ -0,0 +1,17 @@
-+#
-+# Makefile for mini_fo 2.4 and 2.6 Linux kernels
-+#
-+# Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+#
-+# 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.
-+#
-+
-+obj-$(CONFIG_MINI_FO) := mini_fo.o
-+mini_fo-objs   := meta.o dentry.o file.o inode.o main.o super.o state.o aux.o
-+
-+# dependencies
-+${mini_fo-objs}: mini_fo.h fist.h
-+
---- /dev/null
-+++ b/fs/mini_fo/meta.c
-@@ -0,0 +1,1000 @@
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+int meta_build_lists(dentry_t *dentry)
-+{
-+	struct mini_fo_inode_info *inode_info;
-+
-+	dentry_t *meta_dentry = 0;
-+	file_t *meta_file = 0;
-+	mm_segment_t old_fs;
-+	void *buf;
-+
-+	int bytes, len;
-+	struct vfsmount *meta_mnt;
-+	char *entry;
-+
-+	inode_info = itopd(dentry->d_inode);
-+	if(!(inode_info->deleted_list_size == -1 &&
-+	     inode_info->renamed_list_size == -1)) {
-+		printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                  Error, list(s) not virgin.\n");
-+		return -1;
-+	}
-+
-+	/* init our meta lists */
-+	INIT_LIST_HEAD(&inode_info->deleted_list);
-+	inode_info->deleted_list_size = 0;
-+
-+	INIT_LIST_HEAD(&inode_info->renamed_list);
-+	inode_info->renamed_list_size = 0;
-+
-+  	/* might there be a META-file? */
-+	if(dtohd2(dentry) && dtohd2(dentry)->d_inode) {
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     dtohd2(dentry),
-+					     strlen(META_FILENAME));
-+		if(!meta_dentry->d_inode) {
-+			dput(meta_dentry);
-+			goto out_ok;
-+		}
-+		/* $%& err, is this correct? */
-+		meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+		mntget(meta_mnt);
-+
-+
-+		/* open META-file for reading */
-+		meta_file = dentry_open(meta_dentry, meta_mnt, 0x0);
-+		if(!meta_file || IS_ERR(meta_file)) {
-+			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                          ERROR opening META file.\n");
-+			goto out_err;
-+		}
-+
-+		/* check if fs supports reading */
-+		if(!meta_file->f_op->read) {
-+			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                          ERROR, fs does not support reading.\n");
-+			goto out_err_close;
-+		}
-+
-+		/* allocate a page for transfering the data */
-+		buf = (void *) __get_free_page(GFP_KERNEL);
-+		if(!buf) {
-+			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                          ERROR, out of mem.\n");
-+			goto out_err_close;
-+		}
-+		meta_file->f_pos = 0;
-+		old_fs = get_fs();
-+		set_fs(KERNEL_DS);
-+		do {
-+			char *c;
-+			bytes = meta_file->f_op->read(meta_file, buf, PAGE_SIZE, &meta_file->f_pos);
-+			if(bytes == PAGE_SIZE) {
-+				/* trim a cut off filename and adjust f_pos to get it next time */
-+				for(c = (char*) buf+PAGE_SIZE;
-+				    *c != '\n';
-+				    c--, bytes--, meta_file->f_pos--);
-+			}
-+			entry = (char *) buf;
-+			while(entry < (char *) buf+bytes) {
-+
-+				char *old_path;
-+				char *dir_name;
-+				int old_len, new_len;
-+
-+				/* len without '\n'*/
-+				len = (int) (strchr(entry, '\n') - entry);
-+				switch (*entry) {
-+				case 'D':
-+					/* format: "D filename" */
-+					meta_list_add_d_entry(dentry,
-+							      entry+2,
-+							      len-2);
-+					break;
-+				case 'R':
-+					/* format: "R path/xy/dir newDir" */
-+					old_path = entry+2;
-+					dir_name = strchr(old_path, ' ') + 1;
-+					old_len =  dir_name - old_path - 1;
-+					new_len = ((int) entry) + len - ((int ) dir_name);
-+					meta_list_add_r_entry(dentry,
-+							      old_path,
-+							      old_len,
-+							      dir_name,
-+							      new_len);
-+					break;
-+				default:
-+					/* unknown entry type detected */
-+					break;
-+				}
-+				entry += len+1;
-+			}
-+
-+		} while(meta_file->f_pos < meta_dentry->d_inode->i_size);
-+
-+		free_page((unsigned long) buf);
-+		set_fs(old_fs);
-+		fput(meta_file);
-+	}
-+	goto out_ok;
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out_err:
-+	mntput(meta_mnt);
-+	dput(meta_dentry);
-+	return -1;
-+ out_ok:
-+	return 1; /* check this!!! inode_info->wol_size; */
-+}
-+
-+/* cleanups up all lists and free's the mem by dentry */
-+int meta_put_lists(dentry_t *dentry)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk("mini_fo: meta_put_lists: invalid dentry passed.\n");
-+		return -1;
-+	}
-+	return __meta_put_lists(dentry->d_inode);
-+}
-+
-+/* cleanups up all lists and free's the mem by inode */
-+int __meta_put_lists(inode_t *inode)
-+{
-+	int err = 0;
-+	if(!inode || !itopd(inode)) {
-+		printk("mini_fo: __meta_put_lists: invalid inode passed.\n");
-+		return -1;
-+	}
-+	err = __meta_put_d_list(inode);
-+	err |= __meta_put_r_list(inode);
-+	return err;
-+}
-+
-+int meta_sync_lists(dentry_t *dentry)
-+{
-+	int err = 0;
-+	if(!dentry || !dentry->d_inode) {
-+		printk("mini_fo: meta_sync_lists: \
-+                        invalid dentry passed.\n");
-+		return -1;
-+	}
-+	err = meta_sync_d_list(dentry, 0);
-+	err |= meta_sync_r_list(dentry, 1);
-+	return err;
-+}
-+
-+
-+/* remove all D entries from the renamed list and free the mem */
-+int __meta_put_d_list(inode_t *inode)
-+{
-+	struct list_head *tmp;
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: __meta_put_d_list: \
-+                                  invalid inode passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(inode);
-+
-+        /* nuke the DELETED-list */
-+        if(inode_info->deleted_list_size <= 0)
-+		return 0;
-+
-+	while(!list_empty(&inode_info->deleted_list)) {
-+		tmp = inode_info->deleted_list.next;
-+		list_del(tmp);
-+		del_entry = list_entry(tmp, struct deleted_entry, list);
-+		kfree(del_entry->name);
-+		kfree(del_entry);
-+	}
-+	inode_info->deleted_list_size = 0;
-+
-+	return 0;
-+}
-+
-+/* remove all R entries from the renamed list and free the mem */
-+int __meta_put_r_list(inode_t *inode)
-+{
-+	struct list_head *tmp;
-+	struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: meta_put_r_list: invalid inode.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(inode);
-+
-+        /* nuke the RENAMED-list */
-+        if(inode_info->renamed_list_size <= 0)
-+		return 0;
-+
-+	while(!list_empty(&inode_info->renamed_list)) {
-+		tmp = inode_info->renamed_list.next;
-+		list_del(tmp);
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		kfree(ren_entry->new_name);
-+		kfree(ren_entry->old_name);
-+		kfree(ren_entry);
-+	}
-+	inode_info->renamed_list_size = 0;
-+
-+	return 0;
-+}
-+
-+int meta_add_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	int err = 0;
-+	err = meta_list_add_d_entry(dentry, name, len);
-+	err |= meta_write_d_entry(dentry,name,len);
-+	return err;
-+}
-+
-+/* add a D entry to the deleted list */
-+int meta_list_add_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_list_add_d_entry: \
-+                                  invalid dentry passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->deleted_list_size < 0)
-+                return -1;
-+
-+        del_entry = (struct deleted_entry *)
-+		kmalloc(sizeof(struct deleted_entry), GFP_KERNEL);
-+        del_entry->name = (char*) kmalloc(len, GFP_KERNEL);
-+        if(!del_entry || !del_entry->name) {
-+                printk(KERN_CRIT "mini_fo: meta_list_add_d_entry: \
-+                                  out of mem.\n");
-+		kfree(del_entry->name);
-+		kfree(del_entry);
-+                return -ENOMEM;
-+        }
-+
-+        strncpy(del_entry->name, name, len);
-+        del_entry->len = len;
-+
-+        list_add(&del_entry->list, &inode_info->deleted_list);
-+        inode_info->deleted_list_size++;
-+        return 0;
-+}
-+
-+int meta_add_r_entry(dentry_t *dentry,
-+			  const char *old_name, int old_len,
-+			  const char *new_name, int new_len)
-+{
-+	int err = 0;
-+	err = meta_list_add_r_entry(dentry,
-+				    old_name, old_len,
-+				    new_name, new_len);
-+	err |= meta_write_r_entry(dentry,
-+				  old_name, old_len,
-+				  new_name, new_len);
-+	return err;
-+}
-+
-+/* add a R entry to the renamed list */
-+int meta_list_add_r_entry(dentry_t *dentry,
-+			  const char *old_name, int old_len,
-+			  const char *new_name, int new_len)
-+{
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_list_add_r_entry: \
-+                                  invalid dentry passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->renamed_list_size < 0)
-+                return -1;
-+
-+        ren_entry = (struct renamed_entry *)
-+		kmalloc(sizeof(struct renamed_entry), GFP_KERNEL);
-+        ren_entry->old_name = (char*) kmalloc(old_len, GFP_KERNEL);
-+        ren_entry->new_name = (char*) kmalloc(new_len, GFP_KERNEL);
-+
-+        if(!ren_entry || !ren_entry->old_name || !ren_entry->new_name) {
-+                printk(KERN_CRIT "mini_fo: meta_list_add_r_entry: \
-+                                  out of mem.\n");
-+		kfree(ren_entry->new_name);
-+		kfree(ren_entry->old_name);
-+		kfree(ren_entry);
-+                return -ENOMEM;
-+        }
-+
-+        strncpy(ren_entry->old_name, old_name, old_len);
-+        ren_entry->old_len = old_len;
-+        strncpy(ren_entry->new_name, new_name, new_len);
-+        ren_entry->new_len = new_len;
-+
-+        list_add(&ren_entry->list, &inode_info->renamed_list);
-+        inode_info->renamed_list_size++;
-+        return 0;
-+}
-+
-+
-+int meta_remove_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	int err = 0;
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT
-+		       "mini_fo: meta_remove_r_entry: \
-+                        invalid dentry passed.\n");
-+		return -1;
-+	}
-+
-+	err = meta_list_remove_r_entry(dentry, name, len);
-+	err |= meta_sync_lists(dentry);
-+	return err;
-+}
-+
-+int meta_list_remove_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT
-+		       "mini_fo: meta_list_remove_r_entry: \
-+                        invalid dentry passed.\n");
-+		return -1;
-+	}
-+	return __meta_list_remove_r_entry(dentry->d_inode, name, len);
-+}
-+
-+int __meta_list_remove_r_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode))
-+		printk(KERN_CRIT
-+		       "mini_fo: __meta_list_remove_r_entry: \
-+                        invalid inode passed.\n");
-+	inode_info = itopd(inode);
-+
-+        if(inode_info->renamed_list_size < 0)
-+                return -1;
-+        if(inode_info->renamed_list_size == 0)
-+                return 1;
-+
-+	list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		if(ren_entry->new_len != len)
-+			continue;
-+
-+		if(!strncmp(ren_entry->new_name, name, len)) {
-+			list_del(tmp);
-+			kfree(ren_entry->new_name);
-+			kfree(ren_entry->old_name);
-+			kfree(ren_entry);
-+			inode_info->renamed_list_size--;
-+			return 0;
-+		}
-+	}
-+	return 1;
-+}
-+
-+
-+/* append a single D entry to the meta file */
-+int meta_write_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	dentry_t *meta_dentry = 0;
-+        file_t *meta_file = 0;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err;
-+        struct vfsmount *meta_mnt = 0;
-+        char *buf;
-+
-+	err = 0;
-+
-+	if(itopd(dentry->d_inode)->deleted_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	if(dtopd(dentry)->state == UNMODIFIED) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry), strlen (META_FILENAME));
-+
-+	/* We need to create a META-file */
-+        if(!meta_dentry->d_inode) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry,
-+			   S_IRUSR | S_IWUSR,
-+			   NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry,
-+			   S_IRUSR | S_IWUSR);
-+#endif
-+	}
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  ERROR opening meta file.\n");
-+                mntput(meta_mnt); /* $%& is this necessary? */
-+                dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* size: len for name, 1 for \n and 2 for "D " */
-+	buf = (char *) kmalloc(len+3, GFP_KERNEL);
-+	if (!buf) {
-+		printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  out of mem.\n");
-+		return -ENOMEM;
-+	}
-+
-+	buf[0] = 'D';
-+	buf[1] = ' ';
-+	strncpy(buf+2, name, len);
-+	buf[len+2] = '\n';
-+	bytes = meta_file->f_op->write(meta_file, buf, len+3,
-+				       &meta_file->f_pos);
-+	if(bytes != len+3) {
-+		printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  ERROR writing.\n");
-+		err = -1;
-+	}
-+	kfree(buf);
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+}
-+
-+/* append a single R entry to the meta file */
-+int meta_write_r_entry(dentry_t *dentry,
-+		       const char *old_name, int old_len,
-+		       const char *new_name, int new_len)
-+{
-+	dentry_t *meta_dentry = 0;
-+        file_t *meta_file = 0;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err, buf_len;
-+	struct vfsmount *meta_mnt = 0;
-+        char *buf;
-+
-+
-+	err = 0;
-+
-+	if(itopd(dentry->d_inode)->renamed_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* build the storage structure? */
-+	if(dtopd(dentry)->state == UNMODIFIED) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry),
-+				     strlen (META_FILENAME));
-+        if(!meta_dentry->d_inode) {
-+                /* We need to create a META-file */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR, NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR);
-+#endif
-+	}
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-+                                  ERROR opening meta file.\n");
-+                mntput(meta_mnt);
-+                dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* size: 2 for "R ", old_len+new_len for names, 1 blank+1 \n */
-+	buf_len = old_len + new_len + 4;
-+	buf = (char *) kmalloc(buf_len, GFP_KERNEL);
-+	if (!buf) {
-+		printk(KERN_CRIT "mini_fo: meta_write_r_entry: out of mem.\n");
-+		return -ENOMEM;
-+	}
-+
-+	buf[0] = 'R';
-+	buf[1] = ' ';
-+	strncpy(buf + 2, old_name, old_len);
-+	buf[old_len + 2] = ' ';
-+	strncpy(buf + old_len + 3, new_name, new_len);
-+	buf[buf_len -1] = '\n';
-+	bytes = meta_file->f_op->write(meta_file, buf, buf_len, &meta_file->f_pos);
-+	if(bytes != buf_len) {
-+		printk(KERN_CRIT "mini_fo: meta_write_r_entry: ERROR writing.\n");
-+		err = -1;
-+	}
-+
-+	kfree(buf);
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+}
-+
-+/* sync D list to disk, append data if app_flag is 1 */
-+/* check the meta_mnt, which seems not to be used (properly)  */
-+
-+int meta_sync_d_list(dentry_t *dentry, int app_flag)
-+{
-+	dentry_t *meta_dentry;
-+        file_t *meta_file;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err;
-+        struct vfsmount *meta_mnt;
-+        char *buf;
-+
-+	struct list_head *tmp;
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	err = 0;
-+	meta_file=0;
-+	meta_mnt=0;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                  invalid inode passed.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->deleted_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* ok, there is something to sync */
-+
-+	/* build the storage structure? */
-+        if(!dtohd2(dentry) && !itohi2(dentry->d_inode)) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry),
-+				     strlen(META_FILENAME));
-+        if(!meta_dentry->d_inode) {
-+                /* We need to create a META-file */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR, NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR);
-+#endif
-+		app_flag = 0;
-+	}
-+	/* need we truncate the meta file? */
-+	if(!app_flag) {
-+		struct iattr newattrs;
-+                newattrs.ia_size = 0;
-+                newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                down(&meta_dentry->d_inode->i_sem);
-+#endif
-+                err = notify_change(meta_dentry, &newattrs);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                up(&meta_dentry->d_inode->i_sem);
-+#endif
-+
-+                if(err || meta_dentry->d_inode->i_size != 0) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          ERROR truncating meta file.\n");
-+                        goto out_err_close;
-+		}
-+	}
-+
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                  ERROR opening meta file.\n");
-+		/* we don't mntget so we dont't mntput (for now)
-+		 * mntput(meta_mnt);
-+		 */
-+		dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* here we go... */
-+        list_for_each(tmp, &inode_info->deleted_list) {
-+		del_entry = list_entry(tmp, struct deleted_entry, list);
-+
-+		/* size: len for name, 1 for \n and 2 for "D " */
-+		buf = (char *) kmalloc(del_entry->len+3, GFP_KERNEL);
-+		if (!buf) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          out of mem.\n");
-+			return -ENOMEM;
-+		}
-+
-+		buf[0] = 'D';
-+		buf[1] = ' ';
-+		strncpy(buf+2, del_entry->name, del_entry->len);
-+		buf[del_entry->len+2] = '\n';
-+		bytes = meta_file->f_op->write(meta_file, buf,
-+					       del_entry->len+3,
-+					       &meta_file->f_pos);
-+		if(bytes != del_entry->len+3) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          ERROR writing.\n");
-+			err |= -1;
-+		}
-+		kfree(buf);
-+	}
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+
-+}
-+
-+int meta_sync_r_list(dentry_t *dentry, int app_flag)
-+{
-+	dentry_t *meta_dentry;
-+        file_t *meta_file;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err, buf_len;
-+        struct vfsmount *meta_mnt;
-+        char *buf;
-+
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	err = 0;
-+	meta_file=0;
-+	meta_mnt=0;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                  invalid dentry passed.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->deleted_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* ok, there is something to sync */
-+
-+	/* build the storage structure? */
-+        if(!dtohd2(dentry) && !itohi2(dentry->d_inode)) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry),
-+				     strlen(META_FILENAME));
-+        if(!meta_dentry->d_inode) {
-+                /* We need to create a META-file */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR, NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR);
-+#endif
-+		app_flag = 0;
-+	}
-+	/* need we truncate the meta file? */
-+	if(!app_flag) {
-+		struct iattr newattrs;
-+                newattrs.ia_size = 0;
-+                newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                down(&meta_dentry->d_inode->i_sem);
-+#endif
-+                err = notify_change(meta_dentry, &newattrs);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                up(&meta_dentry->d_inode->i_sem);
-+#endif
-+                if(err || meta_dentry->d_inode->i_size != 0) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          ERROR truncating meta file.\n");
-+                        goto out_err_close;
-+		}
-+	}
-+
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                  ERROR opening meta file.\n");
-+		/* we don't mntget so we dont't mntput (for now)
-+		 * mntput(meta_mnt);
-+		 */
-+		dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* here we go... */
-+        list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		/* size:
-+		 * 2 for "R ", old_len+new_len for names, 1 blank+1 \n */
-+		buf_len = ren_entry->old_len + ren_entry->new_len + 4;
-+		buf = (char *) kmalloc(buf_len, GFP_KERNEL);
-+		if (!buf) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          out of mem.\n");
-+			return -ENOMEM;
-+		}
-+		buf[0] = 'R';
-+		buf[1] = ' ';
-+		strncpy(buf + 2, ren_entry->old_name, ren_entry->old_len);
-+		buf[ren_entry->old_len + 2] = ' ';
-+		strncpy(buf + ren_entry->old_len + 3,
-+			ren_entry->new_name, ren_entry->new_len);
-+		buf[buf_len - 1] = '\n';
-+		bytes = meta_file->f_op->write(meta_file, buf,
-+					       buf_len, &meta_file->f_pos);
-+		if(bytes != buf_len) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          ERROR writing.\n");
-+			err |= -1;
-+		}
-+		kfree(buf);
-+	}
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+}
-+
-+int meta_check_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode)
-+		printk(KERN_CRIT "mini_fo: meta_check_d_dentry: \
-+                                  invalid dentry passed.\n");
-+	return __meta_check_d_entry(dentry->d_inode, name, len);
-+}
-+
-+int __meta_check_d_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode))
-+		printk(KERN_CRIT "mini_fo: __meta_check_d_dentry: \
-+                                  invalid inode passed.\n");
-+
-+        inode_info = itopd(inode);
-+
-+        if(inode_info->deleted_list_size <= 0)
-+                return 0;
-+
-+        list_for_each(tmp, &inode_info->deleted_list) {
-+		del_entry = list_entry(tmp, struct deleted_entry, list);
-+		if(del_entry->len != len)
-+			continue;
-+
-+		if(!strncmp(del_entry->name, name, len))
-+			return 1;
-+	}
-+	return 0;
-+}
-+
-+/*
-+ * check if file has been renamed and return path to orig. base dir.
-+ * Implements no error return values so far, what of course sucks.
-+ * String is null terminated.'
-+ */
-+char* meta_check_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry: \
-+                                  invalid dentry passed.\n");
-+		return NULL;
-+	}
-+	return __meta_check_r_entry(dentry->d_inode, name, len);
-+}
-+
-+char* __meta_check_r_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+	char *old_path;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry: \
-+                                  invalid inode passed.\n");
-+		return NULL;
-+	}
-+	inode_info = itopd(inode);
-+
-+        if(inode_info->renamed_list_size <= 0)
-+                return NULL;
-+
-+        list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		if(ren_entry->new_len != len)
-+			continue;
-+
-+		if(!strncmp(ren_entry->new_name, name, len)) {
-+			old_path = (char *)
-+				kmalloc(ren_entry->old_len+1, GFP_KERNEL);
-+			strncpy(old_path,
-+				ren_entry->old_name,
-+				ren_entry->old_len);
-+			old_path[ren_entry->old_len]='\0';
-+			return old_path;
-+		}
-+	}
-+	return NULL;
-+}
-+
-+/*
-+ * This version only checks if entry exists and return:
-+ *     1 if exists,
-+ *     0 if not,
-+ *    -1 if error.
-+ */
-+int meta_is_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry [2]: \
-+                                  invalid dentry passed.\n");
-+		return -1;
-+	}
-+	return __meta_is_r_entry(dentry->d_inode, name, len);
-+}
-+
-+int __meta_is_r_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry [2]: \
-+                                  invalid inode passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(inode);
-+
-+        if(inode_info->renamed_list_size <= 0)
-+                return -1;
-+
-+        list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		if(ren_entry->new_len != len)
-+			continue;
-+
-+		if(!strncmp(ren_entry->new_name, name, len))
-+			return 1;
-+	}
-+	return 0;
-+}
-+
---- /dev/null
-+++ b/fs/mini_fo/mini_fo.h
-@@ -0,0 +1,510 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifndef __MINI_FO_H_
-+#define __MINI_FO_H_
-+
-+#ifdef __KERNEL__
-+
-+/* META stuff */
-+#define META_FILENAME "META_dAfFgHE39ktF3HD2sr"
-+
-+/* use xattrs? */
-+#define XATTR
-+
-+/* File attributes that when changed, result in a file beeing copied to storage */
-+#define COPY_FLAGS ATTR_MODE | ATTR_UID | ATTR_GID | ATTR_SIZE
-+
-+/*
-+ * mini_fo filestates
-+ */
-+#define MODIFIED       1
-+#define UNMODIFIED     2
-+#define CREATED        3
-+#define DEL_REWRITTEN  4
-+#define DELETED        5
-+#define NON_EXISTANT   6
-+
-+/* fist file systems superblock magic */
-+# define MINI_FO_SUPER_MAGIC 0xf15f
-+
-+/*
-+ * STRUCTURES:
-+ */
-+
-+/* mini_fo inode data in memory */
-+struct mini_fo_inode_info {
-+	inode_t *wii_inode;
-+	inode_t *wii_inode2; /* pointer to storage inode */
-+
-+	/* META-data lists */
-+	/* deleted list, ex wol */
-+	struct list_head deleted_list;
-+	int deleted_list_size;
-+
-+	/* renamed list */
-+	struct list_head renamed_list;
-+	int renamed_list_size;
-+
-+	/* add other lists here ... */
-+};
-+
-+/* mini_fo dentry data in memory */
-+struct mini_fo_dentry_info {
-+	dentry_t *wdi_dentry;
-+	dentry_t *wdi_dentry2; /* pointer to  storage dentry */
-+	unsigned int state;  /* state of the mini_fo dentry */
-+};
-+
-+
-+/* mini_fo super-block data in memory */
-+struct mini_fo_sb_info {
-+	super_block_t *wsi_sb, *wsi_sb2; /* mk: might point to the same sb */
-+	struct vfsmount *hidden_mnt, *hidden_mnt2;
-+	dentry_t *base_dir_dentry;
-+	dentry_t *storage_dir_dentry;
-+	;
-+};
-+
-+/* readdir_data, readdir helper struct */
-+struct readdir_data {
-+	struct list_head ndl_list; /* linked list head ptr */
-+	int ndl_size; /* list size */
-+	int sto_done; /* flag to show that the storage dir entries have
-+		       * all been read an now follow base entries */
-+};
-+
-+/* file private data. */
-+struct mini_fo_file_info {
-+	struct file *wfi_file;
-+	struct file *wfi_file2; /* pointer to storage file */
-+	struct readdir_data rd;
-+};
-+
-+/* struct ndl_entry */
-+struct ndl_entry {
-+	struct list_head list;
-+	char *name;
-+	int len;
-+};
-+
-+/********************************
-+ *  META-data structures
-+ ********************************/
-+
-+/* deleted entry */
-+struct deleted_entry {
-+	struct list_head list;
-+	char *name;
-+	int len;
-+};
-+
-+/* renamed entry */
-+struct renamed_entry {
-+	struct list_head list;
-+	char *old_name;     /* old directory with full path */
-+	int old_len;        /* length of above string */
-+	char *new_name;     /* new directory name */
-+	int new_len;        /* length of above string */
-+};
-+
-+/* attr_change entry */
-+struct attr_change_entry {
-+	struct list_head list;
-+	char *name;
-+	int len;
-+};
-+
-+/* link entry */
-+struct link_entry {
-+	struct list_head list;
-+	int links_moved;
-+	int inum_base;
-+	int inum_sto;
-+	char *weird_name;
-+	int weird_name_len;
-+};
-+
-+
-+/* Some other stuff required for mini_fo_filldir64, copied from
-+ * fs/readdir.c
-+ */
-+
-+#define ROUND_UP64(x) (((x)+sizeof(u64)-1) & ~(sizeof(u64)-1))
-+#define NAME_OFFSET(de) ((int) ((de)->d_name - (char *) (de)))
-+
-+
-+struct linux_dirent64 {
-+        u64             d_ino;
-+        s64             d_off;
-+        unsigned short  d_reclen;
-+        unsigned char   d_type;
-+        char            d_name[0];
-+};
-+
-+
-+struct getdents_callback64 {
-+        struct linux_dirent64 * current_dir;
-+        struct linux_dirent64 * previous;
-+        int count;
-+        int error;
-+};
-+
-+struct linux_dirent {
-+	unsigned long   d_ino;
-+	unsigned long   d_off;
-+	unsigned short  d_reclen;
-+	char            d_name[1];
-+};
-+
-+struct getdents_callback {
-+	struct linux_dirent * current_dir;
-+	struct linux_dirent * previous;
-+	int count;
-+	int error;
-+};
-+
-+
-+/*
-+ * MACROS:
-+ */
-+
-+/* file TO private_data */
-+# define ftopd(file) ((struct mini_fo_file_info *)((file)->private_data))
-+# define __ftopd(file) ((file)->private_data)
-+/* file TO hidden_file */
-+# define ftohf(file) ((ftopd(file))->wfi_file)
-+# define ftohf2(file) ((ftopd(file))->wfi_file2)
-+
-+/* inode TO private_data */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+# define itopd(ino) ((struct mini_fo_inode_info *)(ino)->i_private)
-+# define __itopd(ino) ((ino)->i_private)
-+#else
-+# define itopd(ino) ((struct mini_fo_inode_info *)(ino)->u.generic_ip)
-+# define __itopd(ino) ((ino)->u.generic_ip)
-+#endif
-+/* inode TO hidden_inode */
-+# define itohi(ino) (itopd(ino)->wii_inode)
-+# define itohi2(ino) (itopd(ino)->wii_inode2)
-+
-+/* superblock TO private_data */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+# define stopd(super) ((struct mini_fo_sb_info *)(super)->s_fs_info)
-+# define __stopd(super) ((super)->s_fs_info)
-+#else
-+# define stopd(super) ((struct mini_fo_sb_info *)(super)->u.generic_sbp)
-+# define __stopd(super) ((super)->u.generic_sbp)
-+#endif
-+
-+/* unused? # define vfs2priv stopd */
-+/* superblock TO hidden_superblock */
-+
-+# define stohs(super) (stopd(super)->wsi_sb)
-+# define stohs2(super) (stopd(super)->wsi_sb2)
-+
-+/* dentry TO private_data */
-+# define dtopd(dentry) ((struct mini_fo_dentry_info *)(dentry)->d_fsdata)
-+# define __dtopd(dentry) ((dentry)->d_fsdata)
-+/* dentry TO hidden_dentry */
-+# define dtohd(dent) (dtopd(dent)->wdi_dentry)
-+# define dtohd2(dent) (dtopd(dent)->wdi_dentry2)
-+
-+/* dentry to state */
-+# define dtost(dent) (dtopd(dent)->state)
-+# define sbt(sb) ((sb)->s_type->name)
-+
-+#define IS_WRITE_FLAG(flag) (flag & (O_RDWR | O_WRONLY | O_APPEND))
-+#define IS_COPY_FLAG(flag) (flag & (COPY_FLAGS))
-+
-+/* macros to simplify non-SCA code */
-+#  define MALLOC_PAGE_POINTERS(hidden_pages, num_hidden_pages)
-+#  define MALLOC_PAGEDATA_POINTERS(hidden_pages_data, num_hidden_pages)
-+#  define FREE_PAGE_POINTERS(hidden_pages, num)
-+#  define FREE_PAGEDATA_POINTERS(hidden_pages_data, num)
-+#  define FOR_EACH_PAGE
-+#  define CURRENT_HIDDEN_PAGE hidden_page
-+#  define CURRENT_HIDDEN_PAGEDATA hidden_page_data
-+#  define CURRENT_HIDDEN_PAGEINDEX page->index
-+
-+/*
-+ * EXTERNALS:
-+ */
-+extern struct file_operations mini_fo_main_fops;
-+extern struct file_operations mini_fo_dir_fops;
-+extern struct inode_operations mini_fo_main_iops;
-+extern struct inode_operations mini_fo_dir_iops;
-+extern struct inode_operations mini_fo_symlink_iops;
-+extern struct super_operations mini_fo_sops;
-+extern struct dentry_operations mini_fo_dops;
-+extern struct vm_operations_struct mini_fo_shared_vmops;
-+extern struct vm_operations_struct mini_fo_private_vmops;
-+extern struct address_space_operations mini_fo_aops;
-+
-+#if 0 /* unused by mini_fo */
-+extern int mini_fo_interpose(dentry_t *hidden_dentry, dentry_t *this_dentry, super_block_t *sb, int flag);
-+#if defined(FIST_FILTER_DATA) || defined(FIST_FILTER_SCA)
-+extern page_t *mini_fo_get1page(file_t *file, int index);
-+extern int mini_fo_fill_zeros(file_t *file, page_t *page, unsigned from);
-+# endif /* FIST_FILTER_DATA || FIST_FILTER_SCA */
-+
-+
-+#  define mini_fo_hidden_dentry(d) __mini_fo_hidden_dentry(__FILE__,__FUNCTION__,__LINE__,(d))
-+#  define mini_fo_hidden_sto_dentry(d) __mini_fo_hidden_sto_dentry(__FILE__,__FUNCTION__,__LINE__,(d))
-+
-+extern dentry_t *__mini_fo_hidden_dentry(char *file, char *func, int line, dentry_t *this_dentry);
-+extern dentry_t *__mini_fo_hidden_sto_dentry(char *file, char *func, int line, dentry_t *this_dentry);
-+
-+extern int mini_fo_read_file(const char *filename, void *buf, int len);
-+extern int mini_fo_write_file(const char *filename, void *buf, int len);
-+extern dentry_t *fist_lookup(dentry_t *dir, const char *name, vnode_t **out, uid_t uid, gid_t gid);
-+#endif /* unused by mini_fo */
-+
-+/* state transition functions */
-+extern int nondir_unmod_to_mod(dentry_t *dentry, int cp_flag);
-+extern int nondir_del_rew_to_del(dentry_t *dentry);
-+extern int nondir_creat_to_del(dentry_t *dentry);
-+extern int nondir_mod_to_del(dentry_t *dentry);
-+extern int nondir_unmod_to_del(dentry_t *dentry);
-+
-+extern int dir_unmod_to_mod(dentry_t *dentry);
-+
-+/* rename specials */
-+extern int rename_directory(inode_t *old_dir, dentry_t *old_dentry, inode_t *new_dir, dentry_t *new_dentry);
-+extern int rename_nondir(inode_t *old_dir, dentry_t *old_dentry, inode_t *new_dir, dentry_t *new_dentry);
-+
-+/* misc stuff */
-+extern int mini_fo_tri_interpose(dentry_t *hidden_dentry,
-+				 dentry_t *hidden_sto_dentry,
-+				 dentry_t *dentry,
-+				 super_block_t *sb, int flag);
-+
-+extern int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
-+			   dentry_t *src_dentry, struct vfsmount *src_mnt);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
-+
-+extern int create_sto_nod(dentry_t *dentry, int mode, dev_t dev);
-+extern int create_sto_reg_file(dentry_t *dentry, int mode, struct nameidata *nd);
-+#else
-+extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode);
-+
-+extern int create_sto_nod(dentry_t *dentry, int mode, int dev);
-+extern int create_sto_reg_file(dentry_t *dentry, int mode);
-+#endif
-+
-+extern int create_sto_dir(dentry_t *dentry, int mode);
-+
-+extern int exists_in_storage(dentry_t *dentry);
-+extern int is_mini_fo_existant(dentry_t *dentry);
-+extern int get_neg_sto_dentry(dentry_t *dentry);
-+extern int build_sto_structure(dentry_t *dir, dentry_t *dentry);
-+extern int get_mini_fo_bpath(dentry_t *dentry, char **bpath, int *bpath_len);
-+extern dentry_t *bpath_walk(super_block_t *sb, char *bpath);
-+extern int bpath_put(dentry_t *dentry);
-+
-+/* check_mini_fo types functions */
-+extern int check_mini_fo_dentry(dentry_t *dentry);
-+extern int check_mini_fo_file(file_t *file);
-+extern int check_mini_fo_inode(inode_t *inode);
-+
-+/* General meta functions, can be called from outside of meta.c */
-+extern int meta_build_lists(dentry_t *dentry);
-+extern int meta_put_lists(dentry_t *dentry);
-+extern int __meta_put_lists(inode_t *inode);
-+
-+extern int meta_add_d_entry(dentry_t *dentry, const char *name, int len);
-+extern int meta_add_r_entry(dentry_t *dentry,
-+			    const char *old_name, int old_len,
-+			    const char *new_name, int new_len);
-+
-+extern int meta_remove_r_entry(dentry_t *dentry, const char *name, int len);
-+
-+extern int meta_check_d_entry(dentry_t *dentry, const char *name, int len);
-+extern int __meta_check_d_entry(inode_t *inode, const char *name, int len);
-+
-+extern char* meta_check_r_entry(dentry_t *dentry, const char *name, int len);
-+extern char* __meta_check_r_entry(inode_t *inode, const char *name, int len);
-+extern int meta_is_r_entry(dentry_t *dentry, const char *name, int len);
-+extern int __meta_is_r_entry(inode_t *inode, const char *name, int len);
-+
-+/* Specific meta functions, should be called only inside meta.c */
-+extern int __meta_put_d_list(inode_t *inode);
-+extern int __meta_put_r_list(inode_t *inode);
-+
-+extern int meta_list_add_d_entry(dentry_t *dentry,
-+				 const char *name, int len);
-+extern int meta_list_add_r_entry(dentry_t *dentry,
-+				 const char *old_name, int old_len,
-+				 const char *new_name, int new_len);
-+
-+extern int meta_list_remove_r_entry(dentry_t *dentry,
-+				    const char *name, int len);
-+
-+extern int __meta_list_remove_r_entry(inode_t *inode,
-+				      const char *name, int len);
-+
-+extern int meta_write_d_entry(dentry_t *dentry, const char *name, int len);
-+extern int meta_write_r_entry(dentry_t *dentry,
-+			      const char *old_name, int old_len,
-+			      const char *new_name, int new_len);
-+
-+extern int meta_sync_lists(dentry_t *dentry);
-+extern int meta_sync_d_list(dentry_t *dentry, int app_flag);
-+extern int meta_sync_r_list(dentry_t *dentry, int app_flag);
-+
-+/* ndl stuff */
-+extern int ndl_add_entry(struct readdir_data *rd, const char *name, int len);
-+extern void ndl_put_list(struct readdir_data *rd);
-+extern int ndl_check_entry(struct readdir_data *rd,
-+			   const char *name, int len);
-+
-+
-+# define copy_inode_size(dst, src) \
-+    dst->i_size = src->i_size; \
-+    dst->i_blocks = src->i_blocks;
-+
-+static inline void
-+fist_copy_attr_atime(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_atime = src->i_atime;
-+}
-+static inline void
-+fist_copy_attr_times(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_atime = src->i_atime;
-+	dest->i_mtime = src->i_mtime;
-+	dest->i_ctime = src->i_ctime;
-+}
-+static inline void
-+fist_copy_attr_timesizes(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_atime = src->i_atime;
-+	dest->i_mtime = src->i_mtime;
-+	dest->i_ctime = src->i_ctime;
-+	copy_inode_size(dest, src);
-+}
-+static inline void
-+fist_copy_attr_all(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_mode = src->i_mode;
-+	dest->i_nlink = src->i_nlink;
-+	dest->i_uid = src->i_uid;
-+	dest->i_gid = src->i_gid;
-+	dest->i_rdev = src->i_rdev;
-+	dest->i_atime = src->i_atime;
-+	dest->i_mtime = src->i_mtime;
-+	dest->i_ctime = src->i_ctime;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-+	dest->i_blksize = src->i_blksize;
-+#endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,12)
-+	dest->i_blkbits = src->i_blkbits;
-+# endif /* linux 2.4.12 and newer */
-+	copy_inode_size(dest, src);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	dest->i_attr_flags = src->i_attr_flags;
-+#else
-+	dest->i_flags = src->i_flags;
-+#endif
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+/* copied from linux/fs.h */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+static inline void double_lock(struct dentry *d1, struct dentry *d2)
-+{
-+	struct mutex *m1 = &d1->d_inode->i_mutex;
-+	struct mutex *m2 = &d2->d_inode->i_mutex;
-+	if (m1 != m2) {
-+		if ((unsigned long) m1 < (unsigned long) m2) {
-+			struct mutex *tmp = m2;
-+			m2 = m1; m1 = tmp;
-+		}
-+		mutex_lock(m1);
-+	}
-+	mutex_lock(m2);
-+}
-+
-+static inline void double_unlock(struct dentry *d1, struct dentry *d2)
-+{
-+	struct mutex *m1 = &d1->d_inode->i_mutex;
-+	struct mutex *m2 = &d2->d_inode->i_mutex;
-+	mutex_unlock(m1);
-+	if (m1 != m2)
-+		mutex_unlock(m2);
-+	dput(d1);
-+	dput(d2);
-+}
-+
-+#else
-+static inline void double_down(struct semaphore *s1, struct semaphore *s2)
-+{
-+        if (s1 != s2) {
-+                if ((unsigned long) s1 < (unsigned long) s2) {
-+                        struct semaphore *tmp = s2;
-+                        s2 = s1; s1 = tmp;
-+                }
-+                down(s1);
-+        }
-+        down(s2);
-+}
-+
-+static inline void double_up(struct semaphore *s1, struct semaphore *s2)
-+{
-+        up(s1);
-+        if (s1 != s2)
-+                up(s2);
-+}
-+
-+static inline void double_lock(struct dentry *d1, struct dentry *d2)
-+{
-+        double_down(&d1->d_inode->i_sem, &d2->d_inode->i_sem);
-+}
-+
-+static inline void double_unlock(struct dentry *d1, struct dentry *d2)
-+{
-+        double_up(&d1->d_inode->i_sem,&d2->d_inode->i_sem);
-+        dput(d1);
-+        dput(d2);
-+}
-+#endif   /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) */
-+#endif  /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
-+#endif /* __KERNEL__ */
-+
-+/*
-+ * Definitions for user and kernel code
-+ */
-+
-+/* ioctls */
-+
-+#endif	/* not __MINI_FO_H_ */
---- /dev/null
-+++ b/fs/mini_fo/mini_fo-merge
-@@ -0,0 +1,180 @@
-+#!/bin/bash
-+#
-+# Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
-+# 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.
-+#
-+
-+BASE=
-+STO=
-+HELP=
-+DRYRUN=
-+VERBOSE=
-+TMP="/tmp/"
-+META_NAME="META_dAfFgHE39ktF3HD2sr"
-+SKIP_DEL_LIST="skip-delete-list.mini_fo-merge"
-+
-+COMMAND=
-+exec_command()
-+{
-+    if [ x$DRYRUN == "xset" ]; then
-+	echo "  would run: $COMMAND"
-+    elif ! [ x$DRYRUN == "xset" ]; then
-+	if [ x$VERBOSE == "xset" ]; then
-+	    echo "  running: $COMMAND"
-+	fi
-+	eval $COMMAND
-+    fi
-+}
-+
-+usage()
-+{
-+cat <<EOF
-+
-+USAGE: $0 -b <base dir> -s <storage dir>
-+Version 0.1
-+
-+This script merges the contents of a mini_fo storage file system back
-+to the base file system.
-+
-+!!! Warning: This will modify the base filesystem and can destroy data
-+             if used wrongly.
-+
-+Options:
-+     -b <base dir>
-+          the directory of the base file system.
-+
-+     -s <storage dir>
-+          the directory of the storage file system.
-+
-+     -d   dry run, will not change anything and print the commands that
-+          would be executed.
-+
-+     -t   tmp dir for storing temporary file. default: $TMP
-+
-+     -v   show what operations are performed.
-+
-+     -h   displays this message.
-+
-+EOF
-+}
-+
-+# parse parameters
-+while getopts hdvt:b:s: OPTS
-+  do
-+  case $OPTS in
-+      h)  HELP="set";;
-+      d)  DRYRUN="set";;
-+      v)  VERBOSE="set";;
-+      b)  BASE="$OPTARG";;
-+      s)  STO="$OPTARG";;
-+      t)  TMP="$OPTARG";;
-+      ?)  usage
-+	  exit 1;;
-+  esac
-+done
-+
-+if [ "x$HELP" == "xset" ]; then
-+    usage
-+    exit -1
-+fi
-+
-+if ! [ -d "$BASE" ] || ! [ -d "$STO" ]; then
-+    echo -e "$0:\n Error, -s and/or -b argument missing. type $0 -h for help."
-+    exit -1;
-+fi
-+
-+# get full paths
-+pushd $STO; STO=`pwd`; popd
-+pushd $BASE; BASE=`pwd`; popd
-+TMP=${TMP%/}
-+
-+
-+cat<<EOF
-+###############################################################################
-+# mini_fo-merge
-+#
-+# base dir:       $BASE
-+# storage dir:    $STO
-+# meta filename:  $META_NAME
-+# dry run:        $DRYRUN
-+# verbose:        $VERBOSE
-+# tmp files:      $TMP
-+###############################################################################
-+
-+EOF
-+
-+rm $TMP/$SKIP_DEL_LIST
-+
-+# first process all renamed dirs
-+echo "Merging renamed directories..."
-+pushd $STO &> /dev/null
-+find . -name $META_NAME -type f -print0  | xargs -0 -e grep  -e '^R ' | tr -s ':R' ' ' | while read ENTRY; do
-+    echo "entry: $ENTRY"
-+    META_FILE=`echo $ENTRY | cut -d ' ' -f 1`
-+    OLD_B_DIR=`echo $ENTRY | cut -d ' ' -f 2 | sed -e 's/\///'`
-+    NEW_NAME=`echo $ENTRY | cut -d ' ' -f 3`
-+    NEW_B_DIR=`echo $META_FILE | sed -e "s/$META_NAME/$NEW_NAME/" | sed -e 's/^\.\///'`
-+    echo "META_FILE: $META_FILE"
-+    echo "OLD_B_DIR: $OLD_B_DIR"
-+    echo "NEW_NAME: $NEW_NAME"
-+    echo  "NEW_B_DIR: $NEW_B_DIR"
-+
-+    pushd $BASE &> /dev/null
-+    # remove an existing dir in storage
-+    COMMAND="rm -rf $NEW_B_DIR"; exec_command
-+    COMMAND="cp -R $OLD_B_DIR $NEW_B_DIR"; exec_command
-+    echo ""
-+    popd &> /dev/null
-+
-+    # remember this dir to exclude it from deleting later
-+    echo $NEW_B_DIR >> $TMP/$SKIP_DEL_LIST
-+done
-+
-+# delete all whiteouted files from base
-+echo -e "\nDeleting whiteout'ed files from base file system..."
-+find . -name $META_NAME -type f -print0  | xargs -0 -e grep  -e '^D ' | sed -e 's/:D//' | while read ENTRY; do
-+    META_FILE=`echo $ENTRY | cut -d ' ' -f 1`
-+    DEL_NAME=`echo $ENTRY | cut -d ' ' -f 2`
-+    DEL_FILE=`echo $META_FILE | sed -e "s/$META_NAME/$DEL_NAME/" | sed -e 's/^\.\///'`
-+    grep -x $DEL_FILE $TMP/$SKIP_DEL_LIST &> /dev/null
-+    if [ $? -ne 0 ]; then
-+	pushd $BASE &> /dev/null
-+	COMMAND="rm -rf $DEL_FILE"; exec_command
-+	popd &> /dev/null
-+    else
-+	echo "  excluding: $DEL_FILE as in skip-del-list."
-+    fi
-+done
-+
-+# create all dirs and update permissions
-+echo -e "\nSetting up directory structures in base file system..."
-+find . -type d | sed -e 's/^\.\///' | while read DIR; do
-+    PERMS=`stat -c %a $DIR`
-+    DIR_UID=`stat -c %u $DIR`
-+    DIR_GID=`stat -c %g $DIR`
-+    pushd $BASE &> /dev/null
-+    if ! [ -d $DIR ]; then
-+	COMMAND="mkdir -p $DIR"; exec_command
-+    fi
-+    COMMAND="chmod $PERMS $DIR"; exec_command
-+    COMMAND="chown $DIR_UID:$DIR_GID $DIR"; exec_command
-+    popd &> /dev/null
-+done
-+
-+# merge all non-directory files
-+echo -e "\nMerging all non-directory files...."
-+for i in b c p f l s; do
-+    find . -type $i | sed -e 's/^\.\///' | grep -v "$META_NAME" | while read FILE; do
-+	pushd $BASE #&> /dev/null
-+	COMMAND="cp -df $STO/$FILE $BASE/$FILE"; exec_command
-+	popd &> /dev/null
-+    done
-+done
-+popd &> /dev/null
-+
-+#rm $TMP/$SKIP_DEL_LIST
-+
-+echo "Done!"
---- /dev/null
-+++ b/fs/mini_fo/mini_fo-overlay
-@@ -0,0 +1,130 @@
-+#!/bin/bash
-+#
-+# Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
-+# 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.
-+#
-+
-+HELP=
-+SUFF=
-+MNTP=
-+MNT_DIR="/mnt"
-+STO=
-+STO_DIR="/tmp"
-+BASE=
-+
-+usage()
-+{
-+cat <<EOF
-+
-+Usage: $0 [-s suffix] [-d sto_dir_dir] [-m mount point] base_dir
-+Version 0.1
-+
-+This script overlays the given base directory using the mini_fo file
-+system. If only the base directory base_dir is given, $0
-+will use a storage directory called "sto-<base_dir_name>" in $STO_DIR,
-+and mount point "mini_fo-<base_dir_dir>" in $MNT_DIR.
-+
-+Options:
-+     -s <suffix>
-+          add given suffix to storage directory and the mount
-+          point. This is usefull for overlaying one base directory
-+          several times and avoiding conflicts with storage directory
-+          names and mount points.
-+
-+     -d <sto_dir_dir>
-+          change the directory in which the storage directory will be
-+          created (default is currently "$STO_DIR".
-+
-+     -m <mount point>
-+          use an alternative directory to create the mini_fo
-+          mountpoint (default is currently "$MNT_DIR".
-+
-+     -h   displays this message.
-+
-+EOF
-+exit 1;
-+}
-+
-+while getopts hm:s:d: OPTS
-+  do
-+  case $OPTS in
-+      s)  SUFF="$OPTARG";;
-+      d)  STO_DIR="$OPTARG";;
-+      m)  MNT_DIR="$OPTARG";;
-+      h)  HELP="set";;
-+      ?)  usage
-+	  exit 1;;
-+  esac
-+done
-+shift $(($OPTIND - 1))
-+
-+BASE="$1"
-+
-+if [ "x$HELP" == "xset" ]; then
-+    usage
-+    exit -1
-+fi
-+
-+# fix suffix
-+if [ "x$SUFF" != "x" ]; then
-+    SUFF="-$SUFF"
-+fi
-+
-+# kill trailing slashes
-+MNT_DIR=${MNT_DIR%/}
-+STO_DIR=${STO_DIR%/}
-+BASE=${BASE%/}
-+
-+
-+if ! [ -d "$BASE" ]; then
-+    echo "invalid base dir $BASE, run $0 -h for help."
-+    exit -1
-+fi
-+
-+# check opts
-+if ! [ -d "$MNT_DIR" ]; then
-+    echo "invalid mount dir $MNT_DIR, run $0 -h for help."
-+    exit -1
-+fi
-+
-+if ! [ -d "$STO_DIR" ]; then
-+    echo "invalid sto_dir_dir $STO_DIR, run $0 -h for help."
-+    exit -1
-+fi
-+
-+MNTP="$MNT_DIR/mini_fo-`basename $BASE`$SUFF"
-+STO="$STO_DIR/sto-`basename $BASE`$SUFF"
-+
-+# create the mount point if it doesn't exist
-+mkdir -p $MNTP
-+if [ $? -ne 0 ]; then
-+    echo "Error, failed to create mount point $MNTP"
-+fi
-+
-+mkdir -p $STO
-+if [ $? -ne 0 ]; then
-+    echo "Error, failed to create storage dir $STO"
-+fi
-+
-+# check if fs is already mounted
-+mount | grep mini_fo | grep $MNTP &> /dev/null
-+if [ $? -eq 0 ]; then
-+    echo "Error, existing mini_fo mount at $MNTP."
-+    exit -1
-+fi
-+
-+mount | grep mini_fo | grep $STO &> /dev/null
-+if [ $? -eq 0 ]; then
-+    echo "Error, $STO seems to be used already."
-+    exit -1
-+fi
-+
-+# mount
-+mount -t mini_fo -o base=$BASE,sto=$STO $BASE $MNTP
-+
-+if [ $? -ne 0 ]; then
-+    echo "Error, mounting failed, maybe no permisson to mount?"
-+fi
---- /dev/null
-+++ b/fs/mini_fo/mmap.c
-@@ -0,0 +1,637 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+
-+#ifdef FIST_COUNT_WRITES
-+/* for counting writes in the middle vs. regular writes */
-+unsigned long count_writes = 0, count_writes_middle = 0;
-+#endif /* FIST_COUNT_WRITES */
-+
-+/* forward declaration of commit write and prepare write */
-+STATIC int mini_fo_commit_write(file_t *file, page_t *page, unsigned from, unsigned to);
-+STATIC int mini_fo_prepare_write(file_t *file, page_t *page, unsigned from, unsigned to);
-+
-+
-+/*
-+ * Function for handling creation of holes when lseek-ing past the
-+ * end of the file and then writing some data.
-+ */
-+int
-+mini_fo_fill_zeros(file_t* file, page_t *page, unsigned from)
-+{
-+	int err = 0;
-+	dentry_t *dentry = file->f_dentry;
-+	inode_t *inode = dentry->d_inode;
-+	page_t *tmp_page;
-+	int index;
-+
-+	print_entry_location();
-+
-+	for (index = inode->i_size >> PAGE_CACHE_SHIFT; index < page->index; index++) {
-+		tmp_page = mini_fo_get1page(file, index);
-+		if (IS_ERR(tmp_page)) {
-+			err = PTR_ERR(tmp_page);
-+			goto out;
-+		}
-+
-+		/*
-+		 * zero out rest of the contents of the page between the appropriate
-+		 * offsets.
-+		 */
-+		memset((char*)page_address(tmp_page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, PAGE_CACHE_SIZE - (inode->i_size & ~PAGE_CACHE_MASK));
-+
-+		if (! (err = mini_fo_prepare_write(file, tmp_page, 0, PAGE_CACHE_SIZE)))
-+			err = mini_fo_commit_write(file, tmp_page, 0, PAGE_CACHE_SIZE);
-+
-+		page_cache_release(tmp_page);
-+		if (err < 0)
-+			goto out;
-+		if (current->need_resched)
-+			schedule();
-+	}
-+
-+	/* zero out appropriate parts of last page */
-+
-+	/*
-+	 * if the encoding type is block, then adjust the 'from' (where the
-+	 * zeroing will start) offset appropriately
-+	 */
-+	from = from & (~(FIST_ENCODING_BLOCKSIZE - 1));
-+
-+	if ((from - (inode->i_size & ~PAGE_CACHE_MASK)) > 0) {
-+
-+		memset((char*)page_address(page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, from - (inode->i_size & ~PAGE_CACHE_MASK));
-+		if (! (err = mini_fo_prepare_write(file, page, 0, PAGE_CACHE_SIZE)))
-+			err = mini_fo_commit_write(file, page, 0, PAGE_CACHE_SIZE);
-+
-+		if (err < 0)
-+			goto out;
-+		if (current->need_resched)
-+			schedule();
-+	}
-+
-+ out:
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+
-+STATIC int
-+mini_fo_writepage(page_t *page)
-+{
-+	int err = -EIO;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	page_t *hidden_page;
-+	char *kaddr, *hidden_kaddr;
-+
-+	print_entry_location();
-+
-+	inode = page->mapping->host;
-+	hidden_inode = itohi(inode);
-+
-+	/*
-+	 * writepage is called when shared mmap'ed files need to write
-+	 * their pages, while prepare/commit_write are called from the
-+	 * non-paged write() interface.  (However, in 2.3 the two interfaces
-+	 * share the same cache, while in 2.2 they didn't.)
-+	 *
-+	 * So we pretty much have to duplicate much of what commit_write does.
-+	 */
-+
-+	/* find lower page (returns a locked page) */
-+	hidden_page = grab_cache_page(hidden_inode->i_mapping, page->index);
-+	if (!hidden_page)
-+		goto out;
-+
-+	/* get page address, and encode it */
-+	kaddr = (char *) kmap(page);
-+	hidden_kaddr = (char*) kmap(hidden_page);
-+	mini_fo_encode_block(kaddr, hidden_kaddr, PAGE_CACHE_SIZE, inode, inode->i_sb, page->index);
-+	/* if encode_block could fail, then return error */
-+	kunmap(page);
-+	kunmap(hidden_page);
-+
-+	/* call lower writepage (expects locked page) */
-+	err = hidden_inode->i_mapping->a_ops->writepage(hidden_page);
-+
-+	/*
-+	 * update mtime and ctime of lower level file system
-+	 * mini_fo' mtime and ctime are updated by generic_file_write
-+	 */
-+	hidden_inode->i_mtime = hidden_inode->i_ctime = CURRENT_TIME;
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,1)
-+	UnlockPage(hidden_page);	/* b/c grab_cache_page locked it */
-+# endif /* kernel older than 2.4.1 */
-+	page_cache_release(hidden_page); /* b/c grab_cache_page increased refcnt */
-+
-+	if (err)
-+		ClearPageUptodate(page);
-+	else
-+		SetPageUptodate(page);
-+ out:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,1)
-+	UnlockPage(page);
-+# endif /* kernel 2.4.1 and newer */
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+/*
-+ * get one page from cache or lower f/s, return error otherwise.
-+ * returns unlocked, up-to-date page (if ok), with increased refcnt.
-+ */
-+page_t *
-+mini_fo_get1page(file_t *file, int index)
-+{
-+	page_t *page;
-+	dentry_t *dentry;
-+	inode_t *inode;
-+	struct address_space *mapping;
-+	int err;
-+
-+	print_entry_location();
-+
-+	dentry = file->f_dentry; /* CPW: Moved below print_entry_location */
-+	inode = dentry->d_inode;
-+	mapping = inode->i_mapping;
-+
-+	fist_dprint(8, "%s: read page index %d pid %d\n", __FUNCTION__, index, current->pid);
-+	if (index < 0) {
-+		printk("%s BUG: index=%d\n", __FUNCTION__, index);
-+		page = ERR_PTR(-EIO);
-+		goto out;
-+	}
-+	page = read_cache_page(mapping,
-+			       index,
-+			       (filler_t *) mapping->a_ops->readpage,
-+			       (void *) file);
-+	if (IS_ERR(page))
-+		goto out;
-+	wait_on_page(page);
-+	if (!Page_Uptodate(page)) {
-+		lock_page(page);
-+		err = mapping->a_ops->readpage(file, page);
-+		if (err) {
-+			page = ERR_PTR(err);
-+			goto out;
-+		}
-+		wait_on_page(page);
-+		if (!Page_Uptodate(page)) {
-+			page = ERR_PTR(-EIO);
-+			goto out;
-+		}
-+	}
-+
-+ out:
-+	print_exit_pointer(page);
-+	return page;
-+}
-+
-+
-+/*
-+ * get one page from cache or lower f/s, return error otherwise.
-+ * similar to get1page, but doesn't guarantee that it will return
-+ * an unlocked page.
-+ */
-+page_t *
-+mini_fo_get1page_cached(file_t *file, int index)
-+{
-+	page_t *page;
-+	dentry_t *dentry;
-+	inode_t *inode;
-+	struct address_space *mapping;
-+	int err;
-+
-+	print_entry_location();
-+
-+	dentry = file->f_dentry; /* CPW: Moved below print_entry_location */
-+	inode = dentry->d_inode;
-+	mapping = inode->i_mapping;
-+
-+	fist_dprint(8, "%s: read page index %d pid %d\n", __FUNCTION__, index, current->pid);
-+	if (index < 0) {
-+		printk("%s BUG: index=%d\n", __FUNCTION__, index);
-+		page = ERR_PTR(-EIO);
-+		goto out;
-+	}
-+	page = read_cache_page(mapping,
-+			       index,
-+			       (filler_t *) mapping->a_ops->readpage,
-+			       (void *) file);
-+	if (IS_ERR(page))
-+		goto out;
-+
-+ out:
-+	print_exit_pointer(page);
-+	return page;
-+}
-+
-+
-+/*
-+ * readpage is called from generic_page_read and the fault handler.
-+ * If your file system uses generic_page_read for the read op, it
-+ * must implement readpage.
-+ *
-+ * Readpage expects a locked page, and must unlock it.
-+ */
-+STATIC int
-+mini_fo_do_readpage(file_t *file, page_t *page)
-+{
-+	int err = -EIO;
-+	dentry_t *dentry;
-+	file_t *hidden_file = NULL;
-+	dentry_t *hidden_dentry;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	char *page_data;
-+	page_t *hidden_page;
-+	char *hidden_page_data;
-+	int real_size;
-+
-+	print_entry_location();
-+
-+	dentry = file->f_dentry; /* CPW: Moved below print_entry_location */
-+	if (ftopd(file) != NULL)
-+		hidden_file = ftohf(file);
-+	hidden_dentry = dtohd(dentry);
-+	inode = dentry->d_inode;
-+	hidden_inode = itohi(inode);
-+
-+	fist_dprint(7, "%s: requesting page %d from file %s\n", __FUNCTION__, page->index, dentry->d_name.name);
-+
-+	MALLOC_PAGE_POINTERS(hidden_pages, num_hidden_pages);
-+	MALLOC_PAGEDATA_POINTERS(hidden_pages_data, num_hidden_pages);
-+	FOR_EACH_PAGE
-+		CURRENT_HIDDEN_PAGE = NULL;
-+
-+	/* find lower page (returns a locked page) */
-+	FOR_EACH_PAGE {
-+		fist_dprint(8, "%s: Current page index = %d\n", __FUNCTION__, CURRENT_HIDDEN_PAGEINDEX);
-+		CURRENT_HIDDEN_PAGE = read_cache_page(hidden_inode->i_mapping,
-+						      CURRENT_HIDDEN_PAGEINDEX,
-+						      (filler_t *) hidden_inode->i_mapping->a_ops->readpage,
-+						      (void *) hidden_file);
-+		if (IS_ERR(CURRENT_HIDDEN_PAGE)) {
-+			err = PTR_ERR(CURRENT_HIDDEN_PAGE);
-+			CURRENT_HIDDEN_PAGE = NULL;
-+			goto out_release;
-+		}
-+	}
-+
-+	/*
-+	 * wait for the page data to show up
-+	 * (signaled by readpage as unlocking the page)
-+	 */
-+	FOR_EACH_PAGE {
-+		wait_on_page(CURRENT_HIDDEN_PAGE);
-+		if (!Page_Uptodate(CURRENT_HIDDEN_PAGE)) {
-+			/*
-+			 * call readpage() again if we returned from wait_on_page with a
-+			 * page that's not up-to-date; that can happen when a partial
-+			 * page has a few buffers which are ok, but not the whole
-+			 * page.
-+			 */
-+			lock_page(CURRENT_HIDDEN_PAGE);
-+			err = hidden_inode->i_mapping->a_ops->readpage(hidden_file,
-+								       CURRENT_HIDDEN_PAGE);
-+			if (err) {
-+				CURRENT_HIDDEN_PAGE = NULL;
-+				goto out_release;
-+			}
-+			wait_on_page(CURRENT_HIDDEN_PAGE);
-+			if (!Page_Uptodate(CURRENT_HIDDEN_PAGE)) {
-+				err = -EIO;
-+				goto out_release;
-+			}
-+		}
-+	}
-+
-+	/* map pages, get their addresses */
-+	page_data = (char *) kmap(page);
-+	FOR_EACH_PAGE
-+		CURRENT_HIDDEN_PAGEDATA = (char *) kmap(CURRENT_HIDDEN_PAGE);
-+
-+	/* if decode_block could fail, then return error */
-+	err = 0;
-+	real_size = hidden_inode->i_size - (page->index << PAGE_CACHE_SHIFT);
-+	if (real_size <= 0)
-+		memset(page_data, 0, PAGE_CACHE_SIZE);
-+	else if (real_size < PAGE_CACHE_SIZE) {
-+		mini_fo_decode_block(hidden_page_data, page_data, real_size, inode, inode->i_sb, page->index);
-+		memset(page_data + real_size, 0, PAGE_CACHE_SIZE - real_size);
-+	} else
-+		mini_fo_decode_block(hidden_page_data, page_data, PAGE_CACHE_SIZE, inode, inode->i_sb, page->index);
-+
-+	FOR_EACH_PAGE
-+		kunmap(CURRENT_HIDDEN_PAGE);
-+	kunmap(page);
-+
-+ out_release:
-+	FOR_EACH_PAGE
-+		if (CURRENT_HIDDEN_PAGE)
-+			page_cache_release(CURRENT_HIDDEN_PAGE); /* undo read_cache_page */
-+
-+	FREE_PAGE_POINTERS(hidden_pages, num_hidden_pages);
-+	FREE_PAGEDATA_POINTERS(hidden_pages_data, num_hidden_pages);
-+
-+ out:
-+	if (err == 0)
-+		SetPageUptodate(page);
-+	else
-+		ClearPageUptodate(page);
-+
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_readpage(file_t *file, page_t *page)
-+{
-+	int err;
-+	print_entry_location();
-+
-+	err = mini_fo_do_readpage(file, page);
-+
-+	/*
-+	 * we have to unlock our page, b/c we _might_ have gotten a locked page.
-+	 * but we no longer have to wakeup on our page here, b/c UnlockPage does
-+	 * it
-+	 */
-+	UnlockPage(page);
-+
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_prepare_write(file_t *file, page_t *page, unsigned from, unsigned to)
-+{
-+	int err = 0;
-+
-+	print_entry_location();
-+
-+	/*
-+	 * we call kmap(page) only here, and do the kunmap
-+	 * and the actual downcalls, including unlockpage and uncache
-+	 * in commit_write.
-+	 */
-+	kmap(page);
-+
-+	/* fast path for whole page writes */
-+	if (from == 0 && to == PAGE_CACHE_SIZE)
-+		goto out;
-+	/* read the page to "revalidate" our data */
-+	/* call the helper function which doesn't unlock the page */
-+	if (!Page_Uptodate(page))
-+		err = mini_fo_do_readpage(file, page);
-+
-+ out:
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+
-+STATIC int
-+mini_fo_commit_write(file_t *file, page_t *page, unsigned from, unsigned to)
-+{
-+	int err = -ENOMEM;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	page_t *hidden_page;
-+	file_t *hidden_file = NULL;
-+	loff_t pos;
-+	unsigned bytes = to - from;
-+	unsigned hidden_from, hidden_to, hidden_bytes;
-+
-+	print_entry_location();
-+
-+	inode = page->mapping->host; /* CPW: Moved below print_entry_location */
-+	hidden_inode = itohi(inode);
-+
-+	ASSERT(file != NULL);
-+	/*
-+	 * here we have a kmapped page, with data from the user copied
-+	 * into it.  we need to encode_block it, and then call the lower
-+	 * commit_write.  We also need to simulate same behavior of
-+	 * generic_file_write, and call prepare_write on the lower f/s first.
-+	 */
-+#ifdef FIST_COUNT_WRITES
-+	count_writes++;
-+# endif /* FIST_COUNT_WRITES */
-+
-+	/* this is append and/or extend -- we can't have holes so fill them in */
-+	if (page->index > (hidden_inode->i_size >> PAGE_CACHE_SHIFT)) {
-+		page_t *tmp_page;
-+		int index;
-+		for (index = hidden_inode->i_size >> PAGE_CACHE_SHIFT; index < page->index; index++) {
-+			tmp_page = mini_fo_get1page(file, index);
-+			if (IS_ERR(tmp_page)) {
-+				err = PTR_ERR(tmp_page);
-+				goto out;
-+			}
-+			/* zero out the contents of the page at the appropriate offsets */
-+			memset((char*)page_address(tmp_page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, PAGE_CACHE_SIZE - (inode->i_size & ~PAGE_CACHE_MASK));
-+			if (!(err = mini_fo_prepare_write(file, tmp_page, 0, PAGE_CACHE_SIZE)))
-+				err = mini_fo_commit_write(file, tmp_page, 0, PAGE_CACHE_SIZE);
-+			page_cache_release(tmp_page);
-+			if (err < 0)
-+				goto out;
-+			if (current->need_resched)
-+				schedule();
-+		}
-+	}
-+
-+	if (ftopd(file) != NULL)
-+		hidden_file = ftohf(file);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_inode->i_mutex);
-+#else
-+	down(&hidden_inode->i_sem);
-+#endif
-+	/* find lower page (returns a locked page) */
-+	hidden_page = grab_cache_page(hidden_inode->i_mapping, page->index);
-+	if (!hidden_page)
-+		goto out;
-+
-+#if FIST_ENCODING_BLOCKSIZE > 1
-+#  error encoding_blocksize greater than 1 is not yet supported
-+# endif /* FIST_ENCODING_BLOCKSIZE > 1 */
-+
-+	hidden_from = from & (~(FIST_ENCODING_BLOCKSIZE - 1));
-+	hidden_to = ((to + FIST_ENCODING_BLOCKSIZE - 1) & (~(FIST_ENCODING_BLOCKSIZE - 1)));
-+	if ((page->index << PAGE_CACHE_SHIFT) + to > hidden_inode->i_size) {
-+
-+		/*
-+		 * if this call to commit_write had introduced holes and the code
-+		 * for handling holes was invoked, then the beginning of this page
-+		 * must be zeroed out
-+		 * zero out bytes from 'size_of_file%pagesize' to 'from'.
-+		 */
-+		if ((hidden_from - (inode->i_size & ~PAGE_CACHE_MASK)) > 0)
-+			memset((char*)page_address(page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, hidden_from - (inode->i_size & ~PAGE_CACHE_MASK));
-+
-+	}
-+	hidden_bytes = hidden_to - hidden_from;
-+
-+	/* call lower prepare_write */
-+	err = -EINVAL;
-+	if (hidden_inode->i_mapping &&
-+	    hidden_inode->i_mapping->a_ops &&
-+	    hidden_inode->i_mapping->a_ops->prepare_write)
-+		err = hidden_inode->i_mapping->a_ops->prepare_write(hidden_file,
-+								    hidden_page,
-+								    hidden_from,
-+								    hidden_to);
-+	if (err)
-+		/* don't leave locked pages behind, esp. on an ENOSPC */
-+		goto out_unlock;
-+
-+	fist_dprint(8, "%s: encoding %d bytes\n", __FUNCTION__, hidden_bytes);
-+	mini_fo_encode_block((char *) page_address(page) + hidden_from, (char*) page_address(hidden_page) + hidden_from, hidden_bytes, inode, inode->i_sb, page->index);
-+	/* if encode_block could fail, then goto unlock and return error */
-+
-+	/* call lower commit_write */
-+	err = hidden_inode->i_mapping->a_ops->commit_write(hidden_file,
-+							   hidden_page,
-+							   hidden_from,
-+							   hidden_to);
-+
-+	if (err < 0)
-+		goto out_unlock;
-+
-+	err = bytes;	/* convert error to no. of bytes */
-+
-+	inode->i_blocks = hidden_inode->i_blocks;
-+	/* we may have to update i_size */
-+	pos = (page->index << PAGE_CACHE_SHIFT) + to;
-+	if (pos > inode->i_size)
-+		inode->i_size = pos;
-+
-+	/*
-+	 * update mtime and ctime of lower level file system
-+	 * mini_fo' mtime and ctime are updated by generic_file_write
-+	 */
-+	hidden_inode->i_mtime = hidden_inode->i_ctime = CURRENT_TIME;
-+
-+	mark_inode_dirty_sync(inode);
-+
-+ out_unlock:
-+	UnlockPage(hidden_page);
-+	page_cache_release(hidden_page);
-+	kunmap(page);		/* kmap was done in prepare_write */
-+ out:
-+	/* we must set our page as up-to-date */
-+	if (err < 0)
-+		ClearPageUptodate(page);
-+	else
-+		SetPageUptodate(page);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_inode->i_mutex);
-+#else
-+	up(&hidden_inode->i_sem);
-+#endif
-+	print_exit_status(err);
-+	return err;			/* assume all is ok */
-+}
-+
-+
-+STATIC int
-+mini_fo_bmap(struct address_space *mapping, long block)
-+{
-+	int err = 0;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+
-+	print_entry_location();
-+
-+	inode = (inode_t *) mapping->host;
-+	hidden_inode = itohi(inode);
-+
-+	if (hidden_inode->i_mapping->a_ops->bmap)
-+		err = hidden_inode->i_mapping->a_ops->bmap(hidden_inode->i_mapping, block);
-+	print_exit_location();
-+	return err;
-+}
-+
-+
-+/*
-+ * This function is copied verbatim from mm/filemap.c.
-+ * XXX: It should be simply moved to some header file instead -- bug Al about it!
-+ */
-+static inline int sync_page(struct page *page)
-+{
-+	struct address_space *mapping = page->mapping;
-+
-+	if (mapping && mapping->a_ops && mapping->a_ops->sync_page)
-+		return mapping->a_ops->sync_page(page);
-+	return 0;
-+}
-+
-+
-+/*
-+ * XXX: we may not need this function if not FIST_FILTER_DATA.
-+ * FIXME: for FIST_FILTER_SCA, get all lower pages and sync them each.
-+ */
-+STATIC int
-+mini_fo_sync_page(page_t *page)
-+{
-+	int err = 0;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	page_t *hidden_page;
-+
-+	print_entry_location();
-+
-+	inode = page->mapping->host; /* CPW: Moved below print_entry_location */
-+	hidden_inode = itohi(inode);
-+
-+	/* find lower page (returns a locked page) */
-+	hidden_page = grab_cache_page(hidden_inode->i_mapping, page->index);
-+	if (!hidden_page)
-+		goto out;
-+
-+	err = sync_page(hidden_page);
-+
-+	UnlockPage(hidden_page);	/* b/c grab_cache_page locked it */
-+	page_cache_release(hidden_page); /* b/c grab_cache_page increased refcnt */
-+
-+ out:
-+	print_exit_status(err);
-+	return err;
-+}
---- /dev/null
-+++ b/fs/mini_fo/README
-@@ -0,0 +1,163 @@
-+README for the mini_fo overlay file system
-+=========================================
-+
-+
-+WHAT IS MINI_FO?
-+----------------
-+
-+mini_fo is a virtual kernel file system that can make read-only
-+file systems writable. This is done by redirecting modifying operations
-+to a writeable location called "storage directory", and leaving the
-+original data in the "base directory" untouched. When reading, the
-+file system merges the modifed and original data so that only the
-+newest versions will appear. This occurs transparently to the user,
-+who can access the data like on any other read-write file system.
-+
-+Base and storage directories may be located on the same or on
-+different partitions and may be of different file system types. While
-+the storage directory obviously needs to be writable, the base may or
-+may not be writable, what doesn't matter as it will no be modified
-+anyway.
-+
-+
-+WHAT IS GOOD FOR?
-+-----------------
-+
-+The primary purpose of the mini_fo file system is to allow easy
-+software updates to embedded systems, that often store their root
-+file system in a read-only flash file system, but there are many
-+more as for example sandboxing, or for allowing live-cds to
-+permanently store information.
-+
-+
-+BUILDING
-+--------
-+This should be simple. Adjust the Makefile to point to the correct
-+kernel headers you want to build the module for. Then:
-+
-+    # make
-+
-+should build "mini_fo.o" for a 2.4 kernel or "mini_fo.ko" for a 2.6
-+kernel.
-+
-+If you are building the module for you current kernel, you can install
-+the module (as root):
-+
-+    # make install
-+
-+or uninstall with
-+
-+    # make uninstall
-+
-+
-+USING THE FILE SYSTEM
-+--------------------
-+
-+the general mount syntax is:
-+
-+   mount -t mini_fo -o base=<base directory>,sto=<storage directory>\
-+                            <base directory> <mount point>
-+
-+Example:
-+
-+You have mounted a cdrom to /mnt/cdrom and want to modifiy some files
-+on it:
-+
-+load the module (as root)
-+
-+    # insmod mini_fo.o for a 2.4 kernel or
-+
-+    # insmod mini_fo.ko for a 2.6 kernel
-+
-+
-+create a storage dir in tmp and a mountpoint for mini_fo:
-+
-+    # mkdir /tmp/sto
-+    # mkdir /mnt/mini_fo
-+
-+and mount the mini_fo file system:
-+
-+    # mount -t mini_fo -o base=/mnt/cdrom,sto=/tmp/sto /mnt/cdrom /mnt/mini_fo
-+
-+
-+Now the data stored on the cd can be accessed via the mini_fo
-+mountpoint just like any read-write file system, files can be modified
-+and deleted, new ones can be created and so on. When done unmount the
-+file system:
-+
-+    # unmount /mnt/mini_fo
-+
-+Note that if the file system is mounted again using the same storage
-+file system, of course it will appear in the modified state again. If
-+you remount it using an new empty storage directory, it will be
-+unmodified. Therefore by executing:
-+
-+    # cd /tmp/sto
-+    # rm -rf *
-+
-+you can nuke all the changes you made to the original file system. But
-+ remember NEVER do this while the mini_fo file system is mounted!
-+
-+
-+Alternatively you can use the mini_fo-overlay bash script, that
-+simplifies managing mini_fo mounts. See TOOLS Section.
-+
-+
-+TOOLS
-+-----
-+
-+mini_fo-merge (experimental):
-+
-+This is a bash script that will merge changes contained in the storage
-+directory back to the base directory. This allows mini_fo to function
-+as a cache file system by overlaying a slow (network, ...) file system
-+and using a fast (ramdisk, ...) as storage. When done, changes can be
-+merged back to the (slow) base with mini_fo-merge. See "mini_fo-merge
-+-h" for details.
-+
-+It can be usefull for merging changes back after a successfull test
-+(patches, software updates...)
-+
-+
-+mini_fo-overlay:
-+
-+This bash script simplifies managing one or more mini_fo mounts. For
-+overlaying a directory called "basedir1", you can just call:
-+
-+    # mini_fo-overlay basedir1
-+
-+This will mount mini_fo with "basedir1" as base, "/tmp/sto-basedir1/"
-+as storage to "/mnt/mini_fo-basedir1/". It has more options though,
-+type "mini_fo-overlay -h" for details.
-+
-+
-+DOCUMENTATION, REPORTING BUGS, GETTING HELP
-+-------------------------------------------
-+
-+Please visit the mini_fo project page at:
-+
-+http://www.denx.de/twiki/bin/view/Know/MiniFOHome
-+
-+
-+WARNINGS
-+--------
-+
-+Never modify the base or the storage directorys while the mini_fo
-+file system is mounted, or you might crash you system. Simply accessing
-+and reading should not cause any trouble.
-+
-+Exporting a mini_fo mount point via NFS has not been tested, and may
-+or may not work.
-+
-+Check the RELEASE_NOTES for details on bugs and features.
-+
-+
-+
-+Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+
-+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.
-+
-+
---- /dev/null
-+++ b/fs/mini_fo/RELEASE_NOTES
-@@ -0,0 +1,111 @@
-+Release:	mini_fo-0.6.1 (v0-6-1)
-+Date:		21.09.2005
-+
-+
-+Changes:
-+--------
-+v0-6-1:
-+
-+- bugfixes (see ChangeLog)
-+
-+- two helper scripts "mini_fo_merge" and "mini_fo_overlay" (see
-+  README for details).
-+
-+v0-6-0:
-+
-+- Support for 2.4 and 2.6 (see Makefile)
-+
-+- Partial hard link support (creating works as expected, but already
-+  existing links in the base file system will be treated as if they
-+  were individual files).
-+
-+- Various bugfixes and cleanups.
-+
-+
-+v0-6-0-pre1:
-+
-+- This is mini_fo-0-6-0-pre1! This release is a complete rewrite of
-+  many vital mini_fo parts such as the old whiteout list code which
-+  has been replaced by the new META subsystem.
-+
-+- Light weight directory renaming implemented. This means if a
-+  directory is renamed via the mini_fo filesystem this will no longer
-+  result in a complete copy in storage, instead only one empty
-+  directory will be created. All base filed contained in the original
-+  directory stay there until modified.
-+
-+- Special files (creating, renaming, deleting etc.) now working.
-+
-+- Many bugfixes and cleanup, mini_fo is now a lot more stable.
-+
-+
-+v0-5-10:
-+
-+- Final release of the 0-5-* versions. Next will be a complete rewrite
-+  of many features. This release contains several bugfixes related to
-+  directory renaming.
-+
-+
-+v0-5-10-pre6:
-+
-+- Lots of cleanup and several bugfixes related to directory deleting
-+
-+- Directory renaming suddenly works, what is most likely due to the
-+  fact tha that "mv" is smart: if the classic rename doesn't work it
-+  will assume that source and target file are on different fs and will
-+  copy the directory and try to remove the source directory. Until
-+  directory removing wasn't implemented, it would fail to do this and
-+  rollback.
-+  So, directory renaming works for now, but it doesn't yet do what you
-+  would expect from a overlay fs, so use with care.
-+
-+
-+v0-5-10-pre5:
-+
-+- implemented directory deleting
-+- made parsing of mount options more stable
-+- New format of mount options! (See README)
-+- I can't reproduce the unknown panic with 2.4.25 anymore, so I'll
-+  happily assume it never existed!
-+
-+
-+Implemented features:
-+---------------------
-+
-+- creating hard links (see BUGS on already existing hard links)
-+- lightweight directory renaming
-+- renaming device files, pipes, sockets, etc.
-+- creating, renaming, deleting of special files
-+- deleting directorys
-+- general directory reading (simple "ls" )
-+- creating files in existing directorys
-+- creating directorys
-+- renaming files.
-+- reading and writing files (involves opening)
-+- appending to files (creates copy in storage)
-+- deleting files
-+- llseek works too, what allows editors to work
-+- persistency (a deleted file stay deleted over remounts)
-+- use of symbolic links
-+- creating of device files
-+
-+
-+Not (yet) implemented features:
-+-------------------------------
-+
-+- full hard link support.
-+
-+
-+
-+BUGS:
-+-----
-+
-+Hard links in the base file system will be treated as individual
-+files, not as links to one inode.
-+
-+The main problem with hard links isn't allowing to create them, but
-+their pure existence. If you modify a base hard link, the changes made
-+will only show up on this link, the other link will remain in the
-+original state. I hope to fix this someday. Please note that this does
-+not effect the special hard links '.' and '..', that are handled
-+seperately by the lower fs.
---- /dev/null
-+++ b/fs/mini_fo/state.c
-@@ -0,0 +1,620 @@
-+/*
-+ * Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+
-+/* create the storage file, setup new states */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+int create_sto_reg_file(dentry_t *dentry, int mode, struct nameidata *nd)
-+#else
-+int create_sto_reg_file(dentry_t *dentry, int mode)
-+#endif
-+{
-+	int err = 0;
-+	inode_t *dir;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	if(exists_in_storage(dentry)) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: wrong type or state.\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if (err) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: ERROR getting neg. sto dentry.\n");
-+		goto out;
-+	}
-+
-+	dir = dentry->d_parent->d_inode;
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* lock parent */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+        down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+        if (IS_ERR(hidden_sto_dir_dentry))
-+                goto out;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+			 hidden_sto_dentry,
-+			 mode, nd);
-+#else
-+	err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+			 hidden_sto_dentry,
-+			 mode);
-+#endif
-+        if(err) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: ERROR creating sto file.\n");
-+                goto out_lock;
-+	}
-+
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: ERROR creating sto file [2].\n");
-+                err = -EINVAL;
-+                goto out_lock;
-+        }
-+
-+        /* interpose the new inode */
-+        if(dtost(dentry) == DELETED) {
-+                dtost(dentry) = DEL_REWRITTEN;
-+                err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        }
-+        else if(dtost(dentry) == NON_EXISTANT) {
-+                dtost(dentry) = CREATED;
-+                err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        }
-+        else if(dtost(dentry) == UNMODIFIED) {
-+                dtost(dentry) = MODIFIED;
-+                /* interpose on new inode */
-+                if(itohi2(dentry->d_inode) != NULL) {
-+                        printk(KERN_CRIT "mini_fo: create_sto_file: invalid inode detected.\n");
-+                        err = -EINVAL;
-+                        goto out_lock;
-+                }
-+                itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	}
-+	fist_copy_attr_timesizes(dentry->d_parent->d_inode,
-+				 hidden_sto_dir_dentry->d_inode);
-+
-+ out_lock:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+        dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+/* create the sto dir, setup states */
-+int create_sto_dir(dentry_t *dentry, int mode)
-+{
-+	int err = 0;
-+	inode_t *dir;
-+	dentry_t *hidden_sto_dentry;
-+        dentry_t *hidden_sto_dir_dentry;
-+
-+	/* had to take the "!S_ISDIR(mode))" check out, because it failed */
-+	if(exists_in_storage(dentry)) {
-+                printk(KERN_CRIT "mini_fo: create_sto_dir: wrong type or state.\\
-+n");
-+                err = -EINVAL;
-+                goto out;
-+        }
-+
-+	err = get_neg_sto_dentry(dentry);
-+	if(err) {
-+		err = -EINVAL;
-+		goto out;
-+	}
-+
-+	dir = dentry->d_parent->d_inode;
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+	if (IS_ERR(hidden_sto_dir_dentry))
-+		goto out;
-+
-+	err = vfs_mkdir(hidden_sto_dir_dentry->d_inode,
-+			hidden_sto_dentry,
-+			mode);
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo: create_sto_dir: ERROR creating sto dir.\n");
-+		goto out_lock;
-+	}
-+
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: create_sto_dir: ERROR creating sto dir [2].\n");
-+		err = -EINVAL;
-+		goto out_lock;
-+	}
-+
-+	/* interpose the new inode */
-+	if(dtost(dentry) == DELETED) {
-+		dtost(dentry) = DEL_REWRITTEN;
-+		err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtopd(dentry)->state == NON_EXISTANT) {
-+		dtopd(dentry)->state = CREATED;
-+		err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtopd(dentry)->state == UNMODIFIED) {
-+		dtopd(dentry)->state = MODIFIED;
-+		/* interpose on new inode */
-+		if(itohi2(dentry->d_inode) != NULL) {
-+			printk(KERN_CRIT "mini_fo:  create_sto_dir: ERROR, invalid inode detected.\n");
-+			err = -EINVAL;
-+			goto out_lock;
-+		}
-+		itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	}
-+
-+	fist_copy_attr_timesizes(dir, hidden_sto_dir_dentry->d_inode);
-+
-+	/* initalize the wol list */
-+	itopd(dentry->d_inode)->deleted_list_size = -1;
-+	itopd(dentry->d_inode)->renamed_list_size = -1;
-+	meta_build_lists(dentry);
-+
-+
-+ out_lock:
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+int create_sto_nod(dentry_t *dentry, int mode, dev_t dev)
-+#else
-+int create_sto_nod(dentry_t *dentry, int mode, int dev)
-+#endif
-+{
-+	int err = 0;
-+	inode_t *dir;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	if(exists_in_storage(dentry)) {
-+		err = -EEXIST;
-+		goto out;
-+	}
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if (err) {
-+                printk(KERN_CRIT "mini_fo: create_sto_nod: ERROR getting neg. sto dentry.\n");
-+                goto out;
-+        }
-+
-+	dir = dentry->d_parent->d_inode;
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* lock parent */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+	if (IS_ERR(hidden_sto_dir_dentry))
-+		goto out;
-+
-+	err = vfs_mknod(hidden_sto_dir_dentry->d_inode, hidden_sto_dentry, mode, dev);
-+	if(err)
-+		goto out_lock;
-+
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: create_sto_nod: creating storage inode failed [1].\n");
-+		err = -EINVAL; /* return something indicating failure */
-+		goto out_lock;
-+	}
-+
-+	/* interpose the new inode */
-+	if(dtost(dentry) == DELETED) {
-+		dtost(dentry) = DEL_REWRITTEN;
-+		err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtost(dentry) == NON_EXISTANT) {
-+		dtost(dentry) = CREATED;
-+		err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtost(dentry) == UNMODIFIED) {
-+		dtost(dentry) = MODIFIED;
-+		/* interpose on new inode */
-+		if(itohi2(dentry->d_inode) != NULL) {
-+			printk(KERN_CRIT "mini_fo: create_sto_nod: error, invalid inode detected.\n");
-+			err = -EINVAL;
-+			goto out_lock;
-+		}
-+		itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	}
-+
-+	fist_copy_attr_timesizes(dir, hidden_sto_dir_dentry->d_inode);
-+
-+ out_lock:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+
-+/* unimplemented (and possibly not usefull):
-+
-+   nondir-del_to_del_rew
-+   nondir-non_exist_to_creat
-+
-+   dir-unmod_to_del
-+   dir-mod_to_del
-+   dir-creat_to_del
-+   dir-del_rew_to_del
-+   dir-del_to_del_rew
-+   dir-non_exist_to_creat
-+*/
-+
-+
-+/* bring a file of any type from state UNMODIFIED to MODIFIED */
-+int nondir_unmod_to_mod(dentry_t *dentry, int cp_flag)
-+{
-+	int err = 0;
-+	struct vfsmount *tgt_mnt;
-+	struct vfsmount *src_mnt;
-+	dentry_t *tgt_dentry;
-+	dentry_t *src_dentry;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if((dtost(dentry) != UNMODIFIED) ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if (err) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  ERROR getting neg. sto dentry.\n");
-+		goto out;
-+	}
-+
-+	/* create sto file */
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* lock parent */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+        down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+        if (IS_ERR(hidden_sto_dir_dentry))
-+                goto out;
-+
-+	/* handle different types of nondirs */
-+	if(S_ISCHR(dentry->d_inode->i_mode) ||
-+	   S_ISBLK(dentry->d_inode->i_mode)) {
-+		err = vfs_mknod(hidden_sto_dir_dentry->d_inode,
-+				hidden_sto_dentry,
-+				dtohd(dentry)->d_inode->i_mode,
-+				dtohd(dentry)->d_inode->i_rdev);
-+	}
-+
-+	else if(S_ISREG(dentry->d_inode->i_mode)) {
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+				 hidden_sto_dentry,
-+				 dtohd(dentry)->d_inode->i_mode, NULL);
-+#else
-+		err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+				 hidden_sto_dentry,
-+				 dtohd(dentry)->d_inode->i_mode);
-+#endif
-+	}
-+        if(err) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  ERROR creating sto file.\n");
-+                goto out_lock;
-+	}
-+
-+	/* interpose on new inode */
-+	if(itohi2(dentry->d_inode) != NULL) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  ERROR, invalid inode detected.\n");
-+		err = -EINVAL;
-+		goto out_lock;
-+	}
-+
-+	itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+
-+        fist_copy_attr_timesizes(dentry->d_parent->d_inode,
-+				 hidden_sto_dir_dentry->d_inode);
-+	dtost(dentry) = MODIFIED;
-+
-+	/* copy contents if regular file and cp_flag = 1 */
-+	if((cp_flag == 1) && S_ISREG(dentry->d_inode->i_mode)) {
-+
-+		/* unlock first */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		dput(hidden_sto_dir_dentry);
-+
-+		tgt_dentry = dtohd2(dentry);
-+		tgt_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+		src_dentry = dtohd(dentry);
-+		src_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt;
-+
-+		err = mini_fo_cp_cont(tgt_dentry, tgt_mnt,
-+				      src_dentry, src_mnt);
-+		if(err) {
-+			printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                          ERROR copying contents.\n");
-+		}
-+		goto out;
-+	}
-+
-+ out_lock:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+        dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+/* this function is currently identical to nondir_creat_to_del */
-+int nondir_del_rew_to_del(dentry_t *dentry)
-+{
-+	return nondir_creat_to_del(dentry);
-+}
-+
-+int nondir_creat_to_del(dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	inode_t *hidden_sto_dir_inode;
-+	dentry_t *hidden_sto_dir_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	/* for now this function serves for both state DEL_REWRITTEN and
-+	 * CREATED */
-+	if(!(dtost(dentry) == CREATED || (dtost(dentry) == DEL_REWRITTEN)) ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_mod_to_del/del_rew_to_del: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	hidden_sto_dir_inode = itohi2(dentry->d_parent->d_inode);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	/* avoid destroying the hidden inode if the file is in use */
-+	dget(hidden_sto_dentry);
-+	err = vfs_unlink(hidden_sto_dir_inode, hidden_sto_dentry);
-+	dput(hidden_sto_dentry);
-+	if(!err)
-+		d_delete(hidden_sto_dentry);
-+
-+	/* propagate number of hard-links */
-+	dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+
-+	dtost(dentry) = NON_EXISTANT;
-+
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+int nondir_mod_to_del(dentry_t *dentry)
-+{
-+	int err;
-+	dentry_t *hidden_sto_dentry;
-+	inode_t *hidden_sto_dir_inode;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) != MODIFIED ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_mod_to_del: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	hidden_sto_dir_inode = itohi2(dentry->d_parent->d_inode);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* was hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	/* avoid destroying the hidden inode if the file is in use */
-+	dget(hidden_sto_dentry);
-+	err = vfs_unlink(hidden_sto_dir_inode, hidden_sto_dentry);
-+	dput(hidden_sto_dentry);
-+	if(!err)
-+		d_delete(hidden_sto_dentry);
-+
-+	/* propagate number of hard-links */
-+	dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+
-+	/* dput base dentry, this will relase the inode and free the
-+	 * dentry, as we will never need it again. */
-+	dput(dtohd(dentry));
-+	dtohd(dentry) = NULL;
-+	dtost(dentry) = DELETED;
-+
-+	/* add deleted file to META-file */
-+	meta_add_d_entry(dentry->d_parent,
-+			 dentry->d_name.name,
-+			 dentry->d_name.len);
-+
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+int nondir_unmod_to_del(dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) != UNMODIFIED ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_del: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	 /* next we have to get a negative dentry for the storage file */
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if(err)
-+		goto out;
-+
-+	/* add deleted file to META lists */
-+	err = meta_add_d_entry(dentry->d_parent,
-+			       dentry->d_name.name,
-+			       dentry->d_name.len);
-+
-+	if(err)
-+		goto out;
-+
-+	/* dput base dentry, this will relase the inode and free the
-+	 * dentry, as we will never need it again. */
-+	dput(dtohd(dentry));
-+	dtohd(dentry) = NULL;
-+	dtost(dentry) = DELETED;
-+
-+ out:
-+	return err;
-+}
-+
-+/* bring a dir from state UNMODIFIED to MODIFIED */
-+int dir_unmod_to_mod(dentry_t *dentry)
-+{
-+	int err;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) != UNMODIFIED ||
-+	   !S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: dir_unmod_to_mod: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* this creates our dir incl. sto. structure */
-+	err = build_sto_structure(dentry->d_parent, dentry);
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo: dir_unmod_to_mod: \
-+                                  build_sto_structure failed.\n");
-+		goto out;
-+	}
-+ out:
-+	return err;
-+}
-+
---- /dev/null
-+++ b/fs/mini_fo/super.c
-@@ -0,0 +1,281 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+
-+STATIC void
-+mini_fo_read_inode(inode_t *inode)
-+{
-+	static struct address_space_operations mini_fo_empty_aops;
-+
-+	__itopd(inode) = kmalloc(sizeof(struct mini_fo_inode_info), GFP_KERNEL);
-+	if (!itopd(inode)) {
-+		printk("<0>%s:%s:%d: No kernel memory!\n", __FILE__, __FUNCTION__, __LINE__);
-+		ASSERT(NULL);
-+	}
-+	itohi(inode) = NULL;
-+	itohi2(inode) = NULL;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	inode->i_version++;
-+#else
-+	inode->i_version = ++event;	/* increment inode version */
-+#endif
-+	inode->i_op = &mini_fo_main_iops;
-+	inode->i_fop = &mini_fo_main_fops;
-+#if 0
-+	/*
-+	 * XXX: To export a file system via NFS, it has to have the
-+	 * FS_REQUIRES_DEV flag, so turn it on.  But should we inherit it from
-+	 * the lower file system, or can we allow our file system to be exported
-+	 * even if the lower one cannot be natively exported.
-+	 */
-+	inode->i_sb->s_type->fs_flags |= FS_REQUIRES_DEV;
-+	/*
-+	 * OK, the above was a hack, which is now turned off because it may
-+	 * cause a panic/oops on some systems.  The correct way to export a
-+	 * "nodev" filesystem is via using nfs-utils > 1.0 and the "fsid=" export
-+	 * parameter, which requires 2.4.20 or later.
-+	 */
-+#endif
-+	/* I don't think ->a_ops is ever allowed to be NULL */
-+	inode->i_mapping->a_ops = &mini_fo_empty_aops;
-+}
-+
-+
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+/*
-+ * No need to call write_inode() on the lower inode, as it
-+ * will have been marked 'dirty' anyway. But we might need
-+ * to write some of our own stuff to disk.
-+ */
-+STATIC void
-+mini_fo_write_inode(inode_t *inode, int sync)
-+{
-+	print_entry_location();
-+	print_exit_location();
-+}
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+
-+
-+STATIC void
-+mini_fo_put_inode(inode_t *inode)
-+{
-+	/*
-+	 * This is really funky stuff:
-+	 * Basically, if i_count == 1, iput will then decrement it and this inode will be destroyed.
-+	 * It is currently holding a reference to the hidden inode.
-+	 * Therefore, it needs to release that reference by calling iput on the hidden inode.
-+	 * iput() _will_ do it for us (by calling our clear_inode), but _only_ if i_nlink == 0.
-+	 * The problem is, NFS keeps i_nlink == 1 for silly_rename'd files.
-+	 * So we must for our i_nlink to 0 here to trick iput() into calling our clear_inode.
-+	 */
-+	if (atomic_read(&inode->i_count) == 1)
-+		inode->i_nlink = 0;
-+}
-+
-+
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+/*
-+ * we now define delete_inode, because there are two VFS paths that may
-+ * destroy an inode: one of them calls clear inode before doing everything
-+ * else that's needed, and the other is fine.  This way we truncate the inode
-+ * size (and its pages) and then clear our own inode, which will do an iput
-+ * on our and the lower inode.
-+ */
-+STATIC void
-+mini_fo_delete_inode(inode_t *inode)
-+{
-+	print_entry_location();
-+
-+	fist_checkinode(inode, "mini_fo_delete_inode IN");
-+	inode->i_size = 0;		/* every f/s seems to do that */
-+	clear_inode(inode);
-+
-+	print_exit_location();
-+}
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+
-+
-+/* final actions when unmounting a file system */
-+STATIC void
-+mini_fo_put_super(super_block_t *sb)
-+{
-+	if (stopd(sb)) {
-+		mntput(stopd(sb)->hidden_mnt);
-+		mntput(stopd(sb)->hidden_mnt2);
-+
-+		/* mk: no! dput(stopd(sb)->base_dir_dentry);
-+		   dput(stopd(sb)->storage_dir_dentry); */
-+
-+		kfree(stopd(sb));
-+		__stopd(sb) = NULL;
-+	}
-+}
-+
-+
-+#ifdef NOT_NEEDED
-+/*
-+ * This is called in do_umount before put_super.
-+ * The superblock lock is not held yet.
-+ * We probably do not need to define this or call write_super
-+ * on the hidden_sb, because sync_supers() will get to hidden_sb
-+ * sooner or later.  But it is also called from file_fsync()...
-+ */
-+STATIC void
-+mini_fo_write_super(super_block_t *sb)
-+{
-+	return;
-+}
-+#endif /* NOT_NEEDED */
-+
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_statfs(struct dentry *d, struct kstatfs *buf)
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_statfs(super_block_t *sb, struct kstatfs *buf)
-+#else
-+mini_fo_statfs(super_block_t *sb, struct statfs *buf)
-+#endif
-+{
-+	int err = 0;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+	struct dentry *hidden_d;
-+
-+	hidden_d = dtohd(d);
-+	err = vfs_statfs(hidden_d, buf);
-+#else
-+	super_block_t *hidden_sb;
-+
-+	hidden_sb = stohs(sb);
-+	err = vfs_statfs(hidden_sb, buf);
-+#endif
-+
-+	return err;
-+}
-+
-+
-+/*
-+ * XXX: not implemented.  This is not allowed yet.
-+ * Should we call this on the hidden_sb?  Probably not.
-+ */
-+STATIC int
-+mini_fo_remount_fs(super_block_t *sb, int *flags, char *data)
-+{
-+	//printk(KERN_CRIT "mini_fo_remount_fs: WARNING, this function is umimplemented.\n");
-+	return -ENOSYS;
-+}
-+
-+
-+/*
-+ * Called by iput() when the inode reference count reached zero
-+ * and the inode is not hashed anywhere.  Used to clear anything
-+ * that needs to be, before the inode is completely destroyed and put
-+ * on the inode free list.
-+ */
-+STATIC void
-+mini_fo_clear_inode(inode_t *inode)
-+{
-+	/*
-+	 * Decrement a reference to a hidden_inode, which was incremented
-+	 * by our read_inode when it was created initially.
-+	 */
-+
-+	/* release the wol_list */
-+	if(S_ISDIR(inode->i_mode)) {
-+		__meta_put_lists(inode);
-+	}
-+
-+	/* mk: fan out fun */
-+	if(itohi(inode))
-+		iput(itohi(inode));
-+	if(itohi2(inode))
-+		iput(itohi2(inode));
-+
-+	// XXX: why this assertion fails?
-+	// because it doesn't like us
-+	// ASSERT((inode->i_state & I_DIRTY) == 0);
-+	kfree(itopd(inode));
-+	__itopd(inode) = NULL;
-+}
-+
-+
-+/*
-+ * Called in do_umount() if the MNT_FORCE flag was used and this
-+ * function is defined.  See comment in linux/fs/super.c:do_umount().
-+ * Used only in nfs, to kill any pending RPC tasks, so that subsequent
-+ * code can actually succeed and won't leave tasks that need handling.
-+ *
-+ * PS. I wonder if this is somehow useful to undo damage that was
-+ * left in the kernel after a user level file server (such as amd)
-+ * dies.
-+ */
-+STATIC void
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_umount_begin(struct vfsmount *mnt, int flags)
-+{
-+	struct vfsmount *hidden_mnt;
-+
-+	hidden_mnt = stopd(mnt->mnt_sb)->hidden_mnt;
-+
-+	if (hidden_mnt->mnt_sb->s_op->umount_begin)
-+		hidden_mnt->mnt_sb->s_op->umount_begin(hidden_mnt, flags);
-+
-+}
-+#else
-+mini_fo_umount_begin(super_block_t *sb)
-+{
-+	super_block_t *hidden_sb;
-+
-+	hidden_sb = stohs(sb);
-+
-+	if (hidden_sb->s_op->umount_begin)
-+		hidden_sb->s_op->umount_begin(hidden_sb);
-+
-+}
-+#endif
-+
-+
-+struct super_operations mini_fo_sops =
-+{
-+	read_inode:		mini_fo_read_inode,
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+	write_inode:	mini_fo_write_inode,
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+	put_inode:		mini_fo_put_inode,
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+	delete_inode:	mini_fo_delete_inode,
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+	put_super:		mini_fo_put_super,
-+	statfs:		mini_fo_statfs,
-+	remount_fs:		mini_fo_remount_fs,
-+	clear_inode:	mini_fo_clear_inode,
-+	umount_begin:	mini_fo_umount_begin,
-+};
---- /dev/null
-+++ b/fs/mini_fo/Kconfig
-@@ -0,0 +1,3 @@
-+config MINI_FO
-+	tristate "Mini fanout overlay filesystem"
-+
diff --git a/target/linux/generic-2.6/patches-2.6.33/210-mini_fo_2.6.25_fixes.patch b/target/linux/generic-2.6/patches-2.6.33/210-mini_fo_2.6.25_fixes.patch
deleted file mode 100644
index b64630d50..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/210-mini_fo_2.6.25_fixes.patch
+++ /dev/null
@@ -1,143 +0,0 @@
---- a/fs/mini_fo/main.c
-+++ b/fs/mini_fo/main.c
-@@ -79,6 +79,7 @@ mini_fo_tri_interpose(dentry_t *hidden_d
- 	 * of the new inode's fields
- 	 */
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
- 	/*
- 	 * original: inode = iget(sb, hidden_inode->i_ino);
- 	 */
-@@ -87,6 +88,13 @@ mini_fo_tri_interpose(dentry_t *hidden_d
- 		err = -EACCES;		/* should be impossible??? */
- 		goto out;
- 	}
-+#else
-+	inode = mini_fo_iget(sb, iunique(sb, 25));
-+	if (IS_ERR(inode)) {
-+		err = PTR_ERR(inode);
-+		goto out;
-+	}
-+#endif
- 
- 	/*
- 	 * interpose the inode if not already interposed
-@@ -184,9 +192,9 @@ mini_fo_parse_options(super_block_t *sb,
- 				hidden_root = ERR_PTR(err);
- 				goto out;
- 			}
--			hidden_root = nd.dentry;
--			stopd(sb)->base_dir_dentry = nd.dentry;
--			stopd(sb)->hidden_mnt = nd.mnt;
-+			hidden_root = nd_get_dentry(&nd);
-+			stopd(sb)->base_dir_dentry = nd_get_dentry(&nd);
-+			stopd(sb)->hidden_mnt = nd_get_mnt(&nd);
- 
- 		} else if(!strncmp("sto=", options, 4)) {
- 			/* parse the storage dir */
-@@ -204,9 +212,9 @@ mini_fo_parse_options(super_block_t *sb,
- 				hidden_root2 = ERR_PTR(err);
- 				goto out;
- 			}
--			hidden_root2 = nd2.dentry;
--			stopd(sb)->storage_dir_dentry = nd2.dentry;
--			stopd(sb)->hidden_mnt2 = nd2.mnt;
-+			hidden_root2 = nd_get_dentry(&nd2);
-+			stopd(sb)->storage_dir_dentry = nd_get_dentry(&nd2);
-+			stopd(sb)->hidden_mnt2 = nd_get_mnt(&nd2);
- 			stohs2(sb) = hidden_root2->d_sb;
- 
- 			/* validate storage dir, this is done in
---- a/fs/mini_fo/mini_fo.h
-+++ b/fs/mini_fo/mini_fo.h
-@@ -302,6 +302,10 @@ extern int mini_fo_tri_interpose(dentry_
- extern int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
- 			   dentry_t *src_dentry, struct vfsmount *src_mnt);
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
-+extern struct inode *mini_fo_iget(struct super_block *sb, unsigned long ino);
-+#endif
-+
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
- 
-@@ -501,6 +505,29 @@ static inline void double_unlock(struct
- #endif  /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
- #endif /* __KERNEL__ */
- 
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
-+static inline dentry_t *nd_get_dentry(struct nameidata *nd)
-+{
-+	return (nd->path.dentry);
-+}
-+
-+static inline struct vfsmount *nd_get_mnt(struct nameidata *nd)
-+{
-+	return (nd->path.mnt);
-+}
-+#else
-+static inline dentry_t *nd_get_dentry(struct nameidata *nd)
-+{
-+	return (nd->dentry);
-+}
-+
-+static inline struct vfsmount *nd_get_mnt(struct nameidata *nd)
-+{
-+	return (nd->mnt);
-+}
-+#endif
-+
- /*
-  * Definitions for user and kernel code
-  */
---- a/fs/mini_fo/super.c
-+++ b/fs/mini_fo/super.c
-@@ -262,10 +262,31 @@ mini_fo_umount_begin(super_block_t *sb)
- }
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
-+struct inode *
-+mini_fo_iget(struct super_block *sb, unsigned long ino)
-+{
-+	struct inode *inode;
-+
-+	inode = iget_locked(sb, ino);
-+	if (!inode)
-+		return ERR_PTR(-ENOMEM);
-+
-+	if (!(inode->i_state & I_NEW))
-+		return inode;
-+
-+	mini_fo_read_inode(inode);
-+
-+	unlock_new_inode(inode);
-+	return inode;
-+}
-+#endif /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25) */
- 
- struct super_operations mini_fo_sops =
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
- 	read_inode:		mini_fo_read_inode,
-+#endif
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
- 	write_inode:	mini_fo_write_inode,
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
---- a/fs/mini_fo/aux.c
-+++ b/fs/mini_fo/aux.c
-@@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb,
- 	err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
- 
- 	/* validate */
--	if (err || !nd.dentry || !nd.dentry->d_inode) {
-+	if (err || !nd_get_dentry(&nd) || !nd_get_dentry(&nd)->d_inode) {
- 		printk(KERN_CRIT "mini_fo: bpath_walk: path_walk failed.\n");
- 		return NULL;
- 	}
--	return nd.dentry;
-+	return nd_get_dentry(&nd);
- }
- 
- 
diff --git a/target/linux/generic-2.6/patches-2.6.33/211-mini_fo_2.6.25_dentry_open_war.patch b/target/linux/generic-2.6/patches-2.6.33/211-mini_fo_2.6.25_dentry_open_war.patch
deleted file mode 100644
index 48a19429b..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/211-mini_fo_2.6.25_dentry_open_war.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- a/fs/mini_fo/meta.c
-+++ b/fs/mini_fo/meta.c
-@@ -442,6 +442,11 @@ int meta_write_d_entry(dentry_t *dentry,
- 			   S_IRUSR | S_IWUSR);
- #endif
- 	}
-+
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-@@ -535,6 +540,11 @@ int meta_write_r_entry(dentry_t *dentry,
- 			   meta_dentry, S_IRUSR | S_IWUSR);
- #endif
- 	}
-+
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-@@ -671,14 +681,16 @@ int meta_sync_d_list(dentry_t *dentry, i
- 		}
- 	}
- 
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-                                   ERROR opening meta file.\n");
--		/* we don't mntget so we dont't mntput (for now)
--		 * mntput(meta_mnt);
--		 */
-+		mntput(meta_mnt);
- 		dput(meta_dentry);
- 		err = -1;
-                 goto out;
-@@ -811,14 +823,16 @@ int meta_sync_r_list(dentry_t *dentry, i
- 		}
- 	}
- 
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-                                   ERROR opening meta file.\n");
--		/* we don't mntget so we dont't mntput (for now)
--		 * mntput(meta_mnt);
--		 */
-+		mntput(meta_mnt);
- 		dput(meta_dentry);
- 		err = -1;
-                 goto out;
diff --git a/target/linux/generic-2.6/patches-2.6.33/212-mini_fo_2.6.26_fixes.patch b/target/linux/generic-2.6/patches-2.6.33/212-mini_fo_2.6.26_fixes.patch
deleted file mode 100644
index b5fa64e6a..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/212-mini_fo_2.6.26_fixes.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/fs/mini_fo/super.c
-+++ b/fs/mini_fo/super.c
-@@ -84,6 +84,7 @@ mini_fo_write_inode(inode_t *inode, int
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
- 
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
- STATIC void
- mini_fo_put_inode(inode_t *inode)
- {
-@@ -99,6 +100,7 @@ mini_fo_put_inode(inode_t *inode)
- 	if (atomic_read(&inode->i_count) == 1)
- 		inode->i_nlink = 0;
- }
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */
- 
- 
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-@@ -238,7 +240,7 @@ mini_fo_clear_inode(inode_t *inode)
-  * dies.
-  */
- STATIC void
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26))
- mini_fo_umount_begin(struct vfsmount *mnt, int flags)
- {
- 	struct vfsmount *hidden_mnt;
-@@ -290,7 +292,9 @@ struct super_operations mini_fo_sops =
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
- 	write_inode:	mini_fo_write_inode,
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
- 	put_inode:		mini_fo_put_inode,
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
- 	delete_inode:	mini_fo_delete_inode,
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
diff --git a/target/linux/generic-2.6/patches-2.6.33/213-mini_fo_2.6.27_fixes.patch b/target/linux/generic-2.6/patches-2.6.33/213-mini_fo_2.6.27_fixes.patch
deleted file mode 100644
index f92c18b25..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/213-mini_fo_2.6.27_fixes.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/fs/mini_fo/inode.c
-+++ b/fs/mini_fo/inode.c
-@@ -439,7 +439,7 @@ mini_fo_symlink(inode_t *dir, dentry_t *
- 	int err=0;
- 	dentry_t *hidden_sto_dentry;
- 	dentry_t *hidden_sto_dir_dentry;
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
-         umode_t mode;
- #endif
- 
-@@ -466,7 +466,7 @@ mini_fo_symlink(inode_t *dir, dentry_t *
- 	down(&hidden_sto_dir_dentry->d_inode->i_sem);
- #endif
- 
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
- 	mode = S_IALLUGO;
- 	err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
- 			  hidden_sto_dentry, symname, mode);
-@@ -1128,7 +1128,7 @@ void mini_fo_put_link(struct dentry *den
- #endif
- 
- STATIC int
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
- mini_fo_permission(inode_t *inode, int mask, struct nameidata *nd)
- #else
- mini_fo_permission(inode_t *inode, int mask)
-@@ -1150,8 +1150,9 @@ mini_fo_permission(inode_t *inode, int m
- 	 *	if (err)
- 	 *		goto out;
- 	 */
--
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
-+	err = inode_permission(hidden_inode, mask);
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- 	err = permission(hidden_inode, mask, nd);
- #else
- 	err = permission(hidden_inode, mask);
diff --git a/target/linux/generic-2.6/patches-2.6.33/214-mini_fo_2.6.29.patch b/target/linux/generic-2.6/patches-2.6.33/214-mini_fo_2.6.29.patch
deleted file mode 100644
index 63d704bf5..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/214-mini_fo_2.6.29.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- a/fs/mini_fo/aux.c
-+++ b/fs/mini_fo/aux.c
-@@ -236,7 +236,7 @@ int mini_fo_cp_cont(dentry_t *tgt_dentry
- 	mntget(src_mnt);
- 
- 	/* open file write only */
--	tgt_file = dentry_open(tgt_dentry, tgt_mnt, 0x1);
-+	tgt_file = dentry_open(tgt_dentry, tgt_mnt, 0x1, current_cred());
- 	if(!tgt_file || IS_ERR(tgt_file)) {
- 		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening target file.\n");
- 		err = PTR_ERR(tgt_file);
-@@ -244,7 +244,7 @@ int mini_fo_cp_cont(dentry_t *tgt_dentry
- 	}
- 
- 	/* open file read only */
--	src_file = dentry_open(src_dentry, src_mnt, 0x0);
-+	src_file = dentry_open(src_dentry, src_mnt, 0x0, current_cred());
- 	if(!src_file || IS_ERR(src_file)) {
- 		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening source file.\n");
- 		err = PTR_ERR(src_file);
---- a/fs/mini_fo/file.c
-+++ b/fs/mini_fo/file.c
-@@ -437,7 +437,7 @@ mini_fo_open(inode_t *inode, file_t *fil
- 			mntget(stopd(inode->i_sb)->hidden_mnt);
- 			hidden_file = dentry_open(hidden_dentry,
- 						  stopd(inode->i_sb)->hidden_mnt,
--						  hidden_flags);
-+						  hidden_flags, file->f_cred);
- 			if (IS_ERR(hidden_file)) {
- 				err = PTR_ERR(hidden_file);
- 				dput(hidden_dentry);
-@@ -479,7 +479,7 @@ mini_fo_open(inode_t *inode, file_t *fil
- 			mntget(stopd(inode->i_sb)->hidden_mnt);
- 			hidden_file = dentry_open(hidden_dentry,
- 						  stopd(inode->i_sb)->hidden_mnt,
--						  hidden_flags);
-+						  hidden_flags, file->f_cred);
- 			if (IS_ERR(hidden_file)) {
- 				err = PTR_ERR(hidden_file);
- 				dput(hidden_dentry);
-@@ -512,7 +512,7 @@ mini_fo_open(inode_t *inode, file_t *fil
- 	mntget(stopd(inode->i_sb)->hidden_mnt2);
- 	hidden_sto_file = dentry_open(hidden_sto_dentry,
- 				      stopd(inode->i_sb)->hidden_mnt2,
--				      hidden_flags);
-+				      hidden_flags, file->f_cred);
- 
- 	/* dentry_open dputs the dentry if it fails */
- 	if (IS_ERR(hidden_sto_file)) {
---- a/fs/mini_fo/meta.c
-+++ b/fs/mini_fo/meta.c
-@@ -56,7 +56,7 @@ int meta_build_lists(dentry_t *dentry)
- 
- 
- 		/* open META-file for reading */
--		meta_file = dentry_open(meta_dentry, meta_mnt, 0x0);
-+		meta_file = dentry_open(meta_dentry, meta_mnt, 0x0, current_cred());
- 		if(!meta_file || IS_ERR(meta_file)) {
- 			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-                                           ERROR opening META file.\n");
-@@ -448,7 +448,7 @@ int meta_write_d_entry(dentry_t *dentry,
- 	mntget(meta_mnt);
- 
-         /* open META-file for writing */
--        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-                                   ERROR opening meta file.\n");
-@@ -546,7 +546,7 @@ int meta_write_r_entry(dentry_t *dentry,
- 	mntget(meta_mnt);
- 
-         /* open META-file for writing */
--        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-                                   ERROR opening meta file.\n");
-@@ -686,7 +686,7 @@ int meta_sync_d_list(dentry_t *dentry, i
- 	mntget(meta_mnt);
- 
-         /* open META-file for writing */
--        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-                                   ERROR opening meta file.\n");
-@@ -828,7 +828,7 @@ int meta_sync_r_list(dentry_t *dentry, i
- 	mntget(meta_mnt);
- 
-         /* open META-file for writing */
--        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-                                   ERROR opening meta file.\n");
diff --git a/target/linux/generic-2.6/patches-2.6.33/215-mini_fo_2.6.30.patch b/target/linux/generic-2.6/patches-2.6.33/215-mini_fo_2.6.30.patch
deleted file mode 100644
index 2d2092061..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/215-mini_fo_2.6.30.patch
+++ /dev/null
@@ -1,157 +0,0 @@
---- a/fs/mini_fo/aux.c
-+++ b/fs/mini_fo/aux.c
-@@ -86,8 +86,10 @@ int get_neg_sto_dentry(dentry_t *dentry)
- 	len = dentry->d_name.len;
- 	name = dentry->d_name.name;
- 
-+	mutex_lock(&dtohd2(dentry->d_parent)->d_inode->i_mutex);
- 	dtohd2(dentry) =
- 		lookup_one_len(name, dtohd2(dentry->d_parent), len);
-+	mutex_unlock(&dtohd2(dentry->d_parent)->d_inode->i_mutex);
- 
-  out:
- 	return err;
-@@ -426,7 +428,9 @@ int build_sto_structure(dentry_t *dir, d
- 		const unsigned char *name;
- 		len = dtohd(dentry)->d_name.len;
- 		name = dtohd(dentry)->d_name.name;
-+		mutex_lock(&dtohd2(dir)->d_inode->i_mutex);
- 		hidden_sto_dentry = lookup_one_len(name, dtohd2(dir), len);
-+		mutex_unlock(&dtohd2(dir)->d_inode->i_mutex);
- 		dtohd2(dentry) = hidden_sto_dentry;
- 	}
- 
---- a/fs/mini_fo/inode.c
-+++ b/fs/mini_fo/inode.c
-@@ -113,17 +113,23 @@ mini_fo_lookup(inode_t *dir, dentry_t *d
- 		hidden_dir_dentry = hidden_dentry->d_parent;
- 		kfree(bpath);
- 	}
--	else if(hidden_dir_dentry && hidden_dir_dentry->d_inode)
-+	else if(hidden_dir_dentry && hidden_dir_dentry->d_inode) {
-+		mutex_lock(&hidden_dir_dentry->d_inode->i_mutex);
- 		hidden_dentry =
- 			lookup_one_len(name, hidden_dir_dentry, namelen);
--	else
-+		mutex_unlock(&hidden_dir_dentry->d_inode->i_mutex);
-+	} else {
- 		hidden_dentry = NULL;
-+	}
- 
--	if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode)
-+	if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode) {
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
- 		hidden_sto_dentry =
- 			lookup_one_len(name, hidden_sto_dir_dentry, namelen);
--	else
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+	} else {
- 		hidden_sto_dentry =  NULL;
-+	}
- 
- 	/* catch error in lookup */
- 	if (IS_ERR(hidden_dentry) || IS_ERR(hidden_sto_dentry)) {
-@@ -553,9 +559,11 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
- #endif
- 
- 		/* Delete an old WOL file contained in the storage dir */
-+		mutex_lock(&hidden_sto_dentry->d_inode->i_mutex);
- 		meta_dentry = lookup_one_len(META_FILENAME,
- 					     hidden_sto_dentry,
- 					     strlen(META_FILENAME));
-+		mutex_unlock(&hidden_sto_dentry->d_inode->i_mutex);
- 		if(meta_dentry->d_inode) {
- 			err = vfs_unlink(hidden_sto_dentry->d_inode, meta_dentry);
- 			dput(meta_dentry);
-@@ -643,9 +651,11 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
- #endif
- 
- 		/* Delete an old WOL file contained in the storage dir */
-+		mutex_lock(&hidden_sto_dentry->d_inode->i_mutex);
- 		meta_dentry = lookup_one_len(META_FILENAME,
- 					     hidden_sto_dentry,
- 					     strlen(META_FILENAME));
-+		mutex_unlock(&hidden_sto_dentry->d_inode->i_mutex);
- 		if(meta_dentry->d_inode) {
- 			/* is this necessary? dget(meta_dentry); */
- 			err = vfs_unlink(hidden_sto_dentry->d_inode,
-@@ -688,9 +698,11 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
- #endif
- 
- 		/* Delete an old WOL file contained in the storage dir */
-+		mutex_lock(&hidden_sto_dentry->d_inode->i_mutex);
- 		meta_dentry = lookup_one_len(META_FILENAME,
- 					     hidden_sto_dentry,
- 					     strlen(META_FILENAME));
-+		mutex_unlock(&hidden_sto_dentry->d_inode->i_mutex);
- 		if(meta_dentry->d_inode) {
- 			/* is this necessary? dget(meta_dentry); */
- 			err = vfs_unlink(hidden_sto_dentry->d_inode,
---- a/fs/mini_fo/meta.c
-+++ b/fs/mini_fo/meta.c
-@@ -43,9 +43,11 @@ int meta_build_lists(dentry_t *dentry)
- 
-   	/* might there be a META-file? */
- 	if(dtohd2(dentry) && dtohd2(dentry)->d_inode) {
-+		mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 		meta_dentry = lookup_one_len(META_FILENAME,
- 					     dtohd2(dentry),
- 					     strlen(META_FILENAME));
-+		mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
- 		if(!meta_dentry->d_inode) {
- 			dput(meta_dentry);
- 			goto out_ok;
-@@ -426,8 +428,11 @@ int meta_write_d_entry(dentry_t *dentry,
- 			goto out;
-                 }
-         }
-+
-+	mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 	meta_dentry = lookup_one_len(META_FILENAME,
- 				     dtohd2(dentry), strlen (META_FILENAME));
-+	mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
- 
- 	/* We need to create a META-file */
-         if(!meta_dentry->d_inode) {
-@@ -527,9 +532,13 @@ int meta_write_r_entry(dentry_t *dentry,
- 			goto out;
-                 }
-         }
-+
-+	mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 	meta_dentry = lookup_one_len(META_FILENAME,
- 				     dtohd2(dentry),
- 				     strlen (META_FILENAME));
-+	mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
-+
-         if(!meta_dentry->d_inode) {
-                 /* We need to create a META-file */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-@@ -641,9 +650,13 @@ int meta_sync_d_list(dentry_t *dentry, i
- 			goto out;
-                 }
-         }
-+
-+	mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 	meta_dentry = lookup_one_len(META_FILENAME,
- 				     dtohd2(dentry),
- 				     strlen(META_FILENAME));
-+	mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
-+
-         if(!meta_dentry->d_inode) {
-                 /* We need to create a META-file */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-@@ -784,9 +797,13 @@ int meta_sync_r_list(dentry_t *dentry, i
- 			goto out;
-                 }
-         }
-+
-+	mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 	meta_dentry = lookup_one_len(META_FILENAME,
- 				     dtohd2(dentry),
- 				     strlen(META_FILENAME));
-+	mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
-+
-         if(!meta_dentry->d_inode) {
-                 /* We need to create a META-file */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
diff --git a/target/linux/generic-2.6/patches-2.6.33/216-mini_fo_locking.patch b/target/linux/generic-2.6/patches-2.6.33/216-mini_fo_locking.patch
deleted file mode 100644
index 4f075920f..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/216-mini_fo_locking.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/fs/mini_fo/state.c
-+++ b/fs/mini_fo/state.c
-@@ -537,17 +537,17 @@ int nondir_mod_to_del(dentry_t *dentry)
- 	dtohd(dentry) = NULL;
- 	dtost(dentry) = DELETED;
- 
--	/* add deleted file to META-file */
--	meta_add_d_entry(dentry->d_parent,
--			 dentry->d_name.name,
--			 dentry->d_name.len);
--
- 	/* was: unlock_dir(hidden_sto_dir_dentry); */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
- 	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
- #else
- 	up(&hidden_sto_dir_dentry->d_inode->i_sem);
- #endif
-+	/* add deleted file to META-file */
-+	meta_add_d_entry(dentry->d_parent,
-+			 dentry->d_name.name,
-+			 dentry->d_name.len);
-+
- 	dput(hidden_sto_dir_dentry);
- 
-  out:
diff --git a/target/linux/generic-2.6/patches-2.6.33/219-kobject_uevent.patch b/target/linux/generic-2.6/patches-2.6.33/219-kobject_uevent.patch
deleted file mode 100644
index 7e00b224c..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/219-kobject_uevent.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/lib/kobject_uevent.c
-+++ b/lib/kobject_uevent.c
-@@ -29,7 +29,8 @@ u64 uevent_seqnum;
- char uevent_helper[UEVENT_HELPER_PATH_LEN] = CONFIG_UEVENT_HELPER_PATH;
- static DEFINE_SPINLOCK(sequence_lock);
- #if defined(CONFIG_NET)
--static struct sock *uevent_sock;
-+struct sock *uevent_sock = NULL;
-+EXPORT_SYMBOL_GPL(uevent_sock);
- #endif
- 
- /* the strings here must match the enum in include/linux/kobject.h */
-@@ -42,6 +43,18 @@ static const char *kobject_actions[] = {
- 	[KOBJ_OFFLINE] =	"offline",
- };
- 
-+u64 uevent_next_seqnum(void)
-+{
-+	u64 seq;
-+
-+	spin_lock(&sequence_lock);
-+	seq = ++uevent_seqnum;
-+	spin_unlock(&sequence_lock);
-+
-+	return seq;
-+}
-+EXPORT_SYMBOL_GPL(uevent_next_seqnum);
-+
- /**
-  * kobject_action_type - translate action string to numeric type
-  *
-@@ -201,9 +214,7 @@ int kobject_uevent_env(struct kobject *k
- 		kobj->state_remove_uevent_sent = 1;
- 
- 	/* we will send an event, so request a new sequence number */
--	spin_lock(&sequence_lock);
--	seq = ++uevent_seqnum;
--	spin_unlock(&sequence_lock);
-+	seq = uevent_next_seqnum();
- 	retval = add_uevent_var(env, "SEQNUM=%llu", (unsigned long long)seq);
- 	if (retval)
- 		goto exit;
diff --git a/target/linux/generic-2.6/patches-2.6.33/220-sound_kconfig.patch b/target/linux/generic-2.6/patches-2.6.33/220-sound_kconfig.patch
deleted file mode 100644
index fb3df254d..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/220-sound_kconfig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/sound/core/Kconfig
-+++ b/sound/core/Kconfig
-@@ -8,7 +8,7 @@ config SND_PCM
- 	select GCD
- 
- config SND_HWDEP
--	tristate
-+	tristate "Sound hardware support"
- 
- config SND_RAWMIDI
- 	tristate
diff --git a/target/linux/generic-2.6/patches-2.6.33/221-binfmt_elf_gcc4.1.patch b/target/linux/generic-2.6/patches-2.6.33/221-binfmt_elf_gcc4.1.patch
deleted file mode 100644
index aefbe1875..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/221-binfmt_elf_gcc4.1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/fs/binfmt_elf.c
-+++ b/fs/binfmt_elf.c
-@@ -1165,7 +1165,7 @@ static unsigned long vma_dump_size(struc
- 	if (FILTER(ELF_HEADERS) &&
- 	    vma->vm_pgoff == 0 && (vma->vm_flags & VM_READ)) {
- 		u32 __user *header = (u32 __user *) vma->vm_start;
--		u32 word;
-+		u32 word = 0;
- 		mm_segment_t fs = get_fs();
- 		/*
- 		 * Doing it this way gets the constant folded by GCC.
diff --git a/target/linux/generic-2.6/patches-2.6.33/222-partial_eraseblock_write.patch b/target/linux/generic-2.6/patches-2.6.33/222-partial_eraseblock_write.patch
deleted file mode 100644
index 0c7672e8b..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/222-partial_eraseblock_write.patch
+++ /dev/null
@@ -1,146 +0,0 @@
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -21,6 +21,8 @@
- #include <linux/root_dev.h>
- #include <linux/magic.h>
- 
-+#define MTD_ERASE_PARTIAL	0x8000 /* partition only covers parts of an erase block */
-+
- /* Our partition linked list */
- static LIST_HEAD(mtd_partitions);
- 
-@@ -226,13 +228,60 @@ static int part_erase(struct mtd_info *m
- 		return -EROFS;
- 	if (instr->addr >= mtd->size)
- 		return -EINVAL;
-+
-+	instr->partial_start = false;
-+	if (mtd->flags & MTD_ERASE_PARTIAL) {
-+		size_t readlen = 0;
-+		u64 mtd_ofs;
-+
-+		instr->erase_buf = kmalloc(part->master->erasesize, GFP_ATOMIC);
-+		if (!instr->erase_buf)
-+			return -ENOMEM;
-+
-+		mtd_ofs = part->offset + instr->addr;
-+		instr->erase_buf_ofs = do_div(mtd_ofs, part->master->erasesize);
-+
-+		if (instr->erase_buf_ofs > 0) {
-+			instr->addr -= instr->erase_buf_ofs;
-+			ret = part->master->read(part->master,
-+				instr->addr + part->offset,
-+				part->master->erasesize,
-+				&readlen, instr->erase_buf);
-+
-+			instr->partial_start = true;
-+		} else {
-+			mtd_ofs = part->offset + part->mtd.size;
-+			instr->erase_buf_ofs = part->master->erasesize -
-+				do_div(mtd_ofs, part->master->erasesize);
-+
-+			if (instr->erase_buf_ofs > 0) {
-+				instr->len += instr->erase_buf_ofs;
-+				ret = part->master->read(part->master,
-+					part->offset + instr->addr +
-+					instr->len - part->master->erasesize,
-+					part->master->erasesize, &readlen,
-+					instr->erase_buf);
-+			} else {
-+				ret = 0;
-+			}
-+		}
-+		if (ret < 0) {
-+			kfree(instr->erase_buf);
-+			return ret;
-+		}
-+
-+	}
-+
- 	instr->addr += part->offset;
- 	ret = part->master->erase(part->master, instr);
- 	if (ret) {
- 		if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
- 			instr->fail_addr -= part->offset;
- 		instr->addr -= part->offset;
-+		if (mtd->flags & MTD_ERASE_PARTIAL)
-+			kfree(instr->erase_buf);
- 	}
-+
- 	return ret;
- }
- 
-@@ -240,7 +289,25 @@ void mtd_erase_callback(struct erase_inf
- {
- 	if (instr->mtd->erase == part_erase) {
- 		struct mtd_part *part = PART(instr->mtd);
-+		size_t wrlen = 0;
- 
-+		if (instr->mtd->flags & MTD_ERASE_PARTIAL) {
-+			if (instr->partial_start) {
-+				part->master->write(part->master,
-+					instr->addr, instr->erase_buf_ofs,
-+					&wrlen, instr->erase_buf);
-+				instr->addr += instr->erase_buf_ofs;
-+			} else {
-+				instr->len -= instr->erase_buf_ofs;
-+				part->master->write(part->master,
-+					instr->addr + instr->len,
-+					instr->erase_buf_ofs, &wrlen,
-+					instr->erase_buf +
-+					part->master->erasesize -
-+					instr->erase_buf_ofs);
-+			}
-+			kfree(instr->erase_buf);
-+		}
- 		if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
- 			instr->fail_addr -= part->offset;
- 		instr->addr -= part->offset;
-@@ -473,18 +540,24 @@ static struct mtd_part *add_one_partitio
- 	if ((slave->mtd.flags & MTD_WRITEABLE) &&
- 	    mtd_mod_by_eb(slave->offset, &slave->mtd)) {
- 		/* Doesn't start on a boundary of major erase size */
--		/* FIXME: Let it be writable if it is on a boundary of
--		 * _minor_ erase size though */
--		slave->mtd.flags &= ~MTD_WRITEABLE;
--		printk(KERN_WARNING"mtd: partition \"%s\" doesn't start on an erase block boundary -- force read-only\n",
--			part->name);
-+		slave->mtd.flags |= MTD_ERASE_PARTIAL;
-+		if (((u32) slave->mtd.size) > master->erasesize)
-+			slave->mtd.flags &= ~MTD_WRITEABLE;
-+		else
-+			slave->mtd.erasesize = slave->mtd.size;
- 	}
- 	if ((slave->mtd.flags & MTD_WRITEABLE) &&
--	    mtd_mod_by_eb(slave->mtd.size, &slave->mtd)) {
--		slave->mtd.flags &= ~MTD_WRITEABLE;
--		printk(KERN_WARNING"mtd: partition \"%s\" doesn't end on an erase block -- force read-only\n",
--			part->name);
--	}
-+	    mtd_mod_by_eb(slave->offset + slave->mtd.size, &slave->mtd)) {
-+		slave->mtd.flags |= MTD_ERASE_PARTIAL;
-+
-+		if ((u32) slave->mtd.size > master->erasesize)
-+			slave->mtd.flags &= ~MTD_WRITEABLE;
-+		else
-+			slave->mtd.erasesize = slave->mtd.size;
-+	}
-+	if ((slave->mtd.flags & (MTD_ERASE_PARTIAL|MTD_WRITEABLE)) == MTD_ERASE_PARTIAL)
-+		printk(KERN_WARNING"mtd: partition \"%s\" must either start or end on erase block boundary or be smaller than an erase block -- forcing read-only\n",
-+				part->name);
- 
- 	slave->mtd.ecclayout = master->ecclayout;
- 	if (master->block_isbad) {
---- a/include/linux/mtd/mtd.h
-+++ b/include/linux/mtd/mtd.h
-@@ -46,6 +46,10 @@ struct erase_info {
- 	u_long priv;
- 	u_char state;
- 	struct erase_info *next;
-+
-+	u8 *erase_buf;
-+	u32 erase_buf_ofs;
-+	bool partial_start;
- };
- 
- struct mtd_erase_region_info {
diff --git a/target/linux/generic-2.6/patches-2.6.33/240-packet_socket_type.patch b/target/linux/generic-2.6/patches-2.6.33/240-packet_socket_type.patch
deleted file mode 100644
index 0cf56c02b..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/240-packet_socket_type.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-This patch allows the user to specify desired packet types (outgoing,
-broadcast, unicast, etc.) on packet sockets via setsockopt.
-This can reduce the load in situations where only a limited number
-of packet types are necessary
-
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-
---- a/include/linux/if_packet.h
-+++ b/include/linux/if_packet.h
-@@ -29,6 +29,8 @@ struct sockaddr_ll {
- /* These ones are invisible by user level */
- #define PACKET_LOOPBACK		5		/* MC/BRD frame looped back */
- #define PACKET_FASTROUTE	6		/* Fastrouted frame	*/
-+#define PACKET_MASK_ANY		0xffffffff	/* mask for packet type bits */
-+
- 
- /* Packet socket options */
- 
-@@ -46,6 +48,7 @@ struct sockaddr_ll {
- #define PACKET_RESERVE			12
- #define PACKET_TX_RING			13
- #define PACKET_LOSS			14
-+#define PACKET_RECV_TYPE		15
- 
- struct tpacket_stats {
- 	unsigned int	tp_packets;
---- a/net/packet/af_packet.c
-+++ b/net/packet/af_packet.c
-@@ -205,6 +205,7 @@ struct packet_sock {
- 	unsigned int		tp_loss:1;
- #endif
- 	struct packet_type	prot_hook ____cacheline_aligned_in_smp;
-+	__u8			pkt_type:3;
- };
- 
- struct packet_skb_cb {
-@@ -343,6 +344,7 @@ static int packet_rcv_spkt(struct sk_buf
- {
- 	struct sock *sk;
- 	struct sockaddr_pkt *spkt;
-+	struct packet_sock *po;
- 
- 	/*
- 	 *	When we registered the protocol we saved the socket in the data
-@@ -350,6 +352,7 @@ static int packet_rcv_spkt(struct sk_buf
- 	 */
- 
- 	sk = pt->af_packet_priv;
-+	po = pkt_sk(sk);
- 
- 	/*
- 	 *	Yank back the headers [hope the device set this
-@@ -362,7 +365,7 @@ static int packet_rcv_spkt(struct sk_buf
- 	 *	so that this procedure is noop.
- 	 */
- 
--	if (skb->pkt_type == PACKET_LOOPBACK)
-+	if (!(po->pkt_type & (1 << skb->pkt_type)))
- 		goto out;
- 
- 	if (!net_eq(dev_net(dev), sock_net(sk)))
-@@ -538,12 +541,12 @@ static int packet_rcv(struct sk_buff *sk
- 	int skb_len = skb->len;
- 	unsigned int snaplen, res;
- 
--	if (skb->pkt_type == PACKET_LOOPBACK)
--		goto drop;
--
- 	sk = pt->af_packet_priv;
- 	po = pkt_sk(sk);
- 
-+	if (!(po->pkt_type & (1 << skb->pkt_type)))
-+		goto drop;
-+
- 	if (!net_eq(dev_net(dev), sock_net(sk)))
- 		goto drop;
- 
-@@ -659,12 +662,12 @@ static int tpacket_rcv(struct sk_buff *s
- 	struct timeval tv;
- 	struct timespec ts;
- 
--	if (skb->pkt_type == PACKET_LOOPBACK)
--		goto drop;
--
- 	sk = pt->af_packet_priv;
- 	po = pkt_sk(sk);
- 
-+	if (!(po->pkt_type & (1 << skb->pkt_type)))
-+		goto drop;
-+
- 	if (!net_eq(dev_net(dev), sock_net(sk)))
- 		goto drop;
- 
-@@ -1386,6 +1389,7 @@ static int packet_create(struct net *net
- 	spin_lock_init(&po->bind_lock);
- 	mutex_init(&po->pg_vec_lock);
- 	po->prot_hook.func = packet_rcv;
-+	po->pkt_type = PACKET_MASK_ANY & ~(1 << PACKET_LOOPBACK);
- 
- 	if (sock->type == SOCK_PACKET)
- 		po->prot_hook.func = packet_rcv_spkt;
-@@ -1731,6 +1735,16 @@ packet_setsockopt(struct socket *sock, i
- 			ret = packet_mc_drop(sk, &mreq);
- 		return ret;
- 	}
-+	case PACKET_RECV_TYPE:
-+	{
-+		unsigned int val;
-+		if (optlen != sizeof(val))
-+			return -EINVAL;
-+		if (copy_from_user(&val, optval, sizeof(val)))
-+			return -EFAULT;
-+		po->pkt_type = val & ~PACKET_LOOPBACK;
-+		return 0;
-+	}
- 
- #ifdef CONFIG_PACKET_MMAP
- 	case PACKET_RX_RING:
-@@ -1876,6 +1890,13 @@ static int packet_getsockopt(struct sock
- 
- 		data = &val;
- 		break;
-+	case PACKET_RECV_TYPE:
-+		if (len > sizeof(unsigned int))
-+			len = sizeof(unsigned int);
-+		val = po->pkt_type;
-+
-+		data = &val;
-+		break;
- #ifdef CONFIG_PACKET_MMAP
- 	case PACKET_VERSION:
- 		if (len > sizeof(int))
diff --git a/target/linux/generic-2.6/patches-2.6.33/250-pppoe_header_pad.patch b/target/linux/generic-2.6/patches-2.6.33/250-pppoe_header_pad.patch
deleted file mode 100644
index a2535db60..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/250-pppoe_header_pad.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/drivers/net/pppoe.c
-+++ b/drivers/net/pppoe.c
-@@ -862,7 +862,7 @@ static int pppoe_sendmsg(struct kiocb *i
- 		goto end;
- 
- 
--	skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32,
-+	skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32 + NET_SKB_PAD,
- 			   0, GFP_KERNEL);
- 	if (!skb) {
- 		error = -ENOMEM;
-@@ -870,7 +870,7 @@ static int pppoe_sendmsg(struct kiocb *i
- 	}
- 
- 	/* Reserve space for headers. */
--	skb_reserve(skb, dev->hard_header_len);
-+	skb_reserve(skb, dev->hard_header_len + NET_SKB_PAD);
- 	skb_reset_network_header(skb);
- 
- 	skb->dev = dev;
diff --git a/target/linux/generic-2.6/patches-2.6.33/260-crypto_optional_tests.patch b/target/linux/generic-2.6/patches-2.6.33/260-crypto_optional_tests.patch
deleted file mode 100644
index 3b28502a6..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/260-crypto_optional_tests.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -96,6 +96,10 @@ config CRYPTO_MANAGER2
- 	select CRYPTO_BLKCIPHER2
- 	select CRYPTO_PCOMP
- 
-+config CRYPTO_MANAGER_NO_TESTS
-+	bool "Disable internal testsuite to save space"
-+	depends on CRYPTO_MANAGER
-+
- config CRYPTO_GF128MUL
- 	tristate "GF(2^128) multiplication functions (EXPERIMENTAL)"
- 	depends on EXPERIMENTAL
---- a/crypto/testmgr.c
-+++ b/crypto/testmgr.c
-@@ -47,6 +47,8 @@
- #define ENCRYPT 1
- #define DECRYPT 0
- 
-+#ifndef CONFIG_CRYPTO_MANAGER_NO_TESTS
-+
- struct tcrypt_result {
- 	struct completion completion;
- 	int err;
-@@ -2359,8 +2361,11 @@ static int alg_find_test(const char *alg
- 	return -1;
- }
- 
-+#endif /* CONFIG_CRYPTO_MANAGER_NO_TESTS */
-+
- int alg_test(const char *driver, const char *alg, u32 type, u32 mask)
- {
-+#ifndef CONFIG_CRYPTO_MANAGER_NO_TESTS
- 	int i;
- 	int j;
- 	int rc;
-@@ -2415,5 +2420,8 @@ notest:
- 	return 0;
- non_fips_alg:
- 	return -EINVAL;
-+#else /* CONFIG_CRYPTO_MANAGER_NO_TESTS */
-+	return 0;
-+#endif /* CONFIG_CRYPTO_MANAGER_NO_TESTS */
- }
- EXPORT_SYMBOL_GPL(alg_test);
---- a/crypto/testmgr.h
-+++ b/crypto/testmgr.h
-@@ -20,6 +20,8 @@
- 
- #include <crypto/compress.h>
- 
-+#ifndef CONFIG_CRYPTO_MANAGER_NO_TESTS
-+
- #define MAX_DIGEST_SIZE		64
- #define MAX_TAP			8
- 
-@@ -9552,4 +9554,6 @@ static struct hash_testvec crc32c_tv_tem
- 	},
- };
- 
-+#endif /* CONFIG_CRYPTO_MANAGER_NO_TESTS */
-+
- #endif	/* _CRYPTO_TESTMGR_H */
diff --git a/target/linux/generic-2.6/patches-2.6.33/400-ledtrig_morse.patch b/target/linux/generic-2.6/patches-2.6.33/400-ledtrig_morse.patch
deleted file mode 100644
index 899ce7fb1..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/400-ledtrig_morse.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -337,4 +337,8 @@ config LEDS_TRIGGER_DEFAULT_ON
- comment "iptables trigger is under Netfilter config (LED target)"
- 	depends on LEDS_TRIGGERS
- 
-+config LEDS_TRIGGER_MORSE
-+	tristate "LED Morse Trigger"
-+	depends on LEDS_TRIGGERS
-+
- endif # NEW_LEDS
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -44,3 +44,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)	+=
- obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)	+= ledtrig-backlight.o
- obj-$(CONFIG_LEDS_TRIGGER_GPIO)		+= ledtrig-gpio.o
- obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o
-+obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
diff --git a/target/linux/generic-2.6/patches-2.6.33/402-ledtrig_netdev.patch b/target/linux/generic-2.6/patches-2.6.33/402-ledtrig_netdev.patch
deleted file mode 100644
index 22660c547..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/402-ledtrig_netdev.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -341,4 +341,11 @@ config LEDS_TRIGGER_MORSE
- 	tristate "LED Morse Trigger"
- 	depends on LEDS_TRIGGERS
- 
-+config LEDS_TRIGGER_NETDEV
-+	tristate "LED Netdev Trigger"
-+	depends on LEDS_TRIGGERS
-+	help
-+	  This allows LEDs to be controlled by network device activity.
-+	  If unsure, say Y.
-+
- endif # NEW_LEDS
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -45,3 +45,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)	+=
- obj-$(CONFIG_LEDS_TRIGGER_GPIO)		+= ledtrig-gpio.o
- obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o
- obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
-+obj-$(CONFIG_LEDS_TRIGGER_NETDEV)      += ledtrig-netdev.o
diff --git a/target/linux/generic-2.6/patches-2.6.33/410-gpio_buttons.patch b/target/linux/generic-2.6/patches-2.6.33/410-gpio_buttons.patch
deleted file mode 100644
index b762ddea5..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/410-gpio_buttons.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/drivers/input/misc/Kconfig
-+++ b/drivers/input/misc/Kconfig
-@@ -319,4 +319,20 @@ config INPUT_PCAP
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called pcap_keys.
- 
-+config INPUT_GPIO_BUTTONS
-+	tristate "Polled GPIO buttons interface"
-+	depends on GENERIC_GPIO
-+	select INPUT_POLLDEV
-+	help
-+	  This driver implements support for buttons connected
-+	  to GPIO pins of various CPUs (and some other chips).
-+
-+	  Say Y here if your device has buttons connected
-+	  directly to such GPIO pins.  Your board-specific
-+	  setup logic must also provide a platform device,
-+	  with configuration data saying which GPIOs are used.
-+
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called gpio-buttons.
-+
- endif
---- a/drivers/input/misc/Makefile
-+++ b/drivers/input/misc/Makefile
-@@ -30,4 +30,5 @@ obj-$(CONFIG_INPUT_WINBOND_CIR)		+= winb
- obj-$(CONFIG_INPUT_WISTRON_BTNS)	+= wistron_btns.o
- obj-$(CONFIG_INPUT_WM831X_ON)		+= wm831x-on.o
- obj-$(CONFIG_INPUT_YEALINK)		+= yealink.o
-+obj-$(CONFIG_INPUT_GPIO_BUTTONS)	+= gpio_buttons.o
- 
diff --git a/target/linux/generic-2.6/patches-2.6.33/420-gpiodev.patch b/target/linux/generic-2.6/patches-2.6.33/420-gpiodev.patch
deleted file mode 100644
index ebc430f3e..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/420-gpiodev.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/drivers/char/Kconfig
-+++ b/drivers/char/Kconfig
-@@ -1016,6 +1016,14 @@ config CS5535_GPIO
- 
- 	  If compiled as a module, it will be called cs5535_gpio.
- 
-+config GPIO_DEVICE
-+	tristate "GPIO device support"
-+	depends on GENERIC_GPIO
-+	help
-+	  Say Y to enable Linux GPIO device support.  This allows control of
-+	  GPIO pins using a character device
-+
-+
- config RAW_DRIVER
- 	tristate "RAW driver (/dev/raw/rawN)"
- 	depends on BLOCK
---- a/drivers/char/Makefile
-+++ b/drivers/char/Makefile
-@@ -95,6 +95,7 @@ obj-$(CONFIG_SCx200_GPIO)	+= scx200_gpio
- obj-$(CONFIG_PC8736x_GPIO)	+= pc8736x_gpio.o
- obj-$(CONFIG_NSC_GPIO)		+= nsc_gpio.o
- obj-$(CONFIG_CS5535_GPIO)	+= cs5535_gpio.o
-+obj-$(CONFIG_GPIO_DEVICE)	+= gpio_dev.o
- obj-$(CONFIG_GPIO_TB0219)	+= tb0219.o
- obj-$(CONFIG_TELCLOCK)		+= tlclk.o
- 
diff --git a/target/linux/generic-2.6/patches-2.6.33/430-scsi_header_fix.patch b/target/linux/generic-2.6/patches-2.6.33/430-scsi_header_fix.patch
deleted file mode 100644
index 59e433361..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/430-scsi_header_fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/include/scsi/scsi.h
-+++ b/include/scsi/scsi.h
-@@ -149,10 +149,10 @@ struct scsi_cmnd;
- 
- /* defined in T10 SCSI Primary Commands-2 (SPC2) */
- struct scsi_varlen_cdb_hdr {
--	u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
--	u8 control;
--	u8 misc[5];
--	u8 additional_cdb_length;         /* total cdb length - 8 */
-+	__u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
-+	__u8 control;
-+	__u8 misc[5];
-+	__u8 additional_cdb_length;         /* total cdb length - 8 */
- 	__be16 service_action;
- 	/* service specific data follows */
- };
diff --git a/target/linux/generic-2.6/patches-2.6.33/510-yaffs_support.patch b/target/linux/generic-2.6/patches-2.6.33/510-yaffs_support.patch
deleted file mode 100644
index e490452e5..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/510-yaffs_support.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/fs/Kconfig
-+++ b/fs/Kconfig
-@@ -44,6 +44,7 @@ source "fs/gfs2/Kconfig"
- source "fs/ocfs2/Kconfig"
- source "fs/btrfs/Kconfig"
- source "fs/nilfs2/Kconfig"
-+source "fs/yaffs2/Kconfig"
- 
- endif # BLOCK
- 
---- a/fs/Makefile
-+++ b/fs/Makefile
-@@ -125,3 +125,4 @@ obj-$(CONFIG_OCFS2_FS)		+= ocfs2/
- obj-$(CONFIG_BTRFS_FS)		+= btrfs/
- obj-$(CONFIG_GFS2_FS)           += gfs2/
- obj-$(CONFIG_EXOFS_FS)          += exofs/
-+obj-$(CONFIG_YAFFS_FS)		+= yaffs2/
diff --git a/target/linux/generic-2.6/patches-2.6.33/511-yaffs-cvs-2009-04-24.patch b/target/linux/generic-2.6/patches-2.6.33/511-yaffs-cvs-2009-04-24.patch
deleted file mode 100644
index c334b17d0..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/511-yaffs-cvs-2009-04-24.patch
+++ /dev/null
@@ -1,12344 +0,0 @@
---- a/fs/yaffs2/devextras.h
-+++ b/fs/yaffs2/devextras.h
-@@ -14,194 +14,135 @@
-  */
- 
- /*
-- * This file is just holds extra declarations used during development.
-- * Most of these are from kernel includes placed here so we can use them in
-- * applications.
-+ * This file is just holds extra declarations of macros that would normally
-+ * be providesd in the Linux kernel. These macros have been written from
-+ * scratch but are functionally equivalent to the Linux ones.
-  *
-  */
- 
- #ifndef __EXTRAS_H__
- #define __EXTRAS_H__
- 
--#if defined WIN32
--#define __inline__ __inline
--#define new newHack
--#endif
--
--#if !(defined __KERNEL__) || (defined WIN32)
- 
--/* User space defines */
-+#if !(defined __KERNEL__)
- 
-+/* Definition of types */
- typedef unsigned char __u8;
- typedef unsigned short __u16;
- typedef unsigned __u32;
- 
-+#endif
-+
- /*
-- * Simple doubly linked list implementation.
-- *
-- * Some of the internal functions ("__xxx") are useful when
-- * manipulating whole lists rather than single entries, as
-- * sometimes we already know the next/prev entries and we can
-- * generate better code by using them directly rather than
-- * using the generic single-entry routines.
-+ * This is a simple doubly linked list implementation that matches the
-+ * way the Linux kernel doubly linked list implementation works.
-  */
- 
--#define prefetch(x) 1
--
--struct list_head {
--	struct list_head *next, *prev;
-+struct ylist_head {
-+	struct ylist_head *next; /* next in chain */
-+	struct ylist_head *prev; /* previous in chain */
- };
- 
--#define LIST_HEAD_INIT(name) { &(name), &(name) }
- 
--#define LIST_HEAD(name) \
--	struct list_head name = LIST_HEAD_INIT(name)
-+/* Initialise a static list */
-+#define YLIST_HEAD(name) \
-+struct ylist_head name = { &(name), &(name)}
-+
- 
--#define INIT_LIST_HEAD(ptr) do { \
--	(ptr)->next = (ptr); (ptr)->prev = (ptr); \
-+
-+/* Initialise a list head to an empty list */
-+#define YINIT_LIST_HEAD(p) \
-+do { \
-+	(p)->next = (p);\
-+	(p)->prev = (p); \
- } while (0)
- 
--/*
-- * Insert a new entry between two known consecutive entries.
-- *
-- * This is only for internal list manipulation where we know
-- * the prev/next entries already!
-- */
--static __inline__ void __list_add(struct list_head *new,
--				  struct list_head *prev,
--				  struct list_head *next)
--{
--	next->prev = new;
--	new->next = next;
--	new->prev = prev;
--	prev->next = new;
--}
- 
--/**
-- * list_add - add a new entry
-- * @new: new entry to be added
-- * @head: list head to add it after
-- *
-- * Insert a new entry after the specified head.
-- * This is good for implementing stacks.
-- */
--static __inline__ void list_add(struct list_head *new, struct list_head *head)
-+/* Add an element to a list */
-+static __inline__ void ylist_add(struct ylist_head *newEntry,
-+				struct ylist_head *list)
- {
--	__list_add(new, head, head->next);
--}
-+	struct ylist_head *listNext = list->next;
-+
-+	list->next = newEntry;
-+	newEntry->prev = list;
-+	newEntry->next = listNext;
-+	listNext->prev = newEntry;
- 
--/**
-- * list_add_tail - add a new entry
-- * @new: new entry to be added
-- * @head: list head to add it before
-- *
-- * Insert a new entry before the specified head.
-- * This is useful for implementing queues.
-- */
--static __inline__ void list_add_tail(struct list_head *new,
--				     struct list_head *head)
--{
--	__list_add(new, head->prev, head);
- }
- 
--/*
-- * Delete a list entry by making the prev/next entries
-- * point to each other.
-- *
-- * This is only for internal list manipulation where we know
-- * the prev/next entries already!
-- */
--static __inline__ void __list_del(struct list_head *prev,
--				  struct list_head *next)
-+static __inline__ void ylist_add_tail(struct ylist_head *newEntry,
-+				 struct ylist_head *list)
- {
--	next->prev = prev;
--	prev->next = next;
-+	struct ylist_head *listPrev = list->prev;
-+
-+	list->prev = newEntry;
-+	newEntry->next = list;
-+	newEntry->prev = listPrev;
-+	listPrev->next = newEntry;
-+
- }
- 
--/**
-- * list_del - deletes entry from list.
-- * @entry: the element to delete from the list.
-- * Note: list_empty on entry does not return true after this, the entry is
-- * in an undefined state.
-- */
--static __inline__ void list_del(struct list_head *entry)
-+
-+/* Take an element out of its current list, with or without
-+ * reinitialising the links.of the entry*/
-+static __inline__ void ylist_del(struct ylist_head *entry)
- {
--	__list_del(entry->prev, entry->next);
-+	struct ylist_head *listNext = entry->next;
-+	struct ylist_head *listPrev = entry->prev;
-+
-+	listNext->prev = listPrev;
-+	listPrev->next = listNext;
-+
- }
- 
--/**
-- * list_del_init - deletes entry from list and reinitialize it.
-- * @entry: the element to delete from the list.
-- */
--static __inline__ void list_del_init(struct list_head *entry)
-+static __inline__ void ylist_del_init(struct ylist_head *entry)
- {
--	__list_del(entry->prev, entry->next);
--	INIT_LIST_HEAD(entry);
-+	ylist_del(entry);
-+	entry->next = entry->prev = entry;
- }
- 
--/**
-- * list_empty - tests whether a list is empty
-- * @head: the list to test.
-- */
--static __inline__ int list_empty(struct list_head *head)
-+
-+/* Test if the list is empty */
-+static __inline__ int ylist_empty(struct ylist_head *entry)
- {
--	return head->next == head;
-+	return (entry->next == entry);
- }
- 
--/**
-- * list_splice - join two lists
-- * @list: the new list to add.
-- * @head: the place to add it in the first list.
-+
-+/* ylist_entry takes a pointer to a list entry and offsets it to that
-+ * we can find a pointer to the object it is embedded in.
-  */
--static __inline__ void list_splice(struct list_head *list,
--				   struct list_head *head)
--{
--	struct list_head *first = list->next;
- 
--	if (first != list) {
--		struct list_head *last = list->prev;
--		struct list_head *at = head->next;
--
--		first->prev = head;
--		head->next = first;
--
--		last->next = at;
--		at->prev = last;
--	}
--}
- 
--/**
-- * list_entry - get the struct for this entry
-- * @ptr:	the &struct list_head pointer.
-- * @type:	the type of the struct this is embedded in.
-- * @member:	the name of the list_struct within the struct.
-- */
--#define list_entry(ptr, type, member) \
--	((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member)))
--
--/**
-- * list_for_each	-	iterate over a list
-- * @pos:	the &struct list_head to use as a loop counter.
-- * @head:	the head for your list.
-- */
--#define list_for_each(pos, head) \
--	for (pos = (head)->next, prefetch(pos->next); pos != (head); \
--        	pos = pos->next, prefetch(pos->next))
--
--/**
-- * list_for_each_safe	-	iterate over a list safe against removal
-- *                              of list entry
-- * @pos:	the &struct list_head to use as a loop counter.
-- * @n:		another &struct list_head to use as temporary storage
-- * @head:	the head for your list.
-- */
--#define list_for_each_safe(pos, n, head) \
--	for (pos = (head)->next, n = pos->next; pos != (head); \
--		pos = n, n = pos->next)
-+#define ylist_entry(entry, type, member) \
-+	((type *)((char *)(entry)-(unsigned long)(&((type *)NULL)->member)))
- 
--/*
-- * File types
-+
-+/* ylist_for_each and list_for_each_safe  iterate over lists.
-+ * ylist_for_each_safe uses temporary storage to make the list delete safe
-  */
-+
-+#define ylist_for_each(itervar, list) \
-+	for (itervar = (list)->next; itervar != (list); itervar = itervar->next)
-+
-+#define ylist_for_each_safe(itervar, saveVar, list) \
-+	for (itervar = (list)->next, saveVar = (list)->next->next; \
-+		itervar != (list); itervar = saveVar, saveVar = saveVar->next)
-+
-+
-+#if !(defined __KERNEL__)
-+
-+
-+#ifndef WIN32
-+#include <sys/stat.h>
-+#endif
-+
-+
-+#ifdef CONFIG_YAFFS_PROVIDE_DEFS
-+/* File types */
-+
-+
- #define DT_UNKNOWN	0
- #define DT_FIFO		1
- #define DT_CHR		2
-@@ -212,6 +153,7 @@ static __inline__ void list_splice(struc
- #define DT_SOCK		12
- #define DT_WHT		14
- 
-+
- #ifndef WIN32
- #include <sys/stat.h>
- #endif
-@@ -227,10 +169,6 @@ static __inline__ void list_splice(struc
- #define ATTR_ATIME	16
- #define ATTR_MTIME	32
- #define ATTR_CTIME	64
--#define ATTR_ATIME_SET	128
--#define ATTR_MTIME_SET	256
--#define ATTR_FORCE	512	/* Not a change, but a change it */
--#define ATTR_ATTR_FLAG	1024
- 
- struct iattr {
- 	unsigned int ia_valid;
-@@ -244,21 +182,15 @@ struct iattr {
- 	unsigned int ia_attr_flags;
- };
- 
--#define KERN_DEBUG
-+#endif
- 
- #else
- 
--#ifndef WIN32
- #include <linux/types.h>
--#include <linux/list.h>
- #include <linux/fs.h>
- #include <linux/stat.h>
--#endif
- 
- #endif
- 
--#if defined WIN32
--#undef new
--#endif
- 
- #endif
---- a/fs/yaffs2/Kconfig
-+++ b/fs/yaffs2/Kconfig
-@@ -5,7 +5,7 @@
- config YAFFS_FS
- 	tristate "YAFFS2 file system support"
- 	default n
--	depends on MTD
-+	depends on MTD_BLOCK
- 	select YAFFS_YAFFS1
- 	select YAFFS_YAFFS2
- 	help
-@@ -43,7 +43,8 @@ config YAFFS_9BYTE_TAGS
- 	  format that you need to continue to support.  New data written
- 	  also uses the older-style format.  Note: Use of this option
- 	  generally requires that MTD's oob layout be adjusted to use the
--	  older-style format.  See notes on tags formats and MTD versions.
-+	  older-style format.  See notes on tags formats and MTD versions
-+	  in yaffs_mtdif1.c.
- 
- 	  If unsure, say N.
- 
-@@ -109,26 +110,6 @@ config YAFFS_DISABLE_LAZY_LOAD
- 
- 	  If unsure, say N.
- 
--config YAFFS_CHECKPOINT_RESERVED_BLOCKS
--	int "Reserved blocks for checkpointing"
--	depends on YAFFS_YAFFS2
--	default 10
--	help
--          Give the number of Blocks to reserve for checkpointing.
--	  Checkpointing saves the state at unmount so that mounting is
--	  much faster as a scan of all the flash to regenerate this state
--	  is not needed.  These Blocks are reserved per partition, so if
--	  you have very small partitions the default (10) may be a mess
--	  for you.  You can set this value to 0, but that does not mean
--	  checkpointing is disabled at all. There only won't be any
--	  specially reserved blocks for checkpointing, so if there is
--	  enough free space on the filesystem, it will be used for
--	  checkpointing.
--
--	  If unsure, leave at default (10), but don't wonder if there are
--	  always 2MB used on your large page device partition (10 x 2k
--	  pagesize). When using small partitions or when being very small
--	  on space, you probably want to set this to zero.
- 
- config YAFFS_DISABLE_WIDE_TNODES
- 	bool "Turn off wide tnodes"
---- a/fs/yaffs2/Makefile
-+++ b/fs/yaffs2/Makefile
-@@ -5,7 +5,6 @@
- obj-$(CONFIG_YAFFS_FS) += yaffs.o
- 
- yaffs-y := yaffs_ecc.o yaffs_fs.o yaffs_guts.o yaffs_checkptrw.o
--yaffs-y += yaffs_packedtags2.o yaffs_nand.o yaffs_qsort.o
-+yaffs-y += yaffs_packedtags1.o yaffs_packedtags2.o yaffs_nand.o yaffs_qsort.o
- yaffs-y += yaffs_tagscompat.o yaffs_tagsvalidity.o
--yaffs-y += yaffs_mtdif1.o yaffs_packedtags1.o
--yaffs-y += yaffs_mtdif.o yaffs_mtdif2.o
-+yaffs-y += yaffs_mtdif.o yaffs_mtdif1.o yaffs_mtdif2.o
---- a/fs/yaffs2/moduleconfig.h
-+++ b/fs/yaffs2/moduleconfig.h
-@@ -27,12 +27,12 @@
- 
- /* Default: Not selected */
- /* Meaning: Yaffs does its own ECC, rather than using MTD ECC */
--//#define CONFIG_YAFFS_DOES_ECC
-+/* #define CONFIG_YAFFS_DOES_ECC */
- 
- /* Default: Not selected */
- /* Meaning: ECC byte order is 'wrong'.  Only meaningful if */
- /*          CONFIG_YAFFS_DOES_ECC is set */
--//#define CONFIG_YAFFS_ECC_WRONG_ORDER
-+/* #define CONFIG_YAFFS_ECC_WRONG_ORDER */
- 
- /* Default: Selected */
- /* Meaning: Disables testing whether chunks are erased before writing to them*/
-@@ -54,11 +54,11 @@ that you need to continue to support.  N
- older-style format.
- Note: Use of this option generally requires that MTD's oob layout be
- adjusted to use the older-style format.  See notes on tags formats and
--MTD versions.
-+MTD versions in yaffs_mtdif1.c.
- */
- /* Default: Not selected */
- /* Meaning: Use older-style on-NAND data format with pageStatus byte */
--#define CONFIG_YAFFS_9BYTE_TAGS
-+/* #define CONFIG_YAFFS_9BYTE_TAGS */
- 
- #endif /* YAFFS_OUT_OF_TREE */
- 
---- a/fs/yaffs2/yaffs_checkptrw.c
-+++ b/fs/yaffs2/yaffs_checkptrw.c
-@@ -12,48 +12,43 @@
-  */
- 
- const char *yaffs_checkptrw_c_version =
--    "$Id: yaffs_checkptrw.c,v 1.14 2007-05-15 20:07:40 charles Exp $";
-+	"$Id: yaffs_checkptrw.c,v 1.18 2009-03-06 17:20:49 wookey Exp $";
- 
- 
- #include "yaffs_checkptrw.h"
--
-+#include "yaffs_getblockinfo.h"
- 
- static int yaffs_CheckpointSpaceOk(yaffs_Device *dev)
- {
--
- 	int blocksAvailable = dev->nErasedBlocks - dev->nReservedBlocks;
- 
- 	T(YAFFS_TRACE_CHECKPOINT,
- 		(TSTR("checkpt blocks available = %d" TENDSTR),
- 		blocksAvailable));
- 
--
- 	return (blocksAvailable <= 0) ? 0 : 1;
- }
- 
- 
- static int yaffs_CheckpointErase(yaffs_Device *dev)
- {
--
- 	int i;
- 
--
--	if(!dev->eraseBlockInNAND)
-+	if (!dev->eraseBlockInNAND)
- 		return 0;
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checking blocks %d to %d"TENDSTR),
--		dev->internalStartBlock,dev->internalEndBlock));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checking blocks %d to %d"TENDSTR),
-+		dev->internalStartBlock, dev->internalEndBlock));
- 
--	for(i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
--		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
--		if(bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT){
--			T(YAFFS_TRACE_CHECKPOINT,(TSTR("erasing checkpt block %d"TENDSTR),i));
--			if(dev->eraseBlockInNAND(dev,i- dev->blockOffset /* realign */)){
-+	for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
-+		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
-+		if (bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT) {
-+			T(YAFFS_TRACE_CHECKPOINT, (TSTR("erasing checkpt block %d"TENDSTR), i));
-+			if (dev->eraseBlockInNAND(dev, i - dev->blockOffset /* realign */)) {
- 				bi->blockState = YAFFS_BLOCK_STATE_EMPTY;
- 				dev->nErasedBlocks++;
- 				dev->nFreeChunks += dev->nChunksPerBlock;
--			}
--			else {
--				dev->markNANDBlockBad(dev,i);
-+			} else {
-+				dev->markNANDBlockBad(dev, i);
- 				bi->blockState = YAFFS_BLOCK_STATE_DEAD;
- 			}
- 		}
-@@ -71,23 +66,23 @@ static void yaffs_CheckpointFindNextEras
- 	int blocksAvailable = dev->nErasedBlocks - dev->nReservedBlocks;
- 	T(YAFFS_TRACE_CHECKPOINT,
- 		(TSTR("allocating checkpt block: erased %d reserved %d avail %d next %d "TENDSTR),
--		dev->nErasedBlocks,dev->nReservedBlocks,blocksAvailable,dev->checkpointNextBlock));
-+		dev->nErasedBlocks, dev->nReservedBlocks, blocksAvailable, dev->checkpointNextBlock));
- 
--	if(dev->checkpointNextBlock >= 0 &&
--	   dev->checkpointNextBlock <= dev->internalEndBlock &&
--	   blocksAvailable > 0){
--
--		for(i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++){
--			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
--			if(bi->blockState == YAFFS_BLOCK_STATE_EMPTY){
-+	if (dev->checkpointNextBlock >= 0 &&
-+			dev->checkpointNextBlock <= dev->internalEndBlock &&
-+			blocksAvailable > 0) {
-+
-+		for (i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++) {
-+			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
-+			if (bi->blockState == YAFFS_BLOCK_STATE_EMPTY) {
- 				dev->checkpointNextBlock = i + 1;
- 				dev->checkpointCurrentBlock = i;
--				T(YAFFS_TRACE_CHECKPOINT,(TSTR("allocating checkpt block %d"TENDSTR),i));
-+				T(YAFFS_TRACE_CHECKPOINT, (TSTR("allocating checkpt block %d"TENDSTR), i));
- 				return;
- 			}
- 		}
- 	}
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("out of checkpt blocks"TENDSTR)));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("out of checkpt blocks"TENDSTR)));
- 
- 	dev->checkpointNextBlock = -1;
- 	dev->checkpointCurrentBlock = -1;
-@@ -98,30 +93,31 @@ static void yaffs_CheckpointFindNextChec
- 	int  i;
- 	yaffs_ExtendedTags tags;
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("find next checkpt block: start:  blocks %d next %d" TENDSTR),
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("find next checkpt block: start:  blocks %d next %d" TENDSTR),
- 		dev->blocksInCheckpoint, dev->checkpointNextBlock));
- 
--	if(dev->blocksInCheckpoint < dev->checkpointMaxBlocks)
--		for(i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++){
-+	if (dev->blocksInCheckpoint < dev->checkpointMaxBlocks)
-+		for (i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++) {
- 			int chunk = i * dev->nChunksPerBlock;
- 			int realignedChunk = chunk - dev->chunkOffset;
- 
--			dev->readChunkWithTagsFromNAND(dev,realignedChunk,NULL,&tags);
--			T(YAFFS_TRACE_CHECKPOINT,(TSTR("find next checkpt block: search: block %d oid %d seq %d eccr %d" TENDSTR),
--				i, tags.objectId,tags.sequenceNumber,tags.eccResult));
-+			dev->readChunkWithTagsFromNAND(dev, realignedChunk,
-+					NULL, &tags);
-+			T(YAFFS_TRACE_CHECKPOINT, (TSTR("find next checkpt block: search: block %d oid %d seq %d eccr %d" TENDSTR),
-+				i, tags.objectId, tags.sequenceNumber, tags.eccResult));
- 
--			if(tags.sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA){
-+			if (tags.sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA) {
- 				/* Right kind of block */
- 				dev->checkpointNextBlock = tags.objectId;
- 				dev->checkpointCurrentBlock = i;
- 				dev->checkpointBlockList[dev->blocksInCheckpoint] = i;
- 				dev->blocksInCheckpoint++;
--				T(YAFFS_TRACE_CHECKPOINT,(TSTR("found checkpt block %d"TENDSTR),i));
-+				T(YAFFS_TRACE_CHECKPOINT, (TSTR("found checkpt block %d"TENDSTR), i));
- 				return;
- 			}
- 		}
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("found no more checkpt blocks"TENDSTR)));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("found no more checkpt blocks"TENDSTR)));
- 
- 	dev->checkpointNextBlock = -1;
- 	dev->checkpointCurrentBlock = -1;
-@@ -133,17 +129,17 @@ int yaffs_CheckpointOpen(yaffs_Device *d
- 
- 	/* Got the functions we need? */
- 	if (!dev->writeChunkWithTagsToNAND ||
--	    !dev->readChunkWithTagsFromNAND ||
--	    !dev->eraseBlockInNAND ||
--	    !dev->markNANDBlockBad)
-+			!dev->readChunkWithTagsFromNAND ||
-+			!dev->eraseBlockInNAND ||
-+			!dev->markNANDBlockBad)
- 		return 0;
- 
--	if(forWriting && !yaffs_CheckpointSpaceOk(dev))
-+	if (forWriting && !yaffs_CheckpointSpaceOk(dev))
- 		return 0;
- 
--	if(!dev->checkpointBuffer)
--		dev->checkpointBuffer = YMALLOC_DMA(dev->nDataBytesPerChunk);
--	if(!dev->checkpointBuffer)
-+	if (!dev->checkpointBuffer)
-+		dev->checkpointBuffer = YMALLOC_DMA(dev->totalBytesPerChunk);
-+	if (!dev->checkpointBuffer)
- 		return 0;
- 
- 
-@@ -159,12 +155,10 @@ int yaffs_CheckpointOpen(yaffs_Device *d
- 	dev->checkpointNextBlock = dev->internalStartBlock;
- 
- 	/* Erase all the blocks in the checkpoint area */
--	if(forWriting){
--		memset(dev->checkpointBuffer,0,dev->nDataBytesPerChunk);
-+	if (forWriting) {
-+		memset(dev->checkpointBuffer, 0, dev->nDataBytesPerChunk);
- 		dev->checkpointByteOffset = 0;
- 		return yaffs_CheckpointErase(dev);
--
--
- 	} else {
- 		int i;
- 		/* Set to a value that will kick off a read */
-@@ -174,7 +168,7 @@ int yaffs_CheckpointOpen(yaffs_Device *d
- 		dev->blocksInCheckpoint = 0;
- 		dev->checkpointMaxBlocks = (dev->internalEndBlock - dev->internalStartBlock)/16 + 2;
- 		dev->checkpointBlockList = YMALLOC(sizeof(int) * dev->checkpointMaxBlocks);
--		for(i = 0; i < dev->checkpointMaxBlocks; i++)
-+		for (i = 0; i < dev->checkpointMaxBlocks; i++)
- 			dev->checkpointBlockList[i] = -1;
- 	}
- 
-@@ -191,18 +185,17 @@ int yaffs_GetCheckpointSum(yaffs_Device
- 
- static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev)
- {
--
- 	int chunk;
- 	int realignedChunk;
- 
- 	yaffs_ExtendedTags tags;
- 
--	if(dev->checkpointCurrentBlock < 0){
-+	if (dev->checkpointCurrentBlock < 0) {
- 		yaffs_CheckpointFindNextErasedBlock(dev);
- 		dev->checkpointCurrentChunk = 0;
- 	}
- 
--	if(dev->checkpointCurrentBlock < 0)
-+	if (dev->checkpointCurrentBlock < 0)
- 		return 0;
- 
- 	tags.chunkDeleted = 0;
-@@ -210,10 +203,10 @@ static int yaffs_CheckpointFlushBuffer(y
- 	tags.chunkId = dev->checkpointPageSequence + 1;
- 	tags.sequenceNumber =  YAFFS_SEQUENCE_CHECKPOINT_DATA;
- 	tags.byteCount = dev->nDataBytesPerChunk;
--	if(dev->checkpointCurrentChunk == 0){
-+	if (dev->checkpointCurrentChunk == 0) {
- 		/* First chunk we write for the block? Set block state to
- 		   checkpoint */
--		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,dev->checkpointCurrentBlock);
-+		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, dev->checkpointCurrentBlock);
- 		bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT;
- 		dev->blocksInCheckpoint++;
- 	}
-@@ -221,28 +214,29 @@ static int yaffs_CheckpointFlushBuffer(y
- 	chunk = dev->checkpointCurrentBlock * dev->nChunksPerBlock + dev->checkpointCurrentChunk;
- 
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint wite buffer nand %d(%d:%d) objid %d chId %d" TENDSTR),
--		chunk, dev->checkpointCurrentBlock, dev->checkpointCurrentChunk,tags.objectId,tags.chunkId));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint wite buffer nand %d(%d:%d) objid %d chId %d" TENDSTR),
-+		chunk, dev->checkpointCurrentBlock, dev->checkpointCurrentChunk, tags.objectId, tags.chunkId));
- 
- 	realignedChunk = chunk - dev->chunkOffset;
- 
--	dev->writeChunkWithTagsToNAND(dev,realignedChunk,dev->checkpointBuffer,&tags);
-+	dev->writeChunkWithTagsToNAND(dev, realignedChunk,
-+			dev->checkpointBuffer, &tags);
- 	dev->checkpointByteOffset = 0;
- 	dev->checkpointPageSequence++;
- 	dev->checkpointCurrentChunk++;
--	if(dev->checkpointCurrentChunk >= dev->nChunksPerBlock){
-+	if (dev->checkpointCurrentChunk >= dev->nChunksPerBlock) {
- 		dev->checkpointCurrentChunk = 0;
- 		dev->checkpointCurrentBlock = -1;
- 	}
--	memset(dev->checkpointBuffer,0,dev->nDataBytesPerChunk);
-+	memset(dev->checkpointBuffer, 0, dev->nDataBytesPerChunk);
- 
- 	return 1;
- }
- 
- 
--int yaffs_CheckpointWrite(yaffs_Device *dev,const void *data, int nBytes)
-+int yaffs_CheckpointWrite(yaffs_Device *dev, const void *data, int nBytes)
- {
--	int i=0;
-+	int i = 0;
- 	int ok = 1;
- 
- 
-@@ -250,17 +244,14 @@ int yaffs_CheckpointWrite(yaffs_Device *
- 
- 
- 
--	if(!dev->checkpointBuffer)
-+	if (!dev->checkpointBuffer)
- 		return 0;
- 
--	if(!dev->checkpointOpenForWrite)
-+	if (!dev->checkpointOpenForWrite)
- 		return -1;
- 
--	while(i < nBytes && ok) {
--
--
--
--		dev->checkpointBuffer[dev->checkpointByteOffset] = *dataBytes ;
-+	while (i < nBytes && ok) {
-+		dev->checkpointBuffer[dev->checkpointByteOffset] = *dataBytes;
- 		dev->checkpointSum += *dataBytes;
- 		dev->checkpointXor ^= *dataBytes;
- 
-@@ -270,18 +261,17 @@ int yaffs_CheckpointWrite(yaffs_Device *
- 		dev->checkpointByteCount++;
- 
- 
--		if(dev->checkpointByteOffset < 0 ||
-+		if (dev->checkpointByteOffset < 0 ||
- 		   dev->checkpointByteOffset >= dev->nDataBytesPerChunk)
- 			ok = yaffs_CheckpointFlushBuffer(dev);
--
- 	}
- 
--	return 	i;
-+	return i;
- }
- 
- int yaffs_CheckpointRead(yaffs_Device *dev, void *data, int nBytes)
- {
--	int i=0;
-+	int i = 0;
- 	int ok = 1;
- 	yaffs_ExtendedTags tags;
- 
-@@ -291,52 +281,54 @@ int yaffs_CheckpointRead(yaffs_Device *d
- 
- 	__u8 *dataBytes = (__u8 *)data;
- 
--	if(!dev->checkpointBuffer)
-+	if (!dev->checkpointBuffer)
- 		return 0;
- 
--	if(dev->checkpointOpenForWrite)
-+	if (dev->checkpointOpenForWrite)
- 		return -1;
- 
--	while(i < nBytes && ok) {
-+	while (i < nBytes && ok) {
- 
- 
--		if(dev->checkpointByteOffset < 0 ||
--		   dev->checkpointByteOffset >= dev->nDataBytesPerChunk) {
-+		if (dev->checkpointByteOffset < 0 ||
-+			dev->checkpointByteOffset >= dev->nDataBytesPerChunk) {
- 
--		   	if(dev->checkpointCurrentBlock < 0){
-+			if (dev->checkpointCurrentBlock < 0) {
- 				yaffs_CheckpointFindNextCheckpointBlock(dev);
- 				dev->checkpointCurrentChunk = 0;
- 			}
- 
--			if(dev->checkpointCurrentBlock < 0)
-+			if (dev->checkpointCurrentBlock < 0)
- 				ok = 0;
- 			else {
--
--				chunk = dev->checkpointCurrentBlock * dev->nChunksPerBlock +
--				          dev->checkpointCurrentChunk;
-+				chunk = dev->checkpointCurrentBlock *
-+					dev->nChunksPerBlock +
-+					dev->checkpointCurrentChunk;
- 
- 				realignedChunk = chunk - dev->chunkOffset;
- 
--	   			/* read in the next chunk */
--	   			/* printf("read checkpoint page %d\n",dev->checkpointPage); */
--				dev->readChunkWithTagsFromNAND(dev, realignedChunk,
--							       dev->checkpointBuffer,
--							      &tags);
--
--				if(tags.chunkId != (dev->checkpointPageSequence + 1) ||
--				   tags.sequenceNumber != YAFFS_SEQUENCE_CHECKPOINT_DATA)
--				   ok = 0;
-+				/* read in the next chunk */
-+				/* printf("read checkpoint page %d\n",dev->checkpointPage); */
-+				dev->readChunkWithTagsFromNAND(dev,
-+						realignedChunk,
-+						dev->checkpointBuffer,
-+						&tags);
-+
-+				if (tags.chunkId != (dev->checkpointPageSequence + 1) ||
-+					tags.eccResult > YAFFS_ECC_RESULT_FIXED ||
-+					tags.sequenceNumber != YAFFS_SEQUENCE_CHECKPOINT_DATA)
-+					ok = 0;
- 
- 				dev->checkpointByteOffset = 0;
- 				dev->checkpointPageSequence++;
- 				dev->checkpointCurrentChunk++;
- 
--				if(dev->checkpointCurrentChunk >= dev->nChunksPerBlock)
-+				if (dev->checkpointCurrentChunk >= dev->nChunksPerBlock)
- 					dev->checkpointCurrentBlock = -1;
- 			}
- 		}
- 
--		if(ok){
-+		if (ok) {
- 			*dataBytes = dev->checkpointBuffer[dev->checkpointByteOffset];
- 			dev->checkpointSum += *dataBytes;
- 			dev->checkpointXor ^= *dataBytes;
-@@ -353,17 +345,17 @@ int yaffs_CheckpointRead(yaffs_Device *d
- int yaffs_CheckpointClose(yaffs_Device *dev)
- {
- 
--	if(dev->checkpointOpenForWrite){
--		if(dev->checkpointByteOffset != 0)
-+	if (dev->checkpointOpenForWrite) {
-+		if (dev->checkpointByteOffset != 0)
- 			yaffs_CheckpointFlushBuffer(dev);
- 	} else {
- 		int i;
--		for(i = 0; i < dev->blocksInCheckpoint && dev->checkpointBlockList[i] >= 0; i++){
--			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,dev->checkpointBlockList[i]);
--			if(bi->blockState == YAFFS_BLOCK_STATE_EMPTY)
-+		for (i = 0; i < dev->blocksInCheckpoint && dev->checkpointBlockList[i] >= 0; i++) {
-+			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, dev->checkpointBlockList[i]);
-+			if (bi->blockState == YAFFS_BLOCK_STATE_EMPTY)
- 				bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT;
- 			else {
--				// Todo this looks odd...
-+				/* Todo this looks odd... */
- 			}
- 		}
- 		YFREE(dev->checkpointBlockList);
-@@ -374,27 +366,25 @@ int yaffs_CheckpointClose(yaffs_Device *
- 	dev->nErasedBlocks -= dev->blocksInCheckpoint;
- 
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint byte count %d" TENDSTR),
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint byte count %d" TENDSTR),
- 			dev->checkpointByteCount));
- 
--	if(dev->checkpointBuffer){
-+	if (dev->checkpointBuffer) {
- 		/* free the buffer */
- 		YFREE(dev->checkpointBuffer);
- 		dev->checkpointBuffer = NULL;
- 		return 1;
--	}
--	else
-+	} else
- 		return 0;
--
- }
- 
- int yaffs_CheckpointInvalidateStream(yaffs_Device *dev)
- {
- 	/* Erase the first checksum block */
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint invalidate"TENDSTR)));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint invalidate"TENDSTR)));
- 
--	if(!yaffs_CheckpointSpaceOk(dev))
-+	if (!yaffs_CheckpointSpaceOk(dev))
- 		return 0;
- 
- 	return yaffs_CheckpointErase(dev);
---- a/fs/yaffs2/yaffs_checkptrw.h
-+++ b/fs/yaffs2/yaffs_checkptrw.h
-@@ -20,9 +20,9 @@
- 
- int yaffs_CheckpointOpen(yaffs_Device *dev, int forWriting);
- 
--int yaffs_CheckpointWrite(yaffs_Device *dev,const void *data, int nBytes);
-+int yaffs_CheckpointWrite(yaffs_Device *dev, const void *data, int nBytes);
- 
--int yaffs_CheckpointRead(yaffs_Device *dev,void *data, int nBytes);
-+int yaffs_CheckpointRead(yaffs_Device *dev, void *data, int nBytes);
- 
- int yaffs_GetCheckpointSum(yaffs_Device *dev, __u32 *sum);
- 
---- a/fs/yaffs2/yaffs_ecc.c
-+++ b/fs/yaffs2/yaffs_ecc.c
-@@ -29,7 +29,7 @@
-  */
- 
- const char *yaffs_ecc_c_version =
--    "$Id: yaffs_ecc.c,v 1.9 2007-02-14 01:09:06 wookey Exp $";
-+	"$Id: yaffs_ecc.c,v 1.11 2009-03-06 17:20:50 wookey Exp $";
- 
- #include "yportenv.h"
- 
-@@ -109,12 +109,10 @@ void yaffs_ECCCalculate(const unsigned c
- 		b = column_parity_table[*data++];
- 		col_parity ^= b;
- 
--		if (b & 0x01)	// odd number of bits in the byte
--		{
-+		if (b & 0x01) {		/* odd number of bits in the byte */
- 			line_parity ^= i;
- 			line_parity_prime ^= ~i;
- 		}
--
- 	}
- 
- 	ecc[2] = (~col_parity) | 0x03;
-@@ -158,7 +156,7 @@ void yaffs_ECCCalculate(const unsigned c
- 	ecc[0] = ~t;
- 
- #ifdef CONFIG_YAFFS_ECC_WRONG_ORDER
--	// Swap the bytes into the wrong order
-+	/* Swap the bytes into the wrong order */
- 	t = ecc[0];
- 	ecc[0] = ecc[1];
- 	ecc[1] = t;
-@@ -189,7 +187,7 @@ int yaffs_ECCCorrect(unsigned char *data
- 		unsigned bit;
- 
- #ifdef CONFIG_YAFFS_ECC_WRONG_ORDER
--		// swap the bytes to correct for the wrong order
-+		/* swap the bytes to correct for the wrong order */
- 		unsigned char t;
- 
- 		t = d0;
-@@ -251,7 +249,7 @@ int yaffs_ECCCorrect(unsigned char *data
-  * ECCxxxOther does ECC calcs on arbitrary n bytes of data
-  */
- void yaffs_ECCCalculateOther(const unsigned char *data, unsigned nBytes,
--			     yaffs_ECCOther * eccOther)
-+				yaffs_ECCOther *eccOther)
- {
- 	unsigned int i;
- 
-@@ -278,8 +276,8 @@ void yaffs_ECCCalculateOther(const unsig
- }
- 
- int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes,
--			  yaffs_ECCOther * read_ecc,
--			  const yaffs_ECCOther * test_ecc)
-+			yaffs_ECCOther *read_ecc,
-+			const yaffs_ECCOther *test_ecc)
- {
- 	unsigned char cDelta;	/* column parity delta */
- 	unsigned lDelta;	/* line parity delta */
-@@ -294,8 +292,7 @@ int yaffs_ECCCorrectOther(unsigned char
- 		return 0; /* no error */
- 
- 	if (lDelta == ~lDeltaPrime &&
--	    (((cDelta ^ (cDelta >> 1)) & 0x15) == 0x15))
--	{
-+	    (((cDelta ^ (cDelta >> 1)) & 0x15) == 0x15)) {
- 		/* Single bit (recoverable) error in data */
- 
- 		bit = 0;
-@@ -307,7 +304,7 @@ int yaffs_ECCCorrectOther(unsigned char
- 		if (cDelta & 0x02)
- 			bit |= 0x01;
- 
--		if(lDelta >= nBytes)
-+		if (lDelta >= nBytes)
- 			return -1;
- 
- 		data[lDelta] ^= (1 << bit);
-@@ -316,7 +313,7 @@ int yaffs_ECCCorrectOther(unsigned char
- 	}
- 
- 	if ((yaffs_CountBits32(lDelta) + yaffs_CountBits32(lDeltaPrime) +
--	     yaffs_CountBits(cDelta)) == 1) {
-+			yaffs_CountBits(cDelta)) == 1) {
- 		/* Reccoverable error in ecc */
- 
- 		*read_ecc = *test_ecc;
-@@ -326,6 +323,4 @@ int yaffs_ECCCorrectOther(unsigned char
- 	/* Unrecoverable error */
- 
- 	return -1;
--
- }
--
---- a/fs/yaffs2/yaffs_ecc.h
-+++ b/fs/yaffs2/yaffs_ecc.h
-@@ -13,15 +13,15 @@
-  * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
-  */
- 
-- /*
--  * This code implements the ECC algorithm used in SmartMedia.
--  *
--  * The ECC comprises 22 bits of parity information and is stuffed into 3 bytes.
--  * The two unused bit are set to 1.
--  * The ECC can correct single bit errors in a 256-byte page of data. Thus, two such ECC
--  * blocks are used on a 512-byte NAND page.
--  *
--  */
-+/*
-+ * This code implements the ECC algorithm used in SmartMedia.
-+ *
-+ * The ECC comprises 22 bits of parity information and is stuffed into 3 bytes.
-+ * The two unused bit are set to 1.
-+ * The ECC can correct single bit errors in a 256-byte page of data. Thus, two such ECC
-+ * blocks are used on a 512-byte NAND page.
-+ *
-+ */
- 
- #ifndef __YAFFS_ECC_H__
- #define __YAFFS_ECC_H__
-@@ -34,11 +34,11 @@ typedef struct {
- 
- void yaffs_ECCCalculate(const unsigned char *data, unsigned char *ecc);
- int yaffs_ECCCorrect(unsigned char *data, unsigned char *read_ecc,
--		     const unsigned char *test_ecc);
-+		const unsigned char *test_ecc);
- 
- void yaffs_ECCCalculateOther(const unsigned char *data, unsigned nBytes,
--			     yaffs_ECCOther * ecc);
-+			yaffs_ECCOther *ecc);
- int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes,
--			  yaffs_ECCOther * read_ecc,
--			  const yaffs_ECCOther * test_ecc);
-+			yaffs_ECCOther *read_ecc,
-+			const yaffs_ECCOther *test_ecc);
- #endif
---- a/fs/yaffs2/yaffs_fs.c
-+++ b/fs/yaffs2/yaffs_fs.c
-@@ -1,7 +1,7 @@
- /*
-  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
-  *
-- * Copyright (C) 2002-2007 Aleph One Ltd.
-+ * Copyright (C) 2002-2009 Aleph One Ltd.
-  *   for Toby Churchill Ltd and Brightstar Engineering
-  *
-  * Created by Charles Manning <charles@aleph1.co.uk>
-@@ -32,18 +32,17 @@
-  */
- 
- const char *yaffs_fs_c_version =
--    "$Id: yaffs_fs.c,v 1.63 2007-09-19 20:35:40 imcd Exp $";
-+    "$Id: yaffs_fs.c,v 1.79 2009-03-17 01:12:00 wookey Exp $";
- extern const char *yaffs_guts_c_version;
- 
- #include <linux/version.h>
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
- #include <linux/config.h>
- #endif
- #include <linux/kernel.h>
- #include <linux/module.h>
- #include <linux/slab.h>
- #include <linux/init.h>
--#include <linux/list.h>
- #include <linux/fs.h>
- #include <linux/proc_fs.h>
- #include <linux/smp_lock.h>
-@@ -53,10 +52,12 @@ extern const char *yaffs_guts_c_version;
- #include <linux/string.h>
- #include <linux/ctype.h>
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#include "asm/div64.h"
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 
- #include <linux/statfs.h>	/* Added NCB 15-8-2003 */
--#include <asm/statfs.h>
-+#include <linux/statfs.h>
- #define UnlockPage(p) unlock_page(p)
- #define Page_Uptodate(page)	test_bit(PG_uptodate, &(page)->flags)
- 
-@@ -69,22 +70,45 @@ extern const char *yaffs_guts_c_version;
- #define	BDEVNAME_SIZE		0
- #define	yaffs_devname(sb, buf)	kdevname(sb->s_dev)
- 
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0))
- /* added NCB 26/5/2006 for 2.4.25-vrs2-tcl1 kernel */
- #define __user
- #endif
- 
- #endif
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26))
-+#define YPROC_ROOT  (&proc_root)
-+#else
-+#define YPROC_ROOT  NULL
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- #define WRITE_SIZE_STR "writesize"
--#define WRITE_SIZE(mtd) (mtd)->writesize
-+#define WRITE_SIZE(mtd) ((mtd)->writesize)
- #else
- #define WRITE_SIZE_STR "oobblock"
--#define WRITE_SIZE(mtd) (mtd)->oobblock
-+#define WRITE_SIZE(mtd) ((mtd)->oobblock)
- #endif
- 
--#include <asm/uaccess.h>
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 27))
-+#define YAFFS_USE_WRITE_BEGIN_END 1
-+#else
-+#define YAFFS_USE_WRITE_BEGIN_END 0
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 28))
-+static uint32_t YCALCBLOCKS(uint64_t partition_size, uint32_t block_size)
-+{
-+	uint64_t result = partition_size;
-+	do_div(result, block_size);
-+	return (uint32_t)result;
-+}
-+#else
-+#define YCALCBLOCKS(s, b) ((s)/(b))
-+#endif
-+
-+#include <linux/uaccess.h>
- 
- #include "yportenv.h"
- #include "yaffs_guts.h"
-@@ -96,28 +120,44 @@ extern const char *yaffs_guts_c_version;
- 
- unsigned int yaffs_traceMask = YAFFS_TRACE_BAD_BLOCKS;
- unsigned int yaffs_wr_attempts = YAFFS_WR_ATTEMPTS;
-+unsigned int yaffs_auto_checkpoint = 1;
- 
- /* Module Parameters */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
--module_param(yaffs_traceMask,uint,0644);
--module_param(yaffs_wr_attempts,uint,0644);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+module_param(yaffs_traceMask, uint, 0644);
-+module_param(yaffs_wr_attempts, uint, 0644);
-+module_param(yaffs_auto_checkpoint, uint, 0644);
-+#else
-+MODULE_PARM(yaffs_traceMask, "i");
-+MODULE_PARM(yaffs_wr_attempts, "i");
-+MODULE_PARM(yaffs_auto_checkpoint, "i");
-+#endif
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25))
-+/* use iget and read_inode */
-+#define Y_IGET(sb, inum) iget((sb), (inum))
-+static void yaffs_read_inode(struct inode *inode);
-+
- #else
--MODULE_PARM(yaffs_traceMask,"i");
--MODULE_PARM(yaffs_wr_attempts,"i");
-+/* Call local equivalent */
-+#define YAFFS_USE_OWN_IGET
-+#define Y_IGET(sb, inum) yaffs_iget((sb), (inum))
-+
-+static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino);
- #endif
- 
- /*#define T(x) printk x */
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18))
--#define yaffs_InodeToObjectLV(iptr) (iptr)->i_private
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18))
-+#define yaffs_InodeToObjectLV(iptr) ((iptr)->i_private)
- #else
--#define yaffs_InodeToObjectLV(iptr) (iptr)->u.generic_ip
-+#define yaffs_InodeToObjectLV(iptr) ((iptr)->u.generic_ip)
- #endif
- 
- #define yaffs_InodeToObject(iptr) ((yaffs_Object *)(yaffs_InodeToObjectLV(iptr)))
- #define yaffs_DentryToObject(dptr) yaffs_InodeToObject((dptr)->d_inode)
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- #define yaffs_SuperToDevice(sb)	((yaffs_Device *)sb->s_fs_info)
- #else
- #define yaffs_SuperToDevice(sb)	((yaffs_Device *)sb->u.generic_sbp)
-@@ -126,47 +166,49 @@ MODULE_PARM(yaffs_wr_attempts,"i");
- static void yaffs_put_super(struct super_block *sb);
- 
- static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
--				loff_t * pos);
-+				loff_t *pos);
-+static ssize_t yaffs_hold_space(struct file *f);
-+static void yaffs_release_space(struct file *f);
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_file_flush(struct file *file, fl_owner_t id);
- #else
- static int yaffs_file_flush(struct file *file);
- #endif
- 
- static int yaffs_sync_object(struct file *file, struct dentry *dentry,
--			     int datasync);
-+				int datasync);
- 
- static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir);
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
- 			struct nameidata *n);
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
--				   struct nameidata *n);
-+					struct nameidata *n);
- #else
- static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode);
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry);
- #endif
- static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
--		      struct dentry *dentry);
-+			struct dentry *dentry);
- static int yaffs_unlink(struct inode *dir, struct dentry *dentry);
- static int yaffs_symlink(struct inode *dir, struct dentry *dentry,
--			 const char *symname);
-+			const char *symname);
- static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode);
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
--		       dev_t dev);
-+			dev_t dev);
- #else
- static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
--		       int dev);
-+			int dev);
- #endif
- static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry,
- 			struct inode *new_dir, struct dentry *new_dentry);
- static int yaffs_setattr(struct dentry *dentry, struct iattr *attr);
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_sync_fs(struct super_block *sb, int wait);
- static void yaffs_write_super(struct super_block *sb);
- #else
-@@ -174,33 +216,47 @@ static int yaffs_sync_fs(struct super_bl
- static int yaffs_write_super(struct super_block *sb);
- #endif
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf);
--#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf);
- #else
- static int yaffs_statfs(struct super_block *sb, struct statfs *buf);
- #endif
--static void yaffs_read_inode(struct inode *inode);
- 
-+#ifdef YAFFS_HAS_PUT_INODE
- static void yaffs_put_inode(struct inode *inode);
-+#endif
-+
- static void yaffs_delete_inode(struct inode *);
- static void yaffs_clear_inode(struct inode *);
- 
- static int yaffs_readpage(struct file *file, struct page *page);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_writepage(struct page *page, struct writeback_control *wbc);
- #else
- static int yaffs_writepage(struct page *page);
- #endif
-+
-+
-+#if (YAFFS_USE_WRITE_BEGIN_END != 0)
-+static int yaffs_write_begin(struct file *filp, struct address_space *mapping,
-+				loff_t pos, unsigned len, unsigned flags,
-+				struct page **pagep, void **fsdata);
-+static int yaffs_write_end(struct file *filp, struct address_space *mapping,
-+				loff_t pos, unsigned len, unsigned copied,
-+				struct page *pg, void *fsdadata);
-+#else
- static int yaffs_prepare_write(struct file *f, struct page *pg,
--			       unsigned offset, unsigned to);
-+				unsigned offset, unsigned to);
- static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
--			      unsigned to);
-+				unsigned to);
- 
--static int yaffs_readlink(struct dentry *dentry, char __user * buffer,
--			  int buflen);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
-+#endif
-+
-+static int yaffs_readlink(struct dentry *dentry, char __user *buffer,
-+				int buflen);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
- static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
- #else
- static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
-@@ -209,12 +265,17 @@ static int yaffs_follow_link(struct dent
- static struct address_space_operations yaffs_file_address_operations = {
- 	.readpage = yaffs_readpage,
- 	.writepage = yaffs_writepage,
-+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-+	.write_begin = yaffs_write_begin,
-+	.write_end = yaffs_write_end,
-+#else
- 	.prepare_write = yaffs_prepare_write,
- 	.commit_write = yaffs_commit_write,
-+#endif
- };
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,22))
--static struct file_operations yaffs_file_operations = {
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 22))
-+static const struct file_operations yaffs_file_operations = {
- 	.read = do_sync_read,
- 	.write = do_sync_write,
- 	.aio_read = generic_file_aio_read,
-@@ -224,11 +285,12 @@ static struct file_operations yaffs_file
- 	.fsync = yaffs_sync_object,
- 	.splice_read = generic_file_splice_read,
- 	.splice_write = generic_file_splice_write,
-+	.llseek = generic_file_llseek,
- };
- 
--#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18))
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18))
- 
--static struct file_operations yaffs_file_operations = {
-+static const struct file_operations yaffs_file_operations = {
- 	.read = do_sync_read,
- 	.write = do_sync_write,
- 	.aio_read = generic_file_aio_read,
-@@ -241,29 +303,29 @@ static struct file_operations yaffs_file
- 
- #else
- 
--static struct file_operations yaffs_file_operations = {
-+static const struct file_operations yaffs_file_operations = {
- 	.read = generic_file_read,
- 	.write = generic_file_write,
- 	.mmap = generic_file_mmap,
- 	.flush = yaffs_file_flush,
- 	.fsync = yaffs_sync_object,
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 	.sendfile = generic_file_sendfile,
- #endif
- };
- #endif
- 
--static struct inode_operations yaffs_file_inode_operations = {
-+static const struct inode_operations yaffs_file_inode_operations = {
- 	.setattr = yaffs_setattr,
- };
- 
--static struct inode_operations yaffs_symlink_inode_operations = {
-+static const struct inode_operations yaffs_symlink_inode_operations = {
- 	.readlink = yaffs_readlink,
- 	.follow_link = yaffs_follow_link,
- 	.setattr = yaffs_setattr,
- };
- 
--static struct inode_operations yaffs_dir_inode_operations = {
-+static const struct inode_operations yaffs_dir_inode_operations = {
- 	.create = yaffs_create,
- 	.lookup = yaffs_lookup,
- 	.link = yaffs_link,
-@@ -276,16 +338,21 @@ static struct inode_operations yaffs_dir
- 	.setattr = yaffs_setattr,
- };
- 
--static struct file_operations yaffs_dir_operations = {
-+static const struct file_operations yaffs_dir_operations = {
- 	.read = generic_read_dir,
- 	.readdir = yaffs_readdir,
- 	.fsync = yaffs_sync_object,
- };
- 
--static struct super_operations yaffs_super_ops = {
-+static const struct super_operations yaffs_super_ops = {
- 	.statfs = yaffs_statfs,
-+
-+#ifndef YAFFS_USE_OWN_IGET
- 	.read_inode = yaffs_read_inode,
-+#endif
-+#ifdef YAFFS_HAS_PUT_INODE
- 	.put_inode = yaffs_put_inode,
-+#endif
- 	.put_super = yaffs_put_super,
- 	.delete_inode = yaffs_delete_inode,
- 	.clear_inode = yaffs_clear_inode,
-@@ -293,22 +360,21 @@ static struct super_operations yaffs_sup
- 	.write_super = yaffs_write_super,
- };
- 
--static void yaffs_GrossLock(yaffs_Device * dev)
-+static void yaffs_GrossLock(yaffs_Device *dev)
- {
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs locking\n"));
--
-+	T(YAFFS_TRACE_OS, ("yaffs locking %p\n", current));
- 	down(&dev->grossLock);
-+	T(YAFFS_TRACE_OS, ("yaffs locked %p\n", current));
- }
- 
--static void yaffs_GrossUnlock(yaffs_Device * dev)
-+static void yaffs_GrossUnlock(yaffs_Device *dev)
- {
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs unlocking\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs unlocking %p\n", current));
- 	up(&dev->grossLock);
--
- }
- 
--static int yaffs_readlink(struct dentry *dentry, char __user * buffer,
--			  int buflen)
-+static int yaffs_readlink(struct dentry *dentry, char __user *buffer,
-+			int buflen)
- {
- 	unsigned char *alias;
- 	int ret;
-@@ -329,7 +395,7 @@ static int yaffs_readlink(struct dentry
- 	return ret;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
- static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
- #else
- static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
-@@ -345,32 +411,31 @@ static int yaffs_follow_link(struct dent
- 
- 	yaffs_GrossUnlock(dev);
- 
--	if (!alias)
--        {
-+	if (!alias) {
- 		ret = -ENOMEM;
- 		goto out;
--        }
-+	}
- 
- 	ret = vfs_follow_link(nd, alias);
- 	kfree(alias);
- out:
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
--	return ERR_PTR (ret);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
-+	return ERR_PTR(ret);
- #else
- 	return ret;
- #endif
- }
- 
- struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,
--			      yaffs_Object * obj);
-+				yaffs_Object *obj);
- 
- /*
-  * Lookup is used to find objects in the fs
-  */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
--				   struct nameidata *n)
-+				struct nameidata *n)
- #else
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry)
- #endif
-@@ -383,12 +448,11 @@ static struct dentry *yaffs_lookup(struc
- 	yaffs_GrossLock(dev);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_lookup for %d:%s\n",
--	   yaffs_InodeToObject(dir)->objectId, dentry->d_name.name));
-+		("yaffs_lookup for %d:%s\n",
-+		yaffs_InodeToObject(dir)->objectId, dentry->d_name.name));
- 
--	obj =
--	    yaffs_FindObjectByName(yaffs_InodeToObject(dir),
--				   dentry->d_name.name);
-+	obj = yaffs_FindObjectByName(yaffs_InodeToObject(dir),
-+					dentry->d_name.name);
- 
- 	obj = yaffs_GetEquivalentObject(obj);	/* in case it was a hardlink */
- 
-@@ -397,13 +461,13 @@ static struct dentry *yaffs_lookup(struc
- 
- 	if (obj) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_lookup found %d\n", obj->objectId));
-+			("yaffs_lookup found %d\n", obj->objectId));
- 
- 		inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
- 
- 		if (inode) {
- 			T(YAFFS_TRACE_OS,
--			  (KERN_DEBUG "yaffs_loookup dentry \n"));
-+				("yaffs_loookup dentry \n"));
- /* #if 0 asserted by NCB for 2.5/6 compatability - falls through to
-  * d_add even if NULL inode */
- #if 0
-@@ -416,7 +480,7 @@ static struct dentry *yaffs_lookup(struc
- 		}
- 
- 	} else {
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_lookup not found\n"));
-+		T(YAFFS_TRACE_OS, ("yaffs_lookup not found\n"));
- 
- 	}
- 
-@@ -425,20 +489,22 @@ static struct dentry *yaffs_lookup(struc
- 	d_add(dentry, inode);
- 
- 	return NULL;
--	/*      return (ERR_PTR(-EIO)); */
--
- }
- 
-+
-+#ifdef YAFFS_HAS_PUT_INODE
-+
- /* For now put inode is just for debugging
-  * Put inode is called when the inode **structure** is put.
-  */
- static void yaffs_put_inode(struct inode *inode)
- {
- 	T(YAFFS_TRACE_OS,
--	  ("yaffs_put_inode: ino %d, count %d\n", (int)inode->i_ino,
--	   atomic_read(&inode->i_count)));
-+		("yaffs_put_inode: ino %d, count %d\n", (int)inode->i_ino,
-+		atomic_read(&inode->i_count)));
- 
- }
-+#endif
- 
- /* clear is called to tell the fs to release any per-inode data it holds */
- static void yaffs_clear_inode(struct inode *inode)
-@@ -449,9 +515,9 @@ static void yaffs_clear_inode(struct ino
- 	obj = yaffs_InodeToObject(inode);
- 
- 	T(YAFFS_TRACE_OS,
--	  ("yaffs_clear_inode: ino %d, count %d %s\n", (int)inode->i_ino,
--	   atomic_read(&inode->i_count),
--	   obj ? "object exists" : "null object"));
-+		("yaffs_clear_inode: ino %d, count %d %s\n", (int)inode->i_ino,
-+		atomic_read(&inode->i_count),
-+		obj ? "object exists" : "null object"));
- 
- 	if (obj) {
- 		dev = obj->myDev;
-@@ -486,23 +552,23 @@ static void yaffs_delete_inode(struct in
- 	yaffs_Device *dev;
- 
- 	T(YAFFS_TRACE_OS,
--	  ("yaffs_delete_inode: ino %d, count %d %s\n", (int)inode->i_ino,
--	   atomic_read(&inode->i_count),
--	   obj ? "object exists" : "null object"));
-+		("yaffs_delete_inode: ino %d, count %d %s\n", (int)inode->i_ino,
-+		atomic_read(&inode->i_count),
-+		obj ? "object exists" : "null object"));
- 
- 	if (obj) {
- 		dev = obj->myDev;
- 		yaffs_GrossLock(dev);
--		yaffs_DeleteFile(obj);
-+		yaffs_DeleteObject(obj);
- 		yaffs_GrossUnlock(dev);
- 	}
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
--        truncate_inode_pages (&inode->i_data, 0);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
-+	truncate_inode_pages(&inode->i_data, 0);
- #endif
- 	clear_inode(inode);
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_file_flush(struct file *file, fl_owner_t id)
- #else
- static int yaffs_file_flush(struct file *file)
-@@ -513,8 +579,8 @@ static int yaffs_file_flush(struct file
- 	yaffs_Device *dev = obj->myDev;
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_file_flush object %d (%s)\n", obj->objectId,
--	   obj->dirty ? "dirty" : "clean"));
-+		("yaffs_file_flush object %d (%s)\n", obj->objectId,
-+		obj->dirty ? "dirty" : "clean"));
- 
- 	yaffs_GrossLock(dev);
- 
-@@ -535,15 +601,15 @@ static int yaffs_readpage_nolock(struct
- 
- 	yaffs_Device *dev;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_readpage at %08x, size %08x\n",
--			   (unsigned)(pg->index << PAGE_CACHE_SHIFT),
--			   (unsigned)PAGE_CACHE_SIZE));
-+	T(YAFFS_TRACE_OS, ("yaffs_readpage at %08x, size %08x\n",
-+			(unsigned)(pg->index << PAGE_CACHE_SHIFT),
-+			(unsigned)PAGE_CACHE_SIZE));
- 
- 	obj = yaffs_DentryToObject(f->f_dentry);
- 
- 	dev = obj->myDev;
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 	BUG_ON(!PageLocked(pg));
- #else
- 	if (!PageLocked(pg))
-@@ -555,9 +621,9 @@ static int yaffs_readpage_nolock(struct
- 
- 	yaffs_GrossLock(dev);
- 
--	ret =
--	    yaffs_ReadDataFromFile(obj, pg_buf, pg->index << PAGE_CACHE_SHIFT,
--				   PAGE_CACHE_SIZE);
-+	ret = yaffs_ReadDataFromFile(obj, pg_buf,
-+				pg->index << PAGE_CACHE_SHIFT,
-+				PAGE_CACHE_SIZE);
- 
- 	yaffs_GrossUnlock(dev);
- 
-@@ -575,7 +641,7 @@ static int yaffs_readpage_nolock(struct
- 	flush_dcache_page(pg);
- 	kunmap(pg);
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_readpage done\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_readpage done\n"));
- 	return ret;
- }
- 
-@@ -593,7 +659,7 @@ static int yaffs_readpage(struct file *f
- 
- /* writepage inspired by/stolen from smbfs */
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_writepage(struct page *page, struct writeback_control *wbc)
- #else
- static int yaffs_writepage(struct page *page)
-@@ -616,12 +682,11 @@ static int yaffs_writepage(struct page *
- 
- 	if (offset > inode->i_size) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG
--		   "yaffs_writepage at %08x, inode size = %08x!!!\n",
--		   (unsigned)(page->index << PAGE_CACHE_SHIFT),
--		   (unsigned)inode->i_size));
-+			("yaffs_writepage at %08x, inode size = %08x!!!\n",
-+			(unsigned)(page->index << PAGE_CACHE_SHIFT),
-+			(unsigned)inode->i_size));
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "                -> don't care!!\n"));
-+			("                -> don't care!!\n"));
- 		unlock_page(page);
- 		return 0;
- 	}
-@@ -629,11 +694,10 @@ static int yaffs_writepage(struct page *
- 	end_index = inode->i_size >> PAGE_CACHE_SHIFT;
- 
- 	/* easy case */
--	if (page->index < end_index) {
-+	if (page->index < end_index)
- 		nBytes = PAGE_CACHE_SIZE;
--	} else {
-+	else
- 		nBytes = inode->i_size & (PAGE_CACHE_SIZE - 1);
--	}
- 
- 	get_page(page);
- 
-@@ -643,19 +707,18 @@ static int yaffs_writepage(struct page *
- 	yaffs_GrossLock(obj->myDev);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_writepage at %08x, size %08x\n",
--	   (unsigned)(page->index << PAGE_CACHE_SHIFT), nBytes));
-+		("yaffs_writepage at %08x, size %08x\n",
-+		(unsigned)(page->index << PAGE_CACHE_SHIFT), nBytes));
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "writepag0: obj = %05x, ino = %05x\n",
--	   (int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
-+		("writepag0: obj = %05x, ino = %05x\n",
-+		(int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
- 
--	nWritten =
--	    yaffs_WriteDataToFile(obj, buffer, page->index << PAGE_CACHE_SHIFT,
--				  nBytes, 0);
-+	nWritten = yaffs_WriteDataToFile(obj, buffer,
-+			page->index << PAGE_CACHE_SHIFT, nBytes, 0);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "writepag1: obj = %05x, ino = %05x\n",
--	   (int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
-+		("writepag1: obj = %05x, ino = %05x\n",
-+		(int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
- 
- 	yaffs_GrossUnlock(obj->myDev);
- 
-@@ -667,100 +730,207 @@ static int yaffs_writepage(struct page *
- 	return (nWritten == nBytes) ? 0 : -ENOSPC;
- }
- 
-+
-+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-+static int yaffs_write_begin(struct file *filp, struct address_space *mapping,
-+				loff_t pos, unsigned len, unsigned flags,
-+				struct page **pagep, void **fsdata)
-+{
-+	struct page *pg = NULL;
-+	pgoff_t index = pos >> PAGE_CACHE_SHIFT;
-+	uint32_t offset = pos & (PAGE_CACHE_SIZE - 1);
-+	uint32_t to = offset + len;
-+
-+	int ret = 0;
-+	int space_held = 0;
-+
-+	T(YAFFS_TRACE_OS, ("start yaffs_write_begin\n"));
-+	/* Get a page */
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 28)
-+	pg = grab_cache_page_write_begin(mapping, index, flags);
-+#else
-+	pg = __grab_cache_page(mapping, index);
-+#endif
-+
-+	*pagep = pg;
-+	if (!pg) {
-+		ret =  -ENOMEM;
-+		goto out;
-+	}
-+	/* Get fs space */
-+	space_held = yaffs_hold_space(filp);
-+
-+	if (!space_held) {
-+		ret = -ENOSPC;
-+		goto out;
-+	}
-+
-+	/* Update page if required */
-+
-+	if (!Page_Uptodate(pg) && (offset || to < PAGE_CACHE_SIZE))
-+		ret = yaffs_readpage_nolock(filp, pg);
-+
-+	if (ret)
-+		goto out;
-+
-+	/* Happy path return */
-+	T(YAFFS_TRACE_OS, ("end yaffs_write_begin - ok\n"));
-+
-+	return 0;
-+
-+out:
-+	T(YAFFS_TRACE_OS, ("end yaffs_write_begin fail returning %d\n", ret));
-+	if (space_held)
-+		yaffs_release_space(filp);
-+	if (pg) {
-+		unlock_page(pg);
-+		page_cache_release(pg);
-+	}
-+	return ret;
-+}
-+
-+#else
-+
- static int yaffs_prepare_write(struct file *f, struct page *pg,
--			       unsigned offset, unsigned to)
-+				unsigned offset, unsigned to)
- {
-+	T(YAFFS_TRACE_OS, ("yaffs_prepair_write\n"));
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_prepair_write\n"));
- 	if (!Page_Uptodate(pg) && (offset || to < PAGE_CACHE_SIZE))
- 		return yaffs_readpage_nolock(f, pg);
--
- 	return 0;
-+}
-+#endif
-+
-+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-+static int yaffs_write_end(struct file *filp, struct address_space *mapping,
-+				loff_t pos, unsigned len, unsigned copied,
-+				struct page *pg, void *fsdadata)
-+{
-+	int ret = 0;
-+	void *addr, *kva;
-+	uint32_t offset_into_page = pos & (PAGE_CACHE_SIZE - 1);
-+
-+	kva = kmap(pg);
-+	addr = kva + offset_into_page;
-+
-+	T(YAFFS_TRACE_OS,
-+		("yaffs_write_end addr %x pos %x nBytes %d\n",
-+		(unsigned) addr,
-+		(int)pos, copied));
-+
-+	ret = yaffs_file_write(filp, addr, copied, &pos);
-+
-+	if (ret != copied) {
-+		T(YAFFS_TRACE_OS,
-+			("yaffs_write_end not same size ret %d  copied %d\n",
-+			ret, copied));
-+		SetPageError(pg);
-+		ClearPageUptodate(pg);
-+	} else {
-+		SetPageUptodate(pg);
-+	}
-+
-+	kunmap(pg);
- 
-+	yaffs_release_space(filp);
-+	unlock_page(pg);
-+	page_cache_release(pg);
-+	return ret;
- }
-+#else
- 
- static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
--			      unsigned to)
-+				unsigned to)
- {
-+	void *addr, *kva;
- 
--	void *addr = page_address(pg) + offset;
- 	loff_t pos = (((loff_t) pg->index) << PAGE_CACHE_SHIFT) + offset;
- 	int nBytes = to - offset;
- 	int nWritten;
- 
- 	unsigned spos = pos;
--	unsigned saddr = (unsigned)addr;
-+	unsigned saddr;
-+
-+	kva = kmap(pg);
-+	addr = kva + offset;
-+
-+	saddr = (unsigned) addr;
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_commit_write addr %x pos %x nBytes %d\n", saddr,
--	   spos, nBytes));
-+		("yaffs_commit_write addr %x pos %x nBytes %d\n",
-+		saddr, spos, nBytes));
- 
- 	nWritten = yaffs_file_write(f, addr, nBytes, &pos);
- 
- 	if (nWritten != nBytes) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG
--		   "yaffs_commit_write not same size nWritten %d  nBytes %d\n",
--		   nWritten, nBytes));
-+			("yaffs_commit_write not same size nWritten %d  nBytes %d\n",
-+			nWritten, nBytes));
- 		SetPageError(pg);
- 		ClearPageUptodate(pg);
- 	} else {
- 		SetPageUptodate(pg);
- 	}
- 
-+	kunmap(pg);
-+
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_commit_write returning %d\n",
--	   nWritten == nBytes ? 0 : nWritten));
-+		("yaffs_commit_write returning %d\n",
-+		nWritten == nBytes ? 0 : nWritten));
- 
- 	return nWritten == nBytes ? 0 : nWritten;
--
- }
-+#endif
-+
- 
--static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object * obj)
-+static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object *obj)
- {
- 	if (inode && obj) {
- 
- 
- 		/* Check mode against the variant type and attempt to repair if broken. */
-- 		__u32 mode = obj->yst_mode;
-- 		switch( obj->variantType ){
-- 		case YAFFS_OBJECT_TYPE_FILE :
-- 		        if( ! S_ISREG(mode) ){
-- 			        obj->yst_mode &= ~S_IFMT;
-- 			        obj->yst_mode |= S_IFREG;
-- 			}
--
-- 			break;
-- 		case YAFFS_OBJECT_TYPE_SYMLINK :
-- 		        if( ! S_ISLNK(mode) ){
-- 			        obj->yst_mode &= ~S_IFMT;
-- 				obj->yst_mode |= S_IFLNK;
-- 			}
--
-- 			break;
-- 		case YAFFS_OBJECT_TYPE_DIRECTORY :
-- 		        if( ! S_ISDIR(mode) ){
-- 			        obj->yst_mode &= ~S_IFMT;
-- 			        obj->yst_mode |= S_IFDIR;
-- 			}
--
-- 			break;
-- 		case YAFFS_OBJECT_TYPE_UNKNOWN :
-- 		case YAFFS_OBJECT_TYPE_HARDLINK :
-- 		case YAFFS_OBJECT_TYPE_SPECIAL :
-- 		default:
-- 		        /* TODO? */
-- 		        break;
-- 		}
-+		__u32 mode = obj->yst_mode;
-+		switch (obj->variantType) {
-+		case YAFFS_OBJECT_TYPE_FILE:
-+			if (!S_ISREG(mode)) {
-+				obj->yst_mode &= ~S_IFMT;
-+				obj->yst_mode |= S_IFREG;
-+			}
-+
-+			break;
-+		case YAFFS_OBJECT_TYPE_SYMLINK:
-+			if (!S_ISLNK(mode)) {
-+				obj->yst_mode &= ~S_IFMT;
-+				obj->yst_mode |= S_IFLNK;
-+			}
-+
-+			break;
-+		case YAFFS_OBJECT_TYPE_DIRECTORY:
-+			if (!S_ISDIR(mode)) {
-+				obj->yst_mode &= ~S_IFMT;
-+				obj->yst_mode |= S_IFDIR;
-+			}
-+
-+			break;
-+		case YAFFS_OBJECT_TYPE_UNKNOWN:
-+		case YAFFS_OBJECT_TYPE_HARDLINK:
-+		case YAFFS_OBJECT_TYPE_SPECIAL:
-+		default:
-+			/* TODO? */
-+			break;
-+		}
-+
-+		inode->i_flags |= S_NOATIME;
- 
- 		inode->i_ino = obj->objectId;
- 		inode->i_mode = obj->yst_mode;
- 		inode->i_uid = obj->yst_uid;
- 		inode->i_gid = obj->yst_gid;
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
- 		inode->i_blksize = inode->i_sb->s_blocksize;
- #endif
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 
- 		inode->i_rdev = old_decode_dev(obj->yst_rdev);
- 		inode->i_atime.tv_sec = (time_t) (obj->yst_atime);
-@@ -781,26 +951,25 @@ static void yaffs_FillInodeFromObject(st
- 		inode->i_nlink = yaffs_GetObjectLinkCount(obj);
- 
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG
--		   "yaffs_FillInode mode %x uid %d gid %d size %d count %d\n",
--		   inode->i_mode, inode->i_uid, inode->i_gid,
--		   (int)inode->i_size, atomic_read(&inode->i_count)));
-+			("yaffs_FillInode mode %x uid %d gid %d size %d count %d\n",
-+			inode->i_mode, inode->i_uid, inode->i_gid,
-+			(int)inode->i_size, atomic_read(&inode->i_count)));
- 
- 		switch (obj->yst_mode & S_IFMT) {
- 		default:	/* fifo, device or socket */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 			init_special_inode(inode, obj->yst_mode,
--					   old_decode_dev(obj->yst_rdev));
-+					old_decode_dev(obj->yst_rdev));
- #else
- 			init_special_inode(inode, obj->yst_mode,
--					   (dev_t) (obj->yst_rdev));
-+					(dev_t) (obj->yst_rdev));
- #endif
- 			break;
- 		case S_IFREG:	/* file */
- 			inode->i_op = &yaffs_file_inode_operations;
- 			inode->i_fop = &yaffs_file_operations;
- 			inode->i_mapping->a_ops =
--			    &yaffs_file_address_operations;
-+				&yaffs_file_address_operations;
- 			break;
- 		case S_IFDIR:	/* directory */
- 			inode->i_op = &yaffs_dir_inode_operations;
-@@ -817,34 +986,36 @@ static void yaffs_FillInodeFromObject(st
- 
- 	} else {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_FileInode invalid parameters\n"));
-+			("yaffs_FileInode invalid parameters\n"));
- 	}
- 
- }
- 
- struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,
--			      yaffs_Object * obj)
-+				yaffs_Object *obj)
- {
- 	struct inode *inode;
- 
- 	if (!sb) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_get_inode for NULL super_block!!\n"));
-+			("yaffs_get_inode for NULL super_block!!\n"));
- 		return NULL;
- 
- 	}
- 
- 	if (!obj) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_get_inode for NULL object!!\n"));
-+			("yaffs_get_inode for NULL object!!\n"));
- 		return NULL;
- 
- 	}
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_get_inode for object %d\n", obj->objectId));
-+		("yaffs_get_inode for object %d\n", obj->objectId));
- 
--	inode = iget(sb, obj->objectId);
-+	inode = Y_IGET(sb, obj->objectId);
-+	if (IS_ERR(inode))
-+		return NULL;
- 
- 	/* NB Side effect: iget calls back to yaffs_read_inode(). */
- 	/* iget also increments the inode's i_count */
-@@ -854,7 +1025,7 @@ struct inode *yaffs_get_inode(struct sup
- }
- 
- static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
--				loff_t * pos)
-+				loff_t *pos)
- {
- 	yaffs_Object *obj;
- 	int nWritten, ipos;
-@@ -869,28 +1040,26 @@ static ssize_t yaffs_file_write(struct f
- 
- 	inode = f->f_dentry->d_inode;
- 
--	if (!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND) {
-+	if (!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND)
- 		ipos = inode->i_size;
--	} else {
-+	else
- 		ipos = *pos;
--	}
- 
--	if (!obj) {
-+	if (!obj)
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_file_write: hey obj is null!\n"));
--	} else {
-+			("yaffs_file_write: hey obj is null!\n"));
-+	else
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG
--		   "yaffs_file_write about to write writing %d bytes"
--		   "to object %d at %d\n",
--		   n, obj->objectId, ipos));
--	}
-+			("yaffs_file_write about to write writing %zu bytes"
-+			"to object %d at %d\n",
-+			n, obj->objectId, ipos));
- 
- 	nWritten = yaffs_WriteDataToFile(obj, buf, ipos, n, 0);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_file_write writing %d bytes, %d written at %d\n",
--	   n, nWritten, ipos));
-+		("yaffs_file_write writing %zu bytes, %d written at %d\n",
-+		n, nWritten, ipos));
-+
- 	if (nWritten > 0) {
- 		ipos += nWritten;
- 		*pos = ipos;
-@@ -899,10 +1068,9 @@ static ssize_t yaffs_file_write(struct f
- 			inode->i_blocks = (ipos + 511) >> 9;
- 
- 			T(YAFFS_TRACE_OS,
--			  (KERN_DEBUG
--			   "yaffs_file_write size updated to %d bytes, "
--			   "%d blocks\n",
--			   ipos, (int)(inode->i_blocks)));
-+				("yaffs_file_write size updated to %d bytes, "
-+				"%d blocks\n",
-+				ipos, (int)(inode->i_blocks)));
- 		}
- 
- 	}
-@@ -910,13 +1078,54 @@ static ssize_t yaffs_file_write(struct f
- 	return nWritten == 0 ? -ENOSPC : nWritten;
- }
- 
-+/* Space holding and freeing is done to ensure we have space available for write_begin/end */
-+/* For now we just assume few parallel writes and check against a small number. */
-+/* Todo: need to do this with a counter to handle parallel reads better */
-+
-+static ssize_t yaffs_hold_space(struct file *f)
-+{
-+	yaffs_Object *obj;
-+	yaffs_Device *dev;
-+
-+	int nFreeChunks;
-+
-+
-+	obj = yaffs_DentryToObject(f->f_dentry);
-+
-+	dev = obj->myDev;
-+
-+	yaffs_GrossLock(dev);
-+
-+	nFreeChunks = yaffs_GetNumberOfFreeChunks(dev);
-+
-+	yaffs_GrossUnlock(dev);
-+
-+	return (nFreeChunks > 20) ? 1 : 0;
-+}
-+
-+static void yaffs_release_space(struct file *f)
-+{
-+	yaffs_Object *obj;
-+	yaffs_Device *dev;
-+
-+
-+	obj = yaffs_DentryToObject(f->f_dentry);
-+
-+	dev = obj->myDev;
-+
-+	yaffs_GrossLock(dev);
-+
-+
-+	yaffs_GrossUnlock(dev);
-+}
-+
- static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
- {
- 	yaffs_Object *obj;
- 	yaffs_Device *dev;
- 	struct inode *inode = f->f_dentry->d_inode;
- 	unsigned long offset, curoffs;
--	struct list_head *i;
-+	struct ylist_head *i;
- 	yaffs_Object *l;
- 
- 	char name[YAFFS_MAX_NAME_LENGTH + 1];
-@@ -932,24 +1141,20 @@ static int yaffs_readdir(struct file *f,
- 
- 	if (offset == 0) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_readdir: entry . ino %d \n",
--		   (int)inode->i_ino));
--		if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR)
--		    < 0) {
-+			("yaffs_readdir: entry . ino %d \n",
-+			(int)inode->i_ino));
-+		if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR) < 0)
- 			goto out;
--		}
- 		offset++;
- 		f->f_pos++;
- 	}
- 	if (offset == 1) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_readdir: entry .. ino %d \n",
--		   (int)f->f_dentry->d_parent->d_inode->i_ino));
--		if (filldir
--		    (dirent, "..", 2, offset,
--		     f->f_dentry->d_parent->d_inode->i_ino, DT_DIR) < 0) {
-+			("yaffs_readdir: entry .. ino %d \n",
-+			(int)f->f_dentry->d_parent->d_inode->i_ino));
-+		if (filldir(dirent, "..", 2, offset,
-+			f->f_dentry->d_parent->d_inode->i_ino, DT_DIR) < 0)
- 			goto out;
--		}
- 		offset++;
- 		f->f_pos++;
- 	}
-@@ -965,35 +1170,32 @@ static int yaffs_readdir(struct file *f,
- 		f->f_version = inode->i_version;
- 	}
- 
--	list_for_each(i, &obj->variant.directoryVariant.children) {
-+	ylist_for_each(i, &obj->variant.directoryVariant.children) {
- 		curoffs++;
- 		if (curoffs >= offset) {
--			l = list_entry(i, yaffs_Object, siblings);
-+			l = ylist_entry(i, yaffs_Object, siblings);
- 
- 			yaffs_GetObjectName(l, name,
- 					    YAFFS_MAX_NAME_LENGTH + 1);
- 			T(YAFFS_TRACE_OS,
--			  (KERN_DEBUG "yaffs_readdir: %s inode %d\n", name,
-+			  ("yaffs_readdir: %s inode %d\n", name,
- 			   yaffs_GetObjectInode(l)));
- 
- 			if (filldir(dirent,
--				    name,
--				    strlen(name),
--				    offset,
--				    yaffs_GetObjectInode(l),
--				    yaffs_GetObjectType(l))
--			    < 0) {
-+					name,
-+					strlen(name),
-+					offset,
-+					yaffs_GetObjectInode(l),
-+					yaffs_GetObjectType(l)) < 0)
- 				goto up_and_out;
--			}
- 
- 			offset++;
- 			f->f_pos++;
- 		}
- 	}
- 
--      up_and_out:
--      out:
--
-+up_and_out:
-+out:
- 	yaffs_GrossUnlock(dev);
- 
- 	return 0;
-@@ -1002,12 +1204,19 @@ static int yaffs_readdir(struct file *f,
- /*
-  * File creation. Allocate an inode, and we're done..
-  */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
-+#define YCRED(x) x
-+#else
-+#define YCRED(x) (x->cred)
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
--		       dev_t rdev)
-+			dev_t rdev)
- #else
- static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
--		       int rdev)
-+			int rdev)
- #endif
- {
- 	struct inode *inode;
-@@ -1018,25 +1227,25 @@ static int yaffs_mknod(struct inode *dir
- 	yaffs_Object *parent = yaffs_InodeToObject(dir);
- 
- 	int error = -ENOSPC;
--	uid_t uid = current->fsuid;
--	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid;
-+	uid_t uid = YCRED(current)->fsuid;
-+	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
- 
--	if((dir->i_mode & S_ISGID) && S_ISDIR(mode))
-+	if ((dir->i_mode & S_ISGID) && S_ISDIR(mode))
- 		mode |= S_ISGID;
- 
- 	if (parent) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod: parent object %d type %d\n",
--		   parent->objectId, parent->variantType));
-+			("yaffs_mknod: parent object %d type %d\n",
-+			parent->objectId, parent->variantType));
- 	} else {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod: could not get parent object\n"));
-+			("yaffs_mknod: could not get parent object\n"));
- 		return -EPERM;
- 	}
- 
- 	T(YAFFS_TRACE_OS, ("yaffs_mknod: making oject for %s, "
--			   "mode %x dev %x\n",
--			   dentry->d_name.name, mode, rdev));
-+			"mode %x dev %x\n",
-+			dentry->d_name.name, mode, rdev));
- 
- 	dev = parent->myDev;
- 
-@@ -1045,33 +1254,28 @@ static int yaffs_mknod(struct inode *dir
- 	switch (mode & S_IFMT) {
- 	default:
- 		/* Special (socket, fifo, device...) */
--		T(YAFFS_TRACE_OS, (KERN_DEBUG
--				   "yaffs_mknod: making special\n"));
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
--		obj =
--		    yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
--				       gid, old_encode_dev(rdev));
--#else
--		obj =
--		    yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
--				       gid, rdev);
-+		T(YAFFS_TRACE_OS, ("yaffs_mknod: making special\n"));
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+		obj = yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
-+				gid, old_encode_dev(rdev));
-+#else
-+		obj = yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
-+				gid, rdev);
- #endif
- 		break;
- 	case S_IFREG:		/* file          */
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_mknod: making file\n"));
--		obj =
--		    yaffs_MknodFile(parent, dentry->d_name.name, mode, uid,
--				    gid);
-+		T(YAFFS_TRACE_OS, ("yaffs_mknod: making file\n"));
-+		obj = yaffs_MknodFile(parent, dentry->d_name.name, mode, uid,
-+				gid);
- 		break;
- 	case S_IFDIR:		/* directory */
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod: making directory\n"));
--		obj =
--		    yaffs_MknodDirectory(parent, dentry->d_name.name, mode,
--					 uid, gid);
-+			("yaffs_mknod: making directory\n"));
-+		obj = yaffs_MknodDirectory(parent, dentry->d_name.name, mode,
-+					uid, gid);
- 		break;
- 	case S_IFLNK:		/* symlink */
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_mknod: making file\n"));
-+		T(YAFFS_TRACE_OS, ("yaffs_mknod: making symlink\n"));
- 		obj = NULL;	/* Do we ever get here? */
- 		break;
- 	}
-@@ -1083,12 +1287,12 @@ static int yaffs_mknod(struct inode *dir
- 		inode = yaffs_get_inode(dir->i_sb, mode, rdev, obj);
- 		d_instantiate(dentry, inode);
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod created object %d count = %d\n",
--		   obj->objectId, atomic_read(&inode->i_count)));
-+			("yaffs_mknod created object %d count = %d\n",
-+			obj->objectId, atomic_read(&inode->i_count)));
- 		error = 0;
- 	} else {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod failed making object\n"));
-+			("yaffs_mknod failed making object\n"));
- 		error = -ENOMEM;
- 	}
- 
-@@ -1098,25 +1302,19 @@ static int yaffs_mknod(struct inode *dir
- static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
- {
- 	int retVal;
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_mkdir\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_mkdir\n"));
- 	retVal = yaffs_mknod(dir, dentry, mode | S_IFDIR, 0);
--#if 0
--	/* attempt to fix dir bug - didn't work */
--	if (!retVal) {
--		dget(dentry);
--	}
--#endif
- 	return retVal;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
- 			struct nameidata *n)
- #else
- static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode)
- #endif
- {
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_create\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_create\n"));
- 	return yaffs_mknod(dir, dentry, mode | S_IFREG, 0);
- }
- 
-@@ -1127,8 +1325,8 @@ static int yaffs_unlink(struct inode *di
- 	yaffs_Device *dev;
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_unlink %d:%s\n", (int)(dir->i_ino),
--	   dentry->d_name.name));
-+		("yaffs_unlink %d:%s\n", (int)(dir->i_ino),
-+		dentry->d_name.name));
- 
- 	dev = yaffs_InodeToObject(dir)->myDev;
- 
-@@ -1151,82 +1349,74 @@ static int yaffs_unlink(struct inode *di
-  * Create a link...
-  */
- static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
--		      struct dentry *dentry)
-+			struct dentry *dentry)
- {
- 	struct inode *inode = old_dentry->d_inode;
- 	yaffs_Object *obj = NULL;
- 	yaffs_Object *link = NULL;
- 	yaffs_Device *dev;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_link\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_link\n"));
- 
- 	obj = yaffs_InodeToObject(inode);
- 	dev = obj->myDev;
- 
- 	yaffs_GrossLock(dev);
- 
--	if (!S_ISDIR(inode->i_mode))	/* Don't link directories */
--	{
--		link =
--		    yaffs_Link(yaffs_InodeToObject(dir), dentry->d_name.name,
--			       obj);
--	}
-+	if (!S_ISDIR(inode->i_mode))		/* Don't link directories */
-+		link = yaffs_Link(yaffs_InodeToObject(dir), dentry->d_name.name,
-+			obj);
- 
- 	if (link) {
- 		old_dentry->d_inode->i_nlink = yaffs_GetObjectLinkCount(obj);
- 		d_instantiate(dentry, old_dentry->d_inode);
- 		atomic_inc(&old_dentry->d_inode->i_count);
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_link link count %d i_count %d\n",
--		   old_dentry->d_inode->i_nlink,
--		   atomic_read(&old_dentry->d_inode->i_count)));
--
-+			("yaffs_link link count %d i_count %d\n",
-+			old_dentry->d_inode->i_nlink,
-+			atomic_read(&old_dentry->d_inode->i_count)));
- 	}
- 
- 	yaffs_GrossUnlock(dev);
- 
--	if (link) {
--
-+	if (link)
- 		return 0;
--	}
- 
- 	return -EPERM;
- }
- 
- static int yaffs_symlink(struct inode *dir, struct dentry *dentry,
--			 const char *symname)
-+				const char *symname)
- {
- 	yaffs_Object *obj;
- 	yaffs_Device *dev;
--	uid_t uid = current->fsuid;
--	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid;
-+	uid_t uid = YCRED(current)->fsuid;
-+	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_symlink\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_symlink\n"));
- 
- 	dev = yaffs_InodeToObject(dir)->myDev;
- 	yaffs_GrossLock(dev);
- 	obj = yaffs_MknodSymLink(yaffs_InodeToObject(dir), dentry->d_name.name,
--				 S_IFLNK | S_IRWXUGO, uid, gid, symname);
-+				S_IFLNK | S_IRWXUGO, uid, gid, symname);
- 	yaffs_GrossUnlock(dev);
- 
- 	if (obj) {
--
- 		struct inode *inode;
- 
- 		inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
- 		d_instantiate(dentry, inode);
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "symlink created OK\n"));
-+		T(YAFFS_TRACE_OS, ("symlink created OK\n"));
- 		return 0;
- 	} else {
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "symlink not created\n"));
--
-+		T(YAFFS_TRACE_OS, ("symlink not created\n"));
- 	}
- 
- 	return -ENOMEM;
- }
- 
- static int yaffs_sync_object(struct file *file, struct dentry *dentry,
--			     int datasync)
-+				int datasync)
- {
- 
- 	yaffs_Object *obj;
-@@ -1236,7 +1426,7 @@ static int yaffs_sync_object(struct file
- 
- 	dev = obj->myDev;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_sync_object\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_sync_object\n"));
- 	yaffs_GrossLock(dev);
- 	yaffs_FlushFile(obj, 1);
- 	yaffs_GrossUnlock(dev);
-@@ -1255,41 +1445,36 @@ static int yaffs_rename(struct inode *ol
- 	int retVal = YAFFS_FAIL;
- 	yaffs_Object *target;
- 
--        T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_rename\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_rename\n"));
- 	dev = yaffs_InodeToObject(old_dir)->myDev;
- 
- 	yaffs_GrossLock(dev);
- 
- 	/* Check if the target is an existing directory that is not empty. */
--	target =
--	    yaffs_FindObjectByName(yaffs_InodeToObject(new_dir),
--				   new_dentry->d_name.name);
-+	target = yaffs_FindObjectByName(yaffs_InodeToObject(new_dir),
-+				new_dentry->d_name.name);
- 
- 
- 
--	if (target &&
--	    target->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
--	    !list_empty(&target->variant.directoryVariant.children)) {
-+	if (target && target->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
-+		!ylist_empty(&target->variant.directoryVariant.children)) {
- 
--	        T(YAFFS_TRACE_OS, (KERN_DEBUG "target is non-empty dir\n"));
-+		T(YAFFS_TRACE_OS, ("target is non-empty dir\n"));
- 
- 		retVal = YAFFS_FAIL;
- 	} else {
--
- 		/* Now does unlinking internally using shadowing mechanism */
--	        T(YAFFS_TRACE_OS, (KERN_DEBUG "calling yaffs_RenameObject\n"));
--
--		retVal =
--		    yaffs_RenameObject(yaffs_InodeToObject(old_dir),
--				       old_dentry->d_name.name,
--				       yaffs_InodeToObject(new_dir),
--				       new_dentry->d_name.name);
-+		T(YAFFS_TRACE_OS, ("calling yaffs_RenameObject\n"));
- 
-+		retVal = yaffs_RenameObject(yaffs_InodeToObject(old_dir),
-+				old_dentry->d_name.name,
-+				yaffs_InodeToObject(new_dir),
-+				new_dentry->d_name.name);
- 	}
- 	yaffs_GrossUnlock(dev);
- 
- 	if (retVal == YAFFS_OK) {
--		if(target) {
-+		if (target) {
- 			new_dentry->d_inode->i_nlink--;
- 			mark_inode_dirty(new_dentry->d_inode);
- 		}
-@@ -1298,7 +1483,6 @@ static int yaffs_rename(struct inode *ol
- 	} else {
- 		return -ENOTEMPTY;
- 	}
--
- }
- 
- static int yaffs_setattr(struct dentry *dentry, struct iattr *attr)
-@@ -1308,15 +1492,15 @@ static int yaffs_setattr(struct dentry *
- 	yaffs_Device *dev;
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_setattr of object %d\n",
--	   yaffs_InodeToObject(inode)->objectId));
--
--	if ((error = inode_change_ok(inode, attr)) == 0) {
-+		("yaffs_setattr of object %d\n",
-+		yaffs_InodeToObject(inode)->objectId));
- 
-+	error = inode_change_ok(inode, attr);
-+	if (error == 0) {
- 		dev = yaffs_InodeToObject(inode)->myDev;
- 		yaffs_GrossLock(dev);
- 		if (yaffs_SetAttributes(yaffs_InodeToObject(inode), attr) ==
--		    YAFFS_OK) {
-+				YAFFS_OK) {
- 			error = 0;
- 		} else {
- 			error = -EPERM;
-@@ -1328,12 +1512,12 @@ static int yaffs_setattr(struct dentry *
- 	return error;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf)
- {
- 	yaffs_Device *dev = yaffs_DentryToObject(dentry)->myDev;
- 	struct super_block *sb = dentry->d_sb;
--#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf)
- {
- 	yaffs_Device *dev = yaffs_SuperToDevice(sb);
-@@ -1343,32 +1527,53 @@ static int yaffs_statfs(struct super_blo
- 	yaffs_Device *dev = yaffs_SuperToDevice(sb);
- #endif
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_statfs\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_statfs\n"));
- 
- 	yaffs_GrossLock(dev);
- 
- 	buf->f_type = YAFFS_MAGIC;
- 	buf->f_bsize = sb->s_blocksize;
- 	buf->f_namelen = 255;
--	if (sb->s_blocksize > dev->nDataBytesPerChunk) {
-+
-+	if (dev->nDataBytesPerChunk & (dev->nDataBytesPerChunk - 1)) {
-+		/* Do this if chunk size is not a power of 2 */
-+
-+		uint64_t bytesInDev;
-+		uint64_t bytesFree;
-+
-+		bytesInDev = ((uint64_t)((dev->endBlock - dev->startBlock + 1))) *
-+			((uint64_t)(dev->nChunksPerBlock * dev->nDataBytesPerChunk));
-+
-+		do_div(bytesInDev, sb->s_blocksize); /* bytesInDev becomes the number of blocks */
-+		buf->f_blocks = bytesInDev;
-+
-+		bytesFree  = ((uint64_t)(yaffs_GetNumberOfFreeChunks(dev))) *
-+			((uint64_t)(dev->nDataBytesPerChunk));
-+
-+		do_div(bytesFree, sb->s_blocksize);
-+
-+		buf->f_bfree = bytesFree;
-+
-+	} else if (sb->s_blocksize > dev->nDataBytesPerChunk) {
- 
- 		buf->f_blocks =
--		    (dev->endBlock - dev->startBlock +
--		     1) * dev->nChunksPerBlock / (sb->s_blocksize /
--						  dev->nDataBytesPerChunk);
-+			(dev->endBlock - dev->startBlock + 1) *
-+			dev->nChunksPerBlock /
-+			(sb->s_blocksize / dev->nDataBytesPerChunk);
- 		buf->f_bfree =
--		    yaffs_GetNumberOfFreeChunks(dev) / (sb->s_blocksize /
--							dev->nDataBytesPerChunk);
-+			yaffs_GetNumberOfFreeChunks(dev) /
-+			(sb->s_blocksize / dev->nDataBytesPerChunk);
- 	} else {
--
- 		buf->f_blocks =
--		    (dev->endBlock - dev->startBlock +
--		     1) * dev->nChunksPerBlock * (dev->nDataBytesPerChunk /
--						  sb->s_blocksize);
-+			(dev->endBlock - dev->startBlock + 1) *
-+			dev->nChunksPerBlock *
-+			(dev->nDataBytesPerChunk / sb->s_blocksize);
-+
- 		buf->f_bfree =
--		    yaffs_GetNumberOfFreeChunks(dev) * (dev->nDataBytesPerChunk /
--							sb->s_blocksize);
-+			yaffs_GetNumberOfFreeChunks(dev) *
-+			(dev->nDataBytesPerChunk / sb->s_blocksize);
- 	}
-+
- 	buf->f_files = 0;
- 	buf->f_ffree = 0;
- 	buf->f_bavail = buf->f_bfree;
-@@ -1378,18 +1583,19 @@ static int yaffs_statfs(struct super_blo
- }
- 
- 
--/**
- static int yaffs_do_sync_fs(struct super_block *sb)
- {
- 
- 	yaffs_Device *dev = yaffs_SuperToDevice(sb);
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_do_sync_fs\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_do_sync_fs\n"));
- 
--	if(sb->s_dirt) {
-+	if (sb->s_dirt) {
- 		yaffs_GrossLock(dev);
- 
--		if(dev)
-+		if (dev) {
-+			yaffs_FlushEntireDeviceCache(dev);
- 			yaffs_CheckpointSave(dev);
-+		}
- 
- 		yaffs_GrossUnlock(dev);
- 
-@@ -1397,35 +1603,73 @@ static int yaffs_do_sync_fs(struct super
- 	}
- 	return 0;
- }
--**/
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static void yaffs_write_super(struct super_block *sb)
- #else
- static int yaffs_write_super(struct super_block *sb)
- #endif
- {
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_write_super\n"));
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18))
--	return 0; /* yaffs_do_sync_fs(sb);*/
-+	T(YAFFS_TRACE_OS, ("yaffs_write_super\n"));
-+	if (yaffs_auto_checkpoint >= 2)
-+		yaffs_do_sync_fs(sb);
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18))
-+	return 0;
- #endif
- }
- 
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_sync_fs(struct super_block *sb, int wait)
- #else
- static int yaffs_sync_fs(struct super_block *sb)
- #endif
- {
-+	T(YAFFS_TRACE_OS, ("yaffs_sync_fs\n"));
-+
-+	if (yaffs_auto_checkpoint >= 1)
-+		yaffs_do_sync_fs(sb);
-+
-+	return 0;
-+}
-+
-+#ifdef YAFFS_USE_OWN_IGET
-+
-+static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino)
-+{
-+	struct inode *inode;
-+	yaffs_Object *obj;
-+	yaffs_Device *dev = yaffs_SuperToDevice(sb);
-+
-+	T(YAFFS_TRACE_OS,
-+		("yaffs_iget for %lu\n", ino));
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_sync_fs\n"));
-+	inode = iget_locked(sb, ino);
-+	if (!inode)
-+		return ERR_PTR(-ENOMEM);
-+	if (!(inode->i_state & I_NEW))
-+		return inode;
-+
-+	/* NB This is called as a side effect of other functions, but
-+	 * we had to release the lock to prevent deadlocks, so
-+	 * need to lock again.
-+	 */
- 
--	return 0; /* yaffs_do_sync_fs(sb);*/
-+	yaffs_GrossLock(dev);
- 
-+	obj = yaffs_FindObjectByNumber(dev, inode->i_ino);
-+
-+	yaffs_FillInodeFromObject(inode, obj);
-+
-+	yaffs_GrossUnlock(dev);
-+
-+	unlock_new_inode(inode);
-+	return inode;
- }
- 
-+#else
- 
- static void yaffs_read_inode(struct inode *inode)
- {
-@@ -1438,7 +1682,7 @@ static void yaffs_read_inode(struct inod
- 	yaffs_Device *dev = yaffs_SuperToDevice(inode->i_sb);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_read_inode for %d\n", (int)inode->i_ino));
-+		("yaffs_read_inode for %d\n", (int)inode->i_ino));
- 
- 	yaffs_GrossLock(dev);
- 
-@@ -1449,18 +1693,20 @@ static void yaffs_read_inode(struct inod
- 	yaffs_GrossUnlock(dev);
- }
- 
--static LIST_HEAD(yaffs_dev_list);
-+#endif
-+
-+static YLIST_HEAD(yaffs_dev_list);
- 
--#if 0 // not used
-+#if 0 /* not used */
- static int yaffs_remount_fs(struct super_block *sb, int *flags, char *data)
- {
- 	yaffs_Device    *dev = yaffs_SuperToDevice(sb);
- 
--	if( *flags & MS_RDONLY ) {
-+	if (*flags & MS_RDONLY) {
- 		struct mtd_info *mtd = yaffs_SuperToDevice(sb)->genericDevice;
- 
- 		T(YAFFS_TRACE_OS,
--			(KERN_DEBUG "yaffs_remount_fs: %s: RO\n", dev->name ));
-+			("yaffs_remount_fs: %s: RO\n", dev->name));
- 
- 		yaffs_GrossLock(dev);
- 
-@@ -1472,10 +1718,9 @@ static int yaffs_remount_fs(struct super
- 			mtd->sync(mtd);
- 
- 		yaffs_GrossUnlock(dev);
--	}
--	else {
-+	} else {
- 		T(YAFFS_TRACE_OS,
--			(KERN_DEBUG "yaffs_remount_fs: %s: RW\n", dev->name ));
-+			("yaffs_remount_fs: %s: RW\n", dev->name));
- 	}
- 
- 	return 0;
-@@ -1486,7 +1731,7 @@ static void yaffs_put_super(struct super
- {
- 	yaffs_Device *dev = yaffs_SuperToDevice(sb);
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_put_super\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_put_super\n"));
- 
- 	yaffs_GrossLock(dev);
- 
-@@ -1494,18 +1739,17 @@ static void yaffs_put_super(struct super
- 
- 	yaffs_CheckpointSave(dev);
- 
--	if (dev->putSuperFunc) {
-+	if (dev->putSuperFunc)
- 		dev->putSuperFunc(sb);
--	}
- 
- 	yaffs_Deinitialise(dev);
- 
- 	yaffs_GrossUnlock(dev);
- 
- 	/* we assume this is protected by lock_kernel() in mount/umount */
--	list_del(&dev->devList);
-+	ylist_del(&dev->devList);
- 
--	if(dev->spareBuffer){
-+	if (dev->spareBuffer) {
- 		YFREE(dev->spareBuffer);
- 		dev->spareBuffer = NULL;
- 	}
-@@ -1516,12 +1760,10 @@ static void yaffs_put_super(struct super
- 
- static void yaffs_MTDPutSuper(struct super_block *sb)
- {
--
- 	struct mtd_info *mtd = yaffs_SuperToDevice(sb)->genericDevice;
- 
--	if (mtd->sync) {
-+	if (mtd->sync)
- 		mtd->sync(mtd);
--	}
- 
- 	put_mtd_device(mtd);
- }
-@@ -1531,9 +1773,9 @@ static void yaffs_MarkSuperBlockDirty(vo
- {
- 	struct super_block *sb = (struct super_block *)vsb;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_MarkSuperBlockDirty() sb = %p\n",sb));
--//	if(sb)
--//		sb->s_dirt = 1;
-+	T(YAFFS_TRACE_OS, ("yaffs_MarkSuperBlockDirty() sb = %p\n", sb));
-+	if (sb)
-+		sb->s_dirt = 1;
- }
- 
- typedef struct {
-@@ -1546,48 +1788,48 @@ typedef struct {
- #define MAX_OPT_LEN 20
- static int yaffs_parse_options(yaffs_options *options, const char *options_str)
- {
--	char cur_opt[MAX_OPT_LEN+1];
-+	char cur_opt[MAX_OPT_LEN + 1];
- 	int p;
- 	int error = 0;
- 
- 	/* Parse through the options which is a comma seperated list */
- 
--	while(options_str && *options_str && !error){
--		memset(cur_opt,0,MAX_OPT_LEN+1);
-+	while (options_str && *options_str && !error) {
-+		memset(cur_opt, 0, MAX_OPT_LEN + 1);
- 		p = 0;
- 
--		while(*options_str && *options_str != ','){
--			if(p < MAX_OPT_LEN){
-+		while (*options_str && *options_str != ',') {
-+			if (p < MAX_OPT_LEN) {
- 				cur_opt[p] = *options_str;
- 				p++;
- 			}
- 			options_str++;
- 		}
- 
--		if(!strcmp(cur_opt,"inband-tags"))
-+		if (!strcmp(cur_opt, "inband-tags"))
- 			options->inband_tags = 1;
--		else if(!strcmp(cur_opt,"no-cache"))
-+		else if (!strcmp(cur_opt, "no-cache"))
- 			options->no_cache = 1;
--		else if(!strcmp(cur_opt,"no-checkpoint-read"))
-+		else if (!strcmp(cur_opt, "no-checkpoint-read"))
- 			options->skip_checkpoint_read = 1;
--		else if(!strcmp(cur_opt,"no-checkpoint-write"))
-+		else if (!strcmp(cur_opt, "no-checkpoint-write"))
- 			options->skip_checkpoint_write = 1;
--		else if(!strcmp(cur_opt,"no-checkpoint")){
-+		else if (!strcmp(cur_opt, "no-checkpoint")) {
- 			options->skip_checkpoint_read = 1;
- 			options->skip_checkpoint_write = 1;
- 		} else {
--			printk(KERN_INFO "yaffs: Bad mount option \"%s\"\n",cur_opt);
-+			printk(KERN_INFO "yaffs: Bad mount option \"%s\"\n",
-+					cur_opt);
- 			error = 1;
- 		}
--
- 	}
- 
- 	return error;
- }
- 
- static struct super_block *yaffs_internal_read_super(int yaffsVersion,
--						     struct super_block *sb,
--						     void *data, int silent)
-+						struct super_block *sb,
-+						void *data, int silent)
- {
- 	int nBlocks;
- 	struct inode *inode = NULL;
-@@ -1602,6 +1844,7 @@ static struct super_block *yaffs_interna
- 
- 	sb->s_magic = YAFFS_MAGIC;
- 	sb->s_op = &yaffs_super_ops;
-+	sb->s_flags |= MS_NOATIME;
- 
- 	if (!sb)
- 		printk(KERN_INFO "yaffs: sb is NULL\n");
-@@ -1614,14 +1857,14 @@ static struct super_block *yaffs_interna
- 		       sb->s_dev,
- 		       yaffs_devname(sb, devname_buf));
- 
--	if(!data_str)
-+	if (!data_str)
- 		data_str = "";
- 
--	printk(KERN_INFO "yaffs: passed flags \"%s\"\n",data_str);
-+	printk(KERN_INFO "yaffs: passed flags \"%s\"\n", data_str);
- 
--	memset(&options,0,sizeof(options));
-+	memset(&options, 0, sizeof(options));
- 
--	if(yaffs_parse_options(&options,data_str)){
-+	if (yaffs_parse_options(&options, data_str)) {
- 		/* Option parsing failed */
- 		return NULL;
- 	}
-@@ -1645,9 +1888,9 @@ static struct super_block *yaffs_interna
- 			       yaffs_devname(sb, devname_buf)));
- 
- 	/* Check it's an mtd device..... */
--	if (MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR) {
-+	if (MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR)
- 		return NULL;	/* This isn't an mtd device */
--	}
-+
- 	/* Get the device */
- 	mtd = get_mtd_device(NULL, MINOR(sb->s_dev));
- 	if (!mtd) {
-@@ -1673,29 +1916,23 @@ static struct super_block *yaffs_interna
- 	T(YAFFS_TRACE_OS, (" %s %d\n", WRITE_SIZE_STR, WRITE_SIZE(mtd)));
- 	T(YAFFS_TRACE_OS, (" oobsize %d\n", mtd->oobsize));
- 	T(YAFFS_TRACE_OS, (" erasesize %d\n", mtd->erasesize));
--	T(YAFFS_TRACE_OS, (" size %d\n", mtd->size));
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
-+	T(YAFFS_TRACE_OS, (" size %u\n", mtd->size));
-+#else
-+	T(YAFFS_TRACE_OS, (" size %lld\n", mtd->size));
-+#endif
- 
- #ifdef CONFIG_YAFFS_AUTO_YAFFS2
- 
--	if (yaffsVersion == 1 &&
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--	    mtd->writesize >= 2048) {
--#else
--	    mtd->oobblock >= 2048) {
--#endif
--	    T(YAFFS_TRACE_ALWAYS,("yaffs: auto selecting yaffs2\n"));
--	    yaffsVersion = 2;
-+	if (yaffsVersion == 1 && WRITE_SIZE(mtd) >= 2048) {
-+		T(YAFFS_TRACE_ALWAYS, ("yaffs: auto selecting yaffs2\n"));
-+		yaffsVersion = 2;
- 	}
- 
- 	/* Added NCB 26/5/2006 for completeness */
--	if (yaffsVersion == 2 &&
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--	    mtd->writesize == 512) {
--#else
--	    mtd->oobblock == 512) {
--#endif
--	    T(YAFFS_TRACE_ALWAYS,("yaffs: auto selecting yaffs1\n"));
--	    yaffsVersion = 1;
-+	if (yaffsVersion == 2 && !options.inband_tags && WRITE_SIZE(mtd) == 512) {
-+		T(YAFFS_TRACE_ALWAYS, ("yaffs: auto selecting yaffs1\n"));
-+		yaffsVersion = 1;
- 	}
- 
- #endif
-@@ -1707,7 +1944,7 @@ static struct super_block *yaffs_interna
- 		    !mtd->block_markbad ||
- 		    !mtd->read ||
- 		    !mtd->write ||
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- 		    !mtd->read_oob || !mtd->write_oob) {
- #else
- 		    !mtd->write_ecc ||
-@@ -1719,12 +1956,9 @@ static struct super_block *yaffs_interna
- 			return NULL;
- 		}
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--		if (mtd->writesize < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
--#else
--		if (mtd->oobblock < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
--#endif
--		    mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) {
-+		if ((WRITE_SIZE(mtd) < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
-+		    mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) &&
-+		    !options.inband_tags) {
- 			T(YAFFS_TRACE_ALWAYS,
- 			  ("yaffs: MTD device does not have the "
- 			   "right page sizes\n"));
-@@ -1735,7 +1969,7 @@ static struct super_block *yaffs_interna
- 		if (!mtd->erase ||
- 		    !mtd->read ||
- 		    !mtd->write ||
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- 		    !mtd->read_oob || !mtd->write_oob) {
- #else
- 		    !mtd->write_ecc ||
-@@ -1761,7 +1995,7 @@ static struct super_block *yaffs_interna
- 	 * Set the yaffs_Device up for mtd
- 	 */
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 	sb->s_fs_info = dev = kmalloc(sizeof(yaffs_Device), GFP_KERNEL);
- #else
- 	sb->u.generic_sbp = dev = kmalloc(sizeof(yaffs_Device), GFP_KERNEL);
-@@ -1780,13 +2014,15 @@ static struct super_block *yaffs_interna
- 
- 	/* Set up the memory size parameters.... */
- 
--	nBlocks = mtd->size / (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK);
-+	nBlocks = YCALCBLOCKS(mtd->size, (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK));
-+
- 	dev->startBlock = 0;
- 	dev->endBlock = nBlocks - 1;
- 	dev->nChunksPerBlock = YAFFS_CHUNKS_PER_BLOCK;
--	dev->nDataBytesPerChunk = YAFFS_BYTES_PER_CHUNK;
-+	dev->totalBytesPerChunk = YAFFS_BYTES_PER_CHUNK;
- 	dev->nReservedBlocks = 5;
- 	dev->nShortOpCaches = (options.no_cache) ? 0 : 10;
-+	dev->inbandTags = options.inband_tags;
- 
- 	/* ... and the functions. */
- 	if (yaffsVersion == 2) {
-@@ -1798,20 +2034,19 @@ static struct super_block *yaffs_interna
- 		dev->queryNANDBlock = nandmtd2_QueryNANDBlock;
- 		dev->spareBuffer = YMALLOC(mtd->oobsize);
- 		dev->isYaffs2 = 1;
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--		dev->nDataBytesPerChunk = mtd->writesize;
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+		dev->totalBytesPerChunk = mtd->writesize;
- 		dev->nChunksPerBlock = mtd->erasesize / mtd->writesize;
- #else
--		dev->nDataBytesPerChunk = mtd->oobblock;
-+		dev->totalBytesPerChunk = mtd->oobblock;
- 		dev->nChunksPerBlock = mtd->erasesize / mtd->oobblock;
- #endif
--		nBlocks = mtd->size / mtd->erasesize;
-+		nBlocks = YCALCBLOCKS(mtd->size, mtd->erasesize);
- 
--		dev->nCheckpointReservedBlocks = CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS;
- 		dev->startBlock = 0;
- 		dev->endBlock = nBlocks - 1;
- 	} else {
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- 		/* use the MTD interface in yaffs_mtdif1.c */
- 		dev->writeChunkWithTagsToNAND =
- 			nandmtd1_WriteChunkWithTagsToNAND;
-@@ -1847,7 +2082,7 @@ static struct super_block *yaffs_interna
- 	dev->skipCheckpointWrite = options.skip_checkpoint_write;
- 
- 	/* we assume this is protected by lock_kernel() in mount/umount */
--	list_add_tail(&dev->devList, &yaffs_dev_list);
-+	ylist_add_tail(&dev->devList, &yaffs_dev_list);
- 
- 	init_MUTEX(&dev->grossLock);
- 
-@@ -1884,20 +2119,23 @@ static struct super_block *yaffs_interna
- 		return NULL;
- 	}
- 	sb->s_root = root;
-+	sb->s_dirt = !dev->isCheckpointed;
-+	T(YAFFS_TRACE_ALWAYS,
-+	  ("yaffs_read_super: isCheckpointed %d\n", dev->isCheckpointed));
- 
- 	T(YAFFS_TRACE_OS, ("yaffs_read_super: done\n"));
- 	return sb;
- }
- 
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_internal_read_super_mtd(struct super_block *sb, void *data,
- 					 int silent)
- {
- 	return yaffs_internal_read_super(1, sb, data, silent) ? 0 : -EINVAL;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_read_super(struct file_system_type *fs,
- 			    int flags, const char *dev_name,
- 			    void *data, struct vfsmount *mnt)
-@@ -1938,14 +2176,14 @@ static DECLARE_FSTYPE(yaffs_fs_type, "ya
- 
- #ifdef CONFIG_YAFFS_YAFFS2
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs2_internal_read_super_mtd(struct super_block *sb, void *data,
- 					  int silent)
- {
- 	return yaffs_internal_read_super(2, sb, data, silent) ? 0 : -EINVAL;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs2_read_super(struct file_system_type *fs,
- 			int flags, const char *dev_name, void *data,
- 			struct vfsmount *mnt)
-@@ -1990,12 +2228,12 @@ static char *yaffs_dump_dev(char *buf, y
- {
- 	buf += sprintf(buf, "startBlock......... %d\n", dev->startBlock);
- 	buf += sprintf(buf, "endBlock........... %d\n", dev->endBlock);
-+	buf += sprintf(buf, "totalBytesPerChunk. %d\n", dev->totalBytesPerChunk);
- 	buf += sprintf(buf, "nDataBytesPerChunk. %d\n", dev->nDataBytesPerChunk);
- 	buf += sprintf(buf, "chunkGroupBits..... %d\n", dev->chunkGroupBits);
- 	buf += sprintf(buf, "chunkGroupSize..... %d\n", dev->chunkGroupSize);
- 	buf += sprintf(buf, "nErasedBlocks...... %d\n", dev->nErasedBlocks);
- 	buf += sprintf(buf, "nReservedBlocks.... %d\n", dev->nReservedBlocks);
--	buf += sprintf(buf, "nCheckptResBlocks.. %d\n", dev->nCheckpointReservedBlocks);
- 	buf += sprintf(buf, "blocksInCheckpoint. %d\n", dev->blocksInCheckpoint);
- 	buf += sprintf(buf, "nTnodesCreated..... %d\n", dev->nTnodesCreated);
- 	buf += sprintf(buf, "nFreeTnodes........ %d\n", dev->nFreeTnodes);
-@@ -2006,10 +2244,8 @@ static char *yaffs_dump_dev(char *buf, y
- 	buf += sprintf(buf, "nPageReads......... %d\n", dev->nPageReads);
- 	buf += sprintf(buf, "nBlockErasures..... %d\n", dev->nBlockErasures);
- 	buf += sprintf(buf, "nGCCopies.......... %d\n", dev->nGCCopies);
--	buf +=
--	    sprintf(buf, "garbageCollections. %d\n", dev->garbageCollections);
--	buf +=
--	    sprintf(buf, "passiveGCs......... %d\n",
-+	buf += sprintf(buf, "garbageCollections. %d\n", dev->garbageCollections);
-+	buf += sprintf(buf, "passiveGCs......... %d\n",
- 		    dev->passiveGarbageCollections);
- 	buf += sprintf(buf, "nRetriedWrites..... %d\n", dev->nRetriedWrites);
- 	buf += sprintf(buf, "nShortOpCaches..... %d\n", dev->nShortOpCaches);
-@@ -2025,6 +2261,7 @@ static char *yaffs_dump_dev(char *buf, y
- 	    sprintf(buf, "nBackgroudDeletions %d\n", dev->nBackgroundDeletions);
- 	buf += sprintf(buf, "useNANDECC......... %d\n", dev->useNANDECC);
- 	buf += sprintf(buf, "isYaffs2........... %d\n", dev->isYaffs2);
-+	buf += sprintf(buf, "inbandTags......... %d\n", dev->inbandTags);
- 
- 	return buf;
- }
-@@ -2033,7 +2270,7 @@ static int yaffs_proc_read(char *page,
- 			   char **start,
- 			   off_t offset, int count, int *eof, void *data)
- {
--	struct list_head *item;
-+	struct ylist_head *item;
- 	char *buf = page;
- 	int step = offset;
- 	int n = 0;
-@@ -2057,8 +2294,8 @@ static int yaffs_proc_read(char *page,
- 	lock_kernel();
- 
- 	/* Locate and print the Nth entry.  Order N-squared but N is small. */
--	list_for_each(item, &yaffs_dev_list) {
--		yaffs_Device *dev = list_entry(item, yaffs_Device, devList);
-+	ylist_for_each(item, &yaffs_dev_list) {
-+		yaffs_Device *dev = ylist_entry(item, yaffs_Device, devList);
- 		if (n < step) {
- 			n++;
- 			continue;
-@@ -2119,7 +2356,7 @@ static int yaffs_proc_write(struct file
- 	char *end;
- 	char *mask_name;
- 	const char *x;
--	char substring[MAX_MASK_NAME_LENGTH+1];
-+	char substring[MAX_MASK_NAME_LENGTH + 1];
- 	int i;
- 	int done = 0;
- 	int add, len = 0;
-@@ -2129,9 +2366,8 @@ static int yaffs_proc_write(struct file
- 
- 	while (!done && (pos < count)) {
- 		done = 1;
--		while ((pos < count) && isspace(buf[pos])) {
-+		while ((pos < count) && isspace(buf[pos]))
- 			pos++;
--		}
- 
- 		switch (buf[pos]) {
- 		case '+':
-@@ -2148,20 +2384,21 @@ static int yaffs_proc_write(struct file
- 		mask_name = NULL;
- 
- 		mask_bitfield = simple_strtoul(buf + pos, &end, 0);
-+
- 		if (end > buf + pos) {
- 			mask_name = "numeral";
- 			len = end - (buf + pos);
- 			pos += len;
- 			done = 0;
- 		} else {
--			for(x = buf + pos, i = 0;
--			    (*x == '_' || (*x >='a' && *x <= 'z')) &&
--			    i <MAX_MASK_NAME_LENGTH; x++, i++, pos++)
--			    substring[i] = *x;
-+			for (x = buf + pos, i = 0;
-+			    (*x == '_' || (*x >= 'a' && *x <= 'z')) &&
-+			    i < MAX_MASK_NAME_LENGTH; x++, i++, pos++)
-+				substring[i] = *x;
- 			substring[i] = '\0';
- 
- 			for (i = 0; mask_flags[i].mask_name != NULL; i++) {
--				if(strcmp(substring,mask_flags[i].mask_name) == 0){
-+				if (strcmp(substring, mask_flags[i].mask_name) == 0) {
- 					mask_name = mask_flags[i].mask_name;
- 					mask_bitfield = mask_flags[i].mask_bitfield;
- 					done = 0;
-@@ -2172,7 +2409,7 @@ static int yaffs_proc_write(struct file
- 
- 		if (mask_name != NULL) {
- 			done = 0;
--			switch(add) {
-+			switch (add) {
- 			case '-':
- 				rg &= ~mask_bitfield;
- 				break;
-@@ -2191,13 +2428,13 @@ static int yaffs_proc_write(struct file
- 
- 	yaffs_traceMask = rg | YAFFS_TRACE_ALWAYS;
- 
--	printk("new trace = 0x%08X\n",yaffs_traceMask);
-+	printk(KERN_DEBUG "new trace = 0x%08X\n", yaffs_traceMask);
- 
- 	if (rg & YAFFS_TRACE_ALWAYS) {
- 		for (i = 0; mask_flags[i].mask_name != NULL; i++) {
- 			char flag;
- 			flag = ((rg & mask_flags[i].mask_bitfield) == mask_flags[i].mask_bitfield) ? '+' : '-';
--			printk("%c%s\n", flag, mask_flags[i].mask_name);
-+			printk(KERN_DEBUG "%c%s\n", flag, mask_flags[i].mask_name);
- 		}
- 	}
- 
-@@ -2211,12 +2448,8 @@ struct file_system_to_install {
- };
- 
- static struct file_system_to_install fs_to_install[] = {
--//#ifdef CONFIG_YAFFS_YAFFS1
- 	{&yaffs_fs_type, 0},
--//#endif
--//#ifdef CONFIG_YAFFS_YAFFS2
- 	{&yaffs2_fs_type, 0},
--//#endif
- 	{NULL, 0}
- };
- 
-@@ -2231,15 +2464,14 @@ static int __init init_yaffs_fs(void)
- 	/* Install the proc_fs entry */
- 	my_proc_entry = create_proc_entry("yaffs",
- 					       S_IRUGO | S_IFREG,
--					       &proc_root);
-+					       YPROC_ROOT);
- 
- 	if (my_proc_entry) {
- 		my_proc_entry->write_proc = yaffs_proc_write;
- 		my_proc_entry->read_proc = yaffs_proc_read;
- 		my_proc_entry->data = NULL;
--	} else {
-+	} else
- 		return -ENOMEM;
--	}
- 
- 	/* Now add the file system entries */
- 
-@@ -2247,9 +2479,8 @@ static int __init init_yaffs_fs(void)
- 
- 	while (fsinst->fst && !error) {
- 		error = register_filesystem(fsinst->fst);
--		if (!error) {
-+		if (!error)
- 			fsinst->installed = 1;
--		}
- 		fsinst++;
- 	}
- 
-@@ -2277,7 +2508,7 @@ static void __exit exit_yaffs_fs(void)
- 	T(YAFFS_TRACE_ALWAYS, ("yaffs " __DATE__ " " __TIME__
- 			       " removing. \n"));
- 
--	remove_proc_entry("yaffs", &proc_root);
-+	remove_proc_entry("yaffs", YPROC_ROOT);
- 
- 	fsinst = fs_to_install;
- 
-@@ -2288,7 +2519,6 @@ static void __exit exit_yaffs_fs(void)
- 		}
- 		fsinst++;
- 	}
--
- }
- 
- module_init(init_yaffs_fs)
---- /dev/null
-+++ b/fs/yaffs2/yaffs_getblockinfo.h
-@@ -0,0 +1,34 @@
-+/*
-+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
-+ *
-+ * Copyright (C) 2002-2007 Aleph One Ltd.
-+ *   for Toby Churchill Ltd and Brightstar Engineering
-+ *
-+ * Created by Charles Manning <charles@aleph1.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 2.1 as
-+ * published by the Free Software Foundation.
-+ *
-+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
-+ */
-+
-+#ifndef __YAFFS_GETBLOCKINFO_H__
-+#define __YAFFS_GETBLOCKINFO_H__
-+
-+#include "yaffs_guts.h"
-+
-+/* Function to manipulate block info */
-+static Y_INLINE yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blk)
-+{
-+	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
-+		T(YAFFS_TRACE_ERROR,
-+		  (TSTR
-+		   ("**>> yaffs: getBlockInfo block %d is not valid" TENDSTR),
-+		   blk));
-+		YBUG();
-+	}
-+	return &dev->blockInfo[blk - dev->internalStartBlock];
-+}
-+
-+#endif
---- a/fs/yaffs2/yaffs_guts.c
-+++ b/fs/yaffs2/yaffs_guts.c
-@@ -12,16 +12,17 @@
-  */
- 
- const char *yaffs_guts_c_version =
--    "$Id: yaffs_guts.c,v 1.49 2007-05-15 20:07:40 charles Exp $";
-+    "$Id: yaffs_guts.c,v 1.82 2009-03-09 04:24:17 charles Exp $";
- 
- #include "yportenv.h"
- 
- #include "yaffsinterface.h"
- #include "yaffs_guts.h"
- #include "yaffs_tagsvalidity.h"
-+#include "yaffs_getblockinfo.h"
- 
- #include "yaffs_tagscompat.h"
--#ifndef  CONFIG_YAFFS_USE_OWN_SORT
-+#ifndef CONFIG_YAFFS_USE_OWN_SORT
- #include "yaffs_qsort.h"
- #endif
- #include "yaffs_nand.h"
-@@ -32,116 +33,116 @@ const char *yaffs_guts_c_version =
- #include "yaffs_packedtags2.h"
- 
- 
--#ifdef CONFIG_YAFFS_WINCE
--void yfsd_LockYAFFS(BOOL fsLockOnly);
--void yfsd_UnlockYAFFS(BOOL fsLockOnly);
--#endif
--
- #define YAFFS_PASSIVE_GC_CHUNKS 2
- 
- #include "yaffs_ecc.h"
- 
- 
- /* Robustification (if it ever comes about...) */
--static void yaffs_RetireBlock(yaffs_Device * dev, int blockInNAND);
--static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND, int erasedOk);
--static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
--				     const __u8 * data,
--				     const yaffs_ExtendedTags * tags);
--static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
--				    const yaffs_ExtendedTags * tags);
-+static void yaffs_RetireBlock(yaffs_Device *dev, int blockInNAND);
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND,
-+		int erasedOk);
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+				const __u8 *data,
-+				const yaffs_ExtendedTags *tags);
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+				const yaffs_ExtendedTags *tags);
- 
- /* Other local prototypes */
--static int yaffs_UnlinkObject( yaffs_Object *obj);
-+static int yaffs_UnlinkObject(yaffs_Object *obj);
- static int yaffs_ObjectHasCachedWriteData(yaffs_Object *obj);
- 
- static void yaffs_HardlinkFixup(yaffs_Device *dev, yaffs_Object *hardList);
- 
--static int yaffs_WriteNewChunkWithTagsToNAND(yaffs_Device * dev,
--					     const __u8 * buffer,
--					     yaffs_ExtendedTags * tags,
--					     int useReserve);
--static int yaffs_PutChunkIntoFile(yaffs_Object * in, int chunkInInode,
--				  int chunkInNAND, int inScan);
--
--static yaffs_Object *yaffs_CreateNewObject(yaffs_Device * dev, int number,
--					   yaffs_ObjectType type);
--static void yaffs_AddObjectToDirectory(yaffs_Object * directory,
--				       yaffs_Object * obj);
--static int yaffs_UpdateObjectHeader(yaffs_Object * in, const YCHAR * name,
--				    int force, int isShrink, int shadows);
--static void yaffs_RemoveObjectFromDirectory(yaffs_Object * obj);
-+static int yaffs_WriteNewChunkWithTagsToNAND(yaffs_Device *dev,
-+					const __u8 *buffer,
-+					yaffs_ExtendedTags *tags,
-+					int useReserve);
-+static int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode,
-+				int chunkInNAND, int inScan);
-+
-+static yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev, int number,
-+					yaffs_ObjectType type);
-+static void yaffs_AddObjectToDirectory(yaffs_Object *directory,
-+				yaffs_Object *obj);
-+static int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name,
-+				int force, int isShrink, int shadows);
-+static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj);
- static int yaffs_CheckStructures(void);
--static int yaffs_DeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, __u32 level,
--			      int chunkOffset, int *limit);
--static int yaffs_DoGenericObjectDeletion(yaffs_Object * in);
--
--static yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blockNo);
--
--static __u8 *yaffs_GetTempBuffer(yaffs_Device * dev, int lineNo);
--static void yaffs_ReleaseTempBuffer(yaffs_Device * dev, __u8 * buffer,
--				    int lineNo);
-+static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level,
-+			int chunkOffset, int *limit);
-+static int yaffs_DoGenericObjectDeletion(yaffs_Object *in);
-+
-+static yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device *dev, int blockNo);
- 
--static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
--				  int chunkInNAND);
- 
--static int yaffs_UnlinkWorker(yaffs_Object * obj);
--static void yaffs_DestroyObject(yaffs_Object * obj);
-+static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
-+				int chunkInNAND);
- 
--static int yaffs_TagsMatch(const yaffs_ExtendedTags * tags, int objectId,
--			   int chunkInObject);
-+static int yaffs_UnlinkWorker(yaffs_Object *obj);
- 
--loff_t yaffs_GetFileSize(yaffs_Object * obj);
-+static int yaffs_TagsMatch(const yaffs_ExtendedTags *tags, int objectId,
-+			int chunkInObject);
- 
--static int yaffs_AllocateChunk(yaffs_Device * dev, int useReserve, yaffs_BlockInfo **blockUsedPtr);
-+static int yaffs_AllocateChunk(yaffs_Device *dev, int useReserve,
-+				yaffs_BlockInfo **blockUsedPtr);
- 
--static void yaffs_VerifyFreeChunks(yaffs_Device * dev);
-+static void yaffs_VerifyFreeChunks(yaffs_Device *dev);
- 
- static void yaffs_CheckObjectDetailsLoaded(yaffs_Object *in);
- 
-+static void yaffs_VerifyDirectory(yaffs_Object *directory);
- #ifdef YAFFS_PARANOID
--static int yaffs_CheckFileSanity(yaffs_Object * in);
-+static int yaffs_CheckFileSanity(yaffs_Object *in);
- #else
- #define yaffs_CheckFileSanity(in)
- #endif
- 
--static void yaffs_InvalidateWholeChunkCache(yaffs_Object * in);
--static void yaffs_InvalidateChunkCache(yaffs_Object * object, int chunkId);
-+static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in);
-+static void yaffs_InvalidateChunkCache(yaffs_Object *object, int chunkId);
- 
- static void yaffs_InvalidateCheckpoint(yaffs_Device *dev);
- 
--static int yaffs_FindChunkInFile(yaffs_Object * in, int chunkInInode,
--				 yaffs_ExtendedTags * tags);
-+static int yaffs_FindChunkInFile(yaffs_Object *in, int chunkInInode,
-+				yaffs_ExtendedTags *tags);
- 
--static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos);
--static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device * dev,
--					  yaffs_FileStructure * fStruct,
--					  __u32 chunkId);
-+static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn,
-+		unsigned pos);
-+static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev,
-+					yaffs_FileStructure *fStruct,
-+					__u32 chunkId);
- 
- 
- /* Function to calculate chunk and offset */
- 
--static void yaffs_AddrToChunk(yaffs_Device *dev, loff_t addr, __u32 *chunk, __u32 *offset)
-+static void yaffs_AddrToChunk(yaffs_Device *dev, loff_t addr, int *chunkOut,
-+		__u32 *offsetOut)
- {
--	if(dev->chunkShift){
--		/* Easy-peasy power of 2 case */
--		*chunk  = (__u32)(addr >> dev->chunkShift);
--		*offset = (__u32)(addr & dev->chunkMask);
--	}
--	else if(dev->crumbsPerChunk)
--	{
--		/* Case where we're using "crumbs" */
--		*offset = (__u32)(addr & dev->crumbMask);
--		addr >>= dev->crumbShift;
--		*chunk = ((__u32)addr)/dev->crumbsPerChunk;
--		*offset += ((addr - (*chunk * dev->crumbsPerChunk)) << dev->crumbShift);
-+	int chunk;
-+	__u32 offset;
-+
-+	chunk  = (__u32)(addr >> dev->chunkShift);
-+
-+	if (dev->chunkDiv == 1) {
-+		/* easy power of 2 case */
-+		offset = (__u32)(addr & dev->chunkMask);
-+	} else {
-+		/* Non power-of-2 case */
-+
-+		loff_t chunkBase;
-+
-+		chunk /= dev->chunkDiv;
-+
-+		chunkBase = ((loff_t)chunk) * dev->nDataBytesPerChunk;
-+		offset = (__u32)(addr - chunkBase);
- 	}
--	else
--		YBUG();
-+
-+	*chunkOut = chunk;
-+	*offsetOut = offset;
- }
- 
--/* Function to return the number of shifts for a power of 2 greater than or equal
-- * to the given number
-+/* Function to return the number of shifts for a power of 2 greater than or
-+ * equal to the given number
-  * Note we don't try to cater for all possible numbers and this does not have to
-  * be hellishly efficient.
-  */
-@@ -153,13 +154,14 @@ static __u32 ShiftsGE(__u32 x)
- 
- 	nShifts = extraBits = 0;
- 
--	while(x>1){
--		if(x & 1) extraBits++;
--		x>>=1;
-+	while (x > 1) {
-+		if (x & 1)
-+			extraBits++;
-+		x >>= 1;
- 		nShifts++;
- 	}
- 
--	if(extraBits)
-+	if (extraBits)
- 		nShifts++;
- 
- 	return nShifts;
-@@ -168,16 +170,17 @@ static __u32 ShiftsGE(__u32 x)
- /* Function to return the number of shifts to get a 1 in bit 0
-  */
- 
--static __u32 ShiftDiv(__u32 x)
-+static __u32 Shifts(__u32 x)
- {
- 	int nShifts;
- 
- 	nShifts =  0;
- 
--	if(!x) return 0;
-+	if (!x)
-+		return 0;
- 
--	while( !(x&1)){
--		x>>=1;
-+	while (!(x&1)) {
-+		x >>= 1;
- 		nShifts++;
- 	}
- 
-@@ -195,21 +198,25 @@ static int yaffs_InitialiseTempBuffers(y
- 	int i;
- 	__u8 *buf = (__u8 *)1;
- 
--	memset(dev->tempBuffer,0,sizeof(dev->tempBuffer));
-+	memset(dev->tempBuffer, 0, sizeof(dev->tempBuffer));
- 
- 	for (i = 0; buf && i < YAFFS_N_TEMP_BUFFERS; i++) {
- 		dev->tempBuffer[i].line = 0;	/* not in use */
- 		dev->tempBuffer[i].buffer = buf =
--		    YMALLOC_DMA(dev->nDataBytesPerChunk);
-+		    YMALLOC_DMA(dev->totalBytesPerChunk);
- 	}
- 
- 	return buf ? YAFFS_OK : YAFFS_FAIL;
--
- }
- 
--static __u8 *yaffs_GetTempBuffer(yaffs_Device * dev, int lineNo)
-+__u8 *yaffs_GetTempBuffer(yaffs_Device *dev, int lineNo)
- {
- 	int i, j;
-+
-+	dev->tempInUse++;
-+	if (dev->tempInUse > dev->maxTemp)
-+		dev->maxTemp = dev->tempInUse;
-+
- 	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
- 		if (dev->tempBuffer[i].line == 0) {
- 			dev->tempBuffer[i].line = lineNo;
-@@ -227,9 +234,9 @@ static __u8 *yaffs_GetTempBuffer(yaffs_D
- 	T(YAFFS_TRACE_BUFFERS,
- 	  (TSTR("Out of temp buffers at line %d, other held by lines:"),
- 	   lineNo));
--	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
-+	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++)
- 		T(YAFFS_TRACE_BUFFERS, (TSTR(" %d "), dev->tempBuffer[i].line));
--	}
-+
- 	T(YAFFS_TRACE_BUFFERS, (TSTR(" " TENDSTR)));
- 
- 	/*
-@@ -242,10 +249,13 @@ static __u8 *yaffs_GetTempBuffer(yaffs_D
- 
- }
- 
--static void yaffs_ReleaseTempBuffer(yaffs_Device * dev, __u8 * buffer,
-+void yaffs_ReleaseTempBuffer(yaffs_Device *dev, __u8 *buffer,
- 				    int lineNo)
- {
- 	int i;
-+
-+	dev->tempInUse--;
-+
- 	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
- 		if (dev->tempBuffer[i].buffer == buffer) {
- 			dev->tempBuffer[i].line = 0;
-@@ -267,27 +277,26 @@ static void yaffs_ReleaseTempBuffer(yaff
- /*
-  * Determine if we have a managed buffer.
-  */
--int yaffs_IsManagedTempBuffer(yaffs_Device * dev, const __u8 * buffer)
-+int yaffs_IsManagedTempBuffer(yaffs_Device *dev, const __u8 *buffer)
- {
- 	int i;
-+
- 	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
- 		if (dev->tempBuffer[i].buffer == buffer)
- 			return 1;
-+	}
- 
-+	for (i = 0; i < dev->nShortOpCaches; i++) {
-+		if (dev->srCache[i].data == buffer)
-+			return 1;
- 	}
- 
--    for (i = 0; i < dev->nShortOpCaches; i++) {
--        if( dev->srCache[i].data == buffer )
--            return 1;
--
--    }
--
--    if (buffer == dev->checkpointBuffer)
--      return 1;
--
--    T(YAFFS_TRACE_ALWAYS,
--	  (TSTR("yaffs: unmaged buffer detected.\n" TENDSTR)));
--    return 0;
-+	if (buffer == dev->checkpointBuffer)
-+		return 1;
-+
-+	T(YAFFS_TRACE_ALWAYS,
-+		(TSTR("yaffs: unmaged buffer detected.\n" TENDSTR)));
-+	return 0;
- }
- 
- 
-@@ -296,62 +305,63 @@ int yaffs_IsManagedTempBuffer(yaffs_Devi
-  * Chunk bitmap manipulations
-  */
- 
--static Y_INLINE __u8 *yaffs_BlockBits(yaffs_Device * dev, int blk)
-+static Y_INLINE __u8 *yaffs_BlockBits(yaffs_Device *dev, int blk)
- {
- 	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
- 		T(YAFFS_TRACE_ERROR,
--		  (TSTR("**>> yaffs: BlockBits block %d is not valid" TENDSTR),
--		   blk));
-+			(TSTR("**>> yaffs: BlockBits block %d is not valid" TENDSTR),
-+			blk));
- 		YBUG();
- 	}
- 	return dev->chunkBits +
--	    (dev->chunkBitmapStride * (blk - dev->internalStartBlock));
-+		(dev->chunkBitmapStride * (blk - dev->internalStartBlock));
- }
- 
- static Y_INLINE void yaffs_VerifyChunkBitId(yaffs_Device *dev, int blk, int chunk)
- {
--	if(blk < dev->internalStartBlock || blk > dev->internalEndBlock ||
--	   chunk < 0 || chunk >= dev->nChunksPerBlock) {
--	   T(YAFFS_TRACE_ERROR,
--	    (TSTR("**>> yaffs: Chunk Id (%d:%d) invalid"TENDSTR),blk,chunk));
--	    YBUG();
-+	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock ||
-+			chunk < 0 || chunk >= dev->nChunksPerBlock) {
-+		T(YAFFS_TRACE_ERROR,
-+		(TSTR("**>> yaffs: Chunk Id (%d:%d) invalid"TENDSTR),
-+			blk, chunk));
-+		YBUG();
- 	}
- }
- 
--static Y_INLINE void yaffs_ClearChunkBits(yaffs_Device * dev, int blk)
-+static Y_INLINE void yaffs_ClearChunkBits(yaffs_Device *dev, int blk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 
- 	memset(blkBits, 0, dev->chunkBitmapStride);
- }
- 
--static Y_INLINE void yaffs_ClearChunkBit(yaffs_Device * dev, int blk, int chunk)
-+static Y_INLINE void yaffs_ClearChunkBit(yaffs_Device *dev, int blk, int chunk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 
--	yaffs_VerifyChunkBitId(dev,blk,chunk);
-+	yaffs_VerifyChunkBitId(dev, blk, chunk);
- 
- 	blkBits[chunk / 8] &= ~(1 << (chunk & 7));
- }
- 
--static Y_INLINE void yaffs_SetChunkBit(yaffs_Device * dev, int blk, int chunk)
-+static Y_INLINE void yaffs_SetChunkBit(yaffs_Device *dev, int blk, int chunk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 
--	yaffs_VerifyChunkBitId(dev,blk,chunk);
-+	yaffs_VerifyChunkBitId(dev, blk, chunk);
- 
- 	blkBits[chunk / 8] |= (1 << (chunk & 7));
- }
- 
--static Y_INLINE int yaffs_CheckChunkBit(yaffs_Device * dev, int blk, int chunk)
-+static Y_INLINE int yaffs_CheckChunkBit(yaffs_Device *dev, int blk, int chunk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
--	yaffs_VerifyChunkBitId(dev,blk,chunk);
-+	yaffs_VerifyChunkBitId(dev, blk, chunk);
- 
- 	return (blkBits[chunk / 8] & (1 << (chunk & 7))) ? 1 : 0;
- }
- 
--static Y_INLINE int yaffs_StillSomeChunkBits(yaffs_Device * dev, int blk)
-+static Y_INLINE int yaffs_StillSomeChunkBits(yaffs_Device *dev, int blk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 	int i;
-@@ -363,17 +373,17 @@ static Y_INLINE int yaffs_StillSomeChunk
- 	return 0;
- }
- 
--static int yaffs_CountChunkBits(yaffs_Device * dev, int blk)
-+static int yaffs_CountChunkBits(yaffs_Device *dev, int blk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 	int i;
- 	int n = 0;
- 	for (i = 0; i < dev->chunkBitmapStride; i++) {
- 		__u8 x = *blkBits;
--		while(x){
--			if(x & 1)
-+		while (x) {
-+			if (x & 1)
- 				n++;
--			x >>=1;
-+			x >>= 1;
- 		}
- 
- 		blkBits++;
-@@ -400,7 +410,7 @@ static int yaffs_SkipNANDVerification(ya
- 	return !(yaffs_traceMask & (YAFFS_TRACE_VERIFY_NAND));
- }
- 
--static const char * blockStateName[] = {
-+static const char *blockStateName[] = {
- "Unknown",
- "Needs scanning",
- "Scanning",
-@@ -413,64 +423,65 @@ static const char * blockStateName[] = {
- "Dead"
- };
- 
--static void yaffs_VerifyBlock(yaffs_Device *dev,yaffs_BlockInfo *bi,int n)
-+static void yaffs_VerifyBlock(yaffs_Device *dev, yaffs_BlockInfo *bi, int n)
- {
- 	int actuallyUsed;
- 	int inUse;
- 
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
- 	/* Report illegal runtime states */
--	if(bi->blockState <0 || bi->blockState >= YAFFS_NUMBER_OF_BLOCK_STATES)
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has undefined state %d"TENDSTR),n,bi->blockState));
-+	if (bi->blockState >= YAFFS_NUMBER_OF_BLOCK_STATES)
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has undefined state %d"TENDSTR), n, bi->blockState));
- 
--	switch(bi->blockState){
--	 case YAFFS_BLOCK_STATE_UNKNOWN:
--	 case YAFFS_BLOCK_STATE_SCANNING:
--	 case YAFFS_BLOCK_STATE_NEEDS_SCANNING:
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has bad run-state %s"TENDSTR),
--		n,blockStateName[bi->blockState]));
-+	switch (bi->blockState) {
-+	case YAFFS_BLOCK_STATE_UNKNOWN:
-+	case YAFFS_BLOCK_STATE_SCANNING:
-+	case YAFFS_BLOCK_STATE_NEEDS_SCANNING:
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has bad run-state %s"TENDSTR),
-+		n, blockStateName[bi->blockState]));
- 	}
- 
- 	/* Check pages in use and soft deletions are legal */
- 
- 	actuallyUsed = bi->pagesInUse - bi->softDeletions;
- 
--	if(bi->pagesInUse < 0 || bi->pagesInUse > dev->nChunksPerBlock ||
-+	if (bi->pagesInUse < 0 || bi->pagesInUse > dev->nChunksPerBlock ||
- 	   bi->softDeletions < 0 || bi->softDeletions > dev->nChunksPerBlock ||
- 	   actuallyUsed < 0 || actuallyUsed > dev->nChunksPerBlock)
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has illegal values pagesInUsed %d softDeletions %d"TENDSTR),
--		n,bi->pagesInUse,bi->softDeletions));
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has illegal values pagesInUsed %d softDeletions %d"TENDSTR),
-+		n, bi->pagesInUse, bi->softDeletions));
- 
- 
- 	/* Check chunk bitmap legal */
--	inUse = yaffs_CountChunkBits(dev,n);
--	if(inUse != bi->pagesInUse)
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has inconsistent values pagesInUse %d counted chunk bits %d"TENDSTR),
--			n,bi->pagesInUse,inUse));
-+	inUse = yaffs_CountChunkBits(dev, n);
-+	if (inUse != bi->pagesInUse)
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has inconsistent values pagesInUse %d counted chunk bits %d"TENDSTR),
-+			n, bi->pagesInUse, inUse));
- 
- 	/* Check that the sequence number is valid.
- 	 * Ten million is legal, but is very unlikely
- 	 */
--	if(dev->isYaffs2 &&
-+	if (dev->isYaffs2 &&
- 	   (bi->blockState == YAFFS_BLOCK_STATE_ALLOCATING || bi->blockState == YAFFS_BLOCK_STATE_FULL) &&
--	   (bi->sequenceNumber < YAFFS_LOWEST_SEQUENCE_NUMBER || bi->sequenceNumber > 10000000 ))
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has suspect sequence number of %d"TENDSTR),
--		n,bi->sequenceNumber));
--
-+	   (bi->sequenceNumber < YAFFS_LOWEST_SEQUENCE_NUMBER || bi->sequenceNumber > 10000000))
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has suspect sequence number of %d"TENDSTR),
-+		n, bi->sequenceNumber));
- }
- 
--static void yaffs_VerifyCollectedBlock(yaffs_Device *dev,yaffs_BlockInfo *bi,int n)
-+static void yaffs_VerifyCollectedBlock(yaffs_Device *dev, yaffs_BlockInfo *bi,
-+		int n)
- {
--	yaffs_VerifyBlock(dev,bi,n);
-+	yaffs_VerifyBlock(dev, bi, n);
- 
- 	/* After collection the block should be in the erased state */
--	/* TODO: This will need to change if we do partial gc */
-+	/* This will need to change if we do partial gc */
- 
--	if(bi->blockState != YAFFS_BLOCK_STATE_EMPTY){
--		T(YAFFS_TRACE_ERROR,(TSTR("Block %d is in state %d after gc, should be erased"TENDSTR),
--			n,bi->blockState));
-+	if (bi->blockState != YAFFS_BLOCK_STATE_COLLECTING &&
-+			bi->blockState != YAFFS_BLOCK_STATE_EMPTY) {
-+		T(YAFFS_TRACE_ERROR, (TSTR("Block %d is in state %d after gc, should be erased"TENDSTR),
-+			n, bi->blockState));
- 	}
- }
- 
-@@ -480,52 +491,49 @@ static void yaffs_VerifyBlocks(yaffs_Dev
- 	int nBlocksPerState[YAFFS_NUMBER_OF_BLOCK_STATES];
- 	int nIllegalBlockStates = 0;
- 
--
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
--	memset(nBlocksPerState,0,sizeof(nBlocksPerState));
--
-+	memset(nBlocksPerState, 0, sizeof(nBlocksPerState));
- 
--	for(i = dev->internalStartBlock; i <= dev->internalEndBlock; i++){
--		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
--		yaffs_VerifyBlock(dev,bi,i);
-+	for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
-+		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
-+		yaffs_VerifyBlock(dev, bi, i);
- 
--		if(bi->blockState >=0 && bi->blockState < YAFFS_NUMBER_OF_BLOCK_STATES)
-+		if (bi->blockState < YAFFS_NUMBER_OF_BLOCK_STATES)
- 			nBlocksPerState[bi->blockState]++;
- 		else
- 			nIllegalBlockStates++;
--
- 	}
- 
--	T(YAFFS_TRACE_VERIFY,(TSTR(""TENDSTR)));
--	T(YAFFS_TRACE_VERIFY,(TSTR("Block summary"TENDSTR)));
-+	T(YAFFS_TRACE_VERIFY, (TSTR(""TENDSTR)));
-+	T(YAFFS_TRACE_VERIFY, (TSTR("Block summary"TENDSTR)));
- 
--	T(YAFFS_TRACE_VERIFY,(TSTR("%d blocks have illegal states"TENDSTR),nIllegalBlockStates));
--	if(nBlocksPerState[YAFFS_BLOCK_STATE_ALLOCATING] > 1)
--		T(YAFFS_TRACE_VERIFY,(TSTR("Too many allocating blocks"TENDSTR)));
-+	T(YAFFS_TRACE_VERIFY, (TSTR("%d blocks have illegal states"TENDSTR), nIllegalBlockStates));
-+	if (nBlocksPerState[YAFFS_BLOCK_STATE_ALLOCATING] > 1)
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Too many allocating blocks"TENDSTR)));
- 
--	for(i = 0; i < YAFFS_NUMBER_OF_BLOCK_STATES; i++)
-+	for (i = 0; i < YAFFS_NUMBER_OF_BLOCK_STATES; i++)
- 		T(YAFFS_TRACE_VERIFY,
- 		  (TSTR("%s %d blocks"TENDSTR),
--		  blockStateName[i],nBlocksPerState[i]));
-+		  blockStateName[i], nBlocksPerState[i]));
- 
--	if(dev->blocksInCheckpoint != nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT])
-+	if (dev->blocksInCheckpoint != nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT])
- 		T(YAFFS_TRACE_VERIFY,
- 		 (TSTR("Checkpoint block count wrong dev %d count %d"TENDSTR),
- 		 dev->blocksInCheckpoint, nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT]));
- 
--	if(dev->nErasedBlocks != nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY])
-+	if (dev->nErasedBlocks != nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY])
- 		T(YAFFS_TRACE_VERIFY,
- 		 (TSTR("Erased block count wrong dev %d count %d"TENDSTR),
- 		 dev->nErasedBlocks, nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY]));
- 
--	if(nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING] > 1)
-+	if (nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING] > 1)
- 		T(YAFFS_TRACE_VERIFY,
- 		 (TSTR("Too many collecting blocks %d (max is 1)"TENDSTR),
- 		 nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING]));
- 
--	T(YAFFS_TRACE_VERIFY,(TSTR(""TENDSTR)));
-+	T(YAFFS_TRACE_VERIFY, (TSTR(""TENDSTR)));
- 
- }
- 
-@@ -535,26 +543,26 @@ static void yaffs_VerifyBlocks(yaffs_Dev
-  */
- static void yaffs_VerifyObjectHeader(yaffs_Object *obj, yaffs_ObjectHeader *oh, yaffs_ExtendedTags *tags, int parentCheck)
- {
--	if(yaffs_SkipVerification(obj->myDev))
-+	if (obj && yaffs_SkipVerification(obj->myDev))
- 		return;
- 
--	if(!(tags && obj && oh)){
--	 	T(YAFFS_TRACE_VERIFY,
--		 		(TSTR("Verifying object header tags %x obj %x oh %x"TENDSTR),
--		 		(__u32)tags,(__u32)obj,(__u32)oh));
-+	if (!(tags && obj && oh)) {
-+		T(YAFFS_TRACE_VERIFY,
-+				(TSTR("Verifying object header tags %x obj %x oh %x"TENDSTR),
-+				(__u32)tags, (__u32)obj, (__u32)oh));
- 		return;
- 	}
- 
--	if(oh->type <= YAFFS_OBJECT_TYPE_UNKNOWN ||
--	   oh->type > YAFFS_OBJECT_TYPE_MAX)
--	 	T(YAFFS_TRACE_VERIFY,
--		 (TSTR("Obj %d header type is illegal value 0x%x"TENDSTR),
--		 tags->objectId, oh->type));
--
--	if(tags->objectId != obj->objectId)
--	 	T(YAFFS_TRACE_VERIFY,
--		 (TSTR("Obj %d header mismatch objectId %d"TENDSTR),
--		 tags->objectId, obj->objectId));
-+	if (oh->type <= YAFFS_OBJECT_TYPE_UNKNOWN ||
-+			oh->type > YAFFS_OBJECT_TYPE_MAX)
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d header type is illegal value 0x%x"TENDSTR),
-+			tags->objectId, oh->type));
-+
-+	if (tags->objectId != obj->objectId)
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d header mismatch objectId %d"TENDSTR),
-+			tags->objectId, obj->objectId));
- 
- 
- 	/*
-@@ -563,46 +571,43 @@ static void yaffs_VerifyObjectHeader(yaf
- 	 * Tests do not apply to the root object.
- 	 */
- 
--	if(parentCheck && tags->objectId > 1 && !obj->parent)
--	 	T(YAFFS_TRACE_VERIFY,
--		 (TSTR("Obj %d header mismatch parentId %d obj->parent is NULL"TENDSTR),
--	 	 tags->objectId, oh->parentObjectId));
--
--
--	if(parentCheck && obj->parent &&
--	   oh->parentObjectId != obj->parent->objectId &&
--	   (oh->parentObjectId != YAFFS_OBJECTID_UNLINKED ||
--	    obj->parent->objectId != YAFFS_OBJECTID_DELETED))
--	 	T(YAFFS_TRACE_VERIFY,
--		 (TSTR("Obj %d header mismatch parentId %d parentObjectId %d"TENDSTR),
--	 	 tags->objectId, oh->parentObjectId, obj->parent->objectId));
-+	if (parentCheck && tags->objectId > 1 && !obj->parent)
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d header mismatch parentId %d obj->parent is NULL"TENDSTR),
-+			tags->objectId, oh->parentObjectId));
- 
-+	if (parentCheck && obj->parent &&
-+			oh->parentObjectId != obj->parent->objectId &&
-+			(oh->parentObjectId != YAFFS_OBJECTID_UNLINKED ||
-+			obj->parent->objectId != YAFFS_OBJECTID_DELETED))
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d header mismatch parentId %d parentObjectId %d"TENDSTR),
-+			tags->objectId, oh->parentObjectId, obj->parent->objectId));
- 
--	if(tags->objectId > 1 && oh->name[0] == 0) /* Null name */
-+	if (tags->objectId > 1 && oh->name[0] == 0) /* Null name */
- 		T(YAFFS_TRACE_VERIFY,
--		(TSTR("Obj %d header name is NULL"TENDSTR),
--		 obj->objectId));
-+			(TSTR("Obj %d header name is NULL"TENDSTR),
-+			obj->objectId));
- 
--	if(tags->objectId > 1 && ((__u8)(oh->name[0])) == 0xff) /* Trashed name */
-+	if (tags->objectId > 1 && ((__u8)(oh->name[0])) == 0xff) /* Trashed name */
- 		T(YAFFS_TRACE_VERIFY,
--		(TSTR("Obj %d header name is 0xFF"TENDSTR),
--		 obj->objectId));
-+			(TSTR("Obj %d header name is 0xFF"TENDSTR),
-+			obj->objectId));
- }
- 
- 
- 
--static int yaffs_VerifyTnodeWorker(yaffs_Object * obj, yaffs_Tnode * tn,
--				  	__u32 level, int chunkOffset)
-+static int yaffs_VerifyTnodeWorker(yaffs_Object *obj, yaffs_Tnode *tn,
-+					__u32 level, int chunkOffset)
- {
- 	int i;
- 	yaffs_Device *dev = obj->myDev;
- 	int ok = 1;
--	int nTnodeBytes = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
- 
- 	if (tn) {
- 		if (level > 0) {
- 
--			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++){
-+			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++) {
- 				if (tn->internal[i]) {
- 					ok = yaffs_VerifyTnodeWorker(obj,
- 							tn->internal[i],
-@@ -611,20 +616,19 @@ static int yaffs_VerifyTnodeWorker(yaffs
- 				}
- 			}
- 		} else if (level == 0) {
--			int i;
- 			yaffs_ExtendedTags tags;
- 			__u32 objectId = obj->objectId;
- 
- 			chunkOffset <<=  YAFFS_TNODES_LEVEL0_BITS;
- 
--			for(i = 0; i < YAFFS_NTNODES_LEVEL0; i++){
--				__u32 theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
-+			for (i = 0; i < YAFFS_NTNODES_LEVEL0; i++) {
-+				__u32 theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
- 
--				if(theChunk > 0){
-+				if (theChunk > 0) {
- 					/* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),tags.objectId,tags.chunkId,theChunk)); */
--					yaffs_ReadChunkWithTagsFromNAND(dev,theChunk,NULL, &tags);
--					if(tags.objectId != objectId || tags.chunkId != chunkOffset){
--						T(~0,(TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
-+					yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL, &tags);
-+					if (tags.objectId != objectId || tags.chunkId != chunkOffset) {
-+						T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
- 							objectId, chunkOffset, theChunk,
- 							tags.objectId, tags.chunkId));
- 					}
-@@ -646,13 +650,15 @@ static void yaffs_VerifyFile(yaffs_Objec
- 	__u32 lastChunk;
- 	__u32 x;
- 	__u32 i;
--	int ok;
- 	yaffs_Device *dev;
- 	yaffs_ExtendedTags tags;
- 	yaffs_Tnode *tn;
- 	__u32 objectId;
- 
--	if(obj && yaffs_SkipVerification(obj->myDev))
-+	if (!obj)
-+		return;
-+
-+	if (yaffs_SkipVerification(obj->myDev))
- 		return;
- 
- 	dev = obj->myDev;
-@@ -662,17 +668,17 @@ static void yaffs_VerifyFile(yaffs_Objec
- 	lastChunk =  obj->variant.fileVariant.fileSize / dev->nDataBytesPerChunk + 1;
- 	x = lastChunk >> YAFFS_TNODES_LEVEL0_BITS;
- 	requiredTallness = 0;
--	while (x> 0) {
-+	while (x > 0) {
- 		x >>= YAFFS_TNODES_INTERNAL_BITS;
- 		requiredTallness++;
- 	}
- 
- 	actualTallness = obj->variant.fileVariant.topLevel;
- 
--	if(requiredTallness > actualTallness )
-+	if (requiredTallness > actualTallness)
- 		T(YAFFS_TRACE_VERIFY,
- 		(TSTR("Obj %d had tnode tallness %d, needs to be %d"TENDSTR),
--		 obj->objectId,actualTallness, requiredTallness));
-+		 obj->objectId, actualTallness, requiredTallness));
- 
- 
- 	/* Check that the chunks in the tnode tree are all correct.
-@@ -680,39 +686,31 @@ static void yaffs_VerifyFile(yaffs_Objec
- 	 * checking the tags for every chunk match.
- 	 */
- 
--	if(yaffs_SkipNANDVerification(dev))
-+	if (yaffs_SkipNANDVerification(dev))
- 		return;
- 
--	for(i = 1; i <= lastChunk; i++){
--		tn = yaffs_FindLevel0Tnode(dev, &obj->variant.fileVariant,i);
-+	for (i = 1; i <= lastChunk; i++) {
-+		tn = yaffs_FindLevel0Tnode(dev, &obj->variant.fileVariant, i);
- 
- 		if (tn) {
--			__u32 theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
--			if(theChunk > 0){
-+			__u32 theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
-+			if (theChunk > 0) {
- 				/* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),objectId,i,theChunk)); */
--				yaffs_ReadChunkWithTagsFromNAND(dev,theChunk,NULL, &tags);
--				if(tags.objectId != objectId || tags.chunkId != i){
--					T(~0,(TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
-+				yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL, &tags);
-+				if (tags.objectId != objectId || tags.chunkId != i) {
-+					T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
- 						objectId, i, theChunk,
- 						tags.objectId, tags.chunkId));
- 				}
- 			}
- 		}
--
- 	}
--
- }
- 
--static void yaffs_VerifyDirectory(yaffs_Object *obj)
--{
--	if(obj && yaffs_SkipVerification(obj->myDev))
--		return;
--
--}
- 
- static void yaffs_VerifyHardLink(yaffs_Object *obj)
- {
--	if(obj && yaffs_SkipVerification(obj->myDev))
-+	if (obj && yaffs_SkipVerification(obj->myDev))
- 		return;
- 
- 	/* Verify sane equivalent object */
-@@ -720,7 +718,7 @@ static void yaffs_VerifyHardLink(yaffs_O
- 
- static void yaffs_VerifySymlink(yaffs_Object *obj)
- {
--	if(obj && yaffs_SkipVerification(obj->myDev))
-+	if (obj && yaffs_SkipVerification(obj->myDev))
- 		return;
- 
- 	/* Verify symlink string */
-@@ -728,7 +726,7 @@ static void yaffs_VerifySymlink(yaffs_Ob
- 
- static void yaffs_VerifySpecial(yaffs_Object *obj)
- {
--	if(obj && yaffs_SkipVerification(obj->myDev))
-+	if (obj && yaffs_SkipVerification(obj->myDev))
- 		return;
- }
- 
-@@ -740,14 +738,19 @@ static void yaffs_VerifyObject(yaffs_Obj
- 	__u32 chunkMax;
- 
- 	__u32 chunkIdOk;
--	__u32 chunkIsLive;
-+	__u32 chunkInRange;
-+	__u32 chunkShouldNotBeDeleted;
-+	__u32 chunkValid;
-+
-+	if (!obj)
-+		return;
- 
--	if(!obj)
-+	if (obj->beingCreated)
- 		return;
- 
- 	dev = obj->myDev;
- 
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
- 	/* Check sane object header chunk */
-@@ -755,50 +758,54 @@ static void yaffs_VerifyObject(yaffs_Obj
- 	chunkMin = dev->internalStartBlock * dev->nChunksPerBlock;
- 	chunkMax = (dev->internalEndBlock+1) * dev->nChunksPerBlock - 1;
- 
--	chunkIdOk = (obj->chunkId >= chunkMin && obj->chunkId <= chunkMax);
--	chunkIsLive = chunkIdOk &&
-+	chunkInRange = (((unsigned)(obj->hdrChunk)) >= chunkMin && ((unsigned)(obj->hdrChunk)) <= chunkMax);
-+	chunkIdOk = chunkInRange || obj->hdrChunk == 0;
-+	chunkValid = chunkInRange &&
- 			yaffs_CheckChunkBit(dev,
--					    obj->chunkId / dev->nChunksPerBlock,
--					    obj->chunkId % dev->nChunksPerBlock);
--	if(!obj->fake &&
--	    (!chunkIdOk || !chunkIsLive)) {
--	   T(YAFFS_TRACE_VERIFY,
--	   (TSTR("Obj %d has chunkId %d %s %s"TENDSTR),
--	   obj->objectId,obj->chunkId,
--	   chunkIdOk ? "" : ",out of range",
--	   chunkIsLive || !chunkIdOk ? "" : ",marked as deleted"));
-+					obj->hdrChunk / dev->nChunksPerBlock,
-+					obj->hdrChunk % dev->nChunksPerBlock);
-+	chunkShouldNotBeDeleted = chunkInRange && !chunkValid;
-+
-+	if (!obj->fake &&
-+			(!chunkIdOk || chunkShouldNotBeDeleted)) {
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d has chunkId %d %s %s"TENDSTR),
-+			obj->objectId, obj->hdrChunk,
-+			chunkIdOk ? "" : ",out of range",
-+			chunkShouldNotBeDeleted ? ",marked as deleted" : ""));
- 	}
- 
--	if(chunkIdOk && chunkIsLive &&!yaffs_SkipNANDVerification(dev)) {
-+	if (chunkValid && !yaffs_SkipNANDVerification(dev)) {
- 		yaffs_ExtendedTags tags;
- 		yaffs_ObjectHeader *oh;
--		__u8 *buffer = yaffs_GetTempBuffer(dev,__LINE__);
-+		__u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
- 
- 		oh = (yaffs_ObjectHeader *)buffer;
- 
--		yaffs_ReadChunkWithTagsFromNAND(dev, obj->chunkId,buffer, &tags);
-+		yaffs_ReadChunkWithTagsFromNAND(dev, obj->hdrChunk, buffer,
-+				&tags);
- 
--		yaffs_VerifyObjectHeader(obj,oh,&tags,1);
-+		yaffs_VerifyObjectHeader(obj, oh, &tags, 1);
- 
--		yaffs_ReleaseTempBuffer(dev,buffer,__LINE__);
-+		yaffs_ReleaseTempBuffer(dev, buffer, __LINE__);
- 	}
- 
- 	/* Verify it has a parent */
--	if(obj && !obj->fake &&
--	   (!obj->parent || obj->parent->myDev != dev)){
--	   T(YAFFS_TRACE_VERIFY,
--	   (TSTR("Obj %d has parent pointer %p which does not look like an object"TENDSTR),
--	   obj->objectId,obj->parent));
-+	if (obj && !obj->fake &&
-+			(!obj->parent || obj->parent->myDev != dev)) {
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d has parent pointer %p which does not look like an object"TENDSTR),
-+			obj->objectId, obj->parent));
- 	}
- 
- 	/* Verify parent is a directory */
--	if(obj->parent && obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY){
--	   T(YAFFS_TRACE_VERIFY,
--	   (TSTR("Obj %d's parent is not a directory (type %d)"TENDSTR),
--	   obj->objectId,obj->parent->variantType));
-+	if (obj->parent && obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d's parent is not a directory (type %d)"TENDSTR),
-+			obj->objectId, obj->parent->variantType));
- 	}
- 
--	switch(obj->variantType){
-+	switch (obj->variantType) {
- 	case YAFFS_OBJECT_TYPE_FILE:
- 		yaffs_VerifyFile(obj);
- 		break;
-@@ -818,33 +825,30 @@ static void yaffs_VerifyObject(yaffs_Obj
- 	default:
- 		T(YAFFS_TRACE_VERIFY,
- 		(TSTR("Obj %d has illegaltype %d"TENDSTR),
--		obj->objectId,obj->variantType));
-+		obj->objectId, obj->variantType));
- 		break;
- 	}
--
--
- }
- 
- static void yaffs_VerifyObjects(yaffs_Device *dev)
- {
- 	yaffs_Object *obj;
- 	int i;
--	struct list_head *lh;
-+	struct ylist_head *lh;
- 
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
- 	/* Iterate through the objects in each hash entry */
- 
--	 for(i = 0; i <  YAFFS_NOBJECT_BUCKETS; i++){
--	 	list_for_each(lh, &dev->objectBucket[i].list) {
-+	for (i = 0; i <  YAFFS_NOBJECT_BUCKETS; i++) {
-+		ylist_for_each(lh, &dev->objectBucket[i].list) {
- 			if (lh) {
--				obj = list_entry(lh, yaffs_Object, hashLink);
-+				obj = ylist_entry(lh, yaffs_Object, hashLink);
- 				yaffs_VerifyObject(obj);
- 			}
- 		}
--	 }
--
-+	}
- }
- 
- 
-@@ -855,19 +859,20 @@ static void yaffs_VerifyObjects(yaffs_De
- static Y_INLINE int yaffs_HashFunction(int n)
- {
- 	n = abs(n);
--	return (n % YAFFS_NOBJECT_BUCKETS);
-+	return n % YAFFS_NOBJECT_BUCKETS;
- }
- 
- /*
-- * Access functions to useful fake objects
-+ * Access functions to useful fake objects.
-+ * Note that root might have a presence in NAND if permissions are set.
-  */
- 
--yaffs_Object *yaffs_Root(yaffs_Device * dev)
-+yaffs_Object *yaffs_Root(yaffs_Device *dev)
- {
- 	return dev->rootDir;
- }
- 
--yaffs_Object *yaffs_LostNFound(yaffs_Device * dev)
-+yaffs_Object *yaffs_LostNFound(yaffs_Device *dev)
- {
- 	return dev->lostNFoundDir;
- }
-@@ -877,7 +882,7 @@ yaffs_Object *yaffs_LostNFound(yaffs_Dev
-  *  Erased NAND checking functions
-  */
- 
--int yaffs_CheckFF(__u8 * buffer, int nBytes)
-+int yaffs_CheckFF(__u8 *buffer, int nBytes)
- {
- 	/* Horrible, slow implementation */
- 	while (nBytes--) {
-@@ -889,9 +894,8 @@ int yaffs_CheckFF(__u8 * buffer, int nBy
- }
- 
- static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
--				  int chunkInNAND)
-+				int chunkInNAND)
- {
--
- 	int retval = YAFFS_OK;
- 	__u8 *data = yaffs_GetTempBuffer(dev, __LINE__);
- 	yaffs_ExtendedTags tags;
-@@ -899,10 +903,9 @@ static int yaffs_CheckChunkErased(struct
- 
- 	result = yaffs_ReadChunkWithTagsFromNAND(dev, chunkInNAND, data, &tags);
- 
--	if(tags.eccResult > YAFFS_ECC_RESULT_NO_ERROR)
-+	if (tags.eccResult > YAFFS_ECC_RESULT_NO_ERROR)
- 		retval = YAFFS_FAIL;
- 
--
- 	if (!yaffs_CheckFF(data, dev->nDataBytesPerChunk) || tags.chunkUsed) {
- 		T(YAFFS_TRACE_NANDACCESS,
- 		  (TSTR("Chunk %d not erased" TENDSTR), chunkInNAND));
-@@ -915,11 +918,10 @@ static int yaffs_CheckChunkErased(struct
- 
- }
- 
--
- static int yaffs_WriteNewChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev,
--					     const __u8 * data,
--					     yaffs_ExtendedTags * tags,
--					     int useReserve)
-+					const __u8 *data,
-+					yaffs_ExtendedTags *tags,
-+					int useReserve)
- {
- 	int attempts = 0;
- 	int writeOk = 0;
-@@ -972,7 +974,7 @@ static int yaffs_WriteNewChunkWithTagsTo
- 			erasedOk = yaffs_CheckChunkErased(dev, chunk);
- 			if (erasedOk != YAFFS_OK) {
- 				T(YAFFS_TRACE_ERROR,
--				(TSTR ("**>> yaffs chunk %d was not erased"
-+				(TSTR("**>> yaffs chunk %d was not erased"
- 				TENDSTR), chunk));
- 
- 				/* try another chunk */
-@@ -992,7 +994,11 @@ static int yaffs_WriteNewChunkWithTagsTo
- 		/* Copy the data into the robustification buffer */
- 		yaffs_HandleWriteChunkOk(dev, chunk, data, tags);
- 
--	} while (writeOk != YAFFS_OK && attempts < yaffs_wr_attempts);
-+	} while (writeOk != YAFFS_OK &&
-+		(yaffs_wr_attempts <= 0 || attempts <= yaffs_wr_attempts));
-+
-+	if (!writeOk)
-+		chunk = -1;
- 
- 	if (attempts > 1) {
- 		T(YAFFS_TRACE_ERROR,
-@@ -1009,13 +1015,35 @@ static int yaffs_WriteNewChunkWithTagsTo
-  * Block retiring for handling a broken block.
-  */
- 
--static void yaffs_RetireBlock(yaffs_Device * dev, int blockInNAND)
-+static void yaffs_RetireBlock(yaffs_Device *dev, int blockInNAND)
- {
- 	yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockInNAND);
- 
- 	yaffs_InvalidateCheckpoint(dev);
- 
--	yaffs_MarkBlockBad(dev, blockInNAND);
-+	if (yaffs_MarkBlockBad(dev, blockInNAND) != YAFFS_OK) {
-+		if (yaffs_EraseBlockInNAND(dev, blockInNAND) != YAFFS_OK) {
-+			T(YAFFS_TRACE_ALWAYS, (TSTR(
-+				"yaffs: Failed to mark bad and erase block %d"
-+				TENDSTR), blockInNAND));
-+		} else {
-+			yaffs_ExtendedTags tags;
-+			int chunkId = blockInNAND * dev->nChunksPerBlock;
-+
-+			__u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
-+
-+			memset(buffer, 0xff, dev->nDataBytesPerChunk);
-+			yaffs_InitialiseTags(&tags);
-+			tags.sequenceNumber = YAFFS_SEQUENCE_BAD_BLOCK;
-+			if (dev->writeChunkWithTagsToNAND(dev, chunkId -
-+				dev->chunkOffset, buffer, &tags) != YAFFS_OK)
-+				T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: Failed to "
-+					TCONT("write bad block marker to block %d")
-+					TENDSTR), blockInNAND));
-+
-+			yaffs_ReleaseTempBuffer(dev, buffer, __LINE__);
-+		}
-+	}
- 
- 	bi->blockState = YAFFS_BLOCK_STATE_DEAD;
- 	bi->gcPrioritise = 0;
-@@ -1029,49 +1057,45 @@ static void yaffs_RetireBlock(yaffs_Devi
-  *
-  */
- 
--static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
--				     const __u8 * data,
--				     const yaffs_ExtendedTags * tags)
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+				const __u8 *data,
-+				const yaffs_ExtendedTags *tags)
- {
- }
- 
--static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
--				    const yaffs_ExtendedTags * tags)
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+				const yaffs_ExtendedTags *tags)
- {
- }
- 
- void yaffs_HandleChunkError(yaffs_Device *dev, yaffs_BlockInfo *bi)
- {
--	if(!bi->gcPrioritise){
-+	if (!bi->gcPrioritise) {
- 		bi->gcPrioritise = 1;
- 		dev->hasPendingPrioritisedGCs = 1;
--		bi->chunkErrorStrikes ++;
-+		bi->chunkErrorStrikes++;
- 
--		if(bi->chunkErrorStrikes > 3){
-+		if (bi->chunkErrorStrikes > 3) {
- 			bi->needsRetiring = 1; /* Too many stikes, so retire this */
- 			T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: Block struck out" TENDSTR)));
- 
- 		}
--
- 	}
- }
- 
--static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND, int erasedOk)
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND,
-+		int erasedOk)
- {
--
- 	int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
- 	yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockInNAND);
- 
--	yaffs_HandleChunkError(dev,bi);
-+	yaffs_HandleChunkError(dev, bi);
- 
--
--	if(erasedOk ) {
-+	if (erasedOk) {
- 		/* Was an actual write failure, so mark the block for retirement  */
- 		bi->needsRetiring = 1;
- 		T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
- 		  (TSTR("**>> Block %d needs retiring" TENDSTR), blockInNAND));
--
--
- 	}
- 
- 	/* Delete the chunk */
-@@ -1081,12 +1105,12 @@ static void yaffs_HandleWriteChunkError(
- 
- /*---------------- Name handling functions ------------*/
- 
--static __u16 yaffs_CalcNameSum(const YCHAR * name)
-+static __u16 yaffs_CalcNameSum(const YCHAR *name)
- {
- 	__u16 sum = 0;
- 	__u16 i = 1;
- 
--	YUCHAR *bname = (YUCHAR *) name;
-+	const YUCHAR *bname = (const YUCHAR *) name;
- 	if (bname) {
- 		while ((*bname) && (i < (YAFFS_MAX_NAME_LENGTH/2))) {
- 
-@@ -1102,14 +1126,14 @@ static __u16 yaffs_CalcNameSum(const YCH
- 	return sum;
- }
- 
--static void yaffs_SetObjectName(yaffs_Object * obj, const YCHAR * name)
-+static void yaffs_SetObjectName(yaffs_Object *obj, const YCHAR *name)
- {
- #ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
--	if (name && yaffs_strlen(name) <= YAFFS_SHORT_NAME_LENGTH) {
-+	memset(obj->shortName, 0, sizeof(YCHAR) * (YAFFS_SHORT_NAME_LENGTH+1));
-+	if (name && yaffs_strlen(name) <= YAFFS_SHORT_NAME_LENGTH)
- 		yaffs_strcpy(obj->shortName, name);
--	} else {
-+	else
- 		obj->shortName[0] = _Y('\0');
--	}
- #endif
- 	obj->sum = yaffs_CalcNameSum(name);
- }
-@@ -1126,7 +1150,7 @@ static void yaffs_SetObjectName(yaffs_Ob
-  * Don't use this function directly
-  */
- 
--static int yaffs_CreateTnodes(yaffs_Device * dev, int nTnodes)
-+static int yaffs_CreateTnodes(yaffs_Device *dev, int nTnodes)
- {
- 	int i;
- 	int tnodeSize;
-@@ -1143,6 +1167,9 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 	 * Must be a multiple of 32-bits  */
- 	tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
- 
-+	if (tnodeSize < sizeof(yaffs_Tnode))
-+		tnodeSize = sizeof(yaffs_Tnode);
-+
- 	/* make these things */
- 
- 	newTnodes = YMALLOC(nTnodes * tnodeSize);
-@@ -1150,7 +1177,7 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 
- 	if (!newTnodes) {
- 		T(YAFFS_TRACE_ERROR,
--		  (TSTR("yaffs: Could not allocate Tnodes" TENDSTR)));
-+			(TSTR("yaffs: Could not allocate Tnodes" TENDSTR)));
- 		return YAFFS_FAIL;
- 	}
- 
-@@ -1170,7 +1197,7 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 	dev->freeTnodes = newTnodes;
- #else
- 	/* New hookup for wide tnodes */
--	for(i = 0; i < nTnodes -1; i++) {
-+	for (i = 0; i < nTnodes - 1; i++) {
- 		curr = (yaffs_Tnode *) &mem[i * tnodeSize];
- 		next = (yaffs_Tnode *) &mem[(i+1) * tnodeSize];
- 		curr->internal[0] = next;
-@@ -1197,7 +1224,6 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 		  (TSTR
- 		   ("yaffs: Could not add tnodes to management list" TENDSTR)));
- 		   return YAFFS_FAIL;
--
- 	} else {
- 		tnl->tnodes = newTnodes;
- 		tnl->next = dev->allocatedTnodeList;
-@@ -1211,14 +1237,13 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 
- /* GetTnode gets us a clean tnode. Tries to make allocate more if we run out */
- 
--static yaffs_Tnode *yaffs_GetTnodeRaw(yaffs_Device * dev)
-+static yaffs_Tnode *yaffs_GetTnodeRaw(yaffs_Device *dev)
- {
- 	yaffs_Tnode *tn = NULL;
- 
- 	/* If there are none left make more */
--	if (!dev->freeTnodes) {
-+	if (!dev->freeTnodes)
- 		yaffs_CreateTnodes(dev, YAFFS_ALLOCATION_NTNODES);
--	}
- 
- 	if (dev->freeTnodes) {
- 		tn = dev->freeTnodes;
-@@ -1233,21 +1258,27 @@ static yaffs_Tnode *yaffs_GetTnodeRaw(ya
- 		dev->nFreeTnodes--;
- 	}
- 
-+	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
-+
- 	return tn;
- }
- 
--static yaffs_Tnode *yaffs_GetTnode(yaffs_Device * dev)
-+static yaffs_Tnode *yaffs_GetTnode(yaffs_Device *dev)
- {
- 	yaffs_Tnode *tn = yaffs_GetTnodeRaw(dev);
-+	int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
- 
--	if(tn)
--		memset(tn, 0, (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
-+	if (tnodeSize < sizeof(yaffs_Tnode))
-+		tnodeSize = sizeof(yaffs_Tnode);
-+
-+	if (tn)
-+		memset(tn, 0, tnodeSize);
- 
- 	return tn;
- }
- 
- /* FreeTnode frees up a tnode and puts it back on the free list */
--static void yaffs_FreeTnode(yaffs_Device * dev, yaffs_Tnode * tn)
-+static void yaffs_FreeTnode(yaffs_Device *dev, yaffs_Tnode *tn)
- {
- 	if (tn) {
- #ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG
-@@ -1262,9 +1293,10 @@ static void yaffs_FreeTnode(yaffs_Device
- 		dev->freeTnodes = tn;
- 		dev->nFreeTnodes++;
- 	}
-+	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
- }
- 
--static void yaffs_DeinitialiseTnodes(yaffs_Device * dev)
-+static void yaffs_DeinitialiseTnodes(yaffs_Device *dev)
- {
- 	/* Free the list of allocated tnodes */
- 	yaffs_TnodeList *tmp;
-@@ -1282,71 +1314,72 @@ static void yaffs_DeinitialiseTnodes(yaf
- 	dev->nFreeTnodes = 0;
- }
- 
--static void yaffs_InitialiseTnodes(yaffs_Device * dev)
-+static void yaffs_InitialiseTnodes(yaffs_Device *dev)
- {
- 	dev->allocatedTnodeList = NULL;
- 	dev->freeTnodes = NULL;
- 	dev->nFreeTnodes = 0;
- 	dev->nTnodesCreated = 0;
--
- }
- 
- 
--void yaffs_PutLevel0Tnode(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos, unsigned val)
-+void yaffs_PutLevel0Tnode(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos,
-+		unsigned val)
- {
--  __u32 *map = (__u32 *)tn;
--  __u32 bitInMap;
--  __u32 bitInWord;
--  __u32 wordInMap;
--  __u32 mask;
-+	__u32 *map = (__u32 *)tn;
-+	__u32 bitInMap;
-+	__u32 bitInWord;
-+	__u32 wordInMap;
-+	__u32 mask;
- 
--  pos &= YAFFS_TNODES_LEVEL0_MASK;
--  val >>= dev->chunkGroupBits;
-+	pos &= YAFFS_TNODES_LEVEL0_MASK;
-+	val >>= dev->chunkGroupBits;
- 
--  bitInMap = pos * dev->tnodeWidth;
--  wordInMap = bitInMap /32;
--  bitInWord = bitInMap & (32 -1);
-+	bitInMap = pos * dev->tnodeWidth;
-+	wordInMap = bitInMap / 32;
-+	bitInWord = bitInMap & (32 - 1);
- 
--  mask = dev->tnodeMask << bitInWord;
-+	mask = dev->tnodeMask << bitInWord;
- 
--  map[wordInMap] &= ~mask;
--  map[wordInMap] |= (mask & (val << bitInWord));
-+	map[wordInMap] &= ~mask;
-+	map[wordInMap] |= (mask & (val << bitInWord));
- 
--  if(dev->tnodeWidth > (32-bitInWord)) {
--    bitInWord = (32 - bitInWord);
--    wordInMap++;;
--    mask = dev->tnodeMask >> (/*dev->tnodeWidth -*/ bitInWord);
--    map[wordInMap] &= ~mask;
--    map[wordInMap] |= (mask & (val >> bitInWord));
--  }
-+	if (dev->tnodeWidth > (32 - bitInWord)) {
-+		bitInWord = (32 - bitInWord);
-+		wordInMap++;;
-+		mask = dev->tnodeMask >> (/*dev->tnodeWidth -*/ bitInWord);
-+		map[wordInMap] &= ~mask;
-+		map[wordInMap] |= (mask & (val >> bitInWord));
-+	}
- }
- 
--static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos)
-+static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn,
-+		unsigned pos)
- {
--  __u32 *map = (__u32 *)tn;
--  __u32 bitInMap;
--  __u32 bitInWord;
--  __u32 wordInMap;
--  __u32 val;
-+	__u32 *map = (__u32 *)tn;
-+	__u32 bitInMap;
-+	__u32 bitInWord;
-+	__u32 wordInMap;
-+	__u32 val;
- 
--  pos &= YAFFS_TNODES_LEVEL0_MASK;
-+	pos &= YAFFS_TNODES_LEVEL0_MASK;
- 
--  bitInMap = pos * dev->tnodeWidth;
--  wordInMap = bitInMap /32;
--  bitInWord = bitInMap & (32 -1);
-+	bitInMap = pos * dev->tnodeWidth;
-+	wordInMap = bitInMap / 32;
-+	bitInWord = bitInMap & (32 - 1);
- 
--  val = map[wordInMap] >> bitInWord;
-+	val = map[wordInMap] >> bitInWord;
- 
--  if(dev->tnodeWidth > (32-bitInWord)) {
--    bitInWord = (32 - bitInWord);
--    wordInMap++;;
--    val |= (map[wordInMap] << bitInWord);
--  }
-+	if	(dev->tnodeWidth > (32 - bitInWord)) {
-+		bitInWord = (32 - bitInWord);
-+		wordInMap++;;
-+		val |= (map[wordInMap] << bitInWord);
-+	}
- 
--  val &= dev->tnodeMask;
--  val <<= dev->chunkGroupBits;
-+	val &= dev->tnodeMask;
-+	val <<= dev->chunkGroupBits;
- 
--  return val;
-+	return val;
- }
- 
- /* ------------------- End of individual tnode manipulation -----------------*/
-@@ -1357,24 +1390,21 @@ static __u32 yaffs_GetChunkGroupBase(yaf
-  */
- 
- /* FindLevel0Tnode finds the level 0 tnode, if one exists. */
--static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device * dev,
--					  yaffs_FileStructure * fStruct,
--					  __u32 chunkId)
-+static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev,
-+					yaffs_FileStructure *fStruct,
-+					__u32 chunkId)
- {
--
- 	yaffs_Tnode *tn = fStruct->top;
- 	__u32 i;
- 	int requiredTallness;
- 	int level = fStruct->topLevel;
- 
- 	/* Check sane level and chunk Id */
--	if (level < 0 || level > YAFFS_TNODES_MAX_LEVEL) {
-+	if (level < 0 || level > YAFFS_TNODES_MAX_LEVEL)
- 		return NULL;
--	}
- 
--	if (chunkId > YAFFS_MAX_CHUNK_ID) {
-+	if (chunkId > YAFFS_MAX_CHUNK_ID)
- 		return NULL;
--	}
- 
- 	/* First check we're tall enough (ie enough topLevel) */
- 
-@@ -1385,22 +1415,17 @@ static yaffs_Tnode *yaffs_FindLevel0Tnod
- 		requiredTallness++;
- 	}
- 
--	if (requiredTallness > fStruct->topLevel) {
--		/* Not tall enough, so we can't find it, return NULL. */
--		return NULL;
--	}
-+	if (requiredTallness > fStruct->topLevel)
-+		return NULL; /* Not tall enough, so we can't find it */
- 
- 	/* Traverse down to level 0 */
- 	while (level > 0 && tn) {
--		tn = tn->
--		    internal[(chunkId >>
--			       ( YAFFS_TNODES_LEVEL0_BITS +
--			         (level - 1) *
--			         YAFFS_TNODES_INTERNAL_BITS)
--			      ) &
--			     YAFFS_TNODES_INTERNAL_MASK];
-+		tn = tn->internal[(chunkId >>
-+			(YAFFS_TNODES_LEVEL0_BITS +
-+				(level - 1) *
-+				YAFFS_TNODES_INTERNAL_BITS)) &
-+			YAFFS_TNODES_INTERNAL_MASK];
- 		level--;
--
- 	}
- 
- 	return tn;
-@@ -1417,12 +1442,11 @@ static yaffs_Tnode *yaffs_FindLevel0Tnod
-  *  be plugged into the ttree.
-  */
- 
--static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device * dev,
--					       yaffs_FileStructure * fStruct,
--					       __u32 chunkId,
--					       yaffs_Tnode *passedTn)
-+static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device *dev,
-+					yaffs_FileStructure *fStruct,
-+					__u32 chunkId,
-+					yaffs_Tnode *passedTn)
- {
--
- 	int requiredTallness;
- 	int i;
- 	int l;
-@@ -1432,13 +1456,11 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
- 
- 
- 	/* Check sane level and page Id */
--	if (fStruct->topLevel < 0 || fStruct->topLevel > YAFFS_TNODES_MAX_LEVEL) {
-+	if (fStruct->topLevel < 0 || fStruct->topLevel > YAFFS_TNODES_MAX_LEVEL)
- 		return NULL;
--	}
- 
--	if (chunkId > YAFFS_MAX_CHUNK_ID) {
-+	if (chunkId > YAFFS_MAX_CHUNK_ID)
- 		return NULL;
--	}
- 
- 	/* First check we're tall enough (ie enough topLevel) */
- 
-@@ -1451,7 +1473,7 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
- 
- 
- 	if (requiredTallness > fStruct->topLevel) {
--		/* Not tall enough,gotta make the tree taller */
-+		/* Not tall enough, gotta make the tree taller */
- 		for (i = fStruct->topLevel; i < requiredTallness; i++) {
- 
- 			tn = yaffs_GetTnode(dev);
-@@ -1473,27 +1495,27 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
- 	l = fStruct->topLevel;
- 	tn = fStruct->top;
- 
--	if(l > 0) {
-+	if (l > 0) {
- 		while (l > 0 && tn) {
- 			x = (chunkId >>
--			     ( YAFFS_TNODES_LEVEL0_BITS +
-+			     (YAFFS_TNODES_LEVEL0_BITS +
- 			      (l - 1) * YAFFS_TNODES_INTERNAL_BITS)) &
- 			    YAFFS_TNODES_INTERNAL_MASK;
- 
- 
--			if((l>1) && !tn->internal[x]){
-+			if ((l > 1) && !tn->internal[x]) {
- 				/* Add missing non-level-zero tnode */
- 				tn->internal[x] = yaffs_GetTnode(dev);
- 
--			} else if(l == 1) {
-+			} else if (l == 1) {
- 				/* Looking from level 1 at level 0 */
--			 	if (passedTn) {
-+				if (passedTn) {
- 					/* If we already have one, then release it.*/
--					if(tn->internal[x])
--						yaffs_FreeTnode(dev,tn->internal[x]);
-+					if (tn->internal[x])
-+						yaffs_FreeTnode(dev, tn->internal[x]);
- 					tn->internal[x] = passedTn;
- 
--				} else if(!tn->internal[x]) {
-+				} else if (!tn->internal[x]) {
- 					/* Don't have one, none passed in */
- 					tn->internal[x] = yaffs_GetTnode(dev);
- 				}
-@@ -1504,31 +1526,29 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
- 		}
- 	} else {
- 		/* top is level 0 */
--		if(passedTn) {
--			memcpy(tn,passedTn,(dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
--			yaffs_FreeTnode(dev,passedTn);
-+		if (passedTn) {
-+			memcpy(tn, passedTn, (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
-+			yaffs_FreeTnode(dev, passedTn);
- 		}
- 	}
- 
- 	return tn;
- }
- 
--static int yaffs_FindChunkInGroup(yaffs_Device * dev, int theChunk,
--				  yaffs_ExtendedTags * tags, int objectId,
--				  int chunkInInode)
-+static int yaffs_FindChunkInGroup(yaffs_Device *dev, int theChunk,
-+				yaffs_ExtendedTags *tags, int objectId,
-+				int chunkInInode)
- {
- 	int j;
- 
- 	for (j = 0; theChunk && j < dev->chunkGroupSize; j++) {
--		if (yaffs_CheckChunkBit
--		    (dev, theChunk / dev->nChunksPerBlock,
--		     theChunk % dev->nChunksPerBlock)) {
-+		if (yaffs_CheckChunkBit(dev, theChunk / dev->nChunksPerBlock,
-+				theChunk % dev->nChunksPerBlock)) {
- 			yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL,
- 							tags);
- 			if (yaffs_TagsMatch(tags, objectId, chunkInInode)) {
- 				/* found it; */
- 				return theChunk;
--
- 			}
- 		}
- 		theChunk++;
-@@ -1543,7 +1563,7 @@ static int yaffs_FindChunkInGroup(yaffs_
-  * Returns 0 if it stopped early due to hitting the limit and the delete is incomplete.
-  */
- 
--static int yaffs_DeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, __u32 level,
-+static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level,
- 			      int chunkOffset, int *limit)
- {
- 	int i;
-@@ -1557,7 +1577,6 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 
- 	if (tn) {
- 		if (level > 0) {
--
- 			for (i = YAFFS_NTNODES_INTERNAL - 1; allDone && i >= 0;
- 			     i--) {
- 				if (tn->internal[i]) {
-@@ -1565,17 +1584,17 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 						allDone = 0;
- 					} else {
- 						allDone =
--						    yaffs_DeleteWorker(in,
--								       tn->
--								       internal
--								       [i],
--								       level -
--								       1,
--								       (chunkOffset
-+							yaffs_DeleteWorker(in,
-+								tn->
-+								internal
-+								[i],
-+								level -
-+								1,
-+								(chunkOffset
- 									<<
- 									YAFFS_TNODES_INTERNAL_BITS)
--								       + i,
--								       limit);
-+								+ i,
-+								limit);
- 					}
- 					if (allDone) {
- 						yaffs_FreeTnode(dev,
-@@ -1584,27 +1603,25 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 						tn->internal[i] = NULL;
- 					}
- 				}
--
- 			}
- 			return (allDone) ? 1 : 0;
- 		} else if (level == 0) {
- 			int hitLimit = 0;
- 
- 			for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0 && !hitLimit;
--			     i--) {
--			        theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
-+					i--) {
-+				theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
- 				if (theChunk) {
- 
--					chunkInInode =
--					    (chunkOffset <<
--					     YAFFS_TNODES_LEVEL0_BITS) + i;
-+					chunkInInode = (chunkOffset <<
-+						YAFFS_TNODES_LEVEL0_BITS) + i;
- 
- 					foundChunk =
--					    yaffs_FindChunkInGroup(dev,
--								   theChunk,
--								   &tags,
--								   in->objectId,
--								   chunkInInode);
-+						yaffs_FindChunkInGroup(dev,
-+								theChunk,
-+								&tags,
-+								in->objectId,
-+								chunkInInode);
- 
- 					if (foundChunk > 0) {
- 						yaffs_DeleteChunk(dev,
-@@ -1613,14 +1630,13 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 						in->nDataChunks--;
- 						if (limit) {
- 							*limit = *limit - 1;
--							if (*limit <= 0) {
-+							if (*limit <= 0)
- 								hitLimit = 1;
--							}
- 						}
- 
- 					}
- 
--					yaffs_PutLevel0Tnode(dev,tn,i,0);
-+					yaffs_PutLevel0Tnode(dev, tn, i, 0);
- 				}
- 
- 			}
-@@ -1634,9 +1650,8 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 
- }
- 
--static void yaffs_SoftDeleteChunk(yaffs_Device * dev, int chunk)
-+static void yaffs_SoftDeleteChunk(yaffs_Device *dev, int chunk)
- {
--
- 	yaffs_BlockInfo *theBlock;
- 
- 	T(YAFFS_TRACE_DELETION, (TSTR("soft delete chunk %d" TENDSTR), chunk));
-@@ -1654,7 +1669,7 @@ static void yaffs_SoftDeleteChunk(yaffs_
-  * Thus, essentially this is the same as DeleteWorker except that the chunks are soft deleted.
-  */
- 
--static int yaffs_SoftDeleteWorker(yaffs_Object * in, yaffs_Tnode * tn,
-+static int yaffs_SoftDeleteWorker(yaffs_Object *in, yaffs_Tnode *tn,
- 				  __u32 level, int chunkOffset)
- {
- 	int i;
-@@ -1691,14 +1706,14 @@ static int yaffs_SoftDeleteWorker(yaffs_
- 		} else if (level == 0) {
- 
- 			for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0; i--) {
--				theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
-+				theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
- 				if (theChunk) {
- 					/* Note this does not find the real chunk, only the chunk group.
- 					 * We make an assumption that a chunk group is not larger than
- 					 * a block.
- 					 */
- 					yaffs_SoftDeleteChunk(dev, theChunk);
--					yaffs_PutLevel0Tnode(dev,tn,i,0);
-+					yaffs_PutLevel0Tnode(dev, tn, i, 0);
- 				}
- 
- 			}
-@@ -1712,7 +1727,7 @@ static int yaffs_SoftDeleteWorker(yaffs_
- 
- }
- 
--static void yaffs_SoftDeleteFile(yaffs_Object * obj)
-+static void yaffs_SoftDeleteFile(yaffs_Object *obj)
- {
- 	if (obj->deleted &&
- 	    obj->variantType == YAFFS_OBJECT_TYPE_FILE && !obj->softDeleted) {
-@@ -1746,8 +1761,8 @@ static void yaffs_SoftDeleteFile(yaffs_O
-  * by a special case.
-  */
- 
--static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device * dev, yaffs_Tnode * tn,
--				      __u32 level, int del0)
-+static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device *dev, yaffs_Tnode *tn,
-+				__u32 level, int del0)
- {
- 	int i;
- 	int hasData;
-@@ -1763,9 +1778,8 @@ static yaffs_Tnode *yaffs_PruneWorker(ya
- 						      (i == 0) ? del0 : 1);
- 			}
- 
--			if (tn->internal[i]) {
-+			if (tn->internal[i])
- 				hasData++;
--			}
- 		}
- 
- 		if (hasData == 0 && del0) {
-@@ -1781,8 +1795,8 @@ static yaffs_Tnode *yaffs_PruneWorker(ya
- 
- }
- 
--static int yaffs_PruneFileStructure(yaffs_Device * dev,
--				    yaffs_FileStructure * fStruct)
-+static int yaffs_PruneFileStructure(yaffs_Device *dev,
-+				yaffs_FileStructure *fStruct)
- {
- 	int i;
- 	int hasData;
-@@ -1805,9 +1819,8 @@ static int yaffs_PruneFileStructure(yaff
- 
- 			hasData = 0;
- 			for (i = 1; i < YAFFS_NTNODES_INTERNAL; i++) {
--				if (tn->internal[i]) {
-+				if (tn->internal[i])
- 					hasData++;
--				}
- 			}
- 
- 			if (!hasData) {
-@@ -1828,7 +1841,7 @@ static int yaffs_PruneFileStructure(yaff
- /* yaffs_CreateFreeObjects creates a bunch more objects and
-  * adds them to the object free list.
-  */
--static int yaffs_CreateFreeObjects(yaffs_Device * dev, int nObjects)
-+static int yaffs_CreateFreeObjects(yaffs_Device *dev, int nObjects)
- {
- 	int i;
- 	yaffs_Object *newObjects;
-@@ -1842,9 +1855,9 @@ static int yaffs_CreateFreeObjects(yaffs
- 	list = YMALLOC(sizeof(yaffs_ObjectList));
- 
- 	if (!newObjects || !list) {
--		if(newObjects)
-+		if (newObjects)
- 			YFREE(newObjects);
--		if(list)
-+		if (list)
- 			YFREE(list);
- 		T(YAFFS_TRACE_ALLOCATE,
- 		  (TSTR("yaffs: Could not allocate more objects" TENDSTR)));
-@@ -1854,7 +1867,7 @@ static int yaffs_CreateFreeObjects(yaffs
- 	/* Hook them into the free list */
- 	for (i = 0; i < nObjects - 1; i++) {
- 		newObjects[i].siblings.next =
--		    (struct list_head *)(&newObjects[i + 1]);
-+				(struct ylist_head *)(&newObjects[i + 1]);
- 	}
- 
- 	newObjects[nObjects - 1].siblings.next = (void *)dev->freeObjects;
-@@ -1873,85 +1886,109 @@ static int yaffs_CreateFreeObjects(yaffs
- 
- 
- /* AllocateEmptyObject gets us a clean Object. Tries to make allocate more if we run out */
--static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device * dev)
-+static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device *dev)
- {
- 	yaffs_Object *tn = NULL;
- 
-+#ifdef VALGRIND_TEST
-+	tn = YMALLOC(sizeof(yaffs_Object));
-+#else
- 	/* If there are none left make more */
--	if (!dev->freeObjects) {
-+	if (!dev->freeObjects)
- 		yaffs_CreateFreeObjects(dev, YAFFS_ALLOCATION_NOBJECTS);
--	}
- 
- 	if (dev->freeObjects) {
- 		tn = dev->freeObjects;
- 		dev->freeObjects =
--		    (yaffs_Object *) (dev->freeObjects->siblings.next);
-+			(yaffs_Object *) (dev->freeObjects->siblings.next);
- 		dev->nFreeObjects--;
--
-+	}
-+#endif
-+	if (tn) {
- 		/* Now sweeten it up... */
- 
- 		memset(tn, 0, sizeof(yaffs_Object));
-+		tn->beingCreated = 1;
-+
- 		tn->myDev = dev;
--		tn->chunkId = -1;
-+		tn->hdrChunk = 0;
- 		tn->variantType = YAFFS_OBJECT_TYPE_UNKNOWN;
--		INIT_LIST_HEAD(&(tn->hardLinks));
--		INIT_LIST_HEAD(&(tn->hashLink));
--		INIT_LIST_HEAD(&tn->siblings);
-+		YINIT_LIST_HEAD(&(tn->hardLinks));
-+		YINIT_LIST_HEAD(&(tn->hashLink));
-+		YINIT_LIST_HEAD(&tn->siblings);
-+
-+
-+		/* Now make the directory sane */
-+		if (dev->rootDir) {
-+			tn->parent = dev->rootDir;
-+			ylist_add(&(tn->siblings), &dev->rootDir->variant.directoryVariant.children);
-+		}
- 
- 		/* Add it to the lost and found directory.
- 		 * NB Can't put root or lostNFound in lostNFound so
- 		 * check if lostNFound exists first
- 		 */
--		if (dev->lostNFoundDir) {
-+		if (dev->lostNFoundDir)
- 			yaffs_AddObjectToDirectory(dev->lostNFoundDir, tn);
--		}
-+
-+		tn->beingCreated = 0;
- 	}
- 
-+	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
-+
- 	return tn;
- }
- 
--static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device * dev, int number,
-+static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device *dev, int number,
- 					       __u32 mode)
- {
- 
- 	yaffs_Object *obj =
- 	    yaffs_CreateNewObject(dev, number, YAFFS_OBJECT_TYPE_DIRECTORY);
- 	if (obj) {
--		obj->fake = 1;		/* it is fake so it has no NAND presence... */
-+		obj->fake = 1;		/* it is fake so it might have no NAND presence... */
- 		obj->renameAllowed = 0;	/* ... and we're not allowed to rename it... */
- 		obj->unlinkAllowed = 0;	/* ... or unlink it */
- 		obj->deleted = 0;
- 		obj->unlinked = 0;
- 		obj->yst_mode = mode;
- 		obj->myDev = dev;
--		obj->chunkId = 0;	/* Not a valid chunk. */
-+		obj->hdrChunk = 0;	/* Not a valid chunk. */
- 	}
- 
- 	return obj;
- 
- }
- 
--static void yaffs_UnhashObject(yaffs_Object * tn)
-+static void yaffs_UnhashObject(yaffs_Object *tn)
- {
- 	int bucket;
- 	yaffs_Device *dev = tn->myDev;
- 
- 	/* If it is still linked into the bucket list, free from the list */
--	if (!list_empty(&tn->hashLink)) {
--		list_del_init(&tn->hashLink);
-+	if (!ylist_empty(&tn->hashLink)) {
-+		ylist_del_init(&tn->hashLink);
- 		bucket = yaffs_HashFunction(tn->objectId);
- 		dev->objectBucket[bucket].count--;
- 	}
--
- }
- 
- /*  FreeObject frees up a Object and puts it back on the free list */
--static void yaffs_FreeObject(yaffs_Object * tn)
-+static void yaffs_FreeObject(yaffs_Object *tn)
- {
--
- 	yaffs_Device *dev = tn->myDev;
- 
--#ifdef  __KERNEL__
-+#ifdef __KERNEL__
-+	T(YAFFS_TRACE_OS, (TSTR("FreeObject %p inode %p"TENDSTR), tn, tn->myInode));
-+#endif
-+
-+	if (tn->parent)
-+		YBUG();
-+	if (!ylist_empty(&tn->siblings))
-+		YBUG();
-+
-+
-+#ifdef __KERNEL__
- 	if (tn->myInode) {
- 		/* We're still hooked up to a cached inode.
- 		 * Don't delete now, but mark for later deletion
-@@ -1963,24 +2000,28 @@ static void yaffs_FreeObject(yaffs_Objec
- 
- 	yaffs_UnhashObject(tn);
- 
-+#ifdef VALGRIND_TEST
-+	YFREE(tn);
-+#else
- 	/* Link into the free list. */
--	tn->siblings.next = (struct list_head *)(dev->freeObjects);
-+	tn->siblings.next = (struct ylist_head *)(dev->freeObjects);
- 	dev->freeObjects = tn;
- 	dev->nFreeObjects++;
-+#endif
-+	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
- }
- 
- #ifdef __KERNEL__
- 
--void yaffs_HandleDeferedFree(yaffs_Object * obj)
-+void yaffs_HandleDeferedFree(yaffs_Object *obj)
- {
--	if (obj->deferedFree) {
-+	if (obj->deferedFree)
- 		yaffs_FreeObject(obj);
--	}
- }
- 
- #endif
- 
--static void yaffs_DeinitialiseObjects(yaffs_Device * dev)
-+static void yaffs_DeinitialiseObjects(yaffs_Device *dev)
- {
- 	/* Free the list of allocated Objects */
- 
-@@ -1998,7 +2039,7 @@ static void yaffs_DeinitialiseObjects(ya
- 	dev->nFreeObjects = 0;
- }
- 
--static void yaffs_InitialiseObjects(yaffs_Device * dev)
-+static void yaffs_InitialiseObjects(yaffs_Device *dev)
- {
- 	int i;
- 
-@@ -2007,15 +2048,14 @@ static void yaffs_InitialiseObjects(yaff
- 	dev->nFreeObjects = 0;
- 
- 	for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) {
--		INIT_LIST_HEAD(&dev->objectBucket[i].list);
-+		YINIT_LIST_HEAD(&dev->objectBucket[i].list);
- 		dev->objectBucket[i].count = 0;
- 	}
--
- }
- 
--static int yaffs_FindNiceObjectBucket(yaffs_Device * dev)
-+static int yaffs_FindNiceObjectBucket(yaffs_Device *dev)
- {
--	static int x = 0;
-+	static int x;
- 	int i;
- 	int l = 999;
- 	int lowest = 999999;
-@@ -2049,7 +2089,7 @@ static int yaffs_FindNiceObjectBucket(ya
- 	return l;
- }
- 
--static int yaffs_CreateNewObjectNumber(yaffs_Device * dev)
-+static int yaffs_CreateNewObjectNumber(yaffs_Device *dev)
- {
- 	int bucket = yaffs_FindNiceObjectBucket(dev);
- 
-@@ -2058,7 +2098,7 @@ static int yaffs_CreateNewObjectNumber(y
- 	 */
- 
- 	int found = 0;
--	struct list_head *i;
-+	struct ylist_head *i;
- 
- 	__u32 n = (__u32) bucket;
- 
-@@ -2068,41 +2108,38 @@ static int yaffs_CreateNewObjectNumber(y
- 		found = 1;
- 		n += YAFFS_NOBJECT_BUCKETS;
- 		if (1 || dev->objectBucket[bucket].count > 0) {
--			list_for_each(i, &dev->objectBucket[bucket].list) {
-+			ylist_for_each(i, &dev->objectBucket[bucket].list) {
- 				/* If there is already one in the list */
--				if (i
--				    && list_entry(i, yaffs_Object,
--						  hashLink)->objectId == n) {
-+				if (i && ylist_entry(i, yaffs_Object,
-+						hashLink)->objectId == n) {
- 					found = 0;
- 				}
- 			}
- 		}
- 	}
- 
--
- 	return n;
- }
- 
--static void yaffs_HashObject(yaffs_Object * in)
-+static void yaffs_HashObject(yaffs_Object *in)
- {
- 	int bucket = yaffs_HashFunction(in->objectId);
- 	yaffs_Device *dev = in->myDev;
- 
--	list_add(&in->hashLink, &dev->objectBucket[bucket].list);
-+	ylist_add(&in->hashLink, &dev->objectBucket[bucket].list);
- 	dev->objectBucket[bucket].count++;
--
- }
- 
--yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device * dev, __u32 number)
-+yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev, __u32 number)
- {
- 	int bucket = yaffs_HashFunction(number);
--	struct list_head *i;
-+	struct ylist_head *i;
- 	yaffs_Object *in;
- 
--	list_for_each(i, &dev->objectBucket[bucket].list) {
-+	ylist_for_each(i, &dev->objectBucket[bucket].list) {
- 		/* Look if it is in the list */
- 		if (i) {
--			in = list_entry(i, yaffs_Object, hashLink);
-+			in = ylist_entry(i, yaffs_Object, hashLink);
- 			if (in->objectId == number) {
- #ifdef __KERNEL__
- 				/* Don't tell the VFS about this one if it is defered free */
-@@ -2118,31 +2155,27 @@ yaffs_Object *yaffs_FindObjectByNumber(y
- 	return NULL;
- }
- 
--yaffs_Object *yaffs_CreateNewObject(yaffs_Device * dev, int number,
-+yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev, int number,
- 				    yaffs_ObjectType type)
- {
--
- 	yaffs_Object *theObject;
--	yaffs_Tnode *tn;
-+	yaffs_Tnode *tn = NULL;
- 
--	if (number < 0) {
-+	if (number < 0)
- 		number = yaffs_CreateNewObjectNumber(dev);
--	}
- 
- 	theObject = yaffs_AllocateEmptyObject(dev);
--	if(!theObject)
-+	if (!theObject)
- 		return NULL;
- 
--	if(type == YAFFS_OBJECT_TYPE_FILE){
-+	if (type == YAFFS_OBJECT_TYPE_FILE) {
- 		tn = yaffs_GetTnode(dev);
--		if(!tn){
-+		if (!tn) {
- 			yaffs_FreeObject(theObject);
- 			return NULL;
- 		}
- 	}
- 
--
--
- 	if (theObject) {
- 		theObject->fake = 0;
- 		theObject->renameAllowed = 1;
-@@ -2171,8 +2204,8 @@ yaffs_Object *yaffs_CreateNewObject(yaff
- 			theObject->variant.fileVariant.top = tn;
- 			break;
- 		case YAFFS_OBJECT_TYPE_DIRECTORY:
--			INIT_LIST_HEAD(&theObject->variant.directoryVariant.
--				       children);
-+			YINIT_LIST_HEAD(&theObject->variant.directoryVariant.
-+					children);
- 			break;
- 		case YAFFS_OBJECT_TYPE_SYMLINK:
- 		case YAFFS_OBJECT_TYPE_HARDLINK:
-@@ -2188,32 +2221,30 @@ yaffs_Object *yaffs_CreateNewObject(yaff
- 	return theObject;
- }
- 
--static yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device * dev,
-+static yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device *dev,
- 						      int number,
- 						      yaffs_ObjectType type)
- {
- 	yaffs_Object *theObject = NULL;
- 
--	if (number > 0) {
-+	if (number > 0)
- 		theObject = yaffs_FindObjectByNumber(dev, number);
--	}
- 
--	if (!theObject) {
-+	if (!theObject)
- 		theObject = yaffs_CreateNewObject(dev, number, type);
--	}
- 
- 	return theObject;
- 
- }
- 
- 
--static YCHAR *yaffs_CloneString(const YCHAR * str)
-+static YCHAR *yaffs_CloneString(const YCHAR *str)
- {
- 	YCHAR *newStr = NULL;
- 
- 	if (str && *str) {
- 		newStr = YMALLOC((yaffs_strlen(str) + 1) * sizeof(YCHAR));
--		if(newStr)
-+		if (newStr)
- 			yaffs_strcpy(newStr, str);
- 	}
- 
-@@ -2229,29 +2260,31 @@ static YCHAR *yaffs_CloneString(const YC
-  */
- 
- static yaffs_Object *yaffs_MknodObject(yaffs_ObjectType type,
--				       yaffs_Object * parent,
--				       const YCHAR * name,
-+				       yaffs_Object *parent,
-+				       const YCHAR *name,
- 				       __u32 mode,
- 				       __u32 uid,
- 				       __u32 gid,
--				       yaffs_Object * equivalentObject,
--				       const YCHAR * aliasString, __u32 rdev)
-+				       yaffs_Object *equivalentObject,
-+				       const YCHAR *aliasString, __u32 rdev)
- {
- 	yaffs_Object *in;
--	YCHAR *str;
-+	YCHAR *str = NULL;
- 
- 	yaffs_Device *dev = parent->myDev;
- 
- 	/* Check if the entry exists. If it does then fail the call since we don't want a dup.*/
--	if (yaffs_FindObjectByName(parent, name)) {
-+	if (yaffs_FindObjectByName(parent, name))
- 		return NULL;
--	}
- 
- 	in = yaffs_CreateNewObject(dev, -1, type);
- 
--	if(type == YAFFS_OBJECT_TYPE_SYMLINK){
-+	if (!in)
-+		return YAFFS_FAIL;
-+
-+	if (type == YAFFS_OBJECT_TYPE_SYMLINK) {
- 		str = yaffs_CloneString(aliasString);
--		if(!str){
-+		if (!str) {
- 			yaffs_FreeObject(in);
- 			return NULL;
- 		}
-@@ -2260,7 +2293,7 @@ static yaffs_Object *yaffs_MknodObject(y
- 
- 
- 	if (in) {
--		in->chunkId = -1;
-+		in->hdrChunk = 0;
- 		in->valid = 1;
- 		in->variantType = type;
- 
-@@ -2293,10 +2326,10 @@ static yaffs_Object *yaffs_MknodObject(y
- 			break;
- 		case YAFFS_OBJECT_TYPE_HARDLINK:
- 			in->variant.hardLinkVariant.equivalentObject =
--			    equivalentObject;
-+				equivalentObject;
- 			in->variant.hardLinkVariant.equivalentObjectId =
--			    equivalentObject->objectId;
--			list_add(&in->hardLinks, &equivalentObject->hardLinks);
-+				equivalentObject->objectId;
-+			ylist_add(&in->hardLinks, &equivalentObject->hardLinks);
- 			break;
- 		case YAFFS_OBJECT_TYPE_FILE:
- 		case YAFFS_OBJECT_TYPE_DIRECTORY:
-@@ -2308,7 +2341,7 @@ static yaffs_Object *yaffs_MknodObject(y
- 
- 		if (yaffs_UpdateObjectHeader(in, name, 0, 0, 0) < 0) {
- 			/* Could not create the object header, fail the creation */
--			yaffs_DestroyObject(in);
-+			yaffs_DeleteObject(in);
- 			in = NULL;
- 		}
- 
-@@ -2317,38 +2350,38 @@ static yaffs_Object *yaffs_MknodObject(y
- 	return in;
- }
- 
--yaffs_Object *yaffs_MknodFile(yaffs_Object * parent, const YCHAR * name,
--			      __u32 mode, __u32 uid, __u32 gid)
-+yaffs_Object *yaffs_MknodFile(yaffs_Object *parent, const YCHAR *name,
-+			__u32 mode, __u32 uid, __u32 gid)
- {
- 	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_FILE, parent, name, mode,
--				 uid, gid, NULL, NULL, 0);
-+				uid, gid, NULL, NULL, 0);
- }
- 
--yaffs_Object *yaffs_MknodDirectory(yaffs_Object * parent, const YCHAR * name,
--				   __u32 mode, __u32 uid, __u32 gid)
-+yaffs_Object *yaffs_MknodDirectory(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid)
- {
- 	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_DIRECTORY, parent, name,
- 				 mode, uid, gid, NULL, NULL, 0);
- }
- 
--yaffs_Object *yaffs_MknodSpecial(yaffs_Object * parent, const YCHAR * name,
--				 __u32 mode, __u32 uid, __u32 gid, __u32 rdev)
-+yaffs_Object *yaffs_MknodSpecial(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid, __u32 rdev)
- {
- 	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SPECIAL, parent, name, mode,
- 				 uid, gid, NULL, NULL, rdev);
- }
- 
--yaffs_Object *yaffs_MknodSymLink(yaffs_Object * parent, const YCHAR * name,
--				 __u32 mode, __u32 uid, __u32 gid,
--				 const YCHAR * alias)
-+yaffs_Object *yaffs_MknodSymLink(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid,
-+				const YCHAR *alias)
- {
- 	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SYMLINK, parent, name, mode,
--				 uid, gid, NULL, alias, 0);
-+				uid, gid, NULL, alias, 0);
- }
- 
- /* yaffs_Link returns the object id of the equivalent object.*/
--yaffs_Object *yaffs_Link(yaffs_Object * parent, const YCHAR * name,
--			 yaffs_Object * equivalentObject)
-+yaffs_Object *yaffs_Link(yaffs_Object *parent, const YCHAR *name,
-+			yaffs_Object *equivalentObject)
- {
- 	/* Get the real object in case we were fed a hard link as an equivalent object */
- 	equivalentObject = yaffs_GetEquivalentObject(equivalentObject);
-@@ -2363,33 +2396,31 @@ yaffs_Object *yaffs_Link(yaffs_Object *
- 
- }
- 
--static int yaffs_ChangeObjectName(yaffs_Object * obj, yaffs_Object * newDir,
--				  const YCHAR * newName, int force, int shadows)
-+static int yaffs_ChangeObjectName(yaffs_Object *obj, yaffs_Object *newDir,
-+				const YCHAR *newName, int force, int shadows)
- {
- 	int unlinkOp;
- 	int deleteOp;
- 
- 	yaffs_Object *existingTarget;
- 
--	if (newDir == NULL) {
-+	if (newDir == NULL)
- 		newDir = obj->parent;	/* use the old directory */
--	}
- 
- 	if (newDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
- 		T(YAFFS_TRACE_ALWAYS,
- 		  (TSTR
--		   ("tragendy: yaffs_ChangeObjectName: newDir is not a directory"
-+		   ("tragedy: yaffs_ChangeObjectName: newDir is not a directory"
- 		    TENDSTR)));
- 		YBUG();
- 	}
- 
- 	/* TODO: Do we need this different handling for YAFFS2 and YAFFS1?? */
--	if (obj->myDev->isYaffs2) {
-+	if (obj->myDev->isYaffs2)
- 		unlinkOp = (newDir == obj->myDev->unlinkedDir);
--	} else {
-+	else
- 		unlinkOp = (newDir == obj->myDev->unlinkedDir
- 			    && obj->variantType == YAFFS_OBJECT_TYPE_FILE);
--	}
- 
- 	deleteOp = (newDir == obj->myDev->deletedDir);
- 
-@@ -2415,40 +2446,40 @@ static int yaffs_ChangeObjectName(yaffs_
- 			obj->unlinked = 1;
- 
- 		/* If it is a deletion then we mark it as a shrink for gc purposes. */
--		if (yaffs_UpdateObjectHeader(obj, newName, 0, deleteOp, shadows)>= 0)
-+		if (yaffs_UpdateObjectHeader(obj, newName, 0, deleteOp, shadows) >= 0)
- 			return YAFFS_OK;
- 	}
- 
- 	return YAFFS_FAIL;
- }
- 
--int yaffs_RenameObject(yaffs_Object * oldDir, const YCHAR * oldName,
--		       yaffs_Object * newDir, const YCHAR * newName)
-+int yaffs_RenameObject(yaffs_Object *oldDir, const YCHAR *oldName,
-+		yaffs_Object *newDir, const YCHAR *newName)
- {
--	yaffs_Object *obj;
--	yaffs_Object *existingTarget;
-+	yaffs_Object *obj = NULL;
-+	yaffs_Object *existingTarget = NULL;
- 	int force = 0;
- 
-+
-+	if (!oldDir || oldDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
-+		YBUG();
-+	if (!newDir || newDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
-+		YBUG();
-+
- #ifdef CONFIG_YAFFS_CASE_INSENSITIVE
- 	/* Special case for case insemsitive systems (eg. WinCE).
- 	 * While look-up is case insensitive, the name isn't.
- 	 * Therefore we might want to change x.txt to X.txt
- 	*/
--	if (oldDir == newDir && yaffs_strcmp(oldName, newName) == 0) {
-+	if (oldDir == newDir && yaffs_strcmp(oldName, newName) == 0)
- 		force = 1;
--	}
- #endif
- 
-+	else if (yaffs_strlen(newName) > YAFFS_MAX_NAME_LENGTH)
-+		/* ENAMETOOLONG */
-+		return YAFFS_FAIL;
-+
- 	obj = yaffs_FindObjectByName(oldDir, oldName);
--	/* Check new name to long. */
--	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK &&
--	    yaffs_strlen(newName) > YAFFS_MAX_ALIAS_LENGTH)
--	  /* ENAMETOOLONG */
--	  return YAFFS_FAIL;
--	else if (obj->variantType != YAFFS_OBJECT_TYPE_SYMLINK &&
--		 yaffs_strlen(newName) > YAFFS_MAX_NAME_LENGTH)
--	  /* ENAMETOOLONG */
--	  return YAFFS_FAIL;
- 
- 	if (obj && obj->renameAllowed) {
- 
-@@ -2456,8 +2487,8 @@ int yaffs_RenameObject(yaffs_Object * ol
- 
- 		existingTarget = yaffs_FindObjectByName(newDir, newName);
- 		if (existingTarget &&
--		    existingTarget->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
--		    !list_empty(&existingTarget->variant.directoryVariant.children)) {
-+			existingTarget->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
-+			!ylist_empty(&existingTarget->variant.directoryVariant.children)) {
- 			/* There is a target that is a non-empty directory, so we fail */
- 			return YAFFS_FAIL;	/* EEXIST or ENOTEMPTY */
- 		} else if (existingTarget && existingTarget != obj) {
-@@ -2465,7 +2496,7 @@ int yaffs_RenameObject(yaffs_Object * ol
- 			 * but only if it isn't the same object
- 			 */
- 			yaffs_ChangeObjectName(obj, newDir, newName, force,
--					       existingTarget->objectId);
-+						existingTarget->objectId);
- 			yaffs_UnlinkObject(existingTarget);
- 		}
- 
-@@ -2476,7 +2507,7 @@ int yaffs_RenameObject(yaffs_Object * ol
- 
- /*------------------------- Block Management and Page Allocation ----------------*/
- 
--static int yaffs_InitialiseBlocks(yaffs_Device * dev)
-+static int yaffs_InitialiseBlocks(yaffs_Device *dev)
- {
- 	int nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1;
- 
-@@ -2487,23 +2518,20 @@ static int yaffs_InitialiseBlocks(yaffs_
- 
- 	/* If the first allocation strategy fails, thry the alternate one */
- 	dev->blockInfo = YMALLOC(nBlocks * sizeof(yaffs_BlockInfo));
--	if(!dev->blockInfo){
-+	if (!dev->blockInfo) {
- 		dev->blockInfo = YMALLOC_ALT(nBlocks * sizeof(yaffs_BlockInfo));
- 		dev->blockInfoAlt = 1;
--	}
--	else
-+	} else
- 		dev->blockInfoAlt = 0;
- 
--	if(dev->blockInfo){
--
-+	if (dev->blockInfo) {
- 		/* Set up dynamic blockinfo stuff. */
- 		dev->chunkBitmapStride = (dev->nChunksPerBlock + 7) / 8; /* round up bytes */
- 		dev->chunkBits = YMALLOC(dev->chunkBitmapStride * nBlocks);
--		if(!dev->chunkBits){
-+		if (!dev->chunkBits) {
- 			dev->chunkBits = YMALLOC_ALT(dev->chunkBitmapStride * nBlocks);
- 			dev->chunkBitsAlt = 1;
--		}
--		else
-+		} else
- 			dev->chunkBitsAlt = 0;
- 	}
- 
-@@ -2514,30 +2542,29 @@ static int yaffs_InitialiseBlocks(yaffs_
- 	}
- 
- 	return YAFFS_FAIL;
--
- }
- 
--static void yaffs_DeinitialiseBlocks(yaffs_Device * dev)
-+static void yaffs_DeinitialiseBlocks(yaffs_Device *dev)
- {
--	if(dev->blockInfoAlt && dev->blockInfo)
-+	if (dev->blockInfoAlt && dev->blockInfo)
- 		YFREE_ALT(dev->blockInfo);
--	else if(dev->blockInfo)
-+	else if (dev->blockInfo)
- 		YFREE(dev->blockInfo);
- 
- 	dev->blockInfoAlt = 0;
- 
- 	dev->blockInfo = NULL;
- 
--	if(dev->chunkBitsAlt && dev->chunkBits)
-+	if (dev->chunkBitsAlt && dev->chunkBits)
- 		YFREE_ALT(dev->chunkBits);
--	else if(dev->chunkBits)
-+	else if (dev->chunkBits)
- 		YFREE(dev->chunkBits);
- 	dev->chunkBitsAlt = 0;
- 	dev->chunkBits = NULL;
- }
- 
--static int yaffs_BlockNotDisqualifiedFromGC(yaffs_Device * dev,
--					    yaffs_BlockInfo * bi)
-+static int yaffs_BlockNotDisqualifiedFromGC(yaffs_Device *dev,
-+					yaffs_BlockInfo *bi)
- {
- 	int i;
- 	__u32 seq;
-@@ -2556,7 +2583,7 @@ static int yaffs_BlockNotDisqualifiedFro
- 		seq = dev->sequenceNumber;
- 
- 		for (i = dev->internalStartBlock; i <= dev->internalEndBlock;
--		     i++) {
-+				i++) {
- 			b = yaffs_GetBlockInfo(dev, i);
- 			if (b->blockState == YAFFS_BLOCK_STATE_FULL &&
- 			    (b->pagesInUse - b->softDeletions) <
-@@ -2571,38 +2598,36 @@ static int yaffs_BlockNotDisqualifiedFro
- 	 * discarded pages.
- 	 */
- 	return (bi->sequenceNumber <= dev->oldestDirtySequence);
--
- }
- 
- /* FindDiretiestBlock is used to select the dirtiest block (or close enough)
-  * for garbage collection.
-  */
- 
--static int yaffs_FindBlockForGarbageCollection(yaffs_Device * dev,
--					       int aggressive)
-+static int yaffs_FindBlockForGarbageCollection(yaffs_Device *dev,
-+					int aggressive)
- {
--
- 	int b = dev->currentDirtyChecker;
- 
- 	int i;
- 	int iterations;
- 	int dirtiest = -1;
- 	int pagesInUse = 0;
--	int prioritised=0;
-+	int prioritised = 0;
- 	yaffs_BlockInfo *bi;
- 	int pendingPrioritisedExist = 0;
- 
- 	/* First let's see if we need to grab a prioritised block */
--	if(dev->hasPendingPrioritisedGCs){
--		for(i = dev->internalStartBlock; i < dev->internalEndBlock && !prioritised; i++){
-+	if (dev->hasPendingPrioritisedGCs) {
-+		for (i = dev->internalStartBlock; i < dev->internalEndBlock && !prioritised; i++) {
- 
- 			bi = yaffs_GetBlockInfo(dev, i);
--			//yaffs_VerifyBlock(dev,bi,i);
-+			/* yaffs_VerifyBlock(dev,bi,i); */
- 
--			if(bi->gcPrioritise) {
-+			if (bi->gcPrioritise) {
- 				pendingPrioritisedExist = 1;
--				if(bi->blockState == YAFFS_BLOCK_STATE_FULL &&
--				   yaffs_BlockNotDisqualifiedFromGC(dev, bi)){
-+				if (bi->blockState == YAFFS_BLOCK_STATE_FULL &&
-+				   yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
- 					pagesInUse = (bi->pagesInUse - bi->softDeletions);
- 					dirtiest = i;
- 					prioritised = 1;
-@@ -2611,7 +2636,7 @@ static int yaffs_FindBlockForGarbageColl
- 			}
- 		}
- 
--		if(!pendingPrioritisedExist) /* None found, so we can clear this */
-+		if (!pendingPrioritisedExist) /* None found, so we can clear this */
- 			dev->hasPendingPrioritisedGCs = 0;
- 	}
- 
-@@ -2623,31 +2648,28 @@ static int yaffs_FindBlockForGarbageColl
- 
- 	dev->nonAggressiveSkip--;
- 
--	if (!aggressive && (dev->nonAggressiveSkip > 0)) {
-+	if (!aggressive && (dev->nonAggressiveSkip > 0))
- 		return -1;
--	}
- 
--	if(!prioritised)
-+	if (!prioritised)
- 		pagesInUse =
--	    		(aggressive) ? dev->nChunksPerBlock : YAFFS_PASSIVE_GC_CHUNKS + 1;
-+			(aggressive) ? dev->nChunksPerBlock : YAFFS_PASSIVE_GC_CHUNKS + 1;
- 
--	if (aggressive) {
-+	if (aggressive)
- 		iterations =
- 		    dev->internalEndBlock - dev->internalStartBlock + 1;
--	} else {
-+	else {
- 		iterations =
- 		    dev->internalEndBlock - dev->internalStartBlock + 1;
- 		iterations = iterations / 16;
--		if (iterations > 200) {
-+		if (iterations > 200)
- 			iterations = 200;
--		}
- 	}
- 
- 	for (i = 0; i <= iterations && pagesInUse > 0 && !prioritised; i++) {
- 		b++;
--		if (b < dev->internalStartBlock || b > dev->internalEndBlock) {
-+		if (b < dev->internalStartBlock || b > dev->internalEndBlock)
- 			b = dev->internalStartBlock;
--		}
- 
- 		if (b < dev->internalStartBlock || b > dev->internalEndBlock) {
- 			T(YAFFS_TRACE_ERROR,
-@@ -2657,17 +2679,9 @@ static int yaffs_FindBlockForGarbageColl
- 
- 		bi = yaffs_GetBlockInfo(dev, b);
- 
--#if 0
--		if (bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT) {
--			dirtiest = b;
--			pagesInUse = 0;
--		}
--		else
--#endif
--
- 		if (bi->blockState == YAFFS_BLOCK_STATE_FULL &&
--		       (bi->pagesInUse - bi->softDeletions) < pagesInUse &&
--		        yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
-+			(bi->pagesInUse - bi->softDeletions) < pagesInUse &&
-+				yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
- 			dirtiest = b;
- 			pagesInUse = (bi->pagesInUse - bi->softDeletions);
- 		}
-@@ -2678,19 +2692,18 @@ static int yaffs_FindBlockForGarbageColl
- 	if (dirtiest > 0) {
- 		T(YAFFS_TRACE_GC,
- 		  (TSTR("GC Selected block %d with %d free, prioritised:%d" TENDSTR), dirtiest,
--		   dev->nChunksPerBlock - pagesInUse,prioritised));
-+		   dev->nChunksPerBlock - pagesInUse, prioritised));
- 	}
- 
- 	dev->oldestDirtySequence = 0;
- 
--	if (dirtiest > 0) {
-+	if (dirtiest > 0)
- 		dev->nonAggressiveSkip = 4;
--	}
- 
- 	return dirtiest;
- }
- 
--static void yaffs_BlockBecameDirty(yaffs_Device * dev, int blockNo)
-+static void yaffs_BlockBecameDirty(yaffs_Device *dev, int blockNo)
- {
- 	yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockNo);
- 
-@@ -2752,7 +2765,7 @@ static void yaffs_BlockBecameDirty(yaffs
- 	}
- }
- 
--static int yaffs_FindBlockForAllocation(yaffs_Device * dev)
-+static int yaffs_FindBlockForAllocation(yaffs_Device *dev)
- {
- 	int i;
- 
-@@ -2763,7 +2776,7 @@ static int yaffs_FindBlockForAllocation(
- 		 * Can't get space to gc
- 		 */
- 		T(YAFFS_TRACE_ERROR,
--		  (TSTR("yaffs tragedy: no more eraased blocks" TENDSTR)));
-+		  (TSTR("yaffs tragedy: no more erased blocks" TENDSTR)));
- 
- 		return -1;
- 	}
-@@ -2794,31 +2807,74 @@ static int yaffs_FindBlockForAllocation(
- 
- 	T(YAFFS_TRACE_ALWAYS,
- 	  (TSTR
--	   ("yaffs tragedy: no more eraased blocks, but there should have been %d"
-+	   ("yaffs tragedy: no more erased blocks, but there should have been %d"
- 	    TENDSTR), dev->nErasedBlocks));
- 
- 	return -1;
- }
- 
- 
--// Check if there's space to allocate...
--// Thinks.... do we need top make this ths same as yaffs_GetFreeChunks()?
--static int yaffs_CheckSpaceForAllocation(yaffs_Device * dev)
-+
-+static int yaffs_CalcCheckpointBlocksRequired(yaffs_Device *dev)
-+{
-+	if (!dev->nCheckpointBlocksRequired &&
-+	   dev->isYaffs2) {
-+		/* Not a valid value so recalculate */
-+		int nBytes = 0;
-+		int nBlocks;
-+		int devBlocks = (dev->endBlock - dev->startBlock + 1);
-+		int tnodeSize;
-+
-+		tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-+
-+		if (tnodeSize < sizeof(yaffs_Tnode))
-+			tnodeSize = sizeof(yaffs_Tnode);
-+
-+		nBytes += sizeof(yaffs_CheckpointValidity);
-+		nBytes += sizeof(yaffs_CheckpointDevice);
-+		nBytes += devBlocks * sizeof(yaffs_BlockInfo);
-+		nBytes += devBlocks * dev->chunkBitmapStride;
-+		nBytes += (sizeof(yaffs_CheckpointObject) + sizeof(__u32)) * (dev->nObjectsCreated - dev->nFreeObjects);
-+		nBytes += (tnodeSize + sizeof(__u32)) * (dev->nTnodesCreated - dev->nFreeTnodes);
-+		nBytes += sizeof(yaffs_CheckpointValidity);
-+		nBytes += sizeof(__u32); /* checksum*/
-+
-+		/* Round up and add 2 blocks to allow for some bad blocks, so add 3 */
-+
-+		nBlocks = (nBytes/(dev->nDataBytesPerChunk * dev->nChunksPerBlock)) + 3;
-+
-+		dev->nCheckpointBlocksRequired = nBlocks;
-+	}
-+
-+	return dev->nCheckpointBlocksRequired;
-+}
-+
-+/*
-+ * Check if there's space to allocate...
-+ * Thinks.... do we need top make this ths same as yaffs_GetFreeChunks()?
-+ */
-+static int yaffs_CheckSpaceForAllocation(yaffs_Device *dev)
- {
- 	int reservedChunks;
- 	int reservedBlocks = dev->nReservedBlocks;
- 	int checkpointBlocks;
- 
--	checkpointBlocks =  dev->nCheckpointReservedBlocks - dev->blocksInCheckpoint;
--	if(checkpointBlocks < 0)
-+	if (dev->isYaffs2) {
-+		checkpointBlocks =  yaffs_CalcCheckpointBlocksRequired(dev) -
-+				    dev->blocksInCheckpoint;
-+		if (checkpointBlocks < 0)
-+			checkpointBlocks = 0;
-+	} else {
- 		checkpointBlocks = 0;
-+	}
- 
- 	reservedChunks = ((reservedBlocks + checkpointBlocks) * dev->nChunksPerBlock);
- 
- 	return (dev->nFreeChunks > reservedChunks);
- }
- 
--static int yaffs_AllocateChunk(yaffs_Device * dev, int useReserve, yaffs_BlockInfo **blockUsedPtr)
-+static int yaffs_AllocateChunk(yaffs_Device *dev, int useReserve,
-+		yaffs_BlockInfo **blockUsedPtr)
- {
- 	int retVal;
- 	yaffs_BlockInfo *bi;
-@@ -2835,7 +2891,7 @@ static int yaffs_AllocateChunk(yaffs_Dev
- 	}
- 
- 	if (dev->nErasedBlocks < dev->nReservedBlocks
--	    && dev->allocationPage == 0) {
-+			&& dev->allocationPage == 0) {
- 		T(YAFFS_TRACE_ALLOCATE, (TSTR("Allocating reserve" TENDSTR)));
- 	}
- 
-@@ -2844,10 +2900,10 @@ static int yaffs_AllocateChunk(yaffs_Dev
- 		bi = yaffs_GetBlockInfo(dev, dev->allocationBlock);
- 
- 		retVal = (dev->allocationBlock * dev->nChunksPerBlock) +
--		    dev->allocationPage;
-+			dev->allocationPage;
- 		bi->pagesInUse++;
- 		yaffs_SetChunkBit(dev, dev->allocationBlock,
--				  dev->allocationPage);
-+				dev->allocationPage);
- 
- 		dev->allocationPage++;
- 
-@@ -2859,43 +2915,43 @@ static int yaffs_AllocateChunk(yaffs_Dev
- 			dev->allocationBlock = -1;
- 		}
- 
--		if(blockUsedPtr)
-+		if (blockUsedPtr)
- 			*blockUsedPtr = bi;
- 
- 		return retVal;
- 	}
- 
- 	T(YAFFS_TRACE_ERROR,
--	  (TSTR("!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!" TENDSTR)));
-+			(TSTR("!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!" TENDSTR)));
- 
- 	return -1;
- }
- 
--static int yaffs_GetErasedChunks(yaffs_Device * dev)
-+static int yaffs_GetErasedChunks(yaffs_Device *dev)
- {
- 	int n;
- 
- 	n = dev->nErasedBlocks * dev->nChunksPerBlock;
- 
--	if (dev->allocationBlock > 0) {
-+	if (dev->allocationBlock > 0)
- 		n += (dev->nChunksPerBlock - dev->allocationPage);
--	}
- 
- 	return n;
- 
- }
- 
--static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block)
-+static int yaffs_GarbageCollectBlock(yaffs_Device *dev, int block,
-+		int wholeBlock)
- {
- 	int oldChunk;
- 	int newChunk;
--	int chunkInBlock;
- 	int markNAND;
- 	int retVal = YAFFS_OK;
- 	int cleanups = 0;
- 	int i;
- 	int isCheckpointBlock;
- 	int matchingChunk;
-+	int maxCopies;
- 
- 	int chunksBefore = yaffs_GetErasedChunks(dev);
- 	int chunksAfter;
-@@ -2911,8 +2967,11 @@ static int yaffs_GarbageCollectBlock(yaf
- 	bi->blockState = YAFFS_BLOCK_STATE_COLLECTING;
- 
- 	T(YAFFS_TRACE_TRACING,
--	  (TSTR("Collecting block %d, in use %d, shrink %d, " TENDSTR), block,
--	   bi->pagesInUse, bi->hasShrinkHeader));
-+			(TSTR("Collecting block %d, in use %d, shrink %d, wholeBlock %d" TENDSTR),
-+			 block,
-+			 bi->pagesInUse,
-+			 bi->hasShrinkHeader,
-+			 wholeBlock));
- 
- 	/*yaffs_VerifyFreeChunks(dev); */
- 
-@@ -2926,26 +2985,33 @@ static int yaffs_GarbageCollectBlock(yaf
- 	dev->isDoingGC = 1;
- 
- 	if (isCheckpointBlock ||
--	    !yaffs_StillSomeChunkBits(dev, block)) {
-+			!yaffs_StillSomeChunkBits(dev, block)) {
- 		T(YAFFS_TRACE_TRACING,
--		  (TSTR
--		   ("Collecting block %d that has no chunks in use" TENDSTR),
--		   block));
-+				(TSTR
-+				 ("Collecting block %d that has no chunks in use" TENDSTR),
-+				 block));
- 		yaffs_BlockBecameDirty(dev, block);
- 	} else {
- 
- 		__u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
- 
--		yaffs_VerifyBlock(dev,bi,block);
-+		yaffs_VerifyBlock(dev, bi, block);
- 
--		for (chunkInBlock = 0, oldChunk = block * dev->nChunksPerBlock;
--		     chunkInBlock < dev->nChunksPerBlock
--		     && yaffs_StillSomeChunkBits(dev, block);
--		     chunkInBlock++, oldChunk++) {
--			if (yaffs_CheckChunkBit(dev, block, chunkInBlock)) {
-+		maxCopies = (wholeBlock) ? dev->nChunksPerBlock : 10;
-+		oldChunk = block * dev->nChunksPerBlock + dev->gcChunk;
-+
-+		for (/* init already done */;
-+		     retVal == YAFFS_OK &&
-+		     dev->gcChunk < dev->nChunksPerBlock &&
-+		     (bi->blockState == YAFFS_BLOCK_STATE_COLLECTING) &&
-+		     maxCopies > 0;
-+		     dev->gcChunk++, oldChunk++) {
-+			if (yaffs_CheckChunkBit(dev, block, dev->gcChunk)) {
- 
- 				/* This page is in use and might need to be copied off */
- 
-+				maxCopies--;
-+
- 				markNAND = 1;
- 
- 				yaffs_InitialiseTags(&tags);
-@@ -2959,22 +3025,22 @@ static int yaffs_GarbageCollectBlock(yaf
- 
- 				T(YAFFS_TRACE_GC_DETAIL,
- 				  (TSTR
--				   ("Collecting page %d, %d %d %d " TENDSTR),
--				   chunkInBlock, tags.objectId, tags.chunkId,
-+				   ("Collecting chunk in block %d, %d %d %d " TENDSTR),
-+				   dev->gcChunk, tags.objectId, tags.chunkId,
- 				   tags.byteCount));
- 
--				if(object && !yaffs_SkipVerification(dev)){
--					if(tags.chunkId == 0)
--						matchingChunk = object->chunkId;
--					else if(object->softDeleted)
-+				if (object && !yaffs_SkipVerification(dev)) {
-+					if (tags.chunkId == 0)
-+						matchingChunk = object->hdrChunk;
-+					else if (object->softDeleted)
- 						matchingChunk = oldChunk; /* Defeat the test */
- 					else
--						matchingChunk = yaffs_FindChunkInFile(object,tags.chunkId,NULL);
-+						matchingChunk = yaffs_FindChunkInFile(object, tags.chunkId, NULL);
- 
--					if(oldChunk != matchingChunk)
-+					if (oldChunk != matchingChunk)
- 						T(YAFFS_TRACE_ERROR,
- 						  (TSTR("gc: page in gc mismatch: %d %d %d %d"TENDSTR),
--						  oldChunk,matchingChunk,tags.objectId, tags.chunkId));
-+						  oldChunk, matchingChunk, tags.objectId, tags.chunkId));
- 
- 				}
- 
-@@ -2986,9 +3052,11 @@ static int yaffs_GarbageCollectBlock(yaf
- 					    tags.objectId, tags.chunkId, tags.byteCount));
- 				}
- 
--				if (object && object->deleted
--				    && tags.chunkId != 0) {
--					/* Data chunk in a deleted file, throw it away
-+				if (object &&
-+				    object->deleted &&
-+				    object->softDeleted &&
-+				    tags.chunkId != 0) {
-+					/* Data chunk in a soft deleted file, throw it away
- 					 * It's a soft deleted data chunk,
- 					 * No need to copy this, just forget about it and
- 					 * fix up the object.
-@@ -3003,13 +3071,12 @@ static int yaffs_GarbageCollectBlock(yaf
- 						cleanups++;
- 					}
- 					markNAND = 0;
--				} else if (0
--					   /* Todo object && object->deleted && object->nDataChunks == 0 */
--					   ) {
-+				} else if (0) {
-+					/* Todo object && object->deleted && object->nDataChunks == 0 */
- 					/* Deleted object header with no data chunks.
- 					 * Can be discarded and the file deleted.
- 					 */
--					object->chunkId = 0;
-+					object->hdrChunk = 0;
- 					yaffs_FreeTnode(object->myDev,
- 							object->variant.
- 							fileVariant.top);
-@@ -3031,17 +3098,14 @@ static int yaffs_GarbageCollectBlock(yaf
- 						 * We need to nuke the shrinkheader flags first
- 						 * We no longer want the shrinkHeader flag since its work is done
- 						 * and if it is left in place it will mess up scanning.
--						 * Also, clear out any shadowing stuff
- 						 */
- 
- 						yaffs_ObjectHeader *oh;
- 						oh = (yaffs_ObjectHeader *)buffer;
- 						oh->isShrink = 0;
--						oh->shadowsObject = -1;
--						tags.extraShadows = 0;
- 						tags.extraIsShrinkHeader = 0;
- 
--						yaffs_VerifyObjectHeader(object,oh,&tags,1);
-+						yaffs_VerifyObjectHeader(object, oh, &tags, 1);
- 					}
- 
- 					newChunk =
-@@ -3055,7 +3119,7 @@ static int yaffs_GarbageCollectBlock(yaf
- 
- 						if (tags.chunkId == 0) {
- 							/* It's a header */
--							object->chunkId =  newChunk;
-+							object->hdrChunk =  newChunk;
- 							object->serial =   tags.serialNumber;
- 						} else {
- 							/* It's a data chunk */
-@@ -3067,7 +3131,8 @@ static int yaffs_GarbageCollectBlock(yaf
- 					}
- 				}
- 
--				yaffs_DeleteChunk(dev, oldChunk, markNAND, __LINE__);
-+				if (retVal == YAFFS_OK)
-+					yaffs_DeleteChunk(dev, oldChunk, markNAND, __LINE__);
- 
- 			}
- 		}
-@@ -3098,18 +3163,25 @@ static int yaffs_GarbageCollectBlock(yaf
- 
- 	}
- 
--	yaffs_VerifyCollectedBlock(dev,bi,block);
-+	yaffs_VerifyCollectedBlock(dev, bi, block);
- 
--	if (chunksBefore >= (chunksAfter = yaffs_GetErasedChunks(dev))) {
-+	chunksAfter = yaffs_GetErasedChunks(dev);
-+	if (chunksBefore >= chunksAfter) {
- 		T(YAFFS_TRACE_GC,
- 		  (TSTR
- 		   ("gc did not increase free chunks before %d after %d"
- 		    TENDSTR), chunksBefore, chunksAfter));
- 	}
- 
-+	/* If the gc completed then clear the current gcBlock so that we find another. */
-+	if (bi->blockState != YAFFS_BLOCK_STATE_COLLECTING) {
-+		dev->gcBlock = -1;
-+		dev->gcChunk = 0;
-+	}
-+
- 	dev->isDoingGC = 0;
- 
--	return YAFFS_OK;
-+	return retVal;
- }
- 
- /* New garbage collector
-@@ -3121,7 +3193,7 @@ static int yaffs_GarbageCollectBlock(yaf
-  * The idea is to help clear out space in a more spread-out manner.
-  * Dunno if it really does anything useful.
-  */
--static int yaffs_CheckGarbageCollection(yaffs_Device * dev)
-+static int yaffs_CheckGarbageCollection(yaffs_Device *dev)
- {
- 	int block;
- 	int aggressive;
-@@ -3142,8 +3214,8 @@ static int yaffs_CheckGarbageCollection(
- 	do {
- 		maxTries++;
- 
--		checkpointBlockAdjust = (dev->nCheckpointReservedBlocks - dev->blocksInCheckpoint);
--		if(checkpointBlockAdjust < 0)
-+		checkpointBlockAdjust = yaffs_CalcCheckpointBlocksRequired(dev) - dev->blocksInCheckpoint;
-+		if (checkpointBlockAdjust < 0)
- 			checkpointBlockAdjust = 0;
- 
- 		if (dev->nErasedBlocks < (dev->nReservedBlocks + checkpointBlockAdjust + 2)) {
-@@ -3154,20 +3226,24 @@ static int yaffs_CheckGarbageCollection(
- 			aggressive = 0;
- 		}
- 
--		block = yaffs_FindBlockForGarbageCollection(dev, aggressive);
-+		if (dev->gcBlock <= 0) {
-+			dev->gcBlock = yaffs_FindBlockForGarbageCollection(dev, aggressive);
-+			dev->gcChunk = 0;
-+		}
-+
-+		block = dev->gcBlock;
- 
- 		if (block > 0) {
- 			dev->garbageCollections++;
--			if (!aggressive) {
-+			if (!aggressive)
- 				dev->passiveGarbageCollections++;
--			}
- 
- 			T(YAFFS_TRACE_GC,
- 			  (TSTR
- 			   ("yaffs: GC erasedBlocks %d aggressive %d" TENDSTR),
- 			   dev->nErasedBlocks, aggressive));
- 
--			gcOk = yaffs_GarbageCollectBlock(dev, block);
-+			gcOk = yaffs_GarbageCollectBlock(dev, block, aggressive);
- 		}
- 
- 		if (dev->nErasedBlocks < (dev->nReservedBlocks) && block > 0) {
-@@ -3176,15 +3252,16 @@ static int yaffs_CheckGarbageCollection(
- 			   ("yaffs: GC !!!no reclaim!!! erasedBlocks %d after try %d block %d"
- 			    TENDSTR), dev->nErasedBlocks, maxTries, block));
- 		}
--	} while ((dev->nErasedBlocks < dev->nReservedBlocks) && (block > 0)
--		 && (maxTries < 2));
-+	} while ((dev->nErasedBlocks < dev->nReservedBlocks) &&
-+		 (block > 0) &&
-+		 (maxTries < 2));
- 
- 	return aggressive ? gcOk : YAFFS_OK;
- }
- 
- /*-------------------------  TAGS --------------------------------*/
- 
--static int yaffs_TagsMatch(const yaffs_ExtendedTags * tags, int objectId,
-+static int yaffs_TagsMatch(const yaffs_ExtendedTags *tags, int objectId,
- 			   int chunkInObject)
- {
- 	return (tags->chunkId == chunkInObject &&
-@@ -3195,8 +3272,8 @@ static int yaffs_TagsMatch(const yaffs_E
- 
- /*-------------------- Data file manipulation -----------------*/
- 
--static int yaffs_FindChunkInFile(yaffs_Object * in, int chunkInInode,
--				 yaffs_ExtendedTags * tags)
-+static int yaffs_FindChunkInFile(yaffs_Object *in, int chunkInInode,
-+				 yaffs_ExtendedTags *tags)
- {
- 	/*Get the Tnode, then get the level 0 offset chunk offset */
- 	yaffs_Tnode *tn;
-@@ -3214,7 +3291,7 @@ static int yaffs_FindChunkInFile(yaffs_O
- 	tn = yaffs_FindLevel0Tnode(dev, &in->variant.fileVariant, chunkInInode);
- 
- 	if (tn) {
--		theChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode);
-+		theChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
- 
- 		retVal =
- 		    yaffs_FindChunkInGroup(dev, theChunk, tags, in->objectId,
-@@ -3223,8 +3300,8 @@ static int yaffs_FindChunkInFile(yaffs_O
- 	return retVal;
- }
- 
--static int yaffs_FindAndDeleteChunkInFile(yaffs_Object * in, int chunkInInode,
--					  yaffs_ExtendedTags * tags)
-+static int yaffs_FindAndDeleteChunkInFile(yaffs_Object *in, int chunkInInode,
-+					  yaffs_ExtendedTags *tags)
- {
- 	/* Get the Tnode, then get the level 0 offset chunk offset */
- 	yaffs_Tnode *tn;
-@@ -3243,29 +3320,23 @@ static int yaffs_FindAndDeleteChunkInFil
- 
- 	if (tn) {
- 
--		theChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode);
-+		theChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
- 
- 		retVal =
- 		    yaffs_FindChunkInGroup(dev, theChunk, tags, in->objectId,
- 					   chunkInInode);
- 
- 		/* Delete the entry in the filestructure (if found) */
--		if (retVal != -1) {
--			yaffs_PutLevel0Tnode(dev,tn,chunkInInode,0);
--		}
--	} else {
--		/*T(("No level 0 found for %d\n", chunkInInode)); */
-+		if (retVal != -1)
-+			yaffs_PutLevel0Tnode(dev, tn, chunkInInode, 0);
- 	}
- 
--	if (retVal == -1) {
--		/* T(("Could not find %d to delete\n",chunkInInode)); */
--	}
- 	return retVal;
- }
- 
- #ifdef YAFFS_PARANOID
- 
--static int yaffs_CheckFileSanity(yaffs_Object * in)
-+static int yaffs_CheckFileSanity(yaffs_Object *in)
- {
- 	int chunk;
- 	int nChunks;
-@@ -3278,10 +3349,8 @@ static int yaffs_CheckFileSanity(yaffs_O
- 	int theChunk;
- 	int chunkDeleted;
- 
--	if (in->variantType != YAFFS_OBJECT_TYPE_FILE) {
--		/* T(("Object not a file\n")); */
-+	if (in->variantType != YAFFS_OBJECT_TYPE_FILE)
- 		return YAFFS_FAIL;
--	}
- 
- 	objId = in->objectId;
- 	fSize = in->variant.fileVariant.fileSize;
-@@ -3294,7 +3363,7 @@ static int yaffs_CheckFileSanity(yaffs_O
- 
- 		if (tn) {
- 
--			theChunk = yaffs_GetChunkGroupBase(dev,tn,chunk);
-+			theChunk = yaffs_GetChunkGroupBase(dev, tn, chunk);
- 
- 			if (yaffs_CheckChunkBits
- 			    (dev, theChunk / dev->nChunksPerBlock,
-@@ -3323,7 +3392,7 @@ static int yaffs_CheckFileSanity(yaffs_O
- 
- #endif
- 
--static int yaffs_PutChunkIntoFile(yaffs_Object * in, int chunkInInode,
-+static int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode,
- 				  int chunkInNAND, int inScan)
- {
- 	/* NB inScan is zero unless scanning.
-@@ -3358,11 +3427,10 @@ static int yaffs_PutChunkIntoFile(yaffs_
- 					&in->variant.fileVariant,
- 					chunkInInode,
- 					NULL);
--	if (!tn) {
-+	if (!tn)
- 		return YAFFS_FAIL;
--	}
- 
--	existingChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode);
-+	existingChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
- 
- 	if (inScan != 0) {
- 		/* If we're scanning then we need to test for duplicates
-@@ -3374,7 +3442,7 @@ static int yaffs_PutChunkIntoFile(yaffs_
- 		 * Update: For backward scanning we don't need to re-read tags so this is quite cheap.
- 		 */
- 
--		if (existingChunk != 0) {
-+		if (existingChunk > 0) {
- 			/* NB Right now existing chunk will not be real chunkId if the device >= 32MB
- 			 *    thus we have to do a FindChunkInFile to get the real chunk id.
- 			 *
-@@ -3411,8 +3479,10 @@ static int yaffs_PutChunkIntoFile(yaffs_
- 			 * not be loaded during a scan
- 			 */
- 
--			newSerial = newTags.serialNumber;
--			existingSerial = existingTags.serialNumber;
-+			if (inScan > 0) {
-+				newSerial = newTags.serialNumber;
-+				existingSerial = existingTags.serialNumber;
-+			}
- 
- 			if ((inScan > 0) &&
- 			    (in->myDev->isYaffs2 ||
-@@ -3437,24 +3507,23 @@ static int yaffs_PutChunkIntoFile(yaffs_
- 
- 	}
- 
--	if (existingChunk == 0) {
-+	if (existingChunk == 0)
- 		in->nDataChunks++;
--	}
- 
--	yaffs_PutLevel0Tnode(dev,tn,chunkInInode,chunkInNAND);
-+	yaffs_PutLevel0Tnode(dev, tn, chunkInInode, chunkInNAND);
- 
- 	return YAFFS_OK;
- }
- 
--static int yaffs_ReadChunkDataFromObject(yaffs_Object * in, int chunkInInode,
--					 __u8 * buffer)
-+static int yaffs_ReadChunkDataFromObject(yaffs_Object *in, int chunkInInode,
-+					__u8 *buffer)
- {
- 	int chunkInNAND = yaffs_FindChunkInFile(in, chunkInInode, NULL);
- 
--	if (chunkInNAND >= 0) {
-+	if (chunkInNAND >= 0)
- 		return yaffs_ReadChunkWithTagsFromNAND(in->myDev, chunkInNAND,
--						       buffer,NULL);
--	} else {
-+						buffer, NULL);
-+	else {
- 		T(YAFFS_TRACE_NANDACCESS,
- 		  (TSTR("Chunk %d not found zero instead" TENDSTR),
- 		   chunkInNAND));
-@@ -3465,7 +3534,7 @@ static int yaffs_ReadChunkDataFromObject
- 
- }
- 
--void yaffs_DeleteChunk(yaffs_Device * dev, int chunkId, int markNAND, int lyn)
-+void yaffs_DeleteChunk(yaffs_Device *dev, int chunkId, int markNAND, int lyn)
- {
- 	int block;
- 	int page;
-@@ -3475,16 +3544,15 @@ void yaffs_DeleteChunk(yaffs_Device * de
- 	if (chunkId <= 0)
- 		return;
- 
--
- 	dev->nDeletions++;
- 	block = chunkId / dev->nChunksPerBlock;
- 	page = chunkId % dev->nChunksPerBlock;
- 
- 
--	if(!yaffs_CheckChunkBit(dev,block,page))
-+	if (!yaffs_CheckChunkBit(dev, block, page))
- 		T(YAFFS_TRACE_VERIFY,
--		 	(TSTR("Deleting invalid chunk %d"TENDSTR),
--		 	 chunkId));
-+			(TSTR("Deleting invalid chunk %d"TENDSTR),
-+			 chunkId));
- 
- 	bi = yaffs_GetBlockInfo(dev, block);
- 
-@@ -3524,14 +3592,12 @@ void yaffs_DeleteChunk(yaffs_Device * de
- 			yaffs_BlockBecameDirty(dev, block);
- 		}
- 
--	} else {
--		/* T(("Bad news deleting chunk %d\n",chunkId)); */
- 	}
- 
- }
- 
--static int yaffs_WriteChunkDataToObject(yaffs_Object * in, int chunkInInode,
--					const __u8 * buffer, int nBytes,
-+static int yaffs_WriteChunkDataToObject(yaffs_Object *in, int chunkInInode,
-+					const __u8 *buffer, int nBytes,
- 					int useReserve)
- {
- 	/* Find old chunk Need to do this to get serial number
-@@ -3561,6 +3627,12 @@ static int yaffs_WriteChunkDataToObject(
- 	    (prevChunkId >= 0) ? prevTags.serialNumber + 1 : 1;
- 	newTags.byteCount = nBytes;
- 
-+	if (nBytes < 1 || nBytes > dev->totalBytesPerChunk) {
-+		T(YAFFS_TRACE_ERROR,
-+		(TSTR("Writing %d bytes to chunk!!!!!!!!!" TENDSTR), nBytes));
-+		YBUG();
-+	}
-+
- 	newChunkId =
- 	    yaffs_WriteNewChunkWithTagsToNAND(dev, buffer, &newTags,
- 					      useReserve);
-@@ -3568,11 +3640,9 @@ static int yaffs_WriteChunkDataToObject(
- 	if (newChunkId >= 0) {
- 		yaffs_PutChunkIntoFile(in, chunkInInode, newChunkId, 0);
- 
--		if (prevChunkId >= 0) {
-+		if (prevChunkId >= 0)
- 			yaffs_DeleteChunk(dev, prevChunkId, 1, __LINE__);
- 
--		}
--
- 		yaffs_CheckFileSanity(in);
- 	}
- 	return newChunkId;
-@@ -3582,7 +3652,7 @@ static int yaffs_WriteChunkDataToObject(
- /* UpdateObjectHeader updates the header on NAND for an object.
-  * If name is not NULL, then that new name is used.
-  */
--int yaffs_UpdateObjectHeader(yaffs_Object * in, const YCHAR * name, int force,
-+int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name, int force,
- 			     int isShrink, int shadows)
- {
- 
-@@ -3603,9 +3673,12 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 
- 	yaffs_ObjectHeader *oh = NULL;
- 
--	yaffs_strcpy(oldName,"silly old name");
-+	yaffs_strcpy(oldName, _Y("silly old name"));
- 
--	if (!in->fake || force) {
-+
-+	if (!in->fake ||
-+		in == dev->rootDir || /* The rootDir should also be saved */
-+		force) {
- 
- 		yaffs_CheckGarbageCollection(dev);
- 		yaffs_CheckObjectDetailsLoaded(in);
-@@ -3613,13 +3686,13 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 		buffer = yaffs_GetTempBuffer(in->myDev, __LINE__);
- 		oh = (yaffs_ObjectHeader *) buffer;
- 
--		prevChunkId = in->chunkId;
-+		prevChunkId = in->hdrChunk;
- 
--		if (prevChunkId >= 0) {
-+		if (prevChunkId > 0) {
- 			result = yaffs_ReadChunkWithTagsFromNAND(dev, prevChunkId,
- 							buffer, &oldTags);
- 
--			yaffs_VerifyObjectHeader(in,oh,&oldTags,0);
-+			yaffs_VerifyObjectHeader(in, oh, &oldTags, 0);
- 
- 			memcpy(oldName, oh->name, sizeof(oh->name));
- 		}
-@@ -3628,7 +3701,7 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 
- 		oh->type = in->variantType;
- 		oh->yst_mode = in->yst_mode;
--		oh->shadowsObject = shadows;
-+		oh->shadowsObject = oh->inbandShadowsObject = shadows;
- 
- #ifdef CONFIG_YAFFS_WINCE
- 		oh->win_atime[0] = in->win_atime[0];
-@@ -3645,20 +3718,18 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 		oh->yst_ctime = in->yst_ctime;
- 		oh->yst_rdev = in->yst_rdev;
- #endif
--		if (in->parent) {
-+		if (in->parent)
- 			oh->parentObjectId = in->parent->objectId;
--		} else {
-+		else
- 			oh->parentObjectId = 0;
--		}
- 
- 		if (name && *name) {
- 			memset(oh->name, 0, sizeof(oh->name));
- 			yaffs_strncpy(oh->name, name, YAFFS_MAX_NAME_LENGTH);
--		} else if (prevChunkId>=0) {
-+		} else if (prevChunkId >= 0)
- 			memcpy(oh->name, oldName, sizeof(oh->name));
--		} else {
-+		else
- 			memset(oh->name, 0, sizeof(oh->name));
--		}
- 
- 		oh->isShrink = isShrink;
- 
-@@ -3708,7 +3779,7 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 		newTags.extraShadows = (oh->shadowsObject > 0) ? 1 : 0;
- 		newTags.extraObjectType = in->variantType;
- 
--		yaffs_VerifyObjectHeader(in,oh,&newTags,1);
-+		yaffs_VerifyObjectHeader(in, oh, &newTags, 1);
- 
- 		/* Create new chunk in NAND */
- 		newChunkId =
-@@ -3717,20 +3788,20 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 
- 		if (newChunkId >= 0) {
- 
--			in->chunkId = newChunkId;
-+			in->hdrChunk = newChunkId;
- 
- 			if (prevChunkId >= 0) {
- 				yaffs_DeleteChunk(dev, prevChunkId, 1,
- 						  __LINE__);
- 			}
- 
--			if(!yaffs_ObjectHasCachedWriteData(in))
-+			if (!yaffs_ObjectHasCachedWriteData(in))
- 				in->dirty = 0;
- 
- 			/* If this was a shrink, then mark the block that the chunk lives on */
- 			if (isShrink) {
- 				bi = yaffs_GetBlockInfo(in->myDev,
--							newChunkId /in->myDev->	nChunksPerBlock);
-+					newChunkId / in->myDev->nChunksPerBlock);
- 				bi->hasShrinkHeader = 1;
- 			}
- 
-@@ -3766,7 +3837,7 @@ static int yaffs_ObjectHasCachedWriteDat
- 	yaffs_ChunkCache *cache;
- 	int nCaches = obj->myDev->nShortOpCaches;
- 
--	for(i = 0; i < nCaches; i++){
-+	for (i = 0; i < nCaches; i++) {
- 		cache = &dev->srCache[i];
- 		if (cache->object == obj &&
- 		    cache->dirty)
-@@ -3777,7 +3848,7 @@ static int yaffs_ObjectHasCachedWriteDat
- }
- 
- 
--static void yaffs_FlushFilesChunkCache(yaffs_Object * obj)
-+static void yaffs_FlushFilesChunkCache(yaffs_Object *obj)
- {
- 	yaffs_Device *dev = obj->myDev;
- 	int lowest = -99;	/* Stop compiler whining. */
-@@ -3844,16 +3915,16 @@ void yaffs_FlushEntireDeviceCache(yaffs_
- 	 */
- 	do {
- 		obj = NULL;
--		for( i = 0; i < nCaches && !obj; i++) {
-+		for (i = 0; i < nCaches && !obj; i++) {
- 			if (dev->srCache[i].object &&
- 			    dev->srCache[i].dirty)
- 				obj = dev->srCache[i].object;
- 
- 		}
--		if(obj)
-+		if (obj)
- 			yaffs_FlushFilesChunkCache(obj);
- 
--	} while(obj);
-+	} while (obj);
- 
- }
- 
-@@ -3863,41 +3934,21 @@ void yaffs_FlushEntireDeviceCache(yaffs_
-  * Then look for the least recently used non-dirty one.
-  * Then look for the least recently used dirty one...., flush and look again.
-  */
--static yaffs_ChunkCache *yaffs_GrabChunkCacheWorker(yaffs_Device * dev)
-+static yaffs_ChunkCache *yaffs_GrabChunkCacheWorker(yaffs_Device *dev)
- {
- 	int i;
--	int usage;
--	int theOne;
- 
- 	if (dev->nShortOpCaches > 0) {
- 		for (i = 0; i < dev->nShortOpCaches; i++) {
- 			if (!dev->srCache[i].object)
- 				return &dev->srCache[i];
- 		}
-+	}
- 
--		return NULL;
-+	return NULL;
-+}
- 
--		theOne = -1;
--		usage = 0;	/* just to stop the compiler grizzling */
--
--		for (i = 0; i < dev->nShortOpCaches; i++) {
--			if (!dev->srCache[i].dirty &&
--			    ((dev->srCache[i].lastUse < usage && theOne >= 0) ||
--			     theOne < 0)) {
--				usage = dev->srCache[i].lastUse;
--				theOne = i;
--			}
--		}
--
--
--		return theOne >= 0 ? &dev->srCache[theOne] : NULL;
--	} else {
--		return NULL;
--	}
--
--}
--
--static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device * dev)
-+static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device *dev)
- {
- 	yaffs_ChunkCache *cache;
- 	yaffs_Object *theObj;
-@@ -3927,8 +3978,7 @@ static yaffs_ChunkCache *yaffs_GrabChunk
- 			for (i = 0; i < dev->nShortOpCaches; i++) {
- 				if (dev->srCache[i].object &&
- 				    !dev->srCache[i].locked &&
--				    (dev->srCache[i].lastUse < usage || !cache))
--				{
-+				    (dev->srCache[i].lastUse < usage || !cache)) {
- 					usage = dev->srCache[i].lastUse;
- 					theObj = dev->srCache[i].object;
- 					cache = &dev->srCache[i];
-@@ -3950,7 +4000,7 @@ static yaffs_ChunkCache *yaffs_GrabChunk
- }
- 
- /* Find a cached chunk */
--static yaffs_ChunkCache *yaffs_FindChunkCache(const yaffs_Object * obj,
-+static yaffs_ChunkCache *yaffs_FindChunkCache(const yaffs_Object *obj,
- 					      int chunkId)
- {
- 	yaffs_Device *dev = obj->myDev;
-@@ -3969,7 +4019,7 @@ static yaffs_ChunkCache *yaffs_FindChunk
- }
- 
- /* Mark the chunk for the least recently used algorithym */
--static void yaffs_UseChunkCache(yaffs_Device * dev, yaffs_ChunkCache * cache,
-+static void yaffs_UseChunkCache(yaffs_Device *dev, yaffs_ChunkCache *cache,
- 				int isAWrite)
- {
- 
-@@ -3977,9 +4027,9 @@ static void yaffs_UseChunkCache(yaffs_De
- 		if (dev->srLastUse < 0 || dev->srLastUse > 100000000) {
- 			/* Reset the cache usages */
- 			int i;
--			for (i = 1; i < dev->nShortOpCaches; i++) {
-+			for (i = 1; i < dev->nShortOpCaches; i++)
- 				dev->srCache[i].lastUse = 0;
--			}
-+
- 			dev->srLastUse = 0;
- 		}
- 
-@@ -3987,9 +4037,8 @@ static void yaffs_UseChunkCache(yaffs_De
- 
- 		cache->lastUse = dev->srLastUse;
- 
--		if (isAWrite) {
-+		if (isAWrite)
- 			cache->dirty = 1;
--		}
- 	}
- }
- 
-@@ -3997,21 +4046,20 @@ static void yaffs_UseChunkCache(yaffs_De
-  * Do this when a whole page gets written,
-  * ie the short cache for this page is no longer valid.
-  */
--static void yaffs_InvalidateChunkCache(yaffs_Object * object, int chunkId)
-+static void yaffs_InvalidateChunkCache(yaffs_Object *object, int chunkId)
- {
- 	if (object->myDev->nShortOpCaches > 0) {
- 		yaffs_ChunkCache *cache = yaffs_FindChunkCache(object, chunkId);
- 
--		if (cache) {
-+		if (cache)
- 			cache->object = NULL;
--		}
- 	}
- }
- 
- /* Invalidate all the cache pages associated with this object
-  * Do this whenever ther file is deleted or resized.
-  */
--static void yaffs_InvalidateWholeChunkCache(yaffs_Object * in)
-+static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in)
- {
- 	int i;
- 	yaffs_Device *dev = in->myDev;
-@@ -4019,9 +4067,8 @@ static void yaffs_InvalidateWholeChunkCa
- 	if (dev->nShortOpCaches > 0) {
- 		/* Invalidate it. */
- 		for (i = 0; i < dev->nShortOpCaches; i++) {
--			if (dev->srCache[i].object == in) {
-+			if (dev->srCache[i].object == in)
- 				dev->srCache[i].object = NULL;
--			}
- 		}
- 	}
- }
-@@ -4029,18 +4076,18 @@ static void yaffs_InvalidateWholeChunkCa
- /*--------------------- Checkpointing --------------------*/
- 
- 
--static int yaffs_WriteCheckpointValidityMarker(yaffs_Device *dev,int head)
-+static int yaffs_WriteCheckpointValidityMarker(yaffs_Device *dev, int head)
- {
- 	yaffs_CheckpointValidity cp;
- 
--	memset(&cp,0,sizeof(cp));
-+	memset(&cp, 0, sizeof(cp));
- 
- 	cp.structType = sizeof(cp);
- 	cp.magic = YAFFS_MAGIC;
- 	cp.version = YAFFS_CHECKPOINT_VERSION;
- 	cp.head = (head) ? 1 : 0;
- 
--	return (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp))?
-+	return (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp)) ?
- 		1 : 0;
- }
- 
-@@ -4049,9 +4096,9 @@ static int yaffs_ReadCheckpointValidityM
- 	yaffs_CheckpointValidity cp;
- 	int ok;
- 
--	ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp));
-+	ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
- 
--	if(ok)
-+	if (ok)
- 		ok = (cp.structType == sizeof(cp)) &&
- 		     (cp.magic == YAFFS_MAGIC) &&
- 		     (cp.version == YAFFS_CHECKPOINT_VERSION) &&
-@@ -4100,21 +4147,21 @@ static int yaffs_WriteCheckpointDevice(y
- 	int ok;
- 
- 	/* Write device runtime values*/
--	yaffs_DeviceToCheckpointDevice(&cp,dev);
-+	yaffs_DeviceToCheckpointDevice(&cp, dev);
- 	cp.structType = sizeof(cp);
- 
--	ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
-+	ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
- 
- 	/* Write block info */
--	if(ok) {
-+	if (ok) {
- 		nBytes = nBlocks * sizeof(yaffs_BlockInfo);
--		ok = (yaffs_CheckpointWrite(dev,dev->blockInfo,nBytes) == nBytes);
-+		ok = (yaffs_CheckpointWrite(dev, dev->blockInfo, nBytes) == nBytes);
- 	}
- 
- 	/* Write chunk bits */
--	if(ok) {
-+	if (ok) {
- 		nBytes = nBlocks * dev->chunkBitmapStride;
--		ok = (yaffs_CheckpointWrite(dev,dev->chunkBits,nBytes) == nBytes);
-+		ok = (yaffs_CheckpointWrite(dev, dev->chunkBits, nBytes) == nBytes);
- 	}
- 	return	 ok ? 1 : 0;
- 
-@@ -4128,25 +4175,25 @@ static int yaffs_ReadCheckpointDevice(ya
- 
- 	int ok;
- 
--	ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp));
--	if(!ok)
-+	ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
-+	if (!ok)
- 		return 0;
- 
--	if(cp.structType != sizeof(cp))
-+	if (cp.structType != sizeof(cp))
- 		return 0;
- 
- 
--	yaffs_CheckpointDeviceToDevice(dev,&cp);
-+	yaffs_CheckpointDeviceToDevice(dev, &cp);
- 
- 	nBytes = nBlocks * sizeof(yaffs_BlockInfo);
- 
--	ok = (yaffs_CheckpointRead(dev,dev->blockInfo,nBytes) == nBytes);
-+	ok = (yaffs_CheckpointRead(dev, dev->blockInfo, nBytes) == nBytes);
- 
--	if(!ok)
-+	if (!ok)
- 		return 0;
- 	nBytes = nBlocks * dev->chunkBitmapStride;
- 
--	ok = (yaffs_CheckpointRead(dev,dev->chunkBits,nBytes) == nBytes);
-+	ok = (yaffs_CheckpointRead(dev, dev->chunkBits, nBytes) == nBytes);
- 
- 	return ok ? 1 : 0;
- }
-@@ -4157,7 +4204,7 @@ static void yaffs_ObjectToCheckpointObje
- 
- 	cp->objectId = obj->objectId;
- 	cp->parentId = (obj->parent) ? obj->parent->objectId : 0;
--	cp->chunkId = obj->chunkId;
-+	cp->hdrChunk = obj->hdrChunk;
- 	cp->variantType = obj->variantType;
- 	cp->deleted = obj->deleted;
- 	cp->softDeleted = obj->softDeleted;
-@@ -4168,20 +4215,28 @@ static void yaffs_ObjectToCheckpointObje
- 	cp->serial = obj->serial;
- 	cp->nDataChunks = obj->nDataChunks;
- 
--	if(obj->variantType == YAFFS_OBJECT_TYPE_FILE)
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
- 		cp->fileSizeOrEquivalentObjectId = obj->variant.fileVariant.fileSize;
--	else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
-+	else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
- 		cp->fileSizeOrEquivalentObjectId = obj->variant.hardLinkVariant.equivalentObjectId;
- }
- 
--static void yaffs_CheckpointObjectToObject( yaffs_Object *obj,yaffs_CheckpointObject *cp)
-+static int yaffs_CheckpointObjectToObject(yaffs_Object *obj, yaffs_CheckpointObject *cp)
- {
- 
- 	yaffs_Object *parent;
- 
-+	if (obj->variantType != cp->variantType) {
-+		T(YAFFS_TRACE_ERROR, (TSTR("Checkpoint read object %d type %d "
-+			TCONT("chunk %d does not match existing object type %d")
-+			TENDSTR), cp->objectId, cp->variantType, cp->hdrChunk,
-+			obj->variantType));
-+		return 0;
-+	}
-+
- 	obj->objectId = cp->objectId;
- 
--	if(cp->parentId)
-+	if (cp->parentId)
- 		parent = yaffs_FindOrCreateObjectByNumber(
- 					obj->myDev,
- 					cp->parentId,
-@@ -4189,10 +4244,19 @@ static void yaffs_CheckpointObjectToObje
- 	else
- 		parent = NULL;
- 
--	if(parent)
-+	if (parent) {
-+		if (parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+			T(YAFFS_TRACE_ALWAYS, (TSTR("Checkpoint read object %d parent %d type %d"
-+				TCONT(" chunk %d Parent type, %d, not directory")
-+				TENDSTR),
-+				cp->objectId, cp->parentId, cp->variantType,
-+				cp->hdrChunk, parent->variantType));
-+			return 0;
-+		}
- 		yaffs_AddObjectToDirectory(parent, obj);
-+	}
- 
--	obj->chunkId = cp->chunkId;
-+	obj->hdrChunk = cp->hdrChunk;
- 	obj->variantType = cp->variantType;
- 	obj->deleted = cp->deleted;
- 	obj->softDeleted = cp->softDeleted;
-@@ -4203,29 +4267,34 @@ static void yaffs_CheckpointObjectToObje
- 	obj->serial = cp->serial;
- 	obj->nDataChunks = cp->nDataChunks;
- 
--	if(obj->variantType == YAFFS_OBJECT_TYPE_FILE)
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
- 		obj->variant.fileVariant.fileSize = cp->fileSizeOrEquivalentObjectId;
--	else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
-+	else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
- 		obj->variant.hardLinkVariant.equivalentObjectId = cp->fileSizeOrEquivalentObjectId;
- 
--	if(obj->objectId >= YAFFS_NOBJECT_BUCKETS)
-+	if (obj->hdrChunk > 0)
- 		obj->lazyLoaded = 1;
-+	return 1;
- }
- 
- 
- 
--static int yaffs_CheckpointTnodeWorker(yaffs_Object * in, yaffs_Tnode * tn,
--				  	__u32 level, int chunkOffset)
-+static int yaffs_CheckpointTnodeWorker(yaffs_Object *in, yaffs_Tnode *tn,
-+					__u32 level, int chunkOffset)
- {
- 	int i;
- 	yaffs_Device *dev = in->myDev;
- 	int ok = 1;
--	int nTnodeBytes = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-+	int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-+
-+	if (tnodeSize < sizeof(yaffs_Tnode))
-+		tnodeSize = sizeof(yaffs_Tnode);
-+
- 
- 	if (tn) {
- 		if (level > 0) {
- 
--			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++){
-+			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++) {
- 				if (tn->internal[i]) {
- 					ok = yaffs_CheckpointTnodeWorker(in,
- 							tn->internal[i],
-@@ -4235,10 +4304,9 @@ static int yaffs_CheckpointTnodeWorker(y
- 			}
- 		} else if (level == 0) {
- 			__u32 baseOffset = chunkOffset <<  YAFFS_TNODES_LEVEL0_BITS;
--			/* printf("write tnode at %d\n",baseOffset); */
--			ok = (yaffs_CheckpointWrite(dev,&baseOffset,sizeof(baseOffset)) == sizeof(baseOffset));
--			if(ok)
--				ok = (yaffs_CheckpointWrite(dev,tn,nTnodeBytes) == nTnodeBytes);
-+			ok = (yaffs_CheckpointWrite(dev, &baseOffset, sizeof(baseOffset)) == sizeof(baseOffset));
-+			if (ok)
-+				ok = (yaffs_CheckpointWrite(dev, tn, tnodeSize) == tnodeSize);
- 		}
- 	}
- 
-@@ -4251,13 +4319,13 @@ static int yaffs_WriteCheckpointTnodes(y
- 	__u32 endMarker = ~0;
- 	int ok = 1;
- 
--	if(obj->variantType == YAFFS_OBJECT_TYPE_FILE){
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
- 		ok = yaffs_CheckpointTnodeWorker(obj,
- 					    obj->variant.fileVariant.top,
- 					    obj->variant.fileVariant.topLevel,
- 					    0);
--		if(ok)
--			ok = (yaffs_CheckpointWrite(obj->myDev,&endMarker,sizeof(endMarker)) ==
-+		if (ok)
-+			ok = (yaffs_CheckpointWrite(obj->myDev, &endMarker, sizeof(endMarker)) ==
- 				sizeof(endMarker));
- 	}
- 
-@@ -4272,38 +4340,38 @@ static int yaffs_ReadCheckpointTnodes(ya
- 	yaffs_FileStructure *fileStructPtr = &obj->variant.fileVariant;
- 	yaffs_Tnode *tn;
- 	int nread = 0;
-+	int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
- 
--	ok = (yaffs_CheckpointRead(dev,&baseChunk,sizeof(baseChunk)) == sizeof(baseChunk));
-+	if (tnodeSize < sizeof(yaffs_Tnode))
-+		tnodeSize = sizeof(yaffs_Tnode);
- 
--	while(ok && (~baseChunk)){
-+	ok = (yaffs_CheckpointRead(dev, &baseChunk, sizeof(baseChunk)) == sizeof(baseChunk));
-+
-+	while (ok && (~baseChunk)) {
- 		nread++;
- 		/* Read level 0 tnode */
- 
- 
--		/* printf("read  tnode at %d\n",baseChunk); */
- 		tn = yaffs_GetTnodeRaw(dev);
--		if(tn)
--			ok = (yaffs_CheckpointRead(dev,tn,(dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8) ==
--			      (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
-+		if (tn)
-+			ok = (yaffs_CheckpointRead(dev, tn, tnodeSize) == tnodeSize);
- 		else
- 			ok = 0;
- 
--		if(tn && ok){
-+		if (tn && ok)
- 			ok = yaffs_AddOrFindLevel0Tnode(dev,
--					       		fileStructPtr,
--					       		baseChunk,
--					       		tn) ? 1 : 0;
-+							fileStructPtr,
-+							baseChunk,
-+							tn) ? 1 : 0;
- 
--		}
--
--		if(ok)
--			ok = (yaffs_CheckpointRead(dev,&baseChunk,sizeof(baseChunk)) == sizeof(baseChunk));
-+		if (ok)
-+			ok = (yaffs_CheckpointRead(dev, &baseChunk, sizeof(baseChunk)) == sizeof(baseChunk));
- 
- 	}
- 
--	T(YAFFS_TRACE_CHECKPOINT,(
-+	T(YAFFS_TRACE_CHECKPOINT, (
- 		TSTR("Checkpoint read tnodes %d records, last %d. ok %d" TENDSTR),
--		nread,baseChunk,ok));
-+		nread, baseChunk, ok));
- 
- 	return ok ? 1 : 0;
- }
-@@ -4315,41 +4383,40 @@ static int yaffs_WriteCheckpointObjects(
- 	yaffs_CheckpointObject cp;
- 	int i;
- 	int ok = 1;
--	struct list_head *lh;
-+	struct ylist_head *lh;
- 
- 
- 	/* Iterate through the objects in each hash entry,
- 	 * dumping them to the checkpointing stream.
- 	 */
- 
--	 for(i = 0; ok &&  i <  YAFFS_NOBJECT_BUCKETS; i++){
--	 	list_for_each(lh, &dev->objectBucket[i].list) {
-+	for (i = 0; ok &&  i <  YAFFS_NOBJECT_BUCKETS; i++) {
-+		ylist_for_each(lh, &dev->objectBucket[i].list) {
- 			if (lh) {
--				obj = list_entry(lh, yaffs_Object, hashLink);
-+				obj = ylist_entry(lh, yaffs_Object, hashLink);
- 				if (!obj->deferedFree) {
--					yaffs_ObjectToCheckpointObject(&cp,obj);
-+					yaffs_ObjectToCheckpointObject(&cp, obj);
- 					cp.structType = sizeof(cp);
- 
--					T(YAFFS_TRACE_CHECKPOINT,(
-+					T(YAFFS_TRACE_CHECKPOINT, (
- 						TSTR("Checkpoint write object %d parent %d type %d chunk %d obj addr %x" TENDSTR),
--						cp.objectId,cp.parentId,cp.variantType,cp.chunkId,(unsigned) obj));
-+						cp.objectId, cp.parentId, cp.variantType, cp.hdrChunk, (unsigned) obj));
- 
--					ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
-+					ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
- 
--					if(ok && obj->variantType == YAFFS_OBJECT_TYPE_FILE){
-+					if (ok && obj->variantType == YAFFS_OBJECT_TYPE_FILE)
- 						ok = yaffs_WriteCheckpointTnodes(obj);
--					}
- 				}
- 			}
- 		}
--	 }
-+	}
- 
--	 /* Dump end of list */
--	memset(&cp,0xFF,sizeof(yaffs_CheckpointObject));
-+	/* Dump end of list */
-+	memset(&cp, 0xFF, sizeof(yaffs_CheckpointObject));
- 	cp.structType = sizeof(cp);
- 
--	if(ok)
--		ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
-+	if (ok)
-+		ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
- 
- 	return ok ? 1 : 0;
- }
-@@ -4362,38 +4429,39 @@ static int yaffs_ReadCheckpointObjects(y
- 	int done = 0;
- 	yaffs_Object *hardList = NULL;
- 
--	while(ok && !done) {
--		ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp));
--		if(cp.structType != sizeof(cp)) {
--			T(YAFFS_TRACE_CHECKPOINT,(TSTR("struct size %d instead of %d ok %d"TENDSTR),
--				cp.structType,sizeof(cp),ok));
-+	while (ok && !done) {
-+		ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
-+		if (cp.structType != sizeof(cp)) {
-+			T(YAFFS_TRACE_CHECKPOINT, (TSTR("struct size %d instead of %d ok %d"TENDSTR),
-+				cp.structType, sizeof(cp), ok));
- 			ok = 0;
- 		}
- 
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("Checkpoint read object %d parent %d type %d chunk %d " TENDSTR),
--			cp.objectId,cp.parentId,cp.variantType,cp.chunkId));
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("Checkpoint read object %d parent %d type %d chunk %d " TENDSTR),
-+			cp.objectId, cp.parentId, cp.variantType, cp.hdrChunk));
- 
--		if(ok && cp.objectId == ~0)
-+		if (ok && cp.objectId == ~0)
- 			done = 1;
--		else if(ok){
--			obj = yaffs_FindOrCreateObjectByNumber(dev,cp.objectId, cp.variantType);
--			if(obj) {
--				yaffs_CheckpointObjectToObject(obj,&cp);
--				if(obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
-+		else if (ok) {
-+			obj = yaffs_FindOrCreateObjectByNumber(dev, cp.objectId, cp.variantType);
-+			if (obj) {
-+				ok = yaffs_CheckpointObjectToObject(obj, &cp);
-+				if (!ok)
-+					break;
-+				if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
- 					ok = yaffs_ReadCheckpointTnodes(obj);
--				} else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
-+				} else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
- 					obj->hardLinks.next =
--						    (struct list_head *)
--						    hardList;
-+						(struct ylist_head *) hardList;
- 					hardList = obj;
- 				}
--
--			}
-+			} else
-+				ok = 0;
- 		}
- 	}
- 
--	if(ok)
--		yaffs_HardlinkFixup(dev,hardList);
-+	if (ok)
-+		yaffs_HardlinkFixup(dev, hardList);
- 
- 	return ok ? 1 : 0;
- }
-@@ -4403,11 +4471,11 @@ static int yaffs_WriteCheckpointSum(yaff
- 	__u32 checkpointSum;
- 	int ok;
- 
--	yaffs_GetCheckpointSum(dev,&checkpointSum);
-+	yaffs_GetCheckpointSum(dev, &checkpointSum);
- 
--	ok = (yaffs_CheckpointWrite(dev,&checkpointSum,sizeof(checkpointSum)) == sizeof(checkpointSum));
-+	ok = (yaffs_CheckpointWrite(dev, &checkpointSum, sizeof(checkpointSum)) == sizeof(checkpointSum));
- 
--	if(!ok)
-+	if (!ok)
- 		return 0;
- 
- 	return 1;
-@@ -4419,14 +4487,14 @@ static int yaffs_ReadCheckpointSum(yaffs
- 	__u32 checkpointSum1;
- 	int ok;
- 
--	yaffs_GetCheckpointSum(dev,&checkpointSum0);
-+	yaffs_GetCheckpointSum(dev, &checkpointSum0);
- 
--	ok = (yaffs_CheckpointRead(dev,&checkpointSum1,sizeof(checkpointSum1)) == sizeof(checkpointSum1));
-+	ok = (yaffs_CheckpointRead(dev, &checkpointSum1, sizeof(checkpointSum1)) == sizeof(checkpointSum1));
- 
--	if(!ok)
-+	if (!ok)
- 		return 0;
- 
--	if(checkpointSum0 != checkpointSum1)
-+	if (checkpointSum0 != checkpointSum1)
- 		return 0;
- 
- 	return 1;
-@@ -4435,46 +4503,43 @@ static int yaffs_ReadCheckpointSum(yaffs
- 
- static int yaffs_WriteCheckpointData(yaffs_Device *dev)
- {
--
- 	int ok = 1;
- 
--	if(dev->skipCheckpointWrite || !dev->isYaffs2){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("skipping checkpoint write" TENDSTR)));
-+	if (dev->skipCheckpointWrite || !dev->isYaffs2) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("skipping checkpoint write" TENDSTR)));
- 		ok = 0;
- 	}
- 
--	if(ok)
--		ok = yaffs_CheckpointOpen(dev,1);
-+	if (ok)
-+		ok = yaffs_CheckpointOpen(dev, 1);
- 
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint validity" TENDSTR)));
--		ok = yaffs_WriteCheckpointValidityMarker(dev,1);
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint validity" TENDSTR)));
-+		ok = yaffs_WriteCheckpointValidityMarker(dev, 1);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint device" TENDSTR)));
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint device" TENDSTR)));
- 		ok = yaffs_WriteCheckpointDevice(dev);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint objects" TENDSTR)));
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint objects" TENDSTR)));
- 		ok = yaffs_WriteCheckpointObjects(dev);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint validity" TENDSTR)));
--		ok = yaffs_WriteCheckpointValidityMarker(dev,0);
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint validity" TENDSTR)));
-+		ok = yaffs_WriteCheckpointValidityMarker(dev, 0);
- 	}
- 
--	if(ok){
-+	if (ok)
- 		ok = yaffs_WriteCheckpointSum(dev);
--	}
--
- 
--	if(!yaffs_CheckpointClose(dev))
--		 ok = 0;
-+	if (!yaffs_CheckpointClose(dev))
-+		ok = 0;
- 
--	if(ok)
--	    	dev->isCheckpointed = 1;
--	 else
--	 	dev->isCheckpointed = 0;
-+	if (ok)
-+		dev->isCheckpointed = 1;
-+	else
-+		dev->isCheckpointed = 0;
- 
- 	return dev->isCheckpointed;
- }
-@@ -4483,43 +4548,43 @@ static int yaffs_ReadCheckpointData(yaff
- {
- 	int ok = 1;
- 
--	if(dev->skipCheckpointRead || !dev->isYaffs2){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("skipping checkpoint read" TENDSTR)));
-+	if (dev->skipCheckpointRead || !dev->isYaffs2) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("skipping checkpoint read" TENDSTR)));
- 		ok = 0;
- 	}
- 
--	if(ok)
--		ok = yaffs_CheckpointOpen(dev,0); /* open for read */
-+	if (ok)
-+		ok = yaffs_CheckpointOpen(dev, 0); /* open for read */
- 
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint validity" TENDSTR)));
--		ok = yaffs_ReadCheckpointValidityMarker(dev,1);
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint validity" TENDSTR)));
-+		ok = yaffs_ReadCheckpointValidityMarker(dev, 1);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint device" TENDSTR)));
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint device" TENDSTR)));
- 		ok = yaffs_ReadCheckpointDevice(dev);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint objects" TENDSTR)));
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint objects" TENDSTR)));
- 		ok = yaffs_ReadCheckpointObjects(dev);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint validity" TENDSTR)));
--		ok = yaffs_ReadCheckpointValidityMarker(dev,0);
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint validity" TENDSTR)));
-+		ok = yaffs_ReadCheckpointValidityMarker(dev, 0);
- 	}
- 
--	if(ok){
-+	if (ok) {
- 		ok = yaffs_ReadCheckpointSum(dev);
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint checksum %d" TENDSTR),ok));
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint checksum %d" TENDSTR), ok));
- 	}
- 
--	if(!yaffs_CheckpointClose(dev))
-+	if (!yaffs_CheckpointClose(dev))
- 		ok = 0;
- 
--	if(ok)
--	    	dev->isCheckpointed = 1;
--	 else
--	 	dev->isCheckpointed = 0;
-+	if (ok)
-+		dev->isCheckpointed = 1;
-+	else
-+		dev->isCheckpointed = 0;
- 
- 	return ok ? 1 : 0;
- 
-@@ -4527,11 +4592,11 @@ static int yaffs_ReadCheckpointData(yaff
- 
- static void yaffs_InvalidateCheckpoint(yaffs_Device *dev)
- {
--	if(dev->isCheckpointed ||
--	   dev->blocksInCheckpoint > 0){
-+	if (dev->isCheckpointed ||
-+			dev->blocksInCheckpoint > 0) {
- 		dev->isCheckpointed = 0;
- 		yaffs_CheckpointInvalidateStream(dev);
--		if(dev->superBlock && dev->markSuperBlockDirty)
-+		if (dev->superBlock && dev->markSuperBlockDirty)
- 			dev->markSuperBlockDirty(dev->superBlock);
- 	}
- }
-@@ -4540,18 +4605,18 @@ static void yaffs_InvalidateCheckpoint(y
- int yaffs_CheckpointSave(yaffs_Device *dev)
- {
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("save entry: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("save entry: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
- 
- 	yaffs_VerifyObjects(dev);
- 	yaffs_VerifyBlocks(dev);
- 	yaffs_VerifyFreeChunks(dev);
- 
--	if(!dev->isCheckpointed) {
-+	if (!dev->isCheckpointed) {
- 		yaffs_InvalidateCheckpoint(dev);
- 		yaffs_WriteCheckpointData(dev);
- 	}
- 
--	T(YAFFS_TRACE_ALWAYS,(TSTR("save exit: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-+	T(YAFFS_TRACE_ALWAYS, (TSTR("save exit: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
- 
- 	return dev->isCheckpointed;
- }
-@@ -4559,17 +4624,17 @@ int yaffs_CheckpointSave(yaffs_Device *d
- int yaffs_CheckpointRestore(yaffs_Device *dev)
- {
- 	int retval;
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("restore entry: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("restore entry: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
- 
- 	retval = yaffs_ReadCheckpointData(dev);
- 
--	if(dev->isCheckpointed){
-+	if (dev->isCheckpointed) {
- 		yaffs_VerifyObjects(dev);
- 		yaffs_VerifyBlocks(dev);
- 		yaffs_VerifyFreeChunks(dev);
- 	}
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("restore exit: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("restore exit: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
- 
- 	return retval;
- }
-@@ -4584,12 +4649,12 @@ int yaffs_CheckpointRestore(yaffs_Device
-  * Curve-balls: the first chunk might also be the last chunk.
-  */
- 
--int yaffs_ReadDataFromFile(yaffs_Object * in, __u8 * buffer, loff_t offset,
--			   int nBytes)
-+int yaffs_ReadDataFromFile(yaffs_Object *in, __u8 *buffer, loff_t offset,
-+			int nBytes)
- {
- 
- 	int chunk;
--	int start;
-+	__u32 start;
- 	int nToCopy;
- 	int n = nBytes;
- 	int nDone = 0;
-@@ -4600,27 +4665,26 @@ int yaffs_ReadDataFromFile(yaffs_Object
- 	dev = in->myDev;
- 
- 	while (n > 0) {
--		//chunk = offset / dev->nDataBytesPerChunk + 1;
--		//start = offset % dev->nDataBytesPerChunk;
--		yaffs_AddrToChunk(dev,offset,&chunk,&start);
-+		/* chunk = offset / dev->nDataBytesPerChunk + 1; */
-+		/* start = offset % dev->nDataBytesPerChunk; */
-+		yaffs_AddrToChunk(dev, offset, &chunk, &start);
- 		chunk++;
- 
- 		/* OK now check for the curveball where the start and end are in
- 		 * the same chunk.
- 		 */
--		if ((start + n) < dev->nDataBytesPerChunk) {
-+		if ((start + n) < dev->nDataBytesPerChunk)
- 			nToCopy = n;
--		} else {
-+		else
- 			nToCopy = dev->nDataBytesPerChunk - start;
--		}
- 
- 		cache = yaffs_FindChunkCache(in, chunk);
- 
- 		/* If the chunk is already in the cache or it is less than a whole chunk
--		 * then use the cache (if there is caching)
-+		 * or we're using inband tags then use the cache (if there is caching)
- 		 * else bypass the cache.
- 		 */
--		if (cache || nToCopy != dev->nDataBytesPerChunk) {
-+		if (cache || nToCopy != dev->nDataBytesPerChunk || dev->inbandTags) {
- 			if (dev->nShortOpCaches > 0) {
- 
- 				/* If we can't find the data in the cache, then load it up. */
-@@ -4641,14 +4705,9 @@ int yaffs_ReadDataFromFile(yaffs_Object
- 
- 				cache->locked = 1;
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_UnlockYAFFS(TRUE);
--#endif
-+
- 				memcpy(buffer, &cache->data[start], nToCopy);
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_LockYAFFS(TRUE);
--#endif
- 				cache->locked = 0;
- 			} else {
- 				/* Read into the local buffer then copy..*/
-@@ -4657,41 +4716,19 @@ int yaffs_ReadDataFromFile(yaffs_Object
- 				    yaffs_GetTempBuffer(dev, __LINE__);
- 				yaffs_ReadChunkDataFromObject(in, chunk,
- 							      localBuffer);
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_UnlockYAFFS(TRUE);
--#endif
-+
- 				memcpy(buffer, &localBuffer[start], nToCopy);
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_LockYAFFS(TRUE);
--#endif
-+
- 				yaffs_ReleaseTempBuffer(dev, localBuffer,
- 							__LINE__);
- 			}
- 
- 		} else {
--#ifdef CONFIG_YAFFS_WINCE
--			__u8 *localBuffer = yaffs_GetTempBuffer(dev, __LINE__);
--
--			/* Under WinCE can't do direct transfer. Need to use a local buffer.
--			 * This is because we otherwise screw up WinCE's memory mapper
--			 */
--			yaffs_ReadChunkDataFromObject(in, chunk, localBuffer);
--
--#ifdef CONFIG_YAFFS_WINCE
--			yfsd_UnlockYAFFS(TRUE);
--#endif
--			memcpy(buffer, localBuffer, dev->nDataBytesPerChunk);
- 
--#ifdef CONFIG_YAFFS_WINCE
--			yfsd_LockYAFFS(TRUE);
--			yaffs_ReleaseTempBuffer(dev, localBuffer, __LINE__);
--#endif
--
--#else
- 			/* A full chunk. Read directly into the supplied buffer. */
- 			yaffs_ReadChunkDataFromObject(in, chunk, buffer);
--#endif
-+
- 		}
- 
- 		n -= nToCopy;
-@@ -4704,28 +4741,37 @@ int yaffs_ReadDataFromFile(yaffs_Object
- 	return nDone;
- }
- 
--int yaffs_WriteDataToFile(yaffs_Object * in, const __u8 * buffer, loff_t offset,
--			  int nBytes, int writeThrough)
-+int yaffs_WriteDataToFile(yaffs_Object *in, const __u8 *buffer, loff_t offset,
-+			int nBytes, int writeThrough)
- {
- 
- 	int chunk;
--	int start;
-+	__u32 start;
- 	int nToCopy;
- 	int n = nBytes;
- 	int nDone = 0;
- 	int nToWriteBack;
- 	int startOfWrite = offset;
- 	int chunkWritten = 0;
--	int nBytesRead;
-+	__u32 nBytesRead;
-+	__u32 chunkStart;
- 
- 	yaffs_Device *dev;
- 
- 	dev = in->myDev;
- 
- 	while (n > 0 && chunkWritten >= 0) {
--		//chunk = offset / dev->nDataBytesPerChunk + 1;
--		//start = offset % dev->nDataBytesPerChunk;
--		yaffs_AddrToChunk(dev,offset,&chunk,&start);
-+		/* chunk = offset / dev->nDataBytesPerChunk + 1; */
-+		/* start = offset % dev->nDataBytesPerChunk; */
-+		yaffs_AddrToChunk(dev, offset, &chunk, &start);
-+
-+		if (chunk * dev->nDataBytesPerChunk + start != offset ||
-+				start >= dev->nDataBytesPerChunk) {
-+			T(YAFFS_TRACE_ERROR, (
-+			   TSTR("AddrToChunk of offset %d gives chunk %d start %d"
-+			   TENDSTR),
-+			   (int)offset, chunk, start));
-+		}
- 		chunk++;
- 
- 		/* OK now check for the curveball where the start and end are in
-@@ -4740,25 +4786,32 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 			 * we need to write back as much as was there before.
- 			 */
- 
--			nBytesRead =
--			    in->variant.fileVariant.fileSize -
--			    ((chunk - 1) * dev->nDataBytesPerChunk);
-+			chunkStart = ((chunk - 1) * dev->nDataBytesPerChunk);
-+
-+			if (chunkStart > in->variant.fileVariant.fileSize)
-+				nBytesRead = 0; /* Past end of file */
-+			else
-+				nBytesRead = in->variant.fileVariant.fileSize - chunkStart;
- 
--			if (nBytesRead > dev->nDataBytesPerChunk) {
-+			if (nBytesRead > dev->nDataBytesPerChunk)
- 				nBytesRead = dev->nDataBytesPerChunk;
--			}
- 
- 			nToWriteBack =
- 			    (nBytesRead >
- 			     (start + n)) ? nBytesRead : (start + n);
- 
-+			if (nToWriteBack < 0 || nToWriteBack > dev->nDataBytesPerChunk)
-+				YBUG();
-+
- 		} else {
- 			nToCopy = dev->nDataBytesPerChunk - start;
- 			nToWriteBack = dev->nDataBytesPerChunk;
- 		}
- 
--		if (nToCopy != dev->nDataBytesPerChunk) {
--			/* An incomplete start or end chunk (or maybe both start and end chunk) */
-+		if (nToCopy != dev->nDataBytesPerChunk || dev->inbandTags) {
-+			/* An incomplete start or end chunk (or maybe both start and end chunk),
-+			 * or we're using inband tags, so we want to use the cache buffers.
-+			 */
- 			if (dev->nShortOpCaches > 0) {
- 				yaffs_ChunkCache *cache;
- 				/* If we can't find the data in the cache, then load the cache */
-@@ -4775,10 +4828,9 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 					yaffs_ReadChunkDataFromObject(in, chunk,
- 								      cache->
- 								      data);
--				}
--				else if(cache &&
--				        !cache->dirty &&
--					!yaffs_CheckSpaceForAllocation(in->myDev)){
-+				} else if (cache &&
-+					!cache->dirty &&
-+					!yaffs_CheckSpaceForAllocation(in->myDev)) {
- 					/* Drop the cache if it was a read cache item and
- 					 * no space check has been made for it.
- 					 */
-@@ -4788,16 +4840,12 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 				if (cache) {
- 					yaffs_UseChunkCache(dev, cache, 1);
- 					cache->locked = 1;
--#ifdef CONFIG_YAFFS_WINCE
--					yfsd_UnlockYAFFS(TRUE);
--#endif
-+
- 
- 					memcpy(&cache->data[start], buffer,
- 					       nToCopy);
- 
--#ifdef CONFIG_YAFFS_WINCE
--					yfsd_LockYAFFS(TRUE);
--#endif
-+
- 					cache->locked = 0;
- 					cache->nBytes = nToWriteBack;
- 
-@@ -4825,15 +4873,10 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 				yaffs_ReadChunkDataFromObject(in, chunk,
- 							      localBuffer);
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_UnlockYAFFS(TRUE);
--#endif
-+
- 
- 				memcpy(&localBuffer[start], buffer, nToCopy);
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_LockYAFFS(TRUE);
--#endif
- 				chunkWritten =
- 				    yaffs_WriteChunkDataToObject(in, chunk,
- 								 localBuffer,
-@@ -4846,31 +4889,15 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 			}
- 
- 		} else {
--
--#ifdef CONFIG_YAFFS_WINCE
--			/* Under WinCE can't do direct transfer. Need to use a local buffer.
--			 * This is because we otherwise screw up WinCE's memory mapper
--			 */
--			__u8 *localBuffer = yaffs_GetTempBuffer(dev, __LINE__);
--#ifdef CONFIG_YAFFS_WINCE
--			yfsd_UnlockYAFFS(TRUE);
--#endif
--			memcpy(localBuffer, buffer, dev->nDataBytesPerChunk);
--#ifdef CONFIG_YAFFS_WINCE
--			yfsd_LockYAFFS(TRUE);
--#endif
--			chunkWritten =
--			    yaffs_WriteChunkDataToObject(in, chunk, localBuffer,
--							 dev->nDataBytesPerChunk,
--							 0);
--			yaffs_ReleaseTempBuffer(dev, localBuffer, __LINE__);
--#else
- 			/* A full chunk. Write directly from the supplied buffer. */
-+
-+
-+
- 			chunkWritten =
- 			    yaffs_WriteChunkDataToObject(in, chunk, buffer,
- 							 dev->nDataBytesPerChunk,
- 							 0);
--#endif
-+
- 			/* Since we've overwritten the cached data, we better invalidate it. */
- 			yaffs_InvalidateChunkCache(in, chunk);
- 		}
-@@ -4886,9 +4913,8 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 
- 	/* Update file object */
- 
--	if ((startOfWrite + nDone) > in->variant.fileVariant.fileSize) {
-+	if ((startOfWrite + nDone) > in->variant.fileVariant.fileSize)
- 		in->variant.fileVariant.fileSize = (startOfWrite + nDone);
--	}
- 
- 	in->dirty = 1;
- 
-@@ -4898,7 +4924,7 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 
- /* ---------------------- File resizing stuff ------------------ */
- 
--static void yaffs_PruneResizedChunks(yaffs_Object * in, int newSize)
-+static void yaffs_PruneResizedChunks(yaffs_Object *in, int newSize)
- {
- 
- 	yaffs_Device *dev = in->myDev;
-@@ -4939,11 +4965,11 @@ static void yaffs_PruneResizedChunks(yaf
- 
- }
- 
--int yaffs_ResizeFile(yaffs_Object * in, loff_t newSize)
-+int yaffs_ResizeFile(yaffs_Object *in, loff_t newSize)
- {
- 
- 	int oldFileSize = in->variant.fileVariant.fileSize;
--	int newSizeOfPartialChunk;
-+	__u32 newSizeOfPartialChunk;
- 	int newFullChunks;
- 
- 	yaffs_Device *dev = in->myDev;
-@@ -4955,13 +4981,11 @@ int yaffs_ResizeFile(yaffs_Object * in,
- 
- 	yaffs_CheckGarbageCollection(dev);
- 
--	if (in->variantType != YAFFS_OBJECT_TYPE_FILE) {
--		return yaffs_GetFileSize(in);
--	}
-+	if (in->variantType != YAFFS_OBJECT_TYPE_FILE)
-+		return YAFFS_FAIL;
- 
--	if (newSize == oldFileSize) {
--		return oldFileSize;
--	}
-+	if (newSize == oldFileSize)
-+		return YAFFS_OK;
- 
- 	if (newSize < oldFileSize) {
- 
-@@ -4994,21 +5018,20 @@ int yaffs_ResizeFile(yaffs_Object * in,
- 	}
- 
- 
--
- 	/* Write a new object header.
- 	 * show we've shrunk the file, if need be
- 	 * Do this only if the file is not in the deleted directories.
- 	 */
--	if (in->parent->objectId != YAFFS_OBJECTID_UNLINKED &&
--	    in->parent->objectId != YAFFS_OBJECTID_DELETED) {
-+	if (in->parent &&
-+	    in->parent->objectId != YAFFS_OBJECTID_UNLINKED &&
-+	    in->parent->objectId != YAFFS_OBJECTID_DELETED)
- 		yaffs_UpdateObjectHeader(in, NULL, 0,
- 					 (newSize < oldFileSize) ? 1 : 0, 0);
--	}
- 
--	return newSize;
-+	return YAFFS_OK;
- }
- 
--loff_t yaffs_GetFileSize(yaffs_Object * obj)
-+loff_t yaffs_GetFileSize(yaffs_Object *obj)
- {
- 	obj = yaffs_GetEquivalentObject(obj);
- 
-@@ -5024,7 +5047,7 @@ loff_t yaffs_GetFileSize(yaffs_Object *
- 
- 
- 
--int yaffs_FlushFile(yaffs_Object * in, int updateTime)
-+int yaffs_FlushFile(yaffs_Object *in, int updateTime)
- {
- 	int retVal;
- 	if (in->dirty) {
-@@ -5039,9 +5062,8 @@ int yaffs_FlushFile(yaffs_Object * in, i
- #endif
- 		}
- 
--		retVal =
--		    (yaffs_UpdateObjectHeader(in, NULL, 0, 0, 0) >=
--		     0) ? YAFFS_OK : YAFFS_FAIL;
-+		retVal = (yaffs_UpdateObjectHeader(in, NULL, 0, 0, 0) >=
-+			0) ? YAFFS_OK : YAFFS_FAIL;
- 	} else {
- 		retVal = YAFFS_OK;
- 	}
-@@ -5050,7 +5072,7 @@ int yaffs_FlushFile(yaffs_Object * in, i
- 
- }
- 
--static int yaffs_DoGenericObjectDeletion(yaffs_Object * in)
-+static int yaffs_DoGenericObjectDeletion(yaffs_Object *in)
- {
- 
- 	/* First off, invalidate the file's data in the cache, without flushing. */
-@@ -5058,13 +5080,13 @@ static int yaffs_DoGenericObjectDeletion
- 
- 	if (in->myDev->isYaffs2 && (in->parent != in->myDev->deletedDir)) {
- 		/* Move to the unlinked directory so we have a record that it was deleted. */
--		yaffs_ChangeObjectName(in, in->myDev->deletedDir,"deleted", 0, 0);
-+		yaffs_ChangeObjectName(in, in->myDev->deletedDir, _Y("deleted"), 0, 0);
- 
- 	}
- 
- 	yaffs_RemoveObjectFromDirectory(in);
--	yaffs_DeleteChunk(in->myDev, in->chunkId, 1, __LINE__);
--	in->chunkId = -1;
-+	yaffs_DeleteChunk(in->myDev, in->hdrChunk, 1, __LINE__);
-+	in->hdrChunk = 0;
- 
- 	yaffs_FreeObject(in);
- 	return YAFFS_OK;
-@@ -5075,62 +5097,63 @@ static int yaffs_DoGenericObjectDeletion
-  * and the inode associated with the file.
-  * It does not delete the links associated with the file.
-  */
--static int yaffs_UnlinkFile(yaffs_Object * in)
-+static int yaffs_UnlinkFileIfNeeded(yaffs_Object *in)
- {
- 
- 	int retVal;
- 	int immediateDeletion = 0;
- 
--	if (1) {
- #ifdef __KERNEL__
--		if (!in->myInode) {
--			immediateDeletion = 1;
--
--		}
-+	if (!in->myInode)
-+		immediateDeletion = 1;
- #else
--		if (in->inUse <= 0) {
--			immediateDeletion = 1;
--
--		}
-+	if (in->inUse <= 0)
-+		immediateDeletion = 1;
- #endif
--		if (immediateDeletion) {
--			retVal =
--			    yaffs_ChangeObjectName(in, in->myDev->deletedDir,
--						   "deleted", 0, 0);
--			T(YAFFS_TRACE_TRACING,
--			  (TSTR("yaffs: immediate deletion of file %d" TENDSTR),
--			   in->objectId));
--			in->deleted = 1;
--			in->myDev->nDeletedFiles++;
--			if (0 && in->myDev->isYaffs2) {
--				yaffs_ResizeFile(in, 0);
--			}
--			yaffs_SoftDeleteFile(in);
--		} else {
--			retVal =
--			    yaffs_ChangeObjectName(in, in->myDev->unlinkedDir,
--						   "unlinked", 0, 0);
--		}
- 
-+	if (immediateDeletion) {
-+		retVal =
-+		    yaffs_ChangeObjectName(in, in->myDev->deletedDir,
-+					   _Y("deleted"), 0, 0);
-+		T(YAFFS_TRACE_TRACING,
-+		  (TSTR("yaffs: immediate deletion of file %d" TENDSTR),
-+		   in->objectId));
-+		in->deleted = 1;
-+		in->myDev->nDeletedFiles++;
-+		if (1 || in->myDev->isYaffs2)
-+			yaffs_ResizeFile(in, 0);
-+		yaffs_SoftDeleteFile(in);
-+	} else {
-+		retVal =
-+		    yaffs_ChangeObjectName(in, in->myDev->unlinkedDir,
-+					   _Y("unlinked"), 0, 0);
- 	}
-+
-+
- 	return retVal;
- }
- 
--int yaffs_DeleteFile(yaffs_Object * in)
-+int yaffs_DeleteFile(yaffs_Object *in)
- {
- 	int retVal = YAFFS_OK;
-+	int deleted = in->deleted;
-+
-+	yaffs_ResizeFile(in, 0);
- 
- 	if (in->nDataChunks > 0) {
--		/* Use soft deletion if there is data in the file */
--		if (!in->unlinked) {
--			retVal = yaffs_UnlinkFile(in);
--		}
-+		/* Use soft deletion if there is data in the file.
-+		 * That won't be the case if it has been resized to zero.
-+		 */
-+		if (!in->unlinked)
-+			retVal = yaffs_UnlinkFileIfNeeded(in);
-+
- 		if (retVal == YAFFS_OK && in->unlinked && !in->deleted) {
- 			in->deleted = 1;
-+			deleted = 1;
- 			in->myDev->nDeletedFiles++;
- 			yaffs_SoftDeleteFile(in);
- 		}
--		return in->deleted ? YAFFS_OK : YAFFS_FAIL;
-+		return deleted ? YAFFS_OK : YAFFS_FAIL;
- 	} else {
- 		/* The file has no data chunks so we toss it immediately */
- 		yaffs_FreeTnode(in->myDev, in->variant.fileVariant.top);
-@@ -5141,62 +5164,75 @@ int yaffs_DeleteFile(yaffs_Object * in)
- 	}
- }
- 
--static int yaffs_DeleteDirectory(yaffs_Object * in)
-+static int yaffs_DeleteDirectory(yaffs_Object *in)
- {
- 	/* First check that the directory is empty. */
--	if (list_empty(&in->variant.directoryVariant.children)) {
-+	if (ylist_empty(&in->variant.directoryVariant.children))
- 		return yaffs_DoGenericObjectDeletion(in);
--	}
- 
- 	return YAFFS_FAIL;
- 
- }
- 
--static int yaffs_DeleteSymLink(yaffs_Object * in)
-+static int yaffs_DeleteSymLink(yaffs_Object *in)
- {
- 	YFREE(in->variant.symLinkVariant.alias);
- 
- 	return yaffs_DoGenericObjectDeletion(in);
- }
- 
--static int yaffs_DeleteHardLink(yaffs_Object * in)
-+static int yaffs_DeleteHardLink(yaffs_Object *in)
- {
- 	/* remove this hardlink from the list assocaited with the equivalent
- 	 * object
- 	 */
--	list_del(&in->hardLinks);
-+	ylist_del_init(&in->hardLinks);
- 	return yaffs_DoGenericObjectDeletion(in);
- }
- 
--static void yaffs_DestroyObject(yaffs_Object * obj)
-+int yaffs_DeleteObject(yaffs_Object *obj)
- {
-+int retVal = -1;
- 	switch (obj->variantType) {
- 	case YAFFS_OBJECT_TYPE_FILE:
--		yaffs_DeleteFile(obj);
-+		retVal = yaffs_DeleteFile(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_DIRECTORY:
--		yaffs_DeleteDirectory(obj);
-+		return yaffs_DeleteDirectory(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_SYMLINK:
--		yaffs_DeleteSymLink(obj);
-+		retVal = yaffs_DeleteSymLink(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_HARDLINK:
--		yaffs_DeleteHardLink(obj);
-+		retVal = yaffs_DeleteHardLink(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_SPECIAL:
--		yaffs_DoGenericObjectDeletion(obj);
-+		retVal = yaffs_DoGenericObjectDeletion(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_UNKNOWN:
-+		retVal = 0;
- 		break;		/* should not happen. */
- 	}
-+
-+	return retVal;
- }
- 
--static int yaffs_UnlinkWorker(yaffs_Object * obj)
-+static int yaffs_UnlinkWorker(yaffs_Object *obj)
- {
- 
-+	int immediateDeletion = 0;
-+
-+#ifdef __KERNEL__
-+	if (!obj->myInode)
-+		immediateDeletion = 1;
-+#else
-+	if (obj->inUse <= 0)
-+		immediateDeletion = 1;
-+#endif
-+
- 	if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
- 		return yaffs_DeleteHardLink(obj);
--	} else if (!list_empty(&obj->hardLinks)) {
-+	} else if (!ylist_empty(&obj->hardLinks)) {
- 		/* Curve ball: We're unlinking an object that has a hardlink.
- 		 *
- 		 * This problem arises because we are not strictly following
-@@ -5215,24 +5251,24 @@ static int yaffs_UnlinkWorker(yaffs_Obje
- 		int retVal;
- 		YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
- 
--		hl = list_entry(obj->hardLinks.next, yaffs_Object, hardLinks);
-+		hl = ylist_entry(obj->hardLinks.next, yaffs_Object, hardLinks);
- 
--		list_del_init(&hl->hardLinks);
--		list_del_init(&hl->siblings);
-+		ylist_del_init(&hl->hardLinks);
-+		ylist_del_init(&hl->siblings);
- 
- 		yaffs_GetObjectName(hl, name, YAFFS_MAX_NAME_LENGTH + 1);
- 
- 		retVal = yaffs_ChangeObjectName(obj, hl->parent, name, 0, 0);
- 
--		if (retVal == YAFFS_OK) {
-+		if (retVal == YAFFS_OK)
- 			retVal = yaffs_DoGenericObjectDeletion(hl);
--		}
-+
- 		return retVal;
- 
--	} else {
-+	} else if (immediateDeletion) {
- 		switch (obj->variantType) {
- 		case YAFFS_OBJECT_TYPE_FILE:
--			return yaffs_UnlinkFile(obj);
-+			return yaffs_DeleteFile(obj);
- 			break;
- 		case YAFFS_OBJECT_TYPE_DIRECTORY:
- 			return yaffs_DeleteDirectory(obj);
-@@ -5248,21 +5284,22 @@ static int yaffs_UnlinkWorker(yaffs_Obje
- 		default:
- 			return YAFFS_FAIL;
- 		}
--	}
-+	} else
-+		return yaffs_ChangeObjectName(obj, obj->myDev->unlinkedDir,
-+					   _Y("unlinked"), 0, 0);
- }
- 
- 
--static int yaffs_UnlinkObject( yaffs_Object *obj)
-+static int yaffs_UnlinkObject(yaffs_Object *obj)
- {
- 
--	if (obj && obj->unlinkAllowed) {
-+	if (obj && obj->unlinkAllowed)
- 		return yaffs_UnlinkWorker(obj);
--	}
- 
- 	return YAFFS_FAIL;
- 
- }
--int yaffs_Unlink(yaffs_Object * dir, const YCHAR * name)
-+int yaffs_Unlink(yaffs_Object *dir, const YCHAR *name)
- {
- 	yaffs_Object *obj;
- 
-@@ -5272,8 +5309,8 @@ int yaffs_Unlink(yaffs_Object * dir, con
- 
- /*----------------------- Initialisation Scanning ---------------------- */
- 
--static void yaffs_HandleShadowedObject(yaffs_Device * dev, int objId,
--				       int backwardScanning)
-+static void yaffs_HandleShadowedObject(yaffs_Device *dev, int objId,
-+				int backwardScanning)
- {
- 	yaffs_Object *obj;
- 
-@@ -5286,9 +5323,8 @@ static void yaffs_HandleShadowedObject(y
- 		/* Handle YAFFS2 case (backward scanning)
- 		 * If the shadowed object exists then ignore.
- 		 */
--		if (yaffs_FindObjectByNumber(dev, objId)) {
-+		if (yaffs_FindObjectByNumber(dev, objId))
- 			return;
--		}
- 	}
- 
- 	/* Let's create it (if it does not exist) assuming it is a file so that it can do shrinking etc.
-@@ -5297,6 +5333,8 @@ static void yaffs_HandleShadowedObject(y
- 	obj =
- 	    yaffs_FindOrCreateObjectByNumber(dev, objId,
- 					     YAFFS_OBJECT_TYPE_FILE);
-+	if (!obj)
-+		return;
- 	yaffs_AddObjectToDirectory(dev->unlinkedDir, obj);
- 	obj->variant.fileVariant.shrinkSize = 0;
- 	obj->valid = 1;		/* So that we don't read any other info for this file */
-@@ -5325,44 +5363,77 @@ static void yaffs_HardlinkFixup(yaffs_De
- 		if (in) {
- 			/* Add the hardlink pointers */
- 			hl->variant.hardLinkVariant.equivalentObject = in;
--			list_add(&hl->hardLinks, &in->hardLinks);
-+			ylist_add(&hl->hardLinks, &in->hardLinks);
- 		} else {
- 			/* Todo Need to report/handle this better.
- 			 * Got a problem... hardlink to a non-existant object
- 			 */
- 			hl->variant.hardLinkVariant.equivalentObject = NULL;
--			INIT_LIST_HEAD(&hl->hardLinks);
-+			YINIT_LIST_HEAD(&hl->hardLinks);
- 
- 		}
--
- 	}
-+}
-+
-+
- 
-+
-+
-+static int ybicmp(const void *a, const void *b)
-+{
-+	register int aseq = ((yaffs_BlockIndex *)a)->seq;
-+	register int bseq = ((yaffs_BlockIndex *)b)->seq;
-+	register int ablock = ((yaffs_BlockIndex *)a)->block;
-+	register int bblock = ((yaffs_BlockIndex *)b)->block;
-+	if (aseq == bseq)
-+		return ablock - bblock;
-+	else
-+		return aseq - bseq;
- }
- 
- 
-+struct yaffs_ShadowFixerStruct {
-+	int objectId;
-+	int shadowedId;
-+	struct yaffs_ShadowFixerStruct *next;
-+};
-+
- 
-+static void yaffs_StripDeletedObjects(yaffs_Device *dev)
-+{
-+	/*
-+	*  Sort out state of unlinked and deleted objects after scanning.
-+	*/
-+	struct ylist_head *i;
-+	struct ylist_head *n;
-+	yaffs_Object *l;
- 
-+	/* Soft delete all the unlinked files */
-+	ylist_for_each_safe(i, n,
-+		&dev->unlinkedDir->variant.directoryVariant.children) {
-+		if (i) {
-+			l = ylist_entry(i, yaffs_Object, siblings);
-+			yaffs_DeleteObject(l);
-+		}
-+	}
- 
--static int ybicmp(const void *a, const void *b){
--    register int aseq = ((yaffs_BlockIndex *)a)->seq;
--    register int bseq = ((yaffs_BlockIndex *)b)->seq;
--    register int ablock = ((yaffs_BlockIndex *)a)->block;
--    register int bblock = ((yaffs_BlockIndex *)b)->block;
--    if( aseq == bseq )
--        return ablock - bblock;
--    else
--        return aseq - bseq;
-+	ylist_for_each_safe(i, n,
-+		&dev->deletedDir->variant.directoryVariant.children) {
-+		if (i) {
-+			l = ylist_entry(i, yaffs_Object, siblings);
-+			yaffs_DeleteObject(l);
-+		}
-+	}
- 
- }
- 
--static int yaffs_Scan(yaffs_Device * dev)
-+static int yaffs_Scan(yaffs_Device *dev)
- {
- 	yaffs_ExtendedTags tags;
- 	int blk;
- 	int blockIterator;
- 	int startIterator;
- 	int endIterator;
--	int nBlocksToScan = 0;
- 	int result;
- 
- 	int chunk;
-@@ -5371,26 +5442,19 @@ static int yaffs_Scan(yaffs_Device * dev
- 	yaffs_BlockState state;
- 	yaffs_Object *hardList = NULL;
- 	yaffs_BlockInfo *bi;
--	int sequenceNumber;
-+	__u32 sequenceNumber;
- 	yaffs_ObjectHeader *oh;
- 	yaffs_Object *in;
- 	yaffs_Object *parent;
--	int nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1;
- 
- 	int alloc_failed = 0;
- 
-+	struct yaffs_ShadowFixerStruct *shadowFixerList = NULL;
-+
- 
- 	__u8 *chunkData;
- 
--	yaffs_BlockIndex *blockIndex = NULL;
- 
--	if (dev->isYaffs2) {
--		T(YAFFS_TRACE_SCAN,
--		  (TSTR("yaffs_Scan is not for YAFFS2!" TENDSTR)));
--		return YAFFS_FAIL;
--	}
--
--	//TODO  Throw all the yaffs2 stuuf out of yaffs_Scan since it is only for yaffs1 format.
- 
- 	T(YAFFS_TRACE_SCAN,
- 	  (TSTR("yaffs_Scan starts  intstartblk %d intendblk %d..." TENDSTR),
-@@ -5400,12 +5464,6 @@ static int yaffs_Scan(yaffs_Device * dev
- 
- 	dev->sequenceNumber = YAFFS_LOWEST_SEQUENCE_NUMBER;
- 
--	if (dev->isYaffs2) {
--		blockIndex = YMALLOC(nBlocks * sizeof(yaffs_BlockIndex));
--		if(!blockIndex)
--			return YAFFS_FAIL;
--	}
--
- 	/* Scan all the blocks to determine their state */
- 	for (blk = dev->internalStartBlock; blk <= dev->internalEndBlock; blk++) {
- 		bi = yaffs_GetBlockInfo(dev, blk);
-@@ -5418,6 +5476,9 @@ static int yaffs_Scan(yaffs_Device * dev
- 		bi->blockState = state;
- 		bi->sequenceNumber = sequenceNumber;
- 
-+		if (bi->sequenceNumber == YAFFS_SEQUENCE_BAD_BLOCK)
-+			bi->blockState = state = YAFFS_BLOCK_STATE_DEAD;
-+
- 		T(YAFFS_TRACE_SCAN_DEBUG,
- 		  (TSTR("Block scanning block %d state %d seq %d" TENDSTR), blk,
- 		   state, sequenceNumber));
-@@ -5430,70 +5491,21 @@ static int yaffs_Scan(yaffs_Device * dev
- 			  (TSTR("Block empty " TENDSTR)));
- 			dev->nErasedBlocks++;
- 			dev->nFreeChunks += dev->nChunksPerBlock;
--		} else if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
--
--			/* Determine the highest sequence number */
--			if (dev->isYaffs2 &&
--			    sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
--			    sequenceNumber < YAFFS_HIGHEST_SEQUENCE_NUMBER) {
--
--				blockIndex[nBlocksToScan].seq = sequenceNumber;
--				blockIndex[nBlocksToScan].block = blk;
--
--				nBlocksToScan++;
--
--				if (sequenceNumber >= dev->sequenceNumber) {
--					dev->sequenceNumber = sequenceNumber;
--				}
--			} else if (dev->isYaffs2) {
--				/* TODO: Nasty sequence number! */
--				T(YAFFS_TRACE_SCAN,
--				  (TSTR
--				   ("Block scanning block %d has bad sequence number %d"
--				    TENDSTR), blk, sequenceNumber));
--
--			}
- 		}
- 	}
- 
--	/* Sort the blocks
--	 * Dungy old bubble sort for now...
--	 */
--	if (dev->isYaffs2) {
--		yaffs_BlockIndex temp;
--		int i;
--		int j;
--
--		for (i = 0; i < nBlocksToScan; i++)
--			for (j = i + 1; j < nBlocksToScan; j++)
--				if (blockIndex[i].seq > blockIndex[j].seq) {
--					temp = blockIndex[j];
--					blockIndex[j] = blockIndex[i];
--					blockIndex[i] = temp;
--				}
--	}
--
--	/* Now scan the blocks looking at the data. */
--	if (dev->isYaffs2) {
--		startIterator = 0;
--		endIterator = nBlocksToScan - 1;
--		T(YAFFS_TRACE_SCAN_DEBUG,
--		  (TSTR("%d blocks to be scanned" TENDSTR), nBlocksToScan));
--	} else {
--		startIterator = dev->internalStartBlock;
--		endIterator = dev->internalEndBlock;
--	}
-+	startIterator = dev->internalStartBlock;
-+	endIterator = dev->internalEndBlock;
- 
- 	/* For each block.... */
- 	for (blockIterator = startIterator; !alloc_failed && blockIterator <= endIterator;
- 	     blockIterator++) {
- 
--		if (dev->isYaffs2) {
--			/* get the block to scan in the correct order */
--			blk = blockIndex[blockIterator].block;
--		} else {
--			blk = blockIterator;
--		}
-+		YYIELD();
-+
-+		YYIELD();
-+
-+		blk = blockIterator;
- 
- 		bi = yaffs_GetBlockInfo(dev, blk);
- 		state = bi->blockState;
-@@ -5511,7 +5523,7 @@ static int yaffs_Scan(yaffs_Device * dev
- 
- 			/* Let's have a good look at this chunk... */
- 
--			if (!dev->isYaffs2 && tags.chunkDeleted) {
-+			if (tags.eccResult == YAFFS_ECC_RESULT_UNFIXED || tags.chunkDeleted) {
- 				/* YAFFS1 only...
- 				 * A deleted chunk
- 				 */
-@@ -5540,18 +5552,6 @@ static int yaffs_Scan(yaffs_Device * dev
- 					dev->allocationBlockFinder = blk;
- 					/* Set it to here to encourage the allocator to go forth from here. */
- 
--					/* Yaffs2 sanity check:
--					 * This should be the one with the highest sequence number
--					 */
--					if (dev->isYaffs2
--					    && (dev->sequenceNumber !=
--						bi->sequenceNumber)) {
--						T(YAFFS_TRACE_ALWAYS,
--						  (TSTR
--						   ("yaffs: Allocation block %d was not highest sequence id:"
--						    " block seq = %d, dev seq = %d"
--						    TENDSTR), blk,bi->sequenceNumber,dev->sequenceNumber));
--					}
- 				}
- 
- 				dev->nFreeChunks += (dev->nChunksPerBlock - c);
-@@ -5570,11 +5570,11 @@ static int yaffs_Scan(yaffs_Device * dev
- 				 * the same chunkId).
- 				 */
- 
--				if(!in)
-+				if (!in)
- 					alloc_failed = 1;
- 
--				if(in){
--					if(!yaffs_PutChunkIntoFile(in, tags.chunkId, chunk,1))
-+				if (in) {
-+					if (!yaffs_PutChunkIntoFile(in, tags.chunkId, chunk, 1))
- 						alloc_failed = 1;
- 				}
- 
-@@ -5617,7 +5617,7 @@ static int yaffs_Scan(yaffs_Device * dev
- 					 * deleted, and worse still it has changed type. Delete the old object.
- 					 */
- 
--					yaffs_DestroyObject(in);
-+					yaffs_DeleteObject(in);
- 
- 					in = 0;
- 				}
-@@ -5627,14 +5627,20 @@ static int yaffs_Scan(yaffs_Device * dev
- 								      objectId,
- 								      oh->type);
- 
--				if(!in)
-+				if (!in)
- 					alloc_failed = 1;
- 
- 				if (in && oh->shadowsObject > 0) {
--					yaffs_HandleShadowedObject(dev,
--								   oh->
--								   shadowsObject,
--								   0);
-+
-+					struct yaffs_ShadowFixerStruct *fixer;
-+					fixer = YMALLOC(sizeof(struct yaffs_ShadowFixerStruct));
-+					if (fixer) {
-+						fixer->next = shadowFixerList;
-+						shadowFixerList = fixer;
-+						fixer->objectId = tags.objectId;
-+						fixer->shadowedId = oh->shadowsObject;
-+					}
-+
- 				}
- 
- 				if (in && in->valid) {
-@@ -5643,12 +5649,10 @@ static int yaffs_Scan(yaffs_Device * dev
- 					unsigned existingSerial = in->serial;
- 					unsigned newSerial = tags.serialNumber;
- 
--					if (dev->isYaffs2 ||
--					    ((existingSerial + 1) & 3) ==
--					    newSerial) {
-+					if (((existingSerial + 1) & 3) == newSerial) {
- 						/* Use new one - destroy the exisiting one */
- 						yaffs_DeleteChunk(dev,
--								  in->chunkId,
-+								  in->hdrChunk,
- 								  1, __LINE__);
- 						in->valid = 0;
- 					} else {
-@@ -5681,7 +5685,8 @@ static int yaffs_Scan(yaffs_Device * dev
- 					in->yst_ctime = oh->yst_ctime;
- 					in->yst_rdev = oh->yst_rdev;
- #endif
--					in->chunkId = chunk;
-+					in->hdrChunk = chunk;
-+					in->serial = tags.serialNumber;
- 
- 				} else if (in && !in->valid) {
- 					/* we need to load this info */
-@@ -5705,7 +5710,8 @@ static int yaffs_Scan(yaffs_Device * dev
- 					in->yst_ctime = oh->yst_ctime;
- 					in->yst_rdev = oh->yst_rdev;
- #endif
--					in->chunkId = chunk;
-+					in->hdrChunk = chunk;
-+					in->serial = tags.serialNumber;
- 
- 					yaffs_SetObjectName(in, oh->name);
- 					in->dirty = 0;
-@@ -5718,25 +5724,25 @@ static int yaffs_Scan(yaffs_Device * dev
- 					    yaffs_FindOrCreateObjectByNumber
- 					    (dev, oh->parentObjectId,
- 					     YAFFS_OBJECT_TYPE_DIRECTORY);
--					if (parent->variantType ==
-+					if (!parent)
-+						alloc_failed = 1;
-+					if (parent && parent->variantType ==
- 					    YAFFS_OBJECT_TYPE_UNKNOWN) {
- 						/* Set up as a directory */
- 						parent->variantType =
--						    YAFFS_OBJECT_TYPE_DIRECTORY;
--						INIT_LIST_HEAD(&parent->variant.
--							       directoryVariant.
--							       children);
--					} else if (parent->variantType !=
--						   YAFFS_OBJECT_TYPE_DIRECTORY)
--					{
-+							YAFFS_OBJECT_TYPE_DIRECTORY;
-+						YINIT_LIST_HEAD(&parent->variant.
-+								directoryVariant.
-+								children);
-+					} else if (!parent || parent->variantType !=
-+						   YAFFS_OBJECT_TYPE_DIRECTORY) {
- 						/* Hoosterman, another problem....
- 						 * We're trying to use a non-directory as a directory
- 						 */
- 
- 						T(YAFFS_TRACE_ERROR,
- 						  (TSTR
--						   ("yaffs tragedy: attempting to use non-directory as"
--						    " a directory in scan. Put in lost+found."
-+						   ("yaffs tragedy: attempting to use non-directory as a directory in scan. Put in lost+found."
- 						    TENDSTR)));
- 						parent = dev->lostNFoundDir;
- 					}
-@@ -5760,15 +5766,6 @@ static int yaffs_Scan(yaffs_Device * dev
- 						/* Todo got a problem */
- 						break;
- 					case YAFFS_OBJECT_TYPE_FILE:
--						if (dev->isYaffs2
--						    && oh->isShrink) {
--							/* Prune back the shrunken chunks */
--							yaffs_PruneResizedChunks
--							    (in, oh->fileSize);
--							/* Mark the block as having a shrinkHeader */
--							bi->hasShrinkHeader = 1;
--						}
--
- 						if (dev->useHeaderFileSize)
- 
- 							in->variant.fileVariant.
-@@ -5778,11 +5775,11 @@ static int yaffs_Scan(yaffs_Device * dev
- 						break;
- 					case YAFFS_OBJECT_TYPE_HARDLINK:
- 						in->variant.hardLinkVariant.
--						    equivalentObjectId =
--						    oh->equivalentObjectId;
-+							equivalentObjectId =
-+							oh->equivalentObjectId;
- 						in->hardLinks.next =
--						    (struct list_head *)
--						    hardList;
-+							(struct ylist_head *)
-+							hardList;
- 						hardList = in;
- 						break;
- 					case YAFFS_OBJECT_TYPE_DIRECTORY:
-@@ -5794,15 +5791,17 @@ static int yaffs_Scan(yaffs_Device * dev
- 					case YAFFS_OBJECT_TYPE_SYMLINK:
- 						in->variant.symLinkVariant.alias =
- 						    yaffs_CloneString(oh->alias);
--						if(!in->variant.symLinkVariant.alias)
-+						if (!in->variant.symLinkVariant.alias)
- 							alloc_failed = 1;
- 						break;
- 					}
- 
-+/*
- 					if (parent == dev->deletedDir) {
- 						yaffs_DestroyObject(in);
- 						bi->hasShrinkHeader = 1;
- 					}
-+*/
- 				}
- 			}
- 		}
-@@ -5823,10 +5822,6 @@ static int yaffs_Scan(yaffs_Device * dev
- 
- 	}
- 
--	if (blockIndex) {
--		YFREE(blockIndex);
--	}
--
- 
- 	/* Ok, we've done all the scanning.
- 	 * Fix up the hard link chains.
-@@ -5834,32 +5829,36 @@ static int yaffs_Scan(yaffs_Device * dev
- 	 * hardlinks.
- 	 */
- 
--	yaffs_HardlinkFixup(dev,hardList);
-+	yaffs_HardlinkFixup(dev, hardList);
- 
--	/* Handle the unlinked files. Since they were left in an unlinked state we should
--	 * just delete them.
--	 */
-+	/* Fix up any shadowed objects */
- 	{
--		struct list_head *i;
--		struct list_head *n;
-+		struct yaffs_ShadowFixerStruct *fixer;
-+		yaffs_Object *obj;
- 
--		yaffs_Object *l;
--		/* Soft delete all the unlinked files */
--		list_for_each_safe(i, n,
--				   &dev->unlinkedDir->variant.directoryVariant.
--				   children) {
--			if (i) {
--				l = list_entry(i, yaffs_Object, siblings);
--				yaffs_DestroyObject(l);
--			}
-+		while (shadowFixerList) {
-+			fixer = shadowFixerList;
-+			shadowFixerList = fixer->next;
-+			/* Complete the rename transaction by deleting the shadowed object
-+			 * then setting the object header to unshadowed.
-+			 */
-+			obj = yaffs_FindObjectByNumber(dev, fixer->shadowedId);
-+			if (obj)
-+				yaffs_DeleteObject(obj);
-+
-+			obj = yaffs_FindObjectByNumber(dev, fixer->objectId);
-+
-+			if (obj)
-+				yaffs_UpdateObjectHeader(obj, NULL, 1, 0, 0);
-+
-+			YFREE(fixer);
- 		}
- 	}
- 
- 	yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
- 
--	if(alloc_failed){
-+	if (alloc_failed)
- 		return YAFFS_FAIL;
--	}
- 
- 	T(YAFFS_TRACE_SCAN, (TSTR("yaffs_Scan ends" TENDSTR)));
- 
-@@ -5871,25 +5870,27 @@ static void yaffs_CheckObjectDetailsLoad
- {
- 	__u8 *chunkData;
- 	yaffs_ObjectHeader *oh;
--	yaffs_Device *dev = in->myDev;
-+	yaffs_Device *dev;
- 	yaffs_ExtendedTags tags;
- 	int result;
- 	int alloc_failed = 0;
- 
--	if(!in)
-+	if (!in)
- 		return;
- 
-+	dev = in->myDev;
-+
- #if 0
--	T(YAFFS_TRACE_SCAN,(TSTR("details for object %d %s loaded" TENDSTR),
-+	T(YAFFS_TRACE_SCAN, (TSTR("details for object %d %s loaded" TENDSTR),
- 		in->objectId,
- 		in->lazyLoaded ? "not yet" : "already"));
- #endif
- 
--	if(in->lazyLoaded){
-+	if (in->lazyLoaded && in->hdrChunk > 0) {
- 		in->lazyLoaded = 0;
- 		chunkData = yaffs_GetTempBuffer(dev, __LINE__);
- 
--		result = yaffs_ReadChunkWithTagsFromNAND(dev,in->chunkId,chunkData,&tags);
-+		result = yaffs_ReadChunkWithTagsFromNAND(dev, in->hdrChunk, chunkData, &tags);
- 		oh = (yaffs_ObjectHeader *) chunkData;
- 
- 		in->yst_mode = oh->yst_mode;
-@@ -5911,18 +5912,18 @@ static void yaffs_CheckObjectDetailsLoad
- #endif
- 		yaffs_SetObjectName(in, oh->name);
- 
--		if(in->variantType == YAFFS_OBJECT_TYPE_SYMLINK){
--			 in->variant.symLinkVariant.alias =
-+		if (in->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
-+			in->variant.symLinkVariant.alias =
- 						    yaffs_CloneString(oh->alias);
--			if(!in->variant.symLinkVariant.alias)
-+			if (!in->variant.symLinkVariant.alias)
- 				alloc_failed = 1; /* Not returned to caller */
- 		}
- 
--		yaffs_ReleaseTempBuffer(dev,chunkData, __LINE__);
-+		yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
- 	}
- }
- 
--static int yaffs_ScanBackwards(yaffs_Device * dev)
-+static int yaffs_ScanBackwards(yaffs_Device *dev)
- {
- 	yaffs_ExtendedTags tags;
- 	int blk;
-@@ -5938,7 +5939,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 	yaffs_BlockState state;
- 	yaffs_Object *hardList = NULL;
- 	yaffs_BlockInfo *bi;
--	int sequenceNumber;
-+	__u32 sequenceNumber;
- 	yaffs_ObjectHeader *oh;
- 	yaffs_Object *in;
- 	yaffs_Object *parent;
-@@ -5972,12 +5973,12 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 	blockIndex = YMALLOC(nBlocks * sizeof(yaffs_BlockIndex));
- 
--	if(!blockIndex) {
-+	if (!blockIndex) {
- 		blockIndex = YMALLOC_ALT(nBlocks * sizeof(yaffs_BlockIndex));
- 		altBlockIndex = 1;
- 	}
- 
--	if(!blockIndex) {
-+	if (!blockIndex) {
- 		T(YAFFS_TRACE_SCAN,
- 		  (TSTR("yaffs_Scan() could not allocate block index!" TENDSTR)));
- 		return YAFFS_FAIL;
-@@ -5999,15 +6000,17 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 		bi->blockState = state;
- 		bi->sequenceNumber = sequenceNumber;
- 
--		if(bi->sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA)
-+		if (bi->sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA)
- 			bi->blockState = state = YAFFS_BLOCK_STATE_CHECKPOINT;
-+		if (bi->sequenceNumber == YAFFS_SEQUENCE_BAD_BLOCK)
-+			bi->blockState = state = YAFFS_BLOCK_STATE_DEAD;
- 
- 		T(YAFFS_TRACE_SCAN_DEBUG,
- 		  (TSTR("Block scanning block %d state %d seq %d" TENDSTR), blk,
- 		   state, sequenceNumber));
- 
- 
--		if(state == YAFFS_BLOCK_STATE_CHECKPOINT){
-+		if (state == YAFFS_BLOCK_STATE_CHECKPOINT) {
- 			dev->blocksInCheckpoint++;
- 
- 		} else if (state == YAFFS_BLOCK_STATE_DEAD) {
-@@ -6021,8 +6024,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 		} else if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
- 
- 			/* Determine the highest sequence number */
--			if (dev->isYaffs2 &&
--			    sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
-+			if (sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
- 			    sequenceNumber < YAFFS_HIGHEST_SEQUENCE_NUMBER) {
- 
- 				blockIndex[nBlocksToScan].seq = sequenceNumber;
-@@ -6030,10 +6032,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 				nBlocksToScan++;
- 
--				if (sequenceNumber >= dev->sequenceNumber) {
-+				if (sequenceNumber >= dev->sequenceNumber)
- 					dev->sequenceNumber = sequenceNumber;
--				}
--			} else if (dev->isYaffs2) {
-+			} else {
- 				/* TODO: Nasty sequence number! */
- 				T(YAFFS_TRACE_SCAN,
- 				  (TSTR
-@@ -6053,11 +6054,13 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 	/* Sort the blocks */
- #ifndef CONFIG_YAFFS_USE_OWN_SORT
--	yaffs_qsort(blockIndex, nBlocksToScan,
--		sizeof(yaffs_BlockIndex), ybicmp);
-+	{
-+		/* Use qsort now. */
-+		yaffs_qsort(blockIndex, nBlocksToScan, sizeof(yaffs_BlockIndex), ybicmp);
-+	}
- #else
- 	{
--	 	/* Dungy old bubble sort... */
-+		/* Dungy old bubble sort... */
- 
- 		yaffs_BlockIndex temp;
- 		int i;
-@@ -6075,7 +6078,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 	YYIELD();
- 
--    	T(YAFFS_TRACE_SCAN, (TSTR("...done" TENDSTR)));
-+	T(YAFFS_TRACE_SCAN, (TSTR("...done" TENDSTR)));
- 
- 	/* Now scan the blocks looking at the data. */
- 	startIterator = 0;
-@@ -6085,10 +6088,10 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 	/* For each block.... backwards */
- 	for (blockIterator = endIterator; !alloc_failed && blockIterator >= startIterator;
--	     blockIterator--) {
--	        /* Cooperative multitasking! This loop can run for so
-+			blockIterator--) {
-+		/* Cooperative multitasking! This loop can run for so
- 		   long that watchdog timers expire. */
--	        YYIELD();
-+		YYIELD();
- 
- 		/* get the block to scan in the correct order */
- 		blk = blockIndex[blockIterator].block;
-@@ -6127,10 +6130,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 				 * this is the one being allocated from
- 				 */
- 
--				if(foundChunksInBlock)
--				{
-+				if (foundChunksInBlock) {
- 					/* This is a chunk that was skipped due to failing the erased check */
--
- 				} else if (c == 0) {
- 					/* We're looking at the first chunk in the block so the block is unused */
- 					state = YAFFS_BLOCK_STATE_EMPTY;
-@@ -6138,7 +6139,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 				} else {
- 					if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING ||
- 					    state == YAFFS_BLOCK_STATE_ALLOCATING) {
--					    	if(dev->sequenceNumber == bi->sequenceNumber) {
-+						if (dev->sequenceNumber == bi->sequenceNumber) {
- 							/* this is the block being allocated from */
- 
- 							T(YAFFS_TRACE_SCAN,
-@@ -6150,27 +6151,31 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 							dev->allocationBlock = blk;
- 							dev->allocationPage = c;
- 							dev->allocationBlockFinder = blk;
--						}
--						else {
-+						} else {
- 							/* This is a partially written block that is not
- 							 * the current allocation block. This block must have
- 							 * had a write failure, so set up for retirement.
- 							 */
- 
--							 bi->needsRetiring = 1;
-+							 /* bi->needsRetiring = 1; ??? TODO */
- 							 bi->gcPrioritise = 1;
- 
- 							 T(YAFFS_TRACE_ALWAYS,
--							 (TSTR("Partially written block %d being set for retirement" TENDSTR),
-+							 (TSTR("Partially written block %d detected" TENDSTR),
- 							 blk));
- 						}
--
- 					}
--
- 				}
- 
- 				dev->nFreeChunks++;
- 
-+			} else if (tags.eccResult == YAFFS_ECC_RESULT_UNFIXED) {
-+				T(YAFFS_TRACE_SCAN,
-+				  (TSTR(" Unfixed ECC in chunk(%d:%d), chunk ignored"TENDSTR),
-+				  blk, c));
-+
-+				  dev->nFreeChunks++;
-+
- 			} else if (tags.chunkId > 0) {
- 				/* chunkId > 0 so it is a data chunk... */
- 				unsigned int endpos;
-@@ -6187,7 +6192,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 								      tags.
- 								      objectId,
- 								      YAFFS_OBJECT_TYPE_FILE);
--				if(!in){
-+				if (!in) {
- 					/* Out of memory */
- 					alloc_failed = 1;
- 				}
-@@ -6197,8 +6202,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 				    && chunkBase <
- 				    in->variant.fileVariant.shrinkSize) {
- 					/* This has not been invalidated by a resize */
--					if(!yaffs_PutChunkIntoFile(in, tags.chunkId,
--							       chunk, -1)){
-+					if (!yaffs_PutChunkIntoFile(in, tags.chunkId,
-+							       chunk, -1)) {
- 						alloc_failed = 1;
- 					}
- 
-@@ -6221,7 +6226,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						    scannedFileSize;
- 					}
- 
--				} else if(in) {
-+				} else if (in) {
- 					/* This chunk has been invalidated by a resize, so delete */
- 					yaffs_DeleteChunk(dev, chunk, 1, __LINE__);
- 
-@@ -6242,6 +6247,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 					in = yaffs_FindOrCreateObjectByNumber
- 					    (dev, tags.objectId,
- 					     tags.extraObjectType);
-+					if (!in)
-+						alloc_failed = 1;
- 				}
- 
- 				if (!in ||
-@@ -6251,8 +6258,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 				    tags.extraShadows ||
- 				    (!in->valid &&
- 				    (tags.objectId == YAFFS_OBJECTID_ROOT ||
--				     tags.objectId == YAFFS_OBJECTID_LOSTNFOUND))
--				    ) {
-+				     tags.objectId == YAFFS_OBJECTID_LOSTNFOUND))) {
- 
- 					/* If we don't have  valid info then we need to read the chunk
- 					 * TODO In future we can probably defer reading the chunk and
-@@ -6266,8 +6272,17 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 					oh = (yaffs_ObjectHeader *) chunkData;
- 
--					if (!in)
-+					if (dev->inbandTags) {
-+						/* Fix up the header if they got corrupted by inband tags */
-+						oh->shadowsObject = oh->inbandShadowsObject;
-+						oh->isShrink = oh->inbandIsShrink;
-+					}
-+
-+					if (!in) {
- 						in = yaffs_FindOrCreateObjectByNumber(dev, tags.objectId, oh->type);
-+						if (!in)
-+							alloc_failed = 1;
-+					}
- 
- 				}
- 
-@@ -6275,10 +6290,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 					/* TODO Hoosterman we have a problem! */
- 					T(YAFFS_TRACE_ERROR,
- 					  (TSTR
--					   ("yaffs tragedy: Could not make object for object  %d  "
--					    "at chunk %d during scan"
-+					   ("yaffs tragedy: Could not make object for object  %d at chunk %d during scan"
- 					    TENDSTR), tags.objectId, chunk));
--
-+					continue;
- 				}
- 
- 				if (in->valid) {
-@@ -6289,10 +6303,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 					if ((in->variantType == YAFFS_OBJECT_TYPE_FILE) &&
- 					     ((oh &&
--					       oh-> type == YAFFS_OBJECT_TYPE_FILE)||
-+					       oh->type == YAFFS_OBJECT_TYPE_FILE) ||
- 					      (tags.extraHeaderInfoAvailable  &&
--					       tags.extraObjectType == YAFFS_OBJECT_TYPE_FILE))
--					    ) {
-+					       tags.extraObjectType == YAFFS_OBJECT_TYPE_FILE))) {
- 						__u32 thisSize =
- 						    (oh) ? oh->fileSize : tags.
- 						    extraFileLength;
-@@ -6300,7 +6313,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						    (oh) ? oh->
- 						    parentObjectId : tags.
- 						    extraParentObjectId;
--						unsigned isShrink =
-+
-+
-+						isShrink =
- 						    (oh) ? oh->isShrink : tags.
- 						    extraIsShrinkHeader;
- 
-@@ -6323,9 +6338,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 							    thisSize;
- 						}
- 
--						if (isShrink) {
-+						if (isShrink)
- 							bi->hasShrinkHeader = 1;
--						}
- 
- 					}
- 					/* Use existing - destroy this one. */
-@@ -6333,6 +6347,17 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 				}
- 
-+				if (!in->valid && in->variantType !=
-+				    (oh ? oh->type : tags.extraObjectType))
-+					T(YAFFS_TRACE_ERROR, (
-+						TSTR("yaffs tragedy: Bad object type, "
-+					    TCONT("%d != %d, for object %d at chunk ")
-+					    TCONT("%d during scan")
-+						TENDSTR), oh ?
-+					    oh->type : tags.extraObjectType,
-+					    in->variantType, tags.objectId,
-+					    chunk));
-+
- 				if (!in->valid &&
- 				    (tags.objectId == YAFFS_OBJECTID_ROOT ||
- 				     tags.objectId ==
-@@ -6340,7 +6365,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 					/* We only load some info, don't fiddle with directory structure */
- 					in->valid = 1;
- 
--					if(oh) {
-+					if (oh) {
- 						in->variantType = oh->type;
- 
- 						in->yst_mode = oh->yst_mode;
-@@ -6365,15 +6390,15 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						in->lazyLoaded = 1;
- 					}
- 
--					in->chunkId = chunk;
-+					in->hdrChunk = chunk;
- 
- 				} else if (!in->valid) {
- 					/* we need to load this info */
- 
- 					in->valid = 1;
--					in->chunkId = chunk;
-+					in->hdrChunk = chunk;
- 
--					if(oh) {
-+					if (oh) {
- 						in->variantType = oh->type;
- 
- 						in->yst_mode = oh->yst_mode;
-@@ -6403,20 +6428,19 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						yaffs_SetObjectName(in, oh->name);
- 						parent =
- 						    yaffs_FindOrCreateObjectByNumber
--					    		(dev, oh->parentObjectId,
--					     		 YAFFS_OBJECT_TYPE_DIRECTORY);
-+							(dev, oh->parentObjectId,
-+							 YAFFS_OBJECT_TYPE_DIRECTORY);
- 
- 						 fileSize = oh->fileSize;
-- 						 isShrink = oh->isShrink;
-+						 isShrink = oh->isShrink;
- 						 equivalentObjectId = oh->equivalentObjectId;
- 
--					}
--					else {
-+					} else {
- 						in->variantType = tags.extraObjectType;
- 						parent =
- 						    yaffs_FindOrCreateObjectByNumber
--					    		(dev, tags.extraParentObjectId,
--					     		 YAFFS_OBJECT_TYPE_DIRECTORY);
-+							(dev, tags.extraParentObjectId,
-+							 YAFFS_OBJECT_TYPE_DIRECTORY);
- 						 fileSize = tags.extraFileLength;
- 						 isShrink = tags.extraIsShrinkHeader;
- 						 equivalentObjectId = tags.extraEquivalentObjectId;
-@@ -6425,29 +6449,30 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 					}
- 					in->dirty = 0;
- 
-+					if (!parent)
-+						alloc_failed = 1;
-+
- 					/* directory stuff...
- 					 * hook up to parent
- 					 */
- 
--					if (parent->variantType ==
-+					if (parent && parent->variantType ==
- 					    YAFFS_OBJECT_TYPE_UNKNOWN) {
- 						/* Set up as a directory */
- 						parent->variantType =
--						    YAFFS_OBJECT_TYPE_DIRECTORY;
--						INIT_LIST_HEAD(&parent->variant.
--							       directoryVariant.
--							       children);
--					} else if (parent->variantType !=
--						   YAFFS_OBJECT_TYPE_DIRECTORY)
--					{
-+							YAFFS_OBJECT_TYPE_DIRECTORY;
-+						YINIT_LIST_HEAD(&parent->variant.
-+							directoryVariant.
-+							children);
-+					} else if (!parent || parent->variantType !=
-+						   YAFFS_OBJECT_TYPE_DIRECTORY) {
- 						/* Hoosterman, another problem....
- 						 * We're trying to use a non-directory as a directory
- 						 */
- 
- 						T(YAFFS_TRACE_ERROR,
- 						  (TSTR
--						   ("yaffs tragedy: attempting to use non-directory as"
--						    " a directory in scan. Put in lost+found."
-+						   ("yaffs tragedy: attempting to use non-directory as a directory in scan. Put in lost+found."
- 						    TENDSTR)));
- 						parent = dev->lostNFoundDir;
- 					}
-@@ -6494,12 +6519,12 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 						break;
- 					case YAFFS_OBJECT_TYPE_HARDLINK:
--						if(!itsUnlinked) {
--						  in->variant.hardLinkVariant.equivalentObjectId =
--						    equivalentObjectId;
--						  in->hardLinks.next =
--						    (struct list_head *) hardList;
--						  hardList = in;
-+						if (!itsUnlinked) {
-+							in->variant.hardLinkVariant.equivalentObjectId =
-+								equivalentObjectId;
-+							in->hardLinks.next =
-+								(struct ylist_head *) hardList;
-+							hardList = in;
- 						}
- 						break;
- 					case YAFFS_OBJECT_TYPE_DIRECTORY:
-@@ -6509,12 +6534,11 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						/* Do nothing */
- 						break;
- 					case YAFFS_OBJECT_TYPE_SYMLINK:
--						if(oh){
--						   in->variant.symLinkVariant.alias =
--						    yaffs_CloneString(oh->
--								      alias);
--						   if(!in->variant.symLinkVariant.alias)
--						   	alloc_failed = 1;
-+						if (oh) {
-+							in->variant.symLinkVariant.alias =
-+								yaffs_CloneString(oh->alias);
-+							if (!in->variant.symLinkVariant.alias)
-+								alloc_failed = 1;
- 						}
- 						break;
- 					}
-@@ -6551,75 +6575,129 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 	 * We should now have scanned all the objects, now it's time to add these
- 	 * hardlinks.
- 	 */
--	yaffs_HardlinkFixup(dev,hardList);
-+	yaffs_HardlinkFixup(dev, hardList);
- 
- 
--	/*
--	*  Sort out state of unlinked and deleted objects.
--	*/
--	{
--		struct list_head *i;
--		struct list_head *n;
-+	yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
- 
--		yaffs_Object *l;
-+	if (alloc_failed)
-+		return YAFFS_FAIL;
- 
--		/* Soft delete all the unlinked files */
--		list_for_each_safe(i, n,
--				   &dev->unlinkedDir->variant.directoryVariant.
--				   children) {
--			if (i) {
--				l = list_entry(i, yaffs_Object, siblings);
--				yaffs_DestroyObject(l);
--			}
--		}
-+	T(YAFFS_TRACE_SCAN, (TSTR("yaffs_ScanBackwards ends" TENDSTR)));
- 
--		/* Soft delete all the deletedDir files */
--		list_for_each_safe(i, n,
--				   &dev->deletedDir->variant.directoryVariant.
--				   children) {
--			if (i) {
--				l = list_entry(i, yaffs_Object, siblings);
--				yaffs_DestroyObject(l);
-+	return YAFFS_OK;
-+}
- 
--			}
-+/*------------------------------  Directory Functions ----------------------------- */
-+
-+static void yaffs_VerifyObjectInDirectory(yaffs_Object *obj)
-+{
-+	struct ylist_head *lh;
-+	yaffs_Object *listObj;
-+
-+	int count = 0;
-+
-+	if (!obj) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("No object to verify" TENDSTR)));
-+		YBUG();
-+		return;
-+	}
-+
-+	if (yaffs_SkipVerification(obj->myDev))
-+		return;
-+
-+	if (!obj->parent) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("Object does not have parent" TENDSTR)));
-+		YBUG();
-+		return;
-+	}
-+
-+	if (obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("Parent is not directory" TENDSTR)));
-+		YBUG();
-+	}
-+
-+	/* Iterate through the objects in each hash entry */
-+
-+	ylist_for_each(lh, &obj->parent->variant.directoryVariant.children) {
-+		if (lh) {
-+			listObj = ylist_entry(lh, yaffs_Object, siblings);
-+			yaffs_VerifyObject(listObj);
-+			if (obj == listObj)
-+				count++;
- 		}
-+	 }
-+
-+	if (count != 1) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory %d times" TENDSTR), count));
-+		YBUG();
- 	}
-+}
- 
--	yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
-+static void yaffs_VerifyDirectory(yaffs_Object *directory)
-+{
-+	struct ylist_head *lh;
-+	yaffs_Object *listObj;
- 
--	if(alloc_failed){
--		return YAFFS_FAIL;
-+	if (!directory) {
-+		YBUG();
-+		return;
- 	}
- 
--	T(YAFFS_TRACE_SCAN, (TSTR("yaffs_ScanBackwards ends" TENDSTR)));
-+	if (yaffs_SkipFullVerification(directory->myDev))
-+		return;
- 
--	return YAFFS_OK;
-+	if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("Directory has wrong type: %d" TENDSTR), directory->variantType));
-+		YBUG();
-+	}
-+
-+	/* Iterate through the objects in each hash entry */
-+
-+	ylist_for_each(lh, &directory->variant.directoryVariant.children) {
-+		if (lh) {
-+			listObj = ylist_entry(lh, yaffs_Object, siblings);
-+			if (listObj->parent != directory) {
-+				T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory list has wrong parent %p" TENDSTR), listObj->parent));
-+				YBUG();
-+			}
-+			yaffs_VerifyObjectInDirectory(listObj);
-+		}
-+	}
- }
- 
--/*------------------------------  Directory Functions ----------------------------- */
- 
--static void yaffs_RemoveObjectFromDirectory(yaffs_Object * obj)
-+static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj)
- {
- 	yaffs_Device *dev = obj->myDev;
-+	yaffs_Object *parent;
-+
-+	yaffs_VerifyObjectInDirectory(obj);
-+	parent = obj->parent;
-+
-+	yaffs_VerifyDirectory(parent);
- 
--	if(dev && dev->removeObjectCallback)
-+	if (dev && dev->removeObjectCallback)
- 		dev->removeObjectCallback(obj);
- 
--	list_del_init(&obj->siblings);
-+
-+	ylist_del_init(&obj->siblings);
- 	obj->parent = NULL;
-+
-+	yaffs_VerifyDirectory(parent);
- }
- 
- 
--static void yaffs_AddObjectToDirectory(yaffs_Object * directory,
--				       yaffs_Object * obj)
-+static void yaffs_AddObjectToDirectory(yaffs_Object *directory,
-+					yaffs_Object *obj)
- {
--
- 	if (!directory) {
- 		T(YAFFS_TRACE_ALWAYS,
- 		  (TSTR
- 		   ("tragedy: Trying to add an object to a null pointer directory"
- 		    TENDSTR)));
- 		YBUG();
-+		return;
- 	}
- 	if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
- 		T(YAFFS_TRACE_ALWAYS,
-@@ -6631,37 +6709,42 @@ static void yaffs_AddObjectToDirectory(y
- 
- 	if (obj->siblings.prev == NULL) {
- 		/* Not initialised */
--		INIT_LIST_HEAD(&obj->siblings);
--
--	} else if (!list_empty(&obj->siblings)) {
--		/* If it is holed up somewhere else, un hook it */
--		yaffs_RemoveObjectFromDirectory(obj);
-+		YBUG();
- 	}
-+
-+
-+	yaffs_VerifyDirectory(directory);
-+
-+	yaffs_RemoveObjectFromDirectory(obj);
-+
-+
- 	/* Now add it */
--	list_add(&obj->siblings, &directory->variant.directoryVariant.children);
-+	ylist_add(&obj->siblings, &directory->variant.directoryVariant.children);
- 	obj->parent = directory;
- 
- 	if (directory == obj->myDev->unlinkedDir
--	    || directory == obj->myDev->deletedDir) {
-+			|| directory == obj->myDev->deletedDir) {
- 		obj->unlinked = 1;
- 		obj->myDev->nUnlinkedFiles++;
- 		obj->renameAllowed = 0;
- 	}
-+
-+	yaffs_VerifyDirectory(directory);
-+	yaffs_VerifyObjectInDirectory(obj);
- }
- 
--yaffs_Object *yaffs_FindObjectByName(yaffs_Object * directory,
--				     const YCHAR * name)
-+yaffs_Object *yaffs_FindObjectByName(yaffs_Object *directory,
-+				     const YCHAR *name)
- {
- 	int sum;
- 
--	struct list_head *i;
-+	struct ylist_head *i;
- 	YCHAR buffer[YAFFS_MAX_NAME_LENGTH + 1];
- 
- 	yaffs_Object *l;
- 
--	if (!name) {
-+	if (!name)
- 		return NULL;
--	}
- 
- 	if (!directory) {
- 		T(YAFFS_TRACE_ALWAYS,
-@@ -6669,6 +6752,7 @@ yaffs_Object *yaffs_FindObjectByName(yaf
- 		   ("tragedy: yaffs_FindObjectByName: null pointer directory"
- 		    TENDSTR)));
- 		YBUG();
-+		return NULL;
- 	}
- 	if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
- 		T(YAFFS_TRACE_ALWAYS,
-@@ -6679,28 +6763,27 @@ yaffs_Object *yaffs_FindObjectByName(yaf
- 
- 	sum = yaffs_CalcNameSum(name);
- 
--	list_for_each(i, &directory->variant.directoryVariant.children) {
-+	ylist_for_each(i, &directory->variant.directoryVariant.children) {
- 		if (i) {
--			l = list_entry(i, yaffs_Object, siblings);
-+			l = ylist_entry(i, yaffs_Object, siblings);
-+
-+			if (l->parent != directory)
-+				YBUG();
- 
- 			yaffs_CheckObjectDetailsLoaded(l);
- 
- 			/* Special case for lost-n-found */
- 			if (l->objectId == YAFFS_OBJECTID_LOSTNFOUND) {
--				if (yaffs_strcmp(name, YAFFS_LOSTNFOUND_NAME) == 0) {
-+				if (yaffs_strcmp(name, YAFFS_LOSTNFOUND_NAME) == 0)
- 					return l;
--				}
--			} else if (yaffs_SumCompare(l->sum, sum) || l->chunkId <= 0)
--			{
--				/* LostnFound cunk called Objxxx
-+			} else if (yaffs_SumCompare(l->sum, sum) || l->hdrChunk <= 0) {
-+				/* LostnFound chunk called Objxxx
- 				 * Do a real check
- 				 */
- 				yaffs_GetObjectName(l, buffer,
- 						    YAFFS_MAX_NAME_LENGTH);
--				if (yaffs_strncmp(name, buffer,YAFFS_MAX_NAME_LENGTH) == 0) {
-+				if (yaffs_strncmp(name, buffer, YAFFS_MAX_NAME_LENGTH) == 0)
- 					return l;
--				}
--
- 			}
- 		}
- 	}
-@@ -6710,10 +6793,10 @@ yaffs_Object *yaffs_FindObjectByName(yaf
- 
- 
- #if 0
--int yaffs_ApplyToDirectoryChildren(yaffs_Object * theDir,
--				   int (*fn) (yaffs_Object *))
-+int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir,
-+					int (*fn) (yaffs_Object *))
- {
--	struct list_head *i;
-+	struct ylist_head *i;
- 	yaffs_Object *l;
- 
- 	if (!theDir) {
-@@ -6722,20 +6805,21 @@ int yaffs_ApplyToDirectoryChildren(yaffs
- 		   ("tragedy: yaffs_FindObjectByName: null pointer directory"
- 		    TENDSTR)));
- 		YBUG();
-+		return YAFFS_FAIL;
- 	}
- 	if (theDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
- 		T(YAFFS_TRACE_ALWAYS,
- 		  (TSTR
- 		   ("tragedy: yaffs_FindObjectByName: non-directory" TENDSTR)));
- 		YBUG();
-+		return YAFFS_FAIL;
- 	}
- 
--	list_for_each(i, &theDir->variant.directoryVariant.children) {
-+	ylist_for_each(i, &theDir->variant.directoryVariant.children) {
- 		if (i) {
--			l = list_entry(i, yaffs_Object, siblings);
--			if (l && !fn(l)) {
-+			l = ylist_entry(i, yaffs_Object, siblings);
-+			if (l && !fn(l))
- 				return YAFFS_FAIL;
--			}
- 		}
- 	}
- 
-@@ -6748,7 +6832,7 @@ int yaffs_ApplyToDirectoryChildren(yaffs
-  * actual object.
-  */
- 
--yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object * obj)
-+yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj)
- {
- 	if (obj && obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
- 		/* We want the object id of the equivalent object, not this one */
-@@ -6756,10 +6840,9 @@ yaffs_Object *yaffs_GetEquivalentObject(
- 		yaffs_CheckObjectDetailsLoaded(obj);
- 	}
- 	return obj;
--
- }
- 
--int yaffs_GetObjectName(yaffs_Object * obj, YCHAR * name, int buffSize)
-+int yaffs_GetObjectName(yaffs_Object *obj, YCHAR *name, int buffSize)
- {
- 	memset(name, 0, buffSize * sizeof(YCHAR));
- 
-@@ -6767,18 +6850,26 @@ int yaffs_GetObjectName(yaffs_Object * o
- 
- 	if (obj->objectId == YAFFS_OBJECTID_LOSTNFOUND) {
- 		yaffs_strncpy(name, YAFFS_LOSTNFOUND_NAME, buffSize - 1);
--	} else if (obj->chunkId <= 0) {
-+	} else if (obj->hdrChunk <= 0) {
- 		YCHAR locName[20];
-+		YCHAR numString[20];
-+		YCHAR *x = &numString[19];
-+		unsigned v = obj->objectId;
-+		numString[19] = 0;
-+		while (v > 0) {
-+			x--;
-+			*x = '0' + (v % 10);
-+			v /= 10;
-+		}
- 		/* make up a name */
--		yaffs_sprintf(locName, _Y("%s%d"), YAFFS_LOSTNFOUND_PREFIX,
--			      obj->objectId);
-+		yaffs_strcpy(locName, YAFFS_LOSTNFOUND_PREFIX);
-+		yaffs_strcat(locName, x);
- 		yaffs_strncpy(name, locName, buffSize - 1);
- 
- 	}
- #ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
--	else if (obj->shortName[0]) {
-+	else if (obj->shortName[0])
- 		yaffs_strcpy(name, obj->shortName);
--	}
- #endif
- 	else {
- 		int result;
-@@ -6788,9 +6879,9 @@ int yaffs_GetObjectName(yaffs_Object * o
- 
- 		memset(buffer, 0, obj->myDev->nDataBytesPerChunk);
- 
--		if (obj->chunkId >= 0) {
-+		if (obj->hdrChunk > 0) {
- 			result = yaffs_ReadChunkWithTagsFromNAND(obj->myDev,
--							obj->chunkId, buffer,
-+							obj->hdrChunk, buffer,
- 							NULL);
- 		}
- 		yaffs_strncpy(name, oh->name, buffSize - 1);
-@@ -6801,46 +6892,43 @@ int yaffs_GetObjectName(yaffs_Object * o
- 	return yaffs_strlen(name);
- }
- 
--int yaffs_GetObjectFileLength(yaffs_Object * obj)
-+int yaffs_GetObjectFileLength(yaffs_Object *obj)
- {
--
- 	/* Dereference any hard linking */
- 	obj = yaffs_GetEquivalentObject(obj);
- 
--	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
- 		return obj->variant.fileVariant.fileSize;
--	}
--	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
- 		return yaffs_strlen(obj->variant.symLinkVariant.alias);
--	} else {
-+	else {
- 		/* Only a directory should drop through to here */
- 		return obj->myDev->nDataBytesPerChunk;
- 	}
- }
- 
--int yaffs_GetObjectLinkCount(yaffs_Object * obj)
-+int yaffs_GetObjectLinkCount(yaffs_Object *obj)
- {
- 	int count = 0;
--	struct list_head *i;
-+	struct ylist_head *i;
- 
--	if (!obj->unlinked) {
--		count++;	/* the object itself */
--	}
--	list_for_each(i, &obj->hardLinks) {
--		count++;	/* add the hard links; */
--	}
--	return count;
-+	if (!obj->unlinked)
-+		count++;		/* the object itself */
-+
-+	ylist_for_each(i, &obj->hardLinks)
-+		count++;		/* add the hard links; */
- 
-+	return count;
- }
- 
--int yaffs_GetObjectInode(yaffs_Object * obj)
-+int yaffs_GetObjectInode(yaffs_Object *obj)
- {
- 	obj = yaffs_GetEquivalentObject(obj);
- 
- 	return obj->objectId;
- }
- 
--unsigned yaffs_GetObjectType(yaffs_Object * obj)
-+unsigned yaffs_GetObjectType(yaffs_Object *obj)
- {
- 	obj = yaffs_GetEquivalentObject(obj);
- 
-@@ -6872,19 +6960,18 @@ unsigned yaffs_GetObjectType(yaffs_Objec
- 	}
- }
- 
--YCHAR *yaffs_GetSymlinkAlias(yaffs_Object * obj)
-+YCHAR *yaffs_GetSymlinkAlias(yaffs_Object *obj)
- {
- 	obj = yaffs_GetEquivalentObject(obj);
--	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
- 		return yaffs_CloneString(obj->variant.symLinkVariant.alias);
--	} else {
-+	else
- 		return yaffs_CloneString(_Y(""));
--	}
- }
- 
- #ifndef CONFIG_YAFFS_WINCE
- 
--int yaffs_SetAttributes(yaffs_Object * obj, struct iattr *attr)
-+int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr)
- {
- 	unsigned int valid = attr->ia_valid;
- 
-@@ -6910,7 +6997,7 @@ int yaffs_SetAttributes(yaffs_Object * o
- 	return YAFFS_OK;
- 
- }
--int yaffs_GetAttributes(yaffs_Object * obj, struct iattr *attr)
-+int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr)
- {
- 	unsigned int valid = 0;
- 
-@@ -6934,13 +7021,12 @@ int yaffs_GetAttributes(yaffs_Object * o
- 	attr->ia_valid = valid;
- 
- 	return YAFFS_OK;
--
- }
- 
- #endif
- 
- #if 0
--int yaffs_DumpObject(yaffs_Object * obj)
-+int yaffs_DumpObject(yaffs_Object *obj)
- {
- 	YCHAR name[257];
- 
-@@ -6951,7 +7037,7 @@ int yaffs_DumpObject(yaffs_Object * obj)
- 	   ("Object %d, inode %d \"%s\"\n dirty %d valid %d serial %d sum %d"
- 	    " chunk %d type %d size %d\n"
- 	    TENDSTR), obj->objectId, yaffs_GetObjectInode(obj), name,
--	   obj->dirty, obj->valid, obj->serial, obj->sum, obj->chunkId,
-+	   obj->dirty, obj->valid, obj->serial, obj->sum, obj->hdrChunk,
- 	   yaffs_GetObjectType(obj), yaffs_GetObjectFileLength(obj)));
- 
- 	return YAFFS_OK;
-@@ -6960,7 +7046,7 @@ int yaffs_DumpObject(yaffs_Object * obj)
- 
- /*---------------------------- Initialisation code -------------------------------------- */
- 
--static int yaffs_CheckDevFunctions(const yaffs_Device * dev)
-+static int yaffs_CheckDevFunctions(const yaffs_Device *dev)
- {
- 
- 	/* Common functions, gotta have */
-@@ -7011,7 +7097,7 @@ static int yaffs_CreateInitialDirectorie
- 	    yaffs_CreateFakeDirectory(dev, YAFFS_OBJECTID_LOSTNFOUND,
- 				      YAFFS_LOSTNFOUND_MODE | S_IFDIR);
- 
--	if(dev->lostNFoundDir && dev->rootDir && dev->unlinkedDir && dev->deletedDir){
-+	if (dev->lostNFoundDir && dev->rootDir && dev->unlinkedDir && dev->deletedDir) {
- 		yaffs_AddObjectToDirectory(dev->rootDir, dev->lostNFoundDir);
- 		return YAFFS_OK;
- 	}
-@@ -7019,7 +7105,7 @@ static int yaffs_CreateInitialDirectorie
- 	return YAFFS_FAIL;
- }
- 
--int yaffs_GutsInitialise(yaffs_Device * dev)
-+int yaffs_GutsInitialise(yaffs_Device *dev)
- {
- 	int init_failed = 0;
- 	unsigned x;
-@@ -7040,6 +7126,8 @@ int yaffs_GutsInitialise(yaffs_Device *
- 	dev->chunkOffset = 0;
- 	dev->nFreeChunks = 0;
- 
-+	dev->gcBlock = -1;
-+
- 	if (dev->startBlock == 0) {
- 		dev->internalStartBlock = dev->startBlock + 1;
- 		dev->internalEndBlock = dev->endBlock + 1;
-@@ -7049,18 +7137,18 @@ int yaffs_GutsInitialise(yaffs_Device *
- 
- 	/* Check geometry parameters. */
- 
--	if ((dev->isYaffs2 && dev->nDataBytesPerChunk < 1024) ||
--	    (!dev->isYaffs2 && dev->nDataBytesPerChunk != 512) ||
-+	if ((!dev->inbandTags && dev->isYaffs2 && dev->totalBytesPerChunk < 1024) ||
-+	    (!dev->isYaffs2 && dev->totalBytesPerChunk < 512) ||
-+	    (dev->inbandTags && !dev->isYaffs2) ||
- 	     dev->nChunksPerBlock < 2 ||
- 	     dev->nReservedBlocks < 2 ||
- 	     dev->internalStartBlock <= 0 ||
- 	     dev->internalEndBlock <= 0 ||
--	     dev->internalEndBlock <= (dev->internalStartBlock + dev->nReservedBlocks + 2)	// otherwise it is too small
--	    ) {
-+	     dev->internalEndBlock <= (dev->internalStartBlock + dev->nReservedBlocks + 2)) {	/* otherwise it is too small */
- 		T(YAFFS_TRACE_ALWAYS,
- 		  (TSTR
--		   ("yaffs: NAND geometry problems: chunk size %d, type is yaffs%s "
--		    TENDSTR), dev->nDataBytesPerChunk, dev->isYaffs2 ? "2" : ""));
-+		   ("yaffs: NAND geometry problems: chunk size %d, type is yaffs%s, inbandTags %d "
-+		    TENDSTR), dev->totalBytesPerChunk, dev->isYaffs2 ? "2" : "", dev->inbandTags));
- 		return YAFFS_FAIL;
- 	}
- 
-@@ -7070,6 +7158,12 @@ int yaffs_GutsInitialise(yaffs_Device *
- 		return YAFFS_FAIL;
- 	}
- 
-+	/* Sort out space for inband tags, if required */
-+	if (dev->inbandTags)
-+		dev->nDataBytesPerChunk = dev->totalBytesPerChunk - sizeof(yaffs_PackedTags2TagsPart);
-+	else
-+		dev->nDataBytesPerChunk = dev->totalBytesPerChunk;
-+
- 	/* Got the right mix of functions? */
- 	if (!yaffs_CheckDevFunctions(dev)) {
- 		/* Function missing */
-@@ -7097,31 +7191,18 @@ int yaffs_GutsInitialise(yaffs_Device *
- 
- 	dev->isMounted = 1;
- 
--
--
- 	/* OK now calculate a few things for the device */
- 
- 	/*
- 	 *  Calculate all the chunk size manipulation numbers:
- 	 */
--	 /* Start off assuming it is a power of 2 */
--	 dev->chunkShift = ShiftDiv(dev->nDataBytesPerChunk);
--	 dev->chunkMask = (1<<dev->chunkShift) - 1;
--
--	 if(dev->nDataBytesPerChunk == (dev->chunkMask + 1)){
--	 	/* Yes it is a power of 2, disable crumbs */
--		dev->crumbMask = 0;
--		dev->crumbShift = 0;
--		dev->crumbsPerChunk = 0;
--	 } else {
--	 	/* Not a power of 2, use crumbs instead */
--		dev->crumbShift = ShiftDiv(sizeof(yaffs_PackedTags2TagsPart));
--		dev->crumbMask = (1<<dev->crumbShift)-1;
--		dev->crumbsPerChunk = dev->nDataBytesPerChunk/(1 << dev->crumbShift);
--		dev->chunkShift = 0;
--		dev->chunkMask = 0;
--	}
--
-+	x = dev->nDataBytesPerChunk;
-+	/* We always use dev->chunkShift and dev->chunkDiv */
-+	dev->chunkShift = Shifts(x);
-+	x >>= dev->chunkShift;
-+	dev->chunkDiv = x;
-+	/* We only use chunk mask if chunkDiv is 1 */
-+	dev->chunkMask = (1<<dev->chunkShift) - 1;
- 
- 	/*
- 	 * Calculate chunkGroupBits.
-@@ -7133,16 +7214,15 @@ int yaffs_GutsInitialise(yaffs_Device *
- 	bits = ShiftsGE(x);
- 
- 	/* Set up tnode width if wide tnodes are enabled. */
--	if(!dev->wideTnodesDisabled){
-+	if (!dev->wideTnodesDisabled) {
- 		/* bits must be even so that we end up with 32-bit words */
--		if(bits & 1)
-+		if (bits & 1)
- 			bits++;
--		if(bits < 16)
-+		if (bits < 16)
- 			dev->tnodeWidth = 16;
- 		else
- 			dev->tnodeWidth = bits;
--	}
--	else
-+	} else
- 		dev->tnodeWidth = 16;
- 
- 	dev->tnodeMask = (1<<dev->tnodeWidth)-1;
-@@ -7193,7 +7273,7 @@ int yaffs_GutsInitialise(yaffs_Device *
- 	dev->hasPendingPrioritisedGCs = 1; /* Assume the worst for now, will get fixed on first GC */
- 
- 	/* Initialise temporary buffers and caches. */
--	if(!yaffs_InitialiseTempBuffers(dev))
-+	if (!yaffs_InitialiseTempBuffers(dev))
- 		init_failed = 1;
- 
- 	dev->srCache = NULL;
-@@ -7203,25 +7283,26 @@ int yaffs_GutsInitialise(yaffs_Device *
- 	if (!init_failed &&
- 	    dev->nShortOpCaches > 0) {
- 		int i;
--		__u8 *buf;
-+		void *buf;
- 		int srCacheBytes = dev->nShortOpCaches * sizeof(yaffs_ChunkCache);
- 
--		if (dev->nShortOpCaches > YAFFS_MAX_SHORT_OP_CACHES) {
-+		if (dev->nShortOpCaches > YAFFS_MAX_SHORT_OP_CACHES)
- 			dev->nShortOpCaches = YAFFS_MAX_SHORT_OP_CACHES;
--		}
- 
--		buf = dev->srCache =  YMALLOC(srCacheBytes);
-+		dev->srCache =  YMALLOC(srCacheBytes);
- 
--		if(dev->srCache)
--			memset(dev->srCache,0,srCacheBytes);
-+		buf = (__u8 *) dev->srCache;
-+
-+		if (dev->srCache)
-+			memset(dev->srCache, 0, srCacheBytes);
- 
- 		for (i = 0; i < dev->nShortOpCaches && buf; i++) {
- 			dev->srCache[i].object = NULL;
- 			dev->srCache[i].lastUse = 0;
- 			dev->srCache[i].dirty = 0;
--			dev->srCache[i].data = buf = YMALLOC_DMA(dev->nDataBytesPerChunk);
-+			dev->srCache[i].data = buf = YMALLOC_DMA(dev->totalBytesPerChunk);
- 		}
--		if(!buf)
-+		if (!buf)
- 			init_failed = 1;
- 
- 		dev->srLastUse = 0;
-@@ -7229,29 +7310,30 @@ int yaffs_GutsInitialise(yaffs_Device *
- 
- 	dev->cacheHits = 0;
- 
--	if(!init_failed){
-+	if (!init_failed) {
- 		dev->gcCleanupList = YMALLOC(dev->nChunksPerBlock * sizeof(__u32));
--		if(!dev->gcCleanupList)
-+		if (!dev->gcCleanupList)
- 			init_failed = 1;
- 	}
- 
--	if (dev->isYaffs2) {
-+	if (dev->isYaffs2)
- 		dev->useHeaderFileSize = 1;
--	}
--	if(!init_failed && !yaffs_InitialiseBlocks(dev))
-+
-+	if (!init_failed && !yaffs_InitialiseBlocks(dev))
- 		init_failed = 1;
- 
- 	yaffs_InitialiseTnodes(dev);
- 	yaffs_InitialiseObjects(dev);
- 
--	if(!init_failed && !yaffs_CreateInitialDirectories(dev))
-+	if (!init_failed && !yaffs_CreateInitialDirectories(dev))
- 		init_failed = 1;
- 
- 
--	if(!init_failed){
-+	if (!init_failed) {
- 		/* Now scan the flash. */
- 		if (dev->isYaffs2) {
--			if(yaffs_CheckpointRestore(dev)) {
-+			if (yaffs_CheckpointRestore(dev)) {
-+				yaffs_CheckObjectDetailsLoaded(dev->rootDir);
- 				T(YAFFS_TRACE_ALWAYS,
- 				  (TSTR("yaffs: restored from checkpoint" TENDSTR)));
- 			} else {
-@@ -7273,24 +7355,25 @@ int yaffs_GutsInitialise(yaffs_Device *
- 				dev->nBackgroundDeletions = 0;
- 				dev->oldestDirtySequence = 0;
- 
--				if(!init_failed && !yaffs_InitialiseBlocks(dev))
-+				if (!init_failed && !yaffs_InitialiseBlocks(dev))
- 					init_failed = 1;
- 
- 				yaffs_InitialiseTnodes(dev);
- 				yaffs_InitialiseObjects(dev);
- 
--				if(!init_failed && !yaffs_CreateInitialDirectories(dev))
-+				if (!init_failed && !yaffs_CreateInitialDirectories(dev))
- 					init_failed = 1;
- 
--				if(!init_failed && !yaffs_ScanBackwards(dev))
-+				if (!init_failed && !yaffs_ScanBackwards(dev))
- 					init_failed = 1;
- 			}
--		}else
--			if(!yaffs_Scan(dev))
-+		} else if (!yaffs_Scan(dev))
- 				init_failed = 1;
-+
-+		yaffs_StripDeletedObjects(dev);
- 	}
- 
--	if(init_failed){
-+	if (init_failed) {
- 		/* Clean up the mess */
- 		T(YAFFS_TRACE_TRACING,
- 		  (TSTR("yaffs: yaffs_GutsInitialise() aborted.\n" TENDSTR)));
-@@ -7318,7 +7401,7 @@ int yaffs_GutsInitialise(yaffs_Device *
- 
- }
- 
--void yaffs_Deinitialise(yaffs_Device * dev)
-+void yaffs_Deinitialise(yaffs_Device *dev)
- {
- 	if (dev->isMounted) {
- 		int i;
-@@ -7330,7 +7413,7 @@ void yaffs_Deinitialise(yaffs_Device * d
- 		    dev->srCache) {
- 
- 			for (i = 0; i < dev->nShortOpCaches; i++) {
--				if(dev->srCache[i].data)
-+				if (dev->srCache[i].data)
- 					YFREE(dev->srCache[i].data);
- 				dev->srCache[i].data = NULL;
- 			}
-@@ -7341,16 +7424,17 @@ void yaffs_Deinitialise(yaffs_Device * d
- 
- 		YFREE(dev->gcCleanupList);
- 
--		for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
-+		for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++)
- 			YFREE(dev->tempBuffer[i].buffer);
--		}
- 
- 		dev->isMounted = 0;
--	}
- 
-+		if (dev->deinitialiseNAND)
-+			dev->deinitialiseNAND(dev);
-+	}
- }
- 
--static int yaffs_CountFreeChunks(yaffs_Device * dev)
-+static int yaffs_CountFreeChunks(yaffs_Device *dev)
- {
- 	int nFree;
- 	int b;
-@@ -7358,7 +7442,7 @@ static int yaffs_CountFreeChunks(yaffs_D
- 	yaffs_BlockInfo *blk;
- 
- 	for (nFree = 0, b = dev->internalStartBlock; b <= dev->internalEndBlock;
--	     b++) {
-+			b++) {
- 		blk = yaffs_GetBlockInfo(dev, b);
- 
- 		switch (blk->blockState) {
-@@ -7373,19 +7457,19 @@ static int yaffs_CountFreeChunks(yaffs_D
- 		default:
- 			break;
- 		}
--
- 	}
- 
- 	return nFree;
- }
- 
--int yaffs_GetNumberOfFreeChunks(yaffs_Device * dev)
-+int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev)
- {
- 	/* This is what we report to the outside world */
- 
- 	int nFree;
- 	int nDirtyCacheChunks;
- 	int blocksForCheckpoint;
-+	int i;
- 
- #if 1
- 	nFree = dev->nFreeChunks;
-@@ -7397,12 +7481,9 @@ int yaffs_GetNumberOfFreeChunks(yaffs_De
- 
- 	/* Now count the number of dirty chunks in the cache and subtract those */
- 
--	{
--		int i;
--		for (nDirtyCacheChunks = 0, i = 0; i < dev->nShortOpCaches; i++) {
--			if (dev->srCache[i].dirty)
--				nDirtyCacheChunks++;
--		}
-+	for (nDirtyCacheChunks = 0, i = 0; i < dev->nShortOpCaches; i++) {
-+		if (dev->srCache[i].dirty)
-+			nDirtyCacheChunks++;
- 	}
- 
- 	nFree -= nDirtyCacheChunks;
-@@ -7410,8 +7491,8 @@ int yaffs_GetNumberOfFreeChunks(yaffs_De
- 	nFree -= ((dev->nReservedBlocks + 1) * dev->nChunksPerBlock);
- 
- 	/* Now we figure out how much to reserve for the checkpoint and report that... */
--	blocksForCheckpoint = dev->nCheckpointReservedBlocks - dev->blocksInCheckpoint;
--	if(blocksForCheckpoint < 0)
-+	blocksForCheckpoint = yaffs_CalcCheckpointBlocksRequired(dev) - dev->blocksInCheckpoint;
-+	if (blocksForCheckpoint < 0)
- 		blocksForCheckpoint = 0;
- 
- 	nFree -= (blocksForCheckpoint * dev->nChunksPerBlock);
-@@ -7425,12 +7506,12 @@ int yaffs_GetNumberOfFreeChunks(yaffs_De
- 
- static int yaffs_freeVerificationFailures;
- 
--static void yaffs_VerifyFreeChunks(yaffs_Device * dev)
-+static void yaffs_VerifyFreeChunks(yaffs_Device *dev)
- {
- 	int counted;
- 	int difference;
- 
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
- 	counted = yaffs_CountFreeChunks(dev);
-@@ -7447,23 +7528,25 @@ static void yaffs_VerifyFreeChunks(yaffs
- 
- /*---------------------------------------- YAFFS test code ----------------------*/
- 
--#define yaffs_CheckStruct(structure,syze, name) \
--           if(sizeof(structure) != syze) \
--	       { \
--	         T(YAFFS_TRACE_ALWAYS,(TSTR("%s should be %d but is %d\n" TENDSTR),\
--		 name,syze,sizeof(structure))); \
--	         return YAFFS_FAIL; \
--		}
-+#define yaffs_CheckStruct(structure, syze, name) \
-+	do { \
-+		if (sizeof(structure) != syze) { \
-+			T(YAFFS_TRACE_ALWAYS, (TSTR("%s should be %d but is %d\n" TENDSTR),\
-+				name, syze, sizeof(structure))); \
-+			return YAFFS_FAIL; \
-+		} \
-+	} while (0)
- 
- static int yaffs_CheckStructures(void)
- {
--/*      yaffs_CheckStruct(yaffs_Tags,8,"yaffs_Tags") */
--/*      yaffs_CheckStruct(yaffs_TagsUnion,8,"yaffs_TagsUnion") */
--/*      yaffs_CheckStruct(yaffs_Spare,16,"yaffs_Spare") */
-+/*      yaffs_CheckStruct(yaffs_Tags,8,"yaffs_Tags"); */
-+/*      yaffs_CheckStruct(yaffs_TagsUnion,8,"yaffs_TagsUnion"); */
-+/*      yaffs_CheckStruct(yaffs_Spare,16,"yaffs_Spare"); */
- #ifndef CONFIG_YAFFS_TNODE_LIST_DEBUG
--	yaffs_CheckStruct(yaffs_Tnode, 2 * YAFFS_NTNODES_LEVEL0, "yaffs_Tnode")
-+	yaffs_CheckStruct(yaffs_Tnode, 2 * YAFFS_NTNODES_LEVEL0, "yaffs_Tnode");
- #endif
--	    yaffs_CheckStruct(yaffs_ObjectHeader, 512, "yaffs_ObjectHeader")
--
--	    return YAFFS_OK;
-+#ifndef CONFIG_YAFFS_WINCE
-+	yaffs_CheckStruct(yaffs_ObjectHeader, 512, "yaffs_ObjectHeader");
-+#endif
-+	return YAFFS_OK;
- }
---- a/fs/yaffs2/yaffs_guts.h
-+++ b/fs/yaffs2/yaffs_guts.h
-@@ -90,7 +90,7 @@
- 
- #define YAFFS_MAX_SHORT_OP_CACHES	20
- 
--#define YAFFS_N_TEMP_BUFFERS		4
-+#define YAFFS_N_TEMP_BUFFERS		6
- 
- /* We limit the number attempts at sucessfully saving a chunk of data.
-  * Small-page devices have 32 pages per block; large-page devices have 64.
-@@ -108,6 +108,9 @@
- #define YAFFS_LOWEST_SEQUENCE_NUMBER	0x00001000
- #define YAFFS_HIGHEST_SEQUENCE_NUMBER	0xEFFFFF00
- 
-+/* Special sequence number for bad block that failed to be marked bad */
-+#define YAFFS_SEQUENCE_BAD_BLOCK	0xFFFF0000
-+
- /* ChunkCache is used for short read/write operations.*/
- typedef struct {
- 	struct yaffs_ObjectStruct *object;
-@@ -134,11 +137,10 @@ typedef struct {
- typedef struct {
- 	unsigned chunkId:20;
- 	unsigned serialNumber:2;
--	unsigned byteCount:10;
-+	unsigned byteCountLSB:10;
- 	unsigned objectId:18;
- 	unsigned ecc:12;
--	unsigned unusedStuff:2;
--
-+	unsigned byteCountMSB:2;
- } yaffs_Tags;
- 
- typedef union {
-@@ -277,13 +279,13 @@ typedef struct {
- 
- 	int softDeletions:10;	/* number of soft deleted pages */
- 	int pagesInUse:10;	/* number of pages in use */
--	yaffs_BlockState blockState:4;	/* One of the above block states */
-+	unsigned blockState:4;	/* One of the above block states. NB use unsigned because enum is sometimes an int */
- 	__u32 needsRetiring:1;	/* Data has failed on this block, need to get valid data off */
--                        	/* and retire the block. */
--	__u32 skipErasedCheck: 1; /* If this is set we can skip the erased check on this block */
--	__u32 gcPrioritise: 1; 	/* An ECC check or blank check has failed on this block.
-+				/* and retire the block. */
-+	__u32 skipErasedCheck:1; /* If this is set we can skip the erased check on this block */
-+	__u32 gcPrioritise:1; 	/* An ECC check or blank check has failed on this block.
- 				   It should be prioritised for GC */
--        __u32 chunkErrorStrikes:3; /* How many times we've had ecc etc failures on this block and tried to reuse it */
-+	__u32 chunkErrorStrikes:3; /* How many times we've had ecc etc failures on this block and tried to reuse it */
- 
- #ifdef CONFIG_YAFFS_YAFFS2
- 	__u32 hasShrinkHeader:1; /* This block has at least one shrink object header */
-@@ -300,11 +302,11 @@ typedef struct {
- 
- 	/* Apply to everything  */
- 	int parentObjectId;
--	__u16 sum__NoLongerUsed;	/* checksum of name. No longer used */
-+	__u16 sum__NoLongerUsed;        /* checksum of name. No longer used */
- 	YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
- 
--	/* Thes following apply to directories, files, symlinks - not hard links */
--	__u32 yst_mode;		/* protection */
-+	/* The following apply to directories, files, symlinks - not hard links */
-+	__u32 yst_mode;         /* protection */
- 
- #ifdef CONFIG_YAFFS_WINCE
- 	__u32 notForWinCE[5];
-@@ -331,11 +333,14 @@ typedef struct {
- 	__u32 win_ctime[2];
- 	__u32 win_atime[2];
- 	__u32 win_mtime[2];
--	__u32 roomToGrow[4];
- #else
--	__u32 roomToGrow[10];
-+	__u32 roomToGrow[6];
-+
- #endif
-+	__u32 inbandShadowsObject;
-+	__u32 inbandIsShrink;
- 
-+	__u32 reservedSpace[2];
- 	int shadowsObject;	/* This object header shadows the specified object if > 0 */
- 
- 	/* isShrink applies to object headers written when we shrink the file (ie resize) */
-@@ -381,7 +386,7 @@ typedef struct {
- } yaffs_FileStructure;
- 
- typedef struct {
--	struct list_head children;	/* list of child links */
-+	struct ylist_head children;     /* list of child links */
- } yaffs_DirectoryStructure;
- 
- typedef struct {
-@@ -418,23 +423,24 @@ struct yaffs_ObjectStruct {
- 				 * still in the inode cache. Free of object is defered.
- 				 * until the inode is released.
- 				 */
-+	__u8 beingCreated:1;	/* This object is still being created so skip some checks. */
- 
- 	__u8 serial;		/* serial number of chunk in NAND. Cached here */
- 	__u16 sum;		/* sum of the name to speed searching */
- 
--	struct yaffs_DeviceStruct *myDev;	/* The device I'm on */
-+	struct yaffs_DeviceStruct *myDev;       /* The device I'm on */
- 
--	struct list_head hashLink;	/* list of objects in this hash bucket */
-+	struct ylist_head hashLink;     /* list of objects in this hash bucket */
- 
--	struct list_head hardLinks;	/* all the equivalent hard linked objects */
-+	struct ylist_head hardLinks;    /* all the equivalent hard linked objects */
- 
- 	/* directory structure stuff */
- 	/* also used for linking up the free list */
- 	struct yaffs_ObjectStruct *parent;
--	struct list_head siblings;
-+	struct ylist_head siblings;
- 
- 	/* Where's my object header in NAND? */
--	int chunkId;
-+	int hdrChunk;
- 
- 	int nDataChunks;	/* Number of data chunks attached to the file. */
- 
-@@ -485,7 +491,7 @@ struct yaffs_ObjectList_struct {
- typedef struct yaffs_ObjectList_struct yaffs_ObjectList;
- 
- typedef struct {
--	struct list_head list;
-+	struct ylist_head list;
- 	int count;
- } yaffs_ObjectBucket;
- 
-@@ -495,11 +501,10 @@ typedef struct {
-  */
- 
- typedef struct {
--        int structType;
-+	int structType;
- 	__u32 objectId;
- 	__u32 parentId;
--	int chunkId;
--
-+	int hdrChunk;
- 	yaffs_ObjectType variantType:3;
- 	__u8 deleted:1;
- 	__u8 softDeleted:1;
-@@ -511,8 +516,7 @@ typedef struct {
- 
- 	int nDataChunks;
- 	__u32 fileSizeOrEquivalentObjectId;
--
--}yaffs_CheckpointObject;
-+} yaffs_CheckpointObject;
- 
- /*--------------------- Temporary buffers ----------------
-  *
-@@ -528,13 +532,13 @@ typedef struct {
- /*----------------- Device ---------------------------------*/
- 
- struct yaffs_DeviceStruct {
--	struct list_head devList;
-+	struct ylist_head devList;
- 	const char *name;
- 
- 	/* Entry parameters set up way early. Yaffs sets up the rest.*/
- 	int nDataBytesPerChunk;	/* Should be a power of 2 >= 512 */
- 	int nChunksPerBlock;	/* does not need to be a power of 2 */
--	int nBytesPerSpare;	/* spare area size */
-+	int spareBytesPerChunk;	/* spare area size */
- 	int startBlock;		/* Start block we're allowed to use */
- 	int endBlock;		/* End block we're allowed to use */
- 	int nReservedBlocks;	/* We want this tuneable so that we can reduce */
-@@ -544,9 +548,7 @@ struct yaffs_DeviceStruct {
- 	/* Stuff used by the shared space checkpointing mechanism */
- 	/* If this value is zero, then this mechanism is disabled */
- 
--	int nCheckpointReservedBlocks; /* Blocks to reserve for checkpoint data */
--
--
-+/*	int nCheckpointReservedBlocks; */ /* Blocks to reserve for checkpoint data */
- 
- 
- 	int nShortOpCaches;	/* If <= 0, then short op caching is disabled, else
-@@ -560,30 +562,31 @@ struct yaffs_DeviceStruct {
- 	void *genericDevice;	/* Pointer to device context
- 				 * On an mtd this holds the mtd pointer.
- 				 */
--        void *superBlock;
-+	void *superBlock;
- 
- 	/* NAND access functions (Must be set before calling YAFFS)*/
- 
--	int (*writeChunkToNAND) (struct yaffs_DeviceStruct * dev,
--				 int chunkInNAND, const __u8 * data,
--				 const yaffs_Spare * spare);
--	int (*readChunkFromNAND) (struct yaffs_DeviceStruct * dev,
--				  int chunkInNAND, __u8 * data,
--				  yaffs_Spare * spare);
--	int (*eraseBlockInNAND) (struct yaffs_DeviceStruct * dev,
--				 int blockInNAND);
--	int (*initialiseNAND) (struct yaffs_DeviceStruct * dev);
-+	int (*writeChunkToNAND) (struct yaffs_DeviceStruct *dev,
-+					int chunkInNAND, const __u8 *data,
-+					const yaffs_Spare *spare);
-+	int (*readChunkFromNAND) (struct yaffs_DeviceStruct *dev,
-+					int chunkInNAND, __u8 *data,
-+					yaffs_Spare *spare);
-+	int (*eraseBlockInNAND) (struct yaffs_DeviceStruct *dev,
-+					int blockInNAND);
-+	int (*initialiseNAND) (struct yaffs_DeviceStruct *dev);
-+	int (*deinitialiseNAND) (struct yaffs_DeviceStruct *dev);
- 
- #ifdef CONFIG_YAFFS_YAFFS2
--	int (*writeChunkWithTagsToNAND) (struct yaffs_DeviceStruct * dev,
--					 int chunkInNAND, const __u8 * data,
--					 const yaffs_ExtendedTags * tags);
--	int (*readChunkWithTagsFromNAND) (struct yaffs_DeviceStruct * dev,
--					  int chunkInNAND, __u8 * data,
--					  yaffs_ExtendedTags * tags);
--	int (*markNANDBlockBad) (struct yaffs_DeviceStruct * dev, int blockNo);
--	int (*queryNANDBlock) (struct yaffs_DeviceStruct * dev, int blockNo,
--			       yaffs_BlockState * state, int *sequenceNumber);
-+	int (*writeChunkWithTagsToNAND) (struct yaffs_DeviceStruct *dev,
-+					 int chunkInNAND, const __u8 *data,
-+					 const yaffs_ExtendedTags *tags);
-+	int (*readChunkWithTagsFromNAND) (struct yaffs_DeviceStruct *dev,
-+					  int chunkInNAND, __u8 *data,
-+					  yaffs_ExtendedTags *tags);
-+	int (*markNANDBlockBad) (struct yaffs_DeviceStruct *dev, int blockNo);
-+	int (*queryNANDBlock) (struct yaffs_DeviceStruct *dev, int blockNo,
-+			       yaffs_BlockState *state, __u32 *sequenceNumber);
- #endif
- 
- 	int isYaffs2;
-@@ -595,10 +598,12 @@ struct yaffs_DeviceStruct {
- 	void (*removeObjectCallback)(struct yaffs_ObjectStruct *obj);
- 
- 	/* Callback to mark the superblock dirsty */
--	void (*markSuperBlockDirty)(void * superblock);
-+	void (*markSuperBlockDirty)(void *superblock);
- 
- 	int wideTnodesDisabled; /* Set to disable wide tnodes */
- 
-+	YCHAR *pathDividers;	/* String of legal path dividers */
-+
- 
- 	/* End of stuff that must be set before initialisation. */
- 
-@@ -615,16 +620,14 @@ struct yaffs_DeviceStruct {
- 	__u32 tnodeWidth;
- 	__u32 tnodeMask;
- 
--	/* Stuff to support various file offses to chunk/offset translations */
--	/* "Crumbs" for nDataBytesPerChunk not being a power of 2 */
--	__u32 crumbMask;
--	__u32 crumbShift;
--	__u32 crumbsPerChunk;
--
--	/* Straight shifting for nDataBytesPerChunk being a power of 2 */
--	__u32 chunkShift;
--	__u32 chunkMask;
--
-+	/* Stuff for figuring out file offset to chunk conversions */
-+	__u32 chunkShift; /* Shift value */
-+	__u32 chunkDiv;   /* Divisor after shifting: 1 for power-of-2 sizes */
-+	__u32 chunkMask;  /* Mask to use for power-of-2 case */
-+
-+	/* Stuff to handle inband tags */
-+	int inbandTags;
-+	__u32 totalBytesPerChunk;
- 
- #ifdef __KERNEL__
- 
-@@ -633,7 +636,7 @@ struct yaffs_DeviceStruct {
- 	__u8 *spareBuffer;	/* For mtdif2 use. Don't know the size of the buffer
- 				 * at compile time so we have to allocate it.
- 				 */
--	void (*putSuperFunc) (struct super_block * sb);
-+	void (*putSuperFunc) (struct super_block *sb);
- #endif
- 
- 	int isMounted;
-@@ -663,6 +666,8 @@ struct yaffs_DeviceStruct {
- 	__u32 checkpointSum;
- 	__u32 checkpointXor;
- 
-+	int nCheckpointBlocksRequired; /* Number of blocks needed to store current checkpoint set */
-+
- 	/* Block Info */
- 	yaffs_BlockInfo *blockInfo;
- 	__u8 *chunkBits;	/* bitmap of chunks in use */
-@@ -684,11 +689,15 @@ struct yaffs_DeviceStruct {
- 	yaffs_TnodeList *allocatedTnodeList;
- 
- 	int isDoingGC;
-+	int gcBlock;
-+	int gcChunk;
- 
- 	int nObjectsCreated;
- 	yaffs_Object *freeObjects;
- 	int nFreeObjects;
- 
-+	int nHardLinks;
-+
- 	yaffs_ObjectList *allocatedObjectList;
- 
- 	yaffs_ObjectBucket objectBucket[YAFFS_NOBJECT_BUCKETS];
-@@ -745,8 +754,10 @@ struct yaffs_DeviceStruct {
- 	int nBackgroundDeletions;	/* Count of background deletions. */
- 
- 
-+	/* Temporary buffer management */
- 	yaffs_TempBuffer tempBuffer[YAFFS_N_TEMP_BUFFERS];
- 	int maxTemp;
-+	int tempInUse;
- 	int unmanagedTempAllocations;
- 	int unmanagedTempDeallocations;
- 
-@@ -758,9 +769,9 @@ struct yaffs_DeviceStruct {
- 
- typedef struct yaffs_DeviceStruct yaffs_Device;
- 
--/* The static layout of bllock usage etc is stored in the super block header */
-+/* The static layout of block usage etc is stored in the super block header */
- typedef struct {
--        int StructType;
-+	int StructType;
- 	int version;
- 	int checkpointStartBlock;
- 	int checkpointEndBlock;
-@@ -773,7 +784,7 @@ typedef struct {
-  * must be preserved over unmount/mount cycles.
-  */
- typedef struct {
--        int structType;
-+	int structType;
- 	int nErasedBlocks;
- 	int allocationBlock;	/* Current block being allocated off */
- 	__u32 allocationPage;
-@@ -791,57 +802,45 @@ typedef struct {
- 
- 
- typedef struct {
--    int structType;
--    __u32 magic;
--    __u32 version;
--    __u32 head;
-+	int structType;
-+	__u32 magic;
-+	__u32 version;
-+	__u32 head;
- } yaffs_CheckpointValidity;
- 
--/* Function to manipulate block info */
--static Y_INLINE yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blk)
--{
--	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
--		T(YAFFS_TRACE_ERROR,
--		  (TSTR
--		   ("**>> yaffs: getBlockInfo block %d is not valid" TENDSTR),
--		   blk));
--		YBUG();
--	}
--	return &dev->blockInfo[blk - dev->internalStartBlock];
--}
- 
- /*----------------------- YAFFS Functions -----------------------*/
- 
--int yaffs_GutsInitialise(yaffs_Device * dev);
--void yaffs_Deinitialise(yaffs_Device * dev);
-+int yaffs_GutsInitialise(yaffs_Device *dev);
-+void yaffs_Deinitialise(yaffs_Device *dev);
- 
--int yaffs_GetNumberOfFreeChunks(yaffs_Device * dev);
-+int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev);
- 
--int yaffs_RenameObject(yaffs_Object * oldDir, const YCHAR * oldName,
--		       yaffs_Object * newDir, const YCHAR * newName);
-+int yaffs_RenameObject(yaffs_Object *oldDir, const YCHAR *oldName,
-+		       yaffs_Object *newDir, const YCHAR *newName);
- 
--int yaffs_Unlink(yaffs_Object * dir, const YCHAR * name);
--int yaffs_DeleteFile(yaffs_Object * obj);
-+int yaffs_Unlink(yaffs_Object *dir, const YCHAR *name);
-+int yaffs_DeleteObject(yaffs_Object *obj);
- 
--int yaffs_GetObjectName(yaffs_Object * obj, YCHAR * name, int buffSize);
--int yaffs_GetObjectFileLength(yaffs_Object * obj);
--int yaffs_GetObjectInode(yaffs_Object * obj);
--unsigned yaffs_GetObjectType(yaffs_Object * obj);
--int yaffs_GetObjectLinkCount(yaffs_Object * obj);
-+int yaffs_GetObjectName(yaffs_Object *obj, YCHAR *name, int buffSize);
-+int yaffs_GetObjectFileLength(yaffs_Object *obj);
-+int yaffs_GetObjectInode(yaffs_Object *obj);
-+unsigned yaffs_GetObjectType(yaffs_Object *obj);
-+int yaffs_GetObjectLinkCount(yaffs_Object *obj);
- 
--int yaffs_SetAttributes(yaffs_Object * obj, struct iattr *attr);
--int yaffs_GetAttributes(yaffs_Object * obj, struct iattr *attr);
-+int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr);
-+int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr);
- 
- /* File operations */
--int yaffs_ReadDataFromFile(yaffs_Object * obj, __u8 * buffer, loff_t offset,
--			   int nBytes);
--int yaffs_WriteDataToFile(yaffs_Object * obj, const __u8 * buffer, loff_t offset,
--			  int nBytes, int writeThrough);
--int yaffs_ResizeFile(yaffs_Object * obj, loff_t newSize);
--
--yaffs_Object *yaffs_MknodFile(yaffs_Object * parent, const YCHAR * name,
--			      __u32 mode, __u32 uid, __u32 gid);
--int yaffs_FlushFile(yaffs_Object * obj, int updateTime);
-+int yaffs_ReadDataFromFile(yaffs_Object *obj, __u8 *buffer, loff_t offset,
-+				int nBytes);
-+int yaffs_WriteDataToFile(yaffs_Object *obj, const __u8 *buffer, loff_t offset,
-+				int nBytes, int writeThrough);
-+int yaffs_ResizeFile(yaffs_Object *obj, loff_t newSize);
-+
-+yaffs_Object *yaffs_MknodFile(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid);
-+int yaffs_FlushFile(yaffs_Object *obj, int updateTime);
- 
- /* Flushing and checkpointing */
- void yaffs_FlushEntireDeviceCache(yaffs_Device *dev);
-@@ -850,33 +849,33 @@ int yaffs_CheckpointSave(yaffs_Device *d
- int yaffs_CheckpointRestore(yaffs_Device *dev);
- 
- /* Directory operations */
--yaffs_Object *yaffs_MknodDirectory(yaffs_Object * parent, const YCHAR * name,
--				   __u32 mode, __u32 uid, __u32 gid);
--yaffs_Object *yaffs_FindObjectByName(yaffs_Object * theDir, const YCHAR * name);
--int yaffs_ApplyToDirectoryChildren(yaffs_Object * theDir,
-+yaffs_Object *yaffs_MknodDirectory(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid);
-+yaffs_Object *yaffs_FindObjectByName(yaffs_Object *theDir, const YCHAR *name);
-+int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir,
- 				   int (*fn) (yaffs_Object *));
- 
--yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device * dev, __u32 number);
-+yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev, __u32 number);
- 
- /* Link operations */
--yaffs_Object *yaffs_Link(yaffs_Object * parent, const YCHAR * name,
--			 yaffs_Object * equivalentObject);
-+yaffs_Object *yaffs_Link(yaffs_Object *parent, const YCHAR *name,
-+			 yaffs_Object *equivalentObject);
- 
--yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object * obj);
-+yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj);
- 
- /* Symlink operations */
--yaffs_Object *yaffs_MknodSymLink(yaffs_Object * parent, const YCHAR * name,
-+yaffs_Object *yaffs_MknodSymLink(yaffs_Object *parent, const YCHAR *name,
- 				 __u32 mode, __u32 uid, __u32 gid,
--				 const YCHAR * alias);
--YCHAR *yaffs_GetSymlinkAlias(yaffs_Object * obj);
-+				 const YCHAR *alias);
-+YCHAR *yaffs_GetSymlinkAlias(yaffs_Object *obj);
- 
- /* Special inodes (fifos, sockets and devices) */
--yaffs_Object *yaffs_MknodSpecial(yaffs_Object * parent, const YCHAR * name,
-+yaffs_Object *yaffs_MknodSpecial(yaffs_Object *parent, const YCHAR *name,
- 				 __u32 mode, __u32 uid, __u32 gid, __u32 rdev);
- 
- /* Special directories */
--yaffs_Object *yaffs_Root(yaffs_Device * dev);
--yaffs_Object *yaffs_LostNFound(yaffs_Device * dev);
-+yaffs_Object *yaffs_Root(yaffs_Device *dev);
-+yaffs_Object *yaffs_LostNFound(yaffs_Device *dev);
- 
- #ifdef CONFIG_YAFFS_WINCE
- /* CONFIG_YAFFS_WINCE special stuff */
-@@ -885,18 +884,21 @@ void yfsd_WinFileTimeNow(__u32 target[2]
- 
- #ifdef __KERNEL__
- 
--void yaffs_HandleDeferedFree(yaffs_Object * obj);
-+void yaffs_HandleDeferedFree(yaffs_Object *obj);
- #endif
- 
- /* Debug dump  */
--int yaffs_DumpObject(yaffs_Object * obj);
-+int yaffs_DumpObject(yaffs_Object *obj);
- 
--void yaffs_GutsTest(yaffs_Device * dev);
-+void yaffs_GutsTest(yaffs_Device *dev);
- 
- /* A few useful functions */
--void yaffs_InitialiseTags(yaffs_ExtendedTags * tags);
--void yaffs_DeleteChunk(yaffs_Device * dev, int chunkId, int markNAND, int lyn);
--int yaffs_CheckFF(__u8 * buffer, int nBytes);
-+void yaffs_InitialiseTags(yaffs_ExtendedTags *tags);
-+void yaffs_DeleteChunk(yaffs_Device *dev, int chunkId, int markNAND, int lyn);
-+int yaffs_CheckFF(__u8 *buffer, int nBytes);
- void yaffs_HandleChunkError(yaffs_Device *dev, yaffs_BlockInfo *bi);
- 
-+__u8 *yaffs_GetTempBuffer(yaffs_Device *dev, int lineNo);
-+void yaffs_ReleaseTempBuffer(yaffs_Device *dev, __u8 *buffer, int lineNo);
-+
- #endif
---- a/fs/yaffs2/yaffs_mtdif1.c
-+++ b/fs/yaffs2/yaffs_mtdif1.c
-@@ -26,7 +26,7 @@
- #include "yportenv.h"
- #include "yaffs_guts.h"
- #include "yaffs_packedtags1.h"
--#include "yaffs_tagscompat.h"	// for yaffs_CalcTagsECC
-+#include "yaffs_tagscompat.h"	/* for yaffs_CalcTagsECC */
- 
- #include "linux/kernel.h"
- #include "linux/version.h"
-@@ -34,9 +34,9 @@
- #include "linux/mtd/mtd.h"
- 
- /* Don't compile this module if we don't have MTD's mtd_oob_ops interface */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 
--const char *yaffs_mtdif1_c_version = "$Id: yaffs_mtdif1.c,v 1.3 2007/05/15 20:16:11 ian Exp $";
-+const char *yaffs_mtdif1_c_version = "$Id: yaffs_mtdif1.c,v 1.10 2009-03-09 07:41:10 charles Exp $";
- 
- #ifndef CONFIG_YAFFS_9BYTE_TAGS
- # define YTAG1_SIZE 8
-@@ -89,9 +89,9 @@ static struct nand_ecclayout nand_oob_16
-  * Returns YAFFS_OK or YAFFS_FAIL.
-  */
- int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device *dev,
--	int chunkInNAND, const __u8 * data, const yaffs_ExtendedTags * etags)
-+	int chunkInNAND, const __u8 *data, const yaffs_ExtendedTags *etags)
- {
--	struct mtd_info * mtd = dev->genericDevice;
-+	struct mtd_info *mtd = dev->genericDevice;
- 	int chunkBytes = dev->nDataBytesPerChunk;
- 	loff_t addr = ((loff_t)chunkInNAND) * chunkBytes;
- 	struct mtd_oob_ops ops;
-@@ -146,7 +146,7 @@ int nandmtd1_WriteChunkWithTagsToNAND(ya
- 
- /* Return with empty ExtendedTags but add eccResult.
-  */
--static int rettags(yaffs_ExtendedTags * etags, int eccResult, int retval)
-+static int rettags(yaffs_ExtendedTags *etags, int eccResult, int retval)
- {
- 	if (etags) {
- 		memset(etags, 0, sizeof(*etags));
-@@ -169,9 +169,9 @@ static int rettags(yaffs_ExtendedTags *
-  * Returns YAFFS_OK or YAFFS_FAIL.
-  */
- int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev,
--	int chunkInNAND, __u8 * data, yaffs_ExtendedTags * etags)
-+	int chunkInNAND, __u8 *data, yaffs_ExtendedTags *etags)
- {
--	struct mtd_info * mtd = dev->genericDevice;
-+	struct mtd_info *mtd = dev->genericDevice;
- 	int chunkBytes = dev->nDataBytesPerChunk;
- 	loff_t addr = ((loff_t)chunkInNAND) * chunkBytes;
- 	int eccres = YAFFS_ECC_RESULT_NO_ERROR;
-@@ -189,7 +189,7 @@ int nandmtd1_ReadChunkWithTagsFromNAND(y
- 	ops.datbuf = data;
- 	ops.oobbuf = (__u8 *)&pt1;
- 
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20))
-+#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 20))
- 	/* In MTD 2.6.18 to 2.6.19 nand_base.c:nand_do_read_oob() has a bug;
- 	 * help it out with ops.len = ops.ooblen when ops.datbuf == NULL.
- 	 */
-@@ -284,11 +284,11 @@ int nandmtd1_ReadChunkWithTagsFromNAND(y
-  */
- int nandmtd1_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo)
- {
--	struct mtd_info * mtd = dev->genericDevice;
-+	struct mtd_info *mtd = dev->genericDevice;
- 	int blocksize = dev->nChunksPerBlock * dev->nDataBytesPerChunk;
- 	int retval;
- 
--	yaffs_trace(YAFFS_TRACE_BAD_BLOCKS, "marking block %d bad", blockNo);
-+	yaffs_trace(YAFFS_TRACE_BAD_BLOCKS, "marking block %d bad\n", blockNo);
- 
- 	retval = mtd->block_markbad(mtd, (loff_t)blocksize * blockNo);
- 	return (retval) ? YAFFS_FAIL : YAFFS_OK;
-@@ -298,7 +298,7 @@ int nandmtd1_MarkNANDBlockBad(struct yaf
-  *
-  * Returns YAFFS_OK or YAFFS_FAIL.
-  */
--static int nandmtd1_TestPrerequists(struct mtd_info * mtd)
-+static int nandmtd1_TestPrerequists(struct mtd_info *mtd)
- {
- 	/* 2.6.18 has mtd->ecclayout->oobavail */
- 	/* 2.6.21 has mtd->ecclayout->oobavail and mtd->oobavail */
-@@ -323,10 +323,11 @@ static int nandmtd1_TestPrerequists(stru
-  * Always returns YAFFS_OK.
-  */
- int nandmtd1_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--	yaffs_BlockState * pState, int *pSequenceNumber)
-+	yaffs_BlockState *pState, __u32 *pSequenceNumber)
- {
--	struct mtd_info * mtd = dev->genericDevice;
-+	struct mtd_info *mtd = dev->genericDevice;
- 	int chunkNo = blockNo * dev->nChunksPerBlock;
-+	loff_t addr = (loff_t)chunkNo * dev->nDataBytesPerChunk;
- 	yaffs_ExtendedTags etags;
- 	int state = YAFFS_BLOCK_STATE_DEAD;
- 	int seqnum = 0;
-@@ -335,21 +336,22 @@ int nandmtd1_QueryNANDBlock(struct yaffs
- 	/* We don't yet have a good place to test for MTD config prerequists.
- 	 * Do it here as we are called during the initial scan.
- 	 */
--	if (nandmtd1_TestPrerequists(mtd) != YAFFS_OK) {
-+	if (nandmtd1_TestPrerequists(mtd) != YAFFS_OK)
- 		return YAFFS_FAIL;
--	}
- 
- 	retval = nandmtd1_ReadChunkWithTagsFromNAND(dev, chunkNo, NULL, &etags);
-+	etags.blockBad = (mtd->block_isbad)(mtd, addr);
- 	if (etags.blockBad) {
- 		yaffs_trace(YAFFS_TRACE_BAD_BLOCKS,
--			"block %d is marked bad", blockNo);
-+			"block %d is marked bad\n", blockNo);
- 		state = YAFFS_BLOCK_STATE_DEAD;
--	}
--	else if (etags.chunkUsed) {
-+	} else if (etags.eccResult != YAFFS_ECC_RESULT_NO_ERROR) {
-+		/* bad tags, need to look more closely */
-+		state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
-+	} else if (etags.chunkUsed) {
- 		state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
- 		seqnum = etags.sequenceNumber;
--	}
--	else {
-+	} else {
- 		state = YAFFS_BLOCK_STATE_EMPTY;
- 	}
- 
-@@ -360,4 +362,4 @@ int nandmtd1_QueryNANDBlock(struct yaffs
- 	return YAFFS_OK;
- }
- 
--#endif /*KERNEL_VERSION*/
-+#endif /*MTD_VERSION*/
---- a/fs/yaffs2/yaffs_mtdif1.h
-+++ b/fs/yaffs2/yaffs_mtdif1.h
-@@ -14,15 +14,15 @@
- #ifndef __YAFFS_MTDIF1_H__
- #define __YAFFS_MTDIF1_H__
- 
--int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
--	const __u8 * data, const yaffs_ExtendedTags * tags);
-+int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
-+	const __u8 *data, const yaffs_ExtendedTags *tags);
- 
--int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--	__u8 * data, yaffs_ExtendedTags * tags);
-+int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+	__u8 *data, yaffs_ExtendedTags *tags);
- 
- int nandmtd1_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
- 
- int nandmtd1_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--	yaffs_BlockState * state, int *sequenceNumber);
-+	yaffs_BlockState *state, __u32 *sequenceNumber);
- 
- #endif
---- a/fs/yaffs2/yaffs_mtdif2.c
-+++ b/fs/yaffs2/yaffs_mtdif2.c
-@@ -14,7 +14,7 @@
- /* mtd interface for YAFFS2 */
- 
- const char *yaffs_mtdif2_c_version =
--    "$Id: yaffs_mtdif2.c,v 1.17 2007-02-14 01:09:06 wookey Exp $";
-+	"$Id: yaffs_mtdif2.c,v 1.23 2009-03-06 17:20:53 wookey Exp $";
- 
- #include "yportenv.h"
- 
-@@ -27,19 +27,23 @@ const char *yaffs_mtdif2_c_version =
- 
- #include "yaffs_packedtags2.h"
- 
--int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
--				      const __u8 * data,
--				      const yaffs_ExtendedTags * tags)
-+/* NB For use with inband tags....
-+ * We assume that the data buffer is of size totalBytersPerChunk so that we can also
-+ * use it to load the tags.
-+ */
-+int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
-+				      const __u8 *data,
-+				      const yaffs_ExtendedTags *tags)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	struct mtd_oob_ops ops;
- #else
- 	size_t dummy;
- #endif
- 	int retval = 0;
- 
--	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
-+	loff_t addr;
- 
- 	yaffs_PackedTags2 pt;
- 
-@@ -48,46 +52,40 @@ int nandmtd2_WriteChunkWithTagsToNAND(ya
- 	   ("nandmtd2_WriteChunkWithTagsToNAND chunk %d data %p tags %p"
- 	    TENDSTR), chunkInNAND, data, tags));
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--	if (tags)
--		yaffs_PackTags2(&pt, tags);
--	else
--		BUG(); /* both tags and data should always be present */
- 
--	if (data) {
--		ops.mode = MTD_OOB_AUTO;
--		ops.ooblen = sizeof(pt);
--		ops.len = dev->nDataBytesPerChunk;
--		ops.ooboffs = 0;
--		ops.datbuf = (__u8 *)data;
--		ops.oobbuf = (void *)&pt;
--		retval = mtd->write_oob(mtd, addr, &ops);
-+	addr  = ((loff_t) chunkInNAND) * dev->totalBytesPerChunk;
-+
-+	/* For yaffs2 writing there must be both data and tags.
-+	 * If we're using inband tags, then the tags are stuffed into
-+	 * the end of the data buffer.
-+	 */
-+	if (!data || !tags)
-+		BUG();
-+	else if (dev->inbandTags) {
-+		yaffs_PackedTags2TagsPart *pt2tp;
-+		pt2tp = (yaffs_PackedTags2TagsPart *)(data + dev->nDataBytesPerChunk);
-+		yaffs_PackTags2TagsPart(pt2tp, tags);
- 	} else
--		BUG(); /* both tags and data should always be present */
--#else
--	if (tags) {
- 		yaffs_PackTags2(&pt, tags);
--	}
- 
--	if (data && tags) {
--		if (dev->useNANDECC)
--			retval =
--			    mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
--					   &dummy, data, (__u8 *) & pt, NULL);
--		else
--			retval =
--			    mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
--					   &dummy, data, (__u8 *) & pt, NULL);
--	} else {
--		if (data)
--			retval =
--			    mtd->write(mtd, addr, dev->nDataBytesPerChunk, &dummy,
--				       data);
--		if (tags)
--			retval =
--			    mtd->write_oob(mtd, addr, mtd->oobsize, &dummy,
--					   (__u8 *) & pt);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+	ops.mode = MTD_OOB_AUTO;
-+	ops.ooblen = (dev->inbandTags) ? 0 : sizeof(pt);
-+	ops.len = dev->totalBytesPerChunk;
-+	ops.ooboffs = 0;
-+	ops.datbuf = (__u8 *)data;
-+	ops.oobbuf = (dev->inbandTags) ? NULL : (void *)&pt;
-+	retval = mtd->write_oob(mtd, addr, &ops);
- 
-+#else
-+	if (!dev->inbandTags) {
-+		retval =
-+		    mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
-+				   &dummy, data, (__u8 *) &pt, NULL);
-+	} else {
-+		retval =
-+		    mtd->write(mtd, addr, dev->totalBytesPerChunk, &dummy,
-+			       data);
- 	}
- #endif
- 
-@@ -97,17 +95,18 @@ int nandmtd2_WriteChunkWithTagsToNAND(ya
- 		return YAFFS_FAIL;
- }
- 
--int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--				       __u8 * data, yaffs_ExtendedTags * tags)
-+int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+				       __u8 *data, yaffs_ExtendedTags *tags)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	struct mtd_oob_ops ops;
- #endif
- 	size_t dummy;
- 	int retval = 0;
-+	int localData = 0;
- 
--	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
-+	loff_t addr = ((loff_t) chunkInNAND) * dev->totalBytesPerChunk;
- 
- 	yaffs_PackedTags2 pt;
- 
-@@ -116,9 +115,20 @@ int nandmtd2_ReadChunkWithTagsFromNAND(y
- 	   ("nandmtd2_ReadChunkWithTagsFromNAND chunk %d data %p tags %p"
- 	    TENDSTR), chunkInNAND, data, tags));
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--	if (data && !tags)
--		retval = mtd->read(mtd, addr, dev->nDataBytesPerChunk,
-+	if (dev->inbandTags) {
-+
-+		if (!data) {
-+			localData = 1;
-+			data = yaffs_GetTempBuffer(dev, __LINE__);
-+		}
-+
-+
-+	}
-+
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+	if (dev->inbandTags || (data && !tags))
-+		retval = mtd->read(mtd, addr, dev->totalBytesPerChunk,
- 				&dummy, data);
- 	else if (tags) {
- 		ops.mode = MTD_OOB_AUTO;
-@@ -130,38 +140,42 @@ int nandmtd2_ReadChunkWithTagsFromNAND(y
- 		retval = mtd->read_oob(mtd, addr, &ops);
- 	}
- #else
--	if (data && tags) {
--		if (dev->useNANDECC) {
--			retval =
--			    mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
--					  &dummy, data, dev->spareBuffer,
--					  NULL);
--		} else {
--			retval =
--			    mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
-+	if (!dev->inbandTags && data && tags) {
-+
-+		retval = mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
- 					  &dummy, data, dev->spareBuffer,
- 					  NULL);
--		}
- 	} else {
- 		if (data)
- 			retval =
- 			    mtd->read(mtd, addr, dev->nDataBytesPerChunk, &dummy,
- 				      data);
--		if (tags)
-+		if (!dev->inbandTags && tags)
- 			retval =
- 			    mtd->read_oob(mtd, addr, mtd->oobsize, &dummy,
- 					  dev->spareBuffer);
- 	}
- #endif
- 
--	memcpy(&pt, dev->spareBuffer, sizeof(pt));
- 
--	if (tags)
--		yaffs_UnpackTags2(tags, &pt);
-+	if (dev->inbandTags) {
-+		if (tags) {
-+			yaffs_PackedTags2TagsPart *pt2tp;
-+			pt2tp = (yaffs_PackedTags2TagsPart *)&data[dev->nDataBytesPerChunk];
-+			yaffs_UnpackTags2TagsPart(tags, pt2tp);
-+		}
-+	} else {
-+		if (tags) {
-+			memcpy(&pt, dev->spareBuffer, sizeof(pt));
-+			yaffs_UnpackTags2(tags, &pt);
-+		}
-+	}
-+
-+	if (localData)
-+		yaffs_ReleaseTempBuffer(dev, data, __LINE__);
- 
--	if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
-+	if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
- 		tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
--
- 	if (retval == 0)
- 		return YAFFS_OK;
- 	else
-@@ -178,7 +192,7 @@ int nandmtd2_MarkNANDBlockBad(struct yaf
- 	retval =
- 	    mtd->block_markbad(mtd,
- 			       blockNo * dev->nChunksPerBlock *
--			       dev->nDataBytesPerChunk);
-+			       dev->totalBytesPerChunk);
- 
- 	if (retval == 0)
- 		return YAFFS_OK;
-@@ -188,7 +202,7 @@ int nandmtd2_MarkNANDBlockBad(struct yaf
- }
- 
- int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--			    yaffs_BlockState * state, int *sequenceNumber)
-+			    yaffs_BlockState *state, __u32 *sequenceNumber)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
- 	int retval;
-@@ -198,7 +212,7 @@ int nandmtd2_QueryNANDBlock(struct yaffs
- 	retval =
- 	    mtd->block_isbad(mtd,
- 			     blockNo * dev->nChunksPerBlock *
--			     dev->nDataBytesPerChunk);
-+			     dev->totalBytesPerChunk);
- 
- 	if (retval) {
- 		T(YAFFS_TRACE_MTD, (TSTR("block is bad" TENDSTR)));
---- a/fs/yaffs2/yaffs_mtdif2.h
-+++ b/fs/yaffs2/yaffs_mtdif2.h
-@@ -17,13 +17,13 @@
- #define __YAFFS_MTDIF2_H__
- 
- #include "yaffs_guts.h"
--int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
--				      const __u8 * data,
--				      const yaffs_ExtendedTags * tags);
--int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--				       __u8 * data, yaffs_ExtendedTags * tags);
-+int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
-+				const __u8 *data,
-+				const yaffs_ExtendedTags *tags);
-+int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+				__u8 *data, yaffs_ExtendedTags *tags);
- int nandmtd2_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
- int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--			    yaffs_BlockState * state, int *sequenceNumber);
-+			yaffs_BlockState *state, __u32 *sequenceNumber);
- 
- #endif
---- a/fs/yaffs2/yaffs_mtdif.c
-+++ b/fs/yaffs2/yaffs_mtdif.c
-@@ -12,7 +12,7 @@
-  */
- 
- const char *yaffs_mtdif_c_version =
--    "$Id: yaffs_mtdif.c,v 1.19 2007-02-14 01:09:06 wookey Exp $";
-+	"$Id: yaffs_mtdif.c,v 1.22 2009-03-06 17:20:51 wookey Exp $";
- 
- #include "yportenv.h"
- 
-@@ -24,7 +24,7 @@ const char *yaffs_mtdif_c_version =
- #include "linux/time.h"
- #include "linux/mtd/nand.h"
- 
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18))
-+#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 18))
- static struct nand_oobinfo yaffs_oobinfo = {
- 	.useecc = 1,
- 	.eccbytes = 6,
-@@ -36,7 +36,7 @@ static struct nand_oobinfo yaffs_noeccin
- };
- #endif
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- static inline void translate_spare2oob(const yaffs_Spare *spare, __u8 *oob)
- {
- 	oob[0] = spare->tagByte0;
-@@ -45,8 +45,8 @@ static inline void translate_spare2oob(c
- 	oob[3] = spare->tagByte3;
- 	oob[4] = spare->tagByte4;
- 	oob[5] = spare->tagByte5 & 0x3f;
--	oob[5] |= spare->blockStatus == 'Y' ? 0: 0x80;
--	oob[5] |= spare->pageStatus == 0 ? 0: 0x40;
-+	oob[5] |= spare->blockStatus == 'Y' ? 0 : 0x80;
-+	oob[5] |= spare->pageStatus == 0 ? 0 : 0x40;
- 	oob[6] = spare->tagByte6;
- 	oob[7] = spare->tagByte7;
- }
-@@ -71,18 +71,18 @@ static inline void translate_oob2spare(y
- }
- #endif
- 
--int nandmtd_WriteChunkToNAND(yaffs_Device * dev, int chunkInNAND,
--			     const __u8 * data, const yaffs_Spare * spare)
-+int nandmtd_WriteChunkToNAND(yaffs_Device *dev, int chunkInNAND,
-+			     const __u8 *data, const yaffs_Spare *spare)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	struct mtd_oob_ops ops;
- #endif
- 	size_t dummy;
- 	int retval = 0;
- 
- 	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	__u8 spareAsBytes[8]; /* OOB */
- 
- 	if (data && !spare)
-@@ -135,18 +135,18 @@ int nandmtd_WriteChunkToNAND(yaffs_Devic
- 		return YAFFS_FAIL;
- }
- 
--int nandmtd_ReadChunkFromNAND(yaffs_Device * dev, int chunkInNAND, __u8 * data,
--			      yaffs_Spare * spare)
-+int nandmtd_ReadChunkFromNAND(yaffs_Device *dev, int chunkInNAND, __u8 *data,
-+			      yaffs_Spare *spare)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	struct mtd_oob_ops ops;
- #endif
- 	size_t dummy;
- 	int retval = 0;
- 
- 	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	__u8 spareAsBytes[8]; /* OOB */
- 
- 	if (data && !spare)
-@@ -205,7 +205,7 @@ int nandmtd_ReadChunkFromNAND(yaffs_Devi
- 		return YAFFS_FAIL;
- }
- 
--int nandmtd_EraseBlockInNAND(yaffs_Device * dev, int blockNumber)
-+int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
- 	__u32 addr =
-@@ -234,7 +234,7 @@ int nandmtd_EraseBlockInNAND(yaffs_Devic
- 		return YAFFS_FAIL;
- }
- 
--int nandmtd_InitialiseNAND(yaffs_Device * dev)
-+int nandmtd_InitialiseNAND(yaffs_Device *dev)
- {
- 	return YAFFS_OK;
- }
---- a/fs/yaffs2/yaffs_mtdif.h
-+++ b/fs/yaffs2/yaffs_mtdif.h
-@@ -18,10 +18,15 @@
- 
- #include "yaffs_guts.h"
- 
--int nandmtd_WriteChunkToNAND(yaffs_Device * dev, int chunkInNAND,
--			     const __u8 * data, const yaffs_Spare * spare);
--int nandmtd_ReadChunkFromNAND(yaffs_Device * dev, int chunkInNAND, __u8 * data,
--			      yaffs_Spare * spare);
--int nandmtd_EraseBlockInNAND(yaffs_Device * dev, int blockNumber);
--int nandmtd_InitialiseNAND(yaffs_Device * dev);
-+#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 18))
-+extern struct nand_oobinfo yaffs_oobinfo;
-+extern struct nand_oobinfo yaffs_noeccinfo;
-+#endif
-+
-+int nandmtd_WriteChunkToNAND(yaffs_Device *dev, int chunkInNAND,
-+			const __u8 *data, const yaffs_Spare *spare);
-+int nandmtd_ReadChunkFromNAND(yaffs_Device *dev, int chunkInNAND, __u8 *data,
-+			yaffs_Spare *spare);
-+int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber);
-+int nandmtd_InitialiseNAND(yaffs_Device *dev);
- #endif
---- a/fs/yaffs2/yaffs_nand.c
-+++ b/fs/yaffs2/yaffs_nand.c
-@@ -12,16 +12,17 @@
-  */
- 
- const char *yaffs_nand_c_version =
--    "$Id: yaffs_nand.c,v 1.7 2007-02-14 01:09:06 wookey Exp $";
-+	"$Id: yaffs_nand.c,v 1.10 2009-03-06 17:20:54 wookey Exp $";
- 
- #include "yaffs_nand.h"
- #include "yaffs_tagscompat.h"
- #include "yaffs_tagsvalidity.h"
- 
-+#include "yaffs_getblockinfo.h"
- 
--int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--					   __u8 * buffer,
--					   yaffs_ExtendedTags * tags)
-+int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+					   __u8 *buffer,
-+					   yaffs_ExtendedTags *tags)
- {
- 	int result;
- 	yaffs_ExtendedTags localTags;
-@@ -29,7 +30,7 @@ int yaffs_ReadChunkWithTagsFromNAND(yaff
- 	int realignedChunkInNAND = chunkInNAND - dev->chunkOffset;
- 
- 	/* If there are no tags provided, use local tags to get prioritised gc working */
--	if(!tags)
-+	if (!tags)
- 		tags = &localTags;
- 
- 	if (dev->readChunkWithTagsFromNAND)
-@@ -40,20 +41,20 @@ int yaffs_ReadChunkWithTagsFromNAND(yaff
- 									realignedChunkInNAND,
- 									buffer,
- 									tags);
--	if(tags &&
--	   tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR){
-+	if (tags &&
-+	   tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR) {
- 
- 		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, chunkInNAND/dev->nChunksPerBlock);
--                yaffs_HandleChunkError(dev,bi);
-+		yaffs_HandleChunkError(dev, bi);
- 	}
- 
- 	return result;
- }
- 
--int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev,
-+int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,
- 						   int chunkInNAND,
--						   const __u8 * buffer,
--						   yaffs_ExtendedTags * tags)
-+						   const __u8 *buffer,
-+						   yaffs_ExtendedTags *tags)
- {
- 	chunkInNAND -= dev->chunkOffset;
- 
-@@ -84,7 +85,7 @@ int yaffs_WriteChunkWithTagsToNAND(yaffs
- 								       tags);
- }
- 
--int yaffs_MarkBlockBad(yaffs_Device * dev, int blockNo)
-+int yaffs_MarkBlockBad(yaffs_Device *dev, int blockNo)
- {
- 	blockNo -= dev->blockOffset;
- 
-@@ -95,10 +96,10 @@ int yaffs_MarkBlockBad(yaffs_Device * de
- 		return yaffs_TagsCompatabilityMarkNANDBlockBad(dev, blockNo);
- }
- 
--int yaffs_QueryInitialBlockState(yaffs_Device * dev,
-+int yaffs_QueryInitialBlockState(yaffs_Device *dev,
- 						 int blockNo,
--						 yaffs_BlockState * state,
--						 unsigned *sequenceNumber)
-+						 yaffs_BlockState *state,
-+						 __u32 *sequenceNumber)
- {
- 	blockNo -= dev->blockOffset;
- 
---- a/fs/yaffs2/yaffs_nandemul2k.h
-+++ b/fs/yaffs2/yaffs_nandemul2k.h
-@@ -21,14 +21,14 @@
- #include "yaffs_guts.h"
- 
- int nandemul2k_WriteChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev,
--					int chunkInNAND, const __u8 * data,
--					yaffs_ExtendedTags * tags);
-+					int chunkInNAND, const __u8 *data,
-+					const yaffs_ExtendedTags *tags);
- int nandemul2k_ReadChunkWithTagsFromNAND(struct yaffs_DeviceStruct *dev,
--					 int chunkInNAND, __u8 * data,
--					 yaffs_ExtendedTags * tags);
-+					 int chunkInNAND, __u8 *data,
-+					 yaffs_ExtendedTags *tags);
- int nandemul2k_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
- int nandemul2k_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--			      yaffs_BlockState * state, int *sequenceNumber);
-+			      yaffs_BlockState *state, __u32 *sequenceNumber);
- int nandemul2k_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
- 				int blockInNAND);
- int nandemul2k_InitialiseNAND(struct yaffs_DeviceStruct *dev);
---- a/fs/yaffs2/yaffs_nand.h
-+++ b/fs/yaffs2/yaffs_nand.h
-@@ -19,21 +19,21 @@
- 
- 
- 
--int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--					   __u8 * buffer,
--					   yaffs_ExtendedTags * tags);
--
--int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev,
--						   int chunkInNAND,
--						   const __u8 * buffer,
--						   yaffs_ExtendedTags * tags);
--
--int yaffs_MarkBlockBad(yaffs_Device * dev, int blockNo);
--
--int yaffs_QueryInitialBlockState(yaffs_Device * dev,
--						 int blockNo,
--						 yaffs_BlockState * state,
--						 unsigned *sequenceNumber);
-+int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+					__u8 *buffer,
-+					yaffs_ExtendedTags *tags);
-+
-+int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,
-+						int chunkInNAND,
-+						const __u8 *buffer,
-+						yaffs_ExtendedTags *tags);
-+
-+int yaffs_MarkBlockBad(yaffs_Device *dev, int blockNo);
-+
-+int yaffs_QueryInitialBlockState(yaffs_Device *dev,
-+						int blockNo,
-+						yaffs_BlockState *state,
-+						unsigned *sequenceNumber);
- 
- int yaffs_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
- 				  int blockInNAND);
---- a/fs/yaffs2/yaffs_packedtags1.c
-+++ b/fs/yaffs2/yaffs_packedtags1.c
-@@ -14,7 +14,7 @@
- #include "yaffs_packedtags1.h"
- #include "yportenv.h"
- 
--void yaffs_PackTags1(yaffs_PackedTags1 * pt, const yaffs_ExtendedTags * t)
-+void yaffs_PackTags1(yaffs_PackedTags1 *pt, const yaffs_ExtendedTags *t)
- {
- 	pt->chunkId = t->chunkId;
- 	pt->serialNumber = t->serialNumber;
-@@ -27,7 +27,7 @@ void yaffs_PackTags1(yaffs_PackedTags1 *
- 
- }
- 
--void yaffs_UnpackTags1(yaffs_ExtendedTags * t, const yaffs_PackedTags1 * pt)
-+void yaffs_UnpackTags1(yaffs_ExtendedTags *t, const yaffs_PackedTags1 *pt)
- {
- 	static const __u8 allFF[] =
- 	    { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-@@ -35,9 +35,8 @@ void yaffs_UnpackTags1(yaffs_ExtendedTag
- 
- 	if (memcmp(allFF, pt, sizeof(yaffs_PackedTags1))) {
- 		t->blockBad = 0;
--		if (pt->shouldBeFF != 0xFFFFFFFF) {
-+		if (pt->shouldBeFF != 0xFFFFFFFF)
- 			t->blockBad = 1;
--		}
- 		t->chunkUsed = 1;
- 		t->objectId = pt->objectId;
- 		t->chunkId = pt->chunkId;
-@@ -47,6 +46,5 @@ void yaffs_UnpackTags1(yaffs_ExtendedTag
- 		t->serialNumber = pt->serialNumber;
- 	} else {
- 		memset(t, 0, sizeof(yaffs_ExtendedTags));
--
- 	}
- }
---- a/fs/yaffs2/yaffs_packedtags1.h
-+++ b/fs/yaffs2/yaffs_packedtags1.h
-@@ -32,6 +32,6 @@ typedef struct {
- 
- } yaffs_PackedTags1;
- 
--void yaffs_PackTags1(yaffs_PackedTags1 * pt, const yaffs_ExtendedTags * t);
--void yaffs_UnpackTags1(yaffs_ExtendedTags * t, const yaffs_PackedTags1 * pt);
-+void yaffs_PackTags1(yaffs_PackedTags1 *pt, const yaffs_ExtendedTags *t);
-+void yaffs_UnpackTags1(yaffs_ExtendedTags *t, const yaffs_PackedTags1 *pt);
- #endif
---- a/fs/yaffs2/yaffs_packedtags2.c
-+++ b/fs/yaffs2/yaffs_packedtags2.c
-@@ -37,60 +37,68 @@
- #define EXTRA_OBJECT_TYPE_SHIFT (28)
- #define EXTRA_OBJECT_TYPE_MASK  ((0x0F) << EXTRA_OBJECT_TYPE_SHIFT)
- 
--static void yaffs_DumpPackedTags2(const yaffs_PackedTags2 * pt)
-+
-+static void yaffs_DumpPackedTags2TagsPart(const yaffs_PackedTags2TagsPart *ptt)
- {
- 	T(YAFFS_TRACE_MTD,
- 	  (TSTR("packed tags obj %d chunk %d byte %d seq %d" TENDSTR),
--	   pt->t.objectId, pt->t.chunkId, pt->t.byteCount,
--	   pt->t.sequenceNumber));
-+	   ptt->objectId, ptt->chunkId, ptt->byteCount,
-+	   ptt->sequenceNumber));
-+}
-+static void yaffs_DumpPackedTags2(const yaffs_PackedTags2 *pt)
-+{
-+	yaffs_DumpPackedTags2TagsPart(&pt->t);
- }
- 
--static void yaffs_DumpTags2(const yaffs_ExtendedTags * t)
-+static void yaffs_DumpTags2(const yaffs_ExtendedTags *t)
- {
- 	T(YAFFS_TRACE_MTD,
- 	  (TSTR
--	   ("ext.tags eccres %d blkbad %d chused %d obj %d chunk%d byte "
--	    "%d del %d ser %d seq %d"
-+	   ("ext.tags eccres %d blkbad %d chused %d obj %d chunk%d byte %d del %d ser %d seq %d"
- 	    TENDSTR), t->eccResult, t->blockBad, t->chunkUsed, t->objectId,
- 	   t->chunkId, t->byteCount, t->chunkDeleted, t->serialNumber,
- 	   t->sequenceNumber));
- 
- }
- 
--void yaffs_PackTags2(yaffs_PackedTags2 * pt, const yaffs_ExtendedTags * t)
-+void yaffs_PackTags2TagsPart(yaffs_PackedTags2TagsPart *ptt,
-+		const yaffs_ExtendedTags *t)
- {
--	pt->t.chunkId = t->chunkId;
--	pt->t.sequenceNumber = t->sequenceNumber;
--	pt->t.byteCount = t->byteCount;
--	pt->t.objectId = t->objectId;
-+	ptt->chunkId = t->chunkId;
-+	ptt->sequenceNumber = t->sequenceNumber;
-+	ptt->byteCount = t->byteCount;
-+	ptt->objectId = t->objectId;
- 
- 	if (t->chunkId == 0 && t->extraHeaderInfoAvailable) {
- 		/* Store the extra header info instead */
- 		/* We save the parent object in the chunkId */
--		pt->t.chunkId = EXTRA_HEADER_INFO_FLAG
-+		ptt->chunkId = EXTRA_HEADER_INFO_FLAG
- 			| t->extraParentObjectId;
--		if (t->extraIsShrinkHeader) {
--			pt->t.chunkId |= EXTRA_SHRINK_FLAG;
--		}
--		if (t->extraShadows) {
--			pt->t.chunkId |= EXTRA_SHADOWS_FLAG;
--		}
-+		if (t->extraIsShrinkHeader)
-+			ptt->chunkId |= EXTRA_SHRINK_FLAG;
-+		if (t->extraShadows)
-+			ptt->chunkId |= EXTRA_SHADOWS_FLAG;
- 
--		pt->t.objectId &= ~EXTRA_OBJECT_TYPE_MASK;
--		pt->t.objectId |=
-+		ptt->objectId &= ~EXTRA_OBJECT_TYPE_MASK;
-+		ptt->objectId |=
- 		    (t->extraObjectType << EXTRA_OBJECT_TYPE_SHIFT);
- 
--		if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK) {
--			pt->t.byteCount = t->extraEquivalentObjectId;
--		} else if (t->extraObjectType == YAFFS_OBJECT_TYPE_FILE) {
--			pt->t.byteCount = t->extraFileLength;
--		} else {
--			pt->t.byteCount = 0;
--		}
-+		if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK)
-+			ptt->byteCount = t->extraEquivalentObjectId;
-+		else if (t->extraObjectType == YAFFS_OBJECT_TYPE_FILE)
-+			ptt->byteCount = t->extraFileLength;
-+		else
-+			ptt->byteCount = 0;
- 	}
- 
--	yaffs_DumpPackedTags2(pt);
-+	yaffs_DumpPackedTags2TagsPart(ptt);
- 	yaffs_DumpTags2(t);
-+}
-+
-+
-+void yaffs_PackTags2(yaffs_PackedTags2 *pt, const yaffs_ExtendedTags *t)
-+{
-+	yaffs_PackTags2TagsPart(&pt->t, t);
- 
- #ifndef YAFFS_IGNORE_TAGS_ECC
- 	{
-@@ -101,82 +109,98 @@ void yaffs_PackTags2(yaffs_PackedTags2 *
- #endif
- }
- 
--void yaffs_UnpackTags2(yaffs_ExtendedTags * t, yaffs_PackedTags2 * pt)
-+
-+void yaffs_UnpackTags2TagsPart(yaffs_ExtendedTags *t,
-+		yaffs_PackedTags2TagsPart *ptt)
- {
- 
- 	memset(t, 0, sizeof(yaffs_ExtendedTags));
- 
- 	yaffs_InitialiseTags(t);
- 
--	if (pt->t.sequenceNumber != 0xFFFFFFFF) {
--		/* Page is in use */
--#ifdef YAFFS_IGNORE_TAGS_ECC
--		{
--			t->eccResult = YAFFS_ECC_RESULT_NO_ERROR;
--		}
--#else
--		{
--			yaffs_ECCOther ecc;
--			int result;
--			yaffs_ECCCalculateOther((unsigned char *)&pt->t,
--						sizeof
--						(yaffs_PackedTags2TagsPart),
--						&ecc);
--			result =
--			    yaffs_ECCCorrectOther((unsigned char *)&pt->t,
--						  sizeof
--						  (yaffs_PackedTags2TagsPart),
--						  &pt->ecc, &ecc);
--			switch(result){
--				case 0:
--					t->eccResult = YAFFS_ECC_RESULT_NO_ERROR;
--					break;
--				case 1:
--					t->eccResult = YAFFS_ECC_RESULT_FIXED;
--					break;
--				case -1:
--					t->eccResult = YAFFS_ECC_RESULT_UNFIXED;
--					break;
--				default:
--					t->eccResult = YAFFS_ECC_RESULT_UNKNOWN;
--			}
--		}
--#endif
-+	if (ptt->sequenceNumber != 0xFFFFFFFF) {
- 		t->blockBad = 0;
- 		t->chunkUsed = 1;
--		t->objectId = pt->t.objectId;
--		t->chunkId = pt->t.chunkId;
--		t->byteCount = pt->t.byteCount;
-+		t->objectId = ptt->objectId;
-+		t->chunkId = ptt->chunkId;
-+		t->byteCount = ptt->byteCount;
- 		t->chunkDeleted = 0;
- 		t->serialNumber = 0;
--		t->sequenceNumber = pt->t.sequenceNumber;
-+		t->sequenceNumber = ptt->sequenceNumber;
- 
- 		/* Do extra header info stuff */
- 
--		if (pt->t.chunkId & EXTRA_HEADER_INFO_FLAG) {
-+		if (ptt->chunkId & EXTRA_HEADER_INFO_FLAG) {
- 			t->chunkId = 0;
- 			t->byteCount = 0;
- 
- 			t->extraHeaderInfoAvailable = 1;
- 			t->extraParentObjectId =
--			    pt->t.chunkId & (~(ALL_EXTRA_FLAGS));
-+			    ptt->chunkId & (~(ALL_EXTRA_FLAGS));
- 			t->extraIsShrinkHeader =
--			    (pt->t.chunkId & EXTRA_SHRINK_FLAG) ? 1 : 0;
-+			    (ptt->chunkId & EXTRA_SHRINK_FLAG) ? 1 : 0;
- 			t->extraShadows =
--			    (pt->t.chunkId & EXTRA_SHADOWS_FLAG) ? 1 : 0;
-+			    (ptt->chunkId & EXTRA_SHADOWS_FLAG) ? 1 : 0;
- 			t->extraObjectType =
--			    pt->t.objectId >> EXTRA_OBJECT_TYPE_SHIFT;
-+			    ptt->objectId >> EXTRA_OBJECT_TYPE_SHIFT;
- 			t->objectId &= ~EXTRA_OBJECT_TYPE_MASK;
- 
--			if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK) {
--				t->extraEquivalentObjectId = pt->t.byteCount;
--			} else {
--				t->extraFileLength = pt->t.byteCount;
-+			if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK)
-+				t->extraEquivalentObjectId = ptt->byteCount;
-+			else
-+				t->extraFileLength = ptt->byteCount;
-+		}
-+	}
-+
-+	yaffs_DumpPackedTags2TagsPart(ptt);
-+	yaffs_DumpTags2(t);
-+
-+}
-+
-+
-+void yaffs_UnpackTags2(yaffs_ExtendedTags *t, yaffs_PackedTags2 *pt)
-+{
-+
-+	yaffs_ECCResult eccResult = YAFFS_ECC_RESULT_NO_ERROR;
-+
-+	if (pt->t.sequenceNumber != 0xFFFFFFFF) {
-+		/* Page is in use */
-+#ifndef YAFFS_IGNORE_TAGS_ECC
-+		{
-+			yaffs_ECCOther ecc;
-+			int result;
-+			yaffs_ECCCalculateOther((unsigned char *)&pt->t,
-+						sizeof
-+						(yaffs_PackedTags2TagsPart),
-+						&ecc);
-+			result =
-+			    yaffs_ECCCorrectOther((unsigned char *)&pt->t,
-+						  sizeof
-+						  (yaffs_PackedTags2TagsPart),
-+						  &pt->ecc, &ecc);
-+			switch (result) {
-+			case 0:
-+				eccResult = YAFFS_ECC_RESULT_NO_ERROR;
-+				break;
-+			case 1:
-+				eccResult = YAFFS_ECC_RESULT_FIXED;
-+				break;
-+			case -1:
-+				eccResult = YAFFS_ECC_RESULT_UNFIXED;
-+				break;
-+			default:
-+				eccResult = YAFFS_ECC_RESULT_UNKNOWN;
- 			}
- 		}
-+#endif
- 	}
- 
-+	yaffs_UnpackTags2TagsPart(t, &pt->t);
-+
-+	t->eccResult = eccResult;
-+
- 	yaffs_DumpPackedTags2(pt);
- 	yaffs_DumpTags2(t);
- 
- }
-+
---- a/fs/yaffs2/yaffs_packedtags2.h
-+++ b/fs/yaffs2/yaffs_packedtags2.h
-@@ -33,6 +33,11 @@ typedef struct {
- 	yaffs_ECCOther ecc;
- } yaffs_PackedTags2;
- 
--void yaffs_PackTags2(yaffs_PackedTags2 * pt, const yaffs_ExtendedTags * t);
--void yaffs_UnpackTags2(yaffs_ExtendedTags * t, yaffs_PackedTags2 * pt);
-+/* Full packed tags with ECC, used for oob tags */
-+void yaffs_PackTags2(yaffs_PackedTags2 *pt, const yaffs_ExtendedTags *t);
-+void yaffs_UnpackTags2(yaffs_ExtendedTags *t, yaffs_PackedTags2 *pt);
-+
-+/* Only the tags part (no ECC for use with inband tags */
-+void yaffs_PackTags2TagsPart(yaffs_PackedTags2TagsPart *pt, const yaffs_ExtendedTags *t);
-+void yaffs_UnpackTags2TagsPart(yaffs_ExtendedTags *t, yaffs_PackedTags2TagsPart *pt);
- #endif
---- a/fs/yaffs2/yaffs_qsort.c
-+++ b/fs/yaffs2/yaffs_qsort.c
-@@ -28,12 +28,12 @@
-  */
- 
- #include "yportenv.h"
--//#include <linux/string.h>
-+/* #include <linux/string.h> */
- 
- /*
-  * Qsort routine from Bentley & McIlroy's "Engineering a Sort Function".
-  */
--#define swapcode(TYPE, parmi, parmj, n) { 		\
-+#define swapcode(TYPE, parmi, parmj, n) do { 		\
- 	long i = (n) / sizeof (TYPE); 			\
- 	register TYPE *pi = (TYPE *) (parmi); 		\
- 	register TYPE *pj = (TYPE *) (parmj); 		\
-@@ -41,28 +41,29 @@
- 		register TYPE	t = *pi;		\
- 		*pi++ = *pj;				\
- 		*pj++ = t;				\
--        } while (--i > 0);				\
--}
-+	} while (--i > 0);				\
-+} while (0)
- 
- #define SWAPINIT(a, es) swaptype = ((char *)a - (char *)0) % sizeof(long) || \
--	es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1;
-+	es % sizeof(long) ? 2 : es == sizeof(long) ? 0 : 1;
- 
- static __inline void
- swapfunc(char *a, char *b, int n, int swaptype)
- {
- 	if (swaptype <= 1)
--		swapcode(long, a, b, n)
-+		swapcode(long, a, b, n);
- 	else
--		swapcode(char, a, b, n)
-+		swapcode(char, a, b, n);
- }
- 
--#define swap(a, b)					\
-+#define yswap(a, b) do {					\
- 	if (swaptype == 0) {				\
- 		long t = *(long *)(a);			\
- 		*(long *)(a) = *(long *)(b);		\
- 		*(long *)(b) = t;			\
- 	} else						\
--		swapfunc(a, b, es, swaptype)
-+		swapfunc(a, b, es, swaptype);		\
-+} while (0)
- 
- #define vecswap(a, b, n) 	if ((n) > 0) swapfunc(a, b, n, swaptype)
- 
-@@ -70,12 +71,12 @@ static __inline char *
- med3(char *a, char *b, char *c, int (*cmp)(const void *, const void *))
- {
- 	return cmp(a, b) < 0 ?
--	       (cmp(b, c) < 0 ? b : (cmp(a, c) < 0 ? c : a ))
--              :(cmp(b, c) > 0 ? b : (cmp(a, c) < 0 ? a : c ));
-+		(cmp(b, c) < 0 ? b : (cmp(a, c) < 0 ? c : a))
-+		: (cmp(b, c) > 0 ? b : (cmp(a, c) < 0 ? a : c));
- }
- 
- #ifndef min
--#define min(a,b) (((a) < (b)) ? (a) : (b))
-+#define min(a, b) (((a) < (b)) ? (a) : (b))
- #endif
- 
- void
-@@ -92,7 +93,7 @@ loop:	SWAPINIT(a, es);
- 		for (pm = (char *)a + es; pm < (char *) a + n * es; pm += es)
- 			for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
- 			     pl -= es)
--				swap(pl, pl - es);
-+				yswap(pl, pl - es);
- 		return;
- 	}
- 	pm = (char *)a + (n / 2) * es;
-@@ -107,7 +108,7 @@ loop:	SWAPINIT(a, es);
- 		}
- 		pm = med3(pl, pm, pn, cmp);
- 	}
--	swap(a, pm);
-+	yswap(a, pm);
- 	pa = pb = (char *)a + es;
- 
- 	pc = pd = (char *)a + (n - 1) * es;
-@@ -115,7 +116,7 @@ loop:	SWAPINIT(a, es);
- 		while (pb <= pc && (r = cmp(pb, a)) <= 0) {
- 			if (r == 0) {
- 				swap_cnt = 1;
--				swap(pa, pb);
-+				yswap(pa, pb);
- 				pa += es;
- 			}
- 			pb += es;
-@@ -123,14 +124,14 @@ loop:	SWAPINIT(a, es);
- 		while (pb <= pc && (r = cmp(pc, a)) >= 0) {
- 			if (r == 0) {
- 				swap_cnt = 1;
--				swap(pc, pd);
-+				yswap(pc, pd);
- 				pd -= es;
- 			}
- 			pc -= es;
- 		}
- 		if (pb > pc)
- 			break;
--		swap(pb, pc);
-+		yswap(pb, pc);
- 		swap_cnt = 1;
- 		pb += es;
- 		pc -= es;
-@@ -139,7 +140,7 @@ loop:	SWAPINIT(a, es);
- 		for (pm = (char *) a + es; pm < (char *) a + n * es; pm += es)
- 			for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
- 			     pl -= es)
--				swap(pl, pl - es);
-+				yswap(pl, pl - es);
- 		return;
- 	}
- 
-@@ -148,9 +149,11 @@ loop:	SWAPINIT(a, es);
- 	vecswap(a, pb - r, r);
- 	r = min((long)(pd - pc), (long)(pn - pd - es));
- 	vecswap(pb, pn - r, r);
--	if ((r = pb - pa) > es)
-+	r = pb - pa;
-+	if (r > es)
- 		yaffs_qsort(a, r / es, es, cmp);
--	if ((r = pd - pc) > es) {
-+	r = pd - pc;
-+	if (r > es) {
- 		/* Iterate rather than recurse to save stack space */
- 		a = pn - r;
- 		n = r / es;
---- a/fs/yaffs2/yaffs_qsort.h
-+++ b/fs/yaffs2/yaffs_qsort.h
-@@ -17,7 +17,7 @@
- #ifndef __YAFFS_QSORT_H__
- #define __YAFFS_QSORT_H__
- 
--extern void yaffs_qsort (void *const base, size_t total_elems, size_t size,
--                   int (*cmp)(const void *, const void *));
-+extern void yaffs_qsort(void *const base, size_t total_elems, size_t size,
-+			int (*cmp)(const void *, const void *));
- 
- #endif
---- a/fs/yaffs2/yaffs_tagscompat.c
-+++ b/fs/yaffs2/yaffs_tagscompat.c
-@@ -14,16 +14,17 @@
- #include "yaffs_guts.h"
- #include "yaffs_tagscompat.h"
- #include "yaffs_ecc.h"
-+#include "yaffs_getblockinfo.h"
- 
--static void yaffs_HandleReadDataError(yaffs_Device * dev, int chunkInNAND);
-+static void yaffs_HandleReadDataError(yaffs_Device *dev, int chunkInNAND);
- #ifdef NOTYET
--static void yaffs_CheckWrittenBlock(yaffs_Device * dev, int chunkInNAND);
--static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
--				     const __u8 * data,
--				     const yaffs_Spare * spare);
--static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
--				    const yaffs_Spare * spare);
--static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND);
-+static void yaffs_CheckWrittenBlock(yaffs_Device *dev, int chunkInNAND);
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+				     const __u8 *data,
-+				     const yaffs_Spare *spare);
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+				    const yaffs_Spare *spare);
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND);
- #endif
- 
- static const char yaffs_countBitsTable[256] = {
-@@ -54,13 +55,13 @@ int yaffs_CountBits(__u8 x)
- 
- /********** Tags ECC calculations  *********/
- 
--void yaffs_CalcECC(const __u8 * data, yaffs_Spare * spare)
-+void yaffs_CalcECC(const __u8 *data, yaffs_Spare *spare)
- {
- 	yaffs_ECCCalculate(data, spare->ecc1);
- 	yaffs_ECCCalculate(&data[256], spare->ecc2);
- }
- 
--void yaffs_CalcTagsECC(yaffs_Tags * tags)
-+void yaffs_CalcTagsECC(yaffs_Tags *tags)
- {
- 	/* Calculate an ecc */
- 
-@@ -74,9 +75,8 @@ void yaffs_CalcTagsECC(yaffs_Tags * tags
- 	for (i = 0; i < 8; i++) {
- 		for (j = 1; j & 0xff; j <<= 1) {
- 			bit++;
--			if (b[i] & j) {
-+			if (b[i] & j)
- 				ecc ^= bit;
--			}
- 		}
- 	}
- 
-@@ -84,7 +84,7 @@ void yaffs_CalcTagsECC(yaffs_Tags * tags
- 
- }
- 
--int yaffs_CheckECCOnTags(yaffs_Tags * tags)
-+int yaffs_CheckECCOnTags(yaffs_Tags *tags)
- {
- 	unsigned ecc = tags->ecc;
- 
-@@ -115,8 +115,8 @@ int yaffs_CheckECCOnTags(yaffs_Tags * ta
- 
- /********** Tags **********/
- 
--static void yaffs_LoadTagsIntoSpare(yaffs_Spare * sparePtr,
--				    yaffs_Tags * tagsPtr)
-+static void yaffs_LoadTagsIntoSpare(yaffs_Spare *sparePtr,
-+				yaffs_Tags *tagsPtr)
- {
- 	yaffs_TagsUnion *tu = (yaffs_TagsUnion *) tagsPtr;
- 
-@@ -132,8 +132,8 @@ static void yaffs_LoadTagsIntoSpare(yaff
- 	sparePtr->tagByte7 = tu->asBytes[7];
- }
- 
--static void yaffs_GetTagsFromSpare(yaffs_Device * dev, yaffs_Spare * sparePtr,
--				   yaffs_Tags * tagsPtr)
-+static void yaffs_GetTagsFromSpare(yaffs_Device *dev, yaffs_Spare *sparePtr,
-+				yaffs_Tags *tagsPtr)
- {
- 	yaffs_TagsUnion *tu = (yaffs_TagsUnion *) tagsPtr;
- 	int result;
-@@ -148,21 +148,20 @@ static void yaffs_GetTagsFromSpare(yaffs
- 	tu->asBytes[7] = sparePtr->tagByte7;
- 
- 	result = yaffs_CheckECCOnTags(tagsPtr);
--	if (result > 0) {
-+	if (result > 0)
- 		dev->tagsEccFixed++;
--	} else if (result < 0) {
-+	else if (result < 0)
- 		dev->tagsEccUnfixed++;
--	}
- }
- 
--static void yaffs_SpareInitialise(yaffs_Spare * spare)
-+static void yaffs_SpareInitialise(yaffs_Spare *spare)
- {
- 	memset(spare, 0xFF, sizeof(yaffs_Spare));
- }
- 
- static int yaffs_WriteChunkToNAND(struct yaffs_DeviceStruct *dev,
--				  int chunkInNAND, const __u8 * data,
--				  yaffs_Spare * spare)
-+				int chunkInNAND, const __u8 *data,
-+				yaffs_Spare *spare)
- {
- 	if (chunkInNAND < dev->startBlock * dev->nChunksPerBlock) {
- 		T(YAFFS_TRACE_ERROR,
-@@ -177,9 +176,9 @@ static int yaffs_WriteChunkToNAND(struct
- 
- static int yaffs_ReadChunkFromNAND(struct yaffs_DeviceStruct *dev,
- 				   int chunkInNAND,
--				   __u8 * data,
--				   yaffs_Spare * spare,
--				   yaffs_ECCResult * eccResult,
-+				   __u8 *data,
-+				   yaffs_Spare *spare,
-+				   yaffs_ECCResult *eccResult,
- 				   int doErrorCorrection)
- {
- 	int retVal;
-@@ -252,9 +251,11 @@ static int yaffs_ReadChunkFromNAND(struc
- 		/* Must allocate enough memory for spare+2*sizeof(int) */
- 		/* for ecc results from device. */
- 		struct yaffs_NANDSpare nspare;
--		retVal =
--		    dev->readChunkFromNAND(dev, chunkInNAND, data,
--					   (yaffs_Spare *) & nspare);
-+
-+		memset(&nspare, 0, sizeof(nspare));
-+
-+		retVal = dev->readChunkFromNAND(dev, chunkInNAND, data,
-+					(yaffs_Spare *) &nspare);
- 		memcpy(spare, &nspare, sizeof(yaffs_Spare));
- 		if (data && doErrorCorrection) {
- 			if (nspare.eccres1 > 0) {
-@@ -302,8 +303,7 @@ static int yaffs_ReadChunkFromNAND(struc
- static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
- 				  int chunkInNAND)
- {
--
--	static int init = 0;
-+	static int init;
- 	static __u8 cmpbuf[YAFFS_BYTES_PER_CHUNK];
- 	static __u8 data[YAFFS_BYTES_PER_CHUNK];
- 	/* Might as well always allocate the larger size for */
-@@ -331,12 +331,12 @@ static int yaffs_CheckChunkErased(struct
-  * Functions for robustisizing
-  */
- 
--static void yaffs_HandleReadDataError(yaffs_Device * dev, int chunkInNAND)
-+static void yaffs_HandleReadDataError(yaffs_Device *dev, int chunkInNAND)
- {
- 	int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
- 
- 	/* Mark the block for retirement */
--	yaffs_GetBlockInfo(dev, blockInNAND)->needsRetiring = 1;
-+	yaffs_GetBlockInfo(dev, blockInNAND + dev->blockOffset)->needsRetiring = 1;
- 	T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
- 	  (TSTR("**>>Block %d marked for retirement" TENDSTR), blockInNAND));
- 
-@@ -348,22 +348,22 @@ static void yaffs_HandleReadDataError(ya
- }
- 
- #ifdef NOTYET
--static void yaffs_CheckWrittenBlock(yaffs_Device * dev, int chunkInNAND)
-+static void yaffs_CheckWrittenBlock(yaffs_Device *dev, int chunkInNAND)
- {
- }
- 
--static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
--				     const __u8 * data,
--				     const yaffs_Spare * spare)
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+				     const __u8 *data,
-+				     const yaffs_Spare *spare)
- {
- }
- 
--static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
--				    const yaffs_Spare * spare)
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+				    const yaffs_Spare *spare)
- {
- }
- 
--static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND)
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND)
- {
- 	int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
- 
-@@ -373,8 +373,8 @@ static void yaffs_HandleWriteChunkError(
- 	yaffs_DeleteChunk(dev, chunkInNAND, 1, __LINE__);
- }
- 
--static int yaffs_VerifyCompare(const __u8 * d0, const __u8 * d1,
--			       const yaffs_Spare * s0, const yaffs_Spare * s1)
-+static int yaffs_VerifyCompare(const __u8 *d0, const __u8 *d1,
-+			       const yaffs_Spare *s0, const yaffs_Spare *s1)
- {
- 
- 	if (memcmp(d0, d1, YAFFS_BYTES_PER_CHUNK) != 0 ||
-@@ -398,28 +398,35 @@ static int yaffs_VerifyCompare(const __u
- }
- #endif				/* NOTYET */
- 
--int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device * dev,
--						    int chunkInNAND,
--						    const __u8 * data,
--						    const yaffs_ExtendedTags *
--						    eTags)
-+int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device *dev,
-+						int chunkInNAND,
-+						const __u8 *data,
-+						const yaffs_ExtendedTags *eTags)
- {
- 	yaffs_Spare spare;
- 	yaffs_Tags tags;
- 
- 	yaffs_SpareInitialise(&spare);
- 
--	if (eTags->chunkDeleted) {
-+	if (eTags->chunkDeleted)
- 		spare.pageStatus = 0;
--	} else {
-+	else {
- 		tags.objectId = eTags->objectId;
- 		tags.chunkId = eTags->chunkId;
--		tags.byteCount = eTags->byteCount;
-+
-+		tags.byteCountLSB = eTags->byteCount & 0x3ff;
-+
-+		if (dev->nDataBytesPerChunk >= 1024)
-+			tags.byteCountMSB = (eTags->byteCount >> 10) & 3;
-+		else
-+			tags.byteCountMSB = 3;
-+
-+
- 		tags.serialNumber = eTags->serialNumber;
- 
--		if (!dev->useNANDECC && data) {
-+		if (!dev->useNANDECC && data)
- 			yaffs_CalcECC(data, &spare);
--		}
-+
- 		yaffs_LoadTagsIntoSpare(&spare, &tags);
- 
- 	}
-@@ -427,15 +434,15 @@ int yaffs_TagsCompatabilityWriteChunkWit
- 	return yaffs_WriteChunkToNAND(dev, chunkInNAND, data, &spare);
- }
- 
--int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device * dev,
-+int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device *dev,
- 						     int chunkInNAND,
--						     __u8 * data,
--						     yaffs_ExtendedTags * eTags)
-+						     __u8 *data,
-+						     yaffs_ExtendedTags *eTags)
- {
- 
- 	yaffs_Spare spare;
- 	yaffs_Tags tags;
--	yaffs_ECCResult eccResult;
-+	yaffs_ECCResult eccResult = YAFFS_ECC_RESULT_UNKNOWN;
- 
- 	static yaffs_Spare spareFF;
- 	static int init;
-@@ -466,7 +473,11 @@ int yaffs_TagsCompatabilityReadChunkWith
- 
- 				eTags->objectId = tags.objectId;
- 				eTags->chunkId = tags.chunkId;
--				eTags->byteCount = tags.byteCount;
-+				eTags->byteCount = tags.byteCountLSB;
-+
-+				if (dev->nDataBytesPerChunk >= 1024)
-+					eTags->byteCount |= (((unsigned) tags.byteCountMSB) << 10);
-+
- 				eTags->serialNumber = tags.serialNumber;
- 			}
- 		}
-@@ -497,9 +508,9 @@ int yaffs_TagsCompatabilityMarkNANDBlock
- }
- 
- int yaffs_TagsCompatabilityQueryNANDBlock(struct yaffs_DeviceStruct *dev,
--					  int blockNo, yaffs_BlockState *
--					  state,
--					  int *sequenceNumber)
-+					  int blockNo,
-+					  yaffs_BlockState *state,
-+					  __u32 *sequenceNumber)
- {
- 
- 	yaffs_Spare spare0, spare1;
---- a/fs/yaffs2/yaffs_tagscompat.h
-+++ b/fs/yaffs2/yaffs_tagscompat.h
-@@ -17,24 +17,23 @@
- #define __YAFFS_TAGSCOMPAT_H__
- 
- #include "yaffs_guts.h"
--int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device * dev,
--						    int chunkInNAND,
--						    const __u8 * data,
--						    const yaffs_ExtendedTags *
--						    tags);
--int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device * dev,
--						     int chunkInNAND,
--						     __u8 * data,
--						     yaffs_ExtendedTags *
--						     tags);
-+int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device *dev,
-+						int chunkInNAND,
-+						const __u8 *data,
-+						const yaffs_ExtendedTags *tags);
-+int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device *dev,
-+						int chunkInNAND,
-+						__u8 *data,
-+						yaffs_ExtendedTags *tags);
- int yaffs_TagsCompatabilityMarkNANDBlockBad(struct yaffs_DeviceStruct *dev,
- 					    int blockNo);
- int yaffs_TagsCompatabilityQueryNANDBlock(struct yaffs_DeviceStruct *dev,
--					  int blockNo, yaffs_BlockState *
--					  state, int *sequenceNumber);
-+					  int blockNo,
-+					  yaffs_BlockState *state,
-+					  __u32 *sequenceNumber);
- 
--void yaffs_CalcTagsECC(yaffs_Tags * tags);
--int yaffs_CheckECCOnTags(yaffs_Tags * tags);
-+void yaffs_CalcTagsECC(yaffs_Tags *tags);
-+int yaffs_CheckECCOnTags(yaffs_Tags *tags);
- int yaffs_CountBits(__u8 byte);
- 
- #endif
---- a/fs/yaffs2/yaffs_tagsvalidity.c
-+++ b/fs/yaffs2/yaffs_tagsvalidity.c
-@@ -13,14 +13,14 @@
- 
- #include "yaffs_tagsvalidity.h"
- 
--void yaffs_InitialiseTags(yaffs_ExtendedTags * tags)
-+void yaffs_InitialiseTags(yaffs_ExtendedTags *tags)
- {
- 	memset(tags, 0, sizeof(yaffs_ExtendedTags));
- 	tags->validMarker0 = 0xAAAAAAAA;
- 	tags->validMarker1 = 0x55555555;
- }
- 
--int yaffs_ValidateTags(yaffs_ExtendedTags * tags)
-+int yaffs_ValidateTags(yaffs_ExtendedTags *tags)
- {
- 	return (tags->validMarker0 == 0xAAAAAAAA &&
- 		tags->validMarker1 == 0x55555555);
---- a/fs/yaffs2/yaffs_tagsvalidity.h
-+++ b/fs/yaffs2/yaffs_tagsvalidity.h
-@@ -19,6 +19,6 @@
- 
- #include "yaffs_guts.h"
- 
--void yaffs_InitialiseTags(yaffs_ExtendedTags * tags);
--int yaffs_ValidateTags(yaffs_ExtendedTags * tags);
-+void yaffs_InitialiseTags(yaffs_ExtendedTags *tags);
-+int yaffs_ValidateTags(yaffs_ExtendedTags *tags);
- #endif
---- a/fs/yaffs2/yportenv.h
-+++ b/fs/yaffs2/yportenv.h
-@@ -17,17 +17,28 @@
- #ifndef __YPORTENV_H__
- #define __YPORTENV_H__
- 
-+/*
-+ * Define the MTD version in terms of Linux Kernel versions
-+ * This allows yaffs to be used independantly of the kernel
-+ * as well as with it.
-+ */
-+
-+#define MTD_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c))
-+
- #if defined CONFIG_YAFFS_WINCE
- 
- #include "ywinceenv.h"
- 
--#elif  defined __KERNEL__
-+#elif defined __KERNEL__
- 
- #include "moduleconfig.h"
- 
- /* Linux kernel */
-+
- #include <linux/version.h>
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
-+#define MTD_VERSION_CODE LINUX_VERSION_CODE
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
- #include <linux/config.h>
- #endif
- #include <linux/kernel.h>
-@@ -40,12 +51,13 @@
- #define YCHAR char
- #define YUCHAR unsigned char
- #define _Y(x)     x
--#define yaffs_strcpy(a,b)    strcpy(a,b)
--#define yaffs_strncpy(a,b,c) strncpy(a,b,c)
--#define yaffs_strncmp(a,b,c) strncmp(a,b,c)
--#define yaffs_strlen(s)	     strlen(s)
--#define yaffs_sprintf	     sprintf
--#define yaffs_toupper(a)     toupper(a)
-+#define yaffs_strcat(a, b)     strcat(a, b)
-+#define yaffs_strcpy(a, b)     strcpy(a, b)
-+#define yaffs_strncpy(a, b, c) strncpy(a, b, c)
-+#define yaffs_strncmp(a, b, c) strncmp(a, b, c)
-+#define yaffs_strlen(s)	       strlen(s)
-+#define yaffs_sprintf	       sprintf
-+#define yaffs_toupper(a)       toupper(a)
- 
- #define Y_INLINE inline
- 
-@@ -53,19 +65,19 @@
- #define YAFFS_LOSTNFOUND_PREFIX		"obj"
- 
- /* #define YPRINTF(x) printk x */
--#define YMALLOC(x) kmalloc(x,GFP_KERNEL)
-+#define YMALLOC(x) kmalloc(x, GFP_NOFS)
- #define YFREE(x)   kfree(x)
- #define YMALLOC_ALT(x) vmalloc(x)
- #define YFREE_ALT(x)   vfree(x)
- #define YMALLOC_DMA(x) YMALLOC(x)
- 
--// KR - added for use in scan so processes aren't blocked indefinitely.
-+/* KR - added for use in scan so processes aren't blocked indefinitely. */
- #define YYIELD() schedule()
- 
- #define YAFFS_ROOT_MODE			0666
- #define YAFFS_LOSTNFOUND_MODE		0666
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- #define Y_CURRENT_TIME CURRENT_TIME.tv_sec
- #define Y_TIME_CONVERT(x) (x).tv_sec
- #else
-@@ -73,11 +85,12 @@
- #define Y_TIME_CONVERT(x) (x)
- #endif
- 
--#define yaffs_SumCompare(x,y) ((x) == (y))
--#define yaffs_strcmp(a,b) strcmp(a,b)
-+#define yaffs_SumCompare(x, y) ((x) == (y))
-+#define yaffs_strcmp(a, b) strcmp(a, b)
- 
- #define TENDSTR "\n"
- #define TSTR(x) KERN_WARNING x
-+#define TCONT(x) x
- #define TOUT(p) printk p
- 
- #define yaffs_trace(mask, fmt, args...) \
-@@ -90,6 +103,8 @@
- 
- #elif defined CONFIG_YAFFS_DIRECT
- 
-+#define MTD_VERSION_CODE MTD_VERSION(2, 6, 22)
-+
- /* Direct interface */
- #include "ydirectenv.h"
- 
-@@ -111,11 +126,12 @@
- #define YCHAR char
- #define YUCHAR unsigned char
- #define _Y(x)     x
--#define yaffs_strcpy(a,b)    strcpy(a,b)
--#define yaffs_strncpy(a,b,c) strncpy(a,b,c)
--#define yaffs_strlen(s)	     strlen(s)
--#define yaffs_sprintf	     sprintf
--#define yaffs_toupper(a)     toupper(a)
-+#define yaffs_strcat(a, b)     strcat(a, b)
-+#define yaffs_strcpy(a, b)     strcpy(a, b)
-+#define yaffs_strncpy(a, b, c) strncpy(a, b, c)
-+#define yaffs_strlen(s)	       strlen(s)
-+#define yaffs_sprintf	       sprintf
-+#define yaffs_toupper(a)       toupper(a)
- 
- #define Y_INLINE inline
- 
-@@ -133,8 +149,8 @@
- #define YAFFS_ROOT_MODE				0666
- #define YAFFS_LOSTNFOUND_MODE		0666
- 
--#define yaffs_SumCompare(x,y) ((x) == (y))
--#define yaffs_strcmp(a,b) strcmp(a,b)
-+#define yaffs_SumCompare(x, y) ((x) == (y))
-+#define yaffs_strcmp(a, b) strcmp(a, b)
- 
- #else
- /* Should have specified a configuration type */
-@@ -178,10 +194,10 @@ extern unsigned int yaffs_wr_attempts;
- #define YAFFS_TRACE_ALWAYS		0xF0000000
- 
- 
--#define T(mask,p) do{ if((mask) & (yaffs_traceMask | YAFFS_TRACE_ALWAYS)) TOUT(p);} while(0)
-+#define T(mask, p) do { if ((mask) & (yaffs_traceMask | YAFFS_TRACE_ALWAYS)) TOUT(p); } while (0)
- 
--#ifndef CONFIG_YAFFS_WINCE
--#define YBUG() T(YAFFS_TRACE_BUG,(TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR),__LINE__))
-+#ifndef YBUG
-+#define YBUG() do {T(YAFFS_TRACE_BUG, (TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR), __LINE__)); } while (0)
- #endif
- 
- #endif
diff --git a/target/linux/generic-2.6/patches-2.6.33/600-phy_extension.patch b/target/linux/generic-2.6/patches-2.6.33/600-phy_extension.patch
deleted file mode 100644
index 966a812c0..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/600-phy_extension.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- a/drivers/net/phy/phy.c
-+++ b/drivers/net/phy/phy.c
-@@ -299,6 +299,50 @@ int phy_ethtool_gset(struct phy_device *
- }
- EXPORT_SYMBOL(phy_ethtool_gset);
- 
-+int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr)
-+{
-+	u32 cmd;
-+	int tmp;
-+	struct ethtool_cmd ecmd = { ETHTOOL_GSET };
-+	struct ethtool_value edata = { ETHTOOL_GLINK };
-+
-+	if (get_user(cmd, (u32 *) useraddr))
-+		return -EFAULT;
-+
-+	switch (cmd) {
-+	case ETHTOOL_GSET:
-+		phy_ethtool_gset(phydev, &ecmd);
-+		if (copy_to_user(useraddr, &ecmd, sizeof(ecmd)))
-+			return -EFAULT;
-+		return 0;
-+
-+	case ETHTOOL_SSET:
-+		if (copy_from_user(&ecmd, useraddr, sizeof(ecmd)))
-+			return -EFAULT;
-+		return phy_ethtool_sset(phydev, &ecmd);
-+
-+	case ETHTOOL_NWAY_RST:
-+		/* if autoneg is off, it's an error */
-+		tmp = phy_read(phydev, MII_BMCR);
-+		if (tmp & BMCR_ANENABLE) {
-+			tmp |= (BMCR_ANRESTART);
-+			phy_write(phydev, MII_BMCR, tmp);
-+			return 0;
-+		}
-+		return -EINVAL;
-+
-+	case ETHTOOL_GLINK:
-+		edata.data = (phy_read(phydev,
-+				MII_BMSR) & BMSR_LSTATUS) ? 1 : 0;
-+		if (copy_to_user(useraddr, &edata, sizeof(edata)))
-+			return -EFAULT;
-+		return 0;
-+	}
-+
-+	return -EOPNOTSUPP;
-+}
-+EXPORT_SYMBOL(phy_ethtool_ioctl);
-+
- /**
-  * phy_mii_ioctl - generic PHY MII ioctl interface
-  * @phydev: the phy_device struct
-@@ -352,7 +396,7 @@ int phy_mii_ioctl(struct phy_device *phy
- 		}
- 
- 		phy_write(phydev, mii_data->reg_num, val);
--		
-+
- 		if (mii_data->reg_num == MII_BMCR &&
- 		    val & BMCR_RESET &&
- 		    phydev->drv->config_init) {
-@@ -466,7 +510,7 @@ static void phy_force_reduction(struct p
- 	int idx;
- 
- 	idx = phy_find_setting(phydev->speed, phydev->duplex);
--	
-+
- 	idx++;
- 
- 	idx = phy_find_valid(idx, phydev->supported);
---- a/include/linux/phy.h
-+++ b/include/linux/phy.h
-@@ -491,6 +491,7 @@ void phy_start_machine(struct phy_device
- void phy_stop_machine(struct phy_device *phydev);
- int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
- int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);
-+int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr);
- int phy_mii_ioctl(struct phy_device *phydev,
- 		struct mii_ioctl_data *mii_data, int cmd);
- int phy_start_interrupts(struct phy_device *phydev);
diff --git a/target/linux/generic-2.6/patches-2.6.33/620-phy_adm6996.patch b/target/linux/generic-2.6/patches-2.6.33/620-phy_adm6996.patch
deleted file mode 100644
index b3e469a8d..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/620-phy_adm6996.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -88,6 +88,11 @@ config LSI_ET1011C_PHY
- 	---help---
- 	  Supports the LSI ET1011C PHY.
- 
-+config ADM6996_PHY
-+	tristate "Driver for ADM6996 switches"
-+	---help---
-+	  Currently supports the ADM6996F switch
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -13,6 +13,7 @@ obj-$(CONFIG_VITESSE_PHY)	+= vitesse.o
- obj-$(CONFIG_BROADCOM_PHY)	+= broadcom.o
- obj-$(CONFIG_BCM63XX_PHY)	+= bcm63xx.o
- obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
-+obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/target/linux/generic-2.6/patches-2.6.33/630-phy_packets.patch b/target/linux/generic-2.6/patches-2.6.33/630-phy_packets.patch
deleted file mode 100644
index 9c0f24aa1..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/630-phy_packets.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/drivers/net/phy/phy_device.c
-+++ b/drivers/net/phy/phy_device.c
-@@ -146,6 +146,18 @@ int phy_scan_fixups(struct phy_device *p
- }
- EXPORT_SYMBOL(phy_scan_fixups);
- 
-+static int generic_receive_skb(struct sk_buff *skb)
-+{
-+	skb->protocol = eth_type_trans(skb, skb->dev);
-+	return netif_receive_skb(skb);
-+}
-+
-+static int generic_rx(struct sk_buff *skb)
-+{
-+	skb->protocol = eth_type_trans(skb, skb->dev);
-+	return netif_rx(skb);
-+}
-+
- struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)
- {
- 	struct phy_device *dev;
-@@ -175,6 +187,8 @@ struct phy_device* phy_device_create(str
- 	dev_set_name(&dev->dev, PHY_ID_FMT, bus->id, addr);
- 
- 	dev->state = PHY_DOWN;
-+	dev->netif_receive_skb = &generic_receive_skb;
-+	dev->netif_rx = &generic_rx;
- 
- 	mutex_init(&dev->lock);
- 	INIT_DELAYED_WORK(&dev->state_queue, phy_state_machine);
---- a/include/linux/phy.h
-+++ b/include/linux/phy.h
-@@ -325,6 +325,20 @@ struct phy_device {
- 	void (*adjust_link)(struct net_device *dev);
- 
- 	void (*adjust_state)(struct net_device *dev);
-+
-+	/*
-+	 * By default these point to the original functions
-+	 * with the same name. adding them to the phy_device
-+	 * allows the phy driver to override them for packet
-+	 * mangling if the ethernet driver supports it
-+	 * This is required to support some really horrible
-+	 * switches such as the Marvell 88E6060
-+	 */
-+	int (*netif_receive_skb)(struct sk_buff *skb);
-+	int (*netif_rx)(struct sk_buff *skb);
-+
-+	/* alignment offset for packets */
-+	int pkt_align;
- };
- #define to_phy_device(d) container_of(d, struct phy_device, dev)
- 
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -844,6 +844,7 @@ struct net_device {
- 	void			*ax25_ptr;	/* AX.25 specific data */
- 	struct wireless_dev	*ieee80211_ptr;	/* IEEE 802.11 specific data,
- 						   assign before registering */
-+	void			*phy_ptr; /* PHY device specific data */
- 
- /*
-  * Cache line mostly used on receive path (including eth_type_trans())
diff --git a/target/linux/generic-2.6/patches-2.6.33/650-swconfig.patch b/target/linux/generic-2.6/patches-2.6.33/650-swconfig.patch
deleted file mode 100644
index 6825037ce..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/650-swconfig.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -13,6 +13,12 @@ menuconfig PHYLIB
- 
- if PHYLIB
- 
-+config SWCONFIG
-+	tristate "Switch configuration API"
-+	---help---
-+	  Switch configuration API using netlink. This allows
-+	  you to configure the VLAN features of certain switches.
-+
- comment "MII PHY device drivers"
- 
- config MARVELL_PHY
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -3,6 +3,7 @@
- libphy-objs			:= phy.o phy_device.o mdio_bus.o
- 
- obj-$(CONFIG_PHYLIB)		+= libphy.o
-+obj-$(CONFIG_SWCONFIG)		+= swconfig.o
- obj-$(CONFIG_MARVELL_PHY)	+= marvell.o
- obj-$(CONFIG_DAVICOM_PHY)	+= davicom.o
- obj-$(CONFIG_CICADA_PHY)	+= cicada.o
diff --git a/target/linux/generic-2.6/patches-2.6.33/651-swconfig-2.6.32-fix.patch b/target/linux/generic-2.6/patches-2.6.33/651-swconfig-2.6.32-fix.patch
deleted file mode 100644
index bc8f8fcff..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/651-swconfig-2.6.32-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/drivers/net/phy/swconfig.c
-+++ b/drivers/net/phy/swconfig.c
-@@ -335,7 +335,7 @@ swconfig_send_multipart(struct swconfig_
- 			if (cb->close(cb, arg) < 0)
- 				goto error;
- 		}
--		err = genlmsg_unicast(cb->msg, info->snd_pid);
-+		err = genlmsg_reply(cb->msg, info);
- 		cb->msg = NULL;
- 		if (err < 0)
- 			goto error;
-@@ -419,7 +419,7 @@ swconfig_list_attrs(struct sk_buff *skb,
- 	if (!cb.msg)
- 		return 0;
- 
--	return genlmsg_unicast(cb.msg, info->snd_pid);
-+	return genlmsg_reply(cb.msg, info);
- 
- error:
- 	if (cb.msg)
-@@ -728,7 +728,7 @@ swconfig_get_attr(struct sk_buff *skb, s
- 		goto nla_put_failure;
- 
- 	swconfig_put_dev(dev);
--	return genlmsg_unicast(msg, info->snd_pid);
-+	return genlmsg_reply(msg, info);
- 
- nla_put_failure:
- 	if (msg)
diff --git a/target/linux/generic-2.6/patches-2.6.33/660-phy_mvswitch.patch b/target/linux/generic-2.6/patches-2.6.33/660-phy_mvswitch.patch
deleted file mode 100644
index 36551fd57..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/660-phy_mvswitch.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -99,6 +99,9 @@ config ADM6996_PHY
- 	---help---
- 	  Currently supports the ADM6996F switch
- 
-+config MVSWITCH_PHY
-+	tristate "Driver for Marvell 88E6060 switches"
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -15,6 +15,7 @@ obj-$(CONFIG_BROADCOM_PHY)	+= broadcom.o
- obj-$(CONFIG_BCM63XX_PHY)	+= bcm63xx.o
- obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
- obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
-+obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/target/linux/generic-2.6/patches-2.6.33/670-phy_ip175c.patch b/target/linux/generic-2.6/patches-2.6.33/670-phy_ip175c.patch
deleted file mode 100644
index 862868c8d..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/670-phy_ip175c.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -102,6 +102,10 @@ config ADM6996_PHY
- config MVSWITCH_PHY
- 	tristate "Driver for Marvell 88E6060 switches"
- 
-+config IP175C_PHY
-+	tristate "Driver for IC+ IP175C/IP178C switches"
-+	select SWCONFIG
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -16,6 +16,7 @@ obj-$(CONFIG_BCM63XX_PHY)	+= bcm63xx.o
- obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
- obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
- obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
-+obj-$(CONFIG_IP175C_PHY)	+= ip175c.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/target/linux/generic-2.6/patches-2.6.33/680-phy_ar8216.patch b/target/linux/generic-2.6/patches-2.6.33/680-phy_ar8216.patch
deleted file mode 100644
index 00372aae0..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/680-phy_ar8216.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -106,6 +106,10 @@ config IP175C_PHY
- 	tristate "Driver for IC+ IP175C/IP178C switches"
- 	select SWCONFIG
- 
-+config AR8216_PHY
-+	tristate "Driver for Atheros AR8216 switches"
-+	select SWCONFIG
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -18,6 +18,7 @@ obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
- obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
- obj-$(CONFIG_IP175C_PHY)	+= ip175c.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
-+obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
- obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/target/linux/generic-2.6/patches-2.6.33/690-phy_rtl8306.patch b/target/linux/generic-2.6/patches-2.6.33/690-phy_rtl8306.patch
deleted file mode 100644
index a4793cb63..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/690-phy_rtl8306.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -110,6 +110,10 @@ config AR8216_PHY
- 	tristate "Driver for Atheros AR8216 switches"
- 	select SWCONFIG
- 
-+config RTL8306_PHY
-+	tristate "Driver for Realtek RTL8306S switches"
-+	select SWCONFIG
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -19,6 +19,7 @@ obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
- obj-$(CONFIG_IP175C_PHY)	+= ip175c.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
-+obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
- obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/target/linux/generic-2.6/patches-2.6.33/691-phy_rtl8366.patch b/target/linux/generic-2.6/patches-2.6.33/691-phy_rtl8366.patch
deleted file mode 100644
index 0963bd81b..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/691-phy_rtl8366.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -152,4 +152,29 @@ config MDIO_OCTEON
- 
- 	  If in doubt, say Y.
- 
-+config RTL8366_SMI
-+	tristate "Driver for the RTL8366 SMI interface"
-+	depends on GENERIC_GPIO
-+	---help---
-+	  This module implements the SMI interface protocol which is used
-+	  by some RTL8366 ethernet switch devices via the generic GPIO API.
-+
-+if RTL8366_SMI
-+
-+config RTL8366S_PHY
-+	tristate "Driver for the Realtek RTL8366S switch"
-+	select SWCONFIG
-+
-+config RTL8366RB_PHY
-+	tristate "Driver for the Realtek RTL8366RB switch"
-+	select SWCONFIG
-+
-+config RTL8366S_PHY_DEBUG_FS
-+	bool "RTL8366 switch driver DEBUG_FS support"
-+	depends on RTL8366S_PHY || RTL8366RB_PHY
-+	depends on DEBUG_FS
-+	default n
-+
-+endif # RTL8366_SMI
-+
- endif # PHYLIB
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -20,6 +20,9 @@ obj-$(CONFIG_IP175C_PHY)	+= ip175c.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
- obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
-+obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi.o
-+obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o
-+obj-$(CONFIG_RTL8366RB_PHY)	+= rtl8366rb.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
- obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/target/linux/generic-2.6/patches-2.6.33/700-rtc7301.patch b/target/linux/generic-2.6/patches-2.6.33/700-rtc7301.patch
deleted file mode 100644
index dae807f40..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/700-rtc7301.patch
+++ /dev/null
@@ -1,250 +0,0 @@
---- a/drivers/rtc/Kconfig
-+++ b/drivers/rtc/Kconfig
-@@ -608,6 +608,15 @@ config RTC_DRV_NUC900
- 	  If you say yes here you get support for the RTC subsystem of the
- 	  NUC910/NUC920 used in embedded systems.
- 
-+config RTC_DRV_RTC7301
-+	tristate "Epson RTC-7301 SF/DG"
-+	help
-+	  If you say Y here you will get support for the
-+	  Epson RTC-7301 SF/DG RTC chips.
-+
-+	  This driver can also be built as a module. If so, the module
-+	  will be called rtc-7301.
-+
- comment "on-CPU RTC drivers"
- 
- config RTC_DRV_OMAP
---- a/drivers/rtc/Makefile
-+++ b/drivers/rtc/Makefile
-@@ -72,6 +72,7 @@ obj-$(CONFIG_RTC_DRV_RP5C01)	+= rtc-rp5c
- obj-$(CONFIG_RTC_DRV_RS5C313)	+= rtc-rs5c313.o
- obj-$(CONFIG_RTC_DRV_RS5C348)	+= rtc-rs5c348.o
- obj-$(CONFIG_RTC_DRV_RS5C372)	+= rtc-rs5c372.o
-+obj-$(CONFIG_RTC_DRV_RTC7301)	+= rtc-rtc7301.o
- obj-$(CONFIG_RTC_DRV_RX8025)	+= rtc-rx8025.o
- obj-$(CONFIG_RTC_DRV_RX8581)	+= rtc-rx8581.o
- obj-$(CONFIG_RTC_DRV_S35390A)	+= rtc-s35390a.o
---- /dev/null
-+++ b/drivers/rtc/rtc-rtc7301.c
-@@ -0,0 +1,219 @@
-+/*
-+ * Driver for Epson RTC-7301SF/DG
-+ *
-+ * Copyright (C) 2009 Jose Vasconcellos
-+ *
-+ * 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.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/rtc.h>
-+#include <linux/platform_device.h>
-+#include <linux/io.h>
-+#include <linux/delay.h>
-+#include <linux/bcd.h>
-+
-+#define RTC_NAME "rtc7301"
-+#define RTC_VERSION "0.1"
-+
-+/* Epson RTC-7301 register addresses */
-+#define RTC7301_SEC		0x00
-+#define RTC7301_SEC10		0x01
-+#define RTC7301_MIN		0x02
-+#define RTC7301_MIN10		0x03
-+#define RTC7301_HOUR		0x04
-+#define RTC7301_HOUR10		0x05
-+#define RTC7301_WEEKDAY		0x06
-+#define RTC7301_DAY		0x07
-+#define RTC7301_DAY10		0x08
-+#define RTC7301_MON		0x09
-+#define RTC7301_MON10		0x0A
-+#define RTC7301_YEAR		0x0B
-+#define RTC7301_YEAR10		0x0C
-+#define RTC7301_YEAR100		0x0D
-+#define RTC7301_YEAR1000	0x0E
-+#define RTC7301_CTRLREG		0x0F
-+
-+static uint8_t __iomem *rtc7301_base;
-+
-+#define read_reg(offset) (readb(rtc7301_base + offset) & 0xf)
-+#define write_reg(offset, data) writeb(data, rtc7301_base + (offset))
-+
-+#define rtc7301_isbusy() (read_reg(RTC7301_CTRLREG) & 1)
-+
-+static void rtc7301_init_settings(void)
-+{
-+	int i;
-+
-+	write_reg(RTC7301_CTRLREG, 2);
-+	write_reg(RTC7301_YEAR1000, 2);
-+	udelay(122);
-+
-+	/* bank 1 */
-+	write_reg(RTC7301_CTRLREG, 6);
-+	for (i=0; i<15; i++)
-+		write_reg(i, 0);
-+
-+	/* bank 2 */
-+	write_reg(RTC7301_CTRLREG, 14);
-+	for (i=0; i<15; i++)
-+		write_reg(i, 0);
-+	write_reg(RTC7301_CTRLREG, 0);
-+}
-+
-+static int rtc7301_get_datetime(struct device *dev, struct rtc_time *dt)
-+{
-+	int cnt;
-+	uint8_t buf[16];
-+
-+	cnt = 0;
-+	while (rtc7301_isbusy()) {
-+		udelay(244);
-+		if (cnt++ > 100) {
-+			dev_err(dev, "%s: timeout error %x\n", __func__, rtc7301_base[RTC7301_CTRLREG]);
-+			return -EIO;
-+		}
-+	}
-+
-+	for (cnt=0; cnt<16; cnt++)
-+		buf[cnt] = read_reg(cnt);
-+
-+	if (buf[RTC7301_SEC10] & 8) {
-+		dev_err(dev, "%s: RTC not set\n", __func__);
-+		return -EINVAL;
-+	}
-+
-+	memset(dt, 0, sizeof(*dt));
-+
-+	dt->tm_sec =  buf[RTC7301_SEC] + buf[RTC7301_SEC10]*10;
-+	dt->tm_min =  buf[RTC7301_MIN] + buf[RTC7301_MIN10]*10;
-+	dt->tm_hour = buf[RTC7301_HOUR] + buf[RTC7301_HOUR10]*10;
-+
-+	dt->tm_mday = buf[RTC7301_DAY] + buf[RTC7301_DAY10]*10;
-+	dt->tm_mon =  buf[RTC7301_MON] + buf[RTC7301_MON10]*10 - 1;
-+	dt->tm_year = buf[RTC7301_YEAR] + buf[RTC7301_YEAR10]*10 +
-+		      buf[RTC7301_YEAR100]*100 +
-+		      ((buf[RTC7301_YEAR1000] & 3)*1000) - 1900;
-+
-+	/* the rtc device may contain illegal values on power up
-+	 * according to the data sheet. make sure they are valid.
-+	 */
-+
-+	return rtc_valid_tm(dt);
-+}
-+
-+static int rtc7301_set_datetime(struct device *dev, struct rtc_time *dt)
-+{
-+	int data;
-+
-+	data = dt->tm_year + 1900;
-+	if (data >= 2100 || data < 1900)
-+		return -EINVAL;
-+
-+	write_reg(RTC7301_CTRLREG, 2);
-+       	udelay(122);
-+
-+	data = bin2bcd(dt->tm_sec);
-+	write_reg(RTC7301_SEC, data);
-+	write_reg(RTC7301_SEC10, (data >> 4));
-+
-+	data = bin2bcd(dt->tm_min);
-+	write_reg(RTC7301_MIN, data );
-+	write_reg(RTC7301_MIN10, (data >> 4));
-+
-+	data = bin2bcd(dt->tm_hour);
-+	write_reg(RTC7301_HOUR, data);
-+	write_reg(RTC7301_HOUR10, (data >> 4));
-+
-+	data = bin2bcd(dt->tm_mday);
-+	write_reg(RTC7301_DAY, data);
-+	write_reg(RTC7301_DAY10, (data>> 4));
-+
-+	data = bin2bcd(dt->tm_mon + 1);
-+	write_reg(RTC7301_MON, data);
-+	write_reg(RTC7301_MON10, (data >> 4));
-+
-+	data = bin2bcd(dt->tm_year % 100);
-+	write_reg(RTC7301_YEAR, data);
-+	write_reg(RTC7301_YEAR10, (data >> 4));
-+	data = bin2bcd((1900 + dt->tm_year) / 100);
-+	write_reg(RTC7301_YEAR100, data);
-+
-+	data = bin2bcd(dt->tm_wday);
-+	write_reg(RTC7301_WEEKDAY, data);
-+
-+	write_reg(RTC7301_CTRLREG, 0);
-+
-+	return 0;
-+}
-+
-+static const struct rtc_class_ops rtc7301_rtc_ops = {
-+	.read_time	= rtc7301_get_datetime,
-+	.set_time	= rtc7301_set_datetime,
-+};
-+
-+static int __devinit rtc7301_probe(struct platform_device *pdev)
-+{
-+	struct rtc_device *rtc;
-+	struct resource *res;
-+
-+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if (!res)
-+		return -ENOENT;
-+
-+	rtc7301_base = ioremap_nocache(res->start, 0x1000 /*res->end - res->start + 1*/);
-+	if (!rtc7301_base)
-+		return -EINVAL;
-+
-+	rtc = rtc_device_register(RTC_NAME, &pdev->dev,
-+				&rtc7301_rtc_ops, THIS_MODULE);
-+	if (IS_ERR(rtc)) {
-+		iounmap(rtc7301_base);
-+		return PTR_ERR(rtc);
-+	}
-+
-+	platform_set_drvdata(pdev, rtc);
-+
-+	rtc7301_init_settings();
-+	return 0;
-+}
-+
-+static int __devexit rtc7301_remove(struct platform_device *pdev)
-+{
-+	struct rtc_device *rtc = platform_get_drvdata(pdev);
-+
-+	if (rtc)
-+		rtc_device_unregister(rtc);
-+	if (rtc7301_base)
-+		iounmap(rtc7301_base);
-+	return 0;
-+}
-+
-+static struct platform_driver rtc7301_driver = {
-+	.driver = {
-+		.name	= RTC_NAME,
-+		.owner	= THIS_MODULE,
-+	},
-+	.probe	= rtc7301_probe,
-+	.remove = __devexit_p(rtc7301_remove),
-+};
-+
-+static __init int rtc7301_init(void)
-+{
-+	return platform_driver_register(&rtc7301_driver);
-+}
-+module_init(rtc7301_init);
-+
-+static __exit void rtc7301_exit(void)
-+{
-+	platform_driver_unregister(&rtc7301_driver);
-+}
-+module_exit(rtc7301_exit);
-+
-+MODULE_DESCRIPTION("Epson 7301 RTC driver");
-+MODULE_AUTHOR("Jose Vasconcellos <jvasco@verizon.net>");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS("platform:" RTC_NAME);
-+MODULE_VERSION(RTC_VERSION);
diff --git a/target/linux/generic-2.6/patches-2.6.33/750-glamo-headers.patch b/target/linux/generic-2.6/patches-2.6.33/750-glamo-headers.patch
deleted file mode 100644
index 419d98a42..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/750-glamo-headers.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/include/linux/fb.h
-+++ b/include/linux/fb.h
-@@ -124,6 +124,7 @@ struct dentry;
- #define FB_ACCEL_TRIDENT_BLADE3D 52	/* Trident Blade3D		*/
- #define FB_ACCEL_TRIDENT_BLADEXP 53	/* Trident BladeXP		*/
- #define FB_ACCEL_CIRRUS_ALPINE   53	/* Cirrus Logic 543x/544x/5480	*/
-+#define FB_ACCEL_GLAMO		50	/* SMedia Glamo                 */
- #define FB_ACCEL_NEOMAGIC_NM2070 90	/* NeoMagic NM2070              */
- #define FB_ACCEL_NEOMAGIC_NM2090 91	/* NeoMagic NM2090              */
- #define FB_ACCEL_NEOMAGIC_NM2093 92	/* NeoMagic NM2093              */
---- a/include/linux/Kbuild
-+++ b/include/linux/Kbuild
-@@ -76,6 +76,8 @@ header-y += genetlink.h
- header-y += gen_stats.h
- header-y += gfs2_ondisk.h
- header-y += gigaset_dev.h
-+header-y += glamofb.h
-+header-y += glamo-engine.h
- header-y += hysdn_if.h
- header-y += i2o-dev.h
- header-y += i8k.h
diff --git a/target/linux/generic-2.6/patches-2.6.33/801-usb_serial_endpoint_size.patch b/target/linux/generic-2.6/patches-2.6.33/801-usb_serial_endpoint_size.patch
deleted file mode 100644
index e6d06456a..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/801-usb_serial_endpoint_size.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/drivers/usb/serial/usb-serial.c
-+++ b/drivers/usb/serial/usb-serial.c
-@@ -61,6 +61,7 @@ static struct usb_driver usb_serial_driv
-    drivers depend on it.
- */
- 
-+static ushort maxSize = 0;
- static int debug;
- /* initially all NULL */
- static struct usb_serial *serial_table[SERIAL_TTY_MINORS];
-@@ -914,7 +915,7 @@ int usb_serial_probe(struct usb_interfac
- 			dev_err(&interface->dev, "No free urbs available\n");
- 			goto probe_error;
- 		}
--		buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
-+		buffer_size = (endpoint->wMaxPacketSize > maxSize) ? endpoint->wMaxPacketSize : maxSize;
- 		port->bulk_in_size = buffer_size;
- 		port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
- 		port->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL);
-@@ -1356,3 +1357,5 @@ MODULE_LICENSE("GPL");
- 
- module_param(debug, bool, S_IRUGO | S_IWUSR);
- MODULE_PARM_DESC(debug, "Debug enabled or not");
-+module_param(maxSize, ushort,0);
-+MODULE_PARM_DESC(maxSize,"User specified USB endpoint size");
diff --git a/target/linux/generic-2.6/patches-2.6.33/840-unable_to_open_console.patch b/target/linux/generic-2.6/patches-2.6.33/840-unable_to_open_console.patch
deleted file mode 100644
index 8d9039676..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/840-unable_to_open_console.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/init/main.c
-+++ b/init/main.c
-@@ -807,7 +807,7 @@ static noinline int init_post(void)
- 	numa_default_policy();
- 
- 	if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
--		printk(KERN_WARNING "Warning: unable to open an initial console.\n");
-+		printk(KERN_WARNING "Please be patient, while OpenWrt loads ...\n");
- 
- 	(void) sys_dup(0);
- 	(void) sys_dup(0);
diff --git a/target/linux/generic-2.6/patches-2.6.33/902-darwin_scripts_include.patch b/target/linux/generic-2.6/patches-2.6.33/902-darwin_scripts_include.patch
deleted file mode 100644
index be31abeac..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/902-darwin_scripts_include.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- a/scripts/genksyms/parse.c_shipped
-+++ b/scripts/genksyms/parse.c_shipped
-@@ -160,7 +160,9 @@
- 
- 
- #include <assert.h>
-+#ifndef __APPLE__
- #include <malloc.h>
-+#endif
- #include "genksyms.h"
- 
- static int is_typedef;
---- a/scripts/genksyms/parse.y
-+++ b/scripts/genksyms/parse.y
-@@ -24,7 +24,9 @@
- %{
- 
- #include <assert.h>
-+#ifndef __APPLE__
- #include <malloc.h>
-+#endif
- #include "genksyms.h"
- 
- static int is_typedef;
---- a/scripts/kallsyms.c
-+++ b/scripts/kallsyms.c
-@@ -22,6 +22,35 @@
- #include <stdlib.h>
- #include <string.h>
- #include <ctype.h>
-+#ifdef __APPLE__
-+/* Darwin has no memmem implementation, this one is ripped of the uClibc-0.9.28 source */
-+void *memmem (const void *haystack, size_t haystack_len,
-+                          const void *needle,  size_t needle_len)
-+{
-+  const char *begin;
-+  const char *const last_possible
-+    = (const char *) haystack + haystack_len - needle_len;
-+
-+  if (needle_len == 0)
-+    /* The first occurrence of the empty string is deemed to occur at
-+       the beginning of the string.  */
-+    return (void *) haystack;
-+
-+  /* Sanity check, otherwise the loop might search through the whole
-+     memory.  */
-+  if (__builtin_expect (haystack_len < needle_len, 0))
-+    return NULL;
-+
-+  for (begin = (const char *) haystack; begin <= last_possible; ++begin)
-+    if (begin[0] == ((const char *) needle)[0] &&
-+        !memcmp ((const void *) &begin[1],
-+                 (const void *) ((const char *) needle + 1),
-+                 needle_len - 1))
-+      return (void *) begin;
-+
-+  return NULL;
-+}
-+#endif
- 
- #ifndef ARRAY_SIZE
- #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
---- a/scripts/kconfig/Makefile
-+++ b/scripts/kconfig/Makefile
-@@ -130,6 +130,9 @@ check-lxdialog  := $(srctree)/$(src)/lxd
- # we really need to do so. (Do not call gcc as part of make mrproper)
- HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
- HOST_LOADLIBES   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
-+ifeq ($(shell uname -s),Darwin)
-+HOST_LOADLIBES  += -lncurses
-+endif
- 
- HOST_EXTRACFLAGS += -DLOCALE
- 
---- a/scripts/mod/mk_elfconfig.c
-+++ b/scripts/mod/mk_elfconfig.c
-@@ -1,7 +1,11 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#ifndef __APPLE__
- #include <elf.h>
-+#else
-+#include "../../../../../tools/sstrip/include/elf.h"
-+#endif
- 
- int
- main(int argc, char **argv)
---- a/scripts/mod/modpost.h
-+++ b/scripts/mod/modpost.h
-@@ -7,7 +7,11 @@
- #include <sys/mman.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#if !(defined(__APPLE__) || defined(__CYGWIN__))
- #include <elf.h>
-+#else
-+#include "../../../../../tools/sstrip/include/elf.h"
-+#endif
- 
- #include "elfconfig.h"
- 
diff --git a/target/linux/generic-2.6/patches-2.6.33/903-hostap_txpower.patch b/target/linux/generic-2.6/patches-2.6.33/903-hostap_txpower.patch
deleted file mode 100644
index 22a65924d..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/903-hostap_txpower.patch
+++ /dev/null
@@ -1,154 +0,0 @@
---- a/drivers/net/wireless/hostap/hostap_ap.c
-+++ b/drivers/net/wireless/hostap/hostap_ap.c
-@@ -2335,13 +2335,13 @@ int prism2_ap_get_sta_qual(local_info_t
- 		addr[count].sa_family = ARPHRD_ETHER;
- 		memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
- 		if (sta->last_rx_silence == 0)
--			qual[count].qual = sta->last_rx_signal < 27 ?
--				0 : (sta->last_rx_signal - 27) * 92 / 127;
-+                        qual[count].qual = (sta->last_rx_signal - 156) == 0 ?
-+                                0 : (sta->last_rx_signal - 156) * 92 / 64;
- 		else
--			qual[count].qual = sta->last_rx_signal -
--				sta->last_rx_silence - 35;
--		qual[count].level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
--		qual[count].noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
-+                        qual[count].qual = (sta->last_rx_signal -
-+                                sta->last_rx_silence) * 92 / 64;
-+                qual[count].level = sta->last_rx_signal;
-+                qual[count].noise = sta->last_rx_silence;
- 		qual[count].updated = sta->last_rx_updated;
- 
- 		sta->last_rx_updated = IW_QUAL_DBM;
-@@ -2407,13 +2407,13 @@ int prism2_ap_translate_scan(struct net_
- 		memset(&iwe, 0, sizeof(iwe));
- 		iwe.cmd = IWEVQUAL;
- 		if (sta->last_rx_silence == 0)
--			iwe.u.qual.qual = sta->last_rx_signal < 27 ?
--				0 : (sta->last_rx_signal - 27) * 92 / 127;
-+	                iwe.u.qual.qual = (sta->last_rx_signal -156) == 0 ?
-+	                        0 : (sta->last_rx_signal - 156) * 92 / 64;
- 		else
--			iwe.u.qual.qual = sta->last_rx_signal -
--				sta->last_rx_silence - 35;
--		iwe.u.qual.level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
--		iwe.u.qual.noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
-+                        iwe.u.qual.qual = (sta->last_rx_signal -
-+                                sta->last_rx_silence) * 92 / 64;
-+                iwe.u.qual.level = sta->last_rx_signal;
-+                iwe.u.qual.noise = sta->last_rx_silence;
- 		iwe.u.qual.updated = sta->last_rx_updated;
- 		iwe.len = IW_EV_QUAL_LEN;
- 		current_ev = iwe_stream_add_event(info, current_ev, end_buf,
---- a/drivers/net/wireless/hostap/hostap_config.h
-+++ b/drivers/net/wireless/hostap/hostap_config.h
-@@ -45,4 +45,9 @@
-  */
- /* #define PRISM2_NO_STATION_MODES */
- 
-+/* Enable TX power Setting functions
-+ * (min att = -128 , max att =  127)
-+ */
-+#define RAW_TXPOWER_SETTING
-+
- #endif /* HOSTAP_CONFIG_H */
---- a/drivers/net/wireless/hostap/hostap.h
-+++ b/drivers/net/wireless/hostap/hostap.h
-@@ -90,6 +90,7 @@ extern const struct iw_handler_def hosta
- extern const struct ethtool_ops prism2_ethtool_ops;
- 
- int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
-+int hostap_restore_power(struct net_device *dev);
- 
- 
- #endif /* HOSTAP_H */
---- a/drivers/net/wireless/hostap/hostap_hw.c
-+++ b/drivers/net/wireless/hostap/hostap_hw.c
-@@ -932,6 +932,7 @@ static int hfa384x_set_rid(struct net_de
- 			prism2_hw_reset(dev);
- 	}
- 
-+	hostap_restore_power(dev);
- 	return res;
- }
- 
---- a/drivers/net/wireless/hostap/hostap_info.c
-+++ b/drivers/net/wireless/hostap/hostap_info.c
-@@ -432,6 +432,11 @@ static void handle_info_queue_linkstatus
- 	}
- 
- 	/* Get BSSID if we have a valid AP address */
-+
-+	if ( val == HFA384X_LINKSTATUS_CONNECTED ||
-+	     val == HFA384X_LINKSTATUS_DISCONNECTED )
-+			hostap_restore_power(local->dev);
-+
- 	if (connected) {
- 		netif_carrier_on(local->dev);
- 		netif_carrier_on(local->ddev);
---- a/drivers/net/wireless/hostap/hostap_ioctl.c
-+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
-@@ -1476,23 +1476,20 @@ static int prism2_txpower_hfa386x_to_dBm
- 		val = 255;
- 
- 	tmp = val;
--	tmp >>= 2;
- 
--	return -12 - tmp;
-+	return tmp;
- }
- 
- static u16 prism2_txpower_dBm_to_hfa386x(int val)
- {
- 	signed char tmp;
- 
--	if (val > 20)
--		return 128;
--	else if (val < -43)
-+	if (val > 127)
- 		return 127;
-+	else if (val < -128)
-+		return 128;
- 
- 	tmp = val;
--	tmp = -12 - tmp;
--	tmp <<= 2;
- 
- 	return (unsigned char) tmp;
- }
-@@ -4056,3 +4053,35 @@ int hostap_ioctl(struct net_device *dev,
- 
- 	return ret;
- }
-+
-+/* BUG FIX: Restore power setting value when lost due to F/W bug */
-+
-+int hostap_restore_power(struct net_device *dev)
-+{
-+        struct hostap_interface *iface = netdev_priv(dev);
-+       local_info_t *local = iface->local;
-+
-+       u16 val;
-+       int ret = 0;
-+
-+       if (local->txpower_type == PRISM2_TXPOWER_OFF) {
-+                       val = 0xff; /* use all standby and sleep modes */
-+                       ret = local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
-+                                              HFA386X_CR_A_D_TEST_MODES2,
-+                                              &val, NULL);
-+       }
-+
-+#ifdef RAW_TXPOWER_SETTING
-+       if (local->txpower_type == PRISM2_TXPOWER_FIXED) {
-+               val = HFA384X_TEST_CFG_BIT_ALC;
-+               local->func->cmd(dev, HFA384X_CMDCODE_TEST |
-+                                (HFA384X_TEST_CFG_BITS << 8), 0, &val, NULL);
-+               val = prism2_txpower_dBm_to_hfa386x(local->txpower);
-+               ret = (local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
-+                            HFA386X_CR_MANUAL_TX_POWER, &val, NULL));
-+       }
-+#endif /* RAW_TXPOWER_SETTING */
-+       return (ret ? -EOPNOTSUPP : 0);
-+}
-+
-+EXPORT_SYMBOL(hostap_restore_power);
diff --git a/target/linux/generic-2.6/patches-2.6.33/903-stddef_include.patch b/target/linux/generic-2.6/patches-2.6.33/903-stddef_include.patch
deleted file mode 100644
index 7fe248d8d..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/903-stddef_include.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/include/linux/stddef.h
-+++ b/include/linux/stddef.h
-@@ -16,6 +16,7 @@ enum {
- 	false	= 0,
- 	true	= 1
- };
-+#endif /* __KERNEL__ */
- 
- #undef offsetof
- #ifdef __compiler_offsetof
-@@ -23,6 +24,5 @@ enum {
- #else
- #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
- #endif
--#endif /* __KERNEL__ */
- 
- #endif
diff --git a/target/linux/generic-2.6/patches-2.6.33/905-i386_build.patch b/target/linux/generic-2.6/patches-2.6.33/905-i386_build.patch
deleted file mode 100644
index c701fdaa9..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/905-i386_build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/arch/x86/boot/tools/build.c
-+++ b/arch/x86/boot/tools/build.c
-@@ -29,7 +29,6 @@
- #include <stdarg.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--#include <sys/sysmacros.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/mman.h>
diff --git a/target/linux/generic-2.6/patches-2.6.33/920-01-hotpluggable-spi-gpio.patch b/target/linux/generic-2.6/patches-2.6.33/920-01-hotpluggable-spi-gpio.patch
deleted file mode 100644
index b10bc9a65..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/920-01-hotpluggable-spi-gpio.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Fix spi-gpio for hotplug.
-
---mb
-
-
-
---- a/drivers/spi/spi_gpio.c
-+++ b/drivers/spi/spi_gpio.c
-@@ -218,7 +218,7 @@ static void spi_gpio_cleanup(struct spi_
- 	spi_bitbang_cleanup(spi);
- }
- 
--static int __init spi_gpio_alloc(unsigned pin, const char *label, bool is_in)
-+static int __devinit spi_gpio_alloc(unsigned pin, const char *label, bool is_in)
- {
- 	int value;
- 
-@@ -232,7 +232,7 @@ static int __init spi_gpio_alloc(unsigne
- 	return value;
- }
- 
--static int __init
-+static int __devinit
- spi_gpio_request(struct spi_gpio_platform_data *pdata, const char *label)
- {
- 	int value;
-@@ -261,7 +261,7 @@ done:
- 	return value;
- }
- 
--static int __init spi_gpio_probe(struct platform_device *pdev)
-+static int __devinit spi_gpio_probe(struct platform_device *pdev)
- {
- 	int				status;
- 	struct spi_master		*master;
-@@ -317,7 +317,7 @@ gpio_free:
- 	return status;
- }
- 
--static int __exit spi_gpio_remove(struct platform_device *pdev)
-+static int __devexit spi_gpio_remove(struct platform_device *pdev)
- {
- 	struct spi_gpio			*spi_gpio;
- 	struct spi_gpio_platform_data	*pdata;
-@@ -344,12 +344,13 @@ MODULE_ALIAS("platform:" DRIVER_NAME);
- static struct platform_driver spi_gpio_driver = {
- 	.driver.name	= DRIVER_NAME,
- 	.driver.owner	= THIS_MODULE,
--	.remove		= __exit_p(spi_gpio_remove),
-+	.probe		= spi_gpio_probe,
-+	.remove		= __devexit_p(spi_gpio_remove),
- };
- 
- static int __init spi_gpio_init(void)
- {
--	return platform_driver_probe(&spi_gpio_driver, spi_gpio_probe);
-+	return platform_driver_register(&spi_gpio_driver);
- }
- module_init(spi_gpio_init);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.33/920-04-spi-gpio-implement-spi-delay.patch b/target/linux/generic-2.6/patches-2.6.33/920-04-spi-gpio-implement-spi-delay.patch
deleted file mode 100644
index 19032881b..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/920-04-spi-gpio-implement-spi-delay.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Implement the SPI-GPIO delay function for busses that need speed limitation.
-
---mb
-
-
-
---- a/drivers/spi/spi_gpio.c
-+++ b/drivers/spi/spi_gpio.c
-@@ -21,6 +21,7 @@
- #include <linux/init.h>
- #include <linux/platform_device.h>
- #include <linux/gpio.h>
-+#include <linux/delay.h>
- 
- #include <linux/spi/spi.h>
- #include <linux/spi/spi_bitbang.h>
-@@ -69,6 +70,7 @@ struct spi_gpio {
-  *		#define	SPI_MOSI_GPIO	120
-  *		#define	SPI_SCK_GPIO	121
-  *		#define	SPI_N_CHIPSEL	4
-+ *		#undef NEED_SPIDELAY
-  *		#include "spi_gpio.c"
-  */
- 
-@@ -76,6 +78,7 @@ struct spi_gpio {
- #define DRIVER_NAME	"spi_gpio"
- 
- #define GENERIC_BITBANG	/* vs tight inlines */
-+#define NEED_SPIDELAY	1
- 
- /* all functions referencing these symbols must define pdata */
- #define SPI_MISO_GPIO	((pdata)->miso)
-@@ -120,12 +123,20 @@ static inline int getmiso(const struct s
- #undef pdata
- 
- /*
-- * NOTE:  this clocks "as fast as we can".  It "should" be a function of the
-- * requested device clock.  Software overhead means we usually have trouble
-- * reaching even one Mbit/sec (except when we can inline bitops), so for now
-- * we'll just assume we never need additional per-bit slowdowns.
-+ * NOTE:  to clock "as fast as we can", set spi_device.max_speed_hz
-+ * and spi_transfer.speed_hz to 0.
-+ * Otherwise this is a function of the requested device clock.
-+ * Software overhead means we usually have trouble
-+ * reaching even one Mbit/sec (except when we can inline bitops). So on small
-+ * embedded devices with fast SPI slaves you usually don't need a delay.
-  */
--#define spidelay(nsecs)	do {} while (0)
-+static inline void spidelay(unsigned nsecs)
-+{
-+#ifdef NEED_SPIDELAY
-+	if (unlikely(nsecs))
-+		ndelay(nsecs);
-+#endif /* NEED_SPIDELAY */
-+}
- 
- #define	EXPAND_BITBANG_TXRX
- #include <linux/spi/spi_bitbang.h>
diff --git a/target/linux/generic-2.6/patches-2.6.33/921-gpio_spi_driver.patch b/target/linux/generic-2.6/patches-2.6.33/921-gpio_spi_driver.patch
deleted file mode 100644
index c37bb2280..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/921-gpio_spi_driver.patch
+++ /dev/null
@@ -1,366 +0,0 @@
-THIS CODE IS DEPRECATED.
-
-Please use the new mainline SPI-GPIO driver, as of 2.6.29.
-
---mb
-
-
-
---- /dev/null
-+++ b/include/linux/spi/spi_gpio_old.h
-@@ -0,0 +1,73 @@
-+/*
-+ * spi_gpio interface to platform code
-+ *
-+ * Copyright (c) 2008 Piotr Skamruk
-+ * Copyright (c) 2008 Michael Buesch
-+ *
-+ * 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 _LINUX_SPI_SPI_GPIO
-+#define _LINUX_SPI_SPI_GPIO
-+
-+#include <linux/types.h>
-+#include <linux/spi/spi.h>
-+
-+
-+/**
-+ * struct spi_gpio_platform_data - Data definitions for a SPI-GPIO device.
-+ *
-+ * This structure holds information about a GPIO-based SPI device.
-+ *
-+ * @pin_clk: The GPIO pin number of the CLOCK pin.
-+ *
-+ * @pin_miso: The GPIO pin number of the MISO pin.
-+ *
-+ * @pin_mosi: The GPIO pin number of the MOSI pin.
-+ *
-+ * @pin_cs: The GPIO pin number of the CHIPSELECT pin.
-+ *
-+ * @cs_activelow: If true, the chip is selected when the CS line is low.
-+ *
-+ * @no_spi_delay: If true, no delay is done in the lowlevel bitbanging.
-+ *                Note that doing no delay is not standards compliant,
-+ *                but it might be needed to speed up transfers on some
-+ *                slow embedded machines.
-+ *
-+ * @boardinfo_setup: This callback is called after the
-+ *                   SPI master device was registered, but before the
-+ *                   device is registered.
-+ * @boardinfo_setup_data: Data argument passed to boardinfo_setup().
-+ */
-+struct spi_gpio_platform_data {
-+	unsigned int pin_clk;
-+	unsigned int pin_miso;
-+	unsigned int pin_mosi;
-+	unsigned int pin_cs;
-+	bool cs_activelow;
-+	bool no_spi_delay;
-+	int (*boardinfo_setup)(struct spi_board_info *bi,
-+			       struct spi_master *master,
-+			       void *data);
-+	void *boardinfo_setup_data;
-+};
-+
-+/**
-+ * SPI_GPIO_PLATDEV_NAME - The platform device name string.
-+ *
-+ * The name string that has to be used for platform_device_alloc
-+ * when allocating a spi-gpio device.
-+ */
-+#define SPI_GPIO_PLATDEV_NAME	"spi-gpio"
-+
-+/**
-+ * spi_gpio_next_id - Get another platform device ID number.
-+ *
-+ * This returns the next platform device ID number that has to be used
-+ * for platform_device_alloc. The ID is opaque and should not be used for
-+ * anything else.
-+ */
-+int spi_gpio_next_id(void);
-+
-+#endif /* _LINUX_SPI_SPI_GPIO */
---- /dev/null
-+++ b/drivers/spi/spi_gpio_old.c
-@@ -0,0 +1,251 @@
-+/*
-+ * Bitbanging SPI bus driver using GPIO API
-+ *
-+ * Copyright (c) 2008 Piotr Skamruk
-+ * Copyright (c) 2008 Michael Buesch
-+ *
-+ * based on spi_s3c2410_gpio.c
-+ *   Copyright (c) 2006 Ben Dooks
-+ *   Copyright (c) 2006 Simtec Electronics
-+ * and on i2c-gpio.c
-+ *   Copyright (C) 2007 Atmel Corporation
-+ *
-+ * 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.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/delay.h>
-+#include <linux/spinlock.h>
-+#include <linux/workqueue.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/spi/spi.h>
-+#include <linux/spi/spi_bitbang.h>
-+#include <linux/spi/spi_gpio_old.h>
-+#include <linux/gpio.h>
-+#include <asm/atomic.h>
-+
-+
-+struct spi_gpio {
-+	struct spi_bitbang bitbang;
-+	struct spi_gpio_platform_data *info;
-+	struct platform_device *pdev;
-+	struct spi_board_info bi;
-+};
-+
-+
-+static inline struct spi_gpio *spidev_to_sg(struct spi_device *dev)
-+{
-+	return dev->controller_data;
-+}
-+
-+static inline void setsck(struct spi_device *dev, int val)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+	gpio_set_value(sp->info->pin_clk, val ? 1 : 0);
-+}
-+
-+static inline void setmosi(struct spi_device *dev, int val)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+	gpio_set_value(sp->info->pin_mosi, val ? 1 : 0);
-+}
-+
-+static inline u32 getmiso(struct spi_device *dev)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+	return gpio_get_value(sp->info->pin_miso) ? 1 : 0;
-+}
-+
-+static inline void do_spidelay(struct spi_device *dev, unsigned nsecs)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+
-+	if (!sp->info->no_spi_delay)
-+		ndelay(nsecs);
-+}
-+
-+#define spidelay(nsecs) do {					\
-+	/* Steal the spi_device pointer from our caller.	\
-+	 * The bitbang-API should probably get fixed here... */	\
-+	do_spidelay(spi, nsecs);				\
-+  } while (0)
-+
-+#define EXPAND_BITBANG_TXRX
-+#include <linux/spi/spi_bitbang.h>
-+
-+static u32 spi_gpio_txrx_mode0(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha0(spi, nsecs, 0, word, bits);
-+}
-+
-+static u32 spi_gpio_txrx_mode1(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha1(spi, nsecs, 0, word, bits);
-+}
-+
-+static u32 spi_gpio_txrx_mode2(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha0(spi, nsecs, 1, word, bits);
-+}
-+
-+static u32 spi_gpio_txrx_mode3(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha1(spi, nsecs, 1, word, bits);
-+}
-+
-+static void spi_gpio_chipselect(struct spi_device *dev, int on)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+
-+	if (sp->info->cs_activelow)
-+		on = !on;
-+	gpio_set_value(sp->info->pin_cs, on ? 1 : 0);
-+}
-+
-+static int spi_gpio_probe(struct platform_device *pdev)
-+{
-+	struct spi_master *master;
-+	struct spi_gpio_platform_data *pdata;
-+	struct spi_gpio *sp;
-+	struct spi_device *spidev;
-+	int err;
-+
-+	pdata = pdev->dev.platform_data;
-+	if (!pdata)
-+		return -ENXIO;
-+
-+	err = -ENOMEM;
-+	master = spi_alloc_master(&pdev->dev, sizeof(struct spi_gpio));
-+	if (!master)
-+		goto err_alloc_master;
-+
-+	sp = spi_master_get_devdata(master);
-+	platform_set_drvdata(pdev, sp);
-+	sp->info = pdata;
-+
-+	err = gpio_request(pdata->pin_clk, "spi_clock");
-+	if (err)
-+		goto err_request_clk;
-+	err = gpio_request(pdata->pin_mosi, "spi_mosi");
-+	if (err)
-+		goto err_request_mosi;
-+	err = gpio_request(pdata->pin_miso, "spi_miso");
-+	if (err)
-+		goto err_request_miso;
-+	err = gpio_request(pdata->pin_cs, "spi_cs");
-+	if (err)
-+		goto err_request_cs;
-+
-+	sp->bitbang.master = spi_master_get(master);
-+	sp->bitbang.master->bus_num = -1;
-+	sp->bitbang.master->num_chipselect = 1;
-+	sp->bitbang.chipselect = spi_gpio_chipselect;
-+	sp->bitbang.txrx_word[SPI_MODE_0] = spi_gpio_txrx_mode0;
-+	sp->bitbang.txrx_word[SPI_MODE_1] = spi_gpio_txrx_mode1;
-+	sp->bitbang.txrx_word[SPI_MODE_2] = spi_gpio_txrx_mode2;
-+	sp->bitbang.txrx_word[SPI_MODE_3] = spi_gpio_txrx_mode3;
-+
-+	gpio_direction_output(pdata->pin_clk, 0);
-+	gpio_direction_output(pdata->pin_mosi, 0);
-+	gpio_direction_output(pdata->pin_cs,
-+			      pdata->cs_activelow ? 1 : 0);
-+	gpio_direction_input(pdata->pin_miso);
-+
-+	err = spi_bitbang_start(&sp->bitbang);
-+	if (err)
-+		goto err_no_bitbang;
-+	err = pdata->boardinfo_setup(&sp->bi, master,
-+				     pdata->boardinfo_setup_data);
-+	if (err)
-+		goto err_bi_setup;
-+	sp->bi.controller_data = sp;
-+	spidev = spi_new_device(master, &sp->bi);
-+	if (!spidev)
-+		goto err_new_dev;
-+
-+	return 0;
-+
-+err_new_dev:
-+err_bi_setup:
-+	spi_bitbang_stop(&sp->bitbang);
-+err_no_bitbang:
-+	spi_master_put(sp->bitbang.master);
-+	gpio_free(pdata->pin_cs);
-+err_request_cs:
-+	gpio_free(pdata->pin_miso);
-+err_request_miso:
-+	gpio_free(pdata->pin_mosi);
-+err_request_mosi:
-+	gpio_free(pdata->pin_clk);
-+err_request_clk:
-+	kfree(master);
-+
-+err_alloc_master:
-+	return err;
-+}
-+
-+static int __devexit spi_gpio_remove(struct platform_device *pdev)
-+{
-+	struct spi_gpio *sp;
-+	struct spi_gpio_platform_data *pdata;
-+
-+	pdata = pdev->dev.platform_data;
-+	sp = platform_get_drvdata(pdev);
-+
-+	gpio_free(pdata->pin_clk);
-+	gpio_free(pdata->pin_mosi);
-+	gpio_free(pdata->pin_miso);
-+	gpio_free(pdata->pin_cs);
-+	spi_bitbang_stop(&sp->bitbang);
-+	spi_master_put(sp->bitbang.master);
-+
-+	return 0;
-+}
-+
-+static struct platform_driver spi_gpio_driver = {
-+	.driver		= {
-+		.name	= SPI_GPIO_PLATDEV_NAME,
-+		.owner	= THIS_MODULE,
-+	},
-+	.probe		= spi_gpio_probe,
-+	.remove		= __devexit_p(spi_gpio_remove),
-+};
-+
-+int spi_gpio_next_id(void)
-+{
-+	static atomic_t counter = ATOMIC_INIT(-1);
-+
-+	return atomic_inc_return(&counter);
-+}
-+EXPORT_SYMBOL(spi_gpio_next_id);
-+
-+static int __init spi_gpio_init(void)
-+{
-+	int err;
-+
-+	err = platform_driver_register(&spi_gpio_driver);
-+	if (err)
-+		printk(KERN_ERR "spi-gpio: register failed: %d\n", err);
-+
-+	return err;
-+}
-+module_init(spi_gpio_init);
-+
-+static void __exit spi_gpio_exit(void)
-+{
-+	platform_driver_unregister(&spi_gpio_driver);
-+}
-+module_exit(spi_gpio_exit);
-+
-+MODULE_AUTHOR("Piot Skamruk <piotr.skamruk at gmail.com>");
-+MODULE_AUTHOR("Michael Buesch");
-+MODULE_DESCRIPTION("Platform independent GPIO bitbanging SPI driver");
-+MODULE_LICENSE("GPL v2");
---- a/drivers/spi/Kconfig
-+++ b/drivers/spi/Kconfig
-@@ -116,6 +116,15 @@ config SPI_GPIO
- 	  GPIO operations, you should be able to leverage that for better
- 	  speed with a custom version of this driver; see the source code.
- 
-+config SPI_GPIO_OLD
-+	tristate "Old GPIO API based bitbanging SPI controller (DEPRECATED)"
-+	depends on SPI_MASTER && GENERIC_GPIO
-+	select SPI_BITBANG
-+	help
-+	  This code is deprecated. Please use the new mainline SPI-GPIO driver.
-+
-+	  If unsure, say N.
-+
- config SPI_IMX
- 	tristate "Freescale i.MX SPI controllers"
- 	depends on ARCH_MXC
---- a/drivers/spi/Makefile
-+++ b/drivers/spi/Makefile
-@@ -19,6 +19,7 @@ obj-$(CONFIG_SPI_BUTTERFLY)		+= spi_butt
- obj-$(CONFIG_SPI_DESIGNWARE)		+= dw_spi.o
- obj-$(CONFIG_SPI_DW_PCI)		+= dw_spi_pci.o
- obj-$(CONFIG_SPI_GPIO)			+= spi_gpio.o
-+obj-$(CONFIG_SPI_GPIO_OLD)		+= spi_gpio_old.o
- obj-$(CONFIG_SPI_IMX)			+= spi_imx.o
- obj-$(CONFIG_SPI_LM70_LLP)		+= spi_lm70llp.o
- obj-$(CONFIG_SPI_PXA2XX)		+= pxa2xx_spi.o
diff --git a/target/linux/generic-2.6/patches-2.6.33/922-gpiommc.patch b/target/linux/generic-2.6/patches-2.6.33/922-gpiommc.patch
deleted file mode 100644
index cb39a705f..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/922-gpiommc.patch
+++ /dev/null
@@ -1,843 +0,0 @@
---- /dev/null
-+++ b/drivers/mmc/host/gpiommc.c
-@@ -0,0 +1,608 @@
-+/*
-+ * Driver an MMC/SD card on a bitbanging GPIO SPI bus.
-+ * This module hooks up the mmc_spi and spi_gpio modules and also
-+ * provides a configfs interface.
-+ *
-+ * Copyright 2008 Michael Buesch <mb@bu3sch.de>
-+ *
-+ * Licensed under the GNU/GPL. See COPYING for details.
-+ */
-+
-+#include <linux/mmc/gpiommc.h>
-+#include <linux/platform_device.h>
-+#include <linux/list.h>
-+#include <linux/mutex.h>
-+#include <linux/spi/spi_gpio_old.h>
-+#include <linux/configfs.h>
-+#include <linux/gpio.h>
-+#include <asm/atomic.h>
-+
-+
-+#define PFX				"gpio-mmc: "
-+
-+
-+struct gpiommc_device {
-+	struct platform_device *pdev;
-+	struct platform_device *spi_pdev;
-+	struct spi_board_info boardinfo;
-+};
-+
-+
-+MODULE_DESCRIPTION("GPIO based MMC driver");
-+MODULE_AUTHOR("Michael Buesch");
-+MODULE_LICENSE("GPL");
-+
-+
-+static int gpiommc_boardinfo_setup(struct spi_board_info *bi,
-+				   struct spi_master *master,
-+				   void *data)
-+{
-+	struct gpiommc_device *d = data;
-+	struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
-+
-+	/* Bind the SPI master to the MMC-SPI host driver. */
-+	strlcpy(bi->modalias, "mmc_spi", sizeof(bi->modalias));
-+
-+	bi->max_speed_hz = pdata->max_bus_speed;
-+	bi->bus_num = master->bus_num;
-+	bi->mode = pdata->mode;
-+
-+	return 0;
-+}
-+
-+static int gpiommc_probe(struct platform_device *pdev)
-+{
-+	struct gpiommc_platform_data *mmc_pdata = pdev->dev.platform_data;
-+	struct spi_gpio_platform_data spi_pdata;
-+	struct gpiommc_device *d;
-+	int err;
-+
-+	err = -ENXIO;
-+	if (!mmc_pdata)
-+		goto error;
-+
-+#ifdef CONFIG_MMC_SPI_MODULE
-+	err = request_module("mmc_spi");
-+	if (err) {
-+		printk(KERN_WARNING PFX
-+		       "Failed to request mmc_spi module.\n");
-+	}
-+#endif /* CONFIG_MMC_SPI_MODULE */
-+
-+	/* Allocate the GPIO-MMC device */
-+	err = -ENOMEM;
-+	d = kzalloc(sizeof(*d), GFP_KERNEL);
-+	if (!d)
-+		goto error;
-+	d->pdev = pdev;
-+
-+	/* Create the SPI-GPIO device */
-+	d->spi_pdev = platform_device_alloc(SPI_GPIO_PLATDEV_NAME,
-+					    spi_gpio_next_id());
-+	if (!d->spi_pdev)
-+		goto err_free_d;
-+
-+	memset(&spi_pdata, 0, sizeof(spi_pdata));
-+	spi_pdata.pin_clk = mmc_pdata->pins.gpio_clk;
-+	spi_pdata.pin_miso = mmc_pdata->pins.gpio_do;
-+	spi_pdata.pin_mosi = mmc_pdata->pins.gpio_di;
-+	spi_pdata.pin_cs = mmc_pdata->pins.gpio_cs;
-+	spi_pdata.cs_activelow = mmc_pdata->pins.cs_activelow;
-+	spi_pdata.no_spi_delay = mmc_pdata->no_spi_delay;
-+	spi_pdata.boardinfo_setup = gpiommc_boardinfo_setup;
-+	spi_pdata.boardinfo_setup_data = d;
-+
-+	err = platform_device_add_data(d->spi_pdev, &spi_pdata,
-+				       sizeof(spi_pdata));
-+	if (err)
-+		goto err_free_pdev;
-+	err = platform_device_add(d->spi_pdev);
-+	if (err)
-+		goto err_free_pdata;
-+	platform_set_drvdata(pdev, d);
-+
-+	printk(KERN_INFO PFX "MMC-Card \"%s\" "
-+	       "attached to GPIO pins di=%u, do=%u, clk=%u, cs=%u\n",
-+	       mmc_pdata->name, mmc_pdata->pins.gpio_di,
-+	       mmc_pdata->pins.gpio_do,
-+	       mmc_pdata->pins.gpio_clk,
-+	       mmc_pdata->pins.gpio_cs);
-+
-+	return 0;
-+
-+err_free_pdata:
-+	kfree(d->spi_pdev->dev.platform_data);
-+	d->spi_pdev->dev.platform_data = NULL;
-+err_free_pdev:
-+	platform_device_put(d->spi_pdev);
-+err_free_d:
-+	kfree(d);
-+error:
-+	return err;
-+}
-+
-+static int gpiommc_remove(struct platform_device *pdev)
-+{
-+	struct gpiommc_device *d = platform_get_drvdata(pdev);
-+	struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
-+
-+	platform_device_unregister(d->spi_pdev);
-+	printk(KERN_INFO PFX "GPIO based MMC-Card \"%s\" removed\n",
-+	       pdata->name);
-+	platform_device_put(d->spi_pdev);
-+
-+	return 0;
-+}
-+
-+#ifdef CONFIG_GPIOMMC_CONFIGFS
-+
-+/* A device that was created through configfs */
-+struct gpiommc_configfs_device {
-+	struct config_item item;
-+	/* The platform device, after registration. */
-+	struct platform_device *pdev;
-+	/* The configuration */
-+	struct gpiommc_platform_data pdata;
-+};
-+
-+#define GPIO_INVALID	-1
-+
-+static inline bool gpiommc_is_registered(struct gpiommc_configfs_device *dev)
-+{
-+	return (dev->pdev != NULL);
-+}
-+
-+static inline struct gpiommc_configfs_device *ci_to_gpiommc(struct config_item *item)
-+{
-+	return item ? container_of(item, struct gpiommc_configfs_device, item) : NULL;
-+}
-+
-+static struct configfs_attribute gpiommc_attr_DI = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_data_in",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_DO = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_data_out",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_CLK = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_clock",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_CS = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_chipselect",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_CS_activelow = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_chipselect_activelow",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_spimode = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "spi_mode",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_spidelay = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "spi_delay",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_max_bus_speed = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "max_bus_speed",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_register = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "register",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute *gpiommc_config_attrs[] = {
-+	&gpiommc_attr_DI,
-+	&gpiommc_attr_DO,
-+	&gpiommc_attr_CLK,
-+	&gpiommc_attr_CS,
-+	&gpiommc_attr_CS_activelow,
-+	&gpiommc_attr_spimode,
-+	&gpiommc_attr_spidelay,
-+	&gpiommc_attr_max_bus_speed,
-+	&gpiommc_attr_register,
-+	NULL,
-+};
-+
-+static ssize_t gpiommc_config_attr_show(struct config_item *item,
-+					struct configfs_attribute *attr,
-+					char *page)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+	ssize_t count = 0;
-+	unsigned int gpio;
-+	int err = 0;
-+
-+	if (attr == &gpiommc_attr_DI) {
-+		gpio = dev->pdata.pins.gpio_di;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_DO) {
-+		gpio = dev->pdata.pins.gpio_do;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CLK) {
-+		gpio = dev->pdata.pins.gpio_clk;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS) {
-+		gpio = dev->pdata.pins.gpio_cs;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS_activelow) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 dev->pdata.pins.cs_activelow);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spimode) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 dev->pdata.mode);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spidelay) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 !dev->pdata.no_spi_delay);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_max_bus_speed) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 dev->pdata.max_bus_speed);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_register) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 gpiommc_is_registered(dev));
-+		goto out;
-+	}
-+	WARN_ON(1);
-+	err = -ENOSYS;
-+out:
-+	return err ? err : count;
-+}
-+
-+static int gpiommc_do_register(struct gpiommc_configfs_device *dev,
-+			       const char *name)
-+{
-+	int err;
-+
-+	if (gpiommc_is_registered(dev))
-+		return 0;
-+
-+	if (!gpio_is_valid(dev->pdata.pins.gpio_di) ||
-+	    !gpio_is_valid(dev->pdata.pins.gpio_do) ||
-+	    !gpio_is_valid(dev->pdata.pins.gpio_clk) ||
-+	    !gpio_is_valid(dev->pdata.pins.gpio_cs)) {
-+		printk(KERN_ERR PFX
-+		       "configfs: Invalid GPIO pin number(s)\n");
-+		return -EINVAL;
-+	}
-+
-+	strlcpy(dev->pdata.name, name,
-+		sizeof(dev->pdata.name));
-+
-+	dev->pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME,
-+					  gpiommc_next_id());
-+	if (!dev->pdev)
-+		return -ENOMEM;
-+	err = platform_device_add_data(dev->pdev, &dev->pdata,
-+				       sizeof(dev->pdata));
-+	if (err) {
-+		platform_device_put(dev->pdev);
-+		return err;
-+	}
-+	err = platform_device_add(dev->pdev);
-+	if (err) {
-+		platform_device_put(dev->pdev);
-+		return err;
-+	}
-+
-+	return 0;
-+}
-+
-+static void gpiommc_do_unregister(struct gpiommc_configfs_device *dev)
-+{
-+	if (!gpiommc_is_registered(dev))
-+		return;
-+
-+	platform_device_unregister(dev->pdev);
-+	dev->pdev = NULL;
-+}
-+
-+static ssize_t gpiommc_config_attr_store(struct config_item *item,
-+					 struct configfs_attribute *attr,
-+					 const char *page, size_t count)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+	int err = -EINVAL;
-+	unsigned long data;
-+
-+	if (attr == &gpiommc_attr_register) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data == 1)
-+			err = gpiommc_do_register(dev, item->ci_name);
-+		if (data == 0) {
-+			gpiommc_do_unregister(dev);
-+			err = 0;
-+		}
-+		goto out;
-+	}
-+
-+	if (gpiommc_is_registered(dev)) {
-+		/* The rest of the config parameters can only be set
-+		 * as long as the device is not registered, yet. */
-+		err = -EBUSY;
-+		goto out;
-+	}
-+
-+	if (attr == &gpiommc_attr_DI) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_di = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_DO) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_do = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CLK) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_clk = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_cs = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS_activelow) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data != 0 && data != 1)
-+			goto out;
-+		dev->pdata.pins.cs_activelow = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spimode) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		switch (data) {
-+		case 0:
-+			dev->pdata.mode = SPI_MODE_0;
-+			break;
-+		case 1:
-+			dev->pdata.mode = SPI_MODE_1;
-+			break;
-+		case 2:
-+			dev->pdata.mode = SPI_MODE_2;
-+			break;
-+		case 3:
-+			dev->pdata.mode = SPI_MODE_3;
-+			break;
-+		default:
-+			goto out;
-+		}
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spidelay) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data != 0 && data != 1)
-+			goto out;
-+		dev->pdata.no_spi_delay = !data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_max_bus_speed) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data > UINT_MAX)
-+			goto out;
-+		dev->pdata.max_bus_speed = data;
-+		err = 0;
-+		goto out;
-+	}
-+	WARN_ON(1);
-+	err = -ENOSYS;
-+out:
-+	return err ? err : count;
-+}
-+
-+static void gpiommc_config_item_release(struct config_item *item)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+
-+	kfree(dev);
-+}
-+
-+static struct configfs_item_operations gpiommc_config_item_ops = {
-+	.release		= gpiommc_config_item_release,
-+	.show_attribute		= gpiommc_config_attr_show,
-+	.store_attribute	= gpiommc_config_attr_store,
-+};
-+
-+static struct config_item_type gpiommc_dev_ci_type = {
-+	.ct_item_ops	= &gpiommc_config_item_ops,
-+	.ct_attrs	= gpiommc_config_attrs,
-+	.ct_owner	= THIS_MODULE,
-+};
-+
-+static struct config_item *gpiommc_make_item(struct config_group *group,
-+					     const char *name)
-+{
-+	struct gpiommc_configfs_device *dev;
-+
-+	if (strlen(name) > GPIOMMC_MAX_NAMELEN) {
-+		printk(KERN_ERR PFX "configfs: device name too long\n");
-+		return NULL;
-+	}
-+
-+	dev = kzalloc(sizeof(*dev), GFP_KERNEL);
-+	if (!dev)
-+		return NULL;
-+
-+	config_item_init_type_name(&dev->item, name,
-+				   &gpiommc_dev_ci_type);
-+
-+	/* Assign default configuration */
-+	dev->pdata.pins.gpio_di = GPIO_INVALID;
-+	dev->pdata.pins.gpio_do = GPIO_INVALID;
-+	dev->pdata.pins.gpio_clk = GPIO_INVALID;
-+	dev->pdata.pins.gpio_cs = GPIO_INVALID;
-+	dev->pdata.pins.cs_activelow = 1;
-+	dev->pdata.mode = SPI_MODE_0;
-+	dev->pdata.no_spi_delay = 0;
-+	dev->pdata.max_bus_speed = 5000000; /* 5 MHz */
-+
-+	return &(dev->item);
-+}
-+
-+static void gpiommc_drop_item(struct config_group *group,
-+			      struct config_item *item)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+
-+	gpiommc_do_unregister(dev);
-+	kfree(dev);
-+}
-+
-+static struct configfs_group_operations gpiommc_ct_group_ops = {
-+	.make_item	= gpiommc_make_item,
-+	.drop_item	= gpiommc_drop_item,
-+};
-+
-+static struct config_item_type gpiommc_ci_type = {
-+	.ct_group_ops	= &gpiommc_ct_group_ops,
-+	.ct_owner	= THIS_MODULE,
-+};
-+
-+static struct configfs_subsystem gpiommc_subsys = {
-+	.su_group = {
-+		.cg_item = {
-+			.ci_namebuf = GPIOMMC_PLATDEV_NAME,
-+			.ci_type = &gpiommc_ci_type,
-+		},
-+	},
-+	.su_mutex = __MUTEX_INITIALIZER(gpiommc_subsys.su_mutex),
-+};
-+
-+#endif /* CONFIG_GPIOMMC_CONFIGFS */
-+
-+static struct platform_driver gpiommc_plat_driver = {
-+	.probe	= gpiommc_probe,
-+	.remove	= gpiommc_remove,
-+	.driver	= {
-+		.name	= GPIOMMC_PLATDEV_NAME,
-+		.owner	= THIS_MODULE,
-+	},
-+};
-+
-+int gpiommc_next_id(void)
-+{
-+	static atomic_t counter = ATOMIC_INIT(-1);
-+
-+	return atomic_inc_return(&counter);
-+}
-+EXPORT_SYMBOL(gpiommc_next_id);
-+
-+static int __init gpiommc_modinit(void)
-+{
-+	int err;
-+
-+	err = platform_driver_register(&gpiommc_plat_driver);
-+	if (err)
-+		return err;
-+
-+#ifdef CONFIG_GPIOMMC_CONFIGFS
-+	config_group_init(&gpiommc_subsys.su_group);
-+	err = configfs_register_subsystem(&gpiommc_subsys);
-+	if (err) {
-+		platform_driver_unregister(&gpiommc_plat_driver);
-+		return err;
-+	}
-+#endif /* CONFIG_GPIOMMC_CONFIGFS */
-+
-+	return 0;
-+}
-+module_init(gpiommc_modinit);
-+
-+static void __exit gpiommc_modexit(void)
-+{
-+#ifdef CONFIG_GPIOMMC_CONFIGFS
-+	configfs_unregister_subsystem(&gpiommc_subsys);
-+#endif
-+	platform_driver_unregister(&gpiommc_plat_driver);
-+}
-+module_exit(gpiommc_modexit);
---- a/drivers/mmc/host/Kconfig
-+++ b/drivers/mmc/host/Kconfig
-@@ -373,6 +373,31 @@ config MMC_TMIO
- 	  This provides support for the SD/MMC cell found in TC6393XB,
- 	  T7L66XB and also HTC ASIC3
- 
-+config GPIOMMC
-+	tristate "MMC/SD over GPIO-based SPI"
-+	depends on MMC && MMC_SPI && SPI_GPIO_OLD
-+	help
-+	  This driver hooks up the mmc_spi and spi_gpio modules so that
-+	  MMC/SD cards can be used on a GPIO based bus by bitbanging
-+	  the SPI protocol in software.
-+
-+	  This driver provides a configfs interface to dynamically create
-+	  and destroy GPIO-based MMC/SD card devices. It also provides
-+	  a platform device interface API.
-+	  See Documentation/gpiommc.txt for details.
-+
-+	  The module will be called gpiommc.
-+
-+	  If unsure, say N.
-+
-+config GPIOMMC_CONFIGFS
-+	bool
-+	depends on GPIOMMC && CONFIGFS_FS
-+	default y
-+	help
-+	  This option automatically enables configfs support for gpiommc
-+	  if configfs is available.
-+
- config MMC_CB710
- 	tristate "ENE CB710 MMC/SD Interface support"
- 	depends on PCI
---- a/drivers/mmc/host/Makefile
-+++ b/drivers/mmc/host/Makefile
-@@ -34,6 +34,7 @@ obj-$(CONFIG_MMC_SDRICOH_CS)	+= sdricoh_
- obj-$(CONFIG_MMC_TMIO)		+= tmio_mmc.o
- obj-$(CONFIG_MMC_CB710)	+= cb710-mmc.o
- obj-$(CONFIG_MMC_VIA_SDMMC)	+= via-sdmmc.o
-+obj-$(CONFIG_GPIOMMC)		+= gpiommc.o
- obj-$(CONFIG_SDH_BFIN)		+= bfin_sdh.o
- 
- obj-$(CONFIG_MMC_SDHCI_OF)	+= sdhci-of.o
---- /dev/null
-+++ b/include/linux/mmc/gpiommc.h
-@@ -0,0 +1,71 @@
-+/*
-+ * Device driver for MMC/SD cards driven over a GPIO bus.
-+ *
-+ * Copyright (c) 2008 Michael Buesch
-+ *
-+ * Licensed under the GNU/GPL version 2.
-+ */
-+#ifndef LINUX_GPIOMMC_H_
-+#define LINUX_GPIOMMC_H_
-+
-+#include <linux/types.h>
-+
-+
-+#define GPIOMMC_MAX_NAMELEN		15
-+#define GPIOMMC_MAX_NAMELEN_STR		__stringify(GPIOMMC_MAX_NAMELEN)
-+
-+/**
-+ * struct gpiommc_pins - Hardware pin assignments
-+ *
-+ * @gpio_di: The GPIO number of the DATA IN pin
-+ * @gpio_do: The GPIO number of the DATA OUT pin
-+ * @gpio_clk: The GPIO number of the CLOCK pin
-+ * @gpio_cs: The GPIO number of the CHIPSELECT pin
-+ * @cs_activelow: If true, the chip is considered selected if @gpio_cs is low.
-+ */
-+struct gpiommc_pins {
-+	unsigned int gpio_di;
-+	unsigned int gpio_do;
-+	unsigned int gpio_clk;
-+	unsigned int gpio_cs;
-+	bool cs_activelow;
-+};
-+
-+/**
-+ * struct gpiommc_platform_data - Platform data for a MMC-over-SPI-GPIO device.
-+ *
-+ * @name: The unique name string of the device.
-+ * @pins: The hardware pin assignments.
-+ * @mode: The hardware mode. This is either SPI_MODE_0,
-+ *        SPI_MODE_1, SPI_MODE_2 or SPI_MODE_3. See the SPI documentation.
-+ * @no_spi_delay: Do not use delays in the lowlevel SPI bitbanging code.
-+ *                This is not standards compliant, but may be required for some
-+ *                embedded machines to gain reasonable speed.
-+ * @max_bus_speed: The maximum speed of the SPI bus, in Hertz.
-+ */
-+struct gpiommc_platform_data {
-+	char name[GPIOMMC_MAX_NAMELEN + 1];
-+	struct gpiommc_pins pins;
-+	u8 mode;
-+	bool no_spi_delay;
-+	unsigned int max_bus_speed;
-+};
-+
-+/**
-+ * GPIOMMC_PLATDEV_NAME - The platform device name string.
-+ *
-+ * The name string that has to be used for platform_device_alloc
-+ * when allocating a gpiommc device.
-+ */
-+#define GPIOMMC_PLATDEV_NAME	"gpiommc"
-+
-+/**
-+ * gpiommc_next_id - Get another platform device ID number.
-+ *
-+ * This returns the next platform device ID number that has to be used
-+ * for platform_device_alloc. The ID is opaque and should not be used for
-+ * anything else.
-+ */
-+int gpiommc_next_id(void);
-+
-+#endif /* LINUX_GPIOMMC_H_ */
---- /dev/null
-+++ b/Documentation/gpiommc.txt
-@@ -0,0 +1,97 @@
-+GPIOMMC - Driver for an MMC/SD card on a bitbanging GPIO SPI bus
-+================================================================
-+
-+The gpiommc module hooks up the mmc_spi and spi_gpio modules for running an
-+MMC or SD card on GPIO pins.
-+
-+Two interfaces for registering a new MMC/SD card device are provided:
-+A static platform-device based mechanism and a dynamic configfs based interface.
-+
-+
-+Registering devices via platform-device
-+=======================================
-+
-+The platform-device interface is used for registering MMC/SD devices that are
-+part of the hardware platform. This is most useful only for embedded machines
-+with MMC/SD devices statically connected to the platform GPIO bus.
-+
-+The data structures are declared in <linux/mmc/gpiommc.h>.
-+
-+To register a new device, define an instance of struct gpiommc_platform_data.
-+This structure holds any information about how the device is hooked up to the
-+GPIO pins and what hardware modes the device supports. See the docbook-style
-+documentation in the header file for more information on the struct fields.
-+
-+Then allocate a new instance of a platform device by doing:
-+
-+	pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME, gpiommc_next_id());
-+
-+This will allocate the platform device data structures and hook it up to the
-+gpiommc driver.
-+Then add the gpiommc_platform_data to the platform device.
-+
-+	err = platform_device_add_data(pdev, pdata, sizeof(struct gpiommc_platform_data));
-+
-+You may free the local instance of struct gpiommc_platform_data now. (So the
-+struct may be allocated on the stack, too).
-+Now simply register the platform device.
-+
-+	err = platform_device_add(pdev);
-+
-+Done. The gpiommc probe routine will be invoked now and you should see a kernel
-+log message for the added device.
-+
-+
-+Registering devices via configfs
-+================================
-+
-+MMC/SD cards connected via GPIO often are a pretty dynamic thing, as for example
-+selfmade hacks for soldering an MMC/SD card to standard GPIO pins on embedded
-+hardware are a common situation.
-+So we provide a dynamic interface to conveniently handle adding and removing
-+devices from userspace, without the need to recompile the kernel.
-+
-+The "gpiommc" subdirectory at the configfs mountpoint is used for handling
-+the dynamic configuration.
-+
-+To create a new device, it must first be allocated with mkdir.
-+The following command will allocate a device named "my_mmc":
-+	mkdir /config/gpiommc/my_mmc
-+
-+There are several configuration files available in the new
-+/config/gpiommc/my_mmc/ directory:
-+
-+gpio_data_in			= The SPI data-IN GPIO pin number.
-+gpio_data_out			= The SPI data-OUT GPIO pin number.
-+gpio_clock			= The SPI Clock GPIO pin number.
-+gpio_chipselect			= The SPI Chipselect GPIO pin number.
-+gpio_chipselect_activelow	= Boolean. If 0, Chipselect is active-HIGH.
-+				  If 1, Chipselect is active-LOW.
-+spi_mode			= The SPI data mode. Can be 0-3.
-+spi_delay			= Enable all delays in the lowlevel bitbanging.
-+max_bus_speed			= The maximum SPI bus speed. In Hertz.
-+
-+register			= Not a configuration parameter.
-+				  Used to register the configured card
-+				  with the kernel.
-+
-+The device must first get configured and then registered by writing "1" to
-+the "register" file.
-+The configuration parameters "gpio_data_in", "gpio_data_out", "gpio_clock"
-+and "gpio_chipselect" are essential and _must_ be configured before writing
-+"1" to the "register" file. The registration will fail, otherwise.
-+
-+The default values for the other parameters are:
-+gpio_chipselect_activelow	= 1		(CS active-LOW)
-+spi_mode			= 0		(SPI_MODE_0)
-+spi_delay			= 1		(enabled)
-+max_bus_speed			= 5000000	(5 Mhz)
-+
-+Configuration values can not be changed after registration. To unregister
-+the device, write a "0" to the "register" file. The configuration can be
-+changed again after unregistering.
-+
-+To completely remove the device, simply rmdir the directory
-+(/config/gpiommc/my_mmc in this example).
-+There's no need to first unregister the device before removing it. That will
-+be done automatically.
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -2443,6 +2443,11 @@ T:	git git://git.kernel.org/pub/scm/linu
- S:	Maintained
- F:	drivers/media/video/gspca/
- 
-+GPIOMMC DRIVER
-+P:	Michael Buesch
-+M:	mb@bu3sch.de
-+S:	Maintained
-+
- HARDWARE MONITORING
- L:	lm-sensors@lm-sensors.org
- W:	http://www.lm-sensors.org/
diff --git a/target/linux/generic-2.6/patches-2.6.33/923-gpiommc-configfs-locking.patch b/target/linux/generic-2.6/patches-2.6.33/923-gpiommc-configfs-locking.patch
deleted file mode 100644
index 2e4e820b2..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/923-gpiommc-configfs-locking.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-The gpiommc configfs context structure needs locking, as configfs
-does not lock access between files.
-
---- a/drivers/mmc/host/gpiommc.c
-+++ b/drivers/mmc/host/gpiommc.c
-@@ -143,6 +143,8 @@ struct gpiommc_configfs_device {
- 	struct platform_device *pdev;
- 	/* The configuration */
- 	struct gpiommc_platform_data pdata;
-+	/* Mutex to protect this structure */
-+	struct mutex mutex;
- };
- 
- #define GPIO_INVALID	-1
-@@ -233,6 +235,8 @@ static ssize_t gpiommc_config_attr_show(
- 	unsigned int gpio;
- 	int err = 0;
- 
-+	mutex_lock(&dev->mutex);
-+
- 	if (attr == &gpiommc_attr_DI) {
- 		gpio = dev->pdata.pins.gpio_di;
- 		if (gpio == GPIO_INVALID)
-@@ -293,6 +297,8 @@ static ssize_t gpiommc_config_attr_show(
- 	WARN_ON(1);
- 	err = -ENOSYS;
- out:
-+	mutex_unlock(&dev->mutex);
-+
- 	return err ? err : count;
- }
- 
-@@ -352,6 +358,8 @@ static ssize_t gpiommc_config_attr_store
- 	int err = -EINVAL;
- 	unsigned long data;
- 
-+	mutex_lock(&dev->mutex);
-+
- 	if (attr == &gpiommc_attr_register) {
- 		err = strict_strtoul(page, 10, &data);
- 		if (err)
-@@ -477,6 +485,8 @@ static ssize_t gpiommc_config_attr_store
- 	WARN_ON(1);
- 	err = -ENOSYS;
- out:
-+	mutex_unlock(&dev->mutex);
-+
- 	return err ? err : count;
- }
- 
-@@ -513,6 +523,7 @@ static struct config_item *gpiommc_make_
- 	if (!dev)
- 		return NULL;
- 
-+	mutex_init(&dev->mutex);
- 	config_item_init_type_name(&dev->item, name,
- 				   &gpiommc_dev_ci_type);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.33/924-cs5535_gpio.patch b/target/linux/generic-2.6/patches-2.6.33/924-cs5535_gpio.patch
deleted file mode 100644
index 9081be84a..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/924-cs5535_gpio.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- a/drivers/char/cs5535_gpio.c
-+++ b/drivers/char/cs5535_gpio.c
-@@ -15,6 +15,7 @@
- #include <linux/kernel.h>
- #include <linux/init.h>
- #include <linux/cdev.h>
-+#include <linux/device.h>
- #include <linux/ioport.h>
- #include <linux/pci.h>
- 
-@@ -48,6 +49,7 @@ static struct pci_device_id divil_pci[]
- MODULE_DEVICE_TABLE(pci, divil_pci);
- 
- static struct cdev cs5535_gpio_cdev;
-+static struct class *cs5535_gpio_class;
- 
- /* reserve 32 entries even though some aren't usable */
- #define CS5535_GPIO_COUNT	32
-@@ -66,9 +68,14 @@ static struct gpio_regmap rm[] =
- 	{ 0x30, 0x00, '1', '0' },	/* GPIOx_READ_BACK / GPIOx_OUT_VAL */
- 	{ 0x20, 0x20, 'I', 'i' },	/* GPIOx_IN_EN */
- 	{ 0x04, 0x04, 'O', 'o' },	/* GPIOx_OUT_EN */
-+	{ 0x10, 0x10, 'A', 'a' },	/* GPIOx_OUT_AUX1_SEL */
-+	{ 0x14, 0x14, 'B', 'b' },	/* GPIOx_OUT_AUX2_SEL */
- 	{ 0x08, 0x08, 't', 'T' },	/* GPIOx_OUT_OD_EN */
- 	{ 0x18, 0x18, 'P', 'p' },	/* GPIOx_OUT_PU_EN */
- 	{ 0x1c, 0x1c, 'D', 'd' },	/* GPIOx_OUT_PD_EN */
-+	{ 0x24, 0x24, 'N', 'n' },	/* GPIOx_IN_INV_EN */
-+	{ 0x0c, 0x0c, 'X', 'x' },	/* GPIOx_OUT_INV_EN */
-+	{ 0x00, 0x00, 'H', 'L' },	/* GPIOx_OUT_VAL */
- };
- 
- 
-@@ -176,7 +183,7 @@ static int __init cs5535_gpio_init(void)
- {
- 	dev_t	dev_id;
- 	u32	low, hi;
--	int	retval;
-+	int	retval, i;
- 
- 	if (pci_dev_present(divil_pci) == 0) {
- 		printk(KERN_WARNING NAME ": DIVIL not found\n");
-@@ -231,23 +238,54 @@ static int __init cs5535_gpio_init(void)
- 		major = MAJOR(dev_id);
- 	}
- 
--	if (retval) {
--		release_region(gpio_base, CS5535_GPIO_SIZE);
--		return -1;
--	}
-+	if (retval)
-+		goto error;
- 
- 	printk(KERN_DEBUG NAME ": base=%#x mask=%#lx major=%d\n",
- 	       gpio_base, mask, major);
- 
- 	cdev_init(&cs5535_gpio_cdev, &cs5535_gpio_fops);
--	cdev_add(&cs5535_gpio_cdev, dev_id, CS5535_GPIO_COUNT);
-+	retval = cdev_add(&cs5535_gpio_cdev, dev_id, CS5535_GPIO_COUNT);
-+	if (retval) {
-+		kobject_put(&cs5535_gpio_cdev.kobj);
-+		goto error_region;
-+	}
-+
-+	cs5535_gpio_class = class_create(THIS_MODULE, "cs5535_gpio");
-+	if (IS_ERR(cs5535_gpio_class)) {
-+		printk(KERN_ERR "Error creating cs5535_gpio class\n");
-+		cdev_del(&cs5535_gpio_cdev);
-+		retval = PTR_ERR(cs5535_gpio_class);
-+		goto error_region;
-+	}
-+
-+	for (i = 0; i < CS5535_GPIO_COUNT; i++) {
-+		if (mask & (1<<i)) {
-+			device_create(cs5535_gpio_class, NULL, MKDEV(major, i), NULL, "cs5535_gpio%d", i);
-+		}
-+	}
- 
- 	return 0;
-+
-+error_region:
-+	unregister_chrdev_region(dev_id, CS5535_GPIO_COUNT);
-+error:
-+	release_region(gpio_base, CS5535_GPIO_SIZE);
-+	return retval;
- }
- 
- static void __exit cs5535_gpio_cleanup(void)
- {
- 	dev_t dev_id = MKDEV(major, 0);
-+	int i;
-+
-+	for (i = 0; i < CS5535_GPIO_COUNT; i++) {
-+		if (mask & (1<<i)) {
-+			device_destroy(cs5535_gpio_class, MKDEV(major, i));
-+		}
-+	}
-+
-+	class_destroy(cs5535_gpio_class);
- 
- 	cdev_del(&cs5535_gpio_cdev);
- 	unregister_chrdev_region(dev_id, CS5535_GPIO_COUNT);
diff --git a/target/linux/generic-2.6/patches-2.6.33/925-modify-i2c-gpio-initcall-level.patch b/target/linux/generic-2.6/patches-2.6.33/925-modify-i2c-gpio-initcall-level.patch
deleted file mode 100644
index 1708e33d0..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/925-modify-i2c-gpio-initcall-level.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/drivers/i2c/busses/i2c-gpio.c
-+++ b/drivers/i2c/busses/i2c-gpio.c
-@@ -210,7 +210,7 @@ static int __init i2c_gpio_init(void)
- 
- 	return ret;
- }
--module_init(i2c_gpio_init);
-+subsys_initcall(i2c_gpio_init);
- 
- static void __exit i2c_gpio_exit(void)
- {
diff --git a/target/linux/generic-2.6/patches-2.6.33/940-wireless_mesh_header.patch b/target/linux/generic-2.6/patches-2.6.33/940-wireless_mesh_header.patch
deleted file mode 100644
index 8fbd2a4dc..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/940-wireless_mesh_header.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -137,7 +137,7 @@ static inline bool dev_xmit_complete(int
-  */
- 
- #if defined(CONFIG_WLAN) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
--# if defined(CONFIG_MAC80211_MESH)
-+# if 1 || defined(CONFIG_MAC80211_MESH)
- #  define LL_MAX_HEADER 128
- # else
- #  define LL_MAX_HEADER 96
diff --git a/target/linux/generic-2.6/patches-2.6.33/951-revert_gcc4_4_fixes.patch b/target/linux/generic-2.6/patches-2.6.33/951-revert_gcc4_4_fixes.patch
deleted file mode 100644
index d2c76a8f2..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/951-revert_gcc4_4_fixes.patch
+++ /dev/null
@@ -1,524 +0,0 @@
---- a/arch/powerpc/boot/crtsavres.S
-+++ /dev/null
-@@ -1,233 +0,0 @@
--/*
-- * Special support for eabi and SVR4
-- *
-- *   Copyright (C) 1995, 1996, 1998, 2000, 2001 Free Software Foundation, Inc.
-- *   Copyright 2008 Freescale Semiconductor, Inc.
-- *   Written By Michael Meissner
-- *
-- * Based on gcc/config/rs6000/crtsavres.asm from gcc
-- *
-- * This file 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, or (at your option) any
-- * later version.
-- *
-- * In addition to the permissions in the GNU General Public License, the
-- * Free Software Foundation gives you unlimited permission to link the
-- * compiled version of this file with other programs, and to distribute
-- * those programs without any restriction coming from the use of this
-- * file.  (The General Public License restrictions do apply in other
-- * respects; for example, they cover modification of the file, and
-- * distribution when not linked into another program.)
-- *
-- * This file is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; see the file COPYING.  If not, write to
-- * the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-- * Boston, MA 02110-1301, USA.
-- *
-- *    As a special exception, if you link this library with files
-- *    compiled with GCC to produce an executable, this does not cause
-- *    the resulting executable to be covered by the GNU General Public License.
-- *    This exception does not however invalidate any other reasons why
-- *    the executable file might be covered by the GNU General Public License.
-- */
--
--	.file	"crtsavres.S"
--	.section ".text"
--
--/* On PowerPC64 Linux, these functions are provided by the linker.  */
--#ifndef __powerpc64__
--
--#define _GLOBAL(name) \
--	.type name,@function; \
--	.globl name; \
--name:
--
--/* Routines for saving integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer save area.  */
--
--_GLOBAL(_savegpr_14)
--_GLOBAL(_save32gpr_14)
--	stw	14,-72(11)	/* save gp registers */
--_GLOBAL(_savegpr_15)
--_GLOBAL(_save32gpr_15)
--	stw	15,-68(11)
--_GLOBAL(_savegpr_16)
--_GLOBAL(_save32gpr_16)
--	stw	16,-64(11)
--_GLOBAL(_savegpr_17)
--_GLOBAL(_save32gpr_17)
--	stw	17,-60(11)
--_GLOBAL(_savegpr_18)
--_GLOBAL(_save32gpr_18)
--	stw	18,-56(11)
--_GLOBAL(_savegpr_19)
--_GLOBAL(_save32gpr_19)
--	stw	19,-52(11)
--_GLOBAL(_savegpr_20)
--_GLOBAL(_save32gpr_20)
--	stw	20,-48(11)
--_GLOBAL(_savegpr_21)
--_GLOBAL(_save32gpr_21)
--	stw	21,-44(11)
--_GLOBAL(_savegpr_22)
--_GLOBAL(_save32gpr_22)
--	stw	22,-40(11)
--_GLOBAL(_savegpr_23)
--_GLOBAL(_save32gpr_23)
--	stw	23,-36(11)
--_GLOBAL(_savegpr_24)
--_GLOBAL(_save32gpr_24)
--	stw	24,-32(11)
--_GLOBAL(_savegpr_25)
--_GLOBAL(_save32gpr_25)
--	stw	25,-28(11)
--_GLOBAL(_savegpr_26)
--_GLOBAL(_save32gpr_26)
--	stw	26,-24(11)
--_GLOBAL(_savegpr_27)
--_GLOBAL(_save32gpr_27)
--	stw	27,-20(11)
--_GLOBAL(_savegpr_28)
--_GLOBAL(_save32gpr_28)
--	stw	28,-16(11)
--_GLOBAL(_savegpr_29)
--_GLOBAL(_save32gpr_29)
--	stw	29,-12(11)
--_GLOBAL(_savegpr_30)
--_GLOBAL(_save32gpr_30)
--	stw	30,-8(11)
--_GLOBAL(_savegpr_31)
--_GLOBAL(_save32gpr_31)
--	stw	31,-4(11)
--	blr
--
--/* Routines for restoring integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer restore area.  */
--
--_GLOBAL(_restgpr_14)
--_GLOBAL(_rest32gpr_14)
--	lwz	14,-72(11)	/* restore gp registers */
--_GLOBAL(_restgpr_15)
--_GLOBAL(_rest32gpr_15)
--	lwz	15,-68(11)
--_GLOBAL(_restgpr_16)
--_GLOBAL(_rest32gpr_16)
--	lwz	16,-64(11)
--_GLOBAL(_restgpr_17)
--_GLOBAL(_rest32gpr_17)
--	lwz	17,-60(11)
--_GLOBAL(_restgpr_18)
--_GLOBAL(_rest32gpr_18)
--	lwz	18,-56(11)
--_GLOBAL(_restgpr_19)
--_GLOBAL(_rest32gpr_19)
--	lwz	19,-52(11)
--_GLOBAL(_restgpr_20)
--_GLOBAL(_rest32gpr_20)
--	lwz	20,-48(11)
--_GLOBAL(_restgpr_21)
--_GLOBAL(_rest32gpr_21)
--	lwz	21,-44(11)
--_GLOBAL(_restgpr_22)
--_GLOBAL(_rest32gpr_22)
--	lwz	22,-40(11)
--_GLOBAL(_restgpr_23)
--_GLOBAL(_rest32gpr_23)
--	lwz	23,-36(11)
--_GLOBAL(_restgpr_24)
--_GLOBAL(_rest32gpr_24)
--	lwz	24,-32(11)
--_GLOBAL(_restgpr_25)
--_GLOBAL(_rest32gpr_25)
--	lwz	25,-28(11)
--_GLOBAL(_restgpr_26)
--_GLOBAL(_rest32gpr_26)
--	lwz	26,-24(11)
--_GLOBAL(_restgpr_27)
--_GLOBAL(_rest32gpr_27)
--	lwz	27,-20(11)
--_GLOBAL(_restgpr_28)
--_GLOBAL(_rest32gpr_28)
--	lwz	28,-16(11)
--_GLOBAL(_restgpr_29)
--_GLOBAL(_rest32gpr_29)
--	lwz	29,-12(11)
--_GLOBAL(_restgpr_30)
--_GLOBAL(_rest32gpr_30)
--	lwz	30,-8(11)
--_GLOBAL(_restgpr_31)
--_GLOBAL(_rest32gpr_31)
--	lwz	31,-4(11)
--	blr
--
--/* Routines for restoring integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer restore area.  */
--
--_GLOBAL(_restgpr_14_x)
--_GLOBAL(_rest32gpr_14_x)
--	lwz	14,-72(11)	/* restore gp registers */
--_GLOBAL(_restgpr_15_x)
--_GLOBAL(_rest32gpr_15_x)
--	lwz	15,-68(11)
--_GLOBAL(_restgpr_16_x)
--_GLOBAL(_rest32gpr_16_x)
--	lwz	16,-64(11)
--_GLOBAL(_restgpr_17_x)
--_GLOBAL(_rest32gpr_17_x)
--	lwz	17,-60(11)
--_GLOBAL(_restgpr_18_x)
--_GLOBAL(_rest32gpr_18_x)
--	lwz	18,-56(11)
--_GLOBAL(_restgpr_19_x)
--_GLOBAL(_rest32gpr_19_x)
--	lwz	19,-52(11)
--_GLOBAL(_restgpr_20_x)
--_GLOBAL(_rest32gpr_20_x)
--	lwz	20,-48(11)
--_GLOBAL(_restgpr_21_x)
--_GLOBAL(_rest32gpr_21_x)
--	lwz	21,-44(11)
--_GLOBAL(_restgpr_22_x)
--_GLOBAL(_rest32gpr_22_x)
--	lwz	22,-40(11)
--_GLOBAL(_restgpr_23_x)
--_GLOBAL(_rest32gpr_23_x)
--	lwz	23,-36(11)
--_GLOBAL(_restgpr_24_x)
--_GLOBAL(_rest32gpr_24_x)
--	lwz	24,-32(11)
--_GLOBAL(_restgpr_25_x)
--_GLOBAL(_rest32gpr_25_x)
--	lwz	25,-28(11)
--_GLOBAL(_restgpr_26_x)
--_GLOBAL(_rest32gpr_26_x)
--	lwz	26,-24(11)
--_GLOBAL(_restgpr_27_x)
--_GLOBAL(_rest32gpr_27_x)
--	lwz	27,-20(11)
--_GLOBAL(_restgpr_28_x)
--_GLOBAL(_rest32gpr_28_x)
--	lwz	28,-16(11)
--_GLOBAL(_restgpr_29_x)
--_GLOBAL(_rest32gpr_29_x)
--	lwz	29,-12(11)
--_GLOBAL(_restgpr_30_x)
--_GLOBAL(_rest32gpr_30_x)
--	lwz	30,-8(11)
--_GLOBAL(_restgpr_31_x)
--_GLOBAL(_rest32gpr_31_x)
--	lwz	0,4(11)
--	lwz	31,-4(11)
--	mtlr	0
--	mr	1,11
--	blr
--#endif
---- a/arch/powerpc/boot/Makefile
-+++ b/arch/powerpc/boot/Makefile
-@@ -60,7 +60,7 @@ libfdtheader := fdt.h libfdt.h libfdt_in
- $(addprefix $(obj)/,$(libfdt) libfdt-wrapper.o simpleboot.o): \
- 	$(addprefix $(obj)/,$(libfdtheader))
- 
--src-wlib := string.S crt0.S crtsavres.S stdio.c main.c \
-+src-wlib := string.S crt0.S stdio.c main.c \
- 		$(libfdt) libfdt-wrapper.c \
- 		ns16550.c serial.c simple_alloc.c div64.S util.S \
- 		gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \
---- a/arch/powerpc/kernel/prom_init_check.sh
-+++ b/arch/powerpc/kernel/prom_init_check.sh
-@@ -48,20 +48,6 @@ do
- 		fi
- 	done
- 
--	# ignore register save/restore funcitons
--	if [ "${UNDEF:0:9}" = "_restgpr_" ]; then
--		OK=1
--	fi
--	if [ "${UNDEF:0:11}" = "_rest32gpr_" ]; then
--		OK=1
--	fi
--	if [ "${UNDEF:0:9}" = "_savegpr_" ]; then
--		OK=1
--	fi
--	if [ "${UNDEF:0:11}" = "_save32gpr_" ]; then
--		OK=1
--	fi
--
- 	if [ $OK -eq 0 ]; then
- 		ERROR=1
- 		echo "Error: External symbol '$UNDEF' referenced" \
---- a/arch/powerpc/lib/crtsavres.S
-+++ /dev/null
-@@ -1,229 +0,0 @@
--/*
-- * Special support for eabi and SVR4
-- *
-- *   Copyright (C) 1995, 1996, 1998, 2000, 2001 Free Software Foundation, Inc.
-- *   Copyright 2008 Freescale Semiconductor, Inc.
-- *   Written By Michael Meissner
-- *
-- * Based on gcc/config/rs6000/crtsavres.asm from gcc
-- *
-- * This file 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, or (at your option) any
-- * later version.
-- *
-- * In addition to the permissions in the GNU General Public License, the
-- * Free Software Foundation gives you unlimited permission to link the
-- * compiled version of this file with other programs, and to distribute
-- * those programs without any restriction coming from the use of this
-- * file.  (The General Public License restrictions do apply in other
-- * respects; for example, they cover modification of the file, and
-- * distribution when not linked into another program.)
-- *
-- * This file is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; see the file COPYING.  If not, write to
-- * the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-- * Boston, MA 02110-1301, USA.
-- *
-- *    As a special exception, if you link this library with files
-- *    compiled with GCC to produce an executable, this does not cause
-- *    the resulting executable to be covered by the GNU General Public License.
-- *    This exception does not however invalidate any other reasons why
-- *    the executable file might be covered by the GNU General Public License.
-- */
--
--#include <asm/ppc_asm.h>
--
--	.file	"crtsavres.S"
--	.section ".text"
--
--#ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
--
--/* Routines for saving integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer save area.  */
--
--_GLOBAL(_savegpr_14)
--_GLOBAL(_save32gpr_14)
--	stw	14,-72(11)	/* save gp registers */
--_GLOBAL(_savegpr_15)
--_GLOBAL(_save32gpr_15)
--	stw	15,-68(11)
--_GLOBAL(_savegpr_16)
--_GLOBAL(_save32gpr_16)
--	stw	16,-64(11)
--_GLOBAL(_savegpr_17)
--_GLOBAL(_save32gpr_17)
--	stw	17,-60(11)
--_GLOBAL(_savegpr_18)
--_GLOBAL(_save32gpr_18)
--	stw	18,-56(11)
--_GLOBAL(_savegpr_19)
--_GLOBAL(_save32gpr_19)
--	stw	19,-52(11)
--_GLOBAL(_savegpr_20)
--_GLOBAL(_save32gpr_20)
--	stw	20,-48(11)
--_GLOBAL(_savegpr_21)
--_GLOBAL(_save32gpr_21)
--	stw	21,-44(11)
--_GLOBAL(_savegpr_22)
--_GLOBAL(_save32gpr_22)
--	stw	22,-40(11)
--_GLOBAL(_savegpr_23)
--_GLOBAL(_save32gpr_23)
--	stw	23,-36(11)
--_GLOBAL(_savegpr_24)
--_GLOBAL(_save32gpr_24)
--	stw	24,-32(11)
--_GLOBAL(_savegpr_25)
--_GLOBAL(_save32gpr_25)
--	stw	25,-28(11)
--_GLOBAL(_savegpr_26)
--_GLOBAL(_save32gpr_26)
--	stw	26,-24(11)
--_GLOBAL(_savegpr_27)
--_GLOBAL(_save32gpr_27)
--	stw	27,-20(11)
--_GLOBAL(_savegpr_28)
--_GLOBAL(_save32gpr_28)
--	stw	28,-16(11)
--_GLOBAL(_savegpr_29)
--_GLOBAL(_save32gpr_29)
--	stw	29,-12(11)
--_GLOBAL(_savegpr_30)
--_GLOBAL(_save32gpr_30)
--	stw	30,-8(11)
--_GLOBAL(_savegpr_31)
--_GLOBAL(_save32gpr_31)
--	stw	31,-4(11)
--	blr
--
--/* Routines for restoring integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer restore area.  */
--
--_GLOBAL(_restgpr_14)
--_GLOBAL(_rest32gpr_14)
--	lwz	14,-72(11)	/* restore gp registers */
--_GLOBAL(_restgpr_15)
--_GLOBAL(_rest32gpr_15)
--	lwz	15,-68(11)
--_GLOBAL(_restgpr_16)
--_GLOBAL(_rest32gpr_16)
--	lwz	16,-64(11)
--_GLOBAL(_restgpr_17)
--_GLOBAL(_rest32gpr_17)
--	lwz	17,-60(11)
--_GLOBAL(_restgpr_18)
--_GLOBAL(_rest32gpr_18)
--	lwz	18,-56(11)
--_GLOBAL(_restgpr_19)
--_GLOBAL(_rest32gpr_19)
--	lwz	19,-52(11)
--_GLOBAL(_restgpr_20)
--_GLOBAL(_rest32gpr_20)
--	lwz	20,-48(11)
--_GLOBAL(_restgpr_21)
--_GLOBAL(_rest32gpr_21)
--	lwz	21,-44(11)
--_GLOBAL(_restgpr_22)
--_GLOBAL(_rest32gpr_22)
--	lwz	22,-40(11)
--_GLOBAL(_restgpr_23)
--_GLOBAL(_rest32gpr_23)
--	lwz	23,-36(11)
--_GLOBAL(_restgpr_24)
--_GLOBAL(_rest32gpr_24)
--	lwz	24,-32(11)
--_GLOBAL(_restgpr_25)
--_GLOBAL(_rest32gpr_25)
--	lwz	25,-28(11)
--_GLOBAL(_restgpr_26)
--_GLOBAL(_rest32gpr_26)
--	lwz	26,-24(11)
--_GLOBAL(_restgpr_27)
--_GLOBAL(_rest32gpr_27)
--	lwz	27,-20(11)
--_GLOBAL(_restgpr_28)
--_GLOBAL(_rest32gpr_28)
--	lwz	28,-16(11)
--_GLOBAL(_restgpr_29)
--_GLOBAL(_rest32gpr_29)
--	lwz	29,-12(11)
--_GLOBAL(_restgpr_30)
--_GLOBAL(_rest32gpr_30)
--	lwz	30,-8(11)
--_GLOBAL(_restgpr_31)
--_GLOBAL(_rest32gpr_31)
--	lwz	31,-4(11)
--	blr
--
--/* Routines for restoring integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer restore area.  */
--
--_GLOBAL(_restgpr_14_x)
--_GLOBAL(_rest32gpr_14_x)
--	lwz	14,-72(11)	/* restore gp registers */
--_GLOBAL(_restgpr_15_x)
--_GLOBAL(_rest32gpr_15_x)
--	lwz	15,-68(11)
--_GLOBAL(_restgpr_16_x)
--_GLOBAL(_rest32gpr_16_x)
--	lwz	16,-64(11)
--_GLOBAL(_restgpr_17_x)
--_GLOBAL(_rest32gpr_17_x)
--	lwz	17,-60(11)
--_GLOBAL(_restgpr_18_x)
--_GLOBAL(_rest32gpr_18_x)
--	lwz	18,-56(11)
--_GLOBAL(_restgpr_19_x)
--_GLOBAL(_rest32gpr_19_x)
--	lwz	19,-52(11)
--_GLOBAL(_restgpr_20_x)
--_GLOBAL(_rest32gpr_20_x)
--	lwz	20,-48(11)
--_GLOBAL(_restgpr_21_x)
--_GLOBAL(_rest32gpr_21_x)
--	lwz	21,-44(11)
--_GLOBAL(_restgpr_22_x)
--_GLOBAL(_rest32gpr_22_x)
--	lwz	22,-40(11)
--_GLOBAL(_restgpr_23_x)
--_GLOBAL(_rest32gpr_23_x)
--	lwz	23,-36(11)
--_GLOBAL(_restgpr_24_x)
--_GLOBAL(_rest32gpr_24_x)
--	lwz	24,-32(11)
--_GLOBAL(_restgpr_25_x)
--_GLOBAL(_rest32gpr_25_x)
--	lwz	25,-28(11)
--_GLOBAL(_restgpr_26_x)
--_GLOBAL(_rest32gpr_26_x)
--	lwz	26,-24(11)
--_GLOBAL(_restgpr_27_x)
--_GLOBAL(_rest32gpr_27_x)
--	lwz	27,-20(11)
--_GLOBAL(_restgpr_28_x)
--_GLOBAL(_rest32gpr_28_x)
--	lwz	28,-16(11)
--_GLOBAL(_restgpr_29_x)
--_GLOBAL(_rest32gpr_29_x)
--	lwz	29,-12(11)
--_GLOBAL(_restgpr_30_x)
--_GLOBAL(_rest32gpr_30_x)
--	lwz	30,-8(11)
--_GLOBAL(_restgpr_31_x)
--_GLOBAL(_rest32gpr_31_x)
--	lwz	0,4(11)
--	lwz	31,-4(11)
--	mtlr	0
--	mr	1,11
--	blr
--#endif
---- a/arch/powerpc/lib/Makefile
-+++ b/arch/powerpc/lib/Makefile
-@@ -13,7 +13,7 @@ CFLAGS_REMOVE_feature-fixups.o = -pg
- 
- obj-y			:= string.o alloc.o \
- 			   checksum_$(CONFIG_WORD_SIZE).o
--obj-$(CONFIG_PPC32)	+= div64.o copy_32.o crtsavres.o
-+obj-$(CONFIG_PPC32)	+= div64.o copy_32.o
- obj-$(CONFIG_HAS_IOMEM)	+= devres.o
- 
- obj-$(CONFIG_PPC64)	+= copypage_64.o copyuser_64.o \
---- a/arch/powerpc/Makefile
-+++ b/arch/powerpc/Makefile
-@@ -92,8 +92,6 @@ endif
- else
- 	KBUILD_CFLAGS += $(call cc-option,-mtune=power4)
- endif
--else
--LDFLAGS_MODULE	+= arch/powerpc/lib/crtsavres.o
- endif
- 
- ifeq ($(CONFIG_TUNE_CELL),y)
diff --git a/target/linux/generic-2.6/patches-2.6.33/970-ocf_kbuild_integration.patch b/target/linux/generic-2.6/patches-2.6.33/970-ocf_kbuild_integration.patch
deleted file mode 100644
index 0c40bdc92..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/970-ocf_kbuild_integration.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -823,6 +823,8 @@ config CRYPTO_ANSI_CPRNG
- 	  ANSI X9.31 A.2.4. Not this option must be enabled if CRYPTO_FIPS 
- 	  is selected
- 
-+source "crypto/ocf/Kconfig"
-+
- source "drivers/crypto/Kconfig"
- 
- endif	# if CRYPTO
---- a/crypto/Makefile
-+++ b/crypto/Makefile
-@@ -86,6 +86,11 @@ obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o
- obj-$(CONFIG_CRYPTO_GHASH) += ghash-generic.o
- 
- #
-+# OCF
-+#
-+obj-$(CONFIG_OCF_OCF) += ocf/
-+
-+#
- # generic algorithms and the async_tx api
- #
- obj-$(CONFIG_XOR_BLOCKS) += xor.o
diff --git a/target/linux/generic-2.6/patches-2.6.33/971-ocf_20080917.patch b/target/linux/generic-2.6/patches-2.6.33/971-ocf_20080917.patch
deleted file mode 100644
index 575e36911..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/971-ocf_20080917.patch
+++ /dev/null
@@ -1,152 +0,0 @@
---- a/drivers/char/random.c
-+++ b/drivers/char/random.c
-@@ -129,6 +129,9 @@
-  *                                unsigned int value);
-  * 	void add_interrupt_randomness(int irq);
-  *
-+ *      void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
-+ *      int random_input_wait(void);
-+ *
-  * add_input_randomness() uses the input layer interrupt timing, as well as
-  * the event type information from the hardware.
-  *
-@@ -140,6 +143,13 @@
-  * a better measure, since the timing of the disk interrupts are more
-  * unpredictable.
-  *
-+ * random_input_words() just provides a raw block of entropy to the input
-+ * pool, such as from a hardware entropy generator.
-+ *
-+ * random_input_wait() suspends the caller until such time as the
-+ * entropy pool falls below the write threshold, and returns a count of how
-+ * much entropy (in bits) is needed to sustain the pool.
-+ *
-  * All of these routines try to estimate how many bits of randomness a
-  * particular randomness source.  They do this by keeping track of the
-  * first and second order deltas of the event timings.
-@@ -714,6 +724,61 @@ void add_disk_randomness(struct gendisk
- }
- #endif
- 
-+/*
-+ * random_input_words - add bulk entropy to pool
-+ *
-+ * @buf: buffer to add
-+ * @wordcount: number of __u32 words to add
-+ * @ent_count: total amount of entropy (in bits) to credit
-+ *
-+ * this provides bulk input of entropy to the input pool
-+ *
-+ */
-+void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
-+{
-+	mix_pool_bytes(&input_pool, buf, wordcount*4);
-+
-+	credit_entropy_bits(&input_pool, ent_count);
-+
-+	DEBUG_ENT("crediting %d bits => %d\n",
-+		  ent_count, input_pool.entropy_count);
-+	/*
-+	 * Wake up waiting processes if we have enough
-+	 * entropy.
-+	 */
-+	if (input_pool.entropy_count >= random_read_wakeup_thresh)
-+		wake_up_interruptible(&random_read_wait);
-+}
-+EXPORT_SYMBOL(random_input_words);
-+
-+/*
-+ * random_input_wait - wait until random needs entropy
-+ *
-+ * this function sleeps until the /dev/random subsystem actually
-+ * needs more entropy, and then return the amount of entropy
-+ * that it would be nice to have added to the system.
-+ */
-+int random_input_wait(void)
-+{
-+	int count;
-+
-+	wait_event_interruptible(random_write_wait, 
-+			 input_pool.entropy_count < random_write_wakeup_thresh);
-+
-+	count = random_write_wakeup_thresh - input_pool.entropy_count;
-+
-+        /* likely we got woken up due to a signal */
-+	if (count <= 0) count = random_read_wakeup_thresh; 
-+
-+	DEBUG_ENT("requesting %d bits from input_wait()er %d<%d\n",
-+		  count,
-+		  input_pool.entropy_count, random_write_wakeup_thresh);
-+
-+	return count;
-+}
-+EXPORT_SYMBOL(random_input_wait);
-+
-+
- #define EXTRACT_SIZE 10
- 
- /*********************************************************************
---- a/fs/fcntl.c
-+++ b/fs/fcntl.c
-@@ -141,6 +141,7 @@ SYSCALL_DEFINE1(dup, unsigned int, filde
- 	}
- 	return ret;
- }
-+EXPORT_SYMBOL(sys_dup);
- 
- #define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME)
- 
---- a/include/linux/miscdevice.h
-+++ b/include/linux/miscdevice.h
-@@ -12,6 +12,7 @@
- #define APOLLO_MOUSE_MINOR	7
- #define PC110PAD_MINOR		9
- /*#define ADB_MOUSE_MINOR	10	FIXME OBSOLETE */
-+#define CRYPTODEV_MINOR		70	/* /dev/crypto */
- #define WATCHDOG_MINOR		130	/* Watchdog timer     */
- #define TEMP_MINOR		131	/* Temperature Sensor */
- #define RTC_MINOR		135
---- a/include/linux/random.h
-+++ b/include/linux/random.h
-@@ -34,6 +34,30 @@
- /* Clear the entropy pool and associated counters.  (Superuser only.) */
- #define RNDCLEARPOOL	_IO( 'R', 0x06 )
- 
-+#ifdef CONFIG_FIPS_RNG
-+
-+/* Size of seed value - equal to AES blocksize */
-+#define AES_BLOCK_SIZE_BYTES	16
-+#define SEED_SIZE_BYTES			AES_BLOCK_SIZE_BYTES
-+/* Size of AES key */
-+#define KEY_SIZE_BYTES		16
-+
-+/* ioctl() structure used by FIPS 140-2 Tests */
-+struct rand_fips_test {
-+	unsigned char key[KEY_SIZE_BYTES];			/* Input */
-+	unsigned char datetime[SEED_SIZE_BYTES];	/* Input */
-+	unsigned char seed[SEED_SIZE_BYTES];		/* Input */
-+	unsigned char result[SEED_SIZE_BYTES];		/* Output */
-+};
-+
-+/* FIPS 140-2 RNG Variable Seed Test. (Superuser only.) */
-+#define RNDFIPSVST	_IOWR('R', 0x10, struct rand_fips_test)
-+
-+/* FIPS 140-2 RNG Monte Carlo Test. (Superuser only.) */
-+#define RNDFIPSMCT	_IOWR('R', 0x11, struct rand_fips_test)
-+
-+#endif /* #ifdef CONFIG_FIPS_RNG */
-+
- struct rand_pool_info {
- 	int	entropy_count;
- 	int	buf_size;
-@@ -50,6 +74,10 @@ extern void add_input_randomness(unsigne
- 				 unsigned int value);
- extern void add_interrupt_randomness(int irq);
- 
-+extern void random_input_words(__u32 *buf, size_t wordcount, int ent_count);
-+extern int random_input_wait(void);
-+#define HAS_RANDOM_INPUT_WAIT 1
-+
- extern void get_random_bytes(void *buf, int nbytes);
- void generate_random_uuid(unsigned char uuid_out[16]);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.33/972-ocf_compile_fix.patch b/target/linux/generic-2.6/patches-2.6.33/972-ocf_compile_fix.patch
deleted file mode 100644
index a3fa22681..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/972-ocf_compile_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/crypto/ocf/cryptosoft.c
-+++ b/crypto/ocf/cryptosoft.c
-@@ -47,7 +47,7 @@
- #include <linux/mm.h>
- #include <linux/skbuff.h>
- #include <linux/random.h>
--#include <asm/scatterlist.h>
-+#include <linux/scatterlist.h>
- 
- #include <cryptodev.h>
- #include <uio.h>
diff --git a/target/linux/generic-2.6/patches-2.6.33/973-ocf_2.6.27_fix.patch b/target/linux/generic-2.6/patches-2.6.33/973-ocf_2.6.27_fix.patch
deleted file mode 100644
index ecb9bef51..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/973-ocf_2.6.27_fix.patch
+++ /dev/null
@@ -1,197 +0,0 @@
---- a/crypto/ocf/random.c
-+++ b/crypto/ocf/random.c
-@@ -49,6 +49,7 @@
- #include <linux/unistd.h>
- #include <linux/poll.h>
- #include <linux/random.h>
-+#include <linux/kthread.h>
- #include <cryptodev.h>
- 
- #ifdef CONFIG_OCF_FIPS
-@@ -81,7 +82,7 @@ struct random_op {
- 
- static int random_proc(void *arg);
- 
--static pid_t		randomproc = (pid_t) -1;
-+static struct task_struct *random_task;
- static spinlock_t	random_lock;
- 
- /*
-@@ -141,13 +142,18 @@ crypto_rregister(
- 	spin_lock_irqsave(&random_lock, flags);
- 	list_add_tail(&rops->random_list, &random_ops);
- 	if (!started) {
--		randomproc = kernel_thread(random_proc, NULL, CLONE_FS|CLONE_FILES);
--		if (randomproc < 0) {
--			ret = randomproc;
-+		struct task_struct *t;
-+
-+		t = kthread_create(random_proc, NULL, "ocf-random");
-+		if (IS_ERR(t)) {
-+			ret = PTR_ERR(t);
- 			printk("crypto: crypto_rregister cannot start random thread; "
- 					"error %d", ret);
--		} else
-+		} else {
-+			random_task = t;
-+			wake_up_process(t);
- 			started = 1;
-+		}
- 	}
- 	spin_unlock_irqrestore(&random_lock, flags);
- 
-@@ -172,7 +178,7 @@ crypto_runregister_all(u_int32_t driveri
- 
- 	spin_lock_irqsave(&random_lock, flags);
- 	if (list_empty(&random_ops) && started)
--		kill_proc(randomproc, SIGKILL, 1);
-+		send_sig(SIGKILL, random_task, 1);
- 	spin_unlock_irqrestore(&random_lock, flags);
- 	return(0);
- }
-@@ -308,7 +314,7 @@ random_proc(void *arg)
- 
- bad_alloc:
- 	spin_lock_irq(&random_lock);
--	randomproc = (pid_t) -1;
-+	random_task = NULL;
- 	started = 0;
- 	spin_unlock_irq(&random_lock);
- 
---- a/crypto/ocf/crypto.c
-+++ b/crypto/ocf/crypto.c
-@@ -74,6 +74,7 @@ __FBSDID("$FreeBSD: src/sys/opencrypto/c
- #include <linux/sched.h>
- #include <linux/spinlock.h>
- #include <linux/version.h>
-+#include <linux/kthread.h>
- #include <cryptodev.h>
- 
- /*
-@@ -255,10 +256,10 @@ module_param(crypto_devallowsoft, int, 0
- MODULE_PARM_DESC(crypto_devallowsoft,
- 	   "Enable/disable use of software crypto support");
- 
--static pid_t	cryptoproc = (pid_t) -1;
-+static struct task_struct *crypto_task;
- static struct	completion cryptoproc_exited;
- static DECLARE_WAIT_QUEUE_HEAD(cryptoproc_wait);
--static pid_t	cryptoretproc = (pid_t) -1;
-+static struct task_struct *cryptoret_task;
- static struct	completion cryptoretproc_exited;
- static DECLARE_WAIT_QUEUE_HEAD(cryptoretproc_wait);
- 
-@@ -1401,7 +1402,7 @@ crypto_proc(void *arg)
- 			wait_event_interruptible(cryptoproc_wait,
- 					!(list_empty(&crp_q) || crypto_all_qblocked) ||
- 					!(list_empty(&crp_kq) || crypto_all_kqblocked) ||
--					cryptoproc == (pid_t) -1);
-+					crypto_task == NULL);
- 			crp_sleep = 0;
- 			if (signal_pending (current)) {
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-@@ -1414,7 +1415,7 @@ crypto_proc(void *arg)
- 			}
- 			CRYPTO_Q_LOCK();
- 			dprintk("%s - awake\n", __FUNCTION__);
--			if (cryptoproc == (pid_t) -1)
-+			if (crypto_task == NULL)
- 				break;
- 			cryptostats.cs_intrs++;
- 		}
-@@ -1470,7 +1471,7 @@ crypto_ret_proc(void *arg)
- 			dprintk("%s - sleeping\n", __FUNCTION__);
- 			CRYPTO_RETQ_UNLOCK();
- 			wait_event_interruptible(cryptoretproc_wait,
--					cryptoretproc == (pid_t) -1 ||
-+					cryptoret_task == NULL ||
- 					!list_empty(&crp_ret_q) ||
- 					!list_empty(&crp_ret_kq));
- 			if (signal_pending (current)) {
-@@ -1484,7 +1485,7 @@ crypto_ret_proc(void *arg)
- 			}
- 			CRYPTO_RETQ_LOCK();
- 			dprintk("%s - awake\n", __FUNCTION__);
--			if (cryptoretproc == (pid_t) -1) {
-+			if (cryptoret_task == NULL) {
- 				dprintk("%s - EXITING!\n", __FUNCTION__);
- 				break;
- 			}
-@@ -1597,6 +1598,7 @@ DB_SHOW_COMMAND(kcrypto, db_show_kcrypto
- static int
- crypto_init(void)
- {
-+	struct task_struct *t;
- 	int error;
- 
- 	dprintk("%s(0x%x)\n", __FUNCTION__, (int) crypto_init);
-@@ -1643,23 +1645,27 @@ crypto_init(void)
- 	init_completion(&cryptoproc_exited);
- 	init_completion(&cryptoretproc_exited);
- 
--	cryptoproc = 0; /* to avoid race condition where proc runs first */
--	cryptoproc = kernel_thread(crypto_proc, NULL, CLONE_FS|CLONE_FILES);
--	if (cryptoproc < 0) {
--		error = cryptoproc;
-+	crypto_task = NULL; /* to avoid race condition where proc runs first */
-+	t = kthread_create(crypto_proc, NULL, "ocf-crypto");
-+	if (IS_ERR(t)) {
-+		error = PTR_ERR(t);
- 		printk("crypto: crypto_init cannot start crypto thread; error %d",
- 			error);
- 		goto bad;
- 	}
-+	wake_up_process(t);
-+	crypto_task = t;
- 
--	cryptoretproc = 0; /* to avoid race condition where proc runs first */
--	cryptoretproc = kernel_thread(crypto_ret_proc, NULL, CLONE_FS|CLONE_FILES);
--	if (cryptoretproc < 0) {
--		error = cryptoretproc;
-+	cryptoret_task = NULL; /* to avoid race condition where proc runs first */
-+	t = kthread_create(crypto_ret_proc, NULL, "ocf-cryptoret");
-+	if (IS_ERR(t)) {
-+		error = PTR_ERR(t);
- 		printk("crypto: crypto_init cannot start cryptoret thread; error %d",
- 				error);
- 		goto bad;
- 	}
-+	wake_up_process(t);
-+	cryptoret_task = t;
- 
- 	return 0;
- bad:
-@@ -1671,7 +1677,7 @@ bad:
- static void
- crypto_exit(void)
- {
--	pid_t p;
-+	struct task_struct *t;
- 	unsigned long d_flags;
- 
- 	dprintk("%s()\n", __FUNCTION__);
-@@ -1681,18 +1687,18 @@ crypto_exit(void)
- 	 */
- 
- 	CRYPTO_DRIVER_LOCK();
--	p = cryptoproc;
--	cryptoproc = (pid_t) -1;
--	kill_proc(p, SIGTERM, 1);
-+	t = crypto_task;
-+	crypto_task = NULL;
-+	send_sig(SIGTERM, t, 1);
- 	wake_up_interruptible(&cryptoproc_wait);
- 	CRYPTO_DRIVER_UNLOCK();
- 
- 	wait_for_completion(&cryptoproc_exited);
- 
- 	CRYPTO_DRIVER_LOCK();
--	p = cryptoretproc;
--	cryptoretproc = (pid_t) -1;
--	kill_proc(p, SIGTERM, 1);
-+	t = cryptoret_task;
-+	cryptoret_task = NULL;
-+	send_sig(SIGTERM, t, 1);
- 	wake_up_interruptible(&cryptoretproc_wait);
- 	CRYPTO_DRIVER_UNLOCK();
- 
diff --git a/target/linux/generic-2.6/patches-2.6.33/974-ssb_b43_default_on.patch b/target/linux/generic-2.6/patches-2.6.33/974-ssb_b43_default_on.patch
deleted file mode 100644
index 98dde2a3c..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/974-ssb_b43_default_on.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/drivers/ssb/Kconfig
-+++ b/drivers/ssb/Kconfig
-@@ -49,7 +49,7 @@ config SSB_PCIHOST
- config SSB_B43_PCI_BRIDGE
- 	bool
- 	depends on SSB_PCIHOST
--	default n
-+	default y
- 
- config SSB_PCMCIAHOST_POSSIBLE
- 	bool
diff --git a/target/linux/generic-2.6/patches-2.6.33/977-textsearch_kconfig_hacks.patch b/target/linux/generic-2.6/patches-2.6.33/977-textsearch_kconfig_hacks.patch
deleted file mode 100644
index 94d6b91d8..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/977-textsearch_kconfig_hacks.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -152,16 +152,16 @@ config REED_SOLOMON_DEC16
- # Textsearch support is select'ed if needed
- #
- config TEXTSEARCH
--	boolean
-+	boolean	"Textsearch support"
- 
- config TEXTSEARCH_KMP
--	tristate
-+	tristate "Textsearch KMP"
- 
- config TEXTSEARCH_BM
--	tristate
-+	tristate "Textsearch BM"
- 
- config TEXTSEARCH_FSM
--	tristate
-+	tristate "Textsearch FSM"
- 
- config HAS_IOMEM
- 	boolean
diff --git a/target/linux/generic-2.6/patches-2.6.33/978-lib80211_kconfig_hacks.patch b/target/linux/generic-2.6/patches-2.6.33/978-lib80211_kconfig_hacks.patch
deleted file mode 100644
index 05bb838c1..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/978-lib80211_kconfig_hacks.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/net/wireless/Kconfig
-+++ b/net/wireless/Kconfig
-@@ -141,13 +141,13 @@ config LIB80211
- 	  you want this built into your kernel.
- 
- config LIB80211_CRYPT_WEP
--	tristate
-+	tristate "LIB80211_CRYPT_WEP"
- 
- config LIB80211_CRYPT_CCMP
--	tristate
-+	tristate "LIB80211_CRYPT_CCMP"
- 
- config LIB80211_CRYPT_TKIP
--	tristate
-+	tristate "LIB80211_CRYPT_TKIP"
- 
- config LIB80211_DEBUG
- 	bool "lib80211 debugging messages"
diff --git a/target/linux/generic-2.6/patches-2.6.33/979-crypto_add_kconfig_prompts.patch b/target/linux/generic-2.6/patches-2.6.33/979-crypto_add_kconfig_prompts.patch
deleted file mode 100644
index b40b2cea9..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/979-crypto_add_kconfig_prompts.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -32,7 +32,7 @@ config CRYPTO_FIPS
- 	  option is selected
- 
- config CRYPTO_ALGAPI
--	tristate
-+	tristate "ALGAPI"
- 	select CRYPTO_ALGAPI2
- 	help
- 	  This option provides the API for cryptographic algorithms.
-@@ -41,7 +41,7 @@ config CRYPTO_ALGAPI2
- 	tristate
- 
- config CRYPTO_AEAD
--	tristate
-+	tristate "AEAD"
- 	select CRYPTO_AEAD2
- 	select CRYPTO_ALGAPI
- 
-@@ -50,7 +50,7 @@ config CRYPTO_AEAD2
- 	select CRYPTO_ALGAPI2
- 
- config CRYPTO_BLKCIPHER
--	tristate
-+	tristate "BLKCIPHER"
- 	select CRYPTO_BLKCIPHER2
- 	select CRYPTO_ALGAPI
- 
-@@ -61,7 +61,7 @@ config CRYPTO_BLKCIPHER2
- 	select CRYPTO_WORKQUEUE
- 
- config CRYPTO_HASH
--	tristate
-+	tristate "HASH"
- 	select CRYPTO_HASH2
- 	select CRYPTO_ALGAPI
- 
-@@ -70,7 +70,7 @@ config CRYPTO_HASH2
- 	select CRYPTO_ALGAPI2
- 
- config CRYPTO_RNG
--	tristate
-+	tristate "RNG"
- 	select CRYPTO_RNG2
- 	select CRYPTO_ALGAPI
- 
diff --git a/target/linux/generic-2.6/patches-2.6.33/980-vm_exports.patch b/target/linux/generic-2.6/patches-2.6.33/980-vm_exports.patch
deleted file mode 100644
index 2c3a55201..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/980-vm_exports.patch
+++ /dev/null
@@ -1,142 +0,0 @@
---- a/mm/shmem.c
-+++ b/mm/shmem.c
-@@ -29,6 +29,7 @@
- #include <linux/mm.h>
- #include <linux/module.h>
- #include <linux/swap.h>
-+#include <linux/ima.h>
- 
- static struct vfsmount *shm_mnt;
- 
-@@ -2620,6 +2621,16 @@ int shmem_lock(struct file *file, int lo
- 
- /* common code */
- 
-+void shmem_set_file(struct vm_area_struct *vma, struct file *file)
-+{
-+	ima_counts_get(file);
-+	if (vma->vm_file)
-+		fput(vma->vm_file);
-+	vma->vm_file = file;
-+	vma->vm_ops = &shmem_vm_ops;
-+}
-+EXPORT_SYMBOL_GPL(shmem_set_file);
-+
- /**
-  * shmem_file_setup - get an unlinked file living in tmpfs
-  * @name: name for dentry (to be seen in /proc/<pid>/maps
-@@ -2697,9 +2708,6 @@ int shmem_zero_setup(struct vm_area_stru
- 	if (IS_ERR(file))
- 		return PTR_ERR(file);
- 
--	if (vma->vm_file)
--		fput(vma->vm_file);
--	vma->vm_file = file;
--	vma->vm_ops = &shmem_vm_ops;
-+	shmem_set_file(vma, file);
- 	return 0;
- }
---- a/fs/file.c
-+++ b/fs/file.c
-@@ -271,6 +271,7 @@ int expand_files(struct files_struct *fi
- 	/* All good, so we try */
- 	return expand_fdtable(files, nr);
- }
-+EXPORT_SYMBOL_GPL(expand_files);
- 
- static int count_open_files(struct fdtable *fdt)
- {
---- a/kernel/exit.c
-+++ b/kernel/exit.c
-@@ -508,6 +508,7 @@ struct files_struct *get_files_struct(st
- 
- 	return files;
- }
-+EXPORT_SYMBOL_GPL(get_files_struct);
- 
- void put_files_struct(struct files_struct *files)
- {
-@@ -527,6 +528,7 @@ void put_files_struct(struct files_struc
- 		free_fdtable(fdt);
- 	}
- }
-+EXPORT_SYMBOL_GPL(put_files_struct);
- 
- void reset_files_struct(struct files_struct *files)
- {
---- a/kernel/fork.c
-+++ b/kernel/fork.c
-@@ -169,6 +169,7 @@ void __put_task_struct(struct task_struc
- 	if (!profile_handoff_task(tsk))
- 		free_task(tsk);
- }
-+EXPORT_SYMBOL_GPL(__put_task_struct);
- 
- /*
-  * macro override instead of weak attribute alias, to workaround
---- a/kernel/sched.c
-+++ b/kernel/sched.c
-@@ -6171,6 +6171,7 @@ int can_nice(const struct task_struct *p
- 	return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
- 		capable(CAP_SYS_NICE));
- }
-+EXPORT_SYMBOL_GPL(can_nice);
- 
- #ifdef __ARCH_WANT_SYS_NICE
- 
---- a/mm/memory.c
-+++ b/mm/memory.c
-@@ -1115,6 +1115,7 @@ unsigned long zap_page_range(struct vm_a
- 		tlb_finish_mmu(tlb, address, end);
- 	return end;
- }
-+EXPORT_SYMBOL_GPL(zap_page_range);
- 
- /**
-  * zap_vma_ptes - remove ptes mapping the vma
-@@ -2501,6 +2502,7 @@ int vmtruncate_range(struct inode *inode
- 
- 	return 0;
- }
-+EXPORT_SYMBOL_GPL(vmtruncate_range);
- 
- /*
-  * We enter with non-exclusive mmap_sem (to exclude vma changes,
---- a/mm/vmalloc.c
-+++ b/mm/vmalloc.c
-@@ -1173,6 +1173,7 @@ void unmap_kernel_range(unsigned long ad
- 	vunmap_page_range(addr, end);
- 	flush_tlb_kernel_range(addr, end);
- }
-+EXPORT_SYMBOL_GPL(unmap_kernel_range);
- 
- int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
- {
-@@ -1288,6 +1289,7 @@ struct vm_struct *get_vm_area(unsigned l
- 	return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END,
- 				-1, GFP_KERNEL, __builtin_return_address(0));
- }
-+EXPORT_SYMBOL_GPL(get_vm_area);
- 
- struct vm_struct *get_vm_area_caller(unsigned long size, unsigned long flags,
- 				void *caller)
---- a/include/linux/mm.h
-+++ b/include/linux/mm.h
-@@ -725,6 +725,7 @@ extern void show_free_areas(void);
- 
- int shmem_lock(struct file *file, int lock, struct user_struct *user);
- struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags);
-+void shmem_set_file(struct vm_area_struct *vma, struct file *file);
- int shmem_zero_setup(struct vm_area_struct *);
- 
- #ifndef CONFIG_MMU
---- a/kernel/signal.c
-+++ b/kernel/signal.c
-@@ -1104,6 +1104,7 @@ struct sighand_struct *lock_task_sighand
- 
- 	return sighand;
- }
-+EXPORT_SYMBOL(lock_task_sighand);
- 
- /*
-  * send signal info to all the members of a group
diff --git a/target/linux/generic-2.6/patches-2.6.33/981-wireless_ext_kconfig_hack.patch b/target/linux/generic-2.6/patches-2.6.33/981-wireless_ext_kconfig_hack.patch
deleted file mode 100644
index daac5898a..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/981-wireless_ext_kconfig_hack.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/net/wireless/Kconfig
-+++ b/net/wireless/Kconfig
-@@ -1,5 +1,5 @@
- config WIRELESS_EXT
--	bool
-+	bool "Wireless extensions"
- 
- config WEXT_CORE
- 	def_bool y
-@@ -11,10 +11,10 @@ config WEXT_PROC
- 	depends on WEXT_CORE
- 
- config WEXT_SPY
--	bool
-+	bool "WEXT_SPY"
- 
- config WEXT_PRIV
--	bool
-+	bool "WEXT_PRIV"
- 
- config CFG80211
- 	tristate "cfg80211 - wireless configuration API"
diff --git a/target/linux/generic-2.6/patches-2.6.33/985-cris-headers.patch b/target/linux/generic-2.6/patches-2.6.33/985-cris-headers.patch
deleted file mode 100644
index 73ede933b..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/985-cris-headers.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/arch/cris/include/arch-v10/arch/Kbuild
-+++ b/arch/cris/include/arch-v10/arch/Kbuild
-@@ -1,3 +1,5 @@
-+header-y += elf.h
-+header-y += ptrace.h
- header-y += user.h
- header-y += svinto.h
- header-y += sv_addr_ag.h
---- a/arch/cris/include/asm/Kbuild
-+++ b/arch/cris/include/asm/Kbuild
-@@ -1,11 +1,14 @@
- include include/asm-generic/Kbuild.asm
- 
--header-y += arch-v10/
--header-y += arch-v32/
-+header-y += ../arch-v10/arch/
-+header-y += ../arch-v32/arch/
- 
-+header-y += elf.h
- header-y += ethernet.h
-+header-y += page.h
- header-y += rtc.h
- header-y += sync_serial.h
-+header-y += user.h
- 
- unifdef-y += etraxgpio.h
- unifdef-y += rs485.h
diff --git a/target/linux/generic-2.6/patches-2.6.33/991-ppc4xx_optimization.patch b/target/linux/generic-2.6/patches-2.6.33/991-ppc4xx_optimization.patch
deleted file mode 100644
index 0efb77780..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/991-ppc4xx_optimization.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Upstream doesn't optimize the kernel and bootwrappers for ppc44x because
-they still want to support gcc 3.3 -- well, we don't.
-
---- a/arch/powerpc/Makefile
-+++ b/arch/powerpc/Makefile
-@@ -123,7 +123,8 @@ ifeq ($(CONFIG_FUNCTION_TRACER),y)
- KBUILD_CFLAGS		+= -mno-sched-epilog
- endif
- 
--cpu-as-$(CONFIG_4xx)		+= -Wa,-m405
-+cpu-as-$(CONFIG_40x)		+= -Wa,-m405
-+cpu-as-$(CONFIG_44x)		+= -Wa,-m440
- cpu-as-$(CONFIG_6xx)		+= -Wa,-maltivec
- cpu-as-$(CONFIG_POWER4)		+= -Wa,-maltivec
- cpu-as-$(CONFIG_E500)		+= -Wa,-me500
---- a/arch/powerpc/boot/Makefile
-+++ b/arch/powerpc/boot/Makefile
-@@ -38,10 +38,10 @@ BOOTCFLAGS	+= -I$(obj) -I$(srctree)/$(ob
- DTS_FLAGS	?= -p 1024
- 
- $(obj)/4xx.o: BOOTCFLAGS += -mcpu=405
--$(obj)/ebony.o: BOOTCFLAGS += -mcpu=405
-+$(obj)/ebony.o: BOOTCFLAGS += -mcpu=440
- $(obj)/cuboot-hotfoot.o: BOOTCFLAGS += -mcpu=405
--$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405
--$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405
-+$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=440
-+$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=440
- $(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405
- $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
- $(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405
diff --git a/target/linux/generic-2.6/patches-2.6.33/997-lzo_decompressor_fix.patch b/target/linux/generic-2.6/patches-2.6.33/997-lzo_decompressor_fix.patch
deleted file mode 100644
index 450986538..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/997-lzo_decompressor_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/usr/Kconfig
-+++ b/usr/Kconfig
-@@ -75,7 +75,7 @@ config RD_LZMA
- config RD_LZO
- 	bool "Support initial ramdisks compressed using LZO" if EMBEDDED
- 	default !EMBEDDED
--	depends on BLK_DEV_INITRD
-+	depends on BLK_DEV_INITRD && HAVE_KERNEL_LZO
- 	select DECOMPRESS_LZO
- 	help
- 	  Support loading of a LZO encoded initial ramdisk or cpio buffer
diff --git a/target/linux/generic-2.6/patches-2.6.33/998-openwrt_lzma_options.patch b/target/linux/generic-2.6/patches-2.6.33/998-openwrt_lzma_options.patch
deleted file mode 100644
index 63834d65e..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/998-openwrt_lzma_options.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/scripts/Makefile.lib
-+++ b/scripts/Makefile.lib
-@@ -238,7 +238,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)
- 
- quiet_cmd_lzma = LZMA    $@
- cmd_lzma = (cat $(filter-out FORCE,$^) | \
--	lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
-+	lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
- 	(rm -f $@ ; false)
- 
- quiet_cmd_lzo = LZO    $@
---- a/scripts/gen_initramfs_list.sh
-+++ b/scripts/gen_initramfs_list.sh
-@@ -225,7 +225,7 @@ cpio_list=
- output="/dev/stdout"
- output_file=""
- is_cpio_compressed=
--compr="gzip -9 -f"
-+compr="gzip -9 -f -"
- 
- arg="$1"
- case "$arg" in
-@@ -239,9 +239,9 @@ case "$arg" in
- 		output_file="$1"
- 		cpio_list="$(mktemp ${TMPDIR:-/tmp}/cpiolist.XXXXXX)"
- 		output=${cpio_list}
--		echo "$output_file" | grep -q "\.gz$" && compr="gzip -9 -f"
--		echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f"
--		echo "$output_file" | grep -q "\.lzma$" && compr="lzma -9 -f"
-+		echo "$output_file" | grep -q "\.gz$" && compr="gzip -9 -f -"
-+		echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f -"
-+		echo "$output_file" | grep -q "\.lzma$" && compr="lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so"
- 		echo "$output_file" | grep -q "\.cpio$" && compr="cat"
- 		shift
- 		;;
-@@ -292,7 +292,7 @@ if [ ! -z ${output_file} ]; then
- 	if [ "${is_cpio_compressed}" = "compressed" ]; then
- 		cat ${cpio_tfile} > ${output_file}
- 	else
--		(cat ${cpio_tfile} | ${compr}  - > ${output_file}) \
-+		(cat ${cpio_tfile} | ${compr} > ${output_file}) \
- 		|| (rm -f ${output_file} ; false)
- 	fi
- 	[ -z ${cpio_file} ] && rm ${cpio_tfile}
---- a/lib/decompress.c
-+++ b/lib/decompress.c
-@@ -36,6 +36,7 @@ static const struct compress_format {
- 	{ {037, 0236}, "gzip", gunzip },
- 	{ {0x42, 0x5a}, "bzip2", bunzip2 },
- 	{ {0x5d, 0x00}, "lzma", unlzma },
-+	{ {0x6d, 0x00}, "lzma-openwrt", unlzma },
- 	{ {0x89, 0x4c}, "lzo", unlzo },
- 	{ {0, 0}, NULL, NULL }
- };
diff --git a/target/linux/generic-2.6/patches-2.6.33/999-use_preinit_as_init.patch b/target/linux/generic-2.6/patches-2.6.33/999-use_preinit_as_init.patch
deleted file mode 100644
index c1f8ef075..000000000
--- a/target/linux/generic-2.6/patches-2.6.33/999-use_preinit_as_init.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/init/main.c
-+++ b/init/main.c
-@@ -831,10 +831,7 @@ static noinline int init_post(void)
- 		printk(KERN_WARNING "Failed to execute %s.  Attempting "
- 					"defaults...\n", execute_command);
- 	}
--	run_init_process("/sbin/init");
--	run_init_process("/etc/init");
--	run_init_process("/bin/init");
--	run_init_process("/bin/sh");
-+	run_init_process("/etc/preinit");
- 
- 	panic("No init found.  Try passing init= option to kernel.");
- }
diff --git a/target/linux/generic-2.6/patches-2.6.34/006-squashfs_add_lzma.patch b/target/linux/generic-2.6/patches-2.6.34/006-squashfs_add_lzma.patch
deleted file mode 100644
index 9fd57970f..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/006-squashfs_add_lzma.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-From f49e1efdd179d54e814ff2a8e8f469496583062c Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Tue, 20 Oct 2009 10:54:36 +0100
-Subject: [PATCH] Squashfs: add LZMA compression
-
-Add support for LZMA compressed filesystems.  This is an initial
-implementation.
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/Kconfig        |    5 ++
- fs/squashfs/Makefile       |    1 +
- fs/squashfs/decompressor.c |    4 +
- fs/squashfs/lzma_wrapper.c |  151 ++++++++++++++++++++++++++++++++++++++++++++
- fs/squashfs/squashfs.h     |    3 +
- 5 files changed, 164 insertions(+), 0 deletions(-)
- create mode 100644 fs/squashfs/lzma_wrapper.c
-
---- a/fs/squashfs/Kconfig
-+++ b/fs/squashfs/Kconfig
-@@ -26,6 +26,11 @@ config SQUASHFS
- 
- 	  If unsure, say N.
- 
-+config SQUASHFS_LZMA
-+	bool "Include support for LZMA compressed file systems"
-+	depends on SQUASHFS
-+	select DECOMPRESS_LZMA
-+
- config SQUASHFS_EMBEDDED
- 
- 	bool "Additional option for memory-constrained systems" 
---- a/fs/squashfs/Makefile
-+++ b/fs/squashfs/Makefile
-@@ -5,3 +5,4 @@
- obj-$(CONFIG_SQUASHFS) += squashfs.o
- squashfs-y += block.o cache.o dir.o export.o file.o fragment.o id.o inode.o
- squashfs-y += namei.o super.o symlink.o zlib_wrapper.o decompressor.o
-+squashfs-$(CONFIG_SQUASHFS_LZMA) += lzma_wrapper.o
---- a/fs/squashfs/decompressor.c
-+++ b/fs/squashfs/decompressor.c
-@@ -50,7 +50,11 @@ static const struct squashfs_decompresso
- 
- static const struct squashfs_decompressor *decompressor[] = {
- 	&squashfs_zlib_comp_ops,
-+#ifdef CONFIG_SQUASHFS_LZMA
-+	&squashfs_lzma_comp_ops,
-+#else
- 	&squashfs_lzma_unsupported_comp_ops,
-+#endif
- 	&squashfs_lzo_unsupported_comp_ops,
- 	&squashfs_unknown_comp_ops
- };
---- /dev/null
-+++ b/fs/squashfs/lzma_wrapper.c
-@@ -0,0 +1,151 @@
-+/*
-+ * Squashfs - a compressed read only filesystem for Linux
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-+ * Phillip Lougher <phillip@lougher.demon.co.uk>
-+ *
-+ * 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,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ *
-+ * lzma_wrapper.c
-+ */
-+
-+#include <asm/unaligned.h>
-+#include <linux/buffer_head.h>
-+#include <linux/mutex.h>
-+#include <linux/vmalloc.h>
-+#include <linux/decompress/unlzma.h>
-+
-+#include "squashfs_fs.h"
-+#include "squashfs_fs_sb.h"
-+#include "squashfs_fs_i.h"
-+#include "squashfs.h"
-+#include "decompressor.h"
-+
-+struct squashfs_lzma {
-+	void	*input;
-+	void	*output;
-+};
-+
-+/* decompress_unlzma.c is currently non re-entrant... */
-+DEFINE_MUTEX(lzma_mutex);
-+
-+/* decompress_unlzma.c doesn't provide any context in its callbacks... */
-+static int lzma_error;
-+
-+static void error(char *m)
-+{
-+	ERROR("unlzma error: %s\n", m);
-+	lzma_error = 1;
-+}
-+
-+	
-+static void *lzma_init(struct squashfs_sb_info *msblk)
-+{
-+	struct squashfs_lzma *stream = kzalloc(sizeof(*stream), GFP_KERNEL);
-+	if (stream == NULL)
-+		goto failed;
-+	stream->input = vmalloc(msblk->block_size);
-+	if (stream->input == NULL)
-+		goto failed;
-+	stream->output = vmalloc(msblk->block_size);
-+	if (stream->output == NULL)
-+		goto failed2;
-+
-+	return stream;
-+
-+failed2:
-+	vfree(stream->input);
-+failed:
-+	ERROR("failed to allocate lzma workspace\n");
-+	kfree(stream);
-+	return NULL;
-+}
-+
-+
-+static void lzma_free(void *strm)
-+{
-+	struct squashfs_lzma *stream = strm;
-+
-+	if (stream) {
-+		vfree(stream->input);
-+		vfree(stream->output);
-+	}
-+	kfree(stream);
-+}
-+
-+
-+static int lzma_uncompress(struct squashfs_sb_info *msblk, void **buffer,
-+	struct buffer_head **bh, int b, int offset, int length, int srclength,
-+	int pages)
-+{
-+	struct squashfs_lzma *stream = msblk->stream;
-+	void *buff = stream->input;
-+	int avail, i, bytes = length, res;
-+
-+	mutex_lock(&lzma_mutex);
-+
-+	for (i = 0; i < b; i++) {
-+		wait_on_buffer(bh[i]);
-+		if (!buffer_uptodate(bh[i]))
-+			goto block_release;
-+
-+		avail = min(bytes, msblk->devblksize - offset);
-+		memcpy(buff, bh[i]->b_data + offset, avail);
-+		buff += avail;
-+		bytes -= avail;
-+		offset = 0;
-+		put_bh(bh[i]);
-+	}
-+
-+	lzma_error = 0;
-+	res = unlzma(stream->input, length, NULL, NULL, stream->output, NULL,
-+							error);
-+	if (res || lzma_error)
-+		goto failed;
-+
-+	/* uncompressed size is stored in the LZMA header (5 byte offset) */
-+	res = bytes = get_unaligned_le32(stream->input + 5);
-+	for (i = 0, buff = stream->output; bytes && i < pages; i++) {
-+		avail = min_t(int, bytes, PAGE_CACHE_SIZE);
-+		memcpy(buffer[i], buff, avail);
-+		buff += avail;
-+		bytes -= avail;
-+	}
-+	if (bytes)
-+		goto failed;
-+
-+	mutex_unlock(&lzma_mutex);
-+	return res;
-+
-+block_release:
-+	for (; i < b; i++)
-+		put_bh(bh[i]);
-+
-+failed:
-+	mutex_unlock(&lzma_mutex);
-+
-+	ERROR("lzma decompression failed, data probably corrupt\n");
-+	return -EIO;
-+}
-+
-+const struct squashfs_decompressor squashfs_lzma_comp_ops = {
-+	.init = lzma_init,
-+	.free = lzma_free,
-+	.decompress = lzma_uncompress,
-+	.id = LZMA_COMPRESSION,
-+	.name = "lzma",
-+	.supported = 1
-+};
-+
---- a/fs/squashfs/squashfs.h
-+++ b/fs/squashfs/squashfs.h
-@@ -94,3 +94,6 @@ extern const struct address_space_operat
- 
- /* zlib_wrapper.c */
- extern const struct squashfs_decompressor squashfs_zlib_comp_ops;
-+
-+/* lzma wrapper.c */
-+extern const struct squashfs_decompressor squashfs_lzma_comp_ops;
diff --git a/target/linux/generic-2.6/patches-2.6.34/007-squashfs_make_lzma_available.patch b/target/linux/generic-2.6/patches-2.6.34/007-squashfs_make_lzma_available.patch
deleted file mode 100644
index 9c57d9428..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/007-squashfs_make_lzma_available.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-From fdf23ed283bc6ef5c25076ce2065f892120ff556 Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Thu, 22 Oct 2009 04:57:38 +0100
-Subject: [PATCH] Squashfs: Make unlzma available to non initramfs/initrd code
-
-Add a config option DECOMPRESS_LZMA_NEEDED which allows subsystems to
-specify they need the unlzma code.  Normally decompress_unlzma.c is
-compiled with __init and unlzma is not exported to modules.
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/Kconfig                   |    1 +
- include/linux/decompress/bunzip2_mm.h |   12 ++++++++++++
- include/linux/decompress/inflate_mm.h |   12 ++++++++++++
- include/linux/decompress/mm.h         |    3 ---
- include/linux/decompress/unlzma_mm.h  |   20 ++++++++++++++++++++
- lib/Kconfig                           |    3 +++
- lib/decompress_bunzip2.c              |    1 +
- lib/decompress_inflate.c              |    1 +
- lib/decompress_unlzma.c               |    5 ++++-
- 9 files changed, 54 insertions(+), 4 deletions(-)
- create mode 100644 include/linux/decompress/bunzip2_mm.h
- create mode 100644 include/linux/decompress/inflate_mm.h
- create mode 100644 include/linux/decompress/unlzma_mm.h
-
---- a/fs/squashfs/Kconfig
-+++ b/fs/squashfs/Kconfig
-@@ -30,6 +30,7 @@ config SQUASHFS_LZMA
- 	bool "Include support for LZMA compressed file systems"
- 	depends on SQUASHFS
- 	select DECOMPRESS_LZMA
-+	select DECOMPRESS_LZMA_NEEDED
- 
- config SQUASHFS_EMBEDDED
- 
---- /dev/null
-+++ b/include/linux/decompress/bunzip2_mm.h
-@@ -0,0 +1,12 @@
-+#ifndef BUNZIP2_MM_H
-+#define BUNZIP2_MM_H
-+
-+#ifdef STATIC
-+/* Code active when included from pre-boot environment: */
-+#define INIT
-+#else
-+/* Compile for initramfs/initrd code only */
-+#define INIT __init
-+#endif
-+
-+#endif
---- /dev/null
-+++ b/include/linux/decompress/inflate_mm.h
-@@ -0,0 +1,12 @@
-+#ifndef INFLATE_MM_H
-+#define INFLATE_MM_H
-+
-+#ifdef STATIC
-+/* Code active when included from pre-boot environment: */
-+#define INIT
-+#else
-+/* Compile for initramfs/initrd code only */
-+#define INIT __init
-+#endif
-+
-+#endif
---- a/include/linux/decompress/mm.h
-+++ b/include/linux/decompress/mm.h
-@@ -53,8 +53,6 @@ static void free(void *where)
- 
- #define set_error_fn(x)
- 
--#define INIT
--
- #else /* STATIC */
- 
- /* Code active when compiled standalone for use when loading ramdisk: */
-@@ -77,7 +75,6 @@ static void free(void *where)
- static void(*error)(char *m);
- #define set_error_fn(x) error = x;
- 
--#define INIT __init
- #define STATIC
- 
- #include <linux/init.h>
---- /dev/null
-+++ b/include/linux/decompress/unlzma_mm.h
-@@ -0,0 +1,20 @@
-+#ifndef UNLZMA_MM_H
-+#define UNLZMA_MM_H
-+
-+#ifdef STATIC
-+
-+/* Code active when included from pre-boot environment: */
-+#define INIT
-+
-+#elif defined(CONFIG_DECOMPRESS_LZMA_NEEDED)
-+
-+/* Make it available to non initramfs/initrd code */
-+#define INIT
-+#include <linux/module.h>
-+#else
-+
-+/* Compile for initramfs/initrd code only */
-+#define INIT __init
-+#endif
-+
-+#endif
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -121,6 +121,9 @@ config DECOMPRESS_LZO
- 	select LZO_DECOMPRESS
- 	tristate
- 
-+config DECOMPRESS_LZMA_NEEDED
-+	 boolean
-+
- #
- # Generic allocator support is selected if needed
- #
---- a/lib/decompress_bunzip2.c
-+++ b/lib/decompress_bunzip2.c
-@@ -52,6 +52,7 @@
- #include <linux/slab.h>
- #endif /* STATIC */
- 
-+#include <linux/decompress/bunzip2_mm.h>
- #include <linux/decompress/mm.h>
- 
- #ifndef INT_MAX
---- a/lib/decompress_inflate.c
-+++ b/lib/decompress_inflate.c
-@@ -23,6 +23,7 @@
- 
- #endif /* STATIC */
- 
-+#include <linux/decompress/inflate_mm.h>
- #include <linux/decompress/mm.h>
- 
- #define GZIP_IOBUF_SIZE (16*1024)
---- a/lib/decompress_unlzma.c
-+++ b/lib/decompress_unlzma.c
-@@ -36,6 +36,7 @@
- #include <linux/slab.h>
- #endif /* STATIC */
- 
-+#include <linux/decompress/unlzma_mm.h>
- #include <linux/decompress/mm.h>
- 
- #define	MIN(a, b) (((a) < (b)) ? (a) : (b))
-@@ -531,7 +532,7 @@ static inline void INIT process_bit1(str
- 
- 
- 
--STATIC inline int INIT unlzma(unsigned char *buf, int in_len,
-+STATIC int INIT unlzma(unsigned char *buf, int in_len,
- 			      int(*fill)(void*, unsigned int),
- 			      int(*flush)(void*, unsigned int),
- 			      unsigned char *output,
-@@ -664,4 +665,6 @@ STATIC int INIT decompress(unsigned char
- {
- 	return unlzma(buf, in_len - 4, fill, flush, output, posp, error_fn);
- }
-+#elif defined(CONFIG_DECOMPRESS_LZMA_NEEDED)
-+EXPORT_SYMBOL(unlzma);
- #endif
diff --git a/target/linux/generic-2.6/patches-2.6.34/011-mips_boot.patch b/target/linux/generic-2.6/patches-2.6.34/011-mips_boot.patch
deleted file mode 100644
index c2a043acd..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/011-mips_boot.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/mips/kernel/head.S
-+++ b/arch/mips/kernel/head.S
-@@ -121,6 +121,8 @@
- #endif
- 	.endm
- 
-+	j kernel_entry
-+	nop
- #ifndef CONFIG_NO_EXCEPT_FILL
- 	/*
- 	 * Reserved space for exception handlers.
diff --git a/target/linux/generic-2.6/patches-2.6.34/012-extra_optimization.patch b/target/linux/generic-2.6/patches-2.6.34/012-extra_optimization.patch
deleted file mode 100644
index 0b5174cbb..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/012-extra_optimization.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -529,7 +529,7 @@ all: vmlinux
- ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
- KBUILD_CFLAGS	+= -Os
- else
--KBUILD_CFLAGS	+= -O2
-+KBUILD_CFLAGS	+= -O2 -fno-reorder-blocks -fno-tree-ch
- endif
- 
- include $(srctree)/arch/$(SRCARCH)/Makefile
-@@ -567,6 +567,9 @@ endif
- NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
- CHECKFLAGS     += $(NOSTDINC_FLAGS)
- 
-+# improve gcc optimization
-+CFLAGS += $(call cc-option,-funit-at-a-time,)
-+
- # warn about C99 declaration after statement
- KBUILD_CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)
- 
diff --git a/target/linux/generic-2.6/patches-2.6.34/013-gcc4_inline_fix.patch b/target/linux/generic-2.6/patches-2.6.34/013-gcc4_inline_fix.patch
deleted file mode 100644
index 77ab40543..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/013-gcc4_inline_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/mips/include/asm/system.h
-+++ b/arch/mips/include/asm/system.h
-@@ -194,7 +194,7 @@ extern __u64 __xchg_u64_unsupported_on_3
- #define __xchg_u64 __xchg_u64_unsupported_on_32bit_kernels
- #endif
- 
--static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
-+static __always_inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
- {
- 	switch (size) {
- 	case 4:
diff --git a/target/linux/generic-2.6/patches-2.6.34/014-samsung_flash b/target/linux/generic-2.6/patches-2.6.34/014-samsung_flash
deleted file mode 100644
index 1faeb41ea..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/014-samsung_flash
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -51,6 +51,7 @@
- #define SST49LF040B	        0x0050
- #define SST49LF008A		0x005a
- #define AT49BV6416		0x00d6
-+#define MANUFACTURER_SAMSUNG	0x00ec
- 
- static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
- static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
-@@ -375,12 +376,19 @@ struct mtd_info *cfi_cmdset_0002(struct 
- 
- 		if (extp->MajorVersion != '1' ||
- 		    (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
--			printk(KERN_ERR "  Unknown Amd/Fujitsu Extended Query "
--			       "version %c.%c.\n",  extp->MajorVersion,
--			       extp->MinorVersion);
--			kfree(extp);
--			kfree(mtd);
--			return NULL;
-+		        if (cfi->mfr == MANUFACTURER_SAMSUNG &&
-+			    (extp->MajorVersion == '3' && extp->MinorVersion == '3')) {
-+			    printk(KERN_NOTICE "  Newer Samsung flash detected, "
-+			           "should be compatibile with Amd/Fujitsu.\n");
-+		        }
-+		        else {
-+			    printk(KERN_ERR "  Unknown Amd/Fujitsu Extended Query "
-+			           "version %c.%c.\n",  extp->MajorVersion,
-+			           extp->MinorVersion);
-+			    kfree(extp);
-+			    kfree(mtd);
-+			    return NULL;
-+		        }
- 		}
- 
- 		/* Install our own private info structure */
diff --git a/target/linux/generic-2.6/patches-2.6.34/020-mips_multi_machine_support.patch b/target/linux/generic-2.6/patches-2.6.34/020-mips_multi_machine_support.patch
deleted file mode 100644
index 738eb65da..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/020-mips_multi_machine_support.patch
+++ /dev/null
@@ -1,173 +0,0 @@
---- /dev/null
-+++ b/arch/mips/include/asm/mips_machine.h
-@@ -0,0 +1,47 @@
-+/*
-+ *  Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
-+ *
-+ *  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 __ASM_MIPS_MACHINE_H
-+#define __ASM_MIPS_MACHINE_H
-+
-+#include <linux/init.h>
-+#include <linux/list.h>
-+
-+struct mips_machine {
-+	unsigned long		mach_type;
-+	void			(*mach_setup)(void);
-+	char			*mach_name;
-+	struct list_head	list;
-+};
-+
-+void mips_machine_register(struct mips_machine *) __init;
-+void mips_machine_setup(unsigned long machtype) __init;
-+void mips_machine_set_name(char *name) __init;
-+
-+extern char *mips_machine_name;
-+
-+#define MIPS_MACHINE(_type, _name, _setup) 			\
-+static char machine_name_##_type[] __initdata = _name;		\
-+static struct mips_machine machine_##_type __initdata =		\
-+{								\
-+	.mach_type	= _type,				\
-+	.mach_name	= machine_name_##_type,			\
-+	.mach_setup	= _setup,				\
-+};								\
-+								\
-+static int __init register_machine_##_type(void)		\
-+{								\
-+	mips_machine_register(&machine_##_type);		\
-+	return 0;						\
-+}								\
-+								\
-+pure_initcall(register_machine_##_type)
-+
-+#endif /* __ASM_MIPS_MACHINE_H */
-+
---- /dev/null
-+++ b/arch/mips/kernel/mips_machine.c
-@@ -0,0 +1,74 @@
-+/*
-+ *  Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
-+ *
-+ *  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.
-+ *
-+ */
-+#include <linux/mm.h>
-+
-+#include <asm/mips_machine.h>
-+#include <asm/bootinfo.h>
-+
-+static struct list_head mips_machines __initdata =
-+		LIST_HEAD_INIT(mips_machines);
-+
-+char *mips_machine_name = "Unknown";
-+
-+static struct mips_machine * __init mips_machine_find(unsigned long machtype)
-+{
-+	struct list_head *this;
-+
-+	list_for_each(this, &mips_machines) {
-+		struct mips_machine *mach;
-+
-+		mach = list_entry(this, struct mips_machine, list);
-+		if (mach->mach_type == machtype)
-+			return mach;
-+	}
-+
-+	return NULL;
-+}
-+
-+void __init mips_machine_register(struct mips_machine *mach)
-+{
-+	list_add_tail(&mach->list, &mips_machines);
-+}
-+
-+void __init mips_machine_set_name(char *name)
-+{
-+	unsigned int len;
-+	char *p;
-+
-+	if (name == NULL)
-+		return;
-+
-+	len = strlen(name);
-+	p = kmalloc(len + 1, GFP_KERNEL);
-+	if (p) {
-+		strncpy(p, name, len);
-+		p[len] = '\0';
-+		mips_machine_name = p;
-+	} else {
-+		printk(KERN_WARNING "MIPS: no memory for machine_name\n");
-+	}
-+}
-+
-+void __init mips_machine_setup(unsigned long machtype)
-+{
-+	struct mips_machine *mach;
-+
-+	mach = mips_machine_find(machtype);
-+	if (!mach) {
-+		printk(KERN_ALERT "MIPS: no machine registered for "
-+			"machtype %lu\n", machtype);
-+		return;
-+	}
-+
-+	mips_machine_set_name(mach->mach_name);
-+	printk(KERN_INFO "MIPS: machine is %s\n", mips_machine_name);
-+
-+	if (mach->mach_setup)
-+		mach->mach_setup();
-+}
---- a/arch/mips/kernel/Makefile
-+++ b/arch/mips/kernel/Makefile
-@@ -94,6 +94,7 @@
- obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o
- obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
- obj-$(CONFIG_SPINLOCK_TEST)	+= spinlock_test.o
-+obj-$(CONFIG_MIPS_MACHINE)	+= mips_machine.o
- 
- CFLAGS_cpu-bugs64.o	= $(shell if $(CC) $(KBUILD_CFLAGS) -Wa,-mdaddi -c -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-DHAVE_AS_SET_DADDI"; fi)
- 
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -851,6 +851,9 @@ config MIPS_DISABLE_OBSOLETE_IDE
- config SYNC_R4K
- 	bool
- 
-+config MIPS_MACHINE
-+	def_bool n
-+
- config NO_IOPORT
- 	def_bool n
- 
---- a/arch/mips/kernel/proc.c
-+++ b/arch/mips/kernel/proc.c
-@@ -12,6 +12,7 @@
- #include <asm/cpu-features.h>
- #include <asm/mipsregs.h>
- #include <asm/processor.h>
-+#include <asm/mips_machine.h>
- 
- unsigned int vced_count, vcei_count;
- 
-@@ -31,8 +32,12 @@ static int show_cpuinfo(struct seq_file 
- 	/*
- 	 * For the first processor also print the system type
- 	 */
--	if (n == 0)
-+	if (n == 0) {
- 		seq_printf(m, "system type\t\t: %s\n", get_system_type());
-+#ifdef CONFIG_MIPS_MACHINE
-+		seq_printf(m, "machine\t\t\t: %s\n", mips_machine_name);
-+#endif
-+	}
- 
- 	seq_printf(m, "processor\t\t: %ld\n", n);
- 	sprintf(fmt, "cpu model\t\t: %%s V%%d.%%d%s\n",
diff --git a/target/linux/generic-2.6/patches-2.6.34/021-mips_image_cmdline_hack.patch b/target/linux/generic-2.6/patches-2.6.34/021-mips_image_cmdline_hack.patch
deleted file mode 100644
index 00de8d545..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/021-mips_image_cmdline_hack.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -854,6 +854,10 @@ config SYNC_R4K
- config MIPS_MACHINE
- 	def_bool n
- 
-+config IMAGE_CMDLINE_HACK
-+	bool "OpenWrt specific image command line hack"
-+	default n
-+
- config NO_IOPORT
- 	def_bool n
- 
---- a/arch/mips/kernel/head.S
-+++ b/arch/mips/kernel/head.S
-@@ -143,6 +143,12 @@ FEXPORT(__kernel_entry)
- 	j	kernel_entry
- #endif
- 
-+#ifdef CONFIG_IMAGE_CMDLINE_HACK
-+	.ascii	"CMDLINE:"
-+EXPORT(__image_cmdline)
-+	.fill	0x400
-+#endif /* CONFIG_IMAGE_CMDLINE_HACK */
-+
- 	__REF
- 
- NESTED(kernel_entry, 16, sp)			# kernel entry point
diff --git a/target/linux/generic-2.6/patches-2.6.34/022-mips_use_generic_thread_info_allocator.patch b/target/linux/generic-2.6/patches-2.6.34/022-mips_use_generic_thread_info_allocator.patch
deleted file mode 100644
index 786afd1dc..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/022-mips_use_generic_thread_info_allocator.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/arch/mips/include/asm/thread_info.h
-+++ b/arch/mips/include/asm/thread_info.h
-@@ -83,6 +83,7 @@ register struct thread_info *__current_t
- #define THREAD_SIZE (PAGE_SIZE << THREAD_SIZE_ORDER)
- #define THREAD_MASK (THREAD_SIZE - 1UL)
- 
-+#if 0
- #define __HAVE_ARCH_THREAD_INFO_ALLOCATOR
- 
- #ifdef CONFIG_DEBUG_STACK_USAGE
-@@ -92,6 +93,7 @@ register struct thread_info *__current_t
- #endif
- 
- #define free_thread_info(info) kfree(info)
-+#endif
- 
- #endif /* !__ASSEMBLY__ */
- 
diff --git a/target/linux/generic-2.6/patches-2.6.34/025-mips_disable_fpu.patch b/target/linux/generic-2.6/patches-2.6.34/025-mips_disable_fpu.patch
deleted file mode 100644
index e6b764e2d..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/025-mips_disable_fpu.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-MIPS: allow disabling the kernel FPU emulator
-
-This patch allows turning off the in-kernel Algorithmics
-FPU emulator support, which allows one to save a couple of
-precious blocks on an embedded system.
-
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -839,6 +839,17 @@ config I8259
- config MIPS_BONITO64
- 	bool
- 
-+config MIPS_FPU_EMU
-+	bool "Enable FPU emulation"
-+	default y
-+	help
-+	   This option allows building a kernel with or without the Algorithmics
-+	   FPU emulator enabled. Turning off this option results in a kernel which
-+	   does not catch floating operations exceptions. Make sure that your toolchain
-+	   is configured to enable software floating point emulation in that case.
-+		
-+	   If unsure say Y here.
-+
- config MIPS_MSC
- 	bool
- 
---- a/arch/mips/math-emu/Makefile
-+++ b/arch/mips/math-emu/Makefile
-@@ -2,12 +2,14 @@
- # Makefile for the Linux/MIPS kernel FPU emulation.
- #
- 
--obj-y	:= cp1emu.o ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
-+obj-y	:=	kernel_linkage.o dsemul.o cp1emu.o
-+
-+obj-$(CONFIG_MIPS_FPU_EMU)	+= ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
- 	   ieee754xcpt.o dp_frexp.o dp_modf.o dp_div.o dp_mul.o dp_sub.o \
- 	   dp_add.o dp_fsp.o dp_cmp.o dp_logb.o dp_scalb.o dp_simple.o \
- 	   dp_tint.o dp_fint.o dp_tlong.o dp_flong.o sp_frexp.o sp_modf.o \
- 	   sp_div.o sp_mul.o sp_sub.o sp_add.o sp_fdp.o sp_cmp.o sp_logb.o \
- 	   sp_scalb.o sp_simple.o sp_tint.o sp_fint.o sp_tlong.o sp_flong.o \
--	   dp_sqrt.o sp_sqrt.o kernel_linkage.o dsemul.o
-+	   dp_sqrt.o sp_sqrt.o
- 
- EXTRA_CFLAGS += -Werror
---- a/arch/mips/math-emu/cp1emu.c
-+++ b/arch/mips/math-emu/cp1emu.c
-@@ -58,7 +58,11 @@
- #define __mips 4
- 
- /* Function which emulates a floating point instruction. */
-+#ifdef CONFIG_DEBUG_FS
-+DEFINE_PER_CPU(struct mips_fpu_emulator_stats, fpuemustats);
-+#endif
- 
-+#ifdef CONFIG_MIPS_FPU_EMU
- static int fpu_emu(struct pt_regs *, struct mips_fpu_struct *,
- 	mips_instruction);
- 
-@@ -69,10 +73,6 @@ static int fpux_emu(struct pt_regs *,
- 
- /* Further private data for which no space exists in mips_fpu_struct */
- 
--#ifdef CONFIG_DEBUG_FS
--DEFINE_PER_CPU(struct mips_fpu_emulator_stats, fpuemustats);
--#endif
--
- /* Control registers */
- 
- #define FPCREG_RID	0	/* $0  = revision id */
-@@ -1277,7 +1277,6 @@ int fpu_emulator_cop1Handler(struct pt_r
- 
- 	return sig;
- }
--
- #ifdef CONFIG_DEBUG_FS
- 
- static int fpuemu_stat_get(void *data, u64 *val)
-@@ -1326,4 +1325,11 @@ static int __init debugfs_fpuemu(void)
- 	return 0;
- }
- __initcall(debugfs_fpuemu);
--#endif
-+#endif /* CONFIG_DEBUGFS */
-+#else
-+int fpu_emulator_cop1Handler(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
-+        int has_fpu)
-+{
-+	return 0;
-+}
-+#endif /* CONFIG_MIPS_FPU_EMU */
---- a/arch/mips/math-emu/dsemul.c
-+++ b/arch/mips/math-emu/dsemul.c
-@@ -109,6 +109,7 @@ int mips_dsemul(struct pt_regs *regs, mi
- 	return SIGILL;		/* force out of emulation loop */
- }
- 
-+#ifdef CONFIG_MIPS_FPU_EMU
- int do_dsemulret(struct pt_regs *xcp)
- {
- 	struct emuframe __user *fr;
-@@ -165,3 +166,9 @@ int do_dsemulret(struct pt_regs *xcp)
- 
- 	return 1;
- }
-+#else
-+int do_dsemulret(struct pt_regs *xcp)
-+{
-+	return 0;
-+}
-+#endif /* CONFIG_MIPS_FPU_EMU */
---- a/arch/mips/math-emu/kernel_linkage.c
-+++ b/arch/mips/math-emu/kernel_linkage.c
-@@ -29,6 +29,7 @@
- 
- #define SIGNALLING_NAN 0x7ff800007ff80000LL
- 
-+#ifdef CONFIG_MIPS_FPU_EMU
- void fpu_emulator_init_fpu(void)
- {
- 	static int first = 1;
-@@ -112,4 +113,36 @@ int fpu_emulator_restore_context32(struc
- 
- 	return err;
- }
--#endif
-+#endif	/* CONFIG_64BIT */
-+#else
-+
-+void fpu_emulator_init_fpu(void)
-+{
-+	printk(KERN_INFO "FPU emulator disabled, make sure your toolchain"
-+		"was compiled with software floating point support (soft-float)\n");
-+	return;
-+}
-+
-+int fpu_emulator_save_context(struct sigcontext __user *sc)
-+{
-+	return 0;
-+}
-+
-+int fpu_emulator_restore_context(struct sigcontext __user *sc)
-+{
-+	return 0;
-+}
-+
-+int fpu_emulator_save_context32(struct sigcontext32 __user *sc)
-+{
-+	return 0;
-+}
-+
-+int fpu_emulator_restore_context32(struct sigcontext32 __user *sc)
-+{
-+	return 0;
-+}
-+
-+#ifdef CONFIG_64BIT
-+#endif	/* CONFIG_64BIT */
-+#endif /* CONFIG_MIPS_FPU_EMU */
diff --git a/target/linux/generic-2.6/patches-2.6.34/027-mips_module_reloc.patch b/target/linux/generic-2.6/patches-2.6.34/027-mips_module_reloc.patch
deleted file mode 100644
index 024e7f16c..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/027-mips_module_reloc.patch
+++ /dev/null
@@ -1,368 +0,0 @@
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -93,7 +93,7 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin
- cflags-y			+= -G 0 -mno-abicalls -fno-pic -pipe
- cflags-y			+= -msoft-float
- LDFLAGS_vmlinux			+= -G 0 -static -n -nostdlib
--MODFLAGS			+= -mlong-calls
-+MODFLAGS			+= -mno-long-calls
- 
- cflags-y += -ffreestanding
- 
---- a/arch/mips/include/asm/module.h
-+++ b/arch/mips/include/asm/module.h
-@@ -9,6 +9,11 @@ struct mod_arch_specific {
- 	struct list_head dbe_list;
- 	const struct exception_table_entry *dbe_start;
- 	const struct exception_table_entry *dbe_end;
-+
-+	void *phys_plt_tbl;
-+	void *virt_plt_tbl;
-+	unsigned int phys_plt_offset;
-+	unsigned int virt_plt_offset;
- };
- 
- typedef uint8_t Elf64_Byte;		/* Type for a 8-bit quantity.  */
---- a/arch/mips/kernel/module.c
-+++ b/arch/mips/kernel/module.c
-@@ -43,6 +43,117 @@ static struct mips_hi16 *mips_hi16_list;
- static LIST_HEAD(dbe_list);
- static DEFINE_SPINLOCK(dbe_lock);
- 
-+/*
-+ * Get the potential max trampolines size required of the init and
-+ * non-init sections. Only used if we cannot find enough contiguous
-+ * physically mapped memory to put the module into.
-+ */
-+static unsigned int
-+get_plt_size(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,
-+             const char *secstrings, unsigned int symindex, bool is_init)
-+{
-+	unsigned long ret = 0;
-+	unsigned int i, j;
-+	Elf_Sym *syms;
-+
-+	/* Everything marked ALLOC (this includes the exported symbols) */
-+	for (i = 1; i < hdr->e_shnum; ++i) {
-+		unsigned int info = sechdrs[i].sh_info;
-+
-+		if (sechdrs[i].sh_type != SHT_REL
-+		    && sechdrs[i].sh_type != SHT_RELA)
-+			continue;
-+
-+		/* Not a valid relocation section? */
-+		if (info >= hdr->e_shnum)
-+			continue;
-+
-+		/* Don't bother with non-allocated sections */
-+		if (!(sechdrs[info].sh_flags & SHF_ALLOC))
-+			continue;
-+
-+		/* If it's called *.init*, and we're not init, we're
-+                   not interested */
-+		if ((strstr(secstrings + sechdrs[i].sh_name, ".init") != 0)
-+		    != is_init)
-+			continue;
-+
-+		syms = (Elf_Sym *) sechdrs[symindex].sh_addr;
-+		if (sechdrs[i].sh_type == SHT_REL) {
-+			Elf_Mips_Rel *rel = (void *) sechdrs[i].sh_addr;
-+			unsigned int size = sechdrs[i].sh_size / sizeof(*rel);
-+
-+			for (j = 0; j < size; ++j) {
-+				Elf_Sym *sym;
-+
-+				if (ELF_MIPS_R_TYPE(rel[j]) != R_MIPS_26)
-+					continue;
-+
-+				sym = syms + ELF_MIPS_R_SYM(rel[j]);
-+				if (!is_init && sym->st_shndx != SHN_UNDEF)
-+					continue;
-+
-+				ret += 4 * sizeof(int);
-+			}
-+		} else {
-+			Elf_Mips_Rela *rela = (void *) sechdrs[i].sh_addr;
-+			unsigned int size = sechdrs[i].sh_size / sizeof(*rela);
-+
-+			for (j = 0; j < size; ++j) {
-+				Elf_Sym *sym;
-+
-+				if (ELF_MIPS_R_TYPE(rela[j]) != R_MIPS_26)
-+					continue;
-+
-+				sym = syms + ELF_MIPS_R_SYM(rela[j]);
-+				if (!is_init && sym->st_shndx != SHN_UNDEF)
-+					continue;
-+
-+				ret += 4 * sizeof(int);
-+			}
-+		}
-+	}
-+
-+	return ret;
-+}
-+
-+#ifndef MODULE_START
-+static void *alloc_phys(unsigned long size)
-+{
-+	unsigned order;
-+	struct page *page;
-+	struct page *p;
-+
-+	size = PAGE_ALIGN(size);
-+	order = get_order(size);
-+
-+	page = alloc_pages(GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN |
-+			__GFP_THISNODE, order);
-+	if (!page)
-+		return NULL;
-+
-+	split_page(page, order);
-+
-+	for (p = page + (size >> PAGE_SHIFT); p < page + (1 << order); ++p)
-+		__free_page(p);
-+
-+	return page_address(page);
-+}
-+#endif
-+
-+static void free_phys(void *ptr, unsigned long size)
-+{
-+	struct page *page;
-+	struct page *end;
-+
-+	page = virt_to_page(ptr);
-+	end = page + (PAGE_ALIGN(size) >> PAGE_SHIFT);
-+
-+	for (; page < end; ++page)
-+		__free_page(page);
-+}
-+
-+
- void *module_alloc(unsigned long size)
- {
- #ifdef MODULE_START
-@@ -58,21 +169,99 @@ void *module_alloc(unsigned long size)
- 
- 	return __vmalloc_area(area, GFP_KERNEL, PAGE_KERNEL);
- #else
-+	void *ptr;
-+
- 	if (size == 0)
- 		return NULL;
--	return vmalloc(size);
-+
-+	ptr = alloc_phys(size);
-+
-+	/* If we failed to allocate physically contiguous memory,
-+	 * fall back to regular vmalloc. The module loader code will
-+	 * create jump tables to handle long jumps */
-+	if (!ptr)
-+		return vmalloc(size);
-+
-+	return ptr;
-+#endif
-+}
-+
-+static inline bool is_phys_addr(void *ptr)
-+{
-+#ifdef CONFIG_64BIT
-+	return (KSEGX((unsigned long)ptr) == CKSEG0);
-+#else
-+	return (KSEGX(ptr) == KSEG0);
- #endif
- }
- 
- /* Free memory returned from module_alloc */
- void module_free(struct module *mod, void *module_region)
- {
--	vfree(module_region);
-+	if (is_phys_addr(module_region)) {
-+		if (mod->module_init == module_region)
-+			free_phys(module_region, mod->init_size);
-+		else if (mod->module_core == module_region)
-+			free_phys(module_region, mod->core_size);
-+		else
-+			BUG();
-+	} else {
-+		vfree(module_region);
-+	}
-+}
-+
-+static void *__module_alloc(int size, bool phys)
-+{
-+	void *ptr;
-+
-+	if (phys)
-+		ptr = kmalloc(size, GFP_KERNEL);
-+	else
-+		ptr = vmalloc(size);
-+	return ptr;
-+}
-+
-+static void __module_free(void *ptr)
-+{
-+	if (is_phys_addr(ptr))
-+		kfree(ptr);
-+	else
-+		vfree(ptr);
- }
- 
- int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
- 			      char *secstrings, struct module *mod)
- {
-+	unsigned int symindex = 0;
-+	unsigned int core_size, init_size;
-+	int i;
-+
-+	for (i = 1; i < hdr->e_shnum; i++)
-+		if (sechdrs[i].sh_type == SHT_SYMTAB)
-+			symindex = i;
-+
-+	core_size = get_plt_size(hdr, sechdrs, secstrings, symindex, false);
-+	init_size = get_plt_size(hdr, sechdrs, secstrings, symindex, true);
-+
-+	mod->arch.phys_plt_offset = 0;
-+	mod->arch.virt_plt_offset = 0;
-+	mod->arch.phys_plt_tbl = NULL;
-+	mod->arch.virt_plt_tbl = NULL;
-+
-+	if ((core_size + init_size) == 0)
-+		return 0;
-+
-+	mod->arch.phys_plt_tbl = __module_alloc(core_size + init_size, 1);
-+	if (!mod->arch.phys_plt_tbl)
-+		return -ENOMEM;
-+
-+	mod->arch.virt_plt_tbl = __module_alloc(core_size + init_size, 0);
-+	if (!mod->arch.virt_plt_tbl) {
-+		__module_free(mod->arch.phys_plt_tbl);
-+		mod->arch.phys_plt_tbl = NULL;
-+		return -ENOMEM;
-+	}
-+
- 	return 0;
- }
- 
-@@ -95,28 +284,36 @@ static int apply_r_mips_32_rela(struct m
- 	return 0;
- }
- 
--static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
-+static Elf_Addr add_plt_entry_to(unsigned *plt_offset,
-+				 void *start, Elf_Addr v)
- {
--	if (v % 4) {
--		pr_err("module %s: dangerous R_MIPS_26 REL relocation\n",
--		       me->name);
--		return -ENOEXEC;
--	}
-+	unsigned *tramp = start + *plt_offset;
-+	*plt_offset += 4 * sizeof(int);
- 
--	if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
--		printk(KERN_ERR
--		       "module %s: relocation overflow\n",
--		       me->name);
--		return -ENOEXEC;
--	}
-+	/* adjust carry for addiu */
-+	if (v & 0x00008000)
-+		v += 0x10000;
- 
--	*location = (*location & ~0x03ffffff) |
--	            ((*location + (v >> 2)) & 0x03ffffff);
-+	tramp[0] = 0x3c190000 | (v >> 16);      /* lui t9, hi16 */
-+	tramp[1] = 0x27390000 | (v & 0xffff);   /* addiu t9, t9, lo16 */
-+	tramp[2] = 0x03200008;                  /* jr t9 */
-+	tramp[3] = 0x00000000;                  /* nop */
- 
--	return 0;
-+	return (Elf_Addr) tramp;
- }
- 
--static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)
-+static Elf_Addr add_plt_entry(struct module *me, void *location, Elf_Addr v)
-+{
-+	if (is_phys_addr(location))
-+		return add_plt_entry_to(&me->arch.phys_plt_offset,
-+				me->arch.phys_plt_tbl, v);
-+	else
-+		return add_plt_entry_to(&me->arch.virt_plt_offset,
-+				me->arch.virt_plt_tbl, v);
-+
-+}
-+
-+static int set_r_mips_26(struct module *me, u32 *location, u32 ofs, Elf_Addr v)
- {
- 	if (v % 4) {
- 		pr_err("module %s: dangerous R_MIPS_26 RELArelocation\n",
-@@ -125,17 +322,31 @@ static int apply_r_mips_26_rela(struct m
- 	}
- 
- 	if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
--		printk(KERN_ERR
-+	    v = add_plt_entry(me, location, v + (ofs << 2));
-+		if (!v) {
-+			printk(KERN_ERR
- 		       "module %s: relocation overflow\n",
- 		       me->name);
--		return -ENOEXEC;
-+			return -ENOEXEC;
-+		}
-+		ofs = 0;
- 	}
- 
--	*location = (*location & ~0x03ffffff) | ((v >> 2) & 0x03ffffff);
-+	*location = (*location & ~0x03ffffff) | ((ofs + (v >> 2)) & 0x03ffffff);
- 
- 	return 0;
- }
- 
-+static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
-+{
-+	return set_r_mips_26(me, location, *location & 0x03ffffff, v);
-+}
-+
-+static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)
-+{
-+	return set_r_mips_26(me, location, 0, v);
-+}
-+
- static int apply_r_mips_hi16_rel(struct module *me, u32 *location, Elf_Addr v)
- {
- 	struct mips_hi16 *n;
-@@ -400,11 +611,32 @@ int module_finalize(const Elf_Ehdr *hdr,
- 		list_add(&me->arch.dbe_list, &dbe_list);
- 		spin_unlock_irq(&dbe_lock);
- 	}
-+
-+	/* Get rid of the fixup trampoline if we're running the module
-+	 * from physically mapped address space */
-+	if (me->arch.phys_plt_offset == 0) {
-+		__module_free(me->arch.phys_plt_tbl);
-+		me->arch.phys_plt_tbl = NULL;
-+	}
-+	if (me->arch.virt_plt_offset == 0) {
-+		__module_free(me->arch.virt_plt_tbl);
-+		me->arch.virt_plt_tbl = NULL;
-+	}
-+
- 	return 0;
- }
- 
- void module_arch_cleanup(struct module *mod)
- {
-+	if (mod->arch.phys_plt_tbl) {
-+		__module_free(mod->arch.phys_plt_tbl);
-+		mod->arch.phys_plt_tbl = NULL;
-+	}
-+	if (mod->arch.virt_plt_tbl) {
-+		__module_free(mod->arch.virt_plt_tbl);
-+		mod->arch.virt_plt_tbl = NULL;
-+	}
-+
- 	spin_lock_irq(&dbe_lock);
- 	list_del(&mod->arch.dbe_list);
- 	spin_unlock_irq(&dbe_lock);
diff --git a/target/linux/generic-2.6/patches-2.6.34/028-module_exports.patch b/target/linux/generic-2.6/patches-2.6.34/028-module_exports.patch
deleted file mode 100644
index c56fbb79d..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/028-module_exports.patch
+++ /dev/null
@@ -1,119 +0,0 @@
---- a/include/asm-generic/vmlinux.lds.h
-+++ b/include/asm-generic/vmlinux.lds.h
-@@ -52,6 +52,27 @@
- #define LOAD_OFFSET 0
- #endif
- 
-+#ifndef SYMTAB_KEEP_STR
-+#define SYMTAB_KEEP_STR *(__ksymtab_strings.*)
-+#define SYMTAB_DISCARD_STR
-+#else
-+#define SYMTAB_DISCARD_STR *(__ksymtab_strings.*)
-+#endif
-+
-+#ifndef SYMTAB_KEEP
-+#define SYMTAB_KEEP *(__ksymtab.*)
-+#define SYMTAB_DISCARD
-+#else
-+#define SYMTAB_DISCARD *(__ksymtab.*)
-+#endif
-+
-+#ifndef SYMTAB_KEEP_GPL
-+#define SYMTAB_KEEP_GPL *(__ksymtab_gpl.*)
-+#define SYMTAB_DISCARD_GPL
-+#else
-+#define SYMTAB_DISCARD_GPL *(__ksymtab_gpl.*)
-+#endif
-+
- #ifndef SYMBOL_PREFIX
- #define VMLINUX_SYMBOL(sym) sym
- #else
-@@ -258,35 +279,35 @@
- 	/* Kernel symbol table: Normal symbols */			\
- 	__ksymtab         : AT(ADDR(__ksymtab) - LOAD_OFFSET) {		\
- 		VMLINUX_SYMBOL(__start___ksymtab) = .;			\
--		*(__ksymtab)						\
-+		SYMTAB_KEEP						\
- 		VMLINUX_SYMBOL(__stop___ksymtab) = .;			\
- 	}								\
- 									\
- 	/* Kernel symbol table: GPL-only symbols */			\
- 	__ksymtab_gpl     : AT(ADDR(__ksymtab_gpl) - LOAD_OFFSET) {	\
- 		VMLINUX_SYMBOL(__start___ksymtab_gpl) = .;		\
--		*(__ksymtab_gpl)					\
-+		SYMTAB_KEEP_GPL						\
- 		VMLINUX_SYMBOL(__stop___ksymtab_gpl) = .;		\
- 	}								\
- 									\
- 	/* Kernel symbol table: Normal unused symbols */		\
- 	__ksymtab_unused  : AT(ADDR(__ksymtab_unused) - LOAD_OFFSET) {	\
- 		VMLINUX_SYMBOL(__start___ksymtab_unused) = .;		\
--		*(__ksymtab_unused)					\
-+		*(__ksymtab_unused.*)					\
- 		VMLINUX_SYMBOL(__stop___ksymtab_unused) = .;		\
- 	}								\
- 									\
- 	/* Kernel symbol table: GPL-only unused symbols */		\
- 	__ksymtab_unused_gpl : AT(ADDR(__ksymtab_unused_gpl) - LOAD_OFFSET) { \
- 		VMLINUX_SYMBOL(__start___ksymtab_unused_gpl) = .;	\
--		*(__ksymtab_unused_gpl)					\
-+		*(__ksymtab_unused_gpl.*)				\
- 		VMLINUX_SYMBOL(__stop___ksymtab_unused_gpl) = .;	\
- 	}								\
- 									\
- 	/* Kernel symbol table: GPL-future-only symbols */		\
- 	__ksymtab_gpl_future : AT(ADDR(__ksymtab_gpl_future) - LOAD_OFFSET) { \
- 		VMLINUX_SYMBOL(__start___ksymtab_gpl_future) = .;	\
--		*(__ksymtab_gpl_future)					\
-+		*(__ksymtab_gpl_future.*)				\
- 		VMLINUX_SYMBOL(__stop___ksymtab_gpl_future) = .;	\
- 	}								\
- 									\
-@@ -327,7 +348,7 @@
- 									\
- 	/* Kernel symbol table: strings */				\
-         __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) {	\
--		*(__ksymtab_strings)					\
-+		SYMTAB_KEEP_STR						\
- 	}								\
- 									\
- 	/* __*init sections */						\
-@@ -642,6 +663,9 @@
- 	EXIT_TEXT							\
- 	EXIT_DATA							\
- 	EXIT_CALL							\
-+	SYMTAB_DISCARD							\
-+	SYMTAB_DISCARD_GPL						\
-+	SYMTAB_DISCARD_STR						\
- 	*(.discard)							\
- 	}
- 
---- a/include/linux/module.h
-+++ b/include/linux/module.h
-@@ -194,16 +194,24 @@ void *__symbol_get_gpl(const char *symbo
- #define __CRC_SYMBOL(sym, sec)
- #endif
- 
-+#ifdef MODULE
-+#define __EXPORT_SUFFIX(sym)
-+#else
-+#define __EXPORT_SUFFIX(sym) "." #sym
-+#endif
-+
- /* For every exported symbol, place a struct in the __ksymtab section */
- #define __EXPORT_SYMBOL(sym, sec)				\
- 	extern typeof(sym) sym;					\
- 	__CRC_SYMBOL(sym, sec)					\
- 	static const char __kstrtab_##sym[]			\
--	__attribute__((section("__ksymtab_strings"), aligned(1))) \
-+	__attribute__((section("__ksymtab_strings"		\
-+	  __EXPORT_SUFFIX(sym)), aligned(1)))			\
- 	= MODULE_SYMBOL_PREFIX #sym;                    	\
- 	static const struct kernel_symbol __ksymtab_##sym	\
- 	__used							\
--	__attribute__((section("__ksymtab" sec), unused))	\
-+	__attribute__((section("__ksymtab" sec			\
-+	  __EXPORT_SUFFIX(sym)), unused))			\
- 	= { (unsigned long)&sym, __kstrtab_##sym }
- 
- #define EXPORT_SYMBOL(sym)					\
diff --git a/target/linux/generic-2.6/patches-2.6.34/029-arm_module_unresolved_weak_sym.patch b/target/linux/generic-2.6/patches-2.6.34/029-arm_module_unresolved_weak_sym.patch
deleted file mode 100644
index 8a3b2e23c..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/029-arm_module_unresolved_weak_sym.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/arch/arm/kernel/module.c
-+++ b/arch/arm/kernel/module.c
-@@ -121,6 +121,10 @@ apply_relocate(Elf32_Shdr *sechdrs, cons
- 			return -ENOEXEC;
- 		}
- 
-+		if ((IS_ERR_VALUE(sym->st_value) || !sym->st_value) &&
-+		    ELF_ST_BIND(sym->st_info) == STB_WEAK)
-+			continue;
-+
- 		loc = dstsec->sh_addr + rel->r_offset;
- 
- 		switch (ELF32_R_TYPE(rel->r_info)) {
diff --git a/target/linux/generic-2.6/patches-2.6.34/030-pci_disable_common_quirks.patch b/target/linux/generic-2.6/patches-2.6.34/030-pci_disable_common_quirks.patch
deleted file mode 100644
index 96b4b3387..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/030-pci_disable_common_quirks.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/drivers/pci/Kconfig
-+++ b/drivers/pci/Kconfig
-@@ -51,6 +51,12 @@ config PCI_STUB
- 
- 	  When in doubt, say N.
- 
-+config PCI_DISABLE_COMMON_QUIRKS
-+	bool "PCI disable common quirks"
-+	depends on PCI
-+	help
-+	  If you don't know what to do here, say N.
-+
- config HT_IRQ
- 	bool "Interrupts on hypertransport devices"
- 	default y
---- a/drivers/pci/quirks.c
-+++ b/drivers/pci/quirks.c
-@@ -96,6 +96,7 @@ static void __devinit quirk_resource_ali
- }
- DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, quirk_resource_alignment);
- 
-+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
- /* The Mellanox Tavor device gives false positive parity errors
-  * Mark this device with a broken_parity_status, to allow
-  * PCI scanning code to "skip" this now blacklisted device.
-@@ -1905,7 +1906,9 @@ static void __devinit fixup_rev1_53c810(
- 	}
- }
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
-+#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
- 
-+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
- /* Enable 1k I/O space granularity on the Intel P64H2 */
- static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
- {
-@@ -2536,6 +2539,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x150d, quirk_i82576_sriov);
- 
- #endif	/* CONFIG_PCI_IOV */
-+#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
- 
- static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f,
- 			  struct pci_fixup *end)
diff --git a/target/linux/generic-2.6/patches-2.6.34/031-ppc_gcc_build_fix.patch b/target/linux/generic-2.6/patches-2.6.34/031-ppc_gcc_build_fix.patch
deleted file mode 100644
index 60027948e..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/031-ppc_gcc_build_fix.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-GCC 4.4.x looks to be adding support for generating out-of-line register
-saves/restores based on:
-
-http://gcc.gnu.org/ml/gcc-patches/2008-04/msg01678.html
-
-This breaks the kernel build as we'd have to link with libgcc to get the
-implementation of the register save/restores.
-
-To workaround this issue, we just stole the save/restore code from gcc
-and simplified it down for our needs (integer only).  We only do this if
-PPC32 as gcc makes believe the linker on ppc64 will deal with this and
-only if CONFIG_CC_OPTIMIZE_FOR_SIZE is set (thus -Os).
-
-Signed-off-by: Kumar Gala <[EMAIL PROTECTED]>
----
-
-If someone using cutting edge toolchains for ppc64 could test and make
-sure if we enable CONFIG_CC_OPTIMIZE_FOR_SIZE things work that would be
-nice.
-
-- k
-
- arch/powerpc/kernel/misc_32.S   |   77 +++++++++++++++++++++++++++
- arch/powerpc/kernel/ppc_ksyms.c |  111 +++++++++++++++++++++++++++++++++++++++
- 2 files changed, 188 insertions(+), 0 deletions(-)
-
---- a/arch/powerpc/kernel/misc_32.S
-+++ b/arch/powerpc/kernel/misc_32.S
-@@ -802,3 +802,80 @@ relocate_new_kernel_end:
- relocate_new_kernel_size:
- 	.long relocate_new_kernel_end - relocate_new_kernel
- #endif
-+
-+#if defined(CONFIG_PPC32) && defined(CONFIG_CC_OPTIMIZE_FOR_SIZE)
-+/* Routines for saving integer registers, called by the compiler.  */
-+/* Called with r11 pointing to the stack header word of the caller of the */
-+/* function, just beyond the end of the integer save area.  */
-+
-+_GLOBAL(_savegpr_14)   stw     14,-72(11)      /* save gp registers */
-+_GLOBAL(_savegpr_15)   stw     15,-68(11)
-+_GLOBAL(_savegpr_16)   stw     16,-64(11)
-+_GLOBAL(_savegpr_17)   stw     17,-60(11)
-+_GLOBAL(_savegpr_18)   stw     18,-56(11)
-+_GLOBAL(_savegpr_19)   stw     19,-52(11)
-+_GLOBAL(_savegpr_20)   stw     20,-48(11)
-+_GLOBAL(_savegpr_21)   stw     21,-44(11)
-+_GLOBAL(_savegpr_22)   stw     22,-40(11)
-+_GLOBAL(_savegpr_23)   stw     23,-36(11)
-+_GLOBAL(_savegpr_24)   stw     24,-32(11)
-+_GLOBAL(_savegpr_25)   stw     25,-28(11)
-+_GLOBAL(_savegpr_26)   stw     26,-24(11)
-+_GLOBAL(_savegpr_27)   stw     27,-20(11)
-+_GLOBAL(_savegpr_28)   stw     28,-16(11)
-+_GLOBAL(_savegpr_29)   stw     29,-12(11)
-+_GLOBAL(_savegpr_30)   stw     30,-8(11)
-+_GLOBAL(_savegpr_31)   stw     31,-4(11)
-+                       blr
-+
-+/* Routines for restoring integer registers, called by the compiler.  */
-+/* Called with r11 pointing to the stack header word of the caller of the */
-+/* function, just beyond the end of the integer restore area.  */
-+
-+_GLOBAL(_restgpr_14)   lwz     14,-72(11)      /* restore gp registers */
-+_GLOBAL(_restgpr_15)   lwz     15,-68(11)
-+_GLOBAL(_restgpr_16)   lwz     16,-64(11)
-+_GLOBAL(_restgpr_17)   lwz     17,-60(11)
-+_GLOBAL(_restgpr_18)   lwz     18,-56(11)
-+_GLOBAL(_restgpr_19)   lwz     19,-52(11)
-+_GLOBAL(_restgpr_20)   lwz     20,-48(11)
-+_GLOBAL(_restgpr_21)   lwz     21,-44(11)
-+_GLOBAL(_restgpr_22)   lwz     22,-40(11)
-+_GLOBAL(_restgpr_23)   lwz     23,-36(11)
-+_GLOBAL(_restgpr_24)   lwz     24,-32(11)
-+_GLOBAL(_restgpr_25)   lwz     25,-28(11)
-+_GLOBAL(_restgpr_26)   lwz     26,-24(11)
-+_GLOBAL(_restgpr_27)   lwz     27,-20(11)
-+_GLOBAL(_restgpr_28)   lwz     28,-16(11)
-+_GLOBAL(_restgpr_29)   lwz     29,-12(11)
-+_GLOBAL(_restgpr_30)   lwz     30,-8(11)
-+_GLOBAL(_restgpr_31)   lwz     31,-4(11)
-+                       blr
-+
-+/* Routines for restoring integer registers, called by the compiler.  */
-+/* Called with r11 pointing to the stack header word of the caller of the */
-+/* function, just beyond the end of the integer restore area.  */
-+
-+_GLOBAL(_restgpr_14_x) lwz     14,-72(11)      /* restore gp registers */
-+_GLOBAL(_restgpr_15_x) lwz     15,-68(11)
-+_GLOBAL(_restgpr_16_x) lwz     16,-64(11)
-+_GLOBAL(_restgpr_17_x) lwz     17,-60(11)
-+_GLOBAL(_restgpr_18_x) lwz     18,-56(11)
-+_GLOBAL(_restgpr_19_x) lwz     19,-52(11)
-+_GLOBAL(_restgpr_20_x) lwz     20,-48(11)
-+_GLOBAL(_restgpr_21_x) lwz     21,-44(11)
-+_GLOBAL(_restgpr_22_x) lwz     22,-40(11)
-+_GLOBAL(_restgpr_23_x) lwz     23,-36(11)
-+_GLOBAL(_restgpr_24_x) lwz     24,-32(11)
-+_GLOBAL(_restgpr_25_x) lwz     25,-28(11)
-+_GLOBAL(_restgpr_26_x) lwz     26,-24(11)
-+_GLOBAL(_restgpr_27_x) lwz     27,-20(11)
-+_GLOBAL(_restgpr_28_x) lwz     28,-16(11)
-+_GLOBAL(_restgpr_29_x) lwz     29,-12(11)
-+_GLOBAL(_restgpr_30_x) lwz     30,-8(11)
-+_GLOBAL(_restgpr_31_x) lwz     0,4(11)
-+                       lwz     31,-4(11)
-+                       mtlr    0
-+                       mr      1,11
-+                       blr
-+#endif
---- a/arch/powerpc/kernel/ppc_ksyms.c
-+++ b/arch/powerpc/kernel/ppc_ksyms.c
-@@ -185,3 +185,114 @@ EXPORT_SYMBOL(__mtdcr);
- EXPORT_SYMBOL(__mfdcr);
- #endif
- EXPORT_SYMBOL(empty_zero_page);
-+
-+#if defined(CONFIG_PPC32) && defined(CONFIG_CC_OPTIMIZE_FOR_SIZE)
-+void _savegpr_14(void);
-+void _savegpr_15(void);
-+void _savegpr_16(void);
-+void _savegpr_17(void);
-+void _savegpr_18(void);
-+void _savegpr_19(void);
-+void _savegpr_20(void);
-+void _savegpr_21(void);
-+void _savegpr_22(void);
-+void _savegpr_23(void);
-+void _savegpr_24(void);
-+void _savegpr_25(void);
-+void _savegpr_26(void);
-+void _savegpr_27(void);
-+void _savegpr_28(void);
-+void _savegpr_29(void);
-+void _savegpr_30(void);
-+void _savegpr_31(void);
-+void _restgpr_14(void);
-+void _restgpr_15(void);
-+void _restgpr_16(void);
-+void _restgpr_17(void);
-+void _restgpr_18(void);
-+void _restgpr_19(void);
-+void _restgpr_20(void);
-+void _restgpr_21(void);
-+void _restgpr_22(void);
-+void _restgpr_23(void);
-+void _restgpr_24(void);
-+void _restgpr_25(void);
-+void _restgpr_26(void);
-+void _restgpr_27(void);
-+void _restgpr_28(void);
-+void _restgpr_29(void);
-+void _restgpr_30(void);
-+void _restgpr_31(void);
-+void _restgpr_14_x(void);
-+void _restgpr_15_x(void);
-+void _restgpr_16_x(void);
-+void _restgpr_17_x(void);
-+void _restgpr_18_x(void);
-+void _restgpr_19_x(void);
-+void _restgpr_20_x(void);
-+void _restgpr_21_x(void);
-+void _restgpr_22_x(void);
-+void _restgpr_23_x(void);
-+void _restgpr_24_x(void);
-+void _restgpr_25_x(void);
-+void _restgpr_26_x(void);
-+void _restgpr_27_x(void);
-+void _restgpr_28_x(void);
-+void _restgpr_29_x(void);
-+void _restgpr_30_x(void);
-+void _restgpr_31_x(void);
-+EXPORT_SYMBOL(_savegpr_14);
-+EXPORT_SYMBOL(_savegpr_15);
-+EXPORT_SYMBOL(_savegpr_16);
-+EXPORT_SYMBOL(_savegpr_17);
-+EXPORT_SYMBOL(_savegpr_18);
-+EXPORT_SYMBOL(_savegpr_19);
-+EXPORT_SYMBOL(_savegpr_20);
-+EXPORT_SYMBOL(_savegpr_21);
-+EXPORT_SYMBOL(_savegpr_22);
-+EXPORT_SYMBOL(_savegpr_23);
-+EXPORT_SYMBOL(_savegpr_24);
-+EXPORT_SYMBOL(_savegpr_25);
-+EXPORT_SYMBOL(_savegpr_26);
-+EXPORT_SYMBOL(_savegpr_27);
-+EXPORT_SYMBOL(_savegpr_28);
-+EXPORT_SYMBOL(_savegpr_29);
-+EXPORT_SYMBOL(_savegpr_30);
-+EXPORT_SYMBOL(_savegpr_31);
-+EXPORT_SYMBOL(_restgpr_14);
-+EXPORT_SYMBOL(_restgpr_15);
-+EXPORT_SYMBOL(_restgpr_16);
-+EXPORT_SYMBOL(_restgpr_17);
-+EXPORT_SYMBOL(_restgpr_18);
-+EXPORT_SYMBOL(_restgpr_19);
-+EXPORT_SYMBOL(_restgpr_20);
-+EXPORT_SYMBOL(_restgpr_21);
-+EXPORT_SYMBOL(_restgpr_22);
-+EXPORT_SYMBOL(_restgpr_23);
-+EXPORT_SYMBOL(_restgpr_24);
-+EXPORT_SYMBOL(_restgpr_25);
-+EXPORT_SYMBOL(_restgpr_26);
-+EXPORT_SYMBOL(_restgpr_27);
-+EXPORT_SYMBOL(_restgpr_28);
-+EXPORT_SYMBOL(_restgpr_29);
-+EXPORT_SYMBOL(_restgpr_30);
-+EXPORT_SYMBOL(_restgpr_31);
-+EXPORT_SYMBOL(_restgpr_14_x);
-+EXPORT_SYMBOL(_restgpr_15_x);
-+EXPORT_SYMBOL(_restgpr_16_x);
-+EXPORT_SYMBOL(_restgpr_17_x);
-+EXPORT_SYMBOL(_restgpr_18_x);
-+EXPORT_SYMBOL(_restgpr_19_x);
-+EXPORT_SYMBOL(_restgpr_20_x);
-+EXPORT_SYMBOL(_restgpr_21_x);
-+EXPORT_SYMBOL(_restgpr_22_x);
-+EXPORT_SYMBOL(_restgpr_23_x);
-+EXPORT_SYMBOL(_restgpr_24_x);
-+EXPORT_SYMBOL(_restgpr_25_x);
-+EXPORT_SYMBOL(_restgpr_26_x);
-+EXPORT_SYMBOL(_restgpr_27_x);
-+EXPORT_SYMBOL(_restgpr_28_x);
-+EXPORT_SYMBOL(_restgpr_29_x);
-+EXPORT_SYMBOL(_restgpr_30_x);
-+EXPORT_SYMBOL(_restgpr_31_x);
-+#endif /* CONFIG_PPC32 && CONFIG_CC_OPTIMIZE_FOR_SIZE */
diff --git a/target/linux/generic-2.6/patches-2.6.34/060-block2mtd_init.patch b/target/linux/generic-2.6/patches-2.6.34/060-block2mtd_init.patch
deleted file mode 100644
index 3a47c85bb..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/060-block2mtd_init.patch
+++ /dev/null
@@ -1,120 +0,0 @@
---- a/drivers/mtd/devices/block2mtd.c
-+++ b/drivers/mtd/devices/block2mtd.c
-@@ -14,6 +14,7 @@
- #include <linux/list.h>
- #include <linux/init.h>
- #include <linux/mtd/mtd.h>
-+#include <linux/mtd/partitions.h>
- #include <linux/buffer_head.h>
- #include <linux/mutex.h>
- #include <linux/mount.h>
-@@ -232,10 +233,11 @@ static void block2mtd_free_device(struct
- 
- 
- /* FIXME: ensure that mtd->size % erase_size == 0 */
--static struct block2mtd_dev *add_device(char *devname, int erase_size)
-+static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname)
- {
- 	struct block_device *bdev;
- 	struct block2mtd_dev *dev;
-+	struct mtd_partition *part;
- 	char *name;
- 
- 	if (!devname)
-@@ -273,17 +275,17 @@ static struct block2mtd_dev *add_device(
- 
- 	mutex_init(&dev->write_mutex);
- 
--	/* Setup the MTD structure */
--	/* make the name contain the block device in */
--	name = kmalloc(sizeof("block2mtd: ") + strlen(devname) + 1,
--			GFP_KERNEL);
-+	if (!mtdname)
-+		mtdname = devname;
-+
-+	name = kmalloc(strlen(mtdname) + 1, GFP_KERNEL);
- 	if (!name)
- 		goto devinit_err;
- 
--	sprintf(name, "block2mtd: %s", devname);
-+	strcpy(name, mtdname);
- 	dev->mtd.name = name;
- 
--	dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK;
-+	dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK & ~(erase_size - 1);
- 	dev->mtd.erasesize = erase_size;
- 	dev->mtd.writesize = 1;
- 	dev->mtd.type = MTD_RAM;
-@@ -296,14 +298,17 @@ static struct block2mtd_dev *add_device(
- 	dev->mtd.priv = dev;
- 	dev->mtd.owner = THIS_MODULE;
- 
--	if (add_mtd_device(&dev->mtd)) {
-+	part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
-+	part->name = dev->mtd.name;
-+	part->offset = 0;
-+	part->size = dev->mtd.size;
-+	if (add_mtd_partitions(&dev->mtd, part, 1)) {
- 		/* Device didnt get added, so free the entry */
- 		goto devinit_err;
- 	}
- 	list_add(&dev->list, &blkmtd_device_list);
- 	INFO("mtd%d: [%s] erase_size = %dKiB [%d]", dev->mtd.index,
--			dev->mtd.name + strlen("block2mtd: "),
--			dev->mtd.erasesize >> 10, dev->mtd.erasesize);
-+			mtdname, dev->mtd.erasesize >> 10, dev->mtd.erasesize);
- 	return dev;
- 
- devinit_err:
-@@ -376,9 +381,9 @@ static char block2mtd_paramline[80 + 12]
- 
- static int block2mtd_setup2(const char *val)
- {
--	char buf[80 + 12]; /* 80 for device, 12 for erase size */
-+	char buf[80 + 12 + 80]; /* 80 for device, 12 for erase size, 80 for name */
- 	char *str = buf;
--	char *token[2];
-+	char *token[3];
- 	char *name;
- 	size_t erase_size = PAGE_SIZE;
- 	int i, ret;
-@@ -389,7 +394,7 @@ static int block2mtd_setup2(const char *
- 	strcpy(str, val);
- 	kill_final_newline(str);
- 
--	for (i = 0; i < 2; i++)
-+	for (i = 0; i < 3; i++)
- 		token[i] = strsep(&str, ",");
- 
- 	if (str)
-@@ -408,8 +413,10 @@ static int block2mtd_setup2(const char *
- 			parse_err("illegal erase size");
- 		}
- 	}
-+	if (token[2] && (strlen(token[2]) + 1 > 80))
-+		parse_err("mtd device name too long");
- 
--	add_device(name, erase_size);
-+	add_device(name, erase_size, token[2]);
- 
- 	return 0;
- }
-@@ -443,7 +450,7 @@ static int block2mtd_setup(const char *v
- 
- 
- module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
--MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>]\"");
-+MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>]]\"");
- 
- static int __init block2mtd_init(void)
- {
---- a/fs/partitions/check.c
-+++ b/fs/partitions/check.c
-@@ -625,6 +625,7 @@ try_scan:
- 	kfree(state);
- 	return 0;
- }
-+EXPORT_SYMBOL(rescan_partitions);
- 
- unsigned char *read_dev_sector(struct block_device *bdev, sector_t n, Sector *p)
- {
diff --git a/target/linux/generic-2.6/patches-2.6.34/065-rootfs_split.patch b/target/linux/generic-2.6/patches-2.6.34/065-rootfs_split.patch
deleted file mode 100644
index 22b3f5e90..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/065-rootfs_split.patch
+++ /dev/null
@@ -1,625 +0,0 @@
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -53,6 +53,16 @@ config MTD_PARTITIONS
- 	  devices. Partitioning on NFTL 'devices' is a different - that's the
- 	  'normal' form of partitioning used on a block device.
- 
-+config MTD_ROOTFS_ROOT_DEV
-+	bool "Automatically set 'rootfs' partition to be root filesystem"
-+	depends on MTD_PARTITIONS
-+	default y
-+
-+config MTD_ROOTFS_SPLIT
-+	bool "Automatically split 'rootfs' partition for squashfs"
-+	depends on MTD_PARTITIONS
-+	default y
-+
- config MTD_REDBOOT_PARTS
- 	tristate "RedBoot partition table parsing"
- 	depends on MTD_PARTITIONS
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -18,6 +18,8 @@
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
- #include <linux/mtd/compatmac.h>
-+#include <linux/root_dev.h>
-+#include <linux/magic.h>
- 
- /* Our partition linked list */
- static LIST_HEAD(mtd_partitions);
-@@ -35,7 +37,7 @@ struct mtd_part {
-  * the pointer to that structure with this macro.
-  */
- #define PART(x)  ((struct mtd_part *)(x))
--
-+#define IS_PART(mtd) (mtd->read == part_read)
- 
- /*
-  * MTD methods which simply translate the effective address and pass through
-@@ -503,6 +505,150 @@ out_register:
- 	return slave;
- }
- 
-+#ifdef CONFIG_MTD_ROOTFS_SPLIT
-+#define ROOTFS_SPLIT_NAME "rootfs_data"
-+#define ROOTFS_REMOVED_NAME "<removed>"
-+
-+struct squashfs_super_block {
-+	__le32 s_magic;
-+	__le32 pad0[9];
-+	__le64 bytes_used;
-+};
-+
-+
-+static int split_squashfs(struct mtd_info *master, int offset, int *split_offset)
-+{
-+	struct squashfs_super_block sb;
-+	int len, ret;
-+
-+	ret = master->read(master, offset, sizeof(sb), &len, (void *) &sb);
-+	if (ret || (len != sizeof(sb))) {
-+		printk(KERN_ALERT "split_squashfs: error occured while reading "
-+			"from \"%s\"\n", master->name);
-+		return -EINVAL;
-+	}
-+
-+	if (SQUASHFS_MAGIC != le32_to_cpu(sb.s_magic) ) {
-+		printk(KERN_ALERT "split_squashfs: no squashfs found in \"%s\"\n",
-+			master->name);
-+		*split_offset = 0;
-+		return 0;
-+	}
-+
-+	if (le64_to_cpu((sb.bytes_used)) <= 0) {
-+		printk(KERN_ALERT "split_squashfs: squashfs is empty in \"%s\"\n",
-+			master->name);
-+		*split_offset = 0;
-+		return 0;
-+	}
-+
-+	len = (u32) le64_to_cpu(sb.bytes_used);
-+	len += (offset & 0x000fffff);
-+	len +=  (master->erasesize - 1);
-+	len &= ~(master->erasesize - 1);
-+	len -= (offset & 0x000fffff);
-+	*split_offset = offset + len;
-+
-+	return 0;
-+}
-+
-+static int split_rootfs_data(struct mtd_info *master, struct mtd_info *rpart, const struct mtd_partition *part)
-+{
-+	struct mtd_partition *dpart;
-+	struct mtd_part *slave = NULL;
-+	int split_offset = 0;
-+	int ret;
-+
-+	ret = split_squashfs(master, part->offset, &split_offset);
-+	if (ret)
-+		return ret;
-+
-+	if (split_offset <= 0)
-+		return 0;
-+
-+	dpart = kmalloc(sizeof(*part)+sizeof(ROOTFS_SPLIT_NAME)+1, GFP_KERNEL);
-+	if (dpart == NULL) {
-+		printk(KERN_INFO "split_squashfs: no memory for partition \"%s\"\n",
-+			ROOTFS_SPLIT_NAME);
-+		return -ENOMEM;
-+	}
-+
-+	memcpy(dpart, part, sizeof(*part));
-+	dpart->name = (unsigned char *)&dpart[1];
-+	strcpy(dpart->name, ROOTFS_SPLIT_NAME);
-+
-+	dpart->size -= split_offset - dpart->offset;
-+	dpart->offset = split_offset;
-+
-+	if (dpart == NULL)
-+		return 1;
-+
-+	printk(KERN_INFO "mtd: partition \"%s\" created automatically, ofs=%llX, len=%llX \n",
-+		ROOTFS_SPLIT_NAME, dpart->offset, dpart->size);
-+
-+	slave = add_one_partition(master, dpart, 0, split_offset);
-+	if (!slave) {
-+		kfree(dpart);
-+		return -ENOMEM;
-+	}
-+	rpart->split = &slave->mtd;
-+
-+	return 0;
-+}
-+
-+static int refresh_rootfs_split(struct mtd_info *mtd)
-+{
-+	struct mtd_partition tpart;
-+	struct mtd_part *part;
-+	char *name;
-+	//int index = 0;
-+	int offset, size;
-+	int ret;
-+
-+	part = PART(mtd);
-+
-+	/* check for the new squashfs offset first */
-+	ret = split_squashfs(part->master, part->offset, &offset);
-+	if (ret)
-+		return ret;
-+
-+	if ((offset > 0) && !mtd->split) {
-+		printk(KERN_INFO "%s: creating new split partition for \"%s\"\n", __func__, mtd->name);
-+		/* if we don't have a rootfs split partition, create a new one */
-+		tpart.name = (char *) mtd->name;
-+		tpart.size = mtd->size;
-+		tpart.offset = part->offset;
-+
-+		return split_rootfs_data(part->master, &part->mtd, &tpart);
-+	} else if ((offset > 0) && mtd->split) {
-+		/* update the offsets of the existing partition */
-+		size = mtd->size + part->offset - offset;
-+
-+		part = PART(mtd->split);
-+		part->offset = offset;
-+		part->mtd.size = size;
-+		printk(KERN_INFO "%s: %s partition \"" ROOTFS_SPLIT_NAME "\", offset: 0x%06x (0x%06x)\n",
-+			__func__, (!strcmp(part->mtd.name, ROOTFS_SPLIT_NAME) ? "updating" : "creating"),
-+			(u32) part->offset, (u32) part->mtd.size);
-+		name = kmalloc(sizeof(ROOTFS_SPLIT_NAME) + 1, GFP_KERNEL);
-+		strcpy(name, ROOTFS_SPLIT_NAME);
-+		part->mtd.name = name;
-+	} else if ((offset <= 0) && mtd->split) {
-+		printk(KERN_INFO "%s: removing partition \"%s\"\n", __func__, mtd->split->name);
-+
-+		/* mark existing partition as removed */
-+		part = PART(mtd->split);
-+		name = kmalloc(sizeof(ROOTFS_SPLIT_NAME) + 1, GFP_KERNEL);
-+		strcpy(name, ROOTFS_REMOVED_NAME);
-+		part->mtd.name = name;
-+		part->offset = 0;
-+		part->mtd.size = 0;
-+	}
-+
-+	return 0;
-+}
-+#endif /* CONFIG_MTD_ROOTFS_SPLIT */
-+
- /*
-  * This function, given a master MTD object and a partition table, creates
-  * and registers slave MTD objects which are bound to the master according to
-@@ -518,7 +664,7 @@ int add_mtd_partitions(struct mtd_info *
- {
- 	struct mtd_part *slave;
- 	uint64_t cur_offset = 0;
--	int i;
-+	int i, ret;
- 
- 	printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
- 
-@@ -526,6 +672,21 @@ int add_mtd_partitions(struct mtd_info *
- 		slave = add_one_partition(master, parts + i, i, cur_offset);
- 		if (!slave)
- 			return -ENOMEM;
-+
-+		if (!strcmp(parts[i].name, "rootfs")) {
-+#ifdef CONFIG_MTD_ROOTFS_ROOT_DEV
-+			if (ROOT_DEV == 0) {
-+				printk(KERN_NOTICE "mtd: partition \"rootfs\" "
-+					"set to be root filesystem\n");
-+				ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, slave->mtd.index);
-+			}
-+#endif
-+#ifdef CONFIG_MTD_ROOTFS_SPLIT
-+			ret = split_rootfs_data(master, &slave->mtd, &parts[i]);
-+			/* if (ret == 0)
-+				j++; */
-+#endif
-+		}
- 		cur_offset = slave->offset + slave->mtd.size;
- 	}
- 
-@@ -533,6 +694,32 @@ int add_mtd_partitions(struct mtd_info *
- }
- EXPORT_SYMBOL(add_mtd_partitions);
- 
-+int refresh_mtd_partitions(struct mtd_info *mtd)
-+{
-+	int ret = 0;
-+
-+	if (IS_PART(mtd)) {
-+		struct mtd_part *part;
-+		struct mtd_info *master;
-+
-+		part = PART(mtd);
-+		master = part->master;
-+		if (master->refresh_device)
-+			ret = master->refresh_device(master);
-+	}
-+
-+	if (!ret && mtd->refresh_device)
-+		ret = mtd->refresh_device(mtd);
-+
-+#ifdef CONFIG_MTD_ROOTFS_SPLIT
-+	if (!ret && IS_PART(mtd) && !strcmp(mtd->name, "rootfs"))
-+		refresh_rootfs_split(mtd);
-+#endif
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL_GPL(refresh_mtd_partitions);
-+
- static DEFINE_SPINLOCK(part_parser_lock);
- static LIST_HEAD(part_parsers);
- 
---- a/drivers/mtd/devices/block2mtd.c
-+++ b/drivers/mtd/devices/block2mtd.c
-@@ -29,6 +29,8 @@ struct block2mtd_dev {
- 	struct block_device *blkdev;
- 	struct mtd_info mtd;
- 	struct mutex write_mutex;
-+	rwlock_t bdev_mutex;
-+	char devname[0];
- };
- 
- 
-@@ -81,6 +83,12 @@ static int block2mtd_erase(struct mtd_in
- 	size_t len = instr->len;
- 	int err;
- 
-+	read_lock(&dev->bdev_mutex);
-+	if (!dev->blkdev) {
-+		err = -EINVAL;
-+		goto done;
-+	}
-+
- 	instr->state = MTD_ERASING;
- 	mutex_lock(&dev->write_mutex);
- 	err = _block2mtd_erase(dev, from, len);
-@@ -93,6 +101,10 @@ static int block2mtd_erase(struct mtd_in
- 
- 	instr->state = MTD_ERASE_DONE;
- 	mtd_erase_callback(instr);
-+
-+done:
-+	read_unlock(&dev->bdev_mutex);
-+
- 	return err;
- }
- 
-@@ -104,10 +116,14 @@ static int block2mtd_read(struct mtd_inf
- 	struct page *page;
- 	int index = from >> PAGE_SHIFT;
- 	int offset = from & (PAGE_SIZE-1);
--	int cpylen;
-+	int cpylen, err = 0;
-+
-+	read_lock(&dev->bdev_mutex);
-+	if (!dev->blkdev || (from > mtd->size)) {
-+		err = -EINVAL;
-+		goto done;
-+	}
- 
--	if (from > mtd->size)
--		return -EINVAL;
- 	if (from + len > mtd->size)
- 		len = mtd->size - from;
- 
-@@ -122,10 +138,14 @@ static int block2mtd_read(struct mtd_inf
- 		len = len - cpylen;
- 
- 		page = page_read(dev->blkdev->bd_inode->i_mapping, index);
--		if (!page)
--			return -ENOMEM;
--		if (IS_ERR(page))
--			return PTR_ERR(page);
-+		if (!page) {
-+			err = -ENOMEM;
-+			goto done;
-+		}
-+		if (IS_ERR(page)) {
-+			err = PTR_ERR(page);
-+			goto done;
-+		}
- 
- 		memcpy(buf, page_address(page) + offset, cpylen);
- 		page_cache_release(page);
-@@ -136,7 +156,10 @@ static int block2mtd_read(struct mtd_inf
- 		offset = 0;
- 		index++;
- 	}
--	return 0;
-+
-+done:
-+	read_unlock(&dev->bdev_mutex);
-+	return err;
- }
- 
- 
-@@ -188,12 +211,22 @@ static int block2mtd_write(struct mtd_in
- 		size_t *retlen, const u_char *buf)
- {
- 	struct block2mtd_dev *dev = mtd->priv;
--	int err;
-+	int err = 0;
-+
-+	read_lock(&dev->bdev_mutex);
-+	if (!dev->blkdev) {
-+		err = -EINVAL;
-+		goto done;
-+	}
- 
- 	if (!len)
--		return 0;
--	if (to >= mtd->size)
--		return -ENOSPC;
-+		goto done;
-+
-+	if (to >= mtd->size) {
-+		err = -ENOSPC;
-+		goto done;
-+	}
-+
- 	if (to + len > mtd->size)
- 		len = mtd->size - to;
- 
-@@ -202,6 +235,9 @@ static int block2mtd_write(struct mtd_in
- 	mutex_unlock(&dev->write_mutex);
- 	if (err > 0)
- 		err = 0;
-+
-+done:
-+	read_unlock(&dev->bdev_mutex);
- 	return err;
- }
- 
-@@ -210,52 +246,29 @@ static int block2mtd_write(struct mtd_in
- static void block2mtd_sync(struct mtd_info *mtd)
- {
- 	struct block2mtd_dev *dev = mtd->priv;
--	sync_blockdev(dev->blkdev);
--	return;
--}
--
--
--static void block2mtd_free_device(struct block2mtd_dev *dev)
--{
--	if (!dev)
--		return;
--
--	kfree(dev->mtd.name);
- 
--	if (dev->blkdev) {
--		invalidate_mapping_pages(dev->blkdev->bd_inode->i_mapping,
--					0, -1);
--		close_bdev_exclusive(dev->blkdev, FMODE_READ|FMODE_WRITE);
--	}
-+	read_lock(&dev->bdev_mutex);
-+	if (dev->blkdev)
-+		sync_blockdev(dev->blkdev);
-+	read_unlock(&dev->bdev_mutex);
- 
--	kfree(dev);
-+	return;
- }
- 
- 
--/* FIXME: ensure that mtd->size % erase_size == 0 */
--static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname)
-+static int _open_bdev(struct block2mtd_dev *dev)
- {
- 	struct block_device *bdev;
--	struct block2mtd_dev *dev;
--	struct mtd_partition *part;
--	char *name;
--
--	if (!devname)
--		return NULL;
--
--	dev = kzalloc(sizeof(struct block2mtd_dev), GFP_KERNEL);
--	if (!dev)
--		return NULL;
- 
- 	/* Get a handle on the device */
--	bdev = open_bdev_exclusive(devname, FMODE_READ|FMODE_WRITE, NULL);
-+	bdev = open_bdev_exclusive(dev->devname, FMODE_READ|FMODE_WRITE, NULL);
- #ifndef MODULE
- 	if (IS_ERR(bdev)) {
- 
- 		/* We might not have rootfs mounted at this point. Try
- 		   to resolve the device name by other means. */
- 
--		dev_t devt = name_to_dev_t(devname);
-+		dev_t devt = name_to_dev_t(dev->devname);
- 		if (devt) {
- 			bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
- 		}
-@@ -263,17 +276,98 @@ static struct block2mtd_dev *add_device(
- #endif
- 
- 	if (IS_ERR(bdev)) {
--		ERROR("error: cannot open device %s", devname);
--		goto devinit_err;
-+		ERROR("error: cannot open device %s", dev->devname);
-+		return 1;
- 	}
- 	dev->blkdev = bdev;
- 
- 	if (MAJOR(bdev->bd_dev) == MTD_BLOCK_MAJOR) {
- 		ERROR("attempting to use an MTD device as a block device");
--		goto devinit_err;
-+		return 1;
- 	}
- 
-+	return 0;
-+}
-+
-+static void _close_bdev(struct block2mtd_dev *dev)
-+{
-+	struct block_device *bdev;
-+
-+	if (!dev->blkdev)
-+		return;
-+
-+	bdev = dev->blkdev;
-+	invalidate_mapping_pages(dev->blkdev->bd_inode->i_mapping, 0, -1);
-+	close_bdev_exclusive(dev->blkdev, FMODE_READ|FMODE_WRITE);
-+	dev->blkdev = NULL;
-+}
-+
-+static void block2mtd_free_device(struct block2mtd_dev *dev)
-+{
-+	if (!dev)
-+		return;
-+
-+	kfree(dev->mtd.name);
-+	_close_bdev(dev);
-+	kfree(dev);
-+}
-+
-+
-+static int block2mtd_refresh(struct mtd_info *mtd)
-+{
-+	struct block2mtd_dev *dev = mtd->priv;
-+	struct block_device *bdev;
-+	dev_t devt;
-+	int err = 0;
-+
-+	/* no other mtd function can run at this point */
-+	write_lock(&dev->bdev_mutex);
-+
-+	/* get the device number for the whole disk */
-+	devt = MKDEV(MAJOR(dev->blkdev->bd_dev), 0);
-+
-+	/* close the old block device */
-+	_close_bdev(dev);
-+
-+	/* open the whole disk, issue a partition rescan, then */
-+	bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
-+	if (!bdev || !bdev->bd_disk)
-+		err = -EINVAL;
-+#ifndef CONFIG_MTD_BLOCK2MTD_MODULE
-+	else
-+		err = rescan_partitions(bdev->bd_disk, bdev);
-+#endif
-+	if (bdev)
-+		close_bdev_exclusive(bdev, FMODE_READ|FMODE_WRITE);
-+
-+	/* try to open the partition block device again */
-+	_open_bdev(dev);
-+	write_unlock(&dev->bdev_mutex);
-+
-+	return err;
-+}
-+
-+/* FIXME: ensure that mtd->size % erase_size == 0 */
-+static struct block2mtd_dev *add_device(char *devname, int erase_size, char *mtdname)
-+{
-+	struct block2mtd_dev *dev;
-+	struct mtd_partition *part;
-+	char *name;
-+
-+	if (!devname)
-+		return NULL;
-+
-+	dev = kzalloc(sizeof(struct block2mtd_dev) + strlen(devname) + 1, GFP_KERNEL);
-+	if (!dev)
-+		return NULL;
-+
-+	strcpy(dev->devname, devname);
-+
-+	if (_open_bdev(dev))
-+		goto devinit_err;
-+
- 	mutex_init(&dev->write_mutex);
-+	rwlock_init(&dev->bdev_mutex);
- 
- 	if (!mtdname)
- 		mtdname = devname;
-@@ -297,6 +391,7 @@ static struct block2mtd_dev *add_device(
- 	dev->mtd.read = block2mtd_read;
- 	dev->mtd.priv = dev;
- 	dev->mtd.owner = THIS_MODULE;
-+	dev->mtd.refresh_device = block2mtd_refresh;
- 
- 	part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
- 	part->name = dev->mtd.name;
---- a/drivers/mtd/mtdchar.c
-+++ b/drivers/mtd/mtdchar.c
-@@ -18,6 +18,7 @@
- 
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/compatmac.h>
-+#include <linux/mtd/partitions.h>
- 
- #include <asm/uaccess.h>
- 
-@@ -814,6 +815,13 @@ static int mtd_ioctl(struct inode *inode
- 		file->f_pos = 0;
- 		break;
- 	}
-+#ifdef CONFIG_MTD_PARTITIONS
-+	case MTDREFRESH:
-+	{
-+		ret = refresh_mtd_partitions(mtd);
-+		break;
-+	}
-+#endif
- 
- 	default:
- 		ret = -ENOTTY;
---- a/include/linux/mtd/mtd.h
-+++ b/include/linux/mtd/mtd.h
-@@ -101,6 +101,7 @@ struct mtd_oob_ops {
- 	uint8_t		*oobbuf;
- };
- 
-+struct mtd_info;
- struct mtd_info {
- 	u_char type;
- 	uint32_t flags;
-@@ -241,6 +242,9 @@ struct mtd_info {
- 	struct device dev;
- 	int usecount;
- 
-+	int (*refresh_device)(struct mtd_info *mtd);
-+	struct mtd_info *split;
-+
- 	/* If the driver is something smart, like UBI, it may need to maintain
- 	 * its own reference counting. The below functions are only for driver.
- 	 * The driver may register its callbacks. These callbacks are not
---- a/include/linux/mtd/partitions.h
-+++ b/include/linux/mtd/partitions.h
-@@ -34,12 +34,14 @@
-  * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
-  */
- 
-+struct mtd_partition;
- struct mtd_partition {
- 	char *name;			/* identifier string */
- 	uint64_t size;			/* partition size */
- 	uint64_t offset;		/* offset within the master MTD space */
- 	uint32_t mask_flags;		/* master MTD flags to mask out for this partition */
- 	struct nand_ecclayout *ecclayout;	/* out of band layout for this partition (NAND only)*/
-+	int (*refresh_partition)(struct mtd_info *);
- };
- 
- #define MTDPART_OFS_NXTBLK	(-2)
-@@ -51,6 +53,7 @@ struct mtd_info;
- 
- int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int);
- int del_mtd_partitions(struct mtd_info *);
-+int refresh_mtd_partitions(struct mtd_info *);
- 
- /*
-  * Functions dealing with the various ways of partitioning the space
---- a/include/mtd/mtd-abi.h
-+++ b/include/mtd/mtd-abi.h
-@@ -110,6 +110,7 @@ struct otp_info {
- #define MEMERASE64		_IOW('M', 20, struct erase_info_user64)
- #define MEMWRITEOOB64		_IOWR('M', 21, struct mtd_oob_buf64)
- #define MEMREADOOB64		_IOWR('M', 22, struct mtd_oob_buf64)
-+#define MTDREFRESH		_IO('M', 23)
- 
- /*
-  * Obsolete legacy interface. Keep it in order not to break userspace
diff --git a/target/linux/generic-2.6/patches-2.6.34/066-block2mtd_probe.patch b/target/linux/generic-2.6/patches-2.6.34/066-block2mtd_probe.patch
deleted file mode 100644
index b2b1a347f..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/066-block2mtd_probe.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/drivers/mtd/devices/block2mtd.c
-+++ b/drivers/mtd/devices/block2mtd.c
-@@ -268,6 +268,7 @@ static int _open_bdev(struct block2mtd_d
- 		/* We might not have rootfs mounted at this point. Try
- 		   to resolve the device name by other means. */
- 
-+		wait_for_device_probe();
- 		dev_t devt = name_to_dev_t(dev->devname);
- 		if (devt) {
- 			bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
diff --git a/target/linux/generic-2.6/patches-2.6.34/070-redboot_space.patch b/target/linux/generic-2.6/patches-2.6.34/070-redboot_space.patch
deleted file mode 100644
index 6ace83c01..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/070-redboot_space.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/drivers/mtd/redboot.c
-+++ b/drivers/mtd/redboot.c
-@@ -249,14 +249,21 @@ static int parse_redboot_partitions(stru
- #endif
- 		names += strlen(names)+1;
- 
--#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
- 		if(fl->next && fl->img->flash_base + fl->img->size + master->erasesize <= fl->next->img->flash_base) {
--			i++;
--			parts[i].offset = parts[i-1].size + parts[i-1].offset;
--			parts[i].size = fl->next->img->flash_base - parts[i].offset;
--			parts[i].name = nullname;
--		}
-+			if (!strcmp(parts[i].name, "rootfs")) {
-+				parts[i].size = fl->next->img->flash_base;
-+				parts[i].size &= ~(master->erasesize - 1);
-+				parts[i].size -= parts[i].offset;
-+#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
-+				nrparts--;
-+			} else {
-+				i++;
-+				parts[i].offset = parts[i-1].size + parts[i-1].offset;
-+				parts[i].size = fl->next->img->flash_base - parts[i].offset;
-+				parts[i].name = nullname;
- #endif
-+			}
-+		}
- 		tmp_fl = fl;
- 		fl = fl->next;
- 		kfree(tmp_fl);
diff --git a/target/linux/generic-2.6/patches-2.6.34/071-redboot_boardconfig.patch b/target/linux/generic-2.6/patches-2.6.34/071-redboot_boardconfig.patch
deleted file mode 100644
index f9bc4fe36..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/071-redboot_boardconfig.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/drivers/mtd/redboot.c
-+++ b/drivers/mtd/redboot.c
-@@ -11,6 +11,8 @@
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
- 
-+#define BOARD_CONFIG_PART		"boardconfig"
-+
- struct fis_image_desc {
-     unsigned char name[16];      // Null terminated name
-     uint32_t	  flash_base;    // Address within FLASH of image
-@@ -41,6 +43,7 @@ static int parse_redboot_partitions(stru
-                              struct mtd_partition **pparts,
-                              unsigned long fis_origin)
- {
-+	unsigned long max_offset = 0;
- 	int nrparts = 0;
- 	struct fis_image_desc *buf;
- 	struct mtd_partition *parts;
-@@ -209,14 +212,14 @@ static int parse_redboot_partitions(stru
- 		}
- 	}
- #endif
--	parts = kzalloc(sizeof(*parts)*nrparts + nulllen + namelen, GFP_KERNEL);
-+	parts = kzalloc(sizeof(*parts) * (nrparts + 1) + nulllen + namelen + sizeof(BOARD_CONFIG_PART), GFP_KERNEL);
- 
- 	if (!parts) {
- 		ret = -ENOMEM;
- 		goto out;
- 	}
- 
--	nullname = (char *)&parts[nrparts];
-+	nullname = (char *)&parts[nrparts + 1];
- #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
- 	if (nulllen > 0) {
- 		strcpy(nullname, nullstring);
-@@ -235,6 +238,8 @@ static int parse_redboot_partitions(stru
- 	}
- #endif
- 	for ( ; i<nrparts; i++) {
-+		if(max_offset < buf[i].flash_base + buf[i].size)
-+			max_offset = buf[i].flash_base + buf[i].size;
- 		parts[i].size = fl->img->size;
- 		parts[i].offset = fl->img->flash_base;
- 		parts[i].name = names;
-@@ -268,6 +273,14 @@ static int parse_redboot_partitions(stru
- 		fl = fl->next;
- 		kfree(tmp_fl);
- 	}
-+	if(master->size - max_offset >= master->erasesize)
-+	{
-+		parts[nrparts].size = master->size - max_offset;
-+		parts[nrparts].offset = max_offset;
-+		parts[nrparts].name = names;
-+		strcpy(names, BOARD_CONFIG_PART);
-+		nrparts++;
-+	}
- 	ret = nrparts;
- 	*pparts = parts;
-  out:
diff --git a/target/linux/generic-2.6/patches-2.6.34/080-mtd_plat_nand_chip_fixup.patch b/target/linux/generic-2.6/patches-2.6.34/080-mtd_plat_nand_chip_fixup.patch
deleted file mode 100644
index 16ce76ce8..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/080-mtd_plat_nand_chip_fixup.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/include/linux/mtd/nand.h
-+++ b/include/linux/mtd/nand.h
-@@ -491,6 +491,7 @@ struct platform_nand_chip {
- 	int			chip_delay;
- 	unsigned int		options;
- 	const char		**part_probe_types;
-+	int			(*chip_fixup)(struct mtd_info *mtd);
- 	void			(*set_parts)(uint64_t size,
- 					struct platform_nand_chip *chip);
- 	void			*priv;
---- a/drivers/mtd/nand/plat_nand.c
-+++ b/drivers/mtd/nand/plat_nand.c
-@@ -91,7 +91,18 @@ static int __devinit plat_nand_probe(str
- 	}
- 
- 	/* Scan to find existance of the device */
--	if (nand_scan(&data->mtd, 1)) {
-+	if (nand_scan_ident(&data->mtd, 1)) {
-+		res = -ENXIO;
-+		goto out;
-+	}
-+
-+	if (pdata->chip.chip_fixup) {
-+		res = pdata->chip.chip_fixup(&data->mtd);
-+		if (res)
-+			goto out;
-+	}
-+
-+	if (nand_scan_tail(&data->mtd)) {
- 		err = -ENXIO;
- 		goto out;
- 	}
diff --git a/target/linux/generic-2.6/patches-2.6.34/081-mtd_myloader_partition_parser.patch b/target/linux/generic-2.6/patches-2.6.34/081-mtd_myloader_partition_parser.patch
deleted file mode 100644
index 61b822ee8..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/081-mtd_myloader_partition_parser.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -181,6 +181,22 @@ config MTD_AR7_PARTS
- 	---help---
- 	  TI AR7 partitioning support
- 
-+config MTD_MYLOADER_PARTS
-+	tristate "MyLoader partition parsing"
-+	depends on MTD_PARTITIONS && (ADM5120 || ATHEROS_AR231X || ATHEROS_AR71XX)
-+	---help---
-+	  MyLoader is a bootloader which allows the user to define partitions
-+	  in flash devices, by putting a table in the second erase block
-+	  on the device, similar to a partition table. This table gives the 
-+	  offsets and lengths of the user defined partitions.
-+
-+	  If you need code which can detect and parse these tables, and
-+	  register MTD 'partitions' corresponding to each image detected,
-+	  enable this option.
-+
-+	  You will still need the parsing functions to be called by the driver
-+	  for your particular device. It won't happen automatically.
-+
- comment "User Modules And Translation Layers"
- 
- config MTD_CHAR
---- a/drivers/mtd/Makefile
-+++ b/drivers/mtd/Makefile
-@@ -13,6 +13,7 @@ obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdli
- obj-$(CONFIG_MTD_AFS_PARTS)	+= afs.o
- obj-$(CONFIG_MTD_AR7_PARTS)	+= ar7part.o
- obj-$(CONFIG_MTD_OF_PARTS)      += ofpart.o
-+obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
- 
- # 'Users' - code which presents functionality to userspace.
- obj-$(CONFIG_MTD_CHAR)		+= mtdchar.o
diff --git a/target/linux/generic-2.6/patches-2.6.34/082-mtd_info_move_forward_decl.patch b/target/linux/generic-2.6/patches-2.6.34/082-mtd_info_move_forward_decl.patch
deleted file mode 100644
index 13f0a217d..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/082-mtd_info_move_forward_decl.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/include/linux/mtd/partitions.h
-+++ b/include/linux/mtd/partitions.h
-@@ -33,6 +33,7 @@
-  * Note: writeable partitions require their size and offset be
-  * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
-  */
-+struct mtd_info;
- 
- struct mtd_partition;
- struct mtd_partition {
-@@ -49,7 +50,6 @@ struct mtd_partition {
- #define MTDPART_SIZ_FULL	(0)
- 
- 
--struct mtd_info;
- 
- int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int);
- int del_mtd_partitions(struct mtd_info *);
diff --git a/target/linux/generic-2.6/patches-2.6.34/083-mtd_fix_nand_correct_data_return_code.patch b/target/linux/generic-2.6/patches-2.6.34/083-mtd_fix_nand_correct_data_return_code.patch
deleted file mode 100644
index f630059e8..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/083-mtd_fix_nand_correct_data_return_code.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/drivers/mtd/nand/nand_ecc.c
-+++ b/drivers/mtd/nand/nand_ecc.c
-@@ -507,8 +507,7 @@ int __nand_correct_data(unsigned char *b
- 	if ((bitsperbyte[b0] + bitsperbyte[b1] + bitsperbyte[b2]) == 1)
- 		return 1;	/* error in ecc data; no action needed */
- 
--	printk(KERN_ERR "uncorrectable error : ");
--	return -1;
-+	return -EBADMSG;
- }
- EXPORT_SYMBOL(__nand_correct_data);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.34/084-mtd_m25p80_add_pm25lv_flash_support.patch b/target/linux/generic-2.6/patches-2.6.34/084-mtd_m25p80_add_pm25lv_flash_support.patch
deleted file mode 100644
index 54cc6bbe5..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/084-mtd_m25p80_add_pm25lv_flash_support.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -645,6 +645,10 @@ static const struct spi_device_id m25p_i
- 	{ "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
- 	{ "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
- 
-+	/* PMC -- pm25x "blocks" are 32K, sectors are 4K */
-+	{ "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K) },
-+	{ "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K) },
-+
- 	/* Spansion -- single (large) sector size only, at least
- 	 * for the chips listed here (without boot sectors).
- 	 */
diff --git a/target/linux/generic-2.6/patches-2.6.34/085-mtd_m25p80_add_en25pxx_support.patch b/target/linux/generic-2.6/patches-2.6.34/085-mtd_m25p80_add_en25pxx_support.patch
deleted file mode 100644
index 607430bb2..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/085-mtd_m25p80_add_en25pxx_support.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -645,6 +645,10 @@ static const struct spi_device_id m25p_i
- 	{ "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
- 	{ "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
- 
-+	/* EON -- en25pxx */
-+	{ "en25p32", INFO(0x1c2016, 0, 64 * 1024,  64, 0) },
-+	{ "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) },
-+
- 	/* PMC -- pm25x "blocks" are 32K, sectors are 4K */
- 	{ "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K) },
- 	{ "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K) },
diff --git a/target/linux/generic-2.6/patches-2.6.34/086-mtd_m25p80_add_xxxs33b_support.patch b/target/linux/generic-2.6/patches-2.6.34/086-mtd_m25p80_add_xxxs33b_support.patch
deleted file mode 100644
index 2f6d89927..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/086-mtd_m25p80_add_xxxs33b_support.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -649,6 +649,11 @@ static const struct spi_device_id m25p_i
- 	{ "en25p32", INFO(0x1c2016, 0, 64 * 1024,  64, 0) },
- 	{ "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) },
- 
-+	/* Numonyx -- xxxs33b */
-+	{ "160s33b",  INFO(0x898911, 0, 64 * 1024,  64, 0) },
-+	{ "320s33b",  INFO(0x898912, 0, 64 * 1024, 128, 0) },
-+	{ "640s33b",  INFO(0x898913, 0, 64 * 1024, 256, 0) },
-+
- 	/* PMC -- pm25x "blocks" are 32K, sectors are 4K */
- 	{ "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K) },
- 	{ "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K) },
-@@ -833,11 +838,12 @@ static int __devinit m25p_probe(struct s
- 	dev_set_drvdata(&spi->dev, flash);
- 
- 	/*
--	 * Atmel and SST serial flash tend to power
-+	 * Atmel, SST and Intel/Numonyx serial flash tend to power
- 	 * up with the software protection bits set
- 	 */
- 
- 	if (info->jedec_id >> 16 == 0x1f ||
-+	    info->jedec_id >> 16 == 0x89 ||
- 	    info->jedec_id >> 16 == 0xbf) {
- 		write_enable(flash);
- 		write_sr(flash, 0);
diff --git a/target/linux/generic-2.6/patches-2.6.34/087-mtd-m25p80-add-w25q32-chip-support.patch b/target/linux/generic-2.6/patches-2.6.34/087-mtd-m25p80-add-w25q32-chip-support.patch
deleted file mode 100644
index 8d32ec2c5..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/087-mtd-m25p80-add-w25q32-chip-support.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -706,6 +706,7 @@ static const struct spi_device_id m25p_i
- 	{ "w25x80", INFO(0xef3014, 0, 64 * 1024,  16, SECT_4K) },
- 	{ "w25x16", INFO(0xef3015, 0, 64 * 1024,  32, SECT_4K) },
- 	{ "w25x32", INFO(0xef3016, 0, 64 * 1024,  64, SECT_4K) },
-+	{ "w25q32", INFO(0xef4016, 0, 64 * 1024,  64, SECT_4K) },
- 	{ "w25x64", INFO(0xef3017, 0, 64 * 1024, 128, SECT_4K) },
- 
- 	/* Catalyst / On Semiconductor -- non-JEDEC */
diff --git a/target/linux/generic-2.6/patches-2.6.34/100-netfilter_layer7_2.21.patch b/target/linux/generic-2.6/patches-2.6.34/100-netfilter_layer7_2.21.patch
deleted file mode 100644
index be7d97fe1..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/100-netfilter_layer7_2.21.patch
+++ /dev/null
@@ -1,2132 +0,0 @@
---- /dev/null
-+++ b/include/linux/netfilter/xt_layer7.h
-@@ -0,0 +1,13 @@
-+#ifndef _XT_LAYER7_H
-+#define _XT_LAYER7_H
-+
-+#define MAX_PATTERN_LEN 8192
-+#define MAX_PROTOCOL_LEN 256
-+
-+struct xt_layer7_info {
-+    char protocol[MAX_PROTOCOL_LEN];
-+    char pattern[MAX_PATTERN_LEN];
-+    u_int8_t invert;
-+};
-+
-+#endif /* _XT_LAYER7_H */
---- a/include/net/netfilter/nf_conntrack.h
-+++ b/include/net/netfilter/nf_conntrack.h
-@@ -116,6 +116,22 @@ struct nf_conn {
- 	u_int32_t secmark;
- #endif
- 
-+#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || \
-+    defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
-+	struct {
-+		/*
-+		 * e.g. "http". NULL before decision. "unknown" after decision
-+		 * if no match.
-+		 */
-+		char *app_proto;
-+		/*
-+		 * application layer data so far. NULL after match decision.
-+		 */
-+		char *app_data;
-+		unsigned int app_data_len;
-+	} layer7;
-+#endif
-+
- 	/* Storage reserved for other modules: */
- 	union nf_conntrack_proto proto;
- 
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -858,6 +858,27 @@ config NETFILTER_XT_MATCH_STATE
- 
- 	  To compile it as a module, choose M here.  If unsure, say N.
- 
-+config NETFILTER_XT_MATCH_LAYER7
-+	tristate '"layer7" match support'
-+	depends on NETFILTER_XTABLES
-+	depends on EXPERIMENTAL && (IP_NF_CONNTRACK || NF_CONNTRACK)
-+       depends on NF_CT_ACCT
-+	help
-+	  Say Y if you want to be able to classify connections (and their
-+	  packets) based on regular expression matching of their application
-+	  layer data.   This is one way to classify applications such as
-+	  peer-to-peer filesharing systems that do not always use the same
-+	  port.
-+
-+	  To compile it as a module, choose M here.  If unsure, say N.
-+
-+config NETFILTER_XT_MATCH_LAYER7_DEBUG
-+        bool 'Layer 7 debugging output'
-+        depends on NETFILTER_XT_MATCH_LAYER7
-+        help
-+          Say Y to get lots of debugging output.
-+
-+
- config NETFILTER_XT_MATCH_STATISTIC
- 	tristate '"statistic" match support'
- 	depends on NETFILTER_ADVANCED
---- a/net/netfilter/Makefile
-+++ b/net/netfilter/Makefile
-@@ -89,6 +89,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) 
- obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
-+obj-$(CONFIG_NETFILTER_XT_MATCH_LAYER7) += xt_layer7.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_STATISTIC) += xt_statistic.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) += xt_string.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
---- a/net/netfilter/nf_conntrack_core.c
-+++ b/net/netfilter/nf_conntrack_core.c
-@@ -201,6 +201,14 @@ destroy_conntrack(struct nf_conntrack *n
- 	 * too. */
- 	nf_ct_remove_expectations(ct);
- 
-+	#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
-+	if(ct->layer7.app_proto)
-+		kfree(ct->layer7.app_proto);
-+	if(ct->layer7.app_data)
-+	kfree(ct->layer7.app_data);
-+	#endif
-+
-+
- 	/* We overload first tuple to link into unconfirmed list. */
- 	if (!nf_ct_is_confirmed(ct)) {
- 		BUG_ON(hlist_nulls_unhashed(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnnode));
---- a/net/netfilter/nf_conntrack_standalone.c
-+++ b/net/netfilter/nf_conntrack_standalone.c
-@@ -171,6 +171,12 @@ static int ct_seq_show(struct seq_file *
- 		goto release;
- #endif
- 
-+#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
-+	if(ct->layer7.app_proto &&
-+           seq_printf(s, "l7proto=%s ", ct->layer7.app_proto))
-+		return -ENOSPC;
-+#endif
-+
- 	if (seq_printf(s, "use=%u\n", atomic_read(&ct->ct_general.use)))
- 		goto release;
- 
---- /dev/null
-+++ b/net/netfilter/regexp/regexp.c
-@@ -0,0 +1,1197 @@
-+/*
-+ * regcomp and regexec -- regsub and regerror are elsewhere
-+ * @(#)regexp.c	1.3 of 18 April 87
-+ *
-+ *	Copyright (c) 1986 by University of Toronto.
-+ *	Written by Henry Spencer.  Not derived from licensed software.
-+ *
-+ *	Permission is granted to anyone to use this software for any
-+ *	purpose on any computer system, and to redistribute it freely,
-+ *	subject to the following restrictions:
-+ *
-+ *	1. The author is not responsible for the consequences of use of
-+ *		this software, no matter how awful, even if they arise
-+ *		from defects in it.
-+ *
-+ *	2. The origin of this software must not be misrepresented, either
-+ *		by explicit claim or by omission.
-+ *
-+ *	3. Altered versions must be plainly marked as such, and must not
-+ *		be misrepresented as being the original software.
-+ *
-+ * Beware that some of this code is subtly aware of the way operator
-+ * precedence is structured in regular expressions.  Serious changes in
-+ * regular-expression syntax might require a total rethink.
-+ *
-+ * This code was modified by Ethan Sommer to work within the kernel
-+ * (it now uses kmalloc etc..)
-+ *
-+ * Modified slightly by Matthew Strait to use more modern C.
-+ */
-+
-+#include "regexp.h"
-+#include "regmagic.h"
-+
-+/* added by ethan and matt.  Lets it work in both kernel and user space.
-+(So iptables can use it, for instance.)  Yea, it goes both ways... */
-+#if __KERNEL__
-+  #define malloc(foo) kmalloc(foo,GFP_ATOMIC)
-+#else
-+  #define printk(format,args...) printf(format,##args)
-+#endif
-+
-+void regerror(char * s)
-+{
-+        printk("<3>Regexp: %s\n", s);
-+        /* NOTREACHED */
-+}
-+
-+/*
-+ * The "internal use only" fields in regexp.h are present to pass info from
-+ * compile to execute that permits the execute phase to run lots faster on
-+ * simple cases.  They are:
-+ *
-+ * regstart	char that must begin a match; '\0' if none obvious
-+ * reganch	is the match anchored (at beginning-of-line only)?
-+ * regmust	string (pointer into program) that match must include, or NULL
-+ * regmlen	length of regmust string
-+ *
-+ * Regstart and reganch permit very fast decisions on suitable starting points
-+ * for a match, cutting down the work a lot.  Regmust permits fast rejection
-+ * of lines that cannot possibly match.  The regmust tests are costly enough
-+ * that regcomp() supplies a regmust only if the r.e. contains something
-+ * potentially expensive (at present, the only such thing detected is * or +
-+ * at the start of the r.e., which can involve a lot of backup).  Regmlen is
-+ * supplied because the test in regexec() needs it and regcomp() is computing
-+ * it anyway.
-+ */
-+
-+/*
-+ * Structure for regexp "program".  This is essentially a linear encoding
-+ * of a nondeterministic finite-state machine (aka syntax charts or
-+ * "railroad normal form" in parsing technology).  Each node is an opcode
-+ * plus a "next" pointer, possibly plus an operand.  "Next" pointers of
-+ * all nodes except BRANCH implement concatenation; a "next" pointer with
-+ * a BRANCH on both ends of it is connecting two alternatives.  (Here we
-+ * have one of the subtle syntax dependencies:  an individual BRANCH (as
-+ * opposed to a collection of them) is never concatenated with anything
-+ * because of operator precedence.)  The operand of some types of node is
-+ * a literal string; for others, it is a node leading into a sub-FSM.  In
-+ * particular, the operand of a BRANCH node is the first node of the branch.
-+ * (NB this is *not* a tree structure:  the tail of the branch connects
-+ * to the thing following the set of BRANCHes.)  The opcodes are:
-+ */
-+
-+/* definition	number	opnd?	meaning */
-+#define	END	0	/* no	End of program. */
-+#define	BOL	1	/* no	Match "" at beginning of line. */
-+#define	EOL	2	/* no	Match "" at end of line. */
-+#define	ANY	3	/* no	Match any one character. */
-+#define	ANYOF	4	/* str	Match any character in this string. */
-+#define	ANYBUT	5	/* str	Match any character not in this string. */
-+#define	BRANCH	6	/* node	Match this alternative, or the next... */
-+#define	BACK	7	/* no	Match "", "next" ptr points backward. */
-+#define	EXACTLY	8	/* str	Match this string. */
-+#define	NOTHING	9	/* no	Match empty string. */
-+#define	STAR	10	/* node	Match this (simple) thing 0 or more times. */
-+#define	PLUS	11	/* node	Match this (simple) thing 1 or more times. */
-+#define	OPEN	20	/* no	Mark this point in input as start of #n. */
-+			/*	OPEN+1 is number 1, etc. */
-+#define	CLOSE	30	/* no	Analogous to OPEN. */
-+
-+/*
-+ * Opcode notes:
-+ *
-+ * BRANCH	The set of branches constituting a single choice are hooked
-+ *		together with their "next" pointers, since precedence prevents
-+ *		anything being concatenated to any individual branch.  The
-+ *		"next" pointer of the last BRANCH in a choice points to the
-+ *		thing following the whole choice.  This is also where the
-+ *		final "next" pointer of each individual branch points; each
-+ *		branch starts with the operand node of a BRANCH node.
-+ *
-+ * BACK		Normal "next" pointers all implicitly point forward; BACK
-+ *		exists to make loop structures possible.
-+ *
-+ * STAR,PLUS	'?', and complex '*' and '+', are implemented as circular
-+ *		BRANCH structures using BACK.  Simple cases (one character
-+ *		per match) are implemented with STAR and PLUS for speed
-+ *		and to minimize recursive plunges.
-+ *
-+ * OPEN,CLOSE	...are numbered at compile time.
-+ */
-+
-+/*
-+ * A node is one char of opcode followed by two chars of "next" pointer.
-+ * "Next" pointers are stored as two 8-bit pieces, high order first.  The
-+ * value is a positive offset from the opcode of the node containing it.
-+ * An operand, if any, simply follows the node.  (Note that much of the
-+ * code generation knows about this implicit relationship.)
-+ *
-+ * Using two bytes for the "next" pointer is vast overkill for most things,
-+ * but allows patterns to get big without disasters.
-+ */
-+#define	OP(p)	(*(p))
-+#define	NEXT(p)	(((*((p)+1)&0377)<<8) + (*((p)+2)&0377))
-+#define	OPERAND(p)	((p) + 3)
-+
-+/*
-+ * See regmagic.h for one further detail of program structure.
-+ */
-+
-+
-+/*
-+ * Utility definitions.
-+ */
-+#ifndef CHARBITS
-+#define	UCHARAT(p)	((int)*(unsigned char *)(p))
-+#else
-+#define	UCHARAT(p)	((int)*(p)&CHARBITS)
-+#endif
-+
-+#define	FAIL(m)	{ regerror(m); return(NULL); }
-+#define	ISMULT(c)	((c) == '*' || (c) == '+' || (c) == '?')
-+#define	META	"^$.[()|?+*\\"
-+
-+/*
-+ * Flags to be passed up and down.
-+ */
-+#define	HASWIDTH	01	/* Known never to match null string. */
-+#define	SIMPLE		02	/* Simple enough to be STAR/PLUS operand. */
-+#define	SPSTART		04	/* Starts with * or +. */
-+#define	WORST		0	/* Worst case. */
-+
-+/*
-+ * Global work variables for regcomp().
-+ */
-+struct match_globals {
-+char *reginput;		/* String-input pointer. */
-+char *regbol;		/* Beginning of input, for ^ check. */
-+char **regstartp;	/* Pointer to startp array. */
-+char **regendp;		/* Ditto for endp. */
-+char *regparse;		/* Input-scan pointer. */
-+int regnpar;		/* () count. */
-+char regdummy;
-+char *regcode;		/* Code-emit pointer; &regdummy = don't. */
-+long regsize;		/* Code size. */
-+};
-+
-+/*
-+ * Forward declarations for regcomp()'s friends.
-+ */
-+#ifndef STATIC
-+#define	STATIC	static
-+#endif
-+STATIC char *reg(struct match_globals *g, int paren,int *flagp);
-+STATIC char *regbranch(struct match_globals *g, int *flagp);
-+STATIC char *regpiece(struct match_globals *g, int *flagp);
-+STATIC char *regatom(struct match_globals *g, int *flagp);
-+STATIC char *regnode(struct match_globals *g, char op);
-+STATIC char *regnext(struct match_globals *g, char *p);
-+STATIC void regc(struct match_globals *g, char b);
-+STATIC void reginsert(struct match_globals *g, char op, char *opnd);
-+STATIC void regtail(struct match_globals *g, char *p, char *val);
-+STATIC void regoptail(struct match_globals *g, char *p, char *val);
-+
-+
-+__kernel_size_t my_strcspn(const char *s1,const char *s2)
-+{
-+        char *scan1;
-+        char *scan2;
-+        int count;
-+
-+        count = 0;
-+        for (scan1 = (char *)s1; *scan1 != '\0'; scan1++) {
-+                for (scan2 = (char *)s2; *scan2 != '\0';)       /* ++ moved down. */
-+                        if (*scan1 == *scan2++)
-+                                return(count);
-+                count++;
-+        }
-+        return(count);
-+}
-+
-+/*
-+ - regcomp - compile a regular expression into internal code
-+ *
-+ * We can't allocate space until we know how big the compiled form will be,
-+ * but we can't compile it (and thus know how big it is) until we've got a
-+ * place to put the code.  So we cheat:  we compile it twice, once with code
-+ * generation turned off and size counting turned on, and once "for real".
-+ * This also means that we don't allocate space until we are sure that the
-+ * thing really will compile successfully, and we never have to move the
-+ * code and thus invalidate pointers into it.  (Note that it has to be in
-+ * one piece because free() must be able to free it all.)
-+ *
-+ * Beware that the optimization-preparation code in here knows about some
-+ * of the structure of the compiled regexp.
-+ */
-+regexp *
-+regcomp(char *exp,int *patternsize)
-+{
-+	register regexp *r;
-+	register char *scan;
-+	register char *longest;
-+	register int len;
-+	int flags;
-+	struct match_globals g;
-+	
-+	/* commented out by ethan
-+	   extern char *malloc();
-+	*/
-+
-+	if (exp == NULL)
-+		FAIL("NULL argument");
-+
-+	/* First pass: determine size, legality. */
-+	g.regparse = exp;
-+	g.regnpar = 1;
-+	g.regsize = 0L;
-+	g.regcode = &g.regdummy;
-+	regc(&g, MAGIC);
-+	if (reg(&g, 0, &flags) == NULL)
-+		return(NULL);
-+
-+	/* Small enough for pointer-storage convention? */
-+	if (g.regsize >= 32767L)		/* Probably could be 65535L. */
-+		FAIL("regexp too big");
-+
-+	/* Allocate space. */
-+	*patternsize=sizeof(regexp) + (unsigned)g.regsize;
-+	r = (regexp *)malloc(sizeof(regexp) + (unsigned)g.regsize);
-+	if (r == NULL)
-+		FAIL("out of space");
-+
-+	/* Second pass: emit code. */
-+	g.regparse = exp;
-+	g.regnpar = 1;
-+	g.regcode = r->program;
-+	regc(&g, MAGIC);
-+	if (reg(&g, 0, &flags) == NULL)
-+		return(NULL);
-+
-+	/* Dig out information for optimizations. */
-+	r->regstart = '\0';	/* Worst-case defaults. */
-+	r->reganch = 0;
-+	r->regmust = NULL;
-+	r->regmlen = 0;
-+	scan = r->program+1;			/* First BRANCH. */
-+	if (OP(regnext(&g, scan)) == END) {		/* Only one top-level choice. */
-+		scan = OPERAND(scan);
-+
-+		/* Starting-point info. */
-+		if (OP(scan) == EXACTLY)
-+			r->regstart = *OPERAND(scan);
-+		else if (OP(scan) == BOL)
-+			r->reganch++;
-+
-+		/*
-+		 * If there's something expensive in the r.e., find the
-+		 * longest literal string that must appear and make it the
-+		 * regmust.  Resolve ties in favor of later strings, since
-+		 * the regstart check works with the beginning of the r.e.
-+		 * and avoiding duplication strengthens checking.  Not a
-+		 * strong reason, but sufficient in the absence of others.
-+		 */
-+		if (flags&SPSTART) {
-+			longest = NULL;
-+			len = 0;
-+			for (; scan != NULL; scan = regnext(&g, scan))
-+				if (OP(scan) == EXACTLY && strlen(OPERAND(scan)) >= len) {
-+					longest = OPERAND(scan);
-+					len = strlen(OPERAND(scan));
-+				}
-+			r->regmust = longest;
-+			r->regmlen = len;
-+		}
-+	}
-+
-+	return(r);
-+}
-+
-+/*
-+ - reg - regular expression, i.e. main body or parenthesized thing
-+ *
-+ * Caller must absorb opening parenthesis.
-+ *
-+ * Combining parenthesis handling with the base level of regular expression
-+ * is a trifle forced, but the need to tie the tails of the branches to what
-+ * follows makes it hard to avoid.
-+ */
-+static char *
-+reg(struct match_globals *g, int paren, int *flagp /* Parenthesized? */ )
-+{
-+	register char *ret;
-+	register char *br;
-+	register char *ender;
-+	register int parno = 0; /* 0 makes gcc happy */
-+	int flags;
-+
-+	*flagp = HASWIDTH;	/* Tentatively. */
-+
-+	/* Make an OPEN node, if parenthesized. */
-+	if (paren) {
-+		if (g->regnpar >= NSUBEXP)
-+			FAIL("too many ()");
-+		parno = g->regnpar;
-+		g->regnpar++;
-+		ret = regnode(g, OPEN+parno);
-+	} else
-+		ret = NULL;
-+
-+	/* Pick up the branches, linking them together. */
-+	br = regbranch(g, &flags);
-+	if (br == NULL)
-+		return(NULL);
-+	if (ret != NULL)
-+		regtail(g, ret, br);	/* OPEN -> first. */
-+	else
-+		ret = br;
-+	if (!(flags&HASWIDTH))
-+		*flagp &= ~HASWIDTH;
-+	*flagp |= flags&SPSTART;
-+	while (*g->regparse == '|') {
-+		g->regparse++;
-+		br = regbranch(g, &flags);
-+		if (br == NULL)
-+			return(NULL);
-+		regtail(g, ret, br);	/* BRANCH -> BRANCH. */
-+		if (!(flags&HASWIDTH))
-+			*flagp &= ~HASWIDTH;
-+		*flagp |= flags&SPSTART;
-+	}
-+
-+	/* Make a closing node, and hook it on the end. */
-+	ender = regnode(g, (paren) ? CLOSE+parno : END);	
-+	regtail(g, ret, ender);
-+
-+	/* Hook the tails of the branches to the closing node. */
-+	for (br = ret; br != NULL; br = regnext(g, br))
-+		regoptail(g, br, ender);
-+
-+	/* Check for proper termination. */
-+	if (paren && *g->regparse++ != ')') {
-+		FAIL("unmatched ()");
-+	} else if (!paren && *g->regparse != '\0') {
-+		if (*g->regparse == ')') {
-+			FAIL("unmatched ()");
-+		} else
-+			FAIL("junk on end");	/* "Can't happen". */
-+		/* NOTREACHED */
-+	}
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regbranch - one alternative of an | operator
-+ *
-+ * Implements the concatenation operator.
-+ */
-+static char *
-+regbranch(struct match_globals *g, int *flagp)
-+{
-+	register char *ret;
-+	register char *chain;
-+	register char *latest;
-+	int flags;
-+
-+	*flagp = WORST;		/* Tentatively. */
-+
-+	ret = regnode(g, BRANCH);
-+	chain = NULL;
-+	while (*g->regparse != '\0' && *g->regparse != '|' && *g->regparse != ')') {
-+		latest = regpiece(g, &flags);
-+		if (latest == NULL)
-+			return(NULL);
-+		*flagp |= flags&HASWIDTH;
-+		if (chain == NULL)	/* First piece. */
-+			*flagp |= flags&SPSTART;
-+		else
-+			regtail(g, chain, latest);
-+		chain = latest;
-+	}
-+	if (chain == NULL)	/* Loop ran zero times. */
-+		(void) regnode(g, NOTHING);
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regpiece - something followed by possible [*+?]
-+ *
-+ * Note that the branching code sequences used for ? and the general cases
-+ * of * and + are somewhat optimized:  they use the same NOTHING node as
-+ * both the endmarker for their branch list and the body of the last branch.
-+ * It might seem that this node could be dispensed with entirely, but the
-+ * endmarker role is not redundant.
-+ */
-+static char *
-+regpiece(struct match_globals *g, int *flagp)
-+{
-+	register char *ret;
-+	register char op;
-+	register char *next;
-+	int flags;
-+
-+	ret = regatom(g, &flags);
-+	if (ret == NULL)
-+		return(NULL);
-+
-+	op = *g->regparse;
-+	if (!ISMULT(op)) {
-+		*flagp = flags;
-+		return(ret);
-+	}
-+
-+	if (!(flags&HASWIDTH) && op != '?')
-+		FAIL("*+ operand could be empty");
-+	*flagp = (op != '+') ? (WORST|SPSTART) : (WORST|HASWIDTH);
-+
-+	if (op == '*' && (flags&SIMPLE))
-+		reginsert(g, STAR, ret);
-+	else if (op == '*') {
-+		/* Emit x* as (x&|), where & means "self". */
-+		reginsert(g, BRANCH, ret);			/* Either x */
-+		regoptail(g, ret, regnode(g, BACK));		/* and loop */
-+		regoptail(g, ret, ret);			/* back */
-+		regtail(g, ret, regnode(g, BRANCH));		/* or */
-+		regtail(g, ret, regnode(g, NOTHING));		/* null. */
-+	} else if (op == '+' && (flags&SIMPLE))
-+		reginsert(g, PLUS, ret);
-+	else if (op == '+') {
-+		/* Emit x+ as x(&|), where & means "self". */
-+		next = regnode(g, BRANCH);			/* Either */
-+		regtail(g, ret, next);
-+		regtail(g, regnode(g, BACK), ret);		/* loop back */
-+		regtail(g, next, regnode(g, BRANCH));		/* or */
-+		regtail(g, ret, regnode(g, NOTHING));		/* null. */
-+	} else if (op == '?') {
-+		/* Emit x? as (x|) */
-+		reginsert(g, BRANCH, ret);			/* Either x */
-+		regtail(g, ret, regnode(g, BRANCH));		/* or */
-+		next = regnode(g, NOTHING);		/* null. */
-+		regtail(g, ret, next);
-+		regoptail(g, ret, next);
-+	}
-+	g->regparse++;
-+	if (ISMULT(*g->regparse))
-+		FAIL("nested *?+");
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regatom - the lowest level
-+ *
-+ * Optimization:  gobbles an entire sequence of ordinary characters so that
-+ * it can turn them into a single node, which is smaller to store and
-+ * faster to run.  Backslashed characters are exceptions, each becoming a
-+ * separate node; the code is simpler that way and it's not worth fixing.
-+ */
-+static char *
-+regatom(struct match_globals *g, int *flagp)
-+{
-+	register char *ret;
-+	int flags;
-+
-+	*flagp = WORST;		/* Tentatively. */
-+
-+	switch (*g->regparse++) {
-+	case '^':
-+		ret = regnode(g, BOL);
-+		break;
-+	case '$':
-+		ret = regnode(g, EOL);
-+		break;
-+	case '.':
-+		ret = regnode(g, ANY);
-+		*flagp |= HASWIDTH|SIMPLE;
-+		break;
-+	case '[': {
-+			register int class;
-+			register int classend;
-+
-+			if (*g->regparse == '^') {	/* Complement of range. */
-+				ret = regnode(g, ANYBUT);
-+				g->regparse++;
-+			} else
-+				ret = regnode(g, ANYOF);
-+			if (*g->regparse == ']' || *g->regparse == '-')
-+				regc(g, *g->regparse++);
-+			while (*g->regparse != '\0' && *g->regparse != ']') {
-+				if (*g->regparse == '-') {
-+					g->regparse++;
-+					if (*g->regparse == ']' || *g->regparse == '\0')
-+						regc(g, '-');
-+					else {
-+						class = UCHARAT(g->regparse-2)+1;
-+						classend = UCHARAT(g->regparse);
-+						if (class > classend+1)
-+							FAIL("invalid [] range");
-+						for (; class <= classend; class++)
-+							regc(g, class);
-+						g->regparse++;
-+					}
-+				} else
-+					regc(g, *g->regparse++);
-+			}
-+			regc(g, '\0');
-+			if (*g->regparse != ']')
-+				FAIL("unmatched []");
-+			g->regparse++;
-+			*flagp |= HASWIDTH|SIMPLE;
-+		}
-+		break;
-+	case '(':
-+		ret = reg(g, 1, &flags);
-+		if (ret == NULL)
-+			return(NULL);
-+		*flagp |= flags&(HASWIDTH|SPSTART);
-+		break;
-+	case '\0':
-+	case '|':
-+	case ')':
-+		FAIL("internal urp");	/* Supposed to be caught earlier. */
-+		break;
-+	case '?':
-+	case '+':
-+	case '*':
-+		FAIL("?+* follows nothing");
-+		break;
-+	case '\\':
-+		if (*g->regparse == '\0')
-+			FAIL("trailing \\");
-+		ret = regnode(g, EXACTLY);
-+		regc(g, *g->regparse++);
-+		regc(g, '\0');
-+		*flagp |= HASWIDTH|SIMPLE;
-+		break;
-+	default: {
-+			register int len;
-+			register char ender;
-+
-+			g->regparse--;
-+			len = my_strcspn((const char *)g->regparse, (const char *)META);
-+			if (len <= 0)
-+				FAIL("internal disaster");
-+			ender = *(g->regparse+len);
-+			if (len > 1 && ISMULT(ender))
-+				len--;		/* Back off clear of ?+* operand. */
-+			*flagp |= HASWIDTH;
-+			if (len == 1)
-+				*flagp |= SIMPLE;
-+			ret = regnode(g, EXACTLY);
-+			while (len > 0) {
-+				regc(g, *g->regparse++);
-+				len--;
-+			}
-+			regc(g, '\0');
-+		}
-+		break;
-+	}
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regnode - emit a node
-+ */
-+static char *			/* Location. */
-+regnode(struct match_globals *g, char op)
-+{
-+	register char *ret;
-+	register char *ptr;
-+
-+	ret = g->regcode;
-+	if (ret == &g->regdummy) {
-+		g->regsize += 3;
-+		return(ret);
-+	}
-+
-+	ptr = ret;
-+	*ptr++ = op;
-+	*ptr++ = '\0';		/* Null "next" pointer. */
-+	*ptr++ = '\0';
-+	g->regcode = ptr;
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regc - emit (if appropriate) a byte of code
-+ */
-+static void
-+regc(struct match_globals *g, char b)
-+{
-+	if (g->regcode != &g->regdummy)
-+		*g->regcode++ = b;
-+	else
-+		g->regsize++;
-+}
-+
-+/*
-+ - reginsert - insert an operator in front of already-emitted operand
-+ *
-+ * Means relocating the operand.
-+ */
-+static void
-+reginsert(struct match_globals *g, char op, char* opnd)
-+{
-+	register char *src;
-+	register char *dst;
-+	register char *place;
-+
-+	if (g->regcode == &g->regdummy) {
-+		g->regsize += 3;
-+		return;
-+	}
-+
-+	src = g->regcode;
-+	g->regcode += 3;
-+	dst = g->regcode;
-+	while (src > opnd)
-+		*--dst = *--src;
-+
-+	place = opnd;		/* Op node, where operand used to be. */
-+	*place++ = op;
-+	*place++ = '\0';
-+	*place++ = '\0';
-+}
-+
-+/*
-+ - regtail - set the next-pointer at the end of a node chain
-+ */
-+static void
-+regtail(struct match_globals *g, char *p, char *val)
-+{
-+	register char *scan;
-+	register char *temp;
-+	register int offset;
-+
-+	if (p == &g->regdummy)
-+		return;
-+
-+	/* Find last node. */
-+	scan = p;
-+	for (;;) {
-+		temp = regnext(g, scan);
-+		if (temp == NULL)
-+			break;
-+		scan = temp;
-+	}
-+
-+	if (OP(scan) == BACK)
-+		offset = scan - val;
-+	else
-+		offset = val - scan;
-+	*(scan+1) = (offset>>8)&0377;
-+	*(scan+2) = offset&0377;
-+}
-+
-+/*
-+ - regoptail - regtail on operand of first argument; nop if operandless
-+ */
-+static void
-+regoptail(struct match_globals *g, char *p, char *val)
-+{
-+	/* "Operandless" and "op != BRANCH" are synonymous in practice. */
-+	if (p == NULL || p == &g->regdummy || OP(p) != BRANCH)
-+		return;
-+	regtail(g, OPERAND(p), val);
-+}
-+
-+/*
-+ * regexec and friends
-+ */
-+
-+
-+/*
-+ * Forwards.
-+ */
-+STATIC int regtry(struct match_globals *g, regexp *prog, char *string);
-+STATIC int regmatch(struct match_globals *g, char *prog);
-+STATIC int regrepeat(struct match_globals *g, char *p);
-+
-+#ifdef DEBUG
-+int regnarrate = 0;
-+void regdump();
-+STATIC char *regprop(char *op);
-+#endif
-+
-+/*
-+ - regexec - match a regexp against a string
-+ */
-+int
-+regexec(regexp *prog, char *string)
-+{
-+	register char *s;
-+	struct match_globals g;
-+
-+	/* Be paranoid... */
-+	if (prog == NULL || string == NULL) {
-+		printk("<3>Regexp: NULL parameter\n");
-+		return(0);
-+	}
-+
-+	/* Check validity of program. */
-+	if (UCHARAT(prog->program) != MAGIC) {
-+		printk("<3>Regexp: corrupted program\n");
-+		return(0);
-+	}
-+
-+	/* If there is a "must appear" string, look for it. */
-+	if (prog->regmust != NULL) {
-+		s = string;
-+		while ((s = strchr(s, prog->regmust[0])) != NULL) {
-+			if (strncmp(s, prog->regmust, prog->regmlen) == 0)
-+				break;	/* Found it. */
-+			s++;
-+		}
-+		if (s == NULL)	/* Not present. */
-+			return(0);
-+	}
-+
-+	/* Mark beginning of line for ^ . */
-+	g.regbol = string;
-+
-+	/* Simplest case:  anchored match need be tried only once. */
-+	if (prog->reganch)
-+		return(regtry(&g, prog, string));
-+
-+	/* Messy cases:  unanchored match. */
-+	s = string;
-+	if (prog->regstart != '\0')
-+		/* We know what char it must start with. */
-+		while ((s = strchr(s, prog->regstart)) != NULL) {
-+			if (regtry(&g, prog, s))
-+				return(1);
-+			s++;
-+		}
-+	else
-+		/* We don't -- general case. */
-+		do {
-+			if (regtry(&g, prog, s))
-+				return(1);
-+		} while (*s++ != '\0');
-+
-+	/* Failure. */
-+	return(0);
-+}
-+
-+/*
-+ - regtry - try match at specific point
-+ */
-+static int			/* 0 failure, 1 success */
-+regtry(struct match_globals *g, regexp *prog, char *string)
-+{
-+	register int i;
-+	register char **sp;
-+	register char **ep;
-+
-+	g->reginput = string;
-+	g->regstartp = prog->startp;
-+	g->regendp = prog->endp;
-+
-+	sp = prog->startp;
-+	ep = prog->endp;
-+	for (i = NSUBEXP; i > 0; i--) {
-+		*sp++ = NULL;
-+		*ep++ = NULL;
-+	}
-+	if (regmatch(g, prog->program + 1)) {
-+		prog->startp[0] = string;
-+		prog->endp[0] = g->reginput;
-+		return(1);
-+	} else
-+		return(0);
-+}
-+
-+/*
-+ - regmatch - main matching routine
-+ *
-+ * Conceptually the strategy is simple:  check to see whether the current
-+ * node matches, call self recursively to see whether the rest matches,
-+ * and then act accordingly.  In practice we make some effort to avoid
-+ * recursion, in particular by going through "ordinary" nodes (that don't
-+ * need to know whether the rest of the match failed) by a loop instead of
-+ * by recursion.
-+ */
-+static int			/* 0 failure, 1 success */
-+regmatch(struct match_globals *g, char *prog)
-+{
-+	register char *scan = prog; /* Current node. */
-+	char *next;		    /* Next node. */
-+
-+#ifdef DEBUG
-+	if (scan != NULL && regnarrate)
-+		fprintf(stderr, "%s(\n", regprop(scan));
-+#endif
-+	while (scan != NULL) {
-+#ifdef DEBUG
-+		if (regnarrate)
-+			fprintf(stderr, "%s...\n", regprop(scan));
-+#endif
-+		next = regnext(g, scan);
-+
-+		switch (OP(scan)) {
-+		case BOL:
-+			if (g->reginput != g->regbol)
-+				return(0);
-+			break;
-+		case EOL:
-+			if (*g->reginput != '\0')
-+				return(0);
-+			break;
-+		case ANY:
-+			if (*g->reginput == '\0')
-+				return(0);
-+			g->reginput++;
-+			break;
-+		case EXACTLY: {
-+				register int len;
-+				register char *opnd;
-+
-+				opnd = OPERAND(scan);
-+				/* Inline the first character, for speed. */
-+				if (*opnd != *g->reginput)
-+					return(0);
-+				len = strlen(opnd);
-+				if (len > 1 && strncmp(opnd, g->reginput, len) != 0)
-+					return(0);
-+				g->reginput += len;
-+			}
-+			break;
-+		case ANYOF:
-+			if (*g->reginput == '\0' || strchr(OPERAND(scan), *g->reginput) == NULL)
-+				return(0);
-+			g->reginput++;
-+			break;
-+		case ANYBUT:
-+			if (*g->reginput == '\0' || strchr(OPERAND(scan), *g->reginput) != NULL)
-+				return(0);
-+			g->reginput++;
-+			break;
-+		case NOTHING:
-+		case BACK:
-+			break;
-+		case OPEN+1:
-+		case OPEN+2:
-+		case OPEN+3:
-+		case OPEN+4:
-+		case OPEN+5:
-+		case OPEN+6:
-+		case OPEN+7:
-+		case OPEN+8:
-+		case OPEN+9: {
-+				register int no;
-+				register char *save;
-+
-+				no = OP(scan) - OPEN;
-+				save = g->reginput;
-+
-+				if (regmatch(g, next)) {
-+					/*
-+					 * Don't set startp if some later
-+					 * invocation of the same parentheses
-+					 * already has.
-+					 */
-+					if (g->regstartp[no] == NULL)
-+						g->regstartp[no] = save;
-+					return(1);
-+				} else
-+					return(0);
-+			}
-+			break;
-+		case CLOSE+1:
-+		case CLOSE+2:
-+		case CLOSE+3:
-+		case CLOSE+4:
-+		case CLOSE+5:
-+		case CLOSE+6:
-+		case CLOSE+7:
-+		case CLOSE+8:
-+		case CLOSE+9:
-+			{
-+				register int no;
-+				register char *save;
-+
-+				no = OP(scan) - CLOSE;
-+				save = g->reginput;
-+
-+				if (regmatch(g, next)) {
-+					/*
-+					 * Don't set endp if some later
-+					 * invocation of the same parentheses
-+					 * already has.
-+					 */
-+					if (g->regendp[no] == NULL)
-+						g->regendp[no] = save;
-+					return(1);
-+				} else
-+					return(0);
-+			}
-+			break;
-+		case BRANCH: {
-+				register char *save;
-+
-+				if (OP(next) != BRANCH)		/* No choice. */
-+					next = OPERAND(scan);	/* Avoid recursion. */
-+				else {
-+					do {
-+						save = g->reginput;
-+						if (regmatch(g, OPERAND(scan)))
-+							return(1);
-+						g->reginput = save;
-+						scan = regnext(g, scan);
-+					} while (scan != NULL && OP(scan) == BRANCH);
-+					return(0);
-+					/* NOTREACHED */
-+				}
-+			}
-+			break;
-+		case STAR:
-+		case PLUS: {
-+				register char nextch;
-+				register int no;
-+				register char *save;
-+				register int min;
-+
-+				/*
-+				 * Lookahead to avoid useless match attempts
-+				 * when we know what character comes next.
-+				 */
-+				nextch = '\0';
-+				if (OP(next) == EXACTLY)
-+					nextch = *OPERAND(next);
-+				min = (OP(scan) == STAR) ? 0 : 1;
-+				save = g->reginput;
-+				no = regrepeat(g, OPERAND(scan));
-+				while (no >= min) {
-+					/* If it could work, try it. */
-+					if (nextch == '\0' || *g->reginput == nextch)
-+						if (regmatch(g, next))
-+							return(1);
-+					/* Couldn't or didn't -- back up. */
-+					no--;
-+					g->reginput = save + no;
-+				}
-+				return(0);
-+			}
-+			break;
-+		case END:
-+			return(1);	/* Success! */
-+			break;
-+		default:
-+			printk("<3>Regexp: memory corruption\n");
-+			return(0);
-+			break;
-+		}
-+
-+		scan = next;
-+	}
-+
-+	/*
-+	 * We get here only if there's trouble -- normally "case END" is
-+	 * the terminating point.
-+	 */
-+	printk("<3>Regexp: corrupted pointers\n");
-+	return(0);
-+}
-+
-+/*
-+ - regrepeat - repeatedly match something simple, report how many
-+ */
-+static int
-+regrepeat(struct match_globals *g, char *p)
-+{
-+	register int count = 0;
-+	register char *scan;
-+	register char *opnd;
-+
-+	scan = g->reginput;
-+	opnd = OPERAND(p);
-+	switch (OP(p)) {
-+	case ANY:
-+		count = strlen(scan);
-+		scan += count;
-+		break;
-+	case EXACTLY:
-+		while (*opnd == *scan) {
-+			count++;
-+			scan++;
-+		}
-+		break;
-+	case ANYOF:
-+		while (*scan != '\0' && strchr(opnd, *scan) != NULL) {
-+			count++;
-+			scan++;
-+		}
-+		break;
-+	case ANYBUT:
-+		while (*scan != '\0' && strchr(opnd, *scan) == NULL) {
-+			count++;
-+			scan++;
-+		}
-+		break;
-+	default:		/* Oh dear.  Called inappropriately. */
-+		printk("<3>Regexp: internal foulup\n");
-+		count = 0;	/* Best compromise. */
-+		break;
-+	}
-+	g->reginput = scan;
-+
-+	return(count);
-+}
-+
-+/*
-+ - regnext - dig the "next" pointer out of a node
-+ */
-+static char*
-+regnext(struct match_globals *g, char *p)
-+{
-+	register int offset;
-+
-+	if (p == &g->regdummy)
-+		return(NULL);
-+
-+	offset = NEXT(p);
-+	if (offset == 0)
-+		return(NULL);
-+
-+	if (OP(p) == BACK)
-+		return(p-offset);
-+	else
-+		return(p+offset);
-+}
-+
-+#ifdef DEBUG
-+
-+STATIC char *regprop();
-+
-+/*
-+ - regdump - dump a regexp onto stdout in vaguely comprehensible form
-+ */
-+void
-+regdump(regexp *r)
-+{
-+	register char *s;
-+	register char op = EXACTLY;	/* Arbitrary non-END op. */
-+	register char *next;
-+	/* extern char *strchr(); */
-+
-+
-+	s = r->program + 1;
-+	while (op != END) {	/* While that wasn't END last time... */
-+		op = OP(s);
-+		printf("%2d%s", s-r->program, regprop(s));	/* Where, what. */
-+		next = regnext(s);
-+		if (next == NULL)		/* Next ptr. */
-+			printf("(0)");
-+		else
-+			printf("(%d)", (s-r->program)+(next-s));
-+		s += 3;
-+		if (op == ANYOF || op == ANYBUT || op == EXACTLY) {
-+			/* Literal string, where present. */
-+			while (*s != '\0') {
-+				putchar(*s);
-+				s++;
-+			}
-+			s++;
-+		}
-+		putchar('\n');
-+	}
-+
-+	/* Header fields of interest. */
-+	if (r->regstart != '\0')
-+		printf("start `%c' ", r->regstart);
-+	if (r->reganch)
-+		printf("anchored ");
-+	if (r->regmust != NULL)
-+		printf("must have \"%s\"", r->regmust);
-+	printf("\n");
-+}
-+
-+/*
-+ - regprop - printable representation of opcode
-+ */
-+static char *
-+regprop(char *op)
-+{
-+#define BUFLEN 50
-+	register char *p;
-+	static char buf[BUFLEN];
-+
-+	strcpy(buf, ":");
-+
-+	switch (OP(op)) {
-+	case BOL:
-+		p = "BOL";
-+		break;
-+	case EOL:
-+		p = "EOL";
-+		break;
-+	case ANY:
-+		p = "ANY";
-+		break;
-+	case ANYOF:
-+		p = "ANYOF";
-+		break;
-+	case ANYBUT:
-+		p = "ANYBUT";
-+		break;
-+	case BRANCH:
-+		p = "BRANCH";
-+		break;
-+	case EXACTLY:
-+		p = "EXACTLY";
-+		break;
-+	case NOTHING:
-+		p = "NOTHING";
-+		break;
-+	case BACK:
-+		p = "BACK";
-+		break;
-+	case END:
-+		p = "END";
-+		break;
-+	case OPEN+1:
-+	case OPEN+2:
-+	case OPEN+3:
-+	case OPEN+4:
-+	case OPEN+5:
-+	case OPEN+6:
-+	case OPEN+7:
-+	case OPEN+8:
-+	case OPEN+9:
-+		snprintf(buf+strlen(buf),BUFLEN-strlen(buf), "OPEN%d", OP(op)-OPEN);
-+		p = NULL;
-+		break;
-+	case CLOSE+1:
-+	case CLOSE+2:
-+	case CLOSE+3:
-+	case CLOSE+4:
-+	case CLOSE+5:
-+	case CLOSE+6:
-+	case CLOSE+7:
-+	case CLOSE+8:
-+	case CLOSE+9:
-+		snprintf(buf+strlen(buf),BUFLEN-strlen(buf), "CLOSE%d", OP(op)-CLOSE);
-+		p = NULL;
-+		break;
-+	case STAR:
-+		p = "STAR";
-+		break;
-+	case PLUS:
-+		p = "PLUS";
-+		break;
-+	default:
-+		printk("<3>Regexp: corrupted opcode\n");
-+		break;
-+	}
-+	if (p != NULL)
-+		strncat(buf, p, BUFLEN-strlen(buf));
-+	return(buf);
-+}
-+#endif
-+
-+
---- /dev/null
-+++ b/net/netfilter/regexp/regexp.h
-@@ -0,0 +1,41 @@
-+/*
-+ * Definitions etc. for regexp(3) routines.
-+ *
-+ * Caveat:  this is V8 regexp(3) [actually, a reimplementation thereof],
-+ * not the System V one.
-+ */
-+
-+#ifndef REGEXP_H
-+#define REGEXP_H
-+
-+
-+/*
-+http://www.opensource.apple.com/darwinsource/10.3/expect-1/expect/expect.h ,
-+which contains a version of this library, says:
-+
-+ *
-+ * NSUBEXP must be at least 10, and no greater than 117 or the parser
-+ * will not work properly.
-+ *
-+
-+However, it looks rather like this library is limited to 10.  If you think
-+otherwise, let us know.
-+*/
-+
-+#define NSUBEXP  10
-+typedef struct regexp {
-+	char *startp[NSUBEXP];
-+	char *endp[NSUBEXP];
-+	char regstart;		/* Internal use only. */
-+	char reganch;		/* Internal use only. */
-+	char *regmust;		/* Internal use only. */
-+	int regmlen;		/* Internal use only. */
-+	char program[1];	/* Unwarranted chumminess with compiler. */
-+} regexp;
-+
-+regexp * regcomp(char *exp, int *patternsize);
-+int regexec(regexp *prog, char *string);
-+void regsub(regexp *prog, char *source, char *dest);
-+void regerror(char *s);
-+
-+#endif
---- /dev/null
-+++ b/net/netfilter/regexp/regmagic.h
-@@ -0,0 +1,5 @@
-+/*
-+ * The first byte of the regexp internal "program" is actually this magic
-+ * number; the start node begins in the second byte.
-+ */
-+#define	MAGIC	0234
---- /dev/null
-+++ b/net/netfilter/regexp/regsub.c
-@@ -0,0 +1,95 @@
-+/*
-+ * regsub
-+ * @(#)regsub.c	1.3 of 2 April 86
-+ *
-+ *	Copyright (c) 1986 by University of Toronto.
-+ *	Written by Henry Spencer.  Not derived from licensed software.
-+ *
-+ *	Permission is granted to anyone to use this software for any
-+ *	purpose on any computer system, and to redistribute it freely,
-+ *	subject to the following restrictions:
-+ *
-+ *	1. The author is not responsible for the consequences of use of
-+ *		this software, no matter how awful, even if they arise
-+ *		from defects in it.
-+ *
-+ *	2. The origin of this software must not be misrepresented, either
-+ *		by explicit claim or by omission.
-+ *
-+ *	3. Altered versions must be plainly marked as such, and must not
-+ *		be misrepresented as being the original software.
-+ *
-+ *
-+ * This code was modified by Ethan Sommer to work within the kernel
-+ * (it now uses kmalloc etc..)
-+ *
-+ */
-+#include "regexp.h"
-+#include "regmagic.h"
-+#include <linux/string.h>
-+
-+
-+#ifndef CHARBITS
-+#define	UCHARAT(p)	((int)*(unsigned char *)(p))
-+#else
-+#define	UCHARAT(p)	((int)*(p)&CHARBITS)
-+#endif
-+
-+#if 0
-+//void regerror(char * s)
-+//{
-+//        printk("regexp(3): %s", s);
-+//        /* NOTREACHED */
-+//}
-+#endif
-+
-+/*
-+ - regsub - perform substitutions after a regexp match
-+ */
-+void
-+regsub(regexp * prog, char * source, char * dest)
-+{
-+	register char *src;
-+	register char *dst;
-+	register char c;
-+	register int no;
-+	register int len;
-+	
-+	/* Not necessary and gcc doesn't like it -MLS */
-+	/*extern char *strncpy();*/
-+
-+	if (prog == NULL || source == NULL || dest == NULL) {
-+		regerror("NULL parm to regsub");
-+		return;
-+	}
-+	if (UCHARAT(prog->program) != MAGIC) {
-+		regerror("damaged regexp fed to regsub");
-+		return;
-+	}
-+
-+	src = source;
-+	dst = dest;
-+	while ((c = *src++) != '\0') {
-+		if (c == '&')
-+			no = 0;
-+		else if (c == '\\' && '0' <= *src && *src <= '9')
-+			no = *src++ - '0';
-+		else
-+			no = -1;
-+
-+		if (no < 0) {	/* Ordinary character. */
-+			if (c == '\\' && (*src == '\\' || *src == '&'))
-+				c = *src++;
-+			*dst++ = c;
-+		} else if (prog->startp[no] != NULL && prog->endp[no] != NULL) {
-+			len = prog->endp[no] - prog->startp[no];
-+			(void) strncpy(dst, prog->startp[no], len);
-+			dst += len;
-+			if (len != 0 && *(dst-1) == '\0') {	/* strncpy hit NUL. */
-+				regerror("damaged match string");
-+				return;
-+			}
-+		}
-+	}
-+	*dst++ = '\0';
-+}
---- /dev/null
-+++ b/net/netfilter/xt_layer7.c
-@@ -0,0 +1,666 @@
-+/*
-+  Kernel module to match application layer (OSI layer 7) data in connections.
-+
-+  http://l7-filter.sf.net
-+
-+  (C) 2003-2009 Matthew Strait and Ethan Sommer.
-+
-+  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.
-+  http://www.gnu.org/licenses/gpl.txt
-+
-+  Based on ipt_string.c (C) 2000 Emmanuel Roger <winfield@freegates.be>,
-+  xt_helper.c (C) 2002 Harald Welte and cls_layer7.c (C) 2003 Matthew Strait,
-+  Ethan Sommer, Justin Levandoski.
-+*/
-+
-+#include <linux/spinlock.h>
-+#include <linux/version.h>
-+#include <net/ip.h>
-+#include <net/tcp.h>
-+#include <linux/module.h>
-+#include <linux/skbuff.h>
-+#include <linux/netfilter.h>
-+#include <net/netfilter/nf_conntrack.h>
-+#include <net/netfilter/nf_conntrack_core.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-+#include <net/netfilter/nf_conntrack_extend.h>
-+#include <net/netfilter/nf_conntrack_acct.h>
-+#endif
-+#include <linux/netfilter/x_tables.h>
-+#include <linux/netfilter/xt_layer7.h>
-+#include <linux/ctype.h>
-+#include <linux/proc_fs.h>
-+
-+#include "regexp/regexp.c"
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Matthew Strait <quadong@users.sf.net>, Ethan Sommer <sommere@users.sf.net>");
-+MODULE_DESCRIPTION("iptables application layer match module");
-+MODULE_ALIAS("ipt_layer7");
-+MODULE_VERSION("2.21");
-+
-+static int maxdatalen = 2048; // this is the default
-+module_param(maxdatalen, int, 0444);
-+MODULE_PARM_DESC(maxdatalen, "maximum bytes of data looked at by l7-filter");
-+#ifdef CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG
-+	#define DPRINTK(format,args...) printk(format,##args)
-+#else
-+	#define DPRINTK(format,args...)
-+#endif
-+
-+/* Number of packets whose data we look at.
-+This can be modified through /proc/net/layer7_numpackets */
-+static int num_packets = 10;
-+
-+static struct pattern_cache {
-+	char * regex_string;
-+	regexp * pattern;
-+	struct pattern_cache * next;
-+} * first_pattern_cache = NULL;
-+
-+DEFINE_SPINLOCK(l7_lock);
-+
-+static int total_acct_packets(struct nf_conn *ct)
-+{
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 26)
-+	BUG_ON(ct == NULL);
-+	return (ct->counters[IP_CT_DIR_ORIGINAL].packets + ct->counters[IP_CT_DIR_REPLY].packets);
-+#else
-+	struct nf_conn_counter *acct;
-+
-+	BUG_ON(ct == NULL);
-+	acct = nf_conn_acct_find(ct);
-+	if (!acct)
-+		return 0;
-+	return (acct[IP_CT_DIR_ORIGINAL].packets + acct[IP_CT_DIR_REPLY].packets);
-+#endif
-+}
-+
-+#ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
-+/* Converts an unfriendly string into a friendly one by
-+replacing unprintables with periods and all whitespace with " ". */
-+static char * friendly_print(unsigned char * s)
-+{
-+	char * f = kmalloc(strlen(s) + 1, GFP_ATOMIC);
-+	int i;
-+
-+	if(!f) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in "
-+					"friendly_print, bailing.\n");
-+		return NULL;
-+	}
-+
-+	for(i = 0; i < strlen(s); i++){
-+		if(isprint(s[i]) && s[i] < 128)	f[i] = s[i];
-+		else if(isspace(s[i]))		f[i] = ' ';
-+		else 				f[i] = '.';
-+	}
-+	f[i] = '\0';
-+	return f;
-+}
-+
-+static char dec2hex(int i)
-+{
-+	switch (i) {
-+		case 0 ... 9:
-+			return (i + '0');
-+			break;
-+		case 10 ... 15:
-+			return (i - 10 + 'a');
-+			break;
-+		default:
-+			if (net_ratelimit())
-+				printk("layer7: Problem in dec2hex\n");
-+			return '\0';
-+	}
-+}
-+
-+static char * hex_print(unsigned char * s)
-+{
-+	char * g = kmalloc(strlen(s)*3 + 1, GFP_ATOMIC);
-+	int i;
-+
-+	if(!g) {
-+	       if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in hex_print, "
-+					"bailing.\n");
-+	       return NULL;
-+	}
-+
-+	for(i = 0; i < strlen(s); i++) {
-+		g[i*3    ] = dec2hex(s[i]/16);
-+		g[i*3 + 1] = dec2hex(s[i]%16);
-+		g[i*3 + 2] = ' ';
-+	}
-+	g[i*3] = '\0';
-+
-+	return g;
-+}
-+#endif // DEBUG
-+
-+/* Use instead of regcomp.  As we expect to be seeing the same regexps over and
-+over again, it make sense to cache the results. */
-+static regexp * compile_and_cache(const char * regex_string, 
-+                                  const char * protocol)
-+{
-+	struct pattern_cache * node               = first_pattern_cache;
-+	struct pattern_cache * last_pattern_cache = first_pattern_cache;
-+	struct pattern_cache * tmp;
-+	unsigned int len;
-+
-+	while (node != NULL) {
-+		if (!strcmp(node->regex_string, regex_string))
-+		return node->pattern;
-+
-+		last_pattern_cache = node;/* points at the last non-NULL node */
-+		node = node->next;
-+	}
-+
-+	/* If we reach the end of the list, then we have not yet cached
-+	   the pattern for this regex. Let's do that now.
-+	   Be paranoid about running out of memory to avoid list corruption. */
-+	tmp = kmalloc(sizeof(struct pattern_cache), GFP_ATOMIC);
-+
-+	if(!tmp) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in "
-+					"compile_and_cache, bailing.\n");
-+		return NULL;
-+	}
-+
-+	tmp->regex_string  = kmalloc(strlen(regex_string) + 1, GFP_ATOMIC);
-+	tmp->pattern       = kmalloc(sizeof(struct regexp),    GFP_ATOMIC);
-+	tmp->next = NULL;
-+
-+	if(!tmp->regex_string || !tmp->pattern) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in "
-+					"compile_and_cache, bailing.\n");
-+		kfree(tmp->regex_string);
-+		kfree(tmp->pattern);
-+		kfree(tmp);
-+		return NULL;
-+	}
-+
-+	/* Ok.  The new node is all ready now. */
-+	node = tmp;
-+
-+	if(first_pattern_cache == NULL) /* list is empty */
-+		first_pattern_cache = node; /* make node the beginning */
-+	else
-+		last_pattern_cache->next = node; /* attach node to the end */
-+
-+	/* copy the string and compile the regex */
-+	len = strlen(regex_string);
-+	DPRINTK("About to compile this: \"%s\"\n", regex_string);
-+	node->pattern = regcomp((char *)regex_string, &len);
-+	if ( !node->pattern ) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: Error compiling regexp "
-+					"\"%s\" (%s)\n", 
-+					regex_string, protocol);
-+		/* pattern is now cached as NULL, so we won't try again. */
-+	}
-+
-+	strcpy(node->regex_string, regex_string);
-+	return node->pattern;
-+}
-+
-+static int can_handle(const struct sk_buff *skb)
-+{
-+	if(!ip_hdr(skb)) /* not IP */
-+		return 0;
-+	if(ip_hdr(skb)->protocol != IPPROTO_TCP &&
-+	   ip_hdr(skb)->protocol != IPPROTO_UDP &&
-+	   ip_hdr(skb)->protocol != IPPROTO_ICMP)
-+		return 0;
-+	return 1;
-+}
-+
-+/* Returns offset the into the skb->data that the application data starts */
-+static int app_data_offset(const struct sk_buff *skb)
-+{
-+	/* In case we are ported somewhere (ebtables?) where ip_hdr(skb)
-+	isn't set, this can be gotten from 4*(skb->data[0] & 0x0f) as well. */
-+	int ip_hl = 4*ip_hdr(skb)->ihl;
-+
-+	if( ip_hdr(skb)->protocol == IPPROTO_TCP ) {
-+		/* 12 == offset into TCP header for the header length field.
-+		Can't get this with skb->h.th->doff because the tcphdr
-+		struct doesn't get set when routing (this is confirmed to be
-+		true in Netfilter as well as QoS.) */
-+		int tcp_hl = 4*(skb->data[ip_hl + 12] >> 4);
-+
-+		return ip_hl + tcp_hl;
-+	} else if( ip_hdr(skb)->protocol == IPPROTO_UDP  ) {
-+		return ip_hl + 8; /* UDP header is always 8 bytes */
-+	} else if( ip_hdr(skb)->protocol == IPPROTO_ICMP ) {
-+		return ip_hl + 8; /* ICMP header is 8 bytes */
-+	} else {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: tried to handle unknown "
-+					"protocol!\n");
-+		return ip_hl + 8; /* something reasonable */
-+	}
-+}
-+
-+/* handles whether there's a match when we aren't appending data anymore */
-+static int match_no_append(struct nf_conn * conntrack, 
-+                           struct nf_conn * master_conntrack, 
-+                           enum ip_conntrack_info ctinfo,
-+                           enum ip_conntrack_info master_ctinfo,
-+                           const struct xt_layer7_info * info)
-+{
-+	/* If we're in here, throw the app data away */
-+	if(master_conntrack->layer7.app_data != NULL) {
-+
-+	#ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
-+		if(!master_conntrack->layer7.app_proto) {
-+			char * f = 
-+			  friendly_print(master_conntrack->layer7.app_data);
-+			char * g = 
-+			  hex_print(master_conntrack->layer7.app_data);
-+			DPRINTK("\nl7-filter gave up after %d bytes "
-+				"(%d packets):\n%s\n",
-+				strlen(f), total_acct_packets(master_conntrack), f);
-+			kfree(f);
-+			DPRINTK("In hex: %s\n", g);
-+			kfree(g);
-+		}
-+	#endif
-+
-+		kfree(master_conntrack->layer7.app_data);
-+		master_conntrack->layer7.app_data = NULL; /* don't free again */
-+	}
-+
-+	if(master_conntrack->layer7.app_proto){
-+		/* Here child connections set their .app_proto (for /proc) */
-+		if(!conntrack->layer7.app_proto) {
-+			conntrack->layer7.app_proto = 
-+			  kmalloc(strlen(master_conntrack->layer7.app_proto)+1, 
-+			    GFP_ATOMIC);
-+			if(!conntrack->layer7.app_proto){
-+				if (net_ratelimit())
-+					printk(KERN_ERR "layer7: out of memory "
-+							"in match_no_append, "
-+							"bailing.\n");
-+				return 1;
-+			}
-+			strcpy(conntrack->layer7.app_proto, 
-+				master_conntrack->layer7.app_proto);
-+		}
-+
-+		return (!strcmp(master_conntrack->layer7.app_proto, 
-+				info->protocol));
-+	}
-+	else {
-+		/* If not classified, set to "unknown" to distinguish from
-+		connections that are still being tested. */
-+		master_conntrack->layer7.app_proto = 
-+			kmalloc(strlen("unknown")+1, GFP_ATOMIC);
-+		if(!master_conntrack->layer7.app_proto){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in "
-+						"match_no_append, bailing.\n");
-+			return 1;
-+		}
-+		strcpy(master_conntrack->layer7.app_proto, "unknown");
-+		return 0;
-+	}
-+}
-+
-+/* add the new app data to the conntrack.  Return number of bytes added. */
-+static int add_data(struct nf_conn * master_conntrack,
-+                    char * app_data, int appdatalen)
-+{
-+	int length = 0, i;
-+	int oldlength = master_conntrack->layer7.app_data_len;
-+
-+	/* This is a fix for a race condition by Deti Fliegl. However, I'm not 
-+	   clear on whether the race condition exists or whether this really 
-+	   fixes it.  I might just be being dense... Anyway, if it's not really 
-+	   a fix, all it does is waste a very small amount of time. */
-+	if(!master_conntrack->layer7.app_data) return 0;
-+
-+	/* Strip nulls. Make everything lower case (our regex lib doesn't
-+	do case insensitivity).  Add it to the end of the current data. */
-+	for(i = 0; i < maxdatalen-oldlength-1 &&
-+		   i < appdatalen; i++) {
-+		if(app_data[i] != '\0') {
-+			/* the kernel version of tolower mungs 'upper ascii' */
-+			master_conntrack->layer7.app_data[length+oldlength] =
-+				isascii(app_data[i])? 
-+					tolower(app_data[i]) : app_data[i];
-+			length++;
-+		}
-+	}
-+
-+	master_conntrack->layer7.app_data[length+oldlength] = '\0';
-+	master_conntrack->layer7.app_data_len = length + oldlength;
-+
-+	return length;
-+}
-+
-+/* taken from drivers/video/modedb.c */
-+static int my_atoi(const char *s)
-+{
-+	int val = 0;
-+
-+	for (;; s++) {
-+		switch (*s) {
-+			case '0'...'9':
-+			val = 10*val+(*s-'0');
-+			break;
-+		default:
-+			return val;
-+		}
-+	}
-+}
-+
-+/* write out num_packets to userland. */
-+static int layer7_read_proc(char* page, char ** start, off_t off, int count,
-+                            int* eof, void * data)
-+{
-+	if(num_packets > 99 && net_ratelimit())
-+		printk(KERN_ERR "layer7: NOT REACHED. num_packets too big\n");
-+
-+	page[0] = num_packets/10 + '0';
-+	page[1] = num_packets%10 + '0';
-+	page[2] = '\n';
-+	page[3] = '\0';
-+
-+	*eof=1;
-+
-+	return 3;
-+}
-+
-+/* Read in num_packets from userland */
-+static int layer7_write_proc(struct file* file, const char* buffer,
-+                             unsigned long count, void *data)
-+{
-+	char * foo = kmalloc(count, GFP_ATOMIC);
-+
-+	if(!foo){
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory, bailing. "
-+					"num_packets unchanged.\n");
-+		return count;
-+	}
-+
-+	if(copy_from_user(foo, buffer, count)) {
-+		return -EFAULT;
-+	}
-+
-+
-+	num_packets = my_atoi(foo);
-+	kfree (foo);
-+
-+	/* This has an arbitrary limit to make the math easier. I'm lazy.
-+	But anyway, 99 is a LOT! If you want more, you're doing it wrong! */
-+	if(num_packets > 99) {
-+		printk(KERN_WARNING "layer7: num_packets can't be > 99.\n");
-+		num_packets = 99;
-+	} else if(num_packets < 1) {
-+		printk(KERN_WARNING "layer7: num_packets can't be < 1.\n");
-+		num_packets = 1;
-+	}
-+
-+	return count;
-+}
-+
-+static bool
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+match(const struct sk_buff *skbin, const struct xt_match_param *par)
-+#else
-+match(const struct sk_buff *skbin,
-+      const struct net_device *in,
-+      const struct net_device *out,
-+      const struct xt_match *match,
-+      const void *matchinfo,
-+      int offset,
-+      unsigned int protoff,
-+      bool *hotdrop)
-+#endif
-+{
-+	/* sidestep const without getting a compiler warning... */
-+	struct sk_buff * skb = (struct sk_buff *)skbin; 
-+
-+	const struct xt_layer7_info * info = 
-+	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+		par->matchinfo;
-+	#else
-+		matchinfo;
-+	#endif
-+
-+	enum ip_conntrack_info master_ctinfo, ctinfo;
-+	struct nf_conn *master_conntrack, *conntrack;
-+	unsigned char * app_data;
-+	unsigned int pattern_result, appdatalen;
-+	regexp * comppattern;
-+
-+	/* Be paranoid/incompetent - lock the entire match function. */
-+	spin_lock_bh(&l7_lock);
-+
-+	if(!can_handle(skb)){
-+		DPRINTK("layer7: This is some protocol I can't handle.\n");
-+		spin_unlock_bh(&l7_lock);
-+		return info->invert;
-+	}
-+
-+	/* Treat parent & all its children together as one connection, except
-+	for the purpose of setting conntrack->layer7.app_proto in the actual
-+	connection. This makes /proc/net/ip_conntrack more satisfying. */
-+	if(!(conntrack = nf_ct_get(skb, &ctinfo)) ||
-+	   !(master_conntrack=nf_ct_get(skb,&master_ctinfo))){
-+		DPRINTK("layer7: couldn't get conntrack.\n");
-+		spin_unlock_bh(&l7_lock);
-+		return info->invert;
-+	}
-+
-+	/* Try to get a master conntrack (and its master etc) for FTP, etc. */
-+	while (master_ct(master_conntrack) != NULL)
-+		master_conntrack = master_ct(master_conntrack);
-+
-+	/* if we've classified it or seen too many packets */
-+	if(total_acct_packets(master_conntrack) > num_packets ||
-+	   master_conntrack->layer7.app_proto) {
-+
-+		pattern_result = match_no_append(conntrack, master_conntrack, 
-+						 ctinfo, master_ctinfo, info);
-+
-+		/* skb->cb[0] == seen. Don't do things twice if there are 
-+		multiple l7 rules. I'm not sure that using cb for this purpose 
-+		is correct, even though it says "put your private variables 
-+		there". But it doesn't look like it is being used for anything
-+		else in the skbs that make it here. */
-+		skb->cb[0] = 1; /* marking it seen here's probably irrelevant */
-+
-+		spin_unlock_bh(&l7_lock);
-+		return (pattern_result ^ info->invert);
-+	}
-+
-+	if(skb_is_nonlinear(skb)){
-+		if(skb_linearize(skb) != 0){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: failed to linearize "
-+						"packet, bailing.\n");
-+			spin_unlock_bh(&l7_lock);
-+			return info->invert;
-+		}
-+	}
-+
-+	/* now that the skb is linearized, it's safe to set these. */
-+	app_data = skb->data + app_data_offset(skb);
-+	appdatalen = skb_tail_pointer(skb) - app_data;
-+
-+	/* the return value gets checked later, when we're ready to use it */
-+	comppattern = compile_and_cache(info->pattern, info->protocol);
-+
-+	/* On the first packet of a connection, allocate space for app data */
-+	if(total_acct_packets(master_conntrack) == 1 && !skb->cb[0] && 
-+	   !master_conntrack->layer7.app_data){
-+		master_conntrack->layer7.app_data = 
-+			kmalloc(maxdatalen, GFP_ATOMIC);
-+		if(!master_conntrack->layer7.app_data){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in "
-+						"match, bailing.\n");
-+			spin_unlock_bh(&l7_lock);
-+			return info->invert;
-+		}
-+
-+		master_conntrack->layer7.app_data[0] = '\0';
-+	}
-+
-+	/* Can be here, but unallocated, if numpackets is increased near
-+	the beginning of a connection */
-+	if(master_conntrack->layer7.app_data == NULL){
-+		spin_unlock_bh(&l7_lock);
-+		return info->invert; /* unmatched */
-+	}
-+
-+	if(!skb->cb[0]){
-+		int newbytes;
-+		newbytes = add_data(master_conntrack, app_data, appdatalen);
-+
-+		if(newbytes == 0) { /* didn't add any data */
-+			skb->cb[0] = 1;
-+			/* Didn't match before, not going to match now */
-+			spin_unlock_bh(&l7_lock);
-+			return info->invert;
-+		}
-+	}
-+
-+	/* If looking for "unknown", then never match.  "Unknown" means that
-+	we've given up; we're still trying with these packets. */
-+	if(!strcmp(info->protocol, "unknown")) {
-+		pattern_result = 0;
-+	/* If looking for "unset", then always match. "Unset" means that we
-+	haven't yet classified the connection. */
-+	} else if(!strcmp(info->protocol, "unset")) {
-+		pattern_result = 2;
-+		DPRINTK("layer7: matched unset: not yet classified "
-+			"(%d/%d packets)\n",
-+                        total_acct_packets(master_conntrack), num_packets);
-+	/* If the regexp failed to compile, don't bother running it */
-+	} else if(comppattern && 
-+		  regexec(comppattern, master_conntrack->layer7.app_data)){
-+		DPRINTK("layer7: matched %s\n", info->protocol);
-+		pattern_result = 1;
-+	} else pattern_result = 0;
-+
-+	if(pattern_result == 1) {
-+		master_conntrack->layer7.app_proto = 
-+			kmalloc(strlen(info->protocol)+1, GFP_ATOMIC);
-+		if(!master_conntrack->layer7.app_proto){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in "
-+						"match, bailing.\n");
-+			spin_unlock_bh(&l7_lock);
-+			return (pattern_result ^ info->invert);
-+		}
-+		strcpy(master_conntrack->layer7.app_proto, info->protocol);
-+	} else if(pattern_result > 1) { /* cleanup from "unset" */
-+		pattern_result = 1;
-+	}
-+
-+	/* mark the packet seen */
-+	skb->cb[0] = 1;
-+
-+	spin_unlock_bh(&l7_lock);
-+	return (pattern_result ^ info->invert);
-+}
-+
-+// load nf_conntrack_ipv4
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+static bool check(const struct xt_mtchk_param *par)
-+{
-+        if (nf_ct_l3proto_try_module_get(par->match->family) < 0) {
-+                printk(KERN_WARNING "can't load conntrack support for "
-+                                    "proto=%d\n", par->match->family);
-+#else
-+static bool check(const char *tablename, const void *inf,
-+		 const struct xt_match *match, void *matchinfo,
-+		 unsigned int hook_mask)
-+{
-+        if (nf_ct_l3proto_try_module_get(match->family) < 0) {
-+                printk(KERN_WARNING "can't load conntrack support for "
-+                                    "proto=%d\n", match->family);
-+#endif
-+                return 0;
-+        }
-+	return 1;
-+}
-+
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+	static void destroy(const struct xt_mtdtor_param *par)
-+	{
-+		nf_ct_l3proto_module_put(par->match->family);
-+	}
-+#else
-+	static void destroy(const struct xt_match *match, void *matchinfo)
-+	{
-+		nf_ct_l3proto_module_put(match->family);
-+	}
-+#endif
-+
-+static struct xt_match xt_layer7_match[] __read_mostly = {
-+{
-+	.name		= "layer7",
-+	.family		= AF_INET,
-+	.checkentry	= check,
-+	.match		= match,
-+	.destroy	= destroy,
-+	.matchsize	= sizeof(struct xt_layer7_info),
-+	.me		= THIS_MODULE
-+}
-+};
-+
-+static void layer7_cleanup_proc(void)
-+{
-+	remove_proc_entry("layer7_numpackets", init_net.proc_net);
-+}
-+
-+/* register the proc file */
-+static void layer7_init_proc(void)
-+{
-+	struct proc_dir_entry* entry;
-+	entry = create_proc_entry("layer7_numpackets", 0644, init_net.proc_net);
-+	entry->read_proc = layer7_read_proc;
-+	entry->write_proc = layer7_write_proc;
-+}
-+
-+static int __init xt_layer7_init(void)
-+{
-+	need_conntrack();
-+
-+	layer7_init_proc();
-+	if(maxdatalen < 1) {
-+		printk(KERN_WARNING "layer7: maxdatalen can't be < 1, "
-+			"using 1\n");
-+		maxdatalen = 1;
-+	}
-+	/* This is not a hard limit.  It's just here to prevent people from
-+	bringing their slow machines to a grinding halt. */
-+	else if(maxdatalen > 65536) {
-+		printk(KERN_WARNING "layer7: maxdatalen can't be > 65536, "
-+			"using 65536\n");
-+		maxdatalen = 65536;
-+	}
-+	return xt_register_matches(xt_layer7_match,
-+				   ARRAY_SIZE(xt_layer7_match));
-+}
-+
-+static void __exit xt_layer7_fini(void)
-+{
-+	layer7_cleanup_proc();
-+	xt_unregister_matches(xt_layer7_match, ARRAY_SIZE(xt_layer7_match));
-+}
-+
-+module_init(xt_layer7_init);
-+module_exit(xt_layer7_fini);
diff --git a/target/linux/generic-2.6/patches-2.6.34/101-netfilter_layer7_pktmatch.patch b/target/linux/generic-2.6/patches-2.6.34/101-netfilter_layer7_pktmatch.patch
deleted file mode 100644
index f65e301fd..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/101-netfilter_layer7_pktmatch.patch
+++ /dev/null
@@ -1,108 +0,0 @@
---- a/include/linux/netfilter/xt_layer7.h
-+++ b/include/linux/netfilter/xt_layer7.h
-@@ -8,6 +8,7 @@ struct xt_layer7_info {
-     char protocol[MAX_PROTOCOL_LEN];
-     char pattern[MAX_PATTERN_LEN];
-     u_int8_t invert;
-+    u_int8_t pkt;
- };
- 
- #endif /* _XT_LAYER7_H */
---- a/net/netfilter/xt_layer7.c
-+++ b/net/netfilter/xt_layer7.c
-@@ -314,33 +314,35 @@ static int match_no_append(struct nf_con
- }
- 
- /* add the new app data to the conntrack.  Return number of bytes added. */
--static int add_data(struct nf_conn * master_conntrack,
--                    char * app_data, int appdatalen)
-+static int add_datastr(char *target, int offset, char *app_data, int len)
- {
- 	int length = 0, i;
--	int oldlength = master_conntrack->layer7.app_data_len;
--
--	/* This is a fix for a race condition by Deti Fliegl. However, I'm not 
--	   clear on whether the race condition exists or whether this really 
--	   fixes it.  I might just be being dense... Anyway, if it's not really 
--	   a fix, all it does is waste a very small amount of time. */
--	if(!master_conntrack->layer7.app_data) return 0;
-+	if (!target) return 0;
- 
- 	/* Strip nulls. Make everything lower case (our regex lib doesn't
- 	do case insensitivity).  Add it to the end of the current data. */
--	for(i = 0; i < maxdatalen-oldlength-1 &&
--		   i < appdatalen; i++) {
-+ 	for(i = 0; i < maxdatalen-offset-1 && i < len; i++) {
- 		if(app_data[i] != '\0') {
- 			/* the kernel version of tolower mungs 'upper ascii' */
--			master_conntrack->layer7.app_data[length+oldlength] =
-+			target[length+offset] =
- 				isascii(app_data[i])? 
- 					tolower(app_data[i]) : app_data[i];
- 			length++;
- 		}
- 	}
-+	target[length+offset] = '\0';
-+
-+	return length;
-+}
-+
-+/* add the new app data to the conntrack.  Return number of bytes added. */
-+static int add_data(struct nf_conn * master_conntrack,
-+                    char * app_data, int appdatalen)
-+{
-+	int length;
- 
--	master_conntrack->layer7.app_data[length+oldlength] = '\0';
--	master_conntrack->layer7.app_data_len = length + oldlength;
-+	length = add_datastr(master_conntrack->layer7.app_data, master_conntrack->layer7.app_data_len, app_data, appdatalen);
-+	master_conntrack->layer7.app_data_len += length;
- 
- 	return length;
- }
-@@ -438,7 +440,7 @@ match(const struct sk_buff *skbin,
- 
- 	enum ip_conntrack_info master_ctinfo, ctinfo;
- 	struct nf_conn *master_conntrack, *conntrack;
--	unsigned char * app_data;
-+	unsigned char *app_data, *tmp_data;
- 	unsigned int pattern_result, appdatalen;
- 	regexp * comppattern;
- 
-@@ -466,8 +468,8 @@ match(const struct sk_buff *skbin,
- 		master_conntrack = master_ct(master_conntrack);
- 
- 	/* if we've classified it or seen too many packets */
--	if(total_acct_packets(master_conntrack) > num_packets ||
--	   master_conntrack->layer7.app_proto) {
-+	if(!info->pkt && (total_acct_packets(master_conntrack) > num_packets ||
-+	   master_conntrack->layer7.app_proto)) {
- 
- 		pattern_result = match_no_append(conntrack, master_conntrack, 
- 						 ctinfo, master_ctinfo, info);
-@@ -500,6 +502,25 @@ match(const struct sk_buff *skbin,
- 	/* the return value gets checked later, when we're ready to use it */
- 	comppattern = compile_and_cache(info->pattern, info->protocol);
- 
-+	if (info->pkt) {
-+		tmp_data = kmalloc(maxdatalen, GFP_ATOMIC);
-+		if(!tmp_data){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in match, bailing.\n");
-+			return info->invert;
-+		}
-+
-+		tmp_data[0] = '\0';
-+		add_datastr(tmp_data, 0, app_data, appdatalen);
-+		pattern_result = ((comppattern && regexec(comppattern, tmp_data)) ? 1 : 0);
-+
-+		kfree(tmp_data);
-+		tmp_data = NULL;
-+		spin_unlock_bh(&l7_lock);
-+
-+		return (pattern_result ^ info->invert);
-+	}
-+
- 	/* On the first packet of a connection, allocate space for app data */
- 	if(total_acct_packets(master_conntrack) == 1 && !skb->cb[0] && 
- 	   !master_conntrack->layer7.app_data){
diff --git a/target/linux/generic-2.6/patches-2.6.34/110-netfilter_match_speedup.patch b/target/linux/generic-2.6/patches-2.6.34/110-netfilter_match_speedup.patch
deleted file mode 100644
index e99c6db4d..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/110-netfilter_match_speedup.patch
+++ /dev/null
@@ -1,144 +0,0 @@
---- a/include/linux/netfilter_ipv4/ip_tables.h
-+++ b/include/linux/netfilter_ipv4/ip_tables.h
-@@ -62,6 +62,7 @@ struct ipt_ip {
- #define IPT_F_FRAG		0x01	/* Set if rule is a fragment rule */
- #define IPT_F_GOTO		0x02	/* Set if jump is a goto */
- #define IPT_F_MASK		0x03	/* All possible flag bits mask. */
-+#define IPT_F_NO_DEF_MATCH	0x80	/* Internal: no default match rules present */
- 
- /* Values for "inv" field in struct ipt_ip. */
- #define IPT_INV_VIA_IN		0x01	/* Invert the sense of IN IFACE. */
---- a/net/ipv4/netfilter/ip_tables.c
-+++ b/net/ipv4/netfilter/ip_tables.c
-@@ -88,6 +88,9 @@ ip_packet_match(const struct iphdr *ip,
- 
- #define FWINV(bool, invflg) ((bool) ^ !!(ipinfo->invflags & (invflg)))
- 
-+	if (ipinfo->flags & IPT_F_NO_DEF_MATCH)
-+		return true;
-+
- 	if (FWINV((ip->saddr&ipinfo->smsk.s_addr) != ipinfo->src.s_addr,
- 		  IPT_INV_SRCIP) ||
- 	    FWINV((ip->daddr&ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr,
-@@ -138,13 +141,35 @@ ip_packet_match(const struct iphdr *ip,
- 		return false;
- 	}
- 
-+#undef FWINV
- 	return true;
- }
- 
- static bool
--ip_checkentry(const struct ipt_ip *ip)
-+ip_checkentry(struct ipt_ip *ip)
- {
--	if (ip->flags & ~IPT_F_MASK) {
-+#define FWINV(bool, invflg) ((bool) || (ip->invflags & (invflg)))
-+
-+	if (FWINV(ip->smsk.s_addr, IPT_INV_SRCIP) ||
-+		FWINV(ip->dmsk.s_addr, IPT_INV_DSTIP))
-+		goto has_match_rules;
-+
-+	if (FWINV(!!((const unsigned long *)ip->iniface_mask)[0],
-+		IPT_INV_VIA_IN) ||
-+	    FWINV(!!((const unsigned long *)ip->outiface_mask)[0],
-+		IPT_INV_VIA_OUT))
-+		goto has_match_rules;
-+
-+	if (FWINV(ip->proto, IPT_INV_PROTO))
-+		goto has_match_rules;
-+
-+	if (FWINV(ip->flags&IPT_F_FRAG, IPT_INV_FRAG))
-+		goto has_match_rules;
-+
-+	ip->flags |= IPT_F_NO_DEF_MATCH;
-+
-+has_match_rules:
-+	if (ip->flags & ~(IPT_F_MASK|IPT_F_NO_DEF_MATCH)) {
- 		duprintf("Unknown flag bits set: %08X\n",
- 			 ip->flags & ~IPT_F_MASK);
- 		return false;
-@@ -154,6 +179,8 @@ ip_checkentry(const struct ipt_ip *ip)
- 			 ip->invflags & ~IPT_INV_MASK);
- 		return false;
- 	}
-+
-+#undef FWINV
- 	return true;
- }
- 
-@@ -196,7 +223,6 @@ static inline bool unconditional(const s
- 	static const struct ipt_ip uncond;
- 
- 	return memcmp(ip, &uncond, sizeof(uncond)) == 0;
--#undef FWINV
- }
- 
- #if defined(CONFIG_NETFILTER_XT_TARGET_TRACE) || \
-@@ -321,8 +347,28 @@ ipt_do_table(struct sk_buff *skb,
- 	struct xt_match_param mtpar;
- 	struct xt_target_param tgpar;
- 
--	/* Initialization */
- 	ip = ip_hdr(skb);
-+
-+	IP_NF_ASSERT(table->valid_hooks & (1 << hook));
-+	xt_info_rdlock_bh();
-+	private = table->private;
-+	table_base = private->entries[smp_processor_id()];
-+	e = get_entry(table_base, private->hook_entry[hook]);
-+
-+	if (e->target_offset <= sizeof(struct ipt_entry) &&
-+		(e->ip.flags & IPT_F_NO_DEF_MATCH)) {
-+			struct ipt_entry_target *t = ipt_get_target(e);
-+			if (!t->u.kernel.target->target) {
-+				int v = ((struct ipt_standard_target *)t)->verdict;
-+				if ((v < 0) && (v != IPT_RETURN)) {
-+					ADD_COUNTER(e->counters, ntohs(ip->tot_len), 1);
-+					xt_info_rdunlock_bh();
-+					return (unsigned)(-v) - 1;
-+				}
-+			}
-+	}
-+
-+	/* Initialization */
- 	indev = in ? in->name : nulldevname;
- 	outdev = out ? out->name : nulldevname;
- 	/* We handle fragments by dealing with the first fragment as
-@@ -339,13 +385,6 @@ ipt_do_table(struct sk_buff *skb,
- 	mtpar.family  = tgpar.family = NFPROTO_IPV4;
- 	mtpar.hooknum = tgpar.hooknum = hook;
- 
--	IP_NF_ASSERT(table->valid_hooks & (1 << hook));
--	xt_info_rdlock_bh();
--	private = table->private;
--	table_base = private->entries[smp_processor_id()];
--
--	e = get_entry(table_base, private->hook_entry[hook]);
--
- 	/* For return from builtin chain */
- 	back = get_entry(table_base, private->underflow[hook]);
- 
-@@ -992,6 +1031,7 @@ copy_entries_to_user(unsigned int total_
- 		unsigned int i;
- 		const struct ipt_entry_match *m;
- 		const struct ipt_entry_target *t;
-+		u8 flags;
- 
- 		e = (struct ipt_entry *)(loc_cpu_entry + off);
- 		if (copy_to_user(userptr + off
-@@ -1002,6 +1042,14 @@ copy_entries_to_user(unsigned int total_
- 			goto free_counters;
- 		}
- 
-+		flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
-+		if (copy_to_user(userptr + off
-+				 + offsetof(struct ipt_entry, ip.flags),
-+				 &flags, sizeof(flags)) != 0) {
-+			ret = -EFAULT;
-+			goto free_counters;
-+		}
-+
- 		for (i = sizeof(struct ipt_entry);
- 		     i < e->target_offset;
- 		     i += m->u.match_size) {
diff --git a/target/linux/generic-2.6/patches-2.6.34/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.34/150-netfilter_imq.patch
deleted file mode 100644
index 510ce7042..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/150-netfilter_imq.patch
+++ /dev/null
@@ -1,1336 +0,0 @@
---- /dev/null
-+++ b/drivers/net/imq.c
-@@ -0,0 +1,632 @@
-+/*
-+ *             Pseudo-driver for the intermediate queue device.
-+ *
-+ *             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.
-+ *
-+ * Authors:    Patrick McHardy, <kaber@trash.net>
-+ *
-+ *            The first version was written by Martin Devera, <devik@cdi.cz>
-+ *
-+ * Credits:    Jan Rafaj <imq2t@cedric.vabo.cz>
-+ *              - Update patch to 2.4.21
-+ *             Sebastian Strollo <sstrollo@nortelnetworks.com>
-+ *              - Fix "Dead-loop on netdevice imq"-issue
-+ *             Marcel Sebek <sebek64@post.cz>
-+ *              - Update to 2.6.2-rc1
-+ *
-+ *	       After some time of inactivity there is a group taking care
-+ *	       of IMQ again: http://www.linuximq.net
-+ *
-+ *
-+ *	       2004/06/30 - New version of IMQ patch to kernels <=2.6.7
-+ *             including the following changes:
-+ *
-+ *	       - Correction of ipv6 support "+"s issue (Hasso Tepper)
-+ *	       - Correction of imq_init_devs() issue that resulted in
-+ *	       kernel OOPS unloading IMQ as module (Norbert Buchmuller)
-+ *	       - Addition of functionality to choose number of IMQ devices
-+ *	       during kernel config (Andre Correa)
-+ *	       - Addition of functionality to choose how IMQ hooks on
-+ *	       PRE and POSTROUTING (after or before NAT) (Andre Correa)
-+ *	       - Cosmetic corrections (Norbert Buchmuller) (Andre Correa)
-+ *
-+ *
-+ *             2005/12/16 - IMQ versions between 2.6.7 and 2.6.13 were
-+ *             released with almost no problems. 2.6.14-x was released
-+ *             with some important changes: nfcache was removed; After
-+ *             some weeks of trouble we figured out that some IMQ fields
-+ *             in skb were missing in skbuff.c - skb_clone and copy_skb_header.
-+ *             These functions are correctly patched by this new patch version.
-+ *
-+ *             Thanks for all who helped to figure out all the problems with
-+ *             2.6.14.x: Patrick McHardy, Rune Kock, VeNoMouS, Max CtRiX,
-+ *             Kevin Shanahan, Richard Lucassen, Valery Dachev (hopefully
-+ *             I didn't forget anybody). I apologize again for my lack of time.
-+ *
-+ *
-+ *             2008/06/17 - 2.6.25 - Changed imq.c to use qdisc_run() instead 
-+ *             of qdisc_restart() and moved qdisc_run() to tasklet to avoid
-+ *             recursive locking. New initialization routines to fix 'rmmod' not
-+ *             working anymore. Used code from ifb.c. (Jussi Kivilinna)
-+ *
-+ *             2008/08/06 - 2.6.26 - (JK)
-+ *              - Replaced tasklet with 'netif_schedule()'.
-+ *              - Cleaned up and added comments for imq_nf_queue().
-+ *
-+ *             2009/04/12
-+ *              - Add skb_save_cb/skb_restore_cb helper functions for backuping
-+ *                control buffer. This is needed because qdisc-layer on kernels
-+ *                2.6.27 and newer overwrite control buffer. (Jussi Kivilinna)
-+ *              - Add better locking for IMQ device. Hopefully this will solve
-+ *                SMP issues. (Jussi Kivilinna)
-+ *              - Port to 2.6.27
-+ *              - Port to 2.6.28
-+ *              - Port to 2.6.29 + fix rmmod not working
-+ *
-+ *             2009/04/20 - (Jussi Kivilinna)
-+ *              - Use netdevice feature flags to avoid extra packet handling
-+ *                by core networking layer and possibly increase performance.
-+ *
-+ *             2009/09/26 - (Jussi Kivilinna)
-+ *              - Add imq_nf_reinject_lockless to fix deadlock with
-+ *                imq_nf_queue/imq_nf_reinject.
-+ *
-+ *             2009/12/08 - (Jussi Kivilinna)
-+ *              - Port to 2.6.32
-+ *              - Add check for skb->nf_queue_entry==NULL in imq_dev_xmit()
-+ *              - Also add better error checking for skb->nf_queue_entry usage
-+ *
-+ *	       Also, many thanks to pablo Sebastian Greco for making the initial
-+ *	       patch and to those who helped the testing.
-+ *
-+ *             More info at: http://www.linuximq.net/ (Andre Correa)
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/moduleparam.h>
-+#include <linux/list.h>
-+#include <linux/skbuff.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/rtnetlink.h>
-+#include <linux/if_arp.h>
-+#include <linux/netfilter.h>
-+#include <linux/netfilter_ipv4.h>
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	#include <linux/netfilter_ipv6.h>
-+#endif
-+#include <linux/imq.h>
-+#include <net/pkt_sched.h>
-+#include <net/netfilter/nf_queue.h>
-+
-+static nf_hookfn imq_nf_hook;
-+
-+static struct nf_hook_ops imq_ingress_ipv4 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET,
-+	.hooknum	= NF_INET_PRE_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	.priority	= NF_IP_PRI_MANGLE + 1
-+#else
-+	.priority	= NF_IP_PRI_NAT_DST + 1
-+#endif
-+};
-+
-+static struct nf_hook_ops imq_egress_ipv4 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET,
-+	.hooknum	= NF_INET_POST_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
-+	.priority	= NF_IP_PRI_LAST
-+#else
-+	.priority	= NF_IP_PRI_NAT_SRC - 1
-+#endif
-+};
-+
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+static struct nf_hook_ops imq_ingress_ipv6 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET6,
-+	.hooknum	= NF_INET_PRE_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	.priority	= NF_IP6_PRI_MANGLE + 1
-+#else
-+	.priority	= NF_IP6_PRI_NAT_DST + 1
-+#endif
-+};
-+
-+static struct nf_hook_ops imq_egress_ipv6 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET6,
-+	.hooknum	= NF_INET_POST_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
-+	.priority	= NF_IP6_PRI_LAST
-+#else
-+	.priority	= NF_IP6_PRI_NAT_SRC - 1
-+#endif
-+};
-+#endif
-+
-+#if defined(CONFIG_IMQ_NUM_DEVS)
-+static unsigned int numdevs = CONFIG_IMQ_NUM_DEVS;
-+#else
-+static unsigned int numdevs = IMQ_MAX_DEVS;
-+#endif
-+
-+static DEFINE_SPINLOCK(imq_nf_queue_lock);
-+
-+static struct net_device *imq_devs_cache[IMQ_MAX_DEVS];
-+
-+
-+static struct net_device_stats *imq_get_stats(struct net_device *dev)
-+{
-+	return &dev->stats;
-+}
-+
-+/* called for packets kfree'd in qdiscs at places other than enqueue */
-+static void imq_skb_destructor(struct sk_buff *skb)
-+{
-+	struct nf_queue_entry *entry = skb->nf_queue_entry;
-+
-+	skb->nf_queue_entry = NULL;
-+
-+	if (entry) {
-+		nf_queue_entry_release_refs(entry);
-+		kfree(entry);
-+	}
-+
-+	skb_restore_cb(skb); /* kfree backup */
-+}
-+
-+/* locking not needed when called from imq_nf_queue */
-+static void imq_nf_reinject_lockless(struct nf_queue_entry *entry,
-+						unsigned int verdict)
-+{
-+	int status;
-+
-+	if (!entry->next_outfn) {
-+		nf_reinject(entry, verdict);
-+		return;
-+	}
-+
-+	status = entry->next_outfn(entry, entry->next_queuenum);
-+	if (status < 0) {
-+		nf_queue_entry_release_refs(entry);
-+		kfree_skb(entry->skb);
-+		kfree(entry);
-+	}
-+}
-+
-+static void imq_nf_reinject(struct nf_queue_entry *entry, unsigned int verdict)
-+{
-+	int status;
-+
-+	if (!entry->next_outfn) {
-+		spin_lock_bh(&imq_nf_queue_lock);
-+		nf_reinject(entry, verdict);
-+		spin_unlock_bh(&imq_nf_queue_lock);
-+		return;
-+	}
-+
-+	rcu_read_lock();
-+	local_bh_disable();
-+	status = entry->next_outfn(entry, entry->next_queuenum);
-+	local_bh_enable();
-+	if (status < 0) {
-+		nf_queue_entry_release_refs(entry);
-+		kfree_skb(entry->skb);
-+		kfree(entry);
-+	}
-+
-+	rcu_read_unlock();
-+}
-+
-+static netdev_tx_t imq_dev_xmit(struct sk_buff *skb, struct net_device *dev)
-+{
-+	struct nf_queue_entry *entry = skb->nf_queue_entry;
-+
-+	skb->nf_queue_entry = NULL;
-+	dev->trans_start = jiffies;
-+
-+	dev->stats.tx_bytes += skb->len;
-+	dev->stats.tx_packets++;
-+
-+	if (entry == NULL) {
-+		/* We don't know what is going on here.. packet is queued for
-+		 * imq device, but (probably) not by us.
-+		 *
-+		 * If this packet was not send here by imq_nf_queue(), then
-+		 * skb_save_cb() was not used and skb_free() should not show:
-+		 *   WARNING: IMQ: kfree_skb: skb->cb_next:..
-+		 * and/or
-+		 *   WARNING: IMQ: kfree_skb: skb->nf_queue_entry...
-+		 *
-+		 * However if this message is shown, then IMQ is somehow broken
-+		 * and you should report this to linuximq.net.
-+		 */
-+
-+		/* imq_dev_xmit is black hole that eats all packets, report that
-+		 * we eat this packet happily and increase dropped counters.
-+		 */
-+
-+		dev->stats.tx_dropped++;
-+		dev_kfree_skb(skb);
-+
-+		return NETDEV_TX_OK;
-+	}
-+
-+	skb_restore_cb(skb); /* restore skb->cb */
-+
-+	skb->imq_flags = 0;
-+	skb->destructor = NULL;
-+
-+	imq_nf_reinject(entry, NF_ACCEPT);
-+
-+	return NETDEV_TX_OK;
-+}
-+
-+static int imq_nf_queue(struct nf_queue_entry *entry, unsigned queue_num)
-+{
-+	struct net_device *dev;
-+	struct sk_buff *skb_orig, *skb, *skb_shared;
-+	struct Qdisc *q;
-+	struct netdev_queue *txq;
-+	int users, index;
-+	int retval = -EINVAL;
-+
-+	index = entry->skb->imq_flags & IMQ_F_IFMASK;
-+	if (unlikely(index > numdevs - 1)) {
-+		if (net_ratelimit())
-+			printk(KERN_WARNING
-+			       "IMQ: invalid device specified, highest is %u\n",
-+			       numdevs - 1);
-+		retval = -EINVAL;
-+		goto out;
-+	}
-+
-+	/* check for imq device by index from cache */
-+	dev = imq_devs_cache[index];
-+	if (unlikely(!dev)) {
-+		char buf[8];
-+
-+		/* get device by name and cache result */
-+		snprintf(buf, sizeof(buf), "imq%d", index);
-+		dev = dev_get_by_name(&init_net, buf);
-+		if (!dev) {
-+			/* not found ?!*/
-+			BUG();
-+			retval = -ENODEV;
-+			goto out;
-+		}
-+
-+		imq_devs_cache[index] = dev;
-+		dev_put(dev);
-+	}
-+
-+	if (unlikely(!(dev->flags & IFF_UP))) {
-+		entry->skb->imq_flags = 0;
-+		imq_nf_reinject_lockless(entry, NF_ACCEPT);
-+		retval = 0;
-+		goto out;
-+	}
-+	dev->last_rx = jiffies;
-+
-+	skb = entry->skb;
-+	skb_orig = NULL;
-+
-+	/* skb has owner? => make clone */
-+	if (unlikely(skb->destructor)) {
-+		skb_orig = skb;
-+		skb = skb_clone(skb, GFP_ATOMIC);
-+		if (!skb) {
-+			retval = -ENOMEM;
-+			goto out;
-+		}
-+		entry->skb = skb;
-+	}
-+
-+	skb->nf_queue_entry = entry;
-+
-+	dev->stats.rx_bytes += skb->len;
-+	dev->stats.rx_packets++;
-+
-+	txq = dev_pick_tx(dev, skb);
-+
-+	q = rcu_dereference(txq->qdisc);
-+	if (unlikely(!q->enqueue))
-+		goto packet_not_eaten_by_imq_dev;
-+
-+	spin_lock_bh(qdisc_lock(q));
-+
-+	users = atomic_read(&skb->users);
-+
-+	skb_shared = skb_get(skb); /* increase reference count by one */
-+	skb_save_cb(skb_shared); /* backup skb->cb, as qdisc layer will
-+					overwrite it */
-+	qdisc_enqueue_root(skb_shared, q); /* might kfree_skb */
-+
-+	if (likely(atomic_read(&skb_shared->users) == users + 1)) {
-+		kfree_skb(skb_shared); /* decrease reference count by one */
-+
-+		skb->destructor = &imq_skb_destructor;
-+
-+		/* cloned? */
-+		if (skb_orig)
-+			kfree_skb(skb_orig); /* free original */
-+
-+		spin_unlock_bh(qdisc_lock(q));
-+
-+		/* schedule qdisc dequeue */
-+		__netif_schedule(q);
-+
-+		retval = 0;
-+		goto out;
-+	} else {
-+		skb_restore_cb(skb_shared); /* restore skb->cb */
-+		skb->nf_queue_entry = NULL;
-+		/* qdisc dropped packet and decreased skb reference count of
-+		 * skb, so we don't really want to and try refree as that would
-+		 * actually destroy the skb. */
-+		spin_unlock_bh(qdisc_lock(q));
-+		goto packet_not_eaten_by_imq_dev;
-+	}
-+
-+packet_not_eaten_by_imq_dev:
-+	/* cloned? restore original */
-+	if (skb_orig) {
-+		kfree_skb(skb);
-+		entry->skb = skb_orig;
-+	}
-+	retval = -1;
-+out:
-+	return retval;
-+}
-+
-+static struct nf_queue_handler nfqh = {
-+	.name  = "imq",
-+	.outfn = imq_nf_queue,
-+};
-+
-+static unsigned int imq_nf_hook(unsigned int hook, struct sk_buff *pskb,
-+				const struct net_device *indev,
-+				const struct net_device *outdev,
-+				int (*okfn)(struct sk_buff *))
-+{
-+	if (pskb->imq_flags & IMQ_F_ENQUEUE)
-+		return NF_QUEUE;
-+
-+	return NF_ACCEPT;
-+}
-+
-+static int imq_close(struct net_device *dev)
-+{
-+	netif_stop_queue(dev);
-+	return 0;
-+}
-+
-+static int imq_open(struct net_device *dev)
-+{
-+	netif_start_queue(dev);
-+	return 0;
-+}
-+
-+static const struct net_device_ops imq_netdev_ops = {
-+	.ndo_open		= imq_open,
-+	.ndo_stop		= imq_close,
-+	.ndo_start_xmit		= imq_dev_xmit,
-+	.ndo_get_stats		= imq_get_stats,
-+};
-+
-+static void imq_setup(struct net_device *dev)
-+{
-+	dev->netdev_ops		= &imq_netdev_ops;
-+	dev->type               = ARPHRD_VOID;
-+	dev->mtu                = 16000;
-+	dev->tx_queue_len       = 11000;
-+	dev->flags              = IFF_NOARP;
-+	dev->features           = NETIF_F_SG | NETIF_F_FRAGLIST |
-+				  NETIF_F_GSO | NETIF_F_HW_CSUM |
-+				  NETIF_F_HIGHDMA;
-+	dev->priv_flags		&= ~IFF_XMIT_DST_RELEASE;
-+}
-+
-+static int imq_validate(struct nlattr *tb[], struct nlattr *data[])
-+{
-+	int ret = 0;
-+
-+	if (tb[IFLA_ADDRESS]) {
-+		if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN) {
-+			ret = -EINVAL;
-+			goto end;
-+		}
-+		if (!is_valid_ether_addr(nla_data(tb[IFLA_ADDRESS]))) {
-+			ret = -EADDRNOTAVAIL;
-+			goto end;
-+		}
-+	}
-+	return 0;
-+end:
-+	printk(KERN_WARNING "IMQ: imq_validate failed (%d)\n", ret);
-+	return ret;
-+}
-+
-+static struct rtnl_link_ops imq_link_ops __read_mostly = {
-+	.kind		= "imq",
-+	.priv_size	= 0,
-+	.setup		= imq_setup,
-+	.validate	= imq_validate,
-+};
-+
-+static int __init imq_init_hooks(void)
-+{
-+	int err;
-+
-+	nf_register_queue_imq_handler(&nfqh);
-+
-+	err = nf_register_hook(&imq_ingress_ipv4);
-+	if (err)
-+		goto err1;
-+
-+	err = nf_register_hook(&imq_egress_ipv4);
-+	if (err)
-+		goto err2;
-+
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	err = nf_register_hook(&imq_ingress_ipv6);
-+	if (err)
-+		goto err3;
-+
-+	err = nf_register_hook(&imq_egress_ipv6);
-+	if (err)
-+		goto err4;
-+#endif
-+
-+	return 0;
-+
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+err4:
-+	nf_unregister_hook(&imq_ingress_ipv6);
-+err3:
-+	nf_unregister_hook(&imq_egress_ipv4);
-+#endif
-+err2:
-+	nf_unregister_hook(&imq_ingress_ipv4);
-+err1:
-+	nf_unregister_queue_imq_handler();
-+	return err;
-+}
-+
-+static int __init imq_init_one(int index)
-+{
-+	struct net_device *dev;
-+	int ret;
-+
-+	dev = alloc_netdev(0, "imq%d", imq_setup);
-+	if (!dev)
-+		return -ENOMEM;
-+
-+	ret = dev_alloc_name(dev, dev->name);
-+	if (ret < 0)
-+		goto fail;
-+
-+	dev->rtnl_link_ops = &imq_link_ops;
-+	ret = register_netdevice(dev);
-+	if (ret < 0)
-+		goto fail;
-+
-+	return 0;
-+fail:
-+	free_netdev(dev);
-+	return ret;
-+}
-+
-+static int __init imq_init_devs(void)
-+{
-+	int err, i;
-+
-+	if (numdevs < 1 || numdevs > IMQ_MAX_DEVS) {
-+		printk(KERN_ERR "IMQ: numdevs has to be betweed 1 and %u\n",
-+		       IMQ_MAX_DEVS);
-+		return -EINVAL;
-+	}
-+
-+	rtnl_lock();
-+	err = __rtnl_link_register(&imq_link_ops);
-+
-+	for (i = 0; i < numdevs && !err; i++)
-+		err = imq_init_one(i);
-+
-+	if (err) {
-+		__rtnl_link_unregister(&imq_link_ops);
-+		memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
-+	}
-+	rtnl_unlock();
-+
-+	return err;
-+}
-+
-+static int __init imq_init_module(void)
-+{
-+	int err;
-+
-+#if defined(CONFIG_IMQ_NUM_DEVS)
-+	BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS > 16);
-+	BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS < 2);
-+	BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS - 1 > IMQ_F_IFMASK);
-+#endif
-+
-+	err = imq_init_devs();
-+	if (err) {
-+		printk(KERN_ERR "IMQ: Error trying imq_init_devs(net)\n");
-+		return err;
-+	}
-+
-+	err = imq_init_hooks();
-+	if (err) {
-+		printk(KERN_ERR "IMQ: Error trying imq_init_hooks()\n");
-+		rtnl_link_unregister(&imq_link_ops);
-+		memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
-+		return err;
-+	}
-+
-+	printk(KERN_INFO "IMQ driver loaded successfully.\n");
-+
-+#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	printk(KERN_INFO "\tHooking IMQ before NAT on PREROUTING.\n");
-+#else
-+	printk(KERN_INFO "\tHooking IMQ after NAT on PREROUTING.\n");
-+#endif
-+#if defined(CONFIG_IMQ_BEHAVIOR_AB) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	printk(KERN_INFO "\tHooking IMQ before NAT on POSTROUTING.\n");
-+#else
-+	printk(KERN_INFO "\tHooking IMQ after NAT on POSTROUTING.\n");
-+#endif
-+
-+	return 0;
-+}
-+
-+static void __exit imq_unhook(void)
-+{
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	nf_unregister_hook(&imq_ingress_ipv6);
-+	nf_unregister_hook(&imq_egress_ipv6);
-+#endif
-+	nf_unregister_hook(&imq_ingress_ipv4);
-+	nf_unregister_hook(&imq_egress_ipv4);
-+
-+	nf_unregister_queue_imq_handler();
-+}
-+
-+static void __exit imq_cleanup_devs(void)
-+{
-+	rtnl_link_unregister(&imq_link_ops);
-+	memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
-+}
-+
-+static void __exit imq_exit_module(void)
-+{
-+	imq_unhook();
-+	imq_cleanup_devs();
-+	printk(KERN_INFO "IMQ driver unloaded successfully.\n");
-+}
-+
-+module_init(imq_init_module);
-+module_exit(imq_exit_module);
-+
-+module_param(numdevs, int, 0);
-+MODULE_PARM_DESC(numdevs, "number of IMQ devices (how many imq* devices will "
-+			"be created)");
-+MODULE_AUTHOR("http://www.linuximq.net");
-+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See "
-+			"http://www.linuximq.net/ for more information.");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS_RTNL_LINK("imq");
-+
---- a/drivers/net/Kconfig
-+++ b/drivers/net/Kconfig
-@@ -109,6 +109,129 @@ config EQUALIZER
- 	  To compile this driver as a module, choose M here: the module
- 	  will be called eql.  If unsure, say N.
- 
-+config IMQ
-+	tristate "IMQ (intermediate queueing device) support"
-+	depends on NETDEVICES && NETFILTER
-+	---help---
-+	  The IMQ device(s) is used as placeholder for QoS queueing
-+	  disciplines. Every packet entering/leaving the IP stack can be
-+	  directed through the IMQ device where it's enqueued/dequeued to the
-+	  attached qdisc. This allows you to treat network devices as classes
-+	  and distribute bandwidth among them. Iptables is used to specify
-+	  through which IMQ device, if any, packets travel.
-+
-+	  More information at: http://www.linuximq.net/
-+
-+	  To compile this driver as a module, choose M here: the module
-+	  will be called imq.  If unsure, say N.
-+
-+choice
-+	prompt "IMQ behavior (PRE/POSTROUTING)"
-+	depends on IMQ
-+	default IMQ_BEHAVIOR_AB
-+	help
-+
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		IMQ can work in any of the following ways:
-+
-+		    PREROUTING   |      POSTROUTING
-+		-----------------|-------------------
-+		#1  After NAT    |      After NAT
-+		#2  After NAT    |      Before NAT
-+		#3  Before NAT   |      After NAT
-+		#4  Before NAT   |      Before NAT
-+
-+		The default behavior is to hook before NAT on PREROUTING
-+		and after NAT on POSTROUTING (#3).
-+
-+		This settings are specially usefull when trying to use IMQ
-+		to shape NATed clients.
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_AA
-+	bool "IMQ AA"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   After NAT
-+		POSTROUTING:  After NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_AB
-+	bool "IMQ AB"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   After NAT
-+		POSTROUTING:  Before NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_BA
-+	bool "IMQ BA"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   Before NAT
-+		POSTROUTING:  After NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_BB
-+	bool "IMQ BB"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   Before NAT
-+		POSTROUTING:  Before NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+endchoice
-+
-+config IMQ_NUM_DEVS
-+
-+	int "Number of IMQ devices"
-+	range 2 16
-+	depends on IMQ
-+	default "16"
-+	help
-+
-+		This settings defines how many IMQ devices will be
-+		created.
-+
-+		The default value is 16.
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
- config TUN
- 	tristate "Universal TUN/TAP device driver support"
- 	select CRC32
---- a/drivers/net/Makefile
-+++ b/drivers/net/Makefile
-@@ -165,6 +165,7 @@ obj-$(CONFIG_SLHC) += slhc.o
- obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
- 
- obj-$(CONFIG_DUMMY) += dummy.o
-+obj-$(CONFIG_IMQ) += imq.o
- obj-$(CONFIG_IFB) += ifb.o
- obj-$(CONFIG_MACVLAN) += macvlan.o
- obj-$(CONFIG_DE600) += de600.o
---- /dev/null
-+++ b/include/linux/imq.h
-@@ -0,0 +1,13 @@
-+#ifndef _IMQ_H
-+#define _IMQ_H
-+
-+/* IFMASK (16 device indexes, 0 to 15) and flag(s) fit in 5 bits */
-+#define IMQ_F_BITS	5
-+
-+#define IMQ_F_IFMASK	0x0f
-+#define IMQ_F_ENQUEUE	0x10
-+
-+#define IMQ_MAX_DEVS	(IMQ_F_IFMASK + 1)
-+
-+#endif /* _IMQ_H */
-+
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -1168,6 +1168,7 @@ extern int		dev_alloc_name(struct net_de
- extern int		dev_open(struct net_device *dev);
- extern int		dev_close(struct net_device *dev);
- extern void		dev_disable_lro(struct net_device *dev);
-+extern struct netdev_queue *dev_pick_tx(struct net_device *dev, struct sk_buff *skb);
- extern int		dev_queue_xmit(struct sk_buff *skb);
- extern int		register_netdevice(struct net_device *dev);
- extern void		unregister_netdevice_queue(struct net_device *dev,
---- /dev/null
-+++ b/include/linux/netfilter/xt_IMQ.h
-@@ -0,0 +1,9 @@
-+#ifndef _XT_IMQ_H
-+#define _XT_IMQ_H
-+
-+struct xt_imq_info {
-+	unsigned int todev;     /* target imq device */
-+};
-+
-+#endif /* _XT_IMQ_H */
-+
---- /dev/null
-+++ b/include/linux/netfilter_ipv4/ipt_IMQ.h
-@@ -0,0 +1,10 @@
-+#ifndef _IPT_IMQ_H
-+#define _IPT_IMQ_H
-+
-+/* Backwards compatibility for old userspace */
-+#include <linux/netfilter/xt_IMQ.h>
-+
-+#define ipt_imq_info xt_imq_info
-+
-+#endif /* _IPT_IMQ_H */
-+
---- /dev/null
-+++ b/include/linux/netfilter_ipv6/ip6t_IMQ.h
-@@ -0,0 +1,10 @@
-+#ifndef _IP6T_IMQ_H
-+#define _IP6T_IMQ_H
-+
-+/* Backwards compatibility for old userspace */
-+#include <linux/netfilter/xt_IMQ.h>
-+
-+#define ip6t_imq_info xt_imq_info
-+
-+#endif /* _IP6T_IMQ_H */
-+
---- a/include/linux/skbuff.h
-+++ b/include/linux/skbuff.h
-@@ -29,6 +29,9 @@
- #include <linux/rcupdate.h>
- #include <linux/dmaengine.h>
- #include <linux/hrtimer.h>
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+#include <linux/imq.h>
-+#endif
- 
- /* Don't change this without changing skb_csum_unnecessary! */
- #define CHECKSUM_NONE 0
-@@ -327,6 +330,9 @@
- 	 * first. This is owned by whoever has the skb queued ATM.
- 	 */
- 	char			cb[48] __aligned(8);
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	void                    *cb_next;
-+#endif
- 
- 	unsigned long		_skb_dst;
- #ifdef CONFIG_XFRM
-@@ -363,6 +369,9 @@
- 	struct nf_conntrack	*nfct;
- 	struct sk_buff		*nfct_reasm;
- #endif
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	struct nf_queue_entry	*nf_queue_entry;
-+#endif
- #ifdef CONFIG_BRIDGE_NETFILTER
- 	struct nf_bridge_info	*nf_bridge;
- #endif
-@@ -384,6 +393,10 @@
- 
- 	/* 0/14 bit hole */
- 
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	__u8			imq_flags:IMQ_F_BITS;
-+#endif
-+
- #ifdef CONFIG_NET_DMA
- 	dma_cookie_t		dma_cookie;
- #endif
-@@ -432,6 +445,12 @@
- 	return (struct rtable *)skb_dst(skb);
- }
- 
-+
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+extern int skb_save_cb(struct sk_buff *skb);
-+extern int skb_restore_cb(struct sk_buff *skb);
-+#endif
-+
- extern void kfree_skb(struct sk_buff *skb);
- extern void consume_skb(struct sk_buff *skb);
- extern void	       __kfree_skb(struct sk_buff *skb);
-@@ -1976,6 +1995,10 @@
- 	dst->nfct_reasm = src->nfct_reasm;
- 	nf_conntrack_get_reasm(src->nfct_reasm);
- #endif
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	dst->imq_flags = src->imq_flags;
-+	dst->nf_queue_entry = src->nf_queue_entry;
-+#endif
- #ifdef CONFIG_BRIDGE_NETFILTER
- 	dst->nf_bridge  = src->nf_bridge;
- 	nf_bridge_get(src->nf_bridge);
---- a/include/net/netfilter/nf_queue.h
-+++ b/include/net/netfilter/nf_queue.h
-@@ -13,6 +13,12 @@ struct nf_queue_entry {
- 	struct net_device	*indev;
- 	struct net_device	*outdev;
- 	int			(*okfn)(struct sk_buff *);
-+
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	int			(*next_outfn)(struct nf_queue_entry *entry,
-+					      unsigned int queuenum);
-+	unsigned int		next_queuenum;
-+#endif
- };
- 
- #define nf_queue_entry_reroute(x) ((void *)x + sizeof(struct nf_queue_entry))
-@@ -30,5 +36,11 @@ extern int nf_unregister_queue_handler(u
- 				       const struct nf_queue_handler *qh);
- extern void nf_unregister_queue_handlers(const struct nf_queue_handler *qh);
- extern void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict);
-+extern void nf_queue_entry_release_refs(struct nf_queue_entry *entry);
-+
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+extern void nf_register_queue_imq_handler(const struct nf_queue_handler *qh);
-+extern void nf_unregister_queue_imq_handler(void);
-+#endif
- 
- #endif /* _NF_QUEUE_H */
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -97,6 +97,9 @@
- #include <net/net_namespace.h>
- #include <net/sock.h>
- #include <linux/rtnetlink.h>
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+#include <linux/imq.h>
-+#endif
- #include <linux/proc_fs.h>
- #include <linux/seq_file.h>
- #include <linux/stat.h>
-@@ -1810,7 +1813,11 @@ int dev_hard_start_xmit(struct sk_buff *
- 	int rc = NETDEV_TX_OK;
- 
- 	if (likely(!skb->next)) {
--		if (!list_empty(&ptype_all))
-+		if (!list_empty(&ptype_all)
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+		    && !(skb->imq_flags & IMQ_F_ENQUEUE)
-+#endif
-+		    )
- 			dev_queue_xmit_nit(skb, dev);
- 
- 		if (netif_needs_gso(dev, skb)) {
-@@ -1912,8 +1919,7 @@ static inline u16 dev_cap_txqueue(struct
- 	return queue_index;
- }
- 
--static struct netdev_queue *dev_pick_tx(struct net_device *dev,
--					struct sk_buff *skb)
-+struct netdev_queue *dev_pick_tx(struct net_device *dev, struct sk_buff *skb)
- {
- 	u16 queue_index;
- 	struct sock *sk = skb->sk;
-@@ -1939,6 +1945,7 @@ static struct netdev_queue *dev_pick_tx(
- 	skb_set_queue_mapping(skb, queue_index);
- 	return netdev_get_tx_queue(dev, queue_index);
- }
-+EXPORT_SYMBOL(dev_pick_tx);
- 
- static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q,
- 				 struct net_device *dev,
---- a/net/core/skbuff.c
-+++ b/net/core/skbuff.c
-@@ -72,6 +72,9 @@
- 
- static struct kmem_cache *skbuff_head_cache __read_mostly;
- static struct kmem_cache *skbuff_fclone_cache __read_mostly;
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+static struct kmem_cache *skbuff_cb_store_cache __read_mostly;
-+#endif
- 
- static void sock_pipe_buf_release(struct pipe_inode_info *pipe,
- 				  struct pipe_buffer *buf)
-@@ -91,6 +94,83 @@ static int sock_pipe_buf_steal(struct pi
- 	return 1;
- }
- 
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+/* Control buffer save/restore for IMQ devices */
-+struct skb_cb_table {
-+	void			*cb_next;
-+	atomic_t		refcnt;
-+	char      		cb[48];
-+};
-+
-+static DEFINE_SPINLOCK(skb_cb_store_lock);
-+
-+int skb_save_cb(struct sk_buff *skb)
-+{
-+	struct skb_cb_table *next;
-+
-+	next = kmem_cache_alloc(skbuff_cb_store_cache, GFP_ATOMIC);
-+	if (!next)
-+		return -ENOMEM;
-+
-+	BUILD_BUG_ON(sizeof(skb->cb) != sizeof(next->cb));
-+
-+	memcpy(next->cb, skb->cb, sizeof(skb->cb));
-+	next->cb_next = skb->cb_next;
-+
-+	atomic_set(&next->refcnt, 1);
-+
-+	skb->cb_next = next;
-+	return 0;
-+}
-+EXPORT_SYMBOL(skb_save_cb);
-+
-+int skb_restore_cb(struct sk_buff *skb)
-+{
-+	struct skb_cb_table *next;
-+
-+	if (!skb->cb_next)
-+		return 0;
-+
-+	next = skb->cb_next;
-+
-+	BUILD_BUG_ON(sizeof(skb->cb) != sizeof(next->cb));
-+
-+	memcpy(skb->cb, next->cb, sizeof(skb->cb));
-+	skb->cb_next = next->cb_next;
-+
-+	spin_lock(&skb_cb_store_lock);
-+
-+	if (atomic_dec_and_test(&next->refcnt)) {
-+		kmem_cache_free(skbuff_cb_store_cache, next);
-+	}
-+
-+	spin_unlock(&skb_cb_store_lock);
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL(skb_restore_cb);
-+
-+static void skb_copy_stored_cb(struct sk_buff *new, const struct sk_buff *__old)
-+{
-+	struct skb_cb_table *next;
-+	struct sk_buff *old;
-+
-+	if (!__old->cb_next) {
-+		new->cb_next = NULL;
-+		return;
-+	}
-+
-+	spin_lock(&skb_cb_store_lock);
-+
-+	old = (struct sk_buff *)__old;
-+
-+	next = old->cb_next;
-+	atomic_inc(&next->refcnt);
-+	new->cb_next = next;
-+
-+	spin_unlock(&skb_cb_store_lock);
-+}
-+#endif
- 
- /* Pipe buffer operations for a socket. */
- static const struct pipe_buf_operations sock_pipe_buf_ops = {
-@@ -398,6 +478,26 @@ static void skb_release_head_state(struc
- 		WARN_ON(in_irq());
- 		skb->destructor(skb);
- 	}
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	/* This should not happen. When it does, avoid memleak by restoring
-+	the chain of cb-backups. */
-+	while(skb->cb_next != NULL) {
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "IMQ: kfree_skb: skb->cb_next: "
-+				"%08x\n", (unsigned int)skb->cb_next);
-+
-+		skb_restore_cb(skb);
-+	}
-+	/* This should not happen either, nf_queue_entry is nullified in
-+	 * imq_dev_xmit(). If we have non-NULL nf_queue_entry then we are
-+	 * leaking entry pointers, maybe memory. We don't know if this is
-+	 * pointer to already freed memory, or should this be freed.
-+	 * If this happens we need to add refcounting, etc for nf_queue_entry.
-+	 */
-+	if (skb->nf_queue_entry && net_ratelimit())
-+		printk(KERN_WARNING
-+				"IMQ: kfree_skb: skb->nf_queue_entry != NULL");
-+#endif
- #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
- 	nf_conntrack_put(skb->nfct);
- 	nf_conntrack_put_reasm(skb->nfct_reasm);
-@@ -538,6 +638,9 @@ static void __copy_skb_header(struct sk_
- 	new->sp			= secpath_get(old->sp);
- #endif
- 	memcpy(new->cb, old->cb, sizeof(old->cb));
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	skb_copy_stored_cb(new, old);
-+#endif
- 	new->csum		= old->csum;
- 	new->local_df		= old->local_df;
- 	new->pkt_type		= old->pkt_type;
-@@ -2779,6 +2882,13 @@ void __init skb_init(void)
- 						0,
- 						SLAB_HWCACHE_ALIGN|SLAB_PANIC,
- 						NULL);
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	skbuff_cb_store_cache = kmem_cache_create("skbuff_cb_store_cache",
-+						  sizeof(struct skb_cb_table),
-+						  0,
-+						  SLAB_HWCACHE_ALIGN|SLAB_PANIC,
-+						  NULL);
-+#endif
- }
- 
- /**
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -396,6 +396,18 @@ config NETFILTER_XT_TARGET_LED
- 	  For more information on the LEDs available on your system, see
- 	  Documentation/leds-class.txt
- 
-+config NETFILTER_XT_TARGET_IMQ
-+        tristate '"IMQ" target support'
-+	depends on NETFILTER_XTABLES
-+	depends on IP_NF_MANGLE || IP6_NF_MANGLE
-+	select IMQ
-+	default m if NETFILTER_ADVANCED=n
-+        help
-+          This option adds a `IMQ' target which is used to specify if and
-+          to which imq device packets should get enqueued/dequeued.
-+
-+          To compile it as a module, choose M here.  If unsure, say N.
-+
- config NETFILTER_XT_TARGET_MARK
- 	tristate '"MARK" target support'
- 	default m if NETFILTER_ADVANCED=n
---- a/net/netfilter/Makefile
-+++ b/net/netfilter/Makefile
-@@ -46,6 +46,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_CONNMAR
- obj-$(CONFIG_NETFILTER_XT_TARGET_CONNSECMARK) += xt_CONNSECMARK.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_HL) += xt_HL.o
-+obj-$(CONFIG_NETFILTER_XT_TARGET_IMQ) += xt_IMQ.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_LED) += xt_LED.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_MARK) += xt_MARK.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_NFLOG) += xt_NFLOG.o
---- a/net/netfilter/nf_queue.c
-+++ b/net/netfilter/nf_queue.c
-@@ -20,6 +20,26 @@ static const struct nf_queue_handler *qu
- 
- static DEFINE_MUTEX(queue_handler_mutex);
- 
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+static const struct nf_queue_handler *queue_imq_handler;
-+
-+void nf_register_queue_imq_handler(const struct nf_queue_handler *qh)
-+{
-+	mutex_lock(&queue_handler_mutex);
-+	rcu_assign_pointer(queue_imq_handler, qh);
-+	mutex_unlock(&queue_handler_mutex);
-+}
-+EXPORT_SYMBOL(nf_register_queue_imq_handler);
-+
-+void nf_unregister_queue_imq_handler(void)
-+{
-+	mutex_lock(&queue_handler_mutex);
-+	rcu_assign_pointer(queue_imq_handler, NULL);
-+	mutex_unlock(&queue_handler_mutex);
-+}
-+EXPORT_SYMBOL(nf_unregister_queue_imq_handler);
-+#endif
-+
- /* return EBUSY when somebody else is registered, return EEXIST if the
-  * same handler is registered, return 0 in case of success. */
- int nf_register_queue_handler(u_int8_t pf, const struct nf_queue_handler *qh)
-@@ -80,7 +100,7 @@ void nf_unregister_queue_handlers(const 
- }
- EXPORT_SYMBOL_GPL(nf_unregister_queue_handlers);
- 
--static void nf_queue_entry_release_refs(struct nf_queue_entry *entry)
-+void nf_queue_entry_release_refs(struct nf_queue_entry *entry)
- {
- 	/* Release those devices we held, or Alexey will kill me. */
- 	if (entry->indev)
-@@ -100,6 +120,7 @@ static void nf_queue_entry_release_refs(
- 	/* Drop reference to owner of hook which queued us. */
- 	module_put(entry->elem->owner);
- }
-+EXPORT_SYMBOL_GPL(nf_queue_entry_release_refs);
- 
- /*
-  * Any packet that leaves via this function must come back
-@@ -121,12 +142,26 @@ static int __nf_queue(struct sk_buff *sk
- #endif
- 	const struct nf_afinfo *afinfo;
- 	const struct nf_queue_handler *qh;
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	const struct nf_queue_handler *qih = NULL;
-+#endif
- 
- 	/* QUEUE == DROP if noone is waiting, to be safe. */
- 	rcu_read_lock();
- 
- 	qh = rcu_dereference(queue_handler[pf]);
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	if (pf == PF_INET || pf == PF_INET6)
-+#else
-+	if (pf == PF_INET)
-+#endif
-+		qih = rcu_dereference(queue_imq_handler);
-+
-+	if (!qh && !qih)
-+#else /* !IMQ */
- 	if (!qh)
-+#endif
- 		goto err_unlock;
- 
- 	afinfo = nf_get_afinfo(pf);
-@@ -145,6 +180,10 @@ static int __nf_queue(struct sk_buff *sk
- 		.indev	= indev,
- 		.outdev	= outdev,
- 		.okfn	= okfn,
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+		.next_outfn = qh ? qh->outfn : NULL,
-+		.next_queuenum = queuenum,
-+#endif
- 	};
- 
- 	/* If it's going away, ignore hook. */
-@@ -170,8 +209,19 @@ static int __nf_queue(struct sk_buff *sk
- 	}
- #endif
- 	afinfo->saveroute(skb, entry);
-+
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	if (qih) {
-+		status = qih->outfn(entry, queuenum);
-+		goto imq_skip_queue;
-+	}
-+#endif
-+
- 	status = qh->outfn(entry, queuenum);
- 
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+imq_skip_queue:
-+#endif
- 	rcu_read_unlock();
- 
- 	if (status < 0) {
---- /dev/null
-+++ b/net/netfilter/xt_IMQ.c
-@@ -0,0 +1,73 @@
-+/*
-+ * This target marks packets to be enqueued to an imq device
-+ */
-+#include <linux/module.h>
-+#include <linux/skbuff.h>
-+#include <linux/netfilter/x_tables.h>
-+#include <linux/netfilter/xt_IMQ.h>
-+#include <linux/imq.h>
-+
-+static unsigned int imq_target(struct sk_buff *pskb,
-+				const struct xt_target_param *par)
-+{
-+	const struct xt_imq_info *mr = par->targinfo;
-+
-+	pskb->imq_flags = (mr->todev & IMQ_F_IFMASK) | IMQ_F_ENQUEUE;
-+
-+	return XT_CONTINUE;
-+}
-+
-+static bool imq_checkentry(const struct xt_tgchk_param *par)
-+{
-+	struct xt_imq_info *mr = par->targinfo;
-+
-+	if (mr->todev > IMQ_MAX_DEVS - 1) {
-+		printk(KERN_WARNING
-+		       "IMQ: invalid device specified, highest is %u\n",
-+		       IMQ_MAX_DEVS - 1);
-+		return 0;
-+	}
-+
-+	return 1;
-+}
-+
-+static struct xt_target xt_imq_reg[] __read_mostly = {
-+	{
-+		.name           = "IMQ",
-+		.family		= AF_INET,
-+		.checkentry     = imq_checkentry,
-+		.target         = imq_target,
-+		.targetsize	= sizeof(struct xt_imq_info),
-+		.table		= "mangle",
-+		.me             = THIS_MODULE
-+	},
-+	{
-+		.name           = "IMQ",
-+		.family		= AF_INET6,
-+		.checkentry     = imq_checkentry,
-+		.target         = imq_target,
-+		.targetsize	= sizeof(struct xt_imq_info),
-+		.table		= "mangle",
-+		.me             = THIS_MODULE
-+	},
-+};
-+
-+static int __init imq_init(void)
-+{
-+	return xt_register_targets(xt_imq_reg, ARRAY_SIZE(xt_imq_reg));
-+}
-+
-+static void __exit imq_fini(void)
-+{
-+	xt_unregister_targets(xt_imq_reg, ARRAY_SIZE(xt_imq_reg));
-+}
-+
-+module_init(imq_init);
-+module_exit(imq_fini);
-+
-+MODULE_AUTHOR("http://www.linuximq.net");
-+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS("ipt_IMQ");
-+MODULE_ALIAS("ip6t_IMQ");
-+
diff --git a/target/linux/generic-2.6/patches-2.6.34/180-netfilter_depends.patch b/target/linux/generic-2.6/patches-2.6.34/180-netfilter_depends.patch
deleted file mode 100644
index fc00d159c..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/180-netfilter_depends.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -160,7 +160,6 @@ config NF_CONNTRACK_FTP
- 
- config NF_CONNTRACK_H323
- 	tristate "H.323 protocol support"
--	depends on (IPV6 || IPV6=n)
- 	depends on NETFILTER_ADVANCED
- 	help
- 	  H.323 is a VoIP signalling protocol from ITU-T. As one of the most
-@@ -505,7 +504,6 @@ config NETFILTER_XT_TARGET_SECMARK
- 
- config NETFILTER_XT_TARGET_TCPMSS
- 	tristate '"TCPMSS" target support'
--	depends on (IPV6 || IPV6=n)
- 	default m if NETFILTER_ADVANCED=n
- 	---help---
- 	  This option adds a `TCPMSS' target, which allows you to alter the
diff --git a/target/linux/generic-2.6/patches-2.6.34/190-netfilter_rtsp.patch b/target/linux/generic-2.6/patches-2.6.34/190-netfilter_rtsp.patch
deleted file mode 100644
index 29e82084c..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/190-netfilter_rtsp.patch
+++ /dev/null
@@ -1,1366 +0,0 @@
---- /dev/null
-+++ b/include/linux/netfilter/nf_conntrack_rtsp.h
-@@ -0,0 +1,63 @@
-+/*
-+ * RTSP extension for IP connection tracking.
-+ * (C) 2003 by Tom Marshall <tmarshall at real.com>
-+ * based on ip_conntrack_irc.h
-+ *
-+ *      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.
-+ */
-+#ifndef _IP_CONNTRACK_RTSP_H
-+#define _IP_CONNTRACK_RTSP_H
-+
-+//#define IP_NF_RTSP_DEBUG 1
-+#define IP_NF_RTSP_VERSION "0.6.21"
-+
-+#ifdef __KERNEL__
-+/* port block types */
-+typedef enum {
-+    pb_single,  /* client_port=x */
-+    pb_range,   /* client_port=x-y */
-+    pb_discon   /* client_port=x/y (rtspbis) */
-+} portblock_t;
-+
-+/* We record seq number and length of rtsp headers here, all in host order. */
-+
-+/*
-+ * This structure is per expected connection.  It is a member of struct
-+ * ip_conntrack_expect.  The TCP SEQ for the conntrack expect is stored
-+ * there and we are expected to only store the length of the data which
-+ * needs replaced.  If a packet contains multiple RTSP messages, we create
-+ * one expected connection per message.
-+ *
-+ * We use these variables to mark the entire header block.  This may seem
-+ * like overkill, but the nature of RTSP requires it.  A header may appear
-+ * multiple times in a message.  We must treat two Transport headers the
-+ * same as one Transport header with two entries.
-+ */
-+struct ip_ct_rtsp_expect
-+{
-+    u_int32_t   len;        /* length of header block */
-+    portblock_t pbtype;     /* Type of port block that was requested */
-+    u_int16_t   loport;     /* Port that was requested, low or first */
-+    u_int16_t   hiport;     /* Port that was requested, high or second */
-+#if 0
-+    uint        method;     /* RTSP method */
-+    uint        cseq;       /* CSeq from request */
-+#endif
-+};
-+
-+extern unsigned int (*nf_nat_rtsp_hook)(struct sk_buff *skb,
-+				 enum ip_conntrack_info ctinfo,
-+				 unsigned int matchoff, unsigned int matchlen,
-+				 struct ip_ct_rtsp_expect *prtspexp,
-+				 struct nf_conntrack_expect *exp);
-+
-+extern void (*nf_nat_rtsp_hook_expectfn)(struct nf_conn *ct, struct nf_conntrack_expect *exp);
-+
-+#define RTSP_PORT   554
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _IP_CONNTRACK_RTSP_H */
---- /dev/null
-+++ b/include/linux/netfilter_helpers.h
-@@ -0,0 +1,133 @@
-+/*
-+ * Helpers for netfiler modules.  This file provides implementations for basic
-+ * functions such as strncasecmp(), etc.
-+ *
-+ * gcc will warn for defined but unused functions, so we only include the
-+ * functions requested.  The following macros are used:
-+ *   NF_NEED_STRNCASECMP        nf_strncasecmp()
-+ *   NF_NEED_STRTOU16           nf_strtou16()
-+ *   NF_NEED_STRTOU32           nf_strtou32()
-+ */
-+#ifndef _NETFILTER_HELPERS_H
-+#define _NETFILTER_HELPERS_H
-+
-+/* Only include these functions for kernel code. */
-+#ifdef __KERNEL__
-+
-+#include <linux/ctype.h>
-+#define iseol(c) ( (c) == '\r' || (c) == '\n' )
-+
-+/*
-+ * The standard strncasecmp()
-+ */
-+#ifdef NF_NEED_STRNCASECMP
-+static int
-+nf_strncasecmp(const char* s1, const char* s2, u_int32_t len)
-+{
-+    if (s1 == NULL || s2 == NULL)
-+    {
-+        if (s1 == NULL && s2 == NULL)
-+        {
-+            return 0;
-+        }
-+        return (s1 == NULL) ? -1 : 1;
-+    }
-+    while (len > 0 && tolower(*s1) == tolower(*s2))
-+    {
-+        len--;
-+        s1++;
-+        s2++;
-+    }
-+    return ( (len == 0) ? 0 : (tolower(*s1) - tolower(*s2)) );
-+}
-+#endif /* NF_NEED_STRNCASECMP */
-+
-+/*
-+ * Parse a string containing a 16-bit unsigned integer.
-+ * Returns the number of chars used, or zero if no number is found.
-+ */
-+#ifdef NF_NEED_STRTOU16
-+static int
-+nf_strtou16(const char* pbuf, u_int16_t* pval)
-+{
-+    int n = 0;
-+
-+    *pval = 0;
-+    while (isdigit(pbuf[n]))
-+    {
-+        *pval = (*pval * 10) + (pbuf[n] - '0');
-+        n++;
-+    }
-+
-+    return n;
-+}
-+#endif /* NF_NEED_STRTOU16 */
-+
-+/*
-+ * Parse a string containing a 32-bit unsigned integer.
-+ * Returns the number of chars used, or zero if no number is found.
-+ */
-+#ifdef NF_NEED_STRTOU32
-+static int
-+nf_strtou32(const char* pbuf, u_int32_t* pval)
-+{
-+    int n = 0;
-+
-+    *pval = 0;
-+    while (pbuf[n] >= '0' && pbuf[n] <= '9')
-+    {
-+        *pval = (*pval * 10) + (pbuf[n] - '0');
-+        n++;
-+    }
-+
-+    return n;
-+}
-+#endif /* NF_NEED_STRTOU32 */
-+
-+/*
-+ * Given a buffer and length, advance to the next line and mark the current
-+ * line.
-+ */
-+#ifdef NF_NEED_NEXTLINE
-+static int
-+nf_nextline(char* p, uint len, uint* poff, uint* plineoff, uint* plinelen)
-+{
-+    uint    off = *poff;
-+    uint    physlen = 0;
-+
-+    if (off >= len)
-+    {
-+        return 0;
-+    }
-+
-+    while (p[off] != '\n')
-+    {
-+        if (len-off <= 1)
-+        {
-+            return 0;
-+        }
-+
-+        physlen++;
-+        off++;
-+    }
-+
-+    /* if we saw a crlf, physlen needs adjusted */
-+    if (physlen > 0 && p[off] == '\n' && p[off-1] == '\r')
-+    {
-+        physlen--;
-+    }
-+
-+    /* advance past the newline */
-+    off++;
-+
-+    *plineoff = *poff;
-+    *plinelen = physlen;
-+    *poff = off;
-+
-+    return 1;
-+}
-+#endif /* NF_NEED_NEXTLINE */
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _NETFILTER_HELPERS_H */
---- /dev/null
-+++ b/include/linux/netfilter_mime.h
-@@ -0,0 +1,89 @@
-+/*
-+ * MIME functions for netfilter modules.  This file provides implementations
-+ * for basic MIME parsing.  MIME headers are used in many protocols, such as
-+ * HTTP, RTSP, SIP, etc.
-+ *
-+ * gcc will warn for defined but unused functions, so we only include the
-+ * functions requested.  The following macros are used:
-+ *   NF_NEED_MIME_NEXTLINE      nf_mime_nextline()
-+ */
-+#ifndef _NETFILTER_MIME_H
-+#define _NETFILTER_MIME_H
-+
-+/* Only include these functions for kernel code. */
-+#ifdef __KERNEL__
-+
-+#include <linux/ctype.h>
-+
-+/*
-+ * Given a buffer and length, advance to the next line and mark the current
-+ * line.  If the current line is empty, *plinelen will be set to zero.  If
-+ * not, it will be set to the actual line length (including CRLF).
-+ *
-+ * 'line' in this context means logical line (includes LWS continuations).
-+ * Returns 1 on success, 0 on failure.
-+ */
-+#ifdef NF_NEED_MIME_NEXTLINE
-+static int
-+nf_mime_nextline(char* p, uint len, uint* poff, uint* plineoff, uint* plinelen)
-+{
-+    uint    off = *poff;
-+    uint    physlen = 0;
-+    int     is_first_line = 1;
-+
-+    if (off >= len)
-+    {
-+        return 0;
-+    }
-+
-+    do
-+    {
-+        while (p[off] != '\n')
-+        {
-+            if (len-off <= 1)
-+            {
-+                return 0;
-+            }
-+
-+            physlen++;
-+            off++;
-+        }
-+
-+        /* if we saw a crlf, physlen needs adjusted */
-+        if (physlen > 0 && p[off] == '\n' && p[off-1] == '\r')
-+        {
-+            physlen--;
-+        }
-+
-+        /* advance past the newline */
-+        off++;
-+
-+        /* check for an empty line */
-+        if (physlen == 0)
-+        {
-+            break;
-+        }
-+
-+        /* check for colon on the first physical line */
-+        if (is_first_line)
-+        {
-+            is_first_line = 0;
-+            if (memchr(p+(*poff), ':', physlen) == NULL)
-+            {
-+                return 0;
-+            }
-+        }
-+    }
-+    while (p[off] == ' ' || p[off] == '\t');
-+
-+    *plineoff = *poff;
-+    *plinelen = (physlen == 0) ? 0 : (off - *poff);
-+    *poff = off;
-+
-+    return 1;
-+}
-+#endif /* NF_NEED_MIME_NEXTLINE */
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _NETFILTER_MIME_H */
---- a/net/ipv4/netfilter/Makefile
-+++ b/net/ipv4/netfilter/Makefile
-@@ -26,6 +26,7 @@ obj-$(CONFIG_NF_NAT_AMANDA) += nf_nat_am
- obj-$(CONFIG_NF_NAT_FTP) += nf_nat_ftp.o
- obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o
- obj-$(CONFIG_NF_NAT_IRC) += nf_nat_irc.o
-+obj-$(CONFIG_NF_NAT_RTSP) += nf_nat_rtsp.o
- obj-$(CONFIG_NF_NAT_PPTP) += nf_nat_pptp.o
- obj-$(CONFIG_NF_NAT_SIP) += nf_nat_sip.o
- obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -267,6 +267,16 @@ config NF_CONNTRACK_TFTP
- 
- 	  To compile it as a module, choose M here.  If unsure, say N.
- 
-+config NF_CONNTRACK_RTSP
-+	tristate "RTSP protocol support"
-+	depends on NF_CONNTRACK
-+	help
-+		Support the RTSP protocol.  This allows UDP transports to be setup
-+		properly, including RTP and RDT.
-+
-+		If you want to compile it as a module, say 'M' here and read
-+		Documentation/modules.txt.  If unsure, say 'Y'.
-+
- config NF_CT_NETLINK
- 	tristate 'Connection tracking netlink interface'
- 	select NETFILTER_NETLINK
---- a/net/netfilter/Makefile
-+++ b/net/netfilter/Makefile
-@@ -33,6 +33,7 @@ obj-$(CONFIG_NF_CONNTRACK_PPTP) += nf_co
- obj-$(CONFIG_NF_CONNTRACK_SANE) += nf_conntrack_sane.o
- obj-$(CONFIG_NF_CONNTRACK_SIP) += nf_conntrack_sip.o
- obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_conntrack_tftp.o
-+obj-$(CONFIG_NF_CONNTRACK_RTSP) += nf_conntrack_rtsp.o
- 
- # transparent proxy support
- obj-$(CONFIG_NETFILTER_TPROXY) += nf_tproxy_core.o
---- a/net/ipv4/netfilter/Kconfig
-+++ b/net/ipv4/netfilter/Kconfig
-@@ -257,6 +257,11 @@ config NF_NAT_IRC
- 	depends on NF_CONNTRACK && NF_NAT
- 	default NF_NAT && NF_CONNTRACK_IRC
- 
-+config NF_NAT_RTSP
-+	tristate
-+ 	depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT
-+ 	default NF_NAT && NF_CONNTRACK_RTSP
-+
- config NF_NAT_TFTP
- 	tristate
- 	depends on NF_CONNTRACK && NF_NAT
---- /dev/null
-+++ b/net/netfilter/nf_conntrack_rtsp.c
-@@ -0,0 +1,517 @@
-+/*
-+ * RTSP extension for IP connection tracking
-+ * (C) 2003 by Tom Marshall <tmarshall at real.com>
-+ * based on ip_conntrack_irc.c
-+ *
-+ *      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.
-+ *
-+ * Module load syntax:
-+ *   insmod nf_conntrack_rtsp.o ports=port1,port2,...port<MAX_PORTS>
-+ *                              max_outstanding=n setup_timeout=secs
-+ *
-+ * If no ports are specified, the default will be port 554.
-+ *
-+ * With max_outstanding you can define the maximum number of not yet
-+ * answered SETUP requests per RTSP session (default 8).
-+ * With setup_timeout you can specify how long the system waits for
-+ * an expected data channel (default 300 seconds).
-+ *
-+ * 2005-02-13: Harald Welte <laforge at netfilter.org>
-+ * 	- port to 2.6
-+ * 	- update to recent post-2.6.11 api changes
-+ * 2006-09-14: Steven Van Acker <deepstar at singularity.be>
-+ *      - removed calls to NAT code from conntrack helper: NAT no longer needed to use rtsp-conntrack
-+ * 2007-04-18: Michael Guntsche <mike at it-loops.com>
-+ * 			- Port to new NF API
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/netfilter.h>
-+#include <linux/ip.h>
-+#include <linux/inet.h>
-+#include <net/tcp.h>
-+
-+#include <net/netfilter/nf_conntrack.h>
-+#include <net/netfilter/nf_conntrack_expect.h>
-+#include <net/netfilter/nf_conntrack_helper.h>
-+#include <linux/netfilter/nf_conntrack_rtsp.h>
-+
-+#define NF_NEED_STRNCASECMP
-+#define NF_NEED_STRTOU16
-+#define NF_NEED_STRTOU32
-+#define NF_NEED_NEXTLINE
-+#include <linux/netfilter_helpers.h>
-+#define NF_NEED_MIME_NEXTLINE
-+#include <linux/netfilter_mime.h>
-+
-+#include <linux/ctype.h>
-+#define MAX_SIMUL_SETUP 8 /* XXX: use max_outstanding */
-+#define INFOP(fmt, args...) printk(KERN_INFO "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#if 0
-+#define DEBUGP(fmt, args...) printk(KERN_DEBUG "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#else
-+#define DEBUGP(fmt, args...)
-+#endif
-+
-+#define MAX_PORTS 8
-+static int ports[MAX_PORTS];
-+static int num_ports = 0;
-+static int max_outstanding = 8;
-+static unsigned int setup_timeout = 300;
-+
-+MODULE_AUTHOR("Tom Marshall <tmarshall at real.com>");
-+MODULE_DESCRIPTION("RTSP connection tracking module");
-+MODULE_LICENSE("GPL");
-+module_param_array(ports, int, &num_ports, 0400);
-+MODULE_PARM_DESC(ports, "port numbers of RTSP servers");
-+module_param(max_outstanding, int, 0400);
-+MODULE_PARM_DESC(max_outstanding, "max number of outstanding SETUP requests per RTSP session");
-+module_param(setup_timeout, int, 0400);
-+MODULE_PARM_DESC(setup_timeout, "timeout on for unestablished data channels");
-+
-+static char *rtsp_buffer;
-+static DEFINE_SPINLOCK(rtsp_buffer_lock);
-+
-+unsigned int (*nf_nat_rtsp_hook)(struct sk_buff *skb,
-+				 enum ip_conntrack_info ctinfo,
-+				 unsigned int matchoff, unsigned int matchlen,struct ip_ct_rtsp_expect* prtspexp,
-+				 struct nf_conntrack_expect *exp);
-+void (*nf_nat_rtsp_hook_expectfn)(struct nf_conn *ct, struct nf_conntrack_expect *exp);
-+
-+EXPORT_SYMBOL_GPL(nf_nat_rtsp_hook);
-+
-+/*
-+ * Max mappings we will allow for one RTSP connection (for RTP, the number
-+ * of allocated ports is twice this value).  Note that SMIL burns a lot of
-+ * ports so keep this reasonably high.  If this is too low, you will see a
-+ * lot of "no free client map entries" messages.
-+ */
-+#define MAX_PORT_MAPS 16
-+
-+/*** default port list was here in the masq code: 554, 3030, 4040 ***/
-+
-+#define SKIP_WSPACE(ptr,len,off) while(off < len && isspace(*(ptr+off))) { off++; }
-+
-+/*
-+ * Parse an RTSP packet.
-+ *
-+ * Returns zero if parsing failed.
-+ *
-+ * Parameters:
-+ *  IN      ptcp        tcp data pointer
-+ *  IN      tcplen      tcp data len
-+ *  IN/OUT  ptcpoff     points to current tcp offset
-+ *  OUT     phdrsoff    set to offset of rtsp headers
-+ *  OUT     phdrslen    set to length of rtsp headers
-+ *  OUT     pcseqoff    set to offset of CSeq header
-+ *  OUT     pcseqlen    set to length of CSeq header
-+ */
-+static int
-+rtsp_parse_message(char* ptcp, uint tcplen, uint* ptcpoff,
-+                   uint* phdrsoff, uint* phdrslen,
-+                   uint* pcseqoff, uint* pcseqlen,
-+                   uint* transoff, uint* translen)
-+{
-+	uint    entitylen = 0;
-+	uint    lineoff;
-+	uint    linelen;
-+
-+	if (!nf_nextline(ptcp, tcplen, ptcpoff, &lineoff, &linelen))
-+		return 0;
-+
-+	*phdrsoff = *ptcpoff;
-+	while (nf_mime_nextline(ptcp, tcplen, ptcpoff, &lineoff, &linelen)) {
-+		if (linelen == 0) {
-+			if (entitylen > 0)
-+				*ptcpoff += min(entitylen, tcplen - *ptcpoff);
-+			break;
-+		}
-+		if (lineoff+linelen > tcplen) {
-+			INFOP("!! overrun !!\n");
-+			break;
-+		}
-+
-+		if (nf_strncasecmp(ptcp+lineoff, "CSeq:", 5) == 0) {
-+			*pcseqoff = lineoff;
-+			*pcseqlen = linelen;
-+		}
-+
-+		if (nf_strncasecmp(ptcp+lineoff, "Transport:", 10) == 0) {
-+			*transoff = lineoff;
-+			*translen = linelen;
-+		}
-+
-+		if (nf_strncasecmp(ptcp+lineoff, "Content-Length:", 15) == 0) {
-+			uint off = lineoff+15;
-+			SKIP_WSPACE(ptcp+lineoff, linelen, off);
-+			nf_strtou32(ptcp+off, &entitylen);
-+		}
-+	}
-+	*phdrslen = (*ptcpoff) - (*phdrsoff);
-+
-+	return 1;
-+}
-+
-+/*
-+ * Find lo/hi client ports (if any) in transport header
-+ * In:
-+ *   ptcp, tcplen = packet
-+ *   tranoff, tranlen = buffer to search
-+ *
-+ * Out:
-+ *   pport_lo, pport_hi = lo/hi ports (host endian)
-+ *
-+ * Returns nonzero if any client ports found
-+ *
-+ * Note: it is valid (and expected) for the client to request multiple
-+ * transports, so we need to parse the entire line.
-+ */
-+static int
-+rtsp_parse_transport(char* ptran, uint tranlen,
-+                     struct ip_ct_rtsp_expect* prtspexp)
-+{
-+	int     rc = 0;
-+	uint    off = 0;
-+
-+	if (tranlen < 10 || !iseol(ptran[tranlen-1]) ||
-+	    nf_strncasecmp(ptran, "Transport:", 10) != 0) {
-+		INFOP("sanity check failed\n");
-+		return 0;
-+	}
-+
-+	DEBUGP("tran='%.*s'\n", (int)tranlen, ptran);
-+	off += 10;
-+	SKIP_WSPACE(ptran, tranlen, off);
-+
-+	/* Transport: tran;field;field=val,tran;field;field=val,... */
-+	while (off < tranlen) {
-+		const char* pparamend;
-+		uint        nextparamoff;
-+
-+		pparamend = memchr(ptran+off, ',', tranlen-off);
-+		pparamend = (pparamend == NULL) ? ptran+tranlen : pparamend+1;
-+		nextparamoff = pparamend-ptran;
-+
-+		while (off < nextparamoff) {
-+			const char* pfieldend;
-+			uint        nextfieldoff;
-+
-+			pfieldend = memchr(ptran+off, ';', nextparamoff-off);
-+			nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
-+
-+			if (strncmp(ptran+off, "client_port=", 12) == 0) {
-+				u_int16_t   port;
-+				uint        numlen;
-+
-+				off += 12;
-+				numlen = nf_strtou16(ptran+off, &port);
-+				off += numlen;
-+				if (prtspexp->loport != 0 && prtspexp->loport != port)
-+					DEBUGP("multiple ports found, port %hu ignored\n", port);
-+				else {
-+					DEBUGP("lo port found : %hu\n", port);
-+					prtspexp->loport = prtspexp->hiport = port;
-+					if (ptran[off] == '-') {
-+						off++;
-+						numlen = nf_strtou16(ptran+off, &port);
-+						off += numlen;
-+						prtspexp->pbtype = pb_range;
-+						prtspexp->hiport = port;
-+
-+						// If we have a range, assume rtp:
-+						// loport must be even, hiport must be loport+1
-+						if ((prtspexp->loport & 0x0001) != 0 ||
-+						    prtspexp->hiport != prtspexp->loport+1) {
-+							DEBUGP("incorrect range: %hu-%hu, correcting\n",
-+							       prtspexp->loport, prtspexp->hiport);
-+							prtspexp->loport &= 0xfffe;
-+							prtspexp->hiport = prtspexp->loport+1;
-+						}
-+					} else if (ptran[off] == '/') {
-+						off++;
-+						numlen = nf_strtou16(ptran+off, &port);
-+						off += numlen;
-+						prtspexp->pbtype = pb_discon;
-+						prtspexp->hiport = port;
-+					}
-+					rc = 1;
-+				}
-+			}
-+
-+			/*
-+			 * Note we don't look for the destination parameter here.
-+			 * If we are using NAT, the NAT module will handle it.  If not,
-+			 * and the client is sending packets elsewhere, the expectation
-+			 * will quietly time out.
-+			 */
-+
-+			off = nextfieldoff;
-+		}
-+
-+		off = nextparamoff;
-+	}
-+
-+	return rc;
-+}
-+
-+void expected(struct nf_conn *ct, struct nf_conntrack_expect *exp)
-+{
-+    if(nf_nat_rtsp_hook_expectfn) {
-+        nf_nat_rtsp_hook_expectfn(ct,exp);
-+    }
-+}
-+
-+/*** conntrack functions ***/
-+
-+/* outbound packet: client->server */
-+
-+static inline int
-+help_out(struct sk_buff *skb, unsigned char *rb_ptr, unsigned int datalen,
-+                struct nf_conn *ct, enum ip_conntrack_info ctinfo)
-+{
-+	struct ip_ct_rtsp_expect expinfo;
-+
-+	int dir = CTINFO2DIR(ctinfo);   /* = IP_CT_DIR_ORIGINAL */
-+	//struct  tcphdr* tcph = (void*)iph + iph->ihl * 4;
-+	//uint    tcplen = pktlen - iph->ihl * 4;
-+	char*   pdata = rb_ptr;
-+	//uint    datalen = tcplen - tcph->doff * 4;
-+	uint    dataoff = 0;
-+	int ret = NF_ACCEPT;
-+
-+	struct nf_conntrack_expect *exp;
-+
-+	__be16 be_loport;
-+
-+	memset(&expinfo, 0, sizeof(expinfo));
-+
-+	while (dataoff < datalen) {
-+		uint    cmdoff = dataoff;
-+		uint    hdrsoff = 0;
-+		uint    hdrslen = 0;
-+		uint    cseqoff = 0;
-+		uint    cseqlen = 0;
-+		uint    transoff = 0;
-+		uint    translen = 0;
-+		uint    off;
-+
-+		if (!rtsp_parse_message(pdata, datalen, &dataoff,
-+					&hdrsoff, &hdrslen,
-+					&cseqoff, &cseqlen,
-+					&transoff, &translen))
-+			break;      /* not a valid message */
-+
-+		if (strncmp(pdata+cmdoff, "SETUP ", 6) != 0)
-+			continue;   /* not a SETUP message */
-+		DEBUGP("found a setup message\n");
-+
-+		off = 0;
-+		if(translen) {
-+			rtsp_parse_transport(pdata+transoff, translen, &expinfo);
-+		}
-+
-+		if (expinfo.loport == 0) {
-+			DEBUGP("no udp transports found\n");
-+			continue;   /* no udp transports found */
-+		}
-+
-+		DEBUGP("udp transport found, ports=(%d,%hu,%hu)\n",
-+		       (int)expinfo.pbtype, expinfo.loport, expinfo.hiport);
-+
-+		exp = nf_ct_expect_alloc(ct);
-+		if (!exp) {
-+			ret = NF_DROP;
-+			goto out;
-+		}
-+
-+		be_loport = htons(expinfo.loport);
-+
-+		nf_ct_expect_init(exp, NF_CT_EXPECT_CLASS_DEFAULT,
-+			ct->tuplehash[!dir].tuple.src.l3num,
-+			&ct->tuplehash[!dir].tuple.src.u3, &ct->tuplehash[!dir].tuple.dst.u3,
-+			IPPROTO_UDP, NULL, &be_loport);
-+
-+		exp->master = ct;
-+
-+		exp->expectfn = expected;
-+		exp->flags = 0;
-+
-+		if (expinfo.pbtype == pb_range) {
-+			DEBUGP("Changing expectation mask to handle multiple ports\n");
-+			exp->mask.src.u.udp.port  = 0xfffe;
-+		}
-+
-+		DEBUGP("expect_related %u.%u.%u.%u:%u-%u.%u.%u.%u:%u\n",
-+		       NIPQUAD(exp->tuple.src.u3.ip),
-+		       ntohs(exp->tuple.src.u.udp.port),
-+		       NIPQUAD(exp->tuple.dst.u3.ip),
-+		       ntohs(exp->tuple.dst.u.udp.port));
-+
-+		if (nf_nat_rtsp_hook)
-+			/* pass the request off to the nat helper */
-+			ret = nf_nat_rtsp_hook(skb, ctinfo, hdrsoff, hdrslen, &expinfo, exp);
-+		else if (nf_ct_expect_related(exp) != 0) {
-+			INFOP("nf_ct_expect_related failed\n");
-+			ret  = NF_DROP;
-+		}
-+		nf_ct_expect_put(exp);
-+		goto out;
-+	}
-+out:
-+
-+	return ret;
-+}
-+
-+
-+static inline int
-+help_in(struct sk_buff *skb, size_t pktlen,
-+ struct nf_conn* ct, enum ip_conntrack_info ctinfo)
-+{
-+ return NF_ACCEPT;
-+}
-+
-+static int help(struct sk_buff *skb, unsigned int protoff,
-+		struct nf_conn *ct, enum ip_conntrack_info ctinfo)
-+{
-+	struct tcphdr _tcph, *th;
-+	unsigned int dataoff, datalen;
-+	char *rb_ptr;
-+	int ret = NF_DROP;
-+
-+	/* Until there's been traffic both ways, don't look in packets. */
-+	if (ctinfo != IP_CT_ESTABLISHED &&
-+	    ctinfo != IP_CT_ESTABLISHED + IP_CT_IS_REPLY) {
-+		DEBUGP("conntrackinfo = %u\n", ctinfo);
-+		return NF_ACCEPT;
-+	}
-+
-+	/* Not whole TCP header? */
-+	th = skb_header_pointer(skb, protoff, sizeof(_tcph), &_tcph);
-+
-+	if (!th)
-+		return NF_ACCEPT;
-+
-+	/* No data ? */
-+	dataoff = protoff + th->doff*4;
-+	datalen = skb->len - dataoff;
-+	if (dataoff >= skb->len)
-+		return NF_ACCEPT;
-+
-+	spin_lock_bh(&rtsp_buffer_lock);
-+	rb_ptr = skb_header_pointer(skb, dataoff,
-+				    skb->len - dataoff, rtsp_buffer);
-+	BUG_ON(rb_ptr == NULL);
-+
-+#if 0
-+	/* Checksum invalid?  Ignore. */
-+	/* FIXME: Source route IP option packets --RR */
-+	if (tcp_v4_check(tcph, tcplen, iph->saddr, iph->daddr,
-+			 csum_partial((char*)tcph, tcplen, 0)))
-+	{
-+		DEBUGP("bad csum: %p %u %u.%u.%u.%u %u.%u.%u.%u\n",
-+		       tcph, tcplen, NIPQUAD(iph->saddr), NIPQUAD(iph->daddr));
-+		return NF_ACCEPT;
-+	}
-+#endif
-+
-+	switch (CTINFO2DIR(ctinfo)) {
-+	case IP_CT_DIR_ORIGINAL:
-+		ret = help_out(skb, rb_ptr, datalen, ct, ctinfo);
-+		break;
-+	case IP_CT_DIR_REPLY:
-+		DEBUGP("IP_CT_DIR_REPLY\n");
-+		/* inbound packet: server->client */
-+		ret = NF_ACCEPT;
-+		break;
-+	}
-+
-+	spin_unlock_bh(&rtsp_buffer_lock);
-+
-+	return ret;
-+}
-+
-+static struct nf_conntrack_helper rtsp_helpers[MAX_PORTS];
-+static char rtsp_names[MAX_PORTS][10];
-+static struct nf_conntrack_expect_policy rtsp_expect_policy;
-+
-+/* This function is intentionally _NOT_ defined as __exit */
-+static void
-+fini(void)
-+{
-+	int i;
-+	for (i = 0; i < num_ports; i++) {
-+		DEBUGP("unregistering port %d\n", ports[i]);
-+		nf_conntrack_helper_unregister(&rtsp_helpers[i]);
-+	}
-+	kfree(rtsp_buffer);
-+}
-+
-+static int __init
-+init(void)
-+{
-+	int i, ret;
-+	struct nf_conntrack_helper *hlpr;
-+	char *tmpname;
-+
-+	printk("nf_conntrack_rtsp v" IP_NF_RTSP_VERSION " loading\n");
-+
-+	if (max_outstanding < 1) {
-+		printk("nf_conntrack_rtsp: max_outstanding must be a positive integer\n");
-+		return -EBUSY;
-+	}
-+	if (setup_timeout < 0) {
-+		printk("nf_conntrack_rtsp: setup_timeout must be a positive integer\n");
-+		return -EBUSY;
-+	}
-+
-+	rtsp_expect_policy.max_expected = max_outstanding;
-+	rtsp_expect_policy.timeout = setup_timeout;
-+
-+	rtsp_buffer = kmalloc(65536, GFP_KERNEL);
-+	if (!rtsp_buffer)
-+		return -ENOMEM;
-+
-+	/* If no port given, default to standard rtsp port */
-+	if (ports[0] == 0) {
-+		ports[0] = RTSP_PORT;
-+	}
-+
-+	for (i = 0; (i < MAX_PORTS) && ports[i]; i++) {
-+		hlpr = &rtsp_helpers[i];
-+		memset(hlpr, 0, sizeof(struct nf_conntrack_helper));
-+		hlpr->tuple.src.u.tcp.port = htons(ports[i]);
-+		hlpr->tuple.dst.protonum = IPPROTO_TCP;
-+		hlpr->expect_policy = &rtsp_expect_policy;
-+		hlpr->me = THIS_MODULE;
-+		hlpr->help = help;
-+
-+		tmpname = &rtsp_names[i][0];
-+		if (ports[i] == RTSP_PORT) {
-+			sprintf(tmpname, "rtsp");
-+		} else {
-+			sprintf(tmpname, "rtsp-%d", i);
-+		}
-+		hlpr->name = tmpname;
-+
-+		DEBUGP("port #%d: %d\n", i, ports[i]);
-+
-+		ret = nf_conntrack_helper_register(hlpr);
-+
-+		if (ret) {
-+			printk("nf_conntrack_rtsp: ERROR registering port %d\n", ports[i]);
-+			fini();
-+			return -EBUSY;
-+		}
-+		num_ports++;
-+	}
-+	return 0;
-+}
-+
-+module_init(init);
-+module_exit(fini);
-+
-+EXPORT_SYMBOL(nf_nat_rtsp_hook_expectfn);
-+
---- /dev/null
-+++ b/net/ipv4/netfilter/nf_nat_rtsp.c
-@@ -0,0 +1,496 @@
-+/*
-+ * RTSP extension for TCP NAT alteration
-+ * (C) 2003 by Tom Marshall <tmarshall at real.com>
-+ * based on ip_nat_irc.c
-+ *
-+ *      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.
-+ *
-+ * Module load syntax:
-+ *      insmod nf_nat_rtsp.o ports=port1,port2,...port<MAX_PORTS>
-+ *                           stunaddr=<address>
-+ *                           destaction=[auto|strip|none]
-+ *
-+ * If no ports are specified, the default will be port 554 only.
-+ *
-+ * stunaddr specifies the address used to detect that a client is using STUN.
-+ * If this address is seen in the destination parameter, it is assumed that
-+ * the client has already punched a UDP hole in the firewall, so we don't
-+ * mangle the client_port.  If none is specified, it is autodetected.  It
-+ * only needs to be set if you have multiple levels of NAT.  It should be
-+ * set to the external address that the STUN clients detect.  Note that in
-+ * this case, it will not be possible for clients to use UDP with servers
-+ * between the NATs.
-+ *
-+ * If no destaction is specified, auto is used.
-+ *   destaction=auto:  strip destination parameter if it is not stunaddr.
-+ *   destaction=strip: always strip destination parameter (not recommended).
-+ *   destaction=none:  do not touch destination parameter (not recommended).
-+ */
-+
-+#include <linux/module.h>
-+#include <net/tcp.h>
-+#include <net/netfilter/nf_nat_helper.h>
-+#include <net/netfilter/nf_nat_rule.h>
-+#include <linux/netfilter/nf_conntrack_rtsp.h>
-+#include <net/netfilter/nf_conntrack_expect.h>
-+
-+#include <linux/inet.h>
-+#include <linux/ctype.h>
-+#define NF_NEED_STRNCASECMP
-+#define NF_NEED_STRTOU16
-+#include <linux/netfilter_helpers.h>
-+#define NF_NEED_MIME_NEXTLINE
-+#include <linux/netfilter_mime.h>
-+
-+#define INFOP(fmt, args...) printk(KERN_INFO "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#if 0
-+#define DEBUGP(fmt, args...) printk(KERN_DEBUG "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#else
-+#define DEBUGP(fmt, args...)
-+#endif
-+
-+#define MAX_PORTS       8
-+#define DSTACT_AUTO     0
-+#define DSTACT_STRIP    1
-+#define DSTACT_NONE     2
-+
-+static char*    stunaddr = NULL;
-+static char*    destaction = NULL;
-+
-+static u_int32_t extip = 0;
-+static int       dstact = 0;
-+
-+MODULE_AUTHOR("Tom Marshall <tmarshall at real.com>");
-+MODULE_DESCRIPTION("RTSP network address translation module");
-+MODULE_LICENSE("GPL");
-+module_param(stunaddr, charp, 0644);
-+MODULE_PARM_DESC(stunaddr, "Address for detecting STUN");
-+module_param(destaction, charp, 0644);
-+MODULE_PARM_DESC(destaction, "Action for destination parameter (auto/strip/none)");
-+
-+#define SKIP_WSPACE(ptr,len,off) while(off < len && isspace(*(ptr+off))) { off++; }
-+
-+/*** helper functions ***/
-+
-+static void
-+get_skb_tcpdata(struct sk_buff* skb, char** pptcpdata, uint* ptcpdatalen)
-+{
-+    struct iphdr*   iph  = ip_hdr(skb);
-+    struct tcphdr*  tcph = (void *)iph + ip_hdrlen(skb);
-+
-+    *pptcpdata = (char*)tcph +  tcph->doff*4;
-+    *ptcpdatalen = ((char*)skb_transport_header(skb) + skb->len) - *pptcpdata;
-+}
-+
-+/*** nat functions ***/
-+
-+/*
-+ * Mangle the "Transport:" header:
-+ *   - Replace all occurences of "client_port=<spec>"
-+ *   - Handle destination parameter
-+ *
-+ * In:
-+ *   ct, ctinfo = conntrack context
-+ *   skb        = packet
-+ *   tranoff    = Transport header offset from TCP data
-+ *   tranlen    = Transport header length (incl. CRLF)
-+ *   rport_lo   = replacement low  port (host endian)
-+ *   rport_hi   = replacement high port (host endian)
-+ *
-+ * Returns packet size difference.
-+ *
-+ * Assumes that a complete transport header is present, ending with CR or LF
-+ */
-+static int
-+rtsp_mangle_tran(enum ip_conntrack_info ctinfo,
-+                 struct nf_conntrack_expect* exp,
-+								 struct ip_ct_rtsp_expect* prtspexp,
-+                 struct sk_buff* skb, uint tranoff, uint tranlen)
-+{
-+    char*       ptcp;
-+    uint        tcplen;
-+    char*       ptran;
-+    char        rbuf1[16];      /* Replacement buffer (one port) */
-+    uint        rbuf1len;       /* Replacement len (one port) */
-+    char        rbufa[16];      /* Replacement buffer (all ports) */
-+    uint        rbufalen;       /* Replacement len (all ports) */
-+    u_int32_t   newip;
-+    u_int16_t   loport, hiport;
-+    uint        off = 0;
-+    uint        diff;           /* Number of bytes we removed */
-+
-+    struct nf_conn *ct = exp->master;
-+    struct nf_conntrack_tuple *t;
-+
-+    char    szextaddr[15+1];
-+    uint    extaddrlen;
-+    int     is_stun;
-+
-+    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+    ptran = ptcp+tranoff;
-+
-+    if (tranoff+tranlen > tcplen || tcplen-tranoff < tranlen ||
-+        tranlen < 10 || !iseol(ptran[tranlen-1]) ||
-+        nf_strncasecmp(ptran, "Transport:", 10) != 0)
-+    {
-+        INFOP("sanity check failed\n");
-+        return 0;
-+    }
-+    off += 10;
-+    SKIP_WSPACE(ptcp+tranoff, tranlen, off);
-+
-+    newip = ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip;
-+    t = &exp->tuple;
-+    t->dst.u3.ip = newip;
-+
-+    extaddrlen = extip ? sprintf(szextaddr, "%u.%u.%u.%u", NIPQUAD(extip))
-+                       : sprintf(szextaddr, "%u.%u.%u.%u", NIPQUAD(newip));
-+    DEBUGP("stunaddr=%s (%s)\n", szextaddr, (extip?"forced":"auto"));
-+
-+    rbuf1len = rbufalen = 0;
-+    switch (prtspexp->pbtype)
-+    {
-+    case pb_single:
-+        for (loport = prtspexp->loport; loport != 0; loport++) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(loport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                DEBUGP("using port %hu\n", loport);
-+                break;
-+            }
-+        }
-+        if (loport != 0)
-+        {
-+            rbuf1len = sprintf(rbuf1, "%hu", loport);
-+            rbufalen = sprintf(rbufa, "%hu", loport);
-+        }
-+        break;
-+    case pb_range:
-+        for (loport = prtspexp->loport; loport != 0; loport += 2) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(loport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                hiport = loport + ~exp->mask.src.u.udp.port;
-+                DEBUGP("using ports %hu-%hu\n", loport, hiport);
-+                break;
-+            }
-+        }
-+        if (loport != 0)
-+        {
-+            rbuf1len = sprintf(rbuf1, "%hu", loport);
-+            rbufalen = sprintf(rbufa, "%hu-%hu", loport, loport+1);
-+        }
-+        break;
-+    case pb_discon:
-+        for (loport = prtspexp->loport; loport != 0; loport++) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(loport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                DEBUGP("using port %hu (1 of 2)\n", loport);
-+                break;
-+            }
-+        }
-+        for (hiport = prtspexp->hiport; hiport != 0; hiport++) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(hiport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                DEBUGP("using port %hu (2 of 2)\n", hiport);
-+                break;
-+            }
-+        }
-+        if (loport != 0 && hiport != 0)
-+        {
-+            rbuf1len = sprintf(rbuf1, "%hu", loport);
-+            if (hiport == loport+1)
-+            {
-+                rbufalen = sprintf(rbufa, "%hu-%hu", loport, hiport);
-+            }
-+            else
-+            {
-+                rbufalen = sprintf(rbufa, "%hu/%hu", loport, hiport);
-+            }
-+        }
-+        break;
-+    }
-+
-+    if (rbuf1len == 0)
-+    {
-+        return 0;   /* cannot get replacement port(s) */
-+    }
-+
-+    /* Transport: tran;field;field=val,tran;field;field=val,... */
-+    while (off < tranlen)
-+    {
-+        uint        saveoff;
-+        const char* pparamend;
-+        uint        nextparamoff;
-+
-+        pparamend = memchr(ptran+off, ',', tranlen-off);
-+        pparamend = (pparamend == NULL) ? ptran+tranlen : pparamend+1;
-+        nextparamoff = pparamend-ptcp;
-+
-+        /*
-+         * We pass over each param twice.  On the first pass, we look for a
-+         * destination= field.  It is handled by the security policy.  If it
-+         * is present, allowed, and equal to our external address, we assume
-+         * that STUN is being used and we leave the client_port= field alone.
-+         */
-+        is_stun = 0;
-+        saveoff = off;
-+        while (off < nextparamoff)
-+        {
-+            const char* pfieldend;
-+            uint        nextfieldoff;
-+
-+            pfieldend = memchr(ptran+off, ';', nextparamoff-off);
-+            nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
-+
-+            if (dstact != DSTACT_NONE && strncmp(ptran+off, "destination=", 12) == 0)
-+            {
-+                if (strncmp(ptran+off+12, szextaddr, extaddrlen) == 0)
-+                {
-+                    is_stun = 1;
-+                }
-+                if (dstact == DSTACT_STRIP || (dstact == DSTACT_AUTO && !is_stun))
-+                {
-+                    diff = nextfieldoff-off;
-+                    if (!nf_nat_mangle_tcp_packet(skb, ct, ctinfo,
-+                                                         off, diff, NULL, 0))
-+                    {
-+                        /* mangle failed, all we can do is bail */
-+			nf_ct_unexpect_related(exp);
-+                        return 0;
-+                    }
-+                    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+                    ptran = ptcp+tranoff;
-+                    tranlen -= diff;
-+                    nextparamoff -= diff;
-+                    nextfieldoff -= diff;
-+                }
-+            }
-+
-+            off = nextfieldoff;
-+        }
-+        if (is_stun)
-+        {
-+            continue;
-+        }
-+        off = saveoff;
-+        while (off < nextparamoff)
-+        {
-+            const char* pfieldend;
-+            uint        nextfieldoff;
-+
-+            pfieldend = memchr(ptran+off, ';', nextparamoff-off);
-+            nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
-+
-+            if (strncmp(ptran+off, "client_port=", 12) == 0)
-+            {
-+                u_int16_t   port;
-+                uint        numlen;
-+                uint        origoff;
-+                uint        origlen;
-+                char*       rbuf    = rbuf1;
-+                uint        rbuflen = rbuf1len;
-+
-+                off += 12;
-+                origoff = (ptran-ptcp)+off;
-+                origlen = 0;
-+                numlen = nf_strtou16(ptran+off, &port);
-+                off += numlen;
-+                origlen += numlen;
-+                if (port != prtspexp->loport)
-+                {
-+                    DEBUGP("multiple ports found, port %hu ignored\n", port);
-+                }
-+                else
-+                {
-+                    if (ptran[off] == '-' || ptran[off] == '/')
-+                    {
-+                        off++;
-+                        origlen++;
-+                        numlen = nf_strtou16(ptran+off, &port);
-+                        off += numlen;
-+                        origlen += numlen;
-+                        rbuf = rbufa;
-+                        rbuflen = rbufalen;
-+                    }
-+
-+                    /*
-+                     * note we cannot just memcpy() if the sizes are the same.
-+                     * the mangle function does skb resizing, checks for a
-+                     * cloned skb, and updates the checksums.
-+                     *
-+                     * parameter 4 below is offset from start of tcp data.
-+                     */
-+                    diff = origlen-rbuflen;
-+                    if (!nf_nat_mangle_tcp_packet(skb, ct, ctinfo,
-+                                              origoff, origlen, rbuf, rbuflen))
-+                    {
-+                        /* mangle failed, all we can do is bail */
-+			nf_ct_unexpect_related(exp);
-+                        return 0;
-+                    }
-+                    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+                    ptran = ptcp+tranoff;
-+                    tranlen -= diff;
-+                    nextparamoff -= diff;
-+                    nextfieldoff -= diff;
-+                }
-+            }
-+
-+            off = nextfieldoff;
-+        }
-+
-+        off = nextparamoff;
-+    }
-+
-+    return 1;
-+}
-+
-+static uint
-+help_out(struct sk_buff *skb, enum ip_conntrack_info ctinfo,
-+	 unsigned int matchoff, unsigned int matchlen, struct ip_ct_rtsp_expect* prtspexp,
-+	 struct nf_conntrack_expect* exp)
-+{
-+    char*   ptcp;
-+    uint    tcplen;
-+    uint    hdrsoff;
-+    uint    hdrslen;
-+    uint    lineoff;
-+    uint    linelen;
-+    uint    off;
-+
-+    //struct iphdr* iph = (struct iphdr*)skb->nh.iph;
-+    //struct tcphdr* tcph = (struct tcphdr*)((void*)iph + iph->ihl*4);
-+
-+    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+    hdrsoff = matchoff;//exp->seq - ntohl(tcph->seq);
-+    hdrslen = matchlen;
-+    off = hdrsoff;
-+    DEBUGP("NAT rtsp help_out\n");
-+
-+    while (nf_mime_nextline(ptcp, hdrsoff+hdrslen, &off, &lineoff, &linelen))
-+    {
-+        if (linelen == 0)
-+        {
-+            break;
-+        }
-+        if (off > hdrsoff+hdrslen)
-+        {
-+            INFOP("!! overrun !!");
-+            break;
-+        }
-+        DEBUGP("hdr: len=%u, %.*s", linelen, (int)linelen, ptcp+lineoff);
-+
-+        if (nf_strncasecmp(ptcp+lineoff, "Transport:", 10) == 0)
-+        {
-+            uint oldtcplen = tcplen;
-+	    DEBUGP("hdr: Transport\n");
-+            if (!rtsp_mangle_tran(ctinfo, exp, prtspexp, skb, lineoff, linelen))
-+            {
-+		DEBUGP("hdr: Transport mangle failed");
-+                break;
-+            }
-+            get_skb_tcpdata(skb, &ptcp, &tcplen);
-+            hdrslen -= (oldtcplen-tcplen);
-+            off -= (oldtcplen-tcplen);
-+            lineoff -= (oldtcplen-tcplen);
-+            linelen -= (oldtcplen-tcplen);
-+            DEBUGP("rep: len=%u, %.*s", linelen, (int)linelen, ptcp+lineoff);
-+        }
-+    }
-+
-+    return NF_ACCEPT;
-+}
-+
-+static unsigned int
-+help(struct sk_buff *skb, enum ip_conntrack_info ctinfo,
-+     unsigned int matchoff, unsigned int matchlen, struct ip_ct_rtsp_expect* prtspexp,
-+     struct nf_conntrack_expect* exp)
-+{
-+    int dir = CTINFO2DIR(ctinfo);
-+    int rc = NF_ACCEPT;
-+
-+    switch (dir)
-+    {
-+    case IP_CT_DIR_ORIGINAL:
-+        rc = help_out(skb, ctinfo, matchoff, matchlen, prtspexp, exp);
-+        break;
-+    case IP_CT_DIR_REPLY:
-+	DEBUGP("unmangle ! %u\n", ctinfo);
-+    	/* XXX: unmangle */
-+	rc = NF_ACCEPT;
-+        break;
-+    }
-+    //UNLOCK_BH(&ip_rtsp_lock);
-+
-+    return rc;
-+}
-+
-+static void expected(struct nf_conn* ct, struct nf_conntrack_expect *exp)
-+{
-+    struct nf_nat_multi_range_compat mr;
-+    u_int32_t newdstip, newsrcip, newip;
-+
-+    struct nf_conn *master = ct->master;
-+
-+    newdstip = master->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
-+    newsrcip = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
-+    //FIXME (how to port that ?)
-+    //code from 2.4 : newip = (HOOK2MANIP(hooknum) == IP_NAT_MANIP_SRC) ? newsrcip : newdstip;
-+    newip = newdstip;
-+
-+    DEBUGP("newsrcip=%u.%u.%u.%u, newdstip=%u.%u.%u.%u, newip=%u.%u.%u.%u\n",
-+           NIPQUAD(newsrcip), NIPQUAD(newdstip), NIPQUAD(newip));
-+
-+    mr.rangesize = 1;
-+    // We don't want to manip the per-protocol, just the IPs.
-+    mr.range[0].flags = IP_NAT_RANGE_MAP_IPS;
-+    mr.range[0].min_ip = mr.range[0].max_ip = newip;
-+
-+    nf_nat_setup_info(ct, &mr.range[0], IP_NAT_MANIP_DST);
-+}
-+
-+
-+static void __exit fini(void)
-+{
-+	nf_nat_rtsp_hook = NULL;
-+        nf_nat_rtsp_hook_expectfn = NULL;
-+	synchronize_net();
-+}
-+
-+static int __init init(void)
-+{
-+	printk("nf_nat_rtsp v" IP_NF_RTSP_VERSION " loading\n");
-+
-+	BUG_ON(nf_nat_rtsp_hook);
-+	nf_nat_rtsp_hook = help;
-+        nf_nat_rtsp_hook_expectfn = &expected;
-+
-+	if (stunaddr != NULL)
-+		extip = in_aton(stunaddr);
-+
-+	if (destaction != NULL) {
-+	        if (strcmp(destaction, "auto") == 0)
-+			dstact = DSTACT_AUTO;
-+
-+		if (strcmp(destaction, "strip") == 0)
-+			dstact = DSTACT_STRIP;
-+
-+		if (strcmp(destaction, "none") == 0)
-+			dstact = DSTACT_NONE;
-+	}
-+
-+	return 0;
-+}
-+
-+module_init(init);
-+module_exit(fini);
diff --git a/target/linux/generic-2.6/patches-2.6.34/200-sched_esfq.patch b/target/linux/generic-2.6/patches-2.6.34/200-sched_esfq.patch
deleted file mode 100644
index 1d513580b..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/200-sched_esfq.patch
+++ /dev/null
@@ -1,795 +0,0 @@
---- a/include/linux/pkt_sched.h
-+++ b/include/linux/pkt_sched.h
-@@ -173,8 +173,37 @@ struct tc_sfq_xstats {
-  *
-  *	The only reason for this is efficiency, it is possible
-  *	to change these parameters in compile time.
-+ *
-+ *	If you need to play with these values, use esfq instead.
-  */
- 
-+/* ESFQ section */
-+
-+enum
-+{
-+        /* traditional */
-+	TCA_SFQ_HASH_CLASSIC,
-+	TCA_SFQ_HASH_DST,
-+	TCA_SFQ_HASH_SRC,
-+	TCA_SFQ_HASH_FWMARK,
-+	/* conntrack */
-+	TCA_SFQ_HASH_CTORIGDST,
-+	TCA_SFQ_HASH_CTORIGSRC,
-+	TCA_SFQ_HASH_CTREPLDST,
-+	TCA_SFQ_HASH_CTREPLSRC,
-+	TCA_SFQ_HASH_CTNATCHG,
-+};
-+
-+struct tc_esfq_qopt
-+{
-+	unsigned	quantum;	/* Bytes per round allocated to flow */
-+	int		perturb_period;	/* Period of hash perturbation */
-+	__u32		limit;		/* Maximal packets in queue */
-+	unsigned	divisor;	/* Hash divisor  */
-+	unsigned	flows;		/* Maximal number of flows  */
-+	unsigned	hash_kind;	/* Hash function to use for flow identification */
-+};
-+
- /* RED section */
- 
- enum {
---- a/net/sched/Kconfig
-+++ b/net/sched/Kconfig
-@@ -137,6 +137,37 @@ config NET_SCH_SFQ
- 	  To compile this code as a module, choose M here: the
- 	  module will be called sch_sfq.
- 
-+config NET_SCH_ESFQ
-+	tristate "Enhanced Stochastic Fairness Queueing (ESFQ)"
-+	---help---
-+	  Say Y here if you want to use the Enhanced Stochastic Fairness
-+	  Queueing (ESFQ) packet scheduling algorithm for some of your network
-+	  devices or as a leaf discipline for a classful qdisc such as HTB or
-+	  CBQ (see the top of <file:net/sched/sch_esfq.c> for details and
-+	  references to the SFQ algorithm).
-+
-+	  This is an enchanced SFQ version which allows you to control some
-+	  hardcoded values in the SFQ scheduler.
-+
-+	  ESFQ also adds control of the hash function used to identify packet
-+	  flows. The original SFQ discipline hashes by connection; ESFQ add
-+	  several other hashing methods, such as by src IP or by dst IP, which
-+	  can be more fair to users in some networking situations.
-+
-+	  To compile this code as a module, choose M here: the
-+	  module will be called sch_esfq.
-+
-+config NET_SCH_ESFQ_NFCT
-+	bool "Connection Tracking Hash Types"
-+	depends on NET_SCH_ESFQ && NF_CONNTRACK
-+	---help---
-+	  Say Y here to enable support for hashing based on netfilter connection
-+	  tracking information. This is useful for a router that is also using
-+	  NAT to connect privately-addressed hosts to the Internet. If you want
-+	  to provide fair distribution of upstream bandwidth, ESFQ must use
-+	  connection tracking information, since all outgoing packets will share
-+	  the same source address.
-+
- config NET_SCH_TEQL
- 	tristate "True Link Equalizer (TEQL)"
- 	---help---
---- a/net/sched/Makefile
-+++ b/net/sched/Makefile
-@@ -24,6 +24,7 @@ obj-$(CONFIG_NET_SCH_GRED)	+= sch_gred.o
- obj-$(CONFIG_NET_SCH_INGRESS)	+= sch_ingress.o 
- obj-$(CONFIG_NET_SCH_DSMARK)	+= sch_dsmark.o
- obj-$(CONFIG_NET_SCH_SFQ)	+= sch_sfq.o
-+obj-$(CONFIG_NET_SCH_ESFQ)	+= sch_esfq.o
- obj-$(CONFIG_NET_SCH_TBF)	+= sch_tbf.o
- obj-$(CONFIG_NET_SCH_TEQL)	+= sch_teql.o
- obj-$(CONFIG_NET_SCH_PRIO)	+= sch_prio.o
---- /dev/null
-+++ b/net/sched/sch_esfq.c
-@@ -0,0 +1,702 @@
-+/*
-+ * net/sched/sch_esfq.c	Extended Stochastic Fairness Queueing discipline.
-+ *
-+ *		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.
-+ *
-+ * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
-+ *
-+ * Changes:	Alexander Atanasov, <alex@ssi.bg>
-+ *		Added dynamic depth,limit,divisor,hash_kind options.
-+ *		Added dst and src hashes.
-+ *
-+ * 		Alexander Clouter, <alex@digriz.org.uk>
-+ *		Ported ESFQ to Linux 2.6.
-+ *
-+ * 		Corey Hickey, <bugfood-c@fatooh.org>
-+ *		Maintenance of the Linux 2.6 port.
-+ *		Added fwmark hash (thanks to Robert Kurjata).
-+ *		Added usage of jhash.
-+ *		Added conntrack support.
-+ *		Added ctnatchg hash (thanks to Ben Pfountz).
-+ */
-+
-+#include <linux/module.h>
-+#include <asm/uaccess.h>
-+#include <asm/system.h>
-+#include <linux/bitops.h>
-+#include <linux/types.h>
-+#include <linux/kernel.h>
-+#include <linux/jiffies.h>
-+#include <linux/string.h>
-+#include <linux/mm.h>
-+#include <linux/socket.h>
-+#include <linux/sockios.h>
-+#include <linux/in.h>
-+#include <linux/errno.h>
-+#include <linux/interrupt.h>
-+#include <linux/if_ether.h>
-+#include <linux/inet.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/notifier.h>
-+#include <linux/init.h>
-+#include <net/ip.h>
-+#include <net/netlink.h>
-+#include <linux/ipv6.h>
-+#include <net/route.h>
-+#include <linux/skbuff.h>
-+#include <net/sock.h>
-+#include <net/pkt_sched.h>
-+#include <linux/jhash.h>
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+#include <net/netfilter/nf_conntrack.h>
-+#endif
-+
-+/*	Stochastic Fairness Queuing algorithm.
-+	For more comments look at sch_sfq.c.
-+	The difference is that you can change limit, depth,
-+	hash table size and choose alternate hash types.
-+
-+	classic:	same as in sch_sfq.c
-+	dst:		destination IP address
-+	src:		source IP address
-+	fwmark:		netfilter mark value
-+	ctorigdst:	original destination IP address
-+	ctorigsrc:	original source IP address
-+	ctrepldst:	reply destination IP address
-+	ctreplsrc:	reply source IP
-+
-+*/
-+
-+#define ESFQ_HEAD 0
-+#define ESFQ_TAIL 1
-+
-+/* This type should contain at least SFQ_DEPTH*2 values */
-+typedef unsigned int esfq_index;
-+
-+struct esfq_head
-+{
-+	esfq_index	next;
-+	esfq_index	prev;
-+};
-+
-+struct esfq_sched_data
-+{
-+/* Parameters */
-+	int		perturb_period;
-+	unsigned	quantum;	/* Allotment per round: MUST BE >= MTU */
-+	int		limit;
-+	unsigned	depth;
-+	unsigned	hash_divisor;
-+	unsigned	hash_kind;
-+/* Variables */
-+	struct timer_list perturb_timer;
-+	int		perturbation;
-+	esfq_index	tail;		/* Index of current slot in round */
-+	esfq_index	max_depth;	/* Maximal depth */
-+
-+	esfq_index	*ht;			/* Hash table */
-+	esfq_index	*next;			/* Active slots link */
-+	short		*allot;			/* Current allotment per slot */
-+	unsigned short	*hash;			/* Hash value indexed by slots */
-+	struct sk_buff_head	*qs;		/* Slot queue */
-+	struct esfq_head	*dep;		/* Linked list of slots, indexed by depth */
-+};
-+
-+/* This contains the info we will hash. */
-+struct esfq_packet_info
-+{
-+	u32	proto;		/* protocol or port */
-+	u32	src;		/* source from packet header */
-+	u32	dst;		/* destination from packet header */
-+	u32	ctorigsrc;	/* original source from conntrack */
-+	u32	ctorigdst;	/* original destination from conntrack */
-+	u32	ctreplsrc;	/* reply source from conntrack */
-+	u32	ctrepldst;	/* reply destination from conntrack */
-+	u32	mark;		/* netfilter mark (fwmark) */
-+};
-+
-+static __inline__ unsigned esfq_jhash_1word(struct esfq_sched_data *q,u32 a)
-+{
-+	return jhash_1word(a, q->perturbation) & (q->hash_divisor-1);
-+}
-+
-+static __inline__ unsigned esfq_jhash_2words(struct esfq_sched_data *q, u32 a, u32 b)
-+{
-+	return jhash_2words(a, b, q->perturbation) & (q->hash_divisor-1);
-+}
-+
-+static __inline__ unsigned esfq_jhash_3words(struct esfq_sched_data *q, u32 a, u32 b, u32 c)
-+{
-+	return jhash_3words(a, b, c, q->perturbation) & (q->hash_divisor-1);
-+}
-+
-+static unsigned esfq_hash(struct esfq_sched_data *q, struct sk_buff *skb)
-+{
-+	struct esfq_packet_info info;
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+	enum ip_conntrack_info ctinfo;
-+	struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
-+#endif
-+
-+	switch (skb->protocol) {
-+	case __constant_htons(ETH_P_IP):
-+	{
-+		struct iphdr *iph = ip_hdr(skb);
-+		info.dst = iph->daddr;
-+		info.src = iph->saddr;
-+		if (!(iph->frag_off&htons(IP_MF|IP_OFFSET)) &&
-+		    (iph->protocol == IPPROTO_TCP ||
-+		     iph->protocol == IPPROTO_UDP ||
-+		     iph->protocol == IPPROTO_SCTP ||
-+		     iph->protocol == IPPROTO_DCCP ||
-+		     iph->protocol == IPPROTO_ESP))
-+			info.proto = *(((u32*)iph) + iph->ihl);
-+		else
-+			info.proto = iph->protocol;
-+		break;
-+	}
-+	case __constant_htons(ETH_P_IPV6):
-+	{
-+		struct ipv6hdr *iph = ipv6_hdr(skb);
-+		/* Hash ipv6 addresses into a u32. This isn't ideal,
-+		 * but the code is simple. */
-+		info.dst = jhash2(iph->daddr.s6_addr32, 4, q->perturbation);
-+		info.src = jhash2(iph->saddr.s6_addr32, 4, q->perturbation);
-+		if (iph->nexthdr == IPPROTO_TCP ||
-+		    iph->nexthdr == IPPROTO_UDP ||
-+		    iph->nexthdr == IPPROTO_SCTP ||
-+		    iph->nexthdr == IPPROTO_DCCP ||
-+		    iph->nexthdr == IPPROTO_ESP)
-+			info.proto = *(u32*)&iph[1];
-+		else
-+			info.proto = iph->nexthdr;
-+		break;
-+	}
-+	default:
-+		info.dst   = (u32)(unsigned long)skb_dst(skb);
-+		info.src   = (u32)(unsigned long)skb->sk;
-+		info.proto = skb->protocol;
-+	}
-+
-+	info.mark = skb->mark;
-+
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+	/* defaults if there is no conntrack info */
-+	info.ctorigsrc = info.src;
-+	info.ctorigdst = info.dst;
-+	info.ctreplsrc = info.dst;
-+	info.ctrepldst = info.src;
-+	/* collect conntrack info */
-+	if (ct && ct != &nf_conntrack_untracked) {
-+		if (skb->protocol == __constant_htons(ETH_P_IP)) {
-+			info.ctorigsrc = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
-+			info.ctorigdst = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip;
-+			info.ctreplsrc = ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip;
-+			info.ctrepldst = ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip;
-+		}
-+		else if (skb->protocol == __constant_htons(ETH_P_IPV6)) {
-+			/* Again, hash ipv6 addresses into a single u32. */
-+			info.ctorigsrc = jhash2(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip6, 4, q->perturbation);
-+			info.ctorigdst = jhash2(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip6, 4, q->perturbation);
-+			info.ctreplsrc = jhash2(ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip6, 4, q->perturbation);
-+			info.ctrepldst = jhash2(ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip6, 4, q->perturbation);
-+		}
-+
-+	}
-+#endif
-+
-+	switch(q->hash_kind) {
-+	case TCA_SFQ_HASH_CLASSIC:
-+		return esfq_jhash_3words(q, info.dst, info.src, info.proto);
-+	case TCA_SFQ_HASH_DST:
-+		return esfq_jhash_1word(q, info.dst);
-+	case TCA_SFQ_HASH_SRC:
-+		return esfq_jhash_1word(q, info.src);
-+	case TCA_SFQ_HASH_FWMARK:
-+		return esfq_jhash_1word(q, info.mark);
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+	case TCA_SFQ_HASH_CTORIGDST:
-+		return esfq_jhash_1word(q, info.ctorigdst);
-+	case TCA_SFQ_HASH_CTORIGSRC:
-+		return esfq_jhash_1word(q, info.ctorigsrc);
-+	case TCA_SFQ_HASH_CTREPLDST:
-+		return esfq_jhash_1word(q, info.ctrepldst);
-+	case TCA_SFQ_HASH_CTREPLSRC:
-+		return esfq_jhash_1word(q, info.ctreplsrc);
-+	case TCA_SFQ_HASH_CTNATCHG:
-+	{
-+		if (info.ctorigdst == info.ctreplsrc)
-+			return esfq_jhash_1word(q, info.ctorigsrc);
-+		return esfq_jhash_1word(q, info.ctreplsrc);
-+	}
-+#endif
-+	default:
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "ESFQ: Unknown hash method. Falling back to classic.\n");
-+	}
-+	return esfq_jhash_3words(q, info.dst, info.src, info.proto);
-+}
-+
-+static inline void esfq_link(struct esfq_sched_data *q, esfq_index x)
-+{
-+	esfq_index p, n;
-+	int d = q->qs[x].qlen + q->depth;
-+
-+	p = d;
-+	n = q->dep[d].next;
-+	q->dep[x].next = n;
-+	q->dep[x].prev = p;
-+	q->dep[p].next = q->dep[n].prev = x;
-+}
-+
-+static inline void esfq_dec(struct esfq_sched_data *q, esfq_index x)
-+{
-+	esfq_index p, n;
-+
-+	n = q->dep[x].next;
-+	p = q->dep[x].prev;
-+	q->dep[p].next = n;
-+	q->dep[n].prev = p;
-+
-+	if (n == p && q->max_depth == q->qs[x].qlen + 1)
-+		q->max_depth--;
-+
-+	esfq_link(q, x);
-+}
-+
-+static inline void esfq_inc(struct esfq_sched_data *q, esfq_index x)
-+{
-+	esfq_index p, n;
-+	int d;
-+
-+	n = q->dep[x].next;
-+	p = q->dep[x].prev;
-+	q->dep[p].next = n;
-+	q->dep[n].prev = p;
-+	d = q->qs[x].qlen;
-+	if (q->max_depth < d)
-+		q->max_depth = d;
-+
-+	esfq_link(q, x);
-+}
-+
-+static unsigned int esfq_drop(struct Qdisc *sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_index d = q->max_depth;
-+	struct sk_buff *skb;
-+	unsigned int len;
-+
-+	/* Queue is full! Find the longest slot and
-+	   drop a packet from it */
-+
-+	if (d > 1) {
-+		esfq_index x = q->dep[d+q->depth].next;
-+		skb = q->qs[x].prev;
-+		len = skb->len;
-+		__skb_unlink(skb, &q->qs[x]);
-+		kfree_skb(skb);
-+		esfq_dec(q, x);
-+		sch->q.qlen--;
-+		sch->qstats.drops++;
-+		sch->qstats.backlog -= len;
-+		return len;
-+	}
-+
-+	if (d == 1) {
-+		/* It is difficult to believe, but ALL THE SLOTS HAVE LENGTH 1. */
-+		d = q->next[q->tail];
-+		q->next[q->tail] = q->next[d];
-+		q->allot[q->next[d]] += q->quantum;
-+		skb = q->qs[d].prev;
-+		len = skb->len;
-+		__skb_unlink(skb, &q->qs[d]);
-+		kfree_skb(skb);
-+		esfq_dec(q, d);
-+		sch->q.qlen--;
-+		q->ht[q->hash[d]] = q->depth;
-+		sch->qstats.drops++;
-+		sch->qstats.backlog -= len;
-+		return len;
-+	}
-+
-+	return 0;
-+}
-+
-+static void esfq_q_enqueue(struct sk_buff *skb, struct esfq_sched_data *q, unsigned int end)
-+{
-+	unsigned hash = esfq_hash(q, skb);
-+	unsigned depth = q->depth;
-+	esfq_index x;
-+
-+	x = q->ht[hash];
-+	if (x == depth) {
-+		q->ht[hash] = x = q->dep[depth].next;
-+		q->hash[x] = hash;
-+	}
-+
-+	if (end == ESFQ_TAIL)
-+		__skb_queue_tail(&q->qs[x], skb);
-+	else
-+		__skb_queue_head(&q->qs[x], skb);
-+
-+	esfq_inc(q, x);
-+	if (q->qs[x].qlen == 1) {		/* The flow is new */
-+		if (q->tail == depth) {	/* It is the first flow */
-+			q->tail = x;
-+			q->next[x] = x;
-+			q->allot[x] = q->quantum;
-+		} else {
-+			q->next[x] = q->next[q->tail];
-+			q->next[q->tail] = x;
-+			q->tail = x;
-+		}
-+	}
-+}
-+
-+static int esfq_enqueue(struct sk_buff *skb, struct Qdisc* sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_q_enqueue(skb, q, ESFQ_TAIL);
-+	sch->qstats.backlog += skb->len;
-+	if (++sch->q.qlen < q->limit-1) {
-+		sch->bstats.bytes += skb->len;
-+		sch->bstats.packets++;
-+		return 0;
-+	}
-+
-+	sch->qstats.drops++;
-+	esfq_drop(sch);
-+	return NET_XMIT_CN;
-+}
-+
-+static struct sk_buff *esfq_peek(struct Qdisc* sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_index a;
-+
-+	/* No active slots */
-+	if (q->tail == q->depth)
-+		return NULL;
-+
-+	a = q->next[q->tail];
-+	return skb_peek(&q->qs[a]);
-+}
-+
-+static struct sk_buff *esfq_q_dequeue(struct esfq_sched_data *q)
-+{
-+	struct sk_buff *skb;
-+	unsigned depth = q->depth;
-+	esfq_index a, old_a;
-+
-+	/* No active slots */
-+	if (q->tail == depth)
-+		return NULL;
-+
-+	a = old_a = q->next[q->tail];
-+
-+	/* Grab packet */
-+	skb = __skb_dequeue(&q->qs[a]);
-+	esfq_dec(q, a);
-+
-+	/* Is the slot empty? */
-+	if (q->qs[a].qlen == 0) {
-+		q->ht[q->hash[a]] = depth;
-+		a = q->next[a];
-+		if (a == old_a) {
-+			q->tail = depth;
-+			return skb;
-+		}
-+		q->next[q->tail] = a;
-+		q->allot[a] += q->quantum;
-+	} else if ((q->allot[a] -= skb->len) <= 0) {
-+		q->tail = a;
-+		a = q->next[a];
-+		q->allot[a] += q->quantum;
-+	}
-+
-+	return skb;
-+}
-+
-+static struct sk_buff *esfq_dequeue(struct Qdisc* sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	struct sk_buff *skb;
-+
-+	skb = esfq_q_dequeue(q);
-+	if (skb == NULL)
-+		return NULL;
-+	sch->q.qlen--;
-+	sch->qstats.backlog -= skb->len;
-+	return skb;
-+}
-+
-+static void esfq_q_destroy(struct esfq_sched_data *q)
-+{
-+	del_timer(&q->perturb_timer);
-+	if(q->ht)
-+		kfree(q->ht);
-+	if(q->dep)
-+		kfree(q->dep);
-+	if(q->next)
-+		kfree(q->next);
-+	if(q->allot)
-+		kfree(q->allot);
-+	if(q->hash)
-+		kfree(q->hash);
-+	if(q->qs)
-+		kfree(q->qs);
-+}
-+
-+static void esfq_destroy(struct Qdisc *sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_q_destroy(q);
-+}
-+
-+
-+static void esfq_reset(struct Qdisc* sch)
-+{
-+	struct sk_buff *skb;
-+
-+	while ((skb = esfq_dequeue(sch)) != NULL)
-+		kfree_skb(skb);
-+}
-+
-+static void esfq_perturbation(unsigned long arg)
-+{
-+	struct Qdisc *sch = (struct Qdisc*)arg;
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+
-+	q->perturbation = net_random()&0x1F;
-+
-+	if (q->perturb_period) {
-+		q->perturb_timer.expires = jiffies + q->perturb_period;
-+		add_timer(&q->perturb_timer);
-+	}
-+}
-+
-+static unsigned int esfq_check_hash(unsigned int kind)
-+{
-+	switch (kind) {
-+	case TCA_SFQ_HASH_CTORIGDST:
-+	case TCA_SFQ_HASH_CTORIGSRC:
-+	case TCA_SFQ_HASH_CTREPLDST:
-+	case TCA_SFQ_HASH_CTREPLSRC:
-+	case TCA_SFQ_HASH_CTNATCHG:
-+#ifndef CONFIG_NET_SCH_ESFQ_NFCT
-+	{
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "ESFQ: Conntrack hash types disabled in kernel config. Falling back to classic.\n");
-+		return TCA_SFQ_HASH_CLASSIC;
-+	}
-+#endif
-+	case TCA_SFQ_HASH_CLASSIC:
-+	case TCA_SFQ_HASH_DST:
-+	case TCA_SFQ_HASH_SRC:
-+	case TCA_SFQ_HASH_FWMARK:
-+		return kind;
-+	default:
-+	{
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "ESFQ: Unknown hash type. Falling back to classic.\n");
-+		return TCA_SFQ_HASH_CLASSIC;
-+	}
-+	}
-+}
-+
-+static int esfq_q_init(struct esfq_sched_data *q, struct nlattr *opt)
-+{
-+	struct tc_esfq_qopt *ctl = nla_data(opt);
-+	esfq_index p = ~0U/2;
-+	int i;
-+
-+	if (opt && opt->nla_len < nla_attr_size(sizeof(*ctl)))
-+		return -EINVAL;
-+
-+	q->perturbation = 0;
-+	q->hash_kind = TCA_SFQ_HASH_CLASSIC;
-+	q->max_depth = 0;
-+	if (opt == NULL) {
-+		q->perturb_period = 0;
-+		q->hash_divisor = 1024;
-+		q->tail = q->limit = q->depth = 128;
-+
-+	} else {
-+		struct tc_esfq_qopt *ctl = nla_data(opt);
-+		if (ctl->quantum)
-+			q->quantum = ctl->quantum;
-+		q->perturb_period = ctl->perturb_period*HZ;
-+		q->hash_divisor = ctl->divisor ? : 1024;
-+		q->tail = q->limit = q->depth = ctl->flows ? : 128;
-+
-+		if ( q->depth > p - 1 )
-+			return -EINVAL;
-+
-+		if (ctl->limit)
-+			q->limit = min_t(u32, ctl->limit, q->depth);
-+
-+		if (ctl->hash_kind) {
-+			q->hash_kind = esfq_check_hash(ctl->hash_kind);
-+		}
-+	}
-+
-+	q->ht = kmalloc(q->hash_divisor*sizeof(esfq_index), GFP_KERNEL);
-+	if (!q->ht)
-+		goto err_case;
-+	q->dep = kmalloc((1+q->depth*2)*sizeof(struct esfq_head), GFP_KERNEL);
-+	if (!q->dep)
-+		goto err_case;
-+	q->next = kmalloc(q->depth*sizeof(esfq_index), GFP_KERNEL);
-+	if (!q->next)
-+		goto err_case;
-+	q->allot = kmalloc(q->depth*sizeof(short), GFP_KERNEL);
-+	if (!q->allot)
-+		goto err_case;
-+	q->hash = kmalloc(q->depth*sizeof(unsigned short), GFP_KERNEL);
-+	if (!q->hash)
-+		goto err_case;
-+	q->qs = kmalloc(q->depth*sizeof(struct sk_buff_head), GFP_KERNEL);
-+	if (!q->qs)
-+		goto err_case;
-+
-+	for (i=0; i< q->hash_divisor; i++)
-+		q->ht[i] = q->depth;
-+	for (i=0; i<q->depth; i++) {
-+		skb_queue_head_init(&q->qs[i]);
-+		q->dep[i+q->depth].next = i+q->depth;
-+		q->dep[i+q->depth].prev = i+q->depth;
-+	}
-+
-+	for (i=0; i<q->depth; i++)
-+		esfq_link(q, i);
-+	return 0;
-+err_case:
-+	esfq_q_destroy(q);
-+	return -ENOBUFS;
-+}
-+
-+static int esfq_init(struct Qdisc *sch, struct nlattr *opt)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	int err;
-+
-+	q->quantum = psched_mtu(qdisc_dev(sch)); /* default */
-+	if ((err = esfq_q_init(q, opt)))
-+		return err;
-+
-+	init_timer(&q->perturb_timer);
-+	q->perturb_timer.data = (unsigned long)sch;
-+	q->perturb_timer.function = esfq_perturbation;
-+	if (q->perturb_period) {
-+		q->perturb_timer.expires = jiffies + q->perturb_period;
-+		add_timer(&q->perturb_timer);
-+	}
-+
-+	return 0;
-+}
-+
-+static int esfq_change(struct Qdisc *sch, struct nlattr *opt)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	struct esfq_sched_data new;
-+	struct sk_buff *skb;
-+	int err;
-+
-+	/* set up new queue */
-+	memset(&new, 0, sizeof(struct esfq_sched_data));
-+	new.quantum = psched_mtu(qdisc_dev(sch)); /* default */
-+	if ((err = esfq_q_init(&new, opt)))
-+		return err;
-+
-+	/* copy all packets from the old queue to the new queue */
-+	sch_tree_lock(sch);
-+	while ((skb = esfq_q_dequeue(q)) != NULL)
-+		esfq_q_enqueue(skb, &new, ESFQ_TAIL);
-+
-+	/* clean up the old queue */
-+	esfq_q_destroy(q);
-+
-+	/* copy elements of the new queue into the old queue */
-+	q->perturb_period = new.perturb_period;
-+	q->quantum        = new.quantum;
-+	q->limit          = new.limit;
-+	q->depth          = new.depth;
-+	q->hash_divisor   = new.hash_divisor;
-+	q->hash_kind      = new.hash_kind;
-+	q->tail           = new.tail;
-+	q->max_depth      = new.max_depth;
-+	q->ht    = new.ht;
-+	q->dep   = new.dep;
-+	q->next  = new.next;
-+	q->allot = new.allot;
-+	q->hash  = new.hash;
-+	q->qs    = new.qs;
-+
-+	/* finish up */
-+	if (q->perturb_period) {
-+		q->perturb_timer.expires = jiffies + q->perturb_period;
-+		add_timer(&q->perturb_timer);
-+	} else {
-+		q->perturbation = 0;
-+	}
-+	sch_tree_unlock(sch);
-+	return 0;
-+}
-+
-+static int esfq_dump(struct Qdisc *sch, struct sk_buff *skb)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	unsigned char *b = skb_tail_pointer(skb);
-+	struct tc_esfq_qopt opt;
-+
-+	opt.quantum = q->quantum;
-+	opt.perturb_period = q->perturb_period/HZ;
-+
-+	opt.limit = q->limit;
-+	opt.divisor = q->hash_divisor;
-+	opt.flows = q->depth;
-+	opt.hash_kind = q->hash_kind;
-+
-+	NLA_PUT(skb, TCA_OPTIONS, sizeof(opt), &opt);
-+
-+	return skb->len;
-+
-+nla_put_failure:
-+	nlmsg_trim(skb, b);
-+	return -1;
-+}
-+
-+static struct Qdisc_ops esfq_qdisc_ops =
-+{
-+	.next		=	NULL,
-+	.cl_ops		=	NULL,
-+	.id		=	"esfq",
-+	.priv_size	=	sizeof(struct esfq_sched_data),
-+	.enqueue	=	esfq_enqueue,
-+	.dequeue	=	esfq_dequeue,
-+	.peek		=	esfq_peek,
-+	.drop		=	esfq_drop,
-+	.init		=	esfq_init,
-+	.reset		=	esfq_reset,
-+	.destroy	=	esfq_destroy,
-+	.change		=	esfq_change,
-+	.dump		=	esfq_dump,
-+	.owner		=	THIS_MODULE,
-+};
-+
-+static int __init esfq_module_init(void)
-+{
-+	return register_qdisc(&esfq_qdisc_ops);
-+}
-+static void __exit esfq_module_exit(void)
-+{
-+	unregister_qdisc(&esfq_qdisc_ops);
-+}
-+module_init(esfq_module_init)
-+module_exit(esfq_module_exit)
-+MODULE_LICENSE("GPL");
diff --git a/target/linux/generic-2.6/patches-2.6.34/201-jhash3.patch b/target/linux/generic-2.6/patches-2.6.34/201-jhash3.patch
deleted file mode 100644
index 0218fa19c..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/201-jhash3.patch
+++ /dev/null
@@ -1,227 +0,0 @@
---- a/include/linux/jhash.h
-+++ b/include/linux/jhash.h
-@@ -3,80 +3,95 @@
- 
- /* jhash.h: Jenkins hash support.
-  *
-- * Copyright (C) 1996 Bob Jenkins (bob_jenkins@burtleburtle.net)
-+ * Copyright (C) 2006. Bob Jenkins (bob_jenkins@burtleburtle.net)
-  *
-  * http://burtleburtle.net/bob/hash/
-  *
-  * These are the credits from Bob's sources:
-  *
-- * lookup2.c, by Bob Jenkins, December 1996, Public Domain.
-- * hash(), hash2(), hash3, and mix() are externally useful functions.
-- * Routines to test the hash are included if SELF_TEST is defined.
-- * You can use this free for any purpose.  It has no warranty.
-+ * lookup3.c, by Bob Jenkins, May 2006, Public Domain.
-  *
-- * Copyright (C) 2003 David S. Miller (davem@redhat.com)
-+ * These are functions for producing 32-bit hashes for hash table lookup.
-+ * hashword(), hashlittle(), hashlittle2(), hashbig(), mix(), and final() 
-+ * are externally useful functions.  Routines to test the hash are included 
-+ * if SELF_TEST is defined.  You can use this free for any purpose.  It's in
-+ * the public domain.  It has no warranty.
-+ *
-+ * Copyright (C) 2009 Jozsef Kadlecsik (kadlec@blackhole.kfki.hu)
-  *
-  * I've modified Bob's hash to be useful in the Linux kernel, and
-- * any bugs present are surely my fault.  -DaveM
-+ * any bugs present are my fault.  Jozsef
-  */
- 
--/* NOTE: Arguments are modified. */
--#define __jhash_mix(a, b, c) \
-+#define __rot(x,k) (((x)<<(k)) | ((x)>>(32-(k))))
-+
-+/* __jhash_mix - mix 3 32-bit values reversibly. */
-+#define __jhash_mix(a,b,c) \
-+{ \
-+  a -= c;  a ^= __rot(c, 4);  c += b; \
-+  b -= a;  b ^= __rot(a, 6);  a += c; \
-+  c -= b;  c ^= __rot(b, 8);  b += a; \
-+  a -= c;  a ^= __rot(c,16);  c += b; \
-+  b -= a;  b ^= __rot(a,19);  a += c; \
-+  c -= b;  c ^= __rot(b, 4);  b += a; \
-+}
-+
-+/* __jhash_final - final mixing of 3 32-bit values (a,b,c) into c */
-+#define __jhash_final(a,b,c) \
- { \
--  a -= b; a -= c; a ^= (c>>13); \
--  b -= c; b -= a; b ^= (a<<8); \
--  c -= a; c -= b; c ^= (b>>13); \
--  a -= b; a -= c; a ^= (c>>12);  \
--  b -= c; b -= a; b ^= (a<<16); \
--  c -= a; c -= b; c ^= (b>>5); \
--  a -= b; a -= c; a ^= (c>>3);  \
--  b -= c; b -= a; b ^= (a<<10); \
--  c -= a; c -= b; c ^= (b>>15); \
-+  c ^= b; c -= __rot(b,14); \
-+  a ^= c; a -= __rot(c,11); \
-+  b ^= a; b -= __rot(a,25); \
-+  c ^= b; c -= __rot(b,16); \
-+  a ^= c; a -= __rot(c,4);  \
-+  b ^= a; b -= __rot(a,14); \
-+  c ^= b; c -= __rot(b,24); \
- }
- 
--/* The golden ration: an arbitrary value */
--#define JHASH_GOLDEN_RATIO	0x9e3779b9
-+/* An arbitrary initial parameter */
-+#define JHASH_GOLDEN_RATIO	0xdeadbeef
- 
- /* The most generic version, hashes an arbitrary sequence
-  * of bytes.  No alignment or length assumptions are made about
-- * the input key.
-+ * the input key. The result depends on endianness.
-  */
- static inline u32 jhash(const void *key, u32 length, u32 initval)
- {
--	u32 a, b, c, len;
-+	u32 a,b,c;
- 	const u8 *k = key;
- 
--	len = length;
--	a = b = JHASH_GOLDEN_RATIO;
--	c = initval;
--
--	while (len >= 12) {
--		a += (k[0] +((u32)k[1]<<8) +((u32)k[2]<<16) +((u32)k[3]<<24));
--		b += (k[4] +((u32)k[5]<<8) +((u32)k[6]<<16) +((u32)k[7]<<24));
--		c += (k[8] +((u32)k[9]<<8) +((u32)k[10]<<16)+((u32)k[11]<<24));
--
--		__jhash_mix(a,b,c);
-+	/* Set up the internal state */
-+	a = b = c = JHASH_GOLDEN_RATIO + length + initval;
- 
-+	/* all but the last block: affect some 32 bits of (a,b,c) */
-+	while (length > 12) {
-+    		a += (k[0] + ((u32)k[1]<<8) + ((u32)k[2]<<16) + ((u32)k[3]<<24));
-+		b += (k[4] + ((u32)k[5]<<8) + ((u32)k[6]<<16) + ((u32)k[7]<<24));
-+		c += (k[8] + ((u32)k[9]<<8) + ((u32)k[10]<<16) + ((u32)k[11]<<24));
-+		__jhash_mix(a, b, c);
-+		length -= 12;
- 		k += 12;
--		len -= 12;
- 	}
- 
--	c += length;
--	switch (len) {
--	case 11: c += ((u32)k[10]<<24);
--	case 10: c += ((u32)k[9]<<16);
--	case 9 : c += ((u32)k[8]<<8);
--	case 8 : b += ((u32)k[7]<<24);
--	case 7 : b += ((u32)k[6]<<16);
--	case 6 : b += ((u32)k[5]<<8);
-+	/* last block: affect all 32 bits of (c) */
-+	/* all the case statements fall through */
-+	switch (length) {
-+	case 12: c += (u32)k[11]<<24;
-+	case 11: c += (u32)k[10]<<16;
-+	case 10: c += (u32)k[9]<<8;
-+	case 9 : c += k[8];
-+	case 8 : b += (u32)k[7]<<24;
-+	case 7 : b += (u32)k[6]<<16;
-+	case 6 : b += (u32)k[5]<<8;
- 	case 5 : b += k[4];
--	case 4 : a += ((u32)k[3]<<24);
--	case 3 : a += ((u32)k[2]<<16);
--	case 2 : a += ((u32)k[1]<<8);
-+	case 4 : a += (u32)k[3]<<24;
-+	case 3 : a += (u32)k[2]<<16;
-+	case 2 : a += (u32)k[1]<<8;
- 	case 1 : a += k[0];
--	};
--
--	__jhash_mix(a,b,c);
-+		__jhash_final(a, b, c);
-+	case 0 :
-+		break;
-+	}
- 
- 	return c;
- }
-@@ -86,58 +101,57 @@ static inline u32 jhash(const void *key,
-  */
- static inline u32 jhash2(const u32 *k, u32 length, u32 initval)
- {
--	u32 a, b, c, len;
-+	u32 a, b, c;
- 
--	a = b = JHASH_GOLDEN_RATIO;
--	c = initval;
--	len = length;
-+	/* Set up the internal state */
-+	a = b = c = JHASH_GOLDEN_RATIO + (length<<2) + initval;
- 
--	while (len >= 3) {
-+	/* handle most of the key */
-+	while (length > 3) {
- 		a += k[0];
- 		b += k[1];
- 		c += k[2];
- 		__jhash_mix(a, b, c);
--		k += 3; len -= 3;
-+		length -= 3;
-+		k += 3;
- 	}
- 
--	c += length * 4;
--
--	switch (len) {
--	case 2 : b += k[1];
--	case 1 : a += k[0];
--	};
--
--	__jhash_mix(a,b,c);
-+	/* handle the last 3 u32's */
-+	/* all the case statements fall through */ 
-+	switch (length) {
-+	case 3: c += k[2];
-+	case 2: b += k[1];
-+	case 1: a += k[0];
-+		__jhash_final(a, b, c);
-+	case 0:     /* case 0: nothing left to add */
-+		break;
-+	}
- 
- 	return c;
- }
- 
--
- /* A special ultra-optimized versions that knows they are hashing exactly
-  * 3, 2 or 1 word(s).
-- *
-- * NOTE: In partilar the "c += length; __jhash_mix(a,b,c);" normally
-- *       done at the end is not done here.
-  */
- static inline u32 jhash_3words(u32 a, u32 b, u32 c, u32 initval)
- {
--	a += JHASH_GOLDEN_RATIO;
--	b += JHASH_GOLDEN_RATIO;
--	c += initval;
-+	a += JHASH_GOLDEN_RATIO + initval;
-+	b += JHASH_GOLDEN_RATIO + initval;
-+	c += JHASH_GOLDEN_RATIO + initval;
- 
--	__jhash_mix(a, b, c);
-+	__jhash_final(a, b, c);
- 
- 	return c;
- }
- 
- static inline u32 jhash_2words(u32 a, u32 b, u32 initval)
- {
--	return jhash_3words(a, b, 0, initval);
-+	return jhash_3words(0, a, b, initval);
- }
- 
- static inline u32 jhash_1word(u32 a, u32 initval)
- {
--	return jhash_3words(a, 0, 0, initval);
-+	return jhash_3words(0, 0, a, initval);
- }
- 
- #endif /* _LINUX_JHASH_H */
diff --git a/target/linux/generic-2.6/patches-2.6.34/202-mips_mem_functions_performance.patch b/target/linux/generic-2.6/patches-2.6.34/202-mips_mem_functions_performance.patch
deleted file mode 100644
index 6ea9ba51e..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/202-mips_mem_functions_performance.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- a/arch/mips/include/asm/string.h
-+++ b/arch/mips/include/asm/string.h
-@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__ 
- 
- #define __HAVE_ARCH_MEMSET
- extern void *memset(void *__s, int __c, size_t __count);
-+#define memset(__s, __c, len)					\
-+({								\
-+	size_t __len = (len);					\
-+	void *__ret;						\
-+	if (__builtin_constant_p(len) && __len >= 64)		\
-+		__ret = memset((__s), (__c), __len);		\
-+	else							\
-+		__ret = __builtin_memset((__s), (__c), __len);	\
-+	__ret;							\
-+})
- 
- #define __HAVE_ARCH_MEMCPY
- extern void *memcpy(void *__to, __const__ void *__from, size_t __n);
-+#define memcpy(dst, src, len)					\
-+({								\
-+	size_t __len = (len);					\
-+	void *__ret;						\
-+	if (__builtin_constant_p(len) && __len >= 64)		\
-+		__ret = memcpy((dst), (src), __len);		\
-+	else							\
-+		__ret = __builtin_memcpy((dst), (src), __len);	\
-+	__ret;							\
-+})
- 
- #define __HAVE_ARCH_MEMMOVE
- extern void *memmove(void *__dest, __const__ void *__src, size_t __n);
-+#define memmove(dst, src, len)					\
-+({								\
-+	size_t __len = (len);					\
-+	void *__ret;						\
-+	if (__builtin_constant_p(len) && __len >= 64)		\
-+		__ret = memmove((dst), (src), __len);		\
-+	else							\
-+		__ret = __builtin_memmove((dst), (src), __len);	\
-+	__ret;							\
-+})
-+
-+#define __HAVE_ARCH_MEMCMP
-+#define memcmp(src1, src2, len) __builtin_memcmp((src1), (src2), (len))
- 
- #endif /* _ASM_STRING_H */
---- a/arch/mips/lib/Makefile
-+++ b/arch/mips/lib/Makefile
-@@ -3,7 +3,7 @@
- #
- 
- lib-y	+= csum_partial.o delay.o memcpy.o memcpy-inatomic.o memset.o \
--	   strlen_user.o strncpy_user.o strnlen_user.o uncached.o
-+	   strlen_user.o strncpy_user.o strnlen_user.o uncached.o memcmp.o
- 
- obj-y			+= iomap.o
- obj-$(CONFIG_PCI)	+= iomap-pci.o
---- /dev/null
-+++ b/arch/mips/lib/memcmp.c
-@@ -0,0 +1,22 @@
-+/*
-+ *  copied from linux/lib/string.c
-+ *
-+ *  Copyright (C) 1991, 1992  Linus Torvalds
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/string.h>
-+
-+#undef memcmp
-+int memcmp(const void *cs, const void *ct, size_t count)
-+{
-+	const unsigned char *su1, *su2;
-+	int res = 0;
-+
-+	for (su1 = cs, su2 = ct; 0 < count; ++su1, ++su2, count--)
-+		if ((res = *su1 - *su2) != 0)
-+			break;
-+	return res;
-+}
-+EXPORT_SYMBOL(memcmp);
-+
diff --git a/target/linux/generic-2.6/patches-2.6.34/203-slab_maxsize.patch b/target/linux/generic-2.6/patches-2.6.34/203-slab_maxsize.patch
deleted file mode 100644
index 0c1ae72a4..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/203-slab_maxsize.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/include/linux/slab.h
-+++ b/include/linux/slab.h
-@@ -124,8 +124,8 @@ int kmem_ptr_validate(struct kmem_cache 
-  * to do various tricks to work around compiler limitations in order to
-  * ensure proper constant folding.
-  */
--#define KMALLOC_SHIFT_HIGH	((MAX_ORDER + PAGE_SHIFT - 1) <= 25 ? \
--				(MAX_ORDER + PAGE_SHIFT - 1) : 25)
-+#define KMALLOC_SHIFT_HIGH	((MAX_ORDER + PAGE_SHIFT - 1) <= 17 ? \
-+				(MAX_ORDER + PAGE_SHIFT - 1) : 17)
- 
- #define KMALLOC_MAX_SIZE	(1UL << KMALLOC_SHIFT_HIGH)
- #define KMALLOC_MAX_ORDER	(KMALLOC_SHIFT_HIGH - PAGE_SHIFT)
diff --git a/target/linux/generic-2.6/patches-2.6.34/204-jffs2_eofdetect.patch b/target/linux/generic-2.6/patches-2.6.34/204-jffs2_eofdetect.patch
deleted file mode 100644
index 16d3e1f8e..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/204-jffs2_eofdetect.patch
+++ /dev/null
@@ -1,132 +0,0 @@
---- a/fs/jffs2/build.c
-+++ b/fs/jffs2/build.c
-@@ -111,6 +111,17 @@ static int jffs2_build_filesystem(struct
- 	dbg_fsbuild("scanned flash completely\n");
- 	jffs2_dbg_dump_block_lists_nolock(c);
- 
-+	if (c->flags & (1 << 7)) {
-+		printk("%s(): unlocking the mtd device... ", __func__);
-+		if (c->mtd->unlock)
-+			c->mtd->unlock(c->mtd, 0, c->mtd->size);
-+		printk("done.\n");
-+
-+		printk("%s(): erasing all blocks after the end marker... ", __func__);
-+		jffs2_erase_pending_blocks(c, -1);
-+		printk("done.\n");
-+	}
-+
- 	dbg_fsbuild("pass 1 starting\n");
- 	c->flags |= JFFS2_SB_FLAG_BUILDING;
- 	/* Now scan the directory tree, increasing nlink according to every dirent found. */
---- a/fs/jffs2/scan.c
-+++ b/fs/jffs2/scan.c
-@@ -72,7 +72,7 @@ static int file_dirty(struct jffs2_sb_in
- 		return ret;
- 	if ((ret = jffs2_scan_dirty_space(c, jeb, jeb->free_size)))
- 		return ret;
--	/* Turned wasted size into dirty, since we apparently 
-+	/* Turned wasted size into dirty, since we apparently
- 	   think it's recoverable now. */
- 	jeb->dirty_size += jeb->wasted_size;
- 	c->dirty_size += jeb->wasted_size;
-@@ -144,8 +144,11 @@ int jffs2_scan_medium(struct jffs2_sb_in
- 		/* reset summary info for next eraseblock scan */
- 		jffs2_sum_reset_collected(s);
- 
--		ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
--						buf_size, s);
-+		if (c->flags & (1 << 7))
-+			ret = BLK_STATE_ALLFF;
-+		else
-+			ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
-+							buf_size, s);
- 
- 		if (ret < 0)
- 			goto out;
-@@ -400,7 +403,7 @@ static int jffs2_scan_xref_node(struct j
- 	if (!ref)
- 		return -ENOMEM;
- 
--	/* BEFORE jffs2_build_xattr_subsystem() called, 
-+	/* BEFORE jffs2_build_xattr_subsystem() called,
- 	 * and AFTER xattr_ref is marked as a dead xref,
- 	 * ref->xid is used to store 32bit xid, xd is not used
- 	 * ref->ino is used to store 32bit inode-number, ic is not used
-@@ -473,7 +476,7 @@ static int jffs2_scan_eraseblock (struct
- 		struct jffs2_sum_marker *sm;
- 		void *sumptr = NULL;
- 		uint32_t sumlen;
--	      
-+
- 		if (!buf_size) {
- 			/* XIP case. Just look, point at the summary if it's there */
- 			sm = (void *)buf + c->sector_size - sizeof(*sm);
-@@ -489,9 +492,9 @@ static int jffs2_scan_eraseblock (struct
- 				buf_len = sizeof(*sm);
- 
- 			/* Read as much as we want into the _end_ of the preallocated buffer */
--			err = jffs2_fill_scan_buf(c, buf + buf_size - buf_len, 
-+			err = jffs2_fill_scan_buf(c, buf + buf_size - buf_len,
- 						  jeb->offset + c->sector_size - buf_len,
--						  buf_len);				
-+						  buf_len);
- 			if (err)
- 				return err;
- 
-@@ -510,9 +513,9 @@ static int jffs2_scan_eraseblock (struct
- 				}
- 				if (buf_len < sumlen) {
- 					/* Need to read more so that the entire summary node is present */
--					err = jffs2_fill_scan_buf(c, sumptr, 
-+					err = jffs2_fill_scan_buf(c, sumptr,
- 								  jeb->offset + c->sector_size - sumlen,
--								  sumlen - buf_len);				
-+								  sumlen - buf_len);
- 					if (err)
- 						return err;
- 				}
-@@ -525,7 +528,7 @@ static int jffs2_scan_eraseblock (struct
- 
- 			if (buf_size && sumlen > buf_size)
- 				kfree(sumptr);
--			/* If it returns with a real error, bail. 
-+			/* If it returns with a real error, bail.
- 			   If it returns positive, that's a block classification
- 			   (i.e. BLK_STATE_xxx) so return that too.
- 			   If it returns zero, fall through to full scan. */
-@@ -546,6 +549,17 @@ static int jffs2_scan_eraseblock (struct
- 			return err;
- 	}
- 
-+	if ((buf[0] == 0xde) &&
-+		(buf[1] == 0xad) &&
-+		(buf[2] == 0xc0) &&
-+		(buf[3] == 0xde)) {
-+		/* end of filesystem. erase everything after this point */
-+		printk("%s(): End of filesystem marker found at 0x%x\n", __func__, jeb->offset);
-+		c->flags |= (1 << 7);
-+
-+		return BLK_STATE_ALLFF;
-+	}
-+
- 	/* We temporarily use 'ofs' as a pointer into the buffer/jeb */
- 	ofs = 0;
- 
-@@ -671,7 +685,7 @@ scan_more:
- 				scan_end = buf_len;
- 				goto more_empty;
- 			}
--			
-+
- 			/* See how much more there is to read in this eraseblock... */
- 			buf_len = min_t(uint32_t, buf_size, jeb->offset + c->sector_size - ofs);
- 			if (!buf_len) {
-@@ -907,7 +921,7 @@ scan_more:
- 
- 	D1(printk(KERN_DEBUG "Block at 0x%08x: free 0x%08x, dirty 0x%08x, unchecked 0x%08x, used 0x%08x, wasted 0x%08x\n",
- 		  jeb->offset,jeb->free_size, jeb->dirty_size, jeb->unchecked_size, jeb->used_size, jeb->wasted_size));
--	
-+
- 	/* mark_node_obsolete can add to wasted !! */
- 	if (jeb->wasted_size) {
- 		jeb->dirty_size += jeb->wasted_size;
diff --git a/target/linux/generic-2.6/patches-2.6.34/205-skb_padding.patch b/target/linux/generic-2.6/patches-2.6.34/205-skb_padding.patch
deleted file mode 100644
index 6e6d28b77..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/205-skb_padding.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/include/linux/skbuff.h
-+++ b/include/linux/skbuff.h
-@@ -1377,11 +1377,18 @@ static inline int skb_network_offset(con
-  *
-  * Various parts of the networking layer expect at least 32 bytes of
-  * headroom, you should not reduce this.
-+ *
-+ * This has been changed to 64 to acommodate for routing between ethernet
-+ * and wireless, but only for new allocations
-  */
- #ifndef NET_SKB_PAD
- #define NET_SKB_PAD	32
- #endif
- 
-+#ifndef NET_SKB_PAD_ALLOC
-+#define NET_SKB_PAD_ALLOC	64
-+#endif
-+
- extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
- 
- static inline void __skb_trim(struct sk_buff *skb, unsigned int len)
-@@ -1471,9 +1478,9 @@ static inline void __skb_queue_purge(str
- static inline struct sk_buff *__dev_alloc_skb(unsigned int length,
- 					      gfp_t gfp_mask)
- {
--	struct sk_buff *skb = alloc_skb(length + NET_SKB_PAD, gfp_mask);
-+	struct sk_buff *skb = alloc_skb(length + NET_SKB_PAD_ALLOC, gfp_mask);
- 	if (likely(skb))
--		skb_reserve(skb, NET_SKB_PAD);
-+		skb_reserve(skb, NET_SKB_PAD_ALLOC);
- 	return skb;
- }
- 
-@@ -1556,7 +1563,7 @@ static inline int __skb_cow(struct sk_bu
- 		delta = headroom - skb_headroom(skb);
- 
- 	if (delta || cloned)
--		return pskb_expand_head(skb, ALIGN(delta, NET_SKB_PAD), 0,
-+		return pskb_expand_head(skb, ALIGN(delta, NET_SKB_PAD_ALLOC), 0,
- 					GFP_ATOMIC);
- 	return 0;
- }
---- a/net/core/skbuff.c
-+++ b/net/core/skbuff.c
-@@ -339,9 +339,9 @@ struct sk_buff *__netdev_alloc_skb(struc
- 	int node = dev->dev.parent ? dev_to_node(dev->dev.parent) : -1;
- 	struct sk_buff *skb;
- 
--	skb = __alloc_skb(length + NET_SKB_PAD, gfp_mask, 0, node);
-+	skb = __alloc_skb(length + NET_SKB_PAD_ALLOC, gfp_mask, 0, node);
- 	if (likely(skb)) {
--		skb_reserve(skb, NET_SKB_PAD);
-+		skb_reserve(skb, NET_SKB_PAD_ALLOC);
- 		skb->dev = dev;
- 	}
- 	return skb;
diff --git a/target/linux/generic-2.6/patches-2.6.34/207-powerpc_asm_segment_h.patch b/target/linux/generic-2.6/patches-2.6.34/207-powerpc_asm_segment_h.patch
deleted file mode 100644
index 1272e82c7..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/207-powerpc_asm_segment_h.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- /dev/null
-+++ b/include/asm-powerpc/segment.h
-@@ -0,0 +1,6 @@
-+#ifndef _ASM_SEGMENT_H
-+#define _ASM_SEGMENT_H
-+
-+/* Only here because we have some old header files that expect it.. */
-+
-+#endif /* _ASM_SEGMENT_H */
diff --git a/target/linux/generic-2.6/patches-2.6.34/208-mips_oprofile_fix.patch b/target/linux/generic-2.6/patches-2.6.34/208-mips_oprofile_fix.patch
deleted file mode 100644
index 0cbf4ed32..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/208-mips_oprofile_fix.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -49,7 +49,9 @@ ifneq ($(SUBARCH),$(ARCH))
- endif
- 
- ifndef CONFIG_FUNCTION_TRACER
--cflags-y := -ffunction-sections
-+  ifndef CONFIG_PROFILING
-+    cflags-y := -ffunction-sections
-+  endif
- endif
- ifdef CONFIG_FUNCTION_GRAPH_TRACER
-   ifndef KBUILD_MCOUNT_RA_ADDRESS
---- a/arch/mips/oprofile/op_model_mipsxx.c
-+++ b/arch/mips/oprofile/op_model_mipsxx.c
-@@ -298,6 +298,11 @@ static void reset_counters(void *arg)
- 	}
- }
- 
-+static irqreturn_t mipsxx_perfcount_int(int irq, void *dev_id)
-+{
-+	return mipsxx_perfcount_handler();
-+}
-+
- static int __init mipsxx_init(void)
- {
- 	int counters;
-@@ -374,6 +379,10 @@ static int __init mipsxx_init(void)
- 	save_perf_irq = perf_irq;
- 	perf_irq = mipsxx_perfcount_handler;
- 
-+	if (cp0_perfcount_irq >= 0)
-+		return request_irq(cp0_perfcount_irq, mipsxx_perfcount_int,
-+			IRQF_SHARED, "Perfcounter", save_perf_irq);
-+
- 	return 0;
- }
- 
-@@ -381,6 +390,9 @@ static void mipsxx_exit(void)
- {
- 	int counters = op_model_mipsxx_ops.num_counters;
- 
-+	if (cp0_perfcount_irq >= 0)
-+		free_irq(cp0_perfcount_irq, save_perf_irq);
-+
- 	counters = counters_per_cpu_to_total(counters);
- 	on_each_cpu(reset_counters, (void *)(long)counters, 1);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.34/209-mini_fo.patch b/target/linux/generic-2.6/patches-2.6.34/209-mini_fo.patch
deleted file mode 100644
index b2625cd26..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/209-mini_fo.patch
+++ /dev/null
@@ -1,7782 +0,0 @@
---- a/fs/Kconfig
-+++ b/fs/Kconfig
-@@ -180,6 +180,7 @@ source "fs/ubifs/Kconfig"
- source "fs/cramfs/Kconfig"
- source "fs/squashfs/Kconfig"
- source "fs/freevxfs/Kconfig"
-+source "fs/mini_fo/Kconfig"
- source "fs/minix/Kconfig"
- source "fs/omfs/Kconfig"
- source "fs/hpfs/Kconfig"
---- a/fs/Makefile
-+++ b/fs/Makefile
-@@ -77,6 +77,7 @@ obj-$(CONFIG_SQUASHFS)		+= squashfs/
- obj-y				+= ramfs/
- obj-$(CONFIG_HUGETLBFS)		+= hugetlbfs/
- obj-$(CONFIG_CODA_FS)		+= coda/
-+obj-$(CONFIG_MINI_FO)		+= mini_fo/
- obj-$(CONFIG_MINIX_FS)		+= minix/
- obj-$(CONFIG_FAT_FS)		+= fat/
- obj-$(CONFIG_BFS_FS)		+= bfs/
---- /dev/null
-+++ b/fs/mini_fo/aux.c
-@@ -0,0 +1,577 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+/* check if file exists in storage  */
-+int exists_in_storage(dentry_t *dentry)
-+{
-+	check_mini_fo_dentry(dentry);
-+	if(dtost(dentry) == MODIFIED || dtost(dentry) == CREATED || dtost(dentry) == DEL_REWRITTEN)
-+		return 1;
-+	return 0;
-+}
-+
-+/* check if dentry is in an existing state */
-+int is_mini_fo_existant(dentry_t *dentry)
-+{
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) == DELETED || dtost(dentry) == NON_EXISTANT)
-+		return 0;
-+	else
-+		return 1;
-+}
-+
-+/*
-+ * This function will create a negative storage dentry for
-+ * dentry, what is required for many create like options.
-+ * It will create the storage structure if necessary.
-+ */
-+int get_neg_sto_dentry(dentry_t *dentry)
-+{
-+	int err = 0;
-+	unsigned int len;
-+	const unsigned char *name;
-+
-+	if(!dentry ||
-+	   !dtopd(dentry) ||
-+	   !(dtost(dentry) == UNMODIFIED ||
-+	     dtost(dentry) == NON_EXISTANT ||
-+	     dtost(dentry) == DELETED)) {
-+		printk(KERN_CRIT "mini_fo: get_neg_sto_dentry: invalid dentry passed.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	/* Have we got a neg. dentry already? */
-+	if(dtohd2(dentry)) {
-+		err = 0;
-+		goto out;
-+	}
-+	if(dtost(dentry->d_parent) == UNMODIFIED) {
-+		/* build sto struct */
-+		err = build_sto_structure(dentry->d_parent->d_parent, dentry->d_parent);
-+		if(err ||
-+		   dtost(dentry->d_parent) != MODIFIED) {
-+			printk(KERN_CRIT "mini_fo: get_neg_sto_dentry: ERROR building sto structure.\n");
-+			err = -1;
-+			goto out;
-+		}
-+	}
-+
-+	len = dentry->d_name.len;
-+	name = dentry->d_name.name;
-+
-+	dtohd2(dentry) =
-+		lookup_one_len(name, dtohd2(dentry->d_parent), len);
-+
-+ out:
-+	return err;
-+}
-+
-+int check_mini_fo_dentry(dentry_t *dentry)
-+{
-+ 	ASSERT(dentry != NULL);
-+	ASSERT(dtopd(dentry) != NULL);
-+	ASSERT((dtohd(dentry) != NULL) || (dtohd2(dentry) != NULL));
-+
-+/* 	if(dtost(dentry) == MODIFIED) { */
-+/* 		ASSERT(dentry->d_inode != NULL); */
-+/* 		ASSERT(dtohd(dentry) != NULL); */
-+/* 		ASSERT(dtohd(dentry)->d_inode != NULL); */
-+/* 		ASSERT(dtohd2(dentry) != NULL); */
-+/* 		ASSERT(dtohd2(dentry)->d_inode != NULL); */
-+/* 	} */
-+/* 	else if(dtost(dentry) == UNMODIFIED) { */
-+/* 		ASSERT(dentry->d_inode != NULL); */
-+/* 		ASSERT( */
-+/* 	} */
-+	return 0;
-+}
-+
-+int check_mini_fo_file(file_t *file)
-+{
-+	ASSERT(file != NULL);
-+	ASSERT(ftopd(file) != NULL);
-+	ASSERT(file->f_dentry != NULL);
-+
-+	/* violent checking, check depending of state and type
-+	 *	if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {}
-+	 */
-+	ASSERT((ftohf(file) != NULL) || (ftohf2(file) != NULL));
-+	return 0;
-+}
-+
-+int check_mini_fo_inode(inode_t *inode)
-+{
-+	ASSERT(inode != NULL);
-+	ASSERT(itopd(inode) != NULL);
-+	ASSERT((itohi(inode) != NULL) || (itohi2(inode) != NULL));
-+	return 0;
-+}
-+
-+/*
-+ * will walk a base path as provided by get_mini_fo_bpath and return
-+ * the (hopefully ;-) ) positive dentry of the renamed base dir.
-+ *
-+ * This does some work of path_init.
-+ */
-+dentry_t *bpath_walk(super_block_t *sb, char *bpath)
-+{
-+	int err;
-+        struct vfsmount *mnt;
-+	struct nameidata nd;
-+
-+	/* be paranoid */
-+	if(!bpath || bpath[0] != '/') {
-+		printk(KERN_CRIT "mini_fo: bpath_walk: Invalid string.\n");
-+		return NULL;
-+	}
-+	if(!sb || !stopd(sb)) {
-+		printk(KERN_CRIT "mini_fo: bpath_walk: Invalid sb.\n");
-+		return NULL;
-+	}
-+
-+	/* fix this: how do I reach this lock?
-+	 * read_lock(&current->fs->lock); */
-+	mnt = mntget(stopd(sb)->hidden_mnt);
-+	/* read_unlock(&current->fs->lock); */
-+
-+	err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
-+
-+	/* validate */
-+	if (err || !nd.dentry || !nd.dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: bpath_walk: path_walk failed.\n");
-+		return NULL;
-+	}
-+	return nd.dentry;
-+}
-+
-+
-+/* returns the full path of the basefile incl. its name */
-+int get_mini_fo_bpath(dentry_t *dentry, char **bpath, int *bpath_len)
-+{
-+	char *buf_walker;
-+	int len = 0;
-+	dentry_t *sky_walker;
-+
-+	if(!dentry || !dtohd(dentry)) {
-+		printk(KERN_CRIT "mini_fo: get_mini_fo_bpath: invalid dentry passed.\n");
-+		return -1;
-+	}
-+	sky_walker = dtohd(dentry);
-+
-+	do {
-+		len += sky_walker->d_name.len + 1 ; /* 1 for '/' */
-+		sky_walker = sky_walker->d_parent;
-+	} while(sky_walker != stopd(dentry->d_inode->i_sb)->base_dir_dentry);
-+
-+	/* 1 to oil the loop */
-+	*bpath = (char*)  kmalloc(len + 1, GFP_KERNEL);
-+	if(!*bpath) {
-+		printk(KERN_CRIT "mini_fo: get_mini_fo_bpath: out of mem.\n");
-+		return -1;
-+	}
-+	buf_walker = *bpath+len; /* put it on last char */
-+	*buf_walker = '\n';
-+	sky_walker = dtohd(dentry);
-+
-+	do {
-+		buf_walker -= sky_walker->d_name.len;
-+		strncpy(buf_walker,
-+			sky_walker->d_name.name,
-+			sky_walker->d_name.len);
-+		*(--buf_walker) = '/';
-+		sky_walker = sky_walker->d_parent;
-+	} while(sky_walker != stopd(dentry->d_inode->i_sb)->base_dir_dentry);
-+
-+	/* bpath_len doesn't count newline! */
-+	*bpath_len = len;
-+ 	return 0;
-+}
-+
-+int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
-+		    dentry_t *src_dentry, struct vfsmount *src_mnt)
-+{
-+	void *buf;
-+	mm_segment_t old_fs;
-+	file_t *tgt_file;
-+	file_t *src_file;
-+	int bytes, len, tmp, err;
-+	err = 0;
-+
-+	if(!(tgt_dentry->d_inode && src_dentry->d_inode)) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR, neg. dentry passed.\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+
-+	dget(tgt_dentry);
-+	dget(src_dentry);
-+	mntget(tgt_mnt);
-+	mntget(src_mnt);
-+
-+	/* open file write only */
-+	tgt_file = dentry_open(tgt_dentry, tgt_mnt, 0x1);
-+	if(!tgt_file || IS_ERR(tgt_file)) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening target file.\n");
-+		err = PTR_ERR(tgt_file);
-+		goto out_err;
-+	}
-+
-+	/* open file read only */
-+	src_file = dentry_open(src_dentry, src_mnt, 0x0);
-+	if(!src_file || IS_ERR(src_file)) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening source file.\n");
-+		err = PTR_ERR(src_file);
-+
-+		/* close target file */
-+		fput(tgt_file);
-+		goto out_err;
-+	}
-+
-+	/* check if the filesystem(s) support read respective write */
-+	if(!src_file->f_op->read || !tgt_file->f_op->write) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR, no fs read or write support.\n");
-+		err = -EPERM;
-+		goto out_close;
-+	}
-+
-+	/* allocate a page for transfering the data */
-+	buf = (void *) __get_free_page(GFP_KERNEL);
-+	if(!buf) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR, out of kernel mem.\n");
-+		goto out_err;
-+	}
-+
-+	tgt_file->f_pos = 0;
-+	src_file->f_pos = 0;
-+
-+	old_fs = get_fs();
-+	set_fs(KERNEL_DS);
-+
-+	/* Doing this I assume that a read operation will return a full
-+	 * buffer while there is still data to read, and a less than
-+	 * full buffer when all data has been read.
-+	 */
-+	bytes = len = PAGE_SIZE;
-+	while(bytes == len) {
-+		bytes = src_file->f_op->read(src_file, buf, len,
-+					     &src_file->f_pos);
-+		tmp = tgt_file->f_op->write(tgt_file, buf, bytes,
-+					    &tgt_file->f_pos);
-+		if(tmp != bytes) {
-+			printk(KERN_CRIT "mini_fo_cp_cont: ERROR writing.\n");
-+			goto out_close_unset;
-+		}
-+	}
-+
-+	free_page((unsigned long) buf);
-+	set_fs(old_fs);
-+	fput(tgt_file);
-+	fput(src_file);
-+	goto out;
-+
-+ out_close_unset:
-+	free_page((unsigned long) buf);
-+	set_fs(old_fs);
-+
-+ out_close:
-+	fput(tgt_file);
-+	fput(src_file);
-+
-+ out_err:
-+	dput(tgt_dentry);
-+	dput(src_dentry);
-+
-+	/* mk: not sure if this need to be done */
-+	mntput(tgt_mnt);
-+	mntput(src_mnt);
-+
-+ out:
-+	return err;
-+}
-+
-+/* mk:
-+ * ndl (no-duplicate list) stuff
-+ * This is used in mini_fo_readdir, to save the storage directory contents
-+ * and later when reading base, match them against the list in order
-+ * to avoid duplicates.
-+ */
-+
-+/* add a file specified by name and len to the ndl
-+ * Return values: 0 on success, <0 on failure.
-+ */
-+int ndl_add_entry(struct readdir_data *rd, const char *name, int len)
-+{
-+	struct ndl_entry *tmp_entry;
-+
-+	tmp_entry = (struct ndl_entry *)
-+		kmalloc(sizeof(struct ndl_entry), GFP_KERNEL);
-+	if(!tmp_entry) {
-+                printk(KERN_CRIT "mini_fo: ndl_add_entry: out of mem.\n");
-+                return -ENOMEM;
-+        }
-+        tmp_entry->name = (char*) kmalloc(len, GFP_KERNEL);
-+        if(!tmp_entry->name) {
-+                printk(KERN_CRIT "mini_fo: ndl_add_entry: out of mem.\n");
-+                return -ENOMEM;
-+        }
-+	strncpy(tmp_entry->name, name, len);
-+        tmp_entry->len = len;
-+
-+        list_add(&tmp_entry->list, &rd->ndl_list);
-+        rd->ndl_size++;
-+        return 0;
-+}
-+
-+/* delete all list entries and free memory */
-+void ndl_put_list(struct readdir_data *rd)
-+{
-+	struct list_head *tmp;
-+	struct ndl_entry *tmp_entry;
-+
-+	if(rd->ndl_size <= 0)
-+		return;
-+	while(!list_empty(&rd->ndl_list)) {
-+		tmp = rd->ndl_list.next;
-+                list_del(tmp);
-+                tmp_entry = list_entry(tmp, struct ndl_entry, list);
-+		kfree(tmp_entry->name);
-+                kfree(tmp_entry);
-+        }
-+	rd->ndl_size = 0;
-+}
-+
-+/* Check if a file specified by name and len is in the ndl
-+ * Return value: 0 if not in list, 1 if file is found in ndl.
-+ */
-+int ndl_check_entry(struct readdir_data *rd, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+	struct ndl_entry *tmp_entry;
-+
-+	if(rd->ndl_size <= 0)
-+		return 0;
-+
-+	list_for_each(tmp, &rd->ndl_list) {
-+                tmp_entry = list_entry(tmp, struct ndl_entry, list);
-+                if(tmp_entry->len != len)
-+                        continue;
-+                if(!strncmp(tmp_entry->name, name, len))
-+                        return 1;
-+        }
-+        return 0;
-+}
-+
-+/* mk:
-+ * Recursive function to create corresponding directorys in the storage fs.
-+ * The function will build the storage directorys up to dentry.
-+ */
-+int build_sto_structure(dentry_t *dir, dentry_t *dentry)
-+{
-+	int err;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	if(dentry->d_parent != dir) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: invalid parameter or meta data corruption [1].\n");
-+		return 1;
-+	}
-+
-+       	if(dtost(dir) != MODIFIED) {
-+		err = build_sto_structure(dir->d_parent, dentry->d_parent);
-+		if(err)
-+			return err;
-+	}
-+
-+	/* ok, coming back again. */
-+	check_mini_fo_dentry(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(!hidden_sto_dentry) {
-+		/*
-+		 * This is the case after creating the first
-+		 * hidden_sto_dentry.
-+		 * After one negative storage_dentry, all pointers to
-+		 * hidden_storage dentries are set to NULL. We need to
-+		 * create the negative dentry before we create the storage
-+		 * file.
-+		 */
-+		unsigned int len;
-+		const unsigned char *name;
-+		len = dtohd(dentry)->d_name.len;
-+		name = dtohd(dentry)->d_name.name;
-+		hidden_sto_dentry = lookup_one_len(name, dtohd2(dir), len);
-+		dtohd2(dentry) = hidden_sto_dentry;
-+	}
-+
-+	/* was:	hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	/* lets be safe */
-+	if(dtohd2(dir) != hidden_sto_dir_dentry) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: invalid parameter or meta data corruption [2].\n");
-+		return 1;
-+	}
-+
-+	/* check for errors in lock_parent */
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+	if(IS_ERR(hidden_sto_dir_dentry)) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: lock_parent failed.\n");
-+		return err;
-+	}
-+
-+	err = vfs_mkdir(hidden_sto_dir_dentry->d_inode,
-+			hidden_sto_dentry,
-+			dir->d_inode->i_mode);
-+
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: failed to create storage dir [1].\n");
-+		/* was: unlock_dir(dir); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&dir->d_inode->i_mutex);
-+#else
-+		up(&dir->d_inode->i_sem);
-+#endif
-+		dput(dir);
-+		return err;
-+	}
-+
-+	/* everything ok! */
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: failed to create storage dir [2].\n");
-+		/* was: unlock_dir(dir); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&dir->d_inode->i_mutex);
-+#else
-+		up(&dir->d_inode->i_sem);
-+#endif
-+		dput(dir);
-+		return 1;
-+	}
-+
-+	/* interpose the new inode and set new state */
-+	itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	dtopd(dentry)->state = MODIFIED;
-+
-+	/* initalize the wol list */
-+	itopd(dentry->d_inode)->deleted_list_size = -1;
-+	itopd(dentry->d_inode)->renamed_list_size = -1;
-+	meta_build_lists(dentry);
-+
-+	fist_copy_attr_all(dentry->d_inode, itohi2(dentry->d_inode));
-+	fist_copy_attr_timesizes(dir->d_inode,
-+				 hidden_sto_dir_dentry->d_inode);
-+	dir->d_inode->i_nlink++;
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+	return 0;
-+}
-+
-+
-+#if 0 /* unused */
-+
-+/*
-+ * Read "len" bytes from "filename" into "buf".
-+ * "buf" is in kernel space.
-+ */
-+int
-+mini_fo_read_file(const char *filename, void *buf, int len)
-+{
-+    file_t *filp;
-+    mm_segment_t oldfs;
-+    int bytes;
-+    /* Chroot? Maybe NULL isn't right here */
-+    filp = filp_open(filename, O_RDONLY, 0);
-+    if (!filp || IS_ERR(filp)) {
-+	printk("mini_fo_read_file err %d\n", (int) PTR_ERR(filp));
-+	return -1;  /* or do something else */
-+    }
-+
-+    if (!filp->f_op->read)
-+	return -2;  /* file(system) doesn't allow reads */
-+
-+    /* now read len bytes from offset 0 */
-+    filp->f_pos = 0;		/* start offset */
-+    oldfs = get_fs();
-+    set_fs(KERNEL_DS);
-+    bytes = filp->f_op->read(filp, buf, len, &filp->f_pos);
-+    set_fs(oldfs);
-+
-+    /* close the file */
-+    fput(filp);
-+
-+    return bytes;
-+}
-+
-+
-+
-+/*
-+ * Write "len" bytes from "buf" to "filename"
-+ * "buf" is in kernel space.
-+ */
-+int
-+mini_fo_write_file(const char *filename, void *buf, int len)
-+{
-+    file_t *filp;
-+    mm_segment_t oldfs;
-+    int bytes;
-+				/* Chroot? Maybe NULL isn't right here */
-+    filp = filp_open(filename, O_RDWR|O_CREAT, 0640);
-+    if (!filp || IS_ERR(filp)) {
-+	printk("mini_fo_write_file err %d\n", (int) PTR_ERR(filp));
-+	return -1;  /* or do something else */
-+    }
-+
-+    if (!filp->f_op->write)
-+	return -2;  /* file(system) doesn't allow writes */
-+
-+    /* now write len bytes from offset 0 */
-+    filp->f_pos = 0;		/* start offset */
-+    oldfs = get_fs();
-+    set_fs(KERNEL_DS);
-+    bytes = filp->f_op->write(filp, buf, len, &filp->f_pos);
-+    set_fs(oldfs);
-+
-+    /* close the file */
-+    fput(filp);
-+
-+    return bytes;
-+}
-+
-+#endif /* unused */
-+
---- /dev/null
-+++ b/fs/mini_fo/ChangeLog
-@@ -0,0 +1,281 @@
-+2006-01-24  Markus Klotzbuecher  <mk@mary.denx.de>
-+
-+	* Add tons of ugly ifdefs to Ed L. Cashin's mutex patch to
-+          retain backwards compatibility.
-+
-+2006-01-24  Ed L. Cashin <ecashin@coraid.com>
-+
-+	* Support for the new mutex infrastructure
-+	(7892f2f48d165a34b0b8130c8a195dfd807b8cb6)
-+
-+2005-10-15  Markus Klotzbuecher  <mk@localhost.localdomain>
-+
-+	* Bugfix for a serious memory leak in mini_fo_follow_link.
-+
-+2005-09-21  Markus Klotzbuecher  <mk@mary>
-+
-+	* new release 0.6.1
-+
-+	* fix of a compiler warning due to changes in 2.6.13
-+
-+2005-09-21  Klaus Wenninger  <klaus.wenninger@siemens.com>
-+
-+	* file.c: readdir: fix for a bug that caused directory entries
-+          to show up twice when using storage filesystems such as
-+          minixfs or pramfs.
-+
-+2005-06-30  Eric Lammerts <eric@lammerts.org>
-+
-+	* fix for an oops when overwriting a binary thats beeing
-+          executed.
-+
-+2005-06-09    <mk@mary>
-+
-+	* Renamed overlay to mini_fo-overlay.
-+
-+	* Added mini_fo-merge script to allow merging of storage and base
-+	after making modifications.
-+
-+2005-05-22  root  <mk@mary>
-+
-+	* Added overlay script that allows to easily mount mini_fo ontop
-+	of a given base directory
-+
-+2005-05-10    <mk@mary>
-+
-+	* inode.c: xattr functions return -EOPNOSUPP instead of
-+          -ENOSUPP, what confuses "ls -l"
-+
-+	* Changed license from LGPL to GPL.
-+
-+2005-05-08  root  <mk@mary>
-+
-+	* Makefile: clean it up and added make install and make
-+          uninstall.
-+
-+2005-05-06    <mk@mary>
-+
-+	* merged devel branch back to main. [v0-6-0-pre3]
-+
-+	* removed unused files print.c and fist_ioctl. [devel-0-0-18]
-+
-+	* ioctl: removed fist_ioctl stuff, that is not needed for
-+          now.
-+
-+2005-05-03    <mk@mary>
-+
-+	* file.c: simplified mini_fo_open and mini_fo_setattr using
-+          new state changing functions. [devel-0-0-17]
-+
-+	* inode.c: Fixed getattr state bug (see below) in 2.4 function
-+          mini_fo_inode revalidate.
-+
-+	* inode.c: found an other bug in mini_fo_getattr. States are not
-+	  reliable in this function, as a file can be opened, unlinked and
-+	  the getattr function called. This results in a deleted dentry
-+	  with an inode. Fix is to ignore states and simply use the inode
-+	  available.
-+
-+2005-04-29    <mk@mary>
-+
-+	* file.c: Bugfix and cleanup in fasync and fsync. [devel-0-0-16]
-+
-+	* file.c: do not use mini_fo_lock so the generic version is
-+          used (I guess).
-+
-+	* inode.c: getattr, never call getattr on lower files, as this
-+          will cause the inum to change.
-+
-+	* inode.c: rename_reg_file renamed to rename_nondir, as it
-+          doesn't matter as long it't not a dir. Removed all
-+          rename_dev_file etc.
-+
-+	* tagged as devel-0-0-15
-+
-+	* inode.c: added support for chosing support for extended
-+          attrs at compile time by XATTR define in mini_fo.h .
-+
-+	* inode.c: fixed mini_fo_getattr to use mini_fo inode and not
-+          lower again, what avoids inode number changes that confused
-+          rm again. This is the proper solution.
-+
-+2005-04-24    <mk@mary>
-+
-+	* all files: updated Copyright notive to 2005. [devel-0-0-14]
-+
-+	* inode.c: fixed mini_fo_getattr to not change the inode
-+          number, even if lower files change.
-+
-+	* super.c: fixed a bug that caused deleted base file to show
-+          up suddenly after some time, or after creating a special
-+          file. The problem was that after some time or after special
-+          file creating sync_sb_inodes is called by the vfs, that
-+          called our mini_fo_put_inode. There was (wrongly) called
-+          __meta_put_lists, that nuked the lists, although the inode
-+          was going to continue its life. Moving __meta_put_lists to
-+          mini_fo_clear_inode, where an inode is really destroyed,
-+          solved the problem.
-+
-+
-+2005-04-23    <mk@mary>
-+
-+	* state.c, aux.c: more cleaning up and
-+          simplifications. [devel-0-0-13]
-+
-+	* inode.c: implemented mini_fo_getattr, that was required for
-+          2.6 because inode_revalidate has been remove there, and the
-+	  old "du" bug returned.
-+
-+
-+2005-04-20    <mk@mary>
-+
-+	* aux.c: get_neg_sto_dentry(): allow to be called for dentries
-+          in state UNMODIFIED, NON_EXISTANT _and_ DELETED.
-+
-+2005-04-19    <mk@mary>
-+
-+	* Fixed a bug under 2.6 that caused files deleted via mini_fo
-+          not to be deleted properly and therefore the fs filled up
-+          untill no memory was left. [devel-0-0-12]
-+
-+	* Added basic hard link support. This means that creating
-+          hardlinks will work, but existing ones will be treated as
-+          individual files. [devel-0-0-11]
-+
-+2005-04-17    <mk@mary>
-+
-+	* Bugfixes
-+
-+2005-04-13  root  <mk@mary>
-+
-+	* Added file state.c for the state transition
-+          functions. Doesn't work very well yet, though...
-+
-+2005-04-12    <mk@mary>
-+
-+	* Porting to 2.6 started, which is easier than expected, also
-+          due to Olivier previous work.
-+
-+2005-04-08    <mk@mary>
-+
-+	* Fixed the bug that caused du to return invalid sizes of
-+          directory trees. The problem was that
-+          mini_fo_inode_revalidate didn't always copy the attributes
-+          from the base inode properly.
-+
-+2005-04-01  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Merged devel branch back to main trunk and updated the
-+          RELEASE notes. This will be 0-6-0-pre1.
-+
-+2005-03-31  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Fixed some bugs in rename_reg_file, that only showed up in
-+          the kernel compile test. Kernel compiles cleanly ontop of
-+          mini_fo, now also make mrproper etc. work. Seems pretty stable.
-+
-+2005-03-28  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Many, many directory renaming bugfixes and a lot of other
-+          cleanup. Dir renaming seems to work relatively stable.
-+
-+2005-03-22  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Finished implementing lightweight directory renaming. Some
-+          basic testing indicates it works fine.
-+	  Next is to implement testcases for the testsuite and confirm
-+          everything is really working ok.
-+
-+2005-03-18  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Finished implementing meta.c stuff required for directory
-+          renaming.
-+
-+2005-03-17  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Fixed all compile warnings + an extremly old bug that
-+          somehow crept in while reworking the wol stuff to the META
-+          system. Turning on -Werror again... :-)
-+
-+	* Fixed some bugs in the new rename_reg_file function.
-+
-+	* Rewrote mini_fo rename and split it into several
-+          subfunctions, that handle the different types
-+          seperately. Rewrote the regular file function aswell, as it
-+          was implemented somewhat inefficient.
-+
-+2005-03-16  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Implemented new META subsystem, removed old WOL stuff in favor
-+	  if it.
-+
-+	* After some basic testing everything seems ok...
-+
-+2005-03-11  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Renaming a non regular file caused trouble because I always
-+	  tried to copy the contents. Now I only do this for regular
-+	  files. mini_fo_rename still isn't implemented properly, renaming
-+	  of device files, symlinks etc. results in a empty regular file
-+	  instead of the proper type.
-+
-+	* Directory renaming suddenly works! What a surprise! I guess
-+          this is because renaming is implemented as making a copy and
-+          removing the original. Still this might not work
-+          everywhere...
-+
-+2005-03-09  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Bugfix, when a mini_fo directory that exists in storage
-+  	  (state: MODIFIED, CREATED and DEL_REWRITTEN) is deleted, a
-+  	  possibly existing WOL file contained in it needs to be
-+  	  deleted too.
-+
-+	* Starting cleanup: defined state names in order to get rid of
-+          the state numbers.
-+
-+2005-03-08  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Makefile fix, fist_ioctl was built against wrong sources if ARCH=um
-+
-+	* Fixed a bug in dentry.c, mini_fo_d_hash. In state 4 =
-+          DEL_REWRITTEN the hash was calculated from the base dentry,
-+          which was wrong and and caused assertions in
-+          __mini_fo_hidden_dentry to fail.
-+
-+2005-02-21    <mk@mary>
-+
-+	* Implemented directory deleting (inode.c)
-+
-+	* main.c: made mini_fo_parse_options a little more robust.
-+
-+2004-12-22    <mk@mary>
-+
-+	* Makefile cleanup and uml stuff, removed unneccessary files
-+
-+	* Created a new and hopefully more informative README
-+
-+	* CHANGELOG: created a new CHANGELOG and added old entries reversely
-+
-+
-+2004-10-24 Gleb Natapov <gleb@nbase.co.il>
-+
-+	* Fix: owner and group where not correctly copied from base to
-+          storage.
-+
-+
-+2004-10-05 Gleb Natapov <gleb@nbase.co.il>
-+
-+	* Implementation of fsync, fasync and lock mini_fo functions.
-+
-+
-+2004-09-29 Bob Lee <bob@pantasys.com>
-+
-+	* Fix of a serious pointer bug
-+
-+
-+2004-09-28 Gleb Natapov <gleb@nbase.co.il>
-+
-+	* Implementation of mini_fo_mknod and mini_fo_rename, support
-+          for device files.
-+
---- /dev/null
-+++ b/fs/mini_fo/dentry.c
-@@ -0,0 +1,244 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+/*
-+ * THIS IS A BOOLEAN FUNCTION: returns 1 if valid, 0 otherwise.
-+ */
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_d_revalidate(dentry_t *dentry, struct nameidata *nd)
-+#else
-+mini_fo_d_revalidate(dentry_t *dentry, int flags)
-+#endif
-+{
-+	int err1 = 1; /* valid = 1, invalid = 0 */
-+	int err2 = 1;
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	hidden_dentry  = dtohd(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(hidden_dentry &&
-+	   hidden_dentry->d_op &&
-+	   hidden_dentry->d_op->d_revalidate) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		err1 = hidden_dentry->d_op->d_revalidate(hidden_dentry, nd);
-+#else
-+		err1 = hidden_dentry->d_op->d_revalidate(hidden_dentry, flags);
-+#endif
-+	}
-+	if(hidden_sto_dentry &&
-+	   hidden_sto_dentry->d_op &&
-+	   hidden_sto_dentry->d_op->d_revalidate) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		err2 = hidden_sto_dentry->d_op->d_revalidate(hidden_sto_dentry,
-+							     nd);
-+#else
-+		err2 = hidden_sto_dentry->d_op->d_revalidate(hidden_sto_dentry,
-+							     flags);
-+#endif
-+	}
-+
-+	/* mk: if one of the lower level dentries are valid,
-+	 * the mini_fo dentry is too.
-+	 */
-+	return (err1 || err2);
-+}
-+
-+
-+STATIC int
-+mini_fo_d_hash(dentry_t *dentry, qstr_t *name)
-+{
-+	int err = 0;
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+	/* hidden_dentry = mini_fo_hidden_dentry(dentry);
-+	 * hidden_sto_dentry = mini_fo_hidden_sto_dentry(dentry); */
-+
-+	/* state 1, 3, 4, 5: build the hash for the storage dentry */
-+	if((dtopd(dentry)->state == MODIFIED) ||
-+	   (dtopd(dentry)->state == CREATED) ||
-+	   (dtopd(dentry)->state == DEL_REWRITTEN) ||
-+	   (dtopd(dentry)->state == DELETED)) {
-+		hidden_sto_dentry = dtohd2(dentry);
-+		if(hidden_sto_dentry &&
-+		   hidden_sto_dentry->d_op &&
-+		   hidden_sto_dentry->d_op->d_hash) {
-+			err = hidden_sto_dentry->d_op->d_hash(hidden_sto_dentry, name);
-+		}
-+		goto out;
-+	}
-+	/* state 2: build the hash for the base dentry */
-+	if(dtopd(dentry)->state == UNMODIFIED) {
-+		hidden_dentry = dtohd(dentry);
-+		if(hidden_dentry &&
-+		   hidden_dentry->d_op &&
-+		   hidden_dentry->d_op->d_hash) {
-+			err = hidden_dentry->d_op->d_hash(hidden_dentry, name);
-+		}
-+		goto out;
-+	}
-+	/* state 6: build hash for the dentry that exists */
-+	if(dtopd(dentry)->state == NON_EXISTANT) {
-+		hidden_sto_dentry = dtohd2(dentry);
-+		if(hidden_sto_dentry &&
-+		   hidden_sto_dentry->d_op &&
-+		   hidden_sto_dentry->d_op->d_hash) {
-+			err = hidden_sto_dentry->d_op->d_hash(hidden_sto_dentry, name);
-+			goto out;
-+		}
-+		hidden_dentry = dtohd(dentry);
-+		if(hidden_dentry &&
-+		   hidden_dentry->d_op &&
-+		   hidden_dentry->d_op->d_hash) {
-+			err = hidden_dentry->d_op->d_hash(hidden_dentry, name);
-+			goto out;
-+		}
-+	}
-+
-+	printk(KERN_CRIT "mini_fo: d_hash: invalid state detected.\n");
-+
-+ out:
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_d_compare(dentry_t *dentry, qstr_t *a, qstr_t *b)
-+{
-+	int err;
-+	dentry_t *hidden_dentry=NULL;
-+
-+	/* hidden_dentry = mini_fo_hidden_dentry(dentry); */
-+	if(dtohd2(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else if(dtohd(dentry))
-+		hidden_dentry = dtohd(dentry);
-+
-+	if (hidden_dentry && hidden_dentry->d_op && hidden_dentry->d_op->d_compare) {
-+		err = hidden_dentry->d_op->d_compare(hidden_dentry, a, b);
-+	} else {
-+		err = ((a->len != b->len) || memcmp(a->name, b->name, b->len));
-+	}
-+
-+	return err;
-+}
-+
-+
-+int
-+mini_fo_d_delete(dentry_t *dentry)
-+{
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+	int err = 0;
-+
-+	/* this could be a negative dentry, so check first */
-+	if (!dtopd(dentry)) {
-+		printk(KERN_CRIT "mini_fo_d_delete: negative dentry passed.\n");
-+		goto out;
-+	}
-+	hidden_dentry = dtohd(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(hidden_dentry) {
-+		if(hidden_dentry->d_op &&
-+		   hidden_dentry->d_op->d_delete) {
-+			err = hidden_dentry->d_op->d_delete(hidden_dentry);
-+		}
-+	}
-+	if(hidden_sto_dentry) {
-+		if(hidden_sto_dentry->d_op &&
-+		   hidden_sto_dentry->d_op->d_delete) {
-+			err = hidden_sto_dentry->d_op->d_delete(hidden_sto_dentry);
-+		}
-+	}
-+
-+ out:
-+	return err;
-+}
-+
-+
-+void
-+mini_fo_d_release(dentry_t *dentry)
-+{
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+
-+	/* this could be a negative dentry, so check first */
-+	if (!dtopd(dentry)) {
-+		printk(KERN_CRIT "mini_fo_d_release: no private data.\n");
-+		goto out;
-+	}
-+	hidden_dentry = dtohd(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(hidden_dentry) {
-+		/* decrement hidden dentry's counter and free its inode */
-+		dput(hidden_dentry);
-+	}
-+	if(hidden_sto_dentry) {
-+                /* decrement hidden dentry's counter and free its inode */
-+		dput(hidden_sto_dentry);
-+	}
-+
-+	/* free private data (mini_fo_dentry_info) here */
-+	kfree(dtopd(dentry));
-+	__dtopd(dentry) = NULL;	/* just to be safe */
-+ out:
-+	return;
-+}
-+
-+
-+/*
-+ * we don't really need mini_fo_d_iput, because dentry_iput will call iput() if
-+ * mini_fo_d_iput is not defined. We left this implemented for ease of
-+ * tracing/debugging.
-+ */
-+void
-+mini_fo_d_iput(dentry_t *dentry, inode_t *inode)
-+{
-+	iput(inode);
-+}
-+
-+
-+struct dentry_operations mini_fo_dops = {
-+	d_revalidate:	mini_fo_d_revalidate,
-+	d_hash:		mini_fo_d_hash,
-+	d_compare:		mini_fo_d_compare,
-+	d_release:		mini_fo_d_release,
-+	d_delete:		mini_fo_d_delete,
-+	d_iput:		mini_fo_d_iput,
-+};
---- /dev/null
-+++ b/fs/mini_fo/file.c
-@@ -0,0 +1,713 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+#define ROUND_UP(x) (((x)+sizeof(long)-1) & ~(sizeof(long)-1))
-+
-+/*******************
-+ * File Operations *
-+ *******************/
-+
-+STATIC loff_t
-+mini_fo_llseek(file_t *file, loff_t offset, int origin)
-+{
-+	loff_t err;
-+	file_t *hidden_file = NULL;
-+
-+	if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {
-+		/* Check if trying to llseek from a directory */
-+		err = -EISDIR;
-+		goto out;
-+	}
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	/* always set hidden position to this one */
-+	hidden_file->f_pos = file->f_pos;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	memcpy(&(hidden_file->f_ra),
-+	       &(file->f_ra),
-+	       sizeof(struct file_ra_state));
-+#else
-+	if (file->f_reada) { /* update readahead information if needed */
-+		hidden_file->f_reada = file->f_reada;
-+		hidden_file->f_ramax = file->f_ramax;
-+		hidden_file->f_raend = file->f_raend;
-+		hidden_file->f_ralen = file->f_ralen;
-+		hidden_file->f_rawin = file->f_rawin;
-+	}
-+#endif
-+	if (hidden_file->f_op && hidden_file->f_op->llseek)
-+		err = hidden_file->f_op->llseek(hidden_file, offset, origin);
-+	else
-+		err = generic_file_llseek(hidden_file, offset, origin);
-+
-+	if (err < 0)
-+		goto out;
-+
-+	if (err != file->f_pos) {
-+		file->f_pos = err;
-+		// ION maybe this?
-+		// 	file->f_pos = hidden_file->f_pos;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		file->f_reada = 0;
-+#endif
-+		file->f_version++;
-+	}
-+
-+ out:
-+	return err;
-+}
-+
-+
-+/* mk: fanout capable */
-+STATIC ssize_t
-+mini_fo_read(file_t *file, char *buf, size_t count, loff_t *ppos)
-+{
-+	int err = -EINVAL;
-+	file_t *hidden_file = NULL;
-+	loff_t pos = *ppos;
-+
-+	if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {
-+		/* Check if trying to read from a directory */
-+		/* printk(KERN_CRIT "mini_fo_read: ERROR: trying to read data from a directory.\n"); */
-+		err = -EISDIR;
-+		goto out;
-+	}
-+
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	if (!hidden_file->f_op || !hidden_file->f_op->read)
-+		goto out;
-+
-+	err = hidden_file->f_op->read(hidden_file, buf, count, &pos);
-+	*ppos = pos;
-+
-+	if (err >= 0) {
-+		/* atime should also be updated for reads of size zero or more */
-+		fist_copy_attr_atime(file->f_dentry->d_inode,
-+				     hidden_file->f_dentry->d_inode);
-+	}
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	/*
-+	 * MAJOR HACK
-+	 * because pread() does not have any way to tell us that it is
-+	 * our caller, then we don't know for sure if we have to update
-+	 * the file positions.  This hack relies on read() having passed us
-+	 * the "real" pointer of its struct file's f_pos field.
-+	 */
-+	if (ppos == &file->f_pos)
-+		hidden_file->f_pos = *ppos = pos;
-+	if (hidden_file->f_reada) { /* update readahead information if needed */
-+		file->f_reada = hidden_file->f_reada;
-+		file->f_ramax = hidden_file->f_ramax;
-+		file->f_raend = hidden_file->f_raend;
-+		file->f_ralen = hidden_file->f_ralen;
-+		file->f_rawin = hidden_file->f_rawin;
-+	}
-+#else
-+	memcpy(&(file->f_ra),&(hidden_file->f_ra),sizeof(struct file_ra_state));
-+#endif
-+
-+ out:
-+	return err;
-+}
-+
-+
-+/* this mini_fo_write() does not modify data pages! */
-+STATIC ssize_t
-+mini_fo_write(file_t *file, const char *buf, size_t count, loff_t *ppos)
-+{
-+	int err = -EINVAL;
-+	file_t *hidden_file = NULL;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	loff_t pos = *ppos;
-+
-+	/* mk: fan out: */
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			/* This is bad! We have no storage file to write to. This
-+			 * should never happen because if a file is opened for
-+			 * writing, a copy should have been made earlier.
-+			 */
-+			printk(KERN_CRIT "mini_fo: write : ERROR, no storage file to write.\n");
-+			err = -EINVAL;
-+			goto out;
-+		}
-+	}
-+
-+	inode = file->f_dentry->d_inode;
-+	hidden_inode = itohi2(inode);
-+	if(!hidden_inode) {
-+		printk(KERN_CRIT "mini_fo: write: no sto inode found, not good.\n");
-+		goto out;
-+	}
-+
-+	if (!hidden_file->f_op || !hidden_file->f_op->write)
-+		goto out;
-+
-+	/* adjust for append -- seek to the end of the file */
-+	if (file->f_flags & O_APPEND)
-+		pos = inode->i_size;
-+
-+	err = hidden_file->f_op->write(hidden_file, buf, count, &pos);
-+
-+	/*
-+	 * copy ctime and mtime from lower layer attributes
-+	 * atime is unchanged for both layers
-+	 */
-+	if (err >= 0)
-+		fist_copy_attr_times(inode, hidden_inode);
-+
-+	*ppos = pos;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	/*
-+	 * XXX: MAJOR HACK
-+	 *
-+	 * because pwrite() does not have any way to tell us that it is
-+	 * our caller, then we don't know for sure if we have to update
-+	 * the file positions.  This hack relies on write() having passed us
-+	 * the "real" pointer of its struct file's f_pos field.
-+	 */
-+	if (ppos == &file->f_pos)
-+		hidden_file->f_pos = *ppos = pos;
-+#endif
-+	/* update this inode's size */
-+	if (pos > inode->i_size)
-+		inode->i_size = pos;
-+
-+ out:
-+	return err;
-+}
-+
-+/* Global variable to hold a file_t pointer.
-+ * This serves to allow mini_fo_filldir function to know which file is
-+ * beeing read, which is required for two reasons:
-+ *
-+ *   - be able to call wol functions in order to avoid listing deleted
-+ *     base files.
-+ *   - if we're reading a directory which is in state 1, we need to
-+ *     maintain a list (in mini_fo_filldir) of which files allready
-+ *     have been copied to userspace,to detect files existing in base
-+ *     and storage and not list them twice.
-+ */
-+filldir_t mini_fo_filldir_orig;
-+file_t *mini_fo_filldir_file;
-+
-+/* mainly copied from fs/readdir.c */
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_filldir(void * __buf, const char * name, int namlen, loff_t offset,
-+		  u64 ino, unsigned int d_type)
-+#else
-+mini_fo_filldir(void * __buf, const char * name, int namlen, loff_t offset,
-+		  ino_t ino, unsigned int d_type)
-+#endif
-+{
-+	struct getdents_callback * buf = (struct getdents_callback *) __buf;
-+	file_t* file = mini_fo_filldir_file;
-+
-+	/* In theses states we filter meta files in storage (WOL) */
-+	if(file && (dtopd(file->f_dentry)->state == MODIFIED ||
-+		    dtopd(file->f_dentry)->state == CREATED ||
-+		    dtopd(file->f_dentry)->state == DEL_REWRITTEN)) {
-+
-+		int tmp = strlen(META_FILENAME);
-+		if(tmp  == namlen) {
-+			if(!strncmp(name, META_FILENAME, namlen))
-+				return 0;
-+		}
-+	}
-+
-+	/* check if we are merging the contents of storage and base */
-+	if(file && dtopd(file->f_dentry)->state == MODIFIED) {
-+		/* check if we are still reading storage contents, if
-+		 * yes, we just save the name of the file for duplicate
-+		 * checking later. */
-+
-+		if(!ftopd(file)->rd.sto_done) {
-+			/* put file into ndl list */
-+			if(ndl_add_entry(&ftopd(file)->rd, name, namlen))
-+				printk(KERN_CRIT "mini_fo_filldir: Error adding to ndl.\n");
-+		} else {
-+			/* check if file has been deleted */
-+			if(meta_check_d_entry(file->f_dentry, name, namlen))
-+				return 0;
-+
-+			/* do duplicate checking */
-+			if(ndl_check_entry(&ftopd(file)->rd, name, namlen))
-+				return 0;
-+		}
-+	}
-+
-+	return mini_fo_filldir_orig(buf, name, namlen, offset, ino, d_type);
-+}
-+
-+
-+STATIC int
-+mini_fo_readdir(file_t *file, void *dirent, filldir_t filldir)
-+{
-+	int err = 0;/* mk: ??? -ENOTDIR; */
-+	file_t *hidden_file = NULL;
-+	file_t *hidden_sto_file = NULL;
-+	inode_t *inode;
-+	struct getdents_callback *buf;
-+	int oldcount;
-+
-+#if defined(FIST_FILTER_NAME) || defined(FIST_FILTER_SCA)
-+	struct mini_fo_getdents_callback buf;
-+#endif /* FIST_FILTER_NAME || FIST_FILTER_SCA */
-+
-+	buf = (struct getdents_callback *) dirent;
-+	oldcount = buf->count;
-+	inode = file->f_dentry->d_inode;
-+	mini_fo_filldir_file = file;
-+	mini_fo_filldir_orig = filldir;
-+
-+	ftopd(file)->rd.sto_done = 0;
-+	do {
-+		if (ftopd(file) != NULL) {
-+			if(ftohf2(file)) {
-+				hidden_sto_file = ftohf2(file);
-+				err = vfs_readdir(hidden_sto_file, mini_fo_filldir, dirent);
-+				file->f_pos = hidden_sto_file->f_pos;
-+				if (err > 0)
-+					fist_copy_attr_atime(inode, hidden_sto_file->f_dentry->d_inode);
-+				/* not finshed yet, we'll be called again */
-+				if (buf->count != oldcount)
-+					break;
-+			}
-+
-+			ftopd(file)->rd.sto_done = 1;
-+
-+			if(ftohf(file)) {
-+				hidden_file = ftohf(file);
-+				err = vfs_readdir(hidden_file, mini_fo_filldir, dirent);
-+				file->f_pos = hidden_file->f_pos;
-+				if (err > 0)
-+					fist_copy_attr_atime(inode, hidden_file->f_dentry->d_inode);
-+			}
-+
-+		}
-+	} while (0);
-+
-+	/* mk:
-+	 * we need to check if all the directory data has been copied to userspace,
-+	 * or if we will be called again by userspace to complete the operation.
-+	 */
-+	if(buf->count == oldcount) {
-+		ndl_put_list(&ftopd(file)->rd);
-+	}
-+
-+	/* unset this, safe */
-+	mini_fo_filldir_file = NULL;
-+	return err;
-+}
-+
-+
-+STATIC unsigned int
-+mini_fo_poll(file_t *file, poll_table *wait)
-+{
-+	unsigned int mask = DEFAULT_POLLMASK;
-+	file_t *hidden_file = NULL;
-+
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	if (!hidden_file->f_op || !hidden_file->f_op->poll)
-+		goto out;
-+
-+	mask = hidden_file->f_op->poll(hidden_file, wait);
-+
-+ out:
-+	return mask;
-+}
-+
-+/* FIST-LITE special version of mmap */
-+STATIC int
-+mini_fo_mmap(file_t *file, vm_area_t *vma)
-+{
-+	int err = 0;
-+	file_t *hidden_file = NULL;
-+
-+	/* fanout capability */
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	ASSERT(hidden_file != NULL);
-+	ASSERT(hidden_file->f_op != NULL);
-+	ASSERT(hidden_file->f_op->mmap != NULL);
-+
-+	vma->vm_file = hidden_file;
-+	err = hidden_file->f_op->mmap(hidden_file, vma);
-+	get_file(hidden_file); /* make sure it doesn't get freed on us */
-+	fput(file);	       /* no need to keep extra ref on ours */
-+
-+	return err;
-+}
-+
-+
-+
-+STATIC int
-+mini_fo_open(inode_t *inode, file_t *file)
-+{
-+	int err = 0;
-+ 	int hidden_flags;
-+	file_t *hidden_file = NULL;
-+	dentry_t *hidden_dentry = NULL;
-+
-+	/* fanout stuff */
-+	file_t *hidden_sto_file = NULL;
-+	dentry_t *hidden_sto_dentry = NULL;
-+
-+	__ftopd(file) =
-+		kmalloc(sizeof(struct mini_fo_file_info), GFP_KERNEL);
-+	if (!ftopd(file)) {
-+		err = -ENOMEM;
-+		goto out;
-+	}
-+
-+	/* init the readdir_helper structure */
-+	INIT_LIST_HEAD(&ftopd(file)->rd.ndl_list);
-+	ftopd(file)->rd.ndl_size = 0;
-+
-+	/* In certain paths this could stay uninitalized and cause trouble */
-+	ftohf(file) = NULL;
-+	ftohf2(file) = NULL;
-+	hidden_flags = file->f_flags;
-+
-+	/* create storage files? */
-+	if(dtost(file->f_dentry) == UNMODIFIED) {
-+		if(!IS_WRITE_FLAG(file->f_flags)) {
-+			hidden_dentry = dtohd(file->f_dentry);
-+			dget(hidden_dentry);
-+			/* dentry_open will decrement mnt refcnt if err.
-+			 * otherwise fput() will do an mntput() for us upon file close. */
-+			mntget(stopd(inode->i_sb)->hidden_mnt);
-+			hidden_file = dentry_open(hidden_dentry,
-+						  stopd(inode->i_sb)->hidden_mnt,
-+						  hidden_flags);
-+			if (IS_ERR(hidden_file)) {
-+				err = PTR_ERR(hidden_file);
-+				dput(hidden_dentry);
-+				goto out;
-+			}
-+			ftohf(file) = hidden_file;	/* link two files */
-+			goto out;
-+		}
-+		else {
-+			if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {
-+				err = dir_unmod_to_mod(file->f_dentry);
-+			} else
-+				err = nondir_unmod_to_mod(file->f_dentry, 1);
-+
-+			if (err) {
-+				printk("mini_fo_open: ERROR creating storage file.\n");
-+				goto out;
-+			}
-+		}
-+	}
-+	hidden_sto_dentry = dtohd2(file->f_dentry);
-+	dget(hidden_sto_dentry);
-+
-+	if(dtopd(file->f_dentry)->state == MODIFIED) {
-+		/* Directorys are special, interpose on both lower level files */
-+		if(S_ISDIR(itohi(inode)->i_mode)) {
-+			/* check for invalid file types of lower level files */
-+			if(!(S_ISDIR(itohi(inode)->i_mode) && S_ISDIR(itohi2(inode)->i_mode))) {
-+				printk(KERN_CRIT "mini_fo_open: meta data corruption detected.\n");
-+				dput(hidden_sto_dentry);
-+				err = -EINVAL;
-+				goto out;
-+			}
-+
-+			/* lower level directorys are ok, open the base file */
-+			hidden_dentry = dtohd(file->f_dentry);
-+			dget(hidden_dentry);
-+
-+			mntget(stopd(inode->i_sb)->hidden_mnt);
-+			hidden_file = dentry_open(hidden_dentry,
-+						  stopd(inode->i_sb)->hidden_mnt,
-+						  hidden_flags);
-+			if (IS_ERR(hidden_file)) {
-+				err = PTR_ERR(hidden_file);
-+				dput(hidden_dentry);
-+				dput(hidden_sto_dentry);
-+				goto out;
-+			}
-+			ftohf(file) = hidden_file; /* link the two files */
-+		}
-+	}
-+
-+	if(!exists_in_storage(file->f_dentry)) {
-+		printk(KERN_CRIT "mini_fo_open: invalid file state detected.\n");
-+		err = -EINVAL;
-+		dput(hidden_sto_dentry);
-+
-+		/* If the base file has been opened, we need to close it here */
-+		if(ftohf(file)) {
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				hidden_file->f_op->flush(hidden_file, NULL);
-+#else
-+				hidden_file->f_op->flush(hidden_file);
-+#endif
-+			dput(hidden_dentry);
-+		}
-+		goto out;
-+	}
-+
-+	/* ok, now we can safely open the storage file */
-+	mntget(stopd(inode->i_sb)->hidden_mnt2);
-+	hidden_sto_file = dentry_open(hidden_sto_dentry,
-+				      stopd(inode->i_sb)->hidden_mnt2,
-+				      hidden_flags);
-+
-+	/* dentry_open dputs the dentry if it fails */
-+	if (IS_ERR(hidden_sto_file)) {
-+		err = PTR_ERR(hidden_sto_file);
-+		/* close base file if open */
-+		if(ftohf(file)) {
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				hidden_file->f_op->flush(hidden_file, NULL);
-+#else
-+				hidden_file->f_op->flush(hidden_file);
-+#endif
-+			dput(hidden_dentry);
-+		}
-+		goto out;
-+	}
-+	ftohf2(file) = hidden_sto_file; /* link storage file */
-+
-+ out:
-+	if (err < 0 && ftopd(file)) {
-+		kfree(ftopd(file));
-+	}
-+	return err;
-+}
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_flush(file_t *file, fl_owner_t id)
-+#else
-+mini_fo_flush(file_t *file)
-+#endif
-+{
-+	int err1 = 0;		/* assume ok (see open.c:close_fp) */
-+	int err2 = 0;
-+	file_t *hidden_file = NULL;
-+
-+	check_mini_fo_file(file);
-+
-+	/* mk: we don't do any state checking here, as its not worth the time.
-+	 * Just flush the lower level files if they exist.
-+	 */
-+	if(ftopd(file) != NULL) {
-+		if(ftohf(file) != NULL) {
-+			hidden_file = ftohf(file);
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				err1 = hidden_file->f_op->flush(hidden_file, id);
-+#else
-+				err1 = hidden_file->f_op->flush(hidden_file);
-+#endif
-+		}
-+		if(ftohf2(file) != NULL) {
-+			hidden_file = ftohf2(file);
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				err2 = hidden_file->f_op->flush(hidden_file, id);
-+#else
-+				err2 = hidden_file->f_op->flush(hidden_file);
-+#endif
-+		}
-+	}
-+	return (err1 | err2);
-+}
-+
-+
-+STATIC int
-+mini_fo_release(inode_t *inode, file_t *file)
-+{
-+	int err = 0;
-+	file_t *hidden_file = NULL;
-+
-+	if (ftopd(file) != NULL) {
-+		if(ftohf(file)) {
-+			hidden_file = ftohf(file);
-+			fput(hidden_file);
-+		}
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+			fput(hidden_file);
-+		}
-+		kfree(ftopd(file));
-+	}
-+	return err;
-+}
-+
-+STATIC int
-+mini_fo_fsync(file_t *file, dentry_t *dentry, int datasync)
-+{
-+	int err1 = 0;
-+	int err2 = 0;
-+	file_t *hidden_file = NULL;
-+	dentry_t *hidden_dentry;
-+
-+	check_mini_fo_file(file);
-+
-+	if ((hidden_file = ftohf(file)) != NULL) {
-+		hidden_dentry = dtohd(dentry);
-+		if (hidden_file->f_op && hidden_file->f_op->fsync) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+			err1 = hidden_file->f_op->fsync(hidden_file, hidden_dentry, datasync);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		}
-+	}
-+
-+	if ((hidden_file = ftohf2(file)) != NULL) {
-+		hidden_dentry = dtohd2(dentry);
-+		if (hidden_file->f_op && hidden_file->f_op->fsync) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+			err2 = hidden_file->f_op->fsync(hidden_file, hidden_dentry, datasync);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		}
-+	}
-+	else
-+		goto err;
-+
-+err:
-+	return (err1 || err2);
-+}
-+
-+
-+STATIC int
-+mini_fo_fasync(int fd, file_t *file, int flag)
-+{
-+	int err1 = 0;
-+	int err2 = 0;
-+
-+	file_t *hidden_file = NULL;
-+
-+	check_mini_fo_file(file);
-+
-+	if((hidden_file = ftohf(file)) != NULL) {
-+		err1 = hidden_file->f_op->fasync(fd, hidden_file, flag);
-+	}
-+	if((hidden_file = ftohf2(file)) != NULL) {
-+		err2 = hidden_file->f_op->fasync(fd, hidden_file, flag);
-+	}
-+
-+	return (err1 || err2);
-+}
-+
-+
-+
-+struct file_operations mini_fo_dir_fops =
-+	{
-+		read:	generic_read_dir,
-+		write:	mini_fo_write,
-+		readdir: mini_fo_readdir,
-+		poll:	mini_fo_poll,
-+		/* ioctl:	mini_fo_ioctl, */
-+		mmap:	mini_fo_mmap,
-+		open:	mini_fo_open,
-+		flush:	mini_fo_flush,
-+		release: mini_fo_release,
-+		fsync:	mini_fo_fsync,
-+		fasync:	mini_fo_fasync,
-+		/* not needed lock:	mini_fo_lock, */
-+		/* not needed: readv */
-+		/* not needed: writev */
-+		/* not implemented: sendpage */
-+		/* not implemented: get_unmapped_area */
-+	};
-+
-+struct file_operations mini_fo_main_fops =
-+	{
-+		llseek:	mini_fo_llseek,
-+		read:	mini_fo_read,
-+		write:	mini_fo_write,
-+		readdir: mini_fo_readdir,
-+		poll:	mini_fo_poll,
-+		/* ioctl:	mini_fo_ioctl, */
-+		mmap:	mini_fo_mmap,
-+		open:	mini_fo_open,
-+		flush:	mini_fo_flush,
-+		release: mini_fo_release,
-+		fsync:	mini_fo_fsync,
-+		fasync:	mini_fo_fasync,
-+		/* not needed: lock:	mini_fo_lock, */
-+		/* not needed: readv */
-+		/* not needed: writev */
-+		/* not implemented: sendpage */
-+		/* not implemented: get_unmapped_area */
-+	};
---- /dev/null
-+++ b/fs/mini_fo/fist.h
-@@ -0,0 +1,254 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifndef __FIST_H_
-+#define __FIST_H_
-+
-+/*
-+ * KERNEL ONLY CODE:
-+ */
-+#ifdef __KERNEL__
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
-+#include <linux/autoconf.h>
-+#else
-+#include <linux/config.h>
-+#endif
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+#ifdef CONFIG_MODVERSIONS
-+# define MODVERSIONS
-+# include <linux/modversions.h>
-+#endif /* CONFIG_MODVERSIONS */
-+#endif /* KERNEL_VERSION < 2.6.0 */
-+#include <linux/sched.h>
-+#include <linux/kernel.h>
-+#include <linux/mm.h>
-+#include <linux/string.h>
-+#include <linux/stat.h>
-+#include <linux/errno.h>
-+#include <linux/wait.h>
-+#include <linux/limits.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+#include <linux/locks.h>
-+#else
-+#include <linux/buffer_head.h>
-+#include <linux/pagemap.h>
-+#include <linux/namei.h>
-+#include <linux/module.h>
-+#include <linux/mount.h>
-+#include <linux/page-flags.h>
-+#include <linux/writeback.h>
-+#include <linux/statfs.h>
-+#endif
-+#include <linux/smp.h>
-+#include <linux/smp_lock.h>
-+#include <linux/file.h>
-+#include <linux/slab.h>
-+#include <linux/vmalloc.h>
-+#include <linux/poll.h>
-+#include <linux/list.h>
-+#include <linux/init.h>
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)
-+#include <linux/xattr.h>
-+#endif
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#include <linux/security.h>
-+#endif
-+
-+#include <linux/swap.h>
-+
-+#include <asm/system.h>
-+/* #include <asm/segment.h> */
-+#include <asm/mman.h>
-+#include <linux/seq_file.h>
-+
-+/*
-+ * MACROS:
-+ */
-+
-+/* those mapped to ATTR_* were copied from linux/fs.h */
-+#define FA_MODE		ATTR_MODE
-+#define FA_UID		ATTR_UID
-+#define FA_GID		ATTR_GID
-+#define FA_SIZE		ATTR_SIZE
-+#define FA_ATIME	ATTR_ATIME
-+#define FA_MTIME	ATTR_MTIME
-+#define FA_CTIME	ATTR_CTIME
-+#define FA_ATIME_SET	ATTR_ATIME_SET
-+#define FA_MTIME_SET	ATTR_MTIME_SET
-+#define FA_FORCE	ATTR_FORCE
-+#define FA_ATTR_FLAGS	ATTR_ATTR_FLAG
-+
-+/* must be greater than all other ATTR_* flags! */
-+#define FA_NLINK	2048
-+#define FA_BLKSIZE	4096
-+#define FA_BLOCKS	8192
-+#define FA_TIMES	(FA_ATIME|FA_MTIME|FA_CTIME)
-+#define FA_ALL		0
-+
-+/* macros to manage changes between kernels */
-+#define INODE_DATA(i)	(&(i)->i_data)
-+
-+#define MIN(x,y) ((x < y) ? (x) : (y))
-+#define MAX(x,y) ((x > y) ? (x) : (y))
-+#define MAXPATHLEN PATH_MAX
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,5)
-+# define lookup_one_len(a,b,c) lookup_one(a,b)
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,4,5) */
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,8)
-+# define generic_file_llseek default_llseek
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,4,8) */
-+
-+#ifndef SEEK_SET
-+# define SEEK_SET 0
-+#endif /* not SEEK_SET */
-+
-+#ifndef SEEK_CUR
-+# define SEEK_CUR 1
-+#endif /* not SEEK_CUR */
-+
-+#ifndef SEEK_END
-+# define SEEK_END 2
-+#endif /* not SEEK_END */
-+
-+#ifndef DEFAULT_POLLMASK
-+# define DEFAULT_POLLMASK (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)
-+#endif /* not DEFAULT_POLLMASK */
-+
-+/* XXX: fix this so fistgen generates kfree() code directly */
-+#define kfree_s(a,b) kfree(a)
-+
-+/*
-+ * TYPEDEFS:
-+ */
-+typedef struct dentry dentry_t;
-+typedef struct file file_t;
-+typedef struct inode inode_t;
-+typedef inode_t vnode_t;
-+typedef struct page page_t;
-+typedef struct qstr qstr_t;
-+typedef struct super_block super_block_t;
-+typedef super_block_t vfs_t;
-+typedef struct vm_area_struct vm_area_t;
-+
-+
-+/*
-+ * EXTERNALS:
-+ */
-+
-+#define FPPF(str,page) printk("PPF %s 0x%x/%d: Lck:%d Err:%d Ref:%d Upd:%d Other::%d:%d:%d:%d:\n", \
-+		str, \
-+		(int) page, \
-+		(int) page->index, \
-+		(PageLocked(page) ? 1 : 0), \
-+		(PageError(page) ? 1 : 0), \
-+		(PageReferenced(page) ? 1 : 0), \
-+		(Page_Uptodate(page) ? 1 : 0), \
-+		(PageDecrAfter(page) ? 1 : 0), \
-+		(PageSlab(page) ? 1 : 0), \
-+		(PageSwapCache(page) ? 1 : 0), \
-+		(PageReserved(page) ? 1 : 0) \
-+		)
-+#define EZKDBG printk("EZK %s:%d:%s\n",__FILE__,__LINE__,__FUNCTION__)
-+#if 0
-+# define EZKDBG1 printk("EZK %s:%d\n",__FILE__,__LINE__)
-+#else
-+# define EZKDBG1
-+#endif
-+
-+extern int fist_get_debug_value(void);
-+extern int fist_set_debug_value(int val);
-+#if 0 /* mini_fo doesn't need these */
-+extern void fist_dprint_internal(int level, char *str,...);
-+extern void fist_print_dentry(char *str, const dentry_t *dentry);
-+extern void fist_print_inode(char *str, const inode_t *inode);
-+extern void fist_print_file(char *str, const file_t *file);
-+extern void fist_print_buffer_flags(char *str, struct buffer_head *buffer);
-+extern void fist_print_page_flags(char *str, page_t *page);
-+extern void fist_print_page_bytes(char *str, page_t *page);
-+extern void fist_print_pte_flags(char *str, const page_t *page);
-+extern void fist_checkinode(inode_t *inode, char *msg);
-+extern void fist_print_sb(char *str, const super_block_t *sb);
-+
-+/* §$% by mk: special debug functions */
-+extern void fist_mk_print_dentry(char *str, const dentry_t *dentry);
-+extern void fist_mk_print_inode(char *str, const inode_t *inode);
-+
-+extern char *add_indent(void);
-+extern char *del_indent(void);
-+#endif/* mini_fo doesn't need these */
-+
-+
-+#define STATIC
-+#define ASSERT(EX)	\
-+do {	\
-+    if (!(EX)) {	\
-+	printk(KERN_CRIT "ASSERTION FAILED: %s at %s:%d (%s)\n", #EX,	\
-+	       __FILE__, __LINE__, __FUNCTION__);	\
-+	(*((char *)0))=0;	\
-+    }	\
-+} while (0)
-+/* same ASSERT, but tell me who was the caller of the function */
-+#define ASSERT2(EX)	\
-+do {	\
-+    if (!(EX)) {	\
-+	printk(KERN_CRIT "ASSERTION FAILED (caller): %s at %s:%d (%s)\n", #EX,	\
-+	       file, line, func);	\
-+	(*((char *)0))=0;	\
-+    }	\
-+} while (0)
-+
-+#if 0 /* mini_fo doesn't need these */
-+#define dprintk(format, args...) printk(KERN_DEBUG format, ##args)
-+#define fist_dprint(level, str, args...) fist_dprint_internal(level, KERN_DEBUG str, ## args)
-+#define print_entry_location() fist_dprint(4, "%sIN:  %s %s:%d\n", add_indent(), __FUNCTION__, __FILE__, __LINE__)
-+#define print_exit_location() fist_dprint(4, "%s OUT: %s %s:%d\n", del_indent(), __FUNCTION__, __FILE__, __LINE__)
-+#define print_exit_status(status) fist_dprint(4, "%s OUT: %s %s:%d, STATUS: %d\n", del_indent(), __FUNCTION__, __FILE__, __LINE__, status)
-+#define print_exit_pointer(status) \
-+do { \
-+  if (IS_ERR(status)) \
-+    fist_dprint(4, "%s OUT: %s %s:%d, RESULT: %ld\n", del_indent(), __FUNCTION__, __FILE__, __LINE__, PTR_ERR(status)); \
-+  else \
-+    fist_dprint(4, "%s OUT: %s %s:%d, RESULT: 0x%x\n", del_indent(), __FUNCTION__, __FILE__, __LINE__, PTR_ERR(status)); \
-+} while (0)
-+#endif/* mini_fo doesn't need these */
-+
-+#endif /* __KERNEL__ */
-+
-+
-+/*
-+ * DEFINITIONS FOR USER AND KERNEL CODE:
-+ * (Note: ioctl numbers 1--9 are reserved for fistgen, the rest
-+ *  are auto-generated automatically based on the user's .fist file.)
-+ */
-+# define FIST_IOCTL_GET_DEBUG_VALUE	_IOR(0x15, 1, int)
-+# define FIST_IOCTL_SET_DEBUG_VALUE	_IOW(0x15, 2, int)
-+
-+#endif /* not __FIST_H_ */
---- /dev/null
-+++ b/fs/mini_fo/inode.c
-@@ -0,0 +1,1564 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd)
-+#else
-+mini_fo_create(inode_t *dir, dentry_t *dentry, int mode)
-+#endif
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	err = create_sto_reg_file(dentry, mode, nd);
-+#else
-+	err = create_sto_reg_file(dentry, mode);
-+#endif
-+	check_mini_fo_dentry(dentry);
-+	return err;
-+}
-+
-+
-+STATIC dentry_t *
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_lookup(inode_t *dir, dentry_t *dentry, struct nameidata* nd)
-+#else
-+mini_fo_lookup(inode_t *dir, dentry_t *dentry)
-+#endif
-+{
-+	int err = 0;
-+	dentry_t *hidden_dir_dentry;
-+	dentry_t *hidden_dentry = NULL;
-+
-+	dentry_t *hidden_sto_dir_dentry;
-+	dentry_t *hidden_sto_dentry = NULL;
-+
-+	/* whiteout flag */
-+	int del_flag = 0;
-+	char *bpath = NULL;
-+
-+	const char *name;
-+	unsigned int namelen;
-+
-+	/* Don't allow lookups of META-files */
-+	namelen = strlen(META_FILENAME);
-+	if(namelen == dentry->d_name.len) {
-+		if(!strncmp(dentry->d_name.name, META_FILENAME, namelen)) {
-+			err = -ENOENT;
-+			goto out;
-+		}
-+	}
-+
-+	hidden_dir_dentry = dtohd(dentry->d_parent);
-+	hidden_sto_dir_dentry = dtohd2(dentry->d_parent);
-+
-+	name = dentry->d_name.name;
-+	namelen = dentry->d_name.len;
-+
-+	/* must initialize dentry operations */
-+	dentry->d_op = &mini_fo_dops;
-+
-+	/* setup the del_flag */
-+	del_flag = __meta_check_d_entry(dir, name, namelen);
-+	bpath = __meta_check_r_entry(dir, name, namelen);
-+
-+	/* perform the lookups of base and storage files:
-+	 *
-+	 * This caused some serious trouble, as a lookup_one_len passing
-+	 * a negative dentry oopses. Solution is to only do the lookup
-+	 * if the dentry is positive, else we set it to NULL
-+	 * More trouble, who said a *_dir_dentry can't be NULL?
-+	 */
-+	if(bpath) {
-+		/* Cross-Interposing (C), yeah! */
-+		hidden_dentry = bpath_walk(dir->i_sb, bpath);
-+		if(!hidden_dentry || !hidden_dentry->d_inode) {
-+			printk(KERN_CRIT "mini_fo_lookup: bpath_walk failed.\n");
-+			err= -EINVAL;
-+			goto out;
-+		}
-+
-+		/* this can be set up safely without fear of spaghetti
-+		 * interposing as it is only used for copying times */
-+		hidden_dir_dentry = hidden_dentry->d_parent;
-+		kfree(bpath);
-+	}
-+	else if(hidden_dir_dentry && hidden_dir_dentry->d_inode)
-+		hidden_dentry =
-+			lookup_one_len(name, hidden_dir_dentry, namelen);
-+	else
-+		hidden_dentry = NULL;
-+
-+	if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode)
-+		hidden_sto_dentry =
-+			lookup_one_len(name, hidden_sto_dir_dentry, namelen);
-+	else
-+		hidden_sto_dentry =  NULL;
-+
-+	/* catch error in lookup */
-+	if (IS_ERR(hidden_dentry) || IS_ERR(hidden_sto_dentry)) {
-+		/* mk: we need to call dput on the dentry, whose
-+		 * lookup_one_len operation failed, in order to avoid
-+		 * unmount trouble.
-+		 */
-+		if(IS_ERR(hidden_dentry)) {
-+			printk(KERN_CRIT "mini_fo_lookup: ERR from base dentry, lookup failed.\n");
-+			err = PTR_ERR(hidden_dentry);
-+		} else {
-+			dput(hidden_dentry);
-+		}
-+		if(IS_ERR(hidden_sto_dentry)) {
-+			printk(KERN_CRIT "mini_fo_lookup: ERR from storage dentry, lookup failed.\n");
-+			err = PTR_ERR(hidden_sto_dentry);
-+		} else {
-+			dput(hidden_sto_dentry);
-+		}
-+		goto out;
-+	}
-+
-+	/* allocate dentry private data */
-+	__dtopd(dentry) = (struct mini_fo_dentry_info *)
-+		kmalloc(sizeof(struct mini_fo_dentry_info), GFP_KERNEL);
-+
-+	if (!dtopd(dentry)) {
-+		err = -ENOMEM;
-+		goto out_dput;
-+	}
-+
-+	/* check for different states of the mini_fo file to be looked up. */
-+
-+	/* state 1, file has been modified */
-+	if(hidden_dentry && hidden_sto_dentry &&
-+	   hidden_dentry->d_inode && hidden_sto_dentry->d_inode && !del_flag) {
-+
-+		/* update parent directory's atime */
-+		fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+
-+		dtopd(dentry)->state = MODIFIED;
-+		dtohd(dentry) = hidden_dentry;
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		err = mini_fo_tri_interpose(hidden_dentry,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state1).\n");
-+			goto out_free;
-+		}
-+		goto out;
-+	}
-+	/* state 2, file is unmodified */
-+	if(hidden_dentry && hidden_dentry->d_inode && !del_flag) {
-+
-+		fist_copy_attr_atime(dir, hidden_dir_dentry->d_inode);
-+
-+		dtopd(dentry)->state = UNMODIFIED;
-+		dtohd(dentry) = hidden_dentry;
-+		dtohd2(dentry) = hidden_sto_dentry; /* could be negative */
-+
-+		err = mini_fo_tri_interpose(hidden_dentry,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state2).\n");
-+			goto out_free;
-+		}
-+		goto out;
-+	}
-+	/* state 3, file has been newly created */
-+	if(hidden_sto_dentry && hidden_sto_dentry->d_inode && !del_flag) {
-+
-+		fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+		dtopd(dentry)->state = CREATED;
-+		dtohd(dentry) = hidden_dentry; /* could be negative */
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		err = mini_fo_tri_interpose(hidden_dentry,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state3).\n");
-+			goto out_free;
-+		}
-+		goto out;
-+	}
-+
-+	/* state 4, file has deleted and created again. */
-+	if(hidden_dentry && hidden_sto_dentry &&
-+	   hidden_dentry->d_inode &&
-+	   hidden_sto_dentry->d_inode && del_flag) {
-+
-+		fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+		dtopd(dentry)->state = DEL_REWRITTEN;
-+		dtohd(dentry) = NULL;
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		err = mini_fo_tri_interpose(NULL,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state4).\n");
-+			goto out_free;
-+		}
-+		/* We will never need this dentry again, as the file has been
-+		 * deleted from base */
-+		dput(hidden_dentry);
-+		goto out;
-+	}
-+	/* state 5, file has been deleted in base */
-+	if(hidden_dentry && hidden_sto_dentry &&
-+	   hidden_dentry->d_inode &&
-+	   !hidden_sto_dentry->d_inode && del_flag) {
-+
-+		/* check which parents atime we need for updating */
-+		if(hidden_sto_dir_dentry->d_inode)
-+			fist_copy_attr_atime(dir,
-+					     hidden_sto_dir_dentry->d_inode);
-+		else
-+			fist_copy_attr_atime(dir,
-+					     hidden_dir_dentry->d_inode);
-+
-+		dtopd(dentry)->state = DELETED;
-+		dtohd(dentry) = NULL;
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		/* add negative dentry to dcache to speed up lookups */
-+		d_add(dentry, NULL);
-+		dput(hidden_dentry);
-+		goto out;
-+	}
-+	/* state 6, file does not exist */
-+	if(((hidden_dentry && !hidden_dentry->d_inode) ||
-+	    (hidden_sto_dentry && !hidden_sto_dentry->d_inode)) && !del_flag)
-+		{
-+			/* check which parents atime we need for updating */
-+			if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode)
-+				fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+			else
-+				fist_copy_attr_atime(dir, hidden_dir_dentry->d_inode);
-+
-+			dtopd(dentry)->state = NON_EXISTANT;
-+			dtohd(dentry) = hidden_dentry;
-+			dtohd2(dentry) = hidden_sto_dentry;
-+			d_add(dentry, NULL);
-+			goto out;
-+		}
-+
-+	/* if we get to here, were in an invalid state. bad. */
-+	printk(KERN_CRIT "mini_fo_lookup: ERROR, meta data corruption detected.\n");
-+
-+	/* end state checking */
-+ out_free:
-+	d_drop(dentry);		/* so that our bad dentry will get destroyed */
-+	kfree(dtopd(dentry));
-+	__dtopd(dentry) = NULL;	/* be safe */
-+
-+ out_dput:
-+	if(hidden_dentry)
-+		dput(hidden_dentry);
-+	if(hidden_sto_dentry)
-+		dput(hidden_sto_dentry); /* drops usage count and marks for release */
-+
-+ out:
-+	/* initalize wol if file exists and is directory */
-+	if(dentry->d_inode) {
-+		if(S_ISDIR(dentry->d_inode->i_mode)) {
-+			itopd(dentry->d_inode)->deleted_list_size = -1;
-+			itopd(dentry->d_inode)->renamed_list_size = -1;
-+			meta_build_lists(dentry);
-+		}
-+	}
-+	return ERR_PTR(err);
-+}
-+
-+
-+STATIC int
-+mini_fo_link(dentry_t *old_dentry, inode_t *dir, dentry_t *new_dentry)
-+{
-+	int err;
-+	dentry_t *hidden_old_dentry;
-+	dentry_t *hidden_new_dentry;
-+	dentry_t *hidden_dir_dentry;
-+
-+
-+	check_mini_fo_dentry(old_dentry);
-+	check_mini_fo_dentry(new_dentry);
-+	check_mini_fo_inode(dir);
-+
-+	/* no links to directorys and existing targets target allowed */
-+	if(S_ISDIR(old_dentry->d_inode->i_mode) ||
-+	   is_mini_fo_existant(new_dentry)) {
-+		err = -EPERM;
-+		goto out;
-+	}
-+
-+	/* bring it directly from unmod to del_rew */
-+	if(dtost(old_dentry) == UNMODIFIED) {
-+		err = nondir_unmod_to_mod(old_dentry, 1);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+		err = meta_add_d_entry(old_dentry->d_parent,
-+				       old_dentry->d_name.name,
-+				       old_dentry->d_name.len);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+		dput(dtohd(old_dentry));
-+		dtohd(old_dentry) = NULL;
-+		dtost(old_dentry) = DEL_REWRITTEN;
-+	}
-+
-+	err = get_neg_sto_dentry(new_dentry);
-+	if(err) {
-+		err = -EINVAL;
-+		goto out;
-+	}
-+
-+	hidden_old_dentry = dtohd2(old_dentry);
-+	hidden_new_dentry = dtohd2(new_dentry);
-+
-+	dget(hidden_old_dentry);
-+	dget(hidden_new_dentry);
-+
-+	/* was: hidden_dir_dentry = lock_parent(hidden_new_dentry); */
-+	hidden_dir_dentry = dget(hidden_new_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = vfs_link(hidden_old_dentry,
-+		       hidden_dir_dentry->d_inode,
-+		       hidden_new_dentry);
-+	if (err || !hidden_new_dentry->d_inode)
-+		goto out_lock;
-+
-+	dtost(new_dentry) = CREATED;
-+ 	err = mini_fo_tri_interpose(NULL, hidden_new_dentry, new_dentry, dir->i_sb, 0);
-+	if (err)
-+		goto out_lock;
-+
-+	fist_copy_attr_timesizes(dir, hidden_new_dentry->d_inode);
-+	/* propagate number of hard-links */
-+	old_dentry->d_inode->i_nlink = itohi2(old_dentry->d_inode)->i_nlink;
-+
-+ out_lock:
-+	/* was: unlock_dir(hidden_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_dir_dentry);
-+
-+	dput(hidden_new_dentry);
-+	dput(hidden_old_dentry);
-+	if (!new_dentry->d_inode)
-+		d_drop(new_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_unlink(inode_t *dir, dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	dget(dentry);
-+	if(dtopd(dentry)->state == MODIFIED) {
-+		err = nondir_mod_to_del(dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == UNMODIFIED) {
-+		err = nondir_unmod_to_del(dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == CREATED) {
-+		err = nondir_creat_to_del(dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == DEL_REWRITTEN) {
-+		err = nondir_del_rew_to_del(dentry);
-+		goto out;
-+	}
-+
-+	printk(KERN_CRIT "mini_fo_unlink: ERROR, invalid state detected.\n");
-+
-+ out:
-+	fist_copy_attr_times(dir, itohi2(dentry->d_parent->d_inode));
-+
-+	if(!err) {
-+		/* is this causing my pain? d_delete(dentry); */
-+		d_drop(dentry);
-+	}
-+
-+	dput(dentry);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_symlink(inode_t *dir, dentry_t *dentry, const char *symname)
-+{
-+	int err=0;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        umode_t mode;
-+#endif
-+
-+	/* Fail if the symlink file exists */
-+	if(!(dtost(dentry) == DELETED ||
-+	     dtost(dentry) == NON_EXISTANT)) {
-+		err = -EEXIST;
-+		goto out;
-+	}
-+
-+	err = get_neg_sto_dentry(dentry);
-+	if(err) {
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	dget(hidden_sto_dentry);
-+	/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	mode = S_IALLUGO;
-+	err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
-+			  hidden_sto_dentry, symname, mode);
-+#else
-+	err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
-+			  hidden_sto_dentry,
-+			  symname);
-+#endif
-+	if (err || !hidden_sto_dentry->d_inode)
-+                goto out_lock;
-+
-+        if(dtost(dentry) == DELETED) {
-+                dtost(dentry) = DEL_REWRITTEN;
-+                err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        } else if(dtost(dentry) == NON_EXISTANT) {
-+                dtost(dentry) = CREATED;
-+                err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        }
-+	fist_copy_attr_timesizes(dir, hidden_sto_dir_dentry->d_inode);
-+
-+ out_lock:
-+        /* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+
-+        dput(hidden_sto_dentry);
-+        if (!dentry->d_inode)
-+                d_drop(dentry);
-+ out:
-+        return err;
-+}
-+
-+STATIC int
-+mini_fo_mkdir(inode_t *dir, dentry_t *dentry, int mode)
-+{
-+	int err;
-+
-+	err = create_sto_dir(dentry, mode);
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_rmdir(inode_t *dir, dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+	dentry_t *meta_dentry;
-+	inode_t *hidden_sto_dir = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+	check_mini_fo_inode(dir);
-+
-+	dget(dentry);
-+	if(dtopd(dentry)->state == MODIFIED) {
-+		/* XXX: disabled, because it does not bother to check files on
-+		 * the original filesystem - just a hack, but better than simply
-+		 * removing it without testing */
-+		err = -EINVAL;
-+		goto out;
-+
-+		hidden_sto_dir = itohi2(dir);
-+		hidden_sto_dentry = dtohd2(dentry);
-+
-+		/* was:hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+		hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		/* Delete an old WOL file contained in the storage dir */
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     hidden_sto_dentry,
-+					     strlen(META_FILENAME));
-+		if(meta_dentry->d_inode) {
-+			err = vfs_unlink(hidden_sto_dentry->d_inode, meta_dentry);
-+			dput(meta_dentry);
-+			if(!err)
-+				d_delete(meta_dentry);
-+		}
-+
-+		err = vfs_rmdir(hidden_sto_dir, hidden_sto_dentry);
-+		dput(hidden_sto_dentry);
-+		if(!err)
-+			d_delete(hidden_sto_dentry);
-+
-+		/* propagate number of hard-links */
-+		dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+
-+		dput(dtohd(dentry));
-+
-+		dtohd(dentry) = NULL;
-+		dtopd(dentry)->state = DELETED;
-+
-+		/* carefull with R files */
-+		if( __meta_is_r_entry(dir,
-+				      dentry->d_name.name,
-+				      dentry->d_name.len) == 1) {
-+			err = meta_remove_r_entry(dentry->d_parent,
-+						  dentry->d_name.name,
-+						  dentry->d_name.len);
-+			if(err) {
-+				printk(KERN_CRIT "mini_fo: rmdir: meta_remove_r_entry failed.\n");
-+				goto out;
-+			}
-+		}
-+		else {
-+			/* ok, add deleted file to META */
-+			meta_add_d_entry(dentry->d_parent,
-+					 dentry->d_name.name,
-+					 dentry->d_name.len);
-+		}
-+		/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+		dput(hidden_sto_dir_dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == UNMODIFIED) {
-+		/* XXX: simply adding it to the delete list here is fscking dangerous!
-+		 * as a temporary hack, i will disable rmdir on unmodified directories
-+		 * for now.
-+		 */
-+		err = -EINVAL;
-+		goto out;
-+
-+		err = get_neg_sto_dentry(dentry);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+
-+		/* dput base dentry, this will relase the inode and free the
-+		 * dentry, as we will never need it again. */
-+		dput(dtohd(dentry));
-+		dtohd(dentry) = NULL;
-+		dtopd(dentry)->state = DELETED;
-+
-+		/* add deleted file to META-file */
-+		meta_add_d_entry(dentry->d_parent,
-+				 dentry->d_name.name,
-+				 dentry->d_name.len);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == CREATED) {
-+		hidden_sto_dir = itohi2(dir);
-+		hidden_sto_dentry = dtohd2(dentry);
-+
-+		/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
-+		hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		/* Delete an old WOL file contained in the storage dir */
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     hidden_sto_dentry,
-+					     strlen(META_FILENAME));
-+		if(meta_dentry->d_inode) {
-+			/* is this necessary? dget(meta_dentry); */
-+			err = vfs_unlink(hidden_sto_dentry->d_inode,
-+					 meta_dentry);
-+			dput(meta_dentry);
-+			if(!err)
-+				d_delete(meta_dentry);
-+		}
-+
-+		err = vfs_rmdir(hidden_sto_dir, hidden_sto_dentry);
-+		dput(hidden_sto_dentry);
-+		if(!err)
-+			d_delete(hidden_sto_dentry);
-+
-+		/* propagate number of hard-links */
-+		dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+		dtopd(dentry)->state = NON_EXISTANT;
-+
-+		/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+		dput(hidden_sto_dir_dentry);
-+
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == DEL_REWRITTEN) {
-+		hidden_sto_dir = itohi2(dir);
-+		hidden_sto_dentry = dtohd2(dentry);
-+
-+		/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
-+		hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		/* Delete an old WOL file contained in the storage dir */
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     hidden_sto_dentry,
-+					     strlen(META_FILENAME));
-+		if(meta_dentry->d_inode) {
-+			/* is this necessary? dget(meta_dentry); */
-+			err = vfs_unlink(hidden_sto_dentry->d_inode,
-+					 meta_dentry);
-+			dput(meta_dentry);
-+			if(!err)
-+				d_delete(meta_dentry);
-+		}
-+
-+		err = vfs_rmdir(hidden_sto_dir, hidden_sto_dentry);
-+		dput(hidden_sto_dentry);
-+		if(!err)
-+			d_delete(hidden_sto_dentry);
-+
-+		/* propagate number of hard-links */
-+		dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+		dtopd(dentry)->state = DELETED;
-+		/* was: unlock_dir(hidden_sto_dir_dentry); */
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+		dput(hidden_sto_dir_dentry);
-+		goto out;
-+	}
-+
-+	printk(KERN_CRIT "mini_fo_rmdir: ERROR, invalid state detected.\n");
-+
-+ out:
-+	if(!err) {
-+		d_drop(dentry);
-+	}
-+
-+	fist_copy_attr_times(dir, itohi2(dentry->d_parent->d_inode));
-+	dput(dentry);
-+
-+	return err;
-+}
-+
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_mknod(inode_t *dir, dentry_t *dentry, int mode, dev_t dev)
-+#else
-+mini_fo_mknod(inode_t *dir, dentry_t *dentry, int mode, int dev)
-+#endif
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	err = create_sto_nod(dentry, mode, dev);
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo_mknod: creating sto nod failed.\n");
-+		err = -EINVAL;
-+	}
-+
-+	check_mini_fo_dentry(dentry);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_rename(inode_t *old_dir, dentry_t *old_dentry,
-+	       inode_t *new_dir, dentry_t *new_dentry)
-+{
-+	/* dispatch */
-+	if(S_ISDIR(old_dentry->d_inode->i_mode))
-+		return rename_directory(old_dir, old_dentry, new_dir, new_dentry);
-+	return rename_nondir(old_dir, old_dentry, new_dir, new_dentry);
-+
-+}
-+
-+int rename_directory(inode_t *old_dir, dentry_t *old_dentry,
-+		     inode_t *new_dir, dentry_t *new_dentry)
-+{
-+	int err, bpath_len;
-+	char *bpath;
-+
-+	dentry_t *hidden_old_dentry;
-+	dentry_t *hidden_new_dentry;
-+	dentry_t *hidden_old_dir_dentry;
-+	dentry_t *hidden_new_dir_dentry;
-+
-+	err = 0;
-+	bpath = NULL;
-+	bpath_len = 0;
-+
-+	/* this is a test, chuck out if it works */
-+	if(!(dtopd(new_dentry)->state == DELETED ||
-+	     dtopd(new_dentry)->state == NON_EXISTANT)) {
-+		printk(KERN_CRIT "mini_fo: rename_directory: \
-+                                  uh, ah, new_dentry not negative.\n");
-+		/* return -1; */
-+	}
-+
-+	/* state = UNMODIFIED */
-+	if(dtopd(old_dentry)->state == UNMODIFIED) {
-+		err = dir_unmod_to_mod(old_dentry);
-+		if (err)
-+			goto out;
-+	}
-+
-+	/* state = MODIFIED */
-+	if(dtopd(old_dentry)->state == MODIFIED) {
-+		bpath = meta_check_r_entry(old_dentry->d_parent,
-+					   old_dentry->d_name.name,
-+					   old_dentry->d_name.len);
-+		if(bpath) {
-+			err = meta_remove_r_entry(old_dentry->d_parent,
-+						  old_dentry->d_name.name,
-+						  old_dentry->d_name.len);
-+			if(err) {
-+				printk(KERN_CRIT "mini_fo: rename_directory:\
-+                                                   meta_remove_r_entry \
-+                                                  failed.\n");
-+				goto out;
-+			}
-+			err = meta_add_r_entry(new_dentry->d_parent,
-+					       bpath,
-+					       strlen(bpath),
-+					       new_dentry->d_name.name,
-+					       new_dentry->d_name.len);
-+			kfree(bpath);
-+		}
-+		else {/* wol it */
-+			err = meta_add_d_entry(old_dentry->d_parent,
-+					       old_dentry->d_name.name,
-+					       old_dentry->d_name.len);
-+			if (err)
-+				goto out;
-+			/* put it on rename list */
-+			err = get_mini_fo_bpath(old_dentry,
-+						&bpath,
-+						&bpath_len);
-+			if (err)
-+				goto out;
-+			err = meta_add_r_entry(new_dentry->d_parent,
-+					       bpath, bpath_len,
-+					       new_dentry->d_name.name,
-+					       new_dentry->d_name.len);
-+			if (err)
-+				goto out;
-+		}
-+		/* no state change, MODIFIED stays MODIFIED */
-+	}
-+	/* state = CREATED */
-+	if(dtopd(old_dentry)->state == CREATED ||
-+	   dtopd(old_dentry)->state == DEL_REWRITTEN) {
-+		if(dtohd(old_dentry))
-+			dput(dtohd(old_dentry));
-+
-+		if(dtopd(new_dentry)->state == DELETED) {
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+			dtohd(old_dentry) = NULL;
-+		}
-+		else if(dtopd(new_dentry)->state == NON_EXISTANT) {
-+			dtopd(old_dentry)->state = CREATED;
-+			/* steal new dentry's neg. base dentry */
-+			dtohd(old_dentry) = dtohd(new_dentry);
-+			dtohd(new_dentry) = NULL;
-+		}
-+	}
-+	if(dtopd(new_dentry)->state == UNMODIFIED ||
-+	   dtopd(new_dentry)->state == NON_EXISTANT) {
-+		err = get_neg_sto_dentry(new_dentry);
-+		if(err)
-+			goto out;
-+	}
-+
-+	/* now move sto file */
-+	hidden_old_dentry = dtohd2(old_dentry);
-+	hidden_new_dentry = dtohd2(new_dentry);
-+
-+	dget(hidden_old_dentry);
-+	dget(hidden_new_dentry);
-+
-+	hidden_old_dir_dentry = dget(hidden_old_dentry->d_parent);
-+	hidden_new_dir_dentry = dget(hidden_new_dentry->d_parent);
-+	double_lock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+
-+	err = vfs_rename(hidden_old_dir_dentry->d_inode, hidden_old_dentry,
-+			 hidden_new_dir_dentry->d_inode, hidden_new_dentry);
-+	if(err)
-+		goto out_lock;
-+
-+	fist_copy_attr_all(new_dir, hidden_new_dir_dentry->d_inode);
-+	if (new_dir != old_dir)
-+		fist_copy_attr_all(old_dir,
-+				   hidden_old_dir_dentry->d_inode);
-+
-+ out_lock:
-+	/* double_unlock will dput the new/old parent dentries
-+	 * whose refcnts were incremented via get_parent above. */
-+	double_unlock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+	dput(hidden_new_dentry);
-+	dput(hidden_old_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+int rename_nondir(inode_t *old_dir, dentry_t *old_dentry,
-+		  inode_t *new_dir, dentry_t *new_dentry)
-+{
-+	int err=0;
-+
-+	check_mini_fo_dentry(old_dentry);
-+	check_mini_fo_dentry(new_dentry);
-+	check_mini_fo_inode(old_dir);
-+	check_mini_fo_inode(new_dir);
-+
-+	/* state: UNMODIFIED */
-+	if(dtost(old_dentry) == UNMODIFIED) {
-+		err = nondir_unmod_to_mod(old_dentry, 1);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+	}
-+
-+	/* the easy states */
-+	if(exists_in_storage(old_dentry)) {
-+
-+		dentry_t *hidden_old_dentry;
-+		dentry_t *hidden_new_dentry;
-+		dentry_t *hidden_old_dir_dentry;
-+		dentry_t *hidden_new_dir_dentry;
-+
-+		/* if old file is MODIFIED, add it to the deleted_list */
-+		if(dtopd(old_dentry)->state == MODIFIED) {
-+			meta_add_d_entry(old_dentry->d_parent,
-+					 old_dentry->d_name.name,
-+					 old_dentry->d_name.len);
-+
-+			dput(dtohd(old_dentry));
-+		}
-+		/* if old file is CREATED, we only release the base dentry */
-+		if(dtopd(old_dentry)->state == CREATED) {
-+			if(dtohd(old_dentry))
-+				dput(dtohd(old_dentry));
-+		}
-+
-+		/* now setup the new states (depends on new_dentry state) */
-+		/* new dentry state =  MODIFIED */
-+		if(dtopd(new_dentry)->state == MODIFIED) {
-+			meta_add_d_entry(new_dentry->d_parent,
-+					 new_dentry->d_name.name,
-+					 new_dentry->d_name.len);
-+
-+			/* new dentry will be d_put'ed later by the vfs
-+			 * so don't do it here
-+			 * dput(dtohd(new_dentry));
-+			 */
-+			dtohd(old_dentry) = NULL;
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+		}
-+		/* new dentry state =  UNMODIFIED */
-+		else if(dtopd(new_dentry)->state == UNMODIFIED) {
-+			if(get_neg_sto_dentry(new_dentry))
-+				return -EINVAL;
-+
-+			meta_add_d_entry(new_dentry->d_parent,
-+					 new_dentry->d_name.name,
-+					 new_dentry->d_name.len);
-+
-+			/* is this right??? */
-+			/*dput(dtohd(new_dentry));*/
-+			dtohd(old_dentry) = NULL;
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+		}
-+		/* new dentry state =  CREATED */
-+		else if(dtopd(new_dentry)->state == CREATED) {
-+			/* we keep the neg. base dentry (if exists) */
-+			dtohd(old_dentry) = dtohd(new_dentry);
-+			/* ...and set it to Null, or we'll get
-+			 * dcache.c:345 if it gets dput twice... */
-+			dtohd(new_dentry) = NULL;
-+			dtopd(old_dentry)->state = CREATED;
-+		}
-+		/* new dentry state =  NON_EXISTANT */
-+		else if(dtopd(new_dentry)->state == NON_EXISTANT) {
-+			if(get_neg_sto_dentry(new_dentry))
-+				return -EINVAL;
-+
-+			/* we keep the neg. base dentry (if exists) */
-+			dtohd(old_dentry) = dtohd(new_dentry);
-+			/* ...and set it to Null, or we'll get
-+			 * Dr. dcache.c:345 if it gets dput twice... */
-+			dtohd(new_dentry) = NULL;
-+			dtopd(old_dentry)->state = CREATED;
-+		}
-+		/* new dentry state =  DEL_REWRITTEN or DELETED */
-+		else if(dtopd(new_dentry)->state == DEL_REWRITTEN ||
-+			dtopd(new_dentry)->state == DELETED) {
-+			dtohd(old_dentry) = NULL;
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+		}
-+		else { /* not possible, uhh, ahh */
-+			printk(KERN_CRIT
-+			       "mini_fo: rename_reg_file: invalid state detected [1].\n");
-+			return -1;
-+		}
-+
-+		/* now we definitely have a sto file */
-+		hidden_old_dentry = dtohd2(old_dentry);
-+		hidden_new_dentry = dtohd2(new_dentry);
-+
-+		dget(hidden_old_dentry);
-+		dget(hidden_new_dentry);
-+
-+		hidden_old_dir_dentry = dget(hidden_old_dentry->d_parent);
-+		hidden_new_dir_dentry = dget(hidden_new_dentry->d_parent);
-+		double_lock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+
-+		err = vfs_rename(hidden_old_dir_dentry->d_inode,
-+				 hidden_old_dentry,
-+				 hidden_new_dir_dentry->d_inode,
-+				 hidden_new_dentry);
-+		if(err)
-+			goto out_lock;
-+
-+		fist_copy_attr_all(new_dir, hidden_new_dir_dentry->d_inode);
-+		if (new_dir != old_dir)
-+			fist_copy_attr_all(old_dir, hidden_old_dir_dentry->d_inode);
-+
-+	out_lock:
-+		/* double_unlock will dput the new/old parent dentries
-+		 * whose refcnts were incremented via get_parent above.
-+		 */
-+		double_unlock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+		dput(hidden_new_dentry);
-+		dput(hidden_old_dentry);
-+	out:
-+		return err;
-+	}
-+	else { /* invalid state */
-+		printk(KERN_CRIT "mini_fo: rename_reg_file: ERROR: invalid state detected [2].\n");
-+		return -1;
-+	}
-+}
-+
-+
-+STATIC int
-+mini_fo_readlink(dentry_t *dentry, char *buf, int bufsiz)
-+{
-+	int err=0;
-+	dentry_t *hidden_dentry = NULL;
-+
-+	if(dtohd2(dentry) && dtohd2(dentry)->d_inode) {
-+		hidden_dentry = dtohd2(dentry);
-+	} else if(dtohd(dentry) && dtohd(dentry)->d_inode) {
-+		hidden_dentry = dtohd(dentry);
-+	} else {
-+		goto out;
-+	}
-+
-+	if (!hidden_dentry->d_inode->i_op ||
-+	    !hidden_dentry->d_inode->i_op->readlink) {
-+		err = -EINVAL;		goto out;
-+	}
-+
-+	err = hidden_dentry->d_inode->i_op->readlink(hidden_dentry,
-+						     buf,
-+						     bufsiz);
-+	if (err > 0)
-+		fist_copy_attr_atime(dentry->d_inode, hidden_dentry->d_inode);
-+
-+ out:
-+	return err;
-+}
-+
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-+static int mini_fo_follow_link(dentry_t *dentry, struct nameidata *nd)
-+#else
-+static void* mini_fo_follow_link(dentry_t *dentry, struct nameidata *nd)
-+#endif
-+{
-+	char *buf;
-+	int len = PAGE_SIZE, err;
-+	mm_segment_t old_fs;
-+
-+	/* in 2.6 this is freed by mini_fo_put_link called by __do_follow_link */
-+	buf = kmalloc(len, GFP_KERNEL);
-+	if (!buf) {
-+		err = -ENOMEM;
-+		goto out;
-+	}
-+
-+	/* read the symlink, and then we will follow it */
-+	old_fs = get_fs();
-+	set_fs(KERNEL_DS);
-+	err = dentry->d_inode->i_op->readlink(dentry, buf, len);
-+	set_fs(old_fs);
-+	if (err < 0) {
-+		kfree(buf);
-+		buf = NULL;
-+		goto out;
-+	}
-+	buf[err] = 0;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        nd_set_link(nd, buf);
-+        err = 0;
-+#else
-+	err = vfs_follow_link(nd, buf);
-+#endif
-+
-+ out:
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	kfree(buf);
-+#endif
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-+        return err;
-+#else
-+        return ERR_PTR(err);
-+#endif
-+}
-+
-+STATIC
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-+void mini_fo_put_link(struct dentry *dentry, struct nameidata *nd)
-+#else
-+void mini_fo_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
-+#endif
-+{
-+        char *link;
-+        link = nd_get_link(nd);
-+        kfree(link);
-+}
-+#endif
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_permission(inode_t *inode, int mask, struct nameidata *nd)
-+#else
-+mini_fo_permission(inode_t *inode, int mask)
-+#endif
-+{
-+	inode_t *hidden_inode;
-+	int mode;
-+	int err;
-+
-+	if(itohi2(inode)) {
-+		hidden_inode = itohi2(inode);
-+	} else {
-+		hidden_inode = itohi(inode);
-+	}
-+	mode = inode->i_mode;
-+
-+	/* not really needed, as permission handles everything:
-+	 *	err = vfs_permission(inode, mask);
-+	 *	if (err)
-+	 *		goto out;
-+	 */
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	err = permission(hidden_inode, mask, nd);
-+#else
-+	err = permission(hidden_inode, mask);
-+#endif
-+
-+	/*  out: */
-+	return err;
-+}
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+STATIC int
-+mini_fo_inode_revalidate(dentry_t *dentry)
-+{
-+	int err = 0;
-+	dentry_t *hidden_dentry;
-+	inode_t *hidden_inode;
-+
-+	ASSERT(dentry->d_inode);
-+	ASSERT(itopd(dentry->d_inode));
-+
-+	if(itohi2(dentry->d_inode)) {
-+                hidden_dentry = dtohd2(dentry);
-+		hidden_inode = hidden_dentry->d_inode;
-+	} else if(itohi(dentry->d_inode)) {
-+                hidden_dentry = dtohd(dentry);
-+		hidden_inode = hidden_dentry->d_inode;
-+	} else {
-+                printk(KERN_CRIT "mini_fo_inode_revalidate: ERROR, invalid state detected.\n");
-+                err = -ENOENT;
-+                goto out;
-+        }
-+	if (hidden_inode && hidden_inode->i_op && hidden_inode->i_op->revalidate){
-+		err = hidden_inode->i_op->revalidate(hidden_dentry);
-+		if (err)
-+			goto out;
-+	}
-+	fist_copy_attr_all(dentry->d_inode, hidden_inode);
-+ out:
-+	return err;
-+}
-+#endif
-+
-+STATIC int
-+mini_fo_setattr(dentry_t *dentry, struct iattr *ia)
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(!is_mini_fo_existant(dentry)) {
-+		printk(KERN_CRIT "mini_fo_setattr: ERROR, invalid state detected [1].\n");
-+		goto out;
-+	}
-+
-+	if(dtost(dentry) == UNMODIFIED) {
-+		if(!IS_COPY_FLAG(ia->ia_valid))
-+			goto out; /* we ignore these changes to base */
-+
-+		if(S_ISDIR(dentry->d_inode->i_mode)) {
-+			err = dir_unmod_to_mod(dentry);
-+		} else {
-+			/* we copy contents if file is not beeing truncated */
-+			if(S_ISREG(dentry->d_inode->i_mode) &&
-+			   !(ia->ia_size == 0 && (ia->ia_valid & ATTR_SIZE))) {
-+				err = nondir_unmod_to_mod(dentry, 1);
-+			} else
-+				err = nondir_unmod_to_mod(dentry, 0);
-+		}
-+		if(err) {
-+			err = -EINVAL;
-+			printk(KERN_CRIT "mini_fo_setattr: ERROR changing states.\n");
-+			goto out;
-+		}
-+	}
-+	if(!exists_in_storage(dentry)) {
-+		printk(KERN_CRIT "mini_fo_setattr: ERROR, invalid state detected [2].\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	ASSERT(dentry->d_inode);
-+	ASSERT(dtohd2(dentry));
-+	ASSERT(itopd(dentry->d_inode));
-+	ASSERT(itohi2(dentry->d_inode));
-+
-+	err = notify_change(dtohd2(dentry), ia);
-+	fist_copy_attr_all(dentry->d_inode, itohi2(dentry->d_inode));
-+ out:
-+	return err;
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+STATIC int
-+mini_fo_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
-+{
-+	int err = 0;
-+        dentry_t *hidden_dentry;
-+
-+	ASSERT(dentry->d_inode);
-+	ASSERT(itopd(dentry->d_inode));
-+
-+	if(itohi2(dentry->d_inode)) {
-+                hidden_dentry = dtohd2(dentry);
-+	} else if(itohi(dentry->d_inode)) {
-+                hidden_dentry = dtohd(dentry);
-+	} else {
-+                printk(KERN_CRIT "mini_fo_getattr: ERROR, invalid state detected.\n");
-+                err = -ENOENT;
-+                goto out;
-+        }
-+	fist_copy_attr_all(dentry->d_inode, hidden_dentry->d_inode);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	generic_fillattr(dentry->d_inode, stat);
-+	if (!stat->blksize) {
-+		struct super_block *s = hidden_dentry->d_inode->i_sb;
-+		unsigned blocks;
-+		blocks = (stat->size+s->s_blocksize-1) >> s->s_blocksize_bits;
-+		stat->blocks = (s->s_blocksize / 512) * blocks;
-+		stat->blksize = s->s_blocksize;
-+	}
-+ out:
-+        return err;
-+}
-+#endif
-+
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+#if 0 /* no xattr_alloc() and xattr_free() */
-+/* This is lifted from fs/xattr.c */
-+static void *
-+xattr_alloc(size_t size, size_t limit)
-+{
-+	void *ptr;
-+
-+	if (size > limit)
-+		return ERR_PTR(-E2BIG);
-+
-+	if (!size)	/* size request, no buffer is needed */
-+		return NULL;
-+	else if (size <= PAGE_SIZE)
-+		ptr = kmalloc((unsigned long) size, GFP_KERNEL);
-+	else
-+		ptr = vmalloc((unsigned long) size);
-+	if (!ptr)
-+		return ERR_PTR(-ENOMEM);
-+	return ptr;
-+}
-+
-+static void
-+xattr_free(void *ptr, size_t size)
-+{
-+	if (!size)	/* size request, no buffer was needed */
-+		return;
-+	else if (size <= PAGE_SIZE)
-+		kfree(ptr);
-+	else
-+		vfree(ptr);
-+}
-+#endif /* no xattr_alloc() and xattr_free() */
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+mini_fo_getxattr(struct dentry *dentry, const char *name, void *value, size_t size) {
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+	/* Define these anyway so we don't need as much ifdef'ed code. */
-+	char *encoded_name = NULL;
-+	char *encoded_value = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->getxattr) {
-+		encoded_name = (char *)name;
-+		encoded_value = (char *)value;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->getxattr(hidden_dentry, encoded_name, encoded_value, size);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,21) \
-+     && LINUX_VERSION_CODE <= KERNEL_VERSION(2,4,23)) \
-+     || LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
-+mini_fo_setxattr(struct dentry *dentry, const char *name,
-+		 const void *value, size_t size, int flags)
-+#else
-+mini_fo_setxattr(struct dentry *dentry, const char *name,
-+		 void *value, size_t size, int flags)
-+#endif
-+
-+{
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+
-+	/* Define these anyway, so we don't have as much ifdef'ed code. */
-+	char *encoded_value = NULL;
-+	char *encoded_name = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->setxattr) {
-+		encoded_name = (char *)name;
-+		encoded_value = (char *)value;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->setxattr(hidden_dentry, encoded_name, encoded_value, size, flags);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+mini_fo_removexattr(struct dentry *dentry, const char *name) {
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+	char *encoded_name;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->removexattr) {
-+		encoded_name = (char *)name;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->removexattr(hidden_dentry, encoded_name);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+mini_fo_listxattr(struct dentry *dentry, char *list, size_t size) {
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+	char *encoded_list = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->listxattr) {
-+		encoded_list = list;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->listxattr(hidden_dentry, encoded_list, size);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+# endif /* defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)) */
-+
-+struct inode_operations mini_fo_symlink_iops =
-+	{
-+		readlink:	mini_fo_readlink,
-+		follow_link: mini_fo_follow_link,
-+		/* mk: permission:	mini_fo_permission, */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		revalidate:	mini_fo_inode_revalidate,
-+#endif
-+		setattr:	mini_fo_setattr,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		getattr:	mini_fo_getattr,
-+		put_link:       mini_fo_put_link,
-+#endif
-+
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+		setxattr:	mini_fo_setxattr,
-+		getxattr:	mini_fo_getxattr,
-+		listxattr:	mini_fo_listxattr,
-+		removexattr: mini_fo_removexattr
-+# endif /* defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)) */
-+	};
-+
-+struct inode_operations mini_fo_dir_iops =
-+	{
-+		create:	mini_fo_create,
-+		lookup:	mini_fo_lookup,
-+		link:	mini_fo_link,
-+		unlink:	mini_fo_unlink,
-+		symlink:	mini_fo_symlink,
-+		mkdir:	mini_fo_mkdir,
-+		rmdir:	mini_fo_rmdir,
-+		mknod:	mini_fo_mknod,
-+		rename:	mini_fo_rename,
-+		/* no readlink/follow_link for non-symlinks */
-+		// off because we have setattr
-+		//    truncate:	mini_fo_truncate,
-+		/* mk:permission:	mini_fo_permission, */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		revalidate:	mini_fo_inode_revalidate,
-+#endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		getattr:	mini_fo_getattr,
-+#endif
-+		setattr:	mini_fo_setattr,
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+		setxattr:	mini_fo_setxattr,
-+		getxattr:	mini_fo_getxattr,
-+		listxattr:	mini_fo_listxattr,
-+		removexattr: mini_fo_removexattr
-+# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */
-+	};
-+
-+struct inode_operations mini_fo_main_iops =
-+	{
-+		/* permission:	mini_fo_permission, */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		revalidate:	mini_fo_inode_revalidate,
-+#endif
-+		setattr:	mini_fo_setattr,
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		getattr:	mini_fo_getattr,
-+#endif
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+		setxattr:	mini_fo_setxattr,
-+		getxattr:	mini_fo_getxattr,
-+		listxattr:	mini_fo_listxattr,
-+		removexattr:    mini_fo_removexattr
-+# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */
-+	};
---- /dev/null
-+++ b/fs/mini_fo/main.c
-@@ -0,0 +1,423 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+#include <linux/module.h>
-+
-+/* This definition must only appear after we include <linux/module.h> */
-+#ifndef MODULE_LICENSE
-+# define MODULE_LICENSE(bison)
-+#endif /* not MODULE_LICENSE */
-+
-+/*
-+ * This is the mini_fo tri interpose function, which extends the
-+ * functionality of the regular interpose by interposing a higher
-+ * level inode on top of two lower level ones: the base filesystem
-+ * inode and the storage filesystem inode.
-+ *
-+ *  sb we pass is mini_fo's super_block
-+ */
-+int
-+mini_fo_tri_interpose(dentry_t *hidden_dentry,
-+		      dentry_t *hidden_sto_dentry,
-+		      dentry_t *dentry, super_block_t *sb, int flag)
-+{
-+	inode_t *hidden_inode = NULL;
-+	inode_t *hidden_sto_inode = NULL; /* store corresponding storage inode */
-+	int err = 0;
-+	inode_t *inode;
-+
-+	/* Pointer to hidden_sto_inode if exists, else to hidden_inode.
-+	 * This is used to copy the attributes of the correct inode. */
-+	inode_t *master_inode;
-+
-+	if(hidden_dentry)
-+		hidden_inode = hidden_dentry->d_inode;
-+	if(hidden_sto_dentry)
-+		hidden_sto_inode = hidden_sto_dentry->d_inode;
-+
-+	ASSERT(dentry->d_inode == NULL);
-+
-+	/* mk: One of the inodes associated with the dentrys is likely to
-+	 * be NULL, so carefull:
-+	 */
-+	ASSERT((hidden_inode != NULL) || (hidden_sto_inode != NULL));
-+
-+	if(hidden_sto_inode)
-+		master_inode = hidden_sto_inode;
-+	else
-+		master_inode = hidden_inode;
-+
-+	/*
-+	 * We allocate our new inode below, by calling iget.
-+	 * iget will call our read_inode which will initialize some
-+	 * of the new inode's fields
-+	 */
-+
-+	/*
-+	 * original: inode = iget(sb, hidden_inode->i_ino);
-+	 */
-+	inode = iget(sb, iunique(sb, 25));
-+	if (!inode) {
-+		err = -EACCES;		/* should be impossible??? */
-+		goto out;
-+	}
-+
-+	/*
-+	 * interpose the inode if not already interposed
-+	 *   this is possible if the inode is being reused
-+	 * XXX: what happens if we get_empty_inode() but there's another already?
-+	 * for now, ASSERT() that this can't happen; fix later.
-+	 */
-+	if (itohi(inode) != NULL) {
-+		printk(KERN_CRIT "mini_fo_tri_interpose: itohi(inode) != NULL.\n");
-+	}
-+	if (itohi2(inode) != NULL) {
-+		printk(KERN_CRIT "mini_fo_tri_interpose: itohi2(inode) != NULL.\n");
-+	}
-+
-+	/* mk: Carefull, igrab can't handle NULL inodes (ok, why should it?), so
-+	 * we need to check here:
-+	 */
-+	if(hidden_inode)
-+		itohi(inode) = igrab(hidden_inode);
-+	else
-+		itohi(inode) = NULL;
-+
-+	if(hidden_sto_inode)
-+		itohi2(inode) = igrab(hidden_sto_inode);
-+	else
-+		itohi2(inode) = NULL;
-+
-+
-+	/* Use different set of inode ops for symlinks & directories*/
-+	if (S_ISLNK(master_inode->i_mode))
-+		inode->i_op = &mini_fo_symlink_iops;
-+	else if (S_ISDIR(master_inode->i_mode))
-+		inode->i_op = &mini_fo_dir_iops;
-+
-+	/* Use different set of file ops for directories */
-+	if (S_ISDIR(master_inode->i_mode))
-+		inode->i_fop = &mini_fo_dir_fops;
-+
-+	/* properly initialize special inodes */
-+	if (S_ISBLK(master_inode->i_mode) || S_ISCHR(master_inode->i_mode) ||
-+	    S_ISFIFO(master_inode->i_mode) || S_ISSOCK(master_inode->i_mode)) {
-+		init_special_inode(inode, master_inode->i_mode, master_inode->i_rdev);
-+	}
-+
-+	/* Fix our inode's address operations to that of the lower inode */
-+	if (inode->i_mapping->a_ops != master_inode->i_mapping->a_ops) {
-+		inode->i_mapping->a_ops = master_inode->i_mapping->a_ops;
-+	}
-+
-+	/* only (our) lookup wants to do a d_add */
-+	if (flag)
-+		d_add(dentry, inode);
-+	else
-+		d_instantiate(dentry, inode);
-+
-+	ASSERT(dtopd(dentry) != NULL);
-+
-+	/* all well, copy inode attributes */
-+	fist_copy_attr_all(inode, master_inode);
-+
-+ out:
-+	return err;
-+}
-+
-+/* parse mount options "base=" and "sto=" */
-+dentry_t *
-+mini_fo_parse_options(super_block_t *sb, char *options)
-+{
-+	dentry_t *hidden_root = ERR_PTR(-EINVAL);
-+	dentry_t *hidden_root2 = ERR_PTR(-EINVAL);
-+	struct nameidata nd, nd2;
-+	char *name, *tmp, *end;
-+	int err = 0;
-+
-+	/* We don't want to go off the end of our arguments later on. */
-+	for (end = options; *end; end++);
-+
-+	while (options < end) {
-+		tmp = options;
-+		while (*tmp && *tmp != ',')
-+			tmp++;
-+		*tmp = '\0';
-+		if (!strncmp("base=", options, 5)) {
-+			name = options + 5;
-+			printk(KERN_INFO "mini_fo: using base directory: %s\n", name);
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+			if (path_init(name, LOOKUP_FOLLOW, &nd))
-+				err = path_walk(name, &nd);
-+#else
-+			err = path_lookup(name, LOOKUP_FOLLOW, &nd);
-+#endif
-+			if (err) {
-+				printk(KERN_CRIT "mini_fo: error accessing hidden directory '%s'\n", name);
-+				hidden_root = ERR_PTR(err);
-+				goto out;
-+			}
-+			hidden_root = nd.dentry;
-+			stopd(sb)->base_dir_dentry = nd.dentry;
-+			stopd(sb)->hidden_mnt = nd.mnt;
-+
-+		} else if(!strncmp("sto=", options, 4)) {
-+			/* parse the storage dir */
-+			name = options + 4;
-+			printk(KERN_INFO "mini_fo: using storage directory: %s\n", name);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+			if(path_init(name, LOOKUP_FOLLOW, &nd2))
-+				err = path_walk(name, &nd2);
-+#else
-+                        err = path_lookup(name, LOOKUP_FOLLOW, &nd2);
-+#endif
-+			if(err) {
-+				printk(KERN_CRIT "mini_fo: error accessing hidden storage directory '%s'\n", name);
-+
-+				hidden_root2 = ERR_PTR(err);
-+				goto out;
-+			}
-+			hidden_root2 = nd2.dentry;
-+			stopd(sb)->storage_dir_dentry = nd2.dentry;
-+			stopd(sb)->hidden_mnt2 = nd2.mnt;
-+			stohs2(sb) = hidden_root2->d_sb;
-+
-+			/* validate storage dir, this is done in
-+			 * mini_fo_read_super for the base directory.
-+			 */
-+			if (IS_ERR(hidden_root2)) {
-+				printk(KERN_WARNING "mini_fo_parse_options: storage dentry lookup failed (err = %ld)\n", PTR_ERR(hidden_root2));
-+				goto out;
-+			}
-+			if (!hidden_root2->d_inode) {
-+				printk(KERN_WARNING "mini_fo_parse_options: no storage dir to interpose on.\n");
-+				goto out;
-+			}
-+			stohs2(sb) = hidden_root2->d_sb;
-+		} else {
-+			printk(KERN_WARNING "mini_fo: unrecognized option '%s'\n", options);
-+			hidden_root = ERR_PTR(-EINVAL);
-+			goto out;
-+		}
-+		options = tmp + 1;
-+	}
-+
-+ out:
-+	if(IS_ERR(hidden_root2))
-+		return hidden_root2;
-+	return hidden_root;
-+}
-+
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+static int
-+#else
-+super_block_t *
-+#endif
-+mini_fo_read_super(super_block_t *sb, void *raw_data, int silent)
-+{
-+	dentry_t *hidden_root;
-+	int err = 0;
-+
-+	if (!raw_data) {
-+		printk(KERN_WARNING "mini_fo_read_super: missing argument\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	/*
-+	 * Allocate superblock private data
-+	 */
-+	__stopd(sb) = kmalloc(sizeof(struct mini_fo_sb_info), GFP_KERNEL);
-+	if (!stopd(sb)) {
-+		printk(KERN_WARNING "%s: out of memory\n", __FUNCTION__);
-+		err = -ENOMEM;
-+		goto out;
-+	}
-+	stohs(sb) = NULL;
-+
-+	hidden_root = mini_fo_parse_options(sb, raw_data);
-+	if (IS_ERR(hidden_root)) {
-+		printk(KERN_WARNING "mini_fo_read_super: lookup_dentry failed (err = %ld)\n", PTR_ERR(hidden_root));
-+		err = PTR_ERR(hidden_root);
-+		goto out_free;
-+	}
-+	if (!hidden_root->d_inode) {
-+		printk(KERN_WARNING "mini_fo_read_super: no directory to interpose on\n");
-+		goto out_free;
-+	}
-+	stohs(sb) = hidden_root->d_sb;
-+
-+	/*
-+	 * Linux 2.4.2-ac3 and beyond has code in
-+	 * mm/filemap.c:generic_file_write() that requires sb->s_maxbytes
-+	 * to be populated.  If not set, all write()s under that sb will
-+	 * return 0.
-+	 *
-+	 * Linux 2.4.4+ automatically sets s_maxbytes to MAX_NON_LFS;
-+	 * the filesystem should override it only if it supports LFS.
-+	 */
-+	/* non-SCA code is good to go with LFS */
-+	sb->s_maxbytes = hidden_root->d_sb->s_maxbytes;
-+
-+	sb->s_op = &mini_fo_sops;
-+	/*
-+	 * we can't use d_alloc_root if we want to use
-+	 * our own interpose function unchanged,
-+	 * so we simply replicate *most* of the code in d_alloc_root here
-+	 */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	sb->s_root = d_alloc(NULL, &(const struct qstr) { "/", 1, 0 });
-+#else
-+	sb->s_root = d_alloc(NULL, &(const struct qstr){hash: 0, name: "/", len : 1});
-+#endif
-+	if (IS_ERR(sb->s_root)) {
-+		printk(KERN_WARNING "mini_fo_read_super: d_alloc failed\n");
-+		err = -ENOMEM;
-+		goto out_dput;
-+	}
-+
-+	sb->s_root->d_op = &mini_fo_dops;
-+	sb->s_root->d_sb = sb;
-+	sb->s_root->d_parent = sb->s_root;
-+
-+	/* link the upper and lower dentries */
-+	__dtopd(sb->s_root) = (struct mini_fo_dentry_info *)
-+		kmalloc(sizeof(struct mini_fo_dentry_info), GFP_KERNEL);
-+	if (!dtopd(sb->s_root)) {
-+		err = -ENOMEM;
-+		goto out_dput2;
-+	}
-+	dtopd(sb->s_root)->state = MODIFIED;
-+	dtohd(sb->s_root) = hidden_root;
-+
-+	/* fanout relevant, interpose on storage root dentry too */
-+	dtohd2(sb->s_root) = stopd(sb)->storage_dir_dentry;
-+
-+	/* ...and call tri-interpose to interpose root dir inodes
-+	 * if (mini_fo_interpose(hidden_root, sb->s_root, sb, 0))
-+	 */
-+	if(mini_fo_tri_interpose(hidden_root, dtohd2(sb->s_root), sb->s_root, sb, 0))
-+		goto out_dput2;
-+
-+	/* initalize the wol list */
-+	itopd(sb->s_root->d_inode)->deleted_list_size = -1;
-+	itopd(sb->s_root->d_inode)->renamed_list_size = -1;
-+	meta_build_lists(sb->s_root);
-+
-+	goto out;
-+
-+ out_dput2:
-+	dput(sb->s_root);
-+ out_dput:
-+	dput(hidden_root);
-+	dput(dtohd2(sb->s_root)); /* release the hidden_sto_dentry too */
-+ out_free:
-+	kfree(stopd(sb));
-+	__stopd(sb) = NULL;
-+ out:
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        return err;
-+#else
-+        if (err) {
-+		return ERR_PTR(err);
-+        } else {
-+		return sb;
-+        }
-+#endif
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+static int mini_fo_get_sb(struct file_system_type *fs_type,
-+					  int flags, const char *dev_name,
-+					  void *raw_data, struct vfsmount *mnt)
-+{
-+	return get_sb_nodev(fs_type, flags, raw_data, mini_fo_read_super, mnt);
-+}
-+#else
-+static struct super_block *mini_fo_get_sb(struct file_system_type *fs_type,
-+					  int flags, const char *dev_name,
-+					  void *raw_data)
-+{
-+	return get_sb_nodev(fs_type, flags, raw_data, mini_fo_read_super);
-+}
-+#endif
-+
-+void mini_fo_kill_block_super(struct super_block *sb)
-+{
-+	generic_shutdown_super(sb);
-+	/*
-+	 *      XXX: BUG: Halcrow: Things get unstable sometime after this point:
-+	 *      lib/rwsem-spinlock.c:127: spin_is_locked on uninitialized
-+	 *      fs/fs-writeback.c:402: spin_lock(fs/super.c:a0381828) already
-+	 *      locked by fs/fs-writeback.c/402
-+	 *
-+	 *      Apparently, someone's not releasing a lock on sb_lock...
-+	 */
-+}
-+
-+static struct file_system_type mini_fo_fs_type = {
-+	.owner          = THIS_MODULE,
-+	.name           = "mini_fo",
-+	.get_sb         = mini_fo_get_sb,
-+	.kill_sb        = mini_fo_kill_block_super,
-+	.fs_flags       = 0,
-+};
-+
-+
-+#else
-+static DECLARE_FSTYPE(mini_fo_fs_type, "mini_fo", mini_fo_read_super, 0);
-+#endif
-+
-+static int __init init_mini_fo_fs(void)
-+{
-+	printk("Registering mini_fo version $Id$\n");
-+	return register_filesystem(&mini_fo_fs_type);
-+}
-+static void __exit exit_mini_fo_fs(void)
-+{
-+	printk("Unregistering mini_fo version $Id$\n");
-+	unregister_filesystem(&mini_fo_fs_type);
-+}
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+EXPORT_NO_SYMBOLS;
-+#endif
-+
-+MODULE_AUTHOR("Erez Zadok <ezk@cs.sunysb.edu>");
-+MODULE_DESCRIPTION("FiST-generated mini_fo filesystem");
-+MODULE_LICENSE("GPL");
-+
-+/* MODULE_PARM(fist_debug_var, "i"); */
-+/* MODULE_PARM_DESC(fist_debug_var, "Debug level"); */
-+
-+module_init(init_mini_fo_fs)
-+module_exit(exit_mini_fo_fs)
---- /dev/null
-+++ b/fs/mini_fo/Makefile
-@@ -0,0 +1,17 @@
-+#
-+# Makefile for mini_fo 2.4 and 2.6 Linux kernels
-+#
-+# Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+#
-+# 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.
-+#
-+
-+obj-$(CONFIG_MINI_FO) := mini_fo.o
-+mini_fo-objs   := meta.o dentry.o file.o inode.o main.o super.o state.o aux.o
-+
-+# dependencies
-+${mini_fo-objs}: mini_fo.h fist.h
-+
---- /dev/null
-+++ b/fs/mini_fo/meta.c
-@@ -0,0 +1,1000 @@
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+int meta_build_lists(dentry_t *dentry)
-+{
-+	struct mini_fo_inode_info *inode_info;
-+
-+	dentry_t *meta_dentry = 0;
-+	file_t *meta_file = 0;
-+	mm_segment_t old_fs;
-+	void *buf;
-+
-+	int bytes, len;
-+	struct vfsmount *meta_mnt;
-+	char *entry;
-+
-+	inode_info = itopd(dentry->d_inode);
-+	if(!(inode_info->deleted_list_size == -1 &&
-+	     inode_info->renamed_list_size == -1)) {
-+		printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                  Error, list(s) not virgin.\n");
-+		return -1;
-+	}
-+
-+	/* init our meta lists */
-+	INIT_LIST_HEAD(&inode_info->deleted_list);
-+	inode_info->deleted_list_size = 0;
-+
-+	INIT_LIST_HEAD(&inode_info->renamed_list);
-+	inode_info->renamed_list_size = 0;
-+
-+  	/* might there be a META-file? */
-+	if(dtohd2(dentry) && dtohd2(dentry)->d_inode) {
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     dtohd2(dentry),
-+					     strlen(META_FILENAME));
-+		if(!meta_dentry->d_inode) {
-+			dput(meta_dentry);
-+			goto out_ok;
-+		}
-+		/* $%& err, is this correct? */
-+		meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+		mntget(meta_mnt);
-+
-+
-+		/* open META-file for reading */
-+		meta_file = dentry_open(meta_dentry, meta_mnt, 0x0);
-+		if(!meta_file || IS_ERR(meta_file)) {
-+			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                          ERROR opening META file.\n");
-+			goto out_err;
-+		}
-+
-+		/* check if fs supports reading */
-+		if(!meta_file->f_op->read) {
-+			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                          ERROR, fs does not support reading.\n");
-+			goto out_err_close;
-+		}
-+
-+		/* allocate a page for transfering the data */
-+		buf = (void *) __get_free_page(GFP_KERNEL);
-+		if(!buf) {
-+			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                          ERROR, out of mem.\n");
-+			goto out_err_close;
-+		}
-+		meta_file->f_pos = 0;
-+		old_fs = get_fs();
-+		set_fs(KERNEL_DS);
-+		do {
-+			char *c;
-+			bytes = meta_file->f_op->read(meta_file, buf, PAGE_SIZE, &meta_file->f_pos);
-+			if(bytes == PAGE_SIZE) {
-+				/* trim a cut off filename and adjust f_pos to get it next time */
-+				for(c = (char*) buf+PAGE_SIZE;
-+				    *c != '\n';
-+				    c--, bytes--, meta_file->f_pos--);
-+			}
-+			entry = (char *) buf;
-+			while(entry < (char *) buf+bytes) {
-+
-+				char *old_path;
-+				char *dir_name;
-+				int old_len, new_len;
-+
-+				/* len without '\n'*/
-+				len = (int) (strchr(entry, '\n') - entry);
-+				switch (*entry) {
-+				case 'D':
-+					/* format: "D filename" */
-+					meta_list_add_d_entry(dentry,
-+							      entry+2,
-+							      len-2);
-+					break;
-+				case 'R':
-+					/* format: "R path/xy/dir newDir" */
-+					old_path = entry+2;
-+					dir_name = strchr(old_path, ' ') + 1;
-+					old_len =  dir_name - old_path - 1;
-+					new_len = ((int) entry) + len - ((int ) dir_name);
-+					meta_list_add_r_entry(dentry,
-+							      old_path,
-+							      old_len,
-+							      dir_name,
-+							      new_len);
-+					break;
-+				default:
-+					/* unknown entry type detected */
-+					break;
-+				}
-+				entry += len+1;
-+			}
-+
-+		} while(meta_file->f_pos < meta_dentry->d_inode->i_size);
-+
-+		free_page((unsigned long) buf);
-+		set_fs(old_fs);
-+		fput(meta_file);
-+	}
-+	goto out_ok;
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out_err:
-+	mntput(meta_mnt);
-+	dput(meta_dentry);
-+	return -1;
-+ out_ok:
-+	return 1; /* check this!!! inode_info->wol_size; */
-+}
-+
-+/* cleanups up all lists and free's the mem by dentry */
-+int meta_put_lists(dentry_t *dentry)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk("mini_fo: meta_put_lists: invalid dentry passed.\n");
-+		return -1;
-+	}
-+	return __meta_put_lists(dentry->d_inode);
-+}
-+
-+/* cleanups up all lists and free's the mem by inode */
-+int __meta_put_lists(inode_t *inode)
-+{
-+	int err = 0;
-+	if(!inode || !itopd(inode)) {
-+		printk("mini_fo: __meta_put_lists: invalid inode passed.\n");
-+		return -1;
-+	}
-+	err = __meta_put_d_list(inode);
-+	err |= __meta_put_r_list(inode);
-+	return err;
-+}
-+
-+int meta_sync_lists(dentry_t *dentry)
-+{
-+	int err = 0;
-+	if(!dentry || !dentry->d_inode) {
-+		printk("mini_fo: meta_sync_lists: \
-+                        invalid dentry passed.\n");
-+		return -1;
-+	}
-+	err = meta_sync_d_list(dentry, 0);
-+	err |= meta_sync_r_list(dentry, 1);
-+	return err;
-+}
-+
-+
-+/* remove all D entries from the renamed list and free the mem */
-+int __meta_put_d_list(inode_t *inode)
-+{
-+	struct list_head *tmp;
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: __meta_put_d_list: \
-+                                  invalid inode passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(inode);
-+
-+        /* nuke the DELETED-list */
-+        if(inode_info->deleted_list_size <= 0)
-+		return 0;
-+
-+	while(!list_empty(&inode_info->deleted_list)) {
-+		tmp = inode_info->deleted_list.next;
-+		list_del(tmp);
-+		del_entry = list_entry(tmp, struct deleted_entry, list);
-+		kfree(del_entry->name);
-+		kfree(del_entry);
-+	}
-+	inode_info->deleted_list_size = 0;
-+
-+	return 0;
-+}
-+
-+/* remove all R entries from the renamed list and free the mem */
-+int __meta_put_r_list(inode_t *inode)
-+{
-+	struct list_head *tmp;
-+	struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: meta_put_r_list: invalid inode.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(inode);
-+
-+        /* nuke the RENAMED-list */
-+        if(inode_info->renamed_list_size <= 0)
-+		return 0;
-+
-+	while(!list_empty(&inode_info->renamed_list)) {
-+		tmp = inode_info->renamed_list.next;
-+		list_del(tmp);
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		kfree(ren_entry->new_name);
-+		kfree(ren_entry->old_name);
-+		kfree(ren_entry);
-+	}
-+	inode_info->renamed_list_size = 0;
-+
-+	return 0;
-+}
-+
-+int meta_add_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	int err = 0;
-+	err = meta_list_add_d_entry(dentry, name, len);
-+	err |= meta_write_d_entry(dentry,name,len);
-+	return err;
-+}
-+
-+/* add a D entry to the deleted list */
-+int meta_list_add_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_list_add_d_entry: \
-+                                  invalid dentry passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->deleted_list_size < 0)
-+                return -1;
-+
-+        del_entry = (struct deleted_entry *)
-+		kmalloc(sizeof(struct deleted_entry), GFP_KERNEL);
-+        del_entry->name = (char*) kmalloc(len, GFP_KERNEL);
-+        if(!del_entry || !del_entry->name) {
-+                printk(KERN_CRIT "mini_fo: meta_list_add_d_entry: \
-+                                  out of mem.\n");
-+		kfree(del_entry->name);
-+		kfree(del_entry);
-+                return -ENOMEM;
-+        }
-+
-+        strncpy(del_entry->name, name, len);
-+        del_entry->len = len;
-+
-+        list_add(&del_entry->list, &inode_info->deleted_list);
-+        inode_info->deleted_list_size++;
-+        return 0;
-+}
-+
-+int meta_add_r_entry(dentry_t *dentry,
-+			  const char *old_name, int old_len,
-+			  const char *new_name, int new_len)
-+{
-+	int err = 0;
-+	err = meta_list_add_r_entry(dentry,
-+				    old_name, old_len,
-+				    new_name, new_len);
-+	err |= meta_write_r_entry(dentry,
-+				  old_name, old_len,
-+				  new_name, new_len);
-+	return err;
-+}
-+
-+/* add a R entry to the renamed list */
-+int meta_list_add_r_entry(dentry_t *dentry,
-+			  const char *old_name, int old_len,
-+			  const char *new_name, int new_len)
-+{
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_list_add_r_entry: \
-+                                  invalid dentry passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->renamed_list_size < 0)
-+                return -1;
-+
-+        ren_entry = (struct renamed_entry *)
-+		kmalloc(sizeof(struct renamed_entry), GFP_KERNEL);
-+        ren_entry->old_name = (char*) kmalloc(old_len, GFP_KERNEL);
-+        ren_entry->new_name = (char*) kmalloc(new_len, GFP_KERNEL);
-+
-+        if(!ren_entry || !ren_entry->old_name || !ren_entry->new_name) {
-+                printk(KERN_CRIT "mini_fo: meta_list_add_r_entry: \
-+                                  out of mem.\n");
-+		kfree(ren_entry->new_name);
-+		kfree(ren_entry->old_name);
-+		kfree(ren_entry);
-+                return -ENOMEM;
-+        }
-+
-+        strncpy(ren_entry->old_name, old_name, old_len);
-+        ren_entry->old_len = old_len;
-+        strncpy(ren_entry->new_name, new_name, new_len);
-+        ren_entry->new_len = new_len;
-+
-+        list_add(&ren_entry->list, &inode_info->renamed_list);
-+        inode_info->renamed_list_size++;
-+        return 0;
-+}
-+
-+
-+int meta_remove_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	int err = 0;
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT
-+		       "mini_fo: meta_remove_r_entry: \
-+                        invalid dentry passed.\n");
-+		return -1;
-+	}
-+
-+	err = meta_list_remove_r_entry(dentry, name, len);
-+	err |= meta_sync_lists(dentry);
-+	return err;
-+}
-+
-+int meta_list_remove_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT
-+		       "mini_fo: meta_list_remove_r_entry: \
-+                        invalid dentry passed.\n");
-+		return -1;
-+	}
-+	return __meta_list_remove_r_entry(dentry->d_inode, name, len);
-+}
-+
-+int __meta_list_remove_r_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode))
-+		printk(KERN_CRIT
-+		       "mini_fo: __meta_list_remove_r_entry: \
-+                        invalid inode passed.\n");
-+	inode_info = itopd(inode);
-+
-+        if(inode_info->renamed_list_size < 0)
-+                return -1;
-+        if(inode_info->renamed_list_size == 0)
-+                return 1;
-+
-+	list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		if(ren_entry->new_len != len)
-+			continue;
-+
-+		if(!strncmp(ren_entry->new_name, name, len)) {
-+			list_del(tmp);
-+			kfree(ren_entry->new_name);
-+			kfree(ren_entry->old_name);
-+			kfree(ren_entry);
-+			inode_info->renamed_list_size--;
-+			return 0;
-+		}
-+	}
-+	return 1;
-+}
-+
-+
-+/* append a single D entry to the meta file */
-+int meta_write_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	dentry_t *meta_dentry = 0;
-+        file_t *meta_file = 0;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err;
-+        struct vfsmount *meta_mnt = 0;
-+        char *buf;
-+
-+	err = 0;
-+
-+	if(itopd(dentry->d_inode)->deleted_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	if(dtopd(dentry)->state == UNMODIFIED) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry), strlen (META_FILENAME));
-+
-+	/* We need to create a META-file */
-+        if(!meta_dentry->d_inode) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry,
-+			   S_IRUSR | S_IWUSR,
-+			   NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry,
-+			   S_IRUSR | S_IWUSR);
-+#endif
-+	}
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  ERROR opening meta file.\n");
-+                mntput(meta_mnt); /* $%& is this necessary? */
-+                dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* size: len for name, 1 for \n and 2 for "D " */
-+	buf = (char *) kmalloc(len+3, GFP_KERNEL);
-+	if (!buf) {
-+		printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  out of mem.\n");
-+		return -ENOMEM;
-+	}
-+
-+	buf[0] = 'D';
-+	buf[1] = ' ';
-+	strncpy(buf+2, name, len);
-+	buf[len+2] = '\n';
-+	bytes = meta_file->f_op->write(meta_file, buf, len+3,
-+				       &meta_file->f_pos);
-+	if(bytes != len+3) {
-+		printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  ERROR writing.\n");
-+		err = -1;
-+	}
-+	kfree(buf);
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+}
-+
-+/* append a single R entry to the meta file */
-+int meta_write_r_entry(dentry_t *dentry,
-+		       const char *old_name, int old_len,
-+		       const char *new_name, int new_len)
-+{
-+	dentry_t *meta_dentry = 0;
-+        file_t *meta_file = 0;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err, buf_len;
-+	struct vfsmount *meta_mnt = 0;
-+        char *buf;
-+
-+
-+	err = 0;
-+
-+	if(itopd(dentry->d_inode)->renamed_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* build the storage structure? */
-+	if(dtopd(dentry)->state == UNMODIFIED) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry),
-+				     strlen (META_FILENAME));
-+        if(!meta_dentry->d_inode) {
-+                /* We need to create a META-file */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR, NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR);
-+#endif
-+	}
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-+                                  ERROR opening meta file.\n");
-+                mntput(meta_mnt);
-+                dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* size: 2 for "R ", old_len+new_len for names, 1 blank+1 \n */
-+	buf_len = old_len + new_len + 4;
-+	buf = (char *) kmalloc(buf_len, GFP_KERNEL);
-+	if (!buf) {
-+		printk(KERN_CRIT "mini_fo: meta_write_r_entry: out of mem.\n");
-+		return -ENOMEM;
-+	}
-+
-+	buf[0] = 'R';
-+	buf[1] = ' ';
-+	strncpy(buf + 2, old_name, old_len);
-+	buf[old_len + 2] = ' ';
-+	strncpy(buf + old_len + 3, new_name, new_len);
-+	buf[buf_len -1] = '\n';
-+	bytes = meta_file->f_op->write(meta_file, buf, buf_len, &meta_file->f_pos);
-+	if(bytes != buf_len) {
-+		printk(KERN_CRIT "mini_fo: meta_write_r_entry: ERROR writing.\n");
-+		err = -1;
-+	}
-+
-+	kfree(buf);
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+}
-+
-+/* sync D list to disk, append data if app_flag is 1 */
-+/* check the meta_mnt, which seems not to be used (properly)  */
-+
-+int meta_sync_d_list(dentry_t *dentry, int app_flag)
-+{
-+	dentry_t *meta_dentry;
-+        file_t *meta_file;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err;
-+        struct vfsmount *meta_mnt;
-+        char *buf;
-+
-+	struct list_head *tmp;
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	err = 0;
-+	meta_file=0;
-+	meta_mnt=0;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                  invalid inode passed.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->deleted_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* ok, there is something to sync */
-+
-+	/* build the storage structure? */
-+        if(!dtohd2(dentry) && !itohi2(dentry->d_inode)) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry),
-+				     strlen(META_FILENAME));
-+        if(!meta_dentry->d_inode) {
-+                /* We need to create a META-file */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR, NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR);
-+#endif
-+		app_flag = 0;
-+	}
-+	/* need we truncate the meta file? */
-+	if(!app_flag) {
-+		struct iattr newattrs;
-+                newattrs.ia_size = 0;
-+                newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                down(&meta_dentry->d_inode->i_sem);
-+#endif
-+                err = notify_change(meta_dentry, &newattrs);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                up(&meta_dentry->d_inode->i_sem);
-+#endif
-+
-+                if(err || meta_dentry->d_inode->i_size != 0) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          ERROR truncating meta file.\n");
-+                        goto out_err_close;
-+		}
-+	}
-+
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                  ERROR opening meta file.\n");
-+		/* we don't mntget so we dont't mntput (for now)
-+		 * mntput(meta_mnt);
-+		 */
-+		dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* here we go... */
-+        list_for_each(tmp, &inode_info->deleted_list) {
-+		del_entry = list_entry(tmp, struct deleted_entry, list);
-+
-+		/* size: len for name, 1 for \n and 2 for "D " */
-+		buf = (char *) kmalloc(del_entry->len+3, GFP_KERNEL);
-+		if (!buf) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          out of mem.\n");
-+			return -ENOMEM;
-+		}
-+
-+		buf[0] = 'D';
-+		buf[1] = ' ';
-+		strncpy(buf+2, del_entry->name, del_entry->len);
-+		buf[del_entry->len+2] = '\n';
-+		bytes = meta_file->f_op->write(meta_file, buf,
-+					       del_entry->len+3,
-+					       &meta_file->f_pos);
-+		if(bytes != del_entry->len+3) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          ERROR writing.\n");
-+			err |= -1;
-+		}
-+		kfree(buf);
-+	}
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+
-+}
-+
-+int meta_sync_r_list(dentry_t *dentry, int app_flag)
-+{
-+	dentry_t *meta_dentry;
-+        file_t *meta_file;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err, buf_len;
-+        struct vfsmount *meta_mnt;
-+        char *buf;
-+
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	err = 0;
-+	meta_file=0;
-+	meta_mnt=0;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                  invalid dentry passed.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->deleted_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* ok, there is something to sync */
-+
-+	/* build the storage structure? */
-+        if(!dtohd2(dentry) && !itohi2(dentry->d_inode)) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry),
-+				     strlen(META_FILENAME));
-+        if(!meta_dentry->d_inode) {
-+                /* We need to create a META-file */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR, NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR);
-+#endif
-+		app_flag = 0;
-+	}
-+	/* need we truncate the meta file? */
-+	if(!app_flag) {
-+		struct iattr newattrs;
-+                newattrs.ia_size = 0;
-+                newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                down(&meta_dentry->d_inode->i_sem);
-+#endif
-+                err = notify_change(meta_dentry, &newattrs);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                up(&meta_dentry->d_inode->i_sem);
-+#endif
-+                if(err || meta_dentry->d_inode->i_size != 0) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          ERROR truncating meta file.\n");
-+                        goto out_err_close;
-+		}
-+	}
-+
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                  ERROR opening meta file.\n");
-+		/* we don't mntget so we dont't mntput (for now)
-+		 * mntput(meta_mnt);
-+		 */
-+		dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* here we go... */
-+        list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		/* size:
-+		 * 2 for "R ", old_len+new_len for names, 1 blank+1 \n */
-+		buf_len = ren_entry->old_len + ren_entry->new_len + 4;
-+		buf = (char *) kmalloc(buf_len, GFP_KERNEL);
-+		if (!buf) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          out of mem.\n");
-+			return -ENOMEM;
-+		}
-+		buf[0] = 'R';
-+		buf[1] = ' ';
-+		strncpy(buf + 2, ren_entry->old_name, ren_entry->old_len);
-+		buf[ren_entry->old_len + 2] = ' ';
-+		strncpy(buf + ren_entry->old_len + 3,
-+			ren_entry->new_name, ren_entry->new_len);
-+		buf[buf_len - 1] = '\n';
-+		bytes = meta_file->f_op->write(meta_file, buf,
-+					       buf_len, &meta_file->f_pos);
-+		if(bytes != buf_len) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          ERROR writing.\n");
-+			err |= -1;
-+		}
-+		kfree(buf);
-+	}
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+}
-+
-+int meta_check_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode)
-+		printk(KERN_CRIT "mini_fo: meta_check_d_dentry: \
-+                                  invalid dentry passed.\n");
-+	return __meta_check_d_entry(dentry->d_inode, name, len);
-+}
-+
-+int __meta_check_d_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode))
-+		printk(KERN_CRIT "mini_fo: __meta_check_d_dentry: \
-+                                  invalid inode passed.\n");
-+
-+        inode_info = itopd(inode);
-+
-+        if(inode_info->deleted_list_size <= 0)
-+                return 0;
-+
-+        list_for_each(tmp, &inode_info->deleted_list) {
-+		del_entry = list_entry(tmp, struct deleted_entry, list);
-+		if(del_entry->len != len)
-+			continue;
-+
-+		if(!strncmp(del_entry->name, name, len))
-+			return 1;
-+	}
-+	return 0;
-+}
-+
-+/*
-+ * check if file has been renamed and return path to orig. base dir.
-+ * Implements no error return values so far, what of course sucks.
-+ * String is null terminated.'
-+ */
-+char* meta_check_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry: \
-+                                  invalid dentry passed.\n");
-+		return NULL;
-+	}
-+	return __meta_check_r_entry(dentry->d_inode, name, len);
-+}
-+
-+char* __meta_check_r_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+	char *old_path;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry: \
-+                                  invalid inode passed.\n");
-+		return NULL;
-+	}
-+	inode_info = itopd(inode);
-+
-+        if(inode_info->renamed_list_size <= 0)
-+                return NULL;
-+
-+        list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		if(ren_entry->new_len != len)
-+			continue;
-+
-+		if(!strncmp(ren_entry->new_name, name, len)) {
-+			old_path = (char *)
-+				kmalloc(ren_entry->old_len+1, GFP_KERNEL);
-+			strncpy(old_path,
-+				ren_entry->old_name,
-+				ren_entry->old_len);
-+			old_path[ren_entry->old_len]='\0';
-+			return old_path;
-+		}
-+	}
-+	return NULL;
-+}
-+
-+/*
-+ * This version only checks if entry exists and return:
-+ *     1 if exists,
-+ *     0 if not,
-+ *    -1 if error.
-+ */
-+int meta_is_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry [2]: \
-+                                  invalid dentry passed.\n");
-+		return -1;
-+	}
-+	return __meta_is_r_entry(dentry->d_inode, name, len);
-+}
-+
-+int __meta_is_r_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry [2]: \
-+                                  invalid inode passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(inode);
-+
-+        if(inode_info->renamed_list_size <= 0)
-+                return -1;
-+
-+        list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		if(ren_entry->new_len != len)
-+			continue;
-+
-+		if(!strncmp(ren_entry->new_name, name, len))
-+			return 1;
-+	}
-+	return 0;
-+}
-+
---- /dev/null
-+++ b/fs/mini_fo/mini_fo.h
-@@ -0,0 +1,510 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifndef __MINI_FO_H_
-+#define __MINI_FO_H_
-+
-+#ifdef __KERNEL__
-+
-+/* META stuff */
-+#define META_FILENAME "META_dAfFgHE39ktF3HD2sr"
-+
-+/* use xattrs? */
-+#define XATTR
-+
-+/* File attributes that when changed, result in a file beeing copied to storage */
-+#define COPY_FLAGS ATTR_MODE | ATTR_UID | ATTR_GID | ATTR_SIZE
-+
-+/*
-+ * mini_fo filestates
-+ */
-+#define MODIFIED       1
-+#define UNMODIFIED     2
-+#define CREATED        3
-+#define DEL_REWRITTEN  4
-+#define DELETED        5
-+#define NON_EXISTANT   6
-+
-+/* fist file systems superblock magic */
-+# define MINI_FO_SUPER_MAGIC 0xf15f
-+
-+/*
-+ * STRUCTURES:
-+ */
-+
-+/* mini_fo inode data in memory */
-+struct mini_fo_inode_info {
-+	inode_t *wii_inode;
-+	inode_t *wii_inode2; /* pointer to storage inode */
-+
-+	/* META-data lists */
-+	/* deleted list, ex wol */
-+	struct list_head deleted_list;
-+	int deleted_list_size;
-+
-+	/* renamed list */
-+	struct list_head renamed_list;
-+	int renamed_list_size;
-+
-+	/* add other lists here ... */
-+};
-+
-+/* mini_fo dentry data in memory */
-+struct mini_fo_dentry_info {
-+	dentry_t *wdi_dentry;
-+	dentry_t *wdi_dentry2; /* pointer to  storage dentry */
-+	unsigned int state;  /* state of the mini_fo dentry */
-+};
-+
-+
-+/* mini_fo super-block data in memory */
-+struct mini_fo_sb_info {
-+	super_block_t *wsi_sb, *wsi_sb2; /* mk: might point to the same sb */
-+	struct vfsmount *hidden_mnt, *hidden_mnt2;
-+	dentry_t *base_dir_dentry;
-+	dentry_t *storage_dir_dentry;
-+	;
-+};
-+
-+/* readdir_data, readdir helper struct */
-+struct readdir_data {
-+	struct list_head ndl_list; /* linked list head ptr */
-+	int ndl_size; /* list size */
-+	int sto_done; /* flag to show that the storage dir entries have
-+		       * all been read an now follow base entries */
-+};
-+
-+/* file private data. */
-+struct mini_fo_file_info {
-+	struct file *wfi_file;
-+	struct file *wfi_file2; /* pointer to storage file */
-+	struct readdir_data rd;
-+};
-+
-+/* struct ndl_entry */
-+struct ndl_entry {
-+	struct list_head list;
-+	char *name;
-+	int len;
-+};
-+
-+/********************************
-+ *  META-data structures
-+ ********************************/
-+
-+/* deleted entry */
-+struct deleted_entry {
-+	struct list_head list;
-+	char *name;
-+	int len;
-+};
-+
-+/* renamed entry */
-+struct renamed_entry {
-+	struct list_head list;
-+	char *old_name;     /* old directory with full path */
-+	int old_len;        /* length of above string */
-+	char *new_name;     /* new directory name */
-+	int new_len;        /* length of above string */
-+};
-+
-+/* attr_change entry */
-+struct attr_change_entry {
-+	struct list_head list;
-+	char *name;
-+	int len;
-+};
-+
-+/* link entry */
-+struct link_entry {
-+	struct list_head list;
-+	int links_moved;
-+	int inum_base;
-+	int inum_sto;
-+	char *weird_name;
-+	int weird_name_len;
-+};
-+
-+
-+/* Some other stuff required for mini_fo_filldir64, copied from
-+ * fs/readdir.c
-+ */
-+
-+#define ROUND_UP64(x) (((x)+sizeof(u64)-1) & ~(sizeof(u64)-1))
-+#define NAME_OFFSET(de) ((int) ((de)->d_name - (char *) (de)))
-+
-+
-+struct linux_dirent64 {
-+        u64             d_ino;
-+        s64             d_off;
-+        unsigned short  d_reclen;
-+        unsigned char   d_type;
-+        char            d_name[0];
-+};
-+
-+
-+struct getdents_callback64 {
-+        struct linux_dirent64 * current_dir;
-+        struct linux_dirent64 * previous;
-+        int count;
-+        int error;
-+};
-+
-+struct linux_dirent {
-+	unsigned long   d_ino;
-+	unsigned long   d_off;
-+	unsigned short  d_reclen;
-+	char            d_name[1];
-+};
-+
-+struct getdents_callback {
-+	struct linux_dirent * current_dir;
-+	struct linux_dirent * previous;
-+	int count;
-+	int error;
-+};
-+
-+
-+/*
-+ * MACROS:
-+ */
-+
-+/* file TO private_data */
-+# define ftopd(file) ((struct mini_fo_file_info *)((file)->private_data))
-+# define __ftopd(file) ((file)->private_data)
-+/* file TO hidden_file */
-+# define ftohf(file) ((ftopd(file))->wfi_file)
-+# define ftohf2(file) ((ftopd(file))->wfi_file2)
-+
-+/* inode TO private_data */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+# define itopd(ino) ((struct mini_fo_inode_info *)(ino)->i_private)
-+# define __itopd(ino) ((ino)->i_private)
-+#else
-+# define itopd(ino) ((struct mini_fo_inode_info *)(ino)->u.generic_ip)
-+# define __itopd(ino) ((ino)->u.generic_ip)
-+#endif
-+/* inode TO hidden_inode */
-+# define itohi(ino) (itopd(ino)->wii_inode)
-+# define itohi2(ino) (itopd(ino)->wii_inode2)
-+
-+/* superblock TO private_data */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+# define stopd(super) ((struct mini_fo_sb_info *)(super)->s_fs_info)
-+# define __stopd(super) ((super)->s_fs_info)
-+#else
-+# define stopd(super) ((struct mini_fo_sb_info *)(super)->u.generic_sbp)
-+# define __stopd(super) ((super)->u.generic_sbp)
-+#endif
-+
-+/* unused? # define vfs2priv stopd */
-+/* superblock TO hidden_superblock */
-+
-+# define stohs(super) (stopd(super)->wsi_sb)
-+# define stohs2(super) (stopd(super)->wsi_sb2)
-+
-+/* dentry TO private_data */
-+# define dtopd(dentry) ((struct mini_fo_dentry_info *)(dentry)->d_fsdata)
-+# define __dtopd(dentry) ((dentry)->d_fsdata)
-+/* dentry TO hidden_dentry */
-+# define dtohd(dent) (dtopd(dent)->wdi_dentry)
-+# define dtohd2(dent) (dtopd(dent)->wdi_dentry2)
-+
-+/* dentry to state */
-+# define dtost(dent) (dtopd(dent)->state)
-+# define sbt(sb) ((sb)->s_type->name)
-+
-+#define IS_WRITE_FLAG(flag) (flag & (O_RDWR | O_WRONLY | O_APPEND))
-+#define IS_COPY_FLAG(flag) (flag & (COPY_FLAGS))
-+
-+/* macros to simplify non-SCA code */
-+#  define MALLOC_PAGE_POINTERS(hidden_pages, num_hidden_pages)
-+#  define MALLOC_PAGEDATA_POINTERS(hidden_pages_data, num_hidden_pages)
-+#  define FREE_PAGE_POINTERS(hidden_pages, num)
-+#  define FREE_PAGEDATA_POINTERS(hidden_pages_data, num)
-+#  define FOR_EACH_PAGE
-+#  define CURRENT_HIDDEN_PAGE hidden_page
-+#  define CURRENT_HIDDEN_PAGEDATA hidden_page_data
-+#  define CURRENT_HIDDEN_PAGEINDEX page->index
-+
-+/*
-+ * EXTERNALS:
-+ */
-+extern struct file_operations mini_fo_main_fops;
-+extern struct file_operations mini_fo_dir_fops;
-+extern struct inode_operations mini_fo_main_iops;
-+extern struct inode_operations mini_fo_dir_iops;
-+extern struct inode_operations mini_fo_symlink_iops;
-+extern struct super_operations mini_fo_sops;
-+extern struct dentry_operations mini_fo_dops;
-+extern struct vm_operations_struct mini_fo_shared_vmops;
-+extern struct vm_operations_struct mini_fo_private_vmops;
-+extern struct address_space_operations mini_fo_aops;
-+
-+#if 0 /* unused by mini_fo */
-+extern int mini_fo_interpose(dentry_t *hidden_dentry, dentry_t *this_dentry, super_block_t *sb, int flag);
-+#if defined(FIST_FILTER_DATA) || defined(FIST_FILTER_SCA)
-+extern page_t *mini_fo_get1page(file_t *file, int index);
-+extern int mini_fo_fill_zeros(file_t *file, page_t *page, unsigned from);
-+# endif /* FIST_FILTER_DATA || FIST_FILTER_SCA */
-+
-+
-+#  define mini_fo_hidden_dentry(d) __mini_fo_hidden_dentry(__FILE__,__FUNCTION__,__LINE__,(d))
-+#  define mini_fo_hidden_sto_dentry(d) __mini_fo_hidden_sto_dentry(__FILE__,__FUNCTION__,__LINE__,(d))
-+
-+extern dentry_t *__mini_fo_hidden_dentry(char *file, char *func, int line, dentry_t *this_dentry);
-+extern dentry_t *__mini_fo_hidden_sto_dentry(char *file, char *func, int line, dentry_t *this_dentry);
-+
-+extern int mini_fo_read_file(const char *filename, void *buf, int len);
-+extern int mini_fo_write_file(const char *filename, void *buf, int len);
-+extern dentry_t *fist_lookup(dentry_t *dir, const char *name, vnode_t **out, uid_t uid, gid_t gid);
-+#endif /* unused by mini_fo */
-+
-+/* state transition functions */
-+extern int nondir_unmod_to_mod(dentry_t *dentry, int cp_flag);
-+extern int nondir_del_rew_to_del(dentry_t *dentry);
-+extern int nondir_creat_to_del(dentry_t *dentry);
-+extern int nondir_mod_to_del(dentry_t *dentry);
-+extern int nondir_unmod_to_del(dentry_t *dentry);
-+
-+extern int dir_unmod_to_mod(dentry_t *dentry);
-+
-+/* rename specials */
-+extern int rename_directory(inode_t *old_dir, dentry_t *old_dentry, inode_t *new_dir, dentry_t *new_dentry);
-+extern int rename_nondir(inode_t *old_dir, dentry_t *old_dentry, inode_t *new_dir, dentry_t *new_dentry);
-+
-+/* misc stuff */
-+extern int mini_fo_tri_interpose(dentry_t *hidden_dentry,
-+				 dentry_t *hidden_sto_dentry,
-+				 dentry_t *dentry,
-+				 super_block_t *sb, int flag);
-+
-+extern int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
-+			   dentry_t *src_dentry, struct vfsmount *src_mnt);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
-+
-+extern int create_sto_nod(dentry_t *dentry, int mode, dev_t dev);
-+extern int create_sto_reg_file(dentry_t *dentry, int mode, struct nameidata *nd);
-+#else
-+extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode);
-+
-+extern int create_sto_nod(dentry_t *dentry, int mode, int dev);
-+extern int create_sto_reg_file(dentry_t *dentry, int mode);
-+#endif
-+
-+extern int create_sto_dir(dentry_t *dentry, int mode);
-+
-+extern int exists_in_storage(dentry_t *dentry);
-+extern int is_mini_fo_existant(dentry_t *dentry);
-+extern int get_neg_sto_dentry(dentry_t *dentry);
-+extern int build_sto_structure(dentry_t *dir, dentry_t *dentry);
-+extern int get_mini_fo_bpath(dentry_t *dentry, char **bpath, int *bpath_len);
-+extern dentry_t *bpath_walk(super_block_t *sb, char *bpath);
-+extern int bpath_put(dentry_t *dentry);
-+
-+/* check_mini_fo types functions */
-+extern int check_mini_fo_dentry(dentry_t *dentry);
-+extern int check_mini_fo_file(file_t *file);
-+extern int check_mini_fo_inode(inode_t *inode);
-+
-+/* General meta functions, can be called from outside of meta.c */
-+extern int meta_build_lists(dentry_t *dentry);
-+extern int meta_put_lists(dentry_t *dentry);
-+extern int __meta_put_lists(inode_t *inode);
-+
-+extern int meta_add_d_entry(dentry_t *dentry, const char *name, int len);
-+extern int meta_add_r_entry(dentry_t *dentry,
-+			    const char *old_name, int old_len,
-+			    const char *new_name, int new_len);
-+
-+extern int meta_remove_r_entry(dentry_t *dentry, const char *name, int len);
-+
-+extern int meta_check_d_entry(dentry_t *dentry, const char *name, int len);
-+extern int __meta_check_d_entry(inode_t *inode, const char *name, int len);
-+
-+extern char* meta_check_r_entry(dentry_t *dentry, const char *name, int len);
-+extern char* __meta_check_r_entry(inode_t *inode, const char *name, int len);
-+extern int meta_is_r_entry(dentry_t *dentry, const char *name, int len);
-+extern int __meta_is_r_entry(inode_t *inode, const char *name, int len);
-+
-+/* Specific meta functions, should be called only inside meta.c */
-+extern int __meta_put_d_list(inode_t *inode);
-+extern int __meta_put_r_list(inode_t *inode);
-+
-+extern int meta_list_add_d_entry(dentry_t *dentry,
-+				 const char *name, int len);
-+extern int meta_list_add_r_entry(dentry_t *dentry,
-+				 const char *old_name, int old_len,
-+				 const char *new_name, int new_len);
-+
-+extern int meta_list_remove_r_entry(dentry_t *dentry,
-+				    const char *name, int len);
-+
-+extern int __meta_list_remove_r_entry(inode_t *inode,
-+				      const char *name, int len);
-+
-+extern int meta_write_d_entry(dentry_t *dentry, const char *name, int len);
-+extern int meta_write_r_entry(dentry_t *dentry,
-+			      const char *old_name, int old_len,
-+			      const char *new_name, int new_len);
-+
-+extern int meta_sync_lists(dentry_t *dentry);
-+extern int meta_sync_d_list(dentry_t *dentry, int app_flag);
-+extern int meta_sync_r_list(dentry_t *dentry, int app_flag);
-+
-+/* ndl stuff */
-+extern int ndl_add_entry(struct readdir_data *rd, const char *name, int len);
-+extern void ndl_put_list(struct readdir_data *rd);
-+extern int ndl_check_entry(struct readdir_data *rd,
-+			   const char *name, int len);
-+
-+
-+# define copy_inode_size(dst, src) \
-+    dst->i_size = src->i_size; \
-+    dst->i_blocks = src->i_blocks;
-+
-+static inline void
-+fist_copy_attr_atime(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_atime = src->i_atime;
-+}
-+static inline void
-+fist_copy_attr_times(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_atime = src->i_atime;
-+	dest->i_mtime = src->i_mtime;
-+	dest->i_ctime = src->i_ctime;
-+}
-+static inline void
-+fist_copy_attr_timesizes(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_atime = src->i_atime;
-+	dest->i_mtime = src->i_mtime;
-+	dest->i_ctime = src->i_ctime;
-+	copy_inode_size(dest, src);
-+}
-+static inline void
-+fist_copy_attr_all(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_mode = src->i_mode;
-+	dest->i_nlink = src->i_nlink;
-+	dest->i_uid = src->i_uid;
-+	dest->i_gid = src->i_gid;
-+	dest->i_rdev = src->i_rdev;
-+	dest->i_atime = src->i_atime;
-+	dest->i_mtime = src->i_mtime;
-+	dest->i_ctime = src->i_ctime;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-+	dest->i_blksize = src->i_blksize;
-+#endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,12)
-+	dest->i_blkbits = src->i_blkbits;
-+# endif /* linux 2.4.12 and newer */
-+	copy_inode_size(dest, src);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	dest->i_attr_flags = src->i_attr_flags;
-+#else
-+	dest->i_flags = src->i_flags;
-+#endif
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+/* copied from linux/fs.h */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+static inline void double_lock(struct dentry *d1, struct dentry *d2)
-+{
-+	struct mutex *m1 = &d1->d_inode->i_mutex;
-+	struct mutex *m2 = &d2->d_inode->i_mutex;
-+	if (m1 != m2) {
-+		if ((unsigned long) m1 < (unsigned long) m2) {
-+			struct mutex *tmp = m2;
-+			m2 = m1; m1 = tmp;
-+		}
-+		mutex_lock(m1);
-+	}
-+	mutex_lock(m2);
-+}
-+
-+static inline void double_unlock(struct dentry *d1, struct dentry *d2)
-+{
-+	struct mutex *m1 = &d1->d_inode->i_mutex;
-+	struct mutex *m2 = &d2->d_inode->i_mutex;
-+	mutex_unlock(m1);
-+	if (m1 != m2)
-+		mutex_unlock(m2);
-+	dput(d1);
-+	dput(d2);
-+}
-+
-+#else
-+static inline void double_down(struct semaphore *s1, struct semaphore *s2)
-+{
-+        if (s1 != s2) {
-+                if ((unsigned long) s1 < (unsigned long) s2) {
-+                        struct semaphore *tmp = s2;
-+                        s2 = s1; s1 = tmp;
-+                }
-+                down(s1);
-+        }
-+        down(s2);
-+}
-+
-+static inline void double_up(struct semaphore *s1, struct semaphore *s2)
-+{
-+        up(s1);
-+        if (s1 != s2)
-+                up(s2);
-+}
-+
-+static inline void double_lock(struct dentry *d1, struct dentry *d2)
-+{
-+        double_down(&d1->d_inode->i_sem, &d2->d_inode->i_sem);
-+}
-+
-+static inline void double_unlock(struct dentry *d1, struct dentry *d2)
-+{
-+        double_up(&d1->d_inode->i_sem,&d2->d_inode->i_sem);
-+        dput(d1);
-+        dput(d2);
-+}
-+#endif   /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) */
-+#endif  /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
-+#endif /* __KERNEL__ */
-+
-+/*
-+ * Definitions for user and kernel code
-+ */
-+
-+/* ioctls */
-+
-+#endif	/* not __MINI_FO_H_ */
---- /dev/null
-+++ b/fs/mini_fo/mini_fo-merge
-@@ -0,0 +1,180 @@
-+#!/bin/bash
-+#
-+# Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
-+# 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.
-+#
-+
-+BASE=
-+STO=
-+HELP=
-+DRYRUN=
-+VERBOSE=
-+TMP="/tmp/"
-+META_NAME="META_dAfFgHE39ktF3HD2sr"
-+SKIP_DEL_LIST="skip-delete-list.mini_fo-merge"
-+
-+COMMAND=
-+exec_command()
-+{
-+    if [ x$DRYRUN == "xset" ]; then
-+	echo "  would run: $COMMAND"
-+    elif ! [ x$DRYRUN == "xset" ]; then
-+	if [ x$VERBOSE == "xset" ]; then
-+	    echo "  running: $COMMAND"
-+	fi
-+	eval $COMMAND
-+    fi
-+}
-+
-+usage()
-+{
-+cat <<EOF
-+
-+USAGE: $0 -b <base dir> -s <storage dir>
-+Version 0.1
-+
-+This script merges the contents of a mini_fo storage file system back
-+to the base file system.
-+
-+!!! Warning: This will modify the base filesystem and can destroy data
-+             if used wrongly.
-+
-+Options:
-+     -b <base dir>
-+          the directory of the base file system.
-+
-+     -s <storage dir>
-+          the directory of the storage file system.
-+
-+     -d   dry run, will not change anything and print the commands that
-+          would be executed.
-+
-+     -t   tmp dir for storing temporary file. default: $TMP
-+
-+     -v   show what operations are performed.
-+
-+     -h   displays this message.
-+
-+EOF
-+}
-+
-+# parse parameters
-+while getopts hdvt:b:s: OPTS
-+  do
-+  case $OPTS in
-+      h)  HELP="set";;
-+      d)  DRYRUN="set";;
-+      v)  VERBOSE="set";;
-+      b)  BASE="$OPTARG";;
-+      s)  STO="$OPTARG";;
-+      t)  TMP="$OPTARG";;
-+      ?)  usage
-+	  exit 1;;
-+  esac
-+done
-+
-+if [ "x$HELP" == "xset" ]; then
-+    usage
-+    exit -1
-+fi
-+
-+if ! [ -d "$BASE" ] || ! [ -d "$STO" ]; then
-+    echo -e "$0:\n Error, -s and/or -b argument missing. type $0 -h for help."
-+    exit -1;
-+fi
-+
-+# get full paths
-+pushd $STO; STO=`pwd`; popd
-+pushd $BASE; BASE=`pwd`; popd
-+TMP=${TMP%/}
-+
-+
-+cat<<EOF
-+###############################################################################
-+# mini_fo-merge
-+#
-+# base dir:       $BASE
-+# storage dir:    $STO
-+# meta filename:  $META_NAME
-+# dry run:        $DRYRUN
-+# verbose:        $VERBOSE
-+# tmp files:      $TMP
-+###############################################################################
-+
-+EOF
-+
-+rm $TMP/$SKIP_DEL_LIST
-+
-+# first process all renamed dirs
-+echo "Merging renamed directories..."
-+pushd $STO &> /dev/null
-+find . -name $META_NAME -type f -print0  | xargs -0 -e grep  -e '^R ' | tr -s ':R' ' ' | while read ENTRY; do
-+    echo "entry: $ENTRY"
-+    META_FILE=`echo $ENTRY | cut -d ' ' -f 1`
-+    OLD_B_DIR=`echo $ENTRY | cut -d ' ' -f 2 | sed -e 's/\///'`
-+    NEW_NAME=`echo $ENTRY | cut -d ' ' -f 3`
-+    NEW_B_DIR=`echo $META_FILE | sed -e "s/$META_NAME/$NEW_NAME/" | sed -e 's/^\.\///'`
-+    echo "META_FILE: $META_FILE"
-+    echo "OLD_B_DIR: $OLD_B_DIR"
-+    echo "NEW_NAME: $NEW_NAME"
-+    echo  "NEW_B_DIR: $NEW_B_DIR"
-+
-+    pushd $BASE &> /dev/null
-+    # remove an existing dir in storage
-+    COMMAND="rm -rf $NEW_B_DIR"; exec_command
-+    COMMAND="cp -R $OLD_B_DIR $NEW_B_DIR"; exec_command
-+    echo ""
-+    popd &> /dev/null
-+
-+    # remember this dir to exclude it from deleting later
-+    echo $NEW_B_DIR >> $TMP/$SKIP_DEL_LIST
-+done
-+
-+# delete all whiteouted files from base
-+echo -e "\nDeleting whiteout'ed files from base file system..."
-+find . -name $META_NAME -type f -print0  | xargs -0 -e grep  -e '^D ' | sed -e 's/:D//' | while read ENTRY; do
-+    META_FILE=`echo $ENTRY | cut -d ' ' -f 1`
-+    DEL_NAME=`echo $ENTRY | cut -d ' ' -f 2`
-+    DEL_FILE=`echo $META_FILE | sed -e "s/$META_NAME/$DEL_NAME/" | sed -e 's/^\.\///'`
-+    grep -x $DEL_FILE $TMP/$SKIP_DEL_LIST &> /dev/null
-+    if [ $? -ne 0 ]; then
-+	pushd $BASE &> /dev/null
-+	COMMAND="rm -rf $DEL_FILE"; exec_command
-+	popd &> /dev/null
-+    else
-+	echo "  excluding: $DEL_FILE as in skip-del-list."
-+    fi
-+done
-+
-+# create all dirs and update permissions
-+echo -e "\nSetting up directory structures in base file system..."
-+find . -type d | sed -e 's/^\.\///' | while read DIR; do
-+    PERMS=`stat -c %a $DIR`
-+    DIR_UID=`stat -c %u $DIR`
-+    DIR_GID=`stat -c %g $DIR`
-+    pushd $BASE &> /dev/null
-+    if ! [ -d $DIR ]; then
-+	COMMAND="mkdir -p $DIR"; exec_command
-+    fi
-+    COMMAND="chmod $PERMS $DIR"; exec_command
-+    COMMAND="chown $DIR_UID:$DIR_GID $DIR"; exec_command
-+    popd &> /dev/null
-+done
-+
-+# merge all non-directory files
-+echo -e "\nMerging all non-directory files...."
-+for i in b c p f l s; do
-+    find . -type $i | sed -e 's/^\.\///' | grep -v "$META_NAME" | while read FILE; do
-+	pushd $BASE #&> /dev/null
-+	COMMAND="cp -df $STO/$FILE $BASE/$FILE"; exec_command
-+	popd &> /dev/null
-+    done
-+done
-+popd &> /dev/null
-+
-+#rm $TMP/$SKIP_DEL_LIST
-+
-+echo "Done!"
---- /dev/null
-+++ b/fs/mini_fo/mini_fo-overlay
-@@ -0,0 +1,130 @@
-+#!/bin/bash
-+#
-+# Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
-+# 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.
-+#
-+
-+HELP=
-+SUFF=
-+MNTP=
-+MNT_DIR="/mnt"
-+STO=
-+STO_DIR="/tmp"
-+BASE=
-+
-+usage()
-+{
-+cat <<EOF
-+
-+Usage: $0 [-s suffix] [-d sto_dir_dir] [-m mount point] base_dir
-+Version 0.1
-+
-+This script overlays the given base directory using the mini_fo file
-+system. If only the base directory base_dir is given, $0
-+will use a storage directory called "sto-<base_dir_name>" in $STO_DIR,
-+and mount point "mini_fo-<base_dir_dir>" in $MNT_DIR.
-+
-+Options:
-+     -s <suffix>
-+          add given suffix to storage directory and the mount
-+          point. This is usefull for overlaying one base directory
-+          several times and avoiding conflicts with storage directory
-+          names and mount points.
-+
-+     -d <sto_dir_dir>
-+          change the directory in which the storage directory will be
-+          created (default is currently "$STO_DIR".
-+
-+     -m <mount point>
-+          use an alternative directory to create the mini_fo
-+          mountpoint (default is currently "$MNT_DIR".
-+
-+     -h   displays this message.
-+
-+EOF
-+exit 1;
-+}
-+
-+while getopts hm:s:d: OPTS
-+  do
-+  case $OPTS in
-+      s)  SUFF="$OPTARG";;
-+      d)  STO_DIR="$OPTARG";;
-+      m)  MNT_DIR="$OPTARG";;
-+      h)  HELP="set";;
-+      ?)  usage
-+	  exit 1;;
-+  esac
-+done
-+shift $(($OPTIND - 1))
-+
-+BASE="$1"
-+
-+if [ "x$HELP" == "xset" ]; then
-+    usage
-+    exit -1
-+fi
-+
-+# fix suffix
-+if [ "x$SUFF" != "x" ]; then
-+    SUFF="-$SUFF"
-+fi
-+
-+# kill trailing slashes
-+MNT_DIR=${MNT_DIR%/}
-+STO_DIR=${STO_DIR%/}
-+BASE=${BASE%/}
-+
-+
-+if ! [ -d "$BASE" ]; then
-+    echo "invalid base dir $BASE, run $0 -h for help."
-+    exit -1
-+fi
-+
-+# check opts
-+if ! [ -d "$MNT_DIR" ]; then
-+    echo "invalid mount dir $MNT_DIR, run $0 -h for help."
-+    exit -1
-+fi
-+
-+if ! [ -d "$STO_DIR" ]; then
-+    echo "invalid sto_dir_dir $STO_DIR, run $0 -h for help."
-+    exit -1
-+fi
-+
-+MNTP="$MNT_DIR/mini_fo-`basename $BASE`$SUFF"
-+STO="$STO_DIR/sto-`basename $BASE`$SUFF"
-+
-+# create the mount point if it doesn't exist
-+mkdir -p $MNTP
-+if [ $? -ne 0 ]; then
-+    echo "Error, failed to create mount point $MNTP"
-+fi
-+
-+mkdir -p $STO
-+if [ $? -ne 0 ]; then
-+    echo "Error, failed to create storage dir $STO"
-+fi
-+
-+# check if fs is already mounted
-+mount | grep mini_fo | grep $MNTP &> /dev/null
-+if [ $? -eq 0 ]; then
-+    echo "Error, existing mini_fo mount at $MNTP."
-+    exit -1
-+fi
-+
-+mount | grep mini_fo | grep $STO &> /dev/null
-+if [ $? -eq 0 ]; then
-+    echo "Error, $STO seems to be used already."
-+    exit -1
-+fi
-+
-+# mount
-+mount -t mini_fo -o base=$BASE,sto=$STO $BASE $MNTP
-+
-+if [ $? -ne 0 ]; then
-+    echo "Error, mounting failed, maybe no permisson to mount?"
-+fi
---- /dev/null
-+++ b/fs/mini_fo/mmap.c
-@@ -0,0 +1,637 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+
-+#ifdef FIST_COUNT_WRITES
-+/* for counting writes in the middle vs. regular writes */
-+unsigned long count_writes = 0, count_writes_middle = 0;
-+#endif /* FIST_COUNT_WRITES */
-+
-+/* forward declaration of commit write and prepare write */
-+STATIC int mini_fo_commit_write(file_t *file, page_t *page, unsigned from, unsigned to);
-+STATIC int mini_fo_prepare_write(file_t *file, page_t *page, unsigned from, unsigned to);
-+
-+
-+/*
-+ * Function for handling creation of holes when lseek-ing past the
-+ * end of the file and then writing some data.
-+ */
-+int
-+mini_fo_fill_zeros(file_t* file, page_t *page, unsigned from)
-+{
-+	int err = 0;
-+	dentry_t *dentry = file->f_dentry;
-+	inode_t *inode = dentry->d_inode;
-+	page_t *tmp_page;
-+	int index;
-+
-+	print_entry_location();
-+
-+	for (index = inode->i_size >> PAGE_CACHE_SHIFT; index < page->index; index++) {
-+		tmp_page = mini_fo_get1page(file, index);
-+		if (IS_ERR(tmp_page)) {
-+			err = PTR_ERR(tmp_page);
-+			goto out;
-+		}
-+
-+		/*
-+		 * zero out rest of the contents of the page between the appropriate
-+		 * offsets.
-+		 */
-+		memset((char*)page_address(tmp_page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, PAGE_CACHE_SIZE - (inode->i_size & ~PAGE_CACHE_MASK));
-+
-+		if (! (err = mini_fo_prepare_write(file, tmp_page, 0, PAGE_CACHE_SIZE)))
-+			err = mini_fo_commit_write(file, tmp_page, 0, PAGE_CACHE_SIZE);
-+
-+		page_cache_release(tmp_page);
-+		if (err < 0)
-+			goto out;
-+		if (current->need_resched)
-+			schedule();
-+	}
-+
-+	/* zero out appropriate parts of last page */
-+
-+	/*
-+	 * if the encoding type is block, then adjust the 'from' (where the
-+	 * zeroing will start) offset appropriately
-+	 */
-+	from = from & (~(FIST_ENCODING_BLOCKSIZE - 1));
-+
-+	if ((from - (inode->i_size & ~PAGE_CACHE_MASK)) > 0) {
-+
-+		memset((char*)page_address(page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, from - (inode->i_size & ~PAGE_CACHE_MASK));
-+		if (! (err = mini_fo_prepare_write(file, page, 0, PAGE_CACHE_SIZE)))
-+			err = mini_fo_commit_write(file, page, 0, PAGE_CACHE_SIZE);
-+
-+		if (err < 0)
-+			goto out;
-+		if (current->need_resched)
-+			schedule();
-+	}
-+
-+ out:
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+
-+STATIC int
-+mini_fo_writepage(page_t *page)
-+{
-+	int err = -EIO;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	page_t *hidden_page;
-+	char *kaddr, *hidden_kaddr;
-+
-+	print_entry_location();
-+
-+	inode = page->mapping->host;
-+	hidden_inode = itohi(inode);
-+
-+	/*
-+	 * writepage is called when shared mmap'ed files need to write
-+	 * their pages, while prepare/commit_write are called from the
-+	 * non-paged write() interface.  (However, in 2.3 the two interfaces
-+	 * share the same cache, while in 2.2 they didn't.)
-+	 *
-+	 * So we pretty much have to duplicate much of what commit_write does.
-+	 */
-+
-+	/* find lower page (returns a locked page) */
-+	hidden_page = grab_cache_page(hidden_inode->i_mapping, page->index);
-+	if (!hidden_page)
-+		goto out;
-+
-+	/* get page address, and encode it */
-+	kaddr = (char *) kmap(page);
-+	hidden_kaddr = (char*) kmap(hidden_page);
-+	mini_fo_encode_block(kaddr, hidden_kaddr, PAGE_CACHE_SIZE, inode, inode->i_sb, page->index);
-+	/* if encode_block could fail, then return error */
-+	kunmap(page);
-+	kunmap(hidden_page);
-+
-+	/* call lower writepage (expects locked page) */
-+	err = hidden_inode->i_mapping->a_ops->writepage(hidden_page);
-+
-+	/*
-+	 * update mtime and ctime of lower level file system
-+	 * mini_fo' mtime and ctime are updated by generic_file_write
-+	 */
-+	hidden_inode->i_mtime = hidden_inode->i_ctime = CURRENT_TIME;
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,1)
-+	UnlockPage(hidden_page);	/* b/c grab_cache_page locked it */
-+# endif /* kernel older than 2.4.1 */
-+	page_cache_release(hidden_page); /* b/c grab_cache_page increased refcnt */
-+
-+	if (err)
-+		ClearPageUptodate(page);
-+	else
-+		SetPageUptodate(page);
-+ out:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,1)
-+	UnlockPage(page);
-+# endif /* kernel 2.4.1 and newer */
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+/*
-+ * get one page from cache or lower f/s, return error otherwise.
-+ * returns unlocked, up-to-date page (if ok), with increased refcnt.
-+ */
-+page_t *
-+mini_fo_get1page(file_t *file, int index)
-+{
-+	page_t *page;
-+	dentry_t *dentry;
-+	inode_t *inode;
-+	struct address_space *mapping;
-+	int err;
-+
-+	print_entry_location();
-+
-+	dentry = file->f_dentry; /* CPW: Moved below print_entry_location */
-+	inode = dentry->d_inode;
-+	mapping = inode->i_mapping;
-+
-+	fist_dprint(8, "%s: read page index %d pid %d\n", __FUNCTION__, index, current->pid);
-+	if (index < 0) {
-+		printk("%s BUG: index=%d\n", __FUNCTION__, index);
-+		page = ERR_PTR(-EIO);
-+		goto out;
-+	}
-+	page = read_cache_page(mapping,
-+			       index,
-+			       (filler_t *) mapping->a_ops->readpage,
-+			       (void *) file);
-+	if (IS_ERR(page))
-+		goto out;
-+	wait_on_page(page);
-+	if (!Page_Uptodate(page)) {
-+		lock_page(page);
-+		err = mapping->a_ops->readpage(file, page);
-+		if (err) {
-+			page = ERR_PTR(err);
-+			goto out;
-+		}
-+		wait_on_page(page);
-+		if (!Page_Uptodate(page)) {
-+			page = ERR_PTR(-EIO);
-+			goto out;
-+		}
-+	}
-+
-+ out:
-+	print_exit_pointer(page);
-+	return page;
-+}
-+
-+
-+/*
-+ * get one page from cache or lower f/s, return error otherwise.
-+ * similar to get1page, but doesn't guarantee that it will return
-+ * an unlocked page.
-+ */
-+page_t *
-+mini_fo_get1page_cached(file_t *file, int index)
-+{
-+	page_t *page;
-+	dentry_t *dentry;
-+	inode_t *inode;
-+	struct address_space *mapping;
-+	int err;
-+
-+	print_entry_location();
-+
-+	dentry = file->f_dentry; /* CPW: Moved below print_entry_location */
-+	inode = dentry->d_inode;
-+	mapping = inode->i_mapping;
-+
-+	fist_dprint(8, "%s: read page index %d pid %d\n", __FUNCTION__, index, current->pid);
-+	if (index < 0) {
-+		printk("%s BUG: index=%d\n", __FUNCTION__, index);
-+		page = ERR_PTR(-EIO);
-+		goto out;
-+	}
-+	page = read_cache_page(mapping,
-+			       index,
-+			       (filler_t *) mapping->a_ops->readpage,
-+			       (void *) file);
-+	if (IS_ERR(page))
-+		goto out;
-+
-+ out:
-+	print_exit_pointer(page);
-+	return page;
-+}
-+
-+
-+/*
-+ * readpage is called from generic_page_read and the fault handler.
-+ * If your file system uses generic_page_read for the read op, it
-+ * must implement readpage.
-+ *
-+ * Readpage expects a locked page, and must unlock it.
-+ */
-+STATIC int
-+mini_fo_do_readpage(file_t *file, page_t *page)
-+{
-+	int err = -EIO;
-+	dentry_t *dentry;
-+	file_t *hidden_file = NULL;
-+	dentry_t *hidden_dentry;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	char *page_data;
-+	page_t *hidden_page;
-+	char *hidden_page_data;
-+	int real_size;
-+
-+	print_entry_location();
-+
-+	dentry = file->f_dentry; /* CPW: Moved below print_entry_location */
-+	if (ftopd(file) != NULL)
-+		hidden_file = ftohf(file);
-+	hidden_dentry = dtohd(dentry);
-+	inode = dentry->d_inode;
-+	hidden_inode = itohi(inode);
-+
-+	fist_dprint(7, "%s: requesting page %d from file %s\n", __FUNCTION__, page->index, dentry->d_name.name);
-+
-+	MALLOC_PAGE_POINTERS(hidden_pages, num_hidden_pages);
-+	MALLOC_PAGEDATA_POINTERS(hidden_pages_data, num_hidden_pages);
-+	FOR_EACH_PAGE
-+		CURRENT_HIDDEN_PAGE = NULL;
-+
-+	/* find lower page (returns a locked page) */
-+	FOR_EACH_PAGE {
-+		fist_dprint(8, "%s: Current page index = %d\n", __FUNCTION__, CURRENT_HIDDEN_PAGEINDEX);
-+		CURRENT_HIDDEN_PAGE = read_cache_page(hidden_inode->i_mapping,
-+						      CURRENT_HIDDEN_PAGEINDEX,
-+						      (filler_t *) hidden_inode->i_mapping->a_ops->readpage,
-+						      (void *) hidden_file);
-+		if (IS_ERR(CURRENT_HIDDEN_PAGE)) {
-+			err = PTR_ERR(CURRENT_HIDDEN_PAGE);
-+			CURRENT_HIDDEN_PAGE = NULL;
-+			goto out_release;
-+		}
-+	}
-+
-+	/*
-+	 * wait for the page data to show up
-+	 * (signaled by readpage as unlocking the page)
-+	 */
-+	FOR_EACH_PAGE {
-+		wait_on_page(CURRENT_HIDDEN_PAGE);
-+		if (!Page_Uptodate(CURRENT_HIDDEN_PAGE)) {
-+			/*
-+			 * call readpage() again if we returned from wait_on_page with a
-+			 * page that's not up-to-date; that can happen when a partial
-+			 * page has a few buffers which are ok, but not the whole
-+			 * page.
-+			 */
-+			lock_page(CURRENT_HIDDEN_PAGE);
-+			err = hidden_inode->i_mapping->a_ops->readpage(hidden_file,
-+								       CURRENT_HIDDEN_PAGE);
-+			if (err) {
-+				CURRENT_HIDDEN_PAGE = NULL;
-+				goto out_release;
-+			}
-+			wait_on_page(CURRENT_HIDDEN_PAGE);
-+			if (!Page_Uptodate(CURRENT_HIDDEN_PAGE)) {
-+				err = -EIO;
-+				goto out_release;
-+			}
-+		}
-+	}
-+
-+	/* map pages, get their addresses */
-+	page_data = (char *) kmap(page);
-+	FOR_EACH_PAGE
-+		CURRENT_HIDDEN_PAGEDATA = (char *) kmap(CURRENT_HIDDEN_PAGE);
-+
-+	/* if decode_block could fail, then return error */
-+	err = 0;
-+	real_size = hidden_inode->i_size - (page->index << PAGE_CACHE_SHIFT);
-+	if (real_size <= 0)
-+		memset(page_data, 0, PAGE_CACHE_SIZE);
-+	else if (real_size < PAGE_CACHE_SIZE) {
-+		mini_fo_decode_block(hidden_page_data, page_data, real_size, inode, inode->i_sb, page->index);
-+		memset(page_data + real_size, 0, PAGE_CACHE_SIZE - real_size);
-+	} else
-+		mini_fo_decode_block(hidden_page_data, page_data, PAGE_CACHE_SIZE, inode, inode->i_sb, page->index);
-+
-+	FOR_EACH_PAGE
-+		kunmap(CURRENT_HIDDEN_PAGE);
-+	kunmap(page);
-+
-+ out_release:
-+	FOR_EACH_PAGE
-+		if (CURRENT_HIDDEN_PAGE)
-+			page_cache_release(CURRENT_HIDDEN_PAGE); /* undo read_cache_page */
-+
-+	FREE_PAGE_POINTERS(hidden_pages, num_hidden_pages);
-+	FREE_PAGEDATA_POINTERS(hidden_pages_data, num_hidden_pages);
-+
-+ out:
-+	if (err == 0)
-+		SetPageUptodate(page);
-+	else
-+		ClearPageUptodate(page);
-+
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_readpage(file_t *file, page_t *page)
-+{
-+	int err;
-+	print_entry_location();
-+
-+	err = mini_fo_do_readpage(file, page);
-+
-+	/*
-+	 * we have to unlock our page, b/c we _might_ have gotten a locked page.
-+	 * but we no longer have to wakeup on our page here, b/c UnlockPage does
-+	 * it
-+	 */
-+	UnlockPage(page);
-+
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_prepare_write(file_t *file, page_t *page, unsigned from, unsigned to)
-+{
-+	int err = 0;
-+
-+	print_entry_location();
-+
-+	/*
-+	 * we call kmap(page) only here, and do the kunmap
-+	 * and the actual downcalls, including unlockpage and uncache
-+	 * in commit_write.
-+	 */
-+	kmap(page);
-+
-+	/* fast path for whole page writes */
-+	if (from == 0 && to == PAGE_CACHE_SIZE)
-+		goto out;
-+	/* read the page to "revalidate" our data */
-+	/* call the helper function which doesn't unlock the page */
-+	if (!Page_Uptodate(page))
-+		err = mini_fo_do_readpage(file, page);
-+
-+ out:
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+
-+STATIC int
-+mini_fo_commit_write(file_t *file, page_t *page, unsigned from, unsigned to)
-+{
-+	int err = -ENOMEM;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	page_t *hidden_page;
-+	file_t *hidden_file = NULL;
-+	loff_t pos;
-+	unsigned bytes = to - from;
-+	unsigned hidden_from, hidden_to, hidden_bytes;
-+
-+	print_entry_location();
-+
-+	inode = page->mapping->host; /* CPW: Moved below print_entry_location */
-+	hidden_inode = itohi(inode);
-+
-+	ASSERT(file != NULL);
-+	/*
-+	 * here we have a kmapped page, with data from the user copied
-+	 * into it.  we need to encode_block it, and then call the lower
-+	 * commit_write.  We also need to simulate same behavior of
-+	 * generic_file_write, and call prepare_write on the lower f/s first.
-+	 */
-+#ifdef FIST_COUNT_WRITES
-+	count_writes++;
-+# endif /* FIST_COUNT_WRITES */
-+
-+	/* this is append and/or extend -- we can't have holes so fill them in */
-+	if (page->index > (hidden_inode->i_size >> PAGE_CACHE_SHIFT)) {
-+		page_t *tmp_page;
-+		int index;
-+		for (index = hidden_inode->i_size >> PAGE_CACHE_SHIFT; index < page->index; index++) {
-+			tmp_page = mini_fo_get1page(file, index);
-+			if (IS_ERR(tmp_page)) {
-+				err = PTR_ERR(tmp_page);
-+				goto out;
-+			}
-+			/* zero out the contents of the page at the appropriate offsets */
-+			memset((char*)page_address(tmp_page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, PAGE_CACHE_SIZE - (inode->i_size & ~PAGE_CACHE_MASK));
-+			if (!(err = mini_fo_prepare_write(file, tmp_page, 0, PAGE_CACHE_SIZE)))
-+				err = mini_fo_commit_write(file, tmp_page, 0, PAGE_CACHE_SIZE);
-+			page_cache_release(tmp_page);
-+			if (err < 0)
-+				goto out;
-+			if (current->need_resched)
-+				schedule();
-+		}
-+	}
-+
-+	if (ftopd(file) != NULL)
-+		hidden_file = ftohf(file);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_inode->i_mutex);
-+#else
-+	down(&hidden_inode->i_sem);
-+#endif
-+	/* find lower page (returns a locked page) */
-+	hidden_page = grab_cache_page(hidden_inode->i_mapping, page->index);
-+	if (!hidden_page)
-+		goto out;
-+
-+#if FIST_ENCODING_BLOCKSIZE > 1
-+#  error encoding_blocksize greater than 1 is not yet supported
-+# endif /* FIST_ENCODING_BLOCKSIZE > 1 */
-+
-+	hidden_from = from & (~(FIST_ENCODING_BLOCKSIZE - 1));
-+	hidden_to = ((to + FIST_ENCODING_BLOCKSIZE - 1) & (~(FIST_ENCODING_BLOCKSIZE - 1)));
-+	if ((page->index << PAGE_CACHE_SHIFT) + to > hidden_inode->i_size) {
-+
-+		/*
-+		 * if this call to commit_write had introduced holes and the code
-+		 * for handling holes was invoked, then the beginning of this page
-+		 * must be zeroed out
-+		 * zero out bytes from 'size_of_file%pagesize' to 'from'.
-+		 */
-+		if ((hidden_from - (inode->i_size & ~PAGE_CACHE_MASK)) > 0)
-+			memset((char*)page_address(page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, hidden_from - (inode->i_size & ~PAGE_CACHE_MASK));
-+
-+	}
-+	hidden_bytes = hidden_to - hidden_from;
-+
-+	/* call lower prepare_write */
-+	err = -EINVAL;
-+	if (hidden_inode->i_mapping &&
-+	    hidden_inode->i_mapping->a_ops &&
-+	    hidden_inode->i_mapping->a_ops->prepare_write)
-+		err = hidden_inode->i_mapping->a_ops->prepare_write(hidden_file,
-+								    hidden_page,
-+								    hidden_from,
-+								    hidden_to);
-+	if (err)
-+		/* don't leave locked pages behind, esp. on an ENOSPC */
-+		goto out_unlock;
-+
-+	fist_dprint(8, "%s: encoding %d bytes\n", __FUNCTION__, hidden_bytes);
-+	mini_fo_encode_block((char *) page_address(page) + hidden_from, (char*) page_address(hidden_page) + hidden_from, hidden_bytes, inode, inode->i_sb, page->index);
-+	/* if encode_block could fail, then goto unlock and return error */
-+
-+	/* call lower commit_write */
-+	err = hidden_inode->i_mapping->a_ops->commit_write(hidden_file,
-+							   hidden_page,
-+							   hidden_from,
-+							   hidden_to);
-+
-+	if (err < 0)
-+		goto out_unlock;
-+
-+	err = bytes;	/* convert error to no. of bytes */
-+
-+	inode->i_blocks = hidden_inode->i_blocks;
-+	/* we may have to update i_size */
-+	pos = (page->index << PAGE_CACHE_SHIFT) + to;
-+	if (pos > inode->i_size)
-+		inode->i_size = pos;
-+
-+	/*
-+	 * update mtime and ctime of lower level file system
-+	 * mini_fo' mtime and ctime are updated by generic_file_write
-+	 */
-+	hidden_inode->i_mtime = hidden_inode->i_ctime = CURRENT_TIME;
-+
-+	mark_inode_dirty_sync(inode);
-+
-+ out_unlock:
-+	UnlockPage(hidden_page);
-+	page_cache_release(hidden_page);
-+	kunmap(page);		/* kmap was done in prepare_write */
-+ out:
-+	/* we must set our page as up-to-date */
-+	if (err < 0)
-+		ClearPageUptodate(page);
-+	else
-+		SetPageUptodate(page);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_inode->i_mutex);
-+#else
-+	up(&hidden_inode->i_sem);
-+#endif
-+	print_exit_status(err);
-+	return err;			/* assume all is ok */
-+}
-+
-+
-+STATIC int
-+mini_fo_bmap(struct address_space *mapping, long block)
-+{
-+	int err = 0;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+
-+	print_entry_location();
-+
-+	inode = (inode_t *) mapping->host;
-+	hidden_inode = itohi(inode);
-+
-+	if (hidden_inode->i_mapping->a_ops->bmap)
-+		err = hidden_inode->i_mapping->a_ops->bmap(hidden_inode->i_mapping, block);
-+	print_exit_location();
-+	return err;
-+}
-+
-+
-+/*
-+ * This function is copied verbatim from mm/filemap.c.
-+ * XXX: It should be simply moved to some header file instead -- bug Al about it!
-+ */
-+static inline int sync_page(struct page *page)
-+{
-+	struct address_space *mapping = page->mapping;
-+
-+	if (mapping && mapping->a_ops && mapping->a_ops->sync_page)
-+		return mapping->a_ops->sync_page(page);
-+	return 0;
-+}
-+
-+
-+/*
-+ * XXX: we may not need this function if not FIST_FILTER_DATA.
-+ * FIXME: for FIST_FILTER_SCA, get all lower pages and sync them each.
-+ */
-+STATIC int
-+mini_fo_sync_page(page_t *page)
-+{
-+	int err = 0;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	page_t *hidden_page;
-+
-+	print_entry_location();
-+
-+	inode = page->mapping->host; /* CPW: Moved below print_entry_location */
-+	hidden_inode = itohi(inode);
-+
-+	/* find lower page (returns a locked page) */
-+	hidden_page = grab_cache_page(hidden_inode->i_mapping, page->index);
-+	if (!hidden_page)
-+		goto out;
-+
-+	err = sync_page(hidden_page);
-+
-+	UnlockPage(hidden_page);	/* b/c grab_cache_page locked it */
-+	page_cache_release(hidden_page); /* b/c grab_cache_page increased refcnt */
-+
-+ out:
-+	print_exit_status(err);
-+	return err;
-+}
---- /dev/null
-+++ b/fs/mini_fo/README
-@@ -0,0 +1,163 @@
-+README for the mini_fo overlay file system
-+=========================================
-+
-+
-+WHAT IS MINI_FO?
-+----------------
-+
-+mini_fo is a virtual kernel file system that can make read-only
-+file systems writable. This is done by redirecting modifying operations
-+to a writeable location called "storage directory", and leaving the
-+original data in the "base directory" untouched. When reading, the
-+file system merges the modifed and original data so that only the
-+newest versions will appear. This occurs transparently to the user,
-+who can access the data like on any other read-write file system.
-+
-+Base and storage directories may be located on the same or on
-+different partitions and may be of different file system types. While
-+the storage directory obviously needs to be writable, the base may or
-+may not be writable, what doesn't matter as it will no be modified
-+anyway.
-+
-+
-+WHAT IS GOOD FOR?
-+-----------------
-+
-+The primary purpose of the mini_fo file system is to allow easy
-+software updates to embedded systems, that often store their root
-+file system in a read-only flash file system, but there are many
-+more as for example sandboxing, or for allowing live-cds to
-+permanently store information.
-+
-+
-+BUILDING
-+--------
-+This should be simple. Adjust the Makefile to point to the correct
-+kernel headers you want to build the module for. Then:
-+
-+    # make
-+
-+should build "mini_fo.o" for a 2.4 kernel or "mini_fo.ko" for a 2.6
-+kernel.
-+
-+If you are building the module for you current kernel, you can install
-+the module (as root):
-+
-+    # make install
-+
-+or uninstall with
-+
-+    # make uninstall
-+
-+
-+USING THE FILE SYSTEM
-+--------------------
-+
-+the general mount syntax is:
-+
-+   mount -t mini_fo -o base=<base directory>,sto=<storage directory>\
-+                            <base directory> <mount point>
-+
-+Example:
-+
-+You have mounted a cdrom to /mnt/cdrom and want to modifiy some files
-+on it:
-+
-+load the module (as root)
-+
-+    # insmod mini_fo.o for a 2.4 kernel or
-+
-+    # insmod mini_fo.ko for a 2.6 kernel
-+
-+
-+create a storage dir in tmp and a mountpoint for mini_fo:
-+
-+    # mkdir /tmp/sto
-+    # mkdir /mnt/mini_fo
-+
-+and mount the mini_fo file system:
-+
-+    # mount -t mini_fo -o base=/mnt/cdrom,sto=/tmp/sto /mnt/cdrom /mnt/mini_fo
-+
-+
-+Now the data stored on the cd can be accessed via the mini_fo
-+mountpoint just like any read-write file system, files can be modified
-+and deleted, new ones can be created and so on. When done unmount the
-+file system:
-+
-+    # unmount /mnt/mini_fo
-+
-+Note that if the file system is mounted again using the same storage
-+file system, of course it will appear in the modified state again. If
-+you remount it using an new empty storage directory, it will be
-+unmodified. Therefore by executing:
-+
-+    # cd /tmp/sto
-+    # rm -rf *
-+
-+you can nuke all the changes you made to the original file system. But
-+ remember NEVER do this while the mini_fo file system is mounted!
-+
-+
-+Alternatively you can use the mini_fo-overlay bash script, that
-+simplifies managing mini_fo mounts. See TOOLS Section.
-+
-+
-+TOOLS
-+-----
-+
-+mini_fo-merge (experimental):
-+
-+This is a bash script that will merge changes contained in the storage
-+directory back to the base directory. This allows mini_fo to function
-+as a cache file system by overlaying a slow (network, ...) file system
-+and using a fast (ramdisk, ...) as storage. When done, changes can be
-+merged back to the (slow) base with mini_fo-merge. See "mini_fo-merge
-+-h" for details.
-+
-+It can be usefull for merging changes back after a successfull test
-+(patches, software updates...)
-+
-+
-+mini_fo-overlay:
-+
-+This bash script simplifies managing one or more mini_fo mounts. For
-+overlaying a directory called "basedir1", you can just call:
-+
-+    # mini_fo-overlay basedir1
-+
-+This will mount mini_fo with "basedir1" as base, "/tmp/sto-basedir1/"
-+as storage to "/mnt/mini_fo-basedir1/". It has more options though,
-+type "mini_fo-overlay -h" for details.
-+
-+
-+DOCUMENTATION, REPORTING BUGS, GETTING HELP
-+-------------------------------------------
-+
-+Please visit the mini_fo project page at:
-+
-+http://www.denx.de/twiki/bin/view/Know/MiniFOHome
-+
-+
-+WARNINGS
-+--------
-+
-+Never modify the base or the storage directorys while the mini_fo
-+file system is mounted, or you might crash you system. Simply accessing
-+and reading should not cause any trouble.
-+
-+Exporting a mini_fo mount point via NFS has not been tested, and may
-+or may not work.
-+
-+Check the RELEASE_NOTES for details on bugs and features.
-+
-+
-+
-+Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+
-+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.
-+
-+
---- /dev/null
-+++ b/fs/mini_fo/RELEASE_NOTES
-@@ -0,0 +1,111 @@
-+Release:	mini_fo-0.6.1 (v0-6-1)
-+Date:		21.09.2005
-+
-+
-+Changes:
-+--------
-+v0-6-1:
-+
-+- bugfixes (see ChangeLog)
-+
-+- two helper scripts "mini_fo_merge" and "mini_fo_overlay" (see
-+  README for details).
-+
-+v0-6-0:
-+
-+- Support for 2.4 and 2.6 (see Makefile)
-+
-+- Partial hard link support (creating works as expected, but already
-+  existing links in the base file system will be treated as if they
-+  were individual files).
-+
-+- Various bugfixes and cleanups.
-+
-+
-+v0-6-0-pre1:
-+
-+- This is mini_fo-0-6-0-pre1! This release is a complete rewrite of
-+  many vital mini_fo parts such as the old whiteout list code which
-+  has been replaced by the new META subsystem.
-+
-+- Light weight directory renaming implemented. This means if a
-+  directory is renamed via the mini_fo filesystem this will no longer
-+  result in a complete copy in storage, instead only one empty
-+  directory will be created. All base filed contained in the original
-+  directory stay there until modified.
-+
-+- Special files (creating, renaming, deleting etc.) now working.
-+
-+- Many bugfixes and cleanup, mini_fo is now a lot more stable.
-+
-+
-+v0-5-10:
-+
-+- Final release of the 0-5-* versions. Next will be a complete rewrite
-+  of many features. This release contains several bugfixes related to
-+  directory renaming.
-+
-+
-+v0-5-10-pre6:
-+
-+- Lots of cleanup and several bugfixes related to directory deleting
-+
-+- Directory renaming suddenly works, what is most likely due to the
-+  fact tha that "mv" is smart: if the classic rename doesn't work it
-+  will assume that source and target file are on different fs and will
-+  copy the directory and try to remove the source directory. Until
-+  directory removing wasn't implemented, it would fail to do this and
-+  rollback.
-+  So, directory renaming works for now, but it doesn't yet do what you
-+  would expect from a overlay fs, so use with care.
-+
-+
-+v0-5-10-pre5:
-+
-+- implemented directory deleting
-+- made parsing of mount options more stable
-+- New format of mount options! (See README)
-+- I can't reproduce the unknown panic with 2.4.25 anymore, so I'll
-+  happily assume it never existed!
-+
-+
-+Implemented features:
-+---------------------
-+
-+- creating hard links (see BUGS on already existing hard links)
-+- lightweight directory renaming
-+- renaming device files, pipes, sockets, etc.
-+- creating, renaming, deleting of special files
-+- deleting directorys
-+- general directory reading (simple "ls" )
-+- creating files in existing directorys
-+- creating directorys
-+- renaming files.
-+- reading and writing files (involves opening)
-+- appending to files (creates copy in storage)
-+- deleting files
-+- llseek works too, what allows editors to work
-+- persistency (a deleted file stay deleted over remounts)
-+- use of symbolic links
-+- creating of device files
-+
-+
-+Not (yet) implemented features:
-+-------------------------------
-+
-+- full hard link support.
-+
-+
-+
-+BUGS:
-+-----
-+
-+Hard links in the base file system will be treated as individual
-+files, not as links to one inode.
-+
-+The main problem with hard links isn't allowing to create them, but
-+their pure existence. If you modify a base hard link, the changes made
-+will only show up on this link, the other link will remain in the
-+original state. I hope to fix this someday. Please note that this does
-+not effect the special hard links '.' and '..', that are handled
-+seperately by the lower fs.
---- /dev/null
-+++ b/fs/mini_fo/state.c
-@@ -0,0 +1,620 @@
-+/*
-+ * Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+
-+/* create the storage file, setup new states */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+int create_sto_reg_file(dentry_t *dentry, int mode, struct nameidata *nd)
-+#else
-+int create_sto_reg_file(dentry_t *dentry, int mode)
-+#endif
-+{
-+	int err = 0;
-+	inode_t *dir;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	if(exists_in_storage(dentry)) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: wrong type or state.\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if (err) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: ERROR getting neg. sto dentry.\n");
-+		goto out;
-+	}
-+
-+	dir = dentry->d_parent->d_inode;
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* lock parent */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+        down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+        if (IS_ERR(hidden_sto_dir_dentry))
-+                goto out;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+			 hidden_sto_dentry,
-+			 mode, nd);
-+#else
-+	err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+			 hidden_sto_dentry,
-+			 mode);
-+#endif
-+        if(err) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: ERROR creating sto file.\n");
-+                goto out_lock;
-+	}
-+
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: ERROR creating sto file [2].\n");
-+                err = -EINVAL;
-+                goto out_lock;
-+        }
-+
-+        /* interpose the new inode */
-+        if(dtost(dentry) == DELETED) {
-+                dtost(dentry) = DEL_REWRITTEN;
-+                err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        }
-+        else if(dtost(dentry) == NON_EXISTANT) {
-+                dtost(dentry) = CREATED;
-+                err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        }
-+        else if(dtost(dentry) == UNMODIFIED) {
-+                dtost(dentry) = MODIFIED;
-+                /* interpose on new inode */
-+                if(itohi2(dentry->d_inode) != NULL) {
-+                        printk(KERN_CRIT "mini_fo: create_sto_file: invalid inode detected.\n");
-+                        err = -EINVAL;
-+                        goto out_lock;
-+                }
-+                itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	}
-+	fist_copy_attr_timesizes(dentry->d_parent->d_inode,
-+				 hidden_sto_dir_dentry->d_inode);
-+
-+ out_lock:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+        dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+/* create the sto dir, setup states */
-+int create_sto_dir(dentry_t *dentry, int mode)
-+{
-+	int err = 0;
-+	inode_t *dir;
-+	dentry_t *hidden_sto_dentry;
-+        dentry_t *hidden_sto_dir_dentry;
-+
-+	/* had to take the "!S_ISDIR(mode))" check out, because it failed */
-+	if(exists_in_storage(dentry)) {
-+                printk(KERN_CRIT "mini_fo: create_sto_dir: wrong type or state.\\
-+n");
-+                err = -EINVAL;
-+                goto out;
-+        }
-+
-+	err = get_neg_sto_dentry(dentry);
-+	if(err) {
-+		err = -EINVAL;
-+		goto out;
-+	}
-+
-+	dir = dentry->d_parent->d_inode;
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+	if (IS_ERR(hidden_sto_dir_dentry))
-+		goto out;
-+
-+	err = vfs_mkdir(hidden_sto_dir_dentry->d_inode,
-+			hidden_sto_dentry,
-+			mode);
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo: create_sto_dir: ERROR creating sto dir.\n");
-+		goto out_lock;
-+	}
-+
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: create_sto_dir: ERROR creating sto dir [2].\n");
-+		err = -EINVAL;
-+		goto out_lock;
-+	}
-+
-+	/* interpose the new inode */
-+	if(dtost(dentry) == DELETED) {
-+		dtost(dentry) = DEL_REWRITTEN;
-+		err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtopd(dentry)->state == NON_EXISTANT) {
-+		dtopd(dentry)->state = CREATED;
-+		err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtopd(dentry)->state == UNMODIFIED) {
-+		dtopd(dentry)->state = MODIFIED;
-+		/* interpose on new inode */
-+		if(itohi2(dentry->d_inode) != NULL) {
-+			printk(KERN_CRIT "mini_fo:  create_sto_dir: ERROR, invalid inode detected.\n");
-+			err = -EINVAL;
-+			goto out_lock;
-+		}
-+		itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	}
-+
-+	fist_copy_attr_timesizes(dir, hidden_sto_dir_dentry->d_inode);
-+
-+	/* initalize the wol list */
-+	itopd(dentry->d_inode)->deleted_list_size = -1;
-+	itopd(dentry->d_inode)->renamed_list_size = -1;
-+	meta_build_lists(dentry);
-+
-+
-+ out_lock:
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+int create_sto_nod(dentry_t *dentry, int mode, dev_t dev)
-+#else
-+int create_sto_nod(dentry_t *dentry, int mode, int dev)
-+#endif
-+{
-+	int err = 0;
-+	inode_t *dir;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	if(exists_in_storage(dentry)) {
-+		err = -EEXIST;
-+		goto out;
-+	}
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if (err) {
-+                printk(KERN_CRIT "mini_fo: create_sto_nod: ERROR getting neg. sto dentry.\n");
-+                goto out;
-+        }
-+
-+	dir = dentry->d_parent->d_inode;
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* lock parent */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+	if (IS_ERR(hidden_sto_dir_dentry))
-+		goto out;
-+
-+	err = vfs_mknod(hidden_sto_dir_dentry->d_inode, hidden_sto_dentry, mode, dev);
-+	if(err)
-+		goto out_lock;
-+
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: create_sto_nod: creating storage inode failed [1].\n");
-+		err = -EINVAL; /* return something indicating failure */
-+		goto out_lock;
-+	}
-+
-+	/* interpose the new inode */
-+	if(dtost(dentry) == DELETED) {
-+		dtost(dentry) = DEL_REWRITTEN;
-+		err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtost(dentry) == NON_EXISTANT) {
-+		dtost(dentry) = CREATED;
-+		err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtost(dentry) == UNMODIFIED) {
-+		dtost(dentry) = MODIFIED;
-+		/* interpose on new inode */
-+		if(itohi2(dentry->d_inode) != NULL) {
-+			printk(KERN_CRIT "mini_fo: create_sto_nod: error, invalid inode detected.\n");
-+			err = -EINVAL;
-+			goto out_lock;
-+		}
-+		itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	}
-+
-+	fist_copy_attr_timesizes(dir, hidden_sto_dir_dentry->d_inode);
-+
-+ out_lock:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+
-+/* unimplemented (and possibly not usefull):
-+
-+   nondir-del_to_del_rew
-+   nondir-non_exist_to_creat
-+
-+   dir-unmod_to_del
-+   dir-mod_to_del
-+   dir-creat_to_del
-+   dir-del_rew_to_del
-+   dir-del_to_del_rew
-+   dir-non_exist_to_creat
-+*/
-+
-+
-+/* bring a file of any type from state UNMODIFIED to MODIFIED */
-+int nondir_unmod_to_mod(dentry_t *dentry, int cp_flag)
-+{
-+	int err = 0;
-+	struct vfsmount *tgt_mnt;
-+	struct vfsmount *src_mnt;
-+	dentry_t *tgt_dentry;
-+	dentry_t *src_dentry;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if((dtost(dentry) != UNMODIFIED) ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if (err) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  ERROR getting neg. sto dentry.\n");
-+		goto out;
-+	}
-+
-+	/* create sto file */
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* lock parent */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+        down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+        if (IS_ERR(hidden_sto_dir_dentry))
-+                goto out;
-+
-+	/* handle different types of nondirs */
-+	if(S_ISCHR(dentry->d_inode->i_mode) ||
-+	   S_ISBLK(dentry->d_inode->i_mode)) {
-+		err = vfs_mknod(hidden_sto_dir_dentry->d_inode,
-+				hidden_sto_dentry,
-+				dtohd(dentry)->d_inode->i_mode,
-+				dtohd(dentry)->d_inode->i_rdev);
-+	}
-+
-+	else if(S_ISREG(dentry->d_inode->i_mode)) {
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+				 hidden_sto_dentry,
-+				 dtohd(dentry)->d_inode->i_mode, NULL);
-+#else
-+		err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+				 hidden_sto_dentry,
-+				 dtohd(dentry)->d_inode->i_mode);
-+#endif
-+	}
-+        if(err) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  ERROR creating sto file.\n");
-+                goto out_lock;
-+	}
-+
-+	/* interpose on new inode */
-+	if(itohi2(dentry->d_inode) != NULL) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  ERROR, invalid inode detected.\n");
-+		err = -EINVAL;
-+		goto out_lock;
-+	}
-+
-+	itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+
-+        fist_copy_attr_timesizes(dentry->d_parent->d_inode,
-+				 hidden_sto_dir_dentry->d_inode);
-+	dtost(dentry) = MODIFIED;
-+
-+	/* copy contents if regular file and cp_flag = 1 */
-+	if((cp_flag == 1) && S_ISREG(dentry->d_inode->i_mode)) {
-+
-+		/* unlock first */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		dput(hidden_sto_dir_dentry);
-+
-+		tgt_dentry = dtohd2(dentry);
-+		tgt_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+		src_dentry = dtohd(dentry);
-+		src_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt;
-+
-+		err = mini_fo_cp_cont(tgt_dentry, tgt_mnt,
-+				      src_dentry, src_mnt);
-+		if(err) {
-+			printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                          ERROR copying contents.\n");
-+		}
-+		goto out;
-+	}
-+
-+ out_lock:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+        dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+/* this function is currently identical to nondir_creat_to_del */
-+int nondir_del_rew_to_del(dentry_t *dentry)
-+{
-+	return nondir_creat_to_del(dentry);
-+}
-+
-+int nondir_creat_to_del(dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	inode_t *hidden_sto_dir_inode;
-+	dentry_t *hidden_sto_dir_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	/* for now this function serves for both state DEL_REWRITTEN and
-+	 * CREATED */
-+	if(!(dtost(dentry) == CREATED || (dtost(dentry) == DEL_REWRITTEN)) ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_mod_to_del/del_rew_to_del: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	hidden_sto_dir_inode = itohi2(dentry->d_parent->d_inode);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	/* avoid destroying the hidden inode if the file is in use */
-+	dget(hidden_sto_dentry);
-+	err = vfs_unlink(hidden_sto_dir_inode, hidden_sto_dentry);
-+	dput(hidden_sto_dentry);
-+	if(!err)
-+		d_delete(hidden_sto_dentry);
-+
-+	/* propagate number of hard-links */
-+	dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+
-+	dtost(dentry) = NON_EXISTANT;
-+
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+int nondir_mod_to_del(dentry_t *dentry)
-+{
-+	int err;
-+	dentry_t *hidden_sto_dentry;
-+	inode_t *hidden_sto_dir_inode;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) != MODIFIED ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_mod_to_del: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	hidden_sto_dir_inode = itohi2(dentry->d_parent->d_inode);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* was hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	/* avoid destroying the hidden inode if the file is in use */
-+	dget(hidden_sto_dentry);
-+	err = vfs_unlink(hidden_sto_dir_inode, hidden_sto_dentry);
-+	dput(hidden_sto_dentry);
-+	if(!err)
-+		d_delete(hidden_sto_dentry);
-+
-+	/* propagate number of hard-links */
-+	dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+
-+	/* dput base dentry, this will relase the inode and free the
-+	 * dentry, as we will never need it again. */
-+	dput(dtohd(dentry));
-+	dtohd(dentry) = NULL;
-+	dtost(dentry) = DELETED;
-+
-+	/* add deleted file to META-file */
-+	meta_add_d_entry(dentry->d_parent,
-+			 dentry->d_name.name,
-+			 dentry->d_name.len);
-+
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+int nondir_unmod_to_del(dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) != UNMODIFIED ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_del: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	 /* next we have to get a negative dentry for the storage file */
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if(err)
-+		goto out;
-+
-+	/* add deleted file to META lists */
-+	err = meta_add_d_entry(dentry->d_parent,
-+			       dentry->d_name.name,
-+			       dentry->d_name.len);
-+
-+	if(err)
-+		goto out;
-+
-+	/* dput base dentry, this will relase the inode and free the
-+	 * dentry, as we will never need it again. */
-+	dput(dtohd(dentry));
-+	dtohd(dentry) = NULL;
-+	dtost(dentry) = DELETED;
-+
-+ out:
-+	return err;
-+}
-+
-+/* bring a dir from state UNMODIFIED to MODIFIED */
-+int dir_unmod_to_mod(dentry_t *dentry)
-+{
-+	int err;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) != UNMODIFIED ||
-+	   !S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: dir_unmod_to_mod: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* this creates our dir incl. sto. structure */
-+	err = build_sto_structure(dentry->d_parent, dentry);
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo: dir_unmod_to_mod: \
-+                                  build_sto_structure failed.\n");
-+		goto out;
-+	}
-+ out:
-+	return err;
-+}
-+
---- /dev/null
-+++ b/fs/mini_fo/super.c
-@@ -0,0 +1,281 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * 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.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+
-+STATIC void
-+mini_fo_read_inode(inode_t *inode)
-+{
-+	static struct address_space_operations mini_fo_empty_aops;
-+
-+	__itopd(inode) = kmalloc(sizeof(struct mini_fo_inode_info), GFP_KERNEL);
-+	if (!itopd(inode)) {
-+		printk("<0>%s:%s:%d: No kernel memory!\n", __FILE__, __FUNCTION__, __LINE__);
-+		ASSERT(NULL);
-+	}
-+	itohi(inode) = NULL;
-+	itohi2(inode) = NULL;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	inode->i_version++;
-+#else
-+	inode->i_version = ++event;	/* increment inode version */
-+#endif
-+	inode->i_op = &mini_fo_main_iops;
-+	inode->i_fop = &mini_fo_main_fops;
-+#if 0
-+	/*
-+	 * XXX: To export a file system via NFS, it has to have the
-+	 * FS_REQUIRES_DEV flag, so turn it on.  But should we inherit it from
-+	 * the lower file system, or can we allow our file system to be exported
-+	 * even if the lower one cannot be natively exported.
-+	 */
-+	inode->i_sb->s_type->fs_flags |= FS_REQUIRES_DEV;
-+	/*
-+	 * OK, the above was a hack, which is now turned off because it may
-+	 * cause a panic/oops on some systems.  The correct way to export a
-+	 * "nodev" filesystem is via using nfs-utils > 1.0 and the "fsid=" export
-+	 * parameter, which requires 2.4.20 or later.
-+	 */
-+#endif
-+	/* I don't think ->a_ops is ever allowed to be NULL */
-+	inode->i_mapping->a_ops = &mini_fo_empty_aops;
-+}
-+
-+
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+/*
-+ * No need to call write_inode() on the lower inode, as it
-+ * will have been marked 'dirty' anyway. But we might need
-+ * to write some of our own stuff to disk.
-+ */
-+STATIC void
-+mini_fo_write_inode(inode_t *inode, int sync)
-+{
-+	print_entry_location();
-+	print_exit_location();
-+}
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+
-+
-+STATIC void
-+mini_fo_put_inode(inode_t *inode)
-+{
-+	/*
-+	 * This is really funky stuff:
-+	 * Basically, if i_count == 1, iput will then decrement it and this inode will be destroyed.
-+	 * It is currently holding a reference to the hidden inode.
-+	 * Therefore, it needs to release that reference by calling iput on the hidden inode.
-+	 * iput() _will_ do it for us (by calling our clear_inode), but _only_ if i_nlink == 0.
-+	 * The problem is, NFS keeps i_nlink == 1 for silly_rename'd files.
-+	 * So we must for our i_nlink to 0 here to trick iput() into calling our clear_inode.
-+	 */
-+	if (atomic_read(&inode->i_count) == 1)
-+		inode->i_nlink = 0;
-+}
-+
-+
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+/*
-+ * we now define delete_inode, because there are two VFS paths that may
-+ * destroy an inode: one of them calls clear inode before doing everything
-+ * else that's needed, and the other is fine.  This way we truncate the inode
-+ * size (and its pages) and then clear our own inode, which will do an iput
-+ * on our and the lower inode.
-+ */
-+STATIC void
-+mini_fo_delete_inode(inode_t *inode)
-+{
-+	print_entry_location();
-+
-+	fist_checkinode(inode, "mini_fo_delete_inode IN");
-+	inode->i_size = 0;		/* every f/s seems to do that */
-+	clear_inode(inode);
-+
-+	print_exit_location();
-+}
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+
-+
-+/* final actions when unmounting a file system */
-+STATIC void
-+mini_fo_put_super(super_block_t *sb)
-+{
-+	if (stopd(sb)) {
-+		mntput(stopd(sb)->hidden_mnt);
-+		mntput(stopd(sb)->hidden_mnt2);
-+
-+		/* mk: no! dput(stopd(sb)->base_dir_dentry);
-+		   dput(stopd(sb)->storage_dir_dentry); */
-+
-+		kfree(stopd(sb));
-+		__stopd(sb) = NULL;
-+	}
-+}
-+
-+
-+#ifdef NOT_NEEDED
-+/*
-+ * This is called in do_umount before put_super.
-+ * The superblock lock is not held yet.
-+ * We probably do not need to define this or call write_super
-+ * on the hidden_sb, because sync_supers() will get to hidden_sb
-+ * sooner or later.  But it is also called from file_fsync()...
-+ */
-+STATIC void
-+mini_fo_write_super(super_block_t *sb)
-+{
-+	return;
-+}
-+#endif /* NOT_NEEDED */
-+
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_statfs(struct dentry *d, struct kstatfs *buf)
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_statfs(super_block_t *sb, struct kstatfs *buf)
-+#else
-+mini_fo_statfs(super_block_t *sb, struct statfs *buf)
-+#endif
-+{
-+	int err = 0;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+	struct dentry *hidden_d;
-+
-+	hidden_d = dtohd(d);
-+	err = vfs_statfs(hidden_d, buf);
-+#else
-+	super_block_t *hidden_sb;
-+
-+	hidden_sb = stohs(sb);
-+	err = vfs_statfs(hidden_sb, buf);
-+#endif
-+
-+	return err;
-+}
-+
-+
-+/*
-+ * XXX: not implemented.  This is not allowed yet.
-+ * Should we call this on the hidden_sb?  Probably not.
-+ */
-+STATIC int
-+mini_fo_remount_fs(super_block_t *sb, int *flags, char *data)
-+{
-+	//printk(KERN_CRIT "mini_fo_remount_fs: WARNING, this function is umimplemented.\n");
-+	return -ENOSYS;
-+}
-+
-+
-+/*
-+ * Called by iput() when the inode reference count reached zero
-+ * and the inode is not hashed anywhere.  Used to clear anything
-+ * that needs to be, before the inode is completely destroyed and put
-+ * on the inode free list.
-+ */
-+STATIC void
-+mini_fo_clear_inode(inode_t *inode)
-+{
-+	/*
-+	 * Decrement a reference to a hidden_inode, which was incremented
-+	 * by our read_inode when it was created initially.
-+	 */
-+
-+	/* release the wol_list */
-+	if(S_ISDIR(inode->i_mode)) {
-+		__meta_put_lists(inode);
-+	}
-+
-+	/* mk: fan out fun */
-+	if(itohi(inode))
-+		iput(itohi(inode));
-+	if(itohi2(inode))
-+		iput(itohi2(inode));
-+
-+	// XXX: why this assertion fails?
-+	// because it doesn't like us
-+	// ASSERT((inode->i_state & I_DIRTY) == 0);
-+	kfree(itopd(inode));
-+	__itopd(inode) = NULL;
-+}
-+
-+
-+/*
-+ * Called in do_umount() if the MNT_FORCE flag was used and this
-+ * function is defined.  See comment in linux/fs/super.c:do_umount().
-+ * Used only in nfs, to kill any pending RPC tasks, so that subsequent
-+ * code can actually succeed and won't leave tasks that need handling.
-+ *
-+ * PS. I wonder if this is somehow useful to undo damage that was
-+ * left in the kernel after a user level file server (such as amd)
-+ * dies.
-+ */
-+STATIC void
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_umount_begin(struct vfsmount *mnt, int flags)
-+{
-+	struct vfsmount *hidden_mnt;
-+
-+	hidden_mnt = stopd(mnt->mnt_sb)->hidden_mnt;
-+
-+	if (hidden_mnt->mnt_sb->s_op->umount_begin)
-+		hidden_mnt->mnt_sb->s_op->umount_begin(hidden_mnt, flags);
-+
-+}
-+#else
-+mini_fo_umount_begin(super_block_t *sb)
-+{
-+	super_block_t *hidden_sb;
-+
-+	hidden_sb = stohs(sb);
-+
-+	if (hidden_sb->s_op->umount_begin)
-+		hidden_sb->s_op->umount_begin(hidden_sb);
-+
-+}
-+#endif
-+
-+
-+struct super_operations mini_fo_sops =
-+{
-+	read_inode:		mini_fo_read_inode,
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+	write_inode:	mini_fo_write_inode,
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+	put_inode:		mini_fo_put_inode,
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+	delete_inode:	mini_fo_delete_inode,
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+	put_super:		mini_fo_put_super,
-+	statfs:		mini_fo_statfs,
-+	remount_fs:		mini_fo_remount_fs,
-+	clear_inode:	mini_fo_clear_inode,
-+	umount_begin:	mini_fo_umount_begin,
-+};
---- /dev/null
-+++ b/fs/mini_fo/Kconfig
-@@ -0,0 +1,3 @@
-+config MINI_FO
-+	tristate "Mini fanout overlay filesystem"
-+
diff --git a/target/linux/generic-2.6/patches-2.6.34/210-mini_fo_2.6.25_fixes.patch b/target/linux/generic-2.6/patches-2.6.34/210-mini_fo_2.6.25_fixes.patch
deleted file mode 100644
index d71e3b6fa..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/210-mini_fo_2.6.25_fixes.patch
+++ /dev/null
@@ -1,143 +0,0 @@
---- a/fs/mini_fo/main.c
-+++ b/fs/mini_fo/main.c
-@@ -79,6 +79,7 @@ mini_fo_tri_interpose(dentry_t *hidden_d
- 	 * of the new inode's fields
- 	 */
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
- 	/*
- 	 * original: inode = iget(sb, hidden_inode->i_ino);
- 	 */
-@@ -87,6 +88,13 @@ mini_fo_tri_interpose(dentry_t *hidden_d
- 		err = -EACCES;		/* should be impossible??? */
- 		goto out;
- 	}
-+#else
-+	inode = mini_fo_iget(sb, iunique(sb, 25));
-+	if (IS_ERR(inode)) {
-+		err = PTR_ERR(inode);
-+		goto out;
-+	}
-+#endif
- 
- 	/*
- 	 * interpose the inode if not already interposed
-@@ -184,9 +192,9 @@ mini_fo_parse_options(super_block_t *sb,
- 				hidden_root = ERR_PTR(err);
- 				goto out;
- 			}
--			hidden_root = nd.dentry;
--			stopd(sb)->base_dir_dentry = nd.dentry;
--			stopd(sb)->hidden_mnt = nd.mnt;
-+			hidden_root = nd_get_dentry(&nd);
-+			stopd(sb)->base_dir_dentry = nd_get_dentry(&nd);
-+			stopd(sb)->hidden_mnt = nd_get_mnt(&nd);
- 
- 		} else if(!strncmp("sto=", options, 4)) {
- 			/* parse the storage dir */
-@@ -204,9 +212,9 @@ mini_fo_parse_options(super_block_t *sb,
- 				hidden_root2 = ERR_PTR(err);
- 				goto out;
- 			}
--			hidden_root2 = nd2.dentry;
--			stopd(sb)->storage_dir_dentry = nd2.dentry;
--			stopd(sb)->hidden_mnt2 = nd2.mnt;
-+			hidden_root2 = nd_get_dentry(&nd2);
-+			stopd(sb)->storage_dir_dentry = nd_get_dentry(&nd2);
-+			stopd(sb)->hidden_mnt2 = nd_get_mnt(&nd2);
- 			stohs2(sb) = hidden_root2->d_sb;
- 
- 			/* validate storage dir, this is done in
---- a/fs/mini_fo/mini_fo.h
-+++ b/fs/mini_fo/mini_fo.h
-@@ -302,6 +302,10 @@ extern int mini_fo_tri_interpose(dentry_
- extern int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
- 			   dentry_t *src_dentry, struct vfsmount *src_mnt);
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
-+extern struct inode *mini_fo_iget(struct super_block *sb, unsigned long ino);
-+#endif
-+
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
- 
-@@ -501,6 +505,29 @@ static inline void double_unlock(struct 
- #endif  /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
- #endif /* __KERNEL__ */
- 
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
-+static inline dentry_t *nd_get_dentry(struct nameidata *nd)
-+{
-+	return (nd->path.dentry);
-+}
-+
-+static inline struct vfsmount *nd_get_mnt(struct nameidata *nd)
-+{
-+	return (nd->path.mnt);
-+}
-+#else
-+static inline dentry_t *nd_get_dentry(struct nameidata *nd)
-+{
-+	return (nd->dentry);
-+}
-+
-+static inline struct vfsmount *nd_get_mnt(struct nameidata *nd)
-+{
-+	return (nd->mnt);
-+}
-+#endif
-+
- /*
-  * Definitions for user and kernel code
-  */
---- a/fs/mini_fo/super.c
-+++ b/fs/mini_fo/super.c
-@@ -262,10 +262,31 @@ mini_fo_umount_begin(super_block_t *sb)
- }
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
-+struct inode *
-+mini_fo_iget(struct super_block *sb, unsigned long ino)
-+{
-+	struct inode *inode;
-+
-+	inode = iget_locked(sb, ino);
-+	if (!inode)
-+		return ERR_PTR(-ENOMEM);
-+
-+	if (!(inode->i_state & I_NEW))
-+		return inode;
-+
-+	mini_fo_read_inode(inode);
-+
-+	unlock_new_inode(inode);
-+	return inode;
-+}
-+#endif /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25) */
- 
- struct super_operations mini_fo_sops =
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
- 	read_inode:		mini_fo_read_inode,
-+#endif
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
- 	write_inode:	mini_fo_write_inode,
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
---- a/fs/mini_fo/aux.c
-+++ b/fs/mini_fo/aux.c
-@@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb, 
- 	err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
- 
- 	/* validate */
--	if (err || !nd.dentry || !nd.dentry->d_inode) {
-+	if (err || !nd_get_dentry(&nd) || !nd_get_dentry(&nd)->d_inode) {
- 		printk(KERN_CRIT "mini_fo: bpath_walk: path_walk failed.\n");
- 		return NULL;
- 	}
--	return nd.dentry;
-+	return nd_get_dentry(&nd);
- }
- 
- 
diff --git a/target/linux/generic-2.6/patches-2.6.34/211-mini_fo_2.6.25_dentry_open_war.patch b/target/linux/generic-2.6/patches-2.6.34/211-mini_fo_2.6.25_dentry_open_war.patch
deleted file mode 100644
index 48a19429b..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/211-mini_fo_2.6.25_dentry_open_war.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- a/fs/mini_fo/meta.c
-+++ b/fs/mini_fo/meta.c
-@@ -442,6 +442,11 @@ int meta_write_d_entry(dentry_t *dentry,
- 			   S_IRUSR | S_IWUSR);
- #endif
- 	}
-+
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-@@ -535,6 +540,11 @@ int meta_write_r_entry(dentry_t *dentry,
- 			   meta_dentry, S_IRUSR | S_IWUSR);
- #endif
- 	}
-+
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-@@ -671,14 +681,16 @@ int meta_sync_d_list(dentry_t *dentry, i
- 		}
- 	}
- 
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-                                   ERROR opening meta file.\n");
--		/* we don't mntget so we dont't mntput (for now)
--		 * mntput(meta_mnt);
--		 */
-+		mntput(meta_mnt);
- 		dput(meta_dentry);
- 		err = -1;
-                 goto out;
-@@ -811,14 +823,16 @@ int meta_sync_r_list(dentry_t *dentry, i
- 		}
- 	}
- 
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-                                   ERROR opening meta file.\n");
--		/* we don't mntget so we dont't mntput (for now)
--		 * mntput(meta_mnt);
--		 */
-+		mntput(meta_mnt);
- 		dput(meta_dentry);
- 		err = -1;
-                 goto out;
diff --git a/target/linux/generic-2.6/patches-2.6.34/212-mini_fo_2.6.26_fixes.patch b/target/linux/generic-2.6/patches-2.6.34/212-mini_fo_2.6.26_fixes.patch
deleted file mode 100644
index 8bd9ba324..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/212-mini_fo_2.6.26_fixes.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/fs/mini_fo/super.c
-+++ b/fs/mini_fo/super.c
-@@ -84,6 +84,7 @@ mini_fo_write_inode(inode_t *inode, int 
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
- 
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
- STATIC void
- mini_fo_put_inode(inode_t *inode)
- {
-@@ -99,6 +100,7 @@ mini_fo_put_inode(inode_t *inode)
- 	if (atomic_read(&inode->i_count) == 1)
- 		inode->i_nlink = 0;
- }
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */
- 
- 
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-@@ -238,7 +240,7 @@ mini_fo_clear_inode(inode_t *inode)
-  * dies.
-  */
- STATIC void
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26))
- mini_fo_umount_begin(struct vfsmount *mnt, int flags)
- {
- 	struct vfsmount *hidden_mnt;
-@@ -290,7 +292,9 @@ struct super_operations mini_fo_sops =
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
- 	write_inode:	mini_fo_write_inode,
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
- 	put_inode:		mini_fo_put_inode,
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
- 	delete_inode:	mini_fo_delete_inode,
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
diff --git a/target/linux/generic-2.6/patches-2.6.34/213-mini_fo_2.6.27_fixes.patch b/target/linux/generic-2.6/patches-2.6.34/213-mini_fo_2.6.27_fixes.patch
deleted file mode 100644
index f92c18b25..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/213-mini_fo_2.6.27_fixes.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/fs/mini_fo/inode.c
-+++ b/fs/mini_fo/inode.c
-@@ -439,7 +439,7 @@ mini_fo_symlink(inode_t *dir, dentry_t *
- 	int err=0;
- 	dentry_t *hidden_sto_dentry;
- 	dentry_t *hidden_sto_dir_dentry;
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
-         umode_t mode;
- #endif
- 
-@@ -466,7 +466,7 @@ mini_fo_symlink(inode_t *dir, dentry_t *
- 	down(&hidden_sto_dir_dentry->d_inode->i_sem);
- #endif
- 
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
- 	mode = S_IALLUGO;
- 	err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
- 			  hidden_sto_dentry, symname, mode);
-@@ -1128,7 +1128,7 @@ void mini_fo_put_link(struct dentry *den
- #endif
- 
- STATIC int
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
- mini_fo_permission(inode_t *inode, int mask, struct nameidata *nd)
- #else
- mini_fo_permission(inode_t *inode, int mask)
-@@ -1150,8 +1150,9 @@ mini_fo_permission(inode_t *inode, int m
- 	 *	if (err)
- 	 *		goto out;
- 	 */
--
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
-+	err = inode_permission(hidden_inode, mask);
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- 	err = permission(hidden_inode, mask, nd);
- #else
- 	err = permission(hidden_inode, mask);
diff --git a/target/linux/generic-2.6/patches-2.6.34/214-mini_fo_2.6.29.patch b/target/linux/generic-2.6/patches-2.6.34/214-mini_fo_2.6.29.patch
deleted file mode 100644
index 63d704bf5..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/214-mini_fo_2.6.29.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- a/fs/mini_fo/aux.c
-+++ b/fs/mini_fo/aux.c
-@@ -236,7 +236,7 @@ int mini_fo_cp_cont(dentry_t *tgt_dentry
- 	mntget(src_mnt);
- 
- 	/* open file write only */
--	tgt_file = dentry_open(tgt_dentry, tgt_mnt, 0x1);
-+	tgt_file = dentry_open(tgt_dentry, tgt_mnt, 0x1, current_cred());
- 	if(!tgt_file || IS_ERR(tgt_file)) {
- 		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening target file.\n");
- 		err = PTR_ERR(tgt_file);
-@@ -244,7 +244,7 @@ int mini_fo_cp_cont(dentry_t *tgt_dentry
- 	}
- 
- 	/* open file read only */
--	src_file = dentry_open(src_dentry, src_mnt, 0x0);
-+	src_file = dentry_open(src_dentry, src_mnt, 0x0, current_cred());
- 	if(!src_file || IS_ERR(src_file)) {
- 		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening source file.\n");
- 		err = PTR_ERR(src_file);
---- a/fs/mini_fo/file.c
-+++ b/fs/mini_fo/file.c
-@@ -437,7 +437,7 @@ mini_fo_open(inode_t *inode, file_t *fil
- 			mntget(stopd(inode->i_sb)->hidden_mnt);
- 			hidden_file = dentry_open(hidden_dentry,
- 						  stopd(inode->i_sb)->hidden_mnt,
--						  hidden_flags);
-+						  hidden_flags, file->f_cred);
- 			if (IS_ERR(hidden_file)) {
- 				err = PTR_ERR(hidden_file);
- 				dput(hidden_dentry);
-@@ -479,7 +479,7 @@ mini_fo_open(inode_t *inode, file_t *fil
- 			mntget(stopd(inode->i_sb)->hidden_mnt);
- 			hidden_file = dentry_open(hidden_dentry,
- 						  stopd(inode->i_sb)->hidden_mnt,
--						  hidden_flags);
-+						  hidden_flags, file->f_cred);
- 			if (IS_ERR(hidden_file)) {
- 				err = PTR_ERR(hidden_file);
- 				dput(hidden_dentry);
-@@ -512,7 +512,7 @@ mini_fo_open(inode_t *inode, file_t *fil
- 	mntget(stopd(inode->i_sb)->hidden_mnt2);
- 	hidden_sto_file = dentry_open(hidden_sto_dentry,
- 				      stopd(inode->i_sb)->hidden_mnt2,
--				      hidden_flags);
-+				      hidden_flags, file->f_cred);
- 
- 	/* dentry_open dputs the dentry if it fails */
- 	if (IS_ERR(hidden_sto_file)) {
---- a/fs/mini_fo/meta.c
-+++ b/fs/mini_fo/meta.c
-@@ -56,7 +56,7 @@ int meta_build_lists(dentry_t *dentry)
- 
- 
- 		/* open META-file for reading */
--		meta_file = dentry_open(meta_dentry, meta_mnt, 0x0);
-+		meta_file = dentry_open(meta_dentry, meta_mnt, 0x0, current_cred());
- 		if(!meta_file || IS_ERR(meta_file)) {
- 			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-                                           ERROR opening META file.\n");
-@@ -448,7 +448,7 @@ int meta_write_d_entry(dentry_t *dentry,
- 	mntget(meta_mnt);
- 
-         /* open META-file for writing */
--        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-                                   ERROR opening meta file.\n");
-@@ -546,7 +546,7 @@ int meta_write_r_entry(dentry_t *dentry,
- 	mntget(meta_mnt);
- 
-         /* open META-file for writing */
--        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-                                   ERROR opening meta file.\n");
-@@ -686,7 +686,7 @@ int meta_sync_d_list(dentry_t *dentry, i
- 	mntget(meta_mnt);
- 
-         /* open META-file for writing */
--        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-                                   ERROR opening meta file.\n");
-@@ -828,7 +828,7 @@ int meta_sync_r_list(dentry_t *dentry, i
- 	mntget(meta_mnt);
- 
-         /* open META-file for writing */
--        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-                                   ERROR opening meta file.\n");
diff --git a/target/linux/generic-2.6/patches-2.6.34/215-mini_fo_2.6.30.patch b/target/linux/generic-2.6/patches-2.6.34/215-mini_fo_2.6.30.patch
deleted file mode 100644
index 2d2092061..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/215-mini_fo_2.6.30.patch
+++ /dev/null
@@ -1,157 +0,0 @@
---- a/fs/mini_fo/aux.c
-+++ b/fs/mini_fo/aux.c
-@@ -86,8 +86,10 @@ int get_neg_sto_dentry(dentry_t *dentry)
- 	len = dentry->d_name.len;
- 	name = dentry->d_name.name;
- 
-+	mutex_lock(&dtohd2(dentry->d_parent)->d_inode->i_mutex);
- 	dtohd2(dentry) =
- 		lookup_one_len(name, dtohd2(dentry->d_parent), len);
-+	mutex_unlock(&dtohd2(dentry->d_parent)->d_inode->i_mutex);
- 
-  out:
- 	return err;
-@@ -426,7 +428,9 @@ int build_sto_structure(dentry_t *dir, d
- 		const unsigned char *name;
- 		len = dtohd(dentry)->d_name.len;
- 		name = dtohd(dentry)->d_name.name;
-+		mutex_lock(&dtohd2(dir)->d_inode->i_mutex);
- 		hidden_sto_dentry = lookup_one_len(name, dtohd2(dir), len);
-+		mutex_unlock(&dtohd2(dir)->d_inode->i_mutex);
- 		dtohd2(dentry) = hidden_sto_dentry;
- 	}
- 
---- a/fs/mini_fo/inode.c
-+++ b/fs/mini_fo/inode.c
-@@ -113,17 +113,23 @@ mini_fo_lookup(inode_t *dir, dentry_t *d
- 		hidden_dir_dentry = hidden_dentry->d_parent;
- 		kfree(bpath);
- 	}
--	else if(hidden_dir_dentry && hidden_dir_dentry->d_inode)
-+	else if(hidden_dir_dentry && hidden_dir_dentry->d_inode) {
-+		mutex_lock(&hidden_dir_dentry->d_inode->i_mutex);
- 		hidden_dentry =
- 			lookup_one_len(name, hidden_dir_dentry, namelen);
--	else
-+		mutex_unlock(&hidden_dir_dentry->d_inode->i_mutex);
-+	} else {
- 		hidden_dentry = NULL;
-+	}
- 
--	if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode)
-+	if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode) {
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
- 		hidden_sto_dentry =
- 			lookup_one_len(name, hidden_sto_dir_dentry, namelen);
--	else
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+	} else {
- 		hidden_sto_dentry =  NULL;
-+	}
- 
- 	/* catch error in lookup */
- 	if (IS_ERR(hidden_dentry) || IS_ERR(hidden_sto_dentry)) {
-@@ -553,9 +559,11 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
- #endif
- 
- 		/* Delete an old WOL file contained in the storage dir */
-+		mutex_lock(&hidden_sto_dentry->d_inode->i_mutex);
- 		meta_dentry = lookup_one_len(META_FILENAME,
- 					     hidden_sto_dentry,
- 					     strlen(META_FILENAME));
-+		mutex_unlock(&hidden_sto_dentry->d_inode->i_mutex);
- 		if(meta_dentry->d_inode) {
- 			err = vfs_unlink(hidden_sto_dentry->d_inode, meta_dentry);
- 			dput(meta_dentry);
-@@ -643,9 +651,11 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
- #endif
- 
- 		/* Delete an old WOL file contained in the storage dir */
-+		mutex_lock(&hidden_sto_dentry->d_inode->i_mutex);
- 		meta_dentry = lookup_one_len(META_FILENAME,
- 					     hidden_sto_dentry,
- 					     strlen(META_FILENAME));
-+		mutex_unlock(&hidden_sto_dentry->d_inode->i_mutex);
- 		if(meta_dentry->d_inode) {
- 			/* is this necessary? dget(meta_dentry); */
- 			err = vfs_unlink(hidden_sto_dentry->d_inode,
-@@ -688,9 +698,11 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
- #endif
- 
- 		/* Delete an old WOL file contained in the storage dir */
-+		mutex_lock(&hidden_sto_dentry->d_inode->i_mutex);
- 		meta_dentry = lookup_one_len(META_FILENAME,
- 					     hidden_sto_dentry,
- 					     strlen(META_FILENAME));
-+		mutex_unlock(&hidden_sto_dentry->d_inode->i_mutex);
- 		if(meta_dentry->d_inode) {
- 			/* is this necessary? dget(meta_dentry); */
- 			err = vfs_unlink(hidden_sto_dentry->d_inode,
---- a/fs/mini_fo/meta.c
-+++ b/fs/mini_fo/meta.c
-@@ -43,9 +43,11 @@ int meta_build_lists(dentry_t *dentry)
- 
-   	/* might there be a META-file? */
- 	if(dtohd2(dentry) && dtohd2(dentry)->d_inode) {
-+		mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 		meta_dentry = lookup_one_len(META_FILENAME,
- 					     dtohd2(dentry),
- 					     strlen(META_FILENAME));
-+		mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
- 		if(!meta_dentry->d_inode) {
- 			dput(meta_dentry);
- 			goto out_ok;
-@@ -426,8 +428,11 @@ int meta_write_d_entry(dentry_t *dentry,
- 			goto out;
-                 }
-         }
-+
-+	mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 	meta_dentry = lookup_one_len(META_FILENAME,
- 				     dtohd2(dentry), strlen (META_FILENAME));
-+	mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
- 
- 	/* We need to create a META-file */
-         if(!meta_dentry->d_inode) {
-@@ -527,9 +532,13 @@ int meta_write_r_entry(dentry_t *dentry,
- 			goto out;
-                 }
-         }
-+
-+	mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 	meta_dentry = lookup_one_len(META_FILENAME,
- 				     dtohd2(dentry),
- 				     strlen (META_FILENAME));
-+	mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
-+
-         if(!meta_dentry->d_inode) {
-                 /* We need to create a META-file */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-@@ -641,9 +650,13 @@ int meta_sync_d_list(dentry_t *dentry, i
- 			goto out;
-                 }
-         }
-+
-+	mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 	meta_dentry = lookup_one_len(META_FILENAME,
- 				     dtohd2(dentry),
- 				     strlen(META_FILENAME));
-+	mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
-+
-         if(!meta_dentry->d_inode) {
-                 /* We need to create a META-file */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-@@ -784,9 +797,13 @@ int meta_sync_r_list(dentry_t *dentry, i
- 			goto out;
-                 }
-         }
-+
-+	mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 	meta_dentry = lookup_one_len(META_FILENAME,
- 				     dtohd2(dentry),
- 				     strlen(META_FILENAME));
-+	mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
-+
-         if(!meta_dentry->d_inode) {
-                 /* We need to create a META-file */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
diff --git a/target/linux/generic-2.6/patches-2.6.34/216-mini_fo_locking.patch b/target/linux/generic-2.6/patches-2.6.34/216-mini_fo_locking.patch
deleted file mode 100644
index 4f075920f..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/216-mini_fo_locking.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/fs/mini_fo/state.c
-+++ b/fs/mini_fo/state.c
-@@ -537,17 +537,17 @@ int nondir_mod_to_del(dentry_t *dentry)
- 	dtohd(dentry) = NULL;
- 	dtost(dentry) = DELETED;
- 
--	/* add deleted file to META-file */
--	meta_add_d_entry(dentry->d_parent,
--			 dentry->d_name.name,
--			 dentry->d_name.len);
--
- 	/* was: unlock_dir(hidden_sto_dir_dentry); */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
- 	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
- #else
- 	up(&hidden_sto_dir_dentry->d_inode->i_sem);
- #endif
-+	/* add deleted file to META-file */
-+	meta_add_d_entry(dentry->d_parent,
-+			 dentry->d_name.name,
-+			 dentry->d_name.len);
-+
- 	dput(hidden_sto_dir_dentry);
- 
-  out:
diff --git a/target/linux/generic-2.6/patches-2.6.34/219-kobject_uevent.patch b/target/linux/generic-2.6/patches-2.6.34/219-kobject_uevent.patch
deleted file mode 100644
index 7e00b224c..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/219-kobject_uevent.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/lib/kobject_uevent.c
-+++ b/lib/kobject_uevent.c
-@@ -29,7 +29,8 @@ u64 uevent_seqnum;
- char uevent_helper[UEVENT_HELPER_PATH_LEN] = CONFIG_UEVENT_HELPER_PATH;
- static DEFINE_SPINLOCK(sequence_lock);
- #if defined(CONFIG_NET)
--static struct sock *uevent_sock;
-+struct sock *uevent_sock = NULL;
-+EXPORT_SYMBOL_GPL(uevent_sock);
- #endif
- 
- /* the strings here must match the enum in include/linux/kobject.h */
-@@ -42,6 +43,18 @@ static const char *kobject_actions[] = {
- 	[KOBJ_OFFLINE] =	"offline",
- };
- 
-+u64 uevent_next_seqnum(void)
-+{
-+	u64 seq;
-+
-+	spin_lock(&sequence_lock);
-+	seq = ++uevent_seqnum;
-+	spin_unlock(&sequence_lock);
-+
-+	return seq;
-+}
-+EXPORT_SYMBOL_GPL(uevent_next_seqnum);
-+
- /**
-  * kobject_action_type - translate action string to numeric type
-  *
-@@ -201,9 +214,7 @@ int kobject_uevent_env(struct kobject *k
- 		kobj->state_remove_uevent_sent = 1;
- 
- 	/* we will send an event, so request a new sequence number */
--	spin_lock(&sequence_lock);
--	seq = ++uevent_seqnum;
--	spin_unlock(&sequence_lock);
-+	seq = uevent_next_seqnum();
- 	retval = add_uevent_var(env, "SEQNUM=%llu", (unsigned long long)seq);
- 	if (retval)
- 		goto exit;
diff --git a/target/linux/generic-2.6/patches-2.6.34/220-sound_kconfig.patch b/target/linux/generic-2.6/patches-2.6.34/220-sound_kconfig.patch
deleted file mode 100644
index fb3df254d..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/220-sound_kconfig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/sound/core/Kconfig
-+++ b/sound/core/Kconfig
-@@ -8,7 +8,7 @@ config SND_PCM
- 	select GCD
- 
- config SND_HWDEP
--	tristate
-+	tristate "Sound hardware support"
- 
- config SND_RAWMIDI
- 	tristate
diff --git a/target/linux/generic-2.6/patches-2.6.34/221-binfmt_elf_gcc4.1.patch b/target/linux/generic-2.6/patches-2.6.34/221-binfmt_elf_gcc4.1.patch
deleted file mode 100644
index aefbe1875..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/221-binfmt_elf_gcc4.1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/fs/binfmt_elf.c
-+++ b/fs/binfmt_elf.c
-@@ -1165,7 +1165,7 @@ static unsigned long vma_dump_size(struc
- 	if (FILTER(ELF_HEADERS) &&
- 	    vma->vm_pgoff == 0 && (vma->vm_flags & VM_READ)) {
- 		u32 __user *header = (u32 __user *) vma->vm_start;
--		u32 word;
-+		u32 word = 0;
- 		mm_segment_t fs = get_fs();
- 		/*
- 		 * Doing it this way gets the constant folded by GCC.
diff --git a/target/linux/generic-2.6/patches-2.6.34/222-partial_eraseblock_write.patch b/target/linux/generic-2.6/patches-2.6.34/222-partial_eraseblock_write.patch
deleted file mode 100644
index 0c7672e8b..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/222-partial_eraseblock_write.patch
+++ /dev/null
@@ -1,146 +0,0 @@
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -21,6 +21,8 @@
- #include <linux/root_dev.h>
- #include <linux/magic.h>
- 
-+#define MTD_ERASE_PARTIAL	0x8000 /* partition only covers parts of an erase block */
-+
- /* Our partition linked list */
- static LIST_HEAD(mtd_partitions);
- 
-@@ -226,13 +228,60 @@ static int part_erase(struct mtd_info *m
- 		return -EROFS;
- 	if (instr->addr >= mtd->size)
- 		return -EINVAL;
-+
-+	instr->partial_start = false;
-+	if (mtd->flags & MTD_ERASE_PARTIAL) {
-+		size_t readlen = 0;
-+		u64 mtd_ofs;
-+
-+		instr->erase_buf = kmalloc(part->master->erasesize, GFP_ATOMIC);
-+		if (!instr->erase_buf)
-+			return -ENOMEM;
-+
-+		mtd_ofs = part->offset + instr->addr;
-+		instr->erase_buf_ofs = do_div(mtd_ofs, part->master->erasesize);
-+
-+		if (instr->erase_buf_ofs > 0) {
-+			instr->addr -= instr->erase_buf_ofs;
-+			ret = part->master->read(part->master,
-+				instr->addr + part->offset,
-+				part->master->erasesize,
-+				&readlen, instr->erase_buf);
-+
-+			instr->partial_start = true;
-+		} else {
-+			mtd_ofs = part->offset + part->mtd.size;
-+			instr->erase_buf_ofs = part->master->erasesize -
-+				do_div(mtd_ofs, part->master->erasesize);
-+
-+			if (instr->erase_buf_ofs > 0) {
-+				instr->len += instr->erase_buf_ofs;
-+				ret = part->master->read(part->master,
-+					part->offset + instr->addr +
-+					instr->len - part->master->erasesize,
-+					part->master->erasesize, &readlen,
-+					instr->erase_buf);
-+			} else {
-+				ret = 0;
-+			}
-+		}
-+		if (ret < 0) {
-+			kfree(instr->erase_buf);
-+			return ret;
-+		}
-+
-+	}
-+
- 	instr->addr += part->offset;
- 	ret = part->master->erase(part->master, instr);
- 	if (ret) {
- 		if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
- 			instr->fail_addr -= part->offset;
- 		instr->addr -= part->offset;
-+		if (mtd->flags & MTD_ERASE_PARTIAL)
-+			kfree(instr->erase_buf);
- 	}
-+
- 	return ret;
- }
- 
-@@ -240,7 +289,25 @@ void mtd_erase_callback(struct erase_inf
- {
- 	if (instr->mtd->erase == part_erase) {
- 		struct mtd_part *part = PART(instr->mtd);
-+		size_t wrlen = 0;
- 
-+		if (instr->mtd->flags & MTD_ERASE_PARTIAL) {
-+			if (instr->partial_start) {
-+				part->master->write(part->master,
-+					instr->addr, instr->erase_buf_ofs,
-+					&wrlen, instr->erase_buf);
-+				instr->addr += instr->erase_buf_ofs;
-+			} else {
-+				instr->len -= instr->erase_buf_ofs;
-+				part->master->write(part->master,
-+					instr->addr + instr->len,
-+					instr->erase_buf_ofs, &wrlen,
-+					instr->erase_buf +
-+					part->master->erasesize -
-+					instr->erase_buf_ofs);
-+			}
-+			kfree(instr->erase_buf);
-+		}
- 		if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
- 			instr->fail_addr -= part->offset;
- 		instr->addr -= part->offset;
-@@ -473,18 +540,24 @@ static struct mtd_part *add_one_partitio
- 	if ((slave->mtd.flags & MTD_WRITEABLE) &&
- 	    mtd_mod_by_eb(slave->offset, &slave->mtd)) {
- 		/* Doesn't start on a boundary of major erase size */
--		/* FIXME: Let it be writable if it is on a boundary of
--		 * _minor_ erase size though */
--		slave->mtd.flags &= ~MTD_WRITEABLE;
--		printk(KERN_WARNING"mtd: partition \"%s\" doesn't start on an erase block boundary -- force read-only\n",
--			part->name);
-+		slave->mtd.flags |= MTD_ERASE_PARTIAL;
-+		if (((u32) slave->mtd.size) > master->erasesize)
-+			slave->mtd.flags &= ~MTD_WRITEABLE;
-+		else
-+			slave->mtd.erasesize = slave->mtd.size;
- 	}
- 	if ((slave->mtd.flags & MTD_WRITEABLE) &&
--	    mtd_mod_by_eb(slave->mtd.size, &slave->mtd)) {
--		slave->mtd.flags &= ~MTD_WRITEABLE;
--		printk(KERN_WARNING"mtd: partition \"%s\" doesn't end on an erase block -- force read-only\n",
--			part->name);
--	}
-+	    mtd_mod_by_eb(slave->offset + slave->mtd.size, &slave->mtd)) {
-+		slave->mtd.flags |= MTD_ERASE_PARTIAL;
-+
-+		if ((u32) slave->mtd.size > master->erasesize)
-+			slave->mtd.flags &= ~MTD_WRITEABLE;
-+		else
-+			slave->mtd.erasesize = slave->mtd.size;
-+	}
-+	if ((slave->mtd.flags & (MTD_ERASE_PARTIAL|MTD_WRITEABLE)) == MTD_ERASE_PARTIAL)
-+		printk(KERN_WARNING"mtd: partition \"%s\" must either start or end on erase block boundary or be smaller than an erase block -- forcing read-only\n",
-+				part->name);
- 
- 	slave->mtd.ecclayout = master->ecclayout;
- 	if (master->block_isbad) {
---- a/include/linux/mtd/mtd.h
-+++ b/include/linux/mtd/mtd.h
-@@ -46,6 +46,10 @@ struct erase_info {
- 	u_long priv;
- 	u_char state;
- 	struct erase_info *next;
-+
-+	u8 *erase_buf;
-+	u32 erase_buf_ofs;
-+	bool partial_start;
- };
- 
- struct mtd_erase_region_info {
diff --git a/target/linux/generic-2.6/patches-2.6.34/240-packet_socket_type.patch b/target/linux/generic-2.6/patches-2.6.34/240-packet_socket_type.patch
deleted file mode 100644
index bf00f7aed..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/240-packet_socket_type.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-This patch allows the user to specify desired packet types (outgoing,
-broadcast, unicast, etc.) on packet sockets via setsockopt.
-This can reduce the load in situations where only a limited number
-of packet types are necessary
-
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-
---- a/include/linux/if_packet.h
-+++ b/include/linux/if_packet.h
-@@ -29,6 +29,8 @@
- /* These ones are invisible by user level */
- #define PACKET_LOOPBACK		5		/* MC/BRD frame looped back */
- #define PACKET_FASTROUTE	6		/* Fastrouted frame	*/
-+#define PACKET_MASK_ANY		0xffffffff	/* mask for packet type bits */
-+
- 
- /* Packet socket options */
- 
-@@ -47,6 +49,8 @@
- #define PACKET_TX_RING			13
- #define PACKET_LOSS			14
- #define PACKET_VNET_HDR			15
-+#define PACKET_RECV_TYPE		16
-+
- 
- struct tpacket_stats {
- 	unsigned int	tp_packets;
---- a/net/packet/af_packet.c
-+++ b/net/packet/af_packet.c
-@@ -201,6 +201,7 @@
- 	unsigned int		tp_reserve;
- 	unsigned int		tp_loss:1;
- 	struct packet_type	prot_hook ____cacheline_aligned_in_smp;
-+	__u8			pkt_type:3;
- };
- 
- struct packet_skb_cb {
-@@ -335,6 +336,7 @@
- {
- 	struct sock *sk;
- 	struct sockaddr_pkt *spkt;
-+	struct packet_sock *po;
- 
- 	/*
- 	 *	When we registered the protocol we saved the socket in the data
-@@ -342,6 +344,7 @@
- 	 */
- 
- 	sk = pt->af_packet_priv;
-+	po = pkt_sk(sk);
- 
- 	/*
- 	 *	Yank back the headers [hope the device set this
-@@ -354,7 +357,7 @@
- 	 *	so that this procedure is noop.
- 	 */
- 
--	if (skb->pkt_type == PACKET_LOOPBACK)
-+	if (!(po->pkt_type & (1 << skb->pkt_type)))
- 		goto out;
- 
- 	if (!net_eq(dev_net(dev), sock_net(sk)))
-@@ -530,12 +533,12 @@
- 	int skb_len = skb->len;
- 	unsigned int snaplen, res;
- 
--	if (skb->pkt_type == PACKET_LOOPBACK)
--		goto drop;
--
- 	sk = pt->af_packet_priv;
- 	po = pkt_sk(sk);
- 
-+	if (!(po->pkt_type & (1 << skb->pkt_type)))
-+		goto drop;
-+
- 	if (!net_eq(dev_net(dev), sock_net(sk)))
- 		goto drop;
- 
-@@ -650,12 +653,12 @@
- 	struct timeval tv;
- 	struct timespec ts;
- 
--	if (skb->pkt_type == PACKET_LOOPBACK)
--		goto drop;
--
- 	sk = pt->af_packet_priv;
- 	po = pkt_sk(sk);
- 
-+	if (!(po->pkt_type & (1 << skb->pkt_type)))
-+		goto drop;
-+
- 	if (!net_eq(dev_net(dev), sock_net(sk)))
- 		goto drop;
- 
-@@ -1463,6 +1466,7 @@
- 	spin_lock_init(&po->bind_lock);
- 	mutex_init(&po->pg_vec_lock);
- 	po->prot_hook.func = packet_rcv;
-+	po->pkt_type = PACKET_MASK_ANY & ~(1 << PACKET_LOOPBACK);
- 
- 	if (sock->type == SOCK_PACKET)
- 		po->prot_hook.func = packet_rcv_spkt;
-@@ -1963,6 +1967,16 @@
- 		po->has_vnet_hdr = !!val;
- 		return 0;
- 	}
-+        case PACKET_RECV_TYPE:
-+        {
-+                unsigned int val;
-+                if (optlen != sizeof(val))
-+                        return -EINVAL;
-+                if (copy_from_user(&val, optval, sizeof(val)))
-+                        return -EFAULT;
-+                po->pkt_type = val & ~PACKET_LOOPBACK;
-+                return 0;
-+        }
- 	default:
- 		return -ENOPROTOOPT;
- 	}
-@@ -2020,6 +2034,13 @@
- 
- 		data = &val;
- 		break;
-+	case PACKET_RECV_TYPE:
-+		if (len > sizeof(unsigned int))
-+			len = sizeof(unsigned int);
-+		val = po->pkt_type;
-+
-+		data = &val;
-+		break;
- 	case PACKET_VERSION:
- 		if (len > sizeof(int))
- 			len = sizeof(int);
diff --git a/target/linux/generic-2.6/patches-2.6.34/250-pppoe_header_pad.patch b/target/linux/generic-2.6/patches-2.6.34/250-pppoe_header_pad.patch
deleted file mode 100644
index a2535db60..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/250-pppoe_header_pad.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/drivers/net/pppoe.c
-+++ b/drivers/net/pppoe.c
-@@ -862,7 +862,7 @@ static int pppoe_sendmsg(struct kiocb *i
- 		goto end;
- 
- 
--	skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32,
-+	skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32 + NET_SKB_PAD,
- 			   0, GFP_KERNEL);
- 	if (!skb) {
- 		error = -ENOMEM;
-@@ -870,7 +870,7 @@ static int pppoe_sendmsg(struct kiocb *i
- 	}
- 
- 	/* Reserve space for headers. */
--	skb_reserve(skb, dev->hard_header_len);
-+	skb_reserve(skb, dev->hard_header_len + NET_SKB_PAD);
- 	skb_reset_network_header(skb);
- 
- 	skb->dev = dev;
diff --git a/target/linux/generic-2.6/patches-2.6.34/260-crypto_optional_tests.patch b/target/linux/generic-2.6/patches-2.6.34/260-crypto_optional_tests.patch
deleted file mode 100644
index 3b28502a6..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/260-crypto_optional_tests.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -96,6 +96,10 @@ config CRYPTO_MANAGER2
- 	select CRYPTO_BLKCIPHER2
- 	select CRYPTO_PCOMP
- 
-+config CRYPTO_MANAGER_NO_TESTS
-+	bool "Disable internal testsuite to save space"
-+	depends on CRYPTO_MANAGER
-+
- config CRYPTO_GF128MUL
- 	tristate "GF(2^128) multiplication functions (EXPERIMENTAL)"
- 	depends on EXPERIMENTAL
---- a/crypto/testmgr.c
-+++ b/crypto/testmgr.c
-@@ -47,6 +47,8 @@
- #define ENCRYPT 1
- #define DECRYPT 0
- 
-+#ifndef CONFIG_CRYPTO_MANAGER_NO_TESTS
-+
- struct tcrypt_result {
- 	struct completion completion;
- 	int err;
-@@ -2359,8 +2361,11 @@ static int alg_find_test(const char *alg
- 	return -1;
- }
- 
-+#endif /* CONFIG_CRYPTO_MANAGER_NO_TESTS */
-+
- int alg_test(const char *driver, const char *alg, u32 type, u32 mask)
- {
-+#ifndef CONFIG_CRYPTO_MANAGER_NO_TESTS
- 	int i;
- 	int j;
- 	int rc;
-@@ -2415,5 +2420,8 @@ notest:
- 	return 0;
- non_fips_alg:
- 	return -EINVAL;
-+#else /* CONFIG_CRYPTO_MANAGER_NO_TESTS */
-+	return 0;
-+#endif /* CONFIG_CRYPTO_MANAGER_NO_TESTS */
- }
- EXPORT_SYMBOL_GPL(alg_test);
---- a/crypto/testmgr.h
-+++ b/crypto/testmgr.h
-@@ -20,6 +20,8 @@
- 
- #include <crypto/compress.h>
- 
-+#ifndef CONFIG_CRYPTO_MANAGER_NO_TESTS
-+
- #define MAX_DIGEST_SIZE		64
- #define MAX_TAP			8
- 
-@@ -9552,4 +9554,6 @@ static struct hash_testvec crc32c_tv_tem
- 	},
- };
- 
-+#endif /* CONFIG_CRYPTO_MANAGER_NO_TESTS */
-+
- #endif	/* _CRYPTO_TESTMGR_H */
diff --git a/target/linux/generic-2.6/patches-2.6.34/400-ledtrig_morse.patch b/target/linux/generic-2.6/patches-2.6.34/400-ledtrig_morse.patch
deleted file mode 100644
index 855b3dee5..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/400-ledtrig_morse.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -337,4 +337,8 @@ config LEDS_TRIGGER_DEFAULT_ON
- comment "iptables trigger is under Netfilter config (LED target)"
- 	depends on LEDS_TRIGGERS
- 
-+config LEDS_TRIGGER_MORSE
-+	tristate "LED Morse Trigger"
-+	depends on LEDS_TRIGGERS
-+
- endif # NEW_LEDS
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -44,3 +44,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)	+= 
- obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)	+= ledtrig-backlight.o
- obj-$(CONFIG_LEDS_TRIGGER_GPIO)		+= ledtrig-gpio.o
- obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o
-+obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
diff --git a/target/linux/generic-2.6/patches-2.6.34/402-ledtrig_netdev.patch b/target/linux/generic-2.6/patches-2.6.34/402-ledtrig_netdev.patch
deleted file mode 100644
index d4ac25ede..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/402-ledtrig_netdev.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -341,4 +341,11 @@ config LEDS_TRIGGER_MORSE
- 	tristate "LED Morse Trigger"
- 	depends on LEDS_TRIGGERS
- 
-+config LEDS_TRIGGER_NETDEV
-+	tristate "LED Netdev Trigger"
-+	depends on LEDS_TRIGGERS
-+	help
-+	  This allows LEDs to be controlled by network device activity.
-+	  If unsure, say Y.
-+
- endif # NEW_LEDS
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -45,3 +45,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)	+= 
- obj-$(CONFIG_LEDS_TRIGGER_GPIO)		+= ledtrig-gpio.o
- obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o
- obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
-+obj-$(CONFIG_LEDS_TRIGGER_NETDEV)      += ledtrig-netdev.o
diff --git a/target/linux/generic-2.6/patches-2.6.34/410-gpio_buttons.patch b/target/linux/generic-2.6/patches-2.6.34/410-gpio_buttons.patch
deleted file mode 100644
index b762ddea5..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/410-gpio_buttons.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/drivers/input/misc/Kconfig
-+++ b/drivers/input/misc/Kconfig
-@@ -319,4 +319,20 @@ config INPUT_PCAP
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called pcap_keys.
- 
-+config INPUT_GPIO_BUTTONS
-+	tristate "Polled GPIO buttons interface"
-+	depends on GENERIC_GPIO
-+	select INPUT_POLLDEV
-+	help
-+	  This driver implements support for buttons connected
-+	  to GPIO pins of various CPUs (and some other chips).
-+
-+	  Say Y here if your device has buttons connected
-+	  directly to such GPIO pins.  Your board-specific
-+	  setup logic must also provide a platform device,
-+	  with configuration data saying which GPIOs are used.
-+
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called gpio-buttons.
-+
- endif
---- a/drivers/input/misc/Makefile
-+++ b/drivers/input/misc/Makefile
-@@ -30,4 +30,5 @@ obj-$(CONFIG_INPUT_WINBOND_CIR)		+= winb
- obj-$(CONFIG_INPUT_WISTRON_BTNS)	+= wistron_btns.o
- obj-$(CONFIG_INPUT_WM831X_ON)		+= wm831x-on.o
- obj-$(CONFIG_INPUT_YEALINK)		+= yealink.o
-+obj-$(CONFIG_INPUT_GPIO_BUTTONS)	+= gpio_buttons.o
- 
diff --git a/target/linux/generic-2.6/patches-2.6.34/420-gpiodev.patch b/target/linux/generic-2.6/patches-2.6.34/420-gpiodev.patch
deleted file mode 100644
index ebc430f3e..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/420-gpiodev.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/drivers/char/Kconfig
-+++ b/drivers/char/Kconfig
-@@ -1016,6 +1016,14 @@ config CS5535_GPIO
- 
- 	  If compiled as a module, it will be called cs5535_gpio.
- 
-+config GPIO_DEVICE
-+	tristate "GPIO device support"
-+	depends on GENERIC_GPIO
-+	help
-+	  Say Y to enable Linux GPIO device support.  This allows control of
-+	  GPIO pins using a character device
-+
-+
- config RAW_DRIVER
- 	tristate "RAW driver (/dev/raw/rawN)"
- 	depends on BLOCK
---- a/drivers/char/Makefile
-+++ b/drivers/char/Makefile
-@@ -95,6 +95,7 @@ obj-$(CONFIG_SCx200_GPIO)	+= scx200_gpio
- obj-$(CONFIG_PC8736x_GPIO)	+= pc8736x_gpio.o
- obj-$(CONFIG_NSC_GPIO)		+= nsc_gpio.o
- obj-$(CONFIG_CS5535_GPIO)	+= cs5535_gpio.o
-+obj-$(CONFIG_GPIO_DEVICE)	+= gpio_dev.o
- obj-$(CONFIG_GPIO_TB0219)	+= tb0219.o
- obj-$(CONFIG_TELCLOCK)		+= tlclk.o
- 
diff --git a/target/linux/generic-2.6/patches-2.6.34/430-scsi_header_fix.patch b/target/linux/generic-2.6/patches-2.6.34/430-scsi_header_fix.patch
deleted file mode 100644
index 59e433361..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/430-scsi_header_fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/include/scsi/scsi.h
-+++ b/include/scsi/scsi.h
-@@ -149,10 +149,10 @@ struct scsi_cmnd;
- 
- /* defined in T10 SCSI Primary Commands-2 (SPC2) */
- struct scsi_varlen_cdb_hdr {
--	u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
--	u8 control;
--	u8 misc[5];
--	u8 additional_cdb_length;         /* total cdb length - 8 */
-+	__u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
-+	__u8 control;
-+	__u8 misc[5];
-+	__u8 additional_cdb_length;         /* total cdb length - 8 */
- 	__be16 service_action;
- 	/* service specific data follows */
- };
diff --git a/target/linux/generic-2.6/patches-2.6.34/510-yaffs_support.patch b/target/linux/generic-2.6/patches-2.6.34/510-yaffs_support.patch
deleted file mode 100644
index b14de5940..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/510-yaffs_support.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/fs/Kconfig
-+++ b/fs/Kconfig
-@@ -44,6 +44,7 @@ source "fs/gfs2/Kconfig"
- source "fs/ocfs2/Kconfig"
- source "fs/btrfs/Kconfig"
- source "fs/nilfs2/Kconfig"
-+source "fs/yaffs2/Kconfig"
- 
- endif # BLOCK
- 
---- a/fs/Makefile
-+++ b/fs/Makefile
-@@ -127,3 +127,5 @@
- obj-$(CONFIG_GFS2_FS)           += gfs2/
- obj-$(CONFIG_EXOFS_FS)          += exofs/
- obj-$(CONFIG_CEPH_FS)		+= ceph/
-+obj-$(CONFIG_YAFFS_FS)		+= yaffs2/
-+
diff --git a/target/linux/generic-2.6/patches-2.6.34/511-yaffs-cvs-2009-04-24.patch b/target/linux/generic-2.6/patches-2.6.34/511-yaffs-cvs-2009-04-24.patch
deleted file mode 100644
index 5c70e79a0..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/511-yaffs-cvs-2009-04-24.patch
+++ /dev/null
@@ -1,12344 +0,0 @@
---- a/fs/yaffs2/devextras.h
-+++ b/fs/yaffs2/devextras.h
-@@ -14,194 +14,135 @@
-  */
- 
- /*
-- * This file is just holds extra declarations used during development.
-- * Most of these are from kernel includes placed here so we can use them in
-- * applications.
-+ * This file is just holds extra declarations of macros that would normally
-+ * be providesd in the Linux kernel. These macros have been written from
-+ * scratch but are functionally equivalent to the Linux ones.
-  *
-  */
- 
- #ifndef __EXTRAS_H__
- #define __EXTRAS_H__
- 
--#if defined WIN32
--#define __inline__ __inline
--#define new newHack
--#endif
--
--#if !(defined __KERNEL__) || (defined WIN32)
- 
--/* User space defines */
-+#if !(defined __KERNEL__)
- 
-+/* Definition of types */
- typedef unsigned char __u8;
- typedef unsigned short __u16;
- typedef unsigned __u32;
- 
-+#endif
-+
- /*
-- * Simple doubly linked list implementation.
-- *
-- * Some of the internal functions ("__xxx") are useful when
-- * manipulating whole lists rather than single entries, as
-- * sometimes we already know the next/prev entries and we can
-- * generate better code by using them directly rather than
-- * using the generic single-entry routines.
-+ * This is a simple doubly linked list implementation that matches the
-+ * way the Linux kernel doubly linked list implementation works.
-  */
- 
--#define prefetch(x) 1
--
--struct list_head {
--	struct list_head *next, *prev;
-+struct ylist_head {
-+	struct ylist_head *next; /* next in chain */
-+	struct ylist_head *prev; /* previous in chain */
- };
- 
--#define LIST_HEAD_INIT(name) { &(name), &(name) }
- 
--#define LIST_HEAD(name) \
--	struct list_head name = LIST_HEAD_INIT(name)
-+/* Initialise a static list */
-+#define YLIST_HEAD(name) \
-+struct ylist_head name = { &(name), &(name)}
-+
- 
--#define INIT_LIST_HEAD(ptr) do { \
--	(ptr)->next = (ptr); (ptr)->prev = (ptr); \
-+
-+/* Initialise a list head to an empty list */
-+#define YINIT_LIST_HEAD(p) \
-+do { \
-+	(p)->next = (p);\
-+	(p)->prev = (p); \
- } while (0)
- 
--/*
-- * Insert a new entry between two known consecutive entries.
-- *
-- * This is only for internal list manipulation where we know
-- * the prev/next entries already!
-- */
--static __inline__ void __list_add(struct list_head *new,
--				  struct list_head *prev,
--				  struct list_head *next)
--{
--	next->prev = new;
--	new->next = next;
--	new->prev = prev;
--	prev->next = new;
--}
- 
--/**
-- * list_add - add a new entry
-- * @new: new entry to be added
-- * @head: list head to add it after
-- *
-- * Insert a new entry after the specified head.
-- * This is good for implementing stacks.
-- */
--static __inline__ void list_add(struct list_head *new, struct list_head *head)
-+/* Add an element to a list */
-+static __inline__ void ylist_add(struct ylist_head *newEntry,
-+				struct ylist_head *list)
- {
--	__list_add(new, head, head->next);
--}
-+	struct ylist_head *listNext = list->next;
-+
-+	list->next = newEntry;
-+	newEntry->prev = list;
-+	newEntry->next = listNext;
-+	listNext->prev = newEntry;
- 
--/**
-- * list_add_tail - add a new entry
-- * @new: new entry to be added
-- * @head: list head to add it before
-- *
-- * Insert a new entry before the specified head.
-- * This is useful for implementing queues.
-- */
--static __inline__ void list_add_tail(struct list_head *new,
--				     struct list_head *head)
--{
--	__list_add(new, head->prev, head);
- }
- 
--/*
-- * Delete a list entry by making the prev/next entries
-- * point to each other.
-- *
-- * This is only for internal list manipulation where we know
-- * the prev/next entries already!
-- */
--static __inline__ void __list_del(struct list_head *prev,
--				  struct list_head *next)
-+static __inline__ void ylist_add_tail(struct ylist_head *newEntry,
-+				 struct ylist_head *list)
- {
--	next->prev = prev;
--	prev->next = next;
-+	struct ylist_head *listPrev = list->prev;
-+
-+	list->prev = newEntry;
-+	newEntry->next = list;
-+	newEntry->prev = listPrev;
-+	listPrev->next = newEntry;
-+
- }
- 
--/**
-- * list_del - deletes entry from list.
-- * @entry: the element to delete from the list.
-- * Note: list_empty on entry does not return true after this, the entry is
-- * in an undefined state.
-- */
--static __inline__ void list_del(struct list_head *entry)
-+
-+/* Take an element out of its current list, with or without
-+ * reinitialising the links.of the entry*/
-+static __inline__ void ylist_del(struct ylist_head *entry)
- {
--	__list_del(entry->prev, entry->next);
-+	struct ylist_head *listNext = entry->next;
-+	struct ylist_head *listPrev = entry->prev;
-+
-+	listNext->prev = listPrev;
-+	listPrev->next = listNext;
-+
- }
- 
--/**
-- * list_del_init - deletes entry from list and reinitialize it.
-- * @entry: the element to delete from the list.
-- */
--static __inline__ void list_del_init(struct list_head *entry)
-+static __inline__ void ylist_del_init(struct ylist_head *entry)
- {
--	__list_del(entry->prev, entry->next);
--	INIT_LIST_HEAD(entry);
-+	ylist_del(entry);
-+	entry->next = entry->prev = entry;
- }
- 
--/**
-- * list_empty - tests whether a list is empty
-- * @head: the list to test.
-- */
--static __inline__ int list_empty(struct list_head *head)
-+
-+/* Test if the list is empty */
-+static __inline__ int ylist_empty(struct ylist_head *entry)
- {
--	return head->next == head;
-+	return (entry->next == entry);
- }
- 
--/**
-- * list_splice - join two lists
-- * @list: the new list to add.
-- * @head: the place to add it in the first list.
-+
-+/* ylist_entry takes a pointer to a list entry and offsets it to that
-+ * we can find a pointer to the object it is embedded in.
-  */
--static __inline__ void list_splice(struct list_head *list,
--				   struct list_head *head)
--{
--	struct list_head *first = list->next;
- 
--	if (first != list) {
--		struct list_head *last = list->prev;
--		struct list_head *at = head->next;
--
--		first->prev = head;
--		head->next = first;
--
--		last->next = at;
--		at->prev = last;
--	}
--}
- 
--/**
-- * list_entry - get the struct for this entry
-- * @ptr:	the &struct list_head pointer.
-- * @type:	the type of the struct this is embedded in.
-- * @member:	the name of the list_struct within the struct.
-- */
--#define list_entry(ptr, type, member) \
--	((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member)))
--
--/**
-- * list_for_each	-	iterate over a list
-- * @pos:	the &struct list_head to use as a loop counter.
-- * @head:	the head for your list.
-- */
--#define list_for_each(pos, head) \
--	for (pos = (head)->next, prefetch(pos->next); pos != (head); \
--        	pos = pos->next, prefetch(pos->next))
--
--/**
-- * list_for_each_safe	-	iterate over a list safe against removal
-- *                              of list entry
-- * @pos:	the &struct list_head to use as a loop counter.
-- * @n:		another &struct list_head to use as temporary storage
-- * @head:	the head for your list.
-- */
--#define list_for_each_safe(pos, n, head) \
--	for (pos = (head)->next, n = pos->next; pos != (head); \
--		pos = n, n = pos->next)
-+#define ylist_entry(entry, type, member) \
-+	((type *)((char *)(entry)-(unsigned long)(&((type *)NULL)->member)))
- 
--/*
-- * File types
-+
-+/* ylist_for_each and list_for_each_safe  iterate over lists.
-+ * ylist_for_each_safe uses temporary storage to make the list delete safe
-  */
-+
-+#define ylist_for_each(itervar, list) \
-+	for (itervar = (list)->next; itervar != (list); itervar = itervar->next)
-+
-+#define ylist_for_each_safe(itervar, saveVar, list) \
-+	for (itervar = (list)->next, saveVar = (list)->next->next; \
-+		itervar != (list); itervar = saveVar, saveVar = saveVar->next)
-+
-+
-+#if !(defined __KERNEL__)
-+
-+
-+#ifndef WIN32
-+#include <sys/stat.h>
-+#endif
-+
-+
-+#ifdef CONFIG_YAFFS_PROVIDE_DEFS
-+/* File types */
-+
-+
- #define DT_UNKNOWN	0
- #define DT_FIFO		1
- #define DT_CHR		2
-@@ -212,6 +153,7 @@ static __inline__ void list_splice(struc
- #define DT_SOCK		12
- #define DT_WHT		14
- 
-+
- #ifndef WIN32
- #include <sys/stat.h>
- #endif
-@@ -227,10 +169,6 @@ static __inline__ void list_splice(struc
- #define ATTR_ATIME	16
- #define ATTR_MTIME	32
- #define ATTR_CTIME	64
--#define ATTR_ATIME_SET	128
--#define ATTR_MTIME_SET	256
--#define ATTR_FORCE	512	/* Not a change, but a change it */
--#define ATTR_ATTR_FLAG	1024
- 
- struct iattr {
- 	unsigned int ia_valid;
-@@ -244,21 +182,15 @@ struct iattr {
- 	unsigned int ia_attr_flags;
- };
- 
--#define KERN_DEBUG
-+#endif
- 
- #else
- 
--#ifndef WIN32
- #include <linux/types.h>
--#include <linux/list.h>
- #include <linux/fs.h>
- #include <linux/stat.h>
--#endif
- 
- #endif
- 
--#if defined WIN32
--#undef new
--#endif
- 
- #endif
---- a/fs/yaffs2/Kconfig
-+++ b/fs/yaffs2/Kconfig
-@@ -5,7 +5,7 @@
- config YAFFS_FS
- 	tristate "YAFFS2 file system support"
- 	default n
--	depends on MTD
-+	depends on MTD_BLOCK
- 	select YAFFS_YAFFS1
- 	select YAFFS_YAFFS2
- 	help
-@@ -43,7 +43,8 @@ config YAFFS_9BYTE_TAGS
- 	  format that you need to continue to support.  New data written
- 	  also uses the older-style format.  Note: Use of this option
- 	  generally requires that MTD's oob layout be adjusted to use the
--	  older-style format.  See notes on tags formats and MTD versions.
-+	  older-style format.  See notes on tags formats and MTD versions
-+	  in yaffs_mtdif1.c.
- 
- 	  If unsure, say N.
- 
-@@ -109,26 +110,6 @@ config YAFFS_DISABLE_LAZY_LOAD
- 
- 	  If unsure, say N.
- 
--config YAFFS_CHECKPOINT_RESERVED_BLOCKS
--	int "Reserved blocks for checkpointing"
--	depends on YAFFS_YAFFS2
--	default 10
--	help
--          Give the number of Blocks to reserve for checkpointing.
--	  Checkpointing saves the state at unmount so that mounting is
--	  much faster as a scan of all the flash to regenerate this state
--	  is not needed.  These Blocks are reserved per partition, so if
--	  you have very small partitions the default (10) may be a mess
--	  for you.  You can set this value to 0, but that does not mean
--	  checkpointing is disabled at all. There only won't be any
--	  specially reserved blocks for checkpointing, so if there is
--	  enough free space on the filesystem, it will be used for
--	  checkpointing.
--
--	  If unsure, leave at default (10), but don't wonder if there are
--	  always 2MB used on your large page device partition (10 x 2k
--	  pagesize). When using small partitions or when being very small
--	  on space, you probably want to set this to zero.
- 
- config YAFFS_DISABLE_WIDE_TNODES
- 	bool "Turn off wide tnodes"
---- a/fs/yaffs2/Makefile
-+++ b/fs/yaffs2/Makefile
-@@ -5,7 +5,6 @@
- obj-$(CONFIG_YAFFS_FS) += yaffs.o
- 
- yaffs-y := yaffs_ecc.o yaffs_fs.o yaffs_guts.o yaffs_checkptrw.o
--yaffs-y += yaffs_packedtags2.o yaffs_nand.o yaffs_qsort.o
-+yaffs-y += yaffs_packedtags1.o yaffs_packedtags2.o yaffs_nand.o yaffs_qsort.o
- yaffs-y += yaffs_tagscompat.o yaffs_tagsvalidity.o
--yaffs-y += yaffs_mtdif1.o yaffs_packedtags1.o
--yaffs-y += yaffs_mtdif.o yaffs_mtdif2.o
-+yaffs-y += yaffs_mtdif.o yaffs_mtdif1.o yaffs_mtdif2.o
---- a/fs/yaffs2/moduleconfig.h
-+++ b/fs/yaffs2/moduleconfig.h
-@@ -27,12 +27,12 @@
- 
- /* Default: Not selected */
- /* Meaning: Yaffs does its own ECC, rather than using MTD ECC */
--//#define CONFIG_YAFFS_DOES_ECC
-+/* #define CONFIG_YAFFS_DOES_ECC */
- 
- /* Default: Not selected */
- /* Meaning: ECC byte order is 'wrong'.  Only meaningful if */
- /*          CONFIG_YAFFS_DOES_ECC is set */
--//#define CONFIG_YAFFS_ECC_WRONG_ORDER
-+/* #define CONFIG_YAFFS_ECC_WRONG_ORDER */
- 
- /* Default: Selected */
- /* Meaning: Disables testing whether chunks are erased before writing to them*/
-@@ -54,11 +54,11 @@ that you need to continue to support.  N
- older-style format.
- Note: Use of this option generally requires that MTD's oob layout be
- adjusted to use the older-style format.  See notes on tags formats and
--MTD versions.
-+MTD versions in yaffs_mtdif1.c.
- */
- /* Default: Not selected */
- /* Meaning: Use older-style on-NAND data format with pageStatus byte */
--#define CONFIG_YAFFS_9BYTE_TAGS
-+/* #define CONFIG_YAFFS_9BYTE_TAGS */
- 
- #endif /* YAFFS_OUT_OF_TREE */
- 
---- a/fs/yaffs2/yaffs_checkptrw.c
-+++ b/fs/yaffs2/yaffs_checkptrw.c
-@@ -12,48 +12,43 @@
-  */
- 
- const char *yaffs_checkptrw_c_version =
--    "$Id: yaffs_checkptrw.c,v 1.14 2007-05-15 20:07:40 charles Exp $";
-+	"$Id: yaffs_checkptrw.c,v 1.18 2009-03-06 17:20:49 wookey Exp $";
- 
- 
- #include "yaffs_checkptrw.h"
--
-+#include "yaffs_getblockinfo.h"
- 
- static int yaffs_CheckpointSpaceOk(yaffs_Device *dev)
- {
--
- 	int blocksAvailable = dev->nErasedBlocks - dev->nReservedBlocks;
- 
- 	T(YAFFS_TRACE_CHECKPOINT,
- 		(TSTR("checkpt blocks available = %d" TENDSTR),
- 		blocksAvailable));
- 
--
- 	return (blocksAvailable <= 0) ? 0 : 1;
- }
- 
- 
- static int yaffs_CheckpointErase(yaffs_Device *dev)
- {
--
- 	int i;
- 
--
--	if(!dev->eraseBlockInNAND)
-+	if (!dev->eraseBlockInNAND)
- 		return 0;
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checking blocks %d to %d"TENDSTR),
--		dev->internalStartBlock,dev->internalEndBlock));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checking blocks %d to %d"TENDSTR),
-+		dev->internalStartBlock, dev->internalEndBlock));
- 
--	for(i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
--		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
--		if(bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT){
--			T(YAFFS_TRACE_CHECKPOINT,(TSTR("erasing checkpt block %d"TENDSTR),i));
--			if(dev->eraseBlockInNAND(dev,i- dev->blockOffset /* realign */)){
-+	for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
-+		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
-+		if (bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT) {
-+			T(YAFFS_TRACE_CHECKPOINT, (TSTR("erasing checkpt block %d"TENDSTR), i));
-+			if (dev->eraseBlockInNAND(dev, i - dev->blockOffset /* realign */)) {
- 				bi->blockState = YAFFS_BLOCK_STATE_EMPTY;
- 				dev->nErasedBlocks++;
- 				dev->nFreeChunks += dev->nChunksPerBlock;
--			}
--			else {
--				dev->markNANDBlockBad(dev,i);
-+			} else {
-+				dev->markNANDBlockBad(dev, i);
- 				bi->blockState = YAFFS_BLOCK_STATE_DEAD;
- 			}
- 		}
-@@ -71,23 +66,23 @@ static void yaffs_CheckpointFindNextEras
- 	int blocksAvailable = dev->nErasedBlocks - dev->nReservedBlocks;
- 	T(YAFFS_TRACE_CHECKPOINT,
- 		(TSTR("allocating checkpt block: erased %d reserved %d avail %d next %d "TENDSTR),
--		dev->nErasedBlocks,dev->nReservedBlocks,blocksAvailable,dev->checkpointNextBlock));
-+		dev->nErasedBlocks, dev->nReservedBlocks, blocksAvailable, dev->checkpointNextBlock));
- 
--	if(dev->checkpointNextBlock >= 0 &&
--	   dev->checkpointNextBlock <= dev->internalEndBlock &&
--	   blocksAvailable > 0){
--
--		for(i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++){
--			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
--			if(bi->blockState == YAFFS_BLOCK_STATE_EMPTY){
-+	if (dev->checkpointNextBlock >= 0 &&
-+			dev->checkpointNextBlock <= dev->internalEndBlock &&
-+			blocksAvailable > 0) {
-+
-+		for (i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++) {
-+			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
-+			if (bi->blockState == YAFFS_BLOCK_STATE_EMPTY) {
- 				dev->checkpointNextBlock = i + 1;
- 				dev->checkpointCurrentBlock = i;
--				T(YAFFS_TRACE_CHECKPOINT,(TSTR("allocating checkpt block %d"TENDSTR),i));
-+				T(YAFFS_TRACE_CHECKPOINT, (TSTR("allocating checkpt block %d"TENDSTR), i));
- 				return;
- 			}
- 		}
- 	}
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("out of checkpt blocks"TENDSTR)));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("out of checkpt blocks"TENDSTR)));
- 
- 	dev->checkpointNextBlock = -1;
- 	dev->checkpointCurrentBlock = -1;
-@@ -98,30 +93,31 @@ static void yaffs_CheckpointFindNextChec
- 	int  i;
- 	yaffs_ExtendedTags tags;
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("find next checkpt block: start:  blocks %d next %d" TENDSTR),
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("find next checkpt block: start:  blocks %d next %d" TENDSTR),
- 		dev->blocksInCheckpoint, dev->checkpointNextBlock));
- 
--	if(dev->blocksInCheckpoint < dev->checkpointMaxBlocks)
--		for(i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++){
-+	if (dev->blocksInCheckpoint < dev->checkpointMaxBlocks)
-+		for (i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++) {
- 			int chunk = i * dev->nChunksPerBlock;
- 			int realignedChunk = chunk - dev->chunkOffset;
- 
--			dev->readChunkWithTagsFromNAND(dev,realignedChunk,NULL,&tags);
--			T(YAFFS_TRACE_CHECKPOINT,(TSTR("find next checkpt block: search: block %d oid %d seq %d eccr %d" TENDSTR),
--				i, tags.objectId,tags.sequenceNumber,tags.eccResult));
-+			dev->readChunkWithTagsFromNAND(dev, realignedChunk,
-+					NULL, &tags);
-+			T(YAFFS_TRACE_CHECKPOINT, (TSTR("find next checkpt block: search: block %d oid %d seq %d eccr %d" TENDSTR),
-+				i, tags.objectId, tags.sequenceNumber, tags.eccResult));
- 
--			if(tags.sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA){
-+			if (tags.sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA) {
- 				/* Right kind of block */
- 				dev->checkpointNextBlock = tags.objectId;
- 				dev->checkpointCurrentBlock = i;
- 				dev->checkpointBlockList[dev->blocksInCheckpoint] = i;
- 				dev->blocksInCheckpoint++;
--				T(YAFFS_TRACE_CHECKPOINT,(TSTR("found checkpt block %d"TENDSTR),i));
-+				T(YAFFS_TRACE_CHECKPOINT, (TSTR("found checkpt block %d"TENDSTR), i));
- 				return;
- 			}
- 		}
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("found no more checkpt blocks"TENDSTR)));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("found no more checkpt blocks"TENDSTR)));
- 
- 	dev->checkpointNextBlock = -1;
- 	dev->checkpointCurrentBlock = -1;
-@@ -133,17 +129,17 @@ int yaffs_CheckpointOpen(yaffs_Device *d
- 
- 	/* Got the functions we need? */
- 	if (!dev->writeChunkWithTagsToNAND ||
--	    !dev->readChunkWithTagsFromNAND ||
--	    !dev->eraseBlockInNAND ||
--	    !dev->markNANDBlockBad)
-+			!dev->readChunkWithTagsFromNAND ||
-+			!dev->eraseBlockInNAND ||
-+			!dev->markNANDBlockBad)
- 		return 0;
- 
--	if(forWriting && !yaffs_CheckpointSpaceOk(dev))
-+	if (forWriting && !yaffs_CheckpointSpaceOk(dev))
- 		return 0;
- 
--	if(!dev->checkpointBuffer)
--		dev->checkpointBuffer = YMALLOC_DMA(dev->nDataBytesPerChunk);
--	if(!dev->checkpointBuffer)
-+	if (!dev->checkpointBuffer)
-+		dev->checkpointBuffer = YMALLOC_DMA(dev->totalBytesPerChunk);
-+	if (!dev->checkpointBuffer)
- 		return 0;
- 
- 
-@@ -159,12 +155,10 @@ int yaffs_CheckpointOpen(yaffs_Device *d
- 	dev->checkpointNextBlock = dev->internalStartBlock;
- 
- 	/* Erase all the blocks in the checkpoint area */
--	if(forWriting){
--		memset(dev->checkpointBuffer,0,dev->nDataBytesPerChunk);
-+	if (forWriting) {
-+		memset(dev->checkpointBuffer, 0, dev->nDataBytesPerChunk);
- 		dev->checkpointByteOffset = 0;
- 		return yaffs_CheckpointErase(dev);
--
--
- 	} else {
- 		int i;
- 		/* Set to a value that will kick off a read */
-@@ -174,7 +168,7 @@ int yaffs_CheckpointOpen(yaffs_Device *d
- 		dev->blocksInCheckpoint = 0;
- 		dev->checkpointMaxBlocks = (dev->internalEndBlock - dev->internalStartBlock)/16 + 2;
- 		dev->checkpointBlockList = YMALLOC(sizeof(int) * dev->checkpointMaxBlocks);
--		for(i = 0; i < dev->checkpointMaxBlocks; i++)
-+		for (i = 0; i < dev->checkpointMaxBlocks; i++)
- 			dev->checkpointBlockList[i] = -1;
- 	}
- 
-@@ -191,18 +185,17 @@ int yaffs_GetCheckpointSum(yaffs_Device 
- 
- static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev)
- {
--
- 	int chunk;
- 	int realignedChunk;
- 
- 	yaffs_ExtendedTags tags;
- 
--	if(dev->checkpointCurrentBlock < 0){
-+	if (dev->checkpointCurrentBlock < 0) {
- 		yaffs_CheckpointFindNextErasedBlock(dev);
- 		dev->checkpointCurrentChunk = 0;
- 	}
- 
--	if(dev->checkpointCurrentBlock < 0)
-+	if (dev->checkpointCurrentBlock < 0)
- 		return 0;
- 
- 	tags.chunkDeleted = 0;
-@@ -210,10 +203,10 @@ static int yaffs_CheckpointFlushBuffer(y
- 	tags.chunkId = dev->checkpointPageSequence + 1;
- 	tags.sequenceNumber =  YAFFS_SEQUENCE_CHECKPOINT_DATA;
- 	tags.byteCount = dev->nDataBytesPerChunk;
--	if(dev->checkpointCurrentChunk == 0){
-+	if (dev->checkpointCurrentChunk == 0) {
- 		/* First chunk we write for the block? Set block state to
- 		   checkpoint */
--		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,dev->checkpointCurrentBlock);
-+		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, dev->checkpointCurrentBlock);
- 		bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT;
- 		dev->blocksInCheckpoint++;
- 	}
-@@ -221,28 +214,29 @@ static int yaffs_CheckpointFlushBuffer(y
- 	chunk = dev->checkpointCurrentBlock * dev->nChunksPerBlock + dev->checkpointCurrentChunk;
- 
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint wite buffer nand %d(%d:%d) objid %d chId %d" TENDSTR),
--		chunk, dev->checkpointCurrentBlock, dev->checkpointCurrentChunk,tags.objectId,tags.chunkId));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint wite buffer nand %d(%d:%d) objid %d chId %d" TENDSTR),
-+		chunk, dev->checkpointCurrentBlock, dev->checkpointCurrentChunk, tags.objectId, tags.chunkId));
- 
- 	realignedChunk = chunk - dev->chunkOffset;
- 
--	dev->writeChunkWithTagsToNAND(dev,realignedChunk,dev->checkpointBuffer,&tags);
-+	dev->writeChunkWithTagsToNAND(dev, realignedChunk,
-+			dev->checkpointBuffer, &tags);
- 	dev->checkpointByteOffset = 0;
- 	dev->checkpointPageSequence++;
- 	dev->checkpointCurrentChunk++;
--	if(dev->checkpointCurrentChunk >= dev->nChunksPerBlock){
-+	if (dev->checkpointCurrentChunk >= dev->nChunksPerBlock) {
- 		dev->checkpointCurrentChunk = 0;
- 		dev->checkpointCurrentBlock = -1;
- 	}
--	memset(dev->checkpointBuffer,0,dev->nDataBytesPerChunk);
-+	memset(dev->checkpointBuffer, 0, dev->nDataBytesPerChunk);
- 
- 	return 1;
- }
- 
- 
--int yaffs_CheckpointWrite(yaffs_Device *dev,const void *data, int nBytes)
-+int yaffs_CheckpointWrite(yaffs_Device *dev, const void *data, int nBytes)
- {
--	int i=0;
-+	int i = 0;
- 	int ok = 1;
- 
- 
-@@ -250,17 +244,14 @@ int yaffs_CheckpointWrite(yaffs_Device *
- 
- 
- 
--	if(!dev->checkpointBuffer)
-+	if (!dev->checkpointBuffer)
- 		return 0;
- 
--	if(!dev->checkpointOpenForWrite)
-+	if (!dev->checkpointOpenForWrite)
- 		return -1;
- 
--	while(i < nBytes && ok) {
--
--
--
--		dev->checkpointBuffer[dev->checkpointByteOffset] = *dataBytes ;
-+	while (i < nBytes && ok) {
-+		dev->checkpointBuffer[dev->checkpointByteOffset] = *dataBytes;
- 		dev->checkpointSum += *dataBytes;
- 		dev->checkpointXor ^= *dataBytes;
- 
-@@ -270,18 +261,17 @@ int yaffs_CheckpointWrite(yaffs_Device *
- 		dev->checkpointByteCount++;
- 
- 
--		if(dev->checkpointByteOffset < 0 ||
-+		if (dev->checkpointByteOffset < 0 ||
- 		   dev->checkpointByteOffset >= dev->nDataBytesPerChunk)
- 			ok = yaffs_CheckpointFlushBuffer(dev);
--
- 	}
- 
--	return 	i;
-+	return i;
- }
- 
- int yaffs_CheckpointRead(yaffs_Device *dev, void *data, int nBytes)
- {
--	int i=0;
-+	int i = 0;
- 	int ok = 1;
- 	yaffs_ExtendedTags tags;
- 
-@@ -291,52 +281,54 @@ int yaffs_CheckpointRead(yaffs_Device *d
- 
- 	__u8 *dataBytes = (__u8 *)data;
- 
--	if(!dev->checkpointBuffer)
-+	if (!dev->checkpointBuffer)
- 		return 0;
- 
--	if(dev->checkpointOpenForWrite)
-+	if (dev->checkpointOpenForWrite)
- 		return -1;
- 
--	while(i < nBytes && ok) {
-+	while (i < nBytes && ok) {
- 
- 
--		if(dev->checkpointByteOffset < 0 ||
--		   dev->checkpointByteOffset >= dev->nDataBytesPerChunk) {
-+		if (dev->checkpointByteOffset < 0 ||
-+			dev->checkpointByteOffset >= dev->nDataBytesPerChunk) {
- 
--		   	if(dev->checkpointCurrentBlock < 0){
-+			if (dev->checkpointCurrentBlock < 0) {
- 				yaffs_CheckpointFindNextCheckpointBlock(dev);
- 				dev->checkpointCurrentChunk = 0;
- 			}
- 
--			if(dev->checkpointCurrentBlock < 0)
-+			if (dev->checkpointCurrentBlock < 0)
- 				ok = 0;
- 			else {
--
--				chunk = dev->checkpointCurrentBlock * dev->nChunksPerBlock +
--				          dev->checkpointCurrentChunk;
-+				chunk = dev->checkpointCurrentBlock *
-+					dev->nChunksPerBlock +
-+					dev->checkpointCurrentChunk;
- 
- 				realignedChunk = chunk - dev->chunkOffset;
- 
--	   			/* read in the next chunk */
--	   			/* printf("read checkpoint page %d\n",dev->checkpointPage); */
--				dev->readChunkWithTagsFromNAND(dev, realignedChunk,
--							       dev->checkpointBuffer,
--							      &tags);
--
--				if(tags.chunkId != (dev->checkpointPageSequence + 1) ||
--				   tags.sequenceNumber != YAFFS_SEQUENCE_CHECKPOINT_DATA)
--				   ok = 0;
-+				/* read in the next chunk */
-+				/* printf("read checkpoint page %d\n",dev->checkpointPage); */
-+				dev->readChunkWithTagsFromNAND(dev,
-+						realignedChunk,
-+						dev->checkpointBuffer,
-+						&tags);
-+
-+				if (tags.chunkId != (dev->checkpointPageSequence + 1) ||
-+					tags.eccResult > YAFFS_ECC_RESULT_FIXED ||
-+					tags.sequenceNumber != YAFFS_SEQUENCE_CHECKPOINT_DATA)
-+					ok = 0;
- 
- 				dev->checkpointByteOffset = 0;
- 				dev->checkpointPageSequence++;
- 				dev->checkpointCurrentChunk++;
- 
--				if(dev->checkpointCurrentChunk >= dev->nChunksPerBlock)
-+				if (dev->checkpointCurrentChunk >= dev->nChunksPerBlock)
- 					dev->checkpointCurrentBlock = -1;
- 			}
- 		}
- 
--		if(ok){
-+		if (ok) {
- 			*dataBytes = dev->checkpointBuffer[dev->checkpointByteOffset];
- 			dev->checkpointSum += *dataBytes;
- 			dev->checkpointXor ^= *dataBytes;
-@@ -353,17 +345,17 @@ int yaffs_CheckpointRead(yaffs_Device *d
- int yaffs_CheckpointClose(yaffs_Device *dev)
- {
- 
--	if(dev->checkpointOpenForWrite){
--		if(dev->checkpointByteOffset != 0)
-+	if (dev->checkpointOpenForWrite) {
-+		if (dev->checkpointByteOffset != 0)
- 			yaffs_CheckpointFlushBuffer(dev);
- 	} else {
- 		int i;
--		for(i = 0; i < dev->blocksInCheckpoint && dev->checkpointBlockList[i] >= 0; i++){
--			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,dev->checkpointBlockList[i]);
--			if(bi->blockState == YAFFS_BLOCK_STATE_EMPTY)
-+		for (i = 0; i < dev->blocksInCheckpoint && dev->checkpointBlockList[i] >= 0; i++) {
-+			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, dev->checkpointBlockList[i]);
-+			if (bi->blockState == YAFFS_BLOCK_STATE_EMPTY)
- 				bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT;
- 			else {
--				// Todo this looks odd...
-+				/* Todo this looks odd... */
- 			}
- 		}
- 		YFREE(dev->checkpointBlockList);
-@@ -374,27 +366,25 @@ int yaffs_CheckpointClose(yaffs_Device *
- 	dev->nErasedBlocks -= dev->blocksInCheckpoint;
- 
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint byte count %d" TENDSTR),
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint byte count %d" TENDSTR),
- 			dev->checkpointByteCount));
- 
--	if(dev->checkpointBuffer){
-+	if (dev->checkpointBuffer) {
- 		/* free the buffer */
- 		YFREE(dev->checkpointBuffer);
- 		dev->checkpointBuffer = NULL;
- 		return 1;
--	}
--	else
-+	} else
- 		return 0;
--
- }
- 
- int yaffs_CheckpointInvalidateStream(yaffs_Device *dev)
- {
- 	/* Erase the first checksum block */
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint invalidate"TENDSTR)));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint invalidate"TENDSTR)));
- 
--	if(!yaffs_CheckpointSpaceOk(dev))
-+	if (!yaffs_CheckpointSpaceOk(dev))
- 		return 0;
- 
- 	return yaffs_CheckpointErase(dev);
---- a/fs/yaffs2/yaffs_checkptrw.h
-+++ b/fs/yaffs2/yaffs_checkptrw.h
-@@ -20,9 +20,9 @@
- 
- int yaffs_CheckpointOpen(yaffs_Device *dev, int forWriting);
- 
--int yaffs_CheckpointWrite(yaffs_Device *dev,const void *data, int nBytes);
-+int yaffs_CheckpointWrite(yaffs_Device *dev, const void *data, int nBytes);
- 
--int yaffs_CheckpointRead(yaffs_Device *dev,void *data, int nBytes);
-+int yaffs_CheckpointRead(yaffs_Device *dev, void *data, int nBytes);
- 
- int yaffs_GetCheckpointSum(yaffs_Device *dev, __u32 *sum);
- 
---- a/fs/yaffs2/yaffs_ecc.c
-+++ b/fs/yaffs2/yaffs_ecc.c
-@@ -29,7 +29,7 @@
-  */
- 
- const char *yaffs_ecc_c_version =
--    "$Id: yaffs_ecc.c,v 1.9 2007-02-14 01:09:06 wookey Exp $";
-+	"$Id: yaffs_ecc.c,v 1.11 2009-03-06 17:20:50 wookey Exp $";
- 
- #include "yportenv.h"
- 
-@@ -109,12 +109,10 @@ void yaffs_ECCCalculate(const unsigned c
- 		b = column_parity_table[*data++];
- 		col_parity ^= b;
- 
--		if (b & 0x01)	// odd number of bits in the byte
--		{
-+		if (b & 0x01) {		/* odd number of bits in the byte */
- 			line_parity ^= i;
- 			line_parity_prime ^= ~i;
- 		}
--
- 	}
- 
- 	ecc[2] = (~col_parity) | 0x03;
-@@ -158,7 +156,7 @@ void yaffs_ECCCalculate(const unsigned c
- 	ecc[0] = ~t;
- 
- #ifdef CONFIG_YAFFS_ECC_WRONG_ORDER
--	// Swap the bytes into the wrong order
-+	/* Swap the bytes into the wrong order */
- 	t = ecc[0];
- 	ecc[0] = ecc[1];
- 	ecc[1] = t;
-@@ -189,7 +187,7 @@ int yaffs_ECCCorrect(unsigned char *data
- 		unsigned bit;
- 
- #ifdef CONFIG_YAFFS_ECC_WRONG_ORDER
--		// swap the bytes to correct for the wrong order
-+		/* swap the bytes to correct for the wrong order */
- 		unsigned char t;
- 
- 		t = d0;
-@@ -251,7 +249,7 @@ int yaffs_ECCCorrect(unsigned char *data
-  * ECCxxxOther does ECC calcs on arbitrary n bytes of data
-  */
- void yaffs_ECCCalculateOther(const unsigned char *data, unsigned nBytes,
--			     yaffs_ECCOther * eccOther)
-+				yaffs_ECCOther *eccOther)
- {
- 	unsigned int i;
- 
-@@ -278,8 +276,8 @@ void yaffs_ECCCalculateOther(const unsig
- }
- 
- int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes,
--			  yaffs_ECCOther * read_ecc,
--			  const yaffs_ECCOther * test_ecc)
-+			yaffs_ECCOther *read_ecc,
-+			const yaffs_ECCOther *test_ecc)
- {
- 	unsigned char cDelta;	/* column parity delta */
- 	unsigned lDelta;	/* line parity delta */
-@@ -294,8 +292,7 @@ int yaffs_ECCCorrectOther(unsigned char 
- 		return 0; /* no error */
- 
- 	if (lDelta == ~lDeltaPrime &&
--	    (((cDelta ^ (cDelta >> 1)) & 0x15) == 0x15))
--	{
-+	    (((cDelta ^ (cDelta >> 1)) & 0x15) == 0x15)) {
- 		/* Single bit (recoverable) error in data */
- 
- 		bit = 0;
-@@ -307,7 +304,7 @@ int yaffs_ECCCorrectOther(unsigned char 
- 		if (cDelta & 0x02)
- 			bit |= 0x01;
- 
--		if(lDelta >= nBytes)
-+		if (lDelta >= nBytes)
- 			return -1;
- 
- 		data[lDelta] ^= (1 << bit);
-@@ -316,7 +313,7 @@ int yaffs_ECCCorrectOther(unsigned char 
- 	}
- 
- 	if ((yaffs_CountBits32(lDelta) + yaffs_CountBits32(lDeltaPrime) +
--	     yaffs_CountBits(cDelta)) == 1) {
-+			yaffs_CountBits(cDelta)) == 1) {
- 		/* Reccoverable error in ecc */
- 
- 		*read_ecc = *test_ecc;
-@@ -326,6 +323,4 @@ int yaffs_ECCCorrectOther(unsigned char 
- 	/* Unrecoverable error */
- 
- 	return -1;
--
- }
--
---- a/fs/yaffs2/yaffs_ecc.h
-+++ b/fs/yaffs2/yaffs_ecc.h
-@@ -13,15 +13,15 @@
-  * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
-  */
- 
-- /*
--  * This code implements the ECC algorithm used in SmartMedia.
--  *
--  * The ECC comprises 22 bits of parity information and is stuffed into 3 bytes.
--  * The two unused bit are set to 1.
--  * The ECC can correct single bit errors in a 256-byte page of data. Thus, two such ECC
--  * blocks are used on a 512-byte NAND page.
--  *
--  */
-+/*
-+ * This code implements the ECC algorithm used in SmartMedia.
-+ *
-+ * The ECC comprises 22 bits of parity information and is stuffed into 3 bytes.
-+ * The two unused bit are set to 1.
-+ * The ECC can correct single bit errors in a 256-byte page of data. Thus, two such ECC
-+ * blocks are used on a 512-byte NAND page.
-+ *
-+ */
- 
- #ifndef __YAFFS_ECC_H__
- #define __YAFFS_ECC_H__
-@@ -34,11 +34,11 @@ typedef struct {
- 
- void yaffs_ECCCalculate(const unsigned char *data, unsigned char *ecc);
- int yaffs_ECCCorrect(unsigned char *data, unsigned char *read_ecc,
--		     const unsigned char *test_ecc);
-+		const unsigned char *test_ecc);
- 
- void yaffs_ECCCalculateOther(const unsigned char *data, unsigned nBytes,
--			     yaffs_ECCOther * ecc);
-+			yaffs_ECCOther *ecc);
- int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes,
--			  yaffs_ECCOther * read_ecc,
--			  const yaffs_ECCOther * test_ecc);
-+			yaffs_ECCOther *read_ecc,
-+			const yaffs_ECCOther *test_ecc);
- #endif
---- a/fs/yaffs2/yaffs_fs.c
-+++ b/fs/yaffs2/yaffs_fs.c
-@@ -1,7 +1,7 @@
- /*
-  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
-  *
-- * Copyright (C) 2002-2007 Aleph One Ltd.
-+ * Copyright (C) 2002-2009 Aleph One Ltd.
-  *   for Toby Churchill Ltd and Brightstar Engineering
-  *
-  * Created by Charles Manning <charles@aleph1.co.uk>
-@@ -32,18 +32,17 @@
-  */
- 
- const char *yaffs_fs_c_version =
--    "$Id: yaffs_fs.c,v 1.63 2007-09-19 20:35:40 imcd Exp $";
-+    "$Id: yaffs_fs.c,v 1.79 2009-03-17 01:12:00 wookey Exp $";
- extern const char *yaffs_guts_c_version;
- 
- #include <linux/version.h>
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
- #include <linux/config.h>
- #endif
- #include <linux/kernel.h>
- #include <linux/module.h>
- #include <linux/slab.h>
- #include <linux/init.h>
--#include <linux/list.h>
- #include <linux/fs.h>
- #include <linux/proc_fs.h>
- #include <linux/smp_lock.h>
-@@ -53,10 +52,12 @@ extern const char *yaffs_guts_c_version;
- #include <linux/string.h>
- #include <linux/ctype.h>
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#include "asm/div64.h"
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 
- #include <linux/statfs.h>	/* Added NCB 15-8-2003 */
--#include <asm/statfs.h>
-+#include <linux/statfs.h>
- #define UnlockPage(p) unlock_page(p)
- #define Page_Uptodate(page)	test_bit(PG_uptodate, &(page)->flags)
- 
-@@ -69,22 +70,45 @@ extern const char *yaffs_guts_c_version;
- #define	BDEVNAME_SIZE		0
- #define	yaffs_devname(sb, buf)	kdevname(sb->s_dev)
- 
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0))
- /* added NCB 26/5/2006 for 2.4.25-vrs2-tcl1 kernel */
- #define __user
- #endif
- 
- #endif
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26))
-+#define YPROC_ROOT  (&proc_root)
-+#else
-+#define YPROC_ROOT  NULL
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- #define WRITE_SIZE_STR "writesize"
--#define WRITE_SIZE(mtd) (mtd)->writesize
-+#define WRITE_SIZE(mtd) ((mtd)->writesize)
- #else
- #define WRITE_SIZE_STR "oobblock"
--#define WRITE_SIZE(mtd) (mtd)->oobblock
-+#define WRITE_SIZE(mtd) ((mtd)->oobblock)
- #endif
- 
--#include <asm/uaccess.h>
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 27))
-+#define YAFFS_USE_WRITE_BEGIN_END 1
-+#else
-+#define YAFFS_USE_WRITE_BEGIN_END 0
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 28))
-+static uint32_t YCALCBLOCKS(uint64_t partition_size, uint32_t block_size)
-+{
-+	uint64_t result = partition_size;
-+	do_div(result, block_size);
-+	return (uint32_t)result;
-+}
-+#else
-+#define YCALCBLOCKS(s, b) ((s)/(b))
-+#endif
-+
-+#include <linux/uaccess.h>
- 
- #include "yportenv.h"
- #include "yaffs_guts.h"
-@@ -96,28 +120,44 @@ extern const char *yaffs_guts_c_version;
- 
- unsigned int yaffs_traceMask = YAFFS_TRACE_BAD_BLOCKS;
- unsigned int yaffs_wr_attempts = YAFFS_WR_ATTEMPTS;
-+unsigned int yaffs_auto_checkpoint = 1;
- 
- /* Module Parameters */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
--module_param(yaffs_traceMask,uint,0644);
--module_param(yaffs_wr_attempts,uint,0644);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+module_param(yaffs_traceMask, uint, 0644);
-+module_param(yaffs_wr_attempts, uint, 0644);
-+module_param(yaffs_auto_checkpoint, uint, 0644);
-+#else
-+MODULE_PARM(yaffs_traceMask, "i");
-+MODULE_PARM(yaffs_wr_attempts, "i");
-+MODULE_PARM(yaffs_auto_checkpoint, "i");
-+#endif
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25))
-+/* use iget and read_inode */
-+#define Y_IGET(sb, inum) iget((sb), (inum))
-+static void yaffs_read_inode(struct inode *inode);
-+
- #else
--MODULE_PARM(yaffs_traceMask,"i");
--MODULE_PARM(yaffs_wr_attempts,"i");
-+/* Call local equivalent */
-+#define YAFFS_USE_OWN_IGET
-+#define Y_IGET(sb, inum) yaffs_iget((sb), (inum))
-+
-+static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino);
- #endif
- 
- /*#define T(x) printk x */
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18))
--#define yaffs_InodeToObjectLV(iptr) (iptr)->i_private
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18))
-+#define yaffs_InodeToObjectLV(iptr) ((iptr)->i_private)
- #else
--#define yaffs_InodeToObjectLV(iptr) (iptr)->u.generic_ip
-+#define yaffs_InodeToObjectLV(iptr) ((iptr)->u.generic_ip)
- #endif
- 
- #define yaffs_InodeToObject(iptr) ((yaffs_Object *)(yaffs_InodeToObjectLV(iptr)))
- #define yaffs_DentryToObject(dptr) yaffs_InodeToObject((dptr)->d_inode)
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- #define yaffs_SuperToDevice(sb)	((yaffs_Device *)sb->s_fs_info)
- #else
- #define yaffs_SuperToDevice(sb)	((yaffs_Device *)sb->u.generic_sbp)
-@@ -126,47 +166,49 @@ MODULE_PARM(yaffs_wr_attempts,"i");
- static void yaffs_put_super(struct super_block *sb);
- 
- static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
--				loff_t * pos);
-+				loff_t *pos);
-+static ssize_t yaffs_hold_space(struct file *f);
-+static void yaffs_release_space(struct file *f);
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_file_flush(struct file *file, fl_owner_t id);
- #else
- static int yaffs_file_flush(struct file *file);
- #endif
- 
- static int yaffs_sync_object(struct file *file, struct dentry *dentry,
--			     int datasync);
-+				int datasync);
- 
- static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir);
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
- 			struct nameidata *n);
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
--				   struct nameidata *n);
-+					struct nameidata *n);
- #else
- static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode);
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry);
- #endif
- static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
--		      struct dentry *dentry);
-+			struct dentry *dentry);
- static int yaffs_unlink(struct inode *dir, struct dentry *dentry);
- static int yaffs_symlink(struct inode *dir, struct dentry *dentry,
--			 const char *symname);
-+			const char *symname);
- static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode);
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
--		       dev_t dev);
-+			dev_t dev);
- #else
- static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
--		       int dev);
-+			int dev);
- #endif
- static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry,
- 			struct inode *new_dir, struct dentry *new_dentry);
- static int yaffs_setattr(struct dentry *dentry, struct iattr *attr);
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_sync_fs(struct super_block *sb, int wait);
- static void yaffs_write_super(struct super_block *sb);
- #else
-@@ -174,33 +216,47 @@ static int yaffs_sync_fs(struct super_bl
- static int yaffs_write_super(struct super_block *sb);
- #endif
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf);
--#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf);
- #else
- static int yaffs_statfs(struct super_block *sb, struct statfs *buf);
- #endif
--static void yaffs_read_inode(struct inode *inode);
- 
-+#ifdef YAFFS_HAS_PUT_INODE
- static void yaffs_put_inode(struct inode *inode);
-+#endif
-+
- static void yaffs_delete_inode(struct inode *);
- static void yaffs_clear_inode(struct inode *);
- 
- static int yaffs_readpage(struct file *file, struct page *page);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_writepage(struct page *page, struct writeback_control *wbc);
- #else
- static int yaffs_writepage(struct page *page);
- #endif
-+
-+
-+#if (YAFFS_USE_WRITE_BEGIN_END != 0)
-+static int yaffs_write_begin(struct file *filp, struct address_space *mapping,
-+				loff_t pos, unsigned len, unsigned flags,
-+				struct page **pagep, void **fsdata);
-+static int yaffs_write_end(struct file *filp, struct address_space *mapping,
-+				loff_t pos, unsigned len, unsigned copied,
-+				struct page *pg, void *fsdadata);
-+#else
- static int yaffs_prepare_write(struct file *f, struct page *pg,
--			       unsigned offset, unsigned to);
-+				unsigned offset, unsigned to);
- static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
--			      unsigned to);
-+				unsigned to);
- 
--static int yaffs_readlink(struct dentry *dentry, char __user * buffer,
--			  int buflen);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
-+#endif
-+
-+static int yaffs_readlink(struct dentry *dentry, char __user *buffer,
-+				int buflen);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
- static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
- #else
- static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
-@@ -209,12 +265,17 @@ static int yaffs_follow_link(struct dent
- static struct address_space_operations yaffs_file_address_operations = {
- 	.readpage = yaffs_readpage,
- 	.writepage = yaffs_writepage,
-+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-+	.write_begin = yaffs_write_begin,
-+	.write_end = yaffs_write_end,
-+#else
- 	.prepare_write = yaffs_prepare_write,
- 	.commit_write = yaffs_commit_write,
-+#endif
- };
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,22))
--static struct file_operations yaffs_file_operations = {
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 22))
-+static const struct file_operations yaffs_file_operations = {
- 	.read = do_sync_read,
- 	.write = do_sync_write,
- 	.aio_read = generic_file_aio_read,
-@@ -224,11 +285,12 @@ static struct file_operations yaffs_file
- 	.fsync = yaffs_sync_object,
- 	.splice_read = generic_file_splice_read,
- 	.splice_write = generic_file_splice_write,
-+	.llseek = generic_file_llseek,
- };
- 
--#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18))
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18))
- 
--static struct file_operations yaffs_file_operations = {
-+static const struct file_operations yaffs_file_operations = {
- 	.read = do_sync_read,
- 	.write = do_sync_write,
- 	.aio_read = generic_file_aio_read,
-@@ -241,29 +303,29 @@ static struct file_operations yaffs_file
- 
- #else
- 
--static struct file_operations yaffs_file_operations = {
-+static const struct file_operations yaffs_file_operations = {
- 	.read = generic_file_read,
- 	.write = generic_file_write,
- 	.mmap = generic_file_mmap,
- 	.flush = yaffs_file_flush,
- 	.fsync = yaffs_sync_object,
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 	.sendfile = generic_file_sendfile,
- #endif
- };
- #endif
- 
--static struct inode_operations yaffs_file_inode_operations = {
-+static const struct inode_operations yaffs_file_inode_operations = {
- 	.setattr = yaffs_setattr,
- };
- 
--static struct inode_operations yaffs_symlink_inode_operations = {
-+static const struct inode_operations yaffs_symlink_inode_operations = {
- 	.readlink = yaffs_readlink,
- 	.follow_link = yaffs_follow_link,
- 	.setattr = yaffs_setattr,
- };
- 
--static struct inode_operations yaffs_dir_inode_operations = {
-+static const struct inode_operations yaffs_dir_inode_operations = {
- 	.create = yaffs_create,
- 	.lookup = yaffs_lookup,
- 	.link = yaffs_link,
-@@ -276,16 +338,21 @@ static struct inode_operations yaffs_dir
- 	.setattr = yaffs_setattr,
- };
- 
--static struct file_operations yaffs_dir_operations = {
-+static const struct file_operations yaffs_dir_operations = {
- 	.read = generic_read_dir,
- 	.readdir = yaffs_readdir,
- 	.fsync = yaffs_sync_object,
- };
- 
--static struct super_operations yaffs_super_ops = {
-+static const struct super_operations yaffs_super_ops = {
- 	.statfs = yaffs_statfs,
-+
-+#ifndef YAFFS_USE_OWN_IGET
- 	.read_inode = yaffs_read_inode,
-+#endif
-+#ifdef YAFFS_HAS_PUT_INODE
- 	.put_inode = yaffs_put_inode,
-+#endif
- 	.put_super = yaffs_put_super,
- 	.delete_inode = yaffs_delete_inode,
- 	.clear_inode = yaffs_clear_inode,
-@@ -293,22 +360,21 @@ static struct super_operations yaffs_sup
- 	.write_super = yaffs_write_super,
- };
- 
--static void yaffs_GrossLock(yaffs_Device * dev)
-+static void yaffs_GrossLock(yaffs_Device *dev)
- {
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs locking\n"));
--
-+	T(YAFFS_TRACE_OS, ("yaffs locking %p\n", current));
- 	down(&dev->grossLock);
-+	T(YAFFS_TRACE_OS, ("yaffs locked %p\n", current));
- }
- 
--static void yaffs_GrossUnlock(yaffs_Device * dev)
-+static void yaffs_GrossUnlock(yaffs_Device *dev)
- {
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs unlocking\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs unlocking %p\n", current));
- 	up(&dev->grossLock);
--
- }
- 
--static int yaffs_readlink(struct dentry *dentry, char __user * buffer,
--			  int buflen)
-+static int yaffs_readlink(struct dentry *dentry, char __user *buffer,
-+			int buflen)
- {
- 	unsigned char *alias;
- 	int ret;
-@@ -329,7 +395,7 @@ static int yaffs_readlink(struct dentry 
- 	return ret;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
- static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
- #else
- static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
-@@ -345,32 +411,31 @@ static int yaffs_follow_link(struct dent
- 
- 	yaffs_GrossUnlock(dev);
- 
--	if (!alias)
--        {
-+	if (!alias) {
- 		ret = -ENOMEM;
- 		goto out;
--        }
-+	}
- 
- 	ret = vfs_follow_link(nd, alias);
- 	kfree(alias);
- out:
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
--	return ERR_PTR (ret);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
-+	return ERR_PTR(ret);
- #else
- 	return ret;
- #endif
- }
- 
- struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,
--			      yaffs_Object * obj);
-+				yaffs_Object *obj);
- 
- /*
-  * Lookup is used to find objects in the fs
-  */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
--				   struct nameidata *n)
-+				struct nameidata *n)
- #else
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry)
- #endif
-@@ -383,12 +448,11 @@ static struct dentry *yaffs_lookup(struc
- 	yaffs_GrossLock(dev);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_lookup for %d:%s\n",
--	   yaffs_InodeToObject(dir)->objectId, dentry->d_name.name));
-+		("yaffs_lookup for %d:%s\n",
-+		yaffs_InodeToObject(dir)->objectId, dentry->d_name.name));
- 
--	obj =
--	    yaffs_FindObjectByName(yaffs_InodeToObject(dir),
--				   dentry->d_name.name);
-+	obj = yaffs_FindObjectByName(yaffs_InodeToObject(dir),
-+					dentry->d_name.name);
- 
- 	obj = yaffs_GetEquivalentObject(obj);	/* in case it was a hardlink */
- 
-@@ -397,13 +461,13 @@ static struct dentry *yaffs_lookup(struc
- 
- 	if (obj) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_lookup found %d\n", obj->objectId));
-+			("yaffs_lookup found %d\n", obj->objectId));
- 
- 		inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
- 
- 		if (inode) {
- 			T(YAFFS_TRACE_OS,
--			  (KERN_DEBUG "yaffs_loookup dentry \n"));
-+				("yaffs_loookup dentry \n"));
- /* #if 0 asserted by NCB for 2.5/6 compatability - falls through to
-  * d_add even if NULL inode */
- #if 0
-@@ -416,7 +480,7 @@ static struct dentry *yaffs_lookup(struc
- 		}
- 
- 	} else {
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_lookup not found\n"));
-+		T(YAFFS_TRACE_OS, ("yaffs_lookup not found\n"));
- 
- 	}
- 
-@@ -425,20 +489,22 @@ static struct dentry *yaffs_lookup(struc
- 	d_add(dentry, inode);
- 
- 	return NULL;
--	/*      return (ERR_PTR(-EIO)); */
--
- }
- 
-+
-+#ifdef YAFFS_HAS_PUT_INODE
-+
- /* For now put inode is just for debugging
-  * Put inode is called when the inode **structure** is put.
-  */
- static void yaffs_put_inode(struct inode *inode)
- {
- 	T(YAFFS_TRACE_OS,
--	  ("yaffs_put_inode: ino %d, count %d\n", (int)inode->i_ino,
--	   atomic_read(&inode->i_count)));
-+		("yaffs_put_inode: ino %d, count %d\n", (int)inode->i_ino,
-+		atomic_read(&inode->i_count)));
- 
- }
-+#endif
- 
- /* clear is called to tell the fs to release any per-inode data it holds */
- static void yaffs_clear_inode(struct inode *inode)
-@@ -449,9 +515,9 @@ static void yaffs_clear_inode(struct ino
- 	obj = yaffs_InodeToObject(inode);
- 
- 	T(YAFFS_TRACE_OS,
--	  ("yaffs_clear_inode: ino %d, count %d %s\n", (int)inode->i_ino,
--	   atomic_read(&inode->i_count),
--	   obj ? "object exists" : "null object"));
-+		("yaffs_clear_inode: ino %d, count %d %s\n", (int)inode->i_ino,
-+		atomic_read(&inode->i_count),
-+		obj ? "object exists" : "null object"));
- 
- 	if (obj) {
- 		dev = obj->myDev;
-@@ -486,23 +552,23 @@ static void yaffs_delete_inode(struct in
- 	yaffs_Device *dev;
- 
- 	T(YAFFS_TRACE_OS,
--	  ("yaffs_delete_inode: ino %d, count %d %s\n", (int)inode->i_ino,
--	   atomic_read(&inode->i_count),
--	   obj ? "object exists" : "null object"));
-+		("yaffs_delete_inode: ino %d, count %d %s\n", (int)inode->i_ino,
-+		atomic_read(&inode->i_count),
-+		obj ? "object exists" : "null object"));
- 
- 	if (obj) {
- 		dev = obj->myDev;
- 		yaffs_GrossLock(dev);
--		yaffs_DeleteFile(obj);
-+		yaffs_DeleteObject(obj);
- 		yaffs_GrossUnlock(dev);
- 	}
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
--        truncate_inode_pages (&inode->i_data, 0);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
-+	truncate_inode_pages(&inode->i_data, 0);
- #endif
- 	clear_inode(inode);
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_file_flush(struct file *file, fl_owner_t id)
- #else
- static int yaffs_file_flush(struct file *file)
-@@ -513,8 +579,8 @@ static int yaffs_file_flush(struct file 
- 	yaffs_Device *dev = obj->myDev;
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_file_flush object %d (%s)\n", obj->objectId,
--	   obj->dirty ? "dirty" : "clean"));
-+		("yaffs_file_flush object %d (%s)\n", obj->objectId,
-+		obj->dirty ? "dirty" : "clean"));
- 
- 	yaffs_GrossLock(dev);
- 
-@@ -535,15 +601,15 @@ static int yaffs_readpage_nolock(struct 
- 
- 	yaffs_Device *dev;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_readpage at %08x, size %08x\n",
--			   (unsigned)(pg->index << PAGE_CACHE_SHIFT),
--			   (unsigned)PAGE_CACHE_SIZE));
-+	T(YAFFS_TRACE_OS, ("yaffs_readpage at %08x, size %08x\n",
-+			(unsigned)(pg->index << PAGE_CACHE_SHIFT),
-+			(unsigned)PAGE_CACHE_SIZE));
- 
- 	obj = yaffs_DentryToObject(f->f_dentry);
- 
- 	dev = obj->myDev;
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 	BUG_ON(!PageLocked(pg));
- #else
- 	if (!PageLocked(pg))
-@@ -555,9 +621,9 @@ static int yaffs_readpage_nolock(struct 
- 
- 	yaffs_GrossLock(dev);
- 
--	ret =
--	    yaffs_ReadDataFromFile(obj, pg_buf, pg->index << PAGE_CACHE_SHIFT,
--				   PAGE_CACHE_SIZE);
-+	ret = yaffs_ReadDataFromFile(obj, pg_buf,
-+				pg->index << PAGE_CACHE_SHIFT,
-+				PAGE_CACHE_SIZE);
- 
- 	yaffs_GrossUnlock(dev);
- 
-@@ -575,7 +641,7 @@ static int yaffs_readpage_nolock(struct 
- 	flush_dcache_page(pg);
- 	kunmap(pg);
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_readpage done\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_readpage done\n"));
- 	return ret;
- }
- 
-@@ -593,7 +659,7 @@ static int yaffs_readpage(struct file *f
- 
- /* writepage inspired by/stolen from smbfs */
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_writepage(struct page *page, struct writeback_control *wbc)
- #else
- static int yaffs_writepage(struct page *page)
-@@ -616,12 +682,11 @@ static int yaffs_writepage(struct page *
- 
- 	if (offset > inode->i_size) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG
--		   "yaffs_writepage at %08x, inode size = %08x!!!\n",
--		   (unsigned)(page->index << PAGE_CACHE_SHIFT),
--		   (unsigned)inode->i_size));
-+			("yaffs_writepage at %08x, inode size = %08x!!!\n",
-+			(unsigned)(page->index << PAGE_CACHE_SHIFT),
-+			(unsigned)inode->i_size));
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "                -> don't care!!\n"));
-+			("                -> don't care!!\n"));
- 		unlock_page(page);
- 		return 0;
- 	}
-@@ -629,11 +694,10 @@ static int yaffs_writepage(struct page *
- 	end_index = inode->i_size >> PAGE_CACHE_SHIFT;
- 
- 	/* easy case */
--	if (page->index < end_index) {
-+	if (page->index < end_index)
- 		nBytes = PAGE_CACHE_SIZE;
--	} else {
-+	else
- 		nBytes = inode->i_size & (PAGE_CACHE_SIZE - 1);
--	}
- 
- 	get_page(page);
- 
-@@ -643,19 +707,18 @@ static int yaffs_writepage(struct page *
- 	yaffs_GrossLock(obj->myDev);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_writepage at %08x, size %08x\n",
--	   (unsigned)(page->index << PAGE_CACHE_SHIFT), nBytes));
-+		("yaffs_writepage at %08x, size %08x\n",
-+		(unsigned)(page->index << PAGE_CACHE_SHIFT), nBytes));
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "writepag0: obj = %05x, ino = %05x\n",
--	   (int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
-+		("writepag0: obj = %05x, ino = %05x\n",
-+		(int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
- 
--	nWritten =
--	    yaffs_WriteDataToFile(obj, buffer, page->index << PAGE_CACHE_SHIFT,
--				  nBytes, 0);
-+	nWritten = yaffs_WriteDataToFile(obj, buffer,
-+			page->index << PAGE_CACHE_SHIFT, nBytes, 0);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "writepag1: obj = %05x, ino = %05x\n",
--	   (int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
-+		("writepag1: obj = %05x, ino = %05x\n",
-+		(int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
- 
- 	yaffs_GrossUnlock(obj->myDev);
- 
-@@ -667,100 +730,207 @@ static int yaffs_writepage(struct page *
- 	return (nWritten == nBytes) ? 0 : -ENOSPC;
- }
- 
-+
-+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-+static int yaffs_write_begin(struct file *filp, struct address_space *mapping,
-+				loff_t pos, unsigned len, unsigned flags,
-+				struct page **pagep, void **fsdata)
-+{
-+	struct page *pg = NULL;
-+	pgoff_t index = pos >> PAGE_CACHE_SHIFT;
-+	uint32_t offset = pos & (PAGE_CACHE_SIZE - 1);
-+	uint32_t to = offset + len;
-+
-+	int ret = 0;
-+	int space_held = 0;
-+
-+	T(YAFFS_TRACE_OS, ("start yaffs_write_begin\n"));
-+	/* Get a page */
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 28)
-+	pg = grab_cache_page_write_begin(mapping, index, flags);
-+#else
-+	pg = __grab_cache_page(mapping, index);
-+#endif
-+
-+	*pagep = pg;
-+	if (!pg) {
-+		ret =  -ENOMEM;
-+		goto out;
-+	}
-+	/* Get fs space */
-+	space_held = yaffs_hold_space(filp);
-+
-+	if (!space_held) {
-+		ret = -ENOSPC;
-+		goto out;
-+	}
-+
-+	/* Update page if required */
-+
-+	if (!Page_Uptodate(pg) && (offset || to < PAGE_CACHE_SIZE))
-+		ret = yaffs_readpage_nolock(filp, pg);
-+
-+	if (ret)
-+		goto out;
-+
-+	/* Happy path return */
-+	T(YAFFS_TRACE_OS, ("end yaffs_write_begin - ok\n"));
-+
-+	return 0;
-+
-+out:
-+	T(YAFFS_TRACE_OS, ("end yaffs_write_begin fail returning %d\n", ret));
-+	if (space_held)
-+		yaffs_release_space(filp);
-+	if (pg) {
-+		unlock_page(pg);
-+		page_cache_release(pg);
-+	}
-+	return ret;
-+}
-+
-+#else
-+
- static int yaffs_prepare_write(struct file *f, struct page *pg,
--			       unsigned offset, unsigned to)
-+				unsigned offset, unsigned to)
- {
-+	T(YAFFS_TRACE_OS, ("yaffs_prepair_write\n"));
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_prepair_write\n"));
- 	if (!Page_Uptodate(pg) && (offset || to < PAGE_CACHE_SIZE))
- 		return yaffs_readpage_nolock(f, pg);
--
- 	return 0;
-+}
-+#endif
-+
-+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-+static int yaffs_write_end(struct file *filp, struct address_space *mapping,
-+				loff_t pos, unsigned len, unsigned copied,
-+				struct page *pg, void *fsdadata)
-+{
-+	int ret = 0;
-+	void *addr, *kva;
-+	uint32_t offset_into_page = pos & (PAGE_CACHE_SIZE - 1);
-+
-+	kva = kmap(pg);
-+	addr = kva + offset_into_page;
-+
-+	T(YAFFS_TRACE_OS,
-+		("yaffs_write_end addr %x pos %x nBytes %d\n",
-+		(unsigned) addr,
-+		(int)pos, copied));
-+
-+	ret = yaffs_file_write(filp, addr, copied, &pos);
-+
-+	if (ret != copied) {
-+		T(YAFFS_TRACE_OS,
-+			("yaffs_write_end not same size ret %d  copied %d\n",
-+			ret, copied));
-+		SetPageError(pg);
-+		ClearPageUptodate(pg);
-+	} else {
-+		SetPageUptodate(pg);
-+	}
-+
-+	kunmap(pg);
- 
-+	yaffs_release_space(filp);
-+	unlock_page(pg);
-+	page_cache_release(pg);
-+	return ret;
- }
-+#else
- 
- static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
--			      unsigned to)
-+				unsigned to)
- {
-+	void *addr, *kva;
- 
--	void *addr = page_address(pg) + offset;
- 	loff_t pos = (((loff_t) pg->index) << PAGE_CACHE_SHIFT) + offset;
- 	int nBytes = to - offset;
- 	int nWritten;
- 
- 	unsigned spos = pos;
--	unsigned saddr = (unsigned)addr;
-+	unsigned saddr;
-+
-+	kva = kmap(pg);
-+	addr = kva + offset;
-+
-+	saddr = (unsigned) addr;
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_commit_write addr %x pos %x nBytes %d\n", saddr,
--	   spos, nBytes));
-+		("yaffs_commit_write addr %x pos %x nBytes %d\n",
-+		saddr, spos, nBytes));
- 
- 	nWritten = yaffs_file_write(f, addr, nBytes, &pos);
- 
- 	if (nWritten != nBytes) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG
--		   "yaffs_commit_write not same size nWritten %d  nBytes %d\n",
--		   nWritten, nBytes));
-+			("yaffs_commit_write not same size nWritten %d  nBytes %d\n",
-+			nWritten, nBytes));
- 		SetPageError(pg);
- 		ClearPageUptodate(pg);
- 	} else {
- 		SetPageUptodate(pg);
- 	}
- 
-+	kunmap(pg);
-+
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_commit_write returning %d\n",
--	   nWritten == nBytes ? 0 : nWritten));
-+		("yaffs_commit_write returning %d\n",
-+		nWritten == nBytes ? 0 : nWritten));
- 
- 	return nWritten == nBytes ? 0 : nWritten;
--
- }
-+#endif
-+
- 
--static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object * obj)
-+static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object *obj)
- {
- 	if (inode && obj) {
- 
- 
- 		/* Check mode against the variant type and attempt to repair if broken. */
-- 		__u32 mode = obj->yst_mode;
-- 		switch( obj->variantType ){
-- 		case YAFFS_OBJECT_TYPE_FILE :
-- 		        if( ! S_ISREG(mode) ){
-- 			        obj->yst_mode &= ~S_IFMT;
-- 			        obj->yst_mode |= S_IFREG;
-- 			}
--
-- 			break;
-- 		case YAFFS_OBJECT_TYPE_SYMLINK :
-- 		        if( ! S_ISLNK(mode) ){
-- 			        obj->yst_mode &= ~S_IFMT;
-- 				obj->yst_mode |= S_IFLNK;
-- 			}
--
-- 			break;
-- 		case YAFFS_OBJECT_TYPE_DIRECTORY :
-- 		        if( ! S_ISDIR(mode) ){
-- 			        obj->yst_mode &= ~S_IFMT;
-- 			        obj->yst_mode |= S_IFDIR;
-- 			}
--
-- 			break;
-- 		case YAFFS_OBJECT_TYPE_UNKNOWN :
-- 		case YAFFS_OBJECT_TYPE_HARDLINK :
-- 		case YAFFS_OBJECT_TYPE_SPECIAL :
-- 		default:
-- 		        /* TODO? */
-- 		        break;
-- 		}
-+		__u32 mode = obj->yst_mode;
-+		switch (obj->variantType) {
-+		case YAFFS_OBJECT_TYPE_FILE:
-+			if (!S_ISREG(mode)) {
-+				obj->yst_mode &= ~S_IFMT;
-+				obj->yst_mode |= S_IFREG;
-+			}
-+
-+			break;
-+		case YAFFS_OBJECT_TYPE_SYMLINK:
-+			if (!S_ISLNK(mode)) {
-+				obj->yst_mode &= ~S_IFMT;
-+				obj->yst_mode |= S_IFLNK;
-+			}
-+
-+			break;
-+		case YAFFS_OBJECT_TYPE_DIRECTORY:
-+			if (!S_ISDIR(mode)) {
-+				obj->yst_mode &= ~S_IFMT;
-+				obj->yst_mode |= S_IFDIR;
-+			}
-+
-+			break;
-+		case YAFFS_OBJECT_TYPE_UNKNOWN:
-+		case YAFFS_OBJECT_TYPE_HARDLINK:
-+		case YAFFS_OBJECT_TYPE_SPECIAL:
-+		default:
-+			/* TODO? */
-+			break;
-+		}
-+
-+		inode->i_flags |= S_NOATIME;
- 
- 		inode->i_ino = obj->objectId;
- 		inode->i_mode = obj->yst_mode;
- 		inode->i_uid = obj->yst_uid;
- 		inode->i_gid = obj->yst_gid;
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
- 		inode->i_blksize = inode->i_sb->s_blocksize;
- #endif
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 
- 		inode->i_rdev = old_decode_dev(obj->yst_rdev);
- 		inode->i_atime.tv_sec = (time_t) (obj->yst_atime);
-@@ -781,26 +951,25 @@ static void yaffs_FillInodeFromObject(st
- 		inode->i_nlink = yaffs_GetObjectLinkCount(obj);
- 
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG
--		   "yaffs_FillInode mode %x uid %d gid %d size %d count %d\n",
--		   inode->i_mode, inode->i_uid, inode->i_gid,
--		   (int)inode->i_size, atomic_read(&inode->i_count)));
-+			("yaffs_FillInode mode %x uid %d gid %d size %d count %d\n",
-+			inode->i_mode, inode->i_uid, inode->i_gid,
-+			(int)inode->i_size, atomic_read(&inode->i_count)));
- 
- 		switch (obj->yst_mode & S_IFMT) {
- 		default:	/* fifo, device or socket */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 			init_special_inode(inode, obj->yst_mode,
--					   old_decode_dev(obj->yst_rdev));
-+					old_decode_dev(obj->yst_rdev));
- #else
- 			init_special_inode(inode, obj->yst_mode,
--					   (dev_t) (obj->yst_rdev));
-+					(dev_t) (obj->yst_rdev));
- #endif
- 			break;
- 		case S_IFREG:	/* file */
- 			inode->i_op = &yaffs_file_inode_operations;
- 			inode->i_fop = &yaffs_file_operations;
- 			inode->i_mapping->a_ops =
--			    &yaffs_file_address_operations;
-+				&yaffs_file_address_operations;
- 			break;
- 		case S_IFDIR:	/* directory */
- 			inode->i_op = &yaffs_dir_inode_operations;
-@@ -817,34 +986,36 @@ static void yaffs_FillInodeFromObject(st
- 
- 	} else {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_FileInode invalid parameters\n"));
-+			("yaffs_FileInode invalid parameters\n"));
- 	}
- 
- }
- 
- struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,
--			      yaffs_Object * obj)
-+				yaffs_Object *obj)
- {
- 	struct inode *inode;
- 
- 	if (!sb) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_get_inode for NULL super_block!!\n"));
-+			("yaffs_get_inode for NULL super_block!!\n"));
- 		return NULL;
- 
- 	}
- 
- 	if (!obj) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_get_inode for NULL object!!\n"));
-+			("yaffs_get_inode for NULL object!!\n"));
- 		return NULL;
- 
- 	}
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_get_inode for object %d\n", obj->objectId));
-+		("yaffs_get_inode for object %d\n", obj->objectId));
- 
--	inode = iget(sb, obj->objectId);
-+	inode = Y_IGET(sb, obj->objectId);
-+	if (IS_ERR(inode))
-+		return NULL;
- 
- 	/* NB Side effect: iget calls back to yaffs_read_inode(). */
- 	/* iget also increments the inode's i_count */
-@@ -854,7 +1025,7 @@ struct inode *yaffs_get_inode(struct sup
- }
- 
- static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
--				loff_t * pos)
-+				loff_t *pos)
- {
- 	yaffs_Object *obj;
- 	int nWritten, ipos;
-@@ -869,28 +1040,26 @@ static ssize_t yaffs_file_write(struct f
- 
- 	inode = f->f_dentry->d_inode;
- 
--	if (!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND) {
-+	if (!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND)
- 		ipos = inode->i_size;
--	} else {
-+	else
- 		ipos = *pos;
--	}
- 
--	if (!obj) {
-+	if (!obj)
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_file_write: hey obj is null!\n"));
--	} else {
-+			("yaffs_file_write: hey obj is null!\n"));
-+	else
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG
--		   "yaffs_file_write about to write writing %d bytes"
--		   "to object %d at %d\n",
--		   n, obj->objectId, ipos));
--	}
-+			("yaffs_file_write about to write writing %zu bytes"
-+			"to object %d at %d\n",
-+			n, obj->objectId, ipos));
- 
- 	nWritten = yaffs_WriteDataToFile(obj, buf, ipos, n, 0);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_file_write writing %d bytes, %d written at %d\n",
--	   n, nWritten, ipos));
-+		("yaffs_file_write writing %zu bytes, %d written at %d\n",
-+		n, nWritten, ipos));
-+
- 	if (nWritten > 0) {
- 		ipos += nWritten;
- 		*pos = ipos;
-@@ -899,10 +1068,9 @@ static ssize_t yaffs_file_write(struct f
- 			inode->i_blocks = (ipos + 511) >> 9;
- 
- 			T(YAFFS_TRACE_OS,
--			  (KERN_DEBUG
--			   "yaffs_file_write size updated to %d bytes, "
--			   "%d blocks\n",
--			   ipos, (int)(inode->i_blocks)));
-+				("yaffs_file_write size updated to %d bytes, "
-+				"%d blocks\n",
-+				ipos, (int)(inode->i_blocks)));
- 		}
- 
- 	}
-@@ -910,13 +1078,54 @@ static ssize_t yaffs_file_write(struct f
- 	return nWritten == 0 ? -ENOSPC : nWritten;
- }
- 
-+/* Space holding and freeing is done to ensure we have space available for write_begin/end */
-+/* For now we just assume few parallel writes and check against a small number. */
-+/* Todo: need to do this with a counter to handle parallel reads better */
-+
-+static ssize_t yaffs_hold_space(struct file *f)
-+{
-+	yaffs_Object *obj;
-+	yaffs_Device *dev;
-+
-+	int nFreeChunks;
-+
-+
-+	obj = yaffs_DentryToObject(f->f_dentry);
-+
-+	dev = obj->myDev;
-+
-+	yaffs_GrossLock(dev);
-+
-+	nFreeChunks = yaffs_GetNumberOfFreeChunks(dev);
-+
-+	yaffs_GrossUnlock(dev);
-+
-+	return (nFreeChunks > 20) ? 1 : 0;
-+}
-+
-+static void yaffs_release_space(struct file *f)
-+{
-+	yaffs_Object *obj;
-+	yaffs_Device *dev;
-+
-+
-+	obj = yaffs_DentryToObject(f->f_dentry);
-+
-+	dev = obj->myDev;
-+
-+	yaffs_GrossLock(dev);
-+
-+
-+	yaffs_GrossUnlock(dev);
-+}
-+
- static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
- {
- 	yaffs_Object *obj;
- 	yaffs_Device *dev;
- 	struct inode *inode = f->f_dentry->d_inode;
- 	unsigned long offset, curoffs;
--	struct list_head *i;
-+	struct ylist_head *i;
- 	yaffs_Object *l;
- 
- 	char name[YAFFS_MAX_NAME_LENGTH + 1];
-@@ -932,24 +1141,20 @@ static int yaffs_readdir(struct file *f,
- 
- 	if (offset == 0) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_readdir: entry . ino %d \n",
--		   (int)inode->i_ino));
--		if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR)
--		    < 0) {
-+			("yaffs_readdir: entry . ino %d \n",
-+			(int)inode->i_ino));
-+		if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR) < 0)
- 			goto out;
--		}
- 		offset++;
- 		f->f_pos++;
- 	}
- 	if (offset == 1) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_readdir: entry .. ino %d \n",
--		   (int)f->f_dentry->d_parent->d_inode->i_ino));
--		if (filldir
--		    (dirent, "..", 2, offset,
--		     f->f_dentry->d_parent->d_inode->i_ino, DT_DIR) < 0) {
-+			("yaffs_readdir: entry .. ino %d \n",
-+			(int)f->f_dentry->d_parent->d_inode->i_ino));
-+		if (filldir(dirent, "..", 2, offset,
-+			f->f_dentry->d_parent->d_inode->i_ino, DT_DIR) < 0)
- 			goto out;
--		}
- 		offset++;
- 		f->f_pos++;
- 	}
-@@ -965,35 +1170,32 @@ static int yaffs_readdir(struct file *f,
- 		f->f_version = inode->i_version;
- 	}
- 
--	list_for_each(i, &obj->variant.directoryVariant.children) {
-+	ylist_for_each(i, &obj->variant.directoryVariant.children) {
- 		curoffs++;
- 		if (curoffs >= offset) {
--			l = list_entry(i, yaffs_Object, siblings);
-+			l = ylist_entry(i, yaffs_Object, siblings);
- 
- 			yaffs_GetObjectName(l, name,
- 					    YAFFS_MAX_NAME_LENGTH + 1);
- 			T(YAFFS_TRACE_OS,
--			  (KERN_DEBUG "yaffs_readdir: %s inode %d\n", name,
-+			  ("yaffs_readdir: %s inode %d\n", name,
- 			   yaffs_GetObjectInode(l)));
- 
- 			if (filldir(dirent,
--				    name,
--				    strlen(name),
--				    offset,
--				    yaffs_GetObjectInode(l),
--				    yaffs_GetObjectType(l))
--			    < 0) {
-+					name,
-+					strlen(name),
-+					offset,
-+					yaffs_GetObjectInode(l),
-+					yaffs_GetObjectType(l)) < 0)
- 				goto up_and_out;
--			}
- 
- 			offset++;
- 			f->f_pos++;
- 		}
- 	}
- 
--      up_and_out:
--      out:
--
-+up_and_out:
-+out:
- 	yaffs_GrossUnlock(dev);
- 
- 	return 0;
-@@ -1002,12 +1204,19 @@ static int yaffs_readdir(struct file *f,
- /*
-  * File creation. Allocate an inode, and we're done..
-  */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
-+#define YCRED(x) x
-+#else
-+#define YCRED(x) (x->cred)
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
--		       dev_t rdev)
-+			dev_t rdev)
- #else
- static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
--		       int rdev)
-+			int rdev)
- #endif
- {
- 	struct inode *inode;
-@@ -1018,25 +1227,25 @@ static int yaffs_mknod(struct inode *dir
- 	yaffs_Object *parent = yaffs_InodeToObject(dir);
- 
- 	int error = -ENOSPC;
--	uid_t uid = current->fsuid;
--	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid;
-+	uid_t uid = YCRED(current)->fsuid;
-+	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
- 
--	if((dir->i_mode & S_ISGID) && S_ISDIR(mode))
-+	if ((dir->i_mode & S_ISGID) && S_ISDIR(mode))
- 		mode |= S_ISGID;
- 
- 	if (parent) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod: parent object %d type %d\n",
--		   parent->objectId, parent->variantType));
-+			("yaffs_mknod: parent object %d type %d\n",
-+			parent->objectId, parent->variantType));
- 	} else {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod: could not get parent object\n"));
-+			("yaffs_mknod: could not get parent object\n"));
- 		return -EPERM;
- 	}
- 
- 	T(YAFFS_TRACE_OS, ("yaffs_mknod: making oject for %s, "
--			   "mode %x dev %x\n",
--			   dentry->d_name.name, mode, rdev));
-+			"mode %x dev %x\n",
-+			dentry->d_name.name, mode, rdev));
- 
- 	dev = parent->myDev;
- 
-@@ -1045,33 +1254,28 @@ static int yaffs_mknod(struct inode *dir
- 	switch (mode & S_IFMT) {
- 	default:
- 		/* Special (socket, fifo, device...) */
--		T(YAFFS_TRACE_OS, (KERN_DEBUG
--				   "yaffs_mknod: making special\n"));
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
--		obj =
--		    yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
--				       gid, old_encode_dev(rdev));
--#else
--		obj =
--		    yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
--				       gid, rdev);
-+		T(YAFFS_TRACE_OS, ("yaffs_mknod: making special\n"));
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+		obj = yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
-+				gid, old_encode_dev(rdev));
-+#else
-+		obj = yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
-+				gid, rdev);
- #endif
- 		break;
- 	case S_IFREG:		/* file          */
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_mknod: making file\n"));
--		obj =
--		    yaffs_MknodFile(parent, dentry->d_name.name, mode, uid,
--				    gid);
-+		T(YAFFS_TRACE_OS, ("yaffs_mknod: making file\n"));
-+		obj = yaffs_MknodFile(parent, dentry->d_name.name, mode, uid,
-+				gid);
- 		break;
- 	case S_IFDIR:		/* directory */
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod: making directory\n"));
--		obj =
--		    yaffs_MknodDirectory(parent, dentry->d_name.name, mode,
--					 uid, gid);
-+			("yaffs_mknod: making directory\n"));
-+		obj = yaffs_MknodDirectory(parent, dentry->d_name.name, mode,
-+					uid, gid);
- 		break;
- 	case S_IFLNK:		/* symlink */
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_mknod: making file\n"));
-+		T(YAFFS_TRACE_OS, ("yaffs_mknod: making symlink\n"));
- 		obj = NULL;	/* Do we ever get here? */
- 		break;
- 	}
-@@ -1083,12 +1287,12 @@ static int yaffs_mknod(struct inode *dir
- 		inode = yaffs_get_inode(dir->i_sb, mode, rdev, obj);
- 		d_instantiate(dentry, inode);
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod created object %d count = %d\n",
--		   obj->objectId, atomic_read(&inode->i_count)));
-+			("yaffs_mknod created object %d count = %d\n",
-+			obj->objectId, atomic_read(&inode->i_count)));
- 		error = 0;
- 	} else {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod failed making object\n"));
-+			("yaffs_mknod failed making object\n"));
- 		error = -ENOMEM;
- 	}
- 
-@@ -1098,25 +1302,19 @@ static int yaffs_mknod(struct inode *dir
- static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
- {
- 	int retVal;
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_mkdir\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_mkdir\n"));
- 	retVal = yaffs_mknod(dir, dentry, mode | S_IFDIR, 0);
--#if 0
--	/* attempt to fix dir bug - didn't work */
--	if (!retVal) {
--		dget(dentry);
--	}
--#endif
- 	return retVal;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
- 			struct nameidata *n)
- #else
- static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode)
- #endif
- {
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_create\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_create\n"));
- 	return yaffs_mknod(dir, dentry, mode | S_IFREG, 0);
- }
- 
-@@ -1127,8 +1325,8 @@ static int yaffs_unlink(struct inode *di
- 	yaffs_Device *dev;
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_unlink %d:%s\n", (int)(dir->i_ino),
--	   dentry->d_name.name));
-+		("yaffs_unlink %d:%s\n", (int)(dir->i_ino),
-+		dentry->d_name.name));
- 
- 	dev = yaffs_InodeToObject(dir)->myDev;
- 
-@@ -1151,82 +1349,74 @@ static int yaffs_unlink(struct inode *di
-  * Create a link...
-  */
- static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
--		      struct dentry *dentry)
-+			struct dentry *dentry)
- {
- 	struct inode *inode = old_dentry->d_inode;
- 	yaffs_Object *obj = NULL;
- 	yaffs_Object *link = NULL;
- 	yaffs_Device *dev;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_link\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_link\n"));
- 
- 	obj = yaffs_InodeToObject(inode);
- 	dev = obj->myDev;
- 
- 	yaffs_GrossLock(dev);
- 
--	if (!S_ISDIR(inode->i_mode))	/* Don't link directories */
--	{
--		link =
--		    yaffs_Link(yaffs_InodeToObject(dir), dentry->d_name.name,
--			       obj);
--	}
-+	if (!S_ISDIR(inode->i_mode))		/* Don't link directories */
-+		link = yaffs_Link(yaffs_InodeToObject(dir), dentry->d_name.name,
-+			obj);
- 
- 	if (link) {
- 		old_dentry->d_inode->i_nlink = yaffs_GetObjectLinkCount(obj);
- 		d_instantiate(dentry, old_dentry->d_inode);
- 		atomic_inc(&old_dentry->d_inode->i_count);
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_link link count %d i_count %d\n",
--		   old_dentry->d_inode->i_nlink,
--		   atomic_read(&old_dentry->d_inode->i_count)));
--
-+			("yaffs_link link count %d i_count %d\n",
-+			old_dentry->d_inode->i_nlink,
-+			atomic_read(&old_dentry->d_inode->i_count)));
- 	}
- 
- 	yaffs_GrossUnlock(dev);
- 
--	if (link) {
--
-+	if (link)
- 		return 0;
--	}
- 
- 	return -EPERM;
- }
- 
- static int yaffs_symlink(struct inode *dir, struct dentry *dentry,
--			 const char *symname)
-+				const char *symname)
- {
- 	yaffs_Object *obj;
- 	yaffs_Device *dev;
--	uid_t uid = current->fsuid;
--	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid;
-+	uid_t uid = YCRED(current)->fsuid;
-+	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_symlink\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_symlink\n"));
- 
- 	dev = yaffs_InodeToObject(dir)->myDev;
- 	yaffs_GrossLock(dev);
- 	obj = yaffs_MknodSymLink(yaffs_InodeToObject(dir), dentry->d_name.name,
--				 S_IFLNK | S_IRWXUGO, uid, gid, symname);
-+				S_IFLNK | S_IRWXUGO, uid, gid, symname);
- 	yaffs_GrossUnlock(dev);
- 
- 	if (obj) {
--
- 		struct inode *inode;
- 
- 		inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
- 		d_instantiate(dentry, inode);
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "symlink created OK\n"));
-+		T(YAFFS_TRACE_OS, ("symlink created OK\n"));
- 		return 0;
- 	} else {
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "symlink not created\n"));
--
-+		T(YAFFS_TRACE_OS, ("symlink not created\n"));
- 	}
- 
- 	return -ENOMEM;
- }
- 
- static int yaffs_sync_object(struct file *file, struct dentry *dentry,
--			     int datasync)
-+				int datasync)
- {
- 
- 	yaffs_Object *obj;
-@@ -1236,7 +1426,7 @@ static int yaffs_sync_object(struct file
- 
- 	dev = obj->myDev;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_sync_object\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_sync_object\n"));
- 	yaffs_GrossLock(dev);
- 	yaffs_FlushFile(obj, 1);
- 	yaffs_GrossUnlock(dev);
-@@ -1255,41 +1445,36 @@ static int yaffs_rename(struct inode *ol
- 	int retVal = YAFFS_FAIL;
- 	yaffs_Object *target;
- 
--        T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_rename\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_rename\n"));
- 	dev = yaffs_InodeToObject(old_dir)->myDev;
- 
- 	yaffs_GrossLock(dev);
- 
- 	/* Check if the target is an existing directory that is not empty. */
--	target =
--	    yaffs_FindObjectByName(yaffs_InodeToObject(new_dir),
--				   new_dentry->d_name.name);
-+	target = yaffs_FindObjectByName(yaffs_InodeToObject(new_dir),
-+				new_dentry->d_name.name);
- 
- 
- 
--	if (target &&
--	    target->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
--	    !list_empty(&target->variant.directoryVariant.children)) {
-+	if (target && target->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
-+		!ylist_empty(&target->variant.directoryVariant.children)) {
- 
--	        T(YAFFS_TRACE_OS, (KERN_DEBUG "target is non-empty dir\n"));
-+		T(YAFFS_TRACE_OS, ("target is non-empty dir\n"));
- 
- 		retVal = YAFFS_FAIL;
- 	} else {
--
- 		/* Now does unlinking internally using shadowing mechanism */
--	        T(YAFFS_TRACE_OS, (KERN_DEBUG "calling yaffs_RenameObject\n"));
--
--		retVal =
--		    yaffs_RenameObject(yaffs_InodeToObject(old_dir),
--				       old_dentry->d_name.name,
--				       yaffs_InodeToObject(new_dir),
--				       new_dentry->d_name.name);
-+		T(YAFFS_TRACE_OS, ("calling yaffs_RenameObject\n"));
- 
-+		retVal = yaffs_RenameObject(yaffs_InodeToObject(old_dir),
-+				old_dentry->d_name.name,
-+				yaffs_InodeToObject(new_dir),
-+				new_dentry->d_name.name);
- 	}
- 	yaffs_GrossUnlock(dev);
- 
- 	if (retVal == YAFFS_OK) {
--		if(target) {
-+		if (target) {
- 			new_dentry->d_inode->i_nlink--;
- 			mark_inode_dirty(new_dentry->d_inode);
- 		}
-@@ -1298,7 +1483,6 @@ static int yaffs_rename(struct inode *ol
- 	} else {
- 		return -ENOTEMPTY;
- 	}
--
- }
- 
- static int yaffs_setattr(struct dentry *dentry, struct iattr *attr)
-@@ -1308,15 +1492,15 @@ static int yaffs_setattr(struct dentry *
- 	yaffs_Device *dev;
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_setattr of object %d\n",
--	   yaffs_InodeToObject(inode)->objectId));
--
--	if ((error = inode_change_ok(inode, attr)) == 0) {
-+		("yaffs_setattr of object %d\n",
-+		yaffs_InodeToObject(inode)->objectId));
- 
-+	error = inode_change_ok(inode, attr);
-+	if (error == 0) {
- 		dev = yaffs_InodeToObject(inode)->myDev;
- 		yaffs_GrossLock(dev);
- 		if (yaffs_SetAttributes(yaffs_InodeToObject(inode), attr) ==
--		    YAFFS_OK) {
-+				YAFFS_OK) {
- 			error = 0;
- 		} else {
- 			error = -EPERM;
-@@ -1328,12 +1512,12 @@ static int yaffs_setattr(struct dentry *
- 	return error;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf)
- {
- 	yaffs_Device *dev = yaffs_DentryToObject(dentry)->myDev;
- 	struct super_block *sb = dentry->d_sb;
--#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf)
- {
- 	yaffs_Device *dev = yaffs_SuperToDevice(sb);
-@@ -1343,32 +1527,53 @@ static int yaffs_statfs(struct super_blo
- 	yaffs_Device *dev = yaffs_SuperToDevice(sb);
- #endif
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_statfs\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_statfs\n"));
- 
- 	yaffs_GrossLock(dev);
- 
- 	buf->f_type = YAFFS_MAGIC;
- 	buf->f_bsize = sb->s_blocksize;
- 	buf->f_namelen = 255;
--	if (sb->s_blocksize > dev->nDataBytesPerChunk) {
-+
-+	if (dev->nDataBytesPerChunk & (dev->nDataBytesPerChunk - 1)) {
-+		/* Do this if chunk size is not a power of 2 */
-+
-+		uint64_t bytesInDev;
-+		uint64_t bytesFree;
-+
-+		bytesInDev = ((uint64_t)((dev->endBlock - dev->startBlock + 1))) *
-+			((uint64_t)(dev->nChunksPerBlock * dev->nDataBytesPerChunk));
-+
-+		do_div(bytesInDev, sb->s_blocksize); /* bytesInDev becomes the number of blocks */
-+		buf->f_blocks = bytesInDev;
-+
-+		bytesFree  = ((uint64_t)(yaffs_GetNumberOfFreeChunks(dev))) *
-+			((uint64_t)(dev->nDataBytesPerChunk));
-+
-+		do_div(bytesFree, sb->s_blocksize);
-+
-+		buf->f_bfree = bytesFree;
-+
-+	} else if (sb->s_blocksize > dev->nDataBytesPerChunk) {
- 
- 		buf->f_blocks =
--		    (dev->endBlock - dev->startBlock +
--		     1) * dev->nChunksPerBlock / (sb->s_blocksize /
--						  dev->nDataBytesPerChunk);
-+			(dev->endBlock - dev->startBlock + 1) *
-+			dev->nChunksPerBlock /
-+			(sb->s_blocksize / dev->nDataBytesPerChunk);
- 		buf->f_bfree =
--		    yaffs_GetNumberOfFreeChunks(dev) / (sb->s_blocksize /
--							dev->nDataBytesPerChunk);
-+			yaffs_GetNumberOfFreeChunks(dev) /
-+			(sb->s_blocksize / dev->nDataBytesPerChunk);
- 	} else {
--
- 		buf->f_blocks =
--		    (dev->endBlock - dev->startBlock +
--		     1) * dev->nChunksPerBlock * (dev->nDataBytesPerChunk /
--						  sb->s_blocksize);
-+			(dev->endBlock - dev->startBlock + 1) *
-+			dev->nChunksPerBlock *
-+			(dev->nDataBytesPerChunk / sb->s_blocksize);
-+
- 		buf->f_bfree =
--		    yaffs_GetNumberOfFreeChunks(dev) * (dev->nDataBytesPerChunk /
--							sb->s_blocksize);
-+			yaffs_GetNumberOfFreeChunks(dev) *
-+			(dev->nDataBytesPerChunk / sb->s_blocksize);
- 	}
-+
- 	buf->f_files = 0;
- 	buf->f_ffree = 0;
- 	buf->f_bavail = buf->f_bfree;
-@@ -1378,18 +1583,19 @@ static int yaffs_statfs(struct super_blo
- }
- 
- 
--/**
- static int yaffs_do_sync_fs(struct super_block *sb)
- {
- 
- 	yaffs_Device *dev = yaffs_SuperToDevice(sb);
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_do_sync_fs\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_do_sync_fs\n"));
- 
--	if(sb->s_dirt) {
-+	if (sb->s_dirt) {
- 		yaffs_GrossLock(dev);
- 
--		if(dev)
-+		if (dev) {
-+			yaffs_FlushEntireDeviceCache(dev);
- 			yaffs_CheckpointSave(dev);
-+		}
- 
- 		yaffs_GrossUnlock(dev);
- 
-@@ -1397,35 +1603,73 @@ static int yaffs_do_sync_fs(struct super
- 	}
- 	return 0;
- }
--**/
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static void yaffs_write_super(struct super_block *sb)
- #else
- static int yaffs_write_super(struct super_block *sb)
- #endif
- {
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_write_super\n"));
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18))
--	return 0; /* yaffs_do_sync_fs(sb);*/
-+	T(YAFFS_TRACE_OS, ("yaffs_write_super\n"));
-+	if (yaffs_auto_checkpoint >= 2)
-+		yaffs_do_sync_fs(sb);
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18))
-+	return 0;
- #endif
- }
- 
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_sync_fs(struct super_block *sb, int wait)
- #else
- static int yaffs_sync_fs(struct super_block *sb)
- #endif
- {
-+	T(YAFFS_TRACE_OS, ("yaffs_sync_fs\n"));
-+
-+	if (yaffs_auto_checkpoint >= 1)
-+		yaffs_do_sync_fs(sb);
-+
-+	return 0;
-+}
-+
-+#ifdef YAFFS_USE_OWN_IGET
-+
-+static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino)
-+{
-+	struct inode *inode;
-+	yaffs_Object *obj;
-+	yaffs_Device *dev = yaffs_SuperToDevice(sb);
-+
-+	T(YAFFS_TRACE_OS,
-+		("yaffs_iget for %lu\n", ino));
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_sync_fs\n"));
-+	inode = iget_locked(sb, ino);
-+	if (!inode)
-+		return ERR_PTR(-ENOMEM);
-+	if (!(inode->i_state & I_NEW))
-+		return inode;
-+
-+	/* NB This is called as a side effect of other functions, but
-+	 * we had to release the lock to prevent deadlocks, so
-+	 * need to lock again.
-+	 */
- 
--	return 0; /* yaffs_do_sync_fs(sb);*/
-+	yaffs_GrossLock(dev);
- 
-+	obj = yaffs_FindObjectByNumber(dev, inode->i_ino);
-+
-+	yaffs_FillInodeFromObject(inode, obj);
-+
-+	yaffs_GrossUnlock(dev);
-+
-+	unlock_new_inode(inode);
-+	return inode;
- }
- 
-+#else
- 
- static void yaffs_read_inode(struct inode *inode)
- {
-@@ -1438,7 +1682,7 @@ static void yaffs_read_inode(struct inod
- 	yaffs_Device *dev = yaffs_SuperToDevice(inode->i_sb);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_read_inode for %d\n", (int)inode->i_ino));
-+		("yaffs_read_inode for %d\n", (int)inode->i_ino));
- 
- 	yaffs_GrossLock(dev);
- 
-@@ -1449,18 +1693,20 @@ static void yaffs_read_inode(struct inod
- 	yaffs_GrossUnlock(dev);
- }
- 
--static LIST_HEAD(yaffs_dev_list);
-+#endif
-+
-+static YLIST_HEAD(yaffs_dev_list);
- 
--#if 0 // not used
-+#if 0 /* not used */
- static int yaffs_remount_fs(struct super_block *sb, int *flags, char *data)
- {
- 	yaffs_Device    *dev = yaffs_SuperToDevice(sb);
- 
--	if( *flags & MS_RDONLY ) {
-+	if (*flags & MS_RDONLY) {
- 		struct mtd_info *mtd = yaffs_SuperToDevice(sb)->genericDevice;
- 
- 		T(YAFFS_TRACE_OS,
--			(KERN_DEBUG "yaffs_remount_fs: %s: RO\n", dev->name ));
-+			("yaffs_remount_fs: %s: RO\n", dev->name));
- 
- 		yaffs_GrossLock(dev);
- 
-@@ -1472,10 +1718,9 @@ static int yaffs_remount_fs(struct super
- 			mtd->sync(mtd);
- 
- 		yaffs_GrossUnlock(dev);
--	}
--	else {
-+	} else {
- 		T(YAFFS_TRACE_OS,
--			(KERN_DEBUG "yaffs_remount_fs: %s: RW\n", dev->name ));
-+			("yaffs_remount_fs: %s: RW\n", dev->name));
- 	}
- 
- 	return 0;
-@@ -1486,7 +1731,7 @@ static void yaffs_put_super(struct super
- {
- 	yaffs_Device *dev = yaffs_SuperToDevice(sb);
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_put_super\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_put_super\n"));
- 
- 	yaffs_GrossLock(dev);
- 
-@@ -1494,18 +1739,17 @@ static void yaffs_put_super(struct super
- 
- 	yaffs_CheckpointSave(dev);
- 
--	if (dev->putSuperFunc) {
-+	if (dev->putSuperFunc)
- 		dev->putSuperFunc(sb);
--	}
- 
- 	yaffs_Deinitialise(dev);
- 
- 	yaffs_GrossUnlock(dev);
- 
- 	/* we assume this is protected by lock_kernel() in mount/umount */
--	list_del(&dev->devList);
-+	ylist_del(&dev->devList);
- 
--	if(dev->spareBuffer){
-+	if (dev->spareBuffer) {
- 		YFREE(dev->spareBuffer);
- 		dev->spareBuffer = NULL;
- 	}
-@@ -1516,12 +1760,10 @@ static void yaffs_put_super(struct super
- 
- static void yaffs_MTDPutSuper(struct super_block *sb)
- {
--
- 	struct mtd_info *mtd = yaffs_SuperToDevice(sb)->genericDevice;
- 
--	if (mtd->sync) {
-+	if (mtd->sync)
- 		mtd->sync(mtd);
--	}
- 
- 	put_mtd_device(mtd);
- }
-@@ -1531,9 +1773,9 @@ static void yaffs_MarkSuperBlockDirty(vo
- {
- 	struct super_block *sb = (struct super_block *)vsb;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_MarkSuperBlockDirty() sb = %p\n",sb));
--//	if(sb)
--//		sb->s_dirt = 1;
-+	T(YAFFS_TRACE_OS, ("yaffs_MarkSuperBlockDirty() sb = %p\n", sb));
-+	if (sb)
-+		sb->s_dirt = 1;
- }
- 
- typedef struct {
-@@ -1546,48 +1788,48 @@ typedef struct {
- #define MAX_OPT_LEN 20
- static int yaffs_parse_options(yaffs_options *options, const char *options_str)
- {
--	char cur_opt[MAX_OPT_LEN+1];
-+	char cur_opt[MAX_OPT_LEN + 1];
- 	int p;
- 	int error = 0;
- 
- 	/* Parse through the options which is a comma seperated list */
- 
--	while(options_str && *options_str && !error){
--		memset(cur_opt,0,MAX_OPT_LEN+1);
-+	while (options_str && *options_str && !error) {
-+		memset(cur_opt, 0, MAX_OPT_LEN + 1);
- 		p = 0;
- 
--		while(*options_str && *options_str != ','){
--			if(p < MAX_OPT_LEN){
-+		while (*options_str && *options_str != ',') {
-+			if (p < MAX_OPT_LEN) {
- 				cur_opt[p] = *options_str;
- 				p++;
- 			}
- 			options_str++;
- 		}
- 
--		if(!strcmp(cur_opt,"inband-tags"))
-+		if (!strcmp(cur_opt, "inband-tags"))
- 			options->inband_tags = 1;
--		else if(!strcmp(cur_opt,"no-cache"))
-+		else if (!strcmp(cur_opt, "no-cache"))
- 			options->no_cache = 1;
--		else if(!strcmp(cur_opt,"no-checkpoint-read"))
-+		else if (!strcmp(cur_opt, "no-checkpoint-read"))
- 			options->skip_checkpoint_read = 1;
--		else if(!strcmp(cur_opt,"no-checkpoint-write"))
-+		else if (!strcmp(cur_opt, "no-checkpoint-write"))
- 			options->skip_checkpoint_write = 1;
--		else if(!strcmp(cur_opt,"no-checkpoint")){
-+		else if (!strcmp(cur_opt, "no-checkpoint")) {
- 			options->skip_checkpoint_read = 1;
- 			options->skip_checkpoint_write = 1;
- 		} else {
--			printk(KERN_INFO "yaffs: Bad mount option \"%s\"\n",cur_opt);
-+			printk(KERN_INFO "yaffs: Bad mount option \"%s\"\n",
-+					cur_opt);
- 			error = 1;
- 		}
--
- 	}
- 
- 	return error;
- }
- 
- static struct super_block *yaffs_internal_read_super(int yaffsVersion,
--						     struct super_block *sb,
--						     void *data, int silent)
-+						struct super_block *sb,
-+						void *data, int silent)
- {
- 	int nBlocks;
- 	struct inode *inode = NULL;
-@@ -1602,6 +1844,7 @@ static struct super_block *yaffs_interna
- 
- 	sb->s_magic = YAFFS_MAGIC;
- 	sb->s_op = &yaffs_super_ops;
-+	sb->s_flags |= MS_NOATIME;
- 
- 	if (!sb)
- 		printk(KERN_INFO "yaffs: sb is NULL\n");
-@@ -1614,14 +1857,14 @@ static struct super_block *yaffs_interna
- 		       sb->s_dev,
- 		       yaffs_devname(sb, devname_buf));
- 
--	if(!data_str)
-+	if (!data_str)
- 		data_str = "";
- 
--	printk(KERN_INFO "yaffs: passed flags \"%s\"\n",data_str);
-+	printk(KERN_INFO "yaffs: passed flags \"%s\"\n", data_str);
- 
--	memset(&options,0,sizeof(options));
-+	memset(&options, 0, sizeof(options));
- 
--	if(yaffs_parse_options(&options,data_str)){
-+	if (yaffs_parse_options(&options, data_str)) {
- 		/* Option parsing failed */
- 		return NULL;
- 	}
-@@ -1645,9 +1888,9 @@ static struct super_block *yaffs_interna
- 			       yaffs_devname(sb, devname_buf)));
- 
- 	/* Check it's an mtd device..... */
--	if (MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR) {
-+	if (MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR)
- 		return NULL;	/* This isn't an mtd device */
--	}
-+
- 	/* Get the device */
- 	mtd = get_mtd_device(NULL, MINOR(sb->s_dev));
- 	if (!mtd) {
-@@ -1673,29 +1916,23 @@ static struct super_block *yaffs_interna
- 	T(YAFFS_TRACE_OS, (" %s %d\n", WRITE_SIZE_STR, WRITE_SIZE(mtd)));
- 	T(YAFFS_TRACE_OS, (" oobsize %d\n", mtd->oobsize));
- 	T(YAFFS_TRACE_OS, (" erasesize %d\n", mtd->erasesize));
--	T(YAFFS_TRACE_OS, (" size %d\n", mtd->size));
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
-+	T(YAFFS_TRACE_OS, (" size %u\n", mtd->size));
-+#else
-+	T(YAFFS_TRACE_OS, (" size %lld\n", mtd->size));
-+#endif
- 
- #ifdef CONFIG_YAFFS_AUTO_YAFFS2
- 
--	if (yaffsVersion == 1 &&
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--	    mtd->writesize >= 2048) {
--#else
--	    mtd->oobblock >= 2048) {
--#endif
--	    T(YAFFS_TRACE_ALWAYS,("yaffs: auto selecting yaffs2\n"));
--	    yaffsVersion = 2;
-+	if (yaffsVersion == 1 && WRITE_SIZE(mtd) >= 2048) {
-+		T(YAFFS_TRACE_ALWAYS, ("yaffs: auto selecting yaffs2\n"));
-+		yaffsVersion = 2;
- 	}
- 
- 	/* Added NCB 26/5/2006 for completeness */
--	if (yaffsVersion == 2 &&
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--	    mtd->writesize == 512) {
--#else
--	    mtd->oobblock == 512) {
--#endif
--	    T(YAFFS_TRACE_ALWAYS,("yaffs: auto selecting yaffs1\n"));
--	    yaffsVersion = 1;
-+	if (yaffsVersion == 2 && !options.inband_tags && WRITE_SIZE(mtd) == 512) {
-+		T(YAFFS_TRACE_ALWAYS, ("yaffs: auto selecting yaffs1\n"));
-+		yaffsVersion = 1;
- 	}
- 
- #endif
-@@ -1707,7 +1944,7 @@ static struct super_block *yaffs_interna
- 		    !mtd->block_markbad ||
- 		    !mtd->read ||
- 		    !mtd->write ||
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- 		    !mtd->read_oob || !mtd->write_oob) {
- #else
- 		    !mtd->write_ecc ||
-@@ -1719,12 +1956,9 @@ static struct super_block *yaffs_interna
- 			return NULL;
- 		}
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--		if (mtd->writesize < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
--#else
--		if (mtd->oobblock < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
--#endif
--		    mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) {
-+		if ((WRITE_SIZE(mtd) < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
-+		    mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) &&
-+		    !options.inband_tags) {
- 			T(YAFFS_TRACE_ALWAYS,
- 			  ("yaffs: MTD device does not have the "
- 			   "right page sizes\n"));
-@@ -1735,7 +1969,7 @@ static struct super_block *yaffs_interna
- 		if (!mtd->erase ||
- 		    !mtd->read ||
- 		    !mtd->write ||
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- 		    !mtd->read_oob || !mtd->write_oob) {
- #else
- 		    !mtd->write_ecc ||
-@@ -1761,7 +1995,7 @@ static struct super_block *yaffs_interna
- 	 * Set the yaffs_Device up for mtd
- 	 */
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 	sb->s_fs_info = dev = kmalloc(sizeof(yaffs_Device), GFP_KERNEL);
- #else
- 	sb->u.generic_sbp = dev = kmalloc(sizeof(yaffs_Device), GFP_KERNEL);
-@@ -1780,13 +2014,15 @@ static struct super_block *yaffs_interna
- 
- 	/* Set up the memory size parameters.... */
- 
--	nBlocks = mtd->size / (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK);
-+	nBlocks = YCALCBLOCKS(mtd->size, (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK));
-+
- 	dev->startBlock = 0;
- 	dev->endBlock = nBlocks - 1;
- 	dev->nChunksPerBlock = YAFFS_CHUNKS_PER_BLOCK;
--	dev->nDataBytesPerChunk = YAFFS_BYTES_PER_CHUNK;
-+	dev->totalBytesPerChunk = YAFFS_BYTES_PER_CHUNK;
- 	dev->nReservedBlocks = 5;
- 	dev->nShortOpCaches = (options.no_cache) ? 0 : 10;
-+	dev->inbandTags = options.inband_tags;
- 
- 	/* ... and the functions. */
- 	if (yaffsVersion == 2) {
-@@ -1798,20 +2034,19 @@ static struct super_block *yaffs_interna
- 		dev->queryNANDBlock = nandmtd2_QueryNANDBlock;
- 		dev->spareBuffer = YMALLOC(mtd->oobsize);
- 		dev->isYaffs2 = 1;
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--		dev->nDataBytesPerChunk = mtd->writesize;
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+		dev->totalBytesPerChunk = mtd->writesize;
- 		dev->nChunksPerBlock = mtd->erasesize / mtd->writesize;
- #else
--		dev->nDataBytesPerChunk = mtd->oobblock;
-+		dev->totalBytesPerChunk = mtd->oobblock;
- 		dev->nChunksPerBlock = mtd->erasesize / mtd->oobblock;
- #endif
--		nBlocks = mtd->size / mtd->erasesize;
-+		nBlocks = YCALCBLOCKS(mtd->size, mtd->erasesize);
- 
--		dev->nCheckpointReservedBlocks = CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS;
- 		dev->startBlock = 0;
- 		dev->endBlock = nBlocks - 1;
- 	} else {
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- 		/* use the MTD interface in yaffs_mtdif1.c */
- 		dev->writeChunkWithTagsToNAND =
- 			nandmtd1_WriteChunkWithTagsToNAND;
-@@ -1847,7 +2082,7 @@ static struct super_block *yaffs_interna
- 	dev->skipCheckpointWrite = options.skip_checkpoint_write;
- 
- 	/* we assume this is protected by lock_kernel() in mount/umount */
--	list_add_tail(&dev->devList, &yaffs_dev_list);
-+	ylist_add_tail(&dev->devList, &yaffs_dev_list);
- 
- 	init_MUTEX(&dev->grossLock);
- 
-@@ -1884,20 +2119,23 @@ static struct super_block *yaffs_interna
- 		return NULL;
- 	}
- 	sb->s_root = root;
-+	sb->s_dirt = !dev->isCheckpointed;
-+	T(YAFFS_TRACE_ALWAYS,
-+	  ("yaffs_read_super: isCheckpointed %d\n", dev->isCheckpointed));
- 
- 	T(YAFFS_TRACE_OS, ("yaffs_read_super: done\n"));
- 	return sb;
- }
- 
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_internal_read_super_mtd(struct super_block *sb, void *data,
- 					 int silent)
- {
- 	return yaffs_internal_read_super(1, sb, data, silent) ? 0 : -EINVAL;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_read_super(struct file_system_type *fs,
- 			    int flags, const char *dev_name,
- 			    void *data, struct vfsmount *mnt)
-@@ -1938,14 +2176,14 @@ static DECLARE_FSTYPE(yaffs_fs_type, "ya
- 
- #ifdef CONFIG_YAFFS_YAFFS2
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs2_internal_read_super_mtd(struct super_block *sb, void *data,
- 					  int silent)
- {
- 	return yaffs_internal_read_super(2, sb, data, silent) ? 0 : -EINVAL;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs2_read_super(struct file_system_type *fs,
- 			int flags, const char *dev_name, void *data,
- 			struct vfsmount *mnt)
-@@ -1990,12 +2228,12 @@ static char *yaffs_dump_dev(char *buf, y
- {
- 	buf += sprintf(buf, "startBlock......... %d\n", dev->startBlock);
- 	buf += sprintf(buf, "endBlock........... %d\n", dev->endBlock);
-+	buf += sprintf(buf, "totalBytesPerChunk. %d\n", dev->totalBytesPerChunk);
- 	buf += sprintf(buf, "nDataBytesPerChunk. %d\n", dev->nDataBytesPerChunk);
- 	buf += sprintf(buf, "chunkGroupBits..... %d\n", dev->chunkGroupBits);
- 	buf += sprintf(buf, "chunkGroupSize..... %d\n", dev->chunkGroupSize);
- 	buf += sprintf(buf, "nErasedBlocks...... %d\n", dev->nErasedBlocks);
- 	buf += sprintf(buf, "nReservedBlocks.... %d\n", dev->nReservedBlocks);
--	buf += sprintf(buf, "nCheckptResBlocks.. %d\n", dev->nCheckpointReservedBlocks);
- 	buf += sprintf(buf, "blocksInCheckpoint. %d\n", dev->blocksInCheckpoint);
- 	buf += sprintf(buf, "nTnodesCreated..... %d\n", dev->nTnodesCreated);
- 	buf += sprintf(buf, "nFreeTnodes........ %d\n", dev->nFreeTnodes);
-@@ -2006,10 +2244,8 @@ static char *yaffs_dump_dev(char *buf, y
- 	buf += sprintf(buf, "nPageReads......... %d\n", dev->nPageReads);
- 	buf += sprintf(buf, "nBlockErasures..... %d\n", dev->nBlockErasures);
- 	buf += sprintf(buf, "nGCCopies.......... %d\n", dev->nGCCopies);
--	buf +=
--	    sprintf(buf, "garbageCollections. %d\n", dev->garbageCollections);
--	buf +=
--	    sprintf(buf, "passiveGCs......... %d\n",
-+	buf += sprintf(buf, "garbageCollections. %d\n", dev->garbageCollections);
-+	buf += sprintf(buf, "passiveGCs......... %d\n",
- 		    dev->passiveGarbageCollections);
- 	buf += sprintf(buf, "nRetriedWrites..... %d\n", dev->nRetriedWrites);
- 	buf += sprintf(buf, "nShortOpCaches..... %d\n", dev->nShortOpCaches);
-@@ -2025,6 +2261,7 @@ static char *yaffs_dump_dev(char *buf, y
- 	    sprintf(buf, "nBackgroudDeletions %d\n", dev->nBackgroundDeletions);
- 	buf += sprintf(buf, "useNANDECC......... %d\n", dev->useNANDECC);
- 	buf += sprintf(buf, "isYaffs2........... %d\n", dev->isYaffs2);
-+	buf += sprintf(buf, "inbandTags......... %d\n", dev->inbandTags);
- 
- 	return buf;
- }
-@@ -2033,7 +2270,7 @@ static int yaffs_proc_read(char *page,
- 			   char **start,
- 			   off_t offset, int count, int *eof, void *data)
- {
--	struct list_head *item;
-+	struct ylist_head *item;
- 	char *buf = page;
- 	int step = offset;
- 	int n = 0;
-@@ -2057,8 +2294,8 @@ static int yaffs_proc_read(char *page,
- 	lock_kernel();
- 
- 	/* Locate and print the Nth entry.  Order N-squared but N is small. */
--	list_for_each(item, &yaffs_dev_list) {
--		yaffs_Device *dev = list_entry(item, yaffs_Device, devList);
-+	ylist_for_each(item, &yaffs_dev_list) {
-+		yaffs_Device *dev = ylist_entry(item, yaffs_Device, devList);
- 		if (n < step) {
- 			n++;
- 			continue;
-@@ -2119,7 +2356,7 @@ static int yaffs_proc_write(struct file 
- 	char *end;
- 	char *mask_name;
- 	const char *x;
--	char substring[MAX_MASK_NAME_LENGTH+1];
-+	char substring[MAX_MASK_NAME_LENGTH + 1];
- 	int i;
- 	int done = 0;
- 	int add, len = 0;
-@@ -2129,9 +2366,8 @@ static int yaffs_proc_write(struct file 
- 
- 	while (!done && (pos < count)) {
- 		done = 1;
--		while ((pos < count) && isspace(buf[pos])) {
-+		while ((pos < count) && isspace(buf[pos]))
- 			pos++;
--		}
- 
- 		switch (buf[pos]) {
- 		case '+':
-@@ -2148,20 +2384,21 @@ static int yaffs_proc_write(struct file 
- 		mask_name = NULL;
- 
- 		mask_bitfield = simple_strtoul(buf + pos, &end, 0);
-+
- 		if (end > buf + pos) {
- 			mask_name = "numeral";
- 			len = end - (buf + pos);
- 			pos += len;
- 			done = 0;
- 		} else {
--			for(x = buf + pos, i = 0;
--			    (*x == '_' || (*x >='a' && *x <= 'z')) &&
--			    i <MAX_MASK_NAME_LENGTH; x++, i++, pos++)
--			    substring[i] = *x;
-+			for (x = buf + pos, i = 0;
-+			    (*x == '_' || (*x >= 'a' && *x <= 'z')) &&
-+			    i < MAX_MASK_NAME_LENGTH; x++, i++, pos++)
-+				substring[i] = *x;
- 			substring[i] = '\0';
- 
- 			for (i = 0; mask_flags[i].mask_name != NULL; i++) {
--				if(strcmp(substring,mask_flags[i].mask_name) == 0){
-+				if (strcmp(substring, mask_flags[i].mask_name) == 0) {
- 					mask_name = mask_flags[i].mask_name;
- 					mask_bitfield = mask_flags[i].mask_bitfield;
- 					done = 0;
-@@ -2172,7 +2409,7 @@ static int yaffs_proc_write(struct file 
- 
- 		if (mask_name != NULL) {
- 			done = 0;
--			switch(add) {
-+			switch (add) {
- 			case '-':
- 				rg &= ~mask_bitfield;
- 				break;
-@@ -2191,13 +2428,13 @@ static int yaffs_proc_write(struct file 
- 
- 	yaffs_traceMask = rg | YAFFS_TRACE_ALWAYS;
- 
--	printk("new trace = 0x%08X\n",yaffs_traceMask);
-+	printk(KERN_DEBUG "new trace = 0x%08X\n", yaffs_traceMask);
- 
- 	if (rg & YAFFS_TRACE_ALWAYS) {
- 		for (i = 0; mask_flags[i].mask_name != NULL; i++) {
- 			char flag;
- 			flag = ((rg & mask_flags[i].mask_bitfield) == mask_flags[i].mask_bitfield) ? '+' : '-';
--			printk("%c%s\n", flag, mask_flags[i].mask_name);
-+			printk(KERN_DEBUG "%c%s\n", flag, mask_flags[i].mask_name);
- 		}
- 	}
- 
-@@ -2211,12 +2448,8 @@ struct file_system_to_install {
- };
- 
- static struct file_system_to_install fs_to_install[] = {
--//#ifdef CONFIG_YAFFS_YAFFS1
- 	{&yaffs_fs_type, 0},
--//#endif
--//#ifdef CONFIG_YAFFS_YAFFS2
- 	{&yaffs2_fs_type, 0},
--//#endif
- 	{NULL, 0}
- };
- 
-@@ -2231,15 +2464,14 @@ static int __init init_yaffs_fs(void)
- 	/* Install the proc_fs entry */
- 	my_proc_entry = create_proc_entry("yaffs",
- 					       S_IRUGO | S_IFREG,
--					       &proc_root);
-+					       YPROC_ROOT);
- 
- 	if (my_proc_entry) {
- 		my_proc_entry->write_proc = yaffs_proc_write;
- 		my_proc_entry->read_proc = yaffs_proc_read;
- 		my_proc_entry->data = NULL;
--	} else {
-+	} else
- 		return -ENOMEM;
--	}
- 
- 	/* Now add the file system entries */
- 
-@@ -2247,9 +2479,8 @@ static int __init init_yaffs_fs(void)
- 
- 	while (fsinst->fst && !error) {
- 		error = register_filesystem(fsinst->fst);
--		if (!error) {
-+		if (!error)
- 			fsinst->installed = 1;
--		}
- 		fsinst++;
- 	}
- 
-@@ -2277,7 +2508,7 @@ static void __exit exit_yaffs_fs(void)
- 	T(YAFFS_TRACE_ALWAYS, ("yaffs " __DATE__ " " __TIME__
- 			       " removing. \n"));
- 
--	remove_proc_entry("yaffs", &proc_root);
-+	remove_proc_entry("yaffs", YPROC_ROOT);
- 
- 	fsinst = fs_to_install;
- 
-@@ -2288,7 +2519,6 @@ static void __exit exit_yaffs_fs(void)
- 		}
- 		fsinst++;
- 	}
--
- }
- 
- module_init(init_yaffs_fs)
---- /dev/null
-+++ b/fs/yaffs2/yaffs_getblockinfo.h
-@@ -0,0 +1,34 @@
-+/*
-+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
-+ *
-+ * Copyright (C) 2002-2007 Aleph One Ltd.
-+ *   for Toby Churchill Ltd and Brightstar Engineering
-+ *
-+ * Created by Charles Manning <charles@aleph1.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 2.1 as
-+ * published by the Free Software Foundation.
-+ *
-+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
-+ */
-+
-+#ifndef __YAFFS_GETBLOCKINFO_H__
-+#define __YAFFS_GETBLOCKINFO_H__
-+
-+#include "yaffs_guts.h"
-+
-+/* Function to manipulate block info */
-+static Y_INLINE yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blk)
-+{
-+	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
-+		T(YAFFS_TRACE_ERROR,
-+		  (TSTR
-+		   ("**>> yaffs: getBlockInfo block %d is not valid" TENDSTR),
-+		   blk));
-+		YBUG();
-+	}
-+	return &dev->blockInfo[blk - dev->internalStartBlock];
-+}
-+
-+#endif
---- a/fs/yaffs2/yaffs_guts.c
-+++ b/fs/yaffs2/yaffs_guts.c
-@@ -12,16 +12,17 @@
-  */
- 
- const char *yaffs_guts_c_version =
--    "$Id: yaffs_guts.c,v 1.49 2007-05-15 20:07:40 charles Exp $";
-+    "$Id: yaffs_guts.c,v 1.82 2009-03-09 04:24:17 charles Exp $";
- 
- #include "yportenv.h"
- 
- #include "yaffsinterface.h"
- #include "yaffs_guts.h"
- #include "yaffs_tagsvalidity.h"
-+#include "yaffs_getblockinfo.h"
- 
- #include "yaffs_tagscompat.h"
--#ifndef  CONFIG_YAFFS_USE_OWN_SORT
-+#ifndef CONFIG_YAFFS_USE_OWN_SORT
- #include "yaffs_qsort.h"
- #endif
- #include "yaffs_nand.h"
-@@ -32,116 +33,116 @@ const char *yaffs_guts_c_version =
- #include "yaffs_packedtags2.h"
- 
- 
--#ifdef CONFIG_YAFFS_WINCE
--void yfsd_LockYAFFS(BOOL fsLockOnly);
--void yfsd_UnlockYAFFS(BOOL fsLockOnly);
--#endif
--
- #define YAFFS_PASSIVE_GC_CHUNKS 2
- 
- #include "yaffs_ecc.h"
- 
- 
- /* Robustification (if it ever comes about...) */
--static void yaffs_RetireBlock(yaffs_Device * dev, int blockInNAND);
--static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND, int erasedOk);
--static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
--				     const __u8 * data,
--				     const yaffs_ExtendedTags * tags);
--static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
--				    const yaffs_ExtendedTags * tags);
-+static void yaffs_RetireBlock(yaffs_Device *dev, int blockInNAND);
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND,
-+		int erasedOk);
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+				const __u8 *data,
-+				const yaffs_ExtendedTags *tags);
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+				const yaffs_ExtendedTags *tags);
- 
- /* Other local prototypes */
--static int yaffs_UnlinkObject( yaffs_Object *obj);
-+static int yaffs_UnlinkObject(yaffs_Object *obj);
- static int yaffs_ObjectHasCachedWriteData(yaffs_Object *obj);
- 
- static void yaffs_HardlinkFixup(yaffs_Device *dev, yaffs_Object *hardList);
- 
--static int yaffs_WriteNewChunkWithTagsToNAND(yaffs_Device * dev,
--					     const __u8 * buffer,
--					     yaffs_ExtendedTags * tags,
--					     int useReserve);
--static int yaffs_PutChunkIntoFile(yaffs_Object * in, int chunkInInode,
--				  int chunkInNAND, int inScan);
--
--static yaffs_Object *yaffs_CreateNewObject(yaffs_Device * dev, int number,
--					   yaffs_ObjectType type);
--static void yaffs_AddObjectToDirectory(yaffs_Object * directory,
--				       yaffs_Object * obj);
--static int yaffs_UpdateObjectHeader(yaffs_Object * in, const YCHAR * name,
--				    int force, int isShrink, int shadows);
--static void yaffs_RemoveObjectFromDirectory(yaffs_Object * obj);
-+static int yaffs_WriteNewChunkWithTagsToNAND(yaffs_Device *dev,
-+					const __u8 *buffer,
-+					yaffs_ExtendedTags *tags,
-+					int useReserve);
-+static int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode,
-+				int chunkInNAND, int inScan);
-+
-+static yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev, int number,
-+					yaffs_ObjectType type);
-+static void yaffs_AddObjectToDirectory(yaffs_Object *directory,
-+				yaffs_Object *obj);
-+static int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name,
-+				int force, int isShrink, int shadows);
-+static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj);
- static int yaffs_CheckStructures(void);
--static int yaffs_DeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, __u32 level,
--			      int chunkOffset, int *limit);
--static int yaffs_DoGenericObjectDeletion(yaffs_Object * in);
--
--static yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blockNo);
--
--static __u8 *yaffs_GetTempBuffer(yaffs_Device * dev, int lineNo);
--static void yaffs_ReleaseTempBuffer(yaffs_Device * dev, __u8 * buffer,
--				    int lineNo);
-+static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level,
-+			int chunkOffset, int *limit);
-+static int yaffs_DoGenericObjectDeletion(yaffs_Object *in);
-+
-+static yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device *dev, int blockNo);
- 
--static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
--				  int chunkInNAND);
- 
--static int yaffs_UnlinkWorker(yaffs_Object * obj);
--static void yaffs_DestroyObject(yaffs_Object * obj);
-+static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
-+				int chunkInNAND);
- 
--static int yaffs_TagsMatch(const yaffs_ExtendedTags * tags, int objectId,
--			   int chunkInObject);
-+static int yaffs_UnlinkWorker(yaffs_Object *obj);
- 
--loff_t yaffs_GetFileSize(yaffs_Object * obj);
-+static int yaffs_TagsMatch(const yaffs_ExtendedTags *tags, int objectId,
-+			int chunkInObject);
- 
--static int yaffs_AllocateChunk(yaffs_Device * dev, int useReserve, yaffs_BlockInfo **blockUsedPtr);
-+static int yaffs_AllocateChunk(yaffs_Device *dev, int useReserve,
-+				yaffs_BlockInfo **blockUsedPtr);
- 
--static void yaffs_VerifyFreeChunks(yaffs_Device * dev);
-+static void yaffs_VerifyFreeChunks(yaffs_Device *dev);
- 
- static void yaffs_CheckObjectDetailsLoaded(yaffs_Object *in);
- 
-+static void yaffs_VerifyDirectory(yaffs_Object *directory);
- #ifdef YAFFS_PARANOID
--static int yaffs_CheckFileSanity(yaffs_Object * in);
-+static int yaffs_CheckFileSanity(yaffs_Object *in);
- #else
- #define yaffs_CheckFileSanity(in)
- #endif
- 
--static void yaffs_InvalidateWholeChunkCache(yaffs_Object * in);
--static void yaffs_InvalidateChunkCache(yaffs_Object * object, int chunkId);
-+static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in);
-+static void yaffs_InvalidateChunkCache(yaffs_Object *object, int chunkId);
- 
- static void yaffs_InvalidateCheckpoint(yaffs_Device *dev);
- 
--static int yaffs_FindChunkInFile(yaffs_Object * in, int chunkInInode,
--				 yaffs_ExtendedTags * tags);
-+static int yaffs_FindChunkInFile(yaffs_Object *in, int chunkInInode,
-+				yaffs_ExtendedTags *tags);
- 
--static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos);
--static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device * dev,
--					  yaffs_FileStructure * fStruct,
--					  __u32 chunkId);
-+static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn,
-+		unsigned pos);
-+static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev,
-+					yaffs_FileStructure *fStruct,
-+					__u32 chunkId);
- 
- 
- /* Function to calculate chunk and offset */
- 
--static void yaffs_AddrToChunk(yaffs_Device *dev, loff_t addr, __u32 *chunk, __u32 *offset)
-+static void yaffs_AddrToChunk(yaffs_Device *dev, loff_t addr, int *chunkOut,
-+		__u32 *offsetOut)
- {
--	if(dev->chunkShift){
--		/* Easy-peasy power of 2 case */
--		*chunk  = (__u32)(addr >> dev->chunkShift);
--		*offset = (__u32)(addr & dev->chunkMask);
--	}
--	else if(dev->crumbsPerChunk)
--	{
--		/* Case where we're using "crumbs" */
--		*offset = (__u32)(addr & dev->crumbMask);
--		addr >>= dev->crumbShift;
--		*chunk = ((__u32)addr)/dev->crumbsPerChunk;
--		*offset += ((addr - (*chunk * dev->crumbsPerChunk)) << dev->crumbShift);
-+	int chunk;
-+	__u32 offset;
-+
-+	chunk  = (__u32)(addr >> dev->chunkShift);
-+
-+	if (dev->chunkDiv == 1) {
-+		/* easy power of 2 case */
-+		offset = (__u32)(addr & dev->chunkMask);
-+	} else {
-+		/* Non power-of-2 case */
-+
-+		loff_t chunkBase;
-+
-+		chunk /= dev->chunkDiv;
-+
-+		chunkBase = ((loff_t)chunk) * dev->nDataBytesPerChunk;
-+		offset = (__u32)(addr - chunkBase);
- 	}
--	else
--		YBUG();
-+
-+	*chunkOut = chunk;
-+	*offsetOut = offset;
- }
- 
--/* Function to return the number of shifts for a power of 2 greater than or equal
-- * to the given number
-+/* Function to return the number of shifts for a power of 2 greater than or
-+ * equal to the given number
-  * Note we don't try to cater for all possible numbers and this does not have to
-  * be hellishly efficient.
-  */
-@@ -153,13 +154,14 @@ static __u32 ShiftsGE(__u32 x)
- 
- 	nShifts = extraBits = 0;
- 
--	while(x>1){
--		if(x & 1) extraBits++;
--		x>>=1;
-+	while (x > 1) {
-+		if (x & 1)
-+			extraBits++;
-+		x >>= 1;
- 		nShifts++;
- 	}
- 
--	if(extraBits)
-+	if (extraBits)
- 		nShifts++;
- 
- 	return nShifts;
-@@ -168,16 +170,17 @@ static __u32 ShiftsGE(__u32 x)
- /* Function to return the number of shifts to get a 1 in bit 0
-  */
- 
--static __u32 ShiftDiv(__u32 x)
-+static __u32 Shifts(__u32 x)
- {
- 	int nShifts;
- 
- 	nShifts =  0;
- 
--	if(!x) return 0;
-+	if (!x)
-+		return 0;
- 
--	while( !(x&1)){
--		x>>=1;
-+	while (!(x&1)) {
-+		x >>= 1;
- 		nShifts++;
- 	}
- 
-@@ -195,21 +198,25 @@ static int yaffs_InitialiseTempBuffers(y
- 	int i;
- 	__u8 *buf = (__u8 *)1;
- 
--	memset(dev->tempBuffer,0,sizeof(dev->tempBuffer));
-+	memset(dev->tempBuffer, 0, sizeof(dev->tempBuffer));
- 
- 	for (i = 0; buf && i < YAFFS_N_TEMP_BUFFERS; i++) {
- 		dev->tempBuffer[i].line = 0;	/* not in use */
- 		dev->tempBuffer[i].buffer = buf =
--		    YMALLOC_DMA(dev->nDataBytesPerChunk);
-+		    YMALLOC_DMA(dev->totalBytesPerChunk);
- 	}
- 
- 	return buf ? YAFFS_OK : YAFFS_FAIL;
--
- }
- 
--static __u8 *yaffs_GetTempBuffer(yaffs_Device * dev, int lineNo)
-+__u8 *yaffs_GetTempBuffer(yaffs_Device *dev, int lineNo)
- {
- 	int i, j;
-+
-+	dev->tempInUse++;
-+	if (dev->tempInUse > dev->maxTemp)
-+		dev->maxTemp = dev->tempInUse;
-+
- 	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
- 		if (dev->tempBuffer[i].line == 0) {
- 			dev->tempBuffer[i].line = lineNo;
-@@ -227,9 +234,9 @@ static __u8 *yaffs_GetTempBuffer(yaffs_D
- 	T(YAFFS_TRACE_BUFFERS,
- 	  (TSTR("Out of temp buffers at line %d, other held by lines:"),
- 	   lineNo));
--	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
-+	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++)
- 		T(YAFFS_TRACE_BUFFERS, (TSTR(" %d "), dev->tempBuffer[i].line));
--	}
-+
- 	T(YAFFS_TRACE_BUFFERS, (TSTR(" " TENDSTR)));
- 
- 	/*
-@@ -242,10 +249,13 @@ static __u8 *yaffs_GetTempBuffer(yaffs_D
- 
- }
- 
--static void yaffs_ReleaseTempBuffer(yaffs_Device * dev, __u8 * buffer,
-+void yaffs_ReleaseTempBuffer(yaffs_Device *dev, __u8 *buffer,
- 				    int lineNo)
- {
- 	int i;
-+
-+	dev->tempInUse--;
-+
- 	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
- 		if (dev->tempBuffer[i].buffer == buffer) {
- 			dev->tempBuffer[i].line = 0;
-@@ -267,27 +277,26 @@ static void yaffs_ReleaseTempBuffer(yaff
- /*
-  * Determine if we have a managed buffer.
-  */
--int yaffs_IsManagedTempBuffer(yaffs_Device * dev, const __u8 * buffer)
-+int yaffs_IsManagedTempBuffer(yaffs_Device *dev, const __u8 *buffer)
- {
- 	int i;
-+
- 	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
- 		if (dev->tempBuffer[i].buffer == buffer)
- 			return 1;
-+	}
- 
-+	for (i = 0; i < dev->nShortOpCaches; i++) {
-+		if (dev->srCache[i].data == buffer)
-+			return 1;
- 	}
- 
--    for (i = 0; i < dev->nShortOpCaches; i++) {
--        if( dev->srCache[i].data == buffer )
--            return 1;
--
--    }
--
--    if (buffer == dev->checkpointBuffer)
--      return 1;
--
--    T(YAFFS_TRACE_ALWAYS,
--	  (TSTR("yaffs: unmaged buffer detected.\n" TENDSTR)));
--    return 0;
-+	if (buffer == dev->checkpointBuffer)
-+		return 1;
-+
-+	T(YAFFS_TRACE_ALWAYS,
-+		(TSTR("yaffs: unmaged buffer detected.\n" TENDSTR)));
-+	return 0;
- }
- 
- 
-@@ -296,62 +305,63 @@ int yaffs_IsManagedTempBuffer(yaffs_Devi
-  * Chunk bitmap manipulations
-  */
- 
--static Y_INLINE __u8 *yaffs_BlockBits(yaffs_Device * dev, int blk)
-+static Y_INLINE __u8 *yaffs_BlockBits(yaffs_Device *dev, int blk)
- {
- 	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
- 		T(YAFFS_TRACE_ERROR,
--		  (TSTR("**>> yaffs: BlockBits block %d is not valid" TENDSTR),
--		   blk));
-+			(TSTR("**>> yaffs: BlockBits block %d is not valid" TENDSTR),
-+			blk));
- 		YBUG();
- 	}
- 	return dev->chunkBits +
--	    (dev->chunkBitmapStride * (blk - dev->internalStartBlock));
-+		(dev->chunkBitmapStride * (blk - dev->internalStartBlock));
- }
- 
- static Y_INLINE void yaffs_VerifyChunkBitId(yaffs_Device *dev, int blk, int chunk)
- {
--	if(blk < dev->internalStartBlock || blk > dev->internalEndBlock ||
--	   chunk < 0 || chunk >= dev->nChunksPerBlock) {
--	   T(YAFFS_TRACE_ERROR,
--	    (TSTR("**>> yaffs: Chunk Id (%d:%d) invalid"TENDSTR),blk,chunk));
--	    YBUG();
-+	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock ||
-+			chunk < 0 || chunk >= dev->nChunksPerBlock) {
-+		T(YAFFS_TRACE_ERROR,
-+		(TSTR("**>> yaffs: Chunk Id (%d:%d) invalid"TENDSTR),
-+			blk, chunk));
-+		YBUG();
- 	}
- }
- 
--static Y_INLINE void yaffs_ClearChunkBits(yaffs_Device * dev, int blk)
-+static Y_INLINE void yaffs_ClearChunkBits(yaffs_Device *dev, int blk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 
- 	memset(blkBits, 0, dev->chunkBitmapStride);
- }
- 
--static Y_INLINE void yaffs_ClearChunkBit(yaffs_Device * dev, int blk, int chunk)
-+static Y_INLINE void yaffs_ClearChunkBit(yaffs_Device *dev, int blk, int chunk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 
--	yaffs_VerifyChunkBitId(dev,blk,chunk);
-+	yaffs_VerifyChunkBitId(dev, blk, chunk);
- 
- 	blkBits[chunk / 8] &= ~(1 << (chunk & 7));
- }
- 
--static Y_INLINE void yaffs_SetChunkBit(yaffs_Device * dev, int blk, int chunk)
-+static Y_INLINE void yaffs_SetChunkBit(yaffs_Device *dev, int blk, int chunk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 
--	yaffs_VerifyChunkBitId(dev,blk,chunk);
-+	yaffs_VerifyChunkBitId(dev, blk, chunk);
- 
- 	blkBits[chunk / 8] |= (1 << (chunk & 7));
- }
- 
--static Y_INLINE int yaffs_CheckChunkBit(yaffs_Device * dev, int blk, int chunk)
-+static Y_INLINE int yaffs_CheckChunkBit(yaffs_Device *dev, int blk, int chunk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
--	yaffs_VerifyChunkBitId(dev,blk,chunk);
-+	yaffs_VerifyChunkBitId(dev, blk, chunk);
- 
- 	return (blkBits[chunk / 8] & (1 << (chunk & 7))) ? 1 : 0;
- }
- 
--static Y_INLINE int yaffs_StillSomeChunkBits(yaffs_Device * dev, int blk)
-+static Y_INLINE int yaffs_StillSomeChunkBits(yaffs_Device *dev, int blk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 	int i;
-@@ -363,17 +373,17 @@ static Y_INLINE int yaffs_StillSomeChunk
- 	return 0;
- }
- 
--static int yaffs_CountChunkBits(yaffs_Device * dev, int blk)
-+static int yaffs_CountChunkBits(yaffs_Device *dev, int blk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 	int i;
- 	int n = 0;
- 	for (i = 0; i < dev->chunkBitmapStride; i++) {
- 		__u8 x = *blkBits;
--		while(x){
--			if(x & 1)
-+		while (x) {
-+			if (x & 1)
- 				n++;
--			x >>=1;
-+			x >>= 1;
- 		}
- 
- 		blkBits++;
-@@ -400,7 +410,7 @@ static int yaffs_SkipNANDVerification(ya
- 	return !(yaffs_traceMask & (YAFFS_TRACE_VERIFY_NAND));
- }
- 
--static const char * blockStateName[] = {
-+static const char *blockStateName[] = {
- "Unknown",
- "Needs scanning",
- "Scanning",
-@@ -413,64 +423,65 @@ static const char * blockStateName[] = {
- "Dead"
- };
- 
--static void yaffs_VerifyBlock(yaffs_Device *dev,yaffs_BlockInfo *bi,int n)
-+static void yaffs_VerifyBlock(yaffs_Device *dev, yaffs_BlockInfo *bi, int n)
- {
- 	int actuallyUsed;
- 	int inUse;
- 
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
- 	/* Report illegal runtime states */
--	if(bi->blockState <0 || bi->blockState >= YAFFS_NUMBER_OF_BLOCK_STATES)
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has undefined state %d"TENDSTR),n,bi->blockState));
-+	if (bi->blockState >= YAFFS_NUMBER_OF_BLOCK_STATES)
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has undefined state %d"TENDSTR), n, bi->blockState));
- 
--	switch(bi->blockState){
--	 case YAFFS_BLOCK_STATE_UNKNOWN:
--	 case YAFFS_BLOCK_STATE_SCANNING:
--	 case YAFFS_BLOCK_STATE_NEEDS_SCANNING:
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has bad run-state %s"TENDSTR),
--		n,blockStateName[bi->blockState]));
-+	switch (bi->blockState) {
-+	case YAFFS_BLOCK_STATE_UNKNOWN:
-+	case YAFFS_BLOCK_STATE_SCANNING:
-+	case YAFFS_BLOCK_STATE_NEEDS_SCANNING:
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has bad run-state %s"TENDSTR),
-+		n, blockStateName[bi->blockState]));
- 	}
- 
- 	/* Check pages in use and soft deletions are legal */
- 
- 	actuallyUsed = bi->pagesInUse - bi->softDeletions;
- 
--	if(bi->pagesInUse < 0 || bi->pagesInUse > dev->nChunksPerBlock ||
-+	if (bi->pagesInUse < 0 || bi->pagesInUse > dev->nChunksPerBlock ||
- 	   bi->softDeletions < 0 || bi->softDeletions > dev->nChunksPerBlock ||
- 	   actuallyUsed < 0 || actuallyUsed > dev->nChunksPerBlock)
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has illegal values pagesInUsed %d softDeletions %d"TENDSTR),
--		n,bi->pagesInUse,bi->softDeletions));
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has illegal values pagesInUsed %d softDeletions %d"TENDSTR),
-+		n, bi->pagesInUse, bi->softDeletions));
- 
- 
- 	/* Check chunk bitmap legal */
--	inUse = yaffs_CountChunkBits(dev,n);
--	if(inUse != bi->pagesInUse)
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has inconsistent values pagesInUse %d counted chunk bits %d"TENDSTR),
--			n,bi->pagesInUse,inUse));
-+	inUse = yaffs_CountChunkBits(dev, n);
-+	if (inUse != bi->pagesInUse)
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has inconsistent values pagesInUse %d counted chunk bits %d"TENDSTR),
-+			n, bi->pagesInUse, inUse));
- 
- 	/* Check that the sequence number is valid.
- 	 * Ten million is legal, but is very unlikely
- 	 */
--	if(dev->isYaffs2 &&
-+	if (dev->isYaffs2 &&
- 	   (bi->blockState == YAFFS_BLOCK_STATE_ALLOCATING || bi->blockState == YAFFS_BLOCK_STATE_FULL) &&
--	   (bi->sequenceNumber < YAFFS_LOWEST_SEQUENCE_NUMBER || bi->sequenceNumber > 10000000 ))
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has suspect sequence number of %d"TENDSTR),
--		n,bi->sequenceNumber));
--
-+	   (bi->sequenceNumber < YAFFS_LOWEST_SEQUENCE_NUMBER || bi->sequenceNumber > 10000000))
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has suspect sequence number of %d"TENDSTR),
-+		n, bi->sequenceNumber));
- }
- 
--static void yaffs_VerifyCollectedBlock(yaffs_Device *dev,yaffs_BlockInfo *bi,int n)
-+static void yaffs_VerifyCollectedBlock(yaffs_Device *dev, yaffs_BlockInfo *bi,
-+		int n)
- {
--	yaffs_VerifyBlock(dev,bi,n);
-+	yaffs_VerifyBlock(dev, bi, n);
- 
- 	/* After collection the block should be in the erased state */
--	/* TODO: This will need to change if we do partial gc */
-+	/* This will need to change if we do partial gc */
- 
--	if(bi->blockState != YAFFS_BLOCK_STATE_EMPTY){
--		T(YAFFS_TRACE_ERROR,(TSTR("Block %d is in state %d after gc, should be erased"TENDSTR),
--			n,bi->blockState));
-+	if (bi->blockState != YAFFS_BLOCK_STATE_COLLECTING &&
-+			bi->blockState != YAFFS_BLOCK_STATE_EMPTY) {
-+		T(YAFFS_TRACE_ERROR, (TSTR("Block %d is in state %d after gc, should be erased"TENDSTR),
-+			n, bi->blockState));
- 	}
- }
- 
-@@ -480,52 +491,49 @@ static void yaffs_VerifyBlocks(yaffs_Dev
- 	int nBlocksPerState[YAFFS_NUMBER_OF_BLOCK_STATES];
- 	int nIllegalBlockStates = 0;
- 
--
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
--	memset(nBlocksPerState,0,sizeof(nBlocksPerState));
--
-+	memset(nBlocksPerState, 0, sizeof(nBlocksPerState));
- 
--	for(i = dev->internalStartBlock; i <= dev->internalEndBlock; i++){
--		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
--		yaffs_VerifyBlock(dev,bi,i);
-+	for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
-+		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
-+		yaffs_VerifyBlock(dev, bi, i);
- 
--		if(bi->blockState >=0 && bi->blockState < YAFFS_NUMBER_OF_BLOCK_STATES)
-+		if (bi->blockState < YAFFS_NUMBER_OF_BLOCK_STATES)
- 			nBlocksPerState[bi->blockState]++;
- 		else
- 			nIllegalBlockStates++;
--
- 	}
- 
--	T(YAFFS_TRACE_VERIFY,(TSTR(""TENDSTR)));
--	T(YAFFS_TRACE_VERIFY,(TSTR("Block summary"TENDSTR)));
-+	T(YAFFS_TRACE_VERIFY, (TSTR(""TENDSTR)));
-+	T(YAFFS_TRACE_VERIFY, (TSTR("Block summary"TENDSTR)));
- 
--	T(YAFFS_TRACE_VERIFY,(TSTR("%d blocks have illegal states"TENDSTR),nIllegalBlockStates));
--	if(nBlocksPerState[YAFFS_BLOCK_STATE_ALLOCATING] > 1)
--		T(YAFFS_TRACE_VERIFY,(TSTR("Too many allocating blocks"TENDSTR)));
-+	T(YAFFS_TRACE_VERIFY, (TSTR("%d blocks have illegal states"TENDSTR), nIllegalBlockStates));
-+	if (nBlocksPerState[YAFFS_BLOCK_STATE_ALLOCATING] > 1)
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Too many allocating blocks"TENDSTR)));
- 
--	for(i = 0; i < YAFFS_NUMBER_OF_BLOCK_STATES; i++)
-+	for (i = 0; i < YAFFS_NUMBER_OF_BLOCK_STATES; i++)
- 		T(YAFFS_TRACE_VERIFY,
- 		  (TSTR("%s %d blocks"TENDSTR),
--		  blockStateName[i],nBlocksPerState[i]));
-+		  blockStateName[i], nBlocksPerState[i]));
- 
--	if(dev->blocksInCheckpoint != nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT])
-+	if (dev->blocksInCheckpoint != nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT])
- 		T(YAFFS_TRACE_VERIFY,
- 		 (TSTR("Checkpoint block count wrong dev %d count %d"TENDSTR),
- 		 dev->blocksInCheckpoint, nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT]));
- 
--	if(dev->nErasedBlocks != nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY])
-+	if (dev->nErasedBlocks != nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY])
- 		T(YAFFS_TRACE_VERIFY,
- 		 (TSTR("Erased block count wrong dev %d count %d"TENDSTR),
- 		 dev->nErasedBlocks, nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY]));
- 
--	if(nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING] > 1)
-+	if (nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING] > 1)
- 		T(YAFFS_TRACE_VERIFY,
- 		 (TSTR("Too many collecting blocks %d (max is 1)"TENDSTR),
- 		 nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING]));
- 
--	T(YAFFS_TRACE_VERIFY,(TSTR(""TENDSTR)));
-+	T(YAFFS_TRACE_VERIFY, (TSTR(""TENDSTR)));
- 
- }
- 
-@@ -535,26 +543,26 @@ static void yaffs_VerifyBlocks(yaffs_Dev
-  */
- static void yaffs_VerifyObjectHeader(yaffs_Object *obj, yaffs_ObjectHeader *oh, yaffs_ExtendedTags *tags, int parentCheck)
- {
--	if(yaffs_SkipVerification(obj->myDev))
-+	if (obj && yaffs_SkipVerification(obj->myDev))
- 		return;
- 
--	if(!(tags && obj && oh)){
--	 	T(YAFFS_TRACE_VERIFY,
--		 		(TSTR("Verifying object header tags %x obj %x oh %x"TENDSTR),
--		 		(__u32)tags,(__u32)obj,(__u32)oh));
-+	if (!(tags && obj && oh)) {
-+		T(YAFFS_TRACE_VERIFY,
-+				(TSTR("Verifying object header tags %x obj %x oh %x"TENDSTR),
-+				(__u32)tags, (__u32)obj, (__u32)oh));
- 		return;
- 	}
- 
--	if(oh->type <= YAFFS_OBJECT_TYPE_UNKNOWN ||
--	   oh->type > YAFFS_OBJECT_TYPE_MAX)
--	 	T(YAFFS_TRACE_VERIFY,
--		 (TSTR("Obj %d header type is illegal value 0x%x"TENDSTR),
--		 tags->objectId, oh->type));
--
--	if(tags->objectId != obj->objectId)
--	 	T(YAFFS_TRACE_VERIFY,
--		 (TSTR("Obj %d header mismatch objectId %d"TENDSTR),
--		 tags->objectId, obj->objectId));
-+	if (oh->type <= YAFFS_OBJECT_TYPE_UNKNOWN ||
-+			oh->type > YAFFS_OBJECT_TYPE_MAX)
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d header type is illegal value 0x%x"TENDSTR),
-+			tags->objectId, oh->type));
-+
-+	if (tags->objectId != obj->objectId)
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d header mismatch objectId %d"TENDSTR),
-+			tags->objectId, obj->objectId));
- 
- 
- 	/*
-@@ -563,46 +571,43 @@ static void yaffs_VerifyObjectHeader(yaf
- 	 * Tests do not apply to the root object.
- 	 */
- 
--	if(parentCheck && tags->objectId > 1 && !obj->parent)
--	 	T(YAFFS_TRACE_VERIFY,
--		 (TSTR("Obj %d header mismatch parentId %d obj->parent is NULL"TENDSTR),
--	 	 tags->objectId, oh->parentObjectId));
--
--
--	if(parentCheck && obj->parent &&
--	   oh->parentObjectId != obj->parent->objectId &&
--	   (oh->parentObjectId != YAFFS_OBJECTID_UNLINKED ||
--	    obj->parent->objectId != YAFFS_OBJECTID_DELETED))
--	 	T(YAFFS_TRACE_VERIFY,
--		 (TSTR("Obj %d header mismatch parentId %d parentObjectId %d"TENDSTR),
--	 	 tags->objectId, oh->parentObjectId, obj->parent->objectId));
-+	if (parentCheck && tags->objectId > 1 && !obj->parent)
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d header mismatch parentId %d obj->parent is NULL"TENDSTR),
-+			tags->objectId, oh->parentObjectId));
- 
-+	if (parentCheck && obj->parent &&
-+			oh->parentObjectId != obj->parent->objectId &&
-+			(oh->parentObjectId != YAFFS_OBJECTID_UNLINKED ||
-+			obj->parent->objectId != YAFFS_OBJECTID_DELETED))
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d header mismatch parentId %d parentObjectId %d"TENDSTR),
-+			tags->objectId, oh->parentObjectId, obj->parent->objectId));
- 
--	if(tags->objectId > 1 && oh->name[0] == 0) /* Null name */
-+	if (tags->objectId > 1 && oh->name[0] == 0) /* Null name */
- 		T(YAFFS_TRACE_VERIFY,
--		(TSTR("Obj %d header name is NULL"TENDSTR),
--		 obj->objectId));
-+			(TSTR("Obj %d header name is NULL"TENDSTR),
-+			obj->objectId));
- 
--	if(tags->objectId > 1 && ((__u8)(oh->name[0])) == 0xff) /* Trashed name */
-+	if (tags->objectId > 1 && ((__u8)(oh->name[0])) == 0xff) /* Trashed name */
- 		T(YAFFS_TRACE_VERIFY,
--		(TSTR("Obj %d header name is 0xFF"TENDSTR),
--		 obj->objectId));
-+			(TSTR("Obj %d header name is 0xFF"TENDSTR),
-+			obj->objectId));
- }
- 
- 
- 
--static int yaffs_VerifyTnodeWorker(yaffs_Object * obj, yaffs_Tnode * tn,
--				  	__u32 level, int chunkOffset)
-+static int yaffs_VerifyTnodeWorker(yaffs_Object *obj, yaffs_Tnode *tn,
-+					__u32 level, int chunkOffset)
- {
- 	int i;
- 	yaffs_Device *dev = obj->myDev;
- 	int ok = 1;
--	int nTnodeBytes = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
- 
- 	if (tn) {
- 		if (level > 0) {
- 
--			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++){
-+			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++) {
- 				if (tn->internal[i]) {
- 					ok = yaffs_VerifyTnodeWorker(obj,
- 							tn->internal[i],
-@@ -611,20 +616,19 @@ static int yaffs_VerifyTnodeWorker(yaffs
- 				}
- 			}
- 		} else if (level == 0) {
--			int i;
- 			yaffs_ExtendedTags tags;
- 			__u32 objectId = obj->objectId;
- 
- 			chunkOffset <<=  YAFFS_TNODES_LEVEL0_BITS;
- 
--			for(i = 0; i < YAFFS_NTNODES_LEVEL0; i++){
--				__u32 theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
-+			for (i = 0; i < YAFFS_NTNODES_LEVEL0; i++) {
-+				__u32 theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
- 
--				if(theChunk > 0){
-+				if (theChunk > 0) {
- 					/* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),tags.objectId,tags.chunkId,theChunk)); */
--					yaffs_ReadChunkWithTagsFromNAND(dev,theChunk,NULL, &tags);
--					if(tags.objectId != objectId || tags.chunkId != chunkOffset){
--						T(~0,(TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
-+					yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL, &tags);
-+					if (tags.objectId != objectId || tags.chunkId != chunkOffset) {
-+						T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
- 							objectId, chunkOffset, theChunk,
- 							tags.objectId, tags.chunkId));
- 					}
-@@ -646,13 +650,15 @@ static void yaffs_VerifyFile(yaffs_Objec
- 	__u32 lastChunk;
- 	__u32 x;
- 	__u32 i;
--	int ok;
- 	yaffs_Device *dev;
- 	yaffs_ExtendedTags tags;
- 	yaffs_Tnode *tn;
- 	__u32 objectId;
- 
--	if(obj && yaffs_SkipVerification(obj->myDev))
-+	if (!obj)
-+		return;
-+
-+	if (yaffs_SkipVerification(obj->myDev))
- 		return;
- 
- 	dev = obj->myDev;
-@@ -662,17 +668,17 @@ static void yaffs_VerifyFile(yaffs_Objec
- 	lastChunk =  obj->variant.fileVariant.fileSize / dev->nDataBytesPerChunk + 1;
- 	x = lastChunk >> YAFFS_TNODES_LEVEL0_BITS;
- 	requiredTallness = 0;
--	while (x> 0) {
-+	while (x > 0) {
- 		x >>= YAFFS_TNODES_INTERNAL_BITS;
- 		requiredTallness++;
- 	}
- 
- 	actualTallness = obj->variant.fileVariant.topLevel;
- 
--	if(requiredTallness > actualTallness )
-+	if (requiredTallness > actualTallness)
- 		T(YAFFS_TRACE_VERIFY,
- 		(TSTR("Obj %d had tnode tallness %d, needs to be %d"TENDSTR),
--		 obj->objectId,actualTallness, requiredTallness));
-+		 obj->objectId, actualTallness, requiredTallness));
- 
- 
- 	/* Check that the chunks in the tnode tree are all correct.
-@@ -680,39 +686,31 @@ static void yaffs_VerifyFile(yaffs_Objec
- 	 * checking the tags for every chunk match.
- 	 */
- 
--	if(yaffs_SkipNANDVerification(dev))
-+	if (yaffs_SkipNANDVerification(dev))
- 		return;
- 
--	for(i = 1; i <= lastChunk; i++){
--		tn = yaffs_FindLevel0Tnode(dev, &obj->variant.fileVariant,i);
-+	for (i = 1; i <= lastChunk; i++) {
-+		tn = yaffs_FindLevel0Tnode(dev, &obj->variant.fileVariant, i);
- 
- 		if (tn) {
--			__u32 theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
--			if(theChunk > 0){
-+			__u32 theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
-+			if (theChunk > 0) {
- 				/* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),objectId,i,theChunk)); */
--				yaffs_ReadChunkWithTagsFromNAND(dev,theChunk,NULL, &tags);
--				if(tags.objectId != objectId || tags.chunkId != i){
--					T(~0,(TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
-+				yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL, &tags);
-+				if (tags.objectId != objectId || tags.chunkId != i) {
-+					T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
- 						objectId, i, theChunk,
- 						tags.objectId, tags.chunkId));
- 				}
- 			}
- 		}
--
- 	}
--
- }
- 
--static void yaffs_VerifyDirectory(yaffs_Object *obj)
--{
--	if(obj && yaffs_SkipVerification(obj->myDev))
--		return;
--
--}
- 
- static void yaffs_VerifyHardLink(yaffs_Object *obj)
- {
--	if(obj && yaffs_SkipVerification(obj->myDev))
-+	if (obj && yaffs_SkipVerification(obj->myDev))
- 		return;
- 
- 	/* Verify sane equivalent object */
-@@ -720,7 +718,7 @@ static void yaffs_VerifyHardLink(yaffs_O
- 
- static void yaffs_VerifySymlink(yaffs_Object *obj)
- {
--	if(obj && yaffs_SkipVerification(obj->myDev))
-+	if (obj && yaffs_SkipVerification(obj->myDev))
- 		return;
- 
- 	/* Verify symlink string */
-@@ -728,7 +726,7 @@ static void yaffs_VerifySymlink(yaffs_Ob
- 
- static void yaffs_VerifySpecial(yaffs_Object *obj)
- {
--	if(obj && yaffs_SkipVerification(obj->myDev))
-+	if (obj && yaffs_SkipVerification(obj->myDev))
- 		return;
- }
- 
-@@ -740,14 +738,19 @@ static void yaffs_VerifyObject(yaffs_Obj
- 	__u32 chunkMax;
- 
- 	__u32 chunkIdOk;
--	__u32 chunkIsLive;
-+	__u32 chunkInRange;
-+	__u32 chunkShouldNotBeDeleted;
-+	__u32 chunkValid;
-+
-+	if (!obj)
-+		return;
- 
--	if(!obj)
-+	if (obj->beingCreated)
- 		return;
- 
- 	dev = obj->myDev;
- 
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
- 	/* Check sane object header chunk */
-@@ -755,50 +758,54 @@ static void yaffs_VerifyObject(yaffs_Obj
- 	chunkMin = dev->internalStartBlock * dev->nChunksPerBlock;
- 	chunkMax = (dev->internalEndBlock+1) * dev->nChunksPerBlock - 1;
- 
--	chunkIdOk = (obj->chunkId >= chunkMin && obj->chunkId <= chunkMax);
--	chunkIsLive = chunkIdOk &&
-+	chunkInRange = (((unsigned)(obj->hdrChunk)) >= chunkMin && ((unsigned)(obj->hdrChunk)) <= chunkMax);
-+	chunkIdOk = chunkInRange || obj->hdrChunk == 0;
-+	chunkValid = chunkInRange &&
- 			yaffs_CheckChunkBit(dev,
--					    obj->chunkId / dev->nChunksPerBlock,
--					    obj->chunkId % dev->nChunksPerBlock);
--	if(!obj->fake &&
--	    (!chunkIdOk || !chunkIsLive)) {
--	   T(YAFFS_TRACE_VERIFY,
--	   (TSTR("Obj %d has chunkId %d %s %s"TENDSTR),
--	   obj->objectId,obj->chunkId,
--	   chunkIdOk ? "" : ",out of range",
--	   chunkIsLive || !chunkIdOk ? "" : ",marked as deleted"));
-+					obj->hdrChunk / dev->nChunksPerBlock,
-+					obj->hdrChunk % dev->nChunksPerBlock);
-+	chunkShouldNotBeDeleted = chunkInRange && !chunkValid;
-+
-+	if (!obj->fake &&
-+			(!chunkIdOk || chunkShouldNotBeDeleted)) {
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d has chunkId %d %s %s"TENDSTR),
-+			obj->objectId, obj->hdrChunk,
-+			chunkIdOk ? "" : ",out of range",
-+			chunkShouldNotBeDeleted ? ",marked as deleted" : ""));
- 	}
- 
--	if(chunkIdOk && chunkIsLive &&!yaffs_SkipNANDVerification(dev)) {
-+	if (chunkValid && !yaffs_SkipNANDVerification(dev)) {
- 		yaffs_ExtendedTags tags;
- 		yaffs_ObjectHeader *oh;
--		__u8 *buffer = yaffs_GetTempBuffer(dev,__LINE__);
-+		__u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
- 
- 		oh = (yaffs_ObjectHeader *)buffer;
- 
--		yaffs_ReadChunkWithTagsFromNAND(dev, obj->chunkId,buffer, &tags);
-+		yaffs_ReadChunkWithTagsFromNAND(dev, obj->hdrChunk, buffer,
-+				&tags);
- 
--		yaffs_VerifyObjectHeader(obj,oh,&tags,1);
-+		yaffs_VerifyObjectHeader(obj, oh, &tags, 1);
- 
--		yaffs_ReleaseTempBuffer(dev,buffer,__LINE__);
-+		yaffs_ReleaseTempBuffer(dev, buffer, __LINE__);
- 	}
- 
- 	/* Verify it has a parent */
--	if(obj && !obj->fake &&
--	   (!obj->parent || obj->parent->myDev != dev)){
--	   T(YAFFS_TRACE_VERIFY,
--	   (TSTR("Obj %d has parent pointer %p which does not look like an object"TENDSTR),
--	   obj->objectId,obj->parent));
-+	if (obj && !obj->fake &&
-+			(!obj->parent || obj->parent->myDev != dev)) {
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d has parent pointer %p which does not look like an object"TENDSTR),
-+			obj->objectId, obj->parent));
- 	}
- 
- 	/* Verify parent is a directory */
--	if(obj->parent && obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY){
--	   T(YAFFS_TRACE_VERIFY,
--	   (TSTR("Obj %d's parent is not a directory (type %d)"TENDSTR),
--	   obj->objectId,obj->parent->variantType));
-+	if (obj->parent && obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d's parent is not a directory (type %d)"TENDSTR),
-+			obj->objectId, obj->parent->variantType));
- 	}
- 
--	switch(obj->variantType){
-+	switch (obj->variantType) {
- 	case YAFFS_OBJECT_TYPE_FILE:
- 		yaffs_VerifyFile(obj);
- 		break;
-@@ -818,33 +825,30 @@ static void yaffs_VerifyObject(yaffs_Obj
- 	default:
- 		T(YAFFS_TRACE_VERIFY,
- 		(TSTR("Obj %d has illegaltype %d"TENDSTR),
--		obj->objectId,obj->variantType));
-+		obj->objectId, obj->variantType));
- 		break;
- 	}
--
--
- }
- 
- static void yaffs_VerifyObjects(yaffs_Device *dev)
- {
- 	yaffs_Object *obj;
- 	int i;
--	struct list_head *lh;
-+	struct ylist_head *lh;
- 
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
- 	/* Iterate through the objects in each hash entry */
- 
--	 for(i = 0; i <  YAFFS_NOBJECT_BUCKETS; i++){
--	 	list_for_each(lh, &dev->objectBucket[i].list) {
-+	for (i = 0; i <  YAFFS_NOBJECT_BUCKETS; i++) {
-+		ylist_for_each(lh, &dev->objectBucket[i].list) {
- 			if (lh) {
--				obj = list_entry(lh, yaffs_Object, hashLink);
-+				obj = ylist_entry(lh, yaffs_Object, hashLink);
- 				yaffs_VerifyObject(obj);
- 			}
- 		}
--	 }
--
-+	}
- }
- 
- 
-@@ -855,19 +859,20 @@ static void yaffs_VerifyObjects(yaffs_De
- static Y_INLINE int yaffs_HashFunction(int n)
- {
- 	n = abs(n);
--	return (n % YAFFS_NOBJECT_BUCKETS);
-+	return n % YAFFS_NOBJECT_BUCKETS;
- }
- 
- /*
-- * Access functions to useful fake objects
-+ * Access functions to useful fake objects.
-+ * Note that root might have a presence in NAND if permissions are set.
-  */
- 
--yaffs_Object *yaffs_Root(yaffs_Device * dev)
-+yaffs_Object *yaffs_Root(yaffs_Device *dev)
- {
- 	return dev->rootDir;
- }
- 
--yaffs_Object *yaffs_LostNFound(yaffs_Device * dev)
-+yaffs_Object *yaffs_LostNFound(yaffs_Device *dev)
- {
- 	return dev->lostNFoundDir;
- }
-@@ -877,7 +882,7 @@ yaffs_Object *yaffs_LostNFound(yaffs_Dev
-  *  Erased NAND checking functions
-  */
- 
--int yaffs_CheckFF(__u8 * buffer, int nBytes)
-+int yaffs_CheckFF(__u8 *buffer, int nBytes)
- {
- 	/* Horrible, slow implementation */
- 	while (nBytes--) {
-@@ -889,9 +894,8 @@ int yaffs_CheckFF(__u8 * buffer, int nBy
- }
- 
- static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
--				  int chunkInNAND)
-+				int chunkInNAND)
- {
--
- 	int retval = YAFFS_OK;
- 	__u8 *data = yaffs_GetTempBuffer(dev, __LINE__);
- 	yaffs_ExtendedTags tags;
-@@ -899,10 +903,9 @@ static int yaffs_CheckChunkErased(struct
- 
- 	result = yaffs_ReadChunkWithTagsFromNAND(dev, chunkInNAND, data, &tags);
- 
--	if(tags.eccResult > YAFFS_ECC_RESULT_NO_ERROR)
-+	if (tags.eccResult > YAFFS_ECC_RESULT_NO_ERROR)
- 		retval = YAFFS_FAIL;
- 
--
- 	if (!yaffs_CheckFF(data, dev->nDataBytesPerChunk) || tags.chunkUsed) {
- 		T(YAFFS_TRACE_NANDACCESS,
- 		  (TSTR("Chunk %d not erased" TENDSTR), chunkInNAND));
-@@ -915,11 +918,10 @@ static int yaffs_CheckChunkErased(struct
- 
- }
- 
--
- static int yaffs_WriteNewChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev,
--					     const __u8 * data,
--					     yaffs_ExtendedTags * tags,
--					     int useReserve)
-+					const __u8 *data,
-+					yaffs_ExtendedTags *tags,
-+					int useReserve)
- {
- 	int attempts = 0;
- 	int writeOk = 0;
-@@ -972,7 +974,7 @@ static int yaffs_WriteNewChunkWithTagsTo
- 			erasedOk = yaffs_CheckChunkErased(dev, chunk);
- 			if (erasedOk != YAFFS_OK) {
- 				T(YAFFS_TRACE_ERROR,
--				(TSTR ("**>> yaffs chunk %d was not erased"
-+				(TSTR("**>> yaffs chunk %d was not erased"
- 				TENDSTR), chunk));
- 
- 				/* try another chunk */
-@@ -992,7 +994,11 @@ static int yaffs_WriteNewChunkWithTagsTo
- 		/* Copy the data into the robustification buffer */
- 		yaffs_HandleWriteChunkOk(dev, chunk, data, tags);
- 
--	} while (writeOk != YAFFS_OK && attempts < yaffs_wr_attempts);
-+	} while (writeOk != YAFFS_OK &&
-+		(yaffs_wr_attempts <= 0 || attempts <= yaffs_wr_attempts));
-+
-+	if (!writeOk)
-+		chunk = -1;
- 
- 	if (attempts > 1) {
- 		T(YAFFS_TRACE_ERROR,
-@@ -1009,13 +1015,35 @@ static int yaffs_WriteNewChunkWithTagsTo
-  * Block retiring for handling a broken block.
-  */
- 
--static void yaffs_RetireBlock(yaffs_Device * dev, int blockInNAND)
-+static void yaffs_RetireBlock(yaffs_Device *dev, int blockInNAND)
- {
- 	yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockInNAND);
- 
- 	yaffs_InvalidateCheckpoint(dev);
- 
--	yaffs_MarkBlockBad(dev, blockInNAND);
-+	if (yaffs_MarkBlockBad(dev, blockInNAND) != YAFFS_OK) {
-+		if (yaffs_EraseBlockInNAND(dev, blockInNAND) != YAFFS_OK) {
-+			T(YAFFS_TRACE_ALWAYS, (TSTR(
-+				"yaffs: Failed to mark bad and erase block %d"
-+				TENDSTR), blockInNAND));
-+		} else {
-+			yaffs_ExtendedTags tags;
-+			int chunkId = blockInNAND * dev->nChunksPerBlock;
-+
-+			__u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
-+
-+			memset(buffer, 0xff, dev->nDataBytesPerChunk);
-+			yaffs_InitialiseTags(&tags);
-+			tags.sequenceNumber = YAFFS_SEQUENCE_BAD_BLOCK;
-+			if (dev->writeChunkWithTagsToNAND(dev, chunkId -
-+				dev->chunkOffset, buffer, &tags) != YAFFS_OK)
-+				T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: Failed to "
-+					TCONT("write bad block marker to block %d")
-+					TENDSTR), blockInNAND));
-+
-+			yaffs_ReleaseTempBuffer(dev, buffer, __LINE__);
-+		}
-+	}
- 
- 	bi->blockState = YAFFS_BLOCK_STATE_DEAD;
- 	bi->gcPrioritise = 0;
-@@ -1029,49 +1057,45 @@ static void yaffs_RetireBlock(yaffs_Devi
-  *
-  */
- 
--static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
--				     const __u8 * data,
--				     const yaffs_ExtendedTags * tags)
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+				const __u8 *data,
-+				const yaffs_ExtendedTags *tags)
- {
- }
- 
--static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
--				    const yaffs_ExtendedTags * tags)
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+				const yaffs_ExtendedTags *tags)
- {
- }
- 
- void yaffs_HandleChunkError(yaffs_Device *dev, yaffs_BlockInfo *bi)
- {
--	if(!bi->gcPrioritise){
-+	if (!bi->gcPrioritise) {
- 		bi->gcPrioritise = 1;
- 		dev->hasPendingPrioritisedGCs = 1;
--		bi->chunkErrorStrikes ++;
-+		bi->chunkErrorStrikes++;
- 
--		if(bi->chunkErrorStrikes > 3){
-+		if (bi->chunkErrorStrikes > 3) {
- 			bi->needsRetiring = 1; /* Too many stikes, so retire this */
- 			T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: Block struck out" TENDSTR)));
- 
- 		}
--
- 	}
- }
- 
--static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND, int erasedOk)
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND,
-+		int erasedOk)
- {
--
- 	int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
- 	yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockInNAND);
- 
--	yaffs_HandleChunkError(dev,bi);
-+	yaffs_HandleChunkError(dev, bi);
- 
--
--	if(erasedOk ) {
-+	if (erasedOk) {
- 		/* Was an actual write failure, so mark the block for retirement  */
- 		bi->needsRetiring = 1;
- 		T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
- 		  (TSTR("**>> Block %d needs retiring" TENDSTR), blockInNAND));
--
--
- 	}
- 
- 	/* Delete the chunk */
-@@ -1081,12 +1105,12 @@ static void yaffs_HandleWriteChunkError(
- 
- /*---------------- Name handling functions ------------*/
- 
--static __u16 yaffs_CalcNameSum(const YCHAR * name)
-+static __u16 yaffs_CalcNameSum(const YCHAR *name)
- {
- 	__u16 sum = 0;
- 	__u16 i = 1;
- 
--	YUCHAR *bname = (YUCHAR *) name;
-+	const YUCHAR *bname = (const YUCHAR *) name;
- 	if (bname) {
- 		while ((*bname) && (i < (YAFFS_MAX_NAME_LENGTH/2))) {
- 
-@@ -1102,14 +1126,14 @@ static __u16 yaffs_CalcNameSum(const YCH
- 	return sum;
- }
- 
--static void yaffs_SetObjectName(yaffs_Object * obj, const YCHAR * name)
-+static void yaffs_SetObjectName(yaffs_Object *obj, const YCHAR *name)
- {
- #ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
--	if (name && yaffs_strlen(name) <= YAFFS_SHORT_NAME_LENGTH) {
-+	memset(obj->shortName, 0, sizeof(YCHAR) * (YAFFS_SHORT_NAME_LENGTH+1));
-+	if (name && yaffs_strlen(name) <= YAFFS_SHORT_NAME_LENGTH)
- 		yaffs_strcpy(obj->shortName, name);
--	} else {
-+	else
- 		obj->shortName[0] = _Y('\0');
--	}
- #endif
- 	obj->sum = yaffs_CalcNameSum(name);
- }
-@@ -1126,7 +1150,7 @@ static void yaffs_SetObjectName(yaffs_Ob
-  * Don't use this function directly
-  */
- 
--static int yaffs_CreateTnodes(yaffs_Device * dev, int nTnodes)
-+static int yaffs_CreateTnodes(yaffs_Device *dev, int nTnodes)
- {
- 	int i;
- 	int tnodeSize;
-@@ -1143,6 +1167,9 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 	 * Must be a multiple of 32-bits  */
- 	tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
- 
-+	if (tnodeSize < sizeof(yaffs_Tnode))
-+		tnodeSize = sizeof(yaffs_Tnode);
-+
- 	/* make these things */
- 
- 	newTnodes = YMALLOC(nTnodes * tnodeSize);
-@@ -1150,7 +1177,7 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 
- 	if (!newTnodes) {
- 		T(YAFFS_TRACE_ERROR,
--		  (TSTR("yaffs: Could not allocate Tnodes" TENDSTR)));
-+			(TSTR("yaffs: Could not allocate Tnodes" TENDSTR)));
- 		return YAFFS_FAIL;
- 	}
- 
-@@ -1170,7 +1197,7 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 	dev->freeTnodes = newTnodes;
- #else
- 	/* New hookup for wide tnodes */
--	for(i = 0; i < nTnodes -1; i++) {
-+	for (i = 0; i < nTnodes - 1; i++) {
- 		curr = (yaffs_Tnode *) &mem[i * tnodeSize];
- 		next = (yaffs_Tnode *) &mem[(i+1) * tnodeSize];
- 		curr->internal[0] = next;
-@@ -1197,7 +1224,6 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 		  (TSTR
- 		   ("yaffs: Could not add tnodes to management list" TENDSTR)));
- 		   return YAFFS_FAIL;
--
- 	} else {
- 		tnl->tnodes = newTnodes;
- 		tnl->next = dev->allocatedTnodeList;
-@@ -1211,14 +1237,13 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 
- /* GetTnode gets us a clean tnode. Tries to make allocate more if we run out */
- 
--static yaffs_Tnode *yaffs_GetTnodeRaw(yaffs_Device * dev)
-+static yaffs_Tnode *yaffs_GetTnodeRaw(yaffs_Device *dev)
- {
- 	yaffs_Tnode *tn = NULL;
- 
- 	/* If there are none left make more */
--	if (!dev->freeTnodes) {
-+	if (!dev->freeTnodes)
- 		yaffs_CreateTnodes(dev, YAFFS_ALLOCATION_NTNODES);
--	}
- 
- 	if (dev->freeTnodes) {
- 		tn = dev->freeTnodes;
-@@ -1233,21 +1258,27 @@ static yaffs_Tnode *yaffs_GetTnodeRaw(ya
- 		dev->nFreeTnodes--;
- 	}
- 
-+	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
-+
- 	return tn;
- }
- 
--static yaffs_Tnode *yaffs_GetTnode(yaffs_Device * dev)
-+static yaffs_Tnode *yaffs_GetTnode(yaffs_Device *dev)
- {
- 	yaffs_Tnode *tn = yaffs_GetTnodeRaw(dev);
-+	int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
- 
--	if(tn)
--		memset(tn, 0, (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
-+	if (tnodeSize < sizeof(yaffs_Tnode))
-+		tnodeSize = sizeof(yaffs_Tnode);
-+
-+	if (tn)
-+		memset(tn, 0, tnodeSize);
- 
- 	return tn;
- }
- 
- /* FreeTnode frees up a tnode and puts it back on the free list */
--static void yaffs_FreeTnode(yaffs_Device * dev, yaffs_Tnode * tn)
-+static void yaffs_FreeTnode(yaffs_Device *dev, yaffs_Tnode *tn)
- {
- 	if (tn) {
- #ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG
-@@ -1262,9 +1293,10 @@ static void yaffs_FreeTnode(yaffs_Device
- 		dev->freeTnodes = tn;
- 		dev->nFreeTnodes++;
- 	}
-+	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
- }
- 
--static void yaffs_DeinitialiseTnodes(yaffs_Device * dev)
-+static void yaffs_DeinitialiseTnodes(yaffs_Device *dev)
- {
- 	/* Free the list of allocated tnodes */
- 	yaffs_TnodeList *tmp;
-@@ -1282,71 +1314,72 @@ static void yaffs_DeinitialiseTnodes(yaf
- 	dev->nFreeTnodes = 0;
- }
- 
--static void yaffs_InitialiseTnodes(yaffs_Device * dev)
-+static void yaffs_InitialiseTnodes(yaffs_Device *dev)
- {
- 	dev->allocatedTnodeList = NULL;
- 	dev->freeTnodes = NULL;
- 	dev->nFreeTnodes = 0;
- 	dev->nTnodesCreated = 0;
--
- }
- 
- 
--void yaffs_PutLevel0Tnode(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos, unsigned val)
-+void yaffs_PutLevel0Tnode(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos,
-+		unsigned val)
- {
--  __u32 *map = (__u32 *)tn;
--  __u32 bitInMap;
--  __u32 bitInWord;
--  __u32 wordInMap;
--  __u32 mask;
-+	__u32 *map = (__u32 *)tn;
-+	__u32 bitInMap;
-+	__u32 bitInWord;
-+	__u32 wordInMap;
-+	__u32 mask;
- 
--  pos &= YAFFS_TNODES_LEVEL0_MASK;
--  val >>= dev->chunkGroupBits;
-+	pos &= YAFFS_TNODES_LEVEL0_MASK;
-+	val >>= dev->chunkGroupBits;
- 
--  bitInMap = pos * dev->tnodeWidth;
--  wordInMap = bitInMap /32;
--  bitInWord = bitInMap & (32 -1);
-+	bitInMap = pos * dev->tnodeWidth;
-+	wordInMap = bitInMap / 32;
-+	bitInWord = bitInMap & (32 - 1);
- 
--  mask = dev->tnodeMask << bitInWord;
-+	mask = dev->tnodeMask << bitInWord;
- 
--  map[wordInMap] &= ~mask;
--  map[wordInMap] |= (mask & (val << bitInWord));
-+	map[wordInMap] &= ~mask;
-+	map[wordInMap] |= (mask & (val << bitInWord));
- 
--  if(dev->tnodeWidth > (32-bitInWord)) {
--    bitInWord = (32 - bitInWord);
--    wordInMap++;;
--    mask = dev->tnodeMask >> (/*dev->tnodeWidth -*/ bitInWord);
--    map[wordInMap] &= ~mask;
--    map[wordInMap] |= (mask & (val >> bitInWord));
--  }
-+	if (dev->tnodeWidth > (32 - bitInWord)) {
-+		bitInWord = (32 - bitInWord);
-+		wordInMap++;;
-+		mask = dev->tnodeMask >> (/*dev->tnodeWidth -*/ bitInWord);
-+		map[wordInMap] &= ~mask;
-+		map[wordInMap] |= (mask & (val >> bitInWord));
-+	}
- }
- 
--static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos)
-+static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn,
-+		unsigned pos)
- {
--  __u32 *map = (__u32 *)tn;
--  __u32 bitInMap;
--  __u32 bitInWord;
--  __u32 wordInMap;
--  __u32 val;
-+	__u32 *map = (__u32 *)tn;
-+	__u32 bitInMap;
-+	__u32 bitInWord;
-+	__u32 wordInMap;
-+	__u32 val;
- 
--  pos &= YAFFS_TNODES_LEVEL0_MASK;
-+	pos &= YAFFS_TNODES_LEVEL0_MASK;
- 
--  bitInMap = pos * dev->tnodeWidth;
--  wordInMap = bitInMap /32;
--  bitInWord = bitInMap & (32 -1);
-+	bitInMap = pos * dev->tnodeWidth;
-+	wordInMap = bitInMap / 32;
-+	bitInWord = bitInMap & (32 - 1);
- 
--  val = map[wordInMap] >> bitInWord;
-+	val = map[wordInMap] >> bitInWord;
- 
--  if(dev->tnodeWidth > (32-bitInWord)) {
--    bitInWord = (32 - bitInWord);
--    wordInMap++;;
--    val |= (map[wordInMap] << bitInWord);
--  }
-+	if	(dev->tnodeWidth > (32 - bitInWord)) {
-+		bitInWord = (32 - bitInWord);
-+		wordInMap++;;
-+		val |= (map[wordInMap] << bitInWord);
-+	}
- 
--  val &= dev->tnodeMask;
--  val <<= dev->chunkGroupBits;
-+	val &= dev->tnodeMask;
-+	val <<= dev->chunkGroupBits;
- 
--  return val;
-+	return val;
- }
- 
- /* ------------------- End of individual tnode manipulation -----------------*/
-@@ -1357,24 +1390,21 @@ static __u32 yaffs_GetChunkGroupBase(yaf
-  */
- 
- /* FindLevel0Tnode finds the level 0 tnode, if one exists. */
--static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device * dev,
--					  yaffs_FileStructure * fStruct,
--					  __u32 chunkId)
-+static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev,
-+					yaffs_FileStructure *fStruct,
-+					__u32 chunkId)
- {
--
- 	yaffs_Tnode *tn = fStruct->top;
- 	__u32 i;
- 	int requiredTallness;
- 	int level = fStruct->topLevel;
- 
- 	/* Check sane level and chunk Id */
--	if (level < 0 || level > YAFFS_TNODES_MAX_LEVEL) {
-+	if (level < 0 || level > YAFFS_TNODES_MAX_LEVEL)
- 		return NULL;
--	}
- 
--	if (chunkId > YAFFS_MAX_CHUNK_ID) {
-+	if (chunkId > YAFFS_MAX_CHUNK_ID)
- 		return NULL;
--	}
- 
- 	/* First check we're tall enough (ie enough topLevel) */
- 
-@@ -1385,22 +1415,17 @@ static yaffs_Tnode *yaffs_FindLevel0Tnod
- 		requiredTallness++;
- 	}
- 
--	if (requiredTallness > fStruct->topLevel) {
--		/* Not tall enough, so we can't find it, return NULL. */
--		return NULL;
--	}
-+	if (requiredTallness > fStruct->topLevel)
-+		return NULL; /* Not tall enough, so we can't find it */
- 
- 	/* Traverse down to level 0 */
- 	while (level > 0 && tn) {
--		tn = tn->
--		    internal[(chunkId >>
--			       ( YAFFS_TNODES_LEVEL0_BITS +
--			         (level - 1) *
--			         YAFFS_TNODES_INTERNAL_BITS)
--			      ) &
--			     YAFFS_TNODES_INTERNAL_MASK];
-+		tn = tn->internal[(chunkId >>
-+			(YAFFS_TNODES_LEVEL0_BITS +
-+				(level - 1) *
-+				YAFFS_TNODES_INTERNAL_BITS)) &
-+			YAFFS_TNODES_INTERNAL_MASK];
- 		level--;
--
- 	}
- 
- 	return tn;
-@@ -1417,12 +1442,11 @@ static yaffs_Tnode *yaffs_FindLevel0Tnod
-  *  be plugged into the ttree.
-  */
- 
--static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device * dev,
--					       yaffs_FileStructure * fStruct,
--					       __u32 chunkId,
--					       yaffs_Tnode *passedTn)
-+static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device *dev,
-+					yaffs_FileStructure *fStruct,
-+					__u32 chunkId,
-+					yaffs_Tnode *passedTn)
- {
--
- 	int requiredTallness;
- 	int i;
- 	int l;
-@@ -1432,13 +1456,11 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
- 
- 
- 	/* Check sane level and page Id */
--	if (fStruct->topLevel < 0 || fStruct->topLevel > YAFFS_TNODES_MAX_LEVEL) {
-+	if (fStruct->topLevel < 0 || fStruct->topLevel > YAFFS_TNODES_MAX_LEVEL)
- 		return NULL;
--	}
- 
--	if (chunkId > YAFFS_MAX_CHUNK_ID) {
-+	if (chunkId > YAFFS_MAX_CHUNK_ID)
- 		return NULL;
--	}
- 
- 	/* First check we're tall enough (ie enough topLevel) */
- 
-@@ -1451,7 +1473,7 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
- 
- 
- 	if (requiredTallness > fStruct->topLevel) {
--		/* Not tall enough,gotta make the tree taller */
-+		/* Not tall enough, gotta make the tree taller */
- 		for (i = fStruct->topLevel; i < requiredTallness; i++) {
- 
- 			tn = yaffs_GetTnode(dev);
-@@ -1473,27 +1495,27 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
- 	l = fStruct->topLevel;
- 	tn = fStruct->top;
- 
--	if(l > 0) {
-+	if (l > 0) {
- 		while (l > 0 && tn) {
- 			x = (chunkId >>
--			     ( YAFFS_TNODES_LEVEL0_BITS +
-+			     (YAFFS_TNODES_LEVEL0_BITS +
- 			      (l - 1) * YAFFS_TNODES_INTERNAL_BITS)) &
- 			    YAFFS_TNODES_INTERNAL_MASK;
- 
- 
--			if((l>1) && !tn->internal[x]){
-+			if ((l > 1) && !tn->internal[x]) {
- 				/* Add missing non-level-zero tnode */
- 				tn->internal[x] = yaffs_GetTnode(dev);
- 
--			} else if(l == 1) {
-+			} else if (l == 1) {
- 				/* Looking from level 1 at level 0 */
--			 	if (passedTn) {
-+				if (passedTn) {
- 					/* If we already have one, then release it.*/
--					if(tn->internal[x])
--						yaffs_FreeTnode(dev,tn->internal[x]);
-+					if (tn->internal[x])
-+						yaffs_FreeTnode(dev, tn->internal[x]);
- 					tn->internal[x] = passedTn;
- 
--				} else if(!tn->internal[x]) {
-+				} else if (!tn->internal[x]) {
- 					/* Don't have one, none passed in */
- 					tn->internal[x] = yaffs_GetTnode(dev);
- 				}
-@@ -1504,31 +1526,29 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
- 		}
- 	} else {
- 		/* top is level 0 */
--		if(passedTn) {
--			memcpy(tn,passedTn,(dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
--			yaffs_FreeTnode(dev,passedTn);
-+		if (passedTn) {
-+			memcpy(tn, passedTn, (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
-+			yaffs_FreeTnode(dev, passedTn);
- 		}
- 	}
- 
- 	return tn;
- }
- 
--static int yaffs_FindChunkInGroup(yaffs_Device * dev, int theChunk,
--				  yaffs_ExtendedTags * tags, int objectId,
--				  int chunkInInode)
-+static int yaffs_FindChunkInGroup(yaffs_Device *dev, int theChunk,
-+				yaffs_ExtendedTags *tags, int objectId,
-+				int chunkInInode)
- {
- 	int j;
- 
- 	for (j = 0; theChunk && j < dev->chunkGroupSize; j++) {
--		if (yaffs_CheckChunkBit
--		    (dev, theChunk / dev->nChunksPerBlock,
--		     theChunk % dev->nChunksPerBlock)) {
-+		if (yaffs_CheckChunkBit(dev, theChunk / dev->nChunksPerBlock,
-+				theChunk % dev->nChunksPerBlock)) {
- 			yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL,
- 							tags);
- 			if (yaffs_TagsMatch(tags, objectId, chunkInInode)) {
- 				/* found it; */
- 				return theChunk;
--
- 			}
- 		}
- 		theChunk++;
-@@ -1543,7 +1563,7 @@ static int yaffs_FindChunkInGroup(yaffs_
-  * Returns 0 if it stopped early due to hitting the limit and the delete is incomplete.
-  */
- 
--static int yaffs_DeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, __u32 level,
-+static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level,
- 			      int chunkOffset, int *limit)
- {
- 	int i;
-@@ -1557,7 +1577,6 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 
- 	if (tn) {
- 		if (level > 0) {
--
- 			for (i = YAFFS_NTNODES_INTERNAL - 1; allDone && i >= 0;
- 			     i--) {
- 				if (tn->internal[i]) {
-@@ -1565,17 +1584,17 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 						allDone = 0;
- 					} else {
- 						allDone =
--						    yaffs_DeleteWorker(in,
--								       tn->
--								       internal
--								       [i],
--								       level -
--								       1,
--								       (chunkOffset
-+							yaffs_DeleteWorker(in,
-+								tn->
-+								internal
-+								[i],
-+								level -
-+								1,
-+								(chunkOffset
- 									<<
- 									YAFFS_TNODES_INTERNAL_BITS)
--								       + i,
--								       limit);
-+								+ i,
-+								limit);
- 					}
- 					if (allDone) {
- 						yaffs_FreeTnode(dev,
-@@ -1584,27 +1603,25 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 						tn->internal[i] = NULL;
- 					}
- 				}
--
- 			}
- 			return (allDone) ? 1 : 0;
- 		} else if (level == 0) {
- 			int hitLimit = 0;
- 
- 			for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0 && !hitLimit;
--			     i--) {
--			        theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
-+					i--) {
-+				theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
- 				if (theChunk) {
- 
--					chunkInInode =
--					    (chunkOffset <<
--					     YAFFS_TNODES_LEVEL0_BITS) + i;
-+					chunkInInode = (chunkOffset <<
-+						YAFFS_TNODES_LEVEL0_BITS) + i;
- 
- 					foundChunk =
--					    yaffs_FindChunkInGroup(dev,
--								   theChunk,
--								   &tags,
--								   in->objectId,
--								   chunkInInode);
-+						yaffs_FindChunkInGroup(dev,
-+								theChunk,
-+								&tags,
-+								in->objectId,
-+								chunkInInode);
- 
- 					if (foundChunk > 0) {
- 						yaffs_DeleteChunk(dev,
-@@ -1613,14 +1630,13 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 						in->nDataChunks--;
- 						if (limit) {
- 							*limit = *limit - 1;
--							if (*limit <= 0) {
-+							if (*limit <= 0)
- 								hitLimit = 1;
--							}
- 						}
- 
- 					}
- 
--					yaffs_PutLevel0Tnode(dev,tn,i,0);
-+					yaffs_PutLevel0Tnode(dev, tn, i, 0);
- 				}
- 
- 			}
-@@ -1634,9 +1650,8 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 
- }
- 
--static void yaffs_SoftDeleteChunk(yaffs_Device * dev, int chunk)
-+static void yaffs_SoftDeleteChunk(yaffs_Device *dev, int chunk)
- {
--
- 	yaffs_BlockInfo *theBlock;
- 
- 	T(YAFFS_TRACE_DELETION, (TSTR("soft delete chunk %d" TENDSTR), chunk));
-@@ -1654,7 +1669,7 @@ static void yaffs_SoftDeleteChunk(yaffs_
-  * Thus, essentially this is the same as DeleteWorker except that the chunks are soft deleted.
-  */
- 
--static int yaffs_SoftDeleteWorker(yaffs_Object * in, yaffs_Tnode * tn,
-+static int yaffs_SoftDeleteWorker(yaffs_Object *in, yaffs_Tnode *tn,
- 				  __u32 level, int chunkOffset)
- {
- 	int i;
-@@ -1691,14 +1706,14 @@ static int yaffs_SoftDeleteWorker(yaffs_
- 		} else if (level == 0) {
- 
- 			for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0; i--) {
--				theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
-+				theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
- 				if (theChunk) {
- 					/* Note this does not find the real chunk, only the chunk group.
- 					 * We make an assumption that a chunk group is not larger than
- 					 * a block.
- 					 */
- 					yaffs_SoftDeleteChunk(dev, theChunk);
--					yaffs_PutLevel0Tnode(dev,tn,i,0);
-+					yaffs_PutLevel0Tnode(dev, tn, i, 0);
- 				}
- 
- 			}
-@@ -1712,7 +1727,7 @@ static int yaffs_SoftDeleteWorker(yaffs_
- 
- }
- 
--static void yaffs_SoftDeleteFile(yaffs_Object * obj)
-+static void yaffs_SoftDeleteFile(yaffs_Object *obj)
- {
- 	if (obj->deleted &&
- 	    obj->variantType == YAFFS_OBJECT_TYPE_FILE && !obj->softDeleted) {
-@@ -1746,8 +1761,8 @@ static void yaffs_SoftDeleteFile(yaffs_O
-  * by a special case.
-  */
- 
--static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device * dev, yaffs_Tnode * tn,
--				      __u32 level, int del0)
-+static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device *dev, yaffs_Tnode *tn,
-+				__u32 level, int del0)
- {
- 	int i;
- 	int hasData;
-@@ -1763,9 +1778,8 @@ static yaffs_Tnode *yaffs_PruneWorker(ya
- 						      (i == 0) ? del0 : 1);
- 			}
- 
--			if (tn->internal[i]) {
-+			if (tn->internal[i])
- 				hasData++;
--			}
- 		}
- 
- 		if (hasData == 0 && del0) {
-@@ -1781,8 +1795,8 @@ static yaffs_Tnode *yaffs_PruneWorker(ya
- 
- }
- 
--static int yaffs_PruneFileStructure(yaffs_Device * dev,
--				    yaffs_FileStructure * fStruct)
-+static int yaffs_PruneFileStructure(yaffs_Device *dev,
-+				yaffs_FileStructure *fStruct)
- {
- 	int i;
- 	int hasData;
-@@ -1805,9 +1819,8 @@ static int yaffs_PruneFileStructure(yaff
- 
- 			hasData = 0;
- 			for (i = 1; i < YAFFS_NTNODES_INTERNAL; i++) {
--				if (tn->internal[i]) {
-+				if (tn->internal[i])
- 					hasData++;
--				}
- 			}
- 
- 			if (!hasData) {
-@@ -1828,7 +1841,7 @@ static int yaffs_PruneFileStructure(yaff
- /* yaffs_CreateFreeObjects creates a bunch more objects and
-  * adds them to the object free list.
-  */
--static int yaffs_CreateFreeObjects(yaffs_Device * dev, int nObjects)
-+static int yaffs_CreateFreeObjects(yaffs_Device *dev, int nObjects)
- {
- 	int i;
- 	yaffs_Object *newObjects;
-@@ -1842,9 +1855,9 @@ static int yaffs_CreateFreeObjects(yaffs
- 	list = YMALLOC(sizeof(yaffs_ObjectList));
- 
- 	if (!newObjects || !list) {
--		if(newObjects)
-+		if (newObjects)
- 			YFREE(newObjects);
--		if(list)
-+		if (list)
- 			YFREE(list);
- 		T(YAFFS_TRACE_ALLOCATE,
- 		  (TSTR("yaffs: Could not allocate more objects" TENDSTR)));
-@@ -1854,7 +1867,7 @@ static int yaffs_CreateFreeObjects(yaffs
- 	/* Hook them into the free list */
- 	for (i = 0; i < nObjects - 1; i++) {
- 		newObjects[i].siblings.next =
--		    (struct list_head *)(&newObjects[i + 1]);
-+				(struct ylist_head *)(&newObjects[i + 1]);
- 	}
- 
- 	newObjects[nObjects - 1].siblings.next = (void *)dev->freeObjects;
-@@ -1873,85 +1886,109 @@ static int yaffs_CreateFreeObjects(yaffs
- 
- 
- /* AllocateEmptyObject gets us a clean Object. Tries to make allocate more if we run out */
--static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device * dev)
-+static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device *dev)
- {
- 	yaffs_Object *tn = NULL;
- 
-+#ifdef VALGRIND_TEST
-+	tn = YMALLOC(sizeof(yaffs_Object));
-+#else
- 	/* If there are none left make more */
--	if (!dev->freeObjects) {
-+	if (!dev->freeObjects)
- 		yaffs_CreateFreeObjects(dev, YAFFS_ALLOCATION_NOBJECTS);
--	}
- 
- 	if (dev->freeObjects) {
- 		tn = dev->freeObjects;
- 		dev->freeObjects =
--		    (yaffs_Object *) (dev->freeObjects->siblings.next);
-+			(yaffs_Object *) (dev->freeObjects->siblings.next);
- 		dev->nFreeObjects--;
--
-+	}
-+#endif
-+	if (tn) {
- 		/* Now sweeten it up... */
- 
- 		memset(tn, 0, sizeof(yaffs_Object));
-+		tn->beingCreated = 1;
-+
- 		tn->myDev = dev;
--		tn->chunkId = -1;
-+		tn->hdrChunk = 0;
- 		tn->variantType = YAFFS_OBJECT_TYPE_UNKNOWN;
--		INIT_LIST_HEAD(&(tn->hardLinks));
--		INIT_LIST_HEAD(&(tn->hashLink));
--		INIT_LIST_HEAD(&tn->siblings);
-+		YINIT_LIST_HEAD(&(tn->hardLinks));
-+		YINIT_LIST_HEAD(&(tn->hashLink));
-+		YINIT_LIST_HEAD(&tn->siblings);
-+
-+
-+		/* Now make the directory sane */
-+		if (dev->rootDir) {
-+			tn->parent = dev->rootDir;
-+			ylist_add(&(tn->siblings), &dev->rootDir->variant.directoryVariant.children);
-+		}
- 
- 		/* Add it to the lost and found directory.
- 		 * NB Can't put root or lostNFound in lostNFound so
- 		 * check if lostNFound exists first
- 		 */
--		if (dev->lostNFoundDir) {
-+		if (dev->lostNFoundDir)
- 			yaffs_AddObjectToDirectory(dev->lostNFoundDir, tn);
--		}
-+
-+		tn->beingCreated = 0;
- 	}
- 
-+	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
-+
- 	return tn;
- }
- 
--static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device * dev, int number,
-+static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device *dev, int number,
- 					       __u32 mode)
- {
- 
- 	yaffs_Object *obj =
- 	    yaffs_CreateNewObject(dev, number, YAFFS_OBJECT_TYPE_DIRECTORY);
- 	if (obj) {
--		obj->fake = 1;		/* it is fake so it has no NAND presence... */
-+		obj->fake = 1;		/* it is fake so it might have no NAND presence... */
- 		obj->renameAllowed = 0;	/* ... and we're not allowed to rename it... */
- 		obj->unlinkAllowed = 0;	/* ... or unlink it */
- 		obj->deleted = 0;
- 		obj->unlinked = 0;
- 		obj->yst_mode = mode;
- 		obj->myDev = dev;
--		obj->chunkId = 0;	/* Not a valid chunk. */
-+		obj->hdrChunk = 0;	/* Not a valid chunk. */
- 	}
- 
- 	return obj;
- 
- }
- 
--static void yaffs_UnhashObject(yaffs_Object * tn)
-+static void yaffs_UnhashObject(yaffs_Object *tn)
- {
- 	int bucket;
- 	yaffs_Device *dev = tn->myDev;
- 
- 	/* If it is still linked into the bucket list, free from the list */
--	if (!list_empty(&tn->hashLink)) {
--		list_del_init(&tn->hashLink);
-+	if (!ylist_empty(&tn->hashLink)) {
-+		ylist_del_init(&tn->hashLink);
- 		bucket = yaffs_HashFunction(tn->objectId);
- 		dev->objectBucket[bucket].count--;
- 	}
--
- }
- 
- /*  FreeObject frees up a Object and puts it back on the free list */
--static void yaffs_FreeObject(yaffs_Object * tn)
-+static void yaffs_FreeObject(yaffs_Object *tn)
- {
--
- 	yaffs_Device *dev = tn->myDev;
- 
--#ifdef  __KERNEL__
-+#ifdef __KERNEL__
-+	T(YAFFS_TRACE_OS, (TSTR("FreeObject %p inode %p"TENDSTR), tn, tn->myInode));
-+#endif
-+
-+	if (tn->parent)
-+		YBUG();
-+	if (!ylist_empty(&tn->siblings))
-+		YBUG();
-+
-+
-+#ifdef __KERNEL__
- 	if (tn->myInode) {
- 		/* We're still hooked up to a cached inode.
- 		 * Don't delete now, but mark for later deletion
-@@ -1963,24 +2000,28 @@ static void yaffs_FreeObject(yaffs_Objec
- 
- 	yaffs_UnhashObject(tn);
- 
-+#ifdef VALGRIND_TEST
-+	YFREE(tn);
-+#else
- 	/* Link into the free list. */
--	tn->siblings.next = (struct list_head *)(dev->freeObjects);
-+	tn->siblings.next = (struct ylist_head *)(dev->freeObjects);
- 	dev->freeObjects = tn;
- 	dev->nFreeObjects++;
-+#endif
-+	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
- }
- 
- #ifdef __KERNEL__
- 
--void yaffs_HandleDeferedFree(yaffs_Object * obj)
-+void yaffs_HandleDeferedFree(yaffs_Object *obj)
- {
--	if (obj->deferedFree) {
-+	if (obj->deferedFree)
- 		yaffs_FreeObject(obj);
--	}
- }
- 
- #endif
- 
--static void yaffs_DeinitialiseObjects(yaffs_Device * dev)
-+static void yaffs_DeinitialiseObjects(yaffs_Device *dev)
- {
- 	/* Free the list of allocated Objects */
- 
-@@ -1998,7 +2039,7 @@ static void yaffs_DeinitialiseObjects(ya
- 	dev->nFreeObjects = 0;
- }
- 
--static void yaffs_InitialiseObjects(yaffs_Device * dev)
-+static void yaffs_InitialiseObjects(yaffs_Device *dev)
- {
- 	int i;
- 
-@@ -2007,15 +2048,14 @@ static void yaffs_InitialiseObjects(yaff
- 	dev->nFreeObjects = 0;
- 
- 	for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) {
--		INIT_LIST_HEAD(&dev->objectBucket[i].list);
-+		YINIT_LIST_HEAD(&dev->objectBucket[i].list);
- 		dev->objectBucket[i].count = 0;
- 	}
--
- }
- 
--static int yaffs_FindNiceObjectBucket(yaffs_Device * dev)
-+static int yaffs_FindNiceObjectBucket(yaffs_Device *dev)
- {
--	static int x = 0;
-+	static int x;
- 	int i;
- 	int l = 999;
- 	int lowest = 999999;
-@@ -2049,7 +2089,7 @@ static int yaffs_FindNiceObjectBucket(ya
- 	return l;
- }
- 
--static int yaffs_CreateNewObjectNumber(yaffs_Device * dev)
-+static int yaffs_CreateNewObjectNumber(yaffs_Device *dev)
- {
- 	int bucket = yaffs_FindNiceObjectBucket(dev);
- 
-@@ -2058,7 +2098,7 @@ static int yaffs_CreateNewObjectNumber(y
- 	 */
- 
- 	int found = 0;
--	struct list_head *i;
-+	struct ylist_head *i;
- 
- 	__u32 n = (__u32) bucket;
- 
-@@ -2068,41 +2108,38 @@ static int yaffs_CreateNewObjectNumber(y
- 		found = 1;
- 		n += YAFFS_NOBJECT_BUCKETS;
- 		if (1 || dev->objectBucket[bucket].count > 0) {
--			list_for_each(i, &dev->objectBucket[bucket].list) {
-+			ylist_for_each(i, &dev->objectBucket[bucket].list) {
- 				/* If there is already one in the list */
--				if (i
--				    && list_entry(i, yaffs_Object,
--						  hashLink)->objectId == n) {
-+				if (i && ylist_entry(i, yaffs_Object,
-+						hashLink)->objectId == n) {
- 					found = 0;
- 				}
- 			}
- 		}
- 	}
- 
--
- 	return n;
- }
- 
--static void yaffs_HashObject(yaffs_Object * in)
-+static void yaffs_HashObject(yaffs_Object *in)
- {
- 	int bucket = yaffs_HashFunction(in->objectId);
- 	yaffs_Device *dev = in->myDev;
- 
--	list_add(&in->hashLink, &dev->objectBucket[bucket].list);
-+	ylist_add(&in->hashLink, &dev->objectBucket[bucket].list);
- 	dev->objectBucket[bucket].count++;
--
- }
- 
--yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device * dev, __u32 number)
-+yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev, __u32 number)
- {
- 	int bucket = yaffs_HashFunction(number);
--	struct list_head *i;
-+	struct ylist_head *i;
- 	yaffs_Object *in;
- 
--	list_for_each(i, &dev->objectBucket[bucket].list) {
-+	ylist_for_each(i, &dev->objectBucket[bucket].list) {
- 		/* Look if it is in the list */
- 		if (i) {
--			in = list_entry(i, yaffs_Object, hashLink);
-+			in = ylist_entry(i, yaffs_Object, hashLink);
- 			if (in->objectId == number) {
- #ifdef __KERNEL__
- 				/* Don't tell the VFS about this one if it is defered free */
-@@ -2118,31 +2155,27 @@ yaffs_Object *yaffs_FindObjectByNumber(y
- 	return NULL;
- }
- 
--yaffs_Object *yaffs_CreateNewObject(yaffs_Device * dev, int number,
-+yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev, int number,
- 				    yaffs_ObjectType type)
- {
--
- 	yaffs_Object *theObject;
--	yaffs_Tnode *tn;
-+	yaffs_Tnode *tn = NULL;
- 
--	if (number < 0) {
-+	if (number < 0)
- 		number = yaffs_CreateNewObjectNumber(dev);
--	}
- 
- 	theObject = yaffs_AllocateEmptyObject(dev);
--	if(!theObject)
-+	if (!theObject)
- 		return NULL;
- 
--	if(type == YAFFS_OBJECT_TYPE_FILE){
-+	if (type == YAFFS_OBJECT_TYPE_FILE) {
- 		tn = yaffs_GetTnode(dev);
--		if(!tn){
-+		if (!tn) {
- 			yaffs_FreeObject(theObject);
- 			return NULL;
- 		}
- 	}
- 
--
--
- 	if (theObject) {
- 		theObject->fake = 0;
- 		theObject->renameAllowed = 1;
-@@ -2171,8 +2204,8 @@ yaffs_Object *yaffs_CreateNewObject(yaff
- 			theObject->variant.fileVariant.top = tn;
- 			break;
- 		case YAFFS_OBJECT_TYPE_DIRECTORY:
--			INIT_LIST_HEAD(&theObject->variant.directoryVariant.
--				       children);
-+			YINIT_LIST_HEAD(&theObject->variant.directoryVariant.
-+					children);
- 			break;
- 		case YAFFS_OBJECT_TYPE_SYMLINK:
- 		case YAFFS_OBJECT_TYPE_HARDLINK:
-@@ -2188,32 +2221,30 @@ yaffs_Object *yaffs_CreateNewObject(yaff
- 	return theObject;
- }
- 
--static yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device * dev,
-+static yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device *dev,
- 						      int number,
- 						      yaffs_ObjectType type)
- {
- 	yaffs_Object *theObject = NULL;
- 
--	if (number > 0) {
-+	if (number > 0)
- 		theObject = yaffs_FindObjectByNumber(dev, number);
--	}
- 
--	if (!theObject) {
-+	if (!theObject)
- 		theObject = yaffs_CreateNewObject(dev, number, type);
--	}
- 
- 	return theObject;
- 
- }
- 
- 
--static YCHAR *yaffs_CloneString(const YCHAR * str)
-+static YCHAR *yaffs_CloneString(const YCHAR *str)
- {
- 	YCHAR *newStr = NULL;
- 
- 	if (str && *str) {
- 		newStr = YMALLOC((yaffs_strlen(str) + 1) * sizeof(YCHAR));
--		if(newStr)
-+		if (newStr)
- 			yaffs_strcpy(newStr, str);
- 	}
- 
-@@ -2229,29 +2260,31 @@ static YCHAR *yaffs_CloneString(const YC
-  */
- 
- static yaffs_Object *yaffs_MknodObject(yaffs_ObjectType type,
--				       yaffs_Object * parent,
--				       const YCHAR * name,
-+				       yaffs_Object *parent,
-+				       const YCHAR *name,
- 				       __u32 mode,
- 				       __u32 uid,
- 				       __u32 gid,
--				       yaffs_Object * equivalentObject,
--				       const YCHAR * aliasString, __u32 rdev)
-+				       yaffs_Object *equivalentObject,
-+				       const YCHAR *aliasString, __u32 rdev)
- {
- 	yaffs_Object *in;
--	YCHAR *str;
-+	YCHAR *str = NULL;
- 
- 	yaffs_Device *dev = parent->myDev;
- 
- 	/* Check if the entry exists. If it does then fail the call since we don't want a dup.*/
--	if (yaffs_FindObjectByName(parent, name)) {
-+	if (yaffs_FindObjectByName(parent, name))
- 		return NULL;
--	}
- 
- 	in = yaffs_CreateNewObject(dev, -1, type);
- 
--	if(type == YAFFS_OBJECT_TYPE_SYMLINK){
-+	if (!in)
-+		return YAFFS_FAIL;
-+
-+	if (type == YAFFS_OBJECT_TYPE_SYMLINK) {
- 		str = yaffs_CloneString(aliasString);
--		if(!str){
-+		if (!str) {
- 			yaffs_FreeObject(in);
- 			return NULL;
- 		}
-@@ -2260,7 +2293,7 @@ static yaffs_Object *yaffs_MknodObject(y
- 
- 
- 	if (in) {
--		in->chunkId = -1;
-+		in->hdrChunk = 0;
- 		in->valid = 1;
- 		in->variantType = type;
- 
-@@ -2293,10 +2326,10 @@ static yaffs_Object *yaffs_MknodObject(y
- 			break;
- 		case YAFFS_OBJECT_TYPE_HARDLINK:
- 			in->variant.hardLinkVariant.equivalentObject =
--			    equivalentObject;
-+				equivalentObject;
- 			in->variant.hardLinkVariant.equivalentObjectId =
--			    equivalentObject->objectId;
--			list_add(&in->hardLinks, &equivalentObject->hardLinks);
-+				equivalentObject->objectId;
-+			ylist_add(&in->hardLinks, &equivalentObject->hardLinks);
- 			break;
- 		case YAFFS_OBJECT_TYPE_FILE:
- 		case YAFFS_OBJECT_TYPE_DIRECTORY:
-@@ -2308,7 +2341,7 @@ static yaffs_Object *yaffs_MknodObject(y
- 
- 		if (yaffs_UpdateObjectHeader(in, name, 0, 0, 0) < 0) {
- 			/* Could not create the object header, fail the creation */
--			yaffs_DestroyObject(in);
-+			yaffs_DeleteObject(in);
- 			in = NULL;
- 		}
- 
-@@ -2317,38 +2350,38 @@ static yaffs_Object *yaffs_MknodObject(y
- 	return in;
- }
- 
--yaffs_Object *yaffs_MknodFile(yaffs_Object * parent, const YCHAR * name,
--			      __u32 mode, __u32 uid, __u32 gid)
-+yaffs_Object *yaffs_MknodFile(yaffs_Object *parent, const YCHAR *name,
-+			__u32 mode, __u32 uid, __u32 gid)
- {
- 	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_FILE, parent, name, mode,
--				 uid, gid, NULL, NULL, 0);
-+				uid, gid, NULL, NULL, 0);
- }
- 
--yaffs_Object *yaffs_MknodDirectory(yaffs_Object * parent, const YCHAR * name,
--				   __u32 mode, __u32 uid, __u32 gid)
-+yaffs_Object *yaffs_MknodDirectory(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid)
- {
- 	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_DIRECTORY, parent, name,
- 				 mode, uid, gid, NULL, NULL, 0);
- }
- 
--yaffs_Object *yaffs_MknodSpecial(yaffs_Object * parent, const YCHAR * name,
--				 __u32 mode, __u32 uid, __u32 gid, __u32 rdev)
-+yaffs_Object *yaffs_MknodSpecial(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid, __u32 rdev)
- {
- 	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SPECIAL, parent, name, mode,
- 				 uid, gid, NULL, NULL, rdev);
- }
- 
--yaffs_Object *yaffs_MknodSymLink(yaffs_Object * parent, const YCHAR * name,
--				 __u32 mode, __u32 uid, __u32 gid,
--				 const YCHAR * alias)
-+yaffs_Object *yaffs_MknodSymLink(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid,
-+				const YCHAR *alias)
- {
- 	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SYMLINK, parent, name, mode,
--				 uid, gid, NULL, alias, 0);
-+				uid, gid, NULL, alias, 0);
- }
- 
- /* yaffs_Link returns the object id of the equivalent object.*/
--yaffs_Object *yaffs_Link(yaffs_Object * parent, const YCHAR * name,
--			 yaffs_Object * equivalentObject)
-+yaffs_Object *yaffs_Link(yaffs_Object *parent, const YCHAR *name,
-+			yaffs_Object *equivalentObject)
- {
- 	/* Get the real object in case we were fed a hard link as an equivalent object */
- 	equivalentObject = yaffs_GetEquivalentObject(equivalentObject);
-@@ -2363,33 +2396,31 @@ yaffs_Object *yaffs_Link(yaffs_Object * 
- 
- }
- 
--static int yaffs_ChangeObjectName(yaffs_Object * obj, yaffs_Object * newDir,
--				  const YCHAR * newName, int force, int shadows)
-+static int yaffs_ChangeObjectName(yaffs_Object *obj, yaffs_Object *newDir,
-+				const YCHAR *newName, int force, int shadows)
- {
- 	int unlinkOp;
- 	int deleteOp;
- 
- 	yaffs_Object *existingTarget;
- 
--	if (newDir == NULL) {
-+	if (newDir == NULL)
- 		newDir = obj->parent;	/* use the old directory */
--	}
- 
- 	if (newDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
- 		T(YAFFS_TRACE_ALWAYS,
- 		  (TSTR
--		   ("tragendy: yaffs_ChangeObjectName: newDir is not a directory"
-+		   ("tragedy: yaffs_ChangeObjectName: newDir is not a directory"
- 		    TENDSTR)));
- 		YBUG();
- 	}
- 
- 	/* TODO: Do we need this different handling for YAFFS2 and YAFFS1?? */
--	if (obj->myDev->isYaffs2) {
-+	if (obj->myDev->isYaffs2)
- 		unlinkOp = (newDir == obj->myDev->unlinkedDir);
--	} else {
-+	else
- 		unlinkOp = (newDir == obj->myDev->unlinkedDir
- 			    && obj->variantType == YAFFS_OBJECT_TYPE_FILE);
--	}
- 
- 	deleteOp = (newDir == obj->myDev->deletedDir);
- 
-@@ -2415,40 +2446,40 @@ static int yaffs_ChangeObjectName(yaffs_
- 			obj->unlinked = 1;
- 
- 		/* If it is a deletion then we mark it as a shrink for gc purposes. */
--		if (yaffs_UpdateObjectHeader(obj, newName, 0, deleteOp, shadows)>= 0)
-+		if (yaffs_UpdateObjectHeader(obj, newName, 0, deleteOp, shadows) >= 0)
- 			return YAFFS_OK;
- 	}
- 
- 	return YAFFS_FAIL;
- }
- 
--int yaffs_RenameObject(yaffs_Object * oldDir, const YCHAR * oldName,
--		       yaffs_Object * newDir, const YCHAR * newName)
-+int yaffs_RenameObject(yaffs_Object *oldDir, const YCHAR *oldName,
-+		yaffs_Object *newDir, const YCHAR *newName)
- {
--	yaffs_Object *obj;
--	yaffs_Object *existingTarget;
-+	yaffs_Object *obj = NULL;
-+	yaffs_Object *existingTarget = NULL;
- 	int force = 0;
- 
-+
-+	if (!oldDir || oldDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
-+		YBUG();
-+	if (!newDir || newDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
-+		YBUG();
-+
- #ifdef CONFIG_YAFFS_CASE_INSENSITIVE
- 	/* Special case for case insemsitive systems (eg. WinCE).
- 	 * While look-up is case insensitive, the name isn't.
- 	 * Therefore we might want to change x.txt to X.txt
- 	*/
--	if (oldDir == newDir && yaffs_strcmp(oldName, newName) == 0) {
-+	if (oldDir == newDir && yaffs_strcmp(oldName, newName) == 0)
- 		force = 1;
--	}
- #endif
- 
-+	else if (yaffs_strlen(newName) > YAFFS_MAX_NAME_LENGTH)
-+		/* ENAMETOOLONG */
-+		return YAFFS_FAIL;
-+
- 	obj = yaffs_FindObjectByName(oldDir, oldName);
--	/* Check new name to long. */
--	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK &&
--	    yaffs_strlen(newName) > YAFFS_MAX_ALIAS_LENGTH)
--	  /* ENAMETOOLONG */
--	  return YAFFS_FAIL;
--	else if (obj->variantType != YAFFS_OBJECT_TYPE_SYMLINK &&
--		 yaffs_strlen(newName) > YAFFS_MAX_NAME_LENGTH)
--	  /* ENAMETOOLONG */
--	  return YAFFS_FAIL;
- 
- 	if (obj && obj->renameAllowed) {
- 
-@@ -2456,8 +2487,8 @@ int yaffs_RenameObject(yaffs_Object * ol
- 
- 		existingTarget = yaffs_FindObjectByName(newDir, newName);
- 		if (existingTarget &&
--		    existingTarget->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
--		    !list_empty(&existingTarget->variant.directoryVariant.children)) {
-+			existingTarget->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
-+			!ylist_empty(&existingTarget->variant.directoryVariant.children)) {
- 			/* There is a target that is a non-empty directory, so we fail */
- 			return YAFFS_FAIL;	/* EEXIST or ENOTEMPTY */
- 		} else if (existingTarget && existingTarget != obj) {
-@@ -2465,7 +2496,7 @@ int yaffs_RenameObject(yaffs_Object * ol
- 			 * but only if it isn't the same object
- 			 */
- 			yaffs_ChangeObjectName(obj, newDir, newName, force,
--					       existingTarget->objectId);
-+						existingTarget->objectId);
- 			yaffs_UnlinkObject(existingTarget);
- 		}
- 
-@@ -2476,7 +2507,7 @@ int yaffs_RenameObject(yaffs_Object * ol
- 
- /*------------------------- Block Management and Page Allocation ----------------*/
- 
--static int yaffs_InitialiseBlocks(yaffs_Device * dev)
-+static int yaffs_InitialiseBlocks(yaffs_Device *dev)
- {
- 	int nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1;
- 
-@@ -2487,23 +2518,20 @@ static int yaffs_InitialiseBlocks(yaffs_
- 
- 	/* If the first allocation strategy fails, thry the alternate one */
- 	dev->blockInfo = YMALLOC(nBlocks * sizeof(yaffs_BlockInfo));
--	if(!dev->blockInfo){
-+	if (!dev->blockInfo) {
- 		dev->blockInfo = YMALLOC_ALT(nBlocks * sizeof(yaffs_BlockInfo));
- 		dev->blockInfoAlt = 1;
--	}
--	else
-+	} else
- 		dev->blockInfoAlt = 0;
- 
--	if(dev->blockInfo){
--
-+	if (dev->blockInfo) {
- 		/* Set up dynamic blockinfo stuff. */
- 		dev->chunkBitmapStride = (dev->nChunksPerBlock + 7) / 8; /* round up bytes */
- 		dev->chunkBits = YMALLOC(dev->chunkBitmapStride * nBlocks);
--		if(!dev->chunkBits){
-+		if (!dev->chunkBits) {
- 			dev->chunkBits = YMALLOC_ALT(dev->chunkBitmapStride * nBlocks);
- 			dev->chunkBitsAlt = 1;
--		}
--		else
-+		} else
- 			dev->chunkBitsAlt = 0;
- 	}
- 
-@@ -2514,30 +2542,29 @@ static int yaffs_InitialiseBlocks(yaffs_
- 	}
- 
- 	return YAFFS_FAIL;
--
- }
- 
--static void yaffs_DeinitialiseBlocks(yaffs_Device * dev)
-+static void yaffs_DeinitialiseBlocks(yaffs_Device *dev)
- {
--	if(dev->blockInfoAlt && dev->blockInfo)
-+	if (dev->blockInfoAlt && dev->blockInfo)
- 		YFREE_ALT(dev->blockInfo);
--	else if(dev->blockInfo)
-+	else if (dev->blockInfo)
- 		YFREE(dev->blockInfo);
- 
- 	dev->blockInfoAlt = 0;
- 
- 	dev->blockInfo = NULL;
- 
--	if(dev->chunkBitsAlt && dev->chunkBits)
-+	if (dev->chunkBitsAlt && dev->chunkBits)
- 		YFREE_ALT(dev->chunkBits);
--	else if(dev->chunkBits)
-+	else if (dev->chunkBits)
- 		YFREE(dev->chunkBits);
- 	dev->chunkBitsAlt = 0;
- 	dev->chunkBits = NULL;
- }
- 
--static int yaffs_BlockNotDisqualifiedFromGC(yaffs_Device * dev,
--					    yaffs_BlockInfo * bi)
-+static int yaffs_BlockNotDisqualifiedFromGC(yaffs_Device *dev,
-+					yaffs_BlockInfo *bi)
- {
- 	int i;
- 	__u32 seq;
-@@ -2556,7 +2583,7 @@ static int yaffs_BlockNotDisqualifiedFro
- 		seq = dev->sequenceNumber;
- 
- 		for (i = dev->internalStartBlock; i <= dev->internalEndBlock;
--		     i++) {
-+				i++) {
- 			b = yaffs_GetBlockInfo(dev, i);
- 			if (b->blockState == YAFFS_BLOCK_STATE_FULL &&
- 			    (b->pagesInUse - b->softDeletions) <
-@@ -2571,38 +2598,36 @@ static int yaffs_BlockNotDisqualifiedFro
- 	 * discarded pages.
- 	 */
- 	return (bi->sequenceNumber <= dev->oldestDirtySequence);
--
- }
- 
- /* FindDiretiestBlock is used to select the dirtiest block (or close enough)
-  * for garbage collection.
-  */
- 
--static int yaffs_FindBlockForGarbageCollection(yaffs_Device * dev,
--					       int aggressive)
-+static int yaffs_FindBlockForGarbageCollection(yaffs_Device *dev,
-+					int aggressive)
- {
--
- 	int b = dev->currentDirtyChecker;
- 
- 	int i;
- 	int iterations;
- 	int dirtiest = -1;
- 	int pagesInUse = 0;
--	int prioritised=0;
-+	int prioritised = 0;
- 	yaffs_BlockInfo *bi;
- 	int pendingPrioritisedExist = 0;
- 
- 	/* First let's see if we need to grab a prioritised block */
--	if(dev->hasPendingPrioritisedGCs){
--		for(i = dev->internalStartBlock; i < dev->internalEndBlock && !prioritised; i++){
-+	if (dev->hasPendingPrioritisedGCs) {
-+		for (i = dev->internalStartBlock; i < dev->internalEndBlock && !prioritised; i++) {
- 
- 			bi = yaffs_GetBlockInfo(dev, i);
--			//yaffs_VerifyBlock(dev,bi,i);
-+			/* yaffs_VerifyBlock(dev,bi,i); */
- 
--			if(bi->gcPrioritise) {
-+			if (bi->gcPrioritise) {
- 				pendingPrioritisedExist = 1;
--				if(bi->blockState == YAFFS_BLOCK_STATE_FULL &&
--				   yaffs_BlockNotDisqualifiedFromGC(dev, bi)){
-+				if (bi->blockState == YAFFS_BLOCK_STATE_FULL &&
-+				   yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
- 					pagesInUse = (bi->pagesInUse - bi->softDeletions);
- 					dirtiest = i;
- 					prioritised = 1;
-@@ -2611,7 +2636,7 @@ static int yaffs_FindBlockForGarbageColl
- 			}
- 		}
- 
--		if(!pendingPrioritisedExist) /* None found, so we can clear this */
-+		if (!pendingPrioritisedExist) /* None found, so we can clear this */
- 			dev->hasPendingPrioritisedGCs = 0;
- 	}
- 
-@@ -2623,31 +2648,28 @@ static int yaffs_FindBlockForGarbageColl
- 
- 	dev->nonAggressiveSkip--;
- 
--	if (!aggressive && (dev->nonAggressiveSkip > 0)) {
-+	if (!aggressive && (dev->nonAggressiveSkip > 0))
- 		return -1;
--	}
- 
--	if(!prioritised)
-+	if (!prioritised)
- 		pagesInUse =
--	    		(aggressive) ? dev->nChunksPerBlock : YAFFS_PASSIVE_GC_CHUNKS + 1;
-+			(aggressive) ? dev->nChunksPerBlock : YAFFS_PASSIVE_GC_CHUNKS + 1;
- 
--	if (aggressive) {
-+	if (aggressive)
- 		iterations =
- 		    dev->internalEndBlock - dev->internalStartBlock + 1;
--	} else {
-+	else {
- 		iterations =
- 		    dev->internalEndBlock - dev->internalStartBlock + 1;
- 		iterations = iterations / 16;
--		if (iterations > 200) {
-+		if (iterations > 200)
- 			iterations = 200;
--		}
- 	}
- 
- 	for (i = 0; i <= iterations && pagesInUse > 0 && !prioritised; i++) {
- 		b++;
--		if (b < dev->internalStartBlock || b > dev->internalEndBlock) {
-+		if (b < dev->internalStartBlock || b > dev->internalEndBlock)
- 			b = dev->internalStartBlock;
--		}
- 
- 		if (b < dev->internalStartBlock || b > dev->internalEndBlock) {
- 			T(YAFFS_TRACE_ERROR,
-@@ -2657,17 +2679,9 @@ static int yaffs_FindBlockForGarbageColl
- 
- 		bi = yaffs_GetBlockInfo(dev, b);
- 
--#if 0
--		if (bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT) {
--			dirtiest = b;
--			pagesInUse = 0;
--		}
--		else
--#endif
--
- 		if (bi->blockState == YAFFS_BLOCK_STATE_FULL &&
--		       (bi->pagesInUse - bi->softDeletions) < pagesInUse &&
--		        yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
-+			(bi->pagesInUse - bi->softDeletions) < pagesInUse &&
-+				yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
- 			dirtiest = b;
- 			pagesInUse = (bi->pagesInUse - bi->softDeletions);
- 		}
-@@ -2678,19 +2692,18 @@ static int yaffs_FindBlockForGarbageColl
- 	if (dirtiest > 0) {
- 		T(YAFFS_TRACE_GC,
- 		  (TSTR("GC Selected block %d with %d free, prioritised:%d" TENDSTR), dirtiest,
--		   dev->nChunksPerBlock - pagesInUse,prioritised));
-+		   dev->nChunksPerBlock - pagesInUse, prioritised));
- 	}
- 
- 	dev->oldestDirtySequence = 0;
- 
--	if (dirtiest > 0) {
-+	if (dirtiest > 0)
- 		dev->nonAggressiveSkip = 4;
--	}
- 
- 	return dirtiest;
- }
- 
--static void yaffs_BlockBecameDirty(yaffs_Device * dev, int blockNo)
-+static void yaffs_BlockBecameDirty(yaffs_Device *dev, int blockNo)
- {
- 	yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockNo);
- 
-@@ -2752,7 +2765,7 @@ static void yaffs_BlockBecameDirty(yaffs
- 	}
- }
- 
--static int yaffs_FindBlockForAllocation(yaffs_Device * dev)
-+static int yaffs_FindBlockForAllocation(yaffs_Device *dev)
- {
- 	int i;
- 
-@@ -2763,7 +2776,7 @@ static int yaffs_FindBlockForAllocation(
- 		 * Can't get space to gc
- 		 */
- 		T(YAFFS_TRACE_ERROR,
--		  (TSTR("yaffs tragedy: no more eraased blocks" TENDSTR)));
-+		  (TSTR("yaffs tragedy: no more erased blocks" TENDSTR)));
- 
- 		return -1;
- 	}
-@@ -2794,31 +2807,74 @@ static int yaffs_FindBlockForAllocation(
- 
- 	T(YAFFS_TRACE_ALWAYS,
- 	  (TSTR
--	   ("yaffs tragedy: no more eraased blocks, but there should have been %d"
-+	   ("yaffs tragedy: no more erased blocks, but there should have been %d"
- 	    TENDSTR), dev->nErasedBlocks));
- 
- 	return -1;
- }
- 
- 
--// Check if there's space to allocate...
--// Thinks.... do we need top make this ths same as yaffs_GetFreeChunks()?
--static int yaffs_CheckSpaceForAllocation(yaffs_Device * dev)
-+
-+static int yaffs_CalcCheckpointBlocksRequired(yaffs_Device *dev)
-+{
-+	if (!dev->nCheckpointBlocksRequired &&
-+	   dev->isYaffs2) {
-+		/* Not a valid value so recalculate */
-+		int nBytes = 0;
-+		int nBlocks;
-+		int devBlocks = (dev->endBlock - dev->startBlock + 1);
-+		int tnodeSize;
-+
-+		tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-+
-+		if (tnodeSize < sizeof(yaffs_Tnode))
-+			tnodeSize = sizeof(yaffs_Tnode);
-+
-+		nBytes += sizeof(yaffs_CheckpointValidity);
-+		nBytes += sizeof(yaffs_CheckpointDevice);
-+		nBytes += devBlocks * sizeof(yaffs_BlockInfo);
-+		nBytes += devBlocks * dev->chunkBitmapStride;
-+		nBytes += (sizeof(yaffs_CheckpointObject) + sizeof(__u32)) * (dev->nObjectsCreated - dev->nFreeObjects);
-+		nBytes += (tnodeSize + sizeof(__u32)) * (dev->nTnodesCreated - dev->nFreeTnodes);
-+		nBytes += sizeof(yaffs_CheckpointValidity);
-+		nBytes += sizeof(__u32); /* checksum*/
-+
-+		/* Round up and add 2 blocks to allow for some bad blocks, so add 3 */
-+
-+		nBlocks = (nBytes/(dev->nDataBytesPerChunk * dev->nChunksPerBlock)) + 3;
-+
-+		dev->nCheckpointBlocksRequired = nBlocks;
-+	}
-+
-+	return dev->nCheckpointBlocksRequired;
-+}
-+
-+/*
-+ * Check if there's space to allocate...
-+ * Thinks.... do we need top make this ths same as yaffs_GetFreeChunks()?
-+ */
-+static int yaffs_CheckSpaceForAllocation(yaffs_Device *dev)
- {
- 	int reservedChunks;
- 	int reservedBlocks = dev->nReservedBlocks;
- 	int checkpointBlocks;
- 
--	checkpointBlocks =  dev->nCheckpointReservedBlocks - dev->blocksInCheckpoint;
--	if(checkpointBlocks < 0)
-+	if (dev->isYaffs2) {
-+		checkpointBlocks =  yaffs_CalcCheckpointBlocksRequired(dev) -
-+				    dev->blocksInCheckpoint;
-+		if (checkpointBlocks < 0)
-+			checkpointBlocks = 0;
-+	} else {
- 		checkpointBlocks = 0;
-+	}
- 
- 	reservedChunks = ((reservedBlocks + checkpointBlocks) * dev->nChunksPerBlock);
- 
- 	return (dev->nFreeChunks > reservedChunks);
- }
- 
--static int yaffs_AllocateChunk(yaffs_Device * dev, int useReserve, yaffs_BlockInfo **blockUsedPtr)
-+static int yaffs_AllocateChunk(yaffs_Device *dev, int useReserve,
-+		yaffs_BlockInfo **blockUsedPtr)
- {
- 	int retVal;
- 	yaffs_BlockInfo *bi;
-@@ -2835,7 +2891,7 @@ static int yaffs_AllocateChunk(yaffs_Dev
- 	}
- 
- 	if (dev->nErasedBlocks < dev->nReservedBlocks
--	    && dev->allocationPage == 0) {
-+			&& dev->allocationPage == 0) {
- 		T(YAFFS_TRACE_ALLOCATE, (TSTR("Allocating reserve" TENDSTR)));
- 	}
- 
-@@ -2844,10 +2900,10 @@ static int yaffs_AllocateChunk(yaffs_Dev
- 		bi = yaffs_GetBlockInfo(dev, dev->allocationBlock);
- 
- 		retVal = (dev->allocationBlock * dev->nChunksPerBlock) +
--		    dev->allocationPage;
-+			dev->allocationPage;
- 		bi->pagesInUse++;
- 		yaffs_SetChunkBit(dev, dev->allocationBlock,
--				  dev->allocationPage);
-+				dev->allocationPage);
- 
- 		dev->allocationPage++;
- 
-@@ -2859,43 +2915,43 @@ static int yaffs_AllocateChunk(yaffs_Dev
- 			dev->allocationBlock = -1;
- 		}
- 
--		if(blockUsedPtr)
-+		if (blockUsedPtr)
- 			*blockUsedPtr = bi;
- 
- 		return retVal;
- 	}
- 
- 	T(YAFFS_TRACE_ERROR,
--	  (TSTR("!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!" TENDSTR)));
-+			(TSTR("!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!" TENDSTR)));
- 
- 	return -1;
- }
- 
--static int yaffs_GetErasedChunks(yaffs_Device * dev)
-+static int yaffs_GetErasedChunks(yaffs_Device *dev)
- {
- 	int n;
- 
- 	n = dev->nErasedBlocks * dev->nChunksPerBlock;
- 
--	if (dev->allocationBlock > 0) {
-+	if (dev->allocationBlock > 0)
- 		n += (dev->nChunksPerBlock - dev->allocationPage);
--	}
- 
- 	return n;
- 
- }
- 
--static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block)
-+static int yaffs_GarbageCollectBlock(yaffs_Device *dev, int block,
-+		int wholeBlock)
- {
- 	int oldChunk;
- 	int newChunk;
--	int chunkInBlock;
- 	int markNAND;
- 	int retVal = YAFFS_OK;
- 	int cleanups = 0;
- 	int i;
- 	int isCheckpointBlock;
- 	int matchingChunk;
-+	int maxCopies;
- 
- 	int chunksBefore = yaffs_GetErasedChunks(dev);
- 	int chunksAfter;
-@@ -2911,8 +2967,11 @@ static int yaffs_GarbageCollectBlock(yaf
- 	bi->blockState = YAFFS_BLOCK_STATE_COLLECTING;
- 
- 	T(YAFFS_TRACE_TRACING,
--	  (TSTR("Collecting block %d, in use %d, shrink %d, " TENDSTR), block,
--	   bi->pagesInUse, bi->hasShrinkHeader));
-+			(TSTR("Collecting block %d, in use %d, shrink %d, wholeBlock %d" TENDSTR),
-+			 block,
-+			 bi->pagesInUse,
-+			 bi->hasShrinkHeader,
-+			 wholeBlock));
- 
- 	/*yaffs_VerifyFreeChunks(dev); */
- 
-@@ -2926,26 +2985,33 @@ static int yaffs_GarbageCollectBlock(yaf
- 	dev->isDoingGC = 1;
- 
- 	if (isCheckpointBlock ||
--	    !yaffs_StillSomeChunkBits(dev, block)) {
-+			!yaffs_StillSomeChunkBits(dev, block)) {
- 		T(YAFFS_TRACE_TRACING,
--		  (TSTR
--		   ("Collecting block %d that has no chunks in use" TENDSTR),
--		   block));
-+				(TSTR
-+				 ("Collecting block %d that has no chunks in use" TENDSTR),
-+				 block));
- 		yaffs_BlockBecameDirty(dev, block);
- 	} else {
- 
- 		__u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
- 
--		yaffs_VerifyBlock(dev,bi,block);
-+		yaffs_VerifyBlock(dev, bi, block);
- 
--		for (chunkInBlock = 0, oldChunk = block * dev->nChunksPerBlock;
--		     chunkInBlock < dev->nChunksPerBlock
--		     && yaffs_StillSomeChunkBits(dev, block);
--		     chunkInBlock++, oldChunk++) {
--			if (yaffs_CheckChunkBit(dev, block, chunkInBlock)) {
-+		maxCopies = (wholeBlock) ? dev->nChunksPerBlock : 10;
-+		oldChunk = block * dev->nChunksPerBlock + dev->gcChunk;
-+
-+		for (/* init already done */;
-+		     retVal == YAFFS_OK &&
-+		     dev->gcChunk < dev->nChunksPerBlock &&
-+		     (bi->blockState == YAFFS_BLOCK_STATE_COLLECTING) &&
-+		     maxCopies > 0;
-+		     dev->gcChunk++, oldChunk++) {
-+			if (yaffs_CheckChunkBit(dev, block, dev->gcChunk)) {
- 
- 				/* This page is in use and might need to be copied off */
- 
-+				maxCopies--;
-+
- 				markNAND = 1;
- 
- 				yaffs_InitialiseTags(&tags);
-@@ -2959,22 +3025,22 @@ static int yaffs_GarbageCollectBlock(yaf
- 
- 				T(YAFFS_TRACE_GC_DETAIL,
- 				  (TSTR
--				   ("Collecting page %d, %d %d %d " TENDSTR),
--				   chunkInBlock, tags.objectId, tags.chunkId,
-+				   ("Collecting chunk in block %d, %d %d %d " TENDSTR),
-+				   dev->gcChunk, tags.objectId, tags.chunkId,
- 				   tags.byteCount));
- 
--				if(object && !yaffs_SkipVerification(dev)){
--					if(tags.chunkId == 0)
--						matchingChunk = object->chunkId;
--					else if(object->softDeleted)
-+				if (object && !yaffs_SkipVerification(dev)) {
-+					if (tags.chunkId == 0)
-+						matchingChunk = object->hdrChunk;
-+					else if (object->softDeleted)
- 						matchingChunk = oldChunk; /* Defeat the test */
- 					else
--						matchingChunk = yaffs_FindChunkInFile(object,tags.chunkId,NULL);
-+						matchingChunk = yaffs_FindChunkInFile(object, tags.chunkId, NULL);
- 
--					if(oldChunk != matchingChunk)
-+					if (oldChunk != matchingChunk)
- 						T(YAFFS_TRACE_ERROR,
- 						  (TSTR("gc: page in gc mismatch: %d %d %d %d"TENDSTR),
--						  oldChunk,matchingChunk,tags.objectId, tags.chunkId));
-+						  oldChunk, matchingChunk, tags.objectId, tags.chunkId));
- 
- 				}
- 
-@@ -2986,9 +3052,11 @@ static int yaffs_GarbageCollectBlock(yaf
- 					    tags.objectId, tags.chunkId, tags.byteCount));
- 				}
- 
--				if (object && object->deleted
--				    && tags.chunkId != 0) {
--					/* Data chunk in a deleted file, throw it away
-+				if (object &&
-+				    object->deleted &&
-+				    object->softDeleted &&
-+				    tags.chunkId != 0) {
-+					/* Data chunk in a soft deleted file, throw it away
- 					 * It's a soft deleted data chunk,
- 					 * No need to copy this, just forget about it and
- 					 * fix up the object.
-@@ -3003,13 +3071,12 @@ static int yaffs_GarbageCollectBlock(yaf
- 						cleanups++;
- 					}
- 					markNAND = 0;
--				} else if (0
--					   /* Todo object && object->deleted && object->nDataChunks == 0 */
--					   ) {
-+				} else if (0) {
-+					/* Todo object && object->deleted && object->nDataChunks == 0 */
- 					/* Deleted object header with no data chunks.
- 					 * Can be discarded and the file deleted.
- 					 */
--					object->chunkId = 0;
-+					object->hdrChunk = 0;
- 					yaffs_FreeTnode(object->myDev,
- 							object->variant.
- 							fileVariant.top);
-@@ -3031,17 +3098,14 @@ static int yaffs_GarbageCollectBlock(yaf
- 						 * We need to nuke the shrinkheader flags first
- 						 * We no longer want the shrinkHeader flag since its work is done
- 						 * and if it is left in place it will mess up scanning.
--						 * Also, clear out any shadowing stuff
- 						 */
- 
- 						yaffs_ObjectHeader *oh;
- 						oh = (yaffs_ObjectHeader *)buffer;
- 						oh->isShrink = 0;
--						oh->shadowsObject = -1;
--						tags.extraShadows = 0;
- 						tags.extraIsShrinkHeader = 0;
- 
--						yaffs_VerifyObjectHeader(object,oh,&tags,1);
-+						yaffs_VerifyObjectHeader(object, oh, &tags, 1);
- 					}
- 
- 					newChunk =
-@@ -3055,7 +3119,7 @@ static int yaffs_GarbageCollectBlock(yaf
- 
- 						if (tags.chunkId == 0) {
- 							/* It's a header */
--							object->chunkId =  newChunk;
-+							object->hdrChunk =  newChunk;
- 							object->serial =   tags.serialNumber;
- 						} else {
- 							/* It's a data chunk */
-@@ -3067,7 +3131,8 @@ static int yaffs_GarbageCollectBlock(yaf
- 					}
- 				}
- 
--				yaffs_DeleteChunk(dev, oldChunk, markNAND, __LINE__);
-+				if (retVal == YAFFS_OK)
-+					yaffs_DeleteChunk(dev, oldChunk, markNAND, __LINE__);
- 
- 			}
- 		}
-@@ -3098,18 +3163,25 @@ static int yaffs_GarbageCollectBlock(yaf
- 
- 	}
- 
--	yaffs_VerifyCollectedBlock(dev,bi,block);
-+	yaffs_VerifyCollectedBlock(dev, bi, block);
- 
--	if (chunksBefore >= (chunksAfter = yaffs_GetErasedChunks(dev))) {
-+	chunksAfter = yaffs_GetErasedChunks(dev);
-+	if (chunksBefore >= chunksAfter) {
- 		T(YAFFS_TRACE_GC,
- 		  (TSTR
- 		   ("gc did not increase free chunks before %d after %d"
- 		    TENDSTR), chunksBefore, chunksAfter));
- 	}
- 
-+	/* If the gc completed then clear the current gcBlock so that we find another. */
-+	if (bi->blockState != YAFFS_BLOCK_STATE_COLLECTING) {
-+		dev->gcBlock = -1;
-+		dev->gcChunk = 0;
-+	}
-+
- 	dev->isDoingGC = 0;
- 
--	return YAFFS_OK;
-+	return retVal;
- }
- 
- /* New garbage collector
-@@ -3121,7 +3193,7 @@ static int yaffs_GarbageCollectBlock(yaf
-  * The idea is to help clear out space in a more spread-out manner.
-  * Dunno if it really does anything useful.
-  */
--static int yaffs_CheckGarbageCollection(yaffs_Device * dev)
-+static int yaffs_CheckGarbageCollection(yaffs_Device *dev)
- {
- 	int block;
- 	int aggressive;
-@@ -3142,8 +3214,8 @@ static int yaffs_CheckGarbageCollection(
- 	do {
- 		maxTries++;
- 
--		checkpointBlockAdjust = (dev->nCheckpointReservedBlocks - dev->blocksInCheckpoint);
--		if(checkpointBlockAdjust < 0)
-+		checkpointBlockAdjust = yaffs_CalcCheckpointBlocksRequired(dev) - dev->blocksInCheckpoint;
-+		if (checkpointBlockAdjust < 0)
- 			checkpointBlockAdjust = 0;
- 
- 		if (dev->nErasedBlocks < (dev->nReservedBlocks + checkpointBlockAdjust + 2)) {
-@@ -3154,20 +3226,24 @@ static int yaffs_CheckGarbageCollection(
- 			aggressive = 0;
- 		}
- 
--		block = yaffs_FindBlockForGarbageCollection(dev, aggressive);
-+		if (dev->gcBlock <= 0) {
-+			dev->gcBlock = yaffs_FindBlockForGarbageCollection(dev, aggressive);
-+			dev->gcChunk = 0;
-+		}
-+
-+		block = dev->gcBlock;
- 
- 		if (block > 0) {
- 			dev->garbageCollections++;
--			if (!aggressive) {
-+			if (!aggressive)
- 				dev->passiveGarbageCollections++;
--			}
- 
- 			T(YAFFS_TRACE_GC,
- 			  (TSTR
- 			   ("yaffs: GC erasedBlocks %d aggressive %d" TENDSTR),
- 			   dev->nErasedBlocks, aggressive));
- 
--			gcOk = yaffs_GarbageCollectBlock(dev, block);
-+			gcOk = yaffs_GarbageCollectBlock(dev, block, aggressive);
- 		}
- 
- 		if (dev->nErasedBlocks < (dev->nReservedBlocks) && block > 0) {
-@@ -3176,15 +3252,16 @@ static int yaffs_CheckGarbageCollection(
- 			   ("yaffs: GC !!!no reclaim!!! erasedBlocks %d after try %d block %d"
- 			    TENDSTR), dev->nErasedBlocks, maxTries, block));
- 		}
--	} while ((dev->nErasedBlocks < dev->nReservedBlocks) && (block > 0)
--		 && (maxTries < 2));
-+	} while ((dev->nErasedBlocks < dev->nReservedBlocks) &&
-+		 (block > 0) &&
-+		 (maxTries < 2));
- 
- 	return aggressive ? gcOk : YAFFS_OK;
- }
- 
- /*-------------------------  TAGS --------------------------------*/
- 
--static int yaffs_TagsMatch(const yaffs_ExtendedTags * tags, int objectId,
-+static int yaffs_TagsMatch(const yaffs_ExtendedTags *tags, int objectId,
- 			   int chunkInObject)
- {
- 	return (tags->chunkId == chunkInObject &&
-@@ -3195,8 +3272,8 @@ static int yaffs_TagsMatch(const yaffs_E
- 
- /*-------------------- Data file manipulation -----------------*/
- 
--static int yaffs_FindChunkInFile(yaffs_Object * in, int chunkInInode,
--				 yaffs_ExtendedTags * tags)
-+static int yaffs_FindChunkInFile(yaffs_Object *in, int chunkInInode,
-+				 yaffs_ExtendedTags *tags)
- {
- 	/*Get the Tnode, then get the level 0 offset chunk offset */
- 	yaffs_Tnode *tn;
-@@ -3214,7 +3291,7 @@ static int yaffs_FindChunkInFile(yaffs_O
- 	tn = yaffs_FindLevel0Tnode(dev, &in->variant.fileVariant, chunkInInode);
- 
- 	if (tn) {
--		theChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode);
-+		theChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
- 
- 		retVal =
- 		    yaffs_FindChunkInGroup(dev, theChunk, tags, in->objectId,
-@@ -3223,8 +3300,8 @@ static int yaffs_FindChunkInFile(yaffs_O
- 	return retVal;
- }
- 
--static int yaffs_FindAndDeleteChunkInFile(yaffs_Object * in, int chunkInInode,
--					  yaffs_ExtendedTags * tags)
-+static int yaffs_FindAndDeleteChunkInFile(yaffs_Object *in, int chunkInInode,
-+					  yaffs_ExtendedTags *tags)
- {
- 	/* Get the Tnode, then get the level 0 offset chunk offset */
- 	yaffs_Tnode *tn;
-@@ -3243,29 +3320,23 @@ static int yaffs_FindAndDeleteChunkInFil
- 
- 	if (tn) {
- 
--		theChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode);
-+		theChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
- 
- 		retVal =
- 		    yaffs_FindChunkInGroup(dev, theChunk, tags, in->objectId,
- 					   chunkInInode);
- 
- 		/* Delete the entry in the filestructure (if found) */
--		if (retVal != -1) {
--			yaffs_PutLevel0Tnode(dev,tn,chunkInInode,0);
--		}
--	} else {
--		/*T(("No level 0 found for %d\n", chunkInInode)); */
-+		if (retVal != -1)
-+			yaffs_PutLevel0Tnode(dev, tn, chunkInInode, 0);
- 	}
- 
--	if (retVal == -1) {
--		/* T(("Could not find %d to delete\n",chunkInInode)); */
--	}
- 	return retVal;
- }
- 
- #ifdef YAFFS_PARANOID
- 
--static int yaffs_CheckFileSanity(yaffs_Object * in)
-+static int yaffs_CheckFileSanity(yaffs_Object *in)
- {
- 	int chunk;
- 	int nChunks;
-@@ -3278,10 +3349,8 @@ static int yaffs_CheckFileSanity(yaffs_O
- 	int theChunk;
- 	int chunkDeleted;
- 
--	if (in->variantType != YAFFS_OBJECT_TYPE_FILE) {
--		/* T(("Object not a file\n")); */
-+	if (in->variantType != YAFFS_OBJECT_TYPE_FILE)
- 		return YAFFS_FAIL;
--	}
- 
- 	objId = in->objectId;
- 	fSize = in->variant.fileVariant.fileSize;
-@@ -3294,7 +3363,7 @@ static int yaffs_CheckFileSanity(yaffs_O
- 
- 		if (tn) {
- 
--			theChunk = yaffs_GetChunkGroupBase(dev,tn,chunk);
-+			theChunk = yaffs_GetChunkGroupBase(dev, tn, chunk);
- 
- 			if (yaffs_CheckChunkBits
- 			    (dev, theChunk / dev->nChunksPerBlock,
-@@ -3323,7 +3392,7 @@ static int yaffs_CheckFileSanity(yaffs_O
- 
- #endif
- 
--static int yaffs_PutChunkIntoFile(yaffs_Object * in, int chunkInInode,
-+static int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode,
- 				  int chunkInNAND, int inScan)
- {
- 	/* NB inScan is zero unless scanning.
-@@ -3358,11 +3427,10 @@ static int yaffs_PutChunkIntoFile(yaffs_
- 					&in->variant.fileVariant,
- 					chunkInInode,
- 					NULL);
--	if (!tn) {
-+	if (!tn)
- 		return YAFFS_FAIL;
--	}
- 
--	existingChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode);
-+	existingChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
- 
- 	if (inScan != 0) {
- 		/* If we're scanning then we need to test for duplicates
-@@ -3374,7 +3442,7 @@ static int yaffs_PutChunkIntoFile(yaffs_
- 		 * Update: For backward scanning we don't need to re-read tags so this is quite cheap.
- 		 */
- 
--		if (existingChunk != 0) {
-+		if (existingChunk > 0) {
- 			/* NB Right now existing chunk will not be real chunkId if the device >= 32MB
- 			 *    thus we have to do a FindChunkInFile to get the real chunk id.
- 			 *
-@@ -3411,8 +3479,10 @@ static int yaffs_PutChunkIntoFile(yaffs_
- 			 * not be loaded during a scan
- 			 */
- 
--			newSerial = newTags.serialNumber;
--			existingSerial = existingTags.serialNumber;
-+			if (inScan > 0) {
-+				newSerial = newTags.serialNumber;
-+				existingSerial = existingTags.serialNumber;
-+			}
- 
- 			if ((inScan > 0) &&
- 			    (in->myDev->isYaffs2 ||
-@@ -3437,24 +3507,23 @@ static int yaffs_PutChunkIntoFile(yaffs_
- 
- 	}
- 
--	if (existingChunk == 0) {
-+	if (existingChunk == 0)
- 		in->nDataChunks++;
--	}
- 
--	yaffs_PutLevel0Tnode(dev,tn,chunkInInode,chunkInNAND);
-+	yaffs_PutLevel0Tnode(dev, tn, chunkInInode, chunkInNAND);
- 
- 	return YAFFS_OK;
- }
- 
--static int yaffs_ReadChunkDataFromObject(yaffs_Object * in, int chunkInInode,
--					 __u8 * buffer)
-+static int yaffs_ReadChunkDataFromObject(yaffs_Object *in, int chunkInInode,
-+					__u8 *buffer)
- {
- 	int chunkInNAND = yaffs_FindChunkInFile(in, chunkInInode, NULL);
- 
--	if (chunkInNAND >= 0) {
-+	if (chunkInNAND >= 0)
- 		return yaffs_ReadChunkWithTagsFromNAND(in->myDev, chunkInNAND,
--						       buffer,NULL);
--	} else {
-+						buffer, NULL);
-+	else {
- 		T(YAFFS_TRACE_NANDACCESS,
- 		  (TSTR("Chunk %d not found zero instead" TENDSTR),
- 		   chunkInNAND));
-@@ -3465,7 +3534,7 @@ static int yaffs_ReadChunkDataFromObject
- 
- }
- 
--void yaffs_DeleteChunk(yaffs_Device * dev, int chunkId, int markNAND, int lyn)
-+void yaffs_DeleteChunk(yaffs_Device *dev, int chunkId, int markNAND, int lyn)
- {
- 	int block;
- 	int page;
-@@ -3475,16 +3544,15 @@ void yaffs_DeleteChunk(yaffs_Device * de
- 	if (chunkId <= 0)
- 		return;
- 
--
- 	dev->nDeletions++;
- 	block = chunkId / dev->nChunksPerBlock;
- 	page = chunkId % dev->nChunksPerBlock;
- 
- 
--	if(!yaffs_CheckChunkBit(dev,block,page))
-+	if (!yaffs_CheckChunkBit(dev, block, page))
- 		T(YAFFS_TRACE_VERIFY,
--		 	(TSTR("Deleting invalid chunk %d"TENDSTR),
--		 	 chunkId));
-+			(TSTR("Deleting invalid chunk %d"TENDSTR),
-+			 chunkId));
- 
- 	bi = yaffs_GetBlockInfo(dev, block);
- 
-@@ -3524,14 +3592,12 @@ void yaffs_DeleteChunk(yaffs_Device * de
- 			yaffs_BlockBecameDirty(dev, block);
- 		}
- 
--	} else {
--		/* T(("Bad news deleting chunk %d\n",chunkId)); */
- 	}
- 
- }
- 
--static int yaffs_WriteChunkDataToObject(yaffs_Object * in, int chunkInInode,
--					const __u8 * buffer, int nBytes,
-+static int yaffs_WriteChunkDataToObject(yaffs_Object *in, int chunkInInode,
-+					const __u8 *buffer, int nBytes,
- 					int useReserve)
- {
- 	/* Find old chunk Need to do this to get serial number
-@@ -3561,6 +3627,12 @@ static int yaffs_WriteChunkDataToObject(
- 	    (prevChunkId >= 0) ? prevTags.serialNumber + 1 : 1;
- 	newTags.byteCount = nBytes;
- 
-+	if (nBytes < 1 || nBytes > dev->totalBytesPerChunk) {
-+		T(YAFFS_TRACE_ERROR,
-+		(TSTR("Writing %d bytes to chunk!!!!!!!!!" TENDSTR), nBytes));
-+		YBUG();
-+	}
-+
- 	newChunkId =
- 	    yaffs_WriteNewChunkWithTagsToNAND(dev, buffer, &newTags,
- 					      useReserve);
-@@ -3568,11 +3640,9 @@ static int yaffs_WriteChunkDataToObject(
- 	if (newChunkId >= 0) {
- 		yaffs_PutChunkIntoFile(in, chunkInInode, newChunkId, 0);
- 
--		if (prevChunkId >= 0) {
-+		if (prevChunkId >= 0)
- 			yaffs_DeleteChunk(dev, prevChunkId, 1, __LINE__);
- 
--		}
--
- 		yaffs_CheckFileSanity(in);
- 	}
- 	return newChunkId;
-@@ -3582,7 +3652,7 @@ static int yaffs_WriteChunkDataToObject(
- /* UpdateObjectHeader updates the header on NAND for an object.
-  * If name is not NULL, then that new name is used.
-  */
--int yaffs_UpdateObjectHeader(yaffs_Object * in, const YCHAR * name, int force,
-+int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name, int force,
- 			     int isShrink, int shadows)
- {
- 
-@@ -3603,9 +3673,12 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 
- 	yaffs_ObjectHeader *oh = NULL;
- 
--	yaffs_strcpy(oldName,"silly old name");
-+	yaffs_strcpy(oldName, _Y("silly old name"));
- 
--	if (!in->fake || force) {
-+
-+	if (!in->fake ||
-+		in == dev->rootDir || /* The rootDir should also be saved */
-+		force) {
- 
- 		yaffs_CheckGarbageCollection(dev);
- 		yaffs_CheckObjectDetailsLoaded(in);
-@@ -3613,13 +3686,13 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 		buffer = yaffs_GetTempBuffer(in->myDev, __LINE__);
- 		oh = (yaffs_ObjectHeader *) buffer;
- 
--		prevChunkId = in->chunkId;
-+		prevChunkId = in->hdrChunk;
- 
--		if (prevChunkId >= 0) {
-+		if (prevChunkId > 0) {
- 			result = yaffs_ReadChunkWithTagsFromNAND(dev, prevChunkId,
- 							buffer, &oldTags);
- 
--			yaffs_VerifyObjectHeader(in,oh,&oldTags,0);
-+			yaffs_VerifyObjectHeader(in, oh, &oldTags, 0);
- 
- 			memcpy(oldName, oh->name, sizeof(oh->name));
- 		}
-@@ -3628,7 +3701,7 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 
- 		oh->type = in->variantType;
- 		oh->yst_mode = in->yst_mode;
--		oh->shadowsObject = shadows;
-+		oh->shadowsObject = oh->inbandShadowsObject = shadows;
- 
- #ifdef CONFIG_YAFFS_WINCE
- 		oh->win_atime[0] = in->win_atime[0];
-@@ -3645,20 +3718,18 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 		oh->yst_ctime = in->yst_ctime;
- 		oh->yst_rdev = in->yst_rdev;
- #endif
--		if (in->parent) {
-+		if (in->parent)
- 			oh->parentObjectId = in->parent->objectId;
--		} else {
-+		else
- 			oh->parentObjectId = 0;
--		}
- 
- 		if (name && *name) {
- 			memset(oh->name, 0, sizeof(oh->name));
- 			yaffs_strncpy(oh->name, name, YAFFS_MAX_NAME_LENGTH);
--		} else if (prevChunkId>=0) {
-+		} else if (prevChunkId >= 0)
- 			memcpy(oh->name, oldName, sizeof(oh->name));
--		} else {
-+		else
- 			memset(oh->name, 0, sizeof(oh->name));
--		}
- 
- 		oh->isShrink = isShrink;
- 
-@@ -3708,7 +3779,7 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 		newTags.extraShadows = (oh->shadowsObject > 0) ? 1 : 0;
- 		newTags.extraObjectType = in->variantType;
- 
--		yaffs_VerifyObjectHeader(in,oh,&newTags,1);
-+		yaffs_VerifyObjectHeader(in, oh, &newTags, 1);
- 
- 		/* Create new chunk in NAND */
- 		newChunkId =
-@@ -3717,20 +3788,20 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 
- 		if (newChunkId >= 0) {
- 
--			in->chunkId = newChunkId;
-+			in->hdrChunk = newChunkId;
- 
- 			if (prevChunkId >= 0) {
- 				yaffs_DeleteChunk(dev, prevChunkId, 1,
- 						  __LINE__);
- 			}
- 
--			if(!yaffs_ObjectHasCachedWriteData(in))
-+			if (!yaffs_ObjectHasCachedWriteData(in))
- 				in->dirty = 0;
- 
- 			/* If this was a shrink, then mark the block that the chunk lives on */
- 			if (isShrink) {
- 				bi = yaffs_GetBlockInfo(in->myDev,
--							newChunkId /in->myDev->	nChunksPerBlock);
-+					newChunkId / in->myDev->nChunksPerBlock);
- 				bi->hasShrinkHeader = 1;
- 			}
- 
-@@ -3766,7 +3837,7 @@ static int yaffs_ObjectHasCachedWriteDat
- 	yaffs_ChunkCache *cache;
- 	int nCaches = obj->myDev->nShortOpCaches;
- 
--	for(i = 0; i < nCaches; i++){
-+	for (i = 0; i < nCaches; i++) {
- 		cache = &dev->srCache[i];
- 		if (cache->object == obj &&
- 		    cache->dirty)
-@@ -3777,7 +3848,7 @@ static int yaffs_ObjectHasCachedWriteDat
- }
- 
- 
--static void yaffs_FlushFilesChunkCache(yaffs_Object * obj)
-+static void yaffs_FlushFilesChunkCache(yaffs_Object *obj)
- {
- 	yaffs_Device *dev = obj->myDev;
- 	int lowest = -99;	/* Stop compiler whining. */
-@@ -3844,16 +3915,16 @@ void yaffs_FlushEntireDeviceCache(yaffs_
- 	 */
- 	do {
- 		obj = NULL;
--		for( i = 0; i < nCaches && !obj; i++) {
-+		for (i = 0; i < nCaches && !obj; i++) {
- 			if (dev->srCache[i].object &&
- 			    dev->srCache[i].dirty)
- 				obj = dev->srCache[i].object;
- 
- 		}
--		if(obj)
-+		if (obj)
- 			yaffs_FlushFilesChunkCache(obj);
- 
--	} while(obj);
-+	} while (obj);
- 
- }
- 
-@@ -3863,41 +3934,21 @@ void yaffs_FlushEntireDeviceCache(yaffs_
-  * Then look for the least recently used non-dirty one.
-  * Then look for the least recently used dirty one...., flush and look again.
-  */
--static yaffs_ChunkCache *yaffs_GrabChunkCacheWorker(yaffs_Device * dev)
-+static yaffs_ChunkCache *yaffs_GrabChunkCacheWorker(yaffs_Device *dev)
- {
- 	int i;
--	int usage;
--	int theOne;
- 
- 	if (dev->nShortOpCaches > 0) {
- 		for (i = 0; i < dev->nShortOpCaches; i++) {
- 			if (!dev->srCache[i].object)
- 				return &dev->srCache[i];
- 		}
-+	}
- 
--		return NULL;
-+	return NULL;
-+}
- 
--		theOne = -1;
--		usage = 0;	/* just to stop the compiler grizzling */
--
--		for (i = 0; i < dev->nShortOpCaches; i++) {
--			if (!dev->srCache[i].dirty &&
--			    ((dev->srCache[i].lastUse < usage && theOne >= 0) ||
--			     theOne < 0)) {
--				usage = dev->srCache[i].lastUse;
--				theOne = i;
--			}
--		}
--
--
--		return theOne >= 0 ? &dev->srCache[theOne] : NULL;
--	} else {
--		return NULL;
--	}
--
--}
--
--static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device * dev)
-+static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device *dev)
- {
- 	yaffs_ChunkCache *cache;
- 	yaffs_Object *theObj;
-@@ -3927,8 +3978,7 @@ static yaffs_ChunkCache *yaffs_GrabChunk
- 			for (i = 0; i < dev->nShortOpCaches; i++) {
- 				if (dev->srCache[i].object &&
- 				    !dev->srCache[i].locked &&
--				    (dev->srCache[i].lastUse < usage || !cache))
--				{
-+				    (dev->srCache[i].lastUse < usage || !cache)) {
- 					usage = dev->srCache[i].lastUse;
- 					theObj = dev->srCache[i].object;
- 					cache = &dev->srCache[i];
-@@ -3950,7 +4000,7 @@ static yaffs_ChunkCache *yaffs_GrabChunk
- }
- 
- /* Find a cached chunk */
--static yaffs_ChunkCache *yaffs_FindChunkCache(const yaffs_Object * obj,
-+static yaffs_ChunkCache *yaffs_FindChunkCache(const yaffs_Object *obj,
- 					      int chunkId)
- {
- 	yaffs_Device *dev = obj->myDev;
-@@ -3969,7 +4019,7 @@ static yaffs_ChunkCache *yaffs_FindChunk
- }
- 
- /* Mark the chunk for the least recently used algorithym */
--static void yaffs_UseChunkCache(yaffs_Device * dev, yaffs_ChunkCache * cache,
-+static void yaffs_UseChunkCache(yaffs_Device *dev, yaffs_ChunkCache *cache,
- 				int isAWrite)
- {
- 
-@@ -3977,9 +4027,9 @@ static void yaffs_UseChunkCache(yaffs_De
- 		if (dev->srLastUse < 0 || dev->srLastUse > 100000000) {
- 			/* Reset the cache usages */
- 			int i;
--			for (i = 1; i < dev->nShortOpCaches; i++) {
-+			for (i = 1; i < dev->nShortOpCaches; i++)
- 				dev->srCache[i].lastUse = 0;
--			}
-+
- 			dev->srLastUse = 0;
- 		}
- 
-@@ -3987,9 +4037,8 @@ static void yaffs_UseChunkCache(yaffs_De
- 
- 		cache->lastUse = dev->srLastUse;
- 
--		if (isAWrite) {
-+		if (isAWrite)
- 			cache->dirty = 1;
--		}
- 	}
- }
- 
-@@ -3997,21 +4046,20 @@ static void yaffs_UseChunkCache(yaffs_De
-  * Do this when a whole page gets written,
-  * ie the short cache for this page is no longer valid.
-  */
--static void yaffs_InvalidateChunkCache(yaffs_Object * object, int chunkId)
-+static void yaffs_InvalidateChunkCache(yaffs_Object *object, int chunkId)
- {
- 	if (object->myDev->nShortOpCaches > 0) {
- 		yaffs_ChunkCache *cache = yaffs_FindChunkCache(object, chunkId);
- 
--		if (cache) {
-+		if (cache)
- 			cache->object = NULL;
--		}
- 	}
- }
- 
- /* Invalidate all the cache pages associated with this object
-  * Do this whenever ther file is deleted or resized.
-  */
--static void yaffs_InvalidateWholeChunkCache(yaffs_Object * in)
-+static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in)
- {
- 	int i;
- 	yaffs_Device *dev = in->myDev;
-@@ -4019,9 +4067,8 @@ static void yaffs_InvalidateWholeChunkCa
- 	if (dev->nShortOpCaches > 0) {
- 		/* Invalidate it. */
- 		for (i = 0; i < dev->nShortOpCaches; i++) {
--			if (dev->srCache[i].object == in) {
-+			if (dev->srCache[i].object == in)
- 				dev->srCache[i].object = NULL;
--			}
- 		}
- 	}
- }
-@@ -4029,18 +4076,18 @@ static void yaffs_InvalidateWholeChunkCa
- /*--------------------- Checkpointing --------------------*/
- 
- 
--static int yaffs_WriteCheckpointValidityMarker(yaffs_Device *dev,int head)
-+static int yaffs_WriteCheckpointValidityMarker(yaffs_Device *dev, int head)
- {
- 	yaffs_CheckpointValidity cp;
- 
--	memset(&cp,0,sizeof(cp));
-+	memset(&cp, 0, sizeof(cp));
- 
- 	cp.structType = sizeof(cp);
- 	cp.magic = YAFFS_MAGIC;
- 	cp.version = YAFFS_CHECKPOINT_VERSION;
- 	cp.head = (head) ? 1 : 0;
- 
--	return (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp))?
-+	return (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp)) ?
- 		1 : 0;
- }
- 
-@@ -4049,9 +4096,9 @@ static int yaffs_ReadCheckpointValidityM
- 	yaffs_CheckpointValidity cp;
- 	int ok;
- 
--	ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp));
-+	ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
- 
--	if(ok)
-+	if (ok)
- 		ok = (cp.structType == sizeof(cp)) &&
- 		     (cp.magic == YAFFS_MAGIC) &&
- 		     (cp.version == YAFFS_CHECKPOINT_VERSION) &&
-@@ -4100,21 +4147,21 @@ static int yaffs_WriteCheckpointDevice(y
- 	int ok;
- 
- 	/* Write device runtime values*/
--	yaffs_DeviceToCheckpointDevice(&cp,dev);
-+	yaffs_DeviceToCheckpointDevice(&cp, dev);
- 	cp.structType = sizeof(cp);
- 
--	ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
-+	ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
- 
- 	/* Write block info */
--	if(ok) {
-+	if (ok) {
- 		nBytes = nBlocks * sizeof(yaffs_BlockInfo);
--		ok = (yaffs_CheckpointWrite(dev,dev->blockInfo,nBytes) == nBytes);
-+		ok = (yaffs_CheckpointWrite(dev, dev->blockInfo, nBytes) == nBytes);
- 	}
- 
- 	/* Write chunk bits */
--	if(ok) {
-+	if (ok) {
- 		nBytes = nBlocks * dev->chunkBitmapStride;
--		ok = (yaffs_CheckpointWrite(dev,dev->chunkBits,nBytes) == nBytes);
-+		ok = (yaffs_CheckpointWrite(dev, dev->chunkBits, nBytes) == nBytes);
- 	}
- 	return	 ok ? 1 : 0;
- 
-@@ -4128,25 +4175,25 @@ static int yaffs_ReadCheckpointDevice(ya
- 
- 	int ok;
- 
--	ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp));
--	if(!ok)
-+	ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
-+	if (!ok)
- 		return 0;
- 
--	if(cp.structType != sizeof(cp))
-+	if (cp.structType != sizeof(cp))
- 		return 0;
- 
- 
--	yaffs_CheckpointDeviceToDevice(dev,&cp);
-+	yaffs_CheckpointDeviceToDevice(dev, &cp);
- 
- 	nBytes = nBlocks * sizeof(yaffs_BlockInfo);
- 
--	ok = (yaffs_CheckpointRead(dev,dev->blockInfo,nBytes) == nBytes);
-+	ok = (yaffs_CheckpointRead(dev, dev->blockInfo, nBytes) == nBytes);
- 
--	if(!ok)
-+	if (!ok)
- 		return 0;
- 	nBytes = nBlocks * dev->chunkBitmapStride;
- 
--	ok = (yaffs_CheckpointRead(dev,dev->chunkBits,nBytes) == nBytes);
-+	ok = (yaffs_CheckpointRead(dev, dev->chunkBits, nBytes) == nBytes);
- 
- 	return ok ? 1 : 0;
- }
-@@ -4157,7 +4204,7 @@ static void yaffs_ObjectToCheckpointObje
- 
- 	cp->objectId = obj->objectId;
- 	cp->parentId = (obj->parent) ? obj->parent->objectId : 0;
--	cp->chunkId = obj->chunkId;
-+	cp->hdrChunk = obj->hdrChunk;
- 	cp->variantType = obj->variantType;
- 	cp->deleted = obj->deleted;
- 	cp->softDeleted = obj->softDeleted;
-@@ -4168,20 +4215,28 @@ static void yaffs_ObjectToCheckpointObje
- 	cp->serial = obj->serial;
- 	cp->nDataChunks = obj->nDataChunks;
- 
--	if(obj->variantType == YAFFS_OBJECT_TYPE_FILE)
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
- 		cp->fileSizeOrEquivalentObjectId = obj->variant.fileVariant.fileSize;
--	else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
-+	else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
- 		cp->fileSizeOrEquivalentObjectId = obj->variant.hardLinkVariant.equivalentObjectId;
- }
- 
--static void yaffs_CheckpointObjectToObject( yaffs_Object *obj,yaffs_CheckpointObject *cp)
-+static int yaffs_CheckpointObjectToObject(yaffs_Object *obj, yaffs_CheckpointObject *cp)
- {
- 
- 	yaffs_Object *parent;
- 
-+	if (obj->variantType != cp->variantType) {
-+		T(YAFFS_TRACE_ERROR, (TSTR("Checkpoint read object %d type %d "
-+			TCONT("chunk %d does not match existing object type %d")
-+			TENDSTR), cp->objectId, cp->variantType, cp->hdrChunk,
-+			obj->variantType));
-+		return 0;
-+	}
-+
- 	obj->objectId = cp->objectId;
- 
--	if(cp->parentId)
-+	if (cp->parentId)
- 		parent = yaffs_FindOrCreateObjectByNumber(
- 					obj->myDev,
- 					cp->parentId,
-@@ -4189,10 +4244,19 @@ static void yaffs_CheckpointObjectToObje
- 	else
- 		parent = NULL;
- 
--	if(parent)
-+	if (parent) {
-+		if (parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+			T(YAFFS_TRACE_ALWAYS, (TSTR("Checkpoint read object %d parent %d type %d"
-+				TCONT(" chunk %d Parent type, %d, not directory")
-+				TENDSTR),
-+				cp->objectId, cp->parentId, cp->variantType,
-+				cp->hdrChunk, parent->variantType));
-+			return 0;
-+		}
- 		yaffs_AddObjectToDirectory(parent, obj);
-+	}
- 
--	obj->chunkId = cp->chunkId;
-+	obj->hdrChunk = cp->hdrChunk;
- 	obj->variantType = cp->variantType;
- 	obj->deleted = cp->deleted;
- 	obj->softDeleted = cp->softDeleted;
-@@ -4203,29 +4267,34 @@ static void yaffs_CheckpointObjectToObje
- 	obj->serial = cp->serial;
- 	obj->nDataChunks = cp->nDataChunks;
- 
--	if(obj->variantType == YAFFS_OBJECT_TYPE_FILE)
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
- 		obj->variant.fileVariant.fileSize = cp->fileSizeOrEquivalentObjectId;
--	else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
-+	else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
- 		obj->variant.hardLinkVariant.equivalentObjectId = cp->fileSizeOrEquivalentObjectId;
- 
--	if(obj->objectId >= YAFFS_NOBJECT_BUCKETS)
-+	if (obj->hdrChunk > 0)
- 		obj->lazyLoaded = 1;
-+	return 1;
- }
- 
- 
- 
--static int yaffs_CheckpointTnodeWorker(yaffs_Object * in, yaffs_Tnode * tn,
--				  	__u32 level, int chunkOffset)
-+static int yaffs_CheckpointTnodeWorker(yaffs_Object *in, yaffs_Tnode *tn,
-+					__u32 level, int chunkOffset)
- {
- 	int i;
- 	yaffs_Device *dev = in->myDev;
- 	int ok = 1;
--	int nTnodeBytes = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-+	int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-+
-+	if (tnodeSize < sizeof(yaffs_Tnode))
-+		tnodeSize = sizeof(yaffs_Tnode);
-+
- 
- 	if (tn) {
- 		if (level > 0) {
- 
--			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++){
-+			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++) {
- 				if (tn->internal[i]) {
- 					ok = yaffs_CheckpointTnodeWorker(in,
- 							tn->internal[i],
-@@ -4235,10 +4304,9 @@ static int yaffs_CheckpointTnodeWorker(y
- 			}
- 		} else if (level == 0) {
- 			__u32 baseOffset = chunkOffset <<  YAFFS_TNODES_LEVEL0_BITS;
--			/* printf("write tnode at %d\n",baseOffset); */
--			ok = (yaffs_CheckpointWrite(dev,&baseOffset,sizeof(baseOffset)) == sizeof(baseOffset));
--			if(ok)
--				ok = (yaffs_CheckpointWrite(dev,tn,nTnodeBytes) == nTnodeBytes);
-+			ok = (yaffs_CheckpointWrite(dev, &baseOffset, sizeof(baseOffset)) == sizeof(baseOffset));
-+			if (ok)
-+				ok = (yaffs_CheckpointWrite(dev, tn, tnodeSize) == tnodeSize);
- 		}
- 	}
- 
-@@ -4251,13 +4319,13 @@ static int yaffs_WriteCheckpointTnodes(y
- 	__u32 endMarker = ~0;
- 	int ok = 1;
- 
--	if(obj->variantType == YAFFS_OBJECT_TYPE_FILE){
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
- 		ok = yaffs_CheckpointTnodeWorker(obj,
- 					    obj->variant.fileVariant.top,
- 					    obj->variant.fileVariant.topLevel,
- 					    0);
--		if(ok)
--			ok = (yaffs_CheckpointWrite(obj->myDev,&endMarker,sizeof(endMarker)) ==
-+		if (ok)
-+			ok = (yaffs_CheckpointWrite(obj->myDev, &endMarker, sizeof(endMarker)) ==
- 				sizeof(endMarker));
- 	}
- 
-@@ -4272,38 +4340,38 @@ static int yaffs_ReadCheckpointTnodes(ya
- 	yaffs_FileStructure *fileStructPtr = &obj->variant.fileVariant;
- 	yaffs_Tnode *tn;
- 	int nread = 0;
-+	int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
- 
--	ok = (yaffs_CheckpointRead(dev,&baseChunk,sizeof(baseChunk)) == sizeof(baseChunk));
-+	if (tnodeSize < sizeof(yaffs_Tnode))
-+		tnodeSize = sizeof(yaffs_Tnode);
- 
--	while(ok && (~baseChunk)){
-+	ok = (yaffs_CheckpointRead(dev, &baseChunk, sizeof(baseChunk)) == sizeof(baseChunk));
-+
-+	while (ok && (~baseChunk)) {
- 		nread++;
- 		/* Read level 0 tnode */
- 
- 
--		/* printf("read  tnode at %d\n",baseChunk); */
- 		tn = yaffs_GetTnodeRaw(dev);
--		if(tn)
--			ok = (yaffs_CheckpointRead(dev,tn,(dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8) ==
--			      (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
-+		if (tn)
-+			ok = (yaffs_CheckpointRead(dev, tn, tnodeSize) == tnodeSize);
- 		else
- 			ok = 0;
- 
--		if(tn && ok){
-+		if (tn && ok)
- 			ok = yaffs_AddOrFindLevel0Tnode(dev,
--					       		fileStructPtr,
--					       		baseChunk,
--					       		tn) ? 1 : 0;
-+							fileStructPtr,
-+							baseChunk,
-+							tn) ? 1 : 0;
- 
--		}
--
--		if(ok)
--			ok = (yaffs_CheckpointRead(dev,&baseChunk,sizeof(baseChunk)) == sizeof(baseChunk));
-+		if (ok)
-+			ok = (yaffs_CheckpointRead(dev, &baseChunk, sizeof(baseChunk)) == sizeof(baseChunk));
- 
- 	}
- 
--	T(YAFFS_TRACE_CHECKPOINT,(
-+	T(YAFFS_TRACE_CHECKPOINT, (
- 		TSTR("Checkpoint read tnodes %d records, last %d. ok %d" TENDSTR),
--		nread,baseChunk,ok));
-+		nread, baseChunk, ok));
- 
- 	return ok ? 1 : 0;
- }
-@@ -4315,41 +4383,40 @@ static int yaffs_WriteCheckpointObjects(
- 	yaffs_CheckpointObject cp;
- 	int i;
- 	int ok = 1;
--	struct list_head *lh;
-+	struct ylist_head *lh;
- 
- 
- 	/* Iterate through the objects in each hash entry,
- 	 * dumping them to the checkpointing stream.
- 	 */
- 
--	 for(i = 0; ok &&  i <  YAFFS_NOBJECT_BUCKETS; i++){
--	 	list_for_each(lh, &dev->objectBucket[i].list) {
-+	for (i = 0; ok &&  i <  YAFFS_NOBJECT_BUCKETS; i++) {
-+		ylist_for_each(lh, &dev->objectBucket[i].list) {
- 			if (lh) {
--				obj = list_entry(lh, yaffs_Object, hashLink);
-+				obj = ylist_entry(lh, yaffs_Object, hashLink);
- 				if (!obj->deferedFree) {
--					yaffs_ObjectToCheckpointObject(&cp,obj);
-+					yaffs_ObjectToCheckpointObject(&cp, obj);
- 					cp.structType = sizeof(cp);
- 
--					T(YAFFS_TRACE_CHECKPOINT,(
-+					T(YAFFS_TRACE_CHECKPOINT, (
- 						TSTR("Checkpoint write object %d parent %d type %d chunk %d obj addr %x" TENDSTR),
--						cp.objectId,cp.parentId,cp.variantType,cp.chunkId,(unsigned) obj));
-+						cp.objectId, cp.parentId, cp.variantType, cp.hdrChunk, (unsigned) obj));
- 
--					ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
-+					ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
- 
--					if(ok && obj->variantType == YAFFS_OBJECT_TYPE_FILE){
-+					if (ok && obj->variantType == YAFFS_OBJECT_TYPE_FILE)
- 						ok = yaffs_WriteCheckpointTnodes(obj);
--					}
- 				}
- 			}
- 		}
--	 }
-+	}
- 
--	 /* Dump end of list */
--	memset(&cp,0xFF,sizeof(yaffs_CheckpointObject));
-+	/* Dump end of list */
-+	memset(&cp, 0xFF, sizeof(yaffs_CheckpointObject));
- 	cp.structType = sizeof(cp);
- 
--	if(ok)
--		ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
-+	if (ok)
-+		ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
- 
- 	return ok ? 1 : 0;
- }
-@@ -4362,38 +4429,39 @@ static int yaffs_ReadCheckpointObjects(y
- 	int done = 0;
- 	yaffs_Object *hardList = NULL;
- 
--	while(ok && !done) {
--		ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp));
--		if(cp.structType != sizeof(cp)) {
--			T(YAFFS_TRACE_CHECKPOINT,(TSTR("struct size %d instead of %d ok %d"TENDSTR),
--				cp.structType,sizeof(cp),ok));
-+	while (ok && !done) {
-+		ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
-+		if (cp.structType != sizeof(cp)) {
-+			T(YAFFS_TRACE_CHECKPOINT, (TSTR("struct size %d instead of %d ok %d"TENDSTR),
-+				cp.structType, sizeof(cp), ok));
- 			ok = 0;
- 		}
- 
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("Checkpoint read object %d parent %d type %d chunk %d " TENDSTR),
--			cp.objectId,cp.parentId,cp.variantType,cp.chunkId));
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("Checkpoint read object %d parent %d type %d chunk %d " TENDSTR),
-+			cp.objectId, cp.parentId, cp.variantType, cp.hdrChunk));
- 
--		if(ok && cp.objectId == ~0)
-+		if (ok && cp.objectId == ~0)
- 			done = 1;
--		else if(ok){
--			obj = yaffs_FindOrCreateObjectByNumber(dev,cp.objectId, cp.variantType);
--			if(obj) {
--				yaffs_CheckpointObjectToObject(obj,&cp);
--				if(obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
-+		else if (ok) {
-+			obj = yaffs_FindOrCreateObjectByNumber(dev, cp.objectId, cp.variantType);
-+			if (obj) {
-+				ok = yaffs_CheckpointObjectToObject(obj, &cp);
-+				if (!ok)
-+					break;
-+				if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
- 					ok = yaffs_ReadCheckpointTnodes(obj);
--				} else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
-+				} else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
- 					obj->hardLinks.next =
--						    (struct list_head *)
--						    hardList;
-+						(struct ylist_head *) hardList;
- 					hardList = obj;
- 				}
--
--			}
-+			} else
-+				ok = 0;
- 		}
- 	}
- 
--	if(ok)
--		yaffs_HardlinkFixup(dev,hardList);
-+	if (ok)
-+		yaffs_HardlinkFixup(dev, hardList);
- 
- 	return ok ? 1 : 0;
- }
-@@ -4403,11 +4471,11 @@ static int yaffs_WriteCheckpointSum(yaff
- 	__u32 checkpointSum;
- 	int ok;
- 
--	yaffs_GetCheckpointSum(dev,&checkpointSum);
-+	yaffs_GetCheckpointSum(dev, &checkpointSum);
- 
--	ok = (yaffs_CheckpointWrite(dev,&checkpointSum,sizeof(checkpointSum)) == sizeof(checkpointSum));
-+	ok = (yaffs_CheckpointWrite(dev, &checkpointSum, sizeof(checkpointSum)) == sizeof(checkpointSum));
- 
--	if(!ok)
-+	if (!ok)
- 		return 0;
- 
- 	return 1;
-@@ -4419,14 +4487,14 @@ static int yaffs_ReadCheckpointSum(yaffs
- 	__u32 checkpointSum1;
- 	int ok;
- 
--	yaffs_GetCheckpointSum(dev,&checkpointSum0);
-+	yaffs_GetCheckpointSum(dev, &checkpointSum0);
- 
--	ok = (yaffs_CheckpointRead(dev,&checkpointSum1,sizeof(checkpointSum1)) == sizeof(checkpointSum1));
-+	ok = (yaffs_CheckpointRead(dev, &checkpointSum1, sizeof(checkpointSum1)) == sizeof(checkpointSum1));
- 
--	if(!ok)
-+	if (!ok)
- 		return 0;
- 
--	if(checkpointSum0 != checkpointSum1)
-+	if (checkpointSum0 != checkpointSum1)
- 		return 0;
- 
- 	return 1;
-@@ -4435,46 +4503,43 @@ static int yaffs_ReadCheckpointSum(yaffs
- 
- static int yaffs_WriteCheckpointData(yaffs_Device *dev)
- {
--
- 	int ok = 1;
- 
--	if(dev->skipCheckpointWrite || !dev->isYaffs2){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("skipping checkpoint write" TENDSTR)));
-+	if (dev->skipCheckpointWrite || !dev->isYaffs2) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("skipping checkpoint write" TENDSTR)));
- 		ok = 0;
- 	}
- 
--	if(ok)
--		ok = yaffs_CheckpointOpen(dev,1);
-+	if (ok)
-+		ok = yaffs_CheckpointOpen(dev, 1);
- 
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint validity" TENDSTR)));
--		ok = yaffs_WriteCheckpointValidityMarker(dev,1);
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint validity" TENDSTR)));
-+		ok = yaffs_WriteCheckpointValidityMarker(dev, 1);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint device" TENDSTR)));
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint device" TENDSTR)));
- 		ok = yaffs_WriteCheckpointDevice(dev);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint objects" TENDSTR)));
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint objects" TENDSTR)));
- 		ok = yaffs_WriteCheckpointObjects(dev);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint validity" TENDSTR)));
--		ok = yaffs_WriteCheckpointValidityMarker(dev,0);
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint validity" TENDSTR)));
-+		ok = yaffs_WriteCheckpointValidityMarker(dev, 0);
- 	}
- 
--	if(ok){
-+	if (ok)
- 		ok = yaffs_WriteCheckpointSum(dev);
--	}
--
- 
--	if(!yaffs_CheckpointClose(dev))
--		 ok = 0;
-+	if (!yaffs_CheckpointClose(dev))
-+		ok = 0;
- 
--	if(ok)
--	    	dev->isCheckpointed = 1;
--	 else
--	 	dev->isCheckpointed = 0;
-+	if (ok)
-+		dev->isCheckpointed = 1;
-+	else
-+		dev->isCheckpointed = 0;
- 
- 	return dev->isCheckpointed;
- }
-@@ -4483,43 +4548,43 @@ static int yaffs_ReadCheckpointData(yaff
- {
- 	int ok = 1;
- 
--	if(dev->skipCheckpointRead || !dev->isYaffs2){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("skipping checkpoint read" TENDSTR)));
-+	if (dev->skipCheckpointRead || !dev->isYaffs2) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("skipping checkpoint read" TENDSTR)));
- 		ok = 0;
- 	}
- 
--	if(ok)
--		ok = yaffs_CheckpointOpen(dev,0); /* open for read */
-+	if (ok)
-+		ok = yaffs_CheckpointOpen(dev, 0); /* open for read */
- 
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint validity" TENDSTR)));
--		ok = yaffs_ReadCheckpointValidityMarker(dev,1);
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint validity" TENDSTR)));
-+		ok = yaffs_ReadCheckpointValidityMarker(dev, 1);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint device" TENDSTR)));
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint device" TENDSTR)));
- 		ok = yaffs_ReadCheckpointDevice(dev);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint objects" TENDSTR)));
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint objects" TENDSTR)));
- 		ok = yaffs_ReadCheckpointObjects(dev);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint validity" TENDSTR)));
--		ok = yaffs_ReadCheckpointValidityMarker(dev,0);
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint validity" TENDSTR)));
-+		ok = yaffs_ReadCheckpointValidityMarker(dev, 0);
- 	}
- 
--	if(ok){
-+	if (ok) {
- 		ok = yaffs_ReadCheckpointSum(dev);
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint checksum %d" TENDSTR),ok));
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint checksum %d" TENDSTR), ok));
- 	}
- 
--	if(!yaffs_CheckpointClose(dev))
-+	if (!yaffs_CheckpointClose(dev))
- 		ok = 0;
- 
--	if(ok)
--	    	dev->isCheckpointed = 1;
--	 else
--	 	dev->isCheckpointed = 0;
-+	if (ok)
-+		dev->isCheckpointed = 1;
-+	else
-+		dev->isCheckpointed = 0;
- 
- 	return ok ? 1 : 0;
- 
-@@ -4527,11 +4592,11 @@ static int yaffs_ReadCheckpointData(yaff
- 
- static void yaffs_InvalidateCheckpoint(yaffs_Device *dev)
- {
--	if(dev->isCheckpointed ||
--	   dev->blocksInCheckpoint > 0){
-+	if (dev->isCheckpointed ||
-+			dev->blocksInCheckpoint > 0) {
- 		dev->isCheckpointed = 0;
- 		yaffs_CheckpointInvalidateStream(dev);
--		if(dev->superBlock && dev->markSuperBlockDirty)
-+		if (dev->superBlock && dev->markSuperBlockDirty)
- 			dev->markSuperBlockDirty(dev->superBlock);
- 	}
- }
-@@ -4540,18 +4605,18 @@ static void yaffs_InvalidateCheckpoint(y
- int yaffs_CheckpointSave(yaffs_Device *dev)
- {
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("save entry: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("save entry: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
- 
- 	yaffs_VerifyObjects(dev);
- 	yaffs_VerifyBlocks(dev);
- 	yaffs_VerifyFreeChunks(dev);
- 
--	if(!dev->isCheckpointed) {
-+	if (!dev->isCheckpointed) {
- 		yaffs_InvalidateCheckpoint(dev);
- 		yaffs_WriteCheckpointData(dev);
- 	}
- 
--	T(YAFFS_TRACE_ALWAYS,(TSTR("save exit: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-+	T(YAFFS_TRACE_ALWAYS, (TSTR("save exit: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
- 
- 	return dev->isCheckpointed;
- }
-@@ -4559,17 +4624,17 @@ int yaffs_CheckpointSave(yaffs_Device *d
- int yaffs_CheckpointRestore(yaffs_Device *dev)
- {
- 	int retval;
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("restore entry: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("restore entry: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
- 
- 	retval = yaffs_ReadCheckpointData(dev);
- 
--	if(dev->isCheckpointed){
-+	if (dev->isCheckpointed) {
- 		yaffs_VerifyObjects(dev);
- 		yaffs_VerifyBlocks(dev);
- 		yaffs_VerifyFreeChunks(dev);
- 	}
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("restore exit: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("restore exit: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
- 
- 	return retval;
- }
-@@ -4584,12 +4649,12 @@ int yaffs_CheckpointRestore(yaffs_Device
-  * Curve-balls: the first chunk might also be the last chunk.
-  */
- 
--int yaffs_ReadDataFromFile(yaffs_Object * in, __u8 * buffer, loff_t offset,
--			   int nBytes)
-+int yaffs_ReadDataFromFile(yaffs_Object *in, __u8 *buffer, loff_t offset,
-+			int nBytes)
- {
- 
- 	int chunk;
--	int start;
-+	__u32 start;
- 	int nToCopy;
- 	int n = nBytes;
- 	int nDone = 0;
-@@ -4600,27 +4665,26 @@ int yaffs_ReadDataFromFile(yaffs_Object 
- 	dev = in->myDev;
- 
- 	while (n > 0) {
--		//chunk = offset / dev->nDataBytesPerChunk + 1;
--		//start = offset % dev->nDataBytesPerChunk;
--		yaffs_AddrToChunk(dev,offset,&chunk,&start);
-+		/* chunk = offset / dev->nDataBytesPerChunk + 1; */
-+		/* start = offset % dev->nDataBytesPerChunk; */
-+		yaffs_AddrToChunk(dev, offset, &chunk, &start);
- 		chunk++;
- 
- 		/* OK now check for the curveball where the start and end are in
- 		 * the same chunk.
- 		 */
--		if ((start + n) < dev->nDataBytesPerChunk) {
-+		if ((start + n) < dev->nDataBytesPerChunk)
- 			nToCopy = n;
--		} else {
-+		else
- 			nToCopy = dev->nDataBytesPerChunk - start;
--		}
- 
- 		cache = yaffs_FindChunkCache(in, chunk);
- 
- 		/* If the chunk is already in the cache or it is less than a whole chunk
--		 * then use the cache (if there is caching)
-+		 * or we're using inband tags then use the cache (if there is caching)
- 		 * else bypass the cache.
- 		 */
--		if (cache || nToCopy != dev->nDataBytesPerChunk) {
-+		if (cache || nToCopy != dev->nDataBytesPerChunk || dev->inbandTags) {
- 			if (dev->nShortOpCaches > 0) {
- 
- 				/* If we can't find the data in the cache, then load it up. */
-@@ -4641,14 +4705,9 @@ int yaffs_ReadDataFromFile(yaffs_Object 
- 
- 				cache->locked = 1;
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_UnlockYAFFS(TRUE);
--#endif
-+
- 				memcpy(buffer, &cache->data[start], nToCopy);
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_LockYAFFS(TRUE);
--#endif
- 				cache->locked = 0;
- 			} else {
- 				/* Read into the local buffer then copy..*/
-@@ -4657,41 +4716,19 @@ int yaffs_ReadDataFromFile(yaffs_Object 
- 				    yaffs_GetTempBuffer(dev, __LINE__);
- 				yaffs_ReadChunkDataFromObject(in, chunk,
- 							      localBuffer);
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_UnlockYAFFS(TRUE);
--#endif
-+
- 				memcpy(buffer, &localBuffer[start], nToCopy);
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_LockYAFFS(TRUE);
--#endif
-+
- 				yaffs_ReleaseTempBuffer(dev, localBuffer,
- 							__LINE__);
- 			}
- 
- 		} else {
--#ifdef CONFIG_YAFFS_WINCE
--			__u8 *localBuffer = yaffs_GetTempBuffer(dev, __LINE__);
--
--			/* Under WinCE can't do direct transfer. Need to use a local buffer.
--			 * This is because we otherwise screw up WinCE's memory mapper
--			 */
--			yaffs_ReadChunkDataFromObject(in, chunk, localBuffer);
--
--#ifdef CONFIG_YAFFS_WINCE
--			yfsd_UnlockYAFFS(TRUE);
--#endif
--			memcpy(buffer, localBuffer, dev->nDataBytesPerChunk);
- 
--#ifdef CONFIG_YAFFS_WINCE
--			yfsd_LockYAFFS(TRUE);
--			yaffs_ReleaseTempBuffer(dev, localBuffer, __LINE__);
--#endif
--
--#else
- 			/* A full chunk. Read directly into the supplied buffer. */
- 			yaffs_ReadChunkDataFromObject(in, chunk, buffer);
--#endif
-+
- 		}
- 
- 		n -= nToCopy;
-@@ -4704,28 +4741,37 @@ int yaffs_ReadDataFromFile(yaffs_Object 
- 	return nDone;
- }
- 
--int yaffs_WriteDataToFile(yaffs_Object * in, const __u8 * buffer, loff_t offset,
--			  int nBytes, int writeThrough)
-+int yaffs_WriteDataToFile(yaffs_Object *in, const __u8 *buffer, loff_t offset,
-+			int nBytes, int writeThrough)
- {
- 
- 	int chunk;
--	int start;
-+	__u32 start;
- 	int nToCopy;
- 	int n = nBytes;
- 	int nDone = 0;
- 	int nToWriteBack;
- 	int startOfWrite = offset;
- 	int chunkWritten = 0;
--	int nBytesRead;
-+	__u32 nBytesRead;
-+	__u32 chunkStart;
- 
- 	yaffs_Device *dev;
- 
- 	dev = in->myDev;
- 
- 	while (n > 0 && chunkWritten >= 0) {
--		//chunk = offset / dev->nDataBytesPerChunk + 1;
--		//start = offset % dev->nDataBytesPerChunk;
--		yaffs_AddrToChunk(dev,offset,&chunk,&start);
-+		/* chunk = offset / dev->nDataBytesPerChunk + 1; */
-+		/* start = offset % dev->nDataBytesPerChunk; */
-+		yaffs_AddrToChunk(dev, offset, &chunk, &start);
-+
-+		if (chunk * dev->nDataBytesPerChunk + start != offset ||
-+				start >= dev->nDataBytesPerChunk) {
-+			T(YAFFS_TRACE_ERROR, (
-+			   TSTR("AddrToChunk of offset %d gives chunk %d start %d"
-+			   TENDSTR),
-+			   (int)offset, chunk, start));
-+		}
- 		chunk++;
- 
- 		/* OK now check for the curveball where the start and end are in
-@@ -4740,25 +4786,32 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 			 * we need to write back as much as was there before.
- 			 */
- 
--			nBytesRead =
--			    in->variant.fileVariant.fileSize -
--			    ((chunk - 1) * dev->nDataBytesPerChunk);
-+			chunkStart = ((chunk - 1) * dev->nDataBytesPerChunk);
-+
-+			if (chunkStart > in->variant.fileVariant.fileSize)
-+				nBytesRead = 0; /* Past end of file */
-+			else
-+				nBytesRead = in->variant.fileVariant.fileSize - chunkStart;
- 
--			if (nBytesRead > dev->nDataBytesPerChunk) {
-+			if (nBytesRead > dev->nDataBytesPerChunk)
- 				nBytesRead = dev->nDataBytesPerChunk;
--			}
- 
- 			nToWriteBack =
- 			    (nBytesRead >
- 			     (start + n)) ? nBytesRead : (start + n);
- 
-+			if (nToWriteBack < 0 || nToWriteBack > dev->nDataBytesPerChunk)
-+				YBUG();
-+
- 		} else {
- 			nToCopy = dev->nDataBytesPerChunk - start;
- 			nToWriteBack = dev->nDataBytesPerChunk;
- 		}
- 
--		if (nToCopy != dev->nDataBytesPerChunk) {
--			/* An incomplete start or end chunk (or maybe both start and end chunk) */
-+		if (nToCopy != dev->nDataBytesPerChunk || dev->inbandTags) {
-+			/* An incomplete start or end chunk (or maybe both start and end chunk),
-+			 * or we're using inband tags, so we want to use the cache buffers.
-+			 */
- 			if (dev->nShortOpCaches > 0) {
- 				yaffs_ChunkCache *cache;
- 				/* If we can't find the data in the cache, then load the cache */
-@@ -4775,10 +4828,9 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 					yaffs_ReadChunkDataFromObject(in, chunk,
- 								      cache->
- 								      data);
--				}
--				else if(cache &&
--				        !cache->dirty &&
--					!yaffs_CheckSpaceForAllocation(in->myDev)){
-+				} else if (cache &&
-+					!cache->dirty &&
-+					!yaffs_CheckSpaceForAllocation(in->myDev)) {
- 					/* Drop the cache if it was a read cache item and
- 					 * no space check has been made for it.
- 					 */
-@@ -4788,16 +4840,12 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 				if (cache) {
- 					yaffs_UseChunkCache(dev, cache, 1);
- 					cache->locked = 1;
--#ifdef CONFIG_YAFFS_WINCE
--					yfsd_UnlockYAFFS(TRUE);
--#endif
-+
- 
- 					memcpy(&cache->data[start], buffer,
- 					       nToCopy);
- 
--#ifdef CONFIG_YAFFS_WINCE
--					yfsd_LockYAFFS(TRUE);
--#endif
-+
- 					cache->locked = 0;
- 					cache->nBytes = nToWriteBack;
- 
-@@ -4825,15 +4873,10 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 				yaffs_ReadChunkDataFromObject(in, chunk,
- 							      localBuffer);
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_UnlockYAFFS(TRUE);
--#endif
-+
- 
- 				memcpy(&localBuffer[start], buffer, nToCopy);
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_LockYAFFS(TRUE);
--#endif
- 				chunkWritten =
- 				    yaffs_WriteChunkDataToObject(in, chunk,
- 								 localBuffer,
-@@ -4846,31 +4889,15 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 			}
- 
- 		} else {
--
--#ifdef CONFIG_YAFFS_WINCE
--			/* Under WinCE can't do direct transfer. Need to use a local buffer.
--			 * This is because we otherwise screw up WinCE's memory mapper
--			 */
--			__u8 *localBuffer = yaffs_GetTempBuffer(dev, __LINE__);
--#ifdef CONFIG_YAFFS_WINCE
--			yfsd_UnlockYAFFS(TRUE);
--#endif
--			memcpy(localBuffer, buffer, dev->nDataBytesPerChunk);
--#ifdef CONFIG_YAFFS_WINCE
--			yfsd_LockYAFFS(TRUE);
--#endif
--			chunkWritten =
--			    yaffs_WriteChunkDataToObject(in, chunk, localBuffer,
--							 dev->nDataBytesPerChunk,
--							 0);
--			yaffs_ReleaseTempBuffer(dev, localBuffer, __LINE__);
--#else
- 			/* A full chunk. Write directly from the supplied buffer. */
-+
-+
-+
- 			chunkWritten =
- 			    yaffs_WriteChunkDataToObject(in, chunk, buffer,
- 							 dev->nDataBytesPerChunk,
- 							 0);
--#endif
-+
- 			/* Since we've overwritten the cached data, we better invalidate it. */
- 			yaffs_InvalidateChunkCache(in, chunk);
- 		}
-@@ -4886,9 +4913,8 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 
- 	/* Update file object */
- 
--	if ((startOfWrite + nDone) > in->variant.fileVariant.fileSize) {
-+	if ((startOfWrite + nDone) > in->variant.fileVariant.fileSize)
- 		in->variant.fileVariant.fileSize = (startOfWrite + nDone);
--	}
- 
- 	in->dirty = 1;
- 
-@@ -4898,7 +4924,7 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 
- /* ---------------------- File resizing stuff ------------------ */
- 
--static void yaffs_PruneResizedChunks(yaffs_Object * in, int newSize)
-+static void yaffs_PruneResizedChunks(yaffs_Object *in, int newSize)
- {
- 
- 	yaffs_Device *dev = in->myDev;
-@@ -4939,11 +4965,11 @@ static void yaffs_PruneResizedChunks(yaf
- 
- }
- 
--int yaffs_ResizeFile(yaffs_Object * in, loff_t newSize)
-+int yaffs_ResizeFile(yaffs_Object *in, loff_t newSize)
- {
- 
- 	int oldFileSize = in->variant.fileVariant.fileSize;
--	int newSizeOfPartialChunk;
-+	__u32 newSizeOfPartialChunk;
- 	int newFullChunks;
- 
- 	yaffs_Device *dev = in->myDev;
-@@ -4955,13 +4981,11 @@ int yaffs_ResizeFile(yaffs_Object * in, 
- 
- 	yaffs_CheckGarbageCollection(dev);
- 
--	if (in->variantType != YAFFS_OBJECT_TYPE_FILE) {
--		return yaffs_GetFileSize(in);
--	}
-+	if (in->variantType != YAFFS_OBJECT_TYPE_FILE)
-+		return YAFFS_FAIL;
- 
--	if (newSize == oldFileSize) {
--		return oldFileSize;
--	}
-+	if (newSize == oldFileSize)
-+		return YAFFS_OK;
- 
- 	if (newSize < oldFileSize) {
- 
-@@ -4994,21 +5018,20 @@ int yaffs_ResizeFile(yaffs_Object * in, 
- 	}
- 
- 
--
- 	/* Write a new object header.
- 	 * show we've shrunk the file, if need be
- 	 * Do this only if the file is not in the deleted directories.
- 	 */
--	if (in->parent->objectId != YAFFS_OBJECTID_UNLINKED &&
--	    in->parent->objectId != YAFFS_OBJECTID_DELETED) {
-+	if (in->parent &&
-+	    in->parent->objectId != YAFFS_OBJECTID_UNLINKED &&
-+	    in->parent->objectId != YAFFS_OBJECTID_DELETED)
- 		yaffs_UpdateObjectHeader(in, NULL, 0,
- 					 (newSize < oldFileSize) ? 1 : 0, 0);
--	}
- 
--	return newSize;
-+	return YAFFS_OK;
- }
- 
--loff_t yaffs_GetFileSize(yaffs_Object * obj)
-+loff_t yaffs_GetFileSize(yaffs_Object *obj)
- {
- 	obj = yaffs_GetEquivalentObject(obj);
- 
-@@ -5024,7 +5047,7 @@ loff_t yaffs_GetFileSize(yaffs_Object * 
- 
- 
- 
--int yaffs_FlushFile(yaffs_Object * in, int updateTime)
-+int yaffs_FlushFile(yaffs_Object *in, int updateTime)
- {
- 	int retVal;
- 	if (in->dirty) {
-@@ -5039,9 +5062,8 @@ int yaffs_FlushFile(yaffs_Object * in, i
- #endif
- 		}
- 
--		retVal =
--		    (yaffs_UpdateObjectHeader(in, NULL, 0, 0, 0) >=
--		     0) ? YAFFS_OK : YAFFS_FAIL;
-+		retVal = (yaffs_UpdateObjectHeader(in, NULL, 0, 0, 0) >=
-+			0) ? YAFFS_OK : YAFFS_FAIL;
- 	} else {
- 		retVal = YAFFS_OK;
- 	}
-@@ -5050,7 +5072,7 @@ int yaffs_FlushFile(yaffs_Object * in, i
- 
- }
- 
--static int yaffs_DoGenericObjectDeletion(yaffs_Object * in)
-+static int yaffs_DoGenericObjectDeletion(yaffs_Object *in)
- {
- 
- 	/* First off, invalidate the file's data in the cache, without flushing. */
-@@ -5058,13 +5080,13 @@ static int yaffs_DoGenericObjectDeletion
- 
- 	if (in->myDev->isYaffs2 && (in->parent != in->myDev->deletedDir)) {
- 		/* Move to the unlinked directory so we have a record that it was deleted. */
--		yaffs_ChangeObjectName(in, in->myDev->deletedDir,"deleted", 0, 0);
-+		yaffs_ChangeObjectName(in, in->myDev->deletedDir, _Y("deleted"), 0, 0);
- 
- 	}
- 
- 	yaffs_RemoveObjectFromDirectory(in);
--	yaffs_DeleteChunk(in->myDev, in->chunkId, 1, __LINE__);
--	in->chunkId = -1;
-+	yaffs_DeleteChunk(in->myDev, in->hdrChunk, 1, __LINE__);
-+	in->hdrChunk = 0;
- 
- 	yaffs_FreeObject(in);
- 	return YAFFS_OK;
-@@ -5075,62 +5097,63 @@ static int yaffs_DoGenericObjectDeletion
-  * and the inode associated with the file.
-  * It does not delete the links associated with the file.
-  */
--static int yaffs_UnlinkFile(yaffs_Object * in)
-+static int yaffs_UnlinkFileIfNeeded(yaffs_Object *in)
- {
- 
- 	int retVal;
- 	int immediateDeletion = 0;
- 
--	if (1) {
- #ifdef __KERNEL__
--		if (!in->myInode) {
--			immediateDeletion = 1;
--
--		}
-+	if (!in->myInode)
-+		immediateDeletion = 1;
- #else
--		if (in->inUse <= 0) {
--			immediateDeletion = 1;
--
--		}
-+	if (in->inUse <= 0)
-+		immediateDeletion = 1;
- #endif
--		if (immediateDeletion) {
--			retVal =
--			    yaffs_ChangeObjectName(in, in->myDev->deletedDir,
--						   "deleted", 0, 0);
--			T(YAFFS_TRACE_TRACING,
--			  (TSTR("yaffs: immediate deletion of file %d" TENDSTR),
--			   in->objectId));
--			in->deleted = 1;
--			in->myDev->nDeletedFiles++;
--			if (0 && in->myDev->isYaffs2) {
--				yaffs_ResizeFile(in, 0);
--			}
--			yaffs_SoftDeleteFile(in);
--		} else {
--			retVal =
--			    yaffs_ChangeObjectName(in, in->myDev->unlinkedDir,
--						   "unlinked", 0, 0);
--		}
- 
-+	if (immediateDeletion) {
-+		retVal =
-+		    yaffs_ChangeObjectName(in, in->myDev->deletedDir,
-+					   _Y("deleted"), 0, 0);
-+		T(YAFFS_TRACE_TRACING,
-+		  (TSTR("yaffs: immediate deletion of file %d" TENDSTR),
-+		   in->objectId));
-+		in->deleted = 1;
-+		in->myDev->nDeletedFiles++;
-+		if (1 || in->myDev->isYaffs2)
-+			yaffs_ResizeFile(in, 0);
-+		yaffs_SoftDeleteFile(in);
-+	} else {
-+		retVal =
-+		    yaffs_ChangeObjectName(in, in->myDev->unlinkedDir,
-+					   _Y("unlinked"), 0, 0);
- 	}
-+
-+
- 	return retVal;
- }
- 
--int yaffs_DeleteFile(yaffs_Object * in)
-+int yaffs_DeleteFile(yaffs_Object *in)
- {
- 	int retVal = YAFFS_OK;
-+	int deleted = in->deleted;
-+
-+	yaffs_ResizeFile(in, 0);
- 
- 	if (in->nDataChunks > 0) {
--		/* Use soft deletion if there is data in the file */
--		if (!in->unlinked) {
--			retVal = yaffs_UnlinkFile(in);
--		}
-+		/* Use soft deletion if there is data in the file.
-+		 * That won't be the case if it has been resized to zero.
-+		 */
-+		if (!in->unlinked)
-+			retVal = yaffs_UnlinkFileIfNeeded(in);
-+
- 		if (retVal == YAFFS_OK && in->unlinked && !in->deleted) {
- 			in->deleted = 1;
-+			deleted = 1;
- 			in->myDev->nDeletedFiles++;
- 			yaffs_SoftDeleteFile(in);
- 		}
--		return in->deleted ? YAFFS_OK : YAFFS_FAIL;
-+		return deleted ? YAFFS_OK : YAFFS_FAIL;
- 	} else {
- 		/* The file has no data chunks so we toss it immediately */
- 		yaffs_FreeTnode(in->myDev, in->variant.fileVariant.top);
-@@ -5141,62 +5164,75 @@ int yaffs_DeleteFile(yaffs_Object * in)
- 	}
- }
- 
--static int yaffs_DeleteDirectory(yaffs_Object * in)
-+static int yaffs_DeleteDirectory(yaffs_Object *in)
- {
- 	/* First check that the directory is empty. */
--	if (list_empty(&in->variant.directoryVariant.children)) {
-+	if (ylist_empty(&in->variant.directoryVariant.children))
- 		return yaffs_DoGenericObjectDeletion(in);
--	}
- 
- 	return YAFFS_FAIL;
- 
- }
- 
--static int yaffs_DeleteSymLink(yaffs_Object * in)
-+static int yaffs_DeleteSymLink(yaffs_Object *in)
- {
- 	YFREE(in->variant.symLinkVariant.alias);
- 
- 	return yaffs_DoGenericObjectDeletion(in);
- }
- 
--static int yaffs_DeleteHardLink(yaffs_Object * in)
-+static int yaffs_DeleteHardLink(yaffs_Object *in)
- {
- 	/* remove this hardlink from the list assocaited with the equivalent
- 	 * object
- 	 */
--	list_del(&in->hardLinks);
-+	ylist_del_init(&in->hardLinks);
- 	return yaffs_DoGenericObjectDeletion(in);
- }
- 
--static void yaffs_DestroyObject(yaffs_Object * obj)
-+int yaffs_DeleteObject(yaffs_Object *obj)
- {
-+int retVal = -1;
- 	switch (obj->variantType) {
- 	case YAFFS_OBJECT_TYPE_FILE:
--		yaffs_DeleteFile(obj);
-+		retVal = yaffs_DeleteFile(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_DIRECTORY:
--		yaffs_DeleteDirectory(obj);
-+		return yaffs_DeleteDirectory(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_SYMLINK:
--		yaffs_DeleteSymLink(obj);
-+		retVal = yaffs_DeleteSymLink(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_HARDLINK:
--		yaffs_DeleteHardLink(obj);
-+		retVal = yaffs_DeleteHardLink(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_SPECIAL:
--		yaffs_DoGenericObjectDeletion(obj);
-+		retVal = yaffs_DoGenericObjectDeletion(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_UNKNOWN:
-+		retVal = 0;
- 		break;		/* should not happen. */
- 	}
-+
-+	return retVal;
- }
- 
--static int yaffs_UnlinkWorker(yaffs_Object * obj)
-+static int yaffs_UnlinkWorker(yaffs_Object *obj)
- {
- 
-+	int immediateDeletion = 0;
-+
-+#ifdef __KERNEL__
-+	if (!obj->myInode)
-+		immediateDeletion = 1;
-+#else
-+	if (obj->inUse <= 0)
-+		immediateDeletion = 1;
-+#endif
-+
- 	if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
- 		return yaffs_DeleteHardLink(obj);
--	} else if (!list_empty(&obj->hardLinks)) {
-+	} else if (!ylist_empty(&obj->hardLinks)) {
- 		/* Curve ball: We're unlinking an object that has a hardlink.
- 		 *
- 		 * This problem arises because we are not strictly following
-@@ -5215,24 +5251,24 @@ static int yaffs_UnlinkWorker(yaffs_Obje
- 		int retVal;
- 		YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
- 
--		hl = list_entry(obj->hardLinks.next, yaffs_Object, hardLinks);
-+		hl = ylist_entry(obj->hardLinks.next, yaffs_Object, hardLinks);
- 
--		list_del_init(&hl->hardLinks);
--		list_del_init(&hl->siblings);
-+		ylist_del_init(&hl->hardLinks);
-+		ylist_del_init(&hl->siblings);
- 
- 		yaffs_GetObjectName(hl, name, YAFFS_MAX_NAME_LENGTH + 1);
- 
- 		retVal = yaffs_ChangeObjectName(obj, hl->parent, name, 0, 0);
- 
--		if (retVal == YAFFS_OK) {
-+		if (retVal == YAFFS_OK)
- 			retVal = yaffs_DoGenericObjectDeletion(hl);
--		}
-+
- 		return retVal;
- 
--	} else {
-+	} else if (immediateDeletion) {
- 		switch (obj->variantType) {
- 		case YAFFS_OBJECT_TYPE_FILE:
--			return yaffs_UnlinkFile(obj);
-+			return yaffs_DeleteFile(obj);
- 			break;
- 		case YAFFS_OBJECT_TYPE_DIRECTORY:
- 			return yaffs_DeleteDirectory(obj);
-@@ -5248,21 +5284,22 @@ static int yaffs_UnlinkWorker(yaffs_Obje
- 		default:
- 			return YAFFS_FAIL;
- 		}
--	}
-+	} else
-+		return yaffs_ChangeObjectName(obj, obj->myDev->unlinkedDir,
-+					   _Y("unlinked"), 0, 0);
- }
- 
- 
--static int yaffs_UnlinkObject( yaffs_Object *obj)
-+static int yaffs_UnlinkObject(yaffs_Object *obj)
- {
- 
--	if (obj && obj->unlinkAllowed) {
-+	if (obj && obj->unlinkAllowed)
- 		return yaffs_UnlinkWorker(obj);
--	}
- 
- 	return YAFFS_FAIL;
- 
- }
--int yaffs_Unlink(yaffs_Object * dir, const YCHAR * name)
-+int yaffs_Unlink(yaffs_Object *dir, const YCHAR *name)
- {
- 	yaffs_Object *obj;
- 
-@@ -5272,8 +5309,8 @@ int yaffs_Unlink(yaffs_Object * dir, con
- 
- /*----------------------- Initialisation Scanning ---------------------- */
- 
--static void yaffs_HandleShadowedObject(yaffs_Device * dev, int objId,
--				       int backwardScanning)
-+static void yaffs_HandleShadowedObject(yaffs_Device *dev, int objId,
-+				int backwardScanning)
- {
- 	yaffs_Object *obj;
- 
-@@ -5286,9 +5323,8 @@ static void yaffs_HandleShadowedObject(y
- 		/* Handle YAFFS2 case (backward scanning)
- 		 * If the shadowed object exists then ignore.
- 		 */
--		if (yaffs_FindObjectByNumber(dev, objId)) {
-+		if (yaffs_FindObjectByNumber(dev, objId))
- 			return;
--		}
- 	}
- 
- 	/* Let's create it (if it does not exist) assuming it is a file so that it can do shrinking etc.
-@@ -5297,6 +5333,8 @@ static void yaffs_HandleShadowedObject(y
- 	obj =
- 	    yaffs_FindOrCreateObjectByNumber(dev, objId,
- 					     YAFFS_OBJECT_TYPE_FILE);
-+	if (!obj)
-+		return;
- 	yaffs_AddObjectToDirectory(dev->unlinkedDir, obj);
- 	obj->variant.fileVariant.shrinkSize = 0;
- 	obj->valid = 1;		/* So that we don't read any other info for this file */
-@@ -5325,44 +5363,77 @@ static void yaffs_HardlinkFixup(yaffs_De
- 		if (in) {
- 			/* Add the hardlink pointers */
- 			hl->variant.hardLinkVariant.equivalentObject = in;
--			list_add(&hl->hardLinks, &in->hardLinks);
-+			ylist_add(&hl->hardLinks, &in->hardLinks);
- 		} else {
- 			/* Todo Need to report/handle this better.
- 			 * Got a problem... hardlink to a non-existant object
- 			 */
- 			hl->variant.hardLinkVariant.equivalentObject = NULL;
--			INIT_LIST_HEAD(&hl->hardLinks);
-+			YINIT_LIST_HEAD(&hl->hardLinks);
- 
- 		}
--
- 	}
-+}
-+
-+
- 
-+
-+
-+static int ybicmp(const void *a, const void *b)
-+{
-+	register int aseq = ((yaffs_BlockIndex *)a)->seq;
-+	register int bseq = ((yaffs_BlockIndex *)b)->seq;
-+	register int ablock = ((yaffs_BlockIndex *)a)->block;
-+	register int bblock = ((yaffs_BlockIndex *)b)->block;
-+	if (aseq == bseq)
-+		return ablock - bblock;
-+	else
-+		return aseq - bseq;
- }
- 
- 
-+struct yaffs_ShadowFixerStruct {
-+	int objectId;
-+	int shadowedId;
-+	struct yaffs_ShadowFixerStruct *next;
-+};
-+
- 
-+static void yaffs_StripDeletedObjects(yaffs_Device *dev)
-+{
-+	/*
-+	*  Sort out state of unlinked and deleted objects after scanning.
-+	*/
-+	struct ylist_head *i;
-+	struct ylist_head *n;
-+	yaffs_Object *l;
- 
-+	/* Soft delete all the unlinked files */
-+	ylist_for_each_safe(i, n,
-+		&dev->unlinkedDir->variant.directoryVariant.children) {
-+		if (i) {
-+			l = ylist_entry(i, yaffs_Object, siblings);
-+			yaffs_DeleteObject(l);
-+		}
-+	}
- 
--static int ybicmp(const void *a, const void *b){
--    register int aseq = ((yaffs_BlockIndex *)a)->seq;
--    register int bseq = ((yaffs_BlockIndex *)b)->seq;
--    register int ablock = ((yaffs_BlockIndex *)a)->block;
--    register int bblock = ((yaffs_BlockIndex *)b)->block;
--    if( aseq == bseq )
--        return ablock - bblock;
--    else
--        return aseq - bseq;
-+	ylist_for_each_safe(i, n,
-+		&dev->deletedDir->variant.directoryVariant.children) {
-+		if (i) {
-+			l = ylist_entry(i, yaffs_Object, siblings);
-+			yaffs_DeleteObject(l);
-+		}
-+	}
- 
- }
- 
--static int yaffs_Scan(yaffs_Device * dev)
-+static int yaffs_Scan(yaffs_Device *dev)
- {
- 	yaffs_ExtendedTags tags;
- 	int blk;
- 	int blockIterator;
- 	int startIterator;
- 	int endIterator;
--	int nBlocksToScan = 0;
- 	int result;
- 
- 	int chunk;
-@@ -5371,26 +5442,19 @@ static int yaffs_Scan(yaffs_Device * dev
- 	yaffs_BlockState state;
- 	yaffs_Object *hardList = NULL;
- 	yaffs_BlockInfo *bi;
--	int sequenceNumber;
-+	__u32 sequenceNumber;
- 	yaffs_ObjectHeader *oh;
- 	yaffs_Object *in;
- 	yaffs_Object *parent;
--	int nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1;
- 
- 	int alloc_failed = 0;
- 
-+	struct yaffs_ShadowFixerStruct *shadowFixerList = NULL;
-+
- 
- 	__u8 *chunkData;
- 
--	yaffs_BlockIndex *blockIndex = NULL;
- 
--	if (dev->isYaffs2) {
--		T(YAFFS_TRACE_SCAN,
--		  (TSTR("yaffs_Scan is not for YAFFS2!" TENDSTR)));
--		return YAFFS_FAIL;
--	}
--
--	//TODO  Throw all the yaffs2 stuuf out of yaffs_Scan since it is only for yaffs1 format.
- 
- 	T(YAFFS_TRACE_SCAN,
- 	  (TSTR("yaffs_Scan starts  intstartblk %d intendblk %d..." TENDSTR),
-@@ -5400,12 +5464,6 @@ static int yaffs_Scan(yaffs_Device * dev
- 
- 	dev->sequenceNumber = YAFFS_LOWEST_SEQUENCE_NUMBER;
- 
--	if (dev->isYaffs2) {
--		blockIndex = YMALLOC(nBlocks * sizeof(yaffs_BlockIndex));
--		if(!blockIndex)
--			return YAFFS_FAIL;
--	}
--
- 	/* Scan all the blocks to determine their state */
- 	for (blk = dev->internalStartBlock; blk <= dev->internalEndBlock; blk++) {
- 		bi = yaffs_GetBlockInfo(dev, blk);
-@@ -5418,6 +5476,9 @@ static int yaffs_Scan(yaffs_Device * dev
- 		bi->blockState = state;
- 		bi->sequenceNumber = sequenceNumber;
- 
-+		if (bi->sequenceNumber == YAFFS_SEQUENCE_BAD_BLOCK)
-+			bi->blockState = state = YAFFS_BLOCK_STATE_DEAD;
-+
- 		T(YAFFS_TRACE_SCAN_DEBUG,
- 		  (TSTR("Block scanning block %d state %d seq %d" TENDSTR), blk,
- 		   state, sequenceNumber));
-@@ -5430,70 +5491,21 @@ static int yaffs_Scan(yaffs_Device * dev
- 			  (TSTR("Block empty " TENDSTR)));
- 			dev->nErasedBlocks++;
- 			dev->nFreeChunks += dev->nChunksPerBlock;
--		} else if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
--
--			/* Determine the highest sequence number */
--			if (dev->isYaffs2 &&
--			    sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
--			    sequenceNumber < YAFFS_HIGHEST_SEQUENCE_NUMBER) {
--
--				blockIndex[nBlocksToScan].seq = sequenceNumber;
--				blockIndex[nBlocksToScan].block = blk;
--
--				nBlocksToScan++;
--
--				if (sequenceNumber >= dev->sequenceNumber) {
--					dev->sequenceNumber = sequenceNumber;
--				}
--			} else if (dev->isYaffs2) {
--				/* TODO: Nasty sequence number! */
--				T(YAFFS_TRACE_SCAN,
--				  (TSTR
--				   ("Block scanning block %d has bad sequence number %d"
--				    TENDSTR), blk, sequenceNumber));
--
--			}
- 		}
- 	}
- 
--	/* Sort the blocks
--	 * Dungy old bubble sort for now...
--	 */
--	if (dev->isYaffs2) {
--		yaffs_BlockIndex temp;
--		int i;
--		int j;
--
--		for (i = 0; i < nBlocksToScan; i++)
--			for (j = i + 1; j < nBlocksToScan; j++)
--				if (blockIndex[i].seq > blockIndex[j].seq) {
--					temp = blockIndex[j];
--					blockIndex[j] = blockIndex[i];
--					blockIndex[i] = temp;
--				}
--	}
--
--	/* Now scan the blocks looking at the data. */
--	if (dev->isYaffs2) {
--		startIterator = 0;
--		endIterator = nBlocksToScan - 1;
--		T(YAFFS_TRACE_SCAN_DEBUG,
--		  (TSTR("%d blocks to be scanned" TENDSTR), nBlocksToScan));
--	} else {
--		startIterator = dev->internalStartBlock;
--		endIterator = dev->internalEndBlock;
--	}
-+	startIterator = dev->internalStartBlock;
-+	endIterator = dev->internalEndBlock;
- 
- 	/* For each block.... */
- 	for (blockIterator = startIterator; !alloc_failed && blockIterator <= endIterator;
- 	     blockIterator++) {
- 
--		if (dev->isYaffs2) {
--			/* get the block to scan in the correct order */
--			blk = blockIndex[blockIterator].block;
--		} else {
--			blk = blockIterator;
--		}
-+		YYIELD();
-+
-+		YYIELD();
-+
-+		blk = blockIterator;
- 
- 		bi = yaffs_GetBlockInfo(dev, blk);
- 		state = bi->blockState;
-@@ -5511,7 +5523,7 @@ static int yaffs_Scan(yaffs_Device * dev
- 
- 			/* Let's have a good look at this chunk... */
- 
--			if (!dev->isYaffs2 && tags.chunkDeleted) {
-+			if (tags.eccResult == YAFFS_ECC_RESULT_UNFIXED || tags.chunkDeleted) {
- 				/* YAFFS1 only...
- 				 * A deleted chunk
- 				 */
-@@ -5540,18 +5552,6 @@ static int yaffs_Scan(yaffs_Device * dev
- 					dev->allocationBlockFinder = blk;
- 					/* Set it to here to encourage the allocator to go forth from here. */
- 
--					/* Yaffs2 sanity check:
--					 * This should be the one with the highest sequence number
--					 */
--					if (dev->isYaffs2
--					    && (dev->sequenceNumber !=
--						bi->sequenceNumber)) {
--						T(YAFFS_TRACE_ALWAYS,
--						  (TSTR
--						   ("yaffs: Allocation block %d was not highest sequence id:"
--						    " block seq = %d, dev seq = %d"
--						    TENDSTR), blk,bi->sequenceNumber,dev->sequenceNumber));
--					}
- 				}
- 
- 				dev->nFreeChunks += (dev->nChunksPerBlock - c);
-@@ -5570,11 +5570,11 @@ static int yaffs_Scan(yaffs_Device * dev
- 				 * the same chunkId).
- 				 */
- 
--				if(!in)
-+				if (!in)
- 					alloc_failed = 1;
- 
--				if(in){
--					if(!yaffs_PutChunkIntoFile(in, tags.chunkId, chunk,1))
-+				if (in) {
-+					if (!yaffs_PutChunkIntoFile(in, tags.chunkId, chunk, 1))
- 						alloc_failed = 1;
- 				}
- 
-@@ -5617,7 +5617,7 @@ static int yaffs_Scan(yaffs_Device * dev
- 					 * deleted, and worse still it has changed type. Delete the old object.
- 					 */
- 
--					yaffs_DestroyObject(in);
-+					yaffs_DeleteObject(in);
- 
- 					in = 0;
- 				}
-@@ -5627,14 +5627,20 @@ static int yaffs_Scan(yaffs_Device * dev
- 								      objectId,
- 								      oh->type);
- 
--				if(!in)
-+				if (!in)
- 					alloc_failed = 1;
- 
- 				if (in && oh->shadowsObject > 0) {
--					yaffs_HandleShadowedObject(dev,
--								   oh->
--								   shadowsObject,
--								   0);
-+
-+					struct yaffs_ShadowFixerStruct *fixer;
-+					fixer = YMALLOC(sizeof(struct yaffs_ShadowFixerStruct));
-+					if (fixer) {
-+						fixer->next = shadowFixerList;
-+						shadowFixerList = fixer;
-+						fixer->objectId = tags.objectId;
-+						fixer->shadowedId = oh->shadowsObject;
-+					}
-+
- 				}
- 
- 				if (in && in->valid) {
-@@ -5643,12 +5649,10 @@ static int yaffs_Scan(yaffs_Device * dev
- 					unsigned existingSerial = in->serial;
- 					unsigned newSerial = tags.serialNumber;
- 
--					if (dev->isYaffs2 ||
--					    ((existingSerial + 1) & 3) ==
--					    newSerial) {
-+					if (((existingSerial + 1) & 3) == newSerial) {
- 						/* Use new one - destroy the exisiting one */
- 						yaffs_DeleteChunk(dev,
--								  in->chunkId,
-+								  in->hdrChunk,
- 								  1, __LINE__);
- 						in->valid = 0;
- 					} else {
-@@ -5681,7 +5685,8 @@ static int yaffs_Scan(yaffs_Device * dev
- 					in->yst_ctime = oh->yst_ctime;
- 					in->yst_rdev = oh->yst_rdev;
- #endif
--					in->chunkId = chunk;
-+					in->hdrChunk = chunk;
-+					in->serial = tags.serialNumber;
- 
- 				} else if (in && !in->valid) {
- 					/* we need to load this info */
-@@ -5705,7 +5710,8 @@ static int yaffs_Scan(yaffs_Device * dev
- 					in->yst_ctime = oh->yst_ctime;
- 					in->yst_rdev = oh->yst_rdev;
- #endif
--					in->chunkId = chunk;
-+					in->hdrChunk = chunk;
-+					in->serial = tags.serialNumber;
- 
- 					yaffs_SetObjectName(in, oh->name);
- 					in->dirty = 0;
-@@ -5718,25 +5724,25 @@ static int yaffs_Scan(yaffs_Device * dev
- 					    yaffs_FindOrCreateObjectByNumber
- 					    (dev, oh->parentObjectId,
- 					     YAFFS_OBJECT_TYPE_DIRECTORY);
--					if (parent->variantType ==
-+					if (!parent)
-+						alloc_failed = 1;
-+					if (parent && parent->variantType ==
- 					    YAFFS_OBJECT_TYPE_UNKNOWN) {
- 						/* Set up as a directory */
- 						parent->variantType =
--						    YAFFS_OBJECT_TYPE_DIRECTORY;
--						INIT_LIST_HEAD(&parent->variant.
--							       directoryVariant.
--							       children);
--					} else if (parent->variantType !=
--						   YAFFS_OBJECT_TYPE_DIRECTORY)
--					{
-+							YAFFS_OBJECT_TYPE_DIRECTORY;
-+						YINIT_LIST_HEAD(&parent->variant.
-+								directoryVariant.
-+								children);
-+					} else if (!parent || parent->variantType !=
-+						   YAFFS_OBJECT_TYPE_DIRECTORY) {
- 						/* Hoosterman, another problem....
- 						 * We're trying to use a non-directory as a directory
- 						 */
- 
- 						T(YAFFS_TRACE_ERROR,
- 						  (TSTR
--						   ("yaffs tragedy: attempting to use non-directory as"
--						    " a directory in scan. Put in lost+found."
-+						   ("yaffs tragedy: attempting to use non-directory as a directory in scan. Put in lost+found."
- 						    TENDSTR)));
- 						parent = dev->lostNFoundDir;
- 					}
-@@ -5760,15 +5766,6 @@ static int yaffs_Scan(yaffs_Device * dev
- 						/* Todo got a problem */
- 						break;
- 					case YAFFS_OBJECT_TYPE_FILE:
--						if (dev->isYaffs2
--						    && oh->isShrink) {
--							/* Prune back the shrunken chunks */
--							yaffs_PruneResizedChunks
--							    (in, oh->fileSize);
--							/* Mark the block as having a shrinkHeader */
--							bi->hasShrinkHeader = 1;
--						}
--
- 						if (dev->useHeaderFileSize)
- 
- 							in->variant.fileVariant.
-@@ -5778,11 +5775,11 @@ static int yaffs_Scan(yaffs_Device * dev
- 						break;
- 					case YAFFS_OBJECT_TYPE_HARDLINK:
- 						in->variant.hardLinkVariant.
--						    equivalentObjectId =
--						    oh->equivalentObjectId;
-+							equivalentObjectId =
-+							oh->equivalentObjectId;
- 						in->hardLinks.next =
--						    (struct list_head *)
--						    hardList;
-+							(struct ylist_head *)
-+							hardList;
- 						hardList = in;
- 						break;
- 					case YAFFS_OBJECT_TYPE_DIRECTORY:
-@@ -5794,15 +5791,17 @@ static int yaffs_Scan(yaffs_Device * dev
- 					case YAFFS_OBJECT_TYPE_SYMLINK:
- 						in->variant.symLinkVariant.alias =
- 						    yaffs_CloneString(oh->alias);
--						if(!in->variant.symLinkVariant.alias)
-+						if (!in->variant.symLinkVariant.alias)
- 							alloc_failed = 1;
- 						break;
- 					}
- 
-+/*
- 					if (parent == dev->deletedDir) {
- 						yaffs_DestroyObject(in);
- 						bi->hasShrinkHeader = 1;
- 					}
-+*/
- 				}
- 			}
- 		}
-@@ -5823,10 +5822,6 @@ static int yaffs_Scan(yaffs_Device * dev
- 
- 	}
- 
--	if (blockIndex) {
--		YFREE(blockIndex);
--	}
--
- 
- 	/* Ok, we've done all the scanning.
- 	 * Fix up the hard link chains.
-@@ -5834,32 +5829,36 @@ static int yaffs_Scan(yaffs_Device * dev
- 	 * hardlinks.
- 	 */
- 
--	yaffs_HardlinkFixup(dev,hardList);
-+	yaffs_HardlinkFixup(dev, hardList);
- 
--	/* Handle the unlinked files. Since they were left in an unlinked state we should
--	 * just delete them.
--	 */
-+	/* Fix up any shadowed objects */
- 	{
--		struct list_head *i;
--		struct list_head *n;
-+		struct yaffs_ShadowFixerStruct *fixer;
-+		yaffs_Object *obj;
- 
--		yaffs_Object *l;
--		/* Soft delete all the unlinked files */
--		list_for_each_safe(i, n,
--				   &dev->unlinkedDir->variant.directoryVariant.
--				   children) {
--			if (i) {
--				l = list_entry(i, yaffs_Object, siblings);
--				yaffs_DestroyObject(l);
--			}
-+		while (shadowFixerList) {
-+			fixer = shadowFixerList;
-+			shadowFixerList = fixer->next;
-+			/* Complete the rename transaction by deleting the shadowed object
-+			 * then setting the object header to unshadowed.
-+			 */
-+			obj = yaffs_FindObjectByNumber(dev, fixer->shadowedId);
-+			if (obj)
-+				yaffs_DeleteObject(obj);
-+
-+			obj = yaffs_FindObjectByNumber(dev, fixer->objectId);
-+
-+			if (obj)
-+				yaffs_UpdateObjectHeader(obj, NULL, 1, 0, 0);
-+
-+			YFREE(fixer);
- 		}
- 	}
- 
- 	yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
- 
--	if(alloc_failed){
-+	if (alloc_failed)
- 		return YAFFS_FAIL;
--	}
- 
- 	T(YAFFS_TRACE_SCAN, (TSTR("yaffs_Scan ends" TENDSTR)));
- 
-@@ -5871,25 +5870,27 @@ static void yaffs_CheckObjectDetailsLoad
- {
- 	__u8 *chunkData;
- 	yaffs_ObjectHeader *oh;
--	yaffs_Device *dev = in->myDev;
-+	yaffs_Device *dev;
- 	yaffs_ExtendedTags tags;
- 	int result;
- 	int alloc_failed = 0;
- 
--	if(!in)
-+	if (!in)
- 		return;
- 
-+	dev = in->myDev;
-+
- #if 0
--	T(YAFFS_TRACE_SCAN,(TSTR("details for object %d %s loaded" TENDSTR),
-+	T(YAFFS_TRACE_SCAN, (TSTR("details for object %d %s loaded" TENDSTR),
- 		in->objectId,
- 		in->lazyLoaded ? "not yet" : "already"));
- #endif
- 
--	if(in->lazyLoaded){
-+	if (in->lazyLoaded && in->hdrChunk > 0) {
- 		in->lazyLoaded = 0;
- 		chunkData = yaffs_GetTempBuffer(dev, __LINE__);
- 
--		result = yaffs_ReadChunkWithTagsFromNAND(dev,in->chunkId,chunkData,&tags);
-+		result = yaffs_ReadChunkWithTagsFromNAND(dev, in->hdrChunk, chunkData, &tags);
- 		oh = (yaffs_ObjectHeader *) chunkData;
- 
- 		in->yst_mode = oh->yst_mode;
-@@ -5911,18 +5912,18 @@ static void yaffs_CheckObjectDetailsLoad
- #endif
- 		yaffs_SetObjectName(in, oh->name);
- 
--		if(in->variantType == YAFFS_OBJECT_TYPE_SYMLINK){
--			 in->variant.symLinkVariant.alias =
-+		if (in->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
-+			in->variant.symLinkVariant.alias =
- 						    yaffs_CloneString(oh->alias);
--			if(!in->variant.symLinkVariant.alias)
-+			if (!in->variant.symLinkVariant.alias)
- 				alloc_failed = 1; /* Not returned to caller */
- 		}
- 
--		yaffs_ReleaseTempBuffer(dev,chunkData, __LINE__);
-+		yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
- 	}
- }
- 
--static int yaffs_ScanBackwards(yaffs_Device * dev)
-+static int yaffs_ScanBackwards(yaffs_Device *dev)
- {
- 	yaffs_ExtendedTags tags;
- 	int blk;
-@@ -5938,7 +5939,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 	yaffs_BlockState state;
- 	yaffs_Object *hardList = NULL;
- 	yaffs_BlockInfo *bi;
--	int sequenceNumber;
-+	__u32 sequenceNumber;
- 	yaffs_ObjectHeader *oh;
- 	yaffs_Object *in;
- 	yaffs_Object *parent;
-@@ -5972,12 +5973,12 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 	blockIndex = YMALLOC(nBlocks * sizeof(yaffs_BlockIndex));
- 
--	if(!blockIndex) {
-+	if (!blockIndex) {
- 		blockIndex = YMALLOC_ALT(nBlocks * sizeof(yaffs_BlockIndex));
- 		altBlockIndex = 1;
- 	}
- 
--	if(!blockIndex) {
-+	if (!blockIndex) {
- 		T(YAFFS_TRACE_SCAN,
- 		  (TSTR("yaffs_Scan() could not allocate block index!" TENDSTR)));
- 		return YAFFS_FAIL;
-@@ -5999,15 +6000,17 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 		bi->blockState = state;
- 		bi->sequenceNumber = sequenceNumber;
- 
--		if(bi->sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA)
-+		if (bi->sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA)
- 			bi->blockState = state = YAFFS_BLOCK_STATE_CHECKPOINT;
-+		if (bi->sequenceNumber == YAFFS_SEQUENCE_BAD_BLOCK)
-+			bi->blockState = state = YAFFS_BLOCK_STATE_DEAD;
- 
- 		T(YAFFS_TRACE_SCAN_DEBUG,
- 		  (TSTR("Block scanning block %d state %d seq %d" TENDSTR), blk,
- 		   state, sequenceNumber));
- 
- 
--		if(state == YAFFS_BLOCK_STATE_CHECKPOINT){
-+		if (state == YAFFS_BLOCK_STATE_CHECKPOINT) {
- 			dev->blocksInCheckpoint++;
- 
- 		} else if (state == YAFFS_BLOCK_STATE_DEAD) {
-@@ -6021,8 +6024,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 		} else if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
- 
- 			/* Determine the highest sequence number */
--			if (dev->isYaffs2 &&
--			    sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
-+			if (sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
- 			    sequenceNumber < YAFFS_HIGHEST_SEQUENCE_NUMBER) {
- 
- 				blockIndex[nBlocksToScan].seq = sequenceNumber;
-@@ -6030,10 +6032,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 				nBlocksToScan++;
- 
--				if (sequenceNumber >= dev->sequenceNumber) {
-+				if (sequenceNumber >= dev->sequenceNumber)
- 					dev->sequenceNumber = sequenceNumber;
--				}
--			} else if (dev->isYaffs2) {
-+			} else {
- 				/* TODO: Nasty sequence number! */
- 				T(YAFFS_TRACE_SCAN,
- 				  (TSTR
-@@ -6053,11 +6054,13 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 	/* Sort the blocks */
- #ifndef CONFIG_YAFFS_USE_OWN_SORT
--	yaffs_qsort(blockIndex, nBlocksToScan,
--		sizeof(yaffs_BlockIndex), ybicmp);
-+	{
-+		/* Use qsort now. */
-+		yaffs_qsort(blockIndex, nBlocksToScan, sizeof(yaffs_BlockIndex), ybicmp);
-+	}
- #else
- 	{
--	 	/* Dungy old bubble sort... */
-+		/* Dungy old bubble sort... */
- 
- 		yaffs_BlockIndex temp;
- 		int i;
-@@ -6075,7 +6078,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 	YYIELD();
- 
--    	T(YAFFS_TRACE_SCAN, (TSTR("...done" TENDSTR)));
-+	T(YAFFS_TRACE_SCAN, (TSTR("...done" TENDSTR)));
- 
- 	/* Now scan the blocks looking at the data. */
- 	startIterator = 0;
-@@ -6085,10 +6088,10 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 	/* For each block.... backwards */
- 	for (blockIterator = endIterator; !alloc_failed && blockIterator >= startIterator;
--	     blockIterator--) {
--	        /* Cooperative multitasking! This loop can run for so
-+			blockIterator--) {
-+		/* Cooperative multitasking! This loop can run for so
- 		   long that watchdog timers expire. */
--	        YYIELD();
-+		YYIELD();
- 
- 		/* get the block to scan in the correct order */
- 		blk = blockIndex[blockIterator].block;
-@@ -6127,10 +6130,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 				 * this is the one being allocated from
- 				 */
- 
--				if(foundChunksInBlock)
--				{
-+				if (foundChunksInBlock) {
- 					/* This is a chunk that was skipped due to failing the erased check */
--
- 				} else if (c == 0) {
- 					/* We're looking at the first chunk in the block so the block is unused */
- 					state = YAFFS_BLOCK_STATE_EMPTY;
-@@ -6138,7 +6139,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 				} else {
- 					if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING ||
- 					    state == YAFFS_BLOCK_STATE_ALLOCATING) {
--					    	if(dev->sequenceNumber == bi->sequenceNumber) {
-+						if (dev->sequenceNumber == bi->sequenceNumber) {
- 							/* this is the block being allocated from */
- 
- 							T(YAFFS_TRACE_SCAN,
-@@ -6150,27 +6151,31 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 							dev->allocationBlock = blk;
- 							dev->allocationPage = c;
- 							dev->allocationBlockFinder = blk;
--						}
--						else {
-+						} else {
- 							/* This is a partially written block that is not
- 							 * the current allocation block. This block must have
- 							 * had a write failure, so set up for retirement.
- 							 */
- 
--							 bi->needsRetiring = 1;
-+							 /* bi->needsRetiring = 1; ??? TODO */
- 							 bi->gcPrioritise = 1;
- 
- 							 T(YAFFS_TRACE_ALWAYS,
--							 (TSTR("Partially written block %d being set for retirement" TENDSTR),
-+							 (TSTR("Partially written block %d detected" TENDSTR),
- 							 blk));
- 						}
--
- 					}
--
- 				}
- 
- 				dev->nFreeChunks++;
- 
-+			} else if (tags.eccResult == YAFFS_ECC_RESULT_UNFIXED) {
-+				T(YAFFS_TRACE_SCAN,
-+				  (TSTR(" Unfixed ECC in chunk(%d:%d), chunk ignored"TENDSTR),
-+				  blk, c));
-+
-+				  dev->nFreeChunks++;
-+
- 			} else if (tags.chunkId > 0) {
- 				/* chunkId > 0 so it is a data chunk... */
- 				unsigned int endpos;
-@@ -6187,7 +6192,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 								      tags.
- 								      objectId,
- 								      YAFFS_OBJECT_TYPE_FILE);
--				if(!in){
-+				if (!in) {
- 					/* Out of memory */
- 					alloc_failed = 1;
- 				}
-@@ -6197,8 +6202,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 				    && chunkBase <
- 				    in->variant.fileVariant.shrinkSize) {
- 					/* This has not been invalidated by a resize */
--					if(!yaffs_PutChunkIntoFile(in, tags.chunkId,
--							       chunk, -1)){
-+					if (!yaffs_PutChunkIntoFile(in, tags.chunkId,
-+							       chunk, -1)) {
- 						alloc_failed = 1;
- 					}
- 
-@@ -6221,7 +6226,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						    scannedFileSize;
- 					}
- 
--				} else if(in) {
-+				} else if (in) {
- 					/* This chunk has been invalidated by a resize, so delete */
- 					yaffs_DeleteChunk(dev, chunk, 1, __LINE__);
- 
-@@ -6242,6 +6247,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 					in = yaffs_FindOrCreateObjectByNumber
- 					    (dev, tags.objectId,
- 					     tags.extraObjectType);
-+					if (!in)
-+						alloc_failed = 1;
- 				}
- 
- 				if (!in ||
-@@ -6251,8 +6258,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 				    tags.extraShadows ||
- 				    (!in->valid &&
- 				    (tags.objectId == YAFFS_OBJECTID_ROOT ||
--				     tags.objectId == YAFFS_OBJECTID_LOSTNFOUND))
--				    ) {
-+				     tags.objectId == YAFFS_OBJECTID_LOSTNFOUND))) {
- 
- 					/* If we don't have  valid info then we need to read the chunk
- 					 * TODO In future we can probably defer reading the chunk and
-@@ -6266,8 +6272,17 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 					oh = (yaffs_ObjectHeader *) chunkData;
- 
--					if (!in)
-+					if (dev->inbandTags) {
-+						/* Fix up the header if they got corrupted by inband tags */
-+						oh->shadowsObject = oh->inbandShadowsObject;
-+						oh->isShrink = oh->inbandIsShrink;
-+					}
-+
-+					if (!in) {
- 						in = yaffs_FindOrCreateObjectByNumber(dev, tags.objectId, oh->type);
-+						if (!in)
-+							alloc_failed = 1;
-+					}
- 
- 				}
- 
-@@ -6275,10 +6290,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 					/* TODO Hoosterman we have a problem! */
- 					T(YAFFS_TRACE_ERROR,
- 					  (TSTR
--					   ("yaffs tragedy: Could not make object for object  %d  "
--					    "at chunk %d during scan"
-+					   ("yaffs tragedy: Could not make object for object  %d at chunk %d during scan"
- 					    TENDSTR), tags.objectId, chunk));
--
-+					continue;
- 				}
- 
- 				if (in->valid) {
-@@ -6289,10 +6303,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 					if ((in->variantType == YAFFS_OBJECT_TYPE_FILE) &&
- 					     ((oh &&
--					       oh-> type == YAFFS_OBJECT_TYPE_FILE)||
-+					       oh->type == YAFFS_OBJECT_TYPE_FILE) ||
- 					      (tags.extraHeaderInfoAvailable  &&
--					       tags.extraObjectType == YAFFS_OBJECT_TYPE_FILE))
--					    ) {
-+					       tags.extraObjectType == YAFFS_OBJECT_TYPE_FILE))) {
- 						__u32 thisSize =
- 						    (oh) ? oh->fileSize : tags.
- 						    extraFileLength;
-@@ -6300,7 +6313,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						    (oh) ? oh->
- 						    parentObjectId : tags.
- 						    extraParentObjectId;
--						unsigned isShrink =
-+
-+
-+						isShrink =
- 						    (oh) ? oh->isShrink : tags.
- 						    extraIsShrinkHeader;
- 
-@@ -6323,9 +6338,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 							    thisSize;
- 						}
- 
--						if (isShrink) {
-+						if (isShrink)
- 							bi->hasShrinkHeader = 1;
--						}
- 
- 					}
- 					/* Use existing - destroy this one. */
-@@ -6333,6 +6347,17 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 				}
- 
-+				if (!in->valid && in->variantType !=
-+				    (oh ? oh->type : tags.extraObjectType))
-+					T(YAFFS_TRACE_ERROR, (
-+						TSTR("yaffs tragedy: Bad object type, "
-+					    TCONT("%d != %d, for object %d at chunk ")
-+					    TCONT("%d during scan")
-+						TENDSTR), oh ?
-+					    oh->type : tags.extraObjectType,
-+					    in->variantType, tags.objectId,
-+					    chunk));
-+
- 				if (!in->valid &&
- 				    (tags.objectId == YAFFS_OBJECTID_ROOT ||
- 				     tags.objectId ==
-@@ -6340,7 +6365,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 					/* We only load some info, don't fiddle with directory structure */
- 					in->valid = 1;
- 
--					if(oh) {
-+					if (oh) {
- 						in->variantType = oh->type;
- 
- 						in->yst_mode = oh->yst_mode;
-@@ -6365,15 +6390,15 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						in->lazyLoaded = 1;
- 					}
- 
--					in->chunkId = chunk;
-+					in->hdrChunk = chunk;
- 
- 				} else if (!in->valid) {
- 					/* we need to load this info */
- 
- 					in->valid = 1;
--					in->chunkId = chunk;
-+					in->hdrChunk = chunk;
- 
--					if(oh) {
-+					if (oh) {
- 						in->variantType = oh->type;
- 
- 						in->yst_mode = oh->yst_mode;
-@@ -6403,20 +6428,19 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						yaffs_SetObjectName(in, oh->name);
- 						parent =
- 						    yaffs_FindOrCreateObjectByNumber
--					    		(dev, oh->parentObjectId,
--					     		 YAFFS_OBJECT_TYPE_DIRECTORY);
-+							(dev, oh->parentObjectId,
-+							 YAFFS_OBJECT_TYPE_DIRECTORY);
- 
- 						 fileSize = oh->fileSize;
-- 						 isShrink = oh->isShrink;
-+						 isShrink = oh->isShrink;
- 						 equivalentObjectId = oh->equivalentObjectId;
- 
--					}
--					else {
-+					} else {
- 						in->variantType = tags.extraObjectType;
- 						parent =
- 						    yaffs_FindOrCreateObjectByNumber
--					    		(dev, tags.extraParentObjectId,
--					     		 YAFFS_OBJECT_TYPE_DIRECTORY);
-+							(dev, tags.extraParentObjectId,
-+							 YAFFS_OBJECT_TYPE_DIRECTORY);
- 						 fileSize = tags.extraFileLength;
- 						 isShrink = tags.extraIsShrinkHeader;
- 						 equivalentObjectId = tags.extraEquivalentObjectId;
-@@ -6425,29 +6449,30 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 					}
- 					in->dirty = 0;
- 
-+					if (!parent)
-+						alloc_failed = 1;
-+
- 					/* directory stuff...
- 					 * hook up to parent
- 					 */
- 
--					if (parent->variantType ==
-+					if (parent && parent->variantType ==
- 					    YAFFS_OBJECT_TYPE_UNKNOWN) {
- 						/* Set up as a directory */
- 						parent->variantType =
--						    YAFFS_OBJECT_TYPE_DIRECTORY;
--						INIT_LIST_HEAD(&parent->variant.
--							       directoryVariant.
--							       children);
--					} else if (parent->variantType !=
--						   YAFFS_OBJECT_TYPE_DIRECTORY)
--					{
-+							YAFFS_OBJECT_TYPE_DIRECTORY;
-+						YINIT_LIST_HEAD(&parent->variant.
-+							directoryVariant.
-+							children);
-+					} else if (!parent || parent->variantType !=
-+						   YAFFS_OBJECT_TYPE_DIRECTORY) {
- 						/* Hoosterman, another problem....
- 						 * We're trying to use a non-directory as a directory
- 						 */
- 
- 						T(YAFFS_TRACE_ERROR,
- 						  (TSTR
--						   ("yaffs tragedy: attempting to use non-directory as"
--						    " a directory in scan. Put in lost+found."
-+						   ("yaffs tragedy: attempting to use non-directory as a directory in scan. Put in lost+found."
- 						    TENDSTR)));
- 						parent = dev->lostNFoundDir;
- 					}
-@@ -6494,12 +6519,12 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 						break;
- 					case YAFFS_OBJECT_TYPE_HARDLINK:
--						if(!itsUnlinked) {
--						  in->variant.hardLinkVariant.equivalentObjectId =
--						    equivalentObjectId;
--						  in->hardLinks.next =
--						    (struct list_head *) hardList;
--						  hardList = in;
-+						if (!itsUnlinked) {
-+							in->variant.hardLinkVariant.equivalentObjectId =
-+								equivalentObjectId;
-+							in->hardLinks.next =
-+								(struct ylist_head *) hardList;
-+							hardList = in;
- 						}
- 						break;
- 					case YAFFS_OBJECT_TYPE_DIRECTORY:
-@@ -6509,12 +6534,11 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						/* Do nothing */
- 						break;
- 					case YAFFS_OBJECT_TYPE_SYMLINK:
--						if(oh){
--						   in->variant.symLinkVariant.alias =
--						    yaffs_CloneString(oh->
--								      alias);
--						   if(!in->variant.symLinkVariant.alias)
--						   	alloc_failed = 1;
-+						if (oh) {
-+							in->variant.symLinkVariant.alias =
-+								yaffs_CloneString(oh->alias);
-+							if (!in->variant.symLinkVariant.alias)
-+								alloc_failed = 1;
- 						}
- 						break;
- 					}
-@@ -6551,75 +6575,129 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 	 * We should now have scanned all the objects, now it's time to add these
- 	 * hardlinks.
- 	 */
--	yaffs_HardlinkFixup(dev,hardList);
-+	yaffs_HardlinkFixup(dev, hardList);
- 
- 
--	/*
--	*  Sort out state of unlinked and deleted objects.
--	*/
--	{
--		struct list_head *i;
--		struct list_head *n;
-+	yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
- 
--		yaffs_Object *l;
-+	if (alloc_failed)
-+		return YAFFS_FAIL;
- 
--		/* Soft delete all the unlinked files */
--		list_for_each_safe(i, n,
--				   &dev->unlinkedDir->variant.directoryVariant.
--				   children) {
--			if (i) {
--				l = list_entry(i, yaffs_Object, siblings);
--				yaffs_DestroyObject(l);
--			}
--		}
-+	T(YAFFS_TRACE_SCAN, (TSTR("yaffs_ScanBackwards ends" TENDSTR)));
- 
--		/* Soft delete all the deletedDir files */
--		list_for_each_safe(i, n,
--				   &dev->deletedDir->variant.directoryVariant.
--				   children) {
--			if (i) {
--				l = list_entry(i, yaffs_Object, siblings);
--				yaffs_DestroyObject(l);
-+	return YAFFS_OK;
-+}
- 
--			}
-+/*------------------------------  Directory Functions ----------------------------- */
-+
-+static void yaffs_VerifyObjectInDirectory(yaffs_Object *obj)
-+{
-+	struct ylist_head *lh;
-+	yaffs_Object *listObj;
-+
-+	int count = 0;
-+
-+	if (!obj) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("No object to verify" TENDSTR)));
-+		YBUG();
-+		return;
-+	}
-+
-+	if (yaffs_SkipVerification(obj->myDev))
-+		return;
-+
-+	if (!obj->parent) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("Object does not have parent" TENDSTR)));
-+		YBUG();
-+		return;
-+	}
-+
-+	if (obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("Parent is not directory" TENDSTR)));
-+		YBUG();
-+	}
-+
-+	/* Iterate through the objects in each hash entry */
-+
-+	ylist_for_each(lh, &obj->parent->variant.directoryVariant.children) {
-+		if (lh) {
-+			listObj = ylist_entry(lh, yaffs_Object, siblings);
-+			yaffs_VerifyObject(listObj);
-+			if (obj == listObj)
-+				count++;
- 		}
-+	 }
-+
-+	if (count != 1) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory %d times" TENDSTR), count));
-+		YBUG();
- 	}
-+}
- 
--	yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
-+static void yaffs_VerifyDirectory(yaffs_Object *directory)
-+{
-+	struct ylist_head *lh;
-+	yaffs_Object *listObj;
- 
--	if(alloc_failed){
--		return YAFFS_FAIL;
-+	if (!directory) {
-+		YBUG();
-+		return;
- 	}
- 
--	T(YAFFS_TRACE_SCAN, (TSTR("yaffs_ScanBackwards ends" TENDSTR)));
-+	if (yaffs_SkipFullVerification(directory->myDev))
-+		return;
- 
--	return YAFFS_OK;
-+	if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("Directory has wrong type: %d" TENDSTR), directory->variantType));
-+		YBUG();
-+	}
-+
-+	/* Iterate through the objects in each hash entry */
-+
-+	ylist_for_each(lh, &directory->variant.directoryVariant.children) {
-+		if (lh) {
-+			listObj = ylist_entry(lh, yaffs_Object, siblings);
-+			if (listObj->parent != directory) {
-+				T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory list has wrong parent %p" TENDSTR), listObj->parent));
-+				YBUG();
-+			}
-+			yaffs_VerifyObjectInDirectory(listObj);
-+		}
-+	}
- }
- 
--/*------------------------------  Directory Functions ----------------------------- */
- 
--static void yaffs_RemoveObjectFromDirectory(yaffs_Object * obj)
-+static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj)
- {
- 	yaffs_Device *dev = obj->myDev;
-+	yaffs_Object *parent;
-+
-+	yaffs_VerifyObjectInDirectory(obj);
-+	parent = obj->parent;
-+
-+	yaffs_VerifyDirectory(parent);
- 
--	if(dev && dev->removeObjectCallback)
-+	if (dev && dev->removeObjectCallback)
- 		dev->removeObjectCallback(obj);
- 
--	list_del_init(&obj->siblings);
-+
-+	ylist_del_init(&obj->siblings);
- 	obj->parent = NULL;
-+
-+	yaffs_VerifyDirectory(parent);
- }
- 
- 
--static void yaffs_AddObjectToDirectory(yaffs_Object * directory,
--				       yaffs_Object * obj)
-+static void yaffs_AddObjectToDirectory(yaffs_Object *directory,
-+					yaffs_Object *obj)
- {
--
- 	if (!directory) {
- 		T(YAFFS_TRACE_ALWAYS,
- 		  (TSTR
- 		   ("tragedy: Trying to add an object to a null pointer directory"
- 		    TENDSTR)));
- 		YBUG();
-+		return;
- 	}
- 	if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
- 		T(YAFFS_TRACE_ALWAYS,
-@@ -6631,37 +6709,42 @@ static void yaffs_AddObjectToDirectory(y
- 
- 	if (obj->siblings.prev == NULL) {
- 		/* Not initialised */
--		INIT_LIST_HEAD(&obj->siblings);
--
--	} else if (!list_empty(&obj->siblings)) {
--		/* If it is holed up somewhere else, un hook it */
--		yaffs_RemoveObjectFromDirectory(obj);
-+		YBUG();
- 	}
-+
-+
-+	yaffs_VerifyDirectory(directory);
-+
-+	yaffs_RemoveObjectFromDirectory(obj);
-+
-+
- 	/* Now add it */
--	list_add(&obj->siblings, &directory->variant.directoryVariant.children);
-+	ylist_add(&obj->siblings, &directory->variant.directoryVariant.children);
- 	obj->parent = directory;
- 
- 	if (directory == obj->myDev->unlinkedDir
--	    || directory == obj->myDev->deletedDir) {
-+			|| directory == obj->myDev->deletedDir) {
- 		obj->unlinked = 1;
- 		obj->myDev->nUnlinkedFiles++;
- 		obj->renameAllowed = 0;
- 	}
-+
-+	yaffs_VerifyDirectory(directory);
-+	yaffs_VerifyObjectInDirectory(obj);
- }
- 
--yaffs_Object *yaffs_FindObjectByName(yaffs_Object * directory,
--				     const YCHAR * name)
-+yaffs_Object *yaffs_FindObjectByName(yaffs_Object *directory,
-+				     const YCHAR *name)
- {
- 	int sum;
- 
--	struct list_head *i;
-+	struct ylist_head *i;
- 	YCHAR buffer[YAFFS_MAX_NAME_LENGTH + 1];
- 
- 	yaffs_Object *l;
- 
--	if (!name) {
-+	if (!name)
- 		return NULL;
--	}
- 
- 	if (!directory) {
- 		T(YAFFS_TRACE_ALWAYS,
-@@ -6669,6 +6752,7 @@ yaffs_Object *yaffs_FindObjectByName(yaf
- 		   ("tragedy: yaffs_FindObjectByName: null pointer directory"
- 		    TENDSTR)));
- 		YBUG();
-+		return NULL;
- 	}
- 	if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
- 		T(YAFFS_TRACE_ALWAYS,
-@@ -6679,28 +6763,27 @@ yaffs_Object *yaffs_FindObjectByName(yaf
- 
- 	sum = yaffs_CalcNameSum(name);
- 
--	list_for_each(i, &directory->variant.directoryVariant.children) {
-+	ylist_for_each(i, &directory->variant.directoryVariant.children) {
- 		if (i) {
--			l = list_entry(i, yaffs_Object, siblings);
-+			l = ylist_entry(i, yaffs_Object, siblings);
-+
-+			if (l->parent != directory)
-+				YBUG();
- 
- 			yaffs_CheckObjectDetailsLoaded(l);
- 
- 			/* Special case for lost-n-found */
- 			if (l->objectId == YAFFS_OBJECTID_LOSTNFOUND) {
--				if (yaffs_strcmp(name, YAFFS_LOSTNFOUND_NAME) == 0) {
-+				if (yaffs_strcmp(name, YAFFS_LOSTNFOUND_NAME) == 0)
- 					return l;
--				}
--			} else if (yaffs_SumCompare(l->sum, sum) || l->chunkId <= 0)
--			{
--				/* LostnFound cunk called Objxxx
-+			} else if (yaffs_SumCompare(l->sum, sum) || l->hdrChunk <= 0) {
-+				/* LostnFound chunk called Objxxx
- 				 * Do a real check
- 				 */
- 				yaffs_GetObjectName(l, buffer,
- 						    YAFFS_MAX_NAME_LENGTH);
--				if (yaffs_strncmp(name, buffer,YAFFS_MAX_NAME_LENGTH) == 0) {
-+				if (yaffs_strncmp(name, buffer, YAFFS_MAX_NAME_LENGTH) == 0)
- 					return l;
--				}
--
- 			}
- 		}
- 	}
-@@ -6710,10 +6793,10 @@ yaffs_Object *yaffs_FindObjectByName(yaf
- 
- 
- #if 0
--int yaffs_ApplyToDirectoryChildren(yaffs_Object * theDir,
--				   int (*fn) (yaffs_Object *))
-+int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir,
-+					int (*fn) (yaffs_Object *))
- {
--	struct list_head *i;
-+	struct ylist_head *i;
- 	yaffs_Object *l;
- 
- 	if (!theDir) {
-@@ -6722,20 +6805,21 @@ int yaffs_ApplyToDirectoryChildren(yaffs
- 		   ("tragedy: yaffs_FindObjectByName: null pointer directory"
- 		    TENDSTR)));
- 		YBUG();
-+		return YAFFS_FAIL;
- 	}
- 	if (theDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
- 		T(YAFFS_TRACE_ALWAYS,
- 		  (TSTR
- 		   ("tragedy: yaffs_FindObjectByName: non-directory" TENDSTR)));
- 		YBUG();
-+		return YAFFS_FAIL;
- 	}
- 
--	list_for_each(i, &theDir->variant.directoryVariant.children) {
-+	ylist_for_each(i, &theDir->variant.directoryVariant.children) {
- 		if (i) {
--			l = list_entry(i, yaffs_Object, siblings);
--			if (l && !fn(l)) {
-+			l = ylist_entry(i, yaffs_Object, siblings);
-+			if (l && !fn(l))
- 				return YAFFS_FAIL;
--			}
- 		}
- 	}
- 
-@@ -6748,7 +6832,7 @@ int yaffs_ApplyToDirectoryChildren(yaffs
-  * actual object.
-  */
- 
--yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object * obj)
-+yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj)
- {
- 	if (obj && obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
- 		/* We want the object id of the equivalent object, not this one */
-@@ -6756,10 +6840,9 @@ yaffs_Object *yaffs_GetEquivalentObject(
- 		yaffs_CheckObjectDetailsLoaded(obj);
- 	}
- 	return obj;
--
- }
- 
--int yaffs_GetObjectName(yaffs_Object * obj, YCHAR * name, int buffSize)
-+int yaffs_GetObjectName(yaffs_Object *obj, YCHAR *name, int buffSize)
- {
- 	memset(name, 0, buffSize * sizeof(YCHAR));
- 
-@@ -6767,18 +6850,26 @@ int yaffs_GetObjectName(yaffs_Object * o
- 
- 	if (obj->objectId == YAFFS_OBJECTID_LOSTNFOUND) {
- 		yaffs_strncpy(name, YAFFS_LOSTNFOUND_NAME, buffSize - 1);
--	} else if (obj->chunkId <= 0) {
-+	} else if (obj->hdrChunk <= 0) {
- 		YCHAR locName[20];
-+		YCHAR numString[20];
-+		YCHAR *x = &numString[19];
-+		unsigned v = obj->objectId;
-+		numString[19] = 0;
-+		while (v > 0) {
-+			x--;
-+			*x = '0' + (v % 10);
-+			v /= 10;
-+		}
- 		/* make up a name */
--		yaffs_sprintf(locName, _Y("%s%d"), YAFFS_LOSTNFOUND_PREFIX,
--			      obj->objectId);
-+		yaffs_strcpy(locName, YAFFS_LOSTNFOUND_PREFIX);
-+		yaffs_strcat(locName, x);
- 		yaffs_strncpy(name, locName, buffSize - 1);
- 
- 	}
- #ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
--	else if (obj->shortName[0]) {
-+	else if (obj->shortName[0])
- 		yaffs_strcpy(name, obj->shortName);
--	}
- #endif
- 	else {
- 		int result;
-@@ -6788,9 +6879,9 @@ int yaffs_GetObjectName(yaffs_Object * o
- 
- 		memset(buffer, 0, obj->myDev->nDataBytesPerChunk);
- 
--		if (obj->chunkId >= 0) {
-+		if (obj->hdrChunk > 0) {
- 			result = yaffs_ReadChunkWithTagsFromNAND(obj->myDev,
--							obj->chunkId, buffer,
-+							obj->hdrChunk, buffer,
- 							NULL);
- 		}
- 		yaffs_strncpy(name, oh->name, buffSize - 1);
-@@ -6801,46 +6892,43 @@ int yaffs_GetObjectName(yaffs_Object * o
- 	return yaffs_strlen(name);
- }
- 
--int yaffs_GetObjectFileLength(yaffs_Object * obj)
-+int yaffs_GetObjectFileLength(yaffs_Object *obj)
- {
--
- 	/* Dereference any hard linking */
- 	obj = yaffs_GetEquivalentObject(obj);
- 
--	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
- 		return obj->variant.fileVariant.fileSize;
--	}
--	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
- 		return yaffs_strlen(obj->variant.symLinkVariant.alias);
--	} else {
-+	else {
- 		/* Only a directory should drop through to here */
- 		return obj->myDev->nDataBytesPerChunk;
- 	}
- }
- 
--int yaffs_GetObjectLinkCount(yaffs_Object * obj)
-+int yaffs_GetObjectLinkCount(yaffs_Object *obj)
- {
- 	int count = 0;
--	struct list_head *i;
-+	struct ylist_head *i;
- 
--	if (!obj->unlinked) {
--		count++;	/* the object itself */
--	}
--	list_for_each(i, &obj->hardLinks) {
--		count++;	/* add the hard links; */
--	}
--	return count;
-+	if (!obj->unlinked)
-+		count++;		/* the object itself */
-+
-+	ylist_for_each(i, &obj->hardLinks)
-+		count++;		/* add the hard links; */
- 
-+	return count;
- }
- 
--int yaffs_GetObjectInode(yaffs_Object * obj)
-+int yaffs_GetObjectInode(yaffs_Object *obj)
- {
- 	obj = yaffs_GetEquivalentObject(obj);
- 
- 	return obj->objectId;
- }
- 
--unsigned yaffs_GetObjectType(yaffs_Object * obj)
-+unsigned yaffs_GetObjectType(yaffs_Object *obj)
- {
- 	obj = yaffs_GetEquivalentObject(obj);
- 
-@@ -6872,19 +6960,18 @@ unsigned yaffs_GetObjectType(yaffs_Objec
- 	}
- }
- 
--YCHAR *yaffs_GetSymlinkAlias(yaffs_Object * obj)
-+YCHAR *yaffs_GetSymlinkAlias(yaffs_Object *obj)
- {
- 	obj = yaffs_GetEquivalentObject(obj);
--	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
- 		return yaffs_CloneString(obj->variant.symLinkVariant.alias);
--	} else {
-+	else
- 		return yaffs_CloneString(_Y(""));
--	}
- }
- 
- #ifndef CONFIG_YAFFS_WINCE
- 
--int yaffs_SetAttributes(yaffs_Object * obj, struct iattr *attr)
-+int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr)
- {
- 	unsigned int valid = attr->ia_valid;
- 
-@@ -6910,7 +6997,7 @@ int yaffs_SetAttributes(yaffs_Object * o
- 	return YAFFS_OK;
- 
- }
--int yaffs_GetAttributes(yaffs_Object * obj, struct iattr *attr)
-+int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr)
- {
- 	unsigned int valid = 0;
- 
-@@ -6934,13 +7021,12 @@ int yaffs_GetAttributes(yaffs_Object * o
- 	attr->ia_valid = valid;
- 
- 	return YAFFS_OK;
--
- }
- 
- #endif
- 
- #if 0
--int yaffs_DumpObject(yaffs_Object * obj)
-+int yaffs_DumpObject(yaffs_Object *obj)
- {
- 	YCHAR name[257];
- 
-@@ -6951,7 +7037,7 @@ int yaffs_DumpObject(yaffs_Object * obj)
- 	   ("Object %d, inode %d \"%s\"\n dirty %d valid %d serial %d sum %d"
- 	    " chunk %d type %d size %d\n"
- 	    TENDSTR), obj->objectId, yaffs_GetObjectInode(obj), name,
--	   obj->dirty, obj->valid, obj->serial, obj->sum, obj->chunkId,
-+	   obj->dirty, obj->valid, obj->serial, obj->sum, obj->hdrChunk,
- 	   yaffs_GetObjectType(obj), yaffs_GetObjectFileLength(obj)));
- 
- 	return YAFFS_OK;
-@@ -6960,7 +7046,7 @@ int yaffs_DumpObject(yaffs_Object * obj)
- 
- /*---------------------------- Initialisation code -------------------------------------- */
- 
--static int yaffs_CheckDevFunctions(const yaffs_Device * dev)
-+static int yaffs_CheckDevFunctions(const yaffs_Device *dev)
- {
- 
- 	/* Common functions, gotta have */
-@@ -7011,7 +7097,7 @@ static int yaffs_CreateInitialDirectorie
- 	    yaffs_CreateFakeDirectory(dev, YAFFS_OBJECTID_LOSTNFOUND,
- 				      YAFFS_LOSTNFOUND_MODE | S_IFDIR);
- 
--	if(dev->lostNFoundDir && dev->rootDir && dev->unlinkedDir && dev->deletedDir){
-+	if (dev->lostNFoundDir && dev->rootDir && dev->unlinkedDir && dev->deletedDir) {
- 		yaffs_AddObjectToDirectory(dev->rootDir, dev->lostNFoundDir);
- 		return YAFFS_OK;
- 	}
-@@ -7019,7 +7105,7 @@ static int yaffs_CreateInitialDirectorie
- 	return YAFFS_FAIL;
- }
- 
--int yaffs_GutsInitialise(yaffs_Device * dev)
-+int yaffs_GutsInitialise(yaffs_Device *dev)
- {
- 	int init_failed = 0;
- 	unsigned x;
-@@ -7040,6 +7126,8 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 	dev->chunkOffset = 0;
- 	dev->nFreeChunks = 0;
- 
-+	dev->gcBlock = -1;
-+
- 	if (dev->startBlock == 0) {
- 		dev->internalStartBlock = dev->startBlock + 1;
- 		dev->internalEndBlock = dev->endBlock + 1;
-@@ -7049,18 +7137,18 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 
- 	/* Check geometry parameters. */
- 
--	if ((dev->isYaffs2 && dev->nDataBytesPerChunk < 1024) ||
--	    (!dev->isYaffs2 && dev->nDataBytesPerChunk != 512) ||
-+	if ((!dev->inbandTags && dev->isYaffs2 && dev->totalBytesPerChunk < 1024) ||
-+	    (!dev->isYaffs2 && dev->totalBytesPerChunk < 512) ||
-+	    (dev->inbandTags && !dev->isYaffs2) ||
- 	     dev->nChunksPerBlock < 2 ||
- 	     dev->nReservedBlocks < 2 ||
- 	     dev->internalStartBlock <= 0 ||
- 	     dev->internalEndBlock <= 0 ||
--	     dev->internalEndBlock <= (dev->internalStartBlock + dev->nReservedBlocks + 2)	// otherwise it is too small
--	    ) {
-+	     dev->internalEndBlock <= (dev->internalStartBlock + dev->nReservedBlocks + 2)) {	/* otherwise it is too small */
- 		T(YAFFS_TRACE_ALWAYS,
- 		  (TSTR
--		   ("yaffs: NAND geometry problems: chunk size %d, type is yaffs%s "
--		    TENDSTR), dev->nDataBytesPerChunk, dev->isYaffs2 ? "2" : ""));
-+		   ("yaffs: NAND geometry problems: chunk size %d, type is yaffs%s, inbandTags %d "
-+		    TENDSTR), dev->totalBytesPerChunk, dev->isYaffs2 ? "2" : "", dev->inbandTags));
- 		return YAFFS_FAIL;
- 	}
- 
-@@ -7070,6 +7158,12 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 		return YAFFS_FAIL;
- 	}
- 
-+	/* Sort out space for inband tags, if required */
-+	if (dev->inbandTags)
-+		dev->nDataBytesPerChunk = dev->totalBytesPerChunk - sizeof(yaffs_PackedTags2TagsPart);
-+	else
-+		dev->nDataBytesPerChunk = dev->totalBytesPerChunk;
-+
- 	/* Got the right mix of functions? */
- 	if (!yaffs_CheckDevFunctions(dev)) {
- 		/* Function missing */
-@@ -7097,31 +7191,18 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 
- 	dev->isMounted = 1;
- 
--
--
- 	/* OK now calculate a few things for the device */
- 
- 	/*
- 	 *  Calculate all the chunk size manipulation numbers:
- 	 */
--	 /* Start off assuming it is a power of 2 */
--	 dev->chunkShift = ShiftDiv(dev->nDataBytesPerChunk);
--	 dev->chunkMask = (1<<dev->chunkShift) - 1;
--
--	 if(dev->nDataBytesPerChunk == (dev->chunkMask + 1)){
--	 	/* Yes it is a power of 2, disable crumbs */
--		dev->crumbMask = 0;
--		dev->crumbShift = 0;
--		dev->crumbsPerChunk = 0;
--	 } else {
--	 	/* Not a power of 2, use crumbs instead */
--		dev->crumbShift = ShiftDiv(sizeof(yaffs_PackedTags2TagsPart));
--		dev->crumbMask = (1<<dev->crumbShift)-1;
--		dev->crumbsPerChunk = dev->nDataBytesPerChunk/(1 << dev->crumbShift);
--		dev->chunkShift = 0;
--		dev->chunkMask = 0;
--	}
--
-+	x = dev->nDataBytesPerChunk;
-+	/* We always use dev->chunkShift and dev->chunkDiv */
-+	dev->chunkShift = Shifts(x);
-+	x >>= dev->chunkShift;
-+	dev->chunkDiv = x;
-+	/* We only use chunk mask if chunkDiv is 1 */
-+	dev->chunkMask = (1<<dev->chunkShift) - 1;
- 
- 	/*
- 	 * Calculate chunkGroupBits.
-@@ -7133,16 +7214,15 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 	bits = ShiftsGE(x);
- 
- 	/* Set up tnode width if wide tnodes are enabled. */
--	if(!dev->wideTnodesDisabled){
-+	if (!dev->wideTnodesDisabled) {
- 		/* bits must be even so that we end up with 32-bit words */
--		if(bits & 1)
-+		if (bits & 1)
- 			bits++;
--		if(bits < 16)
-+		if (bits < 16)
- 			dev->tnodeWidth = 16;
- 		else
- 			dev->tnodeWidth = bits;
--	}
--	else
-+	} else
- 		dev->tnodeWidth = 16;
- 
- 	dev->tnodeMask = (1<<dev->tnodeWidth)-1;
-@@ -7193,7 +7273,7 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 	dev->hasPendingPrioritisedGCs = 1; /* Assume the worst for now, will get fixed on first GC */
- 
- 	/* Initialise temporary buffers and caches. */
--	if(!yaffs_InitialiseTempBuffers(dev))
-+	if (!yaffs_InitialiseTempBuffers(dev))
- 		init_failed = 1;
- 
- 	dev->srCache = NULL;
-@@ -7203,25 +7283,26 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 	if (!init_failed &&
- 	    dev->nShortOpCaches > 0) {
- 		int i;
--		__u8 *buf;
-+		void *buf;
- 		int srCacheBytes = dev->nShortOpCaches * sizeof(yaffs_ChunkCache);
- 
--		if (dev->nShortOpCaches > YAFFS_MAX_SHORT_OP_CACHES) {
-+		if (dev->nShortOpCaches > YAFFS_MAX_SHORT_OP_CACHES)
- 			dev->nShortOpCaches = YAFFS_MAX_SHORT_OP_CACHES;
--		}
- 
--		buf = dev->srCache =  YMALLOC(srCacheBytes);
-+		dev->srCache =  YMALLOC(srCacheBytes);
- 
--		if(dev->srCache)
--			memset(dev->srCache,0,srCacheBytes);
-+		buf = (__u8 *) dev->srCache;
-+
-+		if (dev->srCache)
-+			memset(dev->srCache, 0, srCacheBytes);
- 
- 		for (i = 0; i < dev->nShortOpCaches && buf; i++) {
- 			dev->srCache[i].object = NULL;
- 			dev->srCache[i].lastUse = 0;
- 			dev->srCache[i].dirty = 0;
--			dev->srCache[i].data = buf = YMALLOC_DMA(dev->nDataBytesPerChunk);
-+			dev->srCache[i].data = buf = YMALLOC_DMA(dev->totalBytesPerChunk);
- 		}
--		if(!buf)
-+		if (!buf)
- 			init_failed = 1;
- 
- 		dev->srLastUse = 0;
-@@ -7229,29 +7310,30 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 
- 	dev->cacheHits = 0;
- 
--	if(!init_failed){
-+	if (!init_failed) {
- 		dev->gcCleanupList = YMALLOC(dev->nChunksPerBlock * sizeof(__u32));
--		if(!dev->gcCleanupList)
-+		if (!dev->gcCleanupList)
- 			init_failed = 1;
- 	}
- 
--	if (dev->isYaffs2) {
-+	if (dev->isYaffs2)
- 		dev->useHeaderFileSize = 1;
--	}
--	if(!init_failed && !yaffs_InitialiseBlocks(dev))
-+
-+	if (!init_failed && !yaffs_InitialiseBlocks(dev))
- 		init_failed = 1;
- 
- 	yaffs_InitialiseTnodes(dev);
- 	yaffs_InitialiseObjects(dev);
- 
--	if(!init_failed && !yaffs_CreateInitialDirectories(dev))
-+	if (!init_failed && !yaffs_CreateInitialDirectories(dev))
- 		init_failed = 1;
- 
- 
--	if(!init_failed){
-+	if (!init_failed) {
- 		/* Now scan the flash. */
- 		if (dev->isYaffs2) {
--			if(yaffs_CheckpointRestore(dev)) {
-+			if (yaffs_CheckpointRestore(dev)) {
-+				yaffs_CheckObjectDetailsLoaded(dev->rootDir);
- 				T(YAFFS_TRACE_ALWAYS,
- 				  (TSTR("yaffs: restored from checkpoint" TENDSTR)));
- 			} else {
-@@ -7273,24 +7355,25 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 				dev->nBackgroundDeletions = 0;
- 				dev->oldestDirtySequence = 0;
- 
--				if(!init_failed && !yaffs_InitialiseBlocks(dev))
-+				if (!init_failed && !yaffs_InitialiseBlocks(dev))
- 					init_failed = 1;
- 
- 				yaffs_InitialiseTnodes(dev);
- 				yaffs_InitialiseObjects(dev);
- 
--				if(!init_failed && !yaffs_CreateInitialDirectories(dev))
-+				if (!init_failed && !yaffs_CreateInitialDirectories(dev))
- 					init_failed = 1;
- 
--				if(!init_failed && !yaffs_ScanBackwards(dev))
-+				if (!init_failed && !yaffs_ScanBackwards(dev))
- 					init_failed = 1;
- 			}
--		}else
--			if(!yaffs_Scan(dev))
-+		} else if (!yaffs_Scan(dev))
- 				init_failed = 1;
-+
-+		yaffs_StripDeletedObjects(dev);
- 	}
- 
--	if(init_failed){
-+	if (init_failed) {
- 		/* Clean up the mess */
- 		T(YAFFS_TRACE_TRACING,
- 		  (TSTR("yaffs: yaffs_GutsInitialise() aborted.\n" TENDSTR)));
-@@ -7318,7 +7401,7 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 
- }
- 
--void yaffs_Deinitialise(yaffs_Device * dev)
-+void yaffs_Deinitialise(yaffs_Device *dev)
- {
- 	if (dev->isMounted) {
- 		int i;
-@@ -7330,7 +7413,7 @@ void yaffs_Deinitialise(yaffs_Device * d
- 		    dev->srCache) {
- 
- 			for (i = 0; i < dev->nShortOpCaches; i++) {
--				if(dev->srCache[i].data)
-+				if (dev->srCache[i].data)
- 					YFREE(dev->srCache[i].data);
- 				dev->srCache[i].data = NULL;
- 			}
-@@ -7341,16 +7424,17 @@ void yaffs_Deinitialise(yaffs_Device * d
- 
- 		YFREE(dev->gcCleanupList);
- 
--		for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
-+		for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++)
- 			YFREE(dev->tempBuffer[i].buffer);
--		}
- 
- 		dev->isMounted = 0;
--	}
- 
-+		if (dev->deinitialiseNAND)
-+			dev->deinitialiseNAND(dev);
-+	}
- }
- 
--static int yaffs_CountFreeChunks(yaffs_Device * dev)
-+static int yaffs_CountFreeChunks(yaffs_Device *dev)
- {
- 	int nFree;
- 	int b;
-@@ -7358,7 +7442,7 @@ static int yaffs_CountFreeChunks(yaffs_D
- 	yaffs_BlockInfo *blk;
- 
- 	for (nFree = 0, b = dev->internalStartBlock; b <= dev->internalEndBlock;
--	     b++) {
-+			b++) {
- 		blk = yaffs_GetBlockInfo(dev, b);
- 
- 		switch (blk->blockState) {
-@@ -7373,19 +7457,19 @@ static int yaffs_CountFreeChunks(yaffs_D
- 		default:
- 			break;
- 		}
--
- 	}
- 
- 	return nFree;
- }
- 
--int yaffs_GetNumberOfFreeChunks(yaffs_Device * dev)
-+int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev)
- {
- 	/* This is what we report to the outside world */
- 
- 	int nFree;
- 	int nDirtyCacheChunks;
- 	int blocksForCheckpoint;
-+	int i;
- 
- #if 1
- 	nFree = dev->nFreeChunks;
-@@ -7397,12 +7481,9 @@ int yaffs_GetNumberOfFreeChunks(yaffs_De
- 
- 	/* Now count the number of dirty chunks in the cache and subtract those */
- 
--	{
--		int i;
--		for (nDirtyCacheChunks = 0, i = 0; i < dev->nShortOpCaches; i++) {
--			if (dev->srCache[i].dirty)
--				nDirtyCacheChunks++;
--		}
-+	for (nDirtyCacheChunks = 0, i = 0; i < dev->nShortOpCaches; i++) {
-+		if (dev->srCache[i].dirty)
-+			nDirtyCacheChunks++;
- 	}
- 
- 	nFree -= nDirtyCacheChunks;
-@@ -7410,8 +7491,8 @@ int yaffs_GetNumberOfFreeChunks(yaffs_De
- 	nFree -= ((dev->nReservedBlocks + 1) * dev->nChunksPerBlock);
- 
- 	/* Now we figure out how much to reserve for the checkpoint and report that... */
--	blocksForCheckpoint = dev->nCheckpointReservedBlocks - dev->blocksInCheckpoint;
--	if(blocksForCheckpoint < 0)
-+	blocksForCheckpoint = yaffs_CalcCheckpointBlocksRequired(dev) - dev->blocksInCheckpoint;
-+	if (blocksForCheckpoint < 0)
- 		blocksForCheckpoint = 0;
- 
- 	nFree -= (blocksForCheckpoint * dev->nChunksPerBlock);
-@@ -7425,12 +7506,12 @@ int yaffs_GetNumberOfFreeChunks(yaffs_De
- 
- static int yaffs_freeVerificationFailures;
- 
--static void yaffs_VerifyFreeChunks(yaffs_Device * dev)
-+static void yaffs_VerifyFreeChunks(yaffs_Device *dev)
- {
- 	int counted;
- 	int difference;
- 
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
- 	counted = yaffs_CountFreeChunks(dev);
-@@ -7447,23 +7528,25 @@ static void yaffs_VerifyFreeChunks(yaffs
- 
- /*---------------------------------------- YAFFS test code ----------------------*/
- 
--#define yaffs_CheckStruct(structure,syze, name) \
--           if(sizeof(structure) != syze) \
--	       { \
--	         T(YAFFS_TRACE_ALWAYS,(TSTR("%s should be %d but is %d\n" TENDSTR),\
--		 name,syze,sizeof(structure))); \
--	         return YAFFS_FAIL; \
--		}
-+#define yaffs_CheckStruct(structure, syze, name) \
-+	do { \
-+		if (sizeof(structure) != syze) { \
-+			T(YAFFS_TRACE_ALWAYS, (TSTR("%s should be %d but is %d\n" TENDSTR),\
-+				name, syze, sizeof(structure))); \
-+			return YAFFS_FAIL; \
-+		} \
-+	} while (0)
- 
- static int yaffs_CheckStructures(void)
- {
--/*      yaffs_CheckStruct(yaffs_Tags,8,"yaffs_Tags") */
--/*      yaffs_CheckStruct(yaffs_TagsUnion,8,"yaffs_TagsUnion") */
--/*      yaffs_CheckStruct(yaffs_Spare,16,"yaffs_Spare") */
-+/*      yaffs_CheckStruct(yaffs_Tags,8,"yaffs_Tags"); */
-+/*      yaffs_CheckStruct(yaffs_TagsUnion,8,"yaffs_TagsUnion"); */
-+/*      yaffs_CheckStruct(yaffs_Spare,16,"yaffs_Spare"); */
- #ifndef CONFIG_YAFFS_TNODE_LIST_DEBUG
--	yaffs_CheckStruct(yaffs_Tnode, 2 * YAFFS_NTNODES_LEVEL0, "yaffs_Tnode")
-+	yaffs_CheckStruct(yaffs_Tnode, 2 * YAFFS_NTNODES_LEVEL0, "yaffs_Tnode");
- #endif
--	    yaffs_CheckStruct(yaffs_ObjectHeader, 512, "yaffs_ObjectHeader")
--
--	    return YAFFS_OK;
-+#ifndef CONFIG_YAFFS_WINCE
-+	yaffs_CheckStruct(yaffs_ObjectHeader, 512, "yaffs_ObjectHeader");
-+#endif
-+	return YAFFS_OK;
- }
---- a/fs/yaffs2/yaffs_guts.h
-+++ b/fs/yaffs2/yaffs_guts.h
-@@ -90,7 +90,7 @@
- 
- #define YAFFS_MAX_SHORT_OP_CACHES	20
- 
--#define YAFFS_N_TEMP_BUFFERS		4
-+#define YAFFS_N_TEMP_BUFFERS		6
- 
- /* We limit the number attempts at sucessfully saving a chunk of data.
-  * Small-page devices have 32 pages per block; large-page devices have 64.
-@@ -108,6 +108,9 @@
- #define YAFFS_LOWEST_SEQUENCE_NUMBER	0x00001000
- #define YAFFS_HIGHEST_SEQUENCE_NUMBER	0xEFFFFF00
- 
-+/* Special sequence number for bad block that failed to be marked bad */
-+#define YAFFS_SEQUENCE_BAD_BLOCK	0xFFFF0000
-+
- /* ChunkCache is used for short read/write operations.*/
- typedef struct {
- 	struct yaffs_ObjectStruct *object;
-@@ -134,11 +137,10 @@ typedef struct {
- typedef struct {
- 	unsigned chunkId:20;
- 	unsigned serialNumber:2;
--	unsigned byteCount:10;
-+	unsigned byteCountLSB:10;
- 	unsigned objectId:18;
- 	unsigned ecc:12;
--	unsigned unusedStuff:2;
--
-+	unsigned byteCountMSB:2;
- } yaffs_Tags;
- 
- typedef union {
-@@ -277,13 +279,13 @@ typedef struct {
- 
- 	int softDeletions:10;	/* number of soft deleted pages */
- 	int pagesInUse:10;	/* number of pages in use */
--	yaffs_BlockState blockState:4;	/* One of the above block states */
-+	unsigned blockState:4;	/* One of the above block states. NB use unsigned because enum is sometimes an int */
- 	__u32 needsRetiring:1;	/* Data has failed on this block, need to get valid data off */
--                        	/* and retire the block. */
--	__u32 skipErasedCheck: 1; /* If this is set we can skip the erased check on this block */
--	__u32 gcPrioritise: 1; 	/* An ECC check or blank check has failed on this block.
-+				/* and retire the block. */
-+	__u32 skipErasedCheck:1; /* If this is set we can skip the erased check on this block */
-+	__u32 gcPrioritise:1; 	/* An ECC check or blank check has failed on this block.
- 				   It should be prioritised for GC */
--        __u32 chunkErrorStrikes:3; /* How many times we've had ecc etc failures on this block and tried to reuse it */
-+	__u32 chunkErrorStrikes:3; /* How many times we've had ecc etc failures on this block and tried to reuse it */
- 
- #ifdef CONFIG_YAFFS_YAFFS2
- 	__u32 hasShrinkHeader:1; /* This block has at least one shrink object header */
-@@ -300,11 +302,11 @@ typedef struct {
- 
- 	/* Apply to everything  */
- 	int parentObjectId;
--	__u16 sum__NoLongerUsed;	/* checksum of name. No longer used */
-+	__u16 sum__NoLongerUsed;        /* checksum of name. No longer used */
- 	YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
- 
--	/* Thes following apply to directories, files, symlinks - not hard links */
--	__u32 yst_mode;		/* protection */
-+	/* The following apply to directories, files, symlinks - not hard links */
-+	__u32 yst_mode;         /* protection */
- 
- #ifdef CONFIG_YAFFS_WINCE
- 	__u32 notForWinCE[5];
-@@ -331,11 +333,14 @@ typedef struct {
- 	__u32 win_ctime[2];
- 	__u32 win_atime[2];
- 	__u32 win_mtime[2];
--	__u32 roomToGrow[4];
- #else
--	__u32 roomToGrow[10];
-+	__u32 roomToGrow[6];
-+
- #endif
-+	__u32 inbandShadowsObject;
-+	__u32 inbandIsShrink;
- 
-+	__u32 reservedSpace[2];
- 	int shadowsObject;	/* This object header shadows the specified object if > 0 */
- 
- 	/* isShrink applies to object headers written when we shrink the file (ie resize) */
-@@ -381,7 +386,7 @@ typedef struct {
- } yaffs_FileStructure;
- 
- typedef struct {
--	struct list_head children;	/* list of child links */
-+	struct ylist_head children;     /* list of child links */
- } yaffs_DirectoryStructure;
- 
- typedef struct {
-@@ -418,23 +423,24 @@ struct yaffs_ObjectStruct {
- 				 * still in the inode cache. Free of object is defered.
- 				 * until the inode is released.
- 				 */
-+	__u8 beingCreated:1;	/* This object is still being created so skip some checks. */
- 
- 	__u8 serial;		/* serial number of chunk in NAND. Cached here */
- 	__u16 sum;		/* sum of the name to speed searching */
- 
--	struct yaffs_DeviceStruct *myDev;	/* The device I'm on */
-+	struct yaffs_DeviceStruct *myDev;       /* The device I'm on */
- 
--	struct list_head hashLink;	/* list of objects in this hash bucket */
-+	struct ylist_head hashLink;     /* list of objects in this hash bucket */
- 
--	struct list_head hardLinks;	/* all the equivalent hard linked objects */
-+	struct ylist_head hardLinks;    /* all the equivalent hard linked objects */
- 
- 	/* directory structure stuff */
- 	/* also used for linking up the free list */
- 	struct yaffs_ObjectStruct *parent;
--	struct list_head siblings;
-+	struct ylist_head siblings;
- 
- 	/* Where's my object header in NAND? */
--	int chunkId;
-+	int hdrChunk;
- 
- 	int nDataChunks;	/* Number of data chunks attached to the file. */
- 
-@@ -485,7 +491,7 @@ struct yaffs_ObjectList_struct {
- typedef struct yaffs_ObjectList_struct yaffs_ObjectList;
- 
- typedef struct {
--	struct list_head list;
-+	struct ylist_head list;
- 	int count;
- } yaffs_ObjectBucket;
- 
-@@ -495,11 +501,10 @@ typedef struct {
-  */
- 
- typedef struct {
--        int structType;
-+	int structType;
- 	__u32 objectId;
- 	__u32 parentId;
--	int chunkId;
--
-+	int hdrChunk;
- 	yaffs_ObjectType variantType:3;
- 	__u8 deleted:1;
- 	__u8 softDeleted:1;
-@@ -511,8 +516,7 @@ typedef struct {
- 
- 	int nDataChunks;
- 	__u32 fileSizeOrEquivalentObjectId;
--
--}yaffs_CheckpointObject;
-+} yaffs_CheckpointObject;
- 
- /*--------------------- Temporary buffers ----------------
-  *
-@@ -528,13 +532,13 @@ typedef struct {
- /*----------------- Device ---------------------------------*/
- 
- struct yaffs_DeviceStruct {
--	struct list_head devList;
-+	struct ylist_head devList;
- 	const char *name;
- 
- 	/* Entry parameters set up way early. Yaffs sets up the rest.*/
- 	int nDataBytesPerChunk;	/* Should be a power of 2 >= 512 */
- 	int nChunksPerBlock;	/* does not need to be a power of 2 */
--	int nBytesPerSpare;	/* spare area size */
-+	int spareBytesPerChunk;	/* spare area size */
- 	int startBlock;		/* Start block we're allowed to use */
- 	int endBlock;		/* End block we're allowed to use */
- 	int nReservedBlocks;	/* We want this tuneable so that we can reduce */
-@@ -544,9 +548,7 @@ struct yaffs_DeviceStruct {
- 	/* Stuff used by the shared space checkpointing mechanism */
- 	/* If this value is zero, then this mechanism is disabled */
- 
--	int nCheckpointReservedBlocks; /* Blocks to reserve for checkpoint data */
--
--
-+/*	int nCheckpointReservedBlocks; */ /* Blocks to reserve for checkpoint data */
- 
- 
- 	int nShortOpCaches;	/* If <= 0, then short op caching is disabled, else
-@@ -560,30 +562,31 @@ struct yaffs_DeviceStruct {
- 	void *genericDevice;	/* Pointer to device context
- 				 * On an mtd this holds the mtd pointer.
- 				 */
--        void *superBlock;
-+	void *superBlock;
- 
- 	/* NAND access functions (Must be set before calling YAFFS)*/
- 
--	int (*writeChunkToNAND) (struct yaffs_DeviceStruct * dev,
--				 int chunkInNAND, const __u8 * data,
--				 const yaffs_Spare * spare);
--	int (*readChunkFromNAND) (struct yaffs_DeviceStruct * dev,
--				  int chunkInNAND, __u8 * data,
--				  yaffs_Spare * spare);
--	int (*eraseBlockInNAND) (struct yaffs_DeviceStruct * dev,
--				 int blockInNAND);
--	int (*initialiseNAND) (struct yaffs_DeviceStruct * dev);
-+	int (*writeChunkToNAND) (struct yaffs_DeviceStruct *dev,
-+					int chunkInNAND, const __u8 *data,
-+					const yaffs_Spare *spare);
-+	int (*readChunkFromNAND) (struct yaffs_DeviceStruct *dev,
-+					int chunkInNAND, __u8 *data,
-+					yaffs_Spare *spare);
-+	int (*eraseBlockInNAND) (struct yaffs_DeviceStruct *dev,
-+					int blockInNAND);
-+	int (*initialiseNAND) (struct yaffs_DeviceStruct *dev);
-+	int (*deinitialiseNAND) (struct yaffs_DeviceStruct *dev);
- 
- #ifdef CONFIG_YAFFS_YAFFS2
--	int (*writeChunkWithTagsToNAND) (struct yaffs_DeviceStruct * dev,
--					 int chunkInNAND, const __u8 * data,
--					 const yaffs_ExtendedTags * tags);
--	int (*readChunkWithTagsFromNAND) (struct yaffs_DeviceStruct * dev,
--					  int chunkInNAND, __u8 * data,
--					  yaffs_ExtendedTags * tags);
--	int (*markNANDBlockBad) (struct yaffs_DeviceStruct * dev, int blockNo);
--	int (*queryNANDBlock) (struct yaffs_DeviceStruct * dev, int blockNo,
--			       yaffs_BlockState * state, int *sequenceNumber);
-+	int (*writeChunkWithTagsToNAND) (struct yaffs_DeviceStruct *dev,
-+					 int chunkInNAND, const __u8 *data,
-+					 const yaffs_ExtendedTags *tags);
-+	int (*readChunkWithTagsFromNAND) (struct yaffs_DeviceStruct *dev,
-+					  int chunkInNAND, __u8 *data,
-+					  yaffs_ExtendedTags *tags);
-+	int (*markNANDBlockBad) (struct yaffs_DeviceStruct *dev, int blockNo);
-+	int (*queryNANDBlock) (struct yaffs_DeviceStruct *dev, int blockNo,
-+			       yaffs_BlockState *state, __u32 *sequenceNumber);
- #endif
- 
- 	int isYaffs2;
-@@ -595,10 +598,12 @@ struct yaffs_DeviceStruct {
- 	void (*removeObjectCallback)(struct yaffs_ObjectStruct *obj);
- 
- 	/* Callback to mark the superblock dirsty */
--	void (*markSuperBlockDirty)(void * superblock);
-+	void (*markSuperBlockDirty)(void *superblock);
- 
- 	int wideTnodesDisabled; /* Set to disable wide tnodes */
- 
-+	YCHAR *pathDividers;	/* String of legal path dividers */
-+
- 
- 	/* End of stuff that must be set before initialisation. */
- 
-@@ -615,16 +620,14 @@ struct yaffs_DeviceStruct {
- 	__u32 tnodeWidth;
- 	__u32 tnodeMask;
- 
--	/* Stuff to support various file offses to chunk/offset translations */
--	/* "Crumbs" for nDataBytesPerChunk not being a power of 2 */
--	__u32 crumbMask;
--	__u32 crumbShift;
--	__u32 crumbsPerChunk;
--
--	/* Straight shifting for nDataBytesPerChunk being a power of 2 */
--	__u32 chunkShift;
--	__u32 chunkMask;
--
-+	/* Stuff for figuring out file offset to chunk conversions */
-+	__u32 chunkShift; /* Shift value */
-+	__u32 chunkDiv;   /* Divisor after shifting: 1 for power-of-2 sizes */
-+	__u32 chunkMask;  /* Mask to use for power-of-2 case */
-+
-+	/* Stuff to handle inband tags */
-+	int inbandTags;
-+	__u32 totalBytesPerChunk;
- 
- #ifdef __KERNEL__
- 
-@@ -633,7 +636,7 @@ struct yaffs_DeviceStruct {
- 	__u8 *spareBuffer;	/* For mtdif2 use. Don't know the size of the buffer
- 				 * at compile time so we have to allocate it.
- 				 */
--	void (*putSuperFunc) (struct super_block * sb);
-+	void (*putSuperFunc) (struct super_block *sb);
- #endif
- 
- 	int isMounted;
-@@ -663,6 +666,8 @@ struct yaffs_DeviceStruct {
- 	__u32 checkpointSum;
- 	__u32 checkpointXor;
- 
-+	int nCheckpointBlocksRequired; /* Number of blocks needed to store current checkpoint set */
-+
- 	/* Block Info */
- 	yaffs_BlockInfo *blockInfo;
- 	__u8 *chunkBits;	/* bitmap of chunks in use */
-@@ -684,11 +689,15 @@ struct yaffs_DeviceStruct {
- 	yaffs_TnodeList *allocatedTnodeList;
- 
- 	int isDoingGC;
-+	int gcBlock;
-+	int gcChunk;
- 
- 	int nObjectsCreated;
- 	yaffs_Object *freeObjects;
- 	int nFreeObjects;
- 
-+	int nHardLinks;
-+
- 	yaffs_ObjectList *allocatedObjectList;
- 
- 	yaffs_ObjectBucket objectBucket[YAFFS_NOBJECT_BUCKETS];
-@@ -745,8 +754,10 @@ struct yaffs_DeviceStruct {
- 	int nBackgroundDeletions;	/* Count of background deletions. */
- 
- 
-+	/* Temporary buffer management */
- 	yaffs_TempBuffer tempBuffer[YAFFS_N_TEMP_BUFFERS];
- 	int maxTemp;
-+	int tempInUse;
- 	int unmanagedTempAllocations;
- 	int unmanagedTempDeallocations;
- 
-@@ -758,9 +769,9 @@ struct yaffs_DeviceStruct {
- 
- typedef struct yaffs_DeviceStruct yaffs_Device;
- 
--/* The static layout of bllock usage etc is stored in the super block header */
-+/* The static layout of block usage etc is stored in the super block header */
- typedef struct {
--        int StructType;
-+	int StructType;
- 	int version;
- 	int checkpointStartBlock;
- 	int checkpointEndBlock;
-@@ -773,7 +784,7 @@ typedef struct {
-  * must be preserved over unmount/mount cycles.
-  */
- typedef struct {
--        int structType;
-+	int structType;
- 	int nErasedBlocks;
- 	int allocationBlock;	/* Current block being allocated off */
- 	__u32 allocationPage;
-@@ -791,57 +802,45 @@ typedef struct {
- 
- 
- typedef struct {
--    int structType;
--    __u32 magic;
--    __u32 version;
--    __u32 head;
-+	int structType;
-+	__u32 magic;
-+	__u32 version;
-+	__u32 head;
- } yaffs_CheckpointValidity;
- 
--/* Function to manipulate block info */
--static Y_INLINE yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blk)
--{
--	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
--		T(YAFFS_TRACE_ERROR,
--		  (TSTR
--		   ("**>> yaffs: getBlockInfo block %d is not valid" TENDSTR),
--		   blk));
--		YBUG();
--	}
--	return &dev->blockInfo[blk - dev->internalStartBlock];
--}
- 
- /*----------------------- YAFFS Functions -----------------------*/
- 
--int yaffs_GutsInitialise(yaffs_Device * dev);
--void yaffs_Deinitialise(yaffs_Device * dev);
-+int yaffs_GutsInitialise(yaffs_Device *dev);
-+void yaffs_Deinitialise(yaffs_Device *dev);
- 
--int yaffs_GetNumberOfFreeChunks(yaffs_Device * dev);
-+int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev);
- 
--int yaffs_RenameObject(yaffs_Object * oldDir, const YCHAR * oldName,
--		       yaffs_Object * newDir, const YCHAR * newName);
-+int yaffs_RenameObject(yaffs_Object *oldDir, const YCHAR *oldName,
-+		       yaffs_Object *newDir, const YCHAR *newName);
- 
--int yaffs_Unlink(yaffs_Object * dir, const YCHAR * name);
--int yaffs_DeleteFile(yaffs_Object * obj);
-+int yaffs_Unlink(yaffs_Object *dir, const YCHAR *name);
-+int yaffs_DeleteObject(yaffs_Object *obj);
- 
--int yaffs_GetObjectName(yaffs_Object * obj, YCHAR * name, int buffSize);
--int yaffs_GetObjectFileLength(yaffs_Object * obj);
--int yaffs_GetObjectInode(yaffs_Object * obj);
--unsigned yaffs_GetObjectType(yaffs_Object * obj);
--int yaffs_GetObjectLinkCount(yaffs_Object * obj);
-+int yaffs_GetObjectName(yaffs_Object *obj, YCHAR *name, int buffSize);
-+int yaffs_GetObjectFileLength(yaffs_Object *obj);
-+int yaffs_GetObjectInode(yaffs_Object *obj);
-+unsigned yaffs_GetObjectType(yaffs_Object *obj);
-+int yaffs_GetObjectLinkCount(yaffs_Object *obj);
- 
--int yaffs_SetAttributes(yaffs_Object * obj, struct iattr *attr);
--int yaffs_GetAttributes(yaffs_Object * obj, struct iattr *attr);
-+int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr);
-+int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr);
- 
- /* File operations */
--int yaffs_ReadDataFromFile(yaffs_Object * obj, __u8 * buffer, loff_t offset,
--			   int nBytes);
--int yaffs_WriteDataToFile(yaffs_Object * obj, const __u8 * buffer, loff_t offset,
--			  int nBytes, int writeThrough);
--int yaffs_ResizeFile(yaffs_Object * obj, loff_t newSize);
--
--yaffs_Object *yaffs_MknodFile(yaffs_Object * parent, const YCHAR * name,
--			      __u32 mode, __u32 uid, __u32 gid);
--int yaffs_FlushFile(yaffs_Object * obj, int updateTime);
-+int yaffs_ReadDataFromFile(yaffs_Object *obj, __u8 *buffer, loff_t offset,
-+				int nBytes);
-+int yaffs_WriteDataToFile(yaffs_Object *obj, const __u8 *buffer, loff_t offset,
-+				int nBytes, int writeThrough);
-+int yaffs_ResizeFile(yaffs_Object *obj, loff_t newSize);
-+
-+yaffs_Object *yaffs_MknodFile(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid);
-+int yaffs_FlushFile(yaffs_Object *obj, int updateTime);
- 
- /* Flushing and checkpointing */
- void yaffs_FlushEntireDeviceCache(yaffs_Device *dev);
-@@ -850,33 +849,33 @@ int yaffs_CheckpointSave(yaffs_Device *d
- int yaffs_CheckpointRestore(yaffs_Device *dev);
- 
- /* Directory operations */
--yaffs_Object *yaffs_MknodDirectory(yaffs_Object * parent, const YCHAR * name,
--				   __u32 mode, __u32 uid, __u32 gid);
--yaffs_Object *yaffs_FindObjectByName(yaffs_Object * theDir, const YCHAR * name);
--int yaffs_ApplyToDirectoryChildren(yaffs_Object * theDir,
-+yaffs_Object *yaffs_MknodDirectory(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid);
-+yaffs_Object *yaffs_FindObjectByName(yaffs_Object *theDir, const YCHAR *name);
-+int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir,
- 				   int (*fn) (yaffs_Object *));
- 
--yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device * dev, __u32 number);
-+yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev, __u32 number);
- 
- /* Link operations */
--yaffs_Object *yaffs_Link(yaffs_Object * parent, const YCHAR * name,
--			 yaffs_Object * equivalentObject);
-+yaffs_Object *yaffs_Link(yaffs_Object *parent, const YCHAR *name,
-+			 yaffs_Object *equivalentObject);
- 
--yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object * obj);
-+yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj);
- 
- /* Symlink operations */
--yaffs_Object *yaffs_MknodSymLink(yaffs_Object * parent, const YCHAR * name,
-+yaffs_Object *yaffs_MknodSymLink(yaffs_Object *parent, const YCHAR *name,
- 				 __u32 mode, __u32 uid, __u32 gid,
--				 const YCHAR * alias);
--YCHAR *yaffs_GetSymlinkAlias(yaffs_Object * obj);
-+				 const YCHAR *alias);
-+YCHAR *yaffs_GetSymlinkAlias(yaffs_Object *obj);
- 
- /* Special inodes (fifos, sockets and devices) */
--yaffs_Object *yaffs_MknodSpecial(yaffs_Object * parent, const YCHAR * name,
-+yaffs_Object *yaffs_MknodSpecial(yaffs_Object *parent, const YCHAR *name,
- 				 __u32 mode, __u32 uid, __u32 gid, __u32 rdev);
- 
- /* Special directories */
--yaffs_Object *yaffs_Root(yaffs_Device * dev);
--yaffs_Object *yaffs_LostNFound(yaffs_Device * dev);
-+yaffs_Object *yaffs_Root(yaffs_Device *dev);
-+yaffs_Object *yaffs_LostNFound(yaffs_Device *dev);
- 
- #ifdef CONFIG_YAFFS_WINCE
- /* CONFIG_YAFFS_WINCE special stuff */
-@@ -885,18 +884,21 @@ void yfsd_WinFileTimeNow(__u32 target[2]
- 
- #ifdef __KERNEL__
- 
--void yaffs_HandleDeferedFree(yaffs_Object * obj);
-+void yaffs_HandleDeferedFree(yaffs_Object *obj);
- #endif
- 
- /* Debug dump  */
--int yaffs_DumpObject(yaffs_Object * obj);
-+int yaffs_DumpObject(yaffs_Object *obj);
- 
--void yaffs_GutsTest(yaffs_Device * dev);
-+void yaffs_GutsTest(yaffs_Device *dev);
- 
- /* A few useful functions */
--void yaffs_InitialiseTags(yaffs_ExtendedTags * tags);
--void yaffs_DeleteChunk(yaffs_Device * dev, int chunkId, int markNAND, int lyn);
--int yaffs_CheckFF(__u8 * buffer, int nBytes);
-+void yaffs_InitialiseTags(yaffs_ExtendedTags *tags);
-+void yaffs_DeleteChunk(yaffs_Device *dev, int chunkId, int markNAND, int lyn);
-+int yaffs_CheckFF(__u8 *buffer, int nBytes);
- void yaffs_HandleChunkError(yaffs_Device *dev, yaffs_BlockInfo *bi);
- 
-+__u8 *yaffs_GetTempBuffer(yaffs_Device *dev, int lineNo);
-+void yaffs_ReleaseTempBuffer(yaffs_Device *dev, __u8 *buffer, int lineNo);
-+
- #endif
---- a/fs/yaffs2/yaffs_mtdif1.c
-+++ b/fs/yaffs2/yaffs_mtdif1.c
-@@ -26,7 +26,7 @@
- #include "yportenv.h"
- #include "yaffs_guts.h"
- #include "yaffs_packedtags1.h"
--#include "yaffs_tagscompat.h"	// for yaffs_CalcTagsECC
-+#include "yaffs_tagscompat.h"	/* for yaffs_CalcTagsECC */
- 
- #include "linux/kernel.h"
- #include "linux/version.h"
-@@ -34,9 +34,9 @@
- #include "linux/mtd/mtd.h"
- 
- /* Don't compile this module if we don't have MTD's mtd_oob_ops interface */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 
--const char *yaffs_mtdif1_c_version = "$Id: yaffs_mtdif1.c,v 1.3 2007/05/15 20:16:11 ian Exp $";
-+const char *yaffs_mtdif1_c_version = "$Id: yaffs_mtdif1.c,v 1.10 2009-03-09 07:41:10 charles Exp $";
- 
- #ifndef CONFIG_YAFFS_9BYTE_TAGS
- # define YTAG1_SIZE 8
-@@ -89,9 +89,9 @@ static struct nand_ecclayout nand_oob_16
-  * Returns YAFFS_OK or YAFFS_FAIL.
-  */
- int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device *dev,
--	int chunkInNAND, const __u8 * data, const yaffs_ExtendedTags * etags)
-+	int chunkInNAND, const __u8 *data, const yaffs_ExtendedTags *etags)
- {
--	struct mtd_info * mtd = dev->genericDevice;
-+	struct mtd_info *mtd = dev->genericDevice;
- 	int chunkBytes = dev->nDataBytesPerChunk;
- 	loff_t addr = ((loff_t)chunkInNAND) * chunkBytes;
- 	struct mtd_oob_ops ops;
-@@ -146,7 +146,7 @@ int nandmtd1_WriteChunkWithTagsToNAND(ya
- 
- /* Return with empty ExtendedTags but add eccResult.
-  */
--static int rettags(yaffs_ExtendedTags * etags, int eccResult, int retval)
-+static int rettags(yaffs_ExtendedTags *etags, int eccResult, int retval)
- {
- 	if (etags) {
- 		memset(etags, 0, sizeof(*etags));
-@@ -169,9 +169,9 @@ static int rettags(yaffs_ExtendedTags * 
-  * Returns YAFFS_OK or YAFFS_FAIL.
-  */
- int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev,
--	int chunkInNAND, __u8 * data, yaffs_ExtendedTags * etags)
-+	int chunkInNAND, __u8 *data, yaffs_ExtendedTags *etags)
- {
--	struct mtd_info * mtd = dev->genericDevice;
-+	struct mtd_info *mtd = dev->genericDevice;
- 	int chunkBytes = dev->nDataBytesPerChunk;
- 	loff_t addr = ((loff_t)chunkInNAND) * chunkBytes;
- 	int eccres = YAFFS_ECC_RESULT_NO_ERROR;
-@@ -189,7 +189,7 @@ int nandmtd1_ReadChunkWithTagsFromNAND(y
- 	ops.datbuf = data;
- 	ops.oobbuf = (__u8 *)&pt1;
- 
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20))
-+#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 20))
- 	/* In MTD 2.6.18 to 2.6.19 nand_base.c:nand_do_read_oob() has a bug;
- 	 * help it out with ops.len = ops.ooblen when ops.datbuf == NULL.
- 	 */
-@@ -284,11 +284,11 @@ int nandmtd1_ReadChunkWithTagsFromNAND(y
-  */
- int nandmtd1_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo)
- {
--	struct mtd_info * mtd = dev->genericDevice;
-+	struct mtd_info *mtd = dev->genericDevice;
- 	int blocksize = dev->nChunksPerBlock * dev->nDataBytesPerChunk;
- 	int retval;
- 
--	yaffs_trace(YAFFS_TRACE_BAD_BLOCKS, "marking block %d bad", blockNo);
-+	yaffs_trace(YAFFS_TRACE_BAD_BLOCKS, "marking block %d bad\n", blockNo);
- 
- 	retval = mtd->block_markbad(mtd, (loff_t)blocksize * blockNo);
- 	return (retval) ? YAFFS_FAIL : YAFFS_OK;
-@@ -298,7 +298,7 @@ int nandmtd1_MarkNANDBlockBad(struct yaf
-  *
-  * Returns YAFFS_OK or YAFFS_FAIL.
-  */
--static int nandmtd1_TestPrerequists(struct mtd_info * mtd)
-+static int nandmtd1_TestPrerequists(struct mtd_info *mtd)
- {
- 	/* 2.6.18 has mtd->ecclayout->oobavail */
- 	/* 2.6.21 has mtd->ecclayout->oobavail and mtd->oobavail */
-@@ -323,10 +323,11 @@ static int nandmtd1_TestPrerequists(stru
-  * Always returns YAFFS_OK.
-  */
- int nandmtd1_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--	yaffs_BlockState * pState, int *pSequenceNumber)
-+	yaffs_BlockState *pState, __u32 *pSequenceNumber)
- {
--	struct mtd_info * mtd = dev->genericDevice;
-+	struct mtd_info *mtd = dev->genericDevice;
- 	int chunkNo = blockNo * dev->nChunksPerBlock;
-+	loff_t addr = (loff_t)chunkNo * dev->nDataBytesPerChunk;
- 	yaffs_ExtendedTags etags;
- 	int state = YAFFS_BLOCK_STATE_DEAD;
- 	int seqnum = 0;
-@@ -335,21 +336,22 @@ int nandmtd1_QueryNANDBlock(struct yaffs
- 	/* We don't yet have a good place to test for MTD config prerequists.
- 	 * Do it here as we are called during the initial scan.
- 	 */
--	if (nandmtd1_TestPrerequists(mtd) != YAFFS_OK) {
-+	if (nandmtd1_TestPrerequists(mtd) != YAFFS_OK)
- 		return YAFFS_FAIL;
--	}
- 
- 	retval = nandmtd1_ReadChunkWithTagsFromNAND(dev, chunkNo, NULL, &etags);
-+	etags.blockBad = (mtd->block_isbad)(mtd, addr);
- 	if (etags.blockBad) {
- 		yaffs_trace(YAFFS_TRACE_BAD_BLOCKS,
--			"block %d is marked bad", blockNo);
-+			"block %d is marked bad\n", blockNo);
- 		state = YAFFS_BLOCK_STATE_DEAD;
--	}
--	else if (etags.chunkUsed) {
-+	} else if (etags.eccResult != YAFFS_ECC_RESULT_NO_ERROR) {
-+		/* bad tags, need to look more closely */
-+		state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
-+	} else if (etags.chunkUsed) {
- 		state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
- 		seqnum = etags.sequenceNumber;
--	}
--	else {
-+	} else {
- 		state = YAFFS_BLOCK_STATE_EMPTY;
- 	}
- 
-@@ -360,4 +362,4 @@ int nandmtd1_QueryNANDBlock(struct yaffs
- 	return YAFFS_OK;
- }
- 
--#endif /*KERNEL_VERSION*/
-+#endif /*MTD_VERSION*/
---- a/fs/yaffs2/yaffs_mtdif1.h
-+++ b/fs/yaffs2/yaffs_mtdif1.h
-@@ -14,15 +14,15 @@
- #ifndef __YAFFS_MTDIF1_H__
- #define __YAFFS_MTDIF1_H__
- 
--int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
--	const __u8 * data, const yaffs_ExtendedTags * tags);
-+int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
-+	const __u8 *data, const yaffs_ExtendedTags *tags);
- 
--int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--	__u8 * data, yaffs_ExtendedTags * tags);
-+int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+	__u8 *data, yaffs_ExtendedTags *tags);
- 
- int nandmtd1_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
- 
- int nandmtd1_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--	yaffs_BlockState * state, int *sequenceNumber);
-+	yaffs_BlockState *state, __u32 *sequenceNumber);
- 
- #endif
---- a/fs/yaffs2/yaffs_mtdif2.c
-+++ b/fs/yaffs2/yaffs_mtdif2.c
-@@ -14,7 +14,7 @@
- /* mtd interface for YAFFS2 */
- 
- const char *yaffs_mtdif2_c_version =
--    "$Id: yaffs_mtdif2.c,v 1.17 2007-02-14 01:09:06 wookey Exp $";
-+	"$Id: yaffs_mtdif2.c,v 1.23 2009-03-06 17:20:53 wookey Exp $";
- 
- #include "yportenv.h"
- 
-@@ -27,19 +27,23 @@ const char *yaffs_mtdif2_c_version =
- 
- #include "yaffs_packedtags2.h"
- 
--int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
--				      const __u8 * data,
--				      const yaffs_ExtendedTags * tags)
-+/* NB For use with inband tags....
-+ * We assume that the data buffer is of size totalBytersPerChunk so that we can also
-+ * use it to load the tags.
-+ */
-+int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
-+				      const __u8 *data,
-+				      const yaffs_ExtendedTags *tags)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	struct mtd_oob_ops ops;
- #else
- 	size_t dummy;
- #endif
- 	int retval = 0;
- 
--	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
-+	loff_t addr;
- 
- 	yaffs_PackedTags2 pt;
- 
-@@ -48,46 +52,40 @@ int nandmtd2_WriteChunkWithTagsToNAND(ya
- 	   ("nandmtd2_WriteChunkWithTagsToNAND chunk %d data %p tags %p"
- 	    TENDSTR), chunkInNAND, data, tags));
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--	if (tags)
--		yaffs_PackTags2(&pt, tags);
--	else
--		BUG(); /* both tags and data should always be present */
- 
--	if (data) {
--		ops.mode = MTD_OOB_AUTO;
--		ops.ooblen = sizeof(pt);
--		ops.len = dev->nDataBytesPerChunk;
--		ops.ooboffs = 0;
--		ops.datbuf = (__u8 *)data;
--		ops.oobbuf = (void *)&pt;
--		retval = mtd->write_oob(mtd, addr, &ops);
-+	addr  = ((loff_t) chunkInNAND) * dev->totalBytesPerChunk;
-+
-+	/* For yaffs2 writing there must be both data and tags.
-+	 * If we're using inband tags, then the tags are stuffed into
-+	 * the end of the data buffer.
-+	 */
-+	if (!data || !tags)
-+		BUG();
-+	else if (dev->inbandTags) {
-+		yaffs_PackedTags2TagsPart *pt2tp;
-+		pt2tp = (yaffs_PackedTags2TagsPart *)(data + dev->nDataBytesPerChunk);
-+		yaffs_PackTags2TagsPart(pt2tp, tags);
- 	} else
--		BUG(); /* both tags and data should always be present */
--#else
--	if (tags) {
- 		yaffs_PackTags2(&pt, tags);
--	}
- 
--	if (data && tags) {
--		if (dev->useNANDECC)
--			retval =
--			    mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
--					   &dummy, data, (__u8 *) & pt, NULL);
--		else
--			retval =
--			    mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
--					   &dummy, data, (__u8 *) & pt, NULL);
--	} else {
--		if (data)
--			retval =
--			    mtd->write(mtd, addr, dev->nDataBytesPerChunk, &dummy,
--				       data);
--		if (tags)
--			retval =
--			    mtd->write_oob(mtd, addr, mtd->oobsize, &dummy,
--					   (__u8 *) & pt);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+	ops.mode = MTD_OOB_AUTO;
-+	ops.ooblen = (dev->inbandTags) ? 0 : sizeof(pt);
-+	ops.len = dev->totalBytesPerChunk;
-+	ops.ooboffs = 0;
-+	ops.datbuf = (__u8 *)data;
-+	ops.oobbuf = (dev->inbandTags) ? NULL : (void *)&pt;
-+	retval = mtd->write_oob(mtd, addr, &ops);
- 
-+#else
-+	if (!dev->inbandTags) {
-+		retval =
-+		    mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
-+				   &dummy, data, (__u8 *) &pt, NULL);
-+	} else {
-+		retval =
-+		    mtd->write(mtd, addr, dev->totalBytesPerChunk, &dummy,
-+			       data);
- 	}
- #endif
- 
-@@ -97,17 +95,18 @@ int nandmtd2_WriteChunkWithTagsToNAND(ya
- 		return YAFFS_FAIL;
- }
- 
--int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--				       __u8 * data, yaffs_ExtendedTags * tags)
-+int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+				       __u8 *data, yaffs_ExtendedTags *tags)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	struct mtd_oob_ops ops;
- #endif
- 	size_t dummy;
- 	int retval = 0;
-+	int localData = 0;
- 
--	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
-+	loff_t addr = ((loff_t) chunkInNAND) * dev->totalBytesPerChunk;
- 
- 	yaffs_PackedTags2 pt;
- 
-@@ -116,9 +115,20 @@ int nandmtd2_ReadChunkWithTagsFromNAND(y
- 	   ("nandmtd2_ReadChunkWithTagsFromNAND chunk %d data %p tags %p"
- 	    TENDSTR), chunkInNAND, data, tags));
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--	if (data && !tags)
--		retval = mtd->read(mtd, addr, dev->nDataBytesPerChunk,
-+	if (dev->inbandTags) {
-+
-+		if (!data) {
-+			localData = 1;
-+			data = yaffs_GetTempBuffer(dev, __LINE__);
-+		}
-+
-+
-+	}
-+
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+	if (dev->inbandTags || (data && !tags))
-+		retval = mtd->read(mtd, addr, dev->totalBytesPerChunk,
- 				&dummy, data);
- 	else if (tags) {
- 		ops.mode = MTD_OOB_AUTO;
-@@ -130,38 +140,42 @@ int nandmtd2_ReadChunkWithTagsFromNAND(y
- 		retval = mtd->read_oob(mtd, addr, &ops);
- 	}
- #else
--	if (data && tags) {
--		if (dev->useNANDECC) {
--			retval =
--			    mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
--					  &dummy, data, dev->spareBuffer,
--					  NULL);
--		} else {
--			retval =
--			    mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
-+	if (!dev->inbandTags && data && tags) {
-+
-+		retval = mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
- 					  &dummy, data, dev->spareBuffer,
- 					  NULL);
--		}
- 	} else {
- 		if (data)
- 			retval =
- 			    mtd->read(mtd, addr, dev->nDataBytesPerChunk, &dummy,
- 				      data);
--		if (tags)
-+		if (!dev->inbandTags && tags)
- 			retval =
- 			    mtd->read_oob(mtd, addr, mtd->oobsize, &dummy,
- 					  dev->spareBuffer);
- 	}
- #endif
- 
--	memcpy(&pt, dev->spareBuffer, sizeof(pt));
- 
--	if (tags)
--		yaffs_UnpackTags2(tags, &pt);
-+	if (dev->inbandTags) {
-+		if (tags) {
-+			yaffs_PackedTags2TagsPart *pt2tp;
-+			pt2tp = (yaffs_PackedTags2TagsPart *)&data[dev->nDataBytesPerChunk];
-+			yaffs_UnpackTags2TagsPart(tags, pt2tp);
-+		}
-+	} else {
-+		if (tags) {
-+			memcpy(&pt, dev->spareBuffer, sizeof(pt));
-+			yaffs_UnpackTags2(tags, &pt);
-+		}
-+	}
- 
--	if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
--		tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
-+	if (localData)
-+		yaffs_ReleaseTempBuffer(dev, data, __LINE__);
- 
-+	if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
-+		tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
- 	if (retval == 0)
- 		return YAFFS_OK;
- 	else
-@@ -178,7 +192,7 @@ int nandmtd2_MarkNANDBlockBad(struct yaf
- 	retval =
- 	    mtd->block_markbad(mtd,
- 			       blockNo * dev->nChunksPerBlock *
--			       dev->nDataBytesPerChunk);
-+			       dev->totalBytesPerChunk);
- 
- 	if (retval == 0)
- 		return YAFFS_OK;
-@@ -188,7 +202,7 @@ int nandmtd2_MarkNANDBlockBad(struct yaf
- }
- 
- int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--			    yaffs_BlockState * state, int *sequenceNumber)
-+			    yaffs_BlockState *state, __u32 *sequenceNumber)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
- 	int retval;
-@@ -198,7 +212,7 @@ int nandmtd2_QueryNANDBlock(struct yaffs
- 	retval =
- 	    mtd->block_isbad(mtd,
- 			     blockNo * dev->nChunksPerBlock *
--			     dev->nDataBytesPerChunk);
-+			     dev->totalBytesPerChunk);
- 
- 	if (retval) {
- 		T(YAFFS_TRACE_MTD, (TSTR("block is bad" TENDSTR)));
---- a/fs/yaffs2/yaffs_mtdif2.h
-+++ b/fs/yaffs2/yaffs_mtdif2.h
-@@ -17,13 +17,13 @@
- #define __YAFFS_MTDIF2_H__
- 
- #include "yaffs_guts.h"
--int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
--				      const __u8 * data,
--				      const yaffs_ExtendedTags * tags);
--int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--				       __u8 * data, yaffs_ExtendedTags * tags);
-+int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
-+				const __u8 *data,
-+				const yaffs_ExtendedTags *tags);
-+int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+				__u8 *data, yaffs_ExtendedTags *tags);
- int nandmtd2_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
- int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--			    yaffs_BlockState * state, int *sequenceNumber);
-+			yaffs_BlockState *state, __u32 *sequenceNumber);
- 
- #endif
---- a/fs/yaffs2/yaffs_mtdif.c
-+++ b/fs/yaffs2/yaffs_mtdif.c
-@@ -12,7 +12,7 @@
-  */
- 
- const char *yaffs_mtdif_c_version =
--    "$Id: yaffs_mtdif.c,v 1.19 2007-02-14 01:09:06 wookey Exp $";
-+	"$Id: yaffs_mtdif.c,v 1.22 2009-03-06 17:20:51 wookey Exp $";
- 
- #include "yportenv.h"
- 
-@@ -24,7 +24,7 @@ const char *yaffs_mtdif_c_version =
- #include "linux/time.h"
- #include "linux/mtd/nand.h"
- 
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18))
-+#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 18))
- static struct nand_oobinfo yaffs_oobinfo = {
- 	.useecc = 1,
- 	.eccbytes = 6,
-@@ -36,7 +36,7 @@ static struct nand_oobinfo yaffs_noeccin
- };
- #endif
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- static inline void translate_spare2oob(const yaffs_Spare *spare, __u8 *oob)
- {
- 	oob[0] = spare->tagByte0;
-@@ -45,8 +45,8 @@ static inline void translate_spare2oob(c
- 	oob[3] = spare->tagByte3;
- 	oob[4] = spare->tagByte4;
- 	oob[5] = spare->tagByte5 & 0x3f;
--	oob[5] |= spare->blockStatus == 'Y' ? 0: 0x80;
--	oob[5] |= spare->pageStatus == 0 ? 0: 0x40;
-+	oob[5] |= spare->blockStatus == 'Y' ? 0 : 0x80;
-+	oob[5] |= spare->pageStatus == 0 ? 0 : 0x40;
- 	oob[6] = spare->tagByte6;
- 	oob[7] = spare->tagByte7;
- }
-@@ -71,18 +71,18 @@ static inline void translate_oob2spare(y
- }
- #endif
- 
--int nandmtd_WriteChunkToNAND(yaffs_Device * dev, int chunkInNAND,
--			     const __u8 * data, const yaffs_Spare * spare)
-+int nandmtd_WriteChunkToNAND(yaffs_Device *dev, int chunkInNAND,
-+			     const __u8 *data, const yaffs_Spare *spare)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	struct mtd_oob_ops ops;
- #endif
- 	size_t dummy;
- 	int retval = 0;
- 
- 	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	__u8 spareAsBytes[8]; /* OOB */
- 
- 	if (data && !spare)
-@@ -135,18 +135,18 @@ int nandmtd_WriteChunkToNAND(yaffs_Devic
- 		return YAFFS_FAIL;
- }
- 
--int nandmtd_ReadChunkFromNAND(yaffs_Device * dev, int chunkInNAND, __u8 * data,
--			      yaffs_Spare * spare)
-+int nandmtd_ReadChunkFromNAND(yaffs_Device *dev, int chunkInNAND, __u8 *data,
-+			      yaffs_Spare *spare)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	struct mtd_oob_ops ops;
- #endif
- 	size_t dummy;
- 	int retval = 0;
- 
- 	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	__u8 spareAsBytes[8]; /* OOB */
- 
- 	if (data && !spare)
-@@ -205,7 +205,7 @@ int nandmtd_ReadChunkFromNAND(yaffs_Devi
- 		return YAFFS_FAIL;
- }
- 
--int nandmtd_EraseBlockInNAND(yaffs_Device * dev, int blockNumber)
-+int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
- 	__u32 addr =
-@@ -234,7 +234,7 @@ int nandmtd_EraseBlockInNAND(yaffs_Devic
- 		return YAFFS_FAIL;
- }
- 
--int nandmtd_InitialiseNAND(yaffs_Device * dev)
-+int nandmtd_InitialiseNAND(yaffs_Device *dev)
- {
- 	return YAFFS_OK;
- }
---- a/fs/yaffs2/yaffs_mtdif.h
-+++ b/fs/yaffs2/yaffs_mtdif.h
-@@ -18,10 +18,15 @@
- 
- #include "yaffs_guts.h"
- 
--int nandmtd_WriteChunkToNAND(yaffs_Device * dev, int chunkInNAND,
--			     const __u8 * data, const yaffs_Spare * spare);
--int nandmtd_ReadChunkFromNAND(yaffs_Device * dev, int chunkInNAND, __u8 * data,
--			      yaffs_Spare * spare);
--int nandmtd_EraseBlockInNAND(yaffs_Device * dev, int blockNumber);
--int nandmtd_InitialiseNAND(yaffs_Device * dev);
-+#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 18))
-+extern struct nand_oobinfo yaffs_oobinfo;
-+extern struct nand_oobinfo yaffs_noeccinfo;
-+#endif
-+
-+int nandmtd_WriteChunkToNAND(yaffs_Device *dev, int chunkInNAND,
-+			const __u8 *data, const yaffs_Spare *spare);
-+int nandmtd_ReadChunkFromNAND(yaffs_Device *dev, int chunkInNAND, __u8 *data,
-+			yaffs_Spare *spare);
-+int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber);
-+int nandmtd_InitialiseNAND(yaffs_Device *dev);
- #endif
---- a/fs/yaffs2/yaffs_nand.c
-+++ b/fs/yaffs2/yaffs_nand.c
-@@ -12,16 +12,17 @@
-  */
- 
- const char *yaffs_nand_c_version =
--    "$Id: yaffs_nand.c,v 1.7 2007-02-14 01:09:06 wookey Exp $";
-+	"$Id: yaffs_nand.c,v 1.10 2009-03-06 17:20:54 wookey Exp $";
- 
- #include "yaffs_nand.h"
- #include "yaffs_tagscompat.h"
- #include "yaffs_tagsvalidity.h"
- 
-+#include "yaffs_getblockinfo.h"
- 
--int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--					   __u8 * buffer,
--					   yaffs_ExtendedTags * tags)
-+int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+					   __u8 *buffer,
-+					   yaffs_ExtendedTags *tags)
- {
- 	int result;
- 	yaffs_ExtendedTags localTags;
-@@ -29,7 +30,7 @@ int yaffs_ReadChunkWithTagsFromNAND(yaff
- 	int realignedChunkInNAND = chunkInNAND - dev->chunkOffset;
- 
- 	/* If there are no tags provided, use local tags to get prioritised gc working */
--	if(!tags)
-+	if (!tags)
- 		tags = &localTags;
- 
- 	if (dev->readChunkWithTagsFromNAND)
-@@ -40,20 +41,20 @@ int yaffs_ReadChunkWithTagsFromNAND(yaff
- 									realignedChunkInNAND,
- 									buffer,
- 									tags);
--	if(tags &&
--	   tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR){
-+	if (tags &&
-+	   tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR) {
- 
- 		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, chunkInNAND/dev->nChunksPerBlock);
--                yaffs_HandleChunkError(dev,bi);
-+		yaffs_HandleChunkError(dev, bi);
- 	}
- 
- 	return result;
- }
- 
--int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev,
-+int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,
- 						   int chunkInNAND,
--						   const __u8 * buffer,
--						   yaffs_ExtendedTags * tags)
-+						   const __u8 *buffer,
-+						   yaffs_ExtendedTags *tags)
- {
- 	chunkInNAND -= dev->chunkOffset;
- 
-@@ -84,7 +85,7 @@ int yaffs_WriteChunkWithTagsToNAND(yaffs
- 								       tags);
- }
- 
--int yaffs_MarkBlockBad(yaffs_Device * dev, int blockNo)
-+int yaffs_MarkBlockBad(yaffs_Device *dev, int blockNo)
- {
- 	blockNo -= dev->blockOffset;
- 
-@@ -95,10 +96,10 @@ int yaffs_MarkBlockBad(yaffs_Device * de
- 		return yaffs_TagsCompatabilityMarkNANDBlockBad(dev, blockNo);
- }
- 
--int yaffs_QueryInitialBlockState(yaffs_Device * dev,
-+int yaffs_QueryInitialBlockState(yaffs_Device *dev,
- 						 int blockNo,
--						 yaffs_BlockState * state,
--						 unsigned *sequenceNumber)
-+						 yaffs_BlockState *state,
-+						 __u32 *sequenceNumber)
- {
- 	blockNo -= dev->blockOffset;
- 
---- a/fs/yaffs2/yaffs_nandemul2k.h
-+++ b/fs/yaffs2/yaffs_nandemul2k.h
-@@ -21,14 +21,14 @@
- #include "yaffs_guts.h"
- 
- int nandemul2k_WriteChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev,
--					int chunkInNAND, const __u8 * data,
--					yaffs_ExtendedTags * tags);
-+					int chunkInNAND, const __u8 *data,
-+					const yaffs_ExtendedTags *tags);
- int nandemul2k_ReadChunkWithTagsFromNAND(struct yaffs_DeviceStruct *dev,
--					 int chunkInNAND, __u8 * data,
--					 yaffs_ExtendedTags * tags);
-+					 int chunkInNAND, __u8 *data,
-+					 yaffs_ExtendedTags *tags);
- int nandemul2k_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
- int nandemul2k_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--			      yaffs_BlockState * state, int *sequenceNumber);
-+			      yaffs_BlockState *state, __u32 *sequenceNumber);
- int nandemul2k_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
- 				int blockInNAND);
- int nandemul2k_InitialiseNAND(struct yaffs_DeviceStruct *dev);
---- a/fs/yaffs2/yaffs_nand.h
-+++ b/fs/yaffs2/yaffs_nand.h
-@@ -19,21 +19,21 @@
- 
- 
- 
--int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--					   __u8 * buffer,
--					   yaffs_ExtendedTags * tags);
--
--int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev,
--						   int chunkInNAND,
--						   const __u8 * buffer,
--						   yaffs_ExtendedTags * tags);
--
--int yaffs_MarkBlockBad(yaffs_Device * dev, int blockNo);
--
--int yaffs_QueryInitialBlockState(yaffs_Device * dev,
--						 int blockNo,
--						 yaffs_BlockState * state,
--						 unsigned *sequenceNumber);
-+int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+					__u8 *buffer,
-+					yaffs_ExtendedTags *tags);
-+
-+int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,
-+						int chunkInNAND,
-+						const __u8 *buffer,
-+						yaffs_ExtendedTags *tags);
-+
-+int yaffs_MarkBlockBad(yaffs_Device *dev, int blockNo);
-+
-+int yaffs_QueryInitialBlockState(yaffs_Device *dev,
-+						int blockNo,
-+						yaffs_BlockState *state,
-+						unsigned *sequenceNumber);
- 
- int yaffs_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
- 				  int blockInNAND);
---- a/fs/yaffs2/yaffs_packedtags1.c
-+++ b/fs/yaffs2/yaffs_packedtags1.c
-@@ -14,7 +14,7 @@
- #include "yaffs_packedtags1.h"
- #include "yportenv.h"
- 
--void yaffs_PackTags1(yaffs_PackedTags1 * pt, const yaffs_ExtendedTags * t)
-+void yaffs_PackTags1(yaffs_PackedTags1 *pt, const yaffs_ExtendedTags *t)
- {
- 	pt->chunkId = t->chunkId;
- 	pt->serialNumber = t->serialNumber;
-@@ -27,7 +27,7 @@ void yaffs_PackTags1(yaffs_PackedTags1 *
- 
- }
- 
--void yaffs_UnpackTags1(yaffs_ExtendedTags * t, const yaffs_PackedTags1 * pt)
-+void yaffs_UnpackTags1(yaffs_ExtendedTags *t, const yaffs_PackedTags1 *pt)
- {
- 	static const __u8 allFF[] =
- 	    { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-@@ -35,9 +35,8 @@ void yaffs_UnpackTags1(yaffs_ExtendedTag
- 
- 	if (memcmp(allFF, pt, sizeof(yaffs_PackedTags1))) {
- 		t->blockBad = 0;
--		if (pt->shouldBeFF != 0xFFFFFFFF) {
-+		if (pt->shouldBeFF != 0xFFFFFFFF)
- 			t->blockBad = 1;
--		}
- 		t->chunkUsed = 1;
- 		t->objectId = pt->objectId;
- 		t->chunkId = pt->chunkId;
-@@ -47,6 +46,5 @@ void yaffs_UnpackTags1(yaffs_ExtendedTag
- 		t->serialNumber = pt->serialNumber;
- 	} else {
- 		memset(t, 0, sizeof(yaffs_ExtendedTags));
--
- 	}
- }
---- a/fs/yaffs2/yaffs_packedtags1.h
-+++ b/fs/yaffs2/yaffs_packedtags1.h
-@@ -32,6 +32,6 @@ typedef struct {
- 
- } yaffs_PackedTags1;
- 
--void yaffs_PackTags1(yaffs_PackedTags1 * pt, const yaffs_ExtendedTags * t);
--void yaffs_UnpackTags1(yaffs_ExtendedTags * t, const yaffs_PackedTags1 * pt);
-+void yaffs_PackTags1(yaffs_PackedTags1 *pt, const yaffs_ExtendedTags *t);
-+void yaffs_UnpackTags1(yaffs_ExtendedTags *t, const yaffs_PackedTags1 *pt);
- #endif
---- a/fs/yaffs2/yaffs_packedtags2.c
-+++ b/fs/yaffs2/yaffs_packedtags2.c
-@@ -37,60 +37,68 @@
- #define EXTRA_OBJECT_TYPE_SHIFT (28)
- #define EXTRA_OBJECT_TYPE_MASK  ((0x0F) << EXTRA_OBJECT_TYPE_SHIFT)
- 
--static void yaffs_DumpPackedTags2(const yaffs_PackedTags2 * pt)
-+
-+static void yaffs_DumpPackedTags2TagsPart(const yaffs_PackedTags2TagsPart *ptt)
- {
- 	T(YAFFS_TRACE_MTD,
- 	  (TSTR("packed tags obj %d chunk %d byte %d seq %d" TENDSTR),
--	   pt->t.objectId, pt->t.chunkId, pt->t.byteCount,
--	   pt->t.sequenceNumber));
-+	   ptt->objectId, ptt->chunkId, ptt->byteCount,
-+	   ptt->sequenceNumber));
-+}
-+static void yaffs_DumpPackedTags2(const yaffs_PackedTags2 *pt)
-+{
-+	yaffs_DumpPackedTags2TagsPart(&pt->t);
- }
- 
--static void yaffs_DumpTags2(const yaffs_ExtendedTags * t)
-+static void yaffs_DumpTags2(const yaffs_ExtendedTags *t)
- {
- 	T(YAFFS_TRACE_MTD,
- 	  (TSTR
--	   ("ext.tags eccres %d blkbad %d chused %d obj %d chunk%d byte "
--	    "%d del %d ser %d seq %d"
-+	   ("ext.tags eccres %d blkbad %d chused %d obj %d chunk%d byte %d del %d ser %d seq %d"
- 	    TENDSTR), t->eccResult, t->blockBad, t->chunkUsed, t->objectId,
- 	   t->chunkId, t->byteCount, t->chunkDeleted, t->serialNumber,
- 	   t->sequenceNumber));
- 
- }
- 
--void yaffs_PackTags2(yaffs_PackedTags2 * pt, const yaffs_ExtendedTags * t)
-+void yaffs_PackTags2TagsPart(yaffs_PackedTags2TagsPart *ptt,
-+		const yaffs_ExtendedTags *t)
- {
--	pt->t.chunkId = t->chunkId;
--	pt->t.sequenceNumber = t->sequenceNumber;
--	pt->t.byteCount = t->byteCount;
--	pt->t.objectId = t->objectId;
-+	ptt->chunkId = t->chunkId;
-+	ptt->sequenceNumber = t->sequenceNumber;
-+	ptt->byteCount = t->byteCount;
-+	ptt->objectId = t->objectId;
- 
- 	if (t->chunkId == 0 && t->extraHeaderInfoAvailable) {
- 		/* Store the extra header info instead */
- 		/* We save the parent object in the chunkId */
--		pt->t.chunkId = EXTRA_HEADER_INFO_FLAG
-+		ptt->chunkId = EXTRA_HEADER_INFO_FLAG
- 			| t->extraParentObjectId;
--		if (t->extraIsShrinkHeader) {
--			pt->t.chunkId |= EXTRA_SHRINK_FLAG;
--		}
--		if (t->extraShadows) {
--			pt->t.chunkId |= EXTRA_SHADOWS_FLAG;
--		}
-+		if (t->extraIsShrinkHeader)
-+			ptt->chunkId |= EXTRA_SHRINK_FLAG;
-+		if (t->extraShadows)
-+			ptt->chunkId |= EXTRA_SHADOWS_FLAG;
- 
--		pt->t.objectId &= ~EXTRA_OBJECT_TYPE_MASK;
--		pt->t.objectId |=
-+		ptt->objectId &= ~EXTRA_OBJECT_TYPE_MASK;
-+		ptt->objectId |=
- 		    (t->extraObjectType << EXTRA_OBJECT_TYPE_SHIFT);
- 
--		if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK) {
--			pt->t.byteCount = t->extraEquivalentObjectId;
--		} else if (t->extraObjectType == YAFFS_OBJECT_TYPE_FILE) {
--			pt->t.byteCount = t->extraFileLength;
--		} else {
--			pt->t.byteCount = 0;
--		}
-+		if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK)
-+			ptt->byteCount = t->extraEquivalentObjectId;
-+		else if (t->extraObjectType == YAFFS_OBJECT_TYPE_FILE)
-+			ptt->byteCount = t->extraFileLength;
-+		else
-+			ptt->byteCount = 0;
- 	}
- 
--	yaffs_DumpPackedTags2(pt);
-+	yaffs_DumpPackedTags2TagsPart(ptt);
- 	yaffs_DumpTags2(t);
-+}
-+
-+
-+void yaffs_PackTags2(yaffs_PackedTags2 *pt, const yaffs_ExtendedTags *t)
-+{
-+	yaffs_PackTags2TagsPart(&pt->t, t);
- 
- #ifndef YAFFS_IGNORE_TAGS_ECC
- 	{
-@@ -101,82 +109,98 @@ void yaffs_PackTags2(yaffs_PackedTags2 *
- #endif
- }
- 
--void yaffs_UnpackTags2(yaffs_ExtendedTags * t, yaffs_PackedTags2 * pt)
-+
-+void yaffs_UnpackTags2TagsPart(yaffs_ExtendedTags *t,
-+		yaffs_PackedTags2TagsPart *ptt)
- {
- 
- 	memset(t, 0, sizeof(yaffs_ExtendedTags));
- 
- 	yaffs_InitialiseTags(t);
- 
--	if (pt->t.sequenceNumber != 0xFFFFFFFF) {
--		/* Page is in use */
--#ifdef YAFFS_IGNORE_TAGS_ECC
--		{
--			t->eccResult = YAFFS_ECC_RESULT_NO_ERROR;
--		}
--#else
--		{
--			yaffs_ECCOther ecc;
--			int result;
--			yaffs_ECCCalculateOther((unsigned char *)&pt->t,
--						sizeof
--						(yaffs_PackedTags2TagsPart),
--						&ecc);
--			result =
--			    yaffs_ECCCorrectOther((unsigned char *)&pt->t,
--						  sizeof
--						  (yaffs_PackedTags2TagsPart),
--						  &pt->ecc, &ecc);
--			switch(result){
--				case 0:
--					t->eccResult = YAFFS_ECC_RESULT_NO_ERROR;
--					break;
--				case 1:
--					t->eccResult = YAFFS_ECC_RESULT_FIXED;
--					break;
--				case -1:
--					t->eccResult = YAFFS_ECC_RESULT_UNFIXED;
--					break;
--				default:
--					t->eccResult = YAFFS_ECC_RESULT_UNKNOWN;
--			}
--		}
--#endif
-+	if (ptt->sequenceNumber != 0xFFFFFFFF) {
- 		t->blockBad = 0;
- 		t->chunkUsed = 1;
--		t->objectId = pt->t.objectId;
--		t->chunkId = pt->t.chunkId;
--		t->byteCount = pt->t.byteCount;
-+		t->objectId = ptt->objectId;
-+		t->chunkId = ptt->chunkId;
-+		t->byteCount = ptt->byteCount;
- 		t->chunkDeleted = 0;
- 		t->serialNumber = 0;
--		t->sequenceNumber = pt->t.sequenceNumber;
-+		t->sequenceNumber = ptt->sequenceNumber;
- 
- 		/* Do extra header info stuff */
- 
--		if (pt->t.chunkId & EXTRA_HEADER_INFO_FLAG) {
-+		if (ptt->chunkId & EXTRA_HEADER_INFO_FLAG) {
- 			t->chunkId = 0;
- 			t->byteCount = 0;
- 
- 			t->extraHeaderInfoAvailable = 1;
- 			t->extraParentObjectId =
--			    pt->t.chunkId & (~(ALL_EXTRA_FLAGS));
-+			    ptt->chunkId & (~(ALL_EXTRA_FLAGS));
- 			t->extraIsShrinkHeader =
--			    (pt->t.chunkId & EXTRA_SHRINK_FLAG) ? 1 : 0;
-+			    (ptt->chunkId & EXTRA_SHRINK_FLAG) ? 1 : 0;
- 			t->extraShadows =
--			    (pt->t.chunkId & EXTRA_SHADOWS_FLAG) ? 1 : 0;
-+			    (ptt->chunkId & EXTRA_SHADOWS_FLAG) ? 1 : 0;
- 			t->extraObjectType =
--			    pt->t.objectId >> EXTRA_OBJECT_TYPE_SHIFT;
-+			    ptt->objectId >> EXTRA_OBJECT_TYPE_SHIFT;
- 			t->objectId &= ~EXTRA_OBJECT_TYPE_MASK;
- 
--			if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK) {
--				t->extraEquivalentObjectId = pt->t.byteCount;
--			} else {
--				t->extraFileLength = pt->t.byteCount;
-+			if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK)
-+				t->extraEquivalentObjectId = ptt->byteCount;
-+			else
-+				t->extraFileLength = ptt->byteCount;
-+		}
-+	}
-+
-+	yaffs_DumpPackedTags2TagsPart(ptt);
-+	yaffs_DumpTags2(t);
-+
-+}
-+
-+
-+void yaffs_UnpackTags2(yaffs_ExtendedTags *t, yaffs_PackedTags2 *pt)
-+{
-+
-+	yaffs_ECCResult eccResult = YAFFS_ECC_RESULT_NO_ERROR;
-+
-+	if (pt->t.sequenceNumber != 0xFFFFFFFF) {
-+		/* Page is in use */
-+#ifndef YAFFS_IGNORE_TAGS_ECC
-+		{
-+			yaffs_ECCOther ecc;
-+			int result;
-+			yaffs_ECCCalculateOther((unsigned char *)&pt->t,
-+						sizeof
-+						(yaffs_PackedTags2TagsPart),
-+						&ecc);
-+			result =
-+			    yaffs_ECCCorrectOther((unsigned char *)&pt->t,
-+						  sizeof
-+						  (yaffs_PackedTags2TagsPart),
-+						  &pt->ecc, &ecc);
-+			switch (result) {
-+			case 0:
-+				eccResult = YAFFS_ECC_RESULT_NO_ERROR;
-+				break;
-+			case 1:
-+				eccResult = YAFFS_ECC_RESULT_FIXED;
-+				break;
-+			case -1:
-+				eccResult = YAFFS_ECC_RESULT_UNFIXED;
-+				break;
-+			default:
-+				eccResult = YAFFS_ECC_RESULT_UNKNOWN;
- 			}
- 		}
-+#endif
- 	}
- 
-+	yaffs_UnpackTags2TagsPart(t, &pt->t);
-+
-+	t->eccResult = eccResult;
-+
- 	yaffs_DumpPackedTags2(pt);
- 	yaffs_DumpTags2(t);
- 
- }
-+
---- a/fs/yaffs2/yaffs_packedtags2.h
-+++ b/fs/yaffs2/yaffs_packedtags2.h
-@@ -33,6 +33,11 @@ typedef struct {
- 	yaffs_ECCOther ecc;
- } yaffs_PackedTags2;
- 
--void yaffs_PackTags2(yaffs_PackedTags2 * pt, const yaffs_ExtendedTags * t);
--void yaffs_UnpackTags2(yaffs_ExtendedTags * t, yaffs_PackedTags2 * pt);
-+/* Full packed tags with ECC, used for oob tags */
-+void yaffs_PackTags2(yaffs_PackedTags2 *pt, const yaffs_ExtendedTags *t);
-+void yaffs_UnpackTags2(yaffs_ExtendedTags *t, yaffs_PackedTags2 *pt);
-+
-+/* Only the tags part (no ECC for use with inband tags */
-+void yaffs_PackTags2TagsPart(yaffs_PackedTags2TagsPart *pt, const yaffs_ExtendedTags *t);
-+void yaffs_UnpackTags2TagsPart(yaffs_ExtendedTags *t, yaffs_PackedTags2TagsPart *pt);
- #endif
---- a/fs/yaffs2/yaffs_qsort.c
-+++ b/fs/yaffs2/yaffs_qsort.c
-@@ -28,12 +28,12 @@
-  */
- 
- #include "yportenv.h"
--//#include <linux/string.h>
-+/* #include <linux/string.h> */
- 
- /*
-  * Qsort routine from Bentley & McIlroy's "Engineering a Sort Function".
-  */
--#define swapcode(TYPE, parmi, parmj, n) { 		\
-+#define swapcode(TYPE, parmi, parmj, n) do { 		\
- 	long i = (n) / sizeof (TYPE); 			\
- 	register TYPE *pi = (TYPE *) (parmi); 		\
- 	register TYPE *pj = (TYPE *) (parmj); 		\
-@@ -41,28 +41,29 @@
- 		register TYPE	t = *pi;		\
- 		*pi++ = *pj;				\
- 		*pj++ = t;				\
--        } while (--i > 0);				\
--}
-+	} while (--i > 0);				\
-+} while (0)
- 
- #define SWAPINIT(a, es) swaptype = ((char *)a - (char *)0) % sizeof(long) || \
--	es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1;
-+	es % sizeof(long) ? 2 : es == sizeof(long) ? 0 : 1;
- 
- static __inline void
- swapfunc(char *a, char *b, int n, int swaptype)
- {
- 	if (swaptype <= 1)
--		swapcode(long, a, b, n)
-+		swapcode(long, a, b, n);
- 	else
--		swapcode(char, a, b, n)
-+		swapcode(char, a, b, n);
- }
- 
--#define swap(a, b)					\
-+#define yswap(a, b) do {					\
- 	if (swaptype == 0) {				\
- 		long t = *(long *)(a);			\
- 		*(long *)(a) = *(long *)(b);		\
- 		*(long *)(b) = t;			\
- 	} else						\
--		swapfunc(a, b, es, swaptype)
-+		swapfunc(a, b, es, swaptype);		\
-+} while (0)
- 
- #define vecswap(a, b, n) 	if ((n) > 0) swapfunc(a, b, n, swaptype)
- 
-@@ -70,12 +71,12 @@ static __inline char *
- med3(char *a, char *b, char *c, int (*cmp)(const void *, const void *))
- {
- 	return cmp(a, b) < 0 ?
--	       (cmp(b, c) < 0 ? b : (cmp(a, c) < 0 ? c : a ))
--              :(cmp(b, c) > 0 ? b : (cmp(a, c) < 0 ? a : c ));
-+		(cmp(b, c) < 0 ? b : (cmp(a, c) < 0 ? c : a))
-+		: (cmp(b, c) > 0 ? b : (cmp(a, c) < 0 ? a : c));
- }
- 
- #ifndef min
--#define min(a,b) (((a) < (b)) ? (a) : (b))
-+#define min(a, b) (((a) < (b)) ? (a) : (b))
- #endif
- 
- void
-@@ -92,7 +93,7 @@ loop:	SWAPINIT(a, es);
- 		for (pm = (char *)a + es; pm < (char *) a + n * es; pm += es)
- 			for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
- 			     pl -= es)
--				swap(pl, pl - es);
-+				yswap(pl, pl - es);
- 		return;
- 	}
- 	pm = (char *)a + (n / 2) * es;
-@@ -107,7 +108,7 @@ loop:	SWAPINIT(a, es);
- 		}
- 		pm = med3(pl, pm, pn, cmp);
- 	}
--	swap(a, pm);
-+	yswap(a, pm);
- 	pa = pb = (char *)a + es;
- 
- 	pc = pd = (char *)a + (n - 1) * es;
-@@ -115,7 +116,7 @@ loop:	SWAPINIT(a, es);
- 		while (pb <= pc && (r = cmp(pb, a)) <= 0) {
- 			if (r == 0) {
- 				swap_cnt = 1;
--				swap(pa, pb);
-+				yswap(pa, pb);
- 				pa += es;
- 			}
- 			pb += es;
-@@ -123,14 +124,14 @@ loop:	SWAPINIT(a, es);
- 		while (pb <= pc && (r = cmp(pc, a)) >= 0) {
- 			if (r == 0) {
- 				swap_cnt = 1;
--				swap(pc, pd);
-+				yswap(pc, pd);
- 				pd -= es;
- 			}
- 			pc -= es;
- 		}
- 		if (pb > pc)
- 			break;
--		swap(pb, pc);
-+		yswap(pb, pc);
- 		swap_cnt = 1;
- 		pb += es;
- 		pc -= es;
-@@ -139,7 +140,7 @@ loop:	SWAPINIT(a, es);
- 		for (pm = (char *) a + es; pm < (char *) a + n * es; pm += es)
- 			for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
- 			     pl -= es)
--				swap(pl, pl - es);
-+				yswap(pl, pl - es);
- 		return;
- 	}
- 
-@@ -148,9 +149,11 @@ loop:	SWAPINIT(a, es);
- 	vecswap(a, pb - r, r);
- 	r = min((long)(pd - pc), (long)(pn - pd - es));
- 	vecswap(pb, pn - r, r);
--	if ((r = pb - pa) > es)
-+	r = pb - pa;
-+	if (r > es)
- 		yaffs_qsort(a, r / es, es, cmp);
--	if ((r = pd - pc) > es) {
-+	r = pd - pc;
-+	if (r > es) {
- 		/* Iterate rather than recurse to save stack space */
- 		a = pn - r;
- 		n = r / es;
---- a/fs/yaffs2/yaffs_qsort.h
-+++ b/fs/yaffs2/yaffs_qsort.h
-@@ -17,7 +17,7 @@
- #ifndef __YAFFS_QSORT_H__
- #define __YAFFS_QSORT_H__
- 
--extern void yaffs_qsort (void *const base, size_t total_elems, size_t size,
--                   int (*cmp)(const void *, const void *));
-+extern void yaffs_qsort(void *const base, size_t total_elems, size_t size,
-+			int (*cmp)(const void *, const void *));
- 
- #endif
---- a/fs/yaffs2/yaffs_tagscompat.c
-+++ b/fs/yaffs2/yaffs_tagscompat.c
-@@ -14,16 +14,17 @@
- #include "yaffs_guts.h"
- #include "yaffs_tagscompat.h"
- #include "yaffs_ecc.h"
-+#include "yaffs_getblockinfo.h"
- 
--static void yaffs_HandleReadDataError(yaffs_Device * dev, int chunkInNAND);
-+static void yaffs_HandleReadDataError(yaffs_Device *dev, int chunkInNAND);
- #ifdef NOTYET
--static void yaffs_CheckWrittenBlock(yaffs_Device * dev, int chunkInNAND);
--static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
--				     const __u8 * data,
--				     const yaffs_Spare * spare);
--static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
--				    const yaffs_Spare * spare);
--static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND);
-+static void yaffs_CheckWrittenBlock(yaffs_Device *dev, int chunkInNAND);
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+				     const __u8 *data,
-+				     const yaffs_Spare *spare);
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+				    const yaffs_Spare *spare);
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND);
- #endif
- 
- static const char yaffs_countBitsTable[256] = {
-@@ -54,13 +55,13 @@ int yaffs_CountBits(__u8 x)
- 
- /********** Tags ECC calculations  *********/
- 
--void yaffs_CalcECC(const __u8 * data, yaffs_Spare * spare)
-+void yaffs_CalcECC(const __u8 *data, yaffs_Spare *spare)
- {
- 	yaffs_ECCCalculate(data, spare->ecc1);
- 	yaffs_ECCCalculate(&data[256], spare->ecc2);
- }
- 
--void yaffs_CalcTagsECC(yaffs_Tags * tags)
-+void yaffs_CalcTagsECC(yaffs_Tags *tags)
- {
- 	/* Calculate an ecc */
- 
-@@ -74,9 +75,8 @@ void yaffs_CalcTagsECC(yaffs_Tags * tags
- 	for (i = 0; i < 8; i++) {
- 		for (j = 1; j & 0xff; j <<= 1) {
- 			bit++;
--			if (b[i] & j) {
-+			if (b[i] & j)
- 				ecc ^= bit;
--			}
- 		}
- 	}
- 
-@@ -84,7 +84,7 @@ void yaffs_CalcTagsECC(yaffs_Tags * tags
- 
- }
- 
--int yaffs_CheckECCOnTags(yaffs_Tags * tags)
-+int yaffs_CheckECCOnTags(yaffs_Tags *tags)
- {
- 	unsigned ecc = tags->ecc;
- 
-@@ -115,8 +115,8 @@ int yaffs_CheckECCOnTags(yaffs_Tags * ta
- 
- /********** Tags **********/
- 
--static void yaffs_LoadTagsIntoSpare(yaffs_Spare * sparePtr,
--				    yaffs_Tags * tagsPtr)
-+static void yaffs_LoadTagsIntoSpare(yaffs_Spare *sparePtr,
-+				yaffs_Tags *tagsPtr)
- {
- 	yaffs_TagsUnion *tu = (yaffs_TagsUnion *) tagsPtr;
- 
-@@ -132,8 +132,8 @@ static void yaffs_LoadTagsIntoSpare(yaff
- 	sparePtr->tagByte7 = tu->asBytes[7];
- }
- 
--static void yaffs_GetTagsFromSpare(yaffs_Device * dev, yaffs_Spare * sparePtr,
--				   yaffs_Tags * tagsPtr)
-+static void yaffs_GetTagsFromSpare(yaffs_Device *dev, yaffs_Spare *sparePtr,
-+				yaffs_Tags *tagsPtr)
- {
- 	yaffs_TagsUnion *tu = (yaffs_TagsUnion *) tagsPtr;
- 	int result;
-@@ -148,21 +148,20 @@ static void yaffs_GetTagsFromSpare(yaffs
- 	tu->asBytes[7] = sparePtr->tagByte7;
- 
- 	result = yaffs_CheckECCOnTags(tagsPtr);
--	if (result > 0) {
-+	if (result > 0)
- 		dev->tagsEccFixed++;
--	} else if (result < 0) {
-+	else if (result < 0)
- 		dev->tagsEccUnfixed++;
--	}
- }
- 
--static void yaffs_SpareInitialise(yaffs_Spare * spare)
-+static void yaffs_SpareInitialise(yaffs_Spare *spare)
- {
- 	memset(spare, 0xFF, sizeof(yaffs_Spare));
- }
- 
- static int yaffs_WriteChunkToNAND(struct yaffs_DeviceStruct *dev,
--				  int chunkInNAND, const __u8 * data,
--				  yaffs_Spare * spare)
-+				int chunkInNAND, const __u8 *data,
-+				yaffs_Spare *spare)
- {
- 	if (chunkInNAND < dev->startBlock * dev->nChunksPerBlock) {
- 		T(YAFFS_TRACE_ERROR,
-@@ -177,9 +176,9 @@ static int yaffs_WriteChunkToNAND(struct
- 
- static int yaffs_ReadChunkFromNAND(struct yaffs_DeviceStruct *dev,
- 				   int chunkInNAND,
--				   __u8 * data,
--				   yaffs_Spare * spare,
--				   yaffs_ECCResult * eccResult,
-+				   __u8 *data,
-+				   yaffs_Spare *spare,
-+				   yaffs_ECCResult *eccResult,
- 				   int doErrorCorrection)
- {
- 	int retVal;
-@@ -252,9 +251,11 @@ static int yaffs_ReadChunkFromNAND(struc
- 		/* Must allocate enough memory for spare+2*sizeof(int) */
- 		/* for ecc results from device. */
- 		struct yaffs_NANDSpare nspare;
--		retVal =
--		    dev->readChunkFromNAND(dev, chunkInNAND, data,
--					   (yaffs_Spare *) & nspare);
-+
-+		memset(&nspare, 0, sizeof(nspare));
-+
-+		retVal = dev->readChunkFromNAND(dev, chunkInNAND, data,
-+					(yaffs_Spare *) &nspare);
- 		memcpy(spare, &nspare, sizeof(yaffs_Spare));
- 		if (data && doErrorCorrection) {
- 			if (nspare.eccres1 > 0) {
-@@ -302,8 +303,7 @@ static int yaffs_ReadChunkFromNAND(struc
- static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
- 				  int chunkInNAND)
- {
--
--	static int init = 0;
-+	static int init;
- 	static __u8 cmpbuf[YAFFS_BYTES_PER_CHUNK];
- 	static __u8 data[YAFFS_BYTES_PER_CHUNK];
- 	/* Might as well always allocate the larger size for */
-@@ -331,12 +331,12 @@ static int yaffs_CheckChunkErased(struct
-  * Functions for robustisizing
-  */
- 
--static void yaffs_HandleReadDataError(yaffs_Device * dev, int chunkInNAND)
-+static void yaffs_HandleReadDataError(yaffs_Device *dev, int chunkInNAND)
- {
- 	int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
- 
- 	/* Mark the block for retirement */
--	yaffs_GetBlockInfo(dev, blockInNAND)->needsRetiring = 1;
-+	yaffs_GetBlockInfo(dev, blockInNAND + dev->blockOffset)->needsRetiring = 1;
- 	T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
- 	  (TSTR("**>>Block %d marked for retirement" TENDSTR), blockInNAND));
- 
-@@ -348,22 +348,22 @@ static void yaffs_HandleReadDataError(ya
- }
- 
- #ifdef NOTYET
--static void yaffs_CheckWrittenBlock(yaffs_Device * dev, int chunkInNAND)
-+static void yaffs_CheckWrittenBlock(yaffs_Device *dev, int chunkInNAND)
- {
- }
- 
--static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
--				     const __u8 * data,
--				     const yaffs_Spare * spare)
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+				     const __u8 *data,
-+				     const yaffs_Spare *spare)
- {
- }
- 
--static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
--				    const yaffs_Spare * spare)
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+				    const yaffs_Spare *spare)
- {
- }
- 
--static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND)
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND)
- {
- 	int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
- 
-@@ -373,8 +373,8 @@ static void yaffs_HandleWriteChunkError(
- 	yaffs_DeleteChunk(dev, chunkInNAND, 1, __LINE__);
- }
- 
--static int yaffs_VerifyCompare(const __u8 * d0, const __u8 * d1,
--			       const yaffs_Spare * s0, const yaffs_Spare * s1)
-+static int yaffs_VerifyCompare(const __u8 *d0, const __u8 *d1,
-+			       const yaffs_Spare *s0, const yaffs_Spare *s1)
- {
- 
- 	if (memcmp(d0, d1, YAFFS_BYTES_PER_CHUNK) != 0 ||
-@@ -398,28 +398,35 @@ static int yaffs_VerifyCompare(const __u
- }
- #endif				/* NOTYET */
- 
--int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device * dev,
--						    int chunkInNAND,
--						    const __u8 * data,
--						    const yaffs_ExtendedTags *
--						    eTags)
-+int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device *dev,
-+						int chunkInNAND,
-+						const __u8 *data,
-+						const yaffs_ExtendedTags *eTags)
- {
- 	yaffs_Spare spare;
- 	yaffs_Tags tags;
- 
- 	yaffs_SpareInitialise(&spare);
- 
--	if (eTags->chunkDeleted) {
-+	if (eTags->chunkDeleted)
- 		spare.pageStatus = 0;
--	} else {
-+	else {
- 		tags.objectId = eTags->objectId;
- 		tags.chunkId = eTags->chunkId;
--		tags.byteCount = eTags->byteCount;
-+
-+		tags.byteCountLSB = eTags->byteCount & 0x3ff;
-+
-+		if (dev->nDataBytesPerChunk >= 1024)
-+			tags.byteCountMSB = (eTags->byteCount >> 10) & 3;
-+		else
-+			tags.byteCountMSB = 3;
-+
-+
- 		tags.serialNumber = eTags->serialNumber;
- 
--		if (!dev->useNANDECC && data) {
-+		if (!dev->useNANDECC && data)
- 			yaffs_CalcECC(data, &spare);
--		}
-+
- 		yaffs_LoadTagsIntoSpare(&spare, &tags);
- 
- 	}
-@@ -427,15 +434,15 @@ int yaffs_TagsCompatabilityWriteChunkWit
- 	return yaffs_WriteChunkToNAND(dev, chunkInNAND, data, &spare);
- }
- 
--int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device * dev,
-+int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device *dev,
- 						     int chunkInNAND,
--						     __u8 * data,
--						     yaffs_ExtendedTags * eTags)
-+						     __u8 *data,
-+						     yaffs_ExtendedTags *eTags)
- {
- 
- 	yaffs_Spare spare;
- 	yaffs_Tags tags;
--	yaffs_ECCResult eccResult;
-+	yaffs_ECCResult eccResult = YAFFS_ECC_RESULT_UNKNOWN;
- 
- 	static yaffs_Spare spareFF;
- 	static int init;
-@@ -466,7 +473,11 @@ int yaffs_TagsCompatabilityReadChunkWith
- 
- 				eTags->objectId = tags.objectId;
- 				eTags->chunkId = tags.chunkId;
--				eTags->byteCount = tags.byteCount;
-+				eTags->byteCount = tags.byteCountLSB;
-+
-+				if (dev->nDataBytesPerChunk >= 1024)
-+					eTags->byteCount |= (((unsigned) tags.byteCountMSB) << 10);
-+
- 				eTags->serialNumber = tags.serialNumber;
- 			}
- 		}
-@@ -497,9 +508,9 @@ int yaffs_TagsCompatabilityMarkNANDBlock
- }
- 
- int yaffs_TagsCompatabilityQueryNANDBlock(struct yaffs_DeviceStruct *dev,
--					  int blockNo, yaffs_BlockState *
--					  state,
--					  int *sequenceNumber)
-+					  int blockNo,
-+					  yaffs_BlockState *state,
-+					  __u32 *sequenceNumber)
- {
- 
- 	yaffs_Spare spare0, spare1;
---- a/fs/yaffs2/yaffs_tagscompat.h
-+++ b/fs/yaffs2/yaffs_tagscompat.h
-@@ -17,24 +17,23 @@
- #define __YAFFS_TAGSCOMPAT_H__
- 
- #include "yaffs_guts.h"
--int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device * dev,
--						    int chunkInNAND,
--						    const __u8 * data,
--						    const yaffs_ExtendedTags *
--						    tags);
--int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device * dev,
--						     int chunkInNAND,
--						     __u8 * data,
--						     yaffs_ExtendedTags *
--						     tags);
-+int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device *dev,
-+						int chunkInNAND,
-+						const __u8 *data,
-+						const yaffs_ExtendedTags *tags);
-+int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device *dev,
-+						int chunkInNAND,
-+						__u8 *data,
-+						yaffs_ExtendedTags *tags);
- int yaffs_TagsCompatabilityMarkNANDBlockBad(struct yaffs_DeviceStruct *dev,
- 					    int blockNo);
- int yaffs_TagsCompatabilityQueryNANDBlock(struct yaffs_DeviceStruct *dev,
--					  int blockNo, yaffs_BlockState *
--					  state, int *sequenceNumber);
-+					  int blockNo,
-+					  yaffs_BlockState *state,
-+					  __u32 *sequenceNumber);
- 
--void yaffs_CalcTagsECC(yaffs_Tags * tags);
--int yaffs_CheckECCOnTags(yaffs_Tags * tags);
-+void yaffs_CalcTagsECC(yaffs_Tags *tags);
-+int yaffs_CheckECCOnTags(yaffs_Tags *tags);
- int yaffs_CountBits(__u8 byte);
- 
- #endif
---- a/fs/yaffs2/yaffs_tagsvalidity.c
-+++ b/fs/yaffs2/yaffs_tagsvalidity.c
-@@ -13,14 +13,14 @@
- 
- #include "yaffs_tagsvalidity.h"
- 
--void yaffs_InitialiseTags(yaffs_ExtendedTags * tags)
-+void yaffs_InitialiseTags(yaffs_ExtendedTags *tags)
- {
- 	memset(tags, 0, sizeof(yaffs_ExtendedTags));
- 	tags->validMarker0 = 0xAAAAAAAA;
- 	tags->validMarker1 = 0x55555555;
- }
- 
--int yaffs_ValidateTags(yaffs_ExtendedTags * tags)
-+int yaffs_ValidateTags(yaffs_ExtendedTags *tags)
- {
- 	return (tags->validMarker0 == 0xAAAAAAAA &&
- 		tags->validMarker1 == 0x55555555);
---- a/fs/yaffs2/yaffs_tagsvalidity.h
-+++ b/fs/yaffs2/yaffs_tagsvalidity.h
-@@ -19,6 +19,6 @@
- 
- #include "yaffs_guts.h"
- 
--void yaffs_InitialiseTags(yaffs_ExtendedTags * tags);
--int yaffs_ValidateTags(yaffs_ExtendedTags * tags);
-+void yaffs_InitialiseTags(yaffs_ExtendedTags *tags);
-+int yaffs_ValidateTags(yaffs_ExtendedTags *tags);
- #endif
---- a/fs/yaffs2/yportenv.h
-+++ b/fs/yaffs2/yportenv.h
-@@ -17,17 +17,28 @@
- #ifndef __YPORTENV_H__
- #define __YPORTENV_H__
- 
-+/*
-+ * Define the MTD version in terms of Linux Kernel versions
-+ * This allows yaffs to be used independantly of the kernel
-+ * as well as with it.
-+ */
-+
-+#define MTD_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c))
-+
- #if defined CONFIG_YAFFS_WINCE
- 
- #include "ywinceenv.h"
- 
--#elif  defined __KERNEL__
-+#elif defined __KERNEL__
- 
- #include "moduleconfig.h"
- 
- /* Linux kernel */
-+
- #include <linux/version.h>
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
-+#define MTD_VERSION_CODE LINUX_VERSION_CODE
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
- #include <linux/config.h>
- #endif
- #include <linux/kernel.h>
-@@ -40,12 +51,13 @@
- #define YCHAR char
- #define YUCHAR unsigned char
- #define _Y(x)     x
--#define yaffs_strcpy(a,b)    strcpy(a,b)
--#define yaffs_strncpy(a,b,c) strncpy(a,b,c)
--#define yaffs_strncmp(a,b,c) strncmp(a,b,c)
--#define yaffs_strlen(s)	     strlen(s)
--#define yaffs_sprintf	     sprintf
--#define yaffs_toupper(a)     toupper(a)
-+#define yaffs_strcat(a, b)     strcat(a, b)
-+#define yaffs_strcpy(a, b)     strcpy(a, b)
-+#define yaffs_strncpy(a, b, c) strncpy(a, b, c)
-+#define yaffs_strncmp(a, b, c) strncmp(a, b, c)
-+#define yaffs_strlen(s)	       strlen(s)
-+#define yaffs_sprintf	       sprintf
-+#define yaffs_toupper(a)       toupper(a)
- 
- #define Y_INLINE inline
- 
-@@ -53,19 +65,19 @@
- #define YAFFS_LOSTNFOUND_PREFIX		"obj"
- 
- /* #define YPRINTF(x) printk x */
--#define YMALLOC(x) kmalloc(x,GFP_KERNEL)
-+#define YMALLOC(x) kmalloc(x, GFP_NOFS)
- #define YFREE(x)   kfree(x)
- #define YMALLOC_ALT(x) vmalloc(x)
- #define YFREE_ALT(x)   vfree(x)
- #define YMALLOC_DMA(x) YMALLOC(x)
- 
--// KR - added for use in scan so processes aren't blocked indefinitely.
-+/* KR - added for use in scan so processes aren't blocked indefinitely. */
- #define YYIELD() schedule()
- 
- #define YAFFS_ROOT_MODE			0666
- #define YAFFS_LOSTNFOUND_MODE		0666
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- #define Y_CURRENT_TIME CURRENT_TIME.tv_sec
- #define Y_TIME_CONVERT(x) (x).tv_sec
- #else
-@@ -73,11 +85,12 @@
- #define Y_TIME_CONVERT(x) (x)
- #endif
- 
--#define yaffs_SumCompare(x,y) ((x) == (y))
--#define yaffs_strcmp(a,b) strcmp(a,b)
-+#define yaffs_SumCompare(x, y) ((x) == (y))
-+#define yaffs_strcmp(a, b) strcmp(a, b)
- 
- #define TENDSTR "\n"
- #define TSTR(x) KERN_WARNING x
-+#define TCONT(x) x
- #define TOUT(p) printk p
- 
- #define yaffs_trace(mask, fmt, args...) \
-@@ -90,6 +103,8 @@
- 
- #elif defined CONFIG_YAFFS_DIRECT
- 
-+#define MTD_VERSION_CODE MTD_VERSION(2, 6, 22)
-+
- /* Direct interface */
- #include "ydirectenv.h"
- 
-@@ -111,11 +126,12 @@
- #define YCHAR char
- #define YUCHAR unsigned char
- #define _Y(x)     x
--#define yaffs_strcpy(a,b)    strcpy(a,b)
--#define yaffs_strncpy(a,b,c) strncpy(a,b,c)
--#define yaffs_strlen(s)	     strlen(s)
--#define yaffs_sprintf	     sprintf
--#define yaffs_toupper(a)     toupper(a)
-+#define yaffs_strcat(a, b)     strcat(a, b)
-+#define yaffs_strcpy(a, b)     strcpy(a, b)
-+#define yaffs_strncpy(a, b, c) strncpy(a, b, c)
-+#define yaffs_strlen(s)	       strlen(s)
-+#define yaffs_sprintf	       sprintf
-+#define yaffs_toupper(a)       toupper(a)
- 
- #define Y_INLINE inline
- 
-@@ -133,8 +149,8 @@
- #define YAFFS_ROOT_MODE				0666
- #define YAFFS_LOSTNFOUND_MODE		0666
- 
--#define yaffs_SumCompare(x,y) ((x) == (y))
--#define yaffs_strcmp(a,b) strcmp(a,b)
-+#define yaffs_SumCompare(x, y) ((x) == (y))
-+#define yaffs_strcmp(a, b) strcmp(a, b)
- 
- #else
- /* Should have specified a configuration type */
-@@ -178,10 +194,10 @@ extern unsigned int yaffs_wr_attempts;
- #define YAFFS_TRACE_ALWAYS		0xF0000000
- 
- 
--#define T(mask,p) do{ if((mask) & (yaffs_traceMask | YAFFS_TRACE_ALWAYS)) TOUT(p);} while(0)
-+#define T(mask, p) do { if ((mask) & (yaffs_traceMask | YAFFS_TRACE_ALWAYS)) TOUT(p); } while (0)
- 
--#ifndef CONFIG_YAFFS_WINCE
--#define YBUG() T(YAFFS_TRACE_BUG,(TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR),__LINE__))
-+#ifndef YBUG
-+#define YBUG() do {T(YAFFS_TRACE_BUG, (TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR), __LINE__)); } while (0)
- #endif
- 
- #endif
diff --git a/target/linux/generic-2.6/patches-2.6.34/600-phy_extension.patch b/target/linux/generic-2.6/patches-2.6.34/600-phy_extension.patch
deleted file mode 100644
index 966a812c0..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/600-phy_extension.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- a/drivers/net/phy/phy.c
-+++ b/drivers/net/phy/phy.c
-@@ -299,6 +299,50 @@ int phy_ethtool_gset(struct phy_device *
- }
- EXPORT_SYMBOL(phy_ethtool_gset);
- 
-+int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr)
-+{
-+	u32 cmd;
-+	int tmp;
-+	struct ethtool_cmd ecmd = { ETHTOOL_GSET };
-+	struct ethtool_value edata = { ETHTOOL_GLINK };
-+
-+	if (get_user(cmd, (u32 *) useraddr))
-+		return -EFAULT;
-+
-+	switch (cmd) {
-+	case ETHTOOL_GSET:
-+		phy_ethtool_gset(phydev, &ecmd);
-+		if (copy_to_user(useraddr, &ecmd, sizeof(ecmd)))
-+			return -EFAULT;
-+		return 0;
-+
-+	case ETHTOOL_SSET:
-+		if (copy_from_user(&ecmd, useraddr, sizeof(ecmd)))
-+			return -EFAULT;
-+		return phy_ethtool_sset(phydev, &ecmd);
-+
-+	case ETHTOOL_NWAY_RST:
-+		/* if autoneg is off, it's an error */
-+		tmp = phy_read(phydev, MII_BMCR);
-+		if (tmp & BMCR_ANENABLE) {
-+			tmp |= (BMCR_ANRESTART);
-+			phy_write(phydev, MII_BMCR, tmp);
-+			return 0;
-+		}
-+		return -EINVAL;
-+
-+	case ETHTOOL_GLINK:
-+		edata.data = (phy_read(phydev,
-+				MII_BMSR) & BMSR_LSTATUS) ? 1 : 0;
-+		if (copy_to_user(useraddr, &edata, sizeof(edata)))
-+			return -EFAULT;
-+		return 0;
-+	}
-+
-+	return -EOPNOTSUPP;
-+}
-+EXPORT_SYMBOL(phy_ethtool_ioctl);
-+
- /**
-  * phy_mii_ioctl - generic PHY MII ioctl interface
-  * @phydev: the phy_device struct
-@@ -352,7 +396,7 @@ int phy_mii_ioctl(struct phy_device *phy
- 		}
- 
- 		phy_write(phydev, mii_data->reg_num, val);
--		
-+
- 		if (mii_data->reg_num == MII_BMCR &&
- 		    val & BMCR_RESET &&
- 		    phydev->drv->config_init) {
-@@ -466,7 +510,7 @@ static void phy_force_reduction(struct p
- 	int idx;
- 
- 	idx = phy_find_setting(phydev->speed, phydev->duplex);
--	
-+
- 	idx++;
- 
- 	idx = phy_find_valid(idx, phydev->supported);
---- a/include/linux/phy.h
-+++ b/include/linux/phy.h
-@@ -491,6 +491,7 @@ void phy_start_machine(struct phy_device
- void phy_stop_machine(struct phy_device *phydev);
- int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
- int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);
-+int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr);
- int phy_mii_ioctl(struct phy_device *phydev,
- 		struct mii_ioctl_data *mii_data, int cmd);
- int phy_start_interrupts(struct phy_device *phydev);
diff --git a/target/linux/generic-2.6/patches-2.6.34/620-phy_adm6996.patch b/target/linux/generic-2.6/patches-2.6.34/620-phy_adm6996.patch
deleted file mode 100644
index b3e469a8d..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/620-phy_adm6996.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -88,6 +88,11 @@ config LSI_ET1011C_PHY
- 	---help---
- 	  Supports the LSI ET1011C PHY.
- 
-+config ADM6996_PHY
-+	tristate "Driver for ADM6996 switches"
-+	---help---
-+	  Currently supports the ADM6996F switch
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -13,6 +13,7 @@ obj-$(CONFIG_VITESSE_PHY)	+= vitesse.o
- obj-$(CONFIG_BROADCOM_PHY)	+= broadcom.o
- obj-$(CONFIG_BCM63XX_PHY)	+= bcm63xx.o
- obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
-+obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/target/linux/generic-2.6/patches-2.6.34/630-phy_packets.patch b/target/linux/generic-2.6/patches-2.6.34/630-phy_packets.patch
deleted file mode 100644
index 9c0f24aa1..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/630-phy_packets.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/drivers/net/phy/phy_device.c
-+++ b/drivers/net/phy/phy_device.c
-@@ -146,6 +146,18 @@ int phy_scan_fixups(struct phy_device *p
- }
- EXPORT_SYMBOL(phy_scan_fixups);
- 
-+static int generic_receive_skb(struct sk_buff *skb)
-+{
-+	skb->protocol = eth_type_trans(skb, skb->dev);
-+	return netif_receive_skb(skb);
-+}
-+
-+static int generic_rx(struct sk_buff *skb)
-+{
-+	skb->protocol = eth_type_trans(skb, skb->dev);
-+	return netif_rx(skb);
-+}
-+
- struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)
- {
- 	struct phy_device *dev;
-@@ -175,6 +187,8 @@ struct phy_device* phy_device_create(str
- 	dev_set_name(&dev->dev, PHY_ID_FMT, bus->id, addr);
- 
- 	dev->state = PHY_DOWN;
-+	dev->netif_receive_skb = &generic_receive_skb;
-+	dev->netif_rx = &generic_rx;
- 
- 	mutex_init(&dev->lock);
- 	INIT_DELAYED_WORK(&dev->state_queue, phy_state_machine);
---- a/include/linux/phy.h
-+++ b/include/linux/phy.h
-@@ -325,6 +325,20 @@ struct phy_device {
- 	void (*adjust_link)(struct net_device *dev);
- 
- 	void (*adjust_state)(struct net_device *dev);
-+
-+	/*
-+	 * By default these point to the original functions
-+	 * with the same name. adding them to the phy_device
-+	 * allows the phy driver to override them for packet
-+	 * mangling if the ethernet driver supports it
-+	 * This is required to support some really horrible
-+	 * switches such as the Marvell 88E6060
-+	 */
-+	int (*netif_receive_skb)(struct sk_buff *skb);
-+	int (*netif_rx)(struct sk_buff *skb);
-+
-+	/* alignment offset for packets */
-+	int pkt_align;
- };
- #define to_phy_device(d) container_of(d, struct phy_device, dev)
- 
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -844,6 +844,7 @@ struct net_device {
- 	void			*ax25_ptr;	/* AX.25 specific data */
- 	struct wireless_dev	*ieee80211_ptr;	/* IEEE 802.11 specific data,
- 						   assign before registering */
-+	void			*phy_ptr; /* PHY device specific data */
- 
- /*
-  * Cache line mostly used on receive path (including eth_type_trans())
diff --git a/target/linux/generic-2.6/patches-2.6.34/650-swconfig.patch b/target/linux/generic-2.6/patches-2.6.34/650-swconfig.patch
deleted file mode 100644
index 6825037ce..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/650-swconfig.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -13,6 +13,12 @@ menuconfig PHYLIB
- 
- if PHYLIB
- 
-+config SWCONFIG
-+	tristate "Switch configuration API"
-+	---help---
-+	  Switch configuration API using netlink. This allows
-+	  you to configure the VLAN features of certain switches.
-+
- comment "MII PHY device drivers"
- 
- config MARVELL_PHY
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -3,6 +3,7 @@
- libphy-objs			:= phy.o phy_device.o mdio_bus.o
- 
- obj-$(CONFIG_PHYLIB)		+= libphy.o
-+obj-$(CONFIG_SWCONFIG)		+= swconfig.o
- obj-$(CONFIG_MARVELL_PHY)	+= marvell.o
- obj-$(CONFIG_DAVICOM_PHY)	+= davicom.o
- obj-$(CONFIG_CICADA_PHY)	+= cicada.o
diff --git a/target/linux/generic-2.6/patches-2.6.34/651-swconfig-2.6.32-fix.patch b/target/linux/generic-2.6/patches-2.6.34/651-swconfig-2.6.32-fix.patch
deleted file mode 100644
index bc8f8fcff..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/651-swconfig-2.6.32-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/drivers/net/phy/swconfig.c
-+++ b/drivers/net/phy/swconfig.c
-@@ -335,7 +335,7 @@ swconfig_send_multipart(struct swconfig_
- 			if (cb->close(cb, arg) < 0)
- 				goto error;
- 		}
--		err = genlmsg_unicast(cb->msg, info->snd_pid);
-+		err = genlmsg_reply(cb->msg, info);
- 		cb->msg = NULL;
- 		if (err < 0)
- 			goto error;
-@@ -419,7 +419,7 @@ swconfig_list_attrs(struct sk_buff *skb,
- 	if (!cb.msg)
- 		return 0;
- 
--	return genlmsg_unicast(cb.msg, info->snd_pid);
-+	return genlmsg_reply(cb.msg, info);
- 
- error:
- 	if (cb.msg)
-@@ -728,7 +728,7 @@ swconfig_get_attr(struct sk_buff *skb, s
- 		goto nla_put_failure;
- 
- 	swconfig_put_dev(dev);
--	return genlmsg_unicast(msg, info->snd_pid);
-+	return genlmsg_reply(msg, info);
- 
- nla_put_failure:
- 	if (msg)
diff --git a/target/linux/generic-2.6/patches-2.6.34/660-phy_mvswitch.patch b/target/linux/generic-2.6/patches-2.6.34/660-phy_mvswitch.patch
deleted file mode 100644
index 36551fd57..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/660-phy_mvswitch.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -99,6 +99,9 @@ config ADM6996_PHY
- 	---help---
- 	  Currently supports the ADM6996F switch
- 
-+config MVSWITCH_PHY
-+	tristate "Driver for Marvell 88E6060 switches"
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -15,6 +15,7 @@ obj-$(CONFIG_BROADCOM_PHY)	+= broadcom.o
- obj-$(CONFIG_BCM63XX_PHY)	+= bcm63xx.o
- obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
- obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
-+obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/target/linux/generic-2.6/patches-2.6.34/670-phy_ip175c.patch b/target/linux/generic-2.6/patches-2.6.34/670-phy_ip175c.patch
deleted file mode 100644
index 862868c8d..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/670-phy_ip175c.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -102,6 +102,10 @@ config ADM6996_PHY
- config MVSWITCH_PHY
- 	tristate "Driver for Marvell 88E6060 switches"
- 
-+config IP175C_PHY
-+	tristate "Driver for IC+ IP175C/IP178C switches"
-+	select SWCONFIG
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -16,6 +16,7 @@ obj-$(CONFIG_BCM63XX_PHY)	+= bcm63xx.o
- obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
- obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
- obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
-+obj-$(CONFIG_IP175C_PHY)	+= ip175c.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/target/linux/generic-2.6/patches-2.6.34/680-phy_ar8216.patch b/target/linux/generic-2.6/patches-2.6.34/680-phy_ar8216.patch
deleted file mode 100644
index 00372aae0..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/680-phy_ar8216.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -106,6 +106,10 @@ config IP175C_PHY
- 	tristate "Driver for IC+ IP175C/IP178C switches"
- 	select SWCONFIG
- 
-+config AR8216_PHY
-+	tristate "Driver for Atheros AR8216 switches"
-+	select SWCONFIG
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -18,6 +18,7 @@ obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
- obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
- obj-$(CONFIG_IP175C_PHY)	+= ip175c.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
-+obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
- obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/target/linux/generic-2.6/patches-2.6.34/690-phy_rtl8306.patch b/target/linux/generic-2.6/patches-2.6.34/690-phy_rtl8306.patch
deleted file mode 100644
index a4793cb63..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/690-phy_rtl8306.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -110,6 +110,10 @@ config AR8216_PHY
- 	tristate "Driver for Atheros AR8216 switches"
- 	select SWCONFIG
- 
-+config RTL8306_PHY
-+	tristate "Driver for Realtek RTL8306S switches"
-+	select SWCONFIG
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -19,6 +19,7 @@ obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
- obj-$(CONFIG_IP175C_PHY)	+= ip175c.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
-+obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
- obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/target/linux/generic-2.6/patches-2.6.34/691-phy_rtl8366.patch b/target/linux/generic-2.6/patches-2.6.34/691-phy_rtl8366.patch
deleted file mode 100644
index 0963bd81b..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/691-phy_rtl8366.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -152,4 +152,29 @@ config MDIO_OCTEON
- 
- 	  If in doubt, say Y.
- 
-+config RTL8366_SMI
-+	tristate "Driver for the RTL8366 SMI interface"
-+	depends on GENERIC_GPIO
-+	---help---
-+	  This module implements the SMI interface protocol which is used
-+	  by some RTL8366 ethernet switch devices via the generic GPIO API.
-+
-+if RTL8366_SMI
-+
-+config RTL8366S_PHY
-+	tristate "Driver for the Realtek RTL8366S switch"
-+	select SWCONFIG
-+
-+config RTL8366RB_PHY
-+	tristate "Driver for the Realtek RTL8366RB switch"
-+	select SWCONFIG
-+
-+config RTL8366S_PHY_DEBUG_FS
-+	bool "RTL8366 switch driver DEBUG_FS support"
-+	depends on RTL8366S_PHY || RTL8366RB_PHY
-+	depends on DEBUG_FS
-+	default n
-+
-+endif # RTL8366_SMI
-+
- endif # PHYLIB
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -20,6 +20,9 @@ obj-$(CONFIG_IP175C_PHY)	+= ip175c.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
- obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
-+obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi.o
-+obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o
-+obj-$(CONFIG_RTL8366RB_PHY)	+= rtl8366rb.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
- obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/target/linux/generic-2.6/patches-2.6.34/700-rtc7301.patch b/target/linux/generic-2.6/patches-2.6.34/700-rtc7301.patch
deleted file mode 100644
index dae807f40..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/700-rtc7301.patch
+++ /dev/null
@@ -1,250 +0,0 @@
---- a/drivers/rtc/Kconfig
-+++ b/drivers/rtc/Kconfig
-@@ -608,6 +608,15 @@ config RTC_DRV_NUC900
- 	  If you say yes here you get support for the RTC subsystem of the
- 	  NUC910/NUC920 used in embedded systems.
- 
-+config RTC_DRV_RTC7301
-+	tristate "Epson RTC-7301 SF/DG"
-+	help
-+	  If you say Y here you will get support for the
-+	  Epson RTC-7301 SF/DG RTC chips.
-+
-+	  This driver can also be built as a module. If so, the module
-+	  will be called rtc-7301.
-+
- comment "on-CPU RTC drivers"
- 
- config RTC_DRV_OMAP
---- a/drivers/rtc/Makefile
-+++ b/drivers/rtc/Makefile
-@@ -72,6 +72,7 @@ obj-$(CONFIG_RTC_DRV_RP5C01)	+= rtc-rp5c
- obj-$(CONFIG_RTC_DRV_RS5C313)	+= rtc-rs5c313.o
- obj-$(CONFIG_RTC_DRV_RS5C348)	+= rtc-rs5c348.o
- obj-$(CONFIG_RTC_DRV_RS5C372)	+= rtc-rs5c372.o
-+obj-$(CONFIG_RTC_DRV_RTC7301)	+= rtc-rtc7301.o
- obj-$(CONFIG_RTC_DRV_RX8025)	+= rtc-rx8025.o
- obj-$(CONFIG_RTC_DRV_RX8581)	+= rtc-rx8581.o
- obj-$(CONFIG_RTC_DRV_S35390A)	+= rtc-s35390a.o
---- /dev/null
-+++ b/drivers/rtc/rtc-rtc7301.c
-@@ -0,0 +1,219 @@
-+/*
-+ * Driver for Epson RTC-7301SF/DG
-+ *
-+ * Copyright (C) 2009 Jose Vasconcellos
-+ *
-+ * 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.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/rtc.h>
-+#include <linux/platform_device.h>
-+#include <linux/io.h>
-+#include <linux/delay.h>
-+#include <linux/bcd.h>
-+
-+#define RTC_NAME "rtc7301"
-+#define RTC_VERSION "0.1"
-+
-+/* Epson RTC-7301 register addresses */
-+#define RTC7301_SEC		0x00
-+#define RTC7301_SEC10		0x01
-+#define RTC7301_MIN		0x02
-+#define RTC7301_MIN10		0x03
-+#define RTC7301_HOUR		0x04
-+#define RTC7301_HOUR10		0x05
-+#define RTC7301_WEEKDAY		0x06
-+#define RTC7301_DAY		0x07
-+#define RTC7301_DAY10		0x08
-+#define RTC7301_MON		0x09
-+#define RTC7301_MON10		0x0A
-+#define RTC7301_YEAR		0x0B
-+#define RTC7301_YEAR10		0x0C
-+#define RTC7301_YEAR100		0x0D
-+#define RTC7301_YEAR1000	0x0E
-+#define RTC7301_CTRLREG		0x0F
-+
-+static uint8_t __iomem *rtc7301_base;
-+
-+#define read_reg(offset) (readb(rtc7301_base + offset) & 0xf)
-+#define write_reg(offset, data) writeb(data, rtc7301_base + (offset))
-+
-+#define rtc7301_isbusy() (read_reg(RTC7301_CTRLREG) & 1)
-+
-+static void rtc7301_init_settings(void)
-+{
-+	int i;
-+
-+	write_reg(RTC7301_CTRLREG, 2);
-+	write_reg(RTC7301_YEAR1000, 2);
-+	udelay(122);
-+
-+	/* bank 1 */
-+	write_reg(RTC7301_CTRLREG, 6);
-+	for (i=0; i<15; i++)
-+		write_reg(i, 0);
-+
-+	/* bank 2 */
-+	write_reg(RTC7301_CTRLREG, 14);
-+	for (i=0; i<15; i++)
-+		write_reg(i, 0);
-+	write_reg(RTC7301_CTRLREG, 0);
-+}
-+
-+static int rtc7301_get_datetime(struct device *dev, struct rtc_time *dt)
-+{
-+	int cnt;
-+	uint8_t buf[16];
-+
-+	cnt = 0;
-+	while (rtc7301_isbusy()) {
-+		udelay(244);
-+		if (cnt++ > 100) {
-+			dev_err(dev, "%s: timeout error %x\n", __func__, rtc7301_base[RTC7301_CTRLREG]);
-+			return -EIO;
-+		}
-+	}
-+
-+	for (cnt=0; cnt<16; cnt++)
-+		buf[cnt] = read_reg(cnt);
-+
-+	if (buf[RTC7301_SEC10] & 8) {
-+		dev_err(dev, "%s: RTC not set\n", __func__);
-+		return -EINVAL;
-+	}
-+
-+	memset(dt, 0, sizeof(*dt));
-+
-+	dt->tm_sec =  buf[RTC7301_SEC] + buf[RTC7301_SEC10]*10;
-+	dt->tm_min =  buf[RTC7301_MIN] + buf[RTC7301_MIN10]*10;
-+	dt->tm_hour = buf[RTC7301_HOUR] + buf[RTC7301_HOUR10]*10;
-+
-+	dt->tm_mday = buf[RTC7301_DAY] + buf[RTC7301_DAY10]*10;
-+	dt->tm_mon =  buf[RTC7301_MON] + buf[RTC7301_MON10]*10 - 1;
-+	dt->tm_year = buf[RTC7301_YEAR] + buf[RTC7301_YEAR10]*10 +
-+		      buf[RTC7301_YEAR100]*100 +
-+		      ((buf[RTC7301_YEAR1000] & 3)*1000) - 1900;
-+
-+	/* the rtc device may contain illegal values on power up
-+	 * according to the data sheet. make sure they are valid.
-+	 */
-+
-+	return rtc_valid_tm(dt);
-+}
-+
-+static int rtc7301_set_datetime(struct device *dev, struct rtc_time *dt)
-+{
-+	int data;
-+
-+	data = dt->tm_year + 1900;
-+	if (data >= 2100 || data < 1900)
-+		return -EINVAL;
-+
-+	write_reg(RTC7301_CTRLREG, 2);
-+       	udelay(122);
-+
-+	data = bin2bcd(dt->tm_sec);
-+	write_reg(RTC7301_SEC, data);
-+	write_reg(RTC7301_SEC10, (data >> 4));
-+
-+	data = bin2bcd(dt->tm_min);
-+	write_reg(RTC7301_MIN, data );
-+	write_reg(RTC7301_MIN10, (data >> 4));
-+
-+	data = bin2bcd(dt->tm_hour);
-+	write_reg(RTC7301_HOUR, data);
-+	write_reg(RTC7301_HOUR10, (data >> 4));
-+
-+	data = bin2bcd(dt->tm_mday);
-+	write_reg(RTC7301_DAY, data);
-+	write_reg(RTC7301_DAY10, (data>> 4));
-+
-+	data = bin2bcd(dt->tm_mon + 1);
-+	write_reg(RTC7301_MON, data);
-+	write_reg(RTC7301_MON10, (data >> 4));
-+
-+	data = bin2bcd(dt->tm_year % 100);
-+	write_reg(RTC7301_YEAR, data);
-+	write_reg(RTC7301_YEAR10, (data >> 4));
-+	data = bin2bcd((1900 + dt->tm_year) / 100);
-+	write_reg(RTC7301_YEAR100, data);
-+
-+	data = bin2bcd(dt->tm_wday);
-+	write_reg(RTC7301_WEEKDAY, data);
-+
-+	write_reg(RTC7301_CTRLREG, 0);
-+
-+	return 0;
-+}
-+
-+static const struct rtc_class_ops rtc7301_rtc_ops = {
-+	.read_time	= rtc7301_get_datetime,
-+	.set_time	= rtc7301_set_datetime,
-+};
-+
-+static int __devinit rtc7301_probe(struct platform_device *pdev)
-+{
-+	struct rtc_device *rtc;
-+	struct resource *res;
-+
-+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if (!res)
-+		return -ENOENT;
-+
-+	rtc7301_base = ioremap_nocache(res->start, 0x1000 /*res->end - res->start + 1*/);
-+	if (!rtc7301_base)
-+		return -EINVAL;
-+
-+	rtc = rtc_device_register(RTC_NAME, &pdev->dev,
-+				&rtc7301_rtc_ops, THIS_MODULE);
-+	if (IS_ERR(rtc)) {
-+		iounmap(rtc7301_base);
-+		return PTR_ERR(rtc);
-+	}
-+
-+	platform_set_drvdata(pdev, rtc);
-+
-+	rtc7301_init_settings();
-+	return 0;
-+}
-+
-+static int __devexit rtc7301_remove(struct platform_device *pdev)
-+{
-+	struct rtc_device *rtc = platform_get_drvdata(pdev);
-+
-+	if (rtc)
-+		rtc_device_unregister(rtc);
-+	if (rtc7301_base)
-+		iounmap(rtc7301_base);
-+	return 0;
-+}
-+
-+static struct platform_driver rtc7301_driver = {
-+	.driver = {
-+		.name	= RTC_NAME,
-+		.owner	= THIS_MODULE,
-+	},
-+	.probe	= rtc7301_probe,
-+	.remove = __devexit_p(rtc7301_remove),
-+};
-+
-+static __init int rtc7301_init(void)
-+{
-+	return platform_driver_register(&rtc7301_driver);
-+}
-+module_init(rtc7301_init);
-+
-+static __exit void rtc7301_exit(void)
-+{
-+	platform_driver_unregister(&rtc7301_driver);
-+}
-+module_exit(rtc7301_exit);
-+
-+MODULE_DESCRIPTION("Epson 7301 RTC driver");
-+MODULE_AUTHOR("Jose Vasconcellos <jvasco@verizon.net>");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS("platform:" RTC_NAME);
-+MODULE_VERSION(RTC_VERSION);
diff --git a/target/linux/generic-2.6/patches-2.6.34/750-glamo-headers.patch b/target/linux/generic-2.6/patches-2.6.34/750-glamo-headers.patch
deleted file mode 100644
index 419d98a42..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/750-glamo-headers.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/include/linux/fb.h
-+++ b/include/linux/fb.h
-@@ -124,6 +124,7 @@ struct dentry;
- #define FB_ACCEL_TRIDENT_BLADE3D 52	/* Trident Blade3D		*/
- #define FB_ACCEL_TRIDENT_BLADEXP 53	/* Trident BladeXP		*/
- #define FB_ACCEL_CIRRUS_ALPINE   53	/* Cirrus Logic 543x/544x/5480	*/
-+#define FB_ACCEL_GLAMO		50	/* SMedia Glamo                 */
- #define FB_ACCEL_NEOMAGIC_NM2070 90	/* NeoMagic NM2070              */
- #define FB_ACCEL_NEOMAGIC_NM2090 91	/* NeoMagic NM2090              */
- #define FB_ACCEL_NEOMAGIC_NM2093 92	/* NeoMagic NM2093              */
---- a/include/linux/Kbuild
-+++ b/include/linux/Kbuild
-@@ -76,6 +76,8 @@ header-y += genetlink.h
- header-y += gen_stats.h
- header-y += gfs2_ondisk.h
- header-y += gigaset_dev.h
-+header-y += glamofb.h
-+header-y += glamo-engine.h
- header-y += hysdn_if.h
- header-y += i2o-dev.h
- header-y += i8k.h
diff --git a/target/linux/generic-2.6/patches-2.6.34/801-usb_serial_endpoint_size.patch b/target/linux/generic-2.6/patches-2.6.34/801-usb_serial_endpoint_size.patch
deleted file mode 100644
index e6d06456a..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/801-usb_serial_endpoint_size.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/drivers/usb/serial/usb-serial.c
-+++ b/drivers/usb/serial/usb-serial.c
-@@ -61,6 +61,7 @@ static struct usb_driver usb_serial_driv
-    drivers depend on it.
- */
- 
-+static ushort maxSize = 0;
- static int debug;
- /* initially all NULL */
- static struct usb_serial *serial_table[SERIAL_TTY_MINORS];
-@@ -914,7 +915,7 @@ int usb_serial_probe(struct usb_interfac
- 			dev_err(&interface->dev, "No free urbs available\n");
- 			goto probe_error;
- 		}
--		buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
-+		buffer_size = (endpoint->wMaxPacketSize > maxSize) ? endpoint->wMaxPacketSize : maxSize;
- 		port->bulk_in_size = buffer_size;
- 		port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
- 		port->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL);
-@@ -1356,3 +1357,5 @@ MODULE_LICENSE("GPL");
- 
- module_param(debug, bool, S_IRUGO | S_IWUSR);
- MODULE_PARM_DESC(debug, "Debug enabled or not");
-+module_param(maxSize, ushort,0);
-+MODULE_PARM_DESC(maxSize,"User specified USB endpoint size");
diff --git a/target/linux/generic-2.6/patches-2.6.34/840-unable_to_open_console.patch b/target/linux/generic-2.6/patches-2.6.34/840-unable_to_open_console.patch
deleted file mode 100644
index 8d9039676..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/840-unable_to_open_console.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/init/main.c
-+++ b/init/main.c
-@@ -807,7 +807,7 @@ static noinline int init_post(void)
- 	numa_default_policy();
- 
- 	if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
--		printk(KERN_WARNING "Warning: unable to open an initial console.\n");
-+		printk(KERN_WARNING "Please be patient, while OpenWrt loads ...\n");
- 
- 	(void) sys_dup(0);
- 	(void) sys_dup(0);
diff --git a/target/linux/generic-2.6/patches-2.6.34/902-darwin_scripts_include.patch b/target/linux/generic-2.6/patches-2.6.34/902-darwin_scripts_include.patch
deleted file mode 100644
index be31abeac..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/902-darwin_scripts_include.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- a/scripts/genksyms/parse.c_shipped
-+++ b/scripts/genksyms/parse.c_shipped
-@@ -160,7 +160,9 @@
- 
- 
- #include <assert.h>
-+#ifndef __APPLE__
- #include <malloc.h>
-+#endif
- #include "genksyms.h"
- 
- static int is_typedef;
---- a/scripts/genksyms/parse.y
-+++ b/scripts/genksyms/parse.y
-@@ -24,7 +24,9 @@
- %{
- 
- #include <assert.h>
-+#ifndef __APPLE__
- #include <malloc.h>
-+#endif
- #include "genksyms.h"
- 
- static int is_typedef;
---- a/scripts/kallsyms.c
-+++ b/scripts/kallsyms.c
-@@ -22,6 +22,35 @@
- #include <stdlib.h>
- #include <string.h>
- #include <ctype.h>
-+#ifdef __APPLE__
-+/* Darwin has no memmem implementation, this one is ripped of the uClibc-0.9.28 source */
-+void *memmem (const void *haystack, size_t haystack_len,
-+                          const void *needle,  size_t needle_len)
-+{
-+  const char *begin;
-+  const char *const last_possible
-+    = (const char *) haystack + haystack_len - needle_len;
-+
-+  if (needle_len == 0)
-+    /* The first occurrence of the empty string is deemed to occur at
-+       the beginning of the string.  */
-+    return (void *) haystack;
-+
-+  /* Sanity check, otherwise the loop might search through the whole
-+     memory.  */
-+  if (__builtin_expect (haystack_len < needle_len, 0))
-+    return NULL;
-+
-+  for (begin = (const char *) haystack; begin <= last_possible; ++begin)
-+    if (begin[0] == ((const char *) needle)[0] &&
-+        !memcmp ((const void *) &begin[1],
-+                 (const void *) ((const char *) needle + 1),
-+                 needle_len - 1))
-+      return (void *) begin;
-+
-+  return NULL;
-+}
-+#endif
- 
- #ifndef ARRAY_SIZE
- #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
---- a/scripts/kconfig/Makefile
-+++ b/scripts/kconfig/Makefile
-@@ -130,6 +130,9 @@ check-lxdialog  := $(srctree)/$(src)/lxd
- # we really need to do so. (Do not call gcc as part of make mrproper)
- HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
- HOST_LOADLIBES   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
-+ifeq ($(shell uname -s),Darwin)
-+HOST_LOADLIBES  += -lncurses
-+endif
- 
- HOST_EXTRACFLAGS += -DLOCALE
- 
---- a/scripts/mod/mk_elfconfig.c
-+++ b/scripts/mod/mk_elfconfig.c
-@@ -1,7 +1,11 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#ifndef __APPLE__
- #include <elf.h>
-+#else
-+#include "../../../../../tools/sstrip/include/elf.h"
-+#endif
- 
- int
- main(int argc, char **argv)
---- a/scripts/mod/modpost.h
-+++ b/scripts/mod/modpost.h
-@@ -7,7 +7,11 @@
- #include <sys/mman.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#if !(defined(__APPLE__) || defined(__CYGWIN__))
- #include <elf.h>
-+#else
-+#include "../../../../../tools/sstrip/include/elf.h"
-+#endif
- 
- #include "elfconfig.h"
- 
diff --git a/target/linux/generic-2.6/patches-2.6.34/903-hostap_txpower.patch b/target/linux/generic-2.6/patches-2.6.34/903-hostap_txpower.patch
deleted file mode 100644
index 7552ceb33..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/903-hostap_txpower.patch
+++ /dev/null
@@ -1,154 +0,0 @@
---- a/drivers/net/wireless/hostap/hostap_ap.c
-+++ b/drivers/net/wireless/hostap/hostap_ap.c
-@@ -2335,13 +2335,13 @@ int prism2_ap_get_sta_qual(local_info_t 
- 		addr[count].sa_family = ARPHRD_ETHER;
- 		memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
- 		if (sta->last_rx_silence == 0)
--			qual[count].qual = sta->last_rx_signal < 27 ?
--				0 : (sta->last_rx_signal - 27) * 92 / 127;
-+                        qual[count].qual = (sta->last_rx_signal - 156) == 0 ?
-+                                0 : (sta->last_rx_signal - 156) * 92 / 64;
- 		else
--			qual[count].qual = sta->last_rx_signal -
--				sta->last_rx_silence - 35;
--		qual[count].level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
--		qual[count].noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
-+                        qual[count].qual = (sta->last_rx_signal -
-+                                sta->last_rx_silence) * 92 / 64;
-+                qual[count].level = sta->last_rx_signal;
-+                qual[count].noise = sta->last_rx_silence;
- 		qual[count].updated = sta->last_rx_updated;
- 
- 		sta->last_rx_updated = IW_QUAL_DBM;
-@@ -2407,13 +2407,13 @@ int prism2_ap_translate_scan(struct net_
- 		memset(&iwe, 0, sizeof(iwe));
- 		iwe.cmd = IWEVQUAL;
- 		if (sta->last_rx_silence == 0)
--			iwe.u.qual.qual = sta->last_rx_signal < 27 ?
--				0 : (sta->last_rx_signal - 27) * 92 / 127;
-+	                iwe.u.qual.qual = (sta->last_rx_signal -156) == 0 ?
-+	                        0 : (sta->last_rx_signal - 156) * 92 / 64;
- 		else
--			iwe.u.qual.qual = sta->last_rx_signal -
--				sta->last_rx_silence - 35;
--		iwe.u.qual.level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
--		iwe.u.qual.noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
-+                        iwe.u.qual.qual = (sta->last_rx_signal -
-+                                sta->last_rx_silence) * 92 / 64;
-+                iwe.u.qual.level = sta->last_rx_signal;
-+                iwe.u.qual.noise = sta->last_rx_silence;
- 		iwe.u.qual.updated = sta->last_rx_updated;
- 		iwe.len = IW_EV_QUAL_LEN;
- 		current_ev = iwe_stream_add_event(info, current_ev, end_buf,
---- a/drivers/net/wireless/hostap/hostap_config.h
-+++ b/drivers/net/wireless/hostap/hostap_config.h
-@@ -45,4 +45,9 @@
-  */
- /* #define PRISM2_NO_STATION_MODES */
- 
-+/* Enable TX power Setting functions
-+ * (min att = -128 , max att =  127)
-+ */
-+#define RAW_TXPOWER_SETTING
-+
- #endif /* HOSTAP_CONFIG_H */
---- a/drivers/net/wireless/hostap/hostap.h
-+++ b/drivers/net/wireless/hostap/hostap.h
-@@ -90,6 +90,7 @@ extern const struct iw_handler_def hosta
- extern const struct ethtool_ops prism2_ethtool_ops;
- 
- int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
-+int hostap_restore_power(struct net_device *dev);
- 
- 
- #endif /* HOSTAP_H */
---- a/drivers/net/wireless/hostap/hostap_hw.c
-+++ b/drivers/net/wireless/hostap/hostap_hw.c
-@@ -932,6 +932,7 @@ static int hfa384x_set_rid(struct net_de
- 			prism2_hw_reset(dev);
- 	}
- 
-+	hostap_restore_power(dev);
- 	return res;
- }
- 
---- a/drivers/net/wireless/hostap/hostap_info.c
-+++ b/drivers/net/wireless/hostap/hostap_info.c
-@@ -432,6 +432,11 @@ static void handle_info_queue_linkstatus
- 	}
- 
- 	/* Get BSSID if we have a valid AP address */
-+
-+	if ( val == HFA384X_LINKSTATUS_CONNECTED ||
-+	     val == HFA384X_LINKSTATUS_DISCONNECTED )
-+			hostap_restore_power(local->dev);
-+
- 	if (connected) {
- 		netif_carrier_on(local->dev);
- 		netif_carrier_on(local->ddev);
---- a/drivers/net/wireless/hostap/hostap_ioctl.c
-+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
-@@ -1476,23 +1476,20 @@ static int prism2_txpower_hfa386x_to_dBm
- 		val = 255;
- 
- 	tmp = val;
--	tmp >>= 2;
- 
--	return -12 - tmp;
-+	return tmp;
- }
- 
- static u16 prism2_txpower_dBm_to_hfa386x(int val)
- {
- 	signed char tmp;
- 
--	if (val > 20)
--		return 128;
--	else if (val < -43)
-+	if (val > 127)
- 		return 127;
-+	else if (val < -128)
-+		return 128;
- 
- 	tmp = val;
--	tmp = -12 - tmp;
--	tmp <<= 2;
- 
- 	return (unsigned char) tmp;
- }
-@@ -4056,3 +4053,35 @@ int hostap_ioctl(struct net_device *dev,
- 
- 	return ret;
- }
-+
-+/* BUG FIX: Restore power setting value when lost due to F/W bug */
-+
-+int hostap_restore_power(struct net_device *dev)
-+{
-+        struct hostap_interface *iface = netdev_priv(dev);
-+       local_info_t *local = iface->local;
-+
-+       u16 val;
-+       int ret = 0;
-+
-+       if (local->txpower_type == PRISM2_TXPOWER_OFF) {
-+                       val = 0xff; /* use all standby and sleep modes */
-+                       ret = local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
-+                                              HFA386X_CR_A_D_TEST_MODES2,
-+                                              &val, NULL);
-+       }
-+
-+#ifdef RAW_TXPOWER_SETTING
-+       if (local->txpower_type == PRISM2_TXPOWER_FIXED) {
-+               val = HFA384X_TEST_CFG_BIT_ALC;
-+               local->func->cmd(dev, HFA384X_CMDCODE_TEST |
-+                                (HFA384X_TEST_CFG_BITS << 8), 0, &val, NULL);
-+               val = prism2_txpower_dBm_to_hfa386x(local->txpower);
-+               ret = (local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
-+                            HFA386X_CR_MANUAL_TX_POWER, &val, NULL));
-+       }
-+#endif /* RAW_TXPOWER_SETTING */
-+       return (ret ? -EOPNOTSUPP : 0);
-+}
-+
-+EXPORT_SYMBOL(hostap_restore_power);
diff --git a/target/linux/generic-2.6/patches-2.6.34/903-stddef_include.patch b/target/linux/generic-2.6/patches-2.6.34/903-stddef_include.patch
deleted file mode 100644
index 7fe248d8d..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/903-stddef_include.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/include/linux/stddef.h
-+++ b/include/linux/stddef.h
-@@ -16,6 +16,7 @@ enum {
- 	false	= 0,
- 	true	= 1
- };
-+#endif /* __KERNEL__ */
- 
- #undef offsetof
- #ifdef __compiler_offsetof
-@@ -23,6 +24,5 @@ enum {
- #else
- #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
- #endif
--#endif /* __KERNEL__ */
- 
- #endif
diff --git a/target/linux/generic-2.6/patches-2.6.34/905-i386_build.patch b/target/linux/generic-2.6/patches-2.6.34/905-i386_build.patch
deleted file mode 100644
index c701fdaa9..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/905-i386_build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/arch/x86/boot/tools/build.c
-+++ b/arch/x86/boot/tools/build.c
-@@ -29,7 +29,6 @@
- #include <stdarg.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--#include <sys/sysmacros.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/mman.h>
diff --git a/target/linux/generic-2.6/patches-2.6.34/920-01-hotpluggable-spi-gpio.patch b/target/linux/generic-2.6/patches-2.6.34/920-01-hotpluggable-spi-gpio.patch
deleted file mode 100644
index b10bc9a65..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/920-01-hotpluggable-spi-gpio.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Fix spi-gpio for hotplug.
-
---mb
-
-
-
---- a/drivers/spi/spi_gpio.c
-+++ b/drivers/spi/spi_gpio.c
-@@ -218,7 +218,7 @@ static void spi_gpio_cleanup(struct spi_
- 	spi_bitbang_cleanup(spi);
- }
- 
--static int __init spi_gpio_alloc(unsigned pin, const char *label, bool is_in)
-+static int __devinit spi_gpio_alloc(unsigned pin, const char *label, bool is_in)
- {
- 	int value;
- 
-@@ -232,7 +232,7 @@ static int __init spi_gpio_alloc(unsigne
- 	return value;
- }
- 
--static int __init
-+static int __devinit
- spi_gpio_request(struct spi_gpio_platform_data *pdata, const char *label)
- {
- 	int value;
-@@ -261,7 +261,7 @@ done:
- 	return value;
- }
- 
--static int __init spi_gpio_probe(struct platform_device *pdev)
-+static int __devinit spi_gpio_probe(struct platform_device *pdev)
- {
- 	int				status;
- 	struct spi_master		*master;
-@@ -317,7 +317,7 @@ gpio_free:
- 	return status;
- }
- 
--static int __exit spi_gpio_remove(struct platform_device *pdev)
-+static int __devexit spi_gpio_remove(struct platform_device *pdev)
- {
- 	struct spi_gpio			*spi_gpio;
- 	struct spi_gpio_platform_data	*pdata;
-@@ -344,12 +344,13 @@ MODULE_ALIAS("platform:" DRIVER_NAME);
- static struct platform_driver spi_gpio_driver = {
- 	.driver.name	= DRIVER_NAME,
- 	.driver.owner	= THIS_MODULE,
--	.remove		= __exit_p(spi_gpio_remove),
-+	.probe		= spi_gpio_probe,
-+	.remove		= __devexit_p(spi_gpio_remove),
- };
- 
- static int __init spi_gpio_init(void)
- {
--	return platform_driver_probe(&spi_gpio_driver, spi_gpio_probe);
-+	return platform_driver_register(&spi_gpio_driver);
- }
- module_init(spi_gpio_init);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.34/920-04-spi-gpio-implement-spi-delay.patch b/target/linux/generic-2.6/patches-2.6.34/920-04-spi-gpio-implement-spi-delay.patch
deleted file mode 100644
index 19032881b..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/920-04-spi-gpio-implement-spi-delay.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Implement the SPI-GPIO delay function for busses that need speed limitation.
-
---mb
-
-
-
---- a/drivers/spi/spi_gpio.c
-+++ b/drivers/spi/spi_gpio.c
-@@ -21,6 +21,7 @@
- #include <linux/init.h>
- #include <linux/platform_device.h>
- #include <linux/gpio.h>
-+#include <linux/delay.h>
- 
- #include <linux/spi/spi.h>
- #include <linux/spi/spi_bitbang.h>
-@@ -69,6 +70,7 @@ struct spi_gpio {
-  *		#define	SPI_MOSI_GPIO	120
-  *		#define	SPI_SCK_GPIO	121
-  *		#define	SPI_N_CHIPSEL	4
-+ *		#undef NEED_SPIDELAY
-  *		#include "spi_gpio.c"
-  */
- 
-@@ -76,6 +78,7 @@ struct spi_gpio {
- #define DRIVER_NAME	"spi_gpio"
- 
- #define GENERIC_BITBANG	/* vs tight inlines */
-+#define NEED_SPIDELAY	1
- 
- /* all functions referencing these symbols must define pdata */
- #define SPI_MISO_GPIO	((pdata)->miso)
-@@ -120,12 +123,20 @@ static inline int getmiso(const struct s
- #undef pdata
- 
- /*
-- * NOTE:  this clocks "as fast as we can".  It "should" be a function of the
-- * requested device clock.  Software overhead means we usually have trouble
-- * reaching even one Mbit/sec (except when we can inline bitops), so for now
-- * we'll just assume we never need additional per-bit slowdowns.
-+ * NOTE:  to clock "as fast as we can", set spi_device.max_speed_hz
-+ * and spi_transfer.speed_hz to 0.
-+ * Otherwise this is a function of the requested device clock.
-+ * Software overhead means we usually have trouble
-+ * reaching even one Mbit/sec (except when we can inline bitops). So on small
-+ * embedded devices with fast SPI slaves you usually don't need a delay.
-  */
--#define spidelay(nsecs)	do {} while (0)
-+static inline void spidelay(unsigned nsecs)
-+{
-+#ifdef NEED_SPIDELAY
-+	if (unlikely(nsecs))
-+		ndelay(nsecs);
-+#endif /* NEED_SPIDELAY */
-+}
- 
- #define	EXPAND_BITBANG_TXRX
- #include <linux/spi/spi_bitbang.h>
diff --git a/target/linux/generic-2.6/patches-2.6.34/921-gpio_spi_driver.patch b/target/linux/generic-2.6/patches-2.6.34/921-gpio_spi_driver.patch
deleted file mode 100644
index c37bb2280..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/921-gpio_spi_driver.patch
+++ /dev/null
@@ -1,366 +0,0 @@
-THIS CODE IS DEPRECATED.
-
-Please use the new mainline SPI-GPIO driver, as of 2.6.29.
-
---mb
-
-
-
---- /dev/null
-+++ b/include/linux/spi/spi_gpio_old.h
-@@ -0,0 +1,73 @@
-+/*
-+ * spi_gpio interface to platform code
-+ *
-+ * Copyright (c) 2008 Piotr Skamruk
-+ * Copyright (c) 2008 Michael Buesch
-+ *
-+ * 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 _LINUX_SPI_SPI_GPIO
-+#define _LINUX_SPI_SPI_GPIO
-+
-+#include <linux/types.h>
-+#include <linux/spi/spi.h>
-+
-+
-+/**
-+ * struct spi_gpio_platform_data - Data definitions for a SPI-GPIO device.
-+ *
-+ * This structure holds information about a GPIO-based SPI device.
-+ *
-+ * @pin_clk: The GPIO pin number of the CLOCK pin.
-+ *
-+ * @pin_miso: The GPIO pin number of the MISO pin.
-+ *
-+ * @pin_mosi: The GPIO pin number of the MOSI pin.
-+ *
-+ * @pin_cs: The GPIO pin number of the CHIPSELECT pin.
-+ *
-+ * @cs_activelow: If true, the chip is selected when the CS line is low.
-+ *
-+ * @no_spi_delay: If true, no delay is done in the lowlevel bitbanging.
-+ *                Note that doing no delay is not standards compliant,
-+ *                but it might be needed to speed up transfers on some
-+ *                slow embedded machines.
-+ *
-+ * @boardinfo_setup: This callback is called after the
-+ *                   SPI master device was registered, but before the
-+ *                   device is registered.
-+ * @boardinfo_setup_data: Data argument passed to boardinfo_setup().
-+ */
-+struct spi_gpio_platform_data {
-+	unsigned int pin_clk;
-+	unsigned int pin_miso;
-+	unsigned int pin_mosi;
-+	unsigned int pin_cs;
-+	bool cs_activelow;
-+	bool no_spi_delay;
-+	int (*boardinfo_setup)(struct spi_board_info *bi,
-+			       struct spi_master *master,
-+			       void *data);
-+	void *boardinfo_setup_data;
-+};
-+
-+/**
-+ * SPI_GPIO_PLATDEV_NAME - The platform device name string.
-+ *
-+ * The name string that has to be used for platform_device_alloc
-+ * when allocating a spi-gpio device.
-+ */
-+#define SPI_GPIO_PLATDEV_NAME	"spi-gpio"
-+
-+/**
-+ * spi_gpio_next_id - Get another platform device ID number.
-+ *
-+ * This returns the next platform device ID number that has to be used
-+ * for platform_device_alloc. The ID is opaque and should not be used for
-+ * anything else.
-+ */
-+int spi_gpio_next_id(void);
-+
-+#endif /* _LINUX_SPI_SPI_GPIO */
---- /dev/null
-+++ b/drivers/spi/spi_gpio_old.c
-@@ -0,0 +1,251 @@
-+/*
-+ * Bitbanging SPI bus driver using GPIO API
-+ *
-+ * Copyright (c) 2008 Piotr Skamruk
-+ * Copyright (c) 2008 Michael Buesch
-+ *
-+ * based on spi_s3c2410_gpio.c
-+ *   Copyright (c) 2006 Ben Dooks
-+ *   Copyright (c) 2006 Simtec Electronics
-+ * and on i2c-gpio.c
-+ *   Copyright (C) 2007 Atmel Corporation
-+ *
-+ * 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.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/delay.h>
-+#include <linux/spinlock.h>
-+#include <linux/workqueue.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/spi/spi.h>
-+#include <linux/spi/spi_bitbang.h>
-+#include <linux/spi/spi_gpio_old.h>
-+#include <linux/gpio.h>
-+#include <asm/atomic.h>
-+
-+
-+struct spi_gpio {
-+	struct spi_bitbang bitbang;
-+	struct spi_gpio_platform_data *info;
-+	struct platform_device *pdev;
-+	struct spi_board_info bi;
-+};
-+
-+
-+static inline struct spi_gpio *spidev_to_sg(struct spi_device *dev)
-+{
-+	return dev->controller_data;
-+}
-+
-+static inline void setsck(struct spi_device *dev, int val)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+	gpio_set_value(sp->info->pin_clk, val ? 1 : 0);
-+}
-+
-+static inline void setmosi(struct spi_device *dev, int val)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+	gpio_set_value(sp->info->pin_mosi, val ? 1 : 0);
-+}
-+
-+static inline u32 getmiso(struct spi_device *dev)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+	return gpio_get_value(sp->info->pin_miso) ? 1 : 0;
-+}
-+
-+static inline void do_spidelay(struct spi_device *dev, unsigned nsecs)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+
-+	if (!sp->info->no_spi_delay)
-+		ndelay(nsecs);
-+}
-+
-+#define spidelay(nsecs) do {					\
-+	/* Steal the spi_device pointer from our caller.	\
-+	 * The bitbang-API should probably get fixed here... */	\
-+	do_spidelay(spi, nsecs);				\
-+  } while (0)
-+
-+#define EXPAND_BITBANG_TXRX
-+#include <linux/spi/spi_bitbang.h>
-+
-+static u32 spi_gpio_txrx_mode0(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha0(spi, nsecs, 0, word, bits);
-+}
-+
-+static u32 spi_gpio_txrx_mode1(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha1(spi, nsecs, 0, word, bits);
-+}
-+
-+static u32 spi_gpio_txrx_mode2(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha0(spi, nsecs, 1, word, bits);
-+}
-+
-+static u32 spi_gpio_txrx_mode3(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha1(spi, nsecs, 1, word, bits);
-+}
-+
-+static void spi_gpio_chipselect(struct spi_device *dev, int on)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+
-+	if (sp->info->cs_activelow)
-+		on = !on;
-+	gpio_set_value(sp->info->pin_cs, on ? 1 : 0);
-+}
-+
-+static int spi_gpio_probe(struct platform_device *pdev)
-+{
-+	struct spi_master *master;
-+	struct spi_gpio_platform_data *pdata;
-+	struct spi_gpio *sp;
-+	struct spi_device *spidev;
-+	int err;
-+
-+	pdata = pdev->dev.platform_data;
-+	if (!pdata)
-+		return -ENXIO;
-+
-+	err = -ENOMEM;
-+	master = spi_alloc_master(&pdev->dev, sizeof(struct spi_gpio));
-+	if (!master)
-+		goto err_alloc_master;
-+
-+	sp = spi_master_get_devdata(master);
-+	platform_set_drvdata(pdev, sp);
-+	sp->info = pdata;
-+
-+	err = gpio_request(pdata->pin_clk, "spi_clock");
-+	if (err)
-+		goto err_request_clk;
-+	err = gpio_request(pdata->pin_mosi, "spi_mosi");
-+	if (err)
-+		goto err_request_mosi;
-+	err = gpio_request(pdata->pin_miso, "spi_miso");
-+	if (err)
-+		goto err_request_miso;
-+	err = gpio_request(pdata->pin_cs, "spi_cs");
-+	if (err)
-+		goto err_request_cs;
-+
-+	sp->bitbang.master = spi_master_get(master);
-+	sp->bitbang.master->bus_num = -1;
-+	sp->bitbang.master->num_chipselect = 1;
-+	sp->bitbang.chipselect = spi_gpio_chipselect;
-+	sp->bitbang.txrx_word[SPI_MODE_0] = spi_gpio_txrx_mode0;
-+	sp->bitbang.txrx_word[SPI_MODE_1] = spi_gpio_txrx_mode1;
-+	sp->bitbang.txrx_word[SPI_MODE_2] = spi_gpio_txrx_mode2;
-+	sp->bitbang.txrx_word[SPI_MODE_3] = spi_gpio_txrx_mode3;
-+
-+	gpio_direction_output(pdata->pin_clk, 0);
-+	gpio_direction_output(pdata->pin_mosi, 0);
-+	gpio_direction_output(pdata->pin_cs,
-+			      pdata->cs_activelow ? 1 : 0);
-+	gpio_direction_input(pdata->pin_miso);
-+
-+	err = spi_bitbang_start(&sp->bitbang);
-+	if (err)
-+		goto err_no_bitbang;
-+	err = pdata->boardinfo_setup(&sp->bi, master,
-+				     pdata->boardinfo_setup_data);
-+	if (err)
-+		goto err_bi_setup;
-+	sp->bi.controller_data = sp;
-+	spidev = spi_new_device(master, &sp->bi);
-+	if (!spidev)
-+		goto err_new_dev;
-+
-+	return 0;
-+
-+err_new_dev:
-+err_bi_setup:
-+	spi_bitbang_stop(&sp->bitbang);
-+err_no_bitbang:
-+	spi_master_put(sp->bitbang.master);
-+	gpio_free(pdata->pin_cs);
-+err_request_cs:
-+	gpio_free(pdata->pin_miso);
-+err_request_miso:
-+	gpio_free(pdata->pin_mosi);
-+err_request_mosi:
-+	gpio_free(pdata->pin_clk);
-+err_request_clk:
-+	kfree(master);
-+
-+err_alloc_master:
-+	return err;
-+}
-+
-+static int __devexit spi_gpio_remove(struct platform_device *pdev)
-+{
-+	struct spi_gpio *sp;
-+	struct spi_gpio_platform_data *pdata;
-+
-+	pdata = pdev->dev.platform_data;
-+	sp = platform_get_drvdata(pdev);
-+
-+	gpio_free(pdata->pin_clk);
-+	gpio_free(pdata->pin_mosi);
-+	gpio_free(pdata->pin_miso);
-+	gpio_free(pdata->pin_cs);
-+	spi_bitbang_stop(&sp->bitbang);
-+	spi_master_put(sp->bitbang.master);
-+
-+	return 0;
-+}
-+
-+static struct platform_driver spi_gpio_driver = {
-+	.driver		= {
-+		.name	= SPI_GPIO_PLATDEV_NAME,
-+		.owner	= THIS_MODULE,
-+	},
-+	.probe		= spi_gpio_probe,
-+	.remove		= __devexit_p(spi_gpio_remove),
-+};
-+
-+int spi_gpio_next_id(void)
-+{
-+	static atomic_t counter = ATOMIC_INIT(-1);
-+
-+	return atomic_inc_return(&counter);
-+}
-+EXPORT_SYMBOL(spi_gpio_next_id);
-+
-+static int __init spi_gpio_init(void)
-+{
-+	int err;
-+
-+	err = platform_driver_register(&spi_gpio_driver);
-+	if (err)
-+		printk(KERN_ERR "spi-gpio: register failed: %d\n", err);
-+
-+	return err;
-+}
-+module_init(spi_gpio_init);
-+
-+static void __exit spi_gpio_exit(void)
-+{
-+	platform_driver_unregister(&spi_gpio_driver);
-+}
-+module_exit(spi_gpio_exit);
-+
-+MODULE_AUTHOR("Piot Skamruk <piotr.skamruk at gmail.com>");
-+MODULE_AUTHOR("Michael Buesch");
-+MODULE_DESCRIPTION("Platform independent GPIO bitbanging SPI driver");
-+MODULE_LICENSE("GPL v2");
---- a/drivers/spi/Kconfig
-+++ b/drivers/spi/Kconfig
-@@ -116,6 +116,15 @@ config SPI_GPIO
- 	  GPIO operations, you should be able to leverage that for better
- 	  speed with a custom version of this driver; see the source code.
- 
-+config SPI_GPIO_OLD
-+	tristate "Old GPIO API based bitbanging SPI controller (DEPRECATED)"
-+	depends on SPI_MASTER && GENERIC_GPIO
-+	select SPI_BITBANG
-+	help
-+	  This code is deprecated. Please use the new mainline SPI-GPIO driver.
-+
-+	  If unsure, say N.
-+
- config SPI_IMX
- 	tristate "Freescale i.MX SPI controllers"
- 	depends on ARCH_MXC
---- a/drivers/spi/Makefile
-+++ b/drivers/spi/Makefile
-@@ -19,6 +19,7 @@ obj-$(CONFIG_SPI_BUTTERFLY)		+= spi_butt
- obj-$(CONFIG_SPI_DESIGNWARE)		+= dw_spi.o
- obj-$(CONFIG_SPI_DW_PCI)		+= dw_spi_pci.o
- obj-$(CONFIG_SPI_GPIO)			+= spi_gpio.o
-+obj-$(CONFIG_SPI_GPIO_OLD)		+= spi_gpio_old.o
- obj-$(CONFIG_SPI_IMX)			+= spi_imx.o
- obj-$(CONFIG_SPI_LM70_LLP)		+= spi_lm70llp.o
- obj-$(CONFIG_SPI_PXA2XX)		+= pxa2xx_spi.o
diff --git a/target/linux/generic-2.6/patches-2.6.34/922-gpiommc.patch b/target/linux/generic-2.6/patches-2.6.34/922-gpiommc.patch
deleted file mode 100644
index cb39a705f..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/922-gpiommc.patch
+++ /dev/null
@@ -1,843 +0,0 @@
---- /dev/null
-+++ b/drivers/mmc/host/gpiommc.c
-@@ -0,0 +1,608 @@
-+/*
-+ * Driver an MMC/SD card on a bitbanging GPIO SPI bus.
-+ * This module hooks up the mmc_spi and spi_gpio modules and also
-+ * provides a configfs interface.
-+ *
-+ * Copyright 2008 Michael Buesch <mb@bu3sch.de>
-+ *
-+ * Licensed under the GNU/GPL. See COPYING for details.
-+ */
-+
-+#include <linux/mmc/gpiommc.h>
-+#include <linux/platform_device.h>
-+#include <linux/list.h>
-+#include <linux/mutex.h>
-+#include <linux/spi/spi_gpio_old.h>
-+#include <linux/configfs.h>
-+#include <linux/gpio.h>
-+#include <asm/atomic.h>
-+
-+
-+#define PFX				"gpio-mmc: "
-+
-+
-+struct gpiommc_device {
-+	struct platform_device *pdev;
-+	struct platform_device *spi_pdev;
-+	struct spi_board_info boardinfo;
-+};
-+
-+
-+MODULE_DESCRIPTION("GPIO based MMC driver");
-+MODULE_AUTHOR("Michael Buesch");
-+MODULE_LICENSE("GPL");
-+
-+
-+static int gpiommc_boardinfo_setup(struct spi_board_info *bi,
-+				   struct spi_master *master,
-+				   void *data)
-+{
-+	struct gpiommc_device *d = data;
-+	struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
-+
-+	/* Bind the SPI master to the MMC-SPI host driver. */
-+	strlcpy(bi->modalias, "mmc_spi", sizeof(bi->modalias));
-+
-+	bi->max_speed_hz = pdata->max_bus_speed;
-+	bi->bus_num = master->bus_num;
-+	bi->mode = pdata->mode;
-+
-+	return 0;
-+}
-+
-+static int gpiommc_probe(struct platform_device *pdev)
-+{
-+	struct gpiommc_platform_data *mmc_pdata = pdev->dev.platform_data;
-+	struct spi_gpio_platform_data spi_pdata;
-+	struct gpiommc_device *d;
-+	int err;
-+
-+	err = -ENXIO;
-+	if (!mmc_pdata)
-+		goto error;
-+
-+#ifdef CONFIG_MMC_SPI_MODULE
-+	err = request_module("mmc_spi");
-+	if (err) {
-+		printk(KERN_WARNING PFX
-+		       "Failed to request mmc_spi module.\n");
-+	}
-+#endif /* CONFIG_MMC_SPI_MODULE */
-+
-+	/* Allocate the GPIO-MMC device */
-+	err = -ENOMEM;
-+	d = kzalloc(sizeof(*d), GFP_KERNEL);
-+	if (!d)
-+		goto error;
-+	d->pdev = pdev;
-+
-+	/* Create the SPI-GPIO device */
-+	d->spi_pdev = platform_device_alloc(SPI_GPIO_PLATDEV_NAME,
-+					    spi_gpio_next_id());
-+	if (!d->spi_pdev)
-+		goto err_free_d;
-+
-+	memset(&spi_pdata, 0, sizeof(spi_pdata));
-+	spi_pdata.pin_clk = mmc_pdata->pins.gpio_clk;
-+	spi_pdata.pin_miso = mmc_pdata->pins.gpio_do;
-+	spi_pdata.pin_mosi = mmc_pdata->pins.gpio_di;
-+	spi_pdata.pin_cs = mmc_pdata->pins.gpio_cs;
-+	spi_pdata.cs_activelow = mmc_pdata->pins.cs_activelow;
-+	spi_pdata.no_spi_delay = mmc_pdata->no_spi_delay;
-+	spi_pdata.boardinfo_setup = gpiommc_boardinfo_setup;
-+	spi_pdata.boardinfo_setup_data = d;
-+
-+	err = platform_device_add_data(d->spi_pdev, &spi_pdata,
-+				       sizeof(spi_pdata));
-+	if (err)
-+		goto err_free_pdev;
-+	err = platform_device_add(d->spi_pdev);
-+	if (err)
-+		goto err_free_pdata;
-+	platform_set_drvdata(pdev, d);
-+
-+	printk(KERN_INFO PFX "MMC-Card \"%s\" "
-+	       "attached to GPIO pins di=%u, do=%u, clk=%u, cs=%u\n",
-+	       mmc_pdata->name, mmc_pdata->pins.gpio_di,
-+	       mmc_pdata->pins.gpio_do,
-+	       mmc_pdata->pins.gpio_clk,
-+	       mmc_pdata->pins.gpio_cs);
-+
-+	return 0;
-+
-+err_free_pdata:
-+	kfree(d->spi_pdev->dev.platform_data);
-+	d->spi_pdev->dev.platform_data = NULL;
-+err_free_pdev:
-+	platform_device_put(d->spi_pdev);
-+err_free_d:
-+	kfree(d);
-+error:
-+	return err;
-+}
-+
-+static int gpiommc_remove(struct platform_device *pdev)
-+{
-+	struct gpiommc_device *d = platform_get_drvdata(pdev);
-+	struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
-+
-+	platform_device_unregister(d->spi_pdev);
-+	printk(KERN_INFO PFX "GPIO based MMC-Card \"%s\" removed\n",
-+	       pdata->name);
-+	platform_device_put(d->spi_pdev);
-+
-+	return 0;
-+}
-+
-+#ifdef CONFIG_GPIOMMC_CONFIGFS
-+
-+/* A device that was created through configfs */
-+struct gpiommc_configfs_device {
-+	struct config_item item;
-+	/* The platform device, after registration. */
-+	struct platform_device *pdev;
-+	/* The configuration */
-+	struct gpiommc_platform_data pdata;
-+};
-+
-+#define GPIO_INVALID	-1
-+
-+static inline bool gpiommc_is_registered(struct gpiommc_configfs_device *dev)
-+{
-+	return (dev->pdev != NULL);
-+}
-+
-+static inline struct gpiommc_configfs_device *ci_to_gpiommc(struct config_item *item)
-+{
-+	return item ? container_of(item, struct gpiommc_configfs_device, item) : NULL;
-+}
-+
-+static struct configfs_attribute gpiommc_attr_DI = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_data_in",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_DO = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_data_out",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_CLK = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_clock",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_CS = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_chipselect",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_CS_activelow = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_chipselect_activelow",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_spimode = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "spi_mode",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_spidelay = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "spi_delay",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_max_bus_speed = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "max_bus_speed",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_register = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "register",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute *gpiommc_config_attrs[] = {
-+	&gpiommc_attr_DI,
-+	&gpiommc_attr_DO,
-+	&gpiommc_attr_CLK,
-+	&gpiommc_attr_CS,
-+	&gpiommc_attr_CS_activelow,
-+	&gpiommc_attr_spimode,
-+	&gpiommc_attr_spidelay,
-+	&gpiommc_attr_max_bus_speed,
-+	&gpiommc_attr_register,
-+	NULL,
-+};
-+
-+static ssize_t gpiommc_config_attr_show(struct config_item *item,
-+					struct configfs_attribute *attr,
-+					char *page)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+	ssize_t count = 0;
-+	unsigned int gpio;
-+	int err = 0;
-+
-+	if (attr == &gpiommc_attr_DI) {
-+		gpio = dev->pdata.pins.gpio_di;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_DO) {
-+		gpio = dev->pdata.pins.gpio_do;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CLK) {
-+		gpio = dev->pdata.pins.gpio_clk;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS) {
-+		gpio = dev->pdata.pins.gpio_cs;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS_activelow) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 dev->pdata.pins.cs_activelow);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spimode) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 dev->pdata.mode);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spidelay) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 !dev->pdata.no_spi_delay);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_max_bus_speed) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 dev->pdata.max_bus_speed);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_register) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 gpiommc_is_registered(dev));
-+		goto out;
-+	}
-+	WARN_ON(1);
-+	err = -ENOSYS;
-+out:
-+	return err ? err : count;
-+}
-+
-+static int gpiommc_do_register(struct gpiommc_configfs_device *dev,
-+			       const char *name)
-+{
-+	int err;
-+
-+	if (gpiommc_is_registered(dev))
-+		return 0;
-+
-+	if (!gpio_is_valid(dev->pdata.pins.gpio_di) ||
-+	    !gpio_is_valid(dev->pdata.pins.gpio_do) ||
-+	    !gpio_is_valid(dev->pdata.pins.gpio_clk) ||
-+	    !gpio_is_valid(dev->pdata.pins.gpio_cs)) {
-+		printk(KERN_ERR PFX
-+		       "configfs: Invalid GPIO pin number(s)\n");
-+		return -EINVAL;
-+	}
-+
-+	strlcpy(dev->pdata.name, name,
-+		sizeof(dev->pdata.name));
-+
-+	dev->pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME,
-+					  gpiommc_next_id());
-+	if (!dev->pdev)
-+		return -ENOMEM;
-+	err = platform_device_add_data(dev->pdev, &dev->pdata,
-+				       sizeof(dev->pdata));
-+	if (err) {
-+		platform_device_put(dev->pdev);
-+		return err;
-+	}
-+	err = platform_device_add(dev->pdev);
-+	if (err) {
-+		platform_device_put(dev->pdev);
-+		return err;
-+	}
-+
-+	return 0;
-+}
-+
-+static void gpiommc_do_unregister(struct gpiommc_configfs_device *dev)
-+{
-+	if (!gpiommc_is_registered(dev))
-+		return;
-+
-+	platform_device_unregister(dev->pdev);
-+	dev->pdev = NULL;
-+}
-+
-+static ssize_t gpiommc_config_attr_store(struct config_item *item,
-+					 struct configfs_attribute *attr,
-+					 const char *page, size_t count)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+	int err = -EINVAL;
-+	unsigned long data;
-+
-+	if (attr == &gpiommc_attr_register) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data == 1)
-+			err = gpiommc_do_register(dev, item->ci_name);
-+		if (data == 0) {
-+			gpiommc_do_unregister(dev);
-+			err = 0;
-+		}
-+		goto out;
-+	}
-+
-+	if (gpiommc_is_registered(dev)) {
-+		/* The rest of the config parameters can only be set
-+		 * as long as the device is not registered, yet. */
-+		err = -EBUSY;
-+		goto out;
-+	}
-+
-+	if (attr == &gpiommc_attr_DI) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_di = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_DO) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_do = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CLK) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_clk = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_cs = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS_activelow) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data != 0 && data != 1)
-+			goto out;
-+		dev->pdata.pins.cs_activelow = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spimode) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		switch (data) {
-+		case 0:
-+			dev->pdata.mode = SPI_MODE_0;
-+			break;
-+		case 1:
-+			dev->pdata.mode = SPI_MODE_1;
-+			break;
-+		case 2:
-+			dev->pdata.mode = SPI_MODE_2;
-+			break;
-+		case 3:
-+			dev->pdata.mode = SPI_MODE_3;
-+			break;
-+		default:
-+			goto out;
-+		}
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spidelay) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data != 0 && data != 1)
-+			goto out;
-+		dev->pdata.no_spi_delay = !data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_max_bus_speed) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data > UINT_MAX)
-+			goto out;
-+		dev->pdata.max_bus_speed = data;
-+		err = 0;
-+		goto out;
-+	}
-+	WARN_ON(1);
-+	err = -ENOSYS;
-+out:
-+	return err ? err : count;
-+}
-+
-+static void gpiommc_config_item_release(struct config_item *item)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+
-+	kfree(dev);
-+}
-+
-+static struct configfs_item_operations gpiommc_config_item_ops = {
-+	.release		= gpiommc_config_item_release,
-+	.show_attribute		= gpiommc_config_attr_show,
-+	.store_attribute	= gpiommc_config_attr_store,
-+};
-+
-+static struct config_item_type gpiommc_dev_ci_type = {
-+	.ct_item_ops	= &gpiommc_config_item_ops,
-+	.ct_attrs	= gpiommc_config_attrs,
-+	.ct_owner	= THIS_MODULE,
-+};
-+
-+static struct config_item *gpiommc_make_item(struct config_group *group,
-+					     const char *name)
-+{
-+	struct gpiommc_configfs_device *dev;
-+
-+	if (strlen(name) > GPIOMMC_MAX_NAMELEN) {
-+		printk(KERN_ERR PFX "configfs: device name too long\n");
-+		return NULL;
-+	}
-+
-+	dev = kzalloc(sizeof(*dev), GFP_KERNEL);
-+	if (!dev)
-+		return NULL;
-+
-+	config_item_init_type_name(&dev->item, name,
-+				   &gpiommc_dev_ci_type);
-+
-+	/* Assign default configuration */
-+	dev->pdata.pins.gpio_di = GPIO_INVALID;
-+	dev->pdata.pins.gpio_do = GPIO_INVALID;
-+	dev->pdata.pins.gpio_clk = GPIO_INVALID;
-+	dev->pdata.pins.gpio_cs = GPIO_INVALID;
-+	dev->pdata.pins.cs_activelow = 1;
-+	dev->pdata.mode = SPI_MODE_0;
-+	dev->pdata.no_spi_delay = 0;
-+	dev->pdata.max_bus_speed = 5000000; /* 5 MHz */
-+
-+	return &(dev->item);
-+}
-+
-+static void gpiommc_drop_item(struct config_group *group,
-+			      struct config_item *item)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+
-+	gpiommc_do_unregister(dev);
-+	kfree(dev);
-+}
-+
-+static struct configfs_group_operations gpiommc_ct_group_ops = {
-+	.make_item	= gpiommc_make_item,
-+	.drop_item	= gpiommc_drop_item,
-+};
-+
-+static struct config_item_type gpiommc_ci_type = {
-+	.ct_group_ops	= &gpiommc_ct_group_ops,
-+	.ct_owner	= THIS_MODULE,
-+};
-+
-+static struct configfs_subsystem gpiommc_subsys = {
-+	.su_group = {
-+		.cg_item = {
-+			.ci_namebuf = GPIOMMC_PLATDEV_NAME,
-+			.ci_type = &gpiommc_ci_type,
-+		},
-+	},
-+	.su_mutex = __MUTEX_INITIALIZER(gpiommc_subsys.su_mutex),
-+};
-+
-+#endif /* CONFIG_GPIOMMC_CONFIGFS */
-+
-+static struct platform_driver gpiommc_plat_driver = {
-+	.probe	= gpiommc_probe,
-+	.remove	= gpiommc_remove,
-+	.driver	= {
-+		.name	= GPIOMMC_PLATDEV_NAME,
-+		.owner	= THIS_MODULE,
-+	},
-+};
-+
-+int gpiommc_next_id(void)
-+{
-+	static atomic_t counter = ATOMIC_INIT(-1);
-+
-+	return atomic_inc_return(&counter);
-+}
-+EXPORT_SYMBOL(gpiommc_next_id);
-+
-+static int __init gpiommc_modinit(void)
-+{
-+	int err;
-+
-+	err = platform_driver_register(&gpiommc_plat_driver);
-+	if (err)
-+		return err;
-+
-+#ifdef CONFIG_GPIOMMC_CONFIGFS
-+	config_group_init(&gpiommc_subsys.su_group);
-+	err = configfs_register_subsystem(&gpiommc_subsys);
-+	if (err) {
-+		platform_driver_unregister(&gpiommc_plat_driver);
-+		return err;
-+	}
-+#endif /* CONFIG_GPIOMMC_CONFIGFS */
-+
-+	return 0;
-+}
-+module_init(gpiommc_modinit);
-+
-+static void __exit gpiommc_modexit(void)
-+{
-+#ifdef CONFIG_GPIOMMC_CONFIGFS
-+	configfs_unregister_subsystem(&gpiommc_subsys);
-+#endif
-+	platform_driver_unregister(&gpiommc_plat_driver);
-+}
-+module_exit(gpiommc_modexit);
---- a/drivers/mmc/host/Kconfig
-+++ b/drivers/mmc/host/Kconfig
-@@ -373,6 +373,31 @@ config MMC_TMIO
- 	  This provides support for the SD/MMC cell found in TC6393XB,
- 	  T7L66XB and also HTC ASIC3
- 
-+config GPIOMMC
-+	tristate "MMC/SD over GPIO-based SPI"
-+	depends on MMC && MMC_SPI && SPI_GPIO_OLD
-+	help
-+	  This driver hooks up the mmc_spi and spi_gpio modules so that
-+	  MMC/SD cards can be used on a GPIO based bus by bitbanging
-+	  the SPI protocol in software.
-+
-+	  This driver provides a configfs interface to dynamically create
-+	  and destroy GPIO-based MMC/SD card devices. It also provides
-+	  a platform device interface API.
-+	  See Documentation/gpiommc.txt for details.
-+
-+	  The module will be called gpiommc.
-+
-+	  If unsure, say N.
-+
-+config GPIOMMC_CONFIGFS
-+	bool
-+	depends on GPIOMMC && CONFIGFS_FS
-+	default y
-+	help
-+	  This option automatically enables configfs support for gpiommc
-+	  if configfs is available.
-+
- config MMC_CB710
- 	tristate "ENE CB710 MMC/SD Interface support"
- 	depends on PCI
---- a/drivers/mmc/host/Makefile
-+++ b/drivers/mmc/host/Makefile
-@@ -34,6 +34,7 @@ obj-$(CONFIG_MMC_SDRICOH_CS)	+= sdricoh_
- obj-$(CONFIG_MMC_TMIO)		+= tmio_mmc.o
- obj-$(CONFIG_MMC_CB710)	+= cb710-mmc.o
- obj-$(CONFIG_MMC_VIA_SDMMC)	+= via-sdmmc.o
-+obj-$(CONFIG_GPIOMMC)		+= gpiommc.o
- obj-$(CONFIG_SDH_BFIN)		+= bfin_sdh.o
- 
- obj-$(CONFIG_MMC_SDHCI_OF)	+= sdhci-of.o
---- /dev/null
-+++ b/include/linux/mmc/gpiommc.h
-@@ -0,0 +1,71 @@
-+/*
-+ * Device driver for MMC/SD cards driven over a GPIO bus.
-+ *
-+ * Copyright (c) 2008 Michael Buesch
-+ *
-+ * Licensed under the GNU/GPL version 2.
-+ */
-+#ifndef LINUX_GPIOMMC_H_
-+#define LINUX_GPIOMMC_H_
-+
-+#include <linux/types.h>
-+
-+
-+#define GPIOMMC_MAX_NAMELEN		15
-+#define GPIOMMC_MAX_NAMELEN_STR		__stringify(GPIOMMC_MAX_NAMELEN)
-+
-+/**
-+ * struct gpiommc_pins - Hardware pin assignments
-+ *
-+ * @gpio_di: The GPIO number of the DATA IN pin
-+ * @gpio_do: The GPIO number of the DATA OUT pin
-+ * @gpio_clk: The GPIO number of the CLOCK pin
-+ * @gpio_cs: The GPIO number of the CHIPSELECT pin
-+ * @cs_activelow: If true, the chip is considered selected if @gpio_cs is low.
-+ */
-+struct gpiommc_pins {
-+	unsigned int gpio_di;
-+	unsigned int gpio_do;
-+	unsigned int gpio_clk;
-+	unsigned int gpio_cs;
-+	bool cs_activelow;
-+};
-+
-+/**
-+ * struct gpiommc_platform_data - Platform data for a MMC-over-SPI-GPIO device.
-+ *
-+ * @name: The unique name string of the device.
-+ * @pins: The hardware pin assignments.
-+ * @mode: The hardware mode. This is either SPI_MODE_0,
-+ *        SPI_MODE_1, SPI_MODE_2 or SPI_MODE_3. See the SPI documentation.
-+ * @no_spi_delay: Do not use delays in the lowlevel SPI bitbanging code.
-+ *                This is not standards compliant, but may be required for some
-+ *                embedded machines to gain reasonable speed.
-+ * @max_bus_speed: The maximum speed of the SPI bus, in Hertz.
-+ */
-+struct gpiommc_platform_data {
-+	char name[GPIOMMC_MAX_NAMELEN + 1];
-+	struct gpiommc_pins pins;
-+	u8 mode;
-+	bool no_spi_delay;
-+	unsigned int max_bus_speed;
-+};
-+
-+/**
-+ * GPIOMMC_PLATDEV_NAME - The platform device name string.
-+ *
-+ * The name string that has to be used for platform_device_alloc
-+ * when allocating a gpiommc device.
-+ */
-+#define GPIOMMC_PLATDEV_NAME	"gpiommc"
-+
-+/**
-+ * gpiommc_next_id - Get another platform device ID number.
-+ *
-+ * This returns the next platform device ID number that has to be used
-+ * for platform_device_alloc. The ID is opaque and should not be used for
-+ * anything else.
-+ */
-+int gpiommc_next_id(void);
-+
-+#endif /* LINUX_GPIOMMC_H_ */
---- /dev/null
-+++ b/Documentation/gpiommc.txt
-@@ -0,0 +1,97 @@
-+GPIOMMC - Driver for an MMC/SD card on a bitbanging GPIO SPI bus
-+================================================================
-+
-+The gpiommc module hooks up the mmc_spi and spi_gpio modules for running an
-+MMC or SD card on GPIO pins.
-+
-+Two interfaces for registering a new MMC/SD card device are provided:
-+A static platform-device based mechanism and a dynamic configfs based interface.
-+
-+
-+Registering devices via platform-device
-+=======================================
-+
-+The platform-device interface is used for registering MMC/SD devices that are
-+part of the hardware platform. This is most useful only for embedded machines
-+with MMC/SD devices statically connected to the platform GPIO bus.
-+
-+The data structures are declared in <linux/mmc/gpiommc.h>.
-+
-+To register a new device, define an instance of struct gpiommc_platform_data.
-+This structure holds any information about how the device is hooked up to the
-+GPIO pins and what hardware modes the device supports. See the docbook-style
-+documentation in the header file for more information on the struct fields.
-+
-+Then allocate a new instance of a platform device by doing:
-+
-+	pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME, gpiommc_next_id());
-+
-+This will allocate the platform device data structures and hook it up to the
-+gpiommc driver.
-+Then add the gpiommc_platform_data to the platform device.
-+
-+	err = platform_device_add_data(pdev, pdata, sizeof(struct gpiommc_platform_data));
-+
-+You may free the local instance of struct gpiommc_platform_data now. (So the
-+struct may be allocated on the stack, too).
-+Now simply register the platform device.
-+
-+	err = platform_device_add(pdev);
-+
-+Done. The gpiommc probe routine will be invoked now and you should see a kernel
-+log message for the added device.
-+
-+
-+Registering devices via configfs
-+================================
-+
-+MMC/SD cards connected via GPIO often are a pretty dynamic thing, as for example
-+selfmade hacks for soldering an MMC/SD card to standard GPIO pins on embedded
-+hardware are a common situation.
-+So we provide a dynamic interface to conveniently handle adding and removing
-+devices from userspace, without the need to recompile the kernel.
-+
-+The "gpiommc" subdirectory at the configfs mountpoint is used for handling
-+the dynamic configuration.
-+
-+To create a new device, it must first be allocated with mkdir.
-+The following command will allocate a device named "my_mmc":
-+	mkdir /config/gpiommc/my_mmc
-+
-+There are several configuration files available in the new
-+/config/gpiommc/my_mmc/ directory:
-+
-+gpio_data_in			= The SPI data-IN GPIO pin number.
-+gpio_data_out			= The SPI data-OUT GPIO pin number.
-+gpio_clock			= The SPI Clock GPIO pin number.
-+gpio_chipselect			= The SPI Chipselect GPIO pin number.
-+gpio_chipselect_activelow	= Boolean. If 0, Chipselect is active-HIGH.
-+				  If 1, Chipselect is active-LOW.
-+spi_mode			= The SPI data mode. Can be 0-3.
-+spi_delay			= Enable all delays in the lowlevel bitbanging.
-+max_bus_speed			= The maximum SPI bus speed. In Hertz.
-+
-+register			= Not a configuration parameter.
-+				  Used to register the configured card
-+				  with the kernel.
-+
-+The device must first get configured and then registered by writing "1" to
-+the "register" file.
-+The configuration parameters "gpio_data_in", "gpio_data_out", "gpio_clock"
-+and "gpio_chipselect" are essential and _must_ be configured before writing
-+"1" to the "register" file. The registration will fail, otherwise.
-+
-+The default values for the other parameters are:
-+gpio_chipselect_activelow	= 1		(CS active-LOW)
-+spi_mode			= 0		(SPI_MODE_0)
-+spi_delay			= 1		(enabled)
-+max_bus_speed			= 5000000	(5 Mhz)
-+
-+Configuration values can not be changed after registration. To unregister
-+the device, write a "0" to the "register" file. The configuration can be
-+changed again after unregistering.
-+
-+To completely remove the device, simply rmdir the directory
-+(/config/gpiommc/my_mmc in this example).
-+There's no need to first unregister the device before removing it. That will
-+be done automatically.
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -2443,6 +2443,11 @@ T:	git git://git.kernel.org/pub/scm/linu
- S:	Maintained
- F:	drivers/media/video/gspca/
- 
-+GPIOMMC DRIVER
-+P:	Michael Buesch
-+M:	mb@bu3sch.de
-+S:	Maintained
-+
- HARDWARE MONITORING
- L:	lm-sensors@lm-sensors.org
- W:	http://www.lm-sensors.org/
diff --git a/target/linux/generic-2.6/patches-2.6.34/923-gpiommc-configfs-locking.patch b/target/linux/generic-2.6/patches-2.6.34/923-gpiommc-configfs-locking.patch
deleted file mode 100644
index 2e4e820b2..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/923-gpiommc-configfs-locking.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-The gpiommc configfs context structure needs locking, as configfs
-does not lock access between files.
-
---- a/drivers/mmc/host/gpiommc.c
-+++ b/drivers/mmc/host/gpiommc.c
-@@ -143,6 +143,8 @@ struct gpiommc_configfs_device {
- 	struct platform_device *pdev;
- 	/* The configuration */
- 	struct gpiommc_platform_data pdata;
-+	/* Mutex to protect this structure */
-+	struct mutex mutex;
- };
- 
- #define GPIO_INVALID	-1
-@@ -233,6 +235,8 @@ static ssize_t gpiommc_config_attr_show(
- 	unsigned int gpio;
- 	int err = 0;
- 
-+	mutex_lock(&dev->mutex);
-+
- 	if (attr == &gpiommc_attr_DI) {
- 		gpio = dev->pdata.pins.gpio_di;
- 		if (gpio == GPIO_INVALID)
-@@ -293,6 +297,8 @@ static ssize_t gpiommc_config_attr_show(
- 	WARN_ON(1);
- 	err = -ENOSYS;
- out:
-+	mutex_unlock(&dev->mutex);
-+
- 	return err ? err : count;
- }
- 
-@@ -352,6 +358,8 @@ static ssize_t gpiommc_config_attr_store
- 	int err = -EINVAL;
- 	unsigned long data;
- 
-+	mutex_lock(&dev->mutex);
-+
- 	if (attr == &gpiommc_attr_register) {
- 		err = strict_strtoul(page, 10, &data);
- 		if (err)
-@@ -477,6 +485,8 @@ static ssize_t gpiommc_config_attr_store
- 	WARN_ON(1);
- 	err = -ENOSYS;
- out:
-+	mutex_unlock(&dev->mutex);
-+
- 	return err ? err : count;
- }
- 
-@@ -513,6 +523,7 @@ static struct config_item *gpiommc_make_
- 	if (!dev)
- 		return NULL;
- 
-+	mutex_init(&dev->mutex);
- 	config_item_init_type_name(&dev->item, name,
- 				   &gpiommc_dev_ci_type);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.34/924-cs5535_gpio.patch b/target/linux/generic-2.6/patches-2.6.34/924-cs5535_gpio.patch
deleted file mode 100644
index 4cb3031db..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/924-cs5535_gpio.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- a/drivers/char/cs5535_gpio.c
-+++ b/drivers/char/cs5535_gpio.c
-@@ -15,6 +15,7 @@
- #include <linux/kernel.h>
- #include <linux/init.h>
- #include <linux/cdev.h>
-+#include <linux/device.h>
- #include <linux/ioport.h>
- #include <linux/pci.h>
- 
-@@ -48,6 +49,7 @@ static struct pci_device_id divil_pci[] 
- MODULE_DEVICE_TABLE(pci, divil_pci);
- 
- static struct cdev cs5535_gpio_cdev;
-+static struct class *cs5535_gpio_class;
- 
- /* reserve 32 entries even though some aren't usable */
- #define CS5535_GPIO_COUNT	32
-@@ -66,9 +68,14 @@ static struct gpio_regmap rm[] =
- 	{ 0x30, 0x00, '1', '0' },	/* GPIOx_READ_BACK / GPIOx_OUT_VAL */
- 	{ 0x20, 0x20, 'I', 'i' },	/* GPIOx_IN_EN */
- 	{ 0x04, 0x04, 'O', 'o' },	/* GPIOx_OUT_EN */
-+	{ 0x10, 0x10, 'A', 'a' },	/* GPIOx_OUT_AUX1_SEL */
-+	{ 0x14, 0x14, 'B', 'b' },	/* GPIOx_OUT_AUX2_SEL */
- 	{ 0x08, 0x08, 't', 'T' },	/* GPIOx_OUT_OD_EN */
- 	{ 0x18, 0x18, 'P', 'p' },	/* GPIOx_OUT_PU_EN */
- 	{ 0x1c, 0x1c, 'D', 'd' },	/* GPIOx_OUT_PD_EN */
-+	{ 0x24, 0x24, 'N', 'n' },	/* GPIOx_IN_INV_EN */
-+	{ 0x0c, 0x0c, 'X', 'x' },	/* GPIOx_OUT_INV_EN */
-+	{ 0x00, 0x00, 'H', 'L' },	/* GPIOx_OUT_VAL */
- };
- 
- 
-@@ -176,7 +183,7 @@ static int __init cs5535_gpio_init(void)
- {
- 	dev_t	dev_id;
- 	u32	low, hi;
--	int	retval;
-+	int	retval, i;
- 
- 	if (pci_dev_present(divil_pci) == 0) {
- 		printk(KERN_WARNING NAME ": DIVIL not found\n");
-@@ -231,23 +238,54 @@ static int __init cs5535_gpio_init(void)
- 		major = MAJOR(dev_id);
- 	}
- 
--	if (retval) {
--		release_region(gpio_base, CS5535_GPIO_SIZE);
--		return -1;
--	}
-+	if (retval)
-+		goto error;
- 
- 	printk(KERN_DEBUG NAME ": base=%#x mask=%#lx major=%d\n",
- 	       gpio_base, mask, major);
- 
- 	cdev_init(&cs5535_gpio_cdev, &cs5535_gpio_fops);
--	cdev_add(&cs5535_gpio_cdev, dev_id, CS5535_GPIO_COUNT);
-+	retval = cdev_add(&cs5535_gpio_cdev, dev_id, CS5535_GPIO_COUNT);
-+	if (retval) {
-+		kobject_put(&cs5535_gpio_cdev.kobj);
-+		goto error_region;
-+	}
-+
-+	cs5535_gpio_class = class_create(THIS_MODULE, "cs5535_gpio");
-+	if (IS_ERR(cs5535_gpio_class)) {
-+		printk(KERN_ERR "Error creating cs5535_gpio class\n");
-+		cdev_del(&cs5535_gpio_cdev);
-+		retval = PTR_ERR(cs5535_gpio_class);
-+		goto error_region;
-+	}
-+
-+	for (i = 0; i < CS5535_GPIO_COUNT; i++) {
-+		if (mask & (1<<i)) {
-+			device_create(cs5535_gpio_class, NULL, MKDEV(major, i), NULL, "cs5535_gpio%d", i);
-+		}
-+	}
- 
- 	return 0;
-+
-+error_region:
-+	unregister_chrdev_region(dev_id, CS5535_GPIO_COUNT);
-+error:
-+	release_region(gpio_base, CS5535_GPIO_SIZE);
-+	return retval;
- }
- 
- static void __exit cs5535_gpio_cleanup(void)
- {
- 	dev_t dev_id = MKDEV(major, 0);
-+	int i;
-+
-+	for (i = 0; i < CS5535_GPIO_COUNT; i++) {
-+		if (mask & (1<<i)) {
-+			device_destroy(cs5535_gpio_class, MKDEV(major, i));
-+		}
-+	}
-+
-+	class_destroy(cs5535_gpio_class);
- 
- 	cdev_del(&cs5535_gpio_cdev);
- 	unregister_chrdev_region(dev_id, CS5535_GPIO_COUNT);
diff --git a/target/linux/generic-2.6/patches-2.6.34/925-modify-i2c-gpio-initcall-level.patch b/target/linux/generic-2.6/patches-2.6.34/925-modify-i2c-gpio-initcall-level.patch
deleted file mode 100644
index 1708e33d0..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/925-modify-i2c-gpio-initcall-level.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/drivers/i2c/busses/i2c-gpio.c
-+++ b/drivers/i2c/busses/i2c-gpio.c
-@@ -210,7 +210,7 @@ static int __init i2c_gpio_init(void)
- 
- 	return ret;
- }
--module_init(i2c_gpio_init);
-+subsys_initcall(i2c_gpio_init);
- 
- static void __exit i2c_gpio_exit(void)
- {
diff --git a/target/linux/generic-2.6/patches-2.6.34/940-wireless_mesh_header.patch b/target/linux/generic-2.6/patches-2.6.34/940-wireless_mesh_header.patch
deleted file mode 100644
index 845b6c825..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/940-wireless_mesh_header.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -138,7 +138,7 @@
-  */
- 
- #if defined(CONFIG_WLAN) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
--# if defined(CONFIG_MAC80211_MESH)
-+# if 1 || defined(CONFIG_MAC80211_MESH)
- #  define LL_MAX_HEADER 128
- # else
- #  define LL_MAX_HEADER 96
diff --git a/target/linux/generic-2.6/patches-2.6.34/951-revert_gcc4_4_fixes.patch b/target/linux/generic-2.6/patches-2.6.34/951-revert_gcc4_4_fixes.patch
deleted file mode 100644
index d2c76a8f2..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/951-revert_gcc4_4_fixes.patch
+++ /dev/null
@@ -1,524 +0,0 @@
---- a/arch/powerpc/boot/crtsavres.S
-+++ /dev/null
-@@ -1,233 +0,0 @@
--/*
-- * Special support for eabi and SVR4
-- *
-- *   Copyright (C) 1995, 1996, 1998, 2000, 2001 Free Software Foundation, Inc.
-- *   Copyright 2008 Freescale Semiconductor, Inc.
-- *   Written By Michael Meissner
-- *
-- * Based on gcc/config/rs6000/crtsavres.asm from gcc
-- *
-- * This file 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, or (at your option) any
-- * later version.
-- *
-- * In addition to the permissions in the GNU General Public License, the
-- * Free Software Foundation gives you unlimited permission to link the
-- * compiled version of this file with other programs, and to distribute
-- * those programs without any restriction coming from the use of this
-- * file.  (The General Public License restrictions do apply in other
-- * respects; for example, they cover modification of the file, and
-- * distribution when not linked into another program.)
-- *
-- * This file is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; see the file COPYING.  If not, write to
-- * the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-- * Boston, MA 02110-1301, USA.
-- *
-- *    As a special exception, if you link this library with files
-- *    compiled with GCC to produce an executable, this does not cause
-- *    the resulting executable to be covered by the GNU General Public License.
-- *    This exception does not however invalidate any other reasons why
-- *    the executable file might be covered by the GNU General Public License.
-- */
--
--	.file	"crtsavres.S"
--	.section ".text"
--
--/* On PowerPC64 Linux, these functions are provided by the linker.  */
--#ifndef __powerpc64__
--
--#define _GLOBAL(name) \
--	.type name,@function; \
--	.globl name; \
--name:
--
--/* Routines for saving integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer save area.  */
--
--_GLOBAL(_savegpr_14)
--_GLOBAL(_save32gpr_14)
--	stw	14,-72(11)	/* save gp registers */
--_GLOBAL(_savegpr_15)
--_GLOBAL(_save32gpr_15)
--	stw	15,-68(11)
--_GLOBAL(_savegpr_16)
--_GLOBAL(_save32gpr_16)
--	stw	16,-64(11)
--_GLOBAL(_savegpr_17)
--_GLOBAL(_save32gpr_17)
--	stw	17,-60(11)
--_GLOBAL(_savegpr_18)
--_GLOBAL(_save32gpr_18)
--	stw	18,-56(11)
--_GLOBAL(_savegpr_19)
--_GLOBAL(_save32gpr_19)
--	stw	19,-52(11)
--_GLOBAL(_savegpr_20)
--_GLOBAL(_save32gpr_20)
--	stw	20,-48(11)
--_GLOBAL(_savegpr_21)
--_GLOBAL(_save32gpr_21)
--	stw	21,-44(11)
--_GLOBAL(_savegpr_22)
--_GLOBAL(_save32gpr_22)
--	stw	22,-40(11)
--_GLOBAL(_savegpr_23)
--_GLOBAL(_save32gpr_23)
--	stw	23,-36(11)
--_GLOBAL(_savegpr_24)
--_GLOBAL(_save32gpr_24)
--	stw	24,-32(11)
--_GLOBAL(_savegpr_25)
--_GLOBAL(_save32gpr_25)
--	stw	25,-28(11)
--_GLOBAL(_savegpr_26)
--_GLOBAL(_save32gpr_26)
--	stw	26,-24(11)
--_GLOBAL(_savegpr_27)
--_GLOBAL(_save32gpr_27)
--	stw	27,-20(11)
--_GLOBAL(_savegpr_28)
--_GLOBAL(_save32gpr_28)
--	stw	28,-16(11)
--_GLOBAL(_savegpr_29)
--_GLOBAL(_save32gpr_29)
--	stw	29,-12(11)
--_GLOBAL(_savegpr_30)
--_GLOBAL(_save32gpr_30)
--	stw	30,-8(11)
--_GLOBAL(_savegpr_31)
--_GLOBAL(_save32gpr_31)
--	stw	31,-4(11)
--	blr
--
--/* Routines for restoring integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer restore area.  */
--
--_GLOBAL(_restgpr_14)
--_GLOBAL(_rest32gpr_14)
--	lwz	14,-72(11)	/* restore gp registers */
--_GLOBAL(_restgpr_15)
--_GLOBAL(_rest32gpr_15)
--	lwz	15,-68(11)
--_GLOBAL(_restgpr_16)
--_GLOBAL(_rest32gpr_16)
--	lwz	16,-64(11)
--_GLOBAL(_restgpr_17)
--_GLOBAL(_rest32gpr_17)
--	lwz	17,-60(11)
--_GLOBAL(_restgpr_18)
--_GLOBAL(_rest32gpr_18)
--	lwz	18,-56(11)
--_GLOBAL(_restgpr_19)
--_GLOBAL(_rest32gpr_19)
--	lwz	19,-52(11)
--_GLOBAL(_restgpr_20)
--_GLOBAL(_rest32gpr_20)
--	lwz	20,-48(11)
--_GLOBAL(_restgpr_21)
--_GLOBAL(_rest32gpr_21)
--	lwz	21,-44(11)
--_GLOBAL(_restgpr_22)
--_GLOBAL(_rest32gpr_22)
--	lwz	22,-40(11)
--_GLOBAL(_restgpr_23)
--_GLOBAL(_rest32gpr_23)
--	lwz	23,-36(11)
--_GLOBAL(_restgpr_24)
--_GLOBAL(_rest32gpr_24)
--	lwz	24,-32(11)
--_GLOBAL(_restgpr_25)
--_GLOBAL(_rest32gpr_25)
--	lwz	25,-28(11)
--_GLOBAL(_restgpr_26)
--_GLOBAL(_rest32gpr_26)
--	lwz	26,-24(11)
--_GLOBAL(_restgpr_27)
--_GLOBAL(_rest32gpr_27)
--	lwz	27,-20(11)
--_GLOBAL(_restgpr_28)
--_GLOBAL(_rest32gpr_28)
--	lwz	28,-16(11)
--_GLOBAL(_restgpr_29)
--_GLOBAL(_rest32gpr_29)
--	lwz	29,-12(11)
--_GLOBAL(_restgpr_30)
--_GLOBAL(_rest32gpr_30)
--	lwz	30,-8(11)
--_GLOBAL(_restgpr_31)
--_GLOBAL(_rest32gpr_31)
--	lwz	31,-4(11)
--	blr
--
--/* Routines for restoring integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer restore area.  */
--
--_GLOBAL(_restgpr_14_x)
--_GLOBAL(_rest32gpr_14_x)
--	lwz	14,-72(11)	/* restore gp registers */
--_GLOBAL(_restgpr_15_x)
--_GLOBAL(_rest32gpr_15_x)
--	lwz	15,-68(11)
--_GLOBAL(_restgpr_16_x)
--_GLOBAL(_rest32gpr_16_x)
--	lwz	16,-64(11)
--_GLOBAL(_restgpr_17_x)
--_GLOBAL(_rest32gpr_17_x)
--	lwz	17,-60(11)
--_GLOBAL(_restgpr_18_x)
--_GLOBAL(_rest32gpr_18_x)
--	lwz	18,-56(11)
--_GLOBAL(_restgpr_19_x)
--_GLOBAL(_rest32gpr_19_x)
--	lwz	19,-52(11)
--_GLOBAL(_restgpr_20_x)
--_GLOBAL(_rest32gpr_20_x)
--	lwz	20,-48(11)
--_GLOBAL(_restgpr_21_x)
--_GLOBAL(_rest32gpr_21_x)
--	lwz	21,-44(11)
--_GLOBAL(_restgpr_22_x)
--_GLOBAL(_rest32gpr_22_x)
--	lwz	22,-40(11)
--_GLOBAL(_restgpr_23_x)
--_GLOBAL(_rest32gpr_23_x)
--	lwz	23,-36(11)
--_GLOBAL(_restgpr_24_x)
--_GLOBAL(_rest32gpr_24_x)
--	lwz	24,-32(11)
--_GLOBAL(_restgpr_25_x)
--_GLOBAL(_rest32gpr_25_x)
--	lwz	25,-28(11)
--_GLOBAL(_restgpr_26_x)
--_GLOBAL(_rest32gpr_26_x)
--	lwz	26,-24(11)
--_GLOBAL(_restgpr_27_x)
--_GLOBAL(_rest32gpr_27_x)
--	lwz	27,-20(11)
--_GLOBAL(_restgpr_28_x)
--_GLOBAL(_rest32gpr_28_x)
--	lwz	28,-16(11)
--_GLOBAL(_restgpr_29_x)
--_GLOBAL(_rest32gpr_29_x)
--	lwz	29,-12(11)
--_GLOBAL(_restgpr_30_x)
--_GLOBAL(_rest32gpr_30_x)
--	lwz	30,-8(11)
--_GLOBAL(_restgpr_31_x)
--_GLOBAL(_rest32gpr_31_x)
--	lwz	0,4(11)
--	lwz	31,-4(11)
--	mtlr	0
--	mr	1,11
--	blr
--#endif
---- a/arch/powerpc/boot/Makefile
-+++ b/arch/powerpc/boot/Makefile
-@@ -60,7 +60,7 @@ libfdtheader := fdt.h libfdt.h libfdt_in
- $(addprefix $(obj)/,$(libfdt) libfdt-wrapper.o simpleboot.o): \
- 	$(addprefix $(obj)/,$(libfdtheader))
- 
--src-wlib := string.S crt0.S crtsavres.S stdio.c main.c \
-+src-wlib := string.S crt0.S stdio.c main.c \
- 		$(libfdt) libfdt-wrapper.c \
- 		ns16550.c serial.c simple_alloc.c div64.S util.S \
- 		gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \
---- a/arch/powerpc/kernel/prom_init_check.sh
-+++ b/arch/powerpc/kernel/prom_init_check.sh
-@@ -48,20 +48,6 @@ do
- 		fi
- 	done
- 
--	# ignore register save/restore funcitons
--	if [ "${UNDEF:0:9}" = "_restgpr_" ]; then
--		OK=1
--	fi
--	if [ "${UNDEF:0:11}" = "_rest32gpr_" ]; then
--		OK=1
--	fi
--	if [ "${UNDEF:0:9}" = "_savegpr_" ]; then
--		OK=1
--	fi
--	if [ "${UNDEF:0:11}" = "_save32gpr_" ]; then
--		OK=1
--	fi
--
- 	if [ $OK -eq 0 ]; then
- 		ERROR=1
- 		echo "Error: External symbol '$UNDEF' referenced" \
---- a/arch/powerpc/lib/crtsavres.S
-+++ /dev/null
-@@ -1,229 +0,0 @@
--/*
-- * Special support for eabi and SVR4
-- *
-- *   Copyright (C) 1995, 1996, 1998, 2000, 2001 Free Software Foundation, Inc.
-- *   Copyright 2008 Freescale Semiconductor, Inc.
-- *   Written By Michael Meissner
-- *
-- * Based on gcc/config/rs6000/crtsavres.asm from gcc
-- *
-- * This file 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, or (at your option) any
-- * later version.
-- *
-- * In addition to the permissions in the GNU General Public License, the
-- * Free Software Foundation gives you unlimited permission to link the
-- * compiled version of this file with other programs, and to distribute
-- * those programs without any restriction coming from the use of this
-- * file.  (The General Public License restrictions do apply in other
-- * respects; for example, they cover modification of the file, and
-- * distribution when not linked into another program.)
-- *
-- * This file is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; see the file COPYING.  If not, write to
-- * the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-- * Boston, MA 02110-1301, USA.
-- *
-- *    As a special exception, if you link this library with files
-- *    compiled with GCC to produce an executable, this does not cause
-- *    the resulting executable to be covered by the GNU General Public License.
-- *    This exception does not however invalidate any other reasons why
-- *    the executable file might be covered by the GNU General Public License.
-- */
--
--#include <asm/ppc_asm.h>
--
--	.file	"crtsavres.S"
--	.section ".text"
--
--#ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
--
--/* Routines for saving integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer save area.  */
--
--_GLOBAL(_savegpr_14)
--_GLOBAL(_save32gpr_14)
--	stw	14,-72(11)	/* save gp registers */
--_GLOBAL(_savegpr_15)
--_GLOBAL(_save32gpr_15)
--	stw	15,-68(11)
--_GLOBAL(_savegpr_16)
--_GLOBAL(_save32gpr_16)
--	stw	16,-64(11)
--_GLOBAL(_savegpr_17)
--_GLOBAL(_save32gpr_17)
--	stw	17,-60(11)
--_GLOBAL(_savegpr_18)
--_GLOBAL(_save32gpr_18)
--	stw	18,-56(11)
--_GLOBAL(_savegpr_19)
--_GLOBAL(_save32gpr_19)
--	stw	19,-52(11)
--_GLOBAL(_savegpr_20)
--_GLOBAL(_save32gpr_20)
--	stw	20,-48(11)
--_GLOBAL(_savegpr_21)
--_GLOBAL(_save32gpr_21)
--	stw	21,-44(11)
--_GLOBAL(_savegpr_22)
--_GLOBAL(_save32gpr_22)
--	stw	22,-40(11)
--_GLOBAL(_savegpr_23)
--_GLOBAL(_save32gpr_23)
--	stw	23,-36(11)
--_GLOBAL(_savegpr_24)
--_GLOBAL(_save32gpr_24)
--	stw	24,-32(11)
--_GLOBAL(_savegpr_25)
--_GLOBAL(_save32gpr_25)
--	stw	25,-28(11)
--_GLOBAL(_savegpr_26)
--_GLOBAL(_save32gpr_26)
--	stw	26,-24(11)
--_GLOBAL(_savegpr_27)
--_GLOBAL(_save32gpr_27)
--	stw	27,-20(11)
--_GLOBAL(_savegpr_28)
--_GLOBAL(_save32gpr_28)
--	stw	28,-16(11)
--_GLOBAL(_savegpr_29)
--_GLOBAL(_save32gpr_29)
--	stw	29,-12(11)
--_GLOBAL(_savegpr_30)
--_GLOBAL(_save32gpr_30)
--	stw	30,-8(11)
--_GLOBAL(_savegpr_31)
--_GLOBAL(_save32gpr_31)
--	stw	31,-4(11)
--	blr
--
--/* Routines for restoring integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer restore area.  */
--
--_GLOBAL(_restgpr_14)
--_GLOBAL(_rest32gpr_14)
--	lwz	14,-72(11)	/* restore gp registers */
--_GLOBAL(_restgpr_15)
--_GLOBAL(_rest32gpr_15)
--	lwz	15,-68(11)
--_GLOBAL(_restgpr_16)
--_GLOBAL(_rest32gpr_16)
--	lwz	16,-64(11)
--_GLOBAL(_restgpr_17)
--_GLOBAL(_rest32gpr_17)
--	lwz	17,-60(11)
--_GLOBAL(_restgpr_18)
--_GLOBAL(_rest32gpr_18)
--	lwz	18,-56(11)
--_GLOBAL(_restgpr_19)
--_GLOBAL(_rest32gpr_19)
--	lwz	19,-52(11)
--_GLOBAL(_restgpr_20)
--_GLOBAL(_rest32gpr_20)
--	lwz	20,-48(11)
--_GLOBAL(_restgpr_21)
--_GLOBAL(_rest32gpr_21)
--	lwz	21,-44(11)
--_GLOBAL(_restgpr_22)
--_GLOBAL(_rest32gpr_22)
--	lwz	22,-40(11)
--_GLOBAL(_restgpr_23)
--_GLOBAL(_rest32gpr_23)
--	lwz	23,-36(11)
--_GLOBAL(_restgpr_24)
--_GLOBAL(_rest32gpr_24)
--	lwz	24,-32(11)
--_GLOBAL(_restgpr_25)
--_GLOBAL(_rest32gpr_25)
--	lwz	25,-28(11)
--_GLOBAL(_restgpr_26)
--_GLOBAL(_rest32gpr_26)
--	lwz	26,-24(11)
--_GLOBAL(_restgpr_27)
--_GLOBAL(_rest32gpr_27)
--	lwz	27,-20(11)
--_GLOBAL(_restgpr_28)
--_GLOBAL(_rest32gpr_28)
--	lwz	28,-16(11)
--_GLOBAL(_restgpr_29)
--_GLOBAL(_rest32gpr_29)
--	lwz	29,-12(11)
--_GLOBAL(_restgpr_30)
--_GLOBAL(_rest32gpr_30)
--	lwz	30,-8(11)
--_GLOBAL(_restgpr_31)
--_GLOBAL(_rest32gpr_31)
--	lwz	31,-4(11)
--	blr
--
--/* Routines for restoring integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer restore area.  */
--
--_GLOBAL(_restgpr_14_x)
--_GLOBAL(_rest32gpr_14_x)
--	lwz	14,-72(11)	/* restore gp registers */
--_GLOBAL(_restgpr_15_x)
--_GLOBAL(_rest32gpr_15_x)
--	lwz	15,-68(11)
--_GLOBAL(_restgpr_16_x)
--_GLOBAL(_rest32gpr_16_x)
--	lwz	16,-64(11)
--_GLOBAL(_restgpr_17_x)
--_GLOBAL(_rest32gpr_17_x)
--	lwz	17,-60(11)
--_GLOBAL(_restgpr_18_x)
--_GLOBAL(_rest32gpr_18_x)
--	lwz	18,-56(11)
--_GLOBAL(_restgpr_19_x)
--_GLOBAL(_rest32gpr_19_x)
--	lwz	19,-52(11)
--_GLOBAL(_restgpr_20_x)
--_GLOBAL(_rest32gpr_20_x)
--	lwz	20,-48(11)
--_GLOBAL(_restgpr_21_x)
--_GLOBAL(_rest32gpr_21_x)
--	lwz	21,-44(11)
--_GLOBAL(_restgpr_22_x)
--_GLOBAL(_rest32gpr_22_x)
--	lwz	22,-40(11)
--_GLOBAL(_restgpr_23_x)
--_GLOBAL(_rest32gpr_23_x)
--	lwz	23,-36(11)
--_GLOBAL(_restgpr_24_x)
--_GLOBAL(_rest32gpr_24_x)
--	lwz	24,-32(11)
--_GLOBAL(_restgpr_25_x)
--_GLOBAL(_rest32gpr_25_x)
--	lwz	25,-28(11)
--_GLOBAL(_restgpr_26_x)
--_GLOBAL(_rest32gpr_26_x)
--	lwz	26,-24(11)
--_GLOBAL(_restgpr_27_x)
--_GLOBAL(_rest32gpr_27_x)
--	lwz	27,-20(11)
--_GLOBAL(_restgpr_28_x)
--_GLOBAL(_rest32gpr_28_x)
--	lwz	28,-16(11)
--_GLOBAL(_restgpr_29_x)
--_GLOBAL(_rest32gpr_29_x)
--	lwz	29,-12(11)
--_GLOBAL(_restgpr_30_x)
--_GLOBAL(_rest32gpr_30_x)
--	lwz	30,-8(11)
--_GLOBAL(_restgpr_31_x)
--_GLOBAL(_rest32gpr_31_x)
--	lwz	0,4(11)
--	lwz	31,-4(11)
--	mtlr	0
--	mr	1,11
--	blr
--#endif
---- a/arch/powerpc/lib/Makefile
-+++ b/arch/powerpc/lib/Makefile
-@@ -13,7 +13,7 @@ CFLAGS_REMOVE_feature-fixups.o = -pg
- 
- obj-y			:= string.o alloc.o \
- 			   checksum_$(CONFIG_WORD_SIZE).o
--obj-$(CONFIG_PPC32)	+= div64.o copy_32.o crtsavres.o
-+obj-$(CONFIG_PPC32)	+= div64.o copy_32.o
- obj-$(CONFIG_HAS_IOMEM)	+= devres.o
- 
- obj-$(CONFIG_PPC64)	+= copypage_64.o copyuser_64.o \
---- a/arch/powerpc/Makefile
-+++ b/arch/powerpc/Makefile
-@@ -92,8 +92,6 @@ endif
- else
- 	KBUILD_CFLAGS += $(call cc-option,-mtune=power4)
- endif
--else
--LDFLAGS_MODULE	+= arch/powerpc/lib/crtsavres.o
- endif
- 
- ifeq ($(CONFIG_TUNE_CELL),y)
diff --git a/target/linux/generic-2.6/patches-2.6.34/970-ocf_kbuild_integration.patch b/target/linux/generic-2.6/patches-2.6.34/970-ocf_kbuild_integration.patch
deleted file mode 100644
index 0c40bdc92..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/970-ocf_kbuild_integration.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -823,6 +823,8 @@ config CRYPTO_ANSI_CPRNG
- 	  ANSI X9.31 A.2.4. Not this option must be enabled if CRYPTO_FIPS 
- 	  is selected
- 
-+source "crypto/ocf/Kconfig"
-+
- source "drivers/crypto/Kconfig"
- 
- endif	# if CRYPTO
---- a/crypto/Makefile
-+++ b/crypto/Makefile
-@@ -86,6 +86,11 @@ obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o
- obj-$(CONFIG_CRYPTO_GHASH) += ghash-generic.o
- 
- #
-+# OCF
-+#
-+obj-$(CONFIG_OCF_OCF) += ocf/
-+
-+#
- # generic algorithms and the async_tx api
- #
- obj-$(CONFIG_XOR_BLOCKS) += xor.o
diff --git a/target/linux/generic-2.6/patches-2.6.34/971-ocf_20080917.patch b/target/linux/generic-2.6/patches-2.6.34/971-ocf_20080917.patch
deleted file mode 100644
index 669be1a6f..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/971-ocf_20080917.patch
+++ /dev/null
@@ -1,152 +0,0 @@
---- a/drivers/char/random.c
-+++ b/drivers/char/random.c
-@@ -129,6 +129,9 @@
-  *                                unsigned int value);
-  * 	void add_interrupt_randomness(int irq);
-  *
-+ *      void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
-+ *      int random_input_wait(void);
-+ *
-  * add_input_randomness() uses the input layer interrupt timing, as well as
-  * the event type information from the hardware.
-  *
-@@ -140,6 +143,13 @@
-  * a better measure, since the timing of the disk interrupts are more
-  * unpredictable.
-  *
-+ * random_input_words() just provides a raw block of entropy to the input
-+ * pool, such as from a hardware entropy generator.
-+ *
-+ * random_input_wait() suspends the caller until such time as the
-+ * entropy pool falls below the write threshold, and returns a count of how
-+ * much entropy (in bits) is needed to sustain the pool.
-+ *
-  * All of these routines try to estimate how many bits of randomness a
-  * particular randomness source.  They do this by keeping track of the
-  * first and second order deltas of the event timings.
-@@ -714,6 +724,61 @@ void add_disk_randomness(struct gendisk 
- }
- #endif
- 
-+/*
-+ * random_input_words - add bulk entropy to pool
-+ *
-+ * @buf: buffer to add
-+ * @wordcount: number of __u32 words to add
-+ * @ent_count: total amount of entropy (in bits) to credit
-+ *
-+ * this provides bulk input of entropy to the input pool
-+ *
-+ */
-+void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
-+{
-+	mix_pool_bytes(&input_pool, buf, wordcount*4);
-+
-+	credit_entropy_bits(&input_pool, ent_count);
-+
-+	DEBUG_ENT("crediting %d bits => %d\n",
-+		  ent_count, input_pool.entropy_count);
-+	/*
-+	 * Wake up waiting processes if we have enough
-+	 * entropy.
-+	 */
-+	if (input_pool.entropy_count >= random_read_wakeup_thresh)
-+		wake_up_interruptible(&random_read_wait);
-+}
-+EXPORT_SYMBOL(random_input_words);
-+
-+/*
-+ * random_input_wait - wait until random needs entropy
-+ *
-+ * this function sleeps until the /dev/random subsystem actually
-+ * needs more entropy, and then return the amount of entropy
-+ * that it would be nice to have added to the system.
-+ */
-+int random_input_wait(void)
-+{
-+	int count;
-+
-+	wait_event_interruptible(random_write_wait, 
-+			 input_pool.entropy_count < random_write_wakeup_thresh);
-+
-+	count = random_write_wakeup_thresh - input_pool.entropy_count;
-+
-+        /* likely we got woken up due to a signal */
-+	if (count <= 0) count = random_read_wakeup_thresh; 
-+
-+	DEBUG_ENT("requesting %d bits from input_wait()er %d<%d\n",
-+		  count,
-+		  input_pool.entropy_count, random_write_wakeup_thresh);
-+
-+	return count;
-+}
-+EXPORT_SYMBOL(random_input_wait);
-+
-+
- #define EXTRACT_SIZE 10
- 
- /*********************************************************************
---- a/fs/fcntl.c
-+++ b/fs/fcntl.c
-@@ -141,6 +141,7 @@ SYSCALL_DEFINE1(dup, unsigned int, filde
- 	}
- 	return ret;
- }
-+EXPORT_SYMBOL(sys_dup);
- 
- #define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME)
- 
---- a/include/linux/miscdevice.h
-+++ b/include/linux/miscdevice.h
-@@ -12,6 +12,7 @@
- #define APOLLO_MOUSE_MINOR	7
- #define PC110PAD_MINOR		9
- /*#define ADB_MOUSE_MINOR	10	FIXME OBSOLETE */
-+#define CRYPTODEV_MINOR		70	/* /dev/crypto */
- #define WATCHDOG_MINOR		130	/* Watchdog timer     */
- #define TEMP_MINOR		131	/* Temperature Sensor */
- #define RTC_MINOR		135
---- a/include/linux/random.h
-+++ b/include/linux/random.h
-@@ -34,6 +34,30 @@
- /* Clear the entropy pool and associated counters.  (Superuser only.) */
- #define RNDCLEARPOOL	_IO( 'R', 0x06 )
- 
-+#ifdef CONFIG_FIPS_RNG
-+
-+/* Size of seed value - equal to AES blocksize */
-+#define AES_BLOCK_SIZE_BYTES	16
-+#define SEED_SIZE_BYTES			AES_BLOCK_SIZE_BYTES
-+/* Size of AES key */
-+#define KEY_SIZE_BYTES		16
-+
-+/* ioctl() structure used by FIPS 140-2 Tests */
-+struct rand_fips_test {
-+	unsigned char key[KEY_SIZE_BYTES];			/* Input */
-+	unsigned char datetime[SEED_SIZE_BYTES];	/* Input */
-+	unsigned char seed[SEED_SIZE_BYTES];		/* Input */
-+	unsigned char result[SEED_SIZE_BYTES];		/* Output */
-+};
-+
-+/* FIPS 140-2 RNG Variable Seed Test. (Superuser only.) */
-+#define RNDFIPSVST	_IOWR('R', 0x10, struct rand_fips_test)
-+
-+/* FIPS 140-2 RNG Monte Carlo Test. (Superuser only.) */
-+#define RNDFIPSMCT	_IOWR('R', 0x11, struct rand_fips_test)
-+
-+#endif /* #ifdef CONFIG_FIPS_RNG */
-+
- struct rand_pool_info {
- 	int	entropy_count;
- 	int	buf_size;
-@@ -50,6 +74,10 @@ extern void add_input_randomness(unsigne
- 				 unsigned int value);
- extern void add_interrupt_randomness(int irq);
- 
-+extern void random_input_words(__u32 *buf, size_t wordcount, int ent_count);
-+extern int random_input_wait(void);
-+#define HAS_RANDOM_INPUT_WAIT 1
-+
- extern void get_random_bytes(void *buf, int nbytes);
- void generate_random_uuid(unsigned char uuid_out[16]);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.34/972-ocf_compile_fix.patch b/target/linux/generic-2.6/patches-2.6.34/972-ocf_compile_fix.patch
deleted file mode 100644
index a3fa22681..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/972-ocf_compile_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/crypto/ocf/cryptosoft.c
-+++ b/crypto/ocf/cryptosoft.c
-@@ -47,7 +47,7 @@
- #include <linux/mm.h>
- #include <linux/skbuff.h>
- #include <linux/random.h>
--#include <asm/scatterlist.h>
-+#include <linux/scatterlist.h>
- 
- #include <cryptodev.h>
- #include <uio.h>
diff --git a/target/linux/generic-2.6/patches-2.6.34/973-ocf_2.6.27_fix.patch b/target/linux/generic-2.6/patches-2.6.34/973-ocf_2.6.27_fix.patch
deleted file mode 100644
index ecb9bef51..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/973-ocf_2.6.27_fix.patch
+++ /dev/null
@@ -1,197 +0,0 @@
---- a/crypto/ocf/random.c
-+++ b/crypto/ocf/random.c
-@@ -49,6 +49,7 @@
- #include <linux/unistd.h>
- #include <linux/poll.h>
- #include <linux/random.h>
-+#include <linux/kthread.h>
- #include <cryptodev.h>
- 
- #ifdef CONFIG_OCF_FIPS
-@@ -81,7 +82,7 @@ struct random_op {
- 
- static int random_proc(void *arg);
- 
--static pid_t		randomproc = (pid_t) -1;
-+static struct task_struct *random_task;
- static spinlock_t	random_lock;
- 
- /*
-@@ -141,13 +142,18 @@ crypto_rregister(
- 	spin_lock_irqsave(&random_lock, flags);
- 	list_add_tail(&rops->random_list, &random_ops);
- 	if (!started) {
--		randomproc = kernel_thread(random_proc, NULL, CLONE_FS|CLONE_FILES);
--		if (randomproc < 0) {
--			ret = randomproc;
-+		struct task_struct *t;
-+
-+		t = kthread_create(random_proc, NULL, "ocf-random");
-+		if (IS_ERR(t)) {
-+			ret = PTR_ERR(t);
- 			printk("crypto: crypto_rregister cannot start random thread; "
- 					"error %d", ret);
--		} else
-+		} else {
-+			random_task = t;
-+			wake_up_process(t);
- 			started = 1;
-+		}
- 	}
- 	spin_unlock_irqrestore(&random_lock, flags);
- 
-@@ -172,7 +178,7 @@ crypto_runregister_all(u_int32_t driveri
- 
- 	spin_lock_irqsave(&random_lock, flags);
- 	if (list_empty(&random_ops) && started)
--		kill_proc(randomproc, SIGKILL, 1);
-+		send_sig(SIGKILL, random_task, 1);
- 	spin_unlock_irqrestore(&random_lock, flags);
- 	return(0);
- }
-@@ -308,7 +314,7 @@ random_proc(void *arg)
- 
- bad_alloc:
- 	spin_lock_irq(&random_lock);
--	randomproc = (pid_t) -1;
-+	random_task = NULL;
- 	started = 0;
- 	spin_unlock_irq(&random_lock);
- 
---- a/crypto/ocf/crypto.c
-+++ b/crypto/ocf/crypto.c
-@@ -74,6 +74,7 @@ __FBSDID("$FreeBSD: src/sys/opencrypto/c
- #include <linux/sched.h>
- #include <linux/spinlock.h>
- #include <linux/version.h>
-+#include <linux/kthread.h>
- #include <cryptodev.h>
- 
- /*
-@@ -255,10 +256,10 @@ module_param(crypto_devallowsoft, int, 0
- MODULE_PARM_DESC(crypto_devallowsoft,
- 	   "Enable/disable use of software crypto support");
- 
--static pid_t	cryptoproc = (pid_t) -1;
-+static struct task_struct *crypto_task;
- static struct	completion cryptoproc_exited;
- static DECLARE_WAIT_QUEUE_HEAD(cryptoproc_wait);
--static pid_t	cryptoretproc = (pid_t) -1;
-+static struct task_struct *cryptoret_task;
- static struct	completion cryptoretproc_exited;
- static DECLARE_WAIT_QUEUE_HEAD(cryptoretproc_wait);
- 
-@@ -1401,7 +1402,7 @@ crypto_proc(void *arg)
- 			wait_event_interruptible(cryptoproc_wait,
- 					!(list_empty(&crp_q) || crypto_all_qblocked) ||
- 					!(list_empty(&crp_kq) || crypto_all_kqblocked) ||
--					cryptoproc == (pid_t) -1);
-+					crypto_task == NULL);
- 			crp_sleep = 0;
- 			if (signal_pending (current)) {
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-@@ -1414,7 +1415,7 @@ crypto_proc(void *arg)
- 			}
- 			CRYPTO_Q_LOCK();
- 			dprintk("%s - awake\n", __FUNCTION__);
--			if (cryptoproc == (pid_t) -1)
-+			if (crypto_task == NULL)
- 				break;
- 			cryptostats.cs_intrs++;
- 		}
-@@ -1470,7 +1471,7 @@ crypto_ret_proc(void *arg)
- 			dprintk("%s - sleeping\n", __FUNCTION__);
- 			CRYPTO_RETQ_UNLOCK();
- 			wait_event_interruptible(cryptoretproc_wait,
--					cryptoretproc == (pid_t) -1 ||
-+					cryptoret_task == NULL ||
- 					!list_empty(&crp_ret_q) ||
- 					!list_empty(&crp_ret_kq));
- 			if (signal_pending (current)) {
-@@ -1484,7 +1485,7 @@ crypto_ret_proc(void *arg)
- 			}
- 			CRYPTO_RETQ_LOCK();
- 			dprintk("%s - awake\n", __FUNCTION__);
--			if (cryptoretproc == (pid_t) -1) {
-+			if (cryptoret_task == NULL) {
- 				dprintk("%s - EXITING!\n", __FUNCTION__);
- 				break;
- 			}
-@@ -1597,6 +1598,7 @@ DB_SHOW_COMMAND(kcrypto, db_show_kcrypto
- static int
- crypto_init(void)
- {
-+	struct task_struct *t;
- 	int error;
- 
- 	dprintk("%s(0x%x)\n", __FUNCTION__, (int) crypto_init);
-@@ -1643,23 +1645,27 @@ crypto_init(void)
- 	init_completion(&cryptoproc_exited);
- 	init_completion(&cryptoretproc_exited);
- 
--	cryptoproc = 0; /* to avoid race condition where proc runs first */
--	cryptoproc = kernel_thread(crypto_proc, NULL, CLONE_FS|CLONE_FILES);
--	if (cryptoproc < 0) {
--		error = cryptoproc;
-+	crypto_task = NULL; /* to avoid race condition where proc runs first */
-+	t = kthread_create(crypto_proc, NULL, "ocf-crypto");
-+	if (IS_ERR(t)) {
-+		error = PTR_ERR(t);
- 		printk("crypto: crypto_init cannot start crypto thread; error %d",
- 			error);
- 		goto bad;
- 	}
-+	wake_up_process(t);
-+	crypto_task = t;
- 
--	cryptoretproc = 0; /* to avoid race condition where proc runs first */
--	cryptoretproc = kernel_thread(crypto_ret_proc, NULL, CLONE_FS|CLONE_FILES);
--	if (cryptoretproc < 0) {
--		error = cryptoretproc;
-+	cryptoret_task = NULL; /* to avoid race condition where proc runs first */
-+	t = kthread_create(crypto_ret_proc, NULL, "ocf-cryptoret");
-+	if (IS_ERR(t)) {
-+		error = PTR_ERR(t);
- 		printk("crypto: crypto_init cannot start cryptoret thread; error %d",
- 				error);
- 		goto bad;
- 	}
-+	wake_up_process(t);
-+	cryptoret_task = t;
- 
- 	return 0;
- bad:
-@@ -1671,7 +1677,7 @@ bad:
- static void
- crypto_exit(void)
- {
--	pid_t p;
-+	struct task_struct *t;
- 	unsigned long d_flags;
- 
- 	dprintk("%s()\n", __FUNCTION__);
-@@ -1681,18 +1687,18 @@ crypto_exit(void)
- 	 */
- 
- 	CRYPTO_DRIVER_LOCK();
--	p = cryptoproc;
--	cryptoproc = (pid_t) -1;
--	kill_proc(p, SIGTERM, 1);
-+	t = crypto_task;
-+	crypto_task = NULL;
-+	send_sig(SIGTERM, t, 1);
- 	wake_up_interruptible(&cryptoproc_wait);
- 	CRYPTO_DRIVER_UNLOCK();
- 
- 	wait_for_completion(&cryptoproc_exited);
- 
- 	CRYPTO_DRIVER_LOCK();
--	p = cryptoretproc;
--	cryptoretproc = (pid_t) -1;
--	kill_proc(p, SIGTERM, 1);
-+	t = cryptoret_task;
-+	cryptoret_task = NULL;
-+	send_sig(SIGTERM, t, 1);
- 	wake_up_interruptible(&cryptoretproc_wait);
- 	CRYPTO_DRIVER_UNLOCK();
- 
diff --git a/target/linux/generic-2.6/patches-2.6.34/974-ssb_b43_default_on.patch b/target/linux/generic-2.6/patches-2.6.34/974-ssb_b43_default_on.patch
deleted file mode 100644
index 98dde2a3c..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/974-ssb_b43_default_on.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/drivers/ssb/Kconfig
-+++ b/drivers/ssb/Kconfig
-@@ -49,7 +49,7 @@ config SSB_PCIHOST
- config SSB_B43_PCI_BRIDGE
- 	bool
- 	depends on SSB_PCIHOST
--	default n
-+	default y
- 
- config SSB_PCMCIAHOST_POSSIBLE
- 	bool
diff --git a/target/linux/generic-2.6/patches-2.6.34/977-textsearch_kconfig_hacks.patch b/target/linux/generic-2.6/patches-2.6.34/977-textsearch_kconfig_hacks.patch
deleted file mode 100644
index 94d6b91d8..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/977-textsearch_kconfig_hacks.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -152,16 +152,16 @@ config REED_SOLOMON_DEC16
- # Textsearch support is select'ed if needed
- #
- config TEXTSEARCH
--	boolean
-+	boolean	"Textsearch support"
- 
- config TEXTSEARCH_KMP
--	tristate
-+	tristate "Textsearch KMP"
- 
- config TEXTSEARCH_BM
--	tristate
-+	tristate "Textsearch BM"
- 
- config TEXTSEARCH_FSM
--	tristate
-+	tristate "Textsearch FSM"
- 
- config HAS_IOMEM
- 	boolean
diff --git a/target/linux/generic-2.6/patches-2.6.34/978-lib80211_kconfig_hacks.patch b/target/linux/generic-2.6/patches-2.6.34/978-lib80211_kconfig_hacks.patch
deleted file mode 100644
index 05bb838c1..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/978-lib80211_kconfig_hacks.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/net/wireless/Kconfig
-+++ b/net/wireless/Kconfig
-@@ -141,13 +141,13 @@ config LIB80211
- 	  you want this built into your kernel.
- 
- config LIB80211_CRYPT_WEP
--	tristate
-+	tristate "LIB80211_CRYPT_WEP"
- 
- config LIB80211_CRYPT_CCMP
--	tristate
-+	tristate "LIB80211_CRYPT_CCMP"
- 
- config LIB80211_CRYPT_TKIP
--	tristate
-+	tristate "LIB80211_CRYPT_TKIP"
- 
- config LIB80211_DEBUG
- 	bool "lib80211 debugging messages"
diff --git a/target/linux/generic-2.6/patches-2.6.34/979-crypto_add_kconfig_prompts.patch b/target/linux/generic-2.6/patches-2.6.34/979-crypto_add_kconfig_prompts.patch
deleted file mode 100644
index b40b2cea9..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/979-crypto_add_kconfig_prompts.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -32,7 +32,7 @@ config CRYPTO_FIPS
- 	  option is selected
- 
- config CRYPTO_ALGAPI
--	tristate
-+	tristate "ALGAPI"
- 	select CRYPTO_ALGAPI2
- 	help
- 	  This option provides the API for cryptographic algorithms.
-@@ -41,7 +41,7 @@ config CRYPTO_ALGAPI2
- 	tristate
- 
- config CRYPTO_AEAD
--	tristate
-+	tristate "AEAD"
- 	select CRYPTO_AEAD2
- 	select CRYPTO_ALGAPI
- 
-@@ -50,7 +50,7 @@ config CRYPTO_AEAD2
- 	select CRYPTO_ALGAPI2
- 
- config CRYPTO_BLKCIPHER
--	tristate
-+	tristate "BLKCIPHER"
- 	select CRYPTO_BLKCIPHER2
- 	select CRYPTO_ALGAPI
- 
-@@ -61,7 +61,7 @@ config CRYPTO_BLKCIPHER2
- 	select CRYPTO_WORKQUEUE
- 
- config CRYPTO_HASH
--	tristate
-+	tristate "HASH"
- 	select CRYPTO_HASH2
- 	select CRYPTO_ALGAPI
- 
-@@ -70,7 +70,7 @@ config CRYPTO_HASH2
- 	select CRYPTO_ALGAPI2
- 
- config CRYPTO_RNG
--	tristate
-+	tristate "RNG"
- 	select CRYPTO_RNG2
- 	select CRYPTO_ALGAPI
- 
diff --git a/target/linux/generic-2.6/patches-2.6.34/980-vm_exports.patch b/target/linux/generic-2.6/patches-2.6.34/980-vm_exports.patch
deleted file mode 100644
index 39b22150b..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/980-vm_exports.patch
+++ /dev/null
@@ -1,142 +0,0 @@
---- a/mm/shmem.c
-+++ b/mm/shmem.c
-@@ -29,6 +29,7 @@
- #include <linux/mm.h>
- #include <linux/module.h>
- #include <linux/swap.h>
-+#include <linux/ima.h>
- 
- static struct vfsmount *shm_mnt;
- 
-@@ -2620,6 +2621,16 @@ int shmem_lock(struct file *file, int lo
- 
- /* common code */
- 
-+void shmem_set_file(struct vm_area_struct *vma, struct file *file)
-+{
-+	ima_counts_get(file);
-+	if (vma->vm_file)
-+		fput(vma->vm_file);
-+	vma->vm_file = file;
-+	vma->vm_ops = &shmem_vm_ops;
-+}
-+EXPORT_SYMBOL_GPL(shmem_set_file);
-+
- /**
-  * shmem_file_setup - get an unlinked file living in tmpfs
-  * @name: name for dentry (to be seen in /proc/<pid>/maps
-@@ -2697,9 +2708,6 @@ int shmem_zero_setup(struct vm_area_stru
- 	if (IS_ERR(file))
- 		return PTR_ERR(file);
- 
--	if (vma->vm_file)
--		fput(vma->vm_file);
--	vma->vm_file = file;
--	vma->vm_ops = &shmem_vm_ops;
-+	shmem_set_file(vma, file);
- 	return 0;
- }
---- a/fs/file.c
-+++ b/fs/file.c
-@@ -271,6 +271,7 @@ int expand_files(struct files_struct *fi
- 	/* All good, so we try */
- 	return expand_fdtable(files, nr);
- }
-+EXPORT_SYMBOL_GPL(expand_files);
- 
- static int count_open_files(struct fdtable *fdt)
- {
---- a/kernel/exit.c
-+++ b/kernel/exit.c
-@@ -508,6 +508,7 @@ struct files_struct *get_files_struct(st
- 
- 	return files;
- }
-+EXPORT_SYMBOL_GPL(get_files_struct);
- 
- void put_files_struct(struct files_struct *files)
- {
-@@ -527,6 +528,7 @@ void put_files_struct(struct files_struc
- 		free_fdtable(fdt);
- 	}
- }
-+EXPORT_SYMBOL_GPL(put_files_struct);
- 
- void reset_files_struct(struct files_struct *files)
- {
---- a/kernel/fork.c
-+++ b/kernel/fork.c
-@@ -169,6 +169,7 @@ void __put_task_struct(struct task_struc
- 	if (!profile_handoff_task(tsk))
- 		free_task(tsk);
- }
-+EXPORT_SYMBOL_GPL(__put_task_struct);
- 
- /*
-  * macro override instead of weak attribute alias, to workaround
---- a/kernel/sched.c
-+++ b/kernel/sched.c
-@@ -6149,6 +6149,7 @@ int can_nice(const struct task_struct *p
- 	return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
- 		capable(CAP_SYS_NICE));
- }
-+EXPORT_SYMBOL_GPL(can_nice);
- 
- #ifdef __ARCH_WANT_SYS_NICE
- 
---- a/mm/memory.c
-+++ b/mm/memory.c
-@@ -1115,6 +1115,7 @@ unsigned long zap_page_range(struct vm_a
- 		tlb_finish_mmu(tlb, address, end);
- 	return end;
- }
-+EXPORT_SYMBOL_GPL(zap_page_range);
- 
- /**
-  * zap_vma_ptes - remove ptes mapping the vma
-@@ -2501,6 +2502,7 @@ int vmtruncate_range(struct inode *inode
- 
- 	return 0;
- }
-+EXPORT_SYMBOL_GPL(vmtruncate_range);
- 
- /*
-  * We enter with non-exclusive mmap_sem (to exclude vma changes,
---- a/mm/vmalloc.c
-+++ b/mm/vmalloc.c
-@@ -1173,6 +1173,7 @@ void unmap_kernel_range(unsigned long ad
- 	vunmap_page_range(addr, end);
- 	flush_tlb_kernel_range(addr, end);
- }
-+EXPORT_SYMBOL_GPL(unmap_kernel_range);
- 
- int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
- {
-@@ -1288,6 +1289,7 @@ struct vm_struct *get_vm_area(unsigned l
- 	return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END,
- 				-1, GFP_KERNEL, __builtin_return_address(0));
- }
-+EXPORT_SYMBOL_GPL(get_vm_area);
- 
- struct vm_struct *get_vm_area_caller(unsigned long size, unsigned long flags,
- 				void *caller)
---- a/include/linux/mm.h
-+++ b/include/linux/mm.h
-@@ -725,6 +725,7 @@ extern void show_free_areas(void);
- 
- int shmem_lock(struct file *file, int lock, struct user_struct *user);
- struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags);
-+void shmem_set_file(struct vm_area_struct *vma, struct file *file);
- int shmem_zero_setup(struct vm_area_struct *);
- 
- #ifndef CONFIG_MMU
---- a/kernel/signal.c
-+++ b/kernel/signal.c
-@@ -1104,6 +1104,7 @@ struct sighand_struct *lock_task_sighand
- 
- 	return sighand;
- }
-+EXPORT_SYMBOL(lock_task_sighand);
- 
- /*
-  * send signal info to all the members of a group
diff --git a/target/linux/generic-2.6/patches-2.6.34/981-wireless_ext_kconfig_hack.patch b/target/linux/generic-2.6/patches-2.6.34/981-wireless_ext_kconfig_hack.patch
deleted file mode 100644
index daac5898a..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/981-wireless_ext_kconfig_hack.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/net/wireless/Kconfig
-+++ b/net/wireless/Kconfig
-@@ -1,5 +1,5 @@
- config WIRELESS_EXT
--	bool
-+	bool "Wireless extensions"
- 
- config WEXT_CORE
- 	def_bool y
-@@ -11,10 +11,10 @@ config WEXT_PROC
- 	depends on WEXT_CORE
- 
- config WEXT_SPY
--	bool
-+	bool "WEXT_SPY"
- 
- config WEXT_PRIV
--	bool
-+	bool "WEXT_PRIV"
- 
- config CFG80211
- 	tristate "cfg80211 - wireless configuration API"
diff --git a/target/linux/generic-2.6/patches-2.6.34/985-cris-headers.patch b/target/linux/generic-2.6/patches-2.6.34/985-cris-headers.patch
deleted file mode 100644
index 73ede933b..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/985-cris-headers.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/arch/cris/include/arch-v10/arch/Kbuild
-+++ b/arch/cris/include/arch-v10/arch/Kbuild
-@@ -1,3 +1,5 @@
-+header-y += elf.h
-+header-y += ptrace.h
- header-y += user.h
- header-y += svinto.h
- header-y += sv_addr_ag.h
---- a/arch/cris/include/asm/Kbuild
-+++ b/arch/cris/include/asm/Kbuild
-@@ -1,11 +1,14 @@
- include include/asm-generic/Kbuild.asm
- 
--header-y += arch-v10/
--header-y += arch-v32/
-+header-y += ../arch-v10/arch/
-+header-y += ../arch-v32/arch/
- 
-+header-y += elf.h
- header-y += ethernet.h
-+header-y += page.h
- header-y += rtc.h
- header-y += sync_serial.h
-+header-y += user.h
- 
- unifdef-y += etraxgpio.h
- unifdef-y += rs485.h
diff --git a/target/linux/generic-2.6/patches-2.6.34/991-ppc4xx_optimization.patch b/target/linux/generic-2.6/patches-2.6.34/991-ppc4xx_optimization.patch
deleted file mode 100644
index 0efb77780..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/991-ppc4xx_optimization.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Upstream doesn't optimize the kernel and bootwrappers for ppc44x because
-they still want to support gcc 3.3 -- well, we don't.
-
---- a/arch/powerpc/Makefile
-+++ b/arch/powerpc/Makefile
-@@ -123,7 +123,8 @@ ifeq ($(CONFIG_FUNCTION_TRACER),y)
- KBUILD_CFLAGS		+= -mno-sched-epilog
- endif
- 
--cpu-as-$(CONFIG_4xx)		+= -Wa,-m405
-+cpu-as-$(CONFIG_40x)		+= -Wa,-m405
-+cpu-as-$(CONFIG_44x)		+= -Wa,-m440
- cpu-as-$(CONFIG_6xx)		+= -Wa,-maltivec
- cpu-as-$(CONFIG_POWER4)		+= -Wa,-maltivec
- cpu-as-$(CONFIG_E500)		+= -Wa,-me500
---- a/arch/powerpc/boot/Makefile
-+++ b/arch/powerpc/boot/Makefile
-@@ -38,10 +38,10 @@ BOOTCFLAGS	+= -I$(obj) -I$(srctree)/$(ob
- DTS_FLAGS	?= -p 1024
- 
- $(obj)/4xx.o: BOOTCFLAGS += -mcpu=405
--$(obj)/ebony.o: BOOTCFLAGS += -mcpu=405
-+$(obj)/ebony.o: BOOTCFLAGS += -mcpu=440
- $(obj)/cuboot-hotfoot.o: BOOTCFLAGS += -mcpu=405
--$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405
--$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405
-+$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=440
-+$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=440
- $(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405
- $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
- $(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405
diff --git a/target/linux/generic-2.6/patches-2.6.34/997-lzo_decompressor_fix.patch b/target/linux/generic-2.6/patches-2.6.34/997-lzo_decompressor_fix.patch
deleted file mode 100644
index 450986538..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/997-lzo_decompressor_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/usr/Kconfig
-+++ b/usr/Kconfig
-@@ -75,7 +75,7 @@ config RD_LZMA
- config RD_LZO
- 	bool "Support initial ramdisks compressed using LZO" if EMBEDDED
- 	default !EMBEDDED
--	depends on BLK_DEV_INITRD
-+	depends on BLK_DEV_INITRD && HAVE_KERNEL_LZO
- 	select DECOMPRESS_LZO
- 	help
- 	  Support loading of a LZO encoded initial ramdisk or cpio buffer
diff --git a/target/linux/generic-2.6/patches-2.6.34/998-openwrt_lzma_options.patch b/target/linux/generic-2.6/patches-2.6.34/998-openwrt_lzma_options.patch
deleted file mode 100644
index 0ac880cae..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/998-openwrt_lzma_options.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/scripts/Makefile.lib
-+++ b/scripts/Makefile.lib
-@@ -238,7 +238,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) 
- 
- quiet_cmd_lzma = LZMA    $@
- cmd_lzma = (cat $(filter-out FORCE,$^) | \
--	lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
-+	lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
- 	(rm -f $@ ; false)
- 
- quiet_cmd_lzo = LZO    $@
---- a/scripts/gen_initramfs_list.sh
-+++ b/scripts/gen_initramfs_list.sh
-@@ -225,7 +225,7 @@ cpio_list=
- output="/dev/stdout"
- output_file=""
- is_cpio_compressed=
--compr="gzip -9 -f"
-+compr="gzip -9 -f -"
- 
- arg="$1"
- case "$arg" in
-@@ -239,9 +239,9 @@ case "$arg" in
- 		output_file="$1"
- 		cpio_list="$(mktemp ${TMPDIR:-/tmp}/cpiolist.XXXXXX)"
- 		output=${cpio_list}
--		echo "$output_file" | grep -q "\.gz$" && compr="gzip -9 -f"
--		echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f"
--		echo "$output_file" | grep -q "\.lzma$" && compr="lzma -9 -f"
-+		echo "$output_file" | grep -q "\.gz$" && compr="gzip -9 -f -"
-+		echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f -"
-+		echo "$output_file" | grep -q "\.lzma$" && compr="lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so"
- 		echo "$output_file" | grep -q "\.cpio$" && compr="cat"
- 		shift
- 		;;
-@@ -292,7 +292,7 @@ if [ ! -z ${output_file} ]; then
- 	if [ "${is_cpio_compressed}" = "compressed" ]; then
- 		cat ${cpio_tfile} > ${output_file}
- 	else
--		(cat ${cpio_tfile} | ${compr}  - > ${output_file}) \
-+		(cat ${cpio_tfile} | ${compr} > ${output_file}) \
- 		|| (rm -f ${output_file} ; false)
- 	fi
- 	[ -z ${cpio_file} ] && rm ${cpio_tfile}
---- a/lib/decompress.c
-+++ b/lib/decompress.c
-@@ -36,6 +36,7 @@ static const struct compress_format {
- 	{ {037, 0236}, "gzip", gunzip },
- 	{ {0x42, 0x5a}, "bzip2", bunzip2 },
- 	{ {0x5d, 0x00}, "lzma", unlzma },
-+	{ {0x6d, 0x00}, "lzma-openwrt", unlzma },
- 	{ {0x89, 0x4c}, "lzo", unlzo },
- 	{ {0, 0}, NULL, NULL }
- };
diff --git a/target/linux/generic-2.6/patches-2.6.34/999-use_preinit_as_init.patch b/target/linux/generic-2.6/patches-2.6.34/999-use_preinit_as_init.patch
deleted file mode 100644
index c1f8ef075..000000000
--- a/target/linux/generic-2.6/patches-2.6.34/999-use_preinit_as_init.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/init/main.c
-+++ b/init/main.c
-@@ -831,10 +831,7 @@ static noinline int init_post(void)
- 		printk(KERN_WARNING "Failed to execute %s.  Attempting "
- 					"defaults...\n", execute_command);
- 	}
--	run_init_process("/sbin/init");
--	run_init_process("/etc/init");
--	run_init_process("/bin/init");
--	run_init_process("/bin/sh");
-+	run_init_process("/etc/preinit");
- 
- 	panic("No init found.  Try passing init= option to kernel.");
- }
diff --git a/target/linux/goldfish/Makefile b/target/linux/goldfish/Makefile
deleted file mode 100644
index 84342fded..000000000
--- a/target/linux/goldfish/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# 
-# Copyright (C) 2006-2009 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-ARCH:=arm
-BOARD:=goldfish
-BOARDNAME:=Goldfish (Android Emulator)
-FEATURES:=
-CFLAGS:=-O2 -pipe -march=armv5te -mtune=xscale -funit-at-a-time
-
-LINUX_VERSION:=2.6.30.10
-
-DEVICE_TYPE=phone
-
-define Target/Description
-	Android emulator virtual platform
-endef
-
-include $(INCLUDE_DIR)/target.mk
-
-$(eval $(call BuildTarget))
diff --git a/target/linux/goldfish/config-2.6.30 b/target/linux/goldfish/config-2.6.30
deleted file mode 100644
index abb11e4c6..000000000
--- a/target/linux/goldfish/config-2.6.30
+++ /dev/null
@@ -1,205 +0,0 @@
-CONFIG_AEABI=y
-CONFIG_ALIGNMENT_TRAP=y
-# CONFIG_APM_EMULATION is not set
-CONFIG_ARCH_GOLDFISH=y
-# CONFIG_ARCH_HAS_HOLES_MEMORYMODEL is not set
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
-# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARM_THUMB=y
-CONFIG_ARM=y
-# CONFIG_BACKTRACE_SELF_TEST is not set
-CONFIG_BATTERY_GOLDFISH=y
-# CONFIG_BINARY_PRINTF is not set
-CONFIG_BITREVERSE=y
-# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-# CONFIG_BOOT_PRINTK_DELAY is not set
-CONFIG_CMDLINE="console=/dev/ttyS0 root=mtdblock0 rootdelay=1 rootfstype=yaffs2"
-# CONFIG_CONSOLE_EARLYSUSPEND is not set
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_CPU_32v5=y
-CONFIG_CPU_32=y
-CONFIG_CPU_ABRT_EV5TJ=y
-CONFIG_CPU_ARM926T=y
-# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
-CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_COPY_V4WB=y
-CONFIG_CPU_CP15_MMU=y
-CONFIG_CPU_CP15=y
-# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
-# CONFIG_CPU_ICACHE_DISABLE is not set
-CONFIG_CPU_PABRT_NOIFAR=y
-CONFIG_CPU_TLB_V4WBI=y
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_WORKQUEUE=y
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_ERRORS is not set
-# CONFIG_DEBUG_INFO is not set
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_LL is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_SHIRQ is not set
-# CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_USER is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_WRITECOUNT is not set
-# CONFIG_DETECT_HUNG_TASK is not set
-CONFIG_DETECT_SOFTLOCKUP=y
-CONFIG_DEVKMEM=y
-# CONFIG_DM9000 is not set
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_EARLYSUSPEND=y
-# CONFIG_FAULT_INJECTION is not set
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_EARLYSUSPEND=y
-CONFIG_FB_GOLDFISH=y
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-CONFIG_FB=y
-# CONFIG_FIRMWARE_EDID is not set
-CONFIG_FONT_8x16=y
-CONFIG_FONT_8x8=y
-# CONFIG_FONTS is not set
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAME_POINTER=y
-CONFIG_FREEZER=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-# CONFIG_GENERIC_GPIO is not set
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-CONFIG_GOLDFISH_TTY=y
-# CONFIG_HAMRADIO is not set
-CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_EARLYSUSPEND=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAS_WAKELOCK=y
-CONFIG_HAVE_AOUT=y
-CONFIG_HAVE_ARCH_KGDB=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_HAVE_IDE=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_HAVE_MLOCK=y
-CONFIG_HAVE_OPROFILE=y
-CONFIG_HID_SUPPORT=y
-CONFIG_HID=y
-CONFIG_HW_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_GPIO=y
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_INPUT_KEYRESET=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_INPUT=y
-# CONFIG_JFFS2_CMODE_PRIORITY is not set
-CONFIG_JFFS2_CMODE_SIZE=y
-# CONFIG_KEYBOARD_ATKBD is not set
-CONFIG_KEYBOARD_GOLDFISH_EVENTS=y
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-# CONFIG_KGDB is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_LOGO is not set
-CONFIG_MACH_GOLDFISH=y
-# CONFIG_MMC_GOLDFISH is not set
-# CONFIG_MTD_CFI is not set
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-CONFIG_MTD_CONCAT=y
-CONFIG_MTD_GOLDFISH_NAND=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_UBI_BEB_RESERVE=1
-# CONFIG_MTD_UBI_DEBUG is not set
-CONFIG_MTD_UBI_GLUEBI=y
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI=y
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NO_IOPORT is not set
-# CONFIG_NO_USER_SPACE_SCREEN_ACCESS_CONTROL is not set
-# CONFIG_OABI_COMPAT is not set
-# CONFIG_OUTER_CACHE is not set
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PAGE_OFFSET=0xC0000000
-# CONFIG_PAGE_POISONING is not set
-# CONFIG_PCI_SYSCALL is not set
-# CONFIG_PDA_POWER is not set
-# CONFIG_PM_DEBUG is not set
-CONFIG_PM_SLEEP=y
-CONFIG_PM=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-CONFIG_POWER_SUPPLY=y
-# CONFIG_PROVE_LOCKING is not set
-CONFIG_QEMU_TRACE=y
-# CONFIG_RCU_TORTURE_TEST is not set
-# CONFIG_RD_LZMA is not set
-CONFIG_RTC_CLASS=y
-# CONFIG_RTC_DRV_CMOS is not set
-CONFIG_RTC_DRV_GOLDFISH=y
-# CONFIG_RT_MUTEX_TESTER is not set
-CONFIG_SCHED_DEBUG=y
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_SCSI_DMA is not set
-# CONFIG_SERIAL_8250 is not set
-# CONFIG_SLOW_WORK is not set
-CONFIG_SMC91X=y
-CONFIG_SPLIT_PTLOCK_CPUS=4096
-CONFIG_SUSPEND_FREEZER=y
-CONFIG_SUSPEND=y
-CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-# CONFIG_TIMER_STATS is not set
-CONFIG_TRACING_SUPPORT=y
-# CONFIG_UBIFS_FS is not set
-CONFIG_UEVENT_HELPER_PATH=""
-CONFIG_UID16=y
-CONFIG_USER_WAKELOCK=y
-CONFIG_VECTORS_BASE=0xffff0000
-CONFIG_VFP=y
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_VIDEO_OUTPUT_CONTROL=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_VT=y
-CONFIG_WAKELOCK_STAT=y
-CONFIG_WAKELOCK=y
-# CONFIG_WATCHDOG is not set
-CONFIG_ZBOOT_ROM_BSS=0
-CONFIG_ZBOOT_ROM_TEXT=0
-CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/goldfish/image/Makefile b/target/linux/goldfish/image/Makefile
deleted file mode 100644
index 6cd57ba52..000000000
--- a/target/linux/goldfish/image/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# 
-# Copyright (C) 2006-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/image.mk
-
-JFFS2_BLOCKSIZE=124k
-JFFS2OPTS += -n -s 2048
-
-define Image/BuildKernel
-	$(TARGET_CROSS)objcopy -O binary -R .note -R .comment -S \
-		$(LINUX_DIR)/arch/arm/boot/compressed/vmlinux $(BIN_DIR)/$(IMG_PREFIX)-kernel.bin
-	$(if $(CONFIG_TARGET_ROOTFS_INITRAMFS), \
-		$(CP) $(LINUX_DIR)/usr/initramfs_data.cpio.gz, \
-		gzip -c < $(LINUX_DIR)/usr/initramfs_data.cpio > \
-	) $(BIN_DIR)/$(IMG_PREFIX)-ramdisk.bin
-	$(CP) ./run-emulator.sh $(BIN_DIR)/
-endef
-
-define Image/Build/jffs2-124k
-	$(CP) ./ubinize.cfg $(KDIR)/
-	(cd $(KDIR); \
-		ubinize \
-			-o $(BIN_DIR)/$(IMG_PREFIX)-$(1).img \
-			-p 128KiB -m 2KiB -s 2KiB ubinize.cfg; \
-	)
-	nand_ecc \
-		$(BIN_DIR)/$(IMG_PREFIX)-$(1).img \
-		$(BIN_DIR)/$(IMG_PREFIX)-system.bin
-endef
-
-define Image/Build
-	$(call Image/Build/$(1),$(1))
-endef
-
-
-$(eval $(call BuildImage))
diff --git a/target/linux/goldfish/image/run-emulator.sh b/target/linux/goldfish/image/run-emulator.sh
deleted file mode 100644
index c815a2313..000000000
--- a/target/linux/goldfish/image/run-emulator.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX=openwrt-goldfish-
-touch ${PREFIX}data.bin
-./goldfish-qemu/emulator -skindir ./goldfish-qemu/skins -skin HVGA -sysdir . -ramdisk ${PREFIX}ramdisk.bin -kernel ${PREFIX}kernel.bin -system ${PREFIX}system.bin -data ${PREFIX}data.bin -show-kernel -partition-size 100 -qemu -append "console=ttyS0 ubi.mtd=0 root=/dev/mtdblock3 rootfstype=jffs2 bootdelay=1 init=/etc/preinit" -net nic,vlan=0,model=smc91c111 -net user,vlan=0,hostname=OpenWrt
diff --git a/target/linux/goldfish/image/ubinize.cfg b/target/linux/goldfish/image/ubinize.cfg
deleted file mode 100644
index d8d1fde01..000000000
--- a/target/linux/goldfish/image/ubinize.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[rootfs]
-# Volume mode (other option is static)
-mode=ubi
-# Source image
-image=root.jffs2-124k
-# Volume ID in UBI image
-vol_id=0
-# Allow for dynamic resize
-vol_type=dynamic
-# Volume name
-vol_name=rootfs
-# Autoresize volume at first mount
-vol_flags=autoresize
-
diff --git a/target/linux/goldfish/patches-2.6.30/0042-ARM-Make-low-level-printk-work.patch b/target/linux/goldfish/patches-2.6.30/0042-ARM-Make-low-level-printk-work.patch
deleted file mode 100644
index 6a74a3bf6..000000000
--- a/target/linux/goldfish/patches-2.6.30/0042-ARM-Make-low-level-printk-work.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 0c61b75f9da1a0889959a0f9bd0b8b63f936ddf3 Mon Sep 17 00:00:00 2001
-From: Tony Lindgren <tony@atomide.com>
-Date: Mon, 9 May 2005 14:10:26 -0700
-Subject: [PATCH 042/134] ARM: Make low-level printk work
-
-Makes low-level printk work.
-
-Signed-off-by: Tony Lindgren <tony@atomide.com>
----
- kernel/printk.c |    8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
-
---- a/kernel/printk.c
-+++ b/kernel/printk.c
-@@ -45,6 +45,10 @@ void asmlinkage __attribute__((weak)) ea
- 
- #define __LOG_BUF_LEN	(1 << CONFIG_LOG_BUF_SHIFT)
- 
-+#ifdef        CONFIG_DEBUG_LL
-+extern void printascii(char *);
-+#endif
-+
- /* printk's without a loglevel use this.. */
- #define DEFAULT_MESSAGE_LOGLEVEL 4 /* KERN_WARNING */
- 
-@@ -687,6 +691,10 @@ asmlinkage int vprintk(const char *fmt, 
- 				  sizeof(printk_buf) - printed_len, fmt, args);
- 
- 
-+#ifdef	CONFIG_DEBUG_LL
-+	printascii(printk_buf);
-+#endif
-+
- 	/*
- 	 * Copy the output into log_buf.  If the caller didn't provide
- 	 * appropriate log level tags, we insert them here
diff --git a/target/linux/goldfish/patches-2.6.30/0052-lowmemorykiller-Only-iterate-over-process-list-when.patch b/target/linux/goldfish/patches-2.6.30/0052-lowmemorykiller-Only-iterate-over-process-list-when.patch
deleted file mode 100644
index baaa6863d..000000000
--- a/target/linux/goldfish/patches-2.6.30/0052-lowmemorykiller-Only-iterate-over-process-list-when.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 3742e6638bdb7325c6432e2a145ad985ee47d052 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@android.com>
-Date: Mon, 26 Jan 2009 19:13:47 -0800
-Subject: [PATCH 052/134] lowmemorykiller: Only iterate over process list when needed.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-Use NR_ACTIVE plus NR_INACTIVE as a size estimate for our fake cache
-instead the sum of rss. Neither method is accurate.
-
-Also skip the process scan, if the amount of memory available is above
-the largest threshold set.
-
-Signed-off-by: Arve Hjønnevåg <arve@android.com>
----
- drivers/staging/android/lowmemorykiller.c |   35 +++++++++++++++++-----------
- 1 files changed, 21 insertions(+), 14 deletions(-)
-
---- a/drivers/staging/android/lowmemorykiller.c
-+++ b/drivers/staging/android/lowmemorykiller.c
-@@ -71,23 +71,30 @@ static int lowmem_shrink(int nr_to_scan,
- 	}
- 	if(nr_to_scan > 0)
- 		lowmem_print(3, "lowmem_shrink %d, %x, ofree %d, ma %d\n", nr_to_scan, gfp_mask, other_free, min_adj);
-+	rem = global_page_state(NR_ACTIVE) + global_page_state(NR_INACTIVE);
-+	if (nr_to_scan <= 0 || min_adj == OOM_ADJUST_MAX + 1) {
-+		lowmem_print(5, "lowmem_shrink %d, %x, return %d\n", nr_to_scan, gfp_mask, rem);
-+		return rem;
-+	}
-+
- 	read_lock(&tasklist_lock);
- 	for_each_process(p) {
--		if(p->oomkilladj >= 0 && p->mm) {
--			tasksize = get_mm_rss(p->mm);
--			if(nr_to_scan > 0 && tasksize > 0 && p->oomkilladj >= min_adj) {
--				if(selected == NULL ||
--				   p->oomkilladj > selected->oomkilladj ||
--				   (p->oomkilladj == selected->oomkilladj &&
--				    tasksize > selected_tasksize)) {
--					selected = p;
--					selected_tasksize = tasksize;
--					lowmem_print(2, "select %d (%s), adj %d, size %d, to kill\n",
--					             p->pid, p->comm, p->oomkilladj, tasksize);
--				}
--			}
--			rem += tasksize;
-+		if (p->oomkilladj < min_adj || !p->mm)
-+			continue;
-+		tasksize = get_mm_rss(p->mm);
-+		if (tasksize <= 0)
-+			continue;
-+		if (selected) {
-+			if (p->oomkilladj < selected->oomkilladj)
-+				continue;
-+			if (p->oomkilladj == selected->oomkilladj &&
-+			    tasksize <= selected_tasksize)
-+				continue;
- 		}
-+		selected = p;
-+		selected_tasksize = tasksize;
-+		lowmem_print(2, "select %d (%s), adj %d, size %d, to kill\n",
-+		             p->pid, p->comm, p->oomkilladj, tasksize);
- 	}
- 	if(selected != NULL) {
- 		lowmem_print(1, "send sigkill to %d (%s), adj %d, size %d\n",
diff --git a/target/linux/goldfish/patches-2.6.30/0053-lowmemorykiller-Don-t-count-free-space-unless-it-me.patch b/target/linux/goldfish/patches-2.6.30/0053-lowmemorykiller-Don-t-count-free-space-unless-it-me.patch
deleted file mode 100644
index 605e72318..000000000
--- a/target/linux/goldfish/patches-2.6.30/0053-lowmemorykiller-Don-t-count-free-space-unless-it-me.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From f82da10dcae73652a6f0355e4398b4be1af17e6b Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@android.com>
-Date: Mon, 26 Jan 2009 19:22:19 -0800
-Subject: [PATCH 053/134] lowmemorykiller: Don't count free space unless it meets the specified limit by itself
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-This allows processes to be killed when the kernel evict cache pages in
-an attempt to get more contiguous free memory.
-
-Signed-off-by: Arve Hjønnevåg <arve@android.com>
----
- drivers/staging/android/lowmemorykiller.c |   13 +++++++++----
- 1 files changed, 9 insertions(+), 4 deletions(-)
-
---- a/drivers/staging/android/lowmemorykiller.c
-+++ b/drivers/staging/android/lowmemorykiller.c
-@@ -58,20 +58,25 @@ static int lowmem_shrink(int nr_to_scan,
- 	int min_adj = OOM_ADJUST_MAX + 1;
- 	int selected_tasksize = 0;
- 	int array_size = ARRAY_SIZE(lowmem_adj);
--	int other_free = global_page_state(NR_FREE_PAGES) + global_page_state(NR_FILE_PAGES);
-+	int other_free = global_page_state(NR_FREE_PAGES);
-+	int other_file = global_page_state(NR_FILE_PAGES);
- 	if(lowmem_adj_size < array_size)
- 		array_size = lowmem_adj_size;
- 	if(lowmem_minfree_size < array_size)
- 		array_size = lowmem_minfree_size;
- 	for(i = 0; i < array_size; i++) {
--		if(other_free < lowmem_minfree[i]) {
-+		if (other_free < lowmem_minfree[i] &&
-+		    other_file < lowmem_minfree[i]) {
- 			min_adj = lowmem_adj[i];
- 			break;
- 		}
- 	}
- 	if(nr_to_scan > 0)
--		lowmem_print(3, "lowmem_shrink %d, %x, ofree %d, ma %d\n", nr_to_scan, gfp_mask, other_free, min_adj);
--	rem = global_page_state(NR_ACTIVE) + global_page_state(NR_INACTIVE);
-+		lowmem_print(3, "lowmem_shrink %d, %x, ofree %d %d, ma %d\n", nr_to_scan, gfp_mask, other_free, other_file, min_adj);
-+	rem = global_page_state(NR_ACTIVE_ANON) +
-+		global_page_state(NR_ACTIVE_FILE) +
-+		global_page_state(NR_INACTIVE_ANON) +
-+		global_page_state(NR_INACTIVE_FILE);
- 	if (nr_to_scan <= 0 || min_adj == OOM_ADJUST_MAX + 1) {
- 		lowmem_print(5, "lowmem_shrink %d, %x, return %d\n", nr_to_scan, gfp_mask, rem);
- 		return rem;
diff --git a/target/linux/goldfish/patches-2.6.30/0054-timed_gpio-Separate-timed_output-class-into-a-separ.patch b/target/linux/goldfish/patches-2.6.30/0054-timed_gpio-Separate-timed_output-class-into-a-separ.patch
deleted file mode 100644
index 16f1350f5..000000000
--- a/target/linux/goldfish/patches-2.6.30/0054-timed_gpio-Separate-timed_output-class-into-a-separ.patch
+++ /dev/null
@@ -1,415 +0,0 @@
-From e4c9c5d7d6d5deb124083678fe5d839d3133f60a Mon Sep 17 00:00:00 2001
-From: Mike Lockwood <lockwood@android.com>
-Date: Mon, 12 Jan 2009 13:25:05 -0500
-Subject: [PATCH 054/134] timed_gpio: Separate timed_output class into a separate driver.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Mike Lockwood <lockwood@android.com>
-Signed-off-by: Arve Hjønnevåg <arve@android.com>
----
- drivers/staging/android/Kconfig        |    6 ++-
- drivers/staging/android/Makefile       |    1 +
- drivers/staging/android/timed_gpio.c   |   98 +++++++++++--------------
- drivers/staging/android/timed_gpio.h   |    4 +-
- drivers/staging/android/timed_output.c |  121 ++++++++++++++++++++++++++++++++
- drivers/staging/android/timed_output.h |   37 ++++++++++
- 6 files changed, 210 insertions(+), 57 deletions(-)
- create mode 100644 drivers/staging/android/timed_output.c
- create mode 100644 drivers/staging/android/timed_output.h
-
---- a/drivers/staging/android/Kconfig
-+++ b/drivers/staging/android/Kconfig
-@@ -73,9 +73,13 @@ config ANDROID_RAM_CONSOLE_EARLY_SIZE
- 	default 0
- 	depends on ANDROID_RAM_CONSOLE_EARLY_INIT
- 
-+config ANDROID_TIMED_OUTPUT
-+	bool "Timed output class driver"
-+	default y
-+
- config ANDROID_TIMED_GPIO
- 	tristate "Android timed gpio driver"
--	depends on GENERIC_GPIO
-+	depends on GENERIC_GPIO && ANDROID_TIMED_OUTPUT
- 	default n
- 
- config ANDROID_LOW_MEMORY_KILLER
---- a/drivers/staging/android/Makefile
-+++ b/drivers/staging/android/Makefile
-@@ -1,5 +1,6 @@
- obj-$(CONFIG_ANDROID_BINDER_IPC)	+= binder.o
- obj-$(CONFIG_ANDROID_LOGGER)		+= logger.o
- obj-$(CONFIG_ANDROID_RAM_CONSOLE)	+= ram_console.o
-+obj-$(CONFIG_ANDROID_TIMED_OUTPUT)	+= timed_output.o
- obj-$(CONFIG_ANDROID_TIMED_GPIO)	+= timed_gpio.o
- obj-$(CONFIG_ANDROID_LOW_MEMORY_KILLER)	+= lowmemorykiller.o
---- a/drivers/staging/android/timed_gpio.c
-+++ b/drivers/staging/android/timed_gpio.c
-@@ -20,13 +20,12 @@
- #include <linux/err.h>
- #include <linux/gpio.h>
- 
-+#include "timed_output.h"
- #include "timed_gpio.h"
- 
- 
--static struct class *timed_gpio_class;
--
- struct timed_gpio_data {
--	struct device *dev;
-+	struct timed_output_dev dev;
- 	struct hrtimer timer;
- 	spinlock_t lock;
- 	unsigned 	gpio;
-@@ -36,70 +35,62 @@ struct timed_gpio_data {
- 
- static enum hrtimer_restart gpio_timer_func(struct hrtimer *timer)
- {
--	struct timed_gpio_data *gpio_data = container_of(timer, struct timed_gpio_data, timer);
-+	struct timed_gpio_data *data =
-+		container_of(timer, struct timed_gpio_data, timer);
- 
--	gpio_direction_output(gpio_data->gpio, gpio_data->active_low ? 1 : 0);
-+	gpio_direction_output(data->gpio, data->active_low ? 1 : 0);
- 	return HRTIMER_NORESTART;
- }
- 
--static ssize_t gpio_enable_show(struct device *dev, struct device_attribute *attr, char *buf)
-+static int gpio_get_time(struct timed_output_dev *dev)
- {
--	struct timed_gpio_data *gpio_data = dev_get_drvdata(dev);
--	int remaining;
-+	struct timed_gpio_data	*data =
-+		container_of(dev, struct timed_gpio_data, dev);
- 
--	if (hrtimer_active(&gpio_data->timer)) {
--		ktime_t r = hrtimer_get_remaining(&gpio_data->timer);
-+	if (hrtimer_active(&data->timer)) {
-+		ktime_t r = hrtimer_get_remaining(&data->timer);
- 		struct timeval t = ktime_to_timeval(r);
--		remaining = t.tv_sec * 1000 + t.tv_usec / 1000;
-+		return t.tv_sec * 1000 + t.tv_usec / 1000;
- 	} else
--		remaining = 0;
--
--	return sprintf(buf, "%d\n", remaining);
-+		return 0;
- }
- 
--static ssize_t gpio_enable_store(
--		struct device *dev, struct device_attribute *attr,
--		const char *buf, size_t size)
-+static void gpio_enable(struct timed_output_dev *dev, int value)
- {
--	struct timed_gpio_data *gpio_data = dev_get_drvdata(dev);
--	int value;
-+	struct timed_gpio_data	*data =
-+		container_of(dev, struct timed_gpio_data, dev);
- 	unsigned long	flags;
- 
--	sscanf(buf, "%d", &value);
--
--	spin_lock_irqsave(&gpio_data->lock, flags);
-+	spin_lock_irqsave(&data->lock, flags);
- 
- 	/* cancel previous timer and set GPIO according to value */
--	hrtimer_cancel(&gpio_data->timer);
--	gpio_direction_output(gpio_data->gpio, gpio_data->active_low ? !value : !!value);
-+	hrtimer_cancel(&data->timer);
-+	gpio_direction_output(data->gpio, data->active_low ? !value : !!value);
- 
- 	if (value > 0) {
--		if (value > gpio_data->max_timeout)
--			value = gpio_data->max_timeout;
-+		if (value > data->max_timeout)
-+			value = data->max_timeout;
- 
--		hrtimer_start(&gpio_data->timer,
--						ktime_set(value / 1000, (value % 1000) * 1000000),
--						HRTIMER_MODE_REL);
-+		hrtimer_start(&data->timer,
-+			ktime_set(value / 1000, (value % 1000) * 1000000),
-+			HRTIMER_MODE_REL);
- 	}
- 
--	spin_unlock_irqrestore(&gpio_data->lock, flags);
--
--	return size;
-+	spin_unlock_irqrestore(&data->lock, flags);
- }
- 
--static DEVICE_ATTR(enable, S_IRUGO | S_IWUSR, gpio_enable_show, gpio_enable_store);
--
- static int timed_gpio_probe(struct platform_device *pdev)
- {
- 	struct timed_gpio_platform_data *pdata = pdev->dev.platform_data;
- 	struct timed_gpio *cur_gpio;
- 	struct timed_gpio_data *gpio_data, *gpio_dat;
--	int i, ret = 0;
-+	int i, j, ret = 0;
- 
- 	if (!pdata)
- 		return -EBUSY;
- 
--	gpio_data = kzalloc(sizeof(struct timed_gpio_data) * pdata->num_gpios, GFP_KERNEL);
-+	gpio_data = kzalloc(sizeof(struct timed_gpio_data) * pdata->num_gpios,
-+			GFP_KERNEL);
- 	if (!gpio_data)
- 		return -ENOMEM;
- 
-@@ -107,23 +98,26 @@ static int timed_gpio_probe(struct platf
- 		cur_gpio = &pdata->gpios[i];
- 		gpio_dat = &gpio_data[i];
- 
--		hrtimer_init(&gpio_dat->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
-+		hrtimer_init(&gpio_dat->timer, CLOCK_MONOTONIC,
-+				HRTIMER_MODE_REL);
- 		gpio_dat->timer.function = gpio_timer_func;
- 		spin_lock_init(&gpio_dat->lock);
- 
-+		gpio_dat->dev.name = cur_gpio->name;
-+		gpio_dat->dev.get_time = gpio_get_time;
-+		gpio_dat->dev.enable = gpio_enable;
-+		ret = timed_output_dev_register(&gpio_dat->dev);
-+		if (ret < 0) {
-+			for (j = 0; j < i; j++)
-+				timed_output_dev_unregister(&gpio_data[i].dev);
-+			kfree(gpio_data);
-+			return ret;
-+		}
-+
- 		gpio_dat->gpio = cur_gpio->gpio;
- 		gpio_dat->max_timeout = cur_gpio->max_timeout;
- 		gpio_dat->active_low = cur_gpio->active_low;
- 		gpio_direction_output(gpio_dat->gpio, gpio_dat->active_low);
--
--		gpio_dat->dev = device_create(timed_gpio_class, &pdev->dev, 0, "%s", cur_gpio->name);
--		if (unlikely(IS_ERR(gpio_dat->dev)))
--			return PTR_ERR(gpio_dat->dev);
--
--		dev_set_drvdata(gpio_dat->dev, gpio_dat);
--		ret = device_create_file(gpio_dat->dev, &dev_attr_enable);
--		if (ret)
--			return ret;
- 	}
- 
- 	platform_set_drvdata(pdev, gpio_data);
-@@ -137,10 +131,8 @@ static int timed_gpio_remove(struct plat
- 	struct timed_gpio_data *gpio_data = platform_get_drvdata(pdev);
- 	int i;
- 
--	for (i = 0; i < pdata->num_gpios; i++) {
--		device_remove_file(gpio_data[i].dev, &dev_attr_enable);
--		device_unregister(gpio_data[i].dev);
--	}
-+	for (i = 0; i < pdata->num_gpios; i++)
-+		timed_output_dev_unregister(&gpio_data[i].dev);
- 
- 	kfree(gpio_data);
- 
-@@ -151,22 +143,18 @@ static struct platform_driver timed_gpio
- 	.probe		= timed_gpio_probe,
- 	.remove		= timed_gpio_remove,
- 	.driver		= {
--		.name		= "timed-gpio",
-+		.name		= TIMED_GPIO_NAME,
- 		.owner		= THIS_MODULE,
- 	},
- };
- 
- static int __init timed_gpio_init(void)
- {
--	timed_gpio_class = class_create(THIS_MODULE, "timed_output");
--	if (IS_ERR(timed_gpio_class))
--		return PTR_ERR(timed_gpio_class);
- 	return platform_driver_register(&timed_gpio_driver);
- }
- 
- static void __exit timed_gpio_exit(void)
- {
--	class_destroy(timed_gpio_class);
- 	platform_driver_unregister(&timed_gpio_driver);
- }
- 
---- a/drivers/staging/android/timed_gpio.h
-+++ b/drivers/staging/android/timed_gpio.h
-@@ -16,10 +16,12 @@
- #ifndef _LINUX_TIMED_GPIO_H
- #define _LINUX_TIMED_GPIO_H
- 
-+#define TIMED_GPIO_NAME "timed-gpio"
-+
- struct timed_gpio {
- 	const char *name;
- 	unsigned 	gpio;
--	int     max_timeout;
-+	int		max_timeout;
- 	u8 		active_low;
- };
- 
---- /dev/null
-+++ b/drivers/staging/android/timed_output.c
-@@ -0,0 +1,121 @@
-+/* drivers/misc/timed_output.c
-+ *
-+ * Copyright (C) 2009 Google, Inc.
-+ * Author: Mike Lockwood <lockwood@android.com>
-+ *
-+ * This software is licensed under the terms of the GNU General Public
-+ * License version 2, as published by the Free Software Foundation, and
-+ * may be copied, distributed, and modified under those terms.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/types.h>
-+#include <linux/device.h>
-+#include <linux/fs.h>
-+#include <linux/err.h>
-+
-+#include "timed_output.h"
-+
-+static struct class *timed_output_class;
-+static atomic_t device_count;
-+
-+static ssize_t enable_show(struct device *dev, struct device_attribute *attr,
-+		char *buf)
-+{
-+	struct timed_output_dev *tdev = dev_get_drvdata(dev);
-+	int remaining = tdev->get_time(tdev);
-+
-+	return sprintf(buf, "%d\n", remaining);
-+}
-+
-+static ssize_t enable_store(
-+		struct device *dev, struct device_attribute *attr,
-+		const char *buf, size_t size)
-+{
-+	struct timed_output_dev *tdev = dev_get_drvdata(dev);
-+	int value;
-+
-+	sscanf(buf, "%d", &value);
-+	tdev->enable(tdev, value);
-+
-+	return size;
-+}
-+
-+static DEVICE_ATTR(enable, S_IRUGO | S_IWUSR, enable_show, enable_store);
-+
-+static int create_timed_output_class(void)
-+{
-+	if (!timed_output_class) {
-+		timed_output_class = class_create(THIS_MODULE, "timed_output");
-+		if (IS_ERR(timed_output_class))
-+			return PTR_ERR(timed_output_class);
-+		atomic_set(&device_count, 0);
-+	}
-+
-+	return 0;
-+}
-+
-+int timed_output_dev_register(struct timed_output_dev *tdev)
-+{
-+	int ret;
-+
-+	if (!tdev || !tdev->name || !tdev->enable || !tdev->get_time)
-+		return -EINVAL;
-+
-+	ret = create_timed_output_class();
-+	if (ret < 0)
-+		return ret;
-+
-+	tdev->index = atomic_inc_return(&device_count);
-+	tdev->dev = device_create(timed_output_class, NULL,
-+		MKDEV(0, tdev->index), NULL, tdev->name);
-+	if (IS_ERR(tdev->dev))
-+		return PTR_ERR(tdev->dev);
-+
-+	ret = device_create_file(tdev->dev, &dev_attr_enable);
-+	if (ret < 0)
-+		goto err_create_file;
-+
-+	dev_set_drvdata(tdev->dev, tdev);
-+	tdev->state = 0;
-+	return 0;
-+
-+err_create_file:
-+	device_destroy(timed_output_class, MKDEV(0, tdev->index));
-+	printk(KERN_ERR "timed_output: Failed to register driver %s\n",
-+			tdev->name);
-+
-+	return ret;
-+}
-+EXPORT_SYMBOL_GPL(timed_output_dev_register);
-+
-+void timed_output_dev_unregister(struct timed_output_dev *tdev)
-+{
-+	device_remove_file(tdev->dev, &dev_attr_enable);
-+	device_destroy(timed_output_class, MKDEV(0, tdev->index));
-+	dev_set_drvdata(tdev->dev, NULL);
-+}
-+EXPORT_SYMBOL_GPL(timed_output_dev_unregister);
-+
-+static int __init timed_output_init(void)
-+{
-+	return create_timed_output_class();
-+}
-+
-+static void __exit timed_output_exit(void)
-+{
-+	class_destroy(timed_output_class);
-+}
-+
-+module_init(timed_output_init);
-+module_exit(timed_output_exit);
-+
-+MODULE_AUTHOR("Mike Lockwood <lockwood@android.com>");
-+MODULE_DESCRIPTION("timed output class driver");
-+MODULE_LICENSE("GPL");
---- /dev/null
-+++ b/drivers/staging/android/timed_output.h
-@@ -0,0 +1,37 @@
-+/* include/linux/timed_output.h
-+ *
-+ * Copyright (C) 2008 Google, Inc.
-+ *
-+ * This software is licensed under the terms of the GNU General Public
-+ * License version 2, as published by the Free Software Foundation, and
-+ * may be copied, distributed, and modified under those terms.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+*/
-+
-+#ifndef _LINUX_TIMED_OUTPUT_H
-+#define _LINUX_TIMED_OUTPUT_H
-+
-+struct timed_output_dev {
-+	const char	*name;
-+
-+	/* enable the output and set the timer */
-+	void	(*enable)(struct timed_output_dev *sdev, int timeout);
-+
-+	/* returns the current number of milliseconds remaining on the timer */
-+	int		(*get_time)(struct timed_output_dev *sdev);
-+
-+	/* private data */
-+	struct device	*dev;
-+	int		index;
-+	int		state;
-+};
-+
-+extern int timed_output_dev_register(struct timed_output_dev *dev);
-+extern void timed_output_dev_unregister(struct timed_output_dev *dev);
-+
-+#endif
diff --git a/target/linux/goldfish/patches-2.6.30/0055-mm-Add-min_free_order_shift-tunable.patch b/target/linux/goldfish/patches-2.6.30/0055-mm-Add-min_free_order_shift-tunable.patch
deleted file mode 100644
index aec689108..000000000
--- a/target/linux/goldfish/patches-2.6.30/0055-mm-Add-min_free_order_shift-tunable.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From d620f695290e4ffb1586420ba1dbbb5b2c8c075d Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@android.com>
-Date: Tue, 17 Feb 2009 14:51:02 -0800
-Subject: [PATCH 055/134] mm: Add min_free_order_shift tunable.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-By default the kernel tries to keep half as much memory free at each
-order as it does for one order below. This can be too agressive when
-running without swap.
-
-Signed-off-by: Arve Hjønnevåg <arve@android.com>
----
- kernel/sysctl.c |    9 +++++++++
- mm/page_alloc.c |    3 ++-
- 2 files changed, 11 insertions(+), 1 deletions(-)
-
---- a/kernel/sysctl.c
-+++ b/kernel/sysctl.c
-@@ -77,6 +77,7 @@ extern int suid_dumpable;
- extern char core_pattern[];
- extern int pid_max;
- extern int min_free_kbytes;
-+extern int min_free_order_shift;
- extern int pid_max_min, pid_max_max;
- extern int sysctl_drop_caches;
- extern int percpu_pagelist_fraction;
-@@ -1138,6 +1139,14 @@ static struct ctl_table vm_table[] = {
- 		.extra1		= &zero,
- 	},
- 	{
-+		.ctl_name	= CTL_UNNUMBERED,
-+		.procname	= "min_free_order_shift",
-+		.data		= &min_free_order_shift,
-+		.maxlen		= sizeof(min_free_order_shift),
-+		.mode		= 0644,
-+		.proc_handler	= &proc_dointvec
-+	},
-+	{
- 		.ctl_name	= VM_PERCPU_PAGELIST_FRACTION,
- 		.procname	= "percpu_pagelist_fraction",
- 		.data		= &percpu_pagelist_fraction,
---- a/mm/page_alloc.c
-+++ b/mm/page_alloc.c
-@@ -119,6 +119,7 @@ static char * const zone_names[MAX_NR_ZO
- };
- 
- int min_free_kbytes = 1024;
-+int min_free_order_shift = 1;
- 
- unsigned long __meminitdata nr_kernel_pages;
- unsigned long __meminitdata nr_all_pages;
-@@ -1258,7 +1259,7 @@ int zone_watermark_ok(struct zone *z, in
- 		free_pages -= z->free_area[o].nr_free << o;
- 
- 		/* Require fewer higher order pages to be free */
--		min >>= 1;
-+		min >>= min_free_order_shift;
- 
- 		if (free_pages <= min)
- 			return 0;
diff --git a/target/linux/goldfish/patches-2.6.30/0056-mm-Check-if-any-page-in-a-pageblock-is-reserved-bef.patch b/target/linux/goldfish/patches-2.6.30/0056-mm-Check-if-any-page-in-a-pageblock-is-reserved-bef.patch
deleted file mode 100644
index ce1fb71ea..000000000
--- a/target/linux/goldfish/patches-2.6.30/0056-mm-Check-if-any-page-in-a-pageblock-is-reserved-bef.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From a4eb204a8029320c2dd748daf4f51fd48d337c3d Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@android.com>
-Date: Wed, 18 Mar 2009 17:27:31 -0700
-Subject: [PATCH 056/134] mm: Check if any page in a pageblock is reserved before marking it MIGRATE_RESERVE
-
-This fixes a problem where the first pageblock got marked MIGRATE_RESERVE even
-though it only had a few free pages. This in turn caused no contiguous memory
-to be reserved and frequent kswapd wakeups that emptied the caches to get more
-contiguous memory.
----
- mm/page_alloc.c |   16 +++++++++++++++-
- 1 files changed, 15 insertions(+), 1 deletions(-)
-
---- a/mm/page_alloc.c
-+++ b/mm/page_alloc.c
-@@ -2570,6 +2570,20 @@ static inline unsigned long wait_table_b
- #define LONG_ALIGN(x) (((x)+(sizeof(long))-1)&~((sizeof(long))-1))
- 
- /*
-+ * Check if a pageblock contains reserved pages
-+ */
-+static int pageblock_is_reserved(unsigned long start_pfn)
-+{
-+	unsigned long end_pfn = start_pfn + pageblock_nr_pages;
-+	unsigned long pfn;
-+
-+	for (pfn = start_pfn; pfn < end_pfn; pfn++)
-+		if (PageReserved(pfn_to_page(pfn)))
-+			return 1;
-+	return 0;
-+}
-+
-+/*
-  * Mark a number of pageblocks as MIGRATE_RESERVE. The number
-  * of blocks reserved is based on zone->pages_min. The memory within the
-  * reserve will tend to store contiguous free pages. Setting min_free_kbytes
-@@ -2598,7 +2612,7 @@ static void setup_zone_migrate_reserve(s
- 			continue;
- 
- 		/* Blocks with reserved pages will never free, skip them. */
--		if (PageReserved(page))
-+		if (pageblock_is_reserved(pfn))
- 			continue;
- 
- 		block_migratetype = get_pageblock_migratetype(page);
diff --git a/target/linux/goldfish/patches-2.6.30/0058-sched-Enable-might_sleep-before-initializing-driver.patch b/target/linux/goldfish/patches-2.6.30/0058-sched-Enable-might_sleep-before-initializing-driver.patch
deleted file mode 100644
index 8e85b8562..000000000
--- a/target/linux/goldfish/patches-2.6.30/0058-sched-Enable-might_sleep-before-initializing-driver.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 10276fd993c6e4c92d8086a6ccd0c9e0ff53b053 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@android.com>
-Date: Wed, 10 Dec 2008 20:06:28 -0800
-Subject: [PATCH 058/134] sched: Enable might_sleep before initializing drivers.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-This allows detection of init bugs in built-in drivers.
-
-Signed-off-by: Arve Hjønnevåg <arve@android.com>
----
- kernel/sched.c |   14 ++++++++++++--
- 1 files changed, 12 insertions(+), 2 deletions(-)
-
---- a/kernel/sched.c
-+++ b/kernel/sched.c
-@@ -9065,13 +9065,23 @@ void __init sched_init(void)
- }
- 
- #ifdef CONFIG_DEBUG_SPINLOCK_SLEEP
-+static int __might_sleep_init_called;
-+int __init __might_sleep_init(void)
-+{
-+	__might_sleep_init_called = 1;
-+	return 0;
-+}
-+early_initcall(__might_sleep_init);
-+
- void __might_sleep(char *file, int line)
- {
- #ifdef in_atomic
- 	static unsigned long prev_jiffy;	/* ratelimiting */
- 
--	if ((!in_atomic() && !irqs_disabled()) ||
--		    system_state != SYSTEM_RUNNING || oops_in_progress)
-+	if ((!in_atomic() && !irqs_disabled()) || oops_in_progress)
-+		return;
-+	if (system_state != SYSTEM_RUNNING &&
-+	    (!__might_sleep_init_called || system_state != SYSTEM_BOOTING))
- 		return;
- 	if (time_before(jiffies, prev_jiffy + HZ) && prev_jiffy)
- 		return;
diff --git a/target/linux/goldfish/patches-2.6.30/0060--ARM-Add-code-to-prevent-system-calls-from-being-re.patch b/target/linux/goldfish/patches-2.6.30/0060--ARM-Add-code-to-prevent-system-calls-from-being-re.patch
deleted file mode 100644
index 896661615..000000000
--- a/target/linux/goldfish/patches-2.6.30/0060--ARM-Add-code-to-prevent-system-calls-from-being-re.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From d52bcb0a807dde87057f330dbe95aa6d221a4b85 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@android.com>
-Date: Mon, 9 Apr 2007 17:13:02 +0700
-Subject: [PATCH 060/134] [ARM] Add code to prevent system calls from being restarted muliple times before returning from the kernel.
-
-Fixes crashes with thumb syscalls.
----
- arch/arm/kernel/signal.c |    9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
---- a/arch/arm/kernel/signal.c
-+++ b/arch/arm/kernel/signal.c
-@@ -499,6 +499,14 @@ setup_rt_frame(int usig, struct k_sigact
- 
- static inline void restart_syscall(struct pt_regs *regs)
- {
-+	if (regs->ARM_ORIG_r0 == -ERESTARTNOHAND ||
-+	    regs->ARM_ORIG_r0 == -ERESTARTSYS ||
-+	    regs->ARM_ORIG_r0 == -ERESTARTNOINTR ||
-+	    regs->ARM_ORIG_r0 == -ERESTART_RESTARTBLOCK) {
-+		/* the syscall cannot be safely restarted, return -EINTR instead */
-+		regs->ARM_r0 = -EINTR;
-+		return;
-+	}
- 	regs->ARM_r0 = regs->ARM_ORIG_r0;
- 	regs->ARM_pc -= thumb_mode(regs) ? 2 : 4;
- }
-@@ -631,6 +639,7 @@ static void do_signal(struct pt_regs *re
- 	 */
- 	if (syscall) {
- 		if (regs->ARM_r0 == -ERESTART_RESTARTBLOCK) {
-+			regs->ARM_r0 = -EAGAIN; /* prevent multiple restarts */
- 			if (thumb_mode(regs)) {
- 				regs->ARM_r7 = __NR_restart_syscall - __NR_SYSCALL_BASE;
- 				regs->ARM_pc -= 2;
diff --git a/target/linux/goldfish/patches-2.6.30/0061--ARM-Save-thread-registers-in-coredumps.patch b/target/linux/goldfish/patches-2.6.30/0061--ARM-Save-thread-registers-in-coredumps.patch
deleted file mode 100644
index 44f78b638..000000000
--- a/target/linux/goldfish/patches-2.6.30/0061--ARM-Save-thread-registers-in-coredumps.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 784b170a69906c48a688a9ffa7512fc858f8836c Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@android.com>
-Date: Sun, 30 Mar 2008 21:36:29 -0700
-Subject: [PATCH 061/134] [ARM] Save thread registers in coredumps
-
-Signed-off-by: Brian Swetland <swetland@google.com>
----
- arch/arm/include/asm/elf.h |    6 ++++++
- arch/arm/kernel/process.c  |   10 ++++++++++
- 2 files changed, 16 insertions(+), 0 deletions(-)
-
---- a/arch/arm/include/asm/elf.h
-+++ b/arch/arm/include/asm/elf.h
-@@ -86,6 +86,10 @@ extern char elf_platform[];
- 
- struct elf32_hdr;
- 
-+struct task_struct;
-+
-+extern int dump_task_regs (struct task_struct *, elf_gregset_t *);
-+
- /*
-  * This is used to ensure we don't load something for the wrong architecture.
-  */
-@@ -113,4 +117,6 @@ extern int arm_elf_read_implies_exec(con
- extern void elf_set_personality(const struct elf32_hdr *);
- #define SET_PERSONALITY(ex)	elf_set_personality(&(ex))
- 
-+#define ELF_CORE_COPY_TASK_REGS(tsk, elf_regs) dump_task_regs(tsk, elf_regs)
-+
- #endif
---- a/arch/arm/kernel/process.c
-+++ b/arch/arm/kernel/process.c
-@@ -337,6 +337,16 @@ int dump_fpu (struct pt_regs *regs, stru
- EXPORT_SYMBOL(dump_fpu);
- 
- /*
-+ * Capture the user space registers if the task is not running (in user space)
-+ */
-+int dump_task_regs(struct task_struct *tsk, elf_gregset_t *regs)
-+{
-+	struct pt_regs ptregs = *task_pt_regs(tsk);
-+	elf_core_copy_regs(regs, &ptregs);
-+	return 1;
-+}
-+
-+/*
-  * Shuffle the argument into the correct register before calling the
-  * thread function.  r1 is the thread argument, r2 is the pointer to
-  * the thread function, and r3 points to the exit function.
diff --git a/target/linux/goldfish/patches-2.6.30/0064-PM-Add-wake-lock-api.patch b/target/linux/goldfish/patches-2.6.30/0064-PM-Add-wake-lock-api.patch
deleted file mode 100644
index bd4d364ad..000000000
--- a/target/linux/goldfish/patches-2.6.30/0064-PM-Add-wake-lock-api.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From e93bd714c424d9fe907cb1d8ec5ce784767a3b16 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@android.com>
-Date: Fri, 26 Sep 2008 22:10:56 -0700
-Subject: [PATCH 064/134] PM: Add wake lock api.
-
----
- include/linux/wakelock.h |   91 ++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 91 insertions(+), 0 deletions(-)
- create mode 100755 include/linux/wakelock.h
-
---- /dev/null
-+++ b/include/linux/wakelock.h
-@@ -0,0 +1,91 @@
-+/* include/linux/wakelock.h
-+ *
-+ * Copyright (C) 2007-2008 Google, Inc.
-+ *
-+ * This software is licensed under the terms of the GNU General Public
-+ * License version 2, as published by the Free Software Foundation, and
-+ * may be copied, distributed, and modified under those terms.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ */
-+
-+#ifndef _LINUX_WAKELOCK_H
-+#define _LINUX_WAKELOCK_H
-+
-+#include <linux/list.h>
-+#include <linux/ktime.h>
-+
-+/* A wake_lock prevents the system from entering suspend or other low power
-+ * states when active. If the type is set to WAKE_LOCK_SUSPEND, the wake_lock
-+ * prevents a full system suspend. If the type is WAKE_LOCK_IDLE, low power
-+ * states that cause large interrupt latencies or that disable a set of
-+ * interrupts will not entered from idle until the wake_locks are released.
-+ */
-+
-+enum {
-+	WAKE_LOCK_SUSPEND, /* Prevent suspend */
-+	WAKE_LOCK_IDLE,    /* Prevent low power idle */
-+	WAKE_LOCK_TYPE_COUNT
-+};
-+
-+struct wake_lock {
-+#ifdef CONFIG_HAS_WAKELOCK
-+	struct list_head    link;
-+	int                 flags;
-+	const char         *name;
-+	unsigned long       expires;
-+#ifdef CONFIG_WAKELOCK_STAT
-+	struct {
-+		int             count;
-+		int             expire_count;
-+		int             wakeup_count;
-+		ktime_t         total_time;
-+		ktime_t         prevent_suspend_time;
-+		ktime_t         max_time;
-+		ktime_t         last_time;
-+	} stat;
-+#endif
-+#endif
-+};
-+
-+#ifdef CONFIG_HAS_WAKELOCK
-+
-+void wake_lock_init(struct wake_lock *lock, int type, const char *name);
-+void wake_lock_destroy(struct wake_lock *lock);
-+void wake_lock(struct wake_lock *lock);
-+void wake_lock_timeout(struct wake_lock *lock, long timeout);
-+void wake_unlock(struct wake_lock *lock);
-+
-+/* wake_lock_active returns a non-zero value if the wake_lock is currently
-+ * locked. If the wake_lock has a timeout, it does not check the timeout
-+ * but if the timeout had aready been checked it will return 0.
-+ */
-+int wake_lock_active(struct wake_lock *lock);
-+
-+/* has_wake_lock returns 0 if no wake locks of the specified type are active,
-+ * and non-zero if one or more wake locks are held. Specifically it returns
-+ * -1 if one or more wake locks with no timeout are active or the
-+ * number of jiffies until all active wake locks time out.
-+ */
-+long has_wake_lock(int type);
-+
-+#else
-+
-+static inline void wake_lock_init(struct wake_lock *lock, int type,
-+					const char *name) {}
-+static inline void wake_lock_destroy(struct wake_lock *lock) {}
-+static inline void wake_lock(struct wake_lock *lock) {}
-+static inline void wake_lock_timeout(struct wake_lock *lock, long timeout) {}
-+static inline void wake_unlock(struct wake_lock *lock) {}
-+
-+static inline int wake_lock_active(struct wake_lock *lock) { return 0; }
-+static inline long has_wake_lock(int type) { return 0; }
-+
-+#endif
-+
-+#endif
-+
diff --git a/target/linux/goldfish/patches-2.6.30/0065-PM-Add-early-suspend-api.patch b/target/linux/goldfish/patches-2.6.30/0065-PM-Add-early-suspend-api.patch
deleted file mode 100644
index 02adef68a..000000000
--- a/target/linux/goldfish/patches-2.6.30/0065-PM-Add-early-suspend-api.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 4f76252afe98fd017894e61c296bc61836e67a4a Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@android.com>
-Date: Fri, 26 Sep 2008 22:10:56 -0700
-Subject: [PATCH 065/134] PM: Add early suspend api.
-
----
- include/linux/earlysuspend.h |   56 ++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 56 insertions(+), 0 deletions(-)
- create mode 100755 include/linux/earlysuspend.h
-
---- /dev/null
-+++ b/include/linux/earlysuspend.h
-@@ -0,0 +1,56 @@
-+/* include/linux/earlysuspend.h
-+ *
-+ * Copyright (C) 2007-2008 Google, Inc.
-+ *
-+ * This software is licensed under the terms of the GNU General Public
-+ * License version 2, as published by the Free Software Foundation, and
-+ * may be copied, distributed, and modified under those terms.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ */
-+
-+#ifndef _LINUX_EARLYSUSPEND_H
-+#define _LINUX_EARLYSUSPEND_H
-+
-+#ifdef CONFIG_HAS_EARLYSUSPEND
-+#include <linux/list.h>
-+#endif
-+
-+/* The early_suspend structure defines suspend and resume hooks to be called
-+ * when the user visible sleep state of the system changes, and a level to
-+ * control the order. They can be used to turn off the screen and input
-+ * devices that are not used for wakeup.
-+ * Suspend handlers are called in low to high level order, resume handlers are
-+ * called in the opposite order. If, when calling register_early_suspend,
-+ * the suspend handlers have already been called without a matching call to the
-+ * resume handlers, the suspend handler will be called directly from
-+ * register_early_suspend. This direct call can violate the normal level order.
-+ */
-+enum {
-+	EARLY_SUSPEND_LEVEL_BLANK_SCREEN = 50,
-+	EARLY_SUSPEND_LEVEL_STOP_DRAWING = 100,
-+	EARLY_SUSPEND_LEVEL_DISABLE_FB = 150,
-+};
-+struct early_suspend {
-+#ifdef CONFIG_HAS_EARLYSUSPEND
-+	struct list_head link;
-+	int level;
-+	void (*suspend)(struct early_suspend *h);
-+	void (*resume)(struct early_suspend *h);
-+#endif
-+};
-+
-+#ifdef CONFIG_HAS_EARLYSUSPEND
-+void register_early_suspend(struct early_suspend *handler);
-+void unregister_early_suspend(struct early_suspend *handler);
-+#else
-+#define register_early_suspend(handler) do { } while (0)
-+#define unregister_early_suspend(handler) do { } while (0)
-+#endif
-+
-+#endif
-+
diff --git a/target/linux/goldfish/patches-2.6.30/0066-PM-Implement-wakelock-api.patch b/target/linux/goldfish/patches-2.6.30/0066-PM-Implement-wakelock-api.patch
deleted file mode 100644
index 610bc1f51..000000000
--- a/target/linux/goldfish/patches-2.6.30/0066-PM-Implement-wakelock-api.patch
+++ /dev/null
@@ -1,673 +0,0 @@
-From eef7f012d480142a3eccff91e0ae73ecb13220b3 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@android.com>
-Date: Tue, 9 Sep 2008 22:14:34 -0700
-Subject: [PATCH 066/134] PM: Implement wakelock api.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-PM: wakelock: Replace expire work with a timer
-
-The expire work function did not work in the normal case.
-
-Signed-off-by: Arve Hjønnevåg <arve@android.com>
----
- kernel/power/Kconfig    |   19 ++
- kernel/power/Makefile   |    1 +
- kernel/power/power.h    |    7 +
- kernel/power/wakelock.c |  598 +++++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 625 insertions(+), 0 deletions(-)
- create mode 100644 kernel/power/wakelock.c
-
---- a/kernel/power/Kconfig
-+++ b/kernel/power/Kconfig
-@@ -116,6 +116,25 @@ config SUSPEND_FREEZER
- 
- 	  Turning OFF this setting is NOT recommended! If in doubt, say Y.
- 
-+config HAS_WAKELOCK
-+	bool
-+
-+config WAKELOCK
-+	bool "Wake lock"
-+	depends on PM && RTC_CLASS
-+	default n
-+	select HAS_WAKELOCK
-+	---help---
-+	  Enable wakelocks. When user space request a sleep state the
-+	  sleep request will be delayed until no wake locks are held.
-+
-+config WAKELOCK_STAT
-+	bool "Wake lock stats"
-+	depends on WAKELOCK
-+	default y
-+	---help---
-+	  Report wake lock stats in /proc/wakelocks
-+
- config HIBERNATION
- 	bool "Hibernation (aka 'suspend to disk')"
- 	depends on PM && SWAP && ARCH_HIBERNATION_POSSIBLE
---- a/kernel/power/Makefile
-+++ b/kernel/power/Makefile
-@@ -6,6 +6,7 @@ endif
- obj-$(CONFIG_PM)		+= main.o
- obj-$(CONFIG_PM_SLEEP)		+= console.o
- obj-$(CONFIG_FREEZER)		+= process.o
-+obj-$(CONFIG_WAKELOCK)		+= wakelock.o
- obj-$(CONFIG_HIBERNATION)	+= swsusp.o disk.o snapshot.o swap.o user.o
- 
- obj-$(CONFIG_MAGIC_SYSRQ)	+= poweroff.o
---- a/kernel/power/power.h
-+++ b/kernel/power/power.h
-@@ -223,3 +223,10 @@ static inline void suspend_thaw_processe
- {
- }
- #endif
-+
-+#ifdef CONFIG_WAKELOCK
-+/* kernel/power/wakelock.c */
-+extern struct workqueue_struct *suspend_work_queue;
-+extern struct wake_lock main_wake_lock;
-+extern suspend_state_t requested_suspend_state;
-+#endif
---- /dev/null
-+++ b/kernel/power/wakelock.c
-@@ -0,0 +1,598 @@
-+/* kernel/power/wakelock.c
-+ *
-+ * Copyright (C) 2005-2008 Google, Inc.
-+ *
-+ * This software is licensed under the terms of the GNU General Public
-+ * License version 2, as published by the Free Software Foundation, and
-+ * may be copied, distributed, and modified under those terms.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/rtc.h>
-+#include <linux/suspend.h>
-+#include <linux/syscalls.h> /* sys_sync */
-+#include <linux/wakelock.h>
-+#ifdef CONFIG_WAKELOCK_STAT
-+#include <linux/proc_fs.h>
-+#endif
-+#include "power.h"
-+
-+enum {
-+	DEBUG_EXIT_SUSPEND = 1U << 0,
-+	DEBUG_WAKEUP = 1U << 1,
-+	DEBUG_SUSPEND = 1U << 2,
-+	DEBUG_EXPIRE = 1U << 3,
-+	DEBUG_WAKE_LOCK = 1U << 4,
-+};
-+static int debug_mask = DEBUG_EXIT_SUSPEND | DEBUG_WAKEUP;
-+module_param_named(debug_mask, debug_mask, int, S_IRUGO | S_IWUSR | S_IWGRP);
-+
-+#define WAKE_LOCK_TYPE_MASK              (0x0f)
-+#define WAKE_LOCK_INITIALIZED            (1U << 8)
-+#define WAKE_LOCK_ACTIVE                 (1U << 9)
-+#define WAKE_LOCK_AUTO_EXPIRE            (1U << 10)
-+#define WAKE_LOCK_PREVENTING_SUSPEND     (1U << 11)
-+
-+static DEFINE_SPINLOCK(list_lock);
-+static LIST_HEAD(inactive_locks);
-+static struct list_head active_wake_locks[WAKE_LOCK_TYPE_COUNT];
-+static int current_event_num;
-+struct workqueue_struct *suspend_work_queue;
-+struct wake_lock main_wake_lock;
-+suspend_state_t requested_suspend_state = PM_SUSPEND_MEM;
-+static struct wake_lock unknown_wakeup;
-+
-+#ifdef CONFIG_WAKELOCK_STAT
-+static struct wake_lock deleted_wake_locks;
-+static ktime_t last_sleep_time_update;
-+static int wait_for_wakeup;
-+
-+int get_expired_time(struct wake_lock *lock, ktime_t *expire_time)
-+{
-+	struct timespec ts;
-+	struct timespec kt;
-+	struct timespec tomono;
-+	struct timespec delta;
-+	unsigned long seq;
-+	long timeout;
-+
-+	if (!(lock->flags & WAKE_LOCK_AUTO_EXPIRE))
-+		return 0;
-+	do {
-+		seq = read_seqbegin(&xtime_lock);
-+		timeout = lock->expires - jiffies;
-+		if (timeout > 0)
-+			return 0;
-+		kt = current_kernel_time();
-+		tomono = wall_to_monotonic;
-+	} while (read_seqretry(&xtime_lock, seq));
-+	jiffies_to_timespec(-timeout, &delta);
-+	set_normalized_timespec(&ts, kt.tv_sec + tomono.tv_sec - delta.tv_sec,
-+				kt.tv_nsec + tomono.tv_nsec - delta.tv_nsec);
-+	*expire_time = timespec_to_ktime(ts);
-+	return 1;
-+}
-+
-+
-+static int print_lock_stat(char *buf, struct wake_lock *lock)
-+{
-+	int lock_count = lock->stat.count;
-+	int expire_count = lock->stat.expire_count;
-+	ktime_t active_time = ktime_set(0, 0);
-+	ktime_t total_time = lock->stat.total_time;
-+	ktime_t max_time = lock->stat.max_time;
-+	ktime_t prevent_suspend_time = lock->stat.prevent_suspend_time;
-+	if (lock->flags & WAKE_LOCK_ACTIVE) {
-+		ktime_t now, add_time;
-+		int expired = get_expired_time(lock, &now);
-+		if (!expired)
-+			now = ktime_get();
-+		add_time = ktime_sub(now, lock->stat.last_time);
-+		lock_count++;
-+		if (!expired)
-+			active_time = add_time;
-+		else
-+			expire_count++;
-+		total_time = ktime_add(total_time, add_time);
-+		if (lock->flags & WAKE_LOCK_PREVENTING_SUSPEND)
-+			prevent_suspend_time = ktime_add(prevent_suspend_time,
-+					ktime_sub(now, last_sleep_time_update));
-+		if (add_time.tv64 > max_time.tv64)
-+			max_time = add_time;
-+	}
-+
-+	return sprintf(buf, "\"%s\"\t%d\t%d\t%d\t%lld\t%lld\t%lld\t%lld\t"
-+		       "%lld\n", lock->name, lock_count, expire_count,
-+		       lock->stat.wakeup_count, ktime_to_ns(active_time),
-+		       ktime_to_ns(total_time),
-+		       ktime_to_ns(prevent_suspend_time), ktime_to_ns(max_time),
-+		       ktime_to_ns(lock->stat.last_time));
-+}
-+
-+
-+static int wakelocks_read_proc(char *page, char **start, off_t off,
-+			       int count, int *eof, void *data)
-+{
-+	unsigned long irqflags;
-+	struct wake_lock *lock;
-+	int len = 0;
-+	char *p = page;
-+	int type;
-+
-+	spin_lock_irqsave(&list_lock, irqflags);
-+
-+	p += sprintf(p, "name\tcount\texpire_count\twake_count\tactive_since"
-+		     "\ttotal_time\tsleep_time\tmax_time\tlast_change\n");
-+	list_for_each_entry(lock, &inactive_locks, link) {
-+		p += print_lock_stat(p, lock);
-+	}
-+	for (type = 0; type < WAKE_LOCK_TYPE_COUNT; type++) {
-+		list_for_each_entry(lock, &active_wake_locks[type], link)
-+			p += print_lock_stat(p, lock);
-+	}
-+	spin_unlock_irqrestore(&list_lock, irqflags);
-+
-+	*start = page + off;
-+
-+	len = p - page;
-+	if (len > off)
-+		len -= off;
-+	else
-+		len = 0;
-+
-+	return len < count ? len  : count;
-+}
-+
-+static void wake_unlock_stat_locked(struct wake_lock *lock, int expired)
-+{
-+	ktime_t duration;
-+	ktime_t now;
-+	if (!(lock->flags & WAKE_LOCK_ACTIVE))
-+		return;
-+	if (get_expired_time(lock, &now))
-+		expired = 1;
-+	else
-+		now = ktime_get();
-+	lock->stat.count++;
-+	if (expired)
-+		lock->stat.expire_count++;
-+	duration = ktime_sub(now, lock->stat.last_time);
-+	lock->stat.total_time = ktime_add(lock->stat.total_time, duration);
-+	if (ktime_to_ns(duration) > ktime_to_ns(lock->stat.max_time))
-+		lock->stat.max_time = duration;
-+	lock->stat.last_time = ktime_get();
-+	if (lock->flags & WAKE_LOCK_PREVENTING_SUSPEND) {
-+		duration = ktime_sub(now, last_sleep_time_update);
-+		lock->stat.prevent_suspend_time = ktime_add(
-+			lock->stat.prevent_suspend_time, duration);
-+		lock->flags &= ~WAKE_LOCK_PREVENTING_SUSPEND;
-+	}
-+}
-+
-+static void update_sleep_wait_stats_locked(int done)
-+{
-+	struct wake_lock *lock;
-+	ktime_t now, etime, elapsed, add;
-+	int expired;
-+
-+	now = ktime_get();
-+	elapsed = ktime_sub(now, last_sleep_time_update);
-+	list_for_each_entry(lock, &active_wake_locks[WAKE_LOCK_SUSPEND], link) {
-+		expired = get_expired_time(lock, &etime);
-+		if (lock->flags & WAKE_LOCK_PREVENTING_SUSPEND) {
-+			if (expired)
-+				add = ktime_sub(etime, last_sleep_time_update);
-+			else
-+				add = elapsed;
-+			lock->stat.prevent_suspend_time = ktime_add(
-+				lock->stat.prevent_suspend_time, add);
-+		}
-+		if (done || expired)
-+			lock->flags &= ~WAKE_LOCK_PREVENTING_SUSPEND;
-+		else
-+			lock->flags |= WAKE_LOCK_PREVENTING_SUSPEND;
-+	}
-+	last_sleep_time_update = now;
-+}
-+#endif
-+
-+
-+static void expire_wake_lock(struct wake_lock *lock)
-+{
-+#ifdef CONFIG_WAKELOCK_STAT
-+	wake_unlock_stat_locked(lock, 1);
-+#endif
-+	lock->flags &= ~(WAKE_LOCK_ACTIVE | WAKE_LOCK_AUTO_EXPIRE);
-+	list_del(&lock->link);
-+	list_add(&lock->link, &inactive_locks);
-+	if (debug_mask & (DEBUG_WAKE_LOCK | DEBUG_EXPIRE))
-+		pr_info("expired wake lock %s\n", lock->name);
-+}
-+
-+static void print_active_locks(int type)
-+{
-+	unsigned long irqflags;
-+	struct wake_lock *lock;
-+
-+	BUG_ON(type >= WAKE_LOCK_TYPE_COUNT);
-+	spin_lock_irqsave(&list_lock, irqflags);
-+	list_for_each_entry(lock, &active_wake_locks[type], link) {
-+		if (lock->flags & WAKE_LOCK_AUTO_EXPIRE) {
-+			long timeout = lock->expires - jiffies;
-+			if (timeout <= 0)
-+				pr_info("wake lock %s, expired\n", lock->name);
-+			else
-+				pr_info("active wake lock %s, time left %ld\n",
-+					lock->name, timeout);
-+		} else
-+			pr_info("active wake lock %s\n", lock->name);
-+	}
-+	spin_unlock_irqrestore(&list_lock, irqflags);
-+}
-+
-+static long has_wake_lock_locked(int type)
-+{
-+	struct wake_lock *lock, *n;
-+	long max_timeout = 0;
-+
-+	BUG_ON(type >= WAKE_LOCK_TYPE_COUNT);
-+	list_for_each_entry_safe(lock, n, &active_wake_locks[type], link) {
-+		if (lock->flags & WAKE_LOCK_AUTO_EXPIRE) {
-+			long timeout = lock->expires - jiffies;
-+			if (timeout <= 0)
-+				expire_wake_lock(lock);
-+			else if (timeout > max_timeout)
-+				max_timeout = timeout;
-+		} else
-+			return -1;
-+	}
-+	return max_timeout;
-+}
-+
-+long has_wake_lock(int type)
-+{
-+	long ret;
-+	unsigned long irqflags;
-+	spin_lock_irqsave(&list_lock, irqflags);
-+	ret = has_wake_lock_locked(type);
-+	spin_unlock_irqrestore(&list_lock, irqflags);
-+	return ret;
-+}
-+
-+static void suspend(struct work_struct *work)
-+{
-+	int ret;
-+	int entry_event_num;
-+
-+	if (has_wake_lock(WAKE_LOCK_SUSPEND)) {
-+		if (debug_mask & DEBUG_SUSPEND)
-+			pr_info("suspend: abort suspend\n");
-+		return;
-+	}
-+
-+	entry_event_num = current_event_num;
-+	sys_sync();
-+	if (debug_mask & DEBUG_SUSPEND)
-+		pr_info("suspend: enter suspend\n");
-+	ret = pm_suspend(requested_suspend_state);
-+	if (debug_mask & DEBUG_EXIT_SUSPEND) {
-+		struct timespec ts;
-+		struct rtc_time tm;
-+		getnstimeofday(&ts);
-+		rtc_time_to_tm(ts.tv_sec, &tm);
-+		pr_info("suspend: exit suspend, ret = %d "
-+			"(%d-%02d-%02d %02d:%02d:%02d.%09lu UTC)\n", ret,
-+			tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,
-+			tm.tm_hour, tm.tm_min, tm.tm_sec, ts.tv_nsec);
-+	}
-+	if (current_event_num == entry_event_num) {
-+		if (debug_mask & DEBUG_SUSPEND)
-+			pr_info("suspend: pm_suspend returned with no event\n");
-+		wake_lock_timeout(&unknown_wakeup, HZ / 2);
-+	}
-+}
-+static DECLARE_WORK(suspend_work, suspend);
-+
-+static void expire_wake_locks(unsigned long data)
-+{
-+	long has_lock;
-+	unsigned long irqflags;
-+	if (debug_mask & DEBUG_EXPIRE)
-+		pr_info("expire_wake_locks: start\n");
-+	if (debug_mask & DEBUG_SUSPEND)
-+		print_active_locks(WAKE_LOCK_SUSPEND);
-+	spin_lock_irqsave(&list_lock, irqflags);
-+	has_lock = has_wake_lock_locked(WAKE_LOCK_SUSPEND);
-+	if (debug_mask & DEBUG_EXPIRE)
-+		pr_info("expire_wake_locks: done, has_lock %ld\n", has_lock);
-+	if (has_lock == 0)
-+		queue_work(suspend_work_queue, &suspend_work);
-+	spin_unlock_irqrestore(&list_lock, irqflags);
-+}
-+static DEFINE_TIMER(expire_timer, expire_wake_locks, 0, 0);
-+
-+static int power_suspend_late(struct platform_device *pdev, pm_message_t state)
-+{
-+	int ret = has_wake_lock(WAKE_LOCK_SUSPEND) ? -EAGAIN : 0;
-+#ifdef CONFIG_WAKELOCK_STAT
-+	wait_for_wakeup = 1;
-+#endif
-+	if (debug_mask & DEBUG_SUSPEND)
-+		pr_info("power_suspend_late return %d\n", ret);
-+	return ret;
-+}
-+
-+static struct platform_driver power_driver = {
-+	.driver.name = "power",
-+	.suspend_late = power_suspend_late,
-+};
-+static struct platform_device power_device = {
-+	.name = "power",
-+};
-+
-+void wake_lock_init(struct wake_lock *lock, int type, const char *name)
-+{
-+	unsigned long irqflags = 0;
-+
-+	if (name)
-+		lock->name = name;
-+	BUG_ON(!lock->name);
-+
-+	if (debug_mask & DEBUG_WAKE_LOCK)
-+		pr_info("wake_lock_init name=%s\n", lock->name);
-+#ifdef CONFIG_WAKELOCK_STAT
-+	lock->stat.count = 0;
-+	lock->stat.expire_count = 0;
-+	lock->stat.wakeup_count = 0;
-+	lock->stat.total_time = ktime_set(0, 0);
-+	lock->stat.prevent_suspend_time = ktime_set(0, 0);
-+	lock->stat.max_time = ktime_set(0, 0);
-+	lock->stat.last_time = ktime_set(0, 0);
-+#endif
-+	lock->flags = (type & WAKE_LOCK_TYPE_MASK) | WAKE_LOCK_INITIALIZED;
-+
-+	INIT_LIST_HEAD(&lock->link);
-+	spin_lock_irqsave(&list_lock, irqflags);
-+	list_add(&lock->link, &inactive_locks);
-+	spin_unlock_irqrestore(&list_lock, irqflags);
-+}
-+EXPORT_SYMBOL(wake_lock_init);
-+
-+void wake_lock_destroy(struct wake_lock *lock)
-+{
-+	unsigned long irqflags;
-+	if (debug_mask & DEBUG_WAKE_LOCK)
-+		pr_info("wake_lock_destroy name=%s\n", lock->name);
-+	spin_lock_irqsave(&list_lock, irqflags);
-+	lock->flags &= ~WAKE_LOCK_INITIALIZED;
-+#ifdef CONFIG_WAKELOCK_STAT
-+	if (lock->stat.count) {
-+		deleted_wake_locks.stat.count += lock->stat.count;
-+		deleted_wake_locks.stat.expire_count += lock->stat.expire_count;
-+		deleted_wake_locks.stat.total_time =
-+			ktime_add(deleted_wake_locks.stat.total_time,
-+				  lock->stat.total_time);
-+		deleted_wake_locks.stat.prevent_suspend_time =
-+			ktime_add(deleted_wake_locks.stat.prevent_suspend_time,
-+				  lock->stat.prevent_suspend_time);
-+		deleted_wake_locks.stat.max_time =
-+			ktime_add(deleted_wake_locks.stat.max_time,
-+				  lock->stat.max_time);
-+	}
-+#endif
-+	list_del(&lock->link);
-+	spin_unlock_irqrestore(&list_lock, irqflags);
-+}
-+EXPORT_SYMBOL(wake_lock_destroy);
-+
-+static void wake_lock_internal(
-+	struct wake_lock *lock, long timeout, int has_timeout)
-+{
-+	int type;
-+	unsigned long irqflags;
-+	long expire_in;
-+
-+	spin_lock_irqsave(&list_lock, irqflags);
-+	type = lock->flags & WAKE_LOCK_TYPE_MASK;
-+	BUG_ON(type >= WAKE_LOCK_TYPE_COUNT);
-+	BUG_ON(!(lock->flags & WAKE_LOCK_INITIALIZED));
-+#ifdef CONFIG_WAKELOCK_STAT
-+	if (type == WAKE_LOCK_SUSPEND && wait_for_wakeup) {
-+		if (debug_mask & DEBUG_WAKEUP)
-+			pr_info("wakeup wake lock: %s\n", lock->name);
-+		wait_for_wakeup = 0;
-+		lock->stat.wakeup_count++;
-+	}
-+	if ((lock->flags & WAKE_LOCK_AUTO_EXPIRE) &&
-+	    (long)(lock->expires - jiffies) <= 0) {
-+		wake_unlock_stat_locked(lock, 0);
-+		lock->stat.last_time = ktime_get();
-+	}
-+#endif
-+	if (!(lock->flags & WAKE_LOCK_ACTIVE)) {
-+		lock->flags |= WAKE_LOCK_ACTIVE;
-+#ifdef CONFIG_WAKELOCK_STAT
-+		lock->stat.last_time = ktime_get();
-+#endif
-+	}
-+	list_del(&lock->link);
-+	if (has_timeout) {
-+		if (debug_mask & DEBUG_WAKE_LOCK)
-+			pr_info("wake_lock: %s, type %d, timeout %ld.%03lu\n",
-+				lock->name, type, timeout / HZ,
-+				(timeout % HZ) * MSEC_PER_SEC / HZ);
-+		lock->expires = jiffies + timeout;
-+		lock->flags |= WAKE_LOCK_AUTO_EXPIRE;
-+		list_add_tail(&lock->link, &active_wake_locks[type]);
-+	} else {
-+		if (debug_mask & DEBUG_WAKE_LOCK)
-+			pr_info("wake_lock: %s, type %d\n", lock->name, type);
-+		lock->expires = LONG_MAX;
-+		lock->flags &= ~WAKE_LOCK_AUTO_EXPIRE;
-+		list_add(&lock->link, &active_wake_locks[type]);
-+	}
-+	if (type == WAKE_LOCK_SUSPEND) {
-+		current_event_num++;
-+#ifdef CONFIG_WAKELOCK_STAT
-+		if (lock == &main_wake_lock)
-+			update_sleep_wait_stats_locked(1);
-+		else if (!wake_lock_active(&main_wake_lock))
-+			update_sleep_wait_stats_locked(0);
-+#endif
-+		if (has_timeout)
-+			expire_in = has_wake_lock_locked(type);
-+		else
-+			expire_in = -1;
-+		if (expire_in > 0) {
-+			if (debug_mask & DEBUG_EXPIRE)
-+				pr_info("wake_lock: %s, start expire timer, "
-+					"%ld\n", lock->name, expire_in);
-+			mod_timer(&expire_timer, jiffies + expire_in);
-+		} else {
-+			if (del_timer(&expire_timer))
-+				if (debug_mask & DEBUG_EXPIRE)
-+					pr_info("wake_lock: %s, stop expire timer\n",
-+						lock->name);
-+			if (expire_in == 0)
-+				queue_work(suspend_work_queue, &suspend_work);
-+		}
-+	}
-+	spin_unlock_irqrestore(&list_lock, irqflags);
-+}
-+
-+void wake_lock(struct wake_lock *lock)
-+{
-+	wake_lock_internal(lock, 0, 0);
-+}
-+EXPORT_SYMBOL(wake_lock);
-+
-+void wake_lock_timeout(struct wake_lock *lock, long timeout)
-+{
-+	wake_lock_internal(lock, timeout, 1);
-+}
-+EXPORT_SYMBOL(wake_lock_timeout);
-+
-+void wake_unlock(struct wake_lock *lock)
-+{
-+	int type;
-+	unsigned long irqflags;
-+	spin_lock_irqsave(&list_lock, irqflags);
-+	type = lock->flags & WAKE_LOCK_TYPE_MASK;
-+#ifdef CONFIG_WAKELOCK_STAT
-+	wake_unlock_stat_locked(lock, 0);
-+#endif
-+	if (debug_mask & DEBUG_WAKE_LOCK)
-+		pr_info("wake_unlock: %s\n", lock->name);
-+	lock->flags &= ~(WAKE_LOCK_ACTIVE | WAKE_LOCK_AUTO_EXPIRE);
-+	list_del(&lock->link);
-+	list_add(&lock->link, &inactive_locks);
-+	if (type == WAKE_LOCK_SUSPEND) {
-+		long has_lock = has_wake_lock_locked(type);
-+		if (has_lock > 0) {
-+			if (debug_mask & DEBUG_EXPIRE)
-+				pr_info("wake_unlock: %s, start expire timer, "
-+					"%ld\n", lock->name, has_lock);
-+			mod_timer(&expire_timer, jiffies + has_lock);
-+		} else {
-+			if (del_timer(&expire_timer))
-+				if (debug_mask & DEBUG_EXPIRE)
-+					pr_info("wake_unlock: %s, stop expire "
-+						"timer\n", lock->name);
-+			if (has_lock == 0)
-+				queue_work(suspend_work_queue, &suspend_work);
-+		}
-+		if (lock == &main_wake_lock) {
-+			if (debug_mask & DEBUG_SUSPEND)
-+				print_active_locks(WAKE_LOCK_SUSPEND);
-+#ifdef CONFIG_WAKELOCK_STAT
-+			update_sleep_wait_stats_locked(0);
-+#endif
-+		}
-+	}
-+	spin_unlock_irqrestore(&list_lock, irqflags);
-+}
-+EXPORT_SYMBOL(wake_unlock);
-+
-+int wake_lock_active(struct wake_lock *lock)
-+{
-+	return !!(lock->flags & WAKE_LOCK_ACTIVE);
-+}
-+EXPORT_SYMBOL(wake_lock_active);
-+
-+static int __init wakelocks_init(void)
-+{
-+	int ret;
-+	int i;
-+
-+	for (i = 0; i < ARRAY_SIZE(active_wake_locks); i++)
-+		INIT_LIST_HEAD(&active_wake_locks[i]);
-+
-+#ifdef CONFIG_WAKELOCK_STAT
-+	wake_lock_init(&deleted_wake_locks, WAKE_LOCK_SUSPEND,
-+			"deleted_wake_locks");
-+#endif
-+	wake_lock_init(&main_wake_lock, WAKE_LOCK_SUSPEND, "main");
-+	wake_lock(&main_wake_lock);
-+	wake_lock_init(&unknown_wakeup, WAKE_LOCK_SUSPEND, "unknown_wakeups");
-+
-+	ret = platform_device_register(&power_device);
-+	if (ret) {
-+		pr_err("wakelocks_init: platform_device_register failed\n");
-+		goto err_platform_device_register;
-+	}
-+	ret = platform_driver_register(&power_driver);
-+	if (ret) {
-+		pr_err("wakelocks_init: platform_driver_register failed\n");
-+		goto err_platform_driver_register;
-+	}
-+
-+	suspend_work_queue = create_singlethread_workqueue("suspend");
-+	if (suspend_work_queue == NULL) {
-+		ret = -ENOMEM;
-+		goto err_suspend_work_queue;
-+	}
-+
-+#ifdef CONFIG_WAKELOCK_STAT
-+	create_proc_read_entry("wakelocks", S_IRUGO, NULL,
-+				wakelocks_read_proc, NULL);
-+#endif
-+
-+	return 0;
-+
-+err_suspend_work_queue:
-+	platform_driver_unregister(&power_driver);
-+err_platform_driver_register:
-+	platform_device_unregister(&power_device);
-+err_platform_device_register:
-+	wake_lock_destroy(&unknown_wakeup);
-+	wake_lock_destroy(&main_wake_lock);
-+#ifdef CONFIG_WAKELOCK_STAT
-+	wake_lock_destroy(&deleted_wake_locks);
-+#endif
-+	return ret;
-+}
-+
-+static void  __exit wakelocks_exit(void)
-+{
-+#ifdef CONFIG_WAKELOCK_STAT
-+	remove_proc_entry("wakelocks", NULL);
-+#endif
-+	destroy_workqueue(suspend_work_queue);
-+	platform_driver_unregister(&power_driver);
-+	platform_device_unregister(&power_device);
-+	wake_lock_destroy(&unknown_wakeup);
-+	wake_lock_destroy(&main_wake_lock);
-+#ifdef CONFIG_WAKELOCK_STAT
-+	wake_lock_destroy(&deleted_wake_locks);
-+#endif
-+}
-+
-+core_initcall(wakelocks_init);
-+module_exit(wakelocks_exit);
diff --git a/target/linux/goldfish/patches-2.6.30/0067-PM-Implement-early-suspend-api.patch b/target/linux/goldfish/patches-2.6.30/0067-PM-Implement-early-suspend-api.patch
deleted file mode 100644
index 0fc0cc1bb..000000000
--- a/target/linux/goldfish/patches-2.6.30/0067-PM-Implement-early-suspend-api.patch
+++ /dev/null
@@ -1,244 +0,0 @@
-From 2d4a25785ad1aa51bad967543e1ab20e9ed4a046 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@android.com>
-Date: Tue, 7 Oct 2008 20:48:01 -0700
-Subject: [PATCH 067/134] PM: Implement early suspend api
-
----
- kernel/power/Kconfig        |   12 +++
- kernel/power/Makefile       |    1 +
- kernel/power/earlysuspend.c |  178 +++++++++++++++++++++++++++++++++++++++++++
- kernel/power/power.h        |    6 ++
- 4 files changed, 197 insertions(+), 0 deletions(-)
- create mode 100644 kernel/power/earlysuspend.c
-
---- a/kernel/power/Kconfig
-+++ b/kernel/power/Kconfig
-@@ -119,6 +119,9 @@ config SUSPEND_FREEZER
- config HAS_WAKELOCK
- 	bool
- 
-+config HAS_EARLYSUSPEND
-+	bool
-+
- config WAKELOCK
- 	bool "Wake lock"
- 	depends on PM && RTC_CLASS
-@@ -135,6 +138,15 @@ config WAKELOCK_STAT
- 	---help---
- 	  Report wake lock stats in /proc/wakelocks
- 
-+config EARLYSUSPEND
-+	bool "Early suspend"
-+	depends on WAKELOCK
-+	default y
-+	select HAS_EARLYSUSPEND
-+	---help---
-+	  Call early suspend handlers when the user requested sleep state
-+	  changes.
-+
- config HIBERNATION
- 	bool "Hibernation (aka 'suspend to disk')"
- 	depends on PM && SWAP && ARCH_HIBERNATION_POSSIBLE
---- a/kernel/power/Makefile
-+++ b/kernel/power/Makefile
-@@ -7,6 +7,7 @@ obj-$(CONFIG_PM)		+= main.o
- obj-$(CONFIG_PM_SLEEP)		+= console.o
- obj-$(CONFIG_FREEZER)		+= process.o
- obj-$(CONFIG_WAKELOCK)		+= wakelock.o
-+obj-$(CONFIG_EARLYSUSPEND)	+= earlysuspend.o
- obj-$(CONFIG_HIBERNATION)	+= swsusp.o disk.o snapshot.o swap.o user.o
- 
- obj-$(CONFIG_MAGIC_SYSRQ)	+= poweroff.o
---- /dev/null
-+++ b/kernel/power/earlysuspend.c
-@@ -0,0 +1,178 @@
-+/* kernel/power/earlysuspend.c
-+ *
-+ * Copyright (C) 2005-2008 Google, Inc.
-+ *
-+ * This software is licensed under the terms of the GNU General Public
-+ * License version 2, as published by the Free Software Foundation, and
-+ * may be copied, distributed, and modified under those terms.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ */
-+
-+#include <linux/earlysuspend.h>
-+#include <linux/module.h>
-+#include <linux/mutex.h>
-+#include <linux/rtc.h>
-+#include <linux/syscalls.h> /* sys_sync */
-+#include <linux/wakelock.h>
-+#include <linux/workqueue.h>
-+
-+#include "power.h"
-+
-+enum {
-+	DEBUG_USER_STATE = 1U << 0,
-+	DEBUG_SUSPEND = 1U << 2,
-+};
-+static int debug_mask = DEBUG_USER_STATE;
-+module_param_named(debug_mask, debug_mask, int, S_IRUGO | S_IWUSR | S_IWGRP);
-+
-+static DEFINE_MUTEX(early_suspend_lock);
-+static LIST_HEAD(early_suspend_handlers);
-+static void early_suspend(struct work_struct *work);
-+static void late_resume(struct work_struct *work);
-+static DECLARE_WORK(early_suspend_work, early_suspend);
-+static DECLARE_WORK(late_resume_work, late_resume);
-+static DEFINE_SPINLOCK(state_lock);
-+enum {
-+	SUSPEND_REQUESTED = 0x1,
-+	SUSPENDED = 0x2,
-+	SUSPEND_REQUESTED_AND_SUSPENDED = SUSPEND_REQUESTED | SUSPENDED,
-+};
-+static int state;
-+
-+void register_early_suspend(struct early_suspend *handler)
-+{
-+	struct list_head *pos;
-+
-+	mutex_lock(&early_suspend_lock);
-+	list_for_each(pos, &early_suspend_handlers) {
-+		struct early_suspend *e;
-+		e = list_entry(pos, struct early_suspend, link);
-+		if (e->level > handler->level)
-+			break;
-+	}
-+	list_add_tail(&handler->link, pos);
-+	if ((state & SUSPENDED) && handler->suspend)
-+		handler->suspend(handler);
-+	mutex_unlock(&early_suspend_lock);
-+}
-+EXPORT_SYMBOL(register_early_suspend);
-+
-+void unregister_early_suspend(struct early_suspend *handler)
-+{
-+	mutex_lock(&early_suspend_lock);
-+	list_del(&handler->link);
-+	mutex_unlock(&early_suspend_lock);
-+}
-+EXPORT_SYMBOL(unregister_early_suspend);
-+
-+static void early_suspend(struct work_struct *work)
-+{
-+	struct early_suspend *pos;
-+	unsigned long irqflags;
-+	int abort = 0;
-+
-+	mutex_lock(&early_suspend_lock);
-+	spin_lock_irqsave(&state_lock, irqflags);
-+	if (state == SUSPEND_REQUESTED)
-+		state |= SUSPENDED;
-+	else
-+		abort = 1;
-+	spin_unlock_irqrestore(&state_lock, irqflags);
-+
-+	if (abort) {
-+		if (debug_mask & DEBUG_SUSPEND)
-+			pr_info("early_suspend: abort, state %d\n", state);
-+		mutex_unlock(&early_suspend_lock);
-+		goto abort;
-+	}
-+
-+	if (debug_mask & DEBUG_SUSPEND)
-+		pr_info("early_suspend: call handlers\n");
-+	list_for_each_entry(pos, &early_suspend_handlers, link) {
-+		if (pos->suspend != NULL)
-+			pos->suspend(pos);
-+	}
-+	mutex_unlock(&early_suspend_lock);
-+
-+	if (debug_mask & DEBUG_SUSPEND)
-+		pr_info("early_suspend: sync\n");
-+
-+	sys_sync();
-+abort:
-+	spin_lock_irqsave(&state_lock, irqflags);
-+	if (state == SUSPEND_REQUESTED_AND_SUSPENDED)
-+		wake_unlock(&main_wake_lock);
-+	spin_unlock_irqrestore(&state_lock, irqflags);
-+}
-+
-+static void late_resume(struct work_struct *work)
-+{
-+	struct early_suspend *pos;
-+	unsigned long irqflags;
-+	int abort = 0;
-+
-+	mutex_lock(&early_suspend_lock);
-+	spin_lock_irqsave(&state_lock, irqflags);
-+	if (state == SUSPENDED)
-+		state &= ~SUSPENDED;
-+	else
-+		abort = 1;
-+	spin_unlock_irqrestore(&state_lock, irqflags);
-+
-+	if (abort) {
-+		if (debug_mask & DEBUG_SUSPEND)
-+			pr_info("late_resume: abort, state %d\n", state);
-+		goto abort;
-+	}
-+	if (debug_mask & DEBUG_SUSPEND)
-+		pr_info("late_resume: call handlers\n");
-+	list_for_each_entry_reverse(pos, &early_suspend_handlers, link)
-+		if (pos->resume != NULL)
-+			pos->resume(pos);
-+	if (debug_mask & DEBUG_SUSPEND)
-+		pr_info("late_resume: done\n");
-+abort:
-+	mutex_unlock(&early_suspend_lock);
-+}
-+
-+void request_suspend_state(suspend_state_t new_state)
-+{
-+	unsigned long irqflags;
-+	int old_sleep;
-+
-+	spin_lock_irqsave(&state_lock, irqflags);
-+	old_sleep = state & SUSPEND_REQUESTED;
-+	if (debug_mask & DEBUG_USER_STATE) {
-+		struct timespec ts;
-+		struct rtc_time tm;
-+		getnstimeofday(&ts);
-+		rtc_time_to_tm(ts.tv_sec, &tm);
-+		pr_info("request_suspend_state: %s (%d->%d) at %lld "
-+			"(%d-%02d-%02d %02d:%02d:%02d.%09lu UTC)\n",
-+			new_state != PM_SUSPEND_ON ? "sleep" : "wakeup",
-+			requested_suspend_state, new_state,
-+			ktime_to_ns(ktime_get()),
-+			tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,
-+			tm.tm_hour, tm.tm_min, tm.tm_sec, ts.tv_nsec);
-+	}
-+	if (!old_sleep && new_state != PM_SUSPEND_ON) {
-+		state |= SUSPEND_REQUESTED;
-+		queue_work(suspend_work_queue, &early_suspend_work);
-+	} else if (old_sleep && new_state == PM_SUSPEND_ON) {
-+		state &= ~SUSPEND_REQUESTED;
-+		wake_lock(&main_wake_lock);
-+		queue_work(suspend_work_queue, &late_resume_work);
-+	}
-+	requested_suspend_state = new_state;
-+	spin_unlock_irqrestore(&state_lock, irqflags);
-+}
-+
-+suspend_state_t get_suspend_state(void)
-+{
-+	return requested_suspend_state;
-+}
---- a/kernel/power/power.h
-+++ b/kernel/power/power.h
-@@ -230,3 +230,9 @@ extern struct workqueue_struct *suspend_
- extern struct wake_lock main_wake_lock;
- extern suspend_state_t requested_suspend_state;
- #endif
-+
-+#ifdef CONFIG_EARLYSUSPEND
-+/* kernel/power/earlysuspend.c */
-+void request_suspend_state(suspend_state_t state);
-+suspend_state_t get_suspend_state(void);
-+#endif
diff --git a/target/linux/goldfish/patches-2.6.30/0068-PM-Enable-early-suspend-through-sys-power-state.patch b/target/linux/goldfish/patches-2.6.30/0068-PM-Enable-early-suspend-through-sys-power-state.patch
deleted file mode 100644
index 84a95dba9..000000000
--- a/target/linux/goldfish/patches-2.6.30/0068-PM-Enable-early-suspend-through-sys-power-state.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 7b236e69bb4403f20fbdef81907d46b4d32d4af8 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@android.com>
-Date: Thu, 9 Oct 2008 19:17:11 -0700
-Subject: [PATCH 068/134] PM: Enable early suspend through /sys/power/state
-
-If EARLYSUSPEND is enabled then writes to /sys/power/state no longer
-blocks, and the kernel will try to enter the requested state every
-time no wakelocks are held. Write "on" to resume normal operation.
----
- kernel/power/main.c |   14 ++++++++++++++
- 1 files changed, 14 insertions(+), 0 deletions(-)
-
---- a/kernel/power/main.c
-+++ b/kernel/power/main.c
-@@ -408,6 +408,9 @@ static void suspend_finish(void)
- 
- 
- static const char * const pm_states[PM_SUSPEND_MAX] = {
-+#ifdef CONFIG_EARLYSUSPEND
-+	[PM_SUSPEND_ON]		= "on",
-+#endif
- 	[PM_SUSPEND_STANDBY]	= "standby",
- 	[PM_SUSPEND_MEM]	= "mem",
- };
-@@ -525,7 +528,11 @@ static ssize_t state_store(struct kobjec
- 			   const char *buf, size_t n)
- {
- #ifdef CONFIG_SUSPEND
-+#ifdef CONFIG_EARLYSUSPEND
-+	suspend_state_t state = PM_SUSPEND_ON;
-+#else
- 	suspend_state_t state = PM_SUSPEND_STANDBY;
-+#endif
- 	const char * const *s;
- #endif
- 	char *p;
-@@ -547,8 +554,15 @@ static ssize_t state_store(struct kobjec
- 			break;
- 	}
- 	if (state < PM_SUSPEND_MAX && *s)
-+#ifdef CONFIG_EARLYSUSPEND
-+		if (state == PM_SUSPEND_ON || valid_state(state)) {
-+			error = 0;
-+			request_suspend_state(state);
-+		}
-+#else
- 		error = enter_state(state);
- #endif
-+#endif
- 
-  Exit:
- 	return error ? error : n;
diff --git a/target/linux/goldfish/patches-2.6.30/0069-PM-Add-user-space-wake-lock-api.patch b/target/linux/goldfish/patches-2.6.30/0069-PM-Add-user-space-wake-lock-api.patch
deleted file mode 100644
index c1d0125f1..000000000
--- a/target/linux/goldfish/patches-2.6.30/0069-PM-Add-user-space-wake-lock-api.patch
+++ /dev/null
@@ -1,314 +0,0 @@
-From 48e1af2bdd11204f11b3770a6c8d3eee64aee2e8 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@android.com>
-Date: Thu, 9 Oct 2008 21:01:46 -0700
-Subject: [PATCH 069/134] PM: Add user-space wake lock api.
-
-This adds /sys/power/wake_lock and /sys/power/wake_unlock.
-Writing a string to wake_lock creates a wake lock the
-first time is sees a string and locks it. Optionally, the
-string can be followed by a timeout.
-To unlock the wake lock, write the same string to wake_unlock.
----
- kernel/power/Kconfig        |   10 ++
- kernel/power/Makefile       |    1 +
- kernel/power/main.c         |    9 ++
- kernel/power/power.h        |   11 ++
- kernel/power/userwakelock.c |  218 +++++++++++++++++++++++++++++++++++++++++++
- 5 files changed, 249 insertions(+), 0 deletions(-)
- create mode 100644 kernel/power/userwakelock.c
-
---- a/kernel/power/Kconfig
-+++ b/kernel/power/Kconfig
-@@ -138,6 +138,16 @@ config WAKELOCK_STAT
- 	---help---
- 	  Report wake lock stats in /proc/wakelocks
- 
-+config USER_WAKELOCK
-+	bool "Userspace wake locks"
-+	depends on WAKELOCK
-+	default y
-+	---help---
-+	  User-space wake lock api. Write "lockname" or "lockname timeout"
-+	  to /sys/power/wake_lock lock and if needed create a wake lock.
-+	  Write "lockname" to /sys/power/wake_unlock to unlock a user wake
-+	  lock.
-+
- config EARLYSUSPEND
- 	bool "Early suspend"
- 	depends on WAKELOCK
---- a/kernel/power/Makefile
-+++ b/kernel/power/Makefile
-@@ -7,6 +7,7 @@ obj-$(CONFIG_PM)		+= main.o
- obj-$(CONFIG_PM_SLEEP)		+= console.o
- obj-$(CONFIG_FREEZER)		+= process.o
- obj-$(CONFIG_WAKELOCK)		+= wakelock.o
-+obj-$(CONFIG_USER_WAKELOCK)	+= userwakelock.o
- obj-$(CONFIG_EARLYSUSPEND)	+= earlysuspend.o
- obj-$(CONFIG_HIBERNATION)	+= swsusp.o disk.o snapshot.o swap.o user.o
- 
---- a/kernel/power/main.c
-+++ b/kernel/power/main.c
-@@ -595,6 +595,11 @@ pm_trace_store(struct kobject *kobj, str
- power_attr(pm_trace);
- #endif /* CONFIG_PM_TRACE */
- 
-+#ifdef CONFIG_USER_WAKELOCK
-+power_attr(wake_lock);
-+power_attr(wake_unlock);
-+#endif
-+
- static struct attribute * g[] = {
- 	&state_attr.attr,
- #ifdef CONFIG_PM_TRACE
-@@ -603,6 +608,10 @@ static struct attribute * g[] = {
- #if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PM_DEBUG)
- 	&pm_test_attr.attr,
- #endif
-+#ifdef CONFIG_USER_WAKELOCK
-+	&wake_lock_attr.attr,
-+	&wake_unlock_attr.attr,
-+#endif
- 	NULL,
- };
- 
---- a/kernel/power/power.h
-+++ b/kernel/power/power.h
-@@ -231,6 +231,17 @@ extern struct wake_lock main_wake_lock;
- extern suspend_state_t requested_suspend_state;
- #endif
- 
-+#ifdef CONFIG_USER_WAKELOCK
-+ssize_t wake_lock_show(struct kobject *kobj, struct kobj_attribute *attr,
-+			char *buf);
-+ssize_t wake_lock_store(struct kobject *kobj, struct kobj_attribute *attr,
-+			const char *buf, size_t n);
-+ssize_t wake_unlock_show(struct kobject *kobj, struct kobj_attribute *attr,
-+			char *buf);
-+ssize_t  wake_unlock_store(struct kobject *kobj, struct kobj_attribute *attr,
-+			const char *buf, size_t n);
-+#endif
-+
- #ifdef CONFIG_EARLYSUSPEND
- /* kernel/power/earlysuspend.c */
- void request_suspend_state(suspend_state_t state);
---- /dev/null
-+++ b/kernel/power/userwakelock.c
-@@ -0,0 +1,218 @@
-+/* kernel/power/userwakelock.c
-+ *
-+ * Copyright (C) 2005-2008 Google, Inc.
-+ *
-+ * This software is licensed under the terms of the GNU General Public
-+ * License version 2, as published by the Free Software Foundation, and
-+ * may be copied, distributed, and modified under those terms.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ */
-+
-+#include <linux/ctype.h>
-+#include <linux/module.h>
-+#include <linux/wakelock.h>
-+
-+#include "power.h"
-+
-+enum {
-+	DEBUG_FAILURE	= BIT(0),
-+	DEBUG_ERROR	= BIT(1),
-+	DEBUG_NEW	= BIT(2),
-+	DEBUG_ACCESS	= BIT(3),
-+	DEBUG_LOOKUP	= BIT(4),
-+};
-+static int debug_mask = DEBUG_FAILURE;
-+module_param_named(debug_mask, debug_mask, int, S_IRUGO | S_IWUSR | S_IWGRP);
-+
-+static DEFINE_MUTEX(tree_lock);
-+
-+struct user_wake_lock {
-+	struct rb_node		node;
-+	struct wake_lock	wake_lock;
-+	char			name[0];
-+};
-+struct rb_root user_wake_locks;
-+
-+static struct user_wake_lock *lookup_wake_lock_name(
-+	const char *buf, int allocate, long *timeoutptr)
-+{
-+	struct rb_node **p = &user_wake_locks.rb_node;
-+	struct rb_node *parent = NULL;
-+	struct user_wake_lock *l;
-+	int diff;
-+	u64 timeout;
-+	int name_len;
-+	const char *arg;
-+
-+	/* Find length of lock name and start of optional timeout string */
-+	arg = buf;
-+	while (*arg && !isspace(*arg))
-+		arg++;
-+	name_len = arg - buf;
-+	if (!name_len)
-+		goto bad_arg;
-+	while (isspace(*arg))
-+		arg++;
-+
-+	/* Process timeout string */
-+	if (timeoutptr && *arg) {
-+		timeout = simple_strtoull(arg, (char **)&arg, 0);
-+		while (isspace(*arg))
-+			arg++;
-+		if (*arg)
-+			goto bad_arg;
-+		/* convert timeout from nanoseconds to jiffies > 0 */
-+		timeout += (NSEC_PER_SEC / HZ) - 1;
-+		do_div(timeout, (NSEC_PER_SEC / HZ));
-+		if (timeout <= 0)
-+			timeout = 1;
-+		*timeoutptr = timeout;
-+	} else if (*arg)
-+		goto bad_arg;
-+	else if (timeoutptr)
-+		*timeoutptr = 0;
-+
-+	/* Lookup wake lock in rbtree */
-+	while (*p) {
-+		parent = *p;
-+		l = rb_entry(parent, struct user_wake_lock, node);
-+		diff = strncmp(buf, l->name, name_len);
-+		if (!diff && l->name[name_len])
-+			diff = -1;
-+		if (debug_mask & DEBUG_ERROR)
-+			pr_info("lookup_wake_lock_name: compare %.*s %s %d\n",
-+				name_len, buf, l->name, diff);
-+
-+		if (diff < 0)
-+			p = &(*p)->rb_left;
-+		else if (diff > 0)
-+			p = &(*p)->rb_right;
-+		else
-+			return l;
-+	}
-+
-+	/* Allocate and add new wakelock to rbtree */
-+	if (!allocate) {
-+		if (debug_mask & DEBUG_ERROR)
-+			pr_info("lookup_wake_lock_name: %.*s not found\n",
-+				name_len, buf);
-+		return ERR_PTR(-EINVAL);
-+	}
-+	l = kzalloc(sizeof(*l) + name_len + 1, GFP_KERNEL);
-+	if (l == NULL) {
-+		if (debug_mask & DEBUG_FAILURE)
-+			pr_err("lookup_wake_lock_name: failed to allocate "
-+				"memory for %.*s\n", name_len, buf);
-+		return ERR_PTR(-ENOMEM);
-+	}
-+	memcpy(l->name, buf, name_len);
-+	if (debug_mask & DEBUG_NEW)
-+		pr_info("lookup_wake_lock_name: new wake lock %s\n", l->name);
-+	wake_lock_init(&l->wake_lock, WAKE_LOCK_SUSPEND, l->name);
-+	rb_link_node(&l->node, parent, p);
-+	rb_insert_color(&l->node, &user_wake_locks);
-+	return l;
-+
-+bad_arg:
-+	if (debug_mask & DEBUG_ERROR)
-+		pr_info("lookup_wake_lock_name: wake lock, %.*s, bad arg, %s\n",
-+			name_len, buf, arg);
-+	return ERR_PTR(-EINVAL);
-+}
-+
-+ssize_t wake_lock_show(
-+	struct kobject *kobj, struct kobj_attribute *attr, char *buf)
-+{
-+	char *s = buf;
-+	char *end = buf + PAGE_SIZE;
-+	struct rb_node *n;
-+	struct user_wake_lock *l;
-+
-+	mutex_lock(&tree_lock);
-+
-+	for (n = rb_first(&user_wake_locks); n != NULL; n = rb_next(n)) {
-+		l = rb_entry(n, struct user_wake_lock, node);
-+		if (wake_lock_active(&l->wake_lock))
-+			s += scnprintf(s, end - s, "%s ", l->name);
-+	}
-+	s += scnprintf(s, end - s, "\n");
-+
-+	mutex_unlock(&tree_lock);
-+	return (s - buf);
-+}
-+
-+ssize_t wake_lock_store(
-+	struct kobject *kobj, struct kobj_attribute *attr,
-+	const char *buf, size_t n)
-+{
-+	long timeout;
-+	struct user_wake_lock *l;
-+
-+	mutex_lock(&tree_lock);
-+	l = lookup_wake_lock_name(buf, 1, &timeout);
-+	if (IS_ERR(l)) {
-+		n = PTR_ERR(l);
-+		goto bad_name;
-+	}
-+
-+	if (debug_mask & DEBUG_ACCESS)
-+		pr_info("wake_lock_store: %s, timeout %ld\n", l->name, timeout);
-+
-+	if (timeout)
-+		wake_lock_timeout(&l->wake_lock, timeout);
-+	else
-+		wake_lock(&l->wake_lock);
-+bad_name:
-+	mutex_unlock(&tree_lock);
-+	return n;
-+}
-+
-+
-+ssize_t wake_unlock_show(
-+	struct kobject *kobj, struct kobj_attribute *attr, char *buf)
-+{
-+	char *s = buf;
-+	char *end = buf + PAGE_SIZE;
-+	struct rb_node *n;
-+	struct user_wake_lock *l;
-+
-+	mutex_lock(&tree_lock);
-+
-+	for (n = rb_first(&user_wake_locks); n != NULL; n = rb_next(n)) {
-+		l = rb_entry(n, struct user_wake_lock, node);
-+		if (!wake_lock_active(&l->wake_lock))
-+			s += scnprintf(s, end - s, "%s ", l->name);
-+	}
-+	s += scnprintf(s, end - s, "\n");
-+
-+	mutex_unlock(&tree_lock);
-+	return (s - buf);
-+}
-+
-+ssize_t wake_unlock_store(
-+	struct kobject *kobj, struct kobj_attribute *attr,
-+	const char *buf, size_t n)
-+{
-+	struct user_wake_lock *l;
-+
-+	mutex_lock(&tree_lock);
-+	l = lookup_wake_lock_name(buf, 0, NULL);
-+	if (IS_ERR(l)) {
-+		n = PTR_ERR(l);
-+		goto not_found;
-+	}
-+
-+	if (debug_mask & DEBUG_ACCESS)
-+		pr_info("wake_unlock_store: %s\n", l->name);
-+
-+	wake_unlock(&l->wake_lock);
-+not_found:
-+	mutex_unlock(&tree_lock);
-+	return n;
-+}
-+
diff --git a/target/linux/goldfish/patches-2.6.30/0070-PM-wakelock-Abort-task-freezing-if-a-wake-lock-is.patch b/target/linux/goldfish/patches-2.6.30/0070-PM-wakelock-Abort-task-freezing-if-a-wake-lock-is.patch
deleted file mode 100644
index a93df9ad4..000000000
--- a/target/linux/goldfish/patches-2.6.30/0070-PM-wakelock-Abort-task-freezing-if-a-wake-lock-is.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 3f8e407c418205252f00615da4d0182e8c960344 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@android.com>
-Date: Tue, 14 Oct 2008 16:02:39 -0700
-Subject: [PATCH 070/134] PM: wakelock: Abort task freezing if a wake lock is held.
-
-Avoids a problem where the device sometimes hangs for 20 seconds
-before the screen is turned on.
----
- kernel/power/process.c |   23 ++++++++++++++++++-----
- 1 files changed, 18 insertions(+), 5 deletions(-)
-
---- a/kernel/power/process.c
-+++ b/kernel/power/process.c
-@@ -13,6 +13,7 @@
- #include <linux/module.h>
- #include <linux/syscalls.h>
- #include <linux/freezer.h>
-+#include <linux/wakelock.h>
- 
- /* 
-  * Timeout for stopping processes
-@@ -36,6 +37,7 @@ static int try_to_freeze_tasks(bool sig_
- 	struct timeval start, end;
- 	u64 elapsed_csecs64;
- 	unsigned int elapsed_csecs;
-+	unsigned int wakeup = 0;
- 
- 	do_gettimeofday(&start);
- 
-@@ -62,6 +64,10 @@ static int try_to_freeze_tasks(bool sig_
- 		} while_each_thread(g, p);
- 		read_unlock(&tasklist_lock);
- 		yield();			/* Yield is okay here */
-+		if (todo && has_wake_lock(WAKE_LOCK_SUSPEND)) {
-+			wakeup = 1;
-+			break;
-+		}
- 		if (time_after(jiffies, end_time))
- 			break;
- 	} while (todo);
-@@ -77,11 +83,18 @@ static int try_to_freeze_tasks(bool sig_
- 		 * and caller must call thaw_processes() if something fails),
- 		 * but it cleans up leftover PF_FREEZE requests.
- 		 */
--		printk("\n");
--		printk(KERN_ERR "Freezing of tasks failed after %d.%02d seconds "
--				"(%d tasks refusing to freeze):\n",
--				elapsed_csecs / 100, elapsed_csecs % 100, todo);
--		show_state();
-+		if(wakeup) {
-+			printk("\n");
-+			printk(KERN_ERR "Freezing of %s aborted\n",
-+					sig_only ? "user space " : "tasks ");
-+		}
-+		else {
-+			printk("\n");
-+			printk(KERN_ERR "Freezing of tasks failed after %d.%02d seconds "
-+					"(%d tasks refusing to freeze):\n",
-+					elapsed_csecs / 100, elapsed_csecs % 100, todo);
-+			show_state();
-+		}
- 		read_lock(&tasklist_lock);
- 		do_each_thread(g, p) {
- 			task_lock(p);
diff --git a/target/linux/goldfish/patches-2.6.30/0071-PM-earlysuspend-Add-console-switch-when-user-reque.patch b/target/linux/goldfish/patches-2.6.30/0071-PM-earlysuspend-Add-console-switch-when-user-reque.patch
deleted file mode 100644
index 602b92425..000000000
--- a/target/linux/goldfish/patches-2.6.30/0071-PM-earlysuspend-Add-console-switch-when-user-reque.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From 0083b2afe89dea4a06bfd967b164318ad0bccd11 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@android.com>
-Date: Wed, 15 Oct 2008 17:52:20 -0700
-Subject: [PATCH 071/134] PM: earlysuspend: Add console switch when user requested sleep state changes.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Arve Hjønnevåg <arve@android.com>
----
- kernel/power/Kconfig               |   17 ++++++++
- kernel/power/Makefile              |    1 +
- kernel/power/consoleearlysuspend.c |   78 ++++++++++++++++++++++++++++++++++++
- 3 files changed, 96 insertions(+), 0 deletions(-)
- create mode 100644 kernel/power/consoleearlysuspend.c
-
---- a/kernel/power/Kconfig
-+++ b/kernel/power/Kconfig
-@@ -157,6 +157,23 @@ config EARLYSUSPEND
- 	  Call early suspend handlers when the user requested sleep state
- 	  changes.
- 
-+choice
-+	prompt "User-space screen access"
-+	default CONSOLE_EARLYSUSPEND
-+	depends on HAS_EARLYSUSPEND
-+
-+	config NO_USER_SPACE_SCREEN_ACCESS_CONTROL
-+		bool "None"
-+
-+	config CONSOLE_EARLYSUSPEND
-+		bool "Console switch on early-suspend"
-+		depends on HAS_EARLYSUSPEND && VT
-+		---help---
-+		  Register early suspend handler to perform a console switch to
-+		  when user-space should stop drawing to the screen and a switch
-+		  back when it should resume.
-+endchoice
-+
- config HIBERNATION
- 	bool "Hibernation (aka 'suspend to disk')"
- 	depends on PM && SWAP && ARCH_HIBERNATION_POSSIBLE
---- a/kernel/power/Makefile
-+++ b/kernel/power/Makefile
-@@ -9,6 +9,7 @@ obj-$(CONFIG_FREEZER)		+= process.o
- obj-$(CONFIG_WAKELOCK)		+= wakelock.o
- obj-$(CONFIG_USER_WAKELOCK)	+= userwakelock.o
- obj-$(CONFIG_EARLYSUSPEND)	+= earlysuspend.o
-+obj-$(CONFIG_CONSOLE_EARLYSUSPEND)	+= consoleearlysuspend.o
- obj-$(CONFIG_HIBERNATION)	+= swsusp.o disk.o snapshot.o swap.o user.o
- 
- obj-$(CONFIG_MAGIC_SYSRQ)	+= poweroff.o
---- /dev/null
-+++ b/kernel/power/consoleearlysuspend.c
-@@ -0,0 +1,78 @@
-+/* kernel/power/consoleearlysuspend.c
-+ *
-+ * Copyright (C) 2005-2008 Google, Inc.
-+ *
-+ * This software is licensed under the terms of the GNU General Public
-+ * License version 2, as published by the Free Software Foundation, and
-+ * may be copied, distributed, and modified under those terms.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ */
-+
-+#include <linux/console.h>
-+#include <linux/earlysuspend.h>
-+#include <linux/kbd_kern.h>
-+#include <linux/module.h>
-+#include <linux/vt_kern.h>
-+#include <linux/wait.h>
-+
-+#define EARLY_SUSPEND_CONSOLE	(MAX_NR_CONSOLES-1)
-+
-+static int orig_fgconsole;
-+static void console_early_suspend(struct early_suspend *h)
-+{
-+	acquire_console_sem();
-+	orig_fgconsole = fg_console;
-+	if (vc_allocate(EARLY_SUSPEND_CONSOLE))
-+		goto err;
-+	if (set_console(EARLY_SUSPEND_CONSOLE))
-+		goto err;
-+	release_console_sem();
-+
-+	if (vt_waitactive(EARLY_SUSPEND_CONSOLE))
-+		pr_warning("console_early_suspend: Can't switch VCs.\n");
-+	return;
-+err:
-+	pr_warning("console_early_suspend: Can't set console\n");
-+	release_console_sem();
-+}
-+
-+static void console_late_resume(struct early_suspend *h)
-+{
-+	int ret;
-+	acquire_console_sem();
-+	ret = set_console(orig_fgconsole);
-+	release_console_sem();
-+	if (ret) {
-+		pr_warning("console_late_resume: Can't set console.\n");
-+		return;
-+	}
-+
-+	if (vt_waitactive(orig_fgconsole))
-+		pr_warning("console_late_resume: Can't switch VCs.\n");
-+}
-+
-+static struct early_suspend console_early_suspend_desc = {
-+	.level = EARLY_SUSPEND_LEVEL_STOP_DRAWING,
-+	.suspend = console_early_suspend,
-+	.resume = console_late_resume,
-+};
-+
-+static int __init console_early_suspend_init(void)
-+{
-+	register_early_suspend(&console_early_suspend_desc);
-+	return 0;
-+}
-+
-+static void  __exit console_early_suspend_exit(void)
-+{
-+	unregister_early_suspend(&console_early_suspend_desc);
-+}
-+
-+module_init(console_early_suspend_init);
-+module_exit(console_early_suspend_exit);
-+
diff --git a/target/linux/goldfish/patches-2.6.30/0072-PM-earlysuspend-Removing-dependence-on-console.patch b/target/linux/goldfish/patches-2.6.30/0072-PM-earlysuspend-Removing-dependence-on-console.patch
deleted file mode 100644
index 489cfc0f4..000000000
--- a/target/linux/goldfish/patches-2.6.30/0072-PM-earlysuspend-Removing-dependence-on-console.patch
+++ /dev/null
@@ -1,217 +0,0 @@
-From ba801aa66e869f1f9f9d3a1610a2165baa024e4b Mon Sep 17 00:00:00 2001
-From: Rebecca Schultz <rschultz@google.com>
-Date: Thu, 17 Jul 2008 18:14:55 -0700
-Subject: [PATCH 072/134] PM: earlysuspend: Removing dependence on console.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-Rather than signaling a full update of the display from userspace via a
-console switch, this patch introduces 2 files int /sys/power,
-wait_for_fb_sleep and wait_for_fb_wake.  Reading these files will block
-until the requested state has been entered.  When a read from
-wait_for_fb_sleep returns userspace should stop drawing.  When
-wait_for_fb_wake returns, it should do a full update.  If either are called
-when the fb driver is already in the requested state, they will return
-immediately.
-
-Signed-off-by: Rebecca Schultz <rschultz@google.com>
-Signed-off-by: Arve Hjønnevåg <arve@android.com>
----
- kernel/power/Kconfig          |    9 +++
- kernel/power/Makefile         |    1 +
- kernel/power/fbearlysuspend.c |  153 +++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 163 insertions(+), 0 deletions(-)
- create mode 100644 kernel/power/fbearlysuspend.c
-
---- a/kernel/power/Kconfig
-+++ b/kernel/power/Kconfig
-@@ -159,6 +159,7 @@ config EARLYSUSPEND
- 
- choice
- 	prompt "User-space screen access"
-+	default FB_EARLYSUSPEND if !FRAMEBUFFER_CONSOLE
- 	default CONSOLE_EARLYSUSPEND
- 	depends on HAS_EARLYSUSPEND
- 
-@@ -172,6 +173,14 @@ choice
- 		  Register early suspend handler to perform a console switch to
- 		  when user-space should stop drawing to the screen and a switch
- 		  back when it should resume.
-+
-+	config FB_EARLYSUSPEND
-+		bool "Sysfs interface"
-+		depends on HAS_EARLYSUSPEND
-+		---help---
-+		  Register early suspend handler that notifies and waits for
-+		  user-space through sysfs when user-space should stop drawing
-+		  to the screen and notifies user-space when it should resume.
- endchoice
- 
- config HIBERNATION
---- a/kernel/power/Makefile
-+++ b/kernel/power/Makefile
-@@ -10,6 +10,7 @@ obj-$(CONFIG_WAKELOCK)		+= wakelock.o
- obj-$(CONFIG_USER_WAKELOCK)	+= userwakelock.o
- obj-$(CONFIG_EARLYSUSPEND)	+= earlysuspend.o
- obj-$(CONFIG_CONSOLE_EARLYSUSPEND)	+= consoleearlysuspend.o
-+obj-$(CONFIG_FB_EARLYSUSPEND)	+= fbearlysuspend.o
- obj-$(CONFIG_HIBERNATION)	+= swsusp.o disk.o snapshot.o swap.o user.o
- 
- obj-$(CONFIG_MAGIC_SYSRQ)	+= poweroff.o
---- /dev/null
-+++ b/kernel/power/fbearlysuspend.c
-@@ -0,0 +1,153 @@
-+/* kernel/power/fbearlysuspend.c
-+ *
-+ * Copyright (C) 2005-2008 Google, Inc.
-+ *
-+ * This software is licensed under the terms of the GNU General Public
-+ * License version 2, as published by the Free Software Foundation, and
-+ * may be copied, distributed, and modified under those terms.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ */
-+
-+#include <linux/earlysuspend.h>
-+#include <linux/module.h>
-+#include <linux/wait.h>
-+
-+#include "power.h"
-+
-+static wait_queue_head_t fb_state_wq;
-+static DEFINE_SPINLOCK(fb_state_lock);
-+static enum {
-+	FB_STATE_STOPPED_DRAWING,
-+	FB_STATE_REQUEST_STOP_DRAWING,
-+	FB_STATE_DRAWING_OK,
-+} fb_state;
-+
-+/* tell userspace to stop drawing, wait for it to stop */
-+static void stop_drawing_early_suspend(struct early_suspend *h)
-+{
-+	int ret;
-+	unsigned long irq_flags;
-+
-+	spin_lock_irqsave(&fb_state_lock, irq_flags);
-+	fb_state = FB_STATE_REQUEST_STOP_DRAWING;
-+	spin_unlock_irqrestore(&fb_state_lock, irq_flags);
-+
-+	wake_up_all(&fb_state_wq);
-+	ret = wait_event_timeout(fb_state_wq,
-+				 fb_state == FB_STATE_STOPPED_DRAWING,
-+				 HZ);
-+	if (unlikely(fb_state != FB_STATE_STOPPED_DRAWING))
-+		pr_warning("stop_drawing_early_suspend: timeout waiting for "
-+			   "userspace to stop drawing\n");
-+}
-+
-+/* tell userspace to start drawing */
-+static void start_drawing_late_resume(struct early_suspend *h)
-+{
-+	unsigned long irq_flags;
-+
-+	spin_lock_irqsave(&fb_state_lock, irq_flags);
-+	fb_state = FB_STATE_DRAWING_OK;
-+	spin_unlock_irqrestore(&fb_state_lock, irq_flags);
-+	wake_up(&fb_state_wq);
-+}
-+
-+static struct early_suspend stop_drawing_early_suspend_desc = {
-+	.level = EARLY_SUSPEND_LEVEL_STOP_DRAWING,
-+	.suspend = stop_drawing_early_suspend,
-+	.resume = start_drawing_late_resume,
-+};
-+
-+static ssize_t wait_for_fb_sleep_show(struct kobject *kobj,
-+				      struct kobj_attribute *attr, char *buf)
-+{
-+	char *s = buf;
-+	int ret;
-+
-+	ret = wait_event_interruptible(fb_state_wq,
-+				       fb_state != FB_STATE_DRAWING_OK);
-+	if (ret && fb_state == FB_STATE_DRAWING_OK)
-+		return ret;
-+	else
-+		s += sprintf(buf, "sleeping");
-+	return s - buf;
-+}
-+
-+static ssize_t wait_for_fb_wake_show(struct kobject *kobj,
-+				     struct kobj_attribute *attr, char *buf)
-+{
-+	char *s = buf;
-+	int ret;
-+	unsigned long irq_flags;
-+
-+	spin_lock_irqsave(&fb_state_lock, irq_flags);
-+	if (fb_state == FB_STATE_REQUEST_STOP_DRAWING) {
-+		fb_state = FB_STATE_STOPPED_DRAWING;
-+		wake_up(&fb_state_wq);
-+	}
-+	spin_unlock_irqrestore(&fb_state_lock, irq_flags);
-+
-+	ret = wait_event_interruptible(fb_state_wq,
-+				       fb_state == FB_STATE_DRAWING_OK);
-+	if (ret && fb_state != FB_STATE_DRAWING_OK)
-+		return ret;
-+	else
-+		s += sprintf(buf, "awake");
-+
-+	return s - buf;
-+}
-+
-+#define power_ro_attr(_name) \
-+static struct kobj_attribute _name##_attr = {	\
-+	.attr	= {				\
-+		.name = __stringify(_name),	\
-+		.mode = 0444,			\
-+	},					\
-+	.show	= _name##_show,			\
-+	.store	= NULL,		\
-+}
-+
-+power_ro_attr(wait_for_fb_sleep);
-+power_ro_attr(wait_for_fb_wake);
-+
-+static struct attribute *g[] = {
-+	&wait_for_fb_sleep_attr.attr,
-+	&wait_for_fb_wake_attr.attr,
-+	NULL,
-+};
-+
-+static struct attribute_group attr_group = {
-+	.attrs = g,
-+};
-+
-+static int __init android_power_init(void)
-+{
-+	int ret;
-+
-+	init_waitqueue_head(&fb_state_wq);
-+	fb_state = FB_STATE_DRAWING_OK;
-+
-+	ret = sysfs_create_group(power_kobj, &attr_group);
-+	if (ret) {
-+		pr_err("android_power_init: sysfs_create_group failed\n");
-+		return ret;
-+	}
-+
-+	register_early_suspend(&stop_drawing_early_suspend_desc);
-+	return 0;
-+}
-+
-+static void  __exit android_power_exit(void)
-+{
-+	unregister_early_suspend(&stop_drawing_early_suspend_desc);
-+	sysfs_remove_group(power_kobj, &attr_group);
-+}
-+
-+module_init(android_power_init);
-+module_exit(android_power_exit);
-+
diff --git a/target/linux/goldfish/patches-2.6.30/0081-net-socket-ioctl-to-reset-connections-matching-loca.patch b/target/linux/goldfish/patches-2.6.30/0081-net-socket-ioctl-to-reset-connections-matching-loca.patch
deleted file mode 100644
index fdffc507a..000000000
--- a/target/linux/goldfish/patches-2.6.30/0081-net-socket-ioctl-to-reset-connections-matching-loca.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From 2df5996350da51bcdee798c00ae1f2415fd9ad20 Mon Sep 17 00:00:00 2001
-From: Robert Love <rlove@google.com>
-Date: Mon, 12 May 2008 17:08:29 -0400
-Subject: [PATCH 081/134] net: socket ioctl to reset connections matching local address
-
-Introduce a new socket ioctl, SIOCKILLADDR, that nukes all sockets
-bound to the same local address. This is useful in situations with
-dynamic IPs, to kill stuck connections.
-
-Signed-off-by: Brian Swetland <swetland@google.com>
-
-net: fix tcp_v4_nuke_addr
-
-Signed-off-by: Dima Zavin <dima@android.com>
----
- include/linux/sockios.h |    1 +
- include/net/tcp.h       |    2 ++
- net/ipv4/af_inet.c      |    1 +
- net/ipv4/devinet.c      |    9 ++++++++-
- net/ipv4/tcp_ipv4.c     |   31 +++++++++++++++++++++++++++++++
- 5 files changed, 43 insertions(+), 1 deletions(-)
-
---- a/include/linux/sockios.h
-+++ b/include/linux/sockios.h
-@@ -65,6 +65,7 @@
- #define SIOCDIFADDR	0x8936		/* delete PA address		*/
- #define	SIOCSIFHWBROADCAST	0x8937	/* set hardware broadcast addr	*/
- #define SIOCGIFCOUNT	0x8938		/* get number of devices */
-+#define SIOCKILLADDR	0x8939		/* kill sockets with this local addr */
- 
- #define SIOCGIFBR	0x8940		/* Bridging support		*/
- #define SIOCSIFBR	0x8941		/* Set bridging options 	*/
---- a/include/net/tcp.h
-+++ b/include/net/tcp.h
-@@ -1381,6 +1381,8 @@ extern struct sk_buff **tcp4_gro_receive
- extern int tcp_gro_complete(struct sk_buff *skb);
- extern int tcp4_gro_complete(struct sk_buff *skb);
- 
-+extern void tcp_v4_nuke_addr(__u32 saddr);
-+
- #ifdef CONFIG_PROC_FS
- extern int  tcp4_proc_init(void);
- extern void tcp4_proc_exit(void);
---- a/net/ipv4/af_inet.c
-+++ b/net/ipv4/af_inet.c
-@@ -825,6 +825,7 @@ int inet_ioctl(struct socket *sock, unsi
- 		case SIOCSIFPFLAGS:
- 		case SIOCGIFPFLAGS:
- 		case SIOCSIFFLAGS:
-+		case SIOCKILLADDR:
- 			err = devinet_ioctl(net, cmd, (void __user *)arg);
- 			break;
- 		default:
---- a/net/ipv4/devinet.c
-+++ b/net/ipv4/devinet.c
-@@ -57,6 +57,7 @@
- 
- #include <net/arp.h>
- #include <net/ip.h>
-+#include <net/tcp.h>
- #include <net/route.h>
- #include <net/ip_fib.h>
- #include <net/rtnetlink.h>
-@@ -631,6 +632,7 @@ int devinet_ioctl(struct net *net, unsig
- 	case SIOCSIFBRDADDR:	/* Set the broadcast address */
- 	case SIOCSIFDSTADDR:	/* Set the destination address */
- 	case SIOCSIFNETMASK: 	/* Set the netmask for the interface */
-+	case SIOCKILLADDR:	/* Nuke all sockets on this address */
- 		ret = -EACCES;
- 		if (!capable(CAP_NET_ADMIN))
- 			goto out;
-@@ -680,7 +682,8 @@ int devinet_ioctl(struct net *net, unsig
- 	}
- 
- 	ret = -EADDRNOTAVAIL;
--	if (!ifa && cmd != SIOCSIFADDR && cmd != SIOCSIFFLAGS)
-+	if (!ifa && cmd != SIOCSIFADDR && cmd != SIOCSIFFLAGS
-+	    && cmd != SIOCKILLADDR)
- 		goto done;
- 
- 	switch (cmd) {
-@@ -804,6 +807,10 @@ int devinet_ioctl(struct net *net, unsig
- 			inet_insert_ifa(ifa);
- 		}
- 		break;
-+	case SIOCKILLADDR:	/* Nuke all connections on this address */
-+		ret = 0;
-+		tcp_v4_nuke_addr(sin->sin_addr.s_addr);
-+		break;
- 	}
- done:
- 	rtnl_unlock();
---- a/net/ipv4/tcp_ipv4.c
-+++ b/net/ipv4/tcp_ipv4.c
-@@ -1845,6 +1845,37 @@ void tcp_v4_destroy_sock(struct sock *sk
- 
- EXPORT_SYMBOL(tcp_v4_destroy_sock);
- 
-+/*
-+ * tcp_v4_nuke_addr - destroy all sockets on the given local address
-+ */
-+void tcp_v4_nuke_addr(__u32 saddr)
-+{
-+	unsigned int bucket;
-+
-+	for (bucket = 0; bucket < tcp_hashinfo.ehash_size; bucket++) {
-+		struct hlist_nulls_node *node;
-+		struct sock *sk;
-+		spinlock_t *lock = inet_ehash_lockp(&tcp_hashinfo, bucket);
-+
-+		spin_lock_bh(lock);
-+		sk_nulls_for_each(sk, node, &tcp_hashinfo.ehash[bucket].chain) {
-+			struct inet_sock *inet = inet_sk(sk);
-+
-+			if (inet->rcv_saddr != saddr)
-+				continue;
-+			if (sysctl_ip_dynaddr && sk->sk_state == TCP_SYN_SENT)
-+				continue;
-+			if (sock_flag(sk, SOCK_DEAD))
-+				continue;
-+
-+			sk->sk_err = ETIMEDOUT;
-+			sk->sk_error_report(sk);
-+			tcp_done(sk);
-+		}
-+		spin_unlock_bh(lock);
-+	}
-+}
-+
- #ifdef CONFIG_PROC_FS
- /* Proc filesystem TCP sock list dumping. */
- 
diff --git a/target/linux/goldfish/patches-2.6.30/0082-sysfs_net_ipv4-Add-sysfs-based-knobs-for-controllin.patch b/target/linux/goldfish/patches-2.6.30/0082-sysfs_net_ipv4-Add-sysfs-based-knobs-for-controllin.patch
deleted file mode 100644
index f1fce089c..000000000
--- a/target/linux/goldfish/patches-2.6.30/0082-sysfs_net_ipv4-Add-sysfs-based-knobs-for-controllin.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From 75090d40ffbd9b4863238e1d62b43f8598da5e5e Mon Sep 17 00:00:00 2001
-From: Robert Love <rlove@google.com>
-Date: Thu, 31 Jul 2008 11:12:44 -0400
-Subject: [PATCH 082/134] sysfs_net_ipv4: Add sysfs-based knobs for controlling TCP window size
-
-Add a family of knobs to /sys/kernel/ipv4 for controlling the TCP window size:
-
-	tcp_wmem_min
-	tcp_wmem_def
-	tcp_wmem_max
-	tcp_rmem_min
-	tcp_rmem_def
-	tcp_rmem_max
-
-This six values mirror the sysctl knobs in /proc/sys/net/ipv4/tcp_wmem and
-/proc/sys/net/ipv4/tcp_rmem.
-
-Sysfs, unlike sysctl, allows us to set and manage the files' permissions and
-owners.
-
-Signed-off-by: Robert Love <rlove@google.com>
----
- net/ipv4/Makefile         |    1 +
- net/ipv4/sysfs_net_ipv4.c |   88 +++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 89 insertions(+), 0 deletions(-)
- create mode 100644 net/ipv4/sysfs_net_ipv4.c
-
---- a/net/ipv4/Makefile
-+++ b/net/ipv4/Makefile
-@@ -14,6 +14,7 @@ obj-y     := route.o inetpeer.o protocol
- 	     inet_fragment.o
- 
- obj-$(CONFIG_SYSCTL) += sysctl_net_ipv4.o
-+obj-$(CONFIG_SYSFS) += sysfs_net_ipv4.o
- obj-$(CONFIG_IP_FIB_HASH) += fib_hash.o
- obj-$(CONFIG_IP_FIB_TRIE) += fib_trie.o
- obj-$(CONFIG_PROC_FS) += proc.o
---- /dev/null
-+++ b/net/ipv4/sysfs_net_ipv4.c
-@@ -0,0 +1,88 @@
-+/*
-+ * net/ipv4/sysfs_net_ipv4.c
-+ *
-+ * sysfs-based networking knobs (so we can, unlike with sysctl, control perms)
-+ *
-+ * Copyright (C) 2008 Google, Inc.
-+ *
-+ * Robert Love <rlove@google.com>
-+ *
-+ * This software is licensed under the terms of the GNU General Public
-+ * License version 2, as published by the Free Software Foundation, and
-+ * may be copied, distributed, and modified under those terms.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ */
-+
-+#include <linux/kobject.h>
-+#include <linux/string.h>
-+#include <linux/sysfs.h>
-+#include <linux/init.h>
-+#include <net/tcp.h>
-+
-+#define CREATE_IPV4_FILE(_name, _var) \
-+static ssize_t _name##_show(struct kobject *kobj, \
-+			    struct kobj_attribute *attr, char *buf) \
-+{ \
-+	return sprintf(buf, "%d\n", _var); \
-+} \
-+static ssize_t _name##_store(struct kobject *kobj, \
-+			     struct kobj_attribute *attr, \
-+			     const char *buf, size_t count) \
-+{ \
-+	int val, ret; \
-+	ret = sscanf(buf, "%d", &val); \
-+	if (ret != 1) \
-+		return -EINVAL; \
-+	if (val < 0) \
-+		return -EINVAL; \
-+	_var = val; \
-+	return count; \
-+} \
-+static struct kobj_attribute _name##_attr = \
-+	__ATTR(_name, 0644, _name##_show, _name##_store)
-+
-+CREATE_IPV4_FILE(tcp_wmem_min, sysctl_tcp_wmem[0]);
-+CREATE_IPV4_FILE(tcp_wmem_def, sysctl_tcp_wmem[1]);
-+CREATE_IPV4_FILE(tcp_wmem_max, sysctl_tcp_wmem[2]);
-+
-+CREATE_IPV4_FILE(tcp_rmem_min, sysctl_tcp_rmem[0]);
-+CREATE_IPV4_FILE(tcp_rmem_def, sysctl_tcp_rmem[1]);
-+CREATE_IPV4_FILE(tcp_rmem_max, sysctl_tcp_rmem[2]);
-+
-+static struct attribute *ipv4_attrs[] = {
-+	&tcp_wmem_min_attr.attr,
-+	&tcp_wmem_def_attr.attr,
-+	&tcp_wmem_max_attr.attr,
-+	&tcp_rmem_min_attr.attr,
-+	&tcp_rmem_def_attr.attr,
-+	&tcp_rmem_max_attr.attr,
-+	NULL
-+};
-+
-+static struct attribute_group ipv4_attr_group = {
-+	.attrs = ipv4_attrs,
-+};
-+
-+static __init int sysfs_ipv4_init(void)
-+{
-+	struct kobject *ipv4_kobject;
-+	int ret;
-+
-+	ipv4_kobject = kobject_create_and_add("ipv4", kernel_kobj);
-+	if (!ipv4_kobject)
-+		return -ENOMEM;
-+
-+	ret = sysfs_create_group(ipv4_kobject, &ipv4_attr_group);
-+	if (ret) {
-+		kobject_put(ipv4_kobject);
-+		return ret;
-+	}
-+
-+	return 0;
-+}
-+
-+subsys_initcall(sysfs_ipv4_init);
diff --git a/target/linux/goldfish/patches-2.6.30/0086-Input-Generic-GPIO-Input-device.patch b/target/linux/goldfish/patches-2.6.30/0086-Input-Generic-GPIO-Input-device.patch
deleted file mode 100644
index 102563380..000000000
--- a/target/linux/goldfish/patches-2.6.30/0086-Input-Generic-GPIO-Input-device.patch
+++ /dev/null
@@ -1,1460 +0,0 @@
-From 6730377482c05a1742abb92f1463701f5d084a27 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@android.com>
-Date: Wed, 15 Oct 2008 18:23:47 -0700
-Subject: [PATCH 086/134] Input: Generic GPIO Input device.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-Supports keyboard matrixces, direct inputs, direct outputs and axes connected to gpios.
-
-Signed-off-by: Arve Hjønnevåg <arve@android.com>
-Signed-off-by: Nick Pelly <npelly@google.com>
----
- drivers/input/misc/Kconfig       |    5 +
- drivers/input/misc/Makefile      |    1 +
- drivers/input/misc/gpio_axis.c   |  180 +++++++++++++++++
- drivers/input/misc/gpio_event.c  |  224 +++++++++++++++++++++
- drivers/input/misc/gpio_input.c  |  343 ++++++++++++++++++++++++++++++++
- drivers/input/misc/gpio_matrix.c |  406 ++++++++++++++++++++++++++++++++++++++
- drivers/input/misc/gpio_output.c |   84 ++++++++
- include/linux/gpio_event.h       |  154 ++++++++++++++
- 8 files changed, 1397 insertions(+), 0 deletions(-)
- create mode 100644 drivers/input/misc/gpio_axis.c
- create mode 100644 drivers/input/misc/gpio_event.c
- create mode 100644 drivers/input/misc/gpio_input.c
- create mode 100644 drivers/input/misc/gpio_matrix.c
- create mode 100644 drivers/input/misc/gpio_output.c
- create mode 100644 include/linux/gpio_event.h
-
---- a/drivers/input/misc/Kconfig
-+++ b/drivers/input/misc/Kconfig
-@@ -212,6 +212,11 @@ config INPUT_SGI_BTNS
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called sgi_btns.
- 
-+config INPUT_GPIO
-+	tristate "GPIO driver support"
-+	help
-+	  Say Y here if you want to support gpio based keys, wheels etc...
-+
- config HP_SDC_RTC
- 	tristate "HP SDC Real Time Clock"
- 	depends on (GSC || HP300) && SERIO
---- a/drivers/input/misc/Makefile
-+++ b/drivers/input/misc/Makefile
-@@ -25,3 +25,5 @@ obj-$(CONFIG_INPUT_UINPUT)		+= uinput.o
- obj-$(CONFIG_INPUT_WISTRON_BTNS)	+= wistron_btns.o
- obj-$(CONFIG_INPUT_YEALINK)		+= yealink.o
- obj-$(CONFIG_INPUT_GPIO_BUTTONS)	+= gpio_buttons.o
-+obj-$(CONFIG_INPUT_GPIO)		+= gpio_event.o gpio_matrix.o gpio_input.o gpio_output.o gpio_axis.o
-+
---- /dev/null
-+++ b/drivers/input/misc/gpio_axis.c
-@@ -0,0 +1,180 @@
-+/* drivers/input/misc/gpio_axis.c
-+ *
-+ * Copyright (C) 2007 Google, Inc.
-+ *
-+ * This software is licensed under the terms of the GNU General Public
-+ * License version 2, as published by the Free Software Foundation, and
-+ * may be copied, distributed, and modified under those terms.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/gpio.h>
-+#include <linux/gpio_event.h>
-+#include <linux/interrupt.h>
-+
-+struct gpio_axis_state {
-+	struct input_dev *input_dev;
-+	struct gpio_event_axis_info *info;
-+	uint32_t pos;
-+};
-+
-+uint16_t gpio_axis_4bit_gray_map_table[] = {
-+	[0x0] = 0x0, [0x1] = 0x1, /* 0000 0001 */
-+	[0x3] = 0x2, [0x2] = 0x3, /* 0011 0010 */
-+	[0x6] = 0x4, [0x7] = 0x5, /* 0110 0111 */
-+	[0x5] = 0x6, [0x4] = 0x7, /* 0101 0100 */
-+	[0xc] = 0x8, [0xd] = 0x9, /* 1100 1101 */
-+	[0xf] = 0xa, [0xe] = 0xb, /* 1111 1110 */
-+	[0xa] = 0xc, [0xb] = 0xd, /* 1010 1011 */
-+	[0x9] = 0xe, [0x8] = 0xf, /* 1001 1000 */
-+};
-+uint16_t gpio_axis_4bit_gray_map(struct gpio_event_axis_info *info, uint16_t in)
-+{
-+	return gpio_axis_4bit_gray_map_table[in];
-+}
-+
-+uint16_t gpio_axis_5bit_singletrack_map_table[] = {
-+	[0x10] = 0x00, [0x14] = 0x01, [0x1c] = 0x02, /*     10000 10100 11100 */
-+	[0x1e] = 0x03, [0x1a] = 0x04, [0x18] = 0x05, /*     11110 11010 11000 */
-+	[0x08] = 0x06, [0x0a] = 0x07, [0x0e] = 0x08, /*    01000 01010 01110  */
-+	[0x0f] = 0x09, [0x0d] = 0x0a, [0x0c] = 0x0b, /*    01111 01101 01100  */
-+	[0x04] = 0x0c, [0x05] = 0x0d, [0x07] = 0x0e, /*   00100 00101 00111   */
-+	[0x17] = 0x0f, [0x16] = 0x10, [0x06] = 0x11, /*   10111 10110 00110   */
-+	[0x02] = 0x12, [0x12] = 0x13, [0x13] = 0x14, /*  00010 10010 10011    */
-+	[0x1b] = 0x15, [0x0b] = 0x16, [0x03] = 0x17, /*  11011 01011 00011    */
-+	[0x01] = 0x18, [0x09] = 0x19, [0x19] = 0x1a, /* 00001 01001 11001     */
-+	[0x1d] = 0x1b, [0x15] = 0x1c, [0x11] = 0x1d, /* 11101 10101 10001     */
-+};
-+uint16_t gpio_axis_5bit_singletrack_map(
-+	struct gpio_event_axis_info *info, uint16_t in)
-+{
-+	return gpio_axis_5bit_singletrack_map_table[in];
-+}
-+
-+static void gpio_event_update_axis(struct gpio_axis_state *as, int report)
-+{
-+	struct gpio_event_axis_info *ai = as->info;
-+	int i;
-+	int change;
-+	uint16_t state = 0;
-+	uint16_t pos;
-+	uint16_t old_pos = as->pos;
-+	for (i = ai->count - 1; i >= 0; i--)
-+		state = (state << 1) | gpio_get_value(ai->gpio[i]);
-+	pos = ai->map(ai, state);
-+	if (ai->flags & GPIOEAF_PRINT_RAW)
-+		pr_info("axis %d-%d raw %x, pos %d -> %d\n",
-+			ai->type, ai->code, state, old_pos, pos);
-+	if (report && pos != old_pos) {
-+		if (ai->type == EV_REL) {
-+			change = (ai->decoded_size + pos - old_pos) %
-+				  ai->decoded_size;
-+			if (change > ai->decoded_size / 2)
-+				change -= ai->decoded_size;
-+			if (change == ai->decoded_size / 2) {
-+				if (ai->flags & GPIOEAF_PRINT_EVENT)
-+					pr_info("axis %d-%d unknown direction, "
-+						"pos %d -> %d\n", ai->type,
-+						ai->code, old_pos, pos);
-+				change = 0; /* no closest direction */
-+			}
-+			if (ai->flags & GPIOEAF_PRINT_EVENT)
-+				pr_info("axis %d-%d change %d\n",
-+					ai->type, ai->code, change);
-+			input_report_rel(as->input_dev, ai->code, change);
-+		} else {
-+			if (ai->flags & GPIOEAF_PRINT_EVENT)
-+				pr_info("axis %d-%d now %d\n",
-+					ai->type, ai->code, pos);
-+			input_event(as->input_dev, ai->type, ai->code, pos);
-+		}
-+		input_sync(as->input_dev);
-+	}
-+	as->pos = pos;
-+}
-+
-+static irqreturn_t gpio_axis_irq_handler(int irq, void *dev_id)
-+{
-+	struct gpio_axis_state *as = dev_id;
-+	gpio_event_update_axis(as, 1);
-+	return IRQ_HANDLED;
-+}
-+
-+int gpio_event_axis_func(struct input_dev *input_dev,
-+			 struct gpio_event_info *info, void **data, int func)
-+{
-+	int ret;
-+	int i;
-+	int irq;
-+	struct gpio_event_axis_info *ai;
-+	struct gpio_axis_state *as;
-+
-+	ai = container_of(info, struct gpio_event_axis_info, info);
-+	if (func == GPIO_EVENT_FUNC_SUSPEND) {
-+		for (i = 0; i < ai->count; i++)
-+			disable_irq(gpio_to_irq(ai->gpio[i]));
-+		return 0;
-+	}
-+	if (func == GPIO_EVENT_FUNC_RESUME) {
-+		for (i = 0; i < ai->count; i++)
-+			enable_irq(gpio_to_irq(ai->gpio[i]));
-+		return 0;
-+	}
-+
-+	if (func == GPIO_EVENT_FUNC_INIT) {
-+		*data = as = kmalloc(sizeof(*as), GFP_KERNEL);
-+		if (as == NULL) {
-+			ret = -ENOMEM;
-+			goto err_alloc_axis_state_failed;
-+		}
-+		as->input_dev = input_dev;
-+		as->info = ai;
-+
-+		input_set_capability(input_dev, ai->type, ai->code);
-+		if (ai->type == EV_ABS) {
-+			input_set_abs_params(input_dev, ai->code, 0,
-+					     ai->decoded_size - 1, 0, 0);
-+		}
-+		for (i = 0; i < ai->count; i++) {
-+			ret = gpio_request(ai->gpio[i], "gpio_event_axis");
-+			if (ret < 0)
-+				goto err_request_gpio_failed;
-+			ret = gpio_direction_input(ai->gpio[i]);
-+			if (ret < 0)
-+				goto err_gpio_direction_input_failed;
-+			ret = irq = gpio_to_irq(ai->gpio[i]);
-+			if (ret < 0)
-+				goto err_get_irq_num_failed;
-+			ret = request_irq(irq, gpio_axis_irq_handler,
-+					  IRQF_TRIGGER_RISING |
-+					  IRQF_TRIGGER_FALLING,
-+					  "gpio_event_axis", as);
-+			if (ret < 0)
-+				goto err_request_irq_failed;
-+		}
-+		gpio_event_update_axis(as, 0);
-+		return 0;
-+	}
-+
-+	ret = 0;
-+	as = *data;
-+	for (i = ai->count - 1; i >= 0; i--) {
-+		free_irq(gpio_to_irq(ai->gpio[i]), as);
-+err_request_irq_failed:
-+err_get_irq_num_failed:
-+err_gpio_direction_input_failed:
-+		gpio_free(ai->gpio[i]);
-+err_request_gpio_failed:
-+		;
-+	}
-+	kfree(as);
-+	*data = NULL;
-+err_alloc_axis_state_failed:
-+	return ret;
-+}
---- /dev/null
-+++ b/drivers/input/misc/gpio_event.c
-@@ -0,0 +1,224 @@
-+/* drivers/input/misc/gpio_event.c
-+ *
-+ * Copyright (C) 2007 Google, Inc.
-+ *
-+ * This software is licensed under the terms of the GNU General Public
-+ * License version 2, as published by the Free Software Foundation, and
-+ * may be copied, distributed, and modified under those terms.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ */
-+
-+#include <linux/earlysuspend.h>
-+#include <linux/module.h>
-+#include <linux/input.h>
-+#include <linux/gpio_event.h>
-+#include <linux/hrtimer.h>
-+#include <linux/platform_device.h>
-+
-+struct gpio_event {
-+	struct input_dev *input_dev;
-+	const struct gpio_event_platform_data *info;
-+	struct early_suspend early_suspend;
-+	void *state[0];
-+};
-+
-+static int gpio_input_event(
-+	struct input_dev *dev, unsigned int type, unsigned int code, int value)
-+{
-+	int i;
-+	int ret = 0;
-+	int tmp_ret;
-+	struct gpio_event_info **ii;
-+	struct gpio_event *ip = input_get_drvdata(dev);
-+
-+	for (i = 0, ii = ip->info->info; i < ip->info->info_count; i++, ii++) {
-+		if ((*ii)->event) {
-+			tmp_ret = (*ii)->event(ip->input_dev, *ii,
-+					&ip->state[i], type, code, value);
-+			if (tmp_ret)
-+				ret = tmp_ret;
-+		}
-+	}
-+	return ret;
-+}
-+
-+static int gpio_event_call_all_func(struct gpio_event *ip, int func)
-+{
-+	int i;
-+	int ret;
-+	struct gpio_event_info **ii;
-+
-+	if (func == GPIO_EVENT_FUNC_INIT || func == GPIO_EVENT_FUNC_RESUME) {
-+		ii = ip->info->info;
-+		for (i = 0; i < ip->info->info_count; i++, ii++) {
-+			if ((*ii)->func == NULL) {
-+				ret = -ENODEV;
-+				pr_err("gpio_event_probe: Incomplete pdata, "
-+					"no function\n");
-+				goto err_no_func;
-+			}
-+			ret = (*ii)->func(ip->input_dev, *ii, &ip->state[i],
-+					  func);
-+			if (ret) {
-+				pr_err("gpio_event_probe: function failed\n");
-+				goto err_func_failed;
-+			}
-+		}
-+		return 0;
-+	}
-+
-+	ret = 0;
-+	i = ip->info->info_count;
-+	ii = ip->info->info + i;
-+	while (i > 0) {
-+		i--;
-+		ii--;
-+		(*ii)->func(ip->input_dev, *ii, &ip->state[i], func & ~1);
-+err_func_failed:
-+err_no_func:
-+		;
-+	}
-+	return ret;
-+}
-+
-+#ifdef CONFIG_HAS_EARLYSUSPEND
-+void gpio_event_suspend(struct early_suspend *h)
-+{
-+	struct gpio_event *ip;
-+	ip = container_of(h, struct gpio_event, early_suspend);
-+	gpio_event_call_all_func(ip, GPIO_EVENT_FUNC_SUSPEND);
-+	ip->info->power(ip->info, 0);
-+}
-+
-+void gpio_event_resume(struct early_suspend *h)
-+{
-+	struct gpio_event *ip;
-+	ip = container_of(h, struct gpio_event, early_suspend);
-+	ip->info->power(ip->info, 1);
-+	gpio_event_call_all_func(ip, GPIO_EVENT_FUNC_RESUME);
-+}
-+#endif
-+
-+static int __init gpio_event_probe(struct platform_device *pdev)
-+{
-+	int err;
-+	struct gpio_event *ip;
-+	struct input_dev *input_dev;
-+	struct gpio_event_platform_data *event_info;
-+
-+	event_info = pdev->dev.platform_data;
-+	if (event_info == NULL) {
-+		pr_err("gpio_event_probe: No pdata\n");
-+		return -ENODEV;
-+	}
-+	if (event_info->name == NULL ||
-+	   event_info->info == NULL ||
-+	   event_info->info_count == 0) {
-+		pr_err("gpio_event_probe: Incomplete pdata\n");
-+		return -ENODEV;
-+	}
-+	ip = kzalloc(sizeof(*ip) +
-+		     sizeof(ip->state[0]) * event_info->info_count, GFP_KERNEL);
-+	if (ip == NULL) {
-+		err = -ENOMEM;
-+		pr_err("gpio_event_probe: Failed to allocate private data\n");
-+		goto err_kp_alloc_failed;
-+	}
-+	platform_set_drvdata(pdev, ip);
-+
-+	input_dev = input_allocate_device();
-+	if (input_dev == NULL) {
-+		err = -ENOMEM;
-+		pr_err("gpio_event_probe: Failed to allocate input device\n");
-+		goto err_input_dev_alloc_failed;
-+	}
-+	input_set_drvdata(input_dev, ip);
-+	ip->input_dev = input_dev;
-+	ip->info = event_info;
-+	if (event_info->power) {
-+#ifdef CONFIG_HAS_EARLYSUSPEND
-+		ip->early_suspend.level = EARLY_SUSPEND_LEVEL_BLANK_SCREEN + 1;
-+		ip->early_suspend.suspend = gpio_event_suspend;
-+		ip->early_suspend.resume = gpio_event_resume;
-+		register_early_suspend(&ip->early_suspend);
-+#endif
-+		ip->info->power(ip->info, 1);
-+	}
-+
-+	input_dev->name = ip->info->name;
-+	input_dev->event = gpio_input_event;
-+
-+	err = gpio_event_call_all_func(ip, GPIO_EVENT_FUNC_INIT);
-+	if (err)
-+		goto err_call_all_func_failed;
-+
-+	err = input_register_device(input_dev);
-+	if (err) {
-+		pr_err("gpio_event_probe: Unable to register %s input device\n",
-+			input_dev->name);
-+		goto err_input_register_device_failed;
-+	}
-+
-+	return 0;
-+
-+err_input_register_device_failed:
-+	gpio_event_call_all_func(ip, GPIO_EVENT_FUNC_UNINIT);
-+err_call_all_func_failed:
-+	if (event_info->power) {
-+#ifdef CONFIG_HAS_EARLYSUSPEND
-+		unregister_early_suspend(&ip->early_suspend);
-+#endif
-+		ip->info->power(ip->info, 0);
-+	}
-+	input_free_device(input_dev);
-+err_input_dev_alloc_failed:
-+	kfree(ip);
-+err_kp_alloc_failed:
-+	return err;
-+}
-+
-+static int gpio_event_remove(struct platform_device *pdev)
-+{
-+	struct gpio_event *ip = platform_get_drvdata(pdev);
-+
-+	gpio_event_call_all_func(ip, GPIO_EVENT_FUNC_UNINIT);
-+	if (ip->info->power) {
-+#ifdef CONFIG_HAS_EARLYSUSPEND
-+		unregister_early_suspend(&ip->early_suspend);
-+#endif
-+		ip->info->power(ip->info, 0);
-+	}
-+	input_unregister_device(ip->input_dev);
-+	kfree(ip);
-+	return 0;
-+}
-+
-+static struct platform_driver gpio_event_driver = {
-+	.probe		= gpio_event_probe,
-+	.remove		= gpio_event_remove,
-+	.driver		= {
-+		.name	= GPIO_EVENT_DEV_NAME,
-+	},
-+};
-+
-+static int __devinit gpio_event_init(void)
-+{
-+	return platform_driver_register(&gpio_event_driver);
-+}
-+
-+static void __exit gpio_event_exit(void)
-+{
-+	platform_driver_unregister(&gpio_event_driver);
-+}
-+
-+module_init(gpio_event_init);
-+module_exit(gpio_event_exit);
-+
-+MODULE_DESCRIPTION("GPIO Event Driver");
-+MODULE_LICENSE("GPL");
-+
---- /dev/null
-+++ b/drivers/input/misc/gpio_input.c
-@@ -0,0 +1,343 @@
-+/* drivers/input/misc/gpio_input.c
-+ *
-+ * Copyright (C) 2007 Google, Inc.
-+ *
-+ * This software is licensed under the terms of the GNU General Public
-+ * License version 2, as published by the Free Software Foundation, and
-+ * may be copied, distributed, and modified under those terms.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/gpio.h>
-+#include <linux/gpio_event.h>
-+#include <linux/hrtimer.h>
-+#include <linux/input.h>
-+#include <linux/interrupt.h>
-+#include <linux/wakelock.h>
-+
-+enum {
-+	DEBOUNCE_UNSTABLE     = BIT(0),	/* Got irq, while debouncing */
-+	DEBOUNCE_PRESSED      = BIT(1),
-+	DEBOUNCE_NOTPRESSED   = BIT(2),
-+	DEBOUNCE_WAIT_IRQ     = BIT(3),	/* Stable irq state */
-+	DEBOUNCE_POLL         = BIT(4),	/* Stable polling state */
-+
-+	DEBOUNCE_UNKNOWN =
-+		DEBOUNCE_PRESSED | DEBOUNCE_NOTPRESSED,
-+};
-+
-+struct gpio_key_state {
-+	struct gpio_input_state *ds;
-+	uint8_t debounce;
-+};
-+
-+struct gpio_input_state {
-+	struct input_dev *input_dev;
-+	const struct gpio_event_input_info *info;
-+	struct hrtimer timer;
-+	int use_irq;
-+	int debounce_count;
-+	spinlock_t irq_lock;
-+	struct wake_lock wake_lock;
-+	struct gpio_key_state key_state[0];
-+};
-+
-+static enum hrtimer_restart gpio_event_input_timer_func(struct hrtimer *timer)
-+{
-+	int i;
-+	int pressed;
-+	struct gpio_input_state *ds =
-+		container_of(timer, struct gpio_input_state, timer);
-+	unsigned gpio_flags = ds->info->flags;
-+	unsigned npolarity;
-+	int nkeys = ds->info->keymap_size;
-+	const struct gpio_event_direct_entry *key_entry;
-+	struct gpio_key_state *key_state;
-+	unsigned long irqflags;
-+	uint8_t debounce;
-+
-+#if 0
-+	key_entry = kp->keys_info->keymap;
-+	key_state = kp->key_state;
-+	for (i = 0; i < nkeys; i++, key_entry++, key_state++)
-+		pr_info("gpio_read_detect_status %d %d\n", key_entry->gpio,
-+			gpio_read_detect_status(key_entry->gpio));
-+#endif
-+	key_entry = ds->info->keymap;
-+	key_state = ds->key_state;
-+	spin_lock_irqsave(&ds->irq_lock, irqflags);
-+	for (i = 0; i < nkeys; i++, key_entry++, key_state++) {
-+		debounce = key_state->debounce;
-+		if (debounce & DEBOUNCE_WAIT_IRQ)
-+			continue;
-+		if (key_state->debounce & DEBOUNCE_UNSTABLE) {
-+			debounce = key_state->debounce = DEBOUNCE_UNKNOWN;
-+			enable_irq(gpio_to_irq(key_entry->gpio));
-+			pr_info("gpio_keys_scan_keys: key %x-%x, %d "
-+				"(%d) continue debounce\n",
-+				ds->info->type, key_entry->code,
-+				i, key_entry->gpio);
-+		}
-+		npolarity = !(gpio_flags & GPIOEDF_ACTIVE_HIGH);
-+		pressed = gpio_get_value(key_entry->gpio) ^ npolarity;
-+		if (debounce & DEBOUNCE_POLL) {
-+			if (pressed == !(debounce & DEBOUNCE_PRESSED)) {
-+				ds->debounce_count++;
-+				key_state->debounce = DEBOUNCE_UNKNOWN;
-+				if (gpio_flags & GPIOEDF_PRINT_KEY_DEBOUNCE)
-+					pr_info("gpio_keys_scan_keys: key %x-"
-+						"%x, %d (%d) start debounce\n",
-+						ds->info->type, key_entry->code,
-+						i, key_entry->gpio);
-+			}
-+			continue;
-+		}
-+		if (pressed && (debounce & DEBOUNCE_NOTPRESSED)) {
-+			if (gpio_flags & GPIOEDF_PRINT_KEY_DEBOUNCE)
-+				pr_info("gpio_keys_scan_keys: key %x-%x, %d "
-+					"(%d) debounce pressed 1\n",
-+					ds->info->type, key_entry->code,
-+					i, key_entry->gpio);
-+			key_state->debounce = DEBOUNCE_PRESSED;
-+			continue;
-+		}
-+		if (!pressed && (debounce & DEBOUNCE_PRESSED)) {
-+			if (gpio_flags & GPIOEDF_PRINT_KEY_DEBOUNCE)
-+				pr_info("gpio_keys_scan_keys: key %x-%x, %d "
-+					"(%d) debounce pressed 0\n",
-+					ds->info->type, key_entry->code,
-+					i, key_entry->gpio);
-+			key_state->debounce = DEBOUNCE_NOTPRESSED;
-+			continue;
-+		}
-+		/* key is stable */
-+		ds->debounce_count--;
-+		if (ds->use_irq)
-+			key_state->debounce |= DEBOUNCE_WAIT_IRQ;
-+		else
-+			key_state->debounce |= DEBOUNCE_POLL;
-+		if (gpio_flags & GPIOEDF_PRINT_KEYS)
-+			pr_info("gpio_keys_scan_keys: key %x-%x, %d (%d) "
-+				"changed to %d\n", ds->info->type,
-+				key_entry->code, i, key_entry->gpio, pressed);
-+		input_event(ds->input_dev, ds->info->type,
-+			    key_entry->code, pressed);
-+	}
-+
-+#if 0
-+	key_entry = kp->keys_info->keymap;
-+	key_state = kp->key_state;
-+	for (i = 0; i < nkeys; i++, key_entry++, key_state++) {
-+		pr_info("gpio_read_detect_status %d %d\n", key_entry->gpio,
-+			gpio_read_detect_status(key_entry->gpio));
-+	}
-+#endif
-+
-+	if (ds->debounce_count)
-+		hrtimer_start(timer, ds->info->debounce_time, HRTIMER_MODE_REL);
-+	else if (!ds->use_irq)
-+		hrtimer_start(timer, ds->info->poll_time, HRTIMER_MODE_REL);
-+	else
-+		wake_unlock(&ds->wake_lock);
-+
-+	spin_unlock_irqrestore(&ds->irq_lock, irqflags);
-+
-+	return HRTIMER_NORESTART;
-+}
-+
-+static irqreturn_t gpio_event_input_irq_handler(int irq, void *dev_id)
-+{
-+	struct gpio_key_state *ks = dev_id;
-+	struct gpio_input_state *ds = ks->ds;
-+	int keymap_index = ks - ds->key_state;
-+	const struct gpio_event_direct_entry *key_entry;
-+	unsigned long irqflags;
-+	int pressed;
-+
-+	if (!ds->use_irq)
-+		return IRQ_HANDLED;
-+
-+	key_entry = &ds->info->keymap[keymap_index];
-+
-+	if (ds->info->debounce_time.tv64) {
-+		spin_lock_irqsave(&ds->irq_lock, irqflags);
-+		if (ks->debounce & DEBOUNCE_WAIT_IRQ) {
-+			ks->debounce = DEBOUNCE_UNKNOWN;
-+			if (ds->debounce_count++ == 0) {
-+				wake_lock(&ds->wake_lock);
-+				hrtimer_start(
-+					&ds->timer, ds->info->debounce_time,
-+					HRTIMER_MODE_REL);
-+			}
-+			if (ds->info->flags & GPIOEDF_PRINT_KEY_DEBOUNCE)
-+				pr_info("gpio_event_input_irq_handler: "
-+					"key %x-%x, %d (%d) start debounce\n",
-+					ds->info->type, key_entry->code,
-+					keymap_index, key_entry->gpio);
-+		} else {
-+			disable_irq(irq);
-+			ks->debounce = DEBOUNCE_UNSTABLE;
-+		}
-+		spin_unlock_irqrestore(&ds->irq_lock, irqflags);
-+	} else {
-+		pressed = gpio_get_value(key_entry->gpio) ^
-+			!(ds->info->flags & GPIOEDF_ACTIVE_HIGH);
-+		if (ds->info->flags & GPIOEDF_PRINT_KEYS)
-+			pr_info("gpio_event_input_irq_handler: key %x-%x, %d "
-+				"(%d) changed to %d\n",
-+				ds->info->type, key_entry->code, keymap_index,
-+				key_entry->gpio, pressed);
-+		input_event(ds->input_dev, ds->info->type,
-+			    key_entry->code, pressed);
-+	}
-+	return IRQ_HANDLED;
-+}
-+
-+static int gpio_event_input_request_irqs(struct gpio_input_state *ds)
-+{
-+	int i;
-+	int err;
-+	unsigned int irq;
-+	unsigned long req_flags = IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING;
-+
-+	for (i = 0; i < ds->info->keymap_size; i++) {
-+		err = irq = gpio_to_irq(ds->info->keymap[i].gpio);
-+		if (err < 0)
-+			goto err_gpio_get_irq_num_failed;
-+		err = request_irq(irq, gpio_event_input_irq_handler,
-+				  req_flags, "gpio_keys", &ds->key_state[i]);
-+		if (err) {
-+			pr_err("gpio_event_input_request_irqs: request_irq "
-+				"failed for input %d, irq %d\n",
-+				ds->info->keymap[i].gpio, irq);
-+			goto err_request_irq_failed;
-+		}
-+		enable_irq_wake(irq);
-+	}
-+	return 0;
-+
-+	for (i = ds->info->keymap_size - 1; i >= 0; i--) {
-+		free_irq(gpio_to_irq(ds->info->keymap[i].gpio),
-+			 &ds->key_state[i]);
-+err_request_irq_failed:
-+err_gpio_get_irq_num_failed:
-+		;
-+	}
-+	return err;
-+}
-+
-+int gpio_event_input_func(struct input_dev *input_dev,
-+			struct gpio_event_info *info, void **data, int func)
-+{
-+	int ret;
-+	int i;
-+	unsigned long irqflags;
-+	struct gpio_event_input_info *di;
-+	struct gpio_input_state *ds = *data;
-+
-+	di = container_of(info, struct gpio_event_input_info, info);
-+
-+	if (func == GPIO_EVENT_FUNC_SUSPEND) {
-+		spin_lock_irqsave(&ds->irq_lock, irqflags);
-+		if (ds->use_irq)
-+			for (i = 0; i < di->keymap_size; i++)
-+				disable_irq(gpio_to_irq(di->keymap[i].gpio));
-+		spin_unlock_irqrestore(&ds->irq_lock, irqflags);
-+		hrtimer_cancel(&ds->timer);
-+		return 0;
-+	}
-+	if (func == GPIO_EVENT_FUNC_RESUME) {
-+		spin_lock_irqsave(&ds->irq_lock, irqflags);
-+		if (ds->use_irq)
-+			for (i = 0; i < di->keymap_size; i++)
-+				enable_irq(gpio_to_irq(di->keymap[i].gpio));
-+		hrtimer_start(&ds->timer, ktime_set(0, 0), HRTIMER_MODE_REL);
-+		spin_unlock_irqrestore(&ds->irq_lock, irqflags);
-+		return 0;
-+	}
-+
-+	if (func == GPIO_EVENT_FUNC_INIT) {
-+		if (ktime_to_ns(di->poll_time) <= 0)
-+			di->poll_time = ktime_set(0, 20 * NSEC_PER_MSEC);
-+
-+		*data = ds = kzalloc(sizeof(*ds) + sizeof(ds->key_state[0]) *
-+					di->keymap_size, GFP_KERNEL);
-+		if (ds == NULL) {
-+			ret = -ENOMEM;
-+			pr_err("gpio_event_input_func: "
-+				"Failed to allocate private data\n");
-+			goto err_ds_alloc_failed;
-+		}
-+		ds->debounce_count = di->keymap_size;
-+		ds->input_dev = input_dev;
-+		ds->info = di;
-+		wake_lock_init(&ds->wake_lock, WAKE_LOCK_SUSPEND, "gpio_input");
-+		spin_lock_init(&ds->irq_lock);
-+
-+		for (i = 0; i < di->keymap_size; i++) {
-+			input_set_capability(input_dev, di->type,
-+					     di->keymap[i].code);
-+			ds->key_state[i].ds = ds;
-+			ds->key_state[i].debounce = DEBOUNCE_UNKNOWN;
-+		}
-+
-+		for (i = 0; i < di->keymap_size; i++) {
-+			ret = gpio_request(di->keymap[i].gpio, "gpio_kp_in");
-+			if (ret) {
-+				pr_err("gpio_event_input_func: gpio_request "
-+					"failed for %d\n", di->keymap[i].gpio);
-+				goto err_gpio_request_failed;
-+			}
-+			ret = gpio_direction_input(di->keymap[i].gpio);
-+			if (ret) {
-+				pr_err("gpio_event_input_func: "
-+					"gpio_direction_input failed for %d\n",
-+					di->keymap[i].gpio);
-+				goto err_gpio_configure_failed;
-+			}
-+		}
-+
-+		ret = gpio_event_input_request_irqs(ds);
-+
-+		spin_lock_irqsave(&ds->irq_lock, irqflags);
-+		ds->use_irq = ret == 0;
-+
-+		pr_info("GPIO Input Driver: Start gpio inputs for %s in %s "
-+			"mode\n",
-+			input_dev->name, ret == 0 ? "interrupt" : "polling");
-+
-+		hrtimer_init(&ds->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
-+		ds->timer.function = gpio_event_input_timer_func;
-+		hrtimer_start(&ds->timer, ktime_set(0, 0), HRTIMER_MODE_REL);
-+		spin_unlock_irqrestore(&ds->irq_lock, irqflags);
-+		return 0;
-+	}
-+
-+	ret = 0;
-+	spin_lock_irqsave(&ds->irq_lock, irqflags);
-+	hrtimer_cancel(&ds->timer);
-+	if (ds->use_irq) {
-+		for (i = di->keymap_size - 1; i >= 0; i--) {
-+			free_irq(gpio_to_irq(di->keymap[i].gpio),
-+				 &ds->key_state[i]);
-+		}
-+	}
-+	spin_unlock_irqrestore(&ds->irq_lock, irqflags);
-+
-+	for (i = di->keymap_size - 1; i >= 0; i--) {
-+err_gpio_configure_failed:
-+		gpio_free(di->keymap[i].gpio);
-+err_gpio_request_failed:
-+		;
-+	}
-+	wake_lock_destroy(&ds->wake_lock);
-+	kfree(ds);
-+err_ds_alloc_failed:
-+	return ret;
-+}
---- /dev/null
-+++ b/drivers/input/misc/gpio_matrix.c
-@@ -0,0 +1,406 @@
-+/* drivers/input/misc/gpio_matrix.c
-+ *
-+ * Copyright (C) 2007 Google, Inc.
-+ *
-+ * This software is licensed under the terms of the GNU General Public
-+ * License version 2, as published by the Free Software Foundation, and
-+ * may be copied, distributed, and modified under those terms.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/gpio.h>
-+#include <linux/gpio_event.h>
-+#include <linux/hrtimer.h>
-+#include <linux/interrupt.h>
-+#include <linux/wakelock.h>
-+
-+struct gpio_kp {
-+	struct input_dev *input_dev;
-+	struct gpio_event_matrix_info *keypad_info;
-+	struct hrtimer timer;
-+	struct wake_lock wake_lock;
-+	int current_output;
-+	unsigned int use_irq:1;
-+	unsigned int key_state_changed:1;
-+	unsigned int last_key_state_changed:1;
-+	unsigned int some_keys_pressed:2;
-+	unsigned long keys_pressed[0];
-+};
-+
-+static void clear_phantom_key(struct gpio_kp *kp, int out, int in)
-+{
-+	struct gpio_event_matrix_info *mi = kp->keypad_info;
-+	int key_index = out * mi->ninputs + in;
-+	unsigned short keycode = mi->keymap[key_index];;
-+
-+	if (!test_bit(keycode, kp->input_dev->key)) {
-+		if (mi->flags & GPIOKPF_PRINT_PHANTOM_KEYS)
-+			pr_info("gpiomatrix: phantom key %x, %d-%d (%d-%d) "
-+				"cleared\n", keycode, out, in,
-+				mi->output_gpios[out], mi->input_gpios[in]);
-+		__clear_bit(key_index, kp->keys_pressed);
-+	} else {
-+		if (mi->flags & GPIOKPF_PRINT_PHANTOM_KEYS)
-+			pr_info("gpiomatrix: phantom key %x, %d-%d (%d-%d) "
-+				"not cleared\n", keycode, out, in,
-+				mi->output_gpios[out], mi->input_gpios[in]);
-+	}
-+}
-+
-+static int restore_keys_for_input(struct gpio_kp *kp, int out, int in)
-+{
-+	int rv = 0;
-+	int key_index;
-+
-+	key_index = out * kp->keypad_info->ninputs + in;
-+	while (out < kp->keypad_info->noutputs) {
-+		if (test_bit(key_index, kp->keys_pressed)) {
-+			rv = 1;
-+			clear_phantom_key(kp, out, in);
-+		}
-+		key_index += kp->keypad_info->ninputs;
-+		out++;
-+	}
-+	return rv;
-+}
-+
-+static void remove_phantom_keys(struct gpio_kp *kp)
-+{
-+	int out, in, inp;
-+	int key_index;
-+
-+	if (kp->some_keys_pressed < 3)
-+		return;
-+
-+	for (out = 0; out < kp->keypad_info->noutputs; out++) {
-+		inp = -1;
-+		key_index = out * kp->keypad_info->ninputs;
-+		for (in = 0; in < kp->keypad_info->ninputs; in++, key_index++) {
-+			if (test_bit(key_index, kp->keys_pressed)) {
-+				if (inp == -1) {
-+					inp = in;
-+					continue;
-+				}
-+				if (inp >= 0) {
-+					if (!restore_keys_for_input(kp, out + 1,
-+									inp))
-+						break;
-+					clear_phantom_key(kp, out, inp);
-+					inp = -2;
-+				}
-+				restore_keys_for_input(kp, out, in);
-+			}
-+		}
-+	}
-+}
-+
-+static void report_key(struct gpio_kp *kp, int key_index, int out, int in)
-+{
-+	struct gpio_event_matrix_info *mi = kp->keypad_info;
-+	int pressed = test_bit(key_index, kp->keys_pressed);
-+	unsigned short keycode = mi->keymap[key_index];
-+	if (pressed != test_bit(keycode, kp->input_dev->key)) {
-+		if (keycode == KEY_RESERVED) {
-+			if (mi->flags & GPIOKPF_PRINT_UNMAPPED_KEYS)
-+				pr_info("gpiomatrix: unmapped key, %d-%d "
-+					"(%d-%d) changed to %d\n",
-+					out, in, mi->output_gpios[out],
-+					mi->input_gpios[in], pressed);
-+		} else {
-+			if (mi->flags & GPIOKPF_PRINT_MAPPED_KEYS)
-+				pr_info("gpiomatrix: key %x, %d-%d (%d-%d) "
-+					"changed to %d\n", keycode,
-+					out, in, mi->output_gpios[out],
-+					mi->input_gpios[in], pressed);
-+			input_report_key(kp->input_dev, keycode, pressed);
-+		}
-+	}
-+}
-+
-+static enum hrtimer_restart gpio_keypad_timer_func(struct hrtimer *timer)
-+{
-+	int out, in;
-+	int key_index;
-+	int gpio;
-+	struct gpio_kp *kp = container_of(timer, struct gpio_kp, timer);
-+	struct gpio_event_matrix_info *mi = kp->keypad_info;
-+	unsigned gpio_keypad_flags = mi->flags;
-+	unsigned polarity = !!(gpio_keypad_flags & GPIOKPF_ACTIVE_HIGH);
-+
-+	out = kp->current_output;
-+	if (out == mi->noutputs) {
-+		out = 0;
-+		kp->last_key_state_changed = kp->key_state_changed;
-+		kp->key_state_changed = 0;
-+		kp->some_keys_pressed = 0;
-+	} else {
-+		key_index = out * mi->ninputs;
-+		for (in = 0; in < mi->ninputs; in++, key_index++) {
-+			gpio = mi->input_gpios[in];
-+			if (gpio_get_value(gpio) ^ !polarity) {
-+				if (kp->some_keys_pressed < 3)
-+					kp->some_keys_pressed++;
-+				kp->key_state_changed |= !__test_and_set_bit(
-+						key_index, kp->keys_pressed);
-+			} else
-+				kp->key_state_changed |= __test_and_clear_bit(
-+						key_index, kp->keys_pressed);
-+		}
-+		gpio = mi->output_gpios[out];
-+		if (gpio_keypad_flags & GPIOKPF_DRIVE_INACTIVE)
-+			gpio_set_value(gpio, !polarity);
-+		else
-+			gpio_direction_input(gpio);
-+		out++;
-+	}
-+	kp->current_output = out;
-+	if (out < mi->noutputs) {
-+		gpio = mi->output_gpios[out];
-+		if (gpio_keypad_flags & GPIOKPF_DRIVE_INACTIVE)
-+			gpio_set_value(gpio, polarity);
-+		else
-+			gpio_direction_output(gpio, polarity);
-+		hrtimer_start(timer, mi->settle_time, HRTIMER_MODE_REL);
-+		return HRTIMER_NORESTART;
-+	}
-+	if (gpio_keypad_flags & GPIOKPF_DEBOUNCE) {
-+		if (kp->key_state_changed) {
-+			hrtimer_start(&kp->timer, mi->debounce_delay,
-+				      HRTIMER_MODE_REL);
-+			return HRTIMER_NORESTART;
-+		}
-+		kp->key_state_changed = kp->last_key_state_changed;
-+	}
-+	if (kp->key_state_changed) {
-+		if (gpio_keypad_flags & GPIOKPF_REMOVE_SOME_PHANTOM_KEYS)
-+			remove_phantom_keys(kp);
-+		key_index = 0;
-+		for (out = 0; out < mi->noutputs; out++)
-+			for (in = 0; in < mi->ninputs; in++, key_index++)
-+				report_key(kp, key_index, out, in);
-+	}
-+	if (!kp->use_irq || kp->some_keys_pressed) {
-+		hrtimer_start(timer, mi->poll_time, HRTIMER_MODE_REL);
-+		return HRTIMER_NORESTART;
-+	}
-+
-+	/* No keys are pressed, reenable interrupt */
-+	for (out = 0; out < mi->noutputs; out++) {
-+		if (gpio_keypad_flags & GPIOKPF_DRIVE_INACTIVE)
-+			gpio_set_value(mi->output_gpios[out], polarity);
-+		else
-+			gpio_direction_output(mi->output_gpios[out], polarity);
-+	}
-+	for (in = 0; in < mi->ninputs; in++)
-+		enable_irq(gpio_to_irq(mi->input_gpios[in]));
-+	wake_unlock(&kp->wake_lock);
-+	return HRTIMER_NORESTART;
-+}
-+
-+static irqreturn_t gpio_keypad_irq_handler(int irq_in, void *dev_id)
-+{
-+	int i;
-+	struct gpio_kp *kp = dev_id;
-+	struct gpio_event_matrix_info *mi = kp->keypad_info;
-+	unsigned gpio_keypad_flags = mi->flags;
-+
-+	if (!kp->use_irq) /* ignore interrupt while registering the handler */
-+		return IRQ_HANDLED;
-+
-+	for (i = 0; i < mi->ninputs; i++)
-+		disable_irq(gpio_to_irq(mi->input_gpios[i]));
-+	for (i = 0; i < mi->noutputs; i++) {
-+		if (gpio_keypad_flags & GPIOKPF_DRIVE_INACTIVE)
-+			gpio_set_value(mi->output_gpios[i],
-+				!(gpio_keypad_flags & GPIOKPF_ACTIVE_HIGH));
-+		else
-+			gpio_direction_input(mi->output_gpios[i]);
-+	}
-+	wake_lock(&kp->wake_lock);
-+	hrtimer_start(&kp->timer, ktime_set(0, 0), HRTIMER_MODE_REL);
-+	return IRQ_HANDLED;
-+}
-+
-+static int gpio_keypad_request_irqs(struct gpio_kp *kp)
-+{
-+	int i;
-+	int err;
-+	unsigned int irq;
-+	unsigned long request_flags;
-+	struct gpio_event_matrix_info *mi = kp->keypad_info;
-+
-+	switch (mi->flags & (GPIOKPF_ACTIVE_HIGH|GPIOKPF_LEVEL_TRIGGERED_IRQ)) {
-+	default:
-+		request_flags = IRQF_TRIGGER_FALLING;
-+		break;
-+	case GPIOKPF_ACTIVE_HIGH:
-+		request_flags = IRQF_TRIGGER_RISING;
-+		break;
-+	case GPIOKPF_LEVEL_TRIGGERED_IRQ:
-+		request_flags = IRQF_TRIGGER_LOW;
-+		break;
-+	case GPIOKPF_LEVEL_TRIGGERED_IRQ | GPIOKPF_ACTIVE_HIGH:
-+		request_flags = IRQF_TRIGGER_HIGH;
-+		break;
-+	}
-+
-+	for (i = 0; i < mi->ninputs; i++) {
-+		err = irq = gpio_to_irq(mi->input_gpios[i]);
-+		if (err < 0)
-+			goto err_gpio_get_irq_num_failed;
-+		err = request_irq(irq, gpio_keypad_irq_handler, request_flags,
-+				  "gpio_kp", kp);
-+		if (err) {
-+			pr_err("gpiomatrix: request_irq failed for input %d, "
-+				"irq %d\n", mi->input_gpios[i], irq);
-+			goto err_request_irq_failed;
-+		}
-+		err = set_irq_wake(irq, 1);
-+		if (err) {
-+			pr_err("gpiomatrix: set_irq_wake failed for input %d, "
-+				"irq %d\n", mi->input_gpios[i], irq);
-+		}
-+		disable_irq(irq);
-+	}
-+	return 0;
-+
-+	for (i = mi->noutputs - 1; i >= 0; i--) {
-+		free_irq(gpio_to_irq(mi->input_gpios[i]), kp);
-+err_request_irq_failed:
-+err_gpio_get_irq_num_failed:
-+		;
-+	}
-+	return err;
-+}
-+
-+int gpio_event_matrix_func(struct input_dev *input_dev,
-+	struct gpio_event_info *info, void **data, int func)
-+{
-+	int i;
-+	int err;
-+	int key_count;
-+	struct gpio_kp *kp;
-+	struct gpio_event_matrix_info *mi;
-+
-+	mi = container_of(info, struct gpio_event_matrix_info, info);
-+	if (func == GPIO_EVENT_FUNC_SUSPEND || func == GPIO_EVENT_FUNC_RESUME) {
-+		/* TODO: disable scanning */
-+		return 0;
-+	}
-+
-+	if (func == GPIO_EVENT_FUNC_INIT) {
-+		if (mi->keymap == NULL ||
-+		   mi->input_gpios == NULL ||
-+		   mi->output_gpios == NULL) {
-+			err = -ENODEV;
-+			pr_err("gpiomatrix: Incomplete pdata\n");
-+			goto err_invalid_platform_data;
-+		}
-+		key_count = mi->ninputs * mi->noutputs;
-+
-+		*data = kp = kzalloc(sizeof(*kp) + sizeof(kp->keys_pressed[0]) *
-+				     BITS_TO_LONGS(key_count), GFP_KERNEL);
-+		if (kp == NULL) {
-+			err = -ENOMEM;
-+			pr_err("gpiomatrix: Failed to allocate private data\n");
-+			goto err_kp_alloc_failed;
-+		}
-+		kp->input_dev = input_dev;
-+		kp->keypad_info = mi;
-+		set_bit(EV_KEY, input_dev->evbit);
-+		for (i = 0; i < key_count; i++) {
-+			if (mi->keymap[i])
-+				set_bit(mi->keymap[i] & KEY_MAX,
-+					input_dev->keybit);
-+		}
-+
-+		for (i = 0; i < mi->noutputs; i++) {
-+			if (gpio_cansleep(mi->output_gpios[i])) {
-+				pr_err("gpiomatrix: unsupported output gpio %d,"
-+					" can sleep\n", mi->output_gpios[i]);
-+				err = -EINVAL;
-+				goto err_request_output_gpio_failed;
-+			}
-+			err = gpio_request(mi->output_gpios[i], "gpio_kp_out");
-+			if (err) {
-+				pr_err("gpiomatrix: gpio_request failed for "
-+					"output %d\n", mi->output_gpios[i]);
-+				goto err_request_output_gpio_failed;
-+			}
-+			if (mi->flags & GPIOKPF_DRIVE_INACTIVE)
-+				err = gpio_direction_output(mi->output_gpios[i],
-+					!(mi->flags & GPIOKPF_ACTIVE_HIGH));
-+			else
-+				err = gpio_direction_input(mi->output_gpios[i]);
-+			if (err) {
-+				pr_err("gpiomatrix: gpio_configure failed for "
-+					"output %d\n", mi->output_gpios[i]);
-+				goto err_output_gpio_configure_failed;
-+			}
-+		}
-+		for (i = 0; i < mi->ninputs; i++) {
-+			err = gpio_request(mi->input_gpios[i], "gpio_kp_in");
-+			if (err) {
-+				pr_err("gpiomatrix: gpio_request failed for "
-+					"input %d\n", mi->input_gpios[i]);
-+				goto err_request_input_gpio_failed;
-+			}
-+			err = gpio_direction_input(mi->input_gpios[i]);
-+			if (err) {
-+				pr_err("gpiomatrix: gpio_direction_input failed"
-+					" for input %d\n", mi->input_gpios[i]);
-+				goto err_gpio_direction_input_failed;
-+			}
-+		}
-+		kp->current_output = mi->noutputs;
-+		kp->key_state_changed = 1;
-+
-+		hrtimer_init(&kp->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
-+		kp->timer.function = gpio_keypad_timer_func;
-+		wake_lock_init(&kp->wake_lock, WAKE_LOCK_SUSPEND, "gpio_kp");
-+		err = gpio_keypad_request_irqs(kp);
-+		kp->use_irq = err == 0;
-+
-+		pr_info("GPIO Matrix Keypad Driver: Start keypad matrix for %s "
-+			"in %s mode\n", input_dev->name,
-+			kp->use_irq ? "interrupt" : "polling");
-+
-+		if (kp->use_irq)
-+			wake_lock(&kp->wake_lock);
-+		hrtimer_start(&kp->timer, ktime_set(0, 0), HRTIMER_MODE_REL);
-+
-+		return 0;
-+	}
-+
-+	err = 0;
-+	kp = *data;
-+
-+	if (kp->use_irq)
-+		for (i = mi->noutputs - 1; i >= 0; i--)
-+			free_irq(gpio_to_irq(mi->input_gpios[i]), kp);
-+
-+	hrtimer_cancel(&kp->timer);
-+	wake_lock_destroy(&kp->wake_lock);
-+	for (i = mi->noutputs - 1; i >= 0; i--) {
-+err_gpio_direction_input_failed:
-+		gpio_free(mi->input_gpios[i]);
-+err_request_input_gpio_failed:
-+		;
-+	}
-+	for (i = mi->noutputs - 1; i >= 0; i--) {
-+err_output_gpio_configure_failed:
-+		gpio_free(mi->output_gpios[i]);
-+err_request_output_gpio_failed:
-+		;
-+	}
-+	kfree(kp);
-+err_kp_alloc_failed:
-+err_invalid_platform_data:
-+	return err;
-+}
---- /dev/null
-+++ b/drivers/input/misc/gpio_output.c
-@@ -0,0 +1,84 @@
-+/* drivers/input/misc/gpio_output.c
-+ *
-+ * Copyright (C) 2007 Google, Inc.
-+ *
-+ * This software is licensed under the terms of the GNU General Public
-+ * License version 2, as published by the Free Software Foundation, and
-+ * may be copied, distributed, and modified under those terms.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/gpio.h>
-+#include <linux/gpio_event.h>
-+
-+int gpio_event_output_event(
-+	struct input_dev *input_dev, struct gpio_event_info *info, void **data,
-+	unsigned int type, unsigned int code, int value)
-+{
-+	int i;
-+	struct gpio_event_output_info *oi;
-+	oi = container_of(info, struct gpio_event_output_info, info);
-+	if (type != oi->type)
-+		return 0;
-+	if (!(oi->flags & GPIOEDF_ACTIVE_HIGH))
-+		value = !value;
-+	for (i = 0; i < oi->keymap_size; i++)
-+		if (code == oi->keymap[i].code)
-+			gpio_set_value(oi->keymap[i].gpio, value);
-+	return 0;
-+}
-+
-+int gpio_event_output_func(
-+	struct input_dev *input_dev, struct gpio_event_info *info, void **data,
-+	int func)
-+{
-+	int ret;
-+	int i;
-+	struct gpio_event_output_info *oi;
-+	oi = container_of(info, struct gpio_event_output_info, info);
-+
-+	if (func == GPIO_EVENT_FUNC_SUSPEND || func == GPIO_EVENT_FUNC_RESUME)
-+		return 0;
-+
-+	if (func == GPIO_EVENT_FUNC_INIT) {
-+		int output_level = !(oi->flags & GPIOEDF_ACTIVE_HIGH);
-+		for (i = 0; i < oi->keymap_size; i++)
-+			input_set_capability(input_dev, oi->type,
-+					     oi->keymap[i].code);
-+
-+		for (i = 0; i < oi->keymap_size; i++) {
-+			ret = gpio_request(oi->keymap[i].gpio,
-+					   "gpio_event_output");
-+			if (ret) {
-+				pr_err("gpio_event_output_func: gpio_request "
-+					"failed for %d\n", oi->keymap[i].gpio);
-+				goto err_gpio_request_failed;
-+			}
-+			ret = gpio_direction_output(oi->keymap[i].gpio,
-+						    output_level);
-+			if (ret) {
-+				pr_err("gpio_event_output_func: "
-+					"gpio_direction_output failed for %d\n",
-+					oi->keymap[i].gpio);
-+				goto err_gpio_direction_output_failed;
-+			}
-+		}
-+		return 0;
-+	}
-+
-+	ret = 0;
-+	for (i = oi->keymap_size - 1; i >= 0; i--) {
-+err_gpio_direction_output_failed:
-+		gpio_free(oi->keymap[i].gpio);
-+err_gpio_request_failed:
-+		;
-+	}
-+	return ret;
-+}
-+
---- /dev/null
-+++ b/include/linux/gpio_event.h
-@@ -0,0 +1,154 @@
-+/* include/linux/gpio_event.h
-+ *
-+ * Copyright (C) 2007 Google, Inc.
-+ *
-+ * This software is licensed under the terms of the GNU General Public
-+ * License version 2, as published by the Free Software Foundation, and
-+ * may be copied, distributed, and modified under those terms.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ */
-+
-+#ifndef _LINUX_GPIO_EVENT_H
-+#define _LINUX_GPIO_EVENT_H
-+
-+#include <linux/input.h>
-+
-+enum {
-+	GPIO_EVENT_FUNC_UNINIT  = 0x0,
-+	GPIO_EVENT_FUNC_INIT    = 0x1,
-+	GPIO_EVENT_FUNC_SUSPEND = 0x2,
-+	GPIO_EVENT_FUNC_RESUME  = 0x3,
-+};
-+struct gpio_event_info {
-+	int (*func)(struct input_dev *input_dev,
-+		    struct gpio_event_info *info,
-+		    void **data, int func);
-+	int (*event)(struct input_dev *input_dev,
-+		     struct gpio_event_info *info,
-+		     void **data, unsigned int type,
-+		     unsigned int code, int value); /* out events */
-+};
-+
-+struct gpio_event_platform_data {
-+	const char *name;
-+	struct gpio_event_info **info;
-+	size_t info_count;
-+	int (*power)(const struct gpio_event_platform_data *pdata, bool on);
-+};
-+
-+#define GPIO_EVENT_DEV_NAME "gpio-event"
-+
-+/* Key matrix */
-+
-+enum gpio_event_matrix_flags {
-+	/* unset: drive active output low, set: drive active output high */
-+	GPIOKPF_ACTIVE_HIGH              = 1U << 0,
-+	GPIOKPF_DEBOUNCE                 = 1U << 1,
-+	GPIOKPF_REMOVE_SOME_PHANTOM_KEYS = 1U << 2,
-+	GPIOKPF_REMOVE_PHANTOM_KEYS      = GPIOKPF_REMOVE_SOME_PHANTOM_KEYS |
-+					   GPIOKPF_DEBOUNCE,
-+	GPIOKPF_DRIVE_INACTIVE           = 1U << 3,
-+	GPIOKPF_LEVEL_TRIGGERED_IRQ      = 1U << 4,
-+	GPIOKPF_PRINT_UNMAPPED_KEYS      = 1U << 16,
-+	GPIOKPF_PRINT_MAPPED_KEYS        = 1U << 17,
-+	GPIOKPF_PRINT_PHANTOM_KEYS       = 1U << 18,
-+};
-+
-+extern int gpio_event_matrix_func(struct input_dev *input_dev,
-+			struct gpio_event_info *info, void **data, int func);
-+struct gpio_event_matrix_info {
-+	/* initialize to gpio_event_matrix_func */
-+	struct gpio_event_info info;
-+	/* size must be ninputs * noutputs */
-+	const unsigned short *keymap;
-+	unsigned int *input_gpios;
-+	unsigned int *output_gpios;
-+	unsigned int ninputs;
-+	unsigned int noutputs;
-+	/* time to wait before reading inputs after driving each output */
-+	ktime_t settle_time;
-+	/* time to wait before scanning the keypad a second time */
-+	ktime_t debounce_delay;
-+	ktime_t poll_time;
-+	unsigned flags;
-+};
-+
-+/* Directly connected inputs and outputs */
-+
-+enum gpio_event_direct_flags {
-+	GPIOEDF_ACTIVE_HIGH         = 1U << 0,
-+/*	GPIOEDF_USE_DOWN_IRQ        = 1U << 1, */
-+/*	GPIOEDF_USE_IRQ             = (1U << 2) | GPIOIDF_USE_DOWN_IRQ, */
-+	GPIOEDF_PRINT_KEYS          = 1U << 8,
-+	GPIOEDF_PRINT_KEY_DEBOUNCE  = 1U << 9,
-+};
-+
-+struct gpio_event_direct_entry {
-+	uint32_t gpio:23;
-+	uint32_t code:9;
-+};
-+
-+/* inputs */
-+extern int gpio_event_input_func(struct input_dev *input_dev,
-+			struct gpio_event_info *info, void **data, int func);
-+struct gpio_event_input_info {
-+	/* initialize to gpio_event_input_func */
-+	struct gpio_event_info info;
-+	ktime_t debounce_time;
-+	ktime_t poll_time;
-+	uint16_t flags;
-+	uint16_t type;
-+	const struct gpio_event_direct_entry *keymap;
-+	size_t keymap_size;
-+};
-+
-+/* outputs */
-+extern int gpio_event_output_func(struct input_dev *input_dev,
-+			struct gpio_event_info *info, void **data, int func);
-+extern int gpio_event_output_event(struct input_dev *input_dev,
-+			struct gpio_event_info *info, void **data,
-+			unsigned int type, unsigned int code, int value);
-+struct gpio_event_output_info {
-+	/* initialize to gpio_event_output_func and gpio_event_output_event */
-+	struct gpio_event_info info;
-+	uint16_t flags;
-+	uint16_t type;
-+	const struct gpio_event_direct_entry *keymap;
-+	size_t keymap_size;
-+};
-+
-+
-+/* axes */
-+
-+enum gpio_event_axis_flags {
-+	GPIOEAF_PRINT_UNKNOWN_DIRECTION  = 1U << 16,
-+	GPIOEAF_PRINT_RAW                = 1U << 17,
-+	GPIOEAF_PRINT_EVENT              = 1U << 18,
-+};
-+
-+extern int gpio_event_axis_func(struct input_dev *input_dev,
-+			struct gpio_event_info *info, void **data, int func);
-+struct gpio_event_axis_info {
-+	/* initialize to gpio_event_axis_func */
-+	struct gpio_event_info info;
-+	uint8_t  count;
-+	uint8_t  type; /* EV_REL or EV_ABS */
-+	uint16_t code;
-+	uint16_t decoded_size;
-+	uint16_t (*map)(struct gpio_event_axis_info *info, uint16_t in);
-+	uint32_t *gpio;
-+	uint32_t flags;
-+};
-+#define gpio_axis_2bit_gray_map gpio_axis_4bit_gray_map
-+#define gpio_axis_3bit_gray_map gpio_axis_4bit_gray_map
-+uint16_t gpio_axis_4bit_gray_map(
-+			struct gpio_event_axis_info *info, uint16_t in);
-+uint16_t gpio_axis_5bit_singletrack_map(
-+			struct gpio_event_axis_info *info, uint16_t in);
-+
-+#endif
diff --git a/target/linux/goldfish/patches-2.6.30/0087-Input-Hold-wake-lock-while-event-queue-is-not-empty.patch b/target/linux/goldfish/patches-2.6.30/0087-Input-Hold-wake-lock-while-event-queue-is-not-empty.patch
deleted file mode 100644
index e85f7a3db..000000000
--- a/target/linux/goldfish/patches-2.6.30/0087-Input-Hold-wake-lock-while-event-queue-is-not-empty.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 0d1077627288e51b5604f270eae6cf9f5ccd3871 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@android.com>
-Date: Fri, 17 Oct 2008 15:20:55 -0700
-Subject: [PATCH 087/134] Input: Hold wake lock while event queue is not empty.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-Allows userspace code to process input events while
-the device appears to be asleep.
-
-Signed-off-by: Arve Hjønnevåg <arve@android.com>
----
- drivers/input/evdev.c |    7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
-
---- a/drivers/input/evdev.c
-+++ b/drivers/input/evdev.c
-@@ -19,6 +19,7 @@
- #include <linux/input.h>
- #include <linux/major.h>
- #include <linux/device.h>
-+#include <linux/wakelock.h>
- #include "input-compat.h"
- 
- struct evdev {
-@@ -43,6 +44,7 @@ struct evdev_client {
- 	struct fasync_struct *fasync;
- 	struct evdev *evdev;
- 	struct list_head node;
-+	struct wake_lock wake_lock;
- };
- 
- static struct evdev *evdev_table[EVDEV_MINORS];
-@@ -55,6 +57,7 @@ static void evdev_pass_event(struct evde
- 	 * Interrupts are disabled, just acquire the lock
- 	 */
- 	spin_lock(&client->buffer_lock);
-+	wake_lock_timeout(&client->wake_lock, 5 * HZ);
- 	client->buffer[client->head++] = *event;
- 	client->head &= EVDEV_BUFFER_SIZE - 1;
- 	spin_unlock(&client->buffer_lock);
-@@ -233,6 +236,7 @@ static int evdev_release(struct inode *i
- 	mutex_unlock(&evdev->mutex);
- 
- 	evdev_detach_client(evdev, client);
-+	wake_lock_destroy(&client->wake_lock);
- 	kfree(client);
- 
- 	evdev_close_device(evdev);
-@@ -269,6 +273,7 @@ static int evdev_open(struct inode *inod
- 	}
- 
- 	spin_lock_init(&client->buffer_lock);
-+	wake_lock_init(&client->wake_lock, WAKE_LOCK_SUSPEND, "evdev");
- 	client->evdev = evdev;
- 	evdev_attach_client(evdev, client);
- 
-@@ -332,6 +337,8 @@ static int evdev_fetch_next_event(struct
- 	if (have_event) {
- 		*event = client->buffer[client->tail++];
- 		client->tail &= EVDEV_BUFFER_SIZE - 1;
-+		if (client->head == client->tail)
-+			wake_unlock(&client->wake_lock);
- 	}
- 
- 	spin_unlock_irq(&client->buffer_lock);
diff --git a/target/linux/goldfish/patches-2.6.30/0088-Input-Use-monotonic-time-for-event-time-stamps.patch b/target/linux/goldfish/patches-2.6.30/0088-Input-Use-monotonic-time-for-event-time-stamps.patch
deleted file mode 100644
index 6ca183ca7..000000000
--- a/target/linux/goldfish/patches-2.6.30/0088-Input-Use-monotonic-time-for-event-time-stamps.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 474db0e1425f8da03a7d49ebba1602efa503c73f Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@android.com>
-Date: Fri, 17 Oct 2008 15:28:08 -0700
-Subject: [PATCH 088/134] Input: Use monotonic time for event time stamps.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-Since wall time can jump backwards, it cannot be used to determine if one
-event occured before another or for how long a key was pressed.
-
-Signed-off-by: Arve Hjønnevåg <arve@android.com>
----
- drivers/input/evdev.c |    5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
---- a/drivers/input/evdev.c
-+++ b/drivers/input/evdev.c
-@@ -74,8 +74,11 @@ static void evdev_event(struct input_han
- 	struct evdev *evdev = handle->private;
- 	struct evdev_client *client;
- 	struct input_event event;
-+	struct timespec ts;
- 
--	do_gettimeofday(&event.time);
-+	ktime_get_ts(&ts);
-+	event.time.tv_sec = ts.tv_sec;
-+	event.time.tv_usec = ts.tv_nsec / NSEC_PER_USEC;
- 	event.type = type;
- 	event.code = code;
- 	event.value = value;
diff --git a/target/linux/goldfish/patches-2.6.30/0090-input-Add-keyreset-driver.patch b/target/linux/goldfish/patches-2.6.30/0090-input-Add-keyreset-driver.patch
deleted file mode 100644
index 0af1c5617..000000000
--- a/target/linux/goldfish/patches-2.6.30/0090-input-Add-keyreset-driver.patch
+++ /dev/null
@@ -1,313 +0,0 @@
-From eb92150c047e76960ecf8989b9037fd34b43a4af Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@android.com>
-Date: Fri, 21 Nov 2008 21:47:23 -0800
-Subject: [PATCH 090/134] input: Add keyreset driver.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-Add a platform device in the board file to specify a reset key-combo.
-The first time the key-combo is detected a work function that syncs
-the filesystems is scheduled. If all the keys are released and then
-pressed again, it calls panic. Reboot on panic should be set for
-this to work.
-
-Signed-off-by: Arve Hjønnevåg <arve@android.com>
----
- drivers/input/Kconfig    |    9 ++
- drivers/input/Makefile   |    1 +
- drivers/input/keyreset.c |  229 ++++++++++++++++++++++++++++++++++++++++++++++
- include/linux/keyreset.h |   27 ++++++
- 4 files changed, 266 insertions(+), 0 deletions(-)
- create mode 100644 drivers/input/keyreset.c
- create mode 100644 include/linux/keyreset.h
-
---- a/drivers/input/Kconfig
-+++ b/drivers/input/Kconfig
-@@ -149,6 +149,15 @@ config INPUT_APMPOWER
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called apm-power.
- 
-+config INPUT_KEYRESET
-+	tristate "Reset key"
-+	depends on INPUT
-+	---help---
-+	  Say Y here if you want to reboot when some keys are pressed;
-+
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called keyreset.
-+
- config XEN_KBDDEV_FRONTEND
- 	tristate "Xen virtual keyboard and mouse support"
- 	depends on XEN_FBDEV_FRONTEND
---- a/drivers/input/Makefile
-+++ b/drivers/input/Makefile
-@@ -23,5 +23,6 @@ obj-$(CONFIG_INPUT_TOUCHSCREEN)	+= touch
- obj-$(CONFIG_INPUT_MISC)	+= misc/
- 
- obj-$(CONFIG_INPUT_APMPOWER)	+= apm-power.o
-+obj-$(CONFIG_INPUT_KEYRESET)	+= keyreset.o
- 
- obj-$(CONFIG_XEN_KBDDEV_FRONTEND)	+= xen-kbdfront.o
---- /dev/null
-+++ b/drivers/input/keyreset.c
-@@ -0,0 +1,229 @@
-+/* drivers/input/keyreset.c
-+ *
-+ * Copyright (C) 2008 Google, Inc.
-+ *
-+ * This software is licensed under the terms of the GNU General Public
-+ * License version 2, as published by the Free Software Foundation, and
-+ * may be copied, distributed, and modified under those terms.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ */
-+
-+#include <linux/input.h>
-+#include <linux/keyreset.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/reboot.h>
-+#include <linux/sched.h>
-+#include <linux/syscalls.h>
-+
-+
-+struct keyreset_state {
-+	struct input_handler input_handler;
-+	unsigned long keybit[BITS_TO_LONGS(KEY_CNT)];
-+	unsigned long upbit[BITS_TO_LONGS(KEY_CNT)];
-+	unsigned long key[BITS_TO_LONGS(KEY_CNT)];
-+	spinlock_t lock;
-+	int key_down_target;
-+	int key_down;
-+	int key_up;
-+	int restart_disabled;
-+};
-+
-+int restart_requested;
-+static void deferred_restart(struct work_struct *dummy)
-+{
-+	restart_requested = 2;
-+	sys_sync();
-+	restart_requested = 3;
-+	kernel_restart(NULL);
-+}
-+static DECLARE_WORK(restart_work, deferred_restart);
-+
-+static void keyreset_event(struct input_handle *handle, unsigned int type,
-+			   unsigned int code, int value)
-+{
-+	unsigned long flags;
-+	struct keyreset_state *state = handle->private;
-+
-+	if (type != EV_KEY)
-+		return;
-+
-+	if (code >= KEY_MAX)
-+		return;
-+
-+	if (!test_bit(code, state->keybit))
-+		return;
-+
-+	spin_lock_irqsave(&state->lock, flags);
-+	if (!test_bit(code, state->key) == !value)
-+		goto done;
-+	__change_bit(code, state->key);
-+	if (test_bit(code, state->upbit)) {
-+		if (value) {
-+			state->restart_disabled = 1;
-+			state->key_up++;
-+		} else
-+			state->key_up--;
-+	} else {
-+		if (value)
-+			state->key_down++;
-+		else
-+			state->key_down--;
-+	}
-+	if (state->key_down == 0 && state->key_up == 0)
-+		state->restart_disabled = 0;
-+
-+	pr_debug("reset key changed %d %d new state %d-%d-%d\n", code, value,
-+		 state->key_down, state->key_up, state->restart_disabled);
-+
-+	if (value && !state->restart_disabled &&
-+	    state->key_down == state->key_down_target) {
-+		state->restart_disabled = 1;
-+		if (restart_requested)
-+			panic("keyboard reset failed, %d", restart_requested);
-+		pr_info("keyboard reset\n");
-+		schedule_work(&restart_work);
-+		restart_requested = 1;
-+	}
-+done:
-+	spin_unlock_irqrestore(&state->lock, flags);
-+}
-+
-+static int keyreset_connect(struct input_handler *handler,
-+					  struct input_dev *dev,
-+					  const struct input_device_id *id)
-+{
-+	int i;
-+	int ret;
-+	struct input_handle *handle;
-+	struct keyreset_state *state =
-+		container_of(handler, struct keyreset_state, input_handler);
-+
-+	for (i = 0; i < KEY_MAX; i++) {
-+		if (test_bit(i, state->keybit) && test_bit(i, dev->keybit))
-+			break;
-+	}
-+	if (i == KEY_MAX)
-+		return -ENODEV;
-+
-+	handle = kzalloc(sizeof(*handle), GFP_KERNEL);
-+	if (!handle)
-+		return -ENOMEM;
-+
-+	handle->dev = dev;
-+	handle->handler = handler;
-+	handle->name = "keyreset";
-+	handle->private = state;
-+
-+	ret = input_register_handle(handle);
-+	if (ret)
-+		goto err_input_register_handle;
-+
-+	ret = input_open_device(handle);
-+	if (ret)
-+		goto err_input_open_device;
-+
-+	pr_info("using input dev %s for key reset\n", dev->name);
-+
-+	return 0;
-+
-+err_input_open_device:
-+	input_unregister_handle(handle);
-+err_input_register_handle:
-+	kfree(handle);
-+	return ret;
-+}
-+
-+static void keyreset_disconnect(struct input_handle *handle)
-+{
-+	input_close_device(handle);
-+	input_unregister_handle(handle);
-+	kfree(handle);
-+}
-+
-+static const struct input_device_id keyreset_ids[] = {
-+	{
-+		.flags = INPUT_DEVICE_ID_MATCH_EVBIT,
-+		.evbit = { BIT_MASK(EV_KEY) },
-+	},
-+	{ },
-+};
-+MODULE_DEVICE_TABLE(input, keyreset_ids);
-+
-+static int keyreset_probe(struct platform_device *pdev)
-+{
-+	int ret;
-+	int key, *keyp;
-+	struct keyreset_state *state;
-+	struct keyreset_platform_data *pdata = pdev->dev.platform_data;
-+
-+	if (!pdata)
-+		return -EINVAL;
-+
-+	state = kzalloc(sizeof(*state), GFP_KERNEL);
-+	if (!state)
-+		return -ENOMEM;
-+
-+	spin_lock_init(&state->lock);
-+	keyp = pdata->keys_down;
-+	while ((key = *keyp++)) {
-+		if (key >= KEY_MAX)
-+			continue;
-+		state->key_down_target++;
-+		__set_bit(key, state->keybit);
-+	}
-+	if (pdata->keys_up) {
-+		keyp = pdata->keys_up;
-+		while ((key = *keyp++)) {
-+			if (key >= KEY_MAX)
-+				continue;
-+			__set_bit(key, state->keybit);
-+			__set_bit(key, state->upbit);
-+		}
-+	}
-+	state->input_handler.event = keyreset_event;
-+	state->input_handler.connect = keyreset_connect;
-+	state->input_handler.disconnect = keyreset_disconnect;
-+	state->input_handler.name = KEYRESET_NAME;
-+	state->input_handler.id_table = keyreset_ids;
-+	ret = input_register_handler(&state->input_handler);
-+	if (ret) {
-+		kfree(state);
-+		return ret;
-+	}
-+	platform_set_drvdata(pdev, state);
-+	return 0;
-+}
-+
-+int keyreset_remove(struct platform_device *pdev)
-+{
-+	struct keyreset_state *state = platform_get_drvdata(pdev);
-+	input_unregister_handler(&state->input_handler);
-+	kfree(state);
-+	return 0;
-+}
-+
-+
-+struct platform_driver keyreset_driver = {
-+	.driver.name = KEYRESET_NAME,
-+	.probe = keyreset_probe,
-+	.remove = keyreset_remove,
-+};
-+
-+static int __init keyreset_init(void)
-+{
-+	return platform_driver_register(&keyreset_driver);
-+}
-+
-+static void __exit keyreset_exit(void)
-+{
-+	return platform_driver_unregister(&keyreset_driver);
-+}
-+
-+module_init(keyreset_init);
-+module_exit(keyreset_exit);
---- /dev/null
-+++ b/include/linux/keyreset.h
-@@ -0,0 +1,27 @@
-+/*
-+ * include/linux/keyreset.h - platform data structure for resetkeys driver
-+ *
-+ * Copyright (C) 2008 Google, Inc.
-+ *
-+ * This software is licensed under the terms of the GNU General Public
-+ * License version 2, as published by the Free Software Foundation, and
-+ * may be copied, distributed, and modified under those terms.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ */
-+
-+#ifndef _LINUX_KEYRESET_H
-+#define _LINUX_KEYRESET_H
-+
-+#define KEYRESET_NAME "keyreset"
-+
-+struct keyreset_platform_data {
-+	int *keys_up;
-+	int keys_down[]; /* 0 terminated */
-+};
-+
-+#endif /* _LINUX_KEYRESET_H */
diff --git a/target/linux/goldfish/patches-2.6.30/0093-mmc-Add-status-IRQ-and-status-callback-function-to.patch b/target/linux/goldfish/patches-2.6.30/0093-mmc-Add-status-IRQ-and-status-callback-function-to.patch
deleted file mode 100644
index 8fb7ade2d..000000000
--- a/target/linux/goldfish/patches-2.6.30/0093-mmc-Add-status-IRQ-and-status-callback-function-to.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 2cae40a6a76e9e440f146ce0402aed40a7c127ca Mon Sep 17 00:00:00 2001
-From: San Mehat <san@google.com>
-Date: Mon, 10 Nov 2008 16:29:50 -0800
-Subject: [PATCH 093/134] mmc: Add status IRQ and status callback function to mmc platform data
-
-Signed-off-by: San Mehat <san@google.com>
----
- arch/arm/include/asm/mach/mmc.h |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
---- a/arch/arm/include/asm/mach/mmc.h
-+++ b/arch/arm/include/asm/mach/mmc.h
-@@ -10,6 +10,8 @@ struct mmc_platform_data {
- 	unsigned int ocr_mask;			/* available voltages */
- 	u32 (*translate_vdd)(struct device *, unsigned int);
- 	unsigned int (*status)(struct device *);
-+	unsigned int status_irq;
-+	int (*register_status_notify)(void (*callback)(int card_present, void *dev_id), void *dev_id);
- };
- 
- #endif
diff --git a/target/linux/goldfish/patches-2.6.30/0094-mmc-sd-Add-new-CONFIG_MMC_PARANOID_SD_INIT-for-ena.patch b/target/linux/goldfish/patches-2.6.30/0094-mmc-sd-Add-new-CONFIG_MMC_PARANOID_SD_INIT-for-ena.patch
deleted file mode 100644
index 275504b35..000000000
--- a/target/linux/goldfish/patches-2.6.30/0094-mmc-sd-Add-new-CONFIG_MMC_PARANOID_SD_INIT-for-ena.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 66983857a54479d76ce6dbd8399e1276698bd3c5 Mon Sep 17 00:00:00 2001
-From: San Mehat <san@google.com>
-Date: Tue, 11 Nov 2008 09:35:36 -0800
-Subject: [PATCH 094/134] mmc: sd: Add new CONFIG_MMC_PARANOID_SD_INIT for enabling retries during SD detection
-
-Signed-off-by: San Mehat <san@google.com>
----
- drivers/mmc/core/Kconfig |    8 ++++++++
- drivers/mmc/core/sd.c    |   24 ++++++++++++++++++++++--
- 2 files changed, 30 insertions(+), 2 deletions(-)
-
---- a/drivers/mmc/core/Kconfig
-+++ b/drivers/mmc/core/Kconfig
-@@ -14,3 +14,11 @@ config MMC_UNSAFE_RESUME
- 	  This option is usually just for embedded systems which use
- 	  a MMC/SD card for rootfs. Most people should say N here.
- 
-+config MMC_PARANOID_SD_INIT
-+	bool "Enable paranoid SD card initialization (EXPERIMENTAL)"
-+	help
-+	  If you say Y here, the MMC layer will be extra paranoid
-+	  about re-trying SD init requests. This can be a useful
-+	  work-around for buggy controllers and hardware. Enable
-+	  if you are experiencing issues with SD detection.
-+
---- a/drivers/mmc/core/sd.c
-+++ b/drivers/mmc/core/sd.c
-@@ -336,7 +336,9 @@ static int mmc_sd_init_card(struct mmc_h
- 	int err;
- 	u32 cid[4];
- 	unsigned int max_dtr;
--
-+#ifdef CONFIG_MMC_PARANOID_SD_INIT
-+	int retries;
-+#endif
- 	BUG_ON(!host);
- 	WARN_ON(!host->claimed);
- 
-@@ -439,11 +441,29 @@ static int mmc_sd_init_card(struct mmc_h
- 		err = mmc_decode_scr(card);
- 		if (err < 0)
- 			goto free_card;
--
- 		/*
- 		 * Fetch switch information from card.
- 		 */
-+#ifdef CONFIG_MMC_PARANOID_SD_INIT
-+		for (retries = 1; retries <= 3; retries++) {
-+			err = mmc_read_switch(card);
-+			if (!err) {
-+				if (retries > 1) {
-+					printk(KERN_WARNING
-+					       "%s: recovered\n", 
-+					       mmc_hostname(host));
-+				}
-+				break;
-+			} else {
-+				printk(KERN_WARNING
-+				       "%s: read switch failed (attempt %d)\n",
-+				       mmc_hostname(host), retries);
-+			}
-+		}
-+#else
- 		err = mmc_read_switch(card);
-+#endif
-+
- 		if (err)
- 			goto free_card;
- 	}
diff --git a/target/linux/goldfish/patches-2.6.30/0095-mmc-Add-concept-of-an-embedded-SDIO-device.patch b/target/linux/goldfish/patches-2.6.30/0095-mmc-Add-concept-of-an-embedded-SDIO-device.patch
deleted file mode 100644
index e3f0eb481..000000000
--- a/target/linux/goldfish/patches-2.6.30/0095-mmc-Add-concept-of-an-embedded-SDIO-device.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-From 62d51f0d0d0b3c758b4505c3855b61288b8e90aa Mon Sep 17 00:00:00 2001
-From: San Mehat <san@android.com>
-Date: Mon, 14 Apr 2008 15:22:49 -0700
-Subject: [PATCH 095/134] mmc: Add concept of an 'embedded' SDIO device.
-
-This is required to support chips which use SDIO for signaling/
-communication but do not implement the various card enumeration registers
-as required for full SD / SDIO cards.
-
-mmc: sdio: Fix bug where we're freeing the CIS tables we never allocated when using EMBEDDED_SDIO
-mmc: Add max_blksize to embedded SDIO data
-
-Signed-off-by: San Mehat <san@google.com>
----
- arch/arm/include/asm/mach/mmc.h |   10 ++++++
- drivers/mmc/core/Kconfig        |   10 +++++-
- drivers/mmc/core/core.c         |   16 +++++++++
- drivers/mmc/core/sdio.c         |   67 ++++++++++++++++++++++++++++++++-------
- drivers/mmc/core/sdio_bus.c     |   13 +++++++-
- include/linux/mmc/host.h        |   17 ++++++++++
- include/linux/mmc/sdio_func.h   |    8 +++++
- 7 files changed, 127 insertions(+), 14 deletions(-)
-
---- a/arch/arm/include/asm/mach/mmc.h
-+++ b/arch/arm/include/asm/mach/mmc.h
-@@ -5,12 +5,22 @@
- #define ASMARM_MACH_MMC_H
- 
- #include <linux/mmc/host.h>
-+#include <linux/mmc/card.h>
-+#include <linux/mmc/sdio_func.h>
-+
-+struct embedded_sdio_data {
-+        struct sdio_cis cis;
-+        struct sdio_cccr cccr;
-+        struct sdio_embedded_func *funcs;
-+        int num_funcs;
-+};
- 
- struct mmc_platform_data {
- 	unsigned int ocr_mask;			/* available voltages */
- 	u32 (*translate_vdd)(struct device *, unsigned int);
- 	unsigned int (*status)(struct device *);
- 	unsigned int status_irq;
-+	struct embedded_sdio_data *embedded_sdio;
- 	int (*register_status_notify)(void (*callback)(int card_present, void *dev_id), void *dev_id);
- };
- 
---- a/drivers/mmc/core/Kconfig
-+++ b/drivers/mmc/core/Kconfig
-@@ -14,11 +14,19 @@ config MMC_UNSAFE_RESUME
- 	  This option is usually just for embedded systems which use
- 	  a MMC/SD card for rootfs. Most people should say N here.
- 
-+config MMC_EMBEDDED_SDIO
-+	boolean "MMC embedded SDIO device support (EXPERIMENTAL)"
-+	depends on EXPERIMENTAL
-+	help
-+	  If you say Y here, support will be added for embedded SDIO
-+	  devices which do not contain the necessary enumeration
-+	  support in hardware to be properly detected.
-+
- config MMC_PARANOID_SD_INIT
- 	bool "Enable paranoid SD card initialization (EXPERIMENTAL)"
-+	depends on EXPERIMENTAL
- 	help
- 	  If you say Y here, the MMC layer will be extra paranoid
- 	  about re-trying SD init requests. This can be a useful
- 	  work-around for buggy controllers and hardware. Enable
- 	  if you are experiencing issues with SD detection.
--
---- a/drivers/mmc/core/core.c
-+++ b/drivers/mmc/core/core.c
-@@ -1011,6 +1011,22 @@ EXPORT_SYMBOL(mmc_resume_host);
- 
- #endif
- 
-+#ifdef CONFIG_MMC_EMBEDDED_SDIO
-+void mmc_set_embedded_sdio_data(struct mmc_host *host,
-+				struct sdio_cis *cis,
-+				struct sdio_cccr *cccr,
-+				struct sdio_embedded_func *funcs,
-+				int num_funcs)
-+{
-+	host->embedded_sdio_data.cis = cis;
-+	host->embedded_sdio_data.cccr = cccr;
-+	host->embedded_sdio_data.funcs = funcs;
-+	host->embedded_sdio_data.num_funcs = num_funcs;
-+}
-+
-+EXPORT_SYMBOL(mmc_set_embedded_sdio_data);
-+#endif
-+
- static int __init mmc_init(void)
- {
- 	int ret;
---- a/drivers/mmc/core/sdio.c
-+++ b/drivers/mmc/core/sdio.c
-@@ -24,6 +24,10 @@
- #include "sdio_ops.h"
- #include "sdio_cis.h"
- 
-+#ifdef CONFIG_MMC_EMBEDDED_SDIO
-+#include <linux/mmc/sdio_ids.h>
-+#endif
-+
- static int sdio_read_fbr(struct sdio_func *func)
- {
- 	int ret;
-@@ -314,6 +318,11 @@ int mmc_attach_sdio(struct mmc_host *hos
- 	 */
- 	funcs = (ocr & 0x70000000) >> 28;
- 
-+#ifdef CONFIG_MMC_EMBEDDED_SDIO
-+	if (host->embedded_sdio_data.funcs)
-+		funcs = host->embedded_sdio_data.num_funcs;
-+#endif
-+
- 	/*
- 	 * Allocate card structure.
- 	 */
-@@ -351,17 +360,33 @@ int mmc_attach_sdio(struct mmc_host *hos
- 	/*
- 	 * Read the common registers.
- 	 */
--	err = sdio_read_cccr(card);
--	if (err)
--		goto remove;
- 
--	/*
--	 * Read the common CIS tuples.
--	 */
--	err = sdio_read_common_cis(card);
--	if (err)
--		goto remove;
-+#ifdef CONFIG_MMC_EMBEDDED_SDIO
-+	if (host->embedded_sdio_data.cccr)
-+		memcpy(&card->cccr, host->embedded_sdio_data.cccr, sizeof(struct sdio_cccr));
-+	else {
-+#endif
-+		err = sdio_read_cccr(card);
-+		if (err)
-+			goto remove;
-+#ifdef CONFIG_MMC_EMBEDDED_SDIO
-+	}
-+#endif
- 
-+#ifdef CONFIG_MMC_EMBEDDED_SDIO
-+	if (host->embedded_sdio_data.cis)
-+		memcpy(&card->cis, host->embedded_sdio_data.cis, sizeof(struct sdio_cis));
-+	else {
-+#endif
-+		/*
-+		 * Read the common CIS tuples.
-+		 */
-+		err = sdio_read_common_cis(card);
-+		if (err)
-+			goto remove;
-+#ifdef CONFIG_MMC_EMBEDDED_SDIO
-+	}
-+#endif
- 	/*
- 	 * Switch to high-speed (if supported).
- 	 */
-@@ -395,9 +420,27 @@ int mmc_attach_sdio(struct mmc_host *hos
- 	 * Initialize (but don't add) all present functions.
- 	 */
- 	for (i = 0;i < funcs;i++) {
--		err = sdio_init_func(host->card, i + 1);
--		if (err)
--			goto remove;
-+#ifdef CONFIG_MMC_EMBEDDED_SDIO
-+		if (host->embedded_sdio_data.funcs) {
-+			struct sdio_func *tmp;
-+
-+			tmp = sdio_alloc_func(host->card);
-+			if (IS_ERR(tmp))
-+				goto remove;
-+			tmp->num = (i + 1);
-+			card->sdio_func[i] = tmp;
-+			tmp->class = host->embedded_sdio_data.funcs[i].f_class;
-+			tmp->max_blksize = host->embedded_sdio_data.funcs[i].f_maxblksize;
-+			tmp->vendor = card->cis.vendor;
-+			tmp->device = card->cis.device;
-+		} else {
-+#endif
-+			err = sdio_init_func(host->card, i + 1);
-+			if (err)
-+				goto remove;
-+#ifdef CONFIG_MMC_EMBEDDED_SDIO
-+		}
-+#endif
- 	}
- 
- 	mmc_release_host(host);
---- a/drivers/mmc/core/sdio_bus.c
-+++ b/drivers/mmc/core/sdio_bus.c
-@@ -20,6 +20,10 @@
- #include "sdio_cis.h"
- #include "sdio_bus.h"
- 
-+#ifdef CONFIG_MMC_EMBEDDED_SDIO
-+#include <linux/mmc/host.h>
-+#endif
-+
- #define dev_to_sdio_func(d)	container_of(d, struct sdio_func, dev)
- #define to_sdio_driver(d)      container_of(d, struct sdio_driver, drv)
- 
-@@ -202,7 +206,14 @@ static void sdio_release_func(struct dev
- {
- 	struct sdio_func *func = dev_to_sdio_func(dev);
- 
--	sdio_free_func_cis(func);
-+#ifdef CONFIG_MMC_EMBEDDED_SDIO
-+	/*
-+	 * If this device is embedded then we never allocated
-+	 * cis tables for this func
-+	 */
-+	if (!func->card->host->embedded_sdio_data.funcs)
-+#endif
-+		sdio_free_func_cis(func);
- 
- 	if (func->info)
- 		kfree(func->info);
---- a/include/linux/mmc/host.h
-+++ b/include/linux/mmc/host.h
-@@ -161,6 +161,15 @@ struct mmc_host {
- 
- 	struct dentry		*debugfs_root;
- 
-+#ifdef CONFIG_MMC_EMBEDDED_SDIO
-+	struct {
-+		struct sdio_cis			*cis;
-+		struct sdio_cccr		*cccr;
-+		struct sdio_embedded_func	*funcs;
-+		int				num_funcs;
-+	} embedded_sdio_data;
-+#endif
-+
- 	unsigned long		private[0] ____cacheline_aligned;
- };
- 
-@@ -169,6 +178,14 @@ extern int mmc_add_host(struct mmc_host 
- extern void mmc_remove_host(struct mmc_host *);
- extern void mmc_free_host(struct mmc_host *);
- 
-+#ifdef CONFIG_MMC_EMBEDDED_SDIO
-+extern void mmc_set_embedded_sdio_data(struct mmc_host *host,
-+				       struct sdio_cis *cis,
-+				       struct sdio_cccr *cccr,
-+				       struct sdio_embedded_func *funcs,
-+				       int num_funcs);
-+#endif
-+
- static inline void *mmc_priv(struct mmc_host *host)
- {
- 	return (void *)host->private;
---- a/include/linux/mmc/sdio_func.h
-+++ b/include/linux/mmc/sdio_func.h
-@@ -21,6 +21,14 @@ struct sdio_func;
- typedef void (sdio_irq_handler_t)(struct sdio_func *);
- 
- /*
-+ * Structure used to hold embedded SDIO device data from platform layer
-+ */
-+struct sdio_embedded_func {
-+	uint8_t f_class;
-+	uint32_t f_maxblksize;
-+};
-+
-+/*
-  * SDIO function CIS tuple (unknown to the core)
-  */
- struct sdio_func_tuple {
diff --git a/target/linux/goldfish/patches-2.6.30/0097-mmc-Add-new-API-call-sdio_reset_comm-for-resettin.patch b/target/linux/goldfish/patches-2.6.30/0097-mmc-Add-new-API-call-sdio_reset_comm-for-resettin.patch
deleted file mode 100644
index 59cd702b5..000000000
--- a/target/linux/goldfish/patches-2.6.30/0097-mmc-Add-new-API-call-sdio_reset_comm-for-resettin.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 0b9879757f15d4ac99e032647cb3ee26393031b0 Mon Sep 17 00:00:00 2001
-From: San Mehat <san@android.com>
-Date: Thu, 15 May 2008 09:15:37 -0700
-Subject: [PATCH 097/134] mmc: Add new API call 'sdio_reset_comm' for resetting communication with an SDIO device
-
-Signed-off-by: San Mehat <san@android.com>
----
- drivers/mmc/core/sdio.c |   58 +++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 58 insertions(+), 0 deletions(-)
-
---- a/drivers/mmc/core/sdio.c
-+++ b/drivers/mmc/core/sdio.c
-@@ -482,3 +482,61 @@ err:
- 	return err;
- }
- 
-+int sdio_reset_comm(struct mmc_card *card)
-+{
-+	struct mmc_host *host = card->host;
-+	u32 ocr;
-+	int err;
-+
-+	printk("%s():\n", __func__);
-+	mmc_go_idle(host);
-+
-+	mmc_set_clock(host, host->f_min);
-+
-+	err = mmc_send_io_op_cond(host, 0, &ocr);
-+	if (err)
-+		goto err;
-+
-+	host->ocr = mmc_select_voltage(host, ocr);
-+	if (!host->ocr) {
-+		err = -EINVAL;
-+		goto err;
-+	}
-+
-+	err = mmc_send_io_op_cond(host, host->ocr, &ocr);
-+	if (err)
-+		goto err;
-+
-+	if (mmc_host_is_spi(host)) {
-+		err = mmc_spi_set_crc(host, use_spi_crc);
-+		if (err)
-+		goto err;
-+	}
-+
-+	if (!mmc_host_is_spi(host)) {
-+		err = mmc_send_relative_addr(host, &card->rca);
-+		if (err)
-+			goto err;
-+		mmc_set_bus_mode(host, MMC_BUSMODE_PUSHPULL);
-+	}
-+	if (!mmc_host_is_spi(host)) {
-+		err = mmc_select_card(card);
-+		if (err)
-+			goto err;
-+	}
-+
-+	mmc_set_clock(host, card->cis.max_dtr);
-+	err = sdio_enable_wide(card);
-+	if (err)
-+		goto err;
-+
-+	return 0;
-+ err:
-+	printk("%s: Error resetting SDIO communications (%d)\n",
-+	       mmc_hostname(host), err);
-+	mmc_release_host(host);
-+	return err;
-+}
-+EXPORT_SYMBOL(sdio_reset_comm);
-+
-+
diff --git a/target/linux/goldfish/patches-2.6.30/0098-mmc-sd-When-resuming-try-a-little-harder-to-init.patch b/target/linux/goldfish/patches-2.6.30/0098-mmc-sd-When-resuming-try-a-little-harder-to-init.patch
deleted file mode 100644
index 4e525b617..000000000
--- a/target/linux/goldfish/patches-2.6.30/0098-mmc-sd-When-resuming-try-a-little-harder-to-init.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From bd8df907ee8e95143d1bb7ec01ee0e4b6f7e1b79 Mon Sep 17 00:00:00 2001
-From: San Mehat <san@android.com>
-Date: Mon, 1 Dec 2008 08:52:34 -0800
-Subject: [PATCH 098/134] mmc: sd: When resuming, try a little harder to init the card
-
-Signed-off-by: San Mehat <san@android.com>
----
- drivers/mmc/core/sd.c |   19 +++++++++++++++++++
- 1 files changed, 19 insertions(+), 0 deletions(-)
-
---- a/drivers/mmc/core/sd.c
-+++ b/drivers/mmc/core/sd.c
-@@ -607,12 +607,31 @@ static void mmc_sd_suspend(struct mmc_ho
- static void mmc_sd_resume(struct mmc_host *host)
- {
- 	int err;
-+#ifdef CONFIG_MMC_PARANOID_SD_INIT
-+	int retries;
-+#endif
- 
- 	BUG_ON(!host);
- 	BUG_ON(!host->card);
- 
- 	mmc_claim_host(host);
-+#ifdef CONFIG_MMC_PARANOID_SD_INIT
-+	retries = 5;
-+	while (retries) {
-+		err = mmc_sd_init_card(host, host->ocr, host->card);
-+
-+		if (err) {
-+			printk(KERN_ERR "%s: Re-init card rc = %d (retries = %d)\n",
-+			       mmc_hostname(host), err, retries);
-+			mdelay(5);
-+			retries--;
-+			continue;
-+		}
-+		break;
-+	}
-+#else
- 	err = mmc_sd_init_card(host, host->ocr, host->card);
-+#endif
- 	mmc_release_host(host);
- 
- 	if (err) {
diff --git a/target/linux/goldfish/patches-2.6.30/0099-mmc-mmcblk-Add-new-feature-CONFIG_MMC_BLOCK_PARAN.patch b/target/linux/goldfish/patches-2.6.30/0099-mmc-mmcblk-Add-new-feature-CONFIG_MMC_BLOCK_PARAN.patch
deleted file mode 100644
index 78e23780f..000000000
--- a/target/linux/goldfish/patches-2.6.30/0099-mmc-mmcblk-Add-new-feature-CONFIG_MMC_BLOCK_PARAN.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 5ca694dfd981a371e9b18cdd4a89c002ffaccbc5 Mon Sep 17 00:00:00 2001
-From: San Mehat <san@android.com>
-Date: Wed, 3 Dec 2008 10:22:59 -0800
-Subject: [PATCH 099/134] mmc: mmcblk: Add new feature 'CONFIG_MMC_BLOCK_PARANOID_RESUME'
-
-  With this feature enabled, mmcblk will check the card-status before issuing
-a transaction *only* after being resumed. This protectes us from issuing
-transactions before the sdcard is ready (which can occur if the host driver
-deferrs mmc_resume_host() to reduce resume latency)
-
-Signed-off-by: San Mehat <san@android.com>
----
- drivers/mmc/card/Kconfig |    7 +++++++
- drivers/mmc/card/block.c |    3 +++
- drivers/mmc/card/queue.c |   28 ++++++++++++++++++++++++++++
- drivers/mmc/card/queue.h |    3 +++
- 4 files changed, 41 insertions(+), 0 deletions(-)
-
---- a/drivers/mmc/card/Kconfig
-+++ b/drivers/mmc/card/Kconfig
-@@ -32,6 +32,13 @@ config MMC_BLOCK_BOUNCE
- 
- 	  If unsure, say Y here.
- 
-+config MMC_BLOCK_PARANOID_RESUME
-+	bool "Check card status on resume"
-+        depends on MMC_BLOCK
-+        default y
-+        help
-+          Nohelp
-+
- config SDIO_UART
- 	tristate "SDIO UART/GPS class support"
- 	help
---- a/drivers/mmc/card/block.c
-+++ b/drivers/mmc/card/block.c
-@@ -643,6 +643,9 @@ static int mmc_blk_resume(struct mmc_car
- 
- 	if (md) {
- 		mmc_blk_set_blksize(md, card);
-+#ifdef CONFIG_MMC_BLOCK_PARANOID_RESUME
-+		md->queue.check_status = 1;
-+#endif
- 		mmc_queue_resume(&md->queue);
- 	}
- 	return 0;
---- a/drivers/mmc/card/queue.c
-+++ b/drivers/mmc/card/queue.c
-@@ -14,7 +14,9 @@
- #include <linux/freezer.h>
- #include <linux/kthread.h>
- #include <linux/scatterlist.h>
-+#include <linux/delay.h>
- 
-+#include <linux/mmc/mmc.h>
- #include <linux/mmc/card.h>
- #include <linux/mmc/host.h>
- #include "queue.h"
-@@ -70,7 +72,33 @@ static int mmc_queue_thread(void *d)
- 			continue;
- 		}
- 		set_current_state(TASK_RUNNING);
-+#ifdef CONFIG_MMC_BLOCK_PARANOID_RESUME
-+		if (mq->check_status) {
-+			struct mmc_command cmd;
- 
-+			do {
-+				int err;
-+
-+				cmd.opcode = MMC_SEND_STATUS;
-+				cmd.arg = mq->card->rca << 16;
-+				cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
-+
-+				mmc_claim_host(mq->card->host);
-+				err = mmc_wait_for_cmd(mq->card->host, &cmd, 5);
-+				mmc_release_host(mq->card->host);
-+
-+				if (err) {
-+					printk(KERN_ERR "%s: failed to get status (%d)\n",
-+					       __func__, err);
-+					msleep(5);
-+					continue;
-+				}
-+				printk(KERN_DEBUG "%s: status 0x%.8x\n", __func__, cmd.resp[0]);
-+			} while (!(cmd.resp[0] & R1_READY_FOR_DATA) ||
-+				(R1_CURRENT_STATE(cmd.resp[0]) == 7));
-+			mq->check_status = 0;
-+                }
-+#endif
- 		mq->issue_fn(mq, req);
- 	} while (1);
- 	up(&mq->thread_sem);
---- a/drivers/mmc/card/queue.h
-+++ b/drivers/mmc/card/queue.h
-@@ -17,6 +17,9 @@ struct mmc_queue {
- 	char			*bounce_buf;
- 	struct scatterlist	*bounce_sg;
- 	unsigned int		bounce_sg_len;
-+#ifdef CONFIG_MMC_BLOCK_PARANOID_RESUME
-+	int			check_status;
-+#endif
- };
- 
- extern int mmc_init_queue(struct mmc_queue *, struct mmc_card *, spinlock_t *);
diff --git a/target/linux/goldfish/patches-2.6.30/0100-mmc-sd-Add-retries-in-re-detection.patch b/target/linux/goldfish/patches-2.6.30/0100-mmc-sd-Add-retries-in-re-detection.patch
deleted file mode 100644
index 090e9e691..000000000
--- a/target/linux/goldfish/patches-2.6.30/0100-mmc-sd-Add-retries-in-re-detection.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 39e3d37b1f7194277b8a3ea3536a67ec2d24491e Mon Sep 17 00:00:00 2001
-From: San Mehat <san@android.com>
-Date: Thu, 4 Dec 2008 11:18:00 -0800
-Subject: [PATCH 100/134] mmc: sd: Add retries in re-detection
-
-Signed-off-by: San Mehat <san@android.com>
----
- drivers/mmc/core/sd.c |   46 +++++++++++++++++++++++++++++++++++++++++++---
- 1 files changed, 43 insertions(+), 3 deletions(-)
-
---- a/drivers/mmc/core/sd.c
-+++ b/drivers/mmc/core/sd.c
-@@ -558,18 +558,37 @@ static void mmc_sd_remove(struct mmc_hos
-  */
- static void mmc_sd_detect(struct mmc_host *host)
- {
--	int err;
-+	int err = 0;
-+#ifdef CONFIG_MMC_PARANOID_SD_INIT
-+        int retries = 5;
-+#endif
- 
- 	BUG_ON(!host);
- 	BUG_ON(!host->card);
--
-+       
- 	mmc_claim_host(host);
- 
- 	/*
- 	 * Just check if our card has been removed.
- 	 */
-+#ifdef CONFIG_MMC_PARANOID_SD_INIT
-+	while(retries) {
-+		err = mmc_send_status(host->card, NULL);
-+		printk("%s(%s): err = %d\n", __func__, mmc_hostname(host), err);
-+		if (err) {
-+			retries--;
-+			udelay(5);
-+			continue;
-+		}
-+		break;
-+	}
-+	if (!retries) {
-+		printk(KERN_ERR "%s(%s): Unable to re-detect card (%d)\n",
-+		       __func__, mmc_hostname(host), err);
-+	}
-+#else
- 	err = mmc_send_status(host->card, NULL);
--
-+#endif
- 	mmc_release_host(host);
- 
- 	if (err) {
-@@ -664,6 +683,9 @@ static const struct mmc_bus_ops mmc_sd_o
- int mmc_attach_sd(struct mmc_host *host, u32 ocr)
- {
- 	int err;
-+#ifdef CONFIG_MMC_PARANOID_SD_INIT
-+	int retries;
-+#endif
- 
- 	BUG_ON(!host);
- 	WARN_ON(!host->claimed);
-@@ -712,9 +734,27 @@ int mmc_attach_sd(struct mmc_host *host,
- 	/*
- 	 * Detect and init the card.
- 	 */
-+#ifdef CONFIG_MMC_PARANOID_SD_INIT
-+	retries = 5;
-+	while (retries) {
-+		err = mmc_sd_init_card(host, host->ocr, NULL);
-+		if (err) {
-+			retries--;
-+			continue;
-+		}
-+		break;
-+	}
-+
-+	if (!retries) {
-+		printk(KERN_ERR "%s: mmc_sd_init_card() failure (err = %d)\n",
-+		       mmc_hostname(host), err);
-+		goto err;
-+	}
-+#else
- 	err = mmc_sd_init_card(host, host->ocr, NULL);
- 	if (err)
- 		goto err;
-+#endif
- 
- 	mmc_release_host(host);
- 
diff --git a/target/linux/goldfish/patches-2.6.30/0101-android_usb-Composite-USB-gadget-driver-for-android.patch b/target/linux/goldfish/patches-2.6.30/0101-android_usb-Composite-USB-gadget-driver-for-android.patch
deleted file mode 100644
index 4638449ce..000000000
--- a/target/linux/goldfish/patches-2.6.30/0101-android_usb-Composite-USB-gadget-driver-for-android.patch
+++ /dev/null
@@ -1,4127 +0,0 @@
-From 03e39e8f663c896dac11e87d96e8cb0292520e36 Mon Sep 17 00:00:00 2001
-From: Mike Lockwood <lockwood@android.com>
-Date: Tue, 2 Dec 2008 22:01:33 -0500
-Subject: [PATCH 101/134] android_usb: Composite USB gadget driver for android.
-
-Signed-off-by: Mike Lockwood <lockwood@android.com>
-
-USB: android gadget: add remote wakeup attribute to android function
-
-Add remote wakeup attribute to configuration descriptor of android
-function to advertise remote wakeup capability to host
-
-Acked-by: Allam, Suresh Reddy <sallam@qualcomm.com>
-
-Signed-off-by: Mike Lockwood <lockwood@android.com>
-
-usb gadget: link fixes for android composite gadget
-
-Signed-off-by: Mike Lockwood <lockwood@android.com>
-
-usb gadget: Fix null pointer errors in android composite driver
-
-Signed-off-by: Mike Lockwood <lockwood@android.com>
----
- drivers/usb/gadget/Kconfig          |    8 +
- drivers/usb/gadget/Makefile         |    2 +
- drivers/usb/gadget/android.c        |  345 +++++
- drivers/usb/gadget/f_adb.c          |  668 ++++++++
- drivers/usb/gadget/f_adb.h          |   25 +
- drivers/usb/gadget/f_mass_storage.c | 2906 +++++++++++++++++++++++++++++++++++
- drivers/usb/gadget/f_mass_storage.h |   52 +
- include/linux/usb/android.h         |   40 +
- 8 files changed, 4046 insertions(+), 0 deletions(-)
- create mode 100644 drivers/usb/gadget/android.c
- create mode 100644 drivers/usb/gadget/f_adb.c
- create mode 100644 drivers/usb/gadget/f_adb.h
- create mode 100644 drivers/usb/gadget/f_mass_storage.c
- create mode 100644 drivers/usb/gadget/f_mass_storage.h
- create mode 100644 include/linux/usb/android.h
-
---- a/drivers/usb/gadget/Kconfig
-+++ b/drivers/usb/gadget/Kconfig
-@@ -700,6 +700,14 @@ config USB_G_PRINTER
- 	  For more information, see Documentation/usb/gadget_printer.txt
- 	  which includes sample code for accessing the device file.
- 
-+config USB_ANDROID
-+	tristate "Android Gadget"
-+	help
-+	  The Android gadget provides mass storage and adb transport.
-+
-+	  Say "y" to link the driver statically, or "m" to build a
-+	  dynamically linked module called "g_android".
-+
- config USB_CDC_COMPOSITE
- 	tristate "CDC Composite Device (Ethernet and ACM)"
- 	depends on NET
---- a/drivers/usb/gadget/Makefile
-+++ b/drivers/usb/gadget/Makefile
-@@ -33,6 +33,7 @@ gadgetfs-objs			:= inode.o
- g_file_storage-objs		:= file_storage.o
- g_printer-objs			:= printer.o
- g_cdc-objs			:= cdc2.o
-+g_android-objs			:= android.o f_adb.o f_mass_storage.o
- 
- obj-$(CONFIG_USB_ZERO)		+= g_zero.o
- obj-$(CONFIG_USB_ETH)		+= g_ether.o
-@@ -42,4 +43,5 @@ obj-$(CONFIG_USB_G_SERIAL)	+= g_serial.o
- obj-$(CONFIG_USB_G_PRINTER)	+= g_printer.o
- obj-$(CONFIG_USB_MIDI_GADGET)	+= g_midi.o
- obj-$(CONFIG_USB_CDC_COMPOSITE) += g_cdc.o
-+obj-$(CONFIG_USB_ANDROID)	+= g_android.o
- 
---- /dev/null
-+++ b/drivers/usb/gadget/android.c
-@@ -0,0 +1,345 @@
-+/*
-+ * Gadget Driver for Android
-+ *
-+ * Copyright (C) 2008 Google, Inc.
-+ * Author: Mike Lockwood <lockwood@android.com>
-+ *
-+ * This software is licensed under the terms of the GNU General Public
-+ * License version 2, as published by the Free Software Foundation, and
-+ * may be copied, distributed, and modified under those terms.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ */
-+
-+/* #define DEBUG */
-+/* #define VERBOSE_DEBUG */
-+
-+#include <linux/init.h>
-+#include <linux/module.h>
-+#include <linux/fs.h>
-+
-+#include <linux/delay.h>
-+#include <linux/kernel.h>
-+#include <linux/utsname.h>
-+#include <linux/miscdevice.h>
-+#include <linux/platform_device.h>
-+
-+#include <linux/usb/android.h>
-+#include <linux/usb/ch9.h>
-+#include <linux/usb/composite.h>
-+#include <linux/usb/gadget.h>
-+
-+#include "f_mass_storage.h"
-+#include "f_adb.h"
-+
-+#include "gadget_chips.h"
-+
-+/*
-+ * Kbuild is not very cooperative with respect to linking separately
-+ * compiled library objects into one module.  So for now we won't use
-+ * separate compilation ... ensuring init/exit sections work to shrink
-+ * the runtime footprint, and giving us at least some parts of what
-+ * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
-+ */
-+#include "usbstring.c"
-+#include "config.c"
-+#include "epautoconf.c"
-+#include "composite.c"
-+
-+MODULE_AUTHOR("Mike Lockwood");
-+MODULE_DESCRIPTION("Android Composite USB Driver");
-+MODULE_LICENSE("GPL");
-+MODULE_VERSION("1.0");
-+
-+static const char longname[] = "Gadget Android";
-+
-+/* Default vendor and product IDs, overridden by platform data */
-+#define VENDOR_ID		0x18D1
-+#define PRODUCT_ID		0x0001
-+#define ADB_PRODUCT_ID	0x0002
-+
-+struct android_dev {
-+	struct usb_gadget *gadget;
-+	struct usb_composite_dev *cdev;
-+
-+	int product_id;
-+	int adb_product_id;
-+	int version;
-+
-+	int adb_enabled;
-+	int nluns;
-+};
-+
-+static atomic_t adb_enable_excl;
-+static struct android_dev *_android_dev;
-+
-+/* string IDs are assigned dynamically */
-+
-+#define STRING_MANUFACTURER_IDX		0
-+#define STRING_PRODUCT_IDX		1
-+#define STRING_SERIAL_IDX		2
-+
-+/* String Table */
-+static struct usb_string strings_dev[] = {
-+	/* These dummy values should be overridden by platform data */
-+	[STRING_MANUFACTURER_IDX].s = "Android",
-+	[STRING_PRODUCT_IDX].s = "Android",
-+	[STRING_SERIAL_IDX].s = "0123456789ABCDEF",
-+	{  }			/* end of list */
-+};
-+
-+static struct usb_gadget_strings stringtab_dev = {
-+	.language	= 0x0409,	/* en-us */
-+	.strings	= strings_dev,
-+};
-+
-+static struct usb_gadget_strings *dev_strings[] = {
-+	&stringtab_dev,
-+	NULL,
-+};
-+
-+static struct usb_device_descriptor device_desc = {
-+	.bLength              = sizeof(device_desc),
-+	.bDescriptorType      = USB_DT_DEVICE,
-+	.bcdUSB               = __constant_cpu_to_le16(0x0200),
-+	.bDeviceClass         = USB_CLASS_PER_INTERFACE,
-+	.idVendor             = __constant_cpu_to_le16(VENDOR_ID),
-+	.idProduct            = __constant_cpu_to_le16(PRODUCT_ID),
-+	.bcdDevice            = __constant_cpu_to_le16(0xffff),
-+	.bNumConfigurations   = 1,
-+};
-+
-+static int __init android_bind_config(struct usb_configuration *c)
-+{
-+	struct android_dev *dev = _android_dev;
-+	int ret;
-+	printk(KERN_DEBUG "android_bind_config\n");
-+
-+	ret = mass_storage_function_add(dev->cdev, c, dev->nluns);
-+	if (ret)
-+		return ret;
-+	return adb_function_add(dev->cdev, c);
-+}
-+
-+static struct usb_configuration android_config_driver = {
-+	.label		= "android",
-+	.bind		= android_bind_config,
-+	.bConfigurationValue = 1,
-+	.bmAttributes	= USB_CONFIG_ATT_ONE | USB_CONFIG_ATT_SELFPOWER,
-+	.bMaxPower	= 0x80, /* 250ma */
-+};
-+
-+static int __init android_bind(struct usb_composite_dev *cdev)
-+{
-+	struct android_dev *dev = _android_dev;
-+	struct usb_gadget	*gadget = cdev->gadget;
-+	int			gcnum;
-+	int			id;
-+	int			ret;
-+
-+	printk(KERN_INFO "android_bind\n");
-+
-+	/* Allocate string descriptor numbers ... note that string
-+	 * contents can be overridden by the composite_dev glue.
-+	 */
-+	id = usb_string_id(cdev);
-+	if (id < 0)
-+		return id;
-+	strings_dev[STRING_MANUFACTURER_IDX].id = id;
-+	device_desc.iManufacturer = id;
-+
-+	id = usb_string_id(cdev);
-+	if (id < 0)
-+		return id;
-+	strings_dev[STRING_PRODUCT_IDX].id = id;
-+	device_desc.iProduct = id;
-+
-+	id = usb_string_id(cdev);
-+	if (id < 0)
-+		return id;
-+	strings_dev[STRING_SERIAL_IDX].id = id;
-+	device_desc.iSerialNumber = id;
-+
-+	if (gadget->ops->wakeup)
-+		android_config_driver.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
-+
-+	/* register our configuration */
-+	ret = usb_add_config(cdev, &android_config_driver);
-+	if (ret) {
-+		printk(KERN_ERR "usb_add_config failed\n");
-+		return ret;
-+	}
-+
-+	gcnum = usb_gadget_controller_number(gadget);
-+	if (gcnum >= 0)
-+		device_desc.bcdDevice = cpu_to_le16(0x0200 + gcnum);
-+	else {
-+		/* gadget zero is so simple (for now, no altsettings) that
-+		 * it SHOULD NOT have problems with bulk-capable hardware.
-+		 * so just warn about unrcognized controllers -- don't panic.
-+		 *
-+		 * things like configuration and altsetting numbering
-+		 * can need hardware-specific attention though.
-+		 */
-+		pr_warning("%s: controller '%s' not recognized\n",
-+			longname, gadget->name);
-+		device_desc.bcdDevice = __constant_cpu_to_le16(0x9999);
-+	}
-+
-+	usb_gadget_set_selfpowered(gadget);
-+	dev->cdev = cdev;
-+
-+	return 0;
-+}
-+
-+static struct usb_composite_driver android_usb_driver = {
-+	.name		= "android_usb",
-+	.dev		= &device_desc,
-+	.strings	= dev_strings,
-+	.bind		= android_bind,
-+};
-+
-+static void enable_adb(struct android_dev *dev, int enable)
-+{
-+	if (enable != dev->adb_enabled) {
-+		dev->adb_enabled = enable;
-+		adb_function_enable(enable);
-+
-+		/* set product ID to the appropriate value */
-+		if (enable)
-+			device_desc.idProduct =
-+				__constant_cpu_to_le16(dev->adb_product_id);
-+		else
-+			device_desc.idProduct =
-+				__constant_cpu_to_le16(dev->product_id);
-+		if (dev->cdev)
-+			dev->cdev->desc.idProduct = device_desc.idProduct;
-+
-+		/* force reenumeration */
-+		if (dev->cdev && dev->cdev->gadget &&
-+				dev->cdev->gadget->speed != USB_SPEED_UNKNOWN) {
-+			usb_gadget_disconnect(dev->cdev->gadget);
-+			msleep(10);
-+			usb_gadget_connect(dev->cdev->gadget);
-+		}
-+	}
-+}
-+
-+static int adb_enable_open(struct inode *ip, struct file *fp)
-+{
-+	if (atomic_inc_return(&adb_enable_excl) != 1) {
-+		atomic_dec(&adb_enable_excl);
-+		return -EBUSY;
-+	}
-+
-+	printk(KERN_INFO "enabling adb\n");
-+	enable_adb(_android_dev, 1);
-+
-+	return 0;
-+}
-+
-+static int adb_enable_release(struct inode *ip, struct file *fp)
-+{
-+	printk(KERN_INFO "disabling adb\n");
-+	enable_adb(_android_dev, 0);
-+	atomic_dec(&adb_enable_excl);
-+	return 0;
-+}
-+
-+static struct file_operations adb_enable_fops = {
-+	.owner =   THIS_MODULE,
-+	.open =    adb_enable_open,
-+	.release = adb_enable_release,
-+};
-+
-+static struct miscdevice adb_enable_device = {
-+	.minor = MISC_DYNAMIC_MINOR,
-+	.name = "android_adb_enable",
-+	.fops = &adb_enable_fops,
-+};
-+
-+static int __init android_probe(struct platform_device *pdev)
-+{
-+	struct android_usb_platform_data *pdata = pdev->dev.platform_data;
-+	struct android_dev *dev = _android_dev;
-+
-+	printk(KERN_INFO "android_probe pdata: %p\n", pdata);
-+
-+	if (pdata) {
-+		if (pdata->vendor_id)
-+			device_desc.idVendor =
-+				__constant_cpu_to_le16(pdata->vendor_id);
-+		if (pdata->product_id) {
-+			dev->product_id = pdata->product_id;
-+			device_desc.idProduct =
-+				__constant_cpu_to_le16(pdata->product_id);
-+		}
-+		if (pdata->adb_product_id)
-+			dev->adb_product_id = pdata->adb_product_id;
-+		if (pdata->version)
-+			dev->version = pdata->version;
-+
-+		if (pdata->product_name)
-+			strings_dev[STRING_PRODUCT_IDX].s = pdata->product_name;
-+		if (pdata->manufacturer_name)
-+			strings_dev[STRING_MANUFACTURER_IDX].s =
-+					pdata->manufacturer_name;
-+		if (pdata->serial_number)
-+			strings_dev[STRING_SERIAL_IDX].s = pdata->serial_number;
-+		dev->nluns = pdata->nluns;
-+	}
-+
-+	return 0;
-+}
-+
-+static struct platform_driver android_platform_driver = {
-+	.driver = { .name = "android_usb", },
-+	.probe = android_probe,
-+};
-+
-+static int __init init(void)
-+{
-+	struct android_dev *dev;
-+	int ret;
-+
-+	printk(KERN_INFO "android init\n");
-+
-+	dev = kzalloc(sizeof(*dev), GFP_KERNEL);
-+	if (!dev)
-+		return -ENOMEM;
-+
-+	/* set default values, which should be overridden by platform data */
-+	dev->product_id = PRODUCT_ID;
-+	dev->adb_product_id = ADB_PRODUCT_ID;
-+	_android_dev = dev;
-+
-+	ret = platform_driver_register(&android_platform_driver);
-+	if (ret)
-+		return ret;
-+	ret = misc_register(&adb_enable_device);
-+	if (ret) {
-+		platform_driver_unregister(&android_platform_driver);
-+		return ret;
-+	}
-+	ret = usb_composite_register(&android_usb_driver);
-+	if (ret) {
-+		misc_deregister(&adb_enable_device);
-+		platform_driver_unregister(&android_platform_driver);
-+	}
-+	return ret;
-+}
-+module_init(init);
-+
-+static void __exit cleanup(void)
-+{
-+	usb_composite_unregister(&android_usb_driver);
-+	misc_deregister(&adb_enable_device);
-+	platform_driver_unregister(&android_platform_driver);
-+	kfree(_android_dev);
-+	_android_dev = NULL;
-+}
-+module_exit(cleanup);
---- /dev/null
-+++ b/drivers/usb/gadget/f_adb.c
-@@ -0,0 +1,668 @@
-+/*
-+ * Gadget Driver for Android ADB
-+ *
-+ * Copyright (C) 2008 Google, Inc.
-+ * Author: Mike Lockwood <lockwood@android.com>
-+ *
-+ * This software is licensed under the terms of the GNU General Public
-+ * License version 2, as published by the Free Software Foundation, and
-+ * may be copied, distributed, and modified under those terms.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ */
-+
-+/* #define DEBUG */
-+/* #define VERBOSE_DEBUG */
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/poll.h>
-+#include <linux/delay.h>
-+#include <linux/wait.h>
-+#include <linux/err.h>
-+#include <linux/interrupt.h>
-+
-+#include <linux/types.h>
-+#include <linux/device.h>
-+#include <linux/miscdevice.h>
-+
-+#include <linux/usb/ch9.h>
-+#include <linux/usb/composite.h>
-+#include <linux/usb/gadget.h>
-+
-+#include "f_adb.h"
-+
-+#define BULK_BUFFER_SIZE           4096
-+
-+/* number of rx and tx requests to allocate */
-+#define RX_REQ_MAX 4
-+#define TX_REQ_MAX 4
-+
-+static const char shortname[] = "android_adb";
-+
-+struct adb_dev {
-+	struct usb_function function;
-+	struct usb_composite_dev *cdev;
-+	spinlock_t lock;
-+
-+	struct usb_ep *ep_in;
-+	struct usb_ep *ep_out;
-+
-+	int online;
-+	int error;
-+
-+	atomic_t read_excl;
-+	atomic_t write_excl;
-+	atomic_t open_excl;
-+
-+	struct list_head tx_idle;
-+	struct list_head rx_idle;
-+	struct list_head rx_done;
-+
-+	wait_queue_head_t read_wq;
-+	wait_queue_head_t write_wq;
-+
-+	/* the request we're currently reading from */
-+	struct usb_request *read_req;
-+	unsigned char *read_buf;
-+	unsigned read_count;
-+};
-+
-+static struct usb_interface_descriptor adb_interface_desc = {
-+	.bLength                = USB_DT_INTERFACE_SIZE,
-+	.bDescriptorType        = USB_DT_INTERFACE,
-+	.bInterfaceNumber       = 0,
-+	.bNumEndpoints          = 2,
-+	.bInterfaceClass        = 0xFF,
-+	.bInterfaceSubClass     = 0x42,
-+	.bInterfaceProtocol     = 1,
-+};
-+
-+static struct usb_endpoint_descriptor adb_highspeed_in_desc = {
-+	.bLength                = USB_DT_ENDPOINT_SIZE,
-+	.bDescriptorType        = USB_DT_ENDPOINT,
-+	.bEndpointAddress       = USB_DIR_IN,
-+	.bmAttributes           = USB_ENDPOINT_XFER_BULK,
-+	.wMaxPacketSize         = __constant_cpu_to_le16(512),
-+};
-+
-+static struct usb_endpoint_descriptor adb_highspeed_out_desc = {
-+	.bLength                = USB_DT_ENDPOINT_SIZE,
-+	.bDescriptorType        = USB_DT_ENDPOINT,
-+	.bEndpointAddress       = USB_DIR_OUT,
-+	.bmAttributes           = USB_ENDPOINT_XFER_BULK,
-+	.wMaxPacketSize         = __constant_cpu_to_le16(512),
-+};
-+
-+static struct usb_endpoint_descriptor adb_fullspeed_in_desc = {
-+	.bLength                = USB_DT_ENDPOINT_SIZE,
-+	.bDescriptorType        = USB_DT_ENDPOINT,
-+	.bEndpointAddress       = USB_DIR_IN,
-+	.bmAttributes           = USB_ENDPOINT_XFER_BULK,
-+};
-+
-+static struct usb_endpoint_descriptor adb_fullspeed_out_desc = {
-+	.bLength                = USB_DT_ENDPOINT_SIZE,
-+	.bDescriptorType        = USB_DT_ENDPOINT,
-+	.bEndpointAddress       = USB_DIR_OUT,
-+	.bmAttributes           = USB_ENDPOINT_XFER_BULK,
-+};
-+
-+static struct usb_descriptor_header *fs_adb_descs[] = {
-+	(struct usb_descriptor_header *) &adb_interface_desc,
-+	(struct usb_descriptor_header *) &adb_fullspeed_in_desc,
-+	(struct usb_descriptor_header *) &adb_fullspeed_out_desc,
-+	NULL,
-+};
-+
-+static struct usb_descriptor_header *hs_adb_descs[] = {
-+	(struct usb_descriptor_header *) &adb_interface_desc,
-+	(struct usb_descriptor_header *) &adb_highspeed_in_desc,
-+	(struct usb_descriptor_header *) &adb_highspeed_out_desc,
-+	NULL,
-+};
-+
-+/* used when adb function is disabled */
-+static struct usb_descriptor_header *null_adb_descs[] = {
-+	NULL,
-+};
-+
-+
-+/* temporary variable used between adb_open() and adb_gadget_bind() */
-+static struct adb_dev *_adb_dev;
-+
-+static inline struct adb_dev *func_to_dev(struct usb_function *f)
-+{
-+	return container_of(f, struct adb_dev, function);
-+}
-+
-+
-+static struct usb_request *adb_request_new(struct usb_ep *ep, int buffer_size)
-+{
-+	struct usb_request *req = usb_ep_alloc_request(ep, GFP_KERNEL);
-+	if (!req)
-+		return NULL;
-+
-+	/* now allocate buffers for the requests */
-+	req->buf = kmalloc(buffer_size, GFP_KERNEL);
-+	if (!req->buf) {
-+		usb_ep_free_request(ep, req);
-+		return NULL;
-+	}
-+
-+	return req;
-+}
-+
-+static void adb_request_free(struct usb_request *req, struct usb_ep *ep)
-+{
-+	if (req) {
-+		kfree(req->buf);
-+		usb_ep_free_request(ep, req);
-+	}
-+}
-+
-+static inline int _lock(atomic_t *excl)
-+{
-+	if (atomic_inc_return(excl) == 1) {
-+		return 0;
-+	} else {
-+		atomic_dec(excl);
-+		return -1;
-+	}
-+}
-+
-+static inline void _unlock(atomic_t *excl)
-+{
-+	atomic_dec(excl);
-+}
-+
-+/* add a request to the tail of a list */
-+void req_put(struct adb_dev *dev, struct list_head *head,
-+		struct usb_request *req)
-+{
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&dev->lock, flags);
-+	list_add_tail(&req->list, head);
-+	spin_unlock_irqrestore(&dev->lock, flags);
-+}
-+
-+/* remove a request from the head of a list */
-+struct usb_request *req_get(struct adb_dev *dev, struct list_head *head)
-+{
-+	unsigned long flags;
-+	struct usb_request *req;
-+
-+	spin_lock_irqsave(&dev->lock, flags);
-+	if (list_empty(head)) {
-+		req = 0;
-+	} else {
-+		req = list_first_entry(head, struct usb_request, list);
-+		list_del(&req->list);
-+	}
-+	spin_unlock_irqrestore(&dev->lock, flags);
-+	return req;
-+}
-+
-+static void adb_complete_in(struct usb_ep *ep, struct usb_request *req)
-+{
-+	struct adb_dev *dev = _adb_dev;
-+
-+	if (req->status != 0)
-+		dev->error = 1;
-+
-+	req_put(dev, &dev->tx_idle, req);
-+
-+	wake_up(&dev->write_wq);
-+}
-+
-+static void adb_complete_out(struct usb_ep *ep, struct usb_request *req)
-+{
-+	struct adb_dev *dev = _adb_dev;
-+
-+	if (req->status != 0) {
-+		dev->error = 1;
-+		req_put(dev, &dev->rx_idle, req);
-+	} else {
-+		req_put(dev, &dev->rx_done, req);
-+	}
-+
-+	wake_up(&dev->read_wq);
-+}
-+
-+static int __init create_bulk_endpoints(struct adb_dev *dev,
-+				struct usb_endpoint_descriptor *in_desc,
-+				struct usb_endpoint_descriptor *out_desc)
-+{
-+	struct usb_composite_dev *cdev = dev->cdev;
-+	struct usb_request *req;
-+	struct usb_ep *ep;
-+	int i;
-+
-+	DBG(cdev, "create_bulk_endpoints dev: %p\n", dev);
-+
-+	ep = usb_ep_autoconfig(cdev->gadget, in_desc);
-+	if (!ep) {
-+		DBG(cdev, "usb_ep_autoconfig for ep_in failed\n");
-+		return -ENODEV;
-+	}
-+	DBG(cdev, "usb_ep_autoconfig for ep_in got %s\n", ep->name);
-+	dev->ep_in = ep;
-+
-+	ep = usb_ep_autoconfig(cdev->gadget, out_desc);
-+	if (!ep) {
-+		DBG(cdev, "usb_ep_autoconfig for ep_out failed\n");
-+		return -ENODEV;
-+	}
-+	DBG(cdev, "usb_ep_autoconfig for adb ep_out got %s\n", ep->name);
-+	dev->ep_out = ep;
-+
-+	/* now allocate requests for our endpoints */
-+	for (i = 0; i < RX_REQ_MAX; i++) {
-+		req = adb_request_new(dev->ep_out, BULK_BUFFER_SIZE);
-+		if (!req)
-+			goto fail;
-+		req->complete = adb_complete_out;
-+		req_put(dev, &dev->rx_idle, req);
-+	}
-+
-+	for (i = 0; i < TX_REQ_MAX; i++) {
-+		req = adb_request_new(dev->ep_in, BULK_BUFFER_SIZE);
-+		if (!req)
-+			goto fail;
-+		req->complete = adb_complete_in;
-+		req_put(dev, &dev->tx_idle, req);
-+	}
-+
-+	return 0;
-+
-+fail:
-+	printk(KERN_ERR "adb_bind() could not allocate requests\n");
-+	return -1;
-+}
-+
-+static ssize_t adb_read(struct file *fp, char __user *buf,
-+				size_t count, loff_t *pos)
-+{
-+	struct adb_dev *dev = fp->private_data;
-+	struct usb_composite_dev *cdev = dev->cdev;
-+	struct usb_request *req;
-+	int r = count, xfer;
-+	int ret;
-+
-+	DBG(cdev, "adb_read(%d)\n", count);
-+
-+	if (_lock(&dev->read_excl))
-+		return -EBUSY;
-+
-+	/* we will block until we're online */
-+	while (!(dev->online || dev->error)) {
-+		DBG(cdev, "adb_read: waiting for online state\n");
-+		ret = wait_event_interruptible(dev->read_wq,
-+				(dev->online || dev->error));
-+		if (ret < 0) {
-+			_unlock(&dev->read_excl);
-+			return ret;
-+		}
-+	}
-+
-+	while (count > 0) {
-+		if (dev->error) {
-+			DBG(cdev, "adb_read dev->error\n");
-+			r = -EIO;
-+			break;
-+		}
-+
-+		/* if we have idle read requests, get them queued */
-+		while ((req = req_get(dev, &dev->rx_idle))) {
-+requeue_req:
-+			req->length = BULK_BUFFER_SIZE;
-+			ret = usb_ep_queue(dev->ep_out, req, GFP_ATOMIC);
-+
-+			if (ret < 0) {
-+				r = -EIO;
-+				dev->error = 1;
-+				req_put(dev, &dev->rx_idle, req);
-+				goto fail;
-+			} else {
-+				DBG(cdev, "rx %p queue\n", req);
-+			}
-+		}
-+
-+		/* if we have data pending, give it to userspace */
-+		if (dev->read_count > 0) {
-+			if (dev->read_count < count)
-+				xfer = dev->read_count;
-+			else
-+				xfer = count;
-+
-+			if (copy_to_user(buf, dev->read_buf, xfer)) {
-+				r = -EFAULT;
-+				break;
-+			}
-+			dev->read_buf += xfer;
-+			dev->read_count -= xfer;
-+			buf += xfer;
-+			count -= xfer;
-+
-+			/* if we've emptied the buffer, release the request */
-+			if (dev->read_count == 0) {
-+				req_put(dev, &dev->rx_idle, dev->read_req);
-+				dev->read_req = 0;
-+			}
-+			continue;
-+		}
-+
-+		/* wait for a request to complete */
-+		req = 0;
-+		ret = wait_event_interruptible(dev->read_wq,
-+			((req = req_get(dev, &dev->rx_done)) || dev->error));
-+		if (req != 0) {
-+			/* if we got a 0-len one we need to put it back into
-+			** service.  if we made it the current read req we'd
-+			** be stuck forever
-+			*/
-+			if (req->actual == 0)
-+				goto requeue_req;
-+
-+			dev->read_req = req;
-+			dev->read_count = req->actual;
-+			dev->read_buf = req->buf;
-+			DBG(cdev, "rx %p %d\n", req, req->actual);
-+		}
-+
-+		if (ret < 0) {
-+			r = ret;
-+			break;
-+		}
-+	}
-+
-+fail:
-+	_unlock(&dev->read_excl);
-+	DBG(cdev, "adb_read returning %d\n", r);
-+	return r;
-+}
-+
-+static ssize_t adb_write(struct file *fp, const char __user *buf,
-+				 size_t count, loff_t *pos)
-+{
-+	struct adb_dev *dev = fp->private_data;
-+	struct usb_composite_dev *cdev = dev->cdev;
-+	struct usb_request *req = 0;
-+	int r = count, xfer;
-+	int ret;
-+
-+	DBG(cdev, "adb_write(%d)\n", count);
-+
-+	if (_lock(&dev->write_excl))
-+		return -EBUSY;
-+
-+	while (count > 0) {
-+		if (dev->error) {
-+			DBG(cdev, "adb_write dev->error\n");
-+			r = -EIO;
-+			break;
-+		}
-+
-+		/* get an idle tx request to use */
-+		req = 0;
-+		ret = wait_event_interruptible(dev->write_wq,
-+			((req = req_get(dev, &dev->tx_idle)) || dev->error));
-+
-+		if (ret < 0) {
-+			r = ret;
-+			break;
-+		}
-+
-+		if (req != 0) {
-+			if (count > BULK_BUFFER_SIZE)
-+				xfer = BULK_BUFFER_SIZE;
-+			else
-+				xfer = count;
-+			if (copy_from_user(req->buf, buf, xfer)) {
-+				r = -EFAULT;
-+				break;
-+			}
-+
-+			req->length = xfer;
-+			ret = usb_ep_queue(dev->ep_in, req, GFP_ATOMIC);
-+			if (ret < 0) {
-+				DBG(cdev, "adb_write: xfer error %d\n", ret);
-+				dev->error = 1;
-+				r = -EIO;
-+				break;
-+			}
-+
-+			buf += xfer;
-+			count -= xfer;
-+
-+			/* zero this so we don't try to free it on error exit */
-+			req = 0;
-+		}
-+	}
-+
-+	if (req)
-+		req_put(dev, &dev->tx_idle, req);
-+
-+	_unlock(&dev->write_excl);
-+	DBG(cdev, "adb_write returning %d\n", r);
-+	return r;
-+}
-+
-+static int adb_open(struct inode *ip, struct file *fp)
-+{
-+	printk(KERN_INFO "adb_open\n");
-+	if (_lock(&_adb_dev->open_excl))
-+		return -EBUSY;
-+
-+	fp->private_data = _adb_dev;
-+
-+	/* clear the error latch */
-+	_adb_dev->error = 0;
-+
-+	return 0;
-+}
-+
-+static int adb_release(struct inode *ip, struct file *fp)
-+{
-+	printk(KERN_INFO "adb_release\n");
-+	_unlock(&_adb_dev->open_excl);
-+	return 0;
-+}
-+
-+/* file operations for ADB device /dev/android_adb */
-+static struct file_operations adb_fops = {
-+	.owner = THIS_MODULE,
-+	.read = adb_read,
-+	.write = adb_write,
-+	.open = adb_open,
-+	.release = adb_release,
-+};
-+
-+static struct miscdevice adb_device = {
-+	.minor = MISC_DYNAMIC_MINOR,
-+	.name = shortname,
-+	.fops = &adb_fops,
-+};
-+
-+static int __init
-+adb_function_bind(struct usb_configuration *c, struct usb_function *f)
-+{
-+	struct usb_composite_dev *cdev = c->cdev;
-+	struct adb_dev	*dev = func_to_dev(f);
-+	int			id;
-+	int			ret;
-+
-+	dev->cdev = cdev;
-+	DBG(cdev, "adb_function_bind dev: %p\n", dev);
-+
-+	/* allocate interface ID(s) */
-+	id = usb_interface_id(c, f);
-+	if (id < 0)
-+		return id;
-+	adb_interface_desc.bInterfaceNumber = id;
-+
-+	/* allocate endpoints */
-+	ret = create_bulk_endpoints(dev, &adb_fullspeed_in_desc,
-+			&adb_fullspeed_out_desc);
-+	if (ret)
-+		return ret;
-+
-+	/* support high speed hardware */
-+	if (gadget_is_dualspeed(c->cdev->gadget)) {
-+		adb_highspeed_in_desc.bEndpointAddress =
-+			adb_fullspeed_in_desc.bEndpointAddress;
-+		adb_highspeed_out_desc.bEndpointAddress =
-+			adb_fullspeed_out_desc.bEndpointAddress;
-+	}
-+
-+	DBG(cdev, "%s speed %s: IN/%s, OUT/%s\n",
-+			gadget_is_dualspeed(c->cdev->gadget) ? "dual" : "full",
-+			f->name, dev->ep_in->name, dev->ep_out->name);
-+	return 0;
-+}
-+
-+static void
-+adb_function_unbind(struct usb_configuration *c, struct usb_function *f)
-+{
-+	struct adb_dev	*dev = func_to_dev(f);
-+	struct usb_request *req;
-+
-+	spin_lock_irq(&dev->lock);
-+
-+	while ((req = req_get(dev, &dev->rx_idle)))
-+		adb_request_free(req, dev->ep_out);
-+	while ((req = req_get(dev, &dev->tx_idle)))
-+		adb_request_free(req, dev->ep_in);
-+
-+	dev->online = 0;
-+	dev->error = 1;
-+	spin_unlock_irq(&dev->lock);
-+
-+	misc_deregister(&adb_device);
-+	kfree(_adb_dev);
-+	_adb_dev = NULL;
-+}
-+
-+static int adb_function_set_alt(struct usb_function *f,
-+		unsigned intf, unsigned alt)
-+{
-+	struct adb_dev	*dev = func_to_dev(f);
-+	struct usb_composite_dev *cdev = f->config->cdev;
-+	int ret;
-+
-+	DBG(cdev, "adb_function_set_alt intf: %d alt: %d\n", intf, alt);
-+	ret = usb_ep_enable(dev->ep_in,
-+			ep_choose(cdev->gadget,
-+				&adb_highspeed_in_desc,
-+				&adb_fullspeed_in_desc));
-+	if (ret)
-+		return ret;
-+	ret = usb_ep_enable(dev->ep_out,
-+			ep_choose(cdev->gadget,
-+				&adb_highspeed_out_desc,
-+				&adb_fullspeed_out_desc));
-+	if (ret) {
-+		usb_ep_disable(dev->ep_in);
-+		return ret;
-+	}
-+	dev->online = 1;
-+
-+	/* readers may be blocked waiting for us to go online */
-+	wake_up(&dev->read_wq);
-+	return 0;
-+}
-+
-+static void adb_function_disable(struct usb_function *f)
-+{
-+	struct adb_dev	*dev = func_to_dev(f);
-+	struct usb_composite_dev	*cdev = dev->cdev;
-+
-+	DBG(cdev, "adb_function_disable\n");
-+	dev->online = 0;
-+	dev->error = 1;
-+	usb_ep_disable(dev->ep_in);
-+	usb_ep_disable(dev->ep_out);
-+
-+	/* readers may be blocked waiting for us to go online */
-+	wake_up(&dev->read_wq);
-+
-+	VDBG(cdev, "%s disabled\n", dev->function.name);
-+}
-+
-+int __init adb_function_add(struct usb_composite_dev *cdev,
-+	struct usb_configuration *c)
-+{
-+	struct adb_dev *dev;
-+	int ret;
-+
-+	printk(KERN_INFO "adb_function_add\n");
-+
-+	dev = kzalloc(sizeof(*dev), GFP_KERNEL);
-+	if (!dev)
-+		return -ENOMEM;
-+
-+	spin_lock_init(&dev->lock);
-+
-+	init_waitqueue_head(&dev->read_wq);
-+	init_waitqueue_head(&dev->write_wq);
-+
-+	atomic_set(&dev->open_excl, 0);
-+	atomic_set(&dev->read_excl, 0);
-+	atomic_set(&dev->write_excl, 0);
-+
-+	INIT_LIST_HEAD(&dev->rx_idle);
-+	INIT_LIST_HEAD(&dev->rx_done);
-+	INIT_LIST_HEAD(&dev->tx_idle);
-+
-+	dev->cdev = cdev;
-+	dev->function.name = "adb";
-+	dev->function.descriptors = null_adb_descs;
-+	dev->function.hs_descriptors = null_adb_descs;
-+	dev->function.bind = adb_function_bind;
-+	dev->function.unbind = adb_function_unbind;
-+	dev->function.set_alt = adb_function_set_alt;
-+	dev->function.disable = adb_function_disable;
-+
-+	/* _adb_dev must be set before calling usb_gadget_register_driver */
-+	_adb_dev = dev;
-+
-+	ret = misc_register(&adb_device);
-+	if (ret)
-+		goto err1;
-+	ret = usb_add_function(c, &dev->function);
-+	if (ret)
-+		goto err2;
-+
-+	return 0;
-+
-+err2:
-+	misc_deregister(&adb_device);
-+err1:
-+	kfree(dev);
-+	printk(KERN_ERR "adb gadget driver failed to initialize\n");
-+	return ret;
-+}
-+
-+void adb_function_enable(int enable)
-+{
-+	struct adb_dev *dev = _adb_dev;
-+
-+	if (dev) {
-+		DBG(dev->cdev, "adb_function_enable(%s)\n",
-+			enable ? "true" : "false");
-+
-+		if (enable) {
-+			dev->function.descriptors = fs_adb_descs;
-+			dev->function.hs_descriptors = hs_adb_descs;
-+		} else {
-+			dev->function.descriptors = null_adb_descs;
-+			dev->function.hs_descriptors = null_adb_descs;
-+		}
-+	}
-+}
-+
---- /dev/null
-+++ b/drivers/usb/gadget/f_adb.h
-@@ -0,0 +1,25 @@
-+/*
-+ * Gadget Driver for Android ADB
-+ *
-+ * Copyright (C) 2008 Google, Inc.
-+ * Author: Mike Lockwood <lockwood@android.com>
-+ *
-+ * This software is licensed under the terms of the GNU General Public
-+ * License version 2, as published by the Free Software Foundation, and
-+ * may be copied, distributed, and modified under those terms.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ */
-+
-+#ifndef __F_ADB_H
-+#define __F_ADB_H
-+
-+int adb_function_add(struct usb_composite_dev *cdev,
-+	struct usb_configuration *c);
-+void adb_function_enable(int enable);
-+
-+#endif /* __F_ADB_H */
---- /dev/null
-+++ b/drivers/usb/gadget/f_mass_storage.c
-@@ -0,0 +1,2906 @@
-+/*
-+ * drivers/usb/gadget/f_mass_storage.c
-+ *
-+ * Function Driver for USB Mass Storage
-+ *
-+ * Copyright (C) 2008 Google, Inc.
-+ * Author: Mike Lockwood <lockwood@android.com>
-+ *
-+ * Based heavily on the file_storage gadget driver in
-+ * drivers/usb/gadget/file_storage.c and licensed under the same terms:
-+ *
-+ * Copyright (C) 2003-2007 Alan Stern
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions, and the following disclaimer,
-+ *    without modification.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. The names of the above-listed copyright holders may not be used
-+ *    to endorse or promote products derived from this software without
-+ *    specific prior written permission.
-+ *
-+ * ALTERNATIVELY, this software may be distributed under the terms of the
-+ * GNU General Public License ("GPL") as published by the Free Software
-+ * Foundation, either version 2 of that License or (at your option) any
-+ * later version.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+/* #define DEBUG */
-+/* #define VERBOSE_DEBUG */
-+/* #define DUMP_MSGS */
-+
-+
-+#include <linux/blkdev.h>
-+#include <linux/completion.h>
-+#include <linux/dcache.h>
-+#include <linux/delay.h>
-+#include <linux/device.h>
-+#include <linux/fcntl.h>
-+#include <linux/file.h>
-+#include <linux/fs.h>
-+#include <linux/kref.h>
-+#include <linux/kthread.h>
-+#include <linux/limits.h>
-+#include <linux/rwsem.h>
-+#include <linux/slab.h>
-+#include <linux/spinlock.h>
-+#include <linux/string.h>
-+#include <linux/switch.h>
-+#include <linux/freezer.h>
-+#include <linux/utsname.h>
-+#include <linux/wakelock.h>
-+
-+#include <linux/usb_usual.h>
-+#include <linux/usb/ch9.h>
-+#include <linux/usb/composite.h>
-+#include <linux/usb/gadget.h>
-+
-+#include "f_mass_storage.h"
-+#include "gadget_chips.h"
-+
-+
-+#define BULK_BUFFER_SIZE           4096
-+
-+/*-------------------------------------------------------------------------*/
-+
-+#define DRIVER_NAME		"usb_mass_storage"
-+#define MAX_LUNS		8
-+
-+static const char shortname[] = DRIVER_NAME;
-+
-+#ifdef DEBUG
-+#define LDBG(lun, fmt, args...) \
-+	dev_dbg(&(lun)->dev , fmt , ## args)
-+#define MDBG(fmt,args...) \
-+	printk(KERN_DEBUG DRIVER_NAME ": " fmt , ## args)
-+#else
-+#define LDBG(lun, fmt, args...) \
-+	do { } while (0)
-+#define MDBG(fmt,args...) \
-+	do { } while (0)
-+#undef VERBOSE_DEBUG
-+#undef DUMP_MSGS
-+#endif /* DEBUG */
-+
-+#ifdef VERBOSE_DEBUG
-+#define VLDBG	LDBG
-+#else
-+#define VLDBG(lun, fmt, args...) \
-+	do { } while (0)
-+#endif /* VERBOSE_DEBUG */
-+
-+#define LERROR(lun, fmt, args...) \
-+	dev_err(&(lun)->dev , fmt , ## args)
-+#define LWARN(lun, fmt, args...) \
-+	dev_warn(&(lun)->dev , fmt , ## args)
-+#define LINFO(lun, fmt, args...) \
-+	dev_info(&(lun)->dev , fmt , ## args)
-+
-+#define MINFO(fmt,args...) \
-+	printk(KERN_INFO DRIVER_NAME ": " fmt , ## args)
-+
-+#undef DBG
-+#undef VDBG
-+#undef ERROR
-+#undef WARNING
-+#undef INFO
-+#define DBG(d, fmt, args...) \
-+	dev_dbg(&(d)->cdev->gadget->dev , fmt , ## args)
-+#define VDBG(d, fmt, args...) \
-+	dev_vdbg(&(d)->cdev->gadget->dev , fmt , ## args)
-+#define ERROR(d, fmt, args...) \
-+	dev_err(&(d)->cdev->gadget->dev , fmt , ## args)
-+#define WARNING(d, fmt, args...) \
-+	dev_warn(&(d)->cdev->gadget->dev , fmt , ## args)
-+#define INFO(d, fmt, args...) \
-+	dev_info(&(d)->cdev->gadget->dev , fmt , ## args)
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/* Bulk-only data structures */
-+
-+/* Command Block Wrapper */
-+struct bulk_cb_wrap {
-+	__le32	Signature;		/* Contains 'USBC' */
-+	u32	Tag;			/* Unique per command id */
-+	__le32	DataTransferLength;	/* Size of the data */
-+	u8	Flags;			/* Direction in bit 7 */
-+	u8	Lun;			/* LUN (normally 0) */
-+	u8	Length;			/* Of the CDB, <= MAX_COMMAND_SIZE */
-+	u8	CDB[16];		/* Command Data Block */
-+};
-+
-+#define USB_BULK_CB_WRAP_LEN	31
-+#define USB_BULK_CB_SIG		0x43425355	/* Spells out USBC */
-+#define USB_BULK_IN_FLAG	0x80
-+
-+/* Command Status Wrapper */
-+struct bulk_cs_wrap {
-+	__le32	Signature;		/* Should = 'USBS' */
-+	u32	Tag;			/* Same as original command */
-+	__le32	Residue;		/* Amount not transferred */
-+	u8	Status;			/* See below */
-+};
-+
-+#define USB_BULK_CS_WRAP_LEN	13
-+#define USB_BULK_CS_SIG		0x53425355	/* Spells out 'USBS' */
-+#define USB_STATUS_PASS		0
-+#define USB_STATUS_FAIL		1
-+#define USB_STATUS_PHASE_ERROR	2
-+
-+/* Bulk-only class specific requests */
-+#define USB_BULK_RESET_REQUEST		0xff
-+#define USB_BULK_GET_MAX_LUN_REQUEST	0xfe
-+
-+/* Length of a SCSI Command Data Block */
-+#define MAX_COMMAND_SIZE	16
-+
-+/* SCSI commands that we recognize */
-+#define SC_FORMAT_UNIT			0x04
-+#define SC_INQUIRY			0x12
-+#define SC_MODE_SELECT_6		0x15
-+#define SC_MODE_SELECT_10		0x55
-+#define SC_MODE_SENSE_6			0x1a
-+#define SC_MODE_SENSE_10		0x5a
-+#define SC_PREVENT_ALLOW_MEDIUM_REMOVAL	0x1e
-+#define SC_READ_6			0x08
-+#define SC_READ_10			0x28
-+#define SC_READ_12			0xa8
-+#define SC_READ_CAPACITY		0x25
-+#define SC_READ_FORMAT_CAPACITIES	0x23
-+#define SC_RELEASE			0x17
-+#define SC_REQUEST_SENSE		0x03
-+#define SC_RESERVE			0x16
-+#define SC_SEND_DIAGNOSTIC		0x1d
-+#define SC_START_STOP_UNIT		0x1b
-+#define SC_SYNCHRONIZE_CACHE		0x35
-+#define SC_TEST_UNIT_READY		0x00
-+#define SC_VERIFY			0x2f
-+#define SC_WRITE_6			0x0a
-+#define SC_WRITE_10			0x2a
-+#define SC_WRITE_12			0xaa
-+
-+/* SCSI Sense Key/Additional Sense Code/ASC Qualifier values */
-+#define SS_NO_SENSE				0
-+#define SS_COMMUNICATION_FAILURE		0x040800
-+#define SS_INVALID_COMMAND			0x052000
-+#define SS_INVALID_FIELD_IN_CDB			0x052400
-+#define SS_LOGICAL_BLOCK_ADDRESS_OUT_OF_RANGE	0x052100
-+#define SS_LOGICAL_UNIT_NOT_SUPPORTED		0x052500
-+#define SS_MEDIUM_NOT_PRESENT			0x023a00
-+#define SS_MEDIUM_REMOVAL_PREVENTED		0x055302
-+#define SS_NOT_READY_TO_READY_TRANSITION	0x062800
-+#define SS_RESET_OCCURRED			0x062900
-+#define SS_SAVING_PARAMETERS_NOT_SUPPORTED	0x053900
-+#define SS_UNRECOVERED_READ_ERROR		0x031100
-+#define SS_WRITE_ERROR				0x030c02
-+#define SS_WRITE_PROTECTED			0x072700
-+
-+#define SK(x)		((u8) ((x) >> 16))	/* Sense Key byte, etc. */
-+#define ASC(x)		((u8) ((x) >> 8))
-+#define ASCQ(x)		((u8) (x))
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+struct lun {
-+	struct file	*filp;
-+	loff_t		file_length;
-+	loff_t		num_sectors;
-+
-+	unsigned int	ro : 1;
-+	unsigned int	prevent_medium_removal : 1;
-+	unsigned int	registered : 1;
-+	unsigned int	info_valid : 1;
-+
-+	u32		sense_data;
-+	u32		sense_data_info;
-+	u32		unit_attention_data;
-+
-+	struct device	dev;
-+};
-+
-+#define backing_file_is_open(curlun)	((curlun)->filp != NULL)
-+
-+
-+static struct lun *dev_to_lun(struct device *dev)
-+{
-+	return container_of(dev, struct lun, dev);
-+}
-+
-+/* Big enough to hold our biggest descriptor */
-+#define EP0_BUFSIZE	256
-+#define DELAYED_STATUS	(EP0_BUFSIZE + 999)	/* An impossibly large value */
-+
-+/* Number of buffers we will use.  2 is enough for double-buffering */
-+#define NUM_BUFFERS	2
-+
-+enum fsg_buffer_state {
-+	BUF_STATE_EMPTY = 0,
-+	BUF_STATE_FULL,
-+	BUF_STATE_BUSY
-+};
-+
-+struct fsg_buffhd {
-+	void				*buf;
-+	enum fsg_buffer_state		state;
-+	struct fsg_buffhd		*next;
-+
-+	/* The NetChip 2280 is faster, and handles some protocol faults
-+	 * better, if we don't submit any short bulk-out read requests.
-+	 * So we will record the intended request length here. */
-+	unsigned int			bulk_out_intended_length;
-+
-+	struct usb_request		*inreq;
-+	int				inreq_busy;
-+	struct usb_request		*outreq;
-+	int				outreq_busy;
-+};
-+
-+enum fsg_state {
-+	/* This one isn't used anywhere */
-+	FSG_STATE_COMMAND_PHASE = -10,
-+
-+	FSG_STATE_DATA_PHASE,
-+	FSG_STATE_STATUS_PHASE,
-+
-+	FSG_STATE_IDLE = 0,
-+	FSG_STATE_ABORT_BULK_OUT,
-+	FSG_STATE_RESET,
-+	FSG_STATE_CONFIG_CHANGE,
-+	FSG_STATE_EXIT,
-+	FSG_STATE_TERMINATED
-+};
-+
-+enum data_direction {
-+	DATA_DIR_UNKNOWN = 0,
-+	DATA_DIR_FROM_HOST,
-+	DATA_DIR_TO_HOST,
-+	DATA_DIR_NONE
-+};
-+
-+struct fsg_dev {
-+	struct usb_function function;
-+	struct usb_composite_dev *cdev;
-+
-+	/* lock protects: state and all the req_busy's */
-+	spinlock_t		lock;
-+
-+	/* filesem protects: backing files in use */
-+	struct rw_semaphore	filesem;
-+
-+	/* reference counting: wait until all LUNs are released */
-+	struct kref		ref;
-+
-+	unsigned int		bulk_out_maxpacket;
-+	enum fsg_state		state;		/* For exception handling */
-+
-+	u8			config, new_config;
-+
-+	unsigned int		running : 1;
-+	unsigned int		bulk_in_enabled : 1;
-+	unsigned int		bulk_out_enabled : 1;
-+	unsigned int		phase_error : 1;
-+	unsigned int		short_packet_received : 1;
-+	unsigned int		bad_lun_okay : 1;
-+
-+	unsigned long		atomic_bitflags;
-+#define REGISTERED		0
-+#define CLEAR_BULK_HALTS	1
-+#define SUSPENDED		2
-+
-+	struct usb_ep		*bulk_in;
-+	struct usb_ep		*bulk_out;
-+
-+	struct fsg_buffhd	*next_buffhd_to_fill;
-+	struct fsg_buffhd	*next_buffhd_to_drain;
-+	struct fsg_buffhd	buffhds[NUM_BUFFERS];
-+
-+	int			thread_wakeup_needed;
-+	struct completion	thread_notifier;
-+	struct task_struct	*thread_task;
-+
-+	int			cmnd_size;
-+	u8			cmnd[MAX_COMMAND_SIZE];
-+	enum data_direction	data_dir;
-+	u32			data_size;
-+	u32			data_size_from_cmnd;
-+	u32			tag;
-+	unsigned int		lun;
-+	u32			residue;
-+	u32			usb_amount_left;
-+
-+	unsigned int		nluns;
-+	struct lun		*luns;
-+	struct lun		*curlun;
-+
-+	u32				buf_size;
-+	const char		*vendor;
-+	const char		*product;
-+	int				release;
-+
-+	struct switch_dev sdev;
-+
-+	struct wake_lock wake_lock;
-+};
-+
-+static inline struct fsg_dev *func_to_dev(struct usb_function *f)
-+{
-+	return container_of(f, struct fsg_dev, function);
-+}
-+
-+static int exception_in_progress(struct fsg_dev *fsg)
-+{
-+	return (fsg->state > FSG_STATE_IDLE);
-+}
-+
-+/* Make bulk-out requests be divisible by the maxpacket size */
-+static void set_bulk_out_req_length(struct fsg_dev *fsg,
-+		struct fsg_buffhd *bh, unsigned int length)
-+{
-+	unsigned int	rem;
-+
-+	bh->bulk_out_intended_length = length;
-+	rem = length % fsg->bulk_out_maxpacket;
-+	if (rem > 0)
-+		length += fsg->bulk_out_maxpacket - rem;
-+	bh->outreq->length = length;
-+}
-+
-+static struct fsg_dev			*the_fsg;
-+
-+static void	close_backing_file(struct fsg_dev *fsg, struct lun *curlun);
-+static void	close_all_backing_files(struct fsg_dev *fsg);
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+#ifdef DUMP_MSGS
-+
-+static void dump_msg(struct fsg_dev *fsg, const char *label,
-+		const u8 *buf, unsigned int length)
-+{
-+	if (length < 512) {
-+		DBG(fsg, "%s, length %u:\n", label, length);
-+		print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET,
-+				16, 1, buf, length, 0);
-+	}
-+}
-+
-+static void dump_cdb(struct fsg_dev *fsg)
-+{}
-+
-+#else
-+
-+static void dump_msg(struct fsg_dev *fsg, const char *label,
-+		const u8 *buf, unsigned int length)
-+{}
-+
-+#ifdef VERBOSE_DEBUG
-+
-+static void dump_cdb(struct fsg_dev *fsg)
-+{
-+	print_hex_dump(KERN_DEBUG, "SCSI CDB: ", DUMP_PREFIX_NONE,
-+			16, 1, fsg->cmnd, fsg->cmnd_size, 0);
-+}
-+
-+#else
-+
-+static void dump_cdb(struct fsg_dev *fsg)
-+{}
-+
-+#endif /* VERBOSE_DEBUG */
-+#endif /* DUMP_MSGS */
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/* Routines for unaligned data access */
-+
-+static u16 get_be16(u8 *buf)
-+{
-+	return ((u16) buf[0] << 8) | ((u16) buf[1]);
-+}
-+
-+static u32 get_be32(u8 *buf)
-+{
-+	return ((u32) buf[0] << 24) | ((u32) buf[1] << 16) |
-+			((u32) buf[2] << 8) | ((u32) buf[3]);
-+}
-+
-+static void put_be16(u8 *buf, u16 val)
-+{
-+	buf[0] = val >> 8;
-+	buf[1] = val;
-+}
-+
-+static void put_be32(u8 *buf, u32 val)
-+{
-+	buf[0] = val >> 24;
-+	buf[1] = val >> 16;
-+	buf[2] = val >> 8;
-+	buf[3] = val & 0xff;
-+}
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/*
-+ * DESCRIPTORS ... most are static, but strings and (full) configuration
-+ * descriptors are built on demand.  Also the (static) config and interface
-+ * descriptors are adjusted during fsg_bind().
-+ */
-+
-+/* There is only one interface. */
-+
-+static struct usb_interface_descriptor
-+intf_desc = {
-+	.bLength =		sizeof intf_desc,
-+	.bDescriptorType =	USB_DT_INTERFACE,
-+
-+	.bNumEndpoints =	2,		/* Adjusted during fsg_bind() */
-+	.bInterfaceClass =	USB_CLASS_MASS_STORAGE,
-+	.bInterfaceSubClass =	US_SC_SCSI,
-+	.bInterfaceProtocol =	US_PR_BULK,
-+};
-+
-+/* Three full-speed endpoint descriptors: bulk-in, bulk-out,
-+ * and interrupt-in. */
-+
-+static struct usb_endpoint_descriptor
-+fs_bulk_in_desc = {
-+	.bLength =		USB_DT_ENDPOINT_SIZE,
-+	.bDescriptorType =	USB_DT_ENDPOINT,
-+
-+	.bEndpointAddress =	USB_DIR_IN,
-+	.bmAttributes =		USB_ENDPOINT_XFER_BULK,
-+	/* wMaxPacketSize set by autoconfiguration */
-+};
-+
-+static struct usb_endpoint_descriptor
-+fs_bulk_out_desc = {
-+	.bLength =		USB_DT_ENDPOINT_SIZE,
-+	.bDescriptorType =	USB_DT_ENDPOINT,
-+
-+	.bEndpointAddress =	USB_DIR_OUT,
-+	.bmAttributes =		USB_ENDPOINT_XFER_BULK,
-+	/* wMaxPacketSize set by autoconfiguration */
-+};
-+
-+static struct usb_descriptor_header *fs_function[] = {
-+	(struct usb_descriptor_header *) &intf_desc,
-+	(struct usb_descriptor_header *) &fs_bulk_in_desc,
-+	(struct usb_descriptor_header *) &fs_bulk_out_desc,
-+	NULL,
-+};
-+#define FS_FUNCTION_PRE_EP_ENTRIES	2
-+
-+
-+static struct usb_endpoint_descriptor
-+hs_bulk_in_desc = {
-+	.bLength =		USB_DT_ENDPOINT_SIZE,
-+	.bDescriptorType =	USB_DT_ENDPOINT,
-+
-+	/* bEndpointAddress copied from fs_bulk_in_desc during fsg_bind() */
-+	.bmAttributes =		USB_ENDPOINT_XFER_BULK,
-+	.wMaxPacketSize =	__constant_cpu_to_le16(512),
-+};
-+
-+static struct usb_endpoint_descriptor
-+hs_bulk_out_desc = {
-+	.bLength =		USB_DT_ENDPOINT_SIZE,
-+	.bDescriptorType =	USB_DT_ENDPOINT,
-+
-+	/* bEndpointAddress copied from fs_bulk_out_desc during fsg_bind() */
-+	.bmAttributes =		USB_ENDPOINT_XFER_BULK,
-+	.wMaxPacketSize =	__constant_cpu_to_le16(512),
-+	.bInterval =		1,	/* NAK every 1 uframe */
-+};
-+
-+
-+static struct usb_descriptor_header *hs_function[] = {
-+	(struct usb_descriptor_header *) &intf_desc,
-+	(struct usb_descriptor_header *) &hs_bulk_in_desc,
-+	(struct usb_descriptor_header *) &hs_bulk_out_desc,
-+	NULL,
-+};
-+
-+/* Maxpacket and other transfer characteristics vary by speed. */
-+static struct usb_endpoint_descriptor *
-+ep_desc(struct usb_gadget *g, struct usb_endpoint_descriptor *fs,
-+		struct usb_endpoint_descriptor *hs)
-+{
-+	if (gadget_is_dualspeed(g) && g->speed == USB_SPEED_HIGH)
-+		return hs;
-+	return fs;
-+}
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/* These routines may be called in process context or in_irq */
-+
-+/* Caller must hold fsg->lock */
-+static void wakeup_thread(struct fsg_dev *fsg)
-+{
-+	/* Tell the main thread that something has happened */
-+	fsg->thread_wakeup_needed = 1;
-+	if (fsg->thread_task)
-+		wake_up_process(fsg->thread_task);
-+}
-+
-+
-+static void raise_exception(struct fsg_dev *fsg, enum fsg_state new_state)
-+{
-+	unsigned long		flags;
-+
-+	DBG(fsg, "raise_exception %d\n", (int)new_state);
-+	/* Do nothing if a higher-priority exception is already in progress.
-+	 * If a lower-or-equal priority exception is in progress, preempt it
-+	 * and notify the main thread by sending it a signal. */
-+	spin_lock_irqsave(&fsg->lock, flags);
-+	if (fsg->state <= new_state) {
-+		fsg->state = new_state;
-+		if (fsg->thread_task)
-+			send_sig_info(SIGUSR1, SEND_SIG_FORCED,
-+					fsg->thread_task);
-+	}
-+	spin_unlock_irqrestore(&fsg->lock, flags);
-+}
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/* Bulk and interrupt endpoint completion handlers.
-+ * These always run in_irq. */
-+
-+static void bulk_in_complete(struct usb_ep *ep, struct usb_request *req)
-+{
-+	struct fsg_dev		*fsg = ep->driver_data;
-+	struct fsg_buffhd	*bh = req->context;
-+
-+	if (req->status || req->actual != req->length)
-+		DBG(fsg, "%s --> %d, %u/%u\n", __func__,
-+				req->status, req->actual, req->length);
-+
-+	/* Hold the lock while we update the request and buffer states */
-+	smp_wmb();
-+	spin_lock(&fsg->lock);
-+	bh->inreq_busy = 0;
-+	bh->state = BUF_STATE_EMPTY;
-+	wakeup_thread(fsg);
-+	spin_unlock(&fsg->lock);
-+}
-+
-+static void bulk_out_complete(struct usb_ep *ep, struct usb_request *req)
-+{
-+	struct fsg_dev		*fsg = ep->driver_data;
-+	struct fsg_buffhd	*bh = req->context;
-+
-+	dump_msg(fsg, "bulk-out", req->buf, req->actual);
-+	if (req->status || req->actual != bh->bulk_out_intended_length)
-+		DBG(fsg, "%s --> %d, %u/%u\n", __func__,
-+				req->status, req->actual,
-+				bh->bulk_out_intended_length);
-+
-+	/* Hold the lock while we update the request and buffer states */
-+	smp_wmb();
-+	spin_lock(&fsg->lock);
-+	bh->outreq_busy = 0;
-+	bh->state = BUF_STATE_FULL;
-+	wakeup_thread(fsg);
-+	spin_unlock(&fsg->lock);
-+}
-+
-+static int fsg_function_setup(struct usb_function *f,
-+					const struct usb_ctrlrequest *ctrl)
-+{
-+	struct fsg_dev	*fsg = func_to_dev(f);
-+	struct usb_composite_dev *cdev = fsg->cdev;
-+	int			value = -EOPNOTSUPP;
-+	u16			w_index = le16_to_cpu(ctrl->wIndex);
-+	u16			w_value = le16_to_cpu(ctrl->wValue);
-+	u16			w_length = le16_to_cpu(ctrl->wLength);
-+
-+	DBG(fsg, "fsg_function_setup\n");
-+	/* Handle Bulk-only class-specific requests */
-+	if ((ctrl->bRequestType & USB_TYPE_MASK) == USB_TYPE_CLASS) {
-+	DBG(fsg, "USB_TYPE_CLASS\n");
-+		switch (ctrl->bRequest) {
-+		case USB_BULK_RESET_REQUEST:
-+			if (ctrl->bRequestType != (USB_DIR_OUT |
-+					USB_TYPE_CLASS | USB_RECIP_INTERFACE))
-+				break;
-+			if (w_index != 0 || w_value != 0) {
-+				value = -EDOM;
-+				break;
-+			}
-+
-+			/* Raise an exception to stop the current operation
-+			 * and reinitialize our state. */
-+			DBG(fsg, "bulk reset request\n");
-+			raise_exception(fsg, FSG_STATE_RESET);
-+			value = DELAYED_STATUS;
-+			break;
-+
-+		case USB_BULK_GET_MAX_LUN_REQUEST:
-+			if (ctrl->bRequestType != (USB_DIR_IN |
-+					USB_TYPE_CLASS | USB_RECIP_INTERFACE))
-+				break;
-+			if (w_index != 0 || w_value != 0) {
-+				value = -EDOM;
-+				break;
-+			}
-+			VDBG(fsg, "get max LUN\n");
-+			*(u8 *)cdev->req->buf = fsg->nluns - 1;
-+			value = 1;
-+			break;
-+		}
-+	}
-+
-+	if (value == -EOPNOTSUPP)
-+		VDBG(fsg,
-+			"unknown class-specific control req "
-+			"%02x.%02x v%04x i%04x l%u\n",
-+			ctrl->bRequestType, ctrl->bRequest,
-+			le16_to_cpu(ctrl->wValue), w_index, w_length);
-+	return value;
-+}
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/* All the following routines run in process context */
-+
-+
-+/* Use this for bulk or interrupt transfers, not ep0 */
-+static void start_transfer(struct fsg_dev *fsg, struct usb_ep *ep,
-+		struct usb_request *req, int *pbusy,
-+		enum fsg_buffer_state *state)
-+{
-+	int	rc;
-+
-+	DBG(fsg, "start_transfer req: %p, req->buf: %p\n", req, req->buf);
-+	if (ep == fsg->bulk_in)
-+		dump_msg(fsg, "bulk-in", req->buf, req->length);
-+
-+	spin_lock_irq(&fsg->lock);
-+	*pbusy = 1;
-+	*state = BUF_STATE_BUSY;
-+	spin_unlock_irq(&fsg->lock);
-+	rc = usb_ep_queue(ep, req, GFP_KERNEL);
-+	if (rc != 0) {
-+		*pbusy = 0;
-+		*state = BUF_STATE_EMPTY;
-+
-+		/* We can't do much more than wait for a reset */
-+
-+		/* Note: currently the net2280 driver fails zero-length
-+		 * submissions if DMA is enabled. */
-+		if (rc != -ESHUTDOWN && !(rc == -EOPNOTSUPP &&
-+						req->length == 0))
-+			WARN(fsg, "error in submission: %s --> %d\n",
-+				(ep == fsg->bulk_in ? "bulk-in" : "bulk-out"),
-+				rc);
-+	}
-+}
-+
-+
-+static int sleep_thread(struct fsg_dev *fsg)
-+{
-+	int	rc = 0;
-+
-+	/* Wait until a signal arrives or we are woken up */
-+	for (;;) {
-+		try_to_freeze();
-+		set_current_state(TASK_INTERRUPTIBLE);
-+		if (signal_pending(current)) {
-+			rc = -EINTR;
-+			break;
-+		}
-+		if (fsg->thread_wakeup_needed)
-+			break;
-+		schedule();
-+	}
-+	__set_current_state(TASK_RUNNING);
-+	fsg->thread_wakeup_needed = 0;
-+	return rc;
-+}
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static int do_read(struct fsg_dev *fsg)
-+{
-+	struct lun		*curlun = fsg->curlun;
-+	u32			lba;
-+	struct fsg_buffhd	*bh;
-+	int			rc;
-+	u32			amount_left;
-+	loff_t			file_offset, file_offset_tmp;
-+	unsigned int		amount;
-+	unsigned int		partial_page;
-+	ssize_t			nread;
-+
-+	/* Get the starting Logical Block Address and check that it's
-+	 * not too big */
-+	if (fsg->cmnd[0] == SC_READ_6)
-+		lba = (fsg->cmnd[1] << 16) | get_be16(&fsg->cmnd[2]);
-+	else {
-+		lba = get_be32(&fsg->cmnd[2]);
-+
-+		/* We allow DPO (Disable Page Out = don't save data in the
-+		 * cache) and FUA (Force Unit Access = don't read from the
-+		 * cache), but we don't implement them. */
-+		if ((fsg->cmnd[1] & ~0x18) != 0) {
-+			curlun->sense_data = SS_INVALID_FIELD_IN_CDB;
-+			return -EINVAL;
-+		}
-+	}
-+	if (lba >= curlun->num_sectors) {
-+		curlun->sense_data = SS_LOGICAL_BLOCK_ADDRESS_OUT_OF_RANGE;
-+		return -EINVAL;
-+	}
-+	file_offset = ((loff_t) lba) << 9;
-+
-+	/* Carry out the file reads */
-+	amount_left = fsg->data_size_from_cmnd;
-+	if (unlikely(amount_left == 0))
-+		return -EIO;		/* No default reply */
-+
-+	for (;;) {
-+
-+		/* Figure out how much we need to read:
-+		 * Try to read the remaining amount.
-+		 * But don't read more than the buffer size.
-+		 * And don't try to read past the end of the file.
-+		 * Finally, if we're not at a page boundary, don't read past
-+		 *	the next page.
-+		 * If this means reading 0 then we were asked to read past
-+		 *	the end of file. */
-+		amount = min((unsigned int) amount_left,
-+				(unsigned int)fsg->buf_size);
-+		amount = min((loff_t) amount,
-+				curlun->file_length - file_offset);
-+		partial_page = file_offset & (PAGE_CACHE_SIZE - 1);
-+		if (partial_page > 0)
-+			amount = min(amount, (unsigned int) PAGE_CACHE_SIZE -
-+					partial_page);
-+
-+		/* Wait for the next buffer to become available */
-+		bh = fsg->next_buffhd_to_fill;
-+		while (bh->state != BUF_STATE_EMPTY) {
-+			rc = sleep_thread(fsg);
-+			if (rc)
-+				return rc;
-+		}
-+
-+		/* If we were asked to read past the end of file,
-+		 * end with an empty buffer. */
-+		if (amount == 0) {
-+			curlun->sense_data =
-+					SS_LOGICAL_BLOCK_ADDRESS_OUT_OF_RANGE;
-+			curlun->sense_data_info = file_offset >> 9;
-+			curlun->info_valid = 1;
-+			bh->inreq->length = 0;
-+			bh->state = BUF_STATE_FULL;
-+			break;
-+		}
-+
-+		/* Perform the read */
-+		file_offset_tmp = file_offset;
-+		nread = vfs_read(curlun->filp,
-+				(char __user *) bh->buf,
-+				amount, &file_offset_tmp);
-+		VLDBG(curlun, "file read %u @ %llu -> %d\n", amount,
-+				(unsigned long long) file_offset,
-+				(int) nread);
-+		if (signal_pending(current))
-+			return -EINTR;
-+
-+		if (nread < 0) {
-+			LDBG(curlun, "error in file read: %d\n",
-+					(int) nread);
-+			nread = 0;
-+		} else if (nread < amount) {
-+			LDBG(curlun, "partial file read: %d/%u\n",
-+					(int) nread, amount);
-+			nread -= (nread & 511);	/* Round down to a block */
-+		}
-+		file_offset  += nread;
-+		amount_left  -= nread;
-+		fsg->residue -= nread;
-+		bh->inreq->length = nread;
-+		bh->state = BUF_STATE_FULL;
-+
-+		/* If an error occurred, report it and its position */
-+		if (nread < amount) {
-+			curlun->sense_data = SS_UNRECOVERED_READ_ERROR;
-+			curlun->sense_data_info = file_offset >> 9;
-+			curlun->info_valid = 1;
-+			break;
-+		}
-+
-+		if (amount_left == 0)
-+			break;		/* No more left to read */
-+
-+		/* Send this buffer and go read some more */
-+		start_transfer(fsg, fsg->bulk_in, bh->inreq,
-+				&bh->inreq_busy, &bh->state);
-+		fsg->next_buffhd_to_fill = bh->next;
-+	}
-+
-+	return -EIO;		/* No default reply */
-+}
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static int do_write(struct fsg_dev *fsg)
-+{
-+	struct lun		*curlun = fsg->curlun;
-+	u32			lba;
-+	struct fsg_buffhd	*bh;
-+	int			get_some_more;
-+	u32			amount_left_to_req, amount_left_to_write;
-+	loff_t			usb_offset, file_offset, file_offset_tmp;
-+	unsigned int		amount;
-+	unsigned int		partial_page;
-+	ssize_t			nwritten;
-+	int			rc;
-+
-+	if (curlun->ro) {
-+		curlun->sense_data = SS_WRITE_PROTECTED;
-+		return -EINVAL;
-+	}
-+	curlun->filp->f_flags &= ~O_SYNC;	/* Default is not to wait */
-+
-+	/* Get the starting Logical Block Address and check that it's
-+	 * not too big */
-+	if (fsg->cmnd[0] == SC_WRITE_6)
-+		lba = (fsg->cmnd[1] << 16) | get_be16(&fsg->cmnd[2]);
-+	else {
-+		lba = get_be32(&fsg->cmnd[2]);
-+
-+		/* We allow DPO (Disable Page Out = don't save data in the
-+		 * cache) and FUA (Force Unit Access = write directly to the
-+		 * medium).  We don't implement DPO; we implement FUA by
-+		 * performing synchronous output. */
-+		if ((fsg->cmnd[1] & ~0x18) != 0) {
-+			curlun->sense_data = SS_INVALID_FIELD_IN_CDB;
-+			return -EINVAL;
-+		}
-+		if (fsg->cmnd[1] & 0x08)	/* FUA */
-+			curlun->filp->f_flags |= O_SYNC;
-+	}
-+	if (lba >= curlun->num_sectors) {
-+		curlun->sense_data = SS_LOGICAL_BLOCK_ADDRESS_OUT_OF_RANGE;
-+		return -EINVAL;
-+	}
-+
-+	/* Carry out the file writes */
-+	get_some_more = 1;
-+	file_offset = usb_offset = ((loff_t) lba) << 9;
-+	amount_left_to_req = amount_left_to_write = fsg->data_size_from_cmnd;
-+
-+	while (amount_left_to_write > 0) {
-+
-+		/* Queue a request for more data from the host */
-+		bh = fsg->next_buffhd_to_fill;
-+		if (bh->state == BUF_STATE_EMPTY && get_some_more) {
-+
-+			/* Figure out how much we want to get:
-+			 * Try to get the remaining amount.
-+			 * But don't get more than the buffer size.
-+			 * And don't try to go past the end of the file.
-+			 * If we're not at a page boundary,
-+			 *	don't go past the next page.
-+			 * If this means getting 0, then we were asked
-+			 *	to write past the end of file.
-+			 * Finally, round down to a block boundary. */
-+			amount = min(amount_left_to_req, (u32)fsg->buf_size);
-+			amount = min((loff_t) amount, curlun->file_length -
-+					usb_offset);
-+			partial_page = usb_offset & (PAGE_CACHE_SIZE - 1);
-+			if (partial_page > 0)
-+				amount = min(amount,
-+	(unsigned int) PAGE_CACHE_SIZE - partial_page);
-+
-+			if (amount == 0) {
-+				get_some_more = 0;
-+				curlun->sense_data =
-+					SS_LOGICAL_BLOCK_ADDRESS_OUT_OF_RANGE;
-+				curlun->sense_data_info = usb_offset >> 9;
-+				curlun->info_valid = 1;
-+				continue;
-+			}
-+			amount -= (amount & 511);
-+			if (amount == 0) {
-+
-+				/* Why were we were asked to transfer a
-+				 * partial block? */
-+				get_some_more = 0;
-+				continue;
-+			}
-+
-+			/* Get the next buffer */
-+			usb_offset += amount;
-+			fsg->usb_amount_left -= amount;
-+			amount_left_to_req -= amount;
-+			if (amount_left_to_req == 0)
-+				get_some_more = 0;
-+
-+			/* amount is always divisible by 512, hence by
-+			 * the bulk-out maxpacket size */
-+			bh->outreq->length = bh->bulk_out_intended_length =
-+					amount;
-+			start_transfer(fsg, fsg->bulk_out, bh->outreq,
-+					&bh->outreq_busy, &bh->state);
-+			fsg->next_buffhd_to_fill = bh->next;
-+			continue;
-+		}
-+
-+		/* Write the received data to the backing file */
-+		bh = fsg->next_buffhd_to_drain;
-+		if (bh->state == BUF_STATE_EMPTY && !get_some_more)
-+			break;			/* We stopped early */
-+		if (bh->state == BUF_STATE_FULL) {
-+			smp_rmb();
-+			fsg->next_buffhd_to_drain = bh->next;
-+			bh->state = BUF_STATE_EMPTY;
-+
-+			/* Did something go wrong with the transfer? */
-+			if (bh->outreq->status != 0) {
-+				curlun->sense_data = SS_COMMUNICATION_FAILURE;
-+				curlun->sense_data_info = file_offset >> 9;
-+				curlun->info_valid = 1;
-+				break;
-+			}
-+
-+			amount = bh->outreq->actual;
-+			if (curlun->file_length - file_offset < amount) {
-+				LERROR(curlun,
-+	"write %u @ %llu beyond end %llu\n",
-+	amount, (unsigned long long) file_offset,
-+	(unsigned long long) curlun->file_length);
-+				amount = curlun->file_length - file_offset;
-+			}
-+
-+			/* Perform the write */
-+			file_offset_tmp = file_offset;
-+			nwritten = vfs_write(curlun->filp,
-+					(char __user *) bh->buf,
-+					amount, &file_offset_tmp);
-+			VLDBG(curlun, "file write %u @ %llu -> %d\n", amount,
-+					(unsigned long long) file_offset,
-+					(int) nwritten);
-+			if (signal_pending(current))
-+				return -EINTR;		/* Interrupted! */
-+
-+			if (nwritten < 0) {
-+				LDBG(curlun, "error in file write: %d\n",
-+						(int) nwritten);
-+				nwritten = 0;
-+			} else if (nwritten < amount) {
-+				LDBG(curlun, "partial file write: %d/%u\n",
-+						(int) nwritten, amount);
-+				nwritten -= (nwritten & 511);
-+						/* Round down to a block */
-+			}
-+			file_offset += nwritten;
-+			amount_left_to_write -= nwritten;
-+			fsg->residue -= nwritten;
-+
-+			/* If an error occurred, report it and its position */
-+			if (nwritten < amount) {
-+				curlun->sense_data = SS_WRITE_ERROR;
-+				curlun->sense_data_info = file_offset >> 9;
-+				curlun->info_valid = 1;
-+				break;
-+			}
-+
-+			/* Did the host decide to stop early? */
-+			if (bh->outreq->actual != bh->outreq->length) {
-+				fsg->short_packet_received = 1;
-+				break;
-+			}
-+			continue;
-+		}
-+
-+		/* Wait for something to happen */
-+		rc = sleep_thread(fsg);
-+		if (rc)
-+			return rc;
-+	}
-+
-+	return -EIO;		/* No default reply */
-+}
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/* Sync the file data, don't bother with the metadata.
-+ * The caller must own fsg->filesem.
-+ * This code was copied from fs/buffer.c:sys_fdatasync(). */
-+static int fsync_sub(struct lun *curlun)
-+{
-+	struct file	*filp = curlun->filp;
-+	struct inode	*inode;
-+	int		rc, err;
-+
-+	if (curlun->ro || !filp)
-+		return 0;
-+	if (!filp->f_op->fsync)
-+		return -EINVAL;
-+
-+	inode = filp->f_path.dentry->d_inode;
-+	mutex_lock(&inode->i_mutex);
-+	rc = filemap_fdatawrite(inode->i_mapping);
-+	err = filp->f_op->fsync(filp, filp->f_path.dentry, 1);
-+	if (!rc)
-+		rc = err;
-+	err = filemap_fdatawait(inode->i_mapping);
-+	if (!rc)
-+		rc = err;
-+	mutex_unlock(&inode->i_mutex);
-+	VLDBG(curlun, "fdatasync -> %d\n", rc);
-+	return rc;
-+}
-+
-+static void fsync_all(struct fsg_dev *fsg)
-+{
-+	int	i;
-+
-+	for (i = 0; i < fsg->nluns; ++i)
-+		fsync_sub(&fsg->luns[i]);
-+}
-+
-+static int do_synchronize_cache(struct fsg_dev *fsg)
-+{
-+	struct lun	*curlun = fsg->curlun;
-+	int		rc;
-+
-+	/* We ignore the requested LBA and write out all file's
-+	 * dirty data buffers. */
-+	rc = fsync_sub(curlun);
-+	if (rc)
-+		curlun->sense_data = SS_WRITE_ERROR;
-+	return 0;
-+}
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static void invalidate_sub(struct lun *curlun)
-+{
-+	struct file	*filp = curlun->filp;
-+	struct inode	*inode = filp->f_path.dentry->d_inode;
-+	unsigned long	rc;
-+
-+	rc = invalidate_mapping_pages(inode->i_mapping, 0, -1);
-+	VLDBG(curlun, "invalidate_inode_pages -> %ld\n", rc);
-+}
-+
-+static int do_verify(struct fsg_dev *fsg)
-+{
-+	struct lun		*curlun = fsg->curlun;
-+	u32			lba;
-+	u32			verification_length;
-+	struct fsg_buffhd	*bh = fsg->next_buffhd_to_fill;
-+	loff_t			file_offset, file_offset_tmp;
-+	u32			amount_left;
-+	unsigned int		amount;
-+	ssize_t			nread;
-+
-+	/* Get the starting Logical Block Address and check that it's
-+	 * not too big */
-+	lba = get_be32(&fsg->cmnd[2]);
-+	if (lba >= curlun->num_sectors) {
-+		curlun->sense_data = SS_LOGICAL_BLOCK_ADDRESS_OUT_OF_RANGE;
-+		return -EINVAL;
-+	}
-+
-+	/* We allow DPO (Disable Page Out = don't save data in the
-+	 * cache) but we don't implement it. */
-+	if ((fsg->cmnd[1] & ~0x10) != 0) {
-+		curlun->sense_data = SS_INVALID_FIELD_IN_CDB;
-+		return -EINVAL;
-+	}
-+
-+	verification_length = get_be16(&fsg->cmnd[7]);
-+	if (unlikely(verification_length == 0))
-+		return -EIO;		/* No default reply */
-+
-+	/* Prepare to carry out the file verify */
-+	amount_left = verification_length << 9;
-+	file_offset = ((loff_t) lba) << 9;
-+
-+	/* Write out all the dirty buffers before invalidating them */
-+	fsync_sub(curlun);
-+	if (signal_pending(current))
-+		return -EINTR;
-+
-+	invalidate_sub(curlun);
-+	if (signal_pending(current))
-+		return -EINTR;
-+
-+	/* Just try to read the requested blocks */
-+	while (amount_left > 0) {
-+
-+		/* Figure out how much we need to read:
-+		 * Try to read the remaining amount, but not more than
-+		 * the buffer size.
-+		 * And don't try to read past the end of the file.
-+		 * If this means reading 0 then we were asked to read
-+		 * past the end of file. */
-+		amount = min((unsigned int) amount_left,
-+				(unsigned int)fsg->buf_size);
-+		amount = min((loff_t) amount,
-+				curlun->file_length - file_offset);
-+		if (amount == 0) {
-+			curlun->sense_data =
-+					SS_LOGICAL_BLOCK_ADDRESS_OUT_OF_RANGE;
-+			curlun->sense_data_info = file_offset >> 9;
-+			curlun->info_valid = 1;
-+			break;
-+		}
-+
-+		/* Perform the read */
-+		file_offset_tmp = file_offset;
-+		nread = vfs_read(curlun->filp,
-+				(char __user *) bh->buf,
-+				amount, &file_offset_tmp);
-+		VLDBG(curlun, "file read %u @ %llu -> %d\n", amount,
-+				(unsigned long long) file_offset,
-+				(int) nread);
-+		if (signal_pending(current))
-+			return -EINTR;
-+
-+		if (nread < 0) {
-+			LDBG(curlun, "error in file verify: %d\n",
-+					(int) nread);
-+			nread = 0;
-+		} else if (nread < amount) {
-+			LDBG(curlun, "partial file verify: %d/%u\n",
-+					(int) nread, amount);
-+			nread -= (nread & 511);	/* Round down to a sector */
-+		}
-+		if (nread == 0) {
-+			curlun->sense_data = SS_UNRECOVERED_READ_ERROR;
-+			curlun->sense_data_info = file_offset >> 9;
-+			curlun->info_valid = 1;
-+			break;
-+		}
-+		file_offset += nread;
-+		amount_left -= nread;
-+	}
-+	return 0;
-+}
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static int do_inquiry(struct fsg_dev *fsg, struct fsg_buffhd *bh)
-+{
-+	u8	*buf = (u8 *) bh->buf;
-+
-+	if (!fsg->curlun) {		/* Unsupported LUNs are okay */
-+		fsg->bad_lun_okay = 1;
-+		memset(buf, 0, 36);
-+		buf[0] = 0x7f;		/* Unsupported, no device-type */
-+		return 36;
-+	}
-+
-+	memset(buf, 0, 8);	/* Non-removable, direct-access device */
-+
-+	buf[1] = 0x80;	/* set removable bit */
-+	buf[2] = 2;		/* ANSI SCSI level 2 */
-+	buf[3] = 2;		/* SCSI-2 INQUIRY data format */
-+	buf[4] = 31;		/* Additional length */
-+				/* No special options */
-+	sprintf(buf + 8, "%-8s%-16s%04x", fsg->vendor,
-+			fsg->product, fsg->release);
-+	return 36;
-+}
-+
-+
-+static int do_request_sense(struct fsg_dev *fsg, struct fsg_buffhd *bh)
-+{
-+	struct lun	*curlun = fsg->curlun;
-+	u8		*buf = (u8 *) bh->buf;
-+	u32		sd, sdinfo;
-+	int		valid;
-+
-+	/*
-+	 * From the SCSI-2 spec., section 7.9 (Unit attention condition):
-+	 *
-+	 * If a REQUEST SENSE command is received from an initiator
-+	 * with a pending unit attention condition (before the target
-+	 * generates the contingent allegiance condition), then the
-+	 * target shall either:
-+	 *   a) report any pending sense data and preserve the unit
-+	 *	attention condition on the logical unit, or,
-+	 *   b) report the unit attention condition, may discard any
-+	 *	pending sense data, and clear the unit attention
-+	 *	condition on the logical unit for that initiator.
-+	 *
-+	 * FSG normally uses option a); enable this code to use option b).
-+	 */
-+#if 0
-+	if (curlun && curlun->unit_attention_data != SS_NO_SENSE) {
-+		curlun->sense_data = curlun->unit_attention_data;
-+		curlun->unit_attention_data = SS_NO_SENSE;
-+	}
-+#endif
-+
-+	if (!curlun) {		/* Unsupported LUNs are okay */
-+		fsg->bad_lun_okay = 1;
-+		sd = SS_LOGICAL_UNIT_NOT_SUPPORTED;
-+		sdinfo = 0;
-+		valid = 0;
-+	} else {
-+		sd = curlun->sense_data;
-+		sdinfo = curlun->sense_data_info;
-+		valid = curlun->info_valid << 7;
-+		curlun->sense_data = SS_NO_SENSE;
-+		curlun->sense_data_info = 0;
-+		curlun->info_valid = 0;
-+	}
-+
-+	memset(buf, 0, 18);
-+	buf[0] = valid | 0x70;			/* Valid, current error */
-+	buf[2] = SK(sd);
-+	put_be32(&buf[3], sdinfo);		/* Sense information */
-+	buf[7] = 18 - 8;			/* Additional sense length */
-+	buf[12] = ASC(sd);
-+	buf[13] = ASCQ(sd);
-+	return 18;
-+}
-+
-+
-+static int do_read_capacity(struct fsg_dev *fsg, struct fsg_buffhd *bh)
-+{
-+	struct lun	*curlun = fsg->curlun;
-+	u32		lba = get_be32(&fsg->cmnd[2]);
-+	int		pmi = fsg->cmnd[8];
-+	u8		*buf = (u8 *) bh->buf;
-+
-+	/* Check the PMI and LBA fields */
-+	if (pmi > 1 || (pmi == 0 && lba != 0)) {
-+		curlun->sense_data = SS_INVALID_FIELD_IN_CDB;
-+		return -EINVAL;
-+	}
-+
-+	put_be32(&buf[0], curlun->num_sectors - 1);	/* Max logical block */
-+	put_be32(&buf[4], 512);				/* Block length */
-+	return 8;
-+}
-+
-+
-+static int do_mode_sense(struct fsg_dev *fsg, struct fsg_buffhd *bh)
-+{
-+	struct lun	*curlun = fsg->curlun;
-+	int		mscmnd = fsg->cmnd[0];
-+	u8		*buf = (u8 *) bh->buf;
-+	u8		*buf0 = buf;
-+	int		pc, page_code;
-+	int		changeable_values, all_pages;
-+	int		valid_page = 0;
-+	int		len, limit;
-+
-+	if ((fsg->cmnd[1] & ~0x08) != 0) {		/* Mask away DBD */
-+		curlun->sense_data = SS_INVALID_FIELD_IN_CDB;
-+		return -EINVAL;
-+	}
-+	pc = fsg->cmnd[2] >> 6;
-+	page_code = fsg->cmnd[2] & 0x3f;
-+	if (pc == 3) {
-+		curlun->sense_data = SS_SAVING_PARAMETERS_NOT_SUPPORTED;
-+		return -EINVAL;
-+	}
-+	changeable_values = (pc == 1);
-+	all_pages = (page_code == 0x3f);
-+
-+	/* Write the mode parameter header.  Fixed values are: default
-+	 * medium type, no cache control (DPOFUA), and no block descriptors.
-+	 * The only variable value is the WriteProtect bit.  We will fill in
-+	 * the mode data length later. */
-+	memset(buf, 0, 8);
-+	if (mscmnd == SC_MODE_SENSE_6) {
-+		buf[2] = (curlun->ro ? 0x80 : 0x00);		/* WP, DPOFUA */
-+		buf += 4;
-+		limit = 255;
-+	} else {			/* SC_MODE_SENSE_10 */
-+		buf[3] = (curlun->ro ? 0x80 : 0x00);		/* WP, DPOFUA */
-+		buf += 8;
-+		limit = 65535;
-+	}
-+
-+	/* No block descriptors */
-+
-+	/* Disabled to workaround USB reset problems with a Vista host.
-+	 */
-+#if 0
-+	/* The mode pages, in numerical order.  The only page we support
-+	 * is the Caching page. */
-+	if (page_code == 0x08 || all_pages) {
-+		valid_page = 1;
-+		buf[0] = 0x08;		/* Page code */
-+		buf[1] = 10;		/* Page length */
-+		memset(buf+2, 0, 10);	/* None of the fields are changeable */
-+
-+		if (!changeable_values) {
-+			buf[2] = 0x04;	/* Write cache enable, */
-+					/* Read cache not disabled */
-+					/* No cache retention priorities */
-+			put_be16(&buf[4], 0xffff);  /* Don't disable prefetch */
-+					/* Minimum prefetch = 0 */
-+			put_be16(&buf[8], 0xffff);  /* Maximum prefetch */
-+			/* Maximum prefetch ceiling */
-+			put_be16(&buf[10], 0xffff);
-+		}
-+		buf += 12;
-+	}
-+#else
-+	valid_page = 1;
-+#endif
-+
-+	/* Check that a valid page was requested and the mode data length
-+	 * isn't too long. */
-+	len = buf - buf0;
-+	if (!valid_page || len > limit) {
-+		curlun->sense_data = SS_INVALID_FIELD_IN_CDB;
-+		return -EINVAL;
-+	}
-+
-+	/*  Store the mode data length */
-+	if (mscmnd == SC_MODE_SENSE_6)
-+		buf0[0] = len - 1;
-+	else
-+		put_be16(buf0, len - 2);
-+	return len;
-+}
-+
-+static int do_start_stop(struct fsg_dev *fsg)
-+{
-+	struct lun	*curlun = fsg->curlun;
-+	int		loej, start;
-+
-+	/* int immed = fsg->cmnd[1] & 0x01; */
-+	loej = fsg->cmnd[4] & 0x02;
-+	start = fsg->cmnd[4] & 0x01;
-+
-+	if (loej) {
-+		/* eject request from the host */
-+		if (backing_file_is_open(curlun)) {
-+			close_backing_file(fsg, curlun);
-+			curlun->unit_attention_data = SS_MEDIUM_NOT_PRESENT;
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+static int do_prevent_allow(struct fsg_dev *fsg)
-+{
-+	struct lun	*curlun = fsg->curlun;
-+	int		prevent;
-+
-+	prevent = fsg->cmnd[4] & 0x01;
-+	if ((fsg->cmnd[4] & ~0x01) != 0) {		/* Mask away Prevent */
-+		curlun->sense_data = SS_INVALID_FIELD_IN_CDB;
-+		return -EINVAL;
-+	}
-+
-+	if (curlun->prevent_medium_removal && !prevent)
-+		fsync_sub(curlun);
-+	curlun->prevent_medium_removal = prevent;
-+	return 0;
-+}
-+
-+
-+static int do_read_format_capacities(struct fsg_dev *fsg,
-+			struct fsg_buffhd *bh)
-+{
-+	struct lun	*curlun = fsg->curlun;
-+	u8		*buf = (u8 *) bh->buf;
-+
-+	buf[0] = buf[1] = buf[2] = 0;
-+	buf[3] = 8;	/* Only the Current/Maximum Capacity Descriptor */
-+	buf += 4;
-+
-+	put_be32(&buf[0], curlun->num_sectors);	/* Number of blocks */
-+	put_be32(&buf[4], 512);				/* Block length */
-+	buf[4] = 0x02;					/* Current capacity */
-+	return 12;
-+}
-+
-+
-+static int do_mode_select(struct fsg_dev *fsg, struct fsg_buffhd *bh)
-+{
-+	struct lun	*curlun = fsg->curlun;
-+
-+	/* We don't support MODE SELECT */
-+	curlun->sense_data = SS_INVALID_COMMAND;
-+	return -EINVAL;
-+}
-+
-+
-+/*-------------------------------------------------------------------------*/
-+#if 0
-+static int write_zero(struct fsg_dev *fsg)
-+{
-+	struct fsg_buffhd	*bh;
-+	int			rc;
-+
-+	DBG(fsg, "write_zero\n");
-+	/* Wait for the next buffer to become available */
-+	bh = fsg->next_buffhd_to_fill;
-+	while (bh->state != BUF_STATE_EMPTY) {
-+		rc = sleep_thread(fsg);
-+		if (rc)
-+			return rc;
-+	}
-+
-+	bh->inreq->length = 0;
-+	start_transfer(fsg, fsg->bulk_in, bh->inreq,
-+			&bh->inreq_busy, &bh->state);
-+
-+	fsg->next_buffhd_to_fill = bh->next;
-+	return 0;
-+}
-+#endif
-+
-+static int throw_away_data(struct fsg_dev *fsg)
-+{
-+	struct fsg_buffhd	*bh;
-+	u32			amount;
-+	int			rc;
-+
-+	DBG(fsg, "throw_away_data\n");
-+	while ((bh = fsg->next_buffhd_to_drain)->state != BUF_STATE_EMPTY ||
-+			fsg->usb_amount_left > 0) {
-+
-+		/* Throw away the data in a filled buffer */
-+		if (bh->state == BUF_STATE_FULL) {
-+			smp_rmb();
-+			bh->state = BUF_STATE_EMPTY;
-+			fsg->next_buffhd_to_drain = bh->next;
-+
-+			/* A short packet or an error ends everything */
-+			if (bh->outreq->actual != bh->outreq->length ||
-+					bh->outreq->status != 0) {
-+				raise_exception(fsg, FSG_STATE_ABORT_BULK_OUT);
-+				return -EINTR;
-+			}
-+			continue;
-+		}
-+
-+		/* Try to submit another request if we need one */
-+		bh = fsg->next_buffhd_to_fill;
-+		if (bh->state == BUF_STATE_EMPTY && fsg->usb_amount_left > 0) {
-+			amount = min(fsg->usb_amount_left, (u32) fsg->buf_size);
-+
-+			/* amount is always divisible by 512, hence by
-+			 * the bulk-out maxpacket size */
-+			bh->outreq->length = bh->bulk_out_intended_length =
-+					amount;
-+			start_transfer(fsg, fsg->bulk_out, bh->outreq,
-+					&bh->outreq_busy, &bh->state);
-+			fsg->next_buffhd_to_fill = bh->next;
-+			fsg->usb_amount_left -= amount;
-+			continue;
-+		}
-+
-+		/* Otherwise wait for something to happen */
-+		rc = sleep_thread(fsg);
-+		if (rc)
-+			return rc;
-+	}
-+	return 0;
-+}
-+
-+
-+static int finish_reply(struct fsg_dev *fsg)
-+{
-+	struct fsg_buffhd	*bh = fsg->next_buffhd_to_fill;
-+	int			rc = 0;
-+
-+	switch (fsg->data_dir) {
-+	case DATA_DIR_NONE:
-+		break;			/* Nothing to send */
-+
-+	case DATA_DIR_UNKNOWN:
-+		rc = -EINVAL;
-+		break;
-+
-+	/* All but the last buffer of data must have already been sent */
-+	case DATA_DIR_TO_HOST:
-+		if (fsg->data_size == 0)
-+			;		/* Nothing to send */
-+
-+		/* If there's no residue, simply send the last buffer */
-+		else if (fsg->residue == 0) {
-+			start_transfer(fsg, fsg->bulk_in, bh->inreq,
-+					&bh->inreq_busy, &bh->state);
-+			fsg->next_buffhd_to_fill = bh->next;
-+		} else {
-+			start_transfer(fsg, fsg->bulk_in, bh->inreq,
-+					&bh->inreq_busy, &bh->state);
-+			fsg->next_buffhd_to_fill = bh->next;
-+#if 0
-+			/* this is unnecessary, and was causing problems with MacOS */
-+			if (bh->inreq->length > 0)
-+				write_zero(fsg);
-+#endif
-+		}
-+		break;
-+
-+	/* We have processed all we want from the data the host has sent.
-+	 * There may still be outstanding bulk-out requests. */
-+	case DATA_DIR_FROM_HOST:
-+		if (fsg->residue == 0)
-+			;		/* Nothing to receive */
-+
-+		/* Did the host stop sending unexpectedly early? */
-+		else if (fsg->short_packet_received) {
-+			raise_exception(fsg, FSG_STATE_ABORT_BULK_OUT);
-+			rc = -EINTR;
-+		}
-+
-+		/* We haven't processed all the incoming data.  Even though
-+		 * we may be allowed to stall, doing so would cause a race.
-+		 * The controller may already have ACK'ed all the remaining
-+		 * bulk-out packets, in which case the host wouldn't see a
-+		 * STALL.  Not realizing the endpoint was halted, it wouldn't
-+		 * clear the halt -- leading to problems later on. */
-+#if 0
-+		fsg_set_halt(fsg, fsg->bulk_out);
-+		raise_exception(fsg, FSG_STATE_ABORT_BULK_OUT);
-+		rc = -EINTR;
-+#endif
-+
-+		/* We can't stall.  Read in the excess data and throw it
-+		 * all away. */
-+		else
-+			rc = throw_away_data(fsg);
-+		break;
-+	}
-+	return rc;
-+}
-+
-+
-+static int send_status(struct fsg_dev *fsg)
-+{
-+	struct lun		*curlun = fsg->curlun;
-+	struct fsg_buffhd	*bh;
-+	int			rc;
-+	u8			status = USB_STATUS_PASS;
-+	u32			sd, sdinfo = 0;
-+	struct bulk_cs_wrap	*csw;
-+
-+	DBG(fsg, "send_status\n");
-+	/* Wait for the next buffer to become available */
-+	bh = fsg->next_buffhd_to_fill;
-+	while (bh->state != BUF_STATE_EMPTY) {
-+		rc = sleep_thread(fsg);
-+		if (rc)
-+			return rc;
-+	}
-+
-+	if (curlun) {
-+		sd = curlun->sense_data;
-+		sdinfo = curlun->sense_data_info;
-+	} else if (fsg->bad_lun_okay)
-+		sd = SS_NO_SENSE;
-+	else
-+		sd = SS_LOGICAL_UNIT_NOT_SUPPORTED;
-+
-+	if (fsg->phase_error) {
-+		DBG(fsg, "sending phase-error status\n");
-+		status = USB_STATUS_PHASE_ERROR;
-+		sd = SS_INVALID_COMMAND;
-+	} else if (sd != SS_NO_SENSE) {
-+		DBG(fsg, "sending command-failure status\n");
-+		status = USB_STATUS_FAIL;
-+		VDBG(fsg, "  sense data: SK x%02x, ASC x%02x, ASCQ x%02x;"
-+				"  info x%x\n",
-+				SK(sd), ASC(sd), ASCQ(sd), sdinfo);
-+	}
-+
-+	csw = bh->buf;
-+
-+	/* Store and send the Bulk-only CSW */
-+	csw->Signature = __constant_cpu_to_le32(USB_BULK_CS_SIG);
-+	csw->Tag = fsg->tag;
-+	csw->Residue = cpu_to_le32(fsg->residue);
-+	csw->Status = status;
-+
-+	bh->inreq->length = USB_BULK_CS_WRAP_LEN;
-+	start_transfer(fsg, fsg->bulk_in, bh->inreq,
-+			&bh->inreq_busy, &bh->state);
-+
-+	fsg->next_buffhd_to_fill = bh->next;
-+	return 0;
-+}
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/* Check whether the command is properly formed and whether its data size
-+ * and direction agree with the values we already have. */
-+static int check_command(struct fsg_dev *fsg, int cmnd_size,
-+		enum data_direction data_dir, unsigned int mask,
-+		int needs_medium, const char *name)
-+{
-+	int			i;
-+	int			lun = fsg->cmnd[1] >> 5;
-+	static const char	dirletter[4] = {'u', 'o', 'i', 'n'};
-+	char			hdlen[20];
-+	struct lun		*curlun;
-+
-+	hdlen[0] = 0;
-+	if (fsg->data_dir != DATA_DIR_UNKNOWN)
-+		sprintf(hdlen, ", H%c=%u", dirletter[(int) fsg->data_dir],
-+				fsg->data_size);
-+	VDBG(fsg, "SCSI command: %s;  Dc=%d, D%c=%u;  Hc=%d%s\n",
-+			name, cmnd_size, dirletter[(int) data_dir],
-+			fsg->data_size_from_cmnd, fsg->cmnd_size, hdlen);
-+
-+	/* We can't reply at all until we know the correct data direction
-+	 * and size. */
-+	if (fsg->data_size_from_cmnd == 0)
-+		data_dir = DATA_DIR_NONE;
-+	if (fsg->data_dir == DATA_DIR_UNKNOWN) {	/* CB or CBI */
-+		fsg->data_dir = data_dir;
-+		fsg->data_size = fsg->data_size_from_cmnd;
-+
-+	} else {					/* Bulk-only */
-+		if (fsg->data_size < fsg->data_size_from_cmnd) {
-+
-+			/* Host data size < Device data size is a phase error.
-+			 * Carry out the command, but only transfer as much
-+			 * as we are allowed. */
-+			DBG(fsg, "phase error 1\n");
-+			fsg->data_size_from_cmnd = fsg->data_size;
-+			fsg->phase_error = 1;
-+		}
-+	}
-+	fsg->residue = fsg->usb_amount_left = fsg->data_size;
-+
-+	/* Conflicting data directions is a phase error */
-+	if (fsg->data_dir != data_dir && fsg->data_size_from_cmnd > 0) {
-+		fsg->phase_error = 1;
-+		DBG(fsg, "phase error 2\n");
-+		return -EINVAL;
-+	}
-+
-+	/* Verify the length of the command itself */
-+	if (cmnd_size != fsg->cmnd_size) {
-+
-+		/* Special case workaround: MS-Windows issues REQUEST SENSE
-+		 * with cbw->Length == 12 (it should be 6). */
-+		if (fsg->cmnd[0] == SC_REQUEST_SENSE && fsg->cmnd_size == 12)
-+			cmnd_size = fsg->cmnd_size;
-+		else {
-+			fsg->phase_error = 1;
-+			return -EINVAL;
-+		}
-+	}
-+
-+	/* Check that the LUN values are consistent */
-+	if (fsg->lun != lun)
-+		DBG(fsg, "using LUN %d from CBW, "
-+				"not LUN %d from CDB\n",
-+				fsg->lun, lun);
-+
-+	/* Check the LUN */
-+	if (fsg->lun >= 0 && fsg->lun < fsg->nluns) {
-+		fsg->curlun = curlun = &fsg->luns[fsg->lun];
-+		if (fsg->cmnd[0] != SC_REQUEST_SENSE) {
-+			curlun->sense_data = SS_NO_SENSE;
-+			curlun->sense_data_info = 0;
-+			curlun->info_valid = 0;
-+		}
-+	} else {
-+		fsg->curlun = curlun = NULL;
-+		fsg->bad_lun_okay = 0;
-+
-+		/* INQUIRY and REQUEST SENSE commands are explicitly allowed
-+		 * to use unsupported LUNs; all others may not. */
-+		if (fsg->cmnd[0] != SC_INQUIRY &&
-+				fsg->cmnd[0] != SC_REQUEST_SENSE) {
-+			DBG(fsg, "unsupported LUN %d\n", fsg->lun);
-+			return -EINVAL;
-+		}
-+	}
-+
-+	/* If a unit attention condition exists, only INQUIRY and
-+	 * REQUEST SENSE commands are allowed; anything else must fail. */
-+	if (curlun && curlun->unit_attention_data != SS_NO_SENSE &&
-+			fsg->cmnd[0] != SC_INQUIRY &&
-+			fsg->cmnd[0] != SC_REQUEST_SENSE) {
-+		curlun->sense_data = curlun->unit_attention_data;
-+		curlun->unit_attention_data = SS_NO_SENSE;
-+		return -EINVAL;
-+	}
-+
-+	/* Check that only command bytes listed in the mask are non-zero */
-+	fsg->cmnd[1] &= 0x1f;			/* Mask away the LUN */
-+	for (i = 1; i < cmnd_size; ++i) {
-+		if (fsg->cmnd[i] && !(mask & (1 << i))) {
-+			if (curlun)
-+				curlun->sense_data = SS_INVALID_FIELD_IN_CDB;
-+			DBG(fsg, "SS_INVALID_FIELD_IN_CDB\n");
-+			return -EINVAL;
-+		}
-+	}
-+
-+	/* If the medium isn't mounted and the command needs to access
-+	 * it, return an error. */
-+	if (curlun && !backing_file_is_open(curlun) && needs_medium) {
-+		curlun->sense_data = SS_MEDIUM_NOT_PRESENT;
-+		DBG(fsg, "SS_MEDIUM_NOT_PRESENT\n");
-+		return -EINVAL;
-+	}
-+
-+	return 0;
-+}
-+
-+
-+static int do_scsi_command(struct fsg_dev *fsg)
-+{
-+	struct fsg_buffhd	*bh;
-+	int			rc;
-+	int			reply = -EINVAL;
-+	int			i;
-+	static char		unknown[16];
-+
-+	dump_cdb(fsg);
-+
-+	/* Wait for the next buffer to become available for data or status */
-+	bh = fsg->next_buffhd_to_drain = fsg->next_buffhd_to_fill;
-+	while (bh->state != BUF_STATE_EMPTY) {
-+		rc = sleep_thread(fsg);
-+		if (rc)
-+			return rc;
-+	}
-+	fsg->phase_error = 0;
-+	fsg->short_packet_received = 0;
-+
-+	down_read(&fsg->filesem);	/* We're using the backing file */
-+	switch (fsg->cmnd[0]) {
-+
-+	case SC_INQUIRY:
-+		fsg->data_size_from_cmnd = fsg->cmnd[4];
-+		if ((reply = check_command(fsg, 6, DATA_DIR_TO_HOST,
-+				(1<<4), 0,
-+				"INQUIRY")) == 0)
-+			reply = do_inquiry(fsg, bh);
-+		break;
-+
-+	case SC_MODE_SELECT_6:
-+		fsg->data_size_from_cmnd = fsg->cmnd[4];
-+		if ((reply = check_command(fsg, 6, DATA_DIR_FROM_HOST,
-+				(1<<1) | (1<<4), 0,
-+				"MODE SELECT(6)")) == 0)
-+			reply = do_mode_select(fsg, bh);
-+		break;
-+
-+	case SC_MODE_SELECT_10:
-+		fsg->data_size_from_cmnd = get_be16(&fsg->cmnd[7]);
-+		if ((reply = check_command(fsg, 10, DATA_DIR_FROM_HOST,
-+				(1<<1) | (3<<7), 0,
-+				"MODE SELECT(10)")) == 0)
-+			reply = do_mode_select(fsg, bh);
-+		break;
-+
-+	case SC_MODE_SENSE_6:
-+		fsg->data_size_from_cmnd = fsg->cmnd[4];
-+		if ((reply = check_command(fsg, 6, DATA_DIR_TO_HOST,
-+				(1<<1) | (1<<2) | (1<<4), 0,
-+				"MODE SENSE(6)")) == 0)
-+			reply = do_mode_sense(fsg, bh);
-+		break;
-+
-+	case SC_MODE_SENSE_10:
-+		fsg->data_size_from_cmnd = get_be16(&fsg->cmnd[7]);
-+		if ((reply = check_command(fsg, 10, DATA_DIR_TO_HOST,
-+				(1<<1) | (1<<2) | (3<<7), 0,
-+				"MODE SENSE(10)")) == 0)
-+			reply = do_mode_sense(fsg, bh);
-+		break;
-+
-+	case SC_PREVENT_ALLOW_MEDIUM_REMOVAL:
-+		fsg->data_size_from_cmnd = 0;
-+		if ((reply = check_command(fsg, 6, DATA_DIR_NONE,
-+				(1<<4), 0,
-+				"PREVENT-ALLOW MEDIUM REMOVAL")) == 0)
-+			reply = do_prevent_allow(fsg);
-+		break;
-+
-+	case SC_READ_6:
-+		i = fsg->cmnd[4];
-+		fsg->data_size_from_cmnd = (i == 0 ? 256 : i) << 9;
-+		if ((reply = check_command(fsg, 6, DATA_DIR_TO_HOST,
-+				(7<<1) | (1<<4), 1,
-+				"READ(6)")) == 0)
-+			reply = do_read(fsg);
-+		break;
-+
-+	case SC_READ_10:
-+		fsg->data_size_from_cmnd = get_be16(&fsg->cmnd[7]) << 9;
-+		if ((reply = check_command(fsg, 10, DATA_DIR_TO_HOST,
-+				(1<<1) | (0xf<<2) | (3<<7), 1,
-+				"READ(10)")) == 0)
-+			reply = do_read(fsg);
-+		break;
-+
-+	case SC_READ_12:
-+		fsg->data_size_from_cmnd = get_be32(&fsg->cmnd[6]) << 9;
-+		if ((reply = check_command(fsg, 12, DATA_DIR_TO_HOST,
-+				(1<<1) | (0xf<<2) | (0xf<<6), 1,
-+				"READ(12)")) == 0)
-+			reply = do_read(fsg);
-+		break;
-+
-+	case SC_READ_CAPACITY:
-+		fsg->data_size_from_cmnd = 8;
-+		if ((reply = check_command(fsg, 10, DATA_DIR_TO_HOST,
-+				(0xf<<2) | (1<<8), 1,
-+				"READ CAPACITY")) == 0)
-+			reply = do_read_capacity(fsg, bh);
-+		break;
-+
-+	case SC_READ_FORMAT_CAPACITIES:
-+		fsg->data_size_from_cmnd = get_be16(&fsg->cmnd[7]);
-+		if ((reply = check_command(fsg, 10, DATA_DIR_TO_HOST,
-+				(3<<7), 1,
-+				"READ FORMAT CAPACITIES")) == 0)
-+			reply = do_read_format_capacities(fsg, bh);
-+		break;
-+
-+	case SC_REQUEST_SENSE:
-+		fsg->data_size_from_cmnd = fsg->cmnd[4];
-+		if ((reply = check_command(fsg, 6, DATA_DIR_TO_HOST,
-+				(1<<4), 0,
-+				"REQUEST SENSE")) == 0)
-+			reply = do_request_sense(fsg, bh);
-+		break;
-+
-+	case SC_START_STOP_UNIT:
-+		fsg->data_size_from_cmnd = 0;
-+		if ((reply = check_command(fsg, 6, DATA_DIR_NONE,
-+				(1<<1) | (1<<4), 0,
-+				"START-STOP UNIT")) == 0)
-+			reply = do_start_stop(fsg);
-+		break;
-+
-+	case SC_SYNCHRONIZE_CACHE:
-+		fsg->data_size_from_cmnd = 0;
-+		if ((reply = check_command(fsg, 10, DATA_DIR_NONE,
-+				(0xf<<2) | (3<<7), 1,
-+				"SYNCHRONIZE CACHE")) == 0)
-+			reply = do_synchronize_cache(fsg);
-+		break;
-+
-+	case SC_TEST_UNIT_READY:
-+		fsg->data_size_from_cmnd = 0;
-+		reply = check_command(fsg, 6, DATA_DIR_NONE,
-+				0, 1,
-+				"TEST UNIT READY");
-+		break;
-+
-+	/* Although optional, this command is used by MS-Windows.  We
-+	 * support a minimal version: BytChk must be 0. */
-+	case SC_VERIFY:
-+		fsg->data_size_from_cmnd = 0;
-+		if ((reply = check_command(fsg, 10, DATA_DIR_NONE,
-+				(1<<1) | (0xf<<2) | (3<<7), 1,
-+				"VERIFY")) == 0)
-+			reply = do_verify(fsg);
-+		break;
-+
-+	case SC_WRITE_6:
-+		i = fsg->cmnd[4];
-+		fsg->data_size_from_cmnd = (i == 0 ? 256 : i) << 9;
-+		if ((reply = check_command(fsg, 6, DATA_DIR_FROM_HOST,
-+				(7<<1) | (1<<4), 1,
-+				"WRITE(6)")) == 0)
-+			reply = do_write(fsg);
-+		break;
-+
-+	case SC_WRITE_10:
-+		fsg->data_size_from_cmnd = get_be16(&fsg->cmnd[7]) << 9;
-+		if ((reply = check_command(fsg, 10, DATA_DIR_FROM_HOST,
-+				(1<<1) | (0xf<<2) | (3<<7), 1,
-+				"WRITE(10)")) == 0)
-+			reply = do_write(fsg);
-+		break;
-+
-+	case SC_WRITE_12:
-+		fsg->data_size_from_cmnd = get_be32(&fsg->cmnd[6]) << 9;
-+		if ((reply = check_command(fsg, 12, DATA_DIR_FROM_HOST,
-+				(1<<1) | (0xf<<2) | (0xf<<6), 1,
-+				"WRITE(12)")) == 0)
-+			reply = do_write(fsg);
-+		break;
-+
-+	/* Some mandatory commands that we recognize but don't implement.
-+	 * They don't mean much in this setting.  It's left as an exercise
-+	 * for anyone interested to implement RESERVE and RELEASE in terms
-+	 * of Posix locks. */
-+	case SC_FORMAT_UNIT:
-+	case SC_RELEASE:
-+	case SC_RESERVE:
-+	case SC_SEND_DIAGNOSTIC:
-+		/* Fall through */
-+
-+	default:
-+		fsg->data_size_from_cmnd = 0;
-+		sprintf(unknown, "Unknown x%02x", fsg->cmnd[0]);
-+		if ((reply = check_command(fsg, fsg->cmnd_size,
-+				DATA_DIR_UNKNOWN, 0xff, 0, unknown)) == 0) {
-+			fsg->curlun->sense_data = SS_INVALID_COMMAND;
-+			reply = -EINVAL;
-+		}
-+		break;
-+	}
-+	up_read(&fsg->filesem);
-+
-+	VDBG(fsg, "reply: %d, fsg->data_size_from_cmnd: %d\n",
-+			reply, fsg->data_size_from_cmnd);
-+	if (reply == -EINTR || signal_pending(current))
-+		return -EINTR;
-+
-+	/* Set up the single reply buffer for finish_reply() */
-+	if (reply == -EINVAL)
-+		reply = 0;		/* Error reply length */
-+	if (reply >= 0 && fsg->data_dir == DATA_DIR_TO_HOST) {
-+		reply = min((u32) reply, fsg->data_size_from_cmnd);
-+		bh->inreq->length = reply;
-+		bh->state = BUF_STATE_FULL;
-+		fsg->residue -= reply;
-+	}				/* Otherwise it's already set */
-+
-+	return 0;
-+}
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static int received_cbw(struct fsg_dev *fsg, struct fsg_buffhd *bh)
-+{
-+	struct usb_request	*req = bh->outreq;
-+	struct bulk_cb_wrap	*cbw = req->buf;
-+
-+	/* Was this a real packet? */
-+	if (req->status)
-+		return -EINVAL;
-+
-+	/* Is the CBW valid? */
-+	if (req->actual != USB_BULK_CB_WRAP_LEN ||
-+			cbw->Signature != __constant_cpu_to_le32(
-+				USB_BULK_CB_SIG)) {
-+		DBG(fsg, "invalid CBW: len %u sig 0x%x\n",
-+				req->actual,
-+				le32_to_cpu(cbw->Signature));
-+		return -EINVAL;
-+	}
-+
-+	/* Is the CBW meaningful? */
-+	if (cbw->Lun >= MAX_LUNS || cbw->Flags & ~USB_BULK_IN_FLAG ||
-+			cbw->Length <= 0 || cbw->Length > MAX_COMMAND_SIZE) {
-+		DBG(fsg, "non-meaningful CBW: lun = %u, flags = 0x%x, "
-+				"cmdlen %u\n",
-+				cbw->Lun, cbw->Flags, cbw->Length);
-+		return -EINVAL;
-+	}
-+
-+	/* Save the command for later */
-+	fsg->cmnd_size = cbw->Length;
-+	memcpy(fsg->cmnd, cbw->CDB, fsg->cmnd_size);
-+	if (cbw->Flags & USB_BULK_IN_FLAG)
-+		fsg->data_dir = DATA_DIR_TO_HOST;
-+	else
-+		fsg->data_dir = DATA_DIR_FROM_HOST;
-+	fsg->data_size = le32_to_cpu(cbw->DataTransferLength);
-+	if (fsg->data_size == 0)
-+		fsg->data_dir = DATA_DIR_NONE;
-+	fsg->lun = cbw->Lun;
-+	fsg->tag = cbw->Tag;
-+	return 0;
-+}
-+
-+
-+static int get_next_command(struct fsg_dev *fsg)
-+{
-+	struct fsg_buffhd	*bh;
-+	int			rc = 0;
-+
-+	/* Wait for the next buffer to become available */
-+	bh = fsg->next_buffhd_to_fill;
-+	while (bh->state != BUF_STATE_EMPTY) {
-+		rc = sleep_thread(fsg);
-+		if (rc)
-+			return rc;
-+	}
-+
-+	/* Queue a request to read a Bulk-only CBW */
-+	set_bulk_out_req_length(fsg, bh, USB_BULK_CB_WRAP_LEN);
-+	start_transfer(fsg, fsg->bulk_out, bh->outreq,
-+			&bh->outreq_busy, &bh->state);
-+
-+	/* We will drain the buffer in software, which means we
-+	 * can reuse it for the next filling.  No need to advance
-+	 * next_buffhd_to_fill. */
-+
-+	/* Wait for the CBW to arrive */
-+	while (bh->state != BUF_STATE_FULL) {
-+		rc = sleep_thread(fsg);
-+		if (rc)
-+			return rc;
-+	}
-+	smp_rmb();
-+	rc = received_cbw(fsg, bh);
-+	bh->state = BUF_STATE_EMPTY;
-+
-+	return rc;
-+}
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static int enable_endpoint(struct fsg_dev *fsg, struct usb_ep *ep,
-+		const struct usb_endpoint_descriptor *d)
-+{
-+	int	rc;
-+
-+	DBG(fsg, "usb_ep_enable %s\n", ep->name);
-+	ep->driver_data = fsg;
-+	rc = usb_ep_enable(ep, d);
-+	if (rc)
-+		ERROR(fsg, "can't enable %s, result %d\n", ep->name, rc);
-+	return rc;
-+}
-+
-+static int alloc_request(struct fsg_dev *fsg, struct usb_ep *ep,
-+		struct usb_request **preq)
-+{
-+	*preq = usb_ep_alloc_request(ep, GFP_ATOMIC);
-+	if (*preq)
-+		return 0;
-+	ERROR(fsg, "can't allocate request for %s\n", ep->name);
-+	return -ENOMEM;
-+}
-+
-+/*
-+ * Reset interface setting and re-init endpoint state (toggle etc).
-+ * Call with altsetting < 0 to disable the interface.  The only other
-+ * available altsetting is 0, which enables the interface.
-+ */
-+static int do_set_interface(struct fsg_dev *fsg, int altsetting)
-+{
-+	struct usb_composite_dev *cdev = fsg->cdev;
-+	int	rc = 0;
-+	int	i;
-+	const struct usb_endpoint_descriptor	*d;
-+
-+	if (fsg->running)
-+		DBG(fsg, "reset interface\n");
-+
-+reset:
-+	/* Deallocate the requests */
-+	for (i = 0; i < NUM_BUFFERS; ++i) {
-+		struct fsg_buffhd *bh = &fsg->buffhds[i];
-+
-+		if (bh->inreq) {
-+			usb_ep_free_request(fsg->bulk_in, bh->inreq);
-+			bh->inreq = NULL;
-+		}
-+		if (bh->outreq) {
-+			usb_ep_free_request(fsg->bulk_out, bh->outreq);
-+			bh->outreq = NULL;
-+		}
-+	}
-+
-+	/* Disable the endpoints */
-+	if (fsg->bulk_in_enabled) {
-+		DBG(fsg, "usb_ep_disable %s\n", fsg->bulk_in->name);
-+		usb_ep_disable(fsg->bulk_in);
-+		fsg->bulk_in_enabled = 0;
-+	}
-+	if (fsg->bulk_out_enabled) {
-+		DBG(fsg, "usb_ep_disable %s\n", fsg->bulk_out->name);
-+		usb_ep_disable(fsg->bulk_out);
-+		fsg->bulk_out_enabled = 0;
-+	}
-+
-+	fsg->running = 0;
-+	if (altsetting < 0 || rc != 0)
-+		return rc;
-+
-+	DBG(fsg, "set interface %d\n", altsetting);
-+
-+	/* Enable the endpoints */
-+	d = ep_desc(cdev->gadget, &fs_bulk_in_desc, &hs_bulk_in_desc);
-+	if ((rc = enable_endpoint(fsg, fsg->bulk_in, d)) != 0)
-+		goto reset;
-+	fsg->bulk_in_enabled = 1;
-+
-+	d = ep_desc(cdev->gadget, &fs_bulk_out_desc, &hs_bulk_out_desc);
-+	if ((rc = enable_endpoint(fsg, fsg->bulk_out, d)) != 0)
-+		goto reset;
-+	fsg->bulk_out_enabled = 1;
-+	fsg->bulk_out_maxpacket = le16_to_cpu(d->wMaxPacketSize);
-+
-+	/* Allocate the requests */
-+	for (i = 0; i < NUM_BUFFERS; ++i) {
-+		struct fsg_buffhd	*bh = &fsg->buffhds[i];
-+
-+		rc = alloc_request(fsg, fsg->bulk_in, &bh->inreq);
-+		if (rc != 0)
-+			goto reset;
-+		rc = alloc_request(fsg, fsg->bulk_out, &bh->outreq);
-+		if (rc != 0)
-+			goto reset;
-+		bh->inreq->buf = bh->outreq->buf = bh->buf;
-+		bh->inreq->context = bh->outreq->context = bh;
-+		bh->inreq->complete = bulk_in_complete;
-+		bh->outreq->complete = bulk_out_complete;
-+	}
-+
-+	fsg->running = 1;
-+	for (i = 0; i < fsg->nluns; ++i)
-+		fsg->luns[i].unit_attention_data = SS_RESET_OCCURRED;
-+
-+	return rc;
-+}
-+
-+static void adjust_wake_lock(struct fsg_dev *fsg)
-+{
-+	int ums_active = 0;
-+	int i;
-+
-+	spin_lock_irq(&fsg->lock);
-+
-+	if (fsg->config) {
-+		for (i = 0; i < fsg->nluns; ++i) {
-+			if (backing_file_is_open(&fsg->luns[i]))
-+				ums_active = 1;
-+		}
-+	}
-+
-+	if (ums_active)
-+		wake_lock(&fsg->wake_lock);
-+	else
-+		wake_unlock(&fsg->wake_lock);
-+
-+	spin_unlock_irq(&fsg->lock);
-+}
-+
-+/*
-+ * Change our operational configuration.  This code must agree with the code
-+ * that returns config descriptors, and with interface altsetting code.
-+ *
-+ * It's also responsible for power management interactions.  Some
-+ * configurations might not work with our current power sources.
-+ * For now we just assume the gadget is always self-powered.
-+ */
-+static int do_set_config(struct fsg_dev *fsg, u8 new_config)
-+{
-+	int	rc = 0;
-+
-+	if (new_config == fsg->config)
-+		return rc;
-+
-+	/* Disable the single interface */
-+	if (fsg->config != 0) {
-+		DBG(fsg, "reset config\n");
-+		fsg->config = 0;
-+		rc = do_set_interface(fsg, -1);
-+	}
-+
-+	/* Enable the interface */
-+	if (new_config != 0) {
-+		fsg->config = new_config;
-+		rc = do_set_interface(fsg, 0);
-+		if (rc != 0)
-+			fsg->config = 0;	/* Reset on errors */
-+		else
-+			INFO(fsg, "config #%d\n", fsg->config);
-+	}
-+
-+	switch_set_state(&fsg->sdev, new_config);
-+	adjust_wake_lock(fsg);
-+	return rc;
-+}
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static void handle_exception(struct fsg_dev *fsg)
-+{
-+	siginfo_t		info;
-+	int			sig;
-+	int			i;
-+	struct fsg_buffhd	*bh;
-+	enum fsg_state		old_state;
-+	u8			new_config;
-+	struct lun		*curlun;
-+	int			rc;
-+
-+	DBG(fsg, "handle_exception state: %d\n", (int)fsg->state);
-+	/* Clear the existing signals.  Anything but SIGUSR1 is converted
-+	 * into a high-priority EXIT exception. */
-+	for (;;) {
-+		sig = dequeue_signal_lock(current, &current->blocked, &info);
-+		if (!sig)
-+			break;
-+		if (sig != SIGUSR1) {
-+			if (fsg->state < FSG_STATE_EXIT)
-+				DBG(fsg, "Main thread exiting on signal\n");
-+			raise_exception(fsg, FSG_STATE_EXIT);
-+		}
-+	}
-+
-+	/* Clear out the controller's fifos */
-+	if (fsg->bulk_in_enabled)
-+		usb_ep_fifo_flush(fsg->bulk_in);
-+	if (fsg->bulk_out_enabled)
-+		usb_ep_fifo_flush(fsg->bulk_out);
-+
-+	/* Reset the I/O buffer states and pointers, the SCSI
-+	 * state, and the exception.  Then invoke the handler. */
-+	spin_lock_irq(&fsg->lock);
-+
-+	for (i = 0; i < NUM_BUFFERS; ++i) {
-+		bh = &fsg->buffhds[i];
-+		bh->state = BUF_STATE_EMPTY;
-+	}
-+	fsg->next_buffhd_to_fill = fsg->next_buffhd_to_drain =
-+			&fsg->buffhds[0];
-+
-+	new_config = fsg->new_config;
-+	old_state = fsg->state;
-+
-+	if (old_state == FSG_STATE_ABORT_BULK_OUT)
-+		fsg->state = FSG_STATE_STATUS_PHASE;
-+	else {
-+		for (i = 0; i < fsg->nluns; ++i) {
-+			curlun = &fsg->luns[i];
-+			curlun->prevent_medium_removal = 0;
-+			curlun->sense_data = curlun->unit_attention_data =
-+					SS_NO_SENSE;
-+			curlun->sense_data_info = 0;
-+			curlun->info_valid = 0;
-+		}
-+		fsg->state = FSG_STATE_IDLE;
-+	}
-+	spin_unlock_irq(&fsg->lock);
-+
-+	/* Carry out any extra actions required for the exception */
-+	switch (old_state) {
-+	default:
-+		break;
-+
-+	case FSG_STATE_ABORT_BULK_OUT:
-+		DBG(fsg, "FSG_STATE_ABORT_BULK_OUT\n");
-+		spin_lock_irq(&fsg->lock);
-+		if (fsg->state == FSG_STATE_STATUS_PHASE)
-+			fsg->state = FSG_STATE_IDLE;
-+		spin_unlock_irq(&fsg->lock);
-+		break;
-+
-+	case FSG_STATE_RESET:
-+		/* really not much to do here */
-+		break;
-+
-+	case FSG_STATE_CONFIG_CHANGE:
-+		rc = do_set_config(fsg, new_config);
-+		if (new_config == 0) {
-+			/* We're using the backing file */
-+			down_read(&fsg->filesem);
-+			fsync_all(fsg);
-+			up_read(&fsg->filesem);
-+		}
-+		break;
-+
-+	case FSG_STATE_EXIT:
-+	case FSG_STATE_TERMINATED:
-+		do_set_config(fsg, 0);			/* Free resources */
-+		spin_lock_irq(&fsg->lock);
-+		fsg->state = FSG_STATE_TERMINATED;	/* Stop the thread */
-+		spin_unlock_irq(&fsg->lock);
-+		break;
-+	}
-+}
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static int fsg_main_thread(void *fsg_)
-+{
-+	struct fsg_dev		*fsg = fsg_;
-+
-+	/* Allow the thread to be killed by a signal, but set the signal mask
-+	 * to block everything but INT, TERM, KILL, and USR1. */
-+	allow_signal(SIGINT);
-+	allow_signal(SIGTERM);
-+	allow_signal(SIGKILL);
-+	allow_signal(SIGUSR1);
-+
-+	/* Allow the thread to be frozen */
-+	set_freezable();
-+
-+	/* Arrange for userspace references to be interpreted as kernel
-+	 * pointers.  That way we can pass a kernel pointer to a routine
-+	 * that expects a __user pointer and it will work okay. */
-+	set_fs(get_ds());
-+
-+	/* The main loop */
-+	while (fsg->state != FSG_STATE_TERMINATED) {
-+		if (exception_in_progress(fsg) || signal_pending(current)) {
-+			handle_exception(fsg);
-+			continue;
-+		}
-+
-+		if (!fsg->running) {
-+			sleep_thread(fsg);
-+			continue;
-+		}
-+
-+		if (get_next_command(fsg))
-+			continue;
-+
-+		spin_lock_irq(&fsg->lock);
-+		if (!exception_in_progress(fsg))
-+			fsg->state = FSG_STATE_DATA_PHASE;
-+		spin_unlock_irq(&fsg->lock);
-+
-+		if (do_scsi_command(fsg) || finish_reply(fsg))
-+			continue;
-+
-+		spin_lock_irq(&fsg->lock);
-+		if (!exception_in_progress(fsg))
-+			fsg->state = FSG_STATE_STATUS_PHASE;
-+		spin_unlock_irq(&fsg->lock);
-+
-+		if (send_status(fsg))
-+			continue;
-+
-+		spin_lock_irq(&fsg->lock);
-+		if (!exception_in_progress(fsg))
-+			fsg->state = FSG_STATE_IDLE;
-+		spin_unlock_irq(&fsg->lock);
-+		}
-+
-+	spin_lock_irq(&fsg->lock);
-+	fsg->thread_task = NULL;
-+	spin_unlock_irq(&fsg->lock);
-+
-+	/* In case we are exiting because of a signal, unregister the
-+	 * gadget driver and close the backing file. */
-+	if (test_and_clear_bit(REGISTERED, &fsg->atomic_bitflags))
-+		close_all_backing_files(fsg);
-+
-+	/* Let the unbind and cleanup routines know the thread has exited */
-+	complete_and_exit(&fsg->thread_notifier, 0);
-+}
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/* If the next two routines are called while the gadget is registered,
-+ * the caller must own fsg->filesem for writing. */
-+
-+static int open_backing_file(struct fsg_dev *fsg, struct lun *curlun,
-+	const char *filename)
-+{
-+	int				ro;
-+	struct file			*filp = NULL;
-+	int				rc = -EINVAL;
-+	struct inode			*inode = NULL;
-+	loff_t				size;
-+	loff_t				num_sectors;
-+
-+	/* R/W if we can, R/O if we must */
-+	ro = curlun->ro;
-+	if (!ro) {
-+		filp = filp_open(filename, O_RDWR | O_LARGEFILE, 0);
-+		if (-EROFS == PTR_ERR(filp))
-+			ro = 1;
-+	}
-+	if (ro)
-+		filp = filp_open(filename, O_RDONLY | O_LARGEFILE, 0);
-+	if (IS_ERR(filp)) {
-+		LINFO(curlun, "unable to open backing file: %s\n", filename);
-+		return PTR_ERR(filp);
-+	}
-+
-+	if (!(filp->f_mode & FMODE_WRITE))
-+		ro = 1;
-+
-+	if (filp->f_path.dentry)
-+		inode = filp->f_path.dentry->d_inode;
-+	if (inode && S_ISBLK(inode->i_mode)) {
-+		if (bdev_read_only(inode->i_bdev))
-+			ro = 1;
-+	} else if (!inode || !S_ISREG(inode->i_mode)) {
-+		LINFO(curlun, "invalid file type: %s\n", filename);
-+		goto out;
-+	}
-+
-+	/* If we can't read the file, it's no good.
-+	 * If we can't write the file, use it read-only. */
-+	if (!filp->f_op || !(filp->f_op->read || filp->f_op->aio_read)) {
-+		LINFO(curlun, "file not readable: %s\n", filename);
-+		goto out;
-+	}
-+	if (!(filp->f_op->write || filp->f_op->aio_write))
-+		ro = 1;
-+
-+	size = i_size_read(inode->i_mapping->host);
-+	if (size < 0) {
-+		LINFO(curlun, "unable to find file size: %s\n", filename);
-+		rc = (int) size;
-+		goto out;
-+	}
-+	num_sectors = size >> 9;	/* File size in 512-byte sectors */
-+	if (num_sectors == 0) {
-+		LINFO(curlun, "file too small: %s\n", filename);
-+		rc = -ETOOSMALL;
-+		goto out;
-+	}
-+
-+	get_file(filp);
-+	curlun->ro = ro;
-+	curlun->filp = filp;
-+	curlun->file_length = size;
-+	curlun->num_sectors = num_sectors;
-+	LDBG(curlun, "open backing file: %s size: %lld num_sectors: %lld\n",
-+			filename, size, num_sectors);
-+	rc = 0;
-+	adjust_wake_lock(fsg);
-+
-+out:
-+	filp_close(filp, current->files);
-+	return rc;
-+}
-+
-+
-+static void close_backing_file(struct fsg_dev *fsg, struct lun *curlun)
-+{
-+	if (curlun->filp) {
-+		int rc;
-+
-+		/*
-+		 * XXX: San: Ugly hack here added to ensure that
-+		 * our pages get synced to disk.
-+		 * Also drop caches here just to be extra-safe
-+		 */
-+		rc = vfs_fsync(curlun->filp, curlun->filp->f_path.dentry, 1);
-+		if (rc < 0)
-+			printk(KERN_ERR "ums: Error syncing data (%d)\n", rc);
-+		/* drop_pagecache and drop_slab are no longer available */
-+		/* drop_pagecache(); */
-+		/* drop_slab(); */
-+
-+		LDBG(curlun, "close backing file\n");
-+		fput(curlun->filp);
-+		curlun->filp = NULL;
-+		adjust_wake_lock(fsg);
-+	}
-+}
-+
-+static void close_all_backing_files(struct fsg_dev *fsg)
-+{
-+	int	i;
-+
-+	for (i = 0; i < fsg->nluns; ++i)
-+		close_backing_file(fsg, &fsg->luns[i]);
-+}
-+
-+static ssize_t show_file(struct device *dev, struct device_attribute *attr,
-+		char *buf)
-+{
-+	struct lun	*curlun = dev_to_lun(dev);
-+	struct fsg_dev	*fsg = dev_get_drvdata(dev);
-+	char		*p;
-+	ssize_t		rc;
-+
-+	down_read(&fsg->filesem);
-+	if (backing_file_is_open(curlun)) {	/* Get the complete pathname */
-+		p = d_path(&curlun->filp->f_path, buf, PAGE_SIZE - 1);
-+		if (IS_ERR(p))
-+			rc = PTR_ERR(p);
-+		else {
-+			rc = strlen(p);
-+			memmove(buf, p, rc);
-+			buf[rc] = '\n';		/* Add a newline */
-+			buf[++rc] = 0;
-+		}
-+	} else {				/* No file, return 0 bytes */
-+		*buf = 0;
-+		rc = 0;
-+	}
-+	up_read(&fsg->filesem);
-+	return rc;
-+}
-+
-+static ssize_t store_file(struct device *dev, struct device_attribute *attr,
-+		const char *buf, size_t count)
-+{
-+	struct lun	*curlun = dev_to_lun(dev);
-+	struct fsg_dev	*fsg = dev_get_drvdata(dev);
-+	int		rc = 0;
-+
-+	DBG(fsg, "store_file: \"%s\"\n", buf);
-+#if 0
-+	/* disabled because we need to allow closing the backing file if the media was removed */
-+	if (curlun->prevent_medium_removal && backing_file_is_open(curlun)) {
-+		LDBG(curlun, "eject attempt prevented\n");
-+		return -EBUSY;				/* "Door is locked" */
-+	}
-+#endif
-+
-+	/* Remove a trailing newline */
-+	if (count > 0 && buf[count-1] == '\n')
-+		((char *) buf)[count-1] = 0;
-+
-+	/* Eject current medium */
-+	down_write(&fsg->filesem);
-+	if (backing_file_is_open(curlun)) {
-+		close_backing_file(fsg, curlun);
-+		curlun->unit_attention_data = SS_MEDIUM_NOT_PRESENT;
-+	}
-+
-+	/* Load new medium */
-+	if (count > 0 && buf[0]) {
-+		rc = open_backing_file(fsg, curlun, buf);
-+		if (rc == 0)
-+			curlun->unit_attention_data =
-+					SS_NOT_READY_TO_READY_TRANSITION;
-+	}
-+	up_write(&fsg->filesem);
-+	return (rc < 0 ? rc : count);
-+}
-+
-+
-+static DEVICE_ATTR(file, 0444, show_file, store_file);
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static void fsg_release(struct kref *ref)
-+{
-+	struct fsg_dev	*fsg = container_of(ref, struct fsg_dev, ref);
-+
-+	kfree(fsg->luns);
-+	kfree(fsg);
-+}
-+
-+static void lun_release(struct device *dev)
-+{
-+	struct fsg_dev	*fsg = dev_get_drvdata(dev);
-+
-+	kref_put(&fsg->ref, fsg_release);
-+}
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static int __init fsg_alloc(void)
-+{
-+	struct fsg_dev		*fsg;
-+
-+	fsg = kzalloc(sizeof *fsg, GFP_KERNEL);
-+	if (!fsg)
-+		return -ENOMEM;
-+	spin_lock_init(&fsg->lock);
-+	init_rwsem(&fsg->filesem);
-+	kref_init(&fsg->ref);
-+	init_completion(&fsg->thread_notifier);
-+
-+	the_fsg = fsg;
-+	return 0;
-+}
-+
-+static ssize_t print_switch_name(struct switch_dev *sdev, char *buf)
-+{
-+	return sprintf(buf, "%s\n", DRIVER_NAME);
-+}
-+
-+static ssize_t print_switch_state(struct switch_dev *sdev, char *buf)
-+{
-+	struct fsg_dev	*fsg = container_of(sdev, struct fsg_dev, sdev);
-+	return sprintf(buf, "%s\n", (fsg->config ? "online" : "offline"));
-+}
-+
-+static void
-+fsg_function_unbind(struct usb_configuration *c, struct usb_function *f)
-+{
-+	struct fsg_dev	*fsg = func_to_dev(f);
-+	int			i;
-+	struct lun		*curlun;
-+
-+	DBG(fsg, "fsg_function_unbind\n");
-+	clear_bit(REGISTERED, &fsg->atomic_bitflags);
-+
-+	/* Unregister the sysfs attribute files and the LUNs */
-+	for (i = 0; i < fsg->nluns; ++i) {
-+		curlun = &fsg->luns[i];
-+		if (curlun->registered) {
-+			device_remove_file(&curlun->dev, &dev_attr_file);
-+			device_unregister(&curlun->dev);
-+			curlun->registered = 0;
-+		}
-+	}
-+
-+	/* If the thread isn't already dead, tell it to exit now */
-+	if (fsg->state != FSG_STATE_TERMINATED) {
-+		raise_exception(fsg, FSG_STATE_EXIT);
-+		wait_for_completion(&fsg->thread_notifier);
-+
-+		/* The cleanup routine waits for this completion also */
-+		complete(&fsg->thread_notifier);
-+	}
-+
-+	/* Free the data buffers */
-+	for (i = 0; i < NUM_BUFFERS; ++i)
-+		kfree(fsg->buffhds[i].buf);
-+}
-+
-+static int __init
-+fsg_function_bind(struct usb_configuration *c, struct usb_function *f)
-+{
-+	struct usb_composite_dev *cdev = c->cdev;
-+	struct fsg_dev	*fsg = func_to_dev(f);
-+	int			rc;
-+	int			i;
-+	int			id;
-+	struct lun		*curlun;
-+	struct usb_ep		*ep;
-+	char			*pathbuf, *p;
-+
-+	fsg->cdev = cdev;
-+	DBG(fsg, "fsg_function_bind\n");
-+
-+	dev_attr_file.attr.mode = 0644;
-+
-+	/* Find out how many LUNs there should be */
-+	i = fsg->nluns;
-+	if (i == 0)
-+		i = 1;
-+	if (i > MAX_LUNS) {
-+		ERROR(fsg, "invalid number of LUNs: %d\n", i);
-+		rc = -EINVAL;
-+		goto out;
-+	}
-+
-+	/* Create the LUNs, open their backing files, and register the
-+	 * LUN devices in sysfs. */
-+	fsg->luns = kzalloc(i * sizeof(struct lun), GFP_KERNEL);
-+	if (!fsg->luns) {
-+		rc = -ENOMEM;
-+		goto out;
-+	}
-+	fsg->nluns = i;
-+
-+	for (i = 0; i < fsg->nluns; ++i) {
-+		curlun = &fsg->luns[i];
-+		curlun->ro = 0;
-+		curlun->dev.release = lun_release;
-+		curlun->dev.parent = &cdev->gadget->dev;
-+		dev_set_drvdata(&curlun->dev, fsg);
-+		snprintf(curlun->dev.bus_id, BUS_ID_SIZE,
-+				"lun%d", i);
-+
-+		rc = device_register(&curlun->dev);
-+		if (rc != 0) {
-+			INFO(fsg, "failed to register LUN%d: %d\n", i, rc);
-+			goto out;
-+		}
-+		rc = device_create_file(&curlun->dev, &dev_attr_file);
-+		if (rc != 0) {
-+			ERROR(fsg, "device_create_file failed: %d\n", rc);
-+			device_unregister(&curlun->dev);
-+			goto out;
-+		}
-+		curlun->registered = 1;
-+		kref_get(&fsg->ref);
-+	}
-+
-+	/* allocate interface ID(s) */
-+	id = usb_interface_id(c, f);
-+	if (id < 0)
-+		return id;
-+	intf_desc.bInterfaceNumber = id;
-+
-+	ep = usb_ep_autoconfig(cdev->gadget, &fs_bulk_in_desc);
-+	if (!ep)
-+		goto autoconf_fail;
-+	ep->driver_data = fsg;		/* claim the endpoint */
-+	fsg->bulk_in = ep;
-+
-+	ep = usb_ep_autoconfig(cdev->gadget, &fs_bulk_out_desc);
-+	if (!ep)
-+		goto autoconf_fail;
-+	ep->driver_data = fsg;		/* claim the endpoint */
-+	fsg->bulk_out = ep;
-+
-+	rc = -ENOMEM;
-+
-+	if (gadget_is_dualspeed(cdev->gadget)) {
-+		/* Assume endpoint addresses are the same for both speeds */
-+		hs_bulk_in_desc.bEndpointAddress =
-+				fs_bulk_in_desc.bEndpointAddress;
-+		hs_bulk_out_desc.bEndpointAddress =
-+				fs_bulk_out_desc.bEndpointAddress;
-+
-+		f->hs_descriptors = hs_function;
-+	}
-+
-+	/* Allocate the data buffers */
-+	for (i = 0; i < NUM_BUFFERS; ++i) {
-+		struct fsg_buffhd	*bh = &fsg->buffhds[i];
-+
-+		/* Allocate for the bulk-in endpoint.  We assume that
-+		 * the buffer will also work with the bulk-out (and
-+		 * interrupt-in) endpoint. */
-+		bh->buf = kmalloc(fsg->buf_size, GFP_KERNEL);
-+		if (!bh->buf)
-+			goto out;
-+		bh->next = bh + 1;
-+	}
-+	fsg->buffhds[NUM_BUFFERS - 1].next = &fsg->buffhds[0];
-+
-+	fsg->thread_task = kthread_create(fsg_main_thread, fsg,
-+			shortname);
-+	if (IS_ERR(fsg->thread_task)) {
-+		rc = PTR_ERR(fsg->thread_task);
-+		ERROR(fsg, "kthread_create failed: %d\n", rc);
-+		goto out;
-+	}
-+
-+	INFO(fsg, "Number of LUNs=%d\n", fsg->nluns);
-+
-+	pathbuf = kmalloc(PATH_MAX, GFP_KERNEL);
-+	for (i = 0; i < fsg->nluns; ++i) {
-+		curlun = &fsg->luns[i];
-+		if (backing_file_is_open(curlun)) {
-+			p = NULL;
-+			if (pathbuf) {
-+				p = d_path(&curlun->filp->f_path,
-+					   pathbuf, PATH_MAX);
-+				if (IS_ERR(p))
-+					p = NULL;
-+			}
-+			LINFO(curlun, "ro=%d, file: %s\n",
-+					curlun->ro, (p ? p : "(error)"));
-+		}
-+	}
-+	kfree(pathbuf);
-+
-+	set_bit(REGISTERED, &fsg->atomic_bitflags);
-+
-+	/* Tell the thread to start working */
-+	wake_up_process(fsg->thread_task);
-+	return 0;
-+
-+autoconf_fail:
-+	ERROR(fsg, "unable to autoconfigure all endpoints\n");
-+	rc = -ENOTSUPP;
-+
-+out:
-+	DBG(fsg, "fsg_function_bind failed: %d\n", rc);
-+	fsg->state = FSG_STATE_TERMINATED;	/* The thread is dead */
-+	fsg_function_unbind(c, f);
-+	close_all_backing_files(fsg);
-+	return rc;
-+}
-+
-+static int fsg_function_set_alt(struct usb_function *f,
-+		unsigned intf, unsigned alt)
-+{
-+	struct fsg_dev	*fsg = func_to_dev(f);
-+	DBG(fsg, "fsg_function_set_alt intf: %d alt: %d\n", intf, alt);
-+	fsg->new_config = 1;
-+	raise_exception(fsg, FSG_STATE_CONFIG_CHANGE);
-+	return 0;
-+}
-+
-+static void fsg_function_disable(struct usb_function *f)
-+{
-+	struct fsg_dev	*fsg = func_to_dev(f);
-+	DBG(fsg, "fsg_function_disable\n");
-+	fsg->new_config = 0;
-+	raise_exception(fsg, FSG_STATE_CONFIG_CHANGE);
-+}
-+
-+int __init mass_storage_function_add(struct usb_composite_dev *cdev,
-+	struct usb_configuration *c, int nluns)
-+{
-+	int		rc;
-+	struct fsg_dev	*fsg;
-+
-+	printk(KERN_INFO "mass_storage_function_add\n");
-+	rc = fsg_alloc();
-+	if (rc)
-+		return rc;
-+	fsg = the_fsg;
-+	fsg->nluns = nluns;
-+
-+	spin_lock_init(&fsg->lock);
-+	init_rwsem(&fsg->filesem);
-+	kref_init(&fsg->ref);
-+	init_completion(&fsg->thread_notifier);
-+
-+	the_fsg->buf_size = BULK_BUFFER_SIZE;
-+	the_fsg->sdev.name = DRIVER_NAME;
-+	the_fsg->sdev.print_name = print_switch_name;
-+	the_fsg->sdev.print_state = print_switch_state;
-+	rc = switch_dev_register(&the_fsg->sdev);
-+	if (rc < 0)
-+		goto err_switch_dev_register;
-+
-+	wake_lock_init(&the_fsg->wake_lock, WAKE_LOCK_SUSPEND,
-+		       "usb_mass_storage");
-+
-+	fsg->cdev = cdev;
-+	fsg->function.name = shortname;
-+	fsg->function.descriptors = fs_function;
-+	fsg->function.bind = fsg_function_bind;
-+	fsg->function.unbind = fsg_function_unbind;
-+	fsg->function.setup = fsg_function_setup;
-+	fsg->function.set_alt = fsg_function_set_alt;
-+	fsg->function.disable = fsg_function_disable;
-+
-+	rc = usb_add_function(c, &fsg->function);
-+	if (rc != 0)
-+		goto err_usb_add_function;
-+
-+	return 0;
-+
-+err_usb_add_function:
-+	switch_dev_unregister(&the_fsg->sdev);
-+err_switch_dev_register:
-+	kref_put(&the_fsg->ref, fsg_release);
-+
-+	return rc;
-+}
---- /dev/null
-+++ b/drivers/usb/gadget/f_mass_storage.h
-@@ -0,0 +1,52 @@
-+/*
-+ * drivers/usb/gadget/f_mass_storage.h
-+ *
-+ * Function Driver for USB Mass Storage
-+ *
-+ * Copyright (C) 2008 Google, Inc.
-+ * Author: Mike Lockwood <lockwood@android.com>
-+ *
-+ * Based heavily on the file_storage gadget driver in
-+ * drivers/usb/gadget/file_storage.c and licensed under the same terms:
-+ *
-+ * Copyright (C) 2003-2007 Alan Stern
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions, and the following disclaimer,
-+ *    without modification.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. The names of the above-listed copyright holders may not be used
-+ *    to endorse or promote products derived from this software without
-+ *    specific prior written permission.
-+ *
-+ * ALTERNATIVELY, this software may be distributed under the terms of the
-+ * GNU General Public License ("GPL") as published by the Free Software
-+ * Foundation, either version 2 of that License or (at your option) any
-+ * later version.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#ifndef __F_MASS_STORAGE_H
-+#define __F_MASS_STORAGE_H
-+
-+int mass_storage_function_add(struct usb_composite_dev *cdev,
-+	struct usb_configuration *c, int nluns);
-+
-+#endif /* __F_MASS_STORAGE_H */
---- /dev/null
-+++ b/include/linux/usb/android.h
-@@ -0,0 +1,40 @@
-+/*
-+ * Platform data for Android USB
-+ *
-+ * Copyright (C) 2008 Google, Inc.
-+ * Author: Mike Lockwood <lockwood@android.com>
-+ *
-+ * This software is licensed under the terms of the GNU General Public
-+ * License version 2, as published by the Free Software Foundation, and
-+ * may be copied, distributed, and modified under those terms.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ */
-+#ifndef	__LINUX_USB_ANDROID_H
-+#define	__LINUX_USB_ANDROID_H
-+
-+struct android_usb_platform_data {
-+	/* USB device descriptor fields */
-+	__u16 vendor_id;
-+
-+	/* Default product ID. */
-+	__u16 product_id;
-+
-+	/* Product ID when adb is enabled. */
-+	__u16 adb_product_id;
-+
-+	__u16 version;
-+
-+	char *product_name;
-+	char *manufacturer_name;
-+	char *serial_number;
-+
-+	/* number of LUNS for mass storage function */
-+	int nluns;
-+};
-+
-+#endif	/* __LINUX_USB_ANDROID_H */
diff --git a/target/linux/goldfish/patches-2.6.30/0105-block-block_dump-Add-number-of-sectors-to-debug-ou.patch b/target/linux/goldfish/patches-2.6.30/0105-block-block_dump-Add-number-of-sectors-to-debug-ou.patch
deleted file mode 100644
index c057e7b17..000000000
--- a/target/linux/goldfish/patches-2.6.30/0105-block-block_dump-Add-number-of-sectors-to-debug-ou.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 4d3a01ba872f67bae704e37bf888c38fa83be759 Mon Sep 17 00:00:00 2001
-From: San Mehat <san@android.com>
-Date: Sat, 21 Mar 2009 18:48:05 -0700
-Subject: [PATCH 105/134] block: block_dump: Add number of sectors to debug output
-
-Signed-off-by: San Mehat <san@android.com>
----
- block/blk-core.c |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
---- a/block/blk-core.c
-+++ b/block/blk-core.c
-@@ -1558,11 +1558,12 @@ void submit_bio(int rw, struct bio *bio)
- 
- 		if (unlikely(block_dump)) {
- 			char b[BDEVNAME_SIZE];
--			printk(KERN_DEBUG "%s(%d): %s block %Lu on %s\n",
-+			printk(KERN_DEBUG "%s(%d): %s block %Lu on %s (%u sectors)\n",
- 			current->comm, task_pid_nr(current),
- 				(rw & WRITE) ? "WRITE" : "READ",
- 				(unsigned long long)bio->bi_sector,
--				bdevname(bio->bi_bdev, b));
-+				bdevname(bio->bi_bdev, b),
-+				count);
- 		}
- 	}
- 
diff --git a/target/linux/goldfish/patches-2.6.30/0108-mmc-sd-Remove-debugging-printk.patch b/target/linux/goldfish/patches-2.6.30/0108-mmc-sd-Remove-debugging-printk.patch
deleted file mode 100644
index f9efdb35a..000000000
--- a/target/linux/goldfish/patches-2.6.30/0108-mmc-sd-Remove-debugging-printk.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 700cfcab7eee4a822be3fe0c8cfd77caac10bfed Mon Sep 17 00:00:00 2001
-From: Dima Zavin <dima@android.com>
-Date: Wed, 25 Mar 2009 21:29:45 -0700
-Subject: [PATCH 108/134] mmc: sd: Remove debugging printk
-
-Signed-off-by: Dima Zavin <dima@android.com>
----
- drivers/mmc/core/sd.c |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
---- a/drivers/mmc/core/sd.c
-+++ b/drivers/mmc/core/sd.c
-@@ -574,7 +574,6 @@ static void mmc_sd_detect(struct mmc_hos
- #ifdef CONFIG_MMC_PARANOID_SD_INIT
- 	while(retries) {
- 		err = mmc_send_status(host->card, NULL);
--		printk("%s(%s): err = %d\n", __func__, mmc_hostname(host), err);
- 		if (err) {
- 			retries--;
- 			udelay(5);
diff --git a/target/linux/goldfish/patches-2.6.30/0109-Revert-printk-remove-unused-code-from-kernel-print.patch b/target/linux/goldfish/patches-2.6.30/0109-Revert-printk-remove-unused-code-from-kernel-print.patch
deleted file mode 100644
index 26745a116..000000000
--- a/target/linux/goldfish/patches-2.6.30/0109-Revert-printk-remove-unused-code-from-kernel-print.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From fca2519ebf25db61da132932eb3fffeaa1974f43 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@android.com>
-Date: Thu, 15 Jan 2009 19:07:27 -0800
-Subject: [PATCH 109/134] Revert "printk: remove unused code from kernel/printk.c"
-
-This reverts commit acff181d3574244e651913df77332e897b88bff4.
----
- kernel/printk.c |   39 +++++++++++++++++++++++++++++++++++++++
- 1 files changed, 39 insertions(+), 0 deletions(-)
-
---- a/kernel/printk.c
-+++ b/kernel/printk.c
-@@ -255,6 +255,45 @@ static inline void boot_delay_msec(void)
- #endif
- 
- /*
-+ * Return the number of unread characters in the log buffer.
-+ */
-+static int log_buf_get_len(void)
-+{
-+	return logged_chars;
-+}
-+
-+/*
-+ * Copy a range of characters from the log buffer.
-+ */
-+int log_buf_copy(char *dest, int idx, int len)
-+{
-+	int ret, max;
-+	bool took_lock = false;
-+
-+	if (!oops_in_progress) {
-+		spin_lock_irq(&logbuf_lock);
-+		took_lock = true;
-+	}
-+
-+	max = log_buf_get_len();
-+	if (idx < 0 || idx >= max) {
-+		ret = -1;
-+	} else {
-+		if (len > max)
-+			len = max;
-+		ret = len;
-+		idx += (log_end - max);
-+		while (len-- > 0)
-+			dest[len] = LOG_BUF(idx + len);
-+	}
-+
-+	if (took_lock)
-+		spin_unlock_irq(&logbuf_lock);
-+
-+	return ret;
-+}
-+
-+/*
-  * Commands to do_syslog:
-  *
-  * 	0 -- Close the log.  Currently a NOP.
diff --git a/target/linux/goldfish/patches-2.6.30/0110-printk-Fix-log_buf_copy-termination.patch b/target/linux/goldfish/patches-2.6.30/0110-printk-Fix-log_buf_copy-termination.patch
deleted file mode 100644
index 3956090cb..000000000
--- a/target/linux/goldfish/patches-2.6.30/0110-printk-Fix-log_buf_copy-termination.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From e500cd364086cfc018b100d08c97b2fdf229d029 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@android.com>
-Date: Mon, 14 Apr 2008 21:35:25 -0700
-Subject: [PATCH 110/134] printk: Fix log_buf_copy termination.
-
-If idx was non-zero and the log had wrapped, len did not get truncated
-to stop at the last byte written to the log.
----
- kernel/printk.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/kernel/printk.c
-+++ b/kernel/printk.c
-@@ -279,8 +279,8 @@ int log_buf_copy(char *dest, int idx, in
- 	if (idx < 0 || idx >= max) {
- 		ret = -1;
- 	} else {
--		if (len > max)
--			len = max;
-+		if (len > max - idx)
-+			len = max - idx;
- 		ret = len;
- 		idx += (log_end - max);
- 		while (len-- > 0)
diff --git a/target/linux/goldfish/patches-2.6.30/0118--ARM-goldfish-Add-goldfish-platform.patch b/target/linux/goldfish/patches-2.6.30/0118--ARM-goldfish-Add-goldfish-platform.patch
deleted file mode 100644
index c05c78230..000000000
--- a/target/linux/goldfish/patches-2.6.30/0118--ARM-goldfish-Add-goldfish-platform.patch
+++ /dev/null
@@ -1,2127 +0,0 @@
-From 7cc9c853cf4657bc971a3bf8736fa0412f23eea2 Mon Sep 17 00:00:00 2001
-From: Mike A. Chan <mikechan@google.com>
-Date: Tue, 14 Oct 2008 19:46:11 -0700
-Subject: [PATCH 118/134] [ARM] goldfish: Add goldfish platform.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Mike A. Chan <mikechan@google.com>
-Signed-off-by: Arve Hjønnevåg <arve@android.com>
----
- arch/arm/Kconfig                                  |   10 +
- arch/arm/Makefile                                 |    1 +
- arch/arm/configs/goldfish_defconfig               | 1166 +++++++++++++++++++++
- arch/arm/mach-goldfish/Kconfig                    |   11 +
- arch/arm/mach-goldfish/Makefile                   |    9 +
- arch/arm/mach-goldfish/Makefile.boot              |    4 +
- arch/arm/mach-goldfish/board-goldfish.c           |  122 +++
- arch/arm/mach-goldfish/include/mach/dma.h         |    1 +
- arch/arm/mach-goldfish/include/mach/entry-macro.S |   34 +
- arch/arm/mach-goldfish/include/mach/hardware.h    |   44 +
- arch/arm/mach-goldfish/include/mach/io.h          |   24 +
- arch/arm/mach-goldfish/include/mach/irqs.h        |   24 +
- arch/arm/mach-goldfish/include/mach/memory.h      |   35 +
- arch/arm/mach-goldfish/include/mach/system.h      |   30 +
- arch/arm/mach-goldfish/include/mach/timer.h       |   28 +
- arch/arm/mach-goldfish/include/mach/timex.h       |   24 +
- arch/arm/mach-goldfish/include/mach/uncompress.h  |   40 +
- arch/arm/mach-goldfish/include/mach/vmalloc.h     |   21 +
- arch/arm/mach-goldfish/pdev_bus.c                 |  222 ++++
- arch/arm/mach-goldfish/timer.c                    |  147 +++
- 20 files changed, 1997 insertions(+), 0 deletions(-)
- create mode 100644 arch/arm/configs/goldfish_defconfig
- create mode 100644 arch/arm/mach-goldfish/Kconfig
- create mode 100644 arch/arm/mach-goldfish/Makefile
- create mode 100644 arch/arm/mach-goldfish/Makefile.boot
- create mode 100644 arch/arm/mach-goldfish/board-goldfish.c
- create mode 100644 arch/arm/mach-goldfish/include/mach/dma.h
- create mode 100644 arch/arm/mach-goldfish/include/mach/entry-macro.S
- create mode 100644 arch/arm/mach-goldfish/include/mach/hardware.h
- create mode 100644 arch/arm/mach-goldfish/include/mach/io.h
- create mode 100644 arch/arm/mach-goldfish/include/mach/irqs.h
- create mode 100644 arch/arm/mach-goldfish/include/mach/memory.h
- create mode 100644 arch/arm/mach-goldfish/include/mach/system.h
- create mode 100644 arch/arm/mach-goldfish/include/mach/timer.h
- create mode 100644 arch/arm/mach-goldfish/include/mach/timex.h
- create mode 100644 arch/arm/mach-goldfish/include/mach/uncompress.h
- create mode 100644 arch/arm/mach-goldfish/include/mach/vmalloc.h
- create mode 100644 arch/arm/mach-goldfish/pdev_bus.c
- create mode 100644 arch/arm/mach-goldfish/timer.c
-
---- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -206,6 +206,14 @@ config ARCH_AAEC2000
- 	help
- 	  This enables support for systems based on the Agilent AAEC-2000
- 
-+config ARCH_GOLDFISH
-+	bool "Goldfish"
-+	select CPU_ARM926T
-+	select GENERIC_TIME
-+	select GENERIC_CLOCKEVENTS
-+	help
-+	  Support for Goldfish Virtual Platform.
-+
- config ARCH_INTEGRATOR
- 	bool "ARM Ltd. Integrator family"
- 	select ARM_AMBA
-@@ -620,6 +628,8 @@ config ARCH_W90X900
- 
- endchoice
- 
-+source "arch/arm/mach-goldfish/Kconfig"
-+
- source "arch/arm/mach-clps711x/Kconfig"
- 
- source "arch/arm/mach-ep93xx/Kconfig"
---- a/arch/arm/Makefile
-+++ b/arch/arm/Makefile
-@@ -138,6 +138,7 @@ endif
-  machine-$(CONFIG_ARCH_IMX)	   := imx
-  machine-$(CONFIG_ARCH_H720X)	   := h720x
-  machine-$(CONFIG_ARCH_AAEC2000)   := aaec2000
-+ machine-$(CONFIG_ARCH_GOLDFISH)   := goldfish
-  machine-$(CONFIG_ARCH_REALVIEW)   := realview
-  machine-$(CONFIG_ARCH_AT91)	   := at91
-  machine-$(CONFIG_ARCH_EP93XX)	   := ep93xx
---- /dev/null
-+++ b/arch/arm/configs/goldfish_defconfig
-@@ -0,0 +1,1166 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.29
-+# Wed Apr  8 20:40:44 2009
-+#
-+CONFIG_ARM=y
-+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-+# CONFIG_GENERIC_GPIO is not set
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_MMU=y
-+# CONFIG_NO_IOPORT is not set
-+CONFIG_GENERIC_HARDIRQS=y
-+CONFIG_STACKTRACE_SUPPORT=y
-+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-+CONFIG_LOCKDEP_SUPPORT=y
-+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-+CONFIG_HARDIRQS_SW_RESEND=y
-+CONFIG_GENERIC_IRQ_PROBE=y
-+CONFIG_RWSEM_GENERIC_SPINLOCK=y
-+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-+CONFIG_VECTORS_BASE=0xffff0000
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+
-+#
-+# RCU Subsystem
-+#
-+CONFIG_CLASSIC_RCU=y
-+# CONFIG_TREE_RCU is not set
-+# CONFIG_PREEMPT_RCU is not set
-+# CONFIG_TREE_RCU_TRACE is not set
-+# CONFIG_PREEMPT_RCU_TRACE is not set
-+CONFIG_IKCONFIG=y
-+CONFIG_IKCONFIG_PROC=y
-+CONFIG_LOG_BUF_SHIFT=16
-+# CONFIG_GROUP_SCHED is not set
-+# CONFIG_CGROUPS is not set
-+# CONFIG_SYSFS_DEPRECATED_V2 is not set
-+# CONFIG_RELAY is not set
-+CONFIG_NAMESPACES=y
-+# CONFIG_UTS_NS is not set
-+# CONFIG_IPC_NS is not set
-+# CONFIG_USER_NS is not set
-+# CONFIG_PID_NS is not set
-+# CONFIG_NET_NS is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-+CONFIG_SYSCTL=y
-+CONFIG_ANON_INODES=y
-+CONFIG_PANIC_TIMEOUT=0
-+# CONFIG_EMBEDDED is not set
-+CONFIG_UID16=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_ALL is not set
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_AIO=y
-+CONFIG_ASHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_SLAB=y
-+# CONFIG_SLUB is not set
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+CONFIG_BASE_SMALL=0
-+# CONFIG_MODULES is not set
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+# CONFIG_BLK_DEV_INTEGRITY is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_AS=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="anticipatory"
-+CONFIG_FREEZER=y
-+
-+#
-+# System Type
-+#
-+# CONFIG_ARCH_AAEC2000 is not set
-+CONFIG_ARCH_GOLDFISH=y
-+# CONFIG_ARCH_INTEGRATOR is not set
-+# CONFIG_ARCH_REALVIEW is not set
-+# CONFIG_ARCH_VERSATILE is not set
-+# CONFIG_ARCH_AT91 is not set
-+# CONFIG_ARCH_CLPS711X is not set
-+# CONFIG_ARCH_EBSA110 is not set
-+# CONFIG_ARCH_EP93XX is not set
-+# CONFIG_ARCH_FOOTBRIDGE is not set
-+# 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_IXP23XX is not set
-+# CONFIG_ARCH_IXP2000 is not set
-+# CONFIG_ARCH_IXP4XX is not set
-+# CONFIG_ARCH_L7200 is not set
-+# CONFIG_ARCH_KIRKWOOD is not set
-+# CONFIG_ARCH_KS8695 is not set
-+# CONFIG_ARCH_NS9XXX is not set
-+# CONFIG_ARCH_LOKI is not set
-+# CONFIG_ARCH_MV78XX0 is not set
-+# CONFIG_ARCH_MXC is not set
-+# CONFIG_ARCH_ORION5X is not set
-+# CONFIG_ARCH_PNX4008 is not set
-+# CONFIG_ARCH_PXA is not set
-+# CONFIG_ARCH_RPC is not set
-+# CONFIG_ARCH_SA1100 is not set
-+# CONFIG_ARCH_S3C2410 is not set
-+# CONFIG_ARCH_S3C64XX is not set
-+# CONFIG_ARCH_SHARK is not set
-+# CONFIG_ARCH_LH7A40X is not set
-+# CONFIG_ARCH_DAVINCI is not set
-+# CONFIG_ARCH_OMAP is not set
-+# CONFIG_ARCH_MSM is not set
-+# CONFIG_ARCH_W90X900 is not set
-+
-+#
-+# Goldfish Options
-+#
-+CONFIG_MACH_GOLDFISH=y
-+
-+#
-+# Processor Type
-+#
-+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
-+CONFIG_CPU_CP15=y
-+CONFIG_CPU_CP15_MMU=y
-+
-+#
-+# Processor Features
-+#
-+CONFIG_ARM_THUMB=y
-+# CONFIG_CPU_ICACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
-+# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
-+# CONFIG_OUTER_CACHE is not set
-+
-+#
-+# Bus support
-+#
-+# CONFIG_PCI_SYSCALL is not set
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
-+# CONFIG_PCCARD is not set
-+
-+#
-+# Kernel Features
-+#
-+CONFIG_TICK_ONESHOT=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+CONFIG_VMSPLIT_3G=y
-+# CONFIG_VMSPLIT_2G is not set
-+# CONFIG_VMSPLIT_1G is not set
-+CONFIG_PAGE_OFFSET=0xC0000000
-+# CONFIG_PREEMPT is not set
-+CONFIG_HZ=100
-+CONFIG_AEABI=y
-+# CONFIG_OABI_COMPAT is not set
-+CONFIG_ARCH_FLATMEM_HAS_HOLES=y
-+# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
-+# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+CONFIG_PAGEFLAGS_EXTENDED=y
-+CONFIG_SPLIT_PTLOCK_CPUS=4096
-+# CONFIG_PHYS_ADDR_T_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=0
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_UNEVICTABLE_LRU=y
-+CONFIG_ALIGNMENT_TRAP=y
-+
-+#
-+# Boot options
-+#
-+CONFIG_ZBOOT_ROM_TEXT=0x0
-+CONFIG_ZBOOT_ROM_BSS=0x0
-+CONFIG_CMDLINE=""
-+# CONFIG_XIP_KERNEL is not set
-+# CONFIG_KEXEC is not set
-+
-+#
-+# CPU Power Management
-+#
-+# CONFIG_CPU_IDLE is not set
-+
-+#
-+# Floating point emulation
-+#
-+
-+#
-+# At least one emulation must be selected
-+#
-+CONFIG_VFP=y
-+
-+#
-+# Userspace binary formats
-+#
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-+CONFIG_HAVE_AOUT=y
-+# CONFIG_BINFMT_AOUT is not set
-+CONFIG_BINFMT_MISC=y
-+
-+#
-+# Power management options
-+#
-+CONFIG_PM=y
-+# CONFIG_PM_DEBUG is not set
-+CONFIG_PM_SLEEP=y
-+CONFIG_SUSPEND=y
-+CONFIG_SUSPEND_FREEZER=y
-+CONFIG_HAS_WAKELOCK=y
-+CONFIG_HAS_EARLYSUSPEND=y
-+CONFIG_WAKELOCK=y
-+CONFIG_WAKELOCK_STAT=y
-+CONFIG_USER_WAKELOCK=y
-+CONFIG_EARLYSUSPEND=y
-+# CONFIG_NO_USER_SPACE_SCREEN_ACCESS_CONTROL is not set
-+CONFIG_CONSOLE_EARLYSUSPEND=y
-+# CONFIG_FB_EARLYSUSPEND is not set
-+# CONFIG_APM_EMULATION is not set
-+CONFIG_ARCH_SUSPEND_POSSIBLE=y
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_COMPAT_NET_DEV_OPS=y
-+CONFIG_PACKET=y
-+CONFIG_PACKET_MMAP=y
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+CONFIG_XFRM_IPCOMP=y
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+CONFIG_NET_IPIP=y
-+CONFIG_NET_IPGRE=y
-+CONFIG_NET_IPGRE_BROADCAST=y
-+CONFIG_IP_MROUTE=y
-+CONFIG_IP_PIMSM_V1=y
-+CONFIG_IP_PIMSM_V2=y
-+CONFIG_ARPD=y
-+CONFIG_SYN_COOKIES=y
-+CONFIG_INET_AH=y
-+CONFIG_INET_ESP=y
-+CONFIG_INET_IPCOMP=y
-+CONFIG_INET_XFRM_TUNNEL=y
-+CONFIG_INET_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+CONFIG_ANDROID_PARANOID_NETWORK=y
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+CONFIG_STP=y
-+CONFIG_BRIDGE=y
-+# CONFIG_NET_DSA is not set
-+CONFIG_VLAN_8021Q=y
-+# CONFIG_VLAN_8021Q_GVRP is not set
-+# CONFIG_DECNET is not set
-+CONFIG_LLC=y
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+# CONFIG_DCB is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+# CONFIG_PHONET is not set
-+CONFIG_WIRELESS=y
-+# CONFIG_CFG80211 is not set
-+CONFIG_WIRELESS_OLD_REGULATORY=y
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_LIB80211 is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_WIMAX is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=y
-+CONFIG_FIRMWARE_IN_KERNEL=y
-+CONFIG_EXTRA_FIRMWARE=""
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=y
-+CONFIG_PROC_EVENTS=y
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+# CONFIG_MTD_PARTITIONS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+CONFIG_MTD_BLOCK=y
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+# CONFIG_MTD_CFI is not set
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+# CONFIG_MTD_RAM is not set
-+# CONFIG_MTD_ROM is not set
-+# CONFIG_MTD_ABSENT is not set
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+CONFIG_MTD_GOLDFISH_NAND=y
-+# CONFIG_MTD_NAND is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# LPDDR flash memory drivers
-+#
-+# CONFIG_MTD_LPDDR is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+CONFIG_BLK_DEV_NBD=y
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=8192
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+CONFIG_ANDROID_PMEM=y
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+# CONFIG_KERNEL_DEBUGGER_CORE is not set
-+# CONFIG_UID_STAT is not set
-+CONFIG_QEMU_TRACE=y
-+# CONFIG_C2PORT is not set
-+
-+#
-+# EEPROM support
-+#
-+# CONFIG_EEPROM_93CX6 is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_AX88796 is not set
-+CONFIG_SMC91X=y
-+# CONFIG_DM9000 is not set
-+# CONFIG_SMC911X is not set
-+# CONFIG_SMSC911X is not set
-+# CONFIG_DNET is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
-+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
-+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+CONFIG_NETDEV_10000=y
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_IWLWIFI_LEDS is not set
-+
-+#
-+# Enable WiMAX (Networking options) to see the WiMAX drivers
-+#
-+# CONFIG_WAN is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+CONFIG_INPUT_MOUSEDEV=y
-+CONFIG_INPUT_MOUSEDEV_PSAUX=y
-+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-+# CONFIG_INPUT_JOYDEV is not set
-+CONFIG_INPUT_EVDEV=y
-+# CONFIG_INPUT_EVBUG is not set
-+# CONFIG_INPUT_KEYRESET is not set
-+
-+#
-+# Input Device Drivers
-+#
-+CONFIG_INPUT_KEYBOARD=y
-+CONFIG_KEYBOARD_ATKBD=y
-+# CONFIG_KEYBOARD_SUNKBD is not set
-+# CONFIG_KEYBOARD_LKKBD is not set
-+# CONFIG_KEYBOARD_XTKBD is not set
-+# CONFIG_KEYBOARD_NEWTON is not set
-+# CONFIG_KEYBOARD_STOWAWAY is not set
-+CONFIG_KEYBOARD_GOLDFISH_EVENTS=y
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+CONFIG_INPUT_MISC=y
-+# CONFIG_INPUT_ATI_REMOTE is not set
-+# CONFIG_INPUT_ATI_REMOTE2 is not set
-+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
-+# CONFIG_INPUT_POWERMATE is not set
-+# CONFIG_INPUT_YEALINK is not set
-+# CONFIG_INPUT_CM109 is not set
-+# CONFIG_INPUT_UINPUT is not set
-+# CONFIG_INPUT_GPIO is not set
-+# CONFIG_INPUT_KEYCHORD is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+CONFIG_SERIO=y
-+# CONFIG_SERIO_SERPORT is not set
-+CONFIG_SERIO_LIBPS2=y
-+# CONFIG_SERIO_RAW is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+CONFIG_VT=y
-+CONFIG_CONSOLE_TRANSLATIONS=y
-+CONFIG_VT_CONSOLE=y
-+CONFIG_HW_CONSOLE=y
-+# CONFIG_VT_HW_CONSOLE_BINDING is not set
-+CONFIG_DEVMEM=y
-+CONFIG_DEVKMEM=y
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+# CONFIG_SERIAL_8250 is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+CONFIG_UNIX98_PTYS=y
-+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
-+# CONFIG_LEGACY_PTYS is not set
-+# CONFIG_IPMI_HANDLER is not set
-+CONFIG_HW_RANDOM=y
-+# CONFIG_R3964 is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+# CONFIG_DCC_TTY is not set
-+CONFIG_GOLDFISH_TTY=y
-+# CONFIG_I2C is not set
-+# CONFIG_SPI is not set
-+# CONFIG_W1 is not set
-+CONFIG_POWER_SUPPLY=y
-+# CONFIG_POWER_SUPPLY_DEBUG is not set
-+# CONFIG_PDA_POWER is not set
-+# CONFIG_BATTERY_DS2760 is not set
-+CONFIG_BATTERY_GOLDFISH=y
-+# CONFIG_HWMON is not set
-+# CONFIG_THERMAL is not set
-+# CONFIG_THERMAL_HWMON is not set
-+# CONFIG_WATCHDOG is not set
-+CONFIG_SSB_POSSIBLE=y
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_CORE is not set
-+# CONFIG_MFD_SM501 is not set
-+# CONFIG_HTC_PASIC3 is not set
-+# CONFIG_MFD_TMIO is not set
-+
-+#
-+# Multimedia devices
-+#
-+
-+#
-+# Multimedia core support
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+# CONFIG_VIDEO_MEDIA is not set
-+
-+#
-+# Multimedia drivers
-+#
-+# CONFIG_DAB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_VGASTATE is not set
-+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-+CONFIG_FB=y
-+# CONFIG_FIRMWARE_EDID is not set
-+# CONFIG_FB_DDC is not set
-+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
-+CONFIG_FB_CFB_FILLRECT=y
-+CONFIG_FB_CFB_COPYAREA=y
-+CONFIG_FB_CFB_IMAGEBLIT=y
-+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-+# CONFIG_FB_SYS_FILLRECT is not set
-+# CONFIG_FB_SYS_COPYAREA is not set
-+# CONFIG_FB_SYS_IMAGEBLIT is not set
-+# CONFIG_FB_FOREIGN_ENDIAN is not set
-+# CONFIG_FB_SYS_FOPS is not set
-+# CONFIG_FB_SVGALIB is not set
-+# CONFIG_FB_MACMODES is not set
-+# CONFIG_FB_BACKLIGHT is not set
-+CONFIG_FB_MODE_HELPERS=y
-+CONFIG_FB_TILEBLITTING=y
-+
-+#
-+# Frame buffer hardware drivers
-+#
-+# CONFIG_FB_UVESA is not set
-+# CONFIG_FB_S1D13XXX is not set
-+CONFIG_FB_GOLDFISH=y
-+# CONFIG_FB_VIRTUAL is not set
-+# CONFIG_FB_METRONOME is not set
-+# CONFIG_FB_MB862XX is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Console display driver support
-+#
-+# 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
-+CONFIG_FONT_8x16=y
-+# CONFIG_LOGO is not set
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+# CONFIG_HID_PID is not set
-+
-+#
-+# Special HID drivers
-+#
-+CONFIG_HID_COMPAT=y
-+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
-+# CONFIG_USB is not set
-+
-+#
-+# Enable Host or Gadget support to see Inventra options
-+#
-+
-+#
-+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
-+#
-+# CONFIG_USB_GADGET is not set
-+
-+#
-+# OTG and related infrastructure
-+#
-+CONFIG_MMC=y
-+# CONFIG_MMC_DEBUG is not set
-+# CONFIG_MMC_UNSAFE_RESUME is not set
-+# CONFIG_MMC_EMBEDDED_SDIO is not set
-+# CONFIG_MMC_PARANOID_SD_INIT is not set
-+
-+#
-+# MMC/SD/SDIO Card Drivers
-+#
-+CONFIG_MMC_BLOCK=y
-+CONFIG_MMC_BLOCK_BOUNCE=y
-+CONFIG_MMC_BLOCK_PARANOID_RESUME=y
-+# CONFIG_SDIO_UART is not set
-+# CONFIG_MMC_TEST is not set
-+
-+#
-+# MMC/SD/SDIO Host Controller Drivers
-+#
-+# CONFIG_MMC_SDHCI is not set
-+CONFIG_MMC_GOLDFISH=y
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_ACCESSIBILITY is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_SWITCH is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+# CONFIG_RTC_DEBUG is not set
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-+CONFIG_RTC_INTF_ALARM=y
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+
-+#
-+# Platform RTC drivers
-+#
-+# CONFIG_RTC_DRV_CMOS is not set
-+# CONFIG_RTC_DRV_DS1286 is not set
-+# CONFIG_RTC_DRV_DS1511 is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_M48T35 is not set
-+# CONFIG_RTC_DRV_M48T59 is not set
-+# CONFIG_RTC_DRV_BQ4802 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+CONFIG_RTC_DRV_GOLDFISH=y
-+# CONFIG_DMADEVICES is not set
-+# CONFIG_REGULATOR is not set
-+# CONFIG_UIO is not set
-+CONFIG_STAGING=y
-+# CONFIG_STAGING_EXCLUDE_BUILD is not set
-+# CONFIG_ECHO is not set
-+
-+#
-+# Android
-+#
-+CONFIG_ANDROID=y
-+CONFIG_ANDROID_BINDER_IPC=y
-+CONFIG_ANDROID_LOGGER=y
-+# CONFIG_ANDROID_RAM_CONSOLE is not set
-+CONFIG_ANDROID_TIMED_OUTPUT=y
-+CONFIG_ANDROID_LOW_MEMORY_KILLER=y
-+
-+#
-+# File systems
-+#
-+# CONFIG_EXT2_FS is not set
-+# CONFIG_EXT3_FS is not set
-+# CONFIG_EXT4_FS is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+CONFIG_FILE_LOCKING=y
-+# CONFIG_XFS_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+# CONFIG_BTRFS_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+# CONFIG_ISO9660_FS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+CONFIG_FAT_FS=y
-+CONFIG_MSDOS_FS=y
-+CONFIG_VFAT_FS=y
-+CONFIG_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+CONFIG_MISC_FILESYSTEMS=y
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+CONFIG_YAFFS_FS=y
-+CONFIG_YAFFS_YAFFS1=y
-+# CONFIG_YAFFS_9BYTE_TAGS is not set
-+# CONFIG_YAFFS_DOES_ECC is not set
-+CONFIG_YAFFS_YAFFS2=y
-+CONFIG_YAFFS_AUTO_YAFFS2=y
-+# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
-+# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
-+# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
-+CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
-+# CONFIG_JFFS2_FS is not set
-+# CONFIG_CRAMFS is not set
-+# CONFIG_SQUASHFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_OMFS_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+# CONFIG_NFS_FS is not set
-+CONFIG_NFSD=y
-+CONFIG_NFSD_V3=y
-+# CONFIG_NFSD_V3_ACL is not set
-+# CONFIG_NFSD_V4 is not set
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_EXPORTFS=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_REGISTER_V4 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+CONFIG_SMB_FS=y
-+# CONFIG_SMB_NLS_DEFAULT is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+CONFIG_NLS=y
-+CONFIG_NLS_DEFAULT="iso8859-1"
-+CONFIG_NLS_CODEPAGE_437=y
-+# CONFIG_NLS_CODEPAGE_737 is not set
-+# CONFIG_NLS_CODEPAGE_775 is not set
-+# CONFIG_NLS_CODEPAGE_850 is not set
-+# CONFIG_NLS_CODEPAGE_852 is not set
-+# CONFIG_NLS_CODEPAGE_855 is not set
-+# CONFIG_NLS_CODEPAGE_857 is not set
-+# CONFIG_NLS_CODEPAGE_860 is not set
-+# CONFIG_NLS_CODEPAGE_861 is not set
-+# CONFIG_NLS_CODEPAGE_862 is not set
-+# CONFIG_NLS_CODEPAGE_863 is not set
-+# CONFIG_NLS_CODEPAGE_864 is not set
-+# CONFIG_NLS_CODEPAGE_865 is not set
-+# CONFIG_NLS_CODEPAGE_866 is not set
-+# CONFIG_NLS_CODEPAGE_869 is not set
-+# CONFIG_NLS_CODEPAGE_936 is not set
-+# CONFIG_NLS_CODEPAGE_950 is not set
-+# CONFIG_NLS_CODEPAGE_932 is not set
-+# CONFIG_NLS_CODEPAGE_949 is not set
-+# CONFIG_NLS_CODEPAGE_874 is not set
-+# CONFIG_NLS_ISO8859_8 is not set
-+# CONFIG_NLS_CODEPAGE_1250 is not set
-+# CONFIG_NLS_CODEPAGE_1251 is not set
-+# CONFIG_NLS_ASCII is not set
-+CONFIG_NLS_ISO8859_1=y
-+# CONFIG_NLS_ISO8859_2 is not set
-+# CONFIG_NLS_ISO8859_3 is not set
-+# CONFIG_NLS_ISO8859_4 is not set
-+# CONFIG_NLS_ISO8859_5 is not set
-+# CONFIG_NLS_ISO8859_6 is not set
-+# CONFIG_NLS_ISO8859_7 is not set
-+# CONFIG_NLS_ISO8859_9 is not set
-+# CONFIG_NLS_ISO8859_13 is not set
-+# CONFIG_NLS_ISO8859_14 is not set
-+# CONFIG_NLS_ISO8859_15 is not set
-+# CONFIG_NLS_KOI8_R is not set
-+# CONFIG_NLS_KOI8_U is not set
-+# CONFIG_NLS_UTF8 is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_FRAME_WARN=1024
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+# CONFIG_DETECT_SOFTLOCKUP is not set
-+CONFIG_SCHED_DEBUG=y
-+CONFIG_SCHEDSTATS=y
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_DEBUG_OBJECTS is not set
-+# CONFIG_DEBUG_SLAB is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_LOCK_ALLOC is not set
-+# CONFIG_PROVE_LOCKING is not set
-+# CONFIG_LOCK_STAT is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+CONFIG_DEBUG_BUGVERBOSE=y
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_WRITECOUNT is not set
-+CONFIG_DEBUG_MEMORY_INIT=y
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_DEBUG_NOTIFIERS is not set
-+CONFIG_FRAME_POINTER=y
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_LATENCYTOP is not set
-+# CONFIG_SYSCTL_SYSCALL_CHECK is not set
-+CONFIG_HAVE_FUNCTION_TRACER=y
-+
-+#
-+# Tracers
-+#
-+# CONFIG_FUNCTION_TRACER is not set
-+# CONFIG_IRQSOFF_TRACER is not set
-+# CONFIG_SCHED_TRACER is not set
-+# CONFIG_CONTEXT_SWITCH_TRACER is not set
-+# CONFIG_BOOT_TRACER is not set
-+# CONFIG_TRACE_BRANCH_PROFILING is not set
-+# CONFIG_STACK_TRACER is not set
-+# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
-+# CONFIG_SAMPLES is not set
-+CONFIG_HAVE_ARCH_KGDB=y
-+# CONFIG_KGDB is not set
-+# CONFIG_DEBUG_USER is not set
-+# CONFIG_DEBUG_ERRORS is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_LL is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITYFS is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+
-+#
-+# Crypto core or helper
-+#
-+# CONFIG_CRYPTO_FIPS is not set
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_ALGAPI2=y
-+CONFIG_CRYPTO_AEAD=y
-+CONFIG_CRYPTO_AEAD2=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+CONFIG_CRYPTO_BLKCIPHER2=y
-+CONFIG_CRYPTO_HASH=y
-+CONFIG_CRYPTO_HASH2=y
-+CONFIG_CRYPTO_RNG2=y
-+CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_MANAGER2=y
-+# CONFIG_CRYPTO_GF128MUL is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_AUTHENC=y
-+
-+#
-+# Authenticated Encryption with Associated Data
-+#
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_SEQIV is not set
-+
-+#
-+# Block modes
-+#
-+CONFIG_CRYPTO_CBC=y
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_CTS is not set
-+CONFIG_CRYPTO_ECB=y
-+# CONFIG_CRYPTO_LRW is not set
-+CONFIG_CRYPTO_PCBC=y
-+# CONFIG_CRYPTO_XTS is not set
-+
-+#
-+# Hash modes
-+#
-+CONFIG_CRYPTO_HMAC=y
-+# CONFIG_CRYPTO_XCBC is not set
-+
-+#
-+# Digest
-+#
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+CONFIG_CRYPTO_MD5=y
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_RMD128 is not set
-+# CONFIG_CRYPTO_RMD160 is not set
-+# CONFIG_CRYPTO_RMD256 is not set
-+# CONFIG_CRYPTO_RMD320 is not set
-+CONFIG_CRYPTO_SHA1=y
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+
-+#
-+# Ciphers
-+#
-+# CONFIG_CRYPTO_AES is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_ARC4 is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+
-+#
-+# Compression
-+#
-+CONFIG_CRYPTO_DEFLATE=y
-+# CONFIG_CRYPTO_LZO is not set
-+
-+#
-+# Random Number Generation
-+#
-+# CONFIG_CRYPTO_ANSI_CPRNG is not set
-+CONFIG_CRYPTO_HW=y
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+CONFIG_GENERIC_FIND_LAST_BIT=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_T10DIF 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
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
---- /dev/null
-+++ b/arch/arm/mach-goldfish/Kconfig
-@@ -0,0 +1,11 @@
-+if ARCH_GOLDFISH
-+
-+menu "Goldfish Options"
-+
-+config MACH_GOLDFISH
-+	bool "Goldfish (Virtual Platform)"
-+	select CPU_ARM926T
-+
-+endmenu
-+
-+endif
---- /dev/null
-+++ b/arch/arm/mach-goldfish/Makefile
-@@ -0,0 +1,9 @@
-+#
-+# Makefile for the linux kernel.
-+#
-+
-+# Object file lists.
-+
-+obj-y				:= pdev_bus.o timer.o
-+obj-$(CONFIG_MACH_GOLDFISH)	+= board-goldfish.o
-+
---- /dev/null
-+++ b/arch/arm/mach-goldfish/Makefile.boot
-@@ -0,0 +1,4 @@
-+   zreladdr-y	:= 0x00008000
-+params_phys-y	:= 0x00000100
-+initrd_phys-y	:= 0x00800000
-+
---- /dev/null
-+++ b/arch/arm/mach-goldfish/board-goldfish.c
-@@ -0,0 +1,122 @@
-+/* arch/arm/mach-goldfish/board-goldfish.c
-+**
-+** Copyright (C) 2007 Google, Inc.
-+**
-+** This software is licensed under the terms of the GNU General Public
-+** License version 2, as published by the Free Software Foundation, and
-+** may be copied, distributed, and modified under those terms.
-+**
-+** This program is distributed in the hope that it will be useful,
-+** but WITHOUT ANY WARRANTY; without even the implied warranty of
-+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+** GNU General Public License for more details.
-+**
-+*/
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/interrupt.h>
-+#include <linux/irq.h>
-+#include <linux/platform_device.h>
-+#include <linux/delay.h>
-+#include <linux/mtd/mtd.h>
-+#include <linux/mtd/nand.h>
-+#include <linux/mtd/partitions.h>
-+#include <linux/input.h>
-+
-+#include <mach/hardware.h>
-+#include <asm/io.h>
-+#include <asm/mach-types.h>
-+#include <asm/mach/arch.h>
-+#include <asm/mach/flash.h>
-+#include <asm/mach/map.h>
-+#include <asm/mach/time.h>
-+
-+int GOLDFISH_READY = 0;
-+
-+static struct resource goldfish_pdev_bus_resources[] = {
-+	{
-+		.start  = GOLDFISH_PDEV_BUS_BASE,
-+		.end    = GOLDFISH_PDEV_BUS_BASE + GOLDFISH_PDEV_BUS_END - 1,
-+		.flags  = IORESOURCE_IO,
-+	},
-+	{
-+		.start	= IRQ_PDEV_BUS,
-+		.end	= IRQ_PDEV_BUS,
-+		.flags	= IORESOURCE_IRQ,
-+	}
-+};
-+
-+
-+struct platform_device goldfish_pdev_bus_device = {
-+	.name = "goldfish_pdev_bus",
-+	.id = -1,
-+	.num_resources = ARRAY_SIZE(goldfish_pdev_bus_resources),
-+	.resource = goldfish_pdev_bus_resources
-+};
-+
-+static void __init goldfish_init(void)
-+{
-+	platform_device_register(&goldfish_pdev_bus_device);
-+}
-+
-+void goldfish_mask_irq(unsigned int irq)
-+{
-+	writel(irq, IO_ADDRESS(GOLDFISH_INTERRUPT_BASE) + GOLDFISH_INTERRUPT_DISABLE);
-+}
-+
-+void goldfish_unmask_irq(unsigned int irq)
-+{
-+	writel(irq, IO_ADDRESS(GOLDFISH_INTERRUPT_BASE) + GOLDFISH_INTERRUPT_ENABLE);
-+}
-+
-+static struct irq_chip goldfish_irq_chip = {
-+	.name	= "goldfish",
-+	.mask	= goldfish_mask_irq,
-+	.mask_ack = goldfish_mask_irq,
-+	.unmask = goldfish_unmask_irq,
-+};
-+
-+void goldfish_init_irq(void)
-+{
-+	unsigned int i;
-+	uint32_t int_base = IO_ADDRESS(GOLDFISH_INTERRUPT_BASE);
-+
-+	/*
-+	 * Disable all interrupt sources
-+	 */
-+	writel(1, int_base + GOLDFISH_INTERRUPT_DISABLE_ALL);
-+
-+	for (i = 0; i < NR_IRQS; i++) {
-+		set_irq_chip(i, &goldfish_irq_chip);
-+		set_irq_handler(i, handle_level_irq);
-+		set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
-+	}
-+}
-+
-+static struct map_desc goldfish_io_desc[] __initdata = {
-+	{
-+		.virtual	= IO_BASE,
-+		.pfn		= __phys_to_pfn(IO_START),
-+		.length		= IO_SIZE,
-+		.type		= MT_DEVICE
-+	},
-+};
-+
-+static void __init goldfish_map_io(void)
-+{
-+	iotable_init(goldfish_io_desc, ARRAY_SIZE(goldfish_io_desc));
-+    GOLDFISH_READY = 1;
-+}
-+
-+extern struct sys_timer goldfish_timer;
-+
-+MACHINE_START(GOLDFISH, "Goldfish")
-+	.phys_io	= 0xff000000,
-+	.io_pg_offst	= ((0xfe000000) >> 18) & 0xfffc,
-+	.boot_params	= 0x00000100,
-+	.map_io		= goldfish_map_io,
-+	.init_irq	= goldfish_init_irq,
-+	.init_machine	= goldfish_init,
-+	.timer		= &goldfish_timer,
-+MACHINE_END
---- /dev/null
-+++ b/arch/arm/mach-goldfish/include/mach/dma.h
-@@ -0,0 +1 @@
-+/* include/asm-arm/arch-goldfish/dma.h */
---- /dev/null
-+++ b/arch/arm/mach-goldfish/include/mach/entry-macro.S
-@@ -0,0 +1,34 @@
-+/* include/asm-arm/arch-goldfish/entry-macro.S
-+**
-+** Copyright (C) 2007 Google, Inc.
-+**
-+** This software is licensed under the terms of the GNU General Public
-+** License version 2, as published by the Free Software Foundation, and
-+** may be copied, distributed, and modified under those terms.
-+**
-+** This program is distributed in the hope that it will be useful,
-+** but WITHOUT ANY WARRANTY; without even the implied warranty of
-+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+** GNU General Public License for more details.
-+**
-+*/
-+
-+#include <mach/hardware.h>
-+#include <mach/irqs.h>
-+
-+	.macro  disable_fiq
-+	.endm
-+
-+	.macro  get_irqnr_preamble, base, tmp
-+	.endm
-+
-+	.macro  arch_ret_to_user, tmp1, tmp2
-+	.endm
-+
-+	.macro  get_irqnr_and_base, irqnr, irqstat, base, tmp
-+	ldr     \base, =IO_ADDRESS(GOLDFISH_INTERRUPT_BASE)
-+	ldr     \irqnr, [\base, #GOLDFISH_INTERRUPT_NUMBER]
-+	ldr     \irqstat, [\base, #GOLDFISH_INTERRUPT_STATUS]
-+	teq     \irqstat, #0
-+	/* EQ will be set if no irqs pending */
-+	.endm
---- /dev/null
-+++ b/arch/arm/mach-goldfish/include/mach/hardware.h
-@@ -0,0 +1,44 @@
-+/* include/asm-arm/arch-goldfish/hardware.h
-+**
-+** Copyright (C) 2007 Google, Inc.
-+**
-+** This software is licensed under the terms of the GNU General Public
-+** License version 2, as published by the Free Software Foundation, and
-+** may be copied, distributed, and modified under those terms.
-+**
-+** This program is distributed in the hope that it will be useful,
-+** but WITHOUT ANY WARRANTY; without even the implied warranty of
-+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+** GNU General Public License for more details.
-+**
-+*/
-+
-+#ifndef __ASM_ARCH_HARDWARE_H
-+#define __ASM_ARCH_HARDWARE_H
-+
-+#include <asm/sizes.h>
-+
-+/*
-+ * Where in virtual memory the IO devices (timers, system controllers
-+ * and so on)
-+ */
-+#define IO_BASE			0xfe000000                 // VA of IO 
-+#define IO_SIZE			0x00800000                 // How much?
-+#define IO_START		0xff000000                 // PA of IO
-+
-+#define GOLDFISH_INTERRUPT_BASE     (0x0)
-+#define GOLDFISH_INTERRUPT_STATUS       (0x00) // number of pending interrupts
-+#define GOLDFISH_INTERRUPT_NUMBER       (0x04)
-+#define GOLDFISH_INTERRUPT_DISABLE_ALL  (0x08)
-+#define GOLDFISH_INTERRUPT_DISABLE      (0x0c)
-+#define GOLDFISH_INTERRUPT_ENABLE       (0x10)
-+
-+#define GOLDFISH_PDEV_BUS_BASE      (0x1000)
-+#define GOLDFISH_PDEV_BUS_END       (0x100)
-+
-+#define GOLDFISH_TIMER_BASE     (0x3000)
-+
-+/* macro to get at IO space when running virtually */
-+#define IO_ADDRESS(x) ((x) + IO_BASE)
-+
-+#endif
---- /dev/null
-+++ b/arch/arm/mach-goldfish/include/mach/io.h
-@@ -0,0 +1,24 @@
-+/* include/asm-arm/arch-goldfish/io.h
-+**
-+** Copyright (C) 2007 Google, Inc.
-+**
-+** This software is licensed under the terms of the GNU General Public
-+** License version 2, as published by the Free Software Foundation, and
-+** may be copied, distributed, and modified under those terms.
-+**
-+** This program is distributed in the hope that it will be useful,
-+** but WITHOUT ANY WARRANTY; without even the implied warranty of
-+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+** GNU General Public License for more details.
-+**
-+*/
-+
-+#ifndef __ASM_ARM_ARCH_IO_H
-+#define __ASM_ARM_ARCH_IO_H
-+
-+#define IO_SPACE_LIMIT 0xffffffff
-+
-+#define __io(a)			((void __iomem *)(a))
-+#define __mem_pci(a)		(a)
-+
-+#endif
---- /dev/null
-+++ b/arch/arm/mach-goldfish/include/mach/irqs.h
-@@ -0,0 +1,24 @@
-+/* include/asm-arm/arch-goldfish/irqs.h
-+**
-+** Copyright (C) 2007 Google, Inc.
-+**
-+** This software is licensed under the terms of the GNU General Public
-+** License version 2, as published by the Free Software Foundation, and
-+** may be copied, distributed, and modified under those terms.
-+**
-+** This program is distributed in the hope that it will be useful,
-+** but WITHOUT ANY WARRANTY; without even the implied warranty of
-+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+** GNU General Public License for more details.
-+**
-+*/
-+
-+#ifndef __ASM_ARCH_IRQS_H
-+#define __ASM_ARCH_IRQS_H
-+
-+#define IRQ_PDEV_BUS    (1)
-+#define IRQ_TIMER       (3)
-+
-+#define NR_IRQS         (256)
-+
-+#endif
---- /dev/null
-+++ b/arch/arm/mach-goldfish/include/mach/memory.h
-@@ -0,0 +1,35 @@
-+/* include/asm-arm/arch-goldfish/memory.h
-+**
-+** Copyright (C) 2007 Google, Inc.
-+**
-+** This software is licensed under the terms of the GNU General Public
-+** License version 2, as published by the Free Software Foundation, and
-+** may be copied, distributed, and modified under those terms.
-+**
-+** This program is distributed in the hope that it will be useful,
-+** but WITHOUT ANY WARRANTY; without even the implied warranty of
-+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+** GNU General Public License for more details.
-+**
-+*/
-+
-+#ifndef __ASM_ARCH_MEMORY_H
-+#define __ASM_ARCH_MEMORY_H
-+
-+/*
-+ * Physical DRAM offset.
-+ */
-+#define PHYS_OFFSET	UL(0x00000000)
-+#define BUS_OFFSET	UL(0x00000000)
-+
-+/*
-+ * Virtual view <-> DMA view memory address translations
-+ * virt_to_bus: Used to translate the virtual address to an
-+ *              address suitable to be passed to set_dma_addr
-+ * bus_to_virt: Used to convert an address for DMA operations
-+ *              to an address that the kernel can use.
-+ */
-+#define __virt_to_bus(x)	(x - PAGE_OFFSET + BUS_OFFSET)
-+#define __bus_to_virt(x)	(x - BUS_OFFSET + PAGE_OFFSET)
-+
-+#endif
---- /dev/null
-+++ b/arch/arm/mach-goldfish/include/mach/system.h
-@@ -0,0 +1,30 @@
-+/* include/asm-arm/arch-goldfish/system.h
-+**
-+** Copyright (C) 2007 Google, Inc.
-+**
-+** This software is licensed under the terms of the GNU General Public
-+** License version 2, as published by the Free Software Foundation, and
-+** may be copied, distributed, and modified under those terms.
-+**
-+** This program is distributed in the hope that it will be useful,
-+** but WITHOUT ANY WARRANTY; without even the implied warranty of
-+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+** GNU General Public License for more details.
-+**
-+*/
-+
-+#ifndef __ASM_ARCH_SYSTEM_H
-+#define __ASM_ARCH_SYSTEM_H
-+
-+#include <asm/proc-fns.h>
-+
-+static inline void arch_idle(void)
-+{
-+	cpu_do_idle();
-+}
-+
-+static inline void arch_reset(char mode, const char *cmd)
-+{
-+}
-+
-+#endif
---- /dev/null
-+++ b/arch/arm/mach-goldfish/include/mach/timer.h
-@@ -0,0 +1,28 @@
-+/* include/asm-arm/arch-goldfish/timer.h
-+**
-+** Copyright (C) 2007 Google, Inc.
-+**
-+** This software is licensed under the terms of the GNU General Public
-+** License version 2, as published by the Free Software Foundation, and
-+** may be copied, distributed, and modified under those terms.
-+**
-+** This program is distributed in the hope that it will be useful,
-+** but WITHOUT ANY WARRANTY; without even the implied warranty of
-+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+** GNU General Public License for more details.
-+**
-+*/
-+
-+#ifndef __ASM_ARCH_TIMER_H
-+#define __ASM_ARCH_TIMER_H
-+
-+enum {
-+	TIMER_TIME_LOW          = 0x00, // get low bits of current time and update TIMER_TIME_HIGH
-+	TIMER_TIME_HIGH         = 0x04, // get high bits of time at last TIMER_TIME_LOW read
-+	TIMER_ALARM_LOW         = 0x08, // set low bits of alarm and activate it
-+	TIMER_ALARM_HIGH        = 0x0c, // set high bits of next alarm
-+	TIMER_CLEAR_INTERRUPT   = 0x10,
-+	TIMER_CLEAR_ALARM       = 0x14
-+};
-+
-+#endif
---- /dev/null
-+++ b/arch/arm/mach-goldfish/include/mach/timex.h
-@@ -0,0 +1,24 @@
-+/* include/asm-arm/arch-goldfish/timex.h
-+**
-+** Copyright (C) 2007 Google, Inc.
-+**
-+** This software is licensed under the terms of the GNU General Public
-+** License version 2, as published by the Free Software Foundation, and
-+** may be copied, distributed, and modified under those terms.
-+**
-+** This program is distributed in the hope that it will be useful,
-+** but WITHOUT ANY WARRANTY; without even the implied warranty of
-+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+** GNU General Public License for more details.
-+**
-+*/
-+
-+#ifndef __ASM_ARCH_TIMEX_H
-+#define __ASM_ARCH_TIMEX_H
-+
-+/*
-+ * ??
-+ */
-+#define CLOCK_TICK_RATE		(50000000 / 16)
-+
-+#endif
---- /dev/null
-+++ b/arch/arm/mach-goldfish/include/mach/uncompress.h
-@@ -0,0 +1,40 @@
-+/* include/asm-arm/arch-goldfish/uncompress.h
-+**
-+** Copyright (C) 2007 Google, Inc.
-+**
-+** This software is licensed under the terms of the GNU General Public
-+** License version 2, as published by the Free Software Foundation, and
-+** may be copied, distributed, and modified under those terms.
-+**
-+** This program is distributed in the hope that it will be useful,
-+** but WITHOUT ANY WARRANTY; without even the implied warranty of
-+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+** GNU General Public License for more details.
-+**
-+*/
-+
-+#ifndef __ASM_ARCH_UNCOMPRESS_H
-+#define __ASM_ARCH_UNCOMPRESS_H
-+
-+#define GOLDFISH_TTY_PUT_CHAR (*(volatile unsigned int *)0xff002000)
-+
-+/*
-+ * This does not append a newline
-+ */
-+static void putc(int c)
-+{
-+	GOLDFISH_TTY_PUT_CHAR = c;
-+}
-+
-+static inline void flush(void)
-+{
-+}
-+
-+/*
-+ * nothing to do
-+ */
-+#define arch_decomp_setup()
-+
-+#define arch_decomp_wdog()
-+
-+#endif
---- /dev/null
-+++ b/arch/arm/mach-goldfish/include/mach/vmalloc.h
-@@ -0,0 +1,21 @@
-+/* include/asm-arm/arch-goldfish/vmalloc.h
-+**
-+** Copyright (C) 2007 Google, Inc.
-+**
-+** This software is licensed under the terms of the GNU General Public
-+** License version 2, as published by the Free Software Foundation, and
-+** may be copied, distributed, and modified under those terms.
-+**
-+** This program is distributed in the hope that it will be useful,
-+** but WITHOUT ANY WARRANTY; without even the implied warranty of
-+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+** GNU General Public License for more details.
-+**
-+*/
-+
-+#ifndef __ASM_ARCH_VMALLOC_H
-+#define __ASM_ARCH_VMALLOC_H
-+
-+#define VMALLOC_END       (PAGE_OFFSET + 0x3c000000)
-+
-+#endif
---- /dev/null
-+++ b/arch/arm/mach-goldfish/pdev_bus.c
-@@ -0,0 +1,222 @@
-+/* arch/arm/mach-goldfish/pdev_bus.c
-+**
-+** Copyright (C) 2007 Google, Inc.
-+**
-+** This software is licensed under the terms of the GNU General Public
-+** License version 2, as published by the Free Software Foundation, and
-+** may be copied, distributed, and modified under those terms.
-+**
-+** This program is distributed in the hope that it will be useful,
-+** but WITHOUT ANY WARRANTY; without even the implied warranty of
-+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+** GNU General Public License for more details.
-+**
-+*/
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/interrupt.h>
-+#include <linux/irq.h>
-+#include <linux/platform_device.h>
-+
-+#include <mach/hardware.h>
-+#include <asm/io.h>
-+#include <asm/mach-types.h>
-+#include <asm/mach/arch.h>
-+
-+#define PDEV_BUS_OP_DONE        (0x00)
-+#define PDEV_BUS_OP_REMOVE_DEV  (0x04)
-+#define PDEV_BUS_OP_ADD_DEV     (0x08)
-+
-+#define PDEV_BUS_OP_INIT        (0x00)
-+
-+#define PDEV_BUS_OP             (0x00)
-+#define PDEV_BUS_GET_NAME       (0x04)
-+#define PDEV_BUS_NAME_LEN       (0x08)
-+#define PDEV_BUS_ID             (0x0c)
-+#define PDEV_BUS_IO_BASE        (0x10)
-+#define PDEV_BUS_IO_SIZE        (0x14)
-+#define PDEV_BUS_IRQ            (0x18)
-+#define PDEV_BUS_IRQ_COUNT      (0x1c)
-+
-+struct pdev_bus_dev {
-+	struct list_head list;
-+	struct platform_device pdev;
-+	struct resource resources[0];
-+};
-+
-+static void goldfish_pdev_worker(struct work_struct *work);
-+
-+static uint32_t pdev_bus_base;
-+static uint32_t pdev_bus_irq;
-+static LIST_HEAD(pdev_bus_new_devices);
-+static LIST_HEAD(pdev_bus_registered_devices);
-+static LIST_HEAD(pdev_bus_removed_devices);
-+static DECLARE_WORK(pdev_bus_worker, goldfish_pdev_worker);
-+
-+
-+static void goldfish_pdev_worker(struct work_struct *work)
-+{
-+	int ret;
-+	struct pdev_bus_dev *pos, *n;
-+
-+	list_for_each_entry_safe(pos, n, &pdev_bus_removed_devices, list) {
-+		list_del(&pos->list);
-+		platform_device_unregister(&pos->pdev);
-+		kfree(pos);
-+	}
-+	list_for_each_entry_safe(pos, n, &pdev_bus_new_devices, list) {
-+		list_del(&pos->list);
-+		ret = platform_device_register(&pos->pdev);
-+		if(ret) {
-+			printk("goldfish_pdev_worker failed to register device, %s\n", pos->pdev.name);
-+		}
-+		else {
-+			printk("goldfish_pdev_worker registered %s\n", pos->pdev.name);
-+		}
-+		list_add(&pos->list, &pdev_bus_registered_devices);
-+	}
-+}
-+
-+static void goldfish_pdev_remove(void)
-+{
-+	struct pdev_bus_dev *pos, *n;
-+	uint32_t base;
-+	
-+	base = readl(pdev_bus_base + PDEV_BUS_IO_BASE);
-+
-+	list_for_each_entry_safe(pos, n, &pdev_bus_new_devices, list) {
-+		if(pos->resources[0].start == base) {
-+			list_del(&pos->list);
-+			kfree(pos);
-+			return;
-+		}
-+	}
-+	list_for_each_entry_safe(pos, n, &pdev_bus_registered_devices, list) {
-+		if(pos->resources[0].start == base) {
-+			list_del(&pos->list);
-+			list_add(&pos->list, &pdev_bus_removed_devices);
-+			schedule_work(&pdev_bus_worker);
-+			return;
-+		}
-+	};
-+	printk("goldfish_pdev_remove could not find device at %x\n", base);
-+}
-+
-+static int goldfish_new_pdev(void)
-+{
-+	struct pdev_bus_dev *dev;
-+	uint32_t name_len;
-+	uint32_t irq = -1, irq_count;
-+	int resource_count = 2;
-+	uint32_t base;
-+	char *name;
-+
-+	base = readl(pdev_bus_base + PDEV_BUS_IO_BASE);
-+
-+	irq_count = readl(pdev_bus_base + PDEV_BUS_IRQ_COUNT);
-+	name_len = readl(pdev_bus_base + PDEV_BUS_NAME_LEN);
-+	if(irq_count)
-+		resource_count++;
-+
-+	dev = kzalloc(sizeof(*dev) + sizeof(struct resource) * resource_count + name_len + 1, GFP_ATOMIC);
-+	if(dev == NULL)
-+		return -ENOMEM;
-+
-+	dev->pdev.num_resources = resource_count;
-+	dev->pdev.resource = (struct resource *)(dev + 1);
-+	dev->pdev.name = name = (char *)(dev->pdev.resource + resource_count);
-+	dev->pdev.dev.coherent_dma_mask = ~0;
-+
-+	writel(name, pdev_bus_base + PDEV_BUS_GET_NAME);
-+	name[name_len] = '\0';
-+	dev->pdev.id = readl(pdev_bus_base + PDEV_BUS_ID);
-+	dev->pdev.resource[0].start = base;
-+	dev->pdev.resource[0].end = base + readl(pdev_bus_base + PDEV_BUS_IO_SIZE) - 1;
-+	dev->pdev.resource[0].flags = IORESOURCE_MEM;
-+	if(irq_count) {
-+		irq = readl(pdev_bus_base + PDEV_BUS_IRQ);
-+		dev->pdev.resource[1].start = irq;
-+		dev->pdev.resource[1].end = irq + irq_count - 1;
-+		dev->pdev.resource[1].flags = IORESOURCE_IRQ;
-+	}
-+
-+	printk("goldfish_new_pdev %s at %x irq %d\n", name, base, irq);
-+	list_add(&dev->list, &pdev_bus_new_devices);
-+	schedule_work(&pdev_bus_worker);
-+	
-+	return 0;
-+}
-+
-+static irqreturn_t goldfish_pdev_bus_interrupt(int irq, void *dev_id)
-+{
-+	irqreturn_t ret = IRQ_NONE;
-+	while(1) {
-+		uint32_t op = readl(pdev_bus_base + PDEV_BUS_OP);
-+		switch(op) {
-+			case PDEV_BUS_OP_DONE:
-+				return IRQ_NONE;
-+
-+			case PDEV_BUS_OP_REMOVE_DEV:
-+				goldfish_pdev_remove();
-+				break;
-+
-+			case PDEV_BUS_OP_ADD_DEV:
-+				goldfish_new_pdev();
-+				break;
-+		}
-+		ret = IRQ_HANDLED;
-+	}
-+}
-+
-+static int __devinit goldfish_pdev_bus_probe(struct platform_device *pdev)
-+{
-+	int ret;
-+	struct resource *r;
-+	r = platform_get_resource(pdev, IORESOURCE_IO, 0);
-+	if(r == NULL)
-+		return -EINVAL;
-+	pdev_bus_base = IO_ADDRESS(r->start);
-+
-+	r = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-+	if(r == NULL)
-+		return -EINVAL;
-+	pdev_bus_irq = r->start;
-+
-+	ret = request_irq(pdev_bus_irq, goldfish_pdev_bus_interrupt, IRQF_SHARED, "goldfish_pdev_bus", pdev);
-+	if(ret)
-+		goto err_request_irq_failed;
-+
-+	writel(PDEV_BUS_OP_INIT, pdev_bus_base + PDEV_BUS_OP);
-+
-+err_request_irq_failed:
-+	return ret;
-+}
-+
-+static int __devexit goldfish_pdev_bus_remove(struct platform_device *pdev)
-+{
-+	free_irq(pdev_bus_irq, pdev);
-+	return 0;
-+}
-+
-+static struct platform_driver goldfish_pdev_bus_driver = {
-+	.probe = goldfish_pdev_bus_probe,
-+	.remove = __devexit_p(goldfish_pdev_bus_remove),
-+	.driver = {
-+		.name = "goldfish_pdev_bus"
-+	}
-+};
-+
-+static int __init goldfish_pdev_bus_init(void)
-+{
-+	return platform_driver_register(&goldfish_pdev_bus_driver);
-+}
-+
-+static void __exit goldfish_pdev_bus_exit(void)
-+{
-+	platform_driver_unregister(&goldfish_pdev_bus_driver);
-+}
-+
-+module_init(goldfish_pdev_bus_init);
-+module_exit(goldfish_pdev_bus_exit);
-+
---- /dev/null
-+++ b/arch/arm/mach-goldfish/timer.c
-@@ -0,0 +1,147 @@
-+/* arch/arm/mach-goldfish/timer.c
-+**
-+** Copyright (C) 2007 Google, Inc.
-+**
-+** This software is licensed under the terms of the GNU General Public
-+** License version 2, as published by the Free Software Foundation, and
-+** may be copied, distributed, and modified under those terms.
-+**
-+** This program is distributed in the hope that it will be useful,
-+** but WITHOUT ANY WARRANTY; without even the implied warranty of
-+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+** GNU General Public License for more details.
-+**
-+*/
-+
-+#include <linux/clockchips.h>
-+#include <linux/interrupt.h>
-+#include <linux/irq.h>
-+
-+#include <mach/timer.h>
-+#include <mach/hardware.h>
-+#include <asm/io.h>
-+#include <asm/mach/time.h>
-+
-+#include <linux/platform_device.h>
-+
-+static DEFINE_SPINLOCK(goldfish_timer_lock);
-+static int goldfish_timer_ready;
-+
-+static irqreturn_t goldfish_timer_interrupt(int irq, void *dev_id)
-+{
-+	uint32_t timer_base = IO_ADDRESS(GOLDFISH_TIMER_BASE);
-+	struct clock_event_device *evt = dev_id;
-+
-+	writel(1, timer_base + TIMER_CLEAR_INTERRUPT);
-+	if (evt->event_handler)
-+		evt->event_handler(evt);
-+	return IRQ_HANDLED;
-+}
-+
-+static cycle_t goldfish_timer_read(struct clocksource *cs)
-+{
-+	uint32_t timer_base = IO_ADDRESS(GOLDFISH_TIMER_BASE);
-+	unsigned long irqflags;
-+	cycle_t rv;
-+
-+	spin_lock_irqsave(&goldfish_timer_lock, irqflags);
-+	rv = readl(timer_base + TIMER_TIME_LOW);
-+	rv |= (int64_t)readl(timer_base + TIMER_TIME_HIGH) << 32;
-+	spin_unlock_irqrestore(&goldfish_timer_lock, irqflags);
-+	return rv;
-+}
-+
-+static int goldfish_timer_set_next_event(unsigned long cycles,
-+                                         struct clock_event_device *evt)
-+{
-+	uint32_t timer_base = IO_ADDRESS(GOLDFISH_TIMER_BASE);
-+	unsigned long irqflags;
-+	uint64_t alarm;
-+
-+	spin_lock_irqsave(&goldfish_timer_lock, irqflags);
-+	alarm = readl(timer_base + TIMER_TIME_LOW);
-+	alarm |= (int64_t)readl(timer_base + TIMER_TIME_HIGH) << 32;
-+	alarm += cycles;
-+	writel(alarm >> 32, timer_base + TIMER_ALARM_HIGH);
-+	writel(alarm, timer_base + TIMER_ALARM_LOW);
-+	spin_unlock_irqrestore(&goldfish_timer_lock, irqflags);
-+	return 0;
-+}
-+
-+static void goldfish_timer_set_mode(enum clock_event_mode mode,
-+                                    struct clock_event_device *evt)
-+{
-+	uint32_t timer_base = IO_ADDRESS(GOLDFISH_TIMER_BASE);
-+	switch (mode) {
-+		case CLOCK_EVT_MODE_RESUME:
-+		case CLOCK_EVT_MODE_PERIODIC:
-+			break;
-+		case CLOCK_EVT_MODE_ONESHOT:
-+			break;
-+		case CLOCK_EVT_MODE_UNUSED:
-+		case CLOCK_EVT_MODE_SHUTDOWN:
-+			writel(1, timer_base + TIMER_CLEAR_ALARM);
-+			break;
-+	}
-+}
-+
-+unsigned long long sched_clock(void)
-+{
-+	if(goldfish_timer_ready)
-+		return ktime_to_ns(ktime_get());
-+	else
-+		return 0;
-+}
-+
-+static struct clock_event_device goldfish_clockevent = {
-+	.name           = "goldfish_timer",
-+	.features       = CLOCK_EVT_FEAT_ONESHOT,
-+	.max_delta_ns   = ULONG_MAX,
-+	.min_delta_ns   = 1,
-+	.mult           = 1,
-+	.shift          = 0,
-+	.rating         = 200,
-+	.set_next_event = goldfish_timer_set_next_event,
-+	.set_mode       = goldfish_timer_set_mode,
-+};
-+
-+static struct clocksource goldfish_clocksource = {
-+	.name           = "goldfish_timer",
-+	.rating         = 200,
-+	.read           = goldfish_timer_read,
-+	.mult           = 1,
-+	.mask           = CLOCKSOURCE_MASK(64),
-+	.shift          = 0,
-+	.flags          = CLOCK_SOURCE_IS_CONTINUOUS,
-+};
-+
-+static struct irqaction goldfish_timer_irq = {
-+	.name		= "Goldfish Timer Tick",
-+	.flags		= IRQF_DISABLED | IRQF_TIMER,
-+	.handler	= goldfish_timer_interrupt,
-+	.dev_id		= &goldfish_clockevent,
-+};
-+
-+static void __init goldfish_timer_init(void)
-+{
-+	int res;
-+
-+	res = clocksource_register(&goldfish_clocksource);
-+	if (res)
-+		printk(KERN_ERR "goldfish_timer_init: "
-+		       "clocksource_register failed\n");
-+
-+	res = setup_irq(IRQ_TIMER, &goldfish_timer_irq);
-+	if (res)
-+		printk(KERN_ERR "goldfish_timer_init: setup_irq failed\n");
-+
-+	goldfish_clockevent.cpumask = cpumask_of(0);
-+	clockevents_register_device(&goldfish_clockevent);
-+
-+	goldfish_timer_ready = 1;
-+}
-+
-+struct sys_timer goldfish_timer = {
-+	.init		= goldfish_timer_init,
-+};
-+
diff --git a/target/linux/goldfish/patches-2.6.30/0120--ARM-goldfish-Add-audio-driver-for-goldfish.patch b/target/linux/goldfish/patches-2.6.30/0120--ARM-goldfish-Add-audio-driver-for-goldfish.patch
deleted file mode 100644
index 23f4b8f65..000000000
--- a/target/linux/goldfish/patches-2.6.30/0120--ARM-goldfish-Add-audio-driver-for-goldfish.patch
+++ /dev/null
@@ -1,404 +0,0 @@
-From aefe5257bf3ed9bf950ad962a63e5315566c2f97 Mon Sep 17 00:00:00 2001
-From: Mike Lockwood <lockwood@google.com>
-Date: Mon, 23 Jul 2007 09:31:54 -0400
-Subject: [PATCH 120/134] [ARM] goldfish: Add audio driver for goldfish.
-
-Signed-off-by: Mike A. Chan <mikechan@google.com>
----
- arch/arm/mach-goldfish/Makefile |    2 +-
- arch/arm/mach-goldfish/audio.c  |  379 +++++++++++++++++++++++++++++++++++++++
- 2 files changed, 380 insertions(+), 1 deletions(-)
- create mode 100644 arch/arm/mach-goldfish/audio.c
-
---- a/arch/arm/mach-goldfish/Makefile
-+++ b/arch/arm/mach-goldfish/Makefile
-@@ -4,6 +4,6 @@
- 
- # Object file lists.
- 
--obj-y				:= pdev_bus.o timer.o
-+obj-y				:= pdev_bus.o timer.o audio.o
- obj-$(CONFIG_MACH_GOLDFISH)	+= board-goldfish.o
- 
---- /dev/null
-+++ b/arch/arm/mach-goldfish/audio.c
-@@ -0,0 +1,379 @@
-+/* arch/arm/mach-goldfish/audio.c
-+**
-+** Copyright (C) 2007 Google, Inc.
-+**
-+** This software is licensed under the terms of the GNU General Public
-+** License version 2, as published by the Free Software Foundation, and
-+** may be copied, distributed, and modified under those terms.
-+**
-+** This program is distributed in the hope that it will be useful,
-+** but WITHOUT ANY WARRANTY; without even the implied warranty of
-+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+** GNU General Public License for more details.
-+**
-+*/
-+
-+#include <linux/module.h>
-+#include <linux/miscdevice.h>
-+#include <linux/fs.h>
-+#include <linux/platform_device.h>
-+
-+#include <linux/types.h>
-+#include <linux/pci.h>
-+#include <linux/interrupt.h>
-+
-+#include <asm/types.h>
-+#include <asm/io.h>
-+#include <asm/uaccess.h>
-+
-+
-+MODULE_AUTHOR("Google, Inc.");
-+MODULE_DESCRIPTION("Android QEMU Audio Driver");
-+MODULE_LICENSE("GPL");
-+MODULE_VERSION("1.0");
-+
-+struct goldfish_audio {
-+	uint32_t reg_base;
-+	int irq;
-+	spinlock_t lock;
-+	wait_queue_head_t wait;
-+	
-+	char __iomem *buffer_virt;      /* combined buffer virtual address */
-+	unsigned long buffer_phys;      /* combined buffer physical address */
-+
-+	char __iomem *write_buffer1;    /* write buffer 1 virtual address */
-+	char __iomem *write_buffer2;    /* write buffer 2 virtual address */
-+	char __iomem *read_buffer;      /* read buffer virtual address */
-+	int buffer_status;
-+	int read_supported;         /* true if we have audio input support */
-+};
-+
-+/* We will allocate two read buffers and two write buffers.
-+   Having two read buffers facilitate stereo -> mono conversion.
-+   Having two write buffers facilitate interleaved IO.
-+*/
-+#define READ_BUFFER_SIZE        16384
-+#define WRITE_BUFFER_SIZE       16384
-+#define COMBINED_BUFFER_SIZE    ((2 * READ_BUFFER_SIZE) + (2 * WRITE_BUFFER_SIZE))
-+
-+#define GOLDFISH_AUDIO_READ(data, addr)   (readl(data->reg_base + addr))
-+#define GOLDFISH_AUDIO_WRITE(data, addr, x)   (writel(x, data->reg_base + addr))
-+
-+/* temporary variable used between goldfish_audio_probe() and goldfish_audio_open() */
-+static struct goldfish_audio* audio_data;
-+
-+enum {
-+	/* audio status register */
-+	AUDIO_INT_STATUS	= 0x00, 
-+	/* set this to enable IRQ */
-+	AUDIO_INT_ENABLE	= 0x04,
-+	/* set these to specify buffer addresses */
-+	AUDIO_SET_WRITE_BUFFER_1 = 0x08,
-+	AUDIO_SET_WRITE_BUFFER_2 = 0x0C,
-+	/* set number of bytes in buffer to write */
-+	AUDIO_WRITE_BUFFER_1  = 0x10,
-+	AUDIO_WRITE_BUFFER_2  = 0x14,
-+
-+	/* true if audio input is supported */
-+	AUDIO_READ_SUPPORTED = 0x18,
-+	/* buffer to use for audio input */
-+	AUDIO_SET_READ_BUFFER = 0x1C,
-+	
-+	/* driver writes number of bytes to read */
-+	AUDIO_START_READ  = 0x20,
-+
-+	/* number of bytes available in read buffer */
-+	AUDIO_READ_BUFFER_AVAILABLE  = 0x24,
-+
-+	/* AUDIO_INT_STATUS bits */
-+	
-+	/* this bit set when it is safe to write more bytes to the buffer */
-+	AUDIO_INT_WRITE_BUFFER_1_EMPTY	= 1U << 0,
-+	AUDIO_INT_WRITE_BUFFER_2_EMPTY	= 1U << 1,
-+	AUDIO_INT_READ_BUFFER_FULL      = 1U << 2,
-+	
-+	AUDIO_INT_MASK                  = AUDIO_INT_WRITE_BUFFER_1_EMPTY | 
-+	                                  AUDIO_INT_WRITE_BUFFER_2_EMPTY | 
-+	                                  AUDIO_INT_READ_BUFFER_FULL,
-+};
-+
-+
-+static atomic_t open_count = ATOMIC_INIT(0);
-+
-+
-+static ssize_t goldfish_audio_read(struct file *fp, char __user *buf,
-+							size_t count, loff_t *pos)
-+{
-+	struct goldfish_audio* data = fp->private_data;
-+	int length;
-+	int result = 0;
-+	
-+	if (!data->read_supported)
-+		return -ENODEV;
-+
-+	while (count > 0) {
-+		length = (count > READ_BUFFER_SIZE ? READ_BUFFER_SIZE : count);
-+		GOLDFISH_AUDIO_WRITE(data, AUDIO_START_READ, length);
-+
-+		wait_event_interruptible(data->wait, (data->buffer_status & AUDIO_INT_READ_BUFFER_FULL));
-+
-+		length = GOLDFISH_AUDIO_READ(data, AUDIO_READ_BUFFER_AVAILABLE);
-+   
-+		/* copy data to user space */
-+		if (copy_to_user(buf, data->read_buffer, length))
-+		{
-+			printk("copy_from_user failed!\n");
-+			return -EFAULT;
-+		}
-+		
-+		result += length;
-+		buf += length;
-+		count -= length;
-+	}
-+
-+	return result;
-+}
-+
-+static ssize_t goldfish_audio_write(struct file *fp, const char __user *buf,
-+							 size_t count, loff_t *pos)
-+{
-+	struct goldfish_audio* data = fp->private_data;
-+	unsigned long irq_flags;
-+	ssize_t result = 0;
-+	char __iomem *kbuf;
-+
-+	while (count > 0)
-+	{
-+		ssize_t copy = count;
-+		if (copy > WRITE_BUFFER_SIZE)
-+			copy = WRITE_BUFFER_SIZE;
-+		wait_event_interruptible(data->wait, 
-+				(data->buffer_status & (AUDIO_INT_WRITE_BUFFER_1_EMPTY | AUDIO_INT_WRITE_BUFFER_2_EMPTY)));
-+		
-+		if ((data->buffer_status & AUDIO_INT_WRITE_BUFFER_1_EMPTY) != 0) {
-+			kbuf = data->write_buffer1;
-+		} else {
-+			kbuf = data->write_buffer2;
-+		}
-+
-+		/* copy from user space to the appropriate buffer */
-+		if (copy_from_user(kbuf, buf, copy))
-+		{
-+			printk("copy_from_user failed!\n");
-+			result = -EFAULT;
-+			break;
-+		}
-+		else
-+		{
-+			spin_lock_irqsave(&data->lock, irq_flags);
-+
-+			/* clear the buffer empty flag, and signal the emulator to start writing the buffer */
-+			if (kbuf == data->write_buffer1) {
-+				data->buffer_status &= ~AUDIO_INT_WRITE_BUFFER_1_EMPTY;
-+				GOLDFISH_AUDIO_WRITE(data, AUDIO_WRITE_BUFFER_1, copy);
-+			} else {
-+				data->buffer_status &= ~AUDIO_INT_WRITE_BUFFER_2_EMPTY;
-+				GOLDFISH_AUDIO_WRITE(data, AUDIO_WRITE_BUFFER_2, copy);
-+			}
-+
-+			spin_unlock_irqrestore(&data->lock, irq_flags);
-+		}
-+ 
-+		buf += copy;
-+		result += copy;
-+		count -= copy;
-+	}
-+
-+	return result;
-+}
-+
-+static int goldfish_audio_open(struct inode *ip, struct file *fp)
-+{
-+	if (!audio_data)
-+		return -ENODEV;
-+
-+	if (atomic_inc_return(&open_count) == 1) 
-+	{
-+		fp->private_data = audio_data;
-+		audio_data->buffer_status = (AUDIO_INT_WRITE_BUFFER_1_EMPTY | AUDIO_INT_WRITE_BUFFER_2_EMPTY);
-+		GOLDFISH_AUDIO_WRITE(audio_data, AUDIO_INT_ENABLE, AUDIO_INT_MASK);
-+		return 0;
-+	} 
-+	else 
-+	{
-+		atomic_dec(&open_count);
-+		return -EBUSY;
-+	}
-+}
-+
-+static int goldfish_audio_release(struct inode *ip, struct file* fp)
-+{
-+	atomic_dec(&open_count);
-+	GOLDFISH_AUDIO_WRITE(audio_data, AUDIO_INT_ENABLE, 0);
-+	return 0;
-+}
-+	   
-+static int goldfish_audio_ioctl(struct inode* ip, struct file* fp, unsigned int cmd, unsigned long arg)
-+{
-+	/* temporary workaround, until we switch to the ALSA API */
-+	if (cmd == 315)
-+		return -1;
-+	else
-+		return 0;
-+}
-+
-+static irqreturn_t
-+goldfish_audio_interrupt(int irq, void *dev_id)
-+{
-+	unsigned long irq_flags;
-+	struct goldfish_audio	*data = dev_id;
-+	uint32_t status;
-+
-+	spin_lock_irqsave(&data->lock, irq_flags);
-+	
-+	/* read buffer status flags */
-+	status = GOLDFISH_AUDIO_READ(data, AUDIO_INT_STATUS);
-+	status &= AUDIO_INT_MASK;
-+	/* if buffers are newly empty, wake up blocked goldfish_audio_write() call */
-+	if(status) {
-+		data->buffer_status = status;
-+		wake_up(&data->wait);
-+	}
-+	
-+	spin_unlock_irqrestore(&data->lock, irq_flags);
-+	return status ? IRQ_HANDLED : IRQ_NONE;
-+}
-+
-+/* file operations for /dev/eac */
-+static struct file_operations goldfish_audio_fops = {
-+	.owner = THIS_MODULE,
-+	.read = goldfish_audio_read,
-+	.write = goldfish_audio_write,
-+	.open = goldfish_audio_open,
-+	.release = goldfish_audio_release,
-+   .ioctl = goldfish_audio_ioctl,
-+
-+};
-+	
-+static struct miscdevice goldfish_audio_device = {
-+	.minor = MISC_DYNAMIC_MINOR,
-+	.name = "eac",
-+	.fops = &goldfish_audio_fops,
-+};
-+
-+static int goldfish_audio_probe(struct platform_device *pdev)
-+{
-+	int ret;
-+	struct resource *r;
-+	struct goldfish_audio *data;
-+	dma_addr_t buf_addr;
-+
-+printk("goldfish_audio_probe\n");
-+	data = kzalloc(sizeof(*data), GFP_KERNEL);
-+	if(data == NULL) {
-+		ret = -ENOMEM;
-+		goto err_data_alloc_failed;
-+	}
-+	spin_lock_init(&data->lock);
-+	init_waitqueue_head(&data->wait);
-+	platform_set_drvdata(pdev, data);
-+
-+	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if(r == NULL) {
-+		printk("platform_get_resource failed\n");
-+		ret = -ENODEV;
-+		goto err_no_io_base;
-+	}
-+	data->reg_base = IO_ADDRESS(r->start - IO_START);
-+
-+	data->irq = platform_get_irq(pdev, 0);
-+	if(data->irq < 0) {
-+		printk("platform_get_irq failed\n");
-+		ret = -ENODEV;
-+		goto err_no_irq;
-+	}
-+
-+	data->buffer_virt = dma_alloc_writecombine(&pdev->dev, COMBINED_BUFFER_SIZE,
-+												&buf_addr, GFP_KERNEL);
-+	if(data->buffer_virt == 0) {
-+		ret = -ENOMEM;
-+		goto err_alloc_write_buffer_failed;
-+	}
-+	data->buffer_phys = buf_addr;
-+	data->write_buffer1 = data->buffer_virt;
-+	data->write_buffer2 = data->buffer_virt + WRITE_BUFFER_SIZE;
-+	data->read_buffer = data->buffer_virt + 2 * WRITE_BUFFER_SIZE;
-+	
-+	ret = request_irq(data->irq, goldfish_audio_interrupt, IRQF_SHARED, pdev->name, data);
-+	if(ret)
-+		goto err_request_irq_failed;
-+
-+	if((ret = misc_register(&goldfish_audio_device))) 
-+	{
-+		printk("misc_register returned %d in goldfish_audio_init\n", ret);
-+		goto err_misc_register_failed;
-+	}
-+
-+	
-+	GOLDFISH_AUDIO_WRITE(data, AUDIO_SET_WRITE_BUFFER_1, buf_addr);
-+	GOLDFISH_AUDIO_WRITE(data, AUDIO_SET_WRITE_BUFFER_2, buf_addr + WRITE_BUFFER_SIZE);
-+
-+	data->read_supported = GOLDFISH_AUDIO_READ(data, AUDIO_READ_SUPPORTED);
-+	if (data->read_supported)
-+		GOLDFISH_AUDIO_WRITE(data, AUDIO_SET_READ_BUFFER, buf_addr + 2 * WRITE_BUFFER_SIZE);
-+
-+	audio_data = data;
-+	return 0;
-+
-+err_misc_register_failed:
-+err_request_irq_failed:
-+	dma_free_writecombine(&pdev->dev, COMBINED_BUFFER_SIZE, data->buffer_virt, data->buffer_phys);
-+err_alloc_write_buffer_failed:
-+err_no_irq:
-+err_no_io_base:
-+	kfree(data);
-+err_data_alloc_failed:
-+	return ret;
-+}
-+
-+static int goldfish_audio_remove(struct platform_device *pdev)
-+{
-+	struct goldfish_audio *data = platform_get_drvdata(pdev);
-+
-+	misc_deregister(&goldfish_audio_device);
-+	free_irq(data->irq, data);
-+	dma_free_writecombine(&pdev->dev, COMBINED_BUFFER_SIZE, data->buffer_virt, data->buffer_phys);
-+	kfree(data);
-+	audio_data = NULL;
-+	return 0;
-+}
-+
-+static struct platform_driver goldfish_audio_driver = {
-+	.probe		= goldfish_audio_probe,
-+	.remove		= goldfish_audio_remove,
-+	.driver = {
-+		.name = "goldfish_audio"
-+	}
-+};
-+
-+static int __init goldfish_audio_init(void)
-+{
-+	int ret;
-+
-+	ret = platform_driver_register(&goldfish_audio_driver);
-+	if (ret < 0)
-+	{
-+		printk("platform_driver_register returned %d\n", ret);
-+		return ret;
-+	}
-+
-+	return ret;
-+}
-+
-+static void __exit goldfish_audio_exit(void)
-+{
-+	platform_driver_unregister(&goldfish_audio_driver);
-+}
-+
-+module_init(goldfish_audio_init);
-+module_exit(goldfish_audio_exit);
diff --git a/target/linux/goldfish/patches-2.6.30/0121--ARM-goldfish-Implement-suspend-as-wait-for-interr.patch b/target/linux/goldfish/patches-2.6.30/0121--ARM-goldfish-Implement-suspend-as-wait-for-interr.patch
deleted file mode 100644
index 0190820ed..000000000
--- a/target/linux/goldfish/patches-2.6.30/0121--ARM-goldfish-Implement-suspend-as-wait-for-interr.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From f0266de1899f043daff3b472b8fdd6e30012cb25 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@android.com>
-Date: Wed, 9 Jan 2008 11:46:33 -0800
-Subject: [PATCH 121/134] [ARM] goldfish: Implement suspend as wait-for-interrupt.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Mike A. Chan <mikechan@google.com>
-Signed-off-by: Arve Hjønnevåg <arve@android.com>
----
- arch/arm/mach-goldfish/Makefile |    2 +-
- arch/arm/mach-goldfish/pm.c     |   43 +++++++++++++++++++++++++++++++++++++++
- 2 files changed, 44 insertions(+), 1 deletions(-)
- create mode 100644 arch/arm/mach-goldfish/pm.c
-
---- a/arch/arm/mach-goldfish/Makefile
-+++ b/arch/arm/mach-goldfish/Makefile
-@@ -4,6 +4,6 @@
- 
- # Object file lists.
- 
--obj-y				:= pdev_bus.o timer.o audio.o
-+obj-y				:= pdev_bus.o timer.o audio.o pm.o
- obj-$(CONFIG_MACH_GOLDFISH)	+= board-goldfish.o
- 
---- /dev/null
-+++ b/arch/arm/mach-goldfish/pm.c
-@@ -0,0 +1,43 @@
-+/* arch/arm/mach-msm/pm.c
-+ *
-+ * Goldfish Power Management Routines
-+ *
-+ * Copyright (C) 2007 Google, Inc.
-+ *
-+ * This software is licensed under the terms of the GNU General Public
-+ * License version 2, as published by the Free Software Foundation, and
-+ * may be copied, distributed, and modified under those terms.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/pm.h>
-+#include <linux/suspend.h>
-+#include <mach/system.h>
-+
-+static int goldfish_pm_enter(suspend_state_t state)
-+{
-+	arch_idle();
-+	return 0;
-+}
-+
-+static struct platform_suspend_ops goldfish_pm_ops = {
-+	.enter		= goldfish_pm_enter,
-+	.valid		= suspend_valid_only_mem,
-+};
-+
-+static int __init goldfish_pm_init(void)
-+{
-+	suspend_set_ops(&goldfish_pm_ops);
-+	return 0;
-+}
-+
-+__initcall(goldfish_pm_init);
-+
diff --git a/target/linux/goldfish/patches-2.6.30/0122--ARM-goldfish-tty-Adding-tty-driver-for-goldfish.patch b/target/linux/goldfish/patches-2.6.30/0122--ARM-goldfish-tty-Adding-tty-driver-for-goldfish.patch
deleted file mode 100644
index e8767e6bd..000000000
--- a/target/linux/goldfish/patches-2.6.30/0122--ARM-goldfish-tty-Adding-tty-driver-for-goldfish.patch
+++ /dev/null
@@ -1,368 +0,0 @@
-From 4ff5a10b94c0c41088c8bbfa5be1ebab3822371b Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@google.com>
-Date: Fri, 29 Jun 2007 21:41:20 -0700
-Subject: [PATCH 122/134] [ARM] goldfish: tty: Adding tty driver for goldfish.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Mike A. Chan <mikechan@google.com>
-Signed-off-by: Arve Hjønnevåg <arve@android.com>
----
- drivers/char/Kconfig        |    6 +
- drivers/char/Makefile       |    1 +
- drivers/char/goldfish_tty.c |  323 +++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 330 insertions(+), 0 deletions(-)
- create mode 100644 drivers/char/goldfish_tty.c
-
---- a/drivers/char/Kconfig
-+++ b/drivers/char/Kconfig
-@@ -1106,6 +1106,12 @@ config DEVPORT
- 	depends on ISA || PCI
- 	default y
- 
-+config GOLDFISH_TTY
-+	tristate "Goldfish TTY Driver"
-+	default n
-+	help
-+	  TTY driver for Goldfish Virtual Platform.
-+
- source "drivers/s390/char/Kconfig"
- 
- endmenu
---- a/drivers/char/Makefile
-+++ b/drivers/char/Makefile
-@@ -98,6 +98,7 @@ obj-$(CONFIG_GPIO_DEVICE)	+= gpio_dev.o
- obj-$(CONFIG_GPIO_VR41XX)	+= vr41xx_giu.o
- obj-$(CONFIG_GPIO_TB0219)	+= tb0219.o
- obj-$(CONFIG_TELCLOCK)		+= tlclk.o
-+obj-$(CONFIG_GOLDFISH_TTY)	+= goldfish_tty.o
- 
- obj-$(CONFIG_MWAVE)		+= mwave/
- obj-$(CONFIG_AGP)		+= agp/
---- /dev/null
-+++ b/drivers/char/goldfish_tty.c
-@@ -0,0 +1,323 @@
-+/* drivers/char/goldfish_tty.c
-+**
-+** Copyright (C) 2007 Google, Inc.
-+**
-+** This software is licensed under the terms of the GNU General Public
-+** License version 2, as published by the Free Software Foundation, and
-+** may be copied, distributed, and modified under those terms.
-+**
-+** This program is distributed in the hope that it will be useful,
-+** but WITHOUT ANY WARRANTY; without even the implied warranty of
-+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+** GNU General Public License for more details.
-+**
-+*/
-+
-+#include <linux/console.h>
-+#include <linux/init.h>
-+#include <linux/interrupt.h>
-+#include <linux/platform_device.h>
-+#include <linux/tty.h>
-+#include <linux/tty_flip.h>
-+
-+#include <mach/hardware.h>
-+#include <asm/io.h>
-+
-+enum {
-+	GOLDFISH_TTY_PUT_CHAR       = 0x00,
-+	GOLDFISH_TTY_BYTES_READY    = 0x04,
-+	GOLDFISH_TTY_CMD            = 0x08,
-+
-+	GOLDFISH_TTY_DATA_PTR       = 0x10,
-+	GOLDFISH_TTY_DATA_LEN       = 0x14,
-+
-+	GOLDFISH_TTY_CMD_INT_DISABLE    = 0,
-+	GOLDFISH_TTY_CMD_INT_ENABLE     = 1,
-+	GOLDFISH_TTY_CMD_WRITE_BUFFER   = 2,
-+	GOLDFISH_TTY_CMD_READ_BUFFER    = 3,
-+};
-+
-+struct goldfish_tty {
-+	spinlock_t lock;
-+	uint32_t base;
-+	uint32_t irq;
-+	int opencount;
-+	struct tty_struct *tty;
-+	struct console console;
-+};
-+
-+static DEFINE_MUTEX(goldfish_tty_lock);
-+static struct tty_driver *goldfish_tty_driver;
-+static uint32_t goldfish_tty_line_count = 8;
-+static uint32_t goldfish_tty_current_line_count;
-+static struct goldfish_tty *goldfish_ttys;
-+
-+static void goldfish_tty_do_write(int line, const char *buf, unsigned count)
-+{
-+	unsigned long irq_flags;
-+	struct goldfish_tty *qtty = &goldfish_ttys[line];
-+	uint32_t base = qtty->base;
-+	spin_lock_irqsave(&qtty->lock, irq_flags);
-+	writel(buf, base + GOLDFISH_TTY_DATA_PTR);
-+	writel(count, base + GOLDFISH_TTY_DATA_LEN);
-+	writel(GOLDFISH_TTY_CMD_WRITE_BUFFER, base + GOLDFISH_TTY_CMD);
-+	spin_unlock_irqrestore(&qtty->lock, irq_flags);
-+}
-+
-+static irqreturn_t goldfish_tty_interrupt(int irq, void *dev_id)
-+{
-+	struct platform_device *pdev = dev_id;
-+	struct goldfish_tty *qtty = &goldfish_ttys[pdev->id];
-+	uint32_t base = qtty->base;
-+	unsigned long irq_flags;
-+	unsigned char *buf;
-+	uint32_t count;
-+
-+	count = readl(base + GOLDFISH_TTY_BYTES_READY);
-+	if(count == 0) {
-+		return IRQ_NONE;
-+	}
-+	count = tty_prepare_flip_string(qtty->tty, &buf, count);
-+	spin_lock_irqsave(&qtty->lock, irq_flags);
-+	writel(buf, base + GOLDFISH_TTY_DATA_PTR);
-+	writel(count, base + GOLDFISH_TTY_DATA_LEN);
-+	writel(GOLDFISH_TTY_CMD_READ_BUFFER, base + GOLDFISH_TTY_CMD);
-+	spin_unlock_irqrestore(&qtty->lock, irq_flags);
-+	tty_schedule_flip(qtty->tty);
-+	return IRQ_HANDLED;
-+}
-+
-+static int goldfish_tty_open(struct tty_struct * tty, struct file * filp)
-+{
-+	int ret;
-+	struct goldfish_tty *qtty = &goldfish_ttys[tty->index];
-+
-+	mutex_lock(&goldfish_tty_lock);
-+	if(qtty->tty == NULL || qtty->tty == tty) {
-+		if(qtty->opencount++ == 0) {
-+			qtty->tty = tty;
-+			writel(GOLDFISH_TTY_CMD_INT_ENABLE, qtty->base + GOLDFISH_TTY_CMD);
-+		}
-+		ret = 0;
-+	}
-+	else
-+		ret = -EBUSY;
-+	mutex_unlock(&goldfish_tty_lock);
-+	return ret;
-+}
-+
-+static void goldfish_tty_close(struct tty_struct * tty, struct file * filp)
-+{
-+	struct goldfish_tty *qtty = &goldfish_ttys[tty->index];
-+
-+	mutex_lock(&goldfish_tty_lock);
-+	if(qtty->tty == tty) {
-+		if(--qtty->opencount == 0) {
-+			writel(GOLDFISH_TTY_CMD_INT_DISABLE, qtty->base + GOLDFISH_TTY_CMD);
-+			qtty->tty = NULL;
-+		}
-+	}
-+	mutex_unlock(&goldfish_tty_lock);
-+}
-+
-+static int goldfish_tty_write(struct tty_struct * tty, const unsigned char *buf, int count)
-+{
-+	goldfish_tty_do_write(tty->index, buf, count);
-+	return count;
-+}
-+
-+static int goldfish_tty_write_room(struct tty_struct *tty)
-+{
-+	return 0x10000;
-+}
-+
-+static int goldfish_tty_chars_in_buffer(struct tty_struct *tty)
-+{
-+	struct goldfish_tty *qtty = &goldfish_ttys[tty->index];
-+	uint32_t base = qtty->base;
-+	return readl(base + GOLDFISH_TTY_BYTES_READY);
-+}
-+
-+static void goldfish_tty_console_write(struct console *co, const char *b, unsigned count)
-+{
-+	goldfish_tty_do_write(co->index, b, count);
-+}
-+
-+static struct tty_driver *goldfish_tty_console_device(struct console *c, int *index)
-+{
-+	*index = c->index;
-+	return goldfish_tty_driver;
-+}
-+
-+static int goldfish_tty_console_setup(struct console *co, char *options)
-+{
-+	if((unsigned)co->index > goldfish_tty_line_count)
-+		return -ENODEV;
-+	if(goldfish_ttys[co->index].base == 0)
-+		return -ENODEV;
-+	return 0;
-+}
-+
-+static struct tty_operations goldfish_tty_ops = {
-+	.open = goldfish_tty_open,
-+	.close = goldfish_tty_close,
-+	.write = goldfish_tty_write,
-+	.write_room = goldfish_tty_write_room,
-+	.chars_in_buffer = goldfish_tty_chars_in_buffer,
-+};
-+
-+static int __devinit goldfish_tty_create_driver(void)
-+{
-+	int ret;
-+	struct tty_driver *tty;
-+
-+	goldfish_ttys = kzalloc(sizeof(*goldfish_ttys) * goldfish_tty_line_count, GFP_KERNEL);
-+	if(goldfish_ttys == NULL) {
-+		ret = -ENOMEM;
-+		goto err_alloc_goldfish_ttys_failed;
-+	}
-+
-+	tty = alloc_tty_driver(goldfish_tty_line_count);
-+	if(tty == NULL) {
-+		ret = -ENOMEM;
-+		goto err_alloc_tty_driver_failed;
-+	}
-+	tty->driver_name = "goldfish";
-+	tty->name = "ttyS";
-+	tty->type = TTY_DRIVER_TYPE_SERIAL;
-+	tty->subtype = SERIAL_TYPE_NORMAL;
-+	tty->init_termios = tty_std_termios;
-+	tty->flags = TTY_DRIVER_RESET_TERMIOS | TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
-+	tty_set_operations(tty, &goldfish_tty_ops);
-+	ret = tty_register_driver(tty);
-+	if(ret)
-+		goto err_tty_register_driver_failed;
-+
-+	goldfish_tty_driver = tty;
-+	return 0;
-+
-+err_tty_register_driver_failed:
-+	put_tty_driver(tty);
-+err_alloc_tty_driver_failed:
-+	kfree(goldfish_ttys);
-+	goldfish_ttys = NULL;
-+err_alloc_goldfish_ttys_failed:
-+	return ret;
-+}
-+
-+static void goldfish_tty_delete_driver(void)
-+{
-+	tty_unregister_driver(goldfish_tty_driver);
-+	put_tty_driver(goldfish_tty_driver);
-+	goldfish_tty_driver = NULL;
-+	kfree(goldfish_ttys);
-+	goldfish_ttys = NULL;
-+}
-+
-+static int __devinit goldfish_tty_probe(struct platform_device *pdev)
-+{
-+	int ret;
-+	int i;
-+	struct resource *r;
-+	struct device *ttydev;
-+	uint32_t base;
-+	uint32_t irq;
-+
-+	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if(r == NULL)
-+		return -EINVAL;
-+	base = IO_ADDRESS(r->start - IO_START);
-+	r = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-+	if(r == NULL)
-+		return -EINVAL;
-+	irq = r->start;
-+
-+	if(pdev->id >= goldfish_tty_line_count)
-+		return -EINVAL;
-+
-+	mutex_lock(&goldfish_tty_lock);
-+	if(goldfish_tty_current_line_count == 0) {
-+		ret = goldfish_tty_create_driver();
-+		if(ret)
-+			goto err_create_driver_failed;
-+	}
-+	goldfish_tty_current_line_count++;
-+
-+	spin_lock_init(&goldfish_ttys[pdev->id].lock);
-+	goldfish_ttys[pdev->id].base = base;
-+	goldfish_ttys[pdev->id].irq = irq;
-+
-+	writel(GOLDFISH_TTY_CMD_INT_DISABLE, base + GOLDFISH_TTY_CMD);
-+
-+	ret = request_irq(irq, goldfish_tty_interrupt, IRQF_SHARED, "goldfish_tty", pdev);
-+	if(ret)
-+		goto err_request_irq_failed;
-+
-+
-+	ttydev = tty_register_device(goldfish_tty_driver, pdev->id, NULL);
-+	if(IS_ERR(ttydev)) {
-+		ret = PTR_ERR(ttydev);
-+		goto err_tty_register_device_failed;
-+	}
-+
-+	strcpy(goldfish_ttys[pdev->id].console.name, "ttyS");
-+	goldfish_ttys[pdev->id].console.write		= goldfish_tty_console_write;
-+	goldfish_ttys[pdev->id].console.device		= goldfish_tty_console_device;
-+	goldfish_ttys[pdev->id].console.setup		= goldfish_tty_console_setup;
-+	goldfish_ttys[pdev->id].console.flags		= CON_PRINTBUFFER;
-+	goldfish_ttys[pdev->id].console.index		= pdev->id;
-+	register_console(&goldfish_ttys[pdev->id].console);
-+
-+
-+	mutex_unlock(&goldfish_tty_lock);
-+
-+	return 0;
-+
-+	tty_unregister_device(goldfish_tty_driver, i);
-+err_tty_register_device_failed:
-+	free_irq(irq, pdev);
-+err_request_irq_failed:
-+	goldfish_tty_current_line_count--;
-+	if(goldfish_tty_current_line_count == 0) {
-+		goldfish_tty_delete_driver();
-+	}
-+err_create_driver_failed:
-+	mutex_unlock(&goldfish_tty_lock);
-+	return ret;
-+}
-+
-+static int __devexit goldfish_tty_remove(struct platform_device *pdev)
-+{
-+	mutex_lock(&goldfish_tty_lock);
-+	unregister_console(&goldfish_ttys[pdev->id].console);
-+	tty_unregister_device(goldfish_tty_driver, pdev->id);
-+	goldfish_ttys[pdev->id].base = 0;
-+	free_irq(goldfish_ttys[pdev->id].irq, pdev);
-+	goldfish_tty_current_line_count--;
-+	if(goldfish_tty_current_line_count == 0) {
-+		goldfish_tty_delete_driver();
-+	}
-+	mutex_unlock(&goldfish_tty_lock);
-+	return 0;
-+}
-+
-+static struct platform_driver goldfish_tty_platform_driver = {
-+	.probe = goldfish_tty_probe,
-+	.remove = __devexit_p(goldfish_tty_remove),
-+	.driver = {
-+		.name = "goldfish_tty"
-+	}
-+};
-+
-+static int __init goldfish_tty_init(void)
-+{
-+	return platform_driver_register(&goldfish_tty_platform_driver);
-+}
-+
-+static void __exit goldfish_tty_exit(void)
-+{
-+	platform_driver_unregister(&goldfish_tty_platform_driver);
-+}
-+
-+module_init(goldfish_tty_init);
-+module_exit(goldfish_tty_exit);
diff --git a/target/linux/goldfish/patches-2.6.30/0123--ARM-goldfish-events-Add-event-driver-for-goldfis.patch b/target/linux/goldfish/patches-2.6.30/0123--ARM-goldfish-events-Add-event-driver-for-goldfis.patch
deleted file mode 100644
index fd9566e7a..000000000
--- a/target/linux/goldfish/patches-2.6.30/0123--ARM-goldfish-events-Add-event-driver-for-goldfis.patch
+++ /dev/null
@@ -1,234 +0,0 @@
-From 226fd290dc2d052e5cd437cc8464e1424e7ebf2c Mon Sep 17 00:00:00 2001
-From: Brian Swetland <swetland@google.com>
-Date: Sun, 13 Aug 2006 21:50:14 +0700
-Subject: [PATCH 123/134] [ARM] goldfish: events: Add event driver for goldfish
-
-this device is a direct pipe from "hardware" to the input
-event subsystem, allowing us to avoid having to route
-"keypad" style events through an AT keyboard driver (gross!)
-
-Signed-off-by: Mike A. Chan <mikechan@google.com>
----
- drivers/input/keyboard/Kconfig           |    5 +
- drivers/input/keyboard/Makefile          |    1 +
- drivers/input/keyboard/goldfish_events.c |  190 ++++++++++++++++++++++++++++++
- 3 files changed, 196 insertions(+), 0 deletions(-)
- create mode 100644 drivers/input/keyboard/goldfish_events.c
-
---- a/drivers/input/keyboard/Kconfig
-+++ b/drivers/input/keyboard/Kconfig
-@@ -304,6 +304,11 @@ config KEYBOARD_GPIO
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called gpio-keys.
- 
-+config KEYBOARD_GOLDFISH_EVENTS
-+	tristate "Generic Input Event device for Goldfish"
-+	help
-+	  no help
-+
- config KEYBOARD_MAPLE
- 	tristate "Maple bus keyboard"
- 	depends on SH_DREAMCAST && MAPLE
---- a/drivers/input/keyboard/Makefile
-+++ b/drivers/input/keyboard/Makefile
-@@ -23,6 +23,7 @@ obj-$(CONFIG_KEYBOARD_PXA27x)		+= pxa27x
- obj-$(CONFIG_KEYBOARD_PXA930_ROTARY)	+= pxa930_rotary.o
- obj-$(CONFIG_KEYBOARD_AAED2000)		+= aaed2000_kbd.o
- obj-$(CONFIG_KEYBOARD_GPIO)		+= gpio_keys.o
-+obj-$(CONFIG_KEYBOARD_GOLDFISH_EVENTS)	+= goldfish_events.o
- obj-$(CONFIG_KEYBOARD_HP6XX)		+= jornada680_kbd.o
- obj-$(CONFIG_KEYBOARD_HP7XX)		+= jornada720_kbd.o
- obj-$(CONFIG_KEYBOARD_MAPLE)		+= maple_keyb.o
---- /dev/null
-+++ b/drivers/input/keyboard/goldfish_events.c
-@@ -0,0 +1,190 @@
-+/* drivers/input/keyboard/goldfish-events.c
-+**
-+** Copyright (C) 2007 Google, Inc.
-+**
-+** This software is licensed under the terms of the GNU General Public
-+** License version 2, as published by the Free Software Foundation, and
-+** may be copied, distributed, and modified under those terms.
-+**
-+** This program is distributed in the hope that it will be useful,
-+** but WITHOUT ANY WARRANTY; without even the implied warranty of
-+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+** GNU General Public License for more details.
-+**
-+*/
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/interrupt.h>
-+#include <linux/types.h>
-+#include <linux/input.h>
-+#include <linux/kernel.h>
-+#include <linux/platform_device.h>
-+
-+#include <mach/hardware.h>
-+#include <asm/irq.h>
-+#include <asm/io.h>
-+
-+enum {
-+	REG_READ        = 0x00,
-+	REG_SET_PAGE    = 0x00,
-+	REG_LEN         = 0x04,
-+	REG_DATA        = 0x08,
-+
-+	PAGE_NAME       = 0x00000,
-+	PAGE_EVBITS     = 0x10000,
-+	PAGE_ABSDATA    = 0x20000 | EV_ABS,
-+};
-+
-+struct event_dev {
-+    struct input_dev *input;
-+    int irq;
-+    unsigned addr;
-+    char name[0];
-+};
-+
-+static irqreturn_t events_interrupt(int irq, void *dev_id)
-+{
-+    struct event_dev *edev = dev_id;
-+    unsigned type, code, value;
-+
-+    type = __raw_readl(edev->addr + REG_READ);
-+    code = __raw_readl(edev->addr + REG_READ);
-+    value = __raw_readl(edev->addr + REG_READ);
-+
-+    input_event(edev->input, type, code, value);
-+    return IRQ_HANDLED;
-+}
-+
-+static void events_import_bits(struct event_dev *edev, unsigned long bits[], unsigned type, size_t count)
-+{
-+	int i, j;
-+	size_t size;
-+	uint8_t val;
-+	unsigned addr = edev->addr;
-+	__raw_writel(PAGE_EVBITS | type, addr + REG_SET_PAGE);
-+	size = __raw_readl(addr + REG_LEN) * 8;
-+	if (size < count)
-+		count = size;
-+	addr = addr + REG_DATA;
-+	for (i = 0; i < count; i += 8) {
-+		val = __raw_readb(addr++);
-+		for (j = 0; j < 8; j++)
-+			if(val & 1 << j)
-+				set_bit(i + j, bits);
-+	}
-+}
-+
-+static int events_probe(struct platform_device *pdev)
-+{
-+    struct input_dev *input_dev;
-+    struct event_dev *edev = NULL;
-+    struct resource *res;
-+    unsigned keymapnamelen;
-+    int i;
-+    int count;
-+    int irq;
-+    unsigned addr;
-+    int ret;
-+    
-+    printk("*** events probe ***\n");
-+
-+    input_dev = input_allocate_device();
-+    res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+    if(!input_dev || !res) goto fail;
-+
-+    addr = (unsigned) ioremap(res->start, 4096);
-+    irq = platform_get_irq(pdev, 0);
-+
-+    printk("events_probe() addr=0x%08x irq=%d\n", addr, irq);
-+
-+    if(!addr) goto fail;
-+    if(irq < 0) goto fail;
-+
-+    __raw_writel(PAGE_NAME, addr + REG_SET_PAGE);
-+    keymapnamelen = __raw_readl(addr + REG_LEN);
-+
-+    edev = kzalloc(sizeof(struct event_dev) + keymapnamelen + 1, GFP_KERNEL);
-+    if (!edev) goto fail;
-+
-+    edev->input = input_dev;
-+    edev->addr = addr;
-+    edev->irq = irq;
-+    
-+    for (i = 0; i < keymapnamelen; i++) {
-+        edev->name[i] = __raw_readb(edev->addr + REG_DATA + i);
-+    }
-+    printk("events_probe() keymap=%s\n", edev->name);
-+
-+    events_import_bits(edev, input_dev->evbit, EV_SYN, EV_MAX);
-+    events_import_bits(edev, input_dev->keybit, EV_KEY, KEY_MAX);
-+    events_import_bits(edev, input_dev->relbit, EV_REL, REL_MAX);
-+    events_import_bits(edev, input_dev->absbit, EV_ABS, ABS_MAX);
-+    events_import_bits(edev, input_dev->mscbit, EV_MSC, MSC_MAX);
-+    events_import_bits(edev, input_dev->ledbit, EV_LED, LED_MAX);
-+    events_import_bits(edev, input_dev->sndbit, EV_SND, SND_MAX);
-+    events_import_bits(edev, input_dev->ffbit, EV_FF, FF_MAX);
-+    events_import_bits(edev, input_dev->swbit, EV_SW, SW_MAX);
-+
-+    __raw_writel(PAGE_ABSDATA, addr + REG_SET_PAGE);
-+    count = __raw_readl(addr + REG_LEN) / (4 * 4);
-+    if (count > ABS_MAX)
-+        count = ABS_MAX;
-+    for(i = 0; i < count; i++) {
-+        int val[4]; 
-+        int j;
-+        if (!test_bit(i, input_dev->absbit))
-+            continue;
-+        for(j = 0; j < ARRAY_SIZE(val); j++)
-+            val[j] = __raw_readl(edev->addr + REG_DATA + (i * ARRAY_SIZE(val) + j) * 4);
-+        input_set_abs_params(input_dev, i, val[0], val[1], val[2], val[3]);
-+    }
-+    
-+    platform_set_drvdata(pdev, edev);
-+
-+    input_dev->name = edev->name;
-+    input_set_drvdata(input_dev, edev);
-+    
-+    ret = input_register_device(input_dev);
-+    if (ret)
-+        goto fail;
-+
-+    if(request_irq(edev->irq, events_interrupt, 0,
-+                   "goldfish-events-keypad", edev) < 0) {
-+        input_unregister_device(input_dev);
-+        kfree(edev);
-+        return -EINVAL;
-+    }
-+
-+    return 0;
-+
-+fail:
-+    kfree(edev);
-+    input_free_device(input_dev);
-+    
-+    return -EINVAL;
-+}
-+
-+static struct platform_driver events_driver = {
-+    .probe = events_probe,
-+    .driver = {
-+        .name = "goldfish_events",
-+    },
-+};
-+
-+static int __devinit events_init(void)
-+{
-+    return platform_driver_register(&events_driver);
-+}
-+
-+
-+static void __exit events_exit(void)
-+{
-+}
-+
-+module_init(events_init);
-+module_exit(events_exit);
-+
-+MODULE_AUTHOR("Brian Swetland");
-+MODULE_DESCRIPTION("Goldfish Event Device");
-+MODULE_LICENSE("GPL");
diff --git a/target/linux/goldfish/patches-2.6.30/0124--ARM-goldfish-mmc-goldfish-MMC-driver-building-an.patch b/target/linux/goldfish/patches-2.6.30/0124--ARM-goldfish-mmc-goldfish-MMC-driver-building-an.patch
deleted file mode 100644
index 58ccbb0b1..000000000
--- a/target/linux/goldfish/patches-2.6.30/0124--ARM-goldfish-mmc-goldfish-MMC-driver-building-an.patch
+++ /dev/null
@@ -1,626 +0,0 @@
-From 2eccfcf4c5c50b412a0859a345d8d28fc043956b Mon Sep 17 00:00:00 2001
-From: Mike Lockwood <lockwood@android.com>
-Date: Thu, 7 Feb 2008 07:47:30 -0500
-Subject: [PATCH 124/134] [ARM] goldfish: mmc: goldfish MMC driver building and runnning in 2.6.27.
-
-Signed-off-by: Mike A. Chan <mikechan@google.com>
----
- drivers/mmc/host/Kconfig    |    8 +
- drivers/mmc/host/Makefile   |    1 +
- drivers/mmc/host/goldfish.c |  583 +++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 592 insertions(+), 0 deletions(-)
- create mode 100644 drivers/mmc/host/goldfish.c
-
---- a/drivers/mmc/host/Kconfig
-+++ b/drivers/mmc/host/Kconfig
-@@ -200,6 +200,14 @@ config MMC_MVSDIO
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called mvsdio.
- 
-+config MMC_GOLDFISH
-+	tristate "goldfish qemu Multimedia Card Interface support"
-+	depends on ARCH_GOLDFISH
-+	help
-+	  This selects the Goldfish Multimedia card Interface emulation.
-+
-+	  If unsure, say N.
-+
- config MMC_SPI
- 	tristate "MMC/SD/SDIO over SPI"
- 	depends on SPI_MASTER && !HIGHMEM && HAS_DMA
---- a/drivers/mmc/host/Makefile
-+++ b/drivers/mmc/host/Makefile
-@@ -26,6 +26,7 @@ obj-$(CONFIG_MMC_SPI)		+= mmc_spi.o
- ifeq ($(CONFIG_OF),y)
- obj-$(CONFIG_MMC_SPI)		+= of_mmc_spi.o
- endif
-+obj-$(CONFIG_MMC_GOLDFISH)	+= goldfish.o
- obj-$(CONFIG_MMC_S3C)   	+= s3cmci.o
- obj-$(CONFIG_MMC_SDRICOH_CS)	+= sdricoh_cs.o
- obj-$(CONFIG_MMC_TMIO)		+= tmio_mmc.o
---- /dev/null
-+++ b/drivers/mmc/host/goldfish.c
-@@ -0,0 +1,583 @@
-+/*
-+ *  linux/drivers/media/mmc/goldfish.c
-+ *
-+ *  Copyright 2007, Google Inc.
-+ *
-+ *  based on omap.c driver, which was
-+ *  Copyright (C) 2004 Nokia Corporation
-+ *  Written by Tuukka Tikkanen and Juha Yrjölä<juha.yrjola@nokia.com>
-+ *  Misc hacks here and there by Tony Lindgren <tony@atomide.com>
-+ *  Other hacks (DMA, SD, etc) by David Brownell
-+ *
-+ * 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.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/major.h>
-+
-+#include <linux/types.h>
-+#include <linux/pci.h>
-+#include <linux/interrupt.h>
-+
-+#include <linux/kernel.h>
-+#include <linux/fs.h>
-+#include <linux/errno.h>
-+#include <linux/hdreg.h>
-+#include <linux/kdev_t.h>
-+#include <linux/blkdev.h>
-+#include <linux/mutex.h>
-+#include <linux/scatterlist.h>
-+#include <linux/mmc/mmc.h>
-+#include <linux/mmc/sdio.h>
-+#include <linux/mmc/host.h>
-+#include <linux/mmc/card.h>
-+
-+#include <linux/moduleparam.h>
-+#include <linux/init.h>
-+#include <linux/ioport.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/delay.h>
-+#include <linux/spinlock.h>
-+#include <linux/timer.h>
-+#include <linux/clk.h>
-+
-+#include <asm/io.h>
-+#include <asm/irq.h>
-+#include <asm/scatterlist.h>
-+#include <asm/mach-types.h>
-+
-+
-+#include <asm/types.h>
-+#include <asm/io.h>
-+#include <asm/uaccess.h>
-+
-+#define DRIVER_NAME "goldfish_mmc"
-+
-+#define BUFFER_SIZE   16384
-+
-+#define GOLDFISH_MMC_READ(host, addr)   (readl(host->reg_base + addr))
-+#define GOLDFISH_MMC_WRITE(host, addr, x)   (writel(x, host->reg_base + addr))
-+
-+
-+enum {
-+	/* status register */
-+	MMC_INT_STATUS	        = 0x00, 
-+	/* set this to enable IRQ */
-+	MMC_INT_ENABLE	        = 0x04,
-+	/* set this to specify buffer address */
-+	MMC_SET_BUFFER          = 0x08,
-+	
-+	/* MMC command number */
-+	MMC_CMD	                = 0x0C,	
-+
-+	/* MMC argument */
-+	MMC_ARG	                = 0x10,
-+	
-+	/* MMC response (or R2 bits 0 - 31) */
-+	MMC_RESP_0		        = 0x14,
-+
-+	/* MMC R2 response bits 32 - 63 */
-+	MMC_RESP_1		        = 0x18,
-+
-+	/* MMC R2 response bits 64 - 95 */
-+	MMC_RESP_2		        = 0x1C,
-+
-+	/* MMC R2 response bits 96 - 127 */
-+	MMC_RESP_3		        = 0x20,
-+
-+	MMC_BLOCK_LENGTH        = 0x24,
-+	MMC_BLOCK_COUNT         = 0x28,
-+
-+	/* MMC state flags */
-+	MMC_STATE               = 0x2C,
-+
-+	/* MMC_INT_STATUS bits */
-+	
-+	MMC_STAT_END_OF_CMD     = 1U << 0,
-+	MMC_STAT_END_OF_DATA    = 1U << 1,
-+	MMC_STAT_STATE_CHANGE   = 1U << 2,
-+
-+	/* MMC_STATE bits */
-+	MMC_STATE_INSERTED     = 1U << 0,
-+	MMC_STATE_READ_ONLY    = 1U << 1,
-+};
-+
-+/*
-+ * Command types
-+ */
-+#define OMAP_MMC_CMDTYPE_BC	0
-+#define OMAP_MMC_CMDTYPE_BCR	1
-+#define OMAP_MMC_CMDTYPE_AC	2
-+#define OMAP_MMC_CMDTYPE_ADTC	3
-+
-+
-+struct goldfish_mmc_host {
-+	struct mmc_request *	mrq;
-+	struct mmc_command *	cmd;
-+	struct mmc_data *	data;
-+	struct mmc_host *	mmc;
-+	struct device *		dev;
-+	unsigned char		id; /* 16xx chips have 2 MMC blocks */
-+	void __iomem		*virt_base;
-+	unsigned int		phys_base;
-+	int			irq;
-+	unsigned char		bus_mode;
-+	unsigned char		hw_bus_mode;
-+
-+	unsigned int		sg_len;
-+	unsigned		dma_done:1;
-+	unsigned		dma_in_use:1;
-+
-+	struct work_struct	switch_work;
-+	int			switch_last_state;
-+
-+	uint32_t			reg_base;
-+};
-+
-+static inline int
-+goldfish_mmc_cover_is_open(struct goldfish_mmc_host *host)
-+{
-+	return 0;
-+}
-+
-+static ssize_t
-+goldfish_mmc_show_cover_switch(struct device *dev,
-+	struct device_attribute *attr, char *buf)
-+{
-+	struct goldfish_mmc_host *host = dev_get_drvdata(dev);
-+
-+	return sprintf(buf, "%s\n", goldfish_mmc_cover_is_open(host) ? "open" :
-+			"closed");
-+}
-+
-+static DEVICE_ATTR(cover_switch, S_IRUGO, goldfish_mmc_show_cover_switch, NULL);
-+
-+static void
-+goldfish_mmc_start_command(struct goldfish_mmc_host *host, struct mmc_command *cmd)
-+{
-+	u32 cmdreg;
-+	u32 resptype;
-+	u32 cmdtype;
-+
-+	host->cmd = cmd;
-+
-+	resptype = 0;
-+	cmdtype = 0;
-+
-+	/* Our hardware needs to know exact type */
-+	switch (mmc_resp_type(cmd)) {
-+	case MMC_RSP_NONE:
-+		break;
-+	case MMC_RSP_R1:
-+	case MMC_RSP_R1B:
-+		/* resp 1, 1b, 6, 7 */
-+		resptype = 1;
-+		break;
-+	case MMC_RSP_R2:
-+		resptype = 2;
-+		break;
-+	case MMC_RSP_R3:
-+		resptype = 3;
-+		break;
-+	default:
-+		dev_err(mmc_dev(host->mmc), "Invalid response type: %04x\n", mmc_resp_type(cmd));
-+		break;
-+	}
-+
-+	if (mmc_cmd_type(cmd) == MMC_CMD_ADTC) {
-+		cmdtype = OMAP_MMC_CMDTYPE_ADTC;
-+	} else if (mmc_cmd_type(cmd) == MMC_CMD_BC) {
-+		cmdtype = OMAP_MMC_CMDTYPE_BC;
-+	} else if (mmc_cmd_type(cmd) == MMC_CMD_BCR) {
-+		cmdtype = OMAP_MMC_CMDTYPE_BCR;
-+	} else {
-+		cmdtype = OMAP_MMC_CMDTYPE_AC;
-+	}
-+
-+	cmdreg = cmd->opcode | (resptype << 8) | (cmdtype << 12);
-+
-+	if (host->bus_mode == MMC_BUSMODE_OPENDRAIN)
-+		cmdreg |= 1 << 6;
-+
-+	if (cmd->flags & MMC_RSP_BUSY)
-+		cmdreg |= 1 << 11;
-+
-+	if (host->data && !(host->data->flags & MMC_DATA_WRITE))
-+		cmdreg |= 1 << 15;
-+
-+	GOLDFISH_MMC_WRITE(host, MMC_ARG, cmd->arg);
-+	GOLDFISH_MMC_WRITE(host, MMC_CMD, cmdreg);
-+}
-+
-+static void
-+goldfish_mmc_xfer_done(struct goldfish_mmc_host *host, struct mmc_data *data)
-+{
-+	if (host->dma_in_use) {
-+		enum dma_data_direction dma_data_dir;
-+
-+		if (data->flags & MMC_DATA_WRITE)
-+			dma_data_dir = DMA_TO_DEVICE;
-+		else
-+			dma_data_dir = DMA_FROM_DEVICE;
-+
-+		if (dma_data_dir == DMA_FROM_DEVICE) {
-+			// we don't really have DMA, so we need to copy from our platform driver buffer
-+			uint8_t* dest = (uint8_t *)sg_virt(data->sg);
-+			memcpy(dest, host->virt_base, data->sg->length);
-+		}
-+
-+		host->data->bytes_xfered += data->sg->length;
-+
-+		dma_unmap_sg(mmc_dev(host->mmc), data->sg, host->sg_len, dma_data_dir);
-+	}
-+	
-+	host->data = NULL;
-+	host->sg_len = 0;
-+
-+	/* NOTE:  MMC layer will sometimes poll-wait CMD13 next, issuing
-+	 * dozens of requests until the card finishes writing data.
-+	 * It'd be cheaper to just wait till an EOFB interrupt arrives...
-+	 */
-+
-+	if (!data->stop) {
-+		host->mrq = NULL;
-+		mmc_request_done(host->mmc, data->mrq);
-+		return;
-+	}
-+
-+	goldfish_mmc_start_command(host, data->stop);
-+}
-+
-+static void
-+goldfish_mmc_end_of_data(struct goldfish_mmc_host *host, struct mmc_data *data)
-+{
-+	if (!host->dma_in_use) {
-+		goldfish_mmc_xfer_done(host, data);
-+		return;
-+	}
-+	if (host->dma_done)
-+		goldfish_mmc_xfer_done(host, data);
-+}
-+
-+static void
-+goldfish_mmc_cmd_done(struct goldfish_mmc_host *host, struct mmc_command *cmd)
-+{
-+	host->cmd = NULL;
-+	if (cmd->flags & MMC_RSP_PRESENT) {
-+		if (cmd->flags & MMC_RSP_136) {
-+			/* response type 2 */
-+			cmd->resp[3] =
-+				GOLDFISH_MMC_READ(host, MMC_RESP_0);
-+			cmd->resp[2] =
-+				GOLDFISH_MMC_READ(host, MMC_RESP_1);
-+			cmd->resp[1] =
-+				GOLDFISH_MMC_READ(host, MMC_RESP_2);
-+			cmd->resp[0] =
-+				GOLDFISH_MMC_READ(host, MMC_RESP_3);
-+		} else {
-+			/* response types 1, 1b, 3, 4, 5, 6 */
-+			cmd->resp[0] =
-+				GOLDFISH_MMC_READ(host, MMC_RESP_0);
-+		}
-+	}
-+
-+	if (host->data == NULL || cmd->error) {
-+		host->mrq = NULL;
-+		mmc_request_done(host->mmc, cmd->mrq);
-+	}
-+}
-+
-+static irqreturn_t goldfish_mmc_irq(int irq, void *dev_id)
-+{
-+	struct goldfish_mmc_host * host = (struct goldfish_mmc_host *)dev_id;
-+	u16 status;
-+	int end_command;
-+	int end_transfer;
-+	int transfer_error;
-+	int state_changed;
-+
-+	if (host->cmd == NULL && host->data == NULL) {
-+		status = GOLDFISH_MMC_READ(host, MMC_INT_STATUS);
-+		dev_info(mmc_dev(host->mmc),"spurious irq 0x%04x\n", status);
-+		if (status != 0) {
-+			GOLDFISH_MMC_WRITE(host, MMC_INT_STATUS, status);
-+			GOLDFISH_MMC_WRITE(host, MMC_INT_ENABLE, 0);
-+		}
-+		return IRQ_HANDLED;
-+	}
-+
-+	end_command = 0;
-+	end_transfer = 0;
-+	transfer_error = 0;
-+	state_changed = 0;
-+
-+	while ((status = GOLDFISH_MMC_READ(host, MMC_INT_STATUS)) != 0) {
-+		GOLDFISH_MMC_WRITE(host, MMC_INT_STATUS, status);
-+
-+		if (status & MMC_STAT_END_OF_CMD) {
-+			end_command = 1;
-+		}
-+
-+		if (status & MMC_STAT_END_OF_DATA) {
-+			end_transfer = 1;
-+		}
-+		if (status & MMC_STAT_STATE_CHANGE) {
-+			state_changed = 1;
-+		}
-+	}
-+
-+	if (end_command) {
-+		goldfish_mmc_cmd_done(host, host->cmd);
-+	}
-+	if (transfer_error)
-+		goldfish_mmc_xfer_done(host, host->data);
-+	else if (end_transfer) {
-+		host->dma_done = 1;
-+		goldfish_mmc_end_of_data(host, host->data);
-+	}
-+	if (state_changed) {
-+		schedule_work(&host->switch_work);
-+	}
-+
-+	return IRQ_HANDLED;
-+}
-+
-+
-+static void goldfish_mmc_switch_handler(struct work_struct *work)
-+{
-+/*
-+	struct goldfish_mmc_host *host = container_of(work, struct goldfish_mmc_host, switch_work);
-+	struct mmc_card *card;
-+	static int complained = 0;
-+	int cards = 0, cover_open;
-+
-+	cover_open = goldfish_mmc_cover_is_open(host);
-+	if (cover_open != host->switch_last_state) {
-+		kobject_uevent(&host->dev->kobj, KOBJ_CHANGE);
-+		host->switch_last_state = cover_open;
-+	}
-+	mmc_detect_change(host->mmc, 0);
-+	list_for_each_entry(card, &host->mmc->cards, node) {
-+		if (mmc_card_present(card))
-+			cards++;
-+	}
-+	if (goldfish_mmc_cover_is_open(host)) {
-+		if (!complained) {
-+			dev_info(mmc_dev(host->mmc), "cover is open\n");
-+			complained = 1;
-+		}
-+	} else {
-+		complained = 0;
-+	}
-+*/
-+}
-+
-+
-+static void
-+goldfish_mmc_prepare_data(struct goldfish_mmc_host *host, struct mmc_request *req)
-+{
-+	struct mmc_data *data = req->data;
-+	int block_size;
-+	unsigned sg_len;
-+	enum dma_data_direction dma_data_dir;
-+
-+	host->data = data;
-+	if (data == NULL) {
-+		GOLDFISH_MMC_WRITE(host, MMC_BLOCK_LENGTH, 0);
-+		GOLDFISH_MMC_WRITE(host, MMC_BLOCK_COUNT, 0);
-+		host->dma_in_use = 0;
-+		return;
-+	}
-+
-+	block_size = data->blksz;
-+
-+	GOLDFISH_MMC_WRITE(host, MMC_BLOCK_COUNT, data->blocks - 1);
-+	GOLDFISH_MMC_WRITE(host, MMC_BLOCK_LENGTH, block_size - 1);
-+
-+	/* cope with calling layer confusion; it issues "single
-+	 * block" writes using multi-block scatterlists.
-+	 */
-+	sg_len = (data->blocks == 1) ? 1 : data->sg_len;
-+
-+	if (data->flags & MMC_DATA_WRITE)
-+		dma_data_dir = DMA_TO_DEVICE;
-+	else
-+		dma_data_dir = DMA_FROM_DEVICE;
-+
-+	host->sg_len = dma_map_sg(mmc_dev(host->mmc), data->sg,
-+				sg_len, dma_data_dir);
-+	host->dma_done = 0;
-+	host->dma_in_use = 1;
-+	
-+	if (dma_data_dir == DMA_TO_DEVICE) {
-+		// we don't really have DMA, so we need to copy to our platform driver buffer
-+		const uint8_t* src = (uint8_t *)sg_virt(data->sg);
-+		memcpy(host->virt_base, src, data->sg->length);
-+	}
-+}
-+
-+static void goldfish_mmc_request(struct mmc_host *mmc, struct mmc_request *req)
-+{
-+	struct goldfish_mmc_host *host = mmc_priv(mmc);
-+
-+	WARN_ON(host->mrq != NULL);
-+
-+	host->mrq = req;
-+	goldfish_mmc_prepare_data(host, req);
-+	goldfish_mmc_start_command(host, req->cmd);
-+
-+	/* this is to avoid accidentally being detected as an SDIO card in mmc_attach_sdio() */
-+	if (req->cmd->opcode == SD_IO_SEND_OP_COND &&
-+		req->cmd->flags == (MMC_RSP_SPI_R4 | MMC_RSP_R4 | MMC_CMD_BCR)) {
-+		req->cmd->error = -EINVAL;
-+	}
-+}
-+
-+static void goldfish_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
-+{
-+	struct goldfish_mmc_host *host = mmc_priv(mmc);
-+
-+	host->bus_mode = ios->bus_mode;
-+	host->hw_bus_mode = host->bus_mode;
-+}
-+
-+static int goldfish_mmc_get_ro(struct mmc_host *mmc)
-+{
-+	uint32_t state;
-+	struct goldfish_mmc_host *host = mmc_priv(mmc);
-+	
-+	state = GOLDFISH_MMC_READ(host, MMC_STATE);
-+	return ((state & MMC_STATE_READ_ONLY) != 0);
-+}
-+
-+static const struct mmc_host_ops goldfish_mmc_ops = {
-+	.request	= goldfish_mmc_request,
-+	.set_ios	= goldfish_mmc_set_ios,
-+	.get_ro		= goldfish_mmc_get_ro,
-+};
-+
-+static int __init goldfish_mmc_probe(struct platform_device *pdev)
-+{
-+	struct mmc_host *mmc;
-+	struct goldfish_mmc_host *host = NULL;
-+	struct resource *res;
-+	int ret = 0;
-+	int irq;
-+	dma_addr_t buf_addr;
-+
-+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	irq = platform_get_irq(pdev, 0);
-+	if (res == NULL || irq < 0)
-+		return -ENXIO;
-+
-+	mmc = mmc_alloc_host(sizeof(struct goldfish_mmc_host), &pdev->dev);
-+	if (mmc == NULL) {
-+		ret = -ENOMEM;
-+		goto err_alloc_host_failed;
-+	}
-+
-+	host = mmc_priv(mmc);
-+	host->mmc = mmc;	
-+	host->reg_base = IO_ADDRESS(res->start - IO_START);
-+	host->virt_base = dma_alloc_writecombine(&pdev->dev, BUFFER_SIZE,
-+												&buf_addr, GFP_KERNEL);
-+	if(host->virt_base == 0) {
-+		ret = -EBUSY;
-+		goto dma_alloc_failed;
-+	}
-+	host->phys_base = buf_addr;
-+
-+	host->id = pdev->id;
-+	host->irq = irq;
-+
-+	mmc->ops = &goldfish_mmc_ops;
-+	mmc->f_min = 400000;
-+	mmc->f_max = 24000000;
-+	mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
-+	mmc->caps = MMC_CAP_4_BIT_DATA;
-+
-+	/* Use scatterlist DMA to reduce per-transfer costs.
-+	 * NOTE max_seg_size assumption that small blocks aren't
-+	 * normally used (except e.g. for reading SD registers).
-+	 */
-+	mmc->max_phys_segs = 32;
-+	mmc->max_hw_segs = 32;
-+	mmc->max_blk_size = 2048;	/* MMC_BLOCK_LENGTH is 11 bits (+1) */
-+	mmc->max_blk_count = 2048;	/* MMC_BLOCK_COUNT is 11 bits (+1) */
-+	mmc->max_req_size = BUFFER_SIZE;
-+	mmc->max_seg_size = mmc->max_req_size;
-+
-+	ret = request_irq(host->irq, goldfish_mmc_irq, 0, DRIVER_NAME, host);
-+	if (ret)
-+		goto err_request_irq_failed;
-+
-+	host->dev = &pdev->dev;
-+	platform_set_drvdata(pdev, host);
-+
-+	ret = device_create_file(&pdev->dev, &dev_attr_cover_switch);
-+	if (ret)
-+		dev_warn(mmc_dev(host->mmc), "Unable to create sysfs attributes\n");
-+
-+	mmc_add_host(mmc);
-+
-+	GOLDFISH_MMC_WRITE(host, MMC_SET_BUFFER, host->phys_base);	
-+	GOLDFISH_MMC_WRITE(host, MMC_INT_ENABLE, 
-+			MMC_STAT_END_OF_CMD | MMC_STAT_END_OF_DATA | MMC_STAT_STATE_CHANGE 
-+			);
-+
-+	// we start with the card present
-+	kobject_uevent(&host->dev->kobj, KOBJ_CHANGE);
-+	mmc_detect_change(host->mmc, 0);
-+
-+	INIT_WORK(&host->switch_work, goldfish_mmc_switch_handler);
-+
-+	return 0;
-+
-+err_request_irq_failed:
-+	dma_free_writecombine(&pdev->dev, BUFFER_SIZE, host->virt_base, host->phys_base);
-+dma_alloc_failed:
-+	mmc_free_host(host->mmc);
-+err_alloc_host_failed:
-+	return ret;
-+}
-+
-+static int goldfish_mmc_remove(struct platform_device *pdev)
-+{
-+	struct goldfish_mmc_host *host = platform_get_drvdata(pdev);
-+
-+	platform_set_drvdata(pdev, NULL);
-+
-+	BUG_ON(host == NULL);
-+
-+	mmc_remove_host(host->mmc);
-+	free_irq(host->irq, host);
-+	dma_free_writecombine(&pdev->dev, BUFFER_SIZE, host->virt_base, host->phys_base);
-+	mmc_free_host(host->mmc);
-+
-+	return 0;
-+}
-+
-+static struct platform_driver goldfish_mmc_driver = {
-+	.probe		= goldfish_mmc_probe,
-+	.remove		= goldfish_mmc_remove,
-+	.driver		= {
-+		.name	= DRIVER_NAME,
-+	},
-+};
-+
-+static int __init goldfish_mmc_init(void)
-+{
-+	return platform_driver_register(&goldfish_mmc_driver);
-+}
-+
-+static void __exit goldfish_mmc_exit(void)
-+{
-+	platform_driver_unregister(&goldfish_mmc_driver);
-+}
-+
-+module_init(goldfish_mmc_init);
-+module_exit(goldfish_mmc_exit);
-+
diff --git a/target/linux/goldfish/patches-2.6.30/0125--ARM-goldfish-NAND-Add-nand-driver-for-goldfish.patch b/target/linux/goldfish/patches-2.6.30/0125--ARM-goldfish-NAND-Add-nand-driver-for-goldfish.patch
deleted file mode 100644
index 0310888fc..000000000
--- a/target/linux/goldfish/patches-2.6.30/0125--ARM-goldfish-NAND-Add-nand-driver-for-goldfish.patch
+++ /dev/null
@@ -1,521 +0,0 @@
-From bed297dad6283a5926962c1c59f95ad641824630 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@google.com>
-Date: Fri, 29 Jun 2007 22:20:07 -0700
-Subject: [PATCH 125/134] [ARM] goldfish: NAND: Add nand driver for goldfish.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Mike A. Chan <mikechan@google.com>
-Signed-off-by: Arve Hjønnevåg <arve@android.com>
----
- drivers/mtd/devices/Kconfig             |    5 +
- drivers/mtd/devices/Makefile            |    1 +
- drivers/mtd/devices/goldfish_nand.c     |  418 +++++++++++++++++++++++++++++++
- drivers/mtd/devices/goldfish_nand_reg.h |   58 +++++
- 4 files changed, 482 insertions(+), 0 deletions(-)
- create mode 100644 drivers/mtd/devices/goldfish_nand.c
- create mode 100644 drivers/mtd/devices/goldfish_nand_reg.h
-
---- a/drivers/mtd/devices/Kconfig
-+++ b/drivers/mtd/devices/Kconfig
-@@ -297,5 +297,10 @@ config MTD_DOCPROBE_55AA
- 	  LinuxBIOS or if you need to recover a DiskOnChip Millennium on which
- 	  you have managed to wipe the first block.
- 
-+config MTD_GOLDFISH_NAND
-+	tristate "Goldfish NAND device"
-+	help
-+	  none
-+
- endmenu
- 
---- a/drivers/mtd/devices/Makefile
-+++ b/drivers/mtd/devices/Makefile
-@@ -16,3 +16,4 @@ obj-$(CONFIG_MTD_LART)		+= lart.o
- obj-$(CONFIG_MTD_BLOCK2MTD)	+= block2mtd.o
- obj-$(CONFIG_MTD_DATAFLASH)	+= mtd_dataflash.o
- obj-$(CONFIG_MTD_M25P80)	+= m25p80.o
-+obj-$(CONFIG_MTD_GOLDFISH_NAND)	+= goldfish_nand.o
---- /dev/null
-+++ b/drivers/mtd/devices/goldfish_nand.c
-@@ -0,0 +1,418 @@
-+/* drivers/mtd/devices/goldfish_nand.c
-+**
-+** Copyright (C) 2007 Google, Inc.
-+**
-+** This software is licensed under the terms of the GNU General Public
-+** License version 2, as published by the Free Software Foundation, and
-+** may be copied, distributed, and modified under those terms.
-+**
-+** This program is distributed in the hope that it will be useful,
-+** but WITHOUT ANY WARRANTY; without even the implied warranty of
-+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+** GNU General Public License for more details.
-+**
-+*/
-+
-+#include <asm/div64.h>
-+#include <asm/io.h>
-+#include <linux/module.h>
-+#include <linux/slab.h>
-+#include <linux/ioport.h>
-+#include <linux/vmalloc.h>
-+#include <linux/init.h>
-+#include <linux/mtd/compatmac.h>
-+#include <linux/mtd/mtd.h>
-+#include <linux/platform_device.h>
-+
-+#include "goldfish_nand_reg.h"
-+
-+struct goldfish_nand {
-+	spinlock_t              lock;
-+	unsigned char __iomem  *base;
-+	size_t                  mtd_count;
-+	struct mtd_info         mtd[0];
-+};
-+
-+static uint32_t goldfish_nand_cmd(struct mtd_info *mtd, enum nand_cmd cmd,
-+                              uint64_t addr, uint32_t len, void *ptr)
-+{
-+	struct goldfish_nand *nand = mtd->priv;
-+	uint32_t rv;
-+	unsigned long irq_flags;
-+	unsigned char __iomem  *base = nand->base;
-+
-+	spin_lock_irqsave(&nand->lock, irq_flags);
-+	writel(mtd - nand->mtd, base + NAND_DEV);
-+	writel((uint32_t)(addr >> 32), base + NAND_ADDR_HIGH);
-+	writel((uint32_t)addr, base + NAND_ADDR_LOW);
-+	writel(len, base + NAND_TRANSFER_SIZE);
-+	writel(ptr, base + NAND_DATA);
-+	writel(cmd, base + NAND_COMMAND);
-+	rv = readl(base + NAND_RESULT);
-+	spin_unlock_irqrestore(&nand->lock, irq_flags);
-+	return rv;
-+}
-+
-+static int goldfish_nand_erase(struct mtd_info *mtd, struct erase_info *instr)
-+{
-+	loff_t ofs = instr->addr;
-+	uint32_t len = instr->len;
-+	uint32_t rem;
-+
-+	if (ofs + len > mtd->size)
-+		goto invalid_arg;
-+	rem = do_div(ofs, mtd->writesize);
-+	if(rem)
-+		goto invalid_arg;
-+	ofs *= (mtd->writesize + mtd->oobsize);
-+	
-+	if(len % mtd->writesize)
-+		goto invalid_arg;
-+	len = len / mtd->writesize * (mtd->writesize + mtd->oobsize);
-+
-+	if(goldfish_nand_cmd(mtd, NAND_CMD_ERASE, ofs, len, NULL) != len) {
-+		printk("goldfish_nand_erase: erase failed, start %llx, len %x, dev_size "
-+		       "%llx, erase_size %x\n", ofs, len, mtd->size, mtd->erasesize);
-+		return -EIO;
-+	}
-+
-+	instr->state = MTD_ERASE_DONE;
-+	mtd_erase_callback(instr);
-+
-+	return 0;
-+
-+invalid_arg:
-+	printk("goldfish_nand_erase: invalid erase, start %llx, len %x, dev_size "
-+	       "%llx, erase_size %x\n", ofs, len, mtd->size, mtd->erasesize);
-+	return -EINVAL;
-+}
-+
-+static int goldfish_nand_read_oob(struct mtd_info *mtd, loff_t ofs,
-+                              struct mtd_oob_ops *ops)
-+{
-+	uint32_t rem;
-+
-+	if(ofs + ops->len > mtd->size)
-+		goto invalid_arg;
-+	if(ops->datbuf && ops->len && ops->len != mtd->writesize)
-+		goto invalid_arg;
-+	if(ops->ooblen + ops->ooboffs > mtd->oobsize)
-+		goto invalid_arg;
-+
-+	rem = do_div(ofs, mtd->writesize);
-+	if(rem)
-+		goto invalid_arg;
-+	ofs *= (mtd->writesize + mtd->oobsize);
-+
-+	if(ops->datbuf)
-+		ops->retlen = goldfish_nand_cmd(mtd, NAND_CMD_READ, ofs,
-+		                            ops->len, ops->datbuf);
-+	ofs += mtd->writesize + ops->ooboffs;
-+	if(ops->oobbuf)
-+		ops->oobretlen = goldfish_nand_cmd(mtd, NAND_CMD_READ, ofs,
-+		                               ops->ooblen, ops->oobbuf);
-+	return 0;
-+
-+invalid_arg:
-+	printk("goldfish_nand_read_oob: invalid read, start %llx, len %x, "
-+	       "ooblen %x, dev_size %llx, write_size %x\n",
-+	       ofs, ops->len, ops->ooblen, mtd->size, mtd->writesize);
-+	return -EINVAL;
-+}
-+
-+static int goldfish_nand_write_oob(struct mtd_info *mtd, loff_t ofs,
-+                               struct mtd_oob_ops *ops)
-+{
-+	uint32_t rem;
-+
-+	if(ofs + ops->len > mtd->size)
-+		goto invalid_arg;
-+	if(ops->len && ops->len != mtd->writesize)
-+		goto invalid_arg;
-+	if(ops->ooblen + ops->ooboffs > mtd->oobsize)
-+		goto invalid_arg;
-+	
-+	rem = do_div(ofs, mtd->writesize);
-+	if(rem)
-+		goto invalid_arg;
-+	ofs *= (mtd->writesize + mtd->oobsize);
-+
-+	if(ops->datbuf)
-+		ops->retlen = goldfish_nand_cmd(mtd, NAND_CMD_WRITE, ofs,
-+		                            ops->len, ops->datbuf);
-+	ofs += mtd->writesize + ops->ooboffs;
-+	if(ops->oobbuf)
-+		ops->oobretlen = goldfish_nand_cmd(mtd, NAND_CMD_WRITE, ofs,
-+		                               ops->ooblen, ops->oobbuf);
-+	return 0;
-+
-+invalid_arg:
-+	printk("goldfish_nand_write_oob: invalid write, start %llx, len %x, "
-+	       "ooblen %x, dev_size %llx, write_size %x\n",
-+	       ofs, ops->len, ops->ooblen, mtd->size, mtd->writesize);
-+	return -EINVAL;
-+}
-+
-+static int goldfish_nand_read(struct mtd_info *mtd, loff_t from, size_t len,
-+                          size_t *retlen, u_char *buf)
-+{
-+	uint32_t rem;
-+
-+	if(from + len > mtd->size)
-+		goto invalid_arg;
-+	if(len != mtd->writesize)
-+		goto invalid_arg;
-+
-+	rem = do_div(from, mtd->writesize);
-+	if(rem)
-+		goto invalid_arg;
-+	from *= (mtd->writesize + mtd->oobsize);
-+
-+	*retlen = goldfish_nand_cmd(mtd, NAND_CMD_READ, from, len, buf);
-+	return 0;
-+
-+invalid_arg:
-+	printk("goldfish_nand_read: invalid read, start %llx, len %x, dev_size %llx"
-+	       ", write_size %x\n", from, len, mtd->size, mtd->writesize);
-+	return -EINVAL;
-+}
-+
-+static int goldfish_nand_write(struct mtd_info *mtd, loff_t to, size_t len,
-+                           size_t *retlen, const u_char *buf)
-+{
-+	uint32_t rem;
-+
-+	if(to + len > mtd->size)
-+		goto invalid_arg;
-+	if(len != mtd->writesize)
-+		goto invalid_arg;
-+
-+	rem = do_div(to, mtd->writesize);
-+	if(rem)
-+		goto invalid_arg;
-+	to *= (mtd->writesize + mtd->oobsize);
-+
-+	*retlen = goldfish_nand_cmd(mtd, NAND_CMD_WRITE, to, len, (void *)buf);
-+	return 0;
-+
-+invalid_arg:
-+	printk("goldfish_nand_write: invalid write, start %llx, len %x, dev_size %llx"
-+	       ", write_size %x\n", to, len, mtd->size, mtd->writesize);
-+	return -EINVAL;
-+}
-+
-+static int goldfish_nand_block_isbad(struct mtd_info *mtd, loff_t ofs)
-+{
-+	uint32_t rem;
-+
-+	if(ofs >= mtd->size)
-+		goto invalid_arg;
-+
-+	rem = do_div(ofs, mtd->erasesize);
-+	if(rem)
-+		goto invalid_arg;
-+	ofs *= mtd->erasesize / mtd->writesize;
-+	ofs *= (mtd->writesize + mtd->oobsize);
-+
-+	return goldfish_nand_cmd(mtd, NAND_CMD_BLOCK_BAD_GET, ofs, 0, NULL);
-+
-+invalid_arg:
-+	printk("goldfish_nand_block_isbad: invalid arg, ofs %llx, dev_size %llx, "
-+	       "write_size %x\n", ofs, mtd->size, mtd->writesize);
-+	return -EINVAL;
-+}
-+
-+static int goldfish_nand_block_markbad(struct mtd_info *mtd, loff_t ofs)
-+{
-+	uint32_t rem;
-+
-+	if(ofs >= mtd->size)
-+		goto invalid_arg;
-+
-+	rem = do_div(ofs, mtd->erasesize);
-+	if(rem)
-+		goto invalid_arg;
-+	ofs *= mtd->erasesize / mtd->writesize;
-+	ofs *= (mtd->writesize + mtd->oobsize);
-+
-+	if(goldfish_nand_cmd(mtd, NAND_CMD_BLOCK_BAD_SET, ofs, 0, NULL) != 1)
-+		return -EIO;
-+	return 0;
-+
-+invalid_arg:
-+	printk("goldfish_nand_block_markbad: invalid arg, ofs %llx, dev_size %llx, "
-+	       "write_size %x\n", ofs, mtd->size, mtd->writesize);
-+	return -EINVAL;
-+}
-+
-+static int goldfish_nand_init_device(struct goldfish_nand *nand, int id)
-+{
-+	uint32_t name_len;
-+	uint32_t result;
-+	uint32_t flags;
-+	unsigned long irq_flags;
-+	unsigned char __iomem  *base = nand->base;
-+	struct mtd_info *mtd = &nand->mtd[id];
-+	char *name;
-+
-+	spin_lock_irqsave(&nand->lock, irq_flags);
-+	writel(id, base + NAND_DEV);
-+	flags = readl(base + NAND_DEV_FLAGS);
-+	name_len = readl(base + NAND_DEV_NAME_LEN);
-+	mtd->writesize = readl(base + NAND_DEV_PAGE_SIZE);
-+	mtd->size = readl(base + NAND_DEV_SIZE_LOW);
-+	mtd->size |= (uint64_t)readl(base + NAND_DEV_SIZE_HIGH) << 32;
-+	mtd->oobsize = readl(base + NAND_DEV_EXTRA_SIZE);
-+	mtd->oobavail = mtd->oobsize;
-+	mtd->erasesize = readl(base + NAND_DEV_ERASE_SIZE) /
-+	                 (mtd->writesize + mtd->oobsize) * mtd->writesize;
-+	do_div(mtd->size, mtd->writesize + mtd->oobsize);
-+	mtd->size *= mtd->writesize;
-+	printk("goldfish nand dev%d: size %llx, page %d, extra %d, erase %d\n",
-+	       id, mtd->size, mtd->writesize, mtd->oobsize, mtd->erasesize);
-+	spin_unlock_irqrestore(&nand->lock, irq_flags);
-+
-+	mtd->priv = nand;
-+
-+	mtd->name = name = kmalloc(name_len + 1, GFP_KERNEL);
-+	if(name == NULL)
-+		return -ENOMEM;
-+
-+	result = goldfish_nand_cmd(mtd, NAND_CMD_GET_DEV_NAME, 0, name_len, name);
-+	if(result != name_len) {
-+		kfree(mtd->name);
-+		mtd->name = NULL;
-+		printk("goldfish_nand_init_device failed to get dev name %d != %d\n",
-+		       result, name_len);
-+		return -ENODEV;
-+	}
-+	((char *) mtd->name)[name_len] = '\0';
-+
-+	/* Setup the MTD structure */
-+	mtd->type = MTD_NANDFLASH;
-+	mtd->flags = MTD_CAP_NANDFLASH;
-+	if(flags & NAND_DEV_FLAG_READ_ONLY)
-+		mtd->flags &= ~MTD_WRITEABLE;
-+
-+	mtd->owner = THIS_MODULE;
-+	mtd->erase = goldfish_nand_erase;
-+	mtd->read = goldfish_nand_read;
-+	mtd->write = goldfish_nand_write;
-+	mtd->read_oob = goldfish_nand_read_oob;
-+	mtd->write_oob = goldfish_nand_write_oob;
-+	mtd->block_isbad = goldfish_nand_block_isbad;
-+	mtd->block_markbad = goldfish_nand_block_markbad;
-+
-+	if (add_mtd_device(mtd)) {
-+		kfree(mtd->name);
-+		mtd->name = NULL;
-+		return -EIO;
-+	}
-+
-+	return 0;
-+}
-+
-+static int goldfish_nand_probe(struct platform_device *pdev)
-+{
-+	uint32_t num_dev;
-+	int i;
-+	int err;
-+	uint32_t num_dev_working;
-+	uint32_t version;
-+	struct resource *r;
-+	struct goldfish_nand *nand;
-+	unsigned char __iomem  *base;
-+
-+	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if(r == NULL) {
-+		err = -ENODEV;
-+		goto err_no_io_base;
-+	}
-+
-+	base = ioremap(r->start, PAGE_SIZE);
-+	if(base == NULL) {
-+		err = -ENOMEM;
-+		goto err_ioremap;
-+	}
-+	version = readl(base + NAND_VERSION);
-+	if(version != NAND_VERSION_CURRENT) {
-+		printk("goldfish_nand_init: version mismatch, got %d, expected %d\n",
-+		       version, NAND_VERSION_CURRENT);
-+		err = -ENODEV;
-+		goto err_no_dev;
-+	}
-+	num_dev = readl(base + NAND_NUM_DEV);
-+	if(num_dev == 0) {
-+		err = -ENODEV;
-+		goto err_no_dev;
-+	}
-+
-+	nand = kzalloc(sizeof(*nand) + sizeof(struct mtd_info) * num_dev, GFP_KERNEL);
-+	if(nand == NULL) {
-+		err = -ENOMEM;
-+		goto err_nand_alloc_failed;
-+	}
-+	spin_lock_init(&nand->lock);
-+	nand->base = base;
-+	nand->mtd_count = num_dev;
-+	platform_set_drvdata(pdev, nand);
-+
-+	num_dev_working = 0;
-+	for(i = 0; i < num_dev; i++) {
-+		err = goldfish_nand_init_device(nand, i);
-+		if(err == 0)
-+			num_dev_working++;
-+	}
-+	if(num_dev_working == 0) {
-+		err = -ENODEV;
-+		goto err_no_working_dev;
-+	}
-+	return 0;
-+
-+err_no_working_dev:
-+	kfree(nand);
-+err_nand_alloc_failed:
-+err_no_dev:
-+	iounmap(base);
-+err_ioremap:
-+err_no_io_base:
-+	return err;
-+}
-+
-+static int goldfish_nand_remove(struct platform_device *pdev)
-+{
-+	struct goldfish_nand *nand = platform_get_drvdata(pdev);
-+	int i;
-+	for(i = 0; i < nand->mtd_count; i++) {
-+		if(nand->mtd[i].name) {
-+			del_mtd_device(&nand->mtd[i]);
-+			kfree(nand->mtd[i].name);
-+		}
-+	}
-+	iounmap(nand->base);
-+	kfree(nand);
-+	return 0;
-+}
-+
-+static struct platform_driver goldfish_nand_driver = {
-+	.probe		= goldfish_nand_probe,
-+	.remove		= goldfish_nand_remove,
-+	.driver = {
-+		.name = "goldfish_nand"
-+	}
-+};
-+
-+static int __init goldfish_nand_init(void)
-+{
-+	return platform_driver_register(&goldfish_nand_driver);
-+}
-+
-+static void __exit goldfish_nand_exit(void)
-+{
-+	platform_driver_unregister(&goldfish_nand_driver);
-+}
-+
-+
-+module_init(goldfish_nand_init);
-+module_exit(goldfish_nand_exit);
-+
---- /dev/null
-+++ b/drivers/mtd/devices/goldfish_nand_reg.h
-@@ -0,0 +1,58 @@
-+/* drivers/mtd/devices/goldfish_nand_reg.h
-+**
-+** Copyright (C) 2007 Google, Inc.
-+**
-+** This software is licensed under the terms of the GNU General Public
-+** License version 2, as published by the Free Software Foundation, and
-+** may be copied, distributed, and modified under those terms.
-+**
-+** This program is distributed in the hope that it will be useful,
-+** but WITHOUT ANY WARRANTY; without even the implied warranty of
-+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+** GNU General Public License for more details.
-+**
-+*/
-+
-+#ifndef GOLDFISH_NAND_REG_H
-+#define GOLDFISH_NAND_REG_H
-+
-+enum nand_cmd {
-+	NAND_CMD_GET_DEV_NAME,  // Write device name for NAND_DEV to NAND_DATA (vaddr)
-+	NAND_CMD_READ,
-+	NAND_CMD_WRITE,
-+	NAND_CMD_ERASE,
-+	NAND_CMD_BLOCK_BAD_GET, // NAND_RESULT is 1 if block is bad, 0 if it is not
-+	NAND_CMD_BLOCK_BAD_SET
-+};
-+
-+enum nand_dev_flags {
-+	NAND_DEV_FLAG_READ_ONLY = 0x00000001
-+};
-+
-+#define NAND_VERSION_CURRENT (1)
-+
-+enum nand_reg {
-+	// Global
-+	NAND_VERSION        = 0x000,
-+	NAND_NUM_DEV        = 0x004,
-+	NAND_DEV            = 0x008,
-+
-+	// Dev info
-+	NAND_DEV_FLAGS      = 0x010,
-+	NAND_DEV_NAME_LEN   = 0x014,
-+	NAND_DEV_PAGE_SIZE  = 0x018,
-+	NAND_DEV_EXTRA_SIZE = 0x01c,
-+	NAND_DEV_ERASE_SIZE = 0x020,
-+	NAND_DEV_SIZE_LOW   = 0x028,
-+	NAND_DEV_SIZE_HIGH  = 0x02c,
-+
-+	// Command
-+	NAND_RESULT         = 0x040,
-+	NAND_COMMAND        = 0x044,
-+	NAND_DATA           = 0x048,
-+	NAND_TRANSFER_SIZE  = 0x04c,
-+	NAND_ADDR_LOW       = 0x050,
-+	NAND_ADDR_HIGH      = 0x054,
-+};
-+
-+#endif
diff --git a/target/linux/goldfish/patches-2.6.30/0126--ARM-goldfish-POWER-New-power-supply-driver-for-g.patch b/target/linux/goldfish/patches-2.6.30/0126--ARM-goldfish-POWER-New-power-supply-driver-for-g.patch
deleted file mode 100644
index b5df72c40..000000000
--- a/target/linux/goldfish/patches-2.6.30/0126--ARM-goldfish-POWER-New-power-supply-driver-for-g.patch
+++ /dev/null
@@ -1,298 +0,0 @@
-From 7041346d379e563e9ee66f9dd31277e4fb6b1b1f Mon Sep 17 00:00:00 2001
-From: Mike Lockwood <lockwood@android.com>
-Date: Wed, 6 Feb 2008 11:37:10 -0500
-Subject: [PATCH 126/134] [ARM] goldfish: POWER: New power supply driver for goldfish.
-
-Signed-off-by: Mike A. Chan <mikechan@google.com>
----
- drivers/power/Kconfig            |    5 +
- drivers/power/Makefile           |    3 +-
- drivers/power/goldfish_battery.c |  254 ++++++++++++++++++++++++++++++++++++++
- 3 files changed, 261 insertions(+), 1 deletions(-)
- create mode 100644 drivers/power/goldfish_battery.c
-
---- a/drivers/power/Kconfig
-+++ b/drivers/power/Kconfig
-@@ -88,4 +88,9 @@ config CHARGER_PCF50633
- 	help
- 	 Say Y to include support for NXP PCF50633 Main Battery Charger.
- 
-+config BATTERY_GOLDFISH
-+	tristate "Goldfish battery driver"
-+	help
-+	  Say Y to enable support for the battery and AC power in the Goldfish emulator.
-+
- endif # POWER_SUPPLY
---- a/drivers/power/Makefile
-+++ b/drivers/power/Makefile
-@@ -19,10 +19,11 @@ obj-$(CONFIG_APM_POWER)		+= apm_power.o
- obj-$(CONFIG_WM8350_POWER)	+= wm8350_power.o
- 
- obj-$(CONFIG_BATTERY_DS2760)	+= ds2760_battery.o
-+obj-$(CONFIG_BATTERY_GOLDFISH)	+= goldfish_battery.o
- obj-$(CONFIG_BATTERY_PMU)	+= pmu_battery.o
- obj-$(CONFIG_BATTERY_OLPC)	+= olpc_battery.o
- obj-$(CONFIG_BATTERY_TOSA)	+= tosa_battery.o
- obj-$(CONFIG_BATTERY_WM97XX)	+= wm97xx_battery.o
- obj-$(CONFIG_BATTERY_BQ27x00)	+= bq27x00_battery.o
- obj-$(CONFIG_BATTERY_DA9030)	+= da9030_battery.o
--obj-$(CONFIG_CHARGER_PCF50633)	+= pcf50633-charger.o
-\ No newline at end of file
-+obj-$(CONFIG_CHARGER_PCF50633)	+= pcf50633-charger.o
---- /dev/null
-+++ b/drivers/power/goldfish_battery.c
-@@ -0,0 +1,254 @@
-+/* drivers/power/goldfish_battery.c
-+ *
-+ * Power supply driver for the goldfish emulator
-+ *
-+ * Copyright (C) 2008 Google, Inc.
-+ * Author: Mike Lockwood <lockwood@android.com>
-+ *
-+ * This software is licensed under the terms of the GNU General Public
-+ * License version 2, as published by the Free Software Foundation, and
-+ * may be copied, distributed, and modified under those terms.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/err.h>
-+#include <linux/platform_device.h>
-+#include <linux/power_supply.h>
-+#include <linux/types.h>
-+#include <linux/pci.h>
-+#include <linux/interrupt.h>
-+#include <asm/io.h>
-+
-+
-+struct goldfish_battery_data {
-+	uint32_t reg_base;
-+	int irq;
-+	spinlock_t lock;
-+
-+	struct power_supply battery;
-+	struct power_supply ac;
-+};
-+
-+#define GOLDFISH_BATTERY_READ(data, addr)   (readl(data->reg_base + addr))
-+#define GOLDFISH_BATTERY_WRITE(data, addr, x)   (writel(x, data->reg_base + addr))
-+
-+
-+/* temporary variable used between goldfish_battery_probe() and goldfish_battery_open() */
-+static struct goldfish_battery_data *battery_data;
-+
-+enum {
-+	/* status register */
-+	BATTERY_INT_STATUS	    = 0x00,
-+	/* set this to enable IRQ */
-+	BATTERY_INT_ENABLE	    = 0x04,
-+
-+	BATTERY_AC_ONLINE       = 0x08,
-+	BATTERY_STATUS          = 0x0C,
-+	BATTERY_HEALTH          = 0x10,
-+	BATTERY_PRESENT         = 0x14,
-+	BATTERY_CAPACITY        = 0x18,
-+
-+	BATTERY_STATUS_CHANGED	= 1U << 0,
-+	AC_STATUS_CHANGED   	= 1U << 1,
-+	BATTERY_INT_MASK        = BATTERY_STATUS_CHANGED | AC_STATUS_CHANGED,
-+};
-+
-+
-+static int goldfish_ac_get_property(struct power_supply *psy,
-+			enum power_supply_property psp,
-+			union power_supply_propval *val)
-+{
-+	struct goldfish_battery_data *data = container_of(psy,
-+		struct goldfish_battery_data, ac);
-+	int ret = 0;
-+
-+	switch (psp) {
-+	case POWER_SUPPLY_PROP_ONLINE:
-+		val->intval = GOLDFISH_BATTERY_READ(data, BATTERY_AC_ONLINE);
-+		break;
-+	default:
-+		ret = -EINVAL;
-+		break;
-+	}
-+	return ret;
-+}
-+
-+static int goldfish_battery_get_property(struct power_supply *psy,
-+				 enum power_supply_property psp,
-+				 union power_supply_propval *val)
-+{
-+	struct goldfish_battery_data *data = container_of(psy,
-+		struct goldfish_battery_data, battery);
-+	int ret = 0;
-+
-+	switch (psp) {
-+	case POWER_SUPPLY_PROP_STATUS:
-+		val->intval = GOLDFISH_BATTERY_READ(data, BATTERY_STATUS);
-+		break;
-+	case POWER_SUPPLY_PROP_HEALTH:
-+		val->intval = GOLDFISH_BATTERY_READ(data, BATTERY_HEALTH);
-+		break;
-+	case POWER_SUPPLY_PROP_PRESENT:
-+		val->intval = GOLDFISH_BATTERY_READ(data, BATTERY_PRESENT);
-+		break;
-+	case POWER_SUPPLY_PROP_TECHNOLOGY:
-+		val->intval = POWER_SUPPLY_TECHNOLOGY_LION;
-+		break;
-+	case POWER_SUPPLY_PROP_CAPACITY:
-+		val->intval = GOLDFISH_BATTERY_READ(data, BATTERY_CAPACITY);
-+		break;
-+	default:
-+		ret = -EINVAL;
-+		break;
-+	}
-+
-+	return ret;
-+}
-+
-+static enum power_supply_property goldfish_battery_props[] = {
-+	POWER_SUPPLY_PROP_STATUS,
-+	POWER_SUPPLY_PROP_HEALTH,
-+	POWER_SUPPLY_PROP_PRESENT,
-+	POWER_SUPPLY_PROP_TECHNOLOGY,
-+	POWER_SUPPLY_PROP_CAPACITY,
-+};
-+
-+static enum power_supply_property goldfish_ac_props[] = {
-+	POWER_SUPPLY_PROP_ONLINE,
-+};
-+
-+static irqreturn_t goldfish_battery_interrupt(int irq, void *dev_id)
-+{
-+	unsigned long irq_flags;
-+	struct goldfish_battery_data *data = dev_id;
-+	uint32_t status;
-+
-+	spin_lock_irqsave(&data->lock, irq_flags);
-+
-+	/* read status flags, which will clear the interrupt */
-+	status = GOLDFISH_BATTERY_READ(data, BATTERY_INT_STATUS);
-+	status &= BATTERY_INT_MASK;
-+
-+	if (status & BATTERY_STATUS_CHANGED)
-+		power_supply_changed(&data->battery);
-+	if (status & AC_STATUS_CHANGED)
-+		power_supply_changed(&data->ac);
-+
-+	spin_unlock_irqrestore(&data->lock, irq_flags);
-+	return status ? IRQ_HANDLED : IRQ_NONE;
-+}
-+
-+
-+static int goldfish_battery_probe(struct platform_device *pdev)
-+{
-+	int ret;
-+	struct resource *r;
-+	struct goldfish_battery_data *data;
-+
-+	data = kzalloc(sizeof(*data), GFP_KERNEL);
-+	if (data == NULL) {
-+		ret = -ENOMEM;
-+		goto err_data_alloc_failed;
-+	}
-+	spin_lock_init(&data->lock);
-+
-+	data->battery.properties = goldfish_battery_props;
-+	data->battery.num_properties = ARRAY_SIZE(goldfish_battery_props);
-+	data->battery.get_property = goldfish_battery_get_property;
-+	data->battery.name = "battery";
-+	data->battery.type = POWER_SUPPLY_TYPE_BATTERY;
-+
-+	data->ac.properties = goldfish_ac_props;
-+	data->ac.num_properties = ARRAY_SIZE(goldfish_ac_props);
-+	data->ac.get_property = goldfish_ac_get_property;
-+	data->ac.name = "ac";
-+	data->ac.type = POWER_SUPPLY_TYPE_MAINS;
-+
-+	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if (r == NULL) {
-+		printk(KERN_ERR "%s: platform_get_resource failed\n", pdev->name);
-+		ret = -ENODEV;
-+		goto err_no_io_base;
-+	}
-+	data->reg_base = IO_ADDRESS(r->start - IO_START);
-+
-+	data->irq = platform_get_irq(pdev, 0);
-+	if (data->irq < 0) {
-+		printk(KERN_ERR "%s: platform_get_irq failed\n", pdev->name);
-+		ret = -ENODEV;
-+		goto err_no_irq;
-+	}
-+
-+	ret = request_irq(data->irq, goldfish_battery_interrupt, IRQF_SHARED, pdev->name, data);
-+	if (ret)
-+		goto err_request_irq_failed;
-+
-+	ret = power_supply_register(&pdev->dev, &data->ac);
-+	if (ret)
-+		goto err_ac_failed;
-+
-+	ret = power_supply_register(&pdev->dev, &data->battery);
-+	if (ret)
-+		goto err_battery_failed;
-+
-+	platform_set_drvdata(pdev, data);
-+	battery_data = data;
-+
-+	GOLDFISH_BATTERY_WRITE(data, BATTERY_INT_ENABLE, BATTERY_INT_MASK);
-+	return 0;
-+
-+err_battery_failed:
-+	power_supply_unregister(&data->ac);
-+err_ac_failed:
-+	free_irq(data->irq, data);
-+err_request_irq_failed:
-+err_no_irq:
-+err_no_io_base:
-+	kfree(data);
-+err_data_alloc_failed:
-+	return ret;
-+}
-+
-+static int goldfish_battery_remove(struct platform_device *pdev)
-+{
-+	struct goldfish_battery_data *data = platform_get_drvdata(pdev);
-+
-+	power_supply_unregister(&data->battery);
-+	power_supply_unregister(&data->ac);
-+
-+	free_irq(data->irq, data);
-+	kfree(data);
-+	battery_data = NULL;
-+	return 0;
-+}
-+
-+static struct platform_driver goldfish_battery_device = {
-+	.probe		= goldfish_battery_probe,
-+	.remove		= goldfish_battery_remove,
-+	.driver = {
-+		.name = "goldfish-battery"
-+	}
-+};
-+
-+static int __init goldfish_battery_init(void)
-+{
-+	return platform_driver_register(&goldfish_battery_device);
-+}
-+
-+static void __exit goldfish_battery_exit(void)
-+{
-+	platform_driver_unregister(&goldfish_battery_device);
-+}
-+
-+module_init(goldfish_battery_init);
-+module_exit(goldfish_battery_exit);
-+
-+MODULE_AUTHOR("Mike Lockwood lockwood@android.com");
-+MODULE_LICENSE("GPL");
-+MODULE_DESCRIPTION("Battery driver for the Goldfish emulator");
diff --git a/target/linux/goldfish/patches-2.6.30/0127--ARM-goldfish-RTC-Add-RTC-driver-for-goldfish.patch b/target/linux/goldfish/patches-2.6.30/0127--ARM-goldfish-RTC-Add-RTC-driver-for-goldfish.patch
deleted file mode 100644
index bb0c29da2..000000000
--- a/target/linux/goldfish/patches-2.6.30/0127--ARM-goldfish-RTC-Add-RTC-driver-for-goldfish.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-From fce981438497199217ed19f14c4d0f1a1aa309f3 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@google.com>
-Date: Fri, 29 Jun 2007 21:46:31 -0700
-Subject: [PATCH 127/134] [ARM] goldfish: RTC: Add RTC driver for goldfish.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-Gets the current time from the host.
-Alarms are not supported yet.
-
-Signed-off-by: Mike A. Chan <mikechan@google.com>
-Signed-off-by: Arve Hjønnevåg <arve@android.com>
----
- drivers/rtc/Kconfig        |    6 ++
- drivers/rtc/Makefile       |    1 +
- drivers/rtc/rtc-goldfish.c |  138 ++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 145 insertions(+), 0 deletions(-)
- create mode 100644 drivers/rtc/rtc-goldfish.c
-
---- a/drivers/rtc/Kconfig
-+++ b/drivers/rtc/Kconfig
-@@ -691,6 +691,12 @@ config RTC_DRV_BFIN
- 	  This driver can also be built as a module. If so, the module
- 	  will be called rtc-bfin.
- 
-+config RTC_DRV_GOLDFISH
-+	tristate "GOLDFISH"
-+	depends on ARCH_GOLDFISH
-+	help
-+	  RTC driver for Goldfish Virtual Platform
-+
- config RTC_DRV_RS5C313
- 	tristate "Ricoh RS5C313"
- 	depends on SH_LANDISK
---- a/drivers/rtc/Makefile
-+++ b/drivers/rtc/Makefile
-@@ -39,6 +39,7 @@ obj-$(CONFIG_RTC_DRV_DS3234)	+= rtc-ds32
- obj-$(CONFIG_RTC_DRV_EFI)	+= rtc-efi.o
- obj-$(CONFIG_RTC_DRV_EP93XX)	+= rtc-ep93xx.o
- obj-$(CONFIG_RTC_DRV_FM3130)	+= rtc-fm3130.o
-+obj-$(CONFIG_RTC_DRV_GOLDFISH)	+= rtc-goldfish.o
- obj-$(CONFIG_RTC_DRV_ISL1208)	+= rtc-isl1208.o
- obj-$(CONFIG_RTC_DRV_M41T80)	+= rtc-m41t80.o
- obj-$(CONFIG_RTC_DRV_M41T94)	+= rtc-m41t94.o
---- /dev/null
-+++ b/drivers/rtc/rtc-goldfish.c
-@@ -0,0 +1,138 @@
-+/* drivers/rtc/rtc-goldfish.c
-+**
-+** Copyright (C) 2007 Google, Inc.
-+**
-+** This software is licensed under the terms of the GNU General Public
-+** License version 2, as published by the Free Software Foundation, and
-+** may be copied, distributed, and modified under those terms.
-+**
-+** This program is distributed in the hope that it will be useful,
-+** but WITHOUT ANY WARRANTY; without even the implied warranty of
-+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+** GNU General Public License for more details.
-+**
-+*/
-+
-+#include <linux/interrupt.h>
-+#include <linux/irq.h>
-+#include <linux/platform_device.h>
-+#include <linux/rtc.h>
-+
-+#include <mach/timer.h>
-+#include <mach/hardware.h>
-+#include <asm/io.h>
-+
-+struct goldfish_rtc {
-+	uint32_t base;
-+	uint32_t irq;
-+	struct rtc_device *rtc;
-+};
-+
-+static irqreturn_t
-+goldfish_rtc_interrupt(int irq, void *dev_id)
-+{
-+	struct goldfish_rtc	*qrtc = dev_id;
-+	unsigned long		events = 0;
-+
-+	writel(1, qrtc->base + TIMER_CLEAR_INTERRUPT);
-+	events = RTC_IRQF | RTC_AF;
-+
-+	rtc_update_irq(qrtc->rtc, 1, events);
-+
-+	return IRQ_HANDLED;
-+}
-+
-+static int goldfish_rtc_read_time(struct device *dev, struct rtc_time *tm)
-+{
-+	int64_t time;
-+	struct goldfish_rtc	*qrtc = platform_get_drvdata(to_platform_device(dev));
-+
-+	time = readl(qrtc->base + TIMER_TIME_LOW);
-+	time |= (int64_t)readl(qrtc->base + TIMER_TIME_HIGH) << 32;
-+	do_div(time, NSEC_PER_SEC);
-+
-+	rtc_time_to_tm(time, tm);
-+	return 0;
-+}
-+
-+static struct rtc_class_ops goldfish_rtc_ops = {
-+//	.ioctl		= goldfish_rtc_ioctl,
-+	.read_time	= goldfish_rtc_read_time,
-+//	.set_time	= goldfish_rtc_set_time,
-+//	.read_alarm	= goldfish_rtc_read_alarm,
-+//	.set_alarm	= goldfish_rtc_set_alarm,
-+};
-+
-+
-+static int goldfish_rtc_probe(struct platform_device *pdev)
-+{
-+	int ret;
-+	struct resource *r;
-+	struct goldfish_rtc *qrtc;
-+
-+	qrtc = kzalloc(sizeof(*qrtc), GFP_KERNEL);
-+	if(qrtc == NULL) {
-+		ret = -ENOMEM;
-+		goto err_qrtc_alloc_failed;
-+	}
-+	platform_set_drvdata(pdev, qrtc);
-+
-+	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if(r == NULL) {
-+		ret = -ENODEV;
-+		goto err_no_io_base;
-+	}
-+	qrtc->base = IO_ADDRESS(r->start - IO_START);
-+	qrtc->irq = platform_get_irq(pdev, 0);
-+	if(qrtc->irq < 0) {
-+		ret = -ENODEV;
-+		goto err_no_irq;
-+	}
-+	qrtc->rtc = rtc_device_register(pdev->name, &pdev->dev,
-+	                                &goldfish_rtc_ops, THIS_MODULE);
-+	if (IS_ERR(qrtc->rtc)) {
-+		ret = PTR_ERR(qrtc->rtc);
-+		goto err_rtc_device_register_failed;
-+	}
-+
-+	ret = request_irq(qrtc->irq, goldfish_rtc_interrupt, 0, pdev->name, qrtc);
-+	if(ret)
-+		goto request_irq;
-+
-+	return 0;
-+
-+	free_irq(qrtc->irq, qrtc);
-+request_irq:
-+	rtc_device_unregister(qrtc->rtc);
-+err_rtc_device_register_failed:
-+err_no_irq:
-+err_no_io_base:
-+	kfree(qrtc);
-+err_qrtc_alloc_failed:
-+	return ret;
-+}
-+
-+static int goldfish_rtc_remove(struct platform_device *pdev)
-+{
-+	struct goldfish_rtc	*qrtc = platform_get_drvdata(pdev);
-+	free_irq(qrtc->irq, qrtc);
-+	rtc_device_unregister(qrtc->rtc);
-+	kfree(qrtc);
-+	return 0;
-+}
-+
-+static struct platform_driver goldfish_timer = {
-+	.probe = goldfish_rtc_probe,
-+	.remove = goldfish_rtc_remove,
-+	.driver = {
-+		.name = "goldfish_rtc"
-+	}
-+};
-+
-+static int __init goldfish_rtc_init(void)
-+{
-+	return platform_driver_register(&goldfish_timer);
-+}
-+
-+module_init(goldfish_rtc_init);
-+
diff --git a/target/linux/goldfish/patches-2.6.30/0128--ARM-goldfish-fb-Add-fb-driver-for-goldfish.patch b/target/linux/goldfish/patches-2.6.30/0128--ARM-goldfish-fb-Add-fb-driver-for-goldfish.patch
deleted file mode 100644
index 48e69daae..000000000
--- a/target/linux/goldfish/patches-2.6.30/0128--ARM-goldfish-fb-Add-fb-driver-for-goldfish.patch
+++ /dev/null
@@ -1,384 +0,0 @@
-From f8101c780fdc050eda9f93c94f8841de9f384b4f Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@google.com>
-Date: Fri, 29 Jun 2007 22:14:27 -0700
-Subject: [PATCH 128/134] [ARM] goldfish: fb: Add fb driver for goldfish.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-Supports panning for double buffering.
-
-Signed-off-by: Mike A. Chan <mikechan@google.com>
-Signed-off-by: Arve Hjønnevåg <arve@android.com>
----
- drivers/video/Kconfig      |    9 ++
- drivers/video/Makefile     |    1 +
- drivers/video/goldfishfb.c |  334 ++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 344 insertions(+), 0 deletions(-)
- create mode 100644 drivers/video/goldfishfb.c
-
---- a/drivers/video/Kconfig
-+++ b/drivers/video/Kconfig
-@@ -2005,6 +2005,15 @@ config FB_XILINX
- 	  framebuffer. ML300 carries a 640*480 LCD display on the board,
- 	  ML403 uses a standard DB15 VGA connector.
- 
-+config FB_GOLDFISH
-+	tristate "Goldfish Framebuffer"
-+	depends on FB
-+	select FB_CFB_FILLRECT
-+	select FB_CFB_COPYAREA
-+	select FB_CFB_IMAGEBLIT
-+	---help---
-+	  Framebuffer driver for Goldfish Virtual Platform
-+
- config FB_COBALT
- 	tristate "Cobalt server LCD frame buffer support"
- 	depends on FB && MIPS_COBALT
---- a/drivers/video/Makefile
-+++ b/drivers/video/Makefile
-@@ -92,6 +92,7 @@ obj-$(CONFIG_FB_ATMEL)		  += atmel_lcdfb
- obj-$(CONFIG_FB_PVR2)             += pvr2fb.o
- obj-$(CONFIG_FB_VOODOO1)          += sstfb.o
- obj-$(CONFIG_FB_ARMCLCD)	  += amba-clcd.o
-+obj-$(CONFIG_FB_GOLDFISH)         += goldfishfb.o
- obj-$(CONFIG_FB_68328)            += 68328fb.o
- obj-$(CONFIG_FB_GBE)              += gbefb.o
- obj-$(CONFIG_FB_CIRRUS)		  += cirrusfb.o
---- /dev/null
-+++ b/drivers/video/goldfishfb.c
-@@ -0,0 +1,334 @@
-+/* drivers/video/goldfishfb.c
-+**
-+** Copyright (C) 2007 Google, Inc.
-+**
-+** This software is licensed under the terms of the GNU General Public
-+** License version 2, as published by the Free Software Foundation, and
-+** may be copied, distributed, and modified under those terms.
-+**
-+** This program is distributed in the hope that it will be useful,
-+** but WITHOUT ANY WARRANTY; without even the implied warranty of
-+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+** GNU General Public License for more details.
-+**
-+*/
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/errno.h>
-+#include <linux/string.h>
-+#include <linux/slab.h>
-+#include <linux/delay.h>
-+#include <linux/mm.h>
-+#include <linux/fb.h>
-+#include <linux/init.h>
-+#include <linux/interrupt.h>
-+#include <linux/ioport.h>
-+#include <linux/platform_device.h>
-+#ifdef CONFIG_ANDROID_POWER
-+#include <linux/android_power.h>
-+#endif
-+
-+#include <mach/hardware.h>
-+
-+enum {
-+	FB_GET_WIDTH        = 0x00,
-+	FB_GET_HEIGHT       = 0x04,
-+	FB_INT_STATUS       = 0x08,
-+	FB_INT_ENABLE       = 0x0c,
-+	FB_SET_BASE         = 0x10,
-+	FB_SET_ROTATION     = 0x14,
-+	FB_SET_BLANK        = 0x18,
-+	FB_GET_PHYS_WIDTH   = 0x1c,
-+	FB_GET_PHYS_HEIGHT  = 0x20,
-+
-+	FB_INT_VSYNC             = 1U << 0,
-+	FB_INT_BASE_UPDATE_DONE  = 1U << 1
-+};
-+
-+struct goldfish_fb {
-+	uint32_t reg_base;
-+	int irq;
-+	spinlock_t lock;
-+	wait_queue_head_t wait;
-+	int base_update_count;
-+	int rotation;
-+	struct fb_info fb;
-+	u32			cmap[16];
-+#ifdef CONFIG_ANDROID_POWER
-+        android_early_suspend_t early_suspend;
-+#endif
-+};
-+
-+static irqreturn_t
-+goldfish_fb_interrupt(int irq, void *dev_id)
-+{
-+	unsigned long irq_flags;
-+	struct goldfish_fb	*fb = dev_id;
-+	uint32_t status;
-+
-+	spin_lock_irqsave(&fb->lock, irq_flags);
-+	status = readl(fb->reg_base + FB_INT_STATUS);
-+	if(status & FB_INT_BASE_UPDATE_DONE) {
-+		fb->base_update_count++;
-+		wake_up(&fb->wait);
-+	}
-+	spin_unlock_irqrestore(&fb->lock, irq_flags);
-+	return status ? IRQ_HANDLED : IRQ_NONE;
-+}
-+
-+static inline u32 convert_bitfield(int val, struct fb_bitfield *bf)
-+{
-+	unsigned int mask = (1 << bf->length) - 1;
-+
-+	return (val >> (16 - bf->length) & mask) << bf->offset;
-+}
-+
-+static int
-+goldfish_fb_setcolreg(unsigned int regno, unsigned int red, unsigned int green,
-+		 unsigned int blue, unsigned int transp, struct fb_info *info)
-+{
-+	struct goldfish_fb *fb = container_of(info, struct goldfish_fb, fb);
-+
-+	if (regno < 16) {
-+		fb->cmap[regno] = convert_bitfield(transp, &fb->fb.var.transp) |
-+				  convert_bitfield(blue, &fb->fb.var.blue) |
-+				  convert_bitfield(green, &fb->fb.var.green) |
-+				  convert_bitfield(red, &fb->fb.var.red);
-+		return 0;
-+	}
-+	else {
-+		return 1;
-+	}
-+}
-+
-+static int goldfish_fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
-+{
-+	if((var->rotate & 1) != (info->var.rotate & 1)) {
-+		if((var->xres != info->var.yres) ||
-+		   (var->yres != info->var.xres) ||
-+		   (var->xres_virtual != info->var.yres) ||
-+		   (var->yres_virtual > info->var.xres * 2) ||
-+		   (var->yres_virtual < info->var.xres )) {
-+			return -EINVAL;
-+		}
-+	}
-+	else {
-+		if((var->xres != info->var.xres) ||
-+		   (var->yres != info->var.yres) ||
-+		   (var->xres_virtual != info->var.xres) ||
-+		   (var->yres_virtual > info->var.yres * 2) ||
-+		   (var->yres_virtual < info->var.yres )) {
-+			return -EINVAL;
-+		}
-+	}
-+	if((var->xoffset != info->var.xoffset) ||
-+	   (var->bits_per_pixel != info->var.bits_per_pixel) ||
-+	   (var->grayscale != info->var.grayscale)) {
-+		return -EINVAL;
-+	}
-+	return 0;
-+}
-+
-+static int goldfish_fb_set_par(struct fb_info *info)
-+{
-+	struct goldfish_fb *fb = container_of(info, struct goldfish_fb, fb);
-+	if(fb->rotation != fb->fb.var.rotate) {
-+		info->fix.line_length = info->var.xres * 2;
-+		fb->rotation = fb->fb.var.rotate;
-+		writel(fb->rotation, fb->reg_base + FB_SET_ROTATION);
-+	}
-+	return 0;
-+}
-+
-+
-+static int goldfish_fb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info)
-+{
-+	unsigned long irq_flags;
-+	int base_update_count;
-+	struct goldfish_fb *fb = container_of(info, struct goldfish_fb, fb);
-+
-+	spin_lock_irqsave(&fb->lock, irq_flags);
-+	base_update_count = fb->base_update_count;
-+	writel(fb->fb.fix.smem_start + fb->fb.var.xres * 2 * var->yoffset, fb->reg_base + FB_SET_BASE);
-+	spin_unlock_irqrestore(&fb->lock, irq_flags);
-+	wait_event_timeout(fb->wait, fb->base_update_count != base_update_count, HZ / 15);
-+	if(fb->base_update_count == base_update_count)
-+		printk("goldfish_fb_pan_display: timeout wating for base update\n");
-+	return 0;
-+}
-+
-+#ifdef CONFIG_ANDROID_POWER
-+static void goldfish_fb_early_suspend(android_early_suspend_t *h)
-+{
-+	struct goldfish_fb *fb = container_of(h, struct goldfish_fb, early_suspend);
-+	writel(1, fb->reg_base + FB_SET_BLANK);
-+}
-+
-+static void goldfish_fb_late_resume(android_early_suspend_t *h)
-+{
-+	struct goldfish_fb *fb = container_of(h, struct goldfish_fb, early_suspend);
-+        writel(0, fb->reg_base + FB_SET_BLANK);
-+}
-+#endif
-+
-+static struct fb_ops goldfish_fb_ops = {
-+	.owner          = THIS_MODULE,
-+	.fb_check_var   = goldfish_fb_check_var,
-+	.fb_set_par     = goldfish_fb_set_par,
-+	.fb_setcolreg   = goldfish_fb_setcolreg,
-+	.fb_pan_display = goldfish_fb_pan_display,
-+	.fb_fillrect    = cfb_fillrect,
-+	.fb_copyarea    = cfb_copyarea,
-+	.fb_imageblit   = cfb_imageblit,
-+};
-+
-+
-+static int goldfish_fb_probe(struct platform_device *pdev)
-+{
-+	int ret;
-+	struct resource *r;
-+	struct goldfish_fb *fb;
-+	size_t framesize;
-+	uint32_t width, height;
-+	dma_addr_t fbpaddr;
-+
-+	fb = kzalloc(sizeof(*fb), GFP_KERNEL);
-+	if(fb == NULL) {
-+		ret = -ENOMEM;
-+		goto err_fb_alloc_failed;
-+	}
-+	spin_lock_init(&fb->lock);
-+	init_waitqueue_head(&fb->wait);
-+	platform_set_drvdata(pdev, fb);
-+
-+	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if(r == NULL) {
-+		ret = -ENODEV;
-+		goto err_no_io_base;
-+	}
-+	fb->reg_base = IO_ADDRESS(r->start - IO_START);
-+
-+	fb->irq = platform_get_irq(pdev, 0);
-+	if(fb->irq < 0) {
-+		ret = -ENODEV;
-+		goto err_no_irq;
-+	}
-+
-+	width = readl(fb->reg_base + FB_GET_WIDTH);
-+	height = readl(fb->reg_base + FB_GET_HEIGHT);
-+
-+	fb->fb.fbops		= &goldfish_fb_ops;
-+	fb->fb.flags		= FBINFO_FLAG_DEFAULT;
-+	fb->fb.pseudo_palette	= fb->cmap;
-+	//strncpy(fb->fb.fix.id, clcd_name, sizeof(fb->fb.fix.id));
-+	fb->fb.fix.type		= FB_TYPE_PACKED_PIXELS;
-+	fb->fb.fix.visual = FB_VISUAL_TRUECOLOR;
-+	fb->fb.fix.line_length = width * 2;
-+	fb->fb.fix.accel	= FB_ACCEL_NONE;
-+	fb->fb.fix.ypanstep = 1;
-+
-+	fb->fb.var.xres		= width;
-+	fb->fb.var.yres		= height;
-+	fb->fb.var.xres_virtual	= width;
-+	fb->fb.var.yres_virtual	= height * 2;
-+	fb->fb.var.bits_per_pixel = 16;
-+	fb->fb.var.activate	= FB_ACTIVATE_NOW;
-+	fb->fb.var.height	= readl(fb->reg_base + FB_GET_PHYS_HEIGHT);
-+	fb->fb.var.width	= readl(fb->reg_base + FB_GET_PHYS_WIDTH);
-+
-+	fb->fb.var.red.offset = 11;
-+	fb->fb.var.red.length = 5;
-+	fb->fb.var.green.offset = 5;
-+	fb->fb.var.green.length = 6;
-+	fb->fb.var.blue.offset = 0;
-+	fb->fb.var.blue.length = 5;
-+
-+	framesize = width * height * 2 * 2;
-+	fb->fb.screen_base = dma_alloc_writecombine(&pdev->dev, framesize,
-+	                                            &fbpaddr, GFP_KERNEL);
-+	printk("allocating frame buffer %d * %d, got %p\n", width, height, fb->fb.screen_base);
-+	if(fb->fb.screen_base == 0) {
-+		ret = -ENOMEM;
-+		goto err_alloc_screen_base_failed;
-+	}
-+	fb->fb.fix.smem_start = fbpaddr;
-+	fb->fb.fix.smem_len = framesize;
-+
-+	ret = fb_set_var(&fb->fb, &fb->fb.var);
-+	if(ret)
-+		goto err_fb_set_var_failed;
-+
-+	ret = request_irq(fb->irq, goldfish_fb_interrupt, IRQF_SHARED, pdev->name, fb);
-+	if(ret)
-+		goto err_request_irq_failed;
-+
-+	writel(FB_INT_BASE_UPDATE_DONE, fb->reg_base + FB_INT_ENABLE);
-+	goldfish_fb_pan_display(&fb->fb.var, &fb->fb); // updates base
-+
-+	ret = register_framebuffer(&fb->fb);
-+	if(ret)
-+		goto err_register_framebuffer_failed;
-+
-+#ifdef CONFIG_ANDROID_POWER
-+	fb->early_suspend.suspend = goldfish_fb_early_suspend;
-+	fb->early_suspend.resume = goldfish_fb_late_resume;
-+	android_register_early_suspend(&fb->early_suspend);
-+#endif
-+
-+	return 0;
-+
-+
-+err_register_framebuffer_failed:
-+	free_irq(fb->irq, fb);
-+err_request_irq_failed:
-+err_fb_set_var_failed:
-+	dma_free_writecombine(&pdev->dev, framesize, fb->fb.screen_base, fb->fb.fix.smem_start);
-+err_alloc_screen_base_failed:
-+err_no_irq:
-+err_no_io_base:
-+	kfree(fb);
-+err_fb_alloc_failed:
-+	return ret;
-+}
-+
-+static int goldfish_fb_remove(struct platform_device *pdev)
-+{
-+	size_t framesize;
-+	struct goldfish_fb *fb = platform_get_drvdata(pdev);
-+	
-+	framesize = fb->fb.var.xres_virtual * fb->fb.var.yres_virtual * 2;
-+
-+#ifdef CONFIG_ANDROID_POWER
-+        android_unregister_early_suspend(&fb->early_suspend);
-+#endif
-+	unregister_framebuffer(&fb->fb);
-+	free_irq(fb->irq, fb);
-+	dma_free_writecombine(&pdev->dev, framesize, fb->fb.screen_base, fb->fb.fix.smem_start);
-+	kfree(fb);
-+	return 0;
-+}
-+
-+
-+static struct platform_driver goldfish_fb_driver = {
-+	.probe		= goldfish_fb_probe,
-+	.remove		= goldfish_fb_remove,
-+	.driver = {
-+		.name = "goldfish_fb"
-+	}
-+};
-+
-+static int __init goldfish_fb_init(void)
-+{
-+	return platform_driver_register(&goldfish_fb_driver);
-+}
-+
-+static void __exit goldfish_fb_exit(void)
-+{
-+	platform_driver_unregister(&goldfish_fb_driver);
-+}
-+
-+module_init(goldfish_fb_init);
-+module_exit(goldfish_fb_exit);
-+
diff --git a/target/linux/goldfish/patches-2.6.30/0129--ARM-goldfish-qemutrace-Kernel-instrumentation-fo.patch b/target/linux/goldfish/patches-2.6.30/0129--ARM-goldfish-qemutrace-Kernel-instrumentation-fo.patch
deleted file mode 100644
index b31ca03cf..000000000
--- a/target/linux/goldfish/patches-2.6.30/0129--ARM-goldfish-qemutrace-Kernel-instrumentation-fo.patch
+++ /dev/null
@@ -1,854 +0,0 @@
-From fcd69dd4537320a25a294c82362cc7abe4fe773c Mon Sep 17 00:00:00 2001
-From: Ye Wen <ywen@google.com>
-Date: Fri, 14 Jul 2006 14:51:45 +0700
-Subject: [PATCH 129/134] [ARM] goldfish: qemutrace: Kernel instrumentation for tracing the events.
-
-Like fork, context switch, execve and exit.
-This code is to complement Jack's tracing facility.
-
-To turn tracing on:
-echo 1 > /sysfs/qemu_trace/state
-To turn tracing off: echo 0 > /sysfs/qemu_trace/state
-I also added java methods to Debug.java to turn tracing on and off.
-The kernel driver also supports adding dynamic symbols to the trace.
-To add a symbol 'foo' with hex address 'abcd1234' to the trace:
-echo 'abcd1234 foo' > /sysfs/qemu_trace/symbol
-
-Signed-off-by: Mike Chan <mike@android.com>
-
-[ARM] goldfish: qemutrace: Improved support for tracing thread and process names.
-
-Added a new pseudo file /sys/qemu_trace/process_name to allow user
-programs to add a trace record for a process name change.  Removed
-the tracing of thread and process names from the exit() system call
-because that was not sufficiently general.  Added tracing of thread
-names in set_task_comm() and daemonize().  Added tracing of the
-thread group id to fork() and clone().
-
-Signed-off-by: Jack Veenstra <veenstra@google.com>
-Signed-off-by: Mike Chan <mike@android.com>
----
- arch/arm/kernel/entry-armv.S              |    5 +
- drivers/misc/Kconfig                      |    5 +
- drivers/misc/Makefile                     |    1 +
- drivers/misc/qemutrace/Makefile           |    2 +
- drivers/misc/qemutrace/qemu_trace.c       |  386 +++++++++++++++++++++++++++++
- drivers/misc/qemutrace/qemu_trace.h       |   22 ++
- drivers/misc/qemutrace/qemu_trace_sysfs.c |  182 ++++++++++++++
- fs/exec.c                                 |   14 +
- kernel/exit.c                             |   14 +
- kernel/fork.c                             |    8 +
- kernel/sched.c                            |    9 +
- mm/mmap.c                                 |   13 +
- 12 files changed, 661 insertions(+), 0 deletions(-)
- create mode 100644 drivers/misc/qemutrace/Makefile
- create mode 100644 drivers/misc/qemutrace/qemu_trace.c
- create mode 100644 drivers/misc/qemutrace/qemu_trace.h
- create mode 100644 drivers/misc/qemutrace/qemu_trace_sysfs.c
-
---- a/arch/arm/kernel/entry-armv.S
-+++ b/arch/arm/kernel/entry-armv.S
-@@ -733,6 +733,11 @@ ENTRY(__switch_to)
- 	ldr	r0, =thread_notify_head
- 	mov	r1, #THREAD_NOTIFY_SWITCH
- 	bl	atomic_notifier_call_chain
-+#ifdef CONFIG_QEMU_TRACE
-+/*
-+	mcr	p15, 0, r0, c15, c0, 0		@ signal context switch
-+*/
-+#endif
- 	mov	r0, r5
- 	ldmia	r4, {r4 - sl, fp, sp, pc}	@ Load all regs saved previously
-  UNWIND(.fnend		)
---- a/drivers/misc/Kconfig
-+++ b/drivers/misc/Kconfig
-@@ -233,6 +233,11 @@ config ISL29003
- 	  This driver can also be built as a module.  If so, the module
- 	  will be called isl29003.
- 
-+config QEMU_TRACE
-+        tristate "Virtual Device for QEMU tracing"
-+        ---help---
-+          This is a virtual device for QEMU tracing.
-+
- source "drivers/misc/c2port/Kconfig"
- source "drivers/misc/eeprom/Kconfig"
- 
---- a/drivers/misc/Makefile
-+++ b/drivers/misc/Makefile
-@@ -20,4 +20,5 @@ obj-$(CONFIG_SGI_GRU)		+= sgi-gru/
- obj-$(CONFIG_HP_ILO)		+= hpilo.o
- obj-$(CONFIG_ISL29003)		+= isl29003.o
- obj-$(CONFIG_C2PORT)		+= c2port/
-+obj-$(CONFIG_QEMU_TRACE)	+= qemutrace/
- obj-y				+= eeprom/
---- /dev/null
-+++ b/drivers/misc/qemutrace/Makefile
-@@ -0,0 +1,2 @@
-+obj-$(CONFIG_QEMU_TRACE) := qemu_trace.o
-+obj-$(CONFIG_QEMU_TRACE) += qemu_trace_sysfs.o
---- /dev/null
-+++ b/drivers/misc/qemutrace/qemu_trace.c
-@@ -0,0 +1,386 @@
-+/* drivers/misc/qemutrace/qemu_trace.c
-+ *
-+ * Copyright (C) 2007-2008 Google, Inc.
-+ *
-+ * This software is licensed under the terms of the GNU General Public
-+ * License version 2, as published by the Free Software Foundation, and
-+ * may be copied, distributed, and modified under those terms.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/spinlock.h>
-+#include <linux/miscdevice.h>
-+#include <linux/pci.h>
-+#include <linux/proc_fs.h>
-+#include <linux/platform_device.h>
-+#include <linux/mm.h>
-+#include <linux/sched.h>
-+#include <asm/uaccess.h>
-+#include <asm/io.h>
-+#include <asm/sizes.h>
-+#include "qemu_trace.h"
-+
-+/* trace device registers */
-+#define TRACE_DEV_REG_SWITCH            0
-+#define TRACE_DEV_REG_FORK              1
-+#define TRACE_DEV_REG_EXECVE_PID        2
-+#define TRACE_DEV_REG_EXECVE_VMSTART    3
-+#define TRACE_DEV_REG_EXECVE_VMEND      4
-+#define TRACE_DEV_REG_EXECVE_OFFSET     5
-+#define TRACE_DEV_REG_EXECVE_EXEPATH    6
-+#define TRACE_DEV_REG_EXIT              7
-+#define TRACE_DEV_REG_CMDLINE           8
-+#define TRACE_DEV_REG_CMDLINE_LEN       9
-+#define TRACE_DEV_REG_MMAP_EXEPATH      10
-+#define TRACE_DEV_REG_INIT_PID          11
-+#define TRACE_DEV_REG_INIT_NAME         12
-+#define TRACE_DEV_REG_CLONE             13
-+#define TRACE_DEV_REG_UNMAP_START       14
-+#define TRACE_DEV_REG_UNMAP_END         15
-+#define TRACE_DEV_REG_NAME              16
-+#define TRACE_DEV_REG_TGID              17
-+#define TRACE_DEV_REG_DYN_SYM           50
-+#define TRACE_DEV_REG_DYN_SYM_ADDR      51
-+#define TRACE_DEV_REG_REMOVE_ADDR       52
-+#define TRACE_DEV_REG_ENABLE            100
-+
-+static unsigned char __iomem *qt_base;
-+static int init_called;
-+
-+/* PIDs that start before our device registered */
-+#define MAX_INIT_PIDS   2048
-+static int tb_next = 0;
-+static int init_pids[MAX_INIT_PIDS];
-+static DEFINE_SPINLOCK(qemu_trace_lock);
-+
-+void qemu_trace_start(void)
-+{
-+	unsigned long irq_flags;
-+
-+	if (qt_base == NULL)
-+		return;
-+	spin_lock_irqsave(&qemu_trace_lock, irq_flags);
-+	writel(1, qt_base + (TRACE_DEV_REG_ENABLE << 2));
-+	spin_unlock_irqrestore(&qemu_trace_lock, irq_flags);
-+}
-+
-+void qemu_trace_stop(void)
-+{
-+	unsigned long irq_flags;
-+
-+	if (qt_base == NULL)
-+		return;
-+	spin_lock_irqsave(&qemu_trace_lock, irq_flags);
-+	writel(0, qt_base + (TRACE_DEV_REG_ENABLE << 2));
-+	spin_unlock_irqrestore(&qemu_trace_lock, irq_flags);
-+}
-+
-+int qemu_trace_get_tracing(void)
-+{
-+	int val = 0;
-+	if (qt_base != NULL)
-+		val = readl(qt_base + (TRACE_DEV_REG_ENABLE << 2));
-+	return val;
-+}
-+
-+void qemu_trace_add_mapping(unsigned int addr, const char *symbol)
-+{
-+	unsigned long irq_flags;
-+
-+	if (qt_base == NULL)
-+		return;
-+
-+	/* Write the address first, then the symbol name. */
-+	spin_lock_irqsave(&qemu_trace_lock, irq_flags);
-+	writel(addr, qt_base + (TRACE_DEV_REG_DYN_SYM_ADDR << 2));
-+	writel(symbol, qt_base + (TRACE_DEV_REG_DYN_SYM << 2));
-+	spin_unlock_irqrestore(&qemu_trace_lock, irq_flags);
-+}
-+
-+void qemu_trace_remove_mapping(unsigned int addr)
-+{
-+	unsigned long irq_flags;
-+
-+	if (qt_base == NULL)
-+		return;
-+
-+	spin_lock_irqsave(&qemu_trace_lock, irq_flags);
-+	writel(addr, qt_base + (TRACE_DEV_REG_REMOVE_ADDR << 2));
-+	spin_unlock_irqrestore(&qemu_trace_lock, irq_flags);
-+}
-+
-+/* trace the context switch */
-+void qemu_trace_cs(struct task_struct *next)
-+{
-+	unsigned long irq_flags;
-+
-+	if (qt_base == NULL)
-+		return;
-+
-+	spin_lock_irqsave(&qemu_trace_lock, irq_flags);
-+	writel(task_pid_nr(next), qt_base);
-+	spin_unlock_irqrestore(&qemu_trace_lock, irq_flags);
-+}
-+EXPORT_SYMBOL(qemu_trace_cs);
-+
-+/* trace the execve */
-+void qemu_trace_execve(int argc, char __user * __user *argv)
-+{
-+	unsigned long irq_flags;
-+	char page[PAGE_SIZE];
-+	char *ptr = page;
-+
-+	if (qt_base == NULL)
-+		return;
-+
-+	while (argc-- > 0) {
-+		char __user *str;
-+		int len;
-+		if (get_user(str, argv ++))
-+			return;
-+		len = strnlen_user(str, PAGE_SIZE);
-+		if (len == 0)
-+			return;
-+		if (copy_from_user(ptr, str, len))
-+			return;
-+		ptr += len;
-+	}
-+
-+	if (ptr > page) {
-+		int len = ptr - page;
-+		spin_lock_irqsave(&qemu_trace_lock, irq_flags);
-+		writel(len, qt_base + (TRACE_DEV_REG_CMDLINE_LEN << 2));
-+		writel(page, qt_base + (TRACE_DEV_REG_CMDLINE << 2));
-+		spin_unlock_irqrestore(&qemu_trace_lock, irq_flags);
-+	}
-+}
-+EXPORT_SYMBOL(qemu_trace_execve);
-+
-+/* trace the mmap */
-+void qemu_trace_mmap(struct vm_area_struct *vma)
-+{
-+	unsigned long irq_flags;
-+	char page[PAGE_SIZE];
-+	char *p;
-+
-+	if (qt_base == NULL)
-+		return;
-+
-+	if (vma->vm_file == NULL)
-+		return;
-+
-+	p = d_path(&vma->vm_file->f_path, page, PAGE_SIZE);
-+	if (IS_ERR(p))
-+		return;
-+
-+	spin_lock_irqsave(&qemu_trace_lock, irq_flags);
-+	writel(vma->vm_start, qt_base + (TRACE_DEV_REG_EXECVE_VMSTART << 2));
-+	writel(vma->vm_end, qt_base + (TRACE_DEV_REG_EXECVE_VMEND << 2));
-+	writel(vma->vm_pgoff * PAGE_SIZE, qt_base + (TRACE_DEV_REG_EXECVE_OFFSET << 2));
-+	writel(p, qt_base + (TRACE_DEV_REG_MMAP_EXEPATH << 2));
-+	spin_unlock_irqrestore(&qemu_trace_lock, irq_flags);
-+}
-+EXPORT_SYMBOL(qemu_trace_mmap);
-+
-+/* trace the munmap */
-+void qemu_trace_munmap(unsigned long start, unsigned long end)
-+{
-+	unsigned long irq_flags;
-+
-+	if (qt_base == NULL)
-+		return;
-+
-+	spin_lock_irqsave(&qemu_trace_lock, irq_flags);
-+	writel(start, qt_base + (TRACE_DEV_REG_UNMAP_START << 2));
-+	writel(end, qt_base + (TRACE_DEV_REG_UNMAP_END << 2));
-+	spin_unlock_irqrestore(&qemu_trace_lock, irq_flags);
-+}
-+EXPORT_SYMBOL(qemu_trace_munmap);
-+
-+/* trace the fork */
-+void qemu_trace_fork(struct task_struct *forked, unsigned long clone_flags)
-+{
-+	unsigned long irq_flags;
-+
-+	spin_lock_irqsave(&qemu_trace_lock, irq_flags);
-+	if (qt_base == NULL) {
-+		if (tb_next >= MAX_INIT_PIDS) {
-+			if (!init_called)
-+				printk(KERN_ERR
-+				       "QEMU Trace: too many PIDs before "
-+				       "device registered ignoring %d\n",
-+				       forked->pid);
-+		} else {
-+			init_pids[tb_next] = task_pid_nr(forked);
-+			tb_next++;
-+		}
-+	} else {
-+		writel(task_tgid_nr(forked), qt_base + (TRACE_DEV_REG_TGID << 2));
-+		if (clone_flags & CLONE_VM)
-+			writel(task_pid_nr(forked), qt_base + (TRACE_DEV_REG_CLONE << 2));
-+		else
-+			writel(task_pid_nr(forked), qt_base + (TRACE_DEV_REG_FORK << 2));
-+	}
-+	spin_unlock_irqrestore(&qemu_trace_lock, irq_flags);
-+}
-+EXPORT_SYMBOL(qemu_trace_fork);
-+
-+/* trace the exit */
-+void qemu_trace_exit(int code)
-+{
-+	unsigned long irq_flags;
-+
-+	if (qt_base == NULL)
-+		return;
-+
-+	spin_lock_irqsave(&qemu_trace_lock, irq_flags);
-+	writel(code, qt_base + (TRACE_DEV_REG_EXIT << 2));
-+	spin_unlock_irqrestore(&qemu_trace_lock, irq_flags);
-+}
-+EXPORT_SYMBOL(qemu_trace_exit);
-+
-+/* trace the thread name */
-+void qemu_trace_thread_name(const char *name)
-+{
-+	unsigned long irq_flags;
-+
-+	if (qt_base == NULL)
-+		return;
-+
-+	spin_lock_irqsave(&qemu_trace_lock, irq_flags);
-+	writel(name, qt_base + (TRACE_DEV_REG_NAME << 2));
-+	spin_unlock_irqrestore(&qemu_trace_lock, irq_flags);
-+}
-+EXPORT_SYMBOL(qemu_trace_thread_name);
-+
-+/* trace the process name */
-+void qemu_trace_process_name(const char *name)
-+{
-+	unsigned long irq_flags;
-+
-+	if (qt_base == NULL)
-+		return;
-+
-+	spin_lock_irqsave(&qemu_trace_lock, irq_flags);
-+	writel(name, qt_base + (TRACE_DEV_REG_NAME << 2));
-+	spin_unlock_irqrestore(&qemu_trace_lock, irq_flags);
-+}
-+EXPORT_SYMBOL(qemu_trace_process_name);
-+
-+static void qemu_trace_pid_exec(struct task_struct *tsk)
-+{
-+	unsigned long irq_flags;
-+	char page[PAGE_SIZE];
-+	struct mm_struct *mm = get_task_mm(tsk);
-+	if (mm == NULL)
-+		return;
-+	down_read(&mm->mmap_sem);
-+	{
-+		struct vm_area_struct *vma = mm->mmap;
-+		while (vma) {
-+			if ((vma->vm_flags & VM_EXEC) && vma->vm_file) {
-+				char *p;
-+				p = d_path(&vma->vm_file->f_path, page, PAGE_SIZE);
-+				if (!IS_ERR(p)) {
-+					spin_lock_irqsave(&qemu_trace_lock, irq_flags);
-+					writel(vma->vm_start, qt_base + (TRACE_DEV_REG_EXECVE_VMSTART << 2));
-+					writel(vma->vm_end, qt_base + (TRACE_DEV_REG_EXECVE_VMEND << 2));
-+					writel(vma->vm_pgoff * PAGE_SIZE, qt_base + (TRACE_DEV_REG_EXECVE_OFFSET << 2));
-+					writel(p, qt_base + (TRACE_DEV_REG_EXECVE_EXEPATH << 2));
-+					spin_unlock_irqrestore(&qemu_trace_lock, irq_flags);
-+				}
-+			}
-+			vma = vma->vm_next;
-+		}
-+	}
-+	up_read(&mm->mmap_sem);
-+	mmput(mm);
-+}
-+
-+static void qemu_trace_dump_init_threads(void)
-+{
-+	unsigned long irq_flags;
-+	int i;
-+
-+	for (i = 0; i < tb_next; i++) {
-+		struct task_struct *tsk;
-+		struct pid *pid = find_get_pid(init_pids[i]);
-+		if (pid == NULL)
-+			continue;
-+
-+		if ((tsk = get_pid_task(pid, PIDTYPE_PID)) != NULL) {
-+			/* first give the pid and name */
-+			task_lock(tsk);
-+			spin_lock_irqsave(&qemu_trace_lock, irq_flags);
-+			writel(task_tgid_nr(tsk), qt_base + (TRACE_DEV_REG_TGID << 2));
-+			writel(task_pid_nr(tsk), qt_base + (TRACE_DEV_REG_INIT_PID << 2));
-+			writel(tsk->comm, qt_base + (TRACE_DEV_REG_INIT_NAME << 2));
-+			spin_unlock_irqrestore(&qemu_trace_lock, irq_flags);
-+			task_unlock(tsk);
-+			/* check if the task has execs */
-+			qemu_trace_pid_exec(tsk);
-+		}
-+	}
-+}
-+
-+static int qemu_trace_probe(struct platform_device *pdev)
-+{
-+	struct resource *r;
-+
-+	/* not thread safe, but this should not happen */
-+	if (qt_base != NULL) {
-+		printk(KERN_ERR "QEMU TRACE Device: already mapped at %p\n", qt_base);
-+		return -ENODEV;
-+	}
-+	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if (r == NULL)
-+		return -EINVAL;
-+	qt_base = ioremap(r->start, PAGE_SIZE);
-+	printk(KERN_INFO "QEMU TRACE Device: The mapped IO base is %p\n", qt_base);
-+
-+	qemu_trace_dump_init_threads();
-+
-+	return 0;
-+}
-+
-+static int qemu_trace_remove(struct platform_device *pdev)
-+{
-+	iounmap(qt_base);
-+	qt_base = NULL;
-+	return 0;
-+}
-+
-+static struct platform_driver qemu_trace = {
-+	.probe = qemu_trace_probe,
-+	.remove = qemu_trace_remove,
-+	.driver = {
-+		.name = "qemu_trace"
-+	}
-+};
-+
-+static int __init qemu_trace_dev_init(void)
-+{
-+	int ret;
-+	ret = platform_driver_register(&qemu_trace);
-+	init_called = 1;
-+	return ret;
-+}
-+
-+static void qemu_trace_dev_exit(void)
-+{
-+	platform_driver_unregister(&qemu_trace);
-+}
-+
-+
-+module_init(qemu_trace_dev_init);
-+module_exit(qemu_trace_dev_exit);
-+
-+MODULE_AUTHOR("Ye Wen <ywen@google.com>");
-+MODULE_LICENSE("GPL");
---- /dev/null
-+++ b/drivers/misc/qemutrace/qemu_trace.h
-@@ -0,0 +1,22 @@
-+/* drivers/misc/qemutrace/qemu_trace.h
-+ *
-+ * Copyright (C) 2007-2008 Google, Inc.
-+ *
-+ * This software is licensed under the terms of the GNU General Public
-+ *
-+ * License version 2, as published by the Free Software Foundation, and
-+ * may be copied, distributed, and modified under those terms.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ */
-+
-+void qemu_trace_start(void);
-+void qemu_trace_stop(void);
-+int qemu_trace_get_tracing(void);
-+void qemu_trace_add_mapping(unsigned int addr, const char *symbol);
-+void qemu_trace_remove_mapping(unsigned int addr);
-+void qemu_trace_process_name(const char *name);
---- /dev/null
-+++ b/drivers/misc/qemutrace/qemu_trace_sysfs.c
-@@ -0,0 +1,182 @@
-+/* drivers/misc/qemu_sysfs.c
-+ *
-+ * Copyright (C) 2007-2008 Google, Inc.
-+ * Author: Jack Veenstra
-+ *
-+ * This software is licensed under the terms of the GNU General Public
-+ * License version 2, as published by the Free Software Foundation, and
-+ * may be copied, distributed, and modified under those terms.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ */
-+
-+#include <linux/list.h>
-+#include <linux/module.h>
-+#include <linux/miscdevice.h>
-+#include <linux/sysdev.h>
-+#include <linux/fs.h>
-+#include <linux/poll.h>
-+#include <linux/interrupt.h>
-+#include <linux/delay.h>
-+#include <linux/clk.h>
-+#include <linux/wait.h>
-+#include "qemu_trace.h"
-+
-+MODULE_DESCRIPTION("Qemu Trace Driver");
-+MODULE_LICENSE("GPL");
-+MODULE_VERSION("1.0");
-+
-+static struct kobject *qemu_trace_kobj;
-+
-+static ssize_t state_show(struct kobject *kobj, struct kobj_attribute *attr, char * buf)
-+{
-+    int val = qemu_trace_get_tracing();
-+    buf[0] = '0' + val;
-+    buf[1] = '\n';
-+    return 2;
-+}
-+
-+static ssize_t state_store(struct kobject *kobj, struct kobj_attribute *attr, const char * buf, size_t n)
-+{
-+    if (n <= 0)
-+	return -EINVAL;
-+    if (buf[0] == '0')
-+        qemu_trace_stop();
-+    else if (buf[0] == '1')
-+        qemu_trace_start();
-+    else
-+	return -EINVAL;
-+    return n;
-+}
-+
-+static ssize_t symbol_show(struct kobject *kobj, struct kobj_attribute *attr, char * buf)
-+{
-+    return 0;
-+}
-+
-+// We are expecting a string of the form "addr symbol" where 'addr' is a hex address
-+// (without the leading '0x') and symbol is a newline-terminated string.  This symbol
-+// with its corresponding address will be added to the trace file.
-+//
-+// To remove the mapping for (addr, symbol) in the trace file, write just the
-+// address.  As before, the address is in hex without the leading '0x'.  It can
-+// be newline-terminated or zero-terminated.
-+static ssize_t symbol_store(struct kobject *kobj, struct kobj_attribute *attr, const char * buf, size_t n)
-+{
-+    const char *cp;
-+    unsigned int addr = 0;
-+    int len;
-+    char *sym;
-+
-+    if (n <= 0 || buf == NULL)
-+	return -EINVAL;
-+    for (cp = buf; *cp != ' '; ++cp) {
-+        unsigned int digit;
-+
-+        if (*cp >= '0' && *cp <= '9')
-+            digit = *cp - '0';
-+        else if (*cp >= 'a' && *cp <= 'f')
-+            digit = *cp - 'a' + 10;
-+        else if (*cp == 0 || *cp == '\n') {
-+            qemu_trace_remove_mapping(addr);
-+            return n;
-+        } else
-+            return -EINVAL;
-+        addr = (addr << 4) + digit;
-+    }
-+    // Move past the space
-+    cp += 1;
-+
-+    // Copy the string to a new buffer so that we can replace the newline
-+    // with '\0'.
-+    len = strlen(cp);
-+    sym = kzalloc(len + 1, GFP_KERNEL);
-+    strcpy(sym, cp);
-+    if (sym[len - 1] == '\n')
-+        sym[len - 1] = 0;
-+
-+    qemu_trace_add_mapping(addr, sym);
-+    kfree(sym);
-+    return n;
-+}
-+
-+static ssize_t process_name_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf)
-+{
-+    return 0;
-+}
-+
-+/* This expects a string that is the process name.  If the string contains
-+ * a trailing newline, that is removed in the emulator tracing code because
-+ * it is simpler to do it there.
-+ */
-+static ssize_t process_name_store(struct kobject *kobj, struct kobj_attribute *attr, const char *buf, size_t n)
-+{
-+    if (n <= 0 || buf == NULL)
-+	return -EINVAL;
-+
-+    qemu_trace_process_name(buf);
-+    return n;
-+}
-+
-+
-+#define qemu_trace_attr(_name) \
-+static struct kobj_attribute _name##_attr = {	\
-+	.attr	= {				\
-+		.name = __stringify(_name),	\
-+		.mode = 0666,			\
-+	},					\
-+	.show	= _name##_show,			\
-+	.store	= _name##_store,		\
-+}
-+
-+qemu_trace_attr(state);
-+qemu_trace_attr(symbol);
-+qemu_trace_attr(process_name);
-+
-+static struct attribute * qemu_trace_attrs[] = {
-+	&state_attr.attr,
-+	&symbol_attr.attr,
-+	&process_name_attr.attr,
-+	NULL,
-+};
-+
-+static struct attribute_group qemu_trace_attr_group = {
-+	.attrs = qemu_trace_attrs,
-+};
-+
-+static int __init qemu_trace_init(void)
-+{
-+	int ret;
-+
-+	qemu_trace_kobj = kobject_create_and_add("qemu_trace", NULL);
-+	if (qemu_trace_kobj == NULL) {
-+		printk("qemu_trace_init: kobject_create_and_add failed\n");
-+		ret = -ENOMEM;
-+		return ret;
-+	}
-+	ret = sysfs_create_group(qemu_trace_kobj, &qemu_trace_attr_group);
-+	if (ret) {
-+		printk("qemu_trace_init: sysfs_create_group failed\n");
-+		goto err;
-+	}
-+
-+	return 0;
-+
-+err:
-+	kobject_del(qemu_trace_kobj);
-+	qemu_trace_kobj = NULL;
-+	return ret;
-+}
-+
-+static void  __exit qemu_trace_exit(void)
-+{
-+	sysfs_remove_group(qemu_trace_kobj, &qemu_trace_attr_group);
-+	kobject_del(qemu_trace_kobj);
-+}
-+
-+core_initcall(qemu_trace_init);
-+module_exit(qemu_trace_exit);
---- a/fs/exec.c
-+++ b/fs/exec.c
-@@ -59,6 +59,9 @@
- #include <asm/mmu_context.h>
- #include <asm/tlb.h>
- #include "internal.h"
-+#ifdef CONFIG_QEMU_TRACE
-+	void qemu_trace_thread_name(char *name);
-+#endif
- 
- int core_uses_pid;
- char core_pattern[CORENAME_MAX_SIZE] = "core";
-@@ -922,6 +925,9 @@ void set_task_comm(struct task_struct *t
- 	task_lock(tsk);
- 	strlcpy(tsk->comm, buf, sizeof(tsk->comm));
- 	task_unlock(tsk);
-+#ifdef CONFIG_QEMU_TRACE
-+	qemu_trace_thread_name(buf);
-+#endif
- }
- 
- int flush_old_exec(struct linux_binprm * bprm)
-@@ -1245,6 +1251,10 @@ void free_bprm(struct linux_binprm *bprm
- 	kfree(bprm);
- }
- 
-+#ifdef CONFIG_QEMU_TRACE
-+extern void qemu_trace_execve(int argc, char __user * __user * argv);
-+#endif
-+
- /*
-  * sys_execve() executes a new program.
-  */
-@@ -1324,6 +1334,10 @@ int do_execve(char * filename,
- 		goto out;
- 
- 	current->flags &= ~PF_KTHREAD;
-+#ifdef CONFIG_QEMU_TRACE
-+        qemu_trace_execve(bprm->argc, argv);
-+#endif
-+
- 	retval = search_binary_handler(bprm,regs);
- 	if (retval < 0)
- 		goto out;
---- a/kernel/exit.c
-+++ b/kernel/exit.c
-@@ -60,6 +60,11 @@ DEFINE_TRACE(sched_process_free);
- DEFINE_TRACE(sched_process_exit);
- DEFINE_TRACE(sched_process_wait);
- 
-+#ifdef CONFIG_QEMU_TRACE
-+void qemu_trace_thread_name(char *name);
-+void qemu_trace_exit(int code);
-+#endif
-+
- static void exit_mm(struct task_struct * tsk);
- 
- static void __unhash_process(struct task_struct *p)
-@@ -426,6 +431,9 @@ void daemonize(const char *name, ...)
- 	va_start(args, name);
- 	vsnprintf(current->comm, sizeof(current->comm), name, args);
- 	va_end(args);
-+#ifdef CONFIG_QEMU_TRACE
-+	qemu_trace_thread_name(current->comm);
-+#endif
- 
- 	/*
- 	 * If we were started as result of loading a module, close all of the
-@@ -1012,6 +1020,12 @@ NORET_TYPE void do_exit(long code)
- 	preempt_disable();
- 	/* causes final put_task_struct in finish_task_switch(). */
- 	tsk->state = TASK_DEAD;
-+
-+#ifdef CONFIG_QEMU_TRACE
-+	/* Emit a trace record for the exit() call. */
-+	qemu_trace_exit(code);
-+#endif
-+
- 	schedule();
- 	BUG();
- 	/* Avoid "noreturn function does return".  */
---- a/kernel/fork.c
-+++ b/kernel/fork.c
-@@ -1323,6 +1323,10 @@ struct task_struct * __cpuinit fork_idle
- 	return task;
- }
- 
-+#ifdef CONFIG_QEMU_TRACE
-+extern void qemu_trace_fork(struct task_struct *forked, unsigned long clone_flags);
-+#endif
-+
- /*
-  *  Ok, this is the main fork-routine.
-  *
-@@ -1424,6 +1428,10 @@ long do_fork(unsigned long clone_flags,
- 		tracehook_report_clone_complete(trace, regs,
- 						clone_flags, nr, p);
- 
-+#ifdef CONFIG_QEMU_TRACE
-+                qemu_trace_fork(p, clone_flags);
-+#endif
-+
- 		if (clone_flags & CLONE_VFORK) {
- 			freezer_do_not_count();
- 			wait_for_completion(&vfork);
---- a/kernel/sched.c
-+++ b/kernel/sched.c
-@@ -2748,6 +2748,10 @@ asmlinkage void schedule_tail(struct tas
- 		put_user(task_pid_vnr(current), current->set_child_tid);
- }
- 
-+#ifdef CONFIG_QEMU_TRACE
-+void qemu_trace_cs(struct task_struct *next);
-+#endif
-+
- /*
-  * context_switch - switch to the new MM and the new
-  * thread's register state.
-@@ -2790,6 +2794,11 @@ context_switch(struct rq *rq, struct tas
- 	spin_release(&rq->lock.dep_map, 1, _THIS_IP_);
- #endif
- 
-+#ifdef CONFIG_QEMU_TRACE
-+	/* Emit a trace record for the context switch. */
-+	qemu_trace_cs(next);
-+#endif
-+
- 	/* Here we just switch the register state and the stack. */
- 	switch_to(prev, next, prev);
- 
---- a/mm/mmap.c
-+++ b/mm/mmap.c
-@@ -906,6 +906,11 @@ void vm_stat_account(struct mm_struct *m
- }
- #endif /* CONFIG_PROC_FS */
- 
-+#ifdef CONFIG_QEMU_TRACE
-+extern void qemu_trace_mmap(struct vm_area_struct * vma);
-+extern void qemu_trace_munmap(unsigned long start, unsigned long end);
-+#endif
-+
- /*
-  * The caller must hold down_write(current->mm->mmap_sem).
-  */
-@@ -1212,6 +1217,10 @@ munmap_back:
- 	pgoff = vma->vm_pgoff;
- 	vm_flags = vma->vm_flags;
- 
-+#ifdef CONFIG_QEMU_TRACE
-+        qemu_trace_mmap(vma);       
-+#endif
-+
- 	if (vma_wants_writenotify(vma))
- 		vma->vm_page_prot = vm_get_page_prot(vm_flags & ~VM_SHARED);
- 
-@@ -1938,6 +1947,10 @@ int do_munmap(struct mm_struct *mm, unsi
- 	 * Remove the vma's, and unmap the actual pages
- 	 */
- 	detach_vmas_to_be_unmapped(mm, vma, prev, end);
-+
-+#ifdef CONFIG_QEMU_TRACE
-+	qemu_trace_munmap(start, end);
-+#endif
- 	unmap_region(mm, vma, prev, start, end);
- 
- 	/* Fix up all other VM information */
diff --git a/target/linux/goldfish/patches-2.6.30/0133--ARM-goldfish-qemutrace-Add-mmap-support.patch b/target/linux/goldfish/patches-2.6.30/0133--ARM-goldfish-qemutrace-Add-mmap-support.patch
deleted file mode 100644
index 44554a617..000000000
--- a/target/linux/goldfish/patches-2.6.30/0133--ARM-goldfish-qemutrace-Add-mmap-support.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 2309613958ee518f94f1a7ba900e08e604e06048 Mon Sep 17 00:00:00 2001
-From: Jack Veenstra <veenstra@android.com>
-Date: Fri, 1 May 2009 18:50:10 -0700
-Subject: [PATCH 133/134] [ARM] goldfish: qemutrace: Add mmap support.
-
-This makes a page of data available for writing from user-space to allow
-the Dalvik interpreter to send method trace information to the emulator.
-
-Signed-off-by: Jack Veenstra <veenstra@android.com>
----
- drivers/misc/qemutrace/qemu_trace.c |   35 ++++++++++++++++++++++++++++++++++-
- 1 files changed, 34 insertions(+), 1 deletions(-)
-
---- a/drivers/misc/qemutrace/qemu_trace.c
-+++ b/drivers/misc/qemutrace/qemu_trace.c
-@@ -53,6 +53,7 @@
- 
- static unsigned char __iomem *qt_base;
- static int init_called;
-+static uint32_t qemu_trace_paddr;
- 
- /* PIDs that start before our device registered */
- #define MAX_INIT_PIDS   2048
-@@ -330,8 +331,30 @@ static void qemu_trace_dump_init_threads
- 	}
- }
- 
-+static int qemu_trace_mmap_fop(struct file *file, struct vm_area_struct *vma)
-+{
-+	int ret = io_remap_pfn_range(vma, vma->vm_start,
-+			(qemu_trace_paddr >> PAGE_SHIFT) + 1,
-+			PAGE_SIZE, vma->vm_page_prot);
-+	if (ret < 0)
-+		return ret;
-+	return 0;
-+}
-+
-+static const struct file_operations qemu_trace_fops = {
-+	.owner = THIS_MODULE,
-+	.mmap = qemu_trace_mmap_fop,
-+};
-+
-+static struct miscdevice qemu_trace_device = {
-+	.minor = MISC_DYNAMIC_MINOR,
-+	.name = "qemu_trace",
-+	.fops = &qemu_trace_fops,
-+};
-+
- static int qemu_trace_probe(struct platform_device *pdev)
- {
-+	int err;
- 	struct resource *r;
- 
- 	/* not thread safe, but this should not happen */
-@@ -340,18 +363,28 @@ static int qemu_trace_probe(struct platf
- 		return -ENODEV;
- 	}
- 	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
--	if (r == NULL)
-+	if (r == NULL || r->end - r->start < 2 * PAGE_SIZE - 1)
- 		return -EINVAL;
-+	qemu_trace_paddr = r->start;
- 	qt_base = ioremap(r->start, PAGE_SIZE);
- 	printk(KERN_INFO "QEMU TRACE Device: The mapped IO base is %p\n", qt_base);
- 
- 	qemu_trace_dump_init_threads();
-+	err = misc_register(&qemu_trace_device);
-+	if (err)
-+		goto err_misc_register;
- 
- 	return 0;
-+
-+err_misc_register:
-+	iounmap(qt_base);
-+	qt_base = NULL;
-+	return err;
- }
- 
- static int qemu_trace_remove(struct platform_device *pdev)
- {
-+	misc_deregister(&qemu_trace_device);
- 	iounmap(qt_base);
- 	qt_base = NULL;
- 	return 0;
diff --git a/target/linux/goldfish/patches-2.6.30/1000-nand_driver_fixes.patch b/target/linux/goldfish/patches-2.6.30/1000-nand_driver_fixes.patch
deleted file mode 100644
index 0cd366ce9..000000000
--- a/target/linux/goldfish/patches-2.6.30/1000-nand_driver_fixes.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- a/drivers/mtd/devices/goldfish_nand.c
-+++ b/drivers/mtd/devices/goldfish_nand.c
-@@ -65,7 +65,7 @@ static int goldfish_nand_erase(struct mt
- 	if(rem)
- 		goto invalid_arg;
- 	ofs *= (mtd->writesize + mtd->oobsize);
--	
-+
- 	if(len % mtd->writesize)
- 		goto invalid_arg;
- 	len = len / mtd->writesize * (mtd->writesize + mtd->oobsize);
-@@ -94,15 +94,12 @@ static int goldfish_nand_read_oob(struct
- 
- 	if(ofs + ops->len > mtd->size)
- 		goto invalid_arg;
--	if(ops->datbuf && ops->len && ops->len != mtd->writesize)
--		goto invalid_arg;
- 	if(ops->ooblen + ops->ooboffs > mtd->oobsize)
- 		goto invalid_arg;
- 
- 	rem = do_div(ofs, mtd->writesize);
--	if(rem)
--		goto invalid_arg;
- 	ofs *= (mtd->writesize + mtd->oobsize);
-+	ofs += rem;
- 
- 	if(ops->datbuf)
- 		ops->retlen = goldfish_nand_cmd(mtd, NAND_CMD_READ, ofs,
-@@ -131,7 +128,7 @@ static int goldfish_nand_write_oob(struc
- 		goto invalid_arg;
- 	if(ops->ooblen + ops->ooboffs > mtd->oobsize)
- 		goto invalid_arg;
--	
-+
- 	rem = do_div(ofs, mtd->writesize);
- 	if(rem)
- 		goto invalid_arg;
-@@ -160,15 +157,24 @@ static int goldfish_nand_read(struct mtd
- 
- 	if(from + len > mtd->size)
- 		goto invalid_arg;
--	if(len != mtd->writesize)
--		goto invalid_arg;
-+
-+	*retlen = 0;
- 
- 	rem = do_div(from, mtd->writesize);
--	if(rem)
--		goto invalid_arg;
- 	from *= (mtd->writesize + mtd->oobsize);
-+	from += rem;
- 
--	*retlen = goldfish_nand_cmd(mtd, NAND_CMD_READ, from, len, buf);
-+	do {
-+		*retlen += goldfish_nand_cmd(mtd, NAND_CMD_READ, from, min(len, mtd->writesize - rem), buf);
-+		if (len > mtd->writesize - rem) {
-+			len -= mtd->writesize - rem;
-+			buf += mtd->writesize - rem;
-+			from += mtd->writesize + mtd->oobsize - rem;
-+			rem = 0;
-+		} else {
-+			len = 0;
-+		}
-+	} while (len);
- 	return 0;
- 
- invalid_arg:
-@@ -184,15 +190,23 @@ static int goldfish_nand_write(struct mt
- 
- 	if(to + len > mtd->size)
- 		goto invalid_arg;
--	if(len != mtd->writesize)
--		goto invalid_arg;
- 
- 	rem = do_div(to, mtd->writesize);
- 	if(rem)
- 		goto invalid_arg;
- 	to *= (mtd->writesize + mtd->oobsize);
- 
--	*retlen = goldfish_nand_cmd(mtd, NAND_CMD_WRITE, to, len, (void *)buf);
-+	*retlen = 0;
-+	do {
-+		*retlen += goldfish_nand_cmd(mtd, NAND_CMD_WRITE, to, min(len, mtd->writesize), (void *)buf);
-+		if (len > mtd->writesize) {
-+			len -= mtd->writesize;
-+			buf += mtd->writesize;
-+			to += mtd->writesize + mtd->oobsize;
-+		} else {
-+			len = 0;
-+		}
-+	} while (len);
- 	return 0;
- 
- invalid_arg:
diff --git a/target/linux/iop32x/Makefile b/target/linux/iop32x/Makefile
deleted file mode 100644
index 8dd2c1b01..000000000
--- a/target/linux/iop32x/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Copyright (C) 2007-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-ARCH:=arm
-BOARD:=iop32x
-BOARDNAME:=Intel IOP32x
-FEATURES:=squashfs
-
-LINUX_VERSION:=2.6.32.10
-
-include $(INCLUDE_DIR)/target.mk
-
-$(eval $(call BuildTarget))
diff --git a/target/linux/iop32x/base-files/etc/config/network b/target/linux/iop32x/base-files/etc/config/network
deleted file mode 100644
index 1d9b55b2d..000000000
--- a/target/linux/iop32x/base-files/etc/config/network
+++ /dev/null
@@ -1,11 +0,0 @@
-# Network configuration file
-
-config interface loopback
-	option ifname	lo
-	option proto	static
-	option ipaddr	127.0.0.1
-	option netmask	255.0.0.0
-
-config interface lan
-	option ifname	eth0
-	option proto	dhcp
diff --git a/target/linux/iop32x/config-default b/target/linux/iop32x/config-default
deleted file mode 100644
index 81d2e2ba3..000000000
--- a/target/linux/iop32x/config-default
+++ /dev/null
@@ -1,124 +0,0 @@
-# CONFIG_AEABI is not set
-CONFIG_ALIGNMENT_TRAP=y
-CONFIG_ARCH_IOP32X=y
-# CONFIG_ARCH_IQ31244 is not set
-# CONFIG_ARCH_IQ80321 is not set
-CONFIG_ARCH_REQUIRE_GPIOLIB=y
-# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
-# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARM_L1_CACHE_SHIFT=5
-# CONFIG_ARM_THUMB is not set
-CONFIG_ARM=y
-# CONFIG_ARPD is not set
-CONFIG_ATA=m
-CONFIG_BITREVERSE=y
-CONFIG_CFG80211_DEFAULT_PS_VALUE=0
-CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"
-CONFIG_CPU_32v5=y
-CONFIG_CPU_32=y
-CONFIG_CPU_ABRT_EV5T=y
-CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_CP15_MMU=y
-CONFIG_CPU_CP15=y
-CONFIG_CPU_PABRT_LEGACY=y
-CONFIG_CPU_TLB_V4WBI=y
-CONFIG_CPU_XSCALE=y
-CONFIG_CRC16=y
-# CONFIG_DEBUG_USER is not set
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DEVPORT=y
-CONFIG_DLCI=m
-CONFIG_DLCI_MAX=8
-# CONFIG_DM9000 is not set
-CONFIG_DMADEVICES=y
-CONFIG_DMA_ENGINE=y
-CONFIG_DNOTIFY=y
-# CONFIG_DSCC4 is not set
-CONFIG_E1000=y
-# CONFIG_FARSYNC is not set
-# CONFIG_FPE_FASTFPE is not set
-# CONFIG_FPE_NWFPE is not set
-CONFIG_FRAME_POINTER=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-CONFIG_GPIOLIB=y
-# CONFIG_HAMRADIO is not set
-CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAVE_AOUT=y
-CONFIG_HAVE_ARCH_KGDB=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_HAVE_IDE=y
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_LZO=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_HAVE_OPROFILE=y
-CONFIG_HDLC_CISCO=m
-CONFIG_HDLC_FR=m
-CONFIG_HDLC=m
-CONFIG_HDLC_PPP=m
-CONFIG_HDLC_RAW=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
-CONFIG_HWMON=y
-CONFIG_HW_RANDOM=y
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_CHARDEV=y
-# CONFIG_I2C_IOP3XX is not set
-CONFIG_I2C=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INTEL_IOP_ADMA=y
-# CONFIG_IOP_WATCHDOG is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-# CONFIG_IWMMXT is not set
-# CONFIG_LEDS_GPIO is not set
-CONFIG_LEGACY_PTY_COUNT=256
-CONFIG_LEGACY_PTYS=y
-# CONFIG_MACH_EM7210 is not set
-# CONFIG_MACH_GLANTANK is not set
-CONFIG_MACH_N2100=y
-# CONFIG_MTD_CFI_AMDSTD is not set
-CONFIG_MTD_REDBOOT_PARTS=y
-CONFIG_NET_DMA=y
-CONFIG_NLS=m
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_PCI=y
-CONFIG_PLAT_IOP=y
-CONFIG_R8169_VLAN=y
-CONFIG_R8169=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_PCF8563=y
-CONFIG_RTC_DRV_X1205=y
-CONFIG_SCSI=m
-# CONFIG_SCSI_MULTI_LUN is not set
-# CONFIG_SERIAL_8250_EXTENDED is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4096
-CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-# CONFIG_TREE_PREEMPT_RCU is not set
-CONFIG_TREE_RCU=y
-CONFIG_UID16=y
-CONFIG_USB_EHCI_HCD=m
-CONFIG_USB=m
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_UHCI_HCD=m
-CONFIG_VECTORS_BASE=0xffff0000
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_WAN=y
-CONFIG_XSCALE_PMU=y
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/iop32x/image/Makefile b/target/linux/iop32x/image/Makefile
deleted file mode 100644
index 160067386..000000000
--- a/target/linux/iop32x/image/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# 
-# Copyright (C) 2007-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/image.mk
-
-define Image/Prepare
-	cp $(LINUX_DIR)/arch/arm/boot/zImage $(KDIR)/zImage
-endef
-
-define Image/BuildKernel
-	cp $(KDIR)/zImage $(BIN_DIR)/$(IMG_PREFIX)-zImage
-#
-# XXX - FIXME
-#
-#	BIN_DIR=$(BIN_DIR) IMG_PREFIX="$(IMG_PREFIX)" $(TOPDIR)/scripts/arm-magic.sh
-endef
-
-define Image/Build
-	$(call Image/Build/$(1),$(1))
-endef
-
-define Image/Build/jffs2-64k
-	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(1).img bs=65536 conv=sync
-endef
-
-define Image/Build/jffs2-128k
-	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(1).img bs=131072 conv=sync
-	$(call Image/Build/slug,$(1))
-endef
-
-define Image/Build/squashfs
-    $(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
-	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(1).img bs=131072 conv=sync
-	$(call Image/Build/slug,$(1))
-endef
-
-$(eval $(call BuildImage))
diff --git a/target/linux/ixp4xx/config-2.6.32 b/target/linux/ixp4xx/config-2.6.32
index 0b3325275..997768632 100644
--- a/target/linux/ixp4xx/config-2.6.32
+++ b/target/linux/ixp4xx/config-2.6.32
@@ -32,7 +32,6 @@ CONFIG_CPU_IXP46X=y
 CONFIG_CPU_PABRT_NOIFAR=y
 CONFIG_CPU_TLB_V4WBI=y
 CONFIG_CPU_XSCALE=y
-CONFIG_CRC16=y
 # CONFIG_DEBUG_USER is not set
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DEVPORT=y
diff --git a/target/linux/kirkwood/config-default b/target/linux/kirkwood/config-default
index 3f6e03da3..5af395754 100644
--- a/target/linux/kirkwood/config-default
+++ b/target/linux/kirkwood/config-default
@@ -31,7 +31,6 @@ CONFIG_CPU_IDLE_GOV_MENU=y
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_PABRT_NOIFAR=y
 CONFIG_CPU_TLB_FEROCEON=y
-CONFIG_CRC16=y
 # CONFIG_DCB is not set
 # CONFIG_DEBUG_USER is not set
 CONFIG_DEVPORT=y
diff --git a/target/linux/malta/Makefile b/target/linux/malta/Makefile
deleted file mode 100644
index d6372df24..000000000
--- a/target/linux/malta/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Copyright (C) 2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-BOARD:=malta
-BOARDNAME:=MIPS Malta CoreLV board (qemu)
-CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -funit-at-a-time
-SUBTARGETS:=le be
-INITRAMFS_EXTRA_FILES:=
-
-LINUX_VERSION:=2.6.32.10
-
-include $(INCLUDE_DIR)/target.mk
-
-DEFAULT_PACKAGES += wpad-mini kmod-mac80211-hwsim
-
-$(eval $(call BuildTarget))
diff --git a/target/linux/malta/README b/target/linux/malta/README
deleted file mode 100644
index 412996e65..000000000
--- a/target/linux/malta/README
+++ /dev/null
@@ -1,13 +0,0 @@
-This Malta target is intended to be used with the Qemu emulator. It can be used
-to prototype an OpenWrt firmware for MIPS processors. One could also use it to
-troubleshoot MIPS applications without access to real hardware.
-
-To use the images built by OpenWrt with qemu, use the following commands:
-
-For the little-endian image:
-qemu-system-mipsel -kernel bin/malta/openwrt-malta-le-vmlinux.elf -nographic
-
-For the big-endian image:
-qemu-system-mips -kernel bin/malta/openwrt-malta-be-vmlinux.elf -nographic
-
-and enjoy the system bootin.
diff --git a/target/linux/malta/image/Makefile b/target/linux/malta/image/Makefile
deleted file mode 100644
index b09bfa349..000000000
--- a/target/linux/malta/image/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/image.mk
-
-define Image/BuildKernel
-	cp $(KDIR)/vmlinux.elf $(BIN_DIR)/$(IMG_PREFIX)-vmlinux.elf
-endef
-
-define Image/Build/squashfs
-    $(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
-endef
-
-define Image/Build
-	$(call Image/Build/$(1))
-	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) bs=128k conv=sync
-endef
-
-$(eval $(call BuildImage))
diff --git a/target/linux/mpc52xx/Makefile b/target/linux/mpc52xx/Makefile
deleted file mode 100644
index 8e2a8cdaa..000000000
--- a/target/linux/mpc52xx/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2009 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-ARCH:=powerpc
-BOARD:=mpc52xx
-BOARDNAME:=Freescale MPC52xx
-FEATURES:=tgz ext2
-
-LINUX_VERSION:=2.6.30.10
-
-include $(INCLUDE_DIR)/target.mk
-
-define Target/Description
-	Build images for the Freescale MPC52xx based boards.
-endef
-
-$(eval $(call BuildTarget))
diff --git a/target/linux/mpc52xx/base-files/etc/inittab b/target/linux/mpc52xx/base-files/etc/inittab
deleted file mode 100644
index 68b433150..000000000
--- a/target/linux/mpc52xx/base-files/etc/inittab
+++ /dev/null
@@ -1,3 +0,0 @@
-::sysinit:/etc/init.d/rcS S boot
-::shutdown:/etc/init.d/rcS K stop
-ttyPSC0::askfirst:/bin/ash --login
diff --git a/target/linux/mpc52xx/config-2.6.30 b/target/linux/mpc52xx/config-2.6.30
deleted file mode 100644
index 20f2702a0..000000000
--- a/target/linux/mpc52xx/config-2.6.30
+++ /dev/null
@@ -1,253 +0,0 @@
-# CONFIG_40x is not set
-# CONFIG_44x is not set
-CONFIG_6xx=y
-# CONFIG_ADVANCED_OPTIONS is not set
-# CONFIG_ALTIVEC is not set
-# CONFIG_AMIGAONE is not set
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-CONFIG_ARCH_HAS_ILOG2_U32=y
-CONFIG_ARCH_HAS_WALK_MEMORY=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-CONFIG_ARCH_REQUIRE_GPIOLIB=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_ARCH_SUPPORTS_MSI=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-# CONFIG_ARPD is not set
-CONFIG_AUDIT_ARCH=y
-# CONFIG_BINARY_PRINTF is not set
-CONFIG_BITREVERSE=y
-# CONFIG_BOOTX_TEXT is not set
-CONFIG_BOUNCE=y
-# CONFIG_BRIDGE is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_CGROUP_SCHED is not set
-CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="console=ttyPSC0,115200"
-CONFIG_COMPAT_BRK=y
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_DES=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_WORKQUEUE=y
-# CONFIG_CRYPTO_ZLIB is not set
-CONFIG_DEFAULT_AS=y
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
-CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_DEFAULT_UIMAGE is not set
-CONFIG_DEVKMEM=y
-CONFIG_DEVPORT=y
-CONFIG_DNOTIFY=y
-CONFIG_DTC=y
-# CONFIG_E200 is not set
-CONFIG_EARLY_PRINTK=y
-CONFIG_ELF_CORE=y
-# CONFIG_EMBEDDED6xx is not set
-CONFIG_ENABLE_MUST_CHECK=y
-# CONFIG_EPOLL is not set
-CONFIG_FEC_MPC52xx_MDIO=y
-CONFIG_FEC_MPC52xx=y
-CONFIG_FORCE_MAX_ZONEORDER=11
-CONFIG_FREEZER=y
-# CONFIG_FSL_ULI1575 is not set
-# CONFIG_FW_LOADER is not set
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_GPIO=y
-# CONFIG_GENERIC_IOMAP is not set
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_NVRAM=y
-# CONFIG_GENERIC_TBSYNC is not set
-CONFIG_GENERIC_TIME_VSYSCALL=y
-# CONFIG_GEN_RTC_X is not set
-CONFIG_GEN_RTC=y
-CONFIG_GPIOLIB=y
-CONFIG_GROUP_SCHED=y
-# CONFIG_HAMRADIO is not set
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-# CONFIG_HAS_RAPIDIO is not set
-CONFIG_HAVE_ARCH_KGDB=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
-CONFIG_HAVE_IDE=y
-CONFIG_HAVE_IOREMAP_PROT=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_HAVE_LMB=y
-CONFIG_HAVE_MLOCKED_PAGE_BIT=y
-CONFIG_HAVE_MLOCK=y
-CONFIG_HAVE_OPROFILE=y
-# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-# CONFIG_HVC_RTAS is not set
-# CONFIG_HVC_UDBG is not set
-# CONFIG_HW_RANDOM is not set
-# CONFIG_HZ_100 is not set
-CONFIG_HZ=250
-CONFIG_HZ_250=y
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INOTIFY_USER=y
-CONFIG_INOTIFY=y
-# CONFIG_IOMMU_HELPER is not set
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_IP_ADVANCED_ROUTER is not set
-# CONFIG_IPIC is not set
-# CONFIG_IP_MROUTE is not set
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_DHCP=y
-# CONFIG_IP_PNP_RARP is not set
-CONFIG_IP_PNP=y
-CONFIG_IRQ_PER_CPU=y
-# CONFIG_IRQSTACKS is not set
-CONFIG_ISA_DMA_API=y
-CONFIG_KERNEL_START=0xc0000000
-CONFIG_LEGACY_PTY_COUNT=256
-CONFIG_LEGACY_PTYS=y
-CONFIG_LOWMEM_SIZE=0x30000000
-CONFIG_LXT_PHY=y
-CONFIG_MIGRATION=y
-# CONFIG_MII is not set
-# CONFIG_MMIO_NVRAM is not set
-# CONFIG_MPC5121_ADS is not set
-# CONFIG_MPC5121_GENERIC is not set
-# CONFIG_MPIC is not set
-# CONFIG_MPIC_WEIRD is not set
-# CONFIG_MTD is not set
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NET_PCI is not set
-# CONFIG_NET_SCHED is not set
-# CONFIG_NEW_LEDS is not set
-CONFIG_OF_DEVICE=y
-CONFIG_OF_GPIO=y
-CONFIG_OF=y
-# CONFIG_PACKET_MMAP is not set
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PAGE_OFFSET=0xc0000000
-# CONFIG_PARTITION_ADVANCED is not set
-# CONFIG_PATA_MPC52xx is not set
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
-# CONFIG_PCIEPORTBUS is not set
-CONFIG_PCI_LEGACY=y
-CONFIG_PHYLIB=y
-CONFIG_PHYSICAL_START=0x00000000
-# CONFIG_PM_DEBUG is not set
-CONFIG_PM_SLEEP=y
-CONFIG_PM=y
-# CONFIG_PPC_16K_PAGES is not set
-# CONFIG_PPC_256K_PAGES is not set
-CONFIG_PPC32=y
-CONFIG_PPC_4K_PAGES=y
-# CONFIG_PPC64 is not set
-# CONFIG_PPC_64K_PAGES is not set
-# CONFIG_PPC_82xx is not set
-# CONFIG_PPC_83xx is not set
-# CONFIG_PPC_85xx is not set
-# CONFIG_PPC_86xx is not set
-# CONFIG_PPC_8xx is not set
-# CONFIG_PPC_970_NAP is not set
-CONFIG_PPC_BESTCOMM_FEC=y
-CONFIG_PPC_BESTCOMM=y
-CONFIG_PPC_BOOK3S=y
-# CONFIG_PPC_CELL is not set
-# CONFIG_PPC_CELL_NATIVE is not set
-# CONFIG_PPC_CHRP is not set
-CONFIG_PPC_CLOCK=y
-# CONFIG_PPC_DCR_MMIO is not set
-# CONFIG_PPC_DCR_NATIVE is not set
-# CONFIG_PPC_EARLY_DEBUG is not set
-CONFIG_PPC_EFIKA=y
-CONFIG_PPC_FPU=y
-# CONFIG_PPC_I8259 is not set
-# CONFIG_PPC_INDIRECT_IO is not set
-# CONFIG_PPC_INDIRECT_PCI is not set
-CONFIG_PPC_LIB_RHEAP=y
-# CONFIG_PPC_LITE5200 is not set
-# CONFIG_PPC_MEDIA5200 is not set
-# CONFIG_PPC_MM_SLICES is not set
-# CONFIG_PPC_MPC106 is not set
-# CONFIG_PPC_MPC5200_BUGFIX is not set
-CONFIG_PPC_MPC5200_GPIO=y
-# CONFIG_PPC_MPC5200_SIMPLE is not set
-CONFIG_PPC_MPC52xx=y
-CONFIG_PPC_NATIVE=y
-CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
-CONFIG_PPC_OF=y
-CONFIG_PPC_PCI_CHOICE=y
-# CONFIG_PPC_PMAC is not set
-CONFIG_PPC_RTAS=y
-CONFIG_PPC_STD_MMU_32=y
-CONFIG_PPC_STD_MMU=y
-# CONFIG_PPC_UDBG_16550 is not set
-CONFIG_PPC=y
-# CONFIG_PQ2ADS is not set
-CONFIG_PRINT_STACK_DEPTH=64
-CONFIG_PROC_DEVICETREE=y
-CONFIG_PROC_PAGE_MONITOR=y
-# CONFIG_RD_LZMA is not set
-# CONFIG_RTAS_ERROR_LOGGING is not set
-CONFIG_RTAS_PROC=y
-# CONFIG_RT_GROUP_SCHED is not set
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_SCHED_HRTICK=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-# CONFIG_SCSI_DMA is not set
-CONFIG_SECCOMP=y
-# CONFIG_SERIAL_8250 is not set
-CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
-CONFIG_SERIAL_MPC52xx_CONSOLE=y
-CONFIG_SERIAL_MPC52xx=y
-# CONFIG_SLAB is not set
-# CONFIG_SLOW_WORK is not set
-CONFIG_SLUB=y
-# CONFIG_SPI_MPC52xx_PSC is not set
-# CONFIG_SQUASHFS is not set
-# CONFIG_STRIP_ASM_SYMS is not set
-CONFIG_SUSPEND_FREEZER=y
-CONFIG_SUSPEND=y
-# CONFIG_SYSCTL_SYSCALL is not set
-CONFIG_SYSFS_DEPRECATED_V2=y
-CONFIG_SYSFS_DEPRECATED=y
-CONFIG_TASK_SIZE=0xc0000000
-# CONFIG_TAU is not set
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_TRACING_SUPPORT=y
-# CONFIG_UDBG_RTAS_CONSOLE is not set
-CONFIG_UNEVICTABLE_LRU=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USER_SCHED=y
-CONFIG_VIDEO_OUTPUT_CONTROL=m
-# CONFIG_VLAN_8021Q is not set
-CONFIG_VM_EVENT_COUNTERS=y
-# CONFIG_WATCHDOG is not set
-# CONFIG_WLAN_80211 is not set
-CONFIG_WORD_SIZE=32
diff --git a/target/linux/mpc52xx/image/Makefile b/target/linux/mpc52xx/image/Makefile
deleted file mode 100644
index b63a78dc5..000000000
--- a/target/linux/mpc52xx/image/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Copyright (C) 2009-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/image.mk
-
-define Image/Prepare
-	cp $(LINUX_DIR)/arch/powerpc/boot/zImage $(KDIR)/zImage
-endef
-
-define Image/BuildKernel
-	cp $(KDIR)/zImage $(BIN_DIR)/$(IMG_PREFIX)-zImage
-endef
-
-define Image/Build/ext2
-	cp $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-ext2.img
-endef
-
-define Image/Build
-	$(call Image/Build/$(1),$(1))
-endef
-
-$(eval $(call BuildImage))
diff --git a/target/linux/mpc83xx/Makefile b/target/linux/mpc83xx/Makefile
deleted file mode 100644
index 5598b5b11..000000000
--- a/target/linux/mpc83xx/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright (C) 2007-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-ARCH:=powerpc
-BOARD:=mpc83xx
-BOARDNAME:=Freescale MPC83xx
-FEATURES:=squashfs tgz broken
-
-LINUX_VERSION:=2.6.31.12
-
-include $(INCLUDE_DIR)/target.mk
-
-DEFAULT_PACKAGES += kmod-via-velocity
-
-define Target/Description
-	Build firmware images for Freescale MPC83xx based boards (eg. RouterBoard 600).
-endef
-
-$(eval $(call BuildTarget))
diff --git a/target/linux/mpc83xx/base-files/etc/inittab b/target/linux/mpc83xx/base-files/etc/inittab
deleted file mode 100644
index 7989a7f60..000000000
--- a/target/linux/mpc83xx/base-files/etc/inittab
+++ /dev/null
@@ -1,4 +0,0 @@
-::sysinit:/etc/init.d/rcS S boot
-::shutdown:/etc/init.d/rcS K stop
-ttyS0::askfirst:/bin/ash --login
-ttyS1::askfirst:/bin/ash --login
diff --git a/target/linux/mpc83xx/config-2.6.32 b/target/linux/mpc83xx/config-2.6.32
deleted file mode 100644
index 15e121a58..000000000
--- a/target/linux/mpc83xx/config-2.6.32
+++ /dev/null
@@ -1,222 +0,0 @@
-# CONFIG_40x is not set
-# CONFIG_44x is not set
-CONFIG_6xx=y
-# CONFIG_8xxx_WDT is not set
-# CONFIG_ADVANCED_OPTIONS is not set
-# CONFIG_ALTIVEC is not set
-# CONFIG_AMIGAONE is not set
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-CONFIG_ARCH_HAS_ILOG2_U32=y
-CONFIG_ARCH_HAS_WALK_MEMORY=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-CONFIG_ARCH_REQUIRE_GPIOLIB=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_ARCH_SUPPORTS_MSI=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-# CONFIG_ASP834x is not set
-CONFIG_ATA=y
-CONFIG_AUDIT_ARCH=y
-CONFIG_BITREVERSE=y
-# CONFIG_BOOTX_TEXT is not set
-CONFIG_BOUNCE=y
-CONFIG_BUBBATWO=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CFG80211_DEFAULT_PS_VALUE=0
-CONFIG_CMDLINE="console=ttyS0,115200"
-CONFIG_CMDLINE_BOOL=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DEFAULT_UIMAGE=y
-CONFIG_DEVPORT=y
-# CONFIG_DMA_API_DEBUG is not set
-CONFIG_DTC=y
-# CONFIG_E200 is not set
-CONFIG_EARLY_PRINTK=y
-# CONFIG_EMBEDDED6xx is not set
-CONFIG_EXTRA_TARGETS="uImage.fit.mpc8377_wlan"
-CONFIG_FORCE_MAX_ZONEORDER=11
-# CONFIG_FSL_EMB_PERFMON is not set
-CONFIG_FSL_PCI=y
-CONFIG_FSL_PQ_MDIO=y
-CONFIG_FSL_SOC=y
-# CONFIG_FSL_ULI1575 is not set
-# CONFIG_FSNOTIFY is not set
-CONFIG_GENERIC_ATOMIC64=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-# CONFIG_GENERIC_IOMAP is not set
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_NVRAM=y
-# CONFIG_GENERIC_TBSYNC is not set
-CONFIG_GENERIC_TIME_VSYSCALL=y
-# CONFIG_GEN_RTC is not set
-CONFIG_GIANFAR=y
-CONFIG_GPIOLIB=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-# CONFIG_HAS_RAPIDIO is not set
-CONFIG_HAVE_ARCH_KGDB=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_API_DEBUG=y
-CONFIG_HAVE_DMA_ATTRS=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
-CONFIG_HAVE_IDE=y
-CONFIG_HAVE_IOREMAP_PROT=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_HAVE_LMB=y
-CONFIG_HAVE_OPROFILE=y
-CONFIG_HAVE_PERF_EVENTS=y
-# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-CONFIG_HW_RANDOM=y
-CONFIG_HZ=250
-# CONFIG_HZ_100 is not set
-CONFIG_HZ_250=y
-CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_IOMMU_HELPER is not set
-CONFIG_IPIC=y
-# CONFIG_IRQSTACKS is not set
-CONFIG_IRQ_PER_CPU=y
-CONFIG_ISA_DMA_API=y
-CONFIG_KERNEL_START=0xc0000000
-# CONFIG_KMETER1 is not set
-# CONFIG_LEDS_GPIO is not set
-CONFIG_LOWMEM_SIZE=0x30000000
-CONFIG_MAX_ACTIVE_REGIONS=32
-# CONFIG_MMIO_NVRAM is not set
-# CONFIG_MPC5121_ADS is not set
-# CONFIG_MPC5121_GENERIC is not set
-CONFIG_MPC831x_RDB=y
-# CONFIG_MPC832x_MDS is not set
-# CONFIG_MPC832x_RDB is not set
-# CONFIG_MPC834x_ITX is not set
-# CONFIG_MPC834x_MDS is not set
-# CONFIG_MPC836x_MDS is not set
-# CONFIG_MPC836x_RDK is not set
-# CONFIG_MPC837x_MDS is not set
-CONFIG_MPC837x_RDB=y
-# CONFIG_MPC8xxx_GPIO is not set
-# CONFIG_MPIC is not set
-# CONFIG_MPIC_WEIRD is not set
-CONFIG_MTD_NAND=y
-# CONFIG_MTD_NAND_FSL_ELBC is not set
-# CONFIG_MTD_NAND_FSL_UPM is not set
-CONFIG_MTD_NAND_RB_PPC=y
-CONFIG_MTD_OF_PARTS=y
-CONFIG_MTD_PHYSMAP_OF=y
-# CONFIG_MV643XX_ETH is not set
-# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
-CONFIG_OF=y
-CONFIG_OF_DEVICE=y
-CONFIG_OF_GPIO=y
-CONFIG_OF_MDIO=y
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PAGE_OFFSET=0xc0000000
-CONFIG_PATA_RB_PPC=m
-CONFIG_PCI=y
-CONFIG_PCIEAER=y
-# CONFIG_PCIEAER_INJECT is not set
-CONFIG_PCIEPORTBUS=y
-# CONFIG_PCIE_ECRC is not set
-CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
-CONFIG_PCI_DOMAINS=y
-# CONFIG_PERF_COUNTERS is not set
-# CONFIG_PERF_EVENTS is not set
-CONFIG_PHYLIB=y
-CONFIG_PHYSICAL_START=0x00000000
-CONFIG_PPC=y
-CONFIG_PPC32=y
-# CONFIG_PPC64 is not set
-# CONFIG_PPC_82xx is not set
-CONFIG_PPC_83xx=y
-# CONFIG_PPC_85xx is not set
-# CONFIG_PPC_86xx is not set
-# CONFIG_PPC_8xx is not set
-# CONFIG_PPC_970_NAP is not set
-CONFIG_PPC_BOOK3S=y
-CONFIG_PPC_BOOK3S_32=y
-# CONFIG_PPC_CELL is not set
-# CONFIG_PPC_CELL_NATIVE is not set
-# CONFIG_PPC_CHRP is not set
-# CONFIG_PPC_CLOCK is not set
-# CONFIG_PPC_DCR_MMIO is not set
-# CONFIG_PPC_DCR_NATIVE is not set
-CONFIG_PPC_DISABLE_WERROR=y
-# CONFIG_PPC_EARLY_DEBUG is not set
-CONFIG_PPC_FPU=y
-CONFIG_PPC_HAVE_PMU_SUPPORT=y
-# CONFIG_PPC_I8259 is not set
-# CONFIG_PPC_INDIRECT_IO is not set
-CONFIG_PPC_INDIRECT_PCI=y
-CONFIG_PPC_LIB_RHEAP=y
-# CONFIG_PPC_MM_SLICES is not set
-# CONFIG_PPC_MPC106 is not set
-# CONFIG_PPC_MPC52xx is not set
-CONFIG_PPC_MPC831x=y
-CONFIG_PPC_MPC834x=y
-CONFIG_PPC_MPC837x=y
-CONFIG_PPC_OF=y
-CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
-CONFIG_PPC_PCI_CHOICE=y
-# CONFIG_PPC_PMAC is not set
-# CONFIG_PPC_RTAS is not set
-CONFIG_PPC_STD_MMU=y
-CONFIG_PPC_STD_MMU_32=y
-CONFIG_PPC_UDBG_16550=y
-# CONFIG_PQ2ADS is not set
-CONFIG_PRINT_STACK_DEPTH=64
-CONFIG_PROC_DEVICETREE=y
-CONFIG_QE_GPIO=y
-CONFIG_QUICC_ENGINE=y
-CONFIG_RB_IOMAP=y
-CONFIG_RB_PPC=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-# CONFIG_SATA_FSL is not set
-# CONFIG_SBC834x is not set
-CONFIG_SCHED_HRTICK=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_SCSI=y
-# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-CONFIG_SERIAL_8250_EXTENDED=y
-# CONFIG_SERIAL_8250_MANY_PORTS is not set
-# CONFIG_SERIAL_8250_RSA is not set
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-CONFIG_SERIAL_OF_PLATFORM=y
-# CONFIG_SERIAL_QE is not set
-# CONFIG_SWIOTLB is not set
-CONFIG_TASK_SIZE=0xc0000000
-# CONFIG_TAU is not set
-# CONFIG_TREE_PREEMPT_RCU is not set
-CONFIG_TREE_RCU=y
-# CONFIG_UCC_GETH is not set
-CONFIG_VITESSE_PHY=y
-CONFIG_VITESSE_PHY_8601_SKEW=y
-CONFIG_WORD_SIZE=32
-# CONFIG_XILINX_EMACLITE is not set
-# CONFIG_YAFFS_9BYTE_TAGS is not set
-# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
-CONFIG_YAFFS_AUTO_YAFFS2=y
-# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
-# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
-# CONFIG_YAFFS_DOES_ECC is not set
-CONFIG_YAFFS_FS=y
-CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
-CONFIG_YAFFS_YAFFS1=y
-CONFIG_YAFFS_YAFFS2=y
diff --git a/target/linux/mpc83xx/config-default b/target/linux/mpc83xx/config-default
deleted file mode 100644
index eb1889f5b..000000000
--- a/target/linux/mpc83xx/config-default
+++ /dev/null
@@ -1,209 +0,0 @@
-# CONFIG_40x is not set
-# CONFIG_44x is not set
-CONFIG_6xx=y
-# CONFIG_8xxx_WDT is not set
-# CONFIG_ADVANCED_OPTIONS is not set
-# CONFIG_ALTIVEC is not set
-# CONFIG_AMIGAONE is not set
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-CONFIG_ARCH_HAS_ILOG2_U32=y
-CONFIG_ARCH_HAS_WALK_MEMORY=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-CONFIG_ARCH_REQUIRE_GPIOLIB=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_ARCH_SUPPORTS_MSI=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-# CONFIG_ASP834x is not set
-CONFIG_ATA=y
-CONFIG_AUDIT_ARCH=y
-CONFIG_BITREVERSE=y
-# CONFIG_BOOTX_TEXT is not set
-CONFIG_BOUNCE=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="console=ttyS0,115200"
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DEFAULT_UIMAGE=y
-CONFIG_DEVPORT=y
-CONFIG_DTC=y
-# CONFIG_E200 is not set
-CONFIG_EARLY_PRINTK=y
-# CONFIG_EMBEDDED6xx is not set
-CONFIG_EXTRA_TARGETS="uImage.fit.mpc8377_wlan"
-CONFIG_FORCE_MAX_ZONEORDER=11
-# CONFIG_FSL_EMB_PERFMON is not set
-CONFIG_FSL_PCI=y
-CONFIG_FSL_PQ_MDIO=y
-CONFIG_FSL_SOC=y
-# CONFIG_FSL_ULI1575 is not set
-# CONFIG_FSNOTIFY is not set
-CONFIG_GENERIC_ATOMIC64=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-# CONFIG_GENERIC_IOMAP is not set
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_NVRAM=y
-# CONFIG_GENERIC_TBSYNC is not set
-CONFIG_GENERIC_TIME_VSYSCALL=y
-# CONFIG_GEN_RTC is not set
-CONFIG_GIANFAR=y
-CONFIG_GPIOLIB=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-# CONFIG_HAS_RAPIDIO is not set
-CONFIG_HAVE_ARCH_KGDB=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
-CONFIG_HAVE_IDE=y
-CONFIG_HAVE_IOREMAP_PROT=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_HAVE_LMB=y
-CONFIG_HAVE_OPROFILE=y
-CONFIG_HAVE_PERF_COUNTERS=y
-# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-CONFIG_HW_RANDOM=y
-# CONFIG_HZ_100 is not set
-CONFIG_HZ=250
-CONFIG_HZ_250=y
-CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_IOMMU_HELPER is not set
-CONFIG_IPIC=y
-CONFIG_IRQ_PER_CPU=y
-# CONFIG_IRQSTACKS is not set
-CONFIG_ISA_DMA_API=y
-CONFIG_KERNEL_START=0xc0000000
-# CONFIG_KMETER1 is not set
-# CONFIG_LEDS_GPIO is not set
-CONFIG_LOWMEM_SIZE=0x30000000
-CONFIG_MAC80211_DEFAULT_PS_VALUE=0
-# CONFIG_MMIO_NVRAM is not set
-# CONFIG_MPC5121_ADS is not set
-# CONFIG_MPC5121_GENERIC is not set
-# CONFIG_MPC831x_RDB is not set
-# CONFIG_MPC832x_MDS is not set
-# CONFIG_MPC832x_RDB is not set
-# CONFIG_MPC834x_ITX is not set
-# CONFIG_MPC834x_MDS is not set
-# CONFIG_MPC836x_MDS is not set
-# CONFIG_MPC836x_RDK is not set
-# CONFIG_MPC837x_MDS is not set
-CONFIG_MPC837x_RDB=y
-# CONFIG_MPC8xxx_GPIO is not set
-# CONFIG_MPIC is not set
-# CONFIG_MPIC_WEIRD is not set
-# CONFIG_MTD_NAND_FSL_ELBC is not set
-# CONFIG_MTD_NAND_FSL_UPM is not set
-CONFIG_MTD_NAND_RB_PPC=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_OF_PARTS=y
-CONFIG_MTD_PHYSMAP_OF=y
-# CONFIG_MV643XX_ETH is not set
-CONFIG_OF_DEVICE=y
-CONFIG_OF_GPIO=y
-CONFIG_OF_MDIO=y
-CONFIG_OF=y
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PAGE_OFFSET=0xc0000000
-CONFIG_PATA_RB_PPC=m
-CONFIG_PCI=y
-CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
-CONFIG_PCI_DOMAINS=y
-# CONFIG_PCIEAER_INJECT is not set
-CONFIG_PCIEAER=y
-# CONFIG_PCIE_ECRC is not set
-CONFIG_PCIEPORTBUS=y
-# CONFIG_PERF_COUNTERS is not set
-CONFIG_PHYLIB=y
-CONFIG_PHYSICAL_START=0x00000000
-CONFIG_PPC32=y
-# CONFIG_PPC64 is not set
-# CONFIG_PPC_82xx is not set
-CONFIG_PPC_83xx=y
-# CONFIG_PPC_85xx is not set
-# CONFIG_PPC_86xx is not set
-# CONFIG_PPC_8xx is not set
-# CONFIG_PPC_970_NAP is not set
-CONFIG_PPC_BOOK3S_32=y
-CONFIG_PPC_BOOK3S=y
-# CONFIG_PPC_CELL is not set
-# CONFIG_PPC_CELL_NATIVE is not set
-# CONFIG_PPC_CHRP is not set
-# CONFIG_PPC_CLOCK is not set
-# CONFIG_PPC_DCR_MMIO is not set
-# CONFIG_PPC_DCR_NATIVE is not set
-CONFIG_PPC_DISABLE_WERROR=y
-# CONFIG_PPC_EARLY_DEBUG is not set
-CONFIG_PPC_FPU=y
-CONFIG_PPC_HAVE_PMU_SUPPORT=y
-# CONFIG_PPC_I8259 is not set
-# CONFIG_PPC_INDIRECT_IO is not set
-CONFIG_PPC_INDIRECT_PCI=y
-CONFIG_PPC_LIB_RHEAP=y
-# CONFIG_PPC_MM_SLICES is not set
-# CONFIG_PPC_MPC106 is not set
-# CONFIG_PPC_MPC52xx is not set
-CONFIG_PPC_MPC834x=y
-CONFIG_PPC_MPC837x=y
-CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
-CONFIG_PPC_OF=y
-CONFIG_PPC_PCI_CHOICE=y
-# CONFIG_PPC_PMAC is not set
-# CONFIG_PPC_RTAS is not set
-CONFIG_PPC_STD_MMU_32=y
-CONFIG_PPC_STD_MMU=y
-CONFIG_PPC_UDBG_16550=y
-CONFIG_PPC=y
-# CONFIG_PQ2ADS is not set
-CONFIG_PRINT_STACK_DEPTH=64
-CONFIG_PROC_DEVICETREE=y
-CONFIG_QE_GPIO=y
-CONFIG_QUICC_ENGINE=y
-CONFIG_RB_IOMAP=y
-CONFIG_RB_PPC=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-# CONFIG_SATA_FSL is not set
-# CONFIG_SBC834x is not set
-CONFIG_SCHED_HRTICK=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_SCSI=y
-# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-CONFIG_SERIAL_8250_EXTENDED=y
-# CONFIG_SERIAL_8250_MANY_PORTS is not set
-# CONFIG_SERIAL_8250_RSA is not set
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-CONFIG_SERIAL_OF_PLATFORM=y
-# CONFIG_SERIAL_QE is not set
-# CONFIG_SWIOTLB is not set
-CONFIG_TASK_SIZE=0xc0000000
-# CONFIG_TAU is not set
-# CONFIG_UCC_GETH is not set
-CONFIG_WORD_SIZE=32
-# CONFIG_YAFFS_9BYTE_TAGS is not set
-# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
-CONFIG_YAFFS_AUTO_YAFFS2=y
-# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
-# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
-# CONFIG_YAFFS_DOES_ECC is not set
-CONFIG_YAFFS_FS=y
-CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
-CONFIG_YAFFS_YAFFS1=y
-CONFIG_YAFFS_YAFFS2=y
diff --git a/target/linux/mpc83xx/files/scripts/mkits.sh b/target/linux/mpc83xx/files/scripts/mkits.sh
deleted file mode 100755
index 3b02b6950..000000000
--- a/target/linux/mpc83xx/files/scripts/mkits.sh
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/bin/bash
-#
-# Licensed under the terms of the GNU GPL License version 2 or later.
-#
-# Author: Peter Tyser <ptyser@xes-inc.com>
-#
-# U-Boot firmware supports the booting of images in the Flattened Image
-# Tree (FIT) format.  The FIT format uses a device tree structure to
-# describe a kernel image, device tree blob, ramdisk, etc.  This script
-# creates an Image Tree Source (.its file) which can be passed to the
-# 'mkimage' utility to generate an Image Tree Blob (.itb file).  The .itb
-# file can then be booted by U-Boot (or other bootloaders which support
-# FIT images).  See doc/uImage.FIT/howto.txt in U-Boot source code for
-# additional information on FIT images.
-#
-
-usage() {
-	echo "Usage: `basename $0` -A arch -C comp -a addr -e entry" \
-		"-v version -k kernel [-d dtb] -o its_file"
-	echo -e "\t-A ==> set architecture to 'arch'"
-	echo -e "\t-C ==> set compression type 'comp'"
-	echo -e "\t-a ==> set load address to 'addr' (hex)"
-	echo -e "\t-e ==> set entry point to 'entry' (hex)"
-	echo -e "\t-v ==> set kernel version to 'version'"
-	echo -e "\t-k ==> include kernel image 'kernel'"
-	echo -e "\t-d ==> include Device Tree Blob 'dtb'"
-	echo -e "\t-o ==> create output file 'its_file'"
-	exit 1
-}
-
-while getopts ":A:C:a:d:e:k:o:v:" OPTION
-do
-	case $OPTION in
-		A ) ARCH=$OPTARG;;
-		C ) COMPRESS=$OPTARG;;
-		a ) LOAD_ADDR=$OPTARG;;
-		d ) DTB=$OPTARG;;
-		e ) ENTRY_ADDR=$OPTARG;;
-		k ) KERNEL=$OPTARG;;
-		o ) OUTPUT=$OPTARG;;
-		v ) VERSION=$OPTARG;;
-		* ) echo "Invalid option passed to '$0' (options:$@)"
-		usage;;
-	esac
-done
-
-# Make sure user entered all required parameters
-if [ -z "${ARCH}" ] || [ -z "${COMPRESS}" ] || [ -z "${LOAD_ADDR}" ] || \
-	[ -z "${ENTRY_ADDR}" ] || [ -z "${VERSION}" ] || [ -z "${KERNEL}" ] || \
-	[ -z "${OUTPUT}" ]; then
-	usage
-fi
-
-# Create a default, fully populated DTS file
-DATA="/dts-v1/;
-
-/ {
-	description = \"Linux kernel ${VERSION}\";
-	#address-cells = <1>;
-
-	images {
-		kernel@1 {
-			description = \"Linux Kernel ${VERSION}\";
-			data = /incbin/(\"${KERNEL}\");
-			type = \"kernel\";
-			arch = \"${ARCH}\";
-			os = \"linux\";
-			compression = \"${COMPRESS}\";
-			load = <${LOAD_ADDR}>;
-			entry = <${ENTRY_ADDR}>;
-			hash@1 {
-				algo = \"crc32\";
-			};
-			hash@2 {
-				algo = \"sha1\";
-			};
-		};
-
-		fdt@1 { /* start fdt */
-			description = \"Flattened Device Tree blob\";
-			data = /incbin/(\"${DTB}\");
-			type = \"flat_dt\";
-			arch = \"${ARCH}\";
-			compression = \"none\";
-			hash@1 {
-				algo = \"crc32\";
-			};
-			hash@2 {
-				algo = \"sha1\";
-			};
-		}; /* end fdt */
-	};
-
-	configurations {
-		default = \"config@1\";
-		config@1 {
-			description = \"Default Linux kernel\";
-			kernel = \"kernel@1\";
-			fdt = \"fdt@1\";
-		};
-	};
-};"
-
-# Conditionally strip fdt information out of tree
-if [ -z "${DTB}" ]; then
-	DATA=`echo "$DATA" | sed '/start fdt/,/end fdt/d'`
-	DATA=`echo "$DATA" | sed '/fdt/d'`
-fi
-
-# Write .its file to disk
-echo "$DATA" > ${OUTPUT}
diff --git a/target/linux/mpc83xx/image/Makefile b/target/linux/mpc83xx/image/Makefile
deleted file mode 100644
index 9337016e0..000000000
--- a/target/linux/mpc83xx/image/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright (C) 2009-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/image.mk
-
-define Image/Prepare
-	$(LINUX_DIR)/scripts/dtc/dtc -O dtb -R 4 -S 0x20000 $(LINUX_DIR)/arch/powerpc/boot/dts/mpc8377_wlan.dts > $(BIN_DIR)/openwrt-mpc83xx-mpc8377_wlan.dtb
-endef
-
-define Image/BuildKernel
-	cp $(LINUX_DIR)/arch/powerpc/boot/dtbImage.rb600.elf $(BIN_DIR)/$(IMG_PREFIX)-rb600.elf
-	cp $(LINUX_DIR)/arch/powerpc/boot/uImage $(BIN_DIR)/$(IMG_PREFIX)-uImage
-endef
-
-define Image/Build
-	$(call Image/Build/$(1),$(1))
-endef
-
-define Image/Build/squashfs
-	$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
-	( \
-		dd if=$(LINUX_DIR)/arch/powerpc/boot/uImage bs=3072k conv=sync; \
-		dd if=$(KDIR)/root.$(1) bs=256k conv=sync; \
-	) > $(BIN_DIR)/$(IMG_PREFIX)-mpc8377_wlan-$(1).img
-endef
-
-$(eval $(call BuildImage))
diff --git a/target/linux/mpc83xx/patches-2.6.32/001-rb600.patch b/target/linux/mpc83xx/patches-2.6.32/001-rb600.patch
deleted file mode 100644
index 8e1a234c8..000000000
--- a/target/linux/mpc83xx/patches-2.6.32/001-rb600.patch
+++ /dev/null
@@ -1,1976 +0,0 @@
---- /dev/null
-+++ b/arch/powerpc/boot/dts/rb600.dts
-@@ -0,0 +1,242 @@
-+/*
-+ * RouterBOARD 600 series Device Tree Source
-+ *
-+ * Copyright 2009 Michael Guntsche <mike@it-loops.com>
-+ *
-+ * 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.
-+ */
-+
-+/dts-v1/;
-+
-+/ {
-+	model = "RB600";
-+	compatible = "MPC83xx";
-+	#address-cells = <1>;
-+	#size-cells = <1>;
-+
-+	aliases {
-+		ethernet0 = &enet0;
-+		ethernet1 = &enet1;
-+	};
-+
-+	chosen {
-+		linux,stdout-path = "/soc8343@e0000000/serial@4500";
-+	};
-+
-+	cpus {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		PowerPC,8343E@0 {
-+			device_type = "cpu";
-+			reg = <0x0>;
-+			d-cache-line-size = <0x20>;
-+			i-cache-line-size = <0x20>;
-+			d-cache-size = <0x8000>;
-+			i-cache-size = <0x8000>;
-+			timebase-frequency = <0x0000000>; // filled by the bootwrapper from the firmware blob
-+			clock-frequency = <0x00000000>; // filled by the bootwrapper from the firmware blob
-+		};
-+	};
-+
-+	memory {
-+		device_type = "memory";
-+		reg = <0x0 0x0000000>; // filled by the bootwrapper from the firmware blob
-+	};
-+
-+	cf@f9200000 {
-+		lb-timings = <0x5dc 0x3e8 0x1194 0x5dc 0x2af8>;
-+		interrupt-at-level = <0x0>;
-+		interrupt-parent = <&ipic>;
-+		interrupts = <0x16 0x8>;
-+		lbc_extra_divider = <0x1>;
-+		reg = <0xf9200000 0x200000>;
-+		device_type = "rb,cf";
-+	};
-+
-+	cf@f9000000 {
-+		lb-timings = <0x5dc 0x3e8 0x1194 0x5dc 0x2af8>;
-+		interrupt-at-level = <0x0>;
-+		interrupt-parent = <&ipic>;
-+		interrupts = <0x14 0x8>;
-+		lbc_extra_divider = <0x1>;
-+		reg = <0xf9000000 0x200000>;
-+		device_type = "rb,cf";
-+	};
-+
-+	flash {
-+		reg = <0xff800000 0x20000>;
-+	};
-+
-+	nnand {
-+		reg = <0xf0000000 0x1000>;
-+	};
-+
-+	nand {
-+		ale = <&gpio 0x6>;
-+		cle = <&gpio 0x5>;
-+		nce = <&gpio 0x4>;
-+		rdy = <&gpio 0x3>;
-+		reg = <0xf8000000 0x1000>;
-+		device_type = "rb,nand";
-+	};
-+
-+	fancon {
-+		interrupt-parent = <&ipic>;
-+		interrupts = <0x17 0x8>;
-+		sense = <&gpio 0x7>;
-+		fan_on = <&gpio 0x9>;
-+	};
-+
-+	pci0: pci@e0008500 {
-+		device_type = "pci";
-+		compatible = "fsl,mpc8349-pci";
-+		reg = <0xe0008500 0x100 0xe0008300 0x8>;
-+		#address-cells = <3>;
-+		#size-cells = <2>;
-+		#interrupt-cells = <1>;
-+		ranges = <0x2000000 0x0 0x80000000 0x80000000 0x0 0x20000000 0x1000000 0x0 0x0 0xd0000000 0x0 0x4000000>;
-+		bus-range = <0x0 0x0>;
-+		interrupt-map = <
-+			0x5800 0x0 0x0 0x1 &ipic 0x15 0x8
-+			0x6000 0x0 0x0 0x1 &ipic 0x30 0x8
-+			0x6000 0x0 0x0 0x2 &ipic 0x11 0x8
-+			0x6800 0x0 0x0 0x1 &ipic 0x11 0x8
-+			0x6800 0x0 0x0 0x2 &ipic 0x12 0x8
-+			0x7000 0x0 0x0 0x1 &ipic 0x12 0x8
-+			0x7000 0x0 0x0 0x2 &ipic 0x13 0x8
-+			0x7800 0x0 0x0 0x1 &ipic 0x13 0x8
-+			0x7800 0x0 0x0 0x2 &ipic 0x30 0x8
-+			0x8000 0x0 0x0 0x1 &ipic 0x30 0x8
-+			0x8000 0x0 0x0 0x2 &ipic 0x12 0x8
-+			0x8000 0x0 0x0 0x3 &ipic 0x11 0x8
-+			0x8000 0x0 0x0 0x4 &ipic 0x13 0x8
-+			0xa000 0x0 0x0 0x1 &ipic 0x30 0x8
-+			0xa000 0x0 0x0 0x2 &ipic 0x11 0x8
-+			0xa000 0x0 0x0 0x3 &ipic 0x12 0x8
-+			0xa000 0x0 0x0 0x4 &ipic 0x13 0x8
-+			0xa800 0x0 0x0 0x1 &ipic 0x11 0x8
-+			0xa800 0x0 0x0 0x2 &ipic 0x12 0x8
-+			0xa800 0x0 0x0 0x3 &ipic 0x13 0x8
-+			0xa800 0x0 0x0 0x4 &ipic 0x30 0x8>;
-+		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
-+		interrupt-parent = <&ipic>;
-+	};
-+
-+	soc8343@e0000000 {
-+		#address-cells = <1>;
-+		#size-cells = <1>;
-+		device_type = "soc";
-+		compatible = "simple-bus";
-+		ranges = <0x0 0xe0000000 0x100000>;
-+		reg = <0xe0000000 0x200>;
-+		bus-frequency = <0x1>;
-+
-+		led {
-+			user_led = <0x400 0x8>;
-+		};
-+
-+		beeper {
-+			reg = <0x500 0x100>;
-+		};
-+
-+		gpio: gpio@0 {
-+			reg = <0xc08 0x4>;
-+			device-id = <0x0>;
-+			compatible = "gpio";
-+			device_type = "gpio";
-+		};
-+
-+		enet0: ethernet@25000 {
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+			cell-index = <0>;
-+			phy-handle = <&phy0>;
-+			tbi-handle = <&tbi0>;
-+			interrupt-parent = <&ipic>;
-+			interrupts = <0x23 0x8 0x24 0x8 0x25 0x8>;
-+			local-mac-address = [00 00 00 00 00 00];
-+			reg = <0x25000 0x1000>;
-+			ranges = <0x0 0x25000 0x1000>;
-+			compatible = "gianfar";
-+			model = "TSEC";
-+			device_type = "network";
-+
-+			mdio@520 {
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				compatible = "fsl,gianfar-tbi";
-+				reg = <0x520 0x20>;
-+
-+				tbi0: tbi-phy@11 {
-+					reg = <0x11>;
-+					device_type = "tbi-phy";
-+				};
-+			};
-+		};
-+
-+		enet1: ethernet@24000 {
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+			cell-index = <1>;
-+			phy-handle = <&phy1>;
-+			tbi-handle = <&tbi1>;
-+			interrupt-parent = <&ipic>;
-+			interrupts = <0x20 0x8 0x21 0x8 0x22 0x8>;
-+			local-mac-address = [00 00 00 00 00 00];
-+			reg = <0x24000 0x1000>;
-+			ranges = <0x0 0x24000 0x1000>;
-+			compatible = "gianfar";
-+			model = "TSEC";
-+			device_type = "network";
-+
-+			mdio@520 {
-+				#size-cells = <0x0>;
-+				#address-cells = <0x1>;
-+				reg = <0x520 0x20>;
-+				compatible = "fsl,gianfar-mdio";
-+
-+				phy0: ethernet-phy@0 {
-+					device_type = "ethernet-phy";
-+					reg = <0x0>;
-+				};
-+
-+				phy1: ethernet-phy@1 {
-+					device_type = "ethernet-phy";
-+					reg = <0x1>;
-+				};
-+
-+				tbi1: tbi-phy@11 {
-+					reg = <0x11>;
-+					device_type = "tbi-phy";
-+				};
-+			};
-+		};
-+
-+		ipic: pic@700 {
-+			interrupt-controller;
-+			#address-cells = <0>;
-+			#interrupt-cells = <2>;
-+			reg = <0x700 0x100>;
-+			device_type = "ipic";
-+		};
-+
-+		serial@4500 {
-+			interrupt-parent = <&ipic>;
-+			interrupts = <0x9 0x8>;
-+			clock-frequency = <0xfe4f840>;
-+			reg = <0x4500 0x100>;
-+			compatible = "ns16550";
-+			device_type = "serial";
-+		};
-+
-+		wdt@200 {
-+			reg = <0x200 0x100>;
-+			compatible = "mpc83xx_wdt";
-+			device_type = "watchdog";
-+		};
-+	};
-+};
---- a/arch/powerpc/boot/Makefile
-+++ b/arch/powerpc/boot/Makefile
-@@ -73,7 +73,7 @@ src-plat := of.c cuboot-52xx.c cuboot-82
- 		cuboot-pq2.c cuboot-sequoia.c treeboot-walnut.c \
- 		cuboot-bamboo.c cuboot-mpc7448hpc2.c cuboot-taishan.c \
- 		fixed-head.S ep88xc.c ep405.c cuboot-c2k.c \
--		cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c \
-+		cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c rb600.c \
- 		cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \
- 		virtex405-head.S virtex.c redboot-83xx.c cuboot-sam440ep.c \
- 		cuboot-acadia.c cuboot-amigaone.c cuboot-kilauea.c
-@@ -231,6 +231,7 @@ image-$(CONFIG_MPC834x_ITX)		+= cuImage.
- image-$(CONFIG_MPC834x_MDS)		+= cuImage.mpc834x_mds
- image-$(CONFIG_MPC836x_MDS)		+= cuImage.mpc836x_mds
- image-$(CONFIG_ASP834x)			+= dtbImage.asp834x-redboot
-+image-$(CONFIG_RB_PPC)			+= dtbImage.rb600
- 
- # Board ports in arch/powerpc/platform/85xx/Kconfig
- image-$(CONFIG_MPC8540_ADS)		+= cuImage.mpc8540ads
---- /dev/null
-+++ b/arch/powerpc/boot/rb600.c
-@@ -0,0 +1,80 @@
-+/*
-+ * The RouterBOARD platform -- for booting RB600(A) RouterBOARDs.
-+ *
-+ * Author: Michael Guntsche <mike@it-loops.com>
-+ *
-+ * Copyright (c) 2009 Michael Guntsche
-+ *
-+ * 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.
-+ */
-+
-+#include "ops.h"
-+#include "types.h"
-+#include "io.h"
-+#include "stdio.h"
-+#include <libfdt.h>
-+
-+BSS_STACK(4*1024);
-+
-+u64 memsize64;
-+const void *fw_dtb;
-+
-+static void rb600_fixups(void)
-+{
-+	const u32 *reg, *timebase, *clock;
-+	int node, size;
-+	void *chosen;
-+	const char* bootargs;
-+
-+	dt_fixup_memory(0, memsize64);
-+
-+	/* Set the MAC addresses. */
-+	node = fdt_path_offset(fw_dtb, "/soc8343@e0000000/ethernet@24000");
-+	reg = fdt_getprop(fw_dtb, node, "mac-address", &size);
-+	dt_fixup_mac_address_by_alias("ethernet1", (const u8 *)reg);
-+
-+	node = fdt_path_offset(fw_dtb, "/soc8343@e0000000/ethernet@25000");
-+	reg = fdt_getprop(fw_dtb, node, "mac-address", &size);
-+	dt_fixup_mac_address_by_alias("ethernet0", (const u8 *)reg);
-+
-+	/* Find the CPU timebase and clock frequencies. */
-+	node = fdt_node_offset_by_prop_value(fw_dtb, -1, "device_type", "cpu", sizeof("cpu"));
-+	timebase = fdt_getprop(fw_dtb, node, "timebase-frequency", &size);
-+	clock = fdt_getprop(fw_dtb, node, "clock-frequency", &size);
-+	dt_fixup_cpu_clocks(*clock, *timebase, 0);
-+
-+	/* Fixup chosen
-+	 * The bootloader reads the kernelparm segment and adds the content to
-+	 * bootargs. This is needed to specify root and other boot flags.
-+	 */
-+	chosen = finddevice("/chosen");
-+	node = fdt_path_offset(fw_dtb, "/chosen");
-+	bootargs = fdt_getprop(fw_dtb, node, "bootargs", &size);
-+	setprop_str(chosen, "bootargs", bootargs);
-+}
-+
-+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
-+		   unsigned long r6, unsigned long r7)
-+{
-+	const u32 *reg;
-+	int node, size;
-+
-+	fw_dtb = (const void *)r3;
-+
-+	/* Find the memory range. */
-+	node = fdt_node_offset_by_prop_value(fw_dtb, -1, "device_type", "memory", sizeof("memory"));
-+	reg = fdt_getprop(fw_dtb, node, "reg", &size);
-+	memsize64 = reg[1];
-+
-+	/* Now we have the memory size; initialize the heap. */
-+	simple_alloc_init(_end, memsize64 - (unsigned long)_end, 32, 64);
-+
-+	/* Prepare the device tree and find the console. */
-+	fdt_init(_dtb_start);
-+	serial_console_init();
-+
-+	/* Remaining fixups... */
-+	platform_ops.fixups = rb600_fixups;
-+}
---- a/arch/powerpc/boot/wrapper
-+++ b/arch/powerpc/boot/wrapper
-@@ -202,7 +202,7 @@ ps3)
-     isection=.kernel:initrd
-     link_address=''
-     ;;
--ep88xc|ep405|ep8248e)
-+ep88xc|ep405|ep8248e|rb600)
-     platformo="$object/fixed-head.o $object/$platform.o"
-     binary=y
-     ;;
---- a/arch/powerpc/kernel/Makefile
-+++ b/arch/powerpc/kernel/Makefile
-@@ -104,9 +104,11 @@ obj32-$(CONFIG_PPC_PERF_CTRS)	+= mpc7450
- 
- obj-$(CONFIG_8XX_MINIMAL_FPEMU) += softemu8xx.o
- 
-+ifneq ($(CONFIG_RB_IOMAP),y)
- ifneq ($(CONFIG_PPC_INDIRECT_IO),y)
- obj-y				+= iomap.o
- endif
-+endif
- 
- obj-$(CONFIG_PPC64)		+= $(obj64-y)
- obj-$(CONFIG_PPC32)		+= $(obj32-y)
---- a/arch/powerpc/platforms/83xx/Kconfig
-+++ b/arch/powerpc/platforms/83xx/Kconfig
-@@ -30,6 +30,15 @@ config MPC832x_RDB
- 	help
- 	  This option enables support for the MPC8323 RDB board.
- 
-+config RB_PPC
-+	bool "MikroTik RouterBOARD 600 series"
-+	select DEFAULT_UIMAGE
-+	select QUICC_ENGINE
-+	select PPC_MPC834x
-+	select RB_IOMAP
-+	help
-+	  This option enables support for MikroTik RouterBOARD 600 series boards.
-+
- config MPC834x_MDS
- 	bool "Freescale MPC834x MDS"
- 	select DEFAULT_UIMAGE
---- a/arch/powerpc/platforms/83xx/Makefile
-+++ b/arch/powerpc/platforms/83xx/Makefile
-@@ -6,6 +6,7 @@ obj-$(CONFIG_SUSPEND)		+= suspend.o susp
- obj-$(CONFIG_MCU_MPC8349EMITX)	+= mcu_mpc8349emitx.o
- obj-$(CONFIG_MPC831x_RDB)	+= mpc831x_rdb.o
- obj-$(CONFIG_MPC832x_RDB)	+= mpc832x_rdb.o
-+obj-$(CONFIG_RB_PPC)		+= rbppc.o
- obj-$(CONFIG_MPC834x_MDS)	+= mpc834x_mds.o
- obj-$(CONFIG_MPC834x_ITX)	+= mpc834x_itx.o
- obj-$(CONFIG_MPC836x_MDS)	+= mpc836x_mds.o
---- /dev/null
-+++ b/arch/powerpc/platforms/83xx/rbppc.c
-@@ -0,0 +1,316 @@
-+/*
-+ * Copyright (C) 2008-2009 Noah Fontes <nfontes@transtruct.org>
-+ * Copyright (C) 2009 Michael Guntsche <mike@it-loops.com>
-+ * Copyright (C) Mikrotik 2007
-+ *
-+ * 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/delay.h>
-+#include <linux/root_dev.h>
-+#include <linux/initrd.h>
-+#include <linux/interrupt.h>
-+#include <linux/of_platform.h>
-+#include <linux/of_device.h>
-+#include <linux/of_platform.h>
-+#include <asm/time.h>
-+#include <asm/ipic.h>
-+#include <asm/udbg.h>
-+#include <asm/qe.h>
-+#include <asm/qe_ic.h>
-+#include <sysdev/fsl_soc.h>
-+#include <sysdev/fsl_pci.h>
-+#include "mpc83xx.h"
-+
-+#define SYSCTL		0x100
-+#define SICRL		0x014
-+
-+#define GTCFR2		0x04
-+#define GTMDR4		0x22
-+#define GTRFR4		0x26
-+#define GTCNR4		0x2e
-+#define GTVER4		0x36
-+#define GTPSR4		0x3e
-+
-+#define GTCFR_BCM	0x40
-+#define GTCFR_STP4	0x20
-+#define GTCFR_RST4	0x10
-+#define GTCFR_STP3	0x02
-+#define GTCFR_RST3	0x01
-+
-+#define GTMDR_ORI	0x10
-+#define GTMDR_FRR	0x08
-+#define GTMDR_ICLK16	0x04
-+
-+extern int par_io_data_set(u8 port, u8 pin, u8 val);
-+extern int par_io_config_pin(u8 port, u8 pin, int dir, int open_drain,
-+			     int assignment, int has_irq);
-+
-+static unsigned timer_freq;
-+static void *gtm;
-+
-+static int beeper_irq;
-+static unsigned beeper_gpio_pin[2];
-+
-+irqreturn_t rbppc_timer_irq(int irq, void *ptr)
-+{
-+	static int toggle = 0;
-+
-+	par_io_data_set(beeper_gpio_pin[0], beeper_gpio_pin[1], toggle);
-+	toggle = !toggle;
-+
-+	/* ack interrupt */
-+	out_be16(gtm + GTVER4, 3);
-+
-+	return IRQ_HANDLED;
-+}
-+
-+void rbppc_beep(unsigned freq)
-+{
-+	unsigned gtmdr;
-+
-+	if (freq > 5000) freq = 5000;
-+
-+	if (!gtm)
-+		return;
-+	if (!freq) {
-+		out_8(gtm + GTCFR2, GTCFR_STP4 | GTCFR_STP3);
-+		return;
-+	}
-+
-+	out_8(gtm + GTCFR2, GTCFR_RST4 | GTCFR_STP3);
-+	out_be16(gtm + GTPSR4, 255);
-+	gtmdr = GTMDR_FRR | GTMDR_ICLK16;
-+	if (beeper_irq != NO_IRQ) gtmdr |= GTMDR_ORI;
-+	out_be16(gtm + GTMDR4, gtmdr);
-+	out_be16(gtm + GTVER4, 3);
-+
-+	out_be16(gtm + GTRFR4, timer_freq / 16 / 256 / freq / 2);
-+	out_be16(gtm + GTCNR4, 0);
-+}
-+EXPORT_SYMBOL(rbppc_beep);
-+
-+static void __init rbppc_setup_arch(void)
-+{
-+	struct device_node *np;
-+
-+	np = of_find_node_by_type(NULL, "cpu");
-+	if (np) {
-+		const unsigned *fp = of_get_property(np, "clock-frequency", NULL);
-+		loops_per_jiffy = fp ? *fp / HZ : 0;
-+
-+		of_node_put(np);
-+	}
-+
-+	np = of_find_node_by_name(NULL, "serial");
-+	if (np) {
-+		timer_freq =
-+		    *(unsigned *) of_get_property(np, "clock-frequency", NULL);
-+		of_node_put(np);
-+	}
-+
-+#ifdef CONFIG_PCI
-+	np = of_find_node_by_type(NULL, "pci");
-+	if (np) {
-+		mpc83xx_add_bridge(np);
-+	}
-+#endif
-+
-+#ifdef CONFIG_QUICC_ENGINE
-+	np = of_find_node_by_name(np, "par_io");
-+	if (np) {
-+		qe_reset();
-+		par_io_init(np);
-+		of_node_put(np);
-+
-+		np = NULL;
-+		while (1) {
-+			np = of_find_node_by_name(np, "ucc");
-+			if (!np) break;
-+
-+			par_io_of_config(np);
-+		}
-+	}
-+#endif
-+
-+}
-+
-+void __init rbppc_init_IRQ(void)
-+{
-+	struct device_node *np;
-+
-+	np = of_find_node_by_type(NULL, "ipic");
-+	if (np) {
-+		ipic_init(np, 0);
-+		ipic_set_default_priority();
-+		of_node_put(np);
-+	}
-+
-+#ifdef CONFIG_QUICC_ENGINE
-+	np = of_find_node_by_type(NULL, "qeic");
-+	if (np) {
-+		qe_ic_init(np, 0, qe_ic_cascade_low_ipic, qe_ic_cascade_high_ipic);
-+		of_node_put(np);
-+	}
-+#endif
-+}
-+
-+static int __init rbppc_probe(void)
-+{
-+	char *model;
-+
-+	model = of_get_flat_dt_prop(of_get_flat_dt_root(), "model", NULL);
-+
-+	if (!model)
-+		return 0;
-+
-+	if (strcmp(model, "RB600") == 0)
-+		return 1;
-+
-+	return 0;
-+}
-+
-+static void __init rbppc_beeper_init(struct device_node *beeper)
-+{
-+	struct resource res;
-+	struct device_node *gpio;
-+	const unsigned *pin;
-+	const unsigned *gpio_id;
-+
-+	if (of_address_to_resource(beeper, 0, &res)) {
-+		printk(KERN_ERR "rbppc_beeper_init(%s): Beeper error: No region specified\n", beeper->full_name);
-+		return;
-+	}
-+
-+	pin = of_get_property(beeper, "gpio", NULL);
-+	if (pin) {
-+		gpio = of_find_node_by_phandle(pin[0]);
-+
-+		if (!gpio) {
-+			printk(KERN_ERR "rbppc_beeper_init(%s): Beeper error: GPIO handle %x not found\n", beeper->full_name, pin[0]);
-+			return;
-+		}
-+
-+		gpio_id = of_get_property(gpio, "device-id", NULL);
-+		if (!gpio_id) {
-+			printk(KERN_ERR "rbppc_beeper_init(%s): Beeper error: No device-id specified in GPIO\n", beeper->full_name);
-+			return;
-+		}
-+
-+		beeper_gpio_pin[0] = *gpio_id;
-+		beeper_gpio_pin[1] = pin[1];
-+
-+		par_io_config_pin(*gpio_id, pin[1], 1, 0, 0, 0);
-+	} else {
-+		void *sysctl;
-+
-+		sysctl = ioremap_nocache(get_immrbase() + SYSCTL, 0x100);
-+		out_be32(sysctl + SICRL,
-+			 in_be32(sysctl + SICRL) | (1 << (31 - 19)));
-+		iounmap(sysctl);
-+	}
-+
-+	gtm = ioremap_nocache(res.start, res.end - res.start + 1);
-+
-+	beeper_irq = irq_of_parse_and_map(beeper, 0);
-+	if (beeper_irq != NO_IRQ) {
-+		int e = request_irq(beeper_irq, rbppc_timer_irq, 0, "beeper", NULL);
-+		if (e) {
-+			printk(KERN_ERR "rbppc_beeper_init(%s): Request of beeper irq failed!\n", beeper->full_name);
-+		}
-+	}
-+}
-+
-+#define SBIT(x) (0x80000000 >> (x))
-+#define DBIT(x, y) ((y) << (32 - (((x % 16) + 1) * 2)))
-+
-+#define SICRL_RB600(x) ((x) + (0x114 >> 2))
-+#define GPIO_DIR_RB600(x) ((x) + (0xc00 >> 2))
-+#define GPIO_DATA_RB600(x) ((x) + (0xc08 >> 2))
-+
-+static void rbppc_restart(char *cmd)
-+{
-+	__be32 __iomem *reg;
-+
-+	reg = ioremap(get_immrbase(), 0x1000);
-+	local_irq_disable();
-+	out_be32(SICRL_RB600(reg), in_be32(SICRL_RB600(reg)) & ~0x00800000);
-+	out_be32(GPIO_DIR_RB600(reg), in_be32(GPIO_DIR_RB600(reg)) | SBIT(2));
-+	out_be32(GPIO_DATA_RB600(reg), in_be32(GPIO_DATA_RB600(reg)) & ~SBIT(2));
-+
-+	while (1);
-+}
-+
-+static void rbppc_halt(void)
-+{
-+	while (1);
-+}
-+
-+static struct of_device_id rbppc_ids[] = {
-+	{ .type = "soc", },
-+	{ .compatible = "soc", },
-+	{ .compatible = "simple-bus", },
-+	{ .compatible = "gianfar", },
-+	{ },
-+};
-+
-+static int __init rbppc_declare_of_platform_devices(void)
-+{
-+	struct device_node *np;
-+	unsigned idx;
-+
-+	of_platform_bus_probe(NULL, rbppc_ids, NULL);
-+
-+	np = of_find_node_by_type(NULL, "mdio");
-+	if (np) {
-+		unsigned len;
-+		unsigned *res;
-+		const unsigned *eres;
-+		struct device_node *ep;
-+
-+		ep = of_find_compatible_node(NULL, "network", "ucc_geth");
-+		if (ep) {
-+			eres = of_get_property(ep, "reg", &len);
-+			res = (unsigned *) of_get_property(np, "reg", &len);
-+			if (res && eres) {
-+				res[0] = eres[0] + 0x120;
-+			}
-+		}
-+	}
-+
-+	np = of_find_node_by_name(NULL, "nand");
-+	if (np) {
-+		of_platform_device_create(np, "nand", NULL);
-+	}
-+
-+	idx = 0;
-+	for_each_node_by_type(np, "rb,cf") {
-+		char dev_name[12];
-+		snprintf(dev_name, sizeof(dev_name), "cf.%u", idx);
-+		of_platform_device_create(np, dev_name, NULL);
-+		++idx;
-+	}
-+
-+	np = of_find_node_by_name(NULL, "beeper");
-+	if (np) {
-+		rbppc_beeper_init(np);
-+	}
-+
-+	return 0;
-+}
-+machine_device_initcall(rb600, rbppc_declare_of_platform_devices);
-+
-+define_machine(rb600) {
-+	.name 				= "MikroTik RouterBOARD 600 series",
-+	.probe 				= rbppc_probe,
-+	.setup_arch 			= rbppc_setup_arch,
-+	.init_IRQ 			= rbppc_init_IRQ,
-+	.get_irq 			= ipic_get_irq,
-+	.restart 			= rbppc_restart,
-+	.halt				= rbppc_halt,
-+	.time_init 			= mpc83xx_time_init,
-+	.calibrate_decr			= generic_calibrate_decr,
-+};
---- a/arch/powerpc/platforms/Kconfig
-+++ b/arch/powerpc/platforms/Kconfig
-@@ -142,6 +142,10 @@ config GENERIC_IOMAP
- 	bool
- 	default n
- 
-+config RB_IOMAP
-+	bool
-+	default y if RB_PPC
-+
- source "drivers/cpufreq/Kconfig"
- 
- menu "CPU Frequency drivers"
---- a/arch/powerpc/sysdev/Makefile
-+++ b/arch/powerpc/sysdev/Makefile
-@@ -56,3 +56,5 @@ obj-$(CONFIG_PPC_MPC52xx)	+= mpc5xxx_clo
- ifeq ($(CONFIG_SUSPEND),y)
- obj-$(CONFIG_6xx)		+= 6xx-suspend.o
- endif
-+
-+obj-$(CONFIG_RB_IOMAP)		+= rb_iomap.o
---- /dev/null
-+++ b/arch/powerpc/sysdev/rb_iomap.c
-@@ -0,0 +1,223 @@
-+#include <linux/init.h>
-+#include <linux/pci.h>
-+#include <linux/mm.h>
-+#include <asm/io.h>
-+
-+#define LOCALBUS_START		0x40000000
-+#define LOCALBUS_MASK		0x007fffff
-+#define LOCALBUS_REGMASK	0x001fffff
-+
-+static void __iomem *localbus_base;
-+
-+static inline int is_localbus(void __iomem *addr)
-+{
-+	return ((unsigned) addr & ~LOCALBUS_MASK) == LOCALBUS_START;
-+}
-+
-+static inline unsigned localbus_regoff(unsigned reg) {
-+	return (reg << 16) | (((reg ^ 8) & 8) << 17);
-+}
-+
-+static inline void __iomem *localbus_addr(void __iomem *addr)
-+{
-+	return localbus_base
-+	    + ((unsigned) addr & LOCALBUS_MASK & ~LOCALBUS_REGMASK)
-+	    + localbus_regoff((unsigned) addr & LOCALBUS_REGMASK);
-+}
-+
-+unsigned int ioread8(void __iomem *addr)
-+{
-+	if (is_localbus(addr))
-+		return in_be16(localbus_addr(addr)) >> 8;
-+	return readb(addr);
-+}
-+EXPORT_SYMBOL(ioread8);
-+
-+unsigned int ioread16(void __iomem *addr)
-+{
-+	if (is_localbus(addr))
-+		return le16_to_cpu(in_be16(localbus_addr(addr)));
-+	return readw(addr);
-+}
-+EXPORT_SYMBOL(ioread16);
-+
-+unsigned int ioread16be(void __iomem *addr)
-+{
-+	return in_be16(addr);
-+}
-+EXPORT_SYMBOL(ioread16be);
-+
-+unsigned int ioread32(void __iomem *addr)
-+{
-+	return readl(addr);
-+}
-+EXPORT_SYMBOL(ioread32);
-+
-+unsigned int ioread32be(void __iomem *addr)
-+{
-+	return in_be32(addr);
-+}
-+EXPORT_SYMBOL(ioread32be);
-+
-+void iowrite8(u8 val, void __iomem *addr)
-+{
-+	if (is_localbus(addr))
-+		out_be16(localbus_addr(addr), ((u16) val) << 8);
-+	else
-+		writeb(val, addr);
-+}
-+EXPORT_SYMBOL(iowrite8);
-+
-+void iowrite16(u16 val, void __iomem *addr)
-+{
-+	if (is_localbus(addr))
-+		out_be16(localbus_addr(addr), cpu_to_le16(val));
-+	else
-+		writew(val, addr);
-+}
-+EXPORT_SYMBOL(iowrite16);
-+
-+void iowrite16be(u16 val, void __iomem *addr)
-+{
-+	out_be16(addr, val);
-+}
-+EXPORT_SYMBOL(iowrite16be);
-+
-+void iowrite32(u32 val, void __iomem *addr)
-+{
-+	writel(val, addr);
-+}
-+EXPORT_SYMBOL(iowrite32);
-+
-+void iowrite32be(u32 val, void __iomem *addr)
-+{
-+	out_be32(addr, val);
-+}
-+EXPORT_SYMBOL(iowrite32be);
-+
-+void ioread8_rep(void __iomem *addr, void *dst, unsigned long count)
-+{
-+	if (is_localbus(addr)) {
-+		unsigned i;
-+		void *laddr = localbus_addr(addr);
-+		u8 *buf = dst;
-+
-+		for (i = 0; i < count; ++i) {
-+			*buf++ = in_be16(laddr) >> 8;
-+		}
-+	} else {
-+		_insb((u8 __iomem *) addr, dst, count);
-+	}
-+}
-+EXPORT_SYMBOL(ioread8_rep);
-+
-+void ioread16_rep(void __iomem *addr, void *dst, unsigned long count)
-+{
-+	if (is_localbus(addr)) {
-+		unsigned i;
-+		void *laddr = localbus_addr(addr);
-+		u16 *buf = dst;
-+
-+		for (i = 0; i < count; ++i) {
-+			*buf++ = in_be16(laddr);
-+		}
-+	} else {
-+		_insw_ns((u16 __iomem *) addr, dst, count);
-+	}
-+}
-+EXPORT_SYMBOL(ioread16_rep);
-+
-+void ioread32_rep(void __iomem *addr, void *dst, unsigned long count)
-+{
-+	_insl_ns((u32 __iomem *) addr, dst, count);
-+}
-+EXPORT_SYMBOL(ioread32_rep);
-+
-+void iowrite8_rep(void __iomem *addr, const void *src, unsigned long count)
-+{
-+	if (is_localbus(addr)) {
-+		unsigned i;
-+		void *laddr = localbus_addr(addr);
-+		const u8 *buf = src;
-+
-+		for (i = 0; i < count; ++i) {
-+			out_be16(laddr, ((u16) *buf++) << 8);
-+		}
-+	} else {
-+		_outsb((u8 __iomem *) addr, src, count);
-+	}
-+}
-+EXPORT_SYMBOL(iowrite8_rep);
-+
-+void iowrite16_rep(void __iomem *addr, const void *src, unsigned long count)
-+{
-+	if (is_localbus(addr)) {
-+		unsigned i;
-+		void *laddr = localbus_addr(addr);
-+		const u16 *buf = src;
-+
-+		for (i = 0; i < count; ++i) {
-+			out_be16(laddr, *buf++);
-+		}
-+	} else {
-+		_outsw_ns((u16 __iomem *) addr, src, count);
-+	}
-+}
-+EXPORT_SYMBOL(iowrite16_rep);
-+
-+void iowrite32_rep(void __iomem *addr, const void *src, unsigned long count)
-+{
-+	_outsl_ns((u32 __iomem *) addr, src, count);
-+}
-+EXPORT_SYMBOL(iowrite32_rep);
-+
-+void __iomem *ioport_map(unsigned long port, unsigned int len)
-+{
-+	return (void __iomem *) (port + _IO_BASE);
-+}
-+EXPORT_SYMBOL(ioport_unmap);
-+
-+void ioport_unmap(void __iomem *addr)
-+{
-+	/* Nothing to do */
-+}
-+EXPORT_SYMBOL(ioport_map);
-+
-+void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max)
-+{
-+	unsigned long start = pci_resource_start(dev, bar);
-+	unsigned long len = pci_resource_len(dev, bar);
-+	unsigned long flags = pci_resource_flags(dev, bar);
-+
-+	if (!len)
-+		return NULL;
-+	if (max && len > max)
-+		len = max;
-+	if (flags & IORESOURCE_IO)
-+		return ioport_map(start, len);
-+	if (flags & IORESOURCE_MEM)
-+		return ioremap(start, len);
-+	/* What? */
-+	return NULL;
-+}
-+EXPORT_SYMBOL(pci_iomap);
-+
-+void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
-+{
-+	/* Nothing to do */
-+}
-+EXPORT_SYMBOL(pci_iounmap);
-+
-+void __iomem *localbus_map(unsigned long addr, unsigned int len)
-+{
-+	if (!localbus_base)
-+		localbus_base = ioremap(addr & ~LOCALBUS_MASK,
-+					LOCALBUS_MASK + 1);
-+	return (void *) (LOCALBUS_START + (addr & LOCALBUS_MASK));
-+}
-+EXPORT_SYMBOL(localbus_map);
-+
-+void localbus_unmap(void __iomem *addr)
-+{
-+}
-+EXPORT_SYMBOL(localbus_unmap);
---- a/drivers/ata/Kconfig
-+++ b/drivers/ata/Kconfig
-@@ -781,5 +781,12 @@ config PATA_BF54X
- 
- 	  If unsure, say N.
- 
-+config PATA_RB_PPC
-+	tristate "MikroTik RB600 PATA support"
-+	depends on RB_PPC
-+	help
-+	  This option enables support for PATA devices on MikroTik RouterBOARD
-+	  600 series boards.
-+
- endif # ATA_SFF
- endif # ATA
---- a/drivers/ata/Makefile
-+++ b/drivers/ata/Makefile
-@@ -77,6 +77,7 @@ obj-$(CONFIG_PATA_PLATFORM)	+= pata_plat
- obj-$(CONFIG_PATA_AT91)	+= pata_at91.o
- obj-$(CONFIG_PATA_OF_PLATFORM)	+= pata_of_platform.o
- obj-$(CONFIG_PATA_ICSIDE)	+= pata_icside.o
-+obj-$(CONFIG_PATA_RB_PPC)	+= pata_rbppc_cf.o
- # Should be last but two libata driver
- obj-$(CONFIG_PATA_ACPI)		+= pata_acpi.o
- # Should be last but one libata driver
---- /dev/null
-+++ b/drivers/ata/pata_rbppc_cf.c
-@@ -0,0 +1,701 @@
-+/*
-+ * Copyright (C) 2008-2009 Noah Fontes <nfontes@transtruct.org>
-+ * Copyright (C) Mikrotik 2007
-+ *
-+ * 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/kernel.h>
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <scsi/scsi_host.h>
-+#include <linux/libata.h>
-+#include <linux/of_platform.h>
-+#include <linux/ata_platform.h>
-+
-+#define DEBUG_UPM	0
-+
-+#define DRV_NAME	"pata_rbppc_cf"
-+#define DRV_VERSION	"0.0.2"
-+
-+#define DEV2SEL_OFFSET	0x00100000
-+
-+#define IMMR_LBCFG_OFFSET	0x00005000
-+#define IMMR_LBCFG_SIZE		0x00001000
-+
-+#define LOCAL_BUS_MCMR		0x00000078
-+#define   MxMR_OP_MASK			0x30000000
-+#define   MxMR_OP_NORMAL		0x00000000
-+#define   MxMR_OP_WRITE			0x10000000
-+#define   MxMR_OP_READ			0x20000000
-+#define   MxMR_OP_RUN			0x30000000
-+#define   MxMR_LUPWAIT_LOW		0x08000000
-+#define   MxMR_LUPWAIT_HIGH		0x00000000
-+#define   MxMR_LUPWAIT_ENABLE		0x00040000
-+#define   MxMR_RLF_MASK			0x0003c000
-+#define   MxMR_RLF_SHIFT			14
-+#define   MxMR_WLF_MASK			0x00003c00
-+#define   MxMR_WLF_SHIFT			10
-+#define   MxMR_MAD_MASK			0x0000003f
-+#define LOCAL_BUS_MDR		0x00000088
-+#define LOCAL_BUS_LCRR		0x000000D4
-+#define   LCRR_CLKDIV_MASK		0x0000000f
-+
-+#define LOOP_SIZE	4
-+
-+#define UPM_READ_SINGLE_OFFSET	0x00
-+#define UPM_WRITE_SINGLE_OFFSET	0x18
-+#define UPM_DATA_SIZE	0x40
-+
-+#define LBT_CPUIN_MIN		0
-+#define LBT_CPUOUT_MIN		1
-+#define LBT_CPUOUT_MAX		2
-+#define LBT_EXTDEL_MIN		3
-+#define LBT_EXTDEL_MAX		4
-+#define LBT_SIZE		5
-+
-+/* UPM machine configuration bits */
-+#define N_BASE	0x00f00000
-+#define N_CS	0xf0000000
-+#define N_CS_H1	0xc0000000
-+#define N_CS_H2	0x30000000
-+#define N_WE	0x0f000000
-+#define N_WE_H1	0x0c000000
-+#define N_WE_H2	0x03000000
-+#define N_OE	0x00030000
-+#define N_OE_H1	0x00020000
-+#define N_OE_H2	0x00010000
-+#define WAEN	0x00001000
-+#define REDO_2	0x00000100
-+#define REDO_3	0x00000200
-+#define REDO_4	0x00000300
-+#define LOOP	0x00000080
-+#define NA	0x00000008
-+#define UTA	0x00000004
-+#define LAST	0x00000001
-+
-+#define REDO_VAL(mult)	(REDO_2 * ((mult) - 1))
-+#define REDO_MAX_MULT	4
-+
-+#define READ_BASE	(N_BASE | N_WE)
-+#define WRITE_BASE	(N_BASE | N_OE)
-+#define EMPTY		(N_BASE | N_CS | N_OE | N_WE | LAST)
-+
-+#define EOF_UPM_SETTINGS	0
-+#define ANOTHER_TIMING		1
-+
-+#define OA_CPUIN_MIN		0x01
-+#define OA_CPUOUT_MAX		0x02
-+#define OD_CPUOUT_MIN		0x04
-+#define OA_CPUOUT_DELTA		0x06
-+#define OA_EXTDEL_MAX		0x08
-+#define OD_EXTDEL_MIN		0x10
-+#define OA_EXTDEL_DELTA		0x18
-+#define O_MIN_CYCLE_TIME	0x20
-+#define O_MINUS_PREV		0x40
-+#define O_HALF_CYCLE		0x80
-+
-+extern void __iomem *localbus_map(unsigned long addr, unsigned int len);
-+extern void localbus_unmap(void __iomem *addr);
-+
-+struct rbppc_cf_info {
-+	unsigned lbcfg_addr;
-+	unsigned clk_time_ps;
-+	int cur_mode;
-+	u32 lb_timings[LBT_SIZE];
-+};
-+static struct rbppc_cf_info *rbinfo = NULL;
-+
-+struct upm_setting {
-+	unsigned value;
-+	unsigned ns[7];
-+	unsigned clk_minus;
-+	unsigned group_size;
-+	unsigned options;
-+};
-+
-+static const struct upm_setting cfUpmReadSingle[] = {
-+	{ READ_BASE | N_OE,
-+	  /* t1 - ADDR setup time */
-+		{  70,  50,  30,  30,  25,  15,  10 }, 0, 0, (OA_CPUOUT_DELTA |
-+							      OA_EXTDEL_MAX) },
-+	{ READ_BASE | N_OE_H1,
-+		{   0,   0,   0,   0,   0,   0,   0 }, 0, 0, O_HALF_CYCLE },
-+	{ READ_BASE,
-+	  /* t2 - OE0 time */
-+		{ 290, 290, 290,  80,  70,  65,  55 }, 0, 2, (OA_CPUOUT_MAX |
-+							      OA_CPUIN_MIN) },
-+	{ READ_BASE | WAEN,
-+		{   1,   1,   1,   1,   1,   0,   0 }, 0, 0, 0 },
-+	{ READ_BASE | UTA,
-+		{   1,   1,   1,   1,   1,   1,   1 }, 0, 0, 0 },
-+	{ READ_BASE | N_OE,
-+	  /* t9 - ADDR hold time */
-+		{  20,  15,  10,  10,  10,  10,  10 }, 0, 0, (OA_CPUOUT_DELTA |
-+							      OD_EXTDEL_MIN) },
-+	{ READ_BASE | N_OE | N_CS_H2,
-+		{   0,   0,   0,   0,   0,   0,   0 }, 0, 0, O_HALF_CYCLE },
-+	{ READ_BASE | N_OE | N_CS,
-+	  /* t6Z -IORD data tristate */
-+		{  30,  30,  30,  30,  30,  20,  20 }, 1, 1, O_MINUS_PREV },
-+	{ ANOTHER_TIMING,
-+	  /* t2i -IORD recovery time */
-+		{   0,   0,   0,  70,  25,  25,  20 }, 2, 0, 0 },
-+	{ ANOTHER_TIMING,
-+	  /* CS 0 -> 1 MAX */
-+		{   0,   0,   0,   0,   0,   0,   0 }, 1, 0, (OA_CPUOUT_DELTA |
-+							      OA_EXTDEL_MAX) },
-+	{ READ_BASE | N_OE | N_CS | LAST,
-+		{   1,   1,   1,   1,   1,   1,   1 }, 0, 0, 0 },
-+	{ EOF_UPM_SETTINGS,
-+	  /* min total cycle time - includes turnaround and ALE cycle */
-+		{ 600, 383, 240, 180, 120, 100,  80 }, 2, 0, O_MIN_CYCLE_TIME },
-+};
-+
-+static const struct upm_setting cfUpmWriteSingle[] = {
-+	{ WRITE_BASE | N_WE,
-+	  /* t1 - ADDR setup time */
-+		{  70,  50,  30,  30,  25,  15,  10 }, 0, 0, (OA_CPUOUT_DELTA |
-+							      OA_EXTDEL_MAX) },
-+	{ WRITE_BASE | N_WE_H1,
-+		{   0,   0,   0,   0,   0,   0,   0 }, 0, 0, O_HALF_CYCLE },
-+	{ WRITE_BASE,
-+	  /* t2 - WE0 time */
-+		{ 290, 290, 290,  80,  70,  65,  55 }, 0, 1, OA_CPUOUT_DELTA },
-+	{ WRITE_BASE | WAEN,
-+		{   1,   1,   1,   1,   1,   0,   0 }, 0, 0, 0 },
-+	{ WRITE_BASE | N_WE,
-+	  /* t9 - ADDR hold time */
-+		{  20,  15,  10,  10,  10,  10,  10 }, 0, 0, (OA_CPUOUT_DELTA |
-+							      OD_EXTDEL_MIN) },
-+	{ WRITE_BASE | N_WE | N_CS_H2,
-+		{   0,   0,   0,   0,   0,   0,   0 }, 0, 0, O_HALF_CYCLE },
-+	{ WRITE_BASE | N_WE | N_CS,
-+	  /* t4 - DATA hold time */
-+		{  30,  20,  15,  10,  10,  10,  10 }, 0, 1, O_MINUS_PREV },
-+	{ ANOTHER_TIMING,
-+	  /* t2i -IOWR recovery time */
-+		{   0,   0,   0,  70,  25,  25,  20 }, 1, 0, 0 },
-+	{ ANOTHER_TIMING,
-+	  /* CS 0 -> 1 MAX */
-+		{   0,   0,   0,   0,   0,   0,   0 }, 0, 0, (OA_CPUOUT_DELTA |
-+							      OA_EXTDEL_MAX) },
-+	{ WRITE_BASE | N_WE | N_CS | UTA | LAST,
-+		{   1,   1,   1,   1,   1,   1,   1 }, 0, 0, 0 },
-+	/* min total cycle time - includes ALE cycle */
-+	{ EOF_UPM_SETTINGS,
-+		{ 600, 383, 240, 180, 120, 100,  80 }, 1, 0, O_MIN_CYCLE_TIME },
-+};
-+
-+static u8 rbppc_cf_check_status(struct ata_port *ap) {
-+	u8 val = ioread8(ap->ioaddr.status_addr);
-+	if (val == 0xF9)
-+		val = 0x7F;
-+	return val;
-+}
-+
-+static u8 rbppc_cf_check_altstatus(struct ata_port *ap) {
-+	u8 val = ioread8(ap->ioaddr.altstatus_addr);
-+	if (val == 0xF9)
-+		val = 0x7F;
-+	return val;
-+}
-+
-+static void rbppc_cf_dummy_noret(struct ata_port *ap) { }
-+static int rbppc_cf_dummy_ret0(struct ata_port *ap) { return 0; }
-+
-+static int ps2clk(int ps, unsigned clk_time_ps) {
-+	int psMaxOver;
-+	if (ps <= 0) return 0;
-+
-+	/* round down if <= 2% over clk border, but no more than 1/4 clk cycle */
-+	psMaxOver = ps * 2 / 100;
-+	if (4 * psMaxOver > clk_time_ps) {
-+		psMaxOver = clk_time_ps / 4;
-+	}
-+	return (ps + clk_time_ps - 1 - psMaxOver) / clk_time_ps;
-+}
-+
-+static int upm_gen_ps_table(const struct upm_setting *upm,
-+			    int mode, struct rbppc_cf_info *info,
-+			    int *psFinal) {
-+	int uidx;
-+	int lastUpmValIdx = 0;
-+	int group_start_idx = -1;
-+	int group_left_num = -1;
-+	int clk_time_ps = info->clk_time_ps;
-+
-+	for (uidx = 0; upm[uidx].value != EOF_UPM_SETTINGS; ++uidx) {
-+		const struct upm_setting *us = upm + uidx;
-+		unsigned opt = us->options;
-+		int ps = us->ns[mode] * 1000 - us->clk_minus * clk_time_ps;
-+
-+		if (opt & OA_CPUIN_MIN) ps += info->lb_timings[LBT_CPUIN_MIN];
-+		if (opt & OD_CPUOUT_MIN) ps -= info->lb_timings[LBT_CPUOUT_MIN];
-+		if (opt & OA_CPUOUT_MAX) ps += info->lb_timings[LBT_CPUOUT_MAX];
-+		if (opt & OD_EXTDEL_MIN) ps -= info->lb_timings[LBT_EXTDEL_MIN];
-+		if (opt & OA_EXTDEL_MAX) ps += info->lb_timings[LBT_EXTDEL_MAX];
-+
-+		if (us->value == ANOTHER_TIMING) {
-+			/* use longest timing from alternatives */
-+			if (psFinal[lastUpmValIdx] < ps) {
-+				psFinal[lastUpmValIdx] = ps;
-+			}
-+			ps = 0;
-+		}
-+		else {
-+			if (us->group_size) {
-+				group_start_idx = uidx;
-+				group_left_num = us->group_size;
-+			}
-+			else if (group_left_num > 0) {
-+				/* group time is divided on all group members */
-+				int clk = ps2clk(ps, clk_time_ps);
-+				psFinal[group_start_idx] -= clk * clk_time_ps;
-+				--group_left_num;
-+			}
-+			if ((opt & O_MINUS_PREV) && lastUpmValIdx > 0) {
-+				int clk = ps2clk(psFinal[lastUpmValIdx],
-+						 clk_time_ps);
-+				ps -= clk * clk_time_ps;
-+			}
-+			lastUpmValIdx = uidx;
-+		}
-+		psFinal[uidx] = ps;
-+	}
-+	return uidx;
-+}
-+
-+static int free_half(int ps, int clk, int clk_time_ps) {
-+    if (clk < 2) return 0;
-+    return (clk * clk_time_ps - ps) * 2 >= clk_time_ps;
-+}
-+
-+static void upm_gen_clk_table(const struct upm_setting *upm,
-+			      int mode, int clk_time_ps,
-+			      int max_uidx, const int *psFinal, int *clkFinal) {
-+	int clk_cycle_time;
-+	int clk_total;
-+	int uidx;
-+
-+	/* convert picoseconds to clocks */
-+	clk_total = 0;
-+	for (uidx = 0; uidx < max_uidx; ++uidx) {
-+		int clk = ps2clk(psFinal[uidx], clk_time_ps);
-+		clkFinal[uidx] = clk;
-+		clk_total += clk;
-+	}
-+
-+	/* check possibility of half cycle usage */
-+	for (uidx = 1; uidx < max_uidx - 1; ++uidx) {
-+		if ((upm[uidx].options & O_HALF_CYCLE) &&
-+		    free_half(psFinal[uidx - 1], clkFinal[uidx - 1],
-+			      clk_time_ps) &&
-+		    free_half(psFinal[uidx + 1], clkFinal[uidx + 1],
-+			      clk_time_ps)) {
-+			++clkFinal[uidx];
-+			--clkFinal[uidx - 1];
-+			--clkFinal[uidx + 1];
-+		}
-+	}
-+
-+	if ((upm[max_uidx].options & O_MIN_CYCLE_TIME) == 0) return;
-+
-+	/* check cycle time, adjust timings if needed */
-+	clk_cycle_time = (ps2clk(upm[max_uidx].ns[mode] * 1000, clk_time_ps) -
-+			  upm[max_uidx].clk_minus);
-+	uidx = 0;
-+	while (clk_total < clk_cycle_time) {
-+		/* extend all timings in round-robin to match cycle time */
-+		if (clkFinal[uidx]) {
-+#if DEBUG_UPM
-+			printk(KERN_INFO "extending %u by 1 clk\n", uidx);
-+#endif
-+			++clkFinal[uidx];
-+			++clk_total;
-+		}
-+		++uidx;
-+		if (uidx == max_uidx) uidx = 0;
-+	}
-+}
-+
-+static void add_data_val(unsigned val, int *clkLeft, int maxClk,
-+			unsigned *data, int *dataIdx) {
-+	if (*clkLeft == 0) return;
-+
-+	if (maxClk == 0 && *clkLeft >= LOOP_SIZE * 2) {
-+		int times;
-+		int times1;
-+		int times2;
-+
-+		times = *clkLeft / LOOP_SIZE;
-+		if (times > REDO_MAX_MULT * 2) times = REDO_MAX_MULT * 2;
-+		times1 = times / 2;
-+		times2 = times - times1;
-+
-+		val |= LOOP;
-+		data[*dataIdx] = val | REDO_VAL(times1);
-+		++(*dataIdx);
-+		data[*dataIdx] = val | REDO_VAL(times2);
-+		++(*dataIdx);
-+
-+		*clkLeft -= times * LOOP_SIZE;
-+		return;
-+	}
-+
-+	if (maxClk < 1 || maxClk > REDO_MAX_MULT) maxClk = REDO_MAX_MULT;
-+	if (*clkLeft < maxClk) maxClk = *clkLeft;
-+
-+	*clkLeft -= maxClk;
-+	val |= REDO_VAL(maxClk);
-+
-+	data[*dataIdx] = val;
-+	++(*dataIdx);
-+}
-+
-+static int upm_gen_final_data(const struct upm_setting *upm,
-+			       int max_uidx, int *clkFinal, unsigned *data) {
-+	int dataIdx;
-+	int uidx;
-+
-+	dataIdx = 0;
-+	for (uidx = 0; uidx < max_uidx; ++uidx) {
-+		int clk = clkFinal[uidx];
-+		while (clk > 0) {
-+			add_data_val(upm[uidx].value, &clk, 0,
-+				     data, &dataIdx);
-+		}
-+	}
-+	return dataIdx;
-+}
-+
-+static int conv_upm_table(const struct upm_setting *upm,
-+			  int mode, struct rbppc_cf_info *info,
-+			  unsigned *data) {
-+#if DEBUG_UPM
-+	int uidx;
-+#endif
-+	int psFinal[32];
-+	int clkFinal[32];
-+	int max_uidx;
-+	int data_len;
-+
-+	max_uidx = upm_gen_ps_table(upm, mode, info, psFinal);
-+
-+	upm_gen_clk_table(upm, mode, info->clk_time_ps, max_uidx,
-+			  psFinal, clkFinal);
-+
-+#if DEBUG_UPM
-+	/* dump out debug info */
-+	for (uidx = 0; uidx < max_uidx; ++uidx) {
-+		if (clkFinal[uidx]) {
-+			printk(KERN_INFO "idx %d val %08x clk %d ps %d\n",
-+				uidx, upm[uidx].value,
-+				clkFinal[uidx], psFinal[uidx]);
-+		}
-+	}
-+#endif
-+
-+	data_len = upm_gen_final_data(upm, max_uidx, clkFinal, data);
-+
-+#if DEBUG_UPM
-+	for (uidx = 0; uidx < data_len; ++uidx) {
-+		printk(KERN_INFO "cf UPM x result: idx %d val %08x\n",
-+		       uidx, data[uidx]);
-+	}
-+#endif
-+	return 0;
-+}
-+
-+static int gen_upm_data(int mode, struct rbppc_cf_info *info, unsigned *data) {
-+	int i;
-+
-+	for (i = 0; i < UPM_DATA_SIZE; ++i) {
-+		data[i] = EMPTY;
-+	}
-+
-+	if (conv_upm_table(cfUpmReadSingle, mode, info, data + UPM_READ_SINGLE_OFFSET)) {
-+		return -1;
-+	}
-+	if (conv_upm_table(cfUpmWriteSingle, mode, info, data + UPM_WRITE_SINGLE_OFFSET)) {
-+		return -1;
-+	}
-+	return 0;
-+}
-+
-+static void rbppc_cf_program_upm(void *upmMemAddr, volatile void *lbcfg_mxmr, volatile void *lbcfg_mdr, const unsigned *upmData, unsigned offset, unsigned len) {
-+	unsigned i;
-+	unsigned mxmr;
-+
-+	mxmr = in_be32(lbcfg_mxmr);
-+	mxmr &= ~(MxMR_OP_MASK | MxMR_MAD_MASK);
-+	mxmr |= (MxMR_OP_WRITE | offset);
-+	out_be32(lbcfg_mxmr, mxmr);
-+	in_be32(lbcfg_mxmr); /* flush MxMR write */
-+
-+	for (i = 0; i < len; ++i) {
-+		int to;
-+		unsigned data = upmData[i + offset];
-+		out_be32(lbcfg_mdr, data);
-+		in_be32(lbcfg_mdr); /* flush MDR write */
-+
-+		iowrite8(1, upmMemAddr); /* dummy write to any CF addr */
-+
-+		/* wait for dummy write to complete */
-+		for (to = 10000; to >= 0; --to) {
-+			mxmr = in_be32(lbcfg_mxmr);
-+			if (((mxmr ^ (i + 1)) & MxMR_MAD_MASK) == 0) {
-+				break;
-+			}
-+			if (to == 0) {
-+				printk(KERN_ERR "rbppc_cf_program_upm: UPMx program error at 0x%x: Timeout\n", i);
-+			}
-+		}
-+	}
-+	mxmr &= ~(MxMR_OP_MASK | MxMR_RLF_MASK | MxMR_WLF_MASK);
-+	mxmr |= (MxMR_OP_NORMAL | (LOOP_SIZE << MxMR_RLF_SHIFT) | (LOOP_SIZE << MxMR_WLF_SHIFT));
-+	out_be32(lbcfg_mxmr, mxmr);
-+}
-+
-+static int rbppc_cf_update_piomode(struct ata_port *ap, int mode) {
-+	struct rbppc_cf_info *info = (struct rbppc_cf_info *)ap->host->private_data;
-+	void *lbcfgBase;
-+	unsigned upmData[UPM_DATA_SIZE];
-+
-+	if (gen_upm_data(mode, info, upmData)) {
-+		return -1;
-+	}
-+
-+	lbcfgBase = ioremap_nocache(info->lbcfg_addr, IMMR_LBCFG_SIZE);
-+
-+	rbppc_cf_program_upm(ap->ioaddr.cmd_addr, ((char *)lbcfgBase) + LOCAL_BUS_MCMR, ((char *)lbcfgBase) + LOCAL_BUS_MDR, upmData, 0, UPM_DATA_SIZE);
-+	iounmap(lbcfgBase);
-+	return 0;
-+}
-+
-+static void rbppc_cf_set_piomode(struct ata_port *ap, struct ata_device *adev)
-+{
-+	struct rbppc_cf_info *info = (struct rbppc_cf_info *)ap->host->private_data;
-+	int mode = adev->pio_mode - XFER_PIO_0;
-+
-+	DPRINTK("rbppc_cf_set_piomode: PIO %d\n", mode);
-+	if (mode < 0) mode = 0;
-+	if (mode > 6) mode = 6;
-+
-+	if (info->cur_mode < 0 || info->cur_mode > mode) {
-+		if (rbppc_cf_update_piomode(ap, mode) == 0) {
-+			printk(KERN_INFO "rbppc_cf_set_piomode: PIO mode changed to %d\n", mode);
-+			info->cur_mode = mode;
-+		}
-+	}
-+}
-+
-+static struct scsi_host_template rbppc_cf_sht = {
-+	ATA_BASE_SHT(DRV_NAME),
-+};
-+
-+static struct ata_port_operations rbppc_cf_port_ops = {
-+	.inherits		= &ata_bmdma_port_ops,
-+
-+	.sff_check_status	= rbppc_cf_check_status,
-+	.sff_check_altstatus	= rbppc_cf_check_altstatus,
-+
-+	.set_piomode		= rbppc_cf_set_piomode,
-+
-+	.port_start		= rbppc_cf_dummy_ret0,
-+
-+	.sff_irq_clear		= rbppc_cf_dummy_noret,
-+};
-+
-+static int rbppc_cf_init_info(struct of_device *pdev, struct rbppc_cf_info *info) {
-+	struct device_node *np;
-+	struct resource res;
-+	const u32 *u32ptr;
-+	void *lbcfgBase;
-+	void *lbcfg_lcrr;
-+	unsigned lbc_clk_khz;
-+	unsigned lbc_extra_divider = 1;
-+	unsigned ccb_freq_hz;
-+	unsigned lb_div;
-+
-+	u32ptr = of_get_property(pdev->node, "lbc_extra_divider", NULL);
-+	if (u32ptr && *u32ptr) {
-+		lbc_extra_divider = *u32ptr;
-+#if DEBUG_UPM
-+		printk(KERN_INFO "rbppc_cf_init_info: LBC extra divider %u\n",
-+		       lbc_extra_divider);
-+#endif
-+	}
-+
-+	np = of_find_node_by_type(NULL, "serial");
-+	if (!np) {
-+		printk(KERN_ERR "rbppc_cf_init_info: No serial node found\n");
-+		return -1;
-+	}
-+	u32ptr = of_get_property(np, "clock-frequency", NULL);
-+	if (u32ptr == 0 || *u32ptr == 0) {
-+		printk(KERN_ERR "rbppc_cf_init_info: Serial does not have clock-frequency\n");
-+		of_node_put(np);
-+		return -1;
-+	}
-+	ccb_freq_hz = *u32ptr;
-+	of_node_put(np);
-+
-+	np = of_find_node_by_type(NULL, "soc");
-+	if (!np) {
-+		printk(KERN_ERR "rbppc_cf_init_info: No soc node found\n");
-+		return -1;
-+	}
-+	if (of_address_to_resource(np, 0, &res)) {
-+		printk(KERN_ERR "rbppc_cf_init_info: soc does not have resource\n");
-+		of_node_put(np);
-+		return -1;
-+	}
-+	info->lbcfg_addr = res.start + IMMR_LBCFG_OFFSET;
-+	of_node_put(np);
-+
-+	lbcfgBase = ioremap_nocache(info->lbcfg_addr, IMMR_LBCFG_SIZE);
-+	lbcfg_lcrr = ((char*)lbcfgBase) + LOCAL_BUS_LCRR;
-+	lb_div = (in_be32(lbcfg_lcrr) & LCRR_CLKDIV_MASK) * lbc_extra_divider;
-+	iounmap(lbcfgBase);
-+
-+	lbc_clk_khz = ccb_freq_hz / (1000 * lb_div);
-+	info->clk_time_ps = 1000000000 / lbc_clk_khz;
-+	printk(KERN_INFO "rbppc_cf_init_info: Using Local-Bus clock %u kHz %u ps\n",
-+	       lbc_clk_khz, info->clk_time_ps);
-+
-+	u32ptr = of_get_property(pdev->node, "lb-timings", NULL);
-+	if (u32ptr) {
-+		memcpy(info->lb_timings, u32ptr, LBT_SIZE * sizeof(*u32ptr));
-+#if DEBUG_UPM
-+		printk(KERN_INFO "rbppc_cf_init_info: Got LB timings <%u %u %u %u %u>\n",
-+		       u32ptr[0], u32ptr[1], u32ptr[2], u32ptr[3], u32ptr[4]);
-+#endif
-+	}
-+	info->cur_mode = -1;
-+	return 0;
-+}
-+
-+static int rbppc_cf_probe(struct of_device *pdev,
-+			  const struct of_device_id *match)
-+{
-+	struct ata_host *host;
-+	struct ata_port *ap;
-+	struct rbppc_cf_info *info = NULL;
-+	struct resource res;
-+	void *baddr;
-+	const u32 *u32ptr;
-+	int irq_level = 0;
-+	int err = -ENOMEM;
-+
-+	printk(KERN_INFO "rbppc_cf_probe: MikroTik RouterBOARD 600 series Compact Flash PATA driver, version " DRV_VERSION "\n");
-+
-+	if (rbinfo == NULL) {
-+		info = kmalloc(sizeof(*info), GFP_KERNEL);
-+		if (info == NULL) {
-+			printk(KERN_ERR "rbppc_cf_probe: Out of memory\n");
-+			goto err_info;
-+		}
-+		memset(info, 0, sizeof(*info));
-+
-+		if (rbppc_cf_init_info(pdev, info)) {
-+			goto err_info;
-+		}
-+		rbinfo = info;
-+	}
-+
-+	u32ptr = of_get_property(pdev->node, "interrupt-at-level", NULL);
-+	if (u32ptr) {
-+		irq_level = *u32ptr;
-+		printk(KERN_INFO "rbppc_cf_probe: IRQ level %u\n", irq_level);
-+	}
-+
-+	if (of_address_to_resource(pdev->node, 0, &res)) {
-+	    printk(KERN_ERR "rbppc_cf_probe: No reg property found\n");
-+	    goto err_info;
-+	}
-+
-+	host = ata_host_alloc(&pdev->dev, 1);
-+	if (!host)
-+	    goto err_info;
-+
-+	baddr = localbus_map(res.start, res.end - res.start + 1);
-+	host->iomap = baddr;
-+	host->private_data = rbinfo;
-+
-+	ap = host->ports[0];
-+	ap->ops = &rbppc_cf_port_ops;
-+	ap->pio_mask = 0x7F;	/* PIO modes 0-6 */
-+	ap->flags = ATA_FLAG_NO_LEGACY;
-+	ap->mwdma_mask = 0;
-+
-+	ap->ioaddr.cmd_addr = baddr;
-+	ata_sff_std_ports(&ap->ioaddr);
-+	ap->ioaddr.ctl_addr = ap->ioaddr.cmd_addr + 14;
-+	ap->ioaddr.altstatus_addr = ap->ioaddr.ctl_addr;
-+	ap->ioaddr.bmdma_addr = 0;
-+
-+	err = ata_host_activate(
-+		host,
-+		irq_of_parse_and_map(pdev->node, 0), ata_sff_interrupt,
-+		irq_level ? IRQF_TRIGGER_HIGH : IRQF_TRIGGER_LOW,
-+		&rbppc_cf_sht);
-+	if (!err) return 0;
-+
-+	localbus_unmap(baddr);
-+err_info:
-+	if (info) {
-+		kfree(info);
-+		rbinfo = NULL;
-+	}
-+	return err;
-+}
-+
-+static int rbppc_cf_remove(struct of_device *pdev)
-+{
-+	struct device *dev = &pdev->dev;
-+	struct ata_host *host = dev_get_drvdata(dev);
-+
-+	if (host == NULL) return -1;
-+
-+	ata_host_detach(host);
-+	return 0;
-+}
-+
-+static struct of_device_id rbppc_cf_ids[] = {
-+	{ .name = "cf", },
-+	{ },
-+};
-+
-+static struct of_platform_driver rbppc_cf_driver = {
-+	.name = "cf",
-+	.probe = rbppc_cf_probe,
-+	.remove = rbppc_cf_remove,
-+	.match_table = rbppc_cf_ids,
-+	.driver	= {
-+		.name = "rbppc-cf",
-+		.owner = THIS_MODULE,
-+	},
-+};
-+
-+static int __init rbppc_init(void)
-+{
-+	return of_register_platform_driver(&rbppc_cf_driver);
-+}
-+
-+static void __exit rbppc_exit(void)
-+{
-+	of_unregister_platform_driver(&rbppc_cf_driver);
-+}
-+
-+MODULE_AUTHOR("Mikrotikls SIA");
-+MODULE_AUTHOR("Noah Fontes");
-+MODULE_DESCRIPTION("MikroTik RouterBOARD 600 series Compact Flash PATA driver");
-+MODULE_LICENSE("GPL");
-+MODULE_VERSION(DRV_VERSION);
-+
-+module_init(rbppc_init);
-+module_exit(rbppc_exit);
---- a/drivers/mtd/nand/Kconfig
-+++ b/drivers/mtd/nand/Kconfig
-@@ -403,6 +403,13 @@ config MTD_NAND_PLATFORM
- 	  devices. You will need to provide platform-specific functions
- 	  via platform_data.
- 
-+config MTD_NAND_RB_PPC
-+	tristate "MikroTik RB600 NAND support"
-+	depends on MTD_NAND && MTD_PARTITIONS && RB_PPC
-+	help
-+	  This option enables support for the NAND device on MikroTik
-+	  RouterBOARD 600 series boards.
-+
- config MTD_ALAUDA
- 	tristate "MTD driver for Olympus MAUSB-10 and Fujifilm DPC-R1"
- 	depends on MTD_NAND && USB
---- a/drivers/mtd/nand/Makefile
-+++ b/drivers/mtd/nand/Makefile
-@@ -31,6 +31,7 @@ obj-$(CONFIG_MTD_NAND_BASLER_EXCITE)	+= 
- obj-$(CONFIG_MTD_NAND_PXA3xx)		+= pxa3xx_nand.o
- obj-$(CONFIG_MTD_NAND_TMIO)		+= tmio_nand.o
- obj-$(CONFIG_MTD_NAND_PLATFORM)		+= plat_nand.o
-+obj-$(CONFIG_MTD_NAND_RB_PPC)		+= rbppc_nand.o
- obj-$(CONFIG_MTD_ALAUDA)		+= alauda.o
- obj-$(CONFIG_MTD_NAND_PASEMI)		+= pasemi_nand.o
- obj-$(CONFIG_MTD_NAND_ORION)		+= orion_nand.o
---- /dev/null
-+++ b/drivers/mtd/nand/rbppc_nand.c
-@@ -0,0 +1,252 @@
-+/*
-+ * Copyright (C) 2008-2009 Noah Fontes <nfontes@transtruct.org>
-+ * Copyright (C) 2009 Michael Guntsche <mike@it-loops.com>
-+ * Copyright (C) Mikrotik 2007
-+ *
-+ * 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/init.h>
-+#include <linux/mtd/nand.h>
-+#include <linux/mtd/mtd.h>
-+#include <linux/mtd/partitions.h>
-+#include <linux/of_platform.h>
-+#include <asm/of_platform.h>
-+#include <asm/of_device.h>
-+#include <linux/delay.h>
-+#include <asm/io.h>
-+
-+#define DRV_NAME	"rbppc_nand"
-+#define DRV_VERSION	"0.0.2"
-+
-+static struct mtd_info rmtd;
-+static struct nand_chip rnand;
-+
-+struct rbppc_nand_info {
-+	void *gpi;
-+	void *gpo;
-+	void *localbus;
-+
-+	unsigned gpio_rdy;
-+	unsigned gpio_nce;
-+	unsigned gpio_cle;
-+	unsigned gpio_ale;
-+	unsigned gpio_ctrls;
-+};
-+
-+/* We must use the OOB layout from yaffs 1 if we want this to be recognized
-+ * properly. Borrowed from the OpenWRT patches for the RB532.
-+ *
-+ * See <https://dev.openwrt.org/browser/trunk/target/linux/rb532/
-+ * patches-2.6.28/025-rb532_nand_fixup.patch> for more details.
-+ */
-+static struct nand_ecclayout rbppc_nand_oob_16 = {
-+	.eccbytes = 6,
-+	.eccpos = { 8, 9, 10, 13, 14, 15 },
-+	.oobavail = 9,
-+	.oobfree = { { 0, 4 }, { 6, 2 }, { 11, 2 }, { 4, 1 } }
-+};
-+
-+static struct mtd_partition rbppc_nand_partition_info[] = {
-+	{
-+		name: "RouterBOARD NAND Boot",
-+		offset: 0,
-+		size: 4 * 1024 * 1024,
-+	},
-+	{
-+		name: "RouterBOARD NAND Main",
-+		offset: MTDPART_OFS_NXTBLK,
-+		size: MTDPART_SIZ_FULL,
-+	},
-+};
-+
-+static int rbppc_nand_dev_ready(struct mtd_info *mtd) {
-+	struct nand_chip *chip = mtd->priv;
-+	struct rbppc_nand_info *priv = chip->priv;
-+
-+	return in_be32(priv->gpi) & priv->gpio_rdy;
-+}
-+
-+static void rbppc_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl) {
-+	struct nand_chip *chip = mtd->priv;
-+	struct rbppc_nand_info *priv = chip->priv;
-+
-+	if (ctrl & NAND_CTRL_CHANGE) {
-+		unsigned val = in_be32(priv->gpo);
-+		if (!(val & priv->gpio_nce)) {
-+			/* make sure Local Bus has done NAND operations */
-+			readb(priv->localbus);
-+		}
-+
-+		if (ctrl & NAND_CLE) {
-+			val |= priv->gpio_cle;
-+		} else {
-+			val &= ~priv->gpio_cle;
-+		}
-+		if (ctrl & NAND_ALE) {
-+			val |= priv->gpio_ale;
-+		} else {
-+			val &= ~priv->gpio_ale;
-+		}
-+		if (!(ctrl & NAND_NCE)) {
-+			val |= priv->gpio_nce;
-+		} else {
-+			val &= ~priv->gpio_nce;
-+		}
-+		out_be32(priv->gpo, val);
-+
-+		/* make sure GPIO output has changed */
-+		val ^= in_be32(priv->gpo);
-+		if (val & priv->gpio_ctrls) {
-+			printk(KERN_ERR "rbppc_nand_hwcontrol: NAND GPO change failed 0x%08x\n", val);
-+		}
-+	}
-+
-+	if (cmd != NAND_CMD_NONE) writeb(cmd, chip->IO_ADDR_W);
-+}
-+
-+static void rbppc_nand_read_buf(struct mtd_info *mtd, uint8_t *buf, int len)
-+{
-+	struct nand_chip *chip = mtd->priv;
-+	memcpy(buf, chip->IO_ADDR_R, len);
-+}
-+
-+static unsigned init_ok = 0;
-+
-+static int rbppc_nand_probe(struct of_device *pdev,
-+			    const struct of_device_id *match)
-+{
-+	struct device_node *gpio;
-+	struct device_node *nnand;
-+	struct resource res;
-+	struct rbppc_nand_info *info;
-+	void *baddr;
-+	const unsigned *rdy, *nce, *cle, *ale;
-+
-+	printk(KERN_INFO "rbppc_nand_probe: MikroTik RouterBOARD 600 series NAND driver, version " DRV_VERSION "\n");
-+
-+	info = kmalloc(sizeof(*info), GFP_KERNEL);
-+
-+	rdy = of_get_property(pdev->node, "rdy", NULL);
-+	nce = of_get_property(pdev->node, "nce", NULL);
-+	cle = of_get_property(pdev->node, "cle", NULL);
-+	ale = of_get_property(pdev->node, "ale", NULL);
-+
-+	if (!rdy || !nce || !cle || !ale) {
-+		printk(KERN_ERR "rbppc_nand_probe: GPIO properties are missing\n");
-+		goto err;
-+	}
-+	if (rdy[0] != nce[0] || rdy[0] != cle[0] || rdy[0] != ale[0]) {
-+		printk(KERN_ERR "rbppc_nand_probe: Different GPIOs are not supported\n");
-+		goto err;
-+	}
-+
-+	gpio = of_find_node_by_phandle(rdy[0]);
-+	if (!gpio) {
-+		printk(KERN_ERR "rbppc_nand_probe: No GPIO<%x> node found\n", *rdy);
-+		goto err;
-+	}
-+	if (of_address_to_resource(gpio, 0, &res)) {
-+		printk(KERN_ERR "rbppc_nand_probe: No reg property in GPIO found\n");
-+		goto err;
-+	}
-+	info->gpo = ioremap_nocache(res.start, res.end - res.start + 1);
-+
-+	if (!of_address_to_resource(gpio, 1, &res)) {
-+		info->gpi = ioremap_nocache(res.start, res.end - res.start + 1);
-+	} else {
-+		info->gpi = info->gpo;
-+	}
-+	of_node_put(gpio);
-+
-+	info->gpio_rdy = 1 << (31 - rdy[1]);
-+	info->gpio_nce = 1 << (31 - nce[1]);
-+	info->gpio_cle = 1 << (31 - cle[1]);
-+	info->gpio_ale = 1 << (31 - ale[1]);
-+	info->gpio_ctrls = info->gpio_nce | info->gpio_cle | info->gpio_ale;
-+
-+	nnand = of_find_node_by_name(NULL, "nnand");
-+	if (!nnand) {
-+		printk("rbppc_nand_probe: No nNAND found\n");
-+		goto err;
-+	}
-+	if (of_address_to_resource(nnand, 0, &res)) {
-+		printk("rbppc_nand_probe: No reg property in nNAND found\n");
-+		goto err;
-+	}
-+	of_node_put(nnand);
-+	info->localbus = ioremap_nocache(res.start, res.end - res.start + 1);
-+
-+	if (of_address_to_resource(pdev->node, 0, &res)) {
-+	    printk("rbppc_nand_probe: No reg property found\n");
-+	    goto err;
-+	}
-+	baddr = ioremap_nocache(res.start, res.end - res.start + 1);
-+
-+	memset(&rnand, 0, sizeof(rnand));
-+	rnand.cmd_ctrl = rbppc_nand_cmd_ctrl;
-+	rnand.dev_ready = rbppc_nand_dev_ready;
-+	rnand.read_buf = rbppc_nand_read_buf;
-+	rnand.IO_ADDR_W = baddr;
-+	rnand.IO_ADDR_R = baddr;
-+	rnand.priv = info;
-+
-+	memset(&rmtd, 0, sizeof(rmtd));
-+	rnand.ecc.mode = NAND_ECC_SOFT;
-+	rnand.ecc.layout = &rbppc_nand_oob_16;
-+	rnand.chip_delay = 25;
-+	rnand.options |= NAND_NO_AUTOINCR;
-+	rmtd.priv = &rnand;
-+	rmtd.owner = THIS_MODULE;
-+
-+	if (nand_scan(&rmtd, 1) && nand_scan(&rmtd, 1) && nand_scan(&rmtd, 1) && nand_scan(&rmtd, 1)) {
-+		printk(KERN_ERR "rbppc_nand_probe: RouterBOARD NAND device not found\n");
-+		return -ENXIO;
-+	}
-+
-+	add_mtd_partitions(&rmtd, rbppc_nand_partition_info, 2);
-+	init_ok = 1;
-+	return 0;
-+
-+err:
-+	kfree(info);
-+	return -1;
-+}
-+
-+static struct of_device_id rbppc_nand_ids[] = {
-+	{ .name = "nand", },
-+	{ },
-+};
-+
-+static struct of_platform_driver rbppc_nand_driver = {
-+	.name   = "nand",
-+	.probe	= rbppc_nand_probe,
-+	.match_table = rbppc_nand_ids,
-+	.driver	= {
-+		.name = "rbppc-nand",
-+		.owner = THIS_MODULE,
-+	},
-+};
-+
-+static int __init rbppc_nand_init(void)
-+{
-+	return of_register_platform_driver(&rbppc_nand_driver);
-+}
-+
-+static void __exit rbppc_nand_exit(void)
-+{
-+	of_unregister_platform_driver(&rbppc_nand_driver);
-+}
-+
-+MODULE_AUTHOR("Mikrotikls SIA");
-+MODULE_AUTHOR("Noah Fontes");
-+MODULE_AUTHOR("Michael Guntsche");
-+MODULE_DESCRIPTION("MikroTik RouterBOARD 600 series NAND driver");
-+MODULE_LICENSE("GPL");
-+MODULE_VERSION(DRV_VERSION);
-+
-+module_init(rbppc_nand_init);
-+module_exit(rbppc_nand_exit);
diff --git a/target/linux/mpc83xx/patches-2.6.32/002-powerpc_mkuboot.patch b/target/linux/mpc83xx/patches-2.6.32/002-powerpc_mkuboot.patch
deleted file mode 100644
index b13a9969e..000000000
--- a/target/linux/mpc83xx/patches-2.6.32/002-powerpc_mkuboot.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/arch/powerpc/boot/wrapper
-+++ b/arch/powerpc/boot/wrapper
-@@ -43,6 +43,9 @@ gzip=.gz
- # cross-compilation prefix
- CROSS=
- 
-+# mkimage wrapper script
-+MKIMAGE=$srctree/scripts/mkuboot.sh
-+
- # directory for object and other files used by this script
- object=arch/powerpc/boot
- objbin=$object
-@@ -263,7 +266,7 @@ membase=`${CROSS}objdump -p "$kernel" | 
- case "$platform" in
- uboot)
-     rm -f "$ofile"
--    mkimage -A ppc -O linux -T kernel -C gzip -a $membase -e $membase \
-+    ${MKIMAGE} -A ppc -O linux -T kernel -C gzip -a $membase -e $membase \
- 	$uboot_version -d "$vmz" "$ofile"
-     if [ -z "$cacheit" ]; then
- 	rm -f "$vmz"
-@@ -323,7 +326,7 @@ coff)
-     ;;
- cuboot*)
-     gzip -f -9 "$ofile"
--    mkimage -A ppc -O linux -T kernel -C gzip -a "$base" -e "$entry" \
-+    ${MKIMAGE} -A ppc -O linux -T kernel -C gzip -a "$base" -e "$entry" \
-             $uboot_version -d "$ofile".gz "$ofile"
-     ;;
- treeboot*)
diff --git a/target/linux/mpc83xx/patches-2.6.32/003-powerpc_create_fit_uImages.patch b/target/linux/mpc83xx/patches-2.6.32/003-powerpc_create_fit_uImages.patch
deleted file mode 100644
index 52899ce71..000000000
--- a/target/linux/mpc83xx/patches-2.6.32/003-powerpc_create_fit_uImages.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- a/arch/powerpc/Makefile
-+++ b/arch/powerpc/Makefile
-@@ -157,7 +157,8 @@ drivers-$(CONFIG_OPROFILE)	+= arch/power
- # Default to zImage, override when needed
- all: zImage
- 
--BOOT_TARGETS = zImage zImage.initrd uImage zImage% dtbImage% treeImage.% cuImage.% simpleImage.%
-+BOOT_TARGETS = zImage zImage.initrd uImage uImage.fit.% zImage% dtbImage% \
-+	       treeImage.% cuImage.% simpleImage.%
- 
- PHONY += $(BOOT_TARGETS)
- 
-@@ -184,6 +185,7 @@ define archhelp
-   @echo '* zImage          - Build default images selected by kernel config'
-   @echo '  zImage.*        - Compressed kernel image (arch/$(ARCH)/boot/zImage.*)'
-   @echo '  uImage          - U-Boot native image format'
-+  @echo '  uImage.fit.<dt> - U-Boot Flattened Image Tree image format'
-   @echo '  cuImage.<dt>    - Backwards compatible U-Boot image for older'
-   @echo '                    versions which do not support device trees'
-   @echo '  dtbImage.<dt>   - zImage with an embedded device tree blob'
---- a/arch/powerpc/boot/.gitignore
-+++ b/arch/powerpc/boot/.gitignore
-@@ -19,6 +19,7 @@ kernel-vmlinux.strip.c
- kernel-vmlinux.strip.gz
- mktree
- uImage
-+uImage.fit.*
- cuImage.*
- dtbImage.*
- treeImage.*
---- a/arch/powerpc/boot/Makefile
-+++ b/arch/powerpc/boot/Makefile
-@@ -308,6 +308,9 @@ $(obj)/zImage.iseries: vmlinux
- $(obj)/uImage: vmlinux $(wrapperbits)
- 	$(call if_changed,wrap,uboot)
- 
-+$(obj)/uImage.fit.%: vmlinux $(obj)/%.dtb $(wrapperbits)
-+	$(call if_changed,wrap,uboot.fit,,$(obj)/$*.dtb)
-+
- $(obj)/cuImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)
- 	$(call if_changed,wrap,cuboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)
- 
-@@ -347,7 +350,7 @@ install: $(CONFIGURE) $(addprefix $(obj)
- 
- # anything not in $(targets)
- clean-files += $(image-) $(initrd-) cuImage.* dtbImage.* treeImage.* \
--	zImage zImage.initrd zImage.chrp zImage.coff zImage.holly \
-+	uImage.* zImage zImage.initrd zImage.chrp zImage.coff zImage.holly \
- 	zImage.iseries zImage.miboot zImage.pmac zImage.pseries \
- 	simpleImage.* otheros.bld *.dtb
- 
---- a/arch/powerpc/boot/wrapper
-+++ b/arch/powerpc/boot/wrapper
-@@ -46,6 +46,9 @@ CROSS=
- # mkimage wrapper script
- MKIMAGE=$srctree/scripts/mkuboot.sh
- 
-+# script to generate an .its file for uImage.fit.* images
-+MKITS=$srctree/scripts/mkits.sh
-+
- # directory for object and other files used by this script
- object=arch/powerpc/boot
- objbin=$object
-@@ -157,7 +160,7 @@ coff)
-     lds=$object/zImage.coff.lds
-     link_address='0x500000'
-     ;;
--miboot|uboot)
-+miboot|uboot|uboot.fit)
-     # miboot and U-boot want just the bare bits, not an ELF binary
-     ext=bin
-     objflags="-O binary"
-@@ -273,6 +276,21 @@ uboot)
-     fi
-     exit 0
-     ;;
-+uboot.fit)
-+    rm -f "$ofile"
-+    ${MKITS} -A ppc -C gzip -a $membase -e $membase -v $version \
-+	-d "$srctree/$dtb" -k "$srctree/$vmz" -o "$object/uImage.its"
-+
-+    # mkimage calls dtc for FIT images so use kernel dtc if necessary
-+    export PATH=$PATH:$srctree/scripts/dtc
-+
-+    ${MKIMAGE} -f "$object/uImage.its" "$ofile"
-+    rm "$object/uImage.its"
-+    if [ -z "$cacheit" ]; then
-+	rm -f "$vmz"
-+    fi
-+    exit 0
-+    ;;
- esac
- 
- addsec() {
diff --git a/target/linux/mpc83xx/patches-2.6.32/100-vitesse_8601.patch b/target/linux/mpc83xx/patches-2.6.32/100-vitesse_8601.patch
deleted file mode 100644
index 0eb2880f9..000000000
--- a/target/linux/mpc83xx/patches-2.6.32/100-vitesse_8601.patch
+++ /dev/null
@@ -1,116 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -51,6 +51,12 @@ config VITESSE_PHY
-         ---help---
-           Currently supports the vsc8244
- 
-+config VITESSE_PHY_8601_SKEW
-+	bool "Enable skew timing to vsc8601"
-+	depends on VITESSE_PHY
-+	---help---
-+	  Apply clock timing adjustments for vsc8601
-+
- config SMSC_PHY
- 	tristate "Drivers for SMSC PHYs"
- 	---help---
---- a/drivers/net/phy/vitesse.c
-+++ b/drivers/net/phy/vitesse.c
-@@ -26,6 +26,11 @@
- #define MII_VSC8244_EXTCON1_TX_SKEW	0x0800
- #define MII_VSC8244_EXTCON1_RX_SKEW	0x0200
- 
-+/* EXT_CON1 Register values for VSC8601 */
-+#define MII_VSC8601_EXTCON1_INIT       0x0000
-+#define MII_VSC8601_EXTCON1_SKEW       0x0100
-+#define MII_VSC8601_EXTCON1_ACTIPHY    0x0020
-+
- /* Vitesse Interrupt Mask Register */
- #define MII_VSC8244_IMASK		0x19
- #define MII_VSC8244_IMASK_IEN		0x8000
-@@ -88,6 +93,30 @@ static int vsc824x_config_init(struct ph
- 	return err;
- }
- 
-+static int vsc8601_config_init(struct phy_device *phydev)
-+{
-+	int err;
-+	int extcon;
-+
-+	err = phy_write(phydev, MII_VSC8244_AUX_CONSTAT,
-+					MII_VSC8244_AUXCONSTAT_INIT);
-+
-+	if (err < 0)
-+		return err;
-+
-+#ifdef CONFIG_VITESSE_PHY_8601_SKEW
-+	extcon = phy_read(phydev, MII_VSC8244_EXT_CON1);
-+	if (err < 0)
-+		return err;
-+
-+	extcon |= MII_VSC8601_EXTCON1_SKEW;
-+
-+	err = phy_write(phydev, MII_VSC8244_EXT_CON1, extcon);
-+#endif
-+
-+	return err;
-+}
-+
- static int vsc824x_ack_interrupt(struct phy_device *phydev)
- {
- 	int err = 0;
-@@ -143,6 +172,21 @@ static struct phy_driver vsc8244_driver 
- 	.driver 	= { .owner = THIS_MODULE,},
- };
- 
-+/* Vitesse 8601 */
-+static struct phy_driver vsc8601_driver = {
-+	.phy_id         = 0x00070420,
-+	.name           = "Vitesse VSC8601",
-+	.phy_id_mask    = 0x000ffff8,
-+	.features       = PHY_GBIT_FEATURES,
-+	.flags          = PHY_HAS_INTERRUPT,
-+	.config_init    = &vsc8601_config_init,
-+	.config_aneg    = &genphy_config_aneg,
-+	.read_status    = &genphy_read_status,
-+	.ack_interrupt  = &vsc824x_ack_interrupt,
-+	.config_intr    = &vsc82xx_config_intr,
-+	.driver         = { .owner = THIS_MODULE,},
-+};
-+
- static int vsc8221_config_init(struct phy_device *phydev)
- {
- 	int err;
-@@ -176,10 +220,23 @@ static int __init vsc82xx_init(void)
- 
- 	err = phy_driver_register(&vsc8244_driver);
- 	if (err < 0)
--		return err;
-+		goto err;
-+
- 	err = phy_driver_register(&vsc8221_driver);
- 	if (err < 0)
--		phy_driver_unregister(&vsc8244_driver);
-+		goto err1;
-+
-+	err = phy_driver_register(&vsc8601_driver);
-+	if (err < 0)
-+		goto err2;
-+
-+	return 0;
-+
-+err2:
-+	phy_driver_unregister(&vsc8221_driver);
-+err1:
-+	phy_driver_unregister(&vsc8244_driver);
-+err:
- 	return err;
- }
- 
-@@ -187,6 +244,7 @@ static void __exit vsc82xx_exit(void)
- {
- 	phy_driver_unregister(&vsc8244_driver);
- 	phy_driver_unregister(&vsc8221_driver);
-+	phy_driver_unregister(&vsc8601_driver);
- }
- 
- module_init(vsc82xx_init);
diff --git a/target/linux/mpc83xx/patches-2.6.32/110-etsec27_war.patch b/target/linux/mpc83xx/patches-2.6.32/110-etsec27_war.patch
deleted file mode 100644
index 111434b2c..000000000
--- a/target/linux/mpc83xx/patches-2.6.32/110-etsec27_war.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/drivers/net/gianfar.c
-+++ b/drivers/net/gianfar.c
-@@ -334,7 +334,14 @@ static int gfar_probe(struct of_device *
- 	/* We need to delay at least 3 TX clocks */
- 	udelay(2);
- 
--	tempval = (MACCFG1_TX_FLOW | MACCFG1_RX_FLOW);
-+	/*
-+	 * Do not enable flow control on chips earlier than rev 1.1,
-+	 * because of the eTSEC27 erratum
-+	 */
-+	tempval = 0;
-+	if (mfspr(SPRN_SVR) & 0xffff >= 0x0011)
-+		tempval = (MACCFG1_TX_FLOW | MACCFG1_RX_FLOW);
-+
- 	gfar_write(&priv->regs->maccfg1, tempval);
- 
- 	/* Initialize MACCFG2. */
diff --git a/target/linux/mpc83xx/patches/001-rb600.patch b/target/linux/mpc83xx/patches/001-rb600.patch
deleted file mode 100644
index 1d2d1a909..000000000
--- a/target/linux/mpc83xx/patches/001-rb600.patch
+++ /dev/null
@@ -1,1976 +0,0 @@
---- /dev/null
-+++ b/arch/powerpc/boot/dts/rb600.dts
-@@ -0,0 +1,242 @@
-+/*
-+ * RouterBOARD 600 series Device Tree Source
-+ *
-+ * Copyright 2009 Michael Guntsche <mike@it-loops.com>
-+ *
-+ * 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.
-+ */
-+
-+/dts-v1/;
-+
-+/ {
-+	model = "RB600";
-+	compatible = "MPC83xx";
-+	#address-cells = <1>;
-+	#size-cells = <1>;
-+
-+	aliases {
-+		ethernet0 = &enet0;
-+		ethernet1 = &enet1;
-+	};
-+
-+	chosen {
-+		linux,stdout-path = "/soc8343@e0000000/serial@4500";
-+	};
-+
-+	cpus {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		PowerPC,8343E@0 {
-+			device_type = "cpu";
-+			reg = <0x0>;
-+			d-cache-line-size = <0x20>;
-+			i-cache-line-size = <0x20>;
-+			d-cache-size = <0x8000>;
-+			i-cache-size = <0x8000>;
-+			timebase-frequency = <0x0000000>; // filled by the bootwrapper from the firmware blob
-+			clock-frequency = <0x00000000>; // filled by the bootwrapper from the firmware blob
-+		};
-+	};
-+
-+	memory {
-+		device_type = "memory";
-+		reg = <0x0 0x0000000>; // filled by the bootwrapper from the firmware blob
-+	};
-+
-+	cf@f9200000 {
-+		lb-timings = <0x5dc 0x3e8 0x1194 0x5dc 0x2af8>;
-+		interrupt-at-level = <0x0>;
-+		interrupt-parent = <&ipic>;
-+		interrupts = <0x16 0x8>;
-+		lbc_extra_divider = <0x1>;
-+		reg = <0xf9200000 0x200000>;
-+		device_type = "rb,cf";
-+	};
-+
-+	cf@f9000000 {
-+		lb-timings = <0x5dc 0x3e8 0x1194 0x5dc 0x2af8>;
-+		interrupt-at-level = <0x0>;
-+		interrupt-parent = <&ipic>;
-+		interrupts = <0x14 0x8>;
-+		lbc_extra_divider = <0x1>;
-+		reg = <0xf9000000 0x200000>;
-+		device_type = "rb,cf";
-+	};
-+
-+	flash {
-+		reg = <0xff800000 0x20000>;
-+	};
-+
-+	nnand {
-+		reg = <0xf0000000 0x1000>;
-+	};
-+
-+	nand {
-+		ale = <&gpio 0x6>;
-+		cle = <&gpio 0x5>;
-+		nce = <&gpio 0x4>;
-+		rdy = <&gpio 0x3>;
-+		reg = <0xf8000000 0x1000>;
-+		device_type = "rb,nand";
-+	};
-+
-+	fancon {
-+		interrupt-parent = <&ipic>;
-+		interrupts = <0x17 0x8>;
-+		sense = <&gpio 0x7>;
-+		fan_on = <&gpio 0x9>;
-+	};
-+
-+	pci0: pci@e0008500 {
-+		device_type = "pci";
-+		compatible = "fsl,mpc8349-pci";
-+		reg = <0xe0008500 0x100 0xe0008300 0x8>;
-+		#address-cells = <3>;
-+		#size-cells = <2>;
-+		#interrupt-cells = <1>;
-+		ranges = <0x2000000 0x0 0x80000000 0x80000000 0x0 0x20000000 0x1000000 0x0 0x0 0xd0000000 0x0 0x4000000>;
-+		bus-range = <0x0 0x0>;
-+		interrupt-map = <
-+			0x5800 0x0 0x0 0x1 &ipic 0x15 0x8
-+			0x6000 0x0 0x0 0x1 &ipic 0x30 0x8
-+			0x6000 0x0 0x0 0x2 &ipic 0x11 0x8
-+			0x6800 0x0 0x0 0x1 &ipic 0x11 0x8
-+			0x6800 0x0 0x0 0x2 &ipic 0x12 0x8
-+			0x7000 0x0 0x0 0x1 &ipic 0x12 0x8
-+			0x7000 0x0 0x0 0x2 &ipic 0x13 0x8
-+			0x7800 0x0 0x0 0x1 &ipic 0x13 0x8
-+			0x7800 0x0 0x0 0x2 &ipic 0x30 0x8
-+			0x8000 0x0 0x0 0x1 &ipic 0x30 0x8
-+			0x8000 0x0 0x0 0x2 &ipic 0x12 0x8
-+			0x8000 0x0 0x0 0x3 &ipic 0x11 0x8
-+			0x8000 0x0 0x0 0x4 &ipic 0x13 0x8
-+			0xa000 0x0 0x0 0x1 &ipic 0x30 0x8
-+			0xa000 0x0 0x0 0x2 &ipic 0x11 0x8
-+			0xa000 0x0 0x0 0x3 &ipic 0x12 0x8
-+			0xa000 0x0 0x0 0x4 &ipic 0x13 0x8
-+			0xa800 0x0 0x0 0x1 &ipic 0x11 0x8
-+			0xa800 0x0 0x0 0x2 &ipic 0x12 0x8
-+			0xa800 0x0 0x0 0x3 &ipic 0x13 0x8
-+			0xa800 0x0 0x0 0x4 &ipic 0x30 0x8>;
-+		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
-+		interrupt-parent = <&ipic>;
-+	};
-+
-+	soc8343@e0000000 {
-+		#address-cells = <1>;
-+		#size-cells = <1>;
-+		device_type = "soc";
-+		compatible = "simple-bus";
-+		ranges = <0x0 0xe0000000 0x100000>;
-+		reg = <0xe0000000 0x200>;
-+		bus-frequency = <0x1>;
-+
-+		led {
-+			user_led = <0x400 0x8>;
-+		};
-+
-+		beeper {
-+			reg = <0x500 0x100>;
-+		};
-+
-+		gpio: gpio@0 {
-+			reg = <0xc08 0x4>;
-+			device-id = <0x0>;
-+			compatible = "gpio";
-+			device_type = "gpio";
-+		};
-+
-+		enet0: ethernet@25000 {
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+			cell-index = <0>;
-+			phy-handle = <&phy0>;
-+			tbi-handle = <&tbi0>;
-+			interrupt-parent = <&ipic>;
-+			interrupts = <0x23 0x8 0x24 0x8 0x25 0x8>;
-+			local-mac-address = [00 00 00 00 00 00];
-+			reg = <0x25000 0x1000>;
-+			ranges = <0x0 0x25000 0x1000>;
-+			compatible = "gianfar";
-+			model = "TSEC";
-+			device_type = "network";
-+
-+			mdio@520 {
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				compatible = "fsl,gianfar-tbi";
-+				reg = <0x520 0x20>;
-+
-+				tbi0: tbi-phy@11 {
-+					reg = <0x11>;
-+					device_type = "tbi-phy";
-+				};
-+			};
-+		};
-+
-+		enet1: ethernet@24000 {
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+			cell-index = <1>;
-+			phy-handle = <&phy1>;
-+			tbi-handle = <&tbi1>;
-+			interrupt-parent = <&ipic>;
-+			interrupts = <0x20 0x8 0x21 0x8 0x22 0x8>;
-+			local-mac-address = [00 00 00 00 00 00];
-+			reg = <0x24000 0x1000>;
-+			ranges = <0x0 0x24000 0x1000>;
-+			compatible = "gianfar";
-+			model = "TSEC";
-+			device_type = "network";
-+
-+			mdio@520 {
-+				#size-cells = <0x0>;
-+				#address-cells = <0x1>;
-+				reg = <0x520 0x20>;
-+				compatible = "fsl,gianfar-mdio";
-+
-+				phy0: ethernet-phy@0 {
-+					device_type = "ethernet-phy";
-+					reg = <0x0>;
-+				};
-+
-+				phy1: ethernet-phy@1 {
-+					device_type = "ethernet-phy";
-+					reg = <0x1>;
-+				};
-+
-+				tbi1: tbi-phy@11 {
-+					reg = <0x11>;
-+					device_type = "tbi-phy";
-+				};
-+			};
-+		};
-+
-+		ipic: pic@700 {
-+			interrupt-controller;
-+			#address-cells = <0>;
-+			#interrupt-cells = <2>;
-+			reg = <0x700 0x100>;
-+			device_type = "ipic";
-+		};
-+
-+		serial@4500 {
-+			interrupt-parent = <&ipic>;
-+			interrupts = <0x9 0x8>;
-+			clock-frequency = <0xfe4f840>;
-+			reg = <0x4500 0x100>;
-+			compatible = "ns16550";
-+			device_type = "serial";
-+		};
-+
-+		wdt@200 {
-+			reg = <0x200 0x100>;
-+			compatible = "mpc83xx_wdt";
-+			device_type = "watchdog";
-+		};
-+	};
-+};
---- a/arch/powerpc/boot/Makefile
-+++ b/arch/powerpc/boot/Makefile
-@@ -72,7 +72,7 @@ src-plat := of.c cuboot-52xx.c cuboot-82
- 		cuboot-pq2.c cuboot-sequoia.c treeboot-walnut.c \
- 		cuboot-bamboo.c cuboot-mpc7448hpc2.c cuboot-taishan.c \
- 		fixed-head.S ep88xc.c ep405.c cuboot-c2k.c \
--		cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c \
-+		cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c rb600.c \
- 		cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \
- 		virtex405-head.S virtex.c redboot-83xx.c cuboot-sam440ep.c \
- 		cuboot-acadia.c cuboot-amigaone.c
-@@ -229,6 +229,7 @@ image-$(CONFIG_MPC834x_ITX)		+= cuImage.
- image-$(CONFIG_MPC834x_MDS)		+= cuImage.mpc834x_mds
- image-$(CONFIG_MPC836x_MDS)		+= cuImage.mpc836x_mds
- image-$(CONFIG_ASP834x)			+= dtbImage.asp834x-redboot
-+image-$(CONFIG_RB_PPC)			+= dtbImage.rb600
- 
- # Board ports in arch/powerpc/platform/85xx/Kconfig
- image-$(CONFIG_MPC8540_ADS)		+= cuImage.mpc8540ads
---- /dev/null
-+++ b/arch/powerpc/boot/rb600.c
-@@ -0,0 +1,80 @@
-+/*
-+ * The RouterBOARD platform -- for booting RB600(A) RouterBOARDs.
-+ *
-+ * Author: Michael Guntsche <mike@it-loops.com>
-+ *
-+ * Copyright (c) 2009 Michael Guntsche
-+ *
-+ * 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.
-+ */
-+
-+#include "ops.h"
-+#include "types.h"
-+#include "io.h"
-+#include "stdio.h"
-+#include <libfdt.h>
-+
-+BSS_STACK(4*1024);
-+
-+u64 memsize64;
-+const void *fw_dtb;
-+
-+static void rb600_fixups(void)
-+{
-+	const u32 *reg, *timebase, *clock;
-+	int node, size;
-+	void *chosen;
-+	const char* bootargs;
-+
-+	dt_fixup_memory(0, memsize64);
-+
-+	/* Set the MAC addresses. */
-+	node = fdt_path_offset(fw_dtb, "/soc8343@e0000000/ethernet@24000");
-+	reg = fdt_getprop(fw_dtb, node, "mac-address", &size);
-+	dt_fixup_mac_address_by_alias("ethernet1", (const u8 *)reg);
-+
-+	node = fdt_path_offset(fw_dtb, "/soc8343@e0000000/ethernet@25000");
-+	reg = fdt_getprop(fw_dtb, node, "mac-address", &size);
-+	dt_fixup_mac_address_by_alias("ethernet0", (const u8 *)reg);
-+
-+	/* Find the CPU timebase and clock frequencies. */
-+	node = fdt_node_offset_by_prop_value(fw_dtb, -1, "device_type", "cpu", sizeof("cpu"));
-+	timebase = fdt_getprop(fw_dtb, node, "timebase-frequency", &size);
-+	clock = fdt_getprop(fw_dtb, node, "clock-frequency", &size);
-+	dt_fixup_cpu_clocks(*clock, *timebase, 0);
-+
-+	/* Fixup chosen
-+	 * The bootloader reads the kernelparm segment and adds the content to
-+	 * bootargs. This is needed to specify root and other boot flags.
-+	 */
-+	chosen = finddevice("/chosen");
-+	node = fdt_path_offset(fw_dtb, "/chosen");
-+	bootargs = fdt_getprop(fw_dtb, node, "bootargs", &size);
-+	setprop_str(chosen, "bootargs", bootargs);
-+}
-+
-+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
-+		   unsigned long r6, unsigned long r7)
-+{
-+	const u32 *reg;
-+	int node, size;
-+
-+	fw_dtb = (const void *)r3;
-+
-+	/* Find the memory range. */
-+	node = fdt_node_offset_by_prop_value(fw_dtb, -1, "device_type", "memory", sizeof("memory"));
-+	reg = fdt_getprop(fw_dtb, node, "reg", &size);
-+	memsize64 = reg[1];
-+
-+	/* Now we have the memory size; initialize the heap. */
-+	simple_alloc_init(_end, memsize64 - (unsigned long)_end, 32, 64);
-+
-+	/* Prepare the device tree and find the console. */
-+	fdt_init(_dtb_start);
-+	serial_console_init();
-+
-+	/* Remaining fixups... */
-+	platform_ops.fixups = rb600_fixups;
-+}
---- a/arch/powerpc/boot/wrapper
-+++ b/arch/powerpc/boot/wrapper
-@@ -201,7 +201,7 @@ ps3)
-     isection=.kernel:initrd
-     link_address=''
-     ;;
--ep88xc|ep405|ep8248e)
-+ep88xc|ep405|ep8248e|rb600)
-     platformo="$object/fixed-head.o $object/$platform.o"
-     binary=y
-     ;;
---- a/arch/powerpc/kernel/Makefile
-+++ b/arch/powerpc/kernel/Makefile
-@@ -104,9 +104,11 @@ obj32-$(CONFIG_PPC_PERF_CTRS)	+= mpc7450
- 
- obj-$(CONFIG_8XX_MINIMAL_FPEMU) += softemu8xx.o
- 
-+ifneq ($(CONFIG_RB_IOMAP),y)
- ifneq ($(CONFIG_PPC_INDIRECT_IO),y)
- obj-y				+= iomap.o
- endif
-+endif
- 
- obj-$(CONFIG_PPC64)		+= $(obj64-y)
- obj-$(CONFIG_PPC32)		+= $(obj32-y)
---- a/arch/powerpc/platforms/83xx/Kconfig
-+++ b/arch/powerpc/platforms/83xx/Kconfig
-@@ -30,6 +30,15 @@ config MPC832x_RDB
- 	help
- 	  This option enables support for the MPC8323 RDB board.
- 
-+config RB_PPC
-+	bool "MikroTik RouterBOARD 600 series"
-+	select DEFAULT_UIMAGE
-+	select QUICC_ENGINE
-+	select PPC_MPC834x
-+	select RB_IOMAP
-+	help
-+	  This option enables support for MikroTik RouterBOARD 600 series boards.
-+
- config MPC834x_MDS
- 	bool "Freescale MPC834x MDS"
- 	select DEFAULT_UIMAGE
---- a/arch/powerpc/platforms/83xx/Makefile
-+++ b/arch/powerpc/platforms/83xx/Makefile
-@@ -6,6 +6,7 @@ obj-$(CONFIG_SUSPEND)		+= suspend.o susp
- obj-$(CONFIG_MCU_MPC8349EMITX)	+= mcu_mpc8349emitx.o
- obj-$(CONFIG_MPC831x_RDB)	+= mpc831x_rdb.o
- obj-$(CONFIG_MPC832x_RDB)	+= mpc832x_rdb.o
-+obj-$(CONFIG_RB_PPC)		+= rbppc.o
- obj-$(CONFIG_MPC834x_MDS)	+= mpc834x_mds.o
- obj-$(CONFIG_MPC834x_ITX)	+= mpc834x_itx.o
- obj-$(CONFIG_MPC836x_MDS)	+= mpc836x_mds.o
---- /dev/null
-+++ b/arch/powerpc/platforms/83xx/rbppc.c
-@@ -0,0 +1,316 @@
-+/*
-+ * Copyright (C) 2008-2009 Noah Fontes <nfontes@transtruct.org>
-+ * Copyright (C) 2009 Michael Guntsche <mike@it-loops.com>
-+ * Copyright (C) Mikrotik 2007
-+ *
-+ * 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/delay.h>
-+#include <linux/root_dev.h>
-+#include <linux/initrd.h>
-+#include <linux/interrupt.h>
-+#include <linux/of_platform.h>
-+#include <linux/of_device.h>
-+#include <linux/of_platform.h>
-+#include <asm/time.h>
-+#include <asm/ipic.h>
-+#include <asm/udbg.h>
-+#include <asm/qe.h>
-+#include <asm/qe_ic.h>
-+#include <sysdev/fsl_soc.h>
-+#include <sysdev/fsl_pci.h>
-+#include "mpc83xx.h"
-+
-+#define SYSCTL		0x100
-+#define SICRL		0x014
-+
-+#define GTCFR2		0x04
-+#define GTMDR4		0x22
-+#define GTRFR4		0x26
-+#define GTCNR4		0x2e
-+#define GTVER4		0x36
-+#define GTPSR4		0x3e
-+
-+#define GTCFR_BCM	0x40
-+#define GTCFR_STP4	0x20
-+#define GTCFR_RST4	0x10
-+#define GTCFR_STP3	0x02
-+#define GTCFR_RST3	0x01
-+
-+#define GTMDR_ORI	0x10
-+#define GTMDR_FRR	0x08
-+#define GTMDR_ICLK16	0x04
-+
-+extern int par_io_data_set(u8 port, u8 pin, u8 val);
-+extern int par_io_config_pin(u8 port, u8 pin, int dir, int open_drain,
-+			     int assignment, int has_irq);
-+
-+static unsigned timer_freq;
-+static void *gtm;
-+
-+static int beeper_irq;
-+static unsigned beeper_gpio_pin[2];
-+
-+irqreturn_t rbppc_timer_irq(int irq, void *ptr)
-+{
-+	static int toggle = 0;
-+
-+	par_io_data_set(beeper_gpio_pin[0], beeper_gpio_pin[1], toggle);
-+	toggle = !toggle;
-+
-+	/* ack interrupt */
-+	out_be16(gtm + GTVER4, 3);
-+
-+	return IRQ_HANDLED;
-+}
-+
-+void rbppc_beep(unsigned freq)
-+{
-+	unsigned gtmdr;
-+
-+	if (freq > 5000) freq = 5000;
-+
-+	if (!gtm)
-+		return;
-+	if (!freq) {
-+		out_8(gtm + GTCFR2, GTCFR_STP4 | GTCFR_STP3);
-+		return;
-+	}
-+
-+	out_8(gtm + GTCFR2, GTCFR_RST4 | GTCFR_STP3);
-+	out_be16(gtm + GTPSR4, 255);
-+	gtmdr = GTMDR_FRR | GTMDR_ICLK16;
-+	if (beeper_irq != NO_IRQ) gtmdr |= GTMDR_ORI;
-+	out_be16(gtm + GTMDR4, gtmdr);
-+	out_be16(gtm + GTVER4, 3);
-+
-+	out_be16(gtm + GTRFR4, timer_freq / 16 / 256 / freq / 2);
-+	out_be16(gtm + GTCNR4, 0);
-+}
-+EXPORT_SYMBOL(rbppc_beep);
-+
-+static void __init rbppc_setup_arch(void)
-+{
-+	struct device_node *np;
-+
-+	np = of_find_node_by_type(NULL, "cpu");
-+	if (np) {
-+		const unsigned *fp = of_get_property(np, "clock-frequency", NULL);
-+		loops_per_jiffy = fp ? *fp / HZ : 0;
-+
-+		of_node_put(np);
-+	}
-+
-+	np = of_find_node_by_name(NULL, "serial");
-+	if (np) {
-+		timer_freq =
-+		    *(unsigned *) of_get_property(np, "clock-frequency", NULL);
-+		of_node_put(np);
-+	}
-+
-+#ifdef CONFIG_PCI
-+	np = of_find_node_by_type(NULL, "pci");
-+	if (np) {
-+		mpc83xx_add_bridge(np);
-+	}
-+#endif
-+
-+#ifdef CONFIG_QUICC_ENGINE
-+	np = of_find_node_by_name(np, "par_io");
-+	if (np) {
-+		qe_reset();
-+		par_io_init(np);
-+		of_node_put(np);
-+
-+		np = NULL;
-+		while (1) {
-+			np = of_find_node_by_name(np, "ucc");
-+			if (!np) break;
-+
-+			par_io_of_config(np);
-+		}
-+	}
-+#endif
-+
-+}
-+
-+void __init rbppc_init_IRQ(void)
-+{
-+	struct device_node *np;
-+
-+	np = of_find_node_by_type(NULL, "ipic");
-+	if (np) {
-+		ipic_init(np, 0);
-+		ipic_set_default_priority();
-+		of_node_put(np);
-+	}
-+
-+#ifdef CONFIG_QUICC_ENGINE
-+	np = of_find_node_by_type(NULL, "qeic");
-+	if (np) {
-+		qe_ic_init(np, 0, qe_ic_cascade_low_ipic, qe_ic_cascade_high_ipic);
-+		of_node_put(np);
-+	}
-+#endif
-+}
-+
-+static int __init rbppc_probe(void)
-+{
-+	char *model;
-+
-+	model = of_get_flat_dt_prop(of_get_flat_dt_root(), "model", NULL);
-+
-+	if (!model)
-+		return 0;
-+
-+	if (strcmp(model, "RB600") == 0)
-+		return 1;
-+
-+	return 0;
-+}
-+
-+static void __init rbppc_beeper_init(struct device_node *beeper)
-+{
-+	struct resource res;
-+	struct device_node *gpio;
-+	const unsigned *pin;
-+	const unsigned *gpio_id;
-+
-+	if (of_address_to_resource(beeper, 0, &res)) {
-+		printk(KERN_ERR "rbppc_beeper_init(%s): Beeper error: No region specified\n", beeper->full_name);
-+		return;
-+	}
-+
-+	pin = of_get_property(beeper, "gpio", NULL);
-+	if (pin) {
-+		gpio = of_find_node_by_phandle(pin[0]);
-+
-+		if (!gpio) {
-+			printk(KERN_ERR "rbppc_beeper_init(%s): Beeper error: GPIO handle %x not found\n", beeper->full_name, pin[0]);
-+			return;
-+		}
-+
-+		gpio_id = of_get_property(gpio, "device-id", NULL);
-+		if (!gpio_id) {
-+			printk(KERN_ERR "rbppc_beeper_init(%s): Beeper error: No device-id specified in GPIO\n", beeper->full_name);
-+			return;
-+		}
-+
-+		beeper_gpio_pin[0] = *gpio_id;
-+		beeper_gpio_pin[1] = pin[1];
-+
-+		par_io_config_pin(*gpio_id, pin[1], 1, 0, 0, 0);
-+	} else {
-+		void *sysctl;
-+
-+		sysctl = ioremap_nocache(get_immrbase() + SYSCTL, 0x100);
-+		out_be32(sysctl + SICRL,
-+			 in_be32(sysctl + SICRL) | (1 << (31 - 19)));
-+		iounmap(sysctl);
-+	}
-+
-+	gtm = ioremap_nocache(res.start, res.end - res.start + 1);
-+
-+	beeper_irq = irq_of_parse_and_map(beeper, 0);
-+	if (beeper_irq != NO_IRQ) {
-+		int e = request_irq(beeper_irq, rbppc_timer_irq, 0, "beeper", NULL);
-+		if (e) {
-+			printk(KERN_ERR "rbppc_beeper_init(%s): Request of beeper irq failed!\n", beeper->full_name);
-+		}
-+	}
-+}
-+
-+#define SBIT(x) (0x80000000 >> (x))
-+#define DBIT(x, y) ((y) << (32 - (((x % 16) + 1) * 2)))
-+
-+#define SICRL_RB600(x) ((x) + (0x114 >> 2))
-+#define GPIO_DIR_RB600(x) ((x) + (0xc00 >> 2))
-+#define GPIO_DATA_RB600(x) ((x) + (0xc08 >> 2))
-+
-+static void rbppc_restart(char *cmd)
-+{
-+	__be32 __iomem *reg;
-+
-+	reg = ioremap(get_immrbase(), 0x1000);
-+	local_irq_disable();
-+	out_be32(SICRL_RB600(reg), in_be32(SICRL_RB600(reg)) & ~0x00800000);
-+	out_be32(GPIO_DIR_RB600(reg), in_be32(GPIO_DIR_RB600(reg)) | SBIT(2));
-+	out_be32(GPIO_DATA_RB600(reg), in_be32(GPIO_DATA_RB600(reg)) & ~SBIT(2));
-+
-+	while (1);
-+}
-+
-+static void rbppc_halt(void)
-+{
-+	while (1);
-+}
-+
-+static struct of_device_id rbppc_ids[] = {
-+	{ .type = "soc", },
-+	{ .compatible = "soc", },
-+	{ .compatible = "simple-bus", },
-+	{ .compatible = "gianfar", },
-+	{ },
-+};
-+
-+static int __init rbppc_declare_of_platform_devices(void)
-+{
-+	struct device_node *np;
-+	unsigned idx;
-+
-+	of_platform_bus_probe(NULL, rbppc_ids, NULL);
-+
-+	np = of_find_node_by_type(NULL, "mdio");
-+	if (np) {
-+		unsigned len;
-+		unsigned *res;
-+		const unsigned *eres;
-+		struct device_node *ep;
-+
-+		ep = of_find_compatible_node(NULL, "network", "ucc_geth");
-+		if (ep) {
-+			eres = of_get_property(ep, "reg", &len);
-+			res = (unsigned *) of_get_property(np, "reg", &len);
-+			if (res && eres) {
-+				res[0] = eres[0] + 0x120;
-+			}
-+		}
-+	}
-+
-+	np = of_find_node_by_name(NULL, "nand");
-+	if (np) {
-+		of_platform_device_create(np, "nand", NULL);
-+	}
-+
-+	idx = 0;
-+	for_each_node_by_type(np, "rb,cf") {
-+		char dev_name[12];
-+		snprintf(dev_name, sizeof(dev_name), "cf.%u", idx);
-+		of_platform_device_create(np, dev_name, NULL);
-+		++idx;
-+	}
-+
-+	np = of_find_node_by_name(NULL, "beeper");
-+	if (np) {
-+		rbppc_beeper_init(np);
-+	}
-+
-+	return 0;
-+}
-+machine_device_initcall(rb600, rbppc_declare_of_platform_devices);
-+
-+define_machine(rb600) {
-+	.name 				= "MikroTik RouterBOARD 600 series",
-+	.probe 				= rbppc_probe,
-+	.setup_arch 			= rbppc_setup_arch,
-+	.init_IRQ 			= rbppc_init_IRQ,
-+	.get_irq 			= ipic_get_irq,
-+	.restart 			= rbppc_restart,
-+	.halt				= rbppc_halt,
-+	.time_init 			= mpc83xx_time_init,
-+	.calibrate_decr			= generic_calibrate_decr,
-+};
---- a/arch/powerpc/platforms/Kconfig
-+++ b/arch/powerpc/platforms/Kconfig
-@@ -142,6 +142,10 @@ config GENERIC_IOMAP
- 	bool
- 	default n
- 
-+config RB_IOMAP
-+	bool
-+	default y if RB_PPC
-+
- source "drivers/cpufreq/Kconfig"
- 
- menu "CPU Frequency drivers"
---- a/arch/powerpc/sysdev/Makefile
-+++ b/arch/powerpc/sysdev/Makefile
-@@ -56,3 +56,5 @@ obj-$(CONFIG_PPC_MPC52xx)	+= mpc5xxx_clo
- ifeq ($(CONFIG_SUSPEND),y)
- obj-$(CONFIG_6xx)		+= 6xx-suspend.o
- endif
-+
-+obj-$(CONFIG_RB_IOMAP)		+= rb_iomap.o
---- /dev/null
-+++ b/arch/powerpc/sysdev/rb_iomap.c
-@@ -0,0 +1,223 @@
-+#include <linux/init.h>
-+#include <linux/pci.h>
-+#include <linux/mm.h>
-+#include <asm/io.h>
-+
-+#define LOCALBUS_START		0x40000000
-+#define LOCALBUS_MASK		0x007fffff
-+#define LOCALBUS_REGMASK	0x001fffff
-+
-+static void __iomem *localbus_base;
-+
-+static inline int is_localbus(void __iomem *addr)
-+{
-+	return ((unsigned) addr & ~LOCALBUS_MASK) == LOCALBUS_START;
-+}
-+
-+static inline unsigned localbus_regoff(unsigned reg) {
-+	return (reg << 16) | (((reg ^ 8) & 8) << 17);
-+}
-+
-+static inline void __iomem *localbus_addr(void __iomem *addr)
-+{
-+	return localbus_base
-+	    + ((unsigned) addr & LOCALBUS_MASK & ~LOCALBUS_REGMASK)
-+	    + localbus_regoff((unsigned) addr & LOCALBUS_REGMASK);
-+}
-+
-+unsigned int ioread8(void __iomem *addr)
-+{
-+	if (is_localbus(addr))
-+		return in_be16(localbus_addr(addr)) >> 8;
-+	return readb(addr);
-+}
-+EXPORT_SYMBOL(ioread8);
-+
-+unsigned int ioread16(void __iomem *addr)
-+{
-+	if (is_localbus(addr))
-+		return le16_to_cpu(in_be16(localbus_addr(addr)));
-+	return readw(addr);
-+}
-+EXPORT_SYMBOL(ioread16);
-+
-+unsigned int ioread16be(void __iomem *addr)
-+{
-+	return in_be16(addr);
-+}
-+EXPORT_SYMBOL(ioread16be);
-+
-+unsigned int ioread32(void __iomem *addr)
-+{
-+	return readl(addr);
-+}
-+EXPORT_SYMBOL(ioread32);
-+
-+unsigned int ioread32be(void __iomem *addr)
-+{
-+	return in_be32(addr);
-+}
-+EXPORT_SYMBOL(ioread32be);
-+
-+void iowrite8(u8 val, void __iomem *addr)
-+{
-+	if (is_localbus(addr))
-+		out_be16(localbus_addr(addr), ((u16) val) << 8);
-+	else
-+		writeb(val, addr);
-+}
-+EXPORT_SYMBOL(iowrite8);
-+
-+void iowrite16(u16 val, void __iomem *addr)
-+{
-+	if (is_localbus(addr))
-+		out_be16(localbus_addr(addr), cpu_to_le16(val));
-+	else
-+		writew(val, addr);
-+}
-+EXPORT_SYMBOL(iowrite16);
-+
-+void iowrite16be(u16 val, void __iomem *addr)
-+{
-+	out_be16(addr, val);
-+}
-+EXPORT_SYMBOL(iowrite16be);
-+
-+void iowrite32(u32 val, void __iomem *addr)
-+{
-+	writel(val, addr);
-+}
-+EXPORT_SYMBOL(iowrite32);
-+
-+void iowrite32be(u32 val, void __iomem *addr)
-+{
-+	out_be32(addr, val);
-+}
-+EXPORT_SYMBOL(iowrite32be);
-+
-+void ioread8_rep(void __iomem *addr, void *dst, unsigned long count)
-+{
-+	if (is_localbus(addr)) {
-+		unsigned i;
-+		void *laddr = localbus_addr(addr);
-+		u8 *buf = dst;
-+
-+		for (i = 0; i < count; ++i) {
-+			*buf++ = in_be16(laddr) >> 8;
-+		}
-+	} else {
-+		_insb((u8 __iomem *) addr, dst, count);
-+	}
-+}
-+EXPORT_SYMBOL(ioread8_rep);
-+
-+void ioread16_rep(void __iomem *addr, void *dst, unsigned long count)
-+{
-+	if (is_localbus(addr)) {
-+		unsigned i;
-+		void *laddr = localbus_addr(addr);
-+		u16 *buf = dst;
-+
-+		for (i = 0; i < count; ++i) {
-+			*buf++ = in_be16(laddr);
-+		}
-+	} else {
-+		_insw_ns((u16 __iomem *) addr, dst, count);
-+	}
-+}
-+EXPORT_SYMBOL(ioread16_rep);
-+
-+void ioread32_rep(void __iomem *addr, void *dst, unsigned long count)
-+{
-+	_insl_ns((u32 __iomem *) addr, dst, count);
-+}
-+EXPORT_SYMBOL(ioread32_rep);
-+
-+void iowrite8_rep(void __iomem *addr, const void *src, unsigned long count)
-+{
-+	if (is_localbus(addr)) {
-+		unsigned i;
-+		void *laddr = localbus_addr(addr);
-+		const u8 *buf = src;
-+
-+		for (i = 0; i < count; ++i) {
-+			out_be16(laddr, ((u16) *buf++) << 8);
-+		}
-+	} else {
-+		_outsb((u8 __iomem *) addr, src, count);
-+	}
-+}
-+EXPORT_SYMBOL(iowrite8_rep);
-+
-+void iowrite16_rep(void __iomem *addr, const void *src, unsigned long count)
-+{
-+	if (is_localbus(addr)) {
-+		unsigned i;
-+		void *laddr = localbus_addr(addr);
-+		const u16 *buf = src;
-+
-+		for (i = 0; i < count; ++i) {
-+			out_be16(laddr, *buf++);
-+		}
-+	} else {
-+		_outsw_ns((u16 __iomem *) addr, src, count);
-+	}
-+}
-+EXPORT_SYMBOL(iowrite16_rep);
-+
-+void iowrite32_rep(void __iomem *addr, const void *src, unsigned long count)
-+{
-+	_outsl_ns((u32 __iomem *) addr, src, count);
-+}
-+EXPORT_SYMBOL(iowrite32_rep);
-+
-+void __iomem *ioport_map(unsigned long port, unsigned int len)
-+{
-+	return (void __iomem *) (port + _IO_BASE);
-+}
-+EXPORT_SYMBOL(ioport_unmap);
-+
-+void ioport_unmap(void __iomem *addr)
-+{
-+	/* Nothing to do */
-+}
-+EXPORT_SYMBOL(ioport_map);
-+
-+void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max)
-+{
-+	unsigned long start = pci_resource_start(dev, bar);
-+	unsigned long len = pci_resource_len(dev, bar);
-+	unsigned long flags = pci_resource_flags(dev, bar);
-+
-+	if (!len)
-+		return NULL;
-+	if (max && len > max)
-+		len = max;
-+	if (flags & IORESOURCE_IO)
-+		return ioport_map(start, len);
-+	if (flags & IORESOURCE_MEM)
-+		return ioremap(start, len);
-+	/* What? */
-+	return NULL;
-+}
-+EXPORT_SYMBOL(pci_iomap);
-+
-+void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
-+{
-+	/* Nothing to do */
-+}
-+EXPORT_SYMBOL(pci_iounmap);
-+
-+void __iomem *localbus_map(unsigned long addr, unsigned int len)
-+{
-+	if (!localbus_base)
-+		localbus_base = ioremap(addr & ~LOCALBUS_MASK,
-+					LOCALBUS_MASK + 1);
-+	return (void *) (LOCALBUS_START + (addr & LOCALBUS_MASK));
-+}
-+EXPORT_SYMBOL(localbus_map);
-+
-+void localbus_unmap(void __iomem *addr)
-+{
-+}
-+EXPORT_SYMBOL(localbus_unmap);
---- a/drivers/ata/Kconfig
-+++ b/drivers/ata/Kconfig
-@@ -751,5 +751,12 @@ config PATA_BF54X
- 
- 	  If unsure, say N.
- 
-+config PATA_RB_PPC
-+	tristate "MikroTik RB600 PATA support"
-+	depends on RB_PPC
-+	help
-+	  This option enables support for PATA devices on MikroTik RouterBOARD
-+	  600 series boards.
-+
- endif # ATA_SFF
- endif # ATA
---- a/drivers/ata/Makefile
-+++ b/drivers/ata/Makefile
-@@ -75,6 +75,7 @@ obj-$(CONFIG_PATA_PLATFORM)	+= pata_plat
- obj-$(CONFIG_PATA_AT91)	+= pata_at91.o
- obj-$(CONFIG_PATA_OF_PLATFORM)	+= pata_of_platform.o
- obj-$(CONFIG_PATA_ICSIDE)	+= pata_icside.o
-+obj-$(CONFIG_PATA_RB_PPC)	+= pata_rbppc_cf.o
- # Should be last but two libata driver
- obj-$(CONFIG_PATA_ACPI)		+= pata_acpi.o
- # Should be last but one libata driver
---- /dev/null
-+++ b/drivers/ata/pata_rbppc_cf.c
-@@ -0,0 +1,701 @@
-+/*
-+ * Copyright (C) 2008-2009 Noah Fontes <nfontes@transtruct.org>
-+ * Copyright (C) Mikrotik 2007
-+ *
-+ * 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/kernel.h>
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <scsi/scsi_host.h>
-+#include <linux/libata.h>
-+#include <linux/of_platform.h>
-+#include <linux/ata_platform.h>
-+
-+#define DEBUG_UPM	0
-+
-+#define DRV_NAME	"pata_rbppc_cf"
-+#define DRV_VERSION	"0.0.2"
-+
-+#define DEV2SEL_OFFSET	0x00100000
-+
-+#define IMMR_LBCFG_OFFSET	0x00005000
-+#define IMMR_LBCFG_SIZE		0x00001000
-+
-+#define LOCAL_BUS_MCMR		0x00000078
-+#define   MxMR_OP_MASK			0x30000000
-+#define   MxMR_OP_NORMAL		0x00000000
-+#define   MxMR_OP_WRITE			0x10000000
-+#define   MxMR_OP_READ			0x20000000
-+#define   MxMR_OP_RUN			0x30000000
-+#define   MxMR_LUPWAIT_LOW		0x08000000
-+#define   MxMR_LUPWAIT_HIGH		0x00000000
-+#define   MxMR_LUPWAIT_ENABLE		0x00040000
-+#define   MxMR_RLF_MASK			0x0003c000
-+#define   MxMR_RLF_SHIFT			14
-+#define   MxMR_WLF_MASK			0x00003c00
-+#define   MxMR_WLF_SHIFT			10
-+#define   MxMR_MAD_MASK			0x0000003f
-+#define LOCAL_BUS_MDR		0x00000088
-+#define LOCAL_BUS_LCRR		0x000000D4
-+#define   LCRR_CLKDIV_MASK		0x0000000f
-+
-+#define LOOP_SIZE	4
-+
-+#define UPM_READ_SINGLE_OFFSET	0x00
-+#define UPM_WRITE_SINGLE_OFFSET	0x18
-+#define UPM_DATA_SIZE	0x40
-+
-+#define LBT_CPUIN_MIN		0
-+#define LBT_CPUOUT_MIN		1
-+#define LBT_CPUOUT_MAX		2
-+#define LBT_EXTDEL_MIN		3
-+#define LBT_EXTDEL_MAX		4
-+#define LBT_SIZE		5
-+
-+/* UPM machine configuration bits */
-+#define N_BASE	0x00f00000
-+#define N_CS	0xf0000000
-+#define N_CS_H1	0xc0000000
-+#define N_CS_H2	0x30000000
-+#define N_WE	0x0f000000
-+#define N_WE_H1	0x0c000000
-+#define N_WE_H2	0x03000000
-+#define N_OE	0x00030000
-+#define N_OE_H1	0x00020000
-+#define N_OE_H2	0x00010000
-+#define WAEN	0x00001000
-+#define REDO_2	0x00000100
-+#define REDO_3	0x00000200
-+#define REDO_4	0x00000300
-+#define LOOP	0x00000080
-+#define NA	0x00000008
-+#define UTA	0x00000004
-+#define LAST	0x00000001
-+
-+#define REDO_VAL(mult)	(REDO_2 * ((mult) - 1))
-+#define REDO_MAX_MULT	4
-+
-+#define READ_BASE	(N_BASE | N_WE)
-+#define WRITE_BASE	(N_BASE | N_OE)
-+#define EMPTY		(N_BASE | N_CS | N_OE | N_WE | LAST)
-+
-+#define EOF_UPM_SETTINGS	0
-+#define ANOTHER_TIMING		1
-+
-+#define OA_CPUIN_MIN		0x01
-+#define OA_CPUOUT_MAX		0x02
-+#define OD_CPUOUT_MIN		0x04
-+#define OA_CPUOUT_DELTA		0x06
-+#define OA_EXTDEL_MAX		0x08
-+#define OD_EXTDEL_MIN		0x10
-+#define OA_EXTDEL_DELTA		0x18
-+#define O_MIN_CYCLE_TIME	0x20
-+#define O_MINUS_PREV		0x40
-+#define O_HALF_CYCLE		0x80
-+
-+extern void __iomem *localbus_map(unsigned long addr, unsigned int len);
-+extern void localbus_unmap(void __iomem *addr);
-+
-+struct rbppc_cf_info {
-+	unsigned lbcfg_addr;
-+	unsigned clk_time_ps;
-+	int cur_mode;
-+	u32 lb_timings[LBT_SIZE];
-+};
-+static struct rbppc_cf_info *rbinfo = NULL;
-+
-+struct upm_setting {
-+	unsigned value;
-+	unsigned ns[7];
-+	unsigned clk_minus;
-+	unsigned group_size;
-+	unsigned options;
-+};
-+
-+static const struct upm_setting cfUpmReadSingle[] = {
-+	{ READ_BASE | N_OE,
-+	  /* t1 - ADDR setup time */
-+		{  70,  50,  30,  30,  25,  15,  10 }, 0, 0, (OA_CPUOUT_DELTA |
-+							      OA_EXTDEL_MAX) },
-+	{ READ_BASE | N_OE_H1,
-+		{   0,   0,   0,   0,   0,   0,   0 }, 0, 0, O_HALF_CYCLE },
-+	{ READ_BASE,
-+	  /* t2 - OE0 time */
-+		{ 290, 290, 290,  80,  70,  65,  55 }, 0, 2, (OA_CPUOUT_MAX |
-+							      OA_CPUIN_MIN) },
-+	{ READ_BASE | WAEN,
-+		{   1,   1,   1,   1,   1,   0,   0 }, 0, 0, 0 },
-+	{ READ_BASE | UTA,
-+		{   1,   1,   1,   1,   1,   1,   1 }, 0, 0, 0 },
-+	{ READ_BASE | N_OE,
-+	  /* t9 - ADDR hold time */
-+		{  20,  15,  10,  10,  10,  10,  10 }, 0, 0, (OA_CPUOUT_DELTA |
-+							      OD_EXTDEL_MIN) },
-+	{ READ_BASE | N_OE | N_CS_H2,
-+		{   0,   0,   0,   0,   0,   0,   0 }, 0, 0, O_HALF_CYCLE },
-+	{ READ_BASE | N_OE | N_CS,
-+	  /* t6Z -IORD data tristate */
-+		{  30,  30,  30,  30,  30,  20,  20 }, 1, 1, O_MINUS_PREV },
-+	{ ANOTHER_TIMING,
-+	  /* t2i -IORD recovery time */
-+		{   0,   0,   0,  70,  25,  25,  20 }, 2, 0, 0 },
-+	{ ANOTHER_TIMING,
-+	  /* CS 0 -> 1 MAX */
-+		{   0,   0,   0,   0,   0,   0,   0 }, 1, 0, (OA_CPUOUT_DELTA |
-+							      OA_EXTDEL_MAX) },
-+	{ READ_BASE | N_OE | N_CS | LAST,
-+		{   1,   1,   1,   1,   1,   1,   1 }, 0, 0, 0 },
-+	{ EOF_UPM_SETTINGS,
-+	  /* min total cycle time - includes turnaround and ALE cycle */
-+		{ 600, 383, 240, 180, 120, 100,  80 }, 2, 0, O_MIN_CYCLE_TIME },
-+};
-+
-+static const struct upm_setting cfUpmWriteSingle[] = {
-+	{ WRITE_BASE | N_WE,
-+	  /* t1 - ADDR setup time */
-+		{  70,  50,  30,  30,  25,  15,  10 }, 0, 0, (OA_CPUOUT_DELTA |
-+							      OA_EXTDEL_MAX) },
-+	{ WRITE_BASE | N_WE_H1,
-+		{   0,   0,   0,   0,   0,   0,   0 }, 0, 0, O_HALF_CYCLE },
-+	{ WRITE_BASE,
-+	  /* t2 - WE0 time */
-+		{ 290, 290, 290,  80,  70,  65,  55 }, 0, 1, OA_CPUOUT_DELTA },
-+	{ WRITE_BASE | WAEN,
-+		{   1,   1,   1,   1,   1,   0,   0 }, 0, 0, 0 },
-+	{ WRITE_BASE | N_WE,
-+	  /* t9 - ADDR hold time */
-+		{  20,  15,  10,  10,  10,  10,  10 }, 0, 0, (OA_CPUOUT_DELTA |
-+							      OD_EXTDEL_MIN) },
-+	{ WRITE_BASE | N_WE | N_CS_H2,
-+		{   0,   0,   0,   0,   0,   0,   0 }, 0, 0, O_HALF_CYCLE },
-+	{ WRITE_BASE | N_WE | N_CS,
-+	  /* t4 - DATA hold time */
-+		{  30,  20,  15,  10,  10,  10,  10 }, 0, 1, O_MINUS_PREV },
-+	{ ANOTHER_TIMING,
-+	  /* t2i -IOWR recovery time */
-+		{   0,   0,   0,  70,  25,  25,  20 }, 1, 0, 0 },
-+	{ ANOTHER_TIMING,
-+	  /* CS 0 -> 1 MAX */
-+		{   0,   0,   0,   0,   0,   0,   0 }, 0, 0, (OA_CPUOUT_DELTA |
-+							      OA_EXTDEL_MAX) },
-+	{ WRITE_BASE | N_WE | N_CS | UTA | LAST,
-+		{   1,   1,   1,   1,   1,   1,   1 }, 0, 0, 0 },
-+	/* min total cycle time - includes ALE cycle */
-+	{ EOF_UPM_SETTINGS,
-+		{ 600, 383, 240, 180, 120, 100,  80 }, 1, 0, O_MIN_CYCLE_TIME },
-+};
-+
-+static u8 rbppc_cf_check_status(struct ata_port *ap) {
-+	u8 val = ioread8(ap->ioaddr.status_addr);
-+	if (val == 0xF9)
-+		val = 0x7F;
-+	return val;
-+}
-+
-+static u8 rbppc_cf_check_altstatus(struct ata_port *ap) {
-+	u8 val = ioread8(ap->ioaddr.altstatus_addr);
-+	if (val == 0xF9)
-+		val = 0x7F;
-+	return val;
-+}
-+
-+static void rbppc_cf_dummy_noret(struct ata_port *ap) { }
-+static int rbppc_cf_dummy_ret0(struct ata_port *ap) { return 0; }
-+
-+static int ps2clk(int ps, unsigned clk_time_ps) {
-+	int psMaxOver;
-+	if (ps <= 0) return 0;
-+
-+	/* round down if <= 2% over clk border, but no more than 1/4 clk cycle */
-+	psMaxOver = ps * 2 / 100;
-+	if (4 * psMaxOver > clk_time_ps) {
-+		psMaxOver = clk_time_ps / 4;
-+	}
-+	return (ps + clk_time_ps - 1 - psMaxOver) / clk_time_ps;
-+}
-+
-+static int upm_gen_ps_table(const struct upm_setting *upm,
-+			    int mode, struct rbppc_cf_info *info,
-+			    int *psFinal) {
-+	int uidx;
-+	int lastUpmValIdx = 0;
-+	int group_start_idx = -1;
-+	int group_left_num = -1;
-+	int clk_time_ps = info->clk_time_ps;
-+
-+	for (uidx = 0; upm[uidx].value != EOF_UPM_SETTINGS; ++uidx) {
-+		const struct upm_setting *us = upm + uidx;
-+		unsigned opt = us->options;
-+		int ps = us->ns[mode] * 1000 - us->clk_minus * clk_time_ps;
-+
-+		if (opt & OA_CPUIN_MIN) ps += info->lb_timings[LBT_CPUIN_MIN];
-+		if (opt & OD_CPUOUT_MIN) ps -= info->lb_timings[LBT_CPUOUT_MIN];
-+		if (opt & OA_CPUOUT_MAX) ps += info->lb_timings[LBT_CPUOUT_MAX];
-+		if (opt & OD_EXTDEL_MIN) ps -= info->lb_timings[LBT_EXTDEL_MIN];
-+		if (opt & OA_EXTDEL_MAX) ps += info->lb_timings[LBT_EXTDEL_MAX];
-+
-+		if (us->value == ANOTHER_TIMING) {
-+			/* use longest timing from alternatives */
-+			if (psFinal[lastUpmValIdx] < ps) {
-+				psFinal[lastUpmValIdx] = ps;
-+			}
-+			ps = 0;
-+		}
-+		else {
-+			if (us->group_size) {
-+				group_start_idx = uidx;
-+				group_left_num = us->group_size;
-+			}
-+			else if (group_left_num > 0) {
-+				/* group time is divided on all group members */
-+				int clk = ps2clk(ps, clk_time_ps);
-+				psFinal[group_start_idx] -= clk * clk_time_ps;
-+				--group_left_num;
-+			}
-+			if ((opt & O_MINUS_PREV) && lastUpmValIdx > 0) {
-+				int clk = ps2clk(psFinal[lastUpmValIdx],
-+						 clk_time_ps);
-+				ps -= clk * clk_time_ps;
-+			}
-+			lastUpmValIdx = uidx;
-+		}
-+		psFinal[uidx] = ps;
-+	}
-+	return uidx;
-+}
-+
-+static int free_half(int ps, int clk, int clk_time_ps) {
-+    if (clk < 2) return 0;
-+    return (clk * clk_time_ps - ps) * 2 >= clk_time_ps;
-+}
-+
-+static void upm_gen_clk_table(const struct upm_setting *upm,
-+			      int mode, int clk_time_ps,
-+			      int max_uidx, const int *psFinal, int *clkFinal) {
-+	int clk_cycle_time;
-+	int clk_total;
-+	int uidx;
-+
-+	/* convert picoseconds to clocks */
-+	clk_total = 0;
-+	for (uidx = 0; uidx < max_uidx; ++uidx) {
-+		int clk = ps2clk(psFinal[uidx], clk_time_ps);
-+		clkFinal[uidx] = clk;
-+		clk_total += clk;
-+	}
-+
-+	/* check possibility of half cycle usage */
-+	for (uidx = 1; uidx < max_uidx - 1; ++uidx) {
-+		if ((upm[uidx].options & O_HALF_CYCLE) &&
-+		    free_half(psFinal[uidx - 1], clkFinal[uidx - 1],
-+			      clk_time_ps) &&
-+		    free_half(psFinal[uidx + 1], clkFinal[uidx + 1],
-+			      clk_time_ps)) {
-+			++clkFinal[uidx];
-+			--clkFinal[uidx - 1];
-+			--clkFinal[uidx + 1];
-+		}
-+	}
-+
-+	if ((upm[max_uidx].options & O_MIN_CYCLE_TIME) == 0) return;
-+
-+	/* check cycle time, adjust timings if needed */
-+	clk_cycle_time = (ps2clk(upm[max_uidx].ns[mode] * 1000, clk_time_ps) -
-+			  upm[max_uidx].clk_minus);
-+	uidx = 0;
-+	while (clk_total < clk_cycle_time) {
-+		/* extend all timings in round-robin to match cycle time */
-+		if (clkFinal[uidx]) {
-+#if DEBUG_UPM
-+			printk(KERN_INFO "extending %u by 1 clk\n", uidx);
-+#endif
-+			++clkFinal[uidx];
-+			++clk_total;
-+		}
-+		++uidx;
-+		if (uidx == max_uidx) uidx = 0;
-+	}
-+}
-+
-+static void add_data_val(unsigned val, int *clkLeft, int maxClk,
-+			unsigned *data, int *dataIdx) {
-+	if (*clkLeft == 0) return;
-+
-+	if (maxClk == 0 && *clkLeft >= LOOP_SIZE * 2) {
-+		int times;
-+		int times1;
-+		int times2;
-+
-+		times = *clkLeft / LOOP_SIZE;
-+		if (times > REDO_MAX_MULT * 2) times = REDO_MAX_MULT * 2;
-+		times1 = times / 2;
-+		times2 = times - times1;
-+
-+		val |= LOOP;
-+		data[*dataIdx] = val | REDO_VAL(times1);
-+		++(*dataIdx);
-+		data[*dataIdx] = val | REDO_VAL(times2);
-+		++(*dataIdx);
-+
-+		*clkLeft -= times * LOOP_SIZE;
-+		return;
-+	}
-+
-+	if (maxClk < 1 || maxClk > REDO_MAX_MULT) maxClk = REDO_MAX_MULT;
-+	if (*clkLeft < maxClk) maxClk = *clkLeft;
-+
-+	*clkLeft -= maxClk;
-+	val |= REDO_VAL(maxClk);
-+
-+	data[*dataIdx] = val;
-+	++(*dataIdx);
-+}
-+
-+static int upm_gen_final_data(const struct upm_setting *upm,
-+			       int max_uidx, int *clkFinal, unsigned *data) {
-+	int dataIdx;
-+	int uidx;
-+
-+	dataIdx = 0;
-+	for (uidx = 0; uidx < max_uidx; ++uidx) {
-+		int clk = clkFinal[uidx];
-+		while (clk > 0) {
-+			add_data_val(upm[uidx].value, &clk, 0,
-+				     data, &dataIdx);
-+		}
-+	}
-+	return dataIdx;
-+}
-+
-+static int conv_upm_table(const struct upm_setting *upm,
-+			  int mode, struct rbppc_cf_info *info,
-+			  unsigned *data) {
-+#if DEBUG_UPM
-+	int uidx;
-+#endif
-+	int psFinal[32];
-+	int clkFinal[32];
-+	int max_uidx;
-+	int data_len;
-+
-+	max_uidx = upm_gen_ps_table(upm, mode, info, psFinal);
-+
-+	upm_gen_clk_table(upm, mode, info->clk_time_ps, max_uidx,
-+			  psFinal, clkFinal);
-+
-+#if DEBUG_UPM
-+	/* dump out debug info */
-+	for (uidx = 0; uidx < max_uidx; ++uidx) {
-+		if (clkFinal[uidx]) {
-+			printk(KERN_INFO "idx %d val %08x clk %d ps %d\n",
-+				uidx, upm[uidx].value,
-+				clkFinal[uidx], psFinal[uidx]);
-+		}
-+	}
-+#endif
-+
-+	data_len = upm_gen_final_data(upm, max_uidx, clkFinal, data);
-+
-+#if DEBUG_UPM
-+	for (uidx = 0; uidx < data_len; ++uidx) {
-+		printk(KERN_INFO "cf UPM x result: idx %d val %08x\n",
-+		       uidx, data[uidx]);
-+	}
-+#endif
-+	return 0;
-+}
-+
-+static int gen_upm_data(int mode, struct rbppc_cf_info *info, unsigned *data) {
-+	int i;
-+
-+	for (i = 0; i < UPM_DATA_SIZE; ++i) {
-+		data[i] = EMPTY;
-+	}
-+
-+	if (conv_upm_table(cfUpmReadSingle, mode, info, data + UPM_READ_SINGLE_OFFSET)) {
-+		return -1;
-+	}
-+	if (conv_upm_table(cfUpmWriteSingle, mode, info, data + UPM_WRITE_SINGLE_OFFSET)) {
-+		return -1;
-+	}
-+	return 0;
-+}
-+
-+static void rbppc_cf_program_upm(void *upmMemAddr, volatile void *lbcfg_mxmr, volatile void *lbcfg_mdr, const unsigned *upmData, unsigned offset, unsigned len) {
-+	unsigned i;
-+	unsigned mxmr;
-+
-+	mxmr = in_be32(lbcfg_mxmr);
-+	mxmr &= ~(MxMR_OP_MASK | MxMR_MAD_MASK);
-+	mxmr |= (MxMR_OP_WRITE | offset);
-+	out_be32(lbcfg_mxmr, mxmr);
-+	in_be32(lbcfg_mxmr); /* flush MxMR write */
-+
-+	for (i = 0; i < len; ++i) {
-+		int to;
-+		unsigned data = upmData[i + offset];
-+		out_be32(lbcfg_mdr, data);
-+		in_be32(lbcfg_mdr); /* flush MDR write */
-+
-+		iowrite8(1, upmMemAddr); /* dummy write to any CF addr */
-+
-+		/* wait for dummy write to complete */
-+		for (to = 10000; to >= 0; --to) {
-+			mxmr = in_be32(lbcfg_mxmr);
-+			if (((mxmr ^ (i + 1)) & MxMR_MAD_MASK) == 0) {
-+				break;
-+			}
-+			if (to == 0) {
-+				printk(KERN_ERR "rbppc_cf_program_upm: UPMx program error at 0x%x: Timeout\n", i);
-+			}
-+		}
-+	}
-+	mxmr &= ~(MxMR_OP_MASK | MxMR_RLF_MASK | MxMR_WLF_MASK);
-+	mxmr |= (MxMR_OP_NORMAL | (LOOP_SIZE << MxMR_RLF_SHIFT) | (LOOP_SIZE << MxMR_WLF_SHIFT));
-+	out_be32(lbcfg_mxmr, mxmr);
-+}
-+
-+static int rbppc_cf_update_piomode(struct ata_port *ap, int mode) {
-+	struct rbppc_cf_info *info = (struct rbppc_cf_info *)ap->host->private_data;
-+	void *lbcfgBase;
-+	unsigned upmData[UPM_DATA_SIZE];
-+
-+	if (gen_upm_data(mode, info, upmData)) {
-+		return -1;
-+	}
-+
-+	lbcfgBase = ioremap_nocache(info->lbcfg_addr, IMMR_LBCFG_SIZE);
-+
-+	rbppc_cf_program_upm(ap->ioaddr.cmd_addr, ((char *)lbcfgBase) + LOCAL_BUS_MCMR, ((char *)lbcfgBase) + LOCAL_BUS_MDR, upmData, 0, UPM_DATA_SIZE);
-+	iounmap(lbcfgBase);
-+	return 0;
-+}
-+
-+static void rbppc_cf_set_piomode(struct ata_port *ap, struct ata_device *adev)
-+{
-+	struct rbppc_cf_info *info = (struct rbppc_cf_info *)ap->host->private_data;
-+	int mode = adev->pio_mode - XFER_PIO_0;
-+
-+	DPRINTK("rbppc_cf_set_piomode: PIO %d\n", mode);
-+	if (mode < 0) mode = 0;
-+	if (mode > 6) mode = 6;
-+
-+	if (info->cur_mode < 0 || info->cur_mode > mode) {
-+		if (rbppc_cf_update_piomode(ap, mode) == 0) {
-+			printk(KERN_INFO "rbppc_cf_set_piomode: PIO mode changed to %d\n", mode);
-+			info->cur_mode = mode;
-+		}
-+	}
-+}
-+
-+static struct scsi_host_template rbppc_cf_sht = {
-+	ATA_BASE_SHT(DRV_NAME),
-+};
-+
-+static struct ata_port_operations rbppc_cf_port_ops = {
-+	.inherits		= &ata_bmdma_port_ops,
-+
-+	.sff_check_status	= rbppc_cf_check_status,
-+	.sff_check_altstatus	= rbppc_cf_check_altstatus,
-+
-+	.set_piomode		= rbppc_cf_set_piomode,
-+
-+	.port_start		= rbppc_cf_dummy_ret0,
-+
-+	.sff_irq_clear		= rbppc_cf_dummy_noret,
-+};
-+
-+static int rbppc_cf_init_info(struct of_device *pdev, struct rbppc_cf_info *info) {
-+	struct device_node *np;
-+	struct resource res;
-+	const u32 *u32ptr;
-+	void *lbcfgBase;
-+	void *lbcfg_lcrr;
-+	unsigned lbc_clk_khz;
-+	unsigned lbc_extra_divider = 1;
-+	unsigned ccb_freq_hz;
-+	unsigned lb_div;
-+
-+	u32ptr = of_get_property(pdev->node, "lbc_extra_divider", NULL);
-+	if (u32ptr && *u32ptr) {
-+		lbc_extra_divider = *u32ptr;
-+#if DEBUG_UPM
-+		printk(KERN_INFO "rbppc_cf_init_info: LBC extra divider %u\n",
-+		       lbc_extra_divider);
-+#endif
-+	}
-+
-+	np = of_find_node_by_type(NULL, "serial");
-+	if (!np) {
-+		printk(KERN_ERR "rbppc_cf_init_info: No serial node found\n");
-+		return -1;
-+	}
-+	u32ptr = of_get_property(np, "clock-frequency", NULL);
-+	if (u32ptr == 0 || *u32ptr == 0) {
-+		printk(KERN_ERR "rbppc_cf_init_info: Serial does not have clock-frequency\n");
-+		of_node_put(np);
-+		return -1;
-+	}
-+	ccb_freq_hz = *u32ptr;
-+	of_node_put(np);
-+
-+	np = of_find_node_by_type(NULL, "soc");
-+	if (!np) {
-+		printk(KERN_ERR "rbppc_cf_init_info: No soc node found\n");
-+		return -1;
-+	}
-+	if (of_address_to_resource(np, 0, &res)) {
-+		printk(KERN_ERR "rbppc_cf_init_info: soc does not have resource\n");
-+		of_node_put(np);
-+		return -1;
-+	}
-+	info->lbcfg_addr = res.start + IMMR_LBCFG_OFFSET;
-+	of_node_put(np);
-+
-+	lbcfgBase = ioremap_nocache(info->lbcfg_addr, IMMR_LBCFG_SIZE);
-+	lbcfg_lcrr = ((char*)lbcfgBase) + LOCAL_BUS_LCRR;
-+	lb_div = (in_be32(lbcfg_lcrr) & LCRR_CLKDIV_MASK) * lbc_extra_divider;
-+	iounmap(lbcfgBase);
-+
-+	lbc_clk_khz = ccb_freq_hz / (1000 * lb_div);
-+	info->clk_time_ps = 1000000000 / lbc_clk_khz;
-+	printk(KERN_INFO "rbppc_cf_init_info: Using Local-Bus clock %u kHz %u ps\n",
-+	       lbc_clk_khz, info->clk_time_ps);
-+
-+	u32ptr = of_get_property(pdev->node, "lb-timings", NULL);
-+	if (u32ptr) {
-+		memcpy(info->lb_timings, u32ptr, LBT_SIZE * sizeof(*u32ptr));
-+#if DEBUG_UPM
-+		printk(KERN_INFO "rbppc_cf_init_info: Got LB timings <%u %u %u %u %u>\n",
-+		       u32ptr[0], u32ptr[1], u32ptr[2], u32ptr[3], u32ptr[4]);
-+#endif
-+	}
-+	info->cur_mode = -1;
-+	return 0;
-+}
-+
-+static int rbppc_cf_probe(struct of_device *pdev,
-+			  const struct of_device_id *match)
-+{
-+	struct ata_host *host;
-+	struct ata_port *ap;
-+	struct rbppc_cf_info *info = NULL;
-+	struct resource res;
-+	void *baddr;
-+	const u32 *u32ptr;
-+	int irq_level = 0;
-+	int err = -ENOMEM;
-+
-+	printk(KERN_INFO "rbppc_cf_probe: MikroTik RouterBOARD 600 series Compact Flash PATA driver, version " DRV_VERSION "\n");
-+
-+	if (rbinfo == NULL) {
-+		info = kmalloc(sizeof(*info), GFP_KERNEL);
-+		if (info == NULL) {
-+			printk(KERN_ERR "rbppc_cf_probe: Out of memory\n");
-+			goto err_info;
-+		}
-+		memset(info, 0, sizeof(*info));
-+
-+		if (rbppc_cf_init_info(pdev, info)) {
-+			goto err_info;
-+		}
-+		rbinfo = info;
-+	}
-+
-+	u32ptr = of_get_property(pdev->node, "interrupt-at-level", NULL);
-+	if (u32ptr) {
-+		irq_level = *u32ptr;
-+		printk(KERN_INFO "rbppc_cf_probe: IRQ level %u\n", irq_level);
-+	}
-+
-+	if (of_address_to_resource(pdev->node, 0, &res)) {
-+	    printk(KERN_ERR "rbppc_cf_probe: No reg property found\n");
-+	    goto err_info;
-+	}
-+
-+	host = ata_host_alloc(&pdev->dev, 1);
-+	if (!host)
-+	    goto err_info;
-+
-+	baddr = localbus_map(res.start, res.end - res.start + 1);
-+	host->iomap = baddr;
-+	host->private_data = rbinfo;
-+
-+	ap = host->ports[0];
-+	ap->ops = &rbppc_cf_port_ops;
-+	ap->pio_mask = 0x7F;	/* PIO modes 0-6 */
-+	ap->flags = ATA_FLAG_NO_LEGACY;
-+	ap->mwdma_mask = 0;
-+
-+	ap->ioaddr.cmd_addr = baddr;
-+	ata_sff_std_ports(&ap->ioaddr);
-+	ap->ioaddr.ctl_addr = ap->ioaddr.cmd_addr + 14;
-+	ap->ioaddr.altstatus_addr = ap->ioaddr.ctl_addr;
-+	ap->ioaddr.bmdma_addr = 0;
-+
-+	err = ata_host_activate(
-+		host,
-+		irq_of_parse_and_map(pdev->node, 0), ata_sff_interrupt,
-+		irq_level ? IRQF_TRIGGER_HIGH : IRQF_TRIGGER_LOW,
-+		&rbppc_cf_sht);
-+	if (!err) return 0;
-+
-+	localbus_unmap(baddr);
-+err_info:
-+	if (info) {
-+		kfree(info);
-+		rbinfo = NULL;
-+	}
-+	return err;
-+}
-+
-+static int rbppc_cf_remove(struct of_device *pdev)
-+{
-+	struct device *dev = &pdev->dev;
-+	struct ata_host *host = dev_get_drvdata(dev);
-+
-+	if (host == NULL) return -1;
-+
-+	ata_host_detach(host);
-+	return 0;
-+}
-+
-+static struct of_device_id rbppc_cf_ids[] = {
-+	{ .name = "cf", },
-+	{ },
-+};
-+
-+static struct of_platform_driver rbppc_cf_driver = {
-+	.name = "cf",
-+	.probe = rbppc_cf_probe,
-+	.remove = rbppc_cf_remove,
-+	.match_table = rbppc_cf_ids,
-+	.driver	= {
-+		.name = "rbppc-cf",
-+		.owner = THIS_MODULE,
-+	},
-+};
-+
-+static int __init rbppc_init(void)
-+{
-+	return of_register_platform_driver(&rbppc_cf_driver);
-+}
-+
-+static void __exit rbppc_exit(void)
-+{
-+	of_unregister_platform_driver(&rbppc_cf_driver);
-+}
-+
-+MODULE_AUTHOR("Mikrotikls SIA");
-+MODULE_AUTHOR("Noah Fontes");
-+MODULE_DESCRIPTION("MikroTik RouterBOARD 600 series Compact Flash PATA driver");
-+MODULE_LICENSE("GPL");
-+MODULE_VERSION(DRV_VERSION);
-+
-+module_init(rbppc_init);
-+module_exit(rbppc_exit);
---- a/drivers/mtd/nand/Kconfig
-+++ b/drivers/mtd/nand/Kconfig
-@@ -386,6 +386,13 @@ config MTD_NAND_PLATFORM
- 	  devices. You will need to provide platform-specific functions
- 	  via platform_data.
- 
-+config MTD_NAND_RB_PPC
-+	tristate "MikroTik RB600 NAND support"
-+	depends on MTD_NAND && MTD_PARTITIONS && RB_PPC
-+	help
-+	  This option enables support for the NAND device on MikroTik
-+	  RouterBOARD 600 series boards.
-+
- config MTD_ALAUDA
- 	tristate "MTD driver for Olympus MAUSB-10 and Fujifilm DPC-R1"
- 	depends on MTD_NAND && USB
---- a/drivers/mtd/nand/Makefile
-+++ b/drivers/mtd/nand/Makefile
-@@ -31,6 +31,7 @@ obj-$(CONFIG_MTD_NAND_BASLER_EXCITE)	+= 
- obj-$(CONFIG_MTD_NAND_PXA3xx)		+= pxa3xx_nand.o
- obj-$(CONFIG_MTD_NAND_TMIO)		+= tmio_nand.o
- obj-$(CONFIG_MTD_NAND_PLATFORM)		+= plat_nand.o
-+obj-$(CONFIG_MTD_NAND_RB_PPC)		+= rbppc_nand.o
- obj-$(CONFIG_MTD_ALAUDA)		+= alauda.o
- obj-$(CONFIG_MTD_NAND_PASEMI)		+= pasemi_nand.o
- obj-$(CONFIG_MTD_NAND_ORION)		+= orion_nand.o
---- /dev/null
-+++ b/drivers/mtd/nand/rbppc_nand.c
-@@ -0,0 +1,252 @@
-+/*
-+ * Copyright (C) 2008-2009 Noah Fontes <nfontes@transtruct.org>
-+ * Copyright (C) 2009 Michael Guntsche <mike@it-loops.com>
-+ * Copyright (C) Mikrotik 2007
-+ *
-+ * 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/init.h>
-+#include <linux/mtd/nand.h>
-+#include <linux/mtd/mtd.h>
-+#include <linux/mtd/partitions.h>
-+#include <linux/of_platform.h>
-+#include <asm/of_platform.h>
-+#include <asm/of_device.h>
-+#include <linux/delay.h>
-+#include <asm/io.h>
-+
-+#define DRV_NAME	"rbppc_nand"
-+#define DRV_VERSION	"0.0.2"
-+
-+static struct mtd_info rmtd;
-+static struct nand_chip rnand;
-+
-+struct rbppc_nand_info {
-+	void *gpi;
-+	void *gpo;
-+	void *localbus;
-+
-+	unsigned gpio_rdy;
-+	unsigned gpio_nce;
-+	unsigned gpio_cle;
-+	unsigned gpio_ale;
-+	unsigned gpio_ctrls;
-+};
-+
-+/* We must use the OOB layout from yaffs 1 if we want this to be recognized
-+ * properly. Borrowed from the OpenWRT patches for the RB532.
-+ *
-+ * See <https://dev.openwrt.org/browser/trunk/target/linux/rb532/
-+ * patches-2.6.28/025-rb532_nand_fixup.patch> for more details.
-+ */
-+static struct nand_ecclayout rbppc_nand_oob_16 = {
-+	.eccbytes = 6,
-+	.eccpos = { 8, 9, 10, 13, 14, 15 },
-+	.oobavail = 9,
-+	.oobfree = { { 0, 4 }, { 6, 2 }, { 11, 2 }, { 4, 1 } }
-+};
-+
-+static struct mtd_partition rbppc_nand_partition_info[] = {
-+	{
-+		name: "RouterBOARD NAND Boot",
-+		offset: 0,
-+		size: 4 * 1024 * 1024,
-+	},
-+	{
-+		name: "RouterBOARD NAND Main",
-+		offset: MTDPART_OFS_NXTBLK,
-+		size: MTDPART_SIZ_FULL,
-+	},
-+};
-+
-+static int rbppc_nand_dev_ready(struct mtd_info *mtd) {
-+	struct nand_chip *chip = mtd->priv;
-+	struct rbppc_nand_info *priv = chip->priv;
-+
-+	return in_be32(priv->gpi) & priv->gpio_rdy;
-+}
-+
-+static void rbppc_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl) {
-+	struct nand_chip *chip = mtd->priv;
-+	struct rbppc_nand_info *priv = chip->priv;
-+
-+	if (ctrl & NAND_CTRL_CHANGE) {
-+		unsigned val = in_be32(priv->gpo);
-+		if (!(val & priv->gpio_nce)) {
-+			/* make sure Local Bus has done NAND operations */
-+			readb(priv->localbus);
-+		}
-+
-+		if (ctrl & NAND_CLE) {
-+			val |= priv->gpio_cle;
-+		} else {
-+			val &= ~priv->gpio_cle;
-+		}
-+		if (ctrl & NAND_ALE) {
-+			val |= priv->gpio_ale;
-+		} else {
-+			val &= ~priv->gpio_ale;
-+		}
-+		if (!(ctrl & NAND_NCE)) {
-+			val |= priv->gpio_nce;
-+		} else {
-+			val &= ~priv->gpio_nce;
-+		}
-+		out_be32(priv->gpo, val);
-+
-+		/* make sure GPIO output has changed */
-+		val ^= in_be32(priv->gpo);
-+		if (val & priv->gpio_ctrls) {
-+			printk(KERN_ERR "rbppc_nand_hwcontrol: NAND GPO change failed 0x%08x\n", val);
-+		}
-+	}
-+
-+	if (cmd != NAND_CMD_NONE) writeb(cmd, chip->IO_ADDR_W);
-+}
-+
-+static void rbppc_nand_read_buf(struct mtd_info *mtd, uint8_t *buf, int len)
-+{
-+	struct nand_chip *chip = mtd->priv;
-+	memcpy(buf, chip->IO_ADDR_R, len);
-+}
-+
-+static unsigned init_ok = 0;
-+
-+static int rbppc_nand_probe(struct of_device *pdev,
-+			    const struct of_device_id *match)
-+{
-+	struct device_node *gpio;
-+	struct device_node *nnand;
-+	struct resource res;
-+	struct rbppc_nand_info *info;
-+	void *baddr;
-+	const unsigned *rdy, *nce, *cle, *ale;
-+
-+	printk(KERN_INFO "rbppc_nand_probe: MikroTik RouterBOARD 600 series NAND driver, version " DRV_VERSION "\n");
-+
-+	info = kmalloc(sizeof(*info), GFP_KERNEL);
-+
-+	rdy = of_get_property(pdev->node, "rdy", NULL);
-+	nce = of_get_property(pdev->node, "nce", NULL);
-+	cle = of_get_property(pdev->node, "cle", NULL);
-+	ale = of_get_property(pdev->node, "ale", NULL);
-+
-+	if (!rdy || !nce || !cle || !ale) {
-+		printk(KERN_ERR "rbppc_nand_probe: GPIO properties are missing\n");
-+		goto err;
-+	}
-+	if (rdy[0] != nce[0] || rdy[0] != cle[0] || rdy[0] != ale[0]) {
-+		printk(KERN_ERR "rbppc_nand_probe: Different GPIOs are not supported\n");
-+		goto err;
-+	}
-+
-+	gpio = of_find_node_by_phandle(rdy[0]);
-+	if (!gpio) {
-+		printk(KERN_ERR "rbppc_nand_probe: No GPIO<%x> node found\n", *rdy);
-+		goto err;
-+	}
-+	if (of_address_to_resource(gpio, 0, &res)) {
-+		printk(KERN_ERR "rbppc_nand_probe: No reg property in GPIO found\n");
-+		goto err;
-+	}
-+	info->gpo = ioremap_nocache(res.start, res.end - res.start + 1);
-+
-+	if (!of_address_to_resource(gpio, 1, &res)) {
-+		info->gpi = ioremap_nocache(res.start, res.end - res.start + 1);
-+	} else {
-+		info->gpi = info->gpo;
-+	}
-+	of_node_put(gpio);
-+
-+	info->gpio_rdy = 1 << (31 - rdy[1]);
-+	info->gpio_nce = 1 << (31 - nce[1]);
-+	info->gpio_cle = 1 << (31 - cle[1]);
-+	info->gpio_ale = 1 << (31 - ale[1]);
-+	info->gpio_ctrls = info->gpio_nce | info->gpio_cle | info->gpio_ale;
-+
-+	nnand = of_find_node_by_name(NULL, "nnand");
-+	if (!nnand) {
-+		printk("rbppc_nand_probe: No nNAND found\n");
-+		goto err;
-+	}
-+	if (of_address_to_resource(nnand, 0, &res)) {
-+		printk("rbppc_nand_probe: No reg property in nNAND found\n");
-+		goto err;
-+	}
-+	of_node_put(nnand);
-+	info->localbus = ioremap_nocache(res.start, res.end - res.start + 1);
-+
-+	if (of_address_to_resource(pdev->node, 0, &res)) {
-+	    printk("rbppc_nand_probe: No reg property found\n");
-+	    goto err;
-+	}
-+	baddr = ioremap_nocache(res.start, res.end - res.start + 1);
-+
-+	memset(&rnand, 0, sizeof(rnand));
-+	rnand.cmd_ctrl = rbppc_nand_cmd_ctrl;
-+	rnand.dev_ready = rbppc_nand_dev_ready;
-+	rnand.read_buf = rbppc_nand_read_buf;
-+	rnand.IO_ADDR_W = baddr;
-+	rnand.IO_ADDR_R = baddr;
-+	rnand.priv = info;
-+
-+	memset(&rmtd, 0, sizeof(rmtd));
-+	rnand.ecc.mode = NAND_ECC_SOFT;
-+	rnand.ecc.layout = &rbppc_nand_oob_16;
-+	rnand.chip_delay = 25;
-+	rnand.options |= NAND_NO_AUTOINCR;
-+	rmtd.priv = &rnand;
-+	rmtd.owner = THIS_MODULE;
-+
-+	if (nand_scan(&rmtd, 1) && nand_scan(&rmtd, 1) && nand_scan(&rmtd, 1) && nand_scan(&rmtd, 1)) {
-+		printk(KERN_ERR "rbppc_nand_probe: RouterBOARD NAND device not found\n");
-+		return -ENXIO;
-+	}
-+
-+	add_mtd_partitions(&rmtd, rbppc_nand_partition_info, 2);
-+	init_ok = 1;
-+	return 0;
-+
-+err:
-+	kfree(info);
-+	return -1;
-+}
-+
-+static struct of_device_id rbppc_nand_ids[] = {
-+	{ .name = "nand", },
-+	{ },
-+};
-+
-+static struct of_platform_driver rbppc_nand_driver = {
-+	.name   = "nand",
-+	.probe	= rbppc_nand_probe,
-+	.match_table = rbppc_nand_ids,
-+	.driver	= {
-+		.name = "rbppc-nand",
-+		.owner = THIS_MODULE,
-+	},
-+};
-+
-+static int __init rbppc_nand_init(void)
-+{
-+	return of_register_platform_driver(&rbppc_nand_driver);
-+}
-+
-+static void __exit rbppc_nand_exit(void)
-+{
-+	of_unregister_platform_driver(&rbppc_nand_driver);
-+}
-+
-+MODULE_AUTHOR("Mikrotikls SIA");
-+MODULE_AUTHOR("Noah Fontes");
-+MODULE_AUTHOR("Michael Guntsche");
-+MODULE_DESCRIPTION("MikroTik RouterBOARD 600 series NAND driver");
-+MODULE_LICENSE("GPL");
-+MODULE_VERSION(DRV_VERSION);
-+
-+module_init(rbppc_nand_init);
-+module_exit(rbppc_nand_exit);
diff --git a/target/linux/mpc83xx/patches/002-mpc8377e-wlan_support.patch b/target/linux/mpc83xx/patches/002-mpc8377e-wlan_support.patch
deleted file mode 100644
index 68634bf78..000000000
--- a/target/linux/mpc83xx/patches/002-mpc8377e-wlan_support.patch
+++ /dev/null
@@ -1,524 +0,0 @@
-From fda4bd9bac78efd2f9d566c52956d297bc03e8d9 Mon Sep 17 00:00:00 2001
-From: Anton Vorontsov <avorontsov@ru.mvista.com>
-Date: Sat, 25 Jul 2009 01:42:17 +0400
-Subject: [PATCH] powerpc/83xx: Add support for MPC8377E-WLAN boards
-
-MPC8377E-WLAN are basically RDB boards except:
-
-- RAM extended to 512 MB;
-- NAND flash removed, NOR flash extended to 64 MB;
-- Vitesse VSC7385 5-port switch removed, RTL8211B PHY added;
-- Power management MCU removed;
-- PCI slot removed, another mini-PCI slot added (IRQ routing changed);
-- USB3300 PHY's ID pin grounded, thus USB port is host-only.
-
-Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
-Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
-Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
----
- arch/powerpc/boot/dts/mpc8377_wlan.dts    |  464 +++++++++++++++++++++++++++++
- arch/powerpc/platforms/83xx/Kconfig       |    4 +-
- arch/powerpc/platforms/83xx/mpc837x_rdb.c |    5 +-
- 3 files changed, 469 insertions(+), 4 deletions(-)
- create mode 100644 arch/powerpc/boot/dts/mpc8377_wlan.dts
-
---- /dev/null
-+++ b/arch/powerpc/boot/dts/mpc8377_wlan.dts
-@@ -0,0 +1,464 @@
-+/*
-+ * MPC8377E WLAN Device Tree Source
-+ *
-+ * Copyright 2007-2009 Freescale Semiconductor Inc.
-+ * Copyright 2009 MontaVista Software, Inc.
-+ *
-+ * 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.
-+ */
-+
-+/dts-v1/;
-+
-+/ {
-+	compatible = "fsl,mpc8377wlan";
-+	#address-cells = <1>;
-+	#size-cells = <1>;
-+
-+	aliases {
-+		ethernet0 = &enet0;
-+		ethernet1 = &enet1;
-+		serial0 = &serial0;
-+		serial1 = &serial1;
-+		pci0 = &pci0;
-+		pci1 = &pci1;
-+		pci2 = &pci2;
-+	};
-+
-+	cpus {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		PowerPC,8377@0 {
-+			device_type = "cpu";
-+			reg = <0x0>;
-+			d-cache-line-size = <32>;
-+			i-cache-line-size = <32>;
-+			d-cache-size = <32768>;
-+			i-cache-size = <32768>;
-+			timebase-frequency = <0>;
-+			bus-frequency = <0>;
-+			clock-frequency = <0>;
-+		};
-+	};
-+
-+	memory {
-+		device_type = "memory";
-+		reg = <0x00000000 0x20000000>;	// 512MB at 0
-+	};
-+
-+	localbus@e0005000 {
-+		#address-cells = <2>;
-+		#size-cells = <1>;
-+		compatible = "fsl,mpc8377-elbc", "fsl,elbc", "simple-bus";
-+		reg = <0xe0005000 0x1000>;
-+		interrupts = <77 0x8>;
-+		interrupt-parent = <&ipic>;
-+		ranges = <0x0 0x0 0xfc000000 0x04000000>;
-+
-+		flash@0,0 {
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+			compatible = "cfi-flash";
-+			reg = <0x0 0x0 0x4000000>;
-+			bank-width = <2>;
-+			device-width = <1>;
-+
-+			partition@0 {
-+				reg = <0 0x8000>;
-+				label = "u-boot";
-+				read-only;
-+			};
-+
-+			partition@a0000 {
-+				reg = <0xa0000 0x300000>;
-+				label = "kernel";
-+			};
-+
-+			partition@3a0000 {
-+				reg = <0x3a0000 0x3c60000>;
-+				label = "rootfs";
-+			};
-+		};
-+	};
-+
-+	immr@e0000000 {
-+		#address-cells = <1>;
-+		#size-cells = <1>;
-+		device_type = "soc";
-+		compatible = "simple-bus";
-+		ranges = <0x0 0xe0000000 0x00100000>;
-+		reg = <0xe0000000 0x00000200>;
-+		bus-frequency = <0>;
-+
-+		wdt@200 {
-+			device_type = "watchdog";
-+			compatible = "mpc83xx_wdt";
-+			reg = <0x200 0x100>;
-+		};
-+
-+		gpio1: gpio-controller@c00 {
-+			#gpio-cells = <2>;
-+			compatible = "fsl,mpc8377-gpio", "fsl,mpc8349-gpio";
-+			reg = <0xc00 0x100>;
-+			interrupts = <74 0x8>;
-+			interrupt-parent = <&ipic>;
-+			gpio-controller;
-+		};
-+
-+		gpio2: gpio-controller@d00 {
-+			#gpio-cells = <2>;
-+			compatible = "fsl,mpc8377-gpio", "fsl,mpc8349-gpio";
-+			reg = <0xd00 0x100>;
-+			interrupts = <75 0x8>;
-+			interrupt-parent = <&ipic>;
-+			gpio-controller;
-+		};
-+
-+		sleep-nexus {
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+			compatible = "simple-bus";
-+			sleep = <&pmc 0x0c000000>;
-+			ranges;
-+
-+			i2c@3000 {
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				cell-index = <0>;
-+				compatible = "fsl-i2c";
-+				reg = <0x3000 0x100>;
-+				interrupts = <14 0x8>;
-+				interrupt-parent = <&ipic>;
-+				dfsrr;
-+
-+				at24@50 {
-+					compatible = "at24,24c256";
-+					reg = <0x50>;
-+				};
-+
-+				rtc@68 {
-+					compatible = "dallas,ds1339";
-+					reg = <0x68>;
-+				};
-+			};
-+
-+			sdhci@2e000 {
-+				compatible = "fsl,mpc8377-esdhc", "fsl,esdhc";
-+				reg = <0x2e000 0x1000>;
-+				interrupts = <42 0x8>;
-+				interrupt-parent = <&ipic>;
-+				clock-frequency = <133333333>;
-+			};
-+		};
-+
-+		i2c@3100 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			cell-index = <1>;
-+			compatible = "fsl-i2c";
-+			reg = <0x3100 0x100>;
-+			interrupts = <15 0x8>;
-+			interrupt-parent = <&ipic>;
-+			dfsrr;
-+		};
-+
-+		spi@7000 {
-+			cell-index = <0>;
-+			compatible = "fsl,spi";
-+			reg = <0x7000 0x1000>;
-+			interrupts = <16 0x8>;
-+			interrupt-parent = <&ipic>;
-+			mode = "cpu";
-+		};
-+
-+		dma@82a8 {
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+			compatible = "fsl,mpc8377-dma", "fsl,elo-dma";
-+			reg = <0x82a8 4>;
-+			ranges = <0 0x8100 0x1a8>;
-+			interrupt-parent = <&ipic>;
-+			interrupts = <71 8>;
-+			cell-index = <0>;
-+			dma-channel@0 {
-+				compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";
-+				reg = <0 0x80>;
-+				cell-index = <0>;
-+				interrupt-parent = <&ipic>;
-+				interrupts = <71 8>;
-+			};
-+			dma-channel@80 {
-+				compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";
-+				reg = <0x80 0x80>;
-+				cell-index = <1>;
-+				interrupt-parent = <&ipic>;
-+				interrupts = <71 8>;
-+			};
-+			dma-channel@100 {
-+				compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";
-+				reg = <0x100 0x80>;
-+				cell-index = <2>;
-+				interrupt-parent = <&ipic>;
-+				interrupts = <71 8>;
-+			};
-+			dma-channel@180 {
-+				compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";
-+				reg = <0x180 0x28>;
-+				cell-index = <3>;
-+				interrupt-parent = <&ipic>;
-+				interrupts = <71 8>;
-+			};
-+		};
-+
-+		usb@23000 {
-+			compatible = "fsl-usb2-dr";
-+			reg = <0x23000 0x1000>;
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			interrupt-parent = <&ipic>;
-+			interrupts = <38 0x8>;
-+			phy_type = "ulpi";
-+			sleep = <&pmc 0x00c00000>;
-+		};
-+
-+		enet0: ethernet@24000 {
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+			cell-index = <0>;
-+			device_type = "network";
-+			model = "eTSEC";
-+			compatible = "gianfar";
-+			reg = <0x24000 0x1000>;
-+			ranges = <0x0 0x24000 0x1000>;
-+			local-mac-address = [ 00 00 00 00 00 00 ];
-+			interrupts = <32 0x8 33 0x8 34 0x8>;
-+			phy-connection-type = "mii";
-+			interrupt-parent = <&ipic>;
-+			tbi-handle = <&tbi0>;
-+			phy-handle = <&phy2>;
-+			sleep = <&pmc 0xc0000000>;
-+			fsl,magic-packet;
-+
-+			mdio@520 {
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				compatible = "fsl,gianfar-mdio";
-+				reg = <0x520 0x20>;
-+
-+				phy2: ethernet-phy@2 {
-+					interrupt-parent = <&ipic>;
-+					interrupts = <17 0x8>;
-+					reg = <0x2>;
-+					device_type = "ethernet-phy";
-+				};
-+
-+				phy3: ethernet-phy@3 {
-+					interrupt-parent = <&ipic>;
-+					interrupts = <18 0x8>;
-+					reg = <0x3>;
-+					device_type = "ethernet-phy";
-+				};
-+
-+				tbi0: tbi-phy@11 {
-+					reg = <0x11>;
-+					device_type = "tbi-phy";
-+				};
-+			};
-+		};
-+
-+		enet1: ethernet@25000 {
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+			cell-index = <1>;
-+			device_type = "network";
-+			model = "eTSEC";
-+			compatible = "gianfar";
-+			reg = <0x25000 0x1000>;
-+			ranges = <0x0 0x25000 0x1000>;
-+			local-mac-address = [ 00 00 00 00 00 00 ];
-+			interrupts = <35 0x8 36 0x8 37 0x8>;
-+			phy-connection-type = "mii";
-+			interrupt-parent = <&ipic>;
-+			phy-handle = <&phy3>;
-+			tbi-handle = <&tbi1>;
-+			sleep = <&pmc 0x30000000>;
-+			fsl,magic-packet;
-+
-+			mdio@520 {
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				compatible = "fsl,gianfar-tbi";
-+				reg = <0x520 0x20>;
-+
-+				tbi1: tbi-phy@11 {
-+					reg = <0x11>;
-+					device_type = "tbi-phy";
-+				};
-+			};
-+		};
-+
-+		serial0: serial@4500 {
-+			cell-index = <0>;
-+			device_type = "serial";
-+			compatible = "ns16550";
-+			reg = <0x4500 0x100>;
-+			clock-frequency = <0>;
-+			interrupts = <9 0x8>;
-+			interrupt-parent = <&ipic>;
-+		};
-+
-+		serial1: serial@4600 {
-+			cell-index = <1>;
-+			device_type = "serial";
-+			compatible = "ns16550";
-+			reg = <0x4600 0x100>;
-+			clock-frequency = <0>;
-+			interrupts = <10 0x8>;
-+			interrupt-parent = <&ipic>;
-+		};
-+
-+		crypto@30000 {
-+			compatible = "fsl,sec3.0", "fsl,sec2.4", "fsl,sec2.2",
-+				     "fsl,sec2.1", "fsl,sec2.0";
-+			reg = <0x30000 0x10000>;
-+			interrupts = <11 0x8>;
-+			interrupt-parent = <&ipic>;
-+			fsl,num-channels = <4>;
-+			fsl,channel-fifo-len = <24>;
-+			fsl,exec-units-mask = <0x9fe>;
-+			fsl,descriptor-types-mask = <0x3ab0ebf>;
-+			sleep = <&pmc 0x03000000>;
-+		};
-+
-+		sata@18000 {
-+			compatible = "fsl,mpc8377-sata", "fsl,pq-sata";
-+			reg = <0x18000 0x1000>;
-+			interrupts = <44 0x8>;
-+			interrupt-parent = <&ipic>;
-+			sleep = <&pmc 0x000000c0>;
-+		};
-+
-+		sata@19000 {
-+			compatible = "fsl,mpc8377-sata", "fsl,pq-sata";
-+			reg = <0x19000 0x1000>;
-+			interrupts = <45 0x8>;
-+			interrupt-parent = <&ipic>;
-+			sleep = <&pmc 0x00000030>;
-+		};
-+
-+		/* IPIC
-+		 * interrupts cell = <intr #, sense>
-+		 * sense values match linux IORESOURCE_IRQ_* defines:
-+		 * sense == 8: Level, low assertion
-+		 * sense == 2: Edge, high-to-low change
-+		 */
-+		ipic: interrupt-controller@700 {
-+			compatible = "fsl,ipic";
-+			interrupt-controller;
-+			#address-cells = <0>;
-+			#interrupt-cells = <2>;
-+			reg = <0x700 0x100>;
-+		};
-+
-+		pmc: power@b00 {
-+			compatible = "fsl,mpc8377-pmc", "fsl,mpc8349-pmc";
-+			reg = <0xb00 0x100 0xa00 0x100>;
-+			interrupts = <80 0x8>;
-+			interrupt-parent = <&ipic>;
-+		};
-+	};
-+
-+	pci0: pci@e0008500 {
-+		interrupt-map-mask = <0xf800 0 0 7>;
-+		interrupt-map = <
-+				/* IRQ5 = 21 = 0x15, IRQ6 = 0x16, IRQ7 = 23 = 0x17 */
-+
-+				/* IDSEL AD14 IRQ6 inta */
-+				 0x7000 0x0 0x0 0x1 &ipic 22 0x8
-+
-+				/* IDSEL AD15 IRQ5 inta */
-+				 0x7800 0x0 0x0 0x1 &ipic 21 0x8>;
-+		interrupt-parent = <&ipic>;
-+		interrupts = <66 0x8>;
-+		bus-range = <0 0>;
-+		ranges = <0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000
-+		          0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000
-+		          0x01000000 0x0 0x00000000 0xe0300000 0x0 0x00100000>;
-+		sleep = <&pmc 0x00010000>;
-+		clock-frequency = <66666666>;
-+		#interrupt-cells = <1>;
-+		#size-cells = <2>;
-+		#address-cells = <3>;
-+		reg = <0xe0008500 0x100		/* internal registers */
-+		       0xe0008300 0x8>;		/* config space access registers */
-+		compatible = "fsl,mpc8349-pci";
-+		device_type = "pci";
-+	};
-+
-+	pci1: pcie@e0009000 {
-+		#address-cells = <3>;
-+		#size-cells = <2>;
-+		#interrupt-cells = <1>;
-+		device_type = "pci";
-+		compatible = "fsl,mpc8377-pcie", "fsl,mpc8314-pcie";
-+		reg = <0xe0009000 0x00001000>;
-+		ranges = <0x02000000 0 0xa8000000 0xa8000000 0 0x10000000
-+		          0x01000000 0 0x00000000 0xb8000000 0 0x00800000>;
-+		bus-range = <0 255>;
-+		interrupt-map-mask = <0xf800 0 0 7>;
-+		interrupt-map = <0 0 0 1 &ipic 1 8
-+				 0 0 0 2 &ipic 1 8
-+				 0 0 0 3 &ipic 1 8
-+				 0 0 0 4 &ipic 1 8>;
-+		sleep = <&pmc 0x00300000>;
-+		clock-frequency = <0>;
-+
-+		pcie@0 {
-+			#address-cells = <3>;
-+			#size-cells = <2>;
-+			device_type = "pci";
-+			reg = <0 0 0 0 0>;
-+			ranges = <0x02000000 0 0xa8000000
-+				  0x02000000 0 0xa8000000
-+				  0 0x10000000
-+				  0x01000000 0 0x00000000
-+				  0x01000000 0 0x00000000
-+				  0 0x00800000>;
-+		};
-+	};
-+
-+	pci2: pcie@e000a000 {
-+		#address-cells = <3>;
-+		#size-cells = <2>;
-+		#interrupt-cells = <1>;
-+		device_type = "pci";
-+		compatible = "fsl,mpc8377-pcie", "fsl,mpc8314-pcie";
-+		reg = <0xe000a000 0x00001000>;
-+		ranges = <0x02000000 0 0xc8000000 0xc8000000 0 0x10000000
-+			  0x01000000 0 0x00000000 0xd8000000 0 0x00800000>;
-+		bus-range = <0 255>;
-+		interrupt-map-mask = <0xf800 0 0 7>;
-+		interrupt-map = <0 0 0 1 &ipic 2 8
-+				 0 0 0 2 &ipic 2 8
-+				 0 0 0 3 &ipic 2 8
-+				 0 0 0 4 &ipic 2 8>;
-+		sleep = <&pmc 0x000c0000>;
-+		clock-frequency = <0>;
-+
-+		pcie@0 {
-+			#address-cells = <3>;
-+			#size-cells = <2>;
-+			device_type = "pci";
-+			reg = <0 0 0 0 0>;
-+			ranges = <0x02000000 0 0xc8000000
-+				  0x02000000 0 0xc8000000
-+				  0 0x10000000
-+				  0x01000000 0 0x00000000
-+				  0x01000000 0 0x00000000
-+				  0 0x00800000>;
-+		};
-+	};
-+};
---- a/arch/powerpc/platforms/83xx/Kconfig
-+++ b/arch/powerpc/platforms/83xx/Kconfig
-@@ -84,11 +84,11 @@ config MPC837x_MDS
- 	  This option enables support for the MPC837x MDS Processor Board.
- 
- config MPC837x_RDB
--	bool "Freescale MPC837x RDB"
-+	bool "Freescale MPC837x RDB/WLAN"
- 	select DEFAULT_UIMAGE
- 	select PPC_MPC837x
- 	help
--	  This option enables support for the MPC837x RDB Board.
-+	  This option enables support for the MPC837x RDB and WLAN Boards.
- 
- config SBC834x
- 	bool "Wind River SBC834x"
---- a/arch/powerpc/platforms/83xx/mpc837x_rdb.c
-+++ b/arch/powerpc/platforms/83xx/mpc837x_rdb.c
-@@ -86,11 +86,12 @@ static int __init mpc837x_rdb_probe(void
- 
- 	return of_flat_dt_is_compatible(root, "fsl,mpc8377rdb") ||
- 	       of_flat_dt_is_compatible(root, "fsl,mpc8378rdb") ||
--	       of_flat_dt_is_compatible(root, "fsl,mpc8379rdb");
-+	       of_flat_dt_is_compatible(root, "fsl,mpc8379rdb") ||
-+	       of_flat_dt_is_compatible(root, "fsl,mpc8377wlan");
- }
- 
- define_machine(mpc837x_rdb) {
--	.name			= "MPC837x RDB",
-+	.name			= "MPC837x RDB/WLAN",
- 	.probe			= mpc837x_rdb_probe,
- 	.setup_arch		= mpc837x_rdb_setup_arch,
- 	.init_IRQ		= mpc837x_rdb_init_IRQ,
diff --git a/target/linux/mpc83xx/patches/003-esdhc_wp-inverted_property.patch b/target/linux/mpc83xx/patches/003-esdhc_wp-inverted_property.patch
deleted file mode 100644
index 50c199a4d..000000000
--- a/target/linux/mpc83xx/patches/003-esdhc_wp-inverted_property.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From 50dfe70fe9e216cf356830194630f9a39e498d76 Mon Sep 17 00:00:00 2001
-From: Anton Vorontsov <avorontsov@ru.mvista.com>
-Date: Tue, 22 Sep 2009 16:45:14 -0700
-Subject: [PATCH] powerpc: introduce and document sdhci,wp-inverted property for eSDHC
-
-eSDHC block in MPC837x SOCs reports inverted write-protect state, soon
-sdhci-of driver will look for sdhci,wp-inverted properties to decide
-whether apply a specific quirk.
-
-So, document the property and add it to device tree source files.
-
-Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
-Cc: Pierre Ossman <pierre@ossman.eu>
-Cc: Kumar Gala <galak@kernel.crashing.org>
-Cc: David Vrabel <david.vrabel@csr.com>
-Cc: Ben Dooks <ben@fluff.org>
-Cc: Sascha Hauer <s.hauer@pengutronix.de>
-Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-Cc: <linux-mmc@vger.kernel.org>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
----
- Documentation/powerpc/dts-bindings/fsl/esdhc.txt |    2 ++
- arch/powerpc/boot/dts/mpc8377_mds.dts            |    1 +
- arch/powerpc/boot/dts/mpc8377_rdb.dts            |    1 +
- arch/powerpc/boot/dts/mpc8377_wlan.dts           |    1 +
- arch/powerpc/boot/dts/mpc8378_mds.dts            |    1 +
- arch/powerpc/boot/dts/mpc8378_rdb.dts            |    1 +
- arch/powerpc/boot/dts/mpc8379_mds.dts            |    1 +
- arch/powerpc/boot/dts/mpc8379_rdb.dts            |    1 +
- 8 files changed, 9 insertions(+), 0 deletions(-)
-
---- a/Documentation/powerpc/dts-bindings/fsl/esdhc.txt
-+++ b/Documentation/powerpc/dts-bindings/fsl/esdhc.txt
-@@ -10,6 +10,8 @@ Required properties:
-   - interrupts : should contain eSDHC interrupt.
-   - interrupt-parent : interrupt source phandle.
-   - clock-frequency : specifies eSDHC base clock frequency.
-+  - sdhci,wp-inverted : (optional) specifies that eSDHC controller
-+    reports inverted write-protect state;
-   - sdhci,1-bit-only : (optional) specifies that a controller can
-     only handle 1-bit data transfers.
- 
---- a/arch/powerpc/boot/dts/mpc8377_mds.dts
-+++ b/arch/powerpc/boot/dts/mpc8377_mds.dts
-@@ -159,6 +159,7 @@
- 				reg = <0x2e000 0x1000>;
- 				interrupts = <42 0x8>;
- 				interrupt-parent = <&ipic>;
-+				sdhci,wp-inverted;
- 				/* Filled in by U-Boot */
- 				clock-frequency = <0>;
- 			};
---- a/arch/powerpc/boot/dts/mpc8377_rdb.dts
-+++ b/arch/powerpc/boot/dts/mpc8377_rdb.dts
-@@ -173,6 +173,7 @@
- 				reg = <0x2e000 0x1000>;
- 				interrupts = <42 0x8>;
- 				interrupt-parent = <&ipic>;
-+				sdhci,wp-inverted;
- 				/* Filled in by U-Boot */
- 				clock-frequency = <0>;
- 			};
---- a/arch/powerpc/boot/dts/mpc8377_wlan.dts
-+++ b/arch/powerpc/boot/dts/mpc8377_wlan.dts
-@@ -150,6 +150,7 @@
- 				reg = <0x2e000 0x1000>;
- 				interrupts = <42 0x8>;
- 				interrupt-parent = <&ipic>;
-+				sdhci,wp-inverted;
- 				clock-frequency = <133333333>;
- 			};
- 		};
---- a/arch/powerpc/boot/dts/mpc8378_mds.dts
-+++ b/arch/powerpc/boot/dts/mpc8378_mds.dts
-@@ -159,6 +159,7 @@
- 				reg = <0x2e000 0x1000>;
- 				interrupts = <42 0x8>;
- 				interrupt-parent = <&ipic>;
-+				sdhci,wp-inverted;
- 				/* Filled in by U-Boot */
- 				clock-frequency = <0>;
- 			};
---- a/arch/powerpc/boot/dts/mpc8378_rdb.dts
-+++ b/arch/powerpc/boot/dts/mpc8378_rdb.dts
-@@ -173,6 +173,7 @@
- 				reg = <0x2e000 0x1000>;
- 				interrupts = <42 0x8>;
- 				interrupt-parent = <&ipic>;
-+				sdhci,wp-inverted;
- 				/* Filled in by U-Boot */
- 				clock-frequency = <0>;
- 			};
---- a/arch/powerpc/boot/dts/mpc8379_mds.dts
-+++ b/arch/powerpc/boot/dts/mpc8379_mds.dts
-@@ -157,6 +157,7 @@
- 				reg = <0x2e000 0x1000>;
- 				interrupts = <42 0x8>;
- 				interrupt-parent = <&ipic>;
-+				sdhci,wp-inverted;
- 				/* Filled in by U-Boot */
- 				clock-frequency = <0>;
- 			};
---- a/arch/powerpc/boot/dts/mpc8379_rdb.dts
-+++ b/arch/powerpc/boot/dts/mpc8379_rdb.dts
-@@ -171,6 +171,7 @@
- 				reg = <0x2e000 0x1000>;
- 				interrupts = <42 0x8>;
- 				interrupt-parent = <&ipic>;
-+				sdhci,wp-inverted;
- 				/* Filled in by U-Boot */
- 				clock-frequency = <0>;
- 			};
diff --git a/target/linux/mpc83xx/patches/004-mpc8377e-wlan_u-boot_size_fix.patch b/target/linux/mpc83xx/patches/004-mpc8377e-wlan_u-boot_size_fix.patch
deleted file mode 100644
index 8cf95f611..000000000
--- a/target/linux/mpc83xx/patches/004-mpc8377e-wlan_u-boot_size_fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 850f785a1f8c8448db4d70983595b2b088cf60b7 Mon Sep 17 00:00:00 2001
-From: Anton Vorontsov <avorontsov@ru.mvista.com>
-Date: Fri, 16 Oct 2009 20:47:22 +0400
-Subject: [PATCH] powerpc/83xx: Fix u-boot partion size for MPC8377E-WLAN boards
-
-u-boot partition size should be 0x80000 (512 KB), not 0x8000 (32 KB).
-
-Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
-Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
----
- arch/powerpc/boot/dts/mpc8377_wlan.dts |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
---- a/arch/powerpc/boot/dts/mpc8377_wlan.dts
-+++ b/arch/powerpc/boot/dts/mpc8377_wlan.dts
-@@ -67,7 +67,7 @@
- 			device-width = <1>;
- 
- 			partition@0 {
--				reg = <0 0x8000>;
-+				reg = <0 0x80000>;
- 				label = "u-boot";
- 				read-only;
- 			};
diff --git a/target/linux/mpc83xx/patches/005-powerpc_mkuboot.patch b/target/linux/mpc83xx/patches/005-powerpc_mkuboot.patch
deleted file mode 100644
index 8e200b1a6..000000000
--- a/target/linux/mpc83xx/patches/005-powerpc_mkuboot.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/arch/powerpc/boot/wrapper
-+++ b/arch/powerpc/boot/wrapper
-@@ -43,6 +43,9 @@ gzip=.gz
- # cross-compilation prefix
- CROSS=
- 
-+# mkimage wrapper script
-+MKIMAGE=$srctree/scripts/mkuboot.sh
-+
- # directory for object and other files used by this script
- object=arch/powerpc/boot
- objbin=$object
-@@ -262,7 +265,7 @@ membase=`${CROSS}objdump -p "$kernel" | 
- case "$platform" in
- uboot)
-     rm -f "$ofile"
--    mkimage -A ppc -O linux -T kernel -C gzip -a $membase -e $membase \
-+    ${MKIMAGE} -A ppc -O linux -T kernel -C gzip -a $membase -e $membase \
- 	$uboot_version -d "$vmz" "$ofile"
-     if [ -z "$cacheit" ]; then
- 	rm -f "$vmz"
-@@ -322,7 +325,7 @@ coff)
-     ;;
- cuboot*)
-     gzip -f -9 "$ofile"
--    mkimage -A ppc -O linux -T kernel -C gzip -a "$base" -e "$entry" \
-+    ${MKIMAGE} -A ppc -O linux -T kernel -C gzip -a "$base" -e "$entry" \
-             $uboot_version -d "$ofile".gz "$ofile"
-     ;;
- treeboot*)
diff --git a/target/linux/mpc83xx/patches/006-powerpc_create_fit_uImages.patch b/target/linux/mpc83xx/patches/006-powerpc_create_fit_uImages.patch
deleted file mode 100644
index d553c675d..000000000
--- a/target/linux/mpc83xx/patches/006-powerpc_create_fit_uImages.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- a/arch/powerpc/Makefile
-+++ b/arch/powerpc/Makefile
-@@ -157,7 +157,8 @@ drivers-$(CONFIG_OPROFILE)	+= arch/power
- # Default to zImage, override when needed
- all: zImage
- 
--BOOT_TARGETS = zImage zImage.initrd uImage zImage% dtbImage% treeImage.% cuImage.% simpleImage.%
-+BOOT_TARGETS = zImage zImage.initrd uImage uImage.fit.% zImage% dtbImage% \
-+	       treeImage.% cuImage.% simpleImage.%
- 
- PHONY += $(BOOT_TARGETS)
- 
-@@ -173,6 +174,7 @@ define archhelp
-   @echo '* zImage          - Build default images selected by kernel config'
-   @echo '  zImage.*        - Compressed kernel image (arch/$(ARCH)/boot/zImage.*)'
-   @echo '  uImage          - U-Boot native image format'
-+  @echo '  uImage.fit.<dt> - U-Boot Flattened Image Tree image format'
-   @echo '  cuImage.<dt>    - Backwards compatible U-Boot image for older'
-   @echo '                    versions which do not support device trees'
-   @echo '  dtbImage.<dt>   - zImage with an embedded device tree blob'
---- a/arch/powerpc/boot/.gitignore
-+++ b/arch/powerpc/boot/.gitignore
-@@ -19,6 +19,7 @@ kernel-vmlinux.strip.c
- kernel-vmlinux.strip.gz
- mktree
- uImage
-+uImage.fit.*
- cuImage.*
- dtbImage.*
- treeImage.*
---- a/arch/powerpc/boot/Makefile
-+++ b/arch/powerpc/boot/Makefile
-@@ -306,6 +306,9 @@ $(obj)/zImage.iseries: vmlinux
- $(obj)/uImage: vmlinux $(wrapperbits)
- 	$(call if_changed,wrap,uboot)
- 
-+$(obj)/uImage.fit.%: vmlinux $(obj)/%.dtb $(wrapperbits)
-+	$(call if_changed,wrap,uboot.fit,,$(obj)/$*.dtb)
-+
- $(obj)/cuImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)
- 	$(call if_changed,wrap,cuboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)
- 
-@@ -345,7 +348,7 @@ install: $(CONFIGURE) $(addprefix $(obj)
- 
- # anything not in $(targets)
- clean-files += $(image-) $(initrd-) cuImage.* dtbImage.* treeImage.* \
--	zImage zImage.initrd zImage.chrp zImage.coff zImage.holly \
-+	uImage.* zImage zImage.initrd zImage.chrp zImage.coff zImage.holly \
- 	zImage.iseries zImage.miboot zImage.pmac zImage.pseries \
- 	simpleImage.* otheros.bld *.dtb
- 
---- a/arch/powerpc/boot/wrapper
-+++ b/arch/powerpc/boot/wrapper
-@@ -46,6 +46,9 @@ CROSS=
- # mkimage wrapper script
- MKIMAGE=$srctree/scripts/mkuboot.sh
- 
-+# script to generate an .its file for uImage.fit.* images
-+MKITS=$srctree/scripts/mkits.sh
-+
- # directory for object and other files used by this script
- object=arch/powerpc/boot
- objbin=$object
-@@ -156,7 +159,7 @@ coff)
-     lds=$object/zImage.coff.lds
-     link_address='0x500000'
-     ;;
--miboot|uboot)
-+miboot|uboot|uboot.fit)
-     # miboot and U-boot want just the bare bits, not an ELF binary
-     ext=bin
-     objflags="-O binary"
-@@ -272,6 +275,21 @@ uboot)
-     fi
-     exit 0
-     ;;
-+uboot.fit)
-+    rm -f "$ofile"
-+    ${MKITS} -A ppc -C gzip -a $membase -e $membase -v $version \
-+	-d "$srctree/$dtb" -k "$srctree/$vmz" -o "$object/uImage.its"
-+
-+    # mkimage calls dtc for FIT images so use kernel dtc if necessary
-+    export PATH=$PATH:$srctree/scripts/dtc
-+
-+    ${MKIMAGE} -f "$object/uImage.its" "$ofile"
-+    rm "$object/uImage.its"
-+    if [ -z "$cacheit" ]; then
-+	rm -f "$vmz"
-+    fi
-+    exit 0
-+    ;;
- esac
- 
- addsec() {
diff --git a/target/linux/omap35xx/Makefile b/target/linux/omap35xx/Makefile
deleted file mode 100644
index 3a13edbe1..000000000
--- a/target/linux/omap35xx/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Copyright (C) 2006-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-ARCH:=arm
-BOARD:=omap35xx
-BOARDNAME:=TI OMAP35xx
-FEATURES:=broken
-SUBTARGETS=generic
-
-LINUX_VERSION:=2.6.32.10
-KERNELNAME:="uImage"
-
-DEVICE_TYPE=developerboard
-
-define Target/Description
-	omap35xx arm
-endef
-
-include $(INCLUDE_DIR)/target.mk
-
-$(eval $(call BuildTarget))
diff --git a/target/linux/omap35xx/base-files/etc/config/network b/target/linux/omap35xx/base-files/etc/config/network
deleted file mode 100644
index 2ea5a4b04..000000000
--- a/target/linux/omap35xx/base-files/etc/config/network
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (C) 2006 OpenWrt.org
-
-config interface loopback
-	option ifname	lo
-	option proto	static
-	option ipaddr	127.0.0.1
-	option netmask	255.0.0.0
-
-config interface lan
-	option ifname	usb0
-	option type 	bridge
-	option proto	static
-	option ipaddr	192.168.1.1
-	option netmask	255.255.255.0
diff --git a/target/linux/omap35xx/base-files/etc/inittab b/target/linux/omap35xx/base-files/etc/inittab
deleted file mode 100644
index 89626ecda..000000000
--- a/target/linux/omap35xx/base-files/etc/inittab
+++ /dev/null
@@ -1,7 +0,0 @@
-::sysinit:/etc/init.d/rcS S boot
-::shutdown:/etc/init.d/rcS K stop
-tts/0::askfirst:/bin/ash --login
-ttyS0::askfirst:/bin/ash --login
-ttyS1::askfirst:/bin/ash --login
-ttyS2::askfirst:/bin/ash --login
-tty1::askfirst:/bin/ash --login
diff --git a/target/linux/omap35xx/config-2.6.32 b/target/linux/omap35xx/config-2.6.32
deleted file mode 100644
index 4c17d9b40..000000000
--- a/target/linux/omap35xx/config-2.6.32
+++ /dev/null
@@ -1,1730 +0,0 @@
-
-#
-# AC97 GPIO expanders:
-# also be needed; see USB_STORAGE Help for more info
-# Android
-# At least one emulation must be selected
-# Audio decoders
-# Authenticated Encryption with Associated Data
-# Automatically generated make config: don't edit
-# Block modes
-# Boot options
-# Bus support
-# Caches
-# Camera Sensor Selection
-# CBUS support
-# CD-ROM/DVD Filesystems
-# CFG80211 needs to be enabled for MAC80211
-# Character devices
-# Ciphers
-# Compression
-# CONFIG_AB3100_CORE is not set
-# CONFIG_ACCESSIBILITY is not set
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_ADFS_FS is not set
-CONFIG_AEABI=y
-# CONFIG_AFFS_FS is not set
-# CONFIG_AF_RXRPC is not set
-CONFIG_AIO=y
-CONFIG_ALIGNMENT_TRAP=y
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ANDROID is not set
-CONFIG_ANON_INODES=y
-# CONFIG_APM_EMULATION is not set
-# CONFIG_ARCH_AAEC2000 is not set
-# CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_BCMRING is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_GEMINI is not set
-# CONFIG_ARCH_H720X is not set
-CONFIG_ARCH_HAS_CPUFREQ=y
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP13XX is not set
-# CONFIG_ARCH_IOP32X is not set
-# CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IXP2000 is not set
-# CONFIG_ARCH_IXP23XX is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_KIRKWOOD is not set
-# CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_L7200 is not set
-# CONFIG_ARCH_LH7A40X is not set
-# CONFIG_ARCH_LOKI is not set
-# CONFIG_ARCH_MMP is not set
-# CONFIG_ARCH_MSM is not set
-# CONFIG_ARCH_MV78XX0 is not set
-# CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_NOMADIK is not set
-# CONFIG_ARCH_NS9XXX is not set
-# CONFIG_ARCH_OMAP1 is not set
-# CONFIG_ARCH_OMAP2 is not set
-CONFIG_ARCH_OMAP3430=y
-CONFIG_ARCH_OMAP34XX=y
-CONFIG_ARCH_OMAP3=y
-# CONFIG_ARCH_OMAP4 is not set
-CONFIG_ARCH_OMAP_OTG=y
-CONFIG_ARCH_OMAP=y
-# CONFIG_ARCH_ORION5X is not set
-# CONFIG_ARCH_PNX4008 is not set
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_REALVIEW is not set
-CONFIG_ARCH_REQUIRE_GPIOLIB=y
-# CONFIG_ARCH_RPC is not set
-# CONFIG_ARCH_S3C2410 is not set
-# CONFIG_ARCH_S3C64XX is not set
-# CONFIG_ARCH_S5PC1XX is not set
-# CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
-# CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
-# CONFIG_ARCH_STMP3XXX is not set
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-# CONFIG_ARCH_U300 is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_W90X900 is not set
-# CONFIG_ARM_ERRATA_430973 is not set
-# CONFIG_ARM_ERRATA_458693 is not set
-# CONFIG_ARM_ERRATA_460075 is not set
-CONFIG_ARM_L1_CACHE_SHIFT=6
-# CONFIG_ARM_THUMBEE is not set
-CONFIG_ARM_THUMB=y
-# CONFIG_ARM_UNWIND is not set
-CONFIG_ARM=y
-# CONFIG_ARPD is not set
-# CONFIG_ASUS_OLED is not set
-# CONFIG_ATA is not set
-# CONFIG_ATALK is not set
-# CONFIG_ATA_OVER_ETH is not set
-# CONFIG_ATARI_PARTITION is not set
-# CONFIG_ATM is not set
-# CONFIG_AUDIT is not set
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUXDISPLAY is not set
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_GENERIC=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-# CONFIG_BACKTRACE_SELF_TEST is not set
-CONFIG_BASE_FULL=y
-CONFIG_BASE_SMALL=0
-# CONFIG_BATTERY_BQ27x00 is not set
-# CONFIG_BATTERY_DS2760 is not set
-# CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_MAX17040 is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_BINARY_PRINTF is not set
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BINFMT_ELF=y
-CONFIG_BINFMT_MISC=y
-CONFIG_BITREVERSE=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-CONFIG_BLK_DEV_INITRD=y
-# CONFIG_BLK_DEV_INTEGRITY is not set
-CONFIG_BLK_DEV_LOOP=y
-# CONFIG_BLK_DEV_NBD is not set
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=16384
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_SD=y
-# CONFIG_BLK_DEV_SR is not set
-# CONFIG_BLK_DEV_UB is not set
-# CONFIG_BLK_DEV_XIP is not set
-CONFIG_BLK_DEV=y
-CONFIG_BLOCK=y
-# CONFIG_BONDING is not set
-# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
-CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
-# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_BRIDGE is not set
-CONFIG_BROKEN_ON_SMP=y
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_BSD_PROCESS_ACCT_V3 is not set
-CONFIG_BSD_PROCESS_ACCT=y
-# CONFIG_BT is not set
-# CONFIG_BTRFS_FS is not set
-CONFIG_BUG=y
-# CONFIG_CAN is not set
-# CONFIG_CBUS is not set
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_CDROM_PKTCDVD is not set
-CONFIG_CFG80211_DEFAULT_PS_VALUE=0
-# CONFIG_CFG80211 is not set
-# CONFIG_CGROUP_SCHED is not set
-# CONFIG_CGROUPS is not set
-# CONFIG_CHR_DEV_OSST is not set
-# CONFIG_CHR_DEV_SCH is not set
-# CONFIG_CHR_DEV_SG is not set
-# CONFIG_CHR_DEV_ST is not set
-CONFIG_CMDLINE="root=/dev/nfs nfsroot=192.168.0.1:/home/user/buildroot ip=192.168.0.2:192.168.0.1:192.168.0.1:255.255.255.0:tgt:eth0:off rw console=ttyS2,115200n8"
-# CONFIG_COMEDI is not set
-CONFIG_COMMON_CLKDEV=y
-CONFIG_COMPAT_BRK=y
-# CONFIG_CONFIGFS_FS is not set
-# CONFIG_CONNECTOR is not set
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_CONSTRUCTORS=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_CPU_32v6K=y
-CONFIG_CPU_32v7=y
-CONFIG_CPU_32=y
-CONFIG_CPU_ABRT_EV7=y
-# CONFIG_CPU_BPREDICT_DISABLE is not set
-CONFIG_CPU_CACHE_V7=y
-CONFIG_CPU_CACHE_VIPT=y
-CONFIG_CPU_COPY_V6=y
-CONFIG_CPU_CP15_MMU=y
-CONFIG_CPU_CP15=y
-# CONFIG_CPU_DCACHE_DISABLE is not set
-# CONFIG_CPU_FREQ is not set
-CONFIG_CPU_HAS_ASID=y
-# CONFIG_CPU_ICACHE_DISABLE is not set
-# CONFIG_CPU_IDLE is not set
-CONFIG_CPU_PABRT_V7=y
-CONFIG_CPU_TLB_V7=y
-CONFIG_CPU_V7=y
-# CONFIG_CRAMFS is not set
-CONFIG_CRC16=m
-CONFIG_CRC32=y
-CONFIG_CRC7=y
-CONFIG_CRC_CCITT=y
-CONFIG_CRC_ITU_T=y
-# CONFIG_CRC_T10DIF is not set
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_ALGAPI=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_ANUBIS is not set
-CONFIG_CRYPTO_ARC4=m
-# CONFIG_CRYPTO_AUTHENC is not set
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_BLKCIPHER=y
-# CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_CAST5 is not set
-# CONFIG_CRYPTO_CAST6 is not set
-CONFIG_CRYPTO_CBC=y
-# CONFIG_CRYPTO_CCM is not set
-CONFIG_CRYPTO_CRC32C=y
-# CONFIG_CRYPTO_CRYPTD is not set
-# CONFIG_CRYPTO_CTR is not set
-# CONFIG_CRYPTO_CTS is not set
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_DES=y
-CONFIG_CRYPTO_ECB=m
-# CONFIG_CRYPTO_FCRYPT is not set
-# CONFIG_CRYPTO_GCM is not set
-# CONFIG_CRYPTO_GF128MUL is not set
-# CONFIG_CRYPTO_GHASH is not set
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HMAC=m
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_LZO is not set
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_MANAGER=y
-# CONFIG_CRYPTO_MD4 is not set
-CONFIG_CRYPTO_MD5=y
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_NULL is not set
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_PCOMP=y
-# CONFIG_CRYPTO_RMD128 is not set
-# CONFIG_CRYPTO_RMD160 is not set
-# CONFIG_CRYPTO_RMD256 is not set
-# CONFIG_CRYPTO_RMD320 is not set
-CONFIG_CRYPTO_RNG2=y
-# CONFIG_CRYPTO_RNG is not set
-# CONFIG_CRYPTO_SALSA20 is not set
-# CONFIG_CRYPTO_SEED is not set
-# CONFIG_CRYPTO_SEQIV is not set
-# CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_SHA1 is not set
-# CONFIG_CRYPTO_SHA256 is not set
-# CONFIG_CRYPTO_SHA512 is not set
-# CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_TEST is not set
-# CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-# CONFIG_CRYPTO_VMAC is not set
-CONFIG_CRYPTO_WORKQUEUE=y
-# CONFIG_CRYPTO_WP512 is not set
-# CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_XTS is not set
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_ZLIB=y
-# CONFIG_CUSE is not set
-# CONFIG_DAB is not set
-# CONFIG_DCB is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-# CONFIG_DEBUG_DEVRES is not set
-CONFIG_DEBUG_DRIVER=y
-# CONFIG_DEBUG_ERRORS is not set
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-CONFIG_DEBUG_FS=y
-# CONFIG_DEBUG_GPIO is not set
-CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_LL is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_DEBUG_MEMORY_INIT is not set
-CONFIG_DEBUG_MUTEXES=y
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_SHIRQ is not set
-# CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_USER is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_WRITECOUNT is not set
-# CONFIG_DECNET is not set
-CONFIG_DECOMPRESS_LZMA_NEEDED=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DEFAULT_AS=y
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_TCP_CONG="cubic"
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_DETECT_SOFTLOCKUP=y
-CONFIG_DEVKMEM=y
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_DEVTMPFS=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-CONFIG_DISPLAY_SUPPORT=y
-# CONFIG_DLM is not set
-# CONFIG_DMADEVICES is not set
-CONFIG_DNOTIFY=y
-# CONFIG_DS1682 is not set
-# CONFIG_DST is not set
-CONFIG_DUMMY_CONSOLE=y
-# CONFIG_DUMMY is not set
-# CONFIG_DVB_CORE is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-# CONFIG_ECHO is not set
-# CONFIG_ECONET is not set
-# CONFIG_EFI_PARTITION is not set
-# CONFIG_EFS_FS is not set
-CONFIG_ELF_CORE=y
-CONFIG_EMBEDDED=y
-CONFIG_ENABLE_MUST_CHECK=y
-CONFIG_ENABLE_WARN_DEPRECATED=y
-CONFIG_EPOLL=y
-# CONFIG_EQUALIZER is not set
-CONFIG_EVENTFD=y
-CONFIG_EXPERIMENTAL=y
-CONFIG_EXPORTFS=m
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT2_FS=y
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-# CONFIG_EXT3_FS_XATTR is not set
-CONFIG_EXT3_FS=y
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_EXT4_FS=m
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-CONFIG_EXT4_FS_XATTR=y
-# CONFIG_EZX_PCAP is not set
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-CONFIG_FAT_FS=y
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_FB_BACKLIGHT is not set
-# CONFIG_FB_BOOT_VESA_SUPPORT is not set
-# CONFIG_FB_BROADSHEET is not set
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-# CONFIG_FB_DDC is not set
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_MACMODES is not set
-# CONFIG_FB_MB862XX is not set
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MODE_HELPERS is not set
-CONFIG_FB_OMAP2_DEBUG_SUPPORT=y
-CONFIG_FB_OMAP2_FORCE_AUTO_UPDATE=y
-CONFIG_FB_OMAP2_NUM_FBS=3
-CONFIG_FB_OMAP2=y
-# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_FOPS is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
-# CONFIG_FB_TILEBLITTING is not set
-# CONFIG_FB_UDL is not set
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_FB=y
-CONFIG_FILE_LOCKING=y
-# CONFIG_FIRMWARE_EDID is not set
-CONFIG_FLATMEM_MANUAL=y
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_FONT_10x18 is not set
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-CONFIG_FONT_8x16=y
-CONFIG_FONT_8x8=y
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_SUN8x16 is not set
-CONFIG_FONTS=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAME_POINTER=y
-CONFIG_FRAME_WARN=1024
-CONFIG_FREEZER=y
-# CONFIG_FSCACHE is not set
-CONFIG_FS_MBCACHE=m
-CONFIG_FSNOTIFY=y
-CONFIG_FS_POSIX_ACL=y
-# CONFIG_FTL is not set
-# CONFIG_FTRACE is not set
-CONFIG_FUSE_FS=m
-CONFIG_FUTEX=y
-# CONFIG_FW_LOADER is not set
-# CONFIG_GAMEPORT is not set
-# CONFIG_GCOV_KERNEL is not set
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_TIME=y
-# CONFIG_GPIO_DEVICE is not set
-CONFIG_GPIOLIB=y
-# CONFIG_GPIO_MAX7301 is not set
-# CONFIG_GPIO_MAX732X is not set
-# CONFIG_GPIO_MC33880 is not set
-# CONFIG_GPIO_MCP23S08 is not set
-# CONFIG_GPIO_PCA953X is not set
-# CONFIG_GPIO_PCF857X is not set
-# CONFIG_GPIO_SYSFS is not set
-CONFIG_GPIO_TWL4030=y
-CONFIG_GROUP_SCHED=y
-# CONFIG_HAMRADIO is not set
-CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAS_TLS_REG=y
-CONFIG_HAVE_AOUT=y
-CONFIG_HAVE_ARCH_KGDB=y
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_HAVE_IDE=y
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_LZO=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_HAVE_MLOCKED_PAGE_BIT=y
-CONFIG_HAVE_MLOCK=y
-CONFIG_HAVE_OPROFILE=y
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_HFS_FS is not set
-CONFIG_HFSPLUS_FS=m
-# CONFIG_HID_A4TECH is not set
-# CONFIG_HID_APPLE is not set
-# CONFIG_HID_BELKIN is not set
-# CONFIG_HID_CHERRY is not set
-# CONFIG_HID_CHICONY is not set
-# CONFIG_HID_CYPRESS is not set
-# CONFIG_HID_DRAGONRISE is not set
-# CONFIG_HID_EZKEY is not set
-# CONFIG_HID_GREENASIA is not set
-# CONFIG_HID_GYRATION is not set
-# CONFIG_HID_KENSINGTON is not set
-# CONFIG_HID_KYE is not set
-# CONFIG_HID_LOGITECH is not set
-CONFIG_HID=m
-# CONFIG_HID_MICROSOFT is not set
-# CONFIG_HID_MONTEREY is not set
-# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_PANTHERLORD is not set
-# CONFIG_HID_PETALYNX is not set
-# CONFIG_HID_PID is not set
-# CONFIG_HIDRAW is not set
-# CONFIG_HID_SAMSUNG is not set
-# CONFIG_HID_SMARTJOYPLUS is not set
-# CONFIG_HID_SONY is not set
-# CONFIG_HID_SUNPLUS is not set
-CONFIG_HID_SUPPORT=y
-# CONFIG_HID_THRUSTMASTER is not set
-# CONFIG_HID_TOPSEED is not set
-# CONFIG_HID_TWINHAN is not set
-# CONFIG_HID_ZEROPLUS is not set
-# CONFIG_HIGHMEM is not set
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_HOTPLUG=y
-# CONFIG_HPFS_FS is not set
-# CONFIG_HTC_EGPIO is not set
-# CONFIG_HTC_PASIC3 is not set
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_HW_CONSOLE=y
-# CONFIG_HWMON_DEBUG_CHIP is not set
-# CONFIG_HWMON_VID is not set
-CONFIG_HWMON=y
-# CONFIG_HW_RANDOM_TIMERIOMEM is not set
-CONFIG_HW_RANDOM=y
-CONFIG_HZ=128
-CONFIG_I2C_ALGOBIT=y
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_CHARDEV=y
-# CONFIG_I2C_COMPAT is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DESIGNWARE is not set
-CONFIG_I2C_GPIO=y
-CONFIG_I2C_HELPER_AUTO=y
-# CONFIG_I2C_OCORES is not set
-CONFIG_I2C_OMAP=y
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_PCA_PLATFORM is not set
-# CONFIG_I2C_SIMTEC is not set
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_TAOS_EVM is not set
-# CONFIG_I2C_TINY_USB is not set
-CONFIG_I2C=y
-# CONFIG_IDE is not set
-# CONFIG_IEEE802154 is not set
-# CONFIG_IIO is not set
-# CONFIG_IKCONFIG is not set
-# CONFIG_INET_AH is not set
-CONFIG_INET_DIAG=y
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_LRO is not set
-CONFIG_INET_TCP_DIAG=y
-# CONFIG_INET_TUNNEL is not set
-CONFIG_INET_XFRM_MODE_BEET=y
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
-# CONFIG_INET_XFRM_TUNNEL is not set
-CONFIG_INET=y
-# CONFIG_INFTL is not set
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INOTIFY_USER=y
-CONFIG_INOTIFY=y
-# CONFIG_INPUT_EVBUG is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT_GPIO is not set
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_JOYSTICK is not set
-CONFIG_INPUT_KEYBOARD=y
-# CONFIG_INPUT_MIMIO is not set
-# CONFIG_INPUT_MISC is not set
-# CONFIG_INPUT_MOUSEDEV is not set
-CONFIG_INPUT_MOUSE=y
-# CONFIG_INPUT_POLLDEV is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-CONFIG_INPUT=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_NOOP=y
-# CONFIG_IP_ADVANCED_ROUTER is not set
-# CONFIG_IP_DCCP is not set
-CONFIG_IP_FIB_HASH=y
-# CONFIG_IPMI_HANDLER is not set
-# CONFIG_IP_MULTICAST is not set
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_RARP=y
-CONFIG_IP_PNP=y
-# CONFIG_IP_SCTP is not set
-# CONFIG_IPV6 is not set
-# CONFIG_IPX is not set
-# CONFIG_IRDA is not set
-# CONFIG_ISCSI_TCP is not set
-# CONFIG_ISO9660_FS is not set
-# CONFIG_ISP1301_OMAP is not set
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_JBD2=m
-# CONFIG_JBD_DEBUG is not set
-CONFIG_JBD=y
-# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-CONFIG_JFFS2_FS_DEBUG=0
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_XATTR is not set
-CONFIG_JFFS2_FS=y
-# CONFIG_JFFS2_LZO is not set
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
-# CONFIG_JFFS2_SUMMARY is not set
-CONFIG_JFFS2_ZLIB=y
-# CONFIG_JFS_FS is not set
-# CONFIG_KALLSYMS is not set
-# CONFIG_KARMA_PARTITION is not set
-# CONFIG_KERNEL_LZO is not set
-# CONFIG_KEXEC is not set
-CONFIG_KEYBOARD_ATKBD=y
-# CONFIG_KEYBOARD_GPIO is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_LM8323 is not set
-# CONFIG_KEYBOARD_MATRIX is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_OPENCORES is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_TWL4030 is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-# CONFIG_KEYS is not set
-# CONFIG_KGDB is not set
-# CONFIG_KSM is not set
-# CONFIG_LAPB is not set
-# CONFIG_LATENCYTOP is not set
-# CONFIG_LBDAF is not set
-CONFIG_LCD_CLASS_DEVICE=y
-# CONFIG_LCD_ILI9320 is not set
-# CONFIG_LCD_LMS283GF05 is not set
-# CONFIG_LCD_LTV350QV is not set
-CONFIG_LCD_PLATFORM=y
-# CONFIG_LCD_TDO24M is not set
-# CONFIG_LCD_VGG2432A4 is not set
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_LEDS_BD2802 is not set
-CONFIG_LEDS_CLASS=y
-# CONFIG_LEDS_DAC124S085 is not set
-# CONFIG_LEDS_GPIO is not set
-# CONFIG_LEDS is not set
-# CONFIG_LEDS_LP3944 is not set
-# CONFIG_LEDS_PCA9532 is not set
-# CONFIG_LEDS_PCA955X is not set
-# CONFIG_LEDS_TRIGGERS is not set
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_LIB80211_CRYPT_CCMP is not set
-# CONFIG_LIB80211_CRYPT_TKIP is not set
-# CONFIG_LIB80211_CRYPT_WEP is not set
-# CONFIG_LIB80211 is not set
-CONFIG_LIBCRC32C=y
-# CONFIG_LIBFC is not set
-# CONFIG_LIBFCOE is not set
-# CONFIG_LINE6_USB is not set
-# CONFIG_LLC2 is not set
-CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_LOCKDEP_SUPPORT=y
-# CONFIG_LOCK_STAT is not set
-CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_LOGO is not set
-# CONFIG_MACH_NOKIA_RX51 is not set
-# CONFIG_MACH_OMAP_3430SDP is not set
-CONFIG_MACH_OMAP3_BEAGLE=y
-# CONFIG_MACH_OMAP3EVM is not set
-# CONFIG_MACH_OMAP3_PANDORA is not set
-# CONFIG_MACH_OMAP_LDP is not set
-# CONFIG_MACH_OMAP_ZOOM2 is not set
-# CONFIG_MACH_OVERO is not set
-# CONFIG_MAC_PARTITION is not set
-# CONFIG_MACVLAN is not set
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_MD is not set
-# CONFIG_MEDIA_ATTACH is not set
-CONFIG_MEDIA_SUPPORT=y
-# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_MC44S803=y
-CONFIG_MEDIA_TUNER_MT20XX=y
-CONFIG_MEDIA_TUNER_SIMPLE=y
-CONFIG_MEDIA_TUNER_TDA8290=y
-CONFIG_MEDIA_TUNER_TDA9887=y
-CONFIG_MEDIA_TUNER_TEA5761=y
-CONFIG_MEDIA_TUNER_TEA5767=y
-CONFIG_MEDIA_TUNER_XC2028=y
-CONFIG_MEDIA_TUNER_XC5000=y
-CONFIG_MEDIA_TUNER=y
-# CONFIG_MEMSTICK is not set
-# CONFIG_MFD_ASIC3 is not set
-# CONFIG_MFD_CORE is not set
-# CONFIG_MFD_MC13783 is not set
-# CONFIG_MFD_PCF50633 is not set
-# CONFIG_MFD_SM501 is not set
-# CONFIG_MFD_T7L66XB is not set
-# CONFIG_MFD_TC6387XB is not set
-# CONFIG_MFD_TC6393XB is not set
-# CONFIG_MFD_TMIO is not set
-# CONFIG_MFD_WM831X is not set
-# CONFIG_MFD_WM8350_I2C is not set
-# CONFIG_MFD_WM8400 is not set
-# CONFIG_MG_DISK is not set
-CONFIG_MINI_FO=y
-# CONFIG_MINIX_FS is not set
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_MISC_DEVICES is not set
-CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_MMC_AT91 is not set
-# CONFIG_MMC_ATMELMCI is not set
-CONFIG_MMC_BLOCK_BOUNCE=y
-CONFIG_MMC_BLOCK=y
-# CONFIG_MMC_DEBUG is not set
-CONFIG_MMC_OMAP_HS=y
-CONFIG_MMC_OMAP=y
-# CONFIG_MMC_SDHCI is not set
-CONFIG_MMC_SPI=y
-# CONFIG_MMC_TEST is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-CONFIG_MMC=y
-CONFIG_MMU=y
-# CONFIG_MODULE_FORCE_LOAD is not set
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_MODULE_SRCVERSION_ALL=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-# CONFIG_MOUSE_APPLETOUCH is not set
-# CONFIG_MOUSE_BCM5974 is not set
-# CONFIG_MOUSE_GPIO is not set
-# CONFIG_MOUSE_PS2_ALPS is not set
-# CONFIG_MOUSE_PS2_ELANTECH is not set
-# CONFIG_MOUSE_PS2_LOGIPS2PP is not set
-# CONFIG_MOUSE_PS2_SENTELIC is not set
-# CONFIG_MOUSE_PS2_SYNAPTICS is not set
-# CONFIG_MOUSE_PS2_TOUCHKIT is not set
-# CONFIG_MOUSE_PS2_TRACKPOINT is not set
-CONFIG_MOUSE_PS2=y
-# CONFIG_MOUSE_SERIAL is not set
-# CONFIG_MOUSE_SYNAPTICS_I2C is not set
-# CONFIG_MOUSE_VSXXXAA is not set
-CONFIG_MSDOS_FS=y
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_AFS_PARTS is not set
-# CONFIG_MTD_ALAUDA is not set
-CONFIG_MTD_AR7_PARTS=y
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK2MTD=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-# CONFIG_MTD_CFI is not set
-CONFIG_MTD_CHAR=y
-# CONFIG_MTD_CMDLINE_PARTS is not set
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-# CONFIG_MTD_CONCAT is not set
-# CONFIG_MTD_DATAFLASH is not set
-CONFIG_MTD_DEBUG_VERBOSE=2
-CONFIG_MTD_DEBUG=y
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-# CONFIG_MTD_JEDECPROBE is not set
-# CONFIG_MTD_LPDDR is not set
-# CONFIG_MTD_M25P80 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_ECC_SMC is not set
-CONFIG_MTD_NAND_GPIO=y
-CONFIG_MTD_NAND_IDS=y
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
-CONFIG_MTD_NAND_OMAP2=y
-# CONFIG_MTD_NAND_OMAP_PREFETCH_DMA is not set
-CONFIG_MTD_NAND_OMAP_PREFETCH=y
-CONFIG_MTD_NAND_PLATFORM=y
-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
-CONFIG_MTD_NAND=y
-# CONFIG_MTD_ONENAND is not set
-# CONFIG_MTD_OOPS is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_ROM is not set
-CONFIG_MTD_ROOTFS_ROOT_DEV=y
-CONFIG_MTD_ROOTFS_SPLIT=y
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_SST25L is not set
-# CONFIG_MTD_TESTS is not set
-# CONFIG_MTD_UBI is not set
-CONFIG_MTD=y
-# CONFIG_MUSB_PIO_ONLY is not set
-# CONFIG_NAMESPACES is not set
-# CONFIG_NEON is not set
-# CONFIG_NET_9P is not set
-# CONFIG_NETCONSOLE is not set
-# CONFIG_NETDEV_10000 is not set
-# CONFIG_NETDEV_1000 is not set
-CONFIG_NETDEVICES=y
-# CONFIG_NET_DSA is not set
-# CONFIG_NET_ETHERNET is not set
-# CONFIG_NETFILTER is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_NET_KEY=y
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_SCHED is not set
-# CONFIG_NETWORK_FILESYSTEMS is not set
-# CONFIG_NETWORK_SECMARK is not set
-CONFIG_NET=y
-CONFIG_NEW_LEDS=y
-# CONFIG_NFTL is not set
-# CONFIG_NILFS2_FS is not set
-CONFIG_NLATTR=y
-# CONFIG_NLS_ASCII is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-CONFIG_NLS_CODEPAGE_437=y
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-# CONFIG_NLS_CODEPAGE_850 is not set
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-CONFIG_NLS_DEFAULT="iso8859-1"
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-# CONFIG_NLS_ISO8859_15 is not set
-CONFIG_NLS_ISO8859_1=y
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-CONFIG_NLS_UTF8=m
-CONFIG_NLS=y
-CONFIG_NO_HZ=y
-# CONFIG_NOP_USB_XCEIV is not set
-# CONFIG_NTFS_FS is not set
-# CONFIG_OABI_COMPAT is not set
-# CONFIG_OCF_OCF is not set
-# CONFIG_OCFS2_FS is not set
-CONFIG_OMAP2_DSS_DEBUG_SUPPORT=y
-CONFIG_OMAP2_DSS_DSI=y
-CONFIG_OMAP2_DSS_FAKE_VSYNC=y
-CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0
-CONFIG_OMAP2_DSS_RFBI=y
-# CONFIG_OMAP2_DSS_SDI is not set
-# CONFIG_OMAP2_DSS_USE_DSI_PLL is not set
-CONFIG_OMAP2_DSS_VENC=y
-CONFIG_OMAP2_DSS=y
-CONFIG_OMAP2_VRAM_SIZE=12
-CONFIG_OMAP2_VRAM=y
-CONFIG_OMAP2_VRFB=y
-CONFIG_OMAP_32K_TIMER_HZ=128
-CONFIG_OMAP_32K_TIMER=y
-# CONFIG_OMAP_DEBUG_CLOCKDOMAIN is not set
-# CONFIG_OMAP_DEBUG_POWERDOMAIN is not set
-CONFIG_OMAP_DM_TIMER=y
-# CONFIG_OMAP_LL_DEBUG_UART1 is not set
-# CONFIG_OMAP_LL_DEBUG_UART2 is not set
-CONFIG_OMAP_LL_DEBUG_UART3=y
-# CONFIG_OMAP_MBOX_FWK is not set
-CONFIG_OMAP_MCBSP=y
-# CONFIG_OMAP_MPU_TIMER is not set
-# CONFIG_OMAP_MUX is not set
-# CONFIG_OMAP_PM_NONE is not set
-CONFIG_OMAP_PM_NOOP=y
-# CONFIG_OMAP_RESET_CLOCKS is not set
-CONFIG_OMAP_WATCHDOG=y
-# CONFIG_OMFS_FS is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_PACKET_MMAP is not set
-CONFIG_PACKET=y
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PAGE_OFFSET=0xC0000000
-# CONFIG_PAGE_POISONING is not set
-CONFIG_PANEL_GENERIC=y
-CONFIG_PANEL_SAMSUNG_LTE430WQ_F0C=y
-CONFIG_PANEL_SHARP_LS037V7DW01=y
-CONFIG_PANEL_TAAL=y
-# CONFIG_PARPORT is not set
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_PCCARD is not set
-# CONFIG_PCI_SYSCALL is not set
-# CONFIG_PDA_POWER is not set
-# CONFIG_PHONE is not set
-# CONFIG_PHONET is not set
-# CONFIG_PHYS_ADDR_T_64BIT is not set
-# CONFIG_PLAN9AUTH is not set
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PMIC_DA903X is not set
-CONFIG_PM_RUNTIME=y
-CONFIG_PM_SLEEP=y
-CONFIG_PM=y
-# CONFIG_POHMELFS is not set
-# CONFIG_POSIX_MQUEUE is not set
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-CONFIG_POWER_SUPPLY=y
-# CONFIG_PPP is not set
-# CONFIG_PPS is not set
-# CONFIG_PREEMPT is not set
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_PRINTK_TIME is not set
-CONFIG_PRINTK=y
-CONFIG_PROC_FS=y
-CONFIG_PROC_PAGE_MONITOR=y
-CONFIG_PROC_SYSCTL=y
-# CONFIG_PROFILING is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QUOTA is not set
-# CONFIG_R3964 is not set
-# CONFIG_RADIO_ADAPTERS is not set
-# CONFIG_RAID_ATTRS is not set
-# CONFIG_RAR_REGISTER is not set
-# CONFIG_RAW_DRIVER is not set
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-CONFIG_RCU_FANOUT=32
-# CONFIG_RCU_FANOUT_EXACT is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-# CONFIG_RCU_TRACE is not set
-# CONFIG_RD_BZIP2 is not set
-# CONFIG_RD_GZIP is not set
-CONFIG_RD_LZMA=y
-# CONFIG_RD_LZO is not set
-# CONFIG_RDS is not set
-# CONFIG_REGULATOR_BQ24022 is not set
-# CONFIG_REGULATOR_DEBUG is not set
-# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
-# CONFIG_REGULATOR_LP3971 is not set
-# CONFIG_REGULATOR_MAX1586 is not set
-# CONFIG_REGULATOR_TPS65023 is not set
-# CONFIG_REGULATOR_TPS6507X is not set
-CONFIG_REGULATOR_TWL4030=y
-# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
-# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
-CONFIG_REGULATOR=y
-# CONFIG_REISERFS_FS is not set
-# CONFIG_RELAY is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_RFKILL is not set
-# CONFIG_ROMFS_FS is not set
-CONFIG_RTC_CLASS=y
-# CONFIG_RTC_DEBUG is not set
-# CONFIG_RTC_DRV_BQ4802 is not set
-# CONFIG_RTC_DRV_CMOS is not set
-# CONFIG_RTC_DRV_DS1286 is not set
-# CONFIG_RTC_DRV_DS1305 is not set
-# CONFIG_RTC_DRV_DS1307 is not set
-# CONFIG_RTC_DRV_DS1374 is not set
-# CONFIG_RTC_DRV_DS1390 is not set
-# CONFIG_RTC_DRV_DS1511 is not set
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_DS1742 is not set
-# CONFIG_RTC_DRV_DS3234 is not set
-# CONFIG_RTC_DRV_FM3130 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
-# CONFIG_RTC_DRV_M41T80 is not set
-# CONFIG_RTC_DRV_M41T94 is not set
-# CONFIG_RTC_DRV_M48T35 is not set
-# CONFIG_RTC_DRV_M48T59 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_MAX6900 is not set
-# CONFIG_RTC_DRV_MAX6902 is not set
-# CONFIG_RTC_DRV_PCF2123 is not set
-# CONFIG_RTC_DRV_PCF8563 is not set
-# CONFIG_RTC_DRV_PCF8583 is not set
-# CONFIG_RTC_DRV_R9701 is not set
-# CONFIG_RTC_DRV_RS5C348 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set
-# CONFIG_RTC_DRV_RTC7301 is not set
-# CONFIG_RTC_DRV_RX8025 is not set
-# CONFIG_RTC_DRV_RX8581 is not set
-# CONFIG_RTC_DRV_S35390A is not set
-# CONFIG_RTC_DRV_STK17TA8 is not set
-# CONFIG_RTC_DRV_TEST is not set
-CONFIG_RTC_DRV_TWL4030=y
-# CONFIG_RTC_DRV_V3020 is not set
-# CONFIG_RTC_DRV_X1205 is not set
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_HCTOSYS=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_LIB=y
-# CONFIG_RT_GROUP_SCHED is not set
-CONFIG_RT_MUTEXES=y
-# CONFIG_RT_MUTEX_TESTER is not set
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_SAMPLES is not set
-CONFIG_SCHED_DEBUG=y
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_DH is not set
-CONFIG_SCSI_DMA=y
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_LOGGING is not set
-CONFIG_SCSI_LOWLEVEL=y
-# CONFIG_SCSI_MULTI_LUN is not set
-# CONFIG_SCSI_NETLINK is not set
-# CONFIG_SCSI_OSD_INITIATOR is not set
-CONFIG_SCSI_PROC_FS=y
-# CONFIG_SCSI_SAS_LIBSAS is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-# CONFIG_SCSI_SPI_ATTRS is not set
-# CONFIG_SCSI_SRP_ATTRS is not set
-# CONFIG_SCSI_TGT is not set
-CONFIG_SCSI_WAIT_SCAN=m
-CONFIG_SCSI=y
-# CONFIG_SDIO_UART is not set
-# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-# CONFIG_SECURITYFS is not set
-# CONFIG_SECURITY is not set
-CONFIG_SELECT_MEMORY_MODEL=y
-# CONFIG_SENSORS_AD7414 is not set
-# CONFIG_SENSORS_AD7418 is not set
-# CONFIG_SENSORS_ADCXX is not set
-# CONFIG_SENSORS_ADM1021 is not set
-# CONFIG_SENSORS_ADM1025 is not set
-# CONFIG_SENSORS_ADM1026 is not set
-# CONFIG_SENSORS_ADM1029 is not set
-# CONFIG_SENSORS_ADM1031 is not set
-# CONFIG_SENSORS_ADM9240 is not set
-# CONFIG_SENSORS_ADS7828 is not set
-# CONFIG_SENSORS_ADT7462 is not set
-# CONFIG_SENSORS_ADT7470 is not set
-# CONFIG_SENSORS_ADT7473 is not set
-# CONFIG_SENSORS_ADT7475 is not set
-# CONFIG_SENSORS_ATXP1 is not set
-# CONFIG_SENSORS_DME1737 is not set
-# CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_F71882FG is not set
-# CONFIG_SENSORS_F75375S is not set
-# CONFIG_SENSORS_G760A is not set
-# CONFIG_SENSORS_GL518SM is not set
-# CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_LIS3_SPI is not set
-# CONFIG_SENSORS_LM63 is not set
-# CONFIG_SENSORS_LM70 is not set
-# CONFIG_SENSORS_LM75 is not set
-# CONFIG_SENSORS_LM77 is not set
-# CONFIG_SENSORS_LM78 is not set
-# CONFIG_SENSORS_LM80 is not set
-# CONFIG_SENSORS_LM83 is not set
-# CONFIG_SENSORS_LM85 is not set
-# 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_LM95241 is not set
-# CONFIG_SENSORS_LTC4215 is not set
-# CONFIG_SENSORS_LTC4245 is not set
-# CONFIG_SENSORS_MAX1111 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_PCF8591 is not set
-# CONFIG_SENSORS_SHT15 is not set
-# CONFIG_SENSORS_SMSC47B397 is not set
-# CONFIG_SENSORS_SMSC47M192 is not set
-# CONFIG_SENSORS_SMSC47M1 is not set
-# CONFIG_SENSORS_THMC50 is not set
-# CONFIG_SENSORS_TMP401 is not set
-# CONFIG_SENSORS_TMP421 is not set
-# CONFIG_SENSORS_TSL2550 is not set
-# CONFIG_SENSORS_VT1211 is not set
-# CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83781D is not set
-# CONFIG_SENSORS_W83791D is not set
-# CONFIG_SENSORS_W83792D is not set
-# CONFIG_SENSORS_W83793 is not set
-# CONFIG_SENSORS_W83L785TS is not set
-# CONFIG_SENSORS_W83L786NG is not set
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_DETECT_IRQ=y
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_MANY_PORTS=y
-CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_RSA=y
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_CORE=y
-# CONFIG_SERIAL_MAX3100 is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-CONFIG_SERIO_LIBPS2=y
-# CONFIG_SERIO_RAW is not set
-CONFIG_SERIO_SERPORT=y
-CONFIG_SERIO=y
-# CONFIG_SGI_PARTITION is not set
-CONFIG_SHMEM=y
-CONFIG_SIGNALFD=y
-CONFIG_SLABINFO=y
-CONFIG_SLAB=y
-# CONFIG_SLIP is not set
-# CONFIG_SLOB is not set
-# CONFIG_SLOW_WORK is not set
-# CONFIG_SLUB is not set
-# CONFIG_SND_ARM is not set
-# CONFIG_SND_DEBUG is not set
-# CONFIG_SND_DRIVERS is not set
-# CONFIG_SND_DYNAMIC_MINORS is not set
-# CONFIG_SND_EMU10K1_SEQ is not set
-# CONFIG_SND_HRTIMER is not set
-# CONFIG_SND_HWDEP is not set
-CONFIG_SND_JACK=y
-# CONFIG_SND_MIXER_OSS is not set
-CONFIG_SND_OMAP_SOC_MCBSP=y
-CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=y
-CONFIG_SND_OMAP_SOC=y
-# CONFIG_SND_OPL3_LIB_SEQ is not set
-# CONFIG_SND_OPL4_LIB_SEQ is not set
-CONFIG_SND_OSSEMUL=y
-# CONFIG_SND_PCM_OSS is not set
-CONFIG_SND_PCM=y
-# CONFIG_SND_RAWMIDI_SEQ is not set
-# CONFIG_SND_SBAWE_SEQ is not set
-# CONFIG_SND_SEQ_DUMMY is not set
-CONFIG_SND_SEQUENCER_OSS=y
-CONFIG_SND_SEQUENCER=y
-CONFIG_SND_SOC_AD1836=y
-CONFIG_SND_SOC_AD1938=y
-CONFIG_SND_SOC_AD73311=y
-CONFIG_SND_SOC_AK4104=y
-CONFIG_SND_SOC_AK4535=y
-CONFIG_SND_SOC_AK4642=y
-CONFIG_SND_SOC_ALL_CODECS=y
-CONFIG_SND_SOC_CS4270=y
-CONFIG_SND_SOC_I2C_AND_SPI=y
-CONFIG_SND_SOC_L3=y
-CONFIG_SND_SOC_MAX9877=y
-CONFIG_SND_SOC_PCM3008=y
-CONFIG_SND_SOC_SPDIF=y
-CONFIG_SND_SOC_SSM2602=y
-CONFIG_SND_SOC_TLV320AIC23=y
-CONFIG_SND_SOC_TLV320AIC26=y
-CONFIG_SND_SOC_TLV320AIC3X=y
-CONFIG_SND_SOC_TWL4030=y
-CONFIG_SND_SOC_UDA134X=y
-CONFIG_SND_SOC_UDA1380=y
-CONFIG_SND_SOC_WM8510=y
-CONFIG_SND_SOC_WM8523=y
-CONFIG_SND_SOC_WM8580=y
-CONFIG_SND_SOC_WM8728=y
-CONFIG_SND_SOC_WM8731=y
-CONFIG_SND_SOC_WM8750=y
-CONFIG_SND_SOC_WM8753=y
-CONFIG_SND_SOC_WM8776=y
-CONFIG_SND_SOC_WM8900=y
-CONFIG_SND_SOC_WM8903=y
-CONFIG_SND_SOC_WM8940=y
-CONFIG_SND_SOC_WM8960=y
-CONFIG_SND_SOC_WM8961=y
-CONFIG_SND_SOC_WM8971=y
-CONFIG_SND_SOC_WM8974=y
-CONFIG_SND_SOC_WM8988=y
-CONFIG_SND_SOC_WM8990=y
-CONFIG_SND_SOC_WM8993=y
-CONFIG_SND_SOC_WM9081=y
-CONFIG_SND_SOC_WM_HUBS=y
-CONFIG_SND_SOC=y
-# CONFIG_SND_SPI is not set
-# CONFIG_SND_SUPPORT_OLD_API is not set
-CONFIG_SND_TIMER=y
-# CONFIG_SND_USB_AUDIO is not set
-# CONFIG_SND_USB_CAIAQ is not set
-CONFIG_SND_USB=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-CONFIG_SND_VERBOSE_PROCFS=y
-CONFIG_SND=y
-# CONFIG_SOC_CAMERA is not set
-# CONFIG_SOFT_WATCHDOG is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUND_OSS_CORE=y
-# CONFIG_SOUND_PRIME is not set
-CONFIG_SOUND=y
-# CONFIG_SPARSEMEM_MANUAL is not set
-# CONFIG_SPI_BITBANG is not set
-# CONFIG_SPI_DEBUG is not set
-# CONFIG_SPI_GPIO is not set
-# CONFIG_SPI_GPIO_OLD is not set
-CONFIG_SPI_MASTER=y
-CONFIG_SPI_OMAP24XX=y
-CONFIG_SPI_SPIDEV=y
-# CONFIG_SPI_TLE62X0 is not set
-CONFIG_SPI=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-CONFIG_SQUASHFS_LZMA=y
-CONFIG_SQUASHFS=y
-# CONFIG_SSB is not set
-CONFIG_SSB_POSSIBLE=y
-# CONFIG_SSFDC is not set
-CONFIG_STACKTRACE_SUPPORT=y
-# CONFIG_STAGING_EXCLUDE_BUILD is not set
-CONFIG_STAGING=y
-CONFIG_STANDALONE=y
-CONFIG_STRIP_ASM_SYMS=y
-# CONFIG_SUN_PARTITION is not set
-CONFIG_SUSPEND_FREEZER=y
-CONFIG_SUSPEND=y
-CONFIG_SWAP=y
-# CONFIG_SYN_COOKIES is not set
-# CONFIG_SYSCTL_SYSCALL is not set
-CONFIG_SYSCTL=y
-CONFIG_SYSFS_DEPRECATED_V2=y
-CONFIG_SYSFS_DEPRECATED=y
-CONFIG_SYSFS=y
-# CONFIG_SYS_HYPERVISOR is not set
-CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-# CONFIG_SYSV68_PARTITION is not set
-# CONFIG_SYSV_FS is not set
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_SYSVIPC=y
-# CONFIG_TASKSTATS is not set
-# CONFIG_TCG_TPM is not set
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-# CONFIG_TCP_MD5SIG is not set
-# CONFIG_TEXTSEARCH_BM is not set
-# CONFIG_TEXTSEARCH_FSM is not set
-# CONFIG_TEXTSEARCH_KMP is not set
-CONFIG_TEXTSEARCH=y
-CONFIG_THERMAL_HWMON=y
-CONFIG_THERMAL=y
-# CONFIG_THUMB2_KERNEL is not set
-CONFIG_TICK_ONESHOT=y
-CONFIG_TIMERFD=y
-# CONFIG_TIMER_STATS is not set
-# CONFIG_TIPC is not set
-# CONFIG_TMPFS_POSIX_ACL is not set
-CONFIG_TMPFS=y
-# CONFIG_TPS65010 is not set
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_TRACING_SUPPORT=y
-# CONFIG_TRANZPORT is not set
-# CONFIG_TREE_PREEMPT_RCU is not set
-# CONFIG_TREE_RCU_TRACE is not set
-CONFIG_TREE_RCU=y
-# CONFIG_TUN is not set
-CONFIG_TWL4030_CORE=y
-# CONFIG_TWL4030_POWER is not set
-CONFIG_TWL4030_USB=y
-CONFIG_TWL4030_WATCHDOG=y
-# CONFIG_UACCESS_WITH_MEMCPY is not set
-# CONFIG_UDF_FS is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_UFS_FS is not set
-CONFIG_UID16=y
-# CONFIG_UIO is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_UNION_MOUNT is not set
-CONFIG_UNIX98_PTYS=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_UNIX=y
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_USB_ACM is not set
-# CONFIG_USB_ADUTUX is not set
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-# CONFIG_USB_APPLEDISPLAY is not set
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-# CONFIG_USB_AUDIO is not set
-# CONFIG_USB_BERRY_CHARGE is not set
-# CONFIG_USB_C67X00_HCD is not set
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_CDC_COMPOSITE is not set
-# CONFIG_USB_CYPRESS_CY7C63 is not set
-# CONFIG_USB_CYTHERM is not set
-CONFIG_USB_DEBUG=y
-CONFIG_USB_DEVICE_CLASS=y
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DYNAMIC_MINORS is not set
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-# CONFIG_USB_EMI26 is not set
-# CONFIG_USB_EMI62 is not set
-# CONFIG_USB_ET61X251 is not set
-# CONFIG_USB_ETH is not set
-CONFIG_USB_EZUSB=y
-# CONFIG_USB_FILE_STORAGE is not set
-# CONFIG_USB_FTDI_ELAN is not set
-# CONFIG_USB_GADGET_AMD5536UDC is not set
-# CONFIG_USB_GADGET_AT91 is not set
-# CONFIG_USB_GADGET_ATMEL_USBA is not set
-# CONFIG_USB_GADGET_CI13XXX is not set
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_DEBUG_FS is not set
-CONFIG_USB_GADGET_DEBUG=y
-CONFIG_USB_GADGET_DUALSPEED=y
-# CONFIG_USB_GADGET_DUMMY_HCD is not set
-# CONFIG_USB_GADGETFS is not set
-# CONFIG_USB_GADGET_FSL_QE is not set
-# CONFIG_USB_GADGET_FSL_USB2 is not set
-# CONFIG_USB_GADGET_GOKU is not set
-# CONFIG_USB_GADGET_IMX is not set
-# CONFIG_USB_GADGET_LANGWELL is not set
-# CONFIG_USB_GADGET_LH7A40X is not set
-# CONFIG_USB_GADGET_M66592 is not set
-CONFIG_USB_GADGET_MUSB_HDRC=y
-# CONFIG_USB_GADGET_NET2280 is not set
-# CONFIG_USB_GADGET_OMAP is not set
-# CONFIG_USB_GADGET_PXA25X is not set
-# CONFIG_USB_GADGET_PXA27X is not set
-# CONFIG_USB_GADGET_R8A66597 is not set
-# CONFIG_USB_GADGET_S3C2410 is not set
-# CONFIG_USB_GADGET_S3C_HSOTG is not set
-CONFIG_USB_GADGET_SELECTED=y
-CONFIG_USB_GADGET_VBUS_DRAW=500
-CONFIG_USB_GADGET=y
-# CONFIG_USB_GL860 is not set
-# CONFIG_USB_GPIO_VBUS is not set
-# CONFIG_USB_G_PRINTER is not set
-CONFIG_USB_G_SERIAL=y
-# CONFIG_USB_GSPCA_CONEX is not set
-# CONFIG_USB_GSPCA_ETOMS is not set
-# CONFIG_USB_GSPCA_FINEPIX is not set
-# CONFIG_USB_GSPCA_JEILINJ is not set
-CONFIG_USB_GSPCA=m
-# CONFIG_USB_GSPCA_MARS is not set
-# CONFIG_USB_GSPCA_MR97310A is not set
-# CONFIG_USB_GSPCA_OV519 is not set
-# CONFIG_USB_GSPCA_OV534 is not set
-# CONFIG_USB_GSPCA_PAC207 is not set
-# CONFIG_USB_GSPCA_PAC7311 is not set
-# CONFIG_USB_GSPCA_SN9C20X is not set
-# CONFIG_USB_GSPCA_SONIXB is not set
-# CONFIG_USB_GSPCA_SONIXJ is not set
-# CONFIG_USB_GSPCA_SPCA500 is not set
-# CONFIG_USB_GSPCA_SPCA501 is not set
-# CONFIG_USB_GSPCA_SPCA505 is not set
-# CONFIG_USB_GSPCA_SPCA506 is not set
-# CONFIG_USB_GSPCA_SPCA508 is not set
-# CONFIG_USB_GSPCA_SPCA561 is not set
-# CONFIG_USB_GSPCA_SQ905C is not set
-# CONFIG_USB_GSPCA_SQ905 is not set
-# CONFIG_USB_GSPCA_STK014 is not set
-# CONFIG_USB_GSPCA_SUNPLUS is not set
-# CONFIG_USB_GSPCA_T613 is not set
-# CONFIG_USB_GSPCA_TV8532 is not set
-# CONFIG_USB_GSPCA_VC032X is not set
-# CONFIG_USB_GSPCA_ZC3XX is not set
-# CONFIG_USB_HIDDEV is not set
-CONFIG_USB_HID=m
-# CONFIG_USB_HWA_HCD is not set
-# CONFIG_USB_IDMOUSE is not set
-CONFIG_USB_INVENTRA_DMA=y
-# CONFIG_USB_IOWARRIOR is not set
-# CONFIG_USB_IP_COMMON is not set
-# CONFIG_USB_ISIGHTFW is not set
-# CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_ISP1362_HCD is not set
-# CONFIG_USB_ISP1760_HCD is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_LCD is not set
-# CONFIG_USB_LD is not set
-# CONFIG_USB_LED is not set
-# CONFIG_USB_LEGOTOWER is not set
-# CONFIG_USB_LIBUSUAL is not set
-# CONFIG_USB_M5602 is not set
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_MICROTEK is not set
-# CONFIG_USB_MIDI_GADGET is not set
-# CONFIG_USB_MON is not set
-# CONFIG_USB_MOUSE is not set
-# CONFIG_USB_MUSB_DEBUG is not set
-CONFIG_USB_MUSB_HDRC=y
-# CONFIG_USB_MUSB_HOST is not set
-# CONFIG_USB_MUSB_OTG is not set
-CONFIG_USB_MUSB_PERIPHERAL=y
-CONFIG_USB_MUSB_SOC=y
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-# CONFIG_USB_OTG is not set
-CONFIG_USB_OTG_UTILS=y
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OXU210HP_HCD is not set
-# CONFIG_USBPCWATCHDOG is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_PWC_INPUT_EVDEV is not set
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_RIO500 is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_S2255 is not set
-# CONFIG_USB_SERIAL_AIRCABLE is not set
-# CONFIG_USB_SERIAL_ARK3116 is not set
-# CONFIG_USB_SERIAL_BELKIN is not set
-# CONFIG_USB_SERIAL_CH341 is not set
-# CONFIG_USB_SERIAL_CONSOLE is not set
-# CONFIG_USB_SERIAL_CP210X is not set
-# CONFIG_USB_SERIAL_CYBERJACK is not set
-# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
-# CONFIG_USB_SERIAL_DEBUG is not set
-# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
-# CONFIG_USB_SERIAL_EDGEPORT is not set
-# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
-# CONFIG_USB_SERIAL_EMPEG is not set
-CONFIG_USB_SERIAL_FTDI_SIO=y
-# CONFIG_USB_SERIAL_FUNSOFT is not set
-# CONFIG_USB_SERIAL_GARMIN is not set
-CONFIG_USB_SERIAL_GENERIC=y
-# CONFIG_USB_SERIAL_HP4X is not set
-# CONFIG_USB_SERIAL_IPAQ is not set
-# CONFIG_USB_SERIAL_IPW is not set
-# CONFIG_USB_SERIAL_IR is not set
-# CONFIG_USB_SERIAL_IUU is not set
-# CONFIG_USB_SERIAL_KEYSPAN is not set
-# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
-# CONFIG_USB_SERIAL_KLSI is not set
-# CONFIG_USB_SERIAL_KOBIL_SCT is not set
-# CONFIG_USB_SERIAL_MCT_U232 is not set
-# CONFIG_USB_SERIAL_MOS7720 is not set
-# CONFIG_USB_SERIAL_MOS7840 is not set
-# CONFIG_USB_SERIAL_MOTOROLA is not set
-# CONFIG_USB_SERIAL_NAVMAN is not set
-# CONFIG_USB_SERIAL_OMNINET is not set
-# CONFIG_USB_SERIAL_OPTICON is not set
-# CONFIG_USB_SERIAL_OPTION is not set
-# CONFIG_USB_SERIAL_OTI6858 is not set
-CONFIG_USB_SERIAL_PL2303=y
-# CONFIG_USB_SERIAL_QUALCOMM is not set
-# CONFIG_USB_SERIAL_QUATECH2 is not set
-# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
-# CONFIG_USB_SERIAL_SAFE is not set
-# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
-# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
-# CONFIG_USB_SERIAL_SPCP8X5 is not set
-# CONFIG_USB_SERIAL_SYMBOL is not set
-# CONFIG_USB_SERIAL_TI is not set
-# CONFIG_USB_SERIAL_VISOR is not set
-# CONFIG_USB_SERIAL_WHITEHEAT is not set
-# CONFIG_USB_SERIAL_XIRCOM is not set
-CONFIG_USB_SERIAL=y
-# CONFIG_USB_SEVSEG is not set
-# CONFIG_USB_SISUSBVGA is not set
-# CONFIG_USB_SL811_HCD is not set
-# CONFIG_USB_SN9C102 is not set
-# CONFIG_USB_STKWEBCAM is not set
-CONFIG_USB_STORAGE_ALAUDA=y
-# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
-CONFIG_USB_STORAGE_DATAFAB=y
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_FREECOM=y
-# CONFIG_USB_STORAGE_ISD200 is not set
-CONFIG_USB_STORAGE_JUMPSHOT=y
-CONFIG_USB_STORAGE_KARMA=y
-# CONFIG_USB_STORAGE_ONETOUCH is not set
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_USBAT=y
-CONFIG_USB_STORAGE=y
-# CONFIG_USB_STV06XX is not set
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_SUSPEND=y
-# CONFIG_USB_TEST is not set
-# CONFIG_USB_TI_CPPI_DMA is not set
-# CONFIG_USB_TMC is not set
-# CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_USBNET is not set
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_VIDEO_CLASS=m
-# CONFIG_USB_VST is not set
-# CONFIG_USB_WDM is not set
-# CONFIG_USB_WUSB_CBAF is not set
-# CONFIG_USB_WUSB is not set
-CONFIG_USB=y
-# CONFIG_USB_ZC0301 is not set
-# CONFIG_USB_ZERO is not set
-# CONFIG_USB_ZR364XX is not set
-CONFIG_USER_SCHED=y
-CONFIG_V4L_USB_DRIVERS=y
-CONFIG_VECTORS_BASE=0xffff0000
-# CONFIG_VETH is not set
-CONFIG_VFAT_FS=y
-CONFIG_VFPv3=y
-CONFIG_VFP=y
-# CONFIG_VGA_CONSOLE is not set
-# CONFIG_VGASTATE is not set
-# CONFIG_VIDEO_ADV7170 is not set
-# CONFIG_VIDEO_ADV7175 is not set
-# CONFIG_VIDEO_ADV7180 is not set
-# CONFIG_VIDEO_ADV7343 is not set
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_ALLOW_V4L1 is not set
-# CONFIG_VIDEO_BT819 is not set
-# CONFIG_VIDEO_BT856 is not set
-# CONFIG_VIDEO_BT866 is not set
-CONFIG_VIDEO_CAPTURE_DRIVERS=y
-# CONFIG_VIDEO_CS5345 is not set
-# CONFIG_VIDEO_CS53L32A is not set
-# CONFIG_VIDEO_CX231XX is not set
-# CONFIG_VIDEO_CX2341X is not set
-# CONFIG_VIDEO_CX25840 is not set
-CONFIG_VIDEO_DEV=y
-# CONFIG_VIDEO_EM28XX is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIDEO_HDPVR is not set
-# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-# CONFIG_VIDEO_KS0127 is not set
-# CONFIG_VIDEO_M52790 is not set
-CONFIG_VIDEO_MEDIA=y
-# CONFIG_VIDEO_MSP3400 is not set
-# CONFIG_VIDEO_MT9V011 is not set
-# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-# CONFIG_VIDEO_OV7670 is not set
-# CONFIG_VIDEO_PVRUSB2 is not set
-# CONFIG_VIDEO_SAA5246A is not set
-# CONFIG_VIDEO_SAA5249 is not set
-# CONFIG_VIDEO_SAA6588 is not set
-# CONFIG_VIDEO_SAA7110 is not set
-# CONFIG_VIDEO_SAA711X is not set
-# CONFIG_VIDEO_SAA7127 is not set
-# CONFIG_VIDEO_SAA717X is not set
-# CONFIG_VIDEO_SAA7185 is not set
-# CONFIG_VIDEO_TCM825X is not set
-# CONFIG_VIDEO_TDA7432 is not set
-# CONFIG_VIDEO_TDA9840 is not set
-# CONFIG_VIDEO_TDA9875 is not set
-# CONFIG_VIDEO_TEA6415C is not set
-# CONFIG_VIDEO_TEA6420 is not set
-# CONFIG_VIDEO_THS7303 is not set
-# CONFIG_VIDEO_TLV320AIC23B is not set
-# CONFIG_VIDEO_TVAUDIO is not set
-# CONFIG_VIDEO_TVP514X is not set
-# CONFIG_VIDEO_TVP5150 is not set
-# CONFIG_VIDEO_UPD64031A is not set
-# CONFIG_VIDEO_UPD64083 is not set
-# CONFIG_VIDEO_USBVISION is not set
-CONFIG_VIDEO_V4L1_COMPAT=y
-CONFIG_VIDEO_V4L2_COMMON=y
-CONFIG_VIDEO_V4L2=y
-# CONFIG_VIDEO_VIVI is not set
-# CONFIG_VIDEO_VP27SMPX is not set
-# CONFIG_VIDEO_VPX3220 is not set
-# CONFIG_VIDEO_WM8739 is not set
-# CONFIG_VIDEO_WM8775 is not set
-CONFIG_VIRT_TO_BUS=y
-# CONFIG_VLAN_8021Q is not set
-CONFIG_VM_EVENT_COUNTERS=y
-# CONFIG_VMSPLIT_1G is not set
-# CONFIG_VMSPLIT_2G is not set
-CONFIG_VMSPLIT_3G=y
-CONFIG_VT_CONSOLE=y
-# CONFIG_VT_HW_CONSOLE_BINDING is not set
-CONFIG_VT=y
-# CONFIG_VXFS_FS is not set
-# CONFIG_W1 is not set
-# CONFIG_WAN is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-CONFIG_WATCHDOG=y
-# CONFIG_WIMAX is not set
-# CONFIG_WIRELESS_EXT is not set
-CONFIG_WIRELESS_OLD_REGULATORY=y
-CONFIG_WIRELESS=y
-# CONFIG_WLAN_80211 is not set
-# CONFIG_WLAN_PRE80211 is not set
-CONFIG_WLAN=y
-# CONFIG_X25 is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_USER is not set
-CONFIG_XFRM=y
-# CONFIG_XFS_DEBUG is not set
-CONFIG_XFS_FS=m
-# CONFIG_XFS_POSIX_ACL is not set
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_RT is not set
-# CONFIG_XIP_KERNEL is not set
-# CONFIG_YAFFS_FS is not set
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZONE_DMA_FLAG=0
-# Console display driver support
-# CPU Power Management
-# Crypto core or helper
-# Device Drivers
-# Digest
-# Disk-On-Chip Device Drivers
-# Display device support
-# Display hardware drivers
-# DOS/FAT/NT Filesystems
-# Enable WiMAX (Networking options) to see the WiMAX drivers
-# Encoders/decoders and other helper chips
-# External I2C/SMBus adapter drivers
-# File systems
-# Floating point emulation
-# Frame buffer hardware drivers
-# GCOV-based kernel profiling
-# General setup
-# Generic Driver Options
-# Graphics support
-# Hardware I/O ports
-# Hash modes
-# I2C GPIO expanders:
-# I2C Hardware Bus support
-# I2C RTC drivers
-# I2C system bus drivers (mostly embedded / system-on-chip)
-# Input Device Drivers
-# Input device support
-# IO Schedulers
-# Kernel Features
-# Kernel hacking
-# Kernel Performance Events And Counters
-# LED drivers
-# LED Triggers
-# Library routines
-# Linux kernel version: 2.6.32-rc5
-# LPDDR flash memory drivers
-# Mapping drivers for chip access
-# Memory mapped GPIO expanders:
-# Miscellaneous I2C Chip support
-# Miscellaneous USB options
-# MMC/SD/SDIO Card Drivers
-# MMC/SD/SDIO Host Controller Drivers
-# MPEG video encoders
-# Multifunction device drivers
-# Multimedia core support
-# Multimedia drivers
-# Native drivers
-# Networking options
-# Network testing
-# Non-8250 serial port support
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-# OCF Configuration
-# OMAP2/3 Display Device Drivers
-# OMAP 343x high speed USB support
-# OMAP Board Type
-# OMAP Feature Selections
-# on-CPU RTC drivers
-# OTG and related infrastructure
-# Other I2C/SMBus bus drivers
-# Partition Types
-# PCI GPIO expanders:
-# Platform RTC drivers
-# Power management options
-# PPS support
-# Processor Features
-# Processor Type
-# Pseudo filesystems
-# Qualcomm MSM Camera And Video
-# RAM/ROM/Flash chip drivers
-# Random Number Generation
-# RAR Register Driver
-# RCU Subsystem
-# RDS decoders
-# RTC interfaces
-# SCSI device support
-# SCSI support type (disk, tape, CD-ROM)
-# SCSI Transports
-# Security options
-# Self-contained MTD device drivers
-# Serial drivers
-# Sonics Silicon Backplane
-# Special HID drivers
-# SPI GPIO expanders:
-# SPI Master Controller Drivers
-# SPI Protocol Masters
-# SPI RTC drivers
-# System Type
-# Thu Dec 10 00:13:17 2009
-# TI OMAP Implementations
-# TI VLYNQ
-# UBI - Unsorted block images
-# USB-based Watchdog Cards
-# USB Device Class drivers
-# USB HID Boot Protocol drivers
-# USB Host Controller Drivers
-# USB Imaging devices
-# USB Input Devices
-# USB Miscellaneous drivers
-# USB Network Adapters
-# USB port drivers
-# Userland interfaces
-# User Modules And Translation Layers
-# Userspace binary formats
-# Video and audio decoders
-# Video decoders
-# Video encoders
-# Video improvement chips
-# Watchdog Device Drivers
diff --git a/target/linux/omap35xx/files/boot-mmc.cmd b/target/linux/omap35xx/files/boot-mmc.cmd
deleted file mode 100644
index 5e3b34845..000000000
--- a/target/linux/omap35xx/files/boot-mmc.cmd
+++ /dev/null
@@ -1,10 +0,0 @@
-echo -----------------------------
-echo u-boot.cmd
-echo  Kernel: MMC0P1:uImage
-echo  RootFS: MMC0P2
-echo  VideoMode: 640x480@60
-echo  VideoSpec: omapfb:vram:2M,vram:4M
-echo -----------------------------
-setenv bootargs 'console=ttyS2,115200n8 console=tty0 root=/dev/mmcblk0p2 rw rootwait nohz=off video=omapfb:vram:1M,vxres:640,vyres:480'
-fatload mmc 0 83000000 uImage
-bootm 83000000
diff --git a/target/linux/omap35xx/generic/profiles/beagleboard.mk b/target/linux/omap35xx/generic/profiles/beagleboard.mk
deleted file mode 100644
index 69ecdbb82..000000000
--- a/target/linux/omap35xx/generic/profiles/beagleboard.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright (C) 2006 - 2009 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/Beagleboard
-  NAME:=beagleboard
-  FEATURES:=ext2 usb
-endef
-
-define Profile/Beagleboard/Description
-        Beagleboard - www.beagleboard.org
-endef
-$(eval $(call Profile,Beagleboard))
diff --git a/target/linux/omap35xx/generic/target.mk b/target/linux/omap35xx/generic/target.mk
deleted file mode 100644
index 30d8f2332..000000000
--- a/target/linux/omap35xx/generic/target.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-BOARDNAME:=Generic
-
-define Target/Description
-	Build firmware images for ti omap35xx based boards 
-endef
-
diff --git a/target/linux/omap35xx/image/Makefile b/target/linux/omap35xx/image/Makefile
deleted file mode 100644
index aa23c0c83..000000000
--- a/target/linux/omap35xx/image/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# 
-# Copyright (C) 2006-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/image.mk
-
-JFFS2_BLOCKSIZE=128k
-JFFS2OPTS += --little-endian --pagesize=0x800 --no-cleanmarkers --pad
-
-define Image/BuildKernel
-	$(TARGET_CROSS)objcopy -O binary -R .note -R .comment -S $(LINUX_DIR)/arch/arm/boot/compressed/vmlinux linux.bin
-	mkimage -A arm -O linux -T kernel -C none -a 80008000 -e 80008000 -n "OpenWRT Kernel Image beagleboard" -d linux.bin uImage
-	mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n 'uImage.bin+mmc2' -d ../files/boot-mmc.cmd boot.scr
-
-	mv uImage $(BIN_DIR)/$(IMG_PREFIX)-$(KERNEL)-uImage
-	mv boot.scr $(BIN_DIR)/boot.scr
-	rm linux.bin
-endef
-
-define Image/Build/squashfs
-    $(call prepare_generic_squashfs,$(BIN_DIR)/$(IMG_PREFIX)-$(KERNEL)-root.$(1))
-endef
-
-define Image/Build
-	$(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(KERNEL)-root.$(1)
-	PADDING="true" PATH="$(TARGET_PATH)" ./gen_image.sh $(BIN_DIR)/$(IMG_PREFIX)-$(1).image 4 $(KDIR)/root.bootscript 240 $(KDIR)/root.$(1)
-	$(call Image/Build/$(1),$(1))
-endef
-
-
-$(eval $(call BuildImage))
diff --git a/target/linux/omap35xx/image/gen_image.sh b/target/linux/omap35xx/image/gen_image.sh
deleted file mode 100755
index 4fd6e377e..000000000
--- a/target/linux/omap35xx/image/gen_image.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2006 - 2007 OpenWrt.org
-set -x 
-[ $# == 5 ] || {
-    echo "SYNTAX: $0 <file> <kernel size> <kernel directory> <rootfs size> <rootfs image>"
-    exit 1
-}
-
-OUTPUT="$1"
-KERNELSIZE="$2"
-KERNELDIR="$3"
-ROOTFSSIZE="$4"
-ROOTFSIMAGE="$5"
-
-rm -f "$OUTPUT"
-
-head=16
-sect=63
-cyl=$(( ($KERNELSIZE + $ROOTFSSIZE) * 1024 * 1024 / ($head * $sect * 512)))
-
-# create partition table
-set `ptgen -o "$OUTPUT" -h $head -s $sect -p ${KERNELSIZE}m -p ${ROOTFSSIZE}m`
-
-KERNELOFFSET="$(($1 / 512))"
-KERNELSIZE="$(($2 / 512))"
-ROOTFSOFFSET="$(($3 / 512))"
-ROOTFSSIZE="$(($4 / 512))"
-
-BLOCKS="$((($KERNELSIZE / 2) - 1))"
-
-genext2fs -d "$KERNELDIR" -b "$BLOCKS" "$OUTPUT.kernel"
-dd if="$OUTPUT.kernel" of="$OUTPUT" bs=512 seek="$KERNELOFFSET" conv=notrunc
-[ -n "$PADDING" ] && dd if=/dev/zero of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" conv=notrunc count="$ROOTFSSIZE"
-dd if="$ROOTFSIMAGE" of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" conv=notrunc
-#rm -f "$OUTPUT.kernel"
diff --git a/target/linux/omap35xx/patches-2.6.32/001-DSS2.patch b/target/linux/omap35xx/patches-2.6.32/001-DSS2.patch
deleted file mode 100644
index be32519dd..000000000
--- a/target/linux/omap35xx/patches-2.6.32/001-DSS2.patch
+++ /dev/null
@@ -1,22645 +0,0 @@
---- /dev/null
-+++ b/Documentation/arm/OMAP/DSS
-@@ -0,0 +1,317 @@
-+OMAP2/3 Display Subsystem
-+-------------------------
-+
-+This is an almost total rewrite of the OMAP FB driver in drivers/video/omap
-+(let's call it DSS1). The main differences between DSS1 and DSS2 are DSI,
-+TV-out and multiple display support, but there are lots of small improvements
-+also.
-+
-+The DSS2 driver (omapdss module) is in arch/arm/plat-omap/dss/, and the FB,
-+panel and controller drivers are in drivers/video/omap2/. DSS1 and DSS2 live
-+currently side by side, you can choose which one to use.
-+
-+Features
-+--------
-+
-+Working and tested features include:
-+
-+- MIPI DPI (parallel) output
-+- MIPI DSI output in command mode
-+- MIPI DBI (RFBI) output
-+- SDI output
-+- TV output
-+- All pieces can be compiled as a module or inside kernel
-+- Use DISPC to update any of the outputs
-+- Use CPU to update RFBI or DSI output
-+- OMAP DISPC planes
-+- RGB16, RGB24 packed, RGB24 unpacked
-+- YUV2, UYVY
-+- Scaling
-+- Adjusting DSS FCK to find a good pixel clock
-+- Use DSI DPLL to create DSS FCK
-+
-+Tested boards include:
-+- OMAP3 SDP board
-+- Beagle board
-+- N810
-+
-+omapdss driver
-+--------------
-+
-+The DSS driver does not itself have any support for Linux framebuffer, V4L or
-+such like the current ones, but it has an internal kernel API that upper level
-+drivers can use.
-+
-+The DSS driver models OMAP's overlays, overlay managers and displays in a
-+flexible way to enable non-common multi-display configuration. In addition to
-+modelling the hardware overlays, omapdss supports virtual overlays and overlay
-+managers. These can be used when updating a display with CPU or system DMA.
-+
-+Panel and controller drivers
-+----------------------------
-+
-+The drivers implement panel or controller specific functionality and are not
-+usually visible to users except through omapfb driver.  They register
-+themselves to the DSS driver.
-+
-+omapfb driver
-+-------------
-+
-+The omapfb driver implements arbitrary number of standard linux framebuffers.
-+These framebuffers can be routed flexibly to any overlays, thus allowing very
-+dynamic display architecture.
-+
-+The driver exports some omapfb specific ioctls, which are compatible with the
-+ioctls in the old driver.
-+
-+The rest of the non standard features are exported via sysfs. Whether the final
-+implementation will use sysfs, or ioctls, is still open.
-+
-+V4L2 drivers
-+------------
-+
-+V4L2 is being implemented in TI.
-+
-+From omapdss point of view the V4L2 drivers should be similar to framebuffer
-+driver.
-+
-+Architecture
-+--------------------
-+
-+Some clarification what the different components do:
-+
-+    - Framebuffer is a memory area inside OMAP's SRAM/SDRAM that contains the
-+      pixel data for the image. Framebuffer has width and height and color
-+      depth.
-+    - Overlay defines where the pixels are read from and where they go on the
-+      screen. The overlay may be smaller than framebuffer, thus displaying only
-+      part of the framebuffer. The position of the overlay may be changed if
-+      the overlay is smaller than the display.
-+    - Overlay manager combines the overlays in to one image and feeds them to
-+      display.
-+    - Display is the actual physical display device.
-+
-+A framebuffer can be connected to multiple overlays to show the same pixel data
-+on all of the overlays. Note that in this case the overlay input sizes must be
-+the same, but, in case of video overlays, the output size can be different. Any
-+framebuffer can be connected to any overlay.
-+
-+An overlay can be connected to one overlay manager. Also DISPC overlays can be
-+connected only to DISPC overlay managers, and virtual overlays can be only
-+connected to virtual overlays.
-+
-+An overlay manager can be connected to one display. There are certain
-+restrictions which kinds of displays an overlay manager can be connected:
-+
-+    - DISPC TV overlay manager can be only connected to TV display.
-+    - Virtual overlay managers can only be connected to DBI or DSI displays.
-+    - DISPC LCD overlay manager can be connected to all displays, except TV
-+      display.
-+
-+Sysfs
-+-----
-+The sysfs interface is mainly used for testing. I don't think sysfs
-+interface is the best for this in the final version, but I don't quite know
-+what would be the best interfaces for these things.
-+
-+The sysfs interface is divided to two parts: DSS and FB.
-+
-+/sys/class/graphics/fb? directory:
-+mirror		0=off, 1=on
-+rotate		Rotation 0-3 for 0, 90, 180, 270 degrees
-+rotate_type	0 = DMA rotation, 1 = VRFB rotation
-+overlays	List of overlay numbers to which framebuffer pixels go
-+phys_addr	Physical address of the framebuffer
-+virt_addr	Virtual address of the framebuffer
-+size		Size of the framebuffer
-+
-+/sys/devices/platform/omapdss/overlay? directory:
-+enabled		0=off, 1=on
-+input_size	width,height (ie. the framebuffer size)
-+manager		Destination overlay manager name
-+name
-+output_size	width,height
-+position	x,y
-+screen_width	width
-+global_alpha   	global alpha 0-255 0=transparent 255=opaque
-+
-+/sys/devices/platform/omapdss/manager? directory:
-+display				Destination display
-+name
-+alpha_blending_enabled		0=off, 1=on
-+trans_key_enabled		0=off, 1=on
-+trans_key_type			gfx-destination, video-source
-+trans_key_value			transparency color key (RGB24)
-+default_color			default background color (RGB24)
-+
-+/sys/devices/platform/omapdss/display? directory:
-+ctrl_name	Controller name
-+mirror		0=off, 1=on
-+update_mode	0=off, 1=auto, 2=manual
-+enabled		0=off, 1=on
-+name
-+rotate		Rotation 0-3 for 0, 90, 180, 270 degrees
-+timings		Display timings (pixclock,xres/hfp/hbp/hsw,yres/vfp/vbp/vsw)
-+		When writing, two special timings are accepted for tv-out:
-+		"pal" and "ntsc"
-+panel_name
-+tear_elim	Tearing elimination 0=off, 1=on
-+
-+There are also some debugfs files at <debugfs>/omapdss/ which show information
-+about clocks and registers.
-+
-+Examples
-+--------
-+
-+The following definitions have been made for the examples below:
-+
-+ovl0=/sys/devices/platform/omapdss/overlay0
-+ovl1=/sys/devices/platform/omapdss/overlay1
-+ovl2=/sys/devices/platform/omapdss/overlay2
-+
-+mgr0=/sys/devices/platform/omapdss/manager0
-+mgr1=/sys/devices/platform/omapdss/manager1
-+
-+lcd=/sys/devices/platform/omapdss/display0
-+dvi=/sys/devices/platform/omapdss/display1
-+tv=/sys/devices/platform/omapdss/display2
-+
-+fb0=/sys/class/graphics/fb0
-+fb1=/sys/class/graphics/fb1
-+fb2=/sys/class/graphics/fb2
-+
-+Default setup on OMAP3 SDP
-+--------------------------
-+
-+Here's the default setup on OMAP3 SDP board. All planes go to LCD. DVI
-+and TV-out are not in use. The columns from left to right are:
-+framebuffers, overlays, overlay managers, displays. Framebuffers are
-+handled by omapfb, and the rest by the DSS.
-+
-+FB0 --- GFX  -\            DVI
-+FB1 --- VID1 --+- LCD ---- LCD
-+FB2 --- VID2 -/   TV ----- TV
-+
-+Example: Switch from LCD to DVI
-+----------------------
-+
-+w=`cat $dvi/timings | cut -d "," -f 2 | cut -d "/" -f 1`
-+h=`cat $dvi/timings | cut -d "," -f 3 | cut -d "/" -f 1`
-+
-+echo "0" > $lcd/enabled
-+echo "" > $mgr0/display
-+fbset -fb /dev/fb0 -xres $w -yres $h -vxres $w -vyres $h
-+# at this point you have to switch the dvi/lcd dip-switch from the omap board
-+echo "dvi" > $mgr0/display
-+echo "1" > $dvi/enabled
-+
-+After this the configuration looks like:
-+
-+FB0 --- GFX  -\         -- DVI
-+FB1 --- VID1 --+- LCD -/   LCD
-+FB2 --- VID2 -/   TV ----- TV
-+
-+Example: Clone GFX overlay to LCD and TV
-+-------------------------------
-+
-+w=`cat $tv/timings | cut -d "," -f 2 | cut -d "/" -f 1`
-+h=`cat $tv/timings | cut -d "," -f 3 | cut -d "/" -f 1`
-+
-+echo "0" > $ovl0/enabled
-+echo "0" > $ovl1/enabled
-+
-+echo "" > $fb1/overlays
-+echo "0,1" > $fb0/overlays
-+
-+echo "$w,$h" > $ovl1/output_size
-+echo "tv" > $ovl1/manager
-+
-+echo "1" > $ovl0/enabled
-+echo "1" > $ovl1/enabled
-+
-+echo "1" > $tv/enabled
-+
-+After this the configuration looks like (only relevant parts shown):
-+
-+FB0 +-- GFX  ---- LCD ---- LCD
-+     \- VID1 ---- TV  ---- TV
-+
-+Misc notes
-+----------
-+
-+OMAP FB allocates the framebuffer memory using the OMAP VRAM allocator.
-+
-+Using DSI DPLL to generate pixel clock it is possible produce the pixel clock
-+of 86.5MHz (max possible), and with that you get 1280x1024@57 output from DVI.
-+
-+Rotation and mirroring currently only supports RGB565 and RGB8888 modes. VRFB
-+does not support mirroring.
-+
-+VRFB rotation requires much more memory than non-rotated framebuffer, so you
-+probably need to increase your vram setting before using VRFB rotation. Also,
-+many applications may not work with VRFB if they do not pay attention to all
-+framebuffer parameters.
-+
-+Kernel boot arguments
-+---------------------
-+
-+vram=<size>
-+	- Amount of total VRAM to preallocate. For example, "10M". omapfb
-+	  allocates memory for framebuffers from VRAM.
-+
-+omapfb.mode=<display>:<mode>[,...]
-+	- Default video mode for specified displays. For example,
-+	  "dvi:800x400MR-24@60".  See drivers/video/modedb.c.
-+	  There are also two special modes: "pal" and "ntsc" that
-+	  can be used to tv out.
-+
-+omapfb.vram=<fbnum>:<size>[@<physaddr>][,...]
-+	- VRAM allocated for a framebuffer. Normally omapfb allocates vram
-+	  depending on the display size. With this you can manually allocate
-+	  more or define the physical address of each framebuffer. For example,
-+	  "1:4M" to allocate 4M for fb1.
-+
-+omapfb.debug=<y|n>
-+	- Enable debug printing. You have to have OMAPFB debug support enabled
-+	  in kernel config.
-+
-+omapfb.test=<y|n>
-+	- Draw test pattern to framebuffer whenever framebuffer settings change.
-+	  You need to have OMAPFB debug support enabled in kernel config.
-+
-+omapfb.vrfb=<y|n>
-+	- Use VRFB rotation for all framebuffers.
-+
-+omapfb.rotate=<angle>
-+	- Default rotation applied to all framebuffers.
-+	  0 - 0 degree rotation
-+	  1 - 90 degree rotation
-+	  2 - 180 degree rotation
-+	  3 - 270 degree rotation
-+
-+omapfb.mirror=<y|n>
-+	- Default mirror for all framebuffers. Only works with DMA rotation.
-+
-+omapdss.def_disp=<display>
-+	- Name of default display, to which all overlays will be connected.
-+	  Common examples are "lcd" or "tv".
-+
-+omapdss.debug=<y|n>
-+	- Enable debug printing. You have to have DSS debug support enabled in
-+	  kernel config.
-+
-+TODO
-+----
-+
-+DSS locking
-+
-+Error checking
-+- Lots of checks are missing or implemented just as BUG()
-+
-+System DMA update for DSI
-+- Can be used for RGB16 and RGB24P modes. Probably not for RGB24U (how
-+  to skip the empty byte?)
-+
-+OMAP1 support
-+- Not sure if needed
-+
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -3848,6 +3848,23 @@ L:	linux-omap@vger.kernel.org
- S:	Maintained
- F:	drivers/video/omap/
- 
-+OMAP DISPLAY SUBSYSTEM SUPPORT (DSS2)
-+M:	Tomi Valkeinen <tomi.valkeinen@nokia.com>
-+L:	linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
-+L:	linux-omap@vger.kernel.org
-+S:	Maintained
-+F:	drivers/video/omap2/dss/
-+F:	drivers/video/omap2/vrfb.c
-+F:	drivers/video/omap2/vram.c
-+F:	Documentation/arm/OMAP/DSS
-+
-+OMAP FRAMEBUFFER SUPPORT (FOR DSS2)
-+M:	Tomi Valkeinen <tomi.valkeinen@nokia.com>
-+L:	linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
-+L:	linux-omap@vger.kernel.org
-+S:	Maintained
-+F:	drivers/video/omap2/omapfb/
-+
- OMAP MMC SUPPORT
- M:	Jarkko Lavinen <jarkko.lavinen@nokia.com>
- L:	linux-omap@vger.kernel.org
---- a/arch/arm/configs/omap_3430sdp_defconfig
-+++ b/arch/arm/configs/omap_3430sdp_defconfig
-@@ -1336,10 +1336,33 @@ CONFIG_FB_CFB_IMAGEBLIT=y
- #
- # CONFIG_FB_S1D13XXX is not set
- # CONFIG_FB_VIRTUAL is not set
--CONFIG_FB_OMAP=y
--# CONFIG_FB_OMAP_LCDC_EXTERNAL is not set
-+# CONFIG_FB_METRONOME is not set
-+# CONFIG_FB_MB862XX is not set
-+# CONFIG_FB_BROADSHEET is not set
-+# CONFIG_FB_OMAP_LCD_VGA is not set
- # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set
--CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2
-+CONFIG_OMAP2_VRAM=y
-+CONFIG_OMAP2_VRFB=y
-+CONFIG_OMAP2_DSS=y
-+CONFIG_OMAP2_VRAM_SIZE=4
-+CONFIG_OMAP2_DSS_DEBUG_SUPPORT=y
-+# CONFIG_OMAP2_DSS_RFBI is not set
-+CONFIG_OMAP2_DSS_VENC=y
-+# CONFIG_OMAP2_DSS_SDI is not set
-+# CONFIG_OMAP2_DSS_DSI is not set
-+# CONFIG_OMAP2_DSS_FAKE_VSYNC is not set
-+CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0
-+CONFIG_FB_OMAP2=y
-+CONFIG_FB_OMAP2_DEBUG_SUPPORT=y
-+# CONFIG_FB_OMAP2_FORCE_AUTO_UPDATE is not set
-+CONFIG_FB_OMAP2_NUM_FBS=3
-+
-+#
-+# OMAP2/3 Display Device Drivers
-+#
-+CONFIG_PANEL_GENERIC=y
-+# CONFIG_PANEL_SAMSUNG_LTE430WQ_F0C is not set
-+CONFIG_PANEL_SHARP_LS037V7DW01=y
- # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
- 
- #
---- a/arch/arm/mach-omap1/board-nokia770.c
-+++ b/arch/arm/mach-omap1/board-nokia770.c
-@@ -14,6 +14,7 @@
- #include <linux/platform_device.h>
- #include <linux/input.h>
- #include <linux/clk.h>
-+#include <linux/omapfb.h>
- 
- #include <linux/spi/spi.h>
- #include <linux/spi/ads7846.h>
-@@ -32,7 +33,6 @@
- #include <mach/keypad.h>
- #include <mach/common.h>
- #include <mach/dsp_common.h>
--#include <mach/omapfb.h>
- #include <mach/hwa742.h>
- #include <mach/lcd_mipid.h>
- #include <mach/mmc.h>
---- a/arch/arm/mach-omap2/board-3430sdp.c
-+++ b/arch/arm/mach-omap2/board-3430sdp.c
-@@ -37,6 +37,7 @@
- #include <mach/common.h>
- #include <mach/dma.h>
- #include <mach/gpmc.h>
-+#include <mach/display.h>
- 
- #include <mach/control.h>
- #include <mach/gpmc-smc91x.h>
-@@ -152,31 +153,152 @@ static struct spi_board_info sdp3430_spi
- 	},
- };
- 
--static struct platform_device sdp3430_lcd_device = {
--	.name		= "sdp2430_lcd",
--	.id		= -1,
-+
-+#define SDP3430_LCD_PANEL_BACKLIGHT_GPIO	8
-+#define SDP3430_LCD_PANEL_ENABLE_GPIO		5
-+
-+static unsigned backlight_gpio;
-+static unsigned enable_gpio;
-+static int lcd_enabled;
-+static int dvi_enabled;
-+
-+static void __init sdp3430_display_init(void)
-+{
-+	int r;
-+
-+	enable_gpio    = SDP3430_LCD_PANEL_ENABLE_GPIO;
-+	backlight_gpio = SDP3430_LCD_PANEL_BACKLIGHT_GPIO;
-+
-+	r = gpio_request(enable_gpio, "LCD reset");
-+	if (r) {
-+		printk(KERN_ERR "failed to get LCD reset GPIO\n");
-+		goto err0;
-+	}
-+
-+	r = gpio_request(backlight_gpio, "LCD Backlight");
-+	if (r) {
-+		printk(KERN_ERR "failed to get LCD backlight GPIO\n");
-+		goto err1;
-+	}
-+
-+	gpio_direction_output(enable_gpio, 0);
-+	gpio_direction_output(backlight_gpio, 0);
-+
-+	return;
-+err1:
-+	gpio_free(enable_gpio);
-+err0:
-+	return;
-+}
-+
-+static int sdp3430_panel_enable_lcd(struct omap_dss_device *dssdev)
-+{
-+	if (dvi_enabled) {
-+		printk(KERN_ERR "cannot enable LCD, DVI is enabled\n");
-+		return -EINVAL;
-+	}
-+
-+	gpio_direction_output(enable_gpio, 1);
-+	gpio_direction_output(backlight_gpio, 1);
-+
-+	lcd_enabled = 1;
-+
-+	return 0;
-+}
-+
-+static void sdp3430_panel_disable_lcd(struct omap_dss_device *dssdev)
-+{
-+	lcd_enabled = 0;
-+
-+	gpio_direction_output(enable_gpio, 0);
-+	gpio_direction_output(backlight_gpio, 0);
-+}
-+
-+static int sdp3430_panel_enable_dvi(struct omap_dss_device *dssdev)
-+{
-+	if (lcd_enabled) {
-+		printk(KERN_ERR "cannot enable DVI, LCD is enabled\n");
-+		return -EINVAL;
-+	}
-+
-+	dvi_enabled = 1;
-+
-+	return 0;
-+}
-+
-+static void sdp3430_panel_disable_dvi(struct omap_dss_device *dssdev)
-+{
-+	dvi_enabled = 0;
-+}
-+
-+static int sdp3430_panel_enable_tv(struct omap_dss_device *dssdev)
-+{
-+	return 0;
-+}
-+
-+static void sdp3430_panel_disable_tv(struct omap_dss_device *dssdev)
-+{
-+}
-+
-+
-+static struct omap_dss_device sdp3430_lcd_device = {
-+	.name			= "lcd",
-+	.driver_name		= "sharp_ls_panel",
-+	.type			= OMAP_DISPLAY_TYPE_DPI,
-+	.phy.dpi.data_lines	= 16,
-+	.platform_enable	= sdp3430_panel_enable_lcd,
-+	.platform_disable	= sdp3430_panel_disable_lcd,
-+};
-+
-+static struct omap_dss_device sdp3430_dvi_device = {
-+	.name			= "dvi",
-+	.driver_name		= "generic_panel",
-+	.type			= OMAP_DISPLAY_TYPE_DPI,
-+	.phy.dpi.data_lines	= 24,
-+	.platform_enable	= sdp3430_panel_enable_dvi,
-+	.platform_disable	= sdp3430_panel_disable_dvi,
-+};
-+
-+static struct omap_dss_device sdp3430_tv_device = {
-+	.name			= "tv",
-+	.driver_name		= "venc",
-+	.type			= OMAP_DISPLAY_TYPE_VENC,
-+	.phy.venc.type		= OMAP_DSS_VENC_TYPE_SVIDEO,
-+	.platform_enable	= sdp3430_panel_enable_tv,
-+	.platform_disable	= sdp3430_panel_disable_tv,
-+};
-+
-+
-+static struct omap_dss_device *sdp3430_dss_devices[] = {
-+	&sdp3430_lcd_device,
-+	&sdp3430_dvi_device,
-+	&sdp3430_tv_device,
- };
- 
--static struct regulator_consumer_supply sdp3430_vdac_supply = {
--	.supply		= "vdac",
--	.dev		= &sdp3430_lcd_device.dev,
-+static struct omap_dss_board_info sdp3430_dss_data = {
-+	.num_devices	= ARRAY_SIZE(sdp3430_dss_devices),
-+	.devices	= sdp3430_dss_devices,
-+	.default_device	= &sdp3430_lcd_device,
- };
- 
--static struct regulator_consumer_supply sdp3430_vdvi_supply = {
--	.supply		= "vdvi",
--	.dev		= &sdp3430_lcd_device.dev,
-+static struct platform_device sdp3430_dss_device = {
-+	.name		= "omapdss",
-+	.id		= -1,
-+	.dev		= {
-+		.platform_data = &sdp3430_dss_data,
-+	},
- };
- 
--static struct platform_device *sdp3430_devices[] __initdata = {
--	&sdp3430_lcd_device,
-+static struct regulator_consumer_supply sdp3430_vdda_dac_supply = {
-+	.supply		= "vdda_dac",
-+	.dev		= &sdp3430_dss_device.dev,
- };
- 
--static struct omap_lcd_config sdp3430_lcd_config __initdata = {
--	.ctrl_name	= "internal",
-+static struct platform_device *sdp3430_devices[] __initdata = {
-+	&sdp3430_dss_device,
- };
- 
- static struct omap_board_config_kernel sdp3430_config[] __initdata = {
--	{ OMAP_TAG_LCD,		&sdp3430_lcd_config },
- };
- 
- static void __init omap_3430sdp_init_irq(void)
-@@ -392,22 +514,34 @@ static struct regulator_init_data sdp343
- 					| REGULATOR_CHANGE_STATUS,
- 	},
- 	.num_consumer_supplies	= 1,
--	.consumer_supplies	= &sdp3430_vdac_supply,
-+	.consumer_supplies	= &sdp3430_vdda_dac_supply,
- };
- 
- /* VPLL2 for digital video outputs */
-+static struct regulator_consumer_supply sdp3430_vpll2_supplies[] = {
-+	{
-+		.supply		= "vdvi",
-+		.dev		= &sdp3430_lcd_device.dev,
-+	},
-+	{
-+		.supply		= "vdds_dsi",
-+		.dev		= &sdp3430_dss_device.dev,
-+	}
-+};
-+
- static struct regulator_init_data sdp3430_vpll2 = {
- 	.constraints = {
- 		.name			= "VDVI",
- 		.min_uV			= 1800000,
- 		.max_uV			= 1800000,
-+		.apply_uV		= true,
- 		.valid_modes_mask	= REGULATOR_MODE_NORMAL
- 					| REGULATOR_MODE_STANDBY,
- 		.valid_ops_mask		= REGULATOR_CHANGE_MODE
- 					| REGULATOR_CHANGE_STATUS,
- 	},
--	.num_consumer_supplies	= 1,
--	.consumer_supplies	= &sdp3430_vdvi_supply,
-+	.num_consumer_supplies	= ARRAY_SIZE(sdp3430_vpll2_supplies),
-+	.consumer_supplies	= sdp3430_vpll2_supplies,
- };
- 
- static struct twl4030_platform_data sdp3430_twldata = {
-@@ -499,6 +633,7 @@ static void __init omap_3430sdp_init(voi
- 	omap_serial_init();
- 	usb_musb_init();
- 	board_smc91x_init();
-+	sdp3430_display_init();
- 	enable_board_wakeup_source();
- }
- 
---- a/arch/arm/mach-omap2/clock24xx.c
-+++ b/arch/arm/mach-omap2/clock24xx.c
-@@ -116,10 +116,10 @@ static struct omap_clk omap24xx_clks[] =
- 	CLK(NULL,	"mdm_ick",	&mdm_ick,	CK_243X),
- 	CLK(NULL,	"mdm_osc_ck",	&mdm_osc_ck,	CK_243X),
- 	/* DSS domain clocks */
--	CLK("omapfb",	"ick",		&dss_ick,	CK_243X | CK_242X),
--	CLK("omapfb",	"dss1_fck",	&dss1_fck,	CK_243X | CK_242X),
--	CLK("omapfb",	"dss2_fck",	&dss2_fck,	CK_243X | CK_242X),
--	CLK("omapfb",	"tv_fck",	&dss_54m_fck,	CK_243X | CK_242X),
-+	CLK("omapdss",	"ick",		&dss_ick,	CK_243X | CK_242X),
-+	CLK("omapdss",	"dss1_fck",	&dss1_fck,	CK_243X | CK_242X),
-+	CLK("omapdss",	"dss2_fck",	&dss2_fck,	CK_243X | CK_242X),
-+	CLK("omapdss",	"tv_fck",	&dss_54m_fck,	CK_243X | CK_242X),
- 	/* L3 domain clocks */
- 	CLK(NULL,	"core_l3_ck",	&core_l3_ck,	CK_243X | CK_242X),
- 	CLK(NULL,	"ssi_fck",	&ssi_ssr_sst_fck, CK_243X | CK_242X),
---- a/arch/arm/mach-omap2/clock34xx.c
-+++ b/arch/arm/mach-omap2/clock34xx.c
-@@ -236,13 +236,13 @@ static struct omap_clk omap34xx_clks[] =
- 	CLK("omap_rng",	"ick",		&rng_ick,	CK_343X),
- 	CLK(NULL,	"sha11_ick",	&sha11_ick,	CK_343X),
- 	CLK(NULL,	"des1_ick",	&des1_ick,	CK_343X),
--	CLK("omapfb",	"dss1_fck",	&dss1_alwon_fck_3430es1, CK_3430ES1),
--	CLK("omapfb",	"dss1_fck",	&dss1_alwon_fck_3430es2, CK_3430ES2),
--	CLK("omapfb",	"tv_fck",	&dss_tv_fck,	CK_343X),
--	CLK("omapfb",	"video_fck",	&dss_96m_fck,	CK_343X),
--	CLK("omapfb",	"dss2_fck",	&dss2_alwon_fck, CK_343X),
--	CLK("omapfb",	"ick",		&dss_ick_3430es1,	CK_3430ES1),
--	CLK("omapfb",	"ick",		&dss_ick_3430es2,	CK_3430ES2),
-+	CLK("omapdss",	"dss1_fck",	&dss1_alwon_fck_3430es1, CK_3430ES1),
-+	CLK("omapdss",	"dss1_fck",	&dss1_alwon_fck_3430es2, CK_3430ES2),
-+	CLK("omapdss",	"tv_fck",	&dss_tv_fck,	CK_343X),
-+	CLK("omapdss",	"video_fck",	&dss_96m_fck,	CK_343X),
-+	CLK("omapdss",	"dss2_fck",	&dss2_alwon_fck, CK_343X),
-+	CLK("omapdss",	"ick",		&dss_ick_3430es1,	CK_3430ES1),
-+	CLK("omapdss",	"ick",		&dss_ick_3430es2,	CK_3430ES2),
- 	CLK(NULL,	"cam_mclk",	&cam_mclk,	CK_343X),
- 	CLK(NULL,	"cam_ick",	&cam_ick,	CK_343X),
- 	CLK(NULL,	"csi2_96m_fck",	&csi2_96m_fck,	CK_343X),
---- a/arch/arm/mach-omap2/io.c
-+++ b/arch/arm/mach-omap2/io.c
-@@ -22,17 +22,18 @@
- #include <linux/init.h>
- #include <linux/io.h>
- #include <linux/clk.h>
-+#include <linux/omapfb.h>
- 
- #include <asm/tlb.h>
- 
- #include <asm/mach/map.h>
- 
- #include <mach/mux.h>
--#include <mach/omapfb.h>
- #include <mach/sram.h>
- #include <mach/sdrc.h>
- #include <mach/gpmc.h>
- #include <mach/serial.h>
-+#include <mach/vram.h>
- 
- #ifndef CONFIG_ARCH_OMAP4	/* FIXME: Remove this once clkdev is ready */
- #include "clock.h"
-@@ -246,6 +247,7 @@ void __init omap2_map_common_io(void)
- 	omap2_check_revision();
- 	omap_sram_init();
- 	omapfb_reserve_sdram();
-+	omap_vram_reserve_sdram();
- }
- 
- /*
---- a/arch/arm/mach-omap2/sdrc.c
-+++ b/arch/arm/mach-omap2/sdrc.c
-@@ -133,3 +133,19 @@ void __init omap2_sdrc_init(struct omap_
- 		(1 << SDRC_POWER_PAGEPOLICY_SHIFT);
- 	sdrc_write_reg(l, SDRC_POWER);
- }
-+
-+void omap2_sms_write_rot_control(u32 val, unsigned ctx)
-+{
-+	sms_write_reg(val, SMS_ROT_CONTROL(ctx));
-+}
-+
-+void omap2_sms_write_rot_size(u32 val, unsigned ctx)
-+{
-+	sms_write_reg(val, SMS_ROT_SIZE(ctx));
-+}
-+
-+void omap2_sms_write_rot_physical_ba(u32 val, unsigned ctx)
-+{
-+	sms_write_reg(val, SMS_ROT_PHYSICAL_BA(ctx));
-+}
-+
---- a/arch/arm/plat-omap/fb.c
-+++ b/arch/arm/plat-omap/fb.c
-@@ -28,13 +28,13 @@
- #include <linux/platform_device.h>
- #include <linux/bootmem.h>
- #include <linux/io.h>
-+#include <linux/omapfb.h>
- 
- #include <mach/hardware.h>
- #include <asm/mach/map.h>
- 
- #include <mach/board.h>
- #include <mach/sram.h>
--#include <mach/omapfb.h>
- 
- #if defined(CONFIG_FB_OMAP) || defined(CONFIG_FB_OMAP_MODULE)
- 
-@@ -327,7 +327,33 @@ static inline int omap_init_fb(void)
- 
- arch_initcall(omap_init_fb);
- 
--#else
-+#elif defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE)
-+
-+static u64 omap_fb_dma_mask = ~(u32)0;
-+static struct omapfb_platform_data omapfb_config;
-+
-+static struct platform_device omap_fb_device = {
-+	.name		= "omapfb",
-+	.id		= -1,
-+	.dev = {
-+		.dma_mask		= &omap_fb_dma_mask,
-+		.coherent_dma_mask	= ~(u32)0,
-+		.platform_data		= &omapfb_config,
-+	},
-+	.num_resources = 0,
-+};
-+
-+void omapfb_set_platform_data(struct omapfb_platform_data *data)
-+{
-+	omapfb_config = *data;
-+}
-+
-+static inline int omap_init_fb(void)
-+{
-+	return platform_device_register(&omap_fb_device);
-+}
-+
-+arch_initcall(omap_init_fb);
- 
- void omapfb_reserve_sdram(void) {}
- unsigned long omapfb_reserve_sram(unsigned long sram_pstart,
-@@ -339,5 +365,16 @@ unsigned long omapfb_reserve_sram(unsign
- 	return 0;
- }
- 
-+#else
-+
-+void omapfb_reserve_sdram(void) {}
-+unsigned long omapfb_reserve_sram(unsigned long sram_pstart,
-+				  unsigned long sram_vstart,
-+				  unsigned long sram_size,
-+				  unsigned long start_avail,
-+				  unsigned long size_avail)
-+{
-+	return 0;
-+}
- 
- #endif
---- /dev/null
-+++ b/arch/arm/plat-omap/include/mach/display.h
-@@ -0,0 +1,540 @@
-+/*
-+ * linux/include/asm-arm/arch-omap/display.h
-+ *
-+ * Copyright (C) 2008 Nokia Corporation
-+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.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.
-+ *
-+ * This program is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-+ * more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along with
-+ * this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#ifndef __ASM_ARCH_OMAP_DISPLAY_H
-+#define __ASM_ARCH_OMAP_DISPLAY_H
-+
-+#include <linux/list.h>
-+#include <linux/kobject.h>
-+#include <linux/device.h>
-+#include <asm/atomic.h>
-+
-+#define DISPC_IRQ_FRAMEDONE		(1 << 0)
-+#define DISPC_IRQ_VSYNC			(1 << 1)
-+#define DISPC_IRQ_EVSYNC_EVEN		(1 << 2)
-+#define DISPC_IRQ_EVSYNC_ODD		(1 << 3)
-+#define DISPC_IRQ_ACBIAS_COUNT_STAT	(1 << 4)
-+#define DISPC_IRQ_PROG_LINE_NUM		(1 << 5)
-+#define DISPC_IRQ_GFX_FIFO_UNDERFLOW	(1 << 6)
-+#define DISPC_IRQ_GFX_END_WIN		(1 << 7)
-+#define DISPC_IRQ_PAL_GAMMA_MASK	(1 << 8)
-+#define DISPC_IRQ_OCP_ERR		(1 << 9)
-+#define DISPC_IRQ_VID1_FIFO_UNDERFLOW	(1 << 10)
-+#define DISPC_IRQ_VID1_END_WIN		(1 << 11)
-+#define DISPC_IRQ_VID2_FIFO_UNDERFLOW	(1 << 12)
-+#define DISPC_IRQ_VID2_END_WIN		(1 << 13)
-+#define DISPC_IRQ_SYNC_LOST		(1 << 14)
-+#define DISPC_IRQ_SYNC_LOST_DIGIT	(1 << 15)
-+#define DISPC_IRQ_WAKEUP		(1 << 16)
-+
-+struct omap_dss_device;
-+struct omap_overlay_manager;
-+
-+enum omap_display_type {
-+	OMAP_DISPLAY_TYPE_NONE		= 0,
-+	OMAP_DISPLAY_TYPE_DPI		= 1 << 0,
-+	OMAP_DISPLAY_TYPE_DBI		= 1 << 1,
-+	OMAP_DISPLAY_TYPE_SDI		= 1 << 2,
-+	OMAP_DISPLAY_TYPE_DSI		= 1 << 3,
-+	OMAP_DISPLAY_TYPE_VENC		= 1 << 4,
-+};
-+
-+enum omap_plane {
-+	OMAP_DSS_GFX	= 0,
-+	OMAP_DSS_VIDEO1	= 1,
-+	OMAP_DSS_VIDEO2	= 2
-+};
-+
-+enum omap_channel {
-+	OMAP_DSS_CHANNEL_LCD	= 0,
-+	OMAP_DSS_CHANNEL_DIGIT	= 1,
-+};
-+
-+enum omap_color_mode {
-+	OMAP_DSS_COLOR_CLUT1	= 1 << 0,  /* BITMAP 1 */
-+	OMAP_DSS_COLOR_CLUT2	= 1 << 1,  /* BITMAP 2 */
-+	OMAP_DSS_COLOR_CLUT4	= 1 << 2,  /* BITMAP 4 */
-+	OMAP_DSS_COLOR_CLUT8	= 1 << 3,  /* BITMAP 8 */
-+	OMAP_DSS_COLOR_RGB12U	= 1 << 4,  /* RGB12, 16-bit container */
-+	OMAP_DSS_COLOR_ARGB16	= 1 << 5,  /* ARGB16 */
-+	OMAP_DSS_COLOR_RGB16	= 1 << 6,  /* RGB16 */
-+	OMAP_DSS_COLOR_RGB24U	= 1 << 7,  /* RGB24, 32-bit container */
-+	OMAP_DSS_COLOR_RGB24P	= 1 << 8,  /* RGB24, 24-bit container */
-+	OMAP_DSS_COLOR_YUV2	= 1 << 9,  /* YUV2 4:2:2 co-sited */
-+	OMAP_DSS_COLOR_UYVY	= 1 << 10, /* UYVY 4:2:2 co-sited */
-+	OMAP_DSS_COLOR_ARGB32	= 1 << 11, /* ARGB32 */
-+	OMAP_DSS_COLOR_RGBA32	= 1 << 12, /* RGBA32 */
-+	OMAP_DSS_COLOR_RGBX32	= 1 << 13, /* RGBx32 */
-+
-+	OMAP_DSS_COLOR_GFX_OMAP3 =
-+		OMAP_DSS_COLOR_CLUT1 | OMAP_DSS_COLOR_CLUT2 |
-+		OMAP_DSS_COLOR_CLUT4 | OMAP_DSS_COLOR_CLUT8 |
-+		OMAP_DSS_COLOR_RGB12U | OMAP_DSS_COLOR_ARGB16 |
-+		OMAP_DSS_COLOR_RGB16 | OMAP_DSS_COLOR_RGB24U |
-+		OMAP_DSS_COLOR_RGB24P | OMAP_DSS_COLOR_ARGB32 |
-+		OMAP_DSS_COLOR_RGBA32 | OMAP_DSS_COLOR_RGBX32,
-+
-+	OMAP_DSS_COLOR_VID_OMAP3 =
-+		OMAP_DSS_COLOR_RGB12U | OMAP_DSS_COLOR_ARGB16 |
-+		OMAP_DSS_COLOR_RGB16 | OMAP_DSS_COLOR_RGB24U |
-+		OMAP_DSS_COLOR_RGB24P | OMAP_DSS_COLOR_ARGB32 |
-+		OMAP_DSS_COLOR_RGBA32 | OMAP_DSS_COLOR_RGBX32 |
-+		OMAP_DSS_COLOR_YUV2 | OMAP_DSS_COLOR_UYVY,
-+};
-+
-+enum omap_lcd_display_type {
-+	OMAP_DSS_LCD_DISPLAY_STN,
-+	OMAP_DSS_LCD_DISPLAY_TFT,
-+};
-+
-+enum omap_dss_load_mode {
-+	OMAP_DSS_LOAD_CLUT_AND_FRAME	= 0,
-+	OMAP_DSS_LOAD_CLUT_ONLY		= 1,
-+	OMAP_DSS_LOAD_FRAME_ONLY	= 2,
-+	OMAP_DSS_LOAD_CLUT_ONCE_FRAME	= 3,
-+};
-+
-+enum omap_dss_trans_key_type {
-+	OMAP_DSS_COLOR_KEY_GFX_DST = 0,
-+	OMAP_DSS_COLOR_KEY_VID_SRC = 1,
-+};
-+
-+enum omap_rfbi_te_mode {
-+	OMAP_DSS_RFBI_TE_MODE_1 = 1,
-+	OMAP_DSS_RFBI_TE_MODE_2 = 2,
-+};
-+
-+enum omap_panel_config {
-+	OMAP_DSS_LCD_IVS		= 1<<0,
-+	OMAP_DSS_LCD_IHS		= 1<<1,
-+	OMAP_DSS_LCD_IPC		= 1<<2,
-+	OMAP_DSS_LCD_IEO		= 1<<3,
-+	OMAP_DSS_LCD_RF			= 1<<4,
-+	OMAP_DSS_LCD_ONOFF		= 1<<5,
-+
-+	OMAP_DSS_LCD_TFT		= 1<<20,
-+};
-+
-+enum omap_dss_venc_type {
-+	OMAP_DSS_VENC_TYPE_COMPOSITE,
-+	OMAP_DSS_VENC_TYPE_SVIDEO,
-+};
-+
-+enum omap_display_caps {
-+	OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE = 1 << 0,
-+};
-+
-+enum omap_dss_update_mode {
-+	OMAP_DSS_UPDATE_DISABLED = 0,
-+	OMAP_DSS_UPDATE_AUTO,
-+	OMAP_DSS_UPDATE_MANUAL,
-+};
-+
-+enum omap_dss_display_state {
-+	OMAP_DSS_DISPLAY_DISABLED = 0,
-+	OMAP_DSS_DISPLAY_ACTIVE,
-+	OMAP_DSS_DISPLAY_SUSPENDED,
-+};
-+
-+/* XXX perhaps this should be removed */
-+enum omap_dss_overlay_managers {
-+	OMAP_DSS_OVL_MGR_LCD,
-+	OMAP_DSS_OVL_MGR_TV,
-+};
-+
-+enum omap_dss_rotation_type {
-+	OMAP_DSS_ROT_DMA = 0,
-+	OMAP_DSS_ROT_VRFB = 1,
-+};
-+
-+enum omap_overlay_caps {
-+	OMAP_DSS_OVL_CAP_SCALE = 1 << 0,
-+	OMAP_DSS_OVL_CAP_DISPC = 1 << 1,
-+};
-+
-+enum omap_overlay_manager_caps {
-+	OMAP_DSS_OVL_MGR_CAP_DISPC = 1 << 0,
-+};
-+
-+/* RFBI */
-+
-+struct rfbi_timings {
-+	int cs_on_time;
-+	int cs_off_time;
-+	int we_on_time;
-+	int we_off_time;
-+	int re_on_time;
-+	int re_off_time;
-+	int we_cycle_time;
-+	int re_cycle_time;
-+	int cs_pulse_width;
-+	int access_time;
-+
-+	int clk_div;
-+
-+	u32 tim[5];             /* set by rfbi_convert_timings() */
-+
-+	int converted;
-+};
-+
-+void omap_rfbi_write_command(const void *buf, u32 len);
-+void omap_rfbi_read_data(void *buf, u32 len);
-+void omap_rfbi_write_data(const void *buf, u32 len);
-+void omap_rfbi_write_pixels(const void __iomem *buf, int scr_width,
-+		u16 x, u16 y,
-+		u16 w, u16 h);
-+int omap_rfbi_enable_te(bool enable, unsigned line);
-+int omap_rfbi_setup_te(enum omap_rfbi_te_mode mode,
-+			     unsigned hs_pulse_time, unsigned vs_pulse_time,
-+			     int hs_pol_inv, int vs_pol_inv, int extif_div);
-+
-+/* DSI */
-+void dsi_bus_lock(void);
-+void dsi_bus_unlock(void);
-+int dsi_vc_dcs_write(int channel, u8 *data, int len);
-+int dsi_vc_dcs_write_nosync(int channel, u8 *data, int len);
-+int dsi_vc_dcs_read(int channel, u8 dcs_cmd, u8 *buf, int buflen);
-+int dsi_vc_set_max_rx_packet_size(int channel, u16 len);
-+int dsi_vc_send_null(int channel);
-+int dsi_vc_send_bta_sync(int channel);
-+
-+/* Board specific data */
-+struct omap_dss_board_info {
-+	int (*get_last_off_on_transaction_id)(struct device *dev);
-+	int num_devices;
-+	struct omap_dss_device **devices;
-+	struct omap_dss_device *default_device;
-+};
-+
-+struct omap_video_timings {
-+	/* Unit: pixels */
-+	u16 x_res;
-+	/* Unit: pixels */
-+	u16 y_res;
-+	/* Unit: KHz */
-+	u32 pixel_clock;
-+	/* Unit: pixel clocks */
-+	u16 hsw;	/* Horizontal synchronization pulse width */
-+	/* Unit: pixel clocks */
-+	u16 hfp;	/* Horizontal front porch */
-+	/* Unit: pixel clocks */
-+	u16 hbp;	/* Horizontal back porch */
-+	/* Unit: line clocks */
-+	u16 vsw;	/* Vertical synchronization pulse width */
-+	/* Unit: line clocks */
-+	u16 vfp;	/* Vertical front porch */
-+	/* Unit: line clocks */
-+	u16 vbp;	/* Vertical back porch */
-+};
-+
-+#ifdef CONFIG_OMAP2_DSS_VENC
-+/* Hardcoded timings for tv modes. Venc only uses these to
-+ * identify the mode, and does not actually use the configs
-+ * itself. However, the configs should be something that
-+ * a normal monitor can also show */
-+const extern struct omap_video_timings omap_dss_pal_timings;
-+const extern struct omap_video_timings omap_dss_ntsc_timings;
-+#endif
-+
-+struct omap_overlay_info {
-+	bool enabled;
-+
-+	u32 paddr;
-+	void __iomem *vaddr;
-+	u16 screen_width;
-+	u16 width;
-+	u16 height;
-+	enum omap_color_mode color_mode;
-+	u8 rotation;
-+	enum omap_dss_rotation_type rotation_type;
-+	bool mirror;
-+
-+	u16 pos_x;
-+	u16 pos_y;
-+	u16 out_width;	/* if 0, out_width == width */
-+	u16 out_height;	/* if 0, out_height == height */
-+	u8 global_alpha;
-+};
-+
-+struct omap_overlay {
-+	struct kobject kobj;
-+	struct list_head list;
-+
-+	/* static fields */
-+	const char *name;
-+	int id;
-+	enum omap_color_mode supported_modes;
-+	enum omap_overlay_caps caps;
-+
-+	/* dynamic fields */
-+	struct omap_overlay_manager *manager;
-+	struct omap_overlay_info info;
-+
-+	/* if true, info has been changed, but not applied() yet */
-+	bool info_dirty;
-+
-+	int (*set_manager)(struct omap_overlay *ovl,
-+		struct omap_overlay_manager *mgr);
-+	int (*unset_manager)(struct omap_overlay *ovl);
-+
-+	int (*set_overlay_info)(struct omap_overlay *ovl,
-+			struct omap_overlay_info *info);
-+	void (*get_overlay_info)(struct omap_overlay *ovl,
-+			struct omap_overlay_info *info);
-+
-+	int (*wait_for_go)(struct omap_overlay *ovl);
-+};
-+
-+struct omap_overlay_manager_info {
-+	u32 default_color;
-+
-+	enum omap_dss_trans_key_type trans_key_type;
-+	u32 trans_key;
-+	bool trans_enabled;
-+
-+	bool alpha_enabled;
-+};
-+
-+struct omap_overlay_manager {
-+	struct kobject kobj;
-+	struct list_head list;
-+
-+	/* static fields */
-+	const char *name;
-+	int id;
-+	enum omap_overlay_manager_caps caps;
-+	int num_overlays;
-+	struct omap_overlay **overlays;
-+	enum omap_display_type supported_displays;
-+
-+	/* dynamic fields */
-+	struct omap_dss_device *device;
-+	struct omap_overlay_manager_info info;
-+
-+	bool device_changed;
-+	/* if true, info has been changed but not applied() yet */
-+	bool info_dirty;
-+
-+	int (*set_device)(struct omap_overlay_manager *mgr,
-+		struct omap_dss_device *dssdev);
-+	int (*unset_device)(struct omap_overlay_manager *mgr);
-+
-+	int (*set_manager_info)(struct omap_overlay_manager *mgr,
-+			struct omap_overlay_manager_info *info);
-+	void (*get_manager_info)(struct omap_overlay_manager *mgr,
-+			struct omap_overlay_manager_info *info);
-+
-+	int (*apply)(struct omap_overlay_manager *mgr);
-+	int (*wait_for_go)(struct omap_overlay_manager *mgr);
-+};
-+
-+struct omap_dss_device {
-+	struct device dev;
-+
-+	enum omap_display_type type;
-+
-+	union {
-+		struct {
-+			u8 data_lines;
-+		} dpi;
-+
-+		struct {
-+			u8 channel;
-+			u8 data_lines;
-+		} rfbi;
-+
-+		struct {
-+			u8 datapairs;
-+		} sdi;
-+
-+		struct {
-+			u8 clk_lane;
-+			u8 clk_pol;
-+			u8 data1_lane;
-+			u8 data1_pol;
-+			u8 data2_lane;
-+			u8 data2_pol;
-+			unsigned long lp_clk_hz;
-+			unsigned long ddr_clk_hz;
-+
-+			bool ext_te;
-+			u8 ext_te_gpio;
-+		} dsi;
-+
-+		struct {
-+			enum omap_dss_venc_type type;
-+			bool invert_polarity;
-+		} venc;
-+	} phy;
-+
-+	struct {
-+		struct omap_video_timings timings;
-+
-+		int acbi;	/* ac-bias pin transitions per interrupt */
-+		/* Unit: line clocks */
-+		int acb;	/* ac-bias pin frequency */
-+
-+		enum omap_panel_config config;
-+
-+		u8 recommended_bpp;
-+
-+		struct omap_dss_device *ctrl;
-+	} panel;
-+
-+	struct {
-+		u8 pixel_size;
-+		struct rfbi_timings rfbi_timings;
-+		struct omap_dss_device *panel;
-+	} ctrl;
-+
-+	int reset_gpio;
-+
-+	int max_backlight_level;
-+
-+	const char *name;
-+
-+	/* used to match device to driver */
-+	const char *driver_name;
-+
-+	void *data;
-+
-+	struct omap_dss_driver *driver;
-+
-+	/* helper variable for driver suspend/resume */
-+	bool activate_after_resume;
-+
-+	enum omap_display_caps caps;
-+
-+	struct omap_overlay_manager *manager;
-+
-+	enum omap_dss_display_state state;
-+
-+	int (*enable)(struct omap_dss_device *dssdev);
-+	void (*disable)(struct omap_dss_device *dssdev);
-+
-+	int (*suspend)(struct omap_dss_device *dssdev);
-+	int (*resume)(struct omap_dss_device *dssdev);
-+
-+	void (*get_resolution)(struct omap_dss_device *dssdev,
-+			u16 *xres, u16 *yres);
-+	int (*get_recommended_bpp)(struct omap_dss_device *dssdev);
-+
-+	int (*check_timings)(struct omap_dss_device *dssdev,
-+			struct omap_video_timings *timings);
-+	void (*set_timings)(struct omap_dss_device *dssdev,
-+			struct omap_video_timings *timings);
-+	void (*get_timings)(struct omap_dss_device *dssdev,
-+			struct omap_video_timings *timings);
-+	int (*update)(struct omap_dss_device *dssdev,
-+			       u16 x, u16 y, u16 w, u16 h);
-+	int (*sync)(struct omap_dss_device *dssdev);
-+	int (*wait_vsync)(struct omap_dss_device *dssdev);
-+
-+	int (*set_update_mode)(struct omap_dss_device *dssdev,
-+			enum omap_dss_update_mode);
-+	enum omap_dss_update_mode (*get_update_mode)
-+		(struct omap_dss_device *dssdev);
-+
-+	int (*enable_te)(struct omap_dss_device *dssdev, bool enable);
-+	int (*get_te)(struct omap_dss_device *dssdev);
-+
-+	u8 (*get_rotate)(struct omap_dss_device *dssdev);
-+	int (*set_rotate)(struct omap_dss_device *dssdev, u8 rotate);
-+
-+	bool (*get_mirror)(struct omap_dss_device *dssdev);
-+	int (*set_mirror)(struct omap_dss_device *dssdev, bool enable);
-+
-+	int (*run_test)(struct omap_dss_device *dssdev, int test);
-+	int (*memory_read)(struct omap_dss_device *dssdev,
-+			void *buf, size_t size,
-+			u16 x, u16 y, u16 w, u16 h);
-+
-+	int (*set_wss)(struct omap_dss_device *dssdev, u32 wss);
-+	u32 (*get_wss)(struct omap_dss_device *dssdev);
-+
-+	/* platform specific  */
-+	int (*platform_enable)(struct omap_dss_device *dssdev);
-+	void (*platform_disable)(struct omap_dss_device *dssdev);
-+	int (*set_backlight)(struct omap_dss_device *dssdev, int level);
-+	int (*get_backlight)(struct omap_dss_device *dssdev);
-+};
-+
-+struct omap_dss_driver {
-+	struct device_driver driver;
-+
-+	int (*probe)(struct omap_dss_device *);
-+	void (*remove)(struct omap_dss_device *);
-+
-+	int (*enable)(struct omap_dss_device *display);
-+	void (*disable)(struct omap_dss_device *display);
-+	int (*suspend)(struct omap_dss_device *display);
-+	int (*resume)(struct omap_dss_device *display);
-+	int (*run_test)(struct omap_dss_device *display, int test);
-+
-+	void (*setup_update)(struct omap_dss_device *dssdev,
-+			u16 x, u16 y, u16 w, u16 h);
-+
-+	int (*enable_te)(struct omap_dss_device *dssdev, bool enable);
-+	int (*wait_for_te)(struct omap_dss_device *dssdev);
-+
-+	u8 (*get_rotate)(struct omap_dss_device *dssdev);
-+	int (*set_rotate)(struct omap_dss_device *dssdev, u8 rotate);
-+
-+	bool (*get_mirror)(struct omap_dss_device *dssdev);
-+	int (*set_mirror)(struct omap_dss_device *dssdev, bool enable);
-+
-+	int (*memory_read)(struct omap_dss_device *dssdev,
-+			void *buf, size_t size,
-+			u16 x, u16 y, u16 w, u16 h);
-+};
-+
-+int omap_dss_register_driver(struct omap_dss_driver *);
-+void omap_dss_unregister_driver(struct omap_dss_driver *);
-+
-+int omap_dss_register_device(struct omap_dss_device *);
-+void omap_dss_unregister_device(struct omap_dss_device *);
-+
-+void omap_dss_get_device(struct omap_dss_device *dssdev);
-+void omap_dss_put_device(struct omap_dss_device *dssdev);
-+#define for_each_dss_dev(d) while ((d = omap_dss_get_next_device(d)) != NULL)
-+struct omap_dss_device *omap_dss_get_next_device(struct omap_dss_device *from);
-+struct omap_dss_device *omap_dss_find_device(void *data,
-+		int (*match)(struct omap_dss_device *dssdev, void *data));
-+
-+int omap_dss_start_device(struct omap_dss_device *dssdev);
-+void omap_dss_stop_device(struct omap_dss_device *dssdev);
-+
-+int omap_dss_get_num_overlay_managers(void);
-+struct omap_overlay_manager *omap_dss_get_overlay_manager(int num);
-+
-+int omap_dss_get_num_overlays(void);
-+struct omap_overlay *omap_dss_get_overlay(int num);
-+
-+typedef void (*omap_dispc_isr_t) (void *arg, u32 mask);
-+int omap_dispc_register_isr(omap_dispc_isr_t isr, void *arg, u32 mask);
-+int omap_dispc_unregister_isr(omap_dispc_isr_t isr, void *arg, u32 mask);
-+
-+int omap_dispc_wait_for_irq_timeout(u32 irqmask, unsigned long timeout);
-+int omap_dispc_wait_for_irq_interruptible_timeout(u32 irqmask,
-+		unsigned long timeout);
-+
-+#define to_dss_driver(x) container_of((x), struct omap_dss_driver, driver)
-+#define to_dss_device(x) container_of((x), struct omap_dss_device, dev)
-+
-+#endif
---- a/arch/arm/plat-omap/include/mach/omapfb.h
-+++ /dev/null
-@@ -1,398 +0,0 @@
--/*
-- * File: arch/arm/plat-omap/include/mach/omapfb.h
-- *
-- * Framebuffer driver for TI OMAP boards
-- *
-- * Copyright (C) 2004 Nokia Corporation
-- * Author: Imre Deak <imre.deak@nokia.com>
-- *
-- * 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.
-- *
-- * This program is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License along
-- * with this program; if not, write to the Free Software Foundation, Inc.,
-- * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-- */
--
--#ifndef __OMAPFB_H
--#define __OMAPFB_H
--
--#include <asm/ioctl.h>
--#include <asm/types.h>
--
--/* IOCTL commands. */
--
--#define OMAP_IOW(num, dtype)	_IOW('O', num, dtype)
--#define OMAP_IOR(num, dtype)	_IOR('O', num, dtype)
--#define OMAP_IOWR(num, dtype)	_IOWR('O', num, dtype)
--#define OMAP_IO(num)		_IO('O', num)
--
--#define OMAPFB_MIRROR		OMAP_IOW(31, int)
--#define OMAPFB_SYNC_GFX		OMAP_IO(37)
--#define OMAPFB_VSYNC		OMAP_IO(38)
--#define OMAPFB_SET_UPDATE_MODE	OMAP_IOW(40, int)
--#define OMAPFB_GET_CAPS		OMAP_IOR(42, struct omapfb_caps)
--#define OMAPFB_GET_UPDATE_MODE	OMAP_IOW(43, int)
--#define OMAPFB_LCD_TEST		OMAP_IOW(45, int)
--#define OMAPFB_CTRL_TEST	OMAP_IOW(46, int)
--#define OMAPFB_UPDATE_WINDOW_OLD OMAP_IOW(47, struct omapfb_update_window_old)
--#define OMAPFB_SET_COLOR_KEY	OMAP_IOW(50, struct omapfb_color_key)
--#define OMAPFB_GET_COLOR_KEY	OMAP_IOW(51, struct omapfb_color_key)
--#define OMAPFB_SETUP_PLANE	OMAP_IOW(52, struct omapfb_plane_info)
--#define OMAPFB_QUERY_PLANE	OMAP_IOW(53, struct omapfb_plane_info)
--#define OMAPFB_UPDATE_WINDOW	OMAP_IOW(54, struct omapfb_update_window)
--#define OMAPFB_SETUP_MEM	OMAP_IOW(55, struct omapfb_mem_info)
--#define OMAPFB_QUERY_MEM	OMAP_IOW(56, struct omapfb_mem_info)
--
--#define OMAPFB_CAPS_GENERIC_MASK	0x00000fff
--#define OMAPFB_CAPS_LCDC_MASK		0x00fff000
--#define OMAPFB_CAPS_PANEL_MASK		0xff000000
--
--#define OMAPFB_CAPS_MANUAL_UPDATE	0x00001000
--#define OMAPFB_CAPS_TEARSYNC		0x00002000
--#define OMAPFB_CAPS_PLANE_RELOCATE_MEM	0x00004000
--#define OMAPFB_CAPS_PLANE_SCALE		0x00008000
--#define OMAPFB_CAPS_WINDOW_PIXEL_DOUBLE	0x00010000
--#define OMAPFB_CAPS_WINDOW_SCALE	0x00020000
--#define OMAPFB_CAPS_WINDOW_OVERLAY	0x00040000
--#define OMAPFB_CAPS_WINDOW_ROTATE	0x00080000
--#define OMAPFB_CAPS_SET_BACKLIGHT	0x01000000
--
--/* Values from DSP must map to lower 16-bits */
--#define OMAPFB_FORMAT_MASK		0x00ff
--#define OMAPFB_FORMAT_FLAG_DOUBLE	0x0100
--#define OMAPFB_FORMAT_FLAG_TEARSYNC	0x0200
--#define OMAPFB_FORMAT_FLAG_FORCE_VSYNC	0x0400
--#define OMAPFB_FORMAT_FLAG_ENABLE_OVERLAY	0x0800
--#define OMAPFB_FORMAT_FLAG_DISABLE_OVERLAY	0x1000
--
--#define OMAPFB_EVENT_READY	1
--#define OMAPFB_EVENT_DISABLED	2
--
--#define OMAPFB_MEMTYPE_SDRAM		0
--#define OMAPFB_MEMTYPE_SRAM		1
--#define OMAPFB_MEMTYPE_MAX		1
--
--enum omapfb_color_format {
--	OMAPFB_COLOR_RGB565 = 0,
--	OMAPFB_COLOR_YUV422,
--	OMAPFB_COLOR_YUV420,
--	OMAPFB_COLOR_CLUT_8BPP,
--	OMAPFB_COLOR_CLUT_4BPP,
--	OMAPFB_COLOR_CLUT_2BPP,
--	OMAPFB_COLOR_CLUT_1BPP,
--	OMAPFB_COLOR_RGB444,
--	OMAPFB_COLOR_YUY422,
--};
--
--struct omapfb_update_window {
--	__u32 x, y;
--	__u32 width, height;
--	__u32 format;
--	__u32 out_x, out_y;
--	__u32 out_width, out_height;
--	__u32 reserved[8];
--};
--
--struct omapfb_update_window_old {
--	__u32 x, y;
--	__u32 width, height;
--	__u32 format;
--};
--
--enum omapfb_plane {
--	OMAPFB_PLANE_GFX = 0,
--	OMAPFB_PLANE_VID1,
--	OMAPFB_PLANE_VID2,
--};
--
--enum omapfb_channel_out {
--	OMAPFB_CHANNEL_OUT_LCD = 0,
--	OMAPFB_CHANNEL_OUT_DIGIT,
--};
--
--struct omapfb_plane_info {
--	__u32 pos_x;
--	__u32 pos_y;
--	__u8  enabled;
--	__u8  channel_out;
--	__u8  mirror;
--	__u8  reserved1;
--	__u32 out_width;
--	__u32 out_height;
--	__u32 reserved2[12];
--};
--
--struct omapfb_mem_info {
--	__u32 size;
--	__u8  type;
--	__u8  reserved[3];
--};
--
--struct omapfb_caps {
--	__u32 ctrl;
--	__u32 plane_color;
--	__u32 wnd_color;
--};
--
--enum omapfb_color_key_type {
--	OMAPFB_COLOR_KEY_DISABLED = 0,
--	OMAPFB_COLOR_KEY_GFX_DST,
--	OMAPFB_COLOR_KEY_VID_SRC,
--};
--
--struct omapfb_color_key {
--	__u8  channel_out;
--	__u32 background;
--	__u32 trans_key;
--	__u8  key_type;
--};
--
--enum omapfb_update_mode {
--	OMAPFB_UPDATE_DISABLED = 0,
--	OMAPFB_AUTO_UPDATE,
--	OMAPFB_MANUAL_UPDATE
--};
--
--#ifdef __KERNEL__
--
--#include <linux/completion.h>
--#include <linux/interrupt.h>
--#include <linux/fb.h>
--#include <linux/mutex.h>
--
--#include <mach/board.h>
--
--#define OMAP_LCDC_INV_VSYNC             0x0001
--#define OMAP_LCDC_INV_HSYNC             0x0002
--#define OMAP_LCDC_INV_PIX_CLOCK         0x0004
--#define OMAP_LCDC_INV_OUTPUT_EN         0x0008
--#define OMAP_LCDC_HSVS_RISING_EDGE      0x0010
--#define OMAP_LCDC_HSVS_OPPOSITE         0x0020
--
--#define OMAP_LCDC_SIGNAL_MASK		0x003f
--
--#define OMAP_LCDC_PANEL_TFT		0x0100
--
--#define OMAPFB_PLANE_XRES_MIN		8
--#define OMAPFB_PLANE_YRES_MIN		8
--
--#ifdef CONFIG_ARCH_OMAP1
--#define OMAPFB_PLANE_NUM		1
--#else
--#define OMAPFB_PLANE_NUM		3
--#endif
--
--struct omapfb_device;
--
--struct lcd_panel {
--	const char	*name;
--	int		config;		/* TFT/STN, signal inversion */
--	int		bpp;		/* Pixel format in fb mem */
--	int		data_lines;	/* Lines on LCD HW interface */
--
--	int		x_res, y_res;
--	int		pixel_clock;	/* In kHz */
--	int		hsw;		/* Horizontal synchronization
--					   pulse width */
--	int		hfp;		/* Horizontal front porch */
--	int		hbp;		/* Horizontal back porch */
--	int		vsw;		/* Vertical synchronization
--					   pulse width */
--	int		vfp;		/* Vertical front porch */
--	int		vbp;		/* Vertical back porch */
--	int		acb;		/* ac-bias pin frequency */
--	int		pcd;		/* pixel clock divider.
--					   Obsolete use pixel_clock instead */
--
--	int		(*init)		(struct lcd_panel *panel,
--					 struct omapfb_device *fbdev);
--	void		(*cleanup)	(struct lcd_panel *panel);
--	int		(*enable)	(struct lcd_panel *panel);
--	void		(*disable)	(struct lcd_panel *panel);
--	unsigned long	(*get_caps)	(struct lcd_panel *panel);
--	int		(*set_bklight_level)(struct lcd_panel *panel,
--					     unsigned int level);
--	unsigned int	(*get_bklight_level)(struct lcd_panel *panel);
--	unsigned int	(*get_bklight_max)  (struct lcd_panel *panel);
--	int		(*run_test)	(struct lcd_panel *panel, int test_num);
--};
--
--struct extif_timings {
--	int cs_on_time;
--	int cs_off_time;
--	int we_on_time;
--	int we_off_time;
--	int re_on_time;
--	int re_off_time;
--	int we_cycle_time;
--	int re_cycle_time;
--	int cs_pulse_width;
--	int access_time;
--
--	int clk_div;
--
--	u32 tim[5];		/* set by extif->convert_timings */
--
--	int converted;
--};
--
--struct lcd_ctrl_extif {
--	int  (*init)		(struct omapfb_device *fbdev);
--	void (*cleanup)		(void);
--	void (*get_clk_info)	(u32 *clk_period, u32 *max_clk_div);
--	unsigned long (*get_max_tx_rate)(void);
--	int  (*convert_timings)	(struct extif_timings *timings);
--	void (*set_timings)	(const struct extif_timings *timings);
--	void (*set_bits_per_cycle)(int bpc);
--	void (*write_command)	(const void *buf, unsigned int len);
--	void (*read_data)	(void *buf, unsigned int len);
--	void (*write_data)	(const void *buf, unsigned int len);
--	void (*transfer_area)	(int width, int height,
--				 void (callback)(void * data), void *data);
--	int  (*setup_tearsync)	(unsigned pin_cnt,
--				 unsigned hs_pulse_time, unsigned vs_pulse_time,
--				 int hs_pol_inv, int vs_pol_inv, int div);
--	int  (*enable_tearsync) (int enable, unsigned line);
--
--	unsigned long		max_transmit_size;
--};
--
--struct omapfb_notifier_block {
--	struct notifier_block	nb;
--	void			*data;
--	int			plane_idx;
--};
--
--typedef int (*omapfb_notifier_callback_t)(struct notifier_block *,
--					  unsigned long event,
--					  void *fbi);
--
--struct omapfb_mem_region {
--	u32		paddr;
--	void __iomem	*vaddr;
--	unsigned long	size;
--	u8		type;		/* OMAPFB_PLANE_MEM_* */
--	unsigned	alloc:1;	/* allocated by the driver */
--	unsigned	map:1;		/* kernel mapped by the driver */
--};
--
--struct omapfb_mem_desc {
--	int				region_cnt;
--	struct omapfb_mem_region	region[OMAPFB_PLANE_NUM];
--};
--
--struct lcd_ctrl {
--	const char	*name;
--	void		*data;
--
--	int		(*init)		  (struct omapfb_device *fbdev,
--					   int ext_mode,
--					   struct omapfb_mem_desc *req_md);
--	void		(*cleanup)	  (void);
--	void		(*bind_client)	  (struct omapfb_notifier_block *nb);
--	void		(*get_caps)	  (int plane, struct omapfb_caps *caps);
--	int		(*set_update_mode)(enum omapfb_update_mode mode);
--	enum omapfb_update_mode (*get_update_mode)(void);
--	int		(*setup_plane)	  (int plane, int channel_out,
--					   unsigned long offset,
--					   int screen_width,
--					   int pos_x, int pos_y, int width,
--					   int height, int color_mode);
--	int		(*set_rotate)	  (int angle);
--	int		(*setup_mem)	  (int plane, size_t size,
--					   int mem_type, unsigned long *paddr);
--	int		(*mmap)		  (struct fb_info *info,
--					   struct vm_area_struct *vma);
--	int		(*set_scale)	  (int plane,
--					   int orig_width, int orig_height,
--					   int out_width, int out_height);
--	int		(*enable_plane)	  (int plane, int enable);
--	int		(*update_window)  (struct fb_info *fbi,
--					   struct omapfb_update_window *win,
--					   void (*callback)(void *),
--					   void *callback_data);
--	void		(*sync)		  (void);
--	void		(*suspend)	  (void);
--	void		(*resume)	  (void);
--	int		(*run_test)	  (int test_num);
--	int		(*setcolreg)	  (u_int regno, u16 red, u16 green,
--					   u16 blue, u16 transp,
--					   int update_hw_mem);
--	int		(*set_color_key)  (struct omapfb_color_key *ck);
--	int		(*get_color_key)  (struct omapfb_color_key *ck);
--};
--
--enum omapfb_state {
--	OMAPFB_DISABLED	= 0,
--	OMAPFB_SUSPENDED= 99,
--	OMAPFB_ACTIVE	= 100
--};
--
--struct omapfb_plane_struct {
--	int				idx;
--	struct omapfb_plane_info	info;
--	enum omapfb_color_format	color_mode;
--	struct omapfb_device		*fbdev;
--};
--
--struct omapfb_device {
--	int			state;
--	int                     ext_lcdc;               /* Using external
--                                                           LCD controller */
--	struct mutex		rqueue_mutex;
--
--	int			palette_size;
--	u32			pseudo_palette[17];
--
--	struct lcd_panel	*panel;			/* LCD panel */
--	const struct lcd_ctrl	*ctrl;			/* LCD controller */
--	const struct lcd_ctrl	*int_ctrl;		/* internal LCD ctrl */
--	struct lcd_ctrl_extif	*ext_if;		/* LCD ctrl external
--							   interface */
--	struct device		*dev;
--	struct fb_var_screeninfo	new_var;	/* for mode changes */
--
--	struct omapfb_mem_desc		mem_desc;
--	struct fb_info			*fb_info[OMAPFB_PLANE_NUM];
--};
--
--struct omapfb_platform_data {
--	struct omap_lcd_config		lcd;
--	struct omapfb_mem_desc		mem_desc;
--	void				*ctrl_platform_data;
--};
--
--#ifdef CONFIG_ARCH_OMAP1
--extern struct lcd_ctrl omap1_lcd_ctrl;
--#else
--extern struct lcd_ctrl omap2_disp_ctrl;
--#endif
--
--extern void omapfb_reserve_sdram(void);
--extern void omapfb_register_panel(struct lcd_panel *panel);
--extern void omapfb_write_first_pixel(struct omapfb_device *fbdev, u16 pixval);
--extern void omapfb_notify_clients(struct omapfb_device *fbdev,
--				  unsigned long event);
--extern int  omapfb_register_client(struct omapfb_notifier_block *nb,
--				   omapfb_notifier_callback_t callback,
--				   void *callback_data);
--extern int  omapfb_unregister_client(struct omapfb_notifier_block *nb);
--extern int  omapfb_update_window_async(struct fb_info *fbi,
--				       struct omapfb_update_window *win,
--				       void (*callback)(void *),
--				       void *callback_data);
--
--/* in arch/arm/plat-omap/fb.c */
--extern void omapfb_set_ctrl_platform_data(void *pdata);
--
--#endif /* __KERNEL__ */
--
--#endif /* __OMAPFB_H */
---- a/arch/arm/plat-omap/include/mach/sdrc.h
-+++ b/arch/arm/plat-omap/include/mach/sdrc.h
-@@ -88,7 +88,10 @@
- 
- /* SMS register offsets - read/write with sms_{read,write}_reg() */
- 
--#define SMS_SYSCONFIG		0x010
-+#define SMS_SYSCONFIG			0x010
-+#define SMS_ROT_CONTROL(context)	(0x180 + 0x10 * context)
-+#define SMS_ROT_SIZE(context)		(0x184 + 0x10 * context)
-+#define SMS_ROT_PHYSICAL_BA(context)	(0x188 + 0x10 * context)
- /* REVISIT: fill in other SMS registers here */
- 
- 
-@@ -121,6 +124,10 @@ int omap2_sdrc_get_params(unsigned long 
- 			  struct omap_sdrc_params **sdrc_cs0,
- 			  struct omap_sdrc_params **sdrc_cs1);
- 
-+void omap2_sms_write_rot_control(u32 val, unsigned ctx);
-+void omap2_sms_write_rot_size(u32 val, unsigned ctx);
-+void omap2_sms_write_rot_physical_ba(u32 val, unsigned ctx);
-+
- #ifdef CONFIG_ARCH_OMAP2
- 
- struct memory_timings {
---- /dev/null
-+++ b/arch/arm/plat-omap/include/mach/vram.h
-@@ -0,0 +1,63 @@
-+/*
-+ * VRAM manager for OMAP
-+ *
-+ * Copyright (C) 2009 Nokia Corporation
-+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.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.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along
-+ * with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+ */
-+
-+#ifndef __OMAP_VRAM_H__
-+#define __OMAP_VRAM_H__
-+
-+#include <linux/autoconf.h>
-+#include <linux/types.h>
-+
-+#define OMAP_VRAM_MEMTYPE_SDRAM		0
-+#define OMAP_VRAM_MEMTYPE_SRAM		1
-+#define OMAP_VRAM_MEMTYPE_MAX		1
-+
-+extern int omap_vram_add_region(unsigned long paddr, size_t size);
-+extern int omap_vram_free(unsigned long paddr, size_t size);
-+extern int omap_vram_alloc(int mtype, size_t size, unsigned long *paddr);
-+extern int omap_vram_reserve(unsigned long paddr, size_t size);
-+extern void omap_vram_get_info(unsigned long *vram, unsigned long *free_vram,
-+		unsigned long *largest_free_block);
-+
-+#ifdef CONFIG_OMAP2_VRAM
-+extern void omap_vram_set_sdram_vram(u32 size, u32 start);
-+extern void omap_vram_set_sram_vram(u32 size, u32 start);
-+
-+extern void omap_vram_reserve_sdram(void);
-+extern unsigned long omap_vram_reserve_sram(unsigned long sram_pstart,
-+					    unsigned long sram_vstart,
-+					    unsigned long sram_size,
-+					    unsigned long pstart_avail,
-+					    unsigned long size_avail);
-+#else
-+static inline void omap_vram_set_sdram_vram(u32 size, u32 start) { }
-+static inline void omap_vram_set_sram_vram(u32 size, u32 start) { }
-+
-+static inline void omap_vram_reserve_sdram(void) { }
-+static inline unsigned long omap_vram_reserve_sram(unsigned long sram_pstart,
-+					    unsigned long sram_vstart,
-+					    unsigned long sram_size,
-+					    unsigned long pstart_avail,
-+					    unsigned long size_avail)
-+{
-+	return 0;
-+}
-+#endif
-+
-+#endif
---- /dev/null
-+++ b/arch/arm/plat-omap/include/mach/vrfb.h
-@@ -0,0 +1,46 @@
-+/*
-+ * VRFB Rotation Engine
-+ *
-+ * Copyright (C) 2009 Nokia Corporation
-+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.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.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along
-+ * with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+ */
-+
-+#ifndef __OMAP_VRFB_H__
-+#define __OMAP_VRFB_H__
-+
-+#define OMAP_VRFB_LINE_LEN 2048
-+
-+struct vrfb {
-+	u8 context;
-+	void __iomem *vaddr[4];
-+	unsigned long paddr[4];
-+	u16 xoffset;
-+	u16 yoffset;
-+	u8 bytespp;
-+};
-+
-+extern int omap_vrfb_request_ctx(struct vrfb *vrfb);
-+extern void omap_vrfb_release_ctx(struct vrfb *vrfb);
-+extern void omap_vrfb_suspend_ctx(struct vrfb *vrfb);
-+extern void omap_vrfb_resume_ctx(struct vrfb *vrfb);
-+extern void omap_vrfb_adjust_size(u16 *width, u16 *height,
-+		u8 bytespp);
-+extern void omap_vrfb_setup(struct vrfb *vrfb, unsigned long paddr,
-+		u16 width, u16 height,
-+		unsigned bytespp, bool yuv_mode);
-+extern void omap_vrfb_restore_context(void);
-+
-+#endif /* __VRFB_H */
---- a/arch/arm/plat-omap/sram.c
-+++ b/arch/arm/plat-omap/sram.c
-@@ -28,6 +28,7 @@
- #include <mach/sram.h>
- #include <mach/board.h>
- #include <mach/cpu.h>
-+#include <mach/vram.h>
- 
- #include <mach/control.h>
- 
-@@ -185,6 +186,13 @@ void __init omap_detect_sram(void)
- 				       omap_sram_start + SRAM_BOOTLOADER_SZ,
- 				       omap_sram_size - SRAM_BOOTLOADER_SZ);
- 	omap_sram_size -= reserved;
-+
-+	reserved = omap_vram_reserve_sram(omap_sram_start, omap_sram_base,
-+			omap_sram_size,
-+			omap_sram_start + SRAM_BOOTLOADER_SZ,
-+			omap_sram_size - SRAM_BOOTLOADER_SZ);
-+	omap_sram_size -= reserved;
-+
- 	omap_sram_ceil = omap_sram_base + omap_sram_size;
- }
- 
---- a/drivers/video/Kconfig
-+++ b/drivers/video/Kconfig
-@@ -2161,6 +2161,7 @@ config FB_BROADSHEET
- 	  a bridge adapter.
- 
- source "drivers/video/omap/Kconfig"
-+source "drivers/video/omap2/Kconfig"
- 
- source "drivers/video/backlight/Kconfig"
- source "drivers/video/display/Kconfig"
---- a/drivers/video/Makefile
-+++ b/drivers/video/Makefile
-@@ -124,6 +124,7 @@ obj-$(CONFIG_FB_SM501)            += sm5
- obj-$(CONFIG_FB_XILINX)           += xilinxfb.o
- obj-$(CONFIG_FB_SH_MOBILE_LCDC)	  += sh_mobile_lcdcfb.o
- obj-$(CONFIG_FB_OMAP)             += omap/
-+obj-y                             += omap2/
- obj-$(CONFIG_XEN_FBDEV_FRONTEND)  += xen-fbfront.o
- obj-$(CONFIG_FB_CARMINE)          += carminefb.o
- obj-$(CONFIG_FB_MB862XX)	  += mb862xx/
---- a/drivers/video/omap/Kconfig
-+++ b/drivers/video/omap/Kconfig
-@@ -1,6 +1,7 @@
- config FB_OMAP
- 	tristate "OMAP frame buffer support (EXPERIMENTAL)"
--	depends on FB && ARCH_OMAP
-+	depends on FB && ARCH_OMAP && (OMAP2_DSS = "n")
-+
- 	select FB_CFB_FILLRECT
- 	select FB_CFB_COPYAREA
- 	select FB_CFB_IMAGEBLIT
-@@ -72,7 +73,7 @@ config FB_OMAP_LCD_MIPID
- 
- config FB_OMAP_BOOTLOADER_INIT
- 	bool "Check bootloader initialization"
--	depends on FB_OMAP
-+	depends on FB_OMAP || FB_OMAP2
- 	help
- 	  Say Y here if you want to enable checking if the bootloader has
- 	  already initialized the display controller. In this case the
---- a/drivers/video/omap/blizzard.c
-+++ b/drivers/video/omap/blizzard.c
-@@ -27,9 +27,9 @@
- #include <linux/clk.h>
- 
- #include <mach/dma.h>
--#include <mach/omapfb.h>
- #include <mach/blizzard.h>
- 
-+#include "omapfb.h"
- #include "dispc.h"
- 
- #define MODULE_NAME				"blizzard"
---- a/drivers/video/omap/dispc.c
-+++ b/drivers/video/omap/dispc.c
-@@ -24,11 +24,12 @@
- #include <linux/vmalloc.h>
- #include <linux/clk.h>
- #include <linux/io.h>
-+#include <linux/platform_device.h>
- 
- #include <mach/sram.h>
--#include <mach/omapfb.h>
- #include <mach/board.h>
- 
-+#include "omapfb.h"
- #include "dispc.h"
- 
- #define MODULE_NAME			"dispc"
-@@ -188,6 +189,11 @@ static struct {
- 	struct omapfb_color_key	color_key;
- } dispc;
- 
-+static struct platform_device omapdss_device = {
-+	.name		= "omapdss",
-+	.id		= -1,
-+};
-+
- static void enable_lcd_clocks(int enable);
- 
- static void inline dispc_write_reg(int idx, u32 val)
-@@ -907,20 +913,20 @@ static irqreturn_t omap_dispc_irq_handle
- 
- static int get_dss_clocks(void)
- {
--	dispc.dss_ick = clk_get(dispc.fbdev->dev, "ick");
-+	dispc.dss_ick = clk_get(&omapdss_device.dev, "ick");
- 	if (IS_ERR(dispc.dss_ick)) {
- 		dev_err(dispc.fbdev->dev, "can't get ick\n");
- 		return PTR_ERR(dispc.dss_ick);
- 	}
- 
--	dispc.dss1_fck = clk_get(dispc.fbdev->dev, "dss1_fck");
-+	dispc.dss1_fck = clk_get(&omapdss_device.dev, "dss1_fck");
- 	if (IS_ERR(dispc.dss1_fck)) {
- 		dev_err(dispc.fbdev->dev, "can't get dss1_fck\n");
- 		clk_put(dispc.dss_ick);
- 		return PTR_ERR(dispc.dss1_fck);
- 	}
- 
--	dispc.dss_54m_fck = clk_get(dispc.fbdev->dev, "tv_fck");
-+	dispc.dss_54m_fck = clk_get(&omapdss_device.dev, "tv_fck");
- 	if (IS_ERR(dispc.dss_54m_fck)) {
- 		dev_err(dispc.fbdev->dev, "can't get tv_fck\n");
- 		clk_put(dispc.dss_ick);
-@@ -1371,6 +1377,12 @@ static int omap_dispc_init(struct omapfb
- 	int skip_init = 0;
- 	int i;
- 
-+	r = platform_device_register(&omapdss_device);
-+	if (r) {
-+		dev_err(fbdev->dev, "can't register omapdss device\n");
-+		return r;
-+	}
-+
- 	memset(&dispc, 0, sizeof(dispc));
- 
- 	dispc.base = ioremap(DISPC_BASE, SZ_1K);
-@@ -1508,6 +1520,7 @@ static void omap_dispc_cleanup(void)
- 	free_irq(INT_24XX_DSS_IRQ, dispc.fbdev);
- 	put_dss_clocks();
- 	iounmap(dispc.base);
-+	platform_device_unregister(&omapdss_device);
- }
- 
- const struct lcd_ctrl omap2_int_ctrl = {
---- a/drivers/video/omap/hwa742.c
-+++ b/drivers/video/omap/hwa742.c
-@@ -27,8 +27,8 @@
- #include <linux/clk.h>
- 
- #include <mach/dma.h>
--#include <mach/omapfb.h>
- #include <mach/hwa742.h>
-+#include "omapfb.h"
- 
- #define HWA742_REV_CODE_REG       0x0
- #define HWA742_CONFIG_REG         0x2
---- a/drivers/video/omap/lcd_2430sdp.c
-+++ b/drivers/video/omap/lcd_2430sdp.c
-@@ -28,9 +28,10 @@
- #include <linux/i2c/twl4030.h>
- 
- #include <mach/mux.h>
--#include <mach/omapfb.h>
- #include <asm/mach-types.h>
- 
-+#include "omapfb.h"
-+
- #define SDP2430_LCD_PANEL_BACKLIGHT_GPIO	91
- #define SDP2430_LCD_PANEL_ENABLE_GPIO		154
- #define SDP3430_LCD_PANEL_BACKLIGHT_GPIO	24
---- a/drivers/video/omap/lcd_ams_delta.c
-+++ b/drivers/video/omap/lcd_ams_delta.c
-@@ -27,7 +27,8 @@
- 
- #include <mach/board-ams-delta.h>
- #include <mach/hardware.h>
--#include <mach/omapfb.h>
-+
-+#include "omapfb.h"
- 
- #define AMS_DELTA_DEFAULT_CONTRAST	112
- 
---- a/drivers/video/omap/lcd_apollon.c
-+++ b/drivers/video/omap/lcd_apollon.c
-@@ -26,7 +26,8 @@
- 
- #include <mach/gpio.h>
- #include <mach/mux.h>
--#include <mach/omapfb.h>
-+
-+#include "omapfb.h"
- 
- /* #define USE_35INCH_LCD 1 */
- 
---- a/drivers/video/omap/lcd_h3.c
-+++ b/drivers/video/omap/lcd_h3.c
-@@ -24,7 +24,7 @@
- #include <linux/i2c/tps65010.h>
- 
- #include <mach/gpio.h>
--#include <mach/omapfb.h>
-+#include "omapfb.h"
- 
- #define MODULE_NAME	"omapfb-lcd_h3"
- 
---- a/drivers/video/omap/lcd_h4.c
-+++ b/drivers/video/omap/lcd_h4.c
-@@ -22,7 +22,7 @@
- #include <linux/module.h>
- #include <linux/platform_device.h>
- 
--#include <mach/omapfb.h>
-+#include "omapfb.h"
- 
- static int h4_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev)
- {
---- a/drivers/video/omap/lcd_inn1510.c
-+++ b/drivers/video/omap/lcd_inn1510.c
-@@ -24,7 +24,7 @@
- #include <linux/io.h>
- 
- #include <mach/fpga.h>
--#include <mach/omapfb.h>
-+#include "omapfb.h"
- 
- static int innovator1510_panel_init(struct lcd_panel *panel,
- 				    struct omapfb_device *fbdev)
---- a/drivers/video/omap/lcd_inn1610.c
-+++ b/drivers/video/omap/lcd_inn1610.c
-@@ -23,7 +23,7 @@
- #include <linux/platform_device.h>
- 
- #include <mach/gpio.h>
--#include <mach/omapfb.h>
-+#include "omapfb.h"
- 
- #define MODULE_NAME	"omapfb-lcd_h3"
- 
---- a/drivers/video/omap/lcd_ldp.c
-+++ b/drivers/video/omap/lcd_ldp.c
-@@ -28,9 +28,10 @@
- 
- #include <mach/gpio.h>
- #include <mach/mux.h>
--#include <mach/omapfb.h>
- #include <asm/mach-types.h>
- 
-+#include "omapfb.h"
-+
- #define LCD_PANEL_BACKLIGHT_GPIO	(15 + OMAP_MAX_GPIO_LINES)
- #define LCD_PANEL_ENABLE_GPIO		(7 + OMAP_MAX_GPIO_LINES)
- 
---- a/drivers/video/omap/lcd_mipid.c
-+++ b/drivers/video/omap/lcd_mipid.c
-@@ -23,9 +23,10 @@
- #include <linux/workqueue.h>
- #include <linux/spi/spi.h>
- 
--#include <mach/omapfb.h>
- #include <mach/lcd_mipid.h>
- 
-+#include "omapfb.h"
-+
- #define MIPID_MODULE_NAME		"lcd_mipid"
- 
- #define MIPID_CMD_READ_DISP_ID		0x04
---- a/drivers/video/omap/lcd_omap2evm.c
-+++ b/drivers/video/omap/lcd_omap2evm.c
-@@ -27,9 +27,10 @@
- #include <linux/i2c/twl4030.h>
- 
- #include <mach/mux.h>
--#include <mach/omapfb.h>
- #include <asm/mach-types.h>
- 
-+#include "omapfb.h"
-+
- #define LCD_PANEL_ENABLE_GPIO	154
- #define LCD_PANEL_LR		128
- #define LCD_PANEL_UD		129
---- a/drivers/video/omap/lcd_omap3beagle.c
-+++ b/drivers/video/omap/lcd_omap3beagle.c
-@@ -26,9 +26,10 @@
- #include <linux/i2c/twl4030.h>
- 
- #include <mach/mux.h>
--#include <mach/omapfb.h>
- #include <asm/mach-types.h>
- 
-+#include "omapfb.h"
-+
- #define LCD_PANEL_ENABLE_GPIO       170
- 
- static int omap3beagle_panel_init(struct lcd_panel *panel,
---- a/drivers/video/omap/lcd_omap3evm.c
-+++ b/drivers/video/omap/lcd_omap3evm.c
-@@ -26,9 +26,10 @@
- #include <linux/i2c/twl4030.h>
- 
- #include <mach/mux.h>
--#include <mach/omapfb.h>
- #include <asm/mach-types.h>
- 
-+#include "omapfb.h"
-+
- #define LCD_PANEL_ENABLE_GPIO       153
- #define LCD_PANEL_LR                2
- #define LCD_PANEL_UD                3
---- a/drivers/video/omap/lcd_osk.c
-+++ b/drivers/video/omap/lcd_osk.c
-@@ -25,7 +25,7 @@
- 
- #include <mach/gpio.h>
- #include <mach/mux.h>
--#include <mach/omapfb.h>
-+#include "omapfb.h"
- 
- static int osk_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev)
- {
---- a/drivers/video/omap/lcd_overo.c
-+++ b/drivers/video/omap/lcd_overo.c
-@@ -25,9 +25,10 @@
- 
- #include <mach/gpio.h>
- #include <mach/mux.h>
--#include <mach/omapfb.h>
- #include <asm/mach-types.h>
- 
-+#include "omapfb.h"
-+
- #define LCD_ENABLE       144
- 
- static int overo_panel_init(struct lcd_panel *panel,
---- a/drivers/video/omap/lcd_palmte.c
-+++ b/drivers/video/omap/lcd_palmte.c
-@@ -24,7 +24,7 @@
- #include <linux/io.h>
- 
- #include <mach/fpga.h>
--#include <mach/omapfb.h>
-+#include "omapfb.h"
- 
- static int palmte_panel_init(struct lcd_panel *panel,
- 				struct omapfb_device *fbdev)
---- a/drivers/video/omap/lcd_palmtt.c
-+++ b/drivers/video/omap/lcd_palmtt.c
-@@ -30,7 +30,7 @@ GPIO13 - screen blanking
- #include <linux/io.h>
- 
- #include <mach/gpio.h>
--#include <mach/omapfb.h>
-+#include "omapfb.h"
- 
- static int palmtt_panel_init(struct lcd_panel *panel,
- 	struct omapfb_device *fbdev)
---- a/drivers/video/omap/lcd_palmz71.c
-+++ b/drivers/video/omap/lcd_palmz71.c
-@@ -24,7 +24,7 @@
- #include <linux/platform_device.h>
- #include <linux/io.h>
- 
--#include <mach/omapfb.h>
-+#include "omapfb.h"
- 
- static int palmz71_panel_init(struct lcd_panel *panel,
- 			      struct omapfb_device *fbdev)
---- a/drivers/video/omap/lcdc.c
-+++ b/drivers/video/omap/lcdc.c
-@@ -30,10 +30,11 @@
- #include <linux/clk.h>
- 
- #include <mach/dma.h>
--#include <mach/omapfb.h>
- 
- #include <asm/mach-types.h>
- 
-+#include "omapfb.h"
-+
- #include "lcdc.h"
- 
- #define MODULE_NAME			"lcdc"
---- /dev/null
-+++ b/drivers/video/omap/omapfb.h
-@@ -0,0 +1,227 @@
-+/*
-+ * File: drivers/video/omap/omapfb.h
-+ *
-+ * Framebuffer driver for TI OMAP boards
-+ *
-+ * Copyright (C) 2004 Nokia Corporation
-+ * Author: Imre Deak <imre.deak@nokia.com>
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along
-+ * with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+ */
-+
-+#ifndef __OMAPFB_H
-+#define __OMAPFB_H
-+
-+#include <linux/fb.h>
-+#include <linux/mutex.h>
-+#include <linux/omapfb.h>
-+
-+#define OMAPFB_EVENT_READY	1
-+#define OMAPFB_EVENT_DISABLED	2
-+
-+#define OMAP_LCDC_INV_VSYNC             0x0001
-+#define OMAP_LCDC_INV_HSYNC             0x0002
-+#define OMAP_LCDC_INV_PIX_CLOCK         0x0004
-+#define OMAP_LCDC_INV_OUTPUT_EN         0x0008
-+#define OMAP_LCDC_HSVS_RISING_EDGE      0x0010
-+#define OMAP_LCDC_HSVS_OPPOSITE         0x0020
-+
-+#define OMAP_LCDC_SIGNAL_MASK		0x003f
-+
-+#define OMAP_LCDC_PANEL_TFT		0x0100
-+
-+#define OMAPFB_PLANE_XRES_MIN		8
-+#define OMAPFB_PLANE_YRES_MIN		8
-+
-+struct omapfb_device;
-+
-+struct lcd_panel {
-+	const char	*name;
-+	int		config;		/* TFT/STN, signal inversion */
-+	int		bpp;		/* Pixel format in fb mem */
-+	int		data_lines;	/* Lines on LCD HW interface */
-+
-+	int		x_res, y_res;
-+	int		pixel_clock;	/* In kHz */
-+	int		hsw;		/* Horizontal synchronization
-+					   pulse width */
-+	int		hfp;		/* Horizontal front porch */
-+	int		hbp;		/* Horizontal back porch */
-+	int		vsw;		/* Vertical synchronization
-+					   pulse width */
-+	int		vfp;		/* Vertical front porch */
-+	int		vbp;		/* Vertical back porch */
-+	int		acb;		/* ac-bias pin frequency */
-+	int		pcd;		/* pixel clock divider.
-+					   Obsolete use pixel_clock instead */
-+
-+	int		(*init)		(struct lcd_panel *panel,
-+					 struct omapfb_device *fbdev);
-+	void		(*cleanup)	(struct lcd_panel *panel);
-+	int		(*enable)	(struct lcd_panel *panel);
-+	void		(*disable)	(struct lcd_panel *panel);
-+	unsigned long	(*get_caps)	(struct lcd_panel *panel);
-+	int		(*set_bklight_level)(struct lcd_panel *panel,
-+					     unsigned int level);
-+	unsigned int	(*get_bklight_level)(struct lcd_panel *panel);
-+	unsigned int	(*get_bklight_max)  (struct lcd_panel *panel);
-+	int		(*run_test)	(struct lcd_panel *panel, int test_num);
-+};
-+
-+struct extif_timings {
-+	int cs_on_time;
-+	int cs_off_time;
-+	int we_on_time;
-+	int we_off_time;
-+	int re_on_time;
-+	int re_off_time;
-+	int we_cycle_time;
-+	int re_cycle_time;
-+	int cs_pulse_width;
-+	int access_time;
-+
-+	int clk_div;
-+
-+	u32 tim[5];		/* set by extif->convert_timings */
-+
-+	int converted;
-+};
-+
-+struct lcd_ctrl_extif {
-+	int  (*init)		(struct omapfb_device *fbdev);
-+	void (*cleanup)		(void);
-+	void (*get_clk_info)	(u32 *clk_period, u32 *max_clk_div);
-+	unsigned long (*get_max_tx_rate)(void);
-+	int  (*convert_timings)	(struct extif_timings *timings);
-+	void (*set_timings)	(const struct extif_timings *timings);
-+	void (*set_bits_per_cycle)(int bpc);
-+	void (*write_command)	(const void *buf, unsigned int len);
-+	void (*read_data)	(void *buf, unsigned int len);
-+	void (*write_data)	(const void *buf, unsigned int len);
-+	void (*transfer_area)	(int width, int height,
-+				 void (callback)(void *data), void *data);
-+	int  (*setup_tearsync)	(unsigned pin_cnt,
-+				 unsigned hs_pulse_time, unsigned vs_pulse_time,
-+				 int hs_pol_inv, int vs_pol_inv, int div);
-+	int  (*enable_tearsync) (int enable, unsigned line);
-+
-+	unsigned long		max_transmit_size;
-+};
-+
-+struct omapfb_notifier_block {
-+	struct notifier_block	nb;
-+	void			*data;
-+	int			plane_idx;
-+};
-+
-+typedef int (*omapfb_notifier_callback_t)(struct notifier_block *,
-+					  unsigned long event,
-+					  void *fbi);
-+
-+struct lcd_ctrl {
-+	const char	*name;
-+	void		*data;
-+
-+	int		(*init)		  (struct omapfb_device *fbdev,
-+					   int ext_mode,
-+					   struct omapfb_mem_desc *req_md);
-+	void		(*cleanup)	  (void);
-+	void		(*bind_client)	  (struct omapfb_notifier_block *nb);
-+	void		(*get_caps)	  (int plane, struct omapfb_caps *caps);
-+	int		(*set_update_mode)(enum omapfb_update_mode mode);
-+	enum omapfb_update_mode (*get_update_mode)(void);
-+	int		(*setup_plane)	  (int plane, int channel_out,
-+					   unsigned long offset,
-+					   int screen_width,
-+					   int pos_x, int pos_y, int width,
-+					   int height, int color_mode);
-+	int		(*set_rotate)	  (int angle);
-+	int		(*setup_mem)	  (int plane, size_t size,
-+					   int mem_type, unsigned long *paddr);
-+	int		(*mmap)		  (struct fb_info *info,
-+					   struct vm_area_struct *vma);
-+	int		(*set_scale)	  (int plane,
-+					   int orig_width, int orig_height,
-+					   int out_width, int out_height);
-+	int		(*enable_plane)	  (int plane, int enable);
-+	int		(*update_window)  (struct fb_info *fbi,
-+					   struct omapfb_update_window *win,
-+					   void (*callback)(void *),
-+					   void *callback_data);
-+	void		(*sync)		  (void);
-+	void		(*suspend)	  (void);
-+	void		(*resume)	  (void);
-+	int		(*run_test)	  (int test_num);
-+	int		(*setcolreg)	  (u_int regno, u16 red, u16 green,
-+					   u16 blue, u16 transp,
-+					   int update_hw_mem);
-+	int		(*set_color_key)  (struct omapfb_color_key *ck);
-+	int		(*get_color_key)  (struct omapfb_color_key *ck);
-+};
-+
-+enum omapfb_state {
-+	OMAPFB_DISABLED		= 0,
-+	OMAPFB_SUSPENDED	= 99,
-+	OMAPFB_ACTIVE		= 100
-+};
-+
-+struct omapfb_plane_struct {
-+	int				idx;
-+	struct omapfb_plane_info	info;
-+	enum omapfb_color_format	color_mode;
-+	struct omapfb_device		*fbdev;
-+};
-+
-+struct omapfb_device {
-+	int			state;
-+	int                     ext_lcdc;		/* Using external
-+							   LCD controller */
-+	struct mutex		rqueue_mutex;
-+
-+	int			palette_size;
-+	u32			pseudo_palette[17];
-+
-+	struct lcd_panel	*panel;			/* LCD panel */
-+	const struct lcd_ctrl	*ctrl;			/* LCD controller */
-+	const struct lcd_ctrl	*int_ctrl;		/* internal LCD ctrl */
-+	struct lcd_ctrl_extif	*ext_if;		/* LCD ctrl external
-+							   interface */
-+	struct device		*dev;
-+	struct fb_var_screeninfo	new_var;	/* for mode changes */
-+
-+	struct omapfb_mem_desc		mem_desc;
-+	struct fb_info			*fb_info[OMAPFB_PLANE_NUM];
-+};
-+
-+#ifdef CONFIG_ARCH_OMAP1
-+extern struct lcd_ctrl omap1_lcd_ctrl;
-+#else
-+extern struct lcd_ctrl omap2_disp_ctrl;
-+#endif
-+
-+extern void omapfb_register_panel(struct lcd_panel *panel);
-+extern void omapfb_write_first_pixel(struct omapfb_device *fbdev, u16 pixval);
-+extern void omapfb_notify_clients(struct omapfb_device *fbdev,
-+				  unsigned long event);
-+extern int  omapfb_register_client(struct omapfb_notifier_block *nb,
-+				   omapfb_notifier_callback_t callback,
-+				   void *callback_data);
-+extern int  omapfb_unregister_client(struct omapfb_notifier_block *nb);
-+extern int  omapfb_update_window_async(struct fb_info *fbi,
-+				       struct omapfb_update_window *win,
-+				       void (*callback)(void *),
-+				       void *callback_data);
-+
-+#endif /* __OMAPFB_H */
---- a/drivers/video/omap/omapfb_main.c
-+++ b/drivers/video/omap/omapfb_main.c
-@@ -29,8 +29,8 @@
- #include <linux/uaccess.h>
- 
- #include <mach/dma.h>
--#include <mach/omapfb.h>
- 
-+#include "omapfb.h"
- #include "lcdc.h"
- #include "dispc.h"
- 
---- a/drivers/video/omap/rfbi.c
-+++ b/drivers/video/omap/rfbi.c
-@@ -27,8 +27,7 @@
- #include <linux/clk.h>
- #include <linux/io.h>
- 
--#include <mach/omapfb.h>
--
-+#include "omapfb.h"
- #include "dispc.h"
- 
- /* To work around an RFBI transfer rate limitation */
---- a/drivers/video/omap/sossi.c
-+++ b/drivers/video/omap/sossi.c
-@@ -25,8 +25,8 @@
- #include <linux/io.h>
- 
- #include <mach/dma.h>
--#include <mach/omapfb.h>
- 
-+#include "omapfb.h"
- #include "lcdc.h"
- 
- #define MODULE_NAME		"omapfb-sossi"
---- /dev/null
-+++ b/drivers/video/omap2/Kconfig
-@@ -0,0 +1,9 @@
-+config OMAP2_VRAM
-+	bool
-+
-+config OMAP2_VRFB
-+	bool
-+
-+source "drivers/video/omap2/dss/Kconfig"
-+source "drivers/video/omap2/omapfb/Kconfig"
-+source "drivers/video/omap2/displays/Kconfig"
---- /dev/null
-+++ b/drivers/video/omap2/Makefile
-@@ -0,0 +1,6 @@
-+obj-$(CONFIG_OMAP2_VRAM) += vram.o
-+obj-$(CONFIG_OMAP2_VRFB) += vrfb.o
-+
-+obj-y += dss/
-+obj-y += omapfb/
-+obj-y += displays/
---- /dev/null
-+++ b/drivers/video/omap2/displays/Kconfig
-@@ -0,0 +1,28 @@
-+menu "OMAP2/3 Display Device Drivers"
-+        depends on OMAP2_DSS
-+
-+config PANEL_GENERIC
-+        tristate "Generic Panel"
-+        help
-+	  Generic panel driver.
-+	  Used for DVI output for Beagle and OMAP3 SDP.
-+
-+config PANEL_SAMSUNG_LTE430WQ_F0C
-+        tristate "Samsung LTE430WQ-F0C LCD Panel"
-+        depends on OMAP2_DSS
-+        help
-+          LCD Panel used on Overo Palo43
-+
-+config PANEL_SHARP_LS037V7DW01
-+        tristate "Sharp LS037V7DW01 LCD Panel"
-+        depends on OMAP2_DSS
-+        help
-+          LCD Panel used in TI's SDP3430 and EVM boards
-+
-+config PANEL_TAAL
-+        tristate "Taal DSI Panel"
-+        depends on OMAP2_DSS_DSI
-+        help
-+          Taal DSI command mode panel from TPO.
-+
-+endmenu
---- /dev/null
-+++ b/drivers/video/omap2/displays/Makefile
-@@ -0,0 +1,5 @@
-+obj-$(CONFIG_PANEL_GENERIC) += panel-generic.o
-+obj-$(CONFIG_PANEL_SAMSUNG_LTE430WQ_F0C) += panel-samsung-lte430wq-f0c.o
-+obj-$(CONFIG_PANEL_SHARP_LS037V7DW01) += panel-sharp-ls037v7dw01.o
-+
-+obj-$(CONFIG_PANEL_TAAL) += panel-taal.o
---- /dev/null
-+++ b/drivers/video/omap2/displays/panel-generic.c
-@@ -0,0 +1,104 @@
-+/*
-+ * Generic panel support
-+ *
-+ * Copyright (C) 2008 Nokia Corporation
-+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.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.
-+ *
-+ * This program is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-+ * more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along with
-+ * this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/delay.h>
-+
-+#include <mach/display.h>
-+
-+static struct omap_video_timings generic_panel_timings = {
-+	/* 640 x 480 @ 60 Hz  Reduced blanking VESA CVT 0.31M3-R */
-+	.x_res		= 640,
-+	.y_res		= 480,
-+	.pixel_clock	= 23500,
-+	.hfp		= 48,
-+	.hsw		= 32,
-+	.hbp		= 80,
-+	.vfp		= 3,
-+	.vsw		= 4,
-+	.vbp		= 7,
-+};
-+
-+static int generic_panel_probe(struct omap_dss_device *dssdev)
-+{
-+	dssdev->panel.config = OMAP_DSS_LCD_TFT;
-+	dssdev->panel.timings = generic_panel_timings;
-+
-+	return 0;
-+}
-+
-+static void generic_panel_remove(struct omap_dss_device *dssdev)
-+{
-+}
-+
-+static int generic_panel_enable(struct omap_dss_device *dssdev)
-+{
-+	int r = 0;
-+
-+	if (dssdev->platform_enable)
-+		r = dssdev->platform_enable(dssdev);
-+
-+	return r;
-+}
-+
-+static void generic_panel_disable(struct omap_dss_device *dssdev)
-+{
-+	if (dssdev->platform_disable)
-+		dssdev->platform_disable(dssdev);
-+}
-+
-+static int generic_panel_suspend(struct omap_dss_device *dssdev)
-+{
-+	generic_panel_disable(dssdev);
-+	return 0;
-+}
-+
-+static int generic_panel_resume(struct omap_dss_device *dssdev)
-+{
-+	return generic_panel_enable(dssdev);
-+}
-+
-+static struct omap_dss_driver generic_driver = {
-+	.probe		= generic_panel_probe,
-+	.remove		= generic_panel_remove,
-+
-+	.enable		= generic_panel_enable,
-+	.disable	= generic_panel_disable,
-+	.suspend	= generic_panel_suspend,
-+	.resume		= generic_panel_resume,
-+
-+	.driver         = {
-+		.name   = "generic_panel",
-+		.owner  = THIS_MODULE,
-+	},
-+};
-+
-+static int __init generic_panel_drv_init(void)
-+{
-+	return omap_dss_register_driver(&generic_driver);
-+}
-+
-+static void __exit generic_panel_drv_exit(void)
-+{
-+	omap_dss_unregister_driver(&generic_driver);
-+}
-+
-+module_init(generic_panel_drv_init);
-+module_exit(generic_panel_drv_exit);
-+MODULE_LICENSE("GPL");
---- /dev/null
-+++ b/drivers/video/omap2/displays/panel-samsung-lte430wq-f0c.c
-@@ -0,0 +1,113 @@
-+/*
-+ * LCD panel driver for Samsung LTE430WQ-F0C
-+ *
-+ * Author: Steve Sakoman <steve@sakoman.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.
-+ *
-+ * This program is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-+ * more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along with
-+ * this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/delay.h>
-+
-+#include <mach/display.h>
-+
-+static struct omap_video_timings samsung_lte_timings = {
-+	.x_res = 480,
-+	.y_res = 272,
-+
-+	.pixel_clock	= 9200,
-+
-+	.hsw		= 41,
-+	.hfp		= 8,
-+	.hbp		= 45-41,
-+
-+	.vsw		= 10,
-+	.vfp		= 4,
-+	.vbp		= 12-10,
-+};
-+
-+static int samsung_lte_panel_probe(struct omap_dss_device *dssdev)
-+{
-+	dssdev->panel.config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
-+		OMAP_DSS_LCD_IHS;
-+	dssdev->panel.timings = samsung_lte_timings;
-+
-+	return 0;
-+}
-+
-+static void samsung_lte_panel_remove(struct omap_dss_device *dssdev)
-+{
-+}
-+
-+static int samsung_lte_panel_enable(struct omap_dss_device *dssdev)
-+{
-+	int r = 0;
-+
-+	/* wait couple of vsyncs until enabling the LCD */
-+	msleep(50);
-+
-+	if (dssdev->platform_enable)
-+		r = dssdev->platform_enable(dssdev);
-+
-+	return r;
-+}
-+
-+static void samsung_lte_panel_disable(struct omap_dss_device *dssdev)
-+{
-+	if (dssdev->platform_disable)
-+		dssdev->platform_disable(dssdev);
-+
-+	/* wait at least 5 vsyncs after disabling the LCD */
-+
-+	msleep(100);
-+}
-+
-+static int samsung_lte_panel_suspend(struct omap_dss_device *dssdev)
-+{
-+	samsung_lte_panel_disable(dssdev);
-+	return 0;
-+}
-+
-+static int samsung_lte_panel_resume(struct omap_dss_device *dssdev)
-+{
-+	return samsung_lte_panel_enable(dssdev);
-+}
-+
-+static struct omap_dss_driver samsung_lte_driver = {
-+	.probe		= samsung_lte_panel_probe,
-+	.remove		= samsung_lte_panel_remove,
-+
-+	.enable		= samsung_lte_panel_enable,
-+	.disable	= samsung_lte_panel_disable,
-+	.suspend	= samsung_lte_panel_suspend,
-+	.resume		= samsung_lte_panel_resume,
-+
-+	.driver         = {
-+		.name   = "samsung_lte_panel",
-+		.owner  = THIS_MODULE,
-+	},
-+};
-+
-+static int __init samsung_lte_panel_drv_init(void)
-+{
-+	return omap_dss_register_driver(&samsung_lte_driver);
-+}
-+
-+static void __exit samsung_lte_panel_drv_exit(void)
-+{
-+	omap_dss_unregister_driver(&samsung_lte_driver);
-+}
-+
-+module_init(samsung_lte_panel_drv_init);
-+module_exit(samsung_lte_panel_drv_exit);
-+MODULE_LICENSE("GPL");
---- /dev/null
-+++ b/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c
-@@ -0,0 +1,153 @@
-+/*
-+ * LCD panel driver for Sharp LS037V7DW01
-+ *
-+ * Copyright (C) 2008 Nokia Corporation
-+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.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.
-+ *
-+ * This program is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-+ * more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along with
-+ * this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/delay.h>
-+#include <linux/device.h>
-+#include <linux/regulator/consumer.h>
-+#include <linux/err.h>
-+
-+#include <mach/display.h>
-+
-+struct sharp_data {
-+	/* XXX This regulator should actually be in SDP board file, not here,
-+	 * as it doesn't actually power the LCD, but something else that
-+	 * affects the output to LCD (I think. Somebody clarify). It doesn't do
-+	 * harm here, as SDP is the only board using this currently */
-+	struct regulator *vdvi_reg;
-+};
-+
-+static struct omap_video_timings sharp_ls_timings = {
-+	.x_res = 480,
-+	.y_res = 640,
-+
-+	.pixel_clock	= 19200,
-+
-+	.hsw		= 2,
-+	.hfp		= 1,
-+	.hbp		= 28,
-+
-+	.vsw		= 1,
-+	.vfp		= 1,
-+	.vbp		= 1,
-+};
-+
-+static int sharp_ls_panel_probe(struct omap_dss_device *dssdev)
-+{
-+	struct sharp_data *sd;
-+
-+	dssdev->panel.config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
-+		OMAP_DSS_LCD_IHS;
-+	dssdev->panel.acb = 0x28;
-+	dssdev->panel.timings = sharp_ls_timings;
-+
-+	sd = kzalloc(sizeof(*sd), GFP_KERNEL);
-+	if (!sd)
-+		return -ENOMEM;
-+
-+	dev_set_drvdata(&dssdev->dev, sd);
-+
-+	sd->vdvi_reg = regulator_get(&dssdev->dev, "vdvi");
-+	if (IS_ERR(sd->vdvi_reg)) {
-+		kfree(sd);
-+		pr_err("failed to get VDVI regulator\n");
-+		return PTR_ERR(sd->vdvi_reg);
-+	}
-+
-+	return 0;
-+}
-+
-+static void sharp_ls_panel_remove(struct omap_dss_device *dssdev)
-+{
-+	struct sharp_data *sd = dev_get_drvdata(&dssdev->dev);
-+
-+	regulator_put(sd->vdvi_reg);
-+
-+	kfree(sd);
-+}
-+
-+static int sharp_ls_panel_enable(struct omap_dss_device *dssdev)
-+{
-+	struct sharp_data *sd = dev_get_drvdata(&dssdev->dev);
-+	int r = 0;
-+
-+	/* wait couple of vsyncs until enabling the LCD */
-+	msleep(50);
-+
-+	regulator_enable(sd->vdvi_reg);
-+
-+	if (dssdev->platform_enable)
-+		r = dssdev->platform_enable(dssdev);
-+
-+	return r;
-+}
-+
-+static void sharp_ls_panel_disable(struct omap_dss_device *dssdev)
-+{
-+	struct sharp_data *sd = dev_get_drvdata(&dssdev->dev);
-+
-+	if (dssdev->platform_disable)
-+		dssdev->platform_disable(dssdev);
-+
-+	regulator_disable(sd->vdvi_reg);
-+
-+	/* wait at least 5 vsyncs after disabling the LCD */
-+
-+	msleep(100);
-+}
-+
-+static int sharp_ls_panel_suspend(struct omap_dss_device *dssdev)
-+{
-+	sharp_ls_panel_disable(dssdev);
-+	return 0;
-+}
-+
-+static int sharp_ls_panel_resume(struct omap_dss_device *dssdev)
-+{
-+	return sharp_ls_panel_enable(dssdev);
-+}
-+
-+static struct omap_dss_driver sharp_ls_driver = {
-+	.probe		= sharp_ls_panel_probe,
-+	.remove		= sharp_ls_panel_remove,
-+
-+	.enable		= sharp_ls_panel_enable,
-+	.disable	= sharp_ls_panel_disable,
-+	.suspend	= sharp_ls_panel_suspend,
-+	.resume		= sharp_ls_panel_resume,
-+
-+	.driver         = {
-+		.name   = "sharp_ls_panel",
-+		.owner  = THIS_MODULE,
-+	},
-+};
-+
-+static int __init sharp_ls_panel_drv_init(void)
-+{
-+	return omap_dss_register_driver(&sharp_ls_driver);
-+}
-+
-+static void __exit sharp_ls_panel_drv_exit(void)
-+{
-+	omap_dss_unregister_driver(&sharp_ls_driver);
-+}
-+
-+module_init(sharp_ls_panel_drv_init);
-+module_exit(sharp_ls_panel_drv_exit);
-+MODULE_LICENSE("GPL");
---- /dev/null
-+++ b/drivers/video/omap2/displays/panel-taal.c
-@@ -0,0 +1,900 @@
-+/*
-+ * Taal DSI command mode panel
-+ *
-+ * Copyright (C) 2009 Nokia Corporation
-+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.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.
-+ *
-+ * This program is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-+ * more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along with
-+ * this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+/*#define DEBUG*/
-+
-+#include <linux/module.h>
-+#include <linux/delay.h>
-+#include <linux/err.h>
-+#include <linux/jiffies.h>
-+#include <linux/sched.h>
-+#include <linux/backlight.h>
-+#include <linux/fb.h>
-+#include <linux/interrupt.h>
-+#include <linux/gpio.h>
-+#include <linux/completion.h>
-+
-+#include <mach/display.h>
-+
-+/* DSI Virtual channel. Hardcoded for now. */
-+#define TCH 0
-+
-+#define DCS_READ_NUM_ERRORS	0x05
-+#define DCS_READ_POWER_MODE	0x0a
-+#define DCS_READ_MADCTL		0x0b
-+#define DCS_READ_PIXEL_FORMAT	0x0c
-+#define DCS_SLEEP_IN		0x10
-+#define DCS_SLEEP_OUT		0x11
-+#define DCS_DISPLAY_OFF		0x28
-+#define DCS_DISPLAY_ON		0x29
-+#define DCS_COLUMN_ADDR		0x2a
-+#define DCS_PAGE_ADDR		0x2b
-+#define DCS_MEMORY_WRITE	0x2c
-+#define DCS_TEAR_OFF		0x34
-+#define DCS_TEAR_ON		0x35
-+#define DCS_MEM_ACC_CTRL	0x36
-+#define DCS_PIXEL_FORMAT	0x3a
-+#define DCS_BRIGHTNESS		0x51
-+#define DCS_CTRL_DISPLAY	0x53
-+#define DCS_WRITE_CABC		0x55
-+#define DCS_READ_CABC		0x56
-+#define DCS_GET_ID1		0xda
-+#define DCS_GET_ID2		0xdb
-+#define DCS_GET_ID3		0xdc
-+
-+struct taal_data {
-+	struct backlight_device *bldev;
-+
-+	unsigned long	hw_guard_end;	/* next value of jiffies when we can
-+					 * issue the next sleep in/out command
-+					 */
-+	unsigned long	hw_guard_wait;	/* max guard time in jiffies */
-+
-+	struct omap_dss_device *dssdev;
-+
-+	bool enabled;
-+	u8 rotate;
-+	bool mirror;
-+
-+	bool te_enabled;
-+	bool use_ext_te;
-+	struct completion te_completion;
-+
-+	bool use_dsi_bl;
-+
-+	bool cabc_broken;
-+	unsigned cabc_mode;
-+
-+	bool intro_printed;
-+};
-+
-+static void hw_guard_start(struct taal_data *td, int guard_msec)
-+{
-+	td->hw_guard_wait = msecs_to_jiffies(guard_msec);
-+	td->hw_guard_end = jiffies + td->hw_guard_wait;
-+}
-+
-+static void hw_guard_wait(struct taal_data *td)
-+{
-+	unsigned long wait = td->hw_guard_end - jiffies;
-+
-+	if ((long)wait > 0 && wait <= td->hw_guard_wait) {
-+		set_current_state(TASK_UNINTERRUPTIBLE);
-+		schedule_timeout(wait);
-+	}
-+}
-+
-+static int taal_dcs_read_1(u8 dcs_cmd, u8 *data)
-+{
-+	int r;
-+	u8 buf[1];
-+
-+	r = dsi_vc_dcs_read(TCH, dcs_cmd, buf, 1);
-+
-+	if (r < 0)
-+		return r;
-+
-+	*data = buf[0];
-+
-+	return 0;
-+}
-+
-+static int taal_dcs_write_0(u8 dcs_cmd)
-+{
-+	return dsi_vc_dcs_write(TCH, &dcs_cmd, 1);
-+}
-+
-+static int taal_dcs_write_1(u8 dcs_cmd, u8 param)
-+{
-+	u8 buf[2];
-+	buf[0] = dcs_cmd;
-+	buf[1] = param;
-+	return dsi_vc_dcs_write(TCH, buf, 2);
-+}
-+
-+static int taal_sleep_in(struct taal_data *td)
-+
-+{
-+	u8 cmd;
-+	int r;
-+
-+	hw_guard_wait(td);
-+
-+	cmd = DCS_SLEEP_IN;
-+	r = dsi_vc_dcs_write_nosync(TCH, &cmd, 1);
-+	if (r)
-+		return r;
-+
-+	hw_guard_start(td, 120);
-+
-+	msleep(5);
-+
-+	return 0;
-+}
-+
-+static int taal_sleep_out(struct taal_data *td)
-+{
-+	int r;
-+
-+	hw_guard_wait(td);
-+
-+	r = taal_dcs_write_0(DCS_SLEEP_OUT);
-+	if (r)
-+		return r;
-+
-+	hw_guard_start(td, 120);
-+
-+	msleep(5);
-+
-+	return 0;
-+}
-+
-+static int taal_get_id(u8 *id1, u8 *id2, u8 *id3)
-+{
-+	int r;
-+
-+	r = taal_dcs_read_1(DCS_GET_ID1, id1);
-+	if (r)
-+		return r;
-+	r = taal_dcs_read_1(DCS_GET_ID2, id2);
-+	if (r)
-+		return r;
-+	r = taal_dcs_read_1(DCS_GET_ID3, id3);
-+	if (r)
-+		return r;
-+
-+	return 0;
-+}
-+
-+static int taal_set_addr_mode(u8 rotate, bool mirror)
-+{
-+	int r;
-+	u8 mode;
-+	int b5, b6, b7;
-+
-+	r = taal_dcs_read_1(DCS_READ_MADCTL, &mode);
-+	if (r)
-+		return r;
-+
-+	switch (rotate) {
-+	default:
-+	case 0:
-+		b7 = 0;
-+		b6 = 0;
-+		b5 = 0;
-+		break;
-+	case 1:
-+		b7 = 0;
-+		b6 = 1;
-+		b5 = 1;
-+		break;
-+	case 2:
-+		b7 = 1;
-+		b6 = 1;
-+		b5 = 0;
-+		break;
-+	case 3:
-+		b7 = 1;
-+		b6 = 0;
-+		b5 = 1;
-+		break;
-+	}
-+
-+	if (mirror)
-+		b6 = !b6;
-+
-+	mode &= ~((1<<7) | (1<<6) | (1<<5));
-+	mode |= (b7 << 7) | (b6 << 6) | (b5 << 5);
-+
-+	return taal_dcs_write_1(DCS_MEM_ACC_CTRL, mode);
-+}
-+
-+static int taal_set_update_window(u16 x, u16 y, u16 w, u16 h)
-+{
-+	int r;
-+	u16 x1 = x;
-+	u16 x2 = x + w - 1;
-+	u16 y1 = y;
-+	u16 y2 = y + h - 1;
-+
-+	u8 buf[5];
-+	buf[0] = DCS_COLUMN_ADDR;
-+	buf[1] = (x1 >> 8) & 0xff;
-+	buf[2] = (x1 >> 0) & 0xff;
-+	buf[3] = (x2 >> 8) & 0xff;
-+	buf[4] = (x2 >> 0) & 0xff;
-+
-+	r = dsi_vc_dcs_write_nosync(TCH, buf, sizeof(buf));
-+	if (r)
-+		return r;
-+
-+	buf[0] = DCS_PAGE_ADDR;
-+	buf[1] = (y1 >> 8) & 0xff;
-+	buf[2] = (y1 >> 0) & 0xff;
-+	buf[3] = (y2 >> 8) & 0xff;
-+	buf[4] = (y2 >> 0) & 0xff;
-+
-+	r = dsi_vc_dcs_write_nosync(TCH, buf, sizeof(buf));
-+	if (r)
-+		return r;
-+
-+	dsi_vc_send_bta_sync(TCH);
-+
-+	return r;
-+}
-+
-+static int taal_bl_update_status(struct backlight_device *dev)
-+{
-+	struct omap_dss_device *dssdev = dev_get_drvdata(&dev->dev);
-+	struct taal_data *td = dev_get_drvdata(&dssdev->dev);
-+	int r;
-+	int level;
-+
-+	if (dev->props.fb_blank == FB_BLANK_UNBLANK &&
-+			dev->props.power == FB_BLANK_UNBLANK)
-+		level = dev->props.brightness;
-+	else
-+		level = 0;
-+
-+	dev_dbg(&dssdev->dev, "update brightness to %d\n", level);
-+
-+	if (td->use_dsi_bl) {
-+		if (td->enabled) {
-+			dsi_bus_lock();
-+			r = taal_dcs_write_1(DCS_BRIGHTNESS, level);
-+			dsi_bus_unlock();
-+			if (r)
-+				return r;
-+		}
-+	} else {
-+		if (!dssdev->set_backlight)
-+			return -EINVAL;
-+
-+		r = dssdev->set_backlight(dssdev, level);
-+		if (r)
-+			return r;
-+	}
-+
-+	return 0;
-+}
-+
-+static int taal_bl_get_intensity(struct backlight_device *dev)
-+{
-+	if (dev->props.fb_blank == FB_BLANK_UNBLANK &&
-+			dev->props.power == FB_BLANK_UNBLANK)
-+		return dev->props.brightness;
-+
-+	return 0;
-+}
-+
-+static struct backlight_ops taal_bl_ops = {
-+	.get_brightness = taal_bl_get_intensity,
-+	.update_status  = taal_bl_update_status,
-+};
-+
-+static void taal_get_timings(struct omap_dss_device *dssdev,
-+			struct omap_video_timings *timings)
-+{
-+	*timings = dssdev->panel.timings;
-+}
-+
-+static void taal_get_resolution(struct omap_dss_device *dssdev,
-+		u16 *xres, u16 *yres)
-+{
-+	struct taal_data *td = dev_get_drvdata(&dssdev->dev);
-+
-+	if (td->rotate == 0 || td->rotate == 2) {
-+		*xres = dssdev->panel.timings.x_res;
-+		*yres = dssdev->panel.timings.y_res;
-+	} else {
-+		*yres = dssdev->panel.timings.x_res;
-+		*xres = dssdev->panel.timings.y_res;
-+	}
-+}
-+
-+static irqreturn_t taal_te_isr(int irq, void *data)
-+{
-+	struct omap_dss_device *dssdev = data;
-+	struct taal_data *td = dev_get_drvdata(&dssdev->dev);
-+
-+	complete_all(&td->te_completion);
-+
-+	return IRQ_HANDLED;
-+}
-+
-+static ssize_t taal_num_errors_show(struct device *dev,
-+		struct device_attribute *attr, char *buf)
-+{
-+	struct omap_dss_device *dssdev = to_dss_device(dev);
-+	struct taal_data *td = dev_get_drvdata(&dssdev->dev);
-+	u8 errors;
-+	int r;
-+
-+	if (td->enabled) {
-+		dsi_bus_lock();
-+		r = taal_dcs_read_1(DCS_READ_NUM_ERRORS, &errors);
-+		dsi_bus_unlock();
-+	} else {
-+		r = -ENODEV;
-+	}
-+
-+	if (r)
-+		return r;
-+
-+	return snprintf(buf, PAGE_SIZE, "%d\n", errors);
-+}
-+
-+static ssize_t taal_hw_revision_show(struct device *dev,
-+		struct device_attribute *attr, char *buf)
-+{
-+	struct omap_dss_device *dssdev = to_dss_device(dev);
-+	struct taal_data *td = dev_get_drvdata(&dssdev->dev);
-+	u8 id1, id2, id3;
-+	int r;
-+
-+	if (td->enabled) {
-+		dsi_bus_lock();
-+		r = taal_get_id(&id1, &id2, &id3);
-+		dsi_bus_unlock();
-+	} else {
-+		r = -ENODEV;
-+	}
-+
-+	if (r)
-+		return r;
-+
-+	return snprintf(buf, PAGE_SIZE, "%02x.%02x.%02x\n", id1, id2, id3);
-+}
-+
-+static const char *cabc_modes[] = {
-+	"off",		/* used also always when CABC is not supported */
-+	"ui",
-+	"still-image",
-+	"moving-image",
-+};
-+
-+static ssize_t show_cabc_mode(struct device *dev,
-+		struct device_attribute *attr,
-+		char *buf)
-+{
-+	struct omap_dss_device *dssdev = to_dss_device(dev);
-+	struct taal_data *td = dev_get_drvdata(&dssdev->dev);
-+	const char *mode_str;
-+	int mode;
-+	int len;
-+
-+	mode = td->cabc_mode;
-+
-+	mode_str = "unknown";
-+	if (mode >= 0 && mode < ARRAY_SIZE(cabc_modes))
-+		mode_str = cabc_modes[mode];
-+	len = snprintf(buf, PAGE_SIZE, "%s\n", mode_str);
-+
-+	return len < PAGE_SIZE - 1 ? len : PAGE_SIZE - 1;
-+}
-+
-+static ssize_t store_cabc_mode(struct device *dev,
-+		struct device_attribute *attr,
-+		const char *buf, size_t count)
-+{
-+	struct omap_dss_device *dssdev = to_dss_device(dev);
-+	struct taal_data *td = dev_get_drvdata(&dssdev->dev);
-+	int i;
-+
-+	for (i = 0; i < ARRAY_SIZE(cabc_modes); i++) {
-+		if (sysfs_streq(cabc_modes[i], buf))
-+			break;
-+	}
-+
-+	if (i == ARRAY_SIZE(cabc_modes))
-+		return -EINVAL;
-+
-+	if (td->enabled) {
-+		dsi_bus_lock();
-+		if (!td->cabc_broken)
-+			taal_dcs_write_1(DCS_WRITE_CABC, i);
-+		dsi_bus_unlock();
-+	}
-+
-+	td->cabc_mode = i;
-+
-+	return count;
-+}
-+
-+static ssize_t show_cabc_available_modes(struct device *dev,
-+		struct device_attribute *attr,
-+		char *buf)
-+{
-+	int len;
-+	int i;
-+
-+	for (i = 0, len = 0;
-+	     len < PAGE_SIZE && i < ARRAY_SIZE(cabc_modes); i++)
-+		len += snprintf(&buf[len], PAGE_SIZE - len, "%s%s%s",
-+			i ? " " : "", cabc_modes[i],
-+			i == ARRAY_SIZE(cabc_modes) - 1 ? "\n" : "");
-+
-+	return len < PAGE_SIZE ? len : PAGE_SIZE - 1;
-+}
-+
-+static DEVICE_ATTR(num_dsi_errors, S_IRUGO, taal_num_errors_show, NULL);
-+static DEVICE_ATTR(hw_revision, S_IRUGO, taal_hw_revision_show, NULL);
-+static DEVICE_ATTR(cabc_mode, S_IRUGO | S_IWUSR,
-+		show_cabc_mode, store_cabc_mode);
-+static DEVICE_ATTR(cabc_available_modes, S_IRUGO,
-+		show_cabc_available_modes, NULL);
-+
-+static struct attribute *taal_attrs[] = {
-+	&dev_attr_num_dsi_errors.attr,
-+	&dev_attr_hw_revision.attr,
-+	&dev_attr_cabc_mode.attr,
-+	&dev_attr_cabc_available_modes.attr,
-+	NULL,
-+};
-+
-+static struct attribute_group taal_attr_group = {
-+	.attrs = taal_attrs,
-+};
-+
-+static int taal_probe(struct omap_dss_device *dssdev)
-+{
-+	struct taal_data *td;
-+	struct backlight_device *bldev;
-+	int r;
-+
-+	const struct omap_video_timings taal_panel_timings = {
-+		.x_res		= 864,
-+		.y_res		= 480,
-+	};
-+
-+	dev_dbg(&dssdev->dev, "probe\n");
-+
-+	dssdev->panel.config = OMAP_DSS_LCD_TFT;
-+	dssdev->panel.timings = taal_panel_timings;
-+	dssdev->ctrl.pixel_size = 24;
-+
-+	td = kzalloc(sizeof(*td), GFP_KERNEL);
-+	if (!td) {
-+		r = -ENOMEM;
-+		goto err0;
-+	}
-+
-+	dev_set_drvdata(&dssdev->dev, td);
-+
-+	dssdev->get_timings = taal_get_timings;
-+	dssdev->get_resolution = taal_get_resolution;
-+
-+	/* if no platform set_backlight() defined, presume DSI backlight
-+	 * control */
-+	if (!dssdev->set_backlight)
-+		td->use_dsi_bl = true;
-+
-+	bldev = backlight_device_register("taal", &dssdev->dev, dssdev,
-+			&taal_bl_ops);
-+	if (IS_ERR(bldev)) {
-+		r = PTR_ERR(bldev);
-+		goto err1;
-+	}
-+
-+	td->bldev = bldev;
-+
-+	bldev->props.fb_blank = FB_BLANK_UNBLANK;
-+	bldev->props.power = FB_BLANK_UNBLANK;
-+	if (td->use_dsi_bl) {
-+		bldev->props.max_brightness = 255;
-+		bldev->props.brightness = 255;
-+	} else {
-+		bldev->props.max_brightness = 127;
-+		bldev->props.brightness = 127;
-+	}
-+
-+	taal_bl_update_status(bldev);
-+
-+	if (dssdev->phy.dsi.ext_te) {
-+		int gpio = dssdev->phy.dsi.ext_te_gpio;
-+
-+		r = gpio_request(gpio, "taal irq");
-+		if (r) {
-+			dev_err(&dssdev->dev, "GPIO request failed\n");
-+			goto err2;
-+		}
-+
-+		gpio_direction_input(gpio);
-+
-+		r = request_irq(gpio_to_irq(gpio), taal_te_isr,
-+				IRQF_DISABLED | IRQF_TRIGGER_RISING,
-+				"taal vsync", dssdev);
-+
-+		if (r) {
-+			dev_err(&dssdev->dev, "IRQ request failed\n");
-+			gpio_free(gpio);
-+			goto err2;
-+		}
-+
-+		init_completion(&td->te_completion);
-+
-+		td->use_ext_te = true;
-+	}
-+
-+	r = sysfs_create_group(&dssdev->dev.kobj, &taal_attr_group);
-+	if (r) {
-+		dev_err(&dssdev->dev, "failed to create sysfs files\n");
-+		goto err3;
-+	}
-+
-+	return 0;
-+err3:
-+	if (td->use_ext_te) {
-+		int gpio = dssdev->phy.dsi.ext_te_gpio;
-+		free_irq(gpio_to_irq(gpio), dssdev);
-+		gpio_free(gpio);
-+	}
-+err2:
-+	backlight_device_unregister(bldev);
-+err1:
-+	kfree(td);
-+err0:
-+	return r;
-+}
-+
-+static void taal_remove(struct omap_dss_device *dssdev)
-+{
-+	struct taal_data *td = dev_get_drvdata(&dssdev->dev);
-+	struct backlight_device *bldev;
-+
-+	dev_dbg(&dssdev->dev, "remove\n");
-+
-+	sysfs_remove_group(&dssdev->dev.kobj, &taal_attr_group);
-+
-+	if (td->use_ext_te) {
-+		int gpio = dssdev->phy.dsi.ext_te_gpio;
-+		free_irq(gpio_to_irq(gpio), dssdev);
-+		gpio_free(gpio);
-+	}
-+
-+	bldev = td->bldev;
-+	bldev->props.power = FB_BLANK_POWERDOWN;
-+	taal_bl_update_status(bldev);
-+	backlight_device_unregister(bldev);
-+
-+	kfree(td);
-+}
-+
-+static int taal_enable(struct omap_dss_device *dssdev)
-+{
-+	struct taal_data *td = dev_get_drvdata(&dssdev->dev);
-+	u8 id1, id2, id3;
-+	int r;
-+
-+	dev_dbg(&dssdev->dev, "enable\n");
-+
-+	if (dssdev->platform_enable) {
-+		r = dssdev->platform_enable(dssdev);
-+		if (r)
-+			return r;
-+	}
-+
-+	/* it seems we have to wait a bit until taal is ready */
-+	msleep(5);
-+
-+	r = taal_sleep_out(td);
-+	if (r)
-+		return r;
-+
-+	r = taal_get_id(&id1, &id2, &id3);
-+	if (r)
-+		return r;
-+
-+	/* on early revisions CABC is broken */
-+	if (id2 == 0x00 || id2 == 0xff || id2 == 0x81)
-+		td->cabc_broken = true;
-+
-+	taal_dcs_write_1(DCS_BRIGHTNESS, 0xff);
-+	taal_dcs_write_1(DCS_CTRL_DISPLAY, (1<<2) | (1<<5)); /* BL | BCTRL */
-+
-+	taal_dcs_write_1(DCS_PIXEL_FORMAT, 0x7); /* 24bit/pixel */
-+
-+	taal_set_addr_mode(td->rotate, td->mirror);
-+	if (!td->cabc_broken)
-+		taal_dcs_write_1(DCS_WRITE_CABC, td->cabc_mode);
-+
-+	taal_dcs_write_0(DCS_DISPLAY_ON);
-+
-+	td->enabled = 1;
-+
-+	if (!td->intro_printed) {
-+		dev_info(&dssdev->dev, "revision %02x.%02x.%02x\n",
-+				id1, id2, id3);
-+		if (td->cabc_broken)
-+			dev_info(&dssdev->dev,
-+					"old Taal version, CABC disabled\n");
-+		td->intro_printed = true;
-+	}
-+
-+	return 0;
-+}
-+
-+static void taal_disable(struct omap_dss_device *dssdev)
-+{
-+	struct taal_data *td = dev_get_drvdata(&dssdev->dev);
-+
-+	dev_dbg(&dssdev->dev, "disable\n");
-+
-+	taal_dcs_write_0(DCS_DISPLAY_OFF);
-+	taal_sleep_in(td);
-+
-+	/* wait a bit so that the message goes through */
-+	msleep(10);
-+
-+	if (dssdev->platform_disable)
-+		dssdev->platform_disable(dssdev);
-+
-+	td->enabled = 0;
-+}
-+
-+static int taal_suspend(struct omap_dss_device *dssdev)
-+{
-+	struct taal_data *td = dev_get_drvdata(&dssdev->dev);
-+	struct backlight_device *bldev = td->bldev;
-+
-+	bldev->props.power = FB_BLANK_POWERDOWN;
-+	taal_bl_update_status(bldev);
-+
-+	return 0;
-+}
-+
-+static int taal_resume(struct omap_dss_device *dssdev)
-+{
-+	struct taal_data *td = dev_get_drvdata(&dssdev->dev);
-+	struct backlight_device *bldev = td->bldev;
-+
-+	bldev->props.power = FB_BLANK_UNBLANK;
-+	taal_bl_update_status(bldev);
-+
-+	return 0;
-+}
-+
-+static void taal_setup_update(struct omap_dss_device *dssdev,
-+				    u16 x, u16 y, u16 w, u16 h)
-+{
-+	taal_set_update_window(x, y, w, h);
-+}
-+
-+static int taal_enable_te(struct omap_dss_device *dssdev, bool enable)
-+{
-+	struct taal_data *td = dev_get_drvdata(&dssdev->dev);
-+	int r;
-+
-+	td->te_enabled = enable;
-+
-+	if (enable)
-+		r = taal_dcs_write_1(DCS_TEAR_ON, 0);
-+	else
-+		r = taal_dcs_write_0(DCS_TEAR_OFF);
-+
-+	return r;
-+}
-+
-+static int taal_wait_te(struct omap_dss_device *dssdev)
-+{
-+	struct taal_data *td = dev_get_drvdata(&dssdev->dev);
-+	long wait = msecs_to_jiffies(500);
-+
-+	if (!td->use_ext_te || !td->te_enabled)
-+		return 0;
-+
-+	INIT_COMPLETION(td->te_completion);
-+	wait = wait_for_completion_timeout(&td->te_completion, wait);
-+	if (wait == 0) {
-+		dev_err(&dssdev->dev, "timeout waiting TE\n");
-+		return -ETIME;
-+	}
-+
-+	return 0;
-+}
-+
-+static int taal_rotate(struct omap_dss_device *dssdev, u8 rotate)
-+{
-+	struct taal_data *td = dev_get_drvdata(&dssdev->dev);
-+	int r;
-+
-+	dev_dbg(&dssdev->dev, "rotate %d\n", rotate);
-+
-+	if (td->enabled) {
-+		r = taal_set_addr_mode(rotate, td->mirror);
-+
-+		if (r)
-+			return r;
-+	}
-+
-+	td->rotate = rotate;
-+
-+	return 0;
-+}
-+
-+static u8 taal_get_rotate(struct omap_dss_device *dssdev)
-+{
-+	struct taal_data *td = dev_get_drvdata(&dssdev->dev);
-+	return td->rotate;
-+}
-+
-+static int taal_mirror(struct omap_dss_device *dssdev, bool enable)
-+{
-+	struct taal_data *td = dev_get_drvdata(&dssdev->dev);
-+	int r;
-+
-+	dev_dbg(&dssdev->dev, "mirror %d\n", enable);
-+
-+	if (td->enabled) {
-+		r = taal_set_addr_mode(td->rotate, enable);
-+
-+		if (r)
-+			return r;
-+	}
-+
-+	td->mirror = enable;
-+
-+	return 0;
-+}
-+
-+static bool taal_get_mirror(struct omap_dss_device *dssdev)
-+{
-+	struct taal_data *td = dev_get_drvdata(&dssdev->dev);
-+	return td->mirror;
-+}
-+
-+static int taal_run_test(struct omap_dss_device *dssdev, int test_num)
-+{
-+	u8 id1, id2, id3;
-+	int r;
-+
-+	r = taal_dcs_read_1(DCS_GET_ID1, &id1);
-+	if (r)
-+		return r;
-+	r = taal_dcs_read_1(DCS_GET_ID2, &id2);
-+	if (r)
-+		return r;
-+	r = taal_dcs_read_1(DCS_GET_ID3, &id3);
-+	if (r)
-+		return r;
-+
-+	return 0;
-+}
-+
-+static int taal_memory_read(struct omap_dss_device *dssdev,
-+		void *buf, size_t size,
-+		u16 x, u16 y, u16 w, u16 h)
-+{
-+	int r;
-+	int first = 1;
-+	int plen;
-+	unsigned buf_used = 0;
-+
-+	if (size < w * h * 3)
-+		return -ENOMEM;
-+
-+	size = min(w * h * 3,
-+			dssdev->panel.timings.x_res *
-+			dssdev->panel.timings.y_res * 3);
-+
-+	/* plen 1 or 2 goes into short packet. until checksum error is fixed,
-+	 * use short packets. plen 32 works, but bigger packets seem to cause
-+	 * an error. */
-+	if (size % 2)
-+		plen = 1;
-+	else
-+		plen = 2;
-+
-+	taal_setup_update(dssdev, x, y, w, h);
-+
-+	r = dsi_vc_set_max_rx_packet_size(TCH, plen);
-+	if (r)
-+		return r;
-+
-+	while (buf_used < size) {
-+		u8 dcs_cmd = first ? 0x2e : 0x3e;
-+		first = 0;
-+
-+		r = dsi_vc_dcs_read(TCH, dcs_cmd,
-+				buf + buf_used, size - buf_used);
-+
-+		if (r < 0) {
-+			dev_err(&dssdev->dev, "read error\n");
-+			goto err;
-+		}
-+
-+		buf_used += r;
-+
-+		if (r < plen) {
-+			dev_err(&dssdev->dev, "short read\n");
-+			break;
-+		}
-+	}
-+
-+	r = buf_used;
-+
-+err:
-+	dsi_vc_set_max_rx_packet_size(TCH, 1);
-+
-+	return r;
-+}
-+
-+static struct omap_dss_driver taal_driver = {
-+	.probe		= taal_probe,
-+	.remove		= taal_remove,
-+
-+	.enable		= taal_enable,
-+	.disable	= taal_disable,
-+	.suspend	= taal_suspend,
-+	.resume		= taal_resume,
-+
-+	.setup_update	= taal_setup_update,
-+	.enable_te	= taal_enable_te,
-+	.wait_for_te	= taal_wait_te,
-+	.set_rotate	= taal_rotate,
-+	.get_rotate	= taal_get_rotate,
-+	.set_mirror	= taal_mirror,
-+	.get_mirror	= taal_get_mirror,
-+	.run_test	= taal_run_test,
-+	.memory_read	= taal_memory_read,
-+
-+	.driver         = {
-+		.name   = "taal",
-+		.owner  = THIS_MODULE,
-+	},
-+};
-+
-+static int __init taal_init(void)
-+{
-+	omap_dss_register_driver(&taal_driver);
-+
-+	return 0;
-+}
-+
-+static void __exit taal_exit(void)
-+{
-+	omap_dss_unregister_driver(&taal_driver);
-+}
-+
-+module_init(taal_init);
-+module_exit(taal_exit);
-+
-+MODULE_AUTHOR("Tomi Valkeinen <tomi.valkeinen@nokia.com>");
-+MODULE_DESCRIPTION("Taal Driver");
-+MODULE_LICENSE("GPL");
---- /dev/null
-+++ b/drivers/video/omap2/dss/Kconfig
-@@ -0,0 +1,89 @@
-+menuconfig OMAP2_DSS
-+        tristate "OMAP2/3 Display Subsystem support (EXPERIMENTAL)"
-+        depends on ARCH_OMAP2 || ARCH_OMAP3
-+        help
-+          OMAP2/3 Display Subsystem support.
-+
-+if OMAP2_DSS
-+
-+config OMAP2_VRAM_SIZE
-+	int "VRAM size (MB)"
-+	range 0 32
-+	default 0
-+	help
-+	  The amount of SDRAM to reserve at boot time for video RAM use.
-+	  This VRAM will be used by omapfb and other drivers that need
-+	  large continuous RAM area for video use.
-+
-+	  You can also set this with "vram=<bytes>" kernel argument, or
-+	  in the board file.
-+
-+config OMAP2_DSS_DEBUG_SUPPORT
-+        bool "Debug support"
-+	default y
-+	help
-+	  This enables debug messages. You need to enable printing
-+	  with 'debug' module parameter.
-+
-+config OMAP2_DSS_RFBI
-+	bool "RFBI support"
-+        default n
-+	help
-+	  MIPI DBI, or RFBI (Remote Framebuffer Interface), support.
-+
-+config OMAP2_DSS_VENC
-+	bool "VENC support"
-+        default y
-+	help
-+	  OMAP Video Encoder support.
-+
-+config OMAP2_DSS_SDI
-+	bool "SDI support"
-+	depends on ARCH_OMAP3
-+        default n
-+	help
-+	  SDI (Serial Display Interface) support.
-+
-+config OMAP2_DSS_DSI
-+	bool "DSI support"
-+	depends on ARCH_OMAP3
-+        default n
-+	help
-+	  MIPI DSI support.
-+
-+config OMAP2_DSS_USE_DSI_PLL
-+	bool "Use DSI PLL for PCLK (EXPERIMENTAL)"
-+	default n
-+	depends on OMAP2_DSS_DSI
-+	help
-+	  Use DSI PLL to generate pixel clock.  Currently only for DPI output.
-+	  DSI PLL can be used to generate higher and more precise pixel clocks.
-+
-+config OMAP2_DSS_FAKE_VSYNC
-+	bool "Fake VSYNC irq from manual update displays"
-+	default n
-+	help
-+	  If this is selected, DSI will generate a fake DISPC VSYNC interrupt
-+	  when DSI has sent a frame. This is only needed with DSI or RFBI
-+	  displays using manual mode, and you want VSYNC to, for example,
-+	  time animation.
-+
-+config OMAP2_DSS_MIN_FCK_PER_PCK
-+	int "Minimum FCK/PCK ratio (for scaling)"
-+	range 0 32
-+	default 0
-+	help
-+	  This can be used to adjust the minimum FCK/PCK ratio.
-+
-+	  With this you can make sure that DISPC FCK is at least
-+	  n x PCK. Video plane scaling requires higher FCK than
-+	  normally.
-+
-+	  If this is set to 0, there's no extra constraint on the
-+	  DISPC FCK. However, the FCK will at minimum be
-+	  2xPCK (if active matrix) or 3xPCK (if passive matrix).
-+
-+	  Max FCK is 173MHz, so this doesn't work if your PCK
-+	  is very high.
-+
-+endif
---- /dev/null
-+++ b/drivers/video/omap2/dss/Makefile
-@@ -0,0 +1,6 @@
-+obj-$(CONFIG_OMAP2_DSS) += omapdss.o
-+omapdss-y := core.o dss.o dispc.o dpi.o display.o manager.o overlay.o
-+omapdss-$(CONFIG_OMAP2_DSS_RFBI) += rfbi.o
-+omapdss-$(CONFIG_OMAP2_DSS_VENC) += venc.o
-+omapdss-$(CONFIG_OMAP2_DSS_SDI) += sdi.o
-+omapdss-$(CONFIG_OMAP2_DSS_DSI) += dsi.o
---- /dev/null
-+++ b/drivers/video/omap2/dss/core.c
-@@ -0,0 +1,917 @@
-+/*
-+ * linux/drivers/video/omap2/dss/core.c
-+ *
-+ * Copyright (C) 2009 Nokia Corporation
-+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
-+ *
-+ * Some code and ideas taken from drivers/video/omap/ driver
-+ * by Imre Deak.
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-+ * more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along with
-+ * this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#define DSS_SUBSYS_NAME "CORE"
-+
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/clk.h>
-+#include <linux/err.h>
-+#include <linux/platform_device.h>
-+#include <linux/seq_file.h>
-+#include <linux/debugfs.h>
-+#include <linux/io.h>
-+#include <linux/device.h>
-+
-+#include <mach/display.h>
-+#include <mach/clock.h>
-+
-+#include "dss.h"
-+
-+static struct {
-+	struct platform_device *pdev;
-+	int		ctx_id;
-+
-+	struct clk      *dss_ick;
-+	struct clk	*dss1_fck;
-+	struct clk	*dss2_fck;
-+	struct clk      *dss_54m_fck;
-+	struct clk	*dss_96m_fck;
-+	unsigned	num_clks_enabled;
-+} core;
-+
-+static void dss_clk_enable_all_no_ctx(void);
-+static void dss_clk_disable_all_no_ctx(void);
-+static void dss_clk_enable_no_ctx(enum dss_clock clks);
-+static void dss_clk_disable_no_ctx(enum dss_clock clks);
-+
-+static char *def_disp_name;
-+module_param_named(def_disp, def_disp_name, charp, 0);
-+MODULE_PARM_DESC(def_disp_name, "default display name");
-+
-+#ifdef DEBUG
-+unsigned int dss_debug;
-+module_param_named(debug, dss_debug, bool, 0644);
-+#endif
-+
-+/* CONTEXT */
-+static int dss_get_ctx_id(void)
-+{
-+	struct omap_dss_board_info *pdata = core.pdev->dev.platform_data;
-+	int r;
-+
-+	if (!pdata->get_last_off_on_transaction_id)
-+		return 0;
-+	r = pdata->get_last_off_on_transaction_id(&core.pdev->dev);
-+	if (r < 0) {
-+		dev_err(&core.pdev->dev, "getting transaction ID failed, "
-+				"will force context restore\n");
-+		r = -1;
-+	}
-+	return r;
-+}
-+
-+int dss_need_ctx_restore(void)
-+{
-+	int id = dss_get_ctx_id();
-+
-+	if (id < 0 || id != core.ctx_id) {
-+		DSSDBG("ctx id %d -> id %d\n",
-+				core.ctx_id, id);
-+		core.ctx_id = id;
-+		return 1;
-+	} else {
-+		return 0;
-+	}
-+}
-+
-+static void save_all_ctx(void)
-+{
-+	DSSDBG("save context\n");
-+
-+	dss_clk_enable_no_ctx(DSS_CLK_ICK | DSS_CLK_FCK1);
-+
-+	dss_save_context();
-+	dispc_save_context();
-+#ifdef CONFIG_OMAP2_DSS_DSI
-+	dsi_save_context();
-+#endif
-+
-+	dss_clk_disable_no_ctx(DSS_CLK_ICK | DSS_CLK_FCK1);
-+}
-+
-+static void restore_all_ctx(void)
-+{
-+	DSSDBG("restore context\n");
-+
-+	dss_clk_enable_all_no_ctx();
-+
-+	dss_restore_context();
-+	dispc_restore_context();
-+#ifdef CONFIG_OMAP2_DSS_DSI
-+	dsi_restore_context();
-+#endif
-+
-+	dss_clk_disable_all_no_ctx();
-+}
-+
-+/* CLOCKS */
-+void dss_dump_clocks(struct seq_file *s)
-+{
-+	int i;
-+	struct clk *clocks[5] = {
-+		core.dss_ick,
-+		core.dss1_fck,
-+		core.dss2_fck,
-+		core.dss_54m_fck,
-+		core.dss_96m_fck
-+	};
-+
-+	seq_printf(s, "- dss -\n");
-+
-+	seq_printf(s, "internal clk count\t%u\n", core.num_clks_enabled);
-+
-+	for (i = 0; i < 5; i++) {
-+		if (!clocks[i])
-+			continue;
-+		seq_printf(s, "%-15s\t%lu\t%d\n",
-+				clocks[i]->name,
-+				clk_get_rate(clocks[i]),
-+				clocks[i]->usecount);
-+	}
-+}
-+
-+static int dss_get_clock(struct clk **clock, const char *clk_name)
-+{
-+	struct clk *clk;
-+
-+	clk = clk_get(&core.pdev->dev, clk_name);
-+
-+	if (IS_ERR(clk)) {
-+		DSSERR("can't get clock %s", clk_name);
-+		return PTR_ERR(clk);
-+	}
-+
-+	*clock = clk;
-+
-+	DSSDBG("clk %s, rate %ld\n", clk_name, clk_get_rate(clk));
-+
-+	return 0;
-+}
-+
-+static int dss_get_clocks(void)
-+{
-+	int r;
-+
-+	core.dss_ick = NULL;
-+	core.dss1_fck = NULL;
-+	core.dss2_fck = NULL;
-+	core.dss_54m_fck = NULL;
-+	core.dss_96m_fck = NULL;
-+
-+	r = dss_get_clock(&core.dss_ick, "ick");
-+	if (r)
-+		goto err;
-+
-+	r = dss_get_clock(&core.dss1_fck, "dss1_fck");
-+	if (r)
-+		goto err;
-+
-+	r = dss_get_clock(&core.dss2_fck, "dss2_fck");
-+	if (r)
-+		goto err;
-+
-+	r = dss_get_clock(&core.dss_54m_fck, "tv_fck");
-+	if (r)
-+		goto err;
-+
-+	r = dss_get_clock(&core.dss_96m_fck, "video_fck");
-+	if (r)
-+		goto err;
-+
-+	return 0;
-+
-+err:
-+	if (core.dss_ick)
-+		clk_put(core.dss_ick);
-+	if (core.dss1_fck)
-+		clk_put(core.dss1_fck);
-+	if (core.dss2_fck)
-+		clk_put(core.dss2_fck);
-+	if (core.dss_54m_fck)
-+		clk_put(core.dss_54m_fck);
-+	if (core.dss_96m_fck)
-+		clk_put(core.dss_96m_fck);
-+
-+	return r;
-+}
-+
-+static void dss_put_clocks(void)
-+{
-+	if (core.dss_96m_fck)
-+		clk_put(core.dss_96m_fck);
-+	clk_put(core.dss_54m_fck);
-+	clk_put(core.dss1_fck);
-+	clk_put(core.dss2_fck);
-+	clk_put(core.dss_ick);
-+}
-+
-+unsigned long dss_clk_get_rate(enum dss_clock clk)
-+{
-+	switch (clk) {
-+	case DSS_CLK_ICK:
-+		return clk_get_rate(core.dss_ick);
-+	case DSS_CLK_FCK1:
-+		return clk_get_rate(core.dss1_fck);
-+	case DSS_CLK_FCK2:
-+		return clk_get_rate(core.dss2_fck);
-+	case DSS_CLK_54M:
-+		return clk_get_rate(core.dss_54m_fck);
-+	case DSS_CLK_96M:
-+		return clk_get_rate(core.dss_96m_fck);
-+	}
-+
-+	BUG();
-+	return 0;
-+}
-+
-+static unsigned count_clk_bits(enum dss_clock clks)
-+{
-+	unsigned num_clks = 0;
-+
-+	if (clks & DSS_CLK_ICK)
-+		++num_clks;
-+	if (clks & DSS_CLK_FCK1)
-+		++num_clks;
-+	if (clks & DSS_CLK_FCK2)
-+		++num_clks;
-+	if (clks & DSS_CLK_54M)
-+		++num_clks;
-+	if (clks & DSS_CLK_96M)
-+		++num_clks;
-+
-+	return num_clks;
-+}
-+
-+static void dss_clk_enable_no_ctx(enum dss_clock clks)
-+{
-+	unsigned num_clks = count_clk_bits(clks);
-+
-+	if (clks & DSS_CLK_ICK)
-+		clk_enable(core.dss_ick);
-+	if (clks & DSS_CLK_FCK1)
-+		clk_enable(core.dss1_fck);
-+	if (clks & DSS_CLK_FCK2)
-+		clk_enable(core.dss2_fck);
-+	if (clks & DSS_CLK_54M)
-+		clk_enable(core.dss_54m_fck);
-+	if (clks & DSS_CLK_96M)
-+		clk_enable(core.dss_96m_fck);
-+
-+	core.num_clks_enabled += num_clks;
-+}
-+
-+void dss_clk_enable(enum dss_clock clks)
-+{
-+	dss_clk_enable_no_ctx(clks);
-+
-+	if (cpu_is_omap34xx() && dss_need_ctx_restore())
-+		restore_all_ctx();
-+}
-+
-+static void dss_clk_disable_no_ctx(enum dss_clock clks)
-+{
-+	unsigned num_clks = count_clk_bits(clks);
-+
-+	if (clks & DSS_CLK_ICK)
-+		clk_disable(core.dss_ick);
-+	if (clks & DSS_CLK_FCK1)
-+		clk_disable(core.dss1_fck);
-+	if (clks & DSS_CLK_FCK2)
-+		clk_disable(core.dss2_fck);
-+	if (clks & DSS_CLK_54M)
-+		clk_disable(core.dss_54m_fck);
-+	if (clks & DSS_CLK_96M)
-+		clk_disable(core.dss_96m_fck);
-+
-+	core.num_clks_enabled -= num_clks;
-+}
-+
-+void dss_clk_disable(enum dss_clock clks)
-+{
-+	if (cpu_is_omap34xx()) {
-+		unsigned num_clks = count_clk_bits(clks);
-+
-+		BUG_ON(core.num_clks_enabled < num_clks);
-+
-+		if (core.num_clks_enabled == num_clks)
-+			save_all_ctx();
-+	}
-+
-+	dss_clk_disable_no_ctx(clks);
-+}
-+
-+static void dss_clk_enable_all_no_ctx(void)
-+{
-+	enum dss_clock clks;
-+
-+	clks = DSS_CLK_ICK | DSS_CLK_FCK1 | DSS_CLK_FCK2 | DSS_CLK_54M;
-+	if (cpu_is_omap34xx())
-+		clks |= DSS_CLK_96M;
-+	dss_clk_enable_no_ctx(clks);
-+}
-+
-+static void dss_clk_disable_all_no_ctx(void)
-+{
-+	enum dss_clock clks;
-+
-+	clks = DSS_CLK_ICK | DSS_CLK_FCK1 | DSS_CLK_FCK2 | DSS_CLK_54M;
-+	if (cpu_is_omap34xx())
-+		clks |= DSS_CLK_96M;
-+	dss_clk_disable_no_ctx(clks);
-+}
-+
-+static void dss_clk_disable_all(void)
-+{
-+	enum dss_clock clks;
-+
-+	clks = DSS_CLK_ICK | DSS_CLK_FCK1 | DSS_CLK_FCK2 | DSS_CLK_54M;
-+	if (cpu_is_omap34xx())
-+		clks |= DSS_CLK_96M;
-+	dss_clk_disable(clks);
-+}
-+
-+/* DEBUGFS */
-+#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_OMAP2_DSS_DEBUG_SUPPORT)
-+static void dss_debug_dump_clocks(struct seq_file *s)
-+{
-+	dss_dump_clocks(s);
-+	dispc_dump_clocks(s);
-+#ifdef CONFIG_OMAP2_DSS_DSI
-+	dsi_dump_clocks(s);
-+#endif
-+}
-+
-+static int dss_debug_show(struct seq_file *s, void *unused)
-+{
-+	void (*func)(struct seq_file *) = s->private;
-+	func(s);
-+	return 0;
-+}
-+
-+static int dss_debug_open(struct inode *inode, struct file *file)
-+{
-+	return single_open(file, dss_debug_show, inode->i_private);
-+}
-+
-+static const struct file_operations dss_debug_fops = {
-+	.open           = dss_debug_open,
-+	.read           = seq_read,
-+	.llseek         = seq_lseek,
-+	.release        = single_release,
-+};
-+
-+static struct dentry *dss_debugfs_dir;
-+
-+static int dss_initialize_debugfs(void)
-+{
-+	dss_debugfs_dir = debugfs_create_dir("omapdss", NULL);
-+	if (IS_ERR(dss_debugfs_dir)) {
-+		int err = PTR_ERR(dss_debugfs_dir);
-+		dss_debugfs_dir = NULL;
-+		return err;
-+	}
-+
-+	debugfs_create_file("clk", S_IRUGO, dss_debugfs_dir,
-+			&dss_debug_dump_clocks, &dss_debug_fops);
-+
-+	debugfs_create_file("dss", S_IRUGO, dss_debugfs_dir,
-+			&dss_dump_regs, &dss_debug_fops);
-+	debugfs_create_file("dispc", S_IRUGO, dss_debugfs_dir,
-+			&dispc_dump_regs, &dss_debug_fops);
-+#ifdef CONFIG_OMAP2_DSS_RFBI
-+	debugfs_create_file("rfbi", S_IRUGO, dss_debugfs_dir,
-+			&rfbi_dump_regs, &dss_debug_fops);
-+#endif
-+#ifdef CONFIG_OMAP2_DSS_DSI
-+	debugfs_create_file("dsi", S_IRUGO, dss_debugfs_dir,
-+			&dsi_dump_regs, &dss_debug_fops);
-+#endif
-+#ifdef CONFIG_OMAP2_DSS_VENC
-+	debugfs_create_file("venc", S_IRUGO, dss_debugfs_dir,
-+			&venc_dump_regs, &dss_debug_fops);
-+#endif
-+	return 0;
-+}
-+
-+static void dss_uninitialize_debugfs(void)
-+{
-+	if (dss_debugfs_dir)
-+		debugfs_remove_recursive(dss_debugfs_dir);
-+}
-+#endif /* CONFIG_DEBUG_FS && CONFIG_OMAP2_DSS_DEBUG_SUPPORT */
-+
-+/* PLATFORM DEVICE */
-+static int omap_dss_probe(struct platform_device *pdev)
-+{
-+	struct omap_dss_board_info *pdata = pdev->dev.platform_data;
-+	int skip_init = 0;
-+	int r;
-+	int i;
-+
-+	core.pdev = pdev;
-+
-+	dss_init_overlay_managers(pdev);
-+	dss_init_overlays(pdev);
-+
-+	r = dss_get_clocks();
-+	if (r)
-+		goto fail0;
-+
-+	dss_clk_enable_all_no_ctx();
-+
-+	core.ctx_id = dss_get_ctx_id();
-+	DSSDBG("initial ctx id %u\n", core.ctx_id);
-+
-+#ifdef CONFIG_FB_OMAP_BOOTLOADER_INIT
-+	/* DISPC_CONTROL */
-+	if (omap_readl(0x48050440) & 1)	/* LCD enabled? */
-+		skip_init = 1;
-+#endif
-+
-+	r = dss_init(skip_init);
-+	if (r) {
-+		DSSERR("Failed to initialize DSS\n");
-+		goto fail0;
-+	}
-+
-+#ifdef CONFIG_OMAP2_DSS_RFBI
-+	r = rfbi_init();
-+	if (r) {
-+		DSSERR("Failed to initialize rfbi\n");
-+		goto fail0;
-+	}
-+#endif
-+
-+	r = dpi_init();
-+	if (r) {
-+		DSSERR("Failed to initialize dpi\n");
-+		goto fail0;
-+	}
-+
-+	r = dispc_init();
-+	if (r) {
-+		DSSERR("Failed to initialize dispc\n");
-+		goto fail0;
-+	}
-+#ifdef CONFIG_OMAP2_DSS_VENC
-+	r = venc_init(pdev);
-+	if (r) {
-+		DSSERR("Failed to initialize venc\n");
-+		goto fail0;
-+	}
-+#endif
-+	if (cpu_is_omap34xx()) {
-+#ifdef CONFIG_OMAP2_DSS_SDI
-+		r = sdi_init(skip_init);
-+		if (r) {
-+			DSSERR("Failed to initialize SDI\n");
-+			goto fail0;
-+		}
-+#endif
-+#ifdef CONFIG_OMAP2_DSS_DSI
-+		r = dsi_init(pdev);
-+		if (r) {
-+			DSSERR("Failed to initialize DSI\n");
-+			goto fail0;
-+		}
-+#endif
-+	}
-+
-+#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_OMAP2_DSS_DEBUG_SUPPORT)
-+	r = dss_initialize_debugfs();
-+	if (r)
-+		goto fail0;
-+#endif
-+
-+	for (i = 0; i < pdata->num_devices; ++i) {
-+		struct omap_dss_device *dssdev = pdata->devices[i];
-+
-+		r = omap_dss_register_device(dssdev);
-+		if (r)
-+			DSSERR("device reg failed %d\n", i);
-+
-+		if (def_disp_name && strcmp(def_disp_name, dssdev->name) == 0)
-+			pdata->default_device = dssdev;
-+	}
-+
-+	dss_clk_disable_all();
-+
-+	return 0;
-+
-+	/* XXX fail correctly */
-+fail0:
-+	return r;
-+}
-+
-+static int omap_dss_remove(struct platform_device *pdev)
-+{
-+	struct omap_dss_board_info *pdata = pdev->dev.platform_data;
-+	int i;
-+	int c;
-+
-+#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_OMAP2_DSS_DEBUG_SUPPORT)
-+	dss_uninitialize_debugfs();
-+#endif
-+
-+#ifdef CONFIG_OMAP2_DSS_VENC
-+	venc_exit();
-+#endif
-+	dispc_exit();
-+	dpi_exit();
-+#ifdef CONFIG_OMAP2_DSS_RFBI
-+	rfbi_exit();
-+#endif
-+	if (cpu_is_omap34xx()) {
-+#ifdef CONFIG_OMAP2_DSS_DSI
-+		dsi_exit();
-+#endif
-+#ifdef CONFIG_OMAP2_DSS_SDI
-+		sdi_exit();
-+#endif
-+	}
-+
-+	dss_exit();
-+
-+	/* these should be removed at some point */
-+	c = core.dss_ick->usecount;
-+	if (c > 0) {
-+		DSSERR("warning: dss_ick usecount %d, disabling\n", c);
-+		while (c-- > 0)
-+			clk_disable(core.dss_ick);
-+	}
-+
-+	c = core.dss1_fck->usecount;
-+	if (c > 0) {
-+		DSSERR("warning: dss1_fck usecount %d, disabling\n", c);
-+		while (c-- > 0)
-+			clk_disable(core.dss1_fck);
-+	}
-+
-+	c = core.dss2_fck->usecount;
-+	if (c > 0) {
-+		DSSERR("warning: dss2_fck usecount %d, disabling\n", c);
-+		while (c-- > 0)
-+			clk_disable(core.dss2_fck);
-+	}
-+
-+	c = core.dss_54m_fck->usecount;
-+	if (c > 0) {
-+		DSSERR("warning: dss_54m_fck usecount %d, disabling\n", c);
-+		while (c-- > 0)
-+			clk_disable(core.dss_54m_fck);
-+	}
-+
-+	if (core.dss_96m_fck) {
-+		c = core.dss_96m_fck->usecount;
-+		if (c > 0) {
-+			DSSERR("warning: dss_96m_fck usecount %d, disabling\n",
-+					c);
-+			while (c-- > 0)
-+				clk_disable(core.dss_96m_fck);
-+		}
-+	}
-+
-+	dss_put_clocks();
-+
-+	dss_uninit_overlays(pdev);
-+	dss_uninit_overlay_managers(pdev);
-+
-+	for (i = 0; i < pdata->num_devices; ++i)
-+		omap_dss_unregister_device(pdata->devices[i]);
-+
-+	return 0;
-+}
-+
-+static void omap_dss_shutdown(struct platform_device *pdev)
-+{
-+	DSSDBG("shutdown\n");
-+}
-+
-+static int omap_dss_suspend(struct platform_device *pdev, pm_message_t state)
-+{
-+	DSSDBG("suspend %d\n", state.event);
-+
-+	return dss_suspend_all_devices();
-+}
-+
-+static int omap_dss_resume(struct platform_device *pdev)
-+{
-+	DSSDBG("resume\n");
-+
-+	return dss_resume_all_devices();
-+}
-+
-+static struct platform_driver omap_dss_driver = {
-+	.probe          = omap_dss_probe,
-+	.remove         = omap_dss_remove,
-+	.shutdown	= omap_dss_shutdown,
-+	.suspend	= omap_dss_suspend,
-+	.resume		= omap_dss_resume,
-+	.driver         = {
-+		.name   = "omapdss",
-+		.owner  = THIS_MODULE,
-+	},
-+};
-+
-+/* BUS */
-+static int dss_bus_match(struct device *dev, struct device_driver *driver)
-+{
-+	struct omap_dss_device *dssdev = to_dss_device(dev);
-+
-+	DSSDBG("bus_match. dev %s/%s, drv %s\n",
-+			dev_name(dev), dssdev->driver_name, driver->name);
-+
-+	return strcmp(dssdev->driver_name, driver->name) == 0;
-+}
-+
-+static ssize_t device_name_show(struct device *dev,
-+		struct device_attribute *attr, char *buf)
-+{
-+	struct omap_dss_device *dssdev = to_dss_device(dev);
-+	return snprintf(buf, PAGE_SIZE, "%s\n",
-+			dssdev->name ?
-+			dssdev->name : "");
-+}
-+
-+static struct device_attribute default_dev_attrs[] = {
-+	__ATTR(name, S_IRUGO, device_name_show, NULL),
-+	__ATTR_NULL,
-+};
-+
-+static ssize_t driver_name_show(struct device_driver *drv, char *buf)
-+{
-+	struct omap_dss_driver *dssdrv = to_dss_driver(drv);
-+	return snprintf(buf, PAGE_SIZE, "%s\n",
-+			dssdrv->driver.name ?
-+			dssdrv->driver.name : "");
-+}
-+static struct driver_attribute default_drv_attrs[] = {
-+	__ATTR(name, S_IRUGO, driver_name_show, NULL),
-+	__ATTR_NULL,
-+};
-+
-+static struct bus_type dss_bus_type = {
-+	.name = "omapdss",
-+	.match = dss_bus_match,
-+	.dev_attrs = default_dev_attrs,
-+	.drv_attrs = default_drv_attrs,
-+};
-+
-+static void dss_bus_release(struct device *dev)
-+{
-+	DSSDBG("bus_release\n");
-+}
-+
-+static struct device dss_bus = {
-+	.release = dss_bus_release,
-+};
-+
-+struct bus_type *dss_get_bus(void)
-+{
-+	return &dss_bus_type;
-+}
-+
-+/* DRIVER */
-+static int dss_driver_probe(struct device *dev)
-+{
-+	int r;
-+	struct omap_dss_driver *dssdrv = to_dss_driver(dev->driver);
-+	struct omap_dss_device *dssdev = to_dss_device(dev);
-+	struct omap_dss_board_info *pdata = core.pdev->dev.platform_data;
-+	bool force;
-+
-+	DSSDBG("driver_probe: dev %s/%s, drv %s\n",
-+				dev_name(dev), dssdev->driver_name,
-+				dssdrv->driver.name);
-+
-+	dss_init_device(core.pdev, dssdev);
-+
-+	/* skip this if the device is behind a ctrl */
-+	if (!dssdev->panel.ctrl) {
-+		force = pdata->default_device == dssdev;
-+		dss_recheck_connections(dssdev, force);
-+	}
-+
-+	r = dssdrv->probe(dssdev);
-+
-+	if (r) {
-+		DSSERR("driver probe failed: %d\n", r);
-+		return r;
-+	}
-+
-+	DSSDBG("probe done for device %s\n", dev_name(dev));
-+
-+	dssdev->driver = dssdrv;
-+
-+	return 0;
-+}
-+
-+static int dss_driver_remove(struct device *dev)
-+{
-+	struct omap_dss_driver *dssdrv = to_dss_driver(dev->driver);
-+	struct omap_dss_device *dssdev = to_dss_device(dev);
-+
-+	DSSDBG("driver_remove: dev %s/%s\n", dev_name(dev),
-+			dssdev->driver_name);
-+
-+	dssdrv->remove(dssdev);
-+
-+	dss_uninit_device(core.pdev, dssdev);
-+
-+	dssdev->driver = NULL;
-+
-+	return 0;
-+}
-+
-+int omap_dss_register_driver(struct omap_dss_driver *dssdriver)
-+{
-+	dssdriver->driver.bus = &dss_bus_type;
-+	dssdriver->driver.probe = dss_driver_probe;
-+	dssdriver->driver.remove = dss_driver_remove;
-+	return driver_register(&dssdriver->driver);
-+}
-+EXPORT_SYMBOL(omap_dss_register_driver);
-+
-+void omap_dss_unregister_driver(struct omap_dss_driver *dssdriver)
-+{
-+	driver_unregister(&dssdriver->driver);
-+}
-+EXPORT_SYMBOL(omap_dss_unregister_driver);
-+
-+/* DEVICE */
-+static void reset_device(struct device *dev, int check)
-+{
-+	u8 *dev_p = (u8 *)dev;
-+	u8 *dev_end = dev_p + sizeof(*dev);
-+	void *saved_pdata;
-+
-+	saved_pdata = dev->platform_data;
-+	if (check) {
-+		/*
-+		 * Check if there is any other setting than platform_data
-+		 * in struct device; warn that these will be reset by our
-+		 * init.
-+		 */
-+		dev->platform_data = NULL;
-+		while (dev_p < dev_end) {
-+			if (*dev_p) {
-+				WARN("%s: struct device fields will be "
-+						"discarded\n",
-+				     __func__);
-+				break;
-+			}
-+			dev_p++;
-+		}
-+	}
-+	memset(dev, 0, sizeof(*dev));
-+	dev->platform_data = saved_pdata;
-+}
-+
-+
-+static void omap_dss_dev_release(struct device *dev)
-+{
-+	reset_device(dev, 0);
-+}
-+
-+int omap_dss_register_device(struct omap_dss_device *dssdev)
-+{
-+	static int dev_num;
-+	static int panel_num;
-+	int r;
-+
-+	WARN_ON(!dssdev->driver_name);
-+
-+	reset_device(&dssdev->dev, 1);
-+	dssdev->dev.bus = &dss_bus_type;
-+	dssdev->dev.parent = &dss_bus;
-+	dssdev->dev.release = omap_dss_dev_release;
-+	dev_set_name(&dssdev->dev, "display%d", dev_num++);
-+	r = device_register(&dssdev->dev);
-+	if (r)
-+		return r;
-+
-+	if (dssdev->ctrl.panel) {
-+		struct omap_dss_device *panel = dssdev->ctrl.panel;
-+
-+		panel->panel.ctrl = dssdev;
-+
-+		reset_device(&panel->dev, 1);
-+		panel->dev.bus = &dss_bus_type;
-+		panel->dev.parent = &dssdev->dev;
-+		panel->dev.release = omap_dss_dev_release;
-+		dev_set_name(&panel->dev, "panel%d", panel_num++);
-+		r = device_register(&panel->dev);
-+		if (r)
-+			return r;
-+	}
-+
-+	return 0;
-+}
-+
-+void omap_dss_unregister_device(struct omap_dss_device *dssdev)
-+{
-+	device_unregister(&dssdev->dev);
-+
-+	if (dssdev->ctrl.panel) {
-+		struct omap_dss_device *panel = dssdev->ctrl.panel;
-+		device_unregister(&panel->dev);
-+	}
-+}
-+
-+/* BUS */
-+static int omap_dss_bus_register(void)
-+{
-+	int r;
-+
-+	r = bus_register(&dss_bus_type);
-+	if (r) {
-+		DSSERR("bus register failed\n");
-+		return r;
-+	}
-+
-+	dev_set_name(&dss_bus, "omapdss");
-+	r = device_register(&dss_bus);
-+	if (r) {
-+		DSSERR("bus driver register failed\n");
-+		bus_unregister(&dss_bus_type);
-+		return r;
-+	}
-+
-+	return 0;
-+}
-+
-+/* INIT */
-+
-+#ifdef CONFIG_OMAP2_DSS_MODULE
-+static void omap_dss_bus_unregister(void)
-+{
-+	device_unregister(&dss_bus);
-+
-+	bus_unregister(&dss_bus_type);
-+}
-+
-+static int __init omap_dss_init(void)
-+{
-+	int r;
-+
-+	r = omap_dss_bus_register();
-+	if (r)
-+		return r;
-+
-+	r = platform_driver_register(&omap_dss_driver);
-+	if (r) {
-+		omap_dss_bus_unregister();
-+		return r;
-+	}
-+
-+	return 0;
-+}
-+
-+static void __exit omap_dss_exit(void)
-+{
-+	platform_driver_unregister(&omap_dss_driver);
-+
-+	omap_dss_bus_unregister();
-+}
-+
-+module_init(omap_dss_init);
-+module_exit(omap_dss_exit);
-+#else
-+static int __init omap_dss_init(void)
-+{
-+	return omap_dss_bus_register();
-+}
-+
-+static int __init omap_dss_init2(void)
-+{
-+	return platform_driver_register(&omap_dss_driver);
-+}
-+
-+core_initcall(omap_dss_init);
-+device_initcall(omap_dss_init2);
-+#endif
-+
-+MODULE_AUTHOR("Tomi Valkeinen <tomi.valkeinen@nokia.com>");
-+MODULE_DESCRIPTION("OMAP2/3 Display Subsystem");
-+MODULE_LICENSE("GPL v2");
-+
---- /dev/null
-+++ b/drivers/video/omap2/dss/dispc.c
-@@ -0,0 +1,3182 @@
-+/*
-+ * linux/drivers/video/omap2/dss/dispc.c
-+ *
-+ * Copyright (C) 2009 Nokia Corporation
-+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
-+ *
-+ * Some code and ideas taken from drivers/video/omap/ driver
-+ * by Imre Deak.
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-+ * more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along with
-+ * this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#define DSS_SUBSYS_NAME "DISPC"
-+
-+#include <linux/kernel.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/vmalloc.h>
-+#include <linux/clk.h>
-+#include <linux/io.h>
-+#include <linux/jiffies.h>
-+#include <linux/seq_file.h>
-+#include <linux/delay.h>
-+#include <linux/workqueue.h>
-+
-+#include <mach/sram.h>
-+#include <mach/board.h>
-+#include <mach/clock.h>
-+
-+#include <mach/display.h>
-+
-+#include "dss.h"
-+
-+/* DISPC */
-+#define DISPC_BASE			0x48050400
-+
-+#define DISPC_SZ_REGS			SZ_1K
-+
-+struct dispc_reg { u16 idx; };
-+
-+#define DISPC_REG(idx)			((const struct dispc_reg) { idx })
-+
-+/* DISPC common */
-+#define DISPC_REVISION			DISPC_REG(0x0000)
-+#define DISPC_SYSCONFIG			DISPC_REG(0x0010)
-+#define DISPC_SYSSTATUS			DISPC_REG(0x0014)
-+#define DISPC_IRQSTATUS			DISPC_REG(0x0018)
-+#define DISPC_IRQENABLE			DISPC_REG(0x001C)
-+#define DISPC_CONTROL			DISPC_REG(0x0040)
-+#define DISPC_CONFIG			DISPC_REG(0x0044)
-+#define DISPC_CAPABLE			DISPC_REG(0x0048)
-+#define DISPC_DEFAULT_COLOR0		DISPC_REG(0x004C)
-+#define DISPC_DEFAULT_COLOR1		DISPC_REG(0x0050)
-+#define DISPC_TRANS_COLOR0		DISPC_REG(0x0054)
-+#define DISPC_TRANS_COLOR1		DISPC_REG(0x0058)
-+#define DISPC_LINE_STATUS		DISPC_REG(0x005C)
-+#define DISPC_LINE_NUMBER		DISPC_REG(0x0060)
-+#define DISPC_TIMING_H			DISPC_REG(0x0064)
-+#define DISPC_TIMING_V			DISPC_REG(0x0068)
-+#define DISPC_POL_FREQ			DISPC_REG(0x006C)
-+#define DISPC_DIVISOR			DISPC_REG(0x0070)
-+#define DISPC_GLOBAL_ALPHA		DISPC_REG(0x0074)
-+#define DISPC_SIZE_DIG			DISPC_REG(0x0078)
-+#define DISPC_SIZE_LCD			DISPC_REG(0x007C)
-+
-+/* DISPC GFX plane */
-+#define DISPC_GFX_BA0			DISPC_REG(0x0080)
-+#define DISPC_GFX_BA1			DISPC_REG(0x0084)
-+#define DISPC_GFX_POSITION		DISPC_REG(0x0088)
-+#define DISPC_GFX_SIZE			DISPC_REG(0x008C)
-+#define DISPC_GFX_ATTRIBUTES		DISPC_REG(0x00A0)
-+#define DISPC_GFX_FIFO_THRESHOLD	DISPC_REG(0x00A4)
-+#define DISPC_GFX_FIFO_SIZE_STATUS	DISPC_REG(0x00A8)
-+#define DISPC_GFX_ROW_INC		DISPC_REG(0x00AC)
-+#define DISPC_GFX_PIXEL_INC		DISPC_REG(0x00B0)
-+#define DISPC_GFX_WINDOW_SKIP		DISPC_REG(0x00B4)
-+#define DISPC_GFX_TABLE_BA		DISPC_REG(0x00B8)
-+
-+#define DISPC_DATA_CYCLE1		DISPC_REG(0x01D4)
-+#define DISPC_DATA_CYCLE2		DISPC_REG(0x01D8)
-+#define DISPC_DATA_CYCLE3		DISPC_REG(0x01DC)
-+
-+#define DISPC_CPR_COEF_R		DISPC_REG(0x0220)
-+#define DISPC_CPR_COEF_G		DISPC_REG(0x0224)
-+#define DISPC_CPR_COEF_B		DISPC_REG(0x0228)
-+
-+#define DISPC_GFX_PRELOAD		DISPC_REG(0x022C)
-+
-+/* DISPC Video plane, n = 0 for VID1 and n = 1 for VID2 */
-+#define DISPC_VID_REG(n, idx)		DISPC_REG(0x00BC + (n)*0x90 + idx)
-+
-+#define DISPC_VID_BA0(n)		DISPC_VID_REG(n, 0x0000)
-+#define DISPC_VID_BA1(n)		DISPC_VID_REG(n, 0x0004)
-+#define DISPC_VID_POSITION(n)		DISPC_VID_REG(n, 0x0008)
-+#define DISPC_VID_SIZE(n)		DISPC_VID_REG(n, 0x000C)
-+#define DISPC_VID_ATTRIBUTES(n)		DISPC_VID_REG(n, 0x0010)
-+#define DISPC_VID_FIFO_THRESHOLD(n)	DISPC_VID_REG(n, 0x0014)
-+#define DISPC_VID_FIFO_SIZE_STATUS(n)	DISPC_VID_REG(n, 0x0018)
-+#define DISPC_VID_ROW_INC(n)		DISPC_VID_REG(n, 0x001C)
-+#define DISPC_VID_PIXEL_INC(n)		DISPC_VID_REG(n, 0x0020)
-+#define DISPC_VID_FIR(n)		DISPC_VID_REG(n, 0x0024)
-+#define DISPC_VID_PICTURE_SIZE(n)	DISPC_VID_REG(n, 0x0028)
-+#define DISPC_VID_ACCU0(n)		DISPC_VID_REG(n, 0x002C)
-+#define DISPC_VID_ACCU1(n)		DISPC_VID_REG(n, 0x0030)
-+
-+/* coef index i = {0, 1, 2, 3, 4, 5, 6, 7} */
-+#define DISPC_VID_FIR_COEF_H(n, i)	DISPC_REG(0x00F0 + (n)*0x90 + (i)*0x8)
-+/* coef index i = {0, 1, 2, 3, 4, 5, 6, 7} */
-+#define DISPC_VID_FIR_COEF_HV(n, i)	DISPC_REG(0x00F4 + (n)*0x90 + (i)*0x8)
-+/* coef index i = {0, 1, 2, 3, 4} */
-+#define DISPC_VID_CONV_COEF(n, i)	DISPC_REG(0x0130 + (n)*0x90 + (i)*0x4)
-+/* coef index i = {0, 1, 2, 3, 4, 5, 6, 7} */
-+#define DISPC_VID_FIR_COEF_V(n, i)	DISPC_REG(0x01E0 + (n)*0x20 + (i)*0x4)
-+
-+#define DISPC_VID_PRELOAD(n)		DISPC_REG(0x230 + (n)*0x04)
-+
-+
-+#define DISPC_IRQ_MASK_ERROR            (DISPC_IRQ_GFX_FIFO_UNDERFLOW | \
-+					 DISPC_IRQ_OCP_ERR | \
-+					 DISPC_IRQ_VID1_FIFO_UNDERFLOW | \
-+					 DISPC_IRQ_VID2_FIFO_UNDERFLOW | \
-+					 DISPC_IRQ_SYNC_LOST | \
-+					 DISPC_IRQ_SYNC_LOST_DIGIT)
-+
-+#define DISPC_MAX_NR_ISRS		8
-+
-+struct omap_dispc_isr_data {
-+	omap_dispc_isr_t	isr;
-+	void			*arg;
-+	u32			mask;
-+};
-+
-+#define REG_GET(idx, start, end) \
-+	FLD_GET(dispc_read_reg(idx), start, end)
-+
-+#define REG_FLD_MOD(idx, val, start, end)				\
-+	dispc_write_reg(idx, FLD_MOD(dispc_read_reg(idx), val, start, end))
-+
-+static const struct dispc_reg dispc_reg_att[] = { DISPC_GFX_ATTRIBUTES,
-+	DISPC_VID_ATTRIBUTES(0),
-+	DISPC_VID_ATTRIBUTES(1) };
-+
-+static struct {
-+	void __iomem    *base;
-+
-+	struct clk	*dpll4_m4_ck;
-+
-+	unsigned long	cache_req_pck;
-+	unsigned long	cache_prate;
-+	struct dispc_clock_info cache_cinfo;
-+
-+	u32	fifo_size[3];
-+
-+	spinlock_t irq_lock;
-+	u32 irq_error_mask;
-+	struct omap_dispc_isr_data registered_isr[DISPC_MAX_NR_ISRS];
-+	u32 error_irqs;
-+	struct work_struct error_work;
-+
-+	u32		ctx[DISPC_SZ_REGS / sizeof(u32)];
-+} dispc;
-+
-+static void _omap_dispc_set_irqs(void);
-+
-+static inline void dispc_write_reg(const struct dispc_reg idx, u32 val)
-+{
-+	__raw_writel(val, dispc.base + idx.idx);
-+}
-+
-+static inline u32 dispc_read_reg(const struct dispc_reg idx)
-+{
-+	return __raw_readl(dispc.base + idx.idx);
-+}
-+
-+#define SR(reg) \
-+	dispc.ctx[(DISPC_##reg).idx / sizeof(u32)] = dispc_read_reg(DISPC_##reg)
-+#define RR(reg) \
-+	dispc_write_reg(DISPC_##reg, dispc.ctx[(DISPC_##reg).idx / sizeof(u32)])
-+
-+void dispc_save_context(void)
-+{
-+	if (cpu_is_omap24xx())
-+		return;
-+
-+	SR(SYSCONFIG);
-+	SR(IRQENABLE);
-+	SR(CONTROL);
-+	SR(CONFIG);
-+	SR(DEFAULT_COLOR0);
-+	SR(DEFAULT_COLOR1);
-+	SR(TRANS_COLOR0);
-+	SR(TRANS_COLOR1);
-+	SR(LINE_NUMBER);
-+	SR(TIMING_H);
-+	SR(TIMING_V);
-+	SR(POL_FREQ);
-+	SR(DIVISOR);
-+	SR(GLOBAL_ALPHA);
-+	SR(SIZE_DIG);
-+	SR(SIZE_LCD);
-+
-+	SR(GFX_BA0);
-+	SR(GFX_BA1);
-+	SR(GFX_POSITION);
-+	SR(GFX_SIZE);
-+	SR(GFX_ATTRIBUTES);
-+	SR(GFX_FIFO_THRESHOLD);
-+	SR(GFX_ROW_INC);
-+	SR(GFX_PIXEL_INC);
-+	SR(GFX_WINDOW_SKIP);
-+	SR(GFX_TABLE_BA);
-+
-+	SR(DATA_CYCLE1);
-+	SR(DATA_CYCLE2);
-+	SR(DATA_CYCLE3);
-+
-+	SR(CPR_COEF_R);
-+	SR(CPR_COEF_G);
-+	SR(CPR_COEF_B);
-+
-+	SR(GFX_PRELOAD);
-+
-+	/* VID1 */
-+	SR(VID_BA0(0));
-+	SR(VID_BA1(0));
-+	SR(VID_POSITION(0));
-+	SR(VID_SIZE(0));
-+	SR(VID_ATTRIBUTES(0));
-+	SR(VID_FIFO_THRESHOLD(0));
-+	SR(VID_ROW_INC(0));
-+	SR(VID_PIXEL_INC(0));
-+	SR(VID_FIR(0));
-+	SR(VID_PICTURE_SIZE(0));
-+	SR(VID_ACCU0(0));
-+	SR(VID_ACCU1(0));
-+
-+	SR(VID_FIR_COEF_H(0, 0));
-+	SR(VID_FIR_COEF_H(0, 1));
-+	SR(VID_FIR_COEF_H(0, 2));
-+	SR(VID_FIR_COEF_H(0, 3));
-+	SR(VID_FIR_COEF_H(0, 4));
-+	SR(VID_FIR_COEF_H(0, 5));
-+	SR(VID_FIR_COEF_H(0, 6));
-+	SR(VID_FIR_COEF_H(0, 7));
-+
-+	SR(VID_FIR_COEF_HV(0, 0));
-+	SR(VID_FIR_COEF_HV(0, 1));
-+	SR(VID_FIR_COEF_HV(0, 2));
-+	SR(VID_FIR_COEF_HV(0, 3));
-+	SR(VID_FIR_COEF_HV(0, 4));
-+	SR(VID_FIR_COEF_HV(0, 5));
-+	SR(VID_FIR_COEF_HV(0, 6));
-+	SR(VID_FIR_COEF_HV(0, 7));
-+
-+	SR(VID_CONV_COEF(0, 0));
-+	SR(VID_CONV_COEF(0, 1));
-+	SR(VID_CONV_COEF(0, 2));
-+	SR(VID_CONV_COEF(0, 3));
-+	SR(VID_CONV_COEF(0, 4));
-+
-+	SR(VID_FIR_COEF_V(0, 0));
-+	SR(VID_FIR_COEF_V(0, 1));
-+	SR(VID_FIR_COEF_V(0, 2));
-+	SR(VID_FIR_COEF_V(0, 3));
-+	SR(VID_FIR_COEF_V(0, 4));
-+	SR(VID_FIR_COEF_V(0, 5));
-+	SR(VID_FIR_COEF_V(0, 6));
-+	SR(VID_FIR_COEF_V(0, 7));
-+
-+	SR(VID_PRELOAD(0));
-+
-+	/* VID2 */
-+	SR(VID_BA0(1));
-+	SR(VID_BA1(1));
-+	SR(VID_POSITION(1));
-+	SR(VID_SIZE(1));
-+	SR(VID_ATTRIBUTES(1));
-+	SR(VID_FIFO_THRESHOLD(1));
-+	SR(VID_ROW_INC(1));
-+	SR(VID_PIXEL_INC(1));
-+	SR(VID_FIR(1));
-+	SR(VID_PICTURE_SIZE(1));
-+	SR(VID_ACCU0(1));
-+	SR(VID_ACCU1(1));
-+
-+	SR(VID_FIR_COEF_H(1, 0));
-+	SR(VID_FIR_COEF_H(1, 1));
-+	SR(VID_FIR_COEF_H(1, 2));
-+	SR(VID_FIR_COEF_H(1, 3));
-+	SR(VID_FIR_COEF_H(1, 4));
-+	SR(VID_FIR_COEF_H(1, 5));
-+	SR(VID_FIR_COEF_H(1, 6));
-+	SR(VID_FIR_COEF_H(1, 7));
-+
-+	SR(VID_FIR_COEF_HV(1, 0));
-+	SR(VID_FIR_COEF_HV(1, 1));
-+	SR(VID_FIR_COEF_HV(1, 2));
-+	SR(VID_FIR_COEF_HV(1, 3));
-+	SR(VID_FIR_COEF_HV(1, 4));
-+	SR(VID_FIR_COEF_HV(1, 5));
-+	SR(VID_FIR_COEF_HV(1, 6));
-+	SR(VID_FIR_COEF_HV(1, 7));
-+
-+	SR(VID_CONV_COEF(1, 0));
-+	SR(VID_CONV_COEF(1, 1));
-+	SR(VID_CONV_COEF(1, 2));
-+	SR(VID_CONV_COEF(1, 3));
-+	SR(VID_CONV_COEF(1, 4));
-+
-+	SR(VID_FIR_COEF_V(1, 0));
-+	SR(VID_FIR_COEF_V(1, 1));
-+	SR(VID_FIR_COEF_V(1, 2));
-+	SR(VID_FIR_COEF_V(1, 3));
-+	SR(VID_FIR_COEF_V(1, 4));
-+	SR(VID_FIR_COEF_V(1, 5));
-+	SR(VID_FIR_COEF_V(1, 6));
-+	SR(VID_FIR_COEF_V(1, 7));
-+
-+	SR(VID_PRELOAD(1));
-+}
-+
-+void dispc_restore_context(void)
-+{
-+	RR(SYSCONFIG);
-+	RR(IRQENABLE);
-+	/*RR(CONTROL);*/
-+	RR(CONFIG);
-+	RR(DEFAULT_COLOR0);
-+	RR(DEFAULT_COLOR1);
-+	RR(TRANS_COLOR0);
-+	RR(TRANS_COLOR1);
-+	RR(LINE_NUMBER);
-+	RR(TIMING_H);
-+	RR(TIMING_V);
-+	RR(POL_FREQ);
-+	RR(DIVISOR);
-+	RR(GLOBAL_ALPHA);
-+	RR(SIZE_DIG);
-+	RR(SIZE_LCD);
-+
-+	RR(GFX_BA0);
-+	RR(GFX_BA1);
-+	RR(GFX_POSITION);
-+	RR(GFX_SIZE);
-+	RR(GFX_ATTRIBUTES);
-+	RR(GFX_FIFO_THRESHOLD);
-+	RR(GFX_ROW_INC);
-+	RR(GFX_PIXEL_INC);
-+	RR(GFX_WINDOW_SKIP);
-+	RR(GFX_TABLE_BA);
-+
-+	RR(DATA_CYCLE1);
-+	RR(DATA_CYCLE2);
-+	RR(DATA_CYCLE3);
-+
-+	RR(CPR_COEF_R);
-+	RR(CPR_COEF_G);
-+	RR(CPR_COEF_B);
-+
-+	RR(GFX_PRELOAD);
-+
-+	/* VID1 */
-+	RR(VID_BA0(0));
-+	RR(VID_BA1(0));
-+	RR(VID_POSITION(0));
-+	RR(VID_SIZE(0));
-+	RR(VID_ATTRIBUTES(0));
-+	RR(VID_FIFO_THRESHOLD(0));
-+	RR(VID_ROW_INC(0));
-+	RR(VID_PIXEL_INC(0));
-+	RR(VID_FIR(0));
-+	RR(VID_PICTURE_SIZE(0));
-+	RR(VID_ACCU0(0));
-+	RR(VID_ACCU1(0));
-+
-+	RR(VID_FIR_COEF_H(0, 0));
-+	RR(VID_FIR_COEF_H(0, 1));
-+	RR(VID_FIR_COEF_H(0, 2));
-+	RR(VID_FIR_COEF_H(0, 3));
-+	RR(VID_FIR_COEF_H(0, 4));
-+	RR(VID_FIR_COEF_H(0, 5));
-+	RR(VID_FIR_COEF_H(0, 6));
-+	RR(VID_FIR_COEF_H(0, 7));
-+
-+	RR(VID_FIR_COEF_HV(0, 0));
-+	RR(VID_FIR_COEF_HV(0, 1));
-+	RR(VID_FIR_COEF_HV(0, 2));
-+	RR(VID_FIR_COEF_HV(0, 3));
-+	RR(VID_FIR_COEF_HV(0, 4));
-+	RR(VID_FIR_COEF_HV(0, 5));
-+	RR(VID_FIR_COEF_HV(0, 6));
-+	RR(VID_FIR_COEF_HV(0, 7));
-+
-+	RR(VID_CONV_COEF(0, 0));
-+	RR(VID_CONV_COEF(0, 1));
-+	RR(VID_CONV_COEF(0, 2));
-+	RR(VID_CONV_COEF(0, 3));
-+	RR(VID_CONV_COEF(0, 4));
-+
-+	RR(VID_FIR_COEF_V(0, 0));
-+	RR(VID_FIR_COEF_V(0, 1));
-+	RR(VID_FIR_COEF_V(0, 2));
-+	RR(VID_FIR_COEF_V(0, 3));
-+	RR(VID_FIR_COEF_V(0, 4));
-+	RR(VID_FIR_COEF_V(0, 5));
-+	RR(VID_FIR_COEF_V(0, 6));
-+	RR(VID_FIR_COEF_V(0, 7));
-+
-+	RR(VID_PRELOAD(0));
-+
-+	/* VID2 */
-+	RR(VID_BA0(1));
-+	RR(VID_BA1(1));
-+	RR(VID_POSITION(1));
-+	RR(VID_SIZE(1));
-+	RR(VID_ATTRIBUTES(1));
-+	RR(VID_FIFO_THRESHOLD(1));
-+	RR(VID_ROW_INC(1));
-+	RR(VID_PIXEL_INC(1));
-+	RR(VID_FIR(1));
-+	RR(VID_PICTURE_SIZE(1));
-+	RR(VID_ACCU0(1));
-+	RR(VID_ACCU1(1));
-+
-+	RR(VID_FIR_COEF_H(1, 0));
-+	RR(VID_FIR_COEF_H(1, 1));
-+	RR(VID_FIR_COEF_H(1, 2));
-+	RR(VID_FIR_COEF_H(1, 3));
-+	RR(VID_FIR_COEF_H(1, 4));
-+	RR(VID_FIR_COEF_H(1, 5));
-+	RR(VID_FIR_COEF_H(1, 6));
-+	RR(VID_FIR_COEF_H(1, 7));
-+
-+	RR(VID_FIR_COEF_HV(1, 0));
-+	RR(VID_FIR_COEF_HV(1, 1));
-+	RR(VID_FIR_COEF_HV(1, 2));
-+	RR(VID_FIR_COEF_HV(1, 3));
-+	RR(VID_FIR_COEF_HV(1, 4));
-+	RR(VID_FIR_COEF_HV(1, 5));
-+	RR(VID_FIR_COEF_HV(1, 6));
-+	RR(VID_FIR_COEF_HV(1, 7));
-+
-+	RR(VID_CONV_COEF(1, 0));
-+	RR(VID_CONV_COEF(1, 1));
-+	RR(VID_CONV_COEF(1, 2));
-+	RR(VID_CONV_COEF(1, 3));
-+	RR(VID_CONV_COEF(1, 4));
-+
-+	RR(VID_FIR_COEF_V(1, 0));
-+	RR(VID_FIR_COEF_V(1, 1));
-+	RR(VID_FIR_COEF_V(1, 2));
-+	RR(VID_FIR_COEF_V(1, 3));
-+	RR(VID_FIR_COEF_V(1, 4));
-+	RR(VID_FIR_COEF_V(1, 5));
-+	RR(VID_FIR_COEF_V(1, 6));
-+	RR(VID_FIR_COEF_V(1, 7));
-+
-+	RR(VID_PRELOAD(1));
-+
-+	/* enable last, because LCD & DIGIT enable are here */
-+	RR(CONTROL);
-+}
-+
-+#undef SR
-+#undef RR
-+
-+static inline void enable_clocks(bool enable)
-+{
-+	if (enable)
-+		dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1);
-+	else
-+		dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
-+}
-+
-+bool dispc_go_busy(enum omap_channel channel)
-+{
-+	int bit;
-+
-+	if (channel == OMAP_DSS_CHANNEL_LCD)
-+		bit = 5; /* GOLCD */
-+	else
-+		bit = 6; /* GODIGIT */
-+
-+	return REG_GET(DISPC_CONTROL, bit, bit) == 1;
-+}
-+
-+void dispc_go(enum omap_channel channel)
-+{
-+	int bit;
-+
-+	enable_clocks(1);
-+
-+	if (channel == OMAP_DSS_CHANNEL_LCD)
-+		bit = 0; /* LCDENABLE */
-+	else
-+		bit = 1; /* DIGITALENABLE */
-+
-+	/* if the channel is not enabled, we don't need GO */
-+	if (REG_GET(DISPC_CONTROL, bit, bit) == 0)
-+		goto end;
-+
-+	if (channel == OMAP_DSS_CHANNEL_LCD)
-+		bit = 5; /* GOLCD */
-+	else
-+		bit = 6; /* GODIGIT */
-+
-+	if (REG_GET(DISPC_CONTROL, bit, bit) == 1) {
-+		DSSERR("GO bit not down for channel %d\n", channel);
-+		goto end;
-+	}
-+
-+	DSSDBG("GO %s\n", channel == OMAP_DSS_CHANNEL_LCD ? "LCD" : "DIGIT");
-+
-+	REG_FLD_MOD(DISPC_CONTROL, 1, bit, bit);
-+end:
-+	enable_clocks(0);
-+}
-+
-+static void _dispc_write_firh_reg(enum omap_plane plane, int reg, u32 value)
-+{
-+	BUG_ON(plane == OMAP_DSS_GFX);
-+
-+	dispc_write_reg(DISPC_VID_FIR_COEF_H(plane-1, reg), value);
-+}
-+
-+static void _dispc_write_firhv_reg(enum omap_plane plane, int reg, u32 value)
-+{
-+	BUG_ON(plane == OMAP_DSS_GFX);
-+
-+	dispc_write_reg(DISPC_VID_FIR_COEF_HV(plane-1, reg), value);
-+}
-+
-+static void _dispc_write_firv_reg(enum omap_plane plane, int reg, u32 value)
-+{
-+	BUG_ON(plane == OMAP_DSS_GFX);
-+
-+	dispc_write_reg(DISPC_VID_FIR_COEF_V(plane-1, reg), value);
-+}
-+
-+static void _dispc_set_scale_coef(enum omap_plane plane, int hscaleup,
-+		int vscaleup, int five_taps)
-+{
-+	/* Coefficients for horizontal up-sampling */
-+	static const u32 coef_hup[8] = {
-+		0x00800000,
-+		0x0D7CF800,
-+		0x1E70F5FF,
-+		0x335FF5FE,
-+		0xF74949F7,
-+		0xF55F33FB,
-+		0xF5701EFE,
-+		0xF87C0DFF,
-+	};
-+
-+	/* Coefficients for horizontal down-sampling */
-+	static const u32 coef_hdown[8] = {
-+		0x24382400,
-+		0x28371FFE,
-+		0x2C361BFB,
-+		0x303516F9,
-+		0x11343311,
-+		0x1635300C,
-+		0x1B362C08,
-+		0x1F372804,
-+	};
-+
-+	/* Coefficients for horizontal and vertical up-sampling */
-+	static const u32 coef_hvup[2][8] = {
-+		{
-+		0x00800000,
-+		0x037B02FF,
-+		0x0C6F05FE,
-+		0x205907FB,
-+		0x00404000,
-+		0x075920FE,
-+		0x056F0CFF,
-+		0x027B0300,
-+		},
-+		{
-+		0x00800000,
-+		0x0D7CF8FF,
-+		0x1E70F5FE,
-+		0x335FF5FB,
-+		0xF7404000,
-+		0xF55F33FE,
-+		0xF5701EFF,
-+		0xF87C0D00,
-+		},
-+	};
-+
-+	/* Coefficients for horizontal and vertical down-sampling */
-+	static const u32 coef_hvdown[2][8] = {
-+		{
-+		0x24382400,
-+		0x28391F04,
-+		0x2D381B08,
-+		0x3237170C,
-+		0x123737F7,
-+		0x173732F9,
-+		0x1B382DFB,
-+		0x1F3928FE,
-+		},
-+		{
-+		0x24382400,
-+		0x28371F04,
-+		0x2C361B08,
-+		0x3035160C,
-+		0x113433F7,
-+		0x163530F9,
-+		0x1B362CFB,
-+		0x1F3728FE,
-+		},
-+	};
-+
-+	/* Coefficients for vertical up-sampling */
-+	static const u32 coef_vup[8] = {
-+		0x00000000,
-+		0x0000FF00,
-+		0x0000FEFF,
-+		0x0000FBFE,
-+		0x000000F7,
-+		0x0000FEFB,
-+		0x0000FFFE,
-+		0x000000FF,
-+	};
-+
-+
-+	/* Coefficients for vertical down-sampling */
-+	static const u32 coef_vdown[8] = {
-+		0x00000000,
-+		0x000004FE,
-+		0x000008FB,
-+		0x00000CF9,
-+		0x0000F711,
-+		0x0000F90C,
-+		0x0000FB08,
-+		0x0000FE04,
-+	};
-+
-+	const u32 *h_coef;
-+	const u32 *hv_coef;
-+	const u32 *hv_coef_mod;
-+	const u32 *v_coef;
-+	int i;
-+
-+	if (hscaleup)
-+		h_coef = coef_hup;
-+	else
-+		h_coef = coef_hdown;
-+
-+	if (vscaleup) {
-+		hv_coef = coef_hvup[five_taps];
-+		v_coef = coef_vup;
-+
-+		if (hscaleup)
-+			hv_coef_mod = NULL;
-+		else
-+			hv_coef_mod = coef_hvdown[five_taps];
-+	} else {
-+		hv_coef = coef_hvdown[five_taps];
-+		v_coef = coef_vdown;
-+
-+		if (hscaleup)
-+			hv_coef_mod = coef_hvup[five_taps];
-+		else
-+			hv_coef_mod = NULL;
-+	}
-+
-+	for (i = 0; i < 8; i++) {
-+		u32 h, hv;
-+
-+		h = h_coef[i];
-+
-+		hv = hv_coef[i];
-+
-+		if (hv_coef_mod) {
-+			hv &= 0xffffff00;
-+			hv |= (hv_coef_mod[i] & 0xff);
-+		}
-+
-+		_dispc_write_firh_reg(plane, i, h);
-+		_dispc_write_firhv_reg(plane, i, hv);
-+	}
-+
-+	if (!five_taps)
-+		return;
-+
-+	for (i = 0; i < 8; i++) {
-+		u32 v;
-+		v = v_coef[i];
-+		_dispc_write_firv_reg(plane, i, v);
-+	}
-+}
-+
-+static void _dispc_setup_color_conv_coef(void)
-+{
-+	const struct color_conv_coef {
-+		int  ry,  rcr,  rcb,   gy,  gcr,  gcb,   by,  bcr,  bcb;
-+		int  full_range;
-+	}  ctbl_bt601_5 = {
-+		298,  409,    0,  298, -208, -100,  298,    0,  517, 0,
-+	};
-+
-+	const struct color_conv_coef *ct;
-+
-+#define CVAL(x, y) (FLD_VAL(x, 26, 16) | FLD_VAL(y, 10, 0))
-+
-+	ct = &ctbl_bt601_5;
-+
-+	dispc_write_reg(DISPC_VID_CONV_COEF(0, 0), CVAL(ct->rcr, ct->ry));
-+	dispc_write_reg(DISPC_VID_CONV_COEF(0, 1), CVAL(ct->gy,	 ct->rcb));
-+	dispc_write_reg(DISPC_VID_CONV_COEF(0, 2), CVAL(ct->gcb, ct->gcr));
-+	dispc_write_reg(DISPC_VID_CONV_COEF(0, 3), CVAL(ct->bcr, ct->by));
-+	dispc_write_reg(DISPC_VID_CONV_COEF(0, 4), CVAL(0,       ct->bcb));
-+
-+	dispc_write_reg(DISPC_VID_CONV_COEF(1, 0), CVAL(ct->rcr, ct->ry));
-+	dispc_write_reg(DISPC_VID_CONV_COEF(1, 1), CVAL(ct->gy,	 ct->rcb));
-+	dispc_write_reg(DISPC_VID_CONV_COEF(1, 2), CVAL(ct->gcb, ct->gcr));
-+	dispc_write_reg(DISPC_VID_CONV_COEF(1, 3), CVAL(ct->bcr, ct->by));
-+	dispc_write_reg(DISPC_VID_CONV_COEF(1, 4), CVAL(0,       ct->bcb));
-+
-+#undef CVAL
-+
-+	REG_FLD_MOD(DISPC_VID_ATTRIBUTES(0), ct->full_range, 11, 11);
-+	REG_FLD_MOD(DISPC_VID_ATTRIBUTES(1), ct->full_range, 11, 11);
-+}
-+
-+
-+static void _dispc_set_plane_ba0(enum omap_plane plane, u32 paddr)
-+{
-+	const struct dispc_reg ba0_reg[] = { DISPC_GFX_BA0,
-+		DISPC_VID_BA0(0),
-+		DISPC_VID_BA0(1) };
-+
-+	dispc_write_reg(ba0_reg[plane], paddr);
-+}
-+
-+static void _dispc_set_plane_ba1(enum omap_plane plane, u32 paddr)
-+{
-+	const struct dispc_reg ba1_reg[] = { DISPC_GFX_BA1,
-+				      DISPC_VID_BA1(0),
-+				      DISPC_VID_BA1(1) };
-+
-+	dispc_write_reg(ba1_reg[plane], paddr);
-+}
-+
-+static void _dispc_set_plane_pos(enum omap_plane plane, int x, int y)
-+{
-+	const struct dispc_reg pos_reg[] = { DISPC_GFX_POSITION,
-+				      DISPC_VID_POSITION(0),
-+				      DISPC_VID_POSITION(1) };
-+
-+	u32 val = FLD_VAL(y, 26, 16) | FLD_VAL(x, 10, 0);
-+	dispc_write_reg(pos_reg[plane], val);
-+}
-+
-+static void _dispc_set_pic_size(enum omap_plane plane, int width, int height)
-+{
-+	const struct dispc_reg siz_reg[] = { DISPC_GFX_SIZE,
-+				      DISPC_VID_PICTURE_SIZE(0),
-+				      DISPC_VID_PICTURE_SIZE(1) };
-+	u32 val = FLD_VAL(height - 1, 26, 16) | FLD_VAL(width - 1, 10, 0);
-+	dispc_write_reg(siz_reg[plane], val);
-+}
-+
-+static void _dispc_set_vid_size(enum omap_plane plane, int width, int height)
-+{
-+	u32 val;
-+	const struct dispc_reg vsi_reg[] = { DISPC_VID_SIZE(0),
-+				      DISPC_VID_SIZE(1) };
-+
-+	BUG_ON(plane == OMAP_DSS_GFX);
-+
-+	val = FLD_VAL(height - 1, 26, 16) | FLD_VAL(width - 1, 10, 0);
-+	dispc_write_reg(vsi_reg[plane-1], val);
-+}
-+
-+static void _dispc_setup_global_alpha(enum omap_plane plane, u8 global_alpha)
-+{
-+
-+	BUG_ON(plane == OMAP_DSS_VIDEO1);
-+
-+	if (plane == OMAP_DSS_GFX)
-+		REG_FLD_MOD(DISPC_GLOBAL_ALPHA, global_alpha, 7, 0);
-+	else if (plane == OMAP_DSS_VIDEO2)
-+		REG_FLD_MOD(DISPC_GLOBAL_ALPHA, global_alpha, 23, 16);
-+}
-+
-+static void _dispc_set_pix_inc(enum omap_plane plane, s32 inc)
-+{
-+	const struct dispc_reg ri_reg[] = { DISPC_GFX_PIXEL_INC,
-+				     DISPC_VID_PIXEL_INC(0),
-+				     DISPC_VID_PIXEL_INC(1) };
-+
-+	dispc_write_reg(ri_reg[plane], inc);
-+}
-+
-+static void _dispc_set_row_inc(enum omap_plane plane, s32 inc)
-+{
-+	const struct dispc_reg ri_reg[] = { DISPC_GFX_ROW_INC,
-+				     DISPC_VID_ROW_INC(0),
-+				     DISPC_VID_ROW_INC(1) };
-+
-+	dispc_write_reg(ri_reg[plane], inc);
-+}
-+
-+static void _dispc_set_color_mode(enum omap_plane plane,
-+		enum omap_color_mode color_mode)
-+{
-+	u32 m = 0;
-+
-+	switch (color_mode) {
-+	case OMAP_DSS_COLOR_CLUT1:
-+		m = 0x0; break;
-+	case OMAP_DSS_COLOR_CLUT2:
-+		m = 0x1; break;
-+	case OMAP_DSS_COLOR_CLUT4:
-+		m = 0x2; break;
-+	case OMAP_DSS_COLOR_CLUT8:
-+		m = 0x3; break;
-+	case OMAP_DSS_COLOR_RGB12U:
-+		m = 0x4; break;
-+	case OMAP_DSS_COLOR_ARGB16:
-+		m = 0x5; break;
-+	case OMAP_DSS_COLOR_RGB16:
-+		m = 0x6; break;
-+	case OMAP_DSS_COLOR_RGB24U:
-+		m = 0x8; break;
-+	case OMAP_DSS_COLOR_RGB24P:
-+		m = 0x9; break;
-+	case OMAP_DSS_COLOR_YUV2:
-+		m = 0xa; break;
-+	case OMAP_DSS_COLOR_UYVY:
-+		m = 0xb; break;
-+	case OMAP_DSS_COLOR_ARGB32:
-+		m = 0xc; break;
-+	case OMAP_DSS_COLOR_RGBA32:
-+		m = 0xd; break;
-+	case OMAP_DSS_COLOR_RGBX32:
-+		m = 0xe; break;
-+	default:
-+		BUG(); break;
-+	}
-+
-+	REG_FLD_MOD(dispc_reg_att[plane], m, 4, 1);
-+}
-+
-+static void _dispc_set_channel_out(enum omap_plane plane,
-+		enum omap_channel channel)
-+{
-+	int shift;
-+	u32 val;
-+
-+	switch (plane) {
-+	case OMAP_DSS_GFX:
-+		shift = 8;
-+		break;
-+	case OMAP_DSS_VIDEO1:
-+	case OMAP_DSS_VIDEO2:
-+		shift = 16;
-+		break;
-+	default:
-+		BUG();
-+		return;
-+	}
-+
-+	val = dispc_read_reg(dispc_reg_att[plane]);
-+	val = FLD_MOD(val, channel, shift, shift);
-+	dispc_write_reg(dispc_reg_att[plane], val);
-+}
-+
-+void dispc_set_burst_size(enum omap_plane plane,
-+		enum omap_burst_size burst_size)
-+{
-+	int shift;
-+	u32 val;
-+
-+	enable_clocks(1);
-+
-+	switch (plane) {
-+	case OMAP_DSS_GFX:
-+		shift = 6;
-+		break;
-+	case OMAP_DSS_VIDEO1:
-+	case OMAP_DSS_VIDEO2:
-+		shift = 14;
-+		break;
-+	default:
-+		BUG();
-+		return;
-+	}
-+
-+	val = dispc_read_reg(dispc_reg_att[plane]);
-+	val = FLD_MOD(val, burst_size, shift+1, shift);
-+	dispc_write_reg(dispc_reg_att[plane], val);
-+
-+	enable_clocks(0);
-+}
-+
-+static void _dispc_set_vid_color_conv(enum omap_plane plane, bool enable)
-+{
-+	u32 val;
-+
-+	BUG_ON(plane == OMAP_DSS_GFX);
-+
-+	val = dispc_read_reg(dispc_reg_att[plane]);
-+	val = FLD_MOD(val, enable, 9, 9);
-+	dispc_write_reg(dispc_reg_att[plane], val);
-+}
-+
-+void dispc_enable_replication(enum omap_plane plane, bool enable)
-+{
-+	int bit;
-+
-+	if (plane == OMAP_DSS_GFX)
-+		bit = 5;
-+	else
-+		bit = 10;
-+
-+	enable_clocks(1);
-+	REG_FLD_MOD(dispc_reg_att[plane], enable, bit, bit);
-+	enable_clocks(0);
-+}
-+
-+void dispc_set_lcd_size(u16 width, u16 height)
-+{
-+	u32 val;
-+	BUG_ON((width > (1 << 11)) || (height > (1 << 11)));
-+	val = FLD_VAL(height - 1, 26, 16) | FLD_VAL(width - 1, 10, 0);
-+	enable_clocks(1);
-+	dispc_write_reg(DISPC_SIZE_LCD, val);
-+	enable_clocks(0);
-+}
-+
-+void dispc_set_digit_size(u16 width, u16 height)
-+{
-+	u32 val;
-+	BUG_ON((width > (1 << 11)) || (height > (1 << 11)));
-+	val = FLD_VAL(height - 1, 26, 16) | FLD_VAL(width - 1, 10, 0);
-+	enable_clocks(1);
-+	dispc_write_reg(DISPC_SIZE_DIG, val);
-+	enable_clocks(0);
-+}
-+
-+static void dispc_read_plane_fifo_sizes(void)
-+{
-+	const struct dispc_reg fsz_reg[] = { DISPC_GFX_FIFO_SIZE_STATUS,
-+				      DISPC_VID_FIFO_SIZE_STATUS(0),
-+				      DISPC_VID_FIFO_SIZE_STATUS(1) };
-+	u32 size;
-+	int plane;
-+
-+	enable_clocks(1);
-+
-+	for (plane = 0; plane < ARRAY_SIZE(dispc.fifo_size); ++plane) {
-+		if (cpu_is_omap24xx())
-+			size = FLD_GET(dispc_read_reg(fsz_reg[plane]), 8, 0);
-+		else if (cpu_is_omap34xx())
-+			size = FLD_GET(dispc_read_reg(fsz_reg[plane]), 10, 0);
-+		else
-+			BUG();
-+
-+		dispc.fifo_size[plane] = size;
-+	}
-+
-+	enable_clocks(0);
-+}
-+
-+u32 dispc_get_plane_fifo_size(enum omap_plane plane)
-+{
-+	return dispc.fifo_size[plane];
-+}
-+
-+void dispc_setup_plane_fifo(enum omap_plane plane, u32 low, u32 high)
-+{
-+	const struct dispc_reg ftrs_reg[] = { DISPC_GFX_FIFO_THRESHOLD,
-+				       DISPC_VID_FIFO_THRESHOLD(0),
-+				       DISPC_VID_FIFO_THRESHOLD(1) };
-+	enable_clocks(1);
-+
-+	DSSDBG("fifo(%d) low/high old %u/%u, new %u/%u\n",
-+			plane,
-+			REG_GET(ftrs_reg[plane], 11, 0),
-+			REG_GET(ftrs_reg[plane], 27, 16),
-+			low, high);
-+
-+	if (cpu_is_omap24xx())
-+		dispc_write_reg(ftrs_reg[plane],
-+				FLD_VAL(high, 24, 16) | FLD_VAL(low, 8, 0));
-+	else
-+		dispc_write_reg(ftrs_reg[plane],
-+				FLD_VAL(high, 27, 16) | FLD_VAL(low, 11, 0));
-+
-+	enable_clocks(0);
-+}
-+
-+void dispc_enable_fifomerge(bool enable)
-+{
-+	enable_clocks(1);
-+
-+	DSSDBG("FIFO merge %s\n", enable ? "enabled" : "disabled");
-+	REG_FLD_MOD(DISPC_CONFIG, enable ? 1 : 0, 14, 14);
-+
-+	enable_clocks(0);
-+}
-+
-+static void _dispc_set_fir(enum omap_plane plane, int hinc, int vinc)
-+{
-+	u32 val;
-+	const struct dispc_reg fir_reg[] = { DISPC_VID_FIR(0),
-+				      DISPC_VID_FIR(1) };
-+
-+	BUG_ON(plane == OMAP_DSS_GFX);
-+
-+	if (cpu_is_omap24xx())
-+		val = FLD_VAL(vinc, 27, 16) | FLD_VAL(hinc, 11, 0);
-+	else
-+		val = FLD_VAL(vinc, 28, 16) | FLD_VAL(hinc, 12, 0);
-+	dispc_write_reg(fir_reg[plane-1], val);
-+}
-+
-+static void _dispc_set_vid_accu0(enum omap_plane plane, int haccu, int vaccu)
-+{
-+	u32 val;
-+	const struct dispc_reg ac0_reg[] = { DISPC_VID_ACCU0(0),
-+				      DISPC_VID_ACCU0(1) };
-+
-+	BUG_ON(plane == OMAP_DSS_GFX);
-+
-+	val = FLD_VAL(vaccu, 25, 16) | FLD_VAL(haccu, 9, 0);
-+	dispc_write_reg(ac0_reg[plane-1], val);
-+}
-+
-+static void _dispc_set_vid_accu1(enum omap_plane plane, int haccu, int vaccu)
-+{
-+	u32 val;
-+	const struct dispc_reg ac1_reg[] = { DISPC_VID_ACCU1(0),
-+				      DISPC_VID_ACCU1(1) };
-+
-+	BUG_ON(plane == OMAP_DSS_GFX);
-+
-+	val = FLD_VAL(vaccu, 25, 16) | FLD_VAL(haccu, 9, 0);
-+	dispc_write_reg(ac1_reg[plane-1], val);
-+}
-+
-+
-+static void _dispc_set_scaling(enum omap_plane plane,
-+		u16 orig_width, u16 orig_height,
-+		u16 out_width, u16 out_height,
-+		bool ilace, bool five_taps,
-+		bool fieldmode)
-+{
-+	int fir_hinc;
-+	int fir_vinc;
-+	int hscaleup, vscaleup;
-+	int accu0 = 0;
-+	int accu1 = 0;
-+	u32 l;
-+
-+	BUG_ON(plane == OMAP_DSS_GFX);
-+
-+	hscaleup = orig_width <= out_width;
-+	vscaleup = orig_height <= out_height;
-+
-+	_dispc_set_scale_coef(plane, hscaleup, vscaleup, five_taps);
-+
-+	if (!orig_width || orig_width == out_width)
-+		fir_hinc = 0;
-+	else
-+		fir_hinc = 1024 * orig_width / out_width;
-+
-+	if (!orig_height || orig_height == out_height)
-+		fir_vinc = 0;
-+	else
-+		fir_vinc = 1024 * orig_height / out_height;
-+
-+	_dispc_set_fir(plane, fir_hinc, fir_vinc);
-+
-+	l = dispc_read_reg(dispc_reg_att[plane]);
-+	l &= ~((0x0f << 5) | (0x3 << 21));
-+
-+	l |= fir_hinc ? (1 << 5) : 0;
-+	l |= fir_vinc ? (1 << 6) : 0;
-+
-+	l |= hscaleup ? 0 : (1 << 7);
-+	l |= vscaleup ? 0 : (1 << 8);
-+
-+	l |= five_taps ? (1 << 21) : 0;
-+	l |= five_taps ? (1 << 22) : 0;
-+
-+	dispc_write_reg(dispc_reg_att[plane], l);
-+
-+	/*
-+	 * field 0 = even field = bottom field
-+	 * field 1 = odd field = top field
-+	 */
-+	if (ilace && !fieldmode) {
-+		accu1 = 0;
-+		accu0 = (fir_vinc / 2) & 0x3ff;
-+		if (accu0 >= 1024/2) {
-+			accu1 = 1024/2;
-+			accu0 -= accu1;
-+		}
-+	}
-+
-+	_dispc_set_vid_accu0(plane, 0, accu0);
-+	_dispc_set_vid_accu1(plane, 0, accu1);
-+}
-+
-+static void _dispc_set_rotation_attrs(enum omap_plane plane, u8 rotation,
-+		bool mirroring, enum omap_color_mode color_mode)
-+{
-+	if (color_mode == OMAP_DSS_COLOR_YUV2 ||
-+			color_mode == OMAP_DSS_COLOR_UYVY) {
-+		int vidrot = 0;
-+
-+		if (mirroring) {
-+			switch (rotation) {
-+			case 0:
-+				vidrot = 2;
-+				break;
-+			case 1:
-+				vidrot = 1;
-+				break;
-+			case 2:
-+				vidrot = 0;
-+				break;
-+			case 3:
-+				vidrot = 3;
-+				break;
-+			}
-+		} else {
-+			switch (rotation) {
-+			case 0:
-+				vidrot = 0;
-+				break;
-+			case 1:
-+				vidrot = 1;
-+				break;
-+			case 2:
-+				vidrot = 2;
-+				break;
-+			case 3:
-+				vidrot = 3;
-+				break;
-+			}
-+		}
-+
-+		REG_FLD_MOD(dispc_reg_att[plane], vidrot, 13, 12);
-+
-+		if (rotation == 1 || rotation == 3)
-+			REG_FLD_MOD(dispc_reg_att[plane], 0x1, 18, 18);
-+		else
-+			REG_FLD_MOD(dispc_reg_att[plane], 0x0, 18, 18);
-+	} else {
-+		REG_FLD_MOD(dispc_reg_att[plane], 0, 13, 12);
-+		REG_FLD_MOD(dispc_reg_att[plane], 0, 18, 18);
-+	}
-+}
-+
-+static s32 pixinc(int pixels, u8 ps)
-+{
-+	if (pixels == 1)
-+		return 1;
-+	else if (pixels > 1)
-+		return 1 + (pixels - 1) * ps;
-+	else if (pixels < 0)
-+		return 1 - (-pixels + 1) * ps;
-+	else
-+		BUG();
-+}
-+
-+static void calc_vrfb_rotation_offset(u8 rotation, bool mirror,
-+		u16 screen_width,
-+		u16 width, u16 height,
-+		enum omap_color_mode color_mode, bool fieldmode,
-+		unsigned int field_offset,
-+		unsigned *offset0, unsigned *offset1,
-+		s32 *row_inc, s32 *pix_inc)
-+{
-+	u8 ps;
-+
-+	switch (color_mode) {
-+	case OMAP_DSS_COLOR_RGB16:
-+	case OMAP_DSS_COLOR_ARGB16:
-+		ps = 2;
-+		break;
-+
-+	case OMAP_DSS_COLOR_RGB24P:
-+		ps = 3;
-+		break;
-+
-+	case OMAP_DSS_COLOR_RGB24U:
-+	case OMAP_DSS_COLOR_ARGB32:
-+	case OMAP_DSS_COLOR_RGBA32:
-+	case OMAP_DSS_COLOR_RGBX32:
-+	case OMAP_DSS_COLOR_YUV2:
-+	case OMAP_DSS_COLOR_UYVY:
-+		ps = 4;
-+		break;
-+
-+	default:
-+		BUG();
-+		return;
-+	}
-+
-+	DSSDBG("calc_rot(%d): scrw %d, %dx%d\n", rotation, screen_width,
-+			width, height);
-+
-+	/*
-+	 * field 0 = even field = bottom field
-+	 * field 1 = odd field = top field
-+	 */
-+	switch (rotation + mirror * 4) {
-+	case 0:
-+	case 2:
-+		/*
-+		 * If the pixel format is YUV or UYVY divide the width
-+		 * of the image by 2 for 0 and 180 degree rotation.
-+		 */
-+		if (color_mode == OMAP_DSS_COLOR_YUV2 ||
-+			color_mode == OMAP_DSS_COLOR_UYVY)
-+			width = width >> 1;
-+	case 1:
-+	case 3:
-+		*offset1 = 0;
-+		if (field_offset)
-+			*offset0 = field_offset * screen_width * ps;
-+		else
-+			*offset0 = 0;
-+
-+		*row_inc = pixinc(1 + (screen_width - width) +
-+				(fieldmode ? screen_width : 0),
-+				ps);
-+		*pix_inc = pixinc(1, ps);
-+		break;
-+
-+	case 4:
-+	case 6:
-+		/* If the pixel format is YUV or UYVY divide the width
-+		 * of the image by 2  for 0 degree and 180 degree
-+		 */
-+		if (color_mode == OMAP_DSS_COLOR_YUV2 ||
-+			color_mode == OMAP_DSS_COLOR_UYVY)
-+			width = width >> 1;
-+	case 5:
-+	case 7:
-+		*offset1 = 0;
-+		if (field_offset)
-+			*offset0 = field_offset * screen_width * ps;
-+		else
-+			*offset0 = 0;
-+		*row_inc = pixinc(1 - (screen_width + width) -
-+				(fieldmode ? screen_width : 0),
-+				ps);
-+		*pix_inc = pixinc(1, ps);
-+		break;
-+
-+	default:
-+		BUG();
-+	}
-+}
-+
-+static void calc_dma_rotation_offset(u8 rotation, bool mirror,
-+		u16 screen_width,
-+		u16 width, u16 height,
-+		enum omap_color_mode color_mode, bool fieldmode,
-+		unsigned int field_offset,
-+		unsigned *offset0, unsigned *offset1,
-+		s32 *row_inc, s32 *pix_inc)
-+{
-+	u8 ps;
-+	u16 fbw, fbh;
-+
-+	switch (color_mode) {
-+	case OMAP_DSS_COLOR_RGB16:
-+	case OMAP_DSS_COLOR_ARGB16:
-+		ps = 2;
-+		break;
-+
-+	case OMAP_DSS_COLOR_RGB24P:
-+		ps = 3;
-+		break;
-+
-+	case OMAP_DSS_COLOR_RGB24U:
-+	case OMAP_DSS_COLOR_ARGB32:
-+	case OMAP_DSS_COLOR_RGBA32:
-+	case OMAP_DSS_COLOR_RGBX32:
-+		ps = 4;
-+		break;
-+
-+	case OMAP_DSS_COLOR_YUV2:
-+	case OMAP_DSS_COLOR_UYVY:
-+		ps = 2;
-+		break;
-+	default:
-+		BUG();
-+		return;
-+	}
-+
-+	DSSDBG("calc_rot(%d): scrw %d, %dx%d\n", rotation, screen_width,
-+			width, height);
-+
-+	/* width & height are overlay sizes, convert to fb sizes */
-+
-+	if (rotation == 0 || rotation == 2) {
-+		fbw = width;
-+		fbh = height;
-+	} else {
-+		fbw = height;
-+		fbh = width;
-+	}
-+
-+	/*
-+	 * field 0 = even field = bottom field
-+	 * field 1 = odd field = top field
-+	 */
-+	switch (rotation + mirror * 4) {
-+	case 0:
-+		*offset1 = 0;
-+		if (field_offset)
-+			*offset0 = *offset1 + field_offset * screen_width * ps;
-+		else
-+			*offset0 = *offset1;
-+		*row_inc = pixinc(1 + (screen_width - fbw) +
-+				(fieldmode ? screen_width : 0),
-+				ps);
-+		*pix_inc = pixinc(1, ps);
-+		break;
-+	case 1:
-+		*offset1 = screen_width * (fbh - 1) * ps;
-+		if (field_offset)
-+			*offset0 = *offset1 + field_offset * ps;
-+		else
-+			*offset0 = *offset1;
-+		*row_inc = pixinc(screen_width * (fbh - 1) + 1 +
-+				(fieldmode ? 1 : 0), ps);
-+		*pix_inc = pixinc(-screen_width, ps);
-+		break;
-+	case 2:
-+		*offset1 = (screen_width * (fbh - 1) + fbw - 1) * ps;
-+		if (field_offset)
-+			*offset0 = *offset1 - field_offset * screen_width * ps;
-+		else
-+			*offset0 = *offset1;
-+		*row_inc = pixinc(-1 -
-+				(screen_width - fbw) -
-+				(fieldmode ? screen_width : 0),
-+				ps);
-+		*pix_inc = pixinc(-1, ps);
-+		break;
-+	case 3:
-+		*offset1 = (fbw - 1) * ps;
-+		if (field_offset)
-+			*offset0 = *offset1 - field_offset * ps;
-+		else
-+			*offset0 = *offset1;
-+		*row_inc = pixinc(-screen_width * (fbh - 1) - 1 -
-+				(fieldmode ? 1 : 0), ps);
-+		*pix_inc = pixinc(screen_width, ps);
-+		break;
-+
-+	/* mirroring */
-+	case 0 + 4:
-+		*offset1 = (fbw - 1) * ps;
-+		if (field_offset)
-+			*offset0 = *offset1 + field_offset * screen_width * ps;
-+		else
-+			*offset0 = *offset1;
-+		*row_inc = pixinc(screen_width * 2 - 1 +
-+				(fieldmode ? screen_width : 0),
-+				ps);
-+		*pix_inc = pixinc(-1, ps);
-+		break;
-+
-+	case 1 + 4:
-+		*offset1 = 0;
-+		if (field_offset)
-+			*offset0 = *offset1 + field_offset * ps;
-+		else
-+			*offset0 = *offset1;
-+		*row_inc = pixinc(-screen_width * (fbh - 1) + 1 +
-+				(fieldmode ? 1 : 0),
-+				ps);
-+		*pix_inc = pixinc(screen_width, ps);
-+		break;
-+
-+	case 2 + 4:
-+		*offset1 = screen_width * (fbh - 1) * ps;
-+		if (field_offset)
-+			*offset0 = *offset1 - field_offset * screen_width * ps;
-+		else
-+			*offset0 = *offset1;
-+		*row_inc = pixinc(1 - screen_width * 2 -
-+				(fieldmode ? screen_width : 0),
-+				ps);
-+		*pix_inc = pixinc(1, ps);
-+		break;
-+
-+	case 3 + 4:
-+		*offset1 = (screen_width * (fbh - 1) + fbw - 1) * ps;
-+		if (field_offset)
-+			*offset0 = *offset1 - field_offset * ps;
-+		else
-+			*offset0 = *offset1;
-+		*row_inc = pixinc(screen_width * (fbh - 1) - 1 -
-+				(fieldmode ? 1 : 0),
-+				ps);
-+		*pix_inc = pixinc(-screen_width, ps);
-+		break;
-+
-+	default:
-+		BUG();
-+	}
-+}
-+
-+static unsigned long calc_fclk_five_taps(u16 width, u16 height,
-+		u16 out_width, u16 out_height, enum omap_color_mode color_mode)
-+{
-+	u32 fclk = 0;
-+	/* FIXME venc pclk? */
-+	u64 tmp, pclk = dispc_pclk_rate();
-+
-+	if (height > out_height) {
-+		/* FIXME get real display PPL */
-+		unsigned int ppl = 800;
-+
-+		tmp = pclk * height * out_width;
-+		do_div(tmp, 2 * out_height * ppl);
-+		fclk = tmp;
-+
-+		if (height > 2 * out_height && ppl != out_width) {
-+			tmp = pclk * (height - 2 * out_height) * out_width;
-+			do_div(tmp, 2 * out_height * (ppl - out_width));
-+			fclk = max(fclk, (u32) tmp);
-+		}
-+	}
-+
-+	if (width > out_width) {
-+		tmp = pclk * width;
-+		do_div(tmp, out_width);
-+		fclk = max(fclk, (u32) tmp);
-+
-+		if (color_mode == OMAP_DSS_COLOR_RGB24U)
-+			fclk <<= 1;
-+	}
-+
-+	return fclk;
-+}
-+
-+static unsigned long calc_fclk(u16 width, u16 height,
-+		u16 out_width, u16 out_height)
-+{
-+	unsigned int hf, vf;
-+
-+	/*
-+	 * FIXME how to determine the 'A' factor
-+	 * for the no downscaling case ?
-+	 */
-+
-+	if (width > 3 * out_width)
-+		hf = 4;
-+	else if (width > 2 * out_width)
-+		hf = 3;
-+	else if (width > out_width)
-+		hf = 2;
-+	else
-+		hf = 1;
-+
-+	if (height > out_height)
-+		vf = 2;
-+	else
-+		vf = 1;
-+
-+	/* FIXME venc pclk? */
-+	return dispc_pclk_rate() * vf * hf;
-+}
-+
-+void dispc_set_channel_out(enum omap_plane plane, enum omap_channel channel_out)
-+{
-+	enable_clocks(1);
-+	_dispc_set_channel_out(plane, channel_out);
-+	enable_clocks(0);
-+}
-+
-+static int _dispc_setup_plane(enum omap_plane plane,
-+		u32 paddr, u16 screen_width,
-+		u16 pos_x, u16 pos_y,
-+		u16 width, u16 height,
-+		u16 out_width, u16 out_height,
-+		enum omap_color_mode color_mode,
-+		bool ilace,
-+		enum omap_dss_rotation_type rotation_type,
-+		u8 rotation, int mirror,
-+		u8 global_alpha)
-+{
-+	const int maxdownscale = cpu_is_omap34xx() ? 4 : 2;
-+	bool five_taps = 0;
-+	bool fieldmode = 0;
-+	int cconv = 0;
-+	unsigned offset0, offset1;
-+	s32 row_inc;
-+	s32 pix_inc;
-+	u16 frame_height = height;
-+	unsigned int field_offset = 0;
-+
-+	if (paddr == 0)
-+		return -EINVAL;
-+
-+	if (ilace && height == out_height)
-+		fieldmode = 1;
-+
-+	if (ilace) {
-+		if (fieldmode)
-+			height /= 2;
-+		pos_y /= 2;
-+		out_height /= 2;
-+
-+		DSSDBG("adjusting for ilace: height %d, pos_y %d, "
-+				"out_height %d\n",
-+				height, pos_y, out_height);
-+	}
-+
-+	if (plane == OMAP_DSS_GFX) {
-+		if (width != out_width || height != out_height)
-+			return -EINVAL;
-+
-+		switch (color_mode) {
-+		case OMAP_DSS_COLOR_ARGB16:
-+		case OMAP_DSS_COLOR_RGB16:
-+		case OMAP_DSS_COLOR_RGB24P:
-+		case OMAP_DSS_COLOR_RGB24U:
-+		case OMAP_DSS_COLOR_ARGB32:
-+		case OMAP_DSS_COLOR_RGBA32:
-+		case OMAP_DSS_COLOR_RGBX32:
-+			break;
-+
-+		default:
-+			return -EINVAL;
-+		}
-+	} else {
-+		/* video plane */
-+
-+		unsigned long fclk = 0;
-+
-+		if (out_width < width / maxdownscale ||
-+		   out_width > width * 8)
-+			return -EINVAL;
-+
-+		if (out_height < height / maxdownscale ||
-+		   out_height > height * 8)
-+			return -EINVAL;
-+
-+		switch (color_mode) {
-+		case OMAP_DSS_COLOR_RGB16:
-+		case OMAP_DSS_COLOR_RGB24P:
-+		case OMAP_DSS_COLOR_RGB24U:
-+		case OMAP_DSS_COLOR_RGBX32:
-+			break;
-+
-+		case OMAP_DSS_COLOR_ARGB16:
-+		case OMAP_DSS_COLOR_ARGB32:
-+		case OMAP_DSS_COLOR_RGBA32:
-+			if (plane == OMAP_DSS_VIDEO1)
-+				return -EINVAL;
-+			break;
-+
-+		case OMAP_DSS_COLOR_YUV2:
-+		case OMAP_DSS_COLOR_UYVY:
-+			cconv = 1;
-+			break;
-+
-+		default:
-+			return -EINVAL;
-+		}
-+
-+		/* Must use 5-tap filter? */
-+		five_taps = height > out_height * 2;
-+
-+		if (!five_taps) {
-+			fclk = calc_fclk(width, height,
-+					out_width, out_height);
-+
-+			/* Try 5-tap filter if 3-tap fclk is too high */
-+			if (cpu_is_omap34xx() && height > out_height &&
-+					fclk > dispc_fclk_rate())
-+				five_taps = true;
-+		}
-+
-+		if (width > (2048 >> five_taps))
-+			return -EINVAL;
-+
-+		if (five_taps)
-+			fclk = calc_fclk_five_taps(width, height,
-+					out_width, out_height, color_mode);
-+
-+		DSSDBG("required fclk rate = %lu Hz\n", fclk);
-+		DSSDBG("current fclk rate = %lu Hz\n", dispc_fclk_rate());
-+
-+		if (fclk > dispc_fclk_rate()) {
-+			DSSERR("failed to set up scaling, "
-+					"required fclk rate = %lu Hz, "
-+					"current fclk rate = %lu Hz\n",
-+					fclk, dispc_fclk_rate());
-+			return -EINVAL;
-+		}
-+	}
-+
-+	if (ilace && !fieldmode) {
-+		/*
-+		 * when downscaling the bottom field may have to start several
-+		 * source lines below the top field. Unfortunately ACCUI
-+		 * registers will only hold the fractional part of the offset
-+		 * so the integer part must be added to the base address of the
-+		 * bottom field.
-+		 */
-+		if (!height || height == out_height)
-+			field_offset = 0;
-+		else
-+			field_offset = height / out_height / 2;
-+	}
-+
-+	/* Fields are independent but interleaved in memory. */
-+	if (fieldmode)
-+		field_offset = 1;
-+
-+	if (rotation_type == OMAP_DSS_ROT_DMA)
-+		calc_dma_rotation_offset(rotation, mirror,
-+				screen_width, width, frame_height, color_mode,
-+				fieldmode, field_offset,
-+				&offset0, &offset1, &row_inc, &pix_inc);
-+	else
-+		calc_vrfb_rotation_offset(rotation, mirror,
-+				screen_width, width, frame_height, color_mode,
-+				fieldmode, field_offset,
-+				&offset0, &offset1, &row_inc, &pix_inc);
-+
-+	DSSDBG("offset0 %u, offset1 %u, row_inc %d, pix_inc %d\n",
-+			offset0, offset1, row_inc, pix_inc);
-+
-+	_dispc_set_color_mode(plane, color_mode);
-+
-+	_dispc_set_plane_ba0(plane, paddr + offset0);
-+	_dispc_set_plane_ba1(plane, paddr + offset1);
-+
-+	_dispc_set_row_inc(plane, row_inc);
-+	_dispc_set_pix_inc(plane, pix_inc);
-+
-+	DSSDBG("%d,%d %dx%d -> %dx%d\n", pos_x, pos_y, width, height,
-+			out_width, out_height);
-+
-+	_dispc_set_plane_pos(plane, pos_x, pos_y);
-+
-+	_dispc_set_pic_size(plane, width, height);
-+
-+	if (plane != OMAP_DSS_GFX) {
-+		_dispc_set_scaling(plane, width, height,
-+				   out_width, out_height,
-+				   ilace, five_taps, fieldmode);
-+		_dispc_set_vid_size(plane, out_width, out_height);
-+		_dispc_set_vid_color_conv(plane, cconv);
-+	}
-+
-+	_dispc_set_rotation_attrs(plane, rotation, mirror, color_mode);
-+
-+	if (plane != OMAP_DSS_VIDEO1)
-+		_dispc_setup_global_alpha(plane, global_alpha);
-+
-+	return 0;
-+}
-+
-+static void _dispc_enable_plane(enum omap_plane plane, bool enable)
-+{
-+	REG_FLD_MOD(dispc_reg_att[plane], enable ? 1 : 0, 0, 0);
-+}
-+
-+static void dispc_disable_isr(void *data, u32 mask)
-+{
-+	struct completion *compl = data;
-+	complete(compl);
-+}
-+
-+static void _enable_lcd_out(bool enable)
-+{
-+	REG_FLD_MOD(DISPC_CONTROL, enable ? 1 : 0, 0, 0);
-+}
-+
-+void dispc_enable_lcd_out(bool enable)
-+{
-+	struct completion frame_done_completion;
-+	bool is_on;
-+	int r;
-+
-+	enable_clocks(1);
-+
-+	/* When we disable LCD output, we need to wait until frame is done.
-+	 * Otherwise the DSS is still working, and turning off the clocks
-+	 * prevents DSS from going to OFF mode */
-+	is_on = REG_GET(DISPC_CONTROL, 0, 0);
-+
-+	if (!enable && is_on) {
-+		init_completion(&frame_done_completion);
-+
-+		r = omap_dispc_register_isr(dispc_disable_isr,
-+				&frame_done_completion,
-+				DISPC_IRQ_FRAMEDONE);
-+
-+		if (r)
-+			DSSERR("failed to register FRAMEDONE isr\n");
-+	}
-+
-+	_enable_lcd_out(enable);
-+
-+	if (!enable && is_on) {
-+		if (!wait_for_completion_timeout(&frame_done_completion,
-+					msecs_to_jiffies(100)))
-+			DSSERR("timeout waiting for FRAME DONE\n");
-+
-+		r = omap_dispc_unregister_isr(dispc_disable_isr,
-+				&frame_done_completion,
-+				DISPC_IRQ_FRAMEDONE);
-+
-+		if (r)
-+			DSSERR("failed to unregister FRAMEDONE isr\n");
-+	}
-+
-+	enable_clocks(0);
-+}
-+
-+static void _enable_digit_out(bool enable)
-+{
-+	REG_FLD_MOD(DISPC_CONTROL, enable ? 1 : 0, 1, 1);
-+}
-+
-+void dispc_enable_digit_out(bool enable)
-+{
-+	struct completion frame_done_completion;
-+	int r;
-+
-+	enable_clocks(1);
-+
-+	if (REG_GET(DISPC_CONTROL, 1, 1) == enable) {
-+		enable_clocks(0);
-+		return;
-+	}
-+
-+	if (enable) {
-+		unsigned long flags;
-+		/* When we enable digit output, we'll get an extra digit
-+		 * sync lost interrupt, that we need to ignore */
-+		spin_lock_irqsave(&dispc.irq_lock, flags);
-+		dispc.irq_error_mask &= ~DISPC_IRQ_SYNC_LOST_DIGIT;
-+		_omap_dispc_set_irqs();
-+		spin_unlock_irqrestore(&dispc.irq_lock, flags);
-+	}
-+
-+	/* When we disable digit output, we need to wait until fields are done.
-+	 * Otherwise the DSS is still working, and turning off the clocks
-+	 * prevents DSS from going to OFF mode. And when enabling, we need to
-+	 * wait for the extra sync losts */
-+	init_completion(&frame_done_completion);
-+
-+	r = omap_dispc_register_isr(dispc_disable_isr, &frame_done_completion,
-+			DISPC_IRQ_EVSYNC_EVEN | DISPC_IRQ_EVSYNC_ODD);
-+	if (r)
-+		DSSERR("failed to register EVSYNC isr\n");
-+
-+	_enable_digit_out(enable);
-+
-+	/* XXX I understand from TRM that we should only wait for the
-+	 * current field to complete. But it seems we have to wait
-+	 * for both fields */
-+	if (!wait_for_completion_timeout(&frame_done_completion,
-+				msecs_to_jiffies(100)))
-+		DSSERR("timeout waiting for EVSYNC\n");
-+
-+	if (!wait_for_completion_timeout(&frame_done_completion,
-+				msecs_to_jiffies(100)))
-+		DSSERR("timeout waiting for EVSYNC\n");
-+
-+	r = omap_dispc_unregister_isr(dispc_disable_isr,
-+			&frame_done_completion,
-+			DISPC_IRQ_EVSYNC_EVEN | DISPC_IRQ_EVSYNC_ODD);
-+	if (r)
-+		DSSERR("failed to unregister EVSYNC isr\n");
-+
-+	if (enable) {
-+		unsigned long flags;
-+		spin_lock_irqsave(&dispc.irq_lock, flags);
-+		dispc.irq_error_mask = DISPC_IRQ_MASK_ERROR;
-+		dispc_write_reg(DISPC_IRQSTATUS, DISPC_IRQ_SYNC_LOST_DIGIT);
-+		_omap_dispc_set_irqs();
-+		spin_unlock_irqrestore(&dispc.irq_lock, flags);
-+	}
-+
-+	enable_clocks(0);
-+}
-+
-+void dispc_lcd_enable_signal_polarity(bool act_high)
-+{
-+	enable_clocks(1);
-+	REG_FLD_MOD(DISPC_CONTROL, act_high ? 1 : 0, 29, 29);
-+	enable_clocks(0);
-+}
-+
-+void dispc_lcd_enable_signal(bool enable)
-+{
-+	enable_clocks(1);
-+	REG_FLD_MOD(DISPC_CONTROL, enable ? 1 : 0, 28, 28);
-+	enable_clocks(0);
-+}
-+
-+void dispc_pck_free_enable(bool enable)
-+{
-+	enable_clocks(1);
-+	REG_FLD_MOD(DISPC_CONTROL, enable ? 1 : 0, 27, 27);
-+	enable_clocks(0);
-+}
-+
-+void dispc_enable_fifohandcheck(bool enable)
-+{
-+	enable_clocks(1);
-+	REG_FLD_MOD(DISPC_CONFIG, enable ? 1 : 0, 16, 16);
-+	enable_clocks(0);
-+}
-+
-+
-+void dispc_set_lcd_display_type(enum omap_lcd_display_type type)
-+{
-+	int mode;
-+
-+	switch (type) {
-+	case OMAP_DSS_LCD_DISPLAY_STN:
-+		mode = 0;
-+		break;
-+
-+	case OMAP_DSS_LCD_DISPLAY_TFT:
-+		mode = 1;
-+		break;
-+
-+	default:
-+		BUG();
-+		return;
-+	}
-+
-+	enable_clocks(1);
-+	REG_FLD_MOD(DISPC_CONTROL, mode, 3, 3);
-+	enable_clocks(0);
-+}
-+
-+void dispc_set_loadmode(enum omap_dss_load_mode mode)
-+{
-+	enable_clocks(1);
-+	REG_FLD_MOD(DISPC_CONFIG, mode, 2, 1);
-+	enable_clocks(0);
-+}
-+
-+
-+void dispc_set_default_color(enum omap_channel channel, u32 color)
-+{
-+	const struct dispc_reg def_reg[] = { DISPC_DEFAULT_COLOR0,
-+				DISPC_DEFAULT_COLOR1 };
-+
-+	enable_clocks(1);
-+	dispc_write_reg(def_reg[channel], color);
-+	enable_clocks(0);
-+}
-+
-+u32 dispc_get_default_color(enum omap_channel channel)
-+{
-+	const struct dispc_reg def_reg[] = { DISPC_DEFAULT_COLOR0,
-+				DISPC_DEFAULT_COLOR1 };
-+	u32 l;
-+
-+	BUG_ON(channel != OMAP_DSS_CHANNEL_DIGIT &&
-+	       channel != OMAP_DSS_CHANNEL_LCD);
-+
-+	enable_clocks(1);
-+	l = dispc_read_reg(def_reg[channel]);
-+	enable_clocks(0);
-+
-+	return l;
-+}
-+
-+void dispc_set_trans_key(enum omap_channel ch,
-+		enum omap_dss_trans_key_type type,
-+		u32 trans_key)
-+{
-+	const struct dispc_reg tr_reg[] = {
-+		DISPC_TRANS_COLOR0, DISPC_TRANS_COLOR1 };
-+
-+	enable_clocks(1);
-+	if (ch == OMAP_DSS_CHANNEL_LCD)
-+		REG_FLD_MOD(DISPC_CONFIG, type, 11, 11);
-+	else /* OMAP_DSS_CHANNEL_DIGIT */
-+		REG_FLD_MOD(DISPC_CONFIG, type, 13, 13);
-+
-+	dispc_write_reg(tr_reg[ch], trans_key);
-+	enable_clocks(0);
-+}
-+
-+void dispc_get_trans_key(enum omap_channel ch,
-+		enum omap_dss_trans_key_type *type,
-+		u32 *trans_key)
-+{
-+	const struct dispc_reg tr_reg[] = {
-+		DISPC_TRANS_COLOR0, DISPC_TRANS_COLOR1 };
-+
-+	enable_clocks(1);
-+	if (type) {
-+		if (ch == OMAP_DSS_CHANNEL_LCD)
-+			*type = REG_GET(DISPC_CONFIG, 11, 11);
-+		else if (ch == OMAP_DSS_CHANNEL_DIGIT)
-+			*type = REG_GET(DISPC_CONFIG, 13, 13);
-+		else
-+			BUG();
-+	}
-+
-+	if (trans_key)
-+		*trans_key = dispc_read_reg(tr_reg[ch]);
-+	enable_clocks(0);
-+}
-+
-+void dispc_enable_trans_key(enum omap_channel ch, bool enable)
-+{
-+	enable_clocks(1);
-+	if (ch == OMAP_DSS_CHANNEL_LCD)
-+		REG_FLD_MOD(DISPC_CONFIG, enable, 10, 10);
-+	else /* OMAP_DSS_CHANNEL_DIGIT */
-+		REG_FLD_MOD(DISPC_CONFIG, enable, 12, 12);
-+	enable_clocks(0);
-+}
-+void dispc_enable_alpha_blending(enum omap_channel ch, bool enable)
-+{
-+	enable_clocks(1);
-+	if (ch == OMAP_DSS_CHANNEL_LCD)
-+		REG_FLD_MOD(DISPC_CONFIG, enable, 18, 18);
-+	else /* OMAP_DSS_CHANNEL_DIGIT */
-+		REG_FLD_MOD(DISPC_CONFIG, enable, 19, 19);
-+	enable_clocks(0);
-+}
-+bool dispc_alpha_blending_enabled(enum omap_channel ch)
-+{
-+	bool enabled;
-+
-+	enable_clocks(1);
-+	if (ch == OMAP_DSS_CHANNEL_LCD)
-+		enabled = REG_GET(DISPC_CONFIG, 18, 18);
-+	else if (ch == OMAP_DSS_CHANNEL_DIGIT)
-+		enabled = REG_GET(DISPC_CONFIG, 18, 18);
-+	else
-+		BUG();
-+	enable_clocks(0);
-+
-+	return enabled;
-+
-+}
-+
-+
-+bool dispc_trans_key_enabled(enum omap_channel ch)
-+{
-+	bool enabled;
-+
-+	enable_clocks(1);
-+	if (ch == OMAP_DSS_CHANNEL_LCD)
-+		enabled = REG_GET(DISPC_CONFIG, 10, 10);
-+	else if (ch == OMAP_DSS_CHANNEL_DIGIT)
-+		enabled = REG_GET(DISPC_CONFIG, 12, 12);
-+	else
-+		BUG();
-+	enable_clocks(0);
-+
-+	return enabled;
-+}
-+
-+
-+void dispc_set_tft_data_lines(u8 data_lines)
-+{
-+	int code;
-+
-+	switch (data_lines) {
-+	case 12:
-+		code = 0;
-+		break;
-+	case 16:
-+		code = 1;
-+		break;
-+	case 18:
-+		code = 2;
-+		break;
-+	case 24:
-+		code = 3;
-+		break;
-+	default:
-+		BUG();
-+		return;
-+	}
-+
-+	enable_clocks(1);
-+	REG_FLD_MOD(DISPC_CONTROL, code, 9, 8);
-+	enable_clocks(0);
-+}
-+
-+void dispc_set_parallel_interface_mode(enum omap_parallel_interface_mode mode)
-+{
-+	u32 l;
-+	int stallmode;
-+	int gpout0 = 1;
-+	int gpout1;
-+
-+	switch (mode) {
-+	case OMAP_DSS_PARALLELMODE_BYPASS:
-+		stallmode = 0;
-+		gpout1 = 1;
-+		break;
-+
-+	case OMAP_DSS_PARALLELMODE_RFBI:
-+		stallmode = 1;
-+		gpout1 = 0;
-+		break;
-+
-+	case OMAP_DSS_PARALLELMODE_DSI:
-+		stallmode = 1;
-+		gpout1 = 1;
-+		break;
-+
-+	default:
-+		BUG();
-+		return;
-+	}
-+
-+	enable_clocks(1);
-+
-+	l = dispc_read_reg(DISPC_CONTROL);
-+
-+	l = FLD_MOD(l, stallmode, 11, 11);
-+	l = FLD_MOD(l, gpout0, 15, 15);
-+	l = FLD_MOD(l, gpout1, 16, 16);
-+
-+	dispc_write_reg(DISPC_CONTROL, l);
-+
-+	enable_clocks(0);
-+}
-+
-+static bool _dispc_lcd_timings_ok(int hsw, int hfp, int hbp,
-+		int vsw, int vfp, int vbp)
-+{
-+	if (cpu_is_omap24xx() || omap_rev() < OMAP3430_REV_ES3_0) {
-+		if (hsw < 1 || hsw > 64 ||
-+				hfp < 1 || hfp > 256 ||
-+				hbp < 1 || hbp > 256 ||
-+				vsw < 1 || vsw > 64 ||
-+				vfp < 0 || vfp > 255 ||
-+				vbp < 0 || vbp > 255)
-+			return false;
-+	} else {
-+		if (hsw < 1 || hsw > 256 ||
-+				hfp < 1 || hfp > 4096 ||
-+				hbp < 1 || hbp > 4096 ||
-+				vsw < 1 || vsw > 256 ||
-+				vfp < 0 || vfp > 4095 ||
-+				vbp < 0 || vbp > 4095)
-+			return false;
-+	}
-+
-+	return true;
-+}
-+
-+bool dispc_lcd_timings_ok(struct omap_video_timings *timings)
-+{
-+	return _dispc_lcd_timings_ok(timings->hsw, timings->hfp,
-+			timings->hbp, timings->vsw,
-+			timings->vfp, timings->vbp);
-+}
-+
-+static void _dispc_set_lcd_timings(int hsw, int hfp, int hbp,
-+				   int vsw, int vfp, int vbp)
-+{
-+	u32 timing_h, timing_v;
-+
-+	if (cpu_is_omap24xx() || omap_rev() < OMAP3430_REV_ES3_0) {
-+		timing_h = FLD_VAL(hsw-1, 5, 0) | FLD_VAL(hfp-1, 15, 8) |
-+			FLD_VAL(hbp-1, 27, 20);
-+
-+		timing_v = FLD_VAL(vsw-1, 5, 0) | FLD_VAL(vfp, 15, 8) |
-+			FLD_VAL(vbp, 27, 20);
-+	} else {
-+		timing_h = FLD_VAL(hsw-1, 7, 0) | FLD_VAL(hfp-1, 19, 8) |
-+			FLD_VAL(hbp-1, 31, 20);
-+
-+		timing_v = FLD_VAL(vsw-1, 7, 0) | FLD_VAL(vfp, 19, 8) |
-+			FLD_VAL(vbp, 31, 20);
-+	}
-+
-+	enable_clocks(1);
-+	dispc_write_reg(DISPC_TIMING_H, timing_h);
-+	dispc_write_reg(DISPC_TIMING_V, timing_v);
-+	enable_clocks(0);
-+}
-+
-+/* change name to mode? */
-+void dispc_set_lcd_timings(struct omap_video_timings *timings)
-+{
-+	unsigned xtot, ytot;
-+	unsigned long ht, vt;
-+
-+	if (!_dispc_lcd_timings_ok(timings->hsw, timings->hfp,
-+				timings->hbp, timings->vsw,
-+				timings->vfp, timings->vbp))
-+		BUG();
-+
-+	_dispc_set_lcd_timings(timings->hsw, timings->hfp, timings->hbp,
-+			timings->vsw, timings->vfp, timings->vbp);
-+
-+	dispc_set_lcd_size(timings->x_res, timings->y_res);
-+
-+	xtot = timings->x_res + timings->hfp + timings->hsw + timings->hbp;
-+	ytot = timings->y_res + timings->vfp + timings->vsw + timings->vbp;
-+
-+	ht = (timings->pixel_clock * 1000) / xtot;
-+	vt = (timings->pixel_clock * 1000) / xtot / ytot;
-+
-+	DSSDBG("xres %u yres %u\n", timings->x_res, timings->y_res);
-+	DSSDBG("pck %u\n", timings->pixel_clock);
-+	DSSDBG("hsw %d hfp %d hbp %d vsw %d vfp %d vbp %d\n",
-+			timings->hsw, timings->hfp, timings->hbp,
-+			timings->vsw, timings->vfp, timings->vbp);
-+
-+	DSSDBG("hsync %luHz, vsync %luHz\n", ht, vt);
-+}
-+
-+void dispc_set_lcd_divisor(u16 lck_div, u16 pck_div)
-+{
-+	BUG_ON(lck_div < 1);
-+	BUG_ON(pck_div < 2);
-+
-+	enable_clocks(1);
-+	dispc_write_reg(DISPC_DIVISOR,
-+			FLD_VAL(lck_div, 23, 16) | FLD_VAL(pck_div, 7, 0));
-+	enable_clocks(0);
-+}
-+
-+static void dispc_get_lcd_divisor(int *lck_div, int *pck_div)
-+{
-+	u32 l;
-+	l = dispc_read_reg(DISPC_DIVISOR);
-+	*lck_div = FLD_GET(l, 23, 16);
-+	*pck_div = FLD_GET(l, 7, 0);
-+}
-+
-+unsigned long dispc_fclk_rate(void)
-+{
-+	unsigned long r = 0;
-+
-+	if (dss_get_dispc_clk_source() == 0)
-+		r = dss_clk_get_rate(DSS_CLK_FCK1);
-+	else
-+#ifdef CONFIG_OMAP2_DSS_DSI
-+		r = dsi_get_dsi1_pll_rate();
-+#else
-+	BUG();
-+#endif
-+	return r;
-+}
-+
-+unsigned long dispc_lclk_rate(void)
-+{
-+	int lcd;
-+	unsigned long r;
-+	u32 l;
-+
-+	l = dispc_read_reg(DISPC_DIVISOR);
-+
-+	lcd = FLD_GET(l, 23, 16);
-+
-+	r = dispc_fclk_rate();
-+
-+	return r / lcd;
-+}
-+
-+unsigned long dispc_pclk_rate(void)
-+{
-+	int lcd, pcd;
-+	unsigned long r;
-+	u32 l;
-+
-+	l = dispc_read_reg(DISPC_DIVISOR);
-+
-+	lcd = FLD_GET(l, 23, 16);
-+	pcd = FLD_GET(l, 7, 0);
-+
-+	r = dispc_fclk_rate();
-+
-+	return r / lcd / pcd;
-+}
-+
-+void dispc_dump_clocks(struct seq_file *s)
-+{
-+	int lcd, pcd;
-+
-+	enable_clocks(1);
-+
-+	dispc_get_lcd_divisor(&lcd, &pcd);
-+
-+	seq_printf(s, "- dispc -\n");
-+
-+	seq_printf(s, "dispc fclk source = %s\n",
-+			dss_get_dispc_clk_source() == 0 ?
-+			"dss1_alwon_fclk" : "dsi1_pll_fclk");
-+
-+	seq_printf(s, "pixel clk = %lu / %d / %d = %lu\n",
-+			dispc_fclk_rate(),
-+			lcd, pcd,
-+			dispc_pclk_rate());
-+
-+	enable_clocks(0);
-+}
-+
-+void dispc_dump_regs(struct seq_file *s)
-+{
-+#define DUMPREG(r) seq_printf(s, "%-35s %08x\n", #r, dispc_read_reg(r))
-+
-+	dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1);
-+
-+	DUMPREG(DISPC_REVISION);
-+	DUMPREG(DISPC_SYSCONFIG);
-+	DUMPREG(DISPC_SYSSTATUS);
-+	DUMPREG(DISPC_IRQSTATUS);
-+	DUMPREG(DISPC_IRQENABLE);
-+	DUMPREG(DISPC_CONTROL);
-+	DUMPREG(DISPC_CONFIG);
-+	DUMPREG(DISPC_CAPABLE);
-+	DUMPREG(DISPC_DEFAULT_COLOR0);
-+	DUMPREG(DISPC_DEFAULT_COLOR1);
-+	DUMPREG(DISPC_TRANS_COLOR0);
-+	DUMPREG(DISPC_TRANS_COLOR1);
-+	DUMPREG(DISPC_LINE_STATUS);
-+	DUMPREG(DISPC_LINE_NUMBER);
-+	DUMPREG(DISPC_TIMING_H);
-+	DUMPREG(DISPC_TIMING_V);
-+	DUMPREG(DISPC_POL_FREQ);
-+	DUMPREG(DISPC_DIVISOR);
-+	DUMPREG(DISPC_GLOBAL_ALPHA);
-+	DUMPREG(DISPC_SIZE_DIG);
-+	DUMPREG(DISPC_SIZE_LCD);
-+
-+	DUMPREG(DISPC_GFX_BA0);
-+	DUMPREG(DISPC_GFX_BA1);
-+	DUMPREG(DISPC_GFX_POSITION);
-+	DUMPREG(DISPC_GFX_SIZE);
-+	DUMPREG(DISPC_GFX_ATTRIBUTES);
-+	DUMPREG(DISPC_GFX_FIFO_THRESHOLD);
-+	DUMPREG(DISPC_GFX_FIFO_SIZE_STATUS);
-+	DUMPREG(DISPC_GFX_ROW_INC);
-+	DUMPREG(DISPC_GFX_PIXEL_INC);
-+	DUMPREG(DISPC_GFX_WINDOW_SKIP);
-+	DUMPREG(DISPC_GFX_TABLE_BA);
-+
-+	DUMPREG(DISPC_DATA_CYCLE1);
-+	DUMPREG(DISPC_DATA_CYCLE2);
-+	DUMPREG(DISPC_DATA_CYCLE3);
-+
-+	DUMPREG(DISPC_CPR_COEF_R);
-+	DUMPREG(DISPC_CPR_COEF_G);
-+	DUMPREG(DISPC_CPR_COEF_B);
-+
-+	DUMPREG(DISPC_GFX_PRELOAD);
-+
-+	DUMPREG(DISPC_VID_BA0(0));
-+	DUMPREG(DISPC_VID_BA1(0));
-+	DUMPREG(DISPC_VID_POSITION(0));
-+	DUMPREG(DISPC_VID_SIZE(0));
-+	DUMPREG(DISPC_VID_ATTRIBUTES(0));
-+	DUMPREG(DISPC_VID_FIFO_THRESHOLD(0));
-+	DUMPREG(DISPC_VID_FIFO_SIZE_STATUS(0));
-+	DUMPREG(DISPC_VID_ROW_INC(0));
-+	DUMPREG(DISPC_VID_PIXEL_INC(0));
-+	DUMPREG(DISPC_VID_FIR(0));
-+	DUMPREG(DISPC_VID_PICTURE_SIZE(0));
-+	DUMPREG(DISPC_VID_ACCU0(0));
-+	DUMPREG(DISPC_VID_ACCU1(0));
-+
-+	DUMPREG(DISPC_VID_BA0(1));
-+	DUMPREG(DISPC_VID_BA1(1));
-+	DUMPREG(DISPC_VID_POSITION(1));
-+	DUMPREG(DISPC_VID_SIZE(1));
-+	DUMPREG(DISPC_VID_ATTRIBUTES(1));
-+	DUMPREG(DISPC_VID_FIFO_THRESHOLD(1));
-+	DUMPREG(DISPC_VID_FIFO_SIZE_STATUS(1));
-+	DUMPREG(DISPC_VID_ROW_INC(1));
-+	DUMPREG(DISPC_VID_PIXEL_INC(1));
-+	DUMPREG(DISPC_VID_FIR(1));
-+	DUMPREG(DISPC_VID_PICTURE_SIZE(1));
-+	DUMPREG(DISPC_VID_ACCU0(1));
-+	DUMPREG(DISPC_VID_ACCU1(1));
-+
-+	DUMPREG(DISPC_VID_FIR_COEF_H(0, 0));
-+	DUMPREG(DISPC_VID_FIR_COEF_H(0, 1));
-+	DUMPREG(DISPC_VID_FIR_COEF_H(0, 2));
-+	DUMPREG(DISPC_VID_FIR_COEF_H(0, 3));
-+	DUMPREG(DISPC_VID_FIR_COEF_H(0, 4));
-+	DUMPREG(DISPC_VID_FIR_COEF_H(0, 5));
-+	DUMPREG(DISPC_VID_FIR_COEF_H(0, 6));
-+	DUMPREG(DISPC_VID_FIR_COEF_H(0, 7));
-+	DUMPREG(DISPC_VID_FIR_COEF_HV(0, 0));
-+	DUMPREG(DISPC_VID_FIR_COEF_HV(0, 1));
-+	DUMPREG(DISPC_VID_FIR_COEF_HV(0, 2));
-+	DUMPREG(DISPC_VID_FIR_COEF_HV(0, 3));
-+	DUMPREG(DISPC_VID_FIR_COEF_HV(0, 4));
-+	DUMPREG(DISPC_VID_FIR_COEF_HV(0, 5));
-+	DUMPREG(DISPC_VID_FIR_COEF_HV(0, 6));
-+	DUMPREG(DISPC_VID_FIR_COEF_HV(0, 7));
-+	DUMPREG(DISPC_VID_CONV_COEF(0, 0));
-+	DUMPREG(DISPC_VID_CONV_COEF(0, 1));
-+	DUMPREG(DISPC_VID_CONV_COEF(0, 2));
-+	DUMPREG(DISPC_VID_CONV_COEF(0, 3));
-+	DUMPREG(DISPC_VID_CONV_COEF(0, 4));
-+	DUMPREG(DISPC_VID_FIR_COEF_V(0, 0));
-+	DUMPREG(DISPC_VID_FIR_COEF_V(0, 1));
-+	DUMPREG(DISPC_VID_FIR_COEF_V(0, 2));
-+	DUMPREG(DISPC_VID_FIR_COEF_V(0, 3));
-+	DUMPREG(DISPC_VID_FIR_COEF_V(0, 4));
-+	DUMPREG(DISPC_VID_FIR_COEF_V(0, 5));
-+	DUMPREG(DISPC_VID_FIR_COEF_V(0, 6));
-+	DUMPREG(DISPC_VID_FIR_COEF_V(0, 7));
-+
-+	DUMPREG(DISPC_VID_FIR_COEF_H(1, 0));
-+	DUMPREG(DISPC_VID_FIR_COEF_H(1, 1));
-+	DUMPREG(DISPC_VID_FIR_COEF_H(1, 2));
-+	DUMPREG(DISPC_VID_FIR_COEF_H(1, 3));
-+	DUMPREG(DISPC_VID_FIR_COEF_H(1, 4));
-+	DUMPREG(DISPC_VID_FIR_COEF_H(1, 5));
-+	DUMPREG(DISPC_VID_FIR_COEF_H(1, 6));
-+	DUMPREG(DISPC_VID_FIR_COEF_H(1, 7));
-+	DUMPREG(DISPC_VID_FIR_COEF_HV(1, 0));
-+	DUMPREG(DISPC_VID_FIR_COEF_HV(1, 1));
-+	DUMPREG(DISPC_VID_FIR_COEF_HV(1, 2));
-+	DUMPREG(DISPC_VID_FIR_COEF_HV(1, 3));
-+	DUMPREG(DISPC_VID_FIR_COEF_HV(1, 4));
-+	DUMPREG(DISPC_VID_FIR_COEF_HV(1, 5));
-+	DUMPREG(DISPC_VID_FIR_COEF_HV(1, 6));
-+	DUMPREG(DISPC_VID_FIR_COEF_HV(1, 7));
-+	DUMPREG(DISPC_VID_CONV_COEF(1, 0));
-+	DUMPREG(DISPC_VID_CONV_COEF(1, 1));
-+	DUMPREG(DISPC_VID_CONV_COEF(1, 2));
-+	DUMPREG(DISPC_VID_CONV_COEF(1, 3));
-+	DUMPREG(DISPC_VID_CONV_COEF(1, 4));
-+	DUMPREG(DISPC_VID_FIR_COEF_V(1, 0));
-+	DUMPREG(DISPC_VID_FIR_COEF_V(1, 1));
-+	DUMPREG(DISPC_VID_FIR_COEF_V(1, 2));
-+	DUMPREG(DISPC_VID_FIR_COEF_V(1, 3));
-+	DUMPREG(DISPC_VID_FIR_COEF_V(1, 4));
-+	DUMPREG(DISPC_VID_FIR_COEF_V(1, 5));
-+	DUMPREG(DISPC_VID_FIR_COEF_V(1, 6));
-+	DUMPREG(DISPC_VID_FIR_COEF_V(1, 7));
-+
-+	DUMPREG(DISPC_VID_PRELOAD(0));
-+	DUMPREG(DISPC_VID_PRELOAD(1));
-+
-+	dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
-+#undef DUMPREG
-+}
-+
-+static void _dispc_set_pol_freq(bool onoff, bool rf, bool ieo, bool ipc,
-+				bool ihs, bool ivs, u8 acbi, u8 acb)
-+{
-+	u32 l = 0;
-+
-+	DSSDBG("onoff %d rf %d ieo %d ipc %d ihs %d ivs %d acbi %d acb %d\n",
-+			onoff, rf, ieo, ipc, ihs, ivs, acbi, acb);
-+
-+	l |= FLD_VAL(onoff, 17, 17);
-+	l |= FLD_VAL(rf, 16, 16);
-+	l |= FLD_VAL(ieo, 15, 15);
-+	l |= FLD_VAL(ipc, 14, 14);
-+	l |= FLD_VAL(ihs, 13, 13);
-+	l |= FLD_VAL(ivs, 12, 12);
-+	l |= FLD_VAL(acbi, 11, 8);
-+	l |= FLD_VAL(acb, 7, 0);
-+
-+	enable_clocks(1);
-+	dispc_write_reg(DISPC_POL_FREQ, l);
-+	enable_clocks(0);
-+}
-+
-+void dispc_set_pol_freq(enum omap_panel_config config, u8 acbi, u8 acb)
-+{
-+	_dispc_set_pol_freq((config & OMAP_DSS_LCD_ONOFF) != 0,
-+			(config & OMAP_DSS_LCD_RF) != 0,
-+			(config & OMAP_DSS_LCD_IEO) != 0,
-+			(config & OMAP_DSS_LCD_IPC) != 0,
-+			(config & OMAP_DSS_LCD_IHS) != 0,
-+			(config & OMAP_DSS_LCD_IVS) != 0,
-+			acbi, acb);
-+}
-+
-+void find_lck_pck_divs(bool is_tft, unsigned long req_pck, unsigned long fck,
-+		u16 *lck_div, u16 *pck_div)
-+{
-+	u16 pcd_min = is_tft ? 2 : 3;
-+	unsigned long best_pck;
-+	u16 best_ld, cur_ld;
-+	u16 best_pd, cur_pd;
-+
-+	best_pck = 0;
-+	best_ld = 0;
-+	best_pd = 0;
-+
-+	for (cur_ld = 1; cur_ld <= 255; ++cur_ld) {
-+		unsigned long lck = fck / cur_ld;
-+
-+		for (cur_pd = pcd_min; cur_pd <= 255; ++cur_pd) {
-+			unsigned long pck = lck / cur_pd;
-+			long old_delta = abs(best_pck - req_pck);
-+			long new_delta = abs(pck - req_pck);
-+
-+			if (best_pck == 0 || new_delta < old_delta) {
-+				best_pck = pck;
-+				best_ld = cur_ld;
-+				best_pd = cur_pd;
-+
-+				if (pck == req_pck)
-+					goto found;
-+			}
-+
-+			if (pck < req_pck)
-+				break;
-+		}
-+
-+		if (lck / pcd_min < req_pck)
-+			break;
-+	}
-+
-+found:
-+	*lck_div = best_ld;
-+	*pck_div = best_pd;
-+}
-+
-+int dispc_calc_clock_div(bool is_tft, unsigned long req_pck,
-+		struct dispc_clock_info *cinfo)
-+{
-+	unsigned long prate;
-+	struct dispc_clock_info cur, best;
-+	int match = 0;
-+	int min_fck_per_pck;
-+	unsigned long fck_rate = dss_clk_get_rate(DSS_CLK_FCK1);
-+
-+	if (cpu_is_omap34xx())
-+		prate = clk_get_rate(clk_get_parent(dispc.dpll4_m4_ck));
-+	else
-+		prate = 0;
-+
-+	if (req_pck == dispc.cache_req_pck &&
-+			((cpu_is_omap34xx() && prate == dispc.cache_prate) ||
-+			 dispc.cache_cinfo.fck == fck_rate)) {
-+		DSSDBG("dispc clock info found from cache.\n");
-+		*cinfo = dispc.cache_cinfo;
-+		return 0;
-+	}
-+
-+	min_fck_per_pck = CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK;
-+
-+	if (min_fck_per_pck &&
-+		req_pck * min_fck_per_pck > DISPC_MAX_FCK) {
-+		DSSERR("Requested pixel clock not possible with the current "
-+				"OMAP2_DSS_MIN_FCK_PER_PCK setting. Turning "
-+				"the constraint off.\n");
-+		min_fck_per_pck = 0;
-+	}
-+
-+retry:
-+	memset(&cur, 0, sizeof(cur));
-+	memset(&best, 0, sizeof(best));
-+
-+	if (cpu_is_omap24xx()) {
-+		/* XXX can we change the clock on omap2? */
-+		cur.fck = dss_clk_get_rate(DSS_CLK_FCK1);
-+		cur.fck_div = 1;
-+
-+		match = 1;
-+
-+		find_lck_pck_divs(is_tft, req_pck, cur.fck,
-+				&cur.lck_div, &cur.pck_div);
-+
-+		cur.lck = cur.fck / cur.lck_div;
-+		cur.pck = cur.lck / cur.pck_div;
-+
-+		best = cur;
-+
-+		goto found;
-+	} else if (cpu_is_omap34xx()) {
-+		for (cur.fck_div = 16; cur.fck_div > 0; --cur.fck_div) {
-+			cur.fck = prate / cur.fck_div * 2;
-+
-+			if (cur.fck > DISPC_MAX_FCK)
-+				continue;
-+
-+			if (min_fck_per_pck &&
-+					cur.fck < req_pck * min_fck_per_pck)
-+				continue;
-+
-+			match = 1;
-+
-+			find_lck_pck_divs(is_tft, req_pck, cur.fck,
-+					&cur.lck_div, &cur.pck_div);
-+
-+			cur.lck = cur.fck / cur.lck_div;
-+			cur.pck = cur.lck / cur.pck_div;
-+
-+			if (abs(cur.pck - req_pck) < abs(best.pck - req_pck)) {
-+				best = cur;
-+
-+				if (cur.pck == req_pck)
-+					goto found;
-+			}
-+		}
-+	} else {
-+		BUG();
-+	}
-+
-+found:
-+	if (!match) {
-+		if (min_fck_per_pck) {
-+			DSSERR("Could not find suitable clock settings.\n"
-+					"Turning FCK/PCK constraint off and"
-+					"trying again.\n");
-+			min_fck_per_pck = 0;
-+			goto retry;
-+		}
-+
-+		DSSERR("Could not find suitable clock settings.\n");
-+
-+		return -EINVAL;
-+	}
-+
-+	if (cinfo)
-+		*cinfo = best;
-+
-+	dispc.cache_req_pck = req_pck;
-+	dispc.cache_prate = prate;
-+	dispc.cache_cinfo = best;
-+
-+	return 0;
-+}
-+
-+int dispc_set_clock_div(struct dispc_clock_info *cinfo)
-+{
-+	unsigned long prate;
-+	int r;
-+
-+	if (cpu_is_omap34xx()) {
-+		prate = clk_get_rate(clk_get_parent(dispc.dpll4_m4_ck));
-+		DSSDBG("dpll4_m4 = %ld\n", prate);
-+	}
-+
-+	DSSDBG("fck = %ld (%d)\n", cinfo->fck, cinfo->fck_div);
-+	DSSDBG("lck = %ld (%d)\n", cinfo->lck, cinfo->lck_div);
-+	DSSDBG("pck = %ld (%d)\n", cinfo->pck, cinfo->pck_div);
-+
-+	if (cpu_is_omap34xx()) {
-+		r = clk_set_rate(dispc.dpll4_m4_ck, prate / cinfo->fck_div);
-+		if (r)
-+			return r;
-+	}
-+
-+	dispc_set_lcd_divisor(cinfo->lck_div, cinfo->pck_div);
-+
-+	return 0;
-+}
-+
-+int dispc_get_clock_div(struct dispc_clock_info *cinfo)
-+{
-+	cinfo->fck = dss_clk_get_rate(DSS_CLK_FCK1);
-+
-+	if (cpu_is_omap34xx()) {
-+		unsigned long prate;
-+		prate = clk_get_rate(clk_get_parent(dispc.dpll4_m4_ck));
-+		cinfo->fck_div = prate / (cinfo->fck / 2);
-+	} else {
-+		cinfo->fck_div = 0;
-+	}
-+
-+	cinfo->lck_div = REG_GET(DISPC_DIVISOR, 23, 16);
-+	cinfo->pck_div = REG_GET(DISPC_DIVISOR, 7, 0);
-+
-+	cinfo->lck = cinfo->fck / cinfo->lck_div;
-+	cinfo->pck = cinfo->lck / cinfo->pck_div;
-+
-+	return 0;
-+}
-+
-+/* dispc.irq_lock has to be locked by the caller */
-+static void _omap_dispc_set_irqs(void)
-+{
-+	u32 mask;
-+	u32 old_mask;
-+	int i;
-+	struct omap_dispc_isr_data *isr_data;
-+
-+	mask = dispc.irq_error_mask;
-+
-+	for (i = 0; i < DISPC_MAX_NR_ISRS; i++) {
-+		isr_data = &dispc.registered_isr[i];
-+
-+		if (isr_data->isr == NULL)
-+			continue;
-+
-+		mask |= isr_data->mask;
-+	}
-+
-+	enable_clocks(1);
-+
-+	old_mask = dispc_read_reg(DISPC_IRQENABLE);
-+	/* clear the irqstatus for newly enabled irqs */
-+	dispc_write_reg(DISPC_IRQSTATUS, (mask ^ old_mask) & mask);
-+
-+	dispc_write_reg(DISPC_IRQENABLE, mask);
-+
-+	enable_clocks(0);
-+}
-+
-+int omap_dispc_register_isr(omap_dispc_isr_t isr, void *arg, u32 mask)
-+{
-+	int i;
-+	int ret;
-+	unsigned long flags;
-+	struct omap_dispc_isr_data *isr_data;
-+
-+	if (isr == NULL)
-+		return -EINVAL;
-+
-+	spin_lock_irqsave(&dispc.irq_lock, flags);
-+
-+	/* check for duplicate entry */
-+	for (i = 0; i < DISPC_MAX_NR_ISRS; i++) {
-+		isr_data = &dispc.registered_isr[i];
-+		if (isr_data->isr == isr && isr_data->arg == arg &&
-+				isr_data->mask == mask) {
-+			ret = -EINVAL;
-+			goto err;
-+		}
-+	}
-+
-+	isr_data = NULL;
-+	ret = -EBUSY;
-+
-+	for (i = 0; i < DISPC_MAX_NR_ISRS; i++) {
-+		isr_data = &dispc.registered_isr[i];
-+
-+		if (isr_data->isr != NULL)
-+			continue;
-+
-+		isr_data->isr = isr;
-+		isr_data->arg = arg;
-+		isr_data->mask = mask;
-+		ret = 0;
-+
-+		break;
-+	}
-+
-+	_omap_dispc_set_irqs();
-+
-+	spin_unlock_irqrestore(&dispc.irq_lock, flags);
-+
-+	return 0;
-+err:
-+	spin_unlock_irqrestore(&dispc.irq_lock, flags);
-+
-+	return ret;
-+}
-+EXPORT_SYMBOL(omap_dispc_register_isr);
-+
-+int omap_dispc_unregister_isr(omap_dispc_isr_t isr, void *arg, u32 mask)
-+{
-+	int i;
-+	unsigned long flags;
-+	int ret = -EINVAL;
-+	struct omap_dispc_isr_data *isr_data;
-+
-+	spin_lock_irqsave(&dispc.irq_lock, flags);
-+
-+	for (i = 0; i < DISPC_MAX_NR_ISRS; i++) {
-+		isr_data = &dispc.registered_isr[i];
-+		if (isr_data->isr != isr || isr_data->arg != arg ||
-+				isr_data->mask != mask)
-+			continue;
-+
-+		/* found the correct isr */
-+
-+		isr_data->isr = NULL;
-+		isr_data->arg = NULL;
-+		isr_data->mask = 0;
-+
-+		ret = 0;
-+		break;
-+	}
-+
-+	if (ret == 0)
-+		_omap_dispc_set_irqs();
-+
-+	spin_unlock_irqrestore(&dispc.irq_lock, flags);
-+
-+	return ret;
-+}
-+EXPORT_SYMBOL(omap_dispc_unregister_isr);
-+
-+#ifdef DEBUG
-+static void print_irq_status(u32 status)
-+{
-+	if ((status & dispc.irq_error_mask) == 0)
-+		return;
-+
-+	printk(KERN_DEBUG "DISPC IRQ: 0x%x: ", status);
-+
-+#define PIS(x) \
-+	if (status & DISPC_IRQ_##x) \
-+		printk(#x " ");
-+	PIS(GFX_FIFO_UNDERFLOW);
-+	PIS(OCP_ERR);
-+	PIS(VID1_FIFO_UNDERFLOW);
-+	PIS(VID2_FIFO_UNDERFLOW);
-+	PIS(SYNC_LOST);
-+	PIS(SYNC_LOST_DIGIT);
-+#undef PIS
-+
-+	printk("\n");
-+}
-+#endif
-+
-+/* Called from dss.c. Note that we don't touch clocks here,
-+ * but we presume they are on because we got an IRQ. However,
-+ * an irq handler may turn the clocks off, so we may not have
-+ * clock later in the function. */
-+void dispc_irq_handler(void)
-+{
-+	int i;
-+	u32 irqstatus;
-+	u32 handledirqs = 0;
-+	u32 unhandled_errors;
-+	struct omap_dispc_isr_data *isr_data;
-+	struct omap_dispc_isr_data registered_isr[DISPC_MAX_NR_ISRS];
-+
-+	spin_lock(&dispc.irq_lock);
-+
-+	irqstatus = dispc_read_reg(DISPC_IRQSTATUS);
-+
-+#ifdef DEBUG
-+	if (dss_debug)
-+		print_irq_status(irqstatus);
-+#endif
-+	/* Ack the interrupt. Do it here before clocks are possibly turned
-+	 * off */
-+	dispc_write_reg(DISPC_IRQSTATUS, irqstatus);
-+
-+	/* make a copy and unlock, so that isrs can unregister
-+	 * themselves */
-+	memcpy(registered_isr, dispc.registered_isr,
-+			sizeof(registered_isr));
-+
-+	spin_unlock(&dispc.irq_lock);
-+
-+	for (i = 0; i < DISPC_MAX_NR_ISRS; i++) {
-+		isr_data = &registered_isr[i];
-+
-+		if (!isr_data->isr)
-+			continue;
-+
-+		if (isr_data->mask & irqstatus) {
-+			isr_data->isr(isr_data->arg, irqstatus);
-+			handledirqs |= isr_data->mask;
-+		}
-+	}
-+
-+	spin_lock(&dispc.irq_lock);
-+
-+	unhandled_errors = irqstatus & ~handledirqs & dispc.irq_error_mask;
-+
-+	if (unhandled_errors) {
-+		dispc.error_irqs |= unhandled_errors;
-+
-+		dispc.irq_error_mask &= ~unhandled_errors;
-+		_omap_dispc_set_irqs();
-+
-+		schedule_work(&dispc.error_work);
-+	}
-+
-+	spin_unlock(&dispc.irq_lock);
-+}
-+
-+static void dispc_error_worker(struct work_struct *work)
-+{
-+	int i;
-+	u32 errors;
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&dispc.irq_lock, flags);
-+	errors = dispc.error_irqs;
-+	dispc.error_irqs = 0;
-+	spin_unlock_irqrestore(&dispc.irq_lock, flags);
-+
-+	if (errors & DISPC_IRQ_GFX_FIFO_UNDERFLOW) {
-+		DSSERR("GFX_FIFO_UNDERFLOW, disabling GFX\n");
-+		for (i = 0; i < omap_dss_get_num_overlays(); ++i) {
-+			struct omap_overlay *ovl;
-+			ovl = omap_dss_get_overlay(i);
-+
-+			if (!(ovl->caps & OMAP_DSS_OVL_CAP_DISPC))
-+				continue;
-+
-+			if (ovl->id == 0) {
-+				dispc_enable_plane(ovl->id, 0);
-+				dispc_go(ovl->manager->id);
-+				mdelay(50);
-+				break;
-+			}
-+		}
-+	}
-+
-+	if (errors & DISPC_IRQ_VID1_FIFO_UNDERFLOW) {
-+		DSSERR("VID1_FIFO_UNDERFLOW, disabling VID1\n");
-+		for (i = 0; i < omap_dss_get_num_overlays(); ++i) {
-+			struct omap_overlay *ovl;
-+			ovl = omap_dss_get_overlay(i);
-+
-+			if (!(ovl->caps & OMAP_DSS_OVL_CAP_DISPC))
-+				continue;
-+
-+			if (ovl->id == 1) {
-+				dispc_enable_plane(ovl->id, 0);
-+				dispc_go(ovl->manager->id);
-+				mdelay(50);
-+				break;
-+			}
-+		}
-+	}
-+
-+	if (errors & DISPC_IRQ_VID2_FIFO_UNDERFLOW) {
-+		DSSERR("VID2_FIFO_UNDERFLOW, disabling VID2\n");
-+		for (i = 0; i < omap_dss_get_num_overlays(); ++i) {
-+			struct omap_overlay *ovl;
-+			ovl = omap_dss_get_overlay(i);
-+
-+			if (!(ovl->caps & OMAP_DSS_OVL_CAP_DISPC))
-+				continue;
-+
-+			if (ovl->id == 2) {
-+				dispc_enable_plane(ovl->id, 0);
-+				dispc_go(ovl->manager->id);
-+				mdelay(50);
-+				break;
-+			}
-+		}
-+	}
-+
-+	if (errors & DISPC_IRQ_SYNC_LOST) {
-+		struct omap_overlay_manager *manager = NULL;
-+		bool enable = false;
-+
-+		DSSERR("SYNC_LOST, disabling LCD\n");
-+
-+		for (i = 0; i < omap_dss_get_num_overlay_managers(); ++i) {
-+			struct omap_overlay_manager *mgr;
-+			mgr = omap_dss_get_overlay_manager(i);
-+
-+			if (mgr->id == OMAP_DSS_CHANNEL_LCD) {
-+				manager = mgr;
-+				enable = mgr->device->state ==
-+						OMAP_DSS_DISPLAY_ACTIVE;
-+				mgr->device->disable(mgr->device);
-+				break;
-+			}
-+		}
-+
-+		if (manager) {
-+			for (i = 0; i < omap_dss_get_num_overlays(); ++i) {
-+				struct omap_overlay *ovl;
-+				ovl = omap_dss_get_overlay(i);
-+
-+				if (!(ovl->caps & OMAP_DSS_OVL_CAP_DISPC))
-+					continue;
-+
-+				if (ovl->id != 0 && ovl->manager == manager)
-+					dispc_enable_plane(ovl->id, 0);
-+			}
-+
-+			dispc_go(manager->id);
-+			mdelay(50);
-+			if (enable)
-+				manager->device->enable(manager->device);
-+		}
-+	}
-+
-+	if (errors & DISPC_IRQ_SYNC_LOST_DIGIT) {
-+		struct omap_overlay_manager *manager = NULL;
-+		bool enable = false;
-+
-+		DSSERR("SYNC_LOST_DIGIT, disabling TV\n");
-+
-+		for (i = 0; i < omap_dss_get_num_overlay_managers(); ++i) {
-+			struct omap_overlay_manager *mgr;
-+			mgr = omap_dss_get_overlay_manager(i);
-+
-+			if (mgr->id == OMAP_DSS_CHANNEL_DIGIT) {
-+				manager = mgr;
-+				enable = mgr->device->state ==
-+						OMAP_DSS_DISPLAY_ACTIVE;
-+				mgr->device->disable(mgr->device);
-+				break;
-+			}
-+		}
-+
-+		if (manager) {
-+			for (i = 0; i < omap_dss_get_num_overlays(); ++i) {
-+				struct omap_overlay *ovl;
-+				ovl = omap_dss_get_overlay(i);
-+
-+				if (!(ovl->caps & OMAP_DSS_OVL_CAP_DISPC))
-+					continue;
-+
-+				if (ovl->id != 0 && ovl->manager == manager)
-+					dispc_enable_plane(ovl->id, 0);
-+			}
-+
-+			dispc_go(manager->id);
-+			mdelay(50);
-+			if (enable)
-+				manager->device->enable(manager->device);
-+		}
-+	}
-+
-+	if (errors & DISPC_IRQ_OCP_ERR) {
-+		DSSERR("OCP_ERR\n");
-+		for (i = 0; i < omap_dss_get_num_overlay_managers(); ++i) {
-+			struct omap_overlay_manager *mgr;
-+			mgr = omap_dss_get_overlay_manager(i);
-+
-+			if (mgr->caps & OMAP_DSS_OVL_CAP_DISPC)
-+				mgr->device->disable(mgr->device);
-+		}
-+	}
-+
-+	spin_lock_irqsave(&dispc.irq_lock, flags);
-+	dispc.irq_error_mask |= errors;
-+	_omap_dispc_set_irqs();
-+	spin_unlock_irqrestore(&dispc.irq_lock, flags);
-+}
-+
-+int omap_dispc_wait_for_irq_timeout(u32 irqmask, unsigned long timeout)
-+{
-+	void dispc_irq_wait_handler(void *data, u32 mask)
-+	{
-+		complete((struct completion *)data);
-+	}
-+
-+	int r;
-+	DECLARE_COMPLETION_ONSTACK(completion);
-+
-+	r = omap_dispc_register_isr(dispc_irq_wait_handler, &completion,
-+			irqmask);
-+
-+	if (r)
-+		return r;
-+
-+	timeout = wait_for_completion_timeout(&completion, timeout);
-+
-+	omap_dispc_unregister_isr(dispc_irq_wait_handler, &completion, irqmask);
-+
-+	if (timeout == 0)
-+		return -ETIMEDOUT;
-+
-+	if (timeout == -ERESTARTSYS)
-+		return -ERESTARTSYS;
-+
-+	return 0;
-+}
-+
-+int omap_dispc_wait_for_irq_interruptible_timeout(u32 irqmask,
-+		unsigned long timeout)
-+{
-+	void dispc_irq_wait_handler(void *data, u32 mask)
-+	{
-+		complete((struct completion *)data);
-+	}
-+
-+	int r;
-+	DECLARE_COMPLETION_ONSTACK(completion);
-+
-+	r = omap_dispc_register_isr(dispc_irq_wait_handler, &completion,
-+			irqmask);
-+
-+	if (r)
-+		return r;
-+
-+	timeout = wait_for_completion_interruptible_timeout(&completion,
-+			timeout);
-+
-+	omap_dispc_unregister_isr(dispc_irq_wait_handler, &completion, irqmask);
-+
-+	if (timeout == 0)
-+		return -ETIMEDOUT;
-+
-+	if (timeout == -ERESTARTSYS)
-+		return -ERESTARTSYS;
-+
-+	return 0;
-+}
-+
-+#ifdef CONFIG_OMAP2_DSS_FAKE_VSYNC
-+void dispc_fake_vsync_irq(void)
-+{
-+	u32 irqstatus = DISPC_IRQ_VSYNC;
-+	int i;
-+
-+	for (i = 0; i < DISPC_MAX_NR_ISRS; i++) {
-+		struct omap_dispc_isr_data *isr_data;
-+		isr_data = &dispc.registered_isr[i];
-+
-+		if (!isr_data->isr)
-+			continue;
-+
-+		if (isr_data->mask & irqstatus)
-+			isr_data->isr(isr_data->arg, irqstatus);
-+	}
-+}
-+#endif
-+
-+static void _omap_dispc_initialize_irq(void)
-+{
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&dispc.irq_lock, flags);
-+
-+	memset(dispc.registered_isr, 0, sizeof(dispc.registered_isr));
-+
-+	dispc.irq_error_mask = DISPC_IRQ_MASK_ERROR;
-+
-+	/* there's SYNC_LOST_DIGIT waiting after enabling the DSS,
-+	 * so clear it */
-+	dispc_write_reg(DISPC_IRQSTATUS, dispc_read_reg(DISPC_IRQSTATUS));
-+
-+	_omap_dispc_set_irqs();
-+
-+	spin_unlock_irqrestore(&dispc.irq_lock, flags);
-+}
-+
-+void dispc_enable_sidle(void)
-+{
-+	REG_FLD_MOD(DISPC_SYSCONFIG, 2, 4, 3);	/* SIDLEMODE: smart idle */
-+}
-+
-+void dispc_disable_sidle(void)
-+{
-+	REG_FLD_MOD(DISPC_SYSCONFIG, 1, 4, 3);	/* SIDLEMODE: no idle */
-+}
-+
-+static void _omap_dispc_initial_config(void)
-+{
-+	u32 l;
-+
-+	l = dispc_read_reg(DISPC_SYSCONFIG);
-+	l = FLD_MOD(l, 2, 13, 12);	/* MIDLEMODE: smart standby */
-+	l = FLD_MOD(l, 2, 4, 3);	/* SIDLEMODE: smart idle */
-+	l = FLD_MOD(l, 1, 2, 2);	/* ENWAKEUP */
-+	l = FLD_MOD(l, 1, 0, 0);	/* AUTOIDLE */
-+	dispc_write_reg(DISPC_SYSCONFIG, l);
-+
-+	/* FUNCGATED */
-+	REG_FLD_MOD(DISPC_CONFIG, 1, 9, 9);
-+
-+	/* L3 firewall setting: enable access to OCM RAM */
-+	if (cpu_is_omap24xx())
-+		__raw_writel(0x402000b0, OMAP2_IO_ADDRESS(0x680050a0));
-+
-+	_dispc_setup_color_conv_coef();
-+
-+	dispc_set_loadmode(OMAP_DSS_LOAD_FRAME_ONLY);
-+
-+	dispc_read_plane_fifo_sizes();
-+}
-+
-+int dispc_init(void)
-+{
-+	u32 rev;
-+
-+	spin_lock_init(&dispc.irq_lock);
-+
-+	INIT_WORK(&dispc.error_work, dispc_error_worker);
-+
-+	dispc.base = ioremap(DISPC_BASE, DISPC_SZ_REGS);
-+	if (!dispc.base) {
-+		DSSERR("can't ioremap DISPC\n");
-+		return -ENOMEM;
-+	}
-+
-+	if (cpu_is_omap34xx()) {
-+		dispc.dpll4_m4_ck = clk_get(NULL, "dpll4_m4_ck");
-+		if (IS_ERR(dispc.dpll4_m4_ck)) {
-+			DSSERR("Failed to get dpll4_m4_ck\n");
-+			return -ENODEV;
-+		}
-+	}
-+
-+	enable_clocks(1);
-+
-+	_omap_dispc_initial_config();
-+
-+	_omap_dispc_initialize_irq();
-+
-+	dispc_save_context();
-+
-+	rev = dispc_read_reg(DISPC_REVISION);
-+	printk(KERN_INFO "OMAP DISPC rev %d.%d\n",
-+	       FLD_GET(rev, 7, 4), FLD_GET(rev, 3, 0));
-+
-+	enable_clocks(0);
-+
-+	return 0;
-+}
-+
-+void dispc_exit(void)
-+{
-+	if (cpu_is_omap34xx())
-+		clk_put(dispc.dpll4_m4_ck);
-+	iounmap(dispc.base);
-+}
-+
-+int dispc_enable_plane(enum omap_plane plane, bool enable)
-+{
-+	DSSDBG("dispc_enable_plane %d, %d\n", plane, enable);
-+
-+	enable_clocks(1);
-+	_dispc_enable_plane(plane, enable);
-+	enable_clocks(0);
-+
-+	return 0;
-+}
-+
-+int dispc_setup_plane(enum omap_plane plane,
-+		       u32 paddr, u16 screen_width,
-+		       u16 pos_x, u16 pos_y,
-+		       u16 width, u16 height,
-+		       u16 out_width, u16 out_height,
-+		       enum omap_color_mode color_mode,
-+		       bool ilace,
-+		       enum omap_dss_rotation_type rotation_type,
-+		       u8 rotation, bool mirror, u8 global_alpha)
-+{
-+	int r = 0;
-+
-+	DSSDBG("dispc_setup_plane %d, pa %x, sw %d, %d,%d, %dx%d -> "
-+	       "%dx%d, ilace %d, cmode %x, rot %d, mir %d\n",
-+	       plane, paddr, screen_width, pos_x, pos_y,
-+	       width, height,
-+	       out_width, out_height,
-+	       ilace, color_mode,
-+	       rotation, mirror);
-+
-+	enable_clocks(1);
-+
-+	r = _dispc_setup_plane(plane,
-+			   paddr, screen_width,
-+			   pos_x, pos_y,
-+			   width, height,
-+			   out_width, out_height,
-+			   color_mode, ilace,
-+			   rotation_type,
-+			   rotation, mirror,
-+			   global_alpha);
-+
-+	enable_clocks(0);
-+
-+	return r;
-+}
---- /dev/null
-+++ b/drivers/video/omap2/dss/display.c
-@@ -0,0 +1,658 @@
-+/*
-+ * linux/drivers/video/omap2/dss/display.c
-+ *
-+ * Copyright (C) 2009 Nokia Corporation
-+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
-+ *
-+ * Some code and ideas taken from drivers/video/omap/ driver
-+ * by Imre Deak.
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-+ * more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along with
-+ * this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#define DSS_SUBSYS_NAME "DISPLAY"
-+
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/jiffies.h>
-+#include <linux/list.h>
-+#include <linux/platform_device.h>
-+
-+#include <mach/display.h>
-+#include "dss.h"
-+
-+static LIST_HEAD(display_list);
-+
-+static ssize_t display_enabled_show(struct device *dev,
-+		struct device_attribute *attr, char *buf)
-+{
-+	struct omap_dss_device *dssdev = to_dss_device(dev);
-+	bool enabled = dssdev->state != OMAP_DSS_DISPLAY_DISABLED;
-+
-+	return snprintf(buf, PAGE_SIZE, "%d\n", enabled);
-+}
-+
-+static ssize_t display_enabled_store(struct device *dev,
-+		struct device_attribute *attr,
-+		const char *buf, size_t size)
-+{
-+	struct omap_dss_device *dssdev = to_dss_device(dev);
-+	bool enabled, r;
-+
-+	enabled = simple_strtoul(buf, NULL, 10);
-+
-+	if (enabled != (dssdev->state != OMAP_DSS_DISPLAY_DISABLED)) {
-+		if (enabled) {
-+			r = dssdev->enable(dssdev);
-+			if (r)
-+				return r;
-+		} else {
-+			dssdev->disable(dssdev);
-+		}
-+	}
-+
-+	return size;
-+}
-+
-+static ssize_t display_upd_mode_show(struct device *dev,
-+		struct device_attribute *attr, char *buf)
-+{
-+	struct omap_dss_device *dssdev = to_dss_device(dev);
-+	enum omap_dss_update_mode mode = OMAP_DSS_UPDATE_AUTO;
-+	if (dssdev->get_update_mode)
-+		mode = dssdev->get_update_mode(dssdev);
-+	return snprintf(buf, PAGE_SIZE, "%d\n", mode);
-+}
-+
-+static ssize_t display_upd_mode_store(struct device *dev,
-+		struct device_attribute *attr,
-+		const char *buf, size_t size)
-+{
-+	struct omap_dss_device *dssdev = to_dss_device(dev);
-+	int val, r;
-+	enum omap_dss_update_mode mode;
-+
-+	val = simple_strtoul(buf, NULL, 10);
-+
-+	switch (val) {
-+	case OMAP_DSS_UPDATE_DISABLED:
-+	case OMAP_DSS_UPDATE_AUTO:
-+	case OMAP_DSS_UPDATE_MANUAL:
-+		mode = (enum omap_dss_update_mode)val;
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	r = dssdev->set_update_mode(dssdev, mode);
-+	if (r)
-+		return r;
-+
-+	return size;
-+}
-+
-+static ssize_t display_tear_show(struct device *dev,
-+		struct device_attribute *attr, char *buf)
-+{
-+	struct omap_dss_device *dssdev = to_dss_device(dev);
-+	return snprintf(buf, PAGE_SIZE, "%d\n",
-+			dssdev->get_te ? dssdev->get_te(dssdev) : 0);
-+}
-+
-+static ssize_t display_tear_store(struct device *dev,
-+		struct device_attribute *attr, const char *buf, size_t size)
-+{
-+	struct omap_dss_device *dssdev = to_dss_device(dev);
-+	unsigned long te;
-+	int r;
-+
-+	if (!dssdev->enable_te || !dssdev->get_te)
-+		return -ENOENT;
-+
-+	te = simple_strtoul(buf, NULL, 0);
-+
-+	r = dssdev->enable_te(dssdev, te);
-+	if (r)
-+		return r;
-+
-+	return size;
-+}
-+
-+static ssize_t display_timings_show(struct device *dev,
-+		struct device_attribute *attr, char *buf)
-+{
-+	struct omap_dss_device *dssdev = to_dss_device(dev);
-+	struct omap_video_timings t;
-+
-+	if (!dssdev->get_timings)
-+		return -ENOENT;
-+
-+	dssdev->get_timings(dssdev, &t);
-+
-+	return snprintf(buf, PAGE_SIZE, "%u,%u/%u/%u/%u,%u/%u/%u/%u\n",
-+			t.pixel_clock,
-+			t.x_res, t.hfp, t.hbp, t.hsw,
-+			t.y_res, t.vfp, t.vbp, t.vsw);
-+}
-+
-+static ssize_t display_timings_store(struct device *dev,
-+		struct device_attribute *attr, const char *buf, size_t size)
-+{
-+	struct omap_dss_device *dssdev = to_dss_device(dev);
-+	struct omap_video_timings t;
-+	int r, found;
-+
-+	if (!dssdev->set_timings || !dssdev->check_timings)
-+		return -ENOENT;
-+
-+	found = 0;
-+#ifdef CONFIG_OMAP2_DSS_VENC
-+	if (strncmp("pal", buf, 3) == 0) {
-+		t = omap_dss_pal_timings;
-+		found = 1;
-+	} else if (strncmp("ntsc", buf, 4) == 0) {
-+		t = omap_dss_ntsc_timings;
-+		found = 1;
-+	}
-+#endif
-+	if (!found && sscanf(buf, "%u,%hu/%hu/%hu/%hu,%hu/%hu/%hu/%hu",
-+				&t.pixel_clock,
-+				&t.x_res, &t.hfp, &t.hbp, &t.hsw,
-+				&t.y_res, &t.vfp, &t.vbp, &t.vsw) != 9)
-+		return -EINVAL;
-+
-+	r = dssdev->check_timings(dssdev, &t);
-+	if (r)
-+		return r;
-+
-+	dssdev->set_timings(dssdev, &t);
-+
-+	return size;
-+}
-+
-+static ssize_t display_rotate_show(struct device *dev,
-+		struct device_attribute *attr, char *buf)
-+{
-+	struct omap_dss_device *dssdev = to_dss_device(dev);
-+	int rotate;
-+	if (!dssdev->get_rotate)
-+		return -ENOENT;
-+	rotate = dssdev->get_rotate(dssdev);
-+	return snprintf(buf, PAGE_SIZE, "%u\n", rotate);
-+}
-+
-+static ssize_t display_rotate_store(struct device *dev,
-+		struct device_attribute *attr, const char *buf, size_t size)
-+{
-+	struct omap_dss_device *dssdev = to_dss_device(dev);
-+	unsigned long rot;
-+	int r;
-+
-+	if (!dssdev->set_rotate || !dssdev->get_rotate)
-+		return -ENOENT;
-+
-+	rot = simple_strtoul(buf, NULL, 0);
-+
-+	r = dssdev->set_rotate(dssdev, rot);
-+	if (r)
-+		return r;
-+
-+	return size;
-+}
-+
-+static ssize_t display_mirror_show(struct device *dev,
-+		struct device_attribute *attr, char *buf)
-+{
-+	struct omap_dss_device *dssdev = to_dss_device(dev);
-+	int mirror;
-+	if (!dssdev->get_mirror)
-+		return -ENOENT;
-+	mirror = dssdev->get_mirror(dssdev);
-+	return snprintf(buf, PAGE_SIZE, "%u\n", mirror);
-+}
-+
-+static ssize_t display_mirror_store(struct device *dev,
-+		struct device_attribute *attr, const char *buf, size_t size)
-+{
-+	struct omap_dss_device *dssdev = to_dss_device(dev);
-+	unsigned long mirror;
-+	int r;
-+
-+	if (!dssdev->set_mirror || !dssdev->get_mirror)
-+		return -ENOENT;
-+
-+	mirror = simple_strtoul(buf, NULL, 0);
-+
-+	r = dssdev->set_mirror(dssdev, mirror);
-+	if (r)
-+		return r;
-+
-+	return size;
-+}
-+
-+static ssize_t display_wss_show(struct device *dev,
-+		struct device_attribute *attr, char *buf)
-+{
-+	struct omap_dss_device *dssdev = to_dss_device(dev);
-+	unsigned int wss;
-+
-+	if (!dssdev->get_wss)
-+		return -ENOENT;
-+
-+	wss = dssdev->get_wss(dssdev);
-+
-+	return snprintf(buf, PAGE_SIZE, "0x%05x\n", wss);
-+}
-+
-+static ssize_t display_wss_store(struct device *dev,
-+		struct device_attribute *attr, const char *buf, size_t size)
-+{
-+	struct omap_dss_device *dssdev = to_dss_device(dev);
-+	unsigned long wss;
-+	int r;
-+
-+	if (!dssdev->get_wss || !dssdev->set_wss)
-+		return -ENOENT;
-+
-+	if (strict_strtoul(buf, 0, &wss))
-+		return -EINVAL;
-+
-+	if (wss > 0xfffff)
-+		return -EINVAL;
-+
-+	r = dssdev->set_wss(dssdev, wss);
-+	if (r)
-+		return r;
-+
-+	return size;
-+}
-+
-+static DEVICE_ATTR(enabled, S_IRUGO|S_IWUSR,
-+		display_enabled_show, display_enabled_store);
-+static DEVICE_ATTR(update_mode, S_IRUGO|S_IWUSR,
-+		display_upd_mode_show, display_upd_mode_store);
-+static DEVICE_ATTR(tear_elim, S_IRUGO|S_IWUSR,
-+		display_tear_show, display_tear_store);
-+static DEVICE_ATTR(timings, S_IRUGO|S_IWUSR,
-+		display_timings_show, display_timings_store);
-+static DEVICE_ATTR(rotate, S_IRUGO|S_IWUSR,
-+		display_rotate_show, display_rotate_store);
-+static DEVICE_ATTR(mirror, S_IRUGO|S_IWUSR,
-+		display_mirror_show, display_mirror_store);
-+static DEVICE_ATTR(wss, S_IRUGO|S_IWUSR,
-+		display_wss_show, display_wss_store);
-+
-+static struct device_attribute *display_sysfs_attrs[] = {
-+	&dev_attr_enabled,
-+	&dev_attr_update_mode,
-+	&dev_attr_tear_elim,
-+	&dev_attr_timings,
-+	&dev_attr_rotate,
-+	&dev_attr_mirror,
-+	&dev_attr_wss,
-+	NULL
-+};
-+
-+static void default_get_resolution(struct omap_dss_device *dssdev,
-+			u16 *xres, u16 *yres)
-+{
-+	*xres = dssdev->panel.timings.x_res;
-+	*yres = dssdev->panel.timings.y_res;
-+}
-+
-+void default_get_overlay_fifo_thresholds(enum omap_plane plane,
-+		u32 fifo_size, enum omap_burst_size *burst_size,
-+		u32 *fifo_low, u32 *fifo_high)
-+{
-+	unsigned burst_size_bytes;
-+
-+	*burst_size = OMAP_DSS_BURST_16x32;
-+	burst_size_bytes = 16 * 32 / 8;
-+
-+	*fifo_high = fifo_size - 1;
-+	*fifo_low = fifo_size - burst_size_bytes;
-+}
-+
-+static int default_wait_vsync(struct omap_dss_device *dssdev)
-+{
-+	unsigned long timeout = msecs_to_jiffies(500);
-+	u32 irq;
-+
-+	if (dssdev->type == OMAP_DISPLAY_TYPE_VENC)
-+		irq = DISPC_IRQ_EVSYNC_ODD;
-+	else
-+		irq = DISPC_IRQ_VSYNC;
-+
-+	return omap_dispc_wait_for_irq_interruptible_timeout(irq, timeout);
-+}
-+
-+static int default_get_recommended_bpp(struct omap_dss_device *dssdev)
-+{
-+	if (dssdev->panel.recommended_bpp)
-+		return dssdev->panel.recommended_bpp;
-+
-+	switch (dssdev->type) {
-+	case OMAP_DISPLAY_TYPE_DPI:
-+		if (dssdev->phy.dpi.data_lines == 24)
-+			return 24;
-+		else
-+			return 16;
-+
-+	case OMAP_DISPLAY_TYPE_DBI:
-+	case OMAP_DISPLAY_TYPE_DSI:
-+		if (dssdev->ctrl.pixel_size == 24)
-+			return 24;
-+		else
-+			return 16;
-+	case OMAP_DISPLAY_TYPE_VENC:
-+	case OMAP_DISPLAY_TYPE_SDI:
-+		return 24;
-+		return 24;
-+	default:
-+		BUG();
-+	}
-+}
-+
-+/* Checks if replication logic should be used. Only use for active matrix,
-+ * when overlay is in RGB12U or RGB16 mode, and LCD interface is
-+ * 18bpp or 24bpp */
-+bool dss_use_replication(struct omap_dss_device *dssdev,
-+		enum omap_color_mode mode)
-+{
-+	int bpp;
-+
-+	if (mode != OMAP_DSS_COLOR_RGB12U && mode != OMAP_DSS_COLOR_RGB16)
-+		return false;
-+
-+	if (dssdev->type == OMAP_DISPLAY_TYPE_DPI &&
-+			(dssdev->panel.config & OMAP_DSS_LCD_TFT) == 0)
-+		return false;
-+
-+	switch (dssdev->type) {
-+	case OMAP_DISPLAY_TYPE_DPI:
-+		bpp = dssdev->phy.dpi.data_lines;
-+		break;
-+	case OMAP_DISPLAY_TYPE_VENC:
-+	case OMAP_DISPLAY_TYPE_SDI:
-+		bpp = 24;
-+		break;
-+	case OMAP_DISPLAY_TYPE_DBI:
-+	case OMAP_DISPLAY_TYPE_DSI:
-+		bpp = dssdev->ctrl.pixel_size;
-+		break;
-+	default:
-+		BUG();
-+	}
-+
-+	return bpp > 16;
-+}
-+
-+void dss_init_device(struct platform_device *pdev,
-+		struct omap_dss_device *dssdev)
-+{
-+	struct device_attribute *attr;
-+	int i;
-+	int r;
-+
-+	switch (dssdev->type) {
-+	case OMAP_DISPLAY_TYPE_DPI:
-+#ifdef CONFIG_OMAP2_DSS_RFBI
-+	case OMAP_DISPLAY_TYPE_DBI:
-+#endif
-+#ifdef CONFIG_OMAP2_DSS_SDI
-+	case OMAP_DISPLAY_TYPE_SDI:
-+#endif
-+#ifdef CONFIG_OMAP2_DSS_DSI
-+	case OMAP_DISPLAY_TYPE_DSI:
-+#endif
-+#ifdef CONFIG_OMAP2_DSS_VENC
-+	case OMAP_DISPLAY_TYPE_VENC:
-+#endif
-+		break;
-+	default:
-+		DSSERR("Support for display '%s' not compiled in.\n",
-+				dssdev->name);
-+		return;
-+	}
-+
-+	dssdev->get_resolution = default_get_resolution;
-+	dssdev->get_recommended_bpp = default_get_recommended_bpp;
-+	dssdev->wait_vsync = default_wait_vsync;
-+
-+	switch (dssdev->type) {
-+	case OMAP_DISPLAY_TYPE_DPI:
-+		r = dpi_init_display(dssdev);
-+		break;
-+#ifdef CONFIG_OMAP2_DSS_RFBI
-+	case OMAP_DISPLAY_TYPE_DBI:
-+		r = rfbi_init_display(dssdev);
-+		break;
-+#endif
-+#ifdef CONFIG_OMAP2_DSS_VENC
-+	case OMAP_DISPLAY_TYPE_VENC:
-+		r = venc_init_display(dssdev);
-+		break;
-+#endif
-+#ifdef CONFIG_OMAP2_DSS_SDI
-+	case OMAP_DISPLAY_TYPE_SDI:
-+		r = sdi_init_display(dssdev);
-+		break;
-+#endif
-+#ifdef CONFIG_OMAP2_DSS_DSI
-+	case OMAP_DISPLAY_TYPE_DSI:
-+		r = dsi_init_display(dssdev);
-+		break;
-+#endif
-+	default:
-+		BUG();
-+	}
-+
-+	if (r) {
-+		DSSERR("failed to init display %s\n", dssdev->name);
-+		return;
-+	}
-+
-+	/* create device sysfs files */
-+	i = 0;
-+	while ((attr = display_sysfs_attrs[i++]) != NULL) {
-+		r = device_create_file(&dssdev->dev, attr);
-+		if (r)
-+			DSSERR("failed to create sysfs file\n");
-+	}
-+
-+	/* create display? sysfs links */
-+	r = sysfs_create_link(&pdev->dev.kobj, &dssdev->dev.kobj,
-+			dev_name(&dssdev->dev));
-+	if (r)
-+		DSSERR("failed to create sysfs display link\n");
-+}
-+
-+void dss_uninit_device(struct platform_device *pdev,
-+		struct omap_dss_device *dssdev)
-+{
-+	struct device_attribute *attr;
-+	int i = 0;
-+
-+	sysfs_remove_link(&pdev->dev.kobj, dev_name(&dssdev->dev));
-+
-+	while ((attr = display_sysfs_attrs[i++]) != NULL)
-+		device_remove_file(&dssdev->dev, attr);
-+
-+	if (dssdev->manager)
-+		dssdev->manager->unset_device(dssdev->manager);
-+}
-+
-+static int dss_suspend_device(struct device *dev, void *data)
-+{
-+	int r;
-+	struct omap_dss_device *dssdev = to_dss_device(dev);
-+
-+	if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE) {
-+		dssdev->activate_after_resume = false;
-+		return 0;
-+	}
-+
-+	if (!dssdev->suspend) {
-+		DSSERR("display '%s' doesn't implement suspend\n",
-+				dssdev->name);
-+		return -ENOSYS;
-+	}
-+
-+	r = dssdev->suspend(dssdev);
-+	if (r)
-+		return r;
-+
-+	dssdev->activate_after_resume = true;
-+
-+	return 0;
-+}
-+
-+int dss_suspend_all_devices(void)
-+{
-+	int r;
-+	struct bus_type *bus = dss_get_bus();
-+
-+	r = bus_for_each_dev(bus, NULL, NULL, dss_suspend_device);
-+	if (r) {
-+		/* resume all displays that were suspended */
-+		dss_resume_all_devices();
-+		return r;
-+	}
-+
-+	return 0;
-+}
-+
-+static int dss_resume_device(struct device *dev, void *data)
-+{
-+	int r;
-+	struct omap_dss_device *dssdev = to_dss_device(dev);
-+
-+	if (dssdev->activate_after_resume && dssdev->resume) {
-+		r = dssdev->resume(dssdev);
-+		if (r)
-+			return r;
-+	}
-+
-+	dssdev->activate_after_resume = false;
-+
-+	return 0;
-+}
-+
-+int dss_resume_all_devices(void)
-+{
-+	struct bus_type *bus = dss_get_bus();
-+
-+	return bus_for_each_dev(bus, NULL, NULL, dss_resume_device);
-+}
-+
-+
-+void omap_dss_get_device(struct omap_dss_device *dssdev)
-+{
-+	get_device(&dssdev->dev);
-+}
-+EXPORT_SYMBOL(omap_dss_get_device);
-+
-+void omap_dss_put_device(struct omap_dss_device *dssdev)
-+{
-+	put_device(&dssdev->dev);
-+}
-+EXPORT_SYMBOL(omap_dss_put_device);
-+
-+/* ref count of the found device is incremented. ref count
-+ * of from-device is decremented. */
-+struct omap_dss_device *omap_dss_get_next_device(struct omap_dss_device *from)
-+{
-+	struct device *dev;
-+	struct device *dev_start = NULL;
-+	struct omap_dss_device *dssdev = NULL;
-+
-+	int match(struct device *dev, void *data)
-+	{
-+		/* skip panels connected to controllers */
-+		if (to_dss_device(dev)->panel.ctrl)
-+			return 0;
-+
-+		return 1;
-+	}
-+
-+	if (from)
-+		dev_start = &from->dev;
-+	dev = bus_find_device(dss_get_bus(), dev_start, NULL, match);
-+	if (dev)
-+		dssdev = to_dss_device(dev);
-+	if (from)
-+		put_device(&from->dev);
-+
-+	return dssdev;
-+}
-+EXPORT_SYMBOL(omap_dss_get_next_device);
-+
-+struct omap_dss_device *omap_dss_find_device(void *data,
-+		int (*match)(struct omap_dss_device *dssdev, void *data))
-+{
-+	struct omap_dss_device *dssdev = NULL;
-+
-+	while ((dssdev = omap_dss_get_next_device(dssdev)) != NULL) {
-+		if (match(dssdev, data))
-+			return dssdev;
-+	}
-+
-+	return NULL;
-+}
-+EXPORT_SYMBOL(omap_dss_find_device);
-+
-+int omap_dss_start_device(struct omap_dss_device *dssdev)
-+{
-+	int r;
-+
-+	if (!dssdev->driver) {
-+		DSSDBG("no driver\n");
-+		r = -ENODEV;
-+		goto err0;
-+	}
-+
-+	if (dssdev->ctrl.panel && !dssdev->ctrl.panel->driver) {
-+		DSSDBG("no panel driver\n");
-+		r = -ENODEV;
-+		goto err0;
-+	}
-+
-+	if (!try_module_get(dssdev->dev.driver->owner)) {
-+		r = -ENODEV;
-+		goto err0;
-+	}
-+
-+	if (dssdev->ctrl.panel) {
-+		if (!try_module_get(dssdev->ctrl.panel->dev.driver->owner)) {
-+			r = -ENODEV;
-+			goto err1;
-+		}
-+	}
-+
-+	return 0;
-+err1:
-+	module_put(dssdev->dev.driver->owner);
-+err0:
-+	return r;
-+}
-+EXPORT_SYMBOL(omap_dss_start_device);
-+
-+void omap_dss_stop_device(struct omap_dss_device *dssdev)
-+{
-+	if (dssdev->ctrl.panel)
-+		module_put(dssdev->ctrl.panel->dev.driver->owner);
-+
-+	module_put(dssdev->dev.driver->owner);
-+}
-+EXPORT_SYMBOL(omap_dss_stop_device);
-+
---- /dev/null
-+++ b/drivers/video/omap2/dss/dpi.c
-@@ -0,0 +1,388 @@
-+/*
-+ * linux/drivers/video/omap2/dss/dpi.c
-+ *
-+ * Copyright (C) 2009 Nokia Corporation
-+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
-+ *
-+ * Some code and ideas taken from drivers/video/omap/ driver
-+ * by Imre Deak.
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-+ * more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along with
-+ * this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#define DSS_SUBSYS_NAME "DPI"
-+
-+#include <linux/kernel.h>
-+#include <linux/clk.h>
-+#include <linux/delay.h>
-+#include <linux/errno.h>
-+
-+#include <mach/board.h>
-+#include <mach/display.h>
-+#include <mach/cpu.h>
-+
-+#include "dss.h"
-+
-+static struct {
-+	int update_enabled;
-+} dpi;
-+
-+#ifdef CONFIG_OMAP2_DSS_USE_DSI_PLL
-+static int dpi_set_dsi_clk(bool is_tft, unsigned long pck_req,
-+		unsigned long *fck, int *lck_div, int *pck_div)
-+{
-+	struct dsi_clock_info cinfo;
-+	int r;
-+
-+	r = dsi_pll_calc_pck(is_tft, pck_req, &cinfo);
-+	if (r)
-+		return r;
-+
-+	r = dsi_pll_program(&cinfo);
-+	if (r)
-+		return r;
-+
-+	dss_select_clk_source(0, 1);
-+
-+	dispc_set_lcd_divisor(cinfo.lck_div, cinfo.pck_div);
-+
-+	*fck = cinfo.dsi1_pll_fclk;
-+	*lck_div = cinfo.lck_div;
-+	*pck_div = cinfo.pck_div;
-+
-+	return 0;
-+}
-+#else
-+static int dpi_set_dispc_clk(bool is_tft, unsigned long pck_req,
-+		unsigned long *fck, int *lck_div, int *pck_div)
-+{
-+	struct dispc_clock_info cinfo;
-+	int r;
-+
-+	r = dispc_calc_clock_div(is_tft, pck_req, &cinfo);
-+	if (r)
-+		return r;
-+
-+	r = dispc_set_clock_div(&cinfo);
-+	if (r)
-+		return r;
-+
-+	*fck = cinfo.fck;
-+	*lck_div = cinfo.lck_div;
-+	*pck_div = cinfo.pck_div;
-+
-+	return 0;
-+}
-+#endif
-+
-+static int dpi_set_mode(struct omap_dss_device *dssdev)
-+{
-+	struct omap_video_timings *t = &dssdev->panel.timings;
-+	int lck_div, pck_div;
-+	unsigned long fck;
-+	unsigned long pck;
-+	bool is_tft;
-+	int r = 0;
-+
-+	dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1);
-+
-+	dispc_set_pol_freq(dssdev->panel.config, dssdev->panel.acbi,
-+			dssdev->panel.acb);
-+
-+	is_tft = (dssdev->panel.config & OMAP_DSS_LCD_TFT) != 0;
-+
-+#ifdef CONFIG_OMAP2_DSS_USE_DSI_PLL
-+	r = dpi_set_dsi_clk(is_tft, t->pixel_clock * 1000,
-+			&fck, &lck_div, &pck_div);
-+#else
-+	r = dpi_set_dispc_clk(is_tft, t->pixel_clock * 1000,
-+			&fck, &lck_div, &pck_div);
-+#endif
-+	if (r)
-+		goto err0;
-+
-+	pck = fck / lck_div / pck_div / 1000;
-+
-+	if (pck != t->pixel_clock) {
-+		DSSWARN("Could not find exact pixel clock. "
-+				"Requested %d kHz, got %lu kHz\n",
-+				t->pixel_clock, pck);
-+
-+		t->pixel_clock = pck;
-+	}
-+
-+	dispc_set_lcd_timings(t);
-+
-+err0:
-+	dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
-+	return r;
-+}
-+
-+static int dpi_basic_init(struct omap_dss_device *dssdev)
-+{
-+	bool is_tft;
-+
-+	is_tft = (dssdev->panel.config & OMAP_DSS_LCD_TFT) != 0;
-+
-+	dispc_set_parallel_interface_mode(OMAP_DSS_PARALLELMODE_BYPASS);
-+	dispc_set_lcd_display_type(is_tft ? OMAP_DSS_LCD_DISPLAY_TFT :
-+			OMAP_DSS_LCD_DISPLAY_STN);
-+	dispc_set_tft_data_lines(dssdev->phy.dpi.data_lines);
-+
-+	return 0;
-+}
-+
-+static int dpi_display_enable(struct omap_dss_device *dssdev)
-+{
-+	int r;
-+
-+	r = omap_dss_start_device(dssdev);
-+	if (r) {
-+		DSSERR("failed to start device\n");
-+		goto err0;
-+	}
-+
-+	if (dssdev->state != OMAP_DSS_DISPLAY_DISABLED) {
-+		DSSERR("display already enabled\n");
-+		r = -EINVAL;
-+		goto err1;
-+	}
-+
-+	dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1);
-+
-+	r = dpi_basic_init(dssdev);
-+	if (r)
-+		goto err2;
-+
-+#ifdef CONFIG_OMAP2_DSS_USE_DSI_PLL
-+	dss_clk_enable(DSS_CLK_FCK2);
-+	r = dsi_pll_init(0, 1);
-+	if (r)
-+		goto err3;
-+#endif
-+	r = dpi_set_mode(dssdev);
-+	if (r)
-+		goto err4;
-+
-+	mdelay(2);
-+
-+	dispc_enable_lcd_out(1);
-+
-+	r = dssdev->driver->enable(dssdev);
-+	if (r)
-+		goto err5;
-+
-+	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
-+
-+	return 0;
-+
-+err5:
-+	dispc_enable_lcd_out(0);
-+err4:
-+#ifdef CONFIG_OMAP2_DSS_USE_DSI_PLL
-+	dsi_pll_uninit();
-+err3:
-+	dss_clk_disable(DSS_CLK_FCK2);
-+#endif
-+err2:
-+	dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
-+err1:
-+	omap_dss_stop_device(dssdev);
-+err0:
-+	return r;
-+}
-+
-+static int dpi_display_resume(struct omap_dss_device *dssdev);
-+
-+static void dpi_display_disable(struct omap_dss_device *dssdev)
-+{
-+	if (dssdev->state == OMAP_DSS_DISPLAY_DISABLED)
-+		return;
-+
-+	if (dssdev->state == OMAP_DSS_DISPLAY_SUSPENDED)
-+		dpi_display_resume(dssdev);
-+
-+	dssdev->driver->disable(dssdev);
-+
-+	dispc_enable_lcd_out(0);
-+
-+#ifdef CONFIG_OMAP2_DSS_USE_DSI_PLL
-+	dss_select_clk_source(0, 0);
-+	dsi_pll_uninit();
-+	dss_clk_disable(DSS_CLK_FCK2);
-+#endif
-+
-+	dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
-+
-+	dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
-+
-+	omap_dss_stop_device(dssdev);
-+}
-+
-+static int dpi_display_suspend(struct omap_dss_device *dssdev)
-+{
-+	if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
-+		return -EINVAL;
-+
-+	DSSDBG("dpi_display_suspend\n");
-+
-+	if (dssdev->driver->suspend)
-+		dssdev->driver->suspend(dssdev);
-+
-+	dispc_enable_lcd_out(0);
-+
-+	dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
-+
-+	dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
-+
-+	return 0;
-+}
-+
-+static int dpi_display_resume(struct omap_dss_device *dssdev)
-+{
-+	if (dssdev->state != OMAP_DSS_DISPLAY_SUSPENDED)
-+		return -EINVAL;
-+
-+	DSSDBG("dpi_display_resume\n");
-+
-+	dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1);
-+
-+	dispc_enable_lcd_out(1);
-+
-+	if (dssdev->driver->resume)
-+		dssdev->driver->resume(dssdev);
-+
-+	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
-+
-+	return 0;
-+}
-+
-+static void dpi_set_timings(struct omap_dss_device *dssdev,
-+			struct omap_video_timings *timings)
-+{
-+	DSSDBG("dpi_set_timings\n");
-+	dssdev->panel.timings = *timings;
-+	if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE) {
-+		dpi_set_mode(dssdev);
-+		dispc_go(OMAP_DSS_CHANNEL_LCD);
-+	}
-+}
-+
-+static int dpi_check_timings(struct omap_dss_device *dssdev,
-+			struct omap_video_timings *timings)
-+{
-+	bool is_tft;
-+	int r;
-+	int lck_div, pck_div;
-+	unsigned long fck;
-+	unsigned long pck;
-+
-+	if (!dispc_lcd_timings_ok(timings))
-+		return -EINVAL;
-+
-+	if (timings->pixel_clock == 0)
-+		return -EINVAL;
-+
-+	is_tft = (dssdev->panel.config & OMAP_DSS_LCD_TFT) != 0;
-+
-+#ifdef CONFIG_OMAP2_DSS_USE_DSI_PLL
-+	{
-+		struct dsi_clock_info cinfo;
-+		r = dsi_pll_calc_pck(is_tft, timings->pixel_clock * 1000,
-+				&cinfo);
-+
-+		if (r)
-+			return r;
-+
-+		fck = cinfo.dsi1_pll_fclk;
-+		lck_div = cinfo.lck_div;
-+		pck_div = cinfo.pck_div;
-+	}
-+#else
-+	{
-+		struct dispc_clock_info cinfo;
-+		r = dispc_calc_clock_div(is_tft, timings->pixel_clock * 1000,
-+				&cinfo);
-+
-+		if (r)
-+			return r;
-+
-+		fck = cinfo.fck;
-+		lck_div = cinfo.lck_div;
-+		pck_div = cinfo.pck_div;
-+	}
-+#endif
-+
-+	pck = fck / lck_div / pck_div / 1000;
-+
-+	timings->pixel_clock = pck;
-+
-+	return 0;
-+}
-+
-+static void dpi_get_timings(struct omap_dss_device *dssdev,
-+			struct omap_video_timings *timings)
-+{
-+	*timings = dssdev->panel.timings;
-+}
-+
-+static int dpi_display_set_update_mode(struct omap_dss_device *dssdev,
-+		enum omap_dss_update_mode mode)
-+{
-+	if (mode == OMAP_DSS_UPDATE_MANUAL)
-+		return -EINVAL;
-+
-+	if (mode == OMAP_DSS_UPDATE_DISABLED) {
-+		dispc_enable_lcd_out(0);
-+		dpi.update_enabled = 0;
-+	} else {
-+		dispc_enable_lcd_out(1);
-+		dpi.update_enabled = 1;
-+	}
-+
-+	return 0;
-+}
-+
-+static enum omap_dss_update_mode dpi_display_get_update_mode(
-+		struct omap_dss_device *dssdev)
-+{
-+	return dpi.update_enabled ? OMAP_DSS_UPDATE_AUTO :
-+		OMAP_DSS_UPDATE_DISABLED;
-+}
-+
-+int dpi_init_display(struct omap_dss_device *dssdev)
-+{
-+	DSSDBG("init_display\n");
-+
-+	dssdev->enable = dpi_display_enable;
-+	dssdev->disable = dpi_display_disable;
-+	dssdev->suspend = dpi_display_suspend;
-+	dssdev->resume = dpi_display_resume;
-+	dssdev->set_timings = dpi_set_timings;
-+	dssdev->check_timings = dpi_check_timings;
-+	dssdev->get_timings = dpi_get_timings;
-+	dssdev->set_update_mode = dpi_display_set_update_mode;
-+	dssdev->get_update_mode = dpi_display_get_update_mode;
-+
-+	return 0;
-+}
-+
-+int dpi_init(void)
-+{
-+	return 0;
-+}
-+
-+void dpi_exit(void)
-+{
-+}
-+
---- /dev/null
-+++ b/drivers/video/omap2/dss/dsi.c
-@@ -0,0 +1,3509 @@
-+/*
-+ * linux/drivers/video/omap2/dss/dsi.c
-+ *
-+ * Copyright (C) 2009 Nokia Corporation
-+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.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.
-+ *
-+ * This program is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-+ * more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along with
-+ * this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#define DSS_SUBSYS_NAME "DSI"
-+
-+#include <linux/kernel.h>
-+#include <linux/io.h>
-+#include <linux/clk.h>
-+#include <linux/device.h>
-+#include <linux/err.h>
-+#include <linux/interrupt.h>
-+#include <linux/delay.h>
-+#include <linux/mutex.h>
-+#include <linux/seq_file.h>
-+#include <linux/platform_device.h>
-+#include <linux/regulator/consumer.h>
-+#include <linux/kthread.h>
-+#include <linux/wait.h>
-+
-+#include <mach/board.h>
-+#include <mach/display.h>
-+#include <mach/clock.h>
-+
-+#include "dss.h"
-+
-+/*#define VERBOSE_IRQ*/
-+
-+#define DSI_BASE		0x4804FC00
-+
-+struct dsi_reg { u16 idx; };
-+
-+#define DSI_REG(idx)		((const struct dsi_reg) { idx })
-+
-+#define DSI_SZ_REGS		SZ_1K
-+/* DSI Protocol Engine */
-+
-+#define DSI_REVISION			DSI_REG(0x0000)
-+#define DSI_SYSCONFIG			DSI_REG(0x0010)
-+#define DSI_SYSSTATUS			DSI_REG(0x0014)
-+#define DSI_IRQSTATUS			DSI_REG(0x0018)
-+#define DSI_IRQENABLE			DSI_REG(0x001C)
-+#define DSI_CTRL			DSI_REG(0x0040)
-+#define DSI_COMPLEXIO_CFG1		DSI_REG(0x0048)
-+#define DSI_COMPLEXIO_IRQ_STATUS	DSI_REG(0x004C)
-+#define DSI_COMPLEXIO_IRQ_ENABLE	DSI_REG(0x0050)
-+#define DSI_CLK_CTRL			DSI_REG(0x0054)
-+#define DSI_TIMING1			DSI_REG(0x0058)
-+#define DSI_TIMING2			DSI_REG(0x005C)
-+#define DSI_VM_TIMING1			DSI_REG(0x0060)
-+#define DSI_VM_TIMING2			DSI_REG(0x0064)
-+#define DSI_VM_TIMING3			DSI_REG(0x0068)
-+#define DSI_CLK_TIMING			DSI_REG(0x006C)
-+#define DSI_TX_FIFO_VC_SIZE		DSI_REG(0x0070)
-+#define DSI_RX_FIFO_VC_SIZE		DSI_REG(0x0074)
-+#define DSI_COMPLEXIO_CFG2		DSI_REG(0x0078)
-+#define DSI_RX_FIFO_VC_FULLNESS		DSI_REG(0x007C)
-+#define DSI_VM_TIMING4			DSI_REG(0x0080)
-+#define DSI_TX_FIFO_VC_EMPTINESS	DSI_REG(0x0084)
-+#define DSI_VM_TIMING5			DSI_REG(0x0088)
-+#define DSI_VM_TIMING6			DSI_REG(0x008C)
-+#define DSI_VM_TIMING7			DSI_REG(0x0090)
-+#define DSI_STOPCLK_TIMING		DSI_REG(0x0094)
-+#define DSI_VC_CTRL(n)			DSI_REG(0x0100 + (n * 0x20))
-+#define DSI_VC_TE(n)			DSI_REG(0x0104 + (n * 0x20))
-+#define DSI_VC_LONG_PACKET_HEADER(n)	DSI_REG(0x0108 + (n * 0x20))
-+#define DSI_VC_LONG_PACKET_PAYLOAD(n)	DSI_REG(0x010C + (n * 0x20))
-+#define DSI_VC_SHORT_PACKET_HEADER(n)	DSI_REG(0x0110 + (n * 0x20))
-+#define DSI_VC_IRQSTATUS(n)		DSI_REG(0x0118 + (n * 0x20))
-+#define DSI_VC_IRQENABLE(n)		DSI_REG(0x011C + (n * 0x20))
-+
-+/* DSIPHY_SCP */
-+
-+#define DSI_DSIPHY_CFG0			DSI_REG(0x200 + 0x0000)
-+#define DSI_DSIPHY_CFG1			DSI_REG(0x200 + 0x0004)
-+#define DSI_DSIPHY_CFG2			DSI_REG(0x200 + 0x0008)
-+#define DSI_DSIPHY_CFG5			DSI_REG(0x200 + 0x0014)
-+
-+/* DSI_PLL_CTRL_SCP */
-+
-+#define DSI_PLL_CONTROL			DSI_REG(0x300 + 0x0000)
-+#define DSI_PLL_STATUS			DSI_REG(0x300 + 0x0004)
-+#define DSI_PLL_GO			DSI_REG(0x300 + 0x0008)
-+#define DSI_PLL_CONFIGURATION1		DSI_REG(0x300 + 0x000C)
-+#define DSI_PLL_CONFIGURATION2		DSI_REG(0x300 + 0x0010)
-+
-+#define REG_GET(idx, start, end) \
-+	FLD_GET(dsi_read_reg(idx), start, end)
-+
-+#define REG_FLD_MOD(idx, val, start, end) \
-+	dsi_write_reg(idx, FLD_MOD(dsi_read_reg(idx), val, start, end))
-+
-+/* Global interrupts */
-+#define DSI_IRQ_VC0		(1 << 0)
-+#define DSI_IRQ_VC1		(1 << 1)
-+#define DSI_IRQ_VC2		(1 << 2)
-+#define DSI_IRQ_VC3		(1 << 3)
-+#define DSI_IRQ_WAKEUP		(1 << 4)
-+#define DSI_IRQ_RESYNC		(1 << 5)
-+#define DSI_IRQ_PLL_LOCK	(1 << 7)
-+#define DSI_IRQ_PLL_UNLOCK	(1 << 8)
-+#define DSI_IRQ_PLL_RECALL	(1 << 9)
-+#define DSI_IRQ_COMPLEXIO_ERR	(1 << 10)
-+#define DSI_IRQ_HS_TX_TIMEOUT	(1 << 14)
-+#define DSI_IRQ_LP_RX_TIMEOUT	(1 << 15)
-+#define DSI_IRQ_TE_TRIGGER	(1 << 16)
-+#define DSI_IRQ_ACK_TRIGGER	(1 << 17)
-+#define DSI_IRQ_SYNC_LOST	(1 << 18)
-+#define DSI_IRQ_LDO_POWER_GOOD	(1 << 19)
-+#define DSI_IRQ_TA_TIMEOUT	(1 << 20)
-+#define DSI_IRQ_ERROR_MASK \
-+	(DSI_IRQ_HS_TX_TIMEOUT | DSI_IRQ_LP_RX_TIMEOUT | DSI_IRQ_SYNC_LOST | \
-+	DSI_IRQ_TA_TIMEOUT)
-+#define DSI_IRQ_CHANNEL_MASK	0xf
-+
-+/* Virtual channel interrupts */
-+#define DSI_VC_IRQ_CS		(1 << 0)
-+#define DSI_VC_IRQ_ECC_CORR	(1 << 1)
-+#define DSI_VC_IRQ_PACKET_SENT	(1 << 2)
-+#define DSI_VC_IRQ_FIFO_TX_OVF	(1 << 3)
-+#define DSI_VC_IRQ_FIFO_RX_OVF	(1 << 4)
-+#define DSI_VC_IRQ_BTA		(1 << 5)
-+#define DSI_VC_IRQ_ECC_NO_CORR	(1 << 6)
-+#define DSI_VC_IRQ_FIFO_TX_UDF	(1 << 7)
-+#define DSI_VC_IRQ_PP_BUSY_CHANGE (1 << 8)
-+#define DSI_VC_IRQ_ERROR_MASK \
-+	(DSI_VC_IRQ_CS | DSI_VC_IRQ_ECC_CORR | DSI_VC_IRQ_FIFO_TX_OVF | \
-+	DSI_VC_IRQ_FIFO_RX_OVF | DSI_VC_IRQ_ECC_NO_CORR | \
-+	DSI_VC_IRQ_FIFO_TX_UDF)
-+
-+/* ComplexIO interrupts */
-+#define DSI_CIO_IRQ_ERRSYNCESC1		(1 << 0)
-+#define DSI_CIO_IRQ_ERRSYNCESC2		(1 << 1)
-+#define DSI_CIO_IRQ_ERRSYNCESC3		(1 << 2)
-+#define DSI_CIO_IRQ_ERRESC1		(1 << 5)
-+#define DSI_CIO_IRQ_ERRESC2		(1 << 6)
-+#define DSI_CIO_IRQ_ERRESC3		(1 << 7)
-+#define DSI_CIO_IRQ_ERRCONTROL1		(1 << 10)
-+#define DSI_CIO_IRQ_ERRCONTROL2		(1 << 11)
-+#define DSI_CIO_IRQ_ERRCONTROL3		(1 << 12)
-+#define DSI_CIO_IRQ_STATEULPS1		(1 << 15)
-+#define DSI_CIO_IRQ_STATEULPS2		(1 << 16)
-+#define DSI_CIO_IRQ_STATEULPS3		(1 << 17)
-+#define DSI_CIO_IRQ_ERRCONTENTIONLP0_1	(1 << 20)
-+#define DSI_CIO_IRQ_ERRCONTENTIONLP1_1	(1 << 21)
-+#define DSI_CIO_IRQ_ERRCONTENTIONLP0_2	(1 << 22)
-+#define DSI_CIO_IRQ_ERRCONTENTIONLP1_2	(1 << 23)
-+#define DSI_CIO_IRQ_ERRCONTENTIONLP0_3	(1 << 24)
-+#define DSI_CIO_IRQ_ERRCONTENTIONLP1_3	(1 << 25)
-+#define DSI_CIO_IRQ_ULPSACTIVENOT_ALL0	(1 << 30)
-+#define DSI_CIO_IRQ_ULPSACTIVENOT_ALL1	(1 << 31)
-+
-+#define DSI_DT_DCS_SHORT_WRITE_0	0x05
-+#define DSI_DT_DCS_SHORT_WRITE_1	0x15
-+#define DSI_DT_DCS_READ			0x06
-+#define DSI_DT_SET_MAX_RET_PKG_SIZE	0x37
-+#define DSI_DT_NULL_PACKET		0x09
-+#define DSI_DT_DCS_LONG_WRITE		0x39
-+
-+#define DSI_DT_RX_ACK_WITH_ERR		0x02
-+#define DSI_DT_RX_DCS_LONG_READ		0x1c
-+#define DSI_DT_RX_SHORT_READ_1		0x21
-+#define DSI_DT_RX_SHORT_READ_2		0x22
-+
-+#define FINT_MAX 2100000
-+#define FINT_MIN 750000
-+#define REGN_MAX (1 << 7)
-+#define REGM_MAX ((1 << 11) - 1)
-+#define REGM3_MAX (1 << 4)
-+#define REGM4_MAX (1 << 4)
-+
-+enum fifo_size {
-+	DSI_FIFO_SIZE_0		= 0,
-+	DSI_FIFO_SIZE_32	= 1,
-+	DSI_FIFO_SIZE_64	= 2,
-+	DSI_FIFO_SIZE_96	= 3,
-+	DSI_FIFO_SIZE_128	= 4,
-+};
-+
-+enum dsi_vc_mode {
-+	DSI_VC_MODE_L4 = 0,
-+	DSI_VC_MODE_VP,
-+};
-+
-+struct dsi_update_region {
-+	bool dirty;
-+	u16 x, y, w, h;
-+	struct omap_dss_device *device;
-+};
-+
-+static struct
-+{
-+	void __iomem	*base;
-+
-+	unsigned long	dsi1_pll_fclk;	/* Hz */
-+	unsigned long	dsi2_pll_fclk;	/* Hz */
-+	unsigned long	dsiphy;		/* Hz */
-+	unsigned long	ddr_clk;	/* Hz */
-+
-+	struct regulator *vdds_dsi_reg;
-+
-+	struct {
-+		enum dsi_vc_mode mode;
-+		struct omap_dss_device *dssdev;
-+		enum fifo_size fifo_size;
-+		int dest_per;	/* destination peripheral 0-3 */
-+	} vc[4];
-+
-+	struct mutex lock;
-+	struct mutex bus_lock;
-+
-+	unsigned pll_locked;
-+
-+	struct completion bta_completion;
-+
-+	struct task_struct *thread;
-+	wait_queue_head_t waitqueue;
-+
-+	spinlock_t update_lock;
-+	bool framedone_received;
-+	struct dsi_update_region update_region;
-+	struct dsi_update_region active_update_region;
-+	struct completion update_completion;
-+
-+	enum omap_dss_update_mode user_update_mode;
-+	enum omap_dss_update_mode update_mode;
-+	bool te_enabled;
-+	bool use_ext_te;
-+
-+	unsigned long cache_req_pck;
-+	unsigned long cache_clk_freq;
-+	struct dsi_clock_info cache_cinfo;
-+
-+	u32		errors;
-+	spinlock_t	errors_lock;
-+#ifdef DEBUG
-+	ktime_t perf_setup_time;
-+	ktime_t perf_start_time;
-+	ktime_t perf_start_time_auto;
-+	int perf_measure_frames;
-+#endif
-+	int debug_read;
-+	int debug_write;
-+} dsi;
-+
-+#ifdef DEBUG
-+static unsigned int dsi_perf;
-+module_param_named(dsi_perf, dsi_perf, bool, 0644);
-+#endif
-+
-+static inline void dsi_write_reg(const struct dsi_reg idx, u32 val)
-+{
-+	__raw_writel(val, dsi.base + idx.idx);
-+}
-+
-+static inline u32 dsi_read_reg(const struct dsi_reg idx)
-+{
-+	return __raw_readl(dsi.base + idx.idx);
-+}
-+
-+
-+void dsi_save_context(void)
-+{
-+}
-+
-+void dsi_restore_context(void)
-+{
-+}
-+
-+void dsi_bus_lock(void)
-+{
-+	mutex_lock(&dsi.bus_lock);
-+}
-+EXPORT_SYMBOL(dsi_bus_lock);
-+
-+void dsi_bus_unlock(void)
-+{
-+	mutex_unlock(&dsi.bus_lock);
-+}
-+EXPORT_SYMBOL(dsi_bus_unlock);
-+
-+static inline int wait_for_bit_change(const struct dsi_reg idx, int bitnum,
-+		int value)
-+{
-+	int t = 100000;
-+
-+	while (REG_GET(idx, bitnum, bitnum) != value) {
-+		if (--t == 0)
-+			return !value;
-+	}
-+
-+	return value;
-+}
-+
-+#ifdef DEBUG
-+static void dsi_perf_mark_setup(void)
-+{
-+	dsi.perf_setup_time = ktime_get();
-+}
-+
-+static void dsi_perf_mark_start(void)
-+{
-+	dsi.perf_start_time = ktime_get();
-+}
-+
-+static void dsi_perf_mark_start_auto(void)
-+{
-+	dsi.perf_measure_frames = 0;
-+	dsi.perf_start_time_auto = ktime_get();
-+}
-+
-+static void dsi_perf_show(const char *name)
-+{
-+	ktime_t t, setup_time, trans_time;
-+	u32 total_bytes;
-+	u32 setup_us, trans_us, total_us;
-+
-+	if (!dsi_perf)
-+		return;
-+
-+	if (dsi.update_mode == OMAP_DSS_UPDATE_DISABLED)
-+		return;
-+
-+	t = ktime_get();
-+
-+	setup_time = ktime_sub(dsi.perf_start_time, dsi.perf_setup_time);
-+	setup_us = (u32)ktime_to_us(setup_time);
-+	if (setup_us == 0)
-+		setup_us = 1;
-+
-+	trans_time = ktime_sub(t, dsi.perf_start_time);
-+	trans_us = (u32)ktime_to_us(trans_time);
-+	if (trans_us == 0)
-+		trans_us = 1;
-+
-+	total_us = setup_us + trans_us;
-+
-+	total_bytes = dsi.active_update_region.w *
-+		dsi.active_update_region.h *
-+		dsi.active_update_region.device->ctrl.pixel_size / 8;
-+
-+	if (dsi.update_mode == OMAP_DSS_UPDATE_AUTO) {
-+		static u32 s_total_trans_us, s_total_setup_us;
-+		static u32 s_min_trans_us = 0xffffffff, s_min_setup_us;
-+		static u32 s_max_trans_us, s_max_setup_us;
-+		const int numframes = 100;
-+		ktime_t total_time_auto;
-+		u32 total_time_auto_us;
-+
-+		dsi.perf_measure_frames++;
-+
-+		if (setup_us < s_min_setup_us)
-+			s_min_setup_us = setup_us;
-+
-+		if (setup_us > s_max_setup_us)
-+			s_max_setup_us = setup_us;
-+
-+		s_total_setup_us += setup_us;
-+
-+		if (trans_us < s_min_trans_us)
-+			s_min_trans_us = trans_us;
-+
-+		if (trans_us > s_max_trans_us)
-+			s_max_trans_us = trans_us;
-+
-+		s_total_trans_us += trans_us;
-+
-+		if (dsi.perf_measure_frames < numframes)
-+			return;
-+
-+		total_time_auto = ktime_sub(t, dsi.perf_start_time_auto);
-+		total_time_auto_us = (u32)ktime_to_us(total_time_auto);
-+
-+		printk(KERN_INFO "DSI(%s): %u fps, setup %u/%u/%u, "
-+				"trans %u/%u/%u\n",
-+				name,
-+				1000 * 1000 * numframes / total_time_auto_us,
-+				s_min_setup_us,
-+				s_max_setup_us,
-+				s_total_setup_us / numframes,
-+				s_min_trans_us,
-+				s_max_trans_us,
-+				s_total_trans_us / numframes);
-+
-+		s_total_setup_us = 0;
-+		s_min_setup_us = 0xffffffff;
-+		s_max_setup_us = 0;
-+		s_total_trans_us = 0;
-+		s_min_trans_us = 0xffffffff;
-+		s_max_trans_us = 0;
-+		dsi_perf_mark_start_auto();
-+	} else {
-+		printk(KERN_INFO "DSI(%s): %u us + %u us = %u us (%uHz), "
-+				"%u bytes, %u kbytes/sec\n",
-+				name,
-+				setup_us,
-+				trans_us,
-+				total_us,
-+				1000*1000 / total_us,
-+				total_bytes,
-+				total_bytes * 1000 / total_us);
-+	}
-+}
-+#else
-+#define dsi_perf_mark_setup()
-+#define dsi_perf_mark_start()
-+#define dsi_perf_mark_start_auto()
-+#define dsi_perf_show(x)
-+#endif
-+
-+static void print_irq_status(u32 status)
-+{
-+#ifndef VERBOSE_IRQ
-+	if ((status & ~DSI_IRQ_CHANNEL_MASK) == 0)
-+		return;
-+#endif
-+	printk(KERN_DEBUG "DSI IRQ: 0x%x: ", status);
-+
-+#define PIS(x) \
-+	if (status & DSI_IRQ_##x) \
-+		printk(#x " ");
-+#ifdef VERBOSE_IRQ
-+	PIS(VC0);
-+	PIS(VC1);
-+	PIS(VC2);
-+	PIS(VC3);
-+#endif
-+	PIS(WAKEUP);
-+	PIS(RESYNC);
-+	PIS(PLL_LOCK);
-+	PIS(PLL_UNLOCK);
-+	PIS(PLL_RECALL);
-+	PIS(COMPLEXIO_ERR);
-+	PIS(HS_TX_TIMEOUT);
-+	PIS(LP_RX_TIMEOUT);
-+	PIS(TE_TRIGGER);
-+	PIS(ACK_TRIGGER);
-+	PIS(SYNC_LOST);
-+	PIS(LDO_POWER_GOOD);
-+	PIS(TA_TIMEOUT);
-+#undef PIS
-+
-+	printk("\n");
-+}
-+
-+static void print_irq_status_vc(int channel, u32 status)
-+{
-+#ifndef VERBOSE_IRQ
-+	if ((status & ~DSI_VC_IRQ_PACKET_SENT) == 0)
-+		return;
-+#endif
-+	printk(KERN_DEBUG "DSI VC(%d) IRQ 0x%x: ", channel, status);
-+
-+#define PIS(x) \
-+	if (status & DSI_VC_IRQ_##x) \
-+		printk(#x " ");
-+	PIS(CS);
-+	PIS(ECC_CORR);
-+#ifdef VERBOSE_IRQ
-+	PIS(PACKET_SENT);
-+#endif
-+	PIS(FIFO_TX_OVF);
-+	PIS(FIFO_RX_OVF);
-+	PIS(BTA);
-+	PIS(ECC_NO_CORR);
-+	PIS(FIFO_TX_UDF);
-+	PIS(PP_BUSY_CHANGE);
-+#undef PIS
-+	printk("\n");
-+}
-+
-+static void print_irq_status_cio(u32 status)
-+{
-+	printk(KERN_DEBUG "DSI CIO IRQ 0x%x: ", status);
-+
-+#define PIS(x) \
-+	if (status & DSI_CIO_IRQ_##x) \
-+		printk(#x " ");
-+	PIS(ERRSYNCESC1);
-+	PIS(ERRSYNCESC2);
-+	PIS(ERRSYNCESC3);
-+	PIS(ERRESC1);
-+	PIS(ERRESC2);
-+	PIS(ERRESC3);
-+	PIS(ERRCONTROL1);
-+	PIS(ERRCONTROL2);
-+	PIS(ERRCONTROL3);
-+	PIS(STATEULPS1);
-+	PIS(STATEULPS2);
-+	PIS(STATEULPS3);
-+	PIS(ERRCONTENTIONLP0_1);
-+	PIS(ERRCONTENTIONLP1_1);
-+	PIS(ERRCONTENTIONLP0_2);
-+	PIS(ERRCONTENTIONLP1_2);
-+	PIS(ERRCONTENTIONLP0_3);
-+	PIS(ERRCONTENTIONLP1_3);
-+	PIS(ULPSACTIVENOT_ALL0);
-+	PIS(ULPSACTIVENOT_ALL1);
-+#undef PIS
-+
-+	printk("\n");
-+}
-+
-+static int debug_irq;
-+
-+/* called from dss */
-+void dsi_irq_handler(void)
-+{
-+	u32 irqstatus, vcstatus, ciostatus;
-+	int i;
-+
-+	irqstatus = dsi_read_reg(DSI_IRQSTATUS);
-+
-+	if (irqstatus & DSI_IRQ_ERROR_MASK) {
-+		DSSERR("DSI error, irqstatus %x\n", irqstatus);
-+		print_irq_status(irqstatus);
-+		spin_lock(&dsi.errors_lock);
-+		dsi.errors |= irqstatus & DSI_IRQ_ERROR_MASK;
-+		spin_unlock(&dsi.errors_lock);
-+	} else if (debug_irq) {
-+		print_irq_status(irqstatus);
-+	}
-+
-+	for (i = 0; i < 4; ++i) {
-+		if ((irqstatus & (1<<i)) == 0)
-+			continue;
-+
-+		vcstatus = dsi_read_reg(DSI_VC_IRQSTATUS(i));
-+
-+		if (vcstatus & DSI_VC_IRQ_BTA)
-+			complete(&dsi.bta_completion);
-+
-+		if (vcstatus & DSI_VC_IRQ_ERROR_MASK) {
-+			DSSERR("DSI VC(%d) error, vc irqstatus %x\n",
-+				       i, vcstatus);
-+			print_irq_status_vc(i, vcstatus);
-+		} else if (debug_irq) {
-+			print_irq_status_vc(i, vcstatus);
-+		}
-+
-+		dsi_write_reg(DSI_VC_IRQSTATUS(i), vcstatus);
-+	}
-+
-+	if (irqstatus & DSI_IRQ_COMPLEXIO_ERR) {
-+		ciostatus = dsi_read_reg(DSI_COMPLEXIO_IRQ_STATUS);
-+
-+		dsi_write_reg(DSI_COMPLEXIO_IRQ_STATUS, ciostatus);
-+
-+		DSSERR("DSI CIO error, cio irqstatus %x\n", ciostatus);
-+		print_irq_status_cio(ciostatus);
-+	}
-+
-+	dsi_write_reg(DSI_IRQSTATUS, irqstatus & ~DSI_IRQ_CHANNEL_MASK);
-+}
-+
-+
-+static void _dsi_initialize_irq(void)
-+{
-+	u32 l;
-+	int i;
-+
-+	/* disable all interrupts */
-+	dsi_write_reg(DSI_IRQENABLE, 0);
-+	for (i = 0; i < 4; ++i)
-+		dsi_write_reg(DSI_VC_IRQENABLE(i), 0);
-+	dsi_write_reg(DSI_COMPLEXIO_IRQ_ENABLE, 0);
-+
-+	/* clear interrupt status */
-+	l = dsi_read_reg(DSI_IRQSTATUS);
-+	dsi_write_reg(DSI_IRQSTATUS, l & ~DSI_IRQ_CHANNEL_MASK);
-+
-+	for (i = 0; i < 4; ++i) {
-+		l = dsi_read_reg(DSI_VC_IRQSTATUS(i));
-+		dsi_write_reg(DSI_VC_IRQSTATUS(i), l);
-+	}
-+
-+	l = dsi_read_reg(DSI_COMPLEXIO_IRQ_STATUS);
-+	dsi_write_reg(DSI_COMPLEXIO_IRQ_STATUS, l);
-+
-+	/* enable error irqs */
-+	l = DSI_IRQ_ERROR_MASK;
-+	dsi_write_reg(DSI_IRQENABLE, l);
-+
-+	l = DSI_VC_IRQ_ERROR_MASK;
-+	for (i = 0; i < 4; ++i)
-+		dsi_write_reg(DSI_VC_IRQENABLE(i), l);
-+
-+	/* XXX zonda responds incorrectly, causing control error:
-+	   Exit from LP-ESC mode to LP11 uses wrong transition states on the
-+	   data lines LP0 and LN0. */
-+	dsi_write_reg(DSI_COMPLEXIO_IRQ_ENABLE,
-+			-1 & (~DSI_CIO_IRQ_ERRCONTROL2));
-+}
-+
-+static u32 dsi_get_errors(void)
-+{
-+	unsigned long flags;
-+	u32 e;
-+	spin_lock_irqsave(&dsi.errors_lock, flags);
-+	e = dsi.errors;
-+	dsi.errors = 0;
-+	spin_unlock_irqrestore(&dsi.errors_lock, flags);
-+	return e;
-+}
-+
-+static void dsi_vc_enable_bta_irq(int channel)
-+{
-+	u32 l;
-+
-+	dsi_write_reg(DSI_VC_IRQSTATUS(channel), DSI_VC_IRQ_BTA);
-+
-+	l = dsi_read_reg(DSI_VC_IRQENABLE(channel));
-+	l |= DSI_VC_IRQ_BTA;
-+	dsi_write_reg(DSI_VC_IRQENABLE(channel), l);
-+}
-+
-+static void dsi_vc_disable_bta_irq(int channel)
-+{
-+	u32 l;
-+
-+	l = dsi_read_reg(DSI_VC_IRQENABLE(channel));
-+	l &= ~DSI_VC_IRQ_BTA;
-+	dsi_write_reg(DSI_VC_IRQENABLE(channel), l);
-+}
-+
-+/* DSI func clock. this could also be DSI2_PLL_FCLK */
-+static inline void enable_clocks(bool enable)
-+{
-+	if (enable)
-+		dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1);
-+	else
-+		dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
-+}
-+
-+/* source clock for DSI PLL. this could also be PCLKFREE */
-+static inline void dsi_enable_pll_clock(bool enable)
-+{
-+	if (enable)
-+		dss_clk_enable(DSS_CLK_FCK2);
-+	else
-+		dss_clk_disable(DSS_CLK_FCK2);
-+
-+	if (enable && dsi.pll_locked) {
-+		if (wait_for_bit_change(DSI_PLL_STATUS, 1, 1) != 1)
-+			DSSERR("cannot lock PLL when enabling clocks\n");
-+	}
-+}
-+
-+#ifdef DEBUG
-+static void _dsi_print_reset_status(void)
-+{
-+	u32 l;
-+
-+	if (!dss_debug)
-+		return;
-+
-+	/* A dummy read using the SCP interface to any DSIPHY register is
-+	 * required after DSIPHY reset to complete the reset of the DSI complex
-+	 * I/O. */
-+	l = dsi_read_reg(DSI_DSIPHY_CFG5);
-+
-+	printk(KERN_DEBUG "DSI resets: ");
-+
-+	l = dsi_read_reg(DSI_PLL_STATUS);
-+	printk("PLL (%d) ", FLD_GET(l, 0, 0));
-+
-+	l = dsi_read_reg(DSI_COMPLEXIO_CFG1);
-+	printk("CIO (%d) ", FLD_GET(l, 29, 29));
-+
-+	l = dsi_read_reg(DSI_DSIPHY_CFG5);
-+	printk("PHY (%x, %d, %d, %d)\n",
-+			FLD_GET(l, 28, 26),
-+			FLD_GET(l, 29, 29),
-+			FLD_GET(l, 30, 30),
-+			FLD_GET(l, 31, 31));
-+}
-+#else
-+#define _dsi_print_reset_status()
-+#endif
-+
-+static inline int dsi_if_enable(bool enable)
-+{
-+	DSSDBG("dsi_if_enable(%d)\n", enable);
-+
-+	enable = enable ? 1 : 0;
-+	REG_FLD_MOD(DSI_CTRL, enable, 0, 0); /* IF_EN */
-+
-+	if (wait_for_bit_change(DSI_CTRL, 0, enable) != enable) {
-+			DSSERR("Failed to set dsi_if_enable to %d\n", enable);
-+			return -EIO;
-+	}
-+
-+	return 0;
-+}
-+
-+static unsigned long dsi_fclk_rate(void)
-+{
-+	unsigned long r;
-+
-+	if (dss_get_dsi_clk_source() == 0) {
-+		/* DSI FCLK source is DSS1_ALWON_FCK, which is dss1_fck */
-+		r = dss_clk_get_rate(DSS_CLK_FCK1);
-+	} else {
-+		/* DSI FCLK source is DSI2_PLL_FCLK */
-+		r = dsi.dsi2_pll_fclk;
-+	}
-+
-+	return r;
-+}
-+
-+static int dsi_set_lp_clk_divisor(struct omap_dss_device *dssdev)
-+{
-+	unsigned n;
-+	unsigned long dsi_fclk;
-+	unsigned long lp_clk, lp_clk_req;
-+
-+	dsi_fclk = dsi_fclk_rate();
-+
-+	lp_clk_req = dssdev->phy.dsi.lp_clk_hz;
-+
-+	for (n = 1; n < (1 << 13) - 1; ++n) {
-+		lp_clk = dsi_fclk / 2 / n;
-+		if (lp_clk <= lp_clk_req)
-+			break;
-+	}
-+
-+	if (n == (1 << 13) - 1) {
-+		DSSERR("Failed to find LP_CLK_DIVISOR\n");
-+		return -EINVAL;
-+	}
-+
-+	DSSDBG("LP_CLK_DIV %u, LP_CLK %lu (req %lu)\n", n, lp_clk, lp_clk_req);
-+
-+	REG_FLD_MOD(DSI_CLK_CTRL, n, 12, 0);	/* LP_CLK_DIVISOR */
-+	if (dsi_fclk > 30*1000*1000)
-+		REG_FLD_MOD(DSI_CLK_CTRL, 1, 21, 21); /* LP_RX_SYNCHRO_ENABLE */
-+
-+	return 0;
-+}
-+
-+
-+enum dsi_pll_power_state {
-+	DSI_PLL_POWER_OFF	= 0x0,
-+	DSI_PLL_POWER_ON_HSCLK	= 0x1,
-+	DSI_PLL_POWER_ON_ALL	= 0x2,
-+	DSI_PLL_POWER_ON_DIV	= 0x3,
-+};
-+
-+static int dsi_pll_power(enum dsi_pll_power_state state)
-+{
-+	int t = 0;
-+
-+	REG_FLD_MOD(DSI_CLK_CTRL, state, 31, 30);	/* PLL_PWR_CMD */
-+
-+	/* PLL_PWR_STATUS */
-+	while (FLD_GET(dsi_read_reg(DSI_CLK_CTRL), 29, 28) != state) {
-+		udelay(1);
-+		if (t++ > 1000) {
-+			DSSERR("Failed to set DSI PLL power mode to %d\n",
-+					state);
-+			return -ENODEV;
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+int dsi_pll_calc_pck(bool is_tft, unsigned long req_pck,
-+		struct dsi_clock_info *cinfo)
-+{
-+	struct dsi_clock_info cur, best;
-+	int min_fck_per_pck;
-+	int match = 0;
-+	unsigned long dss_clk_fck2;
-+
-+	dss_clk_fck2 = dss_clk_get_rate(DSS_CLK_FCK2);
-+
-+	if (req_pck == dsi.cache_req_pck &&
-+			dsi.cache_cinfo.clkin == dss_clk_fck2) {
-+		DSSDBG("DSI clock info found from cache\n");
-+		*cinfo = dsi.cache_cinfo;
-+		return 0;
-+	}
-+
-+	min_fck_per_pck = CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK;
-+
-+	if (min_fck_per_pck &&
-+		req_pck * min_fck_per_pck > DISPC_MAX_FCK) {
-+		DSSERR("Requested pixel clock not possible with the current "
-+				"OMAP2_DSS_MIN_FCK_PER_PCK setting. Turning "
-+				"the constraint off.\n");
-+		min_fck_per_pck = 0;
-+	}
-+
-+	DSSDBG("dsi_pll_calc\n");
-+
-+retry:
-+	memset(&best, 0, sizeof(best));
-+
-+	memset(&cur, 0, sizeof(cur));
-+	cur.clkin = dss_clk_fck2;
-+	cur.use_dss2_fck = 1;
-+	cur.highfreq = 0;
-+
-+	/* no highfreq: 0.75MHz < Fint = clkin / regn < 2.1MHz */
-+	/* highfreq: 0.75MHz < Fint = clkin / (2*regn) < 2.1MHz */
-+	/* To reduce PLL lock time, keep Fint high (around 2 MHz) */
-+	for (cur.regn = 1; cur.regn < REGN_MAX; ++cur.regn) {
-+		if (cur.highfreq == 0)
-+			cur.fint = cur.clkin / cur.regn;
-+		else
-+			cur.fint = cur.clkin / (2 * cur.regn);
-+
-+		if (cur.fint > FINT_MAX || cur.fint < FINT_MIN)
-+			continue;
-+
-+		/* DSIPHY(MHz) = (2 * regm / regn) * (clkin / (highfreq + 1)) */
-+		for (cur.regm = 1; cur.regm < REGM_MAX; ++cur.regm) {
-+			unsigned long a, b;
-+
-+			a = 2 * cur.regm * (cur.clkin/1000);
-+			b = cur.regn * (cur.highfreq + 1);
-+			cur.dsiphy = a / b * 1000;
-+
-+			if (cur.dsiphy > 1800 * 1000 * 1000)
-+				break;
-+
-+			/* DSI1_PLL_FCLK(MHz) = DSIPHY(MHz) / regm3  < 173MHz */
-+			for (cur.regm3 = 1; cur.regm3 < REGM3_MAX;
-+					++cur.regm3) {
-+				cur.dsi1_pll_fclk = cur.dsiphy / cur.regm3;
-+
-+				/* this will narrow down the search a bit,
-+				 * but still give pixclocks below what was
-+				 * requested */
-+				if (cur.dsi1_pll_fclk  < req_pck)
-+					break;
-+
-+				if (cur.dsi1_pll_fclk > DISPC_MAX_FCK)
-+					continue;
-+
-+				if (min_fck_per_pck &&
-+					cur.dsi1_pll_fclk <
-+						req_pck * min_fck_per_pck)
-+					continue;
-+
-+				match = 1;
-+
-+				find_lck_pck_divs(is_tft, req_pck,
-+						cur.dsi1_pll_fclk,
-+						&cur.lck_div,
-+						&cur.pck_div);
-+
-+				cur.lck = cur.dsi1_pll_fclk / cur.lck_div;
-+				cur.pck = cur.lck / cur.pck_div;
-+
-+				if (abs(cur.pck - req_pck) <
-+						abs(best.pck - req_pck)) {
-+					best = cur;
-+
-+					if (cur.pck == req_pck)
-+						goto found;
-+				}
-+			}
-+		}
-+	}
-+found:
-+	if (!match) {
-+		if (min_fck_per_pck) {
-+			DSSERR("Could not find suitable clock settings.\n"
-+					"Turning FCK/PCK constraint off and"
-+					"trying again.\n");
-+			min_fck_per_pck = 0;
-+			goto retry;
-+		}
-+
-+		DSSERR("Could not find suitable clock settings.\n");
-+
-+		return -EINVAL;
-+	}
-+
-+	/* DSI2_PLL_FCLK (regm4) is not used. Set it to something sane. */
-+	best.regm4 = best.dsiphy / 48000000;
-+	if (best.regm4 > REGM4_MAX)
-+		best.regm4 = REGM4_MAX;
-+	else if (best.regm4 == 0)
-+		best.regm4 = 1;
-+	best.dsi2_pll_fclk = best.dsiphy / best.regm4;
-+
-+	if (cinfo)
-+		*cinfo = best;
-+
-+	dsi.cache_req_pck = req_pck;
-+	dsi.cache_clk_freq = 0;
-+	dsi.cache_cinfo = best;
-+
-+	return 0;
-+}
-+
-+static int dsi_pll_calc_ddrfreq(unsigned long clk_freq,
-+		struct dsi_clock_info *cinfo)
-+{
-+	struct dsi_clock_info cur, best;
-+	const bool use_dss2_fck = 1;
-+	unsigned long datafreq;
-+	unsigned long dss_clk_fck2;
-+
-+	DSSDBG("dsi_pll_calc_ddrfreq\n");
-+
-+	dss_clk_fck2 = dss_clk_get_rate(DSS_CLK_FCK2);
-+
-+	if (clk_freq == dsi.cache_clk_freq &&
-+			dsi.cache_cinfo.clkin == dss_clk_fck2) {
-+		DSSDBG("DSI clock info found from cache\n");
-+		*cinfo = dsi.cache_cinfo;
-+		return 0;
-+	}
-+
-+	datafreq = clk_freq * 4;
-+
-+	memset(&best, 0, sizeof(best));
-+
-+	memset(&cur, 0, sizeof(cur));
-+	cur.use_dss2_fck = use_dss2_fck;
-+	if (use_dss2_fck) {
-+		cur.clkin = dss_clk_fck2;
-+		cur.highfreq = 0;
-+	} else {
-+		cur.clkin = dispc_pclk_rate();
-+		if (cur.clkin < 32000000)
-+			cur.highfreq = 0;
-+		else
-+			cur.highfreq = 1;
-+	}
-+
-+	/* no highfreq: 0.75MHz < Fint = clkin / regn < 2.1MHz */
-+	/* highfreq: 0.75MHz < Fint = clkin / (2*regn) < 2.1MHz */
-+	/* To reduce PLL lock time, keep Fint high (around 2 MHz) */
-+	for (cur.regn = 1; cur.regn < REGN_MAX; ++cur.regn) {
-+		if (cur.highfreq == 0)
-+			cur.fint = cur.clkin / cur.regn;
-+		else
-+			cur.fint = cur.clkin / (2 * cur.regn);
-+
-+		if (cur.fint > FINT_MAX || cur.fint < FINT_MIN)
-+			continue;
-+
-+		/* DSIPHY(MHz) = (2 * regm / regn) * (clkin / (highfreq + 1)) */
-+		for (cur.regm = 1; cur.regm < REGM_MAX; ++cur.regm) {
-+			unsigned long a, b;
-+
-+			a = 2 * cur.regm * (cur.clkin/1000);
-+			b = cur.regn * (cur.highfreq + 1);
-+			cur.dsiphy = a / b * 1000;
-+
-+			if (cur.dsiphy > 1800 * 1000 * 1000)
-+				break;
-+
-+			if (abs(cur.dsiphy - datafreq) <
-+					abs(best.dsiphy - datafreq)) {
-+				best = cur;
-+				/* DSSDBG("best %ld\n", best.dsiphy); */
-+			}
-+
-+			if (cur.dsiphy == datafreq)
-+				goto found;
-+		}
-+	}
-+found:
-+	/* DSI1_PLL_FCLK (regm3) is not used. Set it to something sane. */
-+	best.regm3 = best.dsiphy / 48000000;
-+	if (best.regm3 > REGM3_MAX)
-+		best.regm3 = REGM3_MAX;
-+	else if (best.regm3 == 0)
-+		best.regm3 = 1;
-+	best.dsi1_pll_fclk = best.dsiphy / best.regm3;
-+
-+	/* DSI2_PLL_FCLK (regm4) is not used. Set it to something sane. */
-+	best.regm4 = best.dsiphy / 48000000;
-+	if (best.regm4 > REGM4_MAX)
-+		best.regm4 = REGM4_MAX;
-+	else if (best.regm4 == 0)
-+		best.regm4 = 1;
-+	best.dsi2_pll_fclk = best.dsiphy / best.regm4;
-+
-+	if (cinfo)
-+		*cinfo = best;
-+
-+	dsi.cache_clk_freq = clk_freq;
-+	dsi.cache_req_pck = 0;
-+	dsi.cache_cinfo = best;
-+
-+	return 0;
-+}
-+
-+int dsi_pll_program(struct dsi_clock_info *cinfo)
-+{
-+	int r = 0;
-+	u32 l;
-+
-+	DSSDBG("dsi_pll_program\n");
-+
-+	dsi.dsiphy = cinfo->dsiphy;
-+	dsi.ddr_clk = dsi.dsiphy / 4;
-+	dsi.dsi1_pll_fclk = cinfo->dsi1_pll_fclk;
-+	dsi.dsi2_pll_fclk = cinfo->dsi2_pll_fclk;
-+
-+	DSSDBG("DSI Fint %ld\n", cinfo->fint);
-+
-+	DSSDBG("clkin (%s) rate %ld, highfreq %d\n",
-+			cinfo->use_dss2_fck ? "dss2_fck" : "pclkfree",
-+			cinfo->clkin,
-+			cinfo->highfreq);
-+
-+	/* DSIPHY == CLKIN4DDR */
-+	DSSDBG("DSIPHY = 2 * %d / %d * %lu / %d = %lu\n",
-+			cinfo->regm,
-+			cinfo->regn,
-+			cinfo->clkin,
-+			cinfo->highfreq + 1,
-+			cinfo->dsiphy);
-+
-+	DSSDBG("Data rate on 1 DSI lane %ld Mbps\n",
-+			dsi.dsiphy / 1000 / 1000 / 2);
-+
-+	DSSDBG("Clock lane freq %ld Hz\n", dsi.ddr_clk);
-+
-+	DSSDBG("regm3 = %d, dsi1_pll_fclk = %lu\n",
-+			cinfo->regm3, cinfo->dsi1_pll_fclk);
-+	DSSDBG("regm4 = %d, dsi2_pll_fclk = %lu\n",
-+			cinfo->regm4, cinfo->dsi2_pll_fclk);
-+
-+	REG_FLD_MOD(DSI_PLL_CONTROL, 0, 0, 0); /* DSI_PLL_AUTOMODE = manual */
-+
-+	l = dsi_read_reg(DSI_PLL_CONFIGURATION1);
-+	l = FLD_MOD(l, 1, 0, 0);		/* DSI_PLL_STOPMODE */
-+	l = FLD_MOD(l, cinfo->regn - 1, 7, 1);	/* DSI_PLL_REGN */
-+	l = FLD_MOD(l, cinfo->regm, 18, 8);	/* DSI_PLL_REGM */
-+	l = FLD_MOD(l, cinfo->regm3 - 1, 22, 19);	/* DSI_CLOCK_DIV */
-+	l = FLD_MOD(l, cinfo->regm4 - 1, 26, 23);	/* DSIPROTO_CLOCK_DIV */
-+	dsi_write_reg(DSI_PLL_CONFIGURATION1, l);
-+
-+	l = dsi_read_reg(DSI_PLL_CONFIGURATION2);
-+	l = FLD_MOD(l, 7, 4, 1);		/* DSI_PLL_FREQSEL */
-+	/* DSI_PLL_CLKSEL */
-+	l = FLD_MOD(l, cinfo->use_dss2_fck ? 0 : 1, 11, 11);
-+	l = FLD_MOD(l, cinfo->highfreq, 12, 12);	/* DSI_PLL_HIGHFREQ */
-+	l = FLD_MOD(l, 1, 13, 13);		/* DSI_PLL_REFEN */
-+	l = FLD_MOD(l, 0, 14, 14);		/* DSIPHY_CLKINEN */
-+	l = FLD_MOD(l, 1, 20, 20);		/* DSI_HSDIVBYPASS */
-+	dsi_write_reg(DSI_PLL_CONFIGURATION2, l);
-+
-+	REG_FLD_MOD(DSI_PLL_GO, 1, 0, 0); /* DSI_PLL_GO */
-+
-+	if (wait_for_bit_change(DSI_PLL_GO, 0, 0) != 0) {
-+		DSSERR("dsi pll go bit not going down.\n");
-+		r = -EIO;
-+		goto err;
-+	}
-+
-+	if (wait_for_bit_change(DSI_PLL_STATUS, 1, 1) != 1) {
-+		DSSERR("cannot lock PLL\n");
-+		r = -EIO;
-+		goto err;
-+	}
-+
-+	dsi.pll_locked = 1;
-+
-+	l = dsi_read_reg(DSI_PLL_CONFIGURATION2);
-+	l = FLD_MOD(l, 0, 0, 0);	/* DSI_PLL_IDLE */
-+	l = FLD_MOD(l, 0, 5, 5);	/* DSI_PLL_PLLLPMODE */
-+	l = FLD_MOD(l, 0, 6, 6);	/* DSI_PLL_LOWCURRSTBY */
-+	l = FLD_MOD(l, 0, 7, 7);	/* DSI_PLL_TIGHTPHASELOCK */
-+	l = FLD_MOD(l, 0, 8, 8);	/* DSI_PLL_DRIFTGUARDEN */
-+	l = FLD_MOD(l, 0, 10, 9);	/* DSI_PLL_LOCKSEL */
-+	l = FLD_MOD(l, 1, 13, 13);	/* DSI_PLL_REFEN */
-+	l = FLD_MOD(l, 1, 14, 14);	/* DSIPHY_CLKINEN */
-+	l = FLD_MOD(l, 0, 15, 15);	/* DSI_BYPASSEN */
-+	l = FLD_MOD(l, 1, 16, 16);	/* DSS_CLOCK_EN */
-+	l = FLD_MOD(l, 0, 17, 17);	/* DSS_CLOCK_PWDN */
-+	l = FLD_MOD(l, 1, 18, 18);	/* DSI_PROTO_CLOCK_EN */
-+	l = FLD_MOD(l, 0, 19, 19);	/* DSI_PROTO_CLOCK_PWDN */
-+	l = FLD_MOD(l, 0, 20, 20);	/* DSI_HSDIVBYPASS */
-+	dsi_write_reg(DSI_PLL_CONFIGURATION2, l);
-+
-+	DSSDBG("PLL config done\n");
-+err:
-+	return r;
-+}
-+
-+int dsi_pll_init(bool enable_hsclk, bool enable_hsdiv)
-+{
-+	int r = 0;
-+	enum dsi_pll_power_state pwstate;
-+	struct dispc_clock_info cinfo;
-+
-+	DSSDBG("PLL init\n");
-+
-+	enable_clocks(1);
-+	dsi_enable_pll_clock(1);
-+
-+	/* XXX this should be calculated depending on the screen size,
-+	 * required framerate and DSI speed.
-+	 * For now 48MHz is enough for 864x480@60 with 360Mbps/lane
-+	 * with two lanes */
-+	r = dispc_calc_clock_div(1, 48 * 1000 * 1000, &cinfo);
-+	if (r)
-+		goto err0;
-+
-+	r = dispc_set_clock_div(&cinfo);
-+	if (r) {
-+		DSSERR("Failed to set basic clocks\n");
-+		goto err0;
-+	}
-+
-+	r = regulator_enable(dsi.vdds_dsi_reg);
-+	if (r)
-+		goto err0;
-+
-+	/* XXX PLL does not come out of reset without this... */
-+	dispc_pck_free_enable(1);
-+
-+	if (wait_for_bit_change(DSI_PLL_STATUS, 0, 1) != 1) {
-+		DSSERR("PLL not coming out of reset.\n");
-+		r = -ENODEV;
-+		goto err1;
-+	}
-+
-+	/* XXX ... but if left on, we get problems when planes do not
-+	 * fill the whole display. No idea about this */
-+	dispc_pck_free_enable(0);
-+
-+	if (enable_hsclk && enable_hsdiv)
-+		pwstate = DSI_PLL_POWER_ON_ALL;
-+	else if (enable_hsclk)
-+		pwstate = DSI_PLL_POWER_ON_HSCLK;
-+	else if (enable_hsdiv)
-+		pwstate = DSI_PLL_POWER_ON_DIV;
-+	else
-+		pwstate = DSI_PLL_POWER_OFF;
-+
-+	r = dsi_pll_power(pwstate);
-+
-+	if (r)
-+		goto err1;
-+
-+	DSSDBG("PLL init done\n");
-+
-+	return 0;
-+err1:
-+	regulator_disable(dsi.vdds_dsi_reg);
-+err0:
-+	enable_clocks(0);
-+	dsi_enable_pll_clock(0);
-+	return r;
-+}
-+
-+void dsi_pll_uninit(void)
-+{
-+	enable_clocks(0);
-+	dsi_enable_pll_clock(0);
-+
-+	dsi.pll_locked = 0;
-+	dsi_pll_power(DSI_PLL_POWER_OFF);
-+	regulator_disable(dsi.vdds_dsi_reg);
-+	DSSDBG("PLL uninit done\n");
-+}
-+
-+unsigned long dsi_get_dsi1_pll_rate(void)
-+{
-+	return dsi.dsi1_pll_fclk;
-+}
-+
-+unsigned long dsi_get_dsi2_pll_rate(void)
-+{
-+	return dsi.dsi2_pll_fclk;
-+}
-+
-+void dsi_dump_clocks(struct seq_file *s)
-+{
-+	int clksel;
-+
-+	enable_clocks(1);
-+
-+	clksel = REG_GET(DSI_PLL_CONFIGURATION2, 11, 11);
-+
-+	seq_printf(s, "- dsi -\n");
-+
-+	seq_printf(s, "dsi fclk source = %s\n",
-+			dss_get_dsi_clk_source() == 0 ?
-+			"dss1_alwon_fclk" : "dsi2_pll_fclk");
-+
-+	seq_printf(s, "dsi pll source = %s\n",
-+			clksel == 0 ?
-+			"dss2_alwon_fclk" : "pclkfree");
-+
-+	seq_printf(s,	"DSIPHY\t\t%lu\nDDR_CLK\t\t%lu\n",
-+			dsi.dsiphy, dsi.ddr_clk);
-+
-+	seq_printf(s,	"dsi1_pll_fck\t%lu (%s)\n"
-+			"dsi2_pll_fck\t%lu (%s)\n",
-+			dsi.dsi1_pll_fclk,
-+			dss_get_dispc_clk_source() == 0 ? "off" : "on",
-+			dsi.dsi2_pll_fclk,
-+			dss_get_dsi_clk_source() == 0 ? "off" : "on");
-+
-+	enable_clocks(0);
-+}
-+
-+void dsi_dump_regs(struct seq_file *s)
-+{
-+#define DUMPREG(r) seq_printf(s, "%-35s %08x\n", #r, dsi_read_reg(r))
-+
-+	dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1);
-+
-+	DUMPREG(DSI_REVISION);
-+	DUMPREG(DSI_SYSCONFIG);
-+	DUMPREG(DSI_SYSSTATUS);
-+	DUMPREG(DSI_IRQSTATUS);
-+	DUMPREG(DSI_IRQENABLE);
-+	DUMPREG(DSI_CTRL);
-+	DUMPREG(DSI_COMPLEXIO_CFG1);
-+	DUMPREG(DSI_COMPLEXIO_IRQ_STATUS);
-+	DUMPREG(DSI_COMPLEXIO_IRQ_ENABLE);
-+	DUMPREG(DSI_CLK_CTRL);
-+	DUMPREG(DSI_TIMING1);
-+	DUMPREG(DSI_TIMING2);
-+	DUMPREG(DSI_VM_TIMING1);
-+	DUMPREG(DSI_VM_TIMING2);
-+	DUMPREG(DSI_VM_TIMING3);
-+	DUMPREG(DSI_CLK_TIMING);
-+	DUMPREG(DSI_TX_FIFO_VC_SIZE);
-+	DUMPREG(DSI_RX_FIFO_VC_SIZE);
-+	DUMPREG(DSI_COMPLEXIO_CFG2);
-+	DUMPREG(DSI_RX_FIFO_VC_FULLNESS);
-+	DUMPREG(DSI_VM_TIMING4);
-+	DUMPREG(DSI_TX_FIFO_VC_EMPTINESS);
-+	DUMPREG(DSI_VM_TIMING5);
-+	DUMPREG(DSI_VM_TIMING6);
-+	DUMPREG(DSI_VM_TIMING7);
-+	DUMPREG(DSI_STOPCLK_TIMING);
-+
-+	DUMPREG(DSI_VC_CTRL(0));
-+	DUMPREG(DSI_VC_TE(0));
-+	DUMPREG(DSI_VC_LONG_PACKET_HEADER(0));
-+	DUMPREG(DSI_VC_LONG_PACKET_PAYLOAD(0));
-+	DUMPREG(DSI_VC_SHORT_PACKET_HEADER(0));
-+	DUMPREG(DSI_VC_IRQSTATUS(0));
-+	DUMPREG(DSI_VC_IRQENABLE(0));
-+
-+	DUMPREG(DSI_VC_CTRL(1));
-+	DUMPREG(DSI_VC_TE(1));
-+	DUMPREG(DSI_VC_LONG_PACKET_HEADER(1));
-+	DUMPREG(DSI_VC_LONG_PACKET_PAYLOAD(1));
-+	DUMPREG(DSI_VC_SHORT_PACKET_HEADER(1));
-+	DUMPREG(DSI_VC_IRQSTATUS(1));
-+	DUMPREG(DSI_VC_IRQENABLE(1));
-+
-+	DUMPREG(DSI_VC_CTRL(2));
-+	DUMPREG(DSI_VC_TE(2));
-+	DUMPREG(DSI_VC_LONG_PACKET_HEADER(2));
-+	DUMPREG(DSI_VC_LONG_PACKET_PAYLOAD(2));
-+	DUMPREG(DSI_VC_SHORT_PACKET_HEADER(2));
-+	DUMPREG(DSI_VC_IRQSTATUS(2));
-+	DUMPREG(DSI_VC_IRQENABLE(2));
-+
-+	DUMPREG(DSI_VC_CTRL(3));
-+	DUMPREG(DSI_VC_TE(3));
-+	DUMPREG(DSI_VC_LONG_PACKET_HEADER(3));
-+	DUMPREG(DSI_VC_LONG_PACKET_PAYLOAD(3));
-+	DUMPREG(DSI_VC_SHORT_PACKET_HEADER(3));
-+	DUMPREG(DSI_VC_IRQSTATUS(3));
-+	DUMPREG(DSI_VC_IRQENABLE(3));
-+
-+	DUMPREG(DSI_DSIPHY_CFG0);
-+	DUMPREG(DSI_DSIPHY_CFG1);
-+	DUMPREG(DSI_DSIPHY_CFG2);
-+	DUMPREG(DSI_DSIPHY_CFG5);
-+
-+	DUMPREG(DSI_PLL_CONTROL);
-+	DUMPREG(DSI_PLL_STATUS);
-+	DUMPREG(DSI_PLL_GO);
-+	DUMPREG(DSI_PLL_CONFIGURATION1);
-+	DUMPREG(DSI_PLL_CONFIGURATION2);
-+
-+	dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
-+#undef DUMPREG
-+}
-+
-+enum dsi_complexio_power_state {
-+	DSI_COMPLEXIO_POWER_OFF		= 0x0,
-+	DSI_COMPLEXIO_POWER_ON		= 0x1,
-+	DSI_COMPLEXIO_POWER_ULPS	= 0x2,
-+};
-+
-+static int dsi_complexio_power(enum dsi_complexio_power_state state)
-+{
-+	int t = 0;
-+
-+	/* PWR_CMD */
-+	REG_FLD_MOD(DSI_COMPLEXIO_CFG1, state, 28, 27);
-+
-+	/* PWR_STATUS */
-+	while (FLD_GET(dsi_read_reg(DSI_COMPLEXIO_CFG1), 26, 25) != state) {
-+		udelay(1);
-+		if (t++ > 1000) {
-+			DSSERR("failed to set complexio power state to "
-+					"%d\n", state);
-+			return -ENODEV;
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+static void dsi_complexio_config(struct omap_dss_device *dssdev)
-+{
-+	u32 r;
-+
-+	int clk_lane   = dssdev->phy.dsi.clk_lane;
-+	int data1_lane = dssdev->phy.dsi.data1_lane;
-+	int data2_lane = dssdev->phy.dsi.data2_lane;
-+	int clk_pol    = dssdev->phy.dsi.clk_pol;
-+	int data1_pol  = dssdev->phy.dsi.data1_pol;
-+	int data2_pol  = dssdev->phy.dsi.data2_pol;
-+
-+	r = dsi_read_reg(DSI_COMPLEXIO_CFG1);
-+	r = FLD_MOD(r, clk_lane, 2, 0);
-+	r = FLD_MOD(r, clk_pol, 3, 3);
-+	r = FLD_MOD(r, data1_lane, 6, 4);
-+	r = FLD_MOD(r, data1_pol, 7, 7);
-+	r = FLD_MOD(r, data2_lane, 10, 8);
-+	r = FLD_MOD(r, data2_pol, 11, 11);
-+	dsi_write_reg(DSI_COMPLEXIO_CFG1, r);
-+
-+	/* The configuration of the DSI complex I/O (number of data lanes,
-+	   position, differential order) should not be changed while
-+	   DSS.DSI_CLK_CRTRL[20] LP_CLK_ENABLE bit is set to 1. In order for
-+	   the hardware to take into account a new configuration of the complex
-+	   I/O (done in DSS.DSI_COMPLEXIO_CFG1 register), it is recommended to
-+	   follow this sequence: First set the DSS.DSI_CTRL[0] IF_EN bit to 1,
-+	   then reset the DSS.DSI_CTRL[0] IF_EN to 0, then set
-+	   DSS.DSI_CLK_CTRL[20] LP_CLK_ENABLE to 1 and finally set again the
-+	   DSS.DSI_CTRL[0] IF_EN bit to 1. If the sequence is not followed, the
-+	   DSI complex I/O configuration is unknown. */
-+
-+	/*
-+	REG_FLD_MOD(DSI_CTRL, 1, 0, 0);
-+	REG_FLD_MOD(DSI_CTRL, 0, 0, 0);
-+	REG_FLD_MOD(DSI_CLK_CTRL, 1, 20, 20);
-+	REG_FLD_MOD(DSI_CTRL, 1, 0, 0);
-+	*/
-+}
-+
-+static inline unsigned ns2ddr(unsigned ns)
-+{
-+	/* convert time in ns to ddr ticks, rounding up */
-+	return (ns * (dsi.ddr_clk/1000/1000) + 999) / 1000;
-+}
-+
-+static inline unsigned ddr2ns(unsigned ddr)
-+{
-+	return ddr * 1000 * 1000 / (dsi.ddr_clk / 1000);
-+}
-+
-+static void dsi_complexio_timings(void)
-+{
-+	u32 r;
-+	u32 ths_prepare, ths_prepare_ths_zero, ths_trail, ths_exit;
-+	u32 tlpx_half, tclk_trail, tclk_zero;
-+	u32 tclk_prepare;
-+
-+	/* calculate timings */
-+
-+	/* 1 * DDR_CLK = 2 * UI */
-+
-+	/* min 40ns + 4*UI	max 85ns + 6*UI */
-+	ths_prepare = ns2ddr(70) + 2;
-+
-+	/* min 145ns + 10*UI */
-+	ths_prepare_ths_zero = ns2ddr(175) + 2;
-+
-+	/* min max(8*UI, 60ns+4*UI) */
-+	ths_trail = ns2ddr(60) + 5;
-+
-+	/* min 100ns */
-+	ths_exit = ns2ddr(145);
-+
-+	/* tlpx min 50n */
-+	tlpx_half = ns2ddr(25);
-+
-+	/* min 60ns */
-+	tclk_trail = ns2ddr(60) + 2;
-+
-+	/* min 38ns, max 95ns */
-+	tclk_prepare = ns2ddr(65);
-+
-+	/* min tclk-prepare + tclk-zero = 300ns */
-+	tclk_zero = ns2ddr(260);
-+
-+	DSSDBG("ths_prepare %u (%uns), ths_prepare_ths_zero %u (%uns)\n",
-+		ths_prepare, ddr2ns(ths_prepare),
-+		ths_prepare_ths_zero, ddr2ns(ths_prepare_ths_zero));
-+	DSSDBG("ths_trail %u (%uns), ths_exit %u (%uns)\n",
-+			ths_trail, ddr2ns(ths_trail),
-+			ths_exit, ddr2ns(ths_exit));
-+
-+	DSSDBG("tlpx_half %u (%uns), tclk_trail %u (%uns), "
-+			"tclk_zero %u (%uns)\n",
-+			tlpx_half, ddr2ns(tlpx_half),
-+			tclk_trail, ddr2ns(tclk_trail),
-+			tclk_zero, ddr2ns(tclk_zero));
-+	DSSDBG("tclk_prepare %u (%uns)\n",
-+			tclk_prepare, ddr2ns(tclk_prepare));
-+
-+	/* program timings */
-+
-+	r = dsi_read_reg(DSI_DSIPHY_CFG0);
-+	r = FLD_MOD(r, ths_prepare, 31, 24);
-+	r = FLD_MOD(r, ths_prepare_ths_zero, 23, 16);
-+	r = FLD_MOD(r, ths_trail, 15, 8);
-+	r = FLD_MOD(r, ths_exit, 7, 0);
-+	dsi_write_reg(DSI_DSIPHY_CFG0, r);
-+
-+	r = dsi_read_reg(DSI_DSIPHY_CFG1);
-+	r = FLD_MOD(r, tlpx_half, 22, 16);
-+	r = FLD_MOD(r, tclk_trail, 15, 8);
-+	r = FLD_MOD(r, tclk_zero, 7, 0);
-+	dsi_write_reg(DSI_DSIPHY_CFG1, r);
-+
-+	r = dsi_read_reg(DSI_DSIPHY_CFG2);
-+	r = FLD_MOD(r, tclk_prepare, 7, 0);
-+	dsi_write_reg(DSI_DSIPHY_CFG2, r);
-+}
-+
-+
-+static int dsi_complexio_init(struct omap_dss_device *dssdev)
-+{
-+	int r = 0;
-+
-+	DSSDBG("dsi_complexio_init\n");
-+
-+	/* CIO_CLK_ICG, enable L3 clk to CIO */
-+	REG_FLD_MOD(DSI_CLK_CTRL, 1, 14, 14);
-+
-+	/* A dummy read using the SCP interface to any DSIPHY register is
-+	 * required after DSIPHY reset to complete the reset of the DSI complex
-+	 * I/O. */
-+	dsi_read_reg(DSI_DSIPHY_CFG5);
-+
-+	if (wait_for_bit_change(DSI_DSIPHY_CFG5, 30, 1) != 1) {
-+		DSSERR("ComplexIO PHY not coming out of reset.\n");
-+		r = -ENODEV;
-+		goto err;
-+	}
-+
-+	dsi_complexio_config(dssdev);
-+
-+	r = dsi_complexio_power(DSI_COMPLEXIO_POWER_ON);
-+
-+	if (r)
-+		goto err;
-+
-+	if (wait_for_bit_change(DSI_COMPLEXIO_CFG1, 29, 1) != 1) {
-+		DSSERR("ComplexIO not coming out of reset.\n");
-+		r = -ENODEV;
-+		goto err;
-+	}
-+
-+	if (wait_for_bit_change(DSI_COMPLEXIO_CFG1, 21, 1) != 1) {
-+		DSSERR("ComplexIO LDO power down.\n");
-+		r = -ENODEV;
-+		goto err;
-+	}
-+
-+	dsi_complexio_timings();
-+
-+	/*
-+	   The configuration of the DSI complex I/O (number of data lanes,
-+	   position, differential order) should not be changed while
-+	   DSS.DSI_CLK_CRTRL[20] LP_CLK_ENABLE bit is set to 1. For the
-+	   hardware to recognize a new configuration of the complex I/O (done
-+	   in DSS.DSI_COMPLEXIO_CFG1 register), it is recommended to follow
-+	   this sequence: First set the DSS.DSI_CTRL[0] IF_EN bit to 1, next
-+	   reset the DSS.DSI_CTRL[0] IF_EN to 0, then set DSS.DSI_CLK_CTRL[20]
-+	   LP_CLK_ENABLE to 1, and finally, set again the DSS.DSI_CTRL[0] IF_EN
-+	   bit to 1. If the sequence is not followed, the DSi complex I/O
-+	   configuration is undetermined.
-+	   */
-+	dsi_if_enable(1);
-+	dsi_if_enable(0);
-+	REG_FLD_MOD(DSI_CLK_CTRL, 1, 20, 20); /* LP_CLK_ENABLE */
-+	dsi_if_enable(1);
-+	dsi_if_enable(0);
-+
-+	DSSDBG("CIO init done\n");
-+err:
-+	return r;
-+}
-+
-+static void dsi_complexio_uninit(void)
-+{
-+	dsi_complexio_power(DSI_COMPLEXIO_POWER_OFF);
-+}
-+
-+static int _dsi_wait_reset(void)
-+{
-+	int i = 0;
-+
-+	while (REG_GET(DSI_SYSSTATUS, 0, 0) == 0) {
-+		if (i++ > 5) {
-+			DSSERR("soft reset failed\n");
-+			return -ENODEV;
-+		}
-+		udelay(1);
-+	}
-+
-+	return 0;
-+}
-+
-+static int _dsi_reset(void)
-+{
-+	/* Soft reset */
-+	REG_FLD_MOD(DSI_SYSCONFIG, 1, 1, 1);
-+	return _dsi_wait_reset();
-+}
-+
-+
-+static void dsi_config_tx_fifo(enum fifo_size size1, enum fifo_size size2,
-+		enum fifo_size size3, enum fifo_size size4)
-+{
-+	u32 r = 0;
-+	int add = 0;
-+	int i;
-+
-+	dsi.vc[0].fifo_size = size1;
-+	dsi.vc[1].fifo_size = size2;
-+	dsi.vc[2].fifo_size = size3;
-+	dsi.vc[3].fifo_size = size4;
-+
-+	for (i = 0; i < 4; i++) {
-+		u8 v;
-+		int size = dsi.vc[i].fifo_size;
-+
-+		if (add + size > 4) {
-+			DSSERR("Illegal FIFO configuration\n");
-+			BUG();
-+		}
-+
-+		v = FLD_VAL(add, 2, 0) | FLD_VAL(size, 7, 4);
-+		r |= v << (8 * i);
-+		/*DSSDBG("TX FIFO vc %d: size %d, add %d\n", i, size, add); */
-+		add += size;
-+	}
-+
-+	dsi_write_reg(DSI_TX_FIFO_VC_SIZE, r);
-+}
-+
-+static void dsi_config_rx_fifo(enum fifo_size size1, enum fifo_size size2,
-+		enum fifo_size size3, enum fifo_size size4)
-+{
-+	u32 r = 0;
-+	int add = 0;
-+	int i;
-+
-+	dsi.vc[0].fifo_size = size1;
-+	dsi.vc[1].fifo_size = size2;
-+	dsi.vc[2].fifo_size = size3;
-+	dsi.vc[3].fifo_size = size4;
-+
-+	for (i = 0; i < 4; i++) {
-+		u8 v;
-+		int size = dsi.vc[i].fifo_size;
-+
-+		if (add + size > 4) {
-+			DSSERR("Illegal FIFO configuration\n");
-+			BUG();
-+		}
-+
-+		v = FLD_VAL(add, 2, 0) | FLD_VAL(size, 7, 4);
-+		r |= v << (8 * i);
-+		/*DSSDBG("RX FIFO vc %d: size %d, add %d\n", i, size, add); */
-+		add += size;
-+	}
-+
-+	dsi_write_reg(DSI_RX_FIFO_VC_SIZE, r);
-+}
-+
-+static int dsi_force_tx_stop_mode_io(void)
-+{
-+	u32 r;
-+
-+	r = dsi_read_reg(DSI_TIMING1);
-+	r = FLD_MOD(r, 1, 15, 15);	/* FORCE_TX_STOP_MODE_IO */
-+	dsi_write_reg(DSI_TIMING1, r);
-+
-+	if (wait_for_bit_change(DSI_TIMING1, 15, 0) != 0) {
-+		DSSERR("TX_STOP bit not going down\n");
-+		return -EIO;
-+	}
-+
-+	return 0;
-+}
-+
-+static void dsi_vc_print_status(int channel)
-+{
-+	u32 r;
-+
-+	r = dsi_read_reg(DSI_VC_CTRL(channel));
-+	DSSDBG("vc %d: TX_FIFO_NOT_EMPTY %d, BTA_EN %d, VC_BUSY %d, "
-+			"TX_FIFO_FULL %d, RX_FIFO_NOT_EMPTY %d, ",
-+			channel,
-+			FLD_GET(r, 5, 5),
-+			FLD_GET(r, 6, 6),
-+			FLD_GET(r, 15, 15),
-+			FLD_GET(r, 16, 16),
-+			FLD_GET(r, 20, 20));
-+
-+	r = dsi_read_reg(DSI_TX_FIFO_VC_EMPTINESS);
-+	DSSDBG("EMPTINESS %d\n", (r >> (8 * channel)) & 0xff);
-+}
-+
-+static int dsi_vc_enable(int channel, bool enable)
-+{
-+	if (dsi.update_mode != OMAP_DSS_UPDATE_AUTO)
-+		DSSDBG("dsi_vc_enable channel %d, enable %d\n",
-+				channel, enable);
-+
-+	enable = enable ? 1 : 0;
-+
-+	REG_FLD_MOD(DSI_VC_CTRL(channel), enable, 0, 0);
-+
-+	if (wait_for_bit_change(DSI_VC_CTRL(channel), 0, enable) != enable) {
-+			DSSERR("Failed to set dsi_vc_enable to %d\n", enable);
-+			return -EIO;
-+	}
-+
-+	return 0;
-+}
-+
-+static void dsi_vc_initial_config(int channel)
-+{
-+	u32 r;
-+
-+	DSSDBGF("%d", channel);
-+
-+	r = dsi_read_reg(DSI_VC_CTRL(channel));
-+
-+	if (FLD_GET(r, 15, 15)) /* VC_BUSY */
-+		DSSERR("VC(%d) busy when trying to configure it!\n",
-+				channel);
-+
-+	r = FLD_MOD(r, 0, 1, 1); /* SOURCE, 0 = L4 */
-+	r = FLD_MOD(r, 0, 2, 2); /* BTA_SHORT_EN  */
-+	r = FLD_MOD(r, 0, 3, 3); /* BTA_LONG_EN */
-+	r = FLD_MOD(r, 0, 4, 4); /* MODE, 0 = command */
-+	r = FLD_MOD(r, 1, 7, 7); /* CS_TX_EN */
-+	r = FLD_MOD(r, 1, 8, 8); /* ECC_TX_EN */
-+	r = FLD_MOD(r, 0, 9, 9); /* MODE_SPEED, high speed on/off */
-+
-+	r = FLD_MOD(r, 4, 29, 27); /* DMA_RX_REQ_NB = no dma */
-+	r = FLD_MOD(r, 4, 23, 21); /* DMA_TX_REQ_NB = no dma */
-+
-+	dsi_write_reg(DSI_VC_CTRL(channel), r);
-+
-+	dsi.vc[channel].mode = DSI_VC_MODE_L4;
-+}
-+
-+static void dsi_vc_config_l4(int channel)
-+{
-+	if (dsi.vc[channel].mode == DSI_VC_MODE_L4)
-+		return;
-+
-+	DSSDBGF("%d", channel);
-+
-+	dsi_vc_enable(channel, 0);
-+
-+	if (REG_GET(DSI_VC_CTRL(channel), 15, 15)) /* VC_BUSY */
-+		DSSERR("vc(%d) busy when trying to config for L4\n", channel);
-+
-+	REG_FLD_MOD(DSI_VC_CTRL(channel), 0, 1, 1); /* SOURCE, 0 = L4 */
-+
-+	dsi_vc_enable(channel, 1);
-+
-+	dsi.vc[channel].mode = DSI_VC_MODE_L4;
-+}
-+
-+static void dsi_vc_config_vp(int channel)
-+{
-+	if (dsi.vc[channel].mode == DSI_VC_MODE_VP)
-+		return;
-+
-+	DSSDBGF("%d", channel);
-+
-+	dsi_vc_enable(channel, 0);
-+
-+	if (REG_GET(DSI_VC_CTRL(channel), 15, 15)) /* VC_BUSY */
-+		DSSERR("vc(%d) busy when trying to config for VP\n", channel);
-+
-+	REG_FLD_MOD(DSI_VC_CTRL(channel), 1, 1, 1); /* SOURCE, 1 = video port */
-+
-+	dsi_vc_enable(channel, 1);
-+
-+	dsi.vc[channel].mode = DSI_VC_MODE_VP;
-+}
-+
-+
-+static void dsi_vc_enable_hs(int channel, bool enable)
-+{
-+	DSSDBG("dsi_vc_enable_hs(%d, %d)\n", channel, enable);
-+
-+	dsi_vc_enable(channel, 0);
-+	dsi_if_enable(0);
-+
-+	REG_FLD_MOD(DSI_VC_CTRL(channel), enable, 9, 9);
-+
-+	dsi_vc_enable(channel, 1);
-+	dsi_if_enable(1);
-+
-+	dsi_force_tx_stop_mode_io();
-+}
-+
-+static void dsi_vc_flush_long_data(int channel)
-+{
-+	while (REG_GET(DSI_VC_CTRL(channel), 20, 20)) {
-+		u32 val;
-+		val = dsi_read_reg(DSI_VC_SHORT_PACKET_HEADER(channel));
-+		DSSDBG("\t\tb1 %#02x b2 %#02x b3 %#02x b4 %#02x\n",
-+				(val >> 0) & 0xff,
-+				(val >> 8) & 0xff,
-+				(val >> 16) & 0xff,
-+				(val >> 24) & 0xff);
-+	}
-+}
-+
-+static void dsi_show_rx_ack_with_err(u16 err)
-+{
-+	DSSERR("\tACK with ERROR (%#x):\n", err);
-+	if (err & (1 << 0))
-+		DSSERR("\t\tSoT Error\n");
-+	if (err & (1 << 1))
-+		DSSERR("\t\tSoT Sync Error\n");
-+	if (err & (1 << 2))
-+		DSSERR("\t\tEoT Sync Error\n");
-+	if (err & (1 << 3))
-+		DSSERR("\t\tEscape Mode Entry Command Error\n");
-+	if (err & (1 << 4))
-+		DSSERR("\t\tLP Transmit Sync Error\n");
-+	if (err & (1 << 5))
-+		DSSERR("\t\tHS Receive Timeout Error\n");
-+	if (err & (1 << 6))
-+		DSSERR("\t\tFalse Control Error\n");
-+	if (err & (1 << 7))
-+		DSSERR("\t\t(reserved7)\n");
-+	if (err & (1 << 8))
-+		DSSERR("\t\tECC Error, single-bit (corrected)\n");
-+	if (err & (1 << 9))
-+		DSSERR("\t\tECC Error, multi-bit (not corrected)\n");
-+	if (err & (1 << 10))
-+		DSSERR("\t\tChecksum Error\n");
-+	if (err & (1 << 11))
-+		DSSERR("\t\tData type not recognized\n");
-+	if (err & (1 << 12))
-+		DSSERR("\t\tInvalid VC ID\n");
-+	if (err & (1 << 13))
-+		DSSERR("\t\tInvalid Transmission Length\n");
-+	if (err & (1 << 14))
-+		DSSERR("\t\t(reserved14)\n");
-+	if (err & (1 << 15))
-+		DSSERR("\t\tDSI Protocol Violation\n");
-+}
-+
-+static u16 dsi_vc_flush_receive_data(int channel)
-+{
-+	/* RX_FIFO_NOT_EMPTY */
-+	while (REG_GET(DSI_VC_CTRL(channel), 20, 20)) {
-+		u32 val;
-+		u8 dt;
-+		val = dsi_read_reg(DSI_VC_SHORT_PACKET_HEADER(channel));
-+		DSSDBG("\trawval %#08x\n", val);
-+		dt = FLD_GET(val, 5, 0);
-+		if (dt == DSI_DT_RX_ACK_WITH_ERR) {
-+			u16 err = FLD_GET(val, 23, 8);
-+			dsi_show_rx_ack_with_err(err);
-+		} else if (dt == DSI_DT_RX_SHORT_READ_1) {
-+			DSSDBG("\tDCS short response, 1 byte: %#x\n",
-+					FLD_GET(val, 23, 8));
-+		} else if (dt == DSI_DT_RX_SHORT_READ_2) {
-+			DSSDBG("\tDCS short response, 2 byte: %#x\n",
-+					FLD_GET(val, 23, 8));
-+		} else if (dt == DSI_DT_RX_DCS_LONG_READ) {
-+			DSSDBG("\tDCS long response, len %d\n",
-+					FLD_GET(val, 23, 8));
-+			dsi_vc_flush_long_data(channel);
-+		} else {
-+			DSSERR("\tunknown datatype 0x%02x\n", dt);
-+		}
-+	}
-+	return 0;
-+}
-+
-+static int dsi_vc_send_bta(int channel)
-+{
-+	if (dsi.update_mode != OMAP_DSS_UPDATE_AUTO &&
-+			(dsi.debug_write || dsi.debug_read))
-+		DSSDBG("dsi_vc_send_bta %d\n", channel);
-+
-+	WARN_ON(!mutex_is_locked(&dsi.bus_lock));
-+
-+	if (REG_GET(DSI_VC_CTRL(channel), 20, 20)) {	/* RX_FIFO_NOT_EMPTY */
-+		DSSERR("rx fifo not empty when sending BTA, dumping data:\n");
-+		dsi_vc_flush_receive_data(channel);
-+	}
-+
-+	REG_FLD_MOD(DSI_VC_CTRL(channel), 1, 6, 6); /* BTA_EN */
-+
-+	return 0;
-+}
-+
-+int dsi_vc_send_bta_sync(int channel)
-+{
-+	int r = 0;
-+	u32 err;
-+
-+	INIT_COMPLETION(dsi.bta_completion);
-+
-+	dsi_vc_enable_bta_irq(channel);
-+
-+	r = dsi_vc_send_bta(channel);
-+	if (r)
-+		goto err;
-+
-+	if (wait_for_completion_timeout(&dsi.bta_completion,
-+				msecs_to_jiffies(500)) == 0) {
-+		DSSERR("Failed to receive BTA\n");
-+		r = -EIO;
-+		goto err;
-+	}
-+
-+	err = dsi_get_errors();
-+	if (err) {
-+		DSSERR("Error while sending BTA: %x\n", err);
-+		r = -EIO;
-+		goto err;
-+	}
-+err:
-+	dsi_vc_disable_bta_irq(channel);
-+
-+	return r;
-+}
-+EXPORT_SYMBOL(dsi_vc_send_bta_sync);
-+
-+static inline void dsi_vc_write_long_header(int channel, u8 data_type,
-+		u16 len, u8 ecc)
-+{
-+	u32 val;
-+	u8 data_id;
-+
-+	WARN_ON(!mutex_is_locked(&dsi.bus_lock));
-+
-+	/*data_id = data_type | channel << 6; */
-+	data_id = data_type | dsi.vc[channel].dest_per << 6;
-+
-+	val = FLD_VAL(data_id, 7, 0) | FLD_VAL(len, 23, 8) |
-+		FLD_VAL(ecc, 31, 24);
-+
-+	dsi_write_reg(DSI_VC_LONG_PACKET_HEADER(channel), val);
-+}
-+
-+static inline void dsi_vc_write_long_payload(int channel,
-+		u8 b1, u8 b2, u8 b3, u8 b4)
-+{
-+	u32 val;
-+
-+	val = b4 << 24 | b3 << 16 | b2 << 8  | b1 << 0;
-+
-+/*	DSSDBG("\twriting %02x, %02x, %02x, %02x (%#010x)\n",
-+			b1, b2, b3, b4, val); */
-+
-+	dsi_write_reg(DSI_VC_LONG_PACKET_PAYLOAD(channel), val);
-+}
-+
-+static int dsi_vc_send_long(int channel, u8 data_type, u8 *data, u16 len,
-+		u8 ecc)
-+{
-+	/*u32 val; */
-+	int i;
-+	u8 *p;
-+	int r = 0;
-+	u8 b1, b2, b3, b4;
-+
-+	if (dsi.debug_write)
-+		DSSDBG("dsi_vc_send_long, %d bytes\n", len);
-+
-+	/* len + header */
-+	if (dsi.vc[channel].fifo_size * 32 * 4 < len + 4) {
-+		DSSERR("unable to send long packet: packet too long.\n");
-+		return -EINVAL;
-+	}
-+
-+	dsi_vc_config_l4(channel);
-+
-+	dsi_vc_write_long_header(channel, data_type, len, ecc);
-+
-+	/*dsi_vc_print_status(0); */
-+
-+	p = data;
-+	for (i = 0; i < len >> 2; i++) {
-+		if (dsi.debug_write)
-+			DSSDBG("\tsending full packet %d\n", i);
-+		/*dsi_vc_print_status(0); */
-+
-+		b1 = *p++;
-+		b2 = *p++;
-+		b3 = *p++;
-+		b4 = *p++;
-+
-+		dsi_vc_write_long_payload(channel, b1, b2, b3, b4);
-+	}
-+
-+	i = len % 4;
-+	if (i) {
-+		b1 = 0; b2 = 0; b3 = 0;
-+
-+		if (dsi.debug_write)
-+			DSSDBG("\tsending remainder bytes %d\n", i);
-+
-+		switch (i) {
-+		case 3:
-+			b1 = *p++;
-+			b2 = *p++;
-+			b3 = *p++;
-+			break;
-+		case 2:
-+			b1 = *p++;
-+			b2 = *p++;
-+			break;
-+		case 1:
-+			b1 = *p++;
-+			break;
-+		}
-+
-+		dsi_vc_write_long_payload(channel, b1, b2, b3, 0);
-+	}
-+
-+	return r;
-+}
-+
-+static int dsi_vc_send_short(int channel, u8 data_type, u16 data, u8 ecc)
-+{
-+	u32 r;
-+	u8 data_id;
-+
-+	WARN_ON(!mutex_is_locked(&dsi.bus_lock));
-+
-+	if (dsi.debug_write)
-+		DSSDBG("dsi_vc_send_short(ch%d, dt %#x, b1 %#x, b2 %#x)\n",
-+				channel,
-+				data_type, data & 0xff, (data >> 8) & 0xff);
-+
-+	dsi_vc_config_l4(channel);
-+
-+	if (FLD_GET(dsi_read_reg(DSI_VC_CTRL(channel)), 16, 16)) {
-+		DSSERR("ERROR FIFO FULL, aborting transfer\n");
-+		return -EINVAL;
-+	}
-+
-+	data_id = data_type | channel << 6;
-+
-+	r = (data_id << 0) | (data << 8) | (ecc << 24);
-+
-+	dsi_write_reg(DSI_VC_SHORT_PACKET_HEADER(channel), r);
-+
-+	return 0;
-+}
-+
-+int dsi_vc_send_null(int channel)
-+{
-+	u8 nullpkg[] = {0, 0, 0, 0};
-+	return dsi_vc_send_long(0, DSI_DT_NULL_PACKET, nullpkg, 4, 0);
-+}
-+EXPORT_SYMBOL(dsi_vc_send_null);
-+
-+int dsi_vc_dcs_write_nosync(int channel, u8 *data, int len)
-+{
-+	int r;
-+
-+	BUG_ON(len == 0);
-+
-+	if (len == 1) {
-+		r = dsi_vc_send_short(channel, DSI_DT_DCS_SHORT_WRITE_0,
-+				data[0], 0);
-+	} else if (len == 2) {
-+		r = dsi_vc_send_short(channel, DSI_DT_DCS_SHORT_WRITE_1,
-+				data[0] | (data[1] << 8), 0);
-+	} else {
-+		/* 0x39 = DCS Long Write */
-+		r = dsi_vc_send_long(channel, DSI_DT_DCS_LONG_WRITE,
-+				data, len, 0);
-+	}
-+
-+	return r;
-+}
-+EXPORT_SYMBOL(dsi_vc_dcs_write_nosync);
-+
-+int dsi_vc_dcs_write(int channel, u8 *data, int len)
-+{
-+	int r;
-+
-+	r = dsi_vc_dcs_write_nosync(channel, data, len);
-+	if (r)
-+		return r;
-+
-+	r = dsi_vc_send_bta_sync(channel);
-+
-+	return r;
-+}
-+EXPORT_SYMBOL(dsi_vc_dcs_write);
-+
-+int dsi_vc_dcs_read(int channel, u8 dcs_cmd, u8 *buf, int buflen)
-+{
-+	u32 val;
-+	u8 dt;
-+	int r;
-+
-+	if (dsi.debug_read)
-+		DSSDBG("dsi_vc_dcs_read(ch%d, dcs_cmd %u)\n", channel, dcs_cmd);
-+
-+	r = dsi_vc_send_short(channel, DSI_DT_DCS_READ, dcs_cmd, 0);
-+	if (r)
-+		return r;
-+
-+	r = dsi_vc_send_bta_sync(channel);
-+	if (r)
-+		return r;
-+
-+	/* RX_FIFO_NOT_EMPTY */
-+	if (REG_GET(DSI_VC_CTRL(channel), 20, 20) == 0) {
-+		DSSERR("RX fifo empty when trying to read.\n");
-+		return -EIO;
-+	}
-+
-+	val = dsi_read_reg(DSI_VC_SHORT_PACKET_HEADER(channel));
-+	if (dsi.debug_read)
-+		DSSDBG("\theader: %08x\n", val);
-+	dt = FLD_GET(val, 5, 0);
-+	if (dt == DSI_DT_RX_ACK_WITH_ERR) {
-+		u16 err = FLD_GET(val, 23, 8);
-+		dsi_show_rx_ack_with_err(err);
-+		return -EIO;
-+
-+	} else if (dt == DSI_DT_RX_SHORT_READ_1) {
-+		u8 data = FLD_GET(val, 15, 8);
-+		if (dsi.debug_read)
-+			DSSDBG("\tDCS short response, 1 byte: %02x\n", data);
-+
-+		if (buflen < 1)
-+			return -EIO;
-+
-+		buf[0] = data;
-+
-+		return 1;
-+	} else if (dt == DSI_DT_RX_SHORT_READ_2) {
-+		u16 data = FLD_GET(val, 23, 8);
-+		if (dsi.debug_read)
-+			DSSDBG("\tDCS short response, 2 byte: %04x\n", data);
-+
-+		if (buflen < 2)
-+			return -EIO;
-+
-+		buf[0] = data & 0xff;
-+		buf[1] = (data >> 8) & 0xff;
-+
-+		return 2;
-+	} else if (dt == DSI_DT_RX_DCS_LONG_READ) {
-+		int w;
-+		int len = FLD_GET(val, 23, 8);
-+		if (dsi.debug_read)
-+			DSSDBG("\tDCS long response, len %d\n", len);
-+
-+		if (len > buflen)
-+			return -EIO;
-+
-+		/* two byte checksum ends the packet, not included in len */
-+		for (w = 0; w < len + 2;) {
-+			int b;
-+			val = dsi_read_reg(DSI_VC_SHORT_PACKET_HEADER(channel));
-+			if (dsi.debug_read)
-+				DSSDBG("\t\t%02x %02x %02x %02x\n",
-+						(val >> 0) & 0xff,
-+						(val >> 8) & 0xff,
-+						(val >> 16) & 0xff,
-+						(val >> 24) & 0xff);
-+
-+			for (b = 0; b < 4; ++b) {
-+				if (w < len)
-+					buf[w] = (val >> (b * 8)) & 0xff;
-+				/* we discard the 2 byte checksum */
-+				++w;
-+			}
-+		}
-+
-+		return len;
-+
-+	} else {
-+		DSSERR("\tunknown datatype 0x%02x\n", dt);
-+		return -EIO;
-+	}
-+}
-+EXPORT_SYMBOL(dsi_vc_dcs_read);
-+
-+
-+int dsi_vc_set_max_rx_packet_size(int channel, u16 len)
-+{
-+	return dsi_vc_send_short(channel, DSI_DT_SET_MAX_RET_PKG_SIZE,
-+			len, 0);
-+}
-+EXPORT_SYMBOL(dsi_vc_set_max_rx_packet_size);
-+
-+
-+static int dsi_set_lp_rx_timeout(int ns, int x4, int x16)
-+{
-+	u32 r;
-+	unsigned long fck;
-+	int ticks;
-+
-+	/* ticks in DSI_FCK */
-+
-+	fck = dsi_fclk_rate();
-+	ticks = (fck / 1000 / 1000) * ns / 1000;
-+
-+	if (ticks > 0x1fff) {
-+		DSSERR("LP_TX_TO too high\n");
-+		return -EINVAL;
-+	}
-+
-+	r = dsi_read_reg(DSI_TIMING2);
-+	r = FLD_MOD(r, 1, 15, 15);	/* LP_RX_TO */
-+	r = FLD_MOD(r, x16, 14, 14);	/* LP_RX_TO_X16 */
-+	r = FLD_MOD(r, x4, 13, 13);	/* LP_RX_TO_X4 */
-+	r = FLD_MOD(r, ticks, 12, 0);	/* LP_RX_COUNTER */
-+	dsi_write_reg(DSI_TIMING2, r);
-+
-+	DSSDBG("LP_RX_TO %ld ns (%#x ticks)\n",
-+			(ticks * (x16 ? 16 : 1) * (x4 ? 4 : 1) * 1000) /
-+			(fck / 1000 / 1000),
-+			ticks);
-+
-+	return 0;
-+}
-+
-+static int dsi_set_ta_timeout(int ns, int x8, int x16)
-+{
-+	u32 r;
-+	unsigned long fck;
-+	int ticks;
-+
-+	/* ticks in DSI_FCK */
-+
-+	fck = dsi_fclk_rate();
-+	ticks = (fck / 1000 / 1000) * ns / 1000;
-+
-+	if (ticks > 0x1fff) {
-+		DSSERR("TA_TO too high\n");
-+		return -EINVAL;
-+	}
-+
-+	r = dsi_read_reg(DSI_TIMING1);
-+	r = FLD_MOD(r, 1, 31, 31);	/* TA_TO */
-+	r = FLD_MOD(r, x16, 30, 30);	/* TA_TO_X16 */
-+	r = FLD_MOD(r, x8, 29, 29);	/* TA_TO_X8 */
-+	r = FLD_MOD(r, ticks, 28, 16);	/* TA_TO_COUNTER */
-+	dsi_write_reg(DSI_TIMING1, r);
-+
-+	DSSDBG("TA_TO %ld ns (%#x ticks)\n",
-+			(ticks * (x16 ? 16 : 1) * (x8 ? 8 : 1) * 1000) /
-+			(fck / 1000 / 1000),
-+			ticks);
-+
-+	return 0;
-+}
-+
-+static int dsi_set_stop_state_counter(int ns, int x4, int x16)
-+{
-+	u32 r;
-+	unsigned long fck;
-+	int ticks;
-+
-+	/* ticks in DSI_FCK */
-+
-+	fck = dsi_fclk_rate();
-+	ticks = (fck / 1000 / 1000) * ns / 1000;
-+
-+	if (ticks > 0x1fff) {
-+		DSSERR("STOP_STATE_COUNTER_IO too high\n");
-+		return -EINVAL;
-+	}
-+
-+	r = dsi_read_reg(DSI_TIMING1);
-+	r = FLD_MOD(r, 1, 15, 15);	/* FORCE_TX_STOP_MODE_IO */
-+	r = FLD_MOD(r, x16, 14, 14);	/* STOP_STATE_X16_IO */
-+	r = FLD_MOD(r, x4, 13, 13);	/* STOP_STATE_X4_IO */
-+	r = FLD_MOD(r, ticks, 12, 0);	/* STOP_STATE_COUNTER_IO */
-+	dsi_write_reg(DSI_TIMING1, r);
-+
-+	DSSDBG("STOP_STATE_COUNTER %ld ns (%#x ticks)\n",
-+			(ticks * (x16 ? 16 : 1) * (x4 ? 4 : 1) * 1000) /
-+			(fck / 1000 / 1000),
-+			ticks);
-+
-+	return 0;
-+}
-+
-+static int dsi_set_hs_tx_timeout(int ns, int x4, int x16)
-+{
-+	u32 r;
-+	unsigned long fck;
-+	int ticks;
-+
-+	/* ticks in TxByteClkHS */
-+
-+	fck = dsi.ddr_clk / 4;
-+	ticks = (fck / 1000 / 1000) * ns / 1000;
-+
-+	if (ticks > 0x1fff) {
-+		DSSERR("HS_TX_TO too high\n");
-+		return -EINVAL;
-+	}
-+
-+	r = dsi_read_reg(DSI_TIMING2);
-+	r = FLD_MOD(r, 1, 31, 31);	/* HS_TX_TO */
-+	r = FLD_MOD(r, x16, 30, 30);	/* HS_TX_TO_X16 */
-+	r = FLD_MOD(r, x4, 29, 29);	/* HS_TX_TO_X8 (4 really) */
-+	r = FLD_MOD(r, ticks, 28, 16);	/* HS_TX_TO_COUNTER */
-+	dsi_write_reg(DSI_TIMING2, r);
-+
-+	DSSDBG("HS_TX_TO %ld ns (%#x ticks)\n",
-+			(ticks * (x16 ? 16 : 1) * (x4 ? 4 : 1) * 1000) /
-+			(fck / 1000 / 1000),
-+			ticks);
-+
-+	return 0;
-+}
-+static int dsi_proto_config(struct omap_dss_device *dssdev)
-+{
-+	u32 r;
-+	int buswidth = 0;
-+	int div;
-+
-+	dsi_config_tx_fifo(DSI_FIFO_SIZE_128,
-+			DSI_FIFO_SIZE_0,
-+			DSI_FIFO_SIZE_0,
-+			DSI_FIFO_SIZE_0);
-+
-+	dsi_config_rx_fifo(DSI_FIFO_SIZE_128,
-+			DSI_FIFO_SIZE_0,
-+			DSI_FIFO_SIZE_0,
-+			DSI_FIFO_SIZE_0);
-+
-+	/* XXX what values for the timeouts? */
-+	dsi_set_stop_state_counter(1000, 0, 0);
-+
-+	dsi_set_ta_timeout(50000, 1, 1);
-+
-+	/* 3000ns * 16 */
-+	dsi_set_lp_rx_timeout(3000, 0, 1);
-+
-+	/* 10000ns * 4 */
-+	dsi_set_hs_tx_timeout(10000, 1, 0);
-+
-+	switch (dssdev->ctrl.pixel_size) {
-+	case 16:
-+		buswidth = 0;
-+		break;
-+	case 18:
-+		buswidth = 1;
-+		break;
-+	case 24:
-+		buswidth = 2;
-+		break;
-+	default:
-+		BUG();
-+	}
-+
-+	r = dsi_read_reg(DSI_CTRL);
-+	r = FLD_MOD(r, 1, 1, 1);	/* CS_RX_EN */
-+	r = FLD_MOD(r, 1, 2, 2);	/* ECC_RX_EN */
-+	r = FLD_MOD(r, 1, 3, 3);	/* TX_FIFO_ARBITRATION */
-+
-+	div = dispc_lclk_rate() / dispc_pclk_rate();
-+	r = FLD_MOD(r, div == 2 ? 0 : 1, 4, 4);	/* VP_CLK_RATIO */
-+	r = FLD_MOD(r, buswidth, 7, 6); /* VP_DATA_BUS_WIDTH */
-+	r = FLD_MOD(r, 0, 8, 8);	/* VP_CLK_POL */
-+	r = FLD_MOD(r, 2, 13, 12);	/* LINE_BUFFER, 2 lines */
-+	r = FLD_MOD(r, 1, 14, 14);	/* TRIGGER_RESET_MODE */
-+	r = FLD_MOD(r, 1, 19, 19);	/* EOT_ENABLE */
-+	r = FLD_MOD(r, 1, 24, 24);	/* DCS_CMD_ENABLE */
-+	r = FLD_MOD(r, 0, 25, 25);	/* DCS_CMD_CODE, 1=start, 0=continue */
-+
-+	dsi_write_reg(DSI_CTRL, r);
-+
-+	dsi_vc_initial_config(0);
-+
-+	/* set all vc targets to peripheral 0 */
-+	dsi.vc[0].dest_per = 0;
-+	dsi.vc[1].dest_per = 0;
-+	dsi.vc[2].dest_per = 0;
-+	dsi.vc[3].dest_per = 0;
-+
-+	return 0;
-+}
-+
-+static void dsi_proto_timings(struct omap_dss_device *dssdev)
-+{
-+	unsigned tlpx, tclk_zero, tclk_prepare, tclk_trail;
-+	unsigned tclk_pre, tclk_post;
-+	unsigned ths_prepare, ths_prepare_ths_zero, ths_zero;
-+	unsigned ths_trail, ths_exit;
-+	unsigned ddr_clk_pre, ddr_clk_post;
-+	unsigned enter_hs_mode_lat, exit_hs_mode_lat;
-+	unsigned ths_eot;
-+	u32 r;
-+
-+	r = dsi_read_reg(DSI_DSIPHY_CFG0);
-+	ths_prepare = FLD_GET(r, 31, 24);
-+	ths_prepare_ths_zero = FLD_GET(r, 23, 16);
-+	ths_zero = ths_prepare_ths_zero - ths_prepare;
-+	ths_trail = FLD_GET(r, 15, 8);
-+	ths_exit = FLD_GET(r, 7, 0);
-+
-+	r = dsi_read_reg(DSI_DSIPHY_CFG1);
-+	tlpx = FLD_GET(r, 22, 16) * 2;
-+	tclk_trail = FLD_GET(r, 15, 8);
-+	tclk_zero = FLD_GET(r, 7, 0);
-+
-+	r = dsi_read_reg(DSI_DSIPHY_CFG2);
-+	tclk_prepare = FLD_GET(r, 7, 0);
-+
-+	/* min 8*UI */
-+	tclk_pre = 20;
-+	/* min 60ns + 52*UI */
-+	tclk_post = ns2ddr(60) + 26;
-+
-+	/* ths_eot is 2 for 2 datalanes and 4 for 1 datalane */
-+	if (dssdev->phy.dsi.data1_lane != 0 &&
-+			dssdev->phy.dsi.data2_lane != 0)
-+		ths_eot = 2;
-+	else
-+		ths_eot = 4;
-+
-+	ddr_clk_pre = DIV_ROUND_UP(tclk_pre + tlpx + tclk_zero + tclk_prepare,
-+			4);
-+	ddr_clk_post = DIV_ROUND_UP(tclk_post + tclk_trail, 4) + ths_eot;
-+
-+	BUG_ON(ddr_clk_pre == 0 || ddr_clk_pre > 255);
-+	BUG_ON(ddr_clk_post == 0 || ddr_clk_post > 255);
-+
-+	r = dsi_read_reg(DSI_CLK_TIMING);
-+	r = FLD_MOD(r, ddr_clk_pre, 15, 8);
-+	r = FLD_MOD(r, ddr_clk_post, 7, 0);
-+	dsi_write_reg(DSI_CLK_TIMING, r);
-+
-+	DSSDBG("ddr_clk_pre %u, ddr_clk_post %u\n",
-+			ddr_clk_pre,
-+			ddr_clk_post);
-+
-+	enter_hs_mode_lat = 1 + DIV_ROUND_UP(tlpx, 4) +
-+		DIV_ROUND_UP(ths_prepare, 4) +
-+		DIV_ROUND_UP(ths_zero + 3, 4);
-+
-+	exit_hs_mode_lat = DIV_ROUND_UP(ths_trail + ths_exit, 4) + 1 + ths_eot;
-+
-+	r = FLD_VAL(enter_hs_mode_lat, 31, 16) |
-+		FLD_VAL(exit_hs_mode_lat, 15, 0);
-+	dsi_write_reg(DSI_VM_TIMING7, r);
-+
-+	DSSDBG("enter_hs_mode_lat %u, exit_hs_mode_lat %u\n",
-+			enter_hs_mode_lat, exit_hs_mode_lat);
-+}
-+
-+
-+#define DSI_DECL_VARS \
-+	int __dsi_cb = 0; u32 __dsi_cv = 0;
-+
-+#define DSI_FLUSH(ch) \
-+	if (__dsi_cb > 0) { \
-+		/*DSSDBG("sending long packet %#010x\n", __dsi_cv);*/ \
-+		dsi_write_reg(DSI_VC_LONG_PACKET_PAYLOAD(ch), __dsi_cv); \
-+		__dsi_cb = __dsi_cv = 0; \
-+	}
-+
-+#define DSI_PUSH(ch, data) \
-+	do { \
-+		__dsi_cv |= (data) << (__dsi_cb * 8); \
-+		/*DSSDBG("cv = %#010x, cb = %d\n", __dsi_cv, __dsi_cb);*/ \
-+		if (++__dsi_cb > 3) \
-+			DSI_FLUSH(ch); \
-+	} while (0)
-+
-+static int dsi_update_screen_l4(struct omap_dss_device *dssdev,
-+			int x, int y, int w, int h)
-+{
-+	/* Note: supports only 24bit colors in 32bit container */
-+	int first = 1;
-+	int fifo_stalls = 0;
-+	int max_dsi_packet_size;
-+	int max_data_per_packet;
-+	int max_pixels_per_packet;
-+	int pixels_left;
-+	int bytespp = dssdev->ctrl.pixel_size / 8;
-+	int scr_width;
-+	u32 __iomem *data;
-+	int start_offset;
-+	int horiz_inc;
-+	int current_x;
-+	struct omap_overlay *ovl;
-+
-+	debug_irq = 0;
-+
-+	DSSDBG("dsi_update_screen_l4 (%d,%d %dx%d)\n",
-+			x, y, w, h);
-+
-+	ovl = dssdev->manager->overlays[0];
-+
-+	if (ovl->info.color_mode != OMAP_DSS_COLOR_RGB24U)
-+		return -EINVAL;
-+
-+	if (dssdev->ctrl.pixel_size != 24)
-+		return -EINVAL;
-+
-+	scr_width = ovl->info.screen_width;
-+	data = ovl->info.vaddr;
-+
-+	start_offset = scr_width * y + x;
-+	horiz_inc = scr_width - w;
-+	current_x = x;
-+
-+	/* We need header(4) + DCSCMD(1) + pixels(numpix*bytespp) bytes
-+	 * in fifo */
-+
-+	/* When using CPU, max long packet size is TX buffer size */
-+	max_dsi_packet_size = dsi.vc[0].fifo_size * 32 * 4;
-+
-+	/* we seem to get better perf if we divide the tx fifo to half,
-+	   and while the other half is being sent, we fill the other half
-+	   max_dsi_packet_size /= 2; */
-+
-+	max_data_per_packet = max_dsi_packet_size - 4 - 1;
-+
-+	max_pixels_per_packet = max_data_per_packet / bytespp;
-+
-+	DSSDBG("max_pixels_per_packet %d\n", max_pixels_per_packet);
-+
-+	pixels_left = w * h;
-+
-+	DSSDBG("total pixels %d\n", pixels_left);
-+
-+	data += start_offset;
-+
-+	while (pixels_left > 0) {
-+		/* 0x2c = write_memory_start */
-+		/* 0x3c = write_memory_continue */
-+		u8 dcs_cmd = first ? 0x2c : 0x3c;
-+		int pixels;
-+		DSI_DECL_VARS;
-+		first = 0;
-+
-+#if 1
-+		/* using fifo not empty */
-+		/* TX_FIFO_NOT_EMPTY */
-+		while (FLD_GET(dsi_read_reg(DSI_VC_CTRL(0)), 5, 5)) {
-+			udelay(1);
-+			fifo_stalls++;
-+			if (fifo_stalls > 0xfffff) {
-+				DSSERR("fifo stalls overflow, pixels left %d\n",
-+						pixels_left);
-+				dsi_if_enable(0);
-+				return -EIO;
-+			}
-+		}
-+#elif 1
-+		/* using fifo emptiness */
-+		while ((REG_GET(DSI_TX_FIFO_VC_EMPTINESS, 7, 0)+1)*4 <
-+				max_dsi_packet_size) {
-+			fifo_stalls++;
-+			if (fifo_stalls > 0xfffff) {
-+				DSSERR("fifo stalls overflow, pixels left %d\n",
-+					       pixels_left);
-+				dsi_if_enable(0);
-+				return -EIO;
-+			}
-+		}
-+#else
-+		while ((REG_GET(DSI_TX_FIFO_VC_EMPTINESS, 7, 0)+1)*4 == 0) {
-+			fifo_stalls++;
-+			if (fifo_stalls > 0xfffff) {
-+				DSSERR("fifo stalls overflow, pixels left %d\n",
-+					       pixels_left);
-+				dsi_if_enable(0);
-+				return -EIO;
-+			}
-+		}
-+#endif
-+		pixels = min(max_pixels_per_packet, pixels_left);
-+
-+		pixels_left -= pixels;
-+
-+		dsi_vc_write_long_header(0, DSI_DT_DCS_LONG_WRITE,
-+				1 + pixels * bytespp, 0);
-+
-+		DSI_PUSH(0, dcs_cmd);
-+
-+		while (pixels-- > 0) {
-+			u32 pix = __raw_readl(data++);
-+
-+			DSI_PUSH(0, (pix >> 16) & 0xff);
-+			DSI_PUSH(0, (pix >> 8) & 0xff);
-+			DSI_PUSH(0, (pix >> 0) & 0xff);
-+
-+			current_x++;
-+			if (current_x == x+w) {
-+				current_x = x;
-+				data += horiz_inc;
-+			}
-+		}
-+
-+		DSI_FLUSH(0);
-+	}
-+
-+	return 0;
-+}
-+
-+static void dsi_update_screen_dispc(struct omap_dss_device *dssdev,
-+		u16 x, u16 y, u16 w, u16 h)
-+{
-+	int bytespp = dssdev->ctrl.pixel_size / 8;
-+	int len;
-+	int total_len;
-+	int packet_payload;
-+	int packet_len;
-+	u32 l;
-+	bool use_te_trigger;
-+	const int channel = 0;
-+
-+	use_te_trigger = dsi.te_enabled && !dsi.use_ext_te;
-+
-+	if (dsi.update_mode != OMAP_DSS_UPDATE_AUTO)
-+		DSSDBG("dsi_update_screen_dispc(%d,%d %dx%d)\n",
-+				x, y, w, h);
-+
-+	len = w * h * bytespp;
-+
-+	/* XXX: one packet could be longer, I think? Line buffer is
-+	 * 1024 x 24bits, but we have to put DCS cmd there also.
-+	 * 1023 * 3 should work, but causes strange color effects. */
-+	packet_payload = min(w, (u16)1020) * bytespp;
-+
-+	packet_len = packet_payload + 1;	/* 1 byte for DCS cmd */
-+	total_len = (len / packet_payload) * packet_len;
-+
-+	if (len % packet_payload)
-+		total_len += (len % packet_payload) + 1;
-+
-+	if (0)
-+		dsi_vc_print_status(1);
-+
-+	l = FLD_VAL(total_len, 23, 0); /* TE_SIZE */
-+	dsi_write_reg(DSI_VC_TE(channel), l);
-+
-+	dsi_vc_write_long_header(channel, DSI_DT_DCS_LONG_WRITE, packet_len, 0);
-+
-+	if (use_te_trigger)
-+		l = FLD_MOD(l, 1, 30, 30); /* TE_EN */
-+	else
-+		l = FLD_MOD(l, 1, 31, 31); /* TE_START */
-+	dsi_write_reg(DSI_VC_TE(channel), l);
-+
-+	/* We put SIDLEMODE to no-idle for the duration of the transfer,
-+	 * because DSS interrupts are not capable of waking up the CPU and the
-+	 * framedone interrupt could be delayed for quite a long time. I think
-+	 * the same goes for any DSS interrupts, but for some reason I have not
-+	 * seen the problem anywhere else than here.
-+	 */
-+	dispc_disable_sidle();
-+
-+	dss_start_update(dssdev);
-+
-+	if (use_te_trigger) {
-+		/* disable LP_RX_TO, so that we can receive TE.  Time to wait
-+		 * for TE is longer than the timer allows */
-+		REG_FLD_MOD(DSI_TIMING2, 0, 15, 15); /* LP_RX_TO */
-+
-+		dsi_vc_send_bta(channel);
-+	}
-+}
-+
-+static void dsi_framedone_irq_callback(void *data, u32 mask)
-+{
-+	/* Note: We get FRAMEDONE when DISPC has finished sending pixels and
-+	 * turns itself off. However, DSI still has the pixels in its buffers,
-+	 * and is sending the data.
-+	 */
-+
-+	/* SIDLEMODE back to smart-idle */
-+	dispc_enable_sidle();
-+
-+	dsi.framedone_received = true;
-+	wake_up(&dsi.waitqueue);
-+}
-+
-+static void dsi_set_update_region(struct omap_dss_device *dssdev,
-+		u16 x, u16 y, u16 w, u16 h)
-+{
-+	spin_lock(&dsi.update_lock);
-+	if (dsi.update_region.dirty) {
-+		dsi.update_region.x = min(x, dsi.update_region.x);
-+		dsi.update_region.y = min(y, dsi.update_region.y);
-+		dsi.update_region.w = max(w, dsi.update_region.w);
-+		dsi.update_region.h = max(h, dsi.update_region.h);
-+	} else {
-+		dsi.update_region.x = x;
-+		dsi.update_region.y = y;
-+		dsi.update_region.w = w;
-+		dsi.update_region.h = h;
-+	}
-+
-+	dsi.update_region.device = dssdev;
-+	dsi.update_region.dirty = true;
-+
-+	spin_unlock(&dsi.update_lock);
-+
-+}
-+
-+static void dsi_start_auto_update(struct omap_dss_device *dssdev)
-+{
-+	u16 w, h;
-+	int i;
-+
-+	DSSDBG("starting auto update\n");
-+
-+	/* In automatic mode the overlay settings are applied like on DPI/SDI.
-+	 * Mark the overlays dirty, so that we get the overlays configured, as
-+	 * manual mode has left them in bad shape after config partia planes */
-+	for (i = 0; i < omap_dss_get_num_overlays(); ++i) {
-+		struct omap_overlay *ovl;
-+		ovl = omap_dss_get_overlay(i);
-+		if (ovl->manager == dssdev->manager)
-+			ovl->info_dirty = true;
-+	}
-+	dssdev->manager->apply(dssdev->manager);
-+
-+	dssdev->get_resolution(dssdev, &w, &h);
-+
-+	dsi_set_update_region(dssdev, 0, 0, w, h);
-+
-+	dsi_perf_mark_start_auto();
-+
-+	wake_up(&dsi.waitqueue);
-+}
-+
-+static int dsi_set_te(struct omap_dss_device *dssdev, bool enable)
-+{
-+	int r;
-+	r = dssdev->driver->enable_te(dssdev, enable);
-+	/* XXX for some reason, DSI TE breaks if we don't wait here.
-+	 * Panel bug? Needs more studying */
-+	msleep(100);
-+	return r;
-+}
-+
-+static void dsi_handle_framedone(void)
-+{
-+	int r;
-+	const int channel = 0;
-+	bool use_te_trigger;
-+
-+	use_te_trigger = dsi.te_enabled && !dsi.use_ext_te;
-+
-+	if (dsi.update_mode != OMAP_DSS_UPDATE_AUTO)
-+		DSSDBG("FRAMEDONE\n");
-+
-+	if (use_te_trigger) {
-+		/* enable LP_RX_TO again after the TE */
-+		REG_FLD_MOD(DSI_TIMING2, 1, 15, 15); /* LP_RX_TO */
-+	}
-+
-+	/* Send BTA after the frame. We need this for the TE to work, as TE
-+	 * trigger is only sent for BTAs without preceding packet. Thus we need
-+	 * to BTA after the pixel packets so that next BTA will cause TE
-+	 * trigger.
-+	 *
-+	 * This is not needed when TE is not in use, but we do it anyway to
-+	 * make sure that the transfer has been completed. It would be more
-+	 * optimal, but more complex, to wait only just before starting next
-+	 * transfer. */
-+	r = dsi_vc_send_bta_sync(channel);
-+	if (r)
-+		DSSERR("BTA after framedone failed\n");
-+
-+#ifdef CONFIG_OMAP2_DSS_FAKE_VSYNC
-+	dispc_fake_vsync_irq();
-+#endif
-+}
-+
-+static int dsi_update_thread(void *data)
-+{
-+	unsigned long timeout;
-+	struct omap_dss_device *device;
-+	u16 x, y, w, h;
-+
-+	while (1) {
-+		bool sched;
-+
-+		wait_event_interruptible(dsi.waitqueue,
-+				dsi.update_mode == OMAP_DSS_UPDATE_AUTO ||
-+				(dsi.update_mode == OMAP_DSS_UPDATE_MANUAL &&
-+				 dsi.update_region.dirty == true) ||
-+				kthread_should_stop());
-+
-+		if (kthread_should_stop())
-+			break;
-+
-+		dsi_bus_lock();
-+
-+		if (dsi.update_mode == OMAP_DSS_UPDATE_DISABLED ||
-+				kthread_should_stop()) {
-+			dsi_bus_unlock();
-+			break;
-+		}
-+
-+		dsi_perf_mark_setup();
-+
-+		if (dsi.update_region.dirty) {
-+			spin_lock(&dsi.update_lock);
-+			dsi.active_update_region = dsi.update_region;
-+			dsi.update_region.dirty = false;
-+			spin_unlock(&dsi.update_lock);
-+		}
-+
-+		device = dsi.active_update_region.device;
-+		x = dsi.active_update_region.x;
-+		y = dsi.active_update_region.y;
-+		w = dsi.active_update_region.w;
-+		h = dsi.active_update_region.h;
-+
-+		if (device->manager->caps & OMAP_DSS_OVL_MGR_CAP_DISPC) {
-+
-+			if (dsi.update_mode == OMAP_DSS_UPDATE_MANUAL) {
-+				dss_setup_partial_planes(device,
-+						&x, &y, &w, &h);
-+#if 1
-+				/* XXX there seems to be a bug in this driver
-+				 * or OMAP hardware.  Some updates with certain
-+				 * widths and x coordinates fail. These widths
-+				 * are always odd, so "fix" it here for now */
-+				if (w & 1) {
-+					u16 dw, dh;
-+					device->get_resolution(device,
-+							&dw, &dh);
-+					if (x + w == dw)
-+						x &= ~1;
-+					++w;
-+
-+					dss_setup_partial_planes(device,
-+							&x, &y, &w, &h);
-+				}
-+#endif
-+			}
-+
-+			dispc_set_lcd_size(w, h);
-+		}
-+
-+		if (dsi.active_update_region.dirty) {
-+			dsi.active_update_region.dirty = false;
-+			/* XXX TODO we don't need to send the coords, if they
-+			 * are the same that are already programmed to the
-+			 * panel. That should speed up manual update a bit */
-+			device->driver->setup_update(device, x, y, w, h);
-+		}
-+
-+		dsi_perf_mark_start();
-+
-+		if (device->manager->caps & OMAP_DSS_OVL_MGR_CAP_DISPC) {
-+			dsi_vc_config_vp(0);
-+
-+			if (dsi.te_enabled && dsi.use_ext_te)
-+				device->driver->wait_for_te(device);
-+
-+			dsi.framedone_received = false;
-+
-+			dsi_update_screen_dispc(device, x, y, w, h);
-+
-+			/* wait for framedone */
-+			timeout = msecs_to_jiffies(1000);
-+			timeout = wait_event_timeout(dsi.waitqueue,
-+					dsi.framedone_received == true,
-+					timeout);
-+
-+			if (timeout == 0) {
-+				DSSERR("framedone timeout\n");
-+				DSSERR("failed update %d,%d %dx%d\n",
-+						x, y, w, h);
-+
-+				dispc_enable_sidle();
-+				dispc_enable_lcd_out(0);
-+			} else {
-+				dsi_handle_framedone();
-+				dsi_perf_show("DISPC");
-+			}
-+		} else {
-+			dsi_update_screen_l4(device, x, y, w, h);
-+			dsi_perf_show("L4");
-+		}
-+
-+		sched = atomic_read(&dsi.bus_lock.count) < 0;
-+
-+		complete_all(&dsi.update_completion);
-+
-+		dsi_bus_unlock();
-+
-+		/* XXX We need to give others chance to get the bus lock. Is
-+		 * there a better way for this? */
-+		if (dsi.update_mode == OMAP_DSS_UPDATE_AUTO && sched)
-+			schedule_timeout_interruptible(1);
-+	}
-+
-+	DSSDBG("update thread exiting\n");
-+
-+	return 0;
-+}
-+
-+
-+
-+/* Display funcs */
-+
-+static int dsi_display_init_dispc(struct omap_dss_device *dssdev)
-+{
-+	int r;
-+
-+	r = omap_dispc_register_isr(dsi_framedone_irq_callback, NULL,
-+			DISPC_IRQ_FRAMEDONE);
-+	if (r) {
-+		DSSERR("can't get FRAMEDONE irq\n");
-+		return r;
-+	}
-+
-+	dispc_set_lcd_display_type(OMAP_DSS_LCD_DISPLAY_TFT);
-+
-+	dispc_set_parallel_interface_mode(OMAP_DSS_PARALLELMODE_DSI);
-+	dispc_enable_fifohandcheck(1);
-+
-+	dispc_set_tft_data_lines(dssdev->ctrl.pixel_size);
-+
-+	{
-+		struct omap_video_timings timings = {
-+			.hsw		= 1,
-+			.hfp		= 1,
-+			.hbp		= 1,
-+			.vsw		= 1,
-+			.vfp		= 0,
-+			.vbp		= 0,
-+		};
-+
-+		dispc_set_lcd_timings(&timings);
-+	}
-+
-+	return 0;
-+}
-+
-+static void dsi_display_uninit_dispc(struct omap_dss_device *dssdev)
-+{
-+	omap_dispc_unregister_isr(dsi_framedone_irq_callback, NULL,
-+			DISPC_IRQ_FRAMEDONE);
-+}
-+
-+static int dsi_display_init_dsi(struct omap_dss_device *dssdev)
-+{
-+	struct dsi_clock_info cinfo;
-+	int r;
-+
-+	_dsi_print_reset_status();
-+
-+	r = dsi_pll_init(1, 0);
-+	if (r)
-+		goto err0;
-+
-+	r = dsi_pll_calc_ddrfreq(dssdev->phy.dsi.ddr_clk_hz, &cinfo);
-+	if (r)
-+		goto err1;
-+
-+	r = dsi_pll_program(&cinfo);
-+	if (r)
-+		goto err1;
-+
-+	DSSDBG("PLL OK\n");
-+
-+	r = dsi_complexio_init(dssdev);
-+	if (r)
-+		goto err1;
-+
-+	_dsi_print_reset_status();
-+
-+	dsi_proto_timings(dssdev);
-+	dsi_set_lp_clk_divisor(dssdev);
-+
-+	if (1)
-+		_dsi_print_reset_status();
-+
-+	r = dsi_proto_config(dssdev);
-+	if (r)
-+		goto err2;
-+
-+	/* enable interface */
-+	dsi_vc_enable(0, 1);
-+	dsi_if_enable(1);
-+	dsi_force_tx_stop_mode_io();
-+
-+	if (dssdev->driver->enable) {
-+		r = dssdev->driver->enable(dssdev);
-+		if (r)
-+			goto err3;
-+	}
-+
-+	/* enable high-speed after initial config */
-+	dsi_vc_enable_hs(0, 1);
-+
-+	return 0;
-+err3:
-+	dsi_if_enable(0);
-+err2:
-+	dsi_complexio_uninit();
-+err1:
-+	dsi_pll_uninit();
-+err0:
-+	return r;
-+}
-+
-+static void dsi_display_uninit_dsi(struct omap_dss_device *dssdev)
-+{
-+	if (dssdev->driver->disable)
-+		dssdev->driver->disable(dssdev);
-+
-+	dsi_complexio_uninit();
-+	dsi_pll_uninit();
-+}
-+
-+static int dsi_core_init(void)
-+{
-+	/* Autoidle */
-+	REG_FLD_MOD(DSI_SYSCONFIG, 1, 0, 0);
-+
-+	/* ENWAKEUP */
-+	REG_FLD_MOD(DSI_SYSCONFIG, 1, 2, 2);
-+
-+	/* SIDLEMODE smart-idle */
-+	REG_FLD_MOD(DSI_SYSCONFIG, 2, 4, 3);
-+
-+	_dsi_initialize_irq();
-+
-+	return 0;
-+}
-+
-+static int dsi_display_enable(struct omap_dss_device *dssdev)
-+{
-+	int r = 0;
-+
-+	DSSDBG("dsi_display_enable\n");
-+
-+	mutex_lock(&dsi.lock);
-+	dsi_bus_lock();
-+
-+	r = omap_dss_start_device(dssdev);
-+	if (r) {
-+		DSSERR("failed to start device\n");
-+		goto err0;
-+	}
-+
-+	if (dssdev->state != OMAP_DSS_DISPLAY_DISABLED) {
-+		DSSERR("dssdev already enabled\n");
-+		r = -EINVAL;
-+		goto err1;
-+	}
-+
-+	enable_clocks(1);
-+	dsi_enable_pll_clock(1);
-+
-+	r = _dsi_reset();
-+	if (r)
-+		goto err2;
-+
-+	dsi_core_init();
-+
-+	r = dsi_display_init_dispc(dssdev);
-+	if (r)
-+		goto err2;
-+
-+	r = dsi_display_init_dsi(dssdev);
-+	if (r)
-+		goto err3;
-+
-+	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
-+
-+	dsi.use_ext_te = dssdev->phy.dsi.ext_te;
-+	r = dsi_set_te(dssdev, dsi.te_enabled);
-+	if (r)
-+		goto err3;
-+
-+	dsi.update_mode = dsi.user_update_mode;
-+	if (dsi.update_mode == OMAP_DSS_UPDATE_AUTO)
-+		dsi_start_auto_update(dssdev);
-+
-+	dsi_bus_unlock();
-+	mutex_unlock(&dsi.lock);
-+
-+	return 0;
-+
-+err3:
-+	dsi_display_uninit_dispc(dssdev);
-+err2:
-+	enable_clocks(0);
-+	dsi_enable_pll_clock(0);
-+err1:
-+	omap_dss_stop_device(dssdev);
-+err0:
-+	dsi_bus_unlock();
-+	mutex_unlock(&dsi.lock);
-+	DSSDBG("dsi_display_enable FAILED\n");
-+	return r;
-+}
-+
-+static void dsi_display_disable(struct omap_dss_device *dssdev)
-+{
-+	DSSDBG("dsi_display_disable\n");
-+
-+	mutex_lock(&dsi.lock);
-+	dsi_bus_lock();
-+
-+	if (dssdev->state == OMAP_DSS_DISPLAY_DISABLED ||
-+			dssdev->state == OMAP_DSS_DISPLAY_SUSPENDED)
-+		goto end;
-+
-+	dsi.update_mode = OMAP_DSS_UPDATE_DISABLED;
-+	dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
-+
-+	dsi_display_uninit_dispc(dssdev);
-+
-+	dsi_display_uninit_dsi(dssdev);
-+
-+	enable_clocks(0);
-+	dsi_enable_pll_clock(0);
-+
-+	omap_dss_stop_device(dssdev);
-+end:
-+	dsi_bus_unlock();
-+	mutex_unlock(&dsi.lock);
-+}
-+
-+static int dsi_display_suspend(struct omap_dss_device *dssdev)
-+{
-+	DSSDBG("dsi_display_suspend\n");
-+
-+	mutex_lock(&dsi.lock);
-+	dsi_bus_lock();
-+
-+	if (dssdev->state == OMAP_DSS_DISPLAY_DISABLED ||
-+			dssdev->state == OMAP_DSS_DISPLAY_SUSPENDED)
-+		goto end;
-+
-+	dsi.update_mode = OMAP_DSS_UPDATE_DISABLED;
-+	dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
-+
-+	dsi_display_uninit_dispc(dssdev);
-+
-+	dsi_display_uninit_dsi(dssdev);
-+
-+	enable_clocks(0);
-+	dsi_enable_pll_clock(0);
-+end:
-+	dsi_bus_unlock();
-+	mutex_unlock(&dsi.lock);
-+
-+	return 0;
-+}
-+
-+static int dsi_display_resume(struct omap_dss_device *dssdev)
-+{
-+	int r;
-+
-+	DSSDBG("dsi_display_resume\n");
-+
-+	mutex_lock(&dsi.lock);
-+	dsi_bus_lock();
-+
-+	if (dssdev->state != OMAP_DSS_DISPLAY_SUSPENDED) {
-+		DSSERR("dssdev not suspended\n");
-+		r = -EINVAL;
-+		goto err0;
-+	}
-+
-+	enable_clocks(1);
-+	dsi_enable_pll_clock(1);
-+
-+	r = _dsi_reset();
-+	if (r)
-+		goto err1;
-+
-+	dsi_core_init();
-+
-+	r = dsi_display_init_dispc(dssdev);
-+	if (r)
-+		goto err1;
-+
-+	r = dsi_display_init_dsi(dssdev);
-+	if (r)
-+		goto err2;
-+
-+	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
-+
-+	r = dsi_set_te(dssdev, dsi.te_enabled);
-+	if (r)
-+		goto err2;
-+
-+	dsi.update_mode = dsi.user_update_mode;
-+	if (dsi.update_mode == OMAP_DSS_UPDATE_AUTO)
-+		dsi_start_auto_update(dssdev);
-+
-+	dsi_bus_unlock();
-+	mutex_unlock(&dsi.lock);
-+
-+	return 0;
-+
-+err2:
-+	dsi_display_uninit_dispc(dssdev);
-+err1:
-+	enable_clocks(0);
-+	dsi_enable_pll_clock(0);
-+err0:
-+	dsi_bus_unlock();
-+	mutex_unlock(&dsi.lock);
-+	DSSDBG("dsi_display_resume FAILED\n");
-+	return r;
-+}
-+
-+static int dsi_display_update(struct omap_dss_device *dssdev,
-+			u16 x, u16 y, u16 w, u16 h)
-+{
-+	int r = 0;
-+	u16 dw, dh;
-+
-+	DSSDBG("dsi_display_update(%d,%d %dx%d)\n", x, y, w, h);
-+
-+	mutex_lock(&dsi.lock);
-+
-+	if (dsi.update_mode != OMAP_DSS_UPDATE_MANUAL)
-+		goto end;
-+
-+	if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
-+		goto end;
-+
-+	dssdev->get_resolution(dssdev, &dw, &dh);
-+
-+	if  (x > dw || y > dh)
-+		goto end;
-+
-+	if (x + w > dw)
-+		w = dw - x;
-+
-+	if (y + h > dh)
-+		h = dh - y;
-+
-+	if (w == 0 || h == 0)
-+		goto end;
-+
-+	dsi_set_update_region(dssdev, x, y, w, h);
-+
-+	wake_up(&dsi.waitqueue);
-+
-+end:
-+	mutex_unlock(&dsi.lock);
-+
-+	return r;
-+}
-+
-+static int dsi_display_sync(struct omap_dss_device *dssdev)
-+{
-+	bool wait;
-+
-+	DSSDBG("dsi_display_sync()\n");
-+
-+	mutex_lock(&dsi.lock);
-+	dsi_bus_lock();
-+
-+	if (dsi.update_mode == OMAP_DSS_UPDATE_MANUAL &&
-+			dsi.update_region.dirty) {
-+		INIT_COMPLETION(dsi.update_completion);
-+		wait = true;
-+	} else {
-+		wait = false;
-+	}
-+
-+	dsi_bus_unlock();
-+	mutex_unlock(&dsi.lock);
-+
-+	if (wait)
-+		wait_for_completion_interruptible(&dsi.update_completion);
-+
-+	DSSDBG("dsi_display_sync() done\n");
-+	return 0;
-+}
-+
-+static int dsi_display_set_update_mode(struct omap_dss_device *dssdev,
-+		enum omap_dss_update_mode mode)
-+{
-+	DSSDBGF("%d", mode);
-+
-+	mutex_lock(&dsi.lock);
-+	dsi_bus_lock();
-+
-+	if (dsi.update_mode != mode) {
-+		dsi.user_update_mode = mode;
-+		dsi.update_mode = mode;
-+
-+		if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE &&
-+				mode == OMAP_DSS_UPDATE_AUTO)
-+			dsi_start_auto_update(dssdev);
-+	}
-+
-+	dsi_bus_unlock();
-+	mutex_unlock(&dsi.lock);
-+
-+	return 0;
-+}
-+
-+static enum omap_dss_update_mode dsi_display_get_update_mode(
-+		struct omap_dss_device *dssdev)
-+{
-+	return dsi.update_mode;
-+}
-+
-+
-+static int dsi_display_enable_te(struct omap_dss_device *dssdev, bool enable)
-+{
-+	int r = 0;
-+
-+	DSSDBGF("%d", enable);
-+
-+	if (!dssdev->driver->enable_te)
-+		return -ENOENT;
-+
-+	dsi_bus_lock();
-+
-+	dsi.te_enabled = enable;
-+
-+	if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
-+		goto end;
-+
-+	r = dsi_set_te(dssdev, enable);
-+end:
-+	dsi_bus_unlock();
-+
-+	return r;
-+}
-+
-+static int dsi_display_get_te(struct omap_dss_device *dssdev)
-+{
-+	return dsi.te_enabled;
-+}
-+
-+static int dsi_display_set_rotate(struct omap_dss_device *dssdev, u8 rotate)
-+{
-+
-+	DSSDBGF("%d", rotate);
-+
-+	if (!dssdev->driver->set_rotate || !dssdev->driver->get_rotate)
-+		return -EINVAL;
-+
-+	dsi_bus_lock();
-+	dssdev->driver->set_rotate(dssdev, rotate);
-+	if (dsi.update_mode == OMAP_DSS_UPDATE_AUTO) {
-+		u16 w, h;
-+		/* the display dimensions may have changed, so set a new
-+		 * update region */
-+		dssdev->get_resolution(dssdev, &w, &h);
-+		dsi_set_update_region(dssdev, 0, 0, w, h);
-+	}
-+	dsi_bus_unlock();
-+
-+	return 0;
-+}
-+
-+static u8 dsi_display_get_rotate(struct omap_dss_device *dssdev)
-+{
-+	if (!dssdev->driver->set_rotate || !dssdev->driver->get_rotate)
-+		return 0;
-+
-+	return dssdev->driver->get_rotate(dssdev);
-+}
-+
-+static int dsi_display_set_mirror(struct omap_dss_device *dssdev, bool mirror)
-+{
-+	DSSDBGF("%d", mirror);
-+
-+	if (!dssdev->driver->set_mirror || !dssdev->driver->get_mirror)
-+		return -EINVAL;
-+
-+	dsi_bus_lock();
-+	dssdev->driver->set_mirror(dssdev, mirror);
-+	dsi_bus_unlock();
-+
-+	return 0;
-+}
-+
-+static bool dsi_display_get_mirror(struct omap_dss_device *dssdev)
-+{
-+	if (!dssdev->driver->set_mirror || !dssdev->driver->get_mirror)
-+		return 0;
-+
-+	return dssdev->driver->get_mirror(dssdev);
-+}
-+
-+static int dsi_display_run_test(struct omap_dss_device *dssdev, int test_num)
-+{
-+	int r;
-+
-+	if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
-+		return -EIO;
-+
-+	DSSDBGF("%d", test_num);
-+
-+	dsi_bus_lock();
-+
-+	/* run test first in low speed mode */
-+	dsi_vc_enable_hs(0, 0);
-+
-+	if (dssdev->driver->run_test) {
-+		r = dssdev->driver->run_test(dssdev, test_num);
-+		if (r)
-+			goto end;
-+	}
-+
-+	/* then in high speed */
-+	dsi_vc_enable_hs(0, 1);
-+
-+	if (dssdev->driver->run_test) {
-+		r = dssdev->driver->run_test(dssdev, test_num);
-+		if (r)
-+			goto end;
-+	}
-+
-+end:
-+	dsi_vc_enable_hs(0, 1);
-+
-+	dsi_bus_unlock();
-+
-+	return r;
-+}
-+
-+static int dsi_display_memory_read(struct omap_dss_device *dssdev,
-+		void *buf, size_t size,
-+		u16 x, u16 y, u16 w, u16 h)
-+{
-+	int r;
-+
-+	DSSDBGF("");
-+
-+	if (!dssdev->driver->memory_read)
-+		return -EINVAL;
-+
-+	if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
-+		return -EIO;
-+
-+	dsi_bus_lock();
-+
-+	r = dssdev->driver->memory_read(dssdev, buf, size,
-+			x, y, w, h);
-+
-+	dsi_bus_unlock();
-+
-+	return r;
-+}
-+
-+void dsi_get_overlay_fifo_thresholds(enum omap_plane plane,
-+		u32 fifo_size, enum omap_burst_size *burst_size,
-+		u32 *fifo_low, u32 *fifo_high)
-+{
-+	unsigned burst_size_bytes;
-+
-+	*burst_size = OMAP_DSS_BURST_16x32;
-+	burst_size_bytes = 16 * 32 / 8;
-+
-+	*fifo_high = fifo_size - burst_size_bytes;
-+	*fifo_low = 0;
-+}
-+
-+int dsi_init_display(struct omap_dss_device *dssdev)
-+{
-+	DSSDBG("DSI init\n");
-+
-+	dssdev->enable = dsi_display_enable;
-+	dssdev->disable = dsi_display_disable;
-+	dssdev->suspend = dsi_display_suspend;
-+	dssdev->resume = dsi_display_resume;
-+	dssdev->update = dsi_display_update;
-+	dssdev->sync = dsi_display_sync;
-+	dssdev->set_update_mode = dsi_display_set_update_mode;
-+	dssdev->get_update_mode = dsi_display_get_update_mode;
-+	dssdev->enable_te = dsi_display_enable_te;
-+	dssdev->get_te = dsi_display_get_te;
-+
-+	dssdev->get_rotate = dsi_display_get_rotate;
-+	dssdev->set_rotate = dsi_display_set_rotate;
-+
-+	dssdev->get_mirror = dsi_display_get_mirror;
-+	dssdev->set_mirror = dsi_display_set_mirror;
-+
-+	dssdev->run_test = dsi_display_run_test;
-+	dssdev->memory_read = dsi_display_memory_read;
-+
-+	dssdev->caps = OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE;
-+
-+	dsi.vc[0].dssdev = dssdev;
-+	dsi.vc[1].dssdev = dssdev;
-+
-+	return 0;
-+}
-+
-+int dsi_init(struct platform_device *pdev)
-+{
-+	u32 rev;
-+	struct sched_param param = {
-+		.sched_priority = MAX_USER_RT_PRIO-1
-+	};
-+
-+	spin_lock_init(&dsi.errors_lock);
-+	dsi.errors = 0;
-+
-+	/* XXX fail properly */
-+
-+	init_completion(&dsi.bta_completion);
-+	init_completion(&dsi.update_completion);
-+
-+	dsi.thread = kthread_create(dsi_update_thread, NULL, "dsi");
-+	if (IS_ERR(dsi.thread)) {
-+		DSSERR("cannot create kthread\n");
-+		return PTR_ERR(dsi.thread);
-+	}
-+	sched_setscheduler(dsi.thread, SCHED_FIFO, &param);
-+
-+	init_waitqueue_head(&dsi.waitqueue);
-+	spin_lock_init(&dsi.update_lock);
-+
-+	mutex_init(&dsi.lock);
-+	mutex_init(&dsi.bus_lock);
-+
-+	dsi.update_mode = OMAP_DSS_UPDATE_DISABLED;
-+	dsi.user_update_mode = OMAP_DSS_UPDATE_DISABLED;
-+
-+	dsi.base = ioremap(DSI_BASE, DSI_SZ_REGS);
-+	if (!dsi.base) {
-+		DSSERR("can't ioremap DSI\n");
-+		return -ENOMEM;
-+	}
-+
-+	dsi.vdds_dsi_reg = regulator_get(&pdev->dev, "vdds_dsi");
-+	if (IS_ERR(dsi.vdds_dsi_reg)) {
-+		iounmap(dsi.base);
-+		DSSERR("can't get VDDS_DSI regulator\n");
-+		return PTR_ERR(dsi.vdds_dsi_reg);
-+	}
-+
-+	enable_clocks(1);
-+
-+	rev = dsi_read_reg(DSI_REVISION);
-+	printk(KERN_INFO "OMAP DSI rev %d.%d\n",
-+	       FLD_GET(rev, 7, 4), FLD_GET(rev, 3, 0));
-+
-+	enable_clocks(0);
-+
-+	wake_up_process(dsi.thread);
-+
-+	return 0;
-+}
-+
-+void dsi_exit(void)
-+{
-+	kthread_stop(dsi.thread);
-+
-+	regulator_put(dsi.vdds_dsi_reg);
-+
-+	iounmap(dsi.base);
-+
-+	DSSDBG("omap_dsi_exit\n");
-+}
-+
---- /dev/null
-+++ b/drivers/video/omap2/dss/dss.c
-@@ -0,0 +1,347 @@
-+/*
-+ * linux/drivers/video/omap2/dss/dss.c
-+ *
-+ * Copyright (C) 2009 Nokia Corporation
-+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
-+ *
-+ * Some code and ideas taken from drivers/video/omap/ driver
-+ * by Imre Deak.
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-+ * more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along with
-+ * this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#define DSS_SUBSYS_NAME "DSS"
-+
-+#include <linux/kernel.h>
-+#include <linux/io.h>
-+#include <linux/err.h>
-+#include <linux/delay.h>
-+#include <linux/interrupt.h>
-+#include <linux/seq_file.h>
-+
-+#include <mach/display.h>
-+#include "dss.h"
-+
-+#define DSS_BASE			0x48050000
-+
-+#define DSS_SZ_REGS			SZ_512
-+
-+struct dss_reg {
-+	u16 idx;
-+};
-+
-+#define DSS_REG(idx)			((const struct dss_reg) { idx })
-+
-+#define DSS_REVISION			DSS_REG(0x0000)
-+#define DSS_SYSCONFIG			DSS_REG(0x0010)
-+#define DSS_SYSSTATUS			DSS_REG(0x0014)
-+#define DSS_IRQSTATUS			DSS_REG(0x0018)
-+#define DSS_CONTROL			DSS_REG(0x0040)
-+#define DSS_SDI_CONTROL			DSS_REG(0x0044)
-+#define DSS_PLL_CONTROL			DSS_REG(0x0048)
-+#define DSS_SDI_STATUS			DSS_REG(0x005C)
-+
-+#define REG_GET(idx, start, end) \
-+	FLD_GET(dss_read_reg(idx), start, end)
-+
-+#define REG_FLD_MOD(idx, val, start, end) \
-+	dss_write_reg(idx, FLD_MOD(dss_read_reg(idx), val, start, end))
-+
-+static struct {
-+	void __iomem    *base;
-+
-+	u32		ctx[DSS_SZ_REGS / sizeof(u32)];
-+} dss;
-+
-+static int _omap_dss_wait_reset(void);
-+
-+static inline void dss_write_reg(const struct dss_reg idx, u32 val)
-+{
-+	__raw_writel(val, dss.base + idx.idx);
-+}
-+
-+static inline u32 dss_read_reg(const struct dss_reg idx)
-+{
-+	return __raw_readl(dss.base + idx.idx);
-+}
-+
-+#define SR(reg) \
-+	dss.ctx[(DSS_##reg).idx / sizeof(u32)] = dss_read_reg(DSS_##reg)
-+#define RR(reg) \
-+	dss_write_reg(DSS_##reg, dss.ctx[(DSS_##reg).idx / sizeof(u32)])
-+
-+void dss_save_context(void)
-+{
-+	if (cpu_is_omap24xx())
-+		return;
-+
-+	SR(SYSCONFIG);
-+	SR(CONTROL);
-+
-+#ifdef CONFIG_OMAP2_DSS_SDI
-+	SR(SDI_CONTROL);
-+	SR(PLL_CONTROL);
-+#endif
-+}
-+
-+void dss_restore_context(void)
-+{
-+	if (_omap_dss_wait_reset())
-+		DSSERR("DSS not coming out of reset after sleep\n");
-+
-+	RR(SYSCONFIG);
-+	RR(CONTROL);
-+
-+#ifdef CONFIG_OMAP2_DSS_SDI
-+	RR(SDI_CONTROL);
-+	RR(PLL_CONTROL);
-+#endif
-+}
-+
-+#undef SR
-+#undef RR
-+
-+void dss_sdi_init(u8 datapairs)
-+{
-+	u32 l;
-+
-+	BUG_ON(datapairs > 3 || datapairs < 1);
-+
-+	l = dss_read_reg(DSS_SDI_CONTROL);
-+	l = FLD_MOD(l, 0xf, 19, 15);		/* SDI_PDIV */
-+	l = FLD_MOD(l, datapairs-1, 3, 2);	/* SDI_PRSEL */
-+	l = FLD_MOD(l, 2, 1, 0);		/* SDI_BWSEL */
-+	dss_write_reg(DSS_SDI_CONTROL, l);
-+
-+	l = dss_read_reg(DSS_PLL_CONTROL);
-+	l = FLD_MOD(l, 0x7, 25, 22);	/* SDI_PLL_FREQSEL */
-+	l = FLD_MOD(l, 0xb, 16, 11);	/* SDI_PLL_REGN */
-+	l = FLD_MOD(l, 0xb4, 10, 1);	/* SDI_PLL_REGM */
-+	dss_write_reg(DSS_PLL_CONTROL, l);
-+}
-+
-+void dss_sdi_enable(void)
-+{
-+	dispc_pck_free_enable(1);
-+
-+	/* Reset SDI PLL */
-+	REG_FLD_MOD(DSS_PLL_CONTROL, 1, 18, 18); /* SDI_PLL_SYSRESET */
-+	udelay(1);	/* wait 2x PCLK */
-+
-+	/* Lock SDI PLL */
-+	REG_FLD_MOD(DSS_PLL_CONTROL, 1, 28, 28); /* SDI_PLL_GOBIT */
-+
-+	/* Waiting for PLL lock request to complete */
-+	while (dss_read_reg(DSS_SDI_STATUS) & (1 << 6))
-+		;
-+
-+	/* Clearing PLL_GO bit */
-+	REG_FLD_MOD(DSS_PLL_CONTROL, 0, 28, 28);
-+
-+	/* Waiting for PLL to lock */
-+	while (!(dss_read_reg(DSS_SDI_STATUS) & (1 << 5)))
-+		;
-+
-+	dispc_lcd_enable_signal(1);
-+
-+	/* Waiting for SDI reset to complete */
-+	while (!(dss_read_reg(DSS_SDI_STATUS) & (1 << 2)))
-+		;
-+}
-+
-+void dss_sdi_disable(void)
-+{
-+	dispc_lcd_enable_signal(0);
-+
-+	dispc_pck_free_enable(0);
-+
-+	/* Reset SDI PLL */
-+	REG_FLD_MOD(DSS_PLL_CONTROL, 0, 18, 18); /* SDI_PLL_SYSRESET */
-+}
-+
-+void dss_dump_regs(struct seq_file *s)
-+{
-+#define DUMPREG(r) seq_printf(s, "%-35s %08x\n", #r, dss_read_reg(r))
-+
-+	dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1);
-+
-+	DUMPREG(DSS_REVISION);
-+	DUMPREG(DSS_SYSCONFIG);
-+	DUMPREG(DSS_SYSSTATUS);
-+	DUMPREG(DSS_IRQSTATUS);
-+	DUMPREG(DSS_CONTROL);
-+	DUMPREG(DSS_SDI_CONTROL);
-+	DUMPREG(DSS_PLL_CONTROL);
-+	DUMPREG(DSS_SDI_STATUS);
-+
-+	dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
-+#undef DUMPREG
-+}
-+
-+void dss_select_clk_source(bool dsi, bool dispc)
-+{
-+	u32 r;
-+	r = dss_read_reg(DSS_CONTROL);
-+	r = FLD_MOD(r, dsi, 1, 1);	/* DSI_CLK_SWITCH */
-+	r = FLD_MOD(r, dispc, 0, 0);	/* DISPC_CLK_SWITCH */
-+	dss_write_reg(DSS_CONTROL, r);
-+}
-+
-+int dss_get_dsi_clk_source(void)
-+{
-+	return FLD_GET(dss_read_reg(DSS_CONTROL), 1, 1);
-+}
-+
-+int dss_get_dispc_clk_source(void)
-+{
-+	return FLD_GET(dss_read_reg(DSS_CONTROL), 0, 0);
-+}
-+
-+static irqreturn_t dss_irq_handler_omap2(int irq, void *arg)
-+{
-+	dispc_irq_handler();
-+
-+	return IRQ_HANDLED;
-+}
-+
-+static irqreturn_t dss_irq_handler_omap3(int irq, void *arg)
-+{
-+	u32 irqstatus;
-+
-+	irqstatus = dss_read_reg(DSS_IRQSTATUS);
-+
-+	if (irqstatus & (1<<0))	/* DISPC_IRQ */
-+		dispc_irq_handler();
-+#ifdef CONFIG_OMAP2_DSS_DSI
-+	if (irqstatus & (1<<1))	/* DSI_IRQ */
-+		dsi_irq_handler();
-+#endif
-+
-+	return IRQ_HANDLED;
-+}
-+
-+static int _omap_dss_wait_reset(void)
-+{
-+	unsigned timeout = 1000;
-+
-+	while (REG_GET(DSS_SYSSTATUS, 0, 0) == 0) {
-+		udelay(1);
-+		if (!--timeout) {
-+			DSSERR("soft reset failed\n");
-+			return -ENODEV;
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+static int _omap_dss_reset(void)
-+{
-+	/* Soft reset */
-+	REG_FLD_MOD(DSS_SYSCONFIG, 1, 1, 1);
-+	return _omap_dss_wait_reset();
-+}
-+
-+void dss_set_venc_output(enum omap_dss_venc_type type)
-+{
-+	int l = 0;
-+
-+	if (type == OMAP_DSS_VENC_TYPE_COMPOSITE)
-+		l = 0;
-+	else if (type == OMAP_DSS_VENC_TYPE_SVIDEO)
-+		l = 1;
-+	else
-+		BUG();
-+
-+	/* venc out selection. 0 = comp, 1 = svideo */
-+	REG_FLD_MOD(DSS_CONTROL, l, 6, 6);
-+}
-+
-+void dss_set_dac_pwrdn_bgz(bool enable)
-+{
-+	REG_FLD_MOD(DSS_CONTROL, enable, 5, 5);	/* DAC Power-Down Control */
-+}
-+
-+int dss_init(bool skip_init)
-+{
-+	int r;
-+	u32 rev;
-+
-+	dss.base = ioremap(DSS_BASE, DSS_SZ_REGS);
-+	if (!dss.base) {
-+		DSSERR("can't ioremap DSS\n");
-+		r = -ENOMEM;
-+		goto fail0;
-+	}
-+
-+	if (!skip_init) {
-+		/* disable LCD and DIGIT output. This seems to fix the synclost
-+		 * problem that we get, if the bootloader starts the DSS and
-+		 * the kernel resets it */
-+		omap_writel(omap_readl(0x48050440) & ~0x3, 0x48050440);
-+
-+		/* We need to wait here a bit, otherwise we sometimes start to
-+		 * get synclost errors, and after that only power cycle will
-+		 * restore DSS functionality. I have no idea why this happens.
-+		 * And we have to wait _before_ resetting the DSS, but after
-+		 * enabling clocks.
-+		 */
-+		msleep(50);
-+
-+		_omap_dss_reset();
-+	}
-+
-+	/* autoidle */
-+	REG_FLD_MOD(DSS_SYSCONFIG, 1, 0, 0);
-+
-+	/* Select DPLL */
-+	REG_FLD_MOD(DSS_CONTROL, 0, 0, 0);
-+
-+#ifdef CONFIG_OMAP2_DSS_VENC
-+	REG_FLD_MOD(DSS_CONTROL, 1, 4, 4);	/* venc dac demen */
-+	REG_FLD_MOD(DSS_CONTROL, 1, 3, 3);	/* venc clock 4x enable */
-+	REG_FLD_MOD(DSS_CONTROL, 0, 2, 2);	/* venc clock mode = normal */
-+#endif
-+
-+	r = request_irq(INT_24XX_DSS_IRQ,
-+			cpu_is_omap24xx()
-+			? dss_irq_handler_omap2
-+			: dss_irq_handler_omap3,
-+			0, "OMAP DSS", NULL);
-+
-+	if (r < 0) {
-+		DSSERR("omap2 dss: request_irq failed\n");
-+		goto fail1;
-+	}
-+
-+	dss_save_context();
-+
-+	rev = dss_read_reg(DSS_REVISION);
-+	printk(KERN_INFO "OMAP DSS rev %d.%d\n",
-+			FLD_GET(rev, 7, 4), FLD_GET(rev, 3, 0));
-+
-+	return 0;
-+
-+fail1:
-+	iounmap(dss.base);
-+fail0:
-+	return r;
-+}
-+
-+void dss_exit(void)
-+{
-+	free_irq(INT_24XX_DSS_IRQ, NULL);
-+
-+	iounmap(dss.base);
-+}
-+
---- /dev/null
-+++ b/drivers/video/omap2/dss/dss.h
-@@ -0,0 +1,356 @@
-+/*
-+ * linux/drivers/video/omap2/dss/dss.h
-+ *
-+ * Copyright (C) 2009 Nokia Corporation
-+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
-+ *
-+ * Some code and ideas taken from drivers/video/omap/ driver
-+ * by Imre Deak.
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-+ * more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along with
-+ * this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#ifndef __OMAP2_DSS_H
-+#define __OMAP2_DSS_H
-+
-+#ifdef CONFIG_OMAP2_DSS_DEBUG_SUPPORT
-+#define DEBUG
-+#endif
-+
-+#ifdef DEBUG
-+extern unsigned int dss_debug;
-+#ifdef DSS_SUBSYS_NAME
-+#define DSSDBG(format, ...) \
-+	if (dss_debug) \
-+		printk(KERN_DEBUG "omapdss " DSS_SUBSYS_NAME ": " format, \
-+		## __VA_ARGS__)
-+#else
-+#define DSSDBG(format, ...) \
-+	if (dss_debug) \
-+		printk(KERN_DEBUG "omapdss: " format, ## __VA_ARGS__)
-+#endif
-+
-+#ifdef DSS_SUBSYS_NAME
-+#define DSSDBGF(format, ...) \
-+	if (dss_debug) \
-+		printk(KERN_DEBUG "omapdss " DSS_SUBSYS_NAME \
-+				": %s(" format ")\n", \
-+				__func__, \
-+				## __VA_ARGS__)
-+#else
-+#define DSSDBGF(format, ...) \
-+	if (dss_debug) \
-+		printk(KERN_DEBUG "omapdss: " \
-+				": %s(" format ")\n", \
-+				__func__, \
-+				## __VA_ARGS__)
-+#endif
-+
-+#else /* DEBUG */
-+#define DSSDBG(format, ...)
-+#define DSSDBGF(format, ...)
-+#endif
-+
-+
-+#ifdef DSS_SUBSYS_NAME
-+#define DSSERR(format, ...) \
-+	printk(KERN_ERR "omapdss " DSS_SUBSYS_NAME " error: " format, \
-+	## __VA_ARGS__)
-+#else
-+#define DSSERR(format, ...) \
-+	printk(KERN_ERR "omapdss error: " format, ## __VA_ARGS__)
-+#endif
-+
-+#ifdef DSS_SUBSYS_NAME
-+#define DSSINFO(format, ...) \
-+	printk(KERN_INFO "omapdss " DSS_SUBSYS_NAME ": " format, \
-+	## __VA_ARGS__)
-+#else
-+#define DSSINFO(format, ...) \
-+	printk(KERN_INFO "omapdss: " format, ## __VA_ARGS__)
-+#endif
-+
-+#ifdef DSS_SUBSYS_NAME
-+#define DSSWARN(format, ...) \
-+	printk(KERN_WARNING "omapdss " DSS_SUBSYS_NAME ": " format, \
-+	## __VA_ARGS__)
-+#else
-+#define DSSWARN(format, ...) \
-+	printk(KERN_WARNING "omapdss: " format, ## __VA_ARGS__)
-+#endif
-+
-+/* OMAP TRM gives bitfields as start:end, where start is the higher bit
-+   number. For example 7:0 */
-+#define FLD_MASK(start, end)	(((1 << (start - end + 1)) - 1) << (end))
-+#define FLD_VAL(val, start, end) (((val) << end) & FLD_MASK(start, end))
-+#define FLD_GET(val, start, end) (((val) & FLD_MASK(start, end)) >> (end))
-+#define FLD_MOD(orig, val, start, end) \
-+	(((orig) & ~FLD_MASK(start, end)) | FLD_VAL(val, start, end))
-+
-+#define DISPC_MAX_FCK 173000000
-+
-+enum omap_burst_size {
-+	OMAP_DSS_BURST_4x32 = 0,
-+	OMAP_DSS_BURST_8x32 = 1,
-+	OMAP_DSS_BURST_16x32 = 2,
-+};
-+
-+enum omap_parallel_interface_mode {
-+	OMAP_DSS_PARALLELMODE_BYPASS,		/* MIPI DPI */
-+	OMAP_DSS_PARALLELMODE_RFBI,		/* MIPI DBI */
-+	OMAP_DSS_PARALLELMODE_DSI,
-+};
-+
-+enum dss_clock {
-+	DSS_CLK_ICK	= 1 << 0,
-+	DSS_CLK_FCK1	= 1 << 1,
-+	DSS_CLK_FCK2	= 1 << 2,
-+	DSS_CLK_54M	= 1 << 3,
-+	DSS_CLK_96M	= 1 << 4,
-+};
-+
-+struct dispc_clock_info {
-+	/* rates that we get with dividers below */
-+	unsigned long fck;
-+	unsigned long lck;
-+	unsigned long pck;
-+
-+	/* dividers */
-+	u16 fck_div;
-+	u16 lck_div;
-+	u16 pck_div;
-+};
-+
-+struct dsi_clock_info {
-+	/* rates that we get with dividers below */
-+	unsigned long fint;
-+	unsigned long dsiphy;
-+	unsigned long clkin;
-+	unsigned long dsi1_pll_fclk;
-+	unsigned long dsi2_pll_fclk;
-+	unsigned long lck;
-+	unsigned long pck;
-+
-+	/* dividers */
-+	u16 regn;
-+	u16 regm;
-+	u16 regm3;
-+	u16 regm4;
-+
-+	u16 lck_div;
-+	u16 pck_div;
-+
-+	u8 highfreq;
-+	bool use_dss2_fck;
-+};
-+
-+struct seq_file;
-+struct platform_device;
-+
-+/* core */
-+void dss_clk_enable(enum dss_clock clks);
-+void dss_clk_disable(enum dss_clock clks);
-+unsigned long dss_clk_get_rate(enum dss_clock clk);
-+int dss_need_ctx_restore(void);
-+void dss_dump_clocks(struct seq_file *s);
-+struct bus_type *dss_get_bus(void);
-+
-+/* display */
-+int dss_suspend_all_devices(void);
-+int dss_resume_all_devices(void);
-+
-+void dss_init_device(struct platform_device *pdev,
-+		struct omap_dss_device *dssdev);
-+void dss_uninit_device(struct platform_device *pdev,
-+		struct omap_dss_device *dssdev);
-+bool dss_use_replication(struct omap_dss_device *dssdev,
-+		enum omap_color_mode mode);
-+void default_get_overlay_fifo_thresholds(enum omap_plane plane,
-+		u32 fifo_size, enum omap_burst_size *burst_size,
-+		u32 *fifo_low, u32 *fifo_high);
-+
-+/* manager */
-+int dss_init_overlay_managers(struct platform_device *pdev);
-+void dss_uninit_overlay_managers(struct platform_device *pdev);
-+int dss_mgr_wait_for_go_ovl(struct omap_overlay *ovl);
-+void dss_setup_partial_planes(struct omap_dss_device *dssdev,
-+				u16 *x, u16 *y, u16 *w, u16 *h);
-+void dss_start_update(struct omap_dss_device *dssdev);
-+
-+/* overlay */
-+void dss_init_overlays(struct platform_device *pdev);
-+void dss_uninit_overlays(struct platform_device *pdev);
-+int dss_check_overlay(struct omap_overlay *ovl, struct omap_dss_device *dssdev);
-+void dss_overlay_setup_dispc_manager(struct omap_overlay_manager *mgr);
-+#ifdef L4_EXAMPLE
-+void dss_overlay_setup_l4_manager(struct omap_overlay_manager *mgr);
-+#endif
-+void dss_recheck_connections(struct omap_dss_device *dssdev, bool force);
-+
-+/* DSS */
-+int dss_init(bool skip_init);
-+void dss_exit(void);
-+
-+void dss_save_context(void);
-+void dss_restore_context(void);
-+
-+void dss_dump_regs(struct seq_file *s);
-+
-+void dss_sdi_init(u8 datapairs);
-+void dss_sdi_enable(void);
-+void dss_sdi_disable(void);
-+
-+void dss_select_clk_source(bool dsi, bool dispc);
-+int dss_get_dsi_clk_source(void);
-+int dss_get_dispc_clk_source(void);
-+void dss_set_venc_output(enum omap_dss_venc_type type);
-+void dss_set_dac_pwrdn_bgz(bool enable);
-+
-+/* SDI */
-+int sdi_init(bool skip_init);
-+void sdi_exit(void);
-+int sdi_init_display(struct omap_dss_device *display);
-+
-+/* DSI */
-+int dsi_init(struct platform_device *pdev);
-+void dsi_exit(void);
-+
-+void dsi_dump_clocks(struct seq_file *s);
-+void dsi_dump_regs(struct seq_file *s);
-+
-+void dsi_save_context(void);
-+void dsi_restore_context(void);
-+
-+int dsi_init_display(struct omap_dss_device *display);
-+void dsi_irq_handler(void);
-+unsigned long dsi_get_dsi1_pll_rate(void);
-+unsigned long dsi_get_dsi2_pll_rate(void);
-+int dsi_pll_calc_pck(bool is_tft, unsigned long req_pck,
-+		struct dsi_clock_info *cinfo);
-+int dsi_pll_program(struct dsi_clock_info *cinfo);
-+int dsi_pll_init(bool enable_hsclk, bool enable_hsdiv);
-+void dsi_pll_uninit(void);
-+void dsi_get_overlay_fifo_thresholds(enum omap_plane plane,
-+		u32 fifo_size, enum omap_burst_size *burst_size,
-+		u32 *fifo_low, u32 *fifo_high);
-+
-+/* DPI */
-+int dpi_init(void);
-+void dpi_exit(void);
-+int dpi_init_display(struct omap_dss_device *dssdev);
-+
-+/* DISPC */
-+int dispc_init(void);
-+void dispc_exit(void);
-+void dispc_dump_clocks(struct seq_file *s);
-+void dispc_dump_regs(struct seq_file *s);
-+void dispc_irq_handler(void);
-+void dispc_fake_vsync_irq(void);
-+
-+void dispc_save_context(void);
-+void dispc_restore_context(void);
-+
-+void dispc_enable_sidle(void);
-+void dispc_disable_sidle(void);
-+
-+void dispc_lcd_enable_signal_polarity(bool act_high);
-+void dispc_lcd_enable_signal(bool enable);
-+void dispc_pck_free_enable(bool enable);
-+void dispc_enable_fifohandcheck(bool enable);
-+
-+void dispc_set_lcd_size(u16 width, u16 height);
-+void dispc_set_digit_size(u16 width, u16 height);
-+u32 dispc_get_plane_fifo_size(enum omap_plane plane);
-+void dispc_setup_plane_fifo(enum omap_plane plane, u32 low, u32 high);
-+void dispc_enable_fifomerge(bool enable);
-+void dispc_set_burst_size(enum omap_plane plane,
-+		enum omap_burst_size burst_size);
-+
-+void dispc_set_plane_ba0(enum omap_plane plane, u32 paddr);
-+void dispc_set_plane_ba1(enum omap_plane plane, u32 paddr);
-+void dispc_set_plane_pos(enum omap_plane plane, u16 x, u16 y);
-+void dispc_set_plane_size(enum omap_plane plane, u16 width, u16 height);
-+void dispc_set_channel_out(enum omap_plane plane,
-+		enum omap_channel channel_out);
-+
-+int dispc_setup_plane(enum omap_plane plane,
-+		      u32 paddr, u16 screen_width,
-+		      u16 pos_x, u16 pos_y,
-+		      u16 width, u16 height,
-+		      u16 out_width, u16 out_height,
-+		      enum omap_color_mode color_mode,
-+		      bool ilace,
-+		      enum omap_dss_rotation_type rotation_type,
-+		      u8 rotation, bool mirror,
-+		      u8 global_alpha);
-+
-+bool dispc_go_busy(enum omap_channel channel);
-+void dispc_go(enum omap_channel channel);
-+void dispc_enable_lcd_out(bool enable);
-+void dispc_enable_digit_out(bool enable);
-+int dispc_enable_plane(enum omap_plane plane, bool enable);
-+void dispc_enable_replication(enum omap_plane plane, bool enable);
-+
-+void dispc_set_parallel_interface_mode(enum omap_parallel_interface_mode mode);
-+void dispc_set_tft_data_lines(u8 data_lines);
-+void dispc_set_lcd_display_type(enum omap_lcd_display_type type);
-+void dispc_set_loadmode(enum omap_dss_load_mode mode);
-+
-+void dispc_set_default_color(enum omap_channel channel, u32 color);
-+u32 dispc_get_default_color(enum omap_channel channel);
-+void dispc_set_trans_key(enum omap_channel ch,
-+		enum omap_dss_trans_key_type type,
-+		u32 trans_key);
-+void dispc_get_trans_key(enum omap_channel ch,
-+		enum omap_dss_trans_key_type *type,
-+		u32 *trans_key);
-+void dispc_enable_trans_key(enum omap_channel ch, bool enable);
-+void dispc_enable_alpha_blending(enum omap_channel ch, bool enable);
-+bool dispc_trans_key_enabled(enum omap_channel ch);
-+bool dispc_alpha_blending_enabled(enum omap_channel ch);
-+
-+bool dispc_lcd_timings_ok(struct omap_video_timings *timings);
-+void dispc_set_lcd_timings(struct omap_video_timings *timings);
-+unsigned long dispc_fclk_rate(void);
-+unsigned long dispc_lclk_rate(void);
-+unsigned long dispc_pclk_rate(void);
-+void dispc_set_pol_freq(enum omap_panel_config config, u8 acbi, u8 acb);
-+void find_lck_pck_divs(bool is_tft, unsigned long req_pck, unsigned long fck,
-+		u16 *lck_div, u16 *pck_div);
-+int dispc_calc_clock_div(bool is_tft, unsigned long req_pck,
-+		struct dispc_clock_info *cinfo);
-+int dispc_set_clock_div(struct dispc_clock_info *cinfo);
-+int dispc_get_clock_div(struct dispc_clock_info *cinfo);
-+void dispc_set_lcd_divisor(u16 lck_div, u16 pck_div);
-+
-+
-+/* VENC */
-+int venc_init(struct platform_device *pdev);
-+void venc_exit(void);
-+void venc_dump_regs(struct seq_file *s);
-+int venc_init_display(struct omap_dss_device *display);
-+
-+/* RFBI */
-+int rfbi_init(void);
-+void rfbi_exit(void);
-+void rfbi_dump_regs(struct seq_file *s);
-+
-+int rfbi_configure(int rfbi_module, int bpp, int lines);
-+void rfbi_enable_rfbi(bool enable);
-+void rfbi_transfer_area(u16 width, u16 height,
-+			     void (callback)(void *data), void *data);
-+void rfbi_set_timings(int rfbi_module, struct rfbi_timings *t);
-+unsigned long rfbi_get_max_tx_rate(void);
-+int rfbi_init_display(struct omap_dss_device *display);
-+
-+#endif
---- /dev/null
-+++ b/drivers/video/omap2/dss/manager.c
-@@ -0,0 +1,1487 @@
-+/*
-+ * linux/drivers/video/omap2/dss/manager.c
-+ *
-+ * Copyright (C) 2009 Nokia Corporation
-+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
-+ *
-+ * Some code and ideas taken from drivers/video/omap/ driver
-+ * by Imre Deak.
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-+ * more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along with
-+ * this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#define DSS_SUBSYS_NAME "MANAGER"
-+
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/spinlock.h>
-+#include <linux/jiffies.h>
-+
-+#include <mach/display.h>
-+#include <mach/cpu.h>
-+
-+#include "dss.h"
-+
-+static int num_managers;
-+static struct list_head manager_list;
-+
-+static ssize_t manager_name_show(struct omap_overlay_manager *mgr, char *buf)
-+{
-+	return snprintf(buf, PAGE_SIZE, "%s\n", mgr->name);
-+}
-+
-+static ssize_t manager_display_show(struct omap_overlay_manager *mgr, char *buf)
-+{
-+	return snprintf(buf, PAGE_SIZE, "%s\n",
-+			mgr->device ? mgr->device->name : "<none>");
-+}
-+
-+static ssize_t manager_display_store(struct omap_overlay_manager *mgr,
-+		const char *buf, size_t size)
-+{
-+	int r = 0;
-+	size_t len = size;
-+	struct omap_dss_device *dssdev = NULL;
-+
-+	int match(struct omap_dss_device *dssdev, void *data)
-+	{
-+		const char *str = data;
-+		return sysfs_streq(dssdev->name, str);
-+	}
-+
-+	if (buf[size-1] == '\n')
-+		--len;
-+
-+	if (len > 0)
-+		dssdev = omap_dss_find_device((void *)buf, match);
-+
-+	if (len > 0 && dssdev == NULL)
-+		return -EINVAL;
-+
-+	if (dssdev)
-+		DSSDBG("display %s found\n", dssdev->name);
-+
-+	if (mgr->device) {
-+		r = mgr->unset_device(mgr);
-+		if (r) {
-+			DSSERR("failed to unset display\n");
-+			goto put_device;
-+		}
-+	}
-+
-+	if (dssdev) {
-+		r = mgr->set_device(mgr, dssdev);
-+		if (r) {
-+			DSSERR("failed to set manager\n");
-+			goto put_device;
-+		}
-+
-+		r = mgr->apply(mgr);
-+		if (r) {
-+			DSSERR("failed to apply dispc config\n");
-+			goto put_device;
-+		}
-+	}
-+
-+put_device:
-+	if (dssdev)
-+		omap_dss_put_device(dssdev);
-+
-+	return r ? r : size;
-+}
-+
-+static ssize_t manager_default_color_show(struct omap_overlay_manager *mgr,
-+					  char *buf)
-+{
-+	return snprintf(buf, PAGE_SIZE, "%d\n", mgr->info.default_color);
-+}
-+
-+static ssize_t manager_default_color_store(struct omap_overlay_manager *mgr,
-+					   const char *buf, size_t size)
-+{
-+	struct omap_overlay_manager_info info;
-+	u32 color;
-+	int r;
-+
-+	if (sscanf(buf, "%d", &color) != 1)
-+		return -EINVAL;
-+
-+	mgr->get_manager_info(mgr, &info);
-+
-+	info.default_color = color;
-+
-+	r = mgr->set_manager_info(mgr, &info);
-+	if (r)
-+		return r;
-+
-+	r = mgr->apply(mgr);
-+	if (r)
-+		return r;
-+
-+	return size;
-+}
-+
-+static const char *trans_key_type_str[] = {
-+	"gfx-destination",
-+	"video-source",
-+};
-+
-+static ssize_t manager_trans_key_type_show(struct omap_overlay_manager *mgr,
-+					   char *buf)
-+{
-+	enum omap_dss_trans_key_type key_type;
-+
-+	key_type = mgr->info.trans_key_type;
-+	BUG_ON(key_type >= ARRAY_SIZE(trans_key_type_str));
-+
-+	return snprintf(buf, PAGE_SIZE, "%s\n", trans_key_type_str[key_type]);
-+}
-+
-+static ssize_t manager_trans_key_type_store(struct omap_overlay_manager *mgr,
-+					    const char *buf, size_t size)
-+{
-+	enum omap_dss_trans_key_type key_type;
-+	struct omap_overlay_manager_info info;
-+	int r;
-+
-+	for (key_type = OMAP_DSS_COLOR_KEY_GFX_DST;
-+			key_type < ARRAY_SIZE(trans_key_type_str); key_type++) {
-+		if (sysfs_streq(buf, trans_key_type_str[key_type]))
-+			break;
-+	}
-+
-+	if (key_type == ARRAY_SIZE(trans_key_type_str))
-+		return -EINVAL;
-+
-+	mgr->get_manager_info(mgr, &info);
-+
-+	info.trans_key_type = key_type;
-+
-+	r = mgr->set_manager_info(mgr, &info);
-+	if (r)
-+		return r;
-+
-+	r = mgr->apply(mgr);
-+	if (r)
-+		return r;
-+
-+	return size;
-+}
-+
-+static ssize_t manager_trans_key_value_show(struct omap_overlay_manager *mgr,
-+					    char *buf)
-+{
-+	return snprintf(buf, PAGE_SIZE, "%d\n", mgr->info.trans_key);
-+}
-+
-+static ssize_t manager_trans_key_value_store(struct omap_overlay_manager *mgr,
-+					     const char *buf, size_t size)
-+{
-+	struct omap_overlay_manager_info info;
-+	u32 key_value;
-+	int r;
-+
-+	if (sscanf(buf, "%d", &key_value) != 1)
-+		return -EINVAL;
-+
-+	mgr->get_manager_info(mgr, &info);
-+
-+	info.trans_key = key_value;
-+
-+	r = mgr->set_manager_info(mgr, &info);
-+	if (r)
-+		return r;
-+
-+	r = mgr->apply(mgr);
-+	if (r)
-+		return r;
-+
-+	return size;
-+}
-+
-+static ssize_t manager_trans_key_enabled_show(struct omap_overlay_manager *mgr,
-+					      char *buf)
-+{
-+	return snprintf(buf, PAGE_SIZE, "%d\n", mgr->info.trans_enabled);
-+}
-+
-+static ssize_t manager_trans_key_enabled_store(struct omap_overlay_manager *mgr,
-+					       const char *buf, size_t size)
-+{
-+	struct omap_overlay_manager_info info;
-+	int enable;
-+	int r;
-+
-+	if (sscanf(buf, "%d", &enable) != 1)
-+		return -EINVAL;
-+
-+	mgr->get_manager_info(mgr, &info);
-+
-+	info.trans_enabled = enable ? true : false;
-+
-+	r = mgr->set_manager_info(mgr, &info);
-+	if (r)
-+		return r;
-+
-+	r = mgr->apply(mgr);
-+	if (r)
-+		return r;
-+
-+	return size;
-+}
-+
-+static ssize_t manager_alpha_blending_enabled_show(
-+		struct omap_overlay_manager *mgr, char *buf)
-+{
-+	return snprintf(buf, PAGE_SIZE, "%d\n", mgr->info.alpha_enabled);
-+}
-+
-+static ssize_t manager_alpha_blending_enabled_store(
-+		struct omap_overlay_manager *mgr,
-+		const char *buf, size_t size)
-+{
-+	struct omap_overlay_manager_info info;
-+	int enable;
-+	int r;
-+
-+	if (sscanf(buf, "%d", &enable) != 1)
-+		return -EINVAL;
-+
-+	mgr->get_manager_info(mgr, &info);
-+
-+	info.alpha_enabled = enable ? true : false;
-+
-+	r = mgr->set_manager_info(mgr, &info);
-+	if (r)
-+		return r;
-+
-+	r = mgr->apply(mgr);
-+	if (r)
-+		return r;
-+
-+	return size;
-+}
-+
-+struct manager_attribute {
-+	struct attribute attr;
-+	ssize_t (*show)(struct omap_overlay_manager *, char *);
-+	ssize_t	(*store)(struct omap_overlay_manager *, const char *, size_t);
-+};
-+
-+#define MANAGER_ATTR(_name, _mode, _show, _store) \
-+	struct manager_attribute manager_attr_##_name = \
-+	__ATTR(_name, _mode, _show, _store)
-+
-+static MANAGER_ATTR(name, S_IRUGO, manager_name_show, NULL);
-+static MANAGER_ATTR(display, S_IRUGO|S_IWUSR,
-+		manager_display_show, manager_display_store);
-+static MANAGER_ATTR(default_color, S_IRUGO|S_IWUSR,
-+		manager_default_color_show, manager_default_color_store);
-+static MANAGER_ATTR(trans_key_type, S_IRUGO|S_IWUSR,
-+		manager_trans_key_type_show, manager_trans_key_type_store);
-+static MANAGER_ATTR(trans_key_value, S_IRUGO|S_IWUSR,
-+		manager_trans_key_value_show, manager_trans_key_value_store);
-+static MANAGER_ATTR(trans_key_enabled, S_IRUGO|S_IWUSR,
-+		manager_trans_key_enabled_show,
-+		manager_trans_key_enabled_store);
-+static MANAGER_ATTR(alpha_blending_enabled, S_IRUGO|S_IWUSR,
-+		manager_alpha_blending_enabled_show,
-+		manager_alpha_blending_enabled_store);
-+
-+
-+static struct attribute *manager_sysfs_attrs[] = {
-+	&manager_attr_name.attr,
-+	&manager_attr_display.attr,
-+	&manager_attr_default_color.attr,
-+	&manager_attr_trans_key_type.attr,
-+	&manager_attr_trans_key_value.attr,
-+	&manager_attr_trans_key_enabled.attr,
-+	&manager_attr_alpha_blending_enabled.attr,
-+	NULL
-+};
-+
-+static ssize_t manager_attr_show(struct kobject *kobj, struct attribute *attr,
-+		char *buf)
-+{
-+	struct omap_overlay_manager *manager;
-+	struct manager_attribute *manager_attr;
-+
-+	manager = container_of(kobj, struct omap_overlay_manager, kobj);
-+	manager_attr = container_of(attr, struct manager_attribute, attr);
-+
-+	if (!manager_attr->show)
-+		return -ENOENT;
-+
-+	return manager_attr->show(manager, buf);
-+}
-+
-+static ssize_t manager_attr_store(struct kobject *kobj, struct attribute *attr,
-+		const char *buf, size_t size)
-+{
-+	struct omap_overlay_manager *manager;
-+	struct manager_attribute *manager_attr;
-+
-+	manager = container_of(kobj, struct omap_overlay_manager, kobj);
-+	manager_attr = container_of(attr, struct manager_attribute, attr);
-+
-+	if (!manager_attr->store)
-+		return -ENOENT;
-+
-+	return manager_attr->store(manager, buf, size);
-+}
-+
-+static struct sysfs_ops manager_sysfs_ops = {
-+	.show = manager_attr_show,
-+	.store = manager_attr_store,
-+};
-+
-+static struct kobj_type manager_ktype = {
-+	.sysfs_ops = &manager_sysfs_ops,
-+	.default_attrs = manager_sysfs_attrs,
-+};
-+
-+/*
-+ * We have 4 levels of cache for the dispc settings. First two are in SW and
-+ * the latter two in HW.
-+ *
-+ * +--------------------+
-+ * |overlay/manager_info|
-+ * +--------------------+
-+ *          v
-+ *        apply()
-+ *          v
-+ * +--------------------+
-+ * |     dss_cache      |
-+ * +--------------------+
-+ *          v
-+ *      configure()
-+ *          v
-+ * +--------------------+
-+ * |  shadow registers  |
-+ * +--------------------+
-+ *          v
-+ * VFP or lcd/digit_enable
-+ *          v
-+ * +--------------------+
-+ * |      registers     |
-+ * +--------------------+
-+ */
-+
-+struct overlay_cache_data {
-+	/* If true, cache changed, but not written to shadow registers. Set
-+	 * in apply(), cleared when registers written. */
-+	bool dirty;
-+	/* If true, shadow registers contain changed values not yet in real
-+	 * registers. Set when writing to shadow registers, cleared at
-+	 * VSYNC/EVSYNC */
-+	bool shadow_dirty;
-+
-+	bool enabled;
-+
-+	u32 paddr;
-+	void __iomem *vaddr;
-+	u16 screen_width;
-+	u16 width;
-+	u16 height;
-+	enum omap_color_mode color_mode;
-+	u8 rotation;
-+	enum omap_dss_rotation_type rotation_type;
-+	bool mirror;
-+
-+	u16 pos_x;
-+	u16 pos_y;
-+	u16 out_width;	/* if 0, out_width == width */
-+	u16 out_height;	/* if 0, out_height == height */
-+	u8 global_alpha;
-+
-+	enum omap_channel channel;
-+	bool replication;
-+	bool ilace;
-+
-+	enum omap_burst_size burst_size;
-+	u32 fifo_low;
-+	u32 fifo_high;
-+
-+	bool manual_update;
-+};
-+
-+struct manager_cache_data {
-+	/* If true, cache changed, but not written to shadow registers. Set
-+	 * in apply(), cleared when registers written. */
-+	bool dirty;
-+	/* If true, shadow registers contain changed values not yet in real
-+	 * registers. Set when writing to shadow registers, cleared at
-+	 * VSYNC/EVSYNC */
-+	bool shadow_dirty;
-+
-+	u32 default_color;
-+
-+	enum omap_dss_trans_key_type trans_key_type;
-+	u32 trans_key;
-+	bool trans_enabled;
-+
-+	bool alpha_enabled;
-+
-+	bool manual_upd_display;
-+	bool manual_update;
-+	bool do_manual_update;
-+
-+	/* manual update region */
-+	u16 x, y, w, h;
-+};
-+
-+static struct {
-+	spinlock_t lock;
-+	struct overlay_cache_data overlay_cache[3];
-+	struct manager_cache_data manager_cache[2];
-+
-+	bool irq_enabled;
-+} dss_cache;
-+
-+
-+
-+static int omap_dss_set_device(struct omap_overlay_manager *mgr,
-+		struct omap_dss_device *dssdev)
-+{
-+	int i;
-+	int r;
-+
-+	if (dssdev->manager) {
-+		DSSERR("display '%s' already has a manager '%s'\n",
-+			       dssdev->name, dssdev->manager->name);
-+		return -EINVAL;
-+	}
-+
-+	if ((mgr->supported_displays & dssdev->type) == 0) {
-+		DSSERR("display '%s' does not support manager '%s'\n",
-+			       dssdev->name, mgr->name);
-+		return -EINVAL;
-+	}
-+
-+	for (i = 0; i < mgr->num_overlays; i++) {
-+		struct omap_overlay *ovl = mgr->overlays[i];
-+
-+		if (ovl->manager != mgr || !ovl->info.enabled)
-+			continue;
-+
-+		r = dss_check_overlay(ovl, dssdev);
-+		if (r)
-+			return r;
-+	}
-+
-+	dssdev->manager = mgr;
-+	mgr->device = dssdev;
-+	mgr->device_changed = true;
-+
-+	return 0;
-+}
-+
-+static int omap_dss_unset_device(struct omap_overlay_manager *mgr)
-+{
-+	if (!mgr->device) {
-+		DSSERR("failed to unset display, display not set.\n");
-+		return -EINVAL;
-+	}
-+
-+	mgr->device->manager = NULL;
-+	mgr->device = NULL;
-+	mgr->device_changed = true;
-+
-+	return 0;
-+}
-+
-+static int dss_mgr_wait_for_go(struct omap_overlay_manager *mgr)
-+{
-+	unsigned long timeout = msecs_to_jiffies(500);
-+	struct manager_cache_data *mc;
-+	enum omap_channel channel;
-+	u32 irq;
-+	int r;
-+	int i;
-+
-+	if (!mgr->device)
-+		return 0;
-+
-+	if (mgr->device->type == OMAP_DISPLAY_TYPE_VENC) {
-+		irq = DISPC_IRQ_EVSYNC_ODD | DISPC_IRQ_EVSYNC_EVEN;
-+		channel = OMAP_DSS_CHANNEL_DIGIT;
-+	} else {
-+		if (mgr->device->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE) {
-+			enum omap_dss_update_mode mode;
-+			mode = mgr->device->get_update_mode(mgr->device);
-+			if (mode != OMAP_DSS_UPDATE_AUTO)
-+				return 0;
-+
-+			irq = DISPC_IRQ_FRAMEDONE;
-+		} else {
-+			irq = DISPC_IRQ_VSYNC;
-+		}
-+		channel = OMAP_DSS_CHANNEL_LCD;
-+	}
-+
-+	mc = &dss_cache.manager_cache[mgr->id];
-+	i = 0;
-+	while (1) {
-+		unsigned long flags;
-+		bool shadow_dirty, dirty;
-+
-+		spin_lock_irqsave(&dss_cache.lock, flags);
-+		dirty = mc->dirty;
-+		shadow_dirty = mc->shadow_dirty;
-+		spin_unlock_irqrestore(&dss_cache.lock, flags);
-+
-+		if (!dirty && !shadow_dirty) {
-+			r = 0;
-+			break;
-+		}
-+
-+		/* 4 iterations is the worst case:
-+		 * 1 - initial iteration, dirty = true (between VFP and VSYNC)
-+		 * 2 - first VSYNC, dirty = true
-+		 * 3 - dirty = false, shadow_dirty = true
-+		 * 4 - shadow_dirty = false */
-+		if (i++ == 3) {
-+			DSSERR("mgr(%d)->wait_for_go() not finishing\n",
-+					mgr->id);
-+			r = 0;
-+			break;
-+		}
-+
-+		r = omap_dispc_wait_for_irq_interruptible_timeout(irq, timeout);
-+		if (r == -ERESTARTSYS)
-+			break;
-+
-+		if (r) {
-+			DSSERR("mgr(%d)->wait_for_go() timeout\n", mgr->id);
-+			break;
-+		}
-+	}
-+
-+	return r;
-+}
-+
-+int dss_mgr_wait_for_go_ovl(struct omap_overlay *ovl)
-+{
-+	unsigned long timeout = msecs_to_jiffies(500);
-+	enum omap_channel channel;
-+	struct overlay_cache_data *oc;
-+	struct omap_dss_device *dssdev;
-+	u32 irq;
-+	int r;
-+	int i;
-+
-+	if (!ovl->manager || !ovl->manager->device)
-+		return 0;
-+
-+	dssdev = ovl->manager->device;
-+
-+	if (dssdev->type == OMAP_DISPLAY_TYPE_VENC) {
-+		irq = DISPC_IRQ_EVSYNC_ODD | DISPC_IRQ_EVSYNC_EVEN;
-+		channel = OMAP_DSS_CHANNEL_DIGIT;
-+	} else {
-+		if (dssdev->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE) {
-+			enum omap_dss_update_mode mode;
-+			mode = dssdev->get_update_mode(dssdev);
-+			if (mode != OMAP_DSS_UPDATE_AUTO)
-+				return 0;
-+
-+			irq = DISPC_IRQ_FRAMEDONE;
-+		} else {
-+			irq = DISPC_IRQ_VSYNC;
-+		}
-+		channel = OMAP_DSS_CHANNEL_LCD;
-+	}
-+
-+	oc = &dss_cache.overlay_cache[ovl->id];
-+	i = 0;
-+	while (1) {
-+		unsigned long flags;
-+		bool shadow_dirty, dirty;
-+
-+		spin_lock_irqsave(&dss_cache.lock, flags);
-+		dirty = oc->dirty;
-+		shadow_dirty = oc->shadow_dirty;
-+		spin_unlock_irqrestore(&dss_cache.lock, flags);
-+
-+		if (!dirty && !shadow_dirty) {
-+			r = 0;
-+			break;
-+		}
-+
-+		/* 4 iterations is the worst case:
-+		 * 1 - initial iteration, dirty = true (between VFP and VSYNC)
-+		 * 2 - first VSYNC, dirty = true
-+		 * 3 - dirty = false, shadow_dirty = true
-+		 * 4 - shadow_dirty = false */
-+		if (i++ == 3) {
-+			DSSERR("ovl(%d)->wait_for_go() not finishing\n",
-+					ovl->id);
-+			r = 0;
-+			break;
-+		}
-+
-+		r = omap_dispc_wait_for_irq_interruptible_timeout(irq, timeout);
-+		if (r == -ERESTARTSYS)
-+			break;
-+
-+		if (r) {
-+			DSSERR("ovl(%d)->wait_for_go() timeout\n", ovl->id);
-+			break;
-+		}
-+	}
-+
-+	return r;
-+}
-+
-+static int overlay_enabled(struct omap_overlay *ovl)
-+{
-+	return ovl->info.enabled && ovl->manager && ovl->manager->device;
-+}
-+
-+/* Is rect1 a subset of rect2? */
-+static bool rectangle_subset(int x1, int y1, int w1, int h1,
-+		int x2, int y2, int w2, int h2)
-+{
-+	if (x1 < x2 || y1 < y2)
-+		return false;
-+
-+	if (x1 + w1 > x2 + w2)
-+		return false;
-+
-+	if (y1 + h1 > y2 + h2)
-+		return false;
-+
-+	return true;
-+}
-+
-+/* Do rect1 and rect2 overlap? */
-+static bool rectangle_intersects(int x1, int y1, int w1, int h1,
-+		int x2, int y2, int w2, int h2)
-+{
-+	if (x1 >= x2 + w2)
-+		return false;
-+
-+	if (x2 >= x1 + w1)
-+		return false;
-+
-+	if (y1 >= y2 + h2)
-+		return false;
-+
-+	if (y2 >= y1 + h1)
-+		return false;
-+
-+	return true;
-+}
-+
-+static bool dispc_is_overlay_scaled(struct overlay_cache_data *oc)
-+{
-+	if (oc->out_width != 0 && oc->width != oc->out_width)
-+		return true;
-+
-+	if (oc->out_height != 0 && oc->height != oc->out_height)
-+		return true;
-+
-+	return false;
-+}
-+
-+static int configure_overlay(enum omap_plane plane)
-+{
-+	struct overlay_cache_data *c;
-+	struct manager_cache_data *mc;
-+	u16 outw, outh;
-+	u16 x, y, w, h;
-+	u32 paddr;
-+	int r;
-+
-+	DSSDBGF("%d", plane);
-+
-+	c = &dss_cache.overlay_cache[plane];
-+
-+	if (!c->enabled) {
-+		dispc_enable_plane(plane, 0);
-+		return 0;
-+	}
-+
-+	mc = &dss_cache.manager_cache[c->channel];
-+
-+	x = c->pos_x;
-+	y = c->pos_y;
-+	w = c->width;
-+	h = c->height;
-+	outw = c->out_width == 0 ? c->width : c->out_width;
-+	outh = c->out_height == 0 ? c->height : c->out_height;
-+	paddr = c->paddr;
-+
-+	if (c->manual_update && mc->do_manual_update) {
-+		unsigned bpp;
-+		/* If the overlay is outside the update region, disable it */
-+		if (!rectangle_intersects(mc->x, mc->y, mc->w, mc->h,
-+					x, y, outw, outh)) {
-+			dispc_enable_plane(plane, 0);
-+			return 0;
-+		}
-+
-+		switch (c->color_mode) {
-+		case OMAP_DSS_COLOR_RGB16:
-+		case OMAP_DSS_COLOR_ARGB16:
-+		case OMAP_DSS_COLOR_YUV2:
-+		case OMAP_DSS_COLOR_UYVY:
-+			bpp = 16;
-+			break;
-+
-+		case OMAP_DSS_COLOR_RGB24P:
-+			bpp = 24;
-+			break;
-+
-+		case OMAP_DSS_COLOR_RGB24U:
-+		case OMAP_DSS_COLOR_ARGB32:
-+		case OMAP_DSS_COLOR_RGBA32:
-+		case OMAP_DSS_COLOR_RGBX32:
-+			bpp = 32;
-+			break;
-+
-+		default:
-+			BUG();
-+		}
-+
-+		if (dispc_is_overlay_scaled(c)) {
-+			/* If the overlay is scaled, the update area has
-+			 * already been enlarged to cover the whole overlay. We
-+			 * only need to adjust x/y here */
-+			x = c->pos_x - mc->x;
-+			y = c->pos_y - mc->y;
-+		} else {
-+			if (mc->x > c->pos_x) {
-+				x = 0;
-+				w -= (mc->x - c->pos_x);
-+				paddr += (mc->x - c->pos_x) * bpp / 8;
-+			} else {
-+				x = c->pos_x - mc->x;
-+			}
-+
-+			if (mc->y > c->pos_y) {
-+				y = 0;
-+				h -= (mc->y - c->pos_y);
-+				paddr += (mc->y - c->pos_y) * c->screen_width *
-+					bpp / 8;
-+			} else {
-+				y = c->pos_y - mc->y;
-+			}
-+
-+			if (mc->w < (x+w))
-+				w -= (x+w) - (mc->w);
-+
-+			if (mc->h < (y+h))
-+				h -= (y+h) - (mc->h);
-+
-+			outw = w;
-+			outh = h;
-+		}
-+	}
-+
-+	r = dispc_setup_plane(plane,
-+			paddr,
-+			c->screen_width,
-+			x, y,
-+			w, h,
-+			outw, outh,
-+			c->color_mode,
-+			c->ilace,
-+			c->rotation_type,
-+			c->rotation,
-+			c->mirror,
-+			c->global_alpha);
-+
-+	if (r) {
-+		/* this shouldn't happen */
-+		DSSERR("dispc_setup_plane failed for ovl %d\n", plane);
-+		dispc_enable_plane(plane, 0);
-+		return r;
-+	}
-+
-+	dispc_enable_replication(plane, c->replication);
-+
-+	dispc_set_burst_size(plane, c->burst_size);
-+	dispc_setup_plane_fifo(plane, c->fifo_low, c->fifo_high);
-+
-+	dispc_enable_plane(plane, 1);
-+
-+	return 0;
-+}
-+
-+static void configure_manager(enum omap_channel channel)
-+{
-+	struct manager_cache_data *c;
-+
-+	DSSDBGF("%d", channel);
-+
-+	c = &dss_cache.manager_cache[channel];
-+
-+	dispc_set_trans_key(channel, c->trans_key_type, c->trans_key);
-+	dispc_enable_trans_key(channel, c->trans_enabled);
-+	dispc_enable_alpha_blending(channel, c->alpha_enabled);
-+}
-+
-+/* configure_dispc() tries to write values from cache to shadow registers.
-+ * It writes only to those managers/overlays that are not busy.
-+ * returns 0 if everything could be written to shadow registers.
-+ * returns 1 if not everything could be written to shadow registers. */
-+static int configure_dispc(void)
-+{
-+	struct overlay_cache_data *oc;
-+	struct manager_cache_data *mc;
-+	const int num_ovls = ARRAY_SIZE(dss_cache.overlay_cache);
-+	const int num_mgrs = ARRAY_SIZE(dss_cache.manager_cache);
-+	int i;
-+	int r;
-+	bool mgr_busy[2];
-+	bool mgr_go[2];
-+	bool busy;
-+
-+	r = 0;
-+	busy = false;
-+
-+	mgr_busy[0] = dispc_go_busy(0);
-+	mgr_busy[1] = dispc_go_busy(1);
-+	mgr_go[0] = false;
-+	mgr_go[1] = false;
-+
-+	/* Commit overlay settings */
-+	for (i = 0; i < num_ovls; ++i) {
-+		oc = &dss_cache.overlay_cache[i];
-+		mc = &dss_cache.manager_cache[oc->channel];
-+
-+		if (!oc->dirty)
-+			continue;
-+
-+		if (oc->manual_update && !mc->do_manual_update)
-+			continue;
-+
-+		if (mgr_busy[oc->channel]) {
-+			busy = true;
-+			continue;
-+		}
-+
-+		r = configure_overlay(i);
-+		if (r)
-+			DSSERR("configure_overlay %d failed\n", i);
-+
-+		oc->dirty = false;
-+		oc->shadow_dirty = true;
-+		mgr_go[oc->channel] = true;
-+	}
-+
-+	/* Commit manager settings */
-+	for (i = 0; i < num_mgrs; ++i) {
-+		mc = &dss_cache.manager_cache[i];
-+
-+		if (!mc->dirty)
-+			continue;
-+
-+		if (mc->manual_update && !mc->do_manual_update)
-+			continue;
-+
-+		if (mgr_busy[i]) {
-+			busy = true;
-+			continue;
-+		}
-+
-+		configure_manager(i);
-+		mc->dirty = false;
-+		mc->shadow_dirty = true;
-+		mgr_go[i] = true;
-+	}
-+
-+	/* set GO */
-+	for (i = 0; i < num_mgrs; ++i) {
-+		mc = &dss_cache.manager_cache[i];
-+
-+		if (!mgr_go[i])
-+			continue;
-+
-+		/* We don't need GO with manual update display. LCD iface will
-+		 * always be turned off after frame, and new settings will be
-+		 * taken in to use at next update */
-+		if (!mc->manual_upd_display)
-+			dispc_go(i);
-+	}
-+
-+	if (busy)
-+		r = 1;
-+	else
-+		r = 0;
-+
-+	return r;
-+}
-+
-+/* Configure dispc for partial update. Return possibly modified update
-+ * area */
-+void dss_setup_partial_planes(struct omap_dss_device *dssdev,
-+		u16 *xi, u16 *yi, u16 *wi, u16 *hi)
-+{
-+	struct overlay_cache_data *oc;
-+	struct manager_cache_data *mc;
-+	const int num_ovls = ARRAY_SIZE(dss_cache.overlay_cache);
-+	struct omap_overlay_manager *mgr;
-+	int i;
-+	u16 x, y, w, h;
-+	unsigned long flags;
-+
-+	x = *xi;
-+	y = *yi;
-+	w = *wi;
-+	h = *hi;
-+
-+	DSSDBG("dispc_setup_partial_planes %d,%d %dx%d\n",
-+		*xi, *yi, *wi, *hi);
-+
-+	mgr = dssdev->manager;
-+
-+	if (!mgr) {
-+		DSSDBG("no manager\n");
-+		return;
-+	}
-+
-+	spin_lock_irqsave(&dss_cache.lock, flags);
-+
-+	/* We need to show the whole overlay if it is scaled. So look for
-+	 * those, and make the update area larger if found.
-+	 * Also mark the overlay cache dirty */
-+	for (i = 0; i < num_ovls; ++i) {
-+		unsigned x1, y1, x2, y2;
-+		unsigned outw, outh;
-+
-+		oc = &dss_cache.overlay_cache[i];
-+
-+		if (oc->channel != mgr->id)
-+			continue;
-+
-+		oc->dirty = true;
-+
-+		if (!oc->enabled)
-+			continue;
-+
-+		if (!dispc_is_overlay_scaled(oc))
-+			continue;
-+
-+		outw = oc->out_width == 0 ? oc->width : oc->out_width;
-+		outh = oc->out_height == 0 ? oc->height : oc->out_height;
-+
-+		/* is the overlay outside the update region? */
-+		if (!rectangle_intersects(x, y, w, h,
-+					oc->pos_x, oc->pos_y,
-+					outw, outh))
-+			continue;
-+
-+		/* if the overlay totally inside the update region? */
-+		if (rectangle_subset(oc->pos_x, oc->pos_y, outw, outh,
-+					x, y, w, h))
-+			continue;
-+
-+		if (x > oc->pos_x)
-+			x1 = oc->pos_x;
-+		else
-+			x1 = x;
-+
-+		if (y > oc->pos_y)
-+			y1 = oc->pos_y;
-+		else
-+			y1 = y;
-+
-+		if ((x + w) < (oc->pos_x + outw))
-+			x2 = oc->pos_x + outw;
-+		else
-+			x2 = x + w;
-+
-+		if ((y + h) < (oc->pos_y + outh))
-+			y2 = oc->pos_y + outh;
-+		else
-+			y2 = y + h;
-+
-+		x = x1;
-+		y = y1;
-+		w = x2 - x1;
-+		h = y2 - y1;
-+
-+		DSSDBG("changing upd area due to ovl(%d) scaling %d,%d %dx%d\n",
-+				i, x, y, w, h);
-+	}
-+
-+	mc = &dss_cache.manager_cache[mgr->id];
-+	mc->do_manual_update = true;
-+	mc->x = x;
-+	mc->y = y;
-+	mc->w = w;
-+	mc->h = h;
-+
-+	configure_dispc();
-+
-+	mc->do_manual_update = false;
-+
-+	spin_unlock_irqrestore(&dss_cache.lock, flags);
-+
-+	*xi = x;
-+	*yi = y;
-+	*wi = w;
-+	*hi = h;
-+}
-+
-+void dss_start_update(struct omap_dss_device *dssdev)
-+{
-+	struct manager_cache_data *mc;
-+	struct overlay_cache_data *oc;
-+	const int num_ovls = ARRAY_SIZE(dss_cache.overlay_cache);
-+	const int num_mgrs = ARRAY_SIZE(dss_cache.manager_cache);
-+	struct omap_overlay_manager *mgr;
-+	int i;
-+
-+	mgr = dssdev->manager;
-+
-+	for (i = 0; i < num_ovls; ++i) {
-+		oc = &dss_cache.overlay_cache[i];
-+		if (oc->channel != mgr->id)
-+			continue;
-+
-+		oc->shadow_dirty = false;
-+	}
-+
-+	for (i = 0; i < num_mgrs; ++i) {
-+		mc = &dss_cache.manager_cache[i];
-+		if (mgr->id != i)
-+			continue;
-+
-+		mc->shadow_dirty = false;
-+	}
-+
-+	dispc_enable_lcd_out(1);
-+}
-+
-+static void dss_apply_irq_handler(void *data, u32 mask)
-+{
-+	struct manager_cache_data *mc;
-+	struct overlay_cache_data *oc;
-+	const int num_ovls = ARRAY_SIZE(dss_cache.overlay_cache);
-+	const int num_mgrs = ARRAY_SIZE(dss_cache.manager_cache);
-+	int i, r;
-+	bool mgr_busy[2];
-+
-+	mgr_busy[0] = dispc_go_busy(0);
-+	mgr_busy[1] = dispc_go_busy(1);
-+
-+	spin_lock(&dss_cache.lock);
-+
-+	for (i = 0; i < num_ovls; ++i) {
-+		oc = &dss_cache.overlay_cache[i];
-+		if (!mgr_busy[oc->channel])
-+			oc->shadow_dirty = false;
-+	}
-+
-+	for (i = 0; i < num_mgrs; ++i) {
-+		mc = &dss_cache.manager_cache[i];
-+		if (!mgr_busy[i])
-+			mc->shadow_dirty = false;
-+	}
-+
-+	r = configure_dispc();
-+	if (r == 1)
-+		goto end;
-+
-+	/* re-read busy flags */
-+	mgr_busy[0] = dispc_go_busy(0);
-+	mgr_busy[1] = dispc_go_busy(1);
-+
-+	/* keep running as long as there are busy managers, so that
-+	 * we can collect overlay-applied information */
-+	for (i = 0; i < num_mgrs; ++i) {
-+		if (mgr_busy[i])
-+			goto end;
-+	}
-+
-+	omap_dispc_unregister_isr(dss_apply_irq_handler, NULL,
-+			DISPC_IRQ_VSYNC	| DISPC_IRQ_EVSYNC_ODD |
-+			DISPC_IRQ_EVSYNC_EVEN);
-+	dss_cache.irq_enabled = false;
-+
-+end:
-+	spin_unlock(&dss_cache.lock);
-+}
-+
-+static int omap_dss_mgr_apply(struct omap_overlay_manager *mgr)
-+{
-+	struct overlay_cache_data *oc;
-+	struct manager_cache_data *mc;
-+	int i;
-+	struct omap_overlay *ovl;
-+	int num_planes_enabled = 0;
-+	bool use_fifomerge;
-+	unsigned long flags;
-+	int r;
-+
-+	DSSDBG("omap_dss_mgr_apply(%s)\n", mgr->name);
-+
-+	spin_lock_irqsave(&dss_cache.lock, flags);
-+
-+	/* Configure overlays */
-+	for (i = 0; i < omap_dss_get_num_overlays(); ++i) {
-+		struct omap_dss_device *dssdev;
-+
-+		ovl = omap_dss_get_overlay(i);
-+
-+		if (!(ovl->caps & OMAP_DSS_OVL_CAP_DISPC))
-+			continue;
-+
-+		oc = &dss_cache.overlay_cache[ovl->id];
-+
-+		if (!overlay_enabled(ovl)) {
-+			if (oc->enabled) {
-+				oc->enabled = false;
-+				oc->dirty = true;
-+			}
-+			continue;
-+		}
-+
-+		if (!ovl->info_dirty) {
-+			if (oc->enabled)
-+				++num_planes_enabled;
-+			continue;
-+		}
-+
-+		dssdev = ovl->manager->device;
-+
-+		if (dss_check_overlay(ovl, dssdev)) {
-+			if (oc->enabled) {
-+				oc->enabled = false;
-+				oc->dirty = true;
-+			}
-+			continue;
-+		}
-+
-+		ovl->info_dirty = false;
-+		oc->dirty = true;
-+
-+		oc->paddr = ovl->info.paddr;
-+		oc->vaddr = ovl->info.vaddr;
-+		oc->screen_width = ovl->info.screen_width;
-+		oc->width = ovl->info.width;
-+		oc->height = ovl->info.height;
-+		oc->color_mode = ovl->info.color_mode;
-+		oc->rotation = ovl->info.rotation;
-+		oc->rotation_type = ovl->info.rotation_type;
-+		oc->mirror = ovl->info.mirror;
-+		oc->pos_x = ovl->info.pos_x;
-+		oc->pos_y = ovl->info.pos_y;
-+		oc->out_width = ovl->info.out_width;
-+		oc->out_height = ovl->info.out_height;
-+		oc->global_alpha = ovl->info.global_alpha;
-+
-+		oc->replication =
-+			dss_use_replication(dssdev, ovl->info.color_mode);
-+
-+		oc->ilace = dssdev->type == OMAP_DISPLAY_TYPE_VENC;
-+
-+		oc->channel = ovl->manager->id;
-+
-+		oc->enabled = true;
-+
-+		oc->manual_update =
-+			dssdev->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE &&
-+			dssdev->get_update_mode(dssdev) != OMAP_DSS_UPDATE_AUTO;
-+
-+		++num_planes_enabled;
-+	}
-+
-+	/* Configure managers */
-+	list_for_each_entry(mgr, &manager_list, list) {
-+		struct omap_dss_device *dssdev;
-+
-+		if (!(mgr->caps & OMAP_DSS_OVL_MGR_CAP_DISPC))
-+			continue;
-+
-+		mc = &dss_cache.manager_cache[mgr->id];
-+
-+		if (mgr->device_changed) {
-+			mgr->device_changed = false;
-+			mgr->info_dirty  = true;
-+		}
-+
-+		if (!mgr->info_dirty)
-+			continue;
-+
-+		if (!mgr->device)
-+			continue;
-+
-+		dssdev = mgr->device;
-+
-+		mgr->info_dirty = false;
-+		mc->dirty = true;
-+
-+		mc->default_color = mgr->info.default_color;
-+		mc->trans_key_type = mgr->info.trans_key_type;
-+		mc->trans_key = mgr->info.trans_key;
-+		mc->trans_enabled = mgr->info.trans_enabled;
-+		mc->alpha_enabled = mgr->info.alpha_enabled;
-+
-+		mc->manual_upd_display =
-+			dssdev->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE;
-+
-+		mc->manual_update =
-+			dssdev->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE &&
-+			dssdev->get_update_mode(dssdev) != OMAP_DSS_UPDATE_AUTO;
-+	}
-+
-+	/* XXX TODO: Try to get fifomerge working. The problem is that it
-+	 * affects both managers, not individually but at the same time. This
-+	 * means the change has to be well synchronized. I guess the proper way
-+	 * is to have a two step process for fifo merge:
-+	 *        fifomerge enable:
-+	 *             1. disable other planes, leaving one plane enabled
-+	 *             2. wait until the planes are disabled on HW
-+	 *             3. config merged fifo thresholds, enable fifomerge
-+	 *        fifomerge disable:
-+	 *             1. config unmerged fifo thresholds, disable fifomerge
-+	 *             2. wait until fifo changes are in HW
-+	 *             3. enable planes
-+	 */
-+	use_fifomerge = false;
-+
-+	/* Configure overlay fifos */
-+	for (i = 0; i < omap_dss_get_num_overlays(); ++i) {
-+		struct omap_dss_device *dssdev;
-+		u32 size;
-+
-+		ovl = omap_dss_get_overlay(i);
-+
-+		if (!(ovl->caps & OMAP_DSS_OVL_CAP_DISPC))
-+			continue;
-+
-+		oc = &dss_cache.overlay_cache[ovl->id];
-+
-+		if (!oc->enabled)
-+			continue;
-+
-+		dssdev = ovl->manager->device;
-+
-+		size = dispc_get_plane_fifo_size(ovl->id);
-+		if (use_fifomerge)
-+			size *= 3;
-+
-+		switch (dssdev->type) {
-+		case OMAP_DISPLAY_TYPE_DPI:
-+		case OMAP_DISPLAY_TYPE_DBI:
-+		case OMAP_DISPLAY_TYPE_SDI:
-+		case OMAP_DISPLAY_TYPE_VENC:
-+			default_get_overlay_fifo_thresholds(ovl->id, size,
-+					&oc->burst_size, &oc->fifo_low,
-+					&oc->fifo_high);
-+			break;
-+#ifdef CONFIG_OMAP2_DSS_DSI
-+		case OMAP_DISPLAY_TYPE_DSI:
-+			dsi_get_overlay_fifo_thresholds(ovl->id, size,
-+					&oc->burst_size, &oc->fifo_low,
-+					&oc->fifo_high);
-+			break;
-+#endif
-+		default:
-+			BUG();
-+		}
-+	}
-+
-+	r = 0;
-+	dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1);
-+	if (!dss_cache.irq_enabled) {
-+		r = omap_dispc_register_isr(dss_apply_irq_handler, NULL,
-+				DISPC_IRQ_VSYNC	| DISPC_IRQ_EVSYNC_ODD |
-+				DISPC_IRQ_EVSYNC_EVEN);
-+		dss_cache.irq_enabled = true;
-+	}
-+	configure_dispc();
-+	dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
-+
-+	spin_unlock_irqrestore(&dss_cache.lock, flags);
-+
-+	return r;
-+}
-+
-+static int dss_check_manager(struct omap_overlay_manager *mgr)
-+{
-+	/* OMAP supports only graphics source transparency color key and alpha
-+	 * blending simultaneously. See TRM 15.4.2.4.2.2 Alpha Mode */
-+
-+	if (mgr->info.alpha_enabled && mgr->info.trans_enabled &&
-+			mgr->info.trans_key_type != OMAP_DSS_COLOR_KEY_GFX_DST)
-+		return -EINVAL;
-+
-+	return 0;
-+}
-+
-+static int omap_dss_mgr_set_info(struct omap_overlay_manager *mgr,
-+		struct omap_overlay_manager_info *info)
-+{
-+	int r;
-+	struct omap_overlay_manager_info old_info;
-+
-+	old_info = mgr->info;
-+	mgr->info = *info;
-+
-+	r = dss_check_manager(mgr);
-+	if (r) {
-+		mgr->info = old_info;
-+		return r;
-+	}
-+
-+	mgr->info_dirty = true;
-+
-+	return 0;
-+}
-+
-+static void omap_dss_mgr_get_info(struct omap_overlay_manager *mgr,
-+		struct omap_overlay_manager_info *info)
-+{
-+	*info = mgr->info;
-+}
-+
-+static void omap_dss_add_overlay_manager(struct omap_overlay_manager *manager)
-+{
-+	++num_managers;
-+	list_add_tail(&manager->list, &manager_list);
-+}
-+
-+int dss_init_overlay_managers(struct platform_device *pdev)
-+{
-+	int i, r;
-+
-+	spin_lock_init(&dss_cache.lock);
-+
-+	INIT_LIST_HEAD(&manager_list);
-+
-+	num_managers = 0;
-+
-+	for (i = 0; i < 2; ++i) {
-+		struct omap_overlay_manager *mgr;
-+		mgr = kzalloc(sizeof(*mgr), GFP_KERNEL);
-+
-+		BUG_ON(mgr == NULL);
-+
-+		switch (i) {
-+		case 0:
-+			mgr->name = "lcd";
-+			mgr->id = OMAP_DSS_CHANNEL_LCD;
-+			mgr->supported_displays =
-+				OMAP_DISPLAY_TYPE_DPI | OMAP_DISPLAY_TYPE_DBI |
-+				OMAP_DISPLAY_TYPE_SDI | OMAP_DISPLAY_TYPE_DSI;
-+			break;
-+		case 1:
-+			mgr->name = "tv";
-+			mgr->id = OMAP_DSS_CHANNEL_DIGIT;
-+			mgr->supported_displays = OMAP_DISPLAY_TYPE_VENC;
-+			break;
-+		}
-+
-+		mgr->set_device = &omap_dss_set_device;
-+		mgr->unset_device = &omap_dss_unset_device;
-+		mgr->apply = &omap_dss_mgr_apply;
-+		mgr->set_manager_info = &omap_dss_mgr_set_info;
-+		mgr->get_manager_info = &omap_dss_mgr_get_info;
-+		mgr->wait_for_go = &dss_mgr_wait_for_go;
-+
-+		mgr->caps = OMAP_DSS_OVL_MGR_CAP_DISPC;
-+
-+		dss_overlay_setup_dispc_manager(mgr);
-+
-+		omap_dss_add_overlay_manager(mgr);
-+
-+		r = kobject_init_and_add(&mgr->kobj, &manager_ktype,
-+				&pdev->dev.kobj, "manager%d", i);
-+
-+		if (r) {
-+			DSSERR("failed to create sysfs file\n");
-+			continue;
-+		}
-+	}
-+
-+#ifdef L4_EXAMPLE
-+	{
-+		int omap_dss_mgr_apply_l4(struct omap_overlay_manager *mgr)
-+		{
-+			DSSDBG("omap_dss_mgr_apply_l4(%s)\n", mgr->name);
-+
-+			return 0;
-+		}
-+
-+		struct omap_overlay_manager *mgr;
-+		mgr = kzalloc(sizeof(*mgr), GFP_KERNEL);
-+
-+		BUG_ON(mgr == NULL);
-+
-+		mgr->name = "l4";
-+		mgr->supported_displays =
-+			OMAP_DISPLAY_TYPE_DBI | OMAP_DISPLAY_TYPE_DSI;
-+
-+		mgr->set_device = &omap_dss_set_device;
-+		mgr->unset_device = &omap_dss_unset_device;
-+		mgr->apply = &omap_dss_mgr_apply_l4;
-+		mgr->set_manager_info = &omap_dss_mgr_set_info;
-+		mgr->get_manager_info = &omap_dss_mgr_get_info;
-+
-+		dss_overlay_setup_l4_manager(mgr);
-+
-+		omap_dss_add_overlay_manager(mgr);
-+
-+		r = kobject_init_and_add(&mgr->kobj, &manager_ktype,
-+				&pdev->dev.kobj, "managerl4");
-+
-+		if (r)
-+			DSSERR("failed to create sysfs file\n");
-+	}
-+#endif
-+
-+	return 0;
-+}
-+
-+void dss_uninit_overlay_managers(struct platform_device *pdev)
-+{
-+	struct omap_overlay_manager *mgr;
-+
-+	while (!list_empty(&manager_list)) {
-+		mgr = list_first_entry(&manager_list,
-+				struct omap_overlay_manager, list);
-+		list_del(&mgr->list);
-+		kobject_del(&mgr->kobj);
-+		kobject_put(&mgr->kobj);
-+		kfree(mgr);
-+	}
-+
-+	num_managers = 0;
-+}
-+
-+int omap_dss_get_num_overlay_managers(void)
-+{
-+	return num_managers;
-+}
-+EXPORT_SYMBOL(omap_dss_get_num_overlay_managers);
-+
-+struct omap_overlay_manager *omap_dss_get_overlay_manager(int num)
-+{
-+	int i = 0;
-+	struct omap_overlay_manager *mgr;
-+
-+	list_for_each_entry(mgr, &manager_list, list) {
-+		if (i++ == num)
-+			return mgr;
-+	}
-+
-+	return NULL;
-+}
-+EXPORT_SYMBOL(omap_dss_get_overlay_manager);
-+
---- /dev/null
-+++ b/drivers/video/omap2/dss/overlay.c
-@@ -0,0 +1,673 @@
-+/*
-+ * linux/drivers/video/omap2/dss/overlay.c
-+ *
-+ * Copyright (C) 2009 Nokia Corporation
-+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
-+ *
-+ * Some code and ideas taken from drivers/video/omap/ driver
-+ * by Imre Deak.
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-+ * more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along with
-+ * this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#define DSS_SUBSYS_NAME "OVERLAY"
-+
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/err.h>
-+#include <linux/sysfs.h>
-+#include <linux/kobject.h>
-+#include <linux/platform_device.h>
-+#include <linux/delay.h>
-+
-+#include <mach/display.h>
-+
-+#include "dss.h"
-+
-+static int num_overlays;
-+static struct list_head overlay_list;
-+
-+static ssize_t overlay_name_show(struct omap_overlay *ovl, char *buf)
-+{
-+	return snprintf(buf, PAGE_SIZE, "%s\n", ovl->name);
-+}
-+
-+static ssize_t overlay_manager_show(struct omap_overlay *ovl, char *buf)
-+{
-+	return snprintf(buf, PAGE_SIZE, "%s\n",
-+			ovl->manager ? ovl->manager->name : "<none>");
-+}
-+
-+static ssize_t overlay_manager_store(struct omap_overlay *ovl, const char *buf,
-+		size_t size)
-+{
-+	int i, r;
-+	struct omap_overlay_manager *mgr = NULL;
-+	struct omap_overlay_manager *old_mgr;
-+	int len = size;
-+
-+	if (buf[size-1] == '\n')
-+		--len;
-+
-+	if (len > 0) {
-+		for (i = 0; i < omap_dss_get_num_overlay_managers(); ++i) {
-+			mgr = omap_dss_get_overlay_manager(i);
-+
-+			if (strncmp(buf, mgr->name, len) == 0)
-+				break;
-+
-+			mgr = NULL;
-+		}
-+	}
-+
-+	if (len > 0 && mgr == NULL)
-+		return -EINVAL;
-+
-+	if (mgr)
-+		DSSDBG("manager %s found\n", mgr->name);
-+
-+	if (mgr == ovl->manager)
-+		return size;
-+
-+	old_mgr = ovl->manager;
-+
-+	/* detach old manager */
-+	if (old_mgr) {
-+		r = ovl->unset_manager(ovl);
-+		if (r) {
-+			DSSERR("detach failed\n");
-+			return r;
-+		}
-+
-+		r = old_mgr->apply(old_mgr);
-+		if (r)
-+			return r;
-+	}
-+
-+	if (mgr) {
-+		r = ovl->set_manager(ovl, mgr);
-+		if (r) {
-+			DSSERR("Failed to attach overlay\n");
-+			return r;
-+		}
-+
-+		r = mgr->apply(mgr);
-+		if (r)
-+			return r;
-+	}
-+
-+	return size;
-+}
-+
-+static ssize_t overlay_input_size_show(struct omap_overlay *ovl, char *buf)
-+{
-+	return snprintf(buf, PAGE_SIZE, "%d,%d\n",
-+			ovl->info.width, ovl->info.height);
-+}
-+
-+static ssize_t overlay_screen_width_show(struct omap_overlay *ovl, char *buf)
-+{
-+	return snprintf(buf, PAGE_SIZE, "%d\n", ovl->info.screen_width);
-+}
-+
-+static ssize_t overlay_position_show(struct omap_overlay *ovl, char *buf)
-+{
-+	return snprintf(buf, PAGE_SIZE, "%d,%d\n",
-+			ovl->info.pos_x, ovl->info.pos_y);
-+}
-+
-+static ssize_t overlay_position_store(struct omap_overlay *ovl,
-+		const char *buf, size_t size)
-+{
-+	int r;
-+	char *last;
-+	struct omap_overlay_info info;
-+
-+	ovl->get_overlay_info(ovl, &info);
-+
-+	info.pos_x = simple_strtoul(buf, &last, 10);
-+	++last;
-+	if (last - buf >= size)
-+		return -EINVAL;
-+
-+	info.pos_y = simple_strtoul(last, &last, 10);
-+
-+	r = ovl->set_overlay_info(ovl, &info);
-+	if (r)
-+		return r;
-+
-+	if (ovl->manager) {
-+		r = ovl->manager->apply(ovl->manager);
-+		if (r)
-+			return r;
-+	}
-+
-+	return size;
-+}
-+
-+static ssize_t overlay_output_size_show(struct omap_overlay *ovl, char *buf)
-+{
-+	return snprintf(buf, PAGE_SIZE, "%d,%d\n",
-+			ovl->info.out_width, ovl->info.out_height);
-+}
-+
-+static ssize_t overlay_output_size_store(struct omap_overlay *ovl,
-+		const char *buf, size_t size)
-+{
-+	int r;
-+	char *last;
-+	struct omap_overlay_info info;
-+
-+	ovl->get_overlay_info(ovl, &info);
-+
-+	info.out_width = simple_strtoul(buf, &last, 10);
-+	++last;
-+	if (last - buf >= size)
-+		return -EINVAL;
-+
-+	info.out_height = simple_strtoul(last, &last, 10);
-+
-+	r = ovl->set_overlay_info(ovl, &info);
-+	if (r)
-+		return r;
-+
-+	if (ovl->manager) {
-+		r = ovl->manager->apply(ovl->manager);
-+		if (r)
-+			return r;
-+	}
-+
-+	return size;
-+}
-+
-+static ssize_t overlay_enabled_show(struct omap_overlay *ovl, char *buf)
-+{
-+	return snprintf(buf, PAGE_SIZE, "%d\n", ovl->info.enabled);
-+}
-+
-+static ssize_t overlay_enabled_store(struct omap_overlay *ovl, const char *buf,
-+		size_t size)
-+{
-+	int r;
-+	struct omap_overlay_info info;
-+
-+	ovl->get_overlay_info(ovl, &info);
-+
-+	info.enabled = simple_strtoul(buf, NULL, 10);
-+
-+	r = ovl->set_overlay_info(ovl, &info);
-+	if (r)
-+		return r;
-+
-+	if (ovl->manager) {
-+		r = ovl->manager->apply(ovl->manager);
-+		if (r)
-+			return r;
-+	}
-+
-+	return size;
-+}
-+
-+static ssize_t overlay_global_alpha_show(struct omap_overlay *ovl, char *buf)
-+{
-+	return snprintf(buf, PAGE_SIZE, "%d\n",
-+			ovl->info.global_alpha);
-+}
-+
-+static ssize_t overlay_global_alpha_store(struct omap_overlay *ovl,
-+		const char *buf, size_t size)
-+{
-+	int r;
-+	struct omap_overlay_info info;
-+
-+	ovl->get_overlay_info(ovl, &info);
-+
-+	/* Video1 plane does not support global alpha
-+	 * to always make it 255 completely opaque
-+	 */
-+	if (ovl->id == OMAP_DSS_VIDEO1)
-+		info.global_alpha = 255;
-+	else
-+		info.global_alpha = simple_strtoul(buf, NULL, 10);
-+
-+	r = ovl->set_overlay_info(ovl, &info);
-+	if (r)
-+		return r;
-+
-+	if (ovl->manager) {
-+		r = ovl->manager->apply(ovl->manager);
-+		if (r)
-+			return r;
-+	}
-+
-+	return size;
-+}
-+
-+struct overlay_attribute {
-+	struct attribute attr;
-+	ssize_t (*show)(struct omap_overlay *, char *);
-+	ssize_t	(*store)(struct omap_overlay *, const char *, size_t);
-+};
-+
-+#define OVERLAY_ATTR(_name, _mode, _show, _store) \
-+	struct overlay_attribute overlay_attr_##_name = \
-+	__ATTR(_name, _mode, _show, _store)
-+
-+static OVERLAY_ATTR(name, S_IRUGO, overlay_name_show, NULL);
-+static OVERLAY_ATTR(manager, S_IRUGO|S_IWUSR,
-+		overlay_manager_show, overlay_manager_store);
-+static OVERLAY_ATTR(input_size, S_IRUGO, overlay_input_size_show, NULL);
-+static OVERLAY_ATTR(screen_width, S_IRUGO, overlay_screen_width_show, NULL);
-+static OVERLAY_ATTR(position, S_IRUGO|S_IWUSR,
-+		overlay_position_show, overlay_position_store);
-+static OVERLAY_ATTR(output_size, S_IRUGO|S_IWUSR,
-+		overlay_output_size_show, overlay_output_size_store);
-+static OVERLAY_ATTR(enabled, S_IRUGO|S_IWUSR,
-+		overlay_enabled_show, overlay_enabled_store);
-+static OVERLAY_ATTR(global_alpha, S_IRUGO|S_IWUSR,
-+		overlay_global_alpha_show, overlay_global_alpha_store);
-+
-+static struct attribute *overlay_sysfs_attrs[] = {
-+	&overlay_attr_name.attr,
-+	&overlay_attr_manager.attr,
-+	&overlay_attr_input_size.attr,
-+	&overlay_attr_screen_width.attr,
-+	&overlay_attr_position.attr,
-+	&overlay_attr_output_size.attr,
-+	&overlay_attr_enabled.attr,
-+	&overlay_attr_global_alpha.attr,
-+	NULL
-+};
-+
-+static ssize_t overlay_attr_show(struct kobject *kobj, struct attribute *attr,
-+		char *buf)
-+{
-+	struct omap_overlay *overlay;
-+	struct overlay_attribute *overlay_attr;
-+
-+	overlay = container_of(kobj, struct omap_overlay, kobj);
-+	overlay_attr = container_of(attr, struct overlay_attribute, attr);
-+
-+	if (!overlay_attr->show)
-+		return -ENOENT;
-+
-+	return overlay_attr->show(overlay, buf);
-+}
-+
-+static ssize_t overlay_attr_store(struct kobject *kobj, struct attribute *attr,
-+		const char *buf, size_t size)
-+{
-+	struct omap_overlay *overlay;
-+	struct overlay_attribute *overlay_attr;
-+
-+	overlay = container_of(kobj, struct omap_overlay, kobj);
-+	overlay_attr = container_of(attr, struct overlay_attribute, attr);
-+
-+	if (!overlay_attr->store)
-+		return -ENOENT;
-+
-+	return overlay_attr->store(overlay, buf, size);
-+}
-+
-+static struct sysfs_ops overlay_sysfs_ops = {
-+	.show = overlay_attr_show,
-+	.store = overlay_attr_store,
-+};
-+
-+static struct kobj_type overlay_ktype = {
-+	.sysfs_ops = &overlay_sysfs_ops,
-+	.default_attrs = overlay_sysfs_attrs,
-+};
-+
-+/* Check if overlay parameters are compatible with display */
-+int dss_check_overlay(struct omap_overlay *ovl, struct omap_dss_device *dssdev)
-+{
-+	struct omap_overlay_info *info;
-+	u16 outw, outh;
-+	u16 dw, dh;
-+
-+	if (!dssdev)
-+		return 0;
-+
-+	if (!ovl->info.enabled)
-+		return 0;
-+
-+	info = &ovl->info;
-+
-+	if (info->paddr == 0) {
-+		DSSDBG("check_overlay failed: paddr 0\n");
-+		return -EINVAL;
-+	}
-+
-+	dssdev->get_resolution(dssdev, &dw, &dh);
-+
-+	DSSDBG("check_overlay %d: (%d,%d %dx%d -> %dx%d) disp (%dx%d)\n",
-+			ovl->id,
-+			info->pos_x, info->pos_y,
-+			info->width, info->height,
-+			info->out_width, info->out_height,
-+			dw, dh);
-+
-+	if ((ovl->caps & OMAP_DSS_OVL_CAP_SCALE) == 0) {
-+		outw = info->width;
-+		outh = info->height;
-+	} else {
-+		if (info->out_width == 0)
-+			outw = info->width;
-+		else
-+			outw = info->out_width;
-+
-+		if (info->out_height == 0)
-+			outh = info->height;
-+		else
-+			outh = info->out_height;
-+	}
-+
-+	if (dw < info->pos_x + outw) {
-+		DSSDBG("check_overlay failed 1: %d < %d + %d\n",
-+				dw, info->pos_x, outw);
-+		return -EINVAL;
-+	}
-+
-+	if (dh < info->pos_y + outh) {
-+		DSSDBG("check_overlay failed 2: %d < %d + %d\n",
-+				dh, info->pos_y, outh);
-+		return -EINVAL;
-+	}
-+
-+	if ((ovl->supported_modes & info->color_mode) == 0) {
-+		DSSERR("overlay doesn't support mode %d\n", info->color_mode);
-+		return -EINVAL;
-+	}
-+
-+	return 0;
-+}
-+
-+static int dss_ovl_set_overlay_info(struct omap_overlay *ovl,
-+		struct omap_overlay_info *info)
-+{
-+	int r;
-+	struct omap_overlay_info old_info;
-+
-+	old_info = ovl->info;
-+	ovl->info = *info;
-+
-+	if (ovl->manager) {
-+		r = dss_check_overlay(ovl, ovl->manager->device);
-+		if (r) {
-+			ovl->info = old_info;
-+			return r;
-+		}
-+	}
-+
-+	ovl->info_dirty = true;
-+
-+	return 0;
-+}
-+
-+static void dss_ovl_get_overlay_info(struct omap_overlay *ovl,
-+		struct omap_overlay_info *info)
-+{
-+	*info = ovl->info;
-+}
-+
-+static int dss_ovl_wait_for_go(struct omap_overlay *ovl)
-+{
-+	return dss_mgr_wait_for_go_ovl(ovl);
-+}
-+
-+static int omap_dss_set_manager(struct omap_overlay *ovl,
-+		struct omap_overlay_manager *mgr)
-+{
-+	if (!mgr)
-+		return -EINVAL;
-+
-+	if (ovl->manager) {
-+		DSSERR("overlay '%s' already has a manager '%s'\n",
-+				ovl->name, ovl->manager->name);
-+		return -EINVAL;
-+	}
-+
-+	if (ovl->info.enabled) {
-+		DSSERR("overlay has to be disabled to change the manager\n");
-+		return -EINVAL;
-+	}
-+
-+	ovl->manager = mgr;
-+
-+	dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1);
-+	/* XXX: on manual update display, in auto update mode, a bug happens
-+	 * here. When an overlay is first enabled on LCD, then it's disabled,
-+	 * and the manager is changed to TV, we sometimes get SYNC_LOST_DIGIT
-+	 * errors. Waiting before changing the channel_out fixes it. I'm
-+	 * guessing that the overlay is still somehow being used for the LCD,
-+	 * but I don't understand how or why. */
-+	msleep(40);
-+	dispc_set_channel_out(ovl->id, mgr->id);
-+	dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
-+
-+	return 0;
-+}
-+
-+static int omap_dss_unset_manager(struct omap_overlay *ovl)
-+{
-+	int r;
-+
-+	if (!ovl->manager) {
-+		DSSERR("failed to detach overlay: manager not set\n");
-+		return -EINVAL;
-+	}
-+
-+	if (ovl->info.enabled) {
-+		DSSERR("overlay has to be disabled to unset the manager\n");
-+		return -EINVAL;
-+	}
-+
-+	r = ovl->wait_for_go(ovl);
-+	if (r)
-+		return r;
-+
-+	ovl->manager = NULL;
-+
-+	return 0;
-+}
-+
-+int omap_dss_get_num_overlays(void)
-+{
-+	return num_overlays;
-+}
-+EXPORT_SYMBOL(omap_dss_get_num_overlays);
-+
-+struct omap_overlay *omap_dss_get_overlay(int num)
-+{
-+	int i = 0;
-+	struct omap_overlay *ovl;
-+
-+	list_for_each_entry(ovl, &overlay_list, list) {
-+		if (i++ == num)
-+			return ovl;
-+	}
-+
-+	return NULL;
-+}
-+EXPORT_SYMBOL(omap_dss_get_overlay);
-+
-+static void omap_dss_add_overlay(struct omap_overlay *overlay)
-+{
-+	++num_overlays;
-+	list_add_tail(&overlay->list, &overlay_list);
-+}
-+
-+static struct omap_overlay *dispc_overlays[3];
-+
-+void dss_overlay_setup_dispc_manager(struct omap_overlay_manager *mgr)
-+{
-+	mgr->num_overlays = 3;
-+	mgr->overlays = dispc_overlays;
-+}
-+
-+#ifdef L4_EXAMPLE
-+static struct omap_overlay *l4_overlays[1];
-+void dss_overlay_setup_l4_manager(struct omap_overlay_manager *mgr)
-+{
-+	mgr->num_overlays = 1;
-+	mgr->overlays = l4_overlays;
-+}
-+#endif
-+
-+void dss_init_overlays(struct platform_device *pdev)
-+{
-+	int i, r;
-+
-+	INIT_LIST_HEAD(&overlay_list);
-+
-+	num_overlays = 0;
-+
-+	for (i = 0; i < 3; ++i) {
-+		struct omap_overlay *ovl;
-+		ovl = kzalloc(sizeof(*ovl), GFP_KERNEL);
-+
-+		BUG_ON(ovl == NULL);
-+
-+		switch (i) {
-+		case 0:
-+			ovl->name = "gfx";
-+			ovl->id = OMAP_DSS_GFX;
-+			ovl->supported_modes = OMAP_DSS_COLOR_GFX_OMAP3;
-+			ovl->caps = OMAP_DSS_OVL_CAP_DISPC;
-+			ovl->info.global_alpha = 255;
-+			break;
-+		case 1:
-+			ovl->name = "vid1";
-+			ovl->id = OMAP_DSS_VIDEO1;
-+			ovl->supported_modes = OMAP_DSS_COLOR_VID_OMAP3;
-+			ovl->caps = OMAP_DSS_OVL_CAP_SCALE |
-+				OMAP_DSS_OVL_CAP_DISPC;
-+			ovl->info.global_alpha = 255;
-+			break;
-+		case 2:
-+			ovl->name = "vid2";
-+			ovl->id = OMAP_DSS_VIDEO2;
-+			ovl->supported_modes = OMAP_DSS_COLOR_VID_OMAP3;
-+			ovl->caps = OMAP_DSS_OVL_CAP_SCALE |
-+				OMAP_DSS_OVL_CAP_DISPC;
-+			ovl->info.global_alpha = 255;
-+			break;
-+		}
-+
-+		ovl->set_manager = &omap_dss_set_manager;
-+		ovl->unset_manager = &omap_dss_unset_manager;
-+		ovl->set_overlay_info = &dss_ovl_set_overlay_info;
-+		ovl->get_overlay_info = &dss_ovl_get_overlay_info;
-+		ovl->wait_for_go = &dss_ovl_wait_for_go;
-+
-+		omap_dss_add_overlay(ovl);
-+
-+		r = kobject_init_and_add(&ovl->kobj, &overlay_ktype,
-+				&pdev->dev.kobj, "overlay%d", i);
-+
-+		if (r) {
-+			DSSERR("failed to create sysfs file\n");
-+			continue;
-+		}
-+
-+		dispc_overlays[i] = ovl;
-+	}
-+
-+#ifdef L4_EXAMPLE
-+	{
-+		struct omap_overlay *ovl;
-+		ovl = kzalloc(sizeof(*ovl), GFP_KERNEL);
-+
-+		BUG_ON(ovl == NULL);
-+
-+		ovl->name = "l4";
-+		ovl->supported_modes = OMAP_DSS_COLOR_RGB24U;
-+
-+		ovl->set_manager = &omap_dss_set_manager;
-+		ovl->unset_manager = &omap_dss_unset_manager;
-+		ovl->set_overlay_info = &dss_ovl_set_overlay_info;
-+		ovl->get_overlay_info = &dss_ovl_get_overlay_info;
-+
-+		omap_dss_add_overlay(ovl);
-+
-+		r = kobject_init_and_add(&ovl->kobj, &overlay_ktype,
-+				&pdev->dev.kobj, "overlayl4");
-+
-+		if (r)
-+			DSSERR("failed to create sysfs file\n");
-+
-+		l4_overlays[0] = ovl;
-+	}
-+#endif
-+}
-+
-+/* connect overlays to the new device, if not already connected. if force
-+ * selected, connect always. */
-+void dss_recheck_connections(struct omap_dss_device *dssdev, bool force)
-+{
-+	int i;
-+	struct omap_overlay_manager *lcd_mgr;
-+	struct omap_overlay_manager *tv_mgr;
-+	struct omap_overlay_manager *mgr = NULL;
-+
-+	lcd_mgr = omap_dss_get_overlay_manager(OMAP_DSS_OVL_MGR_LCD);
-+	tv_mgr = omap_dss_get_overlay_manager(OMAP_DSS_OVL_MGR_TV);
-+
-+	if (dssdev->type != OMAP_DISPLAY_TYPE_VENC) {
-+		if (!lcd_mgr->device || force) {
-+			if (lcd_mgr->device)
-+				lcd_mgr->unset_device(lcd_mgr);
-+			lcd_mgr->set_device(lcd_mgr, dssdev);
-+			mgr = lcd_mgr;
-+		}
-+	}
-+
-+	if (dssdev->type == OMAP_DISPLAY_TYPE_VENC) {
-+		if (!tv_mgr->device || force) {
-+			if (tv_mgr->device)
-+				tv_mgr->unset_device(tv_mgr);
-+			tv_mgr->set_device(tv_mgr, dssdev);
-+			mgr = tv_mgr;
-+		}
-+	}
-+
-+	if (mgr) {
-+		for (i = 0; i < 3; i++) {
-+			struct omap_overlay *ovl;
-+			ovl = omap_dss_get_overlay(i);
-+			if (!ovl->manager || force) {
-+				if (ovl->manager)
-+					omap_dss_unset_manager(ovl);
-+				omap_dss_set_manager(ovl, mgr);
-+			}
-+		}
-+	}
-+}
-+
-+void dss_uninit_overlays(struct platform_device *pdev)
-+{
-+	struct omap_overlay *ovl;
-+
-+	while (!list_empty(&overlay_list)) {
-+		ovl = list_first_entry(&overlay_list,
-+				struct omap_overlay, list);
-+		list_del(&ovl->list);
-+		kobject_del(&ovl->kobj);
-+		kobject_put(&ovl->kobj);
-+		kfree(ovl);
-+	}
-+
-+	num_overlays = 0;
-+}
-+
---- /dev/null
-+++ b/drivers/video/omap2/dss/rfbi.c
-@@ -0,0 +1,1310 @@
-+/*
-+ * linux/drivers/video/omap2/dss/rfbi.c
-+ *
-+ * Copyright (C) 2009 Nokia Corporation
-+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
-+ *
-+ * Some code and ideas taken from drivers/video/omap/ driver
-+ * by Imre Deak.
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-+ * more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along with
-+ * this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#define DSS_SUBSYS_NAME "RFBI"
-+
-+#include <linux/kernel.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/vmalloc.h>
-+#include <linux/clk.h>
-+#include <linux/io.h>
-+#include <linux/delay.h>
-+#include <linux/kfifo.h>
-+#include <linux/ktime.h>
-+#include <linux/hrtimer.h>
-+#include <linux/seq_file.h>
-+
-+#include <mach/board.h>
-+#include <mach/display.h>
-+#include "dss.h"
-+
-+/*#define MEASURE_PERF*/
-+
-+#define RFBI_BASE               0x48050800
-+
-+struct rfbi_reg { u16 idx; };
-+
-+#define RFBI_REG(idx)		((const struct rfbi_reg) { idx })
-+
-+#define RFBI_REVISION		RFBI_REG(0x0000)
-+#define RFBI_SYSCONFIG		RFBI_REG(0x0010)
-+#define RFBI_SYSSTATUS		RFBI_REG(0x0014)
-+#define RFBI_CONTROL		RFBI_REG(0x0040)
-+#define RFBI_PIXEL_CNT		RFBI_REG(0x0044)
-+#define RFBI_LINE_NUMBER	RFBI_REG(0x0048)
-+#define RFBI_CMD		RFBI_REG(0x004c)
-+#define RFBI_PARAM		RFBI_REG(0x0050)
-+#define RFBI_DATA		RFBI_REG(0x0054)
-+#define RFBI_READ		RFBI_REG(0x0058)
-+#define RFBI_STATUS		RFBI_REG(0x005c)
-+
-+#define RFBI_CONFIG(n)		RFBI_REG(0x0060 + (n)*0x18)
-+#define RFBI_ONOFF_TIME(n)	RFBI_REG(0x0064 + (n)*0x18)
-+#define RFBI_CYCLE_TIME(n)	RFBI_REG(0x0068 + (n)*0x18)
-+#define RFBI_DATA_CYCLE1(n)	RFBI_REG(0x006c + (n)*0x18)
-+#define RFBI_DATA_CYCLE2(n)	RFBI_REG(0x0070 + (n)*0x18)
-+#define RFBI_DATA_CYCLE3(n)	RFBI_REG(0x0074 + (n)*0x18)
-+
-+#define RFBI_VSYNC_WIDTH	RFBI_REG(0x0090)
-+#define RFBI_HSYNC_WIDTH	RFBI_REG(0x0094)
-+
-+#define RFBI_CMD_FIFO_LEN_BYTES (16 * sizeof(struct update_param))
-+
-+#define REG_FLD_MOD(idx, val, start, end) \
-+	rfbi_write_reg(idx, FLD_MOD(rfbi_read_reg(idx), val, start, end))
-+
-+/* To work around an RFBI transfer rate limitation */
-+#define OMAP_RFBI_RATE_LIMIT    1
-+
-+enum omap_rfbi_cycleformat {
-+	OMAP_DSS_RFBI_CYCLEFORMAT_1_1 = 0,
-+	OMAP_DSS_RFBI_CYCLEFORMAT_2_1 = 1,
-+	OMAP_DSS_RFBI_CYCLEFORMAT_3_1 = 2,
-+	OMAP_DSS_RFBI_CYCLEFORMAT_3_2 = 3,
-+};
-+
-+enum omap_rfbi_datatype {
-+	OMAP_DSS_RFBI_DATATYPE_12 = 0,
-+	OMAP_DSS_RFBI_DATATYPE_16 = 1,
-+	OMAP_DSS_RFBI_DATATYPE_18 = 2,
-+	OMAP_DSS_RFBI_DATATYPE_24 = 3,
-+};
-+
-+enum omap_rfbi_parallelmode {
-+	OMAP_DSS_RFBI_PARALLELMODE_8 = 0,
-+	OMAP_DSS_RFBI_PARALLELMODE_9 = 1,
-+	OMAP_DSS_RFBI_PARALLELMODE_12 = 2,
-+	OMAP_DSS_RFBI_PARALLELMODE_16 = 3,
-+};
-+
-+enum update_cmd {
-+	RFBI_CMD_UPDATE = 0,
-+	RFBI_CMD_SYNC   = 1,
-+};
-+
-+static int rfbi_convert_timings(struct rfbi_timings *t);
-+static void rfbi_get_clk_info(u32 *clk_period, u32 *max_clk_div);
-+static void process_cmd_fifo(void);
-+
-+static struct {
-+	void __iomem	*base;
-+
-+	unsigned long	l4_khz;
-+
-+	enum omap_rfbi_datatype datatype;
-+	enum omap_rfbi_parallelmode parallelmode;
-+
-+	enum omap_rfbi_te_mode te_mode;
-+	int te_enabled;
-+
-+	void (*framedone_callback)(void *data);
-+	void *framedone_callback_data;
-+
-+	struct omap_dss_device *dssdev[2];
-+
-+	struct kfifo      *cmd_fifo;
-+	spinlock_t        cmd_lock;
-+	struct completion cmd_done;
-+	atomic_t          cmd_fifo_full;
-+	atomic_t          cmd_pending;
-+#ifdef MEASURE_PERF
-+	unsigned perf_bytes;
-+	ktime_t perf_setup_time;
-+	ktime_t perf_start_time;
-+#endif
-+} rfbi;
-+
-+struct update_region {
-+	u16	x;
-+	u16     y;
-+	u16     w;
-+	u16     h;
-+};
-+
-+struct update_param {
-+	u8 rfbi_module;
-+	u8 cmd;
-+
-+	union {
-+		struct update_region r;
-+		struct completion *sync;
-+	} par;
-+};
-+
-+static inline void rfbi_write_reg(const struct rfbi_reg idx, u32 val)
-+{
-+	__raw_writel(val, rfbi.base + idx.idx);
-+}
-+
-+static inline u32 rfbi_read_reg(const struct rfbi_reg idx)
-+{
-+	return __raw_readl(rfbi.base + idx.idx);
-+}
-+
-+static void rfbi_enable_clocks(bool enable)
-+{
-+	if (enable)
-+		dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1);
-+	else
-+		dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
-+}
-+
-+void omap_rfbi_write_command(const void *buf, u32 len)
-+{
-+	rfbi_enable_clocks(1);
-+	switch (rfbi.parallelmode) {
-+	case OMAP_DSS_RFBI_PARALLELMODE_8:
-+	{
-+		const u8 *b = buf;
-+		for (; len; len--)
-+			rfbi_write_reg(RFBI_CMD, *b++);
-+		break;
-+	}
-+
-+	case OMAP_DSS_RFBI_PARALLELMODE_16:
-+	{
-+		const u16 *w = buf;
-+		BUG_ON(len & 1);
-+		for (; len; len -= 2)
-+			rfbi_write_reg(RFBI_CMD, *w++);
-+		break;
-+	}
-+
-+	case OMAP_DSS_RFBI_PARALLELMODE_9:
-+	case OMAP_DSS_RFBI_PARALLELMODE_12:
-+	default:
-+		BUG();
-+	}
-+	rfbi_enable_clocks(0);
-+}
-+EXPORT_SYMBOL(omap_rfbi_write_command);
-+
-+void omap_rfbi_read_data(void *buf, u32 len)
-+{
-+	rfbi_enable_clocks(1);
-+	switch (rfbi.parallelmode) {
-+	case OMAP_DSS_RFBI_PARALLELMODE_8:
-+	{
-+		u8 *b = buf;
-+		for (; len; len--) {
-+			rfbi_write_reg(RFBI_READ, 0);
-+			*b++ = rfbi_read_reg(RFBI_READ);
-+		}
-+		break;
-+	}
-+
-+	case OMAP_DSS_RFBI_PARALLELMODE_16:
-+	{
-+		u16 *w = buf;
-+		BUG_ON(len & ~1);
-+		for (; len; len -= 2) {
-+			rfbi_write_reg(RFBI_READ, 0);
-+			*w++ = rfbi_read_reg(RFBI_READ);
-+		}
-+		break;
-+	}
-+
-+	case OMAP_DSS_RFBI_PARALLELMODE_9:
-+	case OMAP_DSS_RFBI_PARALLELMODE_12:
-+	default:
-+		BUG();
-+	}
-+	rfbi_enable_clocks(0);
-+}
-+EXPORT_SYMBOL(omap_rfbi_read_data);
-+
-+void omap_rfbi_write_data(const void *buf, u32 len)
-+{
-+	rfbi_enable_clocks(1);
-+	switch (rfbi.parallelmode) {
-+	case OMAP_DSS_RFBI_PARALLELMODE_8:
-+	{
-+		const u8 *b = buf;
-+		for (; len; len--)
-+			rfbi_write_reg(RFBI_PARAM, *b++);
-+		break;
-+	}
-+
-+	case OMAP_DSS_RFBI_PARALLELMODE_16:
-+	{
-+		const u16 *w = buf;
-+		BUG_ON(len & 1);
-+		for (; len; len -= 2)
-+			rfbi_write_reg(RFBI_PARAM, *w++);
-+		break;
-+	}
-+
-+	case OMAP_DSS_RFBI_PARALLELMODE_9:
-+	case OMAP_DSS_RFBI_PARALLELMODE_12:
-+	default:
-+		BUG();
-+
-+	}
-+	rfbi_enable_clocks(0);
-+}
-+EXPORT_SYMBOL(omap_rfbi_write_data);
-+
-+void omap_rfbi_write_pixels(const void __iomem *buf, int scr_width,
-+		u16 x, u16 y,
-+		u16 w, u16 h)
-+{
-+	int start_offset = scr_width * y + x;
-+	int horiz_offset = scr_width - w;
-+	int i;
-+
-+	rfbi_enable_clocks(1);
-+
-+	if (rfbi.datatype == OMAP_DSS_RFBI_DATATYPE_16 &&
-+	   rfbi.parallelmode == OMAP_DSS_RFBI_PARALLELMODE_8) {
-+		const u16 __iomem *pd = buf;
-+		pd += start_offset;
-+
-+		for (; h; --h) {
-+			for (i = 0; i < w; ++i) {
-+				const u8 __iomem *b = (const u8 __iomem *)pd;
-+				rfbi_write_reg(RFBI_PARAM, __raw_readb(b+1));
-+				rfbi_write_reg(RFBI_PARAM, __raw_readb(b+0));
-+				++pd;
-+			}
-+			pd += horiz_offset;
-+		}
-+	} else if (rfbi.datatype == OMAP_DSS_RFBI_DATATYPE_24 &&
-+	   rfbi.parallelmode == OMAP_DSS_RFBI_PARALLELMODE_8) {
-+		const u32 __iomem *pd = buf;
-+		pd += start_offset;
-+
-+		for (; h; --h) {
-+			for (i = 0; i < w; ++i) {
-+				const u8 __iomem *b = (const u8 __iomem *)pd;
-+				rfbi_write_reg(RFBI_PARAM, __raw_readb(b+2));
-+				rfbi_write_reg(RFBI_PARAM, __raw_readb(b+1));
-+				rfbi_write_reg(RFBI_PARAM, __raw_readb(b+0));
-+				++pd;
-+			}
-+			pd += horiz_offset;
-+		}
-+	} else if (rfbi.datatype == OMAP_DSS_RFBI_DATATYPE_16 &&
-+	   rfbi.parallelmode == OMAP_DSS_RFBI_PARALLELMODE_16) {
-+		const u16 __iomem *pd = buf;
-+		pd += start_offset;
-+
-+		for (; h; --h) {
-+			for (i = 0; i < w; ++i) {
-+				rfbi_write_reg(RFBI_PARAM, __raw_readw(pd));
-+				++pd;
-+			}
-+			pd += horiz_offset;
-+		}
-+	} else {
-+		BUG();
-+	}
-+
-+	rfbi_enable_clocks(0);
-+}
-+EXPORT_SYMBOL(omap_rfbi_write_pixels);
-+
-+#ifdef MEASURE_PERF
-+static void perf_mark_setup(void)
-+{
-+	rfbi.perf_setup_time = ktime_get();
-+}
-+
-+static void perf_mark_start(void)
-+{
-+	rfbi.perf_start_time = ktime_get();
-+}
-+
-+static void perf_show(const char *name)
-+{
-+	ktime_t t, setup_time, trans_time;
-+	u32 total_bytes;
-+	u32 setup_us, trans_us, total_us;
-+
-+	t = ktime_get();
-+
-+	setup_time = ktime_sub(rfbi.perf_start_time, rfbi.perf_setup_time);
-+	setup_us = (u32)ktime_to_us(setup_time);
-+	if (setup_us == 0)
-+		setup_us = 1;
-+
-+	trans_time = ktime_sub(t, rfbi.perf_start_time);
-+	trans_us = (u32)ktime_to_us(trans_time);
-+	if (trans_us == 0)
-+		trans_us = 1;
-+
-+	total_us = setup_us + trans_us;
-+
-+	total_bytes = rfbi.perf_bytes;
-+
-+	DSSINFO("%s update %u us + %u us = %u us (%uHz), %u bytes, "
-+			"%u kbytes/sec\n",
-+			name,
-+			setup_us,
-+			trans_us,
-+			total_us,
-+			1000*1000 / total_us,
-+			total_bytes,
-+			total_bytes * 1000 / total_us);
-+}
-+#else
-+#define perf_mark_setup()
-+#define perf_mark_start()
-+#define perf_show(x)
-+#endif
-+
-+void rfbi_transfer_area(u16 width, u16 height,
-+			     void (callback)(void *data), void *data)
-+{
-+	u32 l;
-+
-+	/*BUG_ON(callback == 0);*/
-+	BUG_ON(rfbi.framedone_callback != NULL);
-+
-+	DSSDBG("rfbi_transfer_area %dx%d\n", width, height);
-+
-+	dispc_set_lcd_size(width, height);
-+
-+	dispc_enable_lcd_out(1);
-+
-+	rfbi.framedone_callback = callback;
-+	rfbi.framedone_callback_data = data;
-+
-+	rfbi_enable_clocks(1);
-+
-+	rfbi_write_reg(RFBI_PIXEL_CNT, width * height);
-+
-+	l = rfbi_read_reg(RFBI_CONTROL);
-+	l = FLD_MOD(l, 1, 0, 0); /* enable */
-+	if (!rfbi.te_enabled)
-+		l = FLD_MOD(l, 1, 4, 4); /* ITE */
-+
-+	perf_mark_start();
-+
-+	rfbi_write_reg(RFBI_CONTROL, l);
-+}
-+
-+static void framedone_callback(void *data, u32 mask)
-+{
-+	void (*callback)(void *data);
-+
-+	DSSDBG("FRAMEDONE\n");
-+
-+	perf_show("DISPC");
-+
-+	REG_FLD_MOD(RFBI_CONTROL, 0, 0, 0);
-+
-+	rfbi_enable_clocks(0);
-+
-+	callback = rfbi.framedone_callback;
-+	rfbi.framedone_callback = NULL;
-+
-+	/*callback(rfbi.framedone_callback_data);*/
-+
-+	atomic_set(&rfbi.cmd_pending, 0);
-+
-+	process_cmd_fifo();
-+}
-+
-+#if 1 /* VERBOSE */
-+static void rfbi_print_timings(void)
-+{
-+	u32 l;
-+	u32 time;
-+
-+	l = rfbi_read_reg(RFBI_CONFIG(0));
-+	time = 1000000000 / rfbi.l4_khz;
-+	if (l & (1 << 4))
-+		time *= 2;
-+
-+	DSSDBG("Tick time %u ps\n", time);
-+	l = rfbi_read_reg(RFBI_ONOFF_TIME(0));
-+	DSSDBG("CSONTIME %d, CSOFFTIME %d, WEONTIME %d, WEOFFTIME %d, "
-+		"REONTIME %d, REOFFTIME %d\n",
-+		l & 0x0f, (l >> 4) & 0x3f, (l >> 10) & 0x0f, (l >> 14) & 0x3f,
-+		(l >> 20) & 0x0f, (l >> 24) & 0x3f);
-+
-+	l = rfbi_read_reg(RFBI_CYCLE_TIME(0));
-+	DSSDBG("WECYCLETIME %d, RECYCLETIME %d, CSPULSEWIDTH %d, "
-+		"ACCESSTIME %d\n",
-+		(l & 0x3f), (l >> 6) & 0x3f, (l >> 12) & 0x3f,
-+		(l >> 22) & 0x3f);
-+}
-+#else
-+static void rfbi_print_timings(void) {}
-+#endif
-+
-+
-+
-+
-+static u32 extif_clk_period;
-+
-+static inline unsigned long round_to_extif_ticks(unsigned long ps, int div)
-+{
-+	int bus_tick = extif_clk_period * div;
-+	return (ps + bus_tick - 1) / bus_tick * bus_tick;
-+}
-+
-+static int calc_reg_timing(struct rfbi_timings *t, int div)
-+{
-+	t->clk_div = div;
-+
-+	t->cs_on_time = round_to_extif_ticks(t->cs_on_time, div);
-+
-+	t->we_on_time = round_to_extif_ticks(t->we_on_time, div);
-+	t->we_off_time = round_to_extif_ticks(t->we_off_time, div);
-+	t->we_cycle_time = round_to_extif_ticks(t->we_cycle_time, div);
-+
-+	t->re_on_time = round_to_extif_ticks(t->re_on_time, div);
-+	t->re_off_time = round_to_extif_ticks(t->re_off_time, div);
-+	t->re_cycle_time = round_to_extif_ticks(t->re_cycle_time, div);
-+
-+	t->access_time = round_to_extif_ticks(t->access_time, div);
-+	t->cs_off_time = round_to_extif_ticks(t->cs_off_time, div);
-+	t->cs_pulse_width = round_to_extif_ticks(t->cs_pulse_width, div);
-+
-+	DSSDBG("[reg]cson %d csoff %d reon %d reoff %d\n",
-+	       t->cs_on_time, t->cs_off_time, t->re_on_time, t->re_off_time);
-+	DSSDBG("[reg]weon %d weoff %d recyc %d wecyc %d\n",
-+	       t->we_on_time, t->we_off_time, t->re_cycle_time,
-+	       t->we_cycle_time);
-+	DSSDBG("[reg]rdaccess %d cspulse %d\n",
-+	       t->access_time, t->cs_pulse_width);
-+
-+	return rfbi_convert_timings(t);
-+}
-+
-+static int calc_extif_timings(struct rfbi_timings *t)
-+{
-+	u32 max_clk_div;
-+	int div;
-+
-+	rfbi_get_clk_info(&extif_clk_period, &max_clk_div);
-+	for (div = 1; div <= max_clk_div; div++) {
-+		if (calc_reg_timing(t, div) == 0)
-+			break;
-+	}
-+
-+	if (div <= max_clk_div)
-+		return 0;
-+
-+	DSSERR("can't setup timings\n");
-+	return -1;
-+}
-+
-+
-+void rfbi_set_timings(int rfbi_module, struct rfbi_timings *t)
-+{
-+	int r;
-+
-+	if (!t->converted) {
-+		r = calc_extif_timings(t);
-+		if (r < 0)
-+			DSSERR("Failed to calc timings\n");
-+	}
-+
-+	BUG_ON(!t->converted);
-+
-+	rfbi_enable_clocks(1);
-+	rfbi_write_reg(RFBI_ONOFF_TIME(rfbi_module), t->tim[0]);
-+	rfbi_write_reg(RFBI_CYCLE_TIME(rfbi_module), t->tim[1]);
-+
-+	/* TIMEGRANULARITY */
-+	REG_FLD_MOD(RFBI_CONFIG(rfbi_module),
-+		    (t->tim[2] ? 1 : 0), 4, 4);
-+
-+	rfbi_print_timings();
-+	rfbi_enable_clocks(0);
-+}
-+
-+static int ps_to_rfbi_ticks(int time, int div)
-+{
-+	unsigned long tick_ps;
-+	int ret;
-+
-+	/* Calculate in picosecs to yield more exact results */
-+	tick_ps = 1000000000 / (rfbi.l4_khz) * div;
-+
-+	ret = (time + tick_ps - 1) / tick_ps;
-+
-+	return ret;
-+}
-+
-+#ifdef OMAP_RFBI_RATE_LIMIT
-+unsigned long rfbi_get_max_tx_rate(void)
-+{
-+	unsigned long   l4_rate, dss1_rate;
-+	int             min_l4_ticks = 0;
-+	int             i;
-+
-+	/* According to TI this can't be calculated so make the
-+	 * adjustments for a couple of known frequencies and warn for
-+	 * others.
-+	 */
-+	static const struct {
-+		unsigned long l4_clk;           /* HZ */
-+		unsigned long dss1_clk;         /* HZ */
-+		unsigned long min_l4_ticks;
-+	} ftab[] = {
-+		{ 55,   132,    7, },           /* 7.86 MPix/s */
-+		{ 110,  110,    12, },          /* 9.16 MPix/s */
-+		{ 110,  132,    10, },          /* 11   Mpix/s */
-+		{ 120,  120,    10, },          /* 12   Mpix/s */
-+		{ 133,  133,    10, },          /* 13.3 Mpix/s */
-+	};
-+
-+	l4_rate = rfbi.l4_khz / 1000;
-+	dss1_rate = dss_clk_get_rate(DSS_CLK_FCK1) / 1000000;
-+
-+	for (i = 0; i < ARRAY_SIZE(ftab); i++) {
-+		/* Use a window instead of an exact match, to account
-+		 * for different DPLL multiplier / divider pairs.
-+		 */
-+		if (abs(ftab[i].l4_clk - l4_rate) < 3 &&
-+		    abs(ftab[i].dss1_clk - dss1_rate) < 3) {
-+			min_l4_ticks = ftab[i].min_l4_ticks;
-+			break;
-+		}
-+	}
-+	if (i == ARRAY_SIZE(ftab)) {
-+		/* Can't be sure, return anyway the maximum not
-+		 * rate-limited. This might cause a problem only for the
-+		 * tearing synchronisation.
-+		 */
-+		DSSERR("can't determine maximum RFBI transfer rate\n");
-+		return rfbi.l4_khz * 1000;
-+	}
-+	return rfbi.l4_khz * 1000 / min_l4_ticks;
-+}
-+#else
-+int rfbi_get_max_tx_rate(void)
-+{
-+	return rfbi.l4_khz * 1000;
-+}
-+#endif
-+
-+static void rfbi_get_clk_info(u32 *clk_period, u32 *max_clk_div)
-+{
-+	*clk_period = 1000000000 / rfbi.l4_khz;
-+	*max_clk_div = 2;
-+}
-+
-+static int rfbi_convert_timings(struct rfbi_timings *t)
-+{
-+	u32 l;
-+	int reon, reoff, weon, weoff, cson, csoff, cs_pulse;
-+	int actim, recyc, wecyc;
-+	int div = t->clk_div;
-+
-+	if (div <= 0 || div > 2)
-+		return -1;
-+
-+	/* Make sure that after conversion it still holds that:
-+	 * weoff > weon, reoff > reon, recyc >= reoff, wecyc >= weoff,
-+	 * csoff > cson, csoff >= max(weoff, reoff), actim > reon
-+	 */
-+	weon = ps_to_rfbi_ticks(t->we_on_time, div);
-+	weoff = ps_to_rfbi_ticks(t->we_off_time, div);
-+	if (weoff <= weon)
-+		weoff = weon + 1;
-+	if (weon > 0x0f)
-+		return -1;
-+	if (weoff > 0x3f)
-+		return -1;
-+
-+	reon = ps_to_rfbi_ticks(t->re_on_time, div);
-+	reoff = ps_to_rfbi_ticks(t->re_off_time, div);
-+	if (reoff <= reon)
-+		reoff = reon + 1;
-+	if (reon > 0x0f)
-+		return -1;
-+	if (reoff > 0x3f)
-+		return -1;
-+
-+	cson = ps_to_rfbi_ticks(t->cs_on_time, div);
-+	csoff = ps_to_rfbi_ticks(t->cs_off_time, div);
-+	if (csoff <= cson)
-+		csoff = cson + 1;
-+	if (csoff < max(weoff, reoff))
-+		csoff = max(weoff, reoff);
-+	if (cson > 0x0f)
-+		return -1;
-+	if (csoff > 0x3f)
-+		return -1;
-+
-+	l =  cson;
-+	l |= csoff << 4;
-+	l |= weon  << 10;
-+	l |= weoff << 14;
-+	l |= reon  << 20;
-+	l |= reoff << 24;
-+
-+	t->tim[0] = l;
-+
-+	actim = ps_to_rfbi_ticks(t->access_time, div);
-+	if (actim <= reon)
-+		actim = reon + 1;
-+	if (actim > 0x3f)
-+		return -1;
-+
-+	wecyc = ps_to_rfbi_ticks(t->we_cycle_time, div);
-+	if (wecyc < weoff)
-+		wecyc = weoff;
-+	if (wecyc > 0x3f)
-+		return -1;
-+
-+	recyc = ps_to_rfbi_ticks(t->re_cycle_time, div);
-+	if (recyc < reoff)
-+		recyc = reoff;
-+	if (recyc > 0x3f)
-+		return -1;
-+
-+	cs_pulse = ps_to_rfbi_ticks(t->cs_pulse_width, div);
-+	if (cs_pulse > 0x3f)
-+		return -1;
-+
-+	l =  wecyc;
-+	l |= recyc    << 6;
-+	l |= cs_pulse << 12;
-+	l |= actim    << 22;
-+
-+	t->tim[1] = l;
-+
-+	t->tim[2] = div - 1;
-+
-+	t->converted = 1;
-+
-+	return 0;
-+}
-+
-+/* xxx FIX module selection missing */
-+int omap_rfbi_setup_te(enum omap_rfbi_te_mode mode,
-+			     unsigned hs_pulse_time, unsigned vs_pulse_time,
-+			     int hs_pol_inv, int vs_pol_inv, int extif_div)
-+{
-+	int hs, vs;
-+	int min;
-+	u32 l;
-+
-+	hs = ps_to_rfbi_ticks(hs_pulse_time, 1);
-+	vs = ps_to_rfbi_ticks(vs_pulse_time, 1);
-+	if (hs < 2)
-+		return -EDOM;
-+	if (mode == OMAP_DSS_RFBI_TE_MODE_2)
-+		min = 2;
-+	else /* OMAP_DSS_RFBI_TE_MODE_1 */
-+		min = 4;
-+	if (vs < min)
-+		return -EDOM;
-+	if (vs == hs)
-+		return -EINVAL;
-+	rfbi.te_mode = mode;
-+	DSSDBG("setup_te: mode %d hs %d vs %d hs_inv %d vs_inv %d\n",
-+		mode, hs, vs, hs_pol_inv, vs_pol_inv);
-+
-+	rfbi_enable_clocks(1);
-+	rfbi_write_reg(RFBI_HSYNC_WIDTH, hs);
-+	rfbi_write_reg(RFBI_VSYNC_WIDTH, vs);
-+
-+	l = rfbi_read_reg(RFBI_CONFIG(0));
-+	if (hs_pol_inv)
-+		l &= ~(1 << 21);
-+	else
-+		l |= 1 << 21;
-+	if (vs_pol_inv)
-+		l &= ~(1 << 20);
-+	else
-+		l |= 1 << 20;
-+	rfbi_enable_clocks(0);
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL(omap_rfbi_setup_te);
-+
-+/* xxx FIX module selection missing */
-+int omap_rfbi_enable_te(bool enable, unsigned line)
-+{
-+	u32 l;
-+
-+	DSSDBG("te %d line %d mode %d\n", enable, line, rfbi.te_mode);
-+	if (line > (1 << 11) - 1)
-+		return -EINVAL;
-+
-+	rfbi_enable_clocks(1);
-+	l = rfbi_read_reg(RFBI_CONFIG(0));
-+	l &= ~(0x3 << 2);
-+	if (enable) {
-+		rfbi.te_enabled = 1;
-+		l |= rfbi.te_mode << 2;
-+	} else
-+		rfbi.te_enabled = 0;
-+	rfbi_write_reg(RFBI_CONFIG(0), l);
-+	rfbi_write_reg(RFBI_LINE_NUMBER, line);
-+	rfbi_enable_clocks(0);
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL(omap_rfbi_enable_te);
-+
-+#if 0
-+static void rfbi_enable_config(int enable1, int enable2)
-+{
-+	u32 l;
-+	int cs = 0;
-+
-+	if (enable1)
-+		cs |= 1<<0;
-+	if (enable2)
-+		cs |= 1<<1;
-+
-+	rfbi_enable_clocks(1);
-+
-+	l = rfbi_read_reg(RFBI_CONTROL);
-+
-+	l = FLD_MOD(l, cs, 3, 2);
-+	l = FLD_MOD(l, 0, 1, 1);
-+
-+	rfbi_write_reg(RFBI_CONTROL, l);
-+
-+
-+	l = rfbi_read_reg(RFBI_CONFIG(0));
-+	l = FLD_MOD(l, 0, 3, 2); /* TRIGGERMODE: ITE */
-+	/*l |= FLD_VAL(2, 8, 7); */ /* L4FORMAT, 2pix/L4 */
-+	/*l |= FLD_VAL(0, 8, 7); */ /* L4FORMAT, 1pix/L4 */
-+
-+	l = FLD_MOD(l, 0, 16, 16); /* A0POLARITY */
-+	l = FLD_MOD(l, 1, 20, 20); /* TE_VSYNC_POLARITY */
-+	l = FLD_MOD(l, 1, 21, 21); /* HSYNCPOLARITY */
-+
-+	l = FLD_MOD(l, OMAP_DSS_RFBI_PARALLELMODE_8, 1, 0);
-+	rfbi_write_reg(RFBI_CONFIG(0), l);
-+
-+	rfbi_enable_clocks(0);
-+}
-+#endif
-+
-+int rfbi_configure(int rfbi_module, int bpp, int lines)
-+{
-+	u32 l;
-+	int cycle1 = 0, cycle2 = 0, cycle3 = 0;
-+	enum omap_rfbi_cycleformat cycleformat;
-+	enum omap_rfbi_datatype datatype;
-+	enum omap_rfbi_parallelmode parallelmode;
-+
-+	switch (bpp) {
-+	case 12:
-+		datatype = OMAP_DSS_RFBI_DATATYPE_12;
-+		break;
-+	case 16:
-+		datatype = OMAP_DSS_RFBI_DATATYPE_16;
-+		break;
-+	case 18:
-+		datatype = OMAP_DSS_RFBI_DATATYPE_18;
-+		break;
-+	case 24:
-+		datatype = OMAP_DSS_RFBI_DATATYPE_24;
-+		break;
-+	default:
-+		BUG();
-+		return 1;
-+	}
-+	rfbi.datatype = datatype;
-+
-+	switch (lines) {
-+	case 8:
-+		parallelmode = OMAP_DSS_RFBI_PARALLELMODE_8;
-+		break;
-+	case 9:
-+		parallelmode = OMAP_DSS_RFBI_PARALLELMODE_9;
-+		break;
-+	case 12:
-+		parallelmode = OMAP_DSS_RFBI_PARALLELMODE_12;
-+		break;
-+	case 16:
-+		parallelmode = OMAP_DSS_RFBI_PARALLELMODE_16;
-+		break;
-+	default:
-+		BUG();
-+		return 1;
-+	}
-+	rfbi.parallelmode = parallelmode;
-+
-+	if ((bpp % lines) == 0) {
-+		switch (bpp / lines) {
-+		case 1:
-+			cycleformat = OMAP_DSS_RFBI_CYCLEFORMAT_1_1;
-+			break;
-+		case 2:
-+			cycleformat = OMAP_DSS_RFBI_CYCLEFORMAT_2_1;
-+			break;
-+		case 3:
-+			cycleformat = OMAP_DSS_RFBI_CYCLEFORMAT_3_1;
-+			break;
-+		default:
-+			BUG();
-+			return 1;
-+		}
-+	} else if ((2 * bpp % lines) == 0) {
-+		if ((2 * bpp / lines) == 3)
-+			cycleformat = OMAP_DSS_RFBI_CYCLEFORMAT_3_2;
-+		else {
-+			BUG();
-+			return 1;
-+		}
-+	} else {
-+		BUG();
-+		return 1;
-+	}
-+
-+	switch (cycleformat) {
-+	case OMAP_DSS_RFBI_CYCLEFORMAT_1_1:
-+		cycle1 = lines;
-+		break;
-+
-+	case OMAP_DSS_RFBI_CYCLEFORMAT_2_1:
-+		cycle1 = lines;
-+		cycle2 = lines;
-+		break;
-+
-+	case OMAP_DSS_RFBI_CYCLEFORMAT_3_1:
-+		cycle1 = lines;
-+		cycle2 = lines;
-+		cycle3 = lines;
-+		break;
-+
-+	case OMAP_DSS_RFBI_CYCLEFORMAT_3_2:
-+		cycle1 = lines;
-+		cycle2 = (lines / 2) | ((lines / 2) << 16);
-+		cycle3 = (lines << 16);
-+		break;
-+	}
-+
-+	rfbi_enable_clocks(1);
-+
-+	REG_FLD_MOD(RFBI_CONTROL, 0, 3, 2); /* clear CS */
-+
-+	l = 0;
-+	l |= FLD_VAL(parallelmode, 1, 0);
-+	l |= FLD_VAL(0, 3, 2);		/* TRIGGERMODE: ITE */
-+	l |= FLD_VAL(0, 4, 4);		/* TIMEGRANULARITY */
-+	l |= FLD_VAL(datatype, 6, 5);
-+	/* l |= FLD_VAL(2, 8, 7); */	/* L4FORMAT, 2pix/L4 */
-+	l |= FLD_VAL(0, 8, 7);	/* L4FORMAT, 1pix/L4 */
-+	l |= FLD_VAL(cycleformat, 10, 9);
-+	l |= FLD_VAL(0, 12, 11);	/* UNUSEDBITS */
-+	l |= FLD_VAL(0, 16, 16);	/* A0POLARITY */
-+	l |= FLD_VAL(0, 17, 17);	/* REPOLARITY */
-+	l |= FLD_VAL(0, 18, 18);	/* WEPOLARITY */
-+	l |= FLD_VAL(0, 19, 19);	/* CSPOLARITY */
-+	l |= FLD_VAL(1, 20, 20);	/* TE_VSYNC_POLARITY */
-+	l |= FLD_VAL(1, 21, 21);	/* HSYNCPOLARITY */
-+	rfbi_write_reg(RFBI_CONFIG(rfbi_module), l);
-+
-+	rfbi_write_reg(RFBI_DATA_CYCLE1(rfbi_module), cycle1);
-+	rfbi_write_reg(RFBI_DATA_CYCLE2(rfbi_module), cycle2);
-+	rfbi_write_reg(RFBI_DATA_CYCLE3(rfbi_module), cycle3);
-+
-+
-+	l = rfbi_read_reg(RFBI_CONTROL);
-+	l = FLD_MOD(l, rfbi_module+1, 3, 2); /* Select CSx */
-+	l = FLD_MOD(l, 0, 1, 1); /* clear bypass */
-+	rfbi_write_reg(RFBI_CONTROL, l);
-+
-+
-+	DSSDBG("RFBI config: bpp %d, lines %d, cycles: 0x%x 0x%x 0x%x\n",
-+	       bpp, lines, cycle1, cycle2, cycle3);
-+
-+	rfbi_enable_clocks(0);
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL(rfbi_configure);
-+
-+static int rfbi_find_display(struct omap_dss_device *dssdev)
-+{
-+	if (dssdev == rfbi.dssdev[0])
-+		return 0;
-+
-+	if (dssdev == rfbi.dssdev[1])
-+		return 1;
-+
-+	BUG();
-+	return -1;
-+}
-+
-+
-+static void signal_fifo_waiters(void)
-+{
-+	if (atomic_read(&rfbi.cmd_fifo_full) > 0) {
-+		/* DSSDBG("SIGNALING: Fifo not full for waiter!\n"); */
-+		complete(&rfbi.cmd_done);
-+		atomic_dec(&rfbi.cmd_fifo_full);
-+	}
-+}
-+
-+/* returns 1 for async op, and 0 for sync op */
-+static int do_update(struct omap_dss_device *dssdev, struct update_region *upd)
-+{
-+	u16 x = upd->x;
-+	u16 y = upd->y;
-+	u16 w = upd->w;
-+	u16 h = upd->h;
-+
-+	perf_mark_setup();
-+
-+	if (dssdev->manager->caps & OMAP_DSS_OVL_MGR_CAP_DISPC) {
-+		/*dssdev->driver->enable_te(dssdev, 1); */
-+		dss_setup_partial_planes(dssdev, &x, &y, &w, &h);
-+	}
-+
-+#ifdef MEASURE_PERF
-+	rfbi.perf_bytes = w * h * 2; /* XXX always 16bit */
-+#endif
-+
-+	dssdev->driver->setup_update(dssdev, x, y, w, h);
-+
-+	if (dssdev->manager->caps & OMAP_DSS_OVL_MGR_CAP_DISPC) {
-+		rfbi_transfer_area(w, h, NULL, NULL);
-+		return 1;
-+	} else {
-+		struct omap_overlay *ovl;
-+		void __iomem *addr;
-+		int scr_width;
-+
-+		ovl = dssdev->manager->overlays[0];
-+		scr_width = ovl->info.screen_width;
-+		addr = ovl->info.vaddr;
-+
-+		omap_rfbi_write_pixels(addr, scr_width, x, y, w, h);
-+
-+		perf_show("L4");
-+
-+		return 0;
-+	}
-+}
-+
-+static void process_cmd_fifo(void)
-+{
-+	int len;
-+	struct update_param p;
-+	struct omap_dss_device *dssdev;
-+	unsigned long flags;
-+
-+	if (atomic_inc_return(&rfbi.cmd_pending) != 1)
-+		return;
-+
-+	while (true) {
-+		spin_lock_irqsave(rfbi.cmd_fifo->lock, flags);
-+
-+		len = __kfifo_get(rfbi.cmd_fifo, (unsigned char *)&p,
-+				  sizeof(struct update_param));
-+		if (len == 0) {
-+			DSSDBG("nothing more in fifo\n");
-+			atomic_set(&rfbi.cmd_pending, 0);
-+			spin_unlock_irqrestore(rfbi.cmd_fifo->lock, flags);
-+			break;
-+		}
-+
-+		/* DSSDBG("fifo full %d\n", rfbi.cmd_fifo_full.counter);*/
-+
-+		spin_unlock_irqrestore(rfbi.cmd_fifo->lock, flags);
-+
-+		BUG_ON(len != sizeof(struct update_param));
-+		BUG_ON(p.rfbi_module > 1);
-+
-+		dssdev = rfbi.dssdev[p.rfbi_module];
-+
-+		if (p.cmd == RFBI_CMD_UPDATE) {
-+			if (do_update(dssdev, &p.par.r))
-+				break; /* async op */
-+		} else if (p.cmd == RFBI_CMD_SYNC) {
-+			DSSDBG("Signaling SYNC done!\n");
-+			complete(p.par.sync);
-+		} else
-+			BUG();
-+	}
-+
-+	signal_fifo_waiters();
-+}
-+
-+static void rfbi_push_cmd(struct update_param *p)
-+{
-+	int ret;
-+
-+	while (1) {
-+		unsigned long flags;
-+		int available;
-+
-+		spin_lock_irqsave(rfbi.cmd_fifo->lock, flags);
-+		available = RFBI_CMD_FIFO_LEN_BYTES -
-+			__kfifo_len(rfbi.cmd_fifo);
-+
-+/*		DSSDBG("%d bytes left in fifo\n", available); */
-+		if (available < sizeof(struct update_param)) {
-+			DSSDBG("Going to wait because FIFO FULL..\n");
-+			spin_unlock_irqrestore(rfbi.cmd_fifo->lock, flags);
-+			atomic_inc(&rfbi.cmd_fifo_full);
-+			wait_for_completion(&rfbi.cmd_done);
-+			/*DSSDBG("Woke up because fifo not full anymore\n");*/
-+			continue;
-+		}
-+
-+		ret = __kfifo_put(rfbi.cmd_fifo, (unsigned char *)p,
-+				  sizeof(struct update_param));
-+/*		DSSDBG("pushed %d bytes\n", ret);*/
-+
-+		spin_unlock_irqrestore(rfbi.cmd_fifo->lock, flags);
-+
-+		BUG_ON(ret != sizeof(struct update_param));
-+
-+		break;
-+	}
-+}
-+
-+static void rfbi_push_update(int rfbi_module, int x, int y, int w, int h)
-+{
-+	struct update_param p;
-+
-+	p.rfbi_module = rfbi_module;
-+	p.cmd = RFBI_CMD_UPDATE;
-+
-+	p.par.r.x = x;
-+	p.par.r.y = y;
-+	p.par.r.w = w;
-+	p.par.r.h = h;
-+
-+	DSSDBG("RFBI pushed %d,%d %dx%d\n", x, y, w, h);
-+
-+	rfbi_push_cmd(&p);
-+
-+	process_cmd_fifo();
-+}
-+
-+static void rfbi_push_sync(int rfbi_module, struct completion *sync_comp)
-+{
-+	struct update_param p;
-+
-+	p.rfbi_module = rfbi_module;
-+	p.cmd = RFBI_CMD_SYNC;
-+	p.par.sync = sync_comp;
-+
-+	rfbi_push_cmd(&p);
-+
-+	DSSDBG("RFBI sync pushed to cmd fifo\n");
-+
-+	process_cmd_fifo();
-+}
-+
-+void rfbi_dump_regs(struct seq_file *s)
-+{
-+#define DUMPREG(r) seq_printf(s, "%-35s %08x\n", #r, rfbi_read_reg(r))
-+
-+	dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1);
-+
-+	DUMPREG(RFBI_REVISION);
-+	DUMPREG(RFBI_SYSCONFIG);
-+	DUMPREG(RFBI_SYSSTATUS);
-+	DUMPREG(RFBI_CONTROL);
-+	DUMPREG(RFBI_PIXEL_CNT);
-+	DUMPREG(RFBI_LINE_NUMBER);
-+	DUMPREG(RFBI_CMD);
-+	DUMPREG(RFBI_PARAM);
-+	DUMPREG(RFBI_DATA);
-+	DUMPREG(RFBI_READ);
-+	DUMPREG(RFBI_STATUS);
-+
-+	DUMPREG(RFBI_CONFIG(0));
-+	DUMPREG(RFBI_ONOFF_TIME(0));
-+	DUMPREG(RFBI_CYCLE_TIME(0));
-+	DUMPREG(RFBI_DATA_CYCLE1(0));
-+	DUMPREG(RFBI_DATA_CYCLE2(0));
-+	DUMPREG(RFBI_DATA_CYCLE3(0));
-+
-+	DUMPREG(RFBI_CONFIG(1));
-+	DUMPREG(RFBI_ONOFF_TIME(1));
-+	DUMPREG(RFBI_CYCLE_TIME(1));
-+	DUMPREG(RFBI_DATA_CYCLE1(1));
-+	DUMPREG(RFBI_DATA_CYCLE2(1));
-+	DUMPREG(RFBI_DATA_CYCLE3(1));
-+
-+	DUMPREG(RFBI_VSYNC_WIDTH);
-+	DUMPREG(RFBI_HSYNC_WIDTH);
-+
-+	dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
-+#undef DUMPREG
-+}
-+
-+int rfbi_init(void)
-+{
-+	u32 rev;
-+	u32 l;
-+
-+	spin_lock_init(&rfbi.cmd_lock);
-+	rfbi.cmd_fifo = kfifo_alloc(RFBI_CMD_FIFO_LEN_BYTES, GFP_KERNEL,
-+				    &rfbi.cmd_lock);
-+	if (IS_ERR(rfbi.cmd_fifo))
-+		return -ENOMEM;
-+
-+	init_completion(&rfbi.cmd_done);
-+	atomic_set(&rfbi.cmd_fifo_full, 0);
-+	atomic_set(&rfbi.cmd_pending, 0);
-+
-+	rfbi.base = ioremap(RFBI_BASE, SZ_256);
-+	if (!rfbi.base) {
-+		DSSERR("can't ioremap RFBI\n");
-+		return -ENOMEM;
-+	}
-+
-+	rfbi_enable_clocks(1);
-+
-+	msleep(10);
-+
-+	rfbi.l4_khz = dss_clk_get_rate(DSS_CLK_ICK) / 1000;
-+
-+	/* Enable autoidle and smart-idle */
-+	l = rfbi_read_reg(RFBI_SYSCONFIG);
-+	l |= (1 << 0) | (2 << 3);
-+	rfbi_write_reg(RFBI_SYSCONFIG, l);
-+
-+	rev = rfbi_read_reg(RFBI_REVISION);
-+	printk(KERN_INFO "OMAP RFBI rev %d.%d\n",
-+	       FLD_GET(rev, 7, 4), FLD_GET(rev, 3, 0));
-+
-+	rfbi_enable_clocks(0);
-+
-+	return 0;
-+}
-+
-+void rfbi_exit(void)
-+{
-+	DSSDBG("rfbi_exit\n");
-+
-+	kfifo_free(rfbi.cmd_fifo);
-+
-+	iounmap(rfbi.base);
-+}
-+
-+/* struct omap_display support */
-+static int rfbi_display_update(struct omap_dss_device *dssdev,
-+			u16 x, u16 y, u16 w, u16 h)
-+{
-+	int rfbi_module;
-+
-+	if (w == 0 || h == 0)
-+		return 0;
-+
-+	rfbi_module = rfbi_find_display(dssdev);
-+
-+	rfbi_push_update(rfbi_module, x, y, w, h);
-+
-+	return 0;
-+}
-+
-+static int rfbi_display_sync(struct omap_dss_device *dssdev)
-+{
-+	struct completion sync_comp;
-+	int rfbi_module;
-+
-+	rfbi_module = rfbi_find_display(dssdev);
-+
-+	init_completion(&sync_comp);
-+	rfbi_push_sync(rfbi_module, &sync_comp);
-+	DSSDBG("Waiting for SYNC to happen...\n");
-+	wait_for_completion(&sync_comp);
-+	DSSDBG("Released from SYNC\n");
-+	return 0;
-+}
-+
-+static int rfbi_display_enable_te(struct omap_dss_device *dssdev, bool enable)
-+{
-+	dssdev->driver->enable_te(dssdev, enable);
-+	return 0;
-+}
-+
-+static int rfbi_display_enable(struct omap_dss_device *dssdev)
-+{
-+	int r;
-+
-+	r = omap_dss_start_device(dssdev);
-+	if (r) {
-+		DSSERR("failed to start device\n");
-+		goto err0;
-+	}
-+
-+	r = omap_dispc_register_isr(framedone_callback, NULL,
-+			DISPC_IRQ_FRAMEDONE);
-+	if (r) {
-+		DSSERR("can't get FRAMEDONE irq\n");
-+		goto err1;
-+	}
-+
-+	dispc_set_lcd_display_type(OMAP_DSS_LCD_DISPLAY_TFT);
-+
-+	dispc_set_parallel_interface_mode(OMAP_DSS_PARALLELMODE_RFBI);
-+
-+	dispc_set_tft_data_lines(dssdev->ctrl.pixel_size);
-+
-+	rfbi_configure(dssdev->phy.rfbi.channel,
-+			       dssdev->ctrl.pixel_size,
-+			       dssdev->phy.rfbi.data_lines);
-+
-+	rfbi_set_timings(dssdev->phy.rfbi.channel,
-+			 &dssdev->ctrl.rfbi_timings);
-+
-+
-+	if (dssdev->driver->enable) {
-+		r = dssdev->driver->enable(dssdev);
-+		if (r)
-+			goto err2;
-+	}
-+
-+	return 0;
-+err2:
-+	omap_dispc_unregister_isr(framedone_callback, NULL,
-+			DISPC_IRQ_FRAMEDONE);
-+err1:
-+	omap_dss_stop_device(dssdev);
-+err0:
-+	return r;
-+}
-+
-+static void rfbi_display_disable(struct omap_dss_device *dssdev)
-+{
-+	dssdev->driver->disable(dssdev);
-+	omap_dispc_unregister_isr(framedone_callback, NULL,
-+			DISPC_IRQ_FRAMEDONE);
-+	omap_dss_stop_device(dssdev);
-+}
-+
-+int rfbi_init_display(struct omap_dss_device *dssdev)
-+{
-+	dssdev->enable = rfbi_display_enable;
-+	dssdev->disable = rfbi_display_disable;
-+	dssdev->update = rfbi_display_update;
-+	dssdev->sync = rfbi_display_sync;
-+	dssdev->enable_te = rfbi_display_enable_te;
-+
-+	rfbi.dssdev[dssdev->phy.rfbi.channel] = dssdev;
-+
-+	dssdev->caps = OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE;
-+
-+	return 0;
-+}
---- /dev/null
-+++ b/drivers/video/omap2/dss/sdi.c
-@@ -0,0 +1,261 @@
-+/*
-+ * linux/drivers/video/omap2/dss/sdi.c
-+ *
-+ * Copyright (C) 2009 Nokia Corporation
-+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.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.
-+ *
-+ * This program is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-+ * more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along with
-+ * this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#define DSS_SUBSYS_NAME "SDI"
-+
-+#include <linux/kernel.h>
-+#include <linux/clk.h>
-+#include <linux/delay.h>
-+#include <linux/err.h>
-+
-+#include <mach/board.h>
-+#include <mach/display.h>
-+#include "dss.h"
-+
-+static struct {
-+	bool skip_init;
-+	bool update_enabled;
-+} sdi;
-+
-+static void sdi_basic_init(void)
-+{
-+	dispc_set_parallel_interface_mode(OMAP_DSS_PARALLELMODE_BYPASS);
-+
-+	dispc_set_lcd_display_type(OMAP_DSS_LCD_DISPLAY_TFT);
-+	dispc_set_tft_data_lines(24);
-+	dispc_lcd_enable_signal_polarity(1);
-+}
-+
-+static int sdi_display_enable(struct omap_dss_device *dssdev)
-+{
-+	struct omap_video_timings *t = &dssdev->panel.timings;
-+	struct dispc_clock_info cinfo;
-+	u16 lck_div, pck_div;
-+	unsigned long fck;
-+	unsigned long pck;
-+	int r;
-+
-+	r = omap_dss_start_device(dssdev);
-+	if (r) {
-+		DSSERR("failed to start device\n");
-+		goto err0;
-+	}
-+
-+	if (dssdev->state != OMAP_DSS_DISPLAY_DISABLED) {
-+		DSSERR("dssdev already enabled\n");
-+		r = -EINVAL;
-+		goto err1;
-+	}
-+
-+	/* In case of skip_init sdi_init has already enabled the clocks */
-+	if (!sdi.skip_init)
-+		dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1);
-+
-+	sdi_basic_init();
-+
-+	/* 15.5.9.1.2 */
-+	dssdev->panel.config |= OMAP_DSS_LCD_RF | OMAP_DSS_LCD_ONOFF;
-+
-+	dispc_set_pol_freq(dssdev->panel.config, dssdev->panel.acbi,
-+			dssdev->panel.acb);
-+
-+	if (!sdi.skip_init)
-+		r = dispc_calc_clock_div(1, t->pixel_clock * 1000,
-+				&cinfo);
-+	else
-+		r = dispc_get_clock_div(&cinfo);
-+
-+	if (r)
-+		goto err2;
-+
-+	fck = cinfo.fck;
-+	lck_div = cinfo.lck_div;
-+	pck_div = cinfo.pck_div;
-+
-+	pck = fck / lck_div / pck_div / 1000;
-+
-+	if (pck != t->pixel_clock) {
-+		DSSWARN("Could not find exact pixel clock. Requested %d kHz, "
-+				"got %lu kHz\n",
-+				t->pixel_clock, pck);
-+
-+		t->pixel_clock = pck;
-+	}
-+
-+
-+	dispc_set_lcd_timings(t);
-+
-+	r = dispc_set_clock_div(&cinfo);
-+	if (r)
-+		goto err2;
-+
-+	if (!sdi.skip_init) {
-+		dss_sdi_init(dssdev->phy.sdi.datapairs);
-+		dss_sdi_enable();
-+		mdelay(2);
-+	}
-+
-+	dispc_enable_lcd_out(1);
-+
-+	if (dssdev->driver->enable) {
-+		r = dssdev->driver->enable(dssdev);
-+		if (r)
-+			goto err3;
-+	}
-+
-+	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
-+
-+	sdi.skip_init = 0;
-+
-+	return 0;
-+err3:
-+	dispc_enable_lcd_out(0);
-+err2:
-+	dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
-+err1:
-+	omap_dss_stop_device(dssdev);
-+err0:
-+	return r;
-+}
-+
-+static int sdi_display_resume(struct omap_dss_device *dssdev);
-+
-+static void sdi_display_disable(struct omap_dss_device *dssdev)
-+{
-+	if (dssdev->state == OMAP_DSS_DISPLAY_DISABLED)
-+		return;
-+
-+	if (dssdev->state == OMAP_DSS_DISPLAY_SUSPENDED)
-+		sdi_display_resume(dssdev);
-+
-+	if (dssdev->driver->disable)
-+		dssdev->driver->disable(dssdev);
-+
-+	dispc_enable_lcd_out(0);
-+
-+	dss_sdi_disable();
-+
-+	dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
-+
-+	dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
-+
-+	omap_dss_stop_device(dssdev);
-+}
-+
-+static int sdi_display_suspend(struct omap_dss_device *dssdev)
-+{
-+	if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
-+		return -EINVAL;
-+
-+	if (dssdev->driver->suspend)
-+		dssdev->driver->suspend(dssdev);
-+
-+	dispc_enable_lcd_out(0);
-+
-+	dss_sdi_disable();
-+
-+	dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
-+
-+	dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
-+
-+	return 0;
-+}
-+
-+static int sdi_display_resume(struct omap_dss_device *dssdev)
-+{
-+	if (dssdev->state != OMAP_DSS_DISPLAY_SUSPENDED)
-+		return -EINVAL;
-+
-+	dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1);
-+
-+	dss_sdi_enable();
-+	mdelay(2);
-+
-+	dispc_enable_lcd_out(1);
-+
-+	if (dssdev->driver->resume)
-+		dssdev->driver->resume(dssdev);
-+
-+	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
-+
-+	return 0;
-+}
-+
-+static int sdi_display_set_update_mode(struct omap_dss_device *dssdev,
-+		enum omap_dss_update_mode mode)
-+{
-+	if (mode == OMAP_DSS_UPDATE_MANUAL)
-+		return -EINVAL;
-+
-+	if (mode == OMAP_DSS_UPDATE_DISABLED) {
-+		dispc_enable_lcd_out(0);
-+		sdi.update_enabled = 0;
-+	} else {
-+		dispc_enable_lcd_out(1);
-+		sdi.update_enabled = 1;
-+	}
-+
-+	return 0;
-+}
-+
-+static enum omap_dss_update_mode sdi_display_get_update_mode(
-+		struct omap_dss_device *dssdev)
-+{
-+	return sdi.update_enabled ? OMAP_DSS_UPDATE_AUTO :
-+		OMAP_DSS_UPDATE_DISABLED;
-+}
-+
-+static void sdi_get_timings(struct omap_dss_device *dssdev,
-+			struct omap_video_timings *timings)
-+{
-+	*timings = dssdev->panel.timings;
-+}
-+
-+int sdi_init_display(struct omap_dss_device *dssdev)
-+{
-+	DSSDBG("SDI init\n");
-+
-+	dssdev->enable = sdi_display_enable;
-+	dssdev->disable = sdi_display_disable;
-+	dssdev->suspend = sdi_display_suspend;
-+	dssdev->resume = sdi_display_resume;
-+	dssdev->set_update_mode = sdi_display_set_update_mode;
-+	dssdev->get_update_mode = sdi_display_get_update_mode;
-+	dssdev->get_timings = sdi_get_timings;
-+
-+	return 0;
-+}
-+
-+int sdi_init(bool skip_init)
-+{
-+	/* we store this for first display enable, then clear it */
-+	sdi.skip_init = skip_init;
-+
-+	/*
-+	 * Enable clocks already here, otherwise there would be a toggle
-+	 * of them until sdi_display_enable is called.
-+	 */
-+	if (skip_init)
-+		dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1);
-+	return 0;
-+}
-+
-+void sdi_exit(void)
-+{
-+}
---- /dev/null
-+++ b/drivers/video/omap2/dss/venc.c
-@@ -0,0 +1,797 @@
-+/*
-+ * linux/drivers/video/omap2/dss/venc.c
-+ *
-+ * Copyright (C) 2009 Nokia Corporation
-+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
-+ *
-+ * VENC settings from TI's DSS driver
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-+ * more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along with
-+ * this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#define DSS_SUBSYS_NAME "VENC"
-+
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/clk.h>
-+#include <linux/err.h>
-+#include <linux/io.h>
-+#include <linux/mutex.h>
-+#include <linux/completion.h>
-+#include <linux/delay.h>
-+#include <linux/string.h>
-+#include <linux/seq_file.h>
-+#include <linux/platform_device.h>
-+#include <linux/regulator/consumer.h>
-+
-+#include <mach/display.h>
-+#include <mach/cpu.h>
-+
-+#include "dss.h"
-+
-+#define VENC_BASE	0x48050C00
-+
-+/* Venc registers */
-+#define VENC_REV_ID				0x00
-+#define VENC_STATUS				0x04
-+#define VENC_F_CONTROL				0x08
-+#define VENC_VIDOUT_CTRL			0x10
-+#define VENC_SYNC_CTRL				0x14
-+#define VENC_LLEN				0x1C
-+#define VENC_FLENS				0x20
-+#define VENC_HFLTR_CTRL				0x24
-+#define VENC_CC_CARR_WSS_CARR			0x28
-+#define VENC_C_PHASE				0x2C
-+#define VENC_GAIN_U				0x30
-+#define VENC_GAIN_V				0x34
-+#define VENC_GAIN_Y				0x38
-+#define VENC_BLACK_LEVEL			0x3C
-+#define VENC_BLANK_LEVEL			0x40
-+#define VENC_X_COLOR				0x44
-+#define VENC_M_CONTROL				0x48
-+#define VENC_BSTAMP_WSS_DATA			0x4C
-+#define VENC_S_CARR				0x50
-+#define VENC_LINE21				0x54
-+#define VENC_LN_SEL				0x58
-+#define VENC_L21__WC_CTL			0x5C
-+#define VENC_HTRIGGER_VTRIGGER			0x60
-+#define VENC_SAVID__EAVID			0x64
-+#define VENC_FLEN__FAL				0x68
-+#define VENC_LAL__PHASE_RESET			0x6C
-+#define VENC_HS_INT_START_STOP_X		0x70
-+#define VENC_HS_EXT_START_STOP_X		0x74
-+#define VENC_VS_INT_START_X			0x78
-+#define VENC_VS_INT_STOP_X__VS_INT_START_Y	0x7C
-+#define VENC_VS_INT_STOP_Y__VS_EXT_START_X	0x80
-+#define VENC_VS_EXT_STOP_X__VS_EXT_START_Y	0x84
-+#define VENC_VS_EXT_STOP_Y			0x88
-+#define VENC_AVID_START_STOP_X			0x90
-+#define VENC_AVID_START_STOP_Y			0x94
-+#define VENC_FID_INT_START_X__FID_INT_START_Y	0xA0
-+#define VENC_FID_INT_OFFSET_Y__FID_EXT_START_X	0xA4
-+#define VENC_FID_EXT_START_Y__FID_EXT_OFFSET_Y	0xA8
-+#define VENC_TVDETGP_INT_START_STOP_X		0xB0
-+#define VENC_TVDETGP_INT_START_STOP_Y		0xB4
-+#define VENC_GEN_CTRL				0xB8
-+#define VENC_OUTPUT_CONTROL			0xC4
-+#define VENC_OUTPUT_TEST			0xC8
-+#define VENC_DAC_B__DAC_C			0xC8
-+
-+struct venc_config {
-+	u32 f_control;
-+	u32 vidout_ctrl;
-+	u32 sync_ctrl;
-+	u32 llen;
-+	u32 flens;
-+	u32 hfltr_ctrl;
-+	u32 cc_carr_wss_carr;
-+	u32 c_phase;
-+	u32 gain_u;
-+	u32 gain_v;
-+	u32 gain_y;
-+	u32 black_level;
-+	u32 blank_level;
-+	u32 x_color;
-+	u32 m_control;
-+	u32 bstamp_wss_data;
-+	u32 s_carr;
-+	u32 line21;
-+	u32 ln_sel;
-+	u32 l21__wc_ctl;
-+	u32 htrigger_vtrigger;
-+	u32 savid__eavid;
-+	u32 flen__fal;
-+	u32 lal__phase_reset;
-+	u32 hs_int_start_stop_x;
-+	u32 hs_ext_start_stop_x;
-+	u32 vs_int_start_x;
-+	u32 vs_int_stop_x__vs_int_start_y;
-+	u32 vs_int_stop_y__vs_ext_start_x;
-+	u32 vs_ext_stop_x__vs_ext_start_y;
-+	u32 vs_ext_stop_y;
-+	u32 avid_start_stop_x;
-+	u32 avid_start_stop_y;
-+	u32 fid_int_start_x__fid_int_start_y;
-+	u32 fid_int_offset_y__fid_ext_start_x;
-+	u32 fid_ext_start_y__fid_ext_offset_y;
-+	u32 tvdetgp_int_start_stop_x;
-+	u32 tvdetgp_int_start_stop_y;
-+	u32 gen_ctrl;
-+};
-+
-+/* from TRM */
-+static const struct venc_config venc_config_pal_trm = {
-+	.f_control				= 0,
-+	.vidout_ctrl				= 1,
-+	.sync_ctrl				= 0x40,
-+	.llen					= 0x35F, /* 863 */
-+	.flens					= 0x270, /* 624 */
-+	.hfltr_ctrl				= 0,
-+	.cc_carr_wss_carr			= 0x2F7225ED,
-+	.c_phase				= 0,
-+	.gain_u					= 0x111,
-+	.gain_v					= 0x181,
-+	.gain_y					= 0x140,
-+	.black_level				= 0x3B,
-+	.blank_level				= 0x3B,
-+	.x_color				= 0x7,
-+	.m_control				= 0x2,
-+	.bstamp_wss_data			= 0x3F,
-+	.s_carr					= 0x2A098ACB,
-+	.line21					= 0,
-+	.ln_sel					= 0x01290015,
-+	.l21__wc_ctl				= 0x0000F603,
-+	.htrigger_vtrigger			= 0,
-+
-+	.savid__eavid				= 0x06A70108,
-+	.flen__fal				= 0x00180270,
-+	.lal__phase_reset			= 0x00040135,
-+	.hs_int_start_stop_x			= 0x00880358,
-+	.hs_ext_start_stop_x			= 0x000F035F,
-+	.vs_int_start_x				= 0x01A70000,
-+	.vs_int_stop_x__vs_int_start_y		= 0x000001A7,
-+	.vs_int_stop_y__vs_ext_start_x		= 0x01AF0000,
-+	.vs_ext_stop_x__vs_ext_start_y		= 0x000101AF,
-+	.vs_ext_stop_y				= 0x00000025,
-+	.avid_start_stop_x			= 0x03530083,
-+	.avid_start_stop_y			= 0x026C002E,
-+	.fid_int_start_x__fid_int_start_y	= 0x0001008A,
-+	.fid_int_offset_y__fid_ext_start_x	= 0x002E0138,
-+	.fid_ext_start_y__fid_ext_offset_y	= 0x01380001,
-+
-+	.tvdetgp_int_start_stop_x		= 0x00140001,
-+	.tvdetgp_int_start_stop_y		= 0x00010001,
-+	.gen_ctrl				= 0x00FF0000,
-+};
-+
-+/* from TRM */
-+static const struct venc_config venc_config_ntsc_trm = {
-+	.f_control				= 0,
-+	.vidout_ctrl				= 1,
-+	.sync_ctrl				= 0x8040,
-+	.llen					= 0x359,
-+	.flens					= 0x20C,
-+	.hfltr_ctrl				= 0,
-+	.cc_carr_wss_carr			= 0x043F2631,
-+	.c_phase				= 0,
-+	.gain_u					= 0x102,
-+	.gain_v					= 0x16C,
-+	.gain_y					= 0x12F,
-+	.black_level				= 0x43,
-+	.blank_level				= 0x38,
-+	.x_color				= 0x7,
-+	.m_control				= 0x1,
-+	.bstamp_wss_data			= 0x38,
-+	.s_carr					= 0x21F07C1F,
-+	.line21					= 0,
-+	.ln_sel					= 0x01310011,
-+	.l21__wc_ctl				= 0x0000F003,
-+	.htrigger_vtrigger			= 0,
-+
-+	.savid__eavid				= 0x069300F4,
-+	.flen__fal				= 0x0016020C,
-+	.lal__phase_reset			= 0x00060107,
-+	.hs_int_start_stop_x			= 0x008E0350,
-+	.hs_ext_start_stop_x			= 0x000F0359,
-+	.vs_int_start_x				= 0x01A00000,
-+	.vs_int_stop_x__vs_int_start_y		= 0x020701A0,
-+	.vs_int_stop_y__vs_ext_start_x		= 0x01AC0024,
-+	.vs_ext_stop_x__vs_ext_start_y		= 0x020D01AC,
-+	.vs_ext_stop_y				= 0x00000006,
-+	.avid_start_stop_x			= 0x03480078,
-+	.avid_start_stop_y			= 0x02060024,
-+	.fid_int_start_x__fid_int_start_y	= 0x0001008A,
-+	.fid_int_offset_y__fid_ext_start_x	= 0x01AC0106,
-+	.fid_ext_start_y__fid_ext_offset_y	= 0x01060006,
-+
-+	.tvdetgp_int_start_stop_x		= 0x00140001,
-+	.tvdetgp_int_start_stop_y		= 0x00010001,
-+	.gen_ctrl				= 0x00F90000,
-+};
-+
-+static const struct venc_config venc_config_pal_bdghi = {
-+	.f_control				= 0,
-+	.vidout_ctrl				= 0,
-+	.sync_ctrl				= 0,
-+	.hfltr_ctrl				= 0,
-+	.x_color				= 0,
-+	.line21					= 0,
-+	.ln_sel					= 21,
-+	.htrigger_vtrigger			= 0,
-+	.tvdetgp_int_start_stop_x		= 0x00140001,
-+	.tvdetgp_int_start_stop_y		= 0x00010001,
-+	.gen_ctrl				= 0x00FB0000,
-+
-+	.llen					= 864-1,
-+	.flens					= 625-1,
-+	.cc_carr_wss_carr			= 0x2F7625ED,
-+	.c_phase				= 0xDF,
-+	.gain_u					= 0x111,
-+	.gain_v					= 0x181,
-+	.gain_y					= 0x140,
-+	.black_level				= 0x3e,
-+	.blank_level				= 0x3e,
-+	.m_control				= 0<<2 | 1<<1,
-+	.bstamp_wss_data			= 0x42,
-+	.s_carr					= 0x2a098acb,
-+	.l21__wc_ctl				= 0<<13 | 0x16<<8 | 0<<0,
-+	.savid__eavid				= 0x06A70108,
-+	.flen__fal				= 23<<16 | 624<<0,
-+	.lal__phase_reset			= 2<<17 | 310<<0,
-+	.hs_int_start_stop_x			= 0x00920358,
-+	.hs_ext_start_stop_x			= 0x000F035F,
-+	.vs_int_start_x				= 0x1a7<<16,
-+	.vs_int_stop_x__vs_int_start_y		= 0x000601A7,
-+	.vs_int_stop_y__vs_ext_start_x		= 0x01AF0036,
-+	.vs_ext_stop_x__vs_ext_start_y		= 0x27101af,
-+	.vs_ext_stop_y				= 0x05,
-+	.avid_start_stop_x			= 0x03530082,
-+	.avid_start_stop_y			= 0x0270002E,
-+	.fid_int_start_x__fid_int_start_y	= 0x0005008A,
-+	.fid_int_offset_y__fid_ext_start_x	= 0x002E0138,
-+	.fid_ext_start_y__fid_ext_offset_y	= 0x01380005,
-+};
-+
-+const struct omap_video_timings omap_dss_pal_timings = {
-+	.x_res		= 720,
-+	.y_res		= 574,
-+	.pixel_clock	= 13500,
-+	.hsw		= 64,
-+	.hfp		= 12,
-+	.hbp		= 68,
-+	.vsw		= 5,
-+	.vfp		= 5,
-+	.vbp		= 41,
-+};
-+EXPORT_SYMBOL(omap_dss_pal_timings);
-+
-+const struct omap_video_timings omap_dss_ntsc_timings = {
-+	.x_res		= 720,
-+	.y_res		= 482,
-+	.pixel_clock	= 13500,
-+	.hsw		= 64,
-+	.hfp		= 16,
-+	.hbp		= 58,
-+	.vsw		= 6,
-+	.vfp		= 6,
-+	.vbp		= 31,
-+};
-+EXPORT_SYMBOL(omap_dss_ntsc_timings);
-+
-+static struct {
-+	void __iomem *base;
-+	struct mutex venc_lock;
-+	u32 wss_data;
-+	struct regulator *vdda_dac_reg;
-+} venc;
-+
-+static inline void venc_write_reg(int idx, u32 val)
-+{
-+	__raw_writel(val, venc.base + idx);
-+}
-+
-+static inline u32 venc_read_reg(int idx)
-+{
-+	u32 l = __raw_readl(venc.base + idx);
-+	return l;
-+}
-+
-+static void venc_write_config(const struct venc_config *config)
-+{
-+	DSSDBG("write venc conf\n");
-+
-+	venc_write_reg(VENC_LLEN, config->llen);
-+	venc_write_reg(VENC_FLENS, config->flens);
-+	venc_write_reg(VENC_CC_CARR_WSS_CARR, config->cc_carr_wss_carr);
-+	venc_write_reg(VENC_C_PHASE, config->c_phase);
-+	venc_write_reg(VENC_GAIN_U, config->gain_u);
-+	venc_write_reg(VENC_GAIN_V, config->gain_v);
-+	venc_write_reg(VENC_GAIN_Y, config->gain_y);
-+	venc_write_reg(VENC_BLACK_LEVEL, config->black_level);
-+	venc_write_reg(VENC_BLANK_LEVEL, config->blank_level);
-+	venc_write_reg(VENC_M_CONTROL, config->m_control);
-+	venc_write_reg(VENC_BSTAMP_WSS_DATA, config->bstamp_wss_data |
-+			venc.wss_data);
-+	venc_write_reg(VENC_S_CARR, config->s_carr);
-+	venc_write_reg(VENC_L21__WC_CTL, config->l21__wc_ctl);
-+	venc_write_reg(VENC_SAVID__EAVID, config->savid__eavid);
-+	venc_write_reg(VENC_FLEN__FAL, config->flen__fal);
-+	venc_write_reg(VENC_LAL__PHASE_RESET, config->lal__phase_reset);
-+	venc_write_reg(VENC_HS_INT_START_STOP_X, config->hs_int_start_stop_x);
-+	venc_write_reg(VENC_HS_EXT_START_STOP_X, config->hs_ext_start_stop_x);
-+	venc_write_reg(VENC_VS_INT_START_X, config->vs_int_start_x);
-+	venc_write_reg(VENC_VS_INT_STOP_X__VS_INT_START_Y,
-+		       config->vs_int_stop_x__vs_int_start_y);
-+	venc_write_reg(VENC_VS_INT_STOP_Y__VS_EXT_START_X,
-+		       config->vs_int_stop_y__vs_ext_start_x);
-+	venc_write_reg(VENC_VS_EXT_STOP_X__VS_EXT_START_Y,
-+		       config->vs_ext_stop_x__vs_ext_start_y);
-+	venc_write_reg(VENC_VS_EXT_STOP_Y, config->vs_ext_stop_y);
-+	venc_write_reg(VENC_AVID_START_STOP_X, config->avid_start_stop_x);
-+	venc_write_reg(VENC_AVID_START_STOP_Y, config->avid_start_stop_y);
-+	venc_write_reg(VENC_FID_INT_START_X__FID_INT_START_Y,
-+		       config->fid_int_start_x__fid_int_start_y);
-+	venc_write_reg(VENC_FID_INT_OFFSET_Y__FID_EXT_START_X,
-+		       config->fid_int_offset_y__fid_ext_start_x);
-+	venc_write_reg(VENC_FID_EXT_START_Y__FID_EXT_OFFSET_Y,
-+		       config->fid_ext_start_y__fid_ext_offset_y);
-+
-+	venc_write_reg(VENC_DAC_B__DAC_C,  venc_read_reg(VENC_DAC_B__DAC_C));
-+	venc_write_reg(VENC_VIDOUT_CTRL, config->vidout_ctrl);
-+	venc_write_reg(VENC_HFLTR_CTRL, config->hfltr_ctrl);
-+	venc_write_reg(VENC_X_COLOR, config->x_color);
-+	venc_write_reg(VENC_LINE21, config->line21);
-+	venc_write_reg(VENC_LN_SEL, config->ln_sel);
-+	venc_write_reg(VENC_HTRIGGER_VTRIGGER, config->htrigger_vtrigger);
-+	venc_write_reg(VENC_TVDETGP_INT_START_STOP_X,
-+		       config->tvdetgp_int_start_stop_x);
-+	venc_write_reg(VENC_TVDETGP_INT_START_STOP_Y,
-+		       config->tvdetgp_int_start_stop_y);
-+	venc_write_reg(VENC_GEN_CTRL, config->gen_ctrl);
-+	venc_write_reg(VENC_F_CONTROL, config->f_control);
-+	venc_write_reg(VENC_SYNC_CTRL, config->sync_ctrl);
-+}
-+
-+static void venc_reset(void)
-+{
-+	int t = 1000;
-+
-+	venc_write_reg(VENC_F_CONTROL, 1<<8);
-+	while (venc_read_reg(VENC_F_CONTROL) & (1<<8)) {
-+		if (--t == 0) {
-+			DSSERR("Failed to reset venc\n");
-+			return;
-+		}
-+	}
-+
-+	/* the magical sleep that makes things work */
-+	msleep(20);
-+}
-+
-+static void venc_enable_clocks(int enable)
-+{
-+	if (enable)
-+		dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1 | DSS_CLK_54M |
-+				DSS_CLK_96M);
-+	else
-+		dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1 | DSS_CLK_54M |
-+				DSS_CLK_96M);
-+}
-+
-+static const struct venc_config *venc_timings_to_config(
-+		struct omap_video_timings *timings)
-+{
-+	if (memcmp(&omap_dss_pal_timings, timings, sizeof(*timings)) == 0)
-+		return &venc_config_pal_trm;
-+
-+	if (memcmp(&omap_dss_ntsc_timings, timings, sizeof(*timings)) == 0)
-+		return &venc_config_ntsc_trm;
-+
-+	BUG();
-+}
-+
-+
-+
-+
-+
-+/* driver */
-+static int venc_panel_probe(struct omap_dss_device *dssdev)
-+{
-+	dssdev->panel.timings = omap_dss_pal_timings;
-+
-+	return 0;
-+}
-+
-+static void venc_panel_remove(struct omap_dss_device *dssdev)
-+{
-+}
-+
-+static int venc_panel_enable(struct omap_dss_device *dssdev)
-+{
-+	int r = 0;
-+
-+	/* wait couple of vsyncs until enabling the LCD */
-+	msleep(50);
-+
-+	if (dssdev->platform_enable)
-+		r = dssdev->platform_enable(dssdev);
-+
-+	return r;
-+}
-+
-+static void venc_panel_disable(struct omap_dss_device *dssdev)
-+{
-+	if (dssdev->platform_disable)
-+		dssdev->platform_disable(dssdev);
-+
-+	/* wait at least 5 vsyncs after disabling the LCD */
-+
-+	msleep(100);
-+}
-+
-+static int venc_panel_suspend(struct omap_dss_device *dssdev)
-+{
-+	venc_panel_disable(dssdev);
-+	return 0;
-+}
-+
-+static int venc_panel_resume(struct omap_dss_device *dssdev)
-+{
-+	return venc_panel_enable(dssdev);
-+}
-+
-+static struct omap_dss_driver venc_driver = {
-+	.probe		= venc_panel_probe,
-+	.remove		= venc_panel_remove,
-+
-+	.enable		= venc_panel_enable,
-+	.disable	= venc_panel_disable,
-+	.suspend	= venc_panel_suspend,
-+	.resume		= venc_panel_resume,
-+
-+	.driver         = {
-+		.name   = "venc",
-+		.owner  = THIS_MODULE,
-+	},
-+};
-+/* driver end */
-+
-+
-+
-+int venc_init(struct platform_device *pdev)
-+{
-+	u8 rev_id;
-+
-+	mutex_init(&venc.venc_lock);
-+
-+	venc.wss_data = 0;
-+
-+	venc.base = ioremap(VENC_BASE, SZ_1K);
-+	if (!venc.base) {
-+		DSSERR("can't ioremap VENC\n");
-+		return -ENOMEM;
-+	}
-+
-+	venc.vdda_dac_reg = regulator_get(&pdev->dev, "vdda_dac");
-+	if (IS_ERR(venc.vdda_dac_reg)) {
-+		iounmap(venc.base);
-+		DSSERR("can't get VDDA_DAC regulator\n");
-+		return PTR_ERR(venc.vdda_dac_reg);
-+	}
-+
-+	venc_enable_clocks(1);
-+
-+	rev_id = (u8)(venc_read_reg(VENC_REV_ID) & 0xff);
-+	printk(KERN_INFO "OMAP VENC rev %d\n", rev_id);
-+
-+	venc_enable_clocks(0);
-+
-+	return omap_dss_register_driver(&venc_driver);
-+}
-+
-+void venc_exit(void)
-+{
-+	omap_dss_unregister_driver(&venc_driver);
-+
-+	regulator_put(venc.vdda_dac_reg);
-+
-+	iounmap(venc.base);
-+}
-+
-+static void venc_power_on(struct omap_dss_device *dssdev)
-+{
-+	u32 l;
-+
-+	venc_enable_clocks(1);
-+
-+	venc_reset();
-+	venc_write_config(venc_timings_to_config(&dssdev->panel.timings));
-+
-+	dss_set_venc_output(dssdev->phy.venc.type);
-+	dss_set_dac_pwrdn_bgz(1);
-+
-+	l = 0;
-+
-+	if (dssdev->phy.venc.type == OMAP_DSS_VENC_TYPE_COMPOSITE)
-+		l |= 1 << 1;
-+	else /* S-Video */
-+		l |= (1 << 0) | (1 << 2);
-+
-+	if (dssdev->phy.venc.invert_polarity == false)
-+		l |= 1 << 3;
-+
-+	venc_write_reg(VENC_OUTPUT_CONTROL, l);
-+
-+	dispc_set_digit_size(dssdev->panel.timings.x_res,
-+			dssdev->panel.timings.y_res/2);
-+
-+	regulator_enable(venc.vdda_dac_reg);
-+
-+	if (dssdev->platform_enable)
-+		dssdev->platform_enable(dssdev);
-+
-+	dispc_enable_digit_out(1);
-+}
-+
-+static void venc_power_off(struct omap_dss_device *dssdev)
-+{
-+	venc_write_reg(VENC_OUTPUT_CONTROL, 0);
-+	dss_set_dac_pwrdn_bgz(0);
-+
-+	dispc_enable_digit_out(0);
-+
-+	if (dssdev->platform_disable)
-+		dssdev->platform_disable(dssdev);
-+
-+	regulator_disable(venc.vdda_dac_reg);
-+
-+	venc_enable_clocks(0);
-+}
-+
-+static int venc_enable_display(struct omap_dss_device *dssdev)
-+{
-+	int r = 0;
-+
-+	DSSDBG("venc_enable_display\n");
-+
-+	mutex_lock(&venc.venc_lock);
-+
-+	if (dssdev->state != OMAP_DSS_DISPLAY_DISABLED) {
-+		r = -EINVAL;
-+		goto err;
-+	}
-+
-+	venc_power_on(dssdev);
-+
-+	venc.wss_data = 0;
-+
-+	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
-+err:
-+	mutex_unlock(&venc.venc_lock);
-+
-+	return r;
-+}
-+
-+static void venc_disable_display(struct omap_dss_device *dssdev)
-+{
-+	DSSDBG("venc_disable_display\n");
-+
-+	mutex_lock(&venc.venc_lock);
-+
-+	if (dssdev->state == OMAP_DSS_DISPLAY_DISABLED)
-+		goto end;
-+
-+	if (dssdev->state == OMAP_DSS_DISPLAY_SUSPENDED) {
-+		/* suspended is the same as disabled with venc */
-+		dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
-+		goto end;
-+	}
-+
-+	venc_power_off(dssdev);
-+
-+	dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
-+end:
-+	mutex_unlock(&venc.venc_lock);
-+}
-+
-+static int venc_display_suspend(struct omap_dss_device *dssdev)
-+{
-+	int r = 0;
-+
-+	DSSDBG("venc_display_suspend\n");
-+
-+	mutex_lock(&venc.venc_lock);
-+
-+	if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE) {
-+		r = -EINVAL;
-+		goto err;
-+	}
-+
-+	venc_power_off(dssdev);
-+
-+	dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
-+err:
-+	mutex_unlock(&venc.venc_lock);
-+
-+	return r;
-+}
-+
-+static int venc_display_resume(struct omap_dss_device *dssdev)
-+{
-+	int r = 0;
-+
-+	DSSDBG("venc_display_resume\n");
-+
-+	mutex_lock(&venc.venc_lock);
-+
-+	if (dssdev->state != OMAP_DSS_DISPLAY_SUSPENDED) {
-+		r = -EINVAL;
-+		goto err;
-+	}
-+
-+	venc_power_on(dssdev);
-+
-+	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
-+err:
-+	mutex_unlock(&venc.venc_lock);
-+
-+	return r;
-+}
-+
-+static void venc_get_timings(struct omap_dss_device *dssdev,
-+			struct omap_video_timings *timings)
-+{
-+	*timings = dssdev->panel.timings;
-+}
-+
-+static void venc_set_timings(struct omap_dss_device *dssdev,
-+			struct omap_video_timings *timings)
-+{
-+	DSSDBG("venc_set_timings\n");
-+
-+	/* Reset WSS data when the TV standard changes. */
-+	if (memcmp(&dssdev->panel.timings, timings, sizeof(*timings)))
-+		venc.wss_data = 0;
-+
-+	dssdev->panel.timings = *timings;
-+	if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE) {
-+		/* turn the venc off and on to get new timings to use */
-+		venc_disable_display(dssdev);
-+		venc_enable_display(dssdev);
-+	}
-+}
-+
-+static int venc_check_timings(struct omap_dss_device *dssdev,
-+			struct omap_video_timings *timings)
-+{
-+	DSSDBG("venc_check_timings\n");
-+
-+	if (memcmp(&omap_dss_pal_timings, timings, sizeof(*timings)) == 0)
-+		return 0;
-+
-+	if (memcmp(&omap_dss_ntsc_timings, timings, sizeof(*timings)) == 0)
-+		return 0;
-+
-+	return -EINVAL;
-+}
-+
-+static u32 venc_get_wss(struct omap_dss_device *dssdev)
-+{
-+	/* Invert due to VENC_L21_WC_CTL:INV=1 */
-+	return (venc.wss_data >> 8) ^ 0xfffff;
-+}
-+
-+static int venc_set_wss(struct omap_dss_device *dssdev,	u32 wss)
-+{
-+	const struct venc_config *config;
-+
-+	DSSDBG("venc_set_wss\n");
-+
-+	mutex_lock(&venc.venc_lock);
-+
-+	config = venc_timings_to_config(&dssdev->panel.timings);
-+
-+	/* Invert due to VENC_L21_WC_CTL:INV=1 */
-+	venc.wss_data = (wss ^ 0xfffff) << 8;
-+
-+	venc_enable_clocks(1);
-+
-+	venc_write_reg(VENC_BSTAMP_WSS_DATA, config->bstamp_wss_data |
-+			venc.wss_data);
-+
-+	venc_enable_clocks(0);
-+
-+	mutex_unlock(&venc.venc_lock);
-+
-+	return 0;
-+}
-+
-+static enum omap_dss_update_mode venc_display_get_update_mode(
-+		struct omap_dss_device *dssdev)
-+{
-+	if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)
-+		return OMAP_DSS_UPDATE_AUTO;
-+	else
-+		return OMAP_DSS_UPDATE_DISABLED;
-+}
-+
-+int venc_init_display(struct omap_dss_device *dssdev)
-+{
-+	DSSDBG("init_display\n");
-+
-+	dssdev->enable = venc_enable_display;
-+	dssdev->disable = venc_disable_display;
-+	dssdev->suspend = venc_display_suspend;
-+	dssdev->resume = venc_display_resume;
-+	dssdev->get_timings = venc_get_timings;
-+	dssdev->set_timings = venc_set_timings;
-+	dssdev->check_timings = venc_check_timings;
-+	dssdev->get_wss = venc_get_wss;
-+	dssdev->set_wss = venc_set_wss;
-+	dssdev->get_update_mode = venc_display_get_update_mode;
-+
-+	return 0;
-+}
-+
-+void venc_dump_regs(struct seq_file *s)
-+{
-+#define DUMPREG(r) seq_printf(s, "%-35s %08x\n", #r, venc_read_reg(r))
-+
-+	venc_enable_clocks(1);
-+
-+	DUMPREG(VENC_F_CONTROL);
-+	DUMPREG(VENC_VIDOUT_CTRL);
-+	DUMPREG(VENC_SYNC_CTRL);
-+	DUMPREG(VENC_LLEN);
-+	DUMPREG(VENC_FLENS);
-+	DUMPREG(VENC_HFLTR_CTRL);
-+	DUMPREG(VENC_CC_CARR_WSS_CARR);
-+	DUMPREG(VENC_C_PHASE);
-+	DUMPREG(VENC_GAIN_U);
-+	DUMPREG(VENC_GAIN_V);
-+	DUMPREG(VENC_GAIN_Y);
-+	DUMPREG(VENC_BLACK_LEVEL);
-+	DUMPREG(VENC_BLANK_LEVEL);
-+	DUMPREG(VENC_X_COLOR);
-+	DUMPREG(VENC_M_CONTROL);
-+	DUMPREG(VENC_BSTAMP_WSS_DATA);
-+	DUMPREG(VENC_S_CARR);
-+	DUMPREG(VENC_LINE21);
-+	DUMPREG(VENC_LN_SEL);
-+	DUMPREG(VENC_L21__WC_CTL);
-+	DUMPREG(VENC_HTRIGGER_VTRIGGER);
-+	DUMPREG(VENC_SAVID__EAVID);
-+	DUMPREG(VENC_FLEN__FAL);
-+	DUMPREG(VENC_LAL__PHASE_RESET);
-+	DUMPREG(VENC_HS_INT_START_STOP_X);
-+	DUMPREG(VENC_HS_EXT_START_STOP_X);
-+	DUMPREG(VENC_VS_INT_START_X);
-+	DUMPREG(VENC_VS_INT_STOP_X__VS_INT_START_Y);
-+	DUMPREG(VENC_VS_INT_STOP_Y__VS_EXT_START_X);
-+	DUMPREG(VENC_VS_EXT_STOP_X__VS_EXT_START_Y);
-+	DUMPREG(VENC_VS_EXT_STOP_Y);
-+	DUMPREG(VENC_AVID_START_STOP_X);
-+	DUMPREG(VENC_AVID_START_STOP_Y);
-+	DUMPREG(VENC_FID_INT_START_X__FID_INT_START_Y);
-+	DUMPREG(VENC_FID_INT_OFFSET_Y__FID_EXT_START_X);
-+	DUMPREG(VENC_FID_EXT_START_Y__FID_EXT_OFFSET_Y);
-+	DUMPREG(VENC_TVDETGP_INT_START_STOP_X);
-+	DUMPREG(VENC_TVDETGP_INT_START_STOP_Y);
-+	DUMPREG(VENC_GEN_CTRL);
-+	DUMPREG(VENC_OUTPUT_CONTROL);
-+	DUMPREG(VENC_OUTPUT_TEST);
-+
-+	venc_enable_clocks(0);
-+
-+#undef DUMPREG
-+}
---- /dev/null
-+++ b/drivers/video/omap2/omapfb/Kconfig
-@@ -0,0 +1,37 @@
-+menuconfig FB_OMAP2
-+        tristate "OMAP2/3 frame buffer support (EXPERIMENTAL)"
-+        depends on FB && OMAP2_DSS
-+
-+	select OMAP2_VRAM
-+	select OMAP2_VRFB
-+        select FB_CFB_FILLRECT
-+        select FB_CFB_COPYAREA
-+        select FB_CFB_IMAGEBLIT
-+        help
-+          Frame buffer driver for OMAP2/3 based boards.
-+
-+config FB_OMAP2_DEBUG_SUPPORT
-+	bool "Debug support for OMAP2/3 FB"
-+	default y
-+	depends on FB_OMAP2
-+	help
-+	  Support for debug output. You have to enable the actual printing
-+	  with debug module parameter.
-+
-+config FB_OMAP2_FORCE_AUTO_UPDATE
-+	bool "Force main display to automatic update mode"
-+	depends on FB_OMAP2
-+	help
-+	  Forces main display to automatic update mode (if possible),
-+	  and also enables tearsync (if possible). By default
-+	  displays that support manual update are started in manual
-+	  update mode.
-+
-+config FB_OMAP2_NUM_FBS
-+	int "Number of framebuffers"
-+	range 1 10
-+	default 3
-+	depends on FB_OMAP2
-+	help
-+	  Select the number of framebuffers created. OMAP2/3 has 3 overlays
-+	  so normally this would be 3.
---- /dev/null
-+++ b/drivers/video/omap2/omapfb/Makefile
-@@ -0,0 +1,2 @@
-+obj-$(CONFIG_FB_OMAP2) += omapfb.o
-+omapfb-y := omapfb-main.o omapfb-sysfs.o omapfb-ioctl.o
---- /dev/null
-+++ b/drivers/video/omap2/omapfb/omapfb-ioctl.c
-@@ -0,0 +1,727 @@
-+/*
-+ * linux/drivers/video/omap2/omapfb-ioctl.c
-+ *
-+ * Copyright (C) 2008 Nokia Corporation
-+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
-+ *
-+ * Some code and ideas taken from drivers/video/omap/ driver
-+ * by Imre Deak.
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-+ * more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along with
-+ * this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include <linux/fb.h>
-+#include <linux/device.h>
-+#include <linux/uaccess.h>
-+#include <linux/platform_device.h>
-+#include <linux/mm.h>
-+#include <linux/omapfb.h>
-+#include <linux/vmalloc.h>
-+
-+#include <mach/display.h>
-+#include <mach/vrfb.h>
-+#include <mach/vram.h>
-+
-+#include "omapfb.h"
-+
-+static int omapfb_setup_plane(struct fb_info *fbi, struct omapfb_plane_info *pi)
-+{
-+	struct omapfb_info *ofbi = FB2OFB(fbi);
-+	struct omapfb2_device *fbdev = ofbi->fbdev;
-+	struct omap_dss_device *display = fb2display(fbi);
-+	struct omap_overlay *ovl;
-+	struct omap_overlay_info info;
-+	int r = 0;
-+
-+	DBG("omapfb_setup_plane\n");
-+
-+	if (ofbi->num_overlays != 1) {
-+		r = -EINVAL;
-+		goto out;
-+	}
-+
-+	/* XXX uses only the first overlay */
-+	ovl = ofbi->overlays[0];
-+
-+	if (pi->enabled && !ofbi->region.size) {
-+		/*
-+		 * This plane's memory was freed, can't enable it
-+		 * until it's reallocated.
-+		 */
-+		r = -EINVAL;
-+		goto out;
-+	}
-+
-+	ovl->get_overlay_info(ovl, &info);
-+
-+	info.pos_x = pi->pos_x;
-+	info.pos_y = pi->pos_y;
-+	info.out_width = pi->out_width;
-+	info.out_height = pi->out_height;
-+	info.enabled = pi->enabled;
-+
-+	r = ovl->set_overlay_info(ovl, &info);
-+	if (r)
-+		goto out;
-+
-+	if (ovl->manager) {
-+		r = ovl->manager->apply(ovl->manager);
-+		if (r)
-+			goto out;
-+	}
-+
-+	if (display) {
-+		u16 w, h;
-+
-+		if (display->sync)
-+			display->sync(display);
-+
-+		display->get_resolution(display, &w, &h);
-+
-+		if (display->update)
-+			display->update(display, 0, 0, w, h);
-+	}
-+
-+out:
-+	if (r)
-+		dev_err(fbdev->dev, "setup_plane failed\n");
-+	return r;
-+}
-+
-+static int omapfb_query_plane(struct fb_info *fbi, struct omapfb_plane_info *pi)
-+{
-+	struct omapfb_info *ofbi = FB2OFB(fbi);
-+
-+	if (ofbi->num_overlays != 1) {
-+		memset(pi, 0, sizeof(*pi));
-+	} else {
-+		struct omap_overlay_info *ovli;
-+		struct omap_overlay *ovl;
-+
-+		ovl = ofbi->overlays[0];
-+		ovli = &ovl->info;
-+
-+		pi->pos_x = ovli->pos_x;
-+		pi->pos_y = ovli->pos_y;
-+		pi->enabled = ovli->enabled;
-+		pi->channel_out = 0; /* xxx */
-+		pi->mirror = 0;
-+		pi->out_width = ovli->out_width;
-+		pi->out_height = ovli->out_height;
-+	}
-+
-+	return 0;
-+}
-+
-+static int omapfb_setup_mem(struct fb_info *fbi, struct omapfb_mem_info *mi)
-+{
-+	struct omapfb_info *ofbi = FB2OFB(fbi);
-+	struct omapfb2_device *fbdev = ofbi->fbdev;
-+	struct omapfb2_mem_region *rg;
-+	int r, i;
-+	size_t size;
-+
-+	if (mi->type > OMAPFB_MEMTYPE_MAX)
-+		return -EINVAL;
-+
-+	size = PAGE_ALIGN(mi->size);
-+
-+	rg = &ofbi->region;
-+
-+	for (i = 0; i < ofbi->num_overlays; i++) {
-+		if (ofbi->overlays[i]->info.enabled)
-+			return -EBUSY;
-+	}
-+
-+	if (rg->size != size || rg->type != mi->type) {
-+		r = omapfb_realloc_fbmem(fbi, size, mi->type);
-+		if (r) {
-+			dev_err(fbdev->dev, "realloc fbmem failed\n");
-+			return r;
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+static int omapfb_query_mem(struct fb_info *fbi, struct omapfb_mem_info *mi)
-+{
-+	struct omapfb_info *ofbi = FB2OFB(fbi);
-+	struct omapfb2_mem_region *rg;
-+
-+	rg = &ofbi->region;
-+	memset(mi, 0, sizeof(*mi));
-+
-+	mi->size = rg->size;
-+	mi->type = rg->type;
-+
-+	return 0;
-+}
-+
-+static int omapfb_update_window(struct fb_info *fbi,
-+		u32 x, u32 y, u32 w, u32 h)
-+{
-+	struct omap_dss_device *display = fb2display(fbi);
-+	u16 dw, dh;
-+
-+	if (!display)
-+		return 0;
-+
-+	if (w == 0 || h == 0)
-+		return 0;
-+
-+	display->get_resolution(display, &dw, &dh);
-+
-+	if (x + w > dw || y + h > dh)
-+		return -EINVAL;
-+
-+	display->update(display, x, y, w, h);
-+
-+	return 0;
-+}
-+
-+static int omapfb_set_update_mode(struct fb_info *fbi,
-+				   enum omapfb_update_mode mode)
-+{
-+	struct omap_dss_device *display = fb2display(fbi);
-+	enum omap_dss_update_mode um;
-+	int r;
-+
-+	if (!display || !display->set_update_mode)
-+		return -EINVAL;
-+
-+	switch (mode) {
-+	case OMAPFB_UPDATE_DISABLED:
-+		um = OMAP_DSS_UPDATE_DISABLED;
-+		break;
-+
-+	case OMAPFB_AUTO_UPDATE:
-+		um = OMAP_DSS_UPDATE_AUTO;
-+		break;
-+
-+	case OMAPFB_MANUAL_UPDATE:
-+		um = OMAP_DSS_UPDATE_MANUAL;
-+		break;
-+
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	r = display->set_update_mode(display, um);
-+
-+	return r;
-+}
-+
-+static int omapfb_get_update_mode(struct fb_info *fbi,
-+		enum omapfb_update_mode *mode)
-+{
-+	struct omap_dss_device *display = fb2display(fbi);
-+	enum omap_dss_update_mode m;
-+
-+	if (!display || !display->get_update_mode)
-+		return -EINVAL;
-+
-+	m = display->get_update_mode(display);
-+
-+	switch (m) {
-+	case OMAP_DSS_UPDATE_DISABLED:
-+		*mode = OMAPFB_UPDATE_DISABLED;
-+		break;
-+	case OMAP_DSS_UPDATE_AUTO:
-+		*mode = OMAPFB_AUTO_UPDATE;
-+		break;
-+	case OMAP_DSS_UPDATE_MANUAL:
-+		*mode = OMAPFB_MANUAL_UPDATE;
-+		break;
-+	default:
-+		BUG();
-+	}
-+
-+	return 0;
-+}
-+
-+/* XXX this color key handling is a hack... */
-+static struct omapfb_color_key omapfb_color_keys[2];
-+
-+static int _omapfb_set_color_key(struct omap_overlay_manager *mgr,
-+		struct omapfb_color_key *ck)
-+{
-+	struct omap_overlay_manager_info info;
-+	enum omap_dss_trans_key_type kt;
-+	int r;
-+
-+	mgr->get_manager_info(mgr, &info);
-+
-+	if (ck->key_type == OMAPFB_COLOR_KEY_DISABLED) {
-+		info.trans_enabled = false;
-+		omapfb_color_keys[mgr->id] = *ck;
-+
-+		r = mgr->set_manager_info(mgr, &info);
-+		if (r)
-+			return r;
-+
-+		r = mgr->apply(mgr);
-+
-+		return r;
-+	}
-+
-+	switch (ck->key_type) {
-+	case OMAPFB_COLOR_KEY_GFX_DST:
-+		kt = OMAP_DSS_COLOR_KEY_GFX_DST;
-+		break;
-+	case OMAPFB_COLOR_KEY_VID_SRC:
-+		kt = OMAP_DSS_COLOR_KEY_VID_SRC;
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	info.default_color = ck->background;
-+	info.trans_key = ck->trans_key;
-+	info.trans_key_type = kt;
-+	info.trans_enabled = true;
-+
-+	omapfb_color_keys[mgr->id] = *ck;
-+
-+	r = mgr->set_manager_info(mgr, &info);
-+	if (r)
-+		return r;
-+
-+	r = mgr->apply(mgr);
-+
-+	return r;
-+}
-+
-+static int omapfb_set_color_key(struct fb_info *fbi,
-+		struct omapfb_color_key *ck)
-+{
-+	struct omapfb_info *ofbi = FB2OFB(fbi);
-+	struct omapfb2_device *fbdev = ofbi->fbdev;
-+	int r;
-+	int i;
-+	struct omap_overlay_manager *mgr = NULL;
-+
-+	omapfb_lock(fbdev);
-+
-+	for (i = 0; i < ofbi->num_overlays; i++) {
-+		if (ofbi->overlays[i]->manager) {
-+			mgr = ofbi->overlays[i]->manager;
-+			break;
-+		}
-+	}
-+
-+	if (!mgr) {
-+		r = -EINVAL;
-+		goto err;
-+	}
-+
-+	r = _omapfb_set_color_key(mgr, ck);
-+err:
-+	omapfb_unlock(fbdev);
-+
-+	return r;
-+}
-+
-+static int omapfb_get_color_key(struct fb_info *fbi,
-+		struct omapfb_color_key *ck)
-+{
-+	struct omapfb_info *ofbi = FB2OFB(fbi);
-+	struct omapfb2_device *fbdev = ofbi->fbdev;
-+	struct omap_overlay_manager *mgr = NULL;
-+	int r = 0;
-+	int i;
-+
-+	omapfb_lock(fbdev);
-+
-+	for (i = 0; i < ofbi->num_overlays; i++) {
-+		if (ofbi->overlays[i]->manager) {
-+			mgr = ofbi->overlays[i]->manager;
-+			break;
-+		}
-+	}
-+
-+	if (!mgr) {
-+		r = -EINVAL;
-+		goto err;
-+	}
-+
-+	*ck = omapfb_color_keys[mgr->id];
-+err:
-+	omapfb_unlock(fbdev);
-+
-+	return r;
-+}
-+
-+static int omapfb_memory_read(struct fb_info *fbi,
-+		struct omapfb_memory_read *mr)
-+{
-+	struct omap_dss_device *display = fb2display(fbi);
-+	void *buf;
-+	int r;
-+
-+	if (!display || !display->memory_read)
-+		return -ENOENT;
-+
-+	if (!access_ok(VERIFY_WRITE, mr->buffer, mr->buffer_size))
-+		return -EFAULT;
-+
-+	if (mr->w * mr->h * 3 > mr->buffer_size)
-+		return -EINVAL;
-+
-+	buf = vmalloc(mr->buffer_size);
-+	if (!buf) {
-+		DBG("vmalloc failed\n");
-+		return -ENOMEM;
-+	}
-+
-+	r = display->memory_read(display, buf, mr->buffer_size,
-+			mr->x, mr->y, mr->w, mr->h);
-+
-+	if (r > 0) {
-+		if (copy_to_user(mr->buffer, buf, mr->buffer_size))
-+			r = -EFAULT;
-+	}
-+
-+	vfree(buf);
-+
-+	return r;
-+}
-+
-+static int omapfb_get_ovl_colormode(struct omapfb2_device *fbdev,
-+			     struct omapfb_ovl_colormode *mode)
-+{
-+	int ovl_idx = mode->overlay_idx;
-+	int mode_idx = mode->mode_idx;
-+	struct omap_overlay *ovl;
-+	enum omap_color_mode supported_modes;
-+	struct fb_var_screeninfo var;
-+	int i;
-+
-+	if (ovl_idx >= fbdev->num_overlays)
-+		return -ENODEV;
-+	ovl = fbdev->overlays[ovl_idx];
-+	supported_modes = ovl->supported_modes;
-+
-+	mode_idx = mode->mode_idx;
-+
-+	for (i = 0; i < sizeof(supported_modes) * 8; i++) {
-+		if (!(supported_modes & (1 << i)))
-+			continue;
-+		/*
-+		 * It's possible that the FB doesn't support a mode
-+		 * that is supported by the overlay, so call the
-+		 * following here.
-+		 */
-+		if (dss_mode_to_fb_mode(1 << i, &var) < 0)
-+			continue;
-+
-+		mode_idx--;
-+		if (mode_idx < 0)
-+			break;
-+	}
-+
-+	if (i == sizeof(supported_modes) * 8)
-+		return -ENOENT;
-+
-+	mode->bits_per_pixel = var.bits_per_pixel;
-+	mode->nonstd = var.nonstd;
-+	mode->red = var.red;
-+	mode->green = var.green;
-+	mode->blue = var.blue;
-+	mode->transp = var.transp;
-+
-+	return 0;
-+}
-+
-+static int omapfb_wait_for_go(struct fb_info *fbi)
-+{
-+	struct omapfb_info *ofbi = FB2OFB(fbi);
-+	int r = 0;
-+	int i;
-+
-+	for (i = 0; i < ofbi->num_overlays; ++i) {
-+		struct omap_overlay *ovl = ofbi->overlays[i];
-+		r = ovl->wait_for_go(ovl);
-+		if (r)
-+			break;
-+	}
-+
-+	return r;
-+}
-+
-+int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg)
-+{
-+	struct omapfb_info *ofbi = FB2OFB(fbi);
-+	struct omapfb2_device *fbdev = ofbi->fbdev;
-+	struct omap_dss_device *display = fb2display(fbi);
-+
-+	union {
-+		struct omapfb_update_window_old	uwnd_o;
-+		struct omapfb_update_window	uwnd;
-+		struct omapfb_plane_info	plane_info;
-+		struct omapfb_caps		caps;
-+		struct omapfb_mem_info          mem_info;
-+		struct omapfb_color_key		color_key;
-+		struct omapfb_ovl_colormode	ovl_colormode;
-+		enum omapfb_update_mode		update_mode;
-+		int test_num;
-+		struct omapfb_memory_read	memory_read;
-+		struct omapfb_vram_info		vram_info;
-+	} p;
-+
-+	int r = 0;
-+
-+	switch (cmd) {
-+	case OMAPFB_SYNC_GFX:
-+		DBG("ioctl SYNC_GFX\n");
-+		if (!display || !display->sync) {
-+			/* DSS1 never returns an error here, so we neither */
-+			/*r = -EINVAL;*/
-+			break;
-+		}
-+
-+		r = display->sync(display);
-+		break;
-+
-+	case OMAPFB_UPDATE_WINDOW_OLD:
-+		DBG("ioctl UPDATE_WINDOW_OLD\n");
-+		if (!display || !display->update) {
-+			r = -EINVAL;
-+			break;
-+		}
-+
-+		if (copy_from_user(&p.uwnd_o,
-+					(void __user *)arg,
-+					sizeof(p.uwnd_o))) {
-+			r = -EFAULT;
-+			break;
-+		}
-+
-+		r = omapfb_update_window(fbi, p.uwnd_o.x, p.uwnd_o.y,
-+				p.uwnd_o.width, p.uwnd_o.height);
-+		break;
-+
-+	case OMAPFB_UPDATE_WINDOW:
-+		DBG("ioctl UPDATE_WINDOW\n");
-+		if (!display || !display->update) {
-+			r = -EINVAL;
-+			break;
-+		}
-+
-+		if (copy_from_user(&p.uwnd, (void __user *)arg,
-+					sizeof(p.uwnd))) {
-+			r = -EFAULT;
-+			break;
-+		}
-+
-+		r = omapfb_update_window(fbi, p.uwnd.x, p.uwnd.y,
-+				p.uwnd.width, p.uwnd.height);
-+		break;
-+
-+	case OMAPFB_SETUP_PLANE:
-+		DBG("ioctl SETUP_PLANE\n");
-+		if (copy_from_user(&p.plane_info, (void __user *)arg,
-+					sizeof(p.plane_info)))
-+			r = -EFAULT;
-+		else
-+			r = omapfb_setup_plane(fbi, &p.plane_info);
-+		break;
-+
-+	case OMAPFB_QUERY_PLANE:
-+		DBG("ioctl QUERY_PLANE\n");
-+		r = omapfb_query_plane(fbi, &p.plane_info);
-+		if (r < 0)
-+			break;
-+		if (copy_to_user((void __user *)arg, &p.plane_info,
-+					sizeof(p.plane_info)))
-+			r = -EFAULT;
-+		break;
-+
-+	case OMAPFB_SETUP_MEM:
-+		DBG("ioctl SETUP_MEM\n");
-+		if (copy_from_user(&p.mem_info, (void __user *)arg,
-+					sizeof(p.mem_info)))
-+			r = -EFAULT;
-+		else
-+			r = omapfb_setup_mem(fbi, &p.mem_info);
-+		break;
-+
-+	case OMAPFB_QUERY_MEM:
-+		DBG("ioctl QUERY_MEM\n");
-+		r = omapfb_query_mem(fbi, &p.mem_info);
-+		if (r < 0)
-+			break;
-+		if (copy_to_user((void __user *)arg, &p.mem_info,
-+					sizeof(p.mem_info)))
-+			r = -EFAULT;
-+		break;
-+
-+	case OMAPFB_GET_CAPS:
-+		DBG("ioctl GET_CAPS\n");
-+		if (!display) {
-+			r = -EINVAL;
-+			break;
-+		}
-+
-+		memset(&p.caps, 0, sizeof(p.caps));
-+		p.caps.ctrl = display->caps;
-+
-+		if (copy_to_user((void __user *)arg, &p.caps, sizeof(p.caps)))
-+			r = -EFAULT;
-+		break;
-+
-+	case OMAPFB_GET_OVERLAY_COLORMODE:
-+		DBG("ioctl GET_OVERLAY_COLORMODE\n");
-+		if (copy_from_user(&p.ovl_colormode, (void __user *)arg,
-+				   sizeof(p.ovl_colormode))) {
-+			r = -EFAULT;
-+			break;
-+		}
-+		r = omapfb_get_ovl_colormode(fbdev, &p.ovl_colormode);
-+		if (r < 0)
-+			break;
-+		if (copy_to_user((void __user *)arg, &p.ovl_colormode,
-+				 sizeof(p.ovl_colormode)))
-+			r = -EFAULT;
-+		break;
-+
-+	case OMAPFB_SET_UPDATE_MODE:
-+		DBG("ioctl SET_UPDATE_MODE\n");
-+		if (get_user(p.update_mode, (int __user *)arg))
-+			r = -EFAULT;
-+		else
-+			r = omapfb_set_update_mode(fbi, p.update_mode);
-+		break;
-+
-+	case OMAPFB_GET_UPDATE_MODE:
-+		DBG("ioctl GET_UPDATE_MODE\n");
-+		r = omapfb_get_update_mode(fbi, &p.update_mode);
-+		if (r)
-+			break;
-+		if (put_user(p.update_mode,
-+					(enum omapfb_update_mode __user *)arg))
-+			r = -EFAULT;
-+		break;
-+
-+	case OMAPFB_SET_COLOR_KEY:
-+		DBG("ioctl SET_COLOR_KEY\n");
-+		if (copy_from_user(&p.color_key, (void __user *)arg,
-+				   sizeof(p.color_key)))
-+			r = -EFAULT;
-+		else
-+			r = omapfb_set_color_key(fbi, &p.color_key);
-+		break;
-+
-+	case OMAPFB_GET_COLOR_KEY:
-+		DBG("ioctl GET_COLOR_KEY\n");
-+		r = omapfb_get_color_key(fbi, &p.color_key);
-+		if (r)
-+			break;
-+		if (copy_to_user((void __user *)arg, &p.color_key,
-+				 sizeof(p.color_key)))
-+			r = -EFAULT;
-+		break;
-+
-+	case OMAPFB_WAITFORVSYNC:
-+		DBG("ioctl WAITFORVSYNC\n");
-+		if (!display) {
-+			r = -EINVAL;
-+			break;
-+		}
-+
-+		r = display->wait_vsync(display);
-+		break;
-+
-+	case OMAPFB_WAITFORGO:
-+		DBG("ioctl WAITFORGO\n");
-+		if (!display) {
-+			r = -EINVAL;
-+			break;
-+		}
-+
-+		r = omapfb_wait_for_go(fbi);
-+		break;
-+
-+	/* LCD and CTRL tests do the same thing for backward
-+	 * compatibility */
-+	case OMAPFB_LCD_TEST:
-+		DBG("ioctl LCD_TEST\n");
-+		if (get_user(p.test_num, (int __user *)arg)) {
-+			r = -EFAULT;
-+			break;
-+		}
-+		if (!display || !display->run_test) {
-+			r = -EINVAL;
-+			break;
-+		}
-+
-+		r = display->run_test(display, p.test_num);
-+
-+		break;
-+
-+	case OMAPFB_CTRL_TEST:
-+		DBG("ioctl CTRL_TEST\n");
-+		if (get_user(p.test_num, (int __user *)arg)) {
-+			r = -EFAULT;
-+			break;
-+		}
-+		if (!display || !display->run_test) {
-+			r = -EINVAL;
-+			break;
-+		}
-+
-+		r = display->run_test(display, p.test_num);
-+
-+		break;
-+
-+	case OMAPFB_MEMORY_READ:
-+		DBG("ioctl MEMORY_READ\n");
-+
-+		if (copy_from_user(&p.memory_read, (void __user *)arg,
-+					sizeof(p.memory_read))) {
-+			r = -EFAULT;
-+			break;
-+		}
-+
-+		r = omapfb_memory_read(fbi, &p.memory_read);
-+
-+		break;
-+
-+	case OMAPFB_GET_VRAM_INFO: {
-+		unsigned long vram, free, largest;
-+
-+		DBG("ioctl GET_VRAM_INFO\n");
-+
-+		omap_vram_get_info(&vram, &free, &largest);
-+		p.vram_info.total = vram;
-+		p.vram_info.free = free;
-+		p.vram_info.largest_free_block = largest;
-+
-+		if (copy_to_user((void __user *)arg, &p.vram_info,
-+					sizeof(p.vram_info)))
-+			r = -EFAULT;
-+		break;
-+	}
-+
-+	default:
-+		dev_err(fbdev->dev, "Unknown ioctl 0x%x\n", cmd);
-+		r = -EINVAL;
-+	}
-+
-+	if (r < 0)
-+		DBG("ioctl failed: %d\n", r);
-+
-+	return r;
-+}
-+
-+
---- /dev/null
-+++ b/drivers/video/omap2/omapfb/omapfb-main.c
-@@ -0,0 +1,2137 @@
-+/*
-+ * linux/drivers/video/omap2/omapfb-main.c
-+ *
-+ * Copyright (C) 2008 Nokia Corporation
-+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
-+ *
-+ * Some code and ideas taken from drivers/video/omap/ driver
-+ * by Imre Deak.
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-+ * more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along with
-+ * this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/delay.h>
-+#include <linux/fb.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/vmalloc.h>
-+#include <linux/device.h>
-+#include <linux/platform_device.h>
-+#include <linux/omapfb.h>
-+
-+#include <mach/display.h>
-+#include <mach/vram.h>
-+#include <mach/vrfb.h>
-+
-+#include "omapfb.h"
-+
-+#define MODULE_NAME     "omapfb"
-+
-+#define OMAPFB_PLANE_XRES_MIN		8
-+#define OMAPFB_PLANE_YRES_MIN		8
-+
-+static char *def_mode;
-+static char *def_vram;
-+static int def_vrfb;
-+static int def_rotate;
-+static int def_mirror;
-+
-+#ifdef DEBUG
-+unsigned int omapfb_debug;
-+module_param_named(debug, omapfb_debug, bool, 0644);
-+static unsigned int omapfb_test_pattern;
-+module_param_named(test, omapfb_test_pattern, bool, 0644);
-+#endif
-+
-+static int omapfb_fb_init(struct omapfb2_device *fbdev, struct fb_info *fbi);
-+
-+#ifdef DEBUG
-+static void draw_pixel(struct fb_info *fbi, int x, int y, unsigned color)
-+{
-+	struct fb_var_screeninfo *var = &fbi->var;
-+	struct fb_fix_screeninfo *fix = &fbi->fix;
-+	void __iomem *addr = fbi->screen_base;
-+	const unsigned bytespp = var->bits_per_pixel >> 3;
-+	const unsigned line_len = fix->line_length / bytespp;
-+
-+	int r = (color >> 16) & 0xff;
-+	int g = (color >> 8) & 0xff;
-+	int b = (color >> 0) & 0xff;
-+
-+	if (var->bits_per_pixel == 16) {
-+		u16 __iomem *p = (u16 __iomem *)addr;
-+		p += y * line_len + x;
-+
-+		r = r * 32 / 256;
-+		g = g * 64 / 256;
-+		b = b * 32 / 256;
-+
-+		__raw_writew((r << 11) | (g << 5) | (b << 0), p);
-+	} else if (var->bits_per_pixel == 24) {
-+		u8 __iomem *p = (u8 __iomem *)addr;
-+		p += (y * line_len + x) * 3;
-+
-+		__raw_writeb(b, p + 0);
-+		__raw_writeb(g, p + 1);
-+		__raw_writeb(r, p + 2);
-+	} else if (var->bits_per_pixel == 32) {
-+		u32 __iomem *p = (u32 __iomem *)addr;
-+		p += y * line_len + x;
-+		__raw_writel(color, p);
-+	}
-+}
-+
-+static void fill_fb(struct fb_info *fbi)
-+{
-+	struct fb_var_screeninfo *var = &fbi->var;
-+	const short w = var->xres_virtual;
-+	const short h = var->yres_virtual;
-+	void __iomem *addr = fbi->screen_base;
-+	int y, x;
-+
-+	if (!addr)
-+		return;
-+
-+	DBG("fill_fb %dx%d, line_len %d bytes\n", w, h, fbi->fix.line_length);
-+
-+	for (y = 0; y < h; y++) {
-+		for (x = 0; x < w; x++) {
-+			if (x < 20 && y < 20)
-+				draw_pixel(fbi, x, y, 0xffffff);
-+			else if (x < 20 && (y > 20 && y < h - 20))
-+				draw_pixel(fbi, x, y, 0xff);
-+			else if (y < 20 && (x > 20 && x < w - 20))
-+				draw_pixel(fbi, x, y, 0xff00);
-+			else if (x > w - 20 && (y > 20 && y < h - 20))
-+				draw_pixel(fbi, x, y, 0xff0000);
-+			else if (y > h - 20 && (x > 20 && x < w - 20))
-+				draw_pixel(fbi, x, y, 0xffff00);
-+			else if (x == 20 || x == w - 20 ||
-+					y == 20 || y == h - 20)
-+				draw_pixel(fbi, x, y, 0xffffff);
-+			else if (x == y || w - x == h - y)
-+				draw_pixel(fbi, x, y, 0xff00ff);
-+			else if (w - x == y || x == h - y)
-+				draw_pixel(fbi, x, y, 0x00ffff);
-+			else if (x > 20 && y > 20 && x < w - 20 && y < h - 20) {
-+				int t = x * 3 / w;
-+				unsigned r = 0, g = 0, b = 0;
-+				unsigned c;
-+				if (var->bits_per_pixel == 16) {
-+					if (t == 0)
-+						b = (y % 32) * 256 / 32;
-+					else if (t == 1)
-+						g = (y % 64) * 256 / 64;
-+					else if (t == 2)
-+						r = (y % 32) * 256 / 32;
-+				} else {
-+					if (t == 0)
-+						b = (y % 256);
-+					else if (t == 1)
-+						g = (y % 256);
-+					else if (t == 2)
-+						r = (y % 256);
-+				}
-+				c = (r << 16) | (g << 8) | (b << 0);
-+				draw_pixel(fbi, x, y, c);
-+			} else {
-+				draw_pixel(fbi, x, y, 0);
-+			}
-+		}
-+	}
-+}
-+#endif
-+
-+static unsigned omapfb_get_vrfb_offset(struct omapfb_info *ofbi, int rot)
-+{
-+	struct vrfb *vrfb = &ofbi->region.vrfb;
-+	unsigned offset;
-+
-+	switch (rot) {
-+	case FB_ROTATE_UR:
-+		offset = 0;
-+		break;
-+	case FB_ROTATE_CW:
-+		offset = vrfb->yoffset;
-+		break;
-+	case FB_ROTATE_UD:
-+		offset = vrfb->yoffset * OMAP_VRFB_LINE_LEN + vrfb->xoffset;
-+		break;
-+	case FB_ROTATE_CCW:
-+		offset = vrfb->xoffset * OMAP_VRFB_LINE_LEN;
-+		break;
-+	default:
-+		BUG();
-+	}
-+
-+	offset *= vrfb->bytespp;
-+
-+	return offset;
-+}
-+
-+static u32 omapfb_get_region_rot_paddr(struct omapfb_info *ofbi, int rot)
-+{
-+	if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) {
-+		return ofbi->region.vrfb.paddr[rot]
-+			+ omapfb_get_vrfb_offset(ofbi, rot);
-+	} else {
-+		return ofbi->region.paddr;
-+	}
-+}
-+
-+static u32 omapfb_get_region_paddr(struct omapfb_info *ofbi)
-+{
-+	if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB)
-+		return ofbi->region.vrfb.paddr[0];
-+	else
-+		return ofbi->region.paddr;
-+}
-+
-+static void __iomem *omapfb_get_region_vaddr(struct omapfb_info *ofbi)
-+{
-+	if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB)
-+		return ofbi->region.vrfb.vaddr[0];
-+	else
-+		return ofbi->region.vaddr;
-+}
-+
-+static struct omapfb_colormode omapfb_colormodes[] = {
-+	{
-+		.dssmode = OMAP_DSS_COLOR_UYVY,
-+		.bits_per_pixel = 16,
-+		.nonstd = OMAPFB_COLOR_YUV422,
-+	}, {
-+		.dssmode = OMAP_DSS_COLOR_YUV2,
-+		.bits_per_pixel = 16,
-+		.nonstd = OMAPFB_COLOR_YUY422,
-+	}, {
-+		.dssmode = OMAP_DSS_COLOR_ARGB16,
-+		.bits_per_pixel = 16,
-+		.red	= { .length = 4, .offset = 8, .msb_right = 0 },
-+		.green	= { .length = 4, .offset = 4, .msb_right = 0 },
-+		.blue	= { .length = 4, .offset = 0, .msb_right = 0 },
-+		.transp	= { .length = 4, .offset = 12, .msb_right = 0 },
-+	}, {
-+		.dssmode = OMAP_DSS_COLOR_RGB16,
-+		.bits_per_pixel = 16,
-+		.red	= { .length = 5, .offset = 11, .msb_right = 0 },
-+		.green	= { .length = 6, .offset = 5, .msb_right = 0 },
-+		.blue	= { .length = 5, .offset = 0, .msb_right = 0 },
-+		.transp	= { .length = 0, .offset = 0, .msb_right = 0 },
-+	}, {
-+		.dssmode = OMAP_DSS_COLOR_RGB24P,
-+		.bits_per_pixel = 24,
-+		.red	= { .length = 8, .offset = 16, .msb_right = 0 },
-+		.green	= { .length = 8, .offset = 8, .msb_right = 0 },
-+		.blue	= { .length = 8, .offset = 0, .msb_right = 0 },
-+		.transp	= { .length = 0, .offset = 0, .msb_right = 0 },
-+	}, {
-+		.dssmode = OMAP_DSS_COLOR_RGB24U,
-+		.bits_per_pixel = 32,
-+		.red	= { .length = 8, .offset = 16, .msb_right = 0 },
-+		.green	= { .length = 8, .offset = 8, .msb_right = 0 },
-+		.blue	= { .length = 8, .offset = 0, .msb_right = 0 },
-+		.transp	= { .length = 0, .offset = 0, .msb_right = 0 },
-+	}, {
-+		.dssmode = OMAP_DSS_COLOR_ARGB32,
-+		.bits_per_pixel = 32,
-+		.red	= { .length = 8, .offset = 16, .msb_right = 0 },
-+		.green	= { .length = 8, .offset = 8, .msb_right = 0 },
-+		.blue	= { .length = 8, .offset = 0, .msb_right = 0 },
-+		.transp	= { .length = 8, .offset = 24, .msb_right = 0 },
-+	}, {
-+		.dssmode = OMAP_DSS_COLOR_RGBA32,
-+		.bits_per_pixel = 32,
-+		.red	= { .length = 8, .offset = 24, .msb_right = 0 },
-+		.green	= { .length = 8, .offset = 16, .msb_right = 0 },
-+		.blue	= { .length = 8, .offset = 8, .msb_right = 0 },
-+		.transp	= { .length = 8, .offset = 0, .msb_right = 0 },
-+	}, {
-+		.dssmode = OMAP_DSS_COLOR_RGBX32,
-+		.bits_per_pixel = 32,
-+		.red	= { .length = 8, .offset = 24, .msb_right = 0 },
-+		.green	= { .length = 8, .offset = 16, .msb_right = 0 },
-+		.blue	= { .length = 8, .offset = 8, .msb_right = 0 },
-+		.transp	= { .length = 0, .offset = 0, .msb_right = 0 },
-+	},
-+};
-+
-+static bool cmp_var_to_colormode(struct fb_var_screeninfo *var,
-+		struct omapfb_colormode *color)
-+{
-+	bool cmp_component(struct fb_bitfield *f1, struct fb_bitfield *f2)
-+	{
-+		return f1->length == f2->length &&
-+			f1->offset == f2->offset &&
-+			f1->msb_right == f2->msb_right;
-+	}
-+
-+	if (var->bits_per_pixel == 0 ||
-+			var->red.length == 0 ||
-+			var->blue.length == 0 ||
-+			var->green.length == 0)
-+		return 0;
-+
-+	return var->bits_per_pixel == color->bits_per_pixel &&
-+		cmp_component(&var->red, &color->red) &&
-+		cmp_component(&var->green, &color->green) &&
-+		cmp_component(&var->blue, &color->blue) &&
-+		cmp_component(&var->transp, &color->transp);
-+}
-+
-+static void assign_colormode_to_var(struct fb_var_screeninfo *var,
-+		struct omapfb_colormode *color)
-+{
-+	var->bits_per_pixel = color->bits_per_pixel;
-+	var->nonstd = color->nonstd;
-+	var->red = color->red;
-+	var->green = color->green;
-+	var->blue = color->blue;
-+	var->transp = color->transp;
-+}
-+
-+static enum omap_color_mode fb_mode_to_dss_mode(struct fb_var_screeninfo *var)
-+{
-+	enum omap_color_mode dssmode;
-+	int i;
-+
-+	/* first match with nonstd field */
-+	if (var->nonstd) {
-+		for (i = 0; i < ARRAY_SIZE(omapfb_colormodes); ++i) {
-+			struct omapfb_colormode *mode = &omapfb_colormodes[i];
-+			if (var->nonstd == mode->nonstd) {
-+				assign_colormode_to_var(var, mode);
-+				return mode->dssmode;
-+			}
-+		}
-+
-+		return -EINVAL;
-+	}
-+
-+	/* then try exact match of bpp and colors */
-+	for (i = 0; i < ARRAY_SIZE(omapfb_colormodes); ++i) {
-+		struct omapfb_colormode *mode = &omapfb_colormodes[i];
-+		if (cmp_var_to_colormode(var, mode)) {
-+			assign_colormode_to_var(var, mode);
-+			return mode->dssmode;
-+		}
-+	}
-+
-+	/* match with bpp if user has not filled color fields
-+	 * properly */
-+	switch (var->bits_per_pixel) {
-+	case 1:
-+		dssmode = OMAP_DSS_COLOR_CLUT1;
-+		break;
-+	case 2:
-+		dssmode = OMAP_DSS_COLOR_CLUT2;
-+		break;
-+	case 4:
-+		dssmode = OMAP_DSS_COLOR_CLUT4;
-+		break;
-+	case 8:
-+		dssmode = OMAP_DSS_COLOR_CLUT8;
-+		break;
-+	case 12:
-+		dssmode = OMAP_DSS_COLOR_RGB12U;
-+		break;
-+	case 16:
-+		dssmode = OMAP_DSS_COLOR_RGB16;
-+		break;
-+	case 24:
-+		dssmode = OMAP_DSS_COLOR_RGB24P;
-+		break;
-+	case 32:
-+		dssmode = OMAP_DSS_COLOR_RGB24U;
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	for (i = 0; i < ARRAY_SIZE(omapfb_colormodes); ++i) {
-+		struct omapfb_colormode *mode = &omapfb_colormodes[i];
-+		if (dssmode == mode->dssmode) {
-+			assign_colormode_to_var(var, mode);
-+			return mode->dssmode;
-+		}
-+	}
-+
-+	return -EINVAL;
-+}
-+
-+int dss_mode_to_fb_mode(enum omap_color_mode dssmode,
-+			struct fb_var_screeninfo *var)
-+{
-+	int i;
-+
-+	for (i = 0; i < ARRAY_SIZE(omapfb_colormodes); ++i) {
-+		struct omapfb_colormode *mode = &omapfb_colormodes[i];
-+		if (dssmode == mode->dssmode) {
-+			assign_colormode_to_var(var, mode);
-+			return 0;
-+		}
-+	}
-+	return -ENOENT;
-+}
-+
-+void set_fb_fix(struct fb_info *fbi)
-+{
-+	struct fb_fix_screeninfo *fix = &fbi->fix;
-+	struct fb_var_screeninfo *var = &fbi->var;
-+	struct omapfb_info *ofbi = FB2OFB(fbi);
-+	struct omapfb2_mem_region *rg = &ofbi->region;
-+
-+	DBG("set_fb_fix\n");
-+
-+	/* used by open/write in fbmem.c */
-+	fbi->screen_base = (char __iomem *)omapfb_get_region_vaddr(ofbi);
-+
-+	DBG("changing rotation to %d\n", var->rotate);
-+
-+	/* used by mmap in fbmem.c */
-+	if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) {
-+		switch (var->nonstd) {
-+		case OMAPFB_COLOR_YUV422:
-+		case OMAPFB_COLOR_YUY422:
-+			fix->line_length =
-+				(OMAP_VRFB_LINE_LEN * var->bits_per_pixel) >> 2;
-+			break;
-+		default:
-+			fix->line_length =
-+				(OMAP_VRFB_LINE_LEN * var->bits_per_pixel) >> 3;
-+			break;
-+		}
-+	} else
-+		fix->line_length =
-+			(var->xres_virtual * var->bits_per_pixel) >> 3;
-+	fix->smem_start = omapfb_get_region_paddr(ofbi);
-+	fix->smem_len = rg->size;
-+
-+	fix->type = FB_TYPE_PACKED_PIXELS;
-+
-+	if (var->nonstd)
-+		fix->visual = FB_VISUAL_PSEUDOCOLOR;
-+	else {
-+		switch (var->bits_per_pixel) {
-+		case 32:
-+		case 24:
-+		case 16:
-+		case 12:
-+			fix->visual = FB_VISUAL_TRUECOLOR;
-+			/* 12bpp is stored in 16 bits */
-+			break;
-+		case 1:
-+		case 2:
-+		case 4:
-+		case 8:
-+			fix->visual = FB_VISUAL_PSEUDOCOLOR;
-+			break;
-+		}
-+	}
-+
-+	fix->accel = FB_ACCEL_NONE;
-+
-+	fix->xpanstep = 1;
-+	fix->ypanstep = 1;
-+
-+	if (rg->size && ofbi->rotation_type == OMAP_DSS_ROT_VRFB) {
-+		unsigned bytespp;
-+		bool yuv_mode;
-+		enum omap_color_mode mode;
-+
-+		mode = fb_mode_to_dss_mode(var);
-+
-+		bytespp = var->bits_per_pixel >> 3;
-+
-+		if (mode == OMAP_DSS_COLOR_YUV2 || mode == OMAP_DSS_COLOR_UYVY)
-+			yuv_mode = true;
-+		else
-+			yuv_mode = false;
-+
-+		omap_vrfb_setup(&rg->vrfb, rg->paddr,
-+				var->xres_virtual,
-+				var->yres_virtual,
-+				bytespp, yuv_mode);
-+	}
-+}
-+
-+/* check new var and possibly modify it to be ok */
-+int check_fb_var(struct fb_info *fbi, struct fb_var_screeninfo *var)
-+{
-+	struct omapfb_info *ofbi = FB2OFB(fbi);
-+	struct omap_dss_device *display = fb2display(fbi);
-+	unsigned long max_frame_size;
-+	unsigned long line_size;
-+	int xres_min, yres_min;
-+	int xres_max, yres_max;
-+	enum omap_color_mode mode = 0;
-+	int i;
-+	int bytespp;
-+
-+	DBG("check_fb_var %d\n", ofbi->id);
-+
-+	if (ofbi->region.size == 0)
-+		return 0;
-+
-+	mode = fb_mode_to_dss_mode(var);
-+	if (mode < 0) {
-+		DBG("cannot convert var to omap dss mode\n");
-+		return -EINVAL;
-+	}
-+
-+	for (i = 0; i < ofbi->num_overlays; ++i) {
-+		if ((ofbi->overlays[i]->supported_modes & mode) == 0) {
-+			DBG("invalid mode\n");
-+			return -EINVAL;
-+		}
-+	}
-+
-+	if (var->rotate < 0 || var->rotate > 3)
-+		return -EINVAL;
-+
-+	xres_min = OMAPFB_PLANE_XRES_MIN;
-+	xres_max = 2048;
-+	yres_min = OMAPFB_PLANE_YRES_MIN;
-+	yres_max = 2048;
-+
-+	bytespp = var->bits_per_pixel >> 3;
-+
-+	/* XXX: some applications seem to set virtual res to 0. */
-+	if (var->xres_virtual == 0)
-+		var->xres_virtual = var->xres;
-+
-+	if (var->yres_virtual == 0)
-+		var->yres_virtual = var->yres;
-+
-+	if (var->xres_virtual < xres_min || var->yres_virtual < yres_min)
-+		return -EINVAL;
-+
-+	if (var->xres < xres_min)
-+		var->xres = xres_min;
-+	if (var->yres < yres_min)
-+		var->yres = yres_min;
-+	if (var->xres > xres_max)
-+		var->xres = xres_max;
-+	if (var->yres > yres_max)
-+		var->yres = yres_max;
-+
-+	if (var->xres > var->xres_virtual)
-+		var->xres = var->xres_virtual;
-+	if (var->yres > var->yres_virtual)
-+		var->yres = var->yres_virtual;
-+
-+	if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB)
-+		line_size = OMAP_VRFB_LINE_LEN * bytespp;
-+	else
-+		line_size = var->xres_virtual * bytespp;
-+
-+	max_frame_size = ofbi->region.size;
-+
-+	DBG("max frame size %lu, line size %lu\n", max_frame_size, line_size);
-+
-+	if (line_size * var->yres_virtual > max_frame_size) {
-+		DBG("can't fit FB into memory, reducing y\n");
-+		var->yres_virtual = max_frame_size / line_size;
-+
-+		if (var->yres_virtual < yres_min)
-+			var->yres_virtual = yres_min;
-+
-+		if (var->yres > var->yres_virtual)
-+			var->yres = var->yres_virtual;
-+	}
-+
-+	if (line_size * var->yres_virtual > max_frame_size) {
-+		DBG("can't fit FB into memory, reducing x\n");
-+		if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB)
-+			return -EINVAL;
-+
-+		var->xres_virtual = max_frame_size / var->yres_virtual /
-+			bytespp;
-+
-+		if (var->xres_virtual < xres_min)
-+			var->xres_virtual = xres_min;
-+
-+		if (var->xres > var->xres_virtual)
-+			var->xres = var->xres_virtual;
-+
-+		line_size = var->xres_virtual * bytespp;
-+	}
-+
-+	if (line_size * var->yres_virtual > max_frame_size) {
-+		DBG("cannot fit FB to memory\n");
-+		return -EINVAL;
-+	}
-+
-+	if (var->xres + var->xoffset > var->xres_virtual)
-+		var->xoffset = var->xres_virtual - var->xres;
-+	if (var->yres + var->yoffset > var->yres_virtual)
-+		var->yoffset = var->yres_virtual - var->yres;
-+
-+	DBG("xres = %d, yres = %d, vxres = %d, vyres = %d\n",
-+			var->xres, var->yres,
-+			var->xres_virtual, var->yres_virtual);
-+
-+	var->height             = -1;
-+	var->width              = -1;
-+	var->grayscale          = 0;
-+
-+	if (display && display->get_timings) {
-+		struct omap_video_timings timings;
-+		display->get_timings(display, &timings);
-+
-+		/* pixclock in ps, the rest in pixclock */
-+		var->pixclock = timings.pixel_clock != 0 ?
-+			KHZ2PICOS(timings.pixel_clock) :
-+			0;
-+		var->left_margin = timings.hfp;
-+		var->right_margin = timings.hbp;
-+		var->upper_margin = timings.vfp;
-+		var->lower_margin = timings.vbp;
-+		var->hsync_len = timings.hsw;
-+		var->vsync_len = timings.vsw;
-+	} else {
-+		var->pixclock = 0;
-+		var->left_margin = 0;
-+		var->right_margin = 0;
-+		var->upper_margin = 0;
-+		var->lower_margin = 0;
-+		var->hsync_len = 0;
-+		var->vsync_len = 0;
-+	}
-+
-+	/* TODO: get these from panel->config */
-+	var->vmode              = FB_VMODE_NONINTERLACED;
-+	var->sync               = 0;
-+
-+	return 0;
-+}
-+
-+/*
-+ * ---------------------------------------------------------------------------
-+ * fbdev framework callbacks
-+ * ---------------------------------------------------------------------------
-+ */
-+static int omapfb_open(struct fb_info *fbi, int user)
-+{
-+	return 0;
-+}
-+
-+static int omapfb_release(struct fb_info *fbi, int user)
-+{
-+#if 0
-+	struct omapfb_info *ofbi = FB2OFB(fbi);
-+	struct omapfb2_device *fbdev = ofbi->fbdev;
-+	struct omap_dss_device *display = fb2display(fbi);
-+
-+	DBG("Closing fb with plane index %d\n", ofbi->id);
-+
-+	omapfb_lock(fbdev);
-+
-+	if (display && display->get_update_mode && display->update) {
-+		/* XXX this update should be removed, I think. But it's
-+		 * good for debugging */
-+		if (display->get_update_mode(display) ==
-+				OMAP_DSS_UPDATE_MANUAL) {
-+			u16 w, h;
-+
-+			if (display->sync)
-+				display->sync(display);
-+
-+			display->get_resolution(display, &w, &h);
-+			display->update(display, 0, 0, w, h);
-+		}
-+	}
-+
-+	if (display && display->sync)
-+		display->sync(display);
-+
-+	omapfb_unlock(fbdev);
-+#endif
-+	return 0;
-+}
-+
-+/* setup overlay according to the fb */
-+static int omapfb_setup_overlay(struct fb_info *fbi, struct omap_overlay *ovl,
-+		u16 posx, u16 posy, u16 outw, u16 outh)
-+{
-+	int r = 0;
-+	struct omapfb_info *ofbi = FB2OFB(fbi);
-+	struct fb_var_screeninfo *var = &fbi->var;
-+	struct fb_fix_screeninfo *fix = &fbi->fix;
-+	enum omap_color_mode mode = 0;
-+	int offset;
-+	u32 data_start_p;
-+	void __iomem *data_start_v;
-+	struct omap_overlay_info info;
-+	int xres, yres;
-+	int screen_width;
-+	int mirror;
-+	int rotation = var->rotate;
-+	int i;
-+
-+	for (i = 0; i < ofbi->num_overlays; i++) {
-+		if (ovl != ofbi->overlays[i])
-+			continue;
-+
-+		rotation = (rotation + ofbi->rotation[i]) % 4;
-+		break;
-+	}
-+
-+	DBG("setup_overlay %d, posx %d, posy %d, outw %d, outh %d\n", ofbi->id,
-+			posx, posy, outw, outh);
-+
-+	if (rotation == FB_ROTATE_CW || rotation == FB_ROTATE_CCW) {
-+		xres = var->yres;
-+		yres = var->xres;
-+	} else {
-+		xres = var->xres;
-+		yres = var->yres;
-+	}
-+
-+	offset = ((var->yoffset * var->xres_virtual +
-+				var->xoffset) * var->bits_per_pixel) >> 3;
-+
-+	if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) {
-+		data_start_p = omapfb_get_region_rot_paddr(ofbi, rotation);
-+		data_start_v = NULL;
-+	} else {
-+		data_start_p = omapfb_get_region_paddr(ofbi);
-+		data_start_v = omapfb_get_region_vaddr(ofbi);
-+	}
-+
-+	data_start_p += offset;
-+	data_start_v += offset;
-+
-+	mode = fb_mode_to_dss_mode(var);
-+
-+	if (mode == -EINVAL) {
-+		DBG("fb_mode_to_dss_mode failed");
-+		r = -EINVAL;
-+		goto err;
-+	}
-+
-+	switch (var->nonstd) {
-+	case OMAPFB_COLOR_YUV422:
-+	case OMAPFB_COLOR_YUY422:
-+		if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) {
-+			screen_width = fix->line_length
-+				/ (var->bits_per_pixel >> 2);
-+			break;
-+		}
-+	default:
-+		screen_width = fix->line_length / (var->bits_per_pixel >> 3);
-+		break;
-+	}
-+
-+	ovl->get_overlay_info(ovl, &info);
-+
-+	if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB)
-+		mirror = 0;
-+	else
-+		mirror = ofbi->mirror;
-+
-+	info.paddr = data_start_p;
-+	info.vaddr = data_start_v;
-+	info.screen_width = screen_width;
-+	info.width = xres;
-+	info.height = yres;
-+	info.color_mode = mode;
-+	info.rotation_type = ofbi->rotation_type;
-+	info.rotation = rotation;
-+	info.mirror = mirror;
-+
-+	info.pos_x = posx;
-+	info.pos_y = posy;
-+	info.out_width = outw;
-+	info.out_height = outh;
-+
-+	r = ovl->set_overlay_info(ovl, &info);
-+	if (r) {
-+		DBG("ovl->setup_overlay_info failed\n");
-+		goto err;
-+	}
-+
-+	return 0;
-+
-+err:
-+	DBG("setup_overlay failed\n");
-+	return r;
-+}
-+
-+/* apply var to the overlay */
-+int omapfb_apply_changes(struct fb_info *fbi, int init)
-+{
-+	int r = 0;
-+	struct omapfb_info *ofbi = FB2OFB(fbi);
-+	struct fb_var_screeninfo *var = &fbi->var;
-+	struct omap_overlay *ovl;
-+	u16 posx, posy;
-+	u16 outw, outh;
-+	int i;
-+
-+#ifdef DEBUG
-+	if (omapfb_test_pattern)
-+		fill_fb(fbi);
-+#endif
-+
-+	for (i = 0; i < ofbi->num_overlays; i++) {
-+		ovl = ofbi->overlays[i];
-+
-+		DBG("apply_changes, fb %d, ovl %d\n", ofbi->id, ovl->id);
-+
-+		if (ofbi->region.size == 0) {
-+			/* the fb is not available. disable the overlay */
-+			omapfb_overlay_enable(ovl, 0);
-+			if (!init && ovl->manager)
-+				ovl->manager->apply(ovl->manager);
-+			continue;
-+		}
-+
-+		if (init || (ovl->caps & OMAP_DSS_OVL_CAP_SCALE) == 0) {
-+			int rotation = (var->rotate + ofbi->rotation[i]) % 4;
-+			if (rotation == FB_ROTATE_CW ||
-+					rotation == FB_ROTATE_CCW) {
-+				outw = var->yres;
-+				outh = var->xres;
-+			} else {
-+				outw = var->xres;
-+				outh = var->yres;
-+			}
-+		} else {
-+			outw = ovl->info.out_width;
-+			outh = ovl->info.out_height;
-+		}
-+
-+		if (init) {
-+			posx = 0;
-+			posy = 0;
-+		} else {
-+			posx = ovl->info.pos_x;
-+			posy = ovl->info.pos_y;
-+		}
-+
-+		r = omapfb_setup_overlay(fbi, ovl, posx, posy, outw, outh);
-+		if (r)
-+			goto err;
-+
-+		if (!init && ovl->manager)
-+			ovl->manager->apply(ovl->manager);
-+	}
-+	return 0;
-+err:
-+	DBG("apply_changes failed\n");
-+	return r;
-+}
-+
-+/* checks var and eventually tweaks it to something supported,
-+ * DO NOT MODIFY PAR */
-+static int omapfb_check_var(struct fb_var_screeninfo *var, struct fb_info *fbi)
-+{
-+	int r;
-+
-+	DBG("check_var(%d)\n", FB2OFB(fbi)->id);
-+
-+	r = check_fb_var(fbi, var);
-+
-+	return r;
-+}
-+
-+/* set the video mode according to info->var */
-+static int omapfb_set_par(struct fb_info *fbi)
-+{
-+	int r;
-+
-+	DBG("set_par(%d)\n", FB2OFB(fbi)->id);
-+
-+	set_fb_fix(fbi);
-+	r = omapfb_apply_changes(fbi, 0);
-+
-+	return r;
-+}
-+
-+static int omapfb_pan_display(struct fb_var_screeninfo *var,
-+		struct fb_info *fbi)
-+{
-+	struct omapfb_info *ofbi = FB2OFB(fbi);
-+	int r = 0;
-+
-+	DBG("pan_display(%d)\n", ofbi->id);
-+
-+	if (var->xoffset != fbi->var.xoffset ||
-+	    var->yoffset != fbi->var.yoffset) {
-+		struct fb_var_screeninfo new_var;
-+
-+		new_var = fbi->var;
-+		new_var.xoffset = var->xoffset;
-+		new_var.yoffset = var->yoffset;
-+
-+		r = check_fb_var(fbi, &new_var);
-+
-+		if (r == 0) {
-+			fbi->var = new_var;
-+			set_fb_fix(fbi);
-+			r = omapfb_apply_changes(fbi, 0);
-+		}
-+	}
-+
-+	return r;
-+}
-+
-+static void mmap_user_open(struct vm_area_struct *vma)
-+{
-+	struct omapfb_info *ofbi = (struct omapfb_info *)vma->vm_private_data;
-+
-+	atomic_inc(&ofbi->map_count);
-+}
-+
-+static void mmap_user_close(struct vm_area_struct *vma)
-+{
-+	struct omapfb_info *ofbi = (struct omapfb_info *)vma->vm_private_data;
-+
-+	atomic_dec(&ofbi->map_count);
-+}
-+
-+static struct vm_operations_struct mmap_user_ops = {
-+	.open = mmap_user_open,
-+	.close = mmap_user_close,
-+};
-+
-+static int omapfb_mmap(struct fb_info *fbi, struct vm_area_struct *vma)
-+{
-+	struct omapfb_info *ofbi = FB2OFB(fbi);
-+	struct fb_fix_screeninfo *fix = &fbi->fix;
-+	unsigned long off;
-+	unsigned long start;
-+	u32 len;
-+
-+	if (vma->vm_end - vma->vm_start == 0)
-+		return 0;
-+	if (vma->vm_pgoff > (~0UL >> PAGE_SHIFT))
-+		return -EINVAL;
-+	off = vma->vm_pgoff << PAGE_SHIFT;
-+
-+	start = omapfb_get_region_paddr(ofbi);
-+	len = fix->smem_len;
-+	if (off >= len)
-+		return -EINVAL;
-+	if ((vma->vm_end - vma->vm_start + off) > len)
-+		return -EINVAL;
-+
-+	off += start;
-+
-+	DBG("user mmap region start %lx, len %d, off %lx\n", start, len, off);
-+
-+	vma->vm_pgoff = off >> PAGE_SHIFT;
-+	vma->vm_flags |= VM_IO | VM_RESERVED;
-+	vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
-+	vma->vm_ops = &mmap_user_ops;
-+	vma->vm_private_data = ofbi;
-+	if (io_remap_pfn_range(vma, vma->vm_start, off >> PAGE_SHIFT,
-+			     vma->vm_end - vma->vm_start, vma->vm_page_prot))
-+		return -EAGAIN;
-+	/* vm_ops.open won't be called for mmap itself. */
-+	atomic_inc(&ofbi->map_count);
-+	return 0;
-+}
-+
-+/* Store a single color palette entry into a pseudo palette or the hardware
-+ * palette if one is available. For now we support only 16bpp and thus store
-+ * the entry only to the pseudo palette.
-+ */
-+static int _setcolreg(struct fb_info *fbi, u_int regno, u_int red, u_int green,
-+		u_int blue, u_int transp, int update_hw_pal)
-+{
-+	/*struct omapfb_info *ofbi = FB2OFB(fbi);*/
-+	/*struct omapfb2_device *fbdev = ofbi->fbdev;*/
-+	struct fb_var_screeninfo *var = &fbi->var;
-+	int r = 0;
-+
-+	enum omapfb_color_format mode = OMAPFB_COLOR_RGB24U; /* XXX */
-+
-+	/*switch (plane->color_mode) {*/
-+	switch (mode) {
-+	case OMAPFB_COLOR_YUV422:
-+	case OMAPFB_COLOR_YUV420:
-+	case OMAPFB_COLOR_YUY422:
-+		r = -EINVAL;
-+		break;
-+	case OMAPFB_COLOR_CLUT_8BPP:
-+	case OMAPFB_COLOR_CLUT_4BPP:
-+	case OMAPFB_COLOR_CLUT_2BPP:
-+	case OMAPFB_COLOR_CLUT_1BPP:
-+		/*
-+		   if (fbdev->ctrl->setcolreg)
-+		   r = fbdev->ctrl->setcolreg(regno, red, green, blue,
-+		   transp, update_hw_pal);
-+		   */
-+		/* Fallthrough */
-+		r = -EINVAL;
-+		break;
-+	case OMAPFB_COLOR_RGB565:
-+	case OMAPFB_COLOR_RGB444:
-+	case OMAPFB_COLOR_RGB24P:
-+	case OMAPFB_COLOR_RGB24U:
-+		if (r != 0)
-+			break;
-+
-+		if (regno < 0) {
-+			r = -EINVAL;
-+			break;
-+		}
-+
-+		if (regno < 16) {
-+			u16 pal;
-+			pal = ((red >> (16 - var->red.length)) <<
-+					var->red.offset) |
-+				((green >> (16 - var->green.length)) <<
-+				 var->green.offset) |
-+				(blue >> (16 - var->blue.length));
-+			((u32 *)(fbi->pseudo_palette))[regno] = pal;
-+		}
-+		break;
-+	default:
-+		BUG();
-+	}
-+	return r;
-+}
-+
-+static int omapfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
-+		u_int transp, struct fb_info *info)
-+{
-+	DBG("setcolreg\n");
-+
-+	return _setcolreg(info, regno, red, green, blue, transp, 1);
-+}
-+
-+static int omapfb_setcmap(struct fb_cmap *cmap, struct fb_info *info)
-+{
-+	int count, index, r;
-+	u16 *red, *green, *blue, *transp;
-+	u16 trans = 0xffff;
-+
-+	DBG("setcmap\n");
-+
-+	red     = cmap->red;
-+	green   = cmap->green;
-+	blue    = cmap->blue;
-+	transp  = cmap->transp;
-+	index   = cmap->start;
-+
-+	for (count = 0; count < cmap->len; count++) {
-+		if (transp)
-+			trans = *transp++;
-+		r = _setcolreg(info, index++, *red++, *green++, *blue++, trans,
-+				count == cmap->len - 1);
-+		if (r != 0)
-+			return r;
-+	}
-+
-+	return 0;
-+}
-+
-+static void omapfb_vrfb_suspend_all(struct omapfb2_device *fbdev)
-+{
-+	int i;
-+
-+	for (i = 0; i < fbdev->num_fbs; i++) {
-+		struct omapfb_info *ofbi = FB2OFB(fbdev->fbs[i]);
-+
-+		if (ofbi->region.vrfb.vaddr[0])
-+			omap_vrfb_suspend_ctx(&ofbi->region.vrfb);
-+	}
-+}
-+
-+static void omapfb_vrfb_resume_all(struct omapfb2_device *fbdev)
-+{
-+	int i;
-+
-+	for (i = 0; i < fbdev->num_fbs; i++) {
-+		struct omapfb_info *ofbi = FB2OFB(fbdev->fbs[i]);
-+
-+		if (ofbi->region.vrfb.vaddr[0])
-+			omap_vrfb_resume_ctx(&ofbi->region.vrfb);
-+	}
-+}
-+
-+static int omapfb_blank(int blank, struct fb_info *fbi)
-+{
-+	struct omapfb_info *ofbi = FB2OFB(fbi);
-+	struct omapfb2_device *fbdev = ofbi->fbdev;
-+	struct omap_dss_device *display = fb2display(fbi);
-+	int do_update = 0;
-+	int r = 0;
-+
-+	omapfb_lock(fbdev);
-+
-+	switch (blank) {
-+	case FB_BLANK_UNBLANK:
-+		if (display->state != OMAP_DSS_DISPLAY_SUSPENDED)
-+			goto exit;
-+
-+		omapfb_vrfb_resume_all(fbdev);
-+
-+		if (display->resume)
-+			r = display->resume(display);
-+
-+		if (r == 0 && display->get_update_mode &&
-+				display->get_update_mode(display) ==
-+				OMAP_DSS_UPDATE_MANUAL)
-+			do_update = 1;
-+
-+		break;
-+
-+	case FB_BLANK_NORMAL:
-+		/* FB_BLANK_NORMAL could be implemented.
-+		 * Needs DSS additions. */
-+	case FB_BLANK_VSYNC_SUSPEND:
-+	case FB_BLANK_HSYNC_SUSPEND:
-+	case FB_BLANK_POWERDOWN:
-+		if (display->state != OMAP_DSS_DISPLAY_ACTIVE)
-+			goto exit;
-+
-+		if (display->suspend)
-+			r = display->suspend(display);
-+
-+		omapfb_vrfb_suspend_all(fbdev);
-+
-+		break;
-+
-+	default:
-+		r = -EINVAL;
-+	}
-+
-+exit:
-+	omapfb_unlock(fbdev);
-+
-+	if (r == 0 && do_update && display->update) {
-+		u16 w, h;
-+		display->get_resolution(display, &w, &h);
-+
-+		r = display->update(display, 0, 0, w, h);
-+	}
-+
-+	return r;
-+}
-+
-+#if 0
-+/* XXX fb_read and fb_write are needed for VRFB */
-+ssize_t omapfb_write(struct fb_info *info, const char __user *buf,
-+		size_t count, loff_t *ppos)
-+{
-+	DBG("omapfb_write %d, %lu\n", count, (unsigned long)*ppos);
-+	/* XXX needed for VRFB */
-+	return count;
-+}
-+#endif
-+
-+static struct fb_ops omapfb_ops = {
-+	.owner          = THIS_MODULE,
-+	.fb_open        = omapfb_open,
-+	.fb_release     = omapfb_release,
-+	.fb_fillrect    = cfb_fillrect,
-+	.fb_copyarea    = cfb_copyarea,
-+	.fb_imageblit   = cfb_imageblit,
-+	.fb_blank       = omapfb_blank,
-+	.fb_ioctl       = omapfb_ioctl,
-+	.fb_check_var   = omapfb_check_var,
-+	.fb_set_par     = omapfb_set_par,
-+	.fb_pan_display = omapfb_pan_display,
-+	.fb_mmap	= omapfb_mmap,
-+	.fb_setcolreg	= omapfb_setcolreg,
-+	.fb_setcmap	= omapfb_setcmap,
-+	/*.fb_write	= omapfb_write,*/
-+};
-+
-+static void omapfb_free_fbmem(struct fb_info *fbi)
-+{
-+	struct omapfb_info *ofbi = FB2OFB(fbi);
-+	struct omapfb2_device *fbdev = ofbi->fbdev;
-+	struct omapfb2_mem_region *rg;
-+
-+	rg = &ofbi->region;
-+
-+	if (rg->paddr)
-+		if (omap_vram_free(rg->paddr, rg->size))
-+			dev_err(fbdev->dev, "VRAM FREE failed\n");
-+
-+	if (rg->vaddr)
-+		iounmap(rg->vaddr);
-+
-+	if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) {
-+		/* unmap the 0 angle rotation */
-+		if (rg->vrfb.vaddr[0]) {
-+			iounmap(rg->vrfb.vaddr[0]);
-+			omap_vrfb_release_ctx(&rg->vrfb);
-+		}
-+	}
-+
-+	rg->vaddr = NULL;
-+	rg->paddr = 0;
-+	rg->alloc = 0;
-+	rg->size = 0;
-+}
-+
-+static void clear_fb_info(struct fb_info *fbi)
-+{
-+	memset(&fbi->var, 0, sizeof(fbi->var));
-+	memset(&fbi->fix, 0, sizeof(fbi->fix));
-+	strlcpy(fbi->fix.id, MODULE_NAME, sizeof(fbi->fix.id));
-+}
-+
-+static int omapfb_free_all_fbmem(struct omapfb2_device *fbdev)
-+{
-+	int i;
-+
-+	DBG("free all fbmem\n");
-+
-+	for (i = 0; i < fbdev->num_fbs; i++) {
-+		struct fb_info *fbi = fbdev->fbs[i];
-+		omapfb_free_fbmem(fbi);
-+		clear_fb_info(fbi);
-+	}
-+
-+	return 0;
-+}
-+
-+static int omapfb_alloc_fbmem(struct fb_info *fbi, unsigned long size,
-+		unsigned long paddr)
-+{
-+	struct omapfb_info *ofbi = FB2OFB(fbi);
-+	struct omapfb2_device *fbdev = ofbi->fbdev;
-+	struct omapfb2_mem_region *rg;
-+	void __iomem *vaddr;
-+	int r;
-+
-+	rg = &ofbi->region;
-+	memset(rg, 0, sizeof(*rg));
-+
-+	size = PAGE_ALIGN(size);
-+
-+	if (!paddr) {
-+		DBG("allocating %lu bytes for fb %d\n", size, ofbi->id);
-+		r = omap_vram_alloc(OMAP_VRAM_MEMTYPE_SDRAM, size, &paddr);
-+	} else {
-+		DBG("reserving %lu bytes at %lx for fb %d\n", size, paddr,
-+				ofbi->id);
-+		r = omap_vram_reserve(paddr, size);
-+	}
-+
-+	if (r) {
-+		dev_err(fbdev->dev, "failed to allocate framebuffer\n");
-+		return -ENOMEM;
-+	}
-+
-+	if (ofbi->rotation_type != OMAP_DSS_ROT_VRFB) {
-+		vaddr = ioremap_wc(paddr, size);
-+
-+		if (!vaddr) {
-+			dev_err(fbdev->dev, "failed to ioremap framebuffer\n");
-+			omap_vram_free(paddr, size);
-+			return -ENOMEM;
-+		}
-+
-+		DBG("allocated VRAM paddr %lx, vaddr %p\n", paddr, vaddr);
-+	} else {
-+		void __iomem *va;
-+
-+		r = omap_vrfb_request_ctx(&rg->vrfb);
-+		if (r) {
-+			dev_err(fbdev->dev, "vrfb create ctx failed\n");
-+			return r;
-+		}
-+
-+		/* only ioremap the 0 angle view */
-+		va = ioremap_wc(rg->vrfb.paddr[0], size);
-+
-+		if (!va) {
-+			printk(KERN_ERR "vrfb: ioremap failed\n");
-+			omap_vrfb_release_ctx(&rg->vrfb);
-+			return -ENOMEM;
-+		}
-+
-+		DBG("ioremapped vrfb area 0 to %p\n", va);
-+
-+		rg->vrfb.vaddr[0] = va;
-+
-+		vaddr = NULL;
-+	}
-+
-+	rg->paddr = paddr;
-+	rg->vaddr = vaddr;
-+	rg->size = size;
-+	rg->alloc = 1;
-+
-+	return 0;
-+}
-+
-+/* allocate fbmem using display resolution as reference */
-+static int omapfb_alloc_fbmem_display(struct fb_info *fbi, unsigned long size,
-+		unsigned long paddr)
-+{
-+	struct omapfb_info *ofbi = FB2OFB(fbi);
-+	struct omap_dss_device *display;
-+	int bytespp;
-+
-+	display =  fb2display(fbi);
-+
-+	if (!display)
-+		return 0;
-+
-+	switch (display->get_recommended_bpp(display)) {
-+	case 16:
-+		bytespp = 2;
-+		break;
-+	case 24:
-+		bytespp = 4;
-+		break;
-+	default:
-+		bytespp = 4;
-+		break;
-+	}
-+
-+	if (!size) {
-+		u16 w, h;
-+
-+		display->get_resolution(display, &w, &h);
-+
-+		if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) {
-+#ifdef DEBUG
-+			int oldw = w, oldh = h;
-+#endif
-+
-+			omap_vrfb_adjust_size(&w, &h, bytespp);
-+
-+			/* Because we change the resolution of the 0 degree
-+			 * view, we need to alloc max(w, h) for height */
-+			h = max(w, h);
-+			w = OMAP_VRFB_LINE_LEN;
-+
-+			DBG("adjusting fb mem size for VRFB, %dx%d -> %dx%d\n",
-+					oldw, oldh, w, h);
-+		}
-+
-+		size = w * h * bytespp;
-+	}
-+
-+	if (!size)
-+		return 0;
-+
-+	return omapfb_alloc_fbmem(fbi, size, paddr);
-+}
-+
-+static enum omap_color_mode fb_format_to_dss_mode(enum omapfb_color_format fmt)
-+{
-+	enum omap_color_mode mode;
-+
-+	switch (fmt) {
-+	case OMAPFB_COLOR_RGB565:
-+		mode = OMAP_DSS_COLOR_RGB16;
-+		break;
-+	case OMAPFB_COLOR_YUV422:
-+		mode = OMAP_DSS_COLOR_YUV2;
-+		break;
-+	case OMAPFB_COLOR_CLUT_8BPP:
-+		mode = OMAP_DSS_COLOR_CLUT8;
-+		break;
-+	case OMAPFB_COLOR_CLUT_4BPP:
-+		mode = OMAP_DSS_COLOR_CLUT4;
-+		break;
-+	case OMAPFB_COLOR_CLUT_2BPP:
-+		mode = OMAP_DSS_COLOR_CLUT2;
-+		break;
-+	case OMAPFB_COLOR_CLUT_1BPP:
-+		mode = OMAP_DSS_COLOR_CLUT1;
-+		break;
-+	case OMAPFB_COLOR_RGB444:
-+		mode = OMAP_DSS_COLOR_RGB12U;
-+		break;
-+	case OMAPFB_COLOR_YUY422:
-+		mode = OMAP_DSS_COLOR_UYVY;
-+		break;
-+	case OMAPFB_COLOR_ARGB16:
-+		mode = OMAP_DSS_COLOR_ARGB16;
-+		break;
-+	case OMAPFB_COLOR_RGB24U:
-+		mode = OMAP_DSS_COLOR_RGB24U;
-+		break;
-+	case OMAPFB_COLOR_RGB24P:
-+		mode = OMAP_DSS_COLOR_RGB24P;
-+		break;
-+	case OMAPFB_COLOR_ARGB32:
-+		mode = OMAP_DSS_COLOR_ARGB32;
-+		break;
-+	case OMAPFB_COLOR_RGBA32:
-+		mode = OMAP_DSS_COLOR_RGBA32;
-+		break;
-+	case OMAPFB_COLOR_RGBX32:
-+		mode = OMAP_DSS_COLOR_RGBX32;
-+		break;
-+	default:
-+		mode = -EINVAL;
-+	}
-+
-+	return mode;
-+}
-+
-+static int omapfb_parse_vram_param(const char *param, int max_entries,
-+		unsigned long *sizes, unsigned long *paddrs)
-+{
-+	int fbnum;
-+	unsigned long size;
-+	unsigned long paddr = 0;
-+	char *p, *start;
-+
-+	start = (char *)param;
-+
-+	while (1) {
-+		p = start;
-+
-+		fbnum = simple_strtoul(p, &p, 10);
-+
-+		if (p == param)
-+			return -EINVAL;
-+
-+		if (*p != ':')
-+			return -EINVAL;
-+
-+		if (fbnum >= max_entries)
-+			return -EINVAL;
-+
-+		size = memparse(p + 1, &p);
-+
-+		if (!size)
-+			return -EINVAL;
-+
-+		paddr = 0;
-+
-+		if (*p == '@') {
-+			paddr = simple_strtoul(p + 1, &p, 16);
-+
-+			if (!paddr)
-+				return -EINVAL;
-+
-+		}
-+
-+		paddrs[fbnum] = paddr;
-+		sizes[fbnum] = size;
-+
-+		if (*p == 0)
-+			break;
-+
-+		if (*p != ',')
-+			return -EINVAL;
-+
-+		++p;
-+
-+		start = p;
-+	}
-+
-+	return 0;
-+}
-+
-+static int omapfb_allocate_all_fbs(struct omapfb2_device *fbdev)
-+{
-+	int i, r;
-+	unsigned long vram_sizes[10];
-+	unsigned long vram_paddrs[10];
-+
-+	memset(&vram_sizes, 0, sizeof(vram_sizes));
-+	memset(&vram_paddrs, 0, sizeof(vram_paddrs));
-+
-+	if (def_vram &&	omapfb_parse_vram_param(def_vram, 10,
-+				vram_sizes, vram_paddrs)) {
-+		dev_err(fbdev->dev, "failed to parse vram parameter\n");
-+
-+		memset(&vram_sizes, 0, sizeof(vram_sizes));
-+		memset(&vram_paddrs, 0, sizeof(vram_paddrs));
-+	}
-+
-+	if (fbdev->dev->platform_data) {
-+		struct omapfb_platform_data *opd;
-+		opd = fbdev->dev->platform_data;
-+		for (i = 0; i < opd->mem_desc.region_cnt; ++i) {
-+			if (!vram_sizes[i]) {
-+				unsigned long size;
-+				unsigned long paddr;
-+
-+				size = opd->mem_desc.region[i].size;
-+				paddr = opd->mem_desc.region[i].paddr;
-+
-+				vram_sizes[i] = size;
-+				vram_paddrs[i] = paddr;
-+			}
-+		}
-+	}
-+
-+	for (i = 0; i < fbdev->num_fbs; i++) {
-+		/* allocate memory automatically only for fb0, or if
-+		 * excplicitly defined with vram or plat data option */
-+		if (i == 0 || vram_sizes[i] != 0) {
-+			r = omapfb_alloc_fbmem_display(fbdev->fbs[i],
-+					vram_sizes[i], vram_paddrs[i]);
-+
-+			if (r)
-+				return r;
-+		}
-+	}
-+
-+	for (i = 0; i < fbdev->num_fbs; i++) {
-+		struct omapfb_info *ofbi = FB2OFB(fbdev->fbs[i]);
-+		struct omapfb2_mem_region *rg;
-+		rg = &ofbi->region;
-+
-+		DBG("region%d phys %08x virt %p size=%lu\n",
-+				i,
-+				rg->paddr,
-+				rg->vaddr,
-+				rg->size);
-+	}
-+
-+	return 0;
-+}
-+
-+int omapfb_realloc_fbmem(struct fb_info *fbi, unsigned long size, int type)
-+{
-+	struct omapfb_info *ofbi = FB2OFB(fbi);
-+	struct omapfb2_device *fbdev = ofbi->fbdev;
-+	struct omap_dss_device *display = fb2display(fbi);
-+	struct omapfb2_mem_region *rg = &ofbi->region;
-+	unsigned long old_size = rg->size;
-+	unsigned long old_paddr = rg->paddr;
-+	int old_type = rg->type;
-+	int r;
-+
-+	if (type > OMAPFB_MEMTYPE_MAX)
-+		return -EINVAL;
-+
-+	size = PAGE_ALIGN(size);
-+
-+	if (old_size == size && old_type == type)
-+		return 0;
-+
-+	if (display && display->sync)
-+			display->sync(display);
-+
-+	omapfb_free_fbmem(fbi);
-+
-+	if (size == 0) {
-+		clear_fb_info(fbi);
-+		return 0;
-+	}
-+
-+	r = omapfb_alloc_fbmem(fbi, size, 0);
-+
-+	if (r) {
-+		if (old_size)
-+			omapfb_alloc_fbmem(fbi, old_size, old_paddr);
-+
-+		if (rg->size == 0)
-+			clear_fb_info(fbi);
-+
-+		return r;
-+	}
-+
-+	if (old_size == size)
-+		return 0;
-+
-+	if (old_size == 0) {
-+		DBG("initializing fb %d\n", ofbi->id);
-+		r = omapfb_fb_init(fbdev, fbi);
-+		if (r) {
-+			DBG("omapfb_fb_init failed\n");
-+			goto err;
-+		}
-+		r = omapfb_apply_changes(fbi, 1);
-+		if (r) {
-+			DBG("omapfb_apply_changes failed\n");
-+			goto err;
-+		}
-+	} else {
-+		struct fb_var_screeninfo new_var;
-+		memcpy(&new_var, &fbi->var, sizeof(new_var));
-+		r = check_fb_var(fbi, &new_var);
-+		if (r)
-+			goto err;
-+		memcpy(&fbi->var, &new_var, sizeof(fbi->var));
-+		set_fb_fix(fbi);
-+	}
-+
-+	return 0;
-+err:
-+	omapfb_free_fbmem(fbi);
-+	clear_fb_info(fbi);
-+	return r;
-+}
-+
-+/* initialize fb_info, var, fix to something sane based on the display */
-+static int omapfb_fb_init(struct omapfb2_device *fbdev, struct fb_info *fbi)
-+{
-+	struct fb_var_screeninfo *var = &fbi->var;
-+	struct omap_dss_device *display = fb2display(fbi);
-+	struct omapfb_info *ofbi = FB2OFB(fbi);
-+	int r = 0;
-+
-+	fbi->fbops = &omapfb_ops;
-+	fbi->flags = FBINFO_FLAG_DEFAULT;
-+	fbi->pseudo_palette = fbdev->pseudo_palette;
-+
-+	if (ofbi->region.size == 0) {
-+		clear_fb_info(fbi);
-+		return 0;
-+	}
-+
-+	var->nonstd = 0;
-+	var->bits_per_pixel = 0;
-+
-+	var->rotate = def_rotate;
-+
-+	/*
-+	 * Check if there is a default color format set in the board file,
-+	 * and use this format instead the default deducted from the
-+	 * display bpp.
-+	 */
-+	if (fbdev->dev->platform_data) {
-+		struct omapfb_platform_data *opd;
-+		int id = ofbi->id;
-+
-+		opd = fbdev->dev->platform_data;
-+		if (opd->mem_desc.region[id].format_used) {
-+			enum omap_color_mode mode;
-+			enum omapfb_color_format format;
-+
-+			format = opd->mem_desc.region[id].format;
-+			mode = fb_format_to_dss_mode(format);
-+			if (mode < 0) {
-+				r = mode;
-+				goto err;
-+			}
-+			r = dss_mode_to_fb_mode(mode, var);
-+			if (r < 0)
-+				goto err;
-+		}
-+	}
-+
-+	if (display) {
-+		u16 w, h;
-+		int rotation = (var->rotate + ofbi->rotation[0]) % 4;
-+
-+		display->get_resolution(display, &w, &h);
-+
-+		if (rotation == FB_ROTATE_CW ||
-+				rotation == FB_ROTATE_CCW) {
-+			var->xres = h;
-+			var->yres = w;
-+		} else {
-+			var->xres = w;
-+			var->yres = h;
-+		}
-+
-+		var->xres_virtual = var->xres;
-+		var->yres_virtual = var->yres;
-+
-+		if (!var->bits_per_pixel) {
-+			switch (display->get_recommended_bpp(display)) {
-+			case 16:
-+				var->bits_per_pixel = 16;
-+				break;
-+			case 24:
-+				var->bits_per_pixel = 32;
-+				break;
-+			default:
-+				dev_err(fbdev->dev, "illegal display "
-+						"bpp\n");
-+				return -EINVAL;
-+			}
-+		}
-+	} else {
-+		/* if there's no display, let's just guess some basic values */
-+		var->xres = 320;
-+		var->yres = 240;
-+		var->xres_virtual = var->xres;
-+		var->yres_virtual = var->yres;
-+		if (!var->bits_per_pixel)
-+			var->bits_per_pixel = 16;
-+	}
-+
-+	r = check_fb_var(fbi, var);
-+	if (r)
-+		goto err;
-+
-+	set_fb_fix(fbi);
-+
-+	r = fb_alloc_cmap(&fbi->cmap, 256, 0);
-+	if (r)
-+		dev_err(fbdev->dev, "unable to allocate color map memory\n");
-+
-+err:
-+	return r;
-+}
-+
-+static void fbinfo_cleanup(struct omapfb2_device *fbdev, struct fb_info *fbi)
-+{
-+	fb_dealloc_cmap(&fbi->cmap);
-+}
-+
-+
-+static void omapfb_free_resources(struct omapfb2_device *fbdev)
-+{
-+	int i;
-+
-+	DBG("free_resources\n");
-+
-+	if (fbdev == NULL)
-+		return;
-+
-+	for (i = 0; i < fbdev->num_fbs; i++)
-+		unregister_framebuffer(fbdev->fbs[i]);
-+
-+	/* free the reserved fbmem */
-+	omapfb_free_all_fbmem(fbdev);
-+
-+	for (i = 0; i < fbdev->num_fbs; i++) {
-+		fbinfo_cleanup(fbdev, fbdev->fbs[i]);
-+		framebuffer_release(fbdev->fbs[i]);
-+	}
-+
-+	for (i = 0; i < fbdev->num_displays; i++) {
-+		if (fbdev->displays[i]->state != OMAP_DSS_DISPLAY_DISABLED)
-+			fbdev->displays[i]->disable(fbdev->displays[i]);
-+
-+		omap_dss_put_device(fbdev->displays[i]);
-+	}
-+
-+	dev_set_drvdata(fbdev->dev, NULL);
-+	kfree(fbdev);
-+}
-+
-+static int omapfb_create_framebuffers(struct omapfb2_device *fbdev)
-+{
-+	int r, i;
-+
-+	fbdev->num_fbs = 0;
-+
-+	DBG("create %d framebuffers\n",	CONFIG_FB_OMAP2_NUM_FBS);
-+
-+	/* allocate fb_infos */
-+	for (i = 0; i < CONFIG_FB_OMAP2_NUM_FBS; i++) {
-+		struct fb_info *fbi;
-+		struct omapfb_info *ofbi;
-+
-+		fbi = framebuffer_alloc(sizeof(struct omapfb_info),
-+				fbdev->dev);
-+
-+		if (fbi == NULL) {
-+			dev_err(fbdev->dev,
-+				"unable to allocate memory for plane info\n");
-+			return -ENOMEM;
-+		}
-+
-+		clear_fb_info(fbi);
-+
-+		fbdev->fbs[i] = fbi;
-+
-+		ofbi = FB2OFB(fbi);
-+		ofbi->fbdev = fbdev;
-+		ofbi->id = i;
-+
-+		/* assign these early, so that fb alloc can use them */
-+		ofbi->rotation_type = def_vrfb ? OMAP_DSS_ROT_VRFB :
-+			OMAP_DSS_ROT_DMA;
-+		ofbi->mirror = def_mirror;
-+
-+		fbdev->num_fbs++;
-+	}
-+
-+	DBG("fb_infos allocated\n");
-+
-+	/* assign overlays for the fbs */
-+	for (i = 0; i < min(fbdev->num_fbs, fbdev->num_overlays); i++) {
-+		struct omapfb_info *ofbi = FB2OFB(fbdev->fbs[i]);
-+
-+		ofbi->overlays[0] = fbdev->overlays[i];
-+		ofbi->num_overlays = 1;
-+	}
-+
-+	/* allocate fb memories */
-+	r = omapfb_allocate_all_fbs(fbdev);
-+	if (r) {
-+		dev_err(fbdev->dev, "failed to allocate fbmem\n");
-+		return r;
-+	}
-+
-+	DBG("fbmems allocated\n");
-+
-+	/* setup fb_infos */
-+	for (i = 0; i < fbdev->num_fbs; i++) {
-+		r = omapfb_fb_init(fbdev, fbdev->fbs[i]);
-+		if (r) {
-+			dev_err(fbdev->dev, "failed to setup fb_info\n");
-+			return r;
-+		}
-+	}
-+
-+	DBG("fb_infos initialized\n");
-+
-+	for (i = 0; i < fbdev->num_fbs; i++) {
-+		r = register_framebuffer(fbdev->fbs[i]);
-+		if (r != 0) {
-+			dev_err(fbdev->dev,
-+				"registering framebuffer %d failed\n", i);
-+			return r;
-+		}
-+	}
-+
-+	DBG("framebuffers registered\n");
-+
-+	for (i = 0; i < fbdev->num_fbs; i++) {
-+		r = omapfb_apply_changes(fbdev->fbs[i], 1);
-+		if (r) {
-+			dev_err(fbdev->dev, "failed to change mode\n");
-+			return r;
-+		}
-+	}
-+
-+	DBG("create sysfs for fbs\n");
-+	r = omapfb_create_sysfs(fbdev);
-+	if (r) {
-+		dev_err(fbdev->dev, "failed to create sysfs entries\n");
-+		return r;
-+	}
-+
-+	/* Enable fb0 */
-+	if (fbdev->num_fbs > 0) {
-+		struct omapfb_info *ofbi = FB2OFB(fbdev->fbs[0]);
-+
-+		if (ofbi->num_overlays > 0) {
-+			struct omap_overlay *ovl = ofbi->overlays[0];
-+
-+			r = omapfb_overlay_enable(ovl, 1);
-+
-+			if (r) {
-+				dev_err(fbdev->dev,
-+						"failed to enable overlay\n");
-+				return r;
-+			}
-+		}
-+	}
-+
-+	DBG("create_framebuffers done\n");
-+
-+	return 0;
-+}
-+
-+static int omapfb_mode_to_timings(const char *mode_str,
-+		struct omap_video_timings *timings, u8 *bpp)
-+{
-+	struct fb_info fbi;
-+	struct fb_var_screeninfo var;
-+	struct fb_ops fbops;
-+	int r;
-+
-+#ifdef CONFIG_OMAP2_DSS_VENC
-+	if (strcmp(mode_str, "pal") == 0) {
-+		*timings = omap_dss_pal_timings;
-+		*bpp = 0;
-+		return 0;
-+	} else if (strcmp(mode_str, "ntsc") == 0) {
-+		*timings = omap_dss_ntsc_timings;
-+		*bpp = 0;
-+		return 0;
-+	}
-+#endif
-+
-+	/* this is quite a hack, but I wanted to use the modedb and for
-+	 * that we need fb_info and var, so we create dummy ones */
-+
-+	memset(&fbi, 0, sizeof(fbi));
-+	memset(&var, 0, sizeof(var));
-+	memset(&fbops, 0, sizeof(fbops));
-+	fbi.fbops = &fbops;
-+
-+	r = fb_find_mode(&var, &fbi, mode_str, NULL, 0, NULL, 24);
-+
-+	if (r != 0) {
-+		timings->pixel_clock = PICOS2KHZ(var.pixclock);
-+		timings->hfp = var.left_margin;
-+		timings->hbp = var.right_margin;
-+		timings->vfp = var.upper_margin;
-+		timings->vbp = var.lower_margin;
-+		timings->hsw = var.hsync_len;
-+		timings->vsw = var.vsync_len;
-+		timings->x_res = var.xres;
-+		timings->y_res = var.yres;
-+
-+		switch (var.bits_per_pixel) {
-+		case 16:
-+			*bpp = 16;
-+			break;
-+		case 24:
-+		case 32:
-+		default:
-+			*bpp = 24;
-+			break;
-+		}
-+
-+		return 0;
-+	} else {
-+		return -EINVAL;
-+	}
-+}
-+
-+static int omapfb_set_def_mode(struct omap_dss_device *display, char *mode_str)
-+{
-+	int r;
-+	u8 bpp;
-+	struct omap_video_timings timings;
-+
-+	r = omapfb_mode_to_timings(mode_str, &timings, &bpp);
-+	if (r)
-+		return r;
-+
-+	display->panel.recommended_bpp = bpp;
-+
-+	if (!display->check_timings || !display->set_timings)
-+		return -EINVAL;
-+
-+	r = display->check_timings(display, &timings);
-+	if (r)
-+		return r;
-+
-+	display->set_timings(display, &timings);
-+
-+	return 0;
-+}
-+
-+static int omapfb_parse_def_modes(struct omapfb2_device *fbdev)
-+{
-+	char *str, *options, *this_opt;
-+	int r = 0;
-+
-+	str = kmalloc(strlen(def_mode) + 1, GFP_KERNEL);
-+	strcpy(str, def_mode);
-+	options = str;
-+
-+	while (!r && (this_opt = strsep(&options, ",")) != NULL) {
-+		char *p, *display_str, *mode_str;
-+		struct omap_dss_device *display;
-+		int i;
-+
-+		p = strchr(this_opt, ':');
-+		if (!p) {
-+			r = -EINVAL;
-+			break;
-+		}
-+
-+		*p = 0;
-+		display_str = this_opt;
-+		mode_str = p + 1;
-+
-+		display = NULL;
-+		for (i = 0; i < fbdev->num_displays; ++i) {
-+			if (strcmp(fbdev->displays[i]->name,
-+						display_str) == 0) {
-+				display = fbdev->displays[i];
-+				break;
-+			}
-+		}
-+
-+		if (!display) {
-+			r = -EINVAL;
-+			break;
-+		}
-+
-+		r = omapfb_set_def_mode(display, mode_str);
-+		if (r)
-+			break;
-+	}
-+
-+	kfree(str);
-+
-+	return r;
-+}
-+
-+static int omapfb_probe(struct platform_device *pdev)
-+{
-+	struct omapfb2_device *fbdev = NULL;
-+	int r = 0;
-+	int i;
-+	struct omap_overlay *ovl;
-+	struct omap_dss_device *def_display;
-+	struct omap_dss_device *dssdev;
-+
-+	DBG("omapfb_probe\n");
-+
-+	if (pdev->num_resources != 0) {
-+		dev_err(&pdev->dev, "probed for an unknown device\n");
-+		r = -ENODEV;
-+		goto err0;
-+	}
-+
-+	fbdev = kzalloc(sizeof(struct omapfb2_device), GFP_KERNEL);
-+	if (fbdev == NULL) {
-+		r = -ENOMEM;
-+		goto err0;
-+	}
-+
-+	mutex_init(&fbdev->mtx);
-+
-+	fbdev->dev = &pdev->dev;
-+	platform_set_drvdata(pdev, fbdev);
-+
-+	fbdev->num_displays = 0;
-+	dssdev = NULL;
-+	for_each_dss_dev(dssdev) {
-+		omap_dss_get_device(dssdev);
-+		fbdev->displays[fbdev->num_displays++] = dssdev;
-+	}
-+
-+	if (fbdev->num_displays == 0) {
-+		dev_err(&pdev->dev, "no displays\n");
-+		r = -EINVAL;
-+		goto cleanup;
-+	}
-+
-+	fbdev->num_overlays = omap_dss_get_num_overlays();
-+	for (i = 0; i < fbdev->num_overlays; i++)
-+		fbdev->overlays[i] = omap_dss_get_overlay(i);
-+
-+	fbdev->num_managers = omap_dss_get_num_overlay_managers();
-+	for (i = 0; i < fbdev->num_managers; i++)
-+		fbdev->managers[i] = omap_dss_get_overlay_manager(i);
-+
-+	if (def_mode && strlen(def_mode) > 0) {
-+		if (omapfb_parse_def_modes(fbdev))
-+			dev_warn(&pdev->dev, "cannot parse default modes\n");
-+	}
-+
-+	r = omapfb_create_framebuffers(fbdev);
-+	if (r)
-+		goto cleanup;
-+
-+	for (i = 0; i < fbdev->num_managers; i++) {
-+		struct omap_overlay_manager *mgr;
-+		mgr = fbdev->managers[i];
-+		r = mgr->apply(mgr);
-+		if (r)
-+			dev_warn(fbdev->dev, "failed to apply dispc config\n");
-+	}
-+
-+	DBG("mgr->apply'ed\n");
-+
-+	/* gfx overlay should be the default one. find a display
-+	 * connected to that, and use it as default display */
-+	ovl = omap_dss_get_overlay(0);
-+	if (ovl->manager && ovl->manager->device) {
-+		def_display = ovl->manager->device;
-+	} else {
-+		dev_warn(&pdev->dev, "cannot find default display\n");
-+		def_display = NULL;
-+	}
-+
-+	if (def_display) {
-+		u16 w, h;
-+		r = def_display->enable(def_display);
-+		if (r)
-+			dev_warn(fbdev->dev, "Failed to enable display '%s'\n",
-+					def_display->name);
-+
-+		/* set the update mode */
-+		if (def_display->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE) {
-+#ifdef CONFIG_FB_OMAP2_FORCE_AUTO_UPDATE
-+			if (def_display->enable_te)
-+				def_display->enable_te(def_display, 1);
-+			if (def_display->set_update_mode)
-+				def_display->set_update_mode(def_display,
-+						OMAP_DSS_UPDATE_AUTO);
-+#else /* MANUAL_UPDATE */
-+			if (def_display->enable_te)
-+				def_display->enable_te(def_display, 0);
-+			if (def_display->set_update_mode)
-+				def_display->set_update_mode(def_display,
-+						OMAP_DSS_UPDATE_MANUAL);
-+
-+			def_display->get_resolution(def_display, &w, &h);
-+			def_display->update(def_display, 0, 0, w, h);
-+#endif
-+		} else {
-+			if (def_display->set_update_mode)
-+				def_display->set_update_mode(def_display,
-+						OMAP_DSS_UPDATE_AUTO);
-+		}
-+	}
-+
-+	return 0;
-+
-+cleanup:
-+	omapfb_free_resources(fbdev);
-+err0:
-+	dev_err(&pdev->dev, "failed to setup omapfb\n");
-+	return r;
-+}
-+
-+static int omapfb_remove(struct platform_device *pdev)
-+{
-+	struct omapfb2_device *fbdev = platform_get_drvdata(pdev);
-+
-+	/* FIXME: wait till completion of pending events */
-+
-+	omapfb_remove_sysfs(fbdev);
-+
-+	omapfb_free_resources(fbdev);
-+
-+	return 0;
-+}
-+
-+static struct platform_driver omapfb_driver = {
-+	.probe          = omapfb_probe,
-+	.remove         = omapfb_remove,
-+	.driver         = {
-+		.name   = "omapfb",
-+		.owner  = THIS_MODULE,
-+	},
-+};
-+
-+static int __init omapfb_init(void)
-+{
-+	DBG("omapfb_init\n");
-+
-+	if (platform_driver_register(&omapfb_driver)) {
-+		printk(KERN_ERR "failed to register omapfb driver\n");
-+		return -ENODEV;
-+	}
-+
-+	return 0;
-+}
-+
-+static void __exit omapfb_exit(void)
-+{
-+	DBG("omapfb_exit\n");
-+	platform_driver_unregister(&omapfb_driver);
-+}
-+
-+module_param_named(mode, def_mode, charp, 0);
-+module_param_named(vram, def_vram, charp, 0);
-+module_param_named(rotate, def_rotate, int, 0);
-+module_param_named(vrfb, def_vrfb, bool, 0);
-+module_param_named(mirror, def_mirror, bool, 0);
-+
-+/* late_initcall to let panel/ctrl drivers loaded first.
-+ * I guess better option would be a more dynamic approach,
-+ * so that omapfb reacts to new panels when they are loaded */
-+late_initcall(omapfb_init);
-+/*module_init(omapfb_init);*/
-+module_exit(omapfb_exit);
-+
-+MODULE_AUTHOR("Tomi Valkeinen <tomi.valkeinen@nokia.com>");
-+MODULE_DESCRIPTION("OMAP2/3 Framebuffer");
-+MODULE_LICENSE("GPL v2");
---- /dev/null
-+++ b/drivers/video/omap2/omapfb/omapfb-sysfs.c
-@@ -0,0 +1,507 @@
-+/*
-+ * linux/drivers/video/omap2/omapfb-sysfs.c
-+ *
-+ * Copyright (C) 2008 Nokia Corporation
-+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
-+ *
-+ * Some code and ideas taken from drivers/video/omap/ driver
-+ * by Imre Deak.
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-+ * more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along with
-+ * this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include <linux/fb.h>
-+#include <linux/sysfs.h>
-+#include <linux/device.h>
-+#include <linux/uaccess.h>
-+#include <linux/platform_device.h>
-+#include <linux/kernel.h>
-+#include <linux/mm.h>
-+#include <linux/omapfb.h>
-+
-+#include <mach/display.h>
-+#include <mach/vrfb.h>
-+
-+#include "omapfb.h"
-+
-+static ssize_t show_rotate_type(struct device *dev,
-+		struct device_attribute *attr, char *buf)
-+{
-+	struct fb_info *fbi = dev_get_drvdata(dev);
-+	struct omapfb_info *ofbi = FB2OFB(fbi);
-+
-+	return snprintf(buf, PAGE_SIZE, "%d\n", ofbi->rotation_type);
-+}
-+
-+static ssize_t store_rotate_type(struct device *dev,
-+		struct device_attribute *attr,
-+		const char *buf, size_t count)
-+{
-+	struct fb_info *fbi = dev_get_drvdata(dev);
-+	struct omapfb_info *ofbi = FB2OFB(fbi);
-+	enum omap_dss_rotation_type rot_type;
-+	int r;
-+
-+	rot_type = simple_strtoul(buf, NULL, 0);
-+
-+	if (rot_type != OMAP_DSS_ROT_DMA && rot_type != OMAP_DSS_ROT_VRFB)
-+		return -EINVAL;
-+
-+	lock_fb_info(fbi);
-+
-+	r = 0;
-+	if (rot_type == ofbi->rotation_type)
-+		goto out;
-+
-+	if (ofbi->region.size) {
-+		r = -EBUSY;
-+		goto out;
-+	}
-+
-+	ofbi->rotation_type = rot_type;
-+
-+	/*
-+	 * Since the VRAM for this FB is not allocated at the moment we don't
-+	 * need to do any further parameter checking at this point.
-+	 */
-+out:
-+	unlock_fb_info(fbi);
-+
-+	return r ? r : count;
-+}
-+
-+
-+static ssize_t show_mirror(struct device *dev,
-+		struct device_attribute *attr, char *buf)
-+{
-+	struct fb_info *fbi = dev_get_drvdata(dev);
-+	struct omapfb_info *ofbi = FB2OFB(fbi);
-+
-+	return snprintf(buf, PAGE_SIZE, "%d\n", ofbi->mirror);
-+}
-+
-+static ssize_t store_mirror(struct device *dev,
-+		struct device_attribute *attr,
-+		const char *buf, size_t count)
-+{
-+	struct fb_info *fbi = dev_get_drvdata(dev);
-+	struct omapfb_info *ofbi = FB2OFB(fbi);
-+	bool mirror;
-+	int r;
-+	struct fb_var_screeninfo new_var;
-+
-+	mirror = simple_strtoul(buf, NULL, 0);
-+
-+	if (mirror != 0 && mirror != 1)
-+		return -EINVAL;
-+
-+	lock_fb_info(fbi);
-+
-+	ofbi->mirror = mirror;
-+
-+	memcpy(&new_var, &fbi->var, sizeof(new_var));
-+	r = check_fb_var(fbi, &new_var);
-+	if (r)
-+		goto out;
-+	memcpy(&fbi->var, &new_var, sizeof(fbi->var));
-+
-+	set_fb_fix(fbi);
-+
-+	r = omapfb_apply_changes(fbi, 0);
-+	if (r)
-+		goto out;
-+
-+	r = count;
-+out:
-+	unlock_fb_info(fbi);
-+
-+	return r;
-+}
-+
-+static ssize_t show_overlays(struct device *dev,
-+		struct device_attribute *attr, char *buf)
-+{
-+	struct fb_info *fbi = dev_get_drvdata(dev);
-+	struct omapfb_info *ofbi = FB2OFB(fbi);
-+	struct omapfb2_device *fbdev = ofbi->fbdev;
-+	ssize_t l = 0;
-+	int t;
-+
-+	omapfb_lock(fbdev);
-+	lock_fb_info(fbi);
-+
-+	for (t = 0; t < ofbi->num_overlays; t++) {
-+		struct omap_overlay *ovl = ofbi->overlays[t];
-+		int ovlnum;
-+
-+		for (ovlnum = 0; ovlnum < fbdev->num_overlays; ++ovlnum)
-+			if (ovl == fbdev->overlays[ovlnum])
-+				break;
-+
-+		l += snprintf(buf + l, PAGE_SIZE - l, "%s%d",
-+				t == 0 ? "" : ",", ovlnum);
-+	}
-+
-+	l += snprintf(buf + l, PAGE_SIZE - l, "\n");
-+
-+	unlock_fb_info(fbi);
-+	omapfb_unlock(fbdev);
-+
-+	return l;
-+}
-+
-+static struct omapfb_info *get_overlay_fb(struct omapfb2_device *fbdev,
-+		struct omap_overlay *ovl)
-+{
-+	int i, t;
-+
-+	for (i = 0; i < fbdev->num_fbs; i++) {
-+		struct omapfb_info *ofbi = FB2OFB(fbdev->fbs[i]);
-+
-+		for (t = 0; t < ofbi->num_overlays; t++) {
-+			if (ofbi->overlays[t] == ovl)
-+				return ofbi;
-+		}
-+	}
-+
-+	return NULL;
-+}
-+
-+static ssize_t store_overlays(struct device *dev, struct device_attribute *attr,
-+		const char *buf, size_t count)
-+{
-+	struct fb_info *fbi = dev_get_drvdata(dev);
-+	struct omapfb_info *ofbi = FB2OFB(fbi);
-+	struct omapfb2_device *fbdev = ofbi->fbdev;
-+	struct omap_overlay *ovls[OMAPFB_MAX_OVL_PER_FB];
-+	struct omap_overlay *ovl;
-+	int num_ovls, r, i;
-+	int len;
-+	bool added = false;
-+
-+	num_ovls = 0;
-+
-+	len = strlen(buf);
-+	if (buf[len - 1] == '\n')
-+		len = len - 1;
-+
-+	omapfb_lock(fbdev);
-+	lock_fb_info(fbi);
-+
-+	if (len > 0) {
-+		char *p = (char *)buf;
-+		int ovlnum;
-+
-+		while (p < buf + len) {
-+			int found;
-+			if (num_ovls == OMAPFB_MAX_OVL_PER_FB) {
-+				r = -EINVAL;
-+				goto out;
-+			}
-+
-+			ovlnum = simple_strtoul(p, &p, 0);
-+			if (ovlnum > fbdev->num_overlays) {
-+				r = -EINVAL;
-+				goto out;
-+			}
-+
-+			found = 0;
-+			for (i = 0; i < num_ovls; ++i) {
-+				if (ovls[i] == fbdev->overlays[ovlnum]) {
-+					found = 1;
-+					break;
-+				}
-+			}
-+
-+			if (!found)
-+				ovls[num_ovls++] = fbdev->overlays[ovlnum];
-+
-+			p++;
-+		}
-+	}
-+
-+	for (i = 0; i < num_ovls; ++i) {
-+		struct omapfb_info *ofbi2 = get_overlay_fb(fbdev, ovls[i]);
-+		if (ofbi2 && ofbi2 != ofbi) {
-+			dev_err(fbdev->dev, "overlay already in use\n");
-+			r = -EINVAL;
-+			goto out;
-+		}
-+	}
-+
-+	/* detach unused overlays */
-+	for (i = 0; i < ofbi->num_overlays; ++i) {
-+		int t, found;
-+
-+		ovl = ofbi->overlays[i];
-+
-+		found = 0;
-+
-+		for (t = 0; t < num_ovls; ++t) {
-+			if (ovl == ovls[t]) {
-+				found = 1;
-+				break;
-+			}
-+		}
-+
-+		if (found)
-+			continue;
-+
-+		DBG("detaching %d\n", ofbi->overlays[i]->id);
-+
-+		omapfb_overlay_enable(ovl, 0);
-+
-+		if (ovl->manager)
-+			ovl->manager->apply(ovl->manager);
-+
-+		for (t = i + 1; t < ofbi->num_overlays; t++) {
-+			ofbi->rotation[t-1] = ofbi->rotation[t];
-+			ofbi->overlays[t-1] = ofbi->overlays[t];
-+		}
-+
-+		ofbi->num_overlays--;
-+		i--;
-+	}
-+
-+	for (i = 0; i < num_ovls; ++i) {
-+		int t, found;
-+
-+		ovl = ovls[i];
-+
-+		found = 0;
-+
-+		for (t = 0; t < ofbi->num_overlays; ++t) {
-+			if (ovl == ofbi->overlays[t]) {
-+				found = 1;
-+				break;
-+			}
-+		}
-+
-+		if (found)
-+			continue;
-+		ofbi->rotation[ofbi->num_overlays] = 0;
-+		ofbi->overlays[ofbi->num_overlays++] = ovl;
-+
-+		added = true;
-+	}
-+
-+	if (added) {
-+		r = omapfb_apply_changes(fbi, 0);
-+		if (r)
-+			goto out;
-+	}
-+
-+	r = count;
-+out:
-+	unlock_fb_info(fbi);
-+	omapfb_unlock(fbdev);
-+
-+	return r;
-+}
-+
-+static ssize_t show_overlays_rotate(struct device *dev,
-+		struct device_attribute *attr, char *buf)
-+{
-+	struct fb_info *fbi = dev_get_drvdata(dev);
-+	struct omapfb_info *ofbi = FB2OFB(fbi);
-+	ssize_t l = 0;
-+	int t;
-+
-+	lock_fb_info(fbi);
-+
-+	for (t = 0; t < ofbi->num_overlays; t++) {
-+		l += snprintf(buf + l, PAGE_SIZE - l, "%s%d",
-+				t == 0 ? "" : ",", ofbi->rotation[t]);
-+	}
-+
-+	l += snprintf(buf + l, PAGE_SIZE - l, "\n");
-+
-+	unlock_fb_info(fbi);
-+
-+	return l;
-+}
-+
-+static ssize_t store_overlays_rotate(struct device *dev,
-+		struct device_attribute *attr, const char *buf, size_t count)
-+{
-+	struct fb_info *fbi = dev_get_drvdata(dev);
-+	struct omapfb_info *ofbi = FB2OFB(fbi);
-+	int num_ovls = 0, r, i;
-+	int len;
-+	bool changed = false;
-+	u8 rotation[OMAPFB_MAX_OVL_PER_FB];
-+
-+	len = strlen(buf);
-+	if (buf[len - 1] == '\n')
-+		len = len - 1;
-+
-+	lock_fb_info(fbi);
-+
-+	if (len > 0) {
-+		char *p = (char *)buf;
-+
-+		while (p < buf + len) {
-+			int rot;
-+
-+			if (num_ovls == ofbi->num_overlays) {
-+				r = -EINVAL;
-+				goto out;
-+			}
-+
-+			rot = simple_strtoul(p, &p, 0);
-+			if (rot < 0 || rot > 3) {
-+				r = -EINVAL;
-+				goto out;
-+			}
-+
-+			if (ofbi->rotation[num_ovls] != rot)
-+				changed = true;
-+
-+			rotation[num_ovls++] = rot;
-+
-+			p++;
-+		}
-+	}
-+
-+	if (num_ovls != ofbi->num_overlays) {
-+		r = -EINVAL;
-+		goto out;
-+	}
-+
-+	if (changed) {
-+		for (i = 0; i < num_ovls; ++i)
-+			ofbi->rotation[i] = rotation[i];
-+
-+		r = omapfb_apply_changes(fbi, 0);
-+		if (r)
-+			goto out;
-+
-+		/* FIXME error handling? */
-+	}
-+
-+	r = count;
-+out:
-+	unlock_fb_info(fbi);
-+
-+	return r;
-+}
-+
-+static ssize_t show_size(struct device *dev,
-+		struct device_attribute *attr, char *buf)
-+{
-+	struct fb_info *fbi = dev_get_drvdata(dev);
-+	struct omapfb_info *ofbi = FB2OFB(fbi);
-+
-+	return snprintf(buf, PAGE_SIZE, "%lu\n", ofbi->region.size);
-+}
-+
-+static ssize_t store_size(struct device *dev, struct device_attribute *attr,
-+		const char *buf, size_t count)
-+{
-+	struct fb_info *fbi = dev_get_drvdata(dev);
-+	struct omapfb_info *ofbi = FB2OFB(fbi);
-+	unsigned long size;
-+	int r;
-+	int i;
-+
-+	size = PAGE_ALIGN(simple_strtoul(buf, NULL, 0));
-+
-+	lock_fb_info(fbi);
-+
-+	for (i = 0; i < ofbi->num_overlays; i++) {
-+		if (ofbi->overlays[i]->info.enabled) {
-+			r = -EBUSY;
-+			goto out;
-+		}
-+	}
-+
-+	if (size != ofbi->region.size) {
-+		r = omapfb_realloc_fbmem(fbi, size, ofbi->region.type);
-+		if (r) {
-+			dev_err(dev, "realloc fbmem failed\n");
-+			goto out;
-+		}
-+	}
-+
-+	r = count;
-+out:
-+	unlock_fb_info(fbi);
-+
-+	return r;
-+}
-+
-+static ssize_t show_phys(struct device *dev,
-+		struct device_attribute *attr, char *buf)
-+{
-+	struct fb_info *fbi = dev_get_drvdata(dev);
-+	struct omapfb_info *ofbi = FB2OFB(fbi);
-+
-+	return snprintf(buf, PAGE_SIZE, "%0x\n", ofbi->region.paddr);
-+}
-+
-+static ssize_t show_virt(struct device *dev,
-+		struct device_attribute *attr, char *buf)
-+{
-+	struct fb_info *fbi = dev_get_drvdata(dev);
-+	struct omapfb_info *ofbi = FB2OFB(fbi);
-+
-+	return snprintf(buf, PAGE_SIZE, "%p\n", ofbi->region.vaddr);
-+}
-+
-+static struct device_attribute omapfb_attrs[] = {
-+	__ATTR(rotate_type, S_IRUGO | S_IWUSR, show_rotate_type,
-+			store_rotate_type),
-+	__ATTR(mirror, S_IRUGO | S_IWUSR, show_mirror, store_mirror),
-+	__ATTR(size, S_IRUGO | S_IWUSR, show_size, store_size),
-+	__ATTR(overlays, S_IRUGO | S_IWUSR, show_overlays, store_overlays),
-+	__ATTR(overlays_rotate, S_IRUGO | S_IWUSR, show_overlays_rotate,
-+			store_overlays_rotate),
-+	__ATTR(phys_addr, S_IRUGO, show_phys, NULL),
-+	__ATTR(virt_addr, S_IRUGO, show_virt, NULL),
-+};
-+
-+int omapfb_create_sysfs(struct omapfb2_device *fbdev)
-+{
-+	int i;
-+	int r;
-+
-+	DBG("create sysfs for fbs\n");
-+	for (i = 0; i < fbdev->num_fbs; i++) {
-+		int t;
-+		for (t = 0; t < ARRAY_SIZE(omapfb_attrs); t++) {
-+			r = device_create_file(fbdev->fbs[i]->dev,
-+					&omapfb_attrs[t]);
-+
-+			if (r) {
-+				dev_err(fbdev->dev, "failed to create sysfs "
-+						"file\n");
-+				return r;
-+			}
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+void omapfb_remove_sysfs(struct omapfb2_device *fbdev)
-+{
-+	int i, t;
-+
-+	DBG("remove sysfs for fbs\n");
-+	for (i = 0; i < fbdev->num_fbs; i++) {
-+		for (t = 0; t < ARRAY_SIZE(omapfb_attrs); t++)
-+			device_remove_file(fbdev->fbs[i]->dev,
-+					&omapfb_attrs[t]);
-+	}
-+}
-+
---- /dev/null
-+++ b/drivers/video/omap2/omapfb/omapfb.h
-@@ -0,0 +1,146 @@
-+/*
-+ * linux/drivers/video/omap2/omapfb.h
-+ *
-+ * Copyright (C) 2008 Nokia Corporation
-+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
-+ *
-+ * Some code and ideas taken from drivers/video/omap/ driver
-+ * by Imre Deak.
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-+ * more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along with
-+ * this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#ifndef __DRIVERS_VIDEO_OMAP2_OMAPFB_H__
-+#define __DRIVERS_VIDEO_OMAP2_OMAPFB_H__
-+
-+#ifdef CONFIG_FB_OMAP2_DEBUG_SUPPORT
-+#define DEBUG
-+#endif
-+
-+#include <mach/display.h>
-+
-+#ifdef DEBUG
-+extern unsigned int omapfb_debug;
-+#define DBG(format, ...) \
-+	if (omapfb_debug) \
-+		printk(KERN_DEBUG "OMAPFB: " format, ## __VA_ARGS__)
-+#else
-+#define DBG(format, ...)
-+#endif
-+
-+#define FB2OFB(fb_info) ((struct omapfb_info *)(fb_info->par))
-+
-+/* max number of overlays to which a framebuffer data can be direct */
-+#define OMAPFB_MAX_OVL_PER_FB 3
-+
-+struct omapfb2_mem_region {
-+	u32		paddr;
-+	void __iomem	*vaddr;
-+	struct vrfb	vrfb;
-+	unsigned long	size;
-+	u8		type;		/* OMAPFB_PLANE_MEM_* */
-+	bool		alloc;		/* allocated by the driver */
-+	bool		map;		/* kernel mapped by the driver */
-+};
-+
-+/* appended to fb_info */
-+struct omapfb_info {
-+	int id;
-+	struct omapfb2_mem_region region;
-+	atomic_t map_count;
-+	int num_overlays;
-+	struct omap_overlay *overlays[OMAPFB_MAX_OVL_PER_FB];
-+	struct omapfb2_device *fbdev;
-+	enum omap_dss_rotation_type rotation_type;
-+	u8 rotation[OMAPFB_MAX_OVL_PER_FB];
-+	bool mirror;
-+};
-+
-+struct omapfb2_device {
-+	struct device *dev;
-+	struct mutex  mtx;
-+
-+	u32 pseudo_palette[17];
-+
-+	int state;
-+
-+	unsigned num_fbs;
-+	struct fb_info *fbs[10];
-+
-+	unsigned num_displays;
-+	struct omap_dss_device *displays[10];
-+	unsigned num_overlays;
-+	struct omap_overlay *overlays[10];
-+	unsigned num_managers;
-+	struct omap_overlay_manager *managers[10];
-+};
-+
-+struct omapfb_colormode {
-+	enum omap_color_mode dssmode;
-+	u32 bits_per_pixel;
-+	u32 nonstd;
-+	struct fb_bitfield red;
-+	struct fb_bitfield green;
-+	struct fb_bitfield blue;
-+	struct fb_bitfield transp;
-+};
-+
-+void set_fb_fix(struct fb_info *fbi);
-+int check_fb_var(struct fb_info *fbi, struct fb_var_screeninfo *var);
-+int omapfb_realloc_fbmem(struct fb_info *fbi, unsigned long size, int type);
-+int omapfb_apply_changes(struct fb_info *fbi, int init);
-+
-+int omapfb_create_sysfs(struct omapfb2_device *fbdev);
-+void omapfb_remove_sysfs(struct omapfb2_device *fbdev);
-+
-+int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg);
-+
-+int dss_mode_to_fb_mode(enum omap_color_mode dssmode,
-+			struct fb_var_screeninfo *var);
-+
-+/* find the display connected to this fb, if any */
-+static inline struct omap_dss_device *fb2display(struct fb_info *fbi)
-+{
-+	struct omapfb_info *ofbi = FB2OFB(fbi);
-+	int i;
-+
-+	/* XXX: returns the display connected to first attached overlay */
-+	for (i = 0; i < ofbi->num_overlays; i++) {
-+		if (ofbi->overlays[i]->manager)
-+			return ofbi->overlays[i]->manager->device;
-+	}
-+
-+	return NULL;
-+}
-+
-+static inline void omapfb_lock(struct omapfb2_device *fbdev)
-+{
-+	mutex_lock(&fbdev->mtx);
-+}
-+
-+static inline void omapfb_unlock(struct omapfb2_device *fbdev)
-+{
-+	mutex_unlock(&fbdev->mtx);
-+}
-+
-+static inline int omapfb_overlay_enable(struct omap_overlay *ovl,
-+		int enable)
-+{
-+	struct omap_overlay_info info;
-+
-+	ovl->get_overlay_info(ovl, &info);
-+	info.enabled = enable;
-+	return ovl->set_overlay_info(ovl, &info);
-+}
-+
-+#endif
---- /dev/null
-+++ b/drivers/video/omap2/vram.c
-@@ -0,0 +1,655 @@
-+/*
-+ * VRAM manager for OMAP
-+ *
-+ * Copyright (C) 2009 Nokia Corporation
-+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.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.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along
-+ * with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+ */
-+
-+/*#define DEBUG*/
-+
-+#include <linux/kernel.h>
-+#include <linux/mm.h>
-+#include <linux/list.h>
-+#include <linux/seq_file.h>
-+#include <linux/bootmem.h>
-+#include <linux/completion.h>
-+#include <linux/debugfs.h>
-+#include <linux/jiffies.h>
-+#include <linux/module.h>
-+
-+#include <asm/setup.h>
-+
-+#include <mach/sram.h>
-+#include <mach/vram.h>
-+#include <mach/dma.h>
-+
-+#ifdef DEBUG
-+#define DBG(format, ...) pr_debug("VRAM: " format, ## __VA_ARGS__)
-+#else
-+#define DBG(format, ...)
-+#endif
-+
-+#define OMAP2_SRAM_START		0x40200000
-+/* Maximum size, in reality this is smaller if SRAM is partially locked. */
-+#define OMAP2_SRAM_SIZE			0xa0000		/* 640k */
-+
-+/* postponed regions are used to temporarily store region information at boot
-+ * time when we cannot yet allocate the region list */
-+#define MAX_POSTPONED_REGIONS 10
-+
-+static bool vram_initialized;
-+static int postponed_cnt;
-+static struct {
-+	unsigned long paddr;
-+	size_t size;
-+} postponed_regions[MAX_POSTPONED_REGIONS];
-+
-+struct vram_alloc {
-+	struct list_head list;
-+	unsigned long paddr;
-+	unsigned pages;
-+};
-+
-+struct vram_region {
-+	struct list_head list;
-+	struct list_head alloc_list;
-+	unsigned long paddr;
-+	unsigned pages;
-+};
-+
-+static DEFINE_MUTEX(region_mutex);
-+static LIST_HEAD(region_list);
-+
-+static inline int region_mem_type(unsigned long paddr)
-+{
-+	if (paddr >= OMAP2_SRAM_START &&
-+	    paddr < OMAP2_SRAM_START + OMAP2_SRAM_SIZE)
-+		return OMAP_VRAM_MEMTYPE_SRAM;
-+	else
-+		return OMAP_VRAM_MEMTYPE_SDRAM;
-+}
-+
-+static struct vram_region *omap_vram_create_region(unsigned long paddr,
-+		unsigned pages)
-+{
-+	struct vram_region *rm;
-+
-+	rm = kzalloc(sizeof(*rm), GFP_KERNEL);
-+
-+	if (rm) {
-+		INIT_LIST_HEAD(&rm->alloc_list);
-+		rm->paddr = paddr;
-+		rm->pages = pages;
-+	}
-+
-+	return rm;
-+}
-+
-+#if 0
-+static void omap_vram_free_region(struct vram_region *vr)
-+{
-+	list_del(&vr->list);
-+	kfree(vr);
-+}
-+#endif
-+
-+static struct vram_alloc *omap_vram_create_allocation(struct vram_region *vr,
-+		unsigned long paddr, unsigned pages)
-+{
-+	struct vram_alloc *va;
-+	struct vram_alloc *new;
-+
-+	new = kzalloc(sizeof(*va), GFP_KERNEL);
-+
-+	if (!new)
-+		return NULL;
-+
-+	new->paddr = paddr;
-+	new->pages = pages;
-+
-+	list_for_each_entry(va, &vr->alloc_list, list) {
-+		if (va->paddr > new->paddr)
-+			break;
-+	}
-+
-+	list_add_tail(&new->list, &va->list);
-+
-+	return new;
-+}
-+
-+static void omap_vram_free_allocation(struct vram_alloc *va)
-+{
-+	list_del(&va->list);
-+	kfree(va);
-+}
-+
-+int omap_vram_add_region(unsigned long paddr, size_t size)
-+{
-+	struct vram_region *rm;
-+	unsigned pages;
-+
-+	if (vram_initialized) {
-+		DBG("adding region paddr %08lx size %d\n",
-+				paddr, size);
-+
-+		size &= PAGE_MASK;
-+		pages = size >> PAGE_SHIFT;
-+
-+		rm = omap_vram_create_region(paddr, pages);
-+		if (rm == NULL)
-+			return -ENOMEM;
-+
-+		list_add(&rm->list, &region_list);
-+	} else {
-+		if (postponed_cnt == MAX_POSTPONED_REGIONS)
-+			return -ENOMEM;
-+
-+		postponed_regions[postponed_cnt].paddr = paddr;
-+		postponed_regions[postponed_cnt].size = size;
-+
-+		++postponed_cnt;
-+	}
-+	return 0;
-+}
-+
-+int omap_vram_free(unsigned long paddr, size_t size)
-+{
-+	struct vram_region *rm;
-+	struct vram_alloc *alloc;
-+	unsigned start, end;
-+
-+	DBG("free mem paddr %08lx size %d\n", paddr, size);
-+
-+	size = PAGE_ALIGN(size);
-+
-+	mutex_lock(&region_mutex);
-+
-+	list_for_each_entry(rm, &region_list, list) {
-+		list_for_each_entry(alloc, &rm->alloc_list, list) {
-+			start = alloc->paddr;
-+			end = alloc->paddr + (alloc->pages >> PAGE_SHIFT);
-+
-+			if (start >= paddr && end < paddr + size)
-+				goto found;
-+		}
-+	}
-+
-+	mutex_unlock(&region_mutex);
-+	return -EINVAL;
-+
-+found:
-+	omap_vram_free_allocation(alloc);
-+
-+	mutex_unlock(&region_mutex);
-+	return 0;
-+}
-+EXPORT_SYMBOL(omap_vram_free);
-+
-+static int _omap_vram_reserve(unsigned long paddr, unsigned pages)
-+{
-+	struct vram_region *rm;
-+	struct vram_alloc *alloc;
-+	size_t size;
-+
-+	size = pages << PAGE_SHIFT;
-+
-+	list_for_each_entry(rm, &region_list, list) {
-+		unsigned long start, end;
-+
-+		DBG("checking region %lx %d\n", rm->paddr, rm->pages);
-+
-+		if (region_mem_type(rm->paddr) != region_mem_type(paddr))
-+			continue;
-+
-+		start = rm->paddr;
-+		end = start + (rm->pages << PAGE_SHIFT) - 1;
-+		if (start > paddr || end < paddr + size - 1)
-+			continue;
-+
-+		DBG("block ok, checking allocs\n");
-+
-+		list_for_each_entry(alloc, &rm->alloc_list, list) {
-+			end = alloc->paddr - 1;
-+
-+			if (start <= paddr && end >= paddr + size - 1)
-+				goto found;
-+
-+			start = alloc->paddr + (alloc->pages << PAGE_SHIFT);
-+		}
-+
-+		end = rm->paddr + (rm->pages << PAGE_SHIFT) - 1;
-+
-+		if (!(start <= paddr && end >= paddr + size - 1))
-+			continue;
-+found:
-+		DBG("found area start %lx, end %lx\n", start, end);
-+
-+		if (omap_vram_create_allocation(rm, paddr, pages) == NULL)
-+			return -ENOMEM;
-+
-+		return 0;
-+	}
-+
-+	return -ENOMEM;
-+}
-+
-+int omap_vram_reserve(unsigned long paddr, size_t size)
-+{
-+	unsigned pages;
-+	int r;
-+
-+	DBG("reserve mem paddr %08lx size %d\n", paddr, size);
-+
-+	size = PAGE_ALIGN(size);
-+	pages = size >> PAGE_SHIFT;
-+
-+	mutex_lock(&region_mutex);
-+
-+	r = _omap_vram_reserve(paddr, pages);
-+
-+	mutex_unlock(&region_mutex);
-+
-+	return r;
-+}
-+EXPORT_SYMBOL(omap_vram_reserve);
-+
-+static void _omap_vram_dma_cb(int lch, u16 ch_status, void *data)
-+{
-+	struct completion *compl = data;
-+	complete(compl);
-+}
-+
-+static int _omap_vram_clear(u32 paddr, unsigned pages)
-+{
-+	struct completion compl;
-+	unsigned elem_count;
-+	unsigned frame_count;
-+	int r;
-+	int lch;
-+
-+	init_completion(&compl);
-+
-+	r = omap_request_dma(OMAP_DMA_NO_DEVICE, "VRAM DMA",
-+			_omap_vram_dma_cb,
-+			&compl, &lch);
-+	if (r) {
-+		pr_err("VRAM: request_dma failed for memory clear\n");
-+		return -EBUSY;
-+	}
-+
-+	elem_count = pages * PAGE_SIZE / 4;
-+	frame_count = 1;
-+
-+	omap_set_dma_transfer_params(lch, OMAP_DMA_DATA_TYPE_S32,
-+			elem_count, frame_count,
-+			OMAP_DMA_SYNC_ELEMENT,
-+			0, 0);
-+
-+	omap_set_dma_dest_params(lch, 0, OMAP_DMA_AMODE_POST_INC,
-+			paddr, 0, 0);
-+
-+	omap_set_dma_color_mode(lch, OMAP_DMA_CONSTANT_FILL, 0x000000);
-+
-+	omap_start_dma(lch);
-+
-+	if (wait_for_completion_timeout(&compl, msecs_to_jiffies(1000)) == 0) {
-+		omap_stop_dma(lch);
-+		pr_err("VRAM: dma timeout while clearing memory\n");
-+		r = -EIO;
-+		goto err;
-+	}
-+
-+	r = 0;
-+err:
-+	omap_free_dma(lch);
-+
-+	return r;
-+}
-+
-+static int _omap_vram_alloc(int mtype, unsigned pages, unsigned long *paddr)
-+{
-+	struct vram_region *rm;
-+	struct vram_alloc *alloc;
-+
-+	list_for_each_entry(rm, &region_list, list) {
-+		unsigned long start, end;
-+
-+		DBG("checking region %lx %d\n", rm->paddr, rm->pages);
-+
-+		if (region_mem_type(rm->paddr) != mtype)
-+			continue;
-+
-+		start = rm->paddr;
-+
-+		list_for_each_entry(alloc, &rm->alloc_list, list) {
-+			end = alloc->paddr;
-+
-+			if (end - start >= pages << PAGE_SHIFT)
-+				goto found;
-+
-+			start = alloc->paddr + (alloc->pages << PAGE_SHIFT);
-+		}
-+
-+		end = rm->paddr + (rm->pages << PAGE_SHIFT);
-+found:
-+		if (end - start < pages << PAGE_SHIFT)
-+			continue;
-+
-+		DBG("found %lx, end %lx\n", start, end);
-+
-+		alloc = omap_vram_create_allocation(rm, start, pages);
-+		if (alloc == NULL)
-+			return -ENOMEM;
-+
-+		*paddr = start;
-+
-+		_omap_vram_clear(start, pages);
-+
-+		return 0;
-+	}
-+
-+	return -ENOMEM;
-+}
-+
-+int omap_vram_alloc(int mtype, size_t size, unsigned long *paddr)
-+{
-+	unsigned pages;
-+	int r;
-+
-+	BUG_ON(mtype > OMAP_VRAM_MEMTYPE_MAX || !size);
-+
-+	DBG("alloc mem type %d size %d\n", mtype, size);
-+
-+	size = PAGE_ALIGN(size);
-+	pages = size >> PAGE_SHIFT;
-+
-+	mutex_lock(&region_mutex);
-+
-+	r = _omap_vram_alloc(mtype, pages, paddr);
-+
-+	mutex_unlock(&region_mutex);
-+
-+	return r;
-+}
-+EXPORT_SYMBOL(omap_vram_alloc);
-+
-+void omap_vram_get_info(unsigned long *vram,
-+		unsigned long *free_vram,
-+		unsigned long *largest_free_block)
-+{
-+	struct vram_region *vr;
-+	struct vram_alloc *va;
-+
-+	*vram = 0;
-+	*free_vram = 0;
-+	*largest_free_block = 0;
-+
-+	mutex_lock(&region_mutex);
-+
-+	list_for_each_entry(vr, &region_list, list) {
-+		unsigned free;
-+		unsigned long pa;
-+
-+		pa = vr->paddr;
-+		*vram += vr->pages << PAGE_SHIFT;
-+
-+		list_for_each_entry(va, &vr->alloc_list, list) {
-+			free = va->paddr - pa;
-+			*free_vram += free;
-+			if (free > *largest_free_block)
-+				*largest_free_block = free;
-+			pa = va->paddr + (va->pages << PAGE_SHIFT);
-+		}
-+
-+		free = vr->paddr + (vr->pages << PAGE_SHIFT) - pa;
-+		*free_vram += free;
-+		if (free > *largest_free_block)
-+			*largest_free_block = free;
-+	}
-+
-+	mutex_unlock(&region_mutex);
-+}
-+EXPORT_SYMBOL(omap_vram_get_info);
-+
-+#if defined(CONFIG_DEBUG_FS)
-+static int vram_debug_show(struct seq_file *s, void *unused)
-+{
-+	struct vram_region *vr;
-+	struct vram_alloc *va;
-+	unsigned size;
-+
-+	mutex_lock(&region_mutex);
-+
-+	list_for_each_entry(vr, &region_list, list) {
-+		size = vr->pages << PAGE_SHIFT;
-+		seq_printf(s, "%08lx-%08lx (%d bytes)\n",
-+				vr->paddr, vr->paddr + size - 1,
-+				size);
-+
-+		list_for_each_entry(va, &vr->alloc_list, list) {
-+			size = va->pages << PAGE_SHIFT;
-+			seq_printf(s, "    %08lx-%08lx (%d bytes)\n",
-+					va->paddr, va->paddr + size - 1,
-+					size);
-+		}
-+	}
-+
-+	mutex_unlock(&region_mutex);
-+
-+	return 0;
-+}
-+
-+static int vram_debug_open(struct inode *inode, struct file *file)
-+{
-+	return single_open(file, vram_debug_show, inode->i_private);
-+}
-+
-+static const struct file_operations vram_debug_fops = {
-+	.open           = vram_debug_open,
-+	.read           = seq_read,
-+	.llseek         = seq_lseek,
-+	.release        = single_release,
-+};
-+
-+static int __init omap_vram_create_debugfs(void)
-+{
-+	struct dentry *d;
-+
-+	d = debugfs_create_file("vram", S_IRUGO, NULL,
-+			NULL, &vram_debug_fops);
-+	if (IS_ERR(d))
-+		return PTR_ERR(d);
-+
-+	return 0;
-+}
-+#endif
-+
-+static __init int omap_vram_init(void)
-+{
-+	int i;
-+
-+	vram_initialized = 1;
-+
-+	for (i = 0; i < postponed_cnt; i++)
-+		omap_vram_add_region(postponed_regions[i].paddr,
-+				postponed_regions[i].size);
-+
-+#ifdef CONFIG_DEBUG_FS
-+	if (omap_vram_create_debugfs())
-+		pr_err("VRAM: Failed to create debugfs file\n");
-+#endif
-+
-+	return 0;
-+}
-+
-+arch_initcall(omap_vram_init);
-+
-+/* boottime vram alloc stuff */
-+
-+/* set from board file */
-+static u32 omap_vram_sram_start __initdata;
-+static u32 omap_vram_sram_size __initdata;
-+
-+/* set from board file */
-+static u32 omap_vram_sdram_start __initdata;
-+static u32 omap_vram_sdram_size __initdata;
-+
-+/* set from kernel cmdline */
-+static u32 omap_vram_def_sdram_size __initdata;
-+static u32 omap_vram_def_sdram_start __initdata;
-+
-+static void __init omap_vram_early_vram(char **p)
-+{
-+	omap_vram_def_sdram_size = memparse(*p, p);
-+	if (**p == ',')
-+		omap_vram_def_sdram_start = simple_strtoul((*p) + 1, p, 16);
-+}
-+__early_param("vram=", omap_vram_early_vram);
-+
-+/*
-+ * Called from map_io. We need to call to this early enough so that we
-+ * can reserve the fixed SDRAM regions before VM could get hold of them.
-+ */
-+void __init omap_vram_reserve_sdram(void)
-+{
-+	struct bootmem_data	*bdata;
-+	unsigned long		sdram_start, sdram_size;
-+	u32 paddr;
-+	u32 size = 0;
-+
-+	/* cmdline arg overrides the board file definition */
-+	if (omap_vram_def_sdram_size) {
-+		size = omap_vram_def_sdram_size;
-+		paddr = omap_vram_def_sdram_start;
-+	}
-+
-+	if (!size) {
-+		size = omap_vram_sdram_size;
-+		paddr = omap_vram_sdram_start;
-+	}
-+
-+#ifdef CONFIG_OMAP2_VRAM_SIZE
-+	if (!size) {
-+		size = CONFIG_OMAP2_VRAM_SIZE * 1024 * 1024;
-+		paddr = 0;
-+	}
-+#endif
-+
-+	if (!size)
-+		return;
-+
-+	size = PAGE_ALIGN(size);
-+
-+	bdata = NODE_DATA(0)->bdata;
-+	sdram_start = bdata->node_min_pfn << PAGE_SHIFT;
-+	sdram_size = (bdata->node_low_pfn << PAGE_SHIFT) - sdram_start;
-+
-+	if (paddr) {
-+		if ((paddr & ~PAGE_MASK) || paddr < sdram_start ||
-+				paddr + size > sdram_start + sdram_size) {
-+			pr_err("Illegal SDRAM region for VRAM\n");
-+			return;
-+		}
-+
-+		if (reserve_bootmem(paddr, size, BOOTMEM_EXCLUSIVE) < 0) {
-+			pr_err("FB: failed to reserve VRAM\n");
-+			return;
-+		}
-+	} else {
-+		if (size > sdram_size) {
-+			pr_err("Illegal SDRAM size for VRAM\n");
-+			return;
-+		}
-+
-+		paddr = virt_to_phys(alloc_bootmem_pages(size));
-+		BUG_ON(paddr & ~PAGE_MASK);
-+	}
-+
-+	omap_vram_add_region(paddr, size);
-+
-+	pr_info("Reserving %u bytes SDRAM for VRAM\n", size);
-+}
-+
-+/*
-+ * Called at sram init time, before anything is pushed to the SRAM stack.
-+ * Because of the stack scheme, we will allocate everything from the
-+ * start of the lowest address region to the end of SRAM. This will also
-+ * include padding for page alignment and possible holes between regions.
-+ *
-+ * As opposed to the SDRAM case, we'll also do any dynamic allocations at
-+ * this point, since the driver built as a module would have problem with
-+ * freeing / reallocating the regions.
-+ */
-+unsigned long __init omap_vram_reserve_sram(unsigned long sram_pstart,
-+				  unsigned long sram_vstart,
-+				  unsigned long sram_size,
-+				  unsigned long pstart_avail,
-+				  unsigned long size_avail)
-+{
-+	unsigned long			pend_avail;
-+	unsigned long			reserved;
-+	u32 paddr;
-+	u32 size;
-+
-+	paddr = omap_vram_sram_start;
-+	size = omap_vram_sram_size;
-+
-+	if (!size)
-+		return 0;
-+
-+	reserved = 0;
-+	pend_avail = pstart_avail + size_avail;
-+
-+	if (!paddr) {
-+		/* Dynamic allocation */
-+		if ((size_avail & PAGE_MASK) < size) {
-+			pr_err("Not enough SRAM for VRAM\n");
-+			return 0;
-+		}
-+		size_avail = (size_avail - size) & PAGE_MASK;
-+		paddr = pstart_avail + size_avail;
-+	}
-+
-+	if (paddr < sram_pstart ||
-+			paddr + size > sram_pstart + sram_size) {
-+		pr_err("Illegal SRAM region for VRAM\n");
-+		return 0;
-+	}
-+
-+	/* Reserve everything above the start of the region. */
-+	if (pend_avail - paddr > reserved)
-+		reserved = pend_avail - paddr;
-+	size_avail = pend_avail - reserved - pstart_avail;
-+
-+	omap_vram_add_region(paddr, size);
-+
-+	if (reserved)
-+		pr_info("Reserving %lu bytes SRAM for VRAM\n", reserved);
-+
-+	return reserved;
-+}
-+
-+void __init omap_vram_set_sdram_vram(u32 size, u32 start)
-+{
-+	omap_vram_sdram_start = start;
-+	omap_vram_sdram_size = size;
-+}
-+
-+void __init omap_vram_set_sram_vram(u32 size, u32 start)
-+{
-+	omap_vram_sram_start = start;
-+	omap_vram_sram_size = size;
-+}
---- /dev/null
-+++ b/drivers/video/omap2/vrfb.c
-@@ -0,0 +1,277 @@
-+/*
-+ * VRFB Rotation Engine
-+ *
-+ * Copyright (C) 2009 Nokia Corporation
-+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.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.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along
-+ * with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/ioport.h>
-+#include <linux/io.h>
-+#include <linux/bitops.h>
-+#include <linux/mutex.h>
-+
-+#include <mach/io.h>
-+#include <mach/vrfb.h>
-+#include <mach/sdrc.h>
-+/*#define DEBUG*/
-+
-+#ifdef DEBUG
-+#define DBG(format, ...) pr_debug("VRFB: " format, ## __VA_ARGS__)
-+#else
-+#define DBG(format, ...)
-+#endif
-+
-+#define SMS_ROT_VIRT_BASE(context, rot) \
-+	(((context >= 4) ? 0xD0000000 : 0x70000000) \
-+	 + (0x4000000 * (context)) \
-+	 + (0x1000000 * (rot)))
-+
-+#define OMAP_VRFB_SIZE			(2048 * 2048 * 4)
-+
-+#define VRFB_PAGE_WIDTH_EXP	5 /* Assuming SDRAM pagesize= 1024 */
-+#define VRFB_PAGE_HEIGHT_EXP	5 /* 1024 = 2^5 * 2^5 */
-+#define VRFB_PAGE_WIDTH		(1 << VRFB_PAGE_WIDTH_EXP)
-+#define VRFB_PAGE_HEIGHT	(1 << VRFB_PAGE_HEIGHT_EXP)
-+#define SMS_IMAGEHEIGHT_OFFSET	16
-+#define SMS_IMAGEWIDTH_OFFSET	0
-+#define SMS_PH_OFFSET		8
-+#define SMS_PW_OFFSET		4
-+#define SMS_PS_OFFSET		0
-+
-+#define VRFB_NUM_CTXS 12
-+/* bitmap of reserved contexts */
-+static unsigned long ctx_map;
-+/* bitmap of contexts for which we have to keep the HW context valid */
-+static unsigned long ctx_map_active;
-+
-+static DEFINE_MUTEX(ctx_lock);
-+
-+/*
-+ * Access to this happens from client drivers or the PM core after wake-up.
-+ * For the first case we require locking at the driver level, for the second
-+ * we don't need locking, since no drivers will run until after the wake-up
-+ * has finished.
-+ */
-+static struct {
-+	u32 physical_ba;
-+	u32 control;
-+	u32 size;
-+} vrfb_hw_context[VRFB_NUM_CTXS];
-+
-+static inline void restore_hw_context(int ctx)
-+{
-+	omap2_sms_write_rot_control(vrfb_hw_context[ctx].control, ctx);
-+	omap2_sms_write_rot_size(vrfb_hw_context[ctx].size, ctx);
-+	omap2_sms_write_rot_physical_ba(vrfb_hw_context[ctx].physical_ba, ctx);
-+}
-+
-+void omap_vrfb_restore_context(void)
-+{
-+	int i;
-+	unsigned long map = ctx_map_active;
-+
-+	for (i = ffs(map); i; i = ffs(map)) {
-+		/* i=1..32 */
-+		i--;
-+		map &= ~(1 << i);
-+		restore_hw_context(i);
-+	}
-+}
-+
-+void omap_vrfb_adjust_size(u16 *width, u16 *height,
-+		u8 bytespp)
-+{
-+	*width = ALIGN(*width * bytespp, VRFB_PAGE_WIDTH) / bytespp;
-+	*height = ALIGN(*height, VRFB_PAGE_HEIGHT);
-+}
-+EXPORT_SYMBOL(omap_vrfb_adjust_size);
-+
-+void omap_vrfb_setup(struct vrfb *vrfb, unsigned long paddr,
-+		u16 width, u16 height,
-+		unsigned bytespp, bool yuv_mode)
-+{
-+	unsigned pixel_size_exp;
-+	u16 vrfb_width;
-+	u16 vrfb_height;
-+	u8 ctx = vrfb->context;
-+	u32 size;
-+	u32 control;
-+
-+	DBG("omapfb_set_vrfb(%d, %lx, %dx%d, %d)\n", ctx, paddr,
-+			width, height, color_mode);
-+
-+	/* For YUV2 and UYVY modes VRFB needs to handle pixels a bit
-+	 * differently. See TRM. */
-+	if (yuv_mode) {
-+		bytespp *= 2;
-+		width /= 2;
-+	}
-+
-+	if (bytespp == 4)
-+		pixel_size_exp = 2;
-+	else if (bytespp == 2)
-+		pixel_size_exp = 1;
-+	else
-+		BUG();
-+
-+	vrfb_width = ALIGN(width * bytespp, VRFB_PAGE_WIDTH) / bytespp;
-+	vrfb_height = ALIGN(height, VRFB_PAGE_HEIGHT);
-+
-+	DBG("vrfb w %u, h %u bytespp %d\n", vrfb_width, vrfb_height, bytespp);
-+
-+	size  = vrfb_width << SMS_IMAGEWIDTH_OFFSET;
-+	size |= vrfb_height << SMS_IMAGEHEIGHT_OFFSET;
-+
-+	control  = pixel_size_exp << SMS_PS_OFFSET;
-+	control |= VRFB_PAGE_WIDTH_EXP  << SMS_PW_OFFSET;
-+	control |= VRFB_PAGE_HEIGHT_EXP << SMS_PH_OFFSET;
-+
-+	vrfb_hw_context[ctx].physical_ba = paddr;
-+	vrfb_hw_context[ctx].size = size;
-+	vrfb_hw_context[ctx].control = control;
-+
-+	omap2_sms_write_rot_physical_ba(paddr, ctx);
-+	omap2_sms_write_rot_size(size, ctx);
-+	omap2_sms_write_rot_control(control, ctx);
-+
-+	DBG("vrfb offset pixels %d, %d\n",
-+			vrfb_width - width, vrfb_height - height);
-+
-+	vrfb->xoffset = vrfb_width - width;
-+	vrfb->yoffset = vrfb_height - height;
-+	vrfb->bytespp = bytespp;
-+}
-+EXPORT_SYMBOL(omap_vrfb_setup);
-+
-+void omap_vrfb_release_ctx(struct vrfb *vrfb)
-+{
-+	int rot;
-+	int ctx = vrfb->context;
-+
-+	if (ctx == 0xff)
-+		return;
-+
-+	DBG("release ctx %d\n", ctx);
-+
-+	mutex_lock(&ctx_lock);
-+
-+	BUG_ON(!(ctx_map & (1 << ctx)));
-+
-+	clear_bit(ctx, &ctx_map_active);
-+	clear_bit(ctx, &ctx_map);
-+
-+	for (rot = 0; rot < 4; ++rot) {
-+		if (vrfb->paddr[rot]) {
-+			release_mem_region(vrfb->paddr[rot], OMAP_VRFB_SIZE);
-+			vrfb->paddr[rot] = 0;
-+		}
-+	}
-+
-+	vrfb->context = 0xff;
-+
-+	mutex_unlock(&ctx_lock);
-+}
-+EXPORT_SYMBOL(omap_vrfb_release_ctx);
-+
-+int omap_vrfb_request_ctx(struct vrfb *vrfb)
-+{
-+	int rot;
-+	u32 paddr;
-+	u8 ctx;
-+	int r;
-+
-+	DBG("request ctx\n");
-+
-+	mutex_lock(&ctx_lock);
-+
-+	for (ctx = 0; ctx < VRFB_NUM_CTXS; ++ctx)
-+		if ((ctx_map & (1 << ctx)) == 0)
-+			break;
-+
-+	if (ctx == VRFB_NUM_CTXS) {
-+		pr_err("vrfb: no free contexts\n");
-+		r = -EBUSY;
-+		goto out;
-+	}
-+
-+	DBG("found free ctx %d\n", ctx);
-+
-+	set_bit(ctx, &ctx_map);
-+	WARN_ON(ctx_map_active & (1 << ctx));
-+	set_bit(ctx, &ctx_map_active);
-+
-+	memset(vrfb, 0, sizeof(*vrfb));
-+
-+	vrfb->context = ctx;
-+
-+	for (rot = 0; rot < 4; ++rot) {
-+		paddr = SMS_ROT_VIRT_BASE(ctx, rot);
-+		if (!request_mem_region(paddr, OMAP_VRFB_SIZE, "vrfb")) {
-+			pr_err("vrfb: failed to reserve VRFB "
-+					"area for ctx %d, rotation %d\n",
-+					ctx, rot * 90);
-+			omap_vrfb_release_ctx(vrfb);
-+			r = -ENOMEM;
-+			goto out;
-+		}
-+
-+		vrfb->paddr[rot] = paddr;
-+
-+		DBG("VRFB %d/%d: %lx\n", ctx, rot*90, vrfb->paddr[rot]);
-+	}
-+
-+	r = 0;
-+out:
-+	mutex_unlock(&ctx_lock);
-+	return r;
-+}
-+EXPORT_SYMBOL(omap_vrfb_request_ctx);
-+
-+void omap_vrfb_suspend_ctx(struct vrfb *vrfb)
-+{
-+	DBG("suspend ctx %d\n", vrfb->context);
-+	mutex_lock(&ctx_lock);
-+
-+	BUG_ON(vrfb->context >= VRFB_NUM_CTXS);
-+	BUG_ON(!((1 << vrfb->context) & ctx_map_active));
-+
-+	clear_bit(vrfb->context, &ctx_map_active);
-+	mutex_unlock(&ctx_lock);
-+}
-+EXPORT_SYMBOL(omap_vrfb_suspend_ctx);
-+
-+void omap_vrfb_resume_ctx(struct vrfb *vrfb)
-+{
-+	DBG("resume ctx %d\n", vrfb->context);
-+	mutex_lock(&ctx_lock);
-+
-+	BUG_ON(vrfb->context >= VRFB_NUM_CTXS);
-+	BUG_ON((1 << vrfb->context) & ctx_map_active);
-+
-+	/*
-+	 * omap_vrfb_restore_context is normally called by the core domain
-+	 * save / restore logic, but since this VRFB context was suspended
-+	 * those calls didn't actually restore the context and now we might
-+	 * have an invalid context. Do an explicit restore here.
-+	 */
-+	restore_hw_context(vrfb->context);
-+	set_bit(vrfb->context, &ctx_map_active);
-+	mutex_unlock(&ctx_lock);
-+}
-+EXPORT_SYMBOL(omap_vrfb_resume_ctx);
-+
---- /dev/null
-+++ b/include/linux/omapfb.h
-@@ -0,0 +1,242 @@
-+/*
-+ * File: include/linux/omapfb.h
-+ *
-+ * Framebuffer driver for TI OMAP boards
-+ *
-+ * Copyright (C) 2004 Nokia Corporation
-+ * Author: Imre Deak <imre.deak@nokia.com>
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along
-+ * with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+ */
-+
-+#ifndef __LINUX_OMAPFB_H__
-+#define __LINUX_OMAPFB_H__
-+
-+#include <linux/fb.h>
-+#include <linux/ioctl.h>
-+#include <linux/types.h>
-+
-+/* IOCTL commands. */
-+
-+#define OMAP_IOW(num, dtype)	_IOW('O', num, dtype)
-+#define OMAP_IOR(num, dtype)	_IOR('O', num, dtype)
-+#define OMAP_IOWR(num, dtype)	_IOWR('O', num, dtype)
-+#define OMAP_IO(num)		_IO('O', num)
-+
-+#define OMAPFB_MIRROR		OMAP_IOW(31, int)
-+#define OMAPFB_SYNC_GFX		OMAP_IO(37)
-+#define OMAPFB_VSYNC		OMAP_IO(38)
-+#define OMAPFB_SET_UPDATE_MODE	OMAP_IOW(40, int)
-+#define OMAPFB_GET_CAPS		OMAP_IOR(42, struct omapfb_caps)
-+#define OMAPFB_GET_UPDATE_MODE	OMAP_IOW(43, int)
-+#define OMAPFB_LCD_TEST		OMAP_IOW(45, int)
-+#define OMAPFB_CTRL_TEST	OMAP_IOW(46, int)
-+#define OMAPFB_UPDATE_WINDOW_OLD OMAP_IOW(47, struct omapfb_update_window_old)
-+#define OMAPFB_SET_COLOR_KEY	OMAP_IOW(50, struct omapfb_color_key)
-+#define OMAPFB_GET_COLOR_KEY	OMAP_IOW(51, struct omapfb_color_key)
-+#define OMAPFB_SETUP_PLANE	OMAP_IOW(52, struct omapfb_plane_info)
-+#define OMAPFB_QUERY_PLANE	OMAP_IOW(53, struct omapfb_plane_info)
-+#define OMAPFB_UPDATE_WINDOW	OMAP_IOW(54, struct omapfb_update_window)
-+#define OMAPFB_SETUP_MEM	OMAP_IOW(55, struct omapfb_mem_info)
-+#define OMAPFB_QUERY_MEM	OMAP_IOW(56, struct omapfb_mem_info)
-+#define OMAPFB_WAITFORVSYNC	OMAP_IO(57)
-+#define OMAPFB_MEMORY_READ	OMAP_IOR(58, struct omapfb_memory_read)
-+#define OMAPFB_GET_OVERLAY_COLORMODE OMAP_IOR(59, struct omapfb_ovl_colormode)
-+#define OMAPFB_WAITFORGO	OMAP_IO(60)
-+#define OMAPFB_GET_VRAM_INFO	OMAP_IOR(61, struct omapfb_vram_info)
-+
-+#define OMAPFB_CAPS_GENERIC_MASK	0x00000fff
-+#define OMAPFB_CAPS_LCDC_MASK		0x00fff000
-+#define OMAPFB_CAPS_PANEL_MASK		0xff000000
-+
-+#define OMAPFB_CAPS_MANUAL_UPDATE	0x00001000
-+#define OMAPFB_CAPS_TEARSYNC		0x00002000
-+#define OMAPFB_CAPS_PLANE_RELOCATE_MEM	0x00004000
-+#define OMAPFB_CAPS_PLANE_SCALE		0x00008000
-+#define OMAPFB_CAPS_WINDOW_PIXEL_DOUBLE	0x00010000
-+#define OMAPFB_CAPS_WINDOW_SCALE	0x00020000
-+#define OMAPFB_CAPS_WINDOW_OVERLAY	0x00040000
-+#define OMAPFB_CAPS_WINDOW_ROTATE	0x00080000
-+#define OMAPFB_CAPS_SET_BACKLIGHT	0x01000000
-+
-+/* Values from DSP must map to lower 16-bits */
-+#define OMAPFB_FORMAT_MASK		0x00ff
-+#define OMAPFB_FORMAT_FLAG_DOUBLE	0x0100
-+#define OMAPFB_FORMAT_FLAG_TEARSYNC	0x0200
-+#define OMAPFB_FORMAT_FLAG_FORCE_VSYNC	0x0400
-+#define OMAPFB_FORMAT_FLAG_ENABLE_OVERLAY	0x0800
-+#define OMAPFB_FORMAT_FLAG_DISABLE_OVERLAY	0x1000
-+
-+#define OMAPFB_MEMTYPE_SDRAM		0
-+#define OMAPFB_MEMTYPE_SRAM		1
-+#define OMAPFB_MEMTYPE_MAX		1
-+
-+enum omapfb_color_format {
-+	OMAPFB_COLOR_RGB565 = 0,
-+	OMAPFB_COLOR_YUV422,
-+	OMAPFB_COLOR_YUV420,
-+	OMAPFB_COLOR_CLUT_8BPP,
-+	OMAPFB_COLOR_CLUT_4BPP,
-+	OMAPFB_COLOR_CLUT_2BPP,
-+	OMAPFB_COLOR_CLUT_1BPP,
-+	OMAPFB_COLOR_RGB444,
-+	OMAPFB_COLOR_YUY422,
-+
-+	OMAPFB_COLOR_ARGB16,
-+	OMAPFB_COLOR_RGB24U,	/* RGB24, 32-bit container */
-+	OMAPFB_COLOR_RGB24P,	/* RGB24, 24-bit container */
-+	OMAPFB_COLOR_ARGB32,
-+	OMAPFB_COLOR_RGBA32,
-+	OMAPFB_COLOR_RGBX32,
-+};
-+
-+struct omapfb_update_window {
-+	__u32 x, y;
-+	__u32 width, height;
-+	__u32 format;
-+	__u32 out_x, out_y;
-+	__u32 out_width, out_height;
-+	__u32 reserved[8];
-+};
-+
-+struct omapfb_update_window_old {
-+	__u32 x, y;
-+	__u32 width, height;
-+	__u32 format;
-+};
-+
-+enum omapfb_plane {
-+	OMAPFB_PLANE_GFX = 0,
-+	OMAPFB_PLANE_VID1,
-+	OMAPFB_PLANE_VID2,
-+};
-+
-+enum omapfb_channel_out {
-+	OMAPFB_CHANNEL_OUT_LCD = 0,
-+	OMAPFB_CHANNEL_OUT_DIGIT,
-+};
-+
-+struct omapfb_plane_info {
-+	__u32 pos_x;
-+	__u32 pos_y;
-+	__u8  enabled;
-+	__u8  channel_out;
-+	__u8  mirror;
-+	__u8  reserved1;
-+	__u32 out_width;
-+	__u32 out_height;
-+	__u32 reserved2[12];
-+};
-+
-+struct omapfb_mem_info {
-+	__u32 size;
-+	__u8  type;
-+	__u8  reserved[3];
-+};
-+
-+struct omapfb_caps {
-+	__u32 ctrl;
-+	__u32 plane_color;
-+	__u32 wnd_color;
-+};
-+
-+enum omapfb_color_key_type {
-+	OMAPFB_COLOR_KEY_DISABLED = 0,
-+	OMAPFB_COLOR_KEY_GFX_DST,
-+	OMAPFB_COLOR_KEY_VID_SRC,
-+};
-+
-+struct omapfb_color_key {
-+	__u8  channel_out;
-+	__u32 background;
-+	__u32 trans_key;
-+	__u8  key_type;
-+};
-+
-+enum omapfb_update_mode {
-+	OMAPFB_UPDATE_DISABLED = 0,
-+	OMAPFB_AUTO_UPDATE,
-+	OMAPFB_MANUAL_UPDATE
-+};
-+
-+struct omapfb_memory_read {
-+	__u16 x;
-+	__u16 y;
-+	__u16 w;
-+	__u16 h;
-+	size_t buffer_size;
-+	void __user *buffer;
-+};
-+
-+struct omapfb_ovl_colormode {
-+	__u8 overlay_idx;
-+	__u8 mode_idx;
-+	__u32 bits_per_pixel;
-+	__u32 nonstd;
-+	struct fb_bitfield red;
-+	struct fb_bitfield green;
-+	struct fb_bitfield blue;
-+	struct fb_bitfield transp;
-+};
-+
-+struct omapfb_vram_info {
-+	__u32 total;
-+	__u32 free;
-+	__u32 largest_free_block;
-+	__u32 reserved[5];
-+};
-+
-+#ifdef __KERNEL__
-+
-+#include <mach/board.h>
-+
-+#ifdef CONFIG_ARCH_OMAP1
-+#define OMAPFB_PLANE_NUM		1
-+#else
-+#define OMAPFB_PLANE_NUM		3
-+#endif
-+
-+struct omapfb_mem_region {
-+	u32		paddr;
-+	void __iomem	*vaddr;
-+	unsigned long	size;
-+	u8		type;		/* OMAPFB_PLANE_MEM_* */
-+	enum omapfb_color_format format;/* OMAPFB_COLOR_* */
-+	unsigned	format_used:1;	/* Must be set when format is set.
-+					 * Needed b/c of the badly chosen 0
-+					 * base for OMAPFB_COLOR_* values
-+					 */
-+	unsigned	alloc:1;	/* allocated by the driver */
-+	unsigned	map:1;		/* kernel mapped by the driver */
-+};
-+
-+struct omapfb_mem_desc {
-+	int				region_cnt;
-+	struct omapfb_mem_region	region[OMAPFB_PLANE_NUM];
-+};
-+
-+struct omapfb_platform_data {
-+	struct omap_lcd_config		lcd;
-+	struct omapfb_mem_desc		mem_desc;
-+	void				*ctrl_platform_data;
-+};
-+
-+/* in arch/arm/plat-omap/fb.c */
-+extern void omapfb_set_ctrl_platform_data(void *pdata);
-+extern void omapfb_reserve_sdram(void);
-+
-+#endif
-+
-+#endif /* __OMAPFB_H */
diff --git a/target/linux/omap35xx/patches-2.6.32/002-OMAP.patch b/target/linux/omap35xx/patches-2.6.32/002-OMAP.patch
deleted file mode 100644
index e2c9056d7..000000000
--- a/target/linux/omap35xx/patches-2.6.32/002-OMAP.patch
+++ /dev/null
@@ -1,9583 +0,0 @@
---- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -1511,6 +1511,10 @@ source "net/Kconfig"
- 
- source "drivers/Kconfig"
- 
-+if ARCH_OMAP
-+source "drivers/cbus/Kconfig"
-+endif
-+
- source "fs/Kconfig"
- 
- source "arch/arm/Kconfig.debug"
---- a/arch/arm/mach-omap1/board-fsample.c
-+++ b/arch/arm/mach-omap1/board-fsample.c
-@@ -107,7 +107,7 @@ static struct resource smc91x_resources[
- 		.flags	= IORESOURCE_MEM,
- 	},
- 	[1] = {
--		.start	= INT_730_MPU_EXT_NIRQ,
-+		.start	= INT_7XX_MPU_EXT_NIRQ,
- 		.end	= 0,
- 		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
- 	},
-@@ -196,8 +196,8 @@ static struct platform_device smc91x_dev
- 
- static struct resource kp_resources[] = {
- 	[0] = {
--		.start	= INT_730_MPUIO_KEYPAD,
--		.end	= INT_730_MPUIO_KEYPAD,
-+		.start	= INT_7XX_MPUIO_KEYPAD,
-+		.end	= INT_7XX_MPUIO_KEYPAD,
- 		.flags	= IORESOURCE_IRQ,
- 	},
- };
-@@ -309,7 +309,7 @@ static void __init omap_fsample_map_io(v
- 	/*
- 	 * Hold GSM Reset until needed
- 	 */
--	omap_writew(omap_readw(OMAP730_DSP_M_CTL) & ~1, OMAP730_DSP_M_CTL);
-+	omap_writew(omap_readw(OMAP7XX_DSP_M_CTL) & ~1, OMAP7XX_DSP_M_CTL);
- 
- 	/*
- 	 * UARTs -> done automagically by 8250 driver
-@@ -320,21 +320,21 @@ static void __init omap_fsample_map_io(v
- 	 */
- 
- 	/* Flash: CS0 timings setup */
--	omap_writel(0x0000fff3, OMAP730_FLASH_CFG_0);
--	omap_writel(0x00000088, OMAP730_FLASH_ACFG_0);
-+	omap_writel(0x0000fff3, OMAP7XX_FLASH_CFG_0);
-+	omap_writel(0x00000088, OMAP7XX_FLASH_ACFG_0);
- 
- 	/*
- 	 * Ethernet support through the debug board
- 	 * CS1 timings setup
- 	 */
--	omap_writel(0x0000fff3, OMAP730_FLASH_CFG_1);
--	omap_writel(0x00000000, OMAP730_FLASH_ACFG_1);
-+	omap_writel(0x0000fff3, OMAP7XX_FLASH_CFG_1);
-+	omap_writel(0x00000000, OMAP7XX_FLASH_ACFG_1);
- 
- 	/*
- 	 * Configure MPU_EXT_NIRQ IO in IO_CONF9 register,
- 	 * It is used as the Ethernet controller interrupt
- 	 */
--	omap_writel(omap_readl(OMAP730_IO_CONF_9) & 0x1FFFFFFF, OMAP730_IO_CONF_9);
-+	omap_writel(omap_readl(OMAP7XX_IO_CONF_9) & 0x1FFFFFFF, OMAP7XX_IO_CONF_9);
- }
- 
- MACHINE_START(OMAP_FSAMPLE, "OMAP730 F-Sample")
---- a/arch/arm/mach-omap1/board-perseus2.c
-+++ b/arch/arm/mach-omap1/board-perseus2.c
-@@ -74,7 +74,7 @@ static struct resource smc91x_resources[
- 		.flags	= IORESOURCE_MEM,
- 	},
- 	[1] = {
--		.start	= INT_730_MPU_EXT_NIRQ,
-+		.start	= INT_7XX_MPU_EXT_NIRQ,
- 		.end	= 0,
- 		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
- 	},
-@@ -163,8 +163,8 @@ static struct platform_device smc91x_dev
- 
- static struct resource kp_resources[] = {
- 	[0] = {
--		.start	= INT_730_MPUIO_KEYPAD,
--		.end	= INT_730_MPUIO_KEYPAD,
-+		.start	= INT_7XX_MPUIO_KEYPAD,
-+		.end	= INT_7XX_MPUIO_KEYPAD,
- 		.flags	= IORESOURCE_IRQ,
- 	},
- };
-@@ -270,7 +270,7 @@ static void __init omap_perseus2_map_io(
- 	/*
- 	 * Hold GSM Reset until needed
- 	 */
--	omap_writew(omap_readw(OMAP730_DSP_M_CTL) & ~1, OMAP730_DSP_M_CTL);
-+	omap_writew(omap_readw(OMAP7XX_DSP_M_CTL) & ~1, OMAP7XX_DSP_M_CTL);
- 
- 	/*
- 	 * UARTs -> done automagically by 8250 driver
-@@ -281,21 +281,21 @@ static void __init omap_perseus2_map_io(
- 	 */
- 
- 	/* Flash: CS0 timings setup */
--	omap_writel(0x0000fff3, OMAP730_FLASH_CFG_0);
--	omap_writel(0x00000088, OMAP730_FLASH_ACFG_0);
-+	omap_writel(0x0000fff3, OMAP7XX_FLASH_CFG_0);
-+	omap_writel(0x00000088, OMAP7XX_FLASH_ACFG_0);
- 
- 	/*
- 	 * Ethernet support through the debug board
- 	 * CS1 timings setup
- 	 */
--	omap_writel(0x0000fff3, OMAP730_FLASH_CFG_1);
--	omap_writel(0x00000000, OMAP730_FLASH_ACFG_1);
-+	omap_writel(0x0000fff3, OMAP7XX_FLASH_CFG_1);
-+	omap_writel(0x00000000, OMAP7XX_FLASH_ACFG_1);
- 
- 	/*
- 	 * Configure MPU_EXT_NIRQ IO in IO_CONF9 register,
- 	 * It is used as the Ethernet controller interrupt
- 	 */
--	omap_writel(omap_readl(OMAP730_IO_CONF_9) & 0x1FFFFFFF, OMAP730_IO_CONF_9);
-+	omap_writel(omap_readl(OMAP7XX_IO_CONF_9) & 0x1FFFFFFF, OMAP7XX_IO_CONF_9);
- }
- 
- MACHINE_START(OMAP_PERSEUS2, "OMAP730 Perseus2")
---- a/arch/arm/mach-omap1/clock.c
-+++ b/arch/arm/mach-omap1/clock.c
-@@ -69,13 +69,13 @@ struct omap_clk {
- 	}
- 
- #define CK_310	(1 << 0)
--#define CK_730	(1 << 1)
-+#define CK_7XX	(1 << 1)
- #define CK_1510	(1 << 2)
- #define CK_16XX	(1 << 3)
- 
- static struct omap_clk omap_clks[] = {
- 	/* non-ULPD clocks */
--	CLK(NULL,	"ck_ref",	&ck_ref,	CK_16XX | CK_1510 | CK_310),
-+	CLK(NULL,	"ck_ref",	&ck_ref,	CK_16XX | CK_1510 | CK_310 | CK_7XX),
- 	CLK(NULL,	"ck_dpll1",	&ck_dpll1,	CK_16XX | CK_1510 | CK_310),
- 	/* CK_GEN1 clocks */
- 	CLK(NULL,	"ck_dpll1out",	&ck_dpll1out.clk, CK_16XX),
-@@ -83,7 +83,7 @@ static struct omap_clk omap_clks[] = {
- 	CLK(NULL,	"arm_ck",	&arm_ck,	CK_16XX | CK_1510 | CK_310),
- 	CLK(NULL,	"armper_ck",	&armper_ck.clk,	CK_16XX | CK_1510 | CK_310),
- 	CLK(NULL,	"arm_gpio_ck",	&arm_gpio_ck,	CK_1510 | CK_310),
--	CLK(NULL,	"armxor_ck",	&armxor_ck.clk,	CK_16XX | CK_1510 | CK_310),
-+	CLK(NULL,	"armxor_ck",	&armxor_ck.clk,	CK_16XX | CK_1510 | CK_310 | CK_7XX),
- 	CLK(NULL,	"armtim_ck",	&armtim_ck.clk,	CK_16XX | CK_1510 | CK_310),
- 	CLK("omap_wdt",	"fck",		&armwdt_ck.clk,	CK_16XX | CK_1510 | CK_310),
- 	CLK("omap_wdt",	"ick",		&armper_ck.clk,	CK_16XX),
-@@ -97,7 +97,7 @@ static struct omap_clk omap_clks[] = {
- 	CLK(NULL,	"dspxor_ck",	&dspxor_ck,	CK_16XX | CK_1510 | CK_310),
- 	CLK(NULL,	"dsptim_ck",	&dsptim_ck,	CK_16XX | CK_1510 | CK_310),
- 	/* CK_GEN3 clocks */
--	CLK(NULL,	"tc_ck",	&tc_ck.clk,	CK_16XX | CK_1510 | CK_310 | CK_730),
-+	CLK(NULL,	"tc_ck",	&tc_ck.clk,	CK_16XX | CK_1510 | CK_310 | CK_7XX),
- 	CLK(NULL,	"tipb_ck",	&tipb_ck,	CK_1510 | CK_310),
- 	CLK(NULL,	"l3_ocpi_ck",	&l3_ocpi_ck,	CK_16XX),
- 	CLK(NULL,	"tc1_ck",	&tc1_ck,	CK_16XX),
-@@ -108,7 +108,7 @@ static struct omap_clk omap_clks[] = {
- 	CLK(NULL,	"lb_ck",	&lb_ck.clk,	CK_1510 | CK_310),
- 	CLK(NULL,	"rhea1_ck",	&rhea1_ck,	CK_16XX),
- 	CLK(NULL,	"rhea2_ck",	&rhea2_ck,	CK_16XX),
--	CLK(NULL,	"lcd_ck",	&lcd_ck_16xx,	CK_16XX | CK_730),
-+	CLK(NULL,	"lcd_ck",	&lcd_ck_16xx,	CK_16XX | CK_7XX),
- 	CLK(NULL,	"lcd_ck",	&lcd_ck_1510.clk, CK_1510 | CK_310),
- 	/* ULPD clocks */
- 	CLK(NULL,	"uart1_ck",	&uart1_1510,	CK_1510 | CK_310),
-@@ -398,7 +398,7 @@ static int omap1_select_table_rate(struc
- 	 * Reprogramming the DPLL is tricky, it must be done from SRAM.
- 	 * (on 730, bit 13 must always be 1)
- 	 */
--	if (cpu_is_omap730())
-+	if (cpu_is_omap7xx())
- 		omap_sram_reprogram_clock(ptr->dpllctl_val, ptr->ckctl_val | 0x2000);
- 	else
- 		omap_sram_reprogram_clock(ptr->dpllctl_val, ptr->ckctl_val);
-@@ -783,8 +783,8 @@ int __init omap1_clk_init(void)
- 		cpu_mask |= CK_16XX;
- 	if (cpu_is_omap1510())
- 		cpu_mask |= CK_1510;
--	if (cpu_is_omap730())
--		cpu_mask |= CK_730;
-+	if (cpu_is_omap7xx())
-+		cpu_mask |= CK_7XX;
- 	if (cpu_is_omap310())
- 		cpu_mask |= CK_310;
- 
-@@ -800,7 +800,7 @@ int __init omap1_clk_init(void)
- 			crystal_type = info->system_clock_type;
- 	}
- 
--#if defined(CONFIG_ARCH_OMAP730)
-+#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
- 	ck_ref.rate = 13000000;
- #elif defined(CONFIG_ARCH_OMAP16XX)
- 	if (crystal_type == 2)
-@@ -847,7 +847,7 @@ int __init omap1_clk_init(void)
- 		printk(KERN_ERR "System frequencies not set. Check your config.\n");
- 		/* Guess sane values (60MHz) */
- 		omap_writew(0x2290, DPLL_CTL);
--		omap_writew(cpu_is_omap730() ? 0x3005 : 0x1005, ARM_CKCTL);
-+		omap_writew(cpu_is_omap7xx() ? 0x3005 : 0x1005, ARM_CKCTL);
- 		ck_dpll1.rate = 60000000;
- 	}
- #endif
-@@ -862,7 +862,7 @@ int __init omap1_clk_init(void)
- 
- #if defined(CONFIG_MACH_OMAP_PERSEUS2) || defined(CONFIG_MACH_OMAP_FSAMPLE)
- 	/* Select slicer output as OMAP input clock */
--	omap_writew(omap_readw(OMAP730_PCC_UPLD_CTRL) & ~0x1, OMAP730_PCC_UPLD_CTRL);
-+	omap_writew(omap_readw(OMAP7XX_PCC_UPLD_CTRL) & ~0x1, OMAP7XX_PCC_UPLD_CTRL);
- #endif
- 
- 	/* Amstrad Delta wants BCLK high when inactive */
-@@ -873,7 +873,7 @@ int __init omap1_clk_init(void)
- 
- 	/* Turn off DSP and ARM_TIMXO. Make sure ARM_INTHCK is not divided */
- 	/* (on 730, bit 13 must not be cleared) */
--	if (cpu_is_omap730())
-+	if (cpu_is_omap7xx())
- 		omap_writew(omap_readw(ARM_CKCTL) & 0x2fff, ARM_CKCTL);
- 	else
- 		omap_writew(omap_readw(ARM_CKCTL) & 0x0fff, ARM_CKCTL);
---- a/arch/arm/mach-omap1/io.c
-+++ b/arch/arm/mach-omap1/io.c
-@@ -36,33 +36,17 @@ static struct map_desc omap_io_desc[] __
- 	}
- };
- 
--#ifdef CONFIG_ARCH_OMAP730
--static struct map_desc omap730_io_desc[] __initdata = {
-+#if defined (CONFIG_ARCH_OMAP730) || defined (CONFIG_ARCH_OMAP850)
-+static struct map_desc omap7xx_io_desc[] __initdata = {
- 	{
--		.virtual	= OMAP730_DSP_BASE,
--		.pfn		= __phys_to_pfn(OMAP730_DSP_START),
--		.length		= OMAP730_DSP_SIZE,
-+		.virtual	= OMAP7XX_DSP_BASE,
-+		.pfn		= __phys_to_pfn(OMAP7XX_DSP_START),
-+		.length		= OMAP7XX_DSP_SIZE,
- 		.type		= MT_DEVICE
- 	}, {
--		.virtual	= OMAP730_DSPREG_BASE,
--		.pfn		= __phys_to_pfn(OMAP730_DSPREG_START),
--		.length		= OMAP730_DSPREG_SIZE,
--		.type		= MT_DEVICE
--	}
--};
--#endif
--
--#ifdef CONFIG_ARCH_OMAP850
--static struct map_desc omap850_io_desc[] __initdata = {
--	{
--		.virtual	= OMAP850_DSP_BASE,
--		.pfn		= __phys_to_pfn(OMAP850_DSP_START),
--		.length		= OMAP850_DSP_SIZE,
--		.type		= MT_DEVICE
--	}, {
--		.virtual	= OMAP850_DSPREG_BASE,
--		.pfn		= __phys_to_pfn(OMAP850_DSPREG_START),
--		.length		= OMAP850_DSPREG_SIZE,
-+		.virtual	= OMAP7XX_DSPREG_BASE,
-+		.pfn		= __phys_to_pfn(OMAP7XX_DSPREG_START),
-+		.length		= OMAP7XX_DSPREG_SIZE,
- 		.type		= MT_DEVICE
- 	}
- };
-@@ -120,18 +104,11 @@ void __init omap1_map_common_io(void)
- 	 */
- 	omap_check_revision();
- 
--#ifdef CONFIG_ARCH_OMAP730
--	if (cpu_is_omap730()) {
--		iotable_init(omap730_io_desc, ARRAY_SIZE(omap730_io_desc));
--	}
--#endif
--
--#ifdef CONFIG_ARCH_OMAP850
--	if (cpu_is_omap850()) {
--		iotable_init(omap850_io_desc, ARRAY_SIZE(omap850_io_desc));
-+#if defined (CONFIG_ARCH_OMAP730) || defined (CONFIG_ARCH_OMAP850)
-+	if (cpu_is_omap7xx()) {
-+		iotable_init(omap7xx_io_desc, ARRAY_SIZE(omap7xx_io_desc));
- 	}
- #endif
--
- #ifdef CONFIG_ARCH_OMAP15XX
- 	if (cpu_is_omap15xx()) {
- 		iotable_init(omap1510_io_desc, ARRAY_SIZE(omap1510_io_desc));
---- a/arch/arm/mach-omap1/irq.c
-+++ b/arch/arm/mach-omap1/irq.c
-@@ -137,16 +137,8 @@ static void omap_irq_set_cfg(int irq, in
- 	irq_bank_writel(val, bank, offset);
- }
- 
--#ifdef CONFIG_ARCH_OMAP730
--static struct omap_irq_bank omap730_irq_banks[] = {
--	{ .base_reg = OMAP_IH1_BASE,		.trigger_map = 0xb3f8e22f },
--	{ .base_reg = OMAP_IH2_BASE,		.trigger_map = 0xfdb9c1f2 },
--	{ .base_reg = OMAP_IH2_BASE + 0x100,	.trigger_map = 0x800040f3 },
--};
--#endif
--
--#ifdef CONFIG_ARCH_OMAP850
--static struct omap_irq_bank omap850_irq_banks[] = {
-+#if defined (CONFIG_ARCH_OMAP730) || defined (CONFIG_ARCH_OMAP850)
-+static struct omap_irq_bank omap7xx_irq_banks[] = {
- 	{ .base_reg = OMAP_IH1_BASE,		.trigger_map = 0xb3f8e22f },
- 	{ .base_reg = OMAP_IH2_BASE,		.trigger_map = 0xfdb9c1f2 },
- 	{ .base_reg = OMAP_IH2_BASE + 0x100,	.trigger_map = 0x800040f3 },
-@@ -186,16 +178,10 @@ void __init omap_init_irq(void)
- {
- 	int i, j;
- 
--#ifdef CONFIG_ARCH_OMAP730
--	if (cpu_is_omap730()) {
--		irq_banks = omap730_irq_banks;
--		irq_bank_count = ARRAY_SIZE(omap730_irq_banks);
--	}
--#endif
--#ifdef CONFIG_ARCH_OMAP850
--	if (cpu_is_omap850()) {
--		irq_banks = omap850_irq_banks;
--		irq_bank_count = ARRAY_SIZE(omap850_irq_banks);
-+#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
-+	if (cpu_is_omap7xx()) {
-+		irq_banks = omap7xx_irq_banks;
-+		irq_bank_count = ARRAY_SIZE(omap7xx_irq_banks);
- 	}
- #endif
- #ifdef CONFIG_ARCH_OMAP15XX
-@@ -247,10 +233,8 @@ void __init omap_init_irq(void)
- 
- 	/* Unmask level 2 handler */
- 
--	if (cpu_is_omap730())
--		omap_unmask_irq(INT_730_IH2_IRQ);
--	else if (cpu_is_omap850())
--		omap_unmask_irq(INT_850_IH2_IRQ);
-+	if (cpu_is_omap7xx())
-+		omap_unmask_irq(INT_7XX_IH2_IRQ);
- 	else if (cpu_is_omap15xx())
- 		omap_unmask_irq(INT_1510_IH2_IRQ);
- 	else if (cpu_is_omap16xx())
---- a/arch/arm/mach-omap1/mcbsp.c
-+++ b/arch/arm/mach-omap1/mcbsp.c
-@@ -79,29 +79,29 @@ static struct omap_mcbsp_ops omap1_mcbsp
- 	.free		= omap1_mcbsp_free,
- };
- 
--#ifdef CONFIG_ARCH_OMAP730
--static struct omap_mcbsp_platform_data omap730_mcbsp_pdata[] = {
-+#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
-+static struct omap_mcbsp_platform_data omap7xx_mcbsp_pdata[] = {
- 	{
--		.phys_base	= OMAP730_MCBSP1_BASE,
-+		.phys_base	= OMAP7XX_MCBSP1_BASE,
- 		.dma_rx_sync	= OMAP_DMA_MCBSP1_RX,
- 		.dma_tx_sync	= OMAP_DMA_MCBSP1_TX,
--		.rx_irq		= INT_730_McBSP1RX,
--		.tx_irq		= INT_730_McBSP1TX,
-+		.rx_irq		= INT_7XX_McBSP1RX,
-+		.tx_irq		= INT_7XX_McBSP1TX,
- 		.ops		= &omap1_mcbsp_ops,
- 	},
- 	{
--		.phys_base	= OMAP730_MCBSP2_BASE,
-+		.phys_base	= OMAP7XX_MCBSP2_BASE,
- 		.dma_rx_sync	= OMAP_DMA_MCBSP3_RX,
- 		.dma_tx_sync	= OMAP_DMA_MCBSP3_TX,
--		.rx_irq		= INT_730_McBSP2RX,
--		.tx_irq		= INT_730_McBSP2TX,
-+		.rx_irq		= INT_7XX_McBSP2RX,
-+		.tx_irq		= INT_7XX_McBSP2TX,
- 		.ops		= &omap1_mcbsp_ops,
- 	},
- };
--#define OMAP730_MCBSP_PDATA_SZ		ARRAY_SIZE(omap730_mcbsp_pdata)
-+#define OMAP7XX_MCBSP_PDATA_SZ		ARRAY_SIZE(omap7xx_mcbsp_pdata)
- #else
--#define omap730_mcbsp_pdata		NULL
--#define OMAP730_MCBSP_PDATA_SZ		0
-+#define omap7xx_mcbsp_pdata		NULL
-+#define OMAP7XX_MCBSP_PDATA_SZ		0
- #endif
- 
- #ifdef CONFIG_ARCH_OMAP15XX
-@@ -172,8 +172,8 @@ static struct omap_mcbsp_platform_data o
- 
- int __init omap1_mcbsp_init(void)
- {
--	if (cpu_is_omap730())
--		omap_mcbsp_count = OMAP730_MCBSP_PDATA_SZ;
-+	if (cpu_is_omap7xx())
-+		omap_mcbsp_count = OMAP7XX_MCBSP_PDATA_SZ;
- 	if (cpu_is_omap15xx())
- 		omap_mcbsp_count = OMAP15XX_MCBSP_PDATA_SZ;
- 	if (cpu_is_omap16xx())
-@@ -184,9 +184,9 @@ int __init omap1_mcbsp_init(void)
- 	if (!mcbsp_ptr)
- 		return -ENOMEM;
- 
--	if (cpu_is_omap730())
--		omap_mcbsp_register_board_cfg(omap730_mcbsp_pdata,
--						OMAP730_MCBSP_PDATA_SZ);
-+	if (cpu_is_omap7xx())
-+		omap_mcbsp_register_board_cfg(omap7xx_mcbsp_pdata,
-+						OMAP7XX_MCBSP_PDATA_SZ);
- 
- 	if (cpu_is_omap15xx())
- 		omap_mcbsp_register_board_cfg(omap15xx_mcbsp_pdata,
---- a/arch/arm/mach-omap1/mux.c
-+++ b/arch/arm/mach-omap1/mux.c
-@@ -35,47 +35,28 @@
- 
- static struct omap_mux_cfg arch_mux_cfg;
- 
--#ifdef CONFIG_ARCH_OMAP730
--static struct pin_config __initdata_or_module omap730_pins[] = {
--MUX_CFG_730("E2_730_KBR0",        12,   21,    0,   20,   1, 0)
--MUX_CFG_730("J7_730_KBR1",        12,   25,    0,   24,   1, 0)
--MUX_CFG_730("E1_730_KBR2",        12,   29,    0,   28,   1, 0)
--MUX_CFG_730("F3_730_KBR3",        13,    1,    0,    0,   1, 0)
--MUX_CFG_730("D2_730_KBR4",        13,    5,    0,    4,   1, 0)
--MUX_CFG_730("C2_730_KBC0",        13,    9,    0,    8,   1, 0)
--MUX_CFG_730("D3_730_KBC1",        13,   13,    0,   12,   1, 0)
--MUX_CFG_730("E4_730_KBC2",        13,   17,    0,   16,   1, 0)
--MUX_CFG_730("F4_730_KBC3",        13,   21,    0,   20,   1, 0)
--MUX_CFG_730("E3_730_KBC4",        13,   25,    0,   24,   1, 0)
--
--MUX_CFG_730("AA17_730_USB_DM",     2,   21,    0,   20,   0, 0)
--MUX_CFG_730("W16_730_USB_PU_EN",   2,   25,    0,   24,   0, 0)
--MUX_CFG_730("W17_730_USB_VBUSI",   2,   29,    0,   28,   0, 0)
-+#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
-+static struct pin_config __initdata_or_module omap7xx_pins[] = {
-+MUX_CFG_7XX("E2_7XX_KBR0",        12,   21,    0,   20,   1, 0)
-+MUX_CFG_7XX("J7_7XX_KBR1",        12,   25,    0,   24,   1, 0)
-+MUX_CFG_7XX("E1_7XX_KBR2",        12,   29,    0,   28,   1, 0)
-+MUX_CFG_7XX("F3_7XX_KBR3",        13,    1,    0,    0,   1, 0)
-+MUX_CFG_7XX("D2_7XX_KBR4",        13,    5,    0,    4,   1, 0)
-+MUX_CFG_7XX("C2_7XX_KBC0",        13,    9,    0,    8,   1, 0)
-+MUX_CFG_7XX("D3_7XX_KBC1",        13,   13,    0,   12,   1, 0)
-+MUX_CFG_7XX("E4_7XX_KBC2",        13,   17,    0,   16,   1, 0)
-+MUX_CFG_7XX("F4_7XX_KBC3",        13,   21,    0,   20,   1, 0)
-+MUX_CFG_7XX("E3_7XX_KBC4",        13,   25,    0,   24,   1, 0)
-+
-+MUX_CFG_7XX("AA17_7XX_USB_DM",     2,   21,    0,   20,   0, 0)
-+MUX_CFG_7XX("W16_7XX_USB_PU_EN",   2,   25,    0,   24,   0, 0)
-+MUX_CFG_7XX("W17_7XX_USB_VBUSI",   2,   29,    0,   28,   0, 0)
- };
--#define OMAP730_PINS_SZ		ARRAY_SIZE(omap730_pins)
-+#define OMAP7XX_PINS_SZ		ARRAY_SIZE(omap7xx_pins)
- #else
--#define omap730_pins		NULL
--#define OMAP730_PINS_SZ		0
--#endif	/* CONFIG_ARCH_OMAP730 */
--
--#ifdef CONFIG_ARCH_OMAP850
--struct pin_config __initdata_or_module omap850_pins[] = {
--MUX_CFG_850("E2_850_KBR0",        12,   21,    0,   20,   1, 0)
--MUX_CFG_850("J7_850_KBR1",        12,   25,    0,   24,   1, 0)
--MUX_CFG_850("E1_850_KBR2",        12,   29,    0,   28,   1, 0)
--MUX_CFG_850("F3_850_KBR3",        13,    1,    0,    0,   1, 0)
--MUX_CFG_850("D2_850_KBR4",        13,    5,    0,    4,   1, 0)
--MUX_CFG_850("C2_850_KBC0",        13,    9,    0,    8,   1, 0)
--MUX_CFG_850("D3_850_KBC1",        13,   13,    0,   12,   1, 0)
--MUX_CFG_850("E4_850_KBC2",        13,   17,    0,   16,   1, 0)
--MUX_CFG_850("F4_850_KBC3",        13,   21,    0,   20,   1, 0)
--MUX_CFG_850("E3_850_KBC4",        13,   25,    0,   24,   1, 0)
--
--MUX_CFG_850("AA17_850_USB_DM",     2,   21,    0,   20,   0, 0)
--MUX_CFG_850("W16_850_USB_PU_EN",   2,   25,    0,   24,   0, 0)
--MUX_CFG_850("W17_850_USB_VBUSI",   2,   29,    0,   28,   0, 0)
--};
--#endif
-+#define omap7xx_pins		NULL
-+#define OMAP7XX_PINS_SZ		0
-+#endif	/* CONFIG_ARCH_OMAP730 || CONFIG_ARCH_OMAP850 */
- 
- #if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX)
- static struct pin_config __initdata_or_module omap1xxx_pins[] = {
-@@ -438,11 +419,6 @@ int __init_or_module omap1_cfg_reg(const
- 			printk("      %s (0x%08x) = 0x%08x -> 0x%08x\n",
- 			       cfg->pull_name, cfg->pull_reg, pull_orig, pull);
- 	}
--
--#ifdef CONFIG_ARCH_OMAP850
--	omap_mux_register(omap850_pins, ARRAY_SIZE(omap850_pins));
--#endif
--
- #endif
- 
- #ifdef CONFIG_OMAP_MUX_ERRORS
-@@ -454,9 +430,9 @@ int __init_or_module omap1_cfg_reg(const
- 
- int __init omap1_mux_init(void)
- {
--	if (cpu_is_omap730()) {
--		arch_mux_cfg.pins	= omap730_pins;
--		arch_mux_cfg.size	= OMAP730_PINS_SZ;
-+	if (cpu_is_omap7xx()) {
-+		arch_mux_cfg.pins	= omap7xx_pins;
-+		arch_mux_cfg.size	= OMAP7XX_PINS_SZ;
- 		arch_mux_cfg.cfg_reg	= omap1_cfg_reg;
- 	}
- 
---- a/arch/arm/mach-omap1/pm.c
-+++ b/arch/arm/mach-omap1/pm.c
-@@ -62,7 +62,7 @@
- static unsigned int arm_sleep_save[ARM_SLEEP_SAVE_SIZE];
- static unsigned short dsp_sleep_save[DSP_SLEEP_SAVE_SIZE];
- static unsigned short ulpd_sleep_save[ULPD_SLEEP_SAVE_SIZE];
--static unsigned int mpui730_sleep_save[MPUI730_SLEEP_SAVE_SIZE];
-+static unsigned int mpui7xx_sleep_save[MPUI7XX_SLEEP_SAVE_SIZE];
- static unsigned int mpui1510_sleep_save[MPUI1510_SLEEP_SAVE_SIZE];
- static unsigned int mpui1610_sleep_save[MPUI1610_SLEEP_SAVE_SIZE];
- 
-@@ -183,9 +183,9 @@ static void omap_pm_wakeup_setup(void)
- 	 * drivers must still separately call omap_set_gpio_wakeup() to
- 	 * wake up to a GPIO interrupt.
- 	 */
--	if (cpu_is_omap730())
--		level1_wake = OMAP_IRQ_BIT(INT_730_GPIO_BANK1) |
--			OMAP_IRQ_BIT(INT_730_IH2_IRQ);
-+	if (cpu_is_omap7xx())
-+		level1_wake = OMAP_IRQ_BIT(INT_7XX_GPIO_BANK1) |
-+			OMAP_IRQ_BIT(INT_7XX_IH2_IRQ);
- 	else if (cpu_is_omap15xx())
- 		level1_wake = OMAP_IRQ_BIT(INT_GPIO_BANK1) |
- 			OMAP_IRQ_BIT(INT_1510_IH2_IRQ);
-@@ -195,10 +195,10 @@ static void omap_pm_wakeup_setup(void)
- 
- 	omap_writel(~level1_wake, OMAP_IH1_MIR);
- 
--	if (cpu_is_omap730()) {
-+	if (cpu_is_omap7xx()) {
- 		omap_writel(~level2_wake, OMAP_IH2_0_MIR);
--		omap_writel(~(OMAP_IRQ_BIT(INT_730_WAKE_UP_REQ) |
--				OMAP_IRQ_BIT(INT_730_MPUIO_KEYPAD)),
-+		omap_writel(~(OMAP_IRQ_BIT(INT_7XX_WAKE_UP_REQ) |
-+				OMAP_IRQ_BIT(INT_7XX_MPUIO_KEYPAD)),
- 				OMAP_IH2_1_MIR);
- 	} else if (cpu_is_omap15xx()) {
- 		level2_wake |= OMAP_IRQ_BIT(INT_KEYBOARD);
-@@ -253,15 +253,15 @@ void omap1_pm_suspend(void)
- 	 * Save interrupt, MPUI, ARM and UPLD control registers.
- 	 */
- 
--	if (cpu_is_omap730()) {
--		MPUI730_SAVE(OMAP_IH1_MIR);
--		MPUI730_SAVE(OMAP_IH2_0_MIR);
--		MPUI730_SAVE(OMAP_IH2_1_MIR);
--		MPUI730_SAVE(MPUI_CTRL);
--		MPUI730_SAVE(MPUI_DSP_BOOT_CONFIG);
--		MPUI730_SAVE(MPUI_DSP_API_CONFIG);
--		MPUI730_SAVE(EMIFS_CONFIG);
--		MPUI730_SAVE(EMIFF_SDRAM_CONFIG);
-+	if (cpu_is_omap7xx()) {
-+		MPUI7XX_SAVE(OMAP_IH1_MIR);
-+		MPUI7XX_SAVE(OMAP_IH2_0_MIR);
-+		MPUI7XX_SAVE(OMAP_IH2_1_MIR);
-+		MPUI7XX_SAVE(MPUI_CTRL);
-+		MPUI7XX_SAVE(MPUI_DSP_BOOT_CONFIG);
-+		MPUI7XX_SAVE(MPUI_DSP_API_CONFIG);
-+		MPUI7XX_SAVE(EMIFS_CONFIG);
-+		MPUI7XX_SAVE(EMIFF_SDRAM_CONFIG);
- 
- 	} else if (cpu_is_omap15xx()) {
- 		MPUI1510_SAVE(OMAP_IH1_MIR);
-@@ -306,7 +306,7 @@ void omap1_pm_suspend(void)
- 	omap_writew(omap_readw(ARM_RSTCT1) & ~(1 << DSP_EN), ARM_RSTCT1);
- 
- 		/* shut down dsp_ck */
--	if (!cpu_is_omap730())
-+	if (!cpu_is_omap7xx())
- 		omap_writew(omap_readw(ARM_CKCTL) & ~(1 << EN_DSPCK), ARM_CKCTL);
- 
- 	/* temporarily enabling api_ck to access DSP registers */
-@@ -383,12 +383,12 @@ void omap1_pm_suspend(void)
- 	ULPD_RESTORE(ULPD_CLOCK_CTRL);
- 	ULPD_RESTORE(ULPD_STATUS_REQ);
- 
--	if (cpu_is_omap730()) {
--		MPUI730_RESTORE(EMIFS_CONFIG);
--		MPUI730_RESTORE(EMIFF_SDRAM_CONFIG);
--		MPUI730_RESTORE(OMAP_IH1_MIR);
--		MPUI730_RESTORE(OMAP_IH2_0_MIR);
--		MPUI730_RESTORE(OMAP_IH2_1_MIR);
-+	if (cpu_is_omap7xx()) {
-+		MPUI7XX_RESTORE(EMIFS_CONFIG);
-+		MPUI7XX_RESTORE(EMIFF_SDRAM_CONFIG);
-+		MPUI7XX_RESTORE(OMAP_IH1_MIR);
-+		MPUI7XX_RESTORE(OMAP_IH2_0_MIR);
-+		MPUI7XX_RESTORE(OMAP_IH2_1_MIR);
- 	} else if (cpu_is_omap15xx()) {
- 		MPUI1510_RESTORE(MPUI_CTRL);
- 		MPUI1510_RESTORE(MPUI_DSP_BOOT_CONFIG);
-@@ -461,13 +461,13 @@ static int omap_pm_read_proc(
- 	ULPD_SAVE(ULPD_DPLL_CTRL);
- 	ULPD_SAVE(ULPD_POWER_CTRL);
- 
--	if (cpu_is_omap730()) {
--		MPUI730_SAVE(MPUI_CTRL);
--		MPUI730_SAVE(MPUI_DSP_STATUS);
--		MPUI730_SAVE(MPUI_DSP_BOOT_CONFIG);
--		MPUI730_SAVE(MPUI_DSP_API_CONFIG);
--		MPUI730_SAVE(EMIFF_SDRAM_CONFIG);
--		MPUI730_SAVE(EMIFS_CONFIG);
-+	if (cpu_is_omap7xx()) {
-+		MPUI7XX_SAVE(MPUI_CTRL);
-+		MPUI7XX_SAVE(MPUI_DSP_STATUS);
-+		MPUI7XX_SAVE(MPUI_DSP_BOOT_CONFIG);
-+		MPUI7XX_SAVE(MPUI_DSP_API_CONFIG);
-+		MPUI7XX_SAVE(EMIFF_SDRAM_CONFIG);
-+		MPUI7XX_SAVE(EMIFS_CONFIG);
- 	} else if (cpu_is_omap15xx()) {
- 		MPUI1510_SAVE(MPUI_CTRL);
- 		MPUI1510_SAVE(MPUI_DSP_STATUS);
-@@ -517,20 +517,20 @@ static int omap_pm_read_proc(
- 		   ULPD_SHOW(ULPD_STATUS_REQ),
- 		   ULPD_SHOW(ULPD_POWER_CTRL));
- 
--		if (cpu_is_omap730()) {
-+		if (cpu_is_omap7xx()) {
- 			my_buffer_offset += sprintf(my_base + my_buffer_offset,
--			   "MPUI730_CTRL_REG	     0x%-8x \n"
--			   "MPUI730_DSP_STATUS_REG:      0x%-8x \n"
--			   "MPUI730_DSP_BOOT_CONFIG_REG: 0x%-8x \n"
--			   "MPUI730_DSP_API_CONFIG_REG:  0x%-8x \n"
--			   "MPUI730_SDRAM_CONFIG_REG:    0x%-8x \n"
--			   "MPUI730_EMIFS_CONFIG_REG:    0x%-8x \n",
--			   MPUI730_SHOW(MPUI_CTRL),
--			   MPUI730_SHOW(MPUI_DSP_STATUS),
--			   MPUI730_SHOW(MPUI_DSP_BOOT_CONFIG),
--			   MPUI730_SHOW(MPUI_DSP_API_CONFIG),
--			   MPUI730_SHOW(EMIFF_SDRAM_CONFIG),
--			   MPUI730_SHOW(EMIFS_CONFIG));
-+			   "MPUI7XX_CTRL_REG	     0x%-8x \n"
-+			   "MPUI7XX_DSP_STATUS_REG:      0x%-8x \n"
-+			   "MPUI7XX_DSP_BOOT_CONFIG_REG: 0x%-8x \n"
-+			   "MPUI7XX_DSP_API_CONFIG_REG:  0x%-8x \n"
-+			   "MPUI7XX_SDRAM_CONFIG_REG:    0x%-8x \n"
-+			   "MPUI7XX_EMIFS_CONFIG_REG:    0x%-8x \n",
-+			   MPUI7XX_SHOW(MPUI_CTRL),
-+			   MPUI7XX_SHOW(MPUI_DSP_STATUS),
-+			   MPUI7XX_SHOW(MPUI_DSP_BOOT_CONFIG),
-+			   MPUI7XX_SHOW(MPUI_DSP_API_CONFIG),
-+			   MPUI7XX_SHOW(EMIFF_SDRAM_CONFIG),
-+			   MPUI7XX_SHOW(EMIFS_CONFIG));
- 		} else if (cpu_is_omap15xx()) {
- 			my_buffer_offset += sprintf(my_base + my_buffer_offset,
- 			   "MPUI1510_CTRL_REG             0x%-8x \n"
-@@ -668,9 +668,9 @@ static int __init omap_pm_init(void)
- 	 * These routines need to be in SRAM as that's the only
- 	 * memory the MPU can see when it wakes up.
- 	 */
--	if (cpu_is_omap730()) {
--		omap_sram_suspend = omap_sram_push(omap730_cpu_suspend,
--						   omap730_cpu_suspend_sz);
-+	if (cpu_is_omap7xx()) {
-+		omap_sram_suspend = omap_sram_push(omap7xx_cpu_suspend,
-+						   omap7xx_cpu_suspend_sz);
- 	} else if (cpu_is_omap15xx()) {
- 		omap_sram_suspend = omap_sram_push(omap1510_cpu_suspend,
- 						   omap1510_cpu_suspend_sz);
-@@ -686,8 +686,8 @@ static int __init omap_pm_init(void)
- 
- 	pm_idle = omap1_pm_idle;
- 
--	if (cpu_is_omap730())
--		setup_irq(INT_730_WAKE_UP_REQ, &omap_wakeup_irq);
-+	if (cpu_is_omap7xx())
-+		setup_irq(INT_7XX_WAKE_UP_REQ, &omap_wakeup_irq);
- 	else if (cpu_is_omap16xx())
- 		setup_irq(INT_1610_WAKE_UP_REQ, &omap_wakeup_irq);
- 
-@@ -700,8 +700,8 @@ static int __init omap_pm_init(void)
- 	omap_writew(ULPD_POWER_CTRL_REG_VAL, ULPD_POWER_CTRL);
- 
- 	/* Configure IDLECT3 */
--	if (cpu_is_omap730())
--		omap_writel(OMAP730_IDLECT3_VAL, OMAP730_IDLECT3);
-+	if (cpu_is_omap7xx())
-+		omap_writel(OMAP7XX_IDLECT3_VAL, OMAP7XX_IDLECT3);
- 	else if (cpu_is_omap16xx())
- 		omap_writel(OMAP1610_IDLECT3_VAL, OMAP1610_IDLECT3);
- 
---- a/arch/arm/mach-omap1/pm.h
-+++ b/arch/arm/mach-omap1/pm.h
-@@ -98,13 +98,14 @@
- #define OMAP1610_IDLECT3		0xfffece24
- #define OMAP1610_IDLE_LOOP_REQUEST	0x0400
- 
--#define OMAP730_IDLECT1_SLEEP_VAL	0x16c7
--#define OMAP730_IDLECT2_SLEEP_VAL	0x09c7
--#define OMAP730_IDLECT3_VAL		0x3f
--#define OMAP730_IDLECT3		0xfffece24
--#define OMAP730_IDLE_LOOP_REQUEST	0x0C00
-+#define OMAP7XX_IDLECT1_SLEEP_VAL	0x16c7
-+#define OMAP7XX_IDLECT2_SLEEP_VAL	0x09c7
-+#define OMAP7XX_IDLECT3_VAL		0x3f
-+#define OMAP7XX_IDLECT3		0xfffece24
-+#define OMAP7XX_IDLE_LOOP_REQUEST	0x0C00
- 
- #if     !defined(CONFIG_ARCH_OMAP730) && \
-+	!defined(CONFIG_ARCH_OMAP850) && \
- 	!defined(CONFIG_ARCH_OMAP15XX) && \
- 	!defined(CONFIG_ARCH_OMAP16XX)
- #warning "Power management for this processor not implemented yet"
-@@ -122,17 +123,17 @@ extern void allow_idle_sleep(void);
- extern void omap1_pm_idle(void);
- extern void omap1_pm_suspend(void);
- 
--extern void omap730_cpu_suspend(unsigned short, unsigned short);
-+extern void omap7xx_cpu_suspend(unsigned short, unsigned short);
- extern void omap1510_cpu_suspend(unsigned short, unsigned short);
- extern void omap1610_cpu_suspend(unsigned short, unsigned short);
--extern void omap730_idle_loop_suspend(void);
-+extern void omap7xx_idle_loop_suspend(void);
- extern void omap1510_idle_loop_suspend(void);
- extern void omap1610_idle_loop_suspend(void);
- 
--extern unsigned int omap730_cpu_suspend_sz;
-+extern unsigned int omap7xx_cpu_suspend_sz;
- extern unsigned int omap1510_cpu_suspend_sz;
- extern unsigned int omap1610_cpu_suspend_sz;
--extern unsigned int omap730_idle_loop_suspend_sz;
-+extern unsigned int omap7xx_idle_loop_suspend_sz;
- extern unsigned int omap1510_idle_loop_suspend_sz;
- extern unsigned int omap1610_idle_loop_suspend_sz;
- 
-@@ -155,9 +156,9 @@ extern void omap_serial_wake_trigger(int
- #define ULPD_RESTORE(x) omap_writew((ulpd_sleep_save[ULPD_SLEEP_SAVE_##x]), (x))
- #define ULPD_SHOW(x) ulpd_sleep_save[ULPD_SLEEP_SAVE_##x]
- 
--#define MPUI730_SAVE(x) mpui730_sleep_save[MPUI730_SLEEP_SAVE_##x] = omap_readl(x)
--#define MPUI730_RESTORE(x) omap_writel((mpui730_sleep_save[MPUI730_SLEEP_SAVE_##x]), (x))
--#define MPUI730_SHOW(x) mpui730_sleep_save[MPUI730_SLEEP_SAVE_##x]
-+#define MPUI7XX_SAVE(x) mpui7xx_sleep_save[MPUI7XX_SLEEP_SAVE_##x] = omap_readl(x)
-+#define MPUI7XX_RESTORE(x) omap_writel((mpui7xx_sleep_save[MPUI7XX_SLEEP_SAVE_##x]), (x))
-+#define MPUI7XX_SHOW(x) mpui7xx_sleep_save[MPUI7XX_SLEEP_SAVE_##x]
- 
- #define MPUI1510_SAVE(x) mpui1510_sleep_save[MPUI1510_SLEEP_SAVE_##x] = omap_readl(x)
- #define MPUI1510_RESTORE(x) omap_writel((mpui1510_sleep_save[MPUI1510_SLEEP_SAVE_##x]), (x))
-@@ -232,24 +233,24 @@ enum mpui1510_save_state {
- #endif
- };
- 
--enum mpui730_save_state {
--	MPUI730_SLEEP_SAVE_START = 0,
-+enum mpui7xx_save_state {
-+	MPUI7XX_SLEEP_SAVE_START = 0,
- 	/*
- 	 * MPUI registers 32 bits
- 	 */
--	MPUI730_SLEEP_SAVE_MPUI_CTRL,
--	MPUI730_SLEEP_SAVE_MPUI_DSP_BOOT_CONFIG,
--	MPUI730_SLEEP_SAVE_MPUI_DSP_API_CONFIG,
--	MPUI730_SLEEP_SAVE_MPUI_DSP_STATUS,
--	MPUI730_SLEEP_SAVE_EMIFF_SDRAM_CONFIG,
--	MPUI730_SLEEP_SAVE_EMIFS_CONFIG,
--	MPUI730_SLEEP_SAVE_OMAP_IH1_MIR,
--	MPUI730_SLEEP_SAVE_OMAP_IH2_0_MIR,
--	MPUI730_SLEEP_SAVE_OMAP_IH2_1_MIR,
--#if defined(CONFIG_ARCH_OMAP730)
--	MPUI730_SLEEP_SAVE_SIZE
-+	MPUI7XX_SLEEP_SAVE_MPUI_CTRL,
-+	MPUI7XX_SLEEP_SAVE_MPUI_DSP_BOOT_CONFIG,
-+	MPUI7XX_SLEEP_SAVE_MPUI_DSP_API_CONFIG,
-+	MPUI7XX_SLEEP_SAVE_MPUI_DSP_STATUS,
-+	MPUI7XX_SLEEP_SAVE_EMIFF_SDRAM_CONFIG,
-+	MPUI7XX_SLEEP_SAVE_EMIFS_CONFIG,
-+	MPUI7XX_SLEEP_SAVE_OMAP_IH1_MIR,
-+	MPUI7XX_SLEEP_SAVE_OMAP_IH2_0_MIR,
-+	MPUI7XX_SLEEP_SAVE_OMAP_IH2_1_MIR,
-+#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
-+	MPUI7XX_SLEEP_SAVE_SIZE
- #else
--	MPUI730_SLEEP_SAVE_SIZE = 0
-+	MPUI7XX_SLEEP_SAVE_SIZE = 0
- #endif
- };
- 
---- a/arch/arm/mach-omap1/serial.c
-+++ b/arch/arm/mach-omap1/serial.c
-@@ -64,7 +64,6 @@ static void __init omap_serial_reset(str
- 
- static struct plat_serial8250_port serial_platform_data[] = {
- 	{
--		.membase	= OMAP1_IO_ADDRESS(OMAP_UART1_BASE),
- 		.mapbase	= OMAP_UART1_BASE,
- 		.irq		= INT_UART1,
- 		.flags		= UPF_BOOT_AUTOCONF,
-@@ -73,7 +72,6 @@ static struct plat_serial8250_port seria
- 		.uartclk	= OMAP16XX_BASE_BAUD * 16,
- 	},
- 	{
--		.membase	= OMAP1_IO_ADDRESS(OMAP_UART2_BASE),
- 		.mapbase	= OMAP_UART2_BASE,
- 		.irq		= INT_UART2,
- 		.flags		= UPF_BOOT_AUTOCONF,
-@@ -82,7 +80,6 @@ static struct plat_serial8250_port seria
- 		.uartclk	= OMAP16XX_BASE_BAUD * 16,
- 	},
- 	{
--		.membase	= OMAP1_IO_ADDRESS(OMAP_UART3_BASE),
- 		.mapbase	= OMAP_UART3_BASE,
- 		.irq		= INT_UART3,
- 		.flags		= UPF_BOOT_AUTOCONF,
-@@ -90,7 +87,6 @@ static struct plat_serial8250_port seria
- 		.regshift	= 2,
- 		.uartclk	= OMAP16XX_BASE_BAUD * 16,
- 	},
--	{ },
- };
- 
- static struct platform_device serial_device = {
-@@ -110,18 +106,11 @@ void __init omap_serial_init(void)
- {
- 	int i;
- 
--	if (cpu_is_omap730()) {
-+	if (cpu_is_omap7xx()) {
- 		serial_platform_data[0].regshift = 0;
- 		serial_platform_data[1].regshift = 0;
--		serial_platform_data[0].irq = INT_730_UART_MODEM_1;
--		serial_platform_data[1].irq = INT_730_UART_MODEM_IRDA_2;
--	}
--
--	if (cpu_is_omap850()) {
--		serial_platform_data[0].regshift = 0;
--		serial_platform_data[1].regshift = 0;
--		serial_platform_data[0].irq = INT_850_UART_MODEM_1;
--		serial_platform_data[1].irq = INT_850_UART_MODEM_IRDA_2;
-+		serial_platform_data[0].irq = INT_7XX_UART_MODEM_1;
-+		serial_platform_data[1].irq = INT_7XX_UART_MODEM_IRDA_2;
- 	}
- 
- 	if (cpu_is_omap15xx()) {
---- a/arch/arm/mach-omap1/sleep.S
-+++ b/arch/arm/mach-omap1/sleep.S
-@@ -1,7 +1,7 @@
- /*
-  * linux/arch/arm/mach-omap1/sleep.S
-  *
-- * Low-level OMAP730/1510/1610 sleep/wakeUp support
-+ * Low-level OMAP7XX/1510/1610 sleep/wakeUp support
-  *
-  * Initial SA1110 code:
-  * Copyright (c) 2001 Cliff Brake <cbrake@accelent.com>
-@@ -57,8 +57,8 @@
-  *
-  */
- 
--#if defined(CONFIG_ARCH_OMAP730)
--ENTRY(omap730_cpu_suspend)
-+#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
-+ENTRY(omap7xx_cpu_suspend)
- 
- 	@ save registers on stack
- 	stmfd	sp!, {r0 - r12, lr}
-@@ -91,13 +91,13 @@ ENTRY(omap730_cpu_suspend)
- 
- 	@ turn off clock domains
- 	@ do not disable PERCK (0x04)
--	mov	r5, #OMAP730_IDLECT2_SLEEP_VAL & 0xff
--	orr	r5, r5, #OMAP730_IDLECT2_SLEEP_VAL & 0xff00
-+	mov	r5, #OMAP7XX_IDLECT2_SLEEP_VAL & 0xff
-+	orr	r5, r5, #OMAP7XX_IDLECT2_SLEEP_VAL & 0xff00
- 	strh	r5, [r4, #ARM_IDLECT2_ASM_OFFSET & 0xff]
- 
- 	@ request ARM idle
--	mov	r3, #OMAP730_IDLECT1_SLEEP_VAL & 0xff
--	orr	r3, r3, #OMAP730_IDLECT1_SLEEP_VAL & 0xff00
-+	mov	r3, #OMAP7XX_IDLECT1_SLEEP_VAL & 0xff
-+	orr	r3, r3, #OMAP7XX_IDLECT1_SLEEP_VAL & 0xff00
- 	strh	r3, [r4, #ARM_IDLECT1_ASM_OFFSET & 0xff]
- 
- 	@ disable instruction cache
-@@ -113,7 +113,7 @@ ENTRY(omap730_cpu_suspend)
- 	mov	r2, #0
- 	mcr	p15, 0, r2, c7, c0, 4		@ wait for interrupt
- /*
-- * omap730_cpu_suspend()'s resume point.
-+ * omap7xx_cpu_suspend()'s resume point.
-  *
-  * It will just start executing here, so we'll restore stuff from the
-  * stack.
-@@ -132,9 +132,9 @@ ENTRY(omap730_cpu_suspend)
- 	@ restore regs and return
- 	ldmfd	sp!, {r0 - r12, pc}
- 
--ENTRY(omap730_cpu_suspend_sz)
--	.word	. - omap730_cpu_suspend
--#endif /* CONFIG_ARCH_OMAP730 */
-+ENTRY(omap7xx_cpu_suspend_sz)
-+	.word	. - omap7xx_cpu_suspend
-+#endif /* CONFIG_ARCH_OMAP730 || CONFIG_ARCH_OMAP850 */
- 
- #ifdef CONFIG_ARCH_OMAP15XX
- ENTRY(omap1510_cpu_suspend)
---- a/arch/arm/mach-omap2/Makefile
-+++ b/arch/arm/mach-omap2/Makefile
-@@ -80,6 +80,7 @@ obj-$(CONFIG_MACH_OMAP_4430SDP)		+= boar
- # Platform specific device init code
- obj-y					+= usb-musb.o
- obj-$(CONFIG_MACH_OMAP2_TUSB6010)	+= usb-tusb6010.o
-+obj-y					+= usb-ehci.o
- 
- onenand-$(CONFIG_MTD_ONENAND_OMAP2)	:= gpmc-onenand.o
- obj-y					+= $(onenand-m) $(onenand-y)
---- a/arch/arm/mach-omap2/board-2430sdp.c
-+++ b/arch/arm/mach-omap2/board-2430sdp.c
-@@ -221,7 +221,7 @@ static void __init omap_2430sdp_map_io(v
- MACHINE_START(OMAP_2430SDP, "OMAP2430 sdp2430 board")
- 	/* Maintainer: Syed Khasim - Texas Instruments Inc */
- 	.phys_io	= 0x48000000,
--	.io_pg_offst	= ((0xd8000000) >> 18) & 0xfffc,
-+	.io_pg_offst	= ((0xfa000000) >> 18) & 0xfffc,
- 	.boot_params	= 0x80000100,
- 	.map_io		= omap_2430sdp_map_io,
- 	.init_irq	= omap_2430sdp_init_irq,
---- a/arch/arm/mach-omap2/board-3430sdp.c
-+++ b/arch/arm/mach-omap2/board-3430sdp.c
-@@ -618,6 +618,18 @@ static void enable_board_wakeup_source(v
- 	omap_cfg_reg(AF26_34XX_SYS_NIRQ); /* T2 interrupt line (keypad) */
- }
- 
-+static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
-+
-+	.port_mode[0] = EHCI_HCD_OMAP_MODE_PHY,
-+	.port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,
-+	.port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,
-+
-+	.phy_reset  = true,
-+	.reset_gpio_port[0]  = 57,
-+	.reset_gpio_port[1]  = 61,
-+	.reset_gpio_port[2]  = -EINVAL
-+};
-+
- static void __init omap_3430sdp_init(void)
- {
- 	omap3430_i2c_init();
-@@ -635,6 +647,7 @@ static void __init omap_3430sdp_init(voi
- 	board_smc91x_init();
- 	sdp3430_display_init();
- 	enable_board_wakeup_source();
-+	usb_ehci_init(&ehci_pdata);
- }
- 
- static void __init omap_3430sdp_map_io(void)
-@@ -646,7 +659,7 @@ static void __init omap_3430sdp_map_io(v
- MACHINE_START(OMAP_3430SDP, "OMAP3430 3430SDP board")
- 	/* Maintainer: Syed Khasim - Texas Instruments Inc */
- 	.phys_io	= 0x48000000,
--	.io_pg_offst	= ((0xd8000000) >> 18) & 0xfffc,
-+	.io_pg_offst	= ((0xfa000000) >> 18) & 0xfffc,
- 	.boot_params	= 0x80000100,
- 	.map_io		= omap_3430sdp_map_io,
- 	.init_irq	= omap_3430sdp_init_irq,
---- a/arch/arm/mach-omap2/board-4430sdp.c
-+++ b/arch/arm/mach-omap2/board-4430sdp.c
-@@ -52,8 +52,17 @@ static struct omap_board_config_kernel s
- 
- static void __init gic_init_irq(void)
- {
--	gic_dist_init(0, OMAP2_IO_ADDRESS(OMAP44XX_GIC_DIST_BASE), 29);
--	gic_cpu_init(0, OMAP2_IO_ADDRESS(OMAP44XX_GIC_CPU_BASE));
-+	void __iomem *base;
-+
-+	/* Static mapping, never released */
-+	base = ioremap(OMAP44XX_GIC_DIST_BASE, SZ_4K);
-+	BUG_ON(!base);
-+	gic_dist_init(0, base, 29);
-+
-+	/* Static mapping, never released */
-+	base = ioremap(OMAP44XX_GIC_CPU_BASE, SZ_256);
-+	BUG_ON(!base);
-+	gic_cpu_init(0, OMAP44XX_GIC_CPU_BASE);
- }
- 
- static void __init omap_4430sdp_init_irq(void)
-@@ -84,7 +93,7 @@ static void __init omap_4430sdp_map_io(v
- MACHINE_START(OMAP_4430SDP, "OMAP4430 4430SDP board")
- 	/* Maintainer: Santosh Shilimkar - Texas Instruments Inc */
- 	.phys_io	= 0x48000000,
--	.io_pg_offst	= ((0xd8000000) >> 18) & 0xfffc,
-+	.io_pg_offst	= ((0xfa000000) >> 18) & 0xfffc,
- 	.boot_params	= 0x80000100,
- 	.map_io		= omap_4430sdp_map_io,
- 	.init_irq	= omap_4430sdp_init_irq,
---- a/arch/arm/mach-omap2/board-apollon.c
-+++ b/arch/arm/mach-omap2/board-apollon.c
-@@ -333,7 +333,7 @@ static void __init omap_apollon_map_io(v
- MACHINE_START(OMAP_APOLLON, "OMAP24xx Apollon")
- 	/* Maintainer: Kyungmin Park <kyungmin.park@samsung.com> */
- 	.phys_io	= 0x48000000,
--	.io_pg_offst	= ((0xd8000000) >> 18) & 0xfffc,
-+	.io_pg_offst	= ((0xfa000000) >> 18) & 0xfffc,
- 	.boot_params	= 0x80000100,
- 	.map_io		= omap_apollon_map_io,
- 	.init_irq	= omap_apollon_init_irq,
---- a/arch/arm/mach-omap2/board-generic.c
-+++ b/arch/arm/mach-omap2/board-generic.c
-@@ -56,7 +56,7 @@ static void __init omap_generic_map_io(v
- MACHINE_START(OMAP_GENERIC, "Generic OMAP24xx")
- 	/* Maintainer: Paul Mundt <paul.mundt@nokia.com> */
- 	.phys_io	= 0x48000000,
--	.io_pg_offst	= ((0xd8000000) >> 18) & 0xfffc,
-+	.io_pg_offst	= ((0xfa000000) >> 18) & 0xfffc,
- 	.boot_params	= 0x80000100,
- 	.map_io		= omap_generic_map_io,
- 	.init_irq	= omap_generic_init_irq,
---- a/arch/arm/mach-omap2/board-h4.c
-+++ b/arch/arm/mach-omap2/board-h4.c
-@@ -376,7 +376,7 @@ static void __init omap_h4_map_io(void)
- MACHINE_START(OMAP_H4, "OMAP2420 H4 board")
- 	/* Maintainer: Paul Mundt <paul.mundt@nokia.com> */
- 	.phys_io	= 0x48000000,
--	.io_pg_offst	= ((0xd8000000) >> 18) & 0xfffc,
-+	.io_pg_offst	= ((0xfa000000) >> 18) & 0xfffc,
- 	.boot_params	= 0x80000100,
- 	.map_io		= omap_h4_map_io,
- 	.init_irq	= omap_h4_init_irq,
---- a/arch/arm/mach-omap2/board-ldp.c
-+++ b/arch/arm/mach-omap2/board-ldp.c
-@@ -399,7 +399,7 @@ static void __init omap_ldp_map_io(void)
- 
- MACHINE_START(OMAP_LDP, "OMAP LDP board")
- 	.phys_io	= 0x48000000,
--	.io_pg_offst	= ((0xd8000000) >> 18) & 0xfffc,
-+	.io_pg_offst	= ((0xfa000000) >> 18) & 0xfffc,
- 	.boot_params	= 0x80000100,
- 	.map_io		= omap_ldp_map_io,
- 	.init_irq	= omap_ldp_init_irq,
---- a/arch/arm/mach-omap2/board-n8x0.c
-+++ b/arch/arm/mach-omap2/board-n8x0.c
-@@ -121,7 +121,7 @@ static void __init n8x0_init_machine(voi
- 
- MACHINE_START(NOKIA_N800, "Nokia N800")
- 	.phys_io	= 0x48000000,
--	.io_pg_offst	= ((0xd8000000) >> 18) & 0xfffc,
-+	.io_pg_offst	= ((0xfa000000) >> 18) & 0xfffc,
- 	.boot_params	= 0x80000100,
- 	.map_io		= n8x0_map_io,
- 	.init_irq	= n8x0_init_irq,
-@@ -131,7 +131,7 @@ MACHINE_END
- 
- MACHINE_START(NOKIA_N810, "Nokia N810")
- 	.phys_io	= 0x48000000,
--	.io_pg_offst	= ((0xd8000000) >> 18) & 0xfffc,
-+	.io_pg_offst	= ((0xfa000000) >> 18) & 0xfffc,
- 	.boot_params	= 0x80000100,
- 	.map_io		= n8x0_map_io,
- 	.init_irq	= n8x0_init_irq,
-@@ -141,7 +141,7 @@ MACHINE_END
- 
- MACHINE_START(NOKIA_N810_WIMAX, "Nokia N810 WiMAX")
- 	.phys_io	= 0x48000000,
--	.io_pg_offst	= ((0xd8000000) >> 18) & 0xfffc,
-+	.io_pg_offst	= ((0xfa000000) >> 18) & 0xfffc,
- 	.boot_params	= 0x80000100,
- 	.map_io		= n8x0_map_io,
- 	.init_irq	= n8x0_init_irq,
---- a/arch/arm/mach-omap2/board-omap3beagle.c
-+++ b/arch/arm/mach-omap2/board-omap3beagle.c
-@@ -400,6 +400,18 @@ static void __init omap3beagle_flash_ini
- 	}
- }
- 
-+static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
-+
-+	.port_mode[0] = EHCI_HCD_OMAP_MODE_PHY,
-+	.port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,
-+	.port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,
-+
-+	.phy_reset  = true,
-+	.reset_gpio_port[0]  = -EINVAL,
-+	.reset_gpio_port[1]  = 147,
-+	.reset_gpio_port[2]  = -EINVAL
-+};
-+
- static void __init omap3_beagle_init(void)
- {
- 	omap3_beagle_i2c_init();
-@@ -413,6 +425,7 @@ static void __init omap3_beagle_init(voi
- 	gpio_direction_output(170, true);
- 
- 	usb_musb_init();
-+	usb_ehci_init(&ehci_pdata);
- 	omap3beagle_flash_init();
- 
- 	/* Ensure SDRC pins are mux'd for self-refresh */
-@@ -429,7 +442,7 @@ static void __init omap3_beagle_map_io(v
- MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beagle Board")
- 	/* Maintainer: Syed Mohammed Khasim - http://beagleboard.org */
- 	.phys_io	= 0x48000000,
--	.io_pg_offst	= ((0xd8000000) >> 18) & 0xfffc,
-+	.io_pg_offst	= ((0xfa000000) >> 18) & 0xfffc,
- 	.boot_params	= 0x80000100,
- 	.map_io		= omap3_beagle_map_io,
- 	.init_irq	= omap3_beagle_init_irq,
---- a/arch/arm/mach-omap2/board-omap3evm.c
-+++ b/arch/arm/mach-omap2/board-omap3evm.c
-@@ -297,6 +297,18 @@ static struct platform_device *omap3_evm
- 	&omap3evm_smc911x_device,
- };
- 
-+static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
-+
-+	.port_mode[0] = EHCI_HCD_OMAP_MODE_UNKNOWN,
-+	.port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,
-+	.port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,
-+
-+	.phy_reset  = true,
-+	.reset_gpio_port[0]  = -EINVAL,
-+	.reset_gpio_port[1]  = 135,
-+	.reset_gpio_port[2]  = -EINVAL
-+};
-+
- static void __init omap3_evm_init(void)
- {
- 	omap3_evm_i2c_init();
-@@ -312,6 +324,9 @@ static void __init omap3_evm_init(void)
- 	usb_nop_xceiv_register();
- #endif
- 	usb_musb_init();
-+	/* Setup EHCI phy reset padconfig */
-+	omap_cfg_reg(AF4_34XX_GPIO135_OUT);
-+	usb_ehci_init(&ehci_pdata);
- 	ads7846_dev_init();
- }
- 
-@@ -324,7 +339,7 @@ static void __init omap3_evm_map_io(void
- MACHINE_START(OMAP3EVM, "OMAP3 EVM")
- 	/* Maintainer: Syed Mohammed Khasim - Texas Instruments */
- 	.phys_io	= 0x48000000,
--	.io_pg_offst	= ((0xd8000000) >> 18) & 0xfffc,
-+	.io_pg_offst	= ((0xfa000000) >> 18) & 0xfffc,
- 	.boot_params	= 0x80000100,
- 	.map_io		= omap3_evm_map_io,
- 	.init_irq	= omap3_evm_init_irq,
---- a/arch/arm/mach-omap2/board-omap3pandora.c
-+++ b/arch/arm/mach-omap2/board-omap3pandora.c
-@@ -387,6 +387,18 @@ static struct platform_device *omap3pand
- 	&pandora_keys_gpio,
- };
- 
-+static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
-+
-+	.port_mode[0] = EHCI_HCD_OMAP_MODE_PHY,
-+	.port_mode[1] = EHCI_HCD_OMAP_MODE_UNKNOWN,
-+	.port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,
-+
-+	.phy_reset  = true,
-+	.reset_gpio_port[0]  = 16,
-+	.reset_gpio_port[1]  = -EINVAL,
-+	.reset_gpio_port[2]  = -EINVAL
-+};
-+
- static void __init omap3pandora_init(void)
- {
- 	omap3pandora_i2c_init();
-@@ -396,6 +408,7 @@ static void __init omap3pandora_init(voi
- 	spi_register_board_info(omap3pandora_spi_board_info,
- 			ARRAY_SIZE(omap3pandora_spi_board_info));
- 	omap3pandora_ads7846_init();
-+	usb_ehci_init(&ehci_pdata);
- 	pandora_keys_gpio_init();
- 	usb_musb_init();
- 
-@@ -412,7 +425,7 @@ static void __init omap3pandora_map_io(v
- 
- MACHINE_START(OMAP3_PANDORA, "Pandora Handheld Console")
- 	.phys_io	= 0x48000000,
--	.io_pg_offst	= ((0xd8000000) >> 18) & 0xfffc,
-+	.io_pg_offst	= ((0xfa000000) >> 18) & 0xfffc,
- 	.boot_params	= 0x80000100,
- 	.map_io		= omap3pandora_map_io,
- 	.init_irq	= omap3pandora_init_irq,
---- a/arch/arm/mach-omap2/board-overo.c
-+++ b/arch/arm/mach-omap2/board-overo.c
-@@ -384,6 +384,18 @@ static struct platform_device *overo_dev
- 	&overo_lcd_device,
- };
- 
-+static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
-+	.port_mode[0] = EHCI_HCD_OMAP_MODE_UNKNOWN,
-+	.port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,
-+	.port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,
-+
-+	.phy_reset  = true,
-+	.reset_gpio_port[0]  = -EINVAL,
-+	.reset_gpio_port[1]  = OVERO_GPIO_USBH_NRESET,
-+	.reset_gpio_port[2]  = -EINVAL
-+};
-+
-+
- static void __init overo_init(void)
- {
- 	overo_i2c_init();
-@@ -391,6 +403,7 @@ static void __init overo_init(void)
- 	omap_serial_init();
- 	overo_flash_init();
- 	usb_musb_init();
-+	usb_ehci_init(&ehci_pdata);
- 	overo_ads7846_init();
- 	overo_init_smsc911x();
- 
-@@ -433,14 +446,6 @@ static void __init overo_init(void)
- 	else
- 		printk(KERN_ERR "could not obtain gpio for "
- 					"OVERO_GPIO_USBH_CPEN\n");
--
--	if ((gpio_request(OVERO_GPIO_USBH_NRESET,
--			  "OVERO_GPIO_USBH_NRESET") == 0) &&
--	    (gpio_direction_output(OVERO_GPIO_USBH_NRESET, 1) == 0))
--		gpio_export(OVERO_GPIO_USBH_NRESET, 0);
--	else
--		printk(KERN_ERR "could not obtain gpio for "
--					"OVERO_GPIO_USBH_NRESET\n");
- }
- 
- static void __init overo_map_io(void)
-@@ -451,7 +456,7 @@ static void __init overo_map_io(void)
- 
- MACHINE_START(OVERO, "Gumstix Overo")
- 	.phys_io	= 0x48000000,
--	.io_pg_offst	= ((0xd8000000) >> 18) & 0xfffc,
-+	.io_pg_offst	= ((0xfa000000) >> 18) & 0xfffc,
- 	.boot_params	= 0x80000100,
- 	.map_io		= overo_map_io,
- 	.init_irq	= overo_init_irq,
---- a/arch/arm/mach-omap2/board-rx51.c
-+++ b/arch/arm/mach-omap2/board-rx51.c
-@@ -84,7 +84,7 @@ static void __init rx51_map_io(void)
- MACHINE_START(NOKIA_RX51, "Nokia RX-51 board")
- 	/* Maintainer: Lauri Leukkunen <lauri.leukkunen@nokia.com> */
- 	.phys_io	= 0x48000000,
--	.io_pg_offst	= ((0xd8000000) >> 18) & 0xfffc,
-+	.io_pg_offst	= ((0xfa000000) >> 18) & 0xfffc,
- 	.boot_params	= 0x80000100,
- 	.map_io		= rx51_map_io,
- 	.init_irq	= rx51_init_irq,
---- a/arch/arm/mach-omap2/board-zoom2.c
-+++ b/arch/arm/mach-omap2/board-zoom2.c
-@@ -282,7 +282,7 @@ static void __init omap_zoom2_map_io(voi
- 
- MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 board")
- 	.phys_io	= 0x48000000,
--	.io_pg_offst	= ((0xd8000000) >> 18) & 0xfffc,
-+	.io_pg_offst	= ((0xfa000000) >> 18) & 0xfffc,
- 	.boot_params	= 0x80000100,
- 	.map_io		= omap_zoom2_map_io,
- 	.init_irq	= omap_zoom2_init_irq,
---- a/arch/arm/mach-omap2/cm.h
-+++ b/arch/arm/mach-omap2/cm.h
-@@ -17,11 +17,11 @@
- #include "prcm-common.h"
- 
- #define OMAP2420_CM_REGADDR(module, reg)				\
--			OMAP2_IO_ADDRESS(OMAP2420_CM_BASE + (module) + (reg))
-+			OMAP2_L4_IO_ADDRESS(OMAP2420_CM_BASE + (module) + (reg))
- #define OMAP2430_CM_REGADDR(module, reg)				\
--			OMAP2_IO_ADDRESS(OMAP2430_CM_BASE + (module) + (reg))
-+			OMAP2_L4_IO_ADDRESS(OMAP2430_CM_BASE + (module) + (reg))
- #define OMAP34XX_CM_REGADDR(module, reg)				\
--			OMAP2_IO_ADDRESS(OMAP3430_CM_BASE + (module) + (reg))
-+			OMAP2_L4_IO_ADDRESS(OMAP3430_CM_BASE + (module) + (reg))
- 
- /*
-  * Architecture-specific global CM registers
---- a/arch/arm/mach-omap2/id.c
-+++ b/arch/arm/mach-omap2/id.c
-@@ -28,6 +28,7 @@
- static struct omap_chip_id omap_chip;
- static unsigned int omap_revision;
- 
-+u32 omap3_features;
- 
- unsigned int omap_rev(void)
- {
-@@ -155,12 +156,37 @@ void __init omap24xx_check_revision(void
- 	pr_info("\n");
- }
- 
--void __init omap34xx_check_revision(void)
-+#define OMAP3_CHECK_FEATURE(status,feat)				\
-+	if (((status & OMAP3_ ##feat## _MASK) 				\
-+		>> OMAP3_ ##feat## _SHIFT) != FEAT_ ##feat## _NONE) { 	\
-+		omap3_features |= OMAP3_HAS_ ##feat;			\
-+	}
-+
-+void __init omap3_check_features(void)
-+{
-+	u32 status;
-+
-+	omap3_features = 0;
-+
-+	status = omap_ctrl_readl(OMAP3_CONTROL_OMAP_STATUS);
-+
-+	OMAP3_CHECK_FEATURE(status, L2CACHE);
-+	OMAP3_CHECK_FEATURE(status, IVA);
-+	OMAP3_CHECK_FEATURE(status, SGX);
-+	OMAP3_CHECK_FEATURE(status, NEON);
-+	OMAP3_CHECK_FEATURE(status, ISP);
-+
-+	/*
-+	 * TODO: Get additional info (where applicable)
-+	 *       e.g. Size of L2 cache.
-+	 */
-+}
-+
-+void __init omap3_check_revision(void)
- {
- 	u32 cpuid, idcode;
- 	u16 hawkeye;
- 	u8 rev;
--	char *rev_name = "ES1.0";
- 
- 	/*
- 	 * We cannot access revision registers on ES1.0.
-@@ -170,7 +196,7 @@ void __init omap34xx_check_revision(void
- 	cpuid = read_cpuid(CPUID_ID);
- 	if ((((cpuid >> 4) & 0xfff) == 0xc08) && ((cpuid & 0xf) == 0x0)) {
- 		omap_revision = OMAP3430_REV_ES1_0;
--		goto out;
-+		return;
- 	}
- 
- 	/*
-@@ -183,33 +209,111 @@ void __init omap34xx_check_revision(void
- 	hawkeye = (idcode >> 12) & 0xffff;
- 	rev = (idcode >> 28) & 0xff;
- 
--	if (hawkeye == 0xb7ae) {
-+	switch (hawkeye) {
-+	case 0xb7ae:
-+		/* Handle 34xx/35xx devices */
- 		switch (rev) {
--		case 0:
-+		case 0: /* Take care of early samples */
-+		case 1:
- 			omap_revision = OMAP3430_REV_ES2_0;
--			rev_name = "ES2.0";
- 			break;
- 		case 2:
- 			omap_revision = OMAP3430_REV_ES2_1;
--			rev_name = "ES2.1";
- 			break;
- 		case 3:
- 			omap_revision = OMAP3430_REV_ES3_0;
--			rev_name = "ES3.0";
- 			break;
- 		case 4:
- 			omap_revision = OMAP3430_REV_ES3_1;
--			rev_name = "ES3.1";
- 			break;
- 		default:
- 			/* Use the latest known revision as default */
- 			omap_revision = OMAP3430_REV_ES3_1;
--			rev_name = "Unknown revision\n";
- 		}
-+		break;
-+	case 0xb891:
-+		/* Handle 36xx devices */
-+		switch (rev) {
-+		case 0:
-+			omap_revision = OMAP3630_REV_ES1_0;
-+			break;
-+		default:
-+			/* Use the latest known revision as default */
-+			omap_revision = OMAP3630_REV_ES1_0;
-+		}
-+		break;
-+	default:
-+		/* Unknown default to latest silicon rev as default*/
-+		omap_revision = OMAP3630_REV_ES1_0;
- 	}
-+}
- 
--out:
--	pr_info("OMAP%04x %s\n", omap_rev() >> 16, rev_name);
-+#define OMAP3_SHOW_FEATURE(feat)		\
-+	if (omap3_has_ ##feat()) {		\
-+		pr_info (" - "#feat" : Y");	\
-+	} else {				\
-+		pr_info (" - "#feat" : N");	\
-+	}
-+
-+void __init omap3_cpuinfo(void)
-+{
-+	u8 rev = GET_OMAP_REVISION();
-+	char cpu_name[16], cpu_rev[16];
-+
-+	/* OMAP3430 and OMAP3530 are assumed to be same.
-+	 *
-+	 * OMAP3525, OMAP3515 and OMAP3503 can be detected only based
-+	 * on available features. Upon detection, update the CPU id
-+	 * and CPU class bits.
-+	 */
-+	if (cpu_is_omap3630())
-+		strcpy(cpu_name, "3630");
-+	else if (omap3_has_iva() && omap3_has_sgx())
-+		strcpy(cpu_name, "3430/3530");
-+	else if (omap3_has_sgx()) {
-+		omap_revision = OMAP3525_REV(rev);
-+		strcpy(cpu_name, "3525");
-+	}
-+	else if (omap3_has_iva()) {
-+		omap_revision = OMAP3515_REV(rev);
-+		strcpy(cpu_name, "3515");
-+	}
-+	else {
-+		omap_revision = OMAP3503_REV(rev);
-+		strcpy(cpu_name, "3503");
-+	}
-+
-+	switch (rev) {
-+	case OMAP_REVBITS_00:
-+		strcpy(cpu_rev, "1.0");
-+		break;
-+	case OMAP_REVBITS_10:
-+		strcpy(cpu_rev, "2.0");
-+		break;
-+	case OMAP_REVBITS_20:
-+		strcpy(cpu_rev, "2.1");
-+		break;
-+	case OMAP_REVBITS_30:
-+		strcpy(cpu_rev, "3.0");
-+		break;
-+	case OMAP_REVBITS_40:
-+		strcpy(cpu_rev, "3.1");
-+		break;
-+	default:
-+		/* Use the latest known revision as default */
-+		strcpy(cpu_rev, "3.1");
-+	}
-+
-+	/*
-+	 * Print verbose information
-+	 */
-+	pr_info("OMAP%s ES%s\n", cpu_name, cpu_rev);
-+
-+	OMAP3_SHOW_FEATURE(l2cache);
-+	OMAP3_SHOW_FEATURE(iva);
-+	OMAP3_SHOW_FEATURE(sgx);
-+	OMAP3_SHOW_FEATURE(neon);
-+	OMAP3_SHOW_FEATURE(isp);
- }
- 
- /*
-@@ -223,8 +327,11 @@ void __init omap2_check_revision(void)
- 	 */
- 	if (cpu_is_omap24xx())
- 		omap24xx_check_revision();
--	else if (cpu_is_omap34xx())
--		omap34xx_check_revision();
-+	else if (cpu_is_omap34xx()) {
-+		omap3_check_features();
-+		omap3_check_revision();
-+		omap3_cpuinfo();
-+	}
- 	else if (cpu_is_omap44xx()) {
- 		printk(KERN_INFO "FIXME: CPU revision = OMAP4430\n");
- 		return;
---- a/arch/arm/mach-omap2/io.c
-+++ b/arch/arm/mach-omap2/io.c
-@@ -204,6 +204,24 @@ static struct map_desc omap44xx_io_desc[
- 		.type		= MT_DEVICE,
- 	},
- 	{
-+		.virtual	= OMAP44XX_EMIF1_VIRT,
-+		.pfn		= __phys_to_pfn(OMAP44XX_EMIF1_PHYS),
-+		.length		= OMAP44XX_EMIF1_SIZE,
-+		.type		= MT_DEVICE,
-+	},
-+	{
-+		.virtual	= OMAP44XX_EMIF2_VIRT,
-+		.pfn		= __phys_to_pfn(OMAP44XX_EMIF2_PHYS),
-+		.length		= OMAP44XX_EMIF2_SIZE,
-+		.type		= MT_DEVICE,
-+	},
-+	{
-+		.virtual	= OMAP44XX_DMM_VIRT,
-+		.pfn		= __phys_to_pfn(OMAP44XX_DMM_PHYS),
-+		.length		= OMAP44XX_DMM_SIZE,
-+		.type		= MT_DEVICE,
-+	},
-+	{
- 		.virtual	= L4_PER_44XX_VIRT,
- 		.pfn		= __phys_to_pfn(L4_PER_44XX_PHYS),
- 		.length		= L4_PER_44XX_SIZE,
---- a/arch/arm/mach-omap2/irq.c
-+++ b/arch/arm/mach-omap2/irq.c
-@@ -178,12 +178,20 @@ void __init omap_init_irq(void)
- 	int i;
- 
- 	for (i = 0; i < ARRAY_SIZE(irq_banks); i++) {
-+		unsigned long base;
- 		struct omap_irq_bank *bank = irq_banks + i;
- 
- 		if (cpu_is_omap24xx())
--			bank->base_reg = OMAP2_IO_ADDRESS(OMAP24XX_IC_BASE);
-+			base = OMAP24XX_IC_BASE;
- 		else if (cpu_is_omap34xx())
--			bank->base_reg = OMAP2_IO_ADDRESS(OMAP34XX_IC_BASE);
-+			base = OMAP34XX_IC_BASE;
-+
-+		/* Static mapping, never released */
-+		bank->base_reg = ioremap(base, SZ_4K);
-+		if (!bank->base_reg) {
-+			printk(KERN_ERR "Could not ioremap irq bank%i\n", i);
-+			continue;
-+		}
- 
- 		omap_irq_bank_init_one(bank);
- 
---- a/arch/arm/mach-omap2/omap-smp.c
-+++ b/arch/arm/mach-omap2/omap-smp.c
-@@ -26,11 +26,11 @@
- #include <mach/hardware.h>
- 
- /* Registers used for communicating startup information */
--#define OMAP4_AUXCOREBOOT_REG0		(OMAP44XX_VA_WKUPGEN_BASE + 0x800)
--#define OMAP4_AUXCOREBOOT_REG1		(OMAP44XX_VA_WKUPGEN_BASE + 0x804)
-+static void __iomem *omap4_auxcoreboot_reg0;
-+static void __iomem *omap4_auxcoreboot_reg1;
- 
- /* SCU base address */
--static void __iomem *scu_base = OMAP44XX_VA_SCU_BASE;
-+static void __iomem *scu_base;
- 
- /*
-  * Use SCU config register to count number of cores
-@@ -46,6 +46,8 @@ static DEFINE_SPINLOCK(boot_lock);
- 
- void __cpuinit platform_secondary_init(unsigned int cpu)
- {
-+	void __iomem *gic_cpu_base;
-+
- 	trace_hardirqs_off();
- 
- 	/*
-@@ -54,7 +56,10 @@ void __cpuinit platform_secondary_init(u
- 	 * for us: do so
- 	 */
- 
--	gic_cpu_init(0, OMAP2_IO_ADDRESS(OMAP44XX_GIC_CPU_BASE));
-+	/* Static mapping, never released */
-+	gic_cpu_base = ioremap(OMAP44XX_GIC_CPU_BASE, SZ_256);
-+	BUG_ON(!gic_cpu_base);
-+	gic_cpu_init(0, gic_cpu_base);
- 
- 	/*
- 	 * Synchronise with the boot thread.
-@@ -79,7 +84,7 @@ int __cpuinit boot_secondary(unsigned in
- 	 * the AuxCoreBoot1 register is updated with cpu state
- 	 * A barrier is added to ensure that write buffer is drained
- 	 */
--	__raw_writel(cpu, OMAP4_AUXCOREBOOT_REG1);
-+	__raw_writel(cpu, omap4_auxcoreboot_reg1);
- 	smp_wmb();
- 
- 	timeout = jiffies + (1 * HZ);
-@@ -104,7 +109,7 @@ static void __init wakeup_secondary(void
- 	 * A barrier is added to ensure that write buffer is drained
- 	 */
- 	__raw_writel(virt_to_phys(omap_secondary_startup),	   \
--					OMAP4_AUXCOREBOOT_REG0);
-+					omap4_auxcoreboot_reg0);
- 	smp_wmb();
- 
- 	/*
-@@ -130,6 +135,7 @@ void __init smp_prepare_cpus(unsigned in
- {
- 	unsigned int ncores = get_core_count();
- 	unsigned int cpu = smp_processor_id();
-+	void __iomem *omap4_wkupgen_base;
- 	int i;
- 
- 	/* sanity check */
-@@ -161,6 +167,16 @@ void __init smp_prepare_cpus(unsigned in
- 	for (i = 0; i < max_cpus; i++)
- 		set_cpu_present(i, true);
- 
-+	/* Never released */
-+	omap4_wkupgen_base = ioremap(OMAP44XX_WKUPGEN_BASE, SZ_4K);
-+	BUG_ON(!omap4_wkupgen_base);
-+	omap4_auxcoreboot_reg0 = omap4_wkupgen_base + 0x800;
-+	omap4_auxcoreboot_reg0 = omap4_wkupgen_base + 0x804;
-+
-+	/* Never released */
-+	scu_base = ioremap(OMAP44XX_GIC_CPU_BASE, SZ_256);
-+	BUG_ON(!scu_base);
-+
- 	if (max_cpus > 1) {
- 		/*
- 		 * Enable the local timer or broadcast device for the
---- a/arch/arm/mach-omap2/omap_hwmod.c
-+++ b/arch/arm/mach-omap2/omap_hwmod.c
-@@ -496,6 +496,7 @@ static void __iomem *_find_mpu_rt_base(s
- 	struct omap_hwmod_addr_space *mem;
- 	int i;
- 	int found = 0;
-+	void __iomem *va_start;
- 
- 	if (!oh || oh->slaves_cnt == 0)
- 		return NULL;
-@@ -509,16 +510,20 @@ static void __iomem *_find_mpu_rt_base(s
- 		}
- 	}
- 
--	/* XXX use ioremap() instead? */
--
--	if (found)
-+	if (found) {
-+		va_start = ioremap(mem->pa_start, mem->pa_end - mem->pa_start);
-+		if (!va_start) {
-+			pr_err("omap_hwmod: %s: Could not ioremap\n", oh->name);
-+			return NULL;
-+		}
- 		pr_debug("omap_hwmod: %s: MPU register target at va %p\n",
--			 oh->name, OMAP2_IO_ADDRESS(mem->pa_start));
--	else
-+			 oh->name, va_start);
-+	} else {
- 		pr_debug("omap_hwmod: %s: no MPU register target found\n",
- 			 oh->name);
-+	}
- 
--	return (found) ? OMAP2_IO_ADDRESS(mem->pa_start) : NULL;
-+	return (found) ? va_start : NULL;
- }
- 
- /**
-@@ -1148,6 +1153,7 @@ int omap_hwmod_unregister(struct omap_hw
- 	pr_debug("omap_hwmod: %s: unregistering\n", oh->name);
- 
- 	mutex_lock(&omap_hwmod_mutex);
-+	iounmap(oh->_rt_va);
- 	list_del(&oh->node);
- 	mutex_unlock(&omap_hwmod_mutex);
- 
---- a/arch/arm/mach-omap2/pm-debug.c
-+++ b/arch/arm/mach-omap2/pm-debug.c
-@@ -51,7 +51,8 @@ int omap2_pm_debug;
- 	regs[reg_count++].val = __raw_readl(reg)
- #define DUMP_INTC_REG(reg, off) \
- 	regs[reg_count].name = #reg; \
--	regs[reg_count++].val = __raw_readl(OMAP2_IO_ADDRESS(0x480fe000 + (off)))
-+	regs[reg_count++].val = \
-+			 __raw_readl(OMAP2_L4_IO_ADDRESS(0x480fe000 + (off)))
- 
- static int __init pm_dbg_init(void);
- 
---- a/arch/arm/mach-omap2/prm.h
-+++ b/arch/arm/mach-omap2/prm.h
-@@ -17,11 +17,11 @@
- #include "prcm-common.h"
- 
- #define OMAP2420_PRM_REGADDR(module, reg)				\
--			OMAP2_IO_ADDRESS(OMAP2420_PRM_BASE + (module) + (reg))
-+		OMAP2_L4_IO_ADDRESS(OMAP2420_PRM_BASE + (module) + (reg))
- #define OMAP2430_PRM_REGADDR(module, reg)				\
--			OMAP2_IO_ADDRESS(OMAP2430_PRM_BASE + (module) + (reg))
-+		OMAP2_L4_IO_ADDRESS(OMAP2430_PRM_BASE + (module) + (reg))
- #define OMAP34XX_PRM_REGADDR(module, reg)				\
--			OMAP2_IO_ADDRESS(OMAP3430_PRM_BASE + (module) + (reg))
-+		OMAP2_L4_IO_ADDRESS(OMAP3430_PRM_BASE + (module) + (reg))
- 
- /*
-  * Architecture-specific global PRM registers
---- a/arch/arm/mach-omap2/sdrc.h
-+++ b/arch/arm/mach-omap2/sdrc.h
-@@ -48,9 +48,12 @@ static inline u32 sms_read_reg(u16 reg)
- 	return __raw_readl(OMAP_SMS_REGADDR(reg));
- }
- #else
--#define OMAP242X_SDRC_REGADDR(reg)	OMAP2_IO_ADDRESS(OMAP2420_SDRC_BASE + (reg))
--#define OMAP243X_SDRC_REGADDR(reg)	OMAP2_IO_ADDRESS(OMAP243X_SDRC_BASE + (reg))
--#define OMAP34XX_SDRC_REGADDR(reg)	OMAP2_IO_ADDRESS(OMAP343X_SDRC_BASE + (reg))
-+#define OMAP242X_SDRC_REGADDR(reg)					\
-+			OMAP2_L3_IO_ADDRESS(OMAP2420_SDRC_BASE + (reg))
-+#define OMAP243X_SDRC_REGADDR(reg)					\
-+			OMAP2_L3_IO_ADDRESS(OMAP243X_SDRC_BASE + (reg))
-+#define OMAP34XX_SDRC_REGADDR(reg)					\
-+			OMAP2_L3_IO_ADDRESS(OMAP343X_SDRC_BASE + (reg))
- #endif	/* __ASSEMBLER__ */
- 
- #endif
---- a/arch/arm/mach-omap2/serial.c
-+++ b/arch/arm/mach-omap2/serial.c
-@@ -73,7 +73,6 @@ static LIST_HEAD(uart_list);
- 
- static struct plat_serial8250_port serial_platform_data0[] = {
- 	{
--		.membase	= OMAP2_IO_ADDRESS(OMAP_UART1_BASE),
- 		.mapbase	= OMAP_UART1_BASE,
- 		.irq		= 72,
- 		.flags		= UPF_BOOT_AUTOCONF,
-@@ -87,7 +86,6 @@ static struct plat_serial8250_port seria
- 
- static struct plat_serial8250_port serial_platform_data1[] = {
- 	{
--		.membase	= OMAP2_IO_ADDRESS(OMAP_UART2_BASE),
- 		.mapbase	= OMAP_UART2_BASE,
- 		.irq		= 73,
- 		.flags		= UPF_BOOT_AUTOCONF,
-@@ -101,7 +99,6 @@ static struct plat_serial8250_port seria
- 
- static struct plat_serial8250_port serial_platform_data2[] = {
- 	{
--		.membase	= OMAP2_IO_ADDRESS(OMAP_UART3_BASE),
- 		.mapbase	= OMAP_UART3_BASE,
- 		.irq		= 74,
- 		.flags		= UPF_BOOT_AUTOCONF,
-@@ -116,7 +113,6 @@ static struct plat_serial8250_port seria
- #ifdef CONFIG_ARCH_OMAP4
- static struct plat_serial8250_port serial_platform_data3[] = {
- 	{
--		.membase	= OMAP2_IO_ADDRESS(OMAP_UART4_BASE),
- 		.mapbase	= OMAP_UART4_BASE,
- 		.irq		= 70,
- 		.flags		= UPF_BOOT_AUTOCONF,
-@@ -539,7 +535,7 @@ static inline void omap_uart_idle_init(s
- #define DEV_CREATE_FILE(dev, attr)
- #endif /* CONFIG_PM */
- 
--static struct omap_uart_state omap_uart[OMAP_MAX_NR_PORTS] = {
-+static struct omap_uart_state omap_uart[] = {
- 	{
- 		.pdev = {
- 			.name			= "serial8250",
-@@ -589,12 +585,22 @@ void __init omap_serial_early_init(void)
- 	 * if not needed.
- 	 */
- 
--	for (i = 0; i < OMAP_MAX_NR_PORTS; i++) {
-+	for (i = 0; i < ARRAY_SIZE(omap_uart); i++) {
- 		struct omap_uart_state *uart = &omap_uart[i];
- 		struct platform_device *pdev = &uart->pdev;
- 		struct device *dev = &pdev->dev;
- 		struct plat_serial8250_port *p = dev->platform_data;
- 
-+		/*
-+		 * Module 4KB + L4 interconnect 4KB
-+		 * Static mapping, never released
-+		 */
-+		p->membase = ioremap(p->mapbase, SZ_8K);
-+		if (!p->membase) {
-+			printk(KERN_ERR "ioremap failed for uart%i\n", i + 1);
-+			continue;
-+		}
-+
- 		sprintf(name, "uart%d_ick", i+1);
- 		uart->ick = clk_get(NULL, name);
- 		if (IS_ERR(uart->ick)) {
-@@ -631,7 +637,7 @@ void __init omap_serial_init(void)
- {
- 	int i;
- 
--	for (i = 0; i < OMAP_MAX_NR_PORTS; i++) {
-+	for (i = 0; i < ARRAY_SIZE(omap_uart); i++) {
- 		struct omap_uart_state *uart = &omap_uart[i];
- 		struct platform_device *pdev = &uart->pdev;
- 		struct device *dev = &pdev->dev;
---- a/arch/arm/mach-omap2/sram242x.S
-+++ b/arch/arm/mach-omap2/sram242x.S
-@@ -128,7 +128,7 @@ omap242x_sdi_prcm_voltctrl:
- prcm_mask_val:
- 	.word 0xFFFF3FFC
- omap242x_sdi_timer_32ksynct_cr:
--	.word OMAP2_IO_ADDRESS(OMAP2420_32KSYNCT_BASE + 0x010)
-+	.word OMAP2_L4_IO_ADDRESS(OMAP2420_32KSYNCT_BASE + 0x010)
- ENTRY(omap242x_sram_ddr_init_sz)
- 	.word	. - omap242x_sram_ddr_init
- 
-@@ -224,7 +224,7 @@ omap242x_srs_prcm_voltctrl:
- ddr_prcm_mask_val:
- 	.word 0xFFFF3FFC
- omap242x_srs_timer_32ksynct:
--	.word OMAP2_IO_ADDRESS(OMAP2420_32KSYNCT_BASE + 0x010)
-+	.word OMAP2_L4_IO_ADDRESS(OMAP2420_32KSYNCT_BASE + 0x010)
- 
- ENTRY(omap242x_sram_reprogram_sdrc_sz)
- 	.word	. - omap242x_sram_reprogram_sdrc
---- a/arch/arm/mach-omap2/sram243x.S
-+++ b/arch/arm/mach-omap2/sram243x.S
-@@ -128,7 +128,7 @@ omap243x_sdi_prcm_voltctrl:
- prcm_mask_val:
- 	.word 0xFFFF3FFC
- omap243x_sdi_timer_32ksynct_cr:
--	.word OMAP2_IO_ADDRESS(OMAP2430_32KSYNCT_BASE + 0x010)
-+	.word OMAP2_L4_IO_ADDRESS(OMAP2430_32KSYNCT_BASE + 0x010)
- ENTRY(omap243x_sram_ddr_init_sz)
- 	.word	. - omap243x_sram_ddr_init
- 
-@@ -224,7 +224,7 @@ omap243x_srs_prcm_voltctrl:
- ddr_prcm_mask_val:
- 	.word 0xFFFF3FFC
- omap243x_srs_timer_32ksynct:
--	.word OMAP2_IO_ADDRESS(OMAP2430_32KSYNCT_BASE + 0x010)
-+	.word OMAP2_L4_IO_ADDRESS(OMAP2430_32KSYNCT_BASE + 0x010)
- 
- ENTRY(omap243x_sram_reprogram_sdrc_sz)
- 	.word	. - omap243x_sram_reprogram_sdrc
---- a/arch/arm/mach-omap2/timer-gp.c
-+++ b/arch/arm/mach-omap2/timer-gp.c
-@@ -231,7 +231,8 @@ static void __init omap2_gp_clocksource_
- static void __init omap2_gp_timer_init(void)
- {
- #ifdef CONFIG_LOCAL_TIMERS
--	twd_base = OMAP2_IO_ADDRESS(OMAP44XX_LOCAL_TWD_BASE);
-+	twd_base = ioremap(OMAP44XX_LOCAL_TWD_BASE, SZ_256);
-+	BUG_ON(!twd_base);
- #endif
- 	omap_dm_timer_init();
- 
---- /dev/null
-+++ b/arch/arm/mach-omap2/usb-ehci.c
-@@ -0,0 +1,192 @@
-+/*
-+ * linux/arch/arm/mach-omap2/usb-ehci.c
-+ *
-+ * This file will contain the board specific details for the
-+ * Synopsys EHCI host controller on OMAP3430
-+ *
-+ * Copyright (C) 2007 Texas Instruments
-+ * Author: Vikram Pandita <vikram.pandita@ti.com>
-+ *
-+ * Generalization by:
-+ * Felipe Balbi <felipe.balbi@nokia.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.
-+ */
-+
-+#include <linux/types.h>
-+#include <linux/errno.h>
-+#include <linux/delay.h>
-+#include <linux/platform_device.h>
-+#include <linux/clk.h>
-+#include <asm/io.h>
-+#include <mach/mux.h>
-+
-+#include <mach/hardware.h>
-+#include <mach/irqs.h>
-+#include <mach/usb.h>
-+
-+#if defined(CONFIG_USB_EHCI_HCD) || defined(CONFIG_USB_EHCI_HCD_MODULE)
-+
-+static struct resource ehci_resources[] = {
-+	{
-+		.start	= OMAP34XX_EHCI_BASE,
-+		.end	= OMAP34XX_EHCI_BASE + SZ_1K - 1,
-+		.flags	= IORESOURCE_MEM,
-+	},
-+	{
-+		.start	= OMAP34XX_UHH_CONFIG_BASE,
-+		.end	= OMAP34XX_UHH_CONFIG_BASE + SZ_1K - 1,
-+		.flags	= IORESOURCE_MEM,
-+	},
-+	{
-+		.start	= OMAP34XX_USBTLL_BASE,
-+		.end	= OMAP34XX_USBTLL_BASE + SZ_4K - 1,
-+		.flags	= IORESOURCE_MEM,
-+	},
-+	{         /* general IRQ */
-+		.start   = INT_34XX_EHCI_IRQ,
-+		.flags   = IORESOURCE_IRQ,
-+	}
-+};
-+
-+static u64 ehci_dmamask = ~(u32)0;
-+static struct platform_device ehci_device = {
-+	.name           = "ehci-omap",
-+	.id             = 0,
-+	.dev = {
-+		.dma_mask               = &ehci_dmamask,
-+		.coherent_dma_mask      = 0xffffffff,
-+		.platform_data          = NULL,
-+	},
-+	.num_resources  = ARRAY_SIZE(ehci_resources),
-+	.resource       = ehci_resources,
-+};
-+
-+/* MUX settings for EHCI pins */
-+/*
-+ * setup_ehci_io_mux - initialize IO pad mux for USBHOST
-+ */
-+static void setup_ehci_io_mux(enum ehci_hcd_omap_mode *port_mode)
-+{
-+	switch (port_mode[0]) {
-+	case EHCI_HCD_OMAP_MODE_PHY:
-+		omap_cfg_reg(Y9_3430_USB1HS_PHY_STP);
-+		omap_cfg_reg(Y8_3430_USB1HS_PHY_CLK);
-+		omap_cfg_reg(AA14_3430_USB1HS_PHY_DIR);
-+		omap_cfg_reg(AA11_3430_USB1HS_PHY_NXT);
-+		omap_cfg_reg(W13_3430_USB1HS_PHY_DATA0);
-+		omap_cfg_reg(W12_3430_USB1HS_PHY_DATA1);
-+		omap_cfg_reg(W11_3430_USB1HS_PHY_DATA2);
-+		omap_cfg_reg(Y11_3430_USB1HS_PHY_DATA3);
-+		omap_cfg_reg(W9_3430_USB1HS_PHY_DATA4);
-+		omap_cfg_reg(Y12_3430_USB1HS_PHY_DATA5);
-+		omap_cfg_reg(W8_3430_USB1HS_PHY_DATA6);
-+		omap_cfg_reg(Y13_3430_USB1HS_PHY_DATA7);
-+		break;
-+	case EHCI_HCD_OMAP_MODE_TLL:
-+		omap_cfg_reg(Y9_3430_USB1HS_TLL_STP);
-+		omap_cfg_reg(Y8_3430_USB1HS_TLL_CLK);
-+		omap_cfg_reg(AA14_3430_USB1HS_TLL_DIR);
-+		omap_cfg_reg(AA11_3430_USB1HS_TLL_NXT);
-+		omap_cfg_reg(W13_3430_USB1HS_TLL_DATA0);
-+		omap_cfg_reg(W12_3430_USB1HS_TLL_DATA1);
-+		omap_cfg_reg(W11_3430_USB1HS_TLL_DATA2);
-+		omap_cfg_reg(Y11_3430_USB1HS_TLL_DATA3);
-+		omap_cfg_reg(W9_3430_USB1HS_TLL_DATA4);
-+		omap_cfg_reg(Y12_3430_USB1HS_TLL_DATA5);
-+		omap_cfg_reg(W8_3430_USB1HS_TLL_DATA6);
-+		omap_cfg_reg(Y13_3430_USB1HS_TLL_DATA7);
-+		break;
-+	case EHCI_HCD_OMAP_MODE_UNKNOWN:
-+		/* FALLTHROUGH */
-+	default:
-+		break;
-+	}
-+
-+	switch (port_mode[1]) {
-+	case EHCI_HCD_OMAP_MODE_PHY:
-+		omap_cfg_reg(AA10_3430_USB2HS_PHY_STP);
-+		omap_cfg_reg(AA8_3430_USB2HS_PHY_CLK);
-+		omap_cfg_reg(AA9_3430_USB2HS_PHY_DIR);
-+		omap_cfg_reg(AB11_3430_USB2HS_PHY_NXT);
-+		omap_cfg_reg(AB10_3430_USB2HS_PHY_DATA0);
-+		omap_cfg_reg(AB9_3430_USB2HS_PHY_DATA1);
-+		omap_cfg_reg(W3_3430_USB2HS_PHY_DATA2);
-+		omap_cfg_reg(T4_3430_USB2HS_PHY_DATA3);
-+		omap_cfg_reg(T3_3430_USB2HS_PHY_DATA4);
-+		omap_cfg_reg(R3_3430_USB2HS_PHY_DATA5);
-+		omap_cfg_reg(R4_3430_USB2HS_PHY_DATA6);
-+		omap_cfg_reg(T2_3430_USB2HS_PHY_DATA7);
-+		break;
-+	case EHCI_HCD_OMAP_MODE_TLL:
-+		omap_cfg_reg(AA10_3430_USB2HS_TLL_STP);
-+		omap_cfg_reg(AA8_3430_USB2HS_TLL_CLK);
-+		omap_cfg_reg(AA9_3430_USB2HS_TLL_DIR);
-+		omap_cfg_reg(AB11_3430_USB2HS_TLL_NXT);
-+		omap_cfg_reg(AB10_3430_USB2HS_TLL_DATA0);
-+		omap_cfg_reg(AB9_3430_USB2HS_TLL_DATA1);
-+		omap_cfg_reg(W3_3430_USB2HS_TLL_DATA2);
-+		omap_cfg_reg(T4_3430_USB2HS_TLL_DATA3);
-+		omap_cfg_reg(T3_3430_USB2HS_TLL_DATA4);
-+		omap_cfg_reg(R3_3430_USB2HS_TLL_DATA5);
-+		omap_cfg_reg(R4_3430_USB2HS_TLL_DATA6);
-+		omap_cfg_reg(T2_3430_USB2HS_TLL_DATA7);
-+		break;
-+	case EHCI_HCD_OMAP_MODE_UNKNOWN:
-+		/* FALLTHROUGH */
-+	default:
-+		break;
-+	}
-+
-+	switch (port_mode[2]) {
-+	case EHCI_HCD_OMAP_MODE_PHY:
-+		printk(KERN_WARNING "Port3 can't be used in PHY mode\n");
-+		break;
-+	case EHCI_HCD_OMAP_MODE_TLL:
-+		omap_cfg_reg(AB3_3430_USB3HS_TLL_STP);
-+		omap_cfg_reg(AA6_3430_USB3HS_TLL_CLK);
-+		omap_cfg_reg(AA3_3430_USB3HS_TLL_DIR);
-+		omap_cfg_reg(Y3_3430_USB3HS_TLL_NXT);
-+		omap_cfg_reg(AA5_3430_USB3HS_TLL_DATA0);
-+		omap_cfg_reg(Y4_3430_USB3HS_TLL_DATA1);
-+		omap_cfg_reg(Y5_3430_USB3HS_TLL_DATA2);
-+		omap_cfg_reg(W5_3430_USB3HS_TLL_DATA3);
-+		omap_cfg_reg(AB12_3430_USB3HS_TLL_DATA4);
-+		omap_cfg_reg(AB13_3430_USB3HS_TLL_DATA5);
-+		omap_cfg_reg(AA13_3430_USB3HS_TLL_DATA6);
-+		omap_cfg_reg(AA12_3430_USB3HS_TLL_DATA7);
-+		break;
-+	case EHCI_HCD_OMAP_MODE_UNKNOWN:
-+		/* FALLTHROUGH */
-+	default:
-+		break;
-+	}
-+
-+	return;
-+}
-+
-+void __init usb_ehci_init(struct ehci_hcd_omap_platform_data *pdata)
-+{
-+	platform_device_add_data(&ehci_device, pdata, sizeof(*pdata));
-+
-+	/* Setup Pin IO MUX for EHCI */
-+	if (cpu_is_omap34xx())
-+		setup_ehci_io_mux(pdata->port_mode);
-+
-+	if (platform_device_register(&ehci_device) < 0) {
-+		printk(KERN_ERR "Unable to register HS-USB (EHCI) device\n");
-+		return;
-+	}
-+}
-+
-+#else
-+
-+void __init usb_ehci_init(struct ehci_hcd_omap_platform_data *pdata)
-+
-+{
-+}
-+
-+#endif /* CONFIG_USB_EHCI_HCD */
-+
---- a/arch/arm/plat-omap/common.c
-+++ b/arch/arm/plat-omap/common.c
-@@ -224,12 +224,12 @@ static void __init __omap2_set_globals(s
- 
- static struct omap_globals omap242x_globals = {
- 	.class	= OMAP242X_CLASS,
--	.tap	= OMAP2_IO_ADDRESS(0x48014000),
--	.sdrc	= OMAP2_IO_ADDRESS(OMAP2420_SDRC_BASE),
--	.sms	= OMAP2_IO_ADDRESS(OMAP2420_SMS_BASE),
--	.ctrl	= OMAP2_IO_ADDRESS(OMAP2420_CTRL_BASE),
--	.prm	= OMAP2_IO_ADDRESS(OMAP2420_PRM_BASE),
--	.cm	= OMAP2_IO_ADDRESS(OMAP2420_CM_BASE),
-+	.tap	= OMAP2_L4_IO_ADDRESS(0x48014000),
-+	.sdrc	= OMAP2_L3_IO_ADDRESS(OMAP2420_SDRC_BASE),
-+	.sms	= OMAP2_L3_IO_ADDRESS(OMAP2420_SMS_BASE),
-+	.ctrl	= OMAP2_L4_IO_ADDRESS(OMAP2420_CTRL_BASE),
-+	.prm	= OMAP2_L4_IO_ADDRESS(OMAP2420_PRM_BASE),
-+	.cm	= OMAP2_L4_IO_ADDRESS(OMAP2420_CM_BASE),
- };
- 
- void __init omap2_set_globals_242x(void)
-@@ -242,12 +242,12 @@ void __init omap2_set_globals_242x(void)
- 
- static struct omap_globals omap243x_globals = {
- 	.class	= OMAP243X_CLASS,
--	.tap	= OMAP2_IO_ADDRESS(0x4900a000),
--	.sdrc	= OMAP2_IO_ADDRESS(OMAP243X_SDRC_BASE),
--	.sms	= OMAP2_IO_ADDRESS(OMAP243X_SMS_BASE),
--	.ctrl	= OMAP2_IO_ADDRESS(OMAP243X_CTRL_BASE),
--	.prm	= OMAP2_IO_ADDRESS(OMAP2430_PRM_BASE),
--	.cm	= OMAP2_IO_ADDRESS(OMAP2430_CM_BASE),
-+	.tap	= OMAP2_L4_IO_ADDRESS(0x4900a000),
-+	.sdrc	= OMAP2_L3_IO_ADDRESS(OMAP243X_SDRC_BASE),
-+	.sms	= OMAP2_L3_IO_ADDRESS(OMAP243X_SMS_BASE),
-+	.ctrl	= OMAP2_L4_IO_ADDRESS(OMAP243X_CTRL_BASE),
-+	.prm	= OMAP2_L4_IO_ADDRESS(OMAP2430_PRM_BASE),
-+	.cm	= OMAP2_L4_IO_ADDRESS(OMAP2430_CM_BASE),
- };
- 
- void __init omap2_set_globals_243x(void)
-@@ -260,12 +260,12 @@ void __init omap2_set_globals_243x(void)
- 
- static struct omap_globals omap343x_globals = {
- 	.class	= OMAP343X_CLASS,
--	.tap	= OMAP2_IO_ADDRESS(0x4830A000),
--	.sdrc	= OMAP2_IO_ADDRESS(OMAP343X_SDRC_BASE),
--	.sms	= OMAP2_IO_ADDRESS(OMAP343X_SMS_BASE),
--	.ctrl	= OMAP2_IO_ADDRESS(OMAP343X_CTRL_BASE),
--	.prm	= OMAP2_IO_ADDRESS(OMAP3430_PRM_BASE),
--	.cm	= OMAP2_IO_ADDRESS(OMAP3430_CM_BASE),
-+	.tap	= OMAP2_L4_IO_ADDRESS(0x4830A000),
-+	.sdrc	= OMAP2_L3_IO_ADDRESS(OMAP343X_SDRC_BASE),
-+	.sms	= OMAP2_L3_IO_ADDRESS(OMAP343X_SMS_BASE),
-+	.ctrl	= OMAP2_L4_IO_ADDRESS(OMAP343X_CTRL_BASE),
-+	.prm	= OMAP2_L4_IO_ADDRESS(OMAP3430_PRM_BASE),
-+	.cm	= OMAP2_L4_IO_ADDRESS(OMAP3430_CM_BASE),
- };
- 
- void __init omap2_set_globals_343x(void)
-@@ -277,10 +277,10 @@ void __init omap2_set_globals_343x(void)
- #if defined(CONFIG_ARCH_OMAP4)
- static struct omap_globals omap4_globals = {
- 	.class	= OMAP443X_CLASS,
--	.tap	= OMAP2_IO_ADDRESS(0x4830a000),
--	.ctrl	= OMAP2_IO_ADDRESS(OMAP443X_CTRL_BASE),
--	.prm	= OMAP2_IO_ADDRESS(OMAP4430_PRM_BASE),
--	.cm	= OMAP2_IO_ADDRESS(OMAP4430_CM_BASE),
-+	.tap	= OMAP2_L4_IO_ADDRESS(0x4830a000),
-+	.ctrl	= OMAP2_L4_IO_ADDRESS(OMAP443X_CTRL_BASE),
-+	.prm	= OMAP2_L4_IO_ADDRESS(OMAP4430_PRM_BASE),
-+	.cm	= OMAP2_L4_IO_ADDRESS(OMAP4430_CM_BASE),
- };
- 
- void __init omap2_set_globals_443x(void)
---- a/arch/arm/plat-omap/devices.c
-+++ b/arch/arm/plat-omap/devices.c
-@@ -113,17 +113,17 @@ static void omap_init_kp(void)
- 		omap_cfg_reg(E19_1610_KBR4);
- 		omap_cfg_reg(N19_1610_KBR5);
- 	} else if (machine_is_omap_perseus2() || machine_is_omap_fsample()) {
--		omap_cfg_reg(E2_730_KBR0);
--		omap_cfg_reg(J7_730_KBR1);
--		omap_cfg_reg(E1_730_KBR2);
--		omap_cfg_reg(F3_730_KBR3);
--		omap_cfg_reg(D2_730_KBR4);
--
--		omap_cfg_reg(C2_730_KBC0);
--		omap_cfg_reg(D3_730_KBC1);
--		omap_cfg_reg(E4_730_KBC2);
--		omap_cfg_reg(F4_730_KBC3);
--		omap_cfg_reg(E3_730_KBC4);
-+		omap_cfg_reg(E2_7XX_KBR0);
-+		omap_cfg_reg(J7_7XX_KBR1);
-+		omap_cfg_reg(E1_7XX_KBR2);
-+		omap_cfg_reg(F3_7XX_KBR3);
-+		omap_cfg_reg(D2_7XX_KBR4);
-+
-+		omap_cfg_reg(C2_7XX_KBC0);
-+		omap_cfg_reg(D3_7XX_KBC1);
-+		omap_cfg_reg(E4_7XX_KBC2);
-+		omap_cfg_reg(F4_7XX_KBC3);
-+		omap_cfg_reg(E3_7XX_KBC4);
- 	} else if (machine_is_omap_h4()) {
- 		omap_cfg_reg(T19_24XX_KBR0);
- 		omap_cfg_reg(R19_24XX_KBR1);
---- a/arch/arm/plat-omap/dma.c
-+++ b/arch/arm/plat-omap/dma.c
-@@ -2359,40 +2359,46 @@ EXPORT_SYMBOL(omap_stop_lcd_dma);
- 
- static int __init omap_init_dma(void)
- {
-+	unsigned long base;
- 	int ch, r;
- 
- 	if (cpu_class_is_omap1()) {
--		omap_dma_base = OMAP1_IO_ADDRESS(OMAP1_DMA_BASE);
-+		base = OMAP1_DMA_BASE;
- 		dma_lch_count = OMAP1_LOGICAL_DMA_CH_COUNT;
- 	} else if (cpu_is_omap24xx()) {
--		omap_dma_base = OMAP2_IO_ADDRESS(OMAP24XX_DMA4_BASE);
-+		base = OMAP24XX_DMA4_BASE;
- 		dma_lch_count = OMAP_DMA4_LOGICAL_DMA_CH_COUNT;
- 	} else if (cpu_is_omap34xx()) {
--		omap_dma_base = OMAP2_IO_ADDRESS(OMAP34XX_DMA4_BASE);
-+		base = OMAP34XX_DMA4_BASE;
- 		dma_lch_count = OMAP_DMA4_LOGICAL_DMA_CH_COUNT;
- 	} else if (cpu_is_omap44xx()) {
--		omap_dma_base = OMAP2_IO_ADDRESS(OMAP44XX_DMA4_BASE);
-+		base = OMAP44XX_DMA4_BASE;
- 		dma_lch_count = OMAP_DMA4_LOGICAL_DMA_CH_COUNT;
- 	} else {
- 		pr_err("DMA init failed for unsupported omap\n");
- 		return -ENODEV;
- 	}
- 
-+	omap_dma_base = ioremap(base, SZ_4K);
-+	BUG_ON(!omap_dma_base);
-+
- 	if (cpu_class_is_omap2() && omap_dma_reserve_channels
- 			&& (omap_dma_reserve_channels <= dma_lch_count))
- 		dma_lch_count = omap_dma_reserve_channels;
- 
- 	dma_chan = kzalloc(sizeof(struct omap_dma_lch) * dma_lch_count,
- 				GFP_KERNEL);
--	if (!dma_chan)
--		return -ENOMEM;
-+	if (!dma_chan) {
-+		r = -ENOMEM;
-+		goto out_unmap;
-+	}
- 
- 	if (cpu_class_is_omap2()) {
- 		dma_linked_lch = kzalloc(sizeof(struct dma_link_info) *
- 						dma_lch_count, GFP_KERNEL);
- 		if (!dma_linked_lch) {
--			kfree(dma_chan);
--			return -ENOMEM;
-+			r = -ENOMEM;
-+			goto out_free;
- 		}
- 	}
- 
-@@ -2466,7 +2472,7 @@ static int __init omap_init_dma(void)
- 				for (i = 0; i < ch; i++)
- 					free_irq(omap1_dma_irq[i],
- 						 (void *) (i + 1));
--				return r;
-+				goto out_free;
- 			}
- 		}
- 	}
-@@ -2508,11 +2514,19 @@ static int __init omap_init_dma(void)
- 			       "(error %d)\n", r);
- 			for (i = 0; i < dma_chan_count; i++)
- 				free_irq(omap1_dma_irq[i], (void *) (i + 1));
--			return r;
-+			goto out_free;
- 		}
- 	}
- 
- 	return 0;
-+
-+out_free:
-+	kfree(dma_chan);
-+
-+out_unmap:
-+	iounmap(omap_dma_base);
-+
-+	return r;
- }
- 
- arch_initcall(omap_init_dma);
---- a/arch/arm/plat-omap/dmtimer.c
-+++ b/arch/arm/plat-omap/dmtimer.c
-@@ -742,16 +742,17 @@ EXPORT_SYMBOL_GPL(omap_dm_timers_active)
- int __init omap_dm_timer_init(void)
- {
- 	struct omap_dm_timer *timer;
--	int i;
-+	int i, map_size = SZ_8K;	/* Module 4KB + L4 4KB except on omap1 */
- 
- 	if (!(cpu_is_omap16xx() || cpu_class_is_omap2()))
- 		return -ENODEV;
- 
- 	spin_lock_init(&dm_timer_lock);
- 
--	if (cpu_class_is_omap1())
-+	if (cpu_class_is_omap1()) {
- 		dm_timers = omap1_dm_timers;
--	else if (cpu_is_omap24xx()) {
-+		map_size = SZ_2K;
-+	} else if (cpu_is_omap24xx()) {
- 		dm_timers = omap2_dm_timers;
- 		dm_source_names = omap2_dm_source_names;
- 		dm_source_clocks = omap2_dm_source_clocks;
-@@ -774,10 +775,11 @@ int __init omap_dm_timer_init(void)
- 
- 	for (i = 0; i < dm_timer_count; i++) {
- 		timer = &dm_timers[i];
--		if (cpu_class_is_omap1())
--			timer->io_base = OMAP1_IO_ADDRESS(timer->phys_base);
--		else
--			timer->io_base = OMAP2_IO_ADDRESS(timer->phys_base);
-+
-+		/* Static mapping, never released */
-+		timer->io_base = ioremap(timer->phys_base, map_size);
-+		BUG_ON(!timer->io_base);
-+
- #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \
- 					defined(CONFIG_ARCH_OMAP4)
- 		if (cpu_class_is_omap2()) {
---- a/arch/arm/plat-omap/gpio.c
-+++ b/arch/arm/plat-omap/gpio.c
-@@ -31,7 +31,7 @@
- /*
-  * OMAP1510 GPIO registers
-  */
--#define OMAP1510_GPIO_BASE		OMAP1_IO_ADDRESS(0xfffce000)
-+#define OMAP1510_GPIO_BASE		0xfffce000
- #define OMAP1510_GPIO_DATA_INPUT	0x00
- #define OMAP1510_GPIO_DATA_OUTPUT	0x04
- #define OMAP1510_GPIO_DIR_CONTROL	0x08
-@@ -45,10 +45,10 @@
- /*
-  * OMAP1610 specific GPIO registers
-  */
--#define OMAP1610_GPIO1_BASE		OMAP1_IO_ADDRESS(0xfffbe400)
--#define OMAP1610_GPIO2_BASE		OMAP1_IO_ADDRESS(0xfffbec00)
--#define OMAP1610_GPIO3_BASE		OMAP1_IO_ADDRESS(0xfffbb400)
--#define OMAP1610_GPIO4_BASE		OMAP1_IO_ADDRESS(0xfffbbc00)
-+#define OMAP1610_GPIO1_BASE		0xfffbe400
-+#define OMAP1610_GPIO2_BASE		0xfffbec00
-+#define OMAP1610_GPIO3_BASE		0xfffbb400
-+#define OMAP1610_GPIO4_BASE		0xfffbbc00
- #define OMAP1610_GPIO_REVISION		0x0000
- #define OMAP1610_GPIO_SYSCONFIG		0x0010
- #define OMAP1610_GPIO_SYSSTATUS		0x0014
-@@ -68,52 +68,36 @@
- #define OMAP1610_GPIO_SET_DATAOUT	0x00f0
- 
- /*
-- * OMAP730 specific GPIO registers
-+ * OMAP7XX specific GPIO registers
-  */
--#define OMAP730_GPIO1_BASE		OMAP1_IO_ADDRESS(0xfffbc000)
--#define OMAP730_GPIO2_BASE		OMAP1_IO_ADDRESS(0xfffbc800)
--#define OMAP730_GPIO3_BASE		OMAP1_IO_ADDRESS(0xfffbd000)
--#define OMAP730_GPIO4_BASE		OMAP1_IO_ADDRESS(0xfffbd800)
--#define OMAP730_GPIO5_BASE		OMAP1_IO_ADDRESS(0xfffbe000)
--#define OMAP730_GPIO6_BASE		OMAP1_IO_ADDRESS(0xfffbe800)
--#define OMAP730_GPIO_DATA_INPUT		0x00
--#define OMAP730_GPIO_DATA_OUTPUT	0x04
--#define OMAP730_GPIO_DIR_CONTROL	0x08
--#define OMAP730_GPIO_INT_CONTROL	0x0c
--#define OMAP730_GPIO_INT_MASK		0x10
--#define OMAP730_GPIO_INT_STATUS		0x14
-+#define OMAP7XX_GPIO1_BASE		0xfffbc000
-+#define OMAP7XX_GPIO2_BASE		0xfffbc800
-+#define OMAP7XX_GPIO3_BASE		0xfffbd000
-+#define OMAP7XX_GPIO4_BASE		0xfffbd800
-+#define OMAP7XX_GPIO5_BASE		0xfffbe000
-+#define OMAP7XX_GPIO6_BASE		0xfffbe800
-+#define OMAP7XX_GPIO_DATA_INPUT		0x00
-+#define OMAP7XX_GPIO_DATA_OUTPUT	0x04
-+#define OMAP7XX_GPIO_DIR_CONTROL	0x08
-+#define OMAP7XX_GPIO_INT_CONTROL	0x0c
-+#define OMAP7XX_GPIO_INT_MASK		0x10
-+#define OMAP7XX_GPIO_INT_STATUS		0x14
- 
--/*
-- * OMAP850 specific GPIO registers
-- */
--#define OMAP850_GPIO1_BASE		OMAP1_IO_ADDRESS(0xfffbc000)
--#define OMAP850_GPIO2_BASE		OMAP1_IO_ADDRESS(0xfffbc800)
--#define OMAP850_GPIO3_BASE		OMAP1_IO_ADDRESS(0xfffbd000)
--#define OMAP850_GPIO4_BASE		OMAP1_IO_ADDRESS(0xfffbd800)
--#define OMAP850_GPIO5_BASE		OMAP1_IO_ADDRESS(0xfffbe000)
--#define OMAP850_GPIO6_BASE		OMAP1_IO_ADDRESS(0xfffbe800)
--#define OMAP850_GPIO_DATA_INPUT		0x00
--#define OMAP850_GPIO_DATA_OUTPUT	0x04
--#define OMAP850_GPIO_DIR_CONTROL	0x08
--#define OMAP850_GPIO_INT_CONTROL	0x0c
--#define OMAP850_GPIO_INT_MASK		0x10
--#define OMAP850_GPIO_INT_STATUS		0x14
--
--#define OMAP1_MPUIO_VBASE		OMAP1_IO_ADDRESS(OMAP1_MPUIO_BASE)
-+#define OMAP1_MPUIO_VBASE		OMAP1_MPUIO_BASE
- 
- /*
-  * omap24xx specific GPIO registers
-  */
--#define OMAP242X_GPIO1_BASE		OMAP2_IO_ADDRESS(0x48018000)
--#define OMAP242X_GPIO2_BASE		OMAP2_IO_ADDRESS(0x4801a000)
--#define OMAP242X_GPIO3_BASE		OMAP2_IO_ADDRESS(0x4801c000)
--#define OMAP242X_GPIO4_BASE		OMAP2_IO_ADDRESS(0x4801e000)
--
--#define OMAP243X_GPIO1_BASE		OMAP2_IO_ADDRESS(0x4900C000)
--#define OMAP243X_GPIO2_BASE		OMAP2_IO_ADDRESS(0x4900E000)
--#define OMAP243X_GPIO3_BASE		OMAP2_IO_ADDRESS(0x49010000)
--#define OMAP243X_GPIO4_BASE		OMAP2_IO_ADDRESS(0x49012000)
--#define OMAP243X_GPIO5_BASE		OMAP2_IO_ADDRESS(0x480B6000)
-+#define OMAP242X_GPIO1_BASE		0x48018000
-+#define OMAP242X_GPIO2_BASE		0x4801a000
-+#define OMAP242X_GPIO3_BASE		0x4801c000
-+#define OMAP242X_GPIO4_BASE		0x4801e000
-+
-+#define OMAP243X_GPIO1_BASE		0x4900C000
-+#define OMAP243X_GPIO2_BASE		0x4900E000
-+#define OMAP243X_GPIO3_BASE		0x49010000
-+#define OMAP243X_GPIO4_BASE		0x49012000
-+#define OMAP243X_GPIO5_BASE		0x480B6000
- 
- #define OMAP24XX_GPIO_REVISION		0x0000
- #define OMAP24XX_GPIO_SYSCONFIG		0x0010
-@@ -170,24 +154,25 @@
-  * omap34xx specific GPIO registers
-  */
- 
--#define OMAP34XX_GPIO1_BASE		OMAP2_IO_ADDRESS(0x48310000)
--#define OMAP34XX_GPIO2_BASE		OMAP2_IO_ADDRESS(0x49050000)
--#define OMAP34XX_GPIO3_BASE		OMAP2_IO_ADDRESS(0x49052000)
--#define OMAP34XX_GPIO4_BASE		OMAP2_IO_ADDRESS(0x49054000)
--#define OMAP34XX_GPIO5_BASE		OMAP2_IO_ADDRESS(0x49056000)
--#define OMAP34XX_GPIO6_BASE		OMAP2_IO_ADDRESS(0x49058000)
-+#define OMAP34XX_GPIO1_BASE		0x48310000
-+#define OMAP34XX_GPIO2_BASE		0x49050000
-+#define OMAP34XX_GPIO3_BASE		0x49052000
-+#define OMAP34XX_GPIO4_BASE		0x49054000
-+#define OMAP34XX_GPIO5_BASE		0x49056000
-+#define OMAP34XX_GPIO6_BASE		0x49058000
- 
- /*
-  * OMAP44XX  specific GPIO registers
-  */
--#define OMAP44XX_GPIO1_BASE             OMAP2_IO_ADDRESS(0x4a310000)
--#define OMAP44XX_GPIO2_BASE             OMAP2_IO_ADDRESS(0x48055000)
--#define OMAP44XX_GPIO3_BASE             OMAP2_IO_ADDRESS(0x48057000)
--#define OMAP44XX_GPIO4_BASE             OMAP2_IO_ADDRESS(0x48059000)
--#define OMAP44XX_GPIO5_BASE             OMAP2_IO_ADDRESS(0x4805B000)
--#define OMAP44XX_GPIO6_BASE             OMAP2_IO_ADDRESS(0x4805D000)
-+#define OMAP44XX_GPIO1_BASE             0x4a310000
-+#define OMAP44XX_GPIO2_BASE             0x48055000
-+#define OMAP44XX_GPIO3_BASE             0x48057000
-+#define OMAP44XX_GPIO4_BASE             0x48059000
-+#define OMAP44XX_GPIO5_BASE             0x4805B000
-+#define OMAP44XX_GPIO6_BASE             0x4805D000
- 
- struct gpio_bank {
-+	unsigned long pbase;
- 	void __iomem *base;
- 	u16 irq;
- 	u16 virtual_irq_start;
-@@ -215,96 +200,111 @@ struct gpio_bank {
- #define METHOD_MPUIO		0
- #define METHOD_GPIO_1510	1
- #define METHOD_GPIO_1610	2
--#define METHOD_GPIO_730		3
--#define METHOD_GPIO_850		4
-+#define METHOD_GPIO_7XX		3
- #define METHOD_GPIO_24XX	5
- 
- #ifdef CONFIG_ARCH_OMAP16XX
- static struct gpio_bank gpio_bank_1610[5] = {
--	{ OMAP1_MPUIO_VBASE,    INT_MPUIO,	    IH_MPUIO_BASE,     METHOD_MPUIO},
--	{ OMAP1610_GPIO1_BASE, INT_GPIO_BANK1,	    IH_GPIO_BASE,      METHOD_GPIO_1610 },
--	{ OMAP1610_GPIO2_BASE, INT_1610_GPIO_BANK2, IH_GPIO_BASE + 16, METHOD_GPIO_1610 },
--	{ OMAP1610_GPIO3_BASE, INT_1610_GPIO_BANK3, IH_GPIO_BASE + 32, METHOD_GPIO_1610 },
--	{ OMAP1610_GPIO4_BASE, INT_1610_GPIO_BANK4, IH_GPIO_BASE + 48, METHOD_GPIO_1610 },
-+	{ OMAP1_MPUIO_VBASE, 0, INT_MPUIO, IH_MPUIO_BASE,
-+		METHOD_MPUIO },
-+	{ OMAP1610_GPIO1_BASE, 0, INT_GPIO_BANK1, IH_GPIO_BASE,
-+		METHOD_GPIO_1610 },
-+	{ OMAP1610_GPIO2_BASE, 0, INT_1610_GPIO_BANK2, IH_GPIO_BASE + 16,
-+		METHOD_GPIO_1610 },
-+	{ OMAP1610_GPIO3_BASE, 0, INT_1610_GPIO_BANK3, IH_GPIO_BASE + 32,
-+		METHOD_GPIO_1610 },
-+	{ OMAP1610_GPIO4_BASE, 0, INT_1610_GPIO_BANK4, IH_GPIO_BASE + 48,
-+		METHOD_GPIO_1610 },
- };
- #endif
- 
- #ifdef CONFIG_ARCH_OMAP15XX
- static struct gpio_bank gpio_bank_1510[2] = {
--	{ OMAP1_MPUIO_VBASE,   INT_MPUIO,      IH_MPUIO_BASE, METHOD_MPUIO },
--	{ OMAP1510_GPIO_BASE, INT_GPIO_BANK1, IH_GPIO_BASE,  METHOD_GPIO_1510 }
--};
--#endif
--
--#ifdef CONFIG_ARCH_OMAP730
--static struct gpio_bank gpio_bank_730[7] = {
--	{ OMAP1_MPUIO_VBASE,    INT_730_MPUIO,	    IH_MPUIO_BASE,	METHOD_MPUIO },
--	{ OMAP730_GPIO1_BASE,  INT_730_GPIO_BANK1,  IH_GPIO_BASE,	METHOD_GPIO_730 },
--	{ OMAP730_GPIO2_BASE,  INT_730_GPIO_BANK2,  IH_GPIO_BASE + 32,	METHOD_GPIO_730 },
--	{ OMAP730_GPIO3_BASE,  INT_730_GPIO_BANK3,  IH_GPIO_BASE + 64,	METHOD_GPIO_730 },
--	{ OMAP730_GPIO4_BASE,  INT_730_GPIO_BANK4,  IH_GPIO_BASE + 96,	METHOD_GPIO_730 },
--	{ OMAP730_GPIO5_BASE,  INT_730_GPIO_BANK5,  IH_GPIO_BASE + 128, METHOD_GPIO_730 },
--	{ OMAP730_GPIO6_BASE,  INT_730_GPIO_BANK6,  IH_GPIO_BASE + 160, METHOD_GPIO_730 },
-+	{ OMAP1_MPUIO_VBASE, 0, INT_MPUIO, IH_MPUIO_BASE,
-+		METHOD_MPUIO },
-+	{ OMAP1510_GPIO_BASE, 0, INT_GPIO_BANK1, IH_GPIO_BASE,
-+		METHOD_GPIO_1510 }
- };
- #endif
- 
--#ifdef CONFIG_ARCH_OMAP850
--static struct gpio_bank gpio_bank_850[7] = {
--	{ OMAP1_MPUIO_VBASE,     INT_850_MPUIO,	    IH_MPUIO_BASE,	METHOD_MPUIO },
--	{ OMAP850_GPIO1_BASE,  INT_850_GPIO_BANK1,  IH_GPIO_BASE,	METHOD_GPIO_850 },
--	{ OMAP850_GPIO2_BASE,  INT_850_GPIO_BANK2,  IH_GPIO_BASE + 32,	METHOD_GPIO_850 },
--	{ OMAP850_GPIO3_BASE,  INT_850_GPIO_BANK3,  IH_GPIO_BASE + 64,	METHOD_GPIO_850 },
--	{ OMAP850_GPIO4_BASE,  INT_850_GPIO_BANK4,  IH_GPIO_BASE + 96,	METHOD_GPIO_850 },
--	{ OMAP850_GPIO5_BASE,  INT_850_GPIO_BANK5,  IH_GPIO_BASE + 128, METHOD_GPIO_850 },
--	{ OMAP850_GPIO6_BASE,  INT_850_GPIO_BANK6,  IH_GPIO_BASE + 160, METHOD_GPIO_850 },
-+#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
-+static struct gpio_bank gpio_bank_7xx[7] = {
-+	{ OMAP1_MPUIO_VBASE, 0, INT_7XX_MPUIO, IH_MPUIO_BASE,
-+		METHOD_MPUIO },
-+	{ OMAP7XX_GPIO1_BASE, 0, INT_7XX_GPIO_BANK1, IH_GPIO_BASE,
-+		METHOD_GPIO_7XX },
-+	{ OMAP7XX_GPIO2_BASE, 0, INT_7XX_GPIO_BANK2, IH_GPIO_BASE + 32,
-+		METHOD_GPIO_7XX },
-+	{ OMAP7XX_GPIO3_BASE, 0, INT_7XX_GPIO_BANK3, IH_GPIO_BASE + 64,
-+		METHOD_GPIO_7XX },
-+	{ OMAP7XX_GPIO4_BASE, 0, INT_7XX_GPIO_BANK4,  IH_GPIO_BASE + 96,
-+		METHOD_GPIO_7XX },
-+	{ OMAP7XX_GPIO5_BASE, 0, INT_7XX_GPIO_BANK5,  IH_GPIO_BASE + 128,
-+		METHOD_GPIO_7XX },
-+	{ OMAP7XX_GPIO6_BASE, 0, INT_7XX_GPIO_BANK6,  IH_GPIO_BASE + 160,
-+		METHOD_GPIO_7XX },
- };
- #endif
- 
--
- #ifdef CONFIG_ARCH_OMAP24XX
- 
- static struct gpio_bank gpio_bank_242x[4] = {
--	{ OMAP242X_GPIO1_BASE, INT_24XX_GPIO_BANK1, IH_GPIO_BASE,	METHOD_GPIO_24XX },
--	{ OMAP242X_GPIO2_BASE, INT_24XX_GPIO_BANK2, IH_GPIO_BASE + 32,	METHOD_GPIO_24XX },
--	{ OMAP242X_GPIO3_BASE, INT_24XX_GPIO_BANK3, IH_GPIO_BASE + 64,	METHOD_GPIO_24XX },
--	{ OMAP242X_GPIO4_BASE, INT_24XX_GPIO_BANK4, IH_GPIO_BASE + 96,	METHOD_GPIO_24XX },
-+	{ OMAP242X_GPIO1_BASE, 0, INT_24XX_GPIO_BANK1, IH_GPIO_BASE,
-+		METHOD_GPIO_24XX },
-+	{ OMAP242X_GPIO2_BASE, 0, INT_24XX_GPIO_BANK2, IH_GPIO_BASE + 32,
-+		METHOD_GPIO_24XX },
-+	{ OMAP242X_GPIO3_BASE, 0, INT_24XX_GPIO_BANK3, IH_GPIO_BASE + 64,
-+		METHOD_GPIO_24XX },
-+	{ OMAP242X_GPIO4_BASE, 0, INT_24XX_GPIO_BANK4, IH_GPIO_BASE + 96,
-+		METHOD_GPIO_24XX },
- };
- 
- static struct gpio_bank gpio_bank_243x[5] = {
--	{ OMAP243X_GPIO1_BASE, INT_24XX_GPIO_BANK1, IH_GPIO_BASE,	METHOD_GPIO_24XX },
--	{ OMAP243X_GPIO2_BASE, INT_24XX_GPIO_BANK2, IH_GPIO_BASE + 32,	METHOD_GPIO_24XX },
--	{ OMAP243X_GPIO3_BASE, INT_24XX_GPIO_BANK3, IH_GPIO_BASE + 64,	METHOD_GPIO_24XX },
--	{ OMAP243X_GPIO4_BASE, INT_24XX_GPIO_BANK4, IH_GPIO_BASE + 96,	METHOD_GPIO_24XX },
--	{ OMAP243X_GPIO5_BASE, INT_24XX_GPIO_BANK5, IH_GPIO_BASE + 128, METHOD_GPIO_24XX },
-+	{ OMAP243X_GPIO1_BASE, 0, INT_24XX_GPIO_BANK1, IH_GPIO_BASE,
-+		METHOD_GPIO_24XX },
-+	{ OMAP243X_GPIO2_BASE, 0, INT_24XX_GPIO_BANK2, IH_GPIO_BASE + 32,
-+		METHOD_GPIO_24XX },
-+	{ OMAP243X_GPIO3_BASE, 0, INT_24XX_GPIO_BANK3, IH_GPIO_BASE + 64,
-+		METHOD_GPIO_24XX },
-+	{ OMAP243X_GPIO4_BASE, 0, INT_24XX_GPIO_BANK4, IH_GPIO_BASE + 96,
-+		METHOD_GPIO_24XX },
-+	{ OMAP243X_GPIO5_BASE, 0, INT_24XX_GPIO_BANK5, IH_GPIO_BASE + 128,
-+		METHOD_GPIO_24XX },
- };
- 
- #endif
- 
- #ifdef CONFIG_ARCH_OMAP34XX
- static struct gpio_bank gpio_bank_34xx[6] = {
--	{ OMAP34XX_GPIO1_BASE, INT_34XX_GPIO_BANK1, IH_GPIO_BASE,	METHOD_GPIO_24XX },
--	{ OMAP34XX_GPIO2_BASE, INT_34XX_GPIO_BANK2, IH_GPIO_BASE + 32,	METHOD_GPIO_24XX },
--	{ OMAP34XX_GPIO3_BASE, INT_34XX_GPIO_BANK3, IH_GPIO_BASE + 64,	METHOD_GPIO_24XX },
--	{ OMAP34XX_GPIO4_BASE, INT_34XX_GPIO_BANK4, IH_GPIO_BASE + 96,	METHOD_GPIO_24XX },
--	{ OMAP34XX_GPIO5_BASE, INT_34XX_GPIO_BANK5, IH_GPIO_BASE + 128, METHOD_GPIO_24XX },
--	{ OMAP34XX_GPIO6_BASE, INT_34XX_GPIO_BANK6, IH_GPIO_BASE + 160, METHOD_GPIO_24XX },
-+	{ OMAP34XX_GPIO1_BASE, 0, INT_34XX_GPIO_BANK1, IH_GPIO_BASE,
-+		METHOD_GPIO_24XX },
-+	{ OMAP34XX_GPIO2_BASE, 0, INT_34XX_GPIO_BANK2, IH_GPIO_BASE + 32,
-+		METHOD_GPIO_24XX },
-+	{ OMAP34XX_GPIO3_BASE, 0, INT_34XX_GPIO_BANK3, IH_GPIO_BASE + 64,
-+		METHOD_GPIO_24XX },
-+	{ OMAP34XX_GPIO4_BASE, 0, INT_34XX_GPIO_BANK4, IH_GPIO_BASE + 96,
-+		METHOD_GPIO_24XX },
-+	{ OMAP34XX_GPIO5_BASE, 0, INT_34XX_GPIO_BANK5, IH_GPIO_BASE + 128,
-+		METHOD_GPIO_24XX },
-+	{ OMAP34XX_GPIO6_BASE, 0, INT_34XX_GPIO_BANK6, IH_GPIO_BASE + 160,
-+		METHOD_GPIO_24XX },
- };
- 
- #endif
- 
- #ifdef CONFIG_ARCH_OMAP4
- static struct gpio_bank gpio_bank_44xx[6] = {
--	{ OMAP44XX_GPIO1_BASE, INT_44XX_GPIO_BANK1, IH_GPIO_BASE,	\
-+	{ OMAP44XX_GPIO1_BASE, 0, INT_44XX_GPIO_BANK1, IH_GPIO_BASE,
- 		METHOD_GPIO_24XX },
--	{ OMAP44XX_GPIO2_BASE, INT_44XX_GPIO_BANK2, IH_GPIO_BASE + 32,	\
-+	{ OMAP44XX_GPIO2_BASE, 0, INT_44XX_GPIO_BANK2, IH_GPIO_BASE + 32,
- 		METHOD_GPIO_24XX },
--	{ OMAP44XX_GPIO3_BASE, INT_44XX_GPIO_BANK3, IH_GPIO_BASE + 64,	\
-+	{ OMAP44XX_GPIO3_BASE, 0, INT_44XX_GPIO_BANK3, IH_GPIO_BASE + 64,
- 		METHOD_GPIO_24XX },
--	{ OMAP44XX_GPIO4_BASE, INT_44XX_GPIO_BANK4, IH_GPIO_BASE + 96,	\
-+	{ OMAP44XX_GPIO4_BASE, 0, INT_44XX_GPIO_BANK4, IH_GPIO_BASE + 96,
- 		METHOD_GPIO_24XX },
--	{ OMAP44XX_GPIO5_BASE, INT_44XX_GPIO_BANK5, IH_GPIO_BASE + 128, \
-+	{ OMAP44XX_GPIO5_BASE, 0, INT_44XX_GPIO_BANK5, IH_GPIO_BASE + 128,
- 		METHOD_GPIO_24XX },
--	{ OMAP44XX_GPIO6_BASE, INT_44XX_GPIO_BANK6, IH_GPIO_BASE + 160, \
-+	{ OMAP44XX_GPIO6_BASE, 0, INT_44XX_GPIO_BANK6, IH_GPIO_BASE + 160,
- 		METHOD_GPIO_24XX },
- };
- 
-@@ -402,14 +402,9 @@ static void _set_gpio_direction(struct g
- 		reg += OMAP1610_GPIO_DIRECTION;
- 		break;
- #endif
--#ifdef CONFIG_ARCH_OMAP730
--	case METHOD_GPIO_730:
--		reg += OMAP730_GPIO_DIR_CONTROL;
--		break;
--#endif
--#ifdef CONFIG_ARCH_OMAP850
--	case METHOD_GPIO_850:
--		reg += OMAP850_GPIO_DIR_CONTROL;
-+#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
-+	case METHOD_GPIO_7XX:
-+		reg += OMAP7XX_GPIO_DIR_CONTROL;
- 		break;
- #endif
- #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
-@@ -469,19 +464,9 @@ static void _set_gpio_dataout(struct gpi
- 		l = 1 << gpio;
- 		break;
- #endif
--#ifdef CONFIG_ARCH_OMAP730
--	case METHOD_GPIO_730:
--		reg += OMAP730_GPIO_DATA_OUTPUT;
--		l = __raw_readl(reg);
--		if (enable)
--			l |= 1 << gpio;
--		else
--			l &= ~(1 << gpio);
--		break;
--#endif
--#ifdef CONFIG_ARCH_OMAP850
--	case METHOD_GPIO_850:
--		reg += OMAP850_GPIO_DATA_OUTPUT;
-+#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
-+	case METHOD_GPIO_7XX:
-+		reg += OMAP7XX_GPIO_DATA_OUTPUT;
- 		l = __raw_readl(reg);
- 		if (enable)
- 			l |= 1 << gpio;
-@@ -537,14 +522,9 @@ static int _get_gpio_datain(struct gpio_
- 		reg += OMAP1610_GPIO_DATAIN;
- 		break;
- #endif
--#ifdef CONFIG_ARCH_OMAP730
--	case METHOD_GPIO_730:
--		reg += OMAP730_GPIO_DATA_INPUT;
--		break;
--#endif
--#ifdef CONFIG_ARCH_OMAP850
--	case METHOD_GPIO_850:
--		reg += OMAP850_GPIO_DATA_INPUT;
-+#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
-+	case METHOD_GPIO_7XX:
-+		reg += OMAP7XX_GPIO_DATA_INPUT;
- 		break;
- #endif
- #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
-@@ -588,14 +568,9 @@ static int _get_gpio_dataout(struct gpio
- 		reg += OMAP1610_GPIO_DATAOUT;
- 		break;
- #endif
--#ifdef CONFIG_ARCH_OMAP730
--	case METHOD_GPIO_730:
--		reg += OMAP730_GPIO_DATA_OUTPUT;
--		break;
--#endif
--#ifdef CONFIG_ARCH_OMAP850
--	case METHOD_GPIO_850:
--		reg += OMAP850_GPIO_DATA_OUTPUT;
-+#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
-+	case METHOD_GPIO_7XX:
-+		reg += OMAP7XX_GPIO_DATA_OUTPUT;
- 		break;
- #endif
- #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \
-@@ -797,21 +772,9 @@ static int _set_gpio_triggering(struct g
- 			__raw_writel(1 << gpio, bank->base + OMAP1610_GPIO_CLEAR_WAKEUPENA);
- 		break;
- #endif
--#ifdef CONFIG_ARCH_OMAP730
--	case METHOD_GPIO_730:
--		reg += OMAP730_GPIO_INT_CONTROL;
--		l = __raw_readl(reg);
--		if (trigger & IRQ_TYPE_EDGE_RISING)
--			l |= 1 << gpio;
--		else if (trigger & IRQ_TYPE_EDGE_FALLING)
--			l &= ~(1 << gpio);
--		else
--			goto bad;
--		break;
--#endif
--#ifdef CONFIG_ARCH_OMAP850
--	case METHOD_GPIO_850:
--		reg += OMAP850_GPIO_INT_CONTROL;
-+#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
-+	case METHOD_GPIO_7XX:
-+		reg += OMAP7XX_GPIO_INT_CONTROL;
- 		l = __raw_readl(reg);
- 		if (trigger & IRQ_TYPE_EDGE_RISING)
- 			l |= 1 << gpio;
-@@ -897,14 +860,9 @@ static void _clear_gpio_irqbank(struct g
- 		reg += OMAP1610_GPIO_IRQSTATUS1;
- 		break;
- #endif
--#ifdef CONFIG_ARCH_OMAP730
--	case METHOD_GPIO_730:
--		reg += OMAP730_GPIO_INT_STATUS;
--		break;
--#endif
--#ifdef CONFIG_ARCH_OMAP850
--	case METHOD_GPIO_850:
--		reg += OMAP850_GPIO_INT_STATUS;
-+#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
-+	case METHOD_GPIO_7XX:
-+		reg += OMAP7XX_GPIO_INT_STATUS;
- 		break;
- #endif
- #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
-@@ -971,16 +929,9 @@ static u32 _get_gpio_irqbank_mask(struct
- 		mask = 0xffff;
- 		break;
- #endif
--#ifdef CONFIG_ARCH_OMAP730
--	case METHOD_GPIO_730:
--		reg += OMAP730_GPIO_INT_MASK;
--		mask = 0xffffffff;
--		inv = 1;
--		break;
--#endif
--#ifdef CONFIG_ARCH_OMAP850
--	case METHOD_GPIO_850:
--		reg += OMAP850_GPIO_INT_MASK;
-+#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
-+	case METHOD_GPIO_7XX:
-+		reg += OMAP7XX_GPIO_INT_MASK;
- 		mask = 0xffffffff;
- 		inv = 1;
- 		break;
-@@ -1044,19 +995,9 @@ static void _enable_gpio_irqbank(struct 
- 		l = gpio_mask;
- 		break;
- #endif
--#ifdef CONFIG_ARCH_OMAP730
--	case METHOD_GPIO_730:
--		reg += OMAP730_GPIO_INT_MASK;
--		l = __raw_readl(reg);
--		if (enable)
--			l &= ~(gpio_mask);
--		else
--			l |= gpio_mask;
--		break;
--#endif
--#ifdef CONFIG_ARCH_OMAP850
--	case METHOD_GPIO_850:
--		reg += OMAP850_GPIO_INT_MASK;
-+#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
-+	case METHOD_GPIO_7XX:
-+		reg += OMAP7XX_GPIO_INT_MASK;
- 		l = __raw_readl(reg);
- 		if (enable)
- 			l &= ~(gpio_mask);
-@@ -1249,13 +1190,9 @@ static void gpio_irq_handler(unsigned in
- 	if (bank->method == METHOD_GPIO_1610)
- 		isr_reg = bank->base + OMAP1610_GPIO_IRQSTATUS1;
- #endif
--#ifdef CONFIG_ARCH_OMAP730
--	if (bank->method == METHOD_GPIO_730)
--		isr_reg = bank->base + OMAP730_GPIO_INT_STATUS;
--#endif
--#ifdef CONFIG_ARCH_OMAP850
--	if (bank->method == METHOD_GPIO_850)
--		isr_reg = bank->base + OMAP850_GPIO_INT_STATUS;
-+#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
-+	if (bank->method == METHOD_GPIO_7XX)
-+		isr_reg = bank->base + OMAP7XX_GPIO_INT_STATUS;
- #endif
- #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
- 	if (bank->method == METHOD_GPIO_24XX)
-@@ -1524,11 +1461,8 @@ static int gpio_is_input(struct gpio_ban
- 	case METHOD_GPIO_1610:
- 		reg += OMAP1610_GPIO_DIRECTION;
- 		break;
--	case METHOD_GPIO_730:
--		reg += OMAP730_GPIO_DIR_CONTROL;
--		break;
--	case METHOD_GPIO_850:
--		reg += OMAP850_GPIO_DIR_CONTROL;
-+	case METHOD_GPIO_7XX:
-+		reg += OMAP7XX_GPIO_DIR_CONTROL;
- 		break;
- 	case METHOD_GPIO_24XX:
- 		reg += OMAP24XX_GPIO_OE;
-@@ -1607,6 +1541,23 @@ static struct clk * gpio5_fck;
- static struct clk *gpio_iclks[OMAP34XX_NR_GPIOS];
- #endif
- 
-+static void __init omap_gpio_show_rev(void)
-+{
-+	u32 rev;
-+
-+	if (cpu_is_omap16xx())
-+		rev = __raw_readw(gpio_bank[1].base + OMAP1610_GPIO_REVISION);
-+	else if (cpu_is_omap24xx() || cpu_is_omap34xx())
-+		rev = __raw_readl(gpio_bank[0].base + OMAP24XX_GPIO_REVISION);
-+	else if (cpu_is_omap44xx())
-+		rev = __raw_readl(gpio_bank[0].base + OMAP4_GPIO_REVISION);
-+	else
-+		return;
-+
-+	printk(KERN_INFO "OMAP GPIO hardware version %d.%d\n",
-+		(rev >> 4) & 0x0f, rev & 0x0f);
-+}
-+
- /* This lock class tells lockdep that GPIO irqs are in a different
-  * category than their parents, so it won't report false recursion.
-  */
-@@ -1617,6 +1568,7 @@ static int __init _omap_gpio_init(void)
- 	int i;
- 	int gpio = 0;
- 	struct gpio_bank *bank;
-+	int bank_size = SZ_8K;	/* Module 4KB + L4 4KB except on omap1 */
- 	char clk_name[11];
- 
- 	initialized = 1;
-@@ -1679,77 +1631,45 @@ static int __init _omap_gpio_init(void)
- 
- #ifdef CONFIG_ARCH_OMAP15XX
- 	if (cpu_is_omap15xx()) {
--		printk(KERN_INFO "OMAP1510 GPIO hardware\n");
- 		gpio_bank_count = 2;
- 		gpio_bank = gpio_bank_1510;
-+		bank_size = SZ_2K;
- 	}
- #endif
- #if defined(CONFIG_ARCH_OMAP16XX)
- 	if (cpu_is_omap16xx()) {
--		u32 rev;
--
- 		gpio_bank_count = 5;
- 		gpio_bank = gpio_bank_1610;
--		rev = __raw_readw(gpio_bank[1].base + OMAP1610_GPIO_REVISION);
--		printk(KERN_INFO "OMAP GPIO hardware version %d.%d\n",
--		       (rev >> 4) & 0x0f, rev & 0x0f);
-+		bank_size = SZ_2K;
- 	}
- #endif
--#ifdef CONFIG_ARCH_OMAP730
--	if (cpu_is_omap730()) {
--		printk(KERN_INFO "OMAP730 GPIO hardware\n");
--		gpio_bank_count = 7;
--		gpio_bank = gpio_bank_730;
--	}
--#endif
--#ifdef CONFIG_ARCH_OMAP850
--	if (cpu_is_omap850()) {
--		printk(KERN_INFO "OMAP850 GPIO hardware\n");
-+#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
-+	if (cpu_is_omap7xx()) {
- 		gpio_bank_count = 7;
--		gpio_bank = gpio_bank_850;
-+		gpio_bank = gpio_bank_7xx;
-+		bank_size = SZ_2K;
- 	}
- #endif
--
- #ifdef CONFIG_ARCH_OMAP24XX
- 	if (cpu_is_omap242x()) {
--		int rev;
--
- 		gpio_bank_count = 4;
- 		gpio_bank = gpio_bank_242x;
--		rev = __raw_readl(gpio_bank[0].base + OMAP24XX_GPIO_REVISION);
--		printk(KERN_INFO "OMAP242x GPIO hardware version %d.%d\n",
--			(rev >> 4) & 0x0f, rev & 0x0f);
- 	}
- 	if (cpu_is_omap243x()) {
--		int rev;
--
- 		gpio_bank_count = 5;
- 		gpio_bank = gpio_bank_243x;
--		rev = __raw_readl(gpio_bank[0].base + OMAP24XX_GPIO_REVISION);
--		printk(KERN_INFO "OMAP243x GPIO hardware version %d.%d\n",
--			(rev >> 4) & 0x0f, rev & 0x0f);
- 	}
- #endif
- #ifdef CONFIG_ARCH_OMAP34XX
- 	if (cpu_is_omap34xx()) {
--		int rev;
--
- 		gpio_bank_count = OMAP34XX_NR_GPIOS;
- 		gpio_bank = gpio_bank_34xx;
--		rev = __raw_readl(gpio_bank[0].base + OMAP24XX_GPIO_REVISION);
--		printk(KERN_INFO "OMAP34xx GPIO hardware version %d.%d\n",
--			(rev >> 4) & 0x0f, rev & 0x0f);
- 	}
- #endif
- #ifdef CONFIG_ARCH_OMAP4
- 	if (cpu_is_omap44xx()) {
--		int rev;
--
- 		gpio_bank_count = OMAP34XX_NR_GPIOS;
- 		gpio_bank = gpio_bank_44xx;
--		rev = __raw_readl(gpio_bank[0].base + OMAP4_GPIO_REVISION);
--		printk(KERN_INFO "OMAP44xx GPIO hardware version %d.%d\n",
--			(rev >> 4) & 0x0f, rev & 0x0f);
- 	}
- #endif
- 	for (i = 0; i < gpio_bank_count; i++) {
-@@ -1757,6 +1677,14 @@ static int __init _omap_gpio_init(void)
- 
- 		bank = &gpio_bank[i];
- 		spin_lock_init(&bank->lock);
-+
-+		/* Static mapping, never released */
-+		bank->base = ioremap(bank->pbase, bank_size);
-+		if (!bank->base) {
-+			printk(KERN_ERR "Could not ioremap gpio bank%i\n", i);
-+			continue;
-+		}
-+
- 		if (bank_is_mpuio(bank))
- 			__raw_writew(0xffff, bank->base + OMAP_MPUIO_GPIO_MASKIT);
- 		if (cpu_is_omap15xx() && bank->method == METHOD_GPIO_1510) {
-@@ -1768,11 +1696,11 @@ static int __init _omap_gpio_init(void)
- 			__raw_writew(0xffff, bank->base + OMAP1610_GPIO_IRQSTATUS1);
- 			__raw_writew(0x0014, bank->base + OMAP1610_GPIO_SYSCONFIG);
- 		}
--		if (cpu_is_omap7xx() && bank->method == METHOD_GPIO_730) {
--			__raw_writel(0xffffffff, bank->base + OMAP730_GPIO_INT_MASK);
--			__raw_writel(0x00000000, bank->base + OMAP730_GPIO_INT_STATUS);
-+		if (cpu_is_omap7xx() && bank->method == METHOD_GPIO_7XX) {
-+			__raw_writel(0xffffffff, bank->base + OMAP7XX_GPIO_INT_MASK);
-+			__raw_writel(0x00000000, bank->base + OMAP7XX_GPIO_INT_STATUS);
- 
--			gpio_count = 32; /* 730 has 32-bit GPIOs */
-+			gpio_count = 32; /* 7xx has 32-bit GPIOs */
- 		}
- 
- #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \
-@@ -1862,6 +1790,8 @@ static int __init _omap_gpio_init(void)
- 	if (cpu_is_omap34xx())
- 		omap_writel(1 << 0, 0x48306814);
- 
-+	omap_gpio_show_rev();
-+
- 	return 0;
- }
- 
-@@ -2160,8 +2090,7 @@ static int dbg_gpio_show(struct seq_file
- 
- 		if (bank_is_mpuio(bank))
- 			gpio = OMAP_MPUIO(0);
--		else if (cpu_class_is_omap2() || cpu_is_omap730() ||
--				cpu_is_omap850())
-+		else if (cpu_class_is_omap2() || cpu_is_omap7xx())
- 			bankwidth = 32;
- 
- 		for (j = 0; j < bankwidth; j++, gpio++, mask <<= 1) {
---- a/arch/arm/plat-omap/include/mach/control.h
-+++ b/arch/arm/plat-omap/include/mach/control.h
-@@ -20,15 +20,18 @@
- 
- #ifndef __ASSEMBLY__
- #define OMAP242X_CTRL_REGADDR(reg)					\
--	OMAP2_IO_ADDRESS(OMAP242X_CTRL_BASE + (reg))
-+		OMAP2_L4_IO_ADDRESS(OMAP242X_CTRL_BASE + (reg))
- #define OMAP243X_CTRL_REGADDR(reg)					\
--	OMAP2_IO_ADDRESS(OMAP243X_CTRL_BASE + (reg))
-+		OMAP2_L4_IO_ADDRESS(OMAP243X_CTRL_BASE + (reg))
- #define OMAP343X_CTRL_REGADDR(reg)					\
--	OMAP2_IO_ADDRESS(OMAP343X_CTRL_BASE + (reg))
-+		OMAP2_L4_IO_ADDRESS(OMAP343X_CTRL_BASE + (reg))
- #else
--#define OMAP242X_CTRL_REGADDR(reg)	OMAP2_IO_ADDRESS(OMAP242X_CTRL_BASE + (reg))
--#define OMAP243X_CTRL_REGADDR(reg)	OMAP2_IO_ADDRESS(OMAP243X_CTRL_BASE + (reg))
--#define OMAP343X_CTRL_REGADDR(reg)	OMAP2_IO_ADDRESS(OMAP343X_CTRL_BASE + (reg))
-+#define OMAP242X_CTRL_REGADDR(reg)					\
-+		OMAP2_L4_IO_ADDRESS(OMAP242X_CTRL_BASE + (reg))
-+#define OMAP243X_CTRL_REGADDR(reg)					\
-+		OMAP2_L4_IO_ADDRESS(OMAP243X_CTRL_BASE + (reg))
-+#define OMAP343X_CTRL_REGADDR(reg)					\
-+		OMAP2_L4_IO_ADDRESS(OMAP343X_CTRL_BASE + (reg))
- #endif /* __ASSEMBLY__ */
- 
- /*
-@@ -202,6 +205,40 @@
- #define OMAP3_PADCONF_WAKEUPEVENT0	(1 << 15)
- #define OMAP3_PADCONF_WAKEUPENABLE0	(1 << 14)
- 
-+/*
-+ * CONTROL OMAP STATUS register to identify OMAP3 features
-+ */
-+#define OMAP3_CONTROL_OMAP_STATUS	0x044c
-+
-+#define OMAP3_SGX_SHIFT			13
-+#define OMAP3_SGX_MASK			(3 << OMAP3_SGX_SHIFT)
-+#define		FEAT_SGX_FULL		0
-+#define		FEAT_SGX_HALF		1
-+#define		FEAT_SGX_NONE		2
-+
-+#define OMAP3_IVA_SHIFT			12
-+#define OMAP3_IVA_MASK			(1 << OMAP3_SGX_SHIFT)
-+#define		FEAT_IVA		0
-+#define		FEAT_IVA_NONE		1
-+
-+#define OMAP3_L2CACHE_SHIFT		10
-+#define OMAP3_L2CACHE_MASK		(3 << OMAP3_L2CACHE_SHIFT)
-+#define		FEAT_L2CACHE_NONE	0
-+#define		FEAT_L2CACHE_64KB	1
-+#define		FEAT_L2CACHE_128KB	2
-+#define		FEAT_L2CACHE_256KB	3
-+
-+#define OMAP3_ISP_SHIFT			5
-+#define OMAP3_ISP_MASK			(1<< OMAP3_ISP_SHIFT)
-+#define		FEAT_ISP		0
-+#define		FEAT_ISP_NONE		1
-+
-+#define OMAP3_NEON_SHIFT		4
-+#define OMAP3_NEON_MASK			(1<< OMAP3_NEON_SHIFT)
-+#define		FEAT_NEON		0
-+#define		FEAT_NEON_NONE		1
-+
-+
- #ifndef __ASSEMBLY__
- #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \
- 		defined(CONFIG_ARCH_OMAP4)
---- a/arch/arm/plat-omap/include/mach/cpu.h
-+++ b/arch/arm/plat-omap/include/mach/cpu.h
-@@ -30,6 +30,8 @@
- #ifndef __ASM_ARCH_OMAP_CPU_H
- #define __ASM_ARCH_OMAP_CPU_H
- 
-+#include <linux/bitops.h>
-+
- /*
-  * Omap device type i.e. EMU/HS/TST/GP/BAD
-  */
-@@ -57,6 +59,23 @@ struct omap_chip_id {
- unsigned int omap_rev(void);
- 
- /*
-+ * Define CPU revision bits
-+ *
-+ * Verbose meaning of the revision bits may be different for a silicon
-+ * family. This difference can be handled separately.
-+ */
-+#define OMAP_REVBITS_00		0x00
-+#define OMAP_REVBITS_10		0x10
-+#define OMAP_REVBITS_20		0x20
-+#define OMAP_REVBITS_30		0x30
-+#define OMAP_REVBITS_40		0x40
-+
-+/*
-+ * Get the CPU revision for OMAP devices
-+ */
-+#define GET_OMAP_REVISION()	((omap_rev() >> 8) & 0xff)
-+
-+/*
-  * Test if multicore OMAP support is needed
-  */
- #undef MULTI_OMAP1
-@@ -161,6 +180,7 @@ IS_OMAP_CLASS(34xx, 0x34)
- IS_OMAP_SUBCLASS(242x, 0x242)
- IS_OMAP_SUBCLASS(243x, 0x243)
- IS_OMAP_SUBCLASS(343x, 0x343)
-+IS_OMAP_SUBCLASS(363x, 0x363)
- 
- #define cpu_is_omap7xx()		0
- #define cpu_is_omap15xx()		0
-@@ -301,7 +321,12 @@ IS_OMAP_TYPE(3430, 0x3430)
- #define cpu_is_omap2422()		0
- #define cpu_is_omap2423()		0
- #define cpu_is_omap2430()		0
-+#define cpu_is_omap3503()		0
-+#define cpu_is_omap3515()		0
-+#define cpu_is_omap3525()		0
-+#define cpu_is_omap3530()		0
- #define cpu_is_omap3430()		0
-+#define cpu_is_omap3630()		0
- 
- /*
-  * Whether we have MULTI_OMAP1 or not, we still need to distinguish
-@@ -351,7 +376,23 @@ IS_OMAP_TYPE(3430, 0x3430)
- 
- #if defined(CONFIG_ARCH_OMAP34XX)
- # undef cpu_is_omap3430
-+# undef cpu_is_omap3503
-+# undef cpu_is_omap3515
-+# undef cpu_is_omap3525
-+# undef cpu_is_omap3530
- # define cpu_is_omap3430()		is_omap3430()
-+# define cpu_is_omap3503		(cpu_is_omap3430() &&		\
-+						(!omap3_has_iva()) &&	\
-+						(!omap3_has_sgx()))
-+# define cpu_is_omap3515		(cpu_is_omap3430() &&		\
-+						(omap3_has_iva()) &&	\
-+						(!omap3_has_sgx()))
-+# define cpu_is_omap3525		(cpu_is_omap3430() &&		\
-+						(omap3_has_sgx()) &&	\
-+						(!omap3_has_iva()))
-+# define cpu_is_omap3530		(cpu_is_omap3430())
-+# undef cpu_is_omap3630
-+# define cpu_is_omap3630()		is_omap363x()
- #endif
- 
- # if defined(CONFIG_ARCH_OMAP4)
-@@ -382,6 +423,14 @@ IS_OMAP_TYPE(3430, 0x3430)
- #define OMAP3430_REV_ES3_0	0x34303034
- #define OMAP3430_REV_ES3_1	0x34304034
- 
-+#define OMAP3630_REV_ES1_0	0x36300034
-+
-+#define OMAP35XX_CLASS		0x35000034
-+#define OMAP3503_REV(v)		(OMAP35XX_CLASS | (0x3503 << 16) | (v << 12))
-+#define OMAP3515_REV(v)		(OMAP35XX_CLASS | (0x3515 << 16) | (v << 12))
-+#define OMAP3525_REV(v)		(OMAP35XX_CLASS | (0x3525 << 16) | (v << 12))
-+#define OMAP3530_REV(v)		(OMAP35XX_CLASS | (0x3530 << 16) | (v << 12))
-+
- #define OMAP443X_CLASS		0x44300034
- 
- /*
-@@ -423,4 +472,27 @@ IS_OMAP_TYPE(3430, 0x3430)
- int omap_chip_is(struct omap_chip_id oci);
- void omap2_check_revision(void);
- 
-+/*
-+ * Runtime detection of OMAP3 features
-+ */
-+extern u32 omap3_features;
-+
-+#define OMAP3_HAS_L2CACHE		BIT(0)
-+#define OMAP3_HAS_IVA			BIT(1)
-+#define OMAP3_HAS_SGX			BIT(2)
-+#define OMAP3_HAS_NEON			BIT(3)
-+#define OMAP3_HAS_ISP			BIT(4)
-+
-+#define OMAP3_HAS_FEATURE(feat,flag)			\
-+static inline unsigned int omap3_has_ ##feat(void)	\
-+{							\
-+	return (omap3_features & OMAP3_HAS_ ##flag);	\
-+}							\
-+
-+OMAP3_HAS_FEATURE(l2cache, L2CACHE)
-+OMAP3_HAS_FEATURE(sgx, SGX)
-+OMAP3_HAS_FEATURE(iva, IVA)
-+OMAP3_HAS_FEATURE(neon, NEON)
-+OMAP3_HAS_FEATURE(isp, ISP)
-+
- #endif
---- a/arch/arm/plat-omap/include/mach/debug-macro.S
-+++ b/arch/arm/plat-omap/include/mach/debug-macro.S
-@@ -27,7 +27,7 @@
- 
- #elif  CONFIG_ARCH_OMAP2
- 		moveq	\rx, #0x48000000	@ physical base address
--		movne	\rx, #0xd8000000	@ virtual base
-+		movne	\rx, #0xfa000000	@ virtual base
- 		orr	\rx, \rx, #0x0006a000
- #ifdef CONFIG_OMAP_LL_DEBUG_UART2
- 		add	\rx, \rx, #0x00002000	@ UART 2
-@@ -38,7 +38,7 @@
- 
- #elif defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
- 		moveq	\rx, #0x48000000	@ physical base address
--		movne	\rx, #0xd8000000	@ virtual base
-+		movne	\rx, #0xfa000000	@ virtual base
- 		orr	\rx, \rx, #0x0006a000
- #ifdef CONFIG_OMAP_LL_DEBUG_UART2
- 		add	\rx, \rx, #0x00002000	@ UART 2
---- a/arch/arm/plat-omap/include/mach/entry-macro.S
-+++ b/arch/arm/plat-omap/include/mach/entry-macro.S
-@@ -17,11 +17,11 @@
- 
- #if defined(CONFIG_ARCH_OMAP1)
- 
--#if defined(CONFIG_ARCH_OMAP730) && \
-+#if (defined(CONFIG_ARCH_OMAP730)||defined(CONFIG_ARCH_OMAP850)) && \
- 	(defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX))
--#error "FIXME: OMAP730 doesn't support multiple-OMAP"
--#elif defined(CONFIG_ARCH_OMAP730)
--#define INT_IH2_IRQ		INT_730_IH2_IRQ
-+#error "FIXME: OMAP7XX doesn't support multiple-OMAP"
-+#elif defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
-+#define INT_IH2_IRQ		INT_7XX_IH2_IRQ
- #elif defined(CONFIG_ARCH_OMAP15XX)
- #define INT_IH2_IRQ		INT_1510_IH2_IRQ
- #elif defined(CONFIG_ARCH_OMAP16XX)
-@@ -68,9 +68,9 @@
- 
- /* REVISIT: This should be set dynamically if CONFIG_MULTI_OMAP2 is selected */
- #if defined(CONFIG_ARCH_OMAP2420) || defined(CONFIG_ARCH_OMAP2430)
--#define OMAP2_VA_IC_BASE		OMAP2_IO_ADDRESS(OMAP24XX_IC_BASE)
-+#define OMAP2_VA_IC_BASE		OMAP2_L4_IO_ADDRESS(OMAP24XX_IC_BASE)
- #elif defined(CONFIG_ARCH_OMAP34XX)
--#define OMAP2_VA_IC_BASE		OMAP2_IO_ADDRESS(OMAP34XX_IC_BASE)
-+#define OMAP2_VA_IC_BASE		OMAP2_L4_IO_ADDRESS(OMAP34XX_IC_BASE)
- #endif
- #if defined(CONFIG_ARCH_OMAP4)
- #include <mach/omap44xx.h>
-@@ -104,6 +104,8 @@
- 
- 		.endm
- #else
-+#define OMAP44XX_VA_GIC_CPU_BASE	OMAP2_L4_IO_ADDRESS(OMAP44XX_GIC_CPU_BASE)
-+
- 		/*
- 		 * The interrupt numbering scheme is defined in the
- 		 * interrupt controller spec.  To wit:
---- a/arch/arm/plat-omap/include/mach/hardware.h
-+++ b/arch/arm/plat-omap/include/mach/hardware.h
-@@ -280,7 +280,7 @@
-  * ---------------------------------------------------------------------------
-  */
- 
--#include "omap730.h"
-+#include "omap7xx.h"
- #include "omap1510.h"
- #include "omap16xx.h"
- #include "omap24xx.h"
---- a/arch/arm/plat-omap/include/mach/io.h
-+++ b/arch/arm/plat-omap/include/mach/io.h
-@@ -63,8 +63,24 @@
- #define OMAP1_IO_OFFSET		0x01000000	/* Virtual IO = 0xfefb0000 */
- #define OMAP1_IO_ADDRESS(pa)	IOMEM((pa) - OMAP1_IO_OFFSET)
- 
--#define OMAP2_IO_OFFSET		0x90000000
--#define OMAP2_IO_ADDRESS(pa)	IOMEM((pa) + OMAP2_IO_OFFSET) /* L3 and L4 */
-+#define OMAP2_L3_IO_OFFSET	0x90000000
-+#define OMAP2_L3_IO_ADDRESS(pa)	IOMEM((pa) + OMAP2_L3_IO_OFFSET) /* L3 */
-+
-+
-+#define OMAP2_L4_IO_OFFSET	0xb2000000
-+#define OMAP2_L4_IO_ADDRESS(pa)	IOMEM((pa) + OMAP2_L4_IO_OFFSET) /* L4 */
-+
-+#define OMAP4_L3_IO_OFFSET	0xb4000000
-+#define OMAP4_L3_IO_ADDRESS(pa)	IOMEM((pa) + OMAP4_L3_IO_OFFSET) /* L3 */
-+
-+#define OMAP4_L3_PER_IO_OFFSET	0xb1100000
-+#define OMAP4_L3_PER_IO_ADDRESS(pa)	IOMEM((pa) + OMAP4_L3_PER_IO_OFFSET)
-+
-+#define OMAP4_GPMC_IO_OFFSET		0xa9000000
-+#define OMAP4_GPMC_IO_ADDRESS(pa)	IOMEM((pa) + OMAP4_GPMC_IO_OFFSET)
-+
-+#define OMAP2_EMU_IO_OFFSET		0xaa800000	/* Emulation */
-+#define OMAP2_EMU_IO_ADDRESS(pa)	IOMEM((pa) + OMAP2_EMU_IO_OFFSET)
- 
- /*
-  * ----------------------------------------------------------------------------
-@@ -83,24 +99,27 @@
-  */
- 
- /* We map both L3 and L4 on OMAP2 */
--#define L3_24XX_PHYS	L3_24XX_BASE	/* 0x68000000 */
--#define L3_24XX_VIRT	0xf8000000
-+#define L3_24XX_PHYS	L3_24XX_BASE	/* 0x68000000 --> 0xf8000000*/
-+#define L3_24XX_VIRT	(L3_24XX_PHYS + OMAP2_L3_IO_OFFSET)
- #define L3_24XX_SIZE	SZ_1M		/* 44kB of 128MB used, want 1MB sect */
--#define L4_24XX_PHYS	L4_24XX_BASE	/* 0x48000000 */
--#define L4_24XX_VIRT	0xd8000000
-+#define L4_24XX_PHYS	L4_24XX_BASE	/* 0x48000000 --> 0xfa000000 */
-+#define L4_24XX_VIRT	(L4_24XX_PHYS + OMAP2_L4_IO_OFFSET)
- #define L4_24XX_SIZE	SZ_1M		/* 1MB of 128MB used, want 1MB sect */
- 
--#define L4_WK_243X_PHYS		L4_WK_243X_BASE		/* 0x49000000 */
--#define L4_WK_243X_VIRT		0xd9000000
-+#define L4_WK_243X_PHYS		L4_WK_243X_BASE	/* 0x49000000 --> 0xfb000000 */
-+#define L4_WK_243X_VIRT		(L4_WK_243X_PHYS + OMAP2_L4_IO_OFFSET)
- #define L4_WK_243X_SIZE		SZ_1M
--#define OMAP243X_GPMC_PHYS	OMAP243X_GPMC_BASE	/* 0x49000000 */
--#define OMAP243X_GPMC_VIRT	0xFE000000
-+#define OMAP243X_GPMC_PHYS	OMAP243X_GPMC_BASE
-+#define OMAP243X_GPMC_VIRT	(OMAP243X_GPMC_PHYS + OMAP2_L3_IO_OFFSET)
-+						/* 0x6e000000 --> 0xfe000000 */
- #define OMAP243X_GPMC_SIZE	SZ_1M
- #define OMAP243X_SDRC_PHYS	OMAP243X_SDRC_BASE
--#define OMAP243X_SDRC_VIRT	0xFD000000
-+						/* 0x6D000000 --> 0xfd000000 */
-+#define OMAP243X_SDRC_VIRT	(OMAP243X_SDRC_PHYS + OMAP2_L3_IO_OFFSET)
- #define OMAP243X_SDRC_SIZE	SZ_1M
- #define OMAP243X_SMS_PHYS	OMAP243X_SMS_BASE
--#define OMAP243X_SMS_VIRT	0xFC000000
-+						/* 0x6c000000 --> 0xfc000000 */
-+#define OMAP243X_SMS_VIRT	(OMAP243X_SMS_PHYS + OMAP2_L3_IO_OFFSET)
- #define OMAP243X_SMS_SIZE	SZ_1M
- 
- /* DSP */
-@@ -121,12 +140,12 @@
-  */
- 
- /* We map both L3 and L4 on OMAP3 */
--#define L3_34XX_PHYS		L3_34XX_BASE	/* 0x68000000 */
--#define L3_34XX_VIRT		0xf8000000
-+#define L3_34XX_PHYS		L3_34XX_BASE	/* 0x68000000 --> 0xf8000000 */
-+#define L3_34XX_VIRT		(L3_34XX_PHYS + OMAP2_L3_IO_OFFSET)
- #define L3_34XX_SIZE		SZ_1M   /* 44kB of 128MB used, want 1MB sect */
- 
--#define L4_34XX_PHYS		L4_34XX_BASE	/* 0x48000000 */
--#define L4_34XX_VIRT		0xd8000000
-+#define L4_34XX_PHYS		L4_34XX_BASE	/* 0x48000000 --> 0xfa000000 */
-+#define L4_34XX_VIRT		(L4_34XX_PHYS + OMAP2_L4_IO_OFFSET)
- #define L4_34XX_SIZE		SZ_4M   /* 1MB of 128MB used, want 1MB sect */
- 
- /*
-@@ -134,28 +153,33 @@
-  * VPOM3430 was not working for Int controller
-  */
- 
--#define L4_WK_34XX_PHYS		L4_WK_34XX_BASE /* 0x48300000 */
--#define L4_WK_34XX_VIRT		0xd8300000
-+#define L4_WK_34XX_PHYS		L4_WK_34XX_BASE	/* 0x48300000 --> 0xfa300000 */
-+#define L4_WK_34XX_VIRT		(L4_WK_34XX_PHYS + OMAP2_L4_IO_OFFSET)
- #define L4_WK_34XX_SIZE		SZ_1M
- 
--#define L4_PER_34XX_PHYS	L4_PER_34XX_BASE /* 0x49000000 */
--#define L4_PER_34XX_VIRT	0xd9000000
-+#define L4_PER_34XX_PHYS	L4_PER_34XX_BASE
-+						/* 0x49000000 --> 0xfb000000 */
-+#define L4_PER_34XX_VIRT	(L4_PER_34XX_PHYS + OMAP2_L4_IO_OFFSET)
- #define L4_PER_34XX_SIZE	SZ_1M
- 
--#define L4_EMU_34XX_PHYS	L4_EMU_34XX_BASE /* 0x54000000 */
--#define L4_EMU_34XX_VIRT	0xe4000000
--#define L4_EMU_34XX_SIZE	SZ_64M
--
--#define OMAP34XX_GPMC_PHYS	OMAP34XX_GPMC_BASE /* 0x6E000000 */
--#define OMAP34XX_GPMC_VIRT	0xFE000000
-+#define L4_EMU_34XX_PHYS	L4_EMU_34XX_BASE
-+						/* 0x54000000 --> 0xfe800000 */
-+#define L4_EMU_34XX_VIRT	(L4_EMU_34XX_PHYS + OMAP2_EMU_IO_OFFSET)
-+#define L4_EMU_34XX_SIZE	SZ_8M
-+
-+#define OMAP34XX_GPMC_PHYS	OMAP34XX_GPMC_BASE
-+						/* 0x6e000000 --> 0xfe000000 */
-+#define OMAP34XX_GPMC_VIRT	(OMAP34XX_GPMC_PHYS + OMAP2_L3_IO_OFFSET)
- #define OMAP34XX_GPMC_SIZE	SZ_1M
- 
--#define OMAP343X_SMS_PHYS	OMAP343X_SMS_BASE /* 0x6C000000 */
--#define OMAP343X_SMS_VIRT	0xFC000000
-+#define OMAP343X_SMS_PHYS	OMAP343X_SMS_BASE
-+						/* 0x6c000000 --> 0xfc000000 */
-+#define OMAP343X_SMS_VIRT	(OMAP343X_SMS_PHYS + OMAP2_L3_IO_OFFSET)
- #define OMAP343X_SMS_SIZE	SZ_1M
- 
--#define OMAP343X_SDRC_PHYS	OMAP343X_SDRC_BASE /* 0x6D000000 */
--#define OMAP343X_SDRC_VIRT	0xFD000000
-+#define OMAP343X_SDRC_PHYS	OMAP343X_SDRC_BASE
-+						/* 0x6D000000 --> 0xfd000000 */
-+#define OMAP343X_SDRC_VIRT	(OMAP343X_SDRC_PHYS + OMAP2_L3_IO_OFFSET)
- #define OMAP343X_SDRC_SIZE	SZ_1M
- 
- /* DSP */
-@@ -176,32 +200,54 @@
-  */
- 
- /* We map both L3 and L4 on OMAP4 */
--#define L3_44XX_PHYS		L3_44XX_BASE
--#define L3_44XX_VIRT		0xd4000000
-+#define L3_44XX_PHYS		L3_44XX_BASE	/* 0x44000000 --> 0xf8000000 */
-+#define L3_44XX_VIRT		(L3_44XX_PHYS + OMAP4_L3_IO_OFFSET)
- #define L3_44XX_SIZE		SZ_1M
- 
--#define L4_44XX_PHYS		L4_44XX_BASE
--#define L4_44XX_VIRT		0xda000000
-+#define L4_44XX_PHYS		L4_44XX_BASE	/* 0x4a000000 --> 0xfc000000 */
-+#define L4_44XX_VIRT		(L4_44XX_PHYS + OMAP2_L4_IO_OFFSET)
- #define L4_44XX_SIZE		SZ_4M
- 
- 
--#define L4_WK_44XX_PHYS		L4_WK_44XX_BASE
--#define L4_WK_44XX_VIRT		0xda300000
-+#define L4_WK_44XX_PHYS		L4_WK_44XX_BASE	/* 0x4a300000 --> 0xfc300000 */
-+#define L4_WK_44XX_VIRT		(L4_WK_44XX_PHYS + OMAP2_L4_IO_OFFSET)
- #define L4_WK_44XX_SIZE		SZ_1M
- 
- #define L4_PER_44XX_PHYS	L4_PER_44XX_BASE
--#define L4_PER_44XX_VIRT	0xd8000000
-+						/* 0x48000000 --> 0xfa000000 */
-+#define L4_PER_44XX_VIRT	(L4_PER_44XX_PHYS + OMAP2_L4_IO_OFFSET)
- #define L4_PER_44XX_SIZE	SZ_4M
- 
-+#define L4_ABE_44XX_PHYS	L4_ABE_44XX_BASE
-+						/* 0x49000000 --> 0xfb000000 */
-+#define L4_ABE_44XX_VIRT	(L4_ABE_44XX_PHYS + OMAP2_L4_IO_OFFSET)
-+#define L4_ABE_44XX_SIZE	SZ_1M
-+
- #define L4_EMU_44XX_PHYS	L4_EMU_44XX_BASE
--#define L4_EMU_44XX_VIRT	0xe4000000
--#define L4_EMU_44XX_SIZE	SZ_64M
-+						/* 0x54000000 --> 0xfe800000 */
-+#define L4_EMU_44XX_VIRT	(L4_EMU_44XX_PHYS + OMAP2_EMU_IO_OFFSET)
-+#define L4_EMU_44XX_SIZE	SZ_8M
- 
- #define OMAP44XX_GPMC_PHYS	OMAP44XX_GPMC_BASE
--#define OMAP44XX_GPMC_VIRT	0xe0000000
-+						/* 0x50000000 --> 0xf9000000 */
-+#define OMAP44XX_GPMC_VIRT	(OMAP44XX_GPMC_PHYS + OMAP4_GPMC_IO_OFFSET)
- #define OMAP44XX_GPMC_SIZE	SZ_1M
- 
- 
-+#define OMAP44XX_EMIF1_PHYS	OMAP44XX_EMIF1_BASE
-+						/* 0x4c000000 --> 0xfd100000 */
-+#define OMAP44XX_EMIF1_VIRT	(OMAP44XX_EMIF1_PHYS + OMAP4_L3_PER_IO_OFFSET)
-+#define OMAP44XX_EMIF1_SIZE	SZ_1M
-+
-+#define OMAP44XX_EMIF2_PHYS	OMAP44XX_EMIF2_BASE
-+						/* 0x4d000000 --> 0xfd200000 */
-+#define OMAP44XX_EMIF2_VIRT	(OMAP44XX_EMIF2_PHYS + OMAP4_L3_PER_IO_OFFSET)
-+#define OMAP44XX_EMIF2_SIZE	SZ_1M
-+
-+#define OMAP44XX_DMM_PHYS	OMAP44XX_DMM_BASE
-+						/* 0x4e000000 --> 0xfd300000 */
-+#define OMAP44XX_DMM_VIRT	(OMAP44XX_DMM_PHYS + OMAP4_L3_PER_IO_OFFSET)
-+#define OMAP44XX_DMM_SIZE	SZ_1M
- /*
-  * ----------------------------------------------------------------------------
-  * Omap specific register access
---- a/arch/arm/plat-omap/include/mach/irqs.h
-+++ b/arch/arm/plat-omap/include/mach/irqs.h
-@@ -86,49 +86,26 @@
- #define INT_1610_SSR_FIFO_0	29
- 
- /*
-- * OMAP-730 specific IRQ numbers for interrupt handler 1
-+ * OMAP-7xx specific IRQ numbers for interrupt handler 1
-  */
--#define INT_730_IH2_FIQ		0
--#define INT_730_IH2_IRQ		1
--#define INT_730_USB_NON_ISO	2
--#define INT_730_USB_ISO		3
--#define INT_730_ICR		4
--#define INT_730_EAC		5
--#define INT_730_GPIO_BANK1	6
--#define INT_730_GPIO_BANK2	7
--#define INT_730_GPIO_BANK3	8
--#define INT_730_McBSP2TX	10
--#define INT_730_McBSP2RX	11
--#define INT_730_McBSP2RX_OVF	12
--#define INT_730_LCD_LINE	14
--#define INT_730_GSM_PROTECT	15
--#define INT_730_TIMER3		16
--#define INT_730_GPIO_BANK5	17
--#define INT_730_GPIO_BANK6	18
--#define INT_730_SPGIO_WR	29
--
--/*
-- * OMAP-850 specific IRQ numbers for interrupt handler 1
-- */
--#define INT_850_IH2_FIQ		0
--#define INT_850_IH2_IRQ		1
--#define INT_850_USB_NON_ISO	2
--#define INT_850_USB_ISO		3
--#define INT_850_ICR		4
--#define INT_850_EAC		5
--#define INT_850_GPIO_BANK1	6
--#define INT_850_GPIO_BANK2	7
--#define INT_850_GPIO_BANK3	8
--#define INT_850_McBSP2TX	10
--#define INT_850_McBSP2RX	11
--#define INT_850_McBSP2RX_OVF	12
--#define INT_850_LCD_LINE	14
--#define INT_850_GSM_PROTECT	15
--#define INT_850_TIMER3		16
--#define INT_850_GPIO_BANK5	17
--#define INT_850_GPIO_BANK6	18
--#define INT_850_SPGIO_WR	29
--
-+#define INT_7XX_IH2_FIQ		0
-+#define INT_7XX_IH2_IRQ		1
-+#define INT_7XX_USB_NON_ISO	2
-+#define INT_7XX_USB_ISO		3
-+#define INT_7XX_ICR		4
-+#define INT_7XX_EAC		5
-+#define INT_7XX_GPIO_BANK1	6
-+#define INT_7XX_GPIO_BANK2	7
-+#define INT_7XX_GPIO_BANK3	8
-+#define INT_7XX_McBSP2TX	10
-+#define INT_7XX_McBSP2RX	11
-+#define INT_7XX_McBSP2RX_OVF	12
-+#define INT_7XX_LCD_LINE	14
-+#define INT_7XX_GSM_PROTECT	15
-+#define INT_7XX_TIMER3		16
-+#define INT_7XX_GPIO_BANK5	17
-+#define INT_7XX_GPIO_BANK6	18
-+#define INT_7XX_SPGIO_WR	29
- 
- /*
-  * IRQ numbers for interrupt handler 2
-@@ -206,120 +183,62 @@
- #define INT_1610_SHA1MD5	(91 + IH2_BASE)
- 
- /*
-- * OMAP-730 specific IRQ numbers for interrupt handler 2
-- */
--#define INT_730_HW_ERRORS	(0 + IH2_BASE)
--#define INT_730_NFIQ_PWR_FAIL	(1 + IH2_BASE)
--#define INT_730_CFCD		(2 + IH2_BASE)
--#define INT_730_CFIREQ		(3 + IH2_BASE)
--#define INT_730_I2C		(4 + IH2_BASE)
--#define INT_730_PCC		(5 + IH2_BASE)
--#define INT_730_MPU_EXT_NIRQ	(6 + IH2_BASE)
--#define INT_730_SPI_100K_1	(7 + IH2_BASE)
--#define INT_730_SYREN_SPI	(8 + IH2_BASE)
--#define INT_730_VLYNQ		(9 + IH2_BASE)
--#define INT_730_GPIO_BANK4	(10 + IH2_BASE)
--#define INT_730_McBSP1TX	(11 + IH2_BASE)
--#define INT_730_McBSP1RX	(12 + IH2_BASE)
--#define INT_730_McBSP1RX_OF	(13 + IH2_BASE)
--#define INT_730_UART_MODEM_IRDA_2 (14 + IH2_BASE)
--#define INT_730_UART_MODEM_1	(15 + IH2_BASE)
--#define INT_730_MCSI		(16 + IH2_BASE)
--#define INT_730_uWireTX		(17 + IH2_BASE)
--#define INT_730_uWireRX		(18 + IH2_BASE)
--#define INT_730_SMC_CD		(19 + IH2_BASE)
--#define INT_730_SMC_IREQ	(20 + IH2_BASE)
--#define INT_730_HDQ_1WIRE	(21 + IH2_BASE)
--#define INT_730_TIMER32K	(22 + IH2_BASE)
--#define INT_730_MMC_SDIO	(23 + IH2_BASE)
--#define INT_730_UPLD		(24 + IH2_BASE)
--#define INT_730_USB_HHC_1	(27 + IH2_BASE)
--#define INT_730_USB_HHC_2	(28 + IH2_BASE)
--#define INT_730_USB_GENI	(29 + IH2_BASE)
--#define INT_730_USB_OTG		(30 + IH2_BASE)
--#define INT_730_CAMERA_IF	(31 + IH2_BASE)
--#define INT_730_RNG		(32 + IH2_BASE)
--#define INT_730_DUAL_MODE_TIMER (33 + IH2_BASE)
--#define INT_730_DBB_RF_EN	(34 + IH2_BASE)
--#define INT_730_MPUIO_KEYPAD	(35 + IH2_BASE)
--#define INT_730_SHA1_MD5	(36 + IH2_BASE)
--#define INT_730_SPI_100K_2	(37 + IH2_BASE)
--#define INT_730_RNG_IDLE	(38 + IH2_BASE)
--#define INT_730_MPUIO		(39 + IH2_BASE)
--#define INT_730_LLPC_LCD_CTRL_CAN_BE_OFF	(40 + IH2_BASE)
--#define INT_730_LLPC_OE_FALLING (41 + IH2_BASE)
--#define INT_730_LLPC_OE_RISING	(42 + IH2_BASE)
--#define INT_730_LLPC_VSYNC	(43 + IH2_BASE)
--#define INT_730_WAKE_UP_REQ	(46 + IH2_BASE)
--#define INT_730_DMA_CH6		(53 + IH2_BASE)
--#define INT_730_DMA_CH7		(54 + IH2_BASE)
--#define INT_730_DMA_CH8		(55 + IH2_BASE)
--#define INT_730_DMA_CH9		(56 + IH2_BASE)
--#define INT_730_DMA_CH10	(57 + IH2_BASE)
--#define INT_730_DMA_CH11	(58 + IH2_BASE)
--#define INT_730_DMA_CH12	(59 + IH2_BASE)
--#define INT_730_DMA_CH13	(60 + IH2_BASE)
--#define INT_730_DMA_CH14	(61 + IH2_BASE)
--#define INT_730_DMA_CH15	(62 + IH2_BASE)
--#define INT_730_NAND		(63 + IH2_BASE)
--
--/*
-- * OMAP-850 specific IRQ numbers for interrupt handler 2
-+ * OMAP-7xx specific IRQ numbers for interrupt handler 2
-  */
--#define INT_850_HW_ERRORS	(0 + IH2_BASE)
--#define INT_850_NFIQ_PWR_FAIL	(1 + IH2_BASE)
--#define INT_850_CFCD		(2 + IH2_BASE)
--#define INT_850_CFIREQ		(3 + IH2_BASE)
--#define INT_850_I2C		(4 + IH2_BASE)
--#define INT_850_PCC		(5 + IH2_BASE)
--#define INT_850_MPU_EXT_NIRQ	(6 + IH2_BASE)
--#define INT_850_SPI_100K_1	(7 + IH2_BASE)
--#define INT_850_SYREN_SPI	(8 + IH2_BASE)
--#define INT_850_VLYNQ		(9 + IH2_BASE)
--#define INT_850_GPIO_BANK4	(10 + IH2_BASE)
--#define INT_850_McBSP1TX	(11 + IH2_BASE)
--#define INT_850_McBSP1RX	(12 + IH2_BASE)
--#define INT_850_McBSP1RX_OF	(13 + IH2_BASE)
--#define INT_850_UART_MODEM_IRDA_2 (14 + IH2_BASE)
--#define INT_850_UART_MODEM_1	(15 + IH2_BASE)
--#define INT_850_MCSI		(16 + IH2_BASE)
--#define INT_850_uWireTX		(17 + IH2_BASE)
--#define INT_850_uWireRX		(18 + IH2_BASE)
--#define INT_850_SMC_CD		(19 + IH2_BASE)
--#define INT_850_SMC_IREQ	(20 + IH2_BASE)
--#define INT_850_HDQ_1WIRE	(21 + IH2_BASE)
--#define INT_850_TIMER32K	(22 + IH2_BASE)
--#define INT_850_MMC_SDIO	(23 + IH2_BASE)
--#define INT_850_UPLD		(24 + IH2_BASE)
--#define INT_850_USB_HHC_1	(27 + IH2_BASE)
--#define INT_850_USB_HHC_2	(28 + IH2_BASE)
--#define INT_850_USB_GENI	(29 + IH2_BASE)
--#define INT_850_USB_OTG		(30 + IH2_BASE)
--#define INT_850_CAMERA_IF	(31 + IH2_BASE)
--#define INT_850_RNG		(32 + IH2_BASE)
--#define INT_850_DUAL_MODE_TIMER (33 + IH2_BASE)
--#define INT_850_DBB_RF_EN	(34 + IH2_BASE)
--#define INT_850_MPUIO_KEYPAD	(35 + IH2_BASE)
--#define INT_850_SHA1_MD5	(36 + IH2_BASE)
--#define INT_850_SPI_100K_2	(37 + IH2_BASE)
--#define INT_850_RNG_IDLE	(38 + IH2_BASE)
--#define INT_850_MPUIO		(39 + IH2_BASE)
--#define INT_850_LLPC_LCD_CTRL_CAN_BE_OFF	(40 + IH2_BASE)
--#define INT_850_LLPC_OE_FALLING (41 + IH2_BASE)
--#define INT_850_LLPC_OE_RISING	(42 + IH2_BASE)
--#define INT_850_LLPC_VSYNC	(43 + IH2_BASE)
--#define INT_850_WAKE_UP_REQ	(46 + IH2_BASE)
--#define INT_850_DMA_CH6		(53 + IH2_BASE)
--#define INT_850_DMA_CH7		(54 + IH2_BASE)
--#define INT_850_DMA_CH8		(55 + IH2_BASE)
--#define INT_850_DMA_CH9		(56 + IH2_BASE)
--#define INT_850_DMA_CH10	(57 + IH2_BASE)
--#define INT_850_DMA_CH11	(58 + IH2_BASE)
--#define INT_850_DMA_CH12	(59 + IH2_BASE)
--#define INT_850_DMA_CH13	(60 + IH2_BASE)
--#define INT_850_DMA_CH14	(61 + IH2_BASE)
--#define INT_850_DMA_CH15	(62 + IH2_BASE)
--#define INT_850_NAND		(63 + IH2_BASE)
-+#define INT_7XX_HW_ERRORS	(0 + IH2_BASE)
-+#define INT_7XX_NFIQ_PWR_FAIL	(1 + IH2_BASE)
-+#define INT_7XX_CFCD		(2 + IH2_BASE)
-+#define INT_7XX_CFIREQ		(3 + IH2_BASE)
-+#define INT_7XX_I2C		(4 + IH2_BASE)
-+#define INT_7XX_PCC		(5 + IH2_BASE)
-+#define INT_7XX_MPU_EXT_NIRQ	(6 + IH2_BASE)
-+#define INT_7XX_SPI_100K_1	(7 + IH2_BASE)
-+#define INT_7XX_SYREN_SPI	(8 + IH2_BASE)
-+#define INT_7XX_VLYNQ		(9 + IH2_BASE)
-+#define INT_7XX_GPIO_BANK4	(10 + IH2_BASE)
-+#define INT_7XX_McBSP1TX	(11 + IH2_BASE)
-+#define INT_7XX_McBSP1RX	(12 + IH2_BASE)
-+#define INT_7XX_McBSP1RX_OF	(13 + IH2_BASE)
-+#define INT_7XX_UART_MODEM_IRDA_2 (14 + IH2_BASE)
-+#define INT_7XX_UART_MODEM_1	(15 + IH2_BASE)
-+#define INT_7XX_MCSI		(16 + IH2_BASE)
-+#define INT_7XX_uWireTX		(17 + IH2_BASE)
-+#define INT_7XX_uWireRX		(18 + IH2_BASE)
-+#define INT_7XX_SMC_CD		(19 + IH2_BASE)
-+#define INT_7XX_SMC_IREQ	(20 + IH2_BASE)
-+#define INT_7XX_HDQ_1WIRE	(21 + IH2_BASE)
-+#define INT_7XX_TIMER32K	(22 + IH2_BASE)
-+#define INT_7XX_MMC_SDIO	(23 + IH2_BASE)
-+#define INT_7XX_UPLD		(24 + IH2_BASE)
-+#define INT_7XX_USB_HHC_1	(27 + IH2_BASE)
-+#define INT_7XX_USB_HHC_2	(28 + IH2_BASE)
-+#define INT_7XX_USB_GENI	(29 + IH2_BASE)
-+#define INT_7XX_USB_OTG		(30 + IH2_BASE)
-+#define INT_7XX_CAMERA_IF	(31 + IH2_BASE)
-+#define INT_7XX_RNG		(32 + IH2_BASE)
-+#define INT_7XX_DUAL_MODE_TIMER (33 + IH2_BASE)
-+#define INT_7XX_DBB_RF_EN	(34 + IH2_BASE)
-+#define INT_7XX_MPUIO_KEYPAD	(35 + IH2_BASE)
-+#define INT_7XX_SHA1_MD5	(36 + IH2_BASE)
-+#define INT_7XX_SPI_100K_2	(37 + IH2_BASE)
-+#define INT_7XX_RNG_IDLE	(38 + IH2_BASE)
-+#define INT_7XX_MPUIO		(39 + IH2_BASE)
-+#define INT_7XX_LLPC_LCD_CTRL_CAN_BE_OFF	(40 + IH2_BASE)
-+#define INT_7XX_LLPC_OE_FALLING (41 + IH2_BASE)
-+#define INT_7XX_LLPC_OE_RISING	(42 + IH2_BASE)
-+#define INT_7XX_LLPC_VSYNC	(43 + IH2_BASE)
-+#define INT_7XX_WAKE_UP_REQ	(46 + IH2_BASE)
-+#define INT_7XX_DMA_CH6		(53 + IH2_BASE)
-+#define INT_7XX_DMA_CH7		(54 + IH2_BASE)
-+#define INT_7XX_DMA_CH8		(55 + IH2_BASE)
-+#define INT_7XX_DMA_CH9		(56 + IH2_BASE)
-+#define INT_7XX_DMA_CH10	(57 + IH2_BASE)
-+#define INT_7XX_DMA_CH11	(58 + IH2_BASE)
-+#define INT_7XX_DMA_CH12	(59 + IH2_BASE)
-+#define INT_7XX_DMA_CH13	(60 + IH2_BASE)
-+#define INT_7XX_DMA_CH14	(61 + IH2_BASE)
-+#define INT_7XX_DMA_CH15	(62 + IH2_BASE)
-+#define INT_7XX_NAND		(63 + IH2_BASE)
- 
- #define INT_24XX_SYS_NIRQ	7
- #define INT_24XX_SDMA_IRQ0	12
---- a/arch/arm/plat-omap/include/mach/mcbsp.h
-+++ b/arch/arm/plat-omap/include/mach/mcbsp.h
-@@ -30,8 +30,8 @@
- #include <mach/hardware.h>
- #include <mach/clock.h>
- 
--#define OMAP730_MCBSP1_BASE	0xfffb1000
--#define OMAP730_MCBSP2_BASE	0xfffb1800
-+#define OMAP7XX_MCBSP1_BASE	0xfffb1000
-+#define OMAP7XX_MCBSP2_BASE	0xfffb1800
- 
- #define OMAP1510_MCBSP1_BASE	0xe1011800
- #define OMAP1510_MCBSP2_BASE	0xfffb1000
-@@ -58,7 +58,7 @@
- #define OMAP44XX_MCBSP3_BASE	0x49026000
- #define OMAP44XX_MCBSP4_BASE	0x48074000
- 
--#if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP730)
-+#if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
- 
- #define OMAP_MCBSP_REG_DRR2	0x00
- #define OMAP_MCBSP_REG_DRR1	0x02
---- a/arch/arm/plat-omap/include/mach/mux.h
-+++ b/arch/arm/plat-omap/include/mach/mux.h
-@@ -51,23 +51,13 @@
- 					.pu_pd_reg = PU_PD_SEL_##reg, \
- 					.pu_pd_val = status,
- 
--#define MUX_REG_730(reg, mode_offset, mode) .mux_reg_name = "OMAP730_IO_CONF_"#reg, \
--					.mux_reg = OMAP730_IO_CONF_##reg, \
-+#define MUX_REG_7XX(reg, mode_offset, mode) .mux_reg_name = "OMAP7XX_IO_CONF_"#reg, \
-+					.mux_reg = OMAP7XX_IO_CONF_##reg, \
- 					.mask_offset = mode_offset, \
- 					.mask = mode,
- 
--#define PULL_REG_730(reg, bit, status)	.pull_name = "OMAP730_IO_CONF_"#reg, \
--					.pull_reg = OMAP730_IO_CONF_##reg, \
--					.pull_bit = bit, \
--					.pull_val = status,
--
--#define MUX_REG_850(reg, mode_offset, mode) .mux_reg_name = "OMAP850_IO_CONF_"#reg, \
--					.mux_reg = OMAP850_IO_CONF_##reg, \
--					.mask_offset = mode_offset, \
--					.mask = mode,
--
--#define PULL_REG_850(reg, bit, status)	.pull_name = "OMAP850_IO_CONF_"#reg, \
--					.pull_reg = OMAP850_IO_CONF_##reg, \
-+#define PULL_REG_7XX(reg, bit, status)	.pull_name = "OMAP7XX_IO_CONF_"#reg, \
-+					.pull_reg = OMAP7XX_IO_CONF_##reg, \
- 					.pull_bit = bit, \
- 					.pull_val = status,
- 
-@@ -84,21 +74,12 @@
- #define PU_PD_REG(reg, status)		.pu_pd_reg = PU_PD_SEL_##reg, \
- 					.pu_pd_val = status,
- 
--#define MUX_REG_730(reg, mode_offset, mode) \
--					.mux_reg = OMAP730_IO_CONF_##reg, \
-+#define MUX_REG_7XX(reg, mode_offset, mode) \
-+					.mux_reg = OMAP7XX_IO_CONF_##reg, \
- 					.mask_offset = mode_offset, \
- 					.mask = mode,
- 
--#define PULL_REG_730(reg, bit, status)	.pull_reg = OMAP730_IO_CONF_##reg, \
--					.pull_bit = bit, \
--					.pull_val = status,
--
--#define MUX_REG_850(reg, mode_offset, mode) \
--					.mux_reg = OMAP850_IO_CONF_##reg, \
--					.mask_offset = mode_offset, \
--					.mask = mode,
--
--#define PULL_REG_850(reg, bit, status)	.pull_reg = OMAP850_IO_CONF_##reg, \
-+#define PULL_REG_7XX(reg, bit, status)	.pull_reg = OMAP7XX_IO_CONF_##reg, \
- 					.pull_bit = bit, \
- 					.pull_val = status,
- 
-@@ -118,32 +99,21 @@
- 
- /*
-  * OMAP730/850 has a slightly different config for the pin mux.
-- * - config regs are the OMAP730_IO_CONF_x regs (see omap730.h) regs and
-+ * - config regs are the OMAP7XX_IO_CONF_x regs (see omap730.h) regs and
-  *   not the FUNC_MUX_CTRL_x regs from hardware.h
-  * - for pull-up/down, only has one enable bit which is is in the same register
-  *   as mux config
-  */
--#define MUX_CFG_730(desc, mux_reg, mode_offset, mode,	\
-+#define MUX_CFG_7XX(desc, mux_reg, mode_offset, mode,	\
- 		   pull_bit, pull_status, debug_status)\
- {							\
- 	.name =	 desc,					\
- 	.debug = debug_status,				\
--	MUX_REG_730(mux_reg, mode_offset, mode)		\
--	PULL_REG_730(mux_reg, pull_bit, pull_status)	\
-+	MUX_REG_7XX(mux_reg, mode_offset, mode)		\
-+	PULL_REG_7XX(mux_reg, pull_bit, pull_status)	\
- 	PU_PD_REG(NA, 0)		\
- },
- 
--#define MUX_CFG_850(desc, mux_reg, mode_offset, mode,	\
--		   pull_bit, pull_status, debug_status)\
--{							\
--	.name =	 desc,					\
--	.debug = debug_status,				\
--	MUX_REG_850(mux_reg, mode_offset, mode)		\
--	PULL_REG_850(mux_reg, pull_bit, pull_status)	\
--	PU_PD_REG(NA, 0)		\
--},
--
--
- #define MUX_CFG_24XX(desc, reg_offset, mode,			\
- 				pull_en, pull_mode, dbg)	\
- {								\
-@@ -232,45 +202,25 @@ struct pin_config {
- 
- };
- 
--enum omap730_index {
-+enum omap7xx_index {
- 	/* OMAP 730 keyboard */
--	E2_730_KBR0,
--	J7_730_KBR1,
--	E1_730_KBR2,
--	F3_730_KBR3,
--	D2_730_KBR4,
--	C2_730_KBC0,
--	D3_730_KBC1,
--	E4_730_KBC2,
--	F4_730_KBC3,
--	E3_730_KBC4,
--
--	/* USB */
--	AA17_730_USB_DM,
--	W16_730_USB_PU_EN,
--	W17_730_USB_VBUSI,
--};
--
--enum omap850_index {
--	/* OMAP 850 keyboard */
--	E2_850_KBR0,
--	J7_850_KBR1,
--	E1_850_KBR2,
--	F3_850_KBR3,
--	D2_850_KBR4,
--	C2_850_KBC0,
--	D3_850_KBC1,
--	E4_850_KBC2,
--	F4_850_KBC3,
--	E3_850_KBC4,
-+	E2_7XX_KBR0,
-+	J7_7XX_KBR1,
-+	E1_7XX_KBR2,
-+	F3_7XX_KBR3,
-+	D2_7XX_KBR4,
-+	C2_7XX_KBC0,
-+	D3_7XX_KBC1,
-+	E4_7XX_KBC2,
-+	F4_7XX_KBC3,
-+	E3_7XX_KBC4,
- 
- 	/* USB */
--	AA17_850_USB_DM,
--	W16_850_USB_PU_EN,
--	W17_850_USB_VBUSI,
-+	AA17_7XX_USB_DM,
-+	W16_7XX_USB_PU_EN,
-+	W17_7XX_USB_VBUSI,
- };
- 
--
- enum omap1xxx_index {
- 	/* UART1 (BT_UART_GATING)*/
- 	UART1_TX = 0,
---- a/arch/arm/plat-omap/include/mach/omap34xx.h
-+++ b/arch/arm/plat-omap/include/mach/omap34xx.h
-@@ -74,8 +74,12 @@
- 
- #define OMAP34XX_IVA_INTC_BASE	0x40000000
- #define OMAP34XX_HSUSB_OTG_BASE	(L4_34XX_BASE + 0xAB000)
--#define OMAP34XX_HSUSB_HOST_BASE	(L4_34XX_BASE + 0x64000)
- #define OMAP34XX_USBTLL_BASE	(L4_34XX_BASE + 0x62000)
-+#define OMAP34XX_UHH_CONFIG_BASE	(L4_34XX_BASE + 0x64000)
-+#define OMAP34XX_OHCI_BASE	(L4_34XX_BASE + 0x64400)
-+#define OMAP34XX_EHCI_BASE	(L4_34XX_BASE + 0x64800)
-+#define OMAP34XX_SR1_BASE	0x480C9000
-+#define OMAP34XX_SR2_BASE	0x480CB000
- 
- #define OMAP34XX_MAILBOX_BASE		(L4_34XX_BASE + 0x94000)
- 
---- a/arch/arm/plat-omap/include/mach/omap44xx.h
-+++ b/arch/arm/plat-omap/include/mach/omap44xx.h
-@@ -22,6 +22,9 @@
- #define L4_PER_44XX_BASE		0x48000000
- #define L4_EMU_44XX_BASE		0x54000000
- #define L3_44XX_BASE			0x44000000
-+#define OMAP44XX_EMIF1_BASE		0x4c000000
-+#define OMAP44XX_EMIF2_BASE		0x4d000000
-+#define OMAP44XX_DMM_BASE		0x4e000000
- #define OMAP4430_32KSYNCT_BASE		0x4a304000
- #define OMAP4430_CM_BASE		0x4a004000
- #define OMAP4430_PRM_BASE		0x48306000
-@@ -33,14 +36,9 @@
- #define IRQ_SIR_IRQ			0x0040
- #define OMAP44XX_GIC_DIST_BASE		0x48241000
- #define OMAP44XX_GIC_CPU_BASE		0x48240100
--#define OMAP44XX_VA_GIC_CPU_BASE	OMAP2_IO_ADDRESS(OMAP44XX_GIC_CPU_BASE)
- #define OMAP44XX_SCU_BASE		0x48240000
--#define OMAP44XX_VA_SCU_BASE		OMAP2_IO_ADDRESS(OMAP44XX_SCU_BASE)
- #define OMAP44XX_LOCAL_TWD_BASE		0x48240600
--#define OMAP44XX_VA_LOCAL_TWD_BASE	OMAP2_IO_ADDRESS(OMAP44XX_LOCAL_TWD_BASE)
--#define OMAP44XX_LOCAL_TWD_SIZE		0x00000100
- #define OMAP44XX_WKUPGEN_BASE		0x48281000
--#define OMAP44XX_VA_WKUPGEN_BASE	OMAP2_IO_ADDRESS(OMAP44XX_WKUPGEN_BASE)
- 
- #endif /* __ASM_ARCH_OMAP44XX_H */
- 
---- /dev/null
-+++ b/arch/arm/plat-omap/include/mach/omap7xx.h
-@@ -0,0 +1,104 @@
-+/* arch/arm/plat-omap/include/mach/omap7xx.h
-+ *
-+ * Hardware definitions for TI OMAP7XX processor.
-+ *
-+ * Cleanup for Linux-2.6 by Dirk Behme <dirk.behme@de.bosch.com>
-+ * Adapted for omap850 by Zebediah C. McClure <zmc@lurian.net>
-+ * Adapted for omap7xx by Alistair Buxton <a.j.buxton@gmail.com>
-+ *
-+ * 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.
-+ *
-+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
-+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
-+ * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ * You should have received a copy of the  GNU General Public License along
-+ * with this program; if not, write  to the Free Software Foundation, Inc.,
-+ * 675 Mass Ave, Cambridge, MA 02139, USA.
-+ */
-+
-+#ifndef __ASM_ARCH_OMAP7XX_H
-+#define __ASM_ARCH_OMAP7XX_H
-+
-+/*
-+ * ----------------------------------------------------------------------------
-+ * Base addresses
-+ * ----------------------------------------------------------------------------
-+ */
-+
-+/* Syntax: XX_BASE = Virtual base address, XX_START = Physical base address */
-+
-+#define OMAP7XX_DSP_BASE	0xE0000000
-+#define OMAP7XX_DSP_SIZE	0x50000
-+#define OMAP7XX_DSP_START	0xE0000000
-+
-+#define OMAP7XX_DSPREG_BASE	0xE1000000
-+#define OMAP7XX_DSPREG_SIZE	SZ_128K
-+#define OMAP7XX_DSPREG_START	0xE1000000
-+
-+/*
-+ * ----------------------------------------------------------------------------
-+ * OMAP7XX specific configuration registers
-+ * ----------------------------------------------------------------------------
-+ */
-+#define OMAP7XX_CONFIG_BASE	0xfffe1000
-+#define OMAP7XX_IO_CONF_0	0xfffe1070
-+#define OMAP7XX_IO_CONF_1	0xfffe1074
-+#define OMAP7XX_IO_CONF_2	0xfffe1078
-+#define OMAP7XX_IO_CONF_3	0xfffe107c
-+#define OMAP7XX_IO_CONF_4	0xfffe1080
-+#define OMAP7XX_IO_CONF_5	0xfffe1084
-+#define OMAP7XX_IO_CONF_6	0xfffe1088
-+#define OMAP7XX_IO_CONF_7	0xfffe108c
-+#define OMAP7XX_IO_CONF_8	0xfffe1090
-+#define OMAP7XX_IO_CONF_9	0xfffe1094
-+#define OMAP7XX_IO_CONF_10	0xfffe1098
-+#define OMAP7XX_IO_CONF_11	0xfffe109c
-+#define OMAP7XX_IO_CONF_12	0xfffe10a0
-+#define OMAP7XX_IO_CONF_13	0xfffe10a4
-+
-+#define OMAP7XX_MODE_1		0xfffe1010
-+#define OMAP7XX_MODE_2		0xfffe1014
-+
-+/* CSMI specials: in terms of base + offset */
-+#define OMAP7XX_MODE2_OFFSET	0x14
-+
-+/*
-+ * ----------------------------------------------------------------------------
-+ * OMAP7XX traffic controller configuration registers
-+ * ----------------------------------------------------------------------------
-+ */
-+#define OMAP7XX_FLASH_CFG_0	0xfffecc10
-+#define OMAP7XX_FLASH_ACFG_0	0xfffecc50
-+#define OMAP7XX_FLASH_CFG_1	0xfffecc14
-+#define OMAP7XX_FLASH_ACFG_1	0xfffecc54
-+
-+/*
-+ * ----------------------------------------------------------------------------
-+ * OMAP7XX DSP control registers
-+ * ----------------------------------------------------------------------------
-+ */
-+#define OMAP7XX_ICR_BASE	0xfffbb800
-+#define OMAP7XX_DSP_M_CTL	0xfffbb804
-+#define OMAP7XX_DSP_MMU_BASE	0xfffed200
-+
-+/*
-+ * ----------------------------------------------------------------------------
-+ * OMAP7XX PCC_UPLD configuration registers
-+ * ----------------------------------------------------------------------------
-+ */
-+#define OMAP7XX_PCC_UPLD_CTRL_BASE	(0xfffe0900)
-+#define OMAP7XX_PCC_UPLD_CTRL		(OMAP7XX_PCC_UPLD_CTRL_BASE + 0x00)
-+
-+#endif /*  __ASM_ARCH_OMAP7XX_H */
-+
---- a/arch/arm/plat-omap/include/mach/sdrc.h
-+++ b/arch/arm/plat-omap/include/mach/sdrc.h
-@@ -80,11 +80,11 @@
-  */
- 
- #define OMAP242X_SMS_REGADDR(reg)					\
--			(void __iomem *)OMAP2_IO_ADDRESS(OMAP2420_SMS_BASE + reg)
-+		(void __iomem *)OMAP2_L3_IO_ADDRESS(OMAP2420_SMS_BASE + reg)
- #define OMAP243X_SMS_REGADDR(reg)					\
--			(void __iomem *)OMAP2_IO_ADDRESS(OMAP243X_SMS_BASE + reg)
-+		(void __iomem *)OMAP2_L3_IO_ADDRESS(OMAP243X_SMS_BASE + reg)
- #define OMAP343X_SMS_REGADDR(reg)					\
--			(void __iomem *)OMAP2_IO_ADDRESS(OMAP343X_SMS_BASE + reg)
-+		(void __iomem *)OMAP2_L3_IO_ADDRESS(OMAP343X_SMS_BASE + reg)
- 
- /* SMS register offsets - read/write with sms_{read,write}_reg() */
- 
---- a/arch/arm/plat-omap/include/mach/serial.h
-+++ b/arch/arm/plat-omap/include/mach/serial.h
-@@ -20,26 +20,22 @@
- #define OMAP_UART1_BASE		0xfffb0000
- #define OMAP_UART2_BASE		0xfffb0800
- #define OMAP_UART3_BASE		0xfffb9800
--#define OMAP_MAX_NR_PORTS	3
- #elif defined(CONFIG_ARCH_OMAP2)
- /* OMAP2 serial ports */
- #define OMAP_UART1_BASE		0x4806a000
- #define OMAP_UART2_BASE		0x4806c000
- #define OMAP_UART3_BASE		0x4806e000
--#define OMAP_MAX_NR_PORTS	3
- #elif defined(CONFIG_ARCH_OMAP3)
- /* OMAP3 serial ports */
- #define OMAP_UART1_BASE		0x4806a000
- #define OMAP_UART2_BASE		0x4806c000
- #define OMAP_UART3_BASE		0x49020000
--#define OMAP_MAX_NR_PORTS	3
- #elif defined(CONFIG_ARCH_OMAP4)
- /* OMAP4 serial ports */
- #define OMAP_UART1_BASE		0x4806a000
- #define OMAP_UART2_BASE		0x4806c000
- #define OMAP_UART3_BASE		0x48020000
- #define OMAP_UART4_BASE		0x4806e000
--#define OMAP_MAX_NR_PORTS	4
- #endif
- 
- #define OMAP1510_BASE_BAUD	(12000000/16)
---- a/arch/arm/plat-omap/include/mach/uncompress.h
-+++ b/arch/arm/plat-omap/include/mach/uncompress.h
-@@ -25,6 +25,7 @@ unsigned int system_rev;
- 
- #define UART_OMAP_MDR1		0x08	/* mode definition register */
- #define OMAP_ID_730		0x355F
-+#define OMAP_ID_850		0x362C
- #define ID_MASK			0x7fff
- #define check_port(base, shift) ((base[UART_OMAP_MDR1 << shift] & 7) == 0)
- #define omap_get_id() ((*(volatile unsigned int *)(0xfffed404)) >> 12) & ID_MASK
-@@ -53,7 +54,7 @@ static void putc(int c)
- 		/* MMU is not on, so cpu_is_omapXXXX() won't work here */
- 		unsigned int omap_id = omap_get_id();
- 
--		if (omap_id == OMAP_ID_730)
-+		if (omap_id == OMAP_ID_730 || omap_id == OMAP_ID_850)
- 			shift = 0;
- 
- 		if (check_port(uart, shift))
---- a/arch/arm/plat-omap/include/mach/usb.h
-+++ b/arch/arm/plat-omap/include/mach/usb.h
-@@ -5,6 +5,21 @@
- 
- #include <mach/board.h>
- 
-+#define OMAP3_HS_USB_PORTS	3
-+enum ehci_hcd_omap_mode {
-+	EHCI_HCD_OMAP_MODE_UNKNOWN,
-+	EHCI_HCD_OMAP_MODE_PHY,
-+	EHCI_HCD_OMAP_MODE_TLL,
-+};
-+
-+struct ehci_hcd_omap_platform_data {
-+	enum ehci_hcd_omap_mode		port_mode[OMAP3_HS_USB_PORTS];
-+	unsigned			phy_reset:1;
-+
-+	/* have to be valid if phy_reset is true and portx is in phy mode */
-+	int	reset_gpio_port[OMAP3_HS_USB_PORTS];
-+};
-+
- /*-------------------------------------------------------------------------*/
- 
- #define OMAP1_OTG_BASE			0xfffb0400
-@@ -29,6 +44,8 @@
- 
- extern void usb_musb_init(void);
- 
-+extern void usb_ehci_init(struct ehci_hcd_omap_platform_data *pdata);
-+
- #endif
- 
- void omap_usb_init(struct omap_usb_config *pdata);
---- a/arch/arm/plat-omap/include/mach/vmalloc.h
-+++ b/arch/arm/plat-omap/include/mach/vmalloc.h
-@@ -17,5 +17,5 @@
-  * along with this program; if not, write to the Free Software
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-  */
--#define VMALLOC_END	  (PAGE_OFFSET + 0x18000000)
-+#define VMALLOC_END	  (PAGE_OFFSET + 0x38000000)
- 
---- a/arch/arm/plat-omap/io.c
-+++ b/arch/arm/plat-omap/io.c
-@@ -13,7 +13,7 @@
- #include <linux/io.h>
- #include <linux/mm.h>
- 
--#include <mach/omap730.h>
-+#include <mach/omap7xx.h>
- #include <mach/omap1510.h>
- #include <mach/omap16xx.h>
- #include <mach/omap24xx.h>
-@@ -33,13 +33,13 @@ void __iomem *omap_ioremap(unsigned long
- 		if (BETWEEN(p, OMAP1_IO_PHYS, OMAP1_IO_SIZE))
- 			return XLATE(p, OMAP1_IO_PHYS, OMAP1_IO_VIRT);
- 	}
--	if (cpu_is_omap730()) {
--		if (BETWEEN(p, OMAP730_DSP_BASE, OMAP730_DSP_SIZE))
--			return XLATE(p, OMAP730_DSP_BASE, OMAP730_DSP_START);
--
--		if (BETWEEN(p, OMAP730_DSPREG_BASE, OMAP730_DSPREG_SIZE))
--			return XLATE(p, OMAP730_DSPREG_BASE,
--					OMAP730_DSPREG_START);
-+	if (cpu_is_omap7xx()) {
-+		if (BETWEEN(p, OMAP7XX_DSP_BASE, OMAP7XX_DSP_SIZE))
-+			return XLATE(p, OMAP7XX_DSP_BASE, OMAP7XX_DSP_START);
-+
-+		if (BETWEEN(p, OMAP7XX_DSPREG_BASE, OMAP7XX_DSPREG_SIZE))
-+			return XLATE(p, OMAP7XX_DSPREG_BASE,
-+					OMAP7XX_DSPREG_START);
- 	}
- 	if (cpu_is_omap15xx()) {
- 		if (BETWEEN(p, OMAP1510_DSP_BASE, OMAP1510_DSP_SIZE))
-@@ -114,6 +114,14 @@ void __iomem *omap_ioremap(unsigned long
- 			return XLATE(p, L4_WK_44XX_PHYS, L4_WK_44XX_VIRT);
- 		if (BETWEEN(p, OMAP44XX_GPMC_PHYS, OMAP44XX_GPMC_SIZE))
- 			return XLATE(p, OMAP44XX_GPMC_PHYS, OMAP44XX_GPMC_VIRT);
-+		if (BETWEEN(p, OMAP44XX_EMIF1_PHYS, OMAP44XX_EMIF1_SIZE))
-+			return XLATE(p, OMAP44XX_EMIF1_PHYS,		\
-+							OMAP44XX_EMIF1_VIRT);
-+		if (BETWEEN(p, OMAP44XX_EMIF2_PHYS, OMAP44XX_EMIF2_SIZE))
-+			return XLATE(p, OMAP44XX_EMIF2_PHYS,		\
-+							OMAP44XX_EMIF2_VIRT);
-+		if (BETWEEN(p, OMAP44XX_DMM_PHYS, OMAP44XX_DMM_SIZE))
-+			return XLATE(p, OMAP44XX_DMM_PHYS, OMAP44XX_DMM_VIRT);
- 		if (BETWEEN(p, L4_PER_44XX_PHYS, L4_PER_44XX_SIZE))
- 			return XLATE(p, L4_PER_44XX_PHYS, L4_PER_44XX_VIRT);
- 		if (BETWEEN(p, L4_EMU_44XX_PHYS, L4_EMU_44XX_SIZE))
-@@ -142,7 +150,7 @@ u8 omap_readb(u32 pa)
- 	if (cpu_class_is_omap1())
- 		return __raw_readb(OMAP1_IO_ADDRESS(pa));
- 	else
--		return __raw_readb(OMAP2_IO_ADDRESS(pa));
-+		return __raw_readb(OMAP2_L4_IO_ADDRESS(pa));
- }
- EXPORT_SYMBOL(omap_readb);
- 
-@@ -151,7 +159,7 @@ u16 omap_readw(u32 pa)
- 	if (cpu_class_is_omap1())
- 		return __raw_readw(OMAP1_IO_ADDRESS(pa));
- 	else
--		return __raw_readw(OMAP2_IO_ADDRESS(pa));
-+		return __raw_readw(OMAP2_L4_IO_ADDRESS(pa));
- }
- EXPORT_SYMBOL(omap_readw);
- 
-@@ -160,7 +168,7 @@ u32 omap_readl(u32 pa)
- 	if (cpu_class_is_omap1())
- 		return __raw_readl(OMAP1_IO_ADDRESS(pa));
- 	else
--		return __raw_readl(OMAP2_IO_ADDRESS(pa));
-+		return __raw_readl(OMAP2_L4_IO_ADDRESS(pa));
- }
- EXPORT_SYMBOL(omap_readl);
- 
-@@ -169,7 +177,7 @@ void omap_writeb(u8 v, u32 pa)
- 	if (cpu_class_is_omap1())
- 		__raw_writeb(v, OMAP1_IO_ADDRESS(pa));
- 	else
--		__raw_writeb(v, OMAP2_IO_ADDRESS(pa));
-+		__raw_writeb(v, OMAP2_L4_IO_ADDRESS(pa));
- }
- EXPORT_SYMBOL(omap_writeb);
- 
-@@ -178,7 +186,7 @@ void omap_writew(u16 v, u32 pa)
- 	if (cpu_class_is_omap1())
- 		__raw_writew(v, OMAP1_IO_ADDRESS(pa));
- 	else
--		__raw_writew(v, OMAP2_IO_ADDRESS(pa));
-+		__raw_writew(v, OMAP2_L4_IO_ADDRESS(pa));
- }
- EXPORT_SYMBOL(omap_writew);
- 
-@@ -187,6 +195,6 @@ void omap_writel(u32 v, u32 pa)
- 	if (cpu_class_is_omap1())
- 		__raw_writel(v, OMAP1_IO_ADDRESS(pa));
- 	else
--		__raw_writel(v, OMAP2_IO_ADDRESS(pa));
-+		__raw_writel(v, OMAP2_L4_IO_ADDRESS(pa));
- }
- EXPORT_SYMBOL(omap_writel);
---- a/arch/arm/plat-omap/omap_device.c
-+++ b/arch/arm/plat-omap/omap_device.c
-@@ -103,21 +103,6 @@
- /* Private functions */
- 
- /**
-- * _read_32ksynct - read the OMAP 32K sync timer
-- *
-- * Returns the current value of the 32KiHz synchronization counter.
-- * XXX this should be generalized to simply read the system clocksource.
-- * XXX this should be moved to a separate synctimer32k.c file
-- */
--static u32 _read_32ksynct(void)
--{
--	if (!cpu_class_is_omap2())
--		BUG();
--
--	return __raw_readl(OMAP2_IO_ADDRESS(OMAP_32KSYNCT_BASE + 0x010));
--}
--
--/**
-  * _omap_device_activate - increase device readiness
-  * @od: struct omap_device *
-  * @ignore_lat: increase to latency target (0) or full readiness (1)?
-@@ -133,13 +118,13 @@ static u32 _read_32ksynct(void)
-  */
- static int _omap_device_activate(struct omap_device *od, u8 ignore_lat)
- {
--	u32 a, b;
-+	struct timespec a, b, c;
- 
- 	pr_debug("omap_device: %s: activating\n", od->pdev.name);
- 
- 	while (od->pm_lat_level > 0) {
- 		struct omap_device_pm_latency *odpl;
--		int act_lat = 0;
-+		unsigned long long act_lat = 0;
- 
- 		od->pm_lat_level--;
- 
-@@ -149,20 +134,22 @@ static int _omap_device_activate(struct 
- 		    (od->dev_wakeup_lat <= od->_dev_wakeup_lat_limit))
- 			break;
- 
--		a = _read_32ksynct();
-+		getnstimeofday(&a);
- 
- 		/* XXX check return code */
- 		odpl->activate_func(od);
- 
--		b = _read_32ksynct();
-+		getnstimeofday(&b);
- 
--		act_lat = (b - a) >> 15; /* 32KiHz cycles to microseconds */
-+		c = timespec_sub(b, a);
-+		act_lat = timespec_to_ns(&c) * NSEC_PER_USEC;
- 
- 		pr_debug("omap_device: %s: pm_lat %d: activate: elapsed time "
--			 "%d usec\n", od->pdev.name, od->pm_lat_level, act_lat);
-+			 "%llu usec\n", od->pdev.name, od->pm_lat_level,
-+			 act_lat);
- 
- 		WARN(act_lat > odpl->activate_lat, "omap_device: %s.%d: "
--		     "activate step %d took longer than expected (%d > %d)\n",
-+		     "activate step %d took longer than expected (%llu > %d)\n",
- 		     od->pdev.name, od->pdev.id, od->pm_lat_level,
- 		     act_lat, odpl->activate_lat);
- 
-@@ -188,13 +175,13 @@ static int _omap_device_activate(struct 
-  */
- static int _omap_device_deactivate(struct omap_device *od, u8 ignore_lat)
- {
--	u32 a, b;
-+	struct timespec a, b, c;
- 
- 	pr_debug("omap_device: %s: deactivating\n", od->pdev.name);
- 
- 	while (od->pm_lat_level < od->pm_lats_cnt) {
- 		struct omap_device_pm_latency *odpl;
--		int deact_lat = 0;
-+		unsigned long long deact_lat = 0;
- 
- 		odpl = od->pm_lats + od->pm_lat_level;
- 
-@@ -203,23 +190,24 @@ static int _omap_device_deactivate(struc
- 		     od->_dev_wakeup_lat_limit))
- 			break;
- 
--		a = _read_32ksynct();
-+		getnstimeofday(&a);
- 
- 		/* XXX check return code */
- 		odpl->deactivate_func(od);
- 
--		b = _read_32ksynct();
-+		getnstimeofday(&b);
- 
--		deact_lat = (b - a) >> 15; /* 32KiHz cycles to microseconds */
-+		c = timespec_sub(b, a);
-+		deact_lat = timespec_to_ns(&c) * NSEC_PER_USEC;
- 
- 		pr_debug("omap_device: %s: pm_lat %d: deactivate: elapsed time "
--			 "%d usec\n", od->pdev.name, od->pm_lat_level,
-+			 "%llu usec\n", od->pdev.name, od->pm_lat_level,
- 			 deact_lat);
- 
- 		WARN(deact_lat > odpl->deactivate_lat, "omap_device: %s.%d: "
--		     "deactivate step %d took longer than expected (%d > %d)\n",
--		     od->pdev.name, od->pdev.id, od->pm_lat_level,
--		     deact_lat, odpl->deactivate_lat);
-+		     "deactivate step %d took longer than expected "
-+		     "(%llu > %d)\n", od->pdev.name, od->pdev.id,
-+		     od->pm_lat_level, deact_lat, odpl->deactivate_lat);
- 
- 		od->dev_wakeup_lat += odpl->activate_lat;
- 
---- a/arch/arm/plat-omap/sram.c
-+++ b/arch/arm/plat-omap/sram.c
-@@ -42,14 +42,14 @@
- #define OMAP1_SRAM_VA		VMALLOC_END
- #define OMAP2_SRAM_PA		0x40200000
- #define OMAP2_SRAM_PUB_PA	0x4020f800
--#define OMAP2_SRAM_VA		0xe3000000
-+#define OMAP2_SRAM_VA		0xfe400000
- #define OMAP2_SRAM_PUB_VA	(OMAP2_SRAM_VA + 0x800)
- #define OMAP3_SRAM_PA           0x40200000
--#define OMAP3_SRAM_VA           0xe3000000
-+#define OMAP3_SRAM_VA           0xfe400000
- #define OMAP3_SRAM_PUB_PA       0x40208000
- #define OMAP3_SRAM_PUB_VA       (OMAP3_SRAM_VA + 0x8000)
- #define OMAP4_SRAM_PA		0x40200000		/*0x402f0000*/
--#define OMAP4_SRAM_VA		0xd7000000		/*0xd70f0000*/
-+#define OMAP4_SRAM_VA		0xfe400000		/*0xfe4f0000*/
- 
- #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
- #define SRAM_BOOTLOADER_SZ	0x00
-@@ -57,16 +57,16 @@
- #define SRAM_BOOTLOADER_SZ	0x80
- #endif
- 
--#define OMAP24XX_VA_REQINFOPERM0	OMAP2_IO_ADDRESS(0x68005048)
--#define OMAP24XX_VA_READPERM0		OMAP2_IO_ADDRESS(0x68005050)
--#define OMAP24XX_VA_WRITEPERM0		OMAP2_IO_ADDRESS(0x68005058)
--
--#define OMAP34XX_VA_REQINFOPERM0	OMAP2_IO_ADDRESS(0x68012848)
--#define OMAP34XX_VA_READPERM0		OMAP2_IO_ADDRESS(0x68012850)
--#define OMAP34XX_VA_WRITEPERM0		OMAP2_IO_ADDRESS(0x68012858)
--#define OMAP34XX_VA_ADDR_MATCH2		OMAP2_IO_ADDRESS(0x68012880)
--#define OMAP34XX_VA_SMS_RG_ATT0		OMAP2_IO_ADDRESS(0x6C000048)
--#define OMAP34XX_VA_CONTROL_STAT	OMAP2_IO_ADDRESS(0x480022F0)
-+#define OMAP24XX_VA_REQINFOPERM0	OMAP2_L3_IO_ADDRESS(0x68005048)
-+#define OMAP24XX_VA_READPERM0		OMAP2_L3_IO_ADDRESS(0x68005050)
-+#define OMAP24XX_VA_WRITEPERM0		OMAP2_L3_IO_ADDRESS(0x68005058)
-+
-+#define OMAP34XX_VA_REQINFOPERM0	OMAP2_L3_IO_ADDRESS(0x68012848)
-+#define OMAP34XX_VA_READPERM0		OMAP2_L3_IO_ADDRESS(0x68012850)
-+#define OMAP34XX_VA_WRITEPERM0		OMAP2_L3_IO_ADDRESS(0x68012858)
-+#define OMAP34XX_VA_ADDR_MATCH2		OMAP2_L3_IO_ADDRESS(0x68012880)
-+#define OMAP34XX_VA_SMS_RG_ATT0		OMAP2_L3_IO_ADDRESS(0x6C000048)
-+#define OMAP34XX_VA_CONTROL_STAT	OMAP2_L4_IO_ADDRESS(0x480022F0)
- 
- #define GP_DEVICE		0x300
- 
---- a/arch/arm/plat-omap/usb.c
-+++ b/arch/arm/plat-omap/usb.c
-@@ -614,8 +614,8 @@ omap_otg_init(struct omap_usb_config *co
- 	if (config->otg || config->register_host) {
- 		syscon &= ~HST_IDLE_EN;
- 		ohci_device.dev.platform_data = config;
--		if (cpu_is_omap730())
--			ohci_resources[1].start = INT_730_USB_HHC_1;
-+		if (cpu_is_omap7xx())
-+			ohci_resources[1].start = INT_7XX_USB_HHC_1;
- 		status = platform_device_register(&ohci_device);
- 		if (status)
- 			pr_debug("can't register OHCI device, %d\n", status);
-@@ -626,8 +626,8 @@ omap_otg_init(struct omap_usb_config *co
- 	if (config->otg) {
- 		syscon &= ~OTG_IDLE_EN;
- 		otg_device.dev.platform_data = config;
--		if (cpu_is_omap730())
--			otg_resources[1].start = INT_730_USB_OTG;
-+		if (cpu_is_omap7xx())
-+			otg_resources[1].start = INT_7XX_USB_OTG;
- 		status = platform_device_register(&otg_device);
- 		if (status)
- 			pr_debug("can't register OTG device, %d\n", status);
-@@ -731,7 +731,7 @@ static inline void omap_1510_usb_init(st
- 
- void __init omap_usb_init(struct omap_usb_config *pdata)
- {
--	if (cpu_is_omap730() || cpu_is_omap16xx() || cpu_is_omap24xx())
-+	if (cpu_is_omap7xx() || cpu_is_omap16xx() || cpu_is_omap24xx())
- 		omap_otg_init(pdata);
- 	else if (cpu_is_omap15xx())
- 		omap_1510_usb_init(pdata);
---- a/drivers/Makefile
-+++ b/drivers/Makefile
-@@ -72,7 +72,7 @@ obj-$(CONFIG_GAMEPORT)		+= input/gamepor
- obj-$(CONFIG_INPUT)		+= input/
- obj-$(CONFIG_I2O)		+= message/
- obj-$(CONFIG_RTC_LIB)		+= rtc/
--obj-y				+= i2c/ media/
-+obj-y				+= i2c/ media/ cbus/
- obj-$(CONFIG_PPS)		+= pps/
- obj-$(CONFIG_W1)		+= w1/
- obj-$(CONFIG_POWER_SUPPLY)	+= power/
---- /dev/null
-+++ b/drivers/cbus/Kconfig
-@@ -0,0 +1,89 @@
-+#
-+# CBUS device configuration
-+#
-+
-+menu "CBUS support"
-+
-+config CBUS
-+	depends on ARCH_OMAP
-+	bool "CBUS support on OMAP"
-+	---help---
-+	  CBUS is a proprietary serial protocol by Nokia.  It is mainly
-+	  used for accessing Energy Management auxiliary chips.
-+
-+	  If you want CBUS support, you should say Y here.
-+
-+config CBUS_TAHVO
-+	depends on CBUS
-+	bool "Support for Tahvo"
-+	---help---
-+	  Tahvo is a mixed signal ASIC with some system features
-+
-+	  If you want Tahvo support, you should say Y here.
-+
-+config CBUS_TAHVO_USER
-+	depends on CBUS_TAHVO
-+	bool "Support for Tahvo user space functions"
-+	---help---
-+	  If you want support for Tahvo's user space read/write etc. functions,
-+	  you should say Y here.
-+
-+config CBUS_TAHVO_USB
-+	depends on CBUS_TAHVO && USB
-+	tristate "Support for Tahvo USB transceiver"
-+	---help---
-+	  If you want Tahvo support for USB transceiver, say Y or M here.
-+
-+config CBUS_TAHVO_USB_HOST_BY_DEFAULT
-+	depends on CBUS_TAHVO_USB && USB_OTG
-+	boolean "Device in USB host mode by default"
-+	---help---
-+	  Say Y here, if you want the device to enter USB host mode
-+	  by default on bootup.
-+
-+config CBUS_RETU
-+	depends on CBUS
-+	bool "Support for Retu"
-+	---help---
-+	  Retu is a mixed signal ASIC with some system features
-+
-+	  If you want Retu support, you should say Y here.
-+
-+config CBUS_RETU_USER
-+	depends on CBUS_RETU
-+	bool "Support for Retu user space functions"
-+	---help---
-+	  If you want support for Retu's user space read/write etc. functions,
-+	  you should say Y here.
-+
-+config CBUS_RETU_POWERBUTTON
-+	depends on CBUS_RETU
-+	bool "Support for Retu power button"
-+	---help---
-+	  The power button on Nokia 770 is connected to the Retu ASIC.
-+
-+	  If you want support for the Retu power button, you should say Y here.
-+
-+config CBUS_RETU_RTC
-+	depends on CBUS_RETU && SYSFS
-+	tristate "Support for Retu pseudo-RTC"
-+	---help---
-+	  Say Y here if you want support for the device that alleges to be an
-+	  RTC in Retu. This will expose a sysfs interface for it.
-+
-+config CBUS_RETU_WDT
-+	depends on CBUS_RETU && SYSFS
-+	tristate "Support for Retu watchdog timer"
-+	---help---
-+	  Say Y here if you want support for the watchdog in Retu. This will
-+	  expose a sysfs interface to grok it.
-+
-+config CBUS_RETU_HEADSET
-+	depends on CBUS_RETU && SYSFS
-+	tristate "Support for headset detection with Retu/Vilma"
-+	---help---
-+	  Say Y here if you want support detecting a headset that's connected
-+	  to Retu/Vilma. Detection state and events are exposed through
-+	  sysfs.
-+
-+endmenu
---- /dev/null
-+++ b/drivers/cbus/Makefile
-@@ -0,0 +1,14 @@
-+#
-+# Makefile for CBUS.
-+#
-+
-+obj-$(CONFIG_CBUS)		+= cbus.o
-+obj-$(CONFIG_CBUS_TAHVO)	+= tahvo.o
-+obj-$(CONFIG_CBUS_RETU)		+= retu.o
-+obj-$(CONFIG_CBUS_TAHVO_USB)	+= tahvo-usb.o
-+obj-$(CONFIG_CBUS_RETU_POWERBUTTON) += retu-pwrbutton.o
-+obj-$(CONFIG_CBUS_RETU_RTC)	+= retu-rtc.o
-+obj-$(CONFIG_CBUS_RETU_WDT)	+= retu-wdt.o
-+obj-$(CONFIG_CBUS_TAHVO_USER)	+= tahvo-user.o
-+obj-$(CONFIG_CBUS_RETU_USER)	+= retu-user.o
-+obj-$(CONFIG_CBUS_RETU_HEADSET)	+= retu-headset.o
---- /dev/null
-+++ b/drivers/cbus/cbus.c
-@@ -0,0 +1,293 @@
-+/*
-+ * drivers/cbus/cbus.c
-+ *
-+ * Support functions for CBUS serial protocol
-+ *
-+ * Copyright (C) 2004, 2005 Nokia Corporation
-+ *
-+ * Written by Juha Yrjölä <juha.yrjola@nokia.com>,
-+ *	      David Weinehall <david.weinehall@nokia.com>, and
-+ *	      Mikko Ylinen <mikko.k.ylinen@nokia.com>
-+ *
-+ * This file is subject to the terms and conditions of the GNU General
-+ * Public License. See the file "COPYING" in the main directory of this
-+ * archive for more details.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#include <linux/device.h>
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/delay.h>
-+#include <linux/spinlock.h>
-+#include <linux/gpio.h>
-+
-+#include <mach/board.h>
-+#include <mach/board-nokia.h>
-+
-+#include <asm/io.h>
-+
-+#include "cbus.h"
-+
-+struct cbus_host *cbus_host = NULL;
-+
-+#ifdef CONFIG_ARCH_OMAP1
-+/* We use our own MPUIO functions to get closer to 1MHz bus speed */
-+
-+static inline void cbus_set_gpio_direction(u32 base, int mpuio, int is_input)
-+{
-+	u16 w;
-+
-+	mpuio &= 0x0f;
-+	w = __raw_readw(base + OMAP_MPUIO_IO_CNTL);
-+	if (is_input)
-+		w |= 1 << mpuio;
-+	else
-+		w &= ~(1 << mpuio);
-+	__raw_writew(w, base + OMAP_MPUIO_IO_CNTL);
-+
-+}
-+
-+static inline void cbus_set_gpio_dataout(u32 base, int mpuio, int enable)
-+{
-+	u16 w;
-+
-+	mpuio &= 0x0f;
-+	w = __raw_readw(base + OMAP_MPUIO_OUTPUT);
-+	if (enable)
-+		w |= 1 << mpuio;
-+	else
-+		w &= ~(1 << mpuio);
-+	__raw_writew(w, base + OMAP_MPUIO_OUTPUT);
-+}
-+
-+static inline int cbus_get_gpio_datain(u32 base, int mpuio)
-+{
-+	mpuio &= 0x0f;
-+
-+	return (__raw_readw(base + OMAP_MPUIO_INPUT_LATCH) & (1 << mpuio)) != 0;
-+}
-+
-+static void cbus_send_bit(struct cbus_host *host, u32 base, int bit,
-+			  int set_to_input)
-+{
-+	cbus_set_gpio_dataout(base, host->dat_gpio, bit ? 1 : 0);
-+	cbus_set_gpio_dataout(base, host->clk_gpio, 1);
-+
-+	/* The data bit is read on the rising edge of CLK */
-+	if (set_to_input)
-+		cbus_set_gpio_direction(base, host->dat_gpio, 1);
-+
-+	cbus_set_gpio_dataout(base, host->clk_gpio, 0);
-+}
-+
-+static u8 cbus_receive_bit(struct cbus_host *host, u32 base)
-+{
-+	u8 ret;
-+
-+	cbus_set_gpio_dataout(base, host->clk_gpio, 1);
-+	ret = cbus_get_gpio_datain(base, host->dat_gpio);
-+	cbus_set_gpio_dataout(base, host->clk_gpio, 0);
-+
-+	return ret;
-+}
-+
-+#define cbus_output(base, gpio, val)	cbus_set_gpio_direction(base, gpio, 0)
-+
-+#else
-+
-+#define cbus_output(base, gpio, val)	gpio_direction_output(gpio, val)
-+#define cbus_set_gpio_dataout(base, gpio, enable) gpio_set_value(gpio, enable)
-+#define cbus_get_gpio_datain(base, int, gpio) gpio_get_value(gpio)
-+
-+static void _cbus_send_bit(struct cbus_host *host, int bit, int set_to_input)
-+{
-+	gpio_set_value(host->dat_gpio, bit ? 1 : 0);
-+	gpio_set_value(host->clk_gpio, 1);
-+
-+	/* The data bit is read on the rising edge of CLK */
-+	if (set_to_input)
-+		gpio_direction_input(host->dat_gpio);
-+
-+	gpio_set_value(host->clk_gpio, 0);
-+}
-+
-+static u8 _cbus_receive_bit(struct cbus_host *host)
-+{
-+	u8 ret;
-+
-+	gpio_set_value(host->clk_gpio, 1);
-+	ret = gpio_get_value(host->dat_gpio);
-+	gpio_set_value(host->clk_gpio, 0);
-+
-+	return ret;
-+}
-+
-+#define cbus_send_bit(host, base, bit, set_to_input) _cbus_send_bit(host, bit, set_to_input)
-+#define cbus_receive_bit(host, base) _cbus_receive_bit(host)
-+
-+#endif
-+
-+static int cbus_transfer(struct cbus_host *host, int dev, int reg, int data)
-+{
-+	int i;
-+	int is_read = 0;
-+	unsigned long flags;
-+	u32 base;
-+
-+#ifdef CONFIG_ARCH_OMAP1
-+	base = OMAP1_IO_ADDRESS(OMAP_MPUIO_BASE);
-+#else
-+	base = 0;
-+#endif
-+
-+	if (data < 0)
-+		is_read = 1;
-+
-+	/* We don't want interrupts disturbing our transfer */
-+	spin_lock_irqsave(&host->lock, flags);
-+
-+	/* Reset state and start of transfer, SEL stays down during transfer */
-+	cbus_set_gpio_dataout(base, host->sel_gpio, 0);
-+
-+	/* Set the DAT pin to output */
-+	cbus_output(base, host->dat_gpio, 1);
-+
-+	/* Send the device address */
-+	for (i = 3; i > 0; i--)
-+		cbus_send_bit(host, base, dev & (1 << (i - 1)), 0);
-+
-+	/* Send the rw flag */
-+	cbus_send_bit(host, base, is_read, 0);
-+
-+	/* Send the register address */
-+	for (i = 5; i > 0; i--) {
-+		int set_to_input = 0;
-+
-+		if (is_read && i == 1)
-+			set_to_input = 1;
-+
-+		cbus_send_bit(host, base, reg & (1 << (i - 1)), set_to_input);
-+	}
-+
-+	if (!is_read) {
-+		for (i = 16; i > 0; i--)
-+			cbus_send_bit(host, base, data & (1 << (i - 1)), 0);
-+	} else {
-+		cbus_set_gpio_dataout(base, host->clk_gpio, 1);
-+		data = 0;
-+
-+		for (i = 16; i > 0; i--) {
-+			u8 bit = cbus_receive_bit(host, base);
-+
-+			if (bit)
-+				data |= 1 << (i - 1);
-+		}
-+	}
-+
-+	/* Indicate end of transfer, SEL goes up until next transfer */
-+	cbus_set_gpio_dataout(base, host->sel_gpio, 1);
-+	cbus_set_gpio_dataout(base, host->clk_gpio, 1);
-+	cbus_set_gpio_dataout(base, host->clk_gpio, 0);
-+
-+	spin_unlock_irqrestore(&host->lock, flags);
-+
-+	return is_read ? data : 0;
-+}
-+
-+/*
-+ * Read a given register from the device
-+ */
-+int cbus_read_reg(struct cbus_host *host, int dev, int reg)
-+{
-+	return cbus_host ? cbus_transfer(host, dev, reg, -1) : -ENODEV;
-+}
-+
-+/*
-+ * Write to a given register of the device
-+ */
-+int cbus_write_reg(struct cbus_host *host, int dev, int reg, u16 val)
-+{
-+	return cbus_host ? cbus_transfer(host, dev, reg, (int)val) : -ENODEV;
-+}
-+
-+int __init cbus_bus_init(void)
-+{
-+	const struct omap_cbus_config * cbus_config;
-+	struct cbus_host *chost;
-+	int ret;
-+
-+	chost = kmalloc(sizeof (*chost), GFP_KERNEL);
-+	if (chost == NULL)
-+		return -ENOMEM;
-+
-+	memset(chost, 0, sizeof (*chost));
-+
-+	spin_lock_init(&chost->lock);
-+
-+	cbus_config = omap_get_config(OMAP_TAG_CBUS, struct omap_cbus_config);
-+
-+	if (cbus_config == NULL) {
-+		printk(KERN_ERR "cbus: Unable to retrieve config data\n");
-+		return -ENODATA;
-+	}
-+
-+	chost->clk_gpio = cbus_config->clk_gpio;
-+	chost->dat_gpio = cbus_config->dat_gpio;
-+	chost->sel_gpio = cbus_config->sel_gpio;
-+
-+#ifdef CONFIG_ARCH_OMAP1
-+	if (!OMAP_GPIO_IS_MPUIO(chost->clk_gpio) ||
-+	    !OMAP_GPIO_IS_MPUIO(chost->dat_gpio) ||
-+	    !OMAP_GPIO_IS_MPUIO(chost->sel_gpio)) {
-+		printk(KERN_ERR "cbus: Only MPUIO pins supported\n");
-+		ret = -ENODEV;
-+		goto exit1;
-+	}
-+#endif
-+
-+	if ((ret = gpio_request(chost->clk_gpio, "CBUS clk")) < 0)
-+		goto exit1;
-+
-+	if ((ret = gpio_request(chost->dat_gpio, "CBUS data")) < 0)
-+		goto exit2;
-+
-+	if ((ret = gpio_request(chost->sel_gpio, "CBUS sel")) < 0)
-+		goto exit3;
-+
-+	gpio_direction_output(chost->clk_gpio, 0);
-+	gpio_direction_input(chost->dat_gpio);
-+	gpio_direction_output(chost->sel_gpio, 1);
-+
-+	gpio_set_value(chost->clk_gpio, 1);
-+	gpio_set_value(chost->clk_gpio, 0);
-+
-+	cbus_host = chost;
-+
-+	return 0;
-+exit3:
-+	gpio_free(chost->dat_gpio);
-+exit2:
-+	gpio_free(chost->clk_gpio);
-+exit1:
-+	kfree(chost);
-+	return ret;
-+}
-+
-+subsys_initcall(cbus_bus_init);
-+
-+EXPORT_SYMBOL(cbus_host);
-+EXPORT_SYMBOL(cbus_read_reg);
-+EXPORT_SYMBOL(cbus_write_reg);
-+
-+MODULE_DESCRIPTION("CBUS serial protocol");
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Juha Yrjölä, David Weinehall, and Mikko Ylinen");
---- /dev/null
-+++ b/drivers/cbus/cbus.h
-@@ -0,0 +1,36 @@
-+/*
-+ * drivers/cbus/cbus.h
-+ *
-+ * Copyright (C) 2004, 2005 Nokia Corporation
-+ *
-+ * Written by Juha Yrjölä <juha.yrjola@nokia.com> and
-+ *	      David Weinehall <david.weinehall@nokia.com>
-+ *
-+ * This file is subject to the terms and conditions of the GNU General
-+ * Public License. See the file "COPYING" in the main directory of this
-+ * archive for more details.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#ifndef __DRIVERS_CBUS_CBUS_H
-+#define __DRIVERS_CBUS_CBUS_H
-+
-+struct cbus_host {
-+	int clk_gpio, dat_gpio, sel_gpio;
-+        spinlock_t lock;
-+};
-+
-+extern struct cbus_host *cbus_host;
-+
-+extern int cbus_read_reg(struct cbus_host *host, int dev, int reg);
-+extern int cbus_write_reg(struct cbus_host *host, int dev, int reg, u16 val);
-+
-+#endif /* __DRIVERS_CBUS_CBUS_H */
---- /dev/null
-+++ b/drivers/cbus/retu-headset.c
-@@ -0,0 +1,355 @@
-+/**
-+ * Retu/Vilma headset detection
-+ *
-+ * Copyright (C) 2006 Nokia Corporation
-+ *
-+ * Written by Juha Yrjölä
-+ *
-+ * This file is subject to the terms and conditions of the GNU General
-+ * Public License. See the file "COPYING" in the main directory of this
-+ * archive for more details.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/delay.h>
-+#include <linux/input.h>
-+#include <linux/platform_device.h>
-+
-+#include "retu.h"
-+
-+#define RETU_ADC_CHANNEL_HOOKDET	0x05
-+
-+#define RETU_HEADSET_KEY		KEY_PHONE
-+
-+struct retu_headset {
-+	spinlock_t			lock;
-+	struct mutex			mutex;
-+	struct platform_device		*pdev;
-+	struct input_dev		*idev;
-+	unsigned			bias_enabled;
-+	unsigned			detection_enabled;
-+	unsigned			pressed;
-+	struct timer_list		enable_timer;
-+	struct timer_list		detect_timer;
-+};
-+
-+static void retu_headset_set_bias(int enable)
-+{
-+	if (enable) {
-+		retu_set_clear_reg_bits(RETU_REG_AUDTXR,
-+					(1 << 0) | (1 << 1), 0);
-+		msleep(2);
-+		retu_set_clear_reg_bits(RETU_REG_AUDTXR, 1 << 3, 0);
-+	} else {
-+		retu_set_clear_reg_bits(RETU_REG_AUDTXR, 0,
-+					(1 << 0) | (1 << 1) | (1 << 3));
-+	}
-+}
-+
-+static void retu_headset_enable(struct retu_headset *hs)
-+{
-+	mutex_lock(&hs->mutex);
-+	if (!hs->bias_enabled) {
-+		hs->bias_enabled = 1;
-+		retu_headset_set_bias(1);
-+	}
-+	mutex_unlock(&hs->mutex);
-+}
-+
-+static void retu_headset_disable(struct retu_headset *hs)
-+{
-+	mutex_lock(&hs->mutex);
-+	if (hs->bias_enabled) {
-+		hs->bias_enabled = 0;
-+		retu_headset_set_bias(0);
-+	}
-+	mutex_unlock(&hs->mutex);
-+}
-+
-+static void retu_headset_det_enable(struct retu_headset *hs)
-+{
-+	mutex_lock(&hs->mutex);
-+	if (!hs->detection_enabled) {
-+		hs->detection_enabled = 1;
-+		retu_set_clear_reg_bits(RETU_REG_CC1, (1 << 10) | (1 << 8), 0);
-+		retu_enable_irq(RETU_INT_HOOK);
-+	}
-+	mutex_unlock(&hs->mutex);
-+}
-+
-+static void retu_headset_det_disable(struct retu_headset *hs)
-+{
-+	unsigned long flags;
-+
-+	mutex_lock(&hs->mutex);
-+	if (hs->detection_enabled) {
-+		hs->detection_enabled = 0;
-+		retu_disable_irq(RETU_INT_HOOK);
-+		del_timer_sync(&hs->enable_timer);
-+		del_timer_sync(&hs->detect_timer);
-+		spin_lock_irqsave(&hs->lock, flags);
-+		if (hs->pressed)
-+			input_report_key(hs->idev, RETU_HEADSET_KEY, 0);
-+		spin_unlock_irqrestore(&hs->lock, flags);
-+		retu_set_clear_reg_bits(RETU_REG_CC1, 0, (1 << 10) | (1 << 8));
-+	}
-+	mutex_unlock(&hs->mutex);
-+}
-+
-+static ssize_t retu_headset_hookdet_show(struct device *dev,
-+					 struct device_attribute *attr,
-+					 char *buf)
-+{
-+	int val;
-+
-+	val = retu_read_adc(RETU_ADC_CHANNEL_HOOKDET);
-+	return sprintf(buf, "%d\n", val);
-+}
-+
-+static DEVICE_ATTR(hookdet, S_IRUGO, retu_headset_hookdet_show, NULL);
-+
-+static ssize_t retu_headset_enable_show(struct device *dev,
-+					struct device_attribute *attr,
-+					char *buf)
-+{
-+	struct retu_headset *hs = dev_get_drvdata(dev);
-+
-+	return sprintf(buf, "%u\n", hs->bias_enabled);
-+}
-+
-+static ssize_t retu_headset_enable_store(struct device *dev,
-+					 struct device_attribute *attr,
-+					 const char *buf, size_t count)
-+{
-+	struct retu_headset *hs = dev_get_drvdata(dev);
-+	int enable;
-+
-+	if (sscanf(buf, "%u", &enable) != 1)
-+		return -EINVAL;
-+	if (enable)
-+		retu_headset_enable(hs);
-+	else
-+	        retu_headset_disable(hs);
-+	return count;
-+}
-+
-+static DEVICE_ATTR(enable, S_IRUGO | S_IWUSR | S_IWGRP,
-+		   retu_headset_enable_show, retu_headset_enable_store);
-+
-+static ssize_t retu_headset_enable_det_show(struct device *dev,
-+					    struct device_attribute *attr,
-+					    char *buf)
-+{
-+	struct retu_headset *hs = dev_get_drvdata(dev);
-+
-+	return sprintf(buf, "%u\n", hs->detection_enabled);
-+}
-+
-+static ssize_t retu_headset_enable_det_store(struct device *dev,
-+					     struct device_attribute *attr,
-+					     const char *buf, size_t count)
-+{
-+	struct retu_headset *hs = dev_get_drvdata(dev);
-+	int enable;
-+
-+	if (sscanf(buf, "%u", &enable) != 1)
-+		return -EINVAL;
-+	if (enable)
-+		retu_headset_det_enable(hs);
-+	else
-+	        retu_headset_det_disable(hs);
-+	return count;
-+}
-+
-+static DEVICE_ATTR(enable_det, S_IRUGO | S_IWUSR | S_IWGRP,
-+		   retu_headset_enable_det_show,
-+		   retu_headset_enable_det_store);
-+
-+static void retu_headset_hook_interrupt(unsigned long arg)
-+{
-+	struct retu_headset *hs = (struct retu_headset *) arg;
-+	unsigned long flags;
-+
-+	retu_ack_irq(RETU_INT_HOOK);
-+	spin_lock_irqsave(&hs->lock, flags);
-+	if (!hs->pressed) {
-+		/* Headset button was just pressed down. */
-+		hs->pressed = 1;
-+		input_report_key(hs->idev, RETU_HEADSET_KEY, 1);
-+	}
-+	spin_unlock_irqrestore(&hs->lock, flags);
-+	retu_set_clear_reg_bits(RETU_REG_CC1, 0, (1 << 10) | (1 << 8));
-+	mod_timer(&hs->enable_timer, jiffies + msecs_to_jiffies(50));
-+}
-+
-+static void retu_headset_enable_timer(unsigned long arg)
-+{
-+	struct retu_headset *hs = (struct retu_headset *) arg;
-+
-+	retu_set_clear_reg_bits(RETU_REG_CC1, (1 << 10) | (1 << 8), 0);
-+	mod_timer(&hs->detect_timer, jiffies + msecs_to_jiffies(350));
-+}
-+
-+static void retu_headset_detect_timer(unsigned long arg)
-+{
-+	struct retu_headset *hs = (struct retu_headset *) arg;
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&hs->lock, flags);
-+	if (hs->pressed) {
-+		hs->pressed = 0;
-+		input_report_key(hs->idev, RETU_HEADSET_KEY, 0);
-+	}
-+	spin_unlock_irqrestore(&hs->lock, flags);
-+}
-+
-+static int __init retu_headset_probe(struct platform_device *pdev)
-+{
-+	struct retu_headset *hs;
-+	int r;
-+
-+	hs = kzalloc(sizeof(*hs), GFP_KERNEL);
-+	if (hs == NULL)
-+		return -ENOMEM;
-+
-+	hs->pdev = pdev;
-+
-+	hs->idev = input_allocate_device();
-+	if (hs->idev == NULL) {
-+		r = -ENOMEM;
-+		goto err1;
-+	}
-+	hs->idev->name = "retu-headset";
-+	hs->idev->dev.parent = &pdev->dev;
-+	set_bit(EV_KEY, hs->idev->evbit);
-+	set_bit(RETU_HEADSET_KEY, hs->idev->keybit);
-+	r = input_register_device(hs->idev);
-+	if (r < 0)
-+		goto err2;
-+
-+	r = device_create_file(&pdev->dev, &dev_attr_hookdet);
-+	if (r < 0)
-+		goto err3;
-+	r = device_create_file(&pdev->dev, &dev_attr_enable);
-+	if (r < 0)
-+		goto err4;
-+	r = device_create_file(&pdev->dev, &dev_attr_enable_det);
-+	if (r < 0)
-+		goto err5;
-+	platform_set_drvdata(pdev, hs);
-+
-+	spin_lock_init(&hs->lock);
-+	mutex_init(&hs->mutex);
-+	setup_timer(&hs->enable_timer, retu_headset_enable_timer,
-+		    (unsigned long) hs);
-+	setup_timer(&hs->detect_timer, retu_headset_detect_timer,
-+		    (unsigned long) hs);
-+
-+	r = retu_request_irq(RETU_INT_HOOK, retu_headset_hook_interrupt,
-+			     (unsigned long) hs, "hookdet");
-+	if (r != 0) {
-+		dev_err(&pdev->dev, "hookdet IRQ not available\n");
-+		goto err6;
-+	}
-+	retu_disable_irq(RETU_INT_HOOK);
-+	return 0;
-+err6:
-+	device_remove_file(&pdev->dev, &dev_attr_enable_det);
-+err5:
-+	device_remove_file(&pdev->dev, &dev_attr_enable);
-+err4:
-+	device_remove_file(&pdev->dev, &dev_attr_hookdet);
-+err3:
-+	input_unregister_device(hs->idev);
-+err2:
-+	input_free_device(hs->idev);
-+err1:
-+	kfree(hs);
-+	return r;
-+}
-+
-+static int retu_headset_remove(struct platform_device *pdev)
-+{
-+	struct retu_headset *hs = platform_get_drvdata(pdev);
-+
-+	device_remove_file(&pdev->dev, &dev_attr_hookdet);
-+	device_remove_file(&pdev->dev, &dev_attr_enable);
-+	device_remove_file(&pdev->dev, &dev_attr_enable_det);
-+	retu_headset_disable(hs);
-+	retu_headset_det_disable(hs);
-+	retu_free_irq(RETU_INT_HOOK);
-+	input_unregister_device(hs->idev);
-+	input_free_device(hs->idev);
-+	return 0;
-+}
-+
-+static int retu_headset_suspend(struct platform_device *pdev,
-+				pm_message_t mesg)
-+{
-+	struct retu_headset *hs = platform_get_drvdata(pdev);
-+
-+	mutex_lock(&hs->mutex);
-+	if (hs->bias_enabled)
-+		retu_headset_set_bias(0);
-+	mutex_unlock(&hs->mutex);
-+
-+	return 0;
-+}
-+
-+static int retu_headset_resume(struct platform_device *pdev)
-+{
-+	struct retu_headset *hs = platform_get_drvdata(pdev);
-+
-+	mutex_lock(&hs->mutex);
-+	if (hs->bias_enabled)
-+		retu_headset_set_bias(1);
-+	mutex_unlock(&hs->mutex);
-+
-+	return 0;
-+}
-+
-+static struct platform_driver retu_headset_driver = {
-+	.probe		= retu_headset_probe,
-+	.remove		= retu_headset_remove,
-+	.suspend	= retu_headset_suspend,
-+	.resume		= retu_headset_resume,
-+	.driver		= {
-+		.name	= "retu-headset",
-+	},
-+};
-+
-+static int __init retu_headset_init(void)
-+{
-+	int r;
-+
-+	printk(KERN_INFO "Retu/Vilma headset driver initializing\n");
-+
-+	r = platform_driver_register(&retu_headset_driver);
-+	if (r < 0)
-+		return r;
-+
-+	return 0;
-+}
-+
-+static void __exit retu_headset_exit(void)
-+{
-+	platform_driver_unregister(&retu_headset_driver);
-+}
-+
-+module_init(retu_headset_init);
-+module_exit(retu_headset_exit);
-+
-+MODULE_DESCRIPTION("Retu/Vilma headset detection");
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Juha Yrjölä");
---- /dev/null
-+++ b/drivers/cbus/retu-pwrbutton.c
-@@ -0,0 +1,118 @@
-+/**
-+ * drivers/cbus/retu-pwrbutton.c
-+ *
-+ * Driver for sending retu power button event to input-layer
-+ *
-+ * Copyright (C) 2004 Nokia Corporation
-+ *
-+ * Written by Ari Saastamoinen <ari.saastamoinen@elektrobit.com>
-+ *
-+ * Contact Juha Yrjölä <juha.yrjola@nokia.com>
-+ *
-+ * This file is subject to the terms and conditions of the GNU General
-+ * Public License. See the file "COPYING" in the main directory of this
-+ * archive for more details.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/errno.h>
-+#include <linux/input.h>
-+#include <linux/timer.h>
-+#include <linux/jiffies.h>
-+#include <linux/bitops.h>
-+
-+#include "retu.h"
-+
-+#define RETU_STATUS_PWRONX	(1 << 5)
-+
-+#define PWRBTN_DELAY		20
-+#define PWRBTN_UP		0
-+#define PWRBTN_PRESSED		1
-+
-+static int pwrbtn_state;
-+static struct input_dev *pwrbtn_dev;
-+static struct timer_list pwrbtn_timer;
-+
-+static void retubutton_timer_func(unsigned long arg)
-+{
-+	int state;
-+
-+	if (retu_read_reg(RETU_REG_STATUS) & RETU_STATUS_PWRONX)
-+		state = PWRBTN_UP;
-+	else
-+		state = PWRBTN_PRESSED;
-+
-+	if (pwrbtn_state != state) {
-+		input_report_key(pwrbtn_dev, KEY_POWER, state);
-+		pwrbtn_state = state;
-+	}
-+}
-+
-+/**
-+ * Interrupt function is called whenever power button key is pressed
-+ * or released.
-+ */
-+static void retubutton_irq(unsigned long arg)
-+{
-+	retu_ack_irq(RETU_INT_PWR);
-+	mod_timer(&pwrbtn_timer, jiffies + msecs_to_jiffies(PWRBTN_DELAY));
-+}
-+
-+/**
-+ * Init function.
-+ * Allocates interrupt for power button and registers itself to input layer.
-+ */
-+static int __init retubutton_init(void)
-+{
-+	int irq;
-+
-+	printk(KERN_INFO "Retu power button driver initialized\n");
-+	irq = RETU_INT_PWR;
-+
-+	init_timer(&pwrbtn_timer);
-+	pwrbtn_timer.function = retubutton_timer_func;
-+
-+	if (retu_request_irq(irq, &retubutton_irq, 0, "PwrOnX") < 0) {
-+		printk(KERN_ERR "%s@%s: Cannot allocate irq\n",
-+		       __FUNCTION__, __FILE__);
-+		return -EBUSY;
-+	}
-+
-+	pwrbtn_dev = input_allocate_device();
-+	if (!pwrbtn_dev)
-+		return -ENOMEM;
-+
-+	pwrbtn_dev->evbit[0] = BIT_MASK(EV_KEY);
-+	pwrbtn_dev->keybit[BIT_WORD(KEY_POWER)] = BIT_MASK(KEY_POWER);
-+	pwrbtn_dev->name = "retu-pwrbutton";
-+
-+	return input_register_device(pwrbtn_dev);
-+}
-+
-+/**
-+ * Cleanup function which is called when driver is unloaded
-+ */
-+static void __exit retubutton_exit(void)
-+{
-+	retu_free_irq(RETU_INT_PWR);
-+	del_timer_sync(&pwrbtn_timer);
-+	input_unregister_device(pwrbtn_dev);
-+}
-+
-+module_init(retubutton_init);
-+module_exit(retubutton_exit);
-+
-+MODULE_DESCRIPTION("Retu Power Button");
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Ari Saastamoinen");
---- /dev/null
-+++ b/drivers/cbus/retu-rtc.c
-@@ -0,0 +1,477 @@
-+/**
-+ * drivers/cbus/retu-rtc.c
-+ *
-+ * Support for Retu RTC
-+ *
-+ * Copyright (C) 2004, 2005 Nokia Corporation
-+ *
-+ * Written by Paul Mundt <paul.mundt@nokia.com> and
-+ *            Igor Stoppa <igor.stoppa@nokia.com>
-+ *
-+ * The Retu RTC is essentially a partial read-only RTC that gives us Retu's
-+ * idea of what time actually is. It's left as a userspace excercise to map
-+ * this back to time in the real world and ensure that calibration settings
-+ * are sane to compensate for any horrible drift (on account of not being able
-+ * to set the clock to anything).
-+ *
-+ * Days are semi-writeable. Namely, Retu will only track 255 days for us
-+ * consecutively, after which the counter is explicitly stuck at 255 until
-+ * someone comes along and clears it with a write. In the event that no one
-+ * comes along and clears it, we no longer have any idea what day it is.
-+ *
-+ * This file is subject to the terms and conditions of the GNU General
-+ * Public License. See the file "COPYING" in the main directory of this
-+ * archive for more details.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#include <linux/device.h>
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/completion.h>
-+#include <linux/platform_device.h>
-+#include <linux/mutex.h>
-+#include <linux/workqueue.h>
-+
-+#include "cbus.h"
-+#include "retu.h"
-+
-+static struct mutex retu_rtc_mutex;
-+static u16 retu_rtc_alarm_expired;
-+static u16 retu_rtc_reset_occurred;
-+
-+static DECLARE_COMPLETION(retu_rtc_exited);
-+static DECLARE_COMPLETION(retu_rtc_sync);
-+
-+static void retu_rtc_barrier(void);
-+
-+static void retu_rtc_device_release(struct device *dev)
-+{
-+	complete(&retu_rtc_exited);
-+}
-+
-+static ssize_t retu_rtc_time_show(struct device *dev, struct device_attribute *attr,
-+				  char *buf)
-+{
-+	u16 dsr, hmr, dsr2;
-+
-+	mutex_lock(&retu_rtc_mutex);
-+
-+	do {
-+		u16 dummy;
-+
-+		/*
-+		 * Not being in_interrupt() for a retu rtc IRQ, we need to
-+		 * read twice for consistency..
-+		 */
-+		dummy	= retu_read_reg(RETU_REG_RTCDSR);
-+		dsr	= retu_read_reg(RETU_REG_RTCDSR);
-+
-+		dummy	= retu_read_reg(RETU_REG_RTCHMR);
-+		hmr	= retu_read_reg(RETU_REG_RTCHMR);
-+
-+		dummy	= retu_read_reg(RETU_REG_RTCDSR);
-+		dsr2	= retu_read_reg(RETU_REG_RTCDSR);
-+	} while ((dsr != dsr2));
-+
-+	mutex_unlock(&retu_rtc_mutex);
-+
-+	/*
-+	 * Format a 32-bit date-string for userspace
-+	 *
-+	 * days | hours | minutes | seconds
-+	 *
-+	 * 8 bits for each.
-+	 *
-+	 * This mostly sucks because days and seconds are tracked in RTCDSR
-+	 * while hours and minutes are tracked in RTCHMR. And yes, there
-+	 * really are no words that can describe an 8 bit day register (or
-+	 * rather, none that will be reprinted here).
-+	 */
-+	return sprintf(buf, "0x%08x\n", (((dsr >> 8) & 0xff) << 24) |
-+				        (((hmr >> 8) & 0x1f) << 16) |
-+					 ((hmr & 0x3f) << 8) | (dsr & 0x3f));
-+}
-+
-+static ssize_t retu_rtc_time_store(struct device *dev, struct device_attribute *attr,
-+				   const char *buf, size_t count)
-+{
-+	mutex_lock(&retu_rtc_mutex);
-+	/*
-+	 * Writing anything to the day counter forces it to 0
-+	 * The seconds counter would be cleared by resetting the minutes counter,
-+	 * however this won't happen, since we are using the hh:mm counters as
-+	 * a set of free running counters and the day counter as a multiple
-+	 * overflow holder.
-+	 */
-+
-+	/* Reset day counter, but keep Temperature Shutdown state */
-+	retu_write_reg(RETU_REG_RTCDSR,
-+		       retu_read_reg(RETU_REG_RTCDSR) & (1 << 6));
-+
-+	mutex_unlock(&retu_rtc_mutex);
-+
-+	return count;
-+}
-+
-+static DEVICE_ATTR(time, S_IRUGO | S_IWUSR, retu_rtc_time_show,
-+		   retu_rtc_time_store);
-+
-+
-+static ssize_t retu_rtc_reset_show(struct device *dev, struct device_attribute *attr, char *buf)
-+{
-+	/*
-+	 * Returns the status of the rtc
-+	 *
-+	 * 0: no reset has occurred or the status has been cleared
-+	 * 1: a reset has occurred
-+	 *
-+	 * RTC needs to be reset only when both main battery
-+	 * _AND_ backup battery are discharged
-+	 */
-+	return sprintf(buf, "%u\n", retu_rtc_reset_occurred);
-+}
-+
-+static void retu_rtc_do_reset(void)
-+{
-+	u16 ccr1;
-+
-+	ccr1 = retu_read_reg(RETU_REG_CC1);
-+	/* RTC in reset */
-+	retu_write_reg(RETU_REG_CC1, ccr1 | 0x0001);
-+	/* RTC in normal operating mode */
-+	retu_write_reg(RETU_REG_CC1, ccr1 & ~0x0001);
-+
-+	retu_rtc_barrier();
-+	/* Disable alarm and RTC WD */
-+	retu_write_reg(RETU_REG_RTCHMAR, 0x7f3f);
-+	/* Set Calibration register to default value */
-+	retu_write_reg(RETU_REG_RTCCALR, 0x00c0);
-+
-+	retu_rtc_alarm_expired = 0;
-+	retu_rtc_reset_occurred = 1;
-+}
-+
-+static ssize_t retu_rtc_reset_store(struct device *dev, struct device_attribute *attr,
-+				    const char *buf, size_t count)
-+{
-+	unsigned choice;
-+
-+	if(sscanf(buf, "%u", &choice) != 1)
-+		return count;
-+	mutex_lock(&retu_rtc_mutex);
-+	if (choice == 0)
-+		retu_rtc_reset_occurred = 0;
-+	else if (choice == 1)
-+		retu_rtc_do_reset();
-+	mutex_unlock(&retu_rtc_mutex);
-+	return count;
-+}
-+
-+static DEVICE_ATTR(reset, S_IRUGO | S_IWUSR, retu_rtc_reset_show,
-+		   retu_rtc_reset_store);
-+
-+static ssize_t retu_rtc_alarm_show(struct device *dev, struct device_attribute *attr,
-+				   char *buf)
-+{
-+	u16 chmar;
-+	ssize_t retval;
-+
-+	mutex_lock(&retu_rtc_mutex);
-+	/*
-+	 * Format a 16-bit date-string for userspace
-+	 *
-+	 * hours | minutes
-+	 * 8 bits for each.
-+	 */
-+	chmar = retu_read_reg(RETU_REG_RTCHMAR);
-+	/* No shifting needed, only masking unrelated bits */
-+	retval = sprintf(buf, "0x%04x\n", chmar & 0x1f3f);
-+	mutex_unlock(&retu_rtc_mutex);
-+
-+	return retval;
-+}
-+
-+static ssize_t retu_rtc_alarm_store(struct device *dev, struct device_attribute *attr,
-+				    const char *buf, size_t count)
-+{
-+	u16 chmar;
-+	unsigned alrm;
-+	unsigned hours;
-+	unsigned minutes;
-+
-+	mutex_lock(&retu_rtc_mutex);
-+
-+	if(sscanf(buf, "%x", &alrm) != 1)
-+		return count;
-+	hours = (alrm >> 8) & 0x001f;
-+	minutes = (alrm >> 0) & 0x003f;
-+	if ((hours < 24 && minutes < 60) || (hours == 24 && minutes == 60)) {
-+		/*
-+		 * OK, the time format for the alarm is valid (including the
-+		 * disabling values)
-+		 */
-+		/* Keeps the RTC watchdog status */
-+		chmar = retu_read_reg(RETU_REG_RTCHMAR) & 0x6000;
-+		chmar |= alrm & 0x1f3f;	/* Stores the requested alarm */
-+		retu_rtc_barrier();
-+		retu_write_reg(RETU_REG_RTCHMAR, chmar);
-+		/* If the alarm is being disabled */
-+		if (hours == 24 && minutes == 60) {
-+			/* disable the interrupt */
-+			retu_disable_irq(RETU_INT_RTCA);
-+			retu_rtc_alarm_expired = 0;
-+		} else
-+			/* enable the interrupt */
-+			retu_enable_irq(RETU_INT_RTCA);
-+	}
-+	mutex_unlock(&retu_rtc_mutex);
-+
-+	return count;
-+}
-+
-+static DEVICE_ATTR(alarm, S_IRUGO | S_IWUSR, retu_rtc_alarm_show,
-+		   retu_rtc_alarm_store);
-+
-+static ssize_t retu_rtc_alarm_expired_show(struct device *dev, struct device_attribute *attr,
-+					   char *buf)
-+{
-+	ssize_t retval;
-+
-+	retval = sprintf(buf, "%u\n", retu_rtc_alarm_expired);
-+
-+	return retval;
-+}
-+
-+static ssize_t retu_rtc_alarm_expired_store(struct device *dev, struct device_attribute *attr,
-+					    const char *buf, size_t count)
-+{
-+	retu_rtc_alarm_expired = 0;
-+
-+	return count;
-+}
-+
-+static DEVICE_ATTR(alarm_expired, S_IRUGO | S_IWUSR, retu_rtc_alarm_expired_show,
-+		   retu_rtc_alarm_expired_store);
-+
-+
-+static ssize_t retu_rtc_cal_show(struct device *dev, struct device_attribute *attr,
-+				 char *buf)
-+{
-+	u16 rtccalr1;
-+
-+	mutex_lock(&retu_rtc_mutex);
-+	rtccalr1 = retu_read_reg(RETU_REG_RTCCALR);
-+	mutex_unlock(&retu_rtc_mutex);
-+
-+	/*
-+	 * Shows the status of the Calibration Register.
-+	 *
-+	 * Default, after power loss: 0x0000
-+	 * Default, for R&D: 0x00C0
-+	 * Default, for factory: 0x00??
-+	 *
-+	 */
-+	return sprintf(buf, "0x%04x\n", rtccalr1 & 0x00ff);
-+}
-+
-+static ssize_t retu_rtc_cal_store(struct device *dev, struct device_attribute *attr,
-+				  const char *buf, size_t count)
-+{
-+	unsigned calibration_value;
-+
-+	if (sscanf(buf, "%x", &calibration_value) != 1)
-+		return count;
-+
-+	mutex_lock(&retu_rtc_mutex);
-+	retu_rtc_barrier();
-+	retu_write_reg(RETU_REG_RTCCALR, calibration_value & 0x00ff);
-+	mutex_unlock(&retu_rtc_mutex);
-+
-+	return count;
-+}
-+
-+static DEVICE_ATTR(cal, S_IRUGO | S_IWUSR, retu_rtc_cal_show,
-+		   retu_rtc_cal_store);
-+
-+static struct platform_device retu_rtc_device;
-+
-+static void retu_rtca_disable(void)
-+{
-+	retu_disable_irq(RETU_INT_RTCA);
-+	retu_rtc_alarm_expired = 1;
-+	retu_rtc_barrier();
-+	retu_write_reg(RETU_REG_RTCHMAR, (24 << 8) | 60);
-+}
-+
-+static void retu_rtca_expired(struct work_struct *unused)
-+{
-+	retu_rtca_disable();
-+	sysfs_notify(&retu_rtc_device.dev.kobj, NULL, "alarm_expired");
-+}
-+
-+DECLARE_WORK(retu_rtca_work, retu_rtca_expired);
-+
-+/*
-+ * RTCHMR RTCHMAR RTCCAL must be accessed within 0.9 s since the seconds
-+ * interrupt has been signaled in the IDR register
-+ */
-+static void retu_rtcs_interrupt(unsigned long unused)
-+{
-+	retu_ack_irq(RETU_INT_RTCS);
-+	complete_all(&retu_rtc_sync);
-+}
-+
-+static void retu_rtca_interrupt(unsigned long unused)
-+{
-+	retu_ack_irq(RETU_INT_RTCA);
-+	schedule_work(&retu_rtca_work);
-+}
-+
-+static int retu_rtc_init_irq(void)
-+{
-+	int ret;
-+
-+	ret = retu_request_irq(RETU_INT_RTCS, retu_rtcs_interrupt, 0, "RTCS");
-+	if (ret != 0)
-+		return ret;
-+	/*
-+	 * We will take care of enabling and disabling the interrupt
-+	 * elsewhere, so leave it off by default..
-+	 */
-+	retu_disable_irq(RETU_INT_RTCS);
-+
-+	ret = retu_request_irq(RETU_INT_RTCA, retu_rtca_interrupt, 0, "RTCA");
-+	if (ret != 0) {
-+		retu_free_irq(RETU_INT_RTCS);
-+		return ret;
-+	}
-+	retu_disable_irq(RETU_INT_RTCA);
-+
-+	return 0;
-+}
-+
-+
-+static int __devinit retu_rtc_probe(struct device *dev)
-+{
-+	int r;
-+
-+	retu_rtc_alarm_expired = retu_read_reg(RETU_REG_IDR) &
-+					       (0x1 << RETU_INT_RTCA);
-+
-+	if ((r = retu_rtc_init_irq()) != 0)
-+		return r;
-+
-+	mutex_init(&retu_rtc_mutex);
-+
-+	/* If the calibration register is zero, we've probably lost
-+	 * power */
-+	if (retu_read_reg(RETU_REG_RTCCALR) & 0x00ff)
-+		retu_rtc_reset_occurred = 0;
-+	else
-+		retu_rtc_do_reset();
-+
-+	if ((r = device_create_file(dev, &dev_attr_time)) != 0)
-+		return r;
-+	else if ((r = device_create_file(dev, &dev_attr_reset)) != 0)
-+		goto err_unregister_time;
-+	else if ((r = device_create_file(dev, &dev_attr_alarm)) != 0)
-+		goto err_unregister_reset;
-+	else if ((r = device_create_file(dev, &dev_attr_alarm_expired)) != 0)
-+		goto err_unregister_alarm;
-+	else if ((r = device_create_file(dev, &dev_attr_cal)) != 0)
-+		goto err_unregister_alarm_expired;
-+	else
-+		return r;
-+
-+err_unregister_alarm_expired:
-+	device_remove_file(dev, &dev_attr_alarm_expired);
-+err_unregister_alarm:
-+	device_remove_file(dev, &dev_attr_alarm);
-+err_unregister_reset:
-+	device_remove_file(dev, &dev_attr_reset);
-+err_unregister_time:
-+	device_remove_file(dev, &dev_attr_time);
-+	return r;
-+}
-+
-+static int __devexit retu_rtc_remove(struct device *dev)
-+{
-+	retu_disable_irq(RETU_INT_RTCS);
-+	retu_free_irq(RETU_INT_RTCS);
-+	retu_free_irq(RETU_INT_RTCA);
-+	device_remove_file(dev, &dev_attr_cal);
-+	device_remove_file(dev, &dev_attr_alarm_expired);
-+	device_remove_file(dev, &dev_attr_alarm);
-+	device_remove_file(dev, &dev_attr_reset);
-+	device_remove_file(dev, &dev_attr_time);
-+	return 0;
-+}
-+
-+static struct device_driver retu_rtc_driver = {
-+	.name		= "retu-rtc",
-+	.bus		= &platform_bus_type,
-+	.probe		= retu_rtc_probe,
-+	.remove		= __devexit_p(retu_rtc_remove),
-+};
-+
-+static struct platform_device retu_rtc_device = {
-+	.name		= "retu-rtc",
-+	.id		= -1,
-+	.dev		= {
-+		.release	= retu_rtc_device_release,
-+	},
-+};
-+
-+/* This function provides syncronization with the RTCS interrupt handler */
-+static void retu_rtc_barrier(void)
-+{
-+	INIT_COMPLETION(retu_rtc_sync);
-+	retu_ack_irq(RETU_INT_RTCS);
-+	retu_enable_irq(RETU_INT_RTCS);
-+	wait_for_completion(&retu_rtc_sync);
-+	retu_disable_irq(RETU_INT_RTCS);
-+}
-+
-+static int __init retu_rtc_init(void)
-+{
-+	int ret;
-+
-+	init_completion(&retu_rtc_exited);
-+
-+	if ((ret = driver_register(&retu_rtc_driver)) != 0)
-+		return ret;
-+
-+	if ((ret = platform_device_register(&retu_rtc_device)) != 0)
-+		goto err_unregister_driver;
-+
-+	return 0;
-+
-+err_unregister_driver:
-+	driver_unregister(&retu_rtc_driver);
-+	return ret;
-+}
-+
-+static void __exit retu_rtc_exit(void)
-+{
-+	platform_device_unregister(&retu_rtc_device);
-+	driver_unregister(&retu_rtc_driver);
-+
-+	wait_for_completion(&retu_rtc_exited);
-+}
-+
-+module_init(retu_rtc_init);
-+module_exit(retu_rtc_exit);
-+
-+MODULE_DESCRIPTION("Retu RTC");
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Paul Mundt and Igor Stoppa");
---- /dev/null
-+++ b/drivers/cbus/retu-user.c
-@@ -0,0 +1,423 @@
-+/**
-+ * drivers/cbus/retu-user.c
-+ *
-+ * Retu user space interface functions
-+ *
-+ * Copyright (C) 2004, 2005 Nokia Corporation
-+ *
-+ * Written by Mikko Ylinen <mikko.k.ylinen@nokia.com>
-+ *
-+ * This file is subject to the terms and conditions of the GNU General
-+ * Public License. See the file "COPYING" in the main directory of this
-+ * archive for more details.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#include <linux/types.h>
-+#include <linux/kernel.h>
-+#include <linux/interrupt.h>
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/fs.h>
-+#include <linux/miscdevice.h>
-+#include <linux/poll.h>
-+#include <linux/list.h>
-+#include <linux/spinlock.h>
-+#include <linux/mutex.h>
-+
-+#include <asm/uaccess.h>
-+
-+#include "retu.h"
-+
-+#include "user_retu_tahvo.h"
-+
-+/* Maximum size of IRQ node buffer/pool */
-+#define RETU_MAX_IRQ_BUF_LEN	16
-+
-+#define PFX			"retu-user: "
-+
-+/* Bitmap for marking the interrupt sources as having the handlers */
-+static u32 retu_irq_bits;
-+
-+/* For allowing only one user process to subscribe to the retu interrupts */
-+static struct file *retu_irq_subscr = NULL;
-+
-+/* For poll and IRQ passing */
-+struct retu_irq {
-+	u32 id;
-+	struct list_head node;
-+};
-+
-+static spinlock_t retu_irqs_lock;
-+static struct retu_irq *retu_irq_block;
-+static LIST_HEAD(retu_irqs);
-+static LIST_HEAD(retu_irqs_reserve);
-+
-+/* Wait queue - used when user wants to read the device */
-+DECLARE_WAIT_QUEUE_HEAD(retu_user_waitqueue);
-+
-+/* Semaphore to protect irq subscription sequence */
-+static struct mutex retu_mutex;
-+
-+/* This array specifies RETU register types (read/write/toggle) */
-+static const u8 retu_access_bits[] = {
-+	1,
-+	4,
-+	3,
-+	3,
-+	1,
-+	3,
-+	3,
-+	0,
-+	3,
-+	3,
-+	3,
-+	3,
-+	3,
-+	3,
-+	3,
-+	4,
-+	4,
-+	3,
-+	0,
-+	0,
-+	0,
-+	0,
-+	1,
-+	3,
-+	3,
-+	3,
-+	3,
-+	3,
-+	3,
-+	3,
-+	3,
-+	3
-+};
-+
-+/*
-+ * The handler for all RETU interrupts.
-+ *
-+ * arg is the interrupt source in RETU.
-+ */
-+static void retu_user_irq_handler(unsigned long arg)
-+{
-+	struct retu_irq *irq;
-+
-+	retu_ack_irq(arg);
-+
-+	spin_lock(&retu_irqs_lock);
-+	if (list_empty(&retu_irqs_reserve)) {
-+		spin_unlock(&retu_irqs_lock);
-+		return;
-+	}
-+	irq = list_entry((&retu_irqs_reserve)->next, struct retu_irq, node);
-+	irq->id = arg;
-+	list_move_tail(&irq->node, &retu_irqs);
-+	spin_unlock(&retu_irqs_lock);
-+
-+	/* wake up waiting thread */
-+	wake_up(&retu_user_waitqueue);
-+}
-+
-+/*
-+ * This routine sets up the interrupt handler and marks an interrupt source
-+ * in RETU as a candidate for signal delivery to the user process.
-+ */
-+static int retu_user_subscribe_to_irq(int id, struct file *filp)
-+{
-+	int ret;
-+
-+	mutex_lock(&retu_mutex);
-+	if ((retu_irq_subscr != NULL) && (retu_irq_subscr != filp)) {
-+		mutex_unlock(&retu_mutex);
-+		return -EBUSY;
-+	}
-+	/* Store the file pointer of the first user process registering IRQs */
-+	retu_irq_subscr = filp;
-+	mutex_unlock(&retu_mutex);
-+
-+	if (retu_irq_bits & (1 << id))
-+		return 0;
-+
-+	ret = retu_request_irq(id, retu_user_irq_handler, id, "");
-+	if (ret < 0)
-+		return ret;
-+
-+	/* Mark that this interrupt has a handler */
-+	retu_irq_bits |= 1 << id;
-+
-+	return 0;
-+}
-+
-+/*
-+ * Unregisters all RETU interrupt handlers.
-+ */
-+static void retu_unreg_irq_handlers(void)
-+{
-+	int id;
-+
-+	if (!retu_irq_bits)
-+		return;
-+
-+	for (id = 0; id < MAX_RETU_IRQ_HANDLERS; id++)
-+		if (retu_irq_bits & (1 << id))
-+			retu_free_irq(id);
-+
-+	retu_irq_bits = 0;
-+}
-+
-+/*
-+ * Write to RETU register.
-+ * Returns 0 upon success, a negative error value otherwise.
-+ */
-+static int retu_user_write_with_mask(u32 field, u16 value)
-+{
-+	u32 mask;
-+	u32 reg;
-+	u_short tmp;
-+	unsigned long flags;
-+
-+	mask = MASK(field);
-+	reg = REG(field);
-+
-+	/* Detect bad mask and reg */
-+	if (mask == 0 || reg > RETU_REG_MAX ||
-+	    retu_access_bits[reg] == READ_ONLY) {
-+		printk(KERN_ERR PFX "invalid arguments (reg=%#x, mask=%#x)\n",
-+		       reg, mask);
-+		return -EINVAL;
-+	}
-+
-+	/* Justify value according to mask */
-+	while (!(mask & 1)) {
-+		value = value << 1;
-+		mask = mask >> 1;
-+	}
-+
-+	spin_lock_irqsave(&retu_lock, flags);
-+	if (retu_access_bits[reg] == TOGGLE) {
-+		/* No need to detect previous content of register */
-+		tmp = 0;
-+	} else {
-+		/* Read current value of register */
-+		tmp = retu_read_reg(reg);
-+	}
-+
-+	/* Generate new value */
-+	tmp = (tmp & ~MASK(field)) | (value & MASK(field));
-+	/* Write data to RETU */
-+	retu_write_reg(reg, tmp);
-+	spin_unlock_irqrestore(&retu_lock, flags);
-+
-+	return 0;
-+}
-+
-+/*
-+ * Read RETU register.
-+ */
-+static u32 retu_user_read_with_mask(u32 field)
-+{
-+	u_short value;
-+	u32 mask, reg;
-+
-+	mask = MASK(field);
-+	reg = REG(field);
-+
-+	/* Detect bad mask and reg */
-+	if (mask == 0 || reg > RETU_REG_MAX) {
-+		printk(KERN_ERR PFX "invalid arguments (reg=%#x, mask=%#x)\n",
-+		       reg, mask);
-+		return -EINVAL;
-+	}
-+
-+	/* Read the register */
-+	value = retu_read_reg(reg) & mask;
-+
-+	/* Right justify value */
-+	while (!(mask & 1)) {
-+		value = value >> 1;
-+		mask = mask >> 1;
-+	}
-+
-+	return value;
-+}
-+
-+/*
-+ * Close device
-+ */
-+static int retu_close(struct inode *inode, struct file *filp)
-+{
-+	/* Unregister all interrupts that have been registered */
-+	if (retu_irq_subscr == filp) {
-+		retu_unreg_irq_handlers();
-+		retu_irq_subscr = NULL;
-+	}
-+
-+	return 0;
-+}
-+
-+/*
-+ * Device control (ioctl)
-+ */
-+static int retu_ioctl(struct inode *inode, struct file *filp,
-+		      unsigned int cmd, unsigned long arg)
-+{
-+	struct retu_tahvo_write_parms par;
-+	int ret;
-+
-+	switch (cmd) {
-+	case URT_IOCT_IRQ_SUBSCR:
-+		return retu_user_subscribe_to_irq(arg, filp);
-+	case RETU_IOCH_READ:
-+		return retu_user_read_with_mask(arg);
-+	case RETU_IOCX_WRITE:
-+		ret = copy_from_user(&par, (void __user *) arg, sizeof(par));
-+		if (ret)
-+			printk(KERN_ERR "copy_from_user failed: %d\n", ret);
-+		par.result = retu_user_write_with_mask(par.field, par.value);
-+		ret = copy_to_user((void __user *) arg, &par, sizeof(par));
-+		if (ret)
-+			printk(KERN_ERR "copy_to_user failed: %d\n", ret);
-+		break;
-+	case RETU_IOCH_ADC_READ:
-+		return retu_read_adc(arg);
-+	default:
-+		return -ENOIOCTLCMD;
-+	}
-+	return 0;
-+}
-+
-+/*
-+ * Read from device
-+ */
-+static ssize_t retu_read(struct file *filp, char *buf, size_t count,
-+			 loff_t * offp)
-+{
-+	struct retu_irq *irq;
-+
-+	u32 nr, i;
-+
-+	/* read not permitted if neither filp nor anyone has registered IRQs */
-+	if (retu_irq_subscr != filp)
-+		return -EPERM;
-+
-+	if ((count < sizeof(u32)) || ((count % sizeof(u32)) != 0))
-+		return -EINVAL;
-+
-+	nr = count / sizeof(u32);
-+
-+	for (i = 0; i < nr; i++) {
-+		unsigned long flags;
-+		u32 irq_id;
-+		int ret;
-+
-+		ret = wait_event_interruptible(retu_user_waitqueue,
-+					       !list_empty(&retu_irqs));
-+		if (ret < 0)
-+			return ret;
-+
-+		spin_lock_irqsave(&retu_irqs_lock, flags);
-+		irq = list_entry((&retu_irqs)->next, struct retu_irq, node);
-+		irq_id = irq->id;
-+		list_move(&irq->node, &retu_irqs_reserve);
-+		spin_unlock_irqrestore(&retu_irqs_lock, flags);
-+
-+		ret = copy_to_user(buf + i * sizeof(irq_id), &irq_id,
-+				   sizeof(irq_id));
-+		if (ret)
-+			printk(KERN_ERR "copy_to_user failed: %d\n", ret);
-+	}
-+
-+	return count;
-+}
-+
-+/*
-+ * Poll method
-+ */
-+static unsigned retu_poll(struct file *filp, struct poll_table_struct *pt)
-+{
-+	if (!list_empty(&retu_irqs))
-+		return POLLIN;
-+
-+	poll_wait(filp, &retu_user_waitqueue, pt);
-+
-+	if (!list_empty(&retu_irqs))
-+		return POLLIN;
-+	else
-+		return 0;
-+}
-+
-+static struct file_operations retu_user_fileops = {
-+	.owner = THIS_MODULE,
-+	.ioctl = retu_ioctl,
-+	.read = retu_read,
-+	.release = retu_close,
-+	.poll = retu_poll
-+};
-+
-+static struct miscdevice retu_device = {
-+	.minor = MISC_DYNAMIC_MINOR,
-+	.name = "retu",
-+	.fops = &retu_user_fileops
-+};
-+
-+/*
-+ * Initialization
-+ *
-+ * @return 0 if successful, error value otherwise.
-+ */
-+int retu_user_init(void)
-+{
-+	struct retu_irq *irq;
-+	int res, i;
-+
-+	irq = kmalloc(sizeof(*irq) * RETU_MAX_IRQ_BUF_LEN, GFP_KERNEL);
-+	if (irq == NULL) {
-+		printk(KERN_ERR PFX "kmalloc failed\n");
-+		return -ENOMEM;
-+	}
-+	memset(irq, 0, sizeof(*irq) * RETU_MAX_IRQ_BUF_LEN);
-+	for (i = 0; i < RETU_MAX_IRQ_BUF_LEN; i++)
-+		list_add(&irq[i].node, &retu_irqs_reserve);
-+
-+	retu_irq_block = irq;
-+
-+	spin_lock_init(&retu_irqs_lock);
-+	mutex_init(&retu_mutex);
-+
-+	/* Request a misc device */
-+	res = misc_register(&retu_device);
-+	if (res < 0) {
-+		printk(KERN_ERR PFX "unable to register misc device for %s\n",
-+		       retu_device.name);
-+		kfree(irq);
-+		return res;
-+	}
-+
-+	return 0;
-+}
-+
-+/*
-+ * Cleanup.
-+ */
-+void retu_user_cleanup(void)
-+{
-+	/* Unregister our misc device */
-+	misc_deregister(&retu_device);
-+	/* Unregister and disable all RETU interrupts used by this module */
-+	retu_unreg_irq_handlers();
-+	kfree(retu_irq_block);
-+}
-+
-+MODULE_DESCRIPTION("Retu ASIC user space functions");
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Mikko Ylinen");
---- /dev/null
-+++ b/drivers/cbus/retu-wdt.c
-@@ -0,0 +1,202 @@
-+/**
-+ * drivers/cbus/retu-wdt.c
-+ *
-+ * Driver for Retu watchdog
-+ *
-+ * Copyright (C) 2004, 2005 Nokia Corporation
-+ *
-+ * Written by Amit Kucheria <amit.kucheria@nokia.com>
-+ *
-+ * This file is subject to the terms and conditions of the GNU General
-+ * Public License. See the file "COPYING" in the main directory of this
-+ * archive for more details.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/device.h>
-+#include <linux/init.h>
-+
-+#include <linux/completion.h>
-+#include <linux/errno.h>
-+#include <linux/moduleparam.h>
-+#include <linux/platform_device.h>
-+
-+#include "cbus.h"
-+#include "retu.h"
-+
-+/* Watchdog timeout in seconds */
-+#define RETU_WDT_MIN_TIMER 0
-+#define RETU_WDT_DEFAULT_TIMER 32
-+#define RETU_WDT_MAX_TIMER 63
-+
-+static struct completion retu_wdt_completion;
-+static DEFINE_MUTEX(retu_wdt_mutex);
-+
-+/* Current period of watchdog */
-+static unsigned int period_val = RETU_WDT_DEFAULT_TIMER;
-+static int counter_param = RETU_WDT_MAX_TIMER;
-+
-+static int retu_modify_counter(unsigned int new)
-+{
-+	int ret = 0;
-+
-+	if (new < RETU_WDT_MIN_TIMER || new > RETU_WDT_MAX_TIMER)
-+		return -EINVAL;
-+
-+	mutex_lock(&retu_wdt_mutex);
-+
-+	period_val = new;
-+	retu_write_reg(RETU_REG_WATCHDOG, (u16)period_val);
-+
-+	mutex_unlock(&retu_wdt_mutex);
-+	return ret;
-+}
-+
-+static ssize_t retu_wdt_period_show(struct device *dev,
-+				struct device_attribute *attr, char *buf)
-+{
-+	/* Show current max counter */
-+	return sprintf(buf, "%u\n", (u16)period_val);
-+}
-+
-+static ssize_t retu_wdt_period_store(struct device *dev,
-+				struct device_attribute *attr,
-+				const char *buf, size_t count)
-+{
-+	unsigned int new_period;
-+	int ret;
-+
-+	if (sscanf(buf, "%u", &new_period) != 1) {
-+		printk(KERN_ALERT "retu_wdt_period_store: Invalid input\n");
-+		return -EINVAL;
-+	}
-+
-+	ret = retu_modify_counter(new_period);
-+	if (ret < 0)
-+		return ret;
-+
-+	return strnlen(buf, count);
-+}
-+
-+static ssize_t retu_wdt_counter_show(struct device *dev,
-+				struct device_attribute *attr, char *buf)
-+{
-+	u16 counter;
-+
-+	/* Show current value in watchdog counter */
-+	counter = retu_read_reg(RETU_REG_WATCHDOG);
-+
-+	/* Only the 5 LSB are important */
-+	return snprintf(buf, PAGE_SIZE, "%u\n", (counter & 0x3F));
-+}
-+
-+static DEVICE_ATTR(period, S_IRUGO | S_IWUSR, retu_wdt_period_show, \
-+			retu_wdt_period_store);
-+static DEVICE_ATTR(counter, S_IRUGO, retu_wdt_counter_show, NULL);
-+
-+static int __devinit retu_wdt_probe(struct device *dev)
-+{
-+	int ret;
-+
-+	ret = device_create_file(dev, &dev_attr_period);
-+	if (ret) {
-+		printk(KERN_ERR "retu_wdt_probe: Error creating "
-+					"sys device file: period\n");
-+		return ret;
-+	}
-+
-+	ret = device_create_file(dev, &dev_attr_counter);
-+	if (ret) {
-+		device_remove_file(dev, &dev_attr_period);
-+		printk(KERN_ERR "retu_wdt_probe: Error creating "
-+					"sys device file: counter\n");
-+	}
-+
-+	return ret;
-+}
-+
-+static int __devexit retu_wdt_remove(struct device *dev)
-+{
-+	device_remove_file(dev, &dev_attr_period);
-+	device_remove_file(dev, &dev_attr_counter);
-+	return 0;
-+}
-+
-+static void retu_wdt_device_release(struct device *dev)
-+{
-+	complete(&retu_wdt_completion);
-+}
-+
-+static struct platform_device retu_wdt_device = {
-+	.name = "retu-watchdog",
-+	.id = -1,
-+	.dev = {
-+		.release = retu_wdt_device_release,
-+	},
-+};
-+
-+static struct device_driver retu_wdt_driver = {
-+	.name = "retu-watchdog",
-+	.bus = &platform_bus_type,
-+	.probe = retu_wdt_probe,
-+	.remove = __devexit_p(retu_wdt_remove),
-+};
-+
-+static int __init retu_wdt_init(void)
-+{
-+	int ret;
-+
-+	init_completion(&retu_wdt_completion);
-+
-+	ret = driver_register(&retu_wdt_driver);
-+	if (ret)
-+		return ret;
-+
-+	ret = platform_device_register(&retu_wdt_device);
-+	if (ret)
-+		goto exit1;
-+
-+	/* passed as module parameter? */
-+	ret = retu_modify_counter(counter_param);
-+	if (ret == -EINVAL) {
-+		ret = retu_modify_counter(RETU_WDT_DEFAULT_TIMER);
-+		printk(KERN_INFO
-+		       "retu_wdt_init: Intializing to default value\n");
-+	}
-+
-+	printk(KERN_INFO "Retu watchdog driver initialized\n");
-+	return ret;
-+
-+exit1:
-+	driver_unregister(&retu_wdt_driver);
-+	wait_for_completion(&retu_wdt_completion);
-+
-+	return ret;
-+}
-+
-+static void __exit retu_wdt_exit(void)
-+{
-+	platform_device_unregister(&retu_wdt_device);
-+	driver_unregister(&retu_wdt_driver);
-+
-+	wait_for_completion(&retu_wdt_completion);
-+}
-+
-+module_init(retu_wdt_init);
-+module_exit(retu_wdt_exit);
-+module_param(counter_param, int, 0);
-+
-+MODULE_DESCRIPTION("Retu WatchDog");
-+MODULE_AUTHOR("Amit Kucheria");
-+MODULE_LICENSE("GPL");
-+
---- /dev/null
-+++ b/drivers/cbus/retu.c
-@@ -0,0 +1,467 @@
-+/**
-+ * drivers/cbus/retu.c
-+ *
-+ * Support functions for Retu ASIC
-+ *
-+ * Copyright (C) 2004, 2005 Nokia Corporation
-+ *
-+ * Written by Juha Yrjölä <juha.yrjola@nokia.com>,
-+ *	      David Weinehall <david.weinehall@nokia.com>, and
-+ *	      Mikko Ylinen <mikko.k.ylinen@nokia.com>
-+ *
-+ * This file is subject to the terms and conditions of the GNU General
-+ * Public License. See the file "COPYING" in the main directory of this
-+ * archive for more details.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+
-+#include <linux/kernel.h>
-+#include <linux/errno.h>
-+#include <linux/device.h>
-+#include <linux/miscdevice.h>
-+#include <linux/poll.h>
-+#include <linux/fs.h>
-+#include <linux/irq.h>
-+#include <linux/interrupt.h>
-+#include <linux/platform_device.h>
-+#include <linux/gpio.h>
-+
-+#include <asm/uaccess.h>
-+
-+#include <mach/mux.h>
-+#include <mach/board.h>
-+#include <mach/board-nokia.h>
-+
-+#include "cbus.h"
-+#include "retu.h"
-+
-+#define RETU_ID			0x01
-+#define PFX			"retu: "
-+
-+static int retu_initialized;
-+static int retu_irq_pin;
-+static int retu_is_vilma;
-+
-+static struct tasklet_struct retu_tasklet;
-+spinlock_t retu_lock = SPIN_LOCK_UNLOCKED;
-+
-+static struct completion device_release;
-+
-+struct retu_irq_handler_desc {
-+	int (*func)(unsigned long);
-+	unsigned long arg;
-+	char name[8];
-+};
-+
-+static struct retu_irq_handler_desc retu_irq_handlers[MAX_RETU_IRQ_HANDLERS];
-+
-+/**
-+ * retu_read_reg - Read a value from a register in Retu
-+ * @reg: the register to read from
-+ *
-+ * This function returns the contents of the specified register
-+ */
-+int retu_read_reg(int reg)
-+{
-+	BUG_ON(!retu_initialized);
-+	return cbus_read_reg(cbus_host, RETU_ID, reg);
-+}
-+
-+/**
-+ * retu_write_reg - Write a value to a register in Retu
-+ * @reg: the register to write to
-+ * @reg: the value to write to the register
-+ *
-+ * This function writes a value to the specified register
-+ */
-+void retu_write_reg(int reg, u16 val)
-+{
-+	BUG_ON(!retu_initialized);
-+	cbus_write_reg(cbus_host, RETU_ID, reg, val);
-+}
-+
-+void retu_set_clear_reg_bits(int reg, u16 set, u16 clear)
-+{
-+	unsigned long flags;
-+	u16 w;
-+
-+	spin_lock_irqsave(&retu_lock, flags);
-+	w = retu_read_reg(reg);
-+	w &= ~clear;
-+	w |= set;
-+	retu_write_reg(reg, w);
-+	spin_unlock_irqrestore(&retu_lock, flags);
-+}
-+
-+#define ADC_MAX_CHAN_NUMBER	13
-+
-+int retu_read_adc(int channel)
-+{
-+	unsigned long flags;
-+	int res;
-+
-+	if (channel < 0 || channel > ADC_MAX_CHAN_NUMBER)
-+		return -EINVAL;
-+
-+	spin_lock_irqsave(&retu_lock, flags);
-+
-+	if ((channel == 8) && retu_is_vilma) {
-+		int scr = retu_read_reg(RETU_REG_ADCSCR);
-+		int ch = (retu_read_reg(RETU_REG_ADCR) >> 10) & 0xf;
-+		if (((scr & 0xff) != 0) && (ch != 8))
-+			retu_write_reg (RETU_REG_ADCSCR, (scr & ~0xff));
-+	}
-+
-+	/* Select the channel and read result */
-+	retu_write_reg(RETU_REG_ADCR, channel << 10);
-+	res = retu_read_reg(RETU_REG_ADCR) & 0x3ff;
-+
-+	if (retu_is_vilma)
-+		retu_write_reg(RETU_REG_ADCR, (1 << 13));
-+
-+	/* Unlock retu */
-+	spin_unlock_irqrestore(&retu_lock, flags);
-+
-+	return res;
-+}
-+
-+
-+static u16 retu_disable_bogus_irqs(u16 mask)
-+{
-+       int i;
-+
-+       for (i = 0; i < MAX_RETU_IRQ_HANDLERS; i++) {
-+               if (mask & (1 << i))
-+                       continue;
-+               if (retu_irq_handlers[i].func != NULL)
-+                       continue;
-+               /* an IRQ was enabled but we don't have a handler for it */
-+               printk(KERN_INFO PFX "disabling bogus IRQ %d\n", i);
-+               mask |= (1 << i);
-+       }
-+       return mask;
-+}
-+
-+/*
-+ * Disable given RETU interrupt
-+ */
-+void retu_disable_irq(int id)
-+{
-+	unsigned long flags;
-+	u16 mask;
-+
-+	spin_lock_irqsave(&retu_lock, flags);
-+	mask = retu_read_reg(RETU_REG_IMR);
-+	mask |= 1 << id;
-+	mask = retu_disable_bogus_irqs(mask);
-+	retu_write_reg(RETU_REG_IMR, mask);
-+	spin_unlock_irqrestore(&retu_lock, flags);
-+}
-+
-+/*
-+ * Enable given RETU interrupt
-+ */
-+void retu_enable_irq(int id)
-+{
-+	unsigned long flags;
-+	u16 mask;
-+
-+	if (id == 3) {
-+		printk("Enabling Retu IRQ %d\n", id);
-+		dump_stack();
-+	}
-+	spin_lock_irqsave(&retu_lock, flags);
-+	mask = retu_read_reg(RETU_REG_IMR);
-+	mask &= ~(1 << id);
-+	mask = retu_disable_bogus_irqs(mask);
-+	retu_write_reg(RETU_REG_IMR, mask);
-+	spin_unlock_irqrestore(&retu_lock, flags);
-+}
-+
-+/*
-+ * Acknowledge given RETU interrupt
-+ */
-+void retu_ack_irq(int id)
-+{
-+	retu_write_reg(RETU_REG_IDR, 1 << id);
-+}
-+
-+/*
-+ * RETU interrupt handler. Only schedules the tasklet.
-+ */
-+static irqreturn_t retu_irq_handler(int irq, void *dev_id)
-+{
-+	tasklet_schedule(&retu_tasklet);
-+	return IRQ_HANDLED;
-+}
-+
-+/*
-+ * Tasklet handler
-+ */
-+static void retu_tasklet_handler(unsigned long data)
-+{
-+	struct retu_irq_handler_desc *hnd;
-+	u16 id;
-+	u16 im;
-+	int i;
-+
-+	for (;;) {
-+		id = retu_read_reg(RETU_REG_IDR);
-+		im = ~retu_read_reg(RETU_REG_IMR);
-+		id &= im;
-+
-+		if (!id)
-+			break;
-+
-+		for (i = 0; id != 0; i++, id >>= 1) {
-+			if (!(id & 1))
-+				continue;
-+			hnd = &retu_irq_handlers[i];
-+			if (hnd->func == NULL) {
-+                               /* Spurious retu interrupt - disable and ack it */
-+				printk(KERN_INFO "Spurious Retu interrupt "
-+						 "(id %d)\n", i);
-+				retu_disable_irq(i);
-+				retu_ack_irq(i);
-+				continue;
-+			}
-+			hnd->func(hnd->arg);
-+			/*
-+			 * Don't acknowledge the interrupt here
-+			 * It must be done explicitly
-+			 */
-+		}
-+	}
-+}
-+
-+/*
-+ * Register the handler for a given RETU interrupt source.
-+ */
-+int retu_request_irq(int id, void *irq_handler, unsigned long arg, char *name)
-+{
-+	struct retu_irq_handler_desc *hnd;
-+
-+	if (irq_handler == NULL || id >= MAX_RETU_IRQ_HANDLERS ||
-+	    name == NULL) {
-+		printk(KERN_ERR PFX "Invalid arguments to %s\n",
-+		       __FUNCTION__);
-+		return -EINVAL;
-+	}
-+	hnd = &retu_irq_handlers[id];
-+	if (hnd->func != NULL) {
-+		printk(KERN_ERR PFX "IRQ %d already reserved\n", id);
-+		return -EBUSY;
-+	}
-+	printk(KERN_INFO PFX "Registering interrupt %d for device %s\n",
-+	       id, name);
-+	hnd->func = irq_handler;
-+	hnd->arg = arg;
-+	strlcpy(hnd->name, name, sizeof(hnd->name));
-+
-+	retu_ack_irq(id);
-+	retu_enable_irq(id);
-+
-+	return 0;
-+}
-+
-+/*
-+ * Unregister the handler for a given RETU interrupt source.
-+ */
-+void retu_free_irq(int id)
-+{
-+	struct retu_irq_handler_desc *hnd;
-+
-+	if (id >= MAX_RETU_IRQ_HANDLERS) {
-+		printk(KERN_ERR PFX "Invalid argument to %s\n",
-+		       __FUNCTION__);
-+		return;
-+	}
-+	hnd = &retu_irq_handlers[id];
-+	if (hnd->func == NULL) {
-+		printk(KERN_ERR PFX "IRQ %d already freed\n", id);
-+		return;
-+	}
-+
-+	retu_disable_irq(id);
-+	hnd->func = NULL;
-+}
-+
-+/**
-+ * retu_power_off - Shut down power to system
-+ *
-+ * This function puts the system in power off state
-+ */
-+static void retu_power_off(void)
-+{
-+	/* Ignore power button state */
-+	retu_write_reg(RETU_REG_CC1, retu_read_reg(RETU_REG_CC1) | 2);
-+	/* Expire watchdog immediately */
-+	retu_write_reg(RETU_REG_WATCHDOG, 0);
-+	/* Wait for poweroff*/
-+	for (;;);
-+}
-+
-+/**
-+ * retu_probe - Probe for Retu ASIC
-+ * @dev: the Retu device
-+ *
-+ * Probe for the Retu ASIC and allocate memory
-+ * for its device-struct if found
-+ */
-+static int __devinit retu_probe(struct device *dev)
-+{
-+	const struct omap_em_asic_bb5_config * em_asic_config;
-+	int rev, ret;
-+
-+	/* Prepare tasklet */
-+	tasklet_init(&retu_tasklet, retu_tasklet_handler, 0);
-+
-+	em_asic_config = omap_get_config(OMAP_TAG_EM_ASIC_BB5,
-+					 struct omap_em_asic_bb5_config);
-+	if (em_asic_config == NULL) {
-+		printk(KERN_ERR PFX "Unable to retrieve config data\n");
-+		return -ENODATA;
-+	}
-+
-+	retu_irq_pin = em_asic_config->retu_irq_gpio;
-+
-+	if ((ret = gpio_request(retu_irq_pin, "RETU irq")) < 0) {
-+		printk(KERN_ERR PFX "Unable to reserve IRQ GPIO\n");
-+		return ret;
-+	}
-+
-+	/* Set the pin as input */
-+	gpio_direction_input(retu_irq_pin);
-+
-+	/* Rising edge triggers the IRQ */
-+	set_irq_type(gpio_to_irq(retu_irq_pin), IRQ_TYPE_EDGE_RISING);
-+
-+	retu_initialized = 1;
-+
-+	rev = retu_read_reg(RETU_REG_ASICR) & 0xff;
-+	if (rev & (1 << 7))
-+		retu_is_vilma = 1;
-+
-+	printk(KERN_INFO "%s v%d.%d found\n", retu_is_vilma ? "Vilma" : "Retu",
-+	       (rev >> 4) & 0x07, rev & 0x0f);
-+
-+	/* Mask all RETU interrupts */
-+	retu_write_reg(RETU_REG_IMR, 0xffff);
-+
-+	ret = request_irq(gpio_to_irq(retu_irq_pin), retu_irq_handler, 0,
-+			  "retu", 0);
-+	if (ret < 0) {
-+		printk(KERN_ERR PFX "Unable to register IRQ handler\n");
-+		gpio_free(retu_irq_pin);
-+		return ret;
-+	}
-+	set_irq_wake(gpio_to_irq(retu_irq_pin), 1);
-+
-+	/* Register power off function */
-+	pm_power_off = retu_power_off;
-+
-+#ifdef CONFIG_CBUS_RETU_USER
-+	/* Initialize user-space interface */
-+	if (retu_user_init() < 0) {
-+		printk(KERN_ERR "Unable to initialize driver\n");
-+		free_irq(gpio_to_irq(retu_irq_pin), 0);
-+		gpio_free(retu_irq_pin);
-+		return ret;
-+	}
-+#endif
-+
-+	return 0;
-+}
-+
-+static int retu_remove(struct device *dev)
-+{
-+#ifdef CONFIG_CBUS_RETU_USER
-+	retu_user_cleanup();
-+#endif
-+	/* Mask all RETU interrupts */
-+	retu_write_reg(RETU_REG_IMR, 0xffff);
-+	free_irq(gpio_to_irq(retu_irq_pin), 0);
-+	gpio_free(retu_irq_pin);
-+	tasklet_kill(&retu_tasklet);
-+
-+	return 0;
-+}
-+
-+static void retu_device_release(struct device *dev)
-+{
-+	complete(&device_release);
-+}
-+
-+static struct device_driver retu_driver = {
-+	.name		= "retu",
-+	.bus		= &platform_bus_type,
-+	.probe		= retu_probe,
-+	.remove		= retu_remove,
-+};
-+
-+static struct platform_device retu_device = {
-+	.name		= "retu",
-+	.id		= -1,
-+	.dev = {
-+		.release = retu_device_release,
-+	}
-+};
-+
-+/**
-+ * retu_init - initialise Retu driver
-+ *
-+ * Initialise the Retu driver and return 0 if everything worked ok
-+ */
-+static int __init retu_init(void)
-+{
-+	int ret = 0;
-+
-+	printk(KERN_INFO "Retu/Vilma driver initialising\n");
-+
-+	init_completion(&device_release);
-+
-+	if ((ret = driver_register(&retu_driver)) < 0)
-+		return ret;
-+
-+	if ((ret = platform_device_register(&retu_device)) < 0) {
-+		driver_unregister(&retu_driver);
-+		return ret;
-+	}
-+	return 0;
-+}
-+
-+/*
-+ * Cleanup
-+ */
-+static void __exit retu_exit(void)
-+{
-+	platform_device_unregister(&retu_device);
-+	driver_unregister(&retu_driver);
-+	wait_for_completion(&device_release);
-+}
-+
-+EXPORT_SYMBOL(retu_request_irq);
-+EXPORT_SYMBOL(retu_free_irq);
-+EXPORT_SYMBOL(retu_enable_irq);
-+EXPORT_SYMBOL(retu_disable_irq);
-+EXPORT_SYMBOL(retu_ack_irq);
-+EXPORT_SYMBOL(retu_read_reg);
-+EXPORT_SYMBOL(retu_write_reg);
-+
-+subsys_initcall(retu_init);
-+module_exit(retu_exit);
-+
-+MODULE_DESCRIPTION("Retu ASIC control");
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Juha Yrjölä, David Weinehall, and Mikko Ylinen");
---- /dev/null
-+++ b/drivers/cbus/retu.h
-@@ -0,0 +1,77 @@
-+/**
-+ * drivers/cbus/retu.h
-+ *
-+ * Copyright (C) 2004, 2005 Nokia Corporation
-+ *
-+ * Written by Juha Yrjölä <juha.yrjola@nokia.com> and
-+ *	      David Weinehall <david.weinehall@nokia.com>
-+ *
-+ * This file is subject to the terms and conditions of the GNU General
-+ * Public License. See the file "COPYING" in the main directory of this
-+ * archive for more details.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#ifndef __DRIVERS_CBUS_RETU_H
-+#define __DRIVERS_CBUS_RETU_H
-+
-+#include <linux/types.h>
-+
-+/* Registers */
-+#define RETU_REG_ASICR		0x00	/* ASIC ID & revision */
-+#define RETU_REG_IDR		0x01	/* Interrupt ID */
-+#define RETU_REG_IMR		0x02	/* Interrupt mask */
-+#define RETU_REG_RTCDSR		0x03	/* RTC seconds register */
-+#define RETU_REG_RTCHMR		0x04	/* RTC hours and minutes register */
-+#define RETU_REG_RTCHMAR	0x05	/* RTC hours and minutes alarm and time set register */
-+#define RETU_REG_RTCCALR	0x06	/* RTC calibration register */
-+#define RETU_REG_ADCR		0x08	/* ADC result */
-+#define RETU_REG_ADCSCR		0x09	/* ADC sample ctrl */
-+#define RETU_REG_CC1		0x0d	/* Common control register 1 */
-+#define RETU_REG_CC2		0x0e	/* Common control register 2 */
-+#define RETU_REG_CTRL_CLR	0x0f	/* Regulator clear register */
-+#define RETU_REG_CTRL_SET	0x10	/* Regulator set register */
-+#define RETU_REG_STATUS		0x16	/* Status register */
-+#define RETU_REG_WATCHDOG	0x17	/* Watchdog register */
-+#define RETU_REG_AUDTXR		0x18	/* Audio Codec Tx register */
-+#define RETU_REG_MAX		0x1f
-+
-+/* Interrupt sources */
-+#define RETU_INT_PWR		0
-+#define RETU_INT_CHAR		1
-+#define RETU_INT_RTCS		2
-+#define RETU_INT_RTCM		3
-+#define RETU_INT_RTCD		4
-+#define RETU_INT_RTCA		5
-+#define RETU_INT_HOOK		6
-+#define RETU_INT_HEAD		7
-+#define RETU_INT_ADCS		8
-+
-+#define	MAX_RETU_IRQ_HANDLERS	16
-+
-+int retu_read_reg(int reg);
-+void retu_write_reg(int reg, u16 val);
-+void retu_set_clear_reg_bits(int reg, u16 set, u16 clear);
-+int retu_read_adc(int channel);
-+int retu_request_irq(int id, void *irq_handler, unsigned long arg, char *name);
-+void retu_free_irq(int id);
-+void retu_enable_irq(int id);
-+void retu_disable_irq(int id);
-+void retu_ack_irq(int id);
-+
-+#ifdef CONFIG_CBUS_RETU_USER
-+int retu_user_init(void);
-+void retu_user_cleanup(void);
-+#endif
-+
-+extern spinlock_t retu_lock;
-+
-+#endif /* __DRIVERS_CBUS_RETU_H */
---- /dev/null
-+++ b/drivers/cbus/tahvo-usb.c
-@@ -0,0 +1,777 @@
-+/**
-+ * drivers/cbus/tahvo-usb.c
-+ *
-+ * Tahvo USB transeiver
-+ *
-+ * Copyright (C) 2005-2006 Nokia Corporation
-+ *
-+ * Parts copied from drivers/i2c/chips/isp1301_omap.c
-+ * Copyright (C) 2004 Texas Instruments
-+ * Copyright (C) 2004 David Brownell
-+ *
-+ * Written by Juha Yrjölä <juha.yrjola@nokia.com>,
-+ *	      Tony Lindgren <tony@atomide.com>, and
-+ *	      Timo Teräs <timo.teras@nokia.com>
-+ *
-+ * This file is subject to the terms and conditions of the GNU General
-+ * Public License. See the file "COPYING" in the main directory of this
-+ * archive for more details.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/slab.h>
-+#include <linux/io.h>
-+#include <linux/interrupt.h>
-+#include <linux/platform_device.h>
-+#include <linux/usb/ch9.h>
-+#include <linux/usb/gadget.h>
-+#include <linux/usb.h>
-+#include <linux/usb/otg.h>
-+#include <linux/i2c.h>
-+#include <linux/workqueue.h>
-+#include <linux/kobject.h>
-+#include <linux/clk.h>
-+#include <linux/mutex.h>
-+
-+#include <asm/irq.h>
-+#include <mach/usb.h>
-+
-+#include "cbus.h"
-+#include "tahvo.h"
-+
-+#define DRIVER_NAME     "tahvo-usb"
-+
-+#define USBR_SLAVE_CONTROL	(1 << 8)
-+#define USBR_VPPVIO_SW		(1 << 7)
-+#define USBR_SPEED		(1 << 6)
-+#define USBR_REGOUT		(1 << 5)
-+#define USBR_MASTER_SW2		(1 << 4)
-+#define USBR_MASTER_SW1		(1 << 3)
-+#define USBR_SLAVE_SW		(1 << 2)
-+#define USBR_NSUSPEND		(1 << 1)
-+#define USBR_SEMODE		(1 << 0)
-+
-+/* bits in OTG_CTRL */
-+
-+/* Bits that are controlled by OMAP OTG and are read-only */
-+#define OTG_CTRL_OMAP_MASK	(OTG_PULLDOWN|OTG_PULLUP|OTG_DRV_VBUS|\
-+				OTG_PD_VBUS|OTG_PU_VBUS|OTG_PU_ID)
-+/* Bits that are controlled by transceiver */
-+#define OTG_CTRL_XCVR_MASK	(OTG_ASESSVLD|OTG_BSESSEND|\
-+				OTG_BSESSVLD|OTG_VBUSVLD|OTG_ID)
-+/* Bits that are controlled by system */
-+#define OTG_CTRL_SYS_MASK	(OTG_A_BUSREQ|OTG_A_SETB_HNPEN|OTG_B_BUSREQ|\
-+				OTG_B_HNPEN|OTG_BUSDROP)
-+
-+#if defined(CONFIG_USB_OHCI_HCD) && !defined(CONFIG_USB_OTG)
-+#error tahvo-otg.c does not work with OCHI yet!
-+#endif
-+
-+#define TAHVO_MODE_HOST		0
-+#define TAHVO_MODE_PERIPHERAL	1
-+
-+#ifdef CONFIG_USB_OTG
-+#define TAHVO_MODE(tu)		(tu)->tahvo_mode
-+#elif defined(CONFIG_USB_GADGET_OMAP)
-+#define TAHVO_MODE(tu)		TAHVO_MODE_PERIPHERAL
-+#else
-+#define TAHVO_MODE(tu)		TAHVO_MODE_HOST
-+#endif
-+
-+struct tahvo_usb {
-+	struct platform_device *pt_dev;
-+	struct otg_transceiver otg;
-+	int vbus_state;
-+	struct work_struct irq_work;
-+	struct mutex serialize;
-+#ifdef CONFIG_USB_OTG
-+	int tahvo_mode;
-+#endif
-+};
-+static struct platform_device tahvo_usb_device;
-+
-+/*
-+ * ---------------------------------------------------------------------------
-+ * OTG related functions
-+ *
-+ * These shoud be separated into omap-otg.c driver module, as they are used
-+ * by various transceivers. These functions are needed in the UDC-only case
-+ * as well. These functions are copied from GPL isp1301_omap.c
-+ * ---------------------------------------------------------------------------
-+ */
-+static struct platform_device *tahvo_otg_dev;
-+
-+static irqreturn_t omap_otg_irq(int irq, void *arg)
-+{
-+	struct platform_device *otg_dev = (struct platform_device *) arg;
-+	struct tahvo_usb *tu = (struct tahvo_usb *) otg_dev->dev.driver_data;
-+	u16 otg_irq;
-+
-+	otg_irq = omap_readw(OTG_IRQ_SRC);
-+	if (otg_irq & OPRT_CHG) {
-+		omap_writew(OPRT_CHG, OTG_IRQ_SRC);
-+	} else if (otg_irq & B_SRP_TMROUT) {
-+		omap_writew(B_SRP_TMROUT, OTG_IRQ_SRC);
-+	} else if (otg_irq & B_HNP_FAIL) {
-+		omap_writew(B_HNP_FAIL, OTG_IRQ_SRC);
-+	} else if (otg_irq & A_SRP_DETECT) {
-+		omap_writew(A_SRP_DETECT, OTG_IRQ_SRC);
-+	} else if (otg_irq & A_REQ_TMROUT) {
-+		omap_writew(A_REQ_TMROUT, OTG_IRQ_SRC);
-+	} else if (otg_irq & A_VBUS_ERR) {
-+		omap_writew(A_VBUS_ERR, OTG_IRQ_SRC);
-+	} else if (otg_irq & DRIVER_SWITCH) {
-+		if ((!(omap_readl(OTG_CTRL) & OTG_DRIVER_SEL)) &&
-+		   tu->otg.host && tu->otg.state == OTG_STATE_A_HOST) {
-+			/* role is host */
-+			usb_bus_start_enum(tu->otg.host,
-+					   tu->otg.host->otg_port);
-+		}
-+		omap_writew(DRIVER_SWITCH, OTG_IRQ_SRC);
-+	} else
-+		return IRQ_NONE;
-+
-+	return IRQ_HANDLED;
-+
-+}
-+
-+static int omap_otg_init(void)
-+{
-+	u32 l;
-+
-+#ifdef CONFIG_USB_OTG
-+	if (!tahvo_otg_dev) {
-+		printk("tahvo-usb: no tahvo_otg_dev\n");
-+		return -ENODEV;
-+	}
-+#endif
-+
-+	l = omap_readl(OTG_SYSCON_1);
-+	l &= ~OTG_IDLE_EN;
-+	omap_writel(l, OTG_SYSCON_1);
-+	udelay(100);
-+
-+	/* some of these values are board-specific... */
-+	l = omap_readl(OTG_SYSCON_2);
-+	l |= OTG_EN
-+		/* for B-device: */
-+		| SRP_GPDATA		/* 9msec Bdev D+ pulse */
-+		| SRP_GPDVBUS		/* discharge after VBUS pulse */
-+		// | (3 << 24)		/* 2msec VBUS pulse */
-+		/* for A-device: */
-+		| (0 << 20)		/* 200ms nominal A_WAIT_VRISE timer */
-+		| SRP_DPW		/* detect 167+ns SRP pulses */
-+		| SRP_DATA | SRP_VBUS;	/* accept both kinds of SRP pulse */
-+	omap_writel(l, OTG_SYSCON_2);
-+
-+	omap_writew(DRIVER_SWITCH | OPRT_CHG
-+			| B_SRP_TMROUT | B_HNP_FAIL
-+				  | A_VBUS_ERR | A_SRP_DETECT | A_REQ_TMROUT,
-+					OTG_IRQ_EN);
-+	l = omap_readl(OTG_SYSCON_2);
-+	l |= OTG_EN;
-+	omap_writel(l, OTG_SYSCON_2);
-+
-+	return 0;
-+}
-+
-+static int omap_otg_probe(struct device *dev)
-+{
-+	int ret;
-+
-+	tahvo_otg_dev = to_platform_device(dev);
-+	ret = omap_otg_init();
-+	if (ret != 0) {
-+		printk(KERN_ERR "tahvo-usb: omap_otg_init failed\n");
-+		return ret;
-+	}
-+
-+	return request_irq(tahvo_otg_dev->resource[1].start,
-+			   omap_otg_irq, IRQF_DISABLED, DRIVER_NAME,
-+			   &tahvo_usb_device);
-+}
-+
-+static int omap_otg_remove(struct device *dev)
-+{
-+	free_irq(tahvo_otg_dev->resource[1].start, &tahvo_usb_device);
-+	tahvo_otg_dev = NULL;
-+
-+	return 0;
-+}
-+
-+struct device_driver omap_otg_driver = {
-+	.name		= "omap_otg",
-+	.bus		= &platform_bus_type,
-+	.probe		= omap_otg_probe,
-+	.remove		= omap_otg_remove,
-+};
-+
-+/*
-+ * ---------------------------------------------------------------------------
-+ * Tahvo related functions
-+ * These are Nokia proprietary code, except for the OTG register settings,
-+ * which are copied from isp1301.c
-+ * ---------------------------------------------------------------------------
-+ */
-+static ssize_t vbus_state_show(struct device *device,
-+			       struct device_attribute *attr, char *buf)
-+{
-+	struct tahvo_usb *tu = (struct tahvo_usb*) device->driver_data;
-+	return sprintf(buf, "%d\n", tu->vbus_state);
-+}
-+static DEVICE_ATTR(vbus_state, 0444, vbus_state_show, NULL);
-+
-+int vbus_active = 0;
-+
-+#if 0
-+
-+static int host_suspend(struct tahvo_usb *tu)
-+{
-+	struct device	*dev;
-+
-+	if (!tu->otg.host)
-+		return -ENODEV;
-+
-+	/* Currently ASSUMES only the OTG port matters;
-+	 * other ports could be active...
-+	 */
-+	dev = tu->otg.host->controller;
-+	return dev->driver->suspend(dev, PMSG_SUSPEND);
-+}
-+
-+static int host_resume(struct tahvo_usb *tu)
-+{
-+	struct device	*dev;
-+
-+	if (!tu->otg.host)
-+		return -ENODEV;
-+
-+	dev = tu->otg.host->controller;
-+	return dev->driver->resume(dev);
-+}
-+
-+#else
-+
-+static int host_suspend(struct tahvo_usb *tu)
-+{
-+	return 0;
-+}
-+
-+static int host_resume(struct tahvo_usb *tu)
-+{
-+	return 0;
-+}
-+
-+#endif
-+
-+static void check_vbus_state(struct tahvo_usb *tu)
-+{
-+	int reg, prev_state;
-+
-+	reg = tahvo_read_reg(TAHVO_REG_IDSR);
-+	if (reg & 0x01) {
-+		u32 l;
-+
-+		vbus_active = 1;
-+		switch (tu->otg.state) {
-+		case OTG_STATE_B_IDLE:
-+			/* Enable the gadget driver */
-+			if (tu->otg.gadget)
-+				usb_gadget_vbus_connect(tu->otg.gadget);
-+			/* Set B-session valid and not B-sessio ended to indicate
-+			 * Vbus to be ok. */
-+			l = omap_readl(OTG_CTRL);
-+			l &= ~OTG_BSESSEND;
-+			l |= OTG_BSESSVLD;
-+			omap_writel(l, OTG_CTRL);
-+
-+			tu->otg.state = OTG_STATE_B_PERIPHERAL;
-+			break;
-+		case OTG_STATE_A_IDLE:
-+			/* Session is now valid assuming the USB hub is driving Vbus */
-+			tu->otg.state = OTG_STATE_A_HOST;
-+			host_resume(tu);
-+			break;
-+		default:
-+			break;
-+		}
-+		printk("USB cable connected\n");
-+	} else {
-+		switch (tu->otg.state) {
-+		case OTG_STATE_B_PERIPHERAL:
-+			if (tu->otg.gadget)
-+				usb_gadget_vbus_disconnect(tu->otg.gadget);
-+			tu->otg.state = OTG_STATE_B_IDLE;
-+			break;
-+		case OTG_STATE_A_HOST:
-+			tu->otg.state = OTG_STATE_A_IDLE;
-+			break;
-+		default:
-+			break;
-+		}
-+		printk("USB cable disconnected\n");
-+		vbus_active = 0;
-+	}
-+
-+	prev_state = tu->vbus_state;
-+	tu->vbus_state = reg & 0x01;
-+	if (prev_state != tu->vbus_state)
-+		sysfs_notify(&tu->pt_dev->dev.kobj, NULL, "vbus_state");
-+}
-+
-+static void tahvo_usb_become_host(struct tahvo_usb *tu)
-+{
-+	u32 l;
-+
-+	/* Clear system and transceiver controlled bits
-+	 * also mark the A-session is always valid */
-+	omap_otg_init();
-+
-+	l = omap_readl(OTG_CTRL);
-+	l &= ~(OTG_CTRL_XCVR_MASK | OTG_CTRL_SYS_MASK);
-+	l |= OTG_ASESSVLD;
-+	omap_writel(l, OTG_CTRL);
-+
-+	/* Power up the transceiver in USB host mode */
-+	tahvo_write_reg(TAHVO_REG_USBR, USBR_REGOUT | USBR_NSUSPEND |
-+			USBR_MASTER_SW2 | USBR_MASTER_SW1);
-+	tu->otg.state = OTG_STATE_A_IDLE;
-+
-+	check_vbus_state(tu);
-+}
-+
-+static void tahvo_usb_stop_host(struct tahvo_usb *tu)
-+{
-+	host_suspend(tu);
-+	tu->otg.state = OTG_STATE_A_IDLE;
-+}
-+
-+static void tahvo_usb_become_peripheral(struct tahvo_usb *tu)
-+{
-+	u32 l;
-+
-+	/* Clear system and transceiver controlled bits
-+	 * and enable ID to mark peripheral mode and
-+	 * BSESSEND to mark no Vbus */
-+	omap_otg_init();
-+	l = omap_readl(OTG_CTRL);
-+	l &= ~(OTG_CTRL_XCVR_MASK | OTG_CTRL_SYS_MASK | OTG_BSESSVLD);
-+	l |= OTG_ID | OTG_BSESSEND;
-+	omap_writel(l, OTG_CTRL);
-+
-+	/* Power up transceiver and set it in USB perhiperal mode */
-+	tahvo_write_reg(TAHVO_REG_USBR, USBR_SLAVE_CONTROL | USBR_REGOUT | USBR_NSUSPEND | USBR_SLAVE_SW);
-+	tu->otg.state = OTG_STATE_B_IDLE;
-+
-+	check_vbus_state(tu);
-+}
-+
-+static void tahvo_usb_stop_peripheral(struct tahvo_usb *tu)
-+{
-+	u32 l;
-+
-+	l = omap_readl(OTG_CTRL);
-+	l &= ~OTG_BSESSVLD;
-+	l |= OTG_BSESSEND;
-+	omap_writel(l, OTG_CTRL);
-+
-+	if (tu->otg.gadget)
-+		usb_gadget_vbus_disconnect(tu->otg.gadget);
-+	tu->otg.state = OTG_STATE_B_IDLE;
-+
-+}
-+
-+static void tahvo_usb_power_off(struct tahvo_usb *tu)
-+{
-+	u32 l;
-+	int id;
-+
-+	/* Disable gadget controller if any */
-+	if (tu->otg.gadget)
-+		usb_gadget_vbus_disconnect(tu->otg.gadget);
-+
-+	host_suspend(tu);
-+
-+	/* Disable OTG and interrupts */
-+	if (TAHVO_MODE(tu) == TAHVO_MODE_PERIPHERAL)
-+		id = OTG_ID;
-+	else
-+		id = 0;
-+	l = omap_readl(OTG_CTRL);
-+	l &= ~(OTG_CTRL_XCVR_MASK | OTG_CTRL_SYS_MASK | OTG_BSESSVLD);
-+	l |= id | OTG_BSESSEND;
-+	omap_writel(l, OTG_CTRL);
-+	omap_writew(0, OTG_IRQ_EN);
-+
-+	l = omap_readl(OTG_SYSCON_2);
-+	l &= ~OTG_EN;
-+	omap_writel(l, OTG_SYSCON_2);
-+
-+	l = omap_readl(OTG_SYSCON_1);
-+	l |= OTG_IDLE_EN;
-+	omap_writel(l, OTG_SYSCON_1);
-+
-+	/* Power off transceiver */
-+	tahvo_write_reg(TAHVO_REG_USBR, 0);
-+	tu->otg.state = OTG_STATE_UNDEFINED;
-+}
-+
-+
-+static int tahvo_usb_set_power(struct otg_transceiver *dev, unsigned mA)
-+{
-+	struct tahvo_usb *tu = container_of(dev, struct tahvo_usb, otg);
-+
-+	dev_dbg(&tu->pt_dev->dev, "set_power %d mA\n", mA);
-+
-+	if (dev->state == OTG_STATE_B_PERIPHERAL) {
-+		/* REVISIT: Can Tahvo charge battery from VBUS? */
-+	}
-+	return 0;
-+}
-+
-+static int tahvo_usb_set_suspend(struct otg_transceiver *dev, int suspend)
-+{
-+	struct tahvo_usb *tu = container_of(dev, struct tahvo_usb, otg);
-+	u16 w;
-+
-+	dev_dbg(&tu->pt_dev->dev, "set_suspend\n");
-+
-+	w = tahvo_read_reg(TAHVO_REG_USBR);
-+	if (suspend)
-+		w &= ~USBR_NSUSPEND;
-+	else
-+		w |= USBR_NSUSPEND;
-+	tahvo_write_reg(TAHVO_REG_USBR, w);
-+
-+	return 0;
-+}
-+
-+static int tahvo_usb_start_srp(struct otg_transceiver *dev)
-+{
-+	struct tahvo_usb *tu = container_of(dev, struct tahvo_usb, otg);
-+	u32 otg_ctrl;
-+
-+	dev_dbg(&tu->pt_dev->dev, "start_srp\n");
-+
-+	if (!dev || tu->otg.state != OTG_STATE_B_IDLE)
-+		return -ENODEV;
-+
-+	otg_ctrl = omap_readl(OTG_CTRL);
-+	if (!(otg_ctrl & OTG_BSESSEND))
-+		return -EINVAL;
-+
-+	otg_ctrl |= OTG_B_BUSREQ;
-+	otg_ctrl &= ~OTG_A_BUSREQ & OTG_CTRL_SYS_MASK;
-+	omap_writel(otg_ctrl, OTG_CTRL);
-+	tu->otg.state = OTG_STATE_B_SRP_INIT;
-+
-+	return 0;
-+}
-+
-+static int tahvo_usb_start_hnp(struct otg_transceiver *otg)
-+{
-+	struct tahvo_usb *tu = container_of(otg, struct tahvo_usb, otg);
-+
-+	dev_dbg(&tu->pt_dev->dev, "start_hnp\n");
-+#ifdef CONFIG_USB_OTG
-+	/* REVISIT: Add this for OTG */
-+#endif
-+	return -EINVAL;
-+}
-+
-+static int tahvo_usb_set_host(struct otg_transceiver *otg, struct usb_bus *host)
-+{
-+	struct tahvo_usb *tu = container_of(otg, struct tahvo_usb, otg);
-+	u32 l;
-+
-+	dev_dbg(&tu->pt_dev->dev, "set_host %p\n", host);
-+
-+	if (otg == NULL)
-+		return -ENODEV;
-+
-+#if defined(CONFIG_USB_OTG) || !defined(CONFIG_USB_GADGET_OMAP)
-+
-+	mutex_lock(&tu->serialize);
-+
-+	if (host == NULL) {
-+		if (TAHVO_MODE(tu) == TAHVO_MODE_HOST)
-+			tahvo_usb_power_off(tu);
-+		tu->otg.host = NULL;
-+		mutex_unlock(&tu->serialize);
-+		return 0;
-+	}
-+
-+	l = omap_readl(OTG_SYSCON_1);
-+	l &= ~(OTG_IDLE_EN | HST_IDLE_EN | DEV_IDLE_EN);
-+	omap_writel(l, OTG_SYSCON_1);
-+
-+	if (TAHVO_MODE(tu) == TAHVO_MODE_HOST) {
-+		tu->otg.host = NULL;
-+		tahvo_usb_become_host(tu);
-+	} else
-+		host_suspend(tu);
-+
-+	tu->otg.host = host;
-+
-+	mutex_unlock(&tu->serialize);
-+#else
-+	/* No host mode configured, so do not allow host controlled to be set */
-+	return -EINVAL;
-+#endif
-+
-+	return 0;
-+}
-+
-+static int tahvo_usb_set_peripheral(struct otg_transceiver *otg, struct usb_gadget *gadget)
-+{
-+	struct tahvo_usb *tu = container_of(otg, struct tahvo_usb, otg);
-+
-+	dev_dbg(&tu->pt_dev->dev, "set_peripheral %p\n", gadget);
-+
-+	if (!otg)
-+		return -ENODEV;
-+
-+#if defined(CONFIG_USB_OTG) || defined(CONFIG_USB_GADGET_OMAP)
-+
-+	mutex_lock(&tu->serialize);
-+
-+	if (!gadget) {
-+		if (TAHVO_MODE(tu) == TAHVO_MODE_PERIPHERAL)
-+			tahvo_usb_power_off(tu);
-+		tu->otg.gadget = NULL;
-+		mutex_unlock(&tu->serialize);
-+		return 0;
-+	}
-+
-+	tu->otg.gadget = gadget;
-+	if (TAHVO_MODE(tu) == TAHVO_MODE_PERIPHERAL)
-+		tahvo_usb_become_peripheral(tu);
-+
-+	mutex_unlock(&tu->serialize);
-+#else
-+	/* No gadget mode configured, so do not allow host controlled to be set */
-+	return -EINVAL;
-+#endif
-+
-+	return 0;
-+}
-+
-+static void tahvo_usb_irq_work(struct work_struct *work)
-+{
-+	struct tahvo_usb *tu = container_of(work, struct tahvo_usb, irq_work);
-+
-+	mutex_lock(&tu->serialize);
-+	check_vbus_state(tu);
-+	mutex_unlock(&tu->serialize);
-+}
-+
-+static void tahvo_usb_vbus_interrupt(unsigned long arg)
-+{
-+	struct tahvo_usb *tu = (struct tahvo_usb *) arg;
-+
-+	tahvo_ack_irq(TAHVO_INT_VBUSON);
-+	/* Seems we need this to acknowledge the interrupt */
-+	tahvo_read_reg(TAHVO_REG_IDSR);
-+	schedule_work(&tu->irq_work);
-+}
-+
-+#ifdef CONFIG_USB_OTG
-+static ssize_t otg_mode_show(struct device *device,
-+			     struct device_attribute *attr, char *buf)
-+{
-+	struct tahvo_usb *tu = (struct tahvo_usb*) device->driver_data;
-+	switch (tu->tahvo_mode) {
-+	case TAHVO_MODE_HOST:
-+		return sprintf(buf, "host\n");
-+	case TAHVO_MODE_PERIPHERAL:
-+		return sprintf(buf, "peripheral\n");
-+	}
-+	return sprintf(buf, "unknown\n");
-+}
-+
-+static ssize_t otg_mode_store(struct device *device,
-+			      struct device_attribute *attr,
-+			      const char *buf, size_t count)
-+{
-+	struct tahvo_usb *tu = (struct tahvo_usb*) device->driver_data;
-+	int r;
-+
-+	r = strlen(buf);
-+	mutex_lock(&tu->serialize);
-+	if (strncmp(buf, "host", 4) == 0) {
-+		if (tu->tahvo_mode == TAHVO_MODE_PERIPHERAL)
-+			tahvo_usb_stop_peripheral(tu);
-+		tu->tahvo_mode = TAHVO_MODE_HOST;
-+		if (tu->otg.host) {
-+			printk(KERN_INFO "Selected HOST mode: host controller present.\n");
-+			tahvo_usb_become_host(tu);
-+		} else {
-+			printk(KERN_INFO "Selected HOST mode: no host controller, powering off.\n");
-+			tahvo_usb_power_off(tu);
-+		}
-+	} else if (strncmp(buf, "peripheral", 10) == 0) {
-+		if (tu->tahvo_mode == TAHVO_MODE_HOST)
-+			tahvo_usb_stop_host(tu);
-+		tu->tahvo_mode = TAHVO_MODE_PERIPHERAL;
-+		if (tu->otg.gadget) {
-+			printk(KERN_INFO "Selected PERIPHERAL mode: gadget driver present.\n");
-+			tahvo_usb_become_peripheral(tu);
-+		} else {
-+			printk(KERN_INFO "Selected PERIPHERAL mode: no gadget driver, powering off.\n");
-+			tahvo_usb_power_off(tu);
-+		}
-+	} else
-+		r = -EINVAL;
-+
-+	mutex_unlock(&tu->serialize);
-+	return r;
-+}
-+
-+static DEVICE_ATTR(otg_mode, 0644, otg_mode_show, otg_mode_store);
-+#endif
-+
-+static int tahvo_usb_probe(struct device *dev)
-+{
-+	struct tahvo_usb *tu;
-+	int ret;
-+
-+	dev_dbg(dev, "probe\n");
-+
-+	/* Create driver data */
-+	tu = kmalloc(sizeof(*tu), GFP_KERNEL);
-+	if (!tu)
-+		return -ENOMEM;
-+	memset(tu, 0, sizeof(*tu));
-+	tu->pt_dev = container_of(dev, struct platform_device, dev);
-+#ifdef CONFIG_USB_OTG
-+	/* Default mode */
-+#ifdef CONFIG_CBUS_TAHVO_USB_HOST_BY_DEFAULT
-+	tu->tahvo_mode = TAHVO_MODE_HOST;
-+#else
-+	tu->tahvo_mode = TAHVO_MODE_PERIPHERAL;
-+#endif
-+#endif
-+
-+	INIT_WORK(&tu->irq_work, tahvo_usb_irq_work);
-+	mutex_init(&tu->serialize);
-+
-+	/* Set initial state, so that we generate kevents only on
-+	 * state changes */
-+	tu->vbus_state = tahvo_read_reg(TAHVO_REG_IDSR) & 0x01;
-+
-+	/* We cannot enable interrupt until omap_udc is initialized */
-+	ret = tahvo_request_irq(TAHVO_INT_VBUSON, tahvo_usb_vbus_interrupt,
-+				(unsigned long) tu, "vbus_interrupt");
-+	if (ret != 0) {
-+		kfree(tu);
-+		printk(KERN_ERR "Could not register Tahvo interrupt for VBUS\n");
-+		return ret;
-+	}
-+
-+	/* Attributes */
-+	ret = device_create_file(dev, &dev_attr_vbus_state);
-+#ifdef CONFIG_USB_OTG
-+	ret |= device_create_file(dev, &dev_attr_otg_mode);
-+#endif
-+	if (ret)
-+		printk(KERN_ERR "attribute creation failed: %d\n", ret);
-+
-+	/* Create OTG interface */
-+	tahvo_usb_power_off(tu);
-+	tu->otg.state = OTG_STATE_UNDEFINED;
-+	tu->otg.label = DRIVER_NAME;
-+	tu->otg.set_host = tahvo_usb_set_host;
-+	tu->otg.set_peripheral = tahvo_usb_set_peripheral;
-+	tu->otg.set_power = tahvo_usb_set_power;
-+	tu->otg.set_suspend = tahvo_usb_set_suspend;
-+	tu->otg.start_srp = tahvo_usb_start_srp;
-+	tu->otg.start_hnp = tahvo_usb_start_hnp;
-+
-+	ret = otg_set_transceiver(&tu->otg);
-+	if (ret < 0) {
-+		printk(KERN_ERR "Cannot register USB transceiver\n");
-+		kfree(tu);
-+		tahvo_free_irq(TAHVO_INT_VBUSON);
-+		return ret;
-+	}
-+
-+	dev->driver_data = tu;
-+
-+	/* Act upon current vbus state once at startup. A vbus state irq may or
-+	 * may not be generated in addition to this. */
-+	schedule_work(&tu->irq_work);
-+	return 0;
-+}
-+
-+static int tahvo_usb_remove(struct device *dev)
-+{
-+	dev_dbg(dev, "remove\n");
-+
-+	tahvo_free_irq(TAHVO_INT_VBUSON);
-+	flush_scheduled_work();
-+	otg_set_transceiver(0);
-+	device_remove_file(dev, &dev_attr_vbus_state);
-+#ifdef CONFIG_USB_OTG
-+	device_remove_file(dev, &dev_attr_otg_mode);
-+#endif
-+	return 0;
-+}
-+
-+static struct device_driver tahvo_usb_driver = {
-+	.name		= "tahvo-usb",
-+	.bus		= &platform_bus_type,
-+	.probe		= tahvo_usb_probe,
-+	.remove		= tahvo_usb_remove,
-+};
-+
-+static struct platform_device tahvo_usb_device = {
-+	.name		= "tahvo-usb",
-+	.id		= -1,
-+};
-+
-+static int __init tahvo_usb_init(void)
-+{
-+	int ret = 0;
-+
-+	printk(KERN_INFO "Tahvo USB transceiver driver initializing\n");
-+	ret = driver_register(&tahvo_usb_driver);
-+	if (ret)
-+		return ret;
-+	ret = platform_device_register(&tahvo_usb_device);
-+	if (ret < 0) {
-+		driver_unregister(&tahvo_usb_driver);
-+		return ret;
-+	}
-+	ret = driver_register(&omap_otg_driver);
-+	if (ret) {
-+		platform_device_unregister(&tahvo_usb_device);
-+		driver_unregister(&tahvo_usb_driver);
-+		return ret;
-+	}
-+	return 0;
-+}
-+
-+subsys_initcall(tahvo_usb_init);
-+
-+static void __exit tahvo_usb_exit(void)
-+{
-+	driver_unregister(&omap_otg_driver);
-+	platform_device_unregister(&tahvo_usb_device);
-+	driver_unregister(&tahvo_usb_driver);
-+}
-+module_exit(tahvo_usb_exit);
-+
-+MODULE_DESCRIPTION("Tahvo USB OTG Transceiver Driver");
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Juha Yrjölä, Tony Lindgren, and Timo Teräs");
---- /dev/null
-+++ b/drivers/cbus/tahvo-user.c
-@@ -0,0 +1,405 @@
-+/**
-+ * drivers/cbus/tahvo-user.c
-+ *
-+ * Tahvo user space interface functions
-+ *
-+ * Copyright (C) 2004, 2005 Nokia Corporation
-+ *
-+ * Written by Mikko Ylinen <mikko.k.ylinen@nokia.com>
-+ *
-+ * This file is subject to the terms and conditions of the GNU General
-+ * Public License. See the file "COPYING" in the main directory of this
-+ * archive for more details.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#include <linux/types.h>
-+#include <linux/kernel.h>
-+#include <linux/interrupt.h>
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/fs.h>
-+#include <linux/miscdevice.h>
-+#include <linux/poll.h>
-+#include <linux/list.h>
-+#include <linux/spinlock.h>
-+#include <linux/mutex.h>
-+
-+#include <asm/uaccess.h>
-+
-+#include "tahvo.h"
-+
-+#include "user_retu_tahvo.h"
-+
-+/* Maximum size of IRQ node buffer/pool */
-+#define TAHVO_MAX_IRQ_BUF_LEN	16
-+
-+#define PFX			"tahvo-user: "
-+
-+/* Bitmap for marking the interrupt sources as having the handlers */
-+static u32 tahvo_irq_bits;
-+
-+/* For allowing only one user process to subscribe to the tahvo interrupts */
-+static struct file *tahvo_irq_subscr = NULL;
-+
-+/* For poll and IRQ passing */
-+struct tahvo_irq {
-+	u32 id;
-+	struct list_head node;
-+};
-+
-+static spinlock_t tahvo_irqs_lock;
-+static struct tahvo_irq *tahvo_irq_block;
-+static LIST_HEAD(tahvo_irqs);
-+static LIST_HEAD(tahvo_irqs_reserve);
-+
-+/* Wait queue - used when user wants to read the device */
-+DECLARE_WAIT_QUEUE_HEAD(tahvo_user_waitqueue);
-+
-+/* Semaphore to protect irq subscription sequence */
-+static struct mutex tahvo_mutex;
-+
-+/* This array specifies TAHVO register types (read/write/toggle) */
-+static const u8 tahvo_access_bits[] = {
-+	1,
-+	4,
-+	1,
-+	3,
-+	3,
-+	3,
-+	3,
-+	3,
-+	3,
-+	3,
-+	3,
-+	3,
-+	3,
-+	1
-+};
-+
-+/*
-+ * The handler for all TAHVO interrupts.
-+ *
-+ * arg is the interrupt source in TAHVO.
-+ */
-+static void tahvo_user_irq_handler(unsigned long arg)
-+{
-+	struct tahvo_irq *irq;
-+
-+	/* user has to re-enable the interrupt once ready
-+	 * for receiving them again */
-+	tahvo_disable_irq(arg);
-+	tahvo_ack_irq(arg);
-+
-+	spin_lock(&tahvo_irqs_lock);
-+	if (list_empty(&tahvo_irqs_reserve)) {
-+		spin_unlock(&tahvo_irqs_lock);
-+		return;
-+	}
-+	irq = list_entry((&tahvo_irqs_reserve)->next, struct tahvo_irq, node);
-+	irq->id = arg;
-+	list_move_tail(&irq->node, &tahvo_irqs);
-+	spin_unlock(&tahvo_irqs_lock);
-+
-+	/* wake up waiting thread */
-+	wake_up(&tahvo_user_waitqueue);
-+}
-+
-+/*
-+ * This routine sets up the interrupt handler and marks an interrupt source
-+ * in TAHVO as a candidate for signal delivery to the user process.
-+ */
-+static int tahvo_user_subscribe_to_irq(int id, struct file *filp)
-+{
-+	int ret;
-+
-+	mutex_lock(&tahvo_mutex);
-+	if ((tahvo_irq_subscr != NULL) && (tahvo_irq_subscr != filp)) {
-+		mutex_unlock(&tahvo_mutex);
-+		return -EBUSY;
-+	}
-+	/* Store the file pointer of the first user process registering IRQs */
-+	tahvo_irq_subscr = filp;
-+	mutex_unlock(&tahvo_mutex);
-+
-+	if (tahvo_irq_bits & (1 << id))
-+		return 0;
-+
-+	ret = tahvo_request_irq(id, tahvo_user_irq_handler, id, "");
-+	if (ret < 0)
-+		return ret;
-+
-+	/* Mark that this interrupt has a handler */
-+	tahvo_irq_bits |= 1 << id;
-+
-+	return 0;
-+}
-+
-+/*
-+ * Unregister all TAHVO interrupt handlers
-+ */
-+static void tahvo_unreg_irq_handlers(void)
-+{
-+	int id;
-+
-+	if (!tahvo_irq_bits)
-+		return;
-+
-+	for (id = 0; id < MAX_TAHVO_IRQ_HANDLERS; id++)
-+		if (tahvo_irq_bits & (1 << id))
-+			tahvo_free_irq(id);
-+
-+	tahvo_irq_bits = 0;
-+}
-+
-+/*
-+ * Write to TAHVO register.
-+ * Returns 0 upon success, a negative error value otherwise.
-+ */
-+static int tahvo_user_write_with_mask(u32 field, u16 value)
-+{
-+	u32 mask;
-+	u32 reg;
-+	u_short tmp;
-+	unsigned long flags;
-+
-+	mask = MASK(field);
-+	reg = REG(field);
-+
-+	/* Detect bad mask and reg */
-+	if (mask == 0 || reg > TAHVO_REG_MAX ||
-+	    tahvo_access_bits[reg] == READ_ONLY) {
-+		printk(KERN_ERR PFX "invalid arguments (reg=%#x, mask=%#x)\n",
-+		       reg, mask);
-+		return -EINVAL;
-+	}
-+
-+	/* Justify value according to mask */
-+	while (!(mask & 1)) {
-+		value = value << 1;
-+		mask = mask >> 1;
-+	}
-+
-+	spin_lock_irqsave(&tahvo_lock, flags);
-+	if (tahvo_access_bits[reg] == TOGGLE) {
-+		/* No need to detect previous content of register */
-+		tmp = 0;
-+	} else {
-+		/* Read current value of register */
-+		tmp = tahvo_read_reg(reg);
-+	}
-+	/* Generate a new value */
-+	tmp = (tmp & ~MASK(field)) | (value & MASK(field));
-+	/* Write data to TAHVO */
-+	tahvo_write_reg(reg, tmp);
-+	spin_unlock_irqrestore(&tahvo_lock, flags);
-+
-+	return 0;
-+}
-+
-+/*
-+ * Read TAHVO register.
-+ */
-+static u32 tahvo_user_read_with_mask(u32 field)
-+{
-+	u_short value;
-+	u32 mask, reg;
-+
-+	mask = MASK(field);
-+	reg = REG(field);
-+
-+	/* Detect bad mask and reg */
-+	if (mask == 0 || reg > TAHVO_REG_MAX) {
-+		printk(KERN_ERR PFX "invalid arguments (reg=%#x, mask=%#x)\n",
-+		       reg, mask);
-+		return -EINVAL;
-+	}
-+
-+	/* Read the register */
-+	value = tahvo_read_reg(reg) & mask;
-+
-+	/* Right justify value */
-+	while (!(mask & 1)) {
-+		value = value >> 1;
-+		mask = mask >> 1;
-+	}
-+
-+	return value;
-+}
-+
-+/*
-+ * Close device
-+ */
-+static int tahvo_close(struct inode *inode, struct file *filp)
-+{
-+	/* Unregister all interrupts that have been registered */
-+	if (tahvo_irq_subscr == filp) {
-+		tahvo_unreg_irq_handlers();
-+		tahvo_irq_subscr = NULL;
-+	}
-+
-+	return 0;
-+}
-+
-+/*
-+ * Device control (ioctl)
-+ */
-+static int tahvo_ioctl(struct inode *inode, struct file *filp,
-+		       unsigned int cmd, unsigned long arg)
-+{
-+	struct retu_tahvo_write_parms par;
-+	int ret;
-+
-+	switch (cmd) {
-+	case URT_IOCT_IRQ_SUBSCR:
-+		return tahvo_user_subscribe_to_irq(arg, filp);
-+	case TAHVO_IOCH_READ:
-+		return tahvo_user_read_with_mask(arg);
-+	case TAHVO_IOCX_WRITE:
-+		ret = copy_from_user(&par, (void __user *) arg, sizeof(par));
-+		if (ret)
-+			printk(KERN_ERR "copy_from_user failed: %d\n", ret);
-+		par.result = tahvo_user_write_with_mask(par.field, par.value);
-+		ret = copy_to_user((void __user *) arg, &par, sizeof(par));
-+		if (ret)
-+			printk(KERN_ERR "copy_to_user failed: %d\n", ret);
-+		break;
-+	default:
-+		return -ENOIOCTLCMD;
-+	}
-+	return 0;
-+}
-+
-+/*
-+ * Read from device
-+ */
-+static ssize_t tahvo_read(struct file *filp, char *buf, size_t count,
-+			  loff_t * offp)
-+{
-+	struct tahvo_irq *irq;
-+
-+	u32 nr, i;
-+
-+	/* read not permitted if neither filp nor anyone has registered IRQs */
-+	if (tahvo_irq_subscr != filp)
-+		return -EPERM;
-+
-+	if ((count < sizeof(u32)) || ((count % sizeof(u32)) != 0))
-+		return -EINVAL;
-+
-+	nr = count / sizeof(u32);
-+
-+	for (i = 0; i < nr; i++) {
-+		unsigned long flags;
-+		u32 irq_id;
-+		int ret;
-+
-+		ret = wait_event_interruptible(tahvo_user_waitqueue,
-+					       !list_empty(&tahvo_irqs));
-+		if (ret < 0)
-+			return ret;
-+
-+		spin_lock_irqsave(&tahvo_irqs_lock, flags);
-+		irq = list_entry((&tahvo_irqs)->next, struct tahvo_irq, node);
-+		irq_id = irq->id;
-+		list_move(&irq->node, &tahvo_irqs_reserve);
-+		spin_unlock_irqrestore(&tahvo_irqs_lock, flags);
-+
-+		ret = copy_to_user(buf + i * sizeof(irq_id), &irq_id,
-+                                  sizeof(irq_id));
-+		if (ret)
-+			printk(KERN_ERR "copy_to_user failed: %d\n", ret);
-+	}
-+
-+	return count;
-+}
-+
-+/*
-+ * Poll method
-+ */
-+static unsigned tahvo_poll(struct file *filp, struct poll_table_struct *pt)
-+{
-+	if (!list_empty(&tahvo_irqs))
-+		return POLLIN;
-+
-+	poll_wait(filp, &tahvo_user_waitqueue, pt);
-+
-+	if (!list_empty(&tahvo_irqs))
-+		return POLLIN;
-+	else
-+		return 0;
-+}
-+
-+static struct file_operations tahvo_user_fileops = {
-+	.owner = THIS_MODULE,
-+	.ioctl = tahvo_ioctl,
-+	.read = tahvo_read,
-+	.release = tahvo_close,
-+	.poll = tahvo_poll
-+};
-+
-+static struct miscdevice tahvo_device = {
-+	.minor = MISC_DYNAMIC_MINOR,
-+	.name = "tahvo",
-+	.fops = &tahvo_user_fileops
-+};
-+
-+/*
-+ * Initialization
-+ *
-+ * @return 0 if successful, error value otherwise.
-+ */
-+int tahvo_user_init(void)
-+{
-+	struct tahvo_irq *irq;
-+	int res, i;
-+
-+	irq = kmalloc(sizeof(*irq) * TAHVO_MAX_IRQ_BUF_LEN, GFP_KERNEL);
-+	if (irq == NULL) {
-+		printk(KERN_ERR PFX "kmalloc failed\n");
-+		return -ENOMEM;
-+	}
-+	memset(irq, 0, sizeof(*irq) * TAHVO_MAX_IRQ_BUF_LEN);
-+	for (i = 0; i < TAHVO_MAX_IRQ_BUF_LEN; i++)
-+		list_add(&irq[i].node, &tahvo_irqs_reserve);
-+
-+	tahvo_irq_block = irq;
-+
-+	spin_lock_init(&tahvo_irqs_lock);
-+	mutex_init(&tahvo_mutex);
-+
-+	/* Request a misc device */
-+	res = misc_register(&tahvo_device);
-+	if (res < 0) {
-+		printk(KERN_ERR PFX "unable to register misc device for %s\n",
-+		       tahvo_device.name);
-+		kfree(irq);
-+		return res;
-+	}
-+
-+	return 0;
-+}
-+
-+/*
-+ * Cleanup.
-+ */
-+void tahvo_user_cleanup(void)
-+{
-+	/* Unregister our misc device */
-+	misc_deregister(&tahvo_device);
-+	/* Unregister and disable all TAHVO interrupts */
-+	tahvo_unreg_irq_handlers();
-+	kfree(tahvo_irq_block);
-+}
-+
-+MODULE_DESCRIPTION("Tahvo ASIC user space functions");
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Mikko Ylinen");
---- /dev/null
-+++ b/drivers/cbus/tahvo.c
-@@ -0,0 +1,442 @@
-+/**
-+ * drivers/cbus/tahvo.c
-+ *
-+ * Support functions for Tahvo ASIC
-+ *
-+ * Copyright (C) 2004, 2005 Nokia Corporation
-+ *
-+ * Written by Juha Yrjölä <juha.yrjola@nokia.com>,
-+ *	      David Weinehall <david.weinehall@nokia.com>, and
-+ *	      Mikko Ylinen <mikko.k.ylinen@nokia.com>
-+ *
-+ * This file is subject to the terms and conditions of the GNU General
-+ * Public License. See the file "COPYING" in the main directory of this
-+ * archive for more details.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+
-+#include <linux/kernel.h>
-+#include <linux/errno.h>
-+#include <linux/device.h>
-+#include <linux/miscdevice.h>
-+#include <linux/poll.h>
-+#include <linux/fs.h>
-+#include <linux/irq.h>
-+#include <linux/interrupt.h>
-+#include <linux/platform_device.h>
-+#include <linux/gpio.h>
-+
-+#include <asm/uaccess.h>
-+
-+#include <mach/mux.h>
-+#include <mach/board.h>
-+#include <mach/board-nokia.h>
-+
-+#include "cbus.h"
-+#include "tahvo.h"
-+
-+#define TAHVO_ID		0x02
-+#define PFX			"tahvo: "
-+
-+static int tahvo_initialized;
-+static int tahvo_irq_pin;
-+static int tahvo_is_betty;
-+
-+static struct tasklet_struct tahvo_tasklet;
-+spinlock_t tahvo_lock = SPIN_LOCK_UNLOCKED;
-+
-+static struct completion device_release;
-+
-+struct tahvo_irq_handler_desc {
-+	int (*func)(unsigned long);
-+	unsigned long arg;
-+	char name[8];
-+};
-+
-+static struct tahvo_irq_handler_desc tahvo_irq_handlers[MAX_TAHVO_IRQ_HANDLERS];
-+
-+/**
-+ * tahvo_read_reg - Read a value from a register in Tahvo
-+ * @reg: the register to read from
-+ *
-+ * This function returns the contents of the specified register
-+ */
-+int tahvo_read_reg(int reg)
-+{
-+	BUG_ON(!tahvo_initialized);
-+	return cbus_read_reg(cbus_host, TAHVO_ID, reg);
-+}
-+
-+/**
-+ * tahvo_write_reg - Write a value to a register in Tahvo
-+ * @reg: the register to write to
-+ * @reg: the value to write to the register
-+ *
-+ * This function writes a value to the specified register
-+ */
-+void tahvo_write_reg(int reg, u16 val)
-+{
-+	BUG_ON(!tahvo_initialized);
-+	cbus_write_reg(cbus_host, TAHVO_ID, reg, val);
-+}
-+
-+/**
-+ * tahvo_set_clear_reg_bits - set and clear register bits atomically
-+ * @reg: the register to write to
-+ * @bits: the bits to set
-+ *
-+ * This function sets and clears the specified Tahvo register bits atomically
-+ */
-+void tahvo_set_clear_reg_bits(int reg, u16 set, u16 clear)
-+{
-+	unsigned long flags;
-+	u16 w;
-+
-+	spin_lock_irqsave(&tahvo_lock, flags);
-+	w = tahvo_read_reg(reg);
-+	w &= ~clear;
-+	w |= set;
-+	tahvo_write_reg(reg, w);
-+	spin_unlock_irqrestore(&tahvo_lock, flags);
-+}
-+
-+/*
-+ * Disable given TAHVO interrupt
-+ */
-+void tahvo_disable_irq(int id)
-+{
-+	unsigned long flags;
-+	u16 mask;
-+
-+	spin_lock_irqsave(&tahvo_lock, flags);
-+	mask = tahvo_read_reg(TAHVO_REG_IMR);
-+	mask |= 1 << id;
-+	tahvo_write_reg(TAHVO_REG_IMR, mask);
-+	spin_unlock_irqrestore(&tahvo_lock, flags);
-+}
-+
-+/*
-+ * Enable given TAHVO interrupt
-+ */
-+void tahvo_enable_irq(int id)
-+{
-+	unsigned long flags;
-+	u16 mask;
-+
-+	spin_lock_irqsave(&tahvo_lock, flags);
-+	mask = tahvo_read_reg(TAHVO_REG_IMR);
-+	mask &= ~(1 << id);
-+	tahvo_write_reg(TAHVO_REG_IMR, mask);
-+	spin_unlock_irqrestore(&tahvo_lock, flags);
-+}
-+
-+/*
-+ * Acknowledge given TAHVO interrupt
-+ */
-+void tahvo_ack_irq(int id)
-+{
-+	tahvo_write_reg(TAHVO_REG_IDR, 1 << id);
-+}
-+
-+static int tahvo_7bit_backlight;
-+
-+int tahvo_get_backlight_level(void)
-+{
-+	int mask;
-+
-+	if (tahvo_7bit_backlight)
-+		mask = 0x7f;
-+	else
-+		mask = 0x0f;
-+	return tahvo_read_reg(TAHVO_REG_LEDPWMR) & mask;
-+}
-+
-+int tahvo_get_max_backlight_level(void)
-+{
-+	if (tahvo_7bit_backlight)
-+		return 0x7f;
-+	else
-+		return 0x0f;
-+}
-+
-+void tahvo_set_backlight_level(int level)
-+{
-+	int max_level;
-+
-+	max_level = tahvo_get_max_backlight_level();
-+	if (level > max_level)
-+		level = max_level;
-+	tahvo_write_reg(TAHVO_REG_LEDPWMR, level);
-+}
-+
-+/*
-+ * TAHVO interrupt handler. Only schedules the tasklet.
-+ */
-+static irqreturn_t tahvo_irq_handler(int irq, void *dev_id)
-+{
-+	tasklet_schedule(&tahvo_tasklet);
-+	return IRQ_HANDLED;
-+}
-+
-+/*
-+ * Tasklet handler
-+ */
-+static void tahvo_tasklet_handler(unsigned long data)
-+{
-+	struct tahvo_irq_handler_desc *hnd;
-+	u16 id;
-+	u16 im;
-+	int i;
-+
-+	for (;;) {
-+		id = tahvo_read_reg(TAHVO_REG_IDR);
-+		im = ~tahvo_read_reg(TAHVO_REG_IMR);
-+		id &= im;
-+
-+		if (!id)
-+			break;
-+
-+		for (i = 0; id != 0; i++, id >>= 1) {
-+			if (!(id & 1))
-+				continue;
-+			hnd = &tahvo_irq_handlers[i];
-+			if (hnd->func == NULL) {
-+				/* Spurious tahvo interrupt - just ack it */
-+				printk(KERN_INFO "Spurious Tahvo interrupt "
-+						 "(id %d)\n", i);
-+				tahvo_disable_irq(i);
-+				tahvo_ack_irq(i);
-+				continue;
-+			}
-+			hnd->func(hnd->arg);
-+			/*
-+			 * Don't acknowledge the interrupt here
-+			 * It must be done explicitly
-+			 */
-+		}
-+	}
-+}
-+
-+/*
-+ * Register the handler for a given TAHVO interrupt source.
-+ */
-+int tahvo_request_irq(int id, void *irq_handler, unsigned long arg, char *name)
-+{
-+	struct tahvo_irq_handler_desc *hnd;
-+
-+	if (irq_handler == NULL || id >= MAX_TAHVO_IRQ_HANDLERS ||
-+	    name == NULL) {
-+		printk(KERN_ERR PFX "Invalid arguments to %s\n",
-+		       __FUNCTION__);
-+		return -EINVAL;
-+	}
-+	hnd = &tahvo_irq_handlers[id];
-+	if (hnd->func != NULL) {
-+		printk(KERN_ERR PFX "IRQ %d already reserved\n", id);
-+		return -EBUSY;
-+	}
-+	printk(KERN_INFO PFX "Registering interrupt %d for device %s\n",
-+	       id, name);
-+	hnd->func = irq_handler;
-+	hnd->arg = arg;
-+	strlcpy(hnd->name, name, sizeof(hnd->name));
-+
-+	tahvo_ack_irq(id);
-+	tahvo_enable_irq(id);
-+
-+	return 0;
-+}
-+
-+/*
-+ * Unregister the handler for a given TAHVO interrupt source.
-+ */
-+void tahvo_free_irq(int id)
-+{
-+	struct tahvo_irq_handler_desc *hnd;
-+
-+	if (id >= MAX_TAHVO_IRQ_HANDLERS) {
-+		printk(KERN_ERR PFX "Invalid argument to %s\n",
-+		       __FUNCTION__);
-+		return;
-+	}
-+	hnd = &tahvo_irq_handlers[id];
-+	if (hnd->func == NULL) {
-+		printk(KERN_ERR PFX "IRQ %d already freed\n", id);
-+		return;
-+	}
-+
-+	tahvo_disable_irq(id);
-+	hnd->func = NULL;
-+}
-+
-+/**
-+ * tahvo_probe - Probe for Tahvo ASIC
-+ * @dev: the Tahvo device
-+ *
-+ * Probe for the Tahvo ASIC and allocate memory
-+ * for its device-struct if found
-+ */
-+static int __devinit tahvo_probe(struct device *dev)
-+{
-+	const struct omap_em_asic_bb5_config * em_asic_config;
-+	int rev, id, ret;
-+
-+	/* Prepare tasklet */
-+	tasklet_init(&tahvo_tasklet, tahvo_tasklet_handler, 0);
-+
-+	em_asic_config = omap_get_config(OMAP_TAG_EM_ASIC_BB5,
-+					 struct omap_em_asic_bb5_config);
-+	if (em_asic_config == NULL) {
-+		printk(KERN_ERR PFX "Unable to retrieve config data\n");
-+		return -ENODATA;
-+	}
-+
-+	tahvo_initialized = 1;
-+
-+	rev = tahvo_read_reg(TAHVO_REG_ASICR);
-+
-+	id = (rev >> 8) & 0xff;
-+	if (id == 0x03) {
-+		if ((rev & 0xff) >= 0x50)
-+			tahvo_7bit_backlight = 1;
-+	} else if (id == 0x0b) {
-+		tahvo_is_betty = 1;
-+		tahvo_7bit_backlight = 1;
-+	} else {
-+		printk(KERN_ERR "Tahvo/Betty chip not found");
-+		return -ENODEV;
-+	}
-+
-+	printk(KERN_INFO "%s v%d.%d found\n", tahvo_is_betty ? "Betty" : "Tahvo",
-+	       (rev >> 4) & 0x0f, rev & 0x0f);
-+
-+	tahvo_irq_pin = em_asic_config->tahvo_irq_gpio;
-+
-+	if ((ret = gpio_request(tahvo_irq_pin, "TAHVO irq")) < 0) {
-+		printk(KERN_ERR PFX "Unable to reserve IRQ GPIO\n");
-+		return ret;
-+	}
-+
-+	/* Set the pin as input */
-+	gpio_direction_input(tahvo_irq_pin);
-+
-+	/* Rising edge triggers the IRQ */
-+	set_irq_type(gpio_to_irq(tahvo_irq_pin), IRQ_TYPE_EDGE_RISING);
-+
-+	/* Mask all TAHVO interrupts */
-+	tahvo_write_reg(TAHVO_REG_IMR, 0xffff);
-+
-+	ret = request_irq(gpio_to_irq(tahvo_irq_pin), tahvo_irq_handler, 0,
-+			  "tahvo", 0);
-+	if (ret < 0) {
-+		printk(KERN_ERR PFX "Unable to register IRQ handler\n");
-+		gpio_free(tahvo_irq_pin);
-+		return ret;
-+	}
-+#ifdef CONFIG_CBUS_TAHVO_USER
-+	/* Initialize user-space interface */
-+	if (tahvo_user_init() < 0) {
-+		printk(KERN_ERR "Unable to initialize driver\n");
-+		free_irq(gpio_to_irq(tahvo_irq_pin), 0);
-+		gpio_free(tahvo_irq_pin);
-+		return ret;
-+	}
-+#endif
-+	return 0;
-+}
-+
-+static int tahvo_remove(struct device *dev)
-+{
-+#ifdef CONFIG_CBUS_TAHVO_USER
-+	tahvo_user_cleanup();
-+#endif
-+	/* Mask all TAHVO interrupts */
-+	tahvo_write_reg(TAHVO_REG_IMR, 0xffff);
-+	free_irq(gpio_to_irq(tahvo_irq_pin), 0);
-+	gpio_free(tahvo_irq_pin);
-+	tasklet_kill(&tahvo_tasklet);
-+
-+	return 0;
-+}
-+
-+static void tahvo_device_release(struct device *dev)
-+{
-+	complete(&device_release);
-+}
-+
-+static struct device_driver tahvo_driver = {
-+	.name		= "tahvo",
-+	.bus		= &platform_bus_type,
-+	.probe		= tahvo_probe,
-+	.remove		= tahvo_remove,
-+};
-+
-+static struct platform_device tahvo_device = {
-+	.name		= "tahvo",
-+	.id		= -1,
-+	.dev = {
-+		.release = tahvo_device_release,
-+	}
-+};
-+
-+/**
-+ * tahvo_init - initialise Tahvo driver
-+ *
-+ * Initialise the Tahvo driver and return 0 if everything worked ok
-+ */
-+static int __init tahvo_init(void)
-+{
-+	int ret = 0;
-+
-+	printk(KERN_INFO "Tahvo/Betty driver initialising\n");
-+
-+	init_completion(&device_release);
-+
-+	if ((ret = driver_register(&tahvo_driver)) < 0)
-+		return ret;
-+
-+	if ((ret = platform_device_register(&tahvo_device)) < 0) {
-+		driver_unregister(&tahvo_driver);
-+		return ret;
-+	}
-+	return 0;
-+}
-+
-+/*
-+ * Cleanup
-+ */
-+static void __exit tahvo_exit(void)
-+{
-+	platform_device_unregister(&tahvo_device);
-+	driver_unregister(&tahvo_driver);
-+	wait_for_completion(&device_release);
-+}
-+
-+EXPORT_SYMBOL(tahvo_request_irq);
-+EXPORT_SYMBOL(tahvo_free_irq);
-+EXPORT_SYMBOL(tahvo_enable_irq);
-+EXPORT_SYMBOL(tahvo_disable_irq);
-+EXPORT_SYMBOL(tahvo_ack_irq);
-+EXPORT_SYMBOL(tahvo_read_reg);
-+EXPORT_SYMBOL(tahvo_write_reg);
-+EXPORT_SYMBOL(tahvo_get_backlight_level);
-+EXPORT_SYMBOL(tahvo_get_max_backlight_level);
-+EXPORT_SYMBOL(tahvo_set_backlight_level);
-+
-+subsys_initcall(tahvo_init);
-+module_exit(tahvo_exit);
-+
-+MODULE_DESCRIPTION("Tahvo ASIC control");
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Juha Yrjölä, David Weinehall, and Mikko Ylinen");
---- /dev/null
-+++ b/drivers/cbus/tahvo.h
-@@ -0,0 +1,61 @@
-+/*
-+ * drivers/cbus/tahvo.h
-+ *
-+ * Copyright (C) 2004, 2005 Nokia Corporation
-+ *
-+ * Written by Juha Yrjölä <juha.yrjola@nokia.com> and
-+ *	      David Weinehall <david.weinehall@nokia.com>
-+ *
-+ * This file is subject to the terms and conditions of the GNU General
-+ * Public License. See the file "COPYING" in the main directory of this
-+ * archive for more details.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#ifndef __DRIVERS_CBUS_TAHVO_H
-+#define __DRIVERS_CBUS_TAHVO_H
-+
-+#include <linux/types.h>
-+
-+/* Registers */
-+#define TAHVO_REG_ASICR		0x00	/* ASIC ID & revision */
-+#define TAHVO_REG_IDR		0x01	/* Interrupt ID */
-+#define TAHVO_REG_IDSR		0x02	/* Interrupt status */
-+#define TAHVO_REG_IMR		0x03	/* Interrupt mask */
-+#define TAHVO_REG_LEDPWMR	0x05	/* LED PWM */
-+#define TAHVO_REG_USBR		0x06	/* USB control */
-+#define TAHVO_REG_MAX		0x0d
-+
-+/* Interrupt sources */
-+#define TAHVO_INT_VBUSON	0
-+
-+#define MAX_TAHVO_IRQ_HANDLERS	8
-+
-+int tahvo_read_reg(int reg);
-+void tahvo_write_reg(int reg, u16 val);
-+void tahvo_set_clear_reg_bits(int reg, u16 set, u16 clear);
-+int tahvo_request_irq(int id, void *irq_handler, unsigned long arg, char *name);
-+void tahvo_free_irq(int id);
-+void tahvo_enable_irq(int id);
-+void tahvo_disable_irq(int id);
-+void tahvo_ack_irq(int id);
-+int tahvo_get_backlight_level(void);
-+int tahvo_get_max_backlight_level(void);
-+void tahvo_set_backlight_level(int level);
-+
-+#ifdef CONFIG_CBUS_TAHVO_USER
-+int tahvo_user_init(void);
-+void tahvo_user_cleanup(void);
-+#endif
-+
-+extern spinlock_t tahvo_lock;
-+
-+#endif /* __DRIVERS_CBUS_TAHVO_H */
---- /dev/null
-+++ b/drivers/cbus/user_retu_tahvo.h
-@@ -0,0 +1,75 @@
-+/**
-+ * drivers/cbus/user_retu_tahvo.h
-+ *
-+ * Copyright (C) 2004, 2005 Nokia Corporation
-+ *
-+ * Written by Mikko Ylinen <mikko.k.ylinen@nokia.com>
-+ *
-+ * Definitions and types used by both retu-user and tahvo-user.
-+ *
-+ * This file is subject to the terms and conditions of the GNU General
-+ * Public License. See the file "COPYING" in the main directory of this
-+ * archive for more details.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#ifndef _USER_RETU_TAHVO_H
-+#define _USER_RETU_TAHVO_H
-+
-+/* Chip IDs */
-+#define CHIP_RETU	1
-+#define CHIP_TAHVO	2
-+
-+/* Register access type bits */
-+#define READ_ONLY		1
-+#define WRITE_ONLY		2
-+#define READ_WRITE		3
-+#define TOGGLE			4
-+
-+#define MASK(field)		((u16)(field & 0xFFFF))
-+#define REG(field)		((u16)((field >> 16) & 0x3F))
-+
-+/*** IOCTL definitions. These should be kept in sync with user space **********/
-+
-+#define URT_IOC_MAGIC '`'
-+
-+/*
-+ * IOCTL function naming conventions:
-+ * ==================================
-+ *  0 -- No argument and return value
-+ *  S -- Set through a pointer
-+ *  T -- Tell directly with the argument value
-+ *  G -- Reply by setting through a pointer
-+ *  Q -- response is on the return value
-+ *  X -- S and G atomically
-+ *  H -- T and Q atomically
-+ */
-+
-+/* General */
-+#define URT_IOCT_IRQ_SUBSCR		_IO(URT_IOC_MAGIC, 0)
-+
-+/* RETU */
-+#define RETU_IOCH_READ			_IO(URT_IOC_MAGIC, 1)
-+#define RETU_IOCX_WRITE			_IO(URT_IOC_MAGIC, 2)
-+#define RETU_IOCH_ADC_READ		_IO(URT_IOC_MAGIC, 3)
-+
-+/* TAHVO */
-+#define TAHVO_IOCH_READ			_IO(URT_IOC_MAGIC, 4)
-+#define TAHVO_IOCX_WRITE		_IO(URT_IOC_MAGIC, 5)
-+
-+/* This structure is used for writing RETU/TAHVO registers */
-+struct retu_tahvo_write_parms {
-+    u32	field;
-+    u16	value;
-+    u8	result;
-+};
-+
-+#endif
---- a/drivers/spi/omap_uwire.c
-+++ b/drivers/spi/omap_uwire.c
-@@ -52,7 +52,7 @@
- #include <asm/mach-types.h>
- 
- #include <mach/mux.h>
--#include <mach/omap730.h>	/* OMAP730_IO_CONF registers */
-+#include <mach/omap7xx.h>	/* OMAP7XX_IO_CONF registers */
- 
- 
- /* FIXME address is now a platform device resource,
-@@ -504,7 +504,7 @@ static int __init uwire_probe(struct pla
- 	}
- 	clk_enable(uwire->ck);
- 
--	if (cpu_is_omap730())
-+	if (cpu_is_omap7xx())
- 		uwire_idx_shift = 1;
- 	else
- 		uwire_idx_shift = 2;
-@@ -573,8 +573,8 @@ static int __init omap_uwire_init(void)
- 	}
- 	if (machine_is_omap_perseus2()) {
- 		/* configure pins: MPU_UW_nSCS1, MPU_UW_SDO, MPU_UW_SCLK */
--		int val = omap_readl(OMAP730_IO_CONF_9) & ~0x00EEE000;
--		omap_writel(val | 0x00AAA000, OMAP730_IO_CONF_9);
-+		int val = omap_readl(OMAP7XX_IO_CONF_9) & ~0x00EEE000;
-+		omap_writel(val | 0x00AAA000, OMAP7XX_IO_CONF_9);
- 	}
- 
- 	return platform_driver_probe(&uwire_driver, uwire_probe);
---- a/drivers/usb/Kconfig
-+++ b/drivers/usb/Kconfig
-@@ -60,6 +60,7 @@ config USB_ARCH_HAS_EHCI
- 	default y if ARCH_IXP4XX
- 	default y if ARCH_W90X900
- 	default y if ARCH_AT91SAM9G45
-+	default y if ARCH_OMAP34XX
- 	default PCI
- 
- # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.
---- a/drivers/usb/host/ehci-hcd.c
-+++ b/drivers/usb/host/ehci-hcd.c
-@@ -1111,6 +1111,11 @@ MODULE_LICENSE ("GPL");
- #define	PLATFORM_DRIVER		ehci_hcd_au1xxx_driver
- #endif
- 
-+#ifdef CONFIG_ARCH_OMAP34XX
-+#include "ehci-omap.c"
-+#define	PLATFORM_DRIVER		ehci_hcd_omap_driver
-+#endif
-+
- #ifdef CONFIG_PPC_PS3
- #include "ehci-ps3.c"
- #define	PS3_SYSTEM_BUS_DRIVER	ps3_ehci_driver
---- /dev/null
-+++ b/drivers/usb/host/ehci-omap.c
-@@ -0,0 +1,755 @@
-+/*
-+ * ehci-omap.c - driver for USBHOST on OMAP 34xx processor
-+ *
-+ * Bus Glue for OMAP34xx USBHOST 3 port EHCI controller
-+ * Tested on OMAP3430 ES2.0 SDP
-+ *
-+ * Copyright (C) 2007-2008 Texas Instruments, Inc.
-+ *	Author: Vikram Pandita <vikram.pandita@ti.com>
-+ *
-+ * Copyright (C) 2009 Nokia Corporation
-+ *	Contact: Felipe Balbi <felipe.balbi@nokia.com>
-+ *
-+ * Based on "ehci-fsl.c" and "ehci-au1xxx.c" ehci glue layers
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-+ *
-+ * TODO (last updated Feb 23rd, 2009):
-+ *	- add kernel-doc
-+ *	- enable AUTOIDLE
-+ *	- move DPLL5 programming to clock fw
-+ *	- add suspend/resume
-+ *	- move workarounds to board-files
-+ */
-+
-+#include <linux/platform_device.h>
-+#include <linux/clk.h>
-+#include <linux/gpio.h>
-+#include <mach/usb.h>
-+
-+/*
-+ * OMAP USBHOST Register addresses: VIRTUAL ADDRESSES
-+ *	Use ehci_omap_readl()/ehci_omap_writel() functions
-+ */
-+
-+/* TLL Register Set */
-+#define	OMAP_USBTLL_REVISION				(0x00)
-+#define	OMAP_USBTLL_SYSCONFIG				(0x10)
-+#define	OMAP_USBTLL_SYSCONFIG_CACTIVITY			(1 << 8)
-+#define	OMAP_USBTLL_SYSCONFIG_SIDLEMODE			(1 << 3)
-+#define	OMAP_USBTLL_SYSCONFIG_ENAWAKEUP			(1 << 2)
-+#define	OMAP_USBTLL_SYSCONFIG_SOFTRESET			(1 << 1)
-+#define	OMAP_USBTLL_SYSCONFIG_AUTOIDLE			(1 << 0)
-+
-+#define	OMAP_USBTLL_SYSSTATUS				(0x14)
-+#define	OMAP_USBTLL_SYSSTATUS_RESETDONE			(1 << 0)
-+
-+#define	OMAP_USBTLL_IRQSTATUS				(0x18)
-+#define	OMAP_USBTLL_IRQENABLE				(0x1C)
-+
-+#define	OMAP_TLL_SHARED_CONF				(0x30)
-+#define	OMAP_TLL_SHARED_CONF_USB_90D_DDR_EN		(1 << 6)
-+#define	OMAP_TLL_SHARED_CONF_USB_180D_SDR_EN		(1 << 5)
-+#define	OMAP_TLL_SHARED_CONF_USB_DIVRATION		(1 << 2)
-+#define	OMAP_TLL_SHARED_CONF_FCLK_REQ			(1 << 1)
-+#define	OMAP_TLL_SHARED_CONF_FCLK_IS_ON			(1 << 0)
-+
-+#define	OMAP_TLL_CHANNEL_CONF(num)			(0x040 + 0x004 * num)
-+#define	OMAP_TLL_CHANNEL_CONF_ULPINOBITSTUFF		(1 << 11)
-+#define	OMAP_TLL_CHANNEL_CONF_ULPI_ULPIAUTOIDLE		(1 << 10)
-+#define	OMAP_TLL_CHANNEL_CONF_UTMIAUTOIDLE		(1 << 9)
-+#define	OMAP_TLL_CHANNEL_CONF_ULPIDDRMODE		(1 << 8)
-+#define	OMAP_TLL_CHANNEL_CONF_CHANEN			(1 << 0)
-+
-+#define	OMAP_TLL_ULPI_FUNCTION_CTRL(num)		(0x804 + 0x100 * num)
-+#define	OMAP_TLL_ULPI_INTERFACE_CTRL(num)		(0x807 + 0x100 * num)
-+#define	OMAP_TLL_ULPI_OTG_CTRL(num)			(0x80A + 0x100 * num)
-+#define	OMAP_TLL_ULPI_INT_EN_RISE(num)			(0x80D + 0x100 * num)
-+#define	OMAP_TLL_ULPI_INT_EN_FALL(num)			(0x810 + 0x100 * num)
-+#define	OMAP_TLL_ULPI_INT_STATUS(num)			(0x813 + 0x100 * num)
-+#define	OMAP_TLL_ULPI_INT_LATCH(num)			(0x814 + 0x100 * num)
-+#define	OMAP_TLL_ULPI_DEBUG(num)			(0x815 + 0x100 * num)
-+#define	OMAP_TLL_ULPI_SCRATCH_REGISTER(num)		(0x816 + 0x100 * num)
-+
-+#define OMAP_TLL_CHANNEL_COUNT				3
-+#define OMAP_TLL_CHANNEL_1_EN_MASK			(1 << 1)
-+#define OMAP_TLL_CHANNEL_2_EN_MASK			(1 << 2)
-+#define OMAP_TLL_CHANNEL_3_EN_MASK			(1 << 4)
-+
-+/* UHH Register Set */
-+#define	OMAP_UHH_REVISION				(0x00)
-+#define	OMAP_UHH_SYSCONFIG				(0x10)
-+#define	OMAP_UHH_SYSCONFIG_MIDLEMODE			(1 << 12)
-+#define	OMAP_UHH_SYSCONFIG_CACTIVITY			(1 << 8)
-+#define	OMAP_UHH_SYSCONFIG_SIDLEMODE			(1 << 3)
-+#define	OMAP_UHH_SYSCONFIG_ENAWAKEUP			(1 << 2)
-+#define	OMAP_UHH_SYSCONFIG_SOFTRESET			(1 << 1)
-+#define	OMAP_UHH_SYSCONFIG_AUTOIDLE			(1 << 0)
-+
-+#define	OMAP_UHH_SYSSTATUS				(0x14)
-+#define	OMAP_UHH_HOSTCONFIG				(0x40)
-+#define	OMAP_UHH_HOSTCONFIG_ULPI_BYPASS			(1 << 0)
-+#define	OMAP_UHH_HOSTCONFIG_ULPI_P1_BYPASS		(1 << 0)
-+#define	OMAP_UHH_HOSTCONFIG_ULPI_P2_BYPASS		(1 << 11)
-+#define	OMAP_UHH_HOSTCONFIG_ULPI_P3_BYPASS		(1 << 12)
-+#define OMAP_UHH_HOSTCONFIG_INCR4_BURST_EN		(1 << 2)
-+#define OMAP_UHH_HOSTCONFIG_INCR8_BURST_EN		(1 << 3)
-+#define OMAP_UHH_HOSTCONFIG_INCR16_BURST_EN		(1 << 4)
-+#define OMAP_UHH_HOSTCONFIG_INCRX_ALIGN_EN		(1 << 5)
-+#define OMAP_UHH_HOSTCONFIG_P1_CONNECT_STATUS		(1 << 8)
-+#define OMAP_UHH_HOSTCONFIG_P2_CONNECT_STATUS		(1 << 9)
-+#define OMAP_UHH_HOSTCONFIG_P3_CONNECT_STATUS		(1 << 10)
-+
-+#define	OMAP_UHH_DEBUG_CSR				(0x44)
-+
-+/* EHCI Register Set */
-+#define	EHCI_INSNREG05_ULPI				(0xA4)
-+#define	EHCI_INSNREG05_ULPI_CONTROL_SHIFT		31
-+#define	EHCI_INSNREG05_ULPI_PORTSEL_SHIFT		24
-+#define	EHCI_INSNREG05_ULPI_OPSEL_SHIFT			22
-+#define	EHCI_INSNREG05_ULPI_REGADD_SHIFT		16
-+#define	EHCI_INSNREG05_ULPI_EXTREGADD_SHIFT		8
-+#define	EHCI_INSNREG05_ULPI_WRDATA_SHIFT		0
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static inline void ehci_omap_writel(void __iomem *base, u32 reg, u32 val)
-+{
-+	__raw_writel(val, base + reg);
-+}
-+
-+static inline u32 ehci_omap_readl(void __iomem *base, u32 reg)
-+{
-+	return __raw_readl(base + reg);
-+}
-+
-+static inline void ehci_omap_writeb(void __iomem *base, u8 reg, u8 val)
-+{
-+	__raw_writeb(val, base + reg);
-+}
-+
-+static inline u8 ehci_omap_readb(void __iomem *base, u8 reg)
-+{
-+	return __raw_readb(base + reg);
-+}
-+
-+/*-------------------------------------------------------------------------*/
-+
-+struct ehci_hcd_omap {
-+	struct ehci_hcd		*ehci;
-+	struct device		*dev;
-+
-+	struct clk		*usbhost_ick;
-+	struct clk		*usbhost2_120m_fck;
-+	struct clk		*usbhost1_48m_fck;
-+	struct clk		*usbtll_fck;
-+	struct clk		*usbtll_ick;
-+
-+	/* FIXME the following two workarounds are
-+	 * board specific not silicon-specific so these
-+	 * should be moved to board-file instead.
-+	 *
-+	 * Maybe someone from TI will know better which
-+	 * board is affected and needs the workarounds
-+	 * to be applied
-+	 */
-+
-+	/* gpio for resetting phy */
-+	int			reset_gpio_port[OMAP3_HS_USB_PORTS];
-+
-+	/* phy reset workaround */
-+	int			phy_reset;
-+
-+	/* desired phy_mode: TLL, PHY */
-+	enum ehci_hcd_omap_mode	port_mode[OMAP3_HS_USB_PORTS];
-+
-+	void __iomem		*uhh_base;
-+	void __iomem		*tll_base;
-+	void __iomem		*ehci_base;
-+};
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static void omap_usb_utmi_init(struct ehci_hcd_omap *omap, u8 tll_channel_mask)
-+{
-+	unsigned reg;
-+	int i;
-+
-+	/* Program the 3 TLL channels upfront */
-+	for (i = 0; i < OMAP_TLL_CHANNEL_COUNT; i++) {
-+		reg = ehci_omap_readl(omap->tll_base, OMAP_TLL_CHANNEL_CONF(i));
-+
-+		/* Disable AutoIdle, BitStuffing and use SDR Mode */
-+		reg &= ~(OMAP_TLL_CHANNEL_CONF_UTMIAUTOIDLE
-+				| OMAP_TLL_CHANNEL_CONF_ULPINOBITSTUFF
-+				| OMAP_TLL_CHANNEL_CONF_ULPIDDRMODE);
-+		ehci_omap_writel(omap->tll_base, OMAP_TLL_CHANNEL_CONF(i), reg);
-+	}
-+
-+	/* Program Common TLL register */
-+	reg = ehci_omap_readl(omap->tll_base, OMAP_TLL_SHARED_CONF);
-+	reg |= (OMAP_TLL_SHARED_CONF_FCLK_IS_ON
-+			| OMAP_TLL_SHARED_CONF_USB_DIVRATION
-+			| OMAP_TLL_SHARED_CONF_USB_180D_SDR_EN);
-+	reg &= ~OMAP_TLL_SHARED_CONF_USB_90D_DDR_EN;
-+
-+	ehci_omap_writel(omap->tll_base, OMAP_TLL_SHARED_CONF, reg);
-+
-+	/* Enable channels now */
-+	for (i = 0; i < OMAP_TLL_CHANNEL_COUNT; i++) {
-+		reg = ehci_omap_readl(omap->tll_base, OMAP_TLL_CHANNEL_CONF(i));
-+
-+		/* Enable only the reg that is needed */
-+		if (!(tll_channel_mask & 1<<i))
-+			continue;
-+
-+		reg |= OMAP_TLL_CHANNEL_CONF_CHANEN;
-+		ehci_omap_writel(omap->tll_base, OMAP_TLL_CHANNEL_CONF(i), reg);
-+
-+		ehci_omap_writeb(omap->tll_base,
-+				OMAP_TLL_ULPI_SCRATCH_REGISTER(i), 0xbe);
-+		dev_dbg(omap->dev, "ULPI_SCRATCH_REG[ch=%d]= 0x%02x\n",
-+				i+1, ehci_omap_readb(omap->tll_base,
-+				OMAP_TLL_ULPI_SCRATCH_REGISTER(i)));
-+	}
-+}
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/* omap_start_ehc
-+ *	- Start the TI USBHOST controller
-+ */
-+static int omap_start_ehc(struct ehci_hcd_omap *omap, struct usb_hcd *hcd)
-+{
-+	unsigned long timeout = jiffies + msecs_to_jiffies(1000);
-+	u8 tll_ch_mask = 0;
-+	unsigned reg = 0;
-+	int ret = 0;
-+
-+	dev_dbg(omap->dev, "starting TI EHCI USB Controller\n");
-+
-+	/* Enable Clocks for USBHOST */
-+	omap->usbhost_ick = clk_get(omap->dev, "usbhost_ick");
-+	if (IS_ERR(omap->usbhost_ick)) {
-+		ret =  PTR_ERR(omap->usbhost_ick);
-+		goto err_host_ick;
-+	}
-+	clk_enable(omap->usbhost_ick);
-+
-+	omap->usbhost2_120m_fck = clk_get(omap->dev, "usbhost_120m_fck");
-+	if (IS_ERR(omap->usbhost2_120m_fck)) {
-+		ret = PTR_ERR(omap->usbhost2_120m_fck);
-+		goto err_host_120m_fck;
-+	}
-+	clk_enable(omap->usbhost2_120m_fck);
-+
-+	omap->usbhost1_48m_fck = clk_get(omap->dev, "usbhost_48m_fck");
-+	if (IS_ERR(omap->usbhost1_48m_fck)) {
-+		ret = PTR_ERR(omap->usbhost1_48m_fck);
-+		goto err_host_48m_fck;
-+	}
-+	clk_enable(omap->usbhost1_48m_fck);
-+
-+	if (omap->phy_reset) {
-+		/* Refer: ISSUE1 */
-+		if (gpio_is_valid(omap->reset_gpio_port[0])) {
-+			gpio_request(omap->reset_gpio_port[0],
-+						"USB1 PHY reset");
-+			gpio_direction_output(omap->reset_gpio_port[0], 0);
-+		}
-+
-+		if (gpio_is_valid(omap->reset_gpio_port[1])) {
-+			gpio_request(omap->reset_gpio_port[1],
-+						"USB2 PHY reset");
-+			gpio_direction_output(omap->reset_gpio_port[1], 0);
-+		}
-+
-+		/* Hold the PHY in RESET for enough time till DIR is high */
-+		udelay(10);
-+	}
-+
-+	/* Configure TLL for 60Mhz clk for ULPI */
-+	omap->usbtll_fck = clk_get(omap->dev, "usbtll_fck");
-+	if (IS_ERR(omap->usbtll_fck)) {
-+		ret = PTR_ERR(omap->usbtll_fck);
-+		goto err_tll_fck;
-+	}
-+	clk_enable(omap->usbtll_fck);
-+
-+	omap->usbtll_ick = clk_get(omap->dev, "usbtll_ick");
-+	if (IS_ERR(omap->usbtll_ick)) {
-+		ret = PTR_ERR(omap->usbtll_ick);
-+		goto err_tll_ick;
-+	}
-+	clk_enable(omap->usbtll_ick);
-+
-+	/* perform TLL soft reset, and wait until reset is complete */
-+	ehci_omap_writel(omap->tll_base, OMAP_USBTLL_SYSCONFIG,
-+			OMAP_USBTLL_SYSCONFIG_SOFTRESET);
-+
-+	/* Wait for TLL reset to complete */
-+	while (!(ehci_omap_readl(omap->tll_base, OMAP_USBTLL_SYSSTATUS)
-+			& OMAP_USBTLL_SYSSTATUS_RESETDONE)) {
-+		cpu_relax();
-+
-+		if (time_after(jiffies, timeout)) {
-+			dev_dbg(omap->dev, "operation timed out\n");
-+			ret = -EINVAL;
-+			goto err_sys_status;
-+		}
-+	}
-+
-+	dev_dbg(omap->dev, "TLL RESET DONE\n");
-+
-+	/* (1<<3) = no idle mode only for initial debugging */
-+	ehci_omap_writel(omap->tll_base, OMAP_USBTLL_SYSCONFIG,
-+			OMAP_USBTLL_SYSCONFIG_ENAWAKEUP |
-+			OMAP_USBTLL_SYSCONFIG_SIDLEMODE |
-+			OMAP_USBTLL_SYSCONFIG_CACTIVITY);
-+
-+
-+	/* Put UHH in NoIdle/NoStandby mode */
-+	reg = ehci_omap_readl(omap->uhh_base, OMAP_UHH_SYSCONFIG);
-+	reg |= (OMAP_UHH_SYSCONFIG_ENAWAKEUP
-+			| OMAP_UHH_SYSCONFIG_SIDLEMODE
-+			| OMAP_UHH_SYSCONFIG_CACTIVITY
-+			| OMAP_UHH_SYSCONFIG_MIDLEMODE);
-+	reg &= ~OMAP_UHH_SYSCONFIG_AUTOIDLE;
-+
-+	ehci_omap_writel(omap->uhh_base, OMAP_UHH_SYSCONFIG, reg);
-+
-+	reg = ehci_omap_readl(omap->uhh_base, OMAP_UHH_HOSTCONFIG);
-+
-+	/* setup ULPI bypass and burst configurations */
-+	reg |= (OMAP_UHH_HOSTCONFIG_INCR4_BURST_EN
-+			| OMAP_UHH_HOSTCONFIG_INCR8_BURST_EN
-+			| OMAP_UHH_HOSTCONFIG_INCR16_BURST_EN);
-+	reg &= ~OMAP_UHH_HOSTCONFIG_INCRX_ALIGN_EN;
-+
-+	if (omap->port_mode[0] == EHCI_HCD_OMAP_MODE_UNKNOWN)
-+		reg &= ~OMAP_UHH_HOSTCONFIG_P1_CONNECT_STATUS;
-+	if (omap->port_mode[1] == EHCI_HCD_OMAP_MODE_UNKNOWN)
-+		reg &= ~OMAP_UHH_HOSTCONFIG_P2_CONNECT_STATUS;
-+	if (omap->port_mode[2] == EHCI_HCD_OMAP_MODE_UNKNOWN)
-+		reg &= ~OMAP_UHH_HOSTCONFIG_P3_CONNECT_STATUS;
-+
-+	/* Bypass the TLL module for PHY mode operation */
-+	 if (omap_rev() <= OMAP3430_REV_ES2_1) {
-+		dev_dbg(omap->dev, "OMAP3 ES version <= ES2.1 \n");
-+		if ((omap->port_mode[0] == EHCI_HCD_OMAP_MODE_PHY) ||
-+			(omap->port_mode[1] == EHCI_HCD_OMAP_MODE_PHY) ||
-+				(omap->port_mode[2] == EHCI_HCD_OMAP_MODE_PHY))
-+			reg &= ~OMAP_UHH_HOSTCONFIG_ULPI_BYPASS;
-+		else
-+			reg |= OMAP_UHH_HOSTCONFIG_ULPI_BYPASS;
-+	} else {
-+		dev_dbg(omap->dev, "OMAP3 ES version > ES2.1\n");
-+		if (omap->port_mode[0] == EHCI_HCD_OMAP_MODE_PHY)
-+			reg &= ~OMAP_UHH_HOSTCONFIG_ULPI_P1_BYPASS;
-+		else if (omap->port_mode[0] == EHCI_HCD_OMAP_MODE_TLL)
-+			reg |= OMAP_UHH_HOSTCONFIG_ULPI_P1_BYPASS;
-+
-+		if (omap->port_mode[1] == EHCI_HCD_OMAP_MODE_PHY)
-+			reg &= ~OMAP_UHH_HOSTCONFIG_ULPI_P2_BYPASS;
-+		else if (omap->port_mode[1] == EHCI_HCD_OMAP_MODE_TLL)
-+			reg |= OMAP_UHH_HOSTCONFIG_ULPI_P2_BYPASS;
-+
-+		if (omap->port_mode[2] == EHCI_HCD_OMAP_MODE_PHY)
-+			reg &= ~OMAP_UHH_HOSTCONFIG_ULPI_P3_BYPASS;
-+		else if (omap->port_mode[2] == EHCI_HCD_OMAP_MODE_TLL)
-+			reg |= OMAP_UHH_HOSTCONFIG_ULPI_P3_BYPASS;
-+
-+	}
-+	ehci_omap_writel(omap->uhh_base, OMAP_UHH_HOSTCONFIG, reg);
-+	dev_dbg(omap->dev, "UHH setup done, uhh_hostconfig=%x\n", reg);
-+
-+
-+	if ((omap->port_mode[0] == EHCI_HCD_OMAP_MODE_TLL) ||
-+		(omap->port_mode[1] == EHCI_HCD_OMAP_MODE_TLL) ||
-+			(omap->port_mode[2] == EHCI_HCD_OMAP_MODE_TLL)) {
-+
-+		if (omap->port_mode[0] == EHCI_HCD_OMAP_MODE_TLL)
-+			tll_ch_mask |= OMAP_TLL_CHANNEL_1_EN_MASK;
-+		if (omap->port_mode[1] == EHCI_HCD_OMAP_MODE_TLL)
-+			tll_ch_mask |= OMAP_TLL_CHANNEL_2_EN_MASK;
-+		if (omap->port_mode[2] == EHCI_HCD_OMAP_MODE_TLL)
-+			tll_ch_mask |= OMAP_TLL_CHANNEL_3_EN_MASK;
-+
-+		/* Enable UTMI mode for required TLL channels */
-+		omap_usb_utmi_init(omap, tll_ch_mask);
-+	}
-+
-+	if (omap->phy_reset) {
-+		/* Refer ISSUE1:
-+		 * Hold the PHY in RESET for enough time till
-+		 * PHY is settled and ready
-+		 */
-+		udelay(10);
-+
-+		if (gpio_is_valid(omap->reset_gpio_port[0]))
-+			gpio_set_value(omap->reset_gpio_port[0], 1);
-+
-+		if (gpio_is_valid(omap->reset_gpio_port[1]))
-+			gpio_set_value(omap->reset_gpio_port[1], 1);
-+	}
-+
-+	return 0;
-+
-+err_sys_status:
-+	clk_disable(omap->usbtll_ick);
-+	clk_put(omap->usbtll_ick);
-+
-+err_tll_ick:
-+	clk_disable(omap->usbtll_fck);
-+	clk_put(omap->usbtll_fck);
-+
-+err_tll_fck:
-+	clk_disable(omap->usbhost1_48m_fck);
-+	clk_put(omap->usbhost1_48m_fck);
-+
-+	if (omap->phy_reset) {
-+		if (gpio_is_valid(omap->reset_gpio_port[0]))
-+			gpio_free(omap->reset_gpio_port[0]);
-+
-+		if (gpio_is_valid(omap->reset_gpio_port[1]))
-+			gpio_free(omap->reset_gpio_port[1]);
-+	}
-+
-+err_host_48m_fck:
-+	clk_disable(omap->usbhost2_120m_fck);
-+	clk_put(omap->usbhost2_120m_fck);
-+
-+err_host_120m_fck:
-+	clk_disable(omap->usbhost_ick);
-+	clk_put(omap->usbhost_ick);
-+
-+err_host_ick:
-+	return ret;
-+}
-+
-+static void omap_stop_ehc(struct ehci_hcd_omap *omap, struct usb_hcd *hcd)
-+{
-+	unsigned long timeout = jiffies + msecs_to_jiffies(100);
-+
-+	dev_dbg(omap->dev, "stopping TI EHCI USB Controller\n");
-+
-+	/* Reset OMAP modules for insmod/rmmod to work */
-+	ehci_omap_writel(omap->uhh_base, OMAP_UHH_SYSCONFIG,
-+			OMAP_UHH_SYSCONFIG_SOFTRESET);
-+	while (!(ehci_omap_readl(omap->uhh_base, OMAP_UHH_SYSSTATUS)
-+				& (1 << 0))) {
-+		cpu_relax();
-+
-+		if (time_after(jiffies, timeout))
-+			dev_dbg(omap->dev, "operation timed out\n");
-+	}
-+
-+	while (!(ehci_omap_readl(omap->uhh_base, OMAP_UHH_SYSSTATUS)
-+				& (1 << 1))) {
-+		cpu_relax();
-+
-+		if (time_after(jiffies, timeout))
-+			dev_dbg(omap->dev, "operation timed out\n");
-+	}
-+
-+	while (!(ehci_omap_readl(omap->uhh_base, OMAP_UHH_SYSSTATUS)
-+				& (1 << 2))) {
-+		cpu_relax();
-+
-+		if (time_after(jiffies, timeout))
-+			dev_dbg(omap->dev, "operation timed out\n");
-+	}
-+
-+	ehci_omap_writel(omap->tll_base, OMAP_USBTLL_SYSCONFIG, (1 << 1));
-+
-+	while (!(ehci_omap_readl(omap->tll_base, OMAP_USBTLL_SYSSTATUS)
-+				& (1 << 0))) {
-+		cpu_relax();
-+
-+		if (time_after(jiffies, timeout))
-+			dev_dbg(omap->dev, "operation timed out\n");
-+	}
-+
-+	if (omap->usbtll_fck != NULL) {
-+		clk_disable(omap->usbtll_fck);
-+		clk_put(omap->usbtll_fck);
-+		omap->usbtll_fck = NULL;
-+	}
-+
-+	if (omap->usbhost_ick != NULL) {
-+		clk_disable(omap->usbhost_ick);
-+		clk_put(omap->usbhost_ick);
-+		omap->usbhost_ick = NULL;
-+	}
-+
-+	if (omap->usbhost1_48m_fck != NULL) {
-+		clk_disable(omap->usbhost1_48m_fck);
-+		clk_put(omap->usbhost1_48m_fck);
-+		omap->usbhost1_48m_fck = NULL;
-+	}
-+
-+	if (omap->usbhost2_120m_fck != NULL) {
-+		clk_disable(omap->usbhost2_120m_fck);
-+		clk_put(omap->usbhost2_120m_fck);
-+		omap->usbhost2_120m_fck = NULL;
-+	}
-+
-+	if (omap->usbtll_ick != NULL) {
-+		clk_disable(omap->usbtll_ick);
-+		clk_put(omap->usbtll_ick);
-+		omap->usbtll_ick = NULL;
-+	}
-+
-+	if (omap->phy_reset) {
-+		if (gpio_is_valid(omap->reset_gpio_port[0]))
-+			gpio_free(omap->reset_gpio_port[0]);
-+
-+		if (gpio_is_valid(omap->reset_gpio_port[1]))
-+			gpio_free(omap->reset_gpio_port[1]);
-+	}
-+
-+	dev_dbg(omap->dev, "Clock to USB host has been disabled\n");
-+}
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static const struct hc_driver ehci_omap_hc_driver;
-+
-+/* configure so an HC device and id are always provided */
-+/* always called with process context; sleeping is OK */
-+
-+/**
-+ * ehci_hcd_omap_probe - initialize TI-based HCDs
-+ *
-+ * Allocates basic resources for this USB host controller, and
-+ * then invokes the start() method for the HCD associated with it
-+ * through the hotplug entry's driver_data.
-+ */
-+static int ehci_hcd_omap_probe(struct platform_device *pdev)
-+{
-+	struct ehci_hcd_omap_platform_data *pdata = pdev->dev.platform_data;
-+	struct ehci_hcd_omap *omap;
-+	struct resource *res;
-+	struct usb_hcd *hcd;
-+
-+	int irq = platform_get_irq(pdev, 0);
-+	int ret = -ENODEV;
-+
-+	if (!pdata) {
-+		dev_dbg(&pdev->dev, "missing platform_data\n");
-+		goto err_pdata;
-+	}
-+
-+	if (usb_disabled())
-+		goto err_disabled;
-+
-+	omap = kzalloc(sizeof(*omap), GFP_KERNEL);
-+	if (!omap) {
-+		ret = -ENOMEM;
-+		goto err_create_hcd;
-+	}
-+
-+	hcd = usb_create_hcd(&ehci_omap_hc_driver, &pdev->dev,
-+			dev_name(&pdev->dev));
-+	if (!hcd) {
-+		dev_dbg(&pdev->dev, "failed to create hcd with err %d\n", ret);
-+		ret = -ENOMEM;
-+		goto err_create_hcd;
-+	}
-+
-+	platform_set_drvdata(pdev, omap);
-+	omap->dev		= &pdev->dev;
-+	omap->phy_reset		= pdata->phy_reset;
-+	omap->reset_gpio_port[0]	= pdata->reset_gpio_port[0];
-+	omap->reset_gpio_port[1]	= pdata->reset_gpio_port[1];
-+	omap->reset_gpio_port[2]	= pdata->reset_gpio_port[2];
-+	omap->port_mode[0]		= pdata->port_mode[0];
-+	omap->port_mode[1]		= pdata->port_mode[1];
-+	omap->port_mode[2]		= pdata->port_mode[2];
-+	omap->ehci		= hcd_to_ehci(hcd);
-+	omap->ehci->sbrn	= 0x20;
-+
-+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+
-+	hcd->rsrc_start = res->start;
-+	hcd->rsrc_len = resource_size(res);
-+
-+	hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
-+	if (!hcd->regs) {
-+		dev_err(&pdev->dev, "EHCI ioremap failed\n");
-+		ret = -ENOMEM;
-+		goto err_ioremap;
-+	}
-+
-+	/* we know this is the memory we want, no need to ioremap again */
-+	omap->ehci->caps = hcd->regs;
-+	omap->ehci_base = hcd->regs;
-+
-+	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-+	omap->uhh_base = ioremap(res->start, resource_size(res));
-+	if (!omap->uhh_base) {
-+		dev_err(&pdev->dev, "UHH ioremap failed\n");
-+		ret = -ENOMEM;
-+		goto err_uhh_ioremap;
-+	}
-+
-+	res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
-+	omap->tll_base = ioremap(res->start, resource_size(res));
-+	if (!omap->tll_base) {
-+		dev_err(&pdev->dev, "TLL ioremap failed\n");
-+		ret = -ENOMEM;
-+		goto err_tll_ioremap;
-+	}
-+
-+	ret = omap_start_ehc(omap, hcd);
-+	if (ret) {
-+		dev_dbg(&pdev->dev, "failed to start ehci\n");
-+		goto err_start;
-+	}
-+
-+	omap->ehci->regs = hcd->regs
-+		+ HC_LENGTH(readl(&omap->ehci->caps->hc_capbase));
-+
-+	/* cache this readonly data; minimize chip reads */
-+	omap->ehci->hcs_params = readl(&omap->ehci->caps->hcs_params);
-+
-+	/* SET 1 micro-frame Interrupt interval */
-+	writel(readl(&omap->ehci->regs->command) | (1 << 16),
-+			&omap->ehci->regs->command);
-+
-+	ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED);
-+	if (ret) {
-+		dev_dbg(&pdev->dev, "failed to add hcd with err %d\n", ret);
-+		goto err_add_hcd;
-+	}
-+
-+	return 0;
-+
-+err_add_hcd:
-+	omap_stop_ehc(omap, hcd);
-+
-+err_start:
-+	iounmap(omap->tll_base);
-+
-+err_tll_ioremap:
-+	iounmap(omap->uhh_base);
-+
-+err_uhh_ioremap:
-+	iounmap(hcd->regs);
-+
-+err_ioremap:
-+	usb_put_hcd(hcd);
-+
-+err_create_hcd:
-+err_disabled:
-+err_pdata:
-+	return ret;
-+}
-+
-+/* may be called without controller electrically present */
-+/* may be called with controller, bus, and devices active */
-+
-+/**
-+ * ehci_hcd_omap_remove - shutdown processing for EHCI HCDs
-+ * @pdev: USB Host Controller being removed
-+ *
-+ * Reverses the effect of usb_ehci_hcd_omap_probe(), first invoking
-+ * the HCD's stop() method.  It is always called from a thread
-+ * context, normally "rmmod", "apmd", or something similar.
-+ */
-+static int ehci_hcd_omap_remove(struct platform_device *pdev)
-+{
-+	struct ehci_hcd_omap *omap = platform_get_drvdata(pdev);
-+	struct usb_hcd *hcd = ehci_to_hcd(omap->ehci);
-+
-+	usb_remove_hcd(hcd);
-+	omap_stop_ehc(omap, hcd);
-+	iounmap(hcd->regs);
-+	iounmap(omap->tll_base);
-+	iounmap(omap->uhh_base);
-+	usb_put_hcd(hcd);
-+
-+	return 0;
-+}
-+
-+static void ehci_hcd_omap_shutdown(struct platform_device *pdev)
-+{
-+	struct ehci_hcd_omap *omap = platform_get_drvdata(pdev);
-+	struct usb_hcd *hcd = ehci_to_hcd(omap->ehci);
-+
-+	if (hcd->driver->shutdown)
-+		hcd->driver->shutdown(hcd);
-+}
-+
-+static struct platform_driver ehci_hcd_omap_driver = {
-+	.probe			= ehci_hcd_omap_probe,
-+	.remove			= ehci_hcd_omap_remove,
-+	.shutdown		= ehci_hcd_omap_shutdown,
-+	/*.suspend		= ehci_hcd_omap_suspend, */
-+	/*.resume		= ehci_hcd_omap_resume, */
-+	.driver = {
-+		.name		= "ehci-omap",
-+	}
-+};
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static const struct hc_driver ehci_omap_hc_driver = {
-+	.description		= hcd_name,
-+	.product_desc		= "OMAP-EHCI Host Controller",
-+	.hcd_priv_size		= sizeof(struct ehci_hcd),
-+
-+	/*
-+	 * generic hardware linkage
-+	 */
-+	.irq			= ehci_irq,
-+	.flags			= HCD_MEMORY | HCD_USB2,
-+
-+	/*
-+	 * basic lifecycle operations
-+	 */
-+	.reset			= ehci_init,
-+	.start			= ehci_run,
-+	.stop			= ehci_stop,
-+	.shutdown		= ehci_shutdown,
-+
-+	/*
-+	 * managing i/o requests and associated device resources
-+	 */
-+	.urb_enqueue		= ehci_urb_enqueue,
-+	.urb_dequeue		= ehci_urb_dequeue,
-+	.endpoint_disable	= ehci_endpoint_disable,
-+	.endpoint_reset		= ehci_endpoint_reset,
-+
-+	/*
-+	 * scheduling support
-+	 */
-+	.get_frame_number	= ehci_get_frame,
-+
-+	/*
-+	 * root hub support
-+	 */
-+	.hub_status_data	= ehci_hub_status_data,
-+	.hub_control		= ehci_hub_control,
-+	.bus_suspend		= ehci_bus_suspend,
-+	.bus_resume		= ehci_bus_resume,
-+
-+	.clear_tt_buffer_complete = ehci_clear_tt_buffer_complete,
-+};
-+
-+MODULE_ALIAS("platform:omap-ehci");
-+MODULE_AUTHOR("Texas Instruments, Inc.");
-+MODULE_AUTHOR("Felipe Balbi <felipe.balbi@nokia.com>");
-+
---- a/drivers/video/omap/dispc.c
-+++ b/drivers/video/omap/dispc.c
-@@ -210,6 +210,7 @@ static u32 inline dispc_read_reg(int idx
- /* Select RFBI or bypass mode */
- static void enable_rfbi_mode(int enable)
- {
-+	void __iomem *rfbi_control;
- 	u32 l;
- 
- 	l = dispc_read_reg(DISPC_CONTROL);
-@@ -222,9 +223,15 @@ static void enable_rfbi_mode(int enable)
- 	dispc_write_reg(DISPC_CONTROL, l);
- 
- 	/* Set bypass mode in RFBI module */
--	l = __raw_readl(OMAP2_IO_ADDRESS(RFBI_CONTROL));
-+	rfbi_control = ioremap(RFBI_CONTROL, SZ_1K);
-+	if (!rfbi_control) {
-+		pr_err("Unable to ioremap rfbi_control\n");
-+		return;
-+	}
-+	l = __raw_readl(rfbi_control);
- 	l |= enable ? 0 : (1 << 1);
--	__raw_writel(l, OMAP2_IO_ADDRESS(RFBI_CONTROL));
-+	__raw_writel(l, rfbi_control);
-+	iounmap(rfbi_control);
- }
- 
- static void set_lcd_data_lines(int data_lines)
-@@ -1373,6 +1380,7 @@ static int omap_dispc_init(struct omapfb
- 	int r;
- 	u32 l;
- 	struct lcd_panel *panel = fbdev->panel;
-+	void __iomem *ram_fw_base;
- 	int tmo = 10000;
- 	int skip_init = 0;
- 	int i;
-@@ -1453,7 +1461,13 @@ static int omap_dispc_init(struct omapfb
- 	}
- 
- 	/* L3 firewall setting: enable access to OCM RAM */
--	__raw_writel(0x402000b0, OMAP2_IO_ADDRESS(0x680050a0));
-+	ram_fw_base = ioremap(0x68005000, SZ_1K);
-+	if (!ram_fw_base) {
-+		dev_err(dispc.fbdev->dev, "Cannot ioremap to enable OCM RAM\n");
-+		goto fail1;
-+	}
-+	__raw_writel(0x402000b0, ram_fw_base + 0xa0);
-+	iounmap(ram_fw_base);
- 
- 	if ((r = alloc_palette_ram()) < 0)
- 		goto fail2;
diff --git a/target/linux/omap35xx/patches-2.6.32/003-enable_dss2_beagleboard.patch b/target/linux/omap35xx/patches-2.6.32/003-enable_dss2_beagleboard.patch
deleted file mode 100644
index fb89a90ab..000000000
--- a/target/linux/omap35xx/patches-2.6.32/003-enable_dss2_beagleboard.patch
+++ /dev/null
@@ -1,195 +0,0 @@
---- a/arch/arm/mach-omap2/board-omap3beagle.c
-+++ b/arch/arm/mach-omap2/board-omap3beagle.c
-@@ -23,6 +23,7 @@
- #include <linux/gpio.h>
- #include <linux/input.h>
- #include <linux/gpio_keys.h>
-+#include <linux/omapfb.h>
- 
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
-@@ -44,6 +45,7 @@
- #include <mach/mux.h>
- #include <mach/usb.h>
- #include <mach/timer-gp.h>
-+#include <mach/display.h>
- 
- #include "mmc-twl4030.h"
- 
-@@ -106,6 +108,92 @@ static struct platform_device omap3beagl
- 	.resource	= &omap3beagle_nand_resource,
- };
- 
-+/* DSS */
-+
-+static int beagle_enable_dvi(struct omap_dss_device *dssdev)
-+{
-+       if (dssdev->reset_gpio != -1)
-+               gpio_set_value(dssdev->reset_gpio, 1);
-+
-+       return 0;
-+}
-+
-+static void beagle_disable_dvi(struct omap_dss_device *dssdev)
-+{
-+       if (dssdev->reset_gpio != -1)
-+               gpio_set_value(dssdev->reset_gpio, 0);
-+}
-+
-+static struct omap_dss_device beagle_dvi_device = {
-+       .type = OMAP_DISPLAY_TYPE_DPI,
-+       .name = "dvi",
-+       .driver_name = "generic_panel",
-+       .phy.dpi.data_lines = 24,
-+       .reset_gpio = 170,
-+       .platform_enable = beagle_enable_dvi,
-+       .platform_disable = beagle_disable_dvi,
-+};
-+
-+static int beagle_panel_enable_tv(struct omap_dss_device *dssdev)
-+{
-+       return 0;
-+}
-+
-+static void beagle_panel_disable_tv(struct omap_dss_device *dssdev)
-+{
-+}
-+
-+static struct omap_dss_device beagle_tv_device = {
-+       .name = "tv",
-+       .driver_name = "venc",
-+       .type = OMAP_DISPLAY_TYPE_VENC,
-+       .phy.venc.type = OMAP_DSS_VENC_TYPE_SVIDEO,
-+       .platform_enable = beagle_panel_enable_tv,
-+       .platform_disable = beagle_panel_disable_tv,
-+};
-+
-+static struct omap_dss_device *beagle_dss_devices[] = {
-+       &beagle_dvi_device,
-+       &beagle_tv_device,
-+};
-+
-+static struct omap_dss_board_info beagle_dss_data = {
-+       .num_devices = ARRAY_SIZE(beagle_dss_devices),
-+       .devices = beagle_dss_devices,
-+       .default_device = &beagle_dvi_device,
-+};
-+
-+static struct platform_device beagle_dss_device = {
-+       .name          = "omapdss",
-+       .id            = -1,
-+       .dev            = {
-+               .platform_data = &beagle_dss_data,
-+       },
-+};
-+
-+static struct regulator_consumer_supply beagle_vdda_dac_supply = {
-+       .supply         = "vdda_dac",
-+       .dev            = &beagle_dss_device.dev,
-+};
-+
-+static struct regulator_consumer_supply beagle_vdds_dsi_supply = {
-+       .supply         = "vdds_dsi",
-+       .dev            = &beagle_dss_device.dev,
-+};
-+
-+static void __init beagle_display_init(void)
-+{
-+       int r;
-+
-+       r = gpio_request(beagle_dvi_device.reset_gpio, "DVI reset");
-+       if (r < 0) {
-+               printk(KERN_ERR "Unable to get DVI reset GPIO\n");
-+               return;
-+       }
-+
-+       gpio_direction_output(beagle_dvi_device.reset_gpio, 0);
-+}
-+
- #include "sdram-micron-mt46h32m32lf-6.h"
- 
- static struct twl4030_hsmmc_info mmc[] = {
-@@ -117,15 +205,6 @@ static struct twl4030_hsmmc_info mmc[] =
- 	{}	/* Terminator */
- };
- 
--static struct platform_device omap3_beagle_lcd_device = {
--	.name		= "omap3beagle_lcd",
--	.id		= -1,
--};
--
--static struct omap_lcd_config omap3_beagle_lcd_config __initdata = {
--	.ctrl_name	= "internal",
--};
--
- static struct regulator_consumer_supply beagle_vmmc1_supply = {
- 	.supply			= "vmmc",
- };
-@@ -181,15 +260,6 @@ static struct twl4030_gpio_platform_data
- 	.setup		= beagle_twl_gpio_setup,
- };
- 
--static struct regulator_consumer_supply beagle_vdac_supply = {
--	.supply		= "vdac",
--	.dev		= &omap3_beagle_lcd_device.dev,
--};
--
--static struct regulator_consumer_supply beagle_vdvi_supply = {
--	.supply		= "vdvi",
--	.dev		= &omap3_beagle_lcd_device.dev,
--};
- 
- /* VMMC1 for MMC1 pins CMD, CLK, DAT0..DAT3 (20 mA, plus card == max 220 mA) */
- static struct regulator_init_data beagle_vmmc1 = {
-@@ -226,13 +296,14 @@ static struct regulator_init_data beagle
- 	.constraints = {
- 		.min_uV			= 1800000,
- 		.max_uV			= 1800000,
-+		.apply_uV       = true,
- 		.valid_modes_mask	= REGULATOR_MODE_NORMAL
- 					| REGULATOR_MODE_STANDBY,
- 		.valid_ops_mask		= REGULATOR_CHANGE_MODE
- 					| REGULATOR_CHANGE_STATUS,
- 	},
- 	.num_consumer_supplies	= 1,
--	.consumer_supplies	= &beagle_vdac_supply,
-+	.consumer_supplies	= &beagle_vdda_dac_supply,
- };
- 
- /* VPLL2 for digital video outputs */
-@@ -247,7 +318,7 @@ static struct regulator_init_data beagle
- 					| REGULATOR_CHANGE_STATUS,
- 	},
- 	.num_consumer_supplies	= 1,
--	.consumer_supplies	= &beagle_vdvi_supply,
-+	.consumer_supplies	= &beagle_vdds_dsi_supply,
- };
- 
- static struct twl4030_usb_data beagle_usb_data = {
-@@ -340,7 +411,6 @@ static struct platform_device keys_gpio 
- };
- 
- static struct omap_board_config_kernel omap3_beagle_config[] __initdata = {
--	{ OMAP_TAG_LCD,		&omap3_beagle_lcd_config },
- };
- 
- static void __init omap3_beagle_init_irq(void)
-@@ -357,7 +427,7 @@ static void __init omap3_beagle_init_irq
- }
- 
- static struct platform_device *omap3_beagle_devices[] __initdata = {
--	&omap3_beagle_lcd_device,
-+	&beagle_dss_device,
- 	&leds_gpio,
- 	&keys_gpio,
- };
-@@ -420,9 +490,6 @@ static void __init omap3_beagle_init(voi
- 	omap_serial_init();
- 
- 	omap_cfg_reg(J25_34XX_GPIO170);
--	gpio_request(170, "DVI_nPD");
--	/* REVISIT leave DVI powered down until it's needed ... */
--	gpio_direction_output(170, true);
- 
- 	usb_musb_init();
- 	usb_ehci_init(&ehci_pdata);
diff --git a/target/linux/omap35xx/patches-2.6.32/004-compile_fix_dispc.patch b/target/linux/omap35xx/patches-2.6.32/004-compile_fix_dispc.patch
deleted file mode 100644
index ab76ee2cb..000000000
--- a/target/linux/omap35xx/patches-2.6.32/004-compile_fix_dispc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/drivers/video/omap2/dss/dispc.c
-+++ b/drivers/video/omap2/dss/dispc.c
-@@ -3077,8 +3077,8 @@ static void _omap_dispc_initial_config(v
- 	REG_FLD_MOD(DISPC_CONFIG, 1, 9, 9);
- 
- 	/* L3 firewall setting: enable access to OCM RAM */
--	if (cpu_is_omap24xx())
--		__raw_writel(0x402000b0, OMAP2_IO_ADDRESS(0x680050a0));
-+//	if (cpu_is_omap24xx())
-+//		__raw_writel(0x402000b0, OMAP2_IO_ADDRESS(0x680050a0));
- 
- 	_dispc_setup_color_conv_coef();
- 
diff --git a/target/linux/orion/config-default b/target/linux/orion/config-default
index d84cac1fc..58a44edb0 100644
--- a/target/linux/orion/config-default
+++ b/target/linux/orion/config-default
@@ -38,7 +38,6 @@ CONFIG_CPU_FEROCEON=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
 CONFIG_CPU_PABRT_NOIFAR=y
 CONFIG_CPU_TLB_V4WBI=y
-CONFIG_CRC16=y
 # CONFIG_CRC_CCITT is not set
 CONFIG_CRYPTO_DEV_MV_CESA=y
 CONFIG_CRYPTO_HW=y
diff --git a/target/linux/ppc40x/config-default b/target/linux/ppc40x/config-default
deleted file mode 100644
index c2410f32c..000000000
--- a/target/linux/ppc40x/config-default
+++ /dev/null
@@ -1,184 +0,0 @@
-CONFIG_405EP=y
-CONFIG_405EX=y
-CONFIG_40x=y
-# CONFIG_44x is not set
-CONFIG_4xx=y
-CONFIG_4xx_SOC=y
-# CONFIG_ACADIA is not set
-# CONFIG_ADVANCED_OPTIONS is not set
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-CONFIG_ARCH_HAS_ILOG2_U32=y
-CONFIG_ARCH_HAS_WALK_MEMORY=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-CONFIG_ARCH_REQUIRE_GPIOLIB=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_ARCH_SUPPORTS_MSI=y
-CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-CONFIG_AUDIT_ARCH=y
-CONFIG_BITREVERSE=y
-# CONFIG_BOOKE_WDT is not set
-CONFIG_BOUNCE=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CFG80211_DEFAULT_PS_VALUE=0
-CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,jffs2 noinitrd"
-CONFIG_CMDLINE_BOOL=y
-CONFIG_CONSISTENT_SIZE=0x00200000
-CONFIG_DECOMPRESS_LZMA=y
-# CONFIG_DEFAULT_UIMAGE is not set
-CONFIG_DEVPORT=y
-CONFIG_DTC=y
-# CONFIG_E200 is not set
-CONFIG_EARLY_PRINTK=y
-# CONFIG_EP405 is not set
-CONFIG_EXTRA_TARGETS="uImage"
-CONFIG_FORCE_MAX_ZONEORDER=11
-# CONFIG_FSL_ULI1575 is not set
-# CONFIG_FSNOTIFY is not set
-CONFIG_GENERIC_ATOMIC64=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-# CONFIG_GENERIC_IOMAP is not set
-CONFIG_GENERIC_NVRAM=y
-# CONFIG_GENERIC_TBSYNC is not set
-CONFIG_GENERIC_TIME_VSYSCALL=y
-# CONFIG_GEN_RTC is not set
-CONFIG_GPIOLIB=y
-CONFIG_GPIO_SYSFS=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-# CONFIG_HAS_RAPIDIO is not set
-CONFIG_HAVE_ARCH_KGDB=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_API_DEBUG=y
-CONFIG_HAVE_DMA_ATTRS=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
-CONFIG_HAVE_IDE=y
-CONFIG_HAVE_IOREMAP_PROT=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_HAVE_LMB=y
-CONFIG_HAVE_OPROFILE=y
-CONFIG_HAVE_PERF_EVENTS=y
-# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-# CONFIG_HCU4 is not set
-# CONFIG_HOTFOOT is not set
-CONFIG_HW_RANDOM=y
-CONFIG_HZ=250
-# CONFIG_HZ_100 is not set
-CONFIG_HZ_250=y
-CONFIG_IBM_NEW_EMAC=y
-# CONFIG_IBM_NEW_EMAC_DEBUG is not set
-CONFIG_IBM_NEW_EMAC_EMAC4=y
-CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
-CONFIG_IBM_NEW_EMAC_RGMII=y
-CONFIG_IBM_NEW_EMAC_RXB=256
-CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
-CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
-CONFIG_IBM_NEW_EMAC_TXB=256
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_IOMMU_HELPER=y
-# CONFIG_IPIC is not set
-# CONFIG_IRQSTACKS is not set
-CONFIG_IRQ_PER_CPU=y
-CONFIG_ISA_DMA_API=y
-# CONFIG_ISDN_CAPI is not set
-# CONFIG_ISDN_I4L is not set
-CONFIG_KERNEL_START=0xc0000000
-CONFIG_KILAUEA=y
-# CONFIG_LEDS_GPIO is not set
-CONFIG_LOWMEM_SIZE=0x30000000
-CONFIG_MAGICBOX=y
-# CONFIG_MAKALU is not set
-# CONFIG_MATH_EMULATION is not set
-CONFIG_MAX_ACTIVE_REGIONS=32
-# CONFIG_MMIO_NVRAM is not set
-# CONFIG_MPIC is not set
-# CONFIG_MPIC_WEIRD is not set
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-# CONFIG_MTD_CFI_GEOMETRY is not set
-# CONFIG_MTD_CFI_INTELEXT is not set
-CONFIG_MTD_OF_PARTS=y
-CONFIG_MTD_PHYSMAP_OF=y
-# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
-CONFIG_NOT_COHERENT_CACHE=y
-CONFIG_OF=y
-CONFIG_OF_DEVICE=y
-CONFIG_OF_GPIO=y
-CONFIG_OPENRB=y
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PAGE_OFFSET=0xc0000000
-CONFIG_PCI=y
-CONFIG_PCIEAER=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCI_MSI=y
-CONFIG_PHYSICAL_START=0x00000000
-CONFIG_PPC=y
-CONFIG_PPC32=y
-CONFIG_PPC40x_SIMPLE=y
-CONFIG_PPC4xx_PCI_EXPRESS=y
-# CONFIG_PPC64 is not set
-# CONFIG_PPC_85xx is not set
-# CONFIG_PPC_8xx is not set
-# CONFIG_PPC_970_NAP is not set
-# CONFIG_PPC_BOOK3S_32 is not set
-# CONFIG_PPC_CELL is not set
-# CONFIG_PPC_CELL_NATIVE is not set
-# CONFIG_PPC_CLOCK is not set
-CONFIG_PPC_DCR=y
-# CONFIG_PPC_DCR_MMIO is not set
-CONFIG_PPC_DCR_NATIVE=y
-# CONFIG_PPC_EARLY_DEBUG is not set
-# CONFIG_PPC_I8259 is not set
-# CONFIG_PPC_INDIRECT_IO is not set
-CONFIG_PPC_INDIRECT_PCI=y
-CONFIG_PPC_MMU_NOHASH=y
-CONFIG_PPC_MMU_NOHASH_32=y
-# CONFIG_PPC_MM_SLICES is not set
-# CONFIG_PPC_MPC106 is not set
-CONFIG_PPC_OF=y
-CONFIG_PPC_PCI_CHOICE=y
-# CONFIG_PPC_RTAS is not set
-CONFIG_PPC_UDBG_16550=y
-CONFIG_PPC_WERROR=y
-# CONFIG_PQ2ADS is not set
-CONFIG_PRINT_STACK_DEPTH=64
-CONFIG_PROC_DEVICETREE=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_SCHED_HRTICK=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-# CONFIG_SCSI_DMA is not set
-# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-CONFIG_SERIAL_8250_EXTENDED=y
-# CONFIG_SERIAL_8250_MANY_PORTS is not set
-# CONFIG_SERIAL_8250_RSA is not set
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-CONFIG_SERIAL_OF_PLATFORM=y
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-CONFIG_SWIOTLB=y
-CONFIG_TASK_SIZE=0xc0000000
-# CONFIG_TREE_PREEMPT_RCU is not set
-CONFIG_TREE_RCU=y
-# CONFIG_WALNUT is not set
-CONFIG_WORD_SIZE=32
-# CONFIG_XILINX_SYSACE is not set
-# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
diff --git a/target/linux/ppc40x/patches/003-powerpc-add-EBC_BXCR-defines.patch b/target/linux/ppc40x/patches/003-powerpc-add-EBC_BXCR-defines.patch
new file mode 100644
index 000000000..ca70f7223
--- /dev/null
+++ b/target/linux/ppc40x/patches/003-powerpc-add-EBC_BXCR-defines.patch
@@ -0,0 +1,27 @@
+--- a/arch/powerpc/boot/dcr.h
++++ b/arch/powerpc/boot/dcr.h
+@@ -49,6 +49,14 @@ static const unsigned long sdram_bxcr[] 
+ #define   EBC_BXCR(n)					  (n)
+ #define	    EBC_BXCR_BAS				    0xfff00000
+ #define	    EBC_BXCR_BS				  	    0x000e0000
++#define	      EBC_BXCR_BS_1M				      0x00000000
++#define	      EBC_BXCR_BS_2M				      0x00020000
++#define	      EBC_BXCR_BS_4M				      0x00040000
++#define	      EBC_BXCR_BS_8M				      0x00060000
++#define	      EBC_BXCR_BS_16M				      0x00080000
++#define	      EBC_BXCR_BS_32M				      0x000a0000
++#define	      EBC_BXCR_BS_64M				      0x000c0000
++#define	      EBC_BXCR_BS_128M				      0x000e0000
+ #define	    EBC_BXCR_BANK_SIZE(reg) \
+ 	(0x100000 << (((reg) & EBC_BXCR_BS) >> 17))
+ #define	    EBC_BXCR_BU				  	    0x00018000
+@@ -57,6 +65,9 @@ static const unsigned long sdram_bxcr[] 
+ #define	      EBC_BXCR_BU_WO			  	      0x00010000
+ #define	      EBC_BXCR_BU_RW			  	      0x00018000
+ #define	    EBC_BXCR_BW				  	    0x00006000
++#define	      EBC_BXCR_BW_8				      0x00000000
++#define	      EBC_BXCR_BW_16				      0x00002000
++#define	      EBC_BXCR_BW_32				      0x00006000
+ #define   EBC_B0AP					  0x10
+ #define   EBC_B1AP					  0x11
+ #define   EBC_B2AP					  0x12
diff --git a/target/linux/ppc40x/patches/003-powerpc-add-EBC_BXCR_BW-defines.patch b/target/linux/ppc40x/patches/003-powerpc-add-EBC_BXCR_BW-defines.patch
deleted file mode 100644
index 8e380c1c9..000000000
--- a/target/linux/ppc40x/patches/003-powerpc-add-EBC_BXCR_BW-defines.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/arch/powerpc/boot/dcr.h
-+++ b/arch/powerpc/boot/dcr.h
-@@ -57,6 +57,9 @@ static const unsigned long sdram_bxcr[] 
- #define	      EBC_BXCR_BU_WO			  	      0x00010000
- #define	      EBC_BXCR_BU_RW			  	      0x00018000
- #define	    EBC_BXCR_BW				  	    0x00006000
-+#define	      EBC_BXCR_BW_8				      0x00000000
-+#define	      EBC_BXCR_BW_16				      0x00002000
-+#define	      EBC_BXCR_BW_32				      0x00006000
- #define   EBC_B0AP					  0x10
- #define   EBC_B1AP					  0x11
- #define   EBC_B2AP					  0x12
diff --git a/target/linux/ppc40x/patches/004-magicbox.patch b/target/linux/ppc40x/patches/004-magicbox.patch
deleted file mode 100644
index 0f9e192fc..000000000
--- a/target/linux/ppc40x/patches/004-magicbox.patch
+++ /dev/null
@@ -1,440 +0,0 @@
---- /dev/null
-+++ b/arch/powerpc/boot/cuboot-magicbox.c
-@@ -0,0 +1,90 @@
-+/*
-+ * Old U-boot compatibility for Magicbox boards
-+ *
-+ * Author: Imre Kaloz <kaloz@openwrt.org>
-+ *         Gabor Juhos <juhosg@openwrt.org>
-+ *
-+ * 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.
-+ */
-+
-+#include "ops.h"
-+#include "io.h"
-+#include "dcr.h"
-+#include "stdio.h"
-+#include "4xx.h"
-+#include "44x.h"
-+#include "cuboot.h"
-+
-+#define TARGET_4xx
-+#define TARGET_405EP
-+#include "ppcboot.h"
-+
-+static bd_t bd;
-+
-+static void fixup_cf_card(void)
-+{
-+#define DCRN_CPC0_PCI_BASE	0xf9
-+#define CF_CS0_BASE	0xff100000
-+#define CF_CS1_BASE	0xff200000
-+
-+	/* Turn on PerWE instead of PCIsomething */
-+	mtdcr(DCRN_CPC0_PCI_BASE,
-+	      mfdcr(DCRN_CPC0_PCI_BASE) | (0x80000000L >> 27));
-+
-+	/* PerCS1 (CF's CS0): base 0xff100000, 16-bit, rw */
-+	mtdcr(DCRN_EBC0_CFGADDR, EBC_B1CR);
-+	mtdcr(DCRN_EBC0_CFGDATA, CF_CS0_BASE | EBC_BXCR_BU_RW | EBC_BXCR_BW_16);
-+	mtdcr(DCRN_EBC0_CFGADDR, EBC_B1AP);
-+	mtdcr(DCRN_EBC0_CFGDATA, 0x080bd800);
-+
-+	/* PerCS2 (CF's CS1): base 0xff200000, 16-bit, rw */
-+	mtdcr(DCRN_EBC0_CFGADDR, EBC_B2CR);
-+	mtdcr(DCRN_EBC0_CFGDATA, CF_CS1_BASE | EBC_BXCR_BU_RW | EBC_BXCR_BW_16);
-+	mtdcr(DCRN_EBC0_CFGADDR, EBC_B2AP);
-+	mtdcr(DCRN_EBC0_CFGDATA, 0x080bd800);
-+
-+#undef DCRN_CPC0_PCI_BASE
-+#undef CF_CS0_BASE
-+#undef CF_CS1_BASE
-+}
-+
-+static void magicbox_fixups(void)
-+{
-+	ibm405ep_fixup_clocks(bd.bi_procfreq / 8);
-+	ibm4xx_sdram_fixup_memsize();
-+
-+	/* Magicbox v1 has only one ethernet, one serial and no
-+	 * CF slot -- detect it using it's fake enet1addr
-+	 */
-+	if ((bd.bi_enet1addr[0] == 0x00) &&
-+	    (bd.bi_enet1addr[1] == 0x00) &&
-+	    (bd.bi_enet1addr[2] == 0x02) &&
-+	    (bd.bi_enet1addr[3] == 0xfa) &&
-+	    (bd.bi_enet1addr[4] == 0xf0) &&
-+	    (bd.bi_enet1addr[5] == 0x80)) {
-+		void *devp;
-+
-+		devp = finddevice("/plb/opb/ethernet@ef600900");
-+		del_node(devp);
-+		devp = finddevice("/plb/opb/serial@ef600400");
-+		del_node(devp);
-+		devp = finddevice("/plb/ebc/cf_card@ff100000");
-+		del_node(devp);
-+	} else {
-+		fixup_cf_card();
-+	}
-+
-+	dt_fixup_mac_addresses(&bd.bi_enetaddr, &bd.bi_enet1addr);
-+}
-+
-+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
-+		unsigned long r6, unsigned long r7)
-+{
-+	CUBOOT_INIT();
-+	platform_ops.fixups = magicbox_fixups;
-+	platform_ops.exit = ibm40x_dbcr_reset;
-+	fdt_init(_dtb_start);
-+	serial_console_init();
-+}
---- /dev/null
-+++ b/arch/powerpc/boot/dts/magicbox.dts
-@@ -0,0 +1,285 @@
-+/*
-+ * Device Tree Source for Magicbox boards
-+ *
-+ * Copyright 2008-2009 Imre Kaloz <kaloz@openwrt.org>
-+ * Copyright 2009 Gabor Juhos <juhosg@openwrt.org>
-+ *
-+ * Based on walnut.dts
-+ *
-+ * This file is licensed under the terms of the GNU General Public
-+ * License version 2.  This program is licensed "as is" without
-+ * any warranty of any kind, whether express or implied.
-+ */
-+
-+/dts-v1/;
-+
-+/ {
-+	#address-cells = <1>;
-+	#size-cells = <1>;
-+	model = "magicbox";
-+	compatible = "magicbox";
-+	dcr-parent = <&{/cpus/cpu@0}>;
-+
-+	aliases {
-+		ethernet0 = &EMAC0;
-+		ethernet1 = &EMAC1;
-+		serial0 = &UART0;
-+		serial1 = &UART1;
-+	};
-+
-+	cpus {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		cpu@0 {
-+			device_type = "cpu";
-+			model = "PowerPC,405EP";
-+			reg = <0x00000000>;
-+			clock-frequency = <0>; /* Filled in by zImage */
-+			timebase-frequency = <0>; /* Filled in by zImage */
-+			i-cache-line-size = <0x20>;
-+			d-cache-line-size = <0x20>;
-+			i-cache-size = <0x4000>;
-+			d-cache-size = <0x4000>;
-+			dcr-controller;
-+			dcr-access-method = "native";
-+		};
-+	};
-+
-+	memory {
-+		device_type = "memory";
-+		reg = <0x00000000 0x00000000>; /* Filled in by zImage */
-+	};
-+
-+	UIC0: interrupt-controller {
-+		compatible = "ibm,uic";
-+		interrupt-controller;
-+		cell-index = <0>;
-+		dcr-reg = <0x0c0 0x009>;
-+		#address-cells = <0>;
-+		#size-cells = <0>;
-+		#interrupt-cells = <2>;
-+	};
-+
-+	plb {
-+		compatible = "ibm,plb3";
-+		#address-cells = <1>;
-+		#size-cells = <1>;
-+		ranges;
-+		clock-frequency = <0>; /* Filled in by zImage */
-+
-+		SDRAM0: memory-controller {
-+			compatible = "ibm,sdram-405ep";
-+			dcr-reg = <0x010 0x002>;
-+		};
-+
-+		MAL: mcmal {
-+			compatible = "ibm,mcmal-405ep", "ibm,mcmal";
-+			dcr-reg = <0x180 0x062>;
-+			num-tx-chans = <4>;
-+			num-rx-chans = <2>;
-+			interrupt-parent = <&UIC0>;
-+			interrupts = <
-+				0xb 0x4 /* TXEOB */
-+				0xc 0x4 /* RXEOB */
-+				0xa 0x4 /* SERR */
-+				0xd 0x4 /* TXDE */
-+				0xe 0x4 /* RXDE */>;
-+		};
-+
-+		POB0: opb {
-+			compatible = "ibm,opb-405ep", "ibm,opb";
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+			ranges = <0xef600000 0xef600000 0x00a00000>;
-+			dcr-reg = <0x0a0 0x005>;
-+			clock-frequency = <0>; /* Filled in by zImage */
-+
-+			UART0: serial@ef600300 {
-+				device_type = "serial";
-+				compatible = "ns16550";
-+				reg = <0xef600300 0x00000008>;
-+				virtual-reg = <0xef600300>;
-+				clock-frequency = <0>; /* Filled in by zImage */
-+				current-speed = <115200>;
-+				interrupt-parent = <&UIC0>;
-+				interrupts = <0x0 0x4>;
-+			};
-+
-+			UART1: serial@ef600400 {
-+				device_type = "serial";
-+				compatible = "ns16550";
-+				reg = <0xef600400 0x00000008>;
-+				virtual-reg = <0xef600400>;
-+				clock-frequency = <0>; /* Filled in by zImage */
-+				current-speed = <115200>;
-+				interrupt-parent = <&UIC0>;
-+				interrupts = <0x1 0x4>;
-+			};
-+
-+			IIC: i2c@ef600500 {
-+				compatible = "ibm,iic-405ep", "ibm,iic";
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				reg = <0xef600500 0x00000011>;
-+				interrupt-parent = <&UIC0>;
-+				interrupts = <0x2 0x4>;
-+
-+				dtt@48 {
-+					compatible = "national,lm75";
-+					reg = <0x48>;
-+				};
-+
-+				eeprom@50 {
-+					compatible = "at24,24c16";
-+					reg = <0x50>;
-+				};
-+			};
-+
-+			GPIO0: gpio-controller@ef600700 {
-+				compatible = "ibm,ppc4xx-gpio";
-+				reg = <0xef600700 0x00000020>;
-+				#gpio-cells = <2>;
-+				gpio-controller;
-+			};
-+
-+			EMAC0: ethernet@ef600800 {
-+				linux,network-index = <0x0>;
-+				device_type = "network";
-+				compatible = "ibm,emac-405ep", "ibm,emac";
-+				interrupt-parent = <&UIC0>;
-+				interrupts = <
-+					0xf 0x4 /* Ethernet */
-+					0x9 0x4 /* Ethernet Wake Up */>;
-+				local-mac-address = [000000000000]; /* Filled in by zImage */
-+				reg = <0xef600800 0x00000070>;
-+				mal-device = <&MAL>;
-+				mal-tx-channel = <0>;
-+				mal-rx-channel = <0>;
-+				cell-index = <0>;
-+				max-frame-size = <0x5dc>;
-+				rx-fifo-size = <0x1000>;
-+				tx-fifo-size = <0x800>;
-+				phy-mode = "mii";
-+				phy-map = <0x00000000>;
-+			};
-+
-+			EMAC1: ethernet@ef600900 {
-+				linux,network-index = <0x1>;
-+				device_type = "network";
-+				compatible = "ibm,emac-405ep", "ibm,emac";
-+				interrupt-parent = <&UIC0>;
-+				interrupts = <
-+					0x11 0x4 /* Ethernet */
-+					0x09 0x4 /* Ethernet Wake Up */>;
-+				local-mac-address = [000000000000]; /* Filled in by zImage */
-+				reg = <0xef600900 0x00000070>;
-+				mal-device = <&MAL>;
-+				mal-tx-channel = <2>;
-+				mal-rx-channel = <1>;
-+				cell-index = <1>;
-+				max-frame-size = <0x5dc>;
-+				rx-fifo-size = <0x1000>;
-+				tx-fifo-size = <0x800>;
-+				mdio-device = <&EMAC0>;
-+				phy-mode = "mii";
-+				phy-map = <0x00000001>;
-+			};
-+
-+			leds {
-+				compatible = "gpio-leds";
-+				user {
-+					label = "magicbox:red:user";
-+					gpios = <&GPIO0 2 1>;
-+				};
-+			};
-+		};
-+
-+		EBC0: ebc {
-+			compatible = "ibm,ebc-405ep", "ibm,ebc";
-+			dcr-reg = <0x012 0x002>;
-+			#address-cells = <2>;
-+			#size-cells = <1>;
-+			/* The ranges property is supplied by the bootwrapper
-+			 * and is based on the firmware's configuration of the
-+			 * EBC bridge
-+			 */
-+			clock-frequency = <0>; /* Filled in by zImage */
-+
-+			cf_card@ff100000 {
-+				compatible = "magicbox-cf", "pata-magicbox-cf";
-+				reg = <0x00000000 0xff100000 0x00001000
-+				       0x00000000 0xff200000 0x00001000>;
-+				interrupt-parent = <&UIC0>;
-+				interrupts = <0x19 0x1 /* IRQ_TYPE_EDGE_RISING */ >;
-+			};
-+
-+			nor_flash@ffc00000 {
-+				compatible = "cfi-flash";
-+				bank-width = <2>;
-+				reg = <0x00000000 0xffc00000 0x00400000>;
-+				#address-cells = <1>;
-+				#size-cells = <1>;
-+				partition0@0 {
-+					label = "linux";
-+					reg = <0x0 0x140000>;
-+				};
-+				partition1@120000 {
-+					label = "rootfs";
-+					reg = <0x140000 0x680000>;
-+				};
-+				partition2@7c0000 {
-+					label = "u-boot";
-+					reg = <0x7c0000 0x30000>;
-+					read-only;
-+				};
-+				partition3@0 {
-+					label = "firmware";
-+					reg = <0x0 0x7c0000>;
-+				};
-+			};
-+		};
-+
-+		PCI0: pci@ec000000 {
-+			device_type = "pci";
-+			#interrupt-cells = <1>;
-+			#size-cells = <2>;
-+			#address-cells = <3>;
-+			compatible = "ibm,plb405ep-pci", "ibm,plb-pci";
-+			primary;
-+			reg = <0xeec00000 0x00000008	/* Config space access */
-+			       0xeed80000 0x00000004	/* IACK */
-+			       0xeed80000 0x00000004	/* Special cycle */
-+			       0xef480000 0x00000040>;	/* Internal registers */
-+
-+			/* Outbound ranges, one memory and one IO,
-+			 * later cannot be changed. Chip supports a second
-+			 * IO range but we don't use it for now
-+			 */
-+			ranges = <0x02000000 0x00000000 0x80000000 0x80000000 0x00000000 0x20000000
-+				  0x01000000 0x00000000 0x00000000 0xe8000000 0x00000000 0x00010000>;
-+
-+			/* Inbound 2GB range starting at 0 */
-+			dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x80000000>;
-+
-+			interrupt-map-mask = <0xf800 0x0 0x0 0x0>;
-+			interrupt-map = <
-+				/* IDSEL 1 */
-+				0x800 0x0 0x0 0x0 &UIC0 0x1c 0x8
-+
-+				/* IDSEL 2 */
-+				0x1000 0x0 0x0 0x0 &UIC0 0x1d 0x8
-+
-+				/* IDSEL 3 */
-+				0x1800 0x0 0x0 0x0 &UIC0 0x1e 0x8
-+
-+				/* IDSEL 4 */
-+				0x2000 0x0 0x0 0x0 &UIC0 0x1f 0x8
-+			>;
-+		};
-+	};
-+
-+	chosen {
-+		linux,stdout-path = "/plb/opb/serial@ef600300";
-+	};
-+};
---- a/arch/powerpc/boot/Makefile
-+++ b/arch/powerpc/boot/Makefile
-@@ -43,6 +43,7 @@ $(obj)/cuboot-hotfoot.o: BOOTCFLAGS += -
- $(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=440
- $(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=440
- $(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405
-+$(obj)/cuboot-magicbox.o: BOOTCFLAGS += -mcpu=405
- $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
- $(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405
- 
-@@ -76,7 +77,8 @@ src-plat := of.c cuboot-52xx.c cuboot-82
- 		cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c \
- 		cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \
- 		virtex405-head.S virtex.c redboot-83xx.c cuboot-sam440ep.c \
--		cuboot-acadia.c cuboot-amigaone.c cuboot-kilauea.c
-+		cuboot-acadia.c cuboot-amigaone.c cuboot-kilauea.c \
-+		cuboot-magicbox.c
- src-boot := $(src-wlib) $(src-plat) empty.c
- 
- src-boot := $(addprefix $(obj)/, $(src-boot))
-@@ -194,6 +196,7 @@ image-$(CONFIG_EP405)			+= dtbImage.ep40
- image-$(CONFIG_HOTFOOT)			+= cuImage.hotfoot
- image-$(CONFIG_WALNUT)			+= treeImage.walnut
- image-$(CONFIG_ACADIA)			+= cuImage.acadia
-+image-$(CONFIG_MAGICBOX)		+= cuImage.magicbox
- 
- # Board ports in arch/powerpc/platform/44x/Kconfig
- image-$(CONFIG_EBONY)			+= treeImage.ebony cuImage.ebony
---- a/arch/powerpc/platforms/40x/Kconfig
-+++ b/arch/powerpc/platforms/40x/Kconfig
-@@ -60,6 +60,16 @@ config KILAUEA
- 	help
- 	  This option enables support for the AMCC PPC405EX evaluation board.
- 
-+config MAGICBOX
-+	bool "Magicbox"
-+	depends on 40x
-+	default n
-+	select PPC40x_SIMPLE
-+	select 405EP
-+	select PCI
-+	help
-+	  This option enables support for the Magicbox boards.
-+
- config MAKALU
- 	bool "Makalu"
- 	depends on 40x
---- a/arch/powerpc/platforms/40x/ppc40x_simple.c
-+++ b/arch/powerpc/platforms/40x/ppc40x_simple.c
-@@ -55,7 +55,8 @@ static char *board[] __initdata = {
- 	"amcc,haleakala",
- 	"amcc,kilauea",
- 	"amcc,makalu",
--	"est,hotfoot"
-+	"est,hotfoot",
-+	"magicbox"
- };
- 
- static int __init ppc40x_probe(void)
diff --git a/target/linux/ppc40x/patches/005-openrb.patch b/target/linux/ppc40x/patches/005-openrb.patch
deleted file mode 100644
index a90fba88c..000000000
--- a/target/linux/ppc40x/patches/005-openrb.patch
+++ /dev/null
@@ -1,415 +0,0 @@
---- /dev/null
-+++ b/arch/powerpc/boot/cuboot-openrb.c
-@@ -0,0 +1,71 @@
-+/*
-+ * Old U-boot compatibility for OpenRB boards
-+ *
-+ * Author: Gabor Juhos <juhosg@openwrt.org>
-+ *         Imre Kaloz <kaloz@openwrt.org>
-+ *
-+ * 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.
-+ */
-+
-+#include "ops.h"
-+#include "io.h"
-+#include "dcr.h"
-+#include "stdio.h"
-+#include "4xx.h"
-+#include "44x.h"
-+#include "cuboot.h"
-+
-+#define TARGET_4xx
-+#define TARGET_405EP
-+#include "ppcboot.h"
-+
-+static bd_t bd;
-+
-+static void fixup_cf_card(void)
-+{
-+#define DCRN_CPC0_PCI_BASE	0xf9
-+#define CF_CS0_BASE		0xff100000
-+#define CF_CS1_BASE		0xff200000
-+
-+	/* Turn on PerWE instead of PCIsomething */
-+	mtdcr(DCRN_CPC0_PCI_BASE,
-+	      mfdcr(DCRN_CPC0_PCI_BASE) | (0x80000000L >> 27));
-+
-+	/* PerCS1 (CF's CS0): base 0xff100000, 16-bit, rw */
-+	mtdcr(DCRN_EBC0_CFGADDR, EBC_B1CR);
-+	mtdcr(DCRN_EBC0_CFGDATA, CF_CS0_BASE | EBC_BXCR_BU_RW | EBC_BXCR_BW_16);
-+	mtdcr(DCRN_EBC0_CFGADDR, EBC_B1AP);
-+	mtdcr(DCRN_EBC0_CFGDATA, 0x080bd800);
-+
-+	/* PerCS2 (CF's CS1): base 0xff200000, 16-bit, rw */
-+	mtdcr(DCRN_EBC0_CFGADDR, EBC_B2CR);
-+	mtdcr(DCRN_EBC0_CFGDATA, CF_CS1_BASE | EBC_BXCR_BU_RW | EBC_BXCR_BW_16);
-+	mtdcr(DCRN_EBC0_CFGADDR, EBC_B2AP);
-+	mtdcr(DCRN_EBC0_CFGDATA, 0x080bd800);
-+
-+#undef DCRN_CPC0_PCI_BASE
-+#undef CF_CS0_BASE
-+#undef CF_CS1_BASE
-+}
-+
-+static void openrb_fixups(void)
-+{
-+	ibm405ep_fixup_clocks(bd.bi_procfreq / 8);
-+	ibm4xx_sdram_fixup_memsize();
-+
-+	fixup_cf_card();
-+
-+	dt_fixup_mac_addresses(&bd.bi_enetaddr, &bd.bi_enet1addr);
-+}
-+
-+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
-+		unsigned long r6, unsigned long r7)
-+{
-+	CUBOOT_INIT();
-+	platform_ops.fixups = openrb_fixups;
-+	platform_ops.exit = ibm40x_dbcr_reset;
-+	fdt_init(_dtb_start);
-+	serial_console_init();
-+}
---- /dev/null
-+++ b/arch/powerpc/boot/dts/openrb.dts
-@@ -0,0 +1,280 @@
-+/*
-+ * Device Tree Source for OpenRB boards
-+ *
-+ * Copyright 2009 Gabor Juhos <juhosg@openwrt.org>
-+ * Copyright 2009 Imre Kaloz <kaloz@openwrt.org>
-+ *
-+ * Based on walnut.dts
-+ *
-+ * This file is licensed under the terms of the GNU General Public
-+ * License version 2.  This program is licensed "as is" without
-+ * any warranty of any kind, whether express or implied.
-+ */
-+
-+/dts-v1/;
-+
-+/ {
-+	#address-cells = <1>;
-+	#size-cells = <1>;
-+	model = "openrb";
-+	compatible = "openrb";
-+	dcr-parent = <&{/cpus/cpu@0}>;
-+
-+	aliases {
-+		ethernet0 = &EMAC0;
-+		ethernet1 = &EMAC1;
-+		serial0 = &UART0;
-+		serial1 = &UART1;
-+	};
-+
-+	cpus {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		cpu@0 {
-+			device_type = "cpu";
-+			model = "PowerPC,405EP";
-+			reg = <0x00000000>;
-+			clock-frequency = <0>; /* Filled in by zImage */
-+			timebase-frequency = <0>; /* Filled in by zImage */
-+			i-cache-line-size = <0x20>;
-+			d-cache-line-size = <0x20>;
-+			i-cache-size = <0x4000>;
-+			d-cache-size = <0x4000>;
-+			dcr-controller;
-+			dcr-access-method = "native";
-+		};
-+	};
-+
-+	memory {
-+		device_type = "memory";
-+		reg = <0x00000000 0x00000000>; /* Filled in by zImage */
-+	};
-+
-+	UIC0: interrupt-controller {
-+		compatible = "ibm,uic";
-+		interrupt-controller;
-+		cell-index = <0>;
-+		dcr-reg = <0x0c0 0x009>;
-+		#address-cells = <0>;
-+		#size-cells = <0>;
-+		#interrupt-cells = <2>;
-+	};
-+
-+	plb {
-+		compatible = "ibm,plb3";
-+		#address-cells = <1>;
-+		#size-cells = <1>;
-+		ranges;
-+		clock-frequency = <0>; /* Filled in by zImage */
-+
-+		SDRAM0: memory-controller {
-+			compatible = "ibm,sdram-405ep";
-+			dcr-reg = <0x010 0x002>;
-+		};
-+
-+		MAL: mcmal {
-+			compatible = "ibm,mcmal-405ep", "ibm,mcmal";
-+			dcr-reg = <0x180 0x062>;
-+			num-tx-chans = <4>;
-+			num-rx-chans = <2>;
-+			interrupt-parent = <&UIC0>;
-+			interrupts = <
-+				0xb 0x4 /* TXEOB */
-+				0xc 0x4 /* RXEOB */
-+				0xa 0x4 /* SERR */
-+				0xd 0x4 /* TXDE */
-+				0xe 0x4 /* RXDE */>;
-+		};
-+
-+		POB0: opb {
-+			compatible = "ibm,opb-405ep", "ibm,opb";
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+			ranges = <0xef600000 0xef600000 0x00a00000>;
-+			dcr-reg = <0x0a0 0x005>;
-+			clock-frequency = <0>; /* Filled in by zImage */
-+
-+			UART0: serial@ef600300 {
-+				device_type = "serial";
-+				compatible = "ns16550";
-+				reg = <0xef600300 0x00000008>;
-+				virtual-reg = <0xef600300>;
-+				clock-frequency = <0>; /* Filled in by zImage */
-+				current-speed = <115200>;
-+				interrupt-parent = <&UIC0>;
-+				interrupts = <0x0 0x4>;
-+			};
-+
-+			UART1: serial@ef600400 {
-+				device_type = "serial";
-+				compatible = "ns16550";
-+				reg = <0xef600400 0x00000008>;
-+				virtual-reg = <0xef600400>;
-+				clock-frequency = <0>; /* Filled in by zImage */
-+				current-speed = <115200>;
-+				interrupt-parent = <&UIC0>;
-+				interrupts = <0x1 0x4>;
-+			};
-+
-+			IIC: i2c@ef600500 {
-+				compatible = "ibm,iic-405ep", "ibm,iic";
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				reg = <0xef600500 0x00000011>;
-+				interrupt-parent = <&UIC0>;
-+				interrupts = <0x2 0x4>;
-+
-+				eeprom@50 {
-+					compatible = "at24,24c16";
-+					reg = <0x50>;
-+				};
-+			};
-+
-+			GPIO0: gpio-controller@ef600700 {
-+				compatible = "ibm,ppc4xx-gpio";
-+				reg = <0xef600700 0x00000020>;
-+				#gpio-cells = <2>;
-+				gpio-controller;
-+			};
-+
-+			EMAC0: ethernet@ef600800 {
-+				linux,network-index = <0x0>;
-+				device_type = "network";
-+				compatible = "ibm,emac-405ep", "ibm,emac";
-+				interrupt-parent = <&UIC0>;
-+				interrupts = <
-+					0xf 0x4 /* Ethernet */
-+					0x9 0x4 /* Ethernet Wake Up */>;
-+				local-mac-address = [000000000000]; /* Filled in by zImage */
-+				reg = <0xef600800 0x00000070>;
-+				mal-device = <&MAL>;
-+				mal-tx-channel = <0>;
-+				mal-rx-channel = <0>;
-+				cell-index = <0>;
-+				max-frame-size = <0x5dc>;
-+				rx-fifo-size = <0x1000>;
-+				tx-fifo-size = <0x800>;
-+				phy-mode = "mii";
-+				phy-map = <0x00000000>;
-+			};
-+
-+			EMAC1: ethernet@ef600900 {
-+				linux,network-index = <0x1>;
-+				device_type = "network";
-+				compatible = "ibm,emac-405ep", "ibm,emac";
-+				interrupt-parent = <&UIC0>;
-+				interrupts = <
-+					0x11 0x4 /* Ethernet */
-+					0x09 0x4 /* Ethernet Wake Up */>;
-+				local-mac-address = [000000000000]; /* Filled in by zImage */
-+				reg = <0xef600900 0x00000070>;
-+				mal-device = <&MAL>;
-+				mal-tx-channel = <2>;
-+				mal-rx-channel = <1>;
-+				cell-index = <1>;
-+				max-frame-size = <0x5dc>;
-+				rx-fifo-size = <0x1000>;
-+				tx-fifo-size = <0x800>;
-+				mdio-device = <&EMAC0>;
-+				phy-mode = "mii";
-+				phy-map = <0x00000001>;
-+			};
-+
-+			leds {
-+				compatible = "gpio-leds";
-+				user {
-+					label = "openrb:green:user";
-+					gpios = <&GPIO0 2 1>;
-+				};
-+			};
-+		};
-+
-+		EBC0: ebc {
-+			compatible = "ibm,ebc-405ep", "ibm,ebc";
-+			dcr-reg = <0x012 0x002>;
-+			#address-cells = <2>;
-+			#size-cells = <1>;
-+			/* The ranges property is supplied by the bootwrapper
-+			 * and is based on the firmware's configuration of the
-+			 * EBC bridge
-+			 */
-+			clock-frequency = <0>; /* Filled in by zImage */
-+
-+			cf_card@ff100000 {
-+				compatible = "magicbox-cf", "pata-magicbox-cf";
-+				reg = <0x00000000 0xff100000 0x00001000
-+				       0x00000000 0xff200000 0x00001000>;
-+				interrupt-parent = <&UIC0>;
-+				interrupts = <0x19 0x1 /* IRQ_TYPE_EDGE_RISING */ >;
-+			};
-+
-+			nor_flash@ff800000 {
-+				compatible = "cfi-flash";
-+				bank-width = <2>;
-+				reg = <0x00000000 0xff800000 0x00800000>;
-+				#address-cells = <1>;
-+				#size-cells = <1>;
-+				partition0@0 {
-+					label = "linux";
-+					reg = <0x0 0x140000>;
-+				};
-+				partition1@120000 {
-+					label = "rootfs";
-+					reg = <0x140000 0x680000>;
-+				};
-+				partition2@7c0000 {
-+					label = "u-boot";
-+					reg = <0x7c0000 0x30000>;
-+					read-only;
-+				};
-+				partition3@0 {
-+					label = "firmware";
-+					reg = <0x0 0x7c0000>;
-+				};
-+			};
-+		};
-+
-+		PCI0: pci@ec000000 {
-+			device_type = "pci";
-+			#interrupt-cells = <1>;
-+			#size-cells = <2>;
-+			#address-cells = <3>;
-+			compatible = "ibm,plb405ep-pci", "ibm,plb-pci";
-+			primary;
-+			reg = <0xeec00000 0x00000008	/* Config space access */
-+			       0xeed80000 0x00000004	/* IACK */
-+			       0xeed80000 0x00000004	/* Special cycle */
-+			       0xef480000 0x00000040>;	/* Internal registers */
-+
-+			/* Outbound ranges, one memory and one IO,
-+			 * later cannot be changed. Chip supports a second
-+			 * IO range but we don't use it for now
-+			 */
-+			ranges = <0x02000000 0x00000000 0x80000000 0x80000000 0x00000000 0x20000000
-+				  0x01000000 0x00000000 0x00000000 0xe8000000 0x00000000 0x00010000>;
-+
-+			/* Inbound 2GB range starting at 0 */
-+			dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x80000000>;
-+
-+			interrupt-map-mask = <0xf800 0x0 0x0 0x0>;
-+			interrupt-map = <
-+				/* IDSEL 1 */
-+				0x800 0x0 0x0 0x0 &UIC0 0x1c 0x8
-+
-+				/* IDSEL 2 */
-+				0x1000 0x0 0x0 0x0 &UIC0 0x1d 0x8
-+
-+				/* IDSEL 3 */
-+				0x1800 0x0 0x0 0x0 &UIC0 0x1e 0x8
-+
-+				/* IDSEL 4 */
-+				0x2000 0x0 0x0 0x0 &UIC0 0x1f 0x8
-+			>;
-+		};
-+	};
-+
-+	chosen {
-+		linux,stdout-path = "/plb/opb/serial@ef600300";
-+	};
-+};
---- a/arch/powerpc/boot/Makefile
-+++ b/arch/powerpc/boot/Makefile
-@@ -44,6 +44,7 @@ $(obj)/cuboot-taishan.o: BOOTCFLAGS += -
- $(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=440
- $(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405
- $(obj)/cuboot-magicbox.o: BOOTCFLAGS += -mcpu=405
-+$(obj)/cuboot-openrb.o: BOOTCFLAGS += -mcpu=405
- $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
- $(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405
- 
-@@ -78,7 +79,7 @@ src-plat := of.c cuboot-52xx.c cuboot-82
- 		cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \
- 		virtex405-head.S virtex.c redboot-83xx.c cuboot-sam440ep.c \
- 		cuboot-acadia.c cuboot-amigaone.c cuboot-kilauea.c \
--		cuboot-magicbox.c
-+		cuboot-magicbox.c cuboot-openrb.c
- src-boot := $(src-wlib) $(src-plat) empty.c
- 
- src-boot := $(addprefix $(obj)/, $(src-boot))
-@@ -197,6 +198,7 @@ image-$(CONFIG_HOTFOOT)			+= cuImage.hot
- image-$(CONFIG_WALNUT)			+= treeImage.walnut
- image-$(CONFIG_ACADIA)			+= cuImage.acadia
- image-$(CONFIG_MAGICBOX)		+= cuImage.magicbox
-+image-$(CONFIG_OPENRB)			+= cuImage.openrb
- 
- # Board ports in arch/powerpc/platform/44x/Kconfig
- image-$(CONFIG_EBONY)			+= treeImage.ebony cuImage.ebony
---- a/arch/powerpc/platforms/40x/Kconfig
-+++ b/arch/powerpc/platforms/40x/Kconfig
-@@ -70,6 +70,16 @@ config MAGICBOX
- 	help
- 	  This option enables support for the Magicbox boards.
- 
-+config OPENRB
-+	bool "OpenRB"
-+	depends on 40x
-+	default n
-+	select PPC40x_SIMPLE
-+	select 405EP
-+	select PCI
-+	help
-+	  This option enables support for the OpenRB boards.
-+
- config MAKALU
- 	bool "Makalu"
- 	depends on 40x
---- a/arch/powerpc/platforms/40x/ppc40x_simple.c
-+++ b/arch/powerpc/platforms/40x/ppc40x_simple.c
-@@ -56,7 +56,8 @@ static char *board[] __initdata = {
- 	"amcc,kilauea",
- 	"amcc,makalu",
- 	"est,hotfoot",
--	"magicbox"
-+	"magicbox",
-+	"openrb"
- };
- 
- static int __init ppc40x_probe(void)
diff --git a/target/linux/ppc40x/patches/120-usb-isp116x-hcd-add-of-binding.patch b/target/linux/ppc40x/patches/120-usb-isp116x-hcd-add-of-binding.patch
new file mode 100644
index 000000000..6de6e9b84
--- /dev/null
+++ b/target/linux/ppc40x/patches/120-usb-isp116x-hcd-add-of-binding.patch
@@ -0,0 +1,306 @@
+--- a/drivers/usb/host/isp116x-hcd.c
++++ b/drivers/usb/host/isp116x-hcd.c
+@@ -1531,8 +1531,11 @@ static struct hc_driver isp116x_hc_drive
+ 	.bus_resume = isp116x_bus_resume,
+ };
+ 
++#define resource_len(r) (((r)->end - (r)->start) + 1)
++
+ /*----------------------------------------------------------------*/
+ 
++#ifdef CONFIG_USB_ISP116X_HCD_PLATFORM
+ static int isp116x_remove(struct platform_device *pdev)
+ {
+ 	struct usb_hcd *hcd = platform_get_drvdata(pdev);
+@@ -1556,8 +1559,6 @@ static int isp116x_remove(struct platfor
+ 	return 0;
+ }
+ 
+-#define resource_len(r) (((r)->end - (r)->start) + 1)
+-
+ static int __devinit isp116x_probe(struct platform_device *pdev)
+ {
+ 	struct usb_hcd *hcd;
+@@ -1708,22 +1709,253 @@ static struct platform_driver isp116x_dr
+ 	},
+ };
+ 
++static inline int isp116x_platform_register(void)
++{
++	return platform_driver_register(&isp116x_driver);
++}
++
++static inline void isp116x_platform_unregister(void)
++{
++	platform_driver_unregister(&isp116x_driver);
++}
++#else
++static inline int isp116x_platform_register(void) { return 0; };
++static void isp116x_platform_unregister(void) {};
++#endif /* CONFIG_USB_ISP116X_PLATFORM */
++
++/*-----------------------------------------------------------------*/
++
++#ifdef CONFIG_USB_ISP116X_HCD_OF
++
++#include <linux/of.h>
++#include <linux/of_device.h>
++#include <linux/of_platform.h>
++
++#ifdef USE_PLATFORM_DELAY
++static void isp116x_of_delay(struct device *ddev, int delay)
++{
++	ndelay(delay);
++}
++#else
++#define isp116x_of_delay	NULL
++#endif
++
++static int __devinit isp116x_of_probe(struct of_device *op,
++				      const struct of_device_id *match)
++{
++	struct device_node *dn = op->node;
++	struct usb_hcd *hcd;
++	struct isp116x *isp116x;
++	struct resource addr, data, ires;
++	struct isp116x_platform_data *board;
++	void __iomem *addr_reg;
++	void __iomem *data_reg;
++	int irq;
++	int ret = 0;
++	unsigned long irqflags;
++
++	ret = of_address_to_resource(dn, 0, &data);
++	if (ret)
++		return ret;
++
++	ret = of_address_to_resource(dn, 1, &addr);
++	if (ret)
++		return ret;
++
++	ret = of_irq_to_resource(dn, 1, &ires);
++	if (ret)
++		return ret;
++
++	irqflags = ires.flags & IRQF_TRIGGER_MASK;
++
++	board = kzalloc(sizeof(struct isp116x_platform_data), GFP_KERNEL);
++	if (board == NULL)
++		return -ENOMEM;
++
++	if (!request_mem_region(addr.start, resource_len(&addr), hcd_name)) {
++		ret = -EBUSY;
++		goto err_free_board;
++	}
++
++	addr_reg = ioremap_nocache(addr.start, resource_len(&addr));
++	if (addr_reg == NULL) {
++		ret = -ENOMEM;
++		goto err_release_addr;
++	}
++
++	if (!request_mem_region(data.start, resource_len(&data), hcd_name)) {
++		ret = -EBUSY;
++		goto err_unmap_addr;
++	}
++
++	data_reg = ioremap_nocache(data.start, resource_len(&data));
++	if (data_reg == NULL) {
++		ret = -ENOMEM;
++		goto err_release_data;
++	}
++
++	irq = irq_of_parse_and_map(op->node, 0);
++	if (irq == NO_IRQ) {
++		ret = -EINVAL;
++		goto err_unmap_data;
++	}
++
++	/* allocate and initialize hcd */
++	hcd = usb_create_hcd(&isp116x_hc_driver, &op->dev, dev_name(&op->dev));
++	if (!hcd) {
++		ret = -ENOMEM;
++		goto err_irq_dispose;
++	}
++
++	/* this rsrc_start is bogus */
++	hcd->rsrc_start = addr.start;
++	isp116x = hcd_to_isp116x(hcd);
++	isp116x->data_reg = data_reg;
++	isp116x->addr_reg = addr_reg;
++	isp116x->board = board;
++	spin_lock_init(&isp116x->lock);
++	INIT_LIST_HEAD(&isp116x->async);
++
++	board->delay = isp116x_of_delay;
++	if (of_get_property(dn, "sel15Kres", NULL))
++		board->sel15Kres = 1;
++	if (of_get_property(dn, "oc_enable", NULL))
++		board->oc_enable = 1;
++	if (of_get_property(dn, "remote_wakeup_enable", NULL))
++		board->remote_wakeup_enable = 1;
++
++	if (of_get_property(dn, "int_act_high", NULL))
++		board->int_act_high = 1;
++	if (of_get_property(dn, "int_edge_triggered", NULL))
++		board->int_edge_triggered = 1;
++
++	ret = usb_add_hcd(hcd, irq, irqflags | IRQF_DISABLED);
++	if (ret)
++		goto err_put_hcd;
++
++	ret = create_debug_file(isp116x);
++	if (ret) {
++		ERR("Couldn't create debugfs entry\n");
++		goto err_remove_hcd;
++	}
++
++	return 0;
++
++ err_remove_hcd:
++	usb_remove_hcd(hcd);
++ err_put_hcd:
++	usb_put_hcd(hcd);
++ err_irq_dispose:
++	irq_dispose_mapping(irq);
++ err_unmap_data:
++	iounmap(data_reg);
++ err_release_data:
++	release_mem_region(data.start, resource_len(&data));
++ err_unmap_addr:
++	iounmap(addr_reg);
++ err_release_addr:
++	release_mem_region(addr.start, resource_len(&addr));
++ err_free_board:
++	kfree(board);
++	return ret;
++}
++
++static __devexit int isp116x_of_remove(struct of_device *op)
++{
++	struct usb_hcd *hcd = dev_get_drvdata(&op->dev);
++	struct isp116x *isp116x;
++	struct resource res;
++
++	if (!hcd)
++		return 0;
++
++	dev_set_drvdata(&op->dev, NULL);
++
++	isp116x = hcd_to_isp116x(hcd);
++	remove_debug_file(isp116x);
++	usb_remove_hcd(hcd);
++
++	irq_dispose_mapping(hcd->irq);
++
++	iounmap(isp116x->data_reg);
++	(void) of_address_to_resource(op->node, 0, &res);
++	release_mem_region(res.start, resource_len(&res));
++
++	iounmap(isp116x->addr_reg);
++	(void) of_address_to_resource(op->node, 1, &res);
++	release_mem_region(res.start, resource_len(&res));
++
++	kfree(isp116x->board);
++	usb_put_hcd(hcd);
++
++	return 0;
++}
++
++static struct of_device_id isp116x_of_match[] = {
++	{ .compatible = "isp116x-hcd", },
++	{},
++};
++
++static struct of_platform_driver isp116x_of_platform_driver = {
++	.owner		= THIS_MODULE,
++	.name		= "isp116x-hcd-of",
++	.match_table	= isp116x_of_match,
++	.probe		= isp116x_of_probe,
++	.remove		= __devexit_p(isp116x_of_remove),
++	.driver		= {
++		.name	= "isp116x-hcd-of",
++		.owner	= THIS_MODULE,
++	},
++};
++
++static int __init isp116x_of_register(void)
++{
++	return of_register_platform_driver(&isp116x_of_platform_driver);
++}
++
++static void __exit isp116x_of_unregister(void)
++{
++	of_unregister_platform_driver(&isp116x_of_platform_driver);
++}
++
++MODULE_DEVICE_TABLE(of, isp116x_of_match);
++
++#else
++static inline int isp116x_of_register(void) { return 0; };
++static void isp116x_of_unregister(void) {};
++#endif /* CONFIG_USB_ISP116X_HCD_OF */
++
+ /*-----------------------------------------------------------------*/
+ 
+ static int __init isp116x_init(void)
+ {
++	int ret;
++
+ 	if (usb_disabled())
+ 		return -ENODEV;
+ 
+ 	INFO("driver %s, %s\n", hcd_name, DRIVER_VERSION);
+-	return platform_driver_register(&isp116x_driver);
++	ret = isp116x_platform_register();
++	if (ret)
++		return ret;
++
++	ret = isp116x_of_register();
++	if (ret)
++		goto err_platform_unregister;
++
++	return 0;
++
++ err_platform_unregister:
++	isp116x_platform_unregister();
++	return ret;
+ }
+ 
+ module_init(isp116x_init);
+ 
+ static void __exit isp116x_cleanup(void)
+ {
+-	platform_driver_unregister(&isp116x_driver);
++	isp116x_of_unregister();
++	isp116x_platform_unregister();
+ }
+ 
+ module_exit(isp116x_cleanup);
+--- a/drivers/usb/host/Kconfig
++++ b/drivers/usb/host/Kconfig
+@@ -144,6 +144,24 @@ config USB_ISP116X_HCD
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called isp116x-hcd.
+ 
++config USB_ISP116X_HCD_PLATFORM
++	bool "ISP116X support for controllers on platform bus"
++	depends on USB_ISP116X_HCD
++	default n if PPC_OF
++	default y
++	---help---
++	  Enables support for the ISP116x USB controller present on the
++	  platform bus.
++
++config USB_ISP116X_HCD_OF
++	bool "ISP116X support for controllers on OF platform bus"
++	depends on USB_ISP116X_HCD && PPC_OF
++	default y if PPC_OF
++	default n
++	---help---
++	  Enables support for the ISP116x USB controller present on the
++	  OpenFirmware platform bus.
++
+ config USB_ISP1760_HCD
+ 	tristate "ISP 1760 HCD support"
+ 	depends on USB && EXPERIMENTAL
diff --git a/target/linux/ppc40x/patches/121-usb-isp116x-hcd-ppc405-register-access.patch b/target/linux/ppc40x/patches/121-usb-isp116x-hcd-ppc405-register-access.patch
new file mode 100644
index 000000000..c81d18a44
--- /dev/null
+++ b/target/linux/ppc40x/patches/121-usb-isp116x-hcd-ppc405-register-access.patch
@@ -0,0 +1,111 @@
+--- a/drivers/usb/host/isp116x.h
++++ b/drivers/usb/host/isp116x.h
+@@ -364,22 +364,64 @@ struct isp116x_ep {
+ #define	IRQ_TEST()	do{}while(0)
+ #endif
+ 
++#ifdef CONFIG_405EP
++static inline void isp116x_writew(u16 val, void __iomem *addr)
++{
++	writew(cpu_to_le16(val), addr);
++}
++
++static inline u16 isp116x_readw(void __iomem *addr)
++{
++	return le16_to_cpu(readw(addr));
++}
++
++static inline void isp116x_raw_writew(u16 val, void __iomem *addr)
++{
++	writew(cpu_to_le16(val), addr);
++}
++
++static inline u16 isp116x_raw_readw(void __iomem *addr)
++{
++	return le16_to_cpu(readw(addr));
++}
++#else
++static inline void isp116x_writew(u16 val, void __iomem *addr)
++{
++	writew(val, addr);
++}
++
++static inline u16 isp116x_readw(void __iomem *addr)
++{
++	return readw(addr);
++}
++
++static inline void isp116x_raw_writew(u16 val, void __iomem *addr)
++{
++	__raw_writew(val, addr);
++}
++
++static inline u16 isp116x_raw_readw(void __iomem *addr)
++{
++	return __raw_readw(addr);
++}
++#endif
++
+ static inline void isp116x_write_addr(struct isp116x *isp116x, unsigned reg)
+ {
+ 	IRQ_TEST();
+-	writew(reg & 0xff, isp116x->addr_reg);
++	isp116x_writew(reg & 0xff, isp116x->addr_reg);
+ 	isp116x_delay(isp116x, 300);
+ }
+ 
+ static inline void isp116x_write_data16(struct isp116x *isp116x, u16 val)
+ {
+-	writew(val, isp116x->data_reg);
++	isp116x_writew(val, isp116x->data_reg);
+ 	isp116x_delay(isp116x, 150);
+ }
+ 
+ static inline void isp116x_raw_write_data16(struct isp116x *isp116x, u16 val)
+ {
+-	__raw_writew(val, isp116x->data_reg);
++	isp116x_raw_writew(val, isp116x->data_reg);
+ 	isp116x_delay(isp116x, 150);
+ }
+ 
+@@ -387,7 +429,7 @@ static inline u16 isp116x_read_data16(st
+ {
+ 	u16 val;
+ 
+-	val = readw(isp116x->data_reg);
++	val = isp116x_readw(isp116x->data_reg);
+ 	isp116x_delay(isp116x, 150);
+ 	return val;
+ }
+@@ -396,16 +438,16 @@ static inline u16 isp116x_raw_read_data1
+ {
+ 	u16 val;
+ 
+-	val = __raw_readw(isp116x->data_reg);
++	val = isp116x_raw_readw(isp116x->data_reg);
+ 	isp116x_delay(isp116x, 150);
+ 	return val;
+ }
+ 
+ static inline void isp116x_write_data32(struct isp116x *isp116x, u32 val)
+ {
+-	writew(val & 0xffff, isp116x->data_reg);
++	isp116x_writew(val & 0xffff, isp116x->data_reg);
+ 	isp116x_delay(isp116x, 150);
+-	writew(val >> 16, isp116x->data_reg);
++	isp116x_writew(val >> 16, isp116x->data_reg);
+ 	isp116x_delay(isp116x, 150);
+ }
+ 
+@@ -413,9 +455,9 @@ static inline u32 isp116x_read_data32(st
+ {
+ 	u32 val;
+ 
+-	val = (u32) readw(isp116x->data_reg);
++	val = (u32) isp116x_readw(isp116x->data_reg);
+ 	isp116x_delay(isp116x, 150);
+-	val |= ((u32) readw(isp116x->data_reg)) << 16;
++	val |= ((u32) isp116x_readw(isp116x->data_reg)) << 16;
+ 	isp116x_delay(isp116x, 150);
+ 	return val;
+ }
diff --git a/target/linux/ps3/Makefile b/target/linux/ps3/Makefile
deleted file mode 100644
index e36e333cf..000000000
--- a/target/linux/ps3/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-ARCH:=powerpc
-BOARD:=ps3
-BOARDNAME:=Sony PS3 Game Console
-MAINTAINER:=Geoff Levand <geoffrey.levand@am.sony.com>
-SUBTARGETS=petitboot
-FEATURES+=powerpc64
-
-LINUX_VERSION:=2.6.30.10
-
-KERNEL_CC:=
-
-include $(INCLUDE_DIR)/target.mk
-
-define Target/Description
-	Build for the Sony PS3 Game Console
-
-	The OpenWRT build will create both a 1st stage PS3-Linux image
-	suitable for programming into the PS3 flash memory, and a 2nd
-	stage PS3-Linux image suitable for loading via bootloaders or
-	the kexec utility.
-
-	Enable the Petitboot package to build a PS3 bootloader.
-endef
-
-KERNELNAME:="zImage"
-
-$(eval $(call BuildTarget))
diff --git a/target/linux/ps3/README b/target/linux/ps3/README
deleted file mode 100644
index 2d08b8c25..000000000
--- a/target/linux/ps3/README
+++ /dev/null
@@ -1,43 +0,0 @@
-OpenWRT on the Sony PS3 Game Console
-
-The OpenWRT build will create both a 1st stage PS3-Linux image
-suitable for programming into the PS3 flash memory, and a 2nd
-stage PS3-Linux image suitable for loading via bootloaders or
-the kexec utility.
-
-The 2nd stage image is convenient for testing new builds.  It can
-be loaded from disk, USB device, or the network by an existing
-Other OS bootloader.  After the 2nd stage image is tested and
-found to be good, the 1st stage image can then be programmed into
-flash memory.  It is recommended to use this method during
-development to avoid corrupting the flash memory contents, which
-requires a reboot to the Game OS to repair.
-
-Known good Other OS bootloader images and installation information
-can be found here:
-
-  http://www.kernel.org/pub/linux/kernel/people/geoff/cell/
-
-The 2nd stage image file is bin/openwrt-ps3-vmlinux.elf.  It can
-be loaded with an entry in the bootloader config file.  It has
-no initrd file.
-
-The 1st stage image is named bin/otheros.bld.  It can be programmed
-into flash memory either from Linux or the Game OS.  From Linux,
-use the command:
-
-  ps3-flash-util -w otheros.bld
-
-From the Game OS, use the menu item 'Install Other OS'.
-
-Tips on how to recover your PS3-Linux system when it hangs up or no
-longer boots can be found here:
-
-  http://www.kernel.org/pub/linux/kernel/people/geoff/cell/ps3-howto/ps3-boot-recovery-howto.txt
-
-To alter the kernel command line options, run 'make kernel_menuconfig'
-and go to 'Kernel Options' -> 'Initial kernel command string'.
-
-The default video behavior is to autodetect the monitor capabilities,
-which should work for most monitors.  More info on video modes can be
-found in the man page of the ps3-video-mode utility.
diff --git a/target/linux/ps3/config-2.6.30 b/target/linux/ps3/config-2.6.30
deleted file mode 100644
index 2fad43e9d..000000000
--- a/target/linux/ps3/config-2.6.30
+++ /dev/null
@@ -1,332 +0,0 @@
-CONFIG_64BIT=y
-CONFIG_ALTIVEC=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-CONFIG_ARCH_HAS_ILOG2_U32=y
-CONFIG_ARCH_HAS_ILOG2_U64=y
-CONFIG_ARCH_HAS_WALK_MEMORY=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_ARCH_MEMORY_PROBE=y
-CONFIG_ARCH_NO_VIRT_TO_BUS=y
-CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-# CONFIG_ARPD is not set
-CONFIG_AUDIT_ARCH=y
-# CONFIG_BINARY_PRINTF is not set
-CONFIG_BITREVERSE=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=65535
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_SD=y
-# CONFIG_BLK_DEV_SR_VENDOR is not set
-CONFIG_BLK_DEV_SR=y
-CONFIG_BLOCK_COMPAT=y
-# CONFIG_BOOTX_TEXT is not set
-CONFIG_BOUNCE=y
-# CONFIG_BRIDGE is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_CGROUP_SCHED is not set
-CONFIG_CMDLINE=""
-CONFIG_CMDLINE_BOOL=y
-CONFIG_COMPAT_BINFMT_ELF=y
-CONFIG_COMPAT_BRK=y
-CONFIG_COMPAT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_CRC16=y
-# CONFIG_CRYPTO is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_DEFAULT_UIMAGE is not set
-CONFIG_DEVKMEM=y
-CONFIG_DNOTIFY=y
-CONFIG_DTC=y
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_EARLY_PRINTK=y
-CONFIG_ELF_CORE=y
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-# CONFIG_EXT4DEV_COMPAT is not set
-# CONFIG_EXT4_FS_XATTR is not set
-CONFIG_EXT4_FS=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_FAT_FS=y
-CONFIG_FB_PS3_DEFAULT_SIZE_M=9
-CONFIG_FB_PS3=y
-CONFIG_FB_SYS_COPYAREA=y
-CONFIG_FB_SYS_FILLRECT=y
-CONFIG_FB_SYS_FOPS=y
-CONFIG_FB_SYS_IMAGEBLIT=y
-CONFIG_FB=y
-# CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FLATMEM_MANUAL is not set
-CONFIG_FONT_8x16=y
-CONFIG_FONT_8x8=y
-# CONFIG_FONTS is not set
-CONFIG_FORCE_MAX_ZONEORDER=13
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAME_WARN=2048
-# CONFIG_FSL_ULI1575 is not set
-CONFIG_GELIC_NET=y
-# CONFIG_GELIC_WIRELESS is not set
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-# CONFIG_GENERIC_IOMAP is not set
-CONFIG_GENERIC_ISA_DMA=y
-# CONFIG_GENERIC_TBSYNC is not set
-CONFIG_GENERIC_TIME_VSYSCALL=y
-# CONFIG_GEN_RTC is not set
-CONFIG_GROUP_SCHED=y
-# CONFIG_HAMRADIO is not set
-# CONFIG_HANGCHECK_TIMER is not set
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-# CONFIG_HAS_RAPIDIO is not set
-CONFIG_HAVE_ARCH_KGDB=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_ATTRS=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
-CONFIG_HAVE_IDE=y
-CONFIG_HAVE_IOREMAP_PROT=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_HAVE_LMB=y
-CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_HAVE_MLOCK=y
-CONFIG_HAVE_OPROFILE=y
-CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_HAVE_SYSCALL_WRAPPERS=y
-CONFIG_HID_APPLE=y
-CONFIG_HID_BELKIN=y
-CONFIG_HID_CHERRY=y
-CONFIG_HID_EZKEY=y
-CONFIG_HID_LOGITECH=y
-CONFIG_HID_MICROSOFT=y
-CONFIG_HID_SONY=y
-CONFIG_HID_SUNPLUS=y
-CONFIG_HID_SUPPORT=y
-CONFIG_HID=y
-# CONFIG_HIGH_RES_TIMERS is not set
-# CONFIG_HUGETLBFS is not set
-CONFIG_HW_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-# CONFIG_HZ_100 is not set
-CONFIG_HZ=250
-CONFIG_HZ_250=y
-CONFIG_INITRAMFS_ROOT_GID=500
-CONFIG_INITRAMFS_ROOT_UID=500
-CONFIG_INOTIFY_USER=y
-CONFIG_INOTIFY=y
-CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_JOYSTICK=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT=y
-# CONFIG_INPUT_YEALINK is not set
-CONFIG_IOMMU_HELPER=y
-# CONFIG_IOMMU_VMERGE is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
-# CONFIG_IPIC is not set
-# CONFIG_IP_MULTICAST is not set
-# CONFIG_IRQ_ALL_CPUS is not set
-CONFIG_IRQ_PER_CPU=y
-# CONFIG_IRQSTACKS is not set
-CONFIG_ISA_DMA_API=y
-CONFIG_ISO9660_FS=y
-CONFIG_JBD2=y
-CONFIG_JBD=y
-# CONFIG_JOYSTICK_A3D is not set
-# CONFIG_JOYSTICK_ADI is not set
-# CONFIG_JOYSTICK_ANALOG is not set
-# CONFIG_JOYSTICK_COBRA is not set
-# CONFIG_JOYSTICK_GF2K is not set
-# CONFIG_JOYSTICK_GRIP is not set
-# CONFIG_JOYSTICK_GRIP_MP is not set
-# CONFIG_JOYSTICK_GUILLEMOT is not set
-# CONFIG_JOYSTICK_IFORCE is not set
-# CONFIG_JOYSTICK_INTERACT is not set
-# CONFIG_JOYSTICK_JOYDUMP is not set
-# CONFIG_JOYSTICK_MAGELLAN is not set
-# CONFIG_JOYSTICK_SIDEWINDER is not set
-# CONFIG_JOYSTICK_SPACEBALL is not set
-# CONFIG_JOYSTICK_SPACEORB is not set
-# CONFIG_JOYSTICK_STINGER is not set
-# CONFIG_JOYSTICK_TMDC is not set
-# CONFIG_JOYSTICK_TWIDJOY is not set
-# CONFIG_JOYSTICK_WARRIOR is not set
-# CONFIG_JOYSTICK_XPAD is not set
-# CONFIG_JOYSTICK_ZHENHUA is not set
-CONFIG_KERNEL_START=0xc000000000000000
-CONFIG_KEXEC=y
-# CONFIG_LEDS_TRIGGERS is not set
-CONFIG_LOCK_KERNEL=y
-CONFIG_LOG_BUF_SHIFT=15
-# CONFIG_LOGO is not set
-CONFIG_MEMORY_HOTPLUG_SPARSE=y
-CONFIG_MEMORY_HOTPLUG=y
-# CONFIG_MEMORY_HOTREMOVE is not set
-CONFIG_MIGRATION=y
-# CONFIG_MINI_FO is not set
-# CONFIG_MISC_DEVICES is not set
-# CONFIG_MMIO_NVRAM is not set
-# CONFIG_MPIC is not set
-# CONFIG_MPIC_WEIRD is not set
-CONFIG_MSDOS_FS=y
-# CONFIG_MTD is not set
-# CONFIG_NET_ETHERNET is not set
-# CONFIG_NETFILTER is not set
-# CONFIG_NETWORK_FILESYSTEMS is not set
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS=y
-CONFIG_NR_CPUS=2
-# CONFIG_NUMA is not set
-CONFIG_OF_DEVICE=y
-CONFIG_OF=y
-# CONFIG_PACKET_MMAP is not set
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PAGE_OFFSET=0xc000000000000000
-# CONFIG_PARTITION_ADVANCED is not set
-# CONFIG_PCI_DOMAINS is not set
-# CONFIG_PCI_SYSCALL is not set
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_PHYSICAL_START=0x00000000
-CONFIG_POWER3=y
-# CONFIG_POWER4_ONLY is not set
-CONFIG_POWER4=y
-CONFIG_PPC64=y
-# CONFIG_PPC_970_NAP is not set
-CONFIG_PPC_BOOK3S=y
-# CONFIG_PPC_CELLEB is not set
-# CONFIG_PPC_CELL_NATIVE is not set
-# CONFIG_PPC_CELL_QPACE is not set
-CONFIG_PPC_CELL=y
-# CONFIG_PPC_CLOCK is not set
-# CONFIG_PPC_DCR_MMIO is not set
-# CONFIG_PPC_DCR_NATIVE is not set
-# CONFIG_PPC_EARLY_DEBUG is not set
-CONFIG_PPC_FPU=y
-# CONFIG_PPC_HAS_HASH_64K is not set
-# CONFIG_PPC_I8259 is not set
-# CONFIG_PPC_IBM_CELL_BLADE is not set
-# CONFIG_PPC_INDIRECT_IO is not set
-# CONFIG_PPC_ISERIES is not set
-# CONFIG_PPC_MAPLE is not set
-# CONFIG_PPC_MM_SLICES is not set
-# CONFIG_PPC_MPC106 is not set
-# CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set
-CONFIG_PPC_OF=y
-# CONFIG_PPC_PASEMI is not set
-CONFIG_PPC_PCI_CHOICE=y
-# CONFIG_PPC_PMAC is not set
-CONFIG_PPC_PS3=y
-# CONFIG_PPC_PSERIES is not set
-# CONFIG_PPC_RTAS is not set
-CONFIG_PPC_STD_MMU_64=y
-CONFIG_PPC_STD_MMU=y
-# CONFIG_PPC_UDBG_16550 is not set
-CONFIG_PPC=y
-# CONFIG_PQ2ADS is not set
-CONFIG_PRINT_STACK_DEPTH=64
-CONFIG_PROC_DEVICETREE=y
-CONFIG_PROC_PAGE_MONITOR=y
-CONFIG_PS3_ADVANCED=y
-CONFIG_PS3_DISK=y
-# CONFIG_PS3_DYNAMIC_DMA is not set
-CONFIG_PS3_FLASH=y
-CONFIG_PS3_HTAB_SIZE=20
-# CONFIG_PS3_LPM is not set
-CONFIG_PS3_PS3AV=y
-CONFIG_PS3_ROM=y
-CONFIG_PS3_STORAGE=y
-CONFIG_PS3_SYS_MANAGER=y
-# CONFIG_PS3_VRAM is not set
-CONFIG_PS3_VUART=y
-# CONFIG_RD_LZMA is not set
-# CONFIG_RELOCATABLE is not set
-# CONFIG_RT_GROUP_SCHED is not set
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-# CONFIG_SCHED_HRTICK is not set
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-# CONFIG_SCHED_SMT is not set
-# CONFIG_SCSI_LOWLEVEL is not set
-# CONFIG_SCSI_PROC_FS is not set
-CONFIG_SCSI=y
-# CONFIG_SERIAL_8250 is not set
-# CONFIG_SLOW_WORK is not set
-CONFIG_SMP=y
-CONFIG_SPARSEMEM_EXTREME=y
-CONFIG_SPARSEMEM_MANUAL=y
-CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
-# CONFIG_SPARSEMEM_VMEMMAP is not set
-CONFIG_SPARSEMEM=y
-# CONFIG_SPU_BASE is not set
-# CONFIG_SPU_FS is not set
-# CONFIG_SQUASHFS is not set
-CONFIG_STOP_MACHINE=y
-# CONFIG_SWAP is not set
-# CONFIG_SYSCTL_SYSCALL_CHECK is not set
-CONFIG_SYSVIPC_COMPAT=y
-# CONFIG_TEXTSEARCH is not set
-CONFIG_TRACING_SUPPORT=y
-CONFIG_TUNE_CELL=y
-# CONFIG_U3_DART is not set
-# CONFIG_USB_DEVICEFS is not set
-CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y
-CONFIG_USB_EHCI_HCD_PPC_OF=y
-CONFIG_USB_EHCI_HCD=y
-# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
-CONFIG_USB_HID=y
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
-# CONFIG_USB_OHCI_HCD_PPC_OF is not set
-CONFIG_USB_OHCI_HCD=y
-# CONFIG_USB_STORAGE_ALAUDA is not set
-# CONFIG_USB_STORAGE_DATAFAB is not set
-# CONFIG_USB_STORAGE_FREECOM is not set
-# CONFIG_USB_STORAGE_JUMPSHOT is not set
-# CONFIG_USB_STORAGE_KARMA is not set
-# CONFIG_USB_STORAGE_SDDR09 is not set
-# CONFIG_USB_STORAGE_SDDR55 is not set
-# CONFIG_USB_STORAGE_USBAT is not set
-CONFIG_USB_STORAGE=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB=y
-CONFIG_USE_GENERIC_SMP_HELPERS=y
-CONFIG_USER_SCHED=y
-CONFIG_VFAT_FS=y
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_VIDEO_OUTPUT_CONTROL=y
-CONFIG_VIRT_CPU_ACCOUNTING=y
-# CONFIG_VLAN_8021Q is not set
-CONFIG_VM_EVENT_COUNTERS=y
-# CONFIG_VSX is not set
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_VT=y
-# CONFIG_WATCHDOG is not set
-# CONFIG_WIRELESS is not set
-# CONFIG_WLAN_80211 is not set
-CONFIG_WORD_SIZE=64
-# CONFIG_ZISOFS is not set
diff --git a/target/linux/ps3/image/Makefile b/target/linux/ps3/image/Makefile
deleted file mode 100644
index 9eb3d93f0..000000000
--- a/target/linux/ps3/image/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Copyright (C) 2007-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/image.mk
-
-define Image/Prepare
-	cp $(LINUX_DIR)/arch/powerpc/boot/otheros.bld $(KDIR)/image
-endef
-
-define Image/BuildKernel
-	mkdir -p $(BIN_DIR)
-	cp $(KDIR)/image $(BIN_DIR)/otheros.bld
-	cp $(KDIR)/vmlinux.elf $(BIN_DIR)/$(IMG_PREFIX)-vmlinux.elf
-	cp $(BIN_DIR)/$(IMG_PREFIX)-vmlinux.elf $(TARGET_DIR)
-endef
-
-$(eval $(call BuildImage))
diff --git a/target/linux/ps3/modules.mk b/target/linux/ps3/modules.mk
deleted file mode 100644
index f38ccc413..000000000
--- a/target/linux/ps3/modules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-define KernelPackage/ps3lan
-  SUBMENU:=Network Devices
-  TITLE:=PS3-Lan support
-  DEPENDS:=@LINUX_2_6 @TARGET_ps3
-  KCONFIG:= \
-	CONFIG_GELIC_NET \
-	CONFIG_GELIC_WIRELESS=y
-  FILES:=$(LINUX_DIR)/drivers/net/ps3_gelic.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50,ps3_gelic)
-endef
-
-define KernelPackage/ps3lan/description
-  Kernel module for PS3 Networking. Includes Gb Ethernet and WLAN
-endef
-
-$(eval $(call KernelPackage,ps3lan))
diff --git a/target/linux/ps3/patches-2.6.30/0016-ps3-gelic-fix-rxdmac.patch b/target/linux/ps3/patches-2.6.30/0016-ps3-gelic-fix-rxdmac.patch
deleted file mode 100644
index 1cb202d4f..000000000
--- a/target/linux/ps3/patches-2.6.30/0016-ps3-gelic-fix-rxdmac.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-Subject: net/ps3_gelic: Fix RX DMA restart
-
-Fix the condition where PS3 network RX hangs when no network
-TX is occuring by calling gelic_card_enable_rxdmac() during
-RX_DMA_CHAIN_END event processing.
-
-The gelic hardware automatically clears its RX_DMA_EN flag when
-it detects an RX_DMA_CHAIN_END event.  In its processing of
-RX_DMA_CHAIN_END the gelic driver is required to set RX_DMA_EN
-(with a call to gelic_card_enable_rxdmac()) to restart RX DMA
-transfers.  The existing gelic driver code does not set
-RX_DMA_EN directly in its processing of the RX_DMA_CHAIN_END
-event, but uses a flag variable card->rx_dma_restart_required
-to schedule the setting of RX_DMA_EN until next inside the
-interrupt handler.
-
-It seems this delayed setting of RX_DMA_EN causes the hang since
-the next RX interrupt after the RX_DMA_CHAIN_END event where
-RX_DMA_EN is scheduled to be set will not occur since RX_DMA_EN
-was not set.  In the case were network TX is occuring, RX_DMA_EN
-is set in the next TX interrupt and RX processing continues.
-
-Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
----
- drivers/net/ps3_gelic_net.c |   21 ++++++++-------------
- drivers/net/ps3_gelic_net.h |    1 -
- 2 files changed, 8 insertions(+), 14 deletions(-)
-
---- a/drivers/net/ps3_gelic_net.c
-+++ b/drivers/net/ps3_gelic_net.c
-@@ -969,10 +969,6 @@ static int gelic_card_decode_one_descr(s
- 	int dmac_chain_ended;
- 
- 	status = gelic_descr_get_status(descr);
--	/* is this descriptor terminated with next_descr == NULL? */
--	dmac_chain_ended =
--		be32_to_cpu(descr->dmac_cmd_status) &
--		GELIC_DESCR_RX_DMA_CHAIN_END;
- 
- 	if (status == GELIC_DESCR_DMA_CARDOWNED)
- 		return 0;
-@@ -1035,6 +1031,11 @@ static int gelic_card_decode_one_descr(s
- 	/* ok, we've got a packet in descr */
- 	gelic_net_pass_skb_up(descr, card, netdev);
- refill:
-+
-+	/* is the current descriptor terminated with next_descr == NULL? */
-+	dmac_chain_ended =
-+		be32_to_cpu(descr->dmac_cmd_status) &
-+		GELIC_DESCR_RX_DMA_CHAIN_END;
- 	/*
- 	 * So that always DMAC can see the end
- 	 * of the descriptor chain to avoid
-@@ -1063,10 +1064,9 @@ refill:
- 	 * If dmac chain was met, DMAC stopped.
- 	 * thus re-enable it
- 	 */
--	if (dmac_chain_ended) {
--		card->rx_dma_restart_required = 1;
--		dev_dbg(ctodev(card), "reenable rx dma scheduled\n");
--	}
-+
-+	if (dmac_chain_ended)
-+		gelic_card_enable_rxdmac(card);
- 
- 	return 1;
- }
-@@ -1132,11 +1132,6 @@ static irqreturn_t gelic_card_interrupt(
- 
- 	status &= card->irq_mask;
- 
--	if (card->rx_dma_restart_required) {
--		card->rx_dma_restart_required = 0;
--		gelic_card_enable_rxdmac(card);
--	}
--
- 	if (status & GELIC_CARD_RXINT) {
- 		gelic_card_rx_irq_off(card);
- 		napi_schedule(&card->napi);
---- a/drivers/net/ps3_gelic_net.h
-+++ b/drivers/net/ps3_gelic_net.h
-@@ -284,7 +284,6 @@ struct gelic_card {
- 
- 	struct gelic_descr_chain tx_chain;
- 	struct gelic_descr_chain rx_chain;
--	int rx_dma_restart_required;
- 	int rx_csum;
- 	/*
- 	 * tx_lock guards tx descriptor list and
diff --git a/target/linux/ps3/petitboot/base-files/bin/login b/target/linux/ps3/petitboot/base-files/bin/login
deleted file mode 100755
index b17efcdf4..000000000
--- a/target/linux/ps3/petitboot/base-files/bin/login
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2008 OpenWrt.org
-
-bl_option=/sbin/ps3-bl-option
-
-if [ ! -f $bl_option ] ||
-   [ ! `$bl_option --get-telnet-enabled` ] ||
-   [ `$bl_option --get-telnet-enabled` = "0" ]; then
-    echo \
-"
- === IMPORTANT ==========================
-  Telnet login is disabled for security
-  reasons. Enabling telnet login on the
-  host will allow any user connected to
-  the same network to login to the host.
-
-  You can enable telnet login with the
-  following command in the host console:
-
-  # $bl_option -T 1
-
-  You can disable telnet login with the
-  following command in the host console:
-
-  # $bl_option -T 0
- ----------------------------------------
-"
-    exit 0
-fi
-
-grep '^root:[^!]' /etc/passwd >&- 2>&-
-[ "$?" = "0" -a -z "$FAILSAFE" ]  &&
-{
-    echo "Login failed."
-    exit 0
-} || {
-cat << EOF
- === IMPORTANT ============================
-  Use 'passwd' to set your login password
-  this will disable telnet and enable SSH
- ------------------------------------------
-EOF
-}
-
-exec /bin/ash --login
diff --git a/target/linux/ps3/petitboot/base-files/etc/banner b/target/linux/ps3/petitboot/base-files/etc/banner
deleted file mode 100644
index 4d671c7ba..000000000
--- a/target/linux/ps3/petitboot/base-files/etc/banner
+++ /dev/null
@@ -1,6 +0,0 @@
-  _____  _____  _____
- |  _  ||  ___||___  |
- |   __||___  ||___  |
- |__|   |_____||_____|
-            L I N U X
-
diff --git a/target/linux/ps3/petitboot/base-files/etc/config/network b/target/linux/ps3/petitboot/base-files/etc/config/network
deleted file mode 100644
index 453481e32..000000000
--- a/target/linux/ps3/petitboot/base-files/etc/config/network
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (C) 2006 OpenWrt.org
-
-config interface loopback
-	option ifname	lo
-	option proto	static
-	option ipaddr	127.0.0.1
-	option netmask	255.0.0.0
-
-config interface lan
-	option ifname	eth0
-	option proto	dhcp
-	option ipaddr	192.168.1.1
-	option netmask	255.255.255.0
diff --git a/target/linux/ps3/petitboot/base-files/etc/config/system b/target/linux/ps3/petitboot/base-files/etc/config/system
deleted file mode 100644
index 67ffe8319..000000000
--- a/target/linux/ps3/petitboot/base-files/etc/config/system
+++ /dev/null
@@ -1,3 +0,0 @@
-config system
-	option hostname ps3-linux
-	option log_file /var/log/messages
diff --git a/target/linux/ps3/petitboot/base-files/etc/init.d/boot b/target/linux/ps3/petitboot/base-files/etc/init.d/boot
deleted file mode 100755
index c84c6873d..000000000
--- a/target/linux/ps3/petitboot/base-files/etc/init.d/boot
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
-
-START=10
-
-system_config() {
-	local cfg="$1"
-	local hostname
-	
-	config_get hostname "$cfg" hostname
-	echo "${hostname:-OpenWrt}" > /proc/sys/kernel/hostname
-
-	config_get conloglevel "$cfg" conloglevel
-	[ -n "$conloglevel" ] && dmesg -n "$conloglevel"
-	
-	config_get timezone "$cfg" timezone 
-	[ -z "$timezone" ] && timezone=UTC
-	echo "$timezone" > /tmp/TZ
-
-	config_get log_ip "$cfg" log_ip
-	config_get log_size "$cfg" log_size
-	config_get log_port "$cfg" log_port
-	config_get log_file "$cfg" log_file
-
-	[ -z $log_file -a -z "$log_size" ] && log_size=16
-	[ -x /sbin/syslogd ] && syslogd ${log_size:+-C $log_size} \
-		${log_file:+-O $log_file} ${log_ip:+-L -R $log_ip}
-	[ -x /sbin/klogd ] && klogd
-}
-
-apply_uci_config() {(
-	include /lib/config
-	uci_apply_defaults
-)}
-
-start() {
-	[ -f /proc/mounts ] || /sbin/mount_root
-	[ -f /proc/jffs2_bbc ] && echo "S" > /proc/jffs2_bbc
-	[ -f /proc/net/vlan/config ] && vconfig set_name_type DEV_PLUS_VID_NO_PAD
-
-	apply_uci_config
-	config_load system
-	config_foreach system_config system
-
-	mkdir -p /var/run
-	mkdir -p /var/log
-	mkdir -p /var/lock
-	mkdir -p /var/state
-	mkdir -p /tmp/.uci
-	chown 0700 /tmp/.uci
-	touch /var/log/wtmp
-	touch /var/log/lastlog
-	touch /tmp/resolv.conf.auto
-	ln -sf /tmp/resolv.conf.auto /tmp/resolv.conf
-	[ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe
-
-	killall -q hotplug2
-	[ -x /sbin/hotplug2 ] && /sbin/hotplug2 --override --persistent \
-			--max-children 1 --no-coldplug &
-
-	# the coldplugging of network interfaces needs to happen later, so we do it manually here
-	for iface in $(awk -F: '/:/ {print $1}' /proc/net/dev); do
-		/usr/bin/env -i ACTION=add INTERFACE="$iface" /sbin/hotplug-call net
-	done
-
-	# create /dev/root if it doesn't exist
-	[ -e /dev/root ] || {
-		rootdev=$(awk 'BEGIN { RS=" "; FS="="; } $1 == "root" { print $2 }' < /proc/cmdline)
-		[ -n "$rootdev" ] && ln -s "$rootdev" /dev/root
-	}
-
-	load_modules /etc/modules.d/*
-}
diff --git a/target/linux/ps3/petitboot/base-files/etc/inittab b/target/linux/ps3/petitboot/base-files/etc/inittab
deleted file mode 100644
index 96abea984..000000000
--- a/target/linux/ps3/petitboot/base-files/etc/inittab
+++ /dev/null
@@ -1,7 +0,0 @@
-::sysinit:/etc/init.d/rcS S boot
-::shutdown:/etc/init.d/rcS K stop
-::ctrlaltdel:/sbin/reboot
-::restart:/sbin/init
-tty1::respawn:/sbin/initrun
-tty2::askfirst:/bin/ash --login
-tty3::askfirst:/bin/ash --login
diff --git a/target/linux/ps3/petitboot/base-files/etc/sysctl.conf b/target/linux/ps3/petitboot/base-files/etc/sysctl.conf
deleted file mode 100644
index 1af007925..000000000
--- a/target/linux/ps3/petitboot/base-files/etc/sysctl.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-kernel.panic=3
-net.ipv4.conf.default.arp_ignore=1
-net.ipv4.conf.all.arp_ignore=1
-net.ipv4.ip_forward=1
-net.ipv4.icmp_echo_ignore_broadcasts=1
-net.ipv4.icmp_ignore_bogus_error_responses=1
-net.ipv4.tcp_ecn=1 
-net.ipv4.tcp_fin_timeout=30
-net.ipv4.tcp_keepalive_time=120
-net.ipv4.tcp_timestamps=0
-net.core.netdev_max_backlog=30
diff --git a/target/linux/ps3/petitboot/base-files/sbin/initrun b/target/linux/ps3/petitboot/base-files/sbin/initrun
deleted file mode 100755
index 1c3363fcc..000000000
--- a/target/linux/ps3/petitboot/base-files/sbin/initrun
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-# Run petitboot at first startup, otherwise run a login.
-
-sbindir=/usr/sbin
-localstatedir=/var/petitboot
-
-petitboot=$sbindir/petitboot
-run_once=$localstatedir/.run-once
-
-if [ ! -f $run_once -a -x $petitboot ]; then
-	# quiet console
-	echo 3 > /proc/sys/kernel/printk
-	mkdir -p $localstatedir
-	touch $run_once
-        exec $petitboot --timeout
-fi
-
-exec /bin/ash --login
diff --git a/target/linux/ps3/petitboot/base-files/sbin/ps3-bl-option b/target/linux/ps3/petitboot/base-files/sbin/ps3-bl-option
deleted file mode 100755
index 972c00ae1..000000000
--- a/target/linux/ps3/petitboot/base-files/sbin/ps3-bl-option
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/sh
-#
-#  Copyright (C) 2008 Sony Computer Entertainment Inc.
-#  Copyright 2008 Sony Corp.
-#
-#  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; version 2 of the License.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-
-usage() {
-	echo -n "
-SYNOPSIS
-     ps3-bl-option [OPTION]
-DESCRIPTION
-     Get and set PS3 bootloader options in flash.
-OPTIONS
-     -m, --get-video-mode
-             Get the bootloader video mode.
-     -M, --set-video-mode value
-             Set the bootloader video mode.
-     -o, --get-bootloader-timeout
-             Get the bootloader timeout in seconds.
-     -O, --set-bootloader-timeout value
-             Set the bootloader timeout in seconds.
-     -p, --get-bootloader-default
-             Get the default bootloader menu item.
-     -P, --set-bootloader-default value
-             Set the default bootloader menu item.
-     -t, --get-telnet-enabled
-             Get the telnet enabled flag.
-     -T, --set-telnet-enabled value
-             Set the telnet enabled flag.
-     -h, --help
-             Print a help message.
-SEE ALSO
-     ps3-flash-util(8)
-"
-}
-
-bad_arg() {
-	echo "ERROR: bad arg" >&2;
-	usage
-	exit 1
-}
-
-if [ "$#" -eq 0 ] ; then
-	bad_arg
-fi
-
-get_flag() {
-	flags=`ps3-flash-util --db-print $1 $2`
-	echo $(( ${flags:-0} & $3 ))
-}
-
-set_flag() {
-	flags=`ps3-flash-util --db-print $1 $2`
-
-	if [ $4 -eq 0  ]; then
-		ps3-flash-util --db-write-half $1 $2 $(( ${flags:-0} & ~$3 ))
-	else
-		ps3-flash-util --db-write-half $1 $2 $(( ${flags:-0} | $3 ))
-	fi
-}
-
-# owners
-bootloader="3"
-
-# keys
-item="1"
-video="2"
-flags="3"
-timeout="4"
-
-# flags
-telnet="1"
-
-case "$1" in
-	-m | --get-video-mode)
-		ps3-flash-util --db-print ${bootloader} ${video}
-		;;
-	-M | --set-video-mode)
-		ps3-flash-util --db-write-half ${bootloader} ${video} $2
-		;;
-	-o | --get-bootloader-timeout)
-		ps3-flash-util --db-print ${bootloader} ${timeout}
-		;;
-	-O | --set-bootloader-timeout)
-		ps3-flash-util --db-write-half ${bootloader} ${timeout} $2
-		;;
-	-p | --get-bootloader-default)
-		ps3-flash-util --db-print ${bootloader} ${item}
-		;;
-	-P | --set-bootloader-default)
-		ps3-flash-util --db-write-word ${bootloader} ${item} $2
-		;;
-	-t | --get-telnet-enabled)
-		get_flag ${bootloader} ${flags} ${telnet}
-		;;
-	-T | --set-telnet-enabled)
-		set_flag ${bootloader} ${flags} ${telnet} $2
-		;;
-	-h | --help)
-		usage
-		exit 0
-		;;
-	*)
-		bad_arg
-		;;
-esac
diff --git a/target/linux/ps3/petitboot/defconfig-ps3-petitboot b/target/linux/ps3/petitboot/defconfig-ps3-petitboot
deleted file mode 100644
index 5af604b9d..000000000
--- a/target/linux/ps3/petitboot/defconfig-ps3-petitboot
+++ /dev/null
@@ -1,21 +0,0 @@
-# Configuration overrides
-
-CONFIG_TARGET_ps3=y
-CONFIG_UCI_PRECONFIG=y
-CONFIG_UCI_PRECONFIG_network_lan_proto="dhcp"
-
-CONFIG_BUSYBOX_CONFIG_GETTY=y
-CONFIG_BUSYBOX_CONFIG_FDISK=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE=y
-# CONFIG_BUSYBOX_CONFIG_BRCTL is not set
-# CONFIG_BUSYBOX_CONFIG_HTTPD is not set
-CONFIG_BUSYBOX_CONFIG_TFTP=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_GET=y
-
-# CONFIG_PACKAGE_udevtrigger is not set
-CONFIG_UDEV_ENABLE_DEBUG=y
-
-CONFIG_PETITBOOT_DEBUG=y
-CONFIG_PETITBOOT_PS3=y
-# CONFIG_PETITBOOT_AUTORUN_GUI is not set
-CONFIG_PETITBOOT_AUTORUN_CUI=y
diff --git a/target/linux/ps3/petitboot/profiles/000-Default.mk b/target/linux/ps3/petitboot/profiles/000-Default.mk
deleted file mode 100644
index 61cfc0796..000000000
--- a/target/linux/ps3/petitboot/profiles/000-Default.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2009 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/Default
-  NAME:=Default PS3 Petitboot profile
-  PACKAGES:=-dnsmasq -iptables -opkg -ppp -ppp-mod-pppoe -kmod-ipt-nathelper \
-	    -firewall -mtd -hotplug2 -swconfig \
-	    kexec-tools ps3-utils petitboot
-endef
-
-define Profile/Default/Description
-        Default PS3 Petitboot profile
-endef
-$(eval $(call Profile,Default))
-
diff --git a/target/linux/ps3/petitboot/target.mk b/target/linux/ps3/petitboot/target.mk
deleted file mode 100644
index 845c4316d..000000000
--- a/target/linux/ps3/petitboot/target.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-BOARDNAME:=Petitboot
-FEATURES+=fpu ramdisk
-
-define Target/Description
-	Build Petitboot bootloader
-endef
diff --git a/target/linux/pxa/Makefile b/target/linux/pxa/Makefile
deleted file mode 100644
index ba05bef84..000000000
--- a/target/linux/pxa/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright (C) 2006-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-ARCH:=arm
-BOARD:=pxa
-BOARDNAME:=Marvell/Intel PXA2xx
-FEATURES:=squashfs
-
-LINUX_VERSION:=2.6.32.10
-
-include $(INCLUDE_DIR)/target.mk
-
-define Target/Description
-	Build images for PXA2xx systems, eg. Gumstix.
-endef
-
-KERNELNAME:="uImage"
-
-$(eval $(call BuildTarget))
diff --git a/target/linux/pxa/config-default b/target/linux/pxa/config-default
deleted file mode 100644
index 9b351346c..000000000
--- a/target/linux/pxa/config-default
+++ /dev/null
@@ -1,166 +0,0 @@
-# CONFIG_AEABI is not set
-CONFIG_ALIGNMENT_TRAP=y
-CONFIG_APM_EMULATION=m
-CONFIG_ARCH_GUMSTIX=y
-# CONFIG_ARCH_LUBBOCK is not set
-CONFIG_ARCH_MTD_XIP=y
-# CONFIG_ARCH_PXA_ESERIES is not set
-# CONFIG_ARCH_PXA_IDP is not set
-# CONFIG_ARCH_PXA_PALM is not set
-CONFIG_ARCH_PXA=y
-CONFIG_ARCH_REQUIRE_GPIOLIB=y
-# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
-# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-# CONFIG_ARCH_VIPER is not set
-# CONFIG_ARM_THUMB is not set
-CONFIG_ARM=y
-# CONFIG_ARPD is not set
-CONFIG_ATA=m
-CONFIG_BITREVERSE=y
-CONFIG_BLK_DEV_IDECS=m
-# CONFIG_BLK_DEV_IDEDMA is not set
-# CONFIG_BLK_DEV_INITRD is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_CMDLINE="rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"
-CONFIG_COMMON_CLKDEV=y
-CONFIG_CPU_32v5=y
-CONFIG_CPU_32=y
-CONFIG_CPU_ABRT_EV5T=y
-CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_CP15_MMU=y
-CONFIG_CPU_CP15=y
-CONFIG_CPU_PABRT_NOIFAR=y
-CONFIG_CPU_TLB_V4WBI=y
-CONFIG_CPU_XSCALE=y
-# CONFIG_DEBUG_USER is not set
-CONFIG_DECOMPRESS_LZMA=y
-# CONFIG_DM9000 is not set
-CONFIG_ENABLE_MUST_CHECK=y
-# CONFIG_EPOLL is not set
-# CONFIG_FPE_FASTFPE is not set
-# CONFIG_FPE_NWFPE is not set
-CONFIG_FRAME_POINTER=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-CONFIG_GPIOLIB=y
-# CONFIG_HAMRADIO is not set
-CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAVE_AOUT=y
-CONFIG_HAVE_ARCH_KGDB=y
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_HAVE_IDE=y
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_LZO=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_HAVE_OPROFILE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_CHARDEV=m
-# CONFIG_I2C_DESIGNWARE is not set
-CONFIG_I2C=m
-CONFIG_I2C_PXA=m
-CONFIG_I2C_PXA_SLAVE=y
-CONFIG_IDE=m
-CONFIG_INOTIFY_USER=y
-CONFIG_INOTIFY=y
-CONFIG_IWMMXT=y
-# CONFIG_LEDS_GPIO is not set
-CONFIG_MAC80211_DEFAULT_PS_VALUE=0
-# CONFIG_MACH_ARMCORE is not set
-# CONFIG_MACH_BALLOON3 is not set
-# CONFIG_MACH_CM_X300 is not set
-# CONFIG_MACH_COLIBRI300 is not set
-# CONFIG_MACH_COLIBRI320 is not set
-# CONFIG_MACH_COLIBRI is not set
-# CONFIG_MACH_CSB726 is not set
-# CONFIG_MACH_EM_X270 is not set
-# CONFIG_MACH_EXEDA is not set
-# CONFIG_MACH_GUMSTIX_F is not set
-CONFIG_MACH_GUMSTIX_VERDEX=y
-# CONFIG_MACH_H4700 is not set
-# CONFIG_MACH_H5000 is not set
-# CONFIG_MACH_HIMALAYA is not set
-# CONFIG_MACH_INTELMOTE2 is not set
-# CONFIG_MACH_LITTLETON is not set
-# CONFIG_MACH_LOGICPD_PXA270 is not set
-# CONFIG_MACH_MAGICIAN is not set
-# CONFIG_MACH_MAINSTONE is not set
-# CONFIG_MACH_MIOA701 is not set
-# CONFIG_MACH_MP900C is not set
-# CONFIG_MACH_PCM027 is not set
-# CONFIG_MACH_SAAR is not set
-# CONFIG_MACH_STARGATE2 is not set
-# CONFIG_MACH_TAVOREVB is not set
-# CONFIG_MACH_XCEP is not set
-# CONFIG_MACH_ZYLONITE is not set
-# CONFIG_MFD_T7L66XB is not set
-CONFIG_MII=m
-CONFIG_MMC_BLOCK=y
-CONFIG_MMC_PXA=y
-CONFIG_MMC=y
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-# CONFIG_MTD_CFI_AMDSTD is not set
-CONFIG_MTD_CFI_GEOMETRY=y
-# CONFIG_MTD_CFI_I2 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_PXA2XX=y
-# CONFIG_MTD_XIP is not set
-# CONFIG_PACKET is not set
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_PATA_PCMCIA=m
-CONFIG_PCCARD=m
-# CONFIG_PCI_SYSCALL is not set
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_PXA2XX=m
-CONFIG_PLAT_PXA=y
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_RUNTIME is not set
-CONFIG_PM=y
-CONFIG_PXA27x=y
-# CONFIG_PXA_EZX is not set
-# CONFIG_PXA_SHARPSL is not set
-CONFIG_SA1100_WATCHDOG=m
-CONFIG_SCSI=m
-# CONFIG_SCSI_MULTI_LUN is not set
-# CONFIG_SCSI_PROC_FS is not set
-# CONFIG_SDIO_UART is not set
-# CONFIG_SERIAL_8250 is not set
-CONFIG_SERIAL_PXA_CONSOLE=y
-CONFIG_SERIAL_PXA=y
-CONFIG_SERIO_LIBPS2=m
-CONFIG_SERIO=m
-# CONFIG_SERIO_RAW is not set
-CONFIG_SERIO_SERPORT=m
-CONFIG_SMC911X=m
-CONFIG_SMC91X=m
-CONFIG_SMSC911X=y
-CONFIG_SPLIT_PTLOCK_CPUS=4096
-# CONFIG_SUSPEND is not set
-# CONFIG_SYSCTL_SYSCALL is not set
-CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-# CONFIG_TRIZEPS_PXA is not set
-CONFIG_UID16=y
-CONFIG_UNIX=m
-CONFIG_VECTORS_BASE=0xffff0000
-# CONFIG_VLAN_8021Q is not set
-CONFIG_XSCALE_PMU=y
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/pxa/image/Makefile b/target/linux/pxa/image/Makefile
deleted file mode 100644
index 74edb62be..000000000
--- a/target/linux/pxa/image/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Copyright (C) 2008-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/image.mk
-
-define Image/Prepare
-	cp $(LINUX_DIR)/arch/arm/boot/uImage $(KDIR)/uImage
-endef
-
-define Image/BuildKernel
-	cp $(KDIR)/uImage $(BIN_DIR)/$(IMG_PREFIX)-uImage
-endef
-
-define Image/Build
-	$(call Image/Build/$(1),$(1))
-endef
-
-define Image/Build/jffs2-64k
-	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(1).img bs=64k conv=sync
-endef
-
-define Image/Build/jffs2-128k
-	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(1).img bs=128k conv=sync
-endef
-
-define Image/Build/squashfs
-	$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
-	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(1).img bs=128k conv=sync
-endef
-
-$(eval $(call BuildImage))
diff --git a/target/linux/pxa/patches/001-gumstix_verdex_pro_arch_support.patch b/target/linux/pxa/patches/001-gumstix_verdex_pro_arch_support.patch
deleted file mode 100644
index aa05cfcfe..000000000
--- a/target/linux/pxa/patches/001-gumstix_verdex_pro_arch_support.patch
+++ /dev/null
@@ -1,837 +0,0 @@
-From 4f4bb58cba3a6c44e9f9f113609287d9d50be9c4 Mon Sep 17 00:00:00 2001
-From: Joseph Kortje <jpktech@rogers.com>
-Date: Wed, 28 Oct 2009 21:11:28 -0400
-Subject: [PATCH] [ARM] Gumstix Verdex Pro arch support
-
-add an option for Verdex Pro when ARCH_GUMSTIX is selected, and
-factor earlier Gumstix support into a seperate option
-
-Signed-off-by: Bobby Powers <bobbypowers@gmail.com>
----
- arch/arm/mach-pxa/Kconfig                   |   29 +-
- arch/arm/mach-pxa/Makefile                  |    3 +-
- arch/arm/mach-pxa/gumstix-verdex.c          |  749 +++++++++++++++++++++++++++
- arch/arm/mach-pxa/include/mach/mfp-pxa27x.h |    1 +
- 4 files changed, 772 insertions(+), 10 deletions(-)
- create mode 100644 arch/arm/mach-pxa/gumstix-verdex.c
-
---- a/arch/arm/mach-pxa/Kconfig
-+++ b/arch/arm/mach-pxa/Kconfig
-@@ -32,23 +32,34 @@ endmenu
- endif
- 
- config ARCH_GUMSTIX
--	bool "Gumstix XScale 255 boards"
--	select PXA25x
-+	bool "Gumstix boards"
- 	help
--	  Say Y here if you intend to run this kernel on
--	  Basix, Connex, ws-200ax, ws-400ax systems
-+        Say Y here if you intend to run this kernel on a
-+	  gumstix computer.
- 
--choice
--	prompt "Gumstix Carrier/Expansion Board"
- 	depends on ARCH_GUMSTIX
- 
--config GUMSTIX_AM200EPD
-+config MACH_GUMSTIX_F
-+	bool "Gumstix Basix/Connex ..."
-+	depends on ARCH_GUMSTIX
-+	select PXA25x
-+
-+ choice
-+	prompt "Gumstix Carrier/Expansion Board"
-+	depends on MACH_GUMSTIX_F
-+
-+ config GUMSTIX_AM200EPD
- 	bool "Enable AM200EPD board support"
- 
--config GUMSTIX_AM300EPD
-+ config GUMSTIX_AM300EPD
- 	bool "Enable AM300EPD board support"
- 
--endchoice
-+ endchoice
-+
-+config MACH_GUMSTIX_VERDEX
-+	bool "Gumstix VERDEX ..."
-+	depends on ARCH_GUMSTIX
-+	select PXA27x
- 
- config MACH_INTELMOTE2
- 	bool "Intel Mote 2 Platform"
---- a/arch/arm/mach-pxa/Makefile
-+++ b/arch/arm/mach-pxa/Makefile
-@@ -25,7 +25,8 @@ obj-$(CONFIG_CPU_PXA320)	+= pxa320.o
- obj-$(CONFIG_CPU_PXA930)	+= pxa930.o
- 
- # Specific board support
--obj-$(CONFIG_ARCH_GUMSTIX)	+= gumstix.o
-+obj-$(CONFIG_MACH_GUMSTIX_F)	+= gumstix.o
-+obj-$(CONFIG_MACH_GUMSTIX_VERDEX)	+= gumstix-verdex.o
- obj-$(CONFIG_GUMSTIX_AM200EPD)	+= am200epd.o
- obj-$(CONFIG_GUMSTIX_AM300EPD)	+= am300epd.o
- obj-$(CONFIG_ARCH_LUBBOCK)	+= lubbock.o
---- /dev/null
-+++ b/arch/arm/mach-pxa/gumstix-verdex.c
-@@ -0,0 +1,749 @@
-+/*
-+ *  linux/arch/arm/mach-pxa/gumstix-verdex.c
-+ *
-+ *  Support for the Gumstix verdex motherboard.
-+ *
-+ *  Original Author:  Craig Hughes
-+ *  Created:          Feb 14, 2008
-+ *  Copyright:        Craig Hughes
-+ *
-+ *  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.
-+ *
-+ *  Implemented based on lubbock.c by Nicolas Pitre and code from Craig
-+ *  Hughes
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+#include <linux/interrupt.h>
-+#include <linux/mtd/mtd.h>
-+#include <linux/mtd/partitions.h>
-+#include <linux/i2c/tsc2007.h>
-+
-+#include <asm/setup.h>
-+#include <asm/memory.h>
-+#include <asm/mach-types.h>
-+#include <asm/irq.h>
-+#include <asm/sizes.h>
-+#include <asm/io.h>
-+
-+#include <asm/mach/arch.h>
-+#include <asm/mach/map.h>
-+#include <asm/mach/irq.h>
-+#include <asm/mach/flash.h>
-+
-+#include <mach/mmc.h>
-+#include <mach/udc.h>
-+#include <mach/pxafb.h>
-+#include <mach/ohci.h>
-+#include <plat/i2c.h>
-+#include <mach/pxa27x.h>
-+#include <mach/pxa27x-udc.h>
-+#include <mach/gpio.h>
-+
-+#include <mach/gumstix.h>
-+
-+#include "generic.h"
-+
-+#include <linux/delay.h>
-+
-+#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
-+
-+#include <linux/smsc911x.h>
-+
-+static struct resource verdex_smsc911x_resources[] = {
-+	[0] = {
-+		.name	= "smsc911x-memory",
-+		.start  = PXA_CS1_PHYS,
-+		.end    = PXA_CS1_PHYS + 0x000fffff,
-+		.flags  = IORESOURCE_MEM,
-+	},
-+	[1] = {
-+		.start  = IRQ_GPIO(GPIO_GUMSTIX_ETH0),
-+		.end    = IRQ_GPIO(GPIO_GUMSTIX_ETH0),
-+		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_LOWEDGE,
-+	},
-+};
-+
-+static struct smsc911x_platform_config verdex_smsc911x_config = {
-+	.irq_polarity	= SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
-+	.irq_type	= SMSC911X_IRQ_TYPE_PUSH_PULL,
-+	.flags		= SMSC911X_USE_16BIT | SMSC911X_SAVE_MAC_ADDRESS,
-+	.phy_interface	= PHY_INTERFACE_MODE_MII,
-+};
-+
-+static struct platform_device verdex_smsc911x_device = {
-+	.name		= "smsc911x",
-+	.id		= -1,
-+	.num_resources	= ARRAY_SIZE(verdex_smsc911x_resources),
-+	.resource	= verdex_smsc911x_resources,
-+	.dev		= {
-+		.platform_data = &verdex_smsc911x_config,
-+	},
-+};
-+
-+static void __init verdex_init_smsc911x(void)
-+{
-+
-+        printk(KERN_INFO "Initializing Gumstix verdex smsc911x\n");
-+
-+	if (gpio_request(GPIO_GUMSTIX_ETH0_RST, "SMSC911x_ETH0_RST") != 0) {
-+		printk(KERN_ERR "could not obtain gpio for SMSC911x_ETH0_RST\n");
-+		goto err_request_gpio_eth0_rst;
-+	}
-+
-+	if (gpio_request(GPIO_GUMSTIX_ETH0, "SMSC911x_ETH0_IRQ") != 0) {
-+		printk(KERN_ERR "could not obtain gpio for SMSC911x_ETH0_IRQ\n");
-+		goto err_request_gpio_eth0_irq;
-+	}
-+
-+	if (gpio_direction_output(GPIO_GUMSTIX_ETH0_RST, 0) != 0) {
-+		printk(KERN_ERR "could not set SMSC911x_ETH0_RST pin to output\n");
-+		goto err_dir;
-+	}
-+
-+	gpio_set_value(GPIO_GUMSTIX_ETH0_RST, 0);
-+
-+	msleep(500); // Hold RESET for at least 200ms
-+
-+	gpio_set_value(GPIO_GUMSTIX_ETH0_RST, 1);
-+
-+	msleep(50);
-+
-+	if (gpio_direction_input(GPIO_GUMSTIX_ETH0) != 0) {
-+		printk(KERN_ERR "could not set SMSC911x_ETH0_IRQ pin to input\n");
-+		goto err_dir;
-+	}
-+
-+	gpio_export(GPIO_GUMSTIX_ETH0, 0);
-+	platform_device_register(&verdex_smsc911x_device);
-+	return;
-+
-+err_dir:
-+	gpio_free(GPIO_GUMSTIX_ETH0_RST);
-+
-+err_request_gpio_eth0_irq:
-+	gpio_free(GPIO_GUMSTIX_ETH0);
-+
-+err_request_gpio_eth0_rst:
-+	return;
-+}
-+
-+#else
-+static void __init verdex_init_smsc911x(void) { return; }
-+#endif
-+
-+static unsigned long verdex_pin_config[] = {
-+    /* MMC */
-+    GPIO32_MMC_CLK,
-+    GPIO112_MMC_CMD,
-+    GPIO92_MMC_DAT_0,
-+    GPIO109_MMC_DAT_1,
-+    GPIO110_MMC_DAT_2,
-+    GPIO111_MMC_DAT_3,
-+
-+    /* BTUART */
-+    GPIO42_BTUART_RXD,
-+    GPIO43_BTUART_TXD,
-+    GPIO44_BTUART_CTS,
-+    GPIO45_BTUART_RTS,
-+
-+    /* STUART */
-+    GPIO46_STUART_RXD,
-+    GPIO47_STUART_TXD,
-+
-+    /* FFUART */
-+    GPIO34_FFUART_RXD,
-+    GPIO39_FFUART_TXD,
-+
-+    /* SSP 2 */
-+    GPIO19_SSP2_SCLK,
-+    GPIO14_SSP2_SFRM,
-+    GPIO13_SSP2_TXD,
-+    GPIO11_SSP2_RXD,
-+
-+    /* SDRAM and local bus */
-+    GPIO49_nPWE,
-+    GPIO15_nCS_1,
-+
-+    /* I2C */
-+    GPIO117_I2C_SCL,
-+    GPIO118_I2C_SDA,
-+
-+    /* PWM 0 */
-+    GPIO16_PWM0_OUT,
-+
-+    /* BRIGHTNESS */
-+    GPIO17_PWM1_OUT,
-+
-+    /* LCD */
-+    GPIO58_LCD_LDD_0,
-+    GPIO59_LCD_LDD_1,
-+    GPIO60_LCD_LDD_2,
-+    GPIO61_LCD_LDD_3,
-+    GPIO62_LCD_LDD_4,
-+    GPIO63_LCD_LDD_5,
-+    GPIO64_LCD_LDD_6,
-+    GPIO65_LCD_LDD_7,
-+    GPIO66_LCD_LDD_8,
-+    GPIO67_LCD_LDD_9,
-+    GPIO68_LCD_LDD_10,
-+    GPIO69_LCD_LDD_11,
-+    GPIO70_LCD_LDD_12,
-+    GPIO71_LCD_LDD_13,
-+    GPIO72_LCD_LDD_14,
-+    GPIO73_LCD_LDD_15,
-+    GPIO74_LCD_FCLK,
-+    GPIO75_LCD_LCLK,
-+    GPIO76_LCD_PCLK,
-+#ifdef CONFIG_FB_PXA_SHARP_LQ043_PSP
-+    /* DISP must be always high while screen is on */
-+    /* Done below in verdex_init */
-+#else
-+    GPIO77_LCD_BIAS,
-+#endif
-+
-+};
-+
-+#if defined(CONFIG_PCMCIA_PXA2XX) || defined(CONFIG_PCMCIA_PXA2XX_MODULE)
-+
-+static unsigned long gpio_ntschg_0[] = {
-+	GPIO104_GPIO,			// pxa_gpio_mode(GPIO_GUMSTIX_nCD_0_MD);
-+};
-+
-+static unsigned long gpio_ntschg_1[] = {
-+	GPIO18_GPIO,			// pxa_gpio_mode(GPIO_GUMSTIX_nSTSCHG_1_MD);
-+	GPIO36_GPIO,			// pxa_gpio_mode(GPIO_GUMSTIX_nCD_1_MD);
-+	GPIO27_GPIO,			// pxa_gpio_mode(GPIO_GUMSTIX_PRDY_nBSY_1_MD);
-+};
-+
-+static unsigned long gpio_prdy_nbsy_old[] = {
-+	GPIO111_GPIO,			// pxa_gpio_mode(GPIO_GUMSTIX_nSTSCHG_0_MD);
-+	GPIO109_GPIO,			// pxa_gpio_mode(GPIO_GUMSTIX_PRDY_nBSY_0_OLD_MD);
-+};
-+
-+static unsigned long gpio_prdy_nbsy[] = {
-+	GPIO96_GPIO,			// pxa_gpio_mode(GPIO_GUMSTIX_PRDY_nBSY_0_MD);
-+};
-+
-+static unsigned long gpio_nhw_init[] = {
-+	GPIO48_nPOE,			// pxa_gpio_mode(GPIO_GUMSTIX_nPOE_MD);
-+	GPIO102_nPCE_1,			// pxa_gpio_mode(GPIO_GUMSTIX_nPCE_1_MD);
-+	GPIO105_nPCE_2,			// pxa_gpio_mode(GPIO_GUMSTIX_nPCE_2_MD);
-+	GPIO104_GPIO,			// pxa_gpio_mode(GPIO_GUMSTIX_nCD_0_MD);
-+
-+	GPIO49_nPWE,			// pxa_gpio_mode(GPIO_GUMSTIX_nPWE_MD);
-+	GPIO50_nPIOR,			// pxa_gpio_mode(GPIO_GUMSTIX_nPIOR_MD);
-+	GPIO51_nPIOW,			// pxa_gpio_mode(GPIO_GUMSTIX_nPIOW_MD);
-+	GPIO79_PSKTSEL,			// pxa_gpio_mode(GPIO_GUMSTIX_pSKTSEL_MD);
-+	GPIO55_nPREG,			// pxa_gpio_mode(GPIO_GUMSTIX_nPREG_MD);
-+	GPIO56_nPWAIT,			// pxa_gpio_mode(GPIO_GUMSTIX_nPWAIT_MD);
-+	GPIO57_nIOIS16,			// pxa_gpio_mode(GPIO_GUMSTIX_nIOIS16_MD);
-+};
-+
-+static	int net_cf_vx_mode = 0;
-+static	int pcmcia_cf_nr = 2; 
-+
-+inline void __init gumstix_pcmcia_cpld_clk(void)
-+{
-+	GPCR(GPIO_GUMSTIX_nPOE) = GPIO_bit(GPIO_GUMSTIX_nPOE);
-+	GPSR(GPIO_GUMSTIX_nPOE) = GPIO_bit(GPIO_GUMSTIX_nPOE);
-+}
-+
-+inline unsigned char __init gumstix_pcmcia_cpld_read_bits(int bits)
-+{
-+	unsigned char result = 0;
-+	unsigned int shift = 0;
-+	while(bits--)
-+	{
-+		result |= !!(GPLR(GPIO_GUMSTIX_nCD_0) & GPIO_bit(GPIO_GUMSTIX_nCD_0)) << shift;
-+		shift ++;
-+		gumstix_pcmcia_cpld_clk();
-+	}
-+	printk("CPLD responded with: %02x\n",result);
-+	return result;
-+}
-+
-+/* We use the CPLD on the CF-CF card to read a value from a shift register.  If we can read that
-+ * magic sequence, then we have 2 CF cards; otherwise we assume just one
-+ * The CPLD will send the value of the shift register on GPIO11 (the CD line for slot 0)
-+ * when RESET is held in reset.  We use GPIO48 (nPOE) as a clock signal,
-+ * GPIO52/53 (card enable for both cards) to control read/write to the shift register
-+ */
-+static void __init gumstix_count_cards(void)
-+{
-+
-+	if ((gpio_request(GPIO_GUMSTIX_nPOE, "GPIO_GUMSTIX_nPOE") == 0) &&
-+	    (gpio_direction_output(GPIO_GUMSTIX_nPOE, 1) == 0))
-+		gpio_export(GPIO_GUMSTIX_nPOE, 0);
-+	else
-+		printk(KERN_ERR "could not obtain gpio for GPIO_GUMSTIX_nPOE\n");
-+	
-+	if ((gpio_request(GPIO_GUMSTIX_nPCE_1, "GPIO_GUMSTIX_nPCE_1") == 0) &&
-+	    (gpio_direction_output(GPIO_GUMSTIX_nPCE_1, 1) == 0))
-+		gpio_export(GPIO_GUMSTIX_nPCE_1, 0);
-+	else
-+		printk(KERN_ERR "could not obtain gpio for GPIO_GUMSTIX_nPCE_1\n");
-+
-+	if ((gpio_request(GPIO_GUMSTIX_nPCE_2, "GPIO_GUMSTIX_nPCE_2") == 0) &&
-+	    (gpio_direction_output(GPIO_GUMSTIX_nPCE_2, 1) == 0))
-+		gpio_export(GPIO_GUMSTIX_nPCE_2, 0);
-+	else
-+		printk(KERN_ERR "could not obtain gpio for GPIO_GUMSTIX_nPCE_2\n");
-+
-+	if ((gpio_request(GPIO_GUMSTIX_nCD_0, "GPIO_GUMSTIX_nCD_0") == 0) &&
-+	    (gpio_direction_input(GPIO_GUMSTIX_nCD_0) == 0))
-+		gpio_export(GPIO_GUMSTIX_nCD_0, 0);
-+	else
-+		printk(KERN_ERR "could not obtain gpio for GPIO_GUMSTIX_nCD_0\n");
-+
-+	if (net_cf_vx_mode) {
-+		if ((gpio_request(GPIO_GUMSTIX_CF_OLD_RESET, "GPIO_GUMSTIX_CF_OLD_RESET") == 0) &&
-+	    	    (gpio_direction_output(GPIO_GUMSTIX_CF_OLD_RESET, 1) == 0)) {
-+			gpio_export(GPIO_GUMSTIX_CF_OLD_RESET, 0);
-+		} else {
-+			printk(KERN_ERR "could not obtain gpio for GPIO_GUMSTIX_CF_OLD_RESET\n");
-+		}
-+	} else {
-+		if ((gpio_request(GPIO_GUMSTIX_CF_RESET, "GPIO_GUMSTIX_CF_RESET") == 0) &&
-+	    	    (gpio_direction_output(GPIO_GUMSTIX_CF_RESET, 1) == 0)) {
-+			gpio_export(GPIO_GUMSTIX_CF_RESET, 0);
-+		} else {
-+			printk(KERN_ERR "could not obtain gpio for GPIO_GUMSTIX_CF_RESET\n");
-+		}
-+	}
-+
-+	// Setup the shift register
-+	GPSR(GPIO_GUMSTIX_nPCE_1) = GPIO_bit(GPIO_GUMSTIX_nPCE_1);
-+	GPCR(GPIO_GUMSTIX_nPCE_2) = GPIO_bit(GPIO_GUMSTIX_nPCE_2);
-+
-+	// Tick the clock to program the shift register
-+	gumstix_pcmcia_cpld_clk();
-+
-+	// Now set shift register into read mode
-+	GPCR(GPIO_GUMSTIX_nPCE_1) = GPIO_bit(GPIO_GUMSTIX_nPCE_1);
-+	GPSR(GPIO_GUMSTIX_nPCE_2) = GPIO_bit(GPIO_GUMSTIX_nPCE_2);
-+
-+	// We can read the bits now -- 0xC2 means "Dual compact flash"
-+	if(gumstix_pcmcia_cpld_read_bits(8) != 0xC2)
-+	{
-+		// We do not have 2 CF slots
-+		pcmcia_cf_nr = 1;
-+	}
-+
-+	udelay(50);
-+
-+	if (net_cf_vx_mode) {
-+		gpio_set_value(GPIO_GUMSTIX_CF_OLD_RESET, 0);
-+		gpio_free(GPIO_GUMSTIX_CF_OLD_RESET);
-+	} else {
-+		gpio_set_value(GPIO_GUMSTIX_CF_RESET, 0);
-+		gpio_free(GPIO_GUMSTIX_CF_RESET);
-+	}
-+
-+	printk(KERN_INFO "found %d CF slots\n", pcmcia_cf_nr);
-+
-+	gpio_free(GPIO_GUMSTIX_nPCE_2);
-+	gpio_free(GPIO_GUMSTIX_nPCE_1);
-+	gpio_free(GPIO_GUMSTIX_nPOE);
-+	return;
-+}
-+
-+#define	SMC_IO_EXTENT	16
-+#define	BANK_SELECT	14
-+
-+static void __init verdex_pcmcia_pin_config(void)
-+{
-+	struct resource *res;
-+	void *network_controller_memory;
-+	struct platform_device *pdev = &verdex_smsc911x_device;
-+
-+        printk(KERN_INFO "Initializing Gumstix verdex pcmcia\n");
-+
-+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if (res == NULL) {
-+		printk(KERN_ERR "no memory resource defined\n");
-+		goto err_done;
-+	}
-+
-+	res = request_mem_region(res->start, SMC_IO_EXTENT, "smc91x probe");
-+	if (res == NULL) {
-+		printk(KERN_ERR "failed to request memory resource\n");
-+		goto err_done;
-+	}
-+
-+	// We check for the possibility of SMSC91c111 (reg base offset 0x300 from CS1 base)
-+	network_controller_memory = ioremap(res->start + 0x300, SMC_IO_EXTENT);
-+	if (network_controller_memory == NULL) {
-+		printk(KERN_ERR "failed to ioremap() registers\n");
-+		goto err_free_mem;
-+	}
-+
-+	// Look for the special 91c111 value in the bank select register
-+	if((0xff00 & readw(network_controller_memory+BANK_SELECT)) == 0x3300) {
-+		printk(KERN_INFO "Detected netCF-vx board: pcmcia using older GPIO configuration\n");
-+		net_cf_vx_mode = 1;
-+	} else {
-+		printk(KERN_INFO "Not netCF-vx board: pcmcia using newer GPIO configuration\n");
-+		net_cf_vx_mode = 0;
-+	}
-+
-+	iounmap(network_controller_memory);
-+err_free_mem:
-+	release_mem_region(res->start, SMC_IO_EXTENT);
-+err_done:
-+
-+	gumstix_count_cards();	// this can update pcmcia_cf_nr
-+
-+	// If pcmcia_cf_nr is 1 then we do not have 2 CF slots
-+	// Note: logic sequence was altered from previous kernel revs
-+	// so that this works as intended now.
-+	if (pcmcia_cf_nr != 0)
-+	{
-+		pxa2xx_mfp_config(ARRAY_AND_SIZE(gpio_ntschg_0));
-+
-+		if(net_cf_vx_mode)
-+			pxa2xx_mfp_config(gpio_prdy_nbsy_old, 1);
-+		else
-+			pxa2xx_mfp_config(gpio_prdy_nbsy, 1);
-+
-+	} else {
-+		// Note: this reconfigures pin GPIO18 to be GPIO-IN so make
-+		// sure that this only gets done for the old dual slot board
-+		// since that pin is an active AF1 out-mode signal (RDY) on
-+		// newer boards and changing the pin mode on the newer boards
-+		// would result in memory corruption for the NIC (and hang during
-+		// PHY test). 
-+		pxa2xx_mfp_config(ARRAY_AND_SIZE(gpio_ntschg_1));
-+	}
-+
-+	pxa2xx_mfp_config(ARRAY_AND_SIZE(gpio_nhw_init));
-+	return;
-+}
-+
-+int __init gumstix_get_cf_cards(void)
-+{
-+	return pcmcia_cf_nr;
-+}
-+EXPORT_SYMBOL(gumstix_get_cf_cards);
-+
-+#ifdef CONFIG_MACH_GUMSTIX_VERDEX
-+int __init gumstix_check_if_netCF_vx(void)
-+{
-+	return net_cf_vx_mode;
-+}
-+EXPORT_SYMBOL(gumstix_check_if_netCF_vx);
-+#endif
-+
-+#endif
-+
-+#if defined(CONFIG_FB_PXA_SHARP_LQ043_PSP) || defined(CONFIG_FB_PXA_SAMSUNG_LTE430WQ_F0C)
-+static void gumstix_lcd_backlight(int on_or_off)
-+{
-+	int err;
-+	err = gpio_request(17, "LCD BACKLIGHT");
-+	if (err) {
-+		//pr_warning("Gumstix Verdex: Failed to request LCD Backlight gpio\n");
-+		return;
-+	}
-+
-+	if(on_or_off) {
-+		gpio_direction_input(17);
-+	} else {
-+		GPCR(17) = GPIO_bit(17);
-+		gpio_direction_output(17, 0);
-+		GPCR(17) = GPIO_bit(17);
-+	}
-+
-+	return;	
-+}
-+#endif
-+
-+#ifdef CONFIG_FB_PXA_ALPS_CDOLLAR
-+static struct pxafb_mode_info gumstix_fb_mode = {
-+	.pixclock	= 300000,
-+	.xres		= 240,
-+	.yres		= 320,
-+	.bpp		= 16,
-+	.hsync_len	= 2,
-+	.left_margin	= 1,
-+	.right_margin	= 1,
-+	.vsync_len	= 3,
-+	.upper_margin	= 0,
-+	.lower_margin	= 0,
-+	.sync		= FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
-+};
-+
-+static struct pxafb_mach_info gumstix_fb_info = {
-+	.modes		= &gumstix_fb_mode,
-+	.num_modes	= 1,
-+	.lccr0		= LCCR0_Pas | LCCR0_Sngl | LCCR0_Color,
-+	.lccr3		= LCCR3_PixFlEdg,
-+};
-+#elif defined(CONFIG_FB_PXA_SHARP_LQ043_PSP)
-+static struct pxafb_mode_info gumstix_fb_mode = {
-+	.pixclock	= 110000,
-+	.xres		= 480,
-+	.yres		= 272,
-+	.bpp		= 16,
-+	.hsync_len	= 41,
-+	.left_margin	= 2,
-+	.right_margin	= 2,
-+	.vsync_len	= 10,
-+	.upper_margin	= 2,
-+	.lower_margin	= 2,
-+	.sync		= 0, // Hsync and Vsync both active low
-+};
-+
-+static struct pxafb_mach_info gumstix_fb_info = {
-+	.modes			= &gumstix_fb_mode,
-+	.num_modes		= 1,
-+	.lccr0			= LCCR0_Act | LCCR0_Sngl | LCCR0_Color,
-+	.lccr3			= LCCR3_OutEnH | LCCR3_PixFlEdg | (0 << 30),
-+	.pxafb_backlight_power	= &gumstix_lcd_backlight,
-+};
-+#elif defined(CONFIG_FB_PXA_SAMSUNG_LTE430WQ_F0C)
-+static struct pxafb_mode_info gumstix_fb_mode = {
-+	.pixclock	= 108696, // 9.2MHz typical DOTCLK from datasheet
-+	.xres		= 480,
-+	.hsync_len	= 41, // HLW from datasheet: 41 typ
-+	.left_margin	= 4, // HBP - HLW from datasheet: 45 - 41 = 4
-+	.right_margin	= 8, // HFP from datasheet: 8 typ
-+	.yres		= 272,
-+	.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
-+	.bpp		= 16,
-+	.sync		= 0, // Hsync and Vsync both active low
-+};
-+
-+static struct pxafb_mach_info gumstix_fb_info = {
-+	.modes			= &gumstix_fb_mode,
-+	.num_modes		= 1,
-+	.lccr0			= LCCR0_Act | LCCR0_Sngl | LCCR0_Color,
-+	.lccr3			= LCCR3_OutEnH | LCCR3_PixFlEdg | (0 << 30),
-+	.pxafb_backlight_power	= &gumstix_lcd_backlight,
-+};
-+#endif
-+
-+static struct platform_device verdex_audio_device = {
-+    .name       = "pxa2xx-ac97",
-+    .id         = -1,
-+};
-+
-+static struct platform_device *devices[] __initdata = {
-+    &verdex_audio_device,
-+};
-+
-+/* PXA27x OHCI controller setup */
-+#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
-+static int ohci_verdex_init(struct device *dev)
-+{
-+	// Turn on port 2 in host mode
-+	UP2OCR = UP2OCR_HXS | UP2OCR_HXOE | UP2OCR_DPPDE | UP2OCR_DMPDE;
-+
-+	/* See drivers/usb/host/ohci-pxa27x.c for further details but
-+           ENABLE_PORT_ALL flag is equivalent to using this old sequence:
-+ 	UHCHR = (UHCHR) &
-+		~(UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSEP3 | UHCHR_SSE);
-+	*/
-+	return 0;
-+}
-+
-+static struct pxaohci_platform_data verdex_ohci_platform_data = {
-+	.port_mode	= PMM_PERPORT_MODE,
-+	.flags		= ENABLE_PORT_ALL,
-+	.init		= ohci_verdex_init,
-+};
-+
-+static void __init verdex_ohci_init(void)
-+{
-+	pxa_set_ohci_info(&verdex_ohci_platform_data);
-+}
-+#else
-+static void __init verdex_ohci_init(void) {
-+    printk(KERN_INFO "Gumstix verdex host usb ohci is disabled\n");
-+}
-+#endif
-+
-+
-+#if defined(CONFIG_MMC_PXA) || defined(CONFIG_MMC_PXA_MODULE)
-+static struct pxamci_platform_data verdex_mci_platform_data;
-+
-+static int verdex_mci_init(struct device *dev, irq_handler_t detect_int,
-+                void *data)
-+{
-+    /* GPIO setup for MMC on the 120-pin connector is done in verdex_init.
-+     * There is no card detect on a uSD connector so no interrupt to register.
-+     * There is no WP detect GPIO line either.
-+     */
-+
-+    return 0;
-+}
-+
-+static struct pxamci_platform_data verdex_mci_platform_data = {
-+    .ocr_mask   = MMC_VDD_32_33|MMC_VDD_33_34,
-+    .init       = verdex_mci_init,
-+};
-+
-+static void __init verdex_mmc_init(void)
-+{
-+    pxa_set_mci_info(&verdex_mci_platform_data);
-+}
-+#else
-+static void __init verdex_mmc_init(void)
-+{
-+    printk(KERN_INFO "Gumstix verdex mmc disabled\n");
-+}
-+#endif
-+
-+#if defined(CONFIG_USB_GADGET_PXA2XX) || defined(CONFIG_USB_GADGET_PXA2XX_MODULE)
-+static struct pxa2xx_udc_mach_info verdex_udc_info __initdata = {
-+    .gpio_vbus      = GPIO35,
-+    .gpio_pullup    = GPIO41,
-+};
-+
-+static void __init verdex_udc_init(void)
-+{
-+    pxa_set_udc_info(&verdex_udc_info);
-+}
-+#else
-+static void __init verdex_udc_init(void)
-+{
-+    printk(KERN_INFO "Gumstix verdex udc is disabled\n");
-+}
-+#endif
-+
-+#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
-+
-+#if defined(CONFIG_TOUCHSCREEN_TSC2003) || defined(CONFIG_TOUCHSCREEN_TSC2003_MODULE)
-+
-+#define VERDEX_GPIO_PENDOWN	16
-+
-+static int tsc2003_init_platform_hw(void)
-+{
-+	return 0;
-+}
-+
-+static void tsc2003_exit_platform_hw(void)
-+{
-+	return;
-+}
-+
-+static void tsc2003_clear_penirq(void)
-+{
-+	return;
-+}
-+
-+static int tsc2003_get_pendown_state(void)
-+{
-+	return !gpio_get_value(VERDEX_GPIO_PENDOWN);
-+}
-+
-+static struct tsc2007_platform_data tsc2003_config = {
-+	.model = 2003,
-+	.x_plate_ohms = 100,
-+	.get_pendown_state	= tsc2003_get_pendown_state,
-+	.clear_penirq		= tsc2003_clear_penirq,
-+	.init_platform_hw	= tsc2003_init_platform_hw,
-+	.exit_platform_hw	= tsc2003_exit_platform_hw,
-+};
-+#endif
-+
-+static struct i2c_board_info __initdata verdex_i2c_board_info[] = {
-+#if defined(CONFIG_RTC_DRV_DS1307) || defined(CONFIG_RTC_DRV_DS1307_MODULE)
-+
-+	{
-+		I2C_BOARD_INFO("rtc-ds1307", 0x68),
-+	},
-+#endif
-+#if defined(CONFIG_TOUCHSCREEN_TSC2003) || defined(CONFIG_TOUCHSCREEN_TSC2003_MODULE)
-+	{
-+		I2C_BOARD_INFO("tsc2003", 0x48),
-+		.platform_data	= &tsc2003_config,
-+		.irq		= IRQ_GPIO(VERDEX_GPIO_PENDOWN),
-+	},
-+#endif
-+};
-+
-+static struct i2c_pxa_platform_data verdex_i2c_pwr_info = {
-+	.fast_mode = 1,
-+};
-+
-+static struct i2c_pxa_platform_data verdex_i2c_info = {
-+	.fast_mode = 1,
-+};
-+
-+static void __init verdex_i2c_init(void)
-+{
-+        printk(KERN_INFO "Initializing Gumstix verdex i2c\n");
-+
-+#if defined(CONFIG_TOUCHSCREEN_TSC2003) || defined(CONFIG_TOUCHSCREEN_TSC2003_MODULE)
-+	if ((gpio_request(VERDEX_GPIO_PENDOWN, "TSC2003_PENDOWN") == 0) &&
-+	    (gpio_direction_input(VERDEX_GPIO_PENDOWN) == 0)) {
-+		gpio_export(VERDEX_GPIO_PENDOWN, 0);
-+	} else {
-+		printk(KERN_ERR "could not obtain gpio for TSC2003_PENDOWN\n");
-+		return;
-+	}
-+#endif
-+
-+	i2c_register_board_info(0, verdex_i2c_board_info,
-+				ARRAY_SIZE(verdex_i2c_board_info));
-+	pxa_set_i2c_info(&verdex_i2c_info);
-+	pxa27x_set_i2c_power_info(&verdex_i2c_pwr_info);
-+}
-+#else
-+static inline void verdex_i2c_init(void) {}
-+#endif
-+
-+#if defined(CONFIG_PCMCIA_PXA2XX) || defined(CONFIG_PCMCIA_PXA2XX_MODULE)
-+static void __init verdex_pcmcia_init(void)
-+{
-+	verdex_pcmcia_pin_config();
-+}
-+#else
-+static void __init verdex_pcmcia_init(void) {
-+	printk(KERN_INFO "Gumstix verdex pcmcia is disabled\n");
-+}
-+#endif
-+
-+
-+static void __init verdex_init(void)
-+{
-+    pxa2xx_mfp_config(ARRAY_AND_SIZE(verdex_pin_config));
-+
-+#ifdef CONFIG_FB_PXA_SHARP_LQ043_PSP
-+    /* DISP must be always high while screen is on */
-+	gpio_direction_output(GPIO77, 0);
-+	GPSR(GPIO77) = GPIO_bit(GPIO77);
-+#endif 
-+    verdex_udc_init();
-+    verdex_mmc_init();
-+    verdex_ohci_init();
-+    verdex_i2c_init();
-+    verdex_init_smsc911x();
-+    verdex_pcmcia_init();
-+ 
-+#if defined(CONFIG_FB_PXA_ALPS_CDOLLAR) || defined(CONFIG_FB_PXA_SHARP_LQ043_PSP) || defined(CONFIG_FB_PXA_SAMSUNG_LTE430WQ_F0C)
-+        printk(KERN_INFO "Initializing Gumstix verdex FB info\n");
-+	set_pxa_fb_info(&gumstix_fb_info);
-+#endif
-+    printk(KERN_INFO "Initializing Gumstix platform_add_devices\n");
-+    (void) platform_add_devices(devices, ARRAY_SIZE(devices));
-+}
-+
-+MACHINE_START(GUMSTIX, "Gumstix verdex")
-+    .phys_io        = 0x40000000,
-+    .boot_params    = 0xa0000100, /* match u-boot bi_boot_params */
-+    .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
-+    .map_io         = pxa_map_io,
-+    .init_irq       = pxa27x_init_irq,
-+    .timer          = &pxa_timer,
-+    .init_machine   = verdex_init,
-+MACHINE_END
-+
---- a/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h
-+++ b/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h
-@@ -109,6 +109,7 @@
- #define GPIO54_nPCE_2		MFP_CFG_OUT(GPIO54, AF2, DRIVE_HIGH)
- #define GPIO78_nPCE_2		MFP_CFG_OUT(GPIO78, AF1, DRIVE_HIGH)
- #define GPIO87_nPCE_2		MFP_CFG_IN(GPIO87, AF1)
-+#define GPIO105_nPCE_2		MFP_CFG_OUT(GPIO105, AF1, DRIVE_HIGH)
- #define GPIO55_nPREG		MFP_CFG_OUT(GPIO55, AF2, DRIVE_HIGH)
- #define GPIO50_nPIOR		MFP_CFG_OUT(GPIO50, AF2, DRIVE_HIGH)
- #define GPIO51_nPIOW		MFP_CFG_OUT(GPIO51, AF2, DRIVE_HIGH)
diff --git a/target/linux/pxa/patches/002-verdex_lcd_support.patch b/target/linux/pxa/patches/002-verdex_lcd_support.patch
deleted file mode 100644
index 834930703..000000000
--- a/target/linux/pxa/patches/002-verdex_lcd_support.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From eb92a178eceae4e5d18bbb442b8e44cb88457d60 Mon Sep 17 00:00:00 2001
-From: Joseph Kortje <jpktech@rogers.com>
-Date: Wed, 28 Oct 2009 21:25:57 -0400
-Subject: [PATCH] [ARM] Gumstix Verdex LCD config options
-
-add options to Kconfig for Verdex LCD support
-
-Signed-off-by: Bobby Powers <bobbypowers@gmail.com>
----
- drivers/video/Kconfig |   31 +++++++++++++++++++++++++++++++
- 1 files changed, 31 insertions(+), 0 deletions(-)
-
---- a/drivers/video/Kconfig
-+++ b/drivers/video/Kconfig
-@@ -1772,6 +1772,37 @@ config FB_PXA
- 	  say M here and read <file:Documentation/kbuild/modules.txt>.
- 
- 	  If unsure, say N.
-+choice
-+	depends on FB_PXA
-+	prompt "LCD Panel"
-+	default FB_PXA_SAMSUNG_LTE430WQ_F0C
-+
-+config FB_PXA_ALPS_CDOLLAR
-+	boolean "Chris Dollar's ALPS screen"
-+	---help---
-+	  Enable definitions (over-ridable on the kernel command line if
-+	  "PXA LCD command line parameters" is also selected) for an ALPS
-+	  screen which Chris Dollar uses
-+
-+config FB_PXA_SHARP_LQ043_PSP
-+	boolean "SHARP LQ043... series"
-+	---help---
-+	  Enable definitions (over-ridable on the kernel command line if
-+	  "PXA LCD command line parameters" is also selected) for a SHARP
-+	  LQ043... screen, such as the one used by the PSP.  These screens are
-+	  the ones normally sold by gumstix with its boards.
-+
-+config FB_PXA_SAMSUNG_LTE430WQ_F0C
-+	boolean "Samsung LTE430WQ-F0C (standard gumstix LCD)"
-+	---help---
-+	  Enable definitions for a Samsung LTE430WQ-F0C LCD panel, such as the ones resold
-+	  by gumstix for use with their "LCD-Ready" boards.
-+
-+config FB_PXA_NONEOFTHEABOVE
-+	boolean "None of the above"
-+
-+endchoice
-+
- 
- config FB_PXA_OVERLAY
- 	bool "Support PXA27x/PXA3xx Overlay(s) as framebuffer"
diff --git a/target/linux/pxa/patches/003-gumstix_h_verdex_pro_support.patch b/target/linux/pxa/patches/003-gumstix_h_verdex_pro_support.patch
deleted file mode 100644
index 570a40354..000000000
--- a/target/linux/pxa/patches/003-gumstix_h_verdex_pro_support.patch
+++ /dev/null
@@ -1,211 +0,0 @@
-From adb6abbe4e3bc17c20cdc70e4a4357f1633d4970 Mon Sep 17 00:00:00 2001
-From: Joseph Kortje <jpktech@rogers.com>
-Date: Wed, 28 Oct 2009 21:49:11 -0400
-Subject: [PATCH] [ARM] gumstix.h: Verdex Pro support
-
-Added a bunch of ifdefs to support both original gumstix boards
-as well as the Verdex Pro in gumstix.h
-
-Signed-off-by: Bobby Powers <bobbypowers@gmail.com>
----
- arch/arm/mach-pxa/include/mach/gumstix.h |  160 ++++++++++++++++++++++++------
- 1 files changed, 130 insertions(+), 30 deletions(-)
-
---- a/arch/arm/mach-pxa/include/mach/gumstix.h
-+++ b/arch/arm/mach-pxa/include/mach/gumstix.h
-@@ -6,6 +6,9 @@
-  * published by the Free Software Foundation.
-  */
- 
-+#if !defined(__ASM_ARCH_MFP_PXA27X_H) && !defined(__ASM_ARCH_MFP_PXA25X_H)
-+	#error You need to include either mfp-pxa27x.h or mfp-pxa25x.h
-+#endif
- 
- /* BTRESET - Reset line to Bluetooth module, active low signal. */
- #define GPIO_GUMSTIX_BTRESET          7
-@@ -28,9 +31,18 @@ has detected a cable insertion; driven l
- 
- #else
- 
-+#ifndef CONFIG_MACH_GUMSTIX_VERDEX
-+
- #define GPIO_GUMSTIX_USB_GPIOn		35
- #define GPIO_GUMSTIX_USB_GPIOx		41
- 
-+#else
-+
-+#define GPIO_GUMSTIX_USB_GPIOn		100
-+#define GPIO_GUMSTIX_USB_GPIOx		27
-+
-+#endif
-+
- #endif
- 
- /* usb state change */
-@@ -52,48 +64,136 @@ has detected a cable insertion; driven l
-  * ETH_RST provides a hardware reset line to the ethernet chip
-  * ETH is the IRQ line in from the ethernet chip to the PXA
-  */
-+#ifndef CONFIG_MACH_GUMSTIX_VERDEX
- #define GPIO_GUMSTIX_ETH0_RST		80
--#define GPIO_GUMSTIX_ETH0_RST_MD	(GPIO_GUMSTIX_ETH0_RST | GPIO_OUT)
-+#define GPIO_GUMSTIX_ETH0		36
-+#else
-+#define GPIO_GUMSTIX_ETH0_RST		107
-+#define GPIO_GUMSTIX_ETH0		99
-+#endif
- #define GPIO_GUMSTIX_ETH1_RST		52
--#define GPIO_GUMSTIX_ETH1_RST_MD	(GPIO_GUMSTIX_ETH1_RST | GPIO_OUT)
-+#define GPIO_GUMSTIX_ETH1		27
- 
--#define GPIO_GUMSTIX_ETH0		36
-+#define GPIO_GUMSTIX_ETH0_RST_MD	(GPIO_GUMSTIX_ETH0_RST | GPIO_OUT)
-+#define GPIO_GUMSTIX_ETH1_RST_MD	(GPIO_GUMSTIX_ETH1_RST | GPIO_OUT)
- #define GPIO_GUMSTIX_ETH0_MD		(GPIO_GUMSTIX_ETH0 | GPIO_IN)
--#define GUMSTIX_ETH0_IRQ		IRQ_GPIO(GPIO_GUMSTIX_ETH0)
--#define GPIO_GUMSTIX_ETH1		27
- #define GPIO_GUMSTIX_ETH1_MD		(GPIO_GUMSTIX_ETH1 | GPIO_IN)
--#define GUMSTIX_ETH1_IRQ		IRQ_GPIO(GPIO_GUMSTIX_ETH1)
- 
-+#define GUMSTIX_ETH0_IRQ		IRQ_GPIO(GPIO_GUMSTIX_ETH0)
-+#define GUMSTIX_ETH1_IRQ		IRQ_GPIO(GPIO_GUMSTIX_ETH1)
- 
- /* CF reset line */
--#define GPIO8_RESET			8
-+#define GPIO8_CF_RESET			8
-+#define GPIO97_CF_RESET			97
-+#define GPIO110_CF_RESET		110
-+
-+#ifndef CONFIG_MACH_GUMSTIX_VERDEX
-+#define GPIO_GUMSTIX_CF_RESET		GPIO8_CF_RESET
-+#else
-+#define GPIO_GUMSTIX_CF_RESET		GPIO97_CF_RESET
-+#endif
-+
-+#define GPIO_GUMSTIX_CF_OLD_RESET	GPIO110_CF_RESET
-+
-+/* CF signals shared by both sockets */
-+#define GPIO_GUMSTIX_nPOE	48
-+#define GPIO_GUMSTIX_nPWE	49
-+#define GPIO_GUMSTIX_nPIOR	50
-+#define GPIO_GUMSTIX_nPIOW	51
-+
-+#ifndef CONFIG_MACH_GUMSTIX_VERDEX
-+#define GPIO_GUMSTIX_nPCE_1	52
-+#define GPIO_GUMSTIX_nPCE_2	53
-+#define GPIO_GUMSTIX_pSKTSEL	54
-+#else
-+#define GPIO_GUMSTIX_nPCE_1	102
-+#define GPIO_GUMSTIX_nPCE_2	105
-+#define GPIO_GUMSTIX_pSKTSEL	79
-+#endif
-+
-+#define GPIO_GUMSTIX_nPREG	55
-+#define GPIO_GUMSTIX_nPWAIT	56
-+#define GPIO_GUMSTIX_nIOIS16	57
-+
-+/* Pin mode definitions correspond to mfp-pxa2[57]x.h */
-+#define GPIO_GUMSTIX_nPOE_MD	GPIO48_nPOE
-+#define GPIO_GUMSTIX_nPWE_MD	GPIO49_nPWE
-+#define GPIO_GUMSTIX_nPIOR_MD	GPIO50_nPIOR
-+#define GPIO_GUMSTIX_nPIOW_MD	GPIO51_nPIOW
-+
-+#ifndef CONFIG_MACH_GUMSTIX_VERDEX
-+#define GPIO_GUMSTIX_nPCE_1_MD	GPIO52_nPCE_1
-+#define GPIO_GUMSTIX_nPCE_2_MD	GPIO53_nPCE_2
-+#define GPIO_GUMSTIX_pSKTSEL_MD	GPIO54_pSKTSEL
-+#else
-+#define GPIO_GUMSTIX_nPCE_1_MD	GPIO102_nPCE_1
-+#define GPIO_GUMSTIX_nPCE_2_MD	GPIO105_nPCE_2
-+#define GPIO_GUMSTIX_pSKTSEL_MD	GPIO79_pSKTSEL
-+#endif
-+
-+#define GPIO_GUMSTIX_nPREG_MD	GPIO55_nPREG
-+#define GPIO_GUMSTIX_nPWAIT_MD	GPIO56_nPWAIT
-+#define GPIO_GUMSTIX_nIOIS16_MD	GPIO57_nIOIS16
- 
- /* CF slot 0 */
--#define GPIO4_nBVD1			4
--#define GPIO4_nSTSCHG			GPIO4_nBVD1
--#define GPIO11_nCD			11
--#define GPIO26_PRDY_nBSY		26
--#define GUMSTIX_S0_nSTSCHG_IRQ		IRQ_GPIO(GPIO4_nSTSCHG)
--#define GUMSTIX_S0_nCD_IRQ		IRQ_GPIO(GPIO11_nCD)
--#define GUMSTIX_S0_PRDY_nBSY_IRQ	IRQ_GPIO(GPIO26_PRDY_nBSY)
-+#define GPIO4_nBVD1_0			4
-+#define GPIO4_nSTSCHG_0			GPIO4_nBVD1_0
-+#define GPIO11_nCD_0			11
-+#define GPIO26_PRDY_nBSY_0		26
-+
-+#define GPIO111_nBVD1_0			111
-+#define GPIO111_nSTSCHG_0		GPIO111_nBVD1_0
-+#define GPIO104_nCD_0			104
-+#define GPIO96_PRDY_nBSY_0		96
-+#define GPIO109_PRDY_nBSY_0		109
-+
-+#ifndef CONFIG_MACH_GUMSTIX_VERDEX
-+#define GPIO_GUMSTIX_nBVD1_0		GPIO4_nBVD1_0
-+#define GPIO_GUMSTIX_nSTSCHG_0		GPIO4_nSTSCHG_0
-+#define GPIO_GUMSTIX_nCD_0		GPIO11_nCD_0
-+#define GPIO_GUMSTIX_PRDY_nBSY_0	GPIO26_PRDY_nBSY_0
-+#else
-+#define GPIO_GUMSTIX_nBVD1_0		GPIO111_nBVD1_0
-+#define GPIO_GUMSTIX_nSTSCHG_0		GPIO111_nSTSCHG_0
-+#define GPIO_GUMSTIX_nCD_0		GPIO104_nCD_0
-+#define GPIO_GUMSTIX_PRDY_nBSY_0	GPIO96_PRDY_nBSY_0
-+#endif
-+
-+#define GPIO_GUMSTIX_PRDY_nBSY_0_OLD	GPIO109_PRDY_nBSY_0
-+
-+#define GUMSTIX_S0_nSTSCHG_IRQ		IRQ_GPIO(GPIO_GUMSTIX_nSTSCHG_0)
-+#define GUMSTIX_S0_nCD_IRQ		IRQ_GPIO(GPIO_GUMSTIX_nCD_0)
-+#define GUMSTIX_S0_PRDY_nBSY_IRQ	IRQ_GPIO(GPIO_GUMSTIX_PRDY_nBSY_0)
-+#define GUMSTIX_S0_PRDY_nBSY_OLD_IRQ	IRQ_GPIO(GPIO_GUMSTIX_PRDY_nBSY_0_OLD)
- 
- /* CF slot 1 */
--#define GPIO18_nBVD1			18
--#define GPIO18_nSTSCHG			GPIO18_nBVD1
--#define GPIO36_nCD			36
--#define GPIO27_PRDY_nBSY		27
--#define GUMSTIX_S1_nSTSCHG_IRQ		IRQ_GPIO(GPIO18_nSTSCHG)
--#define GUMSTIX_S1_nCD_IRQ		IRQ_GPIO(GPIO36_nCD)
--#define GUMSTIX_S1_PRDY_nBSY_IRQ	IRQ_GPIO(GPIO27_PRDY_nBSY)
--
--/* CF GPIO line modes */
--#define GPIO4_nSTSCHG_MD		(GPIO4_nSTSCHG | GPIO_IN)
--#define GPIO8_RESET_MD			(GPIO8_RESET | GPIO_OUT)
--#define GPIO11_nCD_MD			(GPIO11_nCD | GPIO_IN)
--#define GPIO18_nSTSCHG_MD		(GPIO18_nSTSCHG | GPIO_IN)
--#define GPIO26_PRDY_nBSY_MD		(GPIO26_PRDY_nBSY | GPIO_IN)
--#define GPIO27_PRDY_nBSY_MD		(GPIO27_PRDY_nBSY | GPIO_IN)
--#define GPIO36_nCD_MD			(GPIO36_nCD | GPIO_IN)
-+#define GPIO18_nBVD1_1			18
-+#define GPIO18_nSTSCHG_1		GPIO18_nBVD1_1
-+#define GPIO36_nCD_1			36
-+#define GPIO27_PRDY_nBSY_1		27
-+
-+#define GPIO_GUMSTIX_nBVD1_1		GPIO18_nBVD1_1
-+#define GPIO_GUMSTIX_nSTSCHG_1		GPIO18_nSTSCHG_1
-+#define GPIO_GUMSTIX_nCD_1		GPIO36_nCD_1
-+#define GPIO_GUMSTIX_PRDY_nBSY_1	GPIO27_PRDY_nBSY_1
-+
-+#define GUMSTIX_S1_nSTSCHG_IRQ		IRQ_GPIO(GPIO_GUMSTIX_nSTSCHG_1)
-+#define GUMSTIX_S1_nCD_IRQ		IRQ_GPIO(GPIO_GUMSTIX_nCD_1)
-+#define GUMSTIX_S1_PRDY_nBSY_IRQ	IRQ_GPIO(GPIO_GUMSTIX_PRDY_nBSY_1)
-+
-+/* CF GPIO line modes - correspond to mfp-pxa2[57]x.h */
-+#define GPIO_GUMSTIX_CF_RESET_MD	( GPIO_GUMSTIX_CF_RESET | GPIO_OUT )
-+#define GPIO_GUMSTIX_CF_OLD_RESET_MD	( GPIO_GUMSTIX_CF_OLD_RESET | GPIO_OUT )
-+
-+#define GPIO_GUMSTIX_nSTSCHG_0_MD	GPIO111_GPIO
-+#define GPIO_GUMSTIX_nCD_0_MD		GPIO104_GPIO
-+
-+#define GPIO_GUMSTIX_PRDY_nBSY_0_MD	GPIO96_GPIO
-+#define GPIO_GUMSTIX_PRDY_nBSY_0_OLD_MD	GPIO109_GPIO
-+
-+#define GPIO_GUMSTIX_nSTSCHG_1_MD	GPIO18_GPIO
-+#define GPIO_GUMSTIX_nCD_1_MD		GPIO36_GPIO
-+#define GPIO_GUMSTIX_PRDY_nBSY_1_MD	GPIO27_GPIO
- 
- /* for expansion boards that can't be programatically detected */
- extern int am200_init(void);
diff --git a/target/linux/pxa/patches/004-smsc911x_verdex_pro_support.patch b/target/linux/pxa/patches/004-smsc911x_verdex_pro_support.patch
deleted file mode 100644
index 82490b33b..000000000
--- a/target/linux/pxa/patches/004-smsc911x_verdex_pro_support.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 7645a459feb02f7aae4c3a5724b7800495d1b659 Mon Sep 17 00:00:00 2001
-From: Bobby Powers <bobbypowers@gmail.com>
-Date: Wed, 28 Oct 2009 22:41:31 -0400
-Subject: [PATCH] [ARM] smsc911x: Verdex Pro support
-
-Basically Joseph Kortje's patch, cleaned up to apply to Linus's
-tree.  Some of the smsc911x.c had been applied already
-
-Signed-off-by: Bobby Powers <bobbypowers@gmail.com>
----
- drivers/net/smsc911x.c   |   50 +++++++++++++++++++++++++++++++++++++--------
- drivers/net/smsc911x.h   |    2 +-
- include/linux/smsc911x.h |   11 ++++++++++
- 3 files changed, 53 insertions(+), 10 deletions(-)
-
---- a/drivers/net/smsc911x.c
-+++ b/drivers/net/smsc911x.c
-@@ -1181,7 +1181,7 @@ static int smsc911x_open(struct net_devi
- 		SMSC_WARNING(IFUP,
- 			"Timed out waiting for EEPROM busy bit to clear");
- 
--	smsc911x_reg_write(pdata, GPIO_CFG, 0x70070000);
-+ 	smsc911x_reg_write(pdata, GPIO_CFG, GPIO_CFG_LED1_EN_ | GPIO_CFG_LED2_EN_ | (1 << 20));
- 
- 	/* The soft reset above cleared the device's MAC address,
- 	 * restore it from local copy (set in probe) */
-@@ -1193,8 +1193,8 @@ static int smsc911x_open(struct net_devi
- 	smsc911x_reg_write(pdata, INT_EN, 0);
- 	smsc911x_reg_write(pdata, INT_STS, 0xFFFFFFFF);
- 
--	/* Set interrupt deassertion to 100uS */
--	intcfg = ((10 << 24) | INT_CFG_IRQ_EN_);
-+ 	/* Set interrupt deassertion to 22*10uS */
-+ 	intcfg = ((22 << 24) | INT_CFG_IRQ_EN_);
- 
- 	if (pdata->config.irq_polarity) {
- 		SMSC_TRACE(IFUP, "irq polarity: active high");
-@@ -1220,7 +1220,7 @@ static int smsc911x_open(struct net_devi
- 	temp |= INT_EN_SW_INT_EN_;
- 	smsc911x_reg_write(pdata, INT_EN, temp);
- 
--	timeout = 1000;
-+	timeout = 2000;
- 	while (timeout--) {
- 		if (pdata->software_irq_signal)
- 			break;
-@@ -1948,6 +1948,38 @@ static int __devexit smsc911x_drv_remove
- 	return 0;
- }
- 
-+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) */
-+	}
-+}
-+
- static int __devinit smsc911x_drv_probe(struct platform_device *pdev)
- {
- 	struct net_device *dev;
-@@ -2081,11 +2113,11 @@ static int __devinit smsc911x_drv_probe(
- 			SMSC_TRACE(PROBE,
- 				"Mac Address is read from LAN911x EEPROM");
- 		} else {
--			/* eeprom values are invalid, generate random MAC */
--			random_ether_addr(dev->dev_addr);
--			smsc911x_set_hw_mac_address(pdata, dev->dev_addr);
--			SMSC_TRACE(PROBE,
--				"MAC Address is set to random_ether_addr");
-+			/* eeprom values are invalid, generate MAC from serial number */
-+			gen_serial_ether_addr(dev->dev_addr);
-+  			smsc911x_set_hw_mac_address(pdata, dev->dev_addr);
-+  			SMSC_TRACE(PROBE,
-+				"MAC Address is derived from system serial number");
- 		}
- 	}
- 
diff --git a/target/linux/pxa/patches/005-verdex_pcmcia_support.patch b/target/linux/pxa/patches/005-verdex_pcmcia_support.patch
deleted file mode 100644
index ca50022c6..000000000
--- a/target/linux/pxa/patches/005-verdex_pcmcia_support.patch
+++ /dev/null
@@ -1,234 +0,0 @@
-From 76a102bd5c9d792db19c6c72eafdecea0311a0c9 Mon Sep 17 00:00:00 2001
-From: Craig Hughes <craig@gumstix.com>
-Date: Fri, 30 Oct 2009 14:16:27 -0400
-Subject: [PATCH] [ARM] pxa: Gumstix Verdex PCMCIA support
-
-Needed for the Libertas CS wireless device.
-
-Signed-off-by: Bobby Powers <bobbypowers@gmail.com>
----
- drivers/pcmcia/Kconfig          |    3 +-
- drivers/pcmcia/Makefile         |    3 +
- drivers/pcmcia/pxa2xx_gumstix.c |  194 +++++++++++++++++++++++++++++++++++++++
- 3 files changed, 199 insertions(+), 1 deletions(-)
- create mode 100644 drivers/pcmcia/pxa2xx_gumstix.c
-
---- a/drivers/pcmcia/Kconfig
-+++ b/drivers/pcmcia/Kconfig
-@@ -221,7 +221,8 @@ config PCMCIA_PXA2XX
- 	depends on ARM && ARCH_PXA && PCMCIA
- 	depends on (ARCH_LUBBOCK || MACH_MAINSTONE || PXA_SHARPSL \
- 		    || MACH_ARMCORE || ARCH_PXA_PALM || TRIZEPS_PCMCIA \
--		    || ARCH_VIPER || ARCH_PXA_ESERIES || MACH_STARGATE2)
-+		    || ARCH_VIPER || ARCH_PXA_ESERIES || MACH_STARGATE2 \
-+		    || ARCH_GUMSTIX)
- 	help
- 	  Say Y here to include support for the PXA2xx PCMCIA controller
- 
---- a/drivers/pcmcia/Makefile
-+++ b/drivers/pcmcia/Makefile
-@@ -77,4 +77,7 @@ pxa2xx-obj-$(CONFIG_MACH_PALMLD)		+= pxa
- pxa2xx-obj-$(CONFIG_MACH_E740)			+= pxa2xx_e740.o
- pxa2xx-obj-$(CONFIG_MACH_STARGATE2)		+= pxa2xx_stargate2.o
- 
-+pxa2xx-obj-$(CONFIG_MACH_GUMSTIX_VERDEX)	+= pxa2xx_cs.o
-+pxa2xx_cs-objs					:= pxa2xx_gumstix.o
-+
- obj-$(CONFIG_PCMCIA_PXA2XX)			+= pxa2xx_core.o $(pxa2xx-obj-y)
---- /dev/null
-+++ b/drivers/pcmcia/pxa2xx_gumstix.c
-@@ -0,0 +1,194 @@
-+/*
-+ * linux/drivers/pcmcia/pxa2xx_gumstix.c
-+ *
-+ * Gumstix PCMCIA specific routines. Based on Mainstone
-+ *
-+ * Copyright 2004, Craig Hughes <craig@gumstix.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.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/errno.h>
-+#include <linux/interrupt.h>
-+#include <linux/irq.h>
-+#include <linux/gpio.h>
-+
-+#include <linux/delay.h>
-+#include <linux/platform_device.h>
-+
-+#include <pcmcia/ss.h>
-+
-+#include <mach/hardware.h>
-+#include <asm/mach-types.h>
-+
-+#ifdef CONFIG_MACH_GUMSTIX_VERDEX
-+#include <mach/pxa27x.h>
-+#else
-+#include <mach/pxa27x.h>
-+#endif
-+
-+#include <asm/io.h>
-+#include <mach/gpio.h>
-+#include <mach/gumstix.h>
-+#include "soc_common.h"
-+
-+#define ARRAY_AND_SIZE(x)	(x), ARRAY_SIZE(x)
-+
-+static struct pcmcia_irqs gumstix_pcmcia_irqs0[] = {
-+	{ 0, GUMSTIX_S0_nCD_IRQ,	"CF0 nCD"     },
-+	{ 0, GUMSTIX_S0_nSTSCHG_IRQ,	"CF0 nSTSCHG" },
-+};
-+
-+static struct pcmcia_irqs gumstix_pcmcia_irqs1[] = {
-+	{ 1, GUMSTIX_S1_nCD_IRQ,	"CF1 nCD"     },
-+	{ 1, GUMSTIX_S1_nSTSCHG_IRQ,	"CF1 nSTSCHG" },
-+};
-+
-+
-+static int net_cf_vx_mode = 0;
-+
-+static int gumstix_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
-+{
-+/* Note: The verdex_pcmcia_pin_config is moved to gumstix_verdex.c in order to use mfp_pxa2xx_config
-+   for board-specific pin configuration instead of the old deprecated pxa_gpio_mode function.  Thus,
-+   only the IRQ init is still needed to be done here. */
-+	skt->irq = (skt->nr == 0) ? ((net_cf_vx_mode == 0) ? GUMSTIX_S0_PRDY_nBSY_IRQ : GUMSTIX_S0_PRDY_nBSY_OLD_IRQ) : GUMSTIX_S1_PRDY_nBSY_IRQ;
-+
-+	return (skt->nr == 0) ? soc_pcmcia_request_irqs(skt, gumstix_pcmcia_irqs0, ARRAY_SIZE(gumstix_pcmcia_irqs0)) :
-+				soc_pcmcia_request_irqs(skt, gumstix_pcmcia_irqs1, ARRAY_SIZE(gumstix_pcmcia_irqs1));
-+}
-+
-+static void gumstix_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)
-+{
-+	if(skt->nr == 0)
-+	{
-+		soc_pcmcia_free_irqs(skt, gumstix_pcmcia_irqs0, ARRAY_SIZE(gumstix_pcmcia_irqs0));
-+	} else {
-+		soc_pcmcia_free_irqs(skt, gumstix_pcmcia_irqs1, ARRAY_SIZE(gumstix_pcmcia_irqs1));
-+	}
-+
-+	if (net_cf_vx_mode) {
-+	    	gpio_free(GPIO_GUMSTIX_CF_OLD_RESET);
-+	} else {
-+		gpio_free(GPIO_GUMSTIX_CF_RESET);
-+	}
-+
-+}
-+
-+static void gumstix_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
-+				    struct pcmcia_state *state)
-+{
-+	unsigned int cd, prdy_nbsy, nbvd1;
-+	if(skt->nr == 0)
-+	{
-+		cd = GPIO_GUMSTIX_nCD_0;
-+		if(net_cf_vx_mode)
-+			prdy_nbsy = GPIO_GUMSTIX_PRDY_nBSY_0_OLD;
-+		else
-+			prdy_nbsy = GPIO_GUMSTIX_PRDY_nBSY_0;
-+		nbvd1 = GPIO_GUMSTIX_nBVD1_0;
-+	} else {
-+		cd = GPIO_GUMSTIX_nCD_1;
-+		prdy_nbsy = GPIO_GUMSTIX_PRDY_nBSY_1;
-+		nbvd1 = GPIO_GUMSTIX_nBVD1_1;
-+	}
-+	state->detect = !(GPLR(cd) & GPIO_bit(cd));
-+	state->ready  = !!(GPLR(prdy_nbsy) & GPIO_bit(prdy_nbsy));
-+	state->bvd1   = !!(GPLR(nbvd1) & GPIO_bit(nbvd1));
-+	state->bvd2   = 1;
-+	state->vs_3v  = 0;
-+	state->vs_Xv  = 0;
-+	state->wrprot = 0;
-+}
-+
-+static int gumstix_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
-+				       const socket_state_t *state)
-+{
-+	return 0;
-+}
-+
-+static void gumstix_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
-+{
-+	if(skt->nr) {
-+		soc_pcmcia_enable_irqs(skt, gumstix_pcmcia_irqs0, ARRAY_SIZE(gumstix_pcmcia_irqs0));
-+	} else {
-+		soc_pcmcia_enable_irqs(skt, gumstix_pcmcia_irqs1, ARRAY_SIZE(gumstix_pcmcia_irqs1));
-+	}
-+}
-+
-+static void gumstix_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
-+{
-+	if(skt->nr) {
-+		soc_pcmcia_disable_irqs(skt, gumstix_pcmcia_irqs0, ARRAY_SIZE(gumstix_pcmcia_irqs0));
-+	} else {
-+		soc_pcmcia_disable_irqs(skt, gumstix_pcmcia_irqs1, ARRAY_SIZE(gumstix_pcmcia_irqs1));
-+	}
-+}
-+
-+static struct pcmcia_low_level gumstix_pcmcia_ops = {
-+	.owner			= THIS_MODULE,
-+	.hw_init		= gumstix_pcmcia_hw_init,
-+	.hw_shutdown		= gumstix_pcmcia_hw_shutdown,
-+	.socket_state		= gumstix_pcmcia_socket_state,
-+	.configure_socket	= gumstix_pcmcia_configure_socket,
-+	.socket_init		= gumstix_pcmcia_socket_init,
-+	.socket_suspend		= gumstix_pcmcia_socket_suspend,
-+	.nr			= 2,
-+};
-+
-+static struct platform_device *gumstix_pcmcia_device;
-+
-+extern int __init gumstix_get_cf_cards(void);
-+
-+#ifdef CONFIG_MACH_GUMSTIX_VERDEX
-+extern int __init gumstix_check_if_netCF_vx(void);
-+#endif
-+
-+static int __init gumstix_pcmcia_init(void)
-+{
-+	int ret;
-+
-+#ifdef CONFIG_MACH_GUMSTIX_VERDEX
-+	net_cf_vx_mode = gumstix_check_if_netCF_vx();
-+#endif
-+
-+	gumstix_pcmcia_ops.nr = gumstix_get_cf_cards();
-+
-+	gumstix_pcmcia_device = platform_device_alloc("pxa2xx-pcmcia", -1);
-+	if (!gumstix_pcmcia_device)
-+		return -ENOMEM;
-+
-+	ret = platform_device_add_data(gumstix_pcmcia_device, &gumstix_pcmcia_ops,
-+				       sizeof(gumstix_pcmcia_ops));
-+
-+	if (ret == 0) {
-+		printk(KERN_INFO "Registering gumstix PCMCIA interface.\n");
-+		ret = platform_device_add(gumstix_pcmcia_device);
-+	}
-+
-+	if (ret)
-+		platform_device_put(gumstix_pcmcia_device);
-+
-+	return ret;
-+}
-+
-+static void __exit gumstix_pcmcia_exit(void)
-+{
-+	/*
-+	 * This call is supposed to free our gumstix_pcmcia_device.
-+	 * Unfortunately platform_device don't have a free method, and
-+	 * we can't assume it's free of any reference at this point so we
-+	 * can't free it either.
-+	 */
-+	platform_device_unregister(gumstix_pcmcia_device);
-+}
-+
-+fs_initcall(gumstix_pcmcia_init);
-+module_exit(gumstix_pcmcia_exit);
-+
-+MODULE_LICENSE("GPL");
diff --git a/target/linux/pxa/patches/006-define_smsc911x_for_pcmcia.patch b/target/linux/pxa/patches/006-define_smsc911x_for_pcmcia.patch
deleted file mode 100644
index fe039ae62..000000000
--- a/target/linux/pxa/patches/006-define_smsc911x_for_pcmcia.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From ddd30dbf3cfd805b0de99fc581d0fa1cc7236ef9 Mon Sep 17 00:00:00 2001
-From: Bobby Powers <bobbypowers@gmail.com>
-Date: Fri, 13 Nov 2009 01:33:05 -0500
-Subject: [PATCH] pxa: define smsc911x structures for pcmcia too
-
-The gumstix pcmcia support (which the wireless driver uses) needs
-to know about the smsc911x platform device even if smsc811x support
-is disabled, as they share resources.
-
-Signed-off-by: Bobby Powers <bobbypowers@gmail.com>
----
- arch/arm/mach-pxa/gumstix-verdex.c |    6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
---- a/arch/arm/mach-pxa/gumstix-verdex.c
-+++ b/arch/arm/mach-pxa/gumstix-verdex.c
-@@ -51,7 +51,9 @@
- 
- #include <linux/delay.h>
- 
--#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
-+
-+#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE) \
-+    || defined(CONFIG_PCMCIA_PXA2XX) || defined(CONFIG_PCMCIA_PXA2XX_MODULE)
- 
- #include <linux/smsc911x.h>
- 
-@@ -85,7 +87,9 @@ static struct platform_device verdex_sms
- 		.platform_data = &verdex_smsc911x_config,
- 	},
- };
-+#endif
- 
-+#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
- static void __init verdex_init_smsc911x(void)
- {
- 
diff --git a/target/linux/pxa/patches/007-fix_verdex_pro_mmc_initialization.patch b/target/linux/pxa/patches/007-fix_verdex_pro_mmc_initialization.patch
deleted file mode 100644
index 0f2332896..000000000
--- a/target/linux/pxa/patches/007-fix_verdex_pro_mmc_initialization.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 7169c68fec79e61549b8e9c0106dde88e4d1bf9d Mon Sep 17 00:00:00 2001
-From: Bobby Powers <rpowers@harttech.com>
-Date: Thu, 29 Oct 2009 15:39:45 -0400
-Subject: [PATCH] [ARM] pxa: fix Verdex Pro mmc initialization
-
-The MicroSD port doesn't have card detect, read-only switch
-support, and is continuously powered.  Somewhere in the
-forward-porting this got lost in the structure initialization.
-
-Signed-off-by: Bobby Powers <rpowers@harttech.com>
----
- arch/arm/mach-pxa/gumstix-verdex.c |    7 +++++--
- 1 files changed, 5 insertions(+), 2 deletions(-)
-
---- a/arch/arm/mach-pxa/gumstix-verdex.c
-+++ b/arch/arm/mach-pxa/gumstix-verdex.c
-@@ -590,8 +590,11 @@ static int verdex_mci_init(struct device
- }
- 
- static struct pxamci_platform_data verdex_mci_platform_data = {
--    .ocr_mask   = MMC_VDD_32_33|MMC_VDD_33_34,
--    .init       = verdex_mci_init,
-+	.ocr_mask   = MMC_VDD_32_33|MMC_VDD_33_34,
-+	.init       = verdex_mci_init,
-+	.gpio_card_detect 	= -1,
-+	.gpio_card_ro		= -1,
-+	.gpio_power		= -1,
- };
- 
- static void __init verdex_mmc_init(void)
diff --git a/target/linux/pxa/patches/008-verdex_mtd_support.patch b/target/linux/pxa/patches/008-verdex_mtd_support.patch
deleted file mode 100644
index dbb5bf855..000000000
--- a/target/linux/pxa/patches/008-verdex_mtd_support.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/arch/arm/mach-pxa/gumstix-verdex.c
-+++ b/arch/arm/mach-pxa/gumstix-verdex.c
-@@ -51,6 +51,46 @@
- 
- #include <linux/delay.h>
- 
-+static struct resource flash_resource = {
-+	.start	= 0x00000000,
-+	.end	= SZ_64M - 1,
-+	.flags	= IORESOURCE_MEM,
-+};
-+
-+static struct mtd_partition gumstix_partitions[] = {
-+	{
-+		.name =		"u-boot",
-+		.size =		0x00040000,
-+		.offset =	0,
-+		.mask_flags =	MTD_WRITEABLE  /* force read-only */
-+	} , {
-+		.name =		"rootfs",
-+		.size =		0x01ec0000,
-+		.offset =	0x00040000
-+	} , {
-+		.name =		"kernel",
-+		.size =		0x00100000,
-+		.offset =	0x01f00000
-+	}
-+};
-+
-+static struct flash_platform_data gumstix_flash_data = {
-+	.map_name	= "cfi_probe",
-+	.parts		= gumstix_partitions,
-+	.nr_parts	= ARRAY_SIZE(gumstix_partitions),
-+	.width		= 2,
-+};
-+
-+static struct platform_device gumstix_flash_device = {
-+	.name		= "pxa2xx-flash",
-+	.id		= 0,
-+	.dev = {
-+		.platform_data = &gumstix_flash_data,
-+	},
-+	.resource = &flash_resource,
-+	.num_resources = 1,
-+};
-+
- 
- #if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE) \
-     || defined(CONFIG_PCMCIA_PXA2XX) || defined(CONFIG_PCMCIA_PXA2XX_MODULE)
-@@ -540,6 +580,7 @@ static struct platform_device verdex_aud
- };
- 
- static struct platform_device *devices[] __initdata = {
-+    &gumstix_flash_device,
-     &verdex_audio_device,
- };
- 
diff --git a/target/linux/pxcab/Makefile b/target/linux/pxcab/Makefile
deleted file mode 100644
index 7ca7c0536..000000000
--- a/target/linux/pxcab/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Copyright (C) 2009 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-ARCH:=powerpc
-BOARD:=pxcab
-BOARDNAME:=PowerXCell Accelerator Board
-FEATURES+=powerpc64 fpu ramdisk
-
-LINUX_VERSION:=2.6.30.10
-
-KERNEL_CC:=
-
-include $(INCLUDE_DIR)/target.mk
-
-define Target/Description
-	Build zImage for the IBM PowerXCell Accelerator Board
-	(aka mvXCell-8i from MatrixVision or GigaAccel 180 from Fixstars)
-endef
-
-KERNELNAME:="zImage"
-
-DEFAULT_PACKAGES += kmod-tg3
-
-$(eval $(call BuildTarget))
diff --git a/target/linux/pxcab/base-files/lib/preinit/15_essential_fs_pxcab b/target/linux/pxcab/base-files/lib/preinit/15_essential_fs_pxcab
deleted file mode 100644
index 2c607e260..000000000
--- a/target/linux/pxcab/base-files/lib/preinit/15_essential_fs_pxcab
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-#!/bin/sh
-
-do_mount_procfs() {
-	mount -t proc none /proc
-}
-
diff --git a/target/linux/pxcab/base-files/lib/preinit/45_failsafe_pxcab b/target/linux/pxcab/base-files/lib/preinit/45_failsafe_pxcab
deleted file mode 100644
index dd7330d5d..000000000
--- a/target/linux/pxcab/base-files/lib/preinit/45_failsafe_pxcab
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2006-2010 OpenWrt.org
-# Copyright (C) 2010 Vertical Communications
-
-failsafe_wait() {
-    FAILSAFE=
-    grep -q 'failsafe=' /proc/cmdline && FAILSAFE=true && export FAILSAFE
-    if [ "$FAILSAFE" != "true" ]; then
-        preinit_net_echo "Please press button now to enter failsafe"
-        echo -n "Press "
-        fs_wait_for_key f 'to enter failsafe mode' $fs_failsafe_wait_timeout && FAILSAFE=true && export FAILSAFE
-    fi
-}
-
diff --git a/target/linux/pxcab/config-2.6.30 b/target/linux/pxcab/config-2.6.30
deleted file mode 100644
index 5b5ecd10f..000000000
--- a/target/linux/pxcab/config-2.6.30
+++ /dev/null
@@ -1,438 +0,0 @@
-CONFIG_64BIT=y
-CONFIG_ALTIVEC=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-CONFIG_ARCH_HAS_ILOG2_U32=y
-CONFIG_ARCH_HAS_ILOG2_U64=y
-CONFIG_ARCH_HAS_WALK_MEMORY=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_ARCH_MEMORY_PROBE=y
-CONFIG_ARCH_NO_VIRT_TO_BUS=y
-CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_ARCH_SUPPORTS_MSI=y
-CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-# CONFIG_ARPD is not set
-CONFIG_AUDIT_ARCH=y
-CONFIG_AXON_RAM=m
-# CONFIG_BACKTRACE_SELF_TEST is not set
-# CONFIG_BINARY_PRINTF is not set
-CONFIG_BITREVERSE=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=65535
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_SD=y
-# CONFIG_BLK_DEV_SR_VENDOR is not set
-CONFIG_BLK_DEV_SR=y
-CONFIG_BLOCK_COMPAT=y
-# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
-CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
-# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_BOOTX_TEXT is not set
-CONFIG_BOUNCE=y
-# CONFIG_BRIDGE is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_CBE_CPUFREQ_PMI_ENABLE is not set
-CONFIG_CBE_CPUFREQ_SPU_GOVERNOR=y
-CONFIG_CBE_CPUFREQ=y
-CONFIG_CBE_RAS=y
-CONFIG_CBE_THERM=y
-# CONFIG_CGROUP_SCHED is not set
-CONFIG_CMDLINE_BOOL=y
-# CONFIG_CODE_PATCHING_SELFTEST is not set
-CONFIG_COMPAT_BINFMT_ELF=y
-CONFIG_COMPAT_BRK=y
-CONFIG_COMPAT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-# CONFIG_CPU_FREQ_DEBUG is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
-# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
-# CONFIG_CPU_FREQ_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_STAT_DETAILS is not set
-CONFIG_CPU_FREQ_STAT=y
-CONFIG_CPU_FREQ_TABLE=y
-CONFIG_CPU_FREQ=y
-CONFIG_CRC16=y
-CONFIG_CRC_CCITT=m
-# CONFIG_CRYPTO is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_FS is not set
-CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_SHIRQ is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-# CONFIG_DEBUG_STACKOVERFLOW is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_WRITECOUNT is not set
-CONFIG_DECOMPRESS_LZMA=y
-# CONFIG_DEFAULT_UIMAGE is not set
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_DETECT_SOFTLOCKUP=y
-CONFIG_DEVKMEM=y
-CONFIG_DEVPORT=y
-CONFIG_DNOTIFY=y
-CONFIG_DTC=y
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_EARLY_PRINTK=y
-# CONFIG_EEH is not set
-CONFIG_ELF_CORE=y
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-# CONFIG_EXT4DEV_COMPAT is not set
-# CONFIG_EXT4_FS_XATTR is not set
-CONFIG_EXT4_FS=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_FAT_FS=y
-# CONFIG_FAULT_INJECTION is not set
-CONFIG_FB=y
-# CONFIG_FIRMWARE_EDID is not set
-CONFIG_FIRMWARE_IN_KERNEL=y
-# CONFIG_FLATMEM_MANUAL is not set
-CONFIG_FONT_8x16=y
-CONFIG_FONT_8x8=y
-# CONFIG_FONTS is not set
-CONFIG_FORCE_MAX_ZONEORDER=13
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAME_WARN=2048
-# CONFIG_FSL_ULI1575 is not set
-# CONFIG_FTR_FIXUP_SELFTEST is not set
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_IOMAP=y
-CONFIG_GENERIC_ISA_DMA=y
-# CONFIG_GENERIC_TBSYNC is not set
-CONFIG_GENERIC_TIME_VSYSCALL=y
-# CONFIG_GEN_RTC is not set
-CONFIG_GROUP_SCHED=y
-# CONFIG_HAMRADIO is not set
-# CONFIG_HANGCHECK_TIMER is not set
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-# CONFIG_HAS_RAPIDIO is not set
-CONFIG_HAVE_ARCH_KGDB=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_ATTRS=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
-CONFIG_HAVE_IDE=y
-CONFIG_HAVE_IOREMAP_PROT=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_HAVE_LMB=y
-CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_HAVE_MLOCK=y
-CONFIG_HAVE_OPROFILE=y
-CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_HAVE_SYSCALL_WRAPPERS=y
-CONFIG_HID_APPLE=y
-CONFIG_HID_BELKIN=y
-CONFIG_HID_CHERRY=y
-CONFIG_HID_EZKEY=y
-CONFIG_HID_LOGITECH=y
-CONFIG_HID_MICROSOFT=y
-CONFIG_HID_SONY=y
-CONFIG_HID_SUNPLUS=y
-CONFIG_HID_SUPPORT=y
-CONFIG_HID=y
-# CONFIG_HIGH_RES_TIMERS is not set
-# CONFIG_HUGETLBFS is not set
-CONFIG_HVC_CONSOLE=y
-CONFIG_HVC_DRIVER=y
-CONFIG_HVC_IRQ=y
-# CONFIG_HVC_RTAS is not set
-# CONFIG_HVCS is not set
-# CONFIG_HVC_UDBG is not set
-CONFIG_HW_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-# CONFIG_HZ_100 is not set
-CONFIG_HZ=250
-CONFIG_HZ_250=y
-# CONFIG_IBM_BSR is not set
-# CONFIG_IBMEBUS is not set
-CONFIG_IBM_NEW_EMAC_EMAC4=y
-CONFIG_IBM_NEW_EMAC_RGMII=y
-CONFIG_IBM_NEW_EMAC_TAH=y
-CONFIG_IBM_NEW_EMAC_ZMII=y
-CONFIG_IBMVIO=y
-CONFIG_INITRAMFS_ROOT_GID=500
-CONFIG_INITRAMFS_ROOT_UID=500
-CONFIG_INITRAMFS_SOURCE="/home/mita/scm/openwrt/build_dir/target-powerpc_uClibc-0.9.30.1/root-pxcab /home/mita/scm/openwrt/target/linux/generic-2.6/image/initramfs-base-files.txt"
-CONFIG_INOTIFY_USER=y
-CONFIG_INOTIFY=y
-CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_JOYSTICK=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT=y
-# CONFIG_INPUT_YEALINK is not set
-CONFIG_IOMMU_HELPER=y
-# CONFIG_IOMMU_VMERGE is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
-# CONFIG_IPIC is not set
-# CONFIG_IP_MULTICAST is not set
-# CONFIG_IRQ_ALL_CPUS is not set
-CONFIG_IRQ_PER_CPU=y
-# CONFIG_IRQSTACKS is not set
-CONFIG_ISA_DMA_API=y
-CONFIG_ISO9660_FS=y
-CONFIG_JBD2=y
-CONFIG_JBD=y
-# CONFIG_JOYSTICK_A3D is not set
-# CONFIG_JOYSTICK_ADI is not set
-# CONFIG_JOYSTICK_ANALOG is not set
-# CONFIG_JOYSTICK_COBRA is not set
-# CONFIG_JOYSTICK_GF2K is not set
-# CONFIG_JOYSTICK_GRIP is not set
-# CONFIG_JOYSTICK_GRIP_MP is not set
-# CONFIG_JOYSTICK_GUILLEMOT is not set
-# CONFIG_JOYSTICK_IFORCE is not set
-# CONFIG_JOYSTICK_INTERACT is not set
-# CONFIG_JOYSTICK_JOYDUMP is not set
-# CONFIG_JOYSTICK_MAGELLAN is not set
-# CONFIG_JOYSTICK_SIDEWINDER is not set
-# CONFIG_JOYSTICK_SPACEBALL is not set
-# CONFIG_JOYSTICK_SPACEORB is not set
-# CONFIG_JOYSTICK_STINGER is not set
-# CONFIG_JOYSTICK_TMDC is not set
-# CONFIG_JOYSTICK_TWIDJOY is not set
-# CONFIG_JOYSTICK_WARRIOR is not set
-# CONFIG_JOYSTICK_XPAD is not set
-# CONFIG_JOYSTICK_ZHENHUA is not set
-# CONFIG_KALLSYMS_ALL is not set
-CONFIG_KALLSYMS=y
-CONFIG_KERNEL_START=0xc000000000000000
-CONFIG_KEXEC=y
-# CONFIG_KGDB is not set
-# CONFIG_LEDS_TRIGGERS is not set
-CONFIG_LOCK_KERNEL=y
-# CONFIG_LOCK_STAT is not set
-CONFIG_LOG_BUF_SHIFT=15
-# CONFIG_LOGO is not set
-# CONFIG_LPARCFG is not set
-CONFIG_MEMORY_HOTPLUG_SPARSE=y
-CONFIG_MEMORY_HOTPLUG=y
-# CONFIG_MEMORY_HOTREMOVE is not set
-CONFIG_MIGRATION=y
-# CONFIG_MINI_FO is not set
-# CONFIG_MISC_DEVICES is not set
-CONFIG_MMIO_NVRAM=y
-# CONFIG_MPIC_WEIRD is not set
-CONFIG_MPIC=y
-CONFIG_MSDOS_FS=y
-# CONFIG_MSI_BITMAP_SELFTEST is not set
-CONFIG_MTD_OF_PARTS=y
-CONFIG_MTD_PHYSMAP_OF=y
-CONFIG_NEED_MULTIPLE_NODES=y
-# CONFIG_NET_ETHERNET is not set
-# CONFIG_NETFILTER is not set
-# CONFIG_NETWORK_FILESYSTEMS is not set
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS=y
-CONFIG_NODES_SHIFT=4
-CONFIG_NODES_SPAN_OTHER_NODES=y
-CONFIG_NR_CPUS=2
-CONFIG_NUMA=y
-CONFIG_OF_DEVICE=y
-CONFIG_OF=y
-# CONFIG_PACKET_MMAP is not set
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PAGE_OFFSET=0xc000000000000000
-# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_PCI=y
-# CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_DOMAINS=y
-# CONFIG_PCIEPORTBUS is not set
-CONFIG_PCSPKR_PLATFORM=y
-CONFIG_PHYLIB=y
-# CONFIG_PHYP_DUMP is not set
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_PHYSICAL_START=0x00000000
-CONFIG_POWER3=y
-# CONFIG_POWER4_ONLY is not set
-CONFIG_POWER4=y
-# CONFIG_PPC_16K_PAGES is not set
-# CONFIG_PPC_256K_PAGES is not set
-CONFIG_PPC_4K_PAGES=y
-# CONFIG_PPC_64K_PAGES is not set
-CONFIG_PPC64=y
-# CONFIG_PPC_970_NAP is not set
-CONFIG_PPC_BOOK3S=y
-CONFIG_PPC_CELL_COMMON=y
-# CONFIG_PPC_CELLEB is not set
-CONFIG_PPC_CELL_NATIVE=y
-# CONFIG_PPC_CELL_QPACE is not set
-CONFIG_PPC_CELL=y
-# CONFIG_PPC_CLOCK is not set
-CONFIG_PPC_DCR_MMIO=y
-# CONFIG_PPC_DCR_NATIVE is not set
-CONFIG_PPC_DCR=y
-# CONFIG_PPC_EARLY_DEBUG is not set
-CONFIG_PPC_FPU=y
-# CONFIG_PPC_HAS_HASH_64K is not set
-CONFIG_PPC_I8259=y
-CONFIG_PPC_IBM_CELL_BLADE=y
-# CONFIG_PPC_IBM_CELL_POWERBUTTON is not set
-CONFIG_PPC_IBM_CELL_RESETBUTTON=y
-CONFIG_PPC_INDIRECT_IO=y
-# CONFIG_PPC_INDIRECT_PCI is not set
-# CONFIG_PPC_ISERIES is not set
-# CONFIG_PPC_MAPLE is not set
-# CONFIG_PPC_MM_SLICES is not set
-# CONFIG_PPC_MPC106 is not set
-CONFIG_PPC_NATIVE=y
-CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
-CONFIG_PPC_OF_PLATFORM_PCI=y
-CONFIG_PPC_OF=y
-# CONFIG_PPC_PASEMI is not set
-CONFIG_PPC_PCI_CHOICE=y
-# CONFIG_PPC_PMAC is not set
-# CONFIG_PPC_PS3 is not set
-CONFIG_PPC_PSERIES=y
-CONFIG_PPC_RTAS=y
-# CONFIG_PPC_SMLPAR is not set
-# CONFIG_PPC_SPLPAR is not set
-CONFIG_PPC_STD_MMU_64=y
-CONFIG_PPC_STD_MMU=y
-CONFIG_PPC_UDBG_16550=y
-CONFIG_PPC=y
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP=m
-CONFIG_PPPOE=m
-# CONFIG_PQ2ADS is not set
-CONFIG_PRINT_STACK_DEPTH=64
-CONFIG_PROC_DEVICETREE=y
-CONFIG_PROC_PAGE_MONITOR=y
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-# CONFIG_RELOCATABLE is not set
-CONFIG_RTAS_ERROR_LOGGING=y
-CONFIG_RTAS_FLASH=y
-CONFIG_RTAS_PROC=y
-# CONFIG_RT_GROUP_SCHED is not set
-# CONFIG_RT_MUTEX_TESTER is not set
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-# CONFIG_SCANLOG is not set
-CONFIG_SCHED_DEBUG=y
-# CONFIG_SCHED_HRTICK is not set
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-# CONFIG_SCHED_SMT is not set
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_SCSI_LOWLEVEL is not set
-# CONFIG_SCSI_PROC_FS is not set
-CONFIG_SCSI=y
-# CONFIG_SERIAL_8250_EXTENDED is not set
-# CONFIG_SERIAL_ICOM is not set
-# CONFIG_SERIAL_OF_PLATFORM is not set
-# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
-# CONFIG_SIMPLE_GPIO is not set
-# CONFIG_SLAB is not set
-CONFIG_SLHC=m
-# CONFIG_SLOW_WORK is not set
-CONFIG_SLUB=y
-CONFIG_SMP=y
-CONFIG_SPARSEMEM_EXTREME=y
-CONFIG_SPARSEMEM_MANUAL=y
-CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
-# CONFIG_SPARSEMEM_VMEMMAP is not set
-CONFIG_SPARSEMEM=y
-# CONFIG_SPIDER_NET is not set
-CONFIG_SPU_BASE=y
-CONFIG_SPU_FS=y
-# CONFIG_SQUASHFS is not set
-CONFIG_STOP_MACHINE=y
-# CONFIG_SWAP is not set
-# CONFIG_SYSCTL_SYSCALL_CHECK is not set
-CONFIG_SYSVIPC_COMPAT=y
-# CONFIG_TEXTSEARCH is not set
-CONFIG_TIGON3=y
-# CONFIG_TIMER_STATS is not set
-CONFIG_TRACING_SUPPORT=y
-CONFIG_TUNE_CELL=y
-# CONFIG_U3_DART is not set
-CONFIG_UDBG_RTAS_CONSOLE=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug2"
-# CONFIG_USB_DEVICEFS is not set
-CONFIG_USB_EHCI_HCD_PPC_OF=y
-CONFIG_USB_EHCI_HCD=y
-# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
-CONFIG_USB_HID=y
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-# CONFIG_USB_OHCI_HCD_PPC_OF is not set
-CONFIG_USB_OHCI_HCD=y
-# CONFIG_USB_STORAGE_ALAUDA is not set
-# CONFIG_USB_STORAGE_DATAFAB is not set
-# CONFIG_USB_STORAGE_FREECOM is not set
-# CONFIG_USB_STORAGE_JUMPSHOT is not set
-# CONFIG_USB_STORAGE_KARMA is not set
-# CONFIG_USB_STORAGE_SDDR09 is not set
-# CONFIG_USB_STORAGE_SDDR55 is not set
-# CONFIG_USB_STORAGE_USBAT is not set
-CONFIG_USB_STORAGE=y
-CONFIG_USB_SUPPORT=y
-# CONFIG_USB_UHCI_HCD is not set
-CONFIG_USB=y
-CONFIG_USE_GENERIC_SMP_HELPERS=y
-CONFIG_USER_SCHED=y
-CONFIG_VFAT_FS=y
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_VIDEO_OUTPUT_CONTROL=y
-CONFIG_VIRT_CPU_ACCOUNTING=y
-# CONFIG_VLAN_8021Q is not set
-CONFIG_VM_EVENT_COUNTERS=y
-# CONFIG_VSX is not set
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_VT=y
-# CONFIG_WATCHDOG is not set
-# CONFIG_WIRELESS is not set
-# CONFIG_WLAN_80211 is not set
-CONFIG_WORD_SIZE=64
-CONFIG_XICS=y
-# CONFIG_XMON is not set
-# CONFIG_ZISOFS is not set
diff --git a/target/linux/pxcab/image/Makefile b/target/linux/pxcab/image/Makefile
deleted file mode 100644
index b2e08f073..000000000
--- a/target/linux/pxcab/image/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright (C) 2007-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/image.mk
-
-define Image/Prepare
-	cp $(LINUX_DIR)/arch/powerpc/boot/zImage $(KDIR)/zImage
-endef
-
-define Image/BuildKernel
-	mkdir -p $(BIN_DIR)
-	cp $(KDIR)/zImage $(BIN_DIR)/$(IMG_PREFIX)-zImage
-	cp $(KDIR)/vmlinux.elf $(BIN_DIR)/$(IMG_PREFIX)-vmlinux.elf
-endef
-
-$(eval $(call BuildImage))
diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile
deleted file mode 100644
index 23eb5280d..000000000
--- a/target/linux/ramips/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (C) 2008-2009 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-ARCH:=mipsel
-BOARD:=ramips
-BOARDNAME:=Ralink RT288x/RT305x
-SUBTARGETS:=rt288x rt305x
-CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -funit-at-a-time
-FEATURES:=squashfs broken
-
-LINUX_VERSION:=2.6.32.10
-
-include $(INCLUDE_DIR)/target.mk
-DEFAULT_PACKAGES+=kmod-leds-gpio wpad-mini
-
-define Target/Description
-	Build firmware images for Ralink RT288x/RT305x based boards.
-endef
-
-$(eval $(call BuildTarget))
diff --git a/target/linux/ramips/base-files/etc/inittab b/target/linux/ramips/base-files/etc/inittab
deleted file mode 100644
index 7989a7f60..000000000
--- a/target/linux/ramips/base-files/etc/inittab
+++ /dev/null
@@ -1,4 +0,0 @@
-::sysinit:/etc/init.d/rcS S boot
-::shutdown:/etc/init.d/rcS K stop
-ttyS0::askfirst:/bin/ash --login
-ttyS1::askfirst:/bin/ash --login
diff --git a/target/linux/ramips/base-files/etc/uci-defaults/network b/target/linux/ramips/base-files/etc/uci-defaults/network
deleted file mode 100755
index 8d4c6d547..000000000
--- a/target/linux/ramips/base-files/etc/uci-defaults/network
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-RT305X=`cat /proc/cpuinfo | grep RT305`
-[ -z "${RT305X}" ] || {
-	uci batch <<EOF
-set network.lan.ifname=eth0.1
-set network.wan=interface
-set network.wan.ifname=eth0.2
-set network.wan.proto=dhcp
-commit network
-EOF
-}
-
-uci commit network
diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/common.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/common.h
deleted file mode 100644
index 4fd732432..000000000
--- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/common.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
- *
- *  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 __ASM_MACH_RALINK_COMMON_H
-#define __ASM_MACH_RALINK_COMMON_H
-
-#define RAMIPS_SYS_TYPE_LEN	64
-extern unsigned char ramips_sys_type[RAMIPS_SYS_TYPE_LEN];
-
-void __init ramips_intc_irq_init(unsigned intc_base, unsigned irq,
-				 unsigned irq_base);
-u32 ramips_intc_get_status(void);
-
-void __init ramips_soc_setup(void);
-void __init ramips_gpio_init(void);
-void __init ramips_early_serial_setup(int line, unsigned base, unsigned freq,
-				      unsigned irq);
-
-#endif /* __ASM_MACH_RALINK_COMMON_H */
diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/dev-gpio-buttons.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/dev-gpio-buttons.h
deleted file mode 100644
index c1ae71e8f..000000000
--- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/dev-gpio-buttons.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- *  Ralink SoC GPIO button support
- *
- *  Copyright (C) 2010 Gabor Juhos <juhosg@openwrt.org>
- *
- *  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 __ASM_MACH_RALINK_DEV_GPIO_BUTTONS_H
-#define __ASM_MACH_RALINK_DEV_GPIO_BUTTONS_H
-
-#include <linux/input.h>
-#include <linux/gpio_buttons.h>
-
-#ifdef CONFIG_RALINK_DEV_GPIO_BUTTONS
-void __init ramips_register_gpio_buttons(int id,
-					 unsigned poll_interval,
-					 unsigned nbuttons,
-					 struct gpio_button *buttons);
-#else
-static inline void ramips_register_gpio_buttons(int id,
-						unsigned poll_interval,
-						unsigned nbuttons,
-						struct gpio_button *buttons);
-{
-}
-#endif
-
-#endif /* __ASM_MACH_RALINK_DEV_GPIO_BUTTONS_H */
diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/dev-gpio-leds.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/dev-gpio-leds.h
deleted file mode 100644
index ad2ed2667..000000000
--- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/dev-gpio-leds.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *  Ralink SoC GPIO LED device support
- *
- *  Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
- *
- *  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 __ASM_MACH_RALINK_DEV_GPIO_LEDS_H
-#define __ASM_MACH_RALINK_DEV_GPIO_LEDS_H
-
-#include <linux/leds.h>
-
-#ifdef CONFIG_RALINK_DEV_GPIO_LEDS
-__init void ramips_register_gpio_leds(int id, unsigned num_leds,
-				      struct gpio_led *leds);
-#else
-static inline void ramips_register_gpio_leds(int id, unsigned num_leds,
-					     struct gpio_led *leds)
-{
-}
-#endif
-
-#endif /* __ASM_MACH_RALINK_DEV_GPIO_LEDS_H */
diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/gpio.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/gpio.h
deleted file mode 100644
index f68ee1685..000000000
--- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/gpio.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  Ralink SoC GPIO API support
- *
- *  Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
- *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
- *
- *  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 __ASM_MACH_RALINK_GPIO_H
-#define __ASM_MACH_RALINK_GPIO_H
-
-#define ARCH_NR_GPIOS	128
-#include <asm-generic/gpio.h>
-
-#define gpio_get_value	__gpio_get_value
-#define gpio_set_value	__gpio_set_value
-#define gpio_cansleep	__gpio_cansleep
-#define gpio_to_irq	__gpio_to_irq
-
-#endif /* __ASM_MACH_RALINK_GPIO_H */
diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/irq.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/irq.h
deleted file mode 100644
index 90bfea371..000000000
--- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/irq.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- *  Copyright (C) 2008 Gabor Juhos <juhosg@openwrt.org>
- *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
- *
- *  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 __ASM_MACH_RT288X_IRQ_H
-#define __ASM_MACH_RT288X_IRQ_H
-
-#define MIPS_CPU_IRQ_BASE	0
-#define NR_IRQS			48
-
-#include_next <irq.h>
-
-#endif /* __ASM_MACH_RT288X_IRQ_H */
diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h
deleted file mode 100644
index 22e2b6462..000000000
--- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Ralink machine types
- *
- * Copyright (C) 2010 Joonas Lahtinen <joonas.lahtinen@gmail.com>
- * Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
- *
- * 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.
- */
-
-#include <asm/mips_machine.h>
-
-enum ramips_mach_type {
-	RAMIPS_MACH_GENERIC,
-	/* RT2880 based machines */
-	RAMIPS_MACH_RT_N15,		/* Asus RT-N15 */
-	RAMIPS_MACH_WZR_AGL300NH,	/* Buffalo WZR-AGL300NH */
-
-	/* RT3050 based machines */
-	RAMIPS_MACH_DIR_300_REVB,	/* D-Link DIR-300 rev B */
-
-	/* RT3052 based machines */
-	RAMIPS_MACH_V22RW_2X2,		/* Ralink AP-RT3052-V22RW-2X2 */
-	RAMIPS_MACH_WHR_G300N,		/* Buffalo WHR-G300N */
-	RAMIPS_MACH_FONERA20N,		/* La Fonera 2.0N */
-};
diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/ramips_eth_platform.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/ramips_eth_platform.h
deleted file mode 100644
index ec1e7d4fa..000000000
--- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/ramips_eth_platform.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- *   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; version 2 of the License
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- *
- *   based on Ralink SDK3.3
- *   Copyright (C) 2009 John Crispin <blogic@openwrt.org>
- */
-
-#ifndef _RAMIPS_ETH_PLATFORM_H
-#define _RAMIPS_ETH_PLATFORM_H
-
-struct ramips_eth_platform_data
-{
-	unsigned char mac[6];
-	void (*reset_fe)(void);
-	int min_pkt_len;
-	unsigned long sys_freq;
-};
-
-#endif /* _RAMIPS_ETH_PLATFORM_H */
-
diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x.h
deleted file mode 100644
index a804488f0..000000000
--- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Ralink RT288x SoC specific definitions
- *
- * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
- * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
- *
- * Parts of this file are based on Ralink's 2.6.21 BSP
- *
- * 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 _RT288X_H_
-#define _RT288X_H_
-
-#include <linux/init.h>
-#include <linux/io.h>
-
-void rt288x_detect_sys_type(void) __init;
-void rt288x_detect_sys_freq(void) __init;
-
-extern unsigned long rt288x_cpu_freq;
-extern unsigned long rt288x_sys_freq;
-
-#define RT288X_CPU_IRQ_BASE	0
-#define RT288X_INTC_IRQ_BASE	8
-#define RT288X_INTC_IRQ_COUNT	32
-#define RT288X_GPIO_IRQ_BASE	40
-
-#define RT288X_CPU_IRQ_INTC	(RT288X_CPU_IRQ_BASE + 2)
-#define RT288X_CPU_IRQ_PCI	(RT288X_CPU_IRQ_BASE + 4)
-#define RT288X_CPU_IRQ_FE	(RT288X_CPU_IRQ_BASE + 5)
-#define RT288X_CPU_IRQ_WNIC	(RT288X_CPU_IRQ_BASE + 6)
-#define RT288X_CPU_IRQ_COUNTER	(RT288X_CPU_IRQ_BASE + 7)
-
-#define RT2880_INTC_IRQ_TIMER0	(RT288X_INTC_IRQ_BASE + 0)
-#define RT2880_INTC_IRQ_TIMER1	(RT288X_INTC_IRQ_BASE + 1)
-#define RT2880_INTC_IRQ_UART0	(RT288X_INTC_IRQ_BASE + 2)
-#define RT2880_INTC_IRQ_PIO	(RT288X_INTC_IRQ_BASE + 3)
-#define RT2880_INTC_IRQ_PCM	(RT288X_INTC_IRQ_BASE + 4)
-#define RT2880_INTC_IRQ_UART1	(RT288X_INTC_IRQ_BASE + 8)
-#define RT2880_INTC_IRQ_IA	(RT288X_INTC_IRQ_BASE + 23)
-
-#define RT288X_GPIO_IRQ(x)	(RT288X_GPIO_IRQ_BASE + (x))
-#define RT288X_GPIO_COUNT	32
-
-extern void __iomem *rt288x_sysc_base;
-extern void __iomem *rt288x_memc_base;
-
-static inline void rt288x_sysc_wr(u32 val, unsigned reg)
-{
-	__raw_writel(val, rt288x_sysc_base + reg);
-}
-
-static inline u32 rt288x_sysc_rr(unsigned reg)
-{
-	return __raw_readl(rt288x_sysc_base + reg);
-}
-
-static inline void rt288x_memc_wr(u32 val, unsigned reg)
-{
-	__raw_writel(val, rt288x_memc_base + reg);
-}
-
-static inline u32 rt288x_memc_rr(unsigned reg)
-{
-	return __raw_readl(rt288x_memc_base + reg);
-}
-
-void rt288x_gpio_init(u32 mode) __init;
-
-#endif /* _RT228X_H_ */
diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x/cpu-feature-overrides.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x/cpu-feature-overrides.h
deleted file mode 100644
index 5e2736332..000000000
--- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x/cpu-feature-overrides.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Ralink RT288x specific CPU feature overrides
- *
- * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
- * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
- *
- * This file was derived from: include/asm-mips/cpu-features.h
- *	Copyright (C) 2003, 2004 Ralf Baechle
- *	Copyright (C) 2004 Maciej W. Rozycki
- *
- * 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 __ASM_MACH_RALINK_CPU_FEATURE_OVERRIDES_H
-#define __ASM_MACH_RALINK_CPU_FEATURE_OVERRIDES_H
-
-#define cpu_has_tlb		1
-#define cpu_has_4kex		1
-#define cpu_has_3k_cache	0
-#define cpu_has_4k_cache	1
-#define cpu_has_tx39_cache	0
-#define cpu_has_sb1_cache	0
-#define cpu_has_fpu		0
-#define cpu_has_32fpr		0
-#define cpu_has_counter		1
-#define cpu_has_watch		1
-#define cpu_has_divec		1
-
-#define cpu_has_prefetch	1
-#define cpu_has_ejtag		1
-#define cpu_has_llsc		1
-
-#define cpu_has_mips16		1
-#define cpu_has_mdmx		0
-#define cpu_has_mips3d		0
-#define cpu_has_smartmips	0
-
-#define cpu_has_mips32r1	1
-#define cpu_has_mips32r2	1
-#define cpu_has_mips64r1	0
-#define cpu_has_mips64r2	0
-
-#define cpu_has_dsp		0
-#define cpu_has_mipsmt		0
-
-#define cpu_has_64bits		0
-#define cpu_has_64bit_zero_reg	0
-#define cpu_has_64bit_gp_regs	0
-#define cpu_has_64bit_addresses	0
-
-#define cpu_dcache_line_size()	16
-#define cpu_icache_line_size()	16
-
-#endif /* __ASM_MACH_RALINK_CPU_FEATURE_OVERRIDES_H */
diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x/ralink_soc.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x/ralink_soc.h
deleted file mode 100644
index 60ca647d8..000000000
--- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x/ralink_soc.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Ralink RT288x specific SOC defines
- *
- * Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
- *
- * 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 __RT288X_RALINK_SOC_H
-#define __RT288X_RALINK_SOC_H
-
-#define RALINK_SOC_SDRAM_BASE		0x08000000
-#define RALINK_SOC_MEM_SIZE_MIN		(2 * 1024 * 1024)
-#define RALINK_SOC_MEM_SIZE_MAX		(128 * 1024 * 1024)
-
-#define RALINK_SOC_GPIO_BASE	0x300600
-
-#define RALINK_SOC_GPIO0_COUNT	24
-#define RALINK_SOC_GPIO1_COUNT	16
-#define RALINK_SOC_GPIO2_COUNT	32
-
-#endif /* __RT288X_RALINK_SOC_H */
diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x_regs.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x_regs.h
deleted file mode 100644
index 1dd6c2dce..000000000
--- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x_regs.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- *  Ralink RT288x SoC register definitions
- *
- *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
- *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
- *
- *  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 _RT288X_REGS_H_
-#define _RT288X_REGS_H_
-
-#include <linux/bitops.h>
-
-#define RT2880_SYSC_BASE 	0x00300000
-#define RT2880_TIMER_BASE	0x00300100
-#define RT2880_INTC_BASE	0x00300200
-#define RT2880_MEMC_BASE	0x00300300
-#define RT2880_UART0_BASE	0x00300500
-#define RT2880_PIO_BASE		0x00300600
-#define RT2880_I2C_BASE		0x00300900
-#define RT2880_SPI_BASE		0x00300b00
-#define RT2880_UART1_BASE	0x00300c00
-#define RT2880_FE_BASE		0x00400000
-#define RT2880_ROM_BASE		0x00410000
-#define RT2880_PCM_BASE		0x00420000
-#define RT2880_PCI_BASE		0x00440000
-#define RT2880_WMAC_BASE	0x00480000
-#define RT2880_FLASH1_BASE	0x01000000
-#define RT2880_FLASH0_BASE	0x1fc00000
-#define RT2880_SDRAM_BASE	0x08000000
-
-#define RT2880_SYSC_SIZE	0x100
-#define RT2880_INTC_SIZE	0x100
-#define RT2880_MEMC_SIZE	0x100
-#define RT2880_UART0_SIZE	0x100
-#define RT2880_UART1_SIZE	0x100
-#define RT2880_FLASH1_SIZE	(16 * 1024 * 1024)
-#define RT2880_FLASH0_SIZE	(4 * 1024 * 1024)
-
-/* SYSC registers */
-#define SYSC_REG_CHIP_NAME0	0x000	/* Chip Name 0 */
-#define SYSC_REG_CHIP_NAME1	0x004	/* Chip Name 1 */
-#define SYSC_REG_CHIP_ID	0x00c	/* Chip Identification */
-#define SYSC_REG_SYSTEM_CONFIG	0x010	/* System Configuration */
-#define SYSC_REG_RESET_CTRL	0x034	/* Reset Control*/
-#define SYSC_REG_RESET_STATUS	0x038	/* Reset Status*/
-#define SYSC_REG_GPIO_MODE	0x060	/* GPIO Purpose Select */
-#define SYSC_REG_IA_ADDRESS	0x310	/* Illegal Access Address */
-#define SYSC_REG_IA_TYPE	0x314	/* Illegal Access Type */
-
-#define CHIP_ID_ID_MASK		0xff
-#define CHIP_ID_ID_SHIFT	8
-#define CHIP_ID_REV_MASK	0xff
-
-#define SYSTEM_CONFIG_CPUCLK_SHIFT	20
-#define SYSTEM_CONFIG_CPUCLK_MASK	0x3
-#define SYSTEM_CONFIG_CPUCLK_250	0x0
-#define SYSTEM_CONFIG_CPUCLK_266	0x1
-#define SYSTEM_CONFIG_CPUCLK_280	0x2
-#define SYSTEM_CONFIG_CPUCLK_300	0x3
-
-#define RT2880_RESET_SYSTEM	BIT(0)
-#define RT2880_RESET_TIMER	BIT(1)
-#define RT2880_RESET_INTC	BIT(2)
-#define RT2880_RESET_MEMC	BIT(3)
-#define RT2880_RESET_CPU	BIT(4)
-#define RT2880_RESET_UART0	BIT(5)
-#define RT2880_RESET_PIO	BIT(6)
-#define RT2880_RESET_I2C	BIT(9)
-#define RT2880_RESET_SPI	BIT(11)
-#define RT2880_RESET_UART1	BIT(12)
-#define RT2880_RESET_PCI	BIT(16)
-#define RT2880_RESET_WMAC	BIT(17)
-#define RT2880_RESET_FE		BIT(18)
-#define RT2880_RESET_PCM	BIT(19)
-
-#define RT2880_GPIO_MODE_I2C	BIT(0)
-#define RT2880_GPIO_MODE_UART0	BIT(1)
-#define RT2880_GPIO_MODE_SPI	BIT(2)
-#define RT2880_GPIO_MODE_UART1	BIT(3)
-#define RT2880_GPIO_MODE_JTAG	BIT(4)
-#define RT2880_GPIO_MODE_MDIO	BIT(5)
-#define RT2880_GPIO_MODE_SDRAM	BIT(6)
-#define RT2880_GPIO_MODE_PCI	BIT(7)
-
-#define RT2880_INTC_INT_TIMER0	BIT(0)
-#define RT2880_INTC_INT_TIMER1	BIT(1)
-#define RT2880_INTC_INT_UART0	BIT(2)
-#define RT2880_INTC_INT_PIO	BIT(3)
-#define RT2880_INTC_INT_PCM	BIT(4)
-#define RT2880_INTC_INT_UART1	BIT(8)
-#define RT2880_INTC_INT_IA	BIT(23)
-#define RT2880_INTC_INT_GLOBAL	BIT(31)
-
-/* MEMC registers */
-#define MEMC_REG_SDRAM_CFG0	0x00
-#define MEMC_REG_SDRAM_CFG1	0x04
-#define MEMC_REG_FLASH_CFG0	0x08
-#define MEMC_REG_FLASH_CFG1	0x0c
-#define MEMC_REG_IA_ADDR	0x10
-#define MEMC_REG_IA_TYPE	0x14
-
-#define FLASH_CFG_WIDTH_SHIFT	26
-#define FLASH_CFG_WIDTH_MASK	0x3
-#define FLASH_CFG_WIDTH_8BIT	0x0
-#define FLASH_CFG_WIDTH_16BIT	0x1
-#define FLASH_CFG_WIDTH_32BIT	0x2
-
-/* UART registers */
-#define UART_REG_RX	0
-#define UART_REG_TX	1
-#define UART_REG_IER	2
-#define UART_REG_IIR	3
-#define UART_REG_FCR	4
-#define UART_REG_LCR	5
-#define UART_REG_MCR	6
-#define UART_REG_LSR	7
-
-#endif /* _RT288X_REGS_H_ */
diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt305x.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt305x.h
deleted file mode 100644
index 195bfbe51..000000000
--- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt305x.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Ralink RT305x SoC specific definitions
- *
- * Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
- *
- * Parts of this file are based on Ralink's 2.6.21 BSP
- *
- * 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 _RT305X_H_
-#define _RT305X_H_
-
-#include <linux/init.h>
-#include <linux/io.h>
-
-void rt305x_detect_sys_type(void) __init;
-void rt305x_detect_sys_freq(void) __init;
-
-extern unsigned long rt305x_cpu_freq;
-extern unsigned long rt305x_sys_freq;
-
-#define RT305X_MEM_SIZE_MIN (2 * 1024 * 1024)
-#define RT305X_MEM_SIZE_MAX (64 * 1024 * 1024)
-
-#define RT305X_CPU_IRQ_BASE	0
-#define RT305X_INTC_IRQ_BASE	8
-#define RT305X_INTC_IRQ_COUNT	32
-#define RT305X_GPIO_IRQ_BASE	40
-
-#define RT305X_CPU_IRQ_INTC	(RT305X_CPU_IRQ_BASE + 2)
-#define RT305X_CPU_IRQ_FE	(RT305X_CPU_IRQ_BASE + 5)
-#define RT305X_CPU_IRQ_WNIC	(RT305X_CPU_IRQ_BASE + 6)
-#define RT305X_CPU_IRQ_COUNTER	(RT305X_CPU_IRQ_BASE + 7)
-
-#define RT305X_INTC_IRQ_SYSCTL	(RT305X_INTC_IRQ_BASE + 0)
-#define RT305X_INTC_IRQ_TIMER0	(RT305X_INTC_IRQ_BASE + 1)
-#define RT305X_INTC_IRQ_TIMER1	(RT305X_INTC_IRQ_BASE + 2)
-#define RT305X_INTC_IRQ_IA	(RT305X_INTC_IRQ_BASE + 3)
-#define RT305X_INTC_IRQ_PCM	(RT305X_INTC_IRQ_BASE + 4)
-#define RT305X_INTC_IRQ_UART0	(RT305X_INTC_IRQ_BASE + 5)
-#define RT305X_INTC_IRQ_PIO	(RT305X_INTC_IRQ_BASE + 6)
-#define RT305X_INTC_IRQ_DMA	(RT305X_INTC_IRQ_BASE + 7)
-#define RT305X_INTC_IRQ_NAND	(RT305X_INTC_IRQ_BASE + 8)
-#define RT305X_INTC_IRQ_PERFC	(RT305X_INTC_IRQ_BASE + 9)
-#define RT305X_INTC_IRQ_I2S	(RT305X_INTC_IRQ_BASE + 10)
-#define RT305X_INTC_IRQ_UART1	(RT305X_INTC_IRQ_BASE + 12)
-#define RT305X_INTC_IRQ_ESW	(RT305X_INTC_IRQ_BASE + 17)
-#define RT305X_INTC_IRQ_OTG	(RT305X_INTC_IRQ_BASE + 18)
-
-extern void __iomem *rt305x_sysc_base;
-extern void __iomem *rt305x_memc_base;
-
-static inline void rt305x_sysc_wr(u32 val, unsigned reg)
-{
-	__raw_writel(val, rt305x_sysc_base + reg);
-}
-
-static inline u32 rt305x_sysc_rr(unsigned reg)
-{
-	return __raw_readl(rt305x_sysc_base + reg);
-}
-
-static inline void rt305x_memc_wr(u32 val, unsigned reg)
-{
-	__raw_writel(val, rt305x_memc_base + reg);
-}
-
-static inline u32 rt305x_memc_rr(unsigned reg)
-{
-	return __raw_readl(rt305x_memc_base + reg);
-}
-
-#define RT305X_GPIO_I2C_SD	1
-#define RT305X_GPIO_I2C_SCLK	2
-#define RT305X_GPIO_SPI_EN	3
-#define RT305X_GPIO_SPI_CLK	4
-#define RT305X_GPIO_SPI_DOUT	5
-#define RT305X_GPIO_SPI_DIN	6
-/* GPIO 7-14 is shared between UART0, PCM  and I2S interfaces */
-#define RT305X_GPIO_7		7
-#define RT305X_GPIO_8		8
-#define RT305X_GPIO_9		9
-#define RT305X_GPIO_10		10
-#define RT305X_GPIO_11		11
-#define RT305X_GPIO_12		12
-#define RT305X_GPIO_13		13
-#define RT305X_GPIO_14		14
-#define RT305X_GPIO_UART1_TXD	15
-#define RT305X_GPIO_UART1_RXD	16
-#define RT305X_GPIO_JTAG_TDO	17
-#define RT305X_GPIO_JTAG_TDI	18
-#define RT305X_GPIO_JTAG_TMS	19
-#define RT305X_GPIO_JTAG_TCLK	20
-#define RT305X_GPIO_JTAG_TRST_N	21
-#define RT305X_GPIO_MDIO_MDC	22
-#define RT305X_GPIO_MDIO_MDIO	23
-#define RT305X_GPIO_SDRAM_MD16	24
-#define RT305X_GPIO_SDRAM_MD17	25
-#define RT305X_GPIO_SDRAM_MD18	26
-#define RT305X_GPIO_SDRAM_MD19	27
-#define RT305X_GPIO_SDRAM_MD20	28
-#define RT305X_GPIO_SDRAM_MD21	29
-#define RT305X_GPIO_SDRAM_MD22	30
-#define RT305X_GPIO_SDRAM_MD23	31
-#define RT305X_GPIO_SDRAM_MD24	32
-#define RT305X_GPIO_SDRAM_MD25	33
-#define RT305X_GPIO_SDRAM_MD26	34
-#define RT305X_GPIO_SDRAM_MD27	35
-#define RT305X_GPIO_SDRAM_MD28	36
-#define RT305X_GPIO_SDRAM_MD29	37
-#define RT305X_GPIO_SDRAM_MD30	38
-#define RT305X_GPIO_SDRAM_MD31	39
-#define RT305X_GPIO_GE0_TXD0	40
-#define RT305X_GPIO_GE0_TXD1	41
-#define RT305X_GPIO_GE0_TXD2	42
-#define RT305X_GPIO_GE0_TXD3	43
-#define RT305X_GPIO_GE0_TXEN	44
-#define RT305X_GPIO_GE0_TXCLK	45
-#define RT305X_GPIO_GE0_RXD0	46
-#define RT305X_GPIO_GE0_RXD1	47
-#define RT305X_GPIO_GE0_RXD2	48
-#define RT305X_GPIO_GE0_RXD3	49
-#define RT305X_GPIO_GE0_RXDV	50
-#define RT305X_GPIO_GE0_RXCLK	51
-
-void rt305x_gpio_init(u32 mode) __init;
-
-#endif /* _RT305X_H_ */
diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt305x/cpu-feature-overrides.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt305x/cpu-feature-overrides.h
deleted file mode 100644
index 3295d1a55..000000000
--- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt305x/cpu-feature-overrides.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Ralink RT305x specific CPU feature overrides
- *
- * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
- * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
- *
- * This file was derived from: include/asm-mips/cpu-features.h
- *	Copyright (C) 2003, 2004 Ralf Baechle
- *	Copyright (C) 2004 Maciej W. Rozycki
- *
- * 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 __ASM_MACH_RALINK_CPU_FEATURE_OVERRIDES_H
-#define __ASM_MACH_RALINK_CPU_FEATURE_OVERRIDES_H
-
-#define cpu_has_tlb		1
-#define cpu_has_4kex		1
-#define cpu_has_3k_cache	0
-#define cpu_has_4k_cache	1
-#define cpu_has_tx39_cache	0
-#define cpu_has_sb1_cache	0
-#define cpu_has_fpu		0
-#define cpu_has_32fpr		0
-#define cpu_has_counter		1
-#define cpu_has_watch		1
-#define cpu_has_divec		1
-
-#define cpu_has_prefetch	1
-#define cpu_has_ejtag		1
-#define cpu_has_llsc		1
-
-#define cpu_has_mips16		1
-#define cpu_has_mdmx		0
-#define cpu_has_mips3d		0
-#define cpu_has_smartmips	0
-
-#define cpu_has_mips32r1	1
-#define cpu_has_mips32r2	1
-#define cpu_has_mips64r1	0
-#define cpu_has_mips64r2	0
-
-#define cpu_has_dsp		0
-#define cpu_has_mipsmt		0
-
-#define cpu_has_64bits		0
-#define cpu_has_64bit_zero_reg	0
-#define cpu_has_64bit_gp_regs	0
-#define cpu_has_64bit_addresses	0
-
-#define cpu_dcache_line_size()	32
-#define cpu_icache_line_size()	32
-
-#endif /* __ASM_MACH_RALINK_CPU_FEATURE_OVERRIDES_H */
diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt305x/ralink_soc.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt305x/ralink_soc.h
deleted file mode 100644
index fd0e8b304..000000000
--- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt305x/ralink_soc.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Ralink RT305x specific SOC defines
- *
- * Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
- *
- * 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 __RT288X_RALINK_SOC_H
-#define __RT288X_RALINK_SOC_H
-
-#define RALINK_SOC_SDRAM_BASE		0
-#define RALINK_SOC_MEM_SIZE_MIN		(2 * 1024 * 1024)
-#define RALINK_SOC_MEM_SIZE_MAX		(64 * 1024 * 1024)
-
-#define RALINK_SOC_GPIO_BASE	0x10000600
-
-#define RALINK_SOC_GPIO0_COUNT	24
-#define RALINK_SOC_GPIO1_COUNT	16
-#define RALINK_SOC_GPIO2_COUNT	12
-
-#endif /* __RT288X_RALINK_SOC_H */
diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt305x_regs.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt305x_regs.h
deleted file mode 100644
index 6e7b9e8e6..000000000
--- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt305x_regs.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- *  Ralink RT305 SoC register definitions
- *
- *  Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
- *
- *  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 _RT305X_REGS_H_
-#define _RT305X_REGS_H_
-
-#include <linux/bitops.h>
-
-#define RT305X_SDRAM_BASE	0x00000000
-#define RT305X_SYSC_BASE	0x10000000
-#define RT305X_TIMER_BASE	0x10000100
-#define RT305X_INTC_BASE	0x10000200
-#define RT305X_MEMC_BASE	0x10000300
-#define RT305X_PCM_BASE		0x10000400
-#define RT305X_UART0_BASE	0x10000500
-#define RT305X_GDMA_BASE	0x10000700
-#define RT305X_NANDC_BASE	0x10000800
-#define RT305X_I2C_BASE		0x10000900
-#define RT305X_I2S_BASE		0x10000a00
-#define RT305X_SPI_BASE		0x10000b00
-#define RT305X_UART1_BASE	0x10000c00
-#define RT305X_FE_BASE		0x10100000
-#define RT305X_SWITCH_BASE	0x10110000
-#define RT305X_WMAC_BASE	0x10180000
-#define RT305X_OTG_BASE		0x101c0000
-#define RT305X_ROM_BASE		0x00400000
-#define RT305X_FLASH1_BASE	0x1b000000
-#define RT305X_FLASH0_BASE	0x1f000000
-
-#define RT305X_SYSC_SIZE	0x100
-#define RT305X_TIMER_SIZE	0x100
-#define RT305X_INTC_SIZE	0x100
-#define RT305X_MEMC_SIZE	0x100
-#define RT305X_UART0_SIZE	0x100
-#define RT305X_UART1_SIZE	0x100
-#define RT305X_FLASH1_SIZE	(16 * 1024 * 1024)
-#define RT305X_FLASH0_SIZE	(8 * 1024 * 1024)
-
-/* SYSC registers */
-#define SYSC_REG_CHIP_NAME0	0x000	/* Chip Name 0 */
-#define SYSC_REG_CHIP_NAME1	0x004	/* Chip Name 1 */
-#define SYSC_REG_CHIP_ID	0x00c	/* Chip Identification */
-#define SYSC_REG_SYSTEM_CONFIG	0x010	/* System Configuration */
-#define SYSC_REG_RESET_CTRL	0x034	/* Reset Control*/
-#define SYSC_REG_RESET_STATUS	0x038	/* Reset Status*/
-#define SYSC_REG_GPIO_MODE	0x060	/* GPIO Purpose Select */
-#define SYSC_REG_IA_ADDRESS	0x310	/* Illegal Access Address */
-#define SYSC_REG_IA_TYPE	0x314	/* Illegal Access Type */
-
-#define CHIP_ID_ID_MASK		0xff
-#define CHIP_ID_ID_SHIFT	8
-#define CHIP_ID_REV_MASK	0xff
-
-#define SYSTEM_CONFIG_CPUCLK_SHIFT	18
-#define SYSTEM_CONFIG_CPUCLK_MASK	0x1
-#define SYSTEM_CONFIG_CPUCLK_320	0x0
-#define SYSTEM_CONFIG_CPUCLK_384	0x1
-
-#define RT305X_GPIO_MODE_I2C		BIT(0)
-#define RT305X_GPIO_MODE_SPI		BIT(1)
-#define RT305X_GPIO_MODE_UART0_SHIFT	2
-#define RT305X_GPIO_MODE_UART0_MASK	0x7
-#define RT305X_GPIO_MODE_UART0(x)	((x) << RT305X_GPIO_MODE_UART0_SHIFT)
-#define RT305X_GPIO_MODE_UARTF		0x0
-#define RT305X_GPIO_MODE_PCM_UARTF	0x1
-#define RT305X_GPIO_MODE_PCM_I2S	0x2
-#define RT305X_GPIO_MODE_I2S_UARTF	0x3
-#define RT305X_GPIO_MODE_PCM_GPIO	0x4
-#define RT305X_GPIO_MODE_GPIO_UARTF	0x5
-#define RT305X_GPIO_MODE_GPIO_I2S	0x6
-#define RT305X_GPIO_MODE_GPIO		0x7
-#define RT305X_GPIO_MODE_UART1		BIT(5)
-#define RT305X_GPIO_MODE_JTAG		BIT(6)
-#define RT305X_GPIO_MODE_MDIO		BIT(7)
-#define RT305X_GPIO_MODE_SDRAM		BIT(8)
-#define RT305X_GPIO_MODE_RGMII		BIT(9)
-
-#define RT305X_RESET_SYSTEM	BIT(0)
-#define RT305X_RESET_TIMER	BIT(8)
-#define RT305X_RESET_INTC	BIT(9)
-#define RT305X_RESET_MEMC	BIT(10)
-#define RT305X_RESET_PCM	BIT(11)
-#define RT305X_RESET_UART0	BIT(12)
-#define RT305X_RESET_PIO	BIT(13)
-#define RT305X_RESET_DMA	BIT(14)
-#define RT305X_RESET_I2C	BIT(16)
-#define RT305X_RESET_I2S	BIT(17)
-#define RT305X_RESET_SPI	BIT(18)
-#define RT305X_RESET_UART1	BIT(19)
-#define RT305X_RESET_WNIC	BIT(20)
-#define RT305X_RESET_FE		BIT(21)
-#define RT305X_RESET_OTG	BIT(22)
-#define RT305X_RESET_ESW	BIT(23)
-
-#define RT305X_INTC_INT_SYSCTL	BIT(0)
-#define RT305X_INTC_INT_TIMER0	BIT(1)
-#define RT305X_INTC_INT_TIMER1	BIT(2)
-#define RT305X_INTC_INT_IA	BIT(3)
-#define RT305X_INTC_INT_PCM	BIT(4)
-#define RT305X_INTC_INT_UART0	BIT(5)
-#define RT305X_INTC_INT_PIO	BIT(6)
-#define RT305X_INTC_INT_DMA	BIT(7)
-#define RT305X_INTC_INT_NAND	BIT(8)
-#define RT305X_INTC_INT_PERFC	BIT(9)
-#define RT305X_INTC_INT_I2S	BIT(10)
-#define RT305X_INTC_INT_UART1	BIT(12)
-#define RT305X_INTC_INT_ESW	BIT(17)
-#define RT305X_INTC_INT_OTG	BIT(18)
-#define RT305X_INTC_INT_GLOBAL	BIT(31)
-
-/* MEMC registers */
-#define MEMC_REG_SDRAM_CFG0	0x00
-#define MEMC_REG_SDRAM_CFG1	0x04
-#define MEMC_REG_FLASH_CFG0	0x08
-#define MEMC_REG_FLASH_CFG1	0x0c
-#define MEMC_REG_IA_ADDR	0x10
-#define MEMC_REG_IA_TYPE	0x14
-
-#define FLASH_CFG_WIDTH_SHIFT	26
-#define FLASH_CFG_WIDTH_MASK	0x3
-#define FLASH_CFG_WIDTH_8BIT	0x0
-#define FLASH_CFG_WIDTH_16BIT	0x1
-#define FLASH_CFG_WIDTH_32BIT	0x2
-
-/* UART registers */
-#define UART_REG_RX	0
-#define UART_REG_TX	1
-#define UART_REG_IER	2
-#define UART_REG_IIR	3
-#define UART_REG_FCR	4
-#define UART_REG_LCR	5
-#define UART_REG_MCR	6
-#define UART_REG_LSR	7
-
-#endif /* _RT305X_REGS_H_ */
diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/war.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/war.h
deleted file mode 100644
index a7b712cf2..000000000
--- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/war.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MACH_RALINK_WAR_H
-#define __ASM_MACH_RALINK_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR	0
-#define R4600_V1_HIT_CACHEOP_WAR	0
-#define R4600_V2_HIT_CACHEOP_WAR	0
-#define R5432_CP0_INTERRUPT_WAR		0
-#define BCM1250_M3_WAR			0
-#define SIBYTE_1956_WAR			0
-#define MIPS4K_ICACHE_REFILL_WAR	0
-#define MIPS_CACHE_SYNC_WAR		0
-#define TX49XX_ICACHE_INDEX_INV_WAR	0
-#define RM9000_CDEX_SMP_WAR		0
-#define ICACHE_REFILLS_WORKAROUND_WAR	0
-#define R10000_LLSC_WAR			0
-#define MIPS34K_MISSED_ITLB_WAR		0
-
-#endif /* __ASM_MACH_RALINK_WAR_H */
diff --git a/target/linux/ramips/files/arch/mips/pci/pci-rt288x.c b/target/linux/ramips/files/arch/mips/pci/pci-rt288x.c
deleted file mode 100644
index 475009cdd..000000000
--- a/target/linux/ramips/files/arch/mips/pci/pci-rt288x.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- *  Ralink RT288x SoC PCI register definitions
- *
- *  Copyright (C) 2009 John Crispin <blogic@openwrt.org>
- *  Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
- *
- *  Parts of this file are based on Ralink's 2.6.21 BSP
- *
- *  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.
- */
-
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/io.h>
-#include <linux/init.h>
-
-#include <asm/mach-ralink/rt288x.h>
-#include <asm/mach-ralink/rt288x_regs.h>
-
-#define RT2880_PCI_MEM_BASE	0x20000000
-#define RT2880_PCI_MEM_SIZE	0x10000000
-#define RT2880_PCI_IO_BASE	0x00460000
-#define RT2880_PCI_IO_SIZE	0x00010000
-
-#define RT2880_PCI_REG_PCICFG_ADDR	0x00
-#define RT2880_PCI_REG_PCIMSK_ADDR	0x0c
-#define RT2880_PCI_REG_BAR0SETUP_ADDR	0x10
-#define RT2880_PCI_REG_IMBASEBAR0_ADDR	0x18
-#define RT2880_PCI_REG_CONFIG_ADDR	0x20
-#define RT2880_PCI_REG_CONFIG_DATA	0x24
-#define RT2880_PCI_REG_MEMBASE		0x28
-#define RT2880_PCI_REG_IOBASE		0x2c
-#define RT2880_PCI_REG_ID		0x30
-#define RT2880_PCI_REG_CLASS		0x34
-#define RT2880_PCI_REG_SUBID		0x38
-#define RT2880_PCI_REG_ARBCTL		0x80
-
-static void __iomem *rt2880_pci_base;
-static DEFINE_SPINLOCK(rt2880_pci_lock);
-
-static u32 rt2880_pci_reg_read(u32 reg)
-{
-	return readl(rt2880_pci_base + reg);
-}
-
-static void rt2880_pci_reg_write(u32 val, u32 reg)
-{
-	writel(val, rt2880_pci_base + reg);
-}
-
-static inline u32 rt2880_pci_get_cfgaddr(unsigned int bus, unsigned int slot,
-					 unsigned int func, unsigned int where)
-{
-	return ((bus << 16) | (slot << 11) | (func << 8) | (where & 0xfc) |
-		0x80000000);
-}
-
-static int rt2880_pci_config_read(struct pci_bus *bus, unsigned int devfn,
-				  int where, int size, u32 *val)
-{
-	unsigned long flags;
-	u32 address;
-	u32 data;
-
-	address = rt2880_pci_get_cfgaddr(bus->number, PCI_SLOT(devfn),
-					 PCI_FUNC(devfn), where);
-
-	spin_lock_irqsave(&rt2880_pci_lock, flags);
-	rt2880_pci_reg_write(address, RT2880_PCI_REG_CONFIG_ADDR);
-	data = rt2880_pci_reg_read(RT2880_PCI_REG_CONFIG_DATA);
-	spin_unlock_irqrestore(&rt2880_pci_lock, flags);
-
-	switch (size) {
-	case 1:
-		*val = (data >> ((where & 3) << 3)) & 0xff;
-		break;
-	case 2:
-		*val = (data >> ((where & 3) << 3)) & 0xffff;
-		break;
-	case 4:
-		*val = data;
-		break;
-	}
-
-	return PCIBIOS_SUCCESSFUL;
-}
-
-static int rt2880_pci_config_write(struct pci_bus *bus, unsigned int devfn,
-				   int where, int size, u32 val)
-{
-	unsigned long flags;
-	u32 address;
-	u32 data;
-
-	address = rt2880_pci_get_cfgaddr(bus->number, PCI_SLOT(devfn),
-					 PCI_FUNC(devfn), where);
-
-	spin_lock_irqsave(&rt2880_pci_lock, flags);
-	rt2880_pci_reg_write(address, RT2880_PCI_REG_CONFIG_ADDR);
-	data = rt2880_pci_reg_read(RT2880_PCI_REG_CONFIG_DATA);
-
-	switch (size) {
-	case 1:
-		data = (data & ~(0xff << ((where & 3) << 3))) |
-		       (val << ((where & 3) << 3));
-		break;
-	case 2:
-		data = (data & ~(0xffff << ((where & 3) << 3))) |
-		       (val << ((where & 3) << 3));
-		break;
-	case 4:
-		data = val;
-		break;
-	}
-
-	rt2880_pci_reg_write(data, RT2880_PCI_REG_CONFIG_DATA);
-	spin_unlock_irqrestore(&rt2880_pci_lock, flags);
-
-	return PCIBIOS_SUCCESSFUL;
-}
-
-static struct pci_ops rt2880_pci_ops = {
-	.read	= rt2880_pci_config_read,
-	.write	= rt2880_pci_config_write,
-};
-
-static struct resource rt2880_pci_io_resource = {
-	.name	= "PCI MEM space",
-	.start	= RT2880_PCI_MEM_BASE,
-	.end	= RT2880_PCI_MEM_BASE + RT2880_PCI_MEM_SIZE - 1,
-	.flags	= IORESOURCE_MEM,
-};
-
-static struct resource rt2880_pci_mem_resource = {
-	.name	= "PCI IO space",
-	.start	= RT2880_PCI_IO_BASE,
-	.end	= RT2880_PCI_IO_BASE + RT2880_PCI_IO_SIZE - 1,
-	.flags	= IORESOURCE_IO,
-};
-
-static struct pci_controller rt2880_pci_controller = {
-	.pci_ops	= &rt2880_pci_ops,
-	.mem_resource	= &rt2880_pci_io_resource,
-	.io_resource	= &rt2880_pci_mem_resource,
-};
-
-static inline u32 rt2880_pci_read_u32(unsigned long reg)
-{
-	unsigned long flags;
-	u32 address;
-	u32 ret;
-
-	address = rt2880_pci_get_cfgaddr(0, 0, 0, reg);
-
-	spin_lock_irqsave(&rt2880_pci_lock, flags);
-	rt2880_pci_reg_write(address, RT2880_PCI_REG_CONFIG_ADDR);
-	ret = rt2880_pci_reg_read(RT2880_PCI_REG_CONFIG_DATA);
-	spin_unlock_irqrestore(&rt2880_pci_lock, flags);
-
-	return ret;
-}
-
-static inline void rt2880_pci_write_u32(unsigned long reg, u32 val)
-{
-	unsigned long flags;
-	u32 address;
-
-	address = rt2880_pci_get_cfgaddr(0, 0, 0, reg);
-
-	spin_lock_irqsave(&rt2880_pci_lock, flags);
-	rt2880_pci_reg_write(address, RT2880_PCI_REG_CONFIG_ADDR);
-	rt2880_pci_reg_write(val, RT2880_PCI_REG_CONFIG_DATA);
-	spin_unlock_irqrestore(&rt2880_pci_lock, flags);
-}
-
-int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
-{
-	u16 cmd;
-	int irq = -1;
-
-	if (dev->bus->number != 0)
-		return irq;
-
-	switch (PCI_SLOT(dev->devfn)) {
-	case 0x00:
-		rt2880_pci_write_u32(PCI_BASE_ADDRESS_0, 0x08000000);
-		(void) rt2880_pci_read_u32(PCI_BASE_ADDRESS_0);
-		break;
-	case 0x11:
-		irq = RT288X_CPU_IRQ_PCI;
-		break;
-	default:
-		printk("%s:%s[%d] trying to alloc unknown pci irq\n",
-		       __FILE__, __func__, __LINE__);
-		BUG();
-		break;
-	}
-
-	pci_write_config_byte((struct pci_dev*)dev, PCI_CACHE_LINE_SIZE, 0x14);
-	pci_write_config_byte((struct pci_dev*)dev, PCI_LATENCY_TIMER, 0xFF);
-	pci_read_config_word((struct pci_dev*)dev, PCI_COMMAND, &cmd);
-	cmd |= PCI_COMMAND_MASTER | PCI_COMMAND_IO | PCI_COMMAND_MEMORY |
-	       PCI_COMMAND_INVALIDATE | PCI_COMMAND_FAST_BACK |
-	       PCI_COMMAND_SERR | PCI_COMMAND_WAIT | PCI_COMMAND_PARITY;
-	pci_write_config_word((struct pci_dev*)dev, PCI_COMMAND, cmd);
-	pci_write_config_byte((struct pci_dev*)dev, PCI_INTERRUPT_LINE,
-			      dev->irq);
-	return irq;
-}
-
-static int __init rt2880_pci_init(void)
-{
-	int i;
-
-	rt2880_pci_base = ioremap_nocache(RT2880_PCI_BASE, PAGE_SIZE);
-
-	rt2880_pci_reg_write(0, RT2880_PCI_REG_PCICFG_ADDR);
-	for(i = 0; i < 0xfffff; i++) {}
-
-	rt2880_pci_reg_write(0x79, RT2880_PCI_REG_ARBCTL);
-	rt2880_pci_reg_write(0x07FF0001, RT2880_PCI_REG_BAR0SETUP_ADDR);
-	rt2880_pci_reg_write(RT2880_PCI_MEM_BASE, RT2880_PCI_REG_MEMBASE);
-	rt2880_pci_reg_write(RT2880_PCI_IO_BASE, RT2880_PCI_REG_IOBASE);
-	rt2880_pci_reg_write(0x08000000, RT2880_PCI_REG_IMBASEBAR0_ADDR);
-	rt2880_pci_reg_write(0x08021814, RT2880_PCI_REG_ID);
-	rt2880_pci_reg_write(0x00800001, RT2880_PCI_REG_CLASS);
-	rt2880_pci_reg_write(0x28801814, RT2880_PCI_REG_SUBID);
-	rt2880_pci_reg_write(0x000c0000, RT2880_PCI_REG_PCIMSK_ADDR);
-
-	rt2880_pci_write_u32(PCI_BASE_ADDRESS_0, 0x08000000);
-	(void) rt2880_pci_read_u32(PCI_BASE_ADDRESS_0);
-
-	register_pci_controller(&rt2880_pci_controller);
-	return 0;
-}
-
-int pcibios_plat_dev_init(struct pci_dev *dev)
-{
-	return 0;
-}
-
-arch_initcall(rt2880_pci_init);
diff --git a/target/linux/ramips/files/arch/mips/ralink/Kconfig b/target/linux/ramips/files/arch/mips/ralink/Kconfig
deleted file mode 100644
index c30dbe1c3..000000000
--- a/target/linux/ramips/files/arch/mips/ralink/Kconfig
+++ /dev/null
@@ -1,57 +0,0 @@
-if MIPS_RALINK
-
-choice
-	prompt "Ralink SoC selection"
-	default SOC_RT288X
-	help
-	  Select Ralink MIPS SoC type.
-
-	config RALINK_RT288X
-		bool "RT288x"
-		select SOC_RT288X
-
-	config RALINK_RT305X
-		bool "RT305x"
-		select SOC_RT305X
-
-endchoice
-
-source "arch/mips/ralink/rt288x/Kconfig"
-source "arch/mips/ralink/rt305x/Kconfig"
-
-config SOC_RT288X
-	bool
-	select CEVT_R4K
-	select CSRC_R4K
-	select DMA_NONCOHERENT
-	select IRQ_CPU
-	select ARCH_REQUIRE_GPIOLIB
-	select SYS_HAS_CPU_MIPS32_R1
-	select SYS_HAS_CPU_MIPS32_R2
-	select SYS_SUPPORTS_32BIT_KERNEL
-	select SYS_SUPPORTS_LITTLE_ENDIAN
-	select SYS_HAS_EARLY_PRINTK
-	select HW_HAS_PCI
-	select MIPS_MACHINE
-
-config SOC_RT305X
-	bool
-	select CEVT_R4K
-	select CSRC_R4K
-	select DMA_NONCOHERENT
-	select IRQ_CPU
-	select ARCH_REQUIRE_GPIOLIB
-	select SYS_HAS_CPU_MIPS32_R1
-	select SYS_HAS_CPU_MIPS32_R2
-	select SYS_SUPPORTS_32BIT_KERNEL
-	select SYS_SUPPORTS_LITTLE_ENDIAN
-	select SYS_HAS_EARLY_PRINTK
-	select MIPS_MACHINE
-
-config RALINK_DEV_GPIO_BUTTONS
-	def_bool n
-
-config RALINK_DEV_GPIO_LEDS
-	def_bool n
-
-endif
diff --git a/target/linux/ramips/files/arch/mips/ralink/common/Makefile b/target/linux/ramips/files/arch/mips/ralink/common/Makefile
deleted file mode 100644
index adab85f68..000000000
--- a/target/linux/ramips/files/arch/mips/ralink/common/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Makefile for the Ralink common stuff
-#
-# Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
-#
-# 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.
-
-obj-y	:= prom.o setup.o intc.o gpio.o
-
-obj-$(CONFIG_RALINK_DEV_GPIO_BUTTONS)	+= dev-gpio-buttons.o
-obj-$(CONFIG_RALINK_DEV_GPIO_LEDS)	+= dev-gpio-leds.o
diff --git a/target/linux/ramips/files/arch/mips/ralink/common/dev-gpio-buttons.c b/target/linux/ramips/files/arch/mips/ralink/common/dev-gpio-buttons.c
deleted file mode 100644
index f32300129..000000000
--- a/target/linux/ramips/files/arch/mips/ralink/common/dev-gpio-buttons.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *  Ralink SoC GPIO button support
- *
- *  Copyright (C) 2010 Gabor Juhos <juhosg@openwrt.org>
- *
- *  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.
- */
-
-#include "linux/init.h"
-#include <linux/platform_device.h>
-
-#include <asm/mach-ralink/dev-gpio-buttons.h>
-
-void __init ramips_register_gpio_buttons(int id,
-					 unsigned poll_interval,
-					 unsigned nbuttons,
-					 struct gpio_button *buttons)
-{
-	struct platform_device *pdev;
-	struct gpio_buttons_platform_data pdata;
-	struct gpio_button *p;
-	int err;
-
-	p = kmalloc(nbuttons * sizeof(*p), GFP_KERNEL);
-	if (!p)
-		return;
-
-	memcpy(p, buttons, nbuttons * sizeof(*p));
-
-	pdev = platform_device_alloc("gpio-buttons", id);
-	if (!pdev)
-		goto err_free_buttons;
-
-	memset(&pdata, 0, sizeof(pdata));
-	pdata.poll_interval = poll_interval;
-	pdata.nbuttons = nbuttons;
-	pdata.buttons = p;
-
-	err = platform_device_add_data(pdev, &pdata, sizeof(pdata));
-	if (err)
-		goto err_put_pdev;
-
-
-	err = platform_device_add(pdev);
-	if (err)
-		goto err_put_pdev;
-
-	return;
-
-err_put_pdev:
-	platform_device_put(pdev);
-
-err_free_buttons:
-	kfree(p);
-}
diff --git a/target/linux/ramips/files/arch/mips/ralink/common/dev-gpio-leds.c b/target/linux/ramips/files/arch/mips/ralink/common/dev-gpio-leds.c
deleted file mode 100644
index 2ab187d15..000000000
--- a/target/linux/ramips/files/arch/mips/ralink/common/dev-gpio-leds.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *  Ralink SoC GPIO LED device support
- *
- *  Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
- *
- *  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.
- */
-
-#include <linux/init.h>
-#include <linux/platform_device.h>
-
-#include <asm/mach-ralink/dev-gpio-leds.h>
-
-void __init ramips_register_gpio_leds(int id, unsigned num_leds,
-				      struct gpio_led *leds)
-{
-	struct platform_device *pdev;
-	struct gpio_led_platform_data pdata;
-	struct gpio_led *p;
-	int err;
-
-	p = kmalloc(num_leds * sizeof(*p), GFP_KERNEL);
-	if (!p)
-		return;
-
-	memcpy(p, leds, num_leds * sizeof(*p));
-
-	pdev = platform_device_alloc("leds-gpio", id);
-	if (!pdev)
-		goto err_free_leds;
-
-	memset(&pdata, 0, sizeof(pdata));
-	pdata.num_leds = num_leds;
-	pdata.leds = p;
-
-	err = platform_device_add_data(pdev, &pdata, sizeof(pdata));
-	if (err)
-		goto err_put_pdev;
-
-	err = platform_device_add(pdev);
-	if (err)
-		goto err_put_pdev;
-
-	return;
-
-err_put_pdev:
-	platform_device_put(pdev);
-
-err_free_leds:
-	kfree(p);
-}
diff --git a/target/linux/ramips/files/arch/mips/ralink/common/gpio.c b/target/linux/ramips/files/arch/mips/ralink/common/gpio.c
deleted file mode 100644
index 892f15b1e..000000000
--- a/target/linux/ramips/files/arch/mips/ralink/common/gpio.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Ralink SoC specific GPIO support
- *
- * Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
- *
- * 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.
- */
-
-#include <linux/init.h>
-#include <linux/io.h>
-
-#include <linux/gpio.h>
-
-#include <ralink_soc.h>
-
-#define GPIO0_REG_INT		0x00
-#define GPIO0_REG_EDGE		0x04
-#define GPIO0_REG_RENA		0x08
-#define GPIO0_REG_FENA		0x0c
-#define GPIO0_REG_DATA		0x20
-#define GPIO0_REG_DIR		0x24
-#define GPIO0_REG_POL		0x28
-#define GPIO0_REG_SET		0x2c
-#define GPIO0_REG_RESET		0x30
-#define GPIO0_REG_TOGGLE	0x34
-
-#define GPIO1_REG_INT		0x38
-#define GPIO1_REG_EDGE		0x3c
-#define GPIO1_REG_RENA		0x40
-#define GPIO1_REG_FENA		0x44
-#define GPIO1_REG_DATA		0x48
-#define GPIO1_REG_DIR		0x4c
-#define GPIO1_REG_POL		0x50
-#define GPIO1_REG_SET		0x54
-#define GPIO1_REG_RESET		0x58
-#define GPIO1_REG_TOGGLE	0x5c
-
-#define GPIO2_REG_INT		0x60
-#define GPIO2_REG_EDGE		0x64
-#define GPIO2_REG_RENA		0x68
-#define GPIO2_REG_FENA		0x6c
-#define GPIO2_REG_DATA		0x70
-#define GPIO2_REG_DIR		0x74
-#define GPIO2_REG_POL		0x78
-#define GPIO2_REG_SET		0x7c
-#define GPIO2_REG_RESET		0x80
-#define GPIO2_REG_TOGGLE	0x84
-
-enum ramips_pio_reg {
-	RAMIPS_GPIO_REG_INT,		/* Interrupt status */
-	RAMIPS_GPIO_REG_EDGE,
-	RAMIPS_GPIO_REG_RENA,
-	RAMIPS_GPIO_REG_FENA,
-	RAMIPS_GPIO_REG_DATA,
-	RAMIPS_GPIO_REG_DIR,		/* Direction, 0:in, 1: out */
-	RAMIPS_GPIO_REG_POL,		/* Polarity, 0: normal, 1: invert */
-	RAMIPS_GPIO_REG_SET,
-	RAMIPS_GPIO_REG_RESET,
-	RAMIPS_GPIO_REG_TOGGLE,
-	RAMIPS_GPIO_REG_MAX
-};
-
-struct ramips_gpio_chip {
-	struct gpio_chip	chip;
-	u8			regs[RAMIPS_GPIO_REG_MAX];
-};
-
-static void __iomem *ramips_gpio_base;
-
-static inline struct ramips_gpio_chip *to_ramips_gpio(struct gpio_chip *chip)
-{
-	struct ramips_gpio_chip *rg;
-
-	rg = container_of(chip, struct ramips_gpio_chip, chip);
-	return rg;
-}
-
-static inline void ramips_gpio_wr(struct ramips_gpio_chip *rg, u8 reg, u32 val)
-{
-	__raw_writel(val, ramips_gpio_base + rg->regs[reg]);
-}
-
-static inline u32 ramips_gpio_rr(struct ramips_gpio_chip *rg, u8 reg)
-{
-	return __raw_readl(ramips_gpio_base + rg->regs[reg]);
-}
-
-static int ramips_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
-{
-	struct ramips_gpio_chip *rg = to_ramips_gpio(chip);
-	u32 t;
-
-	t = ramips_gpio_rr(rg, RAMIPS_GPIO_REG_DIR);
-	t &= ~(1 << offset);
-	ramips_gpio_wr(rg, RAMIPS_GPIO_REG_DIR, t);
-
-	return 0;
-}
-
-static int ramips_gpio_direction_output(struct gpio_chip *chip,
-					unsigned offset, int value)
-{
-	struct ramips_gpio_chip *rg = to_ramips_gpio(chip);
-	u32 reg;
-	u32 t;
-
-	reg = (value) ? RAMIPS_GPIO_REG_SET : RAMIPS_GPIO_REG_RESET;
-	ramips_gpio_wr(rg, reg, 1 << offset);
-
-	t = ramips_gpio_rr(rg, RAMIPS_GPIO_REG_DIR);
-	t |= 1 << offset;
-	ramips_gpio_wr(rg, RAMIPS_GPIO_REG_DIR, t);
-
-	return 0;
-}
-
-static void ramips_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
-{
-	struct ramips_gpio_chip *rg = to_ramips_gpio(chip);
-	u32 reg;
-
-	reg = (value) ? RAMIPS_GPIO_REG_SET : RAMIPS_GPIO_REG_RESET;
-	ramips_gpio_wr(rg, reg, 1 << offset);
-}
-
-static int ramips_gpio_get(struct gpio_chip *chip, unsigned offset)
-{
-	struct ramips_gpio_chip *rg = to_ramips_gpio(chip);
-	u32 t;
-
-	t = ramips_gpio_rr(rg, RAMIPS_GPIO_REG_DATA);
-	return !!(t & (1 << offset));
-}
-
-static struct ramips_gpio_chip ramips_gpio_chip0 = {
-	.chip = {
-		.label			= "ramips-gpio0",
-		.direction_input	= ramips_gpio_direction_input,
-		.direction_output	= ramips_gpio_direction_output,
-		.get			= ramips_gpio_get,
-		.set			= ramips_gpio_set,
-		.base			= 0,
-		.ngpio			= RALINK_SOC_GPIO0_COUNT,
-	},
-	.regs = {
-		[RAMIPS_GPIO_REG_INT]	= GPIO0_REG_INT,
-		[RAMIPS_GPIO_REG_EDGE]	= GPIO0_REG_EDGE,
-		[RAMIPS_GPIO_REG_RENA]	= GPIO0_REG_RENA,
-		[RAMIPS_GPIO_REG_FENA]	= GPIO0_REG_FENA,
-		[RAMIPS_GPIO_REG_DATA]	= GPIO0_REG_DATA,
-		[RAMIPS_GPIO_REG_DIR]	= GPIO0_REG_DIR,
-		[RAMIPS_GPIO_REG_POL]	= GPIO0_REG_POL,
-		[RAMIPS_GPIO_REG_SET]	= GPIO0_REG_SET,
-		[RAMIPS_GPIO_REG_RESET]	= GPIO0_REG_RESET,
-		[RAMIPS_GPIO_REG_TOGGLE] = GPIO0_REG_TOGGLE,
-	},
-};
-
-static struct ramips_gpio_chip ramips_gpio_chip1 = {
-	.chip = {
-		.label			= "ramips-gpio1",
-		.direction_input	= ramips_gpio_direction_input,
-		.direction_output	= ramips_gpio_direction_output,
-		.get			= ramips_gpio_get,
-		.set			= ramips_gpio_set,
-		.base			= 32,
-		.ngpio			= RALINK_SOC_GPIO1_COUNT,
-	},
-	.regs = {
-		[RAMIPS_GPIO_REG_INT]	= GPIO1_REG_INT,
-		[RAMIPS_GPIO_REG_EDGE]	= GPIO1_REG_EDGE,
-		[RAMIPS_GPIO_REG_RENA]	= GPIO1_REG_RENA,
-		[RAMIPS_GPIO_REG_FENA]	= GPIO1_REG_FENA,
-		[RAMIPS_GPIO_REG_DATA]	= GPIO1_REG_DATA,
-		[RAMIPS_GPIO_REG_DIR]	= GPIO1_REG_DIR,
-		[RAMIPS_GPIO_REG_POL]	= GPIO1_REG_POL,
-		[RAMIPS_GPIO_REG_SET]	= GPIO1_REG_SET,
-		[RAMIPS_GPIO_REG_RESET]	= GPIO1_REG_RESET,
-		[RAMIPS_GPIO_REG_TOGGLE] = GPIO1_REG_TOGGLE,
-	},
-};
-
-static struct ramips_gpio_chip ramips_gpio_chip2 = {
-	.chip = {
-		.label			= "ramips-gpio2",
-		.direction_input	= ramips_gpio_direction_input,
-		.direction_output	= ramips_gpio_direction_output,
-		.get			= ramips_gpio_get,
-		.set			= ramips_gpio_set,
-		.base			= 64,
-		.ngpio			= RALINK_SOC_GPIO2_COUNT,
-	},
-	.regs = {
-		[RAMIPS_GPIO_REG_INT]	= GPIO2_REG_INT,
-		[RAMIPS_GPIO_REG_EDGE]	= GPIO2_REG_EDGE,
-		[RAMIPS_GPIO_REG_RENA]	= GPIO2_REG_RENA,
-		[RAMIPS_GPIO_REG_FENA]	= GPIO2_REG_FENA,
-		[RAMIPS_GPIO_REG_DATA]	= GPIO2_REG_DATA,
-		[RAMIPS_GPIO_REG_DIR]	= GPIO2_REG_DIR,
-		[RAMIPS_GPIO_REG_POL]	= GPIO2_REG_POL,
-		[RAMIPS_GPIO_REG_SET]	= GPIO2_REG_SET,
-		[RAMIPS_GPIO_REG_RESET]	= GPIO2_REG_RESET,
-		[RAMIPS_GPIO_REG_TOGGLE] = GPIO2_REG_TOGGLE,
-	},
-};
-
-static __init void ramips_gpio_chip_add(struct ramips_gpio_chip *rg)
-{
-	/* set polarity to low for all lines */
-	ramips_gpio_wr(rg, RAMIPS_GPIO_REG_POL, 0);
-
-	gpiochip_add(&rg->chip);
-}
-
-__init int ramips_gpio_init(void)
-{
-	ramips_gpio_base = ioremap_nocache(RALINK_SOC_GPIO_BASE, PAGE_SIZE);
-
-	ramips_gpio_chip_add(&ramips_gpio_chip0);
-	ramips_gpio_chip_add(&ramips_gpio_chip1);
-	ramips_gpio_chip_add(&ramips_gpio_chip2);
-
-	return 0;
-}
diff --git a/target/linux/ramips/files/arch/mips/ralink/common/intc.c b/target/linux/ramips/files/arch/mips/ralink/common/intc.c
deleted file mode 100644
index da3ecd466..000000000
--- a/target/linux/ramips/files/arch/mips/ralink/common/intc.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Ralink SoC Interrupt controller routines
- *
- * Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
- *
- * 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.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/io.h>
-#include <linux/interrupt.h>
-#include <linux/irq.h>
-#include <linux/bitops.h>
-
-#include <asm/irq_cpu.h>
-#include <asm/mipsregs.h>
-
-#include <asm/mach-ralink/common.h>
-
-/* INTC register offsets */
-#define INTC_REG_STATUS0	0x00
-#define INTC_REG_STATUS1	0x04
-#define INTC_REG_TYPE		0x20
-#define INTC_REG_RAW_STATUS	0x30
-#define INTC_REG_ENABLE		0x34
-#define INTC_REG_DISABLE	0x38
-
-#define INTC_INT_GLOBAL		BIT(31)
-#define INTC_IRQ_COUNT		32
-
-static unsigned int ramips_intc_irq_base;
-static void __iomem *ramips_intc_base;
-
-static inline void ramips_intc_wr(u32 val, unsigned reg)
-{
-	__raw_writel(val, ramips_intc_base + reg);
-}
-
-static inline u32 ramips_intc_rr(unsigned reg)
-{
-	return __raw_readl(ramips_intc_base + reg);
-}
-
-static void ramips_intc_irq_unmask(unsigned int irq)
-{
-	irq -= ramips_intc_irq_base;
-	ramips_intc_wr((1 << irq), INTC_REG_ENABLE);
-}
-
-static void ramips_intc_irq_mask(unsigned int irq)
-{
-	irq -= ramips_intc_irq_base;
-	ramips_intc_wr((1 << irq), INTC_REG_DISABLE);
-}
-
-static struct irq_chip ramips_intc_irq_chip = {
-	.name		= "INTC",
-	.unmask		= ramips_intc_irq_unmask,
-	.mask		= ramips_intc_irq_mask,
-	.mask_ack	= ramips_intc_irq_mask,
-};
-
-static struct irqaction ramips_intc_irqaction = {
-	.handler	= no_action,
-	.name		= "cascade [INTC]",
-};
-
-void __init ramips_intc_irq_init(unsigned intc_base, unsigned irq,
-				 unsigned irq_base)
-{
-	int i;
-
-	ramips_intc_base = ioremap_nocache(intc_base, PAGE_SIZE);
-	ramips_intc_irq_base = irq_base;
-
-	/* disable all interrupts */
-	ramips_intc_wr(~0, INTC_REG_DISABLE);
-
-	/* route all INTC interrupts to MIPS HW0 interrupt */
-	ramips_intc_wr(0, INTC_REG_TYPE);
-
-	for (i = ramips_intc_irq_base;
-	     i < ramips_intc_irq_base + INTC_IRQ_COUNT; i++) {
-		set_irq_chip_and_handler(i, &ramips_intc_irq_chip,
-					 handle_level_irq);
-	}
-
-	setup_irq(irq, &ramips_intc_irqaction);
-	ramips_intc_wr(INTC_INT_GLOBAL, INTC_REG_ENABLE);
-}
-
-u32 ramips_intc_get_status(void)
-{
-	return ramips_intc_rr(INTC_REG_STATUS0);
-}
diff --git a/target/linux/ramips/files/arch/mips/ralink/common/prom.c b/target/linux/ramips/files/arch/mips/ralink/common/prom.c
deleted file mode 100644
index fb37274ff..000000000
--- a/target/linux/ramips/files/arch/mips/ralink/common/prom.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- *  Ralink SoC specific prom routines
- *
- *  Copyright (C) 2010 Joonas Lahtinen <joonas.lahtinen@gmail.com>
- *  Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
- *
- *  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.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/string.h>
-
-#include <asm/bootinfo.h>
-#include <asm/addrspace.h>
-
-#include <asm/mach-ralink/common.h>
-#include <asm/mach-ralink/machine.h>
-#include <ralink_soc.h>
-
-static inline void *to_ram_addr(void *addr)
-{
-	u32 base;
-
-	base = KSEG0ADDR(RALINK_SOC_SDRAM_BASE);
-	if (((u32) addr > base) &&
-	    ((u32) addr < (base + RALINK_SOC_MEM_SIZE_MAX)))
-		return addr;
-
-	base = KSEG1ADDR(RALINK_SOC_SDRAM_BASE);
-	if (((u32) addr > base) &&
-	    ((u32) addr < (base + RALINK_SOC_MEM_SIZE_MAX)))
-		return addr;
-
-	/* some U-Boot variants uses physical addresses */
-	base = RALINK_SOC_SDRAM_BASE;
-	if (((u32) addr > base) &&
-	    ((u32) addr < (base + RALINK_SOC_MEM_SIZE_MAX)))
-		return (void *)KSEG0ADDR(addr);
-
-	return NULL;
-}
-
-static void __init prom_append_cmdline(const char *name,
-				       const char *value)
-{
-	char buf[CL_SIZE];
-
-	snprintf(buf, sizeof(buf), " %s=%s", name, value);
-	strlcat(arcs_cmdline, buf, sizeof(arcs_cmdline));
-}
-
-#ifdef CONFIG_IMAGE_CMDLINE_HACK
-extern char __image_cmdline[];
-
-static int __init use_image_cmdline(void)
-{
-	char *p = __image_cmdline;
-	int replace = 0;
-
-	if (*p == '-') {
-		replace = 1;
-		p++;
-	}
-
-	if (*p == '\0')
-		return 0;
-
-	if (replace) {
-		strlcpy(arcs_cmdline, p, sizeof(arcs_cmdline));
-	} else {
-		strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline));
-		strlcat(arcs_cmdline, p, sizeof(arcs_cmdline));
-	}
-
-	return 1;
-}
-#else
-static int inline use_image_cmdline(void) { return 0; }
-#endif
-
-static __init void prom_init_cmdline(int argc, char **argv)
-{
-	int i;
-
-	if (use_image_cmdline())
-		return;
-
-	if (!argv) {
-		printk(KERN_DEBUG "argv=%p is invalid, skipping\n",
-		       argv);
-		return;
-	}
-
-	for (i = 0; i < argc; i++) {
-		char *p = to_ram_addr(argv[i]);
-
-		if (!p) {
-			printk(KERN_DEBUG
-			       "argv[%d]=%p is invalid, skipping\n",
-			       i, argv[i]);
-			continue;
-		}
-
-		printk(KERN_DEBUG "argv[%d]: %s\n", i, p);
-		strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline));
-		strlcat(arcs_cmdline, p, sizeof(arcs_cmdline));
-	}
-}
-
-static __init char *prom_append_env(char **env, const char *envname)
-{
-#define PROM_MAX_ENVS	256
-	int len = strlen(envname);
-	int i;
-
-	if (!env) {
-		printk(KERN_DEBUG "env=%p is not in RAM, skipping\n",
-		       env);
-		return NULL;
-	}
-
-	for (i = 0; i < PROM_MAX_ENVS; i++) {
-		char *p = to_ram_addr(env[i]);
-
-		if (!p)
-			break;
-
-		printk(KERN_DEBUG "env[%d]: %s\n", i, p);
-		if (strncmp(envname, p, len) == 0 && p[len] == '=')
-			prom_append_cmdline(envname, p + len + 1);
-	}
-
-	return NULL;
-#undef PROM_MAX_ENVS
-}
-
-void __init prom_init(void)
-{
-	int argc;
-	char **envp;
-	char **argv;
-
-	printk(KERN_DEBUG
-	       "prom: fw_arg0=%08x, fw_arg1=%08x, fw_arg2=%08x, fw_arg3=%08x\n",
-	       (unsigned int)fw_arg0, (unsigned int)fw_arg1,
-	       (unsigned int)fw_arg2, (unsigned int)fw_arg3);
-
-	argc = fw_arg0;
-	argv = to_ram_addr((void *)fw_arg1);
-	prom_init_cmdline(argc, argv);
-
-	envp = to_ram_addr((void *)fw_arg2);
-	prom_append_env(envp, "board");
-	prom_append_env(envp, "ethaddr");
-}
-
-void __init prom_free_prom_memory(void)
-{
-	/* We do not have to prom memory to free */
-}
diff --git a/target/linux/ramips/files/arch/mips/ralink/common/setup.c b/target/linux/ramips/files/arch/mips/ralink/common/setup.c
deleted file mode 100644
index 877d0b7de..000000000
--- a/target/linux/ramips/files/arch/mips/ralink/common/setup.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Ralink SoC common setup
- *
- * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
- * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
- *
- * 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.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/io.h>
-#include <linux/serial_8250.h>
-
-#include <asm/bootinfo.h>
-#include <asm/addrspace.h>
-
-#include <asm/mach-ralink/common.h>
-#include <asm/mach-ralink/machine.h>
-#include <ralink_soc.h>
-
-unsigned char ramips_sys_type[RAMIPS_SYS_TYPE_LEN];
-
-const char *get_system_type(void)
-{
-	return ramips_sys_type;
-}
-
-static void __init detect_mem_size(void)
-{
-	unsigned long size;
-
-	for (size = RALINK_SOC_MEM_SIZE_MIN; size < RALINK_SOC_MEM_SIZE_MAX;
-	     size <<= 1 ) {
-		if (!memcmp(detect_mem_size,
-			    detect_mem_size + size, 1024))
-			break;
-	}
-
-	add_memory_region(RALINK_SOC_SDRAM_BASE, size, BOOT_MEM_RAM);
-}
-
-void __init ramips_early_serial_setup(int line, unsigned base, unsigned freq,
-				      unsigned irq)
-{
-	struct uart_port p;
-	int err;
-
-	memset(&p, 0, sizeof(p));
-	p.flags		= UPF_SKIP_TEST;
-	p.iotype	= UPIO_AU;
-	p.uartclk	= freq;
-	p.regshift	= 2;
-	p.type		= PORT_16550A;
-
-	p.mapbase	= base;
-	p.membase	= ioremap_nocache(p.mapbase, PAGE_SIZE);
-	p.line		= line;
-	p.irq		= irq;
-
-	err = early_serial_setup(&p);
-	if (err)
-		printk(KERN_ERR "early serial%d registration failed %d\n",
-		       line, err);
-}
-
-void __init plat_mem_setup(void)
-{
-	set_io_port_base(KSEG1);
-
-	detect_mem_size();
-	ramips_soc_setup();
-}
-
-__setup("board=", mips_machtype_setup);
-
-static int __init ramips_machine_setup(void)
-{
-	mips_machine_setup();
-	return 0;
-}
-
-arch_initcall(ramips_machine_setup);
-
-static void __init ramips_generic_init(void)
-{
-}
-
-MIPS_MACHINE(RAMIPS_MACH_GENERIC, "Generic", "Generic Ralink board",
-	     ramips_generic_init);
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/Kconfig b/target/linux/ramips/files/arch/mips/ralink/rt288x/Kconfig
deleted file mode 100644
index 857f4d32b..000000000
--- a/target/linux/ramips/files/arch/mips/ralink/rt288x/Kconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-if RALINK_RT288X
-
-menu "Ralink RT288x machine selection"
-
-config RT288X_MACH_RT_N15
-	bool "Asus RT-N15 board support"
-	default y
-	select RALINK_DEV_GPIO_BUTTONS
-	select RALINK_DEV_GPIO_LEDS
-
-config RT288X_MACH_WZR_AGL300NH
-	bool "Buffalo WZR-AGL300NH board support"
-	default y
-	select RALINK_DEV_GPIO_LEDS
-
-endmenu
-
-endif
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/Makefile b/target/linux/ramips/files/arch/mips/ralink/rt288x/Makefile
deleted file mode 100644
index dda3e063f..000000000
--- a/target/linux/ramips/files/arch/mips/ralink/rt288x/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Makefile for the Ralink RT288x SoC specific parts of the kernel
-#
-# Copyright (C) 2010 Joonas Lahtinen <joonas.lahtinen@gmail.com>
-# Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
-# Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-#
-# 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.
-
-obj-y	:= irq.o setup.o rt288x.o devices.o
-
-obj-$(CONFIG_EARLY_PRINTK)		+= early_printk.o
-
-obj-$(CONFIG_RT288X_MACH_RT_N15)	+= mach-rt-n15.o
-
-obj-$(CONFIG_RT288X_MACH_WZR_AGL300NH)	+= mach-wzr-agl300nh.o
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/devices.c b/target/linux/ramips/files/arch/mips/ralink/rt288x/devices.c
deleted file mode 100644
index 086d9a999..000000000
--- a/target/linux/ramips/files/arch/mips/ralink/rt288x/devices.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- *  Ralink RT288x SoC platform device registration
- *
- *  Copyright (C) 2008 Gabor Juhos <juhosg@openwrt.org>
- *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
- *
- *  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.
- */
-
-#include <linux/kernel.h>
-#include <linux/platform_device.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/physmap.h>
-
-#include <asm/addrspace.h>
-
-#include <asm/mach-ralink/rt288x.h>
-#include <asm/mach-ralink/rt288x_regs.h>
-
-#include "devices.h"
-
-static struct resource rt288x_flash0_resources[] = {
-	{
-		.flags	= IORESOURCE_MEM,
-		.start	= KSEG1ADDR(RT2880_FLASH0_BASE),
-		.end	= KSEG1ADDR(RT2880_FLASH0_BASE) +
-			  RT2880_FLASH0_SIZE - 1,
-	},
-};
-
-static struct platform_device rt288x_flash0_device = {
-	.name		= "physmap-flash",
-	.resource	= rt288x_flash0_resources,
-	.num_resources	= ARRAY_SIZE(rt288x_flash0_resources),
-};
-
-static struct resource rt288x_flash1_resources[] = {
-	{
-		.flags	= IORESOURCE_MEM,
-		.start	= KSEG1ADDR(RT2880_FLASH1_BASE),
-		.end	= KSEG1ADDR(RT2880_FLASH1_BASE) +
-			  RT2880_FLASH1_SIZE - 1,
-	},
-};
-
-static struct platform_device rt288x_flash1_device = {
-	.name		= "physmap-flash",
-	.resource	= rt288x_flash1_resources,
-	.num_resources	= ARRAY_SIZE(rt288x_flash1_resources),
-};
-
-static int rt288x_flash_instance __initdata;
-void __init rt288x_register_flash(unsigned int id,
-				  struct physmap_flash_data *pdata)
-{
-	struct platform_device *pdev;
-	u32 t;
-	int reg;
-
-	switch (id) {
-	case 0:
-		pdev = &rt288x_flash0_device;
-		reg = MEMC_REG_FLASH_CFG0;
-		break;
-	case 1:
-		pdev = &rt288x_flash1_device;
-		reg = MEMC_REG_FLASH_CFG1;
-		break;
-	default:
-		return;
-	}
-
-	t = rt288x_memc_rr(reg);
-	t = (t >> FLASH_CFG_WIDTH_SHIFT) & FLASH_CFG_WIDTH_MASK;
-
-	switch (t) {
-	case FLASH_CFG_WIDTH_8BIT:
-		pdata->width = 1;
-		break;
-	case FLASH_CFG_WIDTH_16BIT:
-		pdata->width = 2;
-		break;
-	case FLASH_CFG_WIDTH_32BIT:
-		pdata->width = 4;
-		break;
-	default:
-		printk(KERN_ERR "RT288x: flash bank%u witdh is invalid\n", id);
-		return;
-	}
-
-	pdev->dev.platform_data = pdata;
-	pdev->id = rt288x_flash_instance;
-
-	platform_device_register(pdev);
-	rt288x_flash_instance++;
-}
-
-static struct resource rt288x_wifi_resources[] = {
-	{
-		.start	= RT2880_WMAC_BASE,
-		.end	= RT2880_WMAC_BASE + 0x3FFFF,
-		.flags	= IORESOURCE_MEM,
-	}, {
-		.start	= RT288X_CPU_IRQ_WNIC,
-		.end	= RT288X_CPU_IRQ_WNIC,
-		.flags	= IORESOURCE_IRQ,
-	},
-};
-
-static struct platform_device rt288x_wifi_device = {
-	.name			= "rt2800_wmac",
-	.resource		= rt288x_wifi_resources,
-	.num_resources	= ARRAY_SIZE(rt288x_wifi_resources),
-	.dev = {
-		.platform_data = NULL,
-	}
-};
-
-void __init rt288x_register_wifi(void)
-{
-	platform_device_register(&rt288x_wifi_device);
-}
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/devices.h b/target/linux/ramips/files/arch/mips/ralink/rt288x/devices.h
deleted file mode 100644
index 78daf3ad0..000000000
--- a/target/linux/ramips/files/arch/mips/ralink/rt288x/devices.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Ralink RT288x SoC specific platform definitions
- *
- * Copyright (C) 2008 Gabor Juhos <juhosg@openwrt.org>
- * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
- *
- * 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 __ASM_MACH_RT288X_PLATFORM_H
-#define __ASM_MACH_RT288X_PLATFORM_H
-
-struct physmap_flash_data;
-
-extern void rt288x_register_flash(unsigned int id,
-				  struct physmap_flash_data *pdata) __init;
-void rt288x_register_wifi(void) __init;
-
-#endif  /* __ASM_MACH_RT288X_PLATFORM_H */
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/early_printk.c b/target/linux/ramips/files/arch/mips/ralink/rt288x/early_printk.c
deleted file mode 100644
index 9fd7adb54..000000000
--- a/target/linux/ramips/files/arch/mips/ralink/rt288x/early_printk.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *  Ralink RT288x SoC early printk support
- *
- *  Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
- *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
- *
- *  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.
- */
-
-#include <linux/io.h>
-#include <linux/serial_reg.h>
-
-#include <asm/addrspace.h>
-
-#include <asm/mach-ralink/rt288x_regs.h>
-
-#define UART_READ(r) \
-	__raw_readl((void __iomem *)(KSEG1ADDR(RT2880_UART1_BASE) + 4 * (r)))
-
-#define UART_WRITE(r, v) \
-	__raw_writel((v), (void __iomem *)(KSEG1ADDR(RT2880_UART1_BASE) + 4 * (r)))
-
-void prom_putchar(unsigned char ch)
-{
-	while (((UART_READ(UART_REG_LSR)) & UART_LSR_THRE) == 0);
-	UART_WRITE(UART_REG_TX, ch);
-	while (((UART_READ(UART_REG_LSR)) & UART_LSR_THRE) == 0);
-}
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/irq.c b/target/linux/ramips/files/arch/mips/ralink/rt288x/irq.c
deleted file mode 100644
index 5465a4560..000000000
--- a/target/linux/ramips/files/arch/mips/ralink/rt288x/irq.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- *  Ralink RT288x SoC specific interrupt handling
- *
- *  Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
- *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
- *
- *  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.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/irq.h>
-
-#include <asm/irq_cpu.h>
-#include <asm/mipsregs.h>
-
-#include <asm/mach-ralink/common.h>
-#include <asm/mach-ralink/rt288x.h>
-#include <asm/mach-ralink/rt288x_regs.h>
-
-static void rt288x_intc_irq_dispatch(void)
-{
-	u32 pending;
-
-	pending = ramips_intc_get_status();
-
-	if (pending & RT2880_INTC_INT_TIMER0)
-		do_IRQ(RT2880_INTC_IRQ_TIMER0);
-
-	else if (pending & RT2880_INTC_INT_TIMER1)
-		do_IRQ(RT2880_INTC_IRQ_TIMER1);
-
-	else if (pending & RT2880_INTC_INT_UART0)
-		do_IRQ(RT2880_INTC_IRQ_UART0);
-
-	else if (pending & RT2880_INTC_INT_PCM)
-		do_IRQ(RT2880_INTC_IRQ_PCM);
-
-	else if (pending & RT2880_INTC_INT_UART1)
-		do_IRQ(RT2880_INTC_IRQ_UART1);
-
-	/* TODO: handle PIO interrupts as well */
-
-	else
-		spurious_interrupt();
-}
-
-asmlinkage void plat_irq_dispatch(void)
-{
-	unsigned long pending;
-
-	pending = read_c0_status() & read_c0_cause() & ST0_IM;
-
-	if (pending & STATUSF_IP7)
-		do_IRQ(RT288X_CPU_IRQ_COUNTER);
-
-	else if (pending & STATUSF_IP4)
-		do_IRQ(RT288X_CPU_IRQ_PCI);
-
-	else if (pending & STATUSF_IP5)
-		do_IRQ(RT288X_CPU_IRQ_FE);
-
-	else if (pending & STATUSF_IP6)
-		do_IRQ(RT288X_CPU_IRQ_WNIC);
-
-	else if (pending & STATUSF_IP2)
-		rt288x_intc_irq_dispatch();
-
-	else
-		spurious_interrupt();
-}
-
-void __init arch_init_irq(void)
-{
-	mips_cpu_irq_init();
-	ramips_intc_irq_init(RT2880_INTC_BASE, RT288X_CPU_IRQ_INTC,
-			     RT288X_INTC_IRQ_BASE);
-}
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-rt-n15.c b/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-rt-n15.c
deleted file mode 100644
index 1a869afac..000000000
--- a/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-rt-n15.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- *  Asus RT-N15 board support
- *
- *  Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
- *
- *  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.
- */
-
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/physmap.h>
-#include <linux/rtl8366s.h>
-
-#include <asm/mach-ralink/machine.h>
-#include <asm/mach-ralink/dev-gpio-buttons.h>
-#include <asm/mach-ralink/dev-gpio-leds.h>
-#include <asm/mach-ralink/rt288x.h>
-#include <asm/mach-ralink/rt288x_regs.h>
-
-#include "devices.h"
-
-#define RT_N15_GPIO_LED_POWER		11
-#define RT_N15_GPIO_BUTTON_WPS		0
-#define RT_N15_GPIO_BUTTON_RESET	12
-
-#define RT_N15_GPIO_RTL8366_SCK		2
-#define RT_N15_GPIO_RTL8366_SDA		1
-
-#define RT_N15_BUTTONS_POLL_INTERVAL	20
-
-#ifdef CONFIG_MTD_PARTITIONS
-static struct mtd_partition rt_n15_partitions[] = {
-	{
-		.name	= "u-boot",
-		.offset	= 0,
-		.size	= 0x030000,
-		.mask_flags = MTD_WRITEABLE,
-	}, {
-		.name	= "u-boot-env",
-		.offset	= 0x030000,
-		.size	= 0x010000,
-		.mask_flags = MTD_WRITEABLE,
-	}, {
-		.name	= "factory",
-		.offset	= 0x040000,
-		.size	= 0x010000,
-		.mask_flags = MTD_WRITEABLE,
-	}, {
-		.name	= "kernel",
-		.offset	= 0x050000,
-		.size	= 0x0b0000,
-	}, {
-		.name	= "rootfs",
-		.offset	= 0x100000,
-		.size	= 0x300000,
-	}, {
-		.name	= "openwrt",
-		.offset	= 0x050000,
-		.size	= 0x3b0000,
-	}
-};
-#endif /* CONFIG_MTD_PARTITIONS */
-
-static struct physmap_flash_data rt_n15_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
-	.nr_parts	= ARRAY_SIZE(rt_n15_partitions),
-	.parts		= rt_n15_partitions,
-#endif
-};
-
-static struct gpio_led rt_n15_leds_gpio[] __initdata = {
-	{
-		.name		= "rt-n15:blue:power",
-		.gpio		= RT_N15_GPIO_LED_POWER,
-		.active_low	= 1,
-	}
-};
-
-static struct gpio_button rt_n15_gpio_buttons[] __initdata = {
-	{
-		.desc		= "reset",
-		.type		= EV_KEY,
-		.code		= BTN_0,
-		.threshold	= 3,
-		.gpio		= RT_N15_GPIO_BUTTON_RESET,
-		.active_low	= 1,
-	}, {
-		.desc		= "wps",
-		.type		= EV_KEY,
-		.code		= BTN_1,
-		.threshold	= 3,
-		.gpio		= RT_N15_GPIO_BUTTON_WPS,
-		.active_low	= 1,
-	}
-};
-
-static struct rtl8366s_platform_data rt_n15_rtl8366s_data = {
-	.gpio_sda        = RT_N15_GPIO_RTL8366_SDA,
-	.gpio_sck        = RT_N15_GPIO_RTL8366_SCK,
-};
-
-static struct platform_device rt_n15_rtl8366s_device = {
-	.name		= RTL8366S_DRIVER_NAME,
-	.id		= -1,
-	.dev = {
-		.platform_data	= &rt_n15_rtl8366s_data,
-	}
-};
-
-static void __init rt_n15_init(void)
-{
-	rt288x_gpio_init(RT2880_GPIO_MODE_UART0 | RT2880_GPIO_MODE_I2C);
-
-	rt288x_register_flash(0, &rt_n15_flash_data);
-
-	ramips_register_gpio_leds(-1, ARRAY_SIZE(rt_n15_leds_gpio),
-				  rt_n15_leds_gpio);
-
-	ramips_register_gpio_buttons(-1, RT_N15_BUTTONS_POLL_INTERVAL,
-				     ARRAY_SIZE(rt_n15_gpio_buttons),
-				     rt_n15_gpio_buttons);
-
-	platform_device_register(&rt_n15_rtl8366s_device);
-
-	rt288x_register_wifi();
-}
-
-MIPS_MACHINE(RAMIPS_MACH_RT_N15, "RT-N15", "Asus RT-N15", rt_n15_init);
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-wzr-agl300nh.c b/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-wzr-agl300nh.c
deleted file mode 100644
index 2e5f46744..000000000
--- a/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-wzr-agl300nh.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- *  Buffalo WZR-AGL300NH board support
- *
- *  Copyright (C) 2010 Joonas Lahtinen <joonas.lahtinen@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.
- */
-
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/physmap.h>
-
-#include <asm/mach-ralink/machine.h>
-#include <asm/mach-ralink/rt288x.h>
-#include <asm/mach-ralink/rt288x_regs.h>
-
-#include "devices.h"
-
-/*
- * MTD layout from stock firmware:
- * mtd0: 00030000 00010000 "uboot"
- * mtd1: 00010000 00010000 "uboot_environ"
- * mtd2: 00010000 00010000 "factory_default"
- * mtd3: 000b0000 00010000 "linux"
- * mtd4: 002f0000 00010000 "rootfs"
- * mtd5: 00010000 00010000 "user_property"
- */
-
-#ifdef CONFIG_MTD_PARTITIONS
-static struct mtd_partition wzr_agl300nh_partitions[] = {
-	{
-		.name	= "uboot",
-		.offset	= 0,
-		.size	= 0x030000,
-		.mask_flags = MTD_WRITEABLE,
-	}, {
-		.name	= "uboot_environ",
-		.offset	= 0x030000,
-		.size	= 0x010000,
-		.mask_flags = MTD_WRITEABLE,
-	}, {
-		.name	= "factory_default",
-		.offset	= 0x040000,
-		.size	= 0x010000,
-		.mask_flags = MTD_WRITEABLE,
-	}, {
-		.name	= "linux",
-		.offset	= 0x050000,
-		.size	= 0x0b0000,
-	}, {
-		.name	= "rootfs",
-		.offset	= 0x100000,
-		.size	= 0x2f0000,
-	}, {
-		.name	= "user_property",
-		.offset	= 0x3f0000,
-		.size	= 0x010000,
-	}
-};
-#endif /* CONFIG_MTD_PARTITIONS */
-
-static struct physmap_flash_data wzr_agl300nh_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
-	.nr_parts	= ARRAY_SIZE(wzr_agl300nh_partitions),
-	.parts		= wzr_agl300nh_partitions,
-#endif
-};
-
-static void __init wzr_agl300nh_init(void)
-{
-	rt288x_gpio_init(RT2880_GPIO_MODE_UART0);
-
-	rt288x_register_flash(0, &wzr_agl300nh_flash_data);
-	rt288x_register_wifi();
-}
-
-MIPS_MACHINE(RAMIPS_MACH_WZR_AGL300NH, "WZR-AGL300NH",
-	     "Buffalo WZR-AGL300NH", wzr_agl300nh_init);
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/rt288x.c b/target/linux/ramips/files/arch/mips/ralink/rt288x/rt288x.c
deleted file mode 100644
index 49a301a1e..000000000
--- a/target/linux/ramips/files/arch/mips/ralink/rt288x/rt288x.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Ralink RT288x SoC specific setup
- *
- * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
- * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
- *
- * Parts of this file are based on Ralink's 2.6.21 BSP
- *
- * 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.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/gpio.h>
-
-#include <asm/mach-ralink/common.h>
-#include <asm/mach-ralink/rt288x.h>
-#include <asm/mach-ralink/rt288x_regs.h>
-
-unsigned long rt288x_cpu_freq;
-EXPORT_SYMBOL_GPL(rt288x_cpu_freq);
-
-unsigned long rt288x_sys_freq;
-EXPORT_SYMBOL_GPL(rt288x_sys_freq);
-
-void __iomem * rt288x_sysc_base;
-void __iomem * rt288x_memc_base;
-
-void __init rt288x_detect_sys_type(void)
-{
-	u32 n0;
-	u32 n1;
-	u32 id;
-
-	n0 = rt288x_sysc_rr(SYSC_REG_CHIP_NAME0);
-	n1 = rt288x_sysc_rr(SYSC_REG_CHIP_NAME1);
-	id = rt288x_sysc_rr(SYSC_REG_CHIP_ID);
-
-	snprintf(ramips_sys_type, RAMIPS_SYS_TYPE_LEN,
-		"Ralink %c%c%c%c%c%c%c%c id:%u rev:%u",
-		(char) (n0 & 0xff), (char) ((n0 >> 8) & 0xff),
-		(char) ((n0 >> 16) & 0xff), (char) ((n0 >> 24) & 0xff),
-		(char) (n1 & 0xff), (char) ((n1 >> 8) & 0xff),
-		(char) ((n1 >> 16) & 0xff), (char) ((n1 >> 24) & 0xff),
-		(id >> CHIP_ID_ID_SHIFT) & CHIP_ID_ID_MASK,
-		(id & CHIP_ID_REV_MASK));
-}
-
-void __init rt288x_detect_sys_freq(void)
-{
-	u32	t;
-
-	t = rt288x_sysc_rr(SYSC_REG_SYSTEM_CONFIG);
-	t = ((t >> SYSTEM_CONFIG_CPUCLK_SHIFT) & SYSTEM_CONFIG_CPUCLK_MASK);
-
-	switch (t) {
-	case SYSTEM_CONFIG_CPUCLK_250:
-		rt288x_cpu_freq = 250000000;
-		break;
-	case SYSTEM_CONFIG_CPUCLK_266:
-		rt288x_cpu_freq = 266666667;
-		break;
-	case SYSTEM_CONFIG_CPUCLK_280:
-		rt288x_cpu_freq = 280000000;
-		break;
-	case SYSTEM_CONFIG_CPUCLK_300:
-		rt288x_cpu_freq = 300000000;
-		break;
-	}
-
-	rt288x_sys_freq = rt288x_cpu_freq / 2;
-}
-
-static void rt288x_gpio_reserve(int first, int last)
-{
-	for (; first <= last; first++)
-		gpio_request(first, "reserved");
-}
-
-void __init rt288x_gpio_init(u32 mode)
-{
-	rt288x_sysc_wr(mode, SYSC_REG_GPIO_MODE);
-
-	ramips_gpio_init();
-	if ((mode & RT2880_GPIO_MODE_I2C) == 0)
-		rt288x_gpio_reserve(1, 2);
-
-	if ((mode & RT2880_GPIO_MODE_SPI) == 0)
-		rt288x_gpio_reserve(3, 6);
-
-	if ((mode & RT2880_GPIO_MODE_UART0) == 0)
-		rt288x_gpio_reserve(7, 14);
-
-	if ((mode & RT2880_GPIO_MODE_JTAG) == 0)
-		rt288x_gpio_reserve(17, 21);
-
-	if ((mode & RT2880_GPIO_MODE_MDIO) == 0)
-		rt288x_gpio_reserve(22, 23);
-
-	if ((mode & RT2880_GPIO_MODE_SDRAM) == 0)
-		rt288x_gpio_reserve(24, 39);
-
-	if ((mode & RT2880_GPIO_MODE_PCI) == 0)
-		rt288x_gpio_reserve(40, 71);
-}
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/setup.c b/target/linux/ramips/files/arch/mips/ralink/rt288x/setup.c
deleted file mode 100644
index e2328fe5e..000000000
--- a/target/linux/ramips/files/arch/mips/ralink/rt288x/setup.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Ralink RT288x SoC specific setup
- *
- * Copyright (C) 2008 Gabor Juhos <juhosg@openwrt.org>
- * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
- *
- * Parts of this file are based on Ralink's 2.6.21 BSP
- *
- * 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.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/io.h>
-
-#include <asm/mips_machine.h>
-#include <asm/reboot.h>
-#include <asm/time.h>
-
-#include <asm/mach-ralink/common.h>
-#include <asm/mach-ralink/rt288x.h>
-#include <asm/mach-ralink/rt288x_regs.h>
-
-static void rt288x_restart(char *command)
-{
-	rt288x_sysc_wr(RT2880_RESET_SYSTEM, SYSC_REG_RESET_CTRL);
-	while (1)
-		if (cpu_wait)
-			cpu_wait();
-}
-
-static void rt288x_halt(void)
-{
-	while (1)
-		cpu_wait();
-}
-
-unsigned int __cpuinit get_c0_compare_irq(void)
-{
-	return CP0_LEGACY_COMPARE_IRQ;
-}
-
-void __init ramips_soc_setup(void)
-{
-	rt288x_sysc_base = ioremap_nocache(RT2880_SYSC_BASE, RT2880_SYSC_SIZE);
-	rt288x_memc_base = ioremap_nocache(RT2880_MEMC_BASE, RT2880_MEMC_SIZE);
-
-	rt288x_detect_sys_type();
-	rt288x_detect_sys_freq();
-
-	printk(KERN_INFO "%s running at %lu.%02lu MHz\n", ramips_sys_type,
-		rt288x_cpu_freq / 1000000,
-		(rt288x_cpu_freq % 1000000) * 100 / 1000000);
-
-	_machine_restart = rt288x_restart;
-	_machine_halt = rt288x_halt;
-	pm_power_off = rt288x_halt;
-
-	ramips_early_serial_setup(0, RT2880_UART0_BASE, rt288x_sys_freq,
-				  RT2880_INTC_IRQ_UART0);
-	ramips_early_serial_setup(1, RT2880_UART1_BASE, rt288x_sys_freq,
-				  RT2880_INTC_IRQ_UART1);
-}
-
-void __init plat_time_init(void)
-{
-	mips_hpt_frequency = rt288x_cpu_freq / 2;
-}
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/Kconfig b/target/linux/ramips/files/arch/mips/ralink/rt305x/Kconfig
deleted file mode 100644
index 532e471d7..000000000
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/Kconfig
+++ /dev/null
@@ -1,31 +0,0 @@
-if RALINK_RT305X
-
-menu "Ralink RT350x machine selection"
-
-config RT305X_MACH_WHR_G300N
-	bool "Buffalo WHR-G300N support"
-	default y
-	select RALINK_DEV_GPIO_BUTTONS
-	select RALINK_DEV_GPIO_LEDS
-
-config RT305X_MACH_DIR_300_REVB
-	bool "D-Link DIR-300 revB board support"
-	default y
-	select RALINK_DEV_GPIO_BUTTONS
-	select RALINK_DEV_GPIO_LEDS
-
-config RT305X_MACH_V22RW_2X2
-	bool "Ralink AP-RT3052-V22RW-2X2 board support"
-	default y
-	select RALINK_DEV_GPIO_BUTTONS
-	select RALINK_DEV_GPIO_LEDS
-
-config RT305X_MACH_FONERA20N
-	bool "La Fonera20N board support"
-	default y
-	select RALINK_DEV_GPIO_BUTTONS
-	select RALINK_DEV_GPIO_LEDS
-
-endmenu
-
-endif
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/Makefile b/target/linux/ramips/files/arch/mips/ralink/rt305x/Makefile
deleted file mode 100644
index a1278c305..000000000
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Makefile for the Ralink RT305x SoC specific parts of the kernel
-#
-# Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
-#
-# 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.
-
-obj-y	:= irq.o setup.o devices.o rt305x.o
-
-obj-$(CONFIG_EARLY_PRINTK)		+= early_printk.o
-
-obj-$(CONFIG_RT305X_MACH_DIR_300_REVB)	+= mach-dir-300-revb.o
-obj-$(CONFIG_RT305X_MACH_V22RW_2X2)	+= mach-v22rw-2x2.o
-obj-$(CONFIG_RT305X_MACH_WHR_G300N)	+= mach-whr-g300n.o
-obj-$(CONFIG_RT305X_MACH_FONERA20N)	+= mach-fonera20n.o
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/devices.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/devices.c
deleted file mode 100644
index 4ee0d4f1b..000000000
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/devices.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- *  Ralink RT305x SoC platform device registration
- *
- *  Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
- *
- *  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.
- */
-
-#include <linux/kernel.h>
-#include <linux/platform_device.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/physmap.h>
-
-#include <asm/addrspace.h>
-
-#include <asm/mach-ralink/rt305x.h>
-#include <asm/mach-ralink/rt305x_regs.h>
-#include "devices.h"
-
-#include <ramips_eth_platform.h>
-
-static struct resource rt305x_flash0_resources[] = {
-	{
-		.flags	= IORESOURCE_MEM,
-		.start	= KSEG1ADDR(RT305X_FLASH0_BASE),
-		.end	= KSEG1ADDR(RT305X_FLASH0_BASE) +
-			  RT305X_FLASH0_SIZE - 1,
-	},
-};
-
-static struct platform_device rt305x_flash0_device = {
-	.name		= "physmap-flash",
-	.resource	= rt305x_flash0_resources,
-	.num_resources	= ARRAY_SIZE(rt305x_flash0_resources),
-};
-
-static struct resource rt305x_flash1_resources[] = {
-	{
-		.flags	= IORESOURCE_MEM,
-		.start	= KSEG1ADDR(RT305X_FLASH1_BASE),
-		.end	= KSEG1ADDR(RT305X_FLASH1_BASE) +
-			  RT305X_FLASH1_SIZE - 1,
-	},
-};
-
-static struct platform_device rt305x_flash1_device = {
-	.name		= "physmap-flash",
-	.resource	= rt305x_flash1_resources,
-	.num_resources	= ARRAY_SIZE(rt305x_flash1_resources),
-};
-
-static int rt305x_flash_instance __initdata;
-void __init rt305x_register_flash(unsigned int id,
-				  struct physmap_flash_data *pdata)
-{
-	struct platform_device *pdev;
-	u32 t;
-	int reg;
-
-	switch (id) {
-	case 0:
-		pdev = &rt305x_flash0_device;
-		reg = MEMC_REG_FLASH_CFG0;
-		break;
-	case 1:
-		pdev = &rt305x_flash1_device;
-		reg = MEMC_REG_FLASH_CFG1;
-		break;
-	default:
-		return;
-	}
-
-	t = rt305x_memc_rr(reg);
-	t = (t >> FLASH_CFG_WIDTH_SHIFT) & FLASH_CFG_WIDTH_MASK;
-
-	switch (t) {
-	case FLASH_CFG_WIDTH_8BIT:
-		pdata->width = 1;
-		break;
-	case FLASH_CFG_WIDTH_16BIT:
-		pdata->width = 2;
-		break;
-	case FLASH_CFG_WIDTH_32BIT:
-		pdata->width = 4;
-		break;
-	default:
-		printk(KERN_ERR "RT305x: flash bank%u witdh is invalid\n", id);
-		return;
-	}
-
-	pdev->dev.platform_data = pdata;
-	pdev->id = rt305x_flash_instance;
-
-	platform_device_register(pdev);
-	rt305x_flash_instance++;
-}
-
-static void rt305x_fe_reset(void)
-{
-	rt305x_sysc_wr(RT305X_RESET_FE, SYSC_REG_RESET_CTRL);
-	rt305x_sysc_wr(0, SYSC_REG_RESET_CTRL);
-}
-
-static struct resource rt305x_eth_resources[] = {
-	{
-		.start	= RT305X_FE_BASE,
-		.end	= RT305X_FE_BASE + PAGE_SIZE - 1,
-		.flags	= IORESOURCE_MEM,
-	}, {
-		.start	= RT305X_CPU_IRQ_FE,
-		.end	= RT305X_CPU_IRQ_FE,
-		.flags	= IORESOURCE_IRQ,
-	},
-};
-
-static struct ramips_eth_platform_data ramips_eth_data = {
-	.mac = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55 },
-	.reset_fe = rt305x_fe_reset,
-	.min_pkt_len = 64,
-};
-
-static struct platform_device rt305x_eth_device = {
-	.name		= "ramips_eth",
-	.resource	= rt305x_eth_resources,
-	.num_resources	= ARRAY_SIZE(rt305x_eth_resources),
-	.dev = {
-		.platform_data = &ramips_eth_data,
-	}
-};
-
-void __init rt305x_register_ethernet(void)
-{
-	ramips_eth_data.sys_freq = rt305x_sys_freq;
-
-	platform_device_register(&rt305x_eth_device);
-}
-
-static struct resource rt305x_wifi_resources[] = {
-	{
-		.start	= RT305X_WMAC_BASE,
-		.end	= RT305X_WMAC_BASE + 0x3FFFF,
-		.flags	= IORESOURCE_MEM,
-	}, {
-		.start	= RT305X_CPU_IRQ_WNIC,
-		.end	= RT305X_CPU_IRQ_WNIC,
-		.flags	= IORESOURCE_IRQ,
-	},
-};
-
-static struct platform_device rt305x_wifi_device = {
-	.name			= "rt2800_wmac",
-	.resource		= rt305x_wifi_resources,
-	.num_resources	= ARRAY_SIZE(rt305x_wifi_resources),
-	.dev = {
-		.platform_data = NULL,
-	}
-};
-
-void __init rt305x_register_wifi(void)
-{
-	platform_device_register(&rt305x_wifi_device);
-}
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/devices.h b/target/linux/ramips/files/arch/mips/ralink/rt305x/devices.h
deleted file mode 100644
index b731f8683..000000000
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/devices.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Ralink RT305x SoC specific platform device definitions
- *
- * Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
- *
- * 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 __RT305X_DEVICES_H
-#define __RT305X_DEVICES_H
-
-struct physmap_flash_data;
-
-extern void rt305x_register_flash(unsigned int id,
-				  struct physmap_flash_data *pdata) __init;
-extern void rt305x_register_ethernet(void) __init;
-extern void rt305x_register_wifi(void) __init;
-
-#endif  /* __RT305X_DEVICES_H */
-
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/early_printk.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/early_printk.c
deleted file mode 100644
index 602df863e..000000000
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/early_printk.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  Ralink RT305x SoC early printk support
- *
- *  Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
- *
- *  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.
- */
-
-#include <linux/io.h>
-#include <linux/serial_reg.h>
-
-#include <asm/addrspace.h>
-
-#include <asm/mach-ralink/rt305x_regs.h>
-
-#define UART_READ(r) \
-	__raw_readl((void __iomem *)(KSEG1ADDR(RT305X_UART1_BASE) + 4 * (r)))
-
-#define UART_WRITE(r, v) \
-	__raw_writel((v), (void __iomem *)(KSEG1ADDR(RT305X_UART1_BASE) + 4 * (r)))
-
-void prom_putchar(unsigned char ch)
-{
-	while (((UART_READ(UART_REG_LSR)) & UART_LSR_THRE) == 0);
-	UART_WRITE(UART_REG_TX, ch);
-	while (((UART_READ(UART_REG_LSR)) & UART_LSR_THRE) == 0);
-}
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/irq.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/irq.c
deleted file mode 100644
index acd1880f5..000000000
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/irq.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- *  Ralink RT305x SoC specific interrupt handling
- *
- *  Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
- *
- *  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.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/irq.h>
-
-#include <asm/irq_cpu.h>
-#include <asm/mipsregs.h>
-
-#include <asm/mach-ralink/common.h>
-#include <asm/mach-ralink/rt305x.h>
-#include <asm/mach-ralink/rt305x_regs.h>
-
-static void rt305x_intc_irq_dispatch(void)
-{
-	u32 pending;
-
-	pending = ramips_intc_get_status();
-
-	if (pending & RT305X_INTC_INT_TIMER0)
-		do_IRQ(RT305X_INTC_IRQ_TIMER0);
-
-	else if (pending & RT305X_INTC_INT_TIMER1)
-		do_IRQ(RT305X_INTC_IRQ_TIMER1);
-
-	else if (pending & RT305X_INTC_INT_UART0)
-		do_IRQ(RT305X_INTC_IRQ_UART0);
-
-	else if (pending & RT305X_INTC_INT_UART1)
-		do_IRQ(RT305X_INTC_IRQ_UART1);
-
-	/* TODO: handle PIO interrupts as well */
-
-	else
-		spurious_interrupt();
-}
-
-asmlinkage void plat_irq_dispatch(void)
-{
-	unsigned long pending;
-
-	pending = read_c0_status() & read_c0_cause() & ST0_IM;
-
-	if (pending & STATUSF_IP7)
-		do_IRQ(RT305X_CPU_IRQ_COUNTER);
-
-	else if (pending & STATUSF_IP5)
-		do_IRQ(RT305X_CPU_IRQ_FE);
-
-	else if (pending & STATUSF_IP6)
-		do_IRQ(RT305X_CPU_IRQ_WNIC);
-
-	else if (pending & STATUSF_IP2)
-		rt305x_intc_irq_dispatch();
-
-	else
-		spurious_interrupt();
-}
-
-void __init arch_init_irq(void)
-{
-	mips_cpu_irq_init();
-	ramips_intc_irq_init(RT305X_INTC_BASE, RT305X_CPU_IRQ_INTC,
-			     RT305X_INTC_IRQ_BASE);
-}
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-dir-300-revb.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-dir-300-revb.c
deleted file mode 100644
index 27fad6ad9..000000000
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-dir-300-revb.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- *  D-Link DIR-300 rev B board support
- *
- *  Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
- *
- *  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.
- */
-
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/physmap.h>
-
-#include <asm/mach-ralink/machine.h>
-#include <asm/mach-ralink/dev-gpio-buttons.h>
-#include <asm/mach-ralink/dev-gpio-leds.h>
-#include <asm/mach-ralink/rt305x.h>
-#include <asm/mach-ralink/rt305x_regs.h>
-
-#include "devices.h"
-
-#define DIR_300B_GPIO_LED_STATUS_AMBER	8
-#define DIR_300B_GPIO_LED_STATUS_GREEN	9
-#define DIR_300B_GPIO_LED_WPS		13
-
-#define DIR_300B_GPIO_BUTTON_WPS	0	/* active low */
-#define DIR_300B_GPIO_BUTTON_RESET	10	/* active low */
-
-#define DIR_300B_BUTTONS_POLL_INTERVAL	20
-
-#ifdef CONFIG_MTD_PARTITIONS
-static struct mtd_partition dir_300b_partitions[] = {
-	{
-		.name	= "u-boot",
-		.offset	= 0,
-		.size	= 0x030000,
-		.mask_flags = MTD_WRITEABLE,
-	}, {
-		.name	= "devdata",
-		.offset	= 0x030000,
-		.size	= 0x010000,
-		.mask_flags = MTD_WRITEABLE,
-	}, {
-		.name	= "devconf",
-		.offset	= 0x040000,
-		.size	= 0x010000,
-		.mask_flags = MTD_WRITEABLE,
-	}, {
-		.name	= "kernel",
-		.offset	= 0x050000,
-		.size	= 0x090000,
-	}, {
-		.name	= "rootfs",
-		.offset	= 0x140000,
-		.size	= 0x2B0000,
-	}, {
-		.name	= "openwrt",
-		.offset	= 0x050000,
-		.size	= 0x3a0000,
-	}
-};
-#endif /* CONFIG_MTD_PARTITIONS */
-
-static struct physmap_flash_data dir_300b_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
-	.nr_parts	= ARRAY_SIZE(dir_300b_partitions),
-	.parts		= dir_300b_partitions,
-#endif
-};
-
-static struct gpio_led dir_300b_leds_gpio[] __initdata = {
-	{
-		.name		= "dir-300b:amber:status",
-		.gpio		= DIR_300B_GPIO_LED_STATUS_AMBER,
-		.active_low	= 1,
-	}, {
-		.name		= "dir-300b:green:status",
-		.gpio		= DIR_300B_GPIO_LED_STATUS_GREEN,
-		.active_low	= 1,
-	}, {
-		.name		= "dir-300b:blue:wps",
-		.gpio		= DIR_300B_GPIO_LED_WPS,
-		.active_low	= 1,
-	}
-};
-
-static struct gpio_button dir_300b_gpio_buttons[] __initdata = {
-	{
-		.desc		= "reset",
-		.type		= EV_KEY,
-		.code		= BTN_0,
-		.threshold	= 3,
-		.gpio		= DIR_300B_GPIO_BUTTON_RESET,
-		.active_low	= 1,
-	}, {
-		.desc		= "wps",
-		.type		= EV_KEY,
-		.code		= BTN_1,
-		.threshold	= 3,
-		.gpio		= DIR_300B_GPIO_BUTTON_WPS,
-		.active_low	= 1,
-	}
-};
-
-static void __init dir_300b_init(void)
-{
-	rt305x_gpio_init(RT305X_GPIO_MODE_GPIO << RT305X_GPIO_MODE_UART0_SHIFT);
-
-	rt305x_register_flash(0, &dir_300b_flash_data);
-	rt305x_register_ethernet();
-	ramips_register_gpio_leds(-1, ARRAY_SIZE(dir_300b_leds_gpio),
-				  dir_300b_leds_gpio);
-	ramips_register_gpio_buttons(-1, DIR_300B_BUTTONS_POLL_INTERVAL,
-				     ARRAY_SIZE(dir_300b_gpio_buttons),
-				     dir_300b_gpio_buttons);
-	rt305x_register_wifi();
-}
-
-MIPS_MACHINE(RAMIPS_MACH_DIR_300_REVB, "DIR-300-revB", "D-Link DIR-300 revB",
-	     dir_300b_init);
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-fonera20n.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-fonera20n.c
deleted file mode 100644
index c87bdaf3e..000000000
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-fonera20n.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- *  La Fonera20N board support
- *
- *  Copyright (C) 2009 John Crispin <blogic@openwrt.org>
- *  Copyright (C) 2010 Gabor Juhos <juhosg@openwrt.org>
- *
- *  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.
- */
-
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/physmap.h>
-
-#include <asm/mach-ralink/machine.h>
-#include <asm/mach-ralink/dev-gpio-buttons.h>
-#include <asm/mach-ralink/dev-gpio-leds.h>
-#include <asm/mach-ralink/rt305x.h>
-#include <asm/mach-ralink/rt305x_regs.h>
-
-#include "devices.h"
-
-#define FONERA20N_GPIO_BUTTON_RESET	12
-#define FONERA20N_GPIO_SWITCH		13
-#define FONERA20N_GPIO_LED_WIFI		7
-#define FONERA20N_GPIO_LED_POWER	9
-#define FONERA20N_GPIO_LED_USB		14
-
-#define FONERA20N_BUTTONS_POLL_INTERVAL	20
-
-#ifdef CONFIG_MTD_PARTITIONS
-static struct mtd_partition fonera20n_partitions[] = {
-	{
-		.name	= "u-boot",
-		.offset	= 0,
-		.size	= 0x030000,
-		.mask_flags = MTD_WRITEABLE,
-	}, {
-		.name	= "u-boot-env",
-		.offset	= 0x030000,
-		.size	= 0x010000,
-		.mask_flags = MTD_WRITEABLE,
-	}, {
-		.name	= "factory",
-		.offset	= 0x040000,
-		.size	= 0x010000,
-		.mask_flags = MTD_WRITEABLE,
-	}, {
-		.name	= "kernel",
-		.offset	= 0x050000,
-		.size	= 0x0a0000,
-	}, {
-		.name	= "rootfs",
-		.offset	= 0x150000,
-		.size	= 0x6b0000,
-	}, {
-		.name	= "openwrt",
-		.offset	= 0x050000,
-		.size	= 0x7b0000,
-	}
-};
-#endif /* CONFIG_MTD_PARTITIONS */
-
-static struct physmap_flash_data fonera20n_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
-	.nr_parts	= ARRAY_SIZE(fonera20n_partitions),
-	.parts		= fonera20n_partitions,
-#endif
-};
-
-static struct gpio_led fonera20n_leds_gpio[] __initdata = {
-	{
-		.name		= "fonera20n:orange:wifi",
-		.gpio		= FONERA20N_GPIO_LED_WIFI,
-		.active_low	= 1,
-	}, {
-		.name		= "fonera20n:green:power",
-		.gpio		= FONERA20N_GPIO_LED_POWER,
-		.active_low	= 1,
-	}, {
-		.name		= "fonera20n:orange:usb",
-		.gpio		= FONERA20N_GPIO_LED_USB,
-		.active_low	= 1,
-	}
-};
-
-static struct gpio_button fonera20n_gpio_buttons[] __initdata = {
-	{
-		.desc		= "reset",
-		.type		= EV_KEY,
-		.code		= BTN_0,
-		.threshold	= 3,
-		.gpio		= FONERA20N_GPIO_BUTTON_RESET,
-		.active_low	= 1,
-	}, {
-		.desc		= "switch",
-		.type		= EV_KEY,
-		.code		= BTN_1,
-		.threshold	= 3,
-		.gpio		= FONERA20N_GPIO_SWITCH,
-		.active_low	= 1,
-	}
-};
-
-static void __init fonera20n_init(void)
-{
-	rt305x_gpio_init(RT305X_GPIO_MODE_GPIO << RT305X_GPIO_MODE_UART0_SHIFT);
-
-	rt305x_register_flash(0, &fonera20n_flash_data);
-
-	ramips_register_gpio_leds(-1, ARRAY_SIZE(fonera20n_leds_gpio),
-				  fonera20n_leds_gpio);
-
-	ramips_register_gpio_buttons(-1, FONERA20N_BUTTONS_POLL_INTERVAL,
-				     ARRAY_SIZE(fonera20n_gpio_buttons),
-				     fonera20n_gpio_buttons);
-
-	rt305x_register_ethernet();
-	rt305x_register_wifi();
-}
-
-MIPS_MACHINE(RAMIPS_MACH_FONERA20N, "FONERA20N", "La Fonera 2.0N",
-	     fonera20n_init);
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-v22rw-2x2.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-v22rw-2x2.c
deleted file mode 100644
index 812dfb4a9..000000000
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-v22rw-2x2.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- *  Ralink AP-RT3052-V22RW-2X2 board support
- *
- *  Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
- *
- *  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.
- */
-
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/physmap.h>
-
-#include <asm/mach-ralink/machine.h>
-#include <asm/mach-ralink/dev-gpio-buttons.h>
-#include <asm/mach-ralink/dev-gpio-leds.h>
-#include <asm/mach-ralink/rt305x.h>
-#include <asm/mach-ralink/rt305x_regs.h>
-
-#include "devices.h"
-
-#define V22RW_2X2_GPIO_BUTTON_WPS	0
-#define V22RW_2X2_GPIO_BUTTON_SWRST	10
-#define V22RW_2X2_GPIO_LED_SECURITY	13
-#define V22RW_2X2_GPIO_LED_WPS		14
-
-#define V22RW_2X2_BUTTONS_POLL_INTERVAL	20
-
-#ifdef CONFIG_MTD_PARTITIONS
-static struct mtd_partition v22rw_2x2_partitions[] = {
-	{
-		.name	= "u-boot",
-		.offset	= 0,
-		.size	= 0x030000,
-		.mask_flags = MTD_WRITEABLE,
-	}, {
-		.name	= "u-boot-env",
-		.offset	= 0x030000,
-		.size	= 0x010000,
-		.mask_flags = MTD_WRITEABLE,
-	}, {
-		.name	= "factory",
-		.offset	= 0x040000,
-		.size	= 0x010000,
-		.mask_flags = MTD_WRITEABLE,
-	}, {
-		.name	= "kernel",
-		.offset	= 0x050000,
-		.size	= 0x0a0000,
-	}, {
-		.name	= "rootfs",
-		.offset	= 0x150000,
-		.size	= 0x2b0000,
-	}, {
-		.name	= "openwrt",
-		.offset	= 0x050000,
-		.size	= 0x3b0000,
-	}
-};
-#endif /* CONFIG_MTD_PARTITIONS */
-
-static struct physmap_flash_data v22rw_2x2_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
-	.nr_parts	= ARRAY_SIZE(v22rw_2x2_partitions),
-	.parts		= v22rw_2x2_partitions,
-#endif
-};
-
-static struct gpio_led v22rw_2x2_leds_gpio[] __initdata = {
-	{
-		.name		= "v22rw-2x2:green:security",
-		.gpio		= V22RW_2X2_GPIO_LED_SECURITY,
-		.active_low	= 1,
-	}, {
-		.name		= "v22rw-2x2:red:wps",
-		.gpio		= V22RW_2X2_GPIO_LED_WPS,
-		.active_low	= 1,
-	}
-};
-
-static struct gpio_button v22rw_2x2_gpio_buttons[] __initdata = {
-	{
-		.desc		= "reset",
-		.type		= EV_KEY,
-		.code		= BTN_0,
-		.threshold	= 3,
-		.gpio		= V22RW_2X2_GPIO_BUTTON_SWRST,
-		.active_low	= 1,
-	}, {
-		.desc		= "wps",
-		.type		= EV_KEY,
-		.code		= BTN_1,
-		.threshold	= 3,
-		.gpio		= V22RW_2X2_GPIO_BUTTON_WPS,
-		.active_low	= 1,
-	}
-};
-
-static void __init v22rw_2x2_init(void)
-{
-	rt305x_gpio_init(RT305X_GPIO_MODE_GPIO << RT305X_GPIO_MODE_UART0_SHIFT);
-
-	rt305x_register_flash(0, &v22rw_2x2_flash_data);
-	rt305x_register_ethernet();
-	ramips_register_gpio_leds(-1, ARRAY_SIZE(v22rw_2x2_leds_gpio),
-				  v22rw_2x2_leds_gpio);
-	ramips_register_gpio_buttons(-1, V22RW_2X2_BUTTONS_POLL_INTERVAL,
-				     ARRAY_SIZE(v22rw_2x2_gpio_buttons),
-				     v22rw_2x2_gpio_buttons);
-	rt305x_register_wifi();
-}
-
-MIPS_MACHINE(RAMIPS_MACH_V22RW_2X2, "V22RW-2X2", "Ralink AP-RT3052-V22RW-2X2",
-	     v22rw_2x2_init);
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-whr-g300n.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-whr-g300n.c
deleted file mode 100644
index 4e0e810bb..000000000
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-whr-g300n.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- *  Buffalo WHR-G300N board support
- *
- *  Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
- *
- *  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.
- */
-
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/physmap.h>
-
-#include <asm/mach-ralink/machine.h>
-#include <asm/mach-ralink/dev-gpio-buttons.h>
-#include <asm/mach-ralink/dev-gpio-leds.h>
-#include <asm/mach-ralink/rt305x.h>
-#include <asm/mach-ralink/rt305x_regs.h>
-
-#include "devices.h"
-
-#define WHR_G300N_GPIO_LED_DIAG		7
-#define WHR_G300N_GPIO_LED_ROUTER	9
-#define WHR_G300N_GPIO_LED_SECURITY	14
-
-#define WHR_G300N_GPIO_BUTTON_AOSS		0	/* active low */
-#define WHR_G300N_GPIO_BUTTON_RESET		10	/* active low */
-#define WHR_G300N_GPIO_BUTTON_ROUTER_ON		8	/* active low */
-#define WHR_G300N_GPIO_BUTTON_ROUTER_OFF	11	/* active low */
-
-#define WHR_G300N_BUTTONS_POLL_INTERVAL		20
-
-#ifdef CONFIG_MTD_PARTITIONS
-static struct mtd_partition whr_g300n_partitions[] = {
-	{
-		.name	= "u-boot",
-		.offset	= 0,
-		.size	= 0x030000,
-		.mask_flags = MTD_WRITEABLE,
-	}, {
-		.name	= "u-boot-env",
-		.offset	= 0x030000,
-		.size	= 0x010000,
-		.mask_flags = MTD_WRITEABLE,
-	}, {
-		.name	= "factory",
-		.offset	= 0x040000,
-		.size	= 0x010000,
-		.mask_flags = MTD_WRITEABLE,
-	}, {
-		.name	= "kernel",
-		.offset	= 0x050000,
-		.size	= 0x090000,
-	}, {
-		.name	= "rootfs",
-		.offset	= 0x140000,
-		.size	= 0x2B0000,
-	}, {
-		.name	= "user",
-		.offset	= 0x3f0000,
-		.size	= 0x010000,
-	}, {
-		.name	= "openwrt",
-		.offset	= 0x050000,
-		.size	= 0x3a0000,
-	}
-};
-#endif /* CONFIG_MTD_PARTITIONS */
-
-static struct physmap_flash_data whr_g300n_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
-	.nr_parts	= ARRAY_SIZE(whr_g300n_partitions),
-	.parts		= whr_g300n_partitions,
-#endif
-};
-
-static struct gpio_led whr_g300n_leds_gpio[] __initdata = {
-	{
-		.name		= "whr-g300n:red:diag",
-		.gpio		= WHR_G300N_GPIO_LED_DIAG,
-		.active_low	= 1,
-	}, {
-		.name		= "whr-g300n:green:router",
-		.gpio		= WHR_G300N_GPIO_LED_ROUTER,
-		.active_low	= 1,
-	}, {
-		.name		= "whr-g300n:amber:security",
-		.gpio		= WHR_G300N_GPIO_LED_SECURITY,
-		.active_low	= 1,
-	}
-};
-
-static struct gpio_button whr_g300n_gpio_buttons[] __initdata = {
-	{
-		.desc		= "reset",
-		.type		= EV_KEY,
-		.code		= BTN_0,
-		.threshold	= 3,
-		.gpio		= WHR_G300N_GPIO_BUTTON_RESET,
-		.active_low	= 1,
-	}, {
-		.desc		= "aoss",
-		.type		= EV_KEY,
-		.code		= BTN_1,
-		.threshold	= 3,
-		.gpio		= WHR_G300N_GPIO_BUTTON_AOSS,
-		.active_low	= 1,
-	}, {
-		.desc		= "router-off",
-		.type		= EV_KEY,
-		.code		= BTN_2,
-		.threshold	= 3,
-		.gpio		= WHR_G300N_GPIO_BUTTON_ROUTER_OFF,
-		.active_low	= 1,
-	}, {
-		.desc		= "router-on",
-		.type		= EV_KEY,
-		.code		= BTN_3,
-		.threshold	= 3,
-		.gpio		= WHR_G300N_GPIO_BUTTON_ROUTER_ON,
-		.active_low	= 1,
-	}
-};
-
-static void __init whr_g300n_init(void)
-{
-	rt305x_gpio_init(RT305X_GPIO_MODE_GPIO << RT305X_GPIO_MODE_UART0_SHIFT);
-
-	rt305x_register_flash(0, &whr_g300n_flash_data);
-	rt305x_register_ethernet();
-	ramips_register_gpio_leds(-1, ARRAY_SIZE(whr_g300n_leds_gpio),
-				  whr_g300n_leds_gpio);
-	ramips_register_gpio_buttons(-1, WHR_G300N_BUTTONS_POLL_INTERVAL,
-				     ARRAY_SIZE(whr_g300n_gpio_buttons),
-				     whr_g300n_gpio_buttons);
-	rt305x_register_wifi();
-}
-
-MIPS_MACHINE(RAMIPS_MACH_WHR_G300N, "WHR-G300N", "Buffalo WHR-G300N",
-	     whr_g300n_init);
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/rt305x.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/rt305x.c
deleted file mode 100644
index 002aaebab..000000000
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/rt305x.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Ralink RT305x SoC specific setup
- *
- * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
- * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
- *
- * Parts of this file are based on Ralink's 2.6.21 BSP
- *
- * 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.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/gpio.h>
-
-#include <asm/mach-ralink/common.h>
-#include <asm/mach-ralink/rt305x.h>
-#include <asm/mach-ralink/rt305x_regs.h>
-
-unsigned long rt305x_cpu_freq;
-EXPORT_SYMBOL_GPL(rt305x_cpu_freq);
-
-unsigned long rt305x_sys_freq;
-EXPORT_SYMBOL_GPL(rt305x_sys_freq);
-
-void __iomem * rt305x_sysc_base;
-void __iomem * rt305x_memc_base;
-
-void __init rt305x_detect_sys_type(void)
-{
-	u32 n0;
-	u32 n1;
-	u32 id;
-
-	n0 = rt305x_sysc_rr(SYSC_REG_CHIP_NAME0);
-	n1 = rt305x_sysc_rr(SYSC_REG_CHIP_NAME1);
-	id = rt305x_sysc_rr(SYSC_REG_CHIP_ID);
-
-	snprintf(ramips_sys_type, RAMIPS_SYS_TYPE_LEN,
-		"Ralink %c%c%c%c%c%c%c%c id:%u rev:%u",
-		(char) (n0 & 0xff), (char) ((n0 >> 8) & 0xff),
-		(char) ((n0 >> 16) & 0xff), (char) ((n0 >> 24) & 0xff),
-		(char) (n1 & 0xff), (char) ((n1 >> 8) & 0xff),
-		(char) ((n1 >> 16) & 0xff), (char) ((n1 >> 24) & 0xff),
-		(id >> CHIP_ID_ID_SHIFT) & CHIP_ID_ID_MASK,
-		(id & CHIP_ID_REV_MASK));
-}
-
-void __init rt305x_detect_sys_freq(void)
-{
-	u32	t;
-
-	t = rt305x_sysc_rr(SYSC_REG_SYSTEM_CONFIG);
-	t = ((t >> SYSTEM_CONFIG_CPUCLK_SHIFT) & SYSTEM_CONFIG_CPUCLK_MASK);
-
-	switch (t) {
-	case SYSTEM_CONFIG_CPUCLK_320:
-		rt305x_cpu_freq = 320000000;
-		break;
-	case SYSTEM_CONFIG_CPUCLK_384:
-		rt305x_cpu_freq = 384000000;
-		break;
-	}
-
-	rt305x_sys_freq = rt305x_cpu_freq / 3;
-}
-
-static void rt305x_gpio_reserve(int first, int last)
-{
-	for (; first <= last; first++)
-		gpio_request(first, "reserved");
-}
-
-void __init rt305x_gpio_init(u32 mode)
-{
-	u32 t;
-
-	rt305x_sysc_wr(mode, SYSC_REG_GPIO_MODE);
-
-	ramips_gpio_init();
-	if ((mode & RT305X_GPIO_MODE_I2C) == 0)
-		rt305x_gpio_reserve(RT305X_GPIO_I2C_SD, RT305X_GPIO_I2C_SCLK);
-
-	if ((mode & RT305X_GPIO_MODE_SPI) == 0)
-		rt305x_gpio_reserve(RT305X_GPIO_SPI_EN, RT305X_GPIO_SPI_CLK);
-
-	t = mode >> RT305X_GPIO_MODE_UART0_SHIFT;
-	t &= RT305X_GPIO_MODE_UART0_MASK;
-	switch (t) {
-	case RT305X_GPIO_MODE_UARTF:
-	case RT305X_GPIO_MODE_PCM_UARTF:
-	case RT305X_GPIO_MODE_PCM_I2S:
-	case RT305X_GPIO_MODE_I2S_UARTF:
-		rt305x_gpio_reserve(RT305X_GPIO_7, RT305X_GPIO_14);
-		break;
-	case RT305X_GPIO_MODE_PCM_GPIO:
-		rt305x_gpio_reserve(RT305X_GPIO_10, RT305X_GPIO_14);
-		break;
-	case RT305X_GPIO_MODE_GPIO_UARTF:
-	case RT305X_GPIO_MODE_GPIO_I2S:
-		rt305x_gpio_reserve(RT305X_GPIO_7, RT305X_GPIO_10);
-		break;
-	}
-
-	if ((mode & RT305X_GPIO_MODE_UART1) == 0)
-		rt305x_gpio_reserve(RT305X_GPIO_UART1_TXD,
-				    RT305X_GPIO_UART1_RXD);
-
-	if ((mode & RT305X_GPIO_MODE_JTAG) == 0)
-		rt305x_gpio_reserve(RT305X_GPIO_JTAG_TDO, RT305X_GPIO_JTAG_TDI);
-
-	if ((mode & RT305X_GPIO_MODE_MDIO) == 0)
-		rt305x_gpio_reserve(RT305X_GPIO_MDIO_MDC,
-				    RT305X_GPIO_MDIO_MDIO);
-
-	if ((mode & RT305X_GPIO_MODE_SDRAM) == 0)
-		rt305x_gpio_reserve(RT305X_GPIO_SDRAM_MD16,
-				    RT305X_GPIO_SDRAM_MD31);
-
-	if ((mode & RT305X_GPIO_MODE_RGMII) == 0)
-		rt305x_gpio_reserve(RT305X_GPIO_GE0_TXD0,
-				    RT305X_GPIO_GE0_RXCLK);
-}
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/setup.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/setup.c
deleted file mode 100644
index 19f340bd4..000000000
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/setup.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Ralink RT305x SoC specific setup
- *
- * Copyright (C) 2008 Gabor Juhos <juhosg@openwrt.org>
- *
- * Parts of this file are based on Ralink's 2.6.21 BSP
- *
- * 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.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/io.h>
-
-#include <asm/mips_machine.h>
-#include <asm/reboot.h>
-#include <asm/time.h>
-
-#include <asm/mach-ralink/common.h>
-#include <asm/mach-ralink/rt305x.h>
-#include <asm/mach-ralink/rt305x_regs.h>
-
-static void rt305x_restart(char *command)
-{
-	rt305x_sysc_wr(RT305X_RESET_SYSTEM, SYSC_REG_RESET_CTRL);
-	while (1)
-		if (cpu_wait)
-			cpu_wait();
-}
-
-static void rt305x_halt(void)
-{
-	while (1)
-		if (cpu_wait)
-			cpu_wait();
-}
-
-unsigned int __cpuinit get_c0_compare_irq(void)
-{
-	return CP0_LEGACY_COMPARE_IRQ;
-}
-
-void __init ramips_soc_setup(void)
-{
-	rt305x_sysc_base = ioremap_nocache(RT305X_SYSC_BASE, PAGE_SIZE);
-	rt305x_memc_base = ioremap_nocache(RT305X_MEMC_BASE, PAGE_SIZE);
-
-	rt305x_detect_sys_type();
-	rt305x_detect_sys_freq();
-
-	printk(KERN_INFO "%s running at %lu.%02lu MHz\n", ramips_sys_type,
-		rt305x_cpu_freq / 1000000,
-		(rt305x_cpu_freq % 1000000) * 100 / 1000000);
-
-	_machine_restart = rt305x_restart;
-	_machine_halt = rt305x_halt;
-	pm_power_off = rt305x_halt;
-
-	ramips_early_serial_setup(0, RT305X_UART0_BASE, rt305x_sys_freq,
-				  RT305X_INTC_IRQ_UART0);
-	ramips_early_serial_setup(1, RT305X_UART1_BASE, rt305x_sys_freq,
-				  RT305X_INTC_IRQ_UART1);
-}
-
-void __init plat_time_init(void)
-{
-	mips_hpt_frequency = rt305x_cpu_freq / 2;
-}
diff --git a/target/linux/ramips/files/drivers/net/ramips.c b/target/linux/ramips/files/drivers/net/ramips.c
deleted file mode 100644
index 5a728be02..000000000
--- a/target/linux/ramips/files/drivers/net/ramips.c
+++ /dev/null
@@ -1,505 +0,0 @@
-/*
- *   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; version 2 of the License
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- *
- *   Copyright (C) 2009 John Crispin <blogic@openwrt.org>
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/dma-mapping.h>
-#include <linux/init.h>
-#include <linux/skbuff.h>
-#include <linux/etherdevice.h>
-#include <linux/platform_device.h>
-
-#include <ramips_eth_platform.h>
-#include "ramips_eth.h"
-
-#define TX_TIMEOUT (20 * HZ / 100)
-#define	MAX_RX_LENGTH	1600
-
-#ifdef CONFIG_RALINK_RT305X
-#include "ramips_esw.c"
-#endif
-
-#define phys_to_bus(a)  (a & 0x1FFFFFFF)
-
-static struct net_device * ramips_dev;
-static void __iomem *ramips_fe_base = 0;
-
-static inline void
-ramips_fe_wr(u32 val, unsigned reg)
-{
-	__raw_writel(val, ramips_fe_base + reg);
-}
-
-static inline u32
-ramips_fe_rr(unsigned reg)
-{
-	return __raw_readl(ramips_fe_base + reg);
-}
-
-static inline void
-ramips_fe_int_disable(u32 mask)
-{
-	ramips_fe_wr(ramips_fe_rr(RAMIPS_FE_INT_ENABLE) & ~mask,
-		     RAMIPS_FE_INT_ENABLE);
-	/* flush write */
-	ramips_fe_rr(RAMIPS_FE_INT_ENABLE);
-}
-
-static inline void
-ramips_fe_int_enable(u32 mask)
-{
-	ramips_fe_wr(ramips_fe_rr(RAMIPS_FE_INT_ENABLE) | mask,
-		     RAMIPS_FE_INT_ENABLE);
-	/* flush write */
-	ramips_fe_rr(RAMIPS_FE_INT_ENABLE);
-}
-
-static inline void
-ramips_hw_set_macaddr(unsigned char *mac)
-{
-	ramips_fe_wr((mac[0] << 8) | mac[1], RAMIPS_GDMA1_MAC_ADRH);
-	ramips_fe_wr((mac[2] << 24) | (mac[3] << 16) | (mac[4] << 8) | mac[5],
-		     RAMIPS_GDMA1_MAC_ADRL);
-}
-
-static void
-ramips_cleanup_dma(struct raeth_priv *re)
-{
-	int i;
-
-	for (i = 0; i < NUM_RX_DESC; i++)
-		if (re->rx_skb[i])
-			dev_kfree_skb_any(re->rx_skb[i]);
-
-	if (re->rx)
-		dma_free_coherent(NULL,
-				  NUM_RX_DESC * sizeof(struct ramips_rx_dma),
-				  re->rx, re->phy_rx);
-
-	if (re->tx)
-		dma_free_coherent(NULL,
-				  NUM_TX_DESC * sizeof(struct ramips_tx_dma),
-				  re->tx, re->phy_tx);
-}
-
-static int
-ramips_alloc_dma(struct raeth_priv *re)
-{
-	int err = -ENOMEM;
-	int i;
-
-	re->skb_free_idx = 0;
-
-	/* setup tx ring */
-	re->tx = dma_alloc_coherent(NULL,
-				    NUM_TX_DESC * sizeof(struct ramips_tx_dma),
-				    &re->phy_tx, GFP_ATOMIC);
-	if (!re->tx)
-		goto err_cleanup;
-
-	memset(re->tx, 0, NUM_TX_DESC * sizeof(struct ramips_tx_dma));
-	for (i = 0; i < NUM_TX_DESC; i++) {
-		re->tx[i].txd2 = TX_DMA_LSO | TX_DMA_DONE;
-		re->tx[i].txd4 = TX_DMA_QN(3) | TX_DMA_PN(1);
-	}
-
-	/* setup rx ring */
-	re->rx = dma_alloc_coherent(NULL,
-				    NUM_RX_DESC * sizeof(struct ramips_rx_dma),
-				    &re->phy_rx, GFP_ATOMIC);
-	if (!re->rx)
-		goto err_cleanup;
-
-	memset(re->rx, 0, sizeof(struct ramips_rx_dma) * NUM_RX_DESC);
-	for (i = 0; i < NUM_RX_DESC; i++) {
-		struct sk_buff *new_skb = dev_alloc_skb(MAX_RX_LENGTH + 2);
-
-		if (!new_skb)
-			goto err_cleanup;
-
-		skb_reserve(new_skb, 2);
-		re->rx[i].rxd1 = dma_map_single(NULL,
-						skb_put(new_skb, 2),
-						MAX_RX_LENGTH + 2,
-						DMA_FROM_DEVICE);
-		re->rx[i].rxd2 |= RX_DMA_LSO;
-		re->rx_skb[i] = new_skb;
-	}
-
-	return 0;
-
- err_cleanup:
-	ramips_cleanup_dma(re);
-	return err;
-}
-
-static void
-ramips_setup_dma(struct raeth_priv *re)
-{
-	ramips_fe_wr(phys_to_bus(re->phy_tx), RAMIPS_TX_BASE_PTR0);
-	ramips_fe_wr(NUM_TX_DESC, RAMIPS_TX_MAX_CNT0);
-	ramips_fe_wr(0, RAMIPS_TX_CTX_IDX0);
-	ramips_fe_wr(RAMIPS_PST_DTX_IDX0, RAMIPS_PDMA_RST_CFG);
-
-	ramips_fe_wr(phys_to_bus(re->phy_rx), RAMIPS_RX_BASE_PTR0);
-	ramips_fe_wr(NUM_RX_DESC, RAMIPS_RX_MAX_CNT0);
-	ramips_fe_wr((NUM_RX_DESC - 1), RAMIPS_RX_CALC_IDX0);
-	ramips_fe_wr(RAMIPS_PST_DRX_IDX0, RAMIPS_PDMA_RST_CFG);
-}
-
-static int
-ramips_eth_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
-{
-	struct raeth_priv *priv = netdev_priv(dev);
-	unsigned long tx;
-	unsigned int tx_next;
-	unsigned int mapped_addr;
-	unsigned long flags;
-
-	if (priv->plat->min_pkt_len) {
-		if (skb->len < priv->plat->min_pkt_len) {
-			if (skb_padto(skb, priv->plat->min_pkt_len)) {
-				printk(KERN_ERR
-				       "ramips_eth: skb_padto failed\n");
-				kfree_skb(skb);
-				return 0;
-			}
-			skb_put(skb, priv->plat->min_pkt_len - skb->len);
-		}
-	}
-
-	dev->trans_start = jiffies;
-	mapped_addr = (unsigned int) dma_map_single(NULL, skb->data, skb->len,
-						    DMA_TO_DEVICE);
-	dma_sync_single_for_device(NULL, mapped_addr, skb->len, DMA_TO_DEVICE);
-	spin_lock_irqsave(&priv->page_lock, flags);
-	tx = ramips_fe_rr(RAMIPS_TX_CTX_IDX0);
-	tx_next = (tx + 1) % NUM_TX_DESC;
-
-	if ((priv->tx_skb[tx]) || (priv->tx_skb[tx_next]) ||
-	    !(priv->tx[tx].txd2 & TX_DMA_DONE) ||
-	    !(priv->tx[tx_next].txd2 & TX_DMA_DONE))
-		goto out;
-
-	priv->tx[tx].txd1 = mapped_addr;
-	priv->tx[tx].txd2 &= ~(TX_DMA_PLEN0_MASK | TX_DMA_DONE);
-	priv->tx[tx].txd2 |= TX_DMA_PLEN0(skb->len);
-	dev->stats.tx_packets++;
-	dev->stats.tx_bytes += skb->len;
-	priv->tx_skb[tx] = skb;
-	wmb();
-	ramips_fe_wr(tx_next, RAMIPS_TX_CTX_IDX0);
-	spin_unlock_irqrestore(&priv->page_lock, flags);
-	return NETDEV_TX_OK;
-
- out:
-	spin_unlock_irqrestore(&priv->page_lock, flags);
-	dev->stats.tx_dropped++;
-	kfree_skb(skb);
-	return NETDEV_TX_OK;
-}
-
-static void
-ramips_eth_rx_hw(unsigned long ptr)
-{
-	struct net_device *dev = (struct net_device *) ptr;
-	struct raeth_priv *priv = netdev_priv(dev);
-	int rx;
-	int max_rx = 16;
-
-	while (max_rx) {
-		struct sk_buff *rx_skb, *new_skb;
-
-		rx = (ramips_fe_rr(RAMIPS_RX_CALC_IDX0) + 1) % NUM_RX_DESC;
-		if (!(priv->rx[rx].rxd2 & RX_DMA_DONE))
-			break;
-		max_rx--;
-
-		rx_skb = priv->rx_skb[rx];
-		rx_skb->len = RX_DMA_PLEN0(priv->rx[rx].rxd2);
-		rx_skb->dev = dev;
-		rx_skb->protocol = eth_type_trans(rx_skb, dev);
-		rx_skb->ip_summed = CHECKSUM_NONE;
-		dev->stats.rx_packets++;
-		dev->stats.rx_bytes += rx_skb->len;
-		netif_rx(rx_skb);
-
-		new_skb = netdev_alloc_skb(dev, MAX_RX_LENGTH + 2);
-		priv->rx_skb[rx] = new_skb;
-		BUG_ON(!new_skb);
-		skb_reserve(new_skb, 2);
-		priv->rx[rx].rxd1 = dma_map_single(NULL,
-						   new_skb->data,
-						   MAX_RX_LENGTH + 2,
-						   DMA_FROM_DEVICE);
-		priv->rx[rx].rxd2 &= ~RX_DMA_DONE;
-		wmb();
-		ramips_fe_wr(rx, RAMIPS_RX_CALC_IDX0);
-	}
-
-	if (max_rx == 0)
-		tasklet_schedule(&priv->rx_tasklet);
-	else
-		ramips_fe_int_enable(RAMIPS_RX_DLY_INT);
-}
-
-static void
-ramips_eth_tx_housekeeping(unsigned long ptr)
-{
-	struct net_device *dev = (struct net_device*)ptr;
-	struct raeth_priv *priv = netdev_priv(dev);
-
-	while ((priv->tx[priv->skb_free_idx].txd2 & TX_DMA_DONE) &&
-	       (priv->tx_skb[priv->skb_free_idx])) {
-		dev_kfree_skb_irq(priv->tx_skb[priv->skb_free_idx]);
-		priv->tx_skb[priv->skb_free_idx] = 0;
-		priv->skb_free_idx++;
-		if (priv->skb_free_idx >= NUM_TX_DESC)
-			priv->skb_free_idx = 0;
-	}
-
-	ramips_fe_int_enable(RAMIPS_TX_DLY_INT);
-}
-
-static void
-ramips_eth_timeout(struct net_device *dev)
-{
-	struct raeth_priv *priv = netdev_priv(dev);
-
-	tasklet_schedule(&priv->tx_housekeeping_tasklet);
-}
-
-static irqreturn_t
-ramips_eth_irq(int irq, void *dev)
-{
-	struct raeth_priv *priv = netdev_priv(dev);
-	unsigned long fe_int = ramips_fe_rr(RAMIPS_FE_INT_STATUS);
-
-	ramips_fe_wr(0xFFFFFFFF, RAMIPS_FE_INT_STATUS);
-
-	if (fe_int & RAMIPS_RX_DLY_INT) {
-		ramips_fe_int_disable(RAMIPS_RX_DLY_INT);
-		tasklet_schedule(&priv->rx_tasklet);
-	}
-
-	if (fe_int & RAMIPS_TX_DLY_INT)
-		ramips_eth_tx_housekeeping((unsigned long)dev);
-
-	return IRQ_HANDLED;
-}
-
-static int
-ramips_eth_open(struct net_device *dev)
-{
-	struct raeth_priv *priv = netdev_priv(dev);
-	int err;
-
-	err = request_irq(dev->irq, ramips_eth_irq, IRQF_DISABLED,
-			  dev->name, dev);
-	if (err)
-		return err;
-
-	err = ramips_alloc_dma(priv);
-	if (err)
-		goto err_free_irq;
-
-	ramips_hw_set_macaddr(dev->dev_addr);
-
-	ramips_setup_dma(priv);
-	ramips_fe_wr((ramips_fe_rr(RAMIPS_PDMA_GLO_CFG) & 0xff) |
-		(RAMIPS_TX_WB_DDONE | RAMIPS_RX_DMA_EN |
-		RAMIPS_TX_DMA_EN | RAMIPS_PDMA_SIZE_4DWORDS),
-		RAMIPS_PDMA_GLO_CFG);
-	ramips_fe_wr((ramips_fe_rr(RAMIPS_FE_GLO_CFG) &
-		~(RAMIPS_US_CYC_CNT_MASK << RAMIPS_US_CYC_CNT_SHIFT)) |
-		((priv->plat->sys_freq / RAMIPS_US_CYC_CNT_DIVISOR) << RAMIPS_US_CYC_CNT_SHIFT),
-		RAMIPS_FE_GLO_CFG);
-
-	tasklet_init(&priv->tx_housekeeping_tasklet, ramips_eth_tx_housekeeping,
-		     (unsigned long)dev);
-	tasklet_init(&priv->rx_tasklet, ramips_eth_rx_hw, (unsigned long)dev);
-
-	ramips_fe_wr(RAMIPS_DELAY_INIT, RAMIPS_DLY_INT_CFG);
-	ramips_fe_wr(RAMIPS_TX_DLY_INT | RAMIPS_RX_DLY_INT, RAMIPS_FE_INT_ENABLE);
-	ramips_fe_wr(ramips_fe_rr(RAMIPS_GDMA1_FWD_CFG) &
-		~(RAMIPS_GDM1_ICS_EN | RAMIPS_GDM1_TCS_EN | RAMIPS_GDM1_UCS_EN | 0xffff),
-		RAMIPS_GDMA1_FWD_CFG);
-	ramips_fe_wr(ramips_fe_rr(RAMIPS_CDMA_CSG_CFG) &
-		~(RAMIPS_ICS_GEN_EN | RAMIPS_TCS_GEN_EN | RAMIPS_UCS_GEN_EN),
-		RAMIPS_CDMA_CSG_CFG);
-	ramips_fe_wr(RAMIPS_PSE_FQFC_CFG_INIT, RAMIPS_PSE_FQ_CFG);
-	ramips_fe_wr(1, RAMIPS_FE_RST_GL);
-	ramips_fe_wr(0, RAMIPS_FE_RST_GL);
-
-	netif_start_queue(dev);
-	return 0;
-
- err_free_irq:
-	free_irq(dev->irq, dev);
-	return err;
-}
-
-static int
-ramips_eth_stop(struct net_device *dev)
-{
-	struct raeth_priv *priv = netdev_priv(dev);
-
-	ramips_fe_wr(ramips_fe_rr(RAMIPS_PDMA_GLO_CFG) &
-		     ~(RAMIPS_TX_WB_DDONE | RAMIPS_RX_DMA_EN | RAMIPS_TX_DMA_EN),
-		     RAMIPS_PDMA_GLO_CFG);
-	free_irq(dev->irq, dev);
-	netif_stop_queue(dev);
-	tasklet_kill(&priv->tx_housekeeping_tasklet);
-	tasklet_kill(&priv->rx_tasklet);
-	ramips_cleanup_dma(priv);
-	printk(KERN_DEBUG "ramips_eth: stopped\n");
-	return 0;
-}
-
-static int __init
-ramips_eth_probe(struct net_device *dev)
-{
-	struct raeth_priv *priv = netdev_priv(dev);
-
-	BUG_ON(!priv->plat->reset_fe);
-	priv->plat->reset_fe();
-	net_srandom(jiffies);
-	memcpy(dev->dev_addr, priv->plat->mac, ETH_ALEN);
-
-	ether_setup(dev);
-	dev->mtu = 1500;
-	dev->watchdog_timeo = TX_TIMEOUT;
-	spin_lock_init(&priv->page_lock);
-
-	return 0;
-}
-
-static const struct net_device_ops ramips_eth_netdev_ops = {
-	.ndo_init		= ramips_eth_probe,
-	.ndo_open		= ramips_eth_open,
-	.ndo_stop		= ramips_eth_stop,
-	.ndo_start_xmit		= ramips_eth_hard_start_xmit,
-	.ndo_tx_timeout		= ramips_eth_timeout,
-	.ndo_change_mtu		= eth_change_mtu,
-	.ndo_set_mac_address	= eth_mac_addr,
-	.ndo_validate_addr	= eth_validate_addr,
-};
-
-static int
-ramips_eth_plat_probe(struct platform_device *plat)
-{
-	struct raeth_priv *priv;
-	struct ramips_eth_platform_data *data = plat->dev.platform_data;
-	struct resource *res;
-	int err;
-
-	if (!data) {
-		dev_err(&plat->dev, "no platform data specified\n");
-		return -EINVAL;
-	}
-
-	res = platform_get_resource(plat, IORESOURCE_MEM, 0);
-	if (!res) {
-		dev_err(&plat->dev, "no memory resource found\n");
-		return -ENXIO;
-	}
-
-	ramips_fe_base = ioremap_nocache(res->start, res->end - res->start + 1);
-	if (!ramips_fe_base)
-		return -ENOMEM;
-
-	ramips_dev = alloc_etherdev(sizeof(struct raeth_priv));
-	if (!ramips_dev) {
-		dev_err(&plat->dev, "alloc_etherdev failed\n");
-		err = -ENOMEM;
-		goto err_unmap;
-	}
-
-	strcpy(ramips_dev->name, "eth%d");
-	ramips_dev->irq = platform_get_irq(plat, 0);
-	if (ramips_dev->irq < 0) {
-		dev_err(&plat->dev, "no IRQ resource found\n");
-		err = -ENXIO;
-		goto err_free_dev;
-	}
-	ramips_dev->addr_len = ETH_ALEN;
-	ramips_dev->base_addr = (unsigned long)ramips_fe_base;
-	ramips_dev->netdev_ops = &ramips_eth_netdev_ops;
-
-	priv = netdev_priv(ramips_dev);
-	priv->plat = data;
-
-	err = register_netdev(ramips_dev);
-	if (err) {
-		dev_err(&plat->dev, "error bringing up device\n");
-		goto err_free_dev;
-	}
-
-#ifdef CONFIG_RALINK_RT305X
-	rt305x_esw_init();
-#endif
-	printk(KERN_DEBUG "ramips_eth: loaded\n");
-	return 0;
-
- err_free_dev:
-	kfree(ramips_dev);
- err_unmap:
-	iounmap(ramips_fe_base);
-	return err;
-}
-
-static int
-ramips_eth_plat_remove(struct platform_device *plat)
-{
-	unregister_netdev(ramips_dev);
-	free_netdev(ramips_dev);
-	printk(KERN_DEBUG "ramips_eth: unloaded\n");
-	return 0;
-}
-
-static struct platform_driver ramips_eth_driver = {
-	.probe = ramips_eth_plat_probe,
-	.remove = ramips_eth_plat_remove,
-	.driver = {
-		.name = "ramips_eth",
-		.owner = THIS_MODULE,
-	},
-};
-
-static int __init
-ramips_eth_init(void)
-{
-	int ret = platform_driver_register(&ramips_eth_driver);
-	if (ret)
-		printk(KERN_ERR
-		       "ramips_eth: Error registering platfom driver!\n");
-	return ret;
-}
-
-static void __exit
-ramips_eth_cleanup(void)
-{
-	platform_driver_unregister(&ramips_eth_driver);
-}
-
-module_init(ramips_eth_init);
-module_exit(ramips_eth_cleanup);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("John Crispin <blogic@openwrt.org>");
-MODULE_DESCRIPTION("ethernet driver for ramips boards");
diff --git a/target/linux/ramips/files/drivers/net/ramips_esw.c b/target/linux/ramips/files/drivers/net/ramips_esw.c
deleted file mode 100644
index f9d31c2fb..000000000
--- a/target/linux/ramips/files/drivers/net/ramips_esw.c
+++ /dev/null
@@ -1,122 +0,0 @@
-#include <rt305x.h>
-#include <rt305x_regs.h>
-
-#define GPIO_PRUPOSE           0x60
-#define GPIO_MDIO_BIT          (1<<7)
-#define RT305X_ESW_PHY_WRITE		(1 << 13)
-#define RT305X_ESW_PHY_TOUT			(5 * HZ)
-#define RT305X_ESW_PHY_CONTROL_0	0xC0
-#define RT305X_ESW_PHY_CONTROL_1	0xC4
-
-static void __iomem *ramips_esw_base = 0;
-
-static inline void
-ramips_esw_wr(u32 val, unsigned reg)
-{
-	__raw_writel(val, ramips_esw_base + reg);
-}
-
-static inline u32
-ramips_esw_rr(unsigned reg)
-{
-	return __raw_readl(ramips_esw_base + reg);
-}
-
-static void
-ramips_enable_mdio(int s)
-{
-	u32 gpio = rt305x_sysc_rr(GPIO_PRUPOSE);
-	if(s)
-		gpio &= ~GPIO_MDIO_BIT;
-	else
-		gpio |= GPIO_MDIO_BIT;
-	rt305x_sysc_wr(gpio, GPIO_PRUPOSE);
-}
-
-u32
-mii_mgr_write(u32 phy_addr, u32 phy_register, u32 write_data)
-{
-	unsigned long volatile t_start = jiffies;
-	int ret = 0;
-
-	ramips_enable_mdio(1);
-	while(1)
-	{
-		if(!(ramips_esw_rr(RT305X_ESW_PHY_CONTROL_1) & (0x1 << 0)))
-			break;
-		if(time_after(jiffies, t_start + RT305X_ESW_PHY_TOUT))
-		{
-			ret = 1;
-			goto out;
-		}
-	}
-	ramips_esw_wr(((write_data & 0xFFFF) << 16) | (phy_register << 8) |
-		(phy_addr) | RT305X_ESW_PHY_WRITE, RT305X_ESW_PHY_CONTROL_0);
-	t_start = jiffies;
-	while(1)
-	{
-		if(ramips_esw_rr(RT305X_ESW_PHY_CONTROL_1) & (0x1 << 0))
-			break;
-		if(time_after(jiffies, t_start + RT305X_ESW_PHY_TOUT))
-		{
-			ret = 1;
-			break;
-		}
-	}
-out:
-	ramips_enable_mdio(0);
-	if(ret)
-		printk(KERN_ERR "ramips_eth: MDIO timeout\n");
-	return ret;
-}
-
-static int
-rt305x_esw_init(void)
-{
-	int i;
-
-	ramips_esw_base = ioremap_nocache(RT305X_SWITCH_BASE, PAGE_SIZE);
-	if(!ramips_esw_base)
-		return -ENOMEM;
-
-	/* vodoo from original driver */
-	ramips_esw_wr(0xC8A07850, 0x08);
-	ramips_esw_wr(0x00000000, 0xe4);
-	ramips_esw_wr(0x00405555, 0x14);
-	ramips_esw_wr(0x00002001, 0x50);
-	ramips_esw_wr(0x00007f7f, 0x90);
-	ramips_esw_wr(0x00007f3f, 0x98);
-	ramips_esw_wr(0x00d6500c, 0xcc);
-	ramips_esw_wr(0x0008a301, 0x9c);
-	ramips_esw_wr(0x02404040, 0x8c);
-	ramips_esw_wr(0x00001002, 0x48);
-	ramips_esw_wr(0x3f502b28, 0xc8);
-	ramips_esw_wr(0x00000000, 0x84);
-
-	mii_mgr_write(0, 31, 0x8000);
-	for(i = 0; i < 5; i++)
-	{
-		mii_mgr_write(i, 0, 0x3100);   //TX10 waveform coefficient
-		mii_mgr_write(i, 26, 0x1601);   //TX10 waveform coefficient
-		mii_mgr_write(i, 29, 0x7058);   //TX100/TX10 AD/DA current bias
-		mii_mgr_write(i, 30, 0x0018);   //TX100 slew rate control
-	}
-	/* PHY IOT */
-	mii_mgr_write(0, 31, 0x0);      //select global register
-	mii_mgr_write(0, 22, 0x052f);   //tune TP_IDL tail and head waveform
-	mii_mgr_write(0, 17, 0x0fe0);   //set TX10 signal amplitude threshold to minimum
-	mii_mgr_write(0, 18, 0x40ba);   //set squelch amplitude to higher threshold
-	mii_mgr_write(0, 14, 0x65);     //longer TP_IDL tail length
-	mii_mgr_write(0, 31, 0x8000);   //select local register
-
-	/* Port 5 Disabled */
-	rt305x_sysc_wr(rt305x_sysc_rr(0x60) | (1 << 9), 0x60); //set RGMII to GPIO mode (GPIO41-GPIO50)
-	rt305x_sysc_wr(0xfff, 0x674); //GPIO41-GPIO50 output mode
-	rt305x_sysc_wr(0x0, 0x670); //GPIO41-GPIO50 output low
-
-	/* set default vlan */
-	ramips_esw_wr(0x2001, 0x50);
-	ramips_esw_wr(0x504f, 0x70);
-
-	return 0;
-}
diff --git a/target/linux/ramips/files/drivers/net/ramips_eth.h b/target/linux/ramips/files/drivers/net/ramips_eth.h
deleted file mode 100644
index 593dd1d87..000000000
--- a/target/linux/ramips/files/drivers/net/ramips_eth.h
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- *   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; version 2 of the License
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- *
- *   based on Ralink SDK3.3
- *   Copyright (C) 2009 John Crispin <blogic@openwrt.org>
- */
-
-#ifndef RAMIPS_ETH_H
-#define RAMIPS_ETH_H
-
-#include <linux/mii.h>
-#include <linux/interrupt.h>
-#include <linux/netdevice.h>
-
-#define NUM_RX_DESC     256
-#define NUM_TX_DESC     256
-
-#define RAMIPS_DELAY_EN_INT		0x80
-#define RAMIPS_DELAY_MAX_INT		0x04
-#define RAMIPS_DELAY_MAX_TOUT		0x04
-#define RAMIPS_DELAY_CHAN		(((RAMIPS_DELAY_EN_INT | RAMIPS_DELAY_MAX_INT) << 8) | RAMIPS_DELAY_MAX_TOUT)
-#define RAMIPS_DELAY_INIT		((RAMIPS_DELAY_CHAN << 16) | RAMIPS_DELAY_CHAN)
-#define RAMIPS_PSE_FQFC_CFG_INIT	0x80504000
-
-/* interrupt bits */
-#define RAMIPS_CNT_PPE_AF		BIT(31)
-#define RAMIPS_CNT_GDM_AF		BIT(29)
-#define RAMIPS_PSE_P2_FC		BIT(26)
-#define RAMIPS_PSE_BUF_DROP		BIT(24)
-#define RAMIPS_GDM_OTHER_DROP		BIT(23)
-#define RAMIPS_PSE_P1_FC		BIT(22)
-#define RAMIPS_PSE_P0_FC		BIT(21)
-#define RAMIPS_PSE_FQ_EMPTY		BIT(20)
-#define RAMIPS_GE1_STA_CHG		BIT(18)
-#define RAMIPS_TX_COHERENT		BIT(17)
-#define RAMIPS_RX_COHERENT		BIT(16)
-#define RAMIPS_TX_DONE_INT3		BIT(11)
-#define RAMIPS_TX_DONE_INT2		BIT(10)
-#define RAMIPS_TX_DONE_INT1		BIT(9)
-#define RAMIPS_TX_DONE_INT0		BIT(8)
-#define RAMIPS_RX_DONE_INT0		BIT(2)
-#define RAMIPS_TX_DLY_INT		BIT(1)
-#define RAMIPS_RX_DLY_INT		BIT(0)
-
-/* registers */
-#define RAMIPS_FE_OFFSET		0x0000
-#define RAMIPS_GDMA_OFFSET		0x0020
-#define RAMIPS_PSE_OFFSET		0x0040
-#define RAMIPS_GDMA2_OFFSET		0x0060
-#define RAMIPS_CDMA_OFFSET		0x0080
-#define RAMIPS_PDMA_OFFSET		0x0100
-#define RAMIPS_PPE_OFFSET		0x0200
-#define RAMIPS_CMTABLE_OFFSET		0x0400
-#define RAMIPS_POLICYTABLE_OFFSET	0x1000
-
-#define RAMIPS_MDIO_ACCESS		(RAMIPS_FE_OFFSET + 0x00)
-#define RAMIPS_MDIO_CFG			(RAMIPS_FE_OFFSET + 0x04)
-#define RAMIPS_FE_GLO_CFG		(RAMIPS_FE_OFFSET + 0x08)
-#define RAMIPS_FE_RST_GL		(RAMIPS_FE_OFFSET + 0x0C)
-#define RAMIPS_FE_INT_STATUS		(RAMIPS_FE_OFFSET + 0x10)
-#define RAMIPS_FE_INT_ENABLE		(RAMIPS_FE_OFFSET + 0x14)
-#define RAMIPS_MDIO_CFG2		(RAMIPS_FE_OFFSET + 0x18)
-#define RAMIPS_FOC_TS_T			(RAMIPS_FE_OFFSET + 0x1C)
-
-#define	RAMIPS_GDMA1_FWD_CFG		(RAMIPS_GDMA_OFFSET + 0x00)
-#define RAMIPS_GDMA1_SCH_CFG		(RAMIPS_GDMA_OFFSET + 0x04)
-#define RAMIPS_GDMA1_SHPR_CFG		(RAMIPS_GDMA_OFFSET + 0x08)
-#define RAMIPS_GDMA1_MAC_ADRL		(RAMIPS_GDMA_OFFSET + 0x0C)
-#define RAMIPS_GDMA1_MAC_ADRH		(RAMIPS_GDMA_OFFSET + 0x10)
-
-#define	RAMIPS_GDMA2_FWD_CFG		(RAMIPS_GDMA2_OFFSET + 0x00)
-#define RAMIPS_GDMA2_SCH_CFG		(RAMIPS_GDMA2_OFFSET + 0x04)
-#define RAMIPS_GDMA2_SHPR_CFG		(RAMIPS_GDMA2_OFFSET + 0x08)
-#define RAMIPS_GDMA2_MAC_ADRL		(RAMIPS_GDMA2_OFFSET + 0x0C)
-#define RAMIPS_GDMA2_MAC_ADRH		(RAMIPS_GDMA2_OFFSET + 0x10)
-
-#define RAMIPS_PSE_FQ_CFG		(RAMIPS_PSE_OFFSET + 0x00)
-#define RAMIPS_CDMA_FC_CFG		(RAMIPS_PSE_OFFSET + 0x04)
-#define RAMIPS_GDMA1_FC_CFG		(RAMIPS_PSE_OFFSET + 0x08)
-#define RAMIPS_GDMA2_FC_CFG		(RAMIPS_PSE_OFFSET + 0x0C)
-
-#define RAMIPS_CDMA_CSG_CFG		(RAMIPS_CDMA_OFFSET + 0x00)
-#define RAMIPS_CDMA_SCH_CFG		(RAMIPS_CDMA_OFFSET + 0x04)
-
-#define RAMIPS_PDMA_GLO_CFG		(RAMIPS_PDMA_OFFSET + 0x00)
-#define RAMIPS_PDMA_RST_CFG		(RAMIPS_PDMA_OFFSET + 0x04)
-#define RAMIPS_PDMA_SCH_CFG		(RAMIPS_PDMA_OFFSET + 0x08)
-#define RAMIPS_DLY_INT_CFG		(RAMIPS_PDMA_OFFSET + 0x0C)
-#define RAMIPS_TX_BASE_PTR0		(RAMIPS_PDMA_OFFSET + 0x10)
-#define RAMIPS_TX_MAX_CNT0		(RAMIPS_PDMA_OFFSET + 0x14)
-#define RAMIPS_TX_CTX_IDX0		(RAMIPS_PDMA_OFFSET + 0x18)
-#define RAMIPS_TX_DTX_IDX0		(RAMIPS_PDMA_OFFSET + 0x1C)
-#define RAMIPS_TX_BASE_PTR1		(RAMIPS_PDMA_OFFSET + 0x20)
-#define RAMIPS_TX_MAX_CNT1		(RAMIPS_PDMA_OFFSET + 0x24)
-#define RAMIPS_TX_CTX_IDX1		(RAMIPS_PDMA_OFFSET + 0x28)
-#define RAMIPS_TX_DTX_IDX1		(RAMIPS_PDMA_OFFSET + 0x2C)
-#define RAMIPS_RX_BASE_PTR0		(RAMIPS_PDMA_OFFSET + 0x30)
-#define RAMIPS_RX_MAX_CNT0		(RAMIPS_PDMA_OFFSET + 0x34)
-#define RAMIPS_RX_CALC_IDX0		(RAMIPS_PDMA_OFFSET + 0x38)
-#define RAMIPS_RX_DRX_IDX0		(RAMIPS_PDMA_OFFSET + 0x3C)
-#define RAMIPS_TX_BASE_PTR2		(RAMIPS_PDMA_OFFSET + 0x40)
-#define RAMIPS_TX_MAX_CNT2		(RAMIPS_PDMA_OFFSET + 0x44)
-#define RAMIPS_TX_CTX_IDX2		(RAMIPS_PDMA_OFFSET + 0x48)
-#define RAMIPS_TX_DTX_IDX2		(RAMIPS_PDMA_OFFSET + 0x4C)
-#define RAMIPS_TX_BASE_PTR3		(RAMIPS_PDMA_OFFSET + 0x50)
-#define RAMIPS_TX_MAX_CNT3		(RAMIPS_PDMA_OFFSET + 0x54)
-#define RAMIPS_TX_CTX_IDX3		(RAMIPS_PDMA_OFFSET + 0x58)
-#define RAMIPS_TX_DTX_IDX3		(RAMIPS_PDMA_OFFSET + 0x5C)
-#define RAMIPS_RX_BASE_PTR1		(RAMIPS_PDMA_OFFSET + 0x60)
-#define RAMIPS_RX_MAX_CNT1		(RAMIPS_PDMA_OFFSET + 0x64)
-#define RAMIPS_RX_CALC_IDX1		(RAMIPS_PDMA_OFFSET + 0x68)
-#define RAMIPS_RX_DRX_IDX1		(RAMIPS_PDMA_OFFSET + 0x6C)
-
-/* uni-cast port */
-#define RAMIPS_GDM1_ICS_EN		BIT(22)
-#define RAMIPS_GDM1_TCS_EN		BIT(21)
-#define RAMIPS_GDM1_UCS_EN		BIT(20)
-#define RAMIPS_GDM1_JMB_EN		BIT(19)
-#define RAMIPS_GDM1_STRPCRC		BIT(16)
-#define RAMIPS_GDM1_UFRC_P_CPU		(0 << 12)
-#define RAMIPS_GDM1_UFRC_P_GDMA1	(1 << 12)
-#define RAMIPS_GDM1_UFRC_P_PPE		(6 << 12)
-
-/* checksums */
-#define RAMIPS_ICS_GEN_EN		BIT(2)
-#define RAMIPS_UCS_GEN_EN		BIT(1)
-#define RAMIPS_TCS_GEN_EN		BIT(0)
-
-/* dma ring */
-#define RAMIPS_PST_DRX_IDX0		BIT(16)
-#define RAMIPS_PST_DTX_IDX3		BIT(3)
-#define RAMIPS_PST_DTX_IDX2		BIT(2)
-#define RAMIPS_PST_DTX_IDX1		BIT(1)
-#define RAMIPS_PST_DTX_IDX0		BIT(0)
-
-#define RAMIPS_TX_WB_DDONE		BIT(6)
-#define RAMIPS_RX_DMA_BUSY		BIT(3)
-#define RAMIPS_TX_DMA_BUSY		BIT(1)
-#define RAMIPS_RX_DMA_EN		BIT(2)
-#define RAMIPS_TX_DMA_EN		BIT(0)
-
-#define RAMIPS_PDMA_SIZE_4DWORDS	(0 << 4)
-#define RAMIPS_PDMA_SIZE_8DWORDS	(1 << 4)
-#define RAMIPS_PDMA_SIZE_16DWORDS	(2 << 4)
-
-#define RAMIPS_US_CYC_CNT_MASK		0xff
-#define RAMIPS_US_CYC_CNT_SHIFT		0x8
-#define RAMIPS_US_CYC_CNT_DIVISOR	1000000
-
-#define RX_DMA_PLEN0(x)			((x >> 16) & 0x3fff)
-#define RX_DMA_LSO			BIT(30)
-#define RX_DMA_DONE			BIT(31)
-
-struct ramips_rx_dma {
-	unsigned int rxd1;
-	unsigned int rxd2;
-	unsigned int rxd3;
-	unsigned int rxd4;
-};
-
-#define TX_DMA_PLEN0_MASK		((0x3fff) << 16)
-#define TX_DMA_PLEN0(x)			((x & 0x3fff) << 16)
-#define TX_DMA_LSO			BIT(30)
-#define TX_DMA_DONE			BIT(31)
-#define TX_DMA_QN(x)			(x << 16)
-#define TX_DMA_PN(x)			(x << 24)
-#define TX_DMA_QN_MASK			TX_DMA_QN(0x7)
-#define TX_DMA_PN_MASK			TX_DMA_PN(0x7)
-
-struct ramips_tx_dma {
-	unsigned int txd1;
-	unsigned int txd2;
-	unsigned int txd3;
-	unsigned int txd4;
-};
-
-struct raeth_priv
-{
-	unsigned int		phy_rx;
-	struct tasklet_struct	rx_tasklet;
-	struct ramips_rx_dma	*rx;
-	struct sk_buff		*rx_skb[NUM_RX_DESC];
-
-	unsigned int		phy_tx;
-	struct tasklet_struct	tx_housekeeping_tasklet;
-	struct ramips_tx_dma	*tx;
-	struct sk_buff		*tx_skb[NUM_RX_DESC];
-
-	unsigned int		skb_free_idx;
-
-	spinlock_t		page_lock;
-	struct ramips_eth_platform_data *plat;
-};
-
-#endif /* RAMIPS_ETH_H */
diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile
deleted file mode 100644
index f0fcfb2c5..000000000
--- a/target/linux/ramips/image/Makefile
+++ /dev/null
@@ -1,118 +0,0 @@
-#
-# Copyright (C) 2008-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/image.mk
-
-define imgname
-$($BIN_DIR)/$(IMG_PREFIX)-$(2)-$(patsubst jffs2-%,jffs2,$(patsubst squashfs-%,squashfs,$(1)))
-endef
-
-VMLINUX:=$(IMG_PREFIX)-vmlinux
-UIMAGE:=$(IMG_PREFIX)-uImage
-ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
-	VMLINUX:=$(IMG_PREFIX)-vmlinux-initramfs
-	UIMAGE:=$(IMG_PREFIX)-uImage-initramfs
-endif
-
-ifeq ($(CONFIG_RALINK_RT305X),y)
-define kernel_entry
--a 0x80000000 -e 0x80000000
-endef
-else
-define kernel_entry
--a 0x88000000 -e 0x88000000
-endef
-endif
-
-define CompressLzma
-  $(STAGING_DIR_HOST)/bin/lzma e $(1) -lc1 -lp2 -pb2 $(2)
-endef
-
-define PatchKernelLzma
-	cp $(KDIR)/vmlinux $(KDIR)/vmlinux-$(1)
-	$(STAGING_DIR_HOST)/bin/patch-cmdline $(KDIR)/vmlinux-$(1) '$(strip $(2))'
-	$(call CompressLzma,$(KDIR)/vmlinux-$(1),$(KDIR)/vmlinux-$(1).bin.lzma)
-endef
-
-define MkImage
-	mkimage -A mips -O linux -T kernel -C $(1) $(call kernel_entry)\
-		-n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
-		-d $(2) $(3)
-endef
-
-define Image/BuildKernel
-	cp $(KDIR)/vmlinux.elf $(BIN_DIR)/$(VMLINUX).elf
-	cp $(KDIR)/vmlinux $(BIN_DIR)/$(VMLINUX).bin
-	$(call CompressLzma,$(KDIR)/vmlinux,$(KDIR)/vmlinux.bin.lzma)
-	$(call MkImage,lzma,$(KDIR)/vmlinux.bin.lzma,$(KDIR)/uImage.lzma)
-	cp $(KDIR)/uImage.lzma $(BIN_DIR)/$(UIMAGE).bin
-endef
-
-define BuildFirmware/Generic
-	$(call PatchKernelLzma,$(2),$(3) $($(4)))
-	if [ `stat -c%s "$(KDIR)/vmlinux-$(2).bin.lzma"` -gt $(5) ]; then \
-		echo "Warning: $(KDIR)/vmlinux-$(2).bin.lzma is too big"; \
-	else if [ `stat -c%s $(KDIR)/root.$(1)` -gt $(6) ]; then \
-		echo "Warning: $(KDIR)/root.$(1) is too big"; \
-	else \
-		mkimage -A mips -O linux -T kernel -C lzma \
-			$(call kernel_entry) \
-			-n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
-			-d $(KDIR)/vmlinux-$(2).bin.lzma $(KDIR)/vmlinux-$(2).uImage; \
-		( \
-			dd if=$(KDIR)/vmlinux-$(2).uImage bs=$(5) conv=sync; \
-			dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \
-		) > $(call imgname,$(1),$(2))-sysupgrade.bin; \
-	fi; fi
-endef
-
-mtdlayout_4M=mtdparts=physmap-flash.0:192k(u-boot)ro,64k(u-boot-env)ro,64k(factory)ro,832k(kernel),2944k(rootfs),3776k@0x50000(firmware)
-define Image/Build/Template/GENERIC_4M
-	$(call BuildFirmware/Generic,$(1),$(2),board=$(3),mtdlayout_4M,851968,3014656)
-endef
-
-mtdlayout_8M=mtdparts=physmap-flash.0:192k(u-boot)ro,64k(u-boot-env)ro,64k(factory)ro,832k(kernel),7040k(rootfs),7872k@0x50000(firmware)
-define Image/Build/Template/GENERIC_8M
-	$(call BuildFirmware/Generic,$(1),$(2),board=$(3),mtdlayout_8M,851968,7208960)
-endef
-
-define Image/Build/Profile/DIR300B1
-	$(call Image/Build/Template/GENERIC_4M,$(1),dir-300-b1,DIR-300-revB)
-endef
-
-define Image/Build/Profile/FONERA20N
-	$(call Image/Build/Template/GENERIC_8M,$(1),fonera20n,FONERA20N)
-endef
-
-define Image/Build/Profile/V22RW2X2
-	$(call Image/Build/Template/GENERIC_4M,$(1),v22rw-2x2,V22RW-2X2)
-endef
-
-define Image/Build/Profile/WHRG300N
-	$(call Image/Build/Template/GENERIC_4M,$(1),whr-g300n,WHR-G300N)
-endef
-
-ifeq ($(CONFIG_RALINK_RT305X),y)
-define Image/Build/Profile/Default
-	$(call Image/Build/Profile/DIR300B1,$(1))
-	$(call Image/Build/Profile/FONERA20N,$(1))
-	$(call Image/Build/Profile/V22RW2X2,$(1))
-	$(call Image/Build/Profile/WHRG300N,$(1))
-endef
-endif
-
-define Image/Build/squashfs
-	$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
-endef
-
-define Image/Build
-	$(call Image/Build/$(1))
-	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) bs=128k conv=sync
-	$(call Image/Build/Profile/$(PROFILE),$(1))
-endef
-
-$(eval $(call BuildImage))
diff --git a/target/linux/ramips/patches-2.6.32/001-mips-add-cp0-compare-irq-function.patch b/target/linux/ramips/patches-2.6.32/001-mips-add-cp0-compare-irq-function.patch
deleted file mode 100644
index babe906eb..000000000
--- a/target/linux/ramips/patches-2.6.32/001-mips-add-cp0-compare-irq-function.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/arch/mips/kernel/traps.c
-+++ b/arch/mips/kernel/traps.c
-@@ -48,6 +48,7 @@
- #include <asm/types.h>
- #include <asm/stacktrace.h>
- #include <asm/irq.h>
-+#include <asm/time.h>
- 
- extern void check_wait(void);
- extern asmlinkage void r4k_wait(void);
-@@ -1537,6 +1538,8 @@ void __cpuinit per_cpu_trap_init(void)
- 	 */
- 	if (cpu_has_mips_r2) {
- 		cp0_compare_irq = (read_c0_intctl() >> 29) & 7;
-+		if (get_c0_compare_irq)
-+			cp0_compare_irq = get_c0_compare_irq();
- 		cp0_perfcount_irq = (read_c0_intctl() >> 26) & 7;
- 		if (cp0_perfcount_irq == cp0_compare_irq)
- 			cp0_perfcount_irq = -1;
---- a/arch/mips/include/asm/time.h
-+++ b/arch/mips/include/asm/time.h
-@@ -52,6 +52,7 @@ extern int (*perf_irq)(void);
-  */
- #ifdef CONFIG_CEVT_R4K_LIB
- extern unsigned int __weak get_c0_compare_int(void);
-+extern unsigned int __weak get_c0_compare_irq(void);
- extern int r4k_clockevent_init(void);
- #endif
- 
diff --git a/target/linux/ramips/patches-2.6.32/010-mtd_fix_cfi_cmdset_0002_erase_status_check.patch b/target/linux/ramips/patches-2.6.32/010-mtd_fix_cfi_cmdset_0002_erase_status_check.patch
deleted file mode 100644
index 22aefe0d4..000000000
--- a/target/linux/ramips/patches-2.6.32/010-mtd_fix_cfi_cmdset_0002_erase_status_check.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -1568,7 +1568,7 @@ static int __xipram do_erase_chip(struct
- 			chip->erase_suspended = 0;
- 		}
- 
--		if (chip_ready(map, adr))
-+		if (chip_good(map, adr, map_word_ff(map)))
- 			break;
- 
- 		if (time_after(jiffies, timeo)) {
-@@ -1656,7 +1656,7 @@ static int __xipram do_erase_oneblock(st
- 			chip->erase_suspended = 0;
- 		}
- 
--		if (chip_ready(map, adr)) {
-+		if (chip_good(map, adr, map_word_ff(map))) {
- 			xip_enable(map, chip, adr);
- 			break;
- 		}
diff --git a/target/linux/ramips/patches-2.6.32/100-mips-ralink-core.patch b/target/linux/ramips/patches-2.6.32/100-mips-ralink-core.patch
deleted file mode 100644
index 10d329ca0..000000000
--- a/target/linux/ramips/patches-2.6.32/100-mips-ralink-core.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -156,6 +156,26 @@ ifeq (,$(findstring march=octeon, $(cfla
- cflags-$(CONFIG_CPU_CAVIUM_OCTEON) += -Wa,-march=octeon
- endif
- 
-+#
-+# Ralink SoC common stuff
-+#
-+core-$(CONFIG_MIPS_RALINK)	+= arch/mips/ralink/common/
-+cflags-$(CONFIG_MIPS_RALINK)	+= -I$(srctree)/arch/mips/include/asm/mach-ralink
-+
-+#
-+# Ralink RT288x
-+#
-+core-$(CONFIG_RALINK_RT288X)	+= arch/mips/ralink/rt288x/
-+cflags-$(CONFIG_RALINK_RT288X)	+= -I$(srctree)//arch/mips/include/asm/mach-ralink/rt288x
-+load-$(CONFIG_RALINK_RT288X)	+= 0xffffffff88000000
-+
-+#
-+# Ralink RT305x
-+#
-+core-$(CONFIG_RALINK_RT305X)	+= arch/mips/ralink/rt305x/
-+cflags-$(CONFIG_RALINK_RT305X)	+= -I$(srctree)/arch/mips/include/asm/mach-ralink/rt305x
-+load-$(CONFIG_RALINK_RT305X)	+= 0xffffffff80000000
-+
- cflags-$(CONFIG_CPU_R4000_WORKAROUNDS)	+= $(call cc-option,-mfix-r4000,)
- cflags-$(CONFIG_CPU_R4400_WORKAROUNDS)	+= $(call cc-option,-mfix-r4400,)
- cflags-$(CONFIG_CPU_DADDI_WORKAROUNDS)	+= $(call cc-option,-mno-daddi,)
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -43,6 +43,9 @@ config AR7
- 	  Support for the Texas Instruments AR7 System-on-a-Chip
- 	  family: TNETD7100, 7200 and 7300.
- 
-+config MIPS_RALINK
-+	bool "Ralink MIPS SoC based boards"
-+
- config BASLER_EXCITE
- 	bool "Basler eXcite smart camera"
- 	select CEVT_R4K
-@@ -679,6 +682,7 @@ source "arch/mips/bcm63xx/Kconfig"
- source "arch/mips/jazz/Kconfig"
- source "arch/mips/lasat/Kconfig"
- source "arch/mips/pmc-sierra/Kconfig"
-+source "arch/mips/ralink/Kconfig"
- source "arch/mips/sgi-ip27/Kconfig"
- source "arch/mips/sibyte/Kconfig"
- source "arch/mips/txx9/Kconfig"
-@@ -1045,7 +1049,7 @@ config BOOT_ELF32
- 
- config MIPS_L1_CACHE_SHIFT
- 	int
--	default "4" if MACH_DECSTATION || MIKROTIK_RB532 || PMC_MSP4200_EVAL
-+	default "4" if MACH_DECSTATION || MIKROTIK_RB532 || PMC_MSP4200_EVAL || RALINK_RT288X
- 	default "6" if MIPS_CPU_SCACHE
- 	default "7" if SGI_IP22 || SGI_IP27 || SGI_IP28 || SNI_RM || CPU_CAVIUM_OCTEON
- 	default "5"
diff --git a/target/linux/ramips/patches-2.6.32/101-rt288x_serial_driver_hack.patch b/target/linux/ramips/patches-2.6.32/101-rt288x_serial_driver_hack.patch
deleted file mode 100644
index 8e47aa3f1..000000000
--- a/target/linux/ramips/patches-2.6.32/101-rt288x_serial_driver_hack.patch
+++ /dev/null
@@ -1,118 +0,0 @@
---- a/drivers/serial/8250.c
-+++ b/drivers/serial/8250.c
-@@ -301,9 +301,9 @@ static const struct serial8250_config ua
- 	},
- };
- 
--#if defined (CONFIG_SERIAL_8250_AU1X00)
-+#if defined (CONFIG_SERIAL_8250_AU1X00) || defined (CONFIG_SERIAL_8250_RT288X)
- 
--/* Au1x00 UART hardware has a weird register layout */
-+/* Au1x00 and RT288x UART hardware has a weird register layout */
- static const u8 au_io_in_map[] = {
- 	[UART_RX]  = 0,
- 	[UART_IER] = 2,
-@@ -421,7 +421,7 @@ static unsigned int mem32_serial_in(stru
- 	return readl(p->membase + offset);
- }
- 
--#ifdef CONFIG_SERIAL_8250_AU1X00
-+#if defined(CONFIG_SERIAL_8250_AU1X00) || defined(CONFIG_SERIAL_8250_RT288X)
- static unsigned int au_serial_in(struct uart_port *p, int offset)
- {
- 	offset = map_8250_in_reg(p, offset) << p->regshift;
-@@ -502,7 +502,7 @@ static void set_io_from_upio(struct uart
- 		p->serial_out = mem32_serial_out;
- 		break;
- 
--#ifdef CONFIG_SERIAL_8250_AU1X00
-+#if defined (CONFIG_SERIAL_8250_AU1X00) || defined (CONFIG_SERIAL_8250_RT288X)
- 	case UPIO_AU:
- 		p->serial_in = au_serial_in;
- 		p->serial_out = au_serial_out;
-@@ -534,7 +534,7 @@ serial_out_sync(struct uart_8250_port *u
- 	switch (p->iotype) {
- 	case UPIO_MEM:
- 	case UPIO_MEM32:
--#ifdef CONFIG_SERIAL_8250_AU1X00
-+#if defined (CONFIG_SERIAL_8250_AU1X00) || defined (CONFIG_SERIAL_8250_RT288X)
- 	case UPIO_AU:
- #endif
- 	case UPIO_DWAPB:
-@@ -572,8 +572,8 @@ static inline void _serial_dl_write(stru
- 	serial_outp(up, UART_DLM, value >> 8 & 0xff);
- }
- 
--#if defined(CONFIG_SERIAL_8250_AU1X00)
--/* Au1x00 haven't got a standard divisor latch */
-+#if defined (CONFIG_SERIAL_8250_AU1X00) || defined (CONFIG_SERIAL_8250_RT288X)
-+/* Au1x00 and RT288x haven't got a standard divisor latch */
- static int serial_dl_read(struct uart_8250_port *up)
- {
- 	if (up->port.iotype == UPIO_AU)
-@@ -780,22 +780,19 @@ static int size_fifo(struct uart_8250_po
-  */
- static unsigned int autoconfig_read_divisor_id(struct uart_8250_port *p)
- {
--	unsigned char old_dll, old_dlm, old_lcr;
-+	unsigned char old_lcr;
-+	unsigned int old_dl;
- 	unsigned int id;
- 
- 	old_lcr = serial_inp(p, UART_LCR);
- 	serial_outp(p, UART_LCR, UART_LCR_DLAB);
- 
--	old_dll = serial_inp(p, UART_DLL);
--	old_dlm = serial_inp(p, UART_DLM);
-+	old_dl = serial_dl_read(p);
- 
--	serial_outp(p, UART_DLL, 0);
--	serial_outp(p, UART_DLM, 0);
-+	serial_dl_write(p, 0);
-+	id = serial_dl_read(p);
- 
--	id = serial_inp(p, UART_DLL) | serial_inp(p, UART_DLM) << 8;
--
--	serial_outp(p, UART_DLL, old_dll);
--	serial_outp(p, UART_DLM, old_dlm);
-+	serial_dl_write(p, old_dl);
- 	serial_outp(p, UART_LCR, old_lcr);
- 
- 	return id;
-@@ -1217,7 +1214,7 @@ static void autoconfig(struct uart_8250_
- 	}
- #endif
- 
--#ifdef CONFIG_SERIAL_8250_AU1X00
-+#if defined (CONFIG_SERIAL_8250_AU1X00) || defined (CONFIG_SERIAL_8250_RT288X)
- 	/* if access method is AU, it is a 16550 with a quirk */
- 	if (up->port.type == PORT_16550A && up->port.iotype == UPIO_AU)
- 		up->bugs |= UART_BUG_NOMSR;
---- a/drivers/serial/Kconfig
-+++ b/drivers/serial/Kconfig
-@@ -266,6 +266,14 @@ config SERIAL_8250_AU1X00
- 	  say Y to this option. The driver can handle up to 4 serial ports,
- 	  depending on the SOC. If unsure, say N.
- 
-+config SERIAL_8250_RT288X
-+	bool "Ralink RT288x/RT305x serial port support"
-+	depends on SERIAL_8250 != n && (SOC_RT288X || SOC_RT305X)
-+	help
-+	  If you have a Ralink RT288x/RT305x SoC based board and want to use the 
-+	  serial port, say Y to this option. The driver can handle up to 2 serial 
-+	  ports. If unsure, say N.
-+
- config SERIAL_8250_RM9K
- 	bool "Support for MIPS RM9xxx integrated serial port"
- 	depends on SERIAL_8250 != n && SERIAL_RM9000
---- a/include/linux/serial_core.h
-+++ b/include/linux/serial_core.h
-@@ -281,7 +281,7 @@ struct uart_port {
- #define UPIO_HUB6		(1)
- #define UPIO_MEM		(2)
- #define UPIO_MEM32		(3)
--#define UPIO_AU			(4)			/* Au1x00 type IO */
-+#define UPIO_AU			(4)			/* Au1x00 and RT288x type IO */
- #define UPIO_TSI		(5)			/* Tsi108/109 type IO */
- #define UPIO_DWAPB		(6)			/* DesignWare APB UART */
- #define UPIO_RM9000		(7)			/* RM9000 type IO */
diff --git a/target/linux/ramips/patches-2.6.32/102-rt288x-pci-driver-hook.patch b/target/linux/ramips/patches-2.6.32/102-rt288x-pci-driver-hook.patch
deleted file mode 100644
index d2056c646..000000000
--- a/target/linux/ramips/patches-2.6.32/102-rt288x-pci-driver-hook.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/arch/mips/pci/Makefile
-+++ b/arch/mips/pci/Makefile
-@@ -55,6 +55,7 @@ obj-$(CONFIG_ZAO_CAPCELLA)	+= fixup-capc
- obj-$(CONFIG_WR_PPMC)		+= fixup-wrppmc.o
- obj-$(CONFIG_MIKROTIK_RB532)	+= pci-rc32434.o ops-rc32434.o fixup-rc32434.o
- obj-$(CONFIG_CPU_CAVIUM_OCTEON)	+= pci-octeon.o pcie-octeon.o
-+obj-$(CONFIG_SOC_RT288X)	+= pci-rt288x.o
- 
- ifdef CONFIG_PCI_MSI
- obj-$(CONFIG_CPU_CAVIUM_OCTEON)	+= msi-octeon.o
diff --git a/target/linux/ramips/patches-2.6.32/103-ethernet.patch b/target/linux/ramips/patches-2.6.32/103-ethernet.patch
deleted file mode 100644
index 8b370b608..000000000
--- a/target/linux/ramips/patches-2.6.32/103-ethernet.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/drivers/net/Kconfig
-+++ b/drivers/net/Kconfig
-@@ -602,6 +602,12 @@ config MIPS_AU1X00_ENET
- 	  If you have an Alchemy Semi AU1X00 based system
- 	  say Y.  Otherwise, say N.
- 
-+config MIPS_RAMIPS_NET
-+	tristate "Ethernet driver for rt288x/rt305x"
-+	depends on MIPS_RALINK
-+	help
-+	  This driver supports the etehrnet mac inside the ralink wisocs
-+
- config SGI_IOC3_ETH
- 	bool "SGI IOC3 Ethernet"
- 	depends on PCI && SGI_IP27
---- a/drivers/net/Makefile
-+++ b/drivers/net/Makefile
-@@ -217,6 +217,7 @@ obj-$(CONFIG_KORINA) += korina.o
- obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o
- obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o
- obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
-+obj-$(CONFIG_MIPS_RAMIPS_NET) += ramips.o
- obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o
- obj-$(CONFIG_DECLANCE) += declance.o
- obj-$(CONFIG_ATARILANCE) += atarilance.o
diff --git a/target/linux/ramips/patches-2.6.32/400-mips-multi-machine-update.patch b/target/linux/ramips/patches-2.6.32/400-mips-multi-machine-update.patch
deleted file mode 100644
index d63587901..000000000
--- a/target/linux/ramips/patches-2.6.32/400-mips-multi-machine-update.patch
+++ /dev/null
@@ -1,134 +0,0 @@
---- a/arch/mips/kernel/mips_machine.c
-+++ b/arch/mips/kernel/mips_machine.c
-@@ -7,12 +7,13 @@
-  *
-  */
- #include <linux/mm.h>
-+#include <linux/string.h>
- 
- #include <asm/mips_machine.h>
--#include <asm/bootinfo.h>
- 
- static struct list_head mips_machines __initdata =
- 		LIST_HEAD_INIT(mips_machines);
-+static char *mips_machid __initdata;
- 
- char *mips_machine_name = "Unknown";
- 
-@@ -55,20 +56,65 @@ void __init mips_machine_set_name(char *
- 	}
- }
- 
--void __init mips_machine_setup(unsigned long machtype)
-+void __init mips_machine_setup(void)
- {
- 	struct mips_machine *mach;
- 
--	mach = mips_machine_find(machtype);
-+	mach = mips_machine_find(mips_machtype);
- 	if (!mach) {
--		printk(KERN_ALERT "MIPS: no machine registered for "
--			"machtype %lu\n", machtype);
-+		printk(KERN_WARNING "MIPS: no machine registered for "
-+			"machtype %lu\n", mips_machtype);
- 		return;
- 	}
- 
- 	mips_machine_set_name(mach->mach_name);
--	printk(KERN_INFO "MIPS: machine is %s\n", mips_machine_name);
-+	printk(KERN_NOTICE "MIPS: machine is %s\n", mips_machine_name);
- 
- 	if (mach->mach_setup)
- 		mach->mach_setup();
- }
-+
-+int __init mips_machtype_setup(char *id)
-+{
-+	if (mips_machid == NULL)
-+		mips_machid = id;
-+
-+	return 1;
-+}
-+
-+__setup("machtype=", mips_machtype_setup);
-+
-+static int __init mips_machtype_init(void)
-+{
-+	struct list_head *this;
-+	struct mips_machine *mach;
-+
-+	if (mips_machid == NULL)
-+		return 0;
-+
-+	list_for_each(this, &mips_machines) {
-+		mach = list_entry(this, struct mips_machine, list);
-+		if (mach->mach_id == NULL)
-+			continue;
-+
-+		if (strcmp(mach->mach_id, mips_machid) == 0) {
-+			mips_machtype = mach->mach_type;
-+			return 0;
-+		}
-+	}
-+
-+	printk(KERN_WARNING
-+	       "MIPS: no machine found for id: '%s', registered machines:\n",
-+	       mips_machid);
-+	printk(KERN_WARNING "%32s %s\n", "id", "name");
-+
-+	list_for_each(this, &mips_machines) {
-+		mach = list_entry(this, struct mips_machine, list);
-+		printk(KERN_WARNING "%32s %s\n",
-+		       mach->mach_id ? mach->mach_id : "", mach->mach_name);
-+	}
-+
-+	return 0;
-+}
-+
-+core_initcall(mips_machtype_init);
---- a/arch/mips/include/asm/mips_machine.h
-+++ b/arch/mips/include/asm/mips_machine.h
-@@ -13,25 +13,33 @@
- #include <linux/init.h>
- #include <linux/list.h>
- 
-+#include <asm/bootinfo.h>
-+
- struct mips_machine {
- 	unsigned long		mach_type;
--	void			(*mach_setup)(void);
-+	char			*mach_id;
- 	char			*mach_name;
-+	void			(*mach_setup)(void);
- 	struct list_head	list;
- };
- 
- void mips_machine_register(struct mips_machine *) __init;
--void mips_machine_setup(unsigned long machtype) __init;
-+void mips_machine_setup(void) __init;
-+int  mips_machtype_setup(char *id) __init;
- void mips_machine_set_name(char *name) __init;
- 
- extern char *mips_machine_name;
- 
--#define MIPS_MACHINE(_type, _name, _setup) 			\
--static char machine_name_##_type[] __initdata = _name;		\
-+#define MIPS_MACHINE(_type, _id, _name, _setup) 		\
-+static const char machine_name_##_type[] __initconst		\
-+			__aligned(1) = _name;			\
-+static const char machine_id_##_type[] __initconst		\
-+			__aligned(1) = _id;			\
- static struct mips_machine machine_##_type __initdata =		\
- {								\
- 	.mach_type	= _type,				\
--	.mach_name	= machine_name_##_type,			\
-+	.mach_id	= (char *) machine_id_##_type,		\
-+	.mach_name	= (char *) machine_name_##_type,	\
- 	.mach_setup	= _setup,				\
- };								\
- 								\
-@@ -44,4 +52,3 @@ static int __init register_machine_##_ty
- pure_initcall(register_machine_##_type)
- 
- #endif /* __ASM_MIPS_MACHINE_H */
--
diff --git a/target/linux/ramips/rt288x/config-2.6.32 b/target/linux/ramips/rt288x/config-2.6.32
deleted file mode 100644
index c21ba4b74..000000000
--- a/target/linux/ramips/rt288x/config-2.6.32
+++ /dev/null
@@ -1,162 +0,0 @@
-CONFIG_32BIT=y
-# CONFIG_64BIT is not set
-# CONFIG_ALCHEMY_GPIO_INDIRECT is not set
-# CONFIG_AR7 is not set
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-CONFIG_ARCH_REQUIRE_GPIOLIB=y
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_ARCH_SUPPORTS_OPROFILE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-# CONFIG_BCM47XX is not set
-# CONFIG_BCM63XX is not set
-CONFIG_BITREVERSE=y
-# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
-# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CEVT_R4K=y
-CONFIG_CEVT_R4K_LIB=y
-CONFIG_CFG80211_DEFAULT_PS_VALUE=0
-CONFIG_CMDLINE="console=ttyS1,57600 rootfstype=squashfs,jffs2"
-# CONFIG_CPU_BIG_ENDIAN is not set
-# CONFIG_CPU_CAVIUM_OCTEON is not set
-CONFIG_CPU_HAS_PREFETCH=y
-CONFIG_CPU_HAS_SYNC=y
-CONFIG_CPU_LITTLE_ENDIAN=y
-# CONFIG_CPU_LOONGSON2E is not set
-CONFIG_CPU_MIPS32=y
-# CONFIG_CPU_MIPS32_R1 is not set
-CONFIG_CPU_MIPS32_R2=y
-# CONFIG_CPU_MIPS64_R1 is not set
-# CONFIG_CPU_MIPS64_R2 is not set
-CONFIG_CPU_MIPSR2=y
-# CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R10000 is not set
-# CONFIG_CPU_R3000 is not set
-# CONFIG_CPU_R4300 is not set
-# CONFIG_CPU_R4X00 is not set
-# CONFIG_CPU_R5000 is not set
-# CONFIG_CPU_R5432 is not set
-# CONFIG_CPU_R5500 is not set
-# CONFIG_CPU_R6000 is not set
-# CONFIG_CPU_R8000 is not set
-# CONFIG_CPU_RM7000 is not set
-# CONFIG_CPU_RM9000 is not set
-# CONFIG_CPU_SB1 is not set
-CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_HIGHMEM=y
-# CONFIG_CPU_TX39XX is not set
-# CONFIG_CPU_TX49XX is not set
-# CONFIG_CPU_VR41XX is not set
-CONFIG_CSRC_R4K=y
-CONFIG_CSRC_R4K_LIB=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DEVPORT=y
-# CONFIG_DM9000 is not set
-CONFIG_DMA_NEED_PCI_MAP_STATE=y
-CONFIG_DMA_NONCOHERENT=y
-CONFIG_EARLY_PRINTK=y
-# CONFIG_FSNOTIFY is not set
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-CONFIG_GPIOLIB=y
-CONFIG_GPIO_SYSFS=y
-CONFIG_HARDWARE_WATCHPOINTS=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAVE_ARCH_KGDB=y
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_HAVE_IDE=y
-CONFIG_HAVE_OPROFILE=y
-CONFIG_HW_HAS_PCI=y
-CONFIG_HW_RANDOM=m
-CONFIG_IMAGE_CMDLINE_HACK=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_IRQ_CPU=y
-# CONFIG_ISDN_CAPI is not set
-# CONFIG_ISDN_I4L is not set
-# CONFIG_LEDS_GPIO is not set
-# CONFIG_MACH_ALCHEMY is not set
-# CONFIG_MACH_DECSTATION is not set
-# CONFIG_MACH_JAZZ is not set
-# CONFIG_MACH_LOONGSON is not set
-# CONFIG_MACH_TX39XX is not set
-# CONFIG_MACH_TX49XX is not set
-# CONFIG_MACH_VR41XX is not set
-# CONFIG_MII is not set
-# CONFIG_MIKROTIK_RB532 is not set
-CONFIG_MIPS=y
-# CONFIG_MIPS_COBALT is not set
-CONFIG_MIPS_L1_CACHE_SHIFT=4
-CONFIG_MIPS_MACHINE=y
-# CONFIG_MIPS_MALTA is not set
-CONFIG_MIPS_MT_DISABLED=y
-# CONFIG_MIPS_MT_SMP is not set
-# CONFIG_MIPS_MT_SMTC is not set
-CONFIG_MIPS_RALINK=y
-# CONFIG_MIPS_RAMIPS_NET is not set
-# CONFIG_MIPS_SIM is not set
-# CONFIG_MTD_CFI_INTELEXT is not set
-CONFIG_MTD_CMDLINE_PARTS=y
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-CONFIG_MTD_PHYSMAP=y
-# CONFIG_NO_IOPORT is not set
-# CONFIG_NXP_STB220 is not set
-# CONFIG_NXP_STB225 is not set
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PHYLIB=y
-# CONFIG_PMC_MSP is not set
-# CONFIG_PMC_YOSEMITE is not set
-# CONFIG_PNX8550_JBS is not set
-# CONFIG_PNX8550_STB810 is not set
-CONFIG_RALINK_DEV_GPIO_BUTTONS=y
-CONFIG_RALINK_DEV_GPIO_LEDS=y
-CONFIG_RALINK_RT288X=y
-# CONFIG_RALINK_RT305X is not set
-CONFIG_RT288X_MACH_RT_N15=y
-CONFIG_RT288X_MACH_WZR_AGL300NH=y
-CONFIG_RTL8366S_PHY=y
-CONFIG_RTL8366_SMI=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-# CONFIG_SCSI_DMA is not set
-# CONFIG_SERIAL_8250_EXTENDED is not set
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RT288X=y
-# CONFIG_SGI_IP22 is not set
-# CONFIG_SGI_IP27 is not set
-# CONFIG_SGI_IP28 is not set
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_SWARM is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-CONFIG_SOC_RT288X=y
-CONFIG_SWCONFIG=y
-CONFIG_SYS_HAS_CPU_MIPS32_R1=y
-CONFIG_SYS_HAS_CPU_MIPS32_R2=y
-CONFIG_SYS_HAS_EARLY_PRINTK=y
-CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
-# CONFIG_TC35815 is not set
-CONFIG_TRAD_SIGNALS=y
-# CONFIG_TREE_PREEMPT_RCU is not set
-CONFIG_TREE_RCU=y
-CONFIG_USB_SUPPORT=y
-CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/ramips/rt288x/target.mk b/target/linux/ramips/rt288x/target.mk
deleted file mode 100644
index cb3b7193d..000000000
--- a/target/linux/ramips/rt288x/target.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Copyright (C) 2009 OpenWrt.org
-#
-
-SUBTARGET:=rt288x
-BOARDNAME:=RT288x based boards
-
-define Target/Description
-	Build firmware images for Ralink RT288x based boards.
-endef
-
diff --git a/target/linux/ramips/rt305x/config-2.6.32 b/target/linux/ramips/rt305x/config-2.6.32
deleted file mode 100644
index 8ceb2ecc7..000000000
--- a/target/linux/ramips/rt305x/config-2.6.32
+++ /dev/null
@@ -1,158 +0,0 @@
-CONFIG_32BIT=y
-# CONFIG_64BIT is not set
-# CONFIG_ALCHEMY_GPIO_INDIRECT is not set
-# CONFIG_AR7 is not set
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-CONFIG_ARCH_REQUIRE_GPIOLIB=y
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_ARCH_SUPPORTS_OPROFILE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-# CONFIG_BCM47XX is not set
-# CONFIG_BCM63XX is not set
-CONFIG_BITREVERSE=y
-# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
-# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CEVT_R4K=y
-CONFIG_CEVT_R4K_LIB=y
-CONFIG_CFG80211_DEFAULT_PS_VALUE=0
-CONFIG_CMDLINE="console=ttyS1,57600 rootfstype=squashfs,jffs2"
-# CONFIG_CPU_BIG_ENDIAN is not set
-# CONFIG_CPU_CAVIUM_OCTEON is not set
-CONFIG_CPU_HAS_PREFETCH=y
-CONFIG_CPU_HAS_SYNC=y
-CONFIG_CPU_LITTLE_ENDIAN=y
-# CONFIG_CPU_LOONGSON2E is not set
-CONFIG_CPU_MIPS32=y
-# CONFIG_CPU_MIPS32_R1 is not set
-CONFIG_CPU_MIPS32_R2=y
-# CONFIG_CPU_MIPS64_R1 is not set
-# CONFIG_CPU_MIPS64_R2 is not set
-CONFIG_CPU_MIPSR2=y
-# CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R10000 is not set
-# CONFIG_CPU_R3000 is not set
-# CONFIG_CPU_R4300 is not set
-# CONFIG_CPU_R4X00 is not set
-# CONFIG_CPU_R5000 is not set
-# CONFIG_CPU_R5432 is not set
-# CONFIG_CPU_R5500 is not set
-# CONFIG_CPU_R6000 is not set
-# CONFIG_CPU_R8000 is not set
-# CONFIG_CPU_RM7000 is not set
-# CONFIG_CPU_RM9000 is not set
-# CONFIG_CPU_SB1 is not set
-CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_HIGHMEM=y
-# CONFIG_CPU_TX39XX is not set
-# CONFIG_CPU_TX49XX is not set
-# CONFIG_CPU_VR41XX is not set
-CONFIG_CSRC_R4K=y
-CONFIG_CSRC_R4K_LIB=y
-CONFIG_DECOMPRESS_LZMA=y
-# CONFIG_DM9000 is not set
-CONFIG_DMA_NEED_PCI_MAP_STATE=y
-CONFIG_DMA_NONCOHERENT=y
-CONFIG_EARLY_PRINTK=y
-# CONFIG_FSNOTIFY is not set
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-CONFIG_GPIOLIB=y
-CONFIG_GPIO_SYSFS=y
-CONFIG_HARDWARE_WATCHPOINTS=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAVE_ARCH_KGDB=y
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_HAVE_IDE=y
-CONFIG_HAVE_OPROFILE=y
-CONFIG_HW_RANDOM=m
-CONFIG_IMAGE_CMDLINE_HACK=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_IRQ_CPU=y
-# CONFIG_ISDN_CAPI is not set
-# CONFIG_ISDN_I4L is not set
-# CONFIG_LEDS_GPIO is not set
-# CONFIG_MACH_ALCHEMY is not set
-# CONFIG_MACH_DECSTATION is not set
-# CONFIG_MACH_JAZZ is not set
-# CONFIG_MACH_LOONGSON is not set
-# CONFIG_MACH_TX39XX is not set
-# CONFIG_MACH_TX49XX is not set
-# CONFIG_MACH_VR41XX is not set
-# CONFIG_MII is not set
-# CONFIG_MIKROTIK_RB532 is not set
-CONFIG_MIPS=y
-# CONFIG_MIPS_COBALT is not set
-CONFIG_MIPS_L1_CACHE_SHIFT=5
-CONFIG_MIPS_MACHINE=y
-# CONFIG_MIPS_MALTA is not set
-CONFIG_MIPS_MT_DISABLED=y
-# CONFIG_MIPS_MT_SMP is not set
-# CONFIG_MIPS_MT_SMTC is not set
-CONFIG_MIPS_RALINK=y
-CONFIG_MIPS_RAMIPS_NET=y
-# CONFIG_MIPS_SIM is not set
-# CONFIG_MTD_CFI_INTELEXT is not set
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_PHYSMAP=y
-# CONFIG_NO_IOPORT is not set
-# CONFIG_NXP_STB220 is not set
-# CONFIG_NXP_STB225 is not set
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PHYLIB=y
-# CONFIG_PMC_MSP is not set
-# CONFIG_PMC_YOSEMITE is not set
-# CONFIG_PNX8550_JBS is not set
-# CONFIG_PNX8550_STB810 is not set
-CONFIG_RALINK_DEV_GPIO_BUTTONS=y
-CONFIG_RALINK_DEV_GPIO_LEDS=y
-# CONFIG_RALINK_RT288X is not set
-CONFIG_RALINK_RT305X=y
-CONFIG_RT305X_MACH_DIR_300_REVB=y
-CONFIG_RT305X_MACH_FONERA20N=y
-CONFIG_RT305X_MACH_V22RW_2X2=y
-CONFIG_RT305X_MACH_WHR_G300N=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-# CONFIG_SCSI_DMA is not set
-# CONFIG_SERIAL_8250_EXTENDED is not set
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RT288X=y
-# CONFIG_SGI_IP22 is not set
-# CONFIG_SGI_IP27 is not set
-# CONFIG_SGI_IP28 is not set
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_SWARM is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-CONFIG_SOC_RT305X=y
-CONFIG_SYS_HAS_CPU_MIPS32_R1=y
-CONFIG_SYS_HAS_CPU_MIPS32_R2=y
-CONFIG_SYS_HAS_EARLY_PRINTK=y
-CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
-CONFIG_TRAD_SIGNALS=y
-# CONFIG_TREE_PREEMPT_RCU is not set
-CONFIG_TREE_RCU=y
-# CONFIG_USB_ARCH_HAS_EHCI is not set
-# CONFIG_USB_ARCH_HAS_HCD is not set
-# CONFIG_USB_ARCH_HAS_OHCI is not set
-CONFIG_USB_SUPPORT=y
-CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/ramips/rt305x/target.mk b/target/linux/ramips/rt305x/target.mk
deleted file mode 100644
index 2c78756cf..000000000
--- a/target/linux/ramips/rt305x/target.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Copyright (C) 2009 OpenWrt.org
-#
-
-SUBTARGET:=rt305x
-BOARDNAME:=RT305x based boards
-
-define Target/Description
-	Build firmware images for Ralink RT305x based boards.
-endef
-
diff --git a/target/linux/rb532/config-2.6.32 b/target/linux/rb532/config-2.6.32
index 67bdedfc4..132c1ba78 100644
--- a/target/linux/rb532/config-2.6.32
+++ b/target/linux/rb532/config-2.6.32
@@ -16,7 +16,6 @@ CONFIG_ATA=y
 CONFIG_BITREVERSE=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_BOOT_RAW=y
-CONFIG_BRIDGE=m
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
 # CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
@@ -89,8 +88,6 @@ CONFIG_HW_RANDOM=y
 CONFIG_HZ=250
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
 CONFIG_IMAGE_CMDLINE_HACK=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_IRQ_CPU=y
@@ -98,7 +95,6 @@ CONFIG_KEXEC=y
 CONFIG_KORINA=y
 # CONFIG_LEDS_GPIO is not set
 CONFIG_LEDS_MIKROTIK_RB532=y
-CONFIG_LLC=m
 # CONFIG_MACH_ALCHEMY is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
@@ -143,7 +139,6 @@ CONFIG_PCSPKR_PLATFORM=y
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_PROBE_INITRD_HEADER is not set
 CONFIG_RC32434_WDT=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_SCSI=y
@@ -163,9 +158,6 @@ CONFIG_SCSI=y
 # CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SENTOSA is not set
 # CONFIG_SIBYTE_SWARM is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-CONFIG_STP=m
 # CONFIG_SWAP is not set
 CONFIG_SWAP_IO_SPACE=y
 CONFIG_SYS_HAS_CPU_MIPS32_R1=y
@@ -178,7 +170,6 @@ CONFIG_TRAD_SIGNALS=y
 CONFIG_TREE_RCU=y
 CONFIG_VIA_RHINE=y
 CONFIG_VIA_RHINE_MMIO=y
-CONFIG_VLAN_8021Q=m
 CONFIG_YAFFS_9BYTE_TAGS=y
 # CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
 CONFIG_YAFFS_AUTO_YAFFS2=y
diff --git a/target/linux/rb532/config-2.6.33 b/target/linux/rb532/config-2.6.33
deleted file mode 100644
index 731912af5..000000000
--- a/target/linux/rb532/config-2.6.33
+++ /dev/null
@@ -1,230 +0,0 @@
-CONFIG_32BIT=y
-# CONFIG_64BIT is not set
-# CONFIG_ALCHEMY_GPIO_INDIRECT is not set
-# CONFIG_AR7 is not set
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-CONFIG_ARCH_REQUIRE_GPIOLIB=y
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_ARCH_SUPPORTS_OPROFILE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ATA=y
-# CONFIG_BCM47XX is not set
-# CONFIG_BCM63XX is not set
-CONFIG_BITREVERSE=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_BOOT_RAW=y
-CONFIG_BRIDGE=m
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
-# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CEVT_R4K=y
-CONFIG_CEVT_R4K_LIB=y
-CONFIG_CMDLINE_BOOL=y
-# CONFIG_CMDLINE_OVERRIDE is not set
-# CONFIG_CPU_BIG_ENDIAN is not set
-# CONFIG_CPU_CAVIUM_OCTEON is not set
-CONFIG_CPU_HAS_PREFETCH=y
-CONFIG_CPU_HAS_SYNC=y
-CONFIG_CPU_LITTLE_ENDIAN=y
-# CONFIG_CPU_LOONGSON2E is not set
-# CONFIG_CPU_LOONGSON2F is not set
-CONFIG_CPU_MIPS32=y
-CONFIG_CPU_MIPS32_R1=y
-# CONFIG_CPU_MIPS32_R2 is not set
-# CONFIG_CPU_MIPS64_R1 is not set
-# CONFIG_CPU_MIPS64_R2 is not set
-CONFIG_CPU_MIPSR1=y
-# CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R10000 is not set
-# CONFIG_CPU_R3000 is not set
-# CONFIG_CPU_R4300 is not set
-# CONFIG_CPU_R4X00 is not set
-# CONFIG_CPU_R5000 is not set
-# CONFIG_CPU_R5432 is not set
-# CONFIG_CPU_R5500 is not set
-# CONFIG_CPU_R6000 is not set
-# CONFIG_CPU_R8000 is not set
-# CONFIG_CPU_RM7000 is not set
-# CONFIG_CPU_RM9000 is not set
-# CONFIG_CPU_SB1 is not set
-CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_HIGHMEM=y
-# CONFIG_CPU_TX39XX is not set
-# CONFIG_CPU_TX49XX is not set
-# CONFIG_CPU_VR41XX is not set
-CONFIG_CSRC_R4K=y
-CONFIG_CSRC_R4K_LIB=y
-# CONFIG_DEBUG_FS is not set
-CONFIG_DECOMPRESS_LZMA=y
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_SMACK is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
-CONFIG_DEVPORT=y
-# CONFIG_DM9000 is not set
-CONFIG_DMA_NEED_PCI_MAP_STATE=y
-CONFIG_DMA_NONCOHERENT=y
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-CONFIG_EXT2_FS=y
-# CONFIG_FSNOTIFY is not set
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-CONFIG_GPIOLIB=y
-CONFIG_GPIO_SYSFS=y
-# CONFIG_HAMRADIO is not set
-CONFIG_HARDWARE_WATCHPOINTS=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAVE_ARCH_KGDB=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_HAVE_IDE=y
-CONFIG_HAVE_OPROFILE=y
-# CONFIG_HIGH_RES_TIMERS is not set
-CONFIG_HW_HAS_PCI=y
-CONFIG_HW_RANDOM=y
-CONFIG_HZ=250
-# CONFIG_HZ_100 is not set
-CONFIG_HZ_250=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_IMAGE_CMDLINE_HACK=y
-CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_INLINE_READ_LOCK is not set
-# CONFIG_INLINE_READ_LOCK_BH is not set
-# CONFIG_INLINE_READ_LOCK_IRQ is not set
-# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_READ_TRYLOCK is not set
-CONFIG_INLINE_READ_UNLOCK=y
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_SPIN_LOCK is not set
-# CONFIG_INLINE_SPIN_LOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_SPIN_TRYLOCK is not set
-# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
-CONFIG_INLINE_SPIN_UNLOCK=y
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_WRITE_LOCK is not set
-# CONFIG_INLINE_WRITE_LOCK_BH is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_WRITE_TRYLOCK is not set
-CONFIG_INLINE_WRITE_UNLOCK=y
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-CONFIG_IRQ_CPU=y
-CONFIG_KEXEC=y
-CONFIG_KORINA=y
-# CONFIG_LEDS_GPIO is not set
-CONFIG_LEDS_MIKROTIK_RB532=y
-CONFIG_LLC=m
-CONFIG_LOONGSON_UART_BASE=y
-# CONFIG_MACH_ALCHEMY is not set
-# CONFIG_MACH_DECSTATION is not set
-# CONFIG_MACH_JAZZ is not set
-# CONFIG_MACH_LOONGSON is not set
-# CONFIG_MACH_TX39XX is not set
-# CONFIG_MACH_TX49XX is not set
-# CONFIG_MACH_VR41XX is not set
-CONFIG_MIKROTIK_RB532=y
-CONFIG_MIPS=y
-# CONFIG_MIPS_COBALT is not set
-CONFIG_MIPS_L1_CACHE_SHIFT=4
-# CONFIG_MIPS_MACHINE is not set
-# CONFIG_MIPS_MALTA is not set
-CONFIG_MIPS_MT_DISABLED=y
-# CONFIG_MIPS_MT_SMP is not set
-# CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_SIM is not set
-CONFIG_MTD_BLOCK2MTD=y
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-# CONFIG_MTD_CFI_AMDSTD is not set
-CONFIG_MTD_CFI_GEOMETRY=y
-# CONFIG_MTD_CFI_INTELEXT is not set
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_PLATFORM=y
-CONFIG_MTD_NAND_VERIFY_WRITE=y
-CONFIG_MTD_PHYSMAP=y
-# CONFIG_MTD_ROOTFS_ROOT_DEV is not set
-# CONFIG_MTD_ROOTFS_SPLIT is not set
-# CONFIG_MUTEX_SPIN_ON_OWNER is not set
-CONFIG_NF_CONNTRACK=y
-CONFIG_NF_CT_ACCT=y
-# CONFIG_NO_IOPORT is not set
-# CONFIG_NXP_STB220 is not set
-# CONFIG_NXP_STB225 is not set
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PATA_RB532=y
-CONFIG_PCI=y
-CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCSPKR_PLATFORM=y
-# CONFIG_PMC_MSP is not set
-# CONFIG_PMC_YOSEMITE is not set
-# CONFIG_PNX8550_JBS is not set
-# CONFIG_PNX8550_STB810 is not set
-# CONFIG_POWERTV is not set
-CONFIG_RC32434_WDT=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_SCSI=y
-# CONFIG_SCSI_LOWLEVEL is not set
-# CONFIG_SCSI_MULTI_LUN is not set
-# CONFIG_SCSI_PROC_FS is not set
-# CONFIG_SERIAL_8250_EXTENDED is not set
-# CONFIG_SGI_IP22 is not set
-# CONFIG_SGI_IP27 is not set
-# CONFIG_SGI_IP28 is not set
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_SWARM is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-CONFIG_STP=m
-# CONFIG_SWAP is not set
-CONFIG_SWAP_IO_SPACE=y
-CONFIG_SYS_HAS_CPU_MIPS32_R1=y
-CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
-# CONFIG_TC35815 is not set
-CONFIG_TRAD_SIGNALS=y
-# CONFIG_TREE_PREEMPT_RCU is not set
-CONFIG_VIA_RHINE=y
-CONFIG_VIA_RHINE_MMIO=y
-CONFIG_VLAN_8021Q=m
-CONFIG_YAFFS_9BYTE_TAGS=y
-# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
-CONFIG_YAFFS_AUTO_YAFFS2=y
-# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
-# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
-CONFIG_YAFFS_FS=y
-CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
-CONFIG_YAFFS_YAFFS1=y
-CONFIG_YAFFS_YAFFS2=y
-CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/rb532/config-2.6.34 b/target/linux/rb532/config-2.6.34
deleted file mode 100644
index c3b498c6c..000000000
--- a/target/linux/rb532/config-2.6.34
+++ /dev/null
@@ -1,241 +0,0 @@
-CONFIG_32BIT=y
-# CONFIG_64BIT is not set
-# CONFIG_ALCHEMY_GPIO_INDIRECT is not set
-# CONFIG_AR7 is not set
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-CONFIG_ARCH_REQUIRE_GPIOLIB=y
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_ARCH_SUPPORTS_OPROFILE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ATA=y
-# CONFIG_BCM47XX is not set
-# CONFIG_BCM63XX is not set
-CONFIG_BITREVERSE=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_BOOT_RAW=y
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
-# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CEVT_R4K=y
-CONFIG_CEVT_R4K_LIB=y
-CONFIG_CMDLINE_BOOL=y
-# CONFIG_CMDLINE_OVERRIDE is not set
-# CONFIG_CPU_BIG_ENDIAN is not set
-# CONFIG_CPU_CAVIUM_OCTEON is not set
-CONFIG_CPU_HAS_PREFETCH=y
-CONFIG_CPU_HAS_SYNC=y
-CONFIG_CPU_LITTLE_ENDIAN=y
-# CONFIG_CPU_LOONGSON2E is not set
-# CONFIG_CPU_LOONGSON2F is not set
-CONFIG_CPU_MIPS32=y
-CONFIG_CPU_MIPS32_R1=y
-# CONFIG_CPU_MIPS32_R2 is not set
-# CONFIG_CPU_MIPS64_R1 is not set
-# CONFIG_CPU_MIPS64_R2 is not set
-CONFIG_CPU_MIPSR1=y
-# CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R10000 is not set
-# CONFIG_CPU_R3000 is not set
-# CONFIG_CPU_R4300 is not set
-# CONFIG_CPU_R4X00 is not set
-# CONFIG_CPU_R5000 is not set
-# CONFIG_CPU_R5432 is not set
-# CONFIG_CPU_R5500 is not set
-# CONFIG_CPU_R6000 is not set
-# CONFIG_CPU_R8000 is not set
-# CONFIG_CPU_RM7000 is not set
-# CONFIG_CPU_RM9000 is not set
-# CONFIG_CPU_SB1 is not set
-CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_HIGHMEM=y
-# CONFIG_CPU_TX39XX is not set
-# CONFIG_CPU_TX49XX is not set
-# CONFIG_CPU_VR41XX is not set
-# CONFIG_CRYSTALHD is not set
-CONFIG_CSRC_R4K=y
-CONFIG_CSRC_R4K_LIB=y
-# CONFIG_DEBUG_FS is not set
-CONFIG_DECOMPRESS_LZMA=y
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_SMACK is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
-CONFIG_DEVPORT=y
-# CONFIG_DM9000 is not set
-CONFIG_DMA_NEED_PCI_MAP_STATE=y
-CONFIG_DMA_NONCOHERENT=y
-# CONFIG_DT3155 is not set
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-CONFIG_EXT2_FS=y
-# CONFIG_FSNOTIFY is not set
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-CONFIG_GPIOLIB=y
-# CONFIG_GPIO_IT8761E is not set
-# CONFIG_GPIO_SCH is not set
-CONFIG_GPIO_SYSFS=y
-# CONFIG_HAMRADIO is not set
-CONFIG_HARDWARE_WATCHPOINTS=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAVE_ARCH_KGDB=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_HAVE_IDE=y
-CONFIG_HAVE_OPROFILE=y
-# CONFIG_HIGH_RES_TIMERS is not set
-CONFIG_HW_HAS_PCI=y
-CONFIG_HW_RANDOM=y
-CONFIG_HZ=250
-# CONFIG_HZ_100 is not set
-CONFIG_HZ_250=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_IMAGE_CMDLINE_HACK=y
-CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_INLINE_READ_LOCK is not set
-# CONFIG_INLINE_READ_LOCK_BH is not set
-# CONFIG_INLINE_READ_LOCK_IRQ is not set
-# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_READ_TRYLOCK is not set
-CONFIG_INLINE_READ_UNLOCK=y
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_SPIN_LOCK is not set
-# CONFIG_INLINE_SPIN_LOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_SPIN_TRYLOCK is not set
-# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
-CONFIG_INLINE_SPIN_UNLOCK=y
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_WRITE_LOCK is not set
-# CONFIG_INLINE_WRITE_LOCK_BH is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_WRITE_TRYLOCK is not set
-CONFIG_INLINE_WRITE_UNLOCK=y
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-CONFIG_IRQ_CPU=y
-CONFIG_KEXEC=y
-CONFIG_KORINA=y
-# CONFIG_KSZ884X_PCI is not set
-# CONFIG_LEDS_GPIO is not set
-CONFIG_LEDS_MIKROTIK_RB532=y
-CONFIG_LLC=m
-# CONFIG_LOGFS is not set
-CONFIG_LOONGSON_UART_BASE=y
-# CONFIG_LPC_SCH is not set
-# CONFIG_MACH_ALCHEMY is not set
-# CONFIG_MACH_DECSTATION is not set
-# CONFIG_MACH_JAZZ is not set
-# CONFIG_MACH_LOONGSON is not set
-# CONFIG_MACH_TX39XX is not set
-# CONFIG_MACH_TX49XX is not set
-# CONFIG_MACH_VR41XX is not set
-# CONFIG_MAX63XX_WATCHDOG is not set
-# CONFIG_MFD_TIMBERDALE is not set
-CONFIG_MIKROTIK_RB532=y
-CONFIG_MIPS=y
-# CONFIG_MIPS_COBALT is not set
-CONFIG_MIPS_L1_CACHE_SHIFT=4
-# CONFIG_MIPS_MACHINE is not set
-# CONFIG_MIPS_MALTA is not set
-CONFIG_MIPS_MT_DISABLED=y
-# CONFIG_MIPS_MT_SMP is not set
-# CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_SIM is not set
-CONFIG_MTD_BLOCK2MTD=y
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-# CONFIG_MTD_CFI_AMDSTD is not set
-CONFIG_MTD_CFI_GEOMETRY=y
-# CONFIG_MTD_CFI_INTELEXT is not set
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_PLATFORM=y
-CONFIG_MTD_NAND_VERIFY_WRITE=y
-CONFIG_MTD_PHYSMAP=y
-# CONFIG_MTD_ROOTFS_ROOT_DEV is not set
-# CONFIG_MTD_ROOTFS_SPLIT is not set
-# CONFIG_MUTEX_SPIN_ON_OWNER is not set
-CONFIG_NF_CONNTRACK=y
-CONFIG_NF_CT_ACCT=y
-# CONFIG_NO_IOPORT is not set
-# CONFIG_NXP_STB220 is not set
-# CONFIG_NXP_STB225 is not set
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PATA_RB532=y
-CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCSPKR_PLATFORM=y
-# CONFIG_PMC_MSP is not set
-# CONFIG_PMC_YOSEMITE is not set
-# CONFIG_PNX8550_JBS is not set
-# CONFIG_PNX8550_STB810 is not set
-# CONFIG_POWERTV is not set
-CONFIG_RC32434_WDT=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_SCSI=y
-# CONFIG_SCSI_LOWLEVEL is not set
-# CONFIG_SCSI_MULTI_LUN is not set
-# CONFIG_SCSI_PROC_FS is not set
-# CONFIG_SERIAL_8250_EXTENDED is not set
-# CONFIG_SERIAL_TIMBERDALE is not set
-# CONFIG_SGI_IP22 is not set
-# CONFIG_SGI_IP27 is not set
-# CONFIG_SGI_IP28 is not set
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_SWARM is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-CONFIG_STP=m
-# CONFIG_SWAP is not set
-CONFIG_SWAP_IO_SPACE=y
-CONFIG_SYS_HAS_CPU_MIPS32_R1=y
-CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
-# CONFIG_TC35815 is not set
-CONFIG_TRAD_SIGNALS=y
-# CONFIG_TREE_PREEMPT_RCU is not set
-CONFIG_VIA_RHINE=y
-CONFIG_VIA_RHINE_MMIO=y
-CONFIG_VLAN_8021Q=m
-CONFIG_YAFFS_9BYTE_TAGS=y
-# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
-CONFIG_YAFFS_AUTO_YAFFS2=y
-# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
-# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
-CONFIG_YAFFS_FS=y
-CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
-CONFIG_YAFFS_YAFFS1=y
-CONFIG_YAFFS_YAFFS2=y
-CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/rb532/patches-2.6.33/001-cmdline_hack.patch b/target/linux/rb532/patches-2.6.33/001-cmdline_hack.patch
deleted file mode 100644
index 82a324ccf..000000000
--- a/target/linux/rb532/patches-2.6.33/001-cmdline_hack.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/arch/mips/rb532/prom.c
-+++ b/arch/mips/rb532/prom.c
-@@ -67,6 +67,7 @@ static inline unsigned long tag2ul(char 
- 	return simple_strtoul(num, 0, 10);
- }
- 
-+extern char __image_cmdline[];
- void __init prom_setup_cmdline(void)
- {
- 	static char cmd_line[CL_SIZE] __initdata;
-@@ -109,6 +110,9 @@ void __init prom_setup_cmdline(void)
- 	}
- 	*(cp++) = ' ';
- 
-+	strcpy(cp,(__image_cmdline));
-+	cp += strlen(__image_cmdline);
-+
- 	i = strlen(arcs_cmdline);
- 	if (i > 0) {
- 		*(cp++) = ' ';
diff --git a/target/linux/rb532/patches-2.6.33/002-rb532_nand_fixup.patch b/target/linux/rb532/patches-2.6.33/002-rb532_nand_fixup.patch
deleted file mode 100644
index 0ba9fefb0..000000000
--- a/target/linux/rb532/patches-2.6.33/002-rb532_nand_fixup.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/arch/mips/rb532/devices.c
-+++ b/arch/mips/rb532/devices.c
-@@ -139,6 +139,19 @@ static struct platform_device cf_slot0 =
- };
- 
- /* Resources and device for NAND */
-+
-+/*
-+ * We need to use the OLD Yaffs-1 OOB layout, otherwise the RB bootloader
-+ * will not be able to find the kernel that we load.  So set the oobinfo
-+ * when creating the partitions
-+ */
-+static struct nand_ecclayout rb532_nand_ecclayout = {
-+	.eccbytes       = 6,
-+	.eccpos         = { 8, 9, 10, 13, 14, 15 },
-+	.oobavail       = 9,
-+	.oobfree        = { { 0, 4 }, { 6, 2 }, { 11, 2 }, { 4, 1 } }
-+};
-+
- static int rb532_dev_ready(struct mtd_info *mtd)
- {
- 	return gpio_get_value(GPIO_RDY);
-@@ -280,6 +293,16 @@ static void __init parse_mac_addr(char *
- /* NAND definitions */
- #define NAND_CHIP_DELAY	25
- 
-+static int rb532_nand_fixup(struct mtd_info *mtd)
-+{
-+	struct nand_chip *chip = mtd->priv;
-+
-+	if (mtd->writesize == 512)
-+		chip->ecc.layout = &rb532_nand_ecclayout;
-+
-+	return 0;
-+}
-+
- static void __init rb532_nand_setup(void)
- {
- 	switch (mips_machtype) {
-@@ -299,6 +322,8 @@ static void __init rb532_nand_setup(void
- 	rb532_nand_data.chip.partitions = rb532_partition_info;
- 	rb532_nand_data.chip.chip_delay = NAND_CHIP_DELAY;
- 	rb532_nand_data.chip.options = NAND_NO_AUTOINCR;
-+	
-+	rb532_nand_data.chip.chip_fixup = &rb532_nand_fixup;
- }
- 
- 
diff --git a/target/linux/rb532/patches-2.6.34/001-cmdline_hack.patch b/target/linux/rb532/patches-2.6.34/001-cmdline_hack.patch
deleted file mode 100644
index 82a324ccf..000000000
--- a/target/linux/rb532/patches-2.6.34/001-cmdline_hack.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/arch/mips/rb532/prom.c
-+++ b/arch/mips/rb532/prom.c
-@@ -67,6 +67,7 @@ static inline unsigned long tag2ul(char 
- 	return simple_strtoul(num, 0, 10);
- }
- 
-+extern char __image_cmdline[];
- void __init prom_setup_cmdline(void)
- {
- 	static char cmd_line[CL_SIZE] __initdata;
-@@ -109,6 +110,9 @@ void __init prom_setup_cmdline(void)
- 	}
- 	*(cp++) = ' ';
- 
-+	strcpy(cp,(__image_cmdline));
-+	cp += strlen(__image_cmdline);
-+
- 	i = strlen(arcs_cmdline);
- 	if (i > 0) {
- 		*(cp++) = ' ';
diff --git a/target/linux/rb532/patches-2.6.34/002-rb532_nand_fixup.patch b/target/linux/rb532/patches-2.6.34/002-rb532_nand_fixup.patch
deleted file mode 100644
index 0ba9fefb0..000000000
--- a/target/linux/rb532/patches-2.6.34/002-rb532_nand_fixup.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/arch/mips/rb532/devices.c
-+++ b/arch/mips/rb532/devices.c
-@@ -139,6 +139,19 @@ static struct platform_device cf_slot0 =
- };
- 
- /* Resources and device for NAND */
-+
-+/*
-+ * We need to use the OLD Yaffs-1 OOB layout, otherwise the RB bootloader
-+ * will not be able to find the kernel that we load.  So set the oobinfo
-+ * when creating the partitions
-+ */
-+static struct nand_ecclayout rb532_nand_ecclayout = {
-+	.eccbytes       = 6,
-+	.eccpos         = { 8, 9, 10, 13, 14, 15 },
-+	.oobavail       = 9,
-+	.oobfree        = { { 0, 4 }, { 6, 2 }, { 11, 2 }, { 4, 1 } }
-+};
-+
- static int rb532_dev_ready(struct mtd_info *mtd)
- {
- 	return gpio_get_value(GPIO_RDY);
-@@ -280,6 +293,16 @@ static void __init parse_mac_addr(char *
- /* NAND definitions */
- #define NAND_CHIP_DELAY	25
- 
-+static int rb532_nand_fixup(struct mtd_info *mtd)
-+{
-+	struct nand_chip *chip = mtd->priv;
-+
-+	if (mtd->writesize == 512)
-+		chip->ecc.layout = &rb532_nand_ecclayout;
-+
-+	return 0;
-+}
-+
- static void __init rb532_nand_setup(void)
- {
- 	switch (mips_machtype) {
-@@ -299,6 +322,8 @@ static void __init rb532_nand_setup(void
- 	rb532_nand_data.chip.partitions = rb532_partition_info;
- 	rb532_nand_data.chip.chip_delay = NAND_CHIP_DELAY;
- 	rb532_nand_data.chip.options = NAND_NO_AUTOINCR;
-+	
-+	rb532_nand_data.chip.chip_fixup = &rb532_nand_fixup;
- }
- 
- 
diff --git a/target/linux/rdc/modules.mk b/target/linux/rdc/modules.mk
deleted file mode 100644
index 668c1c063..000000000
--- a/target/linux/rdc/modules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-define KernelPackage/ide-core/install
-	rm -f $(1)/etc/modules.d/30-ide-core
-endef
-
-
diff --git a/target/linux/s3c24xx/Makefile b/target/linux/s3c24xx/Makefile
deleted file mode 100644
index a0c186a86..000000000
--- a/target/linux/s3c24xx/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (C) 2006-2009 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-ARCH:=arm
-BOARD:=s3c24xx
-BOARDNAME:=Samsung S3C24xx
-FEATURES:=jffs2
-CFLAGS:=-O2 -pipe -march=armv4t -mtune=arm920t -funit-at-a-time
-
-LINUX_VERSION:=2.6.30.10
-
-DEVICE_TYPE=phone
-
-define Target/Description
-	OpenMoko gta02
-endef
-
-include $(INCLUDE_DIR)/target.mk
-
-$(eval $(call BuildTarget))
diff --git a/target/linux/s3c24xx/base-files/etc/acpi/sleep.sh b/target/linux/s3c24xx/base-files/etc/acpi/sleep.sh
deleted file mode 100755
index 3e67423f4..000000000
--- a/target/linux/s3c24xx/base-files/etc/acpi/sleep.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# the following will suspend the Openmoko Freerunner to RAM
-echo mem > /sys/power/state
diff --git a/target/linux/s3c24xx/base-files/etc/config/fstab b/target/linux/s3c24xx/base-files/etc/config/fstab
deleted file mode 100644
index 522356112..000000000
--- a/target/linux/s3c24xx/base-files/etc/config/fstab
+++ /dev/null
@@ -1,6 +0,0 @@
-config mount
-	option target   /card
-	option device   /dev/mmcblk0p1
-	option fstype   auto
-	option options  rw,sync
-	option enabled  1
diff --git a/target/linux/s3c24xx/base-files/etc/config/network b/target/linux/s3c24xx/base-files/etc/config/network
deleted file mode 100644
index 2ea5a4b04..000000000
--- a/target/linux/s3c24xx/base-files/etc/config/network
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (C) 2006 OpenWrt.org
-
-config interface loopback
-	option ifname	lo
-	option proto	static
-	option ipaddr	127.0.0.1
-	option netmask	255.0.0.0
-
-config interface lan
-	option ifname	usb0
-	option type 	bridge
-	option proto	static
-	option ipaddr	192.168.1.1
-	option netmask	255.255.255.0
diff --git a/target/linux/s3c24xx/config-2.6.30 b/target/linux/s3c24xx/config-2.6.30
deleted file mode 100644
index 9a6af9541..000000000
--- a/target/linux/s3c24xx/config-2.6.30
+++ /dev/null
@@ -1,425 +0,0 @@
-# CONFIG_AEABI is not set
-CONFIG_ALIGNMENT_TRAP=y
-# CONFIG_APM_EMULATION is not set
-# CONFIG_AR6000_WLAN_DEBUG is not set
-# CONFIG_AR6000_WLAN_RESET is not set
-CONFIG_AR6000_WLAN=y
-# CONFIG_ARCH_BAST is not set
-CONFIG_ARCH_FLATMEM_HAS_HOLES=y
-# CONFIG_ARCH_H1940 is not set
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_ARCH_REQUIRE_GPIOLIB=y
-CONFIG_ARCH_S3C2410=y
-# CONFIG_ARCH_S3C2440 is not set
-# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
-# CONFIG_ARCH_SMDK2410 is not set
-# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARM_THUMB=y
-CONFIG_ARM=y
-# CONFIG_ARPD is not set
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_GENERIC=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-# CONFIG_BACKLIGHT_PWM is not set
-CONFIG_BATTERY_BQ27000_HDQ=y
-# CONFIG_BINARY_PRINTF is not set
-CONFIG_BITREVERSE=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BRIDGE_NETFILTER=y
-# CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_CHARGER_PCF50633=y
-CONFIG_CMDLINE="unused -- bootloader passes ATAG list"
-CONFIG_COMPAT_BRK=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_CPU_32v4T=y
-CONFIG_CPU_32=y
-CONFIG_CPU_ABRT_EV4T=y
-CONFIG_CPU_ARM920T=y
-CONFIG_CPU_CACHE_V4WT=y
-CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_COPY_V4WB=y
-CONFIG_CPU_CP15_MMU=y
-CONFIG_CPU_CP15=y
-# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
-# CONFIG_CPU_ICACHE_DISABLE is not set
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_LLSERIAL_S3C2440_ONLY=y
-CONFIG_CPU_LLSERIAL_S3C2440=y
-CONFIG_CPU_PABRT_NOIFAR=y
-CONFIG_CPU_S3C2410_DMA=y
-CONFIG_CPU_S3C2442=y
-CONFIG_CPU_S3C244X=y
-CONFIG_CPU_TLB_V4WBI=y
-CONFIG_CRC16=y
-CONFIG_CRC7=y
-CONFIG_CRC_CCITT=y
-CONFIG_CRC_ITU_T=y
-CONFIG_CRC_T10DIF=y
-CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_FS is not set
-CONFIG_DEBUG_MEMORY_INIT=y
-CONFIG_DEBUG_S3C_UART=2
-# CONFIG_DEBUG_USER is not set
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DISPLAY_JBT6K74=y
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_ELF_CORE=y
-# CONFIG_EMBEDDED is not set
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB=y
-CONFIG_FIQ=y
-# CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FONT_10x18 is not set
-CONFIG_FONT_6x11=y
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_8x16 is not set
-# CONFIG_FONT_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_SUN8x16 is not set
-CONFIG_FONTS=y
-# CONFIG_FPE_FASTFPE is not set
-# CONFIG_FPE_NWFPE_XP is not set
-CONFIG_FPE_NWFPE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAME_POINTER=y
-CONFIG_FREEZER=y
-# CONFIG_GENERIC_CLOCKEVENTS is not set
-CONFIG_GENERIC_FIND_LAST_BIT=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-# CONFIG_GENERIC_TIME is not set
-CONFIG_GPIO_DEVICE=y
-CONFIG_GPIOLIB=y
-CONFIG_GPIO_SYSFS=y
-# CONFIG_HAMRADIO is not set
-CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAVE_AOUT=y
-CONFIG_HAVE_ARCH_KGDB=y
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_HAVE_IDE=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_HAVE_MLOCKED_PAGE_BIT=y
-CONFIG_HAVE_MLOCK=y
-CONFIG_HAVE_OPROFILE=y
-CONFIG_HAVE_PWM=y
-CONFIG_HDQ_GPIO_BITBANG=y
-CONFIG_HID_A4TECH=y
-CONFIG_HID_APPLE=y
-CONFIG_HID_BELKIN=y
-CONFIG_HID_CHERRY=y
-CONFIG_HID_CHICONY=y
-CONFIG_HID_CYPRESS=y
-CONFIG_HID_EZKEY=y
-CONFIG_HID_GYRATION=y
-CONFIG_HID_KENSINGTON=y
-CONFIG_HID_KYE=y
-CONFIG_HID_LOGITECH=y
-CONFIG_HID_MICROSOFT=y
-CONFIG_HID_MONTEREY=y
-CONFIG_HID_NTRIG=y
-CONFIG_HID_PANTHERLORD=y
-CONFIG_HID_PETALYNX=y
-CONFIG_HID_SAMSUNG=y
-CONFIG_HID_SONY=y
-CONFIG_HID_SUNPLUS=y
-CONFIG_HID_SUPPORT=y
-CONFIG_HID_TOPSEED=y
-CONFIG_HID=y
-CONFIG_HW_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_HZ=200
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_S3C2410=y
-CONFIG_I2C=y
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INOTIFY_USER=y
-CONFIG_INOTIFY=y
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_GPIO_BUTTONS is not set
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_INPUT_LIS302DL=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_PCF50633_PMU=y
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_INPUT=y
-# CONFIG_INPUT_YEALINK is not set
-# CONFIG_IP_PNP_BOOTP is not set
-# CONFIG_IP_PNP_DHCP is not set
-# CONFIG_IP_PNP_RARP is not set
-CONFIG_IP_PNP=y
-# CONFIG_IP_ROUTE_MULTIPATH is not set
-# CONFIG_IP_ROUTE_VERBOSE is not set
-# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-CONFIG_KALLSYMS=y
-# CONFIG_KEYBOARD_ATKBD is not set
-# CONFIG_KEYBOARD_GPIO is not set
-CONFIG_KEYBOARD_GTA02=y
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-CONFIG_LCD_CLASS_DEVICE=y
-# CONFIG_LCD_ILI9320 is not set
-# CONFIG_LCD_LTV350QV is not set
-# CONFIG_LCD_PLATFORM is not set
-# CONFIG_LCD_TDO24M is not set
-# CONFIG_LCD_VGG2432A4 is not set
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_GTA02_VIBRATOR=y
-# CONFIG_LEDS_PWM is not set
-# CONFIG_LEDS_S3C24XX is not set
-# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
-# CONFIG_LEDS_TRIGGER_NETDEV is not set
-CONFIG_LOCK_KERNEL=y
-CONFIG_LOG_BUF_SHIFT=18
-# CONFIG_LOGO_LINUX_CLUT224 is not set
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_OPENWRT_CLUT224=y
-CONFIG_LOGO=y
-# CONFIG_MACH_AML_M5900 is not set
-# CONFIG_MACH_ANUBIS is not set
-# CONFIG_MACH_AT2440EVB is not set
-# CONFIG_MACH_JIVE is not set
-# CONFIG_MACH_N30 is not set
-CONFIG_MACH_NEO1973_GTA02=y
-CONFIG_MACH_NEO1973=y
-# CONFIG_MACH_NEXCODER_2440 is not set
-# CONFIG_MACH_OSIRIS is not set
-# CONFIG_MACH_OTOM is not set
-# CONFIG_MACH_QT2410 is not set
-# CONFIG_MACH_RX3715 is not set
-# CONFIG_MACH_SMDK2412 is not set
-# CONFIG_MACH_SMDK2413 is not set
-# CONFIG_MACH_SMDK2443 is not set
-# CONFIG_MACH_TCT_HAMMER is not set
-# CONFIG_MACH_VR1000 is not set
-# CONFIG_MACH_VSTMS is not set
-CONFIG_MFD_CORE=y
-CONFIG_MFD_GLAMO_FB=y
-CONFIG_MFD_GLAMO_GPIO=y
-CONFIG_MFD_GLAMO_MCI=y
-CONFIG_MFD_GLAMO=y
-CONFIG_MFD_PCF50633=y
-# CONFIG_MFD_T7L66XB is not set
-# CONFIG_MISC_DEVICES is not set
-CONFIG_MMC_BLOCK=y
-CONFIG_MMC_S3C=y
-CONFIG_MMC=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MTD_ABSENT=y
-# CONFIG_MTD_CFI_AMDSTD is not set
-CONFIG_MTD_CMDLINE_PARTS=y
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-CONFIG_MTD_CONCAT=y
-# CONFIG_MTD_NAND_GPIO is not set
-# CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set
-# CONFIG_MTD_NAND_S3C2410_DEBUG is not set
-CONFIG_MTD_NAND_S3C2410_HWECC=y
-CONFIG_MTD_NAND_S3C2410=y
-CONFIG_MTD_NAND_VERIFY_WRITE=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_ROM=y
-CONFIG_NAMESPACES=y
-# CONFIG_NET_CLS_ACT is not set
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NET_ETHERNET is not set
-# CONFIG_NET_NS is not set
-# CONFIG_NETWORK_FILESYSTEMS is not set
-CONFIG_NLATTR=y
-CONFIG_NO_IOPORT=y
-CONFIG_NR_TTY_DEVICES=6
-# CONFIG_OUTER_CACHE is not set
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_PCF50633_ADC=y
-CONFIG_PCF50633_GPIO=y
-# CONFIG_PCI_SYSCALL is not set
-# CONFIG_PDA_POWER is not set
-CONFIG_PLAT_S3C24XX=y
-CONFIG_PLAT_S3C=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_PM_SLEEP=y
-CONFIG_PM=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-CONFIG_POWER_SUPPLY=y
-CONFIG_PREEMPT=y
-CONFIG_PROC_PAGE_MONITOR=y
-CONFIG_RD_BZIP2=y
-CONFIG_RD_GZIP=y
-# CONFIG_REGULATOR_DEBUG is not set
-CONFIG_REGULATOR_PCF50633=y
-CONFIG_REGULATOR=y
-CONFIG_RTC_CLASS=y
-# CONFIG_RTC_DRV_CMOS is not set
-CONFIG_RTC_DRV_PCF50633=y
-CONFIG_RTC_DRV_S3C=y
-CONFIG_S3C2410_CLOCK=y
-# CONFIG_S3C2410_DMA_DEBUG is not set
-CONFIG_S3C2410_DMA=y
-CONFIG_S3C2410_GPIO=y
-# CONFIG_S3C2410_PM_CHECK is not set
-# CONFIG_S3C2410_PM_DEBUG is not set
-CONFIG_S3C2410_PM=y
-CONFIG_S3C2410_WATCHDOG=y
-CONFIG_S3C2440_DMA=y
-# CONFIG_S3C24XX_ADC is not set
-CONFIG_S3C24XX_GPIO_EXTRA=64
-CONFIG_S3C24XX_GPIO_EXTRA64=yes
-CONFIG_S3C24XX_PWM=y
-# CONFIG_S3C_BOOT_ERROR_RESET is not set
-CONFIG_S3C_BOOT_UART_FORCE_FIFO=y
-# CONFIG_S3C_BOOT_WATCHDOG is not set
-CONFIG_S3C_DEV_USB_HOST=y
-CONFIG_S3C_DMA=y
-CONFIG_S3C_GPIO_SPACE=0
-CONFIG_S3C_LOWLEVEL_UART_PORT=2
-CONFIG_S3C_PWM=y
-# CONFIG_SCSI_LOWLEVEL is not set
-# CONFIG_SCSI_MULTI_LUN is not set
-# CONFIG_SCSI_PROC_FS is not set
-# CONFIG_SDIO_UART is not set
-# CONFIG_SERIAL_8250 is not set
-CONFIG_SERIAL_S3C2440=y
-CONFIG_SERIAL_SAMSUNG_CONSOLE=y
-CONFIG_SERIAL_SAMSUNG_UARTS=3
-CONFIG_SERIAL_SAMSUNG=y
-# CONFIG_SERIO_RAW is not set
-# CONFIG_SERIO_SERPORT is not set
-CONFIG_SERIO=y
-# CONFIG_SLOW_WORK is not set
-# CONFIG_SND_ARM is not set
-# CONFIG_SND_DRIVERS is not set
-CONFIG_SND_JACK=y
-CONFIG_SND=m
-CONFIG_SND_PCM=m
-CONFIG_SND_S3C24XX_SOC_I2S=m
-# CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650 is not set
-CONFIG_SND_S3C24XX_SOC=m
-CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=m
-# CONFIG_SND_S3C24XX_SOC_S3C24XX_UDA134X is not set
-# CONFIG_SND_SOC_ALL_CODECS is not set
-CONFIG_SND_SOC_I2C_AND_SPI=m
-CONFIG_SND_SOC=m
-CONFIG_SND_SOC_WM8753=m
-CONFIG_SND_TIMER=m
-# CONFIG_SND_USB is not set
-# CONFIG_SND_VERBOSE_PROCFS is not set
-CONFIG_SOUND=m
-# CONFIG_SOUND_OSS_CORE is not set
-CONFIG_SPI_BITBANG=y
-CONFIG_SPI_GPIO=y
-CONFIG_SPI_MASTER=y
-CONFIG_SPI_S3C24XX_GPIO=y
-CONFIG_SPI_S3C24XX=y
-# CONFIG_SPI_SPIDEV is not set
-CONFIG_SPI=y
-CONFIG_SPLIT_PTLOCK_CPUS=4096
-# CONFIG_SQUASHFS is not set
-CONFIG_SUSPEND_FREEZER=y
-CONFIG_SUSPEND=y
-# CONFIG_SYSCTL_SYSCALL_CHECK is not set
-CONFIG_SYSFS_DEPRECATED_V2=y
-CONFIG_SYSFS_DEPRECATED=y
-CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-CONFIG_TCP_MD5SIG=y
-CONFIG_TOUCHSCREEN_FILTER_GROUP=y
-CONFIG_TOUCHSCREEN_FILTER_LINEAR=y
-CONFIG_TOUCHSCREEN_FILTER_MEAN=y
-CONFIG_TOUCHSCREEN_FILTER_MEDIAN=y
-CONFIG_TOUCHSCREEN_FILTER=y
-# CONFIG_TOUCHSCREEN_S3C2410_DEBUG is not set
-CONFIG_TOUCHSCREEN_S3C2410=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_UID16=y
-CONFIG_UNEVICTABLE_LRU=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-# CONFIG_USB_ARCH_HAS_EHCI is not set
-# CONFIG_USB_CDC_COMPOSITE is not set
-# CONFIG_USB_DEVICEFS is not set
-CONFIG_USB_ETH_RNDIS=y
-CONFIG_USB_ETH=y
-# CONFIG_USB_FILE_STORAGE is not set
-# CONFIG_USB_GADGET_AMD5536UDC is not set
-# CONFIG_USB_GADGET_AT91 is not set
-# CONFIG_USB_GADGET_ATMEL_USBA is not set
-# CONFIG_USB_GADGET_CI13XXX is not set
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_DEBUG_FS is not set
-# CONFIG_USB_GADGET_DUALSPEED is not set
-# CONFIG_USB_GADGET_DUMMY_HCD is not set
-# CONFIG_USB_GADGETFS is not set
-# CONFIG_USB_GADGET_FSL_QE is not set
-# CONFIG_USB_GADGET_FSL_USB2 is not set
-# CONFIG_USB_GADGET_GOKU is not set
-# CONFIG_USB_GADGET_IMX is not set
-# CONFIG_USB_GADGET_LH7A40X is not set
-# CONFIG_USB_GADGET_M66592 is not set
-# CONFIG_USB_GADGET_MUSB_HDRC is not set
-# CONFIG_USB_GADGET_NET2280 is not set
-# CONFIG_USB_GADGET_OMAP is not set
-# CONFIG_USB_GADGET_PXA25X is not set
-# CONFIG_USB_GADGET_PXA27X is not set
-CONFIG_USB_GADGET_S3C2410=y
-CONFIG_USB_GADGET_SELECTED=y
-CONFIG_USB_GADGET_VBUS_DRAW=500
-CONFIG_USB_GADGET=y
-# CONFIG_USB_G_PRINTER is not set
-# CONFIG_USB_G_SERIAL is not set
-CONFIG_USB_HID=y
-# CONFIG_USB_MIDI_GADGET is not set
-# CONFIG_USB_MUSB_HDRC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_HCD=y
-# CONFIG_USB_S3C2410_DEBUG is not set
-CONFIG_USB_S3C2410=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_SUSPEND=y
-CONFIG_USB=y
-# CONFIG_USB_ZERO is not set
-# CONFIG_USER_NS is not set
-CONFIG_VECTORS_BASE=0xffff0000
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_VIDEO_OUTPUT_CONTROL=y
-# CONFIG_VLAN_8021Q is not set
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_VT=y
-# CONFIG_WLAN_80211 is not set
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/s3c24xx/files-2.6.30/arch/arm/mach-s3c2442/gta02-pm-bt.c b/target/linux/s3c24xx/files-2.6.30/arch/arm/mach-s3c2442/gta02-pm-bt.c
deleted file mode 100644
index 95c1e59e2..000000000
--- a/target/linux/s3c24xx/files-2.6.30/arch/arm/mach-s3c2442/gta02-pm-bt.c
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * Bluetooth PM code for the Openmoko Freerunner GSM Phone
- *
- * (C) 2007 by Openmoko Inc.
- * Author: Harald Welte <laforge@openmoko.org>
- * All rights reserved.
- *
- * 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
- *
- */
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/platform_device.h>
-#include <linux/rfkill.h>
-#include <linux/err.h>
-
-#include <mach/hardware.h>
-#include <asm/mach-types.h>
-
-#include <mach/gta02.h>
-#include <linux/mfd/pcf50633/gpio.h>
-
-#include <linux/regulator/consumer.h>
-
-#define DRVMSG "Openmoko Freerunner Bluetooth Power Management"
-
-struct gta02_pm_bt_data {
-	struct regulator *regulator;
-	struct rfkill *rfkill;
-	int pre_resume_state;
-};
-
-static ssize_t bt_read(struct device *dev, struct device_attribute *attr,
-		       char *buf)
-{
-	int ret = 0;
-	if (!strcmp(attr->attr.name, "power_on")) {
-		if (s3c2410_gpio_getpin(GTA02_GPIO_BT_EN))
-			ret = 1;
-	} else if (!strcmp(attr->attr.name, "reset")) {
-		if (s3c2410_gpio_getpin(GTA02_GPIO_BT_EN) == 0)
-			ret = 1;
-	}
-
-	if (!ret) {
-		return strlcpy(buf, "0\n", 3);
-	} else {
-		return strlcpy(buf, "1\n", 3);
-	}
-}
-
-static void __gta02_pm_bt_toggle_radio(struct device *dev, unsigned int on)
-{
-	struct gta02_pm_bt_data *bt_data = dev_get_drvdata(dev);
-
-	dev_info(dev, "__gta02_pm_bt_toggle_radio %d\n", on);
-
-	bt_data = dev_get_drvdata(dev);
-
-    s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, !on);
-
-	if (on) {
-		if (!regulator_is_enabled(bt_data->regulator))
-			regulator_enable(bt_data->regulator);
-	} else {
-		if (regulator_is_enabled(bt_data->regulator))
-			regulator_disable(bt_data->regulator);
-	}
-
-	s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, on);
-}
-
-
-static int bt_rfkill_toggle_radio(void *data, enum rfkill_state state)
-{
-	struct device *dev = data;
-	unsigned long on = (state == RFKILL_STATE_ON);
-
-	__gta02_pm_bt_toggle_radio(dev, on);
-
-	return 0;
-}
-
-static ssize_t bt_write(struct device *dev, struct device_attribute *attr,
-			const char *buf, size_t count)
-{
-	unsigned long on = simple_strtoul(buf, NULL, 10);
-	struct gta02_pm_bt_data *bt_data = dev_get_drvdata(dev);
-
-	if (!strcmp(attr->attr.name, "power_on")) {
-		enum rfkill_state state = on ? RFKILL_STATE_ON : RFKILL_STATE_OFF;
-		bt_rfkill_toggle_radio(dev, state);
-		bt_data->rfkill->state = state;
-
-		__gta02_pm_bt_toggle_radio(dev, on);
-	} else if (!strcmp(attr->attr.name, "reset")) {
-		/* reset is low-active, so we need to invert */
-		s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, on ? 0 : 1);
-	}
-
-	return count;
-}
-
-static DEVICE_ATTR(power_on, 0644, bt_read, bt_write);
-static DEVICE_ATTR(reset, 0644, bt_read, bt_write);
-
-#ifdef CONFIG_PM
-static int gta02_bt_suspend(struct platform_device *pdev, pm_message_t state)
-{
-	struct gta02_pm_bt_data *bt_data = dev_get_drvdata(&pdev->dev);
-
-	dev_dbg(&pdev->dev, DRVMSG ": suspending\n");
-
-	bt_data->pre_resume_state = s3c2410_gpio_getpin(GTA02_GPIO_BT_EN);
-	__gta02_pm_bt_toggle_radio(&pdev->dev, 0);
-
-	return 0;
-}
-
-static int gta02_bt_resume(struct platform_device *pdev)
-{
-	struct gta02_pm_bt_data *bt_data = dev_get_drvdata(&pdev->dev);
-	dev_dbg(&pdev->dev, DRVMSG ": resuming\n");
-
-	__gta02_pm_bt_toggle_radio(&pdev->dev, bt_data->pre_resume_state);
-	return 0;
-}
-#else
-#define gta02_bt_suspend	NULL
-#define gta02_bt_resume		NULL
-#endif
-
-static struct attribute *gta02_bt_sysfs_entries[] = {
-	&dev_attr_power_on.attr,
-	&dev_attr_reset.attr,
-	NULL
-};
-
-static struct attribute_group gta02_bt_attr_group = {
-	.name	= NULL,
-	.attrs	= gta02_bt_sysfs_entries,
-};
-
-static int __init gta02_bt_probe(struct platform_device *pdev)
-{
-	struct rfkill *rfkill;
-	struct regulator *regulator;
-	struct gta02_pm_bt_data *bt_data;
-	int ret;
-
-	dev_info(&pdev->dev, DRVMSG ": starting\n");
-
-	bt_data = kzalloc(sizeof(*bt_data), GFP_KERNEL);
-	dev_set_drvdata(&pdev->dev, bt_data);
-
-	regulator = regulator_get(&pdev->dev, "BT_3V2");
-	if (IS_ERR(regulator))
-		return -ENODEV;
-
-	bt_data->regulator = regulator;
-
-	/* this tests the true physical state of the regulator... */
-	if (regulator_is_enabled(regulator)) {
-		/*
-		 * but these only operate on the logical state of the
-		 * regulator... so we need to logicaly "adopt" it on
-		 * to turn it off
-		 */
-		regulator_enable(regulator);
-		regulator_disable(regulator);
-	}
-
-	/* we pull reset to low to make sure that the chip doesn't
-	 * drain power through the reset line */
-	s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, 0);
-
-	rfkill = rfkill_allocate(&pdev->dev, RFKILL_TYPE_BLUETOOTH);
-
-	rfkill->name = pdev->name;
-	rfkill->data = &pdev->dev;
-	rfkill->state = RFKILL_STATE_OFF;
-	rfkill->toggle_radio = bt_rfkill_toggle_radio;
-
-	ret = rfkill_register(rfkill);
-	if (ret) {
-		dev_err(&pdev->dev, "Failed to register rfkill\n");
-		return ret;
-	}
-
-	bt_data->rfkill = rfkill;
-
-	return sysfs_create_group(&pdev->dev.kobj, &gta02_bt_attr_group);
-}
-
-static int gta02_bt_remove(struct platform_device *pdev)
-{
-	struct gta02_pm_bt_data *bt_data = dev_get_drvdata(&pdev->dev);
-	struct regulator *regulator;
-
-	sysfs_remove_group(&pdev->dev.kobj, &gta02_bt_attr_group);
-
-	if (bt_data->rfkill) {
-		rfkill_unregister(bt_data->rfkill);
-		rfkill_free(bt_data->rfkill);
-	}
-
-	if (!bt_data || !bt_data->regulator)
-		return 0;
-
-	regulator = bt_data->regulator;
-
-	/* Make sure regulator is disabled before calling regulator_put */
-	if (regulator_is_enabled(regulator))
-		regulator_disable(regulator);
-
-	regulator_put(regulator);
-
-	kfree(bt_data);
-
-	return 0;
-}
-
-static struct platform_driver gta02_bt_driver = {
-	.probe		= gta02_bt_probe,
-	.remove		= gta02_bt_remove,
-	.suspend	= gta02_bt_suspend,
-	.resume		= gta02_bt_resume,
-	.driver		= {
-		.name		= "gta02-pm-bt",
-	},
-};
-
-static int __devinit gta02_bt_init(void)
-{
-	return platform_driver_register(&gta02_bt_driver);
-}
-
-static void gta02_bt_exit(void)
-{
-	platform_driver_unregister(&gta02_bt_driver);
-}
-
-module_init(gta02_bt_init);
-module_exit(gta02_bt_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
-MODULE_DESCRIPTION(DRVMSG);
diff --git a/target/linux/s3c24xx/files-2.6.30/arch/arm/mach-s3c2442/gta02-pm-gps.c b/target/linux/s3c24xx/files-2.6.30/arch/arm/mach-s3c2442/gta02-pm-gps.c
deleted file mode 100644
index ef598c71f..000000000
--- a/target/linux/s3c24xx/files-2.6.30/arch/arm/mach-s3c2442/gta02-pm-gps.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * GPS Power Management code for the Openmoko Freerunner GSM Phone
- *
- * (C) 2007-2009 by Openmoko Inc.
- * Author: Harald Welte <laforge@openmoko.org>
- * All rights reserved.
- *
- * 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
- *
- */
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/delay.h>
-#include <linux/platform_device.h>
-
-#include <mach/hardware.h>
-#include <mach/cpu.h>
-
-#include <asm/mach-types.h>
-
-#include <mach/gta02.h>
-#include <linux/mfd/pcf50633/core.h>
-#include <linux/mfd/pcf50633/pmic.h>
-
-#include <linux/regulator/consumer.h>
-#include <linux/err.h>
-
-struct gta02_pm_gps_data {
-#ifdef CONFIG_PM
-	int keep_on_in_suspend;
-#endif
-	int power_was_on;
-	struct regulator *regulator;
-};
-
-static struct gta02_pm_gps_data gta02_gps;
-
-int gta02_pm_gps_is_on(void)
-{
-	return gta02_gps.power_was_on;
-}
-EXPORT_SYMBOL_GPL(gta02_pm_gps_is_on);
-
-/* This is the POWERON pin */
-static void gps_pwron_set(int on)
-{
-	if (on) {
-		/* return UART pins to being UART pins */
-		s3c2410_gpio_cfgpin(S3C2410_GPH4, S3C2410_GPH4_TXD1);
-		/* remove pulldown now it won't be floating any more */
-		s3c2410_gpio_pullup(S3C2410_GPH5, 0);
-
-		if (!gta02_gps.power_was_on)
-			regulator_enable(gta02_gps.regulator);
-	} else {
-		/*
-		 * take care not to power unpowered GPS from UART TX
-		 * return them to GPIO and force low
-		 */
-		s3c2410_gpio_cfgpin(S3C2410_GPH4, S3C2410_GPH4_OUTP);
-		s3c2410_gpio_setpin(S3C2410_GPH4, 0);
-		/* don't let RX from unpowered GPS float */
-		s3c2410_gpio_pullup(S3C2410_GPH5, 1);
-		if (gta02_gps.power_was_on)
-			regulator_disable(gta02_gps.regulator);
-	}
-}
-
-static int gps_pwron_get(void)
-{
-	return regulator_is_enabled(gta02_gps.regulator);
-}
-
-#ifdef CONFIG_PM
-/* This is the flag for keeping gps ON during suspend */
-static void gps_keep_on_in_suspend_set(int on)
-{
-	gta02_gps.keep_on_in_suspend = on;
-}
-
-static int gps_keep_on_in_suspend_get(void)
-{
-	return gta02_gps.keep_on_in_suspend;
-}
-#endif
-
-static ssize_t power_gps_read(struct device *dev,
-			      struct device_attribute *attr, char *buf)
-{
-	int ret = 0;
-
-	if (!strcmp(attr->attr.name, "power_on") ||
-	    !strcmp(attr->attr.name, "pwron")) {
-		ret = gps_pwron_get();
-#ifdef CONFIG_PM
-	} else if (!strcmp(attr->attr.name, "keep_on_in_suspend")) {
-		ret = gps_keep_on_in_suspend_get();
-#endif
-	}
-	if (ret)
-		return strlcpy(buf, "1\n", 3);
-	else
-		return strlcpy(buf, "0\n", 3);
-}
-
-static ssize_t power_gps_write(struct device *dev,
-			       struct device_attribute *attr, const char *buf,
-			       size_t count)
-{
-	unsigned long on = simple_strtoul(buf, NULL, 10);
-
-	if (!strcmp(attr->attr.name, "power_on") ||
-	    !strcmp(attr->attr.name, "pwron")) {
-		gps_pwron_set(on);
-		gta02_gps.power_was_on = !!on;
-#ifdef CONFIG_PM
-	} else if (!strcmp(attr->attr.name, "keep_on_in_suspend")) {
-		gps_keep_on_in_suspend_set(on);
-#endif
-	}
-	return count;
-}
-
-#ifdef CONFIG_PM
-static int gta02_pm_gps_suspend(struct platform_device *pdev,
-				pm_message_t state)
-{
-	if (!gta02_gps.keep_on_in_suspend ||
-		!gta02_gps.power_was_on)
-		gps_pwron_set(0);
-	else
-		dev_warn(&pdev->dev, "GTA02: keeping gps ON "
-			 "during suspend\n");
-	return 0;
-}
-
-static int gta02_pm_gps_resume(struct platform_device *pdev)
-{
-	if (!gta02_gps.keep_on_in_suspend && gta02_gps.power_was_on)
-		gps_pwron_set(1);
-
-	return 0;
-}
-
-static DEVICE_ATTR(keep_on_in_suspend, 0644, power_gps_read, power_gps_write);
-#else
-#define gta02_pm_gps_suspend	NULL
-#define gta02_pm_gps_resume	NULL
-#endif
-
-static DEVICE_ATTR(power_on, 0644, power_gps_read, power_gps_write);
-
-static struct attribute *gta02_gps_sysfs_entries[] = {
-	&dev_attr_power_on.attr,
-#ifdef CONFIG_PM
-	&dev_attr_keep_on_in_suspend.attr,
-#endif
-	NULL
-};
-
-static struct attribute_group gta02_gps_attr_group = {
-	.name	= NULL,
-	.attrs	= gta02_gps_sysfs_entries,
-};
-
-static int __init gta02_pm_gps_probe(struct platform_device *pdev)
-{
-	gta02_gps.regulator = regulator_get(&pdev->dev, "RF_3V");
-	if (IS_ERR(gta02_gps.regulator)) {
-		dev_err(&pdev->dev, "probe failed %ld\n",
-			PTR_ERR(gta02_gps.regulator));
-
-		return PTR_ERR(gta02_gps.regulator);
-	}
-
-	dev_info(&pdev->dev, "starting\n");
-
-	/*
-	 * Here we should call the code that handles the set GPS power
-	 * off action.  But, the regulator API does not allow us to
-	 * reassert regulator state, and when we read the regulator API
-	 * logical state, it can differ from the actual state,  So
-	 * a workaround for this is to just set the regulator off in the
-	 * PMU directly.  Because that's different from normal flow, we
-	 * have to reproduce other things from the OFF action here too.
-	 */
-
-	/*
-	 * u-boot enables LDO5 (GPS), which doesn't make sense and
-	 * causes confusion. We therefore disable the regulator here.
-	 */
-	pcf50633_reg_write(gta02_pcf, PCF50633_REG_LDO5ENA, 0);
-
-	/*
-	 * take care not to power unpowered GPS from UART TX
-	 * return them to GPIO and force low
-	 */
-	s3c2410_gpio_cfgpin(S3C2410_GPH4, S3C2410_GPH4_OUTP);
-	s3c2410_gpio_setpin(S3C2410_GPH4, 0);
-	/* don't let RX from unpowered GPS float */
-	s3c2410_gpio_pullup(S3C2410_GPH5, 1);
-
-	return sysfs_create_group(&pdev->dev.kobj,
-				  &gta02_gps_attr_group);
-}
-
-static int gta02_pm_gps_remove(struct platform_device *pdev)
-{
-	regulator_put(gta02_gps.regulator);
-	sysfs_remove_group(&pdev->dev.kobj, &gta02_gps_attr_group);
-	return 0;
-}
-
-static struct platform_driver gta02_pm_gps_driver = {
-	.probe		= gta02_pm_gps_probe,
-	.remove		= gta02_pm_gps_remove,
-	.suspend	= gta02_pm_gps_suspend,
-	.resume		= gta02_pm_gps_resume,
-	.driver		= {
-		.name		= "gta02-pm-gps",
-	},
-};
-
-static int __devinit gta02_pm_gps_init(void)
-{
-	return platform_driver_register(&gta02_pm_gps_driver);
-}
-
-static void gta02_pm_gps_exit(void)
-{
-	platform_driver_unregister(&gta02_pm_gps_driver);
-}
-
-module_init(gta02_pm_gps_init);
-module_exit(gta02_pm_gps_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
diff --git a/target/linux/s3c24xx/files-2.6.30/arch/arm/mach-s3c2442/gta02-pm-gsm.c b/target/linux/s3c24xx/files-2.6.30/arch/arm/mach-s3c2442/gta02-pm-gsm.c
deleted file mode 100644
index 687b260e1..000000000
--- a/target/linux/s3c24xx/files-2.6.30/arch/arm/mach-s3c2442/gta02-pm-gsm.c
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- * GSM Management code for the Openmoko Freerunner GSM Phone
- *
- * (C) 2007 by Openmoko Inc.
- * Author: Harald Welte <laforge@openmoko.org>
- * All rights reserved.
- *
- * 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
- *
- */
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/platform_device.h>
-#include <linux/console.h>
-#include <linux/errno.h>
-#include <linux/interrupt.h>
-#include <linux/delay.h>
-
-#include <mach/gpio.h>
-#include <asm/mach-types.h>
-
-#include <mach/hardware.h>
-#include <mach/cpu.h>
-
-#include <mach/gta02.h>
-#include <linux/mfd/pcf50633/gpio.h>
-#include <mach/regs-gpio.h>
-#include <mach/regs-gpioj.h>
-
-int gta_gsm_interrupts;
-EXPORT_SYMBOL(gta_gsm_interrupts);
-
-extern void s3c24xx_serial_console_set_silence(int);
-
-struct gta02pm_priv {
-	int gpio_ndl_gsm;
-	struct console *con;
-};
-
-static struct gta02pm_priv gta02_gsm;
-
-static struct console *find_s3c24xx_console(void)
-{
-	struct console *con;
-
-	acquire_console_sem();
-
-	for (con = console_drivers; con; con = con->next) {
-		if (!strcmp(con->name, "ttySAC"))
-			break;
-	}
-
-	release_console_sem();
-
-	return con;
-}
-
-static ssize_t gsm_read(struct device *dev, struct device_attribute *attr,
-			char *buf)
-{
-	if (!strcmp(attr->attr.name, "power_on")) {
-		if (pcf50633_gpio_get(gta02_pcf, PCF50633_GPIO2))
-			goto out_1;
-	} else if (!strcmp(attr->attr.name, "download")) {
-		if (!s3c2410_gpio_getpin(GTA02_GPIO_nDL_GSM))
-			goto out_1;
-	} else if (!strcmp(attr->attr.name, "flowcontrolled")) {
-		if (s3c2410_gpio_getcfg(S3C2410_GPH1) == S3C2410_GPIO_OUTPUT)
-			goto out_1;
-	}
-
-	return strlcpy(buf, "0\n", 3);
-out_1:
-	return strlcpy(buf, "1\n", 3);
-}
-
-static void gsm_on_off(struct device *dev, int on)
-{
-	if (!on) {
-		s3c2410_gpio_cfgpin(S3C2410_GPH1, S3C2410_GPIO_INPUT);
-		s3c2410_gpio_cfgpin(S3C2410_GPH2, S3C2410_GPIO_INPUT);
-
-		pcf50633_gpio_set(gta02_pcf, PCF50633_GPIO2, 0);
-
-		if (gta02_gsm.con) {
-			s3c24xx_serial_console_set_silence(0);
-			console_start(gta02_gsm.con);
-
-			dev_dbg(dev, "powered down gta02 GSM, enabling "
-					"serial console\n");
-		}
-
-		return;
-	}
-
-	if (gta02_gsm.con) {
-		dev_dbg(dev, "powering up GSM, thus "
-				"disconnecting serial console\n");
-
-		console_stop(gta02_gsm.con);
-		s3c24xx_serial_console_set_silence(1);
-	}
-
-	/* allow UART to talk to GSM side now we will power it */
-	s3c2410_gpio_cfgpin(S3C2410_GPH1, S3C2410_GPH1_nRTS0);
-	s3c2410_gpio_cfgpin(S3C2410_GPH2, S3C2410_GPH2_TXD0);
-
-	pcf50633_gpio_set(gta02_pcf, PCF50633_GPIO2, 7);
-
-	msleep(100);
-
-	s3c2410_gpio_setpin(GTA02_GPIO_MODEM_ON, 1);
-	msleep(500);
-	s3c2410_gpio_setpin(GTA02_GPIO_MODEM_ON, 0);
-
-	/*
-	 * workaround for calypso firmware moko10 and earlier,
-	 * without this it will leave IRQ line high after
-	 * booting
-	 */
-	s3c2410_gpio_setpin(S3C2410_GPH1, 1);
-	s3c2410_gpio_cfgpin(S3C2410_GPH1, S3C2410_GPH1_OUTP);
-	msleep(1000);
-	s3c2410_gpio_cfgpin(S3C2410_GPH1, S3C2410_GPH1_nRTS0);
-
-}
-
-static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
-			 const char *buf, size_t count)
-{
-	unsigned long on = simple_strtoul(buf, NULL, 10);
-
-	if (!strcmp(attr->attr.name, "power_on")) {
-		gsm_on_off(dev, on);
-
-		return count;
-	}
-
-	if (!strcmp(attr->attr.name, "download")) {
-		/*
-		 * the keyboard / buttons driver requests and enables
-		 * the JACK_INSERT IRQ.  We have to take care about
-		 * not enabling and disabling the IRQ when it was
-		 * already in that state or we get "unblanaced IRQ"
-		 * kernel warnings and stack dumps.  So we use the
-		 * copy of the ndl_gsm state to figure out if we should
-		 * enable or disable the jack interrupt
-		 */
-		if (on) {
-			if (gta02_gsm.gpio_ndl_gsm)
-				disable_irq(gpio_to_irq(
-						   GTA02_GPIO_JACK_INSERT));
-		} else {
-			if (!gta02_gsm.gpio_ndl_gsm)
-				enable_irq(gpio_to_irq(
-						   GTA02_GPIO_JACK_INSERT));
-		}
-
-		gta02_gsm.gpio_ndl_gsm = !on;
-		s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, !on);
-
-		return count;
-	}
-
-	if (!strcmp(attr->attr.name, "flowcontrolled")) {
-		if (on) {
-			gta_gsm_interrupts = 0;
-			s3c2410_gpio_setpin(S3C2410_GPH1, 1);
-			s3c2410_gpio_cfgpin(S3C2410_GPH1, S3C2410_GPH1_OUTP);
-		} else
-			s3c2410_gpio_cfgpin(S3C2410_GPH1, S3C2410_GPH1_nRTS0);
-	}
-
-	return count;
-}
-
-static DEVICE_ATTR(power_on, 0644, gsm_read, gsm_write);
-static DEVICE_ATTR(reset, 0644, gsm_read, gsm_write);
-static DEVICE_ATTR(download, 0644, gsm_read, gsm_write);
-static DEVICE_ATTR(flowcontrolled, 0644, gsm_read, gsm_write);
-
-#ifdef CONFIG_PM
-
-static int gta02_gsm_resume(struct platform_device *pdev);
-static int gta02_gsm_suspend(struct platform_device *pdev, pm_message_t state)
-{
-	/* GPIO state is saved/restored by S3C2410 core GPIO driver, so we
-	 * don't need to do much here. */
-
-	/* If flowcontrol asserted, abort if GSM already interrupted */
-	if (s3c2410_gpio_getcfg(S3C2410_GPH1) == S3C2410_GPIO_OUTPUT) {
-		if (gta_gsm_interrupts)
-			goto busy;
-	}
-
-	/* disable DL GSM to prevent jack_insert becoming 'floating' */
-	s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, 1);
-	return 0;
-
-busy:
-	return -EBUSY;
-}
-
-static int
-gta02_gsm_suspend_late(struct platform_device *pdev, pm_message_t state)
-{
-	/* Last chance: abort if GSM already interrupted */
-	if (s3c2410_gpio_getcfg(S3C2410_GPH1) == S3C2410_GPIO_OUTPUT) {
-		if (gta_gsm_interrupts)
-			return -EBUSY;
-	}
-	return 0;
-}
-
-static int gta02_gsm_resume(struct platform_device *pdev)
-{
-	/* GPIO state is saved/restored by S3C2410 core GPIO driver, so we
-	 * don't need to do much here. */
-
-	/* Make sure that the kernel console on the serial port is still
-	 * disabled. FIXME: resume ordering race with serial driver! */
-	if (gta02_gsm.con && s3c2410_gpio_getpin(GTA02_GPIO_MODEM_ON))
-		console_stop(gta02_gsm.con);
-
-	s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, gta02_gsm.gpio_ndl_gsm);
-
-	return 0;
-}
-#else
-#define gta02_gsm_suspend	NULL
-#define gta02_gsm_suspend_late	NULL
-#define gta02_gsm_resume	NULL
-#endif /* CONFIG_PM */
-
-static struct attribute *gta02_gsm_sysfs_entries[] = {
-	&dev_attr_power_on.attr,
-	&dev_attr_reset.attr,
-	&dev_attr_download.attr,
-	&dev_attr_flowcontrolled.attr,
-	NULL
-};
-
-static struct attribute_group gta02_gsm_attr_group = {
-	.name	= NULL,
-	.attrs	= gta02_gsm_sysfs_entries,
-};
-
-static int __init gta02_gsm_probe(struct platform_device *pdev)
-{
-	switch (S3C_SYSTEM_REV_ATAG) {
-	case GTA02v1_SYSTEM_REV:
-	case GTA02v2_SYSTEM_REV:
-	case GTA02v3_SYSTEM_REV:
-	case GTA02v4_SYSTEM_REV:
-	case GTA02v5_SYSTEM_REV:
-	case GTA02v6_SYSTEM_REV:
-		break;
-	default:
-		dev_warn(&pdev->dev, "Unknown Freerunner Revision 0x%x, "
-			 "some PM features not available!!!\n",
-			 system_rev);
-		break;
-	}
-
-	gta02_gsm.con = find_s3c24xx_console();
-	if (!gta02_gsm.con)
-		dev_warn(&pdev->dev,
-			 "cannot find S3C24xx console driver\n");
-
-	/* note that download initially disabled, and enforce that */
-	gta02_gsm.gpio_ndl_gsm = 1;
-	s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, 1);
-
-	/* GSM is to be initially off (at boot, or if this module inserted) */
-	gsm_on_off(&pdev->dev, 0);
-
-	return sysfs_create_group(&pdev->dev.kobj, &gta02_gsm_attr_group);
-}
-
-static int gta02_gsm_remove(struct platform_device *pdev)
-{
-	sysfs_remove_group(&pdev->dev.kobj, &gta02_gsm_attr_group);
-
-	return 0;
-}
-
-static struct platform_driver gta02_gsm_driver = {
-	.probe		= gta02_gsm_probe,
-	.remove		= gta02_gsm_remove,
-	.suspend	= gta02_gsm_suspend,
-	.suspend_late	= gta02_gsm_suspend_late,
-	.resume		= gta02_gsm_resume,
-	.driver		= {
-		.name		= "gta02-pm-gsm",
-	},
-};
-
-static int __devinit gta02_gsm_init(void)
-{
-	return platform_driver_register(&gta02_gsm_driver);
-}
-
-static void gta02_gsm_exit(void)
-{
-	platform_driver_unregister(&gta02_gsm_driver);
-}
-
-module_init(gta02_gsm_init);
-module_exit(gta02_gsm_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
-MODULE_DESCRIPTION("Openmoko Freerunner GSM Power Management");
diff --git a/target/linux/s3c24xx/files-2.6.30/arch/arm/mach-s3c2442/gta02-pm-wlan.c b/target/linux/s3c24xx/files-2.6.30/arch/arm/mach-s3c2442/gta02-pm-wlan.c
deleted file mode 100644
index 9cb8e6a5e..000000000
--- a/target/linux/s3c24xx/files-2.6.30/arch/arm/mach-s3c2442/gta02-pm-wlan.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * GTA02 WLAN power management
- *
- * (C) 2008, 2009 by Openmoko Inc.
- * Author: Andy Green <andy@openmoko.com>
- * All rights reserved.
- *
- * 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
- *
- */
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/mutex.h>
-#include <linux/platform_device.h>
-
-#include <mach/hardware.h>
-#include <asm/mach-types.h>
-
-#include <mach/gta02.h>
-#include <mach/gta02-pm-wlan.h>
-#include <mach/regs-gpio.h>
-#include <mach/regs-gpioj.h>
-
-#include <linux/delay.h>
-#include <linux/rfkill.h>
-
-
-/* ----- Module hardware reset ("power") ----------------------------------- */
-
-
-void gta02_wlan_reset(int assert_reset)
-{
-	if (assert_reset) {
-		s3c2410_gpio_setpin(GTA02_GPIO_nWLAN_RESET, 0);
-		msleep(200); /* probably excessive but we don't have specs */
-	} else {
-		s3c2410_gpio_setpin(GTA02_GPIO_nWLAN_RESET, 1);
-	}
-}
-
-/* ----- rfkill ------------------------------------------------------------ */
-
-/*
- * S3C MCI handles suspend/resume through device removal/insertion. In order to
- * preserve rfkill state, as required in clause 7 of section 3.1 in rfkill.txt,
- * we therefore need to maintain rfkill state outside the driver.
- *
- * This platform driver is as good a place as any other.
- */
-
-static int (*gta02_wlan_rfkill_cb)(void *user, int on);
-static void *gta02_wlan_rfkill_user;
-static DEFINE_MUTEX(gta02_wlan_rfkill_lock);
-static int gta02_wlan_rfkill_on;
-
-/*
- * gta02_wlan_query_rfkill_lock is used to obtain the rfkill state before the
- * driver is ready to process rfkill callbacks. To prevent the state from
- * changing until the driver has completed its initialization, we grab and hold
- * the rfkill lock.
- *
- * A call to gta02_wlan_query_rfkill_lock must be followed by either
- * - a call to gta02_wlan_set_rfkill_cb, to complete the setup, or
- * - a call to gta02_wlan_query_rfkill_unlock to abort the setup process.
- */
-
-int gta02_wlan_query_rfkill_lock(void)
-{
-	mutex_lock(&gta02_wlan_rfkill_lock);
-	return gta02_wlan_rfkill_on;
-}
-EXPORT_SYMBOL_GPL(gta02_wlan_query_rfkill_lock);
-
-void gta02_wlan_query_rfkill_unlock(void)
-{
-	mutex_unlock(&gta02_wlan_rfkill_lock);
-}
-EXPORT_SYMBOL_GPL(gta02_wlan_query_rfkill_unlock);
-
-void gta02_wlan_set_rfkill_cb(int (*cb)(void *user, int on), void *user)
-{
-	BUG_ON(!mutex_is_locked(&gta02_wlan_rfkill_lock));
-	BUG_ON(gta02_wlan_rfkill_cb);
-	gta02_wlan_rfkill_cb = cb;
-	gta02_wlan_rfkill_user = user;
-	mutex_unlock(&gta02_wlan_rfkill_lock);
-}
-EXPORT_SYMBOL_GPL(gta02_wlan_set_rfkill_cb);
-
-void gta02_wlan_clear_rfkill_cb(void)
-{
-	mutex_lock(&gta02_wlan_rfkill_lock);
-	BUG_ON(!gta02_wlan_rfkill_cb);
-	gta02_wlan_rfkill_cb = NULL;
-	mutex_unlock(&gta02_wlan_rfkill_lock);
-}
-EXPORT_SYMBOL_GPL(gta02_wlan_clear_rfkill_cb);
-
-static int gta02_wlan_toggle_radio(void *data, enum rfkill_state state)
-{
-	struct device *dev = data;
-	int on = state == RFKILL_STATE_UNBLOCKED;
-	int res = 0;
-
-	dev_dbg(dev, "gta02_wlan_toggle_radio: state %d (%p)\n",
-	    state, gta02_wlan_rfkill_cb);
-	mutex_lock(&gta02_wlan_rfkill_lock);
-	if (gta02_wlan_rfkill_cb)
-		res = gta02_wlan_rfkill_cb(gta02_wlan_rfkill_user, on);
-	if (!res)
-		gta02_wlan_rfkill_on = on;
-	mutex_unlock(&gta02_wlan_rfkill_lock);
-	return res;
-}
-
-
-/* ----- Initialization/removal -------------------------------------------- */
-
-
-static int __init gta02_wlan_probe(struct platform_device *pdev)
-{
-	/* default-on for now */
-	const int default_state = 1;
-	struct rfkill *rfkill;
-	int error;
-
-	dev_info(&pdev->dev, "starting\n");
-
-	s3c2410_gpio_cfgpin(GTA02_GPIO_nWLAN_RESET, S3C2410_GPIO_OUTPUT);
-	gta02_wlan_reset(1);
-	gta02_wlan_reset(0);
-
-	rfkill = rfkill_allocate(&pdev->dev, RFKILL_TYPE_WLAN);
-	rfkill->name = "ar6000";
-	rfkill->data = &pdev->dev;
-	rfkill->state = default_state ? RFKILL_STATE_ON : RFKILL_STATE_OFF;
-	/*
-	 * If the WLAN driver somehow managed to get activated before we're
-	 * ready, the driver is now in an unknown state, which isn't something
-	 * we're prepared to handle. This can't happen, so just fail hard.
-	 */
-	BUG_ON(gta02_wlan_rfkill_cb);
-	gta02_wlan_rfkill_on = default_state;
-	rfkill->toggle_radio = gta02_wlan_toggle_radio;
-
-	error = rfkill_register(rfkill);
-	if (error) {
-		rfkill_free(rfkill);
-		return error;
-	}
-
-	dev_set_drvdata(&pdev->dev, rfkill);
-
-	return 0;
-}
-
-static int gta02_wlan_remove(struct platform_device *pdev)
-{
-	struct rfkill *rfkill = dev_get_drvdata(&pdev->dev);
-
-	rfkill_unregister(rfkill);
-	rfkill_free(rfkill);
-
-	return 0;
-}
-
-static struct platform_driver gta02_wlan_driver = {
-	.probe		= gta02_wlan_probe,
-	.remove		= gta02_wlan_remove,
-	.driver		= {
-		.name		= "gta02-pm-wlan",
-	},
-};
-
-static int __devinit gta02_wlan_init(void)
-{
-	return platform_driver_register(&gta02_wlan_driver);
-}
-
-static void gta02_wlan_exit(void)
-{
-	platform_driver_unregister(&gta02_wlan_driver);
-}
-
-module_init(gta02_wlan_init);
-module_exit(gta02_wlan_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Andy Green <andy@openmoko.com>");
-MODULE_DESCRIPTION("Openmoko GTA02 WLAN power management");
diff --git a/target/linux/s3c24xx/files-2.6.30/arch/arm/mach-s3c2442/include/mach/gta02-pm-gps.h b/target/linux/s3c24xx/files-2.6.30/arch/arm/mach-s3c2442/include/mach/gta02-pm-gps.h
deleted file mode 100644
index f15180ac0..000000000
--- a/target/linux/s3c24xx/files-2.6.30/arch/arm/mach-s3c2442/include/mach/gta02-pm-gps.h
+++ /dev/null
@@ -1 +0,0 @@
-extern int gta02_pm_gps_is_on(void);
diff --git a/target/linux/s3c24xx/files-2.6.30/arch/arm/mach-s3c2442/include/mach/gta02-pm-gsm.h b/target/linux/s3c24xx/files-2.6.30/arch/arm/mach-s3c2442/include/mach/gta02-pm-gsm.h
deleted file mode 100644
index 07c072803..000000000
--- a/target/linux/s3c24xx/files-2.6.30/arch/arm/mach-s3c2442/include/mach/gta02-pm-gsm.h
+++ /dev/null
@@ -1 +0,0 @@
-extern int gta_gsm_interrupts;
diff --git a/target/linux/s3c24xx/files-2.6.30/arch/arm/mach-s3c2442/include/mach/gta02-pm-wlan.h b/target/linux/s3c24xx/files-2.6.30/arch/arm/mach-s3c2442/include/mach/gta02-pm-wlan.h
deleted file mode 100644
index 483697897..000000000
--- a/target/linux/s3c24xx/files-2.6.30/arch/arm/mach-s3c2442/include/mach/gta02-pm-wlan.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef __MACH_GTA02_PM_WLAN_H
-#define __MACH_GTA02_PM_WLAN_H
-
-void gta02_wlan_reset(int assert_reset);
-int gta02_wlan_query_rfkill_lock(void);
-void gta02_wlan_query_rfkill_unlock(void);
-void gta02_wlan_set_rfkill_cb(int (*cb)(void *user, int on), void *user);
-void gta02_wlan_clear_rfkill_cb(void);
-
-#endif /* __MACH_GTA02_PM_WLAN_H */
diff --git a/target/linux/s3c24xx/files-2.6.30/arch/arm/mach-s3c2442/include/mach/gta02.h b/target/linux/s3c24xx/files-2.6.30/arch/arm/mach-s3c2442/include/mach/gta02.h
deleted file mode 100644
index 3d7606e9b..000000000
--- a/target/linux/s3c24xx/files-2.6.30/arch/arm/mach-s3c2442/include/mach/gta02.h
+++ /dev/null
@@ -1,89 +0,0 @@
-#ifndef _GTA02_H
-#define _GTA02_H
-
-#include <mach/regs-gpio.h>
-#include <mach/gpio.h>
-#include <mach/irqs.h>
-
-/* Different hardware revisions, passed in ATAG_REVISION by u-boot */
-#define GTA02v1_SYSTEM_REV	0x00000310
-#define GTA02v2_SYSTEM_REV	0x00000320
-#define GTA02v3_SYSTEM_REV	0x00000330
-#define GTA02v4_SYSTEM_REV	0x00000340
-#define GTA02v5_SYSTEM_REV	0x00000350
-#define GTA02v6_SYSTEM_REV	0x00000360
-
-#define GTA02_GPIO_n3DL_GSM	S3C2410_GPA13	/* v1 + v2 + v3 only */
-
-#define GTA02_GPIO_PWR_LED1	S3C2410_GPB0
-#define GTA02_GPIO_PWR_LED2	S3C2410_GPB1
-#define GTA02_GPIO_AUX_LED	S3C2410_GPB2
-#define GTA02_GPIO_VIBRATOR_ON	S3C2410_GPB3
-#define GTA02_GPIO_MODEM_RST	S3C2410_GPB5
-#define GTA02_GPIO_BT_EN	S3C2410_GPB6
-#define GTA02_GPIO_MODEM_ON	S3C2410_GPB7
-#define GTA02_GPIO_EXTINT8	S3C2410_GPB8
-#define GTA02_GPIO_USB_PULLUP	S3C2410_GPB9
-
-#define GTA02_GPIO_PIO5		S3C2410_GPC5	/* v3 + v4 only */
-#define GTA02v3_GPIO_nG1_CS	S3C2410_GPD12	/* v3 + v4 only */
-#define GTA02v3_GPIO_nG2_CS	S3C2410_GPD13	/* v3 + v4 only */
-#define GTA02v5_GPIO_HDQ	S3C2410_GPD14   /* v5 + */
-
-#define GTA02_GPIO_nG1_INT	S3C2410_GPF0
-#define GTA02_GPIO_IO1		S3C2410_GPF1
-#define GTA02_GPIO_PIO_2	S3C2410_GPF2	/* v2 + v3 + v4 only */
-#define GTA02_GPIO_JACK_INSERT	S3C2410_GPF4
-#define GTA02_GPIO_WLAN_GPIO1	S3C2410_GPF5	/* v2 + v3 + v4 only */
-#define GTA02_GPIO_AUX_KEY	S3C2410_GPF6
-#define GTA02_GPIO_HOLD_KEY	S3C2410_GPF7
-
-#define GTA02_GPIO_3D_IRQ	S3C2410_GPG4
-#define GTA02v2_GPIO_nG2_INT	S3C2410_GPG8	/* v2 + v3 + v4 only */
-#define GTA02v3_GPIO_nUSB_OC	S3C2410_GPG9	/* v3 + v4 only */
-#define GTA02v3_GPIO_nUSB_FLT	S3C2410_GPG10	/* v3 + v4 only */
-#define GTA02v3_GPIO_nGSM_OC	S3C2410_GPG11	/* v3 + v4 only */
-
-#define GTA02_GPIO_AMP_SHUT	S3C2440_GPJ1	/* v2 + v3 + v4 only */
-#define GTA02v1_GPIO_WLAN_GPIO10	S3C2440_GPJ2
-#define GTA02_GPIO_HP_IN	S3C2440_GPJ2	/* v2 + v3 + v4 only */
-#define GTA02_GPIO_INT0		S3C2440_GPJ3	/* v2 + v3 + v4 only */
-#define GTA02_GPIO_nGSM_EN	S3C2440_GPJ4
-#define GTA02_GPIO_3D_RESET	S3C2440_GPJ5
-#define GTA02_GPIO_nDL_GSM	S3C2440_GPJ6	/* v4 + v5 only */
-#define GTA02_GPIO_WLAN_GPIO0	S3C2440_GPJ7
-#define GTA02v1_GPIO_BAT_ID	S3C2440_GPJ8
-#define GTA02_GPIO_KEEPACT	S3C2440_GPJ8
-#define GTA02v1_GPIO_HP_IN	S3C2440_GPJ10
-#define GTA02_CHIP_PWD		S3C2440_GPJ11	/* v2 + v3 + v4 only */
-#define GTA02_GPIO_nWLAN_RESET	S3C2440_GPJ12	/* v2 + v3 + v4 only */
-
-#define GTA02_IRQ_GSENSOR_1	IRQ_EINT0
-#define GTA02_IRQ_MODEM		IRQ_EINT1
-#define GTA02_IRQ_PIO_2		IRQ_EINT2	/* v2 + v3 + v4 only */
-#define GTA02_IRQ_nJACK_INSERT	IRQ_EINT4
-#define GTA02_IRQ_WLAN_GPIO1	IRQ_EINT5
-#define GTA02_IRQ_AUX		IRQ_EINT6
-#define GTA02_IRQ_nHOLD		IRQ_EINT7
-#define GTA02_IRQ_PCF50633	IRQ_EINT9
-#define GTA02_IRQ_3D		IRQ_EINT12
-#define GTA02_IRQ_GSENSOR_2	IRQ_EINT16	/* v2 + v3 + v4 only */
-#define GTA02v3_IRQ_nUSB_OC	IRQ_EINT17	/* v3 + v4 only */
-#define GTA02v3_IRQ_nUSB_FLT	IRQ_EINT18	/* v3 + v4 only */
-#define GTA02v3_IRQ_nGSM_OC	IRQ_EINT19	/* v3 + v4 only */
-
-/* returns 00 000 on GTA02 A5 and earlier, A6 returns 01 001 */
-#define GTA02_PCB_ID1_0		S3C2410_GPC13
-#define GTA02_PCB_ID1_1		S3C2410_GPC15
-#define GTA02_PCB_ID1_2		S3C2410_GPD0
-#define GTA02_PCB_ID2_0		S3C2410_GPD3
-#define GTA02_PCB_ID2_1		S3C2410_GPD4
-
-#define GTA02_GPIO_GLAMO_BASE S3C_GPIO_END
-#define GTA02_GPIO_GLAMO(x) (GTA02_GPIO_GLAMO_BASE + x)
-
-int gta02_get_pcb_revision(void);
-
-extern struct pcf50633 *gta02_pcf;
-
-#endif /* _GTA02_H */
diff --git a/target/linux/s3c24xx/files-2.6.30/arch/arm/mach-s3c2442/mach-gta02.c b/target/linux/s3c24xx/files-2.6.30/arch/arm/mach-s3c2442/mach-gta02.c
deleted file mode 100644
index 49ab6c43b..000000000
--- a/target/linux/s3c24xx/files-2.6.30/arch/arm/mach-s3c2442/mach-gta02.c
+++ /dev/null
@@ -1,1806 +0,0 @@
-/*
- * linux/arch/arm/mach-s3c2442/mach-gta02.c
- *
- * S3C2442 Machine Support for the Openmoko Freerunner (GTA02)
- *
- * Copyright (C) 2006-2007 by Openmoko, Inc.
- * Author: Harald Welte <laforge@openmoko.org>
- * All rights reserved.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/interrupt.h>
-#include <linux/list.h>
-#include <linux/delay.h>
-#include <linux/timer.h>
-#include <linux/init.h>
-#include <linux/workqueue.h>
-#include <linux/platform_device.h>
-#include <linux/serial_core.h>
-#include <linux/spi/spi.h>
-#include <linux/spi/spi_gpio.h>
-#include <linux/spi/spi_bitbang.h>
-#include <linux/mmc/host.h>
-#include <linux/leds.h>
-#include <linux/gpio_keys.h>
-
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
-#include <linux/mtd/nand_ecc.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/physmap.h>
-
-#include <linux/i2c.h>
-#include <linux/backlight.h>
-#include <linux/regulator/machine.h>
-
-#include <linux/mfd/pcf50633/core.h>
-#include <linux/mfd/pcf50633/mbc.h>
-#include <linux/mfd/pcf50633/adc.h>
-#include <linux/mfd/pcf50633/gpio.h>
-#include <linux/mfd/pcf50633/pmic.h>
-
-#include <linux/lis302dl.h>
-
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/mach/irq.h>
-
-#include <mach/hardware.h>
-#include <mach/io.h>
-#include <asm/irq.h>
-#include <asm/mach-types.h>
-
-#include <mach/regs-irq.h>
-#include <mach/regs-gpio.h>
-#include <mach/regs-gpioj.h>
-#include <mach/fb.h>
-#include <mach/mci.h>
-#include <mach/ts.h>
-#include <mach/spi.h>
-#include <mach/spi-gpio.h>
-#include <mach/regs-mem.h>
-#include <plat/pwm.h>
-#include <mach/cpu.h>
-
-#include <mach/gta02.h>
-
-#include <plat/regs-serial.h>
-#include <plat/nand.h>
-#include <plat/devs.h>
-#include <plat/cpu.h>
-#include <plat/pm.h>
-#include <plat/udc.h>
-#include <plat/iic.h>
-#include <plat/usb-control.h>
-#include <plat/regs-timer.h>
-#include <plat/gpio-core.h>
-
-#include <mach/gta02-pm-gsm.h>
-#include <mach/gta02-pm-gps.h>
-#include <mach/gta02-pm-wlan.h>
-
-#include <linux/jbt6k74.h>
-#include <linux/glamofb.h>
-#include <linux/mfd/glamo.h>
-
-#include <linux/hdq.h>
-#include <linux/bq27000_battery.h>
-
-#include <linux/touchscreen/ts_filter_chain.h>
-#ifdef CONFIG_TOUCHSCREEN_FILTER
-#include <linux/touchscreen/ts_filter_linear.h>
-#include <linux/touchscreen/ts_filter_mean.h>
-#include <linux/touchscreen/ts_filter_median.h>
-#include <linux/touchscreen/ts_filter_group.h>
-#endif
-
-#include <asm/fiq.h>
-
-#include <linux/gta02-vibrator.h>
-
-/* arbitrates which sensor IRQ owns the shared SPI bus */
-static spinlock_t motion_irq_lock;
-
-
-/* -------------------------------------------------------------------------------
- * GTA02 FIQ related
- *
- * Calls into vibrator and hdq and based on the return values
- * determines if we the FIQ source be kept alive
- */
-
-#define DIVISOR_FROM_US(x) ((x) << 3)
-
-#ifdef CONFIG_HDQ_GPIO_BITBANG
-#define FIQ_DIVISOR_HDQ DIVISOR_FROM_US(HDQ_SAMPLE_PERIOD_US)
-extern int hdq_fiq_handler(void);
-#endif
-
-#ifdef CONFIG_LEDS_GTA02_VIBRATOR
-#define FIQ_DIVISOR_VIBRATOR DIVISOR_FROM_US(100)
-extern int gta02_vibrator_fiq_handler(void);
-#endif
-
-#if defined(CONFIG_LEDS_GTA02_VIBRATOR) || defined(CONFIG_HDQ_GPIO_BITBANG)
-
-/* Global data related to our fiq source */
-static u32 gta02_fiq_ack_mask;
-static struct s3c2410_pwm gta02_fiq_pwm_timer;
-static u16 gta02_fiq_timer_index;
-static int gta02_fiq_irq;
-
-static void gta02_fiq_handler(void)
-{
-	u16 divisor = 0xffff;
-
-	/* Vibrator servicing */
-
-	/* disable further timer interrupts if nobody has any work
-	 * or adjust rate according to who still has work
-	 *
-	 * CAUTION: it means forground code must disable FIQ around
-	 * its own non-atomic S3C2410_INTMSK changes... not common
-	 * thankfully and taken care of by the fiq-basis patch
-	 */
-
-#ifdef CONFIG_LEDS_GTA02_VIBRATOR
-	if (gta02_vibrator_fiq_handler())
-		divisor = FIQ_DIVISOR_VIBRATOR;
-#endif
-
-#ifdef CONFIG_HDQ_GPIO_BITBANG
-	if (hdq_fiq_handler())
-		divisor = FIQ_DIVISOR_HDQ;
-#endif
-
-	if (divisor == 0xffff) /* mask the fiq irq source */
-		__raw_writel(__raw_readl(S3C2410_INTMSK) | gta02_fiq_ack_mask,
-			     S3C2410_INTMSK);
-	else /* still working, maybe at a different rate */
-		__raw_writel(divisor, S3C2410_TCNTB(gta02_fiq_timer_index));
-
-	__raw_writel(gta02_fiq_ack_mask, S3C2410_SRCPND);
-}
-
-static void gta02_fiq_kick(void)
-{
-	unsigned long flags;
-	u32 tcon;
-
-	/* we have to take care about FIQ because this modification is
-	 * non-atomic, FIQ could come in after the read and before the
-	 * writeback and its changes to the register would be lost
-	 * (platform INTMSK mod code is taken care of already)
-	 */
-	local_save_flags(flags);
-	local_fiq_disable();
-	/* allow FIQs to resume */
-	__raw_writel(__raw_readl(S3C2410_INTMSK) &
-		     ~(1 << (gta02_fiq_irq - S3C2410_CPUIRQ_OFFSET)),
-		     S3C2410_INTMSK);
-	tcon = __raw_readl(S3C2410_TCON) & ~S3C2410_TCON_T3START;
-	/* fake the timer to a count of 1 */
-	__raw_writel(1, S3C2410_TCNTB(gta02_fiq_timer_index));
-	__raw_writel(tcon | S3C2410_TCON_T3MANUALUPD, S3C2410_TCON);
-	__raw_writel(tcon | S3C2410_TCON_T3MANUALUPD | S3C2410_TCON_T3START,
-		     S3C2410_TCON);
-	__raw_writel(tcon | S3C2410_TCON_T3START, S3C2410_TCON);
-	local_irq_restore(flags);
-}
-
-static int gta02_fiq_enable(void)
-{
-	int irq_index_fiq = IRQ_TIMER3;
-	int rc = 0;
-
-	local_fiq_disable();
-
-	gta02_fiq_irq = irq_index_fiq;
-	gta02_fiq_ack_mask = 1 << (irq_index_fiq - S3C2410_CPUIRQ_OFFSET);
-	gta02_fiq_timer_index = (irq_index_fiq - IRQ_TIMER0);
-
-	/* set up the timer to operate as a pwm device */
-
-	rc = s3c2410_pwm_init(&gta02_fiq_pwm_timer);
-	if (rc)
-		goto bail;
-
-	gta02_fiq_pwm_timer.timerid = PWM0 + gta02_fiq_timer_index;
-	gta02_fiq_pwm_timer.prescaler = (6 - 1) / 2;
-	gta02_fiq_pwm_timer.divider = S3C2410_TCFG1_MUX3_DIV2;
-	/* default rate == ~32us */
-	gta02_fiq_pwm_timer.counter = gta02_fiq_pwm_timer.comparer = 3000;
-
-	rc = s3c2410_pwm_enable(&gta02_fiq_pwm_timer);
-	if (rc)
-		goto bail;
-
-	s3c2410_pwm_start(&gta02_fiq_pwm_timer);
-
-	/* let our selected interrupt be a magic FIQ interrupt */
-	__raw_writel(gta02_fiq_ack_mask, S3C2410_INTMOD);
-
-	/* it's ready to go as soon as we unmask the source in S3C2410_INTMSK */
-	local_fiq_enable();
-
-	set_fiq_c_handler(gta02_fiq_handler);
-
-	return 0;
-
-bail:
-	printk(KERN_ERR "Could not initialize FIQ for GTA02: %d\n", rc);
-
-	return rc;
-}
-
-static void gta02_fiq_disable(void)
-{
-	__raw_writel(0, S3C2410_INTMOD);
-	local_fiq_disable();
-	gta02_fiq_irq = 0; /* no active source interrupt now either */
-
-}
-/* -------------------- /GTA02 FIQ Handler ------------------------------------- */
-
-#endif
-
-/*
- * this gets called every 1ms when we paniced.
- */
-
-static long gta02_panic_blink(long count)
-{
-	long delay = 0;
-	static long last_blink;
-	static char led;
-
-	if (count - last_blink < 100) /* 200ms period, fast blink */
-		return 0;
-
-	led ^= 1;
-	s3c2410_gpio_cfgpin(GTA02_GPIO_AUX_LED, S3C2410_GPIO_OUTPUT);
-	s3c2410_gpio_setpin(GTA02_GPIO_AUX_LED, led);
-
-	last_blink = count;
-	return delay;
-}
-
-
-/**
- * returns PCB revision information in b9,b8 and b2,b1,b0
- * Pre-GTA02 A6 returns 0x000
- *     GTA02 A6 returns 0x101
- *     ...
- */
-
-int gta02_get_pcb_revision(void)
-{
-	int n;
-	int u = 0;
-	static unsigned long pinlist[] = {
-		GTA02_PCB_ID1_0,
-		GTA02_PCB_ID1_1,
-		GTA02_PCB_ID1_2,
-		GTA02_PCB_ID2_0,
-		GTA02_PCB_ID2_1,
-	};
-	static int pin_offset[] = {
-		0, 1, 2, 8, 9
-	};
-
-	for (n = 0 ; n < ARRAY_SIZE(pinlist); n++) {
-		/*
-		 * set the PCB version GPIO to be pulled-down input
-		 * force low briefly first
-		 */
-		s3c2410_gpio_cfgpin(pinlist[n], S3C2410_GPIO_OUTPUT);
-		s3c2410_gpio_setpin(pinlist[n], 0);
-		/* misnomer: it is a pullDOWN in 2442 */
-		s3c2410_gpio_pullup(pinlist[n], 1);
-		s3c2410_gpio_cfgpin(pinlist[n], S3C2410_GPIO_INPUT);
-
-		udelay(10);
-
-		if (s3c2410_gpio_getpin(pinlist[n]))
-			u |= 1 << pin_offset[n];
-
-		/*
-		* when not being interrogated, all of the revision GPIO
-		* are set to output HIGH without pulldown so no current flows
-		* if they are NC or pulled up.
-		*/
-		s3c2410_gpio_setpin(pinlist[n], 1);
-		s3c2410_gpio_cfgpin(pinlist[n], S3C2410_GPIO_OUTPUT);
-		/* misnomer: it is a pullDOWN in 2442 */
-		s3c2410_gpio_pullup(pinlist[n], 0);
-	}
-
-	return u;
-}
-
-struct platform_device gta02_resume_reason_device = {
-	.name 		= "gta02-resume",
-	.num_resources	= 0,
-};
-
-static struct map_desc gta02_iodesc[] __initdata = {
-	{
-		.virtual	= 0xe0000000,
-		.pfn		= __phys_to_pfn(S3C2410_CS3+0x01000000),
-		.length		= SZ_1M,
-		.type		= MT_DEVICE
-	},
-};
-
-#define UCON (S3C2410_UCON_DEFAULT | S3C2443_UCON_RXERR_IRQEN)
-#define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB
-#define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE
-
-static struct s3c2410_uartcfg gta02_uartcfgs[] = {
-	[0] = {
-		.hwport	     = 0,
-		.flags	     = 0,
-		.ucon	     = UCON,
-		.ulcon	     = ULCON,
-		.ufcon	     = UFCON,
-	},
-	[1] = {
-		.hwport	     = 1,
-		.flags	     = 0,
-		.ucon	     = UCON,
-		.ulcon	     = ULCON,
-		.ufcon	     = UFCON,
-	},
-	[2] = {
-		.hwport	     = 2,
-		.flags	     = 0,
-		.ucon	     = UCON,
-		.ulcon	     = ULCON,
-		.ufcon	     = UFCON,
-	},
-
-};
-
-struct pcf50633 *gta02_pcf;
-
-#ifdef CONFIG_CHARGER_PCF50633
-#ifdef CONFIG_HDQ_GPIO_BITBANG
-static int gta02_get_charger_online_status(void)
-{
-	struct pcf50633 *pcf = gta02_pcf;
-
-	return pcf50633_mbc_get_status(pcf) & PCF50633_MBC_USB_ONLINE;
-}
-
-static int gta02_get_charger_active_status(void)
-{
-	struct pcf50633 *pcf = gta02_pcf;
-
-	return pcf50633_mbc_get_status(pcf) & PCF50633_MBC_USB_ACTIVE;
-}
-#endif
-
-#define ADC_NOM_CHG_DETECT_1A 6
-#define ADC_NOM_CHG_DETECT_USB 43
-
-static void
-gta02_configure_pmu_for_charger(struct pcf50633 *pcf, void *unused, int res)
-{
-	int  ma;
-
-	/* Interpret charger type */
-	if (res < ((ADC_NOM_CHG_DETECT_USB + ADC_NOM_CHG_DETECT_1A) / 2)) {
-
-		/* Stop GPO driving out now that we have a IA charger */
-		pcf50633_gpio_set(pcf, PCF50633_GPO, 0);
-
-		ma = 1000;
-	} else
-		ma = 100;
-
-	pcf50633_mbc_usb_curlim_set(pcf, ma);
-}
-
-static struct delayed_work gta02_charger_work;
-static int gta02_usb_vbus_draw;
-
-static void gta02_charger_worker(struct work_struct *work)
-{
-	struct pcf50633 *pcf = gta02_pcf;
-
-	if (gta02_usb_vbus_draw) {
-		pcf50633_mbc_usb_curlim_set(pcf, gta02_usb_vbus_draw);
-		return;
-	} else {
-#ifdef CONFIG_PCF50633_ADC
-		pcf50633_adc_async_read(pcf,
-			PCF50633_ADCC1_MUX_ADCIN1,
-			PCF50633_ADCC1_AVERAGE_16,
-			gta02_configure_pmu_for_charger, NULL);
-#else
-		/* If the PCF50633 ADC is disabled we fallback to a 100mA limit for safety. */
-		pcf50633_mbc_usb_curlim_set(pcf, 100);
-#endif
-		return;
-	}
-}
-
-#define GTA02_CHARGER_CONFIGURE_TIMEOUT ((3000 * HZ) / 1000)
-static void gta02_pmu_event_callback(struct pcf50633 *pcf, int irq)
-{
-	if (irq == PCF50633_IRQ_USBINS) {
-		schedule_delayed_work(&gta02_charger_work,
-				GTA02_CHARGER_CONFIGURE_TIMEOUT);
-		return;
-	} else if (irq == PCF50633_IRQ_USBREM) {
-		cancel_delayed_work_sync(&gta02_charger_work);
-		gta02_usb_vbus_draw = 0;
-	}
-}
-
-static void gta02_pmu_force_shutdown(struct pcf50633 *pcf)
-{
-	pcf50633_reg_set_bit_mask(pcf, PCF50633_REG_OOCSHDWN,
-			PCF50633_OOCSHDWN_GOSTDBY, PCF50633_OOCSHDWN_GOSTDBY);
-}
-
-
-static void gta02_udc_vbus_draw(unsigned int ma)
-{
-	if (!gta02_pcf)
-		return;
-
-	gta02_usb_vbus_draw = ma;
-
-	schedule_delayed_work(&gta02_charger_work,
-				GTA02_CHARGER_CONFIGURE_TIMEOUT);
-}
-
-static int gta02_udc_vbus_status(void)
-{
-	struct pcf50633 *pcf = gta02_pcf;
-	if (!gta02_pcf)
-		return -ENODEV;
-
-	return !!(pcf50633_mbc_get_status(pcf) & PCF50633_MBC_USB_ONLINE);
-}
-
-#else /* !CONFIG_CHARGER_PCF50633 */
-#ifdef CONFIG_HDQ_GPIO_BITBANG
-#define gta02_get_charger_online_status NULL
-#define gta02_get_charger_active_status NULL
-#endif
-#define gta02_pmu_event_callback        NULL
-#define gta02_udc_vbus_draw             NULL
-#define gta02_udc_vbus_status		NULL
-#endif
-
-
-static struct platform_device gta02_pm_gps_dev = {
-	.name		= "gta02-pm-gps",
-};
-
-static struct platform_device gta02_pm_bt_dev = {
-	.name		= "gta02-pm-bt",
-};
-
-static struct platform_device gta02_pm_gsm_dev = {
-	.name		= "gta02-pm-gsm",
-};
-
-static struct platform_device gta02_pm_wlan_dev = {
-	.name		= "gta02-pm-wlan",
-};
-
-/* this is called when pc50633 is probed, unfortunately quite late in the
- * day since it is an I2C bus device.  Here we can belatedly define some
- * platform devices with the advantage that we can mark the pcf50633 as the
- * parent.  This makes them get suspended and resumed with their parent
- * the pcf50633 still around.
- */
-
-static struct platform_device gta02_glamo_dev;
-static void mangle_glamo_res_by_system_rev(void);
-
-static void gta02_pmu_attach_child_devices(struct pcf50633 *pcf);
-static void gta02_pmu_regulator_registered(struct pcf50633 *pcf, int id);
-
-static struct regulator_consumer_supply ldo4_consumers[] = {
-	{
-		.dev = &gta02_pm_bt_dev.dev,
-		.supply = "BT_3V2",
-	},
-};
-
-static struct regulator_consumer_supply ldo5_consumers[] = {
-	{
-		.dev = &gta02_pm_gps_dev.dev,
-		.supply = "RF_3V",
-	},
-};
-
-static struct regulator_consumer_supply hcldo_consumers[] = {
-	{
-		.dev = &gta02_glamo_dev.dev,
-		.supply = "SD_3V3",
-	},
-};
-
-static char *gta02_batteries[] = {
-	"battery",
-};
-
-#ifdef CONFIG_CHARGER_PCF50633
-
-struct pcf50633_platform_data gta02_pcf_pdata = {
-	.resumers = {
-		[0] = 	PCF50633_INT1_USBINS |
-			PCF50633_INT1_USBREM |
-			PCF50633_INT1_ALARM,
-		[1] = 	PCF50633_INT2_ONKEYF,
-		[2] = 	PCF50633_INT3_ONKEY1S,
-		[3] = 	PCF50633_INT4_LOWSYS |
-			PCF50633_INT4_LOWBAT |
-			PCF50633_INT4_HIGHTMP,
-	},
-
-	.batteries = gta02_batteries,
-	.num_batteries = ARRAY_SIZE(gta02_batteries),
-	.charging_restart_interval = (900 * HZ),
-	.chg_ref_current_ma = 1000,
-
-	.reg_init_data = {
-		[PCF50633_REGULATOR_AUTO] = {
-			.constraints = {
-				.name = "IO_3V3",
-				.min_uV = 3300000,
-				.max_uV = 3300000,
-				.valid_modes_mask = REGULATOR_MODE_NORMAL,
-				.boot_on = 1,
-				.always_on = 1,
-				.apply_uV = 1,
-				.state_mem = {
-					.enabled = 1,
-				},
-			},
-			.num_consumer_supplies = 0,
-		},
-		[PCF50633_REGULATOR_DOWN1] = {
-			.constraints = {
-				.name = "CORE_1V3",
-				.min_uV = 1300000,
-				.max_uV = 1600000,
-				.valid_modes_mask = REGULATOR_MODE_NORMAL,
-				.boot_on = 1,
-				.always_on = 1,
-				.apply_uV = 1,
-			},
-			.num_consumer_supplies = 0,
-		},
-		[PCF50633_REGULATOR_DOWN2] = {
-			.constraints = {
-				.name = "IO_1V8",
-				.min_uV = 1800000,
-				.max_uV = 1800000,
-				.valid_modes_mask = REGULATOR_MODE_NORMAL,
-				.apply_uV = 1,
-				.boot_on = 1,
-				.always_on = 1,
-				.state_mem = {
-					.enabled = 1,
-				},
-			},
-			.num_consumer_supplies = 0,
-		},
-		[PCF50633_REGULATOR_HCLDO] = {
-			.constraints = {
-				.name = "SD_3V3",
-				.min_uV = 2000000,
-				.max_uV = 3300000,
-				.valid_modes_mask = REGULATOR_MODE_NORMAL,
-				.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE,
-				.boot_on = 1,
-			},
-			.num_consumer_supplies = 1,
-			.consumer_supplies = hcldo_consumers,
-		},
-		[PCF50633_REGULATOR_LDO1] = {
-			.constraints = {
-				.name = "GSENSOR_3V3",
-				.min_uV = 3300000,
-				.max_uV = 3300000,
-				.valid_modes_mask = REGULATOR_MODE_NORMAL,
-				.apply_uV = 1,
-			},
-			.num_consumer_supplies = 0,
-		},
-		[PCF50633_REGULATOR_LDO2] = {
-			.constraints = {
-				.name = "CODEC_3V3",
-				.min_uV = 3300000,
-				.max_uV = 3300000,
-				.valid_modes_mask = REGULATOR_MODE_NORMAL,
-				.apply_uV = 1,
-			},
-			.num_consumer_supplies = 0,
-		},
-		[PCF50633_REGULATOR_LDO3] = {
-			.constraints = {
-				.min_uV = 3000000,
-				.max_uV = 3000000,
-				.valid_modes_mask = REGULATOR_MODE_NORMAL,
-				.apply_uV = 1,
-			},
-			.num_consumer_supplies = 0,
-		},
-		[PCF50633_REGULATOR_LDO4] = {
-			.constraints = {
-				.name = "BT_3V2",
-				.min_uV = 3200000,
-				.max_uV = 3200000,
-				.valid_modes_mask = REGULATOR_MODE_NORMAL,
-				.apply_uV = 1,
-			},
-			.num_consumer_supplies = 1,
-			.consumer_supplies = ldo4_consumers,
-		},
-		[PCF50633_REGULATOR_LDO5] = {
-			.constraints = {
-				.name = "RF_3V",
-				.min_uV = 3000000,
-				.max_uV = 3000000,
-				.valid_modes_mask = REGULATOR_MODE_NORMAL,
-				.apply_uV = 1,
-				.state_mem = {
-					.enabled = 1,
-				},
-			},
-			.num_consumer_supplies = 1,
-			.consumer_supplies = ldo5_consumers,
-		},
-		[PCF50633_REGULATOR_LDO6] = {
-			.constraints = {
-				.name = "LCM_3V",
-				.min_uV = 3000000,
-				.max_uV = 3000000,
-				.always_on = 1,
-				.valid_modes_mask = REGULATOR_MODE_NORMAL,
-				.apply_uV = 1,
-			},
-			.num_consumer_supplies = 0,
-		},
-		[PCF50633_REGULATOR_MEMLDO] = {
-			.constraints = {
-				.min_uV = 1800000,
-				.max_uV = 1800000,
-				.valid_modes_mask = REGULATOR_MODE_NORMAL,
-				.state_mem = {
-					.enabled = 1,
-				},
-			},
-			.num_consumer_supplies = 0,
-		},
-
-	},
-	.probe_done = gta02_pmu_attach_child_devices,
-	.regulator_registered = gta02_pmu_regulator_registered,
-	.mbc_event_callback = gta02_pmu_event_callback,
-	.force_shutdown = gta02_pmu_force_shutdown,
-};
-
-static void mangle_pmu_pdata_by_system_rev(void)
-{
-	struct regulator_init_data *reg_init_data;
-
-	reg_init_data = gta02_pcf_pdata.reg_init_data;
-
-	switch (S3C_SYSTEM_REV_ATAG) {
-	case GTA02v1_SYSTEM_REV:
-		/* FIXME: this is only in v1 due to wrong PMU variant */
-		reg_init_data[PCF50633_REGULATOR_DOWN2]
-					.constraints.state_mem.enabled = 1;
-
-		reg_init_data[PCF50633_REGULATOR_LDO1]
-					.constraints.min_uV = 1300000;
-		reg_init_data[PCF50633_REGULATOR_LDO1]
-					.constraints.max_uV = 1300000;
-
-		reg_init_data[PCF50633_REGULATOR_LDO5]
-					.constraints.min_uV = 1500000;
-		reg_init_data[PCF50633_REGULATOR_LDO5]
-					.constraints.max_uV = 1500000;
-
-		reg_init_data[PCF50633_REGULATOR_LDO6]
-					.constraints.min_uV = 0;
-		reg_init_data[PCF50633_REGULATOR_LDO6]
-					.constraints.max_uV = 3300000;
-		reg_init_data[PCF50633_REGULATOR_LDO6]
-					.constraints.apply_uV = 1;
-		break;
-	default:
-		break;
-	}
-}
-
-#endif
-
-#ifdef CONFIG_HDQ_GPIO_BITBANG
-/* BQ27000 Battery */
-
-struct bq27000_platform_data bq27000_pdata = {
-	.name = "battery",
-	.rsense_mohms = 20,
-	.hdq_read = hdq_read,
-	.hdq_write = hdq_write,
-	.hdq_initialized = hdq_initialized,
-	.get_charger_online_status = gta02_get_charger_online_status,
-	.get_charger_active_status = gta02_get_charger_active_status
-};
-
-struct platform_device bq27000_battery_device = {
-	.name 		= "bq27000-battery",
-	.dev = {
-		.platform_data = &bq27000_pdata,
-	},
-};
-
-/* HDQ */
-
-static void gta02_hdq_attach_child_devices(struct device *parent_device)
-{
-	switch (S3C_SYSTEM_REV_ATAG) {
-	case GTA02v5_SYSTEM_REV:
-	case GTA02v6_SYSTEM_REV:
-		bq27000_battery_device.dev.parent = parent_device;
-		platform_device_register(&bq27000_battery_device);
-		break;
-	default:
-		break;
-	}
-}
-
-static void gta02_hdq_gpio_direction_out(void)
-{
-	s3c2410_gpio_cfgpin(GTA02v5_GPIO_HDQ, S3C2410_GPIO_OUTPUT);
-}
-
-static void gta02_hdq_gpio_direction_in(void)
-{
-	s3c2410_gpio_cfgpin(GTA02v5_GPIO_HDQ, S3C2410_GPIO_INPUT);
-}
-
-static void gta02_hdq_gpio_set_value(int val)
-{
-
-	s3c2410_gpio_setpin(GTA02v5_GPIO_HDQ, val);
-}
-
-static int gta02_hdq_gpio_get_value(void)
-{
-	return s3c2410_gpio_getpin(GTA02v5_GPIO_HDQ);
-}
-
-static struct resource gta02_hdq_resources[] = {
-	[0] = {
-		.start	= GTA02v5_GPIO_HDQ,
-		.end	= GTA02v5_GPIO_HDQ,
-	},
-};
-
-struct hdq_platform_data gta02_hdq_platform_data = {
-	.attach_child_devices = gta02_hdq_attach_child_devices,
-	.gpio_dir_out = gta02_hdq_gpio_direction_out,
-	.gpio_dir_in = gta02_hdq_gpio_direction_in,
-	.gpio_set = gta02_hdq_gpio_set_value,
-	.gpio_get = gta02_hdq_gpio_get_value,
-
-	.enable_fiq = gta02_fiq_enable,
-	.disable_fiq = gta02_fiq_disable,
-	.kick_fiq = gta02_fiq_kick,
-
-};
-
-struct platform_device gta02_hdq_device = {
-	.name 		= "hdq",
-	.num_resources	= 1,
-	.resource	= gta02_hdq_resources,
-	.dev		= {
-		.platform_data = &gta02_hdq_platform_data,
-	},
-};
-#endif
-
-
-#ifdef CONFIG_LEDS_GTA02_VIBRATOR
-/* vibrator (child of FIQ) */
-
-static struct resource gta02_vibrator_resources[] = {
-	[0] = {
-		.start	= GTA02_GPIO_VIBRATOR_ON,
-		.end	= GTA02_GPIO_VIBRATOR_ON,
-	},
-};
-struct gta02_vib_platform_data gta02_vib_pdata = {
-	.enable_fiq = gta02_fiq_enable,
-	.disable_fiq = gta02_fiq_disable,
-	.kick_fiq = gta02_fiq_kick,
-};
-
-static struct platform_device gta02_vibrator_dev = {
-	.name		= "gta02-vibrator",
-	.num_resources	= ARRAY_SIZE(gta02_vibrator_resources),
-	.resource	= gta02_vibrator_resources,
-	.dev	 = {
-		.platform_data = &gta02_vib_pdata,
-		},
-};
-#endif
-
-/* NOR Flash */
-
-#define GTA02_FLASH_BASE	S3C2410_CS3 /* GCS3 */
-#define GTA02_FLASH_SIZE	0x200000 /* 2MBytes */
-
-static struct physmap_flash_data gta02_nor_flash_data = {
-	.width		= 2,
-};
-
-static struct resource gta02_nor_flash_resource = {
-	.start		= GTA02_FLASH_BASE,
-	.end		= GTA02_FLASH_BASE + GTA02_FLASH_SIZE - 1,
-	.flags		= IORESOURCE_MEM,
-};
-
-static struct platform_device gta02_nor_flash = {
-	.name		= "physmap-flash",
-	.id		= 0,
-	.dev		= {
-				.platform_data	= &gta02_nor_flash_data,
-			},
-	.resource	= &gta02_nor_flash_resource,
-	.num_resources	= 1,
-};
-
-
-struct platform_device s3c24xx_pwm_device = {
-	.name 		= "s3c24xx_pwm",
-	.num_resources	= 0,
-};
-
-static struct i2c_board_info gta02_i2c_devs[] __initdata = {
-	{
-		I2C_BOARD_INFO("pcf50633", 0x73),
-		.irq = GTA02_IRQ_PCF50633,
-		.platform_data = &gta02_pcf_pdata,
-	},
-	{
-		I2C_BOARD_INFO("wm8753", 0x1a),
-	},
-};
-
-static struct s3c2410_nand_set gta02_nand_sets[] = {
-	[0] = {
-		.name		= "neo1973-nand",
-		.nr_chips	= 1,
-		.flags		= S3C2410_NAND_BBT,
-	},
-};
-
-/* choose a set of timings derived from S3C@2442B MCP54 
- * data sheet (K5D2G13ACM-D075 MCP Memory)
- */
-
-static struct s3c2410_platform_nand gta02_nand_info = {
-	.tacls		= 0,
-	.twrph0		= 25,
-	.twrph1		= 15,
-	.nr_sets	= ARRAY_SIZE(gta02_nand_sets),
-	.sets		= gta02_nand_sets,
-	.software_ecc	= 1,
-};
-
-
-static void gta02_s3c_mmc_set_power(unsigned char power_mode,
-    unsigned short vdd)
-{
-	static int is_on = -1;
-	int on;
-
-	on = power_mode == MMC_POWER_ON || power_mode == MMC_POWER_UP;
-	if (is_on != on)
-		gta02_wlan_reset(!on);
-	is_on = on;
-}
-
-
-static struct s3c24xx_mci_pdata gta02_s3c_mmc_cfg = {
-	.set_power	= gta02_s3c_mmc_set_power,
-};
-
-static void gta02_udc_command(enum s3c2410_udc_cmd_e cmd)
-{
-	switch (cmd) {
-	case S3C2410_UDC_P_ENABLE:
-		printk(KERN_DEBUG "%s S3C2410_UDC_P_ENABLE\n", __func__);
-	    s3c2410_gpio_setpin(GTA02_GPIO_USB_PULLUP, 1);
-		break;
-	case S3C2410_UDC_P_DISABLE:
-		printk(KERN_DEBUG "%s S3C2410_UDC_P_DISABLE\n", __func__);
-		s3c2410_gpio_setpin(GTA02_GPIO_USB_PULLUP, 0);
-		break;
-	case S3C2410_UDC_P_RESET:
-		printk(KERN_DEBUG "%s S3C2410_UDC_P_RESET\n", __func__);
-		/* FIXME! */
-		break;
-	default:
-		break;
-	}
-}
-
-/* get PMU to set USB current limit accordingly */
-
-static struct s3c2410_udc_mach_info gta02_udc_cfg = {
-	.vbus_draw	= gta02_udc_vbus_draw,
-	.udc_command	= gta02_udc_command,
-/*	.get_vbus_status = gta02_udc_vbus_status,*/
-};
-
-
-/* Touchscreen configuration. */
-
-#ifdef CONFIG_TOUCHSCREEN_FILTER
-const static struct ts_filter_group_configuration gta02_ts_group = {
-	.length = 12,
-	.close_enough = 10,
-	.threshold = 6,		/* At least half of the points in a group. */
-	.attempts = 10,
-};
-
-const static struct ts_filter_median_configuration gta02_ts_median = {
-	.extent = 20,
-	.decimation_below = 3,
-	.decimation_threshold = 8 * 3,
-	.decimation_above = 4,
-};
-
-const static struct ts_filter_mean_configuration gta02_ts_mean = {
-	.length = 4,
-};
-
-const static struct ts_filter_linear_configuration gta02_ts_linear = {
-	.constants = {1, 0, 0, 0, 1, 0, 1},	/* Don't modify coords. */
-	.coord0 = 0,
-	.coord1 = 1,
-};
-#endif
-
-const static struct ts_filter_chain_configuration gta02_filter_configuration[] =
-{
-#ifdef CONFIG_TOUCHSCREEN_FILTER
-	{&ts_filter_group_api,		&gta02_ts_group.config},
-	{&ts_filter_median_api,		&gta02_ts_median.config},
-	{&ts_filter_mean_api,		&gta02_ts_mean.config},
-	{&ts_filter_linear_api,		&gta02_ts_linear.config},
-#endif
-	{NULL, NULL},
-};
-
-const static struct s3c2410_ts_mach_info gta02_ts_cfg = {
-	.delay = 10000,
-	.presc = 0xff, /* slow as we can go */
-	.filter_config = gta02_filter_configuration,
-};
-
-
-
-static void gta02_bl_set_intensity(int intensity)
-{
-	struct pcf50633 *pcf = gta02_pcf;
-	int old_intensity = pcf50633_reg_read(pcf, PCF50633_REG_LEDOUT);
-	int ret;
-
-	intensity >>= 2;
-
-	/*
-	 * One code path that leads here is from a kernel panic. Trying to turn
-	 * the backlight on just gives us a nearly endless stream of complaints
-	 * and accomplishes nothing. We can't win. Just give up.
-	 *
-	 * In the unlikely event that there's another path leading here while
-	 * we're atomic, we print at least a warning.
-	 */
-	if (in_atomic()) {
-		printk(KERN_ERR
-		    "gta02_bl_set_intensity called while atomic\n");
-		return;
-	}
-
-	if (!(pcf50633_reg_read(pcf, PCF50633_REG_LEDENA) & 3))
-		old_intensity = 0;
-	else
-		old_intensity = pcf50633_reg_read(pcf, PCF50633_REG_LEDOUT);
-
-	if (intensity == old_intensity)
-		return;
-
-	/* We can't do this anywhere else */
-	pcf50633_reg_write(pcf, PCF50633_REG_LEDDIM, 5);
-
-	/*
-	 * The PCF50633 cannot handle LEDOUT = 0 (datasheet p60)
-	 * if seen, you have to re-enable the LED unit
-	 */
-	if (!intensity || !old_intensity)
-		pcf50633_reg_write(pcf, PCF50633_REG_LEDENA, 0);
-
-	if (!intensity) /* illegal to set LEDOUT to 0 */
-		ret = pcf50633_reg_set_bit_mask(pcf, PCF50633_REG_LEDOUT, 0x3f,
-									     2);
-	else
-		ret = pcf50633_reg_set_bit_mask(pcf, PCF50633_REG_LEDOUT, 0x3f,
-			       intensity);
-
-	if (intensity)
-		pcf50633_reg_write(pcf, PCF50633_REG_LEDENA, 2);
-
-}
-
-static struct generic_bl_info gta02_bl_info = {
-	.name 			= "gta02-bl",
-	.max_intensity 		= 0xff,
-	.default_intensity 	= 0xff,
-	.set_bl_intensity 	= gta02_bl_set_intensity,
-};
-
-static struct platform_device gta02_bl_dev = {
-	.name		  = "generic-bl",
-	.id		  = 1,
-	.dev = {
-		.platform_data = &gta02_bl_info,
-	},
-};
-
-/* SPI: LCM control interface attached to Glamo3362 */
-
-static void gta02_jbt6k74_reset(int devidx, int level)
-{
-	gpio_set_value(GTA02_GPIO_GLAMO(4), level);
-}
-
-static void gta02_jbt6k74_probe_completed(struct device *dev)
-{
-	struct pcf50633 *pcf = gta02_pcf;
-
-	/* Switch on backlight. Qi does not do it for us */
-	pcf50633_reg_write(pcf, PCF50633_REG_LEDOUT, 0x01);
-	pcf50633_reg_write(pcf, PCF50633_REG_LEDENA, 0x00);
-	pcf50633_reg_write(pcf, PCF50633_REG_LEDDIM, 0x01);
-	pcf50633_reg_write(pcf, PCF50633_REG_LEDENA, 0x01);
-
-	gta02_bl_dev.dev.parent = dev;
-	platform_device_register(&gta02_bl_dev);
-}
-
-const struct jbt6k74_platform_data jbt6k74_pdata = {
-	.reset		= gta02_jbt6k74_reset,
-	.probe_completed = gta02_jbt6k74_probe_completed,
-};
-
-/*----------- SPI: Accelerometers attached to SPI of s3c244x ----------------- */
-
-void gta02_lis302dl_suspend_io(struct lis302dl_info *lis, int resume)
-{
-	struct lis302dl_platform_data *pdata = lis->pdata;
-
-	if (!resume) {
-		 /*
-		 * we don't want to power them with a high level
-		 * because GSENSOR_3V3 is not up during suspend
-		 */
-		s3c2410_gpio_setpin(pdata->pin_chip_select, 0);
-		s3c2410_gpio_setpin(pdata->pin_clk, 0);
-		s3c2410_gpio_setpin(pdata->pin_mosi, 0);
-		/* misnomer: it is a pullDOWN in 2442 */
-		s3c2410_gpio_pullup(pdata->pin_miso, 1);
-		return;
-	}
-
-	/* back to normal */
-	s3c2410_gpio_setpin(pdata->pin_chip_select, 1);
-	s3c2410_gpio_setpin(pdata->pin_clk, 1);
-	/* misnomer: it is a pullDOWN in 2442 */
-	s3c2410_gpio_pullup(pdata->pin_miso, 0);
-
-	s3c2410_gpio_cfgpin(pdata->pin_chip_select, S3C2410_GPIO_OUTPUT);
-	s3c2410_gpio_cfgpin(pdata->pin_clk, S3C2410_GPIO_OUTPUT);
-	s3c2410_gpio_cfgpin(pdata->pin_mosi, S3C2410_GPIO_OUTPUT);
-	s3c2410_gpio_cfgpin(pdata->pin_miso, S3C2410_GPIO_INPUT);
-
-}
-
-struct lis302dl_platform_data lis302_pdata_top = {
-		.name		= "lis302-1 (top)",
-		.pin_chip_select= S3C2410_GPD12,
-		.pin_clk	= S3C2410_GPG7,
-		.pin_mosi	= S3C2410_GPG6,
-		.pin_miso	= S3C2410_GPG5,
-		.interrupt	= GTA02_IRQ_GSENSOR_1,
-		.open_drain	= 1, /* altered at runtime by PCB rev */
-		.lis302dl_suspend_io = gta02_lis302dl_suspend_io,
-};
-
-struct lis302dl_platform_data lis302_pdata_bottom = {
-		.name		= "lis302-2 (bottom)",
-		.pin_chip_select= S3C2410_GPD13,
-		.pin_clk	= S3C2410_GPG7,
-		.pin_mosi	= S3C2410_GPG6,
-		.pin_miso	= S3C2410_GPG5,
-		.interrupt	= GTA02_IRQ_GSENSOR_2,
-		.open_drain	= 1, /* altered at runtime by PCB rev */
-		.lis302dl_suspend_io = gta02_lis302dl_suspend_io,
-};
-
-static struct spi_board_info gta02_spi_board_info[] = {
-	{
-		.modalias	= "jbt6k74",
-		.platform_data	= &jbt6k74_pdata,
-		.controller_data = (void*)GTA02_GPIO_GLAMO(12),
-		/* irq */
-		.max_speed_hz	= 100 * 1000,
-		.bus_num	= 2,
-		.chip_select = 0
-	},
-	{
-		.modalias	= "lis302dl",
-		/* platform_data */
-		.platform_data	= &lis302_pdata_top,
-		/* controller_data */
-		/* irq */
-		.max_speed_hz	= 100 * 1000,
-		.bus_num	= 3,
-		.chip_select	= 0,
-	},
-
-	{
-		.modalias	= "lis302dl",
-		/* platform_data */
-		.platform_data	= &lis302_pdata_bottom,
-		/* controller_data */
-		/* irq */
-		.max_speed_hz	= 100 * 1000,
-		.bus_num	= 3,
-		.chip_select	= 1,
-	},
-
-};
-
-static void gta02_lis302_chip_select(struct s3c2410_spigpio_info *info, int csid, int cs)
-{
-
-	/*
-	 * Huh... "quirk"... CS on this device is not really "CS" like you can
-	 * expect.
-	 *
-	 * When it is 0 it selects SPI interface mode.
-	 * When it is 1 it selects I2C interface mode.
-	 *
-	 * Because we have 2 devices on one interface we have to make sure
-	 * that the "disabled" device (actually in I2C mode) don't think we're
-	 * talking to it.
-	 *
-	 * When we talk to the "enabled" device, the "disabled" device sees
-	 * the clocks as I2C clocks, creating havoc.
-	 *
-	 * I2C sees MOSI going LOW while CLK HIGH as a START action, thus we
-	 * must ensure this is never issued.
-	 */
-
-	int cs_gpio, other_cs_gpio;
-
-	cs_gpio = csid ? S3C2410_GPD13 : S3C2410_GPD12;
-	other_cs_gpio = (1 - csid) ? S3C2410_GPD13 : S3C2410_GPD12;
-	
-
-	if (cs == BITBANG_CS_ACTIVE) {
-		s3c2410_gpio_setpin(other_cs_gpio, 1);
-		s3c2410_gpio_setpin(cs_gpio, 1);
-		s3c2410_gpio_setpin(info->pin_clk, 1);
-		s3c2410_gpio_setpin(cs_gpio, 0);
-	} else {
-		s3c2410_gpio_setpin(cs_gpio, 1);
-		s3c2410_gpio_setpin(other_cs_gpio, 1);
-	} 
-}
-
-static struct s3c2410_spigpio_info gta02_spigpio_cfg = {
-	.pin_clk	= S3C2410_GPG7,
-	.pin_mosi	= S3C2410_GPG6,
-	.pin_miso	= S3C2410_GPG5,
-	.bus_num	= 3,
-	.num_chipselect	= 2,
-	.chip_select	= gta02_lis302_chip_select,
-	.non_blocking_transfer = 1,
-};
-
-static struct platform_device gta02_spi_gpio_dev = {
-	.name		= "spi_s3c24xx_gpio",
-	.dev = {
-		.platform_data = &gta02_spigpio_cfg,
-	},
-};
-
-/*----------- / SPI: Accelerometers attached to SPI of s3c244x ----------------- */
-
-static struct gpio_led gta02_gpio_leds[] = {
-	{
-		.name	= "gta02-power:orange",
-		.gpio	= GTA02_GPIO_PWR_LED1,
-	}, {
-		.name	= "gta02-power:blue",
-		.gpio	= GTA02_GPIO_PWR_LED2,
-	}, {
-		.name	= "gta02-aux:red",
-		.gpio	= GTA02_GPIO_AUX_LED,
-	},
-};
-
-static struct gpio_led_platform_data gta02_gpio_leds_pdata = {
-	.leds = gta02_gpio_leds,
-	.num_leds = ARRAY_SIZE(gta02_gpio_leds),
-};
-
-struct platform_device gta02_led_dev = {
-	.name = "leds-gpio",
-	.id   = -1,
-	.dev = {
-		.platform_data = &gta02_gpio_leds_pdata,
-	},
-};
-
-static struct gpio_keys_button gta02_buttons[] = {
-	{
-		.gpio = GTA02_GPIO_AUX_KEY,
-		.code = KEY_PHONE,
-		.desc = "Aux",
-		.type = EV_KEY,
-	},
-	{
-		.gpio = GTA02_GPIO_HOLD_KEY,
-		.code = KEY_PAUSE,
-		.desc = "Hold",
-		.type = EV_KEY,
-	},
-};
-
-static struct gpio_keys_platform_data gta02_buttons_pdata = {
-	.buttons = gta02_buttons,
-	.nbuttons = ARRAY_SIZE(gta02_buttons),
-};
-
-static struct platform_device gta02_button_dev = {
-	.name = "gpio-keys",
-	.id = -1,
-	.dev = {
-		.platform_data = &gta02_buttons_pdata,
-	},
-};
-
-static struct platform_device gta02_pm_usbhost_dev = {
-	.name		= "gta02-pm-host",
-};
-
-/* USB */
-static struct s3c2410_hcd_info gta02_usb_info = {
-	.port[0]	= {
-		.flags	= S3C_HCDFLG_USED,
-	},
-	.port[1]	= {
-		.flags	= 0,
-	},
-};
-
-static int glamo_irq_is_wired(void)
-{
-	int rc;
-	int count = 0;
-
-	/*
-	* GTA02 S-Media IRQs prior to A5 are broken due to a lack of
-	* a pullup on the INT# line.  Check for the bad behaviour.
-	*/
-	s3c2410_gpio_setpin(S3C2410_GPG4, 0);
-	s3c2410_gpio_cfgpin(S3C2410_GPG4, S3C2410_GPG4_OUTP);
-	s3c2410_gpio_cfgpin(S3C2410_GPG4, S3C2410_GPG4_INP);
-	/*
-	* we force it low ourselves for a moment and resume being input.
-	* If there is a pullup, it won't stay low for long.  But if the
-	* level converter is there as on < A5 revision, the weak keeper
-	* on the input of the LC will hold the line low indefinitiely
-	*/
-	do
-		rc = s3c2410_gpio_getpin(S3C2410_GPG4);
-	while ((!rc) && ((count++) < 10));
-	if (rc) { /* it got pulled back up, it's good */
-		printk(KERN_INFO "Detected S-Media IRQ# pullup, "
-		"enabling interrupt\n");
-		return 0;
-	} else  /* Gah we can't work with this level converter */
-		printk(KERN_WARNING "** Detected bad IRQ# circuit found"
-		" on pre-A5 GTA02: S-Media interrupt disabled **\n");
-	return -ENODEV;
-}
-
-/* Smedia Glamo 3362 */
-
-/*
- * we crank down SD Card clock dynamically when GPS is powered
- */
-
-static int gta02_glamo_mci_use_slow(void)
-{
-	return gta02_pm_gps_is_on();
-}
-
-static void gta02_glamo_external_reset(int level)
-{
-	s3c2410_gpio_setpin(GTA02_GPIO_3D_RESET, level);
-	s3c2410_gpio_cfgpin(GTA02_GPIO_3D_RESET, S3C2410_GPIO_OUTPUT);
-}
-
-/*
-static struct fb_videomode gta02_glamo_modes[] = {
-	{
-		.name = "480x640",
-		.xres = 480,
-		.yres = 640,
-		.pixclock	= 40816,
-		.left_margin	= 8,
-		.right_margin	= 63,
-		.upper_margin	= 2,
-		.lower_margin	= 4,
-		.hsync_len	= 8,
-		.vsync_len	= 2,
-		.vmode = FB_VMODE_NONINTERLACED,
-	}, {
-		.name = "240x320",
-		.xres = 240,
-		.yres = 320,
-		.pixclock	= 40816,
-		.left_margin	= 8,
-		.right_margin	= 88,
-		.upper_margin	= 2,
-		.lower_margin	= 2,
-		.hsync_len	= 8,
-		.vsync_len	= 2,
-		.vmode = FB_VMODE_NONINTERLACED,
-	}
-};*/
-
-static struct fb_videomode gta02_glamo_modes[] = {
-	{
-		.name = "480x640",
-		.xres = 480,
-		.yres = 640,
-		.pixclock	= 40816,
-		.left_margin	= 8,
-		.right_margin	= 16,
-		.upper_margin	= 2,
-		.lower_margin	= 16,
-		.hsync_len	= 8,
-		.vsync_len	= 2,
-		.vmode = FB_VMODE_NONINTERLACED,
-	}, {
-		.name = "240x320",
-		.xres = 240,
-		.yres = 320,
-		.pixclock	= 40816,
-		.left_margin	= 8,
-		.right_margin	= 16,
-		.upper_margin	= 2,
-		.lower_margin	= 16,
-		.hsync_len	= 8,
-		.vsync_len	= 2,
-		.vmode = FB_VMODE_NONINTERLACED,
-	}
-};
-
-
-static struct glamo_fb_platform_data gta02_glamo_fb_pdata = {
-	.width  = 43,
-	.height = 58,
-
-	.num_modes = ARRAY_SIZE(gta02_glamo_modes),
-	.modes = gta02_glamo_modes,
-};
-
-static struct glamo_mmc_platform_data gta02_glamo_mmc_pdata = {
-	.glamo_mmc_use_slow = gta02_glamo_mci_use_slow,
-};
-
-static struct glamo_platform_data gta02_glamo_pdata = {
-	.fb_data   = &gta02_glamo_fb_pdata,
-	.mmc_data  = &gta02_glamo_mmc_pdata,
-	.gpio_base = GTA02_GPIO_GLAMO_BASE,
-
-	.osci_clock_rate = 32768,
-
-	.glamo_irq_is_wired = glamo_irq_is_wired,
-	.glamo_external_reset = gta02_glamo_external_reset,
-};
-
-static struct resource gta02_glamo_resources[] = {
-	[0] = {
-		.start	= S3C2410_CS1,
-		.end	= S3C2410_CS1 + 0x1000000 - 1,
-		.flags	= IORESOURCE_MEM,
-	},
-	[1] = {
-		.start	= GTA02_IRQ_3D,
-		.end	= GTA02_IRQ_3D,
-		.flags	= IORESOURCE_IRQ,
-	},
-	[2] = {
-		.start = GTA02_GPIO_3D_RESET,
-		.end   = GTA02_GPIO_3D_RESET,
-	},
-};
-
-static struct platform_device gta02_glamo_dev = {
-	.name		= "glamo3362",
-	.num_resources	= ARRAY_SIZE(gta02_glamo_resources),
-	.resource	= gta02_glamo_resources,
-	.dev		= {
-		.platform_data	= &gta02_glamo_pdata,
-	},
-};
-
-static void mangle_glamo_res_by_system_rev(void)
-{
-	switch (S3C_SYSTEM_REV_ATAG) {
-	case GTA02v1_SYSTEM_REV:
-		break;
-	default:
-		gta02_glamo_resources[2].start = GTA02_GPIO_3D_RESET;
-		gta02_glamo_resources[2].end = GTA02_GPIO_3D_RESET;
-		break;
-	}
-
-	switch (S3C_SYSTEM_REV_ATAG) {
-	case GTA02v1_SYSTEM_REV:
-	case GTA02v2_SYSTEM_REV:
-	case GTA02v3_SYSTEM_REV:
-	/* case GTA02v4_SYSTEM_REV: - FIXME: handle this later */
-		/* The hardware is missing a pull-up resistor and thus can't
-		 * support the Smedia Glamo IRQ */
-		gta02_glamo_resources[1].start = 0;
-		gta02_glamo_resources[1].end = 0;
-		break;
-	}
-}
-
-struct spi_gpio_platform_data spigpio_platform_data = {
-	.sck = GTA02_GPIO_GLAMO(10),
-	.mosi = GTA02_GPIO_GLAMO(11),
-	.miso = GTA02_GPIO_GLAMO(5),
-	.num_chipselect = 1,
-};
-
-static struct platform_device spigpio_device = {
-	.name = "spi_gpio",
-	.id   = 2,
-	.dev = {
-		.platform_data = &spigpio_platform_data,
-		.parent        = &gta02_glamo_dev.dev,
-	},
-};
-
-static void __init gta02_map_io(void)
-{
-	s3c24xx_init_io(gta02_iodesc, ARRAY_SIZE(gta02_iodesc));
-	s3c24xx_init_clocks(12000000);
-	s3c24xx_init_uarts(gta02_uartcfgs, ARRAY_SIZE(gta02_uartcfgs));
-}
-
-static irqreturn_t gta02_modem_irq(int irq, void *param)
-{
-/*	printk(KERN_DEBUG "modem wakeup interrupt\n");*/
-	gta_gsm_interrupts++;
-	return IRQ_HANDLED;
-}
-
-static irqreturn_t ar6000_wow_irq(int irq, void *param)
-{
-/*	printk(KERN_DEBUG "ar6000_wow interrupt\n");*/
-	return IRQ_HANDLED;
-}
-
-/*
- * hardware_ecc=1|0
- */
-static char hardware_ecc_str[4] __initdata = "";
-
-static int __init hardware_ecc_setup(char *str)
-{
-	if (str)
-		strlcpy(hardware_ecc_str, str, sizeof(hardware_ecc_str));
-	return 1;
-}
-
-__setup("hardware_ecc=", hardware_ecc_setup);
-
-/* these are the guys that don't need to be children of PMU */
-
-static struct platform_device *gta02_devices[] __initdata = {
-	&s3c_device_usb,
-	&s3c_device_wdt,
-	&s3c_device_sdi,
-	&s3c_device_usbgadget,
-	&s3c_device_nand,
-	&gta02_nor_flash,
-
-	&s3c24xx_pwm_device,
-	&gta02_led_dev,
-	&gta02_pm_wlan_dev, /* not dependent on PMU */
-	&s3c_device_iis,
-	&s3c_device_i2c0,
-};
-
-/* these guys DO need to be children of PMU */
-
-static struct platform_device *gta02_devices_pmu_children[] = {
-	&s3c_device_ts, /* input 1 */
-	&gta02_pm_gsm_dev,
-	&gta02_pm_usbhost_dev,
-	&gta02_spi_gpio_dev, /* input 2 and 3 */
-	&gta02_button_dev, /* input 4 */
-	&gta02_resume_reason_device,
-};
-
-static void gta02_register_glamo(void)
-{
-	platform_device_register(&gta02_glamo_dev);
-	if (gpio_request(GTA02_GPIO_GLAMO(4), "jbt6k74 reset"))
-		printk("gta02: Failed to request jbt6k74 reset pin\n");
-	if (gpio_direction_output(GTA02_GPIO_GLAMO(4), 1))
-		printk("gta02: Failed to configure jbt6k74 reset pin\n");
-	platform_device_register(&spigpio_device);
-}
-
-static void gta02_pmu_regulator_registered(struct pcf50633 *pcf, int id)
-{
-	struct platform_device *regulator, *pdev;
-
-	gta02_pcf = pcf;
-
-	regulator = pcf->regulator_pdev[id];
-
-	switch(id) {
-		case PCF50633_REGULATOR_LDO4:
-			pdev = &gta02_pm_bt_dev;
-			break;
-		case PCF50633_REGULATOR_LDO5:
-			pdev = &gta02_pm_gps_dev;
-			break;
-		case PCF50633_REGULATOR_HCLDO:
-			gta02_register_glamo();
-			return;
-		default:
-			return;
-	}
-
-	pdev->dev.parent = &regulator->dev;
-	platform_device_register(pdev);
-}
-
-/* this is called when pc50633 is probed, unfortunately quite late in the
- * day since it is an I2C bus device.  Here we can belatedly define some
- * platform devices with the advantage that we can mark the pcf50633 as the
- * parent.  This makes them get suspended and resumed with their parent
- * the pcf50633 still around.
- */
-
-static void gta02_pmu_attach_child_devices(struct pcf50633 *pcf)
-{
-	int n;
-
-	for (n = 0; n < ARRAY_SIZE(gta02_devices_pmu_children); n++)
-		gta02_devices_pmu_children[n]->dev.parent = pcf->dev;
-
-	mangle_glamo_res_by_system_rev();
-	platform_add_devices(gta02_devices_pmu_children,
-					ARRAY_SIZE(gta02_devices_pmu_children));
-
-	regulator_has_full_constraints();
-}
-
-static void gta02_poweroff(void)
-{
-	pcf50633_reg_set_bit_mask(gta02_pcf, PCF50633_REG_OOCSHDWN,
-		  PCF50633_OOCSHDWN_GOSTDBY, PCF50633_OOCSHDWN_GOSTDBY);
-}
-
-
-/* On hardware rev 5 and earlier the leds are missing a resistor and reading
- * from their gpio pins will always return 0, so we have to shadow the
- * led states software */
-static unsigned long gpb_shadow;
-extern struct s3c_gpio_chip s3c24xx_gpios[];
-
-static void gta02_gpb_set(struct gpio_chip *chip,
-			    unsigned offset, int value)
-{
-	void __iomem *base = S3C24XX_GPIO_BASE(S3C2410_GPB0);
-	unsigned long flags;
-	unsigned long dat;
-
-	local_irq_save(flags);
-
-	dat = __raw_readl(base + 0x04) | gpb_shadow;
-	dat &= ~(1 << offset);
-	gpb_shadow &= ~(1 << offset);
-	if (value) {
-		dat |= 1 << offset;
-		switch (offset) {
-		case 0 ... 2:
-			gpb_shadow |= 1 << offset;
-			break;
-		default:
-			break;
-		}
-	}
-	__raw_writel(dat, base + 0x04);
-
-	local_irq_restore(flags);
-}
-
-static int gta02_gpb_get(struct gpio_chip *chip, unsigned offset)
-{
-	void __iomem *base = S3C24XX_GPIO_BASE(S3C2410_GPB0);
-	unsigned long val;
-
-	val = __raw_readl(base + 0x04) | gpb_shadow;
-	val >>= offset;
-	val &= 1;
-
-	return val;
-}
-
-static void gta02_hijack_gpb(void) {
-    s3c24xx_gpios[1].chip.set = gta02_gpb_set;
-    s3c24xx_gpios[1].chip.get = gta02_gpb_get;
-}
-
-static void __init gta02_machine_init(void)
-{
-	int rc;
-
-	/* set the panic callback to make AUX blink fast */
-	panic_blink = gta02_panic_blink;
-
-	switch (S3C_SYSTEM_REV_ATAG) {
-	case GTA02v6_SYSTEM_REV:
-		/* we need push-pull interrupt from motion sensors */
-		lis302_pdata_top.open_drain = 0;
-		lis302_pdata_bottom.open_drain = 0;
-		break;
-	default:
-		break;
-	}
-	if (S3C_SYSTEM_REV_ATAG <= GTA02v5_SYSTEM_REV)
-		gta02_hijack_gpb();
-
-	spin_lock_init(&motion_irq_lock);
-
-#ifdef CONFIG_CHARGER_PCF50633
-	INIT_DELAYED_WORK(&gta02_charger_work, gta02_charger_worker);
-#endif
-
-	/* Glamo chip select optimization */
-/*	 *((u32 *)(S3C2410_MEMREG(((1 + 1) << 2)))) = 0x1280; */
-
-	/* do not force soft ecc if we are asked to use hardware_ecc */
-	if (hardware_ecc_str[0] == '1')
-		gta02_nand_info.software_ecc = 0;
-
-	s3c_device_usb.dev.platform_data = &gta02_usb_info;
-	s3c_device_nand.dev.platform_data = &gta02_nand_info;
-	s3c_device_sdi.dev.platform_data = &gta02_s3c_mmc_cfg;
-
-	/* acc sensor chip selects */
-	s3c2410_gpio_setpin(S3C2410_GPD12, 1);
-	s3c2410_gpio_cfgpin(S3C2410_GPD12, S3C2410_GPIO_OUTPUT);
-	s3c2410_gpio_setpin(S3C2410_GPD13, 1);
-	s3c2410_gpio_cfgpin(S3C2410_GPD13, S3C2410_GPIO_OUTPUT);
-
-
-	s3c24xx_udc_set_platdata(&gta02_udc_cfg);
-	s3c_i2c0_set_platdata(NULL);
-	set_s3c2410ts_info(&gta02_ts_cfg);
-
-	mangle_glamo_res_by_system_rev();
-
-	i2c_register_board_info(0, gta02_i2c_devs, ARRAY_SIZE(gta02_i2c_devs));
-	spi_register_board_info(gta02_spi_board_info,
-				ARRAY_SIZE(gta02_spi_board_info));
-
-#ifdef CONFIG_CHARGER_PCF50633
-	mangle_pmu_pdata_by_system_rev();
-#endif
-
-	platform_add_devices(gta02_devices, ARRAY_SIZE(gta02_devices));
-
-	s3c_pm_init();
-
-	/* Make sure the modem can wake us up */
-	set_irq_type(GTA02_IRQ_MODEM, IRQ_TYPE_EDGE_RISING);
-	rc = request_irq(GTA02_IRQ_MODEM, gta02_modem_irq, IRQF_DISABLED,
-			 "modem", NULL);
-	if (rc < 0)
-		printk(KERN_ERR "GTA02: can't request GSM modem wakeup IRQ\n");
-	enable_irq_wake(GTA02_IRQ_MODEM);
-
-	/* Make sure the wifi module can wake us up*/
-	set_irq_type(GTA02_IRQ_WLAN_GPIO1, IRQ_TYPE_EDGE_RISING);
-	rc = request_irq(GTA02_IRQ_WLAN_GPIO1, ar6000_wow_irq, IRQF_DISABLED,
-			"ar6000", NULL);
-
-	if (rc < 0)
-		printk(KERN_ERR "GTA02: can't request ar6k wakeup IRQ\n");
-	enable_irq_wake(GTA02_IRQ_WLAN_GPIO1);
-
-	pm_power_off = gta02_poweroff;
-
-	/* Register the HDQ and vibrator as children of pwm device */
-#ifdef CONFIG_HDQ_GPIO_BITBANG
-	gta02_hdq_device.dev.parent = &s3c24xx_pwm_device.dev;
-	platform_device_register(&gta02_hdq_device);
-#endif
-#ifdef CONFIG_LEDS_GTA02_VIBRATOR
-	gta02_vibrator_dev.dev.parent = &s3c24xx_pwm_device.dev; 
-	platform_device_register(&gta02_vibrator_dev);
-#endif
-}
-
-void DEBUG_LED(int n)
-{
-	switch (n) {
-	case 0:
-		s3c2410_gpio_setpin(GTA02_GPIO_PWR_LED1, 1);
-		break;
-	case 1:
-		s3c2410_gpio_setpin(GTA02_GPIO_PWR_LED2, 1);
-		break;
-	default:
-		s3c2410_gpio_setpin(GTA02_GPIO_AUX_LED, 1);
-		break;
-	}
-}
-EXPORT_SYMBOL_GPL(DEBUG_LED);
-
-MACHINE_START(NEO1973_GTA02, "GTA02")
-	.phys_io	= S3C2410_PA_UART,
-	.io_pg_offst	= (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
-	.boot_params	= S3C2410_SDRAM_PA + 0x100,
-	.map_io		= gta02_map_io,
-	.init_irq	= s3c24xx_init_irq,
-	.init_machine	= gta02_machine_init,
-	.timer		= &s3c24xx_timer,
-MACHINE_END
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/Kconfig b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/Kconfig
deleted file mode 100644
index a422cb0ee..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/Kconfig
+++ /dev/null
@@ -1,31 +0,0 @@
-config AR6000_WLAN
-        tristate "AR6000 wireless networking over SDIO"
-	depends on MMC
-        select WIRELESS_EXT
-        default m
-        help
-          good luck.
-
-config AR6000_WLAN_DEBUG
-	bool "Enable retrieval of firmware debugging information"
-	depends on AR6000_WLAN
-	default n
-	help
-	  The AR6k firmware maintains a log of debugging events that
-	  gets flushed to the host on various occasions. Retrieval of
-	  this data is very slow, taking several seconds.
-
-	  If in doubt, say N.
-
-config AR6000_WLAN_RESET
-	bool "Soft-reset when shutting down"
-	depends on AR6000_WLAN
-	default n
-	help
-	  The AR6k module can be explicitly reset when shutting down
-	  the device. This adds a delay of about two seconds to suspend,
-	  module removal, and so on. Since the WLAN SDIO function is
-	  generally disabled soon thereafter anyway, this reset seems
-	  superfluous.
-
-	  If in doubt, say N.
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/Makefile b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/Makefile
deleted file mode 100644
index f8f443172..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-REV ?= 2
-
-PWD := $(shell pwd)
-
-EXTRA_CFLAGS += -I$(src)/include
-
-EXTRA_CFLAGS += -DLINUX -D__KERNEL__ -DHTC_RAW_INTERFACE\
-                -DTCMD -DUSER_KEYS \
-                -DNO_SYNC_FLUSH #\
-                -DMULTIPLE_FRAMES_PER_INTERRUPT -DAR6000REV$(REV) \
-                -DBLOCK_TX_PATH_FLAG \
-		-DSDIO \
-
-EXTRA_CFLAGS += -DKERNEL_2_6
-
-obj-$(CONFIG_AR6000_WLAN) += ar6000.o
-
-ar6000-objs += htc/ar6k.o      		   \
-	       htc/ar6k_events.o 	   \
-               htc/htc_send.o       	   \
-               htc/htc_recv.o       	   \
-               htc/htc_services.o          \
-               htc/htc.o     		   \
-               hif/hif2.o     		   \
-               bmi/bmi.o                   \
-               ar6000/ar6000_drv.o         \
-               ar6000/ar6000_raw_if.o	   \
-               ar6000/netbuf.o		   \
-               ar6000/wireless_ext.o	   \
-               ar6000/ioctl.o		   \
-               miscdrv/common_drv.o	   \
-               miscdrv/credit_dist.o	   \
-               wmi/wmi.o                   \
-               wlan/wlan_node.o            \
-               wlan/wlan_recv_beacon.o     \
-               wlan/wlan_utils.o
-
-
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/ar6000_drv.c b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/ar6000_drv.c
deleted file mode 100644
index 90533ab96..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/ar6000_drv.c
+++ /dev/null
@@ -1,3129 +0,0 @@
-/*
- *
- * Copyright (c) 2004-2007 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-/*
- * This driver is a pseudo ethernet driver to access the Atheros AR6000
- * WLAN Device
- */
-static const char athId[] __attribute__ ((unused)) = "$Id: //depot/sw/releases/olca2.0-GPL/host/os/linux/ar6000_drv.c#2 $";
-
-#include "ar6000_drv.h"
-#include "htc.h"
-
-MODULE_LICENSE("GPL and additional rights");
-
-#ifndef REORG_APTC_HEURISTICS
-#undef ADAPTIVE_POWER_THROUGHPUT_CONTROL
-#endif /* REORG_APTC_HEURISTICS */
-
-#ifdef ADAPTIVE_POWER_THROUGHPUT_CONTROL
-#define APTC_TRAFFIC_SAMPLING_INTERVAL     100  /* msec */
-#define APTC_UPPER_THROUGHPUT_THRESHOLD    3000 /* Kbps */
-#define APTC_LOWER_THROUGHPUT_THRESHOLD    2000 /* Kbps */
-
-typedef struct aptc_traffic_record {
-    A_BOOL timerScheduled;
-    struct timeval samplingTS;
-    unsigned long bytesReceived;
-    unsigned long bytesTransmitted;
-} APTC_TRAFFIC_RECORD;
-
-A_TIMER aptcTimer;
-APTC_TRAFFIC_RECORD aptcTR;
-#endif /* ADAPTIVE_POWER_THROUGHPUT_CONTROL */
-
-unsigned int bypasswmi = 0;
-unsigned int debuglevel = 0;
-int tspecCompliance = 1;
-unsigned int busspeedlow = 0;
-unsigned int onebitmode = 0;
-unsigned int skipflash = 0;
-unsigned int wmitimeout = 2;
-unsigned int wlanNodeCaching = 1;
-unsigned int enableuartprint = 0;
-unsigned int logWmiRawMsgs = 0;
-unsigned int enabletimerwar = 0;
-unsigned int mbox_yield_limit = 99;
-int reduce_credit_dribble = 1 + HTC_CONNECT_FLAGS_THRESHOLD_LEVEL_ONE_HALF;
-int allow_trace_signal = 0;
-#ifdef CONFIG_HOST_TCMD_SUPPORT
-unsigned int testmode =0;
-#endif
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-module_param(bypasswmi, int, 0644);
-module_param(debuglevel, int, 0644);
-module_param(tspecCompliance, int, 0644);
-module_param(onebitmode, int, 0644);
-module_param(busspeedlow, int, 0644);
-module_param(skipflash, int, 0644);
-module_param(wmitimeout, int, 0644);
-module_param(wlanNodeCaching, int, 0644);
-module_param(logWmiRawMsgs, int, 0644);
-module_param(enableuartprint, int, 0644);
-module_param(enabletimerwar, int, 0644);
-module_param(mbox_yield_limit, int, 0644);
-module_param(reduce_credit_dribble, int, 0644);
-module_param(allow_trace_signal, int, 0644);
-#ifdef CONFIG_HOST_TCMD_SUPPORT
-module_param(testmode, int, 0644);
-#endif
-#else
-
-#define __user
-/* for linux 2.4 and lower */
-MODULE_PARM(bypasswmi,"i");
-MODULE_PARM(debuglevel, "i");
-MODULE_PARM(onebitmode,"i");
-MODULE_PARM(busspeedlow, "i");
-MODULE_PARM(skipflash, "i");
-MODULE_PARM(wmitimeout, "i");
-MODULE_PARM(wlanNodeCaching, "i");
-MODULE_PARM(enableuartprint,"i");
-MODULE_PARM(logWmiRawMsgs, "i");
-MODULE_PARM(enabletimerwar,"i");
-MODULE_PARM(mbox_yield_limit,"i");
-MODULE_PARM(reduce_credit_dribble,"i");
-MODULE_PARM(allow_trace_signal,"i");
-#ifdef CONFIG_HOST_TCMD_SUPPORT
-MODULE_PARM(testmode, "i");
-#endif
-#endif
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)
-/* in 2.6.10 and later this is now a pointer to a uint */
-unsigned int _mboxnum = HTC_MAILBOX_NUM_MAX;
-#define mboxnum &_mboxnum
-#else
-unsigned int mboxnum = HTC_MAILBOX_NUM_MAX;
-#endif
-
-#ifdef CONFIG_AR6000_WLAN_RESET
-unsigned int resetok = 1;
-#else
-unsigned int resetok = 0;
-#endif
-
-#ifdef DEBUG
-A_UINT32 g_dbg_flags = DBG_DEFAULTS;
-unsigned int debugflags = 0;
-int debugdriver = 1;
-unsigned int debughtc = 128;
-unsigned int debugbmi = 1;
-unsigned int debughif = 2;
-unsigned int txcreditsavailable[HTC_MAILBOX_NUM_MAX] = {0};
-unsigned int txcreditsconsumed[HTC_MAILBOX_NUM_MAX] = {0};
-unsigned int txcreditintrenable[HTC_MAILBOX_NUM_MAX] = {0};
-unsigned int txcreditintrenableaggregate[HTC_MAILBOX_NUM_MAX] = {0};
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-module_param(debugflags, int, 0644);
-module_param(debugdriver, int, 0644);
-module_param(debughtc, int, 0644);
-module_param(debugbmi, int, 0644);
-module_param(debughif, int, 0644);
-module_param(resetok, int, 0644);
-module_param_array(txcreditsavailable, int, mboxnum, 0644);
-module_param_array(txcreditsconsumed, int, mboxnum, 0644);
-module_param_array(txcreditintrenable, int, mboxnum, 0644);
-module_param_array(txcreditintrenableaggregate, int, mboxnum, 0644);
-#else
-/* linux 2.4 and lower */
-MODULE_PARM(debugflags,"i");
-MODULE_PARM(debugdriver, "i");
-MODULE_PARM(debughtc, "i");
-MODULE_PARM(debugbmi, "i");
-MODULE_PARM(debughif, "i");
-MODULE_PARM(resetok, "i");
-MODULE_PARM(txcreditsavailable, "0-3i");
-MODULE_PARM(txcreditsconsumed, "0-3i");
-MODULE_PARM(txcreditintrenable, "0-3i");
-MODULE_PARM(txcreditintrenableaggregate, "0-3i");
-#endif
-
-#endif /* DEBUG */
-
-unsigned int tx_attempt[HTC_MAILBOX_NUM_MAX] = {0};
-unsigned int tx_post[HTC_MAILBOX_NUM_MAX] = {0};
-unsigned int tx_complete[HTC_MAILBOX_NUM_MAX] = {0};
-unsigned int hifBusRequestNumMax = 40;
-unsigned int war23838_disabled = 0;
-#ifdef ADAPTIVE_POWER_THROUGHPUT_CONTROL
-unsigned int enableAPTCHeuristics = 1;
-#endif /* ADAPTIVE_POWER_THROUGHPUT_CONTROL */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-module_param_array(tx_attempt, int, mboxnum, 0644);
-module_param_array(tx_post, int, mboxnum, 0644);
-module_param_array(tx_complete, int, mboxnum, 0644);
-module_param(hifBusRequestNumMax, int, 0644);
-module_param(war23838_disabled, int, 0644);
-#ifdef ADAPTIVE_POWER_THROUGHPUT_CONTROL
-module_param(enableAPTCHeuristics, int, 0644);
-#endif /* ADAPTIVE_POWER_THROUGHPUT_CONTROL */
-#else
-MODULE_PARM(tx_attempt, "0-3i");
-MODULE_PARM(tx_post, "0-3i");
-MODULE_PARM(tx_complete, "0-3i");
-MODULE_PARM(hifBusRequestNumMax, "i");
-MODULE_PARM(war23838_disabled, "i");
-#ifdef ADAPTIVE_POWER_THROUGHPUT_CONTROL
-MODULE_PARM(enableAPTCHeuristics, "i");
-#endif /* ADAPTIVE_POWER_THROUGHPUT_CONTROL */
-#endif
-
-#ifdef BLOCK_TX_PATH_FLAG
-int blocktx = 0;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-module_param(blocktx, int, 0644);
-#else
-MODULE_PARM(blocktx, "i");
-#endif
-#endif /* BLOCK_TX_PATH_FLAG */
-
-// TODO move to arsoft_c
-USER_RSSI_THOLD rssi_map[12];
-
-int reconnect_flag = 0;
-
-DECLARE_WAIT_QUEUE_HEAD(ar6000_scan_queue);
-
-/* Function declarations */
-static int ar6000_init_module(void);
-static void ar6000_cleanup_module(void);
-
-int ar6000_init(struct net_device *dev);
-static int ar6000_open(struct net_device *dev);
-static int ar6000_close(struct net_device *dev);
-static int ar6000_cleanup(struct net_device *dev);
-static void ar6000_init_control_info(AR_SOFTC_T *ar);
-static int ar6000_data_tx(struct sk_buff *skb, struct net_device *dev);
-
-static void ar6000_destroy(struct net_device *dev, unsigned int unregister);
-static void ar6000_detect_error(unsigned long ptr);
-static struct net_device_stats *ar6000_get_stats(struct net_device *dev);
-static struct iw_statistics *ar6000_get_iwstats(struct net_device * dev);
-
-/*
- * HTC service connection handlers
- */
-static void ar6000_avail_ev(HTC_HANDLE HTCHandle);
-
-static void ar6000_unavail_ev(void *Instance);
-
-static void ar6000_target_failure(void *Instance, A_STATUS Status);
-
-static void ar6000_rx(void *Context, HTC_PACKET *pPacket);
-
-static void ar6000_rx_refill(void *Context,HTC_ENDPOINT_ID Endpoint);
-
-static void ar6000_tx_complete(void *Context, HTC_PACKET *pPacket);
-
-static void ar6000_tx_queue_full(void *Context, HTC_ENDPOINT_ID Endpoint);
-
-static void ar6000_tx_queue_avail(void *Context, HTC_ENDPOINT_ID Endpoint);
-
-/*
- * Static variables
- */
-
-static struct net_device *ar6000_devices[MAX_AR6000];
-extern struct iw_handler_def ath_iw_handler_def;
-DECLARE_WAIT_QUEUE_HEAD(arEvent);
-static void ar6000_cookie_init(AR_SOFTC_T *ar);
-static void ar6000_cookie_cleanup(AR_SOFTC_T *ar);
-static void ar6000_free_cookie(AR_SOFTC_T *ar, struct ar_cookie * cookie);
-static struct ar_cookie *ar6000_alloc_cookie(AR_SOFTC_T *ar);
-static void ar6000_TxDataCleanup(AR_SOFTC_T *ar);
-
-#ifdef USER_KEYS
-static A_STATUS ar6000_reinstall_keys(AR_SOFTC_T *ar,A_UINT8 key_op_ctrl);
-#endif
-
-
-static struct ar_cookie s_ar_cookie_mem[MAX_COOKIE_NUM];
-
-#define HOST_INTEREST_ITEM_ADDRESS(ar, item)    \
-((ar->arTargetType == TARGET_TYPE_AR6001) ?     \
-   AR6001_HOST_INTEREST_ITEM_ADDRESS(item) :    \
-   AR6002_HOST_INTEREST_ITEM_ADDRESS(item))
-
-
-/* Debug log support */
-
-/*
- * Flag to govern whether the debug logs should be parsed in the kernel
- * or reported to the application.
- */
-#ifdef DEBUG
-#define REPORT_DEBUG_LOGS_TO_APP
-#endif
-
-A_STATUS
-ar6000_set_host_app_area(AR_SOFTC_T *ar)
-{
-    A_UINT32 address, data;
-    struct host_app_area_s host_app_area;
-
-    /* Fetch the address of the host_app_area_s instance in the host interest area */
-    address = HOST_INTEREST_ITEM_ADDRESS(ar, hi_app_host_interest);
-    if (ar6000_ReadRegDiag(ar->arHifDevice, &address, &data) != A_OK) {
-        return A_ERROR;
-    }
-    address = data;
-    host_app_area.wmi_protocol_ver = WMI_PROTOCOL_VERSION;
-    if (ar6000_WriteDataDiag(ar->arHifDevice, address,
-                             (A_UCHAR *)&host_app_area,
-                             sizeof(struct host_app_area_s)) != A_OK)
-    {
-        return A_ERROR;
-    }
-
-    return A_OK;
-}
-
-A_UINT32
-dbglog_get_debug_hdr_ptr(AR_SOFTC_T *ar)
-{
-    A_UINT32 param;
-    A_UINT32 address;
-    A_STATUS status;
-
-    address = HOST_INTEREST_ITEM_ADDRESS(ar, hi_dbglog_hdr);
-    if ((status = ar6000_ReadDataDiag(ar->arHifDevice, address,
-                                      (A_UCHAR *)&param, 4)) != A_OK)
-    {
-        param = 0;
-    }
-
-    return param;
-}
-
-/*
- * The dbglog module has been initialized. Its ok to access the relevant
- * data stuctures over the diagnostic window.
- */
-void
-ar6000_dbglog_init_done(AR_SOFTC_T *ar)
-{
-    ar->dbglog_init_done = TRUE;
-}
-
-A_UINT32
-dbglog_get_debug_fragment(A_INT8 *datap, A_UINT32 len, A_UINT32 limit)
-{
-    A_INT32 *buffer;
-    A_UINT32 count;
-    A_UINT32 numargs;
-    A_UINT32 length;
-    A_UINT32 fraglen;
-
-    count = fraglen = 0;
-    buffer = (A_INT32 *)datap;
-    length = (limit >> 2);
-
-    if (len <= limit) {
-        fraglen = len;
-    } else {
-        while (count < length) {
-            numargs = DBGLOG_GET_NUMARGS(buffer[count]);
-            fraglen = (count << 2);
-            count += numargs + 1;
-        }
-    }
-
-    return fraglen;
-}
-
-void
-dbglog_parse_debug_logs(A_INT8 *datap, A_UINT32 len)
-{
-    A_INT32 *buffer;
-    A_UINT32 count;
-    A_UINT32 timestamp;
-    A_UINT32 debugid;
-    A_UINT32 moduleid;
-    A_UINT32 numargs;
-    A_UINT32 length;
-
-    count = 0;
-    buffer = (A_INT32 *)datap;
-    length = (len >> 2);
-    while (count < length) {
-        debugid = DBGLOG_GET_DBGID(buffer[count]);
-        moduleid = DBGLOG_GET_MODULEID(buffer[count]);
-        numargs = DBGLOG_GET_NUMARGS(buffer[count]);
-        timestamp = DBGLOG_GET_TIMESTAMP(buffer[count]);
-        switch (numargs) {
-            case 0:
-            AR_DEBUG_PRINTF("%d %d (%d)\n", moduleid, debugid, timestamp);
-            break;
-
-            case 1:
-            AR_DEBUG_PRINTF("%d %d (%d): 0x%x\n", moduleid, debugid,
-                            timestamp, buffer[count+1]);
-            break;
-
-            case 2:
-            AR_DEBUG_PRINTF("%d %d (%d): 0x%x, 0x%x\n", moduleid, debugid,
-                            timestamp, buffer[count+1], buffer[count+2]);
-            break;
-
-            default:
-            AR_DEBUG_PRINTF("Invalid args: %d\n", numargs);
-        }
-        count += numargs + 1;
-    }
-}
-
-int
-ar6000_dbglog_get_debug_logs(AR_SOFTC_T *ar)
-{
-    struct dbglog_hdr_s debug_hdr;
-    struct dbglog_buf_s debug_buf;
-    A_UINT32 address;
-    A_UINT32 length;
-    A_UINT32 dropped;
-    A_UINT32 firstbuf;
-    A_UINT32 debug_hdr_ptr;
-
-    if (!ar->dbglog_init_done) return A_ERROR;
-
-#ifndef CONFIG_AR6000_WLAN_DEBUG
-    return 0;
-#endif
-
-    AR6000_SPIN_LOCK(&ar->arLock, 0);
-
-    if (ar->dbgLogFetchInProgress) {
-        AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-        return A_EBUSY;
-    }
-
-        /* block out others */
-    ar->dbgLogFetchInProgress = TRUE;
-
-    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-
-    debug_hdr_ptr = dbglog_get_debug_hdr_ptr(ar);
-    printk("debug_hdr_ptr: 0x%x\n", debug_hdr_ptr);
-
-    /* Get the contents of the ring buffer */
-    if (debug_hdr_ptr) {
-        address = debug_hdr_ptr;
-        length = sizeof(struct dbglog_hdr_s);
-        ar6000_ReadDataDiag(ar->arHifDevice, address,
-                            (A_UCHAR *)&debug_hdr, length);
-        address = (A_UINT32)debug_hdr.dbuf;
-        firstbuf = address;
-        dropped = debug_hdr.dropped;
-        length = sizeof(struct dbglog_buf_s);
-        ar6000_ReadDataDiag(ar->arHifDevice, address,
-                            (A_UCHAR *)&debug_buf, length);
-
-        do {
-            address = (A_UINT32)debug_buf.buffer;
-            length = debug_buf.length;
-            if ((length) && (debug_buf.length <= debug_buf.bufsize)) {
-                /* Rewind the index if it is about to overrun the buffer */
-                if (ar->log_cnt > (DBGLOG_HOST_LOG_BUFFER_SIZE - length)) {
-                    ar->log_cnt = 0;
-                }
-                if(A_OK != ar6000_ReadDataDiag(ar->arHifDevice, address,
-                                    (A_UCHAR *)&ar->log_buffer[ar->log_cnt], length))
-                {
-                    break;
-                }
-                ar6000_dbglog_event(ar, dropped, &ar->log_buffer[ar->log_cnt], length);
-                ar->log_cnt += length;
-            } else {
-                AR_DEBUG_PRINTF("Length: %d (Total size: %d)\n",
-                                debug_buf.length, debug_buf.bufsize);
-            }
-
-            address = (A_UINT32)debug_buf.next;
-            length = sizeof(struct dbglog_buf_s);
-            if(A_OK != ar6000_ReadDataDiag(ar->arHifDevice, address,
-                                (A_UCHAR *)&debug_buf, length))
-            {
-                break;
-            }
-
-        } while (address != firstbuf);
-    }
-
-    ar->dbgLogFetchInProgress = FALSE;
-
-    return A_OK;
-}
-
-void
-ar6000_dbglog_event(AR_SOFTC_T *ar, A_UINT32 dropped,
-                    A_INT8 *buffer, A_UINT32 length)
-{
-#ifdef REPORT_DEBUG_LOGS_TO_APP
-    #define MAX_WIRELESS_EVENT_SIZE 252
-    /*
-     * Break it up into chunks of MAX_WIRELESS_EVENT_SIZE bytes of messages.
-     * There seems to be a limitation on the length of message that could be
-     * transmitted to the user app via this mechanism.
-     */
-    A_UINT32 send, sent;
-
-    sent = 0;
-    send = dbglog_get_debug_fragment(&buffer[sent], length - sent,
-                                     MAX_WIRELESS_EVENT_SIZE);
-    while (send) {
-        ar6000_send_event_to_app(ar, WMIX_DBGLOG_EVENTID, &buffer[sent], send);
-        sent += send;
-        send = dbglog_get_debug_fragment(&buffer[sent], length - sent,
-                                         MAX_WIRELESS_EVENT_SIZE);
-    }
-#else
-    AR_DEBUG_PRINTF("Dropped logs: 0x%x\nDebug info length: %d\n",
-                    dropped, length);
-
-    /* Interpret the debug logs */
-    dbglog_parse_debug_logs(buffer, length);
-#endif /* REPORT_DEBUG_LOGS_TO_APP */
-}
-
-
-
-static int __init
-ar6000_init_module(void)
-{
-    static int probed = 0;
-    A_STATUS status;
-    HTC_INIT_INFO initInfo;
-
-    A_MEMZERO(&initInfo,sizeof(initInfo));
-    initInfo.AddInstance = ar6000_avail_ev;
-    initInfo.DeleteInstance = ar6000_unavail_ev;
-    initInfo.TargetFailure = ar6000_target_failure;
-
-
-#ifdef DEBUG
-    /* Set the debug flags if specified at load time */
-    if(debugflags != 0)
-    {
-        g_dbg_flags = debugflags;
-    }
-#endif
-
-    if (probed) {
-        return -ENODEV;
-    }
-    probed++;
-
-#ifdef ADAPTIVE_POWER_THROUGHPUT_CONTROL
-    memset(&aptcTR, 0, sizeof(APTC_TRAFFIC_RECORD));
-#endif /* ADAPTIVE_POWER_THROUGHPUT_CONTROL */
-
-#ifdef CONFIG_HOST_GPIO_SUPPORT
-    ar6000_gpio_init();
-#endif /* CONFIG_HOST_GPIO_SUPPORT */
-
-    status = HTCInit(&initInfo);
-    if(status != A_OK)
-        return -ENODEV;
-
-    return 0;
-}
-
-static void __exit
-ar6000_cleanup_module(void)
-{
-    int i = 0;
-    struct net_device *ar6000_netdev;
-
-#ifdef ADAPTIVE_POWER_THROUGHPUT_CONTROL
-    /* Delete the Adaptive Power Control timer */
-    if (timer_pending(&aptcTimer)) {
-        del_timer_sync(&aptcTimer);
-    }
-#endif /* ADAPTIVE_POWER_THROUGHPUT_CONTROL */
-
-    for (i=0; i < MAX_AR6000; i++) {
-        if (ar6000_devices[i] != NULL) {
-            ar6000_netdev = ar6000_devices[i];
-            ar6000_devices[i] = NULL;
-            ar6000_destroy(ar6000_netdev, 1);
-        }
-    }
-
-        /* shutting down HTC will cause the HIF layer to detach from the
-         * underlying bus driver which will cause the subsequent deletion of
-         * all HIF and HTC instances */
-    HTCShutDown();
-
-    AR_DEBUG_PRINTF("ar6000_cleanup: success\n");
-}
-
-#ifdef ADAPTIVE_POWER_THROUGHPUT_CONTROL
-void
-aptcTimerHandler(unsigned long arg)
-{
-    A_UINT32 numbytes;
-    A_UINT32 throughput;
-    AR_SOFTC_T *ar;
-    A_STATUS status;
-
-    ar = (AR_SOFTC_T *)arg;
-    A_ASSERT(ar != NULL);
-    A_ASSERT(!timer_pending(&aptcTimer));
-
-    AR6000_SPIN_LOCK(&ar->arLock, 0);
-
-    /* Get the number of bytes transferred */
-    numbytes = aptcTR.bytesTransmitted + aptcTR.bytesReceived;
-    aptcTR.bytesTransmitted = aptcTR.bytesReceived = 0;
-
-    /* Calculate and decide based on throughput thresholds */
-    throughput = ((numbytes * 8)/APTC_TRAFFIC_SAMPLING_INTERVAL); /* Kbps */
-    if (throughput < APTC_LOWER_THROUGHPUT_THRESHOLD) {
-        /* Enable Sleep and delete the timer */
-        A_ASSERT(ar->arWmiReady == TRUE);
-        AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-        status = wmi_powermode_cmd(ar->arWmi, REC_POWER);
-        AR6000_SPIN_LOCK(&ar->arLock, 0);
-        A_ASSERT(status == A_OK);
-        aptcTR.timerScheduled = FALSE;
-    } else {
-        A_TIMEOUT_MS(&aptcTimer, APTC_TRAFFIC_SAMPLING_INTERVAL, 0);
-    }
-
-    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-}
-#endif /* ADAPTIVE_POWER_THROUGHPUT_CONTROL */
-
-
-
-/* set HTC block size, assume BMI is already initialized */
-A_STATUS ar6000_SetHTCBlockSize(AR_SOFTC_T *ar)
-{
-    A_STATUS status;
-    A_UINT32 blocksizes[HTC_MAILBOX_NUM_MAX];
-
-    do {
-            /* get the block sizes */
-        status = HIFConfigureDevice(ar->arHifDevice, HIF_DEVICE_GET_MBOX_BLOCK_SIZE,
-                                    blocksizes, sizeof(blocksizes));
-
-        if (A_FAILED(status)) {
-            AR_DEBUG_PRINTF("Failed to get block size info from HIF layer...\n");
-            break;
-        }
-            /* note: we actually get the block size for mailbox 1, for SDIO the block
-             * size on mailbox 0 is artificially set to 1 */
-            /* must be a power of 2 */
-        A_ASSERT((blocksizes[1] & (blocksizes[1] - 1)) == 0);
-
-            /* set the host interest area for the block size */
-        status = BMIWriteMemory(ar->arHifDevice,
-                                HOST_INTEREST_ITEM_ADDRESS(ar, hi_mbox_io_block_sz),
-                                (A_UCHAR *)&blocksizes[1],
-                                4);
-
-        if (A_FAILED(status)) {
-            AR_DEBUG_PRINTF("BMIWriteMemory for IO block size failed \n");
-            break;
-        }
-
-        AR_DEBUG_PRINTF("Block Size Set: %d (target address:0x%X)\n",
-                blocksizes[1], HOST_INTEREST_ITEM_ADDRESS(ar, hi_mbox_io_block_sz));
-
-            /* set the host interest area for the mbox ISR yield limit */
-        status = BMIWriteMemory(ar->arHifDevice,
-                                HOST_INTEREST_ITEM_ADDRESS(ar, hi_mbox_isr_yield_limit),
-                                (A_UCHAR *)&mbox_yield_limit,
-                                4);
-
-        if (A_FAILED(status)) {
-            AR_DEBUG_PRINTF("BMIWriteMemory for yield limit failed \n");
-            break;
-        }
-
-    } while (FALSE);
-
-    return status;
-}
-
-static void free_raw_buffers(AR_SOFTC_T *ar)
-{
-    int i, j;
-
-    for (i = 0; i != HTC_RAW_STREAM_NUM_MAX; i++) {
-	for (j = 0; j != RAW_HTC_READ_BUFFERS_NUM; j++)
-	    kfree(ar->raw_htc_read_buffer[i][j]);
-	for (j = 0; j != RAW_HTC_WRITE_BUFFERS_NUM; j++)
-	    kfree(ar->raw_htc_write_buffer[i][j]);
-    }
-}
-
-static int alloc_raw_buffers(AR_SOFTC_T *ar)
-{
-    int i, j;
-    raw_htc_buffer *b;
-
-    for (i = 0; i != HTC_RAW_STREAM_NUM_MAX; i++) {
-	for (j = 0; j != RAW_HTC_READ_BUFFERS_NUM; j++) {
-	    b = kzalloc(sizeof(*b), GFP_KERNEL);
-	    if (!b)
-		return -ENOMEM;
-	    ar->raw_htc_read_buffer[i][j] = b;
-	}
-	for (j = 0; j != RAW_HTC_WRITE_BUFFERS_NUM; j++) {
-	    b = kzalloc(sizeof(*b), GFP_KERNEL);
-	    if (!b)
-		return -ENOMEM;
-	    ar->raw_htc_write_buffer[i][j] = b;
-	}
-    }
-    return 0;
-}
-
-static const struct net_device_ops ar6000_netdev_ops = {
-    .ndo_init = &ar6000_init,
-    .ndo_open = &ar6000_open,
-    .ndo_stop = &ar6000_close,
-    .ndo_start_xmit = &ar6000_data_tx,
-    .ndo_get_stats = &ar6000_get_stats,
-    .ndo_do_ioctl = &ar6000_ioctl,
-};
-/*
- * HTC Event handlers
- */
-static void
-ar6000_avail_ev(HTC_HANDLE HTCHandle)
-{
-    int i;
-    struct net_device *dev;
-    AR_SOFTC_T *ar;
-    int device_index = 0;
-
-    AR_DEBUG_PRINTF("ar6000_available\n");
-
-    for (i=0; i < MAX_AR6000; i++) {
-        if (ar6000_devices[i] == NULL) {
-            break;
-        }
-    }
-
-    if (i == MAX_AR6000) {
-        AR_DEBUG_PRINTF("ar6000_available: max devices reached\n");
-        return;
-    }
-
-    /* Save this. It gives a bit better readability especially since */
-    /* we use another local "i" variable below.                      */
-    device_index = i;
-
-    A_ASSERT(HTCHandle != NULL);
-
-    dev = alloc_etherdev(sizeof(AR_SOFTC_T));
-    if (dev == NULL) {
-        AR_DEBUG_PRINTF("ar6000_available: can't alloc etherdev\n");
-        return;
-    }
-
-    ether_setup(dev);
-
-    if (netdev_priv(dev) == NULL) {
-        printk(KERN_CRIT "ar6000_available: Could not allocate memory\n");
-        return;
-    }
-
-    A_MEMZERO(netdev_priv(dev), sizeof(AR_SOFTC_T));
-
-    ar                       = (AR_SOFTC_T *)netdev_priv(dev);
-    ar->arNetDev             = dev;
-    ar->arHtcTarget          = HTCHandle;
-    ar->arHifDevice          = HTCGetHifDevice(HTCHandle);
-    ar->arWlanState          = WLAN_ENABLED;
-    ar->arRadioSwitch        = WLAN_ENABLED;
-    ar->arDeviceIndex        = device_index;
-
-    A_INIT_TIMER(&ar->arHBChallengeResp.timer, ar6000_detect_error, dev);
-    ar->arHBChallengeResp.seqNum = 0;
-    ar->arHBChallengeResp.outstanding = FALSE;
-    ar->arHBChallengeResp.missCnt = 0;
-    ar->arHBChallengeResp.frequency = AR6000_HB_CHALLENGE_RESP_FREQ_DEFAULT;
-    ar->arHBChallengeResp.missThres = AR6000_HB_CHALLENGE_RESP_MISS_THRES_DEFAULT;
-
-    ar6000_init_control_info(ar);
-    init_waitqueue_head(&arEvent);
-    sema_init(&ar->arSem, 1);
-
-    if (alloc_raw_buffers(ar)) {
-	free_raw_buffers(ar);
-	/*
-	 * @@@ Clean up our own mess, but for anything else, cheerfully mimick
-	 * the beautiful error non-handling of the rest of this function.
-	 */
-	return;
-    }
-
-#ifdef ADAPTIVE_POWER_THROUGHPUT_CONTROL
-    A_INIT_TIMER(&aptcTimer, aptcTimerHandler, ar);
-#endif /* ADAPTIVE_POWER_THROUGHPUT_CONTROL */
-
-    /*
-     * If requested, perform some magic which requires no cooperation from
-     * the Target.  It causes the Target to ignore flash and execute to the
-     * OS from ROM.
-     *
-     * This is intended to support recovery from a corrupted flash on Targets
-     * that support flash.
-     */
-    if (skipflash)
-    {
-        ar6000_reset_device_skipflash(ar->arHifDevice);
-            }
-
-    BMIInit();
-    {
-        struct bmi_target_info targ_info;
-
-        if (BMIGetTargetInfo(ar->arHifDevice, &targ_info) != A_OK) {
-            return;
-        }
-
-        ar->arVersion.target_ver = targ_info.target_ver;
-        ar->arTargetType = targ_info.target_type;
-    }
-
-    if (enableuartprint) {
-        A_UINT32 param;
-        param = 1;
-        if (BMIWriteMemory(ar->arHifDevice,
-                           HOST_INTEREST_ITEM_ADDRESS(ar, hi_serial_enable),
-                           (A_UCHAR *)&param,
-                           4)!= A_OK)
-        {
-             AR_DEBUG_PRINTF("BMIWriteMemory for enableuartprint failed \n");
-             return ;
-        }
-        AR_DEBUG_PRINTF("Serial console prints enabled\n");
-    }
-#ifdef CONFIG_HOST_TCMD_SUPPORT
-    if(testmode) {
-        ar->arTargetMode = AR6000_TCMD_MODE;
-    }else {
-        ar->arTargetMode = AR6000_WLAN_MODE;
-    }
-#endif
-    if (enabletimerwar) {
-        A_UINT32 param;
-
-        if (BMIReadMemory(ar->arHifDevice,
-            HOST_INTEREST_ITEM_ADDRESS(ar, hi_option_flag),
-            (A_UCHAR *)&param,
-            4)!= A_OK)
-        {
-            AR_DEBUG_PRINTF("BMIReadMemory for enabletimerwar failed \n");
-            return;
-        }
-
-        param |= HI_OPTION_TIMER_WAR;
-
-        if (BMIWriteMemory(ar->arHifDevice,
-            HOST_INTEREST_ITEM_ADDRESS(ar, hi_option_flag),
-            (A_UCHAR *)&param,
-            4) != A_OK)
-        {
-            AR_DEBUG_PRINTF("BMIWriteMemory for enabletimerwar failed \n");
-            return;
-        }
-        AR_DEBUG_PRINTF("Timer WAR enabled\n");
-    }
-
-
-        /* since BMIInit is called in the driver layer, we have to set the block
-         * size here for the target */
-
-    if (A_FAILED(ar6000_SetHTCBlockSize(ar))) {
-        return;
-    }
-
-    spin_lock_init(&ar->arLock);
-
-    dev->netdev_ops = &ar6000_netdev_ops;
-    dev->watchdog_timeo = AR6000_TX_TIMEOUT;
-    ar6000_ioctl_iwsetup(&ath_iw_handler_def);
-    dev->wireless_handlers = &ath_iw_handler_def;
-    ath_iw_handler_def.get_wireless_stats = ar6000_get_iwstats; /*Displayed via proc fs */
-
-    /*
-     * We need the OS to provide us with more headroom in order to
-     * perform dix to 802.3, WMI header encap, and the HTC header
-     */
-    dev->hard_header_len = ETH_HLEN + sizeof(ATH_LLC_SNAP_HDR) +
-        sizeof(WMI_DATA_HDR) + HTC_HEADER_LEN;
-
-    /* This runs the init function */
-    SET_NETDEV_DEV(dev, HIFGetOSDevice(ar->arHifDevice));
-    if (register_netdev(dev)) {
-        AR_DEBUG_PRINTF("ar6000_avail: register_netdev failed\n");
-        ar6000_destroy(dev, 0);
-        return;
-    }
-
-    HTCSetInstance(ar->arHtcTarget, ar);
-
-    /* We only register the device in the global list if we succeed. */
-    /* If the device is in the global list, it will be destroyed     */
-    /* when the module is unloaded.                                  */
-    ar6000_devices[device_index] = dev;
-
-    AR_DEBUG_PRINTF("ar6000_avail: name=%s htcTarget=0x%x, dev=0x%x (%d), ar=0x%x\n",
-                    dev->name, (A_UINT32)HTCHandle, (A_UINT32)dev, device_index,
-                    (A_UINT32)ar);
-}
-
-static void ar6000_target_failure(void *Instance, A_STATUS Status)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)Instance;
-    WMI_TARGET_ERROR_REPORT_EVENT errEvent;
-    static A_BOOL sip = FALSE;
-
-    if (Status != A_OK) {
-        if (timer_pending(&ar->arHBChallengeResp.timer)) {
-            A_UNTIMEOUT(&ar->arHBChallengeResp.timer);
-        }
-
-        /* try dumping target assertion information (if any) */
-        ar6000_dump_target_assert_info(ar->arHifDevice,ar->arTargetType);
-
-        /*
-         * Fetch the logs from the target via the diagnostic
-         * window.
-         */
-        ar6000_dbglog_get_debug_logs(ar);
-
-        /* Report the error only once */
-        if (!sip) {
-            sip = TRUE;
-            errEvent.errorVal = WMI_TARGET_COM_ERR |
-                                WMI_TARGET_FATAL_ERR;
-#ifdef SEND_EVENT_TO_APP
-            ar6000_send_event_to_app(ar, WMI_ERROR_REPORT_EVENTID,
-                                     (A_UINT8 *)&errEvent,
-                                     sizeof(WMI_TARGET_ERROR_REPORT_EVENT));
-#endif
-        }
-    }
-}
-
-static void
-ar6000_unavail_ev(void *Instance)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)Instance;
-        /* NULL out it's entry in the global list */
-    ar6000_devices[ar->arDeviceIndex] = NULL;
-    ar6000_destroy(ar->arNetDev, 1);
-}
-
-/*
- * We need to differentiate between the surprise and planned removal of the
- * device because of the following consideration:
- * - In case of surprise removal, the hcd already frees up the pending
- *   for the device and hence there is no need to unregister the function
- *   driver inorder to get these requests. For planned removal, the function
- *   driver has to explictly unregister itself to have the hcd return all the
- *   pending requests before the data structures for the devices are freed up.
- *   Note that as per the current implementation, the function driver will
- *   end up releasing all the devices since there is no API to selectively
- *   release a particular device.
- * - Certain commands issued to the target can be skipped for surprise
- *   removal since they will anyway not go through.
- */
-static void
-ar6000_destroy(struct net_device *dev, unsigned int unregister)
-{
-    AR_SOFTC_T *ar;
-
-    AR_DEBUG_PRINTF("+ar6000_destroy \n");
-
-    if((dev == NULL) || ((ar = netdev_priv(dev)) == NULL))
-    {
-        AR_DEBUG_PRINTF("%s(): Failed to get device structure.\n", __func__);
-        return;
-    }
-
-    /* Clear the tx counters */
-    memset(tx_attempt, 0, sizeof(tx_attempt));
-    memset(tx_post, 0, sizeof(tx_post));
-    memset(tx_complete, 0, sizeof(tx_complete));
-
-    /* Free up the device data structure */
-    if (unregister) {
-	unregister_netdev(dev);
-    } else {
-	ar6000_close(dev);
-    ar6000_cleanup(dev);
-    }
-
-    free_raw_buffers(ar);
-
-#ifndef free_netdev
-    kfree(dev);
-#else
-    free_netdev(dev);
-#endif
-
-    AR_DEBUG_PRINTF("-ar6000_destroy \n");
-}
-
-static void ar6000_detect_error(unsigned long ptr)
-{
-    struct net_device *dev = (struct net_device *)ptr;
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    WMI_TARGET_ERROR_REPORT_EVENT errEvent;
-
-    AR6000_SPIN_LOCK(&ar->arLock, 0);
-
-    if (ar->arHBChallengeResp.outstanding) {
-        ar->arHBChallengeResp.missCnt++;
-    } else {
-        ar->arHBChallengeResp.missCnt = 0;
-    }
-
-    if (ar->arHBChallengeResp.missCnt > ar->arHBChallengeResp.missThres) {
-        /* Send Error Detect event to the application layer and do not reschedule the error detection module timer */
-        ar->arHBChallengeResp.missCnt = 0;
-        ar->arHBChallengeResp.seqNum = 0;
-        errEvent.errorVal = WMI_TARGET_COM_ERR | WMI_TARGET_FATAL_ERR;
-        AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-#ifdef SEND_EVENT_TO_APP
-        ar6000_send_event_to_app(ar, WMI_ERROR_REPORT_EVENTID,
-                                 (A_UINT8 *)&errEvent,
-                                 sizeof(WMI_TARGET_ERROR_REPORT_EVENT));
-#endif
-        return;
-    }
-
-    /* Generate the sequence number for the next challenge */
-    ar->arHBChallengeResp.seqNum++;
-    ar->arHBChallengeResp.outstanding = TRUE;
-
-    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-
-    /* Send the challenge on the control channel */
-    if (wmi_get_challenge_resp_cmd(ar->arWmi, ar->arHBChallengeResp.seqNum, DRV_HB_CHALLENGE) != A_OK) {
-        AR_DEBUG_PRINTF("Unable to send heart beat challenge\n");
-    }
-
-
-    /* Reschedule the timer for the next challenge */
-    A_TIMEOUT_MS(&ar->arHBChallengeResp.timer, ar->arHBChallengeResp.frequency * 1000, 0);
-}
-
-void ar6000_init_profile_info(AR_SOFTC_T *ar)
-{
-    ar->arSsidLen            = 0;
-    A_MEMZERO(ar->arSsid, sizeof(ar->arSsid));
-    ar->arNetworkType        = INFRA_NETWORK;
-    ar->arDot11AuthMode      = OPEN_AUTH;
-    ar->arAuthMode           = NONE_AUTH;
-    ar->arPairwiseCrypto     = NONE_CRYPT;
-    ar->arPairwiseCryptoLen  = 0;
-    ar->arGroupCrypto        = NONE_CRYPT;
-    ar->arGroupCryptoLen     = 0;
-    A_MEMZERO(ar->arWepKeyList, sizeof(ar->arWepKeyList));
-    A_MEMZERO(ar->arReqBssid, sizeof(ar->arReqBssid));
-    A_MEMZERO(ar->arBssid, sizeof(ar->arBssid));
-    ar->arBssChannel = 0;
-}
-
-static void
-ar6000_init_control_info(AR_SOFTC_T *ar)
-{
-    ar->arWmiEnabled         = FALSE;
-    ar6000_init_profile_info(ar);
-    ar->arDefTxKeyIndex      = 0;
-    A_MEMZERO(ar->arWepKeyList, sizeof(ar->arWepKeyList));
-    ar->arChannelHint        = 0;
-    ar->arListenInterval     = MAX_LISTEN_INTERVAL;
-    ar->arVersion.host_ver   = AR6K_SW_VERSION;
-    ar->arRssi               = 0;
-    ar->arTxPwr              = 0;
-    ar->arTxPwrSet           = FALSE;
-    ar->arSkipScan           = 0;
-    ar->arBeaconInterval     = 0;
-    ar->arBitRate            = 0;
-    ar->arMaxRetries         = 0;
-    ar->arWmmEnabled         = TRUE;
-}
-
-static int
-ar6000_open(struct net_device *dev)
-{
-    /* Wake up the queues */
-    netif_start_queue(dev);
-
-    return 0;
-}
-
-static int
-ar6000_close(struct net_device *dev)
-{
-    /* Stop the transmit queues */ 
-    netif_stop_queue(dev); 
-    return 0; 
-}
-
-static int 
-ar6000_cleanup(struct net_device *dev)
-{
-    AR_SOFTC_T *ar = netdev_priv(dev);
-
-    /* Stop the transmit queues */
-    netif_stop_queue(dev);
-
-    /* Disable the target and the interrupts associated with it */
-    if (ar->arWmiReady == TRUE)
-    {
-        if (!bypasswmi)
-        {
-            if (ar->arConnected == TRUE || ar->arConnectPending == TRUE)
-            {
-                AR_DEBUG_PRINTF("%s(): Disconnect\n", __func__);
-                AR6000_SPIN_LOCK(&ar->arLock, 0);
-                ar6000_init_profile_info(ar);
-                AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-                wmi_disconnect_cmd(ar->arWmi);
-            }
-
-            ar6000_dbglog_get_debug_logs(ar);
-            ar->arWmiReady  = FALSE;
-            ar->arConnected = FALSE;
-            ar->arConnectPending = FALSE;
-            wmi_shutdown(ar->arWmi);
-            ar->arWmiEnabled = FALSE;
-            ar->arWmi = NULL;
-            ar->arWlanState = WLAN_ENABLED;
-#ifdef USER_KEYS
-            ar->user_savedkeys_stat = USER_SAVEDKEYS_STAT_INIT;
-            ar->user_key_ctrl      = 0;
-#endif
-        }
-
-         AR_DEBUG_PRINTF("%s(): WMI stopped\n", __func__);
-    }
-    else
-    {
-        AR_DEBUG_PRINTF("%s(): WMI not ready 0x%08x 0x%08x\n",
-            __func__, (unsigned int) ar, (unsigned int) ar->arWmi);
-
-        /* Shut down WMI if we have started it */
-        if(ar->arWmiEnabled == TRUE)
-        {
-            AR_DEBUG_PRINTF("%s(): Shut down WMI\n", __func__);
-            wmi_shutdown(ar->arWmi);
-            ar->arWmiEnabled = FALSE;
-            ar->arWmi = NULL;
-        }
-    }
-
-    /* stop HTC */
-    HTCStop(ar->arHtcTarget);
-
-    /* set the instance to NULL so we do not get called back on remove incase we
-     * we're explicity destroyed by module unload */
-    HTCSetInstance(ar->arHtcTarget, NULL);
-
-    if (resetok) {
-        /* try to reset the device if we can
-         * The driver may have been configure NOT to reset the target during
-         * a debug session */
-        AR_DEBUG_PRINTF(" Attempting to reset target on instance destroy.... \n");
-        ar6000_reset_device(ar->arHifDevice, ar->arTargetType);
-    } else {
-        AR_DEBUG_PRINTF(" Host does not want target reset. \n");
-    }
-
-       /* Done with cookies */
-    ar6000_cookie_cleanup(ar);
-
-    /* Cleanup BMI */
-    BMIInit();
-
-    return 0;
-}
-
-/* connect to a service */
-static A_STATUS ar6000_connectservice(AR_SOFTC_T               *ar,
-                                      HTC_SERVICE_CONNECT_REQ  *pConnect,
-                                      WMI_PRI_STREAM_ID        WmiStreamID,
-                                      char                     *pDesc)
-{
-    A_STATUS                 status;
-    HTC_SERVICE_CONNECT_RESP response;
-
-    do {
-
-        A_MEMZERO(&response,sizeof(response));
-
-        status = HTCConnectService(ar->arHtcTarget,
-                                   pConnect,
-                                   &response);
-
-        if (A_FAILED(status)) {
-            AR_DEBUG_PRINTF(" Failed to connect to %s service status:%d \n", pDesc, status);
-            break;
-        }
-
-        if (WmiStreamID == WMI_NOT_MAPPED) {
-                /* done */
-            break;
-        }
-
-            /* set endpoint mapping for the WMI stream in the driver layer */
-        arSetWMIStream2EndpointIDMap(ar,WmiStreamID,response.Endpoint);
-
-    } while (FALSE);
-
-    return status;
-}
-
-static void ar6000_TxDataCleanup(AR_SOFTC_T *ar)
-{
-        /* flush all the data (non-control) streams
-         * we only flush packets that are tagged as data, we leave any control packets that
-         * were in the TX queues alone */
-    HTCFlushEndpoint(ar->arHtcTarget,
-                     arWMIStream2EndpointID(ar,WMI_BEST_EFFORT_PRI),
-                     AR6K_DATA_PKT_TAG);
-    HTCFlushEndpoint(ar->arHtcTarget,
-                     arWMIStream2EndpointID(ar,WMI_LOW_PRI),
-                     AR6K_DATA_PKT_TAG);
-    HTCFlushEndpoint(ar->arHtcTarget,
-                     arWMIStream2EndpointID(ar,WMI_HIGH_PRI),
-                     AR6K_DATA_PKT_TAG);
-    HTCFlushEndpoint(ar->arHtcTarget,
-                     arWMIStream2EndpointID(ar,WMI_HIGHEST_PRI),
-                     AR6K_DATA_PKT_TAG);
-}
-
-/* This function does one time initialization for the lifetime of the device */
-int ar6000_init(struct net_device *dev)
-{
-    AR_SOFTC_T *ar;
-    A_STATUS    status;
-    A_INT32     timeleft;
-
-    if((ar = netdev_priv(dev)) == NULL)
-    {
-        return(-EIO);
-    }
-
-    /* Do we need to finish the BMI phase */
-    if(BMIDone(ar->arHifDevice) != A_OK)
-    {
-        return -EIO;
-    }
-
-    if (!bypasswmi)
-    {
-#if 0 /* TBDXXX */
-        if (ar->arVersion.host_ver != ar->arVersion.target_ver) {
-            A_PRINTF("WARNING: Host version 0x%x does not match Target "
-                    " version 0x%x!\n",
-                    ar->arVersion.host_ver, ar->arVersion.target_ver);
-        }
-#endif
-
-        /* Indicate that WMI is enabled (although not ready yet) */
-        ar->arWmiEnabled = TRUE;
-        if ((ar->arWmi = wmi_init((void *) ar)) == NULL)
-        {
-            AR_DEBUG_PRINTF("%s() Failed to initialize WMI.\n", __func__);
-            return(-EIO);
-        }
-
-        AR_DEBUG_PRINTF("%s() Got WMI @ 0x%08x.\n", __func__,
-            (unsigned int) ar->arWmi);
-    }
-
-    do {
-        HTC_SERVICE_CONNECT_REQ connect;
-
-            /* the reason we have to wait for the target here is that the driver layer
-             * has to init BMI in order to set the host block size,
-             */
-        status = HTCWaitTarget(ar->arHtcTarget);
-
-        if (A_FAILED(status)) {
-            break;
-        }
-
-        A_MEMZERO(&connect,sizeof(connect));
-            /* meta data is unused for now */
-        connect.pMetaData = NULL;
-        connect.MetaDataLength = 0;
-            /* these fields are the same for all service endpoints */
-        connect.EpCallbacks.pContext = ar;
-        connect.EpCallbacks.EpTxComplete = ar6000_tx_complete;
-        connect.EpCallbacks.EpRecv = ar6000_rx;
-        connect.EpCallbacks.EpRecvRefill = ar6000_rx_refill;
-        connect.EpCallbacks.EpSendFull = ar6000_tx_queue_full;
-        connect.EpCallbacks.EpSendAvail = ar6000_tx_queue_avail;
-            /* set the max queue depth so that our ar6000_tx_queue_full handler gets called.
-             * Linux has the peculiarity of not providing flow control between the
-             * NIC and the network stack. There is no API to indicate that a TX packet
-             * was sent which could provide some back pressure to the network stack.
-             * Under linux you would have to wait till the network stack consumed all sk_buffs
-             * before any back-flow kicked in. Which isn't very friendly.
-             * So we have to manage this ourselves */
-        connect.MaxSendQueueDepth = 32;
-
-            /* connect to control service */
-        connect.ServiceID = WMI_CONTROL_SVC;
-        status = ar6000_connectservice(ar,
-                                       &connect,
-                                       WMI_CONTROL_PRI,
-                                       "WMI CONTROL");
-        if (A_FAILED(status)) {
-            break;
-        }
-
-            /* for the remaining data services set the connection flag to reduce dribbling,
-             * if configured to do so */
-        if (reduce_credit_dribble) {
-            connect.ConnectionFlags |= HTC_CONNECT_FLAGS_REDUCE_CREDIT_DRIBBLE;
-            /* the credit dribble trigger threshold is (reduce_credit_dribble - 1) for a value
-             * of 0-3 */
-            connect.ConnectionFlags &= ~HTC_CONNECT_FLAGS_THRESHOLD_LEVEL_MASK;
-            connect.ConnectionFlags |=
-                        ((A_UINT16)reduce_credit_dribble - 1) & HTC_CONNECT_FLAGS_THRESHOLD_LEVEL_MASK;
-        }
-            /* connect to best-effort service */
-        connect.ServiceID = WMI_DATA_BE_SVC;
-
-        status = ar6000_connectservice(ar,
-                                       &connect,
-                                       WMI_BEST_EFFORT_PRI,
-                                       "WMI DATA BE");
-        if (A_FAILED(status)) {
-            break;
-        }
-
-            /* connect to back-ground
-             * map this to WMI LOW_PRI */
-        connect.ServiceID = WMI_DATA_BK_SVC;
-        status = ar6000_connectservice(ar,
-                                       &connect,
-                                       WMI_LOW_PRI,
-                                       "WMI DATA BK");
-        if (A_FAILED(status)) {
-            break;
-        }
-
-            /* connect to Video service, map this to
-             * to HI PRI */
-        connect.ServiceID = WMI_DATA_VI_SVC;
-        status = ar6000_connectservice(ar,
-                                       &connect,
-                                       WMI_HIGH_PRI,
-                                       "WMI DATA VI");
-        if (A_FAILED(status)) {
-            break;
-        }
-
-            /* connect to VO service, this is currently not
-             * mapped to a WMI priority stream due to historical reasons.
-             * WMI originally defined 3 priorities over 3 mailboxes
-             * We can change this when WMI is reworked so that priorities are not
-             * dependent on mailboxes */
-        connect.ServiceID = WMI_DATA_VO_SVC;
-        status = ar6000_connectservice(ar,
-                                       &connect,
-                                       WMI_HIGHEST_PRI,
-                                       "WMI DATA VO");
-        if (A_FAILED(status)) {
-            break;
-        }
-
-        A_ASSERT(arWMIStream2EndpointID(ar,WMI_CONTROL_PRI) != 0);
-        A_ASSERT(arWMIStream2EndpointID(ar,WMI_BEST_EFFORT_PRI) != 0);
-        A_ASSERT(arWMIStream2EndpointID(ar,WMI_LOW_PRI) != 0);
-        A_ASSERT(arWMIStream2EndpointID(ar,WMI_HIGH_PRI) != 0);
-        A_ASSERT(arWMIStream2EndpointID(ar,WMI_HIGHEST_PRI) != 0);
-    } while (FALSE);
-
-    if (A_FAILED(status)) {
-        return (-EIO);
-    }
-
-    /*
-     * give our connected endpoints some buffers
-     */
-    ar6000_rx_refill(ar, arWMIStream2EndpointID(ar,WMI_CONTROL_PRI));
-
-    ar6000_rx_refill(ar, arWMIStream2EndpointID(ar,WMI_BEST_EFFORT_PRI));
-
-    /*
-     * We will post the receive buffers only for SPE testing and so we are
-     * making it conditional on the 'bypasswmi' flag.
-     */
-    if (bypasswmi) {
-        ar6000_rx_refill(ar,arWMIStream2EndpointID(ar,WMI_LOW_PRI));
-        ar6000_rx_refill(ar,arWMIStream2EndpointID(ar,WMI_HIGH_PRI));
-    }
-
-        /* setup credit distribution */
-    ar6000_setup_credit_dist(ar->arHtcTarget, &ar->arCreditStateInfo);
-
-    /* Since cookies are used for HTC transports, they should be */
-    /* initialized prior to enabling HTC.                        */
-    ar6000_cookie_init(ar);
-
-    /* start HTC */
-    status = HTCStart(ar->arHtcTarget);
-
-    if (status != A_OK) {
-        if (ar->arWmiEnabled == TRUE) {
-            wmi_shutdown(ar->arWmi);
-            ar->arWmiEnabled = FALSE;
-            ar->arWmi = NULL;
-        }
-        ar6000_cookie_cleanup(ar);
-        return -EIO;
-    }
-
-    if (!bypasswmi) {
-        /* Wait for Wmi event to be ready */
-        timeleft = wait_event_interruptible_timeout(arEvent,
-            (ar->arWmiReady == TRUE), wmitimeout * HZ);
-
-        if(!timeleft || signal_pending(current))
-        {
-            AR_DEBUG_PRINTF("WMI is not ready or wait was interrupted\n");
-#if defined(DWSIM) /* TBDXXX */
-            AR_DEBUG_PRINTF(".....but proceed anyway.\n");
-#else
-            return -EIO;
-#endif
-        }
-
-        AR_DEBUG_PRINTF("%s() WMI is ready\n", __func__);
-
-        /* Communicate the wmi protocol verision to the target */
-        if ((ar6000_set_host_app_area(ar)) != A_OK) {
-            AR_DEBUG_PRINTF("Unable to set the host app area\n");
-        }
-    }
-
-    ar->arNumDataEndPts = 1;
-
-    return(0);
-}
-
-
-void
-ar6000_bitrate_rx(void *devt, A_INT32 rateKbps)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)devt;
-
-    ar->arBitRate = rateKbps;
-    wake_up(&arEvent);
-}
-
-void
-ar6000_ratemask_rx(void *devt, A_UINT16 ratemask)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)devt;
-
-    ar->arRateMask = ratemask;
-    wake_up(&arEvent);
-}
-
-void
-ar6000_txPwr_rx(void *devt, A_UINT8 txPwr)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)devt;
-
-    ar->arTxPwr = txPwr;
-    wake_up(&arEvent);
-}
-
-
-void
-ar6000_channelList_rx(void *devt, A_INT8 numChan, A_UINT16 *chanList)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)devt;
-
-    A_MEMCPY(ar->arChannelList, chanList, numChan * sizeof (A_UINT16));
-    ar->arNumChannels = numChan;
-
-    wake_up(&arEvent);
-}
-
-A_UINT8
-ar6000_ibss_map_epid(struct sk_buff *skb, struct net_device *dev, A_UINT32 * mapNo)
-{
-    AR_SOFTC_T      *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    A_UINT8         *datap;
-    ATH_MAC_HDR     *macHdr;
-    A_UINT32         i, eptMap;
-
-    (*mapNo) = 0;
-    datap = A_NETBUF_DATA(skb);
-    macHdr = (ATH_MAC_HDR *)(datap + sizeof(WMI_DATA_HDR));
-    if (IEEE80211_IS_MULTICAST(macHdr->dstMac)) {
-        return ENDPOINT_2;
-    }
-
-    eptMap = -1;
-    for (i = 0; i < ar->arNodeNum; i ++) {
-        if (IEEE80211_ADDR_EQ(macHdr->dstMac, ar->arNodeMap[i].macAddress)) {
-            (*mapNo) = i + 1;
-            ar->arNodeMap[i].txPending ++;
-            return ar->arNodeMap[i].epId;
-        }
-
-        if ((eptMap == -1) && !ar->arNodeMap[i].txPending) {
-            eptMap = i;
-        }
-    }
-
-    if (eptMap == -1) {
-        eptMap = ar->arNodeNum;
-        ar->arNodeNum ++;
-        A_ASSERT(ar->arNodeNum <= MAX_NODE_NUM);
-    }
-
-    A_MEMCPY(ar->arNodeMap[eptMap].macAddress, macHdr->dstMac, IEEE80211_ADDR_LEN);
-
-    for (i = ENDPOINT_2; i <= ENDPOINT_5; i ++) {
-        if (!ar->arTxPending[i]) {
-            ar->arNodeMap[eptMap].epId = i;
-            break;
-        }
-        // No free endpoint is available, start redistribution on the inuse endpoints.
-        if (i == ENDPOINT_5) {
-            ar->arNodeMap[eptMap].epId = ar->arNexEpId;
-            ar->arNexEpId ++;
-            if (ar->arNexEpId > ENDPOINT_5) {
-                ar->arNexEpId = ENDPOINT_2;
-            }
-        }
-    }
-
-    (*mapNo) = eptMap + 1;
-    ar->arNodeMap[eptMap].txPending ++;
-
-    return ar->arNodeMap[eptMap].epId;
-}
-
-#ifdef DEBUG
-static void ar6000_dump_skb(struct sk_buff *skb)
-{
-   u_char *ch;
-   for (ch = A_NETBUF_DATA(skb);
-        (A_UINT32)ch < ((A_UINT32)A_NETBUF_DATA(skb) +
-        A_NETBUF_LEN(skb)); ch++)
-    {
-         AR_DEBUG_PRINTF("%2.2x ", *ch);
-    }
-    AR_DEBUG_PRINTF("\n");
-}
-#endif
-
-static int
-ar6000_data_tx(struct sk_buff *skb, struct net_device *dev)
-{
-    AR_SOFTC_T        *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    WMI_PRI_STREAM_ID streamID = WMI_NOT_MAPPED;
-    A_UINT32          mapNo = 0;
-    int               len;
-    struct ar_cookie *cookie;
-    A_BOOL            checkAdHocPsMapping = FALSE;
-
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,13)
-    skb->list = NULL;
-#endif
-
-    AR_DEBUG2_PRINTF("ar6000_data_tx start - skb=0x%x, data=0x%x, len=0x%x\n",
-                     (A_UINT32)skb, (A_UINT32)A_NETBUF_DATA(skb),
-                     A_NETBUF_LEN(skb));
-#ifdef CONFIG_HOST_TCMD_SUPPORT
-     /* TCMD doesnt support any data, free the buf and return */
-    if(ar->arTargetMode == AR6000_TCMD_MODE) {
-        A_NETBUF_FREE(skb);
-        return 0;
-    }
-#endif
-    do {
-
-        if (ar->arWmiReady == FALSE && bypasswmi == 0) {
-            break;
-        }
-
-#ifdef BLOCK_TX_PATH_FLAG
-        if (blocktx) {
-            break;
-        }
-#endif /* BLOCK_TX_PATH_FLAG */
-
-        if (ar->arWmiEnabled) {
-            if (A_NETBUF_HEADROOM(skb) < dev->hard_header_len) {
-                struct sk_buff  *newbuf;
-                /*
-                 * We really should have gotten enough headroom but sometimes
-                 * we still get packets with not enough headroom.  Copy the packet.
-                 */
-                len = A_NETBUF_LEN(skb);
-                newbuf = A_NETBUF_ALLOC(len);
-                if (newbuf == NULL) {
-                    break;
-                }
-                A_NETBUF_PUT(newbuf, len);
-                A_MEMCPY(A_NETBUF_DATA(newbuf), A_NETBUF_DATA(skb), len);
-                A_NETBUF_FREE(skb);
-                skb = newbuf;
-                /* fall through and assemble header */
-            }
-
-            if (wmi_dix_2_dot3(ar->arWmi, skb) != A_OK) {
-                AR_DEBUG_PRINTF("ar6000_data_tx - wmi_dix_2_dot3 failed\n");
-                break;
-            }
-
-            if (wmi_data_hdr_add(ar->arWmi, skb, DATA_MSGTYPE) != A_OK) {
-                AR_DEBUG_PRINTF("ar6000_data_tx - wmi_data_hdr_add failed\n");
-                break;
-            }
-
-            if ((ar->arNetworkType == ADHOC_NETWORK) &&
-                ar->arIbssPsEnable && ar->arConnected) {
-                    /* flag to check adhoc mapping once we take the lock below: */
-                checkAdHocPsMapping = TRUE;
-
-            } else {
-                    /* get the stream mapping */
-                if (ar->arWmmEnabled) {
-                    streamID = wmi_get_stream_id(ar->arWmi,
-                                    wmi_implicit_create_pstream(ar->arWmi, skb, UPLINK_TRAFFIC, UNDEFINED_PRI));
-                } else {
-                    streamID = WMI_BEST_EFFORT_PRI;
-                }
-            }
-
-        } else {
-            struct iphdr    *ipHdr;
-            /*
-             * the endpoint is directly based on the TOS field in the IP
-             * header **** only for testing ******
-             */
-            ipHdr = A_NETBUF_DATA(skb) + sizeof(ATH_MAC_HDR);
-                /* here we map the TOS field to an endpoint number, this is for
-                 * the endpointping test application */
-            streamID = IP_TOS_TO_WMI_PRI(ipHdr->tos);
-        }
-
-    } while (FALSE);
-
-        /* did we succeed ? */
-    if ((streamID == WMI_NOT_MAPPED) && !checkAdHocPsMapping) {
-            /* cleanup and exit */
-        A_NETBUF_FREE(skb);
-        AR6000_STAT_INC(ar, tx_dropped);
-        AR6000_STAT_INC(ar, tx_aborted_errors);
-        return 0;
-    }
-
-    cookie = NULL;
-
-        /* take the lock to protect driver data */
-    AR6000_SPIN_LOCK(&ar->arLock, 0);
-
-    do {
-
-        if (checkAdHocPsMapping) {
-            streamID = ar6000_ibss_map_epid(skb, dev, &mapNo);
-        }
-
-        A_ASSERT(streamID != WMI_NOT_MAPPED);
-
-            /* validate that the endpoint is connected */
-        if (arWMIStream2EndpointID(ar,streamID) == 0) {
-            AR_DEBUG_PRINTF("Stream %d is NOT mapped!\n",streamID);
-            break;
-        }
-            /* allocate resource for this packet */
-        cookie = ar6000_alloc_cookie(ar);
-
-        if (cookie != NULL) {
-                /* update counts while the lock is held */
-            ar->arTxPending[streamID]++;
-            ar->arTotalTxDataPending++;
-        }
-
-    } while (FALSE);
-
-    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-
-    if (cookie != NULL) {
-        cookie->arc_bp[0] = (A_UINT32)skb;
-        cookie->arc_bp[1] = mapNo;
-        SET_HTC_PACKET_INFO_TX(&cookie->HtcPkt,
-                               cookie,
-                               A_NETBUF_DATA(skb),
-                               A_NETBUF_LEN(skb),
-                               arWMIStream2EndpointID(ar,streamID),
-                               AR6K_DATA_PKT_TAG);
-
-#ifdef DEBUG
-        if (debugdriver >= 3) {
-            ar6000_dump_skb(skb);
-        }
-#endif
-            /* HTC interface is asynchronous, if this fails, cleanup will happen in
-             * the ar6000_tx_complete callback */
-        HTCSendPkt(ar->arHtcTarget, &cookie->HtcPkt);
-    } else {
-            /* no packet to send, cleanup */
-        A_NETBUF_FREE(skb);
-        AR6000_STAT_INC(ar, tx_dropped);
-        AR6000_STAT_INC(ar, tx_aborted_errors);
-    }
-
-    return 0;
-}
-
-#ifdef ADAPTIVE_POWER_THROUGHPUT_CONTROL
-static void
-tvsub(register struct timeval *out, register struct timeval *in)
-{
-    if((out->tv_usec -= in->tv_usec) < 0) {
-        out->tv_sec--;
-        out->tv_usec += 1000000;
-    }
-    out->tv_sec -= in->tv_sec;
-}
-
-void
-applyAPTCHeuristics(AR_SOFTC_T *ar)
-{
-    A_UINT32 duration;
-    A_UINT32 numbytes;
-    A_UINT32 throughput;
-    struct timeval ts;
-    A_STATUS status;
-
-    AR6000_SPIN_LOCK(&ar->arLock, 0);
-
-    if ((enableAPTCHeuristics) && (!aptcTR.timerScheduled)) {
-        do_gettimeofday(&ts);
-        tvsub(&ts, &aptcTR.samplingTS);
-        duration = ts.tv_sec * 1000 + ts.tv_usec / 1000; /* ms */
-        numbytes = aptcTR.bytesTransmitted + aptcTR.bytesReceived;
-
-        if (duration > APTC_TRAFFIC_SAMPLING_INTERVAL) {
-            /* Initialize the time stamp and byte count */
-            aptcTR.bytesTransmitted = aptcTR.bytesReceived = 0;
-            do_gettimeofday(&aptcTR.samplingTS);
-
-            /* Calculate and decide based on throughput thresholds */
-            throughput = ((numbytes * 8) / duration);
-            if (throughput > APTC_UPPER_THROUGHPUT_THRESHOLD) {
-                /* Disable Sleep and schedule a timer */
-                A_ASSERT(ar->arWmiReady == TRUE);
-                AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-                status = wmi_powermode_cmd(ar->arWmi, MAX_PERF_POWER);
-                AR6000_SPIN_LOCK(&ar->arLock, 0);
-                A_TIMEOUT_MS(&aptcTimer, APTC_TRAFFIC_SAMPLING_INTERVAL, 0);
-                aptcTR.timerScheduled = TRUE;
-            }
-        }
-    }
-
-    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-}
-#endif /* ADAPTIVE_POWER_THROUGHPUT_CONTROL */
-
-static void
-ar6000_tx_queue_full(void *Context, HTC_ENDPOINT_ID Endpoint)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *) Context;
-
-    if (Endpoint == arWMIStream2EndpointID(ar,WMI_CONTROL_PRI)) {
-        if (!bypasswmi) {
-                /* under normal WMI if this is getting full, then something is running rampant
-                 * the host should not be exhausting the WMI queue with too many commands
-                 * the only exception to this is during testing using endpointping */
-
-            AR6000_SPIN_LOCK(&ar->arLock, 0);
-                /* set flag to handle subsequent messages */
-            ar->arWMIControlEpFull = TRUE;
-            AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-            AR_DEBUG_PRINTF("WMI Control Endpoint is FULL!!! \n");
-        }
-    } else {
-        /* one of the data endpoints queues is getting full..need to stop network stack
-         * the queue will resume after credits received */
-        netif_stop_queue(ar->arNetDev);
-    }
-}
-
-static void
-ar6000_tx_queue_avail(void *Context, HTC_ENDPOINT_ID Endpoint)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)Context;
-
-    if (Endpoint == arWMIStream2EndpointID(ar,WMI_CONTROL_PRI)) {
-        /* FIXME: what do for it?  */
-    } else {
-        /* Wake up interface, rescheduling prevented.  */
-        if (ar->arConnected == TRUE || bypasswmi)
-            netif_wake_queue(ar->arNetDev);
-    }
-}
-
-static void
-ar6000_tx_complete(void *Context, HTC_PACKET *pPacket)
-{
-    AR_SOFTC_T     *ar = (AR_SOFTC_T *)Context;
-    void           *cookie = (void *)pPacket->pPktContext;
-    struct sk_buff *skb = NULL;
-    A_UINT32        mapNo = 0;
-    A_STATUS        status;
-    struct ar_cookie * ar_cookie;
-    WMI_PRI_STREAM_ID streamID;
-    A_BOOL          wakeEvent = FALSE;
-
-    status = pPacket->Status;
-    ar_cookie = (struct ar_cookie *)cookie;
-    skb = (struct sk_buff *)ar_cookie->arc_bp[0];
-    streamID = arEndpoint2WMIStreamID(ar,pPacket->Endpoint);
-    mapNo = ar_cookie->arc_bp[1];
-
-    A_ASSERT(skb);
-    A_ASSERT(pPacket->pBuffer == A_NETBUF_DATA(skb));
-
-    if (A_SUCCESS(status)) {
-        A_ASSERT(pPacket->ActualLength == A_NETBUF_LEN(skb));
-    }
-
-    AR_DEBUG2_PRINTF("ar6000_tx_complete skb=0x%x data=0x%x len=0x%x sid=%d ",
-                     (A_UINT32)skb, (A_UINT32)pPacket->pBuffer,
-                     pPacket->ActualLength,
-                     streamID);
-
-        /* lock the driver as we update internal state */
-    AR6000_SPIN_LOCK(&ar->arLock, 0);
-
-    ar->arTxPending[streamID]--;
-
-    if ((streamID != WMI_CONTROL_PRI) || bypasswmi) {
-        ar->arTotalTxDataPending--;
-    }
-
-    if (streamID == WMI_CONTROL_PRI)
-    {
-        if (ar->arWMIControlEpFull) {
-                /* since this packet completed, the WMI EP is no longer full */
-            ar->arWMIControlEpFull = FALSE;
-        }
-
-        if (ar->arTxPending[streamID] == 0) {
-            wakeEvent = TRUE;
-        }
-    }
-
-    if (A_FAILED(status)) {
-        AR_DEBUG_PRINTF("%s() -TX ERROR, status: 0x%x\n", __func__,
-                        status);
-        AR6000_STAT_INC(ar, tx_errors);
-    } else {
-        AR_DEBUG2_PRINTF("OK\n");
-        AR6000_STAT_INC(ar, tx_packets);
-        ar->arNetStats.tx_bytes += A_NETBUF_LEN(skb);
-#ifdef ADAPTIVE_POWER_THROUGHPUT_CONTROL
-        aptcTR.bytesTransmitted += a_netbuf_to_len(skb);
-        applyAPTCHeuristics(ar);
-#endif /* ADAPTIVE_POWER_THROUGHPUT_CONTROL */
-    }
-
-    // TODO this needs to be looked at
-    if ((ar->arNetworkType == ADHOC_NETWORK) && ar->arIbssPsEnable
-        && (streamID != WMI_CONTROL_PRI) && mapNo)
-    {
-        mapNo --;
-        ar->arNodeMap[mapNo].txPending --;
-
-        if (!ar->arNodeMap[mapNo].txPending && (mapNo == (ar->arNodeNum - 1))) {
-            A_UINT32 i;
-            for (i = ar->arNodeNum; i > 0; i --) {
-                if (!ar->arNodeMap[i - 1].txPending) {
-                    A_MEMZERO(&ar->arNodeMap[i - 1], sizeof(struct ar_node_mapping));
-                    ar->arNodeNum --;
-                } else {
-                    break;
-                }
-            }
-        }
-    }
-
-    /* Freeing a cookie should not be contingent on either of */
-    /* these flags, just if we have a cookie or not.           */
-    /* Can we even get here without a cookie? Fix later.       */
-    if (ar->arWmiReady == TRUE || (bypasswmi))
-    {
-        ar6000_free_cookie(ar, cookie);
-    }
-
-    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-
-    /* lock is released, we can freely call other kernel APIs */
-
-        /* this indirectly frees the HTC_PACKET */
-    A_NETBUF_FREE(skb);
-
-    if (wakeEvent) {
-        wake_up(&arEvent);
-    }
-}
-
-/*
- * Receive event handler.  This is called by HTC when a packet is received
- */
-int pktcount;
-static void
-ar6000_rx(void *Context, HTC_PACKET *pPacket)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)Context;
-    struct sk_buff *skb = (struct sk_buff *)pPacket->pPktContext;
-    int minHdrLen;
-    A_STATUS        status = pPacket->Status;
-    WMI_PRI_STREAM_ID streamID = arEndpoint2WMIStreamID(ar,pPacket->Endpoint);
-    HTC_ENDPOINT_ID   ept = pPacket->Endpoint;
-
-    A_ASSERT((status != A_OK) || (pPacket->pBuffer == (A_NETBUF_DATA(skb) + HTC_HEADER_LEN)));
-
-    AR_DEBUG2_PRINTF("ar6000_rx ar=0x%x sid=%d, skb=0x%x, data=0x%x, len=0x%x ",
-                    (A_UINT32)ar, streamID, (A_UINT32)skb, (A_UINT32)pPacket->pBuffer,
-                    pPacket->ActualLength);
-    if (status != A_OK) {
-        AR_DEBUG2_PRINTF("ERR\n");
-    } else {
-        AR_DEBUG2_PRINTF("OK\n");
-    }
-
-        /* take lock to protect buffer counts
-         * and adaptive power throughput state */
-    AR6000_SPIN_LOCK(&ar->arLock, 0);
-
-    ar->arRxBuffers[streamID]--;
-
-    if (A_SUCCESS(status)) {
-        AR6000_STAT_INC(ar, rx_packets);
-        ar->arNetStats.rx_bytes += pPacket->ActualLength;
-#ifdef ADAPTIVE_POWER_THROUGHPUT_CONTROL
-        aptcTR.bytesReceived += a_netbuf_to_len(skb);
-        applyAPTCHeuristics(ar);
-#endif /* ADAPTIVE_POWER_THROUGHPUT_CONTROL */
-
-        A_NETBUF_PUT(skb, pPacket->ActualLength +  HTC_HEADER_LEN);
-        A_NETBUF_PULL(skb, HTC_HEADER_LEN);
-
-#ifdef DEBUG
-        if (debugdriver >= 2) {
-            ar6000_dump_skb(skb);
-        }
-#endif /* DEBUG */
-    }
-
-    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-
-    if (status != A_OK) {
-        AR6000_STAT_INC(ar, rx_errors);
-        A_NETBUF_FREE(skb);
-    } else if (ar->arWmiEnabled == TRUE) {
-        if (streamID == WMI_CONTROL_PRI) {
-           /*
-            * this is a wmi control msg
-            */
-            wmi_control_rx(ar->arWmi, skb);
-        } else {
-            WMI_DATA_HDR *dhdr = (WMI_DATA_HDR *)A_NETBUF_DATA(skb);
-            if (WMI_DATA_HDR_IS_MSG_TYPE(dhdr, CNTL_MSGTYPE)) {
-                /*
-                 * this is a wmi control msg
-                 */
-                /* strip off WMI hdr */
-                wmi_data_hdr_remove(ar->arWmi, skb);
-                wmi_control_rx(ar->arWmi, skb);
-            } else {
-                /*
-                 * this is a wmi data packet
-                 */
-                minHdrLen = sizeof (WMI_DATA_HDR) + sizeof(ATH_MAC_HDR) +
-                            sizeof(ATH_LLC_SNAP_HDR);
-
-                if ((pPacket->ActualLength < minHdrLen) ||
-                    (pPacket->ActualLength > AR6000_BUFFER_SIZE))
-                {
-                    /*
-                     * packet is too short or too long
-                     */
-                    AR_DEBUG_PRINTF("TOO SHORT or TOO LONG\n");
-                    AR6000_STAT_INC(ar, rx_errors);
-                    AR6000_STAT_INC(ar, rx_length_errors);
-                    A_NETBUF_FREE(skb);
-                } else {
-                    if (ar->arWmmEnabled) {
-                        wmi_implicit_create_pstream(ar->arWmi, skb,
-                            DNLINK_TRAFFIC, UNDEFINED_PRI);
-                    }
-#if 0
-                    /* Access RSSI values here */
-                    AR_DEBUG_PRINTF("RSSI %d\n",
-                        ((WMI_DATA_HDR *) A_NETBUF_DATA(skb))->rssi);
-#endif
-                    wmi_data_hdr_remove(ar->arWmi, skb);
-                    wmi_dot3_2_dix(ar->arWmi, skb);
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-                    /*
-                     * extra push and memcpy, for eth_type_trans() of 2.4 kernel
-                     * will pull out hard_header_len bytes of the skb.
-                     */
-                    A_NETBUF_PUSH(skb, sizeof(WMI_DATA_HDR) + sizeof(ATH_LLC_SNAP_HDR) + HTC_HEADER_LEN);
-                    A_MEMCPY(A_NETBUF_DATA(skb), A_NETBUF_DATA(skb) + sizeof(WMI_DATA_HDR) +
-                             sizeof(ATH_LLC_SNAP_HDR) + HTC_HEADER_LEN, sizeof(ATH_MAC_HDR));
-#endif
-                    if ((ar->arNetDev->flags & IFF_UP) == IFF_UP)
-                    {
-                        skb->dev = ar->arNetDev;
-                        skb->protocol = eth_type_trans(skb, ar->arNetDev);
-                        netif_rx(skb);
-                    }
-                    else
-                    {
-                        A_NETBUF_FREE(skb);
-                    }
-                }
-            }
-        }
-    } else {
-        if ((ar->arNetDev->flags & IFF_UP) == IFF_UP)
-        {
-            skb->dev = ar->arNetDev;
-            skb->protocol = eth_type_trans(skb, ar->arNetDev);
-            netif_rx(skb);
-        }
-        else
-        {
-            A_NETBUF_FREE(skb);
-        }
-    }
-
-    if (status != A_ECANCELED) {
-        /*
-         * HTC provides A_ECANCELED status when it doesn't want to be refilled
-         * (probably due to a shutdown)
-         */
-        ar6000_rx_refill(Context, ept);
-    }
-
-
-}
-
-static void
-ar6000_rx_refill(void *Context, HTC_ENDPOINT_ID Endpoint)
-{
-    AR_SOFTC_T  *ar = (AR_SOFTC_T *)Context;
-    void        *osBuf;
-    int         RxBuffers;
-    int         buffersToRefill;
-    HTC_PACKET  *pPacket;
-    WMI_PRI_STREAM_ID streamId = arEndpoint2WMIStreamID(ar,Endpoint);
-
-    buffersToRefill = (int)AR6000_MAX_RX_BUFFERS -
-                                    (int)ar->arRxBuffers[streamId];
-
-    if (buffersToRefill <= 0) {
-            /* fast return, nothing to fill */
-        return;
-    }
-
-    AR_DEBUG2_PRINTF("ar6000_rx_refill: providing htc with %d buffers at eid=%d\n",
-                    buffersToRefill, Endpoint);
-
-    for (RxBuffers = 0; RxBuffers < buffersToRefill; RxBuffers++) {
-        osBuf = A_NETBUF_ALLOC(AR6000_BUFFER_SIZE);
-        if (NULL == osBuf) {
-            break;
-        }
-            /* the HTC packet wrapper is at the head of the reserved area
-             * in the skb */
-        pPacket = (HTC_PACKET *)(A_NETBUF_HEAD(osBuf));
-            /* set re-fill info */
-        SET_HTC_PACKET_INFO_RX_REFILL(pPacket,osBuf,A_NETBUF_DATA(osBuf),AR6000_BUFFER_SIZE,Endpoint);
-            /* add this packet */
-        HTCAddReceivePkt(ar->arHtcTarget, pPacket);
-    }
-
-        /* update count */
-    AR6000_SPIN_LOCK(&ar->arLock, 0);
-    ar->arRxBuffers[streamId] += RxBuffers;
-    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-}
-
-static struct net_device_stats *
-ar6000_get_stats(struct net_device *dev)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    return &ar->arNetStats;
-}
-
-static struct iw_statistics *
-ar6000_get_iwstats(struct net_device * dev)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    TARGET_STATS *pStats = &ar->arTargetStats;
-    struct iw_statistics * pIwStats = &ar->arIwStats;
-
-    if ((ar->arWmiReady == FALSE)
-    /*
-     * The in_atomic function is used to determine if the scheduling is
-     * allowed in the current context or not. This was introduced in 2.6
-     * From what I have read on the differences between 2.4 and 2.6, the
-     * 2.4 kernel did not support preemption and so this check might not
-     * be required for 2.4 kernels.
-     */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-        || (in_atomic())
-#endif
-       )
-    {
-        pIwStats->status = 0;
-        pIwStats->qual.qual = 0;
-        pIwStats->qual.level =0;
-        pIwStats->qual.noise = 0;
-        pIwStats->discard.code =0;
-        pIwStats->discard.retries=0;
-        pIwStats->miss.beacon =0;
-        return pIwStats;
-    }
-    if (down_interruptible(&ar->arSem)) {
-        pIwStats->status = 0;
-        return pIwStats;
-    }
-
-
-    ar->statsUpdatePending = TRUE;
-
-    if(wmi_get_stats_cmd(ar->arWmi) != A_OK) {
-        up(&ar->arSem);
-        pIwStats->status = 0;
-        return pIwStats;
-    }
-
-    wait_event_interruptible_timeout(arEvent, ar->statsUpdatePending == FALSE, wmitimeout * HZ);
-
-    if (signal_pending(current)) {
-        AR_DEBUG_PRINTF("ar6000 : WMI get stats timeout \n");
-        up(&ar->arSem);
-        pIwStats->status = 0;
-        return pIwStats;
-    }
-    pIwStats->status = 1 ;
-    pIwStats->qual.qual = pStats->cs_aveBeacon_rssi;
-    pIwStats->qual.level =pStats->cs_aveBeacon_rssi + 161;  /* noise is -95 dBm */
-    pIwStats->qual.noise = pStats->noise_floor_calibation;
-    pIwStats->discard.code = pStats->rx_decrypt_err;
-    pIwStats->discard.retries = pStats->tx_retry_cnt;
-    pIwStats->miss.beacon = pStats->cs_bmiss_cnt;
-    up(&ar->arSem);
-    return pIwStats;
-}
-
-void
-ar6000_ready_event(void *devt, A_UINT8 *datap, A_UINT8 phyCap)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)devt;
-    struct net_device *dev = ar->arNetDev;
-
-    ar->arWmiReady = TRUE;
-    wake_up(&arEvent);
-    A_MEMCPY(dev->dev_addr, datap, AR6000_ETH_ADDR_LEN);
-    AR_DEBUG_PRINTF("mac address = %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n",
-        dev->dev_addr[0], dev->dev_addr[1],
-        dev->dev_addr[2], dev->dev_addr[3],
-        dev->dev_addr[4], dev->dev_addr[5]);
-
-    ar->arPhyCapability = phyCap;
-}
-
-A_UINT8
-ar6000_iptos_to_userPriority(A_UINT8 *pkt)
-{
-    struct iphdr *ipHdr = (struct iphdr *)pkt;
-    A_UINT8 userPriority;
-
-    /*
-     * IP Tos format :
-     *      (Refer Pg 57 WMM-test-plan-v1.2)
-     * IP-TOS - 8bits
-     *          : DSCP(6-bits) ECN(2-bits)
-     *          : DSCP - P2 P1 P0 X X X
-     *              where (P2 P1 P0) form 802.1D
-     */
-    userPriority = ipHdr->tos >> 5;
-    return (userPriority & 0x7);
-}
-
-void
-ar6000_connect_event(AR_SOFTC_T *ar, A_UINT16 channel, A_UINT8 *bssid,
-                     A_UINT16 listenInterval, A_UINT16 beaconInterval,
-                     NETWORK_TYPE networkType, A_UINT8 beaconIeLen,
-                     A_UINT8 assocReqLen, A_UINT8 assocRespLen,
-                     A_UINT8 *assocInfo)
-{
-    union iwreq_data wrqu;
-    int i, beacon_ie_pos, assoc_resp_ie_pos, assoc_req_ie_pos;
-    static const char *tag1 = "ASSOCINFO(ReqIEs=";
-    static const char *tag2 = "ASSOCRESPIE=";
-    static const char *beaconIetag = "BEACONIE=";
-    char buf[WMI_CONTROL_MSG_MAX_LEN * 2 + sizeof(tag1)];
-    char *pos;
-    A_UINT8 key_op_ctrl;
-
-    A_MEMCPY(ar->arBssid, bssid, sizeof(ar->arBssid));
-    ar->arBssChannel = channel;
-
-    A_PRINTF("AR6000 connected event on freq %d ", channel);
-    A_PRINTF("with bssid %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x "
-            " listenInterval=%d, beaconInterval = %d, beaconIeLen = %d assocReqLen=%d"
-            " assocRespLen =%d\n",
-             bssid[0], bssid[1], bssid[2],
-             bssid[3], bssid[4], bssid[5],
-             listenInterval, beaconInterval,
-             beaconIeLen, assocReqLen, assocRespLen);
-    if (networkType & ADHOC_NETWORK) {
-        if (networkType & ADHOC_CREATOR) {
-            A_PRINTF("Network: Adhoc (Creator)\n");
-        } else {
-            A_PRINTF("Network: Adhoc (Joiner)\n");
-        }
-    } else {
-        A_PRINTF("Network: Infrastructure\n");
-    }
-
-    if (beaconIeLen && (sizeof(buf) > (9 + beaconIeLen * 2))) {
-        AR_DEBUG_PRINTF("\nBeaconIEs= ");
-
-        beacon_ie_pos = 0;
-        A_MEMZERO(buf, sizeof(buf));
-        sprintf(buf, "%s", beaconIetag);
-        pos = buf + 9;
-        for (i = beacon_ie_pos; i < beacon_ie_pos + beaconIeLen; i++) {
-            AR_DEBUG_PRINTF("%2.2x ", assocInfo[i]);
-            sprintf(pos, "%2.2x", assocInfo[i]);
-            pos += 2;
-        }
-        AR_DEBUG_PRINTF("\n");
-
-        A_MEMZERO(&wrqu, sizeof(wrqu));
-        wrqu.data.length = strlen(buf);
-        wireless_send_event(ar->arNetDev, IWEVCUSTOM, &wrqu, buf);
-    }
-
-    if (assocRespLen && (sizeof(buf) > (12 + (assocRespLen * 2))))
-    {
-        assoc_resp_ie_pos = beaconIeLen + assocReqLen +
-                            sizeof(A_UINT16)  +  /* capinfo*/
-                            sizeof(A_UINT16)  +  /* status Code */
-                            sizeof(A_UINT16)  ;  /* associd */
-        A_MEMZERO(buf, sizeof(buf));
-        sprintf(buf, "%s", tag2);
-        pos = buf + 12;
-        AR_DEBUG_PRINTF("\nAssocRespIEs= ");
-        /*
-         * The Association Response Frame w.o. the WLAN header is delivered to
-         * the host, so skip over to the IEs
-         */
-        for (i = assoc_resp_ie_pos; i < assoc_resp_ie_pos + assocRespLen - 6; i++)
-        {
-            AR_DEBUG_PRINTF("%2.2x ", assocInfo[i]);
-            sprintf(pos, "%2.2x", assocInfo[i]);
-            pos += 2;
-        }
-        AR_DEBUG_PRINTF("\n");
-
-        A_MEMZERO(&wrqu, sizeof(wrqu));
-        wrqu.data.length = strlen(buf);
-        wireless_send_event(ar->arNetDev, IWEVCUSTOM, &wrqu, buf);
-    }
-
-    if (assocReqLen && (sizeof(buf) > (17 + (assocReqLen * 2)))) {
-        /*
-         * assoc Request includes capability and listen interval. Skip these.
-         */
-        assoc_req_ie_pos =  beaconIeLen +
-                            sizeof(A_UINT16)  +  /* capinfo*/
-                            sizeof(A_UINT16);    /* listen interval */
-
-        A_MEMZERO(buf, sizeof(buf));
-        sprintf(buf, "%s", tag1);
-        pos = buf + 17;
-        AR_DEBUG_PRINTF("AssocReqIEs= ");
-        for (i = assoc_req_ie_pos; i < assoc_req_ie_pos + assocReqLen - 4; i++) {
-            AR_DEBUG_PRINTF("%2.2x ", assocInfo[i]);
-            sprintf(pos, "%2.2x", assocInfo[i]);
-            pos += 2;;
-        }
-        AR_DEBUG_PRINTF("\n");
-
-        A_MEMZERO(&wrqu, sizeof(wrqu));
-        wrqu.data.length = strlen(buf);
-        wireless_send_event(ar->arNetDev, IWEVCUSTOM, &wrqu, buf);
-    }
-
-#ifdef USER_KEYS
-    if (ar->user_savedkeys_stat == USER_SAVEDKEYS_STAT_RUN &&
-        ar->user_saved_keys.keyOk == TRUE)
-    {
-
-        key_op_ctrl = KEY_OP_VALID_MASK & ~KEY_OP_INIT_TSC;
-        if (ar->user_key_ctrl & AR6000_USER_SETKEYS_RSC_UNCHANGED) {
-            key_op_ctrl &= ~KEY_OP_INIT_RSC;
-        } else {
-            key_op_ctrl |= KEY_OP_INIT_RSC;
-        }
-        ar6000_reinstall_keys(ar, key_op_ctrl);
-    }
-#endif /* USER_KEYS */
-
-        /* flush data queues */
-    ar6000_TxDataCleanup(ar);
-
-    netif_start_queue(ar->arNetDev);
-
-    if ((OPEN_AUTH == ar->arDot11AuthMode) &&
-        (NONE_AUTH == ar->arAuthMode)      &&
-        (WEP_CRYPT == ar->arPairwiseCrypto))
-    {
-        if (!ar->arConnected) {
-            ar6000_install_static_wep_keys(ar);
-        }
-    }
-
-    ar->arConnected  = TRUE;
-    ar->arConnectPending = FALSE;
-
-    reconnect_flag = 0;
-
-    A_MEMZERO(&wrqu, sizeof(wrqu));
-    A_MEMCPY(wrqu.addr.sa_data, bssid, IEEE80211_ADDR_LEN);
-    wrqu.addr.sa_family = ARPHRD_ETHER;
-    wireless_send_event(ar->arNetDev, SIOCGIWAP, &wrqu, NULL);
-    if ((ar->arNetworkType == ADHOC_NETWORK) && ar->arIbssPsEnable) {
-        A_MEMZERO(ar->arNodeMap, sizeof(ar->arNodeMap));
-        ar->arNodeNum = 0;
-        ar->arNexEpId = ENDPOINT_2;
-    }
-
-}
-
-void ar6000_set_numdataendpts(AR_SOFTC_T *ar, A_UINT32 num)
-{
-    A_ASSERT(num <= (HTC_MAILBOX_NUM_MAX - 1));
-    ar->arNumDataEndPts = num;
-}
-
-void
-ar6000_disconnect_event(AR_SOFTC_T *ar, A_UINT8 reason, A_UINT8 *bssid,
-                        A_UINT8 assocRespLen, A_UINT8 *assocInfo, A_UINT16 protocolReasonStatus)
-{
-    A_UINT8 i;
-
-    A_PRINTF("AR6000 disconnected");
-    if (bssid[0] || bssid[1] || bssid[2] || bssid[3] || bssid[4] || bssid[5]) {
-        A_PRINTF(" from %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x ",
-                 bssid[0], bssid[1], bssid[2], bssid[3], bssid[4], bssid[5]);
-    }
-    A_PRINTF("\n");
-
-    AR_DEBUG_PRINTF("\nDisconnect Reason is %d", reason);
-    AR_DEBUG_PRINTF("\nProtocol Reason/Status Code is %d", protocolReasonStatus);
-    AR_DEBUG_PRINTF("\nAssocResp Frame = %s",
-                    assocRespLen ? " " : "NULL");
-    for (i = 0; i < assocRespLen; i++) {
-        if (!(i % 0x10)) {
-            AR_DEBUG_PRINTF("\n");
-        }
-        AR_DEBUG_PRINTF("%2.2x ", assocInfo[i]);
-    }
-    AR_DEBUG_PRINTF("\n");
-    /*
-     * If the event is due to disconnect cmd from the host, only they the target
-     * would stop trying to connect. Under any other condition, target would
-     * keep trying to connect.
-     *
-     */
-    if( reason == DISCONNECT_CMD)
-    {
-        ar->arConnectPending = FALSE;
-    } else {
-        ar->arConnectPending = TRUE;
-        if (((reason == ASSOC_FAILED) && (protocolReasonStatus == 0x11)) ||
-            ((reason == ASSOC_FAILED) && (protocolReasonStatus == 0x0) && (reconnect_flag == 1))) {
-            ar->arConnected = TRUE;
-            return;
-        }
-    }
-    ar->arConnected = FALSE;
-
-    if( (reason != CSERV_DISCONNECT) || (reconnect_flag != 1) ) {
-        reconnect_flag = 0;
-    }
-
-#ifdef USER_KEYS
-    if (reason != CSERV_DISCONNECT)
-    {
-        ar->user_savedkeys_stat = USER_SAVEDKEYS_STAT_INIT;
-        ar->user_key_ctrl      = 0;
-    }
-#endif /* USER_KEYS */
-
-    netif_stop_queue(ar->arNetDev);
-    A_MEMZERO(ar->arBssid, sizeof(ar->arBssid));
-    ar->arBssChannel = 0;
-    ar->arBeaconInterval = 0;
-
-    ar6000_TxDataCleanup(ar);
-}
-
-void
-ar6000_regDomain_event(AR_SOFTC_T *ar, A_UINT32 regCode)
-{
-    A_PRINTF("AR6000 Reg Code = 0x%x\n", regCode);
-    ar->arRegCode = regCode;
-}
-
-void
-ar6000_neighborReport_event(AR_SOFTC_T *ar, int numAps, WMI_NEIGHBOR_INFO *info)
-{
-    static const char *tag = "PRE-AUTH";
-    char buf[128];
-    union iwreq_data wrqu;
-    int i;
-
-    AR_DEBUG_PRINTF("AR6000 Neighbor Report Event\n");
-    for (i=0; i < numAps; info++, i++) {
-        AR_DEBUG_PRINTF("bssid %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x ",
-            info->bssid[0], info->bssid[1], info->bssid[2],
-            info->bssid[3], info->bssid[4], info->bssid[5]);
-        if (info->bssFlags & WMI_PREAUTH_CAPABLE_BSS) {
-            AR_DEBUG_PRINTF("preauth-cap");
-        }
-        if (info->bssFlags & WMI_PMKID_VALID_BSS) {
-            AR_DEBUG_PRINTF(" pmkid-valid\n");
-            continue;           /* we skip bss if the pmkid is already valid */
-        }
-        AR_DEBUG_PRINTF("\n");
-        snprintf(buf, sizeof(buf), "%s%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x",
-                 tag,
-                 info->bssid[0], info->bssid[1], info->bssid[2],
-                 info->bssid[3], info->bssid[4], info->bssid[5],
-                 i, info->bssFlags);
-        A_MEMZERO(&wrqu, sizeof(wrqu));
-        wrqu.data.length = strlen(buf);
-        wireless_send_event(ar->arNetDev, IWEVCUSTOM, &wrqu, buf);
-    }
-}
-
-void
-ar6000_tkip_micerr_event(AR_SOFTC_T *ar, A_UINT8 keyid, A_BOOL ismcast)
-{
-    static const char *tag = "MLME-MICHAELMICFAILURE.indication";
-    char buf[128];
-    union iwreq_data wrqu;
-
-    A_PRINTF("AR6000 TKIP MIC error received for keyid %d %scast\n",
-             keyid, ismcast ? "multi": "uni");
-    snprintf(buf, sizeof(buf), "%s(keyid=%d %scat)", tag, keyid,
-             ismcast ? "multi" : "uni");
-    memset(&wrqu, 0, sizeof(wrqu));
-    wrqu.data.length = strlen(buf);
-    wireless_send_event(ar->arNetDev, IWEVCUSTOM, &wrqu, buf);
-}
-
-void
-ar6000_scanComplete_event(AR_SOFTC_T *ar, A_STATUS status)
-{
-	AR_DEBUG_PRINTF("AR6000 scan complete: %d\n", status);
-
-	ar->scan_complete = 1;
-	wake_up_interruptible(&ar6000_scan_queue);
-}
-
-void
-ar6000_targetStats_event(AR_SOFTC_T *ar,  WMI_TARGET_STATS *pTarget)
-{
-    TARGET_STATS *pStats = &ar->arTargetStats;
-    A_UINT8 ac;
-
-    /*A_PRINTF("AR6000 updating target stats\n");*/
-    pStats->tx_packets          += pTarget->txrxStats.tx_stats.tx_packets;
-    pStats->tx_bytes            += pTarget->txrxStats.tx_stats.tx_bytes;
-    pStats->tx_unicast_pkts     += pTarget->txrxStats.tx_stats.tx_unicast_pkts;
-    pStats->tx_unicast_bytes    += pTarget->txrxStats.tx_stats.tx_unicast_bytes;
-    pStats->tx_multicast_pkts   += pTarget->txrxStats.tx_stats.tx_multicast_pkts;
-    pStats->tx_multicast_bytes  += pTarget->txrxStats.tx_stats.tx_multicast_bytes;
-    pStats->tx_broadcast_pkts   += pTarget->txrxStats.tx_stats.tx_broadcast_pkts;
-    pStats->tx_broadcast_bytes  += pTarget->txrxStats.tx_stats.tx_broadcast_bytes;
-    pStats->tx_rts_success_cnt  += pTarget->txrxStats.tx_stats.tx_rts_success_cnt;
-    for(ac = 0; ac < WMM_NUM_AC; ac++)
-        pStats->tx_packet_per_ac[ac] += pTarget->txrxStats.tx_stats.tx_packet_per_ac[ac];
-    pStats->tx_errors           += pTarget->txrxStats.tx_stats.tx_errors;
-    pStats->tx_failed_cnt       += pTarget->txrxStats.tx_stats.tx_failed_cnt;
-    pStats->tx_retry_cnt        += pTarget->txrxStats.tx_stats.tx_retry_cnt;
-    pStats->tx_rts_fail_cnt     += pTarget->txrxStats.tx_stats.tx_rts_fail_cnt;
-    pStats->tx_unicast_rate      = wmi_get_rate(pTarget->txrxStats.tx_stats.tx_unicast_rate);
-
-    pStats->rx_packets          += pTarget->txrxStats.rx_stats.rx_packets;
-    pStats->rx_bytes            += pTarget->txrxStats.rx_stats.rx_bytes;
-    pStats->rx_unicast_pkts     += pTarget->txrxStats.rx_stats.rx_unicast_pkts;
-    pStats->rx_unicast_bytes    += pTarget->txrxStats.rx_stats.rx_unicast_bytes;
-    pStats->rx_multicast_pkts   += pTarget->txrxStats.rx_stats.rx_multicast_pkts;
-    pStats->rx_multicast_bytes  += pTarget->txrxStats.rx_stats.rx_multicast_bytes;
-    pStats->rx_broadcast_pkts   += pTarget->txrxStats.rx_stats.rx_broadcast_pkts;
-    pStats->rx_broadcast_bytes  += pTarget->txrxStats.rx_stats.rx_broadcast_bytes;
-    pStats->rx_fragment_pkt     += pTarget->txrxStats.rx_stats.rx_fragment_pkt;
-    pStats->rx_errors           += pTarget->txrxStats.rx_stats.rx_errors;
-    pStats->rx_crcerr           += pTarget->txrxStats.rx_stats.rx_crcerr;
-    pStats->rx_key_cache_miss   += pTarget->txrxStats.rx_stats.rx_key_cache_miss;
-    pStats->rx_decrypt_err      += pTarget->txrxStats.rx_stats.rx_decrypt_err;
-    pStats->rx_duplicate_frames += pTarget->txrxStats.rx_stats.rx_duplicate_frames;
-    pStats->rx_unicast_rate      = wmi_get_rate(pTarget->txrxStats.rx_stats.rx_unicast_rate);
-
-
-    pStats->tkip_local_mic_failure
-                                += pTarget->txrxStats.tkipCcmpStats.tkip_local_mic_failure;
-    pStats->tkip_counter_measures_invoked
-                                += pTarget->txrxStats.tkipCcmpStats.tkip_counter_measures_invoked;
-    pStats->tkip_replays        += pTarget->txrxStats.tkipCcmpStats.tkip_replays;
-    pStats->tkip_format_errors  += pTarget->txrxStats.tkipCcmpStats.tkip_format_errors;
-    pStats->ccmp_format_errors  += pTarget->txrxStats.tkipCcmpStats.ccmp_format_errors;
-    pStats->ccmp_replays        += pTarget->txrxStats.tkipCcmpStats.ccmp_replays;
-
-
-    pStats->power_save_failure_cnt += pTarget->pmStats.power_save_failure_cnt;
-    pStats->noise_floor_calibation = pTarget->noise_floor_calibation;
-
-    pStats->cs_bmiss_cnt        += pTarget->cservStats.cs_bmiss_cnt;
-    pStats->cs_lowRssi_cnt      += pTarget->cservStats.cs_lowRssi_cnt;
-    pStats->cs_connect_cnt      += pTarget->cservStats.cs_connect_cnt;
-    pStats->cs_disconnect_cnt   += pTarget->cservStats.cs_disconnect_cnt;
-    pStats->cs_aveBeacon_snr    = pTarget->cservStats.cs_aveBeacon_snr;
-    pStats->cs_aveBeacon_rssi   = pTarget->cservStats.cs_aveBeacon_rssi;
-    pStats->cs_lastRoam_msec    = pTarget->cservStats.cs_lastRoam_msec;
-    pStats->cs_snr              = pTarget->cservStats.cs_snr;
-    pStats->cs_rssi             = pTarget->cservStats.cs_rssi;
-
-    pStats->lq_val              = pTarget->lqVal;
-
-    pStats->wow_num_pkts_dropped += pTarget->wowStats.wow_num_pkts_dropped;
-    pStats->wow_num_host_pkt_wakeups += pTarget->wowStats.wow_num_host_pkt_wakeups;
-    pStats->wow_num_host_event_wakeups += pTarget->wowStats.wow_num_host_event_wakeups;
-    pStats->wow_num_events_discarded += pTarget->wowStats.wow_num_events_discarded;
-
-    ar->statsUpdatePending = FALSE;
-    wake_up(&arEvent);
-}
-
-void
-ar6000_rssiThreshold_event(AR_SOFTC_T *ar,  WMI_RSSI_THRESHOLD_VAL newThreshold, A_INT16 rssi)
-{
-    USER_RSSI_THOLD userRssiThold;
-
-    userRssiThold.tag = rssi_map[newThreshold].tag;
-    userRssiThold.rssi = rssi;
-    AR_DEBUG2_PRINTF("rssi Threshold range = %d tag = %d  rssi = %d\n", newThreshold, userRssiThold.tag, rssi);
-#ifdef SEND_EVENT_TO_APP
-    ar6000_send_event_to_app(ar, WMI_RSSI_THRESHOLD_EVENTID,(A_UINT8 *)&userRssiThold, sizeof(USER_RSSI_THOLD));
-#endif
-}
-
-
-void
-ar6000_hbChallengeResp_event(AR_SOFTC_T *ar, A_UINT32 cookie, A_UINT32 source)
-{
-    if (source == APP_HB_CHALLENGE) {
-        /* Report it to the app in case it wants a positive acknowledgement */
-#ifdef SEND_EVENT_TO_APP
-        ar6000_send_event_to_app(ar, WMIX_HB_CHALLENGE_RESP_EVENTID,
-                                 (A_UINT8 *)&cookie, sizeof(cookie));
-#endif
-    } else {
-        /* This would ignore the replys that come in after their due time */
-        if (cookie == ar->arHBChallengeResp.seqNum) {
-            ar->arHBChallengeResp.outstanding = FALSE;
-        }
-    }
-}
-
-
-void
-ar6000_reportError_event(AR_SOFTC_T *ar, WMI_TARGET_ERROR_VAL errorVal)
-{
-    char    *errString[] = {
-                [WMI_TARGET_PM_ERR_FAIL]    "WMI_TARGET_PM_ERR_FAIL",
-                [WMI_TARGET_KEY_NOT_FOUND]  "WMI_TARGET_KEY_NOT_FOUND",
-                [WMI_TARGET_DECRYPTION_ERR] "WMI_TARGET_DECRYPTION_ERR",
-                [WMI_TARGET_BMISS]          "WMI_TARGET_BMISS",
-                [WMI_PSDISABLE_NODE_JOIN]   "WMI_PSDISABLE_NODE_JOIN"
-                };
-
-    A_PRINTF("AR6000 Error on Target. Error = 0x%x\n", errorVal);
-
-    /* One error is reported at a time, and errorval is a bitmask */
-    if(errorVal & (errorVal - 1))
-       return;
-
-    A_PRINTF("AR6000 Error type = ");
-    switch(errorVal)
-    {
-        case WMI_TARGET_PM_ERR_FAIL:
-        case WMI_TARGET_KEY_NOT_FOUND:
-        case WMI_TARGET_DECRYPTION_ERR:
-        case WMI_TARGET_BMISS:
-        case WMI_PSDISABLE_NODE_JOIN:
-            A_PRINTF("%s\n", errString[errorVal]);
-            break;
-        default:
-            A_PRINTF("INVALID\n");
-            break;
-    }
-
-}
-
-
-void
-ar6000_cac_event(AR_SOFTC_T *ar, A_UINT8 ac, A_UINT8 cacIndication,
-                 A_UINT8 statusCode, A_UINT8 *tspecSuggestion)
-{
-    WMM_TSPEC_IE    *tspecIe;
-
-    /*
-     * This is the TSPEC IE suggestion from AP.
-     * Suggestion provided by AP under some error
-     * cases, could be helpful for the host app.
-     * Check documentation.
-     */
-    tspecIe = (WMM_TSPEC_IE *)tspecSuggestion;
-
-    /*
-     * What do we do, if we get TSPEC rejection? One thought
-     * that comes to mind is implictly delete the pstream...
-     */
-    A_PRINTF("AR6000 CAC notification. "
-                "AC = %d, cacIndication = 0x%x, statusCode = 0x%x\n",
-                 ac, cacIndication, statusCode);
-}
-
-#define AR6000_PRINT_BSSID(_pBss)  do {     \
-        A_PRINTF("%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x ",\
-                 (_pBss)[0],(_pBss)[1],(_pBss)[2],(_pBss)[3],\
-                 (_pBss)[4],(_pBss)[5]);  \
-} while(0)
-
-void
-ar6000_roam_tbl_event(AR_SOFTC_T *ar, WMI_TARGET_ROAM_TBL *pTbl)
-{
-    A_UINT8 i;
-
-    A_PRINTF("ROAM TABLE NO OF ENTRIES is %d ROAM MODE is %d\n",
-              pTbl->numEntries, pTbl->roamMode);
-    for (i= 0; i < pTbl->numEntries; i++) {
-        A_PRINTF("[%d]bssid %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x ", i,
-            pTbl->bssRoamInfo[i].bssid[0], pTbl->bssRoamInfo[i].bssid[1],
-            pTbl->bssRoamInfo[i].bssid[2],
-            pTbl->bssRoamInfo[i].bssid[3],
-            pTbl->bssRoamInfo[i].bssid[4],
-            pTbl->bssRoamInfo[i].bssid[5]);
-        A_PRINTF("RSSI %d RSSIDT %d LAST RSSI %d UTIL %d ROAM_UTIL %d"
-                 " BIAS %d\n",
-            pTbl->bssRoamInfo[i].rssi,
-            pTbl->bssRoamInfo[i].rssidt,
-            pTbl->bssRoamInfo[i].last_rssi,
-            pTbl->bssRoamInfo[i].util,
-            pTbl->bssRoamInfo[i].roam_util,
-            pTbl->bssRoamInfo[i].bias);
-    }
-}
-
-void
-ar6000_wow_list_event(struct ar6_softc *ar, A_UINT8 num_filters, WMI_GET_WOW_LIST_REPLY *wow_reply)
-{
-    A_UINT8 i,j;
-
-    /*Each event now contains exactly one filter, see bug 26613*/
-    A_PRINTF("WOW pattern %d of %d patterns\n", wow_reply->this_filter_num,                 wow_reply->num_filters);
-    A_PRINTF("wow mode = %s host mode = %s\n",
-            (wow_reply->wow_mode == 0? "disabled":"enabled"),
-            (wow_reply->host_mode == 1 ? "awake":"asleep"));
-
-
-    /*If there are no patterns, the reply will only contain generic
-      WoW information. Pattern information will exist only if there are
-      patterns present. Bug 26716*/
-
-   /* If this event contains pattern information, display it*/
-    if (wow_reply->this_filter_num) {
-        i=0;
-        A_PRINTF("id=%d size=%d offset=%d\n",
-                    wow_reply->wow_filters[i].wow_filter_id,
-                    wow_reply->wow_filters[i].wow_filter_size,
-                    wow_reply->wow_filters[i].wow_filter_offset);
-       A_PRINTF("wow pattern = ");
-       for (j=0; j< wow_reply->wow_filters[i].wow_filter_size; j++) {
-             A_PRINTF("%2.2x",wow_reply->wow_filters[i].wow_filter_pattern[j]);
-        }
-
-        A_PRINTF("\nwow mask = ");
-        for (j=0; j< wow_reply->wow_filters[i].wow_filter_size; j++) {
-            A_PRINTF("%2.2x",wow_reply->wow_filters[i].wow_filter_mask[j]);
-        }
-        A_PRINTF("\n");
-    }
-}
-
-/*
- * Report the Roaming related data collected on the target
- */
-void
-ar6000_display_roam_time(WMI_TARGET_ROAM_TIME *p)
-{
-    A_PRINTF("Disconnect Data : BSSID: ");
-    AR6000_PRINT_BSSID(p->disassoc_bssid);
-    A_PRINTF(" RSSI %d DISASSOC Time %d NO_TXRX_TIME %d\n",
-             p->disassoc_bss_rssi,p->disassoc_time,
-             p->no_txrx_time);
-    A_PRINTF("Connect Data: BSSID: ");
-    AR6000_PRINT_BSSID(p->assoc_bssid);
-    A_PRINTF(" RSSI %d ASSOC Time %d TXRX_TIME %d\n",
-             p->assoc_bss_rssi,p->assoc_time,
-             p->allow_txrx_time);
-    A_PRINTF("Last Data Tx Time (b4 Disassoc) %d "\
-             "First Data Tx Time (after Assoc) %d\n",
-             p->last_data_txrx_time, p->first_data_txrx_time);
-}
-
-void
-ar6000_roam_data_event(AR_SOFTC_T *ar, WMI_TARGET_ROAM_DATA *p)
-{
-    switch (p->roamDataType) {
-        case ROAM_DATA_TIME:
-            ar6000_display_roam_time(&p->u.roamTime);
-            break;
-        default:
-            break;
-    }
-}
-
-void
-ar6000_bssInfo_event_rx(AR_SOFTC_T *ar, A_UINT8 *datap, int len)
-{
-    struct sk_buff *skb;
-    WMI_BSS_INFO_HDR *bih = (WMI_BSS_INFO_HDR *)datap;
-
-
-    if (!ar->arMgmtFilter) {
-        return;
-    }
-    if (((ar->arMgmtFilter & IEEE80211_FILTER_TYPE_BEACON) &&
-        (bih->frameType != BEACON_FTYPE))  ||
-        ((ar->arMgmtFilter & IEEE80211_FILTER_TYPE_PROBE_RESP) &&
-        (bih->frameType != PROBERESP_FTYPE)))
-    {
-        return;
-    }
-
-    if ((skb = A_NETBUF_ALLOC_RAW(len)) != NULL) {
-
-        A_NETBUF_PUT(skb, len);
-        A_MEMCPY(A_NETBUF_DATA(skb), datap, len);
-        skb->dev = ar->arNetDev;
-	printk("MAC RAW...\n");
-//        skb->mac.raw = A_NETBUF_DATA(skb);
-        skb->ip_summed = CHECKSUM_NONE;
-        skb->pkt_type = PACKET_OTHERHOST;
-        skb->protocol = __constant_htons(0x0019);
-        netif_rx(skb);
-    }
-}
-
-A_UINT32 wmiSendCmdNum;
-
-A_STATUS
-ar6000_control_tx(void *devt, void *osbuf, WMI_PRI_STREAM_ID streamID)
-{
-    AR_SOFTC_T       *ar = (AR_SOFTC_T *)devt;
-    A_STATUS         status = A_OK;
-    struct ar_cookie *cookie = NULL;
-    int i;
-
-        /* take lock to protect ar6000_alloc_cookie() */
-    AR6000_SPIN_LOCK(&ar->arLock, 0);
-
-    do {
-
-        AR_DEBUG2_PRINTF("ar_contrstatus = ol_tx: skb=0x%x, len=0x%x, sid=%d\n",
-                         (A_UINT32)osbuf, A_NETBUF_LEN(osbuf), streamID);
-
-        if ((streamID == WMI_CONTROL_PRI) && (ar->arWMIControlEpFull)) {
-                /* control endpoint is full, don't allocate resources, we
-                 * are just going to drop this packet */
-            cookie = NULL;
-            AR_DEBUG_PRINTF(" WMI Control EP full, dropping packet : 0x%X, len:%d \n",
-                    (A_UINT32)osbuf, A_NETBUF_LEN(osbuf));
-        } else {
-            cookie = ar6000_alloc_cookie(ar);
-        }
-
-        if (cookie == NULL) {
-            status = A_NO_MEMORY;
-            break;
-        }
-
-        if(logWmiRawMsgs) {
-            A_PRINTF("WMI cmd send, msgNo %d :", wmiSendCmdNum);
-            for(i = 0; i < a_netbuf_to_len(osbuf); i++)
-                A_PRINTF("%x ", ((A_UINT8 *)a_netbuf_to_data(osbuf))[i]);
-            A_PRINTF("\n");
-        }
-
-        wmiSendCmdNum++;
-
-    } while (FALSE);
-
-    if (cookie != NULL) {
-            /* got a structure to send it out on */
-        ar->arTxPending[streamID]++;
-
-        if (streamID != WMI_CONTROL_PRI) {
-            ar->arTotalTxDataPending++;
-        }
-    }
-
-    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-
-    if (cookie != NULL) {
-        cookie->arc_bp[0] = (A_UINT32)osbuf;
-        cookie->arc_bp[1] = 0;
-        SET_HTC_PACKET_INFO_TX(&cookie->HtcPkt,
-                               cookie,
-                               A_NETBUF_DATA(osbuf),
-                               A_NETBUF_LEN(osbuf),
-                               arWMIStream2EndpointID(ar,streamID),
-                               AR6K_CONTROL_PKT_TAG);
-            /* this interface is asynchronous, if there is an error, cleanup will happen in the
-             * TX completion callback */
-        HTCSendPkt(ar->arHtcTarget, &cookie->HtcPkt);
-        status = A_OK;
-    }
-
-    return status;
-}
-
-/* indicate tx activity or inactivity on a WMI stream */
-void ar6000_indicate_tx_activity(void *devt, A_UINT8 TrafficClass, A_BOOL Active)
-{
-    AR_SOFTC_T  *ar = (AR_SOFTC_T *)devt;
-    WMI_PRI_STREAM_ID streamid;
-
-    if (ar->arWmiEnabled) {
-        streamid = wmi_get_stream_id(ar->arWmi, TrafficClass);
-    } else {
-            /* for mbox ping testing, the traffic class is mapped directly as a stream ID,
-             * see handling of AR6000_XIOCTL_TRAFFIC_ACTIVITY_CHANGE in ioctl.c */
-        streamid = (WMI_PRI_STREAM_ID)TrafficClass;
-    }
-
-        /* notify HTC, this may cause credit distribution changes */
-
-    HTCIndicateActivityChange(ar->arHtcTarget,
-                              arWMIStream2EndpointID(ar,streamid),
-                              Active);
-
-}
-
-module_init(ar6000_init_module);
-module_exit(ar6000_cleanup_module);
-
-/* Init cookie queue */
-static void
-ar6000_cookie_init(AR_SOFTC_T *ar)
-{
-    A_UINT32    i;
-
-    ar->arCookieList = NULL;
-    A_MEMZERO(s_ar_cookie_mem, sizeof(s_ar_cookie_mem));
-
-    for (i = 0; i < MAX_COOKIE_NUM; i++) {
-        ar6000_free_cookie(ar, &s_ar_cookie_mem[i]);
-    }
-}
-
-/* cleanup cookie queue */
-static void
-ar6000_cookie_cleanup(AR_SOFTC_T *ar)
-{
-    /* It is gone .... */
-    ar->arCookieList = NULL;
-}
-
-/* Init cookie queue */
-static void
-ar6000_free_cookie(AR_SOFTC_T *ar, struct ar_cookie * cookie)
-{
-    /* Insert first */
-    A_ASSERT(ar != NULL);
-    A_ASSERT(cookie != NULL);
-    cookie->arc_list_next = ar->arCookieList;
-    ar->arCookieList = cookie;
-}
-
-/* cleanup cookie queue */
-static struct ar_cookie *
-ar6000_alloc_cookie(AR_SOFTC_T  *ar)
-{
-    struct ar_cookie   *cookie;
-
-    cookie = ar->arCookieList;
-    if(cookie != NULL)
-    {
-        ar->arCookieList = cookie->arc_list_next;
-    }
-
-    return cookie;
-}
-
-#ifdef SEND_EVENT_TO_APP
-/*
- * This function is used to send event which come from taget to
- * the application. The buf which send to application is include
- * the event ID and event content.
- */
-#define EVENT_ID_LEN   2
-void ar6000_send_event_to_app(AR_SOFTC_T *ar, A_UINT16 eventId,
-                              A_UINT8 *datap, int len)
-{
-
-#if (WIRELESS_EXT >= 15)
-
-/* note: IWEVCUSTOM only exists in wireless extensions after version 15 */
-
-    char *buf;
-    A_UINT16 size;
-    union iwreq_data wrqu;
-
-    size = len + EVENT_ID_LEN;
-
-    if (size > IW_CUSTOM_MAX) {
-        AR_DEBUG_PRINTF("WMI event ID : 0x%4.4X, len = %d too big for IWEVCUSTOM (max=%d) \n",
-                eventId, size, IW_CUSTOM_MAX);
-        return;
-    }
-
-    buf = A_MALLOC_NOWAIT(size);
-    A_MEMZERO(buf, size);
-    A_MEMCPY(buf, &eventId, EVENT_ID_LEN);
-    A_MEMCPY(buf+EVENT_ID_LEN, datap, len);
-
-    //AR_DEBUG_PRINTF("event ID = %d,len = %d\n",*(A_UINT16*)buf, size);
-    A_MEMZERO(&wrqu, sizeof(wrqu));
-    wrqu.data.length = size;
-    wireless_send_event(ar->arNetDev, IWEVCUSTOM, &wrqu, buf);
-
-    A_FREE(buf);
-#endif
-
-
-}
-#endif
-
-
-void
-ar6000_tx_retry_err_event(void *devt)
-{
-    AR_DEBUG2_PRINTF("Tx retries reach maximum!\n");
-}
-
-void
-ar6000_snrThresholdEvent_rx(void *devt, WMI_SNR_THRESHOLD_VAL newThreshold, A_UINT8 snr)
-{
-    AR_DEBUG2_PRINTF("snr threshold range %d, snr %d\n", newThreshold, snr);
-}
-
-void
-ar6000_lqThresholdEvent_rx(void *devt, WMI_LQ_THRESHOLD_VAL newThreshold, A_UINT8 lq)
-{
-    AR_DEBUG2_PRINTF("lq threshold range %d, lq %d\n", newThreshold, lq);
-}
-
-
-
-A_UINT32
-a_copy_to_user(void *to, const void *from, A_UINT32 n)
-{
-    return(copy_to_user(to, from, n));
-}
-
-A_UINT32
-a_copy_from_user(void *to, const void *from, A_UINT32 n)
-{
-    return(copy_from_user(to, from, n));
-}
-
-
-A_STATUS
-ar6000_get_driver_cfg(struct net_device *dev,
-                        A_UINT16 cfgParam,
-                        void *result)
-{
-
-    A_STATUS    ret = 0;
-
-    switch(cfgParam)
-    {
-        case AR6000_DRIVER_CFG_GET_WLANNODECACHING:
-           *((A_UINT32 *)result) = wlanNodeCaching;
-           break;
-        case AR6000_DRIVER_CFG_LOG_RAW_WMI_MSGS:
-           *((A_UINT32 *)result) = logWmiRawMsgs;
-            break;
-        default:
-           ret = EINVAL;
-           break;
-    }
-
-    return ret;
-}
-
-void
-ar6000_keepalive_rx(void *devt, A_UINT8 configured)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)devt;
-
-    ar->arKeepaliveConfigured = configured;
-    wake_up(&arEvent);
-}
-
-void
-ar6000_pmkid_list_event(void *devt, A_UINT8 numPMKID, WMI_PMKID *pmkidList)
-{
-    A_UINT8 i, j;
-
-    A_PRINTF("Number of Cached PMKIDs is %d\n", numPMKID);
-
-    for (i = 0; i < numPMKID; i++) {
-        A_PRINTF("\nPMKID %d ", i);
-            for (j = 0; j < WMI_PMKID_LEN; j++) {
-                A_PRINTF("%2.2x", pmkidList->pmkid[j]);
-            }
-        pmkidList++;
-    }
-}
-
-#ifdef USER_KEYS
-static A_STATUS
-
-ar6000_reinstall_keys(AR_SOFTC_T *ar, A_UINT8 key_op_ctrl)
-{
-    A_STATUS status = A_OK;
-    struct ieee80211req_key *uik = &ar->user_saved_keys.ucast_ik;
-    struct ieee80211req_key *bik = &ar->user_saved_keys.bcast_ik;
-    CRYPTO_TYPE  keyType = ar->user_saved_keys.keyType;
-
-    if (IEEE80211_CIPHER_CCKM_KRK != uik->ik_type) {
-        if (NONE_CRYPT == keyType) {
-            goto _reinstall_keys_out;
-        }
-
-        if (uik->ik_keylen) {
-            status = wmi_addKey_cmd(ar->arWmi, uik->ik_keyix,
-                    ar->user_saved_keys.keyType, PAIRWISE_USAGE,
-                    uik->ik_keylen, (A_UINT8 *)&uik->ik_keyrsc,
-                    uik->ik_keydata, key_op_ctrl, SYNC_BEFORE_WMIFLAG);
-        }
-
-    } else {
-        status = wmi_add_krk_cmd(ar->arWmi, uik->ik_keydata);
-    }
-
-    if (IEEE80211_CIPHER_CCKM_KRK != bik->ik_type) {
-        if (NONE_CRYPT == keyType) {
-            goto _reinstall_keys_out;
-        }
-
-        if (bik->ik_keylen) {
-            status = wmi_addKey_cmd(ar->arWmi, bik->ik_keyix,
-                    ar->user_saved_keys.keyType, GROUP_USAGE,
-                    bik->ik_keylen, (A_UINT8 *)&bik->ik_keyrsc,
-                    bik->ik_keydata, key_op_ctrl, NO_SYNC_WMIFLAG);
-        }
-    } else {
-        status = wmi_add_krk_cmd(ar->arWmi, bik->ik_keydata);
-    }
-
-_reinstall_keys_out:
-    ar->user_savedkeys_stat = USER_SAVEDKEYS_STAT_INIT;
-    ar->user_key_ctrl      = 0;
-
-    return status;
-}
-#endif /* USER_KEYS */
-
-
-void
-ar6000_dset_open_req(
-    void *context,
-    A_UINT32 id,
-    A_UINT32 targHandle,
-    A_UINT32 targReplyFn,
-    A_UINT32 targReplyArg)
-{
-}
-
-void
-ar6000_dset_close(
-    void *context,
-    A_UINT32 access_cookie)
-{
-    return;
-}
-
-void
-ar6000_dset_data_req(
-   void *context,
-   A_UINT32 accessCookie,
-   A_UINT32 offset,
-   A_UINT32 length,
-   A_UINT32 targBuf,
-   A_UINT32 targReplyFn,
-   A_UINT32 targReplyArg)
-{
-}
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/ar6000_drv.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/ar6000_drv.h
deleted file mode 100644
index 784f158d9..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/ar6000_drv.h
+++ /dev/null
@@ -1,360 +0,0 @@
-/*
- *
- * Copyright (c) 2004-2007 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#ifndef _AR6000_H_
-#define _AR6000_H_
-
-#include <linux/version.h>
-
-
-#include <linux/autoconf.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/spinlock.h>
-#include <linux/skbuff.h>
-#include <linux/if_ether.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <net/iw_handler.h>
-#include <linux/if_arp.h>
-#include <linux/ip.h>
-#include <linux/semaphore.h>
-#include <linux/wireless.h>
-#include <linux/module.h>
-#include <asm/io.h>
-
-#include <a_config.h>
-#include <athdefs.h>
-#include "a_types.h"
-#include "a_osapi.h"
-#include "htc_api.h"
-#include "wmi.h"
-#include "a_drv.h"
-#include "bmi.h"
-#include <ieee80211.h>
-#include <ieee80211_ioctl.h>
-#include <wlan_api.h>
-#include <wmi_api.h>
-#include "gpio_api.h"
-#include "gpio.h"
-#include <host_version.h>
-#include <linux/rtnetlink.h>
-#include <linux/init.h>
-#include <linux/moduleparam.h>
-#include "AR6Khwreg.h"
-#include "ar6000_api.h"
-#ifdef CONFIG_HOST_TCMD_SUPPORT
-#include <testcmd.h>
-#endif
-
-#include "targaddrs.h"
-#include "dbglog_api.h"
-#include "ar6000_diag.h"
-#include "common_drv.h"
-
-#ifndef  __dev_put
-#define  __dev_put(dev) dev_put(dev)
-#endif
-
-#ifdef USER_KEYS
-
-#define USER_SAVEDKEYS_STAT_INIT     0
-#define USER_SAVEDKEYS_STAT_RUN      1
-
-// TODO this needs to move into the AR_SOFTC struct
-struct USER_SAVEDKEYS {
-    struct ieee80211req_key   ucast_ik;
-    struct ieee80211req_key   bcast_ik;
-    CRYPTO_TYPE               keyType;
-    A_BOOL                    keyOk;
-};
-#endif
-
-#define DBG_INFO		0x00000001
-#define DBG_ERROR		0x00000002
-#define DBG_WARNING		0x00000004
-#define DBG_SDIO		0x00000008
-#define DBG_HIF			0x00000010
-#define DBG_HTC			0x00000020
-#define DBG_WMI			0x00000040
-#define DBG_WMI2		0x00000080
-#define DBG_DRIVER		0x00000100
-
-#define DBG_DEFAULTS	(DBG_ERROR|DBG_WARNING)
-
-
-#ifdef DEBUG
-#define AR_DEBUG_PRINTF(args...)        if (debugdriver) A_PRINTF(args);
-#define AR_DEBUG2_PRINTF(args...)        if (debugdriver >= 2) A_PRINTF(args);
-extern int debugdriver;
-#else
-#define AR_DEBUG_PRINTF(args...)
-#define AR_DEBUG2_PRINTF(args...)
-#endif
-
-A_STATUS ar6000_ReadRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data);
-A_STATUS ar6000_WriteRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data);
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define	MAX_AR6000                        1
-#define AR6000_MAX_RX_BUFFERS             16
-#define AR6000_BUFFER_SIZE                1664
-#define AR6000_TX_TIMEOUT                 10
-#define	AR6000_ETH_ADDR_LEN               6
-#define	AR6000_MAX_ENDPOINTS              4
-#define MAX_NODE_NUM                      15
-#define MAX_COOKIE_NUM                    150
-#define AR6000_HB_CHALLENGE_RESP_FREQ_DEFAULT        1
-#define AR6000_HB_CHALLENGE_RESP_MISS_THRES_DEFAULT  1
-
-enum {
-    DRV_HB_CHALLENGE = 0,
-    APP_HB_CHALLENGE
-};
-
-/* HTC RAW streams */
-typedef enum _HTC_RAW_STREAM_ID {
-    HTC_RAW_STREAM_NOT_MAPPED = -1,
-    HTC_RAW_STREAM_0 = 0,
-    HTC_RAW_STREAM_1 = 1,
-    HTC_RAW_STREAM_2 = 2,
-    HTC_RAW_STREAM_3 = 3,
-    HTC_RAW_STREAM_NUM_MAX
-} HTC_RAW_STREAM_ID;
-
-#define RAW_HTC_READ_BUFFERS_NUM    4
-#define RAW_HTC_WRITE_BUFFERS_NUM   4
-
-typedef struct {
-    int currPtr;
-    int length;
-    unsigned char data[AR6000_BUFFER_SIZE];
-    HTC_PACKET    HTCPacket;
-} raw_htc_buffer;
-
-#ifdef CONFIG_HOST_TCMD_SUPPORT
-/*
- *  add TCMD_MODE besides wmi and bypasswmi
- *  in TCMD_MODE, only few TCMD releated wmi commands
- *  counld be hanlder
- */
-enum {
-    AR6000_WMI_MODE = 0,
-    AR6000_BYPASS_MODE,
-    AR6000_TCMD_MODE,
-    AR6000_WLAN_MODE
-};
-#endif /* CONFIG_HOST_TCMD_SUPPORT */
-
-struct ar_wep_key {
-    A_UINT8                 arKeyIndex;
-    A_UINT8                 arKeyLen;
-    A_UINT8                 arKey[64];
-} ;
-
-struct ar_node_mapping {
-    A_UINT8                 macAddress[6];
-    A_UINT8                 epId;
-    A_UINT8                 txPending;
-};
-
-struct ar_cookie {
-    A_UINT32               arc_bp[2];    /* Must be first field */
-    HTC_PACKET             HtcPkt;       /* HTC packet wrapper */
-    struct ar_cookie *arc_list_next;
-};
-
-struct ar_hb_chlng_resp {
-    A_TIMER                 timer;
-    A_UINT32                frequency;
-    A_UINT32                seqNum;
-    A_BOOL                  outstanding;
-    A_UINT8                 missCnt;
-    A_UINT8                 missThres;
-};
-
-typedef struct ar6_softc {
-    struct net_device       *arNetDev;    /* net_device pointer */
-    void                    *arWmi;
-    int                     arTxPending[WMI_PRI_MAX_COUNT];
-    int                     arTotalTxDataPending;
-    A_UINT8                 arNumDataEndPts;
-    A_BOOL                  arWmiEnabled;
-    A_BOOL                  arWmiReady;
-    A_BOOL                  arConnected;
-    A_BOOL                  arRadioSwitch;
-    HTC_HANDLE              arHtcTarget;
-    void                    *arHifDevice;
-    spinlock_t              arLock;
-    struct semaphore        arSem;
-    int                     arRxBuffers[WMI_PRI_MAX_COUNT];
-    int                     arSsidLen;
-    u_char                  arSsid[32];
-    A_UINT8                 arNetworkType;
-    A_UINT8                 arDot11AuthMode;
-    A_UINT8                 arAuthMode;
-    A_UINT8                 arPairwiseCrypto;
-    A_UINT8                 arPairwiseCryptoLen;
-    A_UINT8                 arGroupCrypto;
-    A_UINT8                 arGroupCryptoLen;
-    A_UINT8                 arDefTxKeyIndex;
-    struct ar_wep_key       arWepKeyList[WMI_MAX_KEY_INDEX + 1];
-    A_UINT8                 arBssid[6];
-    A_UINT8                 arReqBssid[6];
-    A_UINT16                arChannelHint;
-    A_UINT16                arBssChannel;
-    A_UINT16                arListenInterval;
-    struct ar6000_version   arVersion;
-    A_UINT32                arTargetType;
-    A_INT8                  arRssi;
-    A_UINT8                 arTxPwr;
-    A_BOOL                  arTxPwrSet;
-    A_INT32                 arBitRate;
-    struct net_device_stats arNetStats;
-    struct iw_statistics 	arIwStats;
-    A_INT8                  arNumChannels;
-    A_UINT16                arChannelList[32];
-    A_UINT32                arRegCode;
-    A_BOOL                  statsUpdatePending;
-    TARGET_STATS            arTargetStats;
-    A_INT8                  arMaxRetries;
-    A_UINT8                 arPhyCapability;
-#ifdef CONFIG_HOST_TCMD_SUPPORT
-    A_UINT8                 tcmdRxReport;
-    A_UINT32                tcmdRxTotalPkt;
-    A_INT32                 tcmdRxRssi;
-    A_UINT32                tcmdPm;
-   A_UINT32                 arTargetMode;
-#endif
-    AR6000_WLAN_STATE       arWlanState;
-    struct ar_node_mapping  arNodeMap[MAX_NODE_NUM];
-    A_UINT8                 arIbssPsEnable;
-    A_UINT8                 arNodeNum;
-    A_UINT8                 arNexEpId;
-    struct ar_cookie        *arCookieList;
-    A_UINT16                arRateMask;
-    A_UINT8                 arSkipScan;
-    A_UINT16                arBeaconInterval;
-    A_BOOL                  arConnectPending;
-    A_BOOL                  arWmmEnabled;
-    struct ar_hb_chlng_resp arHBChallengeResp;
-    A_UINT8                 arKeepaliveConfigured;
-    A_UINT32                arMgmtFilter;
-    HTC_ENDPOINT_ID         arWmi2EpMapping[WMI_PRI_MAX_COUNT];
-    WMI_PRI_STREAM_ID       arEp2WmiMapping[ENDPOINT_MAX];
-#ifdef HTC_RAW_INTERFACE
-    HTC_ENDPOINT_ID         arRaw2EpMapping[HTC_RAW_STREAM_NUM_MAX];
-    HTC_RAW_STREAM_ID       arEp2RawMapping[ENDPOINT_MAX];
-    struct semaphore        raw_htc_read_sem[HTC_RAW_STREAM_NUM_MAX];
-    struct semaphore        raw_htc_write_sem[HTC_RAW_STREAM_NUM_MAX];
-    wait_queue_head_t       raw_htc_read_queue[HTC_RAW_STREAM_NUM_MAX];
-    wait_queue_head_t       raw_htc_write_queue[HTC_RAW_STREAM_NUM_MAX];
-    raw_htc_buffer          *raw_htc_read_buffer[HTC_RAW_STREAM_NUM_MAX][RAW_HTC_READ_BUFFERS_NUM];
-    raw_htc_buffer          *raw_htc_write_buffer[HTC_RAW_STREAM_NUM_MAX][RAW_HTC_WRITE_BUFFERS_NUM];
-    A_BOOL                  write_buffer_available[HTC_RAW_STREAM_NUM_MAX];
-    A_BOOL                  read_buffer_available[HTC_RAW_STREAM_NUM_MAX];
-#endif
-    A_BOOL                  arRawIfInit;
-    int                     arDeviceIndex;
-    COMMON_CREDIT_STATE_INFO arCreditStateInfo;
-    A_BOOL                  arWMIControlEpFull;
-    A_BOOL                  dbgLogFetchInProgress;
-    A_UCHAR                 log_buffer[DBGLOG_HOST_LOG_BUFFER_SIZE];
-    A_UINT32                log_cnt;
-    A_UINT32                dbglog_init_done;
-    A_UINT32                arConnectCtrlFlags;
-	A_UINT32                scan_complete;
-#ifdef USER_KEYS
-    A_INT32                 user_savedkeys_stat;
-    A_UINT32                user_key_ctrl;
-    struct USER_SAVEDKEYS   user_saved_keys;
-#endif
-} AR_SOFTC_T;
-
-
-#define arWMIStream2EndpointID(ar,wmi)          (ar)->arWmi2EpMapping[(wmi)]
-#define arSetWMIStream2EndpointIDMap(ar,wmi,ep)  \
-{  (ar)->arWmi2EpMapping[(wmi)] = (ep); \
-   (ar)->arEp2WmiMapping[(ep)] = (wmi); }
-#define arEndpoint2WMIStreamID(ar,ep)           (ar)->arEp2WmiMapping[(ep)]
-
-#define arRawIfEnabled(ar) (ar)->arRawIfInit
-#define arRawStream2EndpointID(ar,raw)          (ar)->arRaw2EpMapping[(raw)]
-#define arSetRawStream2EndpointIDMap(ar,raw,ep)  \
-{  (ar)->arRaw2EpMapping[(raw)] = (ep); \
-   (ar)->arEp2RawMapping[(ep)] = (raw); }
-#define arEndpoint2RawStreamID(ar,ep)           (ar)->arEp2RawMapping[(ep)]
-
-struct ar_giwscan_param {
-    char    *current_ev;
-    char    *end_buf;
-    A_BOOL  firstPass;
-};
-
-#define AR6000_STAT_INC(ar, stat)       (ar->arNetStats.stat++)
-
-#define AR6000_SPIN_LOCK(lock, param)   do {                            \
-    if (irqs_disabled()) {                                              \
-        AR_DEBUG_PRINTF("IRQs disabled:AR6000_LOCK\n");                 \
-    }                                                                   \
-    spin_lock_bh(lock);                                                 \
-} while (0)
-
-#define AR6000_SPIN_UNLOCK(lock, param) do {                            \
-    if (irqs_disabled()) {                                              \
-        AR_DEBUG_PRINTF("IRQs disabled: AR6000_UNLOCK\n");              \
-    }                                                                   \
-    spin_unlock_bh(lock);                                               \
-} while (0)
-
-int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
-int ar6000_ioctl_dispatcher(struct net_device *dev, struct ifreq *rq, int cmd);
-void ar6000_ioctl_iwsetup(struct iw_handler_def *def);
-void ar6000_gpio_init(void);
-void ar6000_init_profile_info(AR_SOFTC_T *ar);
-void ar6000_install_static_wep_keys(AR_SOFTC_T *ar);
-int ar6000_init(struct net_device *dev);
-int ar6000_dbglog_get_debug_logs(AR_SOFTC_T *ar);
-A_STATUS ar6000_SetHTCBlockSize(AR_SOFTC_T *ar);
-
-#ifdef HTC_RAW_INTERFACE
-
-#ifndef __user
-#define __user
-#endif
-
-int ar6000_htc_raw_open(AR_SOFTC_T *ar);
-int ar6000_htc_raw_close(AR_SOFTC_T *ar);
-ssize_t ar6000_htc_raw_read(AR_SOFTC_T *ar,
-                            HTC_RAW_STREAM_ID StreamID,
-                            char __user *buffer, size_t count);
-ssize_t ar6000_htc_raw_write(AR_SOFTC_T *ar,
-                             HTC_RAW_STREAM_ID StreamID,
-                             char __user *buffer, size_t count);
-
-#endif /* HTC_RAW_INTERFACE */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _AR6000_H_ */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/ar6000_raw_if.c b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/ar6000_raw_if.c
deleted file mode 100644
index 4443bb267..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/ar6000_raw_if.c
+++ /dev/null
@@ -1,440 +0,0 @@
-/*
- *
- * Copyright (c) 2004-2007 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#include "ar6000_drv.h"
-
-#ifdef HTC_RAW_INTERFACE
-
-static void
-ar6000_htc_raw_read_cb(void *Context, HTC_PACKET *pPacket)
-{
-    AR_SOFTC_T        *ar = (AR_SOFTC_T *)Context;
-    raw_htc_buffer    *busy;
-    HTC_RAW_STREAM_ID streamID;
-
-    busy = (raw_htc_buffer *)pPacket->pPktContext;
-    A_ASSERT(busy != NULL);
-
-    if (pPacket->Status == A_ECANCELED) {
-        /*
-         * HTC provides A_ECANCELED status when it doesn't want to be refilled
-         * (probably due to a shutdown)
-         */
-        return;
-    }
-
-    streamID = arEndpoint2RawStreamID(ar,pPacket->Endpoint);
-    A_ASSERT(streamID != HTC_RAW_STREAM_NOT_MAPPED);
-
-#ifdef CF
-   if (down_trylock(&ar->raw_htc_read_sem[streamID])) {
-#else
-    if (down_interruptible(&ar->raw_htc_read_sem[streamID])) {
-#endif /* CF */
-        AR_DEBUG2_PRINTF("Unable to down the semaphore\n");
-    }
-
-    A_ASSERT((pPacket->Status != A_OK) ||
-             (pPacket->pBuffer == (busy->data + HTC_HEADER_LEN)));
-
-    busy->length = pPacket->ActualLength + HTC_HEADER_LEN;
-    busy->currPtr = HTC_HEADER_LEN;
-    ar->read_buffer_available[streamID] = TRUE;
-    //AR_DEBUG_PRINTF("raw read cb:  0x%X 0x%X \n", busy->currPtr,busy->length);
-    up(&ar->raw_htc_read_sem[streamID]);
-
-    /* Signal the waiting process */
-    AR_DEBUG2_PRINTF("Waking up the StreamID(%d) read process\n", streamID);
-    wake_up_interruptible(&ar->raw_htc_read_queue[streamID]);
-}
-
-static void
-ar6000_htc_raw_write_cb(void *Context, HTC_PACKET *pPacket)
-{
-    AR_SOFTC_T          *ar = (AR_SOFTC_T  *)Context;
-    raw_htc_buffer      *free;
-    HTC_RAW_STREAM_ID   streamID;
-
-    free = (raw_htc_buffer *)pPacket->pPktContext;
-    A_ASSERT(free != NULL);
-
-    if (pPacket->Status == A_ECANCELED) {
-        /*
-         * HTC provides A_ECANCELED status when it doesn't want to be refilled
-         * (probably due to a shutdown)
-         */
-        return;
-    }
-
-    streamID = arEndpoint2RawStreamID(ar,pPacket->Endpoint);
-    A_ASSERT(streamID != HTC_RAW_STREAM_NOT_MAPPED);
-
-#ifdef CF
-    if (down_trylock(&ar->raw_htc_write_sem[streamID])) {
-#else
-    if (down_interruptible(&ar->raw_htc_write_sem[streamID])) {
-#endif
-        AR_DEBUG2_PRINTF("Unable to down the semaphore\n");
-    }
-
-    A_ASSERT(pPacket->pBuffer == (free->data + HTC_HEADER_LEN));
-
-    free->length = 0;
-    ar->write_buffer_available[streamID] = TRUE;
-    up(&ar->raw_htc_write_sem[streamID]);
-
-    /* Signal the waiting process */
-    AR_DEBUG2_PRINTF("Waking up the StreamID(%d) write process\n", streamID);
-    wake_up_interruptible(&ar->raw_htc_write_queue[streamID]);
-}
-
-/* connect to a service */
-static A_STATUS ar6000_connect_raw_service(AR_SOFTC_T        *ar,
-                                           HTC_RAW_STREAM_ID StreamID)
-{
-    A_STATUS                 status;
-    HTC_SERVICE_CONNECT_RESP response;
-    A_UINT8                  streamNo;
-    HTC_SERVICE_CONNECT_REQ  connect;
-
-    do {
-
-        A_MEMZERO(&connect,sizeof(connect));
-            /* pass the stream ID as meta data to the RAW streams service */
-        streamNo = (A_UINT8)StreamID;
-        connect.pMetaData = &streamNo;
-        connect.MetaDataLength = sizeof(A_UINT8);
-            /* these fields are the same for all endpoints */
-        connect.EpCallbacks.pContext = ar;
-        connect.EpCallbacks.EpTxComplete = ar6000_htc_raw_write_cb;
-        connect.EpCallbacks.EpRecv = ar6000_htc_raw_read_cb;
-            /* simple interface, we don't need these optional callbacks */
-        connect.EpCallbacks.EpRecvRefill = NULL;
-        connect.EpCallbacks.EpSendFull = NULL;
-        connect.EpCallbacks.EpSendAvail = NULL;
-        connect.MaxSendQueueDepth = RAW_HTC_WRITE_BUFFERS_NUM;
-
-            /* connect to the raw streams service, we may be able to get 1 or more
-             * connections, depending on WHAT is running on the target */
-        connect.ServiceID = HTC_RAW_STREAMS_SVC;
-
-        A_MEMZERO(&response,sizeof(response));
-
-            /* try to connect to the raw stream, it is okay if this fails with
-             * status HTC_SERVICE_NO_MORE_EP */
-        status = HTCConnectService(ar->arHtcTarget,
-                                   &connect,
-                                   &response);
-
-        if (A_FAILED(status)) {
-            if (response.ConnectRespCode == HTC_SERVICE_NO_MORE_EP) {
-                AR_DEBUG_PRINTF("HTC RAW , No more streams allowed \n");
-                status = A_OK;
-            }
-            break;
-        }
-
-            /* set endpoint mapping for the RAW HTC streams */
-        arSetRawStream2EndpointIDMap(ar,StreamID,response.Endpoint);
-
-        AR_DEBUG_PRINTF("HTC RAW : stream ID: %d, endpoint: %d\n",
-                        StreamID, arRawStream2EndpointID(ar,StreamID));
-
-    } while (FALSE);
-
-    return status;
-}
-
-int ar6000_htc_raw_open(AR_SOFTC_T *ar)
-{
-    A_STATUS status;
-    int streamID, endPt, count2;
-    raw_htc_buffer *buffer;
-    HTC_SERVICE_ID servicepriority;
-
-    A_ASSERT(ar->arHtcTarget != NULL);
-
-        /* wait for target */
-    status = HTCWaitTarget(ar->arHtcTarget);
-
-    if (A_FAILED(status)) {
-        AR_DEBUG_PRINTF("HTCWaitTarget failed (%d)\n", status);
-        return -ENODEV;
-    }
-
-    for (endPt = 0; endPt < ENDPOINT_MAX; endPt++) {
-        ar->arEp2RawMapping[endPt] = HTC_RAW_STREAM_NOT_MAPPED;
-    }
-
-    for (streamID = HTC_RAW_STREAM_0; streamID < HTC_RAW_STREAM_NUM_MAX; streamID++) {
-        /* Initialize the data structures */
-        init_MUTEX(&ar->raw_htc_read_sem[streamID]);
-        init_MUTEX(&ar->raw_htc_write_sem[streamID]);
-        init_waitqueue_head(&ar->raw_htc_read_queue[streamID]);
-        init_waitqueue_head(&ar->raw_htc_write_queue[streamID]);
-
-            /* try to connect to the raw service */
-        status = ar6000_connect_raw_service(ar,streamID);
-
-        if (A_FAILED(status)) {
-            break;
-        }
-
-        if (arRawStream2EndpointID(ar,streamID) == 0) {
-            break;
-        }
-
-        for (count2 = 0; count2 < RAW_HTC_READ_BUFFERS_NUM; count2 ++) {
-            /* Initialize the receive buffers */
-            buffer = ar->raw_htc_write_buffer[streamID][count2];
-            memset(buffer, 0, sizeof(raw_htc_buffer));
-            buffer = ar->raw_htc_read_buffer[streamID][count2];
-            memset(buffer, 0, sizeof(raw_htc_buffer));
-
-            SET_HTC_PACKET_INFO_RX_REFILL(&buffer->HTCPacket,
-                                          buffer,
-                                          buffer->data,
-                                          AR6000_BUFFER_SIZE,
-                                          arRawStream2EndpointID(ar,streamID));
-
-            /* Queue buffers to HTC for receive */
-            if ((status = HTCAddReceivePkt(ar->arHtcTarget, &buffer->HTCPacket)) != A_OK)
-            {
-                BMIInit();
-                return -EIO;
-            }
-        }
-
-        for (count2 = 0; count2 < RAW_HTC_WRITE_BUFFERS_NUM; count2 ++) {
-            /* Initialize the receive buffers */
-            buffer = ar->raw_htc_write_buffer[streamID][count2];
-            memset(buffer, 0, sizeof(raw_htc_buffer));
-        }
-
-        ar->read_buffer_available[streamID] = FALSE;
-        ar->write_buffer_available[streamID] = TRUE;
-    }
-
-    if (A_FAILED(status)) {
-        return -EIO;
-    }
-
-    AR_DEBUG_PRINTF("HTC RAW, number of streams the target supports: %d \n", streamID);
-
-    servicepriority = HTC_RAW_STREAMS_SVC;  /* only 1 */
-
-        /* set callbacks and priority list */
-    HTCSetCreditDistribution(ar->arHtcTarget,
-                             ar,
-                             NULL,  /* use default */
-                             NULL,  /* use default */
-                             &servicepriority,
-                             1);
-
-    /* Start the HTC component */
-    if ((status = HTCStart(ar->arHtcTarget)) != A_OK) {
-        BMIInit();
-        return -EIO;
-    }
-
-    (ar)->arRawIfInit = TRUE;
-
-    return 0;
-}
-
-int ar6000_htc_raw_close(AR_SOFTC_T *ar)
-{
-    A_PRINTF("ar6000_htc_raw_close called \n");
-    HTCStop(ar->arHtcTarget);
-
-        /* reset the device */
-    ar6000_reset_device(ar->arHifDevice, ar->arTargetType);
-    /* Initialize the BMI component */
-    BMIInit();
-
-    return 0;
-}
-
-raw_htc_buffer *
-get_filled_buffer(AR_SOFTC_T *ar, HTC_RAW_STREAM_ID StreamID)
-{
-    int count;
-    raw_htc_buffer *busy;
-
-    /* Check for data */
-    for (count = 0; count < RAW_HTC_READ_BUFFERS_NUM; count ++) {
-        busy = ar->raw_htc_read_buffer[StreamID][count];
-        if (busy->length) {
-            break;
-        }
-    }
-    if (busy->length) {
-        ar->read_buffer_available[StreamID] = TRUE;
-    } else {
-        ar->read_buffer_available[StreamID] = FALSE;
-    }
-
-    return busy;
-}
-
-ssize_t ar6000_htc_raw_read(AR_SOFTC_T *ar, HTC_RAW_STREAM_ID StreamID,
-                            char __user *buffer, size_t length)
-{
-    int readPtr;
-    raw_htc_buffer *busy;
-
-    if (arRawStream2EndpointID(ar,StreamID) == 0) {
-        AR_DEBUG_PRINTF("StreamID(%d) not connected! \n", StreamID);
-        return -EFAULT;
-    }
-
-    if (down_interruptible(&ar->raw_htc_read_sem[StreamID])) {
-        return -ERESTARTSYS;
-    }
-
-    busy = get_filled_buffer(ar,StreamID);
-    while (!ar->read_buffer_available[StreamID]) {
-        up(&ar->raw_htc_read_sem[StreamID]);
-
-        /* Wait for the data */
-        AR_DEBUG2_PRINTF("Sleeping StreamID(%d) read process\n", StreamID);
-        if (wait_event_interruptible(ar->raw_htc_read_queue[StreamID],
-                                     ar->read_buffer_available[StreamID]))
-        {
-            return -EINTR;
-        }
-        if (down_interruptible(&ar->raw_htc_read_sem[StreamID])) {
-            return -ERESTARTSYS;
-        }
-        busy = get_filled_buffer(ar,StreamID);
-    }
-
-    /* Read the data */
-    readPtr = busy->currPtr;
-    if (length > busy->length - HTC_HEADER_LEN) {
-        length = busy->length - HTC_HEADER_LEN;
-    }
-    if (copy_to_user(buffer, &busy->data[readPtr], length)) {
-        up(&ar->raw_htc_read_sem[StreamID]);
-        return -EFAULT;
-    }
-
-    busy->currPtr += length;
-
-    //AR_DEBUG_PRINTF("raw read ioctl:  currPTR : 0x%X 0x%X \n", busy->currPtr,busy->length);
-
-    if (busy->currPtr == busy->length)
-    {
-        busy->currPtr = 0;
-        busy->length = 0;
-        HTC_PACKET_RESET_RX(&busy->HTCPacket);
-        //AR_DEBUG_PRINTF("raw read ioctl:  ep for packet:%d \n", busy->HTCPacket.Endpoint);
-        HTCAddReceivePkt(ar->arHtcTarget, &busy->HTCPacket);
-    }
-    ar->read_buffer_available[StreamID] = FALSE;
-    up(&ar->raw_htc_read_sem[StreamID]);
-
-    return length;
-}
-
-static raw_htc_buffer *
-get_free_buffer(AR_SOFTC_T *ar, HTC_ENDPOINT_ID StreamID)
-{
-    int count;
-    raw_htc_buffer *free;
-
-    free = NULL;
-    for (count = 0; count < RAW_HTC_WRITE_BUFFERS_NUM; count ++) {
-        free = ar->raw_htc_write_buffer[StreamID][count];
-        if (free->length == 0) {
-            break;
-        }
-    }
-    if (!free->length) {
-        ar->write_buffer_available[StreamID] = TRUE;
-    } else {
-        ar->write_buffer_available[StreamID] = FALSE;
-    }
-
-    return free;
-}
-
-ssize_t ar6000_htc_raw_write(AR_SOFTC_T *ar, HTC_RAW_STREAM_ID StreamID,
-                     char __user *buffer, size_t length)
-{
-    int writePtr;
-    raw_htc_buffer *free;
-
-    if (arRawStream2EndpointID(ar,StreamID) == 0) {
-        AR_DEBUG_PRINTF("StreamID(%d) not connected! \n", StreamID);
-        return -EFAULT;
-    }
-
-    if (down_interruptible(&ar->raw_htc_write_sem[StreamID])) {
-        return -ERESTARTSYS;
-    }
-
-    /* Search for a free buffer */
-    free = get_free_buffer(ar,StreamID);
-
-    /* Check if there is space to write else wait */
-    while (!ar->write_buffer_available[StreamID]) {
-        up(&ar->raw_htc_write_sem[StreamID]);
-
-        /* Wait for buffer to become free */
-        AR_DEBUG2_PRINTF("Sleeping StreamID(%d) write process\n", StreamID);
-        if (wait_event_interruptible(ar->raw_htc_write_queue[StreamID],
-                                     ar->write_buffer_available[StreamID]))
-        {
-            return -EINTR;
-        }
-        if (down_interruptible(&ar->raw_htc_write_sem[StreamID])) {
-            return -ERESTARTSYS;
-        }
-        free = get_free_buffer(ar,StreamID);
-    }
-
-    /* Send the data */
-    writePtr = HTC_HEADER_LEN;
-    if (length > (AR6000_BUFFER_SIZE - HTC_HEADER_LEN)) {
-        length = AR6000_BUFFER_SIZE - HTC_HEADER_LEN;
-    }
-
-    if (copy_from_user(&free->data[writePtr], buffer, length)) {
-        up(&ar->raw_htc_read_sem[StreamID]);
-        return -EFAULT;
-    }
-
-    free->length = length;
-
-    SET_HTC_PACKET_INFO_TX(&free->HTCPacket,
-                           free,
-                           &free->data[writePtr],
-                           length,
-                           arRawStream2EndpointID(ar,StreamID),
-                           AR6K_DATA_PKT_TAG);
-
-    HTCSendPkt(ar->arHtcTarget,&free->HTCPacket);
-
-    ar->write_buffer_available[StreamID] = FALSE;
-    up(&ar->raw_htc_write_sem[StreamID]);
-
-    return length;
-}
-#endif /* HTC_RAW_INTERFACE */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/ar6xapi_linux.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/ar6xapi_linux.h
deleted file mode 100644
index b8e6e0961..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/ar6xapi_linux.h
+++ /dev/null
@@ -1,128 +0,0 @@
-#ifndef _AR6XAPI_LINUX_H
-#define _AR6XAPI_LINUX_H
-/*
- *
- * Copyright (c) 2004-2007 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct ar6_softc;
-
-void ar6000_ready_event(void *devt, A_UINT8 *datap, A_UINT8 phyCap);
-A_UINT8 ar6000_iptos_to_userPriority(A_UINT8 *pkt);
-A_STATUS ar6000_control_tx(void *devt, void *osbuf, WMI_PRI_STREAM_ID streamID);
-void ar6000_connect_event(struct ar6_softc *ar, A_UINT16 channel,
-                          A_UINT8 *bssid, A_UINT16 listenInterval,
-                          A_UINT16 beaconInterval, NETWORK_TYPE networkType,
-                          A_UINT8 beaconIeLen, A_UINT8 assocReqLen,
-                          A_UINT8 assocRespLen,A_UINT8 *assocInfo);
-void ar6000_disconnect_event(struct ar6_softc *ar, A_UINT8 reason,
-                             A_UINT8 *bssid, A_UINT8 assocRespLen,
-                             A_UINT8 *assocInfo, A_UINT16 protocolReasonStatus);
-void ar6000_tkip_micerr_event(struct ar6_softc *ar, A_UINT8 keyid,
-                              A_BOOL ismcast);
-void ar6000_bitrate_rx(void *devt, A_INT32 rateKbps);
-void ar6000_channelList_rx(void *devt, A_INT8 numChan, A_UINT16 *chanList);
-void ar6000_regDomain_event(struct ar6_softc *ar, A_UINT32 regCode);
-void ar6000_txPwr_rx(void *devt, A_UINT8 txPwr);
-void ar6000_keepalive_rx(void *devt, A_UINT8 configured);
-void ar6000_neighborReport_event(struct ar6_softc *ar, int numAps,
-                                 WMI_NEIGHBOR_INFO *info);
-void ar6000_set_numdataendpts(struct ar6_softc *ar, A_UINT32 num);
-void ar6000_scanComplete_event(struct ar6_softc *ar, A_STATUS status);
-void ar6000_targetStats_event(struct ar6_softc *ar,  WMI_TARGET_STATS *pStats);
-void ar6000_rssiThreshold_event(struct ar6_softc *ar,
-                                WMI_RSSI_THRESHOLD_VAL newThreshold,
-                                A_INT16 rssi);
-void ar6000_reportError_event(struct ar6_softc *, WMI_TARGET_ERROR_VAL errorVal);
-void ar6000_cac_event(struct ar6_softc *ar, A_UINT8 ac, A_UINT8 cac_indication,
-                                A_UINT8 statusCode, A_UINT8 *tspecSuggestion);
-void ar6000_hbChallengeResp_event(struct ar6_softc *, A_UINT32 cookie, A_UINT32 source);
-void
-ar6000_roam_tbl_event(struct ar6_softc *ar, WMI_TARGET_ROAM_TBL *pTbl);
-
-void
-ar6000_roam_data_event(struct ar6_softc *ar, WMI_TARGET_ROAM_DATA *p);
-
-void
-ar6000_wow_list_event(struct ar6_softc *ar, A_UINT8 num_filters,
-                      WMI_GET_WOW_LIST_REPLY *wow_reply);
-
-void ar6000_pmkid_list_event(void *devt, A_UINT8 numPMKID,
-                             WMI_PMKID *pmkidList);
-
-void ar6000_gpio_intr_rx(A_UINT32 intr_mask, A_UINT32 input_values);
-void ar6000_gpio_data_rx(A_UINT32 reg_id, A_UINT32 value);
-void ar6000_gpio_ack_rx(void);
-
-void ar6000_dbglog_init_done(struct ar6_softc *ar);
-
-#ifdef SEND_EVENT_TO_APP
-void ar6000_send_event_to_app(struct ar6_softc *ar, A_UINT16 eventId, A_UINT8 *datap, int len);
-#endif
-
-#ifdef CONFIG_HOST_TCMD_SUPPORT
-void ar6000_tcmd_rx_report_event(void *devt, A_UINT8 * results, int len);
-#endif
-
-void ar6000_tx_retry_err_event(void *devt);
-
-void ar6000_snrThresholdEvent_rx(void *devt,
-                                 WMI_SNR_THRESHOLD_VAL newThreshold,
-                                 A_UINT8 snr);
-
-void ar6000_lqThresholdEvent_rx(void *devt, WMI_LQ_THRESHOLD_VAL range, A_UINT8 lqVal);
-
-
-void ar6000_ratemask_rx(void *devt, A_UINT16 ratemask);
-
-A_STATUS ar6000_get_driver_cfg(struct net_device *dev,
-                                A_UINT16 cfgParam,
-                                void *result);
-void ar6000_bssInfo_event_rx(struct ar6_softc *ar, A_UINT8 *data, int len);
-
-void ar6000_dbglog_event(struct ar6_softc *ar, A_UINT32 dropped,
-                         A_INT8 *buffer, A_UINT32 length);
-
-int ar6000_dbglog_get_debug_logs(struct ar6_softc *ar);
-
-void ar6000_indicate_tx_activity(void *devt, A_UINT8 trafficClass, A_BOOL Active);
-
-void ar6000_dset_open_req(void *devt,
-                          A_UINT32 id,
-                          A_UINT32 targ_handle,
-                          A_UINT32 targ_reply_fn,
-                          A_UINT32 targ_reply_arg);
-void ar6000_dset_close(void *devt, A_UINT32 access_cookie);
-void ar6000_dset_data_req(void *devt,
-                          A_UINT32 access_cookie,
-                          A_UINT32 offset,
-                          A_UINT32 length,
-                          A_UINT32 targ_buf,
-                          A_UINT32 targ_reply_fn,
-                          A_UINT32 targ_reply_arg);
-
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/athdrv_linux.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/athdrv_linux.h
deleted file mode 100644
index 9c3e44973..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/athdrv_linux.h
+++ /dev/null
@@ -1,993 +0,0 @@
-/*
- * Copyright (c) 2004-2006 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#ifndef _ATHDRV_LINUX_H
-#define _ATHDRV_LINUX_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/*
- * There are two types of ioctl's here: Standard ioctls and
- * eXtended ioctls.  All extended ioctls (XIOCTL) are multiplexed
- * off of the single ioctl command, AR6000_IOCTL_EXTENDED.  The
- * arguments for every XIOCTL starts with a 32-bit command word
- * that is used to select which extended ioctl is in use.  After
- * the command word are command-specific arguments.
- */
-
-/* Linux standard Wireless Extensions, private ioctl interfaces */
-#define IEEE80211_IOCTL_SETPARAM             (SIOCIWFIRSTPRIV+0)
-#define IEEE80211_IOCTL_GETPARAM             (SIOCIWFIRSTPRIV+1)
-#define IEEE80211_IOCTL_SETKEY               (SIOCIWFIRSTPRIV+2)
-#define IEEE80211_IOCTL_SETWMMPARAMS         (SIOCIWFIRSTPRIV+3)
-#define IEEE80211_IOCTL_DELKEY               (SIOCIWFIRSTPRIV+4)
-#define IEEE80211_IOCTL_GETWMMPARAMS         (SIOCIWFIRSTPRIV+5)
-#define IEEE80211_IOCTL_SETOPTIE             (SIOCIWFIRSTPRIV+6)
-#define IEEE80211_IOCTL_SETMLME              (SIOCIWFIRSTPRIV+7)
-//#define IEEE80211_IOCTL_GETOPTIE             (SIOCIWFIRSTPRIV+7)
-#define IEEE80211_IOCTL_ADDPMKID             (SIOCIWFIRSTPRIV+8)
-//#define IEEE80211_IOCTL_SETAUTHALG           (SIOCIWFIRSTPRIV+10)
-#define IEEE80211_IOCTL_LASTONE              (SIOCIWFIRSTPRIV+9)
-
-
-
-/*                      ====WMI Ioctls====                                    */
-/*
- *
- * Many ioctls simply provide WMI services to application code:
- * an application makes such an ioctl call with a set of arguments
- * that are packaged into the corresponding WMI message, and sent
- * to the Target.
- */
-
-#define AR6000_IOCTL_WMI_GETREV              (SIOCIWFIRSTPRIV+10)
-/*
- * arguments:
- *   ar6000_version *revision
- */
-
-#define AR6000_IOCTL_WMI_SETPWR              (SIOCIWFIRSTPRIV+11)
-/*
- * arguments:
- *   WMI_POWER_MODE_CMD pwrModeCmd (see include/wmi.h)
- * uses: WMI_SET_POWER_MODE_CMDID
- */
-
-#define AR6000_IOCTL_WMI_SETSCAN             (SIOCIWFIRSTPRIV+12)
-/*
- * arguments:
- *   WMI_SCAN_PARAMS_CMD scanParams (see include/wmi.h)
- * uses: WMI_SET_SCAN_PARAMS_CMDID
- */
-
-#define AR6000_IOCTL_WMI_SETLISTENINT        (SIOCIWFIRSTPRIV+13)
-/*
- * arguments:
- *   UINT32 listenInterval
- * uses: WMI_SET_LISTEN_INT_CMDID
- */
-
-#define AR6000_IOCTL_WMI_SETBSSFILTER        (SIOCIWFIRSTPRIV+14)
-/*
- * arguments:
- *   WMI_BSS_FILTER filter (see include/wmi.h)
- * uses: WMI_SET_BSS_FILTER_CMDID
- */
-
-#define AR6000_IOCTL_WMI_SET_CHANNELPARAMS   (SIOCIWFIRSTPRIV+16)
-/*
- * arguments:
- *   WMI_CHANNEL_PARAMS_CMD chParams
- * uses: WMI_SET_CHANNEL_PARAMS_CMDID
- */
-
-#define AR6000_IOCTL_WMI_SET_PROBEDSSID      (SIOCIWFIRSTPRIV+17)
-/*
- * arguments:
- *   WMI_PROBED_SSID_CMD probedSsids (see include/wmi.h)
- * uses: WMI_SETPROBED_SSID_CMDID
- */
-
-#define AR6000_IOCTL_WMI_SET_PMPARAMS        (SIOCIWFIRSTPRIV+18)
-/*
- * arguments:
- *   WMI_POWER_PARAMS_CMD powerParams (see include/wmi.h)
- * uses: WMI_SET_POWER_PARAMS_CMDID
- */
-
-#define AR6000_IOCTL_WMI_SET_BADAP           (SIOCIWFIRSTPRIV+19)
-/*
- * arguments:
- *   WMI_ADD_BAD_AP_CMD badAPs (see include/wmi.h)
- * uses: WMI_ADD_BAD_AP_CMDID
- */
-
-#define AR6000_IOCTL_WMI_GET_QOS_QUEUE       (SIOCIWFIRSTPRIV+20)
-/*
- * arguments:
- *   ar6000_queuereq queueRequest (see below)
- */
-
-#define AR6000_IOCTL_WMI_CREATE_QOS          (SIOCIWFIRSTPRIV+21)
-/*
- * arguments:
- *   WMI_CREATE_PSTREAM createPstreamCmd (see include/wmi.h)
- * uses: WMI_CREATE_PSTREAM_CMDID
- */
-
-#define AR6000_IOCTL_WMI_DELETE_QOS          (SIOCIWFIRSTPRIV+22)
-/*
- * arguments:
- *   WMI_DELETE_PSTREAM_CMD deletePstreamCmd (see include/wmi.h)
- * uses: WMI_DELETE_PSTREAM_CMDID
- */
-
-#define AR6000_IOCTL_WMI_SET_SNRTHRESHOLD   (SIOCIWFIRSTPRIV+23)
-/*
- * arguments:
- *   WMI_SNR_THRESHOLD_PARAMS_CMD thresholdParams (see include/wmi.h)
- * uses: WMI_SNR_THRESHOLD_PARAMS_CMDID
- */
-
-#define AR6000_IOCTL_WMI_SET_ERROR_REPORT_BITMASK (SIOCIWFIRSTPRIV+24)
-/*
- * arguments:
- *   WMI_TARGET_ERROR_REPORT_BITMASK errorReportBitMask (see include/wmi.h)
- * uses: WMI_TARGET_ERROR_REPORT_BITMASK_CMDID
- */
-
-#define AR6000_IOCTL_WMI_GET_TARGET_STATS    (SIOCIWFIRSTPRIV+25)
-/*
- * arguments:
- *   TARGET_STATS *targetStats (see below)
- * uses: WMI_GET_STATISTICS_CMDID
- */
-
-#define AR6000_IOCTL_WMI_SET_ASSOC_INFO      (SIOCIWFIRSTPRIV+26)
-/*
- * arguments:
- *   WMI_SET_ASSOC_INFO_CMD setAssocInfoCmd
- * uses: WMI_SET_ASSOC_INFO_CMDID
- */
-
-#define AR6000_IOCTL_WMI_SET_ACCESS_PARAMS   (SIOCIWFIRSTPRIV+27)
-/*
- * arguments:
- *   WMI_SET_ACCESS_PARAMS_CMD setAccessParams (see include/wmi.h)
- * uses: WMI_SET_ACCESS_PARAMS_CMDID
- */
-
-#define AR6000_IOCTL_WMI_SET_BMISS_TIME      (SIOCIWFIRSTPRIV+28)
-/*
- * arguments:
- *   UINT32 beaconMissTime
- * uses: WMI_SET_BMISS_TIME_CMDID
- */
-
-#define AR6000_IOCTL_WMI_SET_DISC_TIMEOUT    (SIOCIWFIRSTPRIV+29)
-/*
- * arguments:
- *   WMI_DISC_TIMEOUT_CMD disconnectTimeoutCmd (see include/wmi.h)
- * uses: WMI_SET_DISC_TIMEOUT_CMDID
- */
-
-#define AR6000_IOCTL_WMI_SET_IBSS_PM_CAPS    (SIOCIWFIRSTPRIV+30)
-/*
- * arguments:
- *   WMI_IBSS_PM_CAPS_CMD ibssPowerMgmtCapsCmd
- * uses: WMI_SET_IBSS_PM_CAPS_CMDID
- */
-
-/*
- * There is a very small space available for driver-private
- * wireless ioctls.  In order to circumvent this limitation,
- * we multiplex a bunch of ioctls (XIOCTLs) on top of a
- * single AR6000_IOCTL_EXTENDED ioctl.
- */
-#define AR6000_IOCTL_EXTENDED                (SIOCIWFIRSTPRIV+31)
-
-
-/*                         ====BMI Extended Ioctls====                        */
-
-#define AR6000_XIOCTL_BMI_DONE                                  1
-/*
- * arguments:
- *   UINT32 cmd (AR6000_XIOCTL_BMI_DONE)
- * uses: BMI_DONE
- */
-
-#define AR6000_XIOCTL_BMI_READ_MEMORY                           2
-/*
- * arguments:
- *   union {
- *     struct {
- *       UINT32 cmd (AR6000_XIOCTL_BMI_READ_MEMORY)
- *       UINT32 address
- *       UINT32 length
- *     }
- *     char results[length]
- *   }
- * uses: BMI_READ_MEMORY
- */
-
-#define AR6000_XIOCTL_BMI_WRITE_MEMORY                          3
-/*
- * arguments:
- *   UINT32 cmd (AR6000_XIOCTL_BMI_WRITE_MEMORY)
- *   UINT32 address
- *   UINT32 length
- *   char data[length]
- * uses: BMI_WRITE_MEMORY
- */
-
-#define AR6000_XIOCTL_BMI_EXECUTE                               4
-/*
- * arguments:
- *   UINT32 cmd (AR6000_XIOCTL_BMI_EXECUTE)
- *   UINT32 TargetAddress
- *   UINT32 parameter
- * uses: BMI_EXECUTE
- */
-
-#define AR6000_XIOCTL_BMI_SET_APP_START                         5
-/*
- * arguments:
- *   UINT32 cmd (AR6000_XIOCTL_BMI_SET_APP_START)
- *   UINT32 TargetAddress
- * uses: BMI_SET_APP_START
- */
-
-#define AR6000_XIOCTL_BMI_READ_SOC_REGISTER                     6
-/*
- * arguments:
- *   union {
- *     struct {
- *       UINT32 cmd (AR6000_XIOCTL_BMI_READ_SOC_REGISTER)
- *       UINT32 TargetAddress, 32-bit aligned
- *     }
- *     UINT32 result
- *   }
- * uses: BMI_READ_SOC_REGISTER
- */
-
-#define AR6000_XIOCTL_BMI_WRITE_SOC_REGISTER                    7
-/*
- * arguments:
- *     struct {
- *       UINT32 cmd (AR6000_XIOCTL_BMI_WRITE_SOC_REGISTER)
- *       UINT32 TargetAddress, 32-bit aligned
- *       UINT32 newValue
- *     }
- * uses: BMI_WRITE_SOC_REGISTER
- */
-
-#define AR6000_XIOCTL_BMI_TEST                                  8
-/*
- * arguments:
- *   UINT32 cmd (AR6000_XIOCTL_BMI_TEST)
- *   UINT32 address
- *   UINT32 length
- *   UINT32 count
- */
-
-
-
-/* Historical Host-side DataSet support */
-#define AR6000_XIOCTL_UNUSED9                                   9
-#define AR6000_XIOCTL_UNUSED10                                  10
-#define AR6000_XIOCTL_UNUSED11                                  11
-
-/*                      ====Misc Extended Ioctls====                          */
-
-#define AR6000_XIOCTL_FORCE_TARGET_RESET                        12
-/*
- * arguments:
- *   UINT32 cmd (AR6000_XIOCTL_FORCE_TARGET_RESET)
- */
-
-
-#ifdef HTC_RAW_INTERFACE
-/* HTC Raw Interface Ioctls */
-#define AR6000_XIOCTL_HTC_RAW_OPEN                              13
-/*
- * arguments:
- *   UINT32 cmd (AR6000_XIOCTL_HTC_RAW_OPEN)
- */
-
-#define AR6000_XIOCTL_HTC_RAW_CLOSE                             14
-/*
- * arguments:
- *   UINT32 cmd (AR6000_XIOCTL_HTC_RAW_CLOSE)
- */
-
-#define AR6000_XIOCTL_HTC_RAW_READ                              15
-/*
- * arguments:
- *   union {
- *     struct {
- *       UINT32 cmd (AR6000_XIOCTL_HTC_RAW_READ)
- *       UINT32 mailboxID
- *       UINT32 length
- *     }
- *     results[length]
- *   }
- */
-
-#define AR6000_XIOCTL_HTC_RAW_WRITE                             16
-/*
- * arguments:
- *   UINT32 cmd (AR6000_XIOCTL_HTC_RAW_WRITE)
- *   UINT32 mailboxID
- *   UINT32 length
- *   char buffer[length]
- */
-#endif /* HTC_RAW_INTERFACE */
-
-#define AR6000_XIOCTL_CHECK_TARGET_READY                        17
-/*
- * arguments:
- *   UINT32 cmd (AR6000_XIOCTL_CHECK_TARGET_READY)
- */
-
-
-
-/*                ====GPIO (General Purpose I/O) Extended Ioctls====          */
-
-#define AR6000_XIOCTL_GPIO_OUTPUT_SET                           18
-/*
- * arguments:
- *   UINT32 cmd (AR6000_XIOCTL_GPIO_OUTPUT_SET)
- *   ar6000_gpio_output_set_cmd_s (see below)
- * uses: WMIX_GPIO_OUTPUT_SET_CMDID
- */
-
-#define AR6000_XIOCTL_GPIO_INPUT_GET                            19
-/*
- * arguments:
- *   UINT32 cmd (AR6000_XIOCTL_GPIO_INPUT_GET)
- * uses: WMIX_GPIO_INPUT_GET_CMDID
- */
-
-#define AR6000_XIOCTL_GPIO_REGISTER_SET                         20
-/*
- * arguments:
- *   UINT32 cmd (AR6000_XIOCTL_GPIO_REGISTER_SET)
- *   ar6000_gpio_register_cmd_s (see below)
- * uses: WMIX_GPIO_REGISTER_SET_CMDID
- */
-
-#define AR6000_XIOCTL_GPIO_REGISTER_GET                         21
-/*
- * arguments:
- *   UINT32 cmd (AR6000_XIOCTL_GPIO_REGISTER_GET)
- *   ar6000_gpio_register_cmd_s (see below)
- * uses: WMIX_GPIO_REGISTER_GET_CMDID
- */
-
-#define AR6000_XIOCTL_GPIO_INTR_ACK                             22
-/*
- * arguments:
- *   UINT32 cmd (AR6000_XIOCTL_GPIO_INTR_ACK)
- *   ar6000_cpio_intr_ack_cmd_s (see below)
- * uses: WMIX_GPIO_INTR_ACK_CMDID
- */
-
-#define AR6000_XIOCTL_GPIO_INTR_WAIT                            23
-/*
- * arguments:
- *   UINT32 cmd (AR6000_XIOCTL_GPIO_INTR_WAIT)
- */
-
-
-
-/*                    ====more wireless commands====                          */
-
-#define AR6000_XIOCTL_SET_ADHOC_BSSID                           24
-/*
- * arguments:
- *   UINT32 cmd (AR6000_XIOCTL_SET_ADHOC_BSSID)
- *   WMI_SET_ADHOC_BSSID_CMD setAdHocBssidCmd (see include/wmi.h)
- */
-
-#define AR6000_XIOCTL_SET_OPT_MODE                              25
-/*
- * arguments:
- *   UINT32 cmd (AR6000_XIOCTL_SET_OPT_MODE)
- *   WMI_SET_OPT_MODE_CMD setOptModeCmd (see include/wmi.h)
- * uses: WMI_SET_OPT_MODE_CMDID
- */
-
-#define AR6000_XIOCTL_OPT_SEND_FRAME                            26
-/*
- * arguments:
- *   UINT32 cmd (AR6000_XIOCTL_OPT_SEND_FRAME)
- *   WMI_OPT_TX_FRAME_CMD optTxFrameCmd (see include/wmi.h)
- * uses: WMI_OPT_TX_FRAME_CMDID
- */
-
-#define AR6000_XIOCTL_SET_ADHOC_BEACON_INTVAL                   27
-/*
- * arguments:
- *   UINT32 cmd (AR6000_XIOCTL_SET_ADHOC_BEACON_INTVAL)
- *   WMI_BEACON_INT_CMD beaconIntCmd (see include/wmi.h)
- * uses: WMI_SET_BEACON_INT_CMDID
- */
-
-
-#define IEEE80211_IOCTL_SETAUTHALG                              28
-
-
-#define AR6000_XIOCTL_SET_VOICE_PKT_SIZE                        29
-/*
- * arguments:
- *   UINT32 cmd (AR6000_XIOCTL_SET_VOICE_PKT_SIZE)
- *   WMI_SET_VOICE_PKT_SIZE_CMD setVoicePktSizeCmd (see include/wmi.h)
- * uses: WMI_SET_VOICE_PKT_SIZE_CMDID
- */
-
-
-#define AR6000_XIOCTL_SET_MAX_SP                                30
-/*
- * arguments:
- *   UINT32 cmd (AR6000_XIOCTL_SET_MAX_SP)
- *   WMI_SET_MAX_SP_LEN_CMD maxSPLen(see include/wmi.h)
- * uses: WMI_SET_MAX_SP_LEN_CMDID
- */
-
-#define AR6000_XIOCTL_WMI_GET_ROAM_TBL                          31
-
-#define AR6000_XIOCTL_WMI_SET_ROAM_CTRL                         32
-
-#define AR6000_XIOCTRL_WMI_SET_POWERSAVE_TIMERS                 33
-
-
-/*
- * arguments:
- *   UINT32 cmd (AR6000_XIOCTRL_WMI_SET_POWERSAVE_TIMERS)
- *   WMI_SET_POWERSAVE_TIMERS_CMD powerSaveTimers(see include/wmi.h)
- *   WMI_SET_POWERSAVE_TIMERS_CMDID
- */
-
-#define AR6000_XIOCTRL_WMI_GET_POWER_MODE                        34
-/*
- * arguments:
- *   UINT32 cmd (AR6000_XIOCTRL_WMI_GET_POWER_MODE)
- */
-
-#define AR6000_XIOCTRL_WMI_SET_WLAN_STATE                       35
-typedef enum {
-    WLAN_DISABLED,
-    WLAN_ENABLED
-} AR6000_WLAN_STATE;
-/*
- * arguments:
- * enable/disable
- */
-
-#define AR6000_XIOCTL_WMI_GET_ROAM_DATA                         36
-
-#define AR6000_XIOCTL_WMI_SETRETRYLIMITS                37
-/*
- * arguments:
- *   WMI_SET_RETRY_LIMITS_CMD ibssSetRetryLimitsCmd
- * uses: WMI_SET_RETRY_LIMITS_CMDID
- */
-
-#ifdef CONFIG_HOST_TCMD_SUPPORT
-/*       ====extended commands for radio test ====                          */
-
-#define AR6000_XIOCTL_TCMD_CONT_TX                      38
-/*
- * arguments:
- *   UINT32 cmd (AR6000_XIOCTL_TCMD_CONT_TX)
- *   WMI_TCMD_CONT_TX_CMD contTxCmd (see include/wmi.h)
- * uses: WMI_TCMD_CONT_TX_CMDID
- */
-
-#define AR6000_XIOCTL_TCMD_CONT_RX                      39
-/*
- * arguments:
- *   UINT32 cmd (AR6000_XIOCTL_TCMD_CONT_RX)
- *   WMI_TCMD_CONT_RX_CMD rxCmd (see include/wmi.h)
- * uses: WMI_TCMD_CONT_RX_CMDID
- */
-
-#define AR6000_XIOCTL_TCMD_PM                           40
-/*
- * arguments:
- *   UINT32 cmd (AR6000_XIOCTL_TCMD_PM)
- *   WMI_TCMD_PM_CMD pmCmd (see include/wmi.h)
- * uses: WMI_TCMD_PM_CMDID
- */
-
-#endif /* CONFIG_HOST_TCMD_SUPPORT */
-
-#define AR6000_XIOCTL_WMI_STARTSCAN                     41
-/*
- * arguments:
- *   UINT32 cmd (AR6000_XIOCTL_WMI_STARTSCAN)
- *   UINT8  scanType
- *   UINT8  scanConnected
- *   A_BOOL forceFgScan
- * uses: WMI_START_SCAN_CMDID
- */
-
-#define AR6000_XIOCTL_WMI_SETFIXRATES                   42
-
-#define AR6000_XIOCTL_WMI_GETFIXRATES                   43
-
-
-#define AR6000_XIOCTL_WMI_SET_RSSITHRESHOLD             44
-/*
- * arguments:
- *   WMI_RSSI_THRESHOLD_PARAMS_CMD thresholdParams (see include/wmi.h)
- * uses: WMI_RSSI_THRESHOLD_PARAMS_CMDID
- */
-
-#define AR6000_XIOCTL_WMI_CLR_RSSISNR                   45
-/*
- * arguments:
- *   WMI_CLR_RSSISNR_CMD thresholdParams (see include/wmi.h)
- * uses: WMI_CLR_RSSISNR_CMDID
- */
-
-#define AR6000_XIOCTL_WMI_SET_LQTHRESHOLD               46
-/*
- * arguments:
- *   WMI_LQ_THRESHOLD_PARAMS_CMD thresholdParams (see include/wmi.h)
- * uses: WMI_LQ_THRESHOLD_PARAMS_CMDID
- */
-
-#define AR6000_XIOCTL_WMI_SET_RTS                        47
-/*
- * arguments:
- *   WMI_SET_RTS_MODE_CMD (see include/wmi.h)
- * uses: WMI_SET_RTS_MODE_CMDID
- */
-
-#define AR6000_XIOCTL_WMI_SET_LPREAMBLE                 48
-
-#define AR6000_XIOCTL_WMI_SET_AUTHMODE                  49
-/*
- * arguments:
- *   UINT32 cmd (AR6000_XIOCTL_WMI_SET_AUTHMODE)
- *   UINT8  mode
- * uses: WMI_SET_RECONNECT_AUTH_MODE_CMDID
- */
-
-#define AR6000_XIOCTL_WMI_SET_REASSOCMODE               50
-
-/*
- * arguments:
- *   UINT32 cmd (AR6000_XIOCTL_WMI_SET_WMM)
- *   UINT8  mode
- * uses: WMI_SET_WMM_CMDID
- */
-#define AR6000_XIOCTL_WMI_SET_WMM                       51
-
-/*
- * arguments:
- * UINT32 cmd (AR6000_XIOCTL_WMI_SET_HB_CHALLENGE_RESP_PARAMS)
- * UINT32 frequency
- * UINT8  threshold
- */
-#define AR6000_XIOCTL_WMI_SET_HB_CHALLENGE_RESP_PARAMS  52
-
-/*
- * arguments:
- * UINT32 cmd (AR6000_XIOCTL_WMI_GET_HB_CHALLENGE_RESP)
- * UINT32 cookie
- */
-#define AR6000_XIOCTL_WMI_GET_HB_CHALLENGE_RESP         53
-
-/*
- * arguments:
- *   UINT32 cmd (AR6000_XIOCTL_WMI_GET_RD)
- *   UINT32 regDomain
- */
-#define AR6000_XIOCTL_WMI_GET_RD                        54
-
-#define AR6000_XIOCTL_DIAG_READ                         55
-
-#define AR6000_XIOCTL_DIAG_WRITE                        56
-
-/*
- * arguments cmd (AR6000_XIOCTL_SET_TXOP)
- * WMI_TXOP_CFG  txopEnable
- */
-#define AR6000_XIOCTL_WMI_SET_TXOP                      57
-
-#ifdef USER_KEYS
-/*
- * arguments:
- * UINT32 cmd (AR6000_XIOCTL_USER_SETKEYS)
- * UINT32 keyOpCtrl
- * uses AR6000_USER_SETKEYS_INFO
- */
-#define AR6000_XIOCTL_USER_SETKEYS                      58
-#endif /* USER_KEYS */
-
-#define AR6000_XIOCTL_WMI_SET_KEEPALIVE                 59
-/*
- * arguments:
- *   UINT8 cmd (AR6000_XIOCTL_WMI_SET_KEEPALIVE)
- *   UINT8 keepaliveInterval
- * uses: WMI_SET_KEEPALIVE_CMDID
- */
-
-#define AR6000_XIOCTL_WMI_GET_KEEPALIVE                 60
-/*
- * arguments:
- *   UINT8 cmd (AR6000_XIOCTL_WMI_GET_KEEPALIVE)
- *   UINT8 keepaliveInterval
- *   A_BOOL configured
- * uses: WMI_GET_KEEPALIVE_CMDID
- */
-
-/*               ====ROM Patching Extended Ioctls====                       */
-
-#define AR6000_XIOCTL_BMI_ROMPATCH_INSTALL              61
-/*
- * arguments:
- *     union {
- *       struct {
- *         UINT32 cmd (AR6000_XIOCTL_BMI_ROMPATCH_INSTALL)
- *         UINT32 ROM Address
- *         UINT32 RAM Address
- *         UINT32 number of bytes
- *         UINT32 activate? (0 or 1)
- *       }
- *       A_UINT32 resulting rompatch ID
- *     }
- * uses: BMI_ROMPATCH_INSTALL
- */
-
-#define AR6000_XIOCTL_BMI_ROMPATCH_UNINSTALL            62
-/*
- * arguments:
- *     struct {
- *       UINT32 cmd (AR6000_XIOCTL_BMI_ROMPATCH_UNINSTALL)
- *       UINT32 rompatch ID
- *     }
- * uses: BMI_ROMPATCH_UNINSTALL
- */
-
-#define AR6000_XIOCTL_BMI_ROMPATCH_ACTIVATE             63
-/*
- * arguments:
- *     struct {
- *       UINT32 cmd (AR6000_XIOCTL_BMI_ROMPATCH_ACTIVATE)
- *       UINT32 rompatch count
- *       UINT32 rompatch IDs[rompatch count]
- *     }
- * uses: BMI_ROMPATCH_ACTIVATE
- */
-
-#define AR6000_XIOCTL_BMI_ROMPATCH_DEACTIVATE           64
-/*
- * arguments:
- *     struct {
- *       UINT32 cmd (AR6000_XIOCTL_BMI_ROMPATCH_DEACTIVATE)
- *       UINT32 rompatch count
- *       UINT32 rompatch IDs[rompatch count]
- *     }
- * uses: BMI_ROMPATCH_DEACTIVATE
- */
-
-#define AR6000_XIOCTL_WMI_SET_APPIE             65
-/*
- * arguments:
- *      struct {
- *          UINT32 cmd (AR6000_XIOCTL_WMI_SET_APPIE)
- *          UINT32  app_frmtype;
- *          UINT32  app_buflen;
- *          UINT8   app_buf[];
- *      }
- */
-#define AR6000_XIOCTL_WMI_SET_MGMT_FRM_RX_FILTER    66
-/*
- * arguments:
- *      A_UINT32 filter_type;
- */
-
-#define AR6000_XIOCTL_DBGLOG_CFG_MODULE             67
-
-#define AR6000_XIOCTL_DBGLOG_GET_DEBUG_LOGS         68
-
-#define AR6000_XIOCTL_WMI_SET_WSC_STATUS    		70
-/*
- * arguments:
- *      A_UINT32 wsc_status;
- *            (WSC_REG_INACTIVE or WSC_REG_ACTIVE)
- */
-
-/*
- * arguments:
- *      struct {
- *          A_UINT8 streamType;
- *          A_UINT8 status;
- *      }
- * uses: WMI_SET_BT_STATUS_CMDID
- */
-#define AR6000_XIOCTL_WMI_SET_BT_STATUS             71
-
-/*
- * arguments:
- *      struct {
- *           A_UINT8 paramType;
- *           union {
- *               A_UINT8 noSCOPkts;
- *               BT_PARAMS_A2DP a2dpParams;
- *               BT_COEX_REGS regs;
- *           };
- *      }
- * uses: WMI_SET_BT_PARAM_CMDID
- */
-#define AR6000_XIOCTL_WMI_SET_BT_PARAMS             72
-
-#define AR6000_XIOCTL_WMI_SET_HOST_SLEEP_MODE       73
-#define AR6000_XIOCTL_WMI_SET_WOW_MODE              74
-#define AR6000_XIOCTL_WMI_GET_WOW_LIST              75
-#define AR6000_XIOCTL_WMI_ADD_WOW_PATTERN           76
-#define AR6000_XIOCTL_WMI_DEL_WOW_PATTERN           77
-
-
-
-#define AR6000_XIOCTL_TARGET_INFO                   78
-/*
- * arguments:
- *   UINT32 cmd (AR6000_XIOCTL_TARGET_INFO)
- *   A_UINT32 TargetVersion (returned)
- *   A_UINT32 TargetType    (returned)
- * (See also bmi_msg.h target_ver and target_type)
- */
-
-#define AR6000_XIOCTL_DUMP_HTC_CREDIT_STATE         79
-/*
- * arguments:
- *      none
- */
-
-#define AR6000_XIOCTL_TRAFFIC_ACTIVITY_CHANGE       80
-/*
- * This ioctl is used to emulate traffic activity
- * timeouts.  Activity/inactivity will trigger the driver
- * to re-balance credits.
- *
- * arguments:
- *      ar6000_traffic_activity_change
- */
-
-#define AR6000_XIOCTL_WMI_SET_CONNECT_CTRL_FLAGS    81
-/*
- * This ioctl is used to set the connect control flags
- *
- * arguments:
- *      A_UINT32 connectCtrlFlags
- */
-
-#define AR6000_XIOCTL_WMI_SET_AKMP_PARAMS              82
-/*
- * This IOCTL sets any Authentication,Key Management and Protection
- * related parameters. This is used along with the information set in
- * Connect Command.
- * Currently this enables Multiple PMKIDs to an AP.
- *
- * arguments:
- *      struct {
- *          A_UINT32    akmpInfo;
- *      }
- * uses: WMI_SET_AKMP_PARAMS_CMD
- */
-
-#define AR6000_XIOCTL_WMI_GET_PMKID_LIST            83
-
-#define AR6000_XIOCTL_WMI_SET_PMKID_LIST            84
-/*
- * This IOCTL is used to set a list of PMKIDs. This list of
- * PMKIDs is used in the [Re]AssocReq Frame. This list is used
- * only if the MultiPMKID option is enabled via the
- * AR6000_XIOCTL_WMI_SET_AKMP_PARAMS  IOCTL.
- *
- * arguments:
- *      struct {
- *          A_UINT32    numPMKID;
- *          WMI_PMKID   pmkidList[WMI_MAX_PMKID_CACHE];
- *      }
- * uses: WMI_SET_PMKIDLIST_CMD
- */
-
-/* Historical DSETPATCH support for INI patches */
-#define AR6000_XIOCTL_UNUSED90                      90
-
-
-
-/* used by AR6000_IOCTL_WMI_GETREV */
-struct ar6000_version {
-    A_UINT32        host_ver;
-    A_UINT32        target_ver;
-};
-
-/* used by AR6000_IOCTL_WMI_GET_QOS_QUEUE */
-struct ar6000_queuereq {
-    A_UINT8         trafficClass;
-    A_UINT16        activeTsids;
-};
-
-/* used by AR6000_IOCTL_WMI_GET_TARGET_STATS */
-typedef struct targetStats_t {
-    A_UINT64    tx_packets;
-    A_UINT64    tx_bytes;
-    A_UINT64    tx_unicast_pkts;
-    A_UINT64    tx_unicast_bytes;
-    A_UINT64    tx_multicast_pkts;
-    A_UINT64    tx_multicast_bytes;
-    A_UINT64    tx_broadcast_pkts;
-    A_UINT64    tx_broadcast_bytes;
-    A_UINT64    tx_rts_success_cnt;
-    A_UINT64    tx_packet_per_ac[4];
-
-    A_UINT64    tx_errors;
-    A_UINT64    tx_failed_cnt;
-    A_UINT64    tx_retry_cnt;
-    A_UINT64    tx_rts_fail_cnt;
-    A_INT32     tx_unicast_rate;
-    A_UINT64    rx_packets;
-    A_UINT64    rx_bytes;
-    A_UINT64    rx_unicast_pkts;
-    A_UINT64    rx_unicast_bytes;
-    A_UINT64    rx_multicast_pkts;
-    A_UINT64    rx_multicast_bytes;
-    A_UINT64    rx_broadcast_pkts;
-    A_UINT64    rx_broadcast_bytes;
-    A_UINT64    rx_fragment_pkt;
-
-    A_UINT64    rx_errors;
-    A_UINT64    rx_crcerr;
-    A_UINT64    rx_key_cache_miss;
-    A_UINT64    rx_decrypt_err;
-    A_UINT64    rx_duplicate_frames;
-    A_INT32     rx_unicast_rate;
-
-    A_UINT64    tkip_local_mic_failure;
-    A_UINT64    tkip_counter_measures_invoked;
-    A_UINT64    tkip_replays;
-    A_UINT64    tkip_format_errors;
-    A_UINT64    ccmp_format_errors;
-    A_UINT64    ccmp_replays;
-
-    A_UINT64    power_save_failure_cnt;
-    A_INT16     noise_floor_calibation;
-
-    A_UINT64    cs_bmiss_cnt;
-    A_UINT64    cs_lowRssi_cnt;
-    A_UINT64    cs_connect_cnt;
-    A_UINT64    cs_disconnect_cnt;
-    A_UINT8     cs_aveBeacon_snr;
-    A_INT16     cs_aveBeacon_rssi;
-    A_UINT8     cs_lastRoam_msec;
-    A_UINT8     cs_snr;
-    A_INT16     cs_rssi;
-
-    A_UINT32    lq_val;
-
-    A_UINT32    wow_num_pkts_dropped;
-    A_UINT8     wow_num_host_pkt_wakeups;
-    A_UINT8     wow_num_host_event_wakeups;
-    A_UINT16    wow_num_events_discarded;
-
-}TARGET_STATS;
-
-typedef struct targetStats_cmd_t {
-    TARGET_STATS targetStats;
-    int clearStats;
-} TARGET_STATS_CMD;
-
-/* used by AR6000_XIOCTL_USER_SETKEYS */
-
-/*
- * Setting this bit to 1 doesnot initialize the RSC on the firmware
- */
-#define AR6000_XIOCTL_USER_SETKEYS_RSC_CTRL    1
-#define AR6000_USER_SETKEYS_RSC_UNCHANGED     0x00000002
-
-typedef struct {
-    A_UINT32  keyOpCtrl;  /* Bit Map of Key Mgmt Ctrl Flags */
-} AR6000_USER_SETKEYS_INFO;
-
-
-/* used by AR6000_XIOCTL_GPIO_OUTPUT_SET */
-struct ar6000_gpio_output_set_cmd_s {
-    A_UINT32 set_mask;
-    A_UINT32 clear_mask;
-    A_UINT32 enable_mask;
-    A_UINT32 disable_mask;
-};
-
-/*
- * used by AR6000_XIOCTL_GPIO_REGISTER_GET and AR6000_XIOCTL_GPIO_REGISTER_SET
- */
-struct ar6000_gpio_register_cmd_s {
-    A_UINT32 gpioreg_id;
-    A_UINT32 value;
-};
-
-/* used by AR6000_XIOCTL_GPIO_INTR_ACK */
-struct ar6000_gpio_intr_ack_cmd_s {
-    A_UINT32 ack_mask;
-};
-
-/* used by AR6000_XIOCTL_GPIO_INTR_WAIT */
-struct ar6000_gpio_intr_wait_cmd_s {
-    A_UINT32 intr_mask;
-    A_UINT32 input_values;
-};
-
-/* used by the AR6000_XIOCTL_DBGLOG_CFG_MODULE */
-typedef struct ar6000_dbglog_module_config_s {
-    A_UINT32 valid;
-    A_UINT16 mmask;
-    A_UINT16 tsr;
-    A_BOOL   rep;
-    A_UINT16 size;
-} DBGLOG_MODULE_CONFIG;
-
-typedef struct user_rssi_thold_t {
-    A_INT16     tag;
-    A_INT16     rssi;
-} USER_RSSI_THOLD;
-
-typedef struct user_rssi_params_t {
-    A_UINT8            weight;
-    A_UINT32           pollTime;
-    USER_RSSI_THOLD    tholds[12];
-} USER_RSSI_PARAMS;
-
-/*
- * Host driver may have some config parameters. Typically, these
- * config params are one time config parameters. These could
- * correspond to any of the underlying modules. Host driver exposes
- * an api for the underlying modules to get this config.
- */
-#define AR6000_DRIVER_CFG_BASE                  0x8000
-
-/* Should driver perform wlan node caching? */
-#define AR6000_DRIVER_CFG_GET_WLANNODECACHING   0x8001
-/*Should we log raw WMI msgs */
-#define AR6000_DRIVER_CFG_LOG_RAW_WMI_MSGS      0x8002
-
-/* used by AR6000_XIOCTL_DIAG_READ & AR6000_XIOCTL_DIAG_WRITE */
-struct ar6000_diag_window_cmd_s {
-    unsigned int addr;
-    unsigned int value;
-};
-
-
-struct ar6000_traffic_activity_change {
-    A_UINT32    StreamID;   /* stream ID to indicate activity change */
-    A_UINT32    Active;     /* active (1) or inactive (0) */
-};
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/athtypes_linux.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/athtypes_linux.h
deleted file mode 100644
index 3e91de331..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/athtypes_linux.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * $Id: //depot/sw/releases/olca2.0-GPL/host/os/linux/include/athtypes_linux.h#1 $
- *
- * This file contains the definitions of the basic atheros data types.
- * It is used to map the data types in atheros files to a platform specific
- * type.
- *
- * Copyright 2003-2005 Atheros Communications, Inc.,  All Rights Reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#ifndef _ATHTYPES_LINUX_H_
-#define _ATHTYPES_LINUX_H_
-
-#ifdef __KERNEL__
-#include <linux/types.h>
-#endif
-
-typedef int8_t      A_INT8;
-typedef int16_t     A_INT16;
-typedef int32_t     A_INT32;
-typedef int64_t     A_INT64;
-
-typedef u_int8_t     A_UINT8;
-typedef u_int16_t    A_UINT16;
-typedef u_int32_t    A_UINT32;
-typedef u_int64_t    A_UINT64;
-
-typedef int             A_BOOL;
-typedef char            A_CHAR;
-typedef unsigned char   A_UCHAR;
-typedef unsigned long   A_ATH_TIMER;
-
-
-#endif /* _ATHTYPES_LINUX_H_ */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/config_linux.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/config_linux.h
deleted file mode 100644
index 11a691d0c..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/config_linux.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2004-2007 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#ifndef _CONFIG_LINUX_H_
-#define _CONFIG_LINUX_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Host-side GPIO support is optional.
- * If run-time access to GPIO pins is not required, then
- * this should be changed to #undef.
- */
-#define CONFIG_HOST_GPIO_SUPPORT
-
-/*
- * Host side Test Command support
- */
-#define CONFIG_HOST_TCMD_SUPPORT
-
-#define USE_4BYTE_REGISTER_ACCESS
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/debug_linux.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/debug_linux.h
deleted file mode 100644
index c74e1df9f..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/debug_linux.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2004-2006 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#ifndef _DEBUG_LINUX_H_
-#define _DEBUG_LINUX_H_
-
-#define DBG_DEFAULTS	(DBG_ERROR|DBG_WARNING)
-
-extern A_UINT32 g_dbg_flags;
-
-#define DBGFMT  "%s() : "
-#define DBGARG  __func__
-#define DBGFN	A_PRINTF
-
-/* ------- Debug related stuff ------- */
-enum {
-    ATH_DEBUG_SEND = 0x0001,
-    ATH_DEBUG_RECV = 0x0002,
-    ATH_DEBUG_SYNC = 0x0004,
-    ATH_DEBUG_DUMP = 0x0008,
-    ATH_DEBUG_IRQ  = 0x0010,
-    ATH_DEBUG_TRC  = 0x0020,
-    ATH_DEBUG_WARN = 0x0040,
-    ATH_DEBUG_ERR  = 0x0080,
-    ATH_LOG_INF	   = 0x0100,
-    ATH_DEBUG_BMI  = 0x0110,
-    ATH_DEBUG_WMI  = 0x0120,
-    ATH_DEBUG_HIF  = 0x0140,
-    ATH_DEBUG_HTC  = 0x0180,
-    ATH_DEBUG_WLAN = 0x1000,
-    ATH_LOG_ERR	   = 0x1010,
-    ATH_DEBUG_ANY  = 0xFFFF,
-};
-
-#ifdef DEBUG
-
-#define A_DPRINTF(f, a) \
-	if(g_dbg_flags & (f)) \
-	{	\
-		DBGFN a ; \
-	}
-
-
-// TODO FIX usage of A_PRINTF!
-#define AR_DEBUG_LVL_CHECK(lvl) (debughtc & (lvl))
-#define AR_DEBUG_PRINTBUF(buffer, length, desc) do {   \
-    if (debughtc & ATH_DEBUG_DUMP) {             \
-        DebugDumpBytes(buffer, length,desc);               \
-    }                                            \
-} while(0)
-#define PRINTX_ARG(arg...) arg
-#define AR_DEBUG_PRINTF(flags, args) do {        \
-    if (debughtc & (flags)) {                    \
-        A_PRINTF(KERN_ALERT PRINTX_ARG args);    \
-    }                                            \
-} while (0)
-#define AR_DEBUG_ASSERT(test) do {               \
-    if (!(test)) {                               \
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Debug Assert Caught, File %s, Line: %d, Test:%s \n",__FILE__, __LINE__,#test));         \
-    }                                            \
-} while(0)
-extern int debughtc;
-#else
-#define AR_DEBUG_PRINTF(flags, args)
-#define AR_DEBUG_PRINTBUF(buffer, length, desc)
-#define AR_DEBUG_ASSERT(test)
-#define AR_DEBUG_LVL_CHECK(lvl) 0
-#define A_DPRINTF(f, a)
-#endif
-
-#endif /* _DEBUG_LINUX_H_ */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/ioctl.c b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/ioctl.c
deleted file mode 100644
index 04aa911f3..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/ioctl.c
+++ /dev/null
@@ -1,2532 +0,0 @@
-/*
- *
- * Copyright (c) 2004-2007 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#include "ar6000_drv.h"
-
-static A_UINT8 bcast_mac[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
-static A_UINT8 null_mac[] = {0x0, 0x0, 0x0, 0x0, 0x0, 0x0};
-extern USER_RSSI_THOLD rssi_map[12];
-extern unsigned int wmitimeout;
-extern A_WAITQUEUE_HEAD arEvent;
-extern int tspecCompliance;
-extern int bypasswmi;
-
-static int
-ar6000_ioctl_get_roam_tbl(struct net_device *dev, struct ifreq *rq)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-
-    if (ar->arWmiReady == FALSE) {
-        return -EIO;
-    }
-
-    if(wmi_get_roam_tbl_cmd(ar->arWmi) != A_OK) {
-        return -EIO;
-    }
-
-    return 0;
-}
-
-static int
-ar6000_ioctl_get_roam_data(struct net_device *dev, struct ifreq *rq)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-
-    if (ar->arWmiReady == FALSE) {
-        return -EIO;
-    }
-
-
-    /* currently assume only roam times are required */
-    if(wmi_get_roam_data_cmd(ar->arWmi, ROAM_DATA_TIME) != A_OK) {
-        return -EIO;
-    }
-
-
-    return 0;
-}
-
-static int
-ar6000_ioctl_set_roam_ctrl(struct net_device *dev, char *userdata)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    WMI_SET_ROAM_CTRL_CMD cmd;
-    A_UINT8 size = sizeof(cmd);
-
-    if (ar->arWmiReady == FALSE) {
-        return -EIO;
-    }
-
-
-    if (copy_from_user(&cmd, userdata, size)) {
-        return -EFAULT;
-    }
-
-    if (cmd.roamCtrlType == WMI_SET_HOST_BIAS) {
-        if (cmd.info.bssBiasInfo.numBss > 1) {
-            size += (cmd.info.bssBiasInfo.numBss - 1) * sizeof(WMI_BSS_BIAS);
-        }
-    }
-
-    if (copy_from_user(&cmd, userdata, size)) {
-        return -EFAULT;
-    }
-
-    if(wmi_set_roam_ctrl_cmd(ar->arWmi, &cmd, size) != A_OK) {
-        return -EIO;
-    }
-
-    return 0;
-}
-
-static int
-ar6000_ioctl_set_powersave_timers(struct net_device *dev, char *userdata)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    WMI_POWERSAVE_TIMERS_POLICY_CMD cmd;
-    A_UINT8 size = sizeof(cmd);
-
-    if (ar->arWmiReady == FALSE) {
-        return -EIO;
-    }
-
-    if (copy_from_user(&cmd, userdata, size)) {
-        return -EFAULT;
-    }
-
-    if (copy_from_user(&cmd, userdata, size)) {
-        return -EFAULT;
-    }
-
-    if(wmi_set_powersave_timers_cmd(ar->arWmi, &cmd, size) != A_OK) {
-        return -EIO;
-    }
-
-    return 0;
-}
-
-static int
-ar6000_ioctl_set_wmm(struct net_device *dev, struct ifreq *rq)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    WMI_SET_WMM_CMD cmd;
-    A_STATUS ret;
-
-    if ((dev->flags & IFF_UP) != IFF_UP) {
-        return -EIO;
-    }
-    if (ar->arWmiReady == FALSE) {
-        return -EIO;
-    }
-
-    if (copy_from_user(&cmd, (char *)((unsigned int*)rq->ifr_data + 1),
-                                sizeof(cmd)))
-    {
-        return -EFAULT;
-    }
-
-    if (cmd.status == WMI_WMM_ENABLED) {
-        ar->arWmmEnabled = TRUE;
-    } else {
-        ar->arWmmEnabled = FALSE;
-    }
-
-    ret = wmi_set_wmm_cmd(ar->arWmi, cmd.status);
-
-    switch (ret) {
-        case A_OK:
-            return 0;
-        case A_EBUSY :
-            return -EBUSY;
-        case A_NO_MEMORY:
-            return -ENOMEM;
-        case A_EINVAL:
-        default:
-            return -EFAULT;
-    }
-}
-
-static int
-ar6000_ioctl_set_txop(struct net_device *dev, struct ifreq *rq)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    WMI_SET_WMM_TXOP_CMD cmd;
-    A_STATUS ret;
-
-    if ((dev->flags & IFF_UP) != IFF_UP) {
-        return -EIO;
-    }
-    if (ar->arWmiReady == FALSE) {
-        return -EIO;
-    }
-
-    if (copy_from_user(&cmd, (char *)((unsigned int*)rq->ifr_data + 1),
-                                sizeof(cmd)))
-    {
-        return -EFAULT;
-    }
-
-    ret = wmi_set_wmm_txop(ar->arWmi, cmd.txopEnable);
-
-    switch (ret) {
-        case A_OK:
-            return 0;
-        case A_EBUSY :
-            return -EBUSY;
-        case A_NO_MEMORY:
-            return -ENOMEM;
-        case A_EINVAL:
-        default:
-            return -EFAULT;
-    }
-}
-
-static int
-ar6000_ioctl_get_rd(struct net_device *dev, struct ifreq *rq)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    A_STATUS ret = 0;
-
-    if ((dev->flags & IFF_UP) != IFF_UP || ar->arWmiReady == FALSE) {
-        return -EIO;
-    }
-
-    if(copy_to_user((char *)((unsigned int*)rq->ifr_data + 1),
-                            &ar->arRegCode, sizeof(ar->arRegCode)))
-        ret = -EFAULT;
-
-    return ret;
-}
-
-
-/* Get power mode command */
-static int
-ar6000_ioctl_get_power_mode(struct net_device *dev, struct ifreq *rq)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    WMI_POWER_MODE_CMD power_mode;
-    int ret = 0;
-
-    if (ar->arWmiReady == FALSE) {
-        return -EIO;
-    }
-
-    power_mode.powerMode = wmi_get_power_mode_cmd(ar->arWmi);
-    if (copy_to_user(rq->ifr_data, &power_mode, sizeof(WMI_POWER_MODE_CMD))) {
-        ret = -EFAULT;
-    }
-
-    return ret;
-}
-
-
-static int
-ar6000_ioctl_set_channelParams(struct net_device *dev, struct ifreq *rq)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    WMI_CHANNEL_PARAMS_CMD cmd, *cmdp;
-    int ret = 0;
-
-    if (ar->arWmiReady == FALSE) {
-        return -EIO;
-    }
-
-
-    if (copy_from_user(&cmd, rq->ifr_data, sizeof(cmd))) {
-        return -EFAULT;
-    }
-
-    if (cmd.numChannels > 1) {
-        cmdp = A_MALLOC(130);
-        if (copy_from_user(cmdp, rq->ifr_data,
-                           sizeof (*cmdp) +
-                           ((cmd.numChannels - 1) * sizeof(A_UINT16))))
-        {
-            kfree(cmdp);
-            return -EFAULT;
-        }
-    } else {
-        cmdp = &cmd;
-    }
-
-    if ((ar->arPhyCapability == WMI_11G_CAPABILITY) &&
-        ((cmdp->phyMode == WMI_11A_MODE) || (cmdp->phyMode == WMI_11AG_MODE)))
-    {
-        ret = -EINVAL;
-    }
-
-    if (!ret &&
-        (wmi_set_channelParams_cmd(ar->arWmi, cmdp->scanParam, cmdp->phyMode,
-                                   cmdp->numChannels, cmdp->channelList)
-         != A_OK))
-    {
-        ret = -EIO;
-    }
-
-    if (cmd.numChannels > 1) {
-        kfree(cmdp);
-    }
-
-    return ret;
-}
-
-static int
-ar6000_ioctl_set_snr_threshold(struct net_device *dev, struct ifreq *rq)
-{
-
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    WMI_SNR_THRESHOLD_PARAMS_CMD cmd;
-    int ret = 0;
-
-    if (ar->arWmiReady == FALSE) {
-        return -EIO;
-    }
-
-    if (copy_from_user(&cmd, rq->ifr_data, sizeof(cmd))) {
-        return -EFAULT;
-    }
-
-    if( wmi_set_snr_threshold_params(ar->arWmi, &cmd) != A_OK ) {
-        ret = -EIO;
-    }
-
-    return ret;
-}
-
-static int
-ar6000_ioctl_set_rssi_threshold(struct net_device *dev, struct ifreq *rq)
-{
-#define SWAP_THOLD(thold1, thold2) do { \
-    USER_RSSI_THOLD tmpThold;           \
-    tmpThold.tag = thold1.tag;          \
-    tmpThold.rssi = thold1.rssi;        \
-    thold1.tag = thold2.tag;            \
-    thold1.rssi = thold2.rssi;          \
-    thold2.tag = tmpThold.tag;          \
-    thold2.rssi = tmpThold.rssi;        \
-} while (0)
-
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    WMI_RSSI_THRESHOLD_PARAMS_CMD cmd;
-    USER_RSSI_PARAMS rssiParams;
-    A_INT32 i, j;
-
-    int ret = 0;
-
-    if (ar->arWmiReady == FALSE) {
-        return -EIO;
-    }
-
-    if (copy_from_user((char *)&rssiParams, (char *)((unsigned int *)rq->ifr_data + 1), sizeof(USER_RSSI_PARAMS))) {
-        return -EFAULT;
-    }
-    cmd.weight = rssiParams.weight;
-    cmd.pollTime = rssiParams.pollTime;
-
-    A_MEMCPY(rssi_map, &rssiParams.tholds, sizeof(rssi_map));
-    /*
-     *  only 6 elements, so use bubble sorting, in ascending order
-     */
-    for (i = 5; i > 0; i--) {
-        for (j = 0; j < i; j++) { /* above tholds */
-            if (rssi_map[j+1].rssi < rssi_map[j].rssi) {
-                SWAP_THOLD(rssi_map[j+1], rssi_map[j]);
-            } else if (rssi_map[j+1].rssi == rssi_map[j].rssi) {
-                return EFAULT;
-            }
-        }
-    }
-    for (i = 11; i > 6; i--) {
-        for (j = 6; j < i; j++) { /* below tholds */
-            if (rssi_map[j+1].rssi < rssi_map[j].rssi) {
-                SWAP_THOLD(rssi_map[j+1], rssi_map[j]);
-            } else if (rssi_map[j+1].rssi == rssi_map[j].rssi) {
-                return EFAULT;
-            }
-        }
-    }
-
-#ifdef DEBUG
-    for (i = 0; i < 12; i++) {
-        AR_DEBUG2_PRINTF("thold[%d].tag: %d, thold[%d].rssi: %d \n",
-                i, rssi_map[i].tag, i, rssi_map[i].rssi);
-    }
-#endif
-    cmd.thresholdAbove1_Val = rssi_map[0].rssi;
-    cmd.thresholdAbove2_Val = rssi_map[1].rssi;
-    cmd.thresholdAbove3_Val = rssi_map[2].rssi;
-    cmd.thresholdAbove4_Val = rssi_map[3].rssi;
-    cmd.thresholdAbove5_Val = rssi_map[4].rssi;
-    cmd.thresholdAbove6_Val = rssi_map[5].rssi;
-    cmd.thresholdBelow1_Val = rssi_map[6].rssi;
-    cmd.thresholdBelow2_Val = rssi_map[7].rssi;
-    cmd.thresholdBelow3_Val = rssi_map[8].rssi;
-    cmd.thresholdBelow4_Val = rssi_map[9].rssi;
-    cmd.thresholdBelow5_Val = rssi_map[10].rssi;
-    cmd.thresholdBelow6_Val = rssi_map[11].rssi;
-
-    if( wmi_set_rssi_threshold_params(ar->arWmi, &cmd) != A_OK ) {
-        ret = -EIO;
-    }
-
-    return ret;
-}
-
-static int
-ar6000_ioctl_set_lq_threshold(struct net_device *dev, struct ifreq *rq)
-{
-
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    WMI_LQ_THRESHOLD_PARAMS_CMD cmd;
-    int ret = 0;
-
-    if (ar->arWmiReady == FALSE) {
-        return -EIO;
-    }
-
-    if (copy_from_user(&cmd, (char *)((unsigned int *)rq->ifr_data + 1), sizeof(cmd))) {
-        return -EFAULT;
-    }
-
-    if( wmi_set_lq_threshold_params(ar->arWmi, &cmd) != A_OK ) {
-        ret = -EIO;
-    }
-
-    return ret;
-}
-
-
-static int
-ar6000_ioctl_set_probedSsid(struct net_device *dev, struct ifreq *rq)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    WMI_PROBED_SSID_CMD cmd;
-    int ret = 0;
-
-    if (ar->arWmiReady == FALSE) {
-        return -EIO;
-    }
-
-    if (copy_from_user(&cmd, rq->ifr_data, sizeof(cmd))) {
-        return -EFAULT;
-    }
-
-    if (wmi_probedSsid_cmd(ar->arWmi, cmd.entryIndex, cmd.flag, cmd.ssidLength,
-                                  cmd.ssid) != A_OK)
-    {
-        ret = -EIO;
-    }
-
-    return ret;
-}
-
-static int
-ar6000_ioctl_set_badAp(struct net_device *dev, struct ifreq *rq)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    WMI_ADD_BAD_AP_CMD cmd;
-    int ret = 0;
-
-    if (ar->arWmiReady == FALSE) {
-        return -EIO;
-    }
-
-
-    if (copy_from_user(&cmd, rq->ifr_data, sizeof(cmd))) {
-        return -EFAULT;
-    }
-
-    if (cmd.badApIndex > WMI_MAX_BAD_AP_INDEX) {
-        return -EIO;
-    }
-
-    if (A_MEMCMP(cmd.bssid, null_mac, AR6000_ETH_ADDR_LEN) == 0) {
-        /*
-         * This is a delete badAP.
-         */
-        if (wmi_deleteBadAp_cmd(ar->arWmi, cmd.badApIndex) != A_OK) {
-            ret = -EIO;
-        }
-    } else {
-        if (wmi_addBadAp_cmd(ar->arWmi, cmd.badApIndex, cmd.bssid) != A_OK) {
-            ret = -EIO;
-        }
-    }
-
-    return ret;
-}
-
-static int
-ar6000_ioctl_create_qos(struct net_device *dev, struct ifreq *rq)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    WMI_CREATE_PSTREAM_CMD cmd;
-    A_STATUS ret;
-
-    if (ar->arWmiReady == FALSE) {
-        return -EIO;
-    }
-
-
-    if (copy_from_user(&cmd, rq->ifr_data, sizeof(cmd))) {
-        return -EFAULT;
-    }
-
-    ret = wmi_verify_tspec_params(&cmd, tspecCompliance);
-    if (ret == A_OK)
-        ret = wmi_create_pstream_cmd(ar->arWmi, &cmd);
-
-    switch (ret) {
-        case A_OK:
-            return 0;
-        case A_EBUSY :
-            return -EBUSY;
-        case A_NO_MEMORY:
-            return -ENOMEM;
-        case A_EINVAL:
-        default:
-            return -EFAULT;
-    }
-}
-
-static int
-ar6000_ioctl_delete_qos(struct net_device *dev, struct ifreq *rq)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    WMI_DELETE_PSTREAM_CMD cmd;
-    int ret = 0;
-
-    if (ar->arWmiReady == FALSE) {
-        return -EIO;
-    }
-
-    if (copy_from_user(&cmd, rq->ifr_data, sizeof(cmd))) {
-        return -EFAULT;
-    }
-
-    ret = wmi_delete_pstream_cmd(ar->arWmi, cmd.trafficClass, cmd.tsid);
-
-    switch (ret) {
-        case A_OK:
-            return 0;
-        case A_EBUSY :
-            return -EBUSY;
-        case A_NO_MEMORY:
-            return -ENOMEM;
-        case A_EINVAL:
-        default:
-            return -EFAULT;
-    }
-}
-
-static int
-ar6000_ioctl_get_qos_queue(struct net_device *dev, struct ifreq *rq)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    struct ar6000_queuereq qreq;
-    int ret = 0;
-
-    if (ar->arWmiReady == FALSE) {
-        return -EIO;
-    }
-
-    if( copy_from_user(&qreq, rq->ifr_data,
-                  sizeof(struct ar6000_queuereq)))
-        return -EFAULT;
-
-    qreq.activeTsids = wmi_get_mapped_qos_queue(ar->arWmi, qreq.trafficClass);
-
-    if (copy_to_user(rq->ifr_data, &qreq,
-                 sizeof(struct ar6000_queuereq)))
-    {
-        ret = -EFAULT;
-    }
-
-    return ret;
-}
-
-#ifdef CONFIG_HOST_TCMD_SUPPORT
-static A_STATUS
-ar6000_ioctl_tcmd_get_rx_report(struct net_device *dev,
-                                 struct ifreq *rq, A_UINT8 *data, A_UINT32 len)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    A_UINT32    buf[2];
-    int ret = 0;
-
-    if (ar->arWmiReady == FALSE) {
-        return -EIO;
-    }
-
-    if (down_interruptible(&ar->arSem)) {
-        return -ERESTARTSYS;
-    }
-    ar->tcmdRxReport = 0;
-    if (wmi_test_cmd(ar->arWmi, data, len) != A_OK) {
-        up(&ar->arSem);
-        return -EIO;
-    }
-
-    wait_event_interruptible_timeout(arEvent, ar->tcmdRxReport != 0, wmitimeout * HZ);
-
-    if (signal_pending(current)) {
-        ret = -EINTR;
-    }
-
-    buf[0] = ar->tcmdRxTotalPkt;
-    buf[1] = ar->tcmdRxRssi;
-    if (!ret && copy_to_user(rq->ifr_data, buf, sizeof(buf))) {
-        ret = -EFAULT;
-    }
-
-    up(&ar->arSem);
-
-    return ret;
-}
-
-void
-ar6000_tcmd_rx_report_event(void *devt, A_UINT8 * results, int len)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)devt;
-    TCMD_CONT_RX * rx_rep = (TCMD_CONT_RX *)results;
-
-    ar->tcmdRxTotalPkt = rx_rep->u.report.totalPkt;
-    ar->tcmdRxRssi = rx_rep->u.report.rssiInDBm;
-    ar->tcmdRxReport = 1;
-
-    wake_up(&arEvent);
-}
-#endif /* CONFIG_HOST_TCMD_SUPPORT*/
-
-static int
-ar6000_ioctl_set_error_report_bitmask(struct net_device *dev, struct ifreq *rq)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    WMI_TARGET_ERROR_REPORT_BITMASK cmd;
-    int ret = 0;
-
-    if (ar->arWmiReady == FALSE) {
-        return -EIO;
-    }
-
-    if (copy_from_user(&cmd, rq->ifr_data, sizeof(cmd))) {
-        return -EFAULT;
-    }
-
-    ret = wmi_set_error_report_bitmask(ar->arWmi, cmd.bitmask);
-
-    return  (ret==0 ? ret : -EINVAL);
-}
-
-static int
-ar6000_clear_target_stats(struct net_device *dev)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    TARGET_STATS *pStats = &ar->arTargetStats;
-    int ret = 0;
-
-    if (ar->arWmiReady == FALSE) {
-       return -EIO;
-    }
-    AR6000_SPIN_LOCK(&ar->arLock, 0);
-    A_MEMZERO(pStats, sizeof(TARGET_STATS));
-    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-    return ret;
-}
-
-static int
-ar6000_ioctl_get_target_stats(struct net_device *dev, struct ifreq *rq)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    TARGET_STATS_CMD cmd;
-    TARGET_STATS *pStats = &ar->arTargetStats;
-    int ret = 0;
-
-    if (ar->arWmiReady == FALSE) {
-        return -EIO;
-    }
-    if (copy_from_user(&cmd, rq->ifr_data, sizeof(cmd))) {
-        return -EFAULT;
-    }
-    if (down_interruptible(&ar->arSem)) {
-        return -ERESTARTSYS;
-    }
-
-    ar->statsUpdatePending = TRUE;
-
-    if(wmi_get_stats_cmd(ar->arWmi) != A_OK) {
-        up(&ar->arSem);
-        return -EIO;
-    }
-
-    wait_event_interruptible_timeout(arEvent, ar->statsUpdatePending == FALSE, wmitimeout * HZ);
-
-    if (signal_pending(current)) {
-        ret = -EINTR;
-    }
-
-    if (!ret && copy_to_user(rq->ifr_data, pStats, sizeof(*pStats))) {
-        ret = -EFAULT;
-    }
-
-    if (cmd.clearStats == 1) {
-        ret = ar6000_clear_target_stats(dev);
-    }
-
-    up(&ar->arSem);
-
-    return ret;
-}
-
-static int
-ar6000_ioctl_set_access_params(struct net_device *dev, struct ifreq *rq)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    WMI_SET_ACCESS_PARAMS_CMD cmd;
-    int ret = 0;
-
-    if (ar->arWmiReady == FALSE) {
-        return -EIO;
-    }
-
-    if (copy_from_user(&cmd, rq->ifr_data, sizeof(cmd))) {
-        return -EFAULT;
-    }
-
-    if (wmi_set_access_params_cmd(ar->arWmi, cmd.txop, cmd.eCWmin, cmd.eCWmax,
-                                  cmd.aifsn) == A_OK)
-    {
-        ret = 0;
-    } else {
-        ret = -EINVAL;
-    }
-
-    return (ret);
-}
-
-static int
-ar6000_ioctl_set_disconnect_timeout(struct net_device *dev, struct ifreq *rq)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    WMI_DISC_TIMEOUT_CMD cmd;
-    int ret = 0;
-
-    if (ar->arWmiReady == FALSE) {
-        return -EIO;
-    }
-
-    if (copy_from_user(&cmd, rq->ifr_data, sizeof(cmd))) {
-        return -EFAULT;
-    }
-
-    if (wmi_disctimeout_cmd(ar->arWmi, cmd.disconnectTimeout) == A_OK)
-    {
-        ret = 0;
-    } else {
-        ret = -EINVAL;
-    }
-
-    return (ret);
-}
-
-static int
-ar6000_xioctl_set_voice_pkt_size(struct net_device *dev, char * userdata)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    WMI_SET_VOICE_PKT_SIZE_CMD cmd;
-    int ret = 0;
-
-    if (ar->arWmiReady == FALSE) {
-        return -EIO;
-    }
-
-    if (copy_from_user(&cmd, userdata, sizeof(cmd))) {
-        return -EFAULT;
-    }
-
-    if (wmi_set_voice_pkt_size_cmd(ar->arWmi, cmd.voicePktSize) == A_OK)
-    {
-        ret = 0;
-    } else {
-        ret = -EINVAL;
-    }
-
-
-    return (ret);
-}
-
-static int
-ar6000_xioctl_set_max_sp_len(struct net_device *dev, char * userdata)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    WMI_SET_MAX_SP_LEN_CMD cmd;
-    int ret = 0;
-
-    if (ar->arWmiReady == FALSE) {
-        return -EIO;
-    }
-
-    if (copy_from_user(&cmd, userdata, sizeof(cmd))) {
-        return -EFAULT;
-    }
-
-    if (wmi_set_max_sp_len_cmd(ar->arWmi, cmd.maxSPLen) == A_OK)
-    {
-        ret = 0;
-    } else {
-        ret = -EINVAL;
-    }
-
-    return (ret);
-}
-
-
-static int
-ar6000_xioctl_set_bt_status_cmd(struct net_device *dev, char * userdata)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    WMI_SET_BT_STATUS_CMD cmd;
-    int ret = 0;
-
-    if (ar->arWmiReady == FALSE) {
-        return -EIO;
-    }
-
-    if (copy_from_user(&cmd, userdata, sizeof(cmd))) {
-        return -EFAULT;
-    }
-
-    if (wmi_set_bt_status_cmd(ar->arWmi, cmd.streamType, cmd.status) == A_OK)
-    {
-        ret = 0;
-    } else {
-        ret = -EINVAL;
-    }
-
-    return (ret);
-}
-
-static int
-ar6000_xioctl_set_bt_params_cmd(struct net_device *dev, char * userdata)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    WMI_SET_BT_PARAMS_CMD cmd;
-    int ret = 0;
-
-    if (ar->arWmiReady == FALSE) {
-        return -EIO;
-    }
-
-    if (copy_from_user(&cmd, userdata, sizeof(cmd))) {
-        return -EFAULT;
-    }
-
-    if (wmi_set_bt_params_cmd(ar->arWmi, &cmd) == A_OK)
-    {
-        ret = 0;
-    } else {
-        ret = -EINVAL;
-    }
-
-    return (ret);
-}
-
-#ifdef CONFIG_HOST_GPIO_SUPPORT
-struct ar6000_gpio_intr_wait_cmd_s  gpio_intr_results;
-/* gpio_reg_results and gpio_data_available are protected by arSem */
-static struct ar6000_gpio_register_cmd_s gpio_reg_results;
-static A_BOOL gpio_data_available; /* Requested GPIO data available */
-static A_BOOL gpio_intr_available; /* GPIO interrupt info available */
-static A_BOOL gpio_ack_received;   /* GPIO ack was received */
-
-/* Host-side initialization for General Purpose I/O support */
-void ar6000_gpio_init(void)
-{
-    gpio_intr_available = FALSE;
-    gpio_data_available = FALSE;
-    gpio_ack_received   = FALSE;
-}
-
-/*
- * Called when a GPIO interrupt is received from the Target.
- * intr_values shows which GPIO pins have interrupted.
- * input_values shows a recent value of GPIO pins.
- */
-void
-ar6000_gpio_intr_rx(A_UINT32 intr_mask, A_UINT32 input_values)
-{
-    gpio_intr_results.intr_mask = intr_mask;
-    gpio_intr_results.input_values = input_values;
-    *((volatile A_BOOL *)&gpio_intr_available) = TRUE;
-    wake_up(&arEvent);
-}
-
-/*
- * This is called when a response is received from the Target
- * for a previous or ar6000_gpio_input_get or ar6000_gpio_register_get
- * call.
- */
-void
-ar6000_gpio_data_rx(A_UINT32 reg_id, A_UINT32 value)
-{
-    gpio_reg_results.gpioreg_id = reg_id;
-    gpio_reg_results.value = value;
-    *((volatile A_BOOL *)&gpio_data_available) = TRUE;
-    wake_up(&arEvent);
-}
-
-/*
- * This is called when an acknowledgement is received from the Target
- * for a previous or ar6000_gpio_output_set or ar6000_gpio_register_set
- * call.
- */
-void
-ar6000_gpio_ack_rx(void)
-{
-    gpio_ack_received = TRUE;
-    wake_up(&arEvent);
-}
-
-A_STATUS
-ar6000_gpio_output_set(struct net_device *dev,
-                       A_UINT32 set_mask,
-                       A_UINT32 clear_mask,
-                       A_UINT32 enable_mask,
-                       A_UINT32 disable_mask)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-
-    gpio_ack_received = FALSE;
-    return wmi_gpio_output_set(ar->arWmi,
-                set_mask, clear_mask, enable_mask, disable_mask);
-}
-
-static A_STATUS
-ar6000_gpio_input_get(struct net_device *dev)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-
-    *((volatile A_BOOL *)&gpio_data_available) = FALSE;
-    return wmi_gpio_input_get(ar->arWmi);
-}
-
-static A_STATUS
-ar6000_gpio_register_set(struct net_device *dev,
-                         A_UINT32 gpioreg_id,
-                         A_UINT32 value)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-
-    gpio_ack_received = FALSE;
-    return wmi_gpio_register_set(ar->arWmi, gpioreg_id, value);
-}
-
-static A_STATUS
-ar6000_gpio_register_get(struct net_device *dev,
-                         A_UINT32 gpioreg_id)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-
-    *((volatile A_BOOL *)&gpio_data_available) = FALSE;
-    return wmi_gpio_register_get(ar->arWmi, gpioreg_id);
-}
-
-static A_STATUS
-ar6000_gpio_intr_ack(struct net_device *dev,
-                     A_UINT32 ack_mask)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-
-    gpio_intr_available = FALSE;
-    return wmi_gpio_intr_ack(ar->arWmi, ack_mask);
-}
-#endif /* CONFIG_HOST_GPIO_SUPPORT */
-
-int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    HIF_DEVICE *hifDevice = ar->arHifDevice;
-    int ret, param, param2;
-    unsigned int address = 0;
-    unsigned int length = 0;
-    unsigned char *buffer;
-    char *userdata;
-    A_UINT32 connectCtrlFlags;
-
-
-    static WMI_SCAN_PARAMS_CMD scParams = {0, 0, 0, 0, 0,
-                                           WMI_SHORTSCANRATIO_DEFAULT,
-                                           DEFAULT_SCAN_CTRL_FLAGS,
-                                           0};
-    WMI_SET_AKMP_PARAMS_CMD  akmpParams;
-    WMI_SET_PMKID_LIST_CMD   pmkidInfo;
-
-    if (cmd == AR6000_IOCTL_EXTENDED)
-    {
-        /*
-         * This allows for many more wireless ioctls than would otherwise
-         * be available.  Applications embed the actual ioctl command in
-         * the first word of the parameter block, and use the command
-         * AR6000_IOCTL_EXTENDED_CMD on the ioctl call.
-         */
-        get_user(cmd, (int *)rq->ifr_data);
-        userdata = (char *)(((unsigned int *)rq->ifr_data)+1);
-    }
-    else
-    {
-        userdata = (char *)rq->ifr_data;
-    }
-
-    if ((ar->arWlanState == WLAN_DISABLED) &&
-        ((cmd != AR6000_XIOCTRL_WMI_SET_WLAN_STATE) &&
-         (cmd != AR6000_XIOCTL_DIAG_READ) &&
-         (cmd != AR6000_XIOCTL_DIAG_WRITE)))
-    {
-        return -EIO;
-    }
-
-    ret = 0;
-    switch(cmd)
-    {
-#ifdef CONFIG_HOST_TCMD_SUPPORT
-        case AR6000_XIOCTL_TCMD_CONT_TX:
-            {
-                TCMD_CONT_TX txCmd;
-
-                if (ar->tcmdPm == TCMD_PM_SLEEP) {
-                    A_PRINTF("Can NOT send tx tcmd when target is asleep! \n");
-                    return -EFAULT;
-                }
-
-                if(copy_from_user(&txCmd, userdata, sizeof(TCMD_CONT_TX)))
-                    return -EFAULT;
-                wmi_test_cmd(ar->arWmi,(A_UINT8 *)&txCmd, sizeof(TCMD_CONT_TX));
-            }
-            break;
-        case AR6000_XIOCTL_TCMD_CONT_RX:
-            {
-                TCMD_CONT_RX rxCmd;
-
-                if (ar->tcmdPm == TCMD_PM_SLEEP) {
-                    A_PRINTF("Can NOT send rx tcmd when target is asleep! \n");
-                    return -EFAULT;
-                }
-                if(copy_from_user(&rxCmd, userdata, sizeof(TCMD_CONT_RX)))
-                    return -EFAULT;
-                switch(rxCmd.act)
-                {
-                    case TCMD_CONT_RX_PROMIS:
-                    case TCMD_CONT_RX_FILTER:
-                    case TCMD_CONT_RX_SETMAC:
-                         wmi_test_cmd(ar->arWmi,(A_UINT8 *)&rxCmd,
-                                                sizeof(TCMD_CONT_RX));
-                         break;
-                    case TCMD_CONT_RX_REPORT:
-                         ar6000_ioctl_tcmd_get_rx_report(dev, rq,
-                         (A_UINT8 *)&rxCmd, sizeof(TCMD_CONT_RX));
-                         break;
-                    default:
-                         A_PRINTF("Unknown Cont Rx mode: %d\n",rxCmd.act);
-                         return -EINVAL;
-                }
-            }
-            break;
-        case AR6000_XIOCTL_TCMD_PM:
-            {
-                TCMD_PM pmCmd;
-
-                if(copy_from_user(&pmCmd, userdata, sizeof(TCMD_PM)))
-                    return -EFAULT;
-                ar->tcmdPm = pmCmd.mode;
-                wmi_test_cmd(ar->arWmi, (A_UINT8*)&pmCmd, sizeof(TCMD_PM));
-            }
-            break;
-#endif /* CONFIG_HOST_TCMD_SUPPORT */
-
-        case AR6000_XIOCTL_BMI_DONE:
-            ret = BMIDone(hifDevice);
-            break;
-
-        case AR6000_XIOCTL_BMI_READ_MEMORY:
-            get_user(address, (unsigned int *)userdata);
-            get_user(length, (unsigned int *)userdata + 1);
-            AR_DEBUG_PRINTF("Read Memory (address: 0x%x, length: %d)\n",
-                             address, length);
-            if ((buffer = (unsigned char *)A_MALLOC(length)) != NULL) {
-                A_MEMZERO(buffer, length);
-                ret = BMIReadMemory(hifDevice, address, buffer, length);
-                if (copy_to_user(rq->ifr_data, buffer, length)) {
-                    ret = -EFAULT;
-                }
-                A_FREE(buffer);
-            } else {
-                ret = -ENOMEM;
-            }
-            break;
-
-        case AR6000_XIOCTL_BMI_WRITE_MEMORY:
-            get_user(address, (unsigned int *)userdata);
-            get_user(length, (unsigned int *)userdata + 1);
-            AR_DEBUG_PRINTF("Write Memory (address: 0x%x, length: %d)\n",
-                             address, length);
-            if ((buffer = (unsigned char *)A_MALLOC(length)) != NULL) {
-                A_MEMZERO(buffer, length);
-                if (copy_from_user(buffer, &userdata[sizeof(address) +
-                                   sizeof(length)], length))
-                {
-                    ret = -EFAULT;
-                } else {
-                    ret = BMIWriteMemory(hifDevice, address, buffer, length);
-                }
-                A_FREE(buffer);
-            } else {
-                ret = -ENOMEM;
-            }
-            break;
-
-        case AR6000_XIOCTL_BMI_TEST:
-           AR_DEBUG_PRINTF("No longer supported\n");
-           ret = -EOPNOTSUPP;
-           break;
-
-        case AR6000_XIOCTL_BMI_EXECUTE:
-            get_user(address, (unsigned int *)userdata);
-            get_user(param, (unsigned int *)userdata + 1);
-            AR_DEBUG_PRINTF("Execute (address: 0x%x, param: %d)\n",
-                             address, param);
-            ret = BMIExecute(hifDevice, address, &param);
-            put_user(param, (unsigned int *)rq->ifr_data); /* return value */
-            break;
-
-        case AR6000_XIOCTL_BMI_SET_APP_START:
-            get_user(address, (unsigned int *)userdata);
-            AR_DEBUG_PRINTF("Set App Start (address: 0x%x)\n", address);
-            ret = BMISetAppStart(hifDevice, address);
-            break;
-
-        case AR6000_XIOCTL_BMI_READ_SOC_REGISTER:
-            get_user(address, (unsigned int *)userdata);
-            ret = BMIReadSOCRegister(hifDevice, address, &param);
-            put_user(param, (unsigned int *)rq->ifr_data); /* return value */
-            break;
-
-        case AR6000_XIOCTL_BMI_WRITE_SOC_REGISTER:
-            get_user(address, (unsigned int *)userdata);
-            get_user(param, (unsigned int *)userdata + 1);
-            ret = BMIWriteSOCRegister(hifDevice, address, param);
-            break;
-
-#ifdef HTC_RAW_INTERFACE
-        case AR6000_XIOCTL_HTC_RAW_OPEN:
-            ret = A_OK;
-            if (!arRawIfEnabled(ar)) {
-                /* make sure block size is set in case the target was reset since last
-                  * BMI phase (i.e. flashup downloads) */
-                ret = ar6000_SetHTCBlockSize(ar);
-                if (A_FAILED(ret)) {
-                    break;
-                }
-                /* Terminate the BMI phase */
-                ret = BMIDone(hifDevice);
-                if (ret == A_OK) {
-                    ret = ar6000_htc_raw_open(ar);
-                }
-            }
-            break;
-
-        case AR6000_XIOCTL_HTC_RAW_CLOSE:
-            if (arRawIfEnabled(ar)) {
-                ret = ar6000_htc_raw_close(ar);
-                arRawIfEnabled(ar) = FALSE;
-            } else {
-                ret = A_ERROR;
-            }
-            break;
-
-        case AR6000_XIOCTL_HTC_RAW_READ:
-            if (arRawIfEnabled(ar)) {
-                unsigned int streamID;
-                get_user(streamID, (unsigned int *)userdata);
-                get_user(length, (unsigned int *)userdata + 1);
-                buffer = rq->ifr_data + sizeof(length);
-                ret = ar6000_htc_raw_read(ar, (HTC_RAW_STREAM_ID)streamID,
-                                          buffer, length);
-                put_user(ret, (unsigned int *)rq->ifr_data);
-            } else {
-                ret = A_ERROR;
-            }
-            break;
-
-        case AR6000_XIOCTL_HTC_RAW_WRITE:
-            if (arRawIfEnabled(ar)) {
-                unsigned int streamID;
-                get_user(streamID, (unsigned int *)userdata);
-                get_user(length, (unsigned int *)userdata + 1);
-                buffer = userdata + sizeof(streamID) + sizeof(length);
-                ret = ar6000_htc_raw_write(ar, (HTC_RAW_STREAM_ID)streamID,
-                                           buffer, length);
-                put_user(ret, (unsigned int *)rq->ifr_data);
-            } else {
-                ret = A_ERROR;
-            }
-            break;
-#endif /* HTC_RAW_INTERFACE */
-
-        case AR6000_IOCTL_WMI_GETREV:
-        {
-            if (copy_to_user(rq->ifr_data, &ar->arVersion,
-                             sizeof(ar->arVersion)))
-            {
-                ret = -EFAULT;
-            }
-            break;
-        }
-        case AR6000_IOCTL_WMI_SETPWR:
-        {
-            WMI_POWER_MODE_CMD pwrModeCmd;
-
-            if (ar->arWmiReady == FALSE) {
-                ret = -EIO;
-            } else if (copy_from_user(&pwrModeCmd, userdata,
-                                   sizeof(pwrModeCmd)))
-            {
-                ret = -EFAULT;
-            } else {
-                if (wmi_powermode_cmd(ar->arWmi, pwrModeCmd.powerMode)
-                       != A_OK)
-                {
-                    ret = -EIO;
-                }
-            }
-            break;
-        }
-        case AR6000_IOCTL_WMI_SET_IBSS_PM_CAPS:
-        {
-            WMI_IBSS_PM_CAPS_CMD ibssPmCaps;
-
-            if (ar->arWmiReady == FALSE) {
-                ret = -EIO;
-            } else if (copy_from_user(&ibssPmCaps, userdata,
-                                   sizeof(ibssPmCaps)))
-            {
-                ret = -EFAULT;
-            } else {
-                if (wmi_ibsspmcaps_cmd(ar->arWmi, ibssPmCaps.power_saving, ibssPmCaps.ttl,
-                    ibssPmCaps.atim_windows, ibssPmCaps.timeout_value) != A_OK)
-                {
-                    ret = -EIO;
-                }
-                AR6000_SPIN_LOCK(&ar->arLock, 0);
-                ar->arIbssPsEnable = ibssPmCaps.power_saving;
-                AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-            }
-            break;
-        }
-        case AR6000_IOCTL_WMI_SET_PMPARAMS:
-        {
-            WMI_POWER_PARAMS_CMD pmParams;
-
-            if (ar->arWmiReady == FALSE) {
-                ret = -EIO;
-            } else if (copy_from_user(&pmParams, userdata,
-                                      sizeof(pmParams)))
-            {
-                ret = -EFAULT;
-            } else {
-                if (wmi_pmparams_cmd(ar->arWmi, pmParams.idle_period,
-                                     pmParams.pspoll_number,
-                                     pmParams.dtim_policy) != A_OK)
-                {
-                    ret = -EIO;
-                }
-            }
-            break;
-        }
-        case AR6000_IOCTL_WMI_SETSCAN:
-        {
-            if (ar->arWmiReady == FALSE) {
-                ret = -EIO;
-            } else if (copy_from_user(&scParams, userdata,
-                                      sizeof(scParams)))
-            {
-                ret = -EFAULT;
-            } else {
-                if (CAN_SCAN_IN_CONNECT(scParams.scanCtrlFlags)) {
-                    ar->arSkipScan = FALSE;
-                } else {
-                    ar->arSkipScan = TRUE;
-                }
-
-                if (wmi_scanparams_cmd(ar->arWmi, scParams.fg_start_period,
-                                       scParams.fg_end_period,
-                                       scParams.bg_period,
-                                       scParams.minact_chdwell_time,
-                                       scParams.maxact_chdwell_time,
-                                       scParams.pas_chdwell_time,
-                                       scParams.shortScanRatio,
-                                       scParams.scanCtrlFlags,
-                                       scParams.max_dfsch_act_time) != A_OK)
-                {
-                    ret = -EIO;
-                }
-            }
-            break;
-        }
-        case AR6000_IOCTL_WMI_SETLISTENINT:
-        {
-            WMI_LISTEN_INT_CMD listenCmd;
-
-            if (ar->arWmiReady == FALSE) {
-                ret = -EIO;
-            } else if (copy_from_user(&listenCmd, userdata,
-                                      sizeof(listenCmd)))
-            {
-                ret = -EFAULT;
-            } else {
-                    if (wmi_listeninterval_cmd(ar->arWmi, listenCmd.listenInterval, listenCmd.numBeacons) != A_OK) {
-                        ret = -EIO;
-                    } else {
-                        AR6000_SPIN_LOCK(&ar->arLock, 0);
-                        ar->arListenInterval = param;
-                        AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-                    }
-
-                }
-            break;
-        }
-        case AR6000_IOCTL_WMI_SET_BMISS_TIME:
-        {
-            WMI_BMISS_TIME_CMD bmissCmd;
-
-            if (ar->arWmiReady == FALSE) {
-                ret = -EIO;
-            } else if (copy_from_user(&bmissCmd, userdata,
-                                      sizeof(bmissCmd)))
-            {
-                ret = -EFAULT;
-            } else {
-                if (wmi_bmisstime_cmd(ar->arWmi, bmissCmd.bmissTime, bmissCmd.numBeacons) != A_OK) {
-                    ret = -EIO;
-                }
-            }
-            break;
-        }
-        case AR6000_IOCTL_WMI_SETBSSFILTER:
-        {
-            if (ar->arWmiReady == FALSE) {
-                ret = -EIO;
-            } else {
-
-                get_user(param, (unsigned char *)userdata);
-                get_user(param2, (unsigned int *)(userdata + 1));
-		printk("SETBSSFILTER: filter 0x%x, mask: 0x%x\n", param, param2);
-                if (wmi_bssfilter_cmd(ar->arWmi, param, param2) != A_OK) {
-                    ret = -EIO;
-                }
-            }
-            break;
-        }
-        case AR6000_IOCTL_WMI_SET_SNRTHRESHOLD:
-        {
-            ret = ar6000_ioctl_set_snr_threshold(dev, rq);
-            break;
-        }
-        case AR6000_XIOCTL_WMI_SET_RSSITHRESHOLD:
-        {
-            ret = ar6000_ioctl_set_rssi_threshold(dev, rq);
-            break;
-        }
-        case AR6000_XIOCTL_WMI_CLR_RSSISNR:
-        {
-            if (ar->arWmiReady == FALSE) {
-                ret = -EIO;
-            }
-            ret = wmi_clr_rssi_snr(ar->arWmi);
-            break;
-        }
-        case AR6000_XIOCTL_WMI_SET_LQTHRESHOLD:
-        {
-            ret = ar6000_ioctl_set_lq_threshold(dev, rq);
-            break;
-        }
-        case AR6000_XIOCTL_WMI_SET_LPREAMBLE:
-        {
-            WMI_SET_LPREAMBLE_CMD setLpreambleCmd;
-
-            if (ar->arWmiReady == FALSE) {
-                ret = -EIO;
-            } else if (copy_from_user(&setLpreambleCmd, userdata,
-                                   sizeof(setLpreambleCmd)))
-            {
-                ret = -EFAULT;
-            } else {
-                if (wmi_set_lpreamble_cmd(ar->arWmi, setLpreambleCmd.status)
-                       != A_OK)
-                {
-                    ret = -EIO;
-                }
-            }
-
-            break;
-        }
-        case AR6000_XIOCTL_WMI_SET_RTS:
-        {
-            WMI_SET_RTS_CMD rtsCmd;
-
-            if (ar->arWmiReady == FALSE) {
-                ret = -EIO;
-            } else if (copy_from_user(&rtsCmd, userdata,
-                                   sizeof(rtsCmd)))
-            {
-                ret = -EFAULT;
-            } else {
-                if (wmi_set_rts_cmd(ar->arWmi, rtsCmd.threshold)
-                       != A_OK)
-                {
-                    ret = -EIO;
-                }
-            }
-
-            break;
-        }
-        case AR6000_XIOCTL_WMI_SET_WMM:
-        {
-            ret = ar6000_ioctl_set_wmm(dev, rq);
-            break;
-        }
-        case AR6000_XIOCTL_WMI_SET_TXOP:
-        {
-            ret = ar6000_ioctl_set_txop(dev, rq);
-            break;
-        }
-        case AR6000_XIOCTL_WMI_GET_RD:
-        {
-            ret = ar6000_ioctl_get_rd(dev, rq);
-            break;
-        }
-        case AR6000_IOCTL_WMI_SET_CHANNELPARAMS:
-        {
-            ret = ar6000_ioctl_set_channelParams(dev, rq);
-            break;
-        }
-        case AR6000_IOCTL_WMI_SET_PROBEDSSID:
-        {
-            ret = ar6000_ioctl_set_probedSsid(dev, rq);
-            break;
-        }
-        case AR6000_IOCTL_WMI_SET_BADAP:
-        {
-            ret = ar6000_ioctl_set_badAp(dev, rq);
-            break;
-        }
-        case AR6000_IOCTL_WMI_CREATE_QOS:
-        {
-            ret = ar6000_ioctl_create_qos(dev, rq);
-            break;
-        }
-        case AR6000_IOCTL_WMI_DELETE_QOS:
-        {
-            ret = ar6000_ioctl_delete_qos(dev, rq);
-            break;
-        }
-        case AR6000_IOCTL_WMI_GET_QOS_QUEUE:
-        {
-            ret = ar6000_ioctl_get_qos_queue(dev, rq);
-            break;
-        }
-        case AR6000_IOCTL_WMI_GET_TARGET_STATS:
-        {
-            ret = ar6000_ioctl_get_target_stats(dev, rq);
-            break;
-        }
-        case AR6000_IOCTL_WMI_SET_ERROR_REPORT_BITMASK:
-        {
-            ret = ar6000_ioctl_set_error_report_bitmask(dev, rq);
-            break;
-        }
-        case AR6000_IOCTL_WMI_SET_ASSOC_INFO:
-        {
-            WMI_SET_ASSOC_INFO_CMD cmd;
-            A_UINT8 assocInfo[WMI_MAX_ASSOC_INFO_LEN];
-
-            if (ar->arWmiReady == FALSE) {
-                ret = -EIO;
-            } else {
-                get_user(cmd.ieType, userdata);
-                if (cmd.ieType >= WMI_MAX_ASSOC_INFO_TYPE) {
-                    ret = -EIO;
-                } else {
-                    get_user(cmd.bufferSize, userdata + 1);
-                    if (cmd.bufferSize > WMI_MAX_ASSOC_INFO_LEN) {
-                        ret = -EFAULT;
-                        break;
-                    }
-                    if (copy_from_user(assocInfo, userdata + 2,
-                                       cmd.bufferSize))
-                    {
-                        ret = -EFAULT;
-                    } else {
-                        if (wmi_associnfo_cmd(ar->arWmi, cmd.ieType,
-                                                 cmd.bufferSize,
-                                                 assocInfo) != A_OK)
-                        {
-                            ret = -EIO;
-                        }
-                    }
-                }
-            }
-            break;
-        }
-        case AR6000_IOCTL_WMI_SET_ACCESS_PARAMS:
-        {
-            ret = ar6000_ioctl_set_access_params(dev, rq);
-            break;
-        }
-        case AR6000_IOCTL_WMI_SET_DISC_TIMEOUT:
-        {
-            ret = ar6000_ioctl_set_disconnect_timeout(dev, rq);
-            break;
-        }
-        case AR6000_XIOCTL_FORCE_TARGET_RESET:
-        {
-            if (ar->arHtcTarget)
-            {
-//                HTCForceReset(htcTarget);
-            }
-            else
-            {
-                AR_DEBUG_PRINTF("ar6000_ioctl cannot attempt reset.\n");
-            }
-            break;
-        }
-        case AR6000_XIOCTL_TARGET_INFO:
-        case AR6000_XIOCTL_CHECK_TARGET_READY: /* backwards compatibility */
-        {
-            /* If we made it to here, then the Target exists and is ready. */
-
-            if (cmd == AR6000_XIOCTL_TARGET_INFO) {
-                if (copy_to_user((A_UINT32 *)rq->ifr_data, &ar->arVersion.target_ver,
-                                 sizeof(ar->arVersion.target_ver)))
-                {
-                    ret = -EFAULT;
-                }
-                if (copy_to_user(((A_UINT32 *)rq->ifr_data)+1, &ar->arTargetType,
-                                 sizeof(ar->arTargetType)))
-                {
-                    ret = -EFAULT;
-                }
-            }
-            break;
-        }
-        case AR6000_XIOCTL_WMI_SET_HB_CHALLENGE_RESP_PARAMS:
-        {
-            WMI_SET_HB_CHALLENGE_RESP_PARAMS_CMD hbparam;
-
-            if (copy_from_user(&hbparam, userdata, sizeof(hbparam)))
-            {
-                ret = -EFAULT;
-            } else {
-                AR6000_SPIN_LOCK(&ar->arLock, 0);
-                /* Start a cyclic timer with the parameters provided. */
-                if (hbparam.frequency) {
-                    ar->arHBChallengeResp.frequency = hbparam.frequency;
-                }
-                if (hbparam.threshold) {
-                    ar->arHBChallengeResp.missThres = hbparam.threshold;
-                }
-
-                /* Delete the pending timer and start a new one */
-                if (timer_pending(&ar->arHBChallengeResp.timer)) {
-                    A_UNTIMEOUT(&ar->arHBChallengeResp.timer);
-                }
-                A_TIMEOUT_MS(&ar->arHBChallengeResp.timer, ar->arHBChallengeResp.frequency * 1000, 0);
-                AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-            }
-            break;
-        }
-        case AR6000_XIOCTL_WMI_GET_HB_CHALLENGE_RESP:
-        {
-            A_UINT32 cookie;
-
-            if (copy_from_user(&cookie, userdata, sizeof(cookie))) {
-                return -EFAULT;
-            }
-
-            /* Send the challenge on the control channel */
-            if (wmi_get_challenge_resp_cmd(ar->arWmi, cookie, APP_HB_CHALLENGE) != A_OK) {
-                return -EIO;
-            }
-            break;
-        }
-#ifdef USER_KEYS
-        case AR6000_XIOCTL_USER_SETKEYS:
-        {
-
-            ar->user_savedkeys_stat = USER_SAVEDKEYS_STAT_RUN;
-
-            if (copy_from_user(&ar->user_key_ctrl, userdata,
-                               sizeof(ar->user_key_ctrl)))
-            {
-                return -EFAULT;
-            }
-
-            A_PRINTF("ar6000 USER set key %x\n", ar->user_key_ctrl);
-            break;
-        }
-#endif /* USER_KEYS */
-
-#ifdef CONFIG_HOST_GPIO_SUPPORT
-        case AR6000_XIOCTL_GPIO_OUTPUT_SET:
-        {
-            struct ar6000_gpio_output_set_cmd_s gpio_output_set_cmd;
-
-            if (ar->arWmiReady == FALSE) {
-                return -EIO;
-            }
-            if (down_interruptible(&ar->arSem)) {
-                return -ERESTARTSYS;
-            }
-
-            if (copy_from_user(&gpio_output_set_cmd, userdata,
-                                sizeof(gpio_output_set_cmd)))
-            {
-                ret = -EFAULT;
-            } else {
-                ret = ar6000_gpio_output_set(dev,
-                                             gpio_output_set_cmd.set_mask,
-                                             gpio_output_set_cmd.clear_mask,
-                                             gpio_output_set_cmd.enable_mask,
-                                             gpio_output_set_cmd.disable_mask);
-                if (ret != A_OK) {
-                    ret = EIO;
-                }
-            }
-            up(&ar->arSem);
-            break;
-        }
-        case AR6000_XIOCTL_GPIO_INPUT_GET:
-        {
-            if (ar->arWmiReady == FALSE) {
-                return -EIO;
-            }
-            if (down_interruptible(&ar->arSem)) {
-                return -ERESTARTSYS;
-            }
-
-            ret = ar6000_gpio_input_get(dev);
-            if (ret != A_OK) {
-                up(&ar->arSem);
-                return -EIO;
-            }
-
-            /* Wait for Target to respond. */
-            wait_event_interruptible(arEvent, gpio_data_available);
-            if (signal_pending(current)) {
-                ret = -EINTR;
-            } else {
-                A_ASSERT(gpio_reg_results.gpioreg_id == GPIO_ID_NONE);
-
-                if (copy_to_user(userdata, &gpio_reg_results.value,
-                                 sizeof(gpio_reg_results.value)))
-                {
-                    ret = -EFAULT;
-                }
-            }
-            up(&ar->arSem);
-            break;
-        }
-        case AR6000_XIOCTL_GPIO_REGISTER_SET:
-        {
-            struct ar6000_gpio_register_cmd_s gpio_register_cmd;
-
-            if (ar->arWmiReady == FALSE) {
-                return -EIO;
-            }
-            if (down_interruptible(&ar->arSem)) {
-                return -ERESTARTSYS;
-            }
-
-            if (copy_from_user(&gpio_register_cmd, userdata,
-                                sizeof(gpio_register_cmd)))
-            {
-                ret = -EFAULT;
-            } else {
-                ret = ar6000_gpio_register_set(dev,
-                                               gpio_register_cmd.gpioreg_id,
-                                               gpio_register_cmd.value);
-                if (ret != A_OK) {
-                    ret = EIO;
-                }
-
-                /* Wait for acknowledgement from Target */
-                wait_event_interruptible(arEvent, gpio_ack_received);
-                if (signal_pending(current)) {
-                    ret = -EINTR;
-                }
-            }
-            up(&ar->arSem);
-            break;
-        }
-        case AR6000_XIOCTL_GPIO_REGISTER_GET:
-        {
-            struct ar6000_gpio_register_cmd_s gpio_register_cmd;
-
-            if (ar->arWmiReady == FALSE) {
-                return -EIO;
-            }
-            if (down_interruptible(&ar->arSem)) {
-                return -ERESTARTSYS;
-            }
-
-            if (copy_from_user(&gpio_register_cmd, userdata,
-                                sizeof(gpio_register_cmd)))
-            {
-                ret = -EFAULT;
-            } else {
-                ret = ar6000_gpio_register_get(dev, gpio_register_cmd.gpioreg_id);
-                if (ret != A_OK) {
-                    up(&ar->arSem);
-                    return -EIO;
-                }
-
-                /* Wait for Target to respond. */
-                wait_event_interruptible(arEvent, gpio_data_available);
-                if (signal_pending(current)) {
-                    ret = -EINTR;
-                } else {
-                    A_ASSERT(gpio_register_cmd.gpioreg_id == gpio_reg_results.gpioreg_id);
-                    if (copy_to_user(userdata, &gpio_reg_results,
-                                     sizeof(gpio_reg_results)))
-                    {
-                        ret = -EFAULT;
-                    }
-                }
-            }
-            up(&ar->arSem);
-            break;
-        }
-        case AR6000_XIOCTL_GPIO_INTR_ACK:
-        {
-            struct ar6000_gpio_intr_ack_cmd_s gpio_intr_ack_cmd;
-
-            if (ar->arWmiReady == FALSE) {
-                return -EIO;
-            }
-            if (down_interruptible(&ar->arSem)) {
-                return -ERESTARTSYS;
-            }
-
-            if (copy_from_user(&gpio_intr_ack_cmd, userdata,
-                                sizeof(gpio_intr_ack_cmd)))
-            {
-                ret = -EFAULT;
-            } else {
-                ret = ar6000_gpio_intr_ack(dev, gpio_intr_ack_cmd.ack_mask);
-                if (ret != A_OK) {
-                    ret = EIO;
-                }
-            }
-            up(&ar->arSem);
-            break;
-        }
-        case AR6000_XIOCTL_GPIO_INTR_WAIT:
-        {
-            /* Wait for Target to report an interrupt. */
-            dev_hold(dev);
-            rtnl_unlock();
-            wait_event_interruptible(arEvent, gpio_intr_available);
-            rtnl_lock();
-            __dev_put(dev);
-
-            if (signal_pending(current)) {
-                ret = -EINTR;
-            } else {
-                if (copy_to_user(userdata, &gpio_intr_results,
-                                 sizeof(gpio_intr_results)))
-                {
-                    ret = -EFAULT;
-                }
-            }
-            break;
-        }
-#endif /* CONFIG_HOST_GPIO_SUPPORT */
-
-        case AR6000_XIOCTL_DBGLOG_CFG_MODULE:
-        {
-            struct ar6000_dbglog_module_config_s config;
-
-            if (copy_from_user(&config, userdata, sizeof(config))) {
-                return -EFAULT;
-            }
-
-            /* Send the challenge on the control channel */
-            if (wmi_config_debug_module_cmd(ar->arWmi, config.mmask,
-                                            config.tsr, config.rep,
-                                            config.size, config.valid) != A_OK)
-            {
-                return -EIO;
-            }
-            break;
-        }
-
-        case AR6000_XIOCTL_DBGLOG_GET_DEBUG_LOGS:
-        {
-            /* Send the challenge on the control channel */
-            if (ar6000_dbglog_get_debug_logs(ar) != A_OK)
-            {
-                return -EIO;
-            }
-            break;
-        }
-
-        case AR6000_XIOCTL_SET_ADHOC_BSSID:
-        {
-            WMI_SET_ADHOC_BSSID_CMD adhocBssid;
-
-            if (ar->arWmiReady == FALSE) {
-                ret = -EIO;
-            } else if (copy_from_user(&adhocBssid, userdata,
-                                      sizeof(adhocBssid)))
-            {
-                ret = -EFAULT;
-            } else if (A_MEMCMP(adhocBssid.bssid, bcast_mac,
-                                AR6000_ETH_ADDR_LEN) == 0)
-            {
-                ret = -EFAULT;
-            } else {
-
-                A_MEMCPY(ar->arReqBssid, adhocBssid.bssid, sizeof(ar->arReqBssid));
-        }
-            break;
-        }
-
-        case AR6000_XIOCTL_SET_OPT_MODE:
-        {
-        WMI_SET_OPT_MODE_CMD optModeCmd;
-            AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-
-            if (ar->arWmiReady == FALSE) {
-                ret = -EIO;
-            } else if (copy_from_user(&optModeCmd, userdata,
-                                      sizeof(optModeCmd)))
-            {
-                ret = -EFAULT;
-            } else if (ar->arConnected && optModeCmd.optMode == SPECIAL_ON) {
-                ret = -EFAULT;
-
-            } else if (wmi_set_opt_mode_cmd(ar->arWmi, optModeCmd.optMode)
-                       != A_OK)
-            {
-                ret = -EIO;
-            }
-            break;
-        }
-
-        case AR6000_XIOCTL_OPT_SEND_FRAME:
-        {
-        WMI_OPT_TX_FRAME_CMD optTxFrmCmd;
-            A_UINT8 data[MAX_OPT_DATA_LEN];
-
-            if (ar->arWmiReady == FALSE) {
-                ret = -EIO;
-            } else if (copy_from_user(&optTxFrmCmd, userdata,
-                                      sizeof(optTxFrmCmd)))
-            {
-                ret = -EFAULT;
-            } else if (copy_from_user(data,
-                                      userdata+sizeof(WMI_OPT_TX_FRAME_CMD)-1,
-                                      optTxFrmCmd.optIEDataLen))
-            {
-                ret = -EFAULT;
-            } else {
-                ret = wmi_opt_tx_frame_cmd(ar->arWmi,
-                                           optTxFrmCmd.frmType,
-                                           optTxFrmCmd.dstAddr,
-                                           optTxFrmCmd.bssid,
-                                           optTxFrmCmd.optIEDataLen,
-                                           data);
-            }
-
-            break;
-        }
-        case AR6000_XIOCTL_WMI_SETRETRYLIMITS:
-        {
-            WMI_SET_RETRY_LIMITS_CMD setRetryParams;
-
-            if (ar->arWmiReady == FALSE) {
-                ret = -EIO;
-            } else if (copy_from_user(&setRetryParams, userdata,
-                                      sizeof(setRetryParams)))
-            {
-                ret = -EFAULT;
-            } else {
-                if (wmi_set_retry_limits_cmd(ar->arWmi, setRetryParams.frameType,
-                                          setRetryParams.trafficClass,
-                                          setRetryParams.maxRetries,
-                                          setRetryParams.enableNotify) != A_OK)
-                {
-                    ret = -EIO;
-                }
-                AR6000_SPIN_LOCK(&ar->arLock, 0);
-                ar->arMaxRetries = setRetryParams.maxRetries;
-                AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-            }
-            break;
-        }
-
-        case AR6000_XIOCTL_SET_ADHOC_BEACON_INTVAL:
-        {
-            WMI_BEACON_INT_CMD bIntvlCmd;
-
-            if (ar->arWmiReady == FALSE) {
-                ret = -EIO;
-            } else if (copy_from_user(&bIntvlCmd, userdata,
-                       sizeof(bIntvlCmd)))
-            {
-                ret = -EFAULT;
-            } else if (wmi_set_adhoc_bconIntvl_cmd(ar->arWmi, bIntvlCmd.beaconInterval)
-                        != A_OK)
-            {
-                ret = -EIO;
-            }
-            break;
-        }
-        case IEEE80211_IOCTL_SETAUTHALG:
-        {
-            AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-            struct ieee80211req_authalg req;
-
-            if (ar->arWmiReady == FALSE) {
-                ret = -EIO;
-            } else if (copy_from_user(&req, userdata,
-                       sizeof(struct ieee80211req_authalg)))
-            {
-                ret = -EFAULT;
-            } else if (req.auth_alg == AUTH_ALG_OPEN_SYSTEM) {
-                ar->arDot11AuthMode  = OPEN_AUTH;
-                ar->arPairwiseCrypto  = NONE_CRYPT;
-                ar->arGroupCrypto     = NONE_CRYPT;
-            } else if (req.auth_alg == AUTH_ALG_LEAP) {
-                ar->arDot11AuthMode   = LEAP_AUTH;
-            } else {
-                ret = -EIO;
-            }
-            break;
-        }
-
-        case AR6000_XIOCTL_SET_VOICE_PKT_SIZE:
-            ret = ar6000_xioctl_set_voice_pkt_size(dev, userdata);
-            break;
-
-        case AR6000_XIOCTL_SET_MAX_SP:
-            ret = ar6000_xioctl_set_max_sp_len(dev, userdata);
-            break;
-
-        case AR6000_XIOCTL_WMI_GET_ROAM_TBL:
-            ret = ar6000_ioctl_get_roam_tbl(dev, rq);
-            break;
-        case AR6000_XIOCTL_WMI_SET_ROAM_CTRL:
-            ret = ar6000_ioctl_set_roam_ctrl(dev, userdata);
-            break;
-        case AR6000_XIOCTRL_WMI_SET_POWERSAVE_TIMERS:
-            ret = ar6000_ioctl_set_powersave_timers(dev, userdata);
-            break;
-        case AR6000_XIOCTRL_WMI_GET_POWER_MODE:
-            ret = ar6000_ioctl_get_power_mode(dev, rq);
-            break;
-        case AR6000_XIOCTRL_WMI_SET_WLAN_STATE:
-            get_user(ar->arWlanState, (unsigned int *)userdata);
-            if (ar->arWmiReady == FALSE) {
-                ret = -EIO;
-                break;
-            }
-
-            if (ar->arWlanState == WLAN_ENABLED) {
-                /* Enable foreground scanning */
-                if (wmi_scanparams_cmd(ar->arWmi, scParams.fg_start_period,
-                                       scParams.fg_end_period,
-                                       scParams.bg_period,
-                                       scParams.minact_chdwell_time,
-                                       scParams.maxact_chdwell_time,
-                                       scParams.pas_chdwell_time,
-                                       scParams.shortScanRatio,
-                                       scParams.scanCtrlFlags,
-                                       scParams.max_dfsch_act_time) != A_OK)
-                {
-                    ret = -EIO;
-                }
-                if (ar->arSsidLen) {
-                    ar->arConnectPending = TRUE;
-                    if (wmi_connect_cmd(ar->arWmi, ar->arNetworkType,
-                                        ar->arDot11AuthMode, ar->arAuthMode,
-                                        ar->arPairwiseCrypto,
-                                        ar->arPairwiseCryptoLen,
-                                        ar->arGroupCrypto, ar->arGroupCryptoLen,
-                                        ar->arSsidLen, ar->arSsid,
-                                        ar->arReqBssid, ar->arChannelHint,
-                                        ar->arConnectCtrlFlags) != A_OK)
-                    {
-                        ret = -EIO;
-                        ar->arConnectPending = FALSE;
-                    }
-                }
-            } else {
-                /* Disconnect from the AP and disable foreground scanning */
-                AR6000_SPIN_LOCK(&ar->arLock, 0);
-                if (ar->arConnected == TRUE || ar->arConnectPending == TRUE) {
-                    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-                    wmi_disconnect_cmd(ar->arWmi);
-                } else {
-                    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-                }
-
-                if (wmi_scanparams_cmd(ar->arWmi, 0xFFFF, 0, 0, 0, 0, 0, 0, 0xFF, 0) != A_OK)
-                {
-                    ret = -EIO;
-                }
-            }
-            break;
-        case AR6000_XIOCTL_WMI_GET_ROAM_DATA:
-            ret = ar6000_ioctl_get_roam_data(dev, rq);
-            break;
-        case AR6000_XIOCTL_WMI_SET_BT_STATUS:
-            ret = ar6000_xioctl_set_bt_status_cmd(dev, userdata);
-            break;
-        case AR6000_XIOCTL_WMI_SET_BT_PARAMS:
-            ret = ar6000_xioctl_set_bt_params_cmd(dev, userdata);
-            break;
-        case AR6000_XIOCTL_WMI_STARTSCAN:
-        {
-            WMI_START_SCAN_CMD setStartScanCmd;
-
-            if (ar->arWmiReady == FALSE) {
-                    ret = -EIO;
-                } else if (copy_from_user(&setStartScanCmd, userdata,
-                                          sizeof(setStartScanCmd)))
-                {
-                    ret = -EFAULT;
-                } else {
-                    if (wmi_startscan_cmd(ar->arWmi, setStartScanCmd.scanType,
-                                    setStartScanCmd.forceFgScan,
-                                    setStartScanCmd.isLegacy,
-                                    setStartScanCmd.homeDwellTime,
-                                    setStartScanCmd.forceScanInterval) != A_OK)
-                    {
-                        ret = -EIO;
-                    }
-                }
-            break;
-        }
-        case AR6000_XIOCTL_WMI_SETFIXRATES:
-        {
-            WMI_FIX_RATES_CMD setFixRatesCmd;
-            A_STATUS returnStatus;
-
-            if (ar->arWmiReady == FALSE) {
-                    ret = -EIO;
-                } else if (copy_from_user(&setFixRatesCmd, userdata,
-                                          sizeof(setFixRatesCmd)))
-                {
-                    ret = -EFAULT;
-                } else {
-                    returnStatus = wmi_set_fixrates_cmd(ar->arWmi, setFixRatesCmd.fixRateMask);
-                    if (returnStatus == A_EINVAL)
-                    {
-                        ret = -EINVAL;
-                    }
-                    else if(returnStatus != A_OK) {
-                        ret = -EIO;
-                    }
-                }
-            break;
-        }
-
-        case AR6000_XIOCTL_WMI_GETFIXRATES:
-        {
-            WMI_FIX_RATES_CMD getFixRatesCmd;
-            AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-            int ret = 0;
-
-            if (ar->arWmiReady == FALSE) {
-                return -EIO;
-            }
-
-            if (down_interruptible(&ar->arSem)) {
-                return -ERESTARTSYS;
-            }
-            /* Used copy_from_user/copy_to_user to access user space data */
-            if (copy_from_user(&getFixRatesCmd, userdata, sizeof(getFixRatesCmd))) {
-                ret = -EFAULT;
-            } else {
-                ar->arRateMask = 0xFFFF;
-
-                if (wmi_get_ratemask_cmd(ar->arWmi) != A_OK) {
-                    up(&ar->arSem);
-                    return -EIO;
-                }
-
-                wait_event_interruptible_timeout(arEvent, ar->arRateMask != 0xFFFF, wmitimeout * HZ);
-
-                if (signal_pending(current)) {
-                    ret = -EINTR;
-                }
-
-                if (!ret) {
-                    getFixRatesCmd.fixRateMask = ar->arRateMask;
-                }
-
-                if(copy_to_user(userdata, &getFixRatesCmd, sizeof(getFixRatesCmd))) {
-                   ret = -EFAULT;
-                }
-
-                up(&ar->arSem);
-            }
-            break;
-        }
-        case AR6000_XIOCTL_WMI_SET_AUTHMODE:
-        {
-            WMI_SET_AUTH_MODE_CMD setAuthMode;
-
-            if (ar->arWmiReady == FALSE) {
-                ret = -EIO;
-            } else if (copy_from_user(&setAuthMode, userdata,
-                                      sizeof(setAuthMode)))
-            {
-                ret = -EFAULT;
-            } else {
-                if (wmi_set_authmode_cmd(ar->arWmi, setAuthMode.mode) != A_OK)
-                {
-                    ret = -EIO;
-                }
-            }
-            break;
-        }
-        case AR6000_XIOCTL_WMI_SET_REASSOCMODE:
-        {
-            WMI_SET_REASSOC_MODE_CMD setReassocMode;
-
-            if (ar->arWmiReady == FALSE) {
-                ret = -EIO;
-            } else if (copy_from_user(&setReassocMode, userdata,
-                                      sizeof(setReassocMode)))
-            {
-                ret = -EFAULT;
-            } else {
-                if (wmi_set_reassocmode_cmd(ar->arWmi, setReassocMode.mode) != A_OK)
-                {
-                    ret = -EIO;
-                }
-            }
-            break;
-        }
-        case AR6000_XIOCTL_DIAG_READ:
-        {
-            A_UINT32 addr, data;
-            get_user(addr, (unsigned int *)userdata);
-            if (ar6000_ReadRegDiag(ar->arHifDevice, &addr, &data) != A_OK) {
-                ret = -EIO;
-            }
-            put_user(data, (unsigned int *)userdata + 1);
-            break;
-        }
-        case AR6000_XIOCTL_DIAG_WRITE:
-        {
-            A_UINT32 addr, data;
-            get_user(addr, (unsigned int *)userdata);
-            get_user(data, (unsigned int *)userdata + 1);
-            if (ar6000_WriteRegDiag(ar->arHifDevice, &addr, &data) != A_OK) {
-                ret = -EIO;
-            }
-            break;
-        }
-        case AR6000_XIOCTL_WMI_SET_KEEPALIVE:
-        {
-             WMI_SET_KEEPALIVE_CMD setKeepAlive;
-             if (ar->arWmiReady == FALSE) {
-                 return -EIO;
-             } else if (copy_from_user(&setKeepAlive, userdata,
-                        sizeof(setKeepAlive))){
-                 ret = -EFAULT;
-             } else {
-                 if (wmi_set_keepalive_cmd(ar->arWmi, setKeepAlive.keepaliveInterval) != A_OK) {
-                     ret = -EIO;
-               }
-             }
-             break;
-        }
-        case AR6000_XIOCTL_WMI_GET_KEEPALIVE:
-        {
-            AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-            WMI_GET_KEEPALIVE_CMD getKeepAlive;
-            int ret = 0;
-            if (ar->arWmiReady == FALSE) {
-               return -EIO;
-            }
-            if (down_interruptible(&ar->arSem)) {
-                return -ERESTARTSYS;
-            }
-            if (copy_from_user(&getKeepAlive, userdata,sizeof(getKeepAlive))) {
-               ret = -EFAULT;
-            } else {
-            getKeepAlive.keepaliveInterval = wmi_get_keepalive_cmd(ar->arWmi);
-            ar->arKeepaliveConfigured = 0xFF;
-            if (wmi_get_keepalive_configured(ar->arWmi) != A_OK){
-                up(&ar->arSem);
-                return -EIO;
-            }
-            wait_event_interruptible_timeout(arEvent, ar->arKeepaliveConfigured != 0xFF, wmitimeout * HZ);
-            if (signal_pending(current)) {
-                ret = -EINTR;
-            }
-
-            if (!ret) {
-                getKeepAlive.configured = ar->arKeepaliveConfigured;
-            }
-            if (copy_to_user(userdata, &getKeepAlive, sizeof(getKeepAlive))) {
-               ret = -EFAULT;
-            }
-            up(&ar->arSem);
-            }
-            break;
-        }
-        case AR6000_XIOCTL_WMI_SET_APPIE:
-        {
-            WMI_SET_APPIE_CMD appIEcmd;
-            A_UINT8           appIeInfo[IEEE80211_APPIE_FRAME_MAX_LEN];
-            A_UINT32            fType,ieLen;
-
-	    if (ar->arWmiReady == FALSE) {
-		    return -EIO;
-	    }
-	    get_user(fType, (A_UINT32 *)userdata);
-	    appIEcmd.mgmtFrmType = fType;
-	    if (appIEcmd.mgmtFrmType >= IEEE80211_APPIE_NUM_OF_FRAME) {
-		    ret = -EIO;
-	    } else {
-		    get_user(ieLen, (A_UINT32 *)(userdata + 4));
-		    appIEcmd.ieLen = ieLen;
-		    if (appIEcmd.ieLen > IEEE80211_APPIE_FRAME_MAX_LEN) {
-			    ret = -EIO;
-			    break;
-		    }
-		    if (copy_from_user(appIeInfo, userdata + 8, appIEcmd.ieLen)) {
-			    ret = -EFAULT;
-		    } else {
-			    if (wmi_set_appie_cmd(ar->arWmi, appIEcmd.mgmtFrmType,
-						  appIEcmd.ieLen,  appIeInfo) != A_OK)
-			    {
-				    ret = -EIO;
-			    }
-		    }
-            }
-            break;
-        }
-        case AR6000_XIOCTL_WMI_SET_MGMT_FRM_RX_FILTER:
-        {
-            WMI_BSS_FILTER_CMD cmd;
-            A_UINT32    filterType;
-
-            if (copy_from_user(&filterType, userdata, sizeof(A_UINT32)))
-            {
-                return -EFAULT;
-            }
-            if (filterType & (IEEE80211_FILTER_TYPE_BEACON |
-                                    IEEE80211_FILTER_TYPE_PROBE_RESP))
-            {
-                cmd.bssFilter = ALL_BSS_FILTER;
-            } else {
-                cmd.bssFilter = NONE_BSS_FILTER;
-            }
-            if (wmi_bssfilter_cmd(ar->arWmi, cmd.bssFilter, 0) != A_OK) {
-                ret = -EIO;
-            }
-
-            AR6000_SPIN_LOCK(&ar->arLock, 0);
-            ar->arMgmtFilter = filterType;
-            AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-            break;
-        }
-        case AR6000_XIOCTL_WMI_SET_WSC_STATUS:
-        {
-            A_UINT32    wsc_status;
-
-            if (copy_from_user(&wsc_status, userdata, sizeof(A_UINT32)))
-            {
-                return -EFAULT;
-            }
-            if (wmi_set_wsc_status_cmd(ar->arWmi, wsc_status) != A_OK) {
-                ret = -EIO;
-            }
-            break;
-        }
-        case AR6000_XIOCTL_BMI_ROMPATCH_INSTALL:
-        {
-            A_UINT32 ROM_addr;
-            A_UINT32 RAM_addr;
-            A_UINT32 nbytes;
-            A_UINT32 do_activate;
-            A_UINT32 rompatch_id;
-
-            get_user(ROM_addr, (A_UINT32 *)userdata);
-            get_user(RAM_addr, (A_UINT32 *)userdata + 1);
-            get_user(nbytes, (A_UINT32 *)userdata + 2);
-            get_user(do_activate, (A_UINT32 *)userdata + 3);
-            AR_DEBUG_PRINTF("Install rompatch from ROM: 0x%x to RAM: 0x%x  length: %d\n",
-                             ROM_addr, RAM_addr, nbytes);
-            ret = BMIrompatchInstall(hifDevice, ROM_addr, RAM_addr,
-                                        nbytes, do_activate, &rompatch_id);
-            if (ret == A_OK) {
-                put_user(rompatch_id, (unsigned int *)rq->ifr_data); /* return value */
-            }
-            break;
-        }
-
-        case AR6000_XIOCTL_BMI_ROMPATCH_UNINSTALL:
-        {
-            A_UINT32 rompatch_id;
-
-            get_user(rompatch_id, (A_UINT32 *)userdata);
-            AR_DEBUG_PRINTF("UNinstall rompatch_id %d\n", rompatch_id);
-            ret = BMIrompatchUninstall(hifDevice, rompatch_id);
-            break;
-        }
-
-        case AR6000_XIOCTL_BMI_ROMPATCH_ACTIVATE:
-        case AR6000_XIOCTL_BMI_ROMPATCH_DEACTIVATE:
-        {
-            A_UINT32 rompatch_count;
-
-            get_user(rompatch_count, (A_UINT32 *)userdata);
-            AR_DEBUG_PRINTF("Change rompatch activation count=%d\n", rompatch_count);
-            length = sizeof(A_UINT32) * rompatch_count;
-            if ((buffer = (unsigned char *)A_MALLOC(length)) != NULL) {
-                A_MEMZERO(buffer, length);
-                if (copy_from_user(buffer, &userdata[sizeof(rompatch_count)], length))
-                {
-                    ret = -EFAULT;
-                } else {
-                    if (cmd == AR6000_XIOCTL_BMI_ROMPATCH_ACTIVATE) {
-                        ret = BMIrompatchActivate(hifDevice, rompatch_count, (A_UINT32 *)buffer);
-                    } else {
-                        ret = BMIrompatchDeactivate(hifDevice, rompatch_count, (A_UINT32 *)buffer);
-                    }
-                }
-                A_FREE(buffer);
-            } else {
-                ret = -ENOMEM;
-            }
-
-            break;
-        }
-
-        case AR6000_XIOCTL_WMI_SET_HOST_SLEEP_MODE:
-        {
-            WMI_SET_HOST_SLEEP_MODE_CMD setHostSleepMode;
-
-            if (ar->arWmiReady == FALSE) {
-                ret = -EIO;
-            } else if (copy_from_user(&setHostSleepMode, userdata,
-                                      sizeof(setHostSleepMode)))
-            {
-                ret = -EFAULT;
-            } else {
-                if (wmi_set_host_sleep_mode_cmd(ar->arWmi,
-                                &setHostSleepMode) != A_OK)
-                {
-                    ret = -EIO;
-                }
-            }
-            break;
-        }
-        case AR6000_XIOCTL_WMI_SET_WOW_MODE:
-        {
-            WMI_SET_WOW_MODE_CMD setWowMode;
-
-            if (ar->arWmiReady == FALSE) {
-                ret = -EIO;
-            } else if (copy_from_user(&setWowMode, userdata,
-                                      sizeof(setWowMode)))
-            {
-                ret = -EFAULT;
-            } else {
-                if (wmi_set_wow_mode_cmd(ar->arWmi,
-                                &setWowMode) != A_OK)
-                {
-                    ret = -EIO;
-                }
-            }
-            break;
-        }
-        case AR6000_XIOCTL_WMI_GET_WOW_LIST:
-        {
-            WMI_GET_WOW_LIST_CMD getWowList;
-
-            if (ar->arWmiReady == FALSE) {
-                ret = -EIO;
-            } else if (copy_from_user(&getWowList, userdata,
-                                      sizeof(getWowList)))
-            {
-                ret = -EFAULT;
-            } else {
-                if (wmi_get_wow_list_cmd(ar->arWmi,
-                                &getWowList) != A_OK)
-                {
-                    ret = -EIO;
-                }
-            }
-            break;
-        }
-        case AR6000_XIOCTL_WMI_ADD_WOW_PATTERN:
-        {
-#define WOW_PATTERN_SIZE 64
-#define WOW_MASK_SIZE 64
-
-            WMI_ADD_WOW_PATTERN_CMD cmd;
-            A_UINT8 mask_data[WOW_PATTERN_SIZE]={0};
-            A_UINT8 pattern_data[WOW_PATTERN_SIZE]={0};
-
-            if (ar->arWmiReady == FALSE) {
-                ret = -EIO;
-            } else {
-
-                if(copy_from_user(&cmd, userdata,
-                            sizeof(WMI_ADD_WOW_PATTERN_CMD)))
-                      return -EFAULT;
-                if (copy_from_user(pattern_data,
-                                      userdata + 3,
-                                      cmd.filter_size)){
-                        ret = -EFAULT;
-                        break;
-                }
-                if (copy_from_user(mask_data,
-                                      (userdata + 3 + cmd.filter_size),
-                                      cmd.filter_size)){
-                        ret = -EFAULT;
-                        break;
-                } else {
-                    if (wmi_add_wow_pattern_cmd(ar->arWmi,
-                                &cmd, pattern_data, mask_data, cmd.filter_size) != A_OK){
-                        ret = -EIO;
-                    }
-                }
-            }
-#undef WOW_PATTERN_SIZE
-#undef WOW_MASK_SIZE
-            break;
-        }
-        case AR6000_XIOCTL_WMI_DEL_WOW_PATTERN:
-        {
-            WMI_DEL_WOW_PATTERN_CMD delWowPattern;
-
-            if (ar->arWmiReady == FALSE) {
-                ret = -EIO;
-            } else if (copy_from_user(&delWowPattern, userdata,
-                                      sizeof(delWowPattern)))
-            {
-                ret = -EFAULT;
-            } else {
-                if (wmi_del_wow_pattern_cmd(ar->arWmi,
-                                &delWowPattern) != A_OK)
-                {
-                    ret = -EIO;
-                }
-            }
-            break;
-        }
-        case AR6000_XIOCTL_DUMP_HTC_CREDIT_STATE:
-            if (ar->arHtcTarget != NULL) {
-                HTCDumpCreditStates(ar->arHtcTarget);
-            }
-            break;
-        case AR6000_XIOCTL_TRAFFIC_ACTIVITY_CHANGE:
-            if (ar->arHtcTarget != NULL) {
-                struct ar6000_traffic_activity_change data;
-
-                if (copy_from_user(&data, userdata, sizeof(data)))
-                {
-                    return -EFAULT;
-                }
-                    /* note, this is used for testing (mbox ping testing), indicate activity
-                     * change using the stream ID as the traffic class */
-                ar6000_indicate_tx_activity(ar,
-                                            (A_UINT8)data.StreamID,
-                                            data.Active ? TRUE : FALSE);
-            }
-            break;
-        case AR6000_XIOCTL_WMI_SET_CONNECT_CTRL_FLAGS:
-            if (ar->arWmiReady == FALSE) {
-                ret = -EIO;
-            } else if (copy_from_user(&connectCtrlFlags, userdata,
-                                      sizeof(connectCtrlFlags)))
-            {
-                ret = -EFAULT;
-            } else {
-                ar->arConnectCtrlFlags = connectCtrlFlags;
-            }
-            break;
-        case AR6000_XIOCTL_WMI_SET_AKMP_PARAMS:
-            if (ar->arWmiReady == FALSE) {
-                ret = -EIO;
-            } else if (copy_from_user(&akmpParams, userdata,
-                                      sizeof(WMI_SET_AKMP_PARAMS_CMD)))
-            {
-                ret = -EFAULT;
-            } else {
-                if (wmi_set_akmp_params_cmd(ar->arWmi, &akmpParams) != A_OK) {
-                    ret = -EIO;
-                }
-            }
-            break;
-        case AR6000_XIOCTL_WMI_SET_PMKID_LIST:
-            if (ar->arWmiReady == FALSE) {
-                ret = -EIO;
-            } else {
-                if (copy_from_user(&pmkidInfo.numPMKID, userdata,
-                                      sizeof(pmkidInfo.numPMKID)))
-                {
-                    ret = -EFAULT;
-                    break;
-                }
-                if (copy_from_user(&pmkidInfo.pmkidList,
-                                   userdata + sizeof(pmkidInfo.numPMKID),
-                                   pmkidInfo.numPMKID * sizeof(WMI_PMKID)))
-                {
-                    ret = -EFAULT;
-                    break;
-                }
-                if (wmi_set_pmkid_list_cmd(ar->arWmi, &pmkidInfo) != A_OK) {
-                    ret = -EIO;
-                }
-            }
-            break;
-        case AR6000_XIOCTL_WMI_GET_PMKID_LIST:
-            if (ar->arWmiReady == FALSE) {
-                ret = -EIO;
-            } else  {
-                if (wmi_get_pmkid_list_cmd(ar->arWmi) != A_OK) {
-                    ret = -EIO;
-                }
-            }
-            break;
-        default:
-            ret = -EOPNOTSUPP;
-    }
-    return ret;
-}
-
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/netbuf.c b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/netbuf.c
deleted file mode 100644
index 97b273b3a..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/netbuf.c
+++ /dev/null
@@ -1,225 +0,0 @@
-
-/*
- *
- * Copyright (c) 2004-2007 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-#include <linux/kernel.h>
-#include <linux/skbuff.h>
-#include <a_config.h>
-#include "athdefs.h"
-#include "a_types.h"
-#include "a_osapi.h"
-#include "htc_packet.h"
-
-#define AR6000_DATA_OFFSET    64
-
-void a_netbuf_enqueue(A_NETBUF_QUEUE_T *q, void *pkt)
-{
-    skb_queue_tail((struct sk_buff_head *) q, (struct sk_buff *) pkt);
-}
-
-void a_netbuf_prequeue(A_NETBUF_QUEUE_T *q, void *pkt)
-{
-    skb_queue_head((struct sk_buff_head *) q, (struct sk_buff *) pkt);
-}
-
-void *a_netbuf_dequeue(A_NETBUF_QUEUE_T *q)
-{
-    return((void *) skb_dequeue((struct sk_buff_head *) q));
-}
-
-int a_netbuf_queue_size(A_NETBUF_QUEUE_T *q)
-{
-    return(skb_queue_len((struct sk_buff_head *) q));
-}
-
-int a_netbuf_queue_empty(A_NETBUF_QUEUE_T *q)
-{
-    return(skb_queue_empty((struct sk_buff_head *) q));
-}
-
-void a_netbuf_queue_init(A_NETBUF_QUEUE_T *q)
-{
-    skb_queue_head_init((struct sk_buff_head *) q);
-}
-
-void *
-a_netbuf_alloc(int size)
-{
-    struct sk_buff *skb;
-    skb = dev_alloc_skb(AR6000_DATA_OFFSET + sizeof(HTC_PACKET) + size);
-    skb_reserve(skb, AR6000_DATA_OFFSET + sizeof(HTC_PACKET));
-    return ((void *)skb);
-}
-
-/*
- * Allocate an SKB w.o. any encapsulation requirement.
- */
-void *
-a_netbuf_alloc_raw(int size)
-{
-    struct sk_buff *skb;
-
-    skb = dev_alloc_skb(size);
-
-    return ((void *)skb);
-}
-
-void
-a_netbuf_free(void *bufPtr)
-{
-    struct sk_buff *skb = (struct sk_buff *)bufPtr;
-
-    dev_kfree_skb(skb);
-}
-
-A_UINT32
-a_netbuf_to_len(void *bufPtr)
-{
-    return (((struct sk_buff *)bufPtr)->len);
-}
-
-void *
-a_netbuf_to_data(void *bufPtr)
-{
-    return (((struct sk_buff *)bufPtr)->data);
-}
-
-/*
- * Add len # of bytes to the beginning of the network buffer
- * pointed to by bufPtr
- */
-A_STATUS
-a_netbuf_push(void *bufPtr, A_INT32 len)
-{
-    skb_push((struct sk_buff *)bufPtr, len);
-
-    return A_OK;
-}
-
-/*
- * Add len # of bytes to the beginning of the network buffer
- * pointed to by bufPtr and also fill with data
- */
-A_STATUS
-a_netbuf_push_data(void *bufPtr, char *srcPtr, A_INT32 len)
-{
-    skb_push((struct sk_buff *) bufPtr, len);
-    A_MEMCPY(((struct sk_buff *)bufPtr)->data, srcPtr, len);
-
-    return A_OK;
-}
-
-/*
- * Add len # of bytes to the end of the network buffer
- * pointed to by bufPtr
- */
-A_STATUS
-a_netbuf_put(void *bufPtr, A_INT32 len)
-{
-    skb_put((struct sk_buff *)bufPtr, len);
-
-    return A_OK;
-}
-
-/*
- * Add len # of bytes to the end of the network buffer
- * pointed to by bufPtr and also fill with data
- */
-A_STATUS
-a_netbuf_put_data(void *bufPtr, char *srcPtr, A_INT32 len)
-{
-    char *start = ((struct sk_buff *)bufPtr)->data +
-        ((struct sk_buff *)bufPtr)->len;
-    skb_put((struct sk_buff *)bufPtr, len);
-    A_MEMCPY(start, srcPtr, len);
-
-    return A_OK;
-}
-
-
-/*
- * Trim the network buffer pointed to by bufPtr to len # of bytes
- */
-A_STATUS
-a_netbuf_setlen(void *bufPtr, A_INT32 len)
-{
-    skb_trim((struct sk_buff *)bufPtr, len);
-
-    return A_OK;
-}
-
-/*
- * Chop of len # of bytes from the end of the buffer.
- */
-A_STATUS
-a_netbuf_trim(void *bufPtr, A_INT32 len)
-{
-    skb_trim((struct sk_buff *)bufPtr, ((struct sk_buff *)bufPtr)->len - len);
-
-    return A_OK;
-}
-
-/*
- * Chop of len # of bytes from the end of the buffer and return the data.
- */
-A_STATUS
-a_netbuf_trim_data(void *bufPtr, char *dstPtr, A_INT32 len)
-{
-    char *start = ((struct sk_buff *)bufPtr)->data +
-        (((struct sk_buff *)bufPtr)->len - len);
-
-    A_MEMCPY(dstPtr, start, len);
-    skb_trim((struct sk_buff *)bufPtr, ((struct sk_buff *)bufPtr)->len - len);
-
-    return A_OK;
-}
-
-
-/*
- * Returns the number of bytes available to a a_netbuf_push()
- */
-A_INT32
-a_netbuf_headroom(void *bufPtr)
-{
-    return (skb_headroom((struct sk_buff *)bufPtr));
-}
-
-/*
- * Removes specified number of bytes from the beginning of the buffer
- */
-A_STATUS
-a_netbuf_pull(void *bufPtr, A_INT32 len)
-{
-    skb_pull((struct sk_buff *)bufPtr, len);
-
-    return A_OK;
-}
-
-/*
- * Removes specified number of bytes from the beginning of the buffer
- * and return the data
- */
-A_STATUS
-a_netbuf_pull_data(void *bufPtr, char *dstPtr, A_INT32 len)
-{
-    A_MEMCPY(dstPtr, ((struct sk_buff *)bufPtr)->data, len);
-    skb_pull((struct sk_buff *)bufPtr, len);
-
-    return A_OK;
-}
-
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/osapi_linux.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/osapi_linux.h
deleted file mode 100644
index 5b64212a2..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/osapi_linux.h
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * $Id: //depot/sw/releases/olca2.0-GPL/host/os/linux/include/osapi_linux.h#1 $
- *
- * This file contains the definitions of the basic atheros data types.
- * It is used to map the data types in atheros files to a platform specific
- * type.
- *
- * Copyright 2003-2005 Atheros Communications, Inc.,  All Rights Reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#ifndef _OSAPI_LINUX_H_
-#define _OSAPI_LINUX_H_
-
-#ifdef __KERNEL__
-
-#include <linux/version.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/skbuff.h>
-#include <linux/netdevice.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-#include <linux/jiffies.h>
-#endif
-#include <linux/timer.h>
-#include <linux/delay.h>
-#include <linux/wait.h>
-#ifdef KERNEL_2_4
-#include <asm/arch/irq.h>
-#include <asm/irq.h>
-#endif
-
-#ifdef __GNUC__
-#define __ATTRIB_PACK           __attribute__ ((packed))
-#define __ATTRIB_PRINTF         __attribute__ ((format (printf, 1, 2)))
-#define __ATTRIB_NORETURN       __attribute__ ((noreturn))
-#ifndef INLINE
-#define INLINE                  __inline__
-#endif
-#else /* Not GCC */
-#define __ATTRIB_PACK
-#define __ATTRIB_PRINTF
-#define __ATTRIB_NORETURN
-#ifndef INLINE
-#define INLINE                  __inline
-#endif
-#endif /* End __GNUC__ */
-
-#define PREPACK
-#define POSTPACK                __ATTRIB_PACK
-
-/*
- * Endianes macros
- */
-#define A_BE2CPU8(x)       ntohb(x)
-#define A_BE2CPU16(x)      ntohs(x)
-#define A_BE2CPU32(x)      ntohl(x)
-
-#define A_LE2CPU8(x)       (x)
-#define A_LE2CPU16(x)      (x)
-#define A_LE2CPU32(x)      (x)
-
-#define A_CPU2BE8(x)       htonb(x)
-#define A_CPU2BE16(x)      htons(x)
-#define A_CPU2BE32(x)      htonl(x)
-
-#define A_MEMCPY(dst, src, len)         memcpy((A_UINT8 *)(dst), (src), (len))
-#define A_MEMZERO(addr, len)            memset(addr, 0, len)
-#define A_MEMCMP(addr1, addr2, len)     memcmp((addr1), (addr2), (len))
-#define A_MALLOC(size)                  kmalloc((size), GFP_KERNEL)
-#define A_MALLOC_NOWAIT(size)           kmalloc((size), GFP_ATOMIC)
-#define A_FREE(addr)                    kfree(addr)
-#define A_PRINTF(args...)               printk(args)
-
-/* Mutual Exclusion */
-typedef spinlock_t                      A_MUTEX_T;
-#define A_MUTEX_INIT(mutex)             spin_lock_init(mutex)
-#define A_MUTEX_LOCK(mutex)             spin_lock_bh(mutex)
-#define A_MUTEX_UNLOCK(mutex)           spin_unlock_bh(mutex)
-#define A_IS_MUTEX_VALID(mutex)         TRUE  /* okay to return true, since A_MUTEX_DELETE does nothing */
-#define A_MUTEX_DELETE(mutex)           /* spin locks are not kernel resources so nothing to free.. */
-
-/* Get current time in ms adding a constant offset (in ms) */
-#define A_GET_MS(offset)    \
-	(jiffies + ((offset) / 1000) * HZ)
-
-/*
- * Timer Functions
- */
-#define A_MDELAY(msecs)                 mdelay(msecs)
-typedef struct timer_list               A_TIMER;
-
-#define A_INIT_TIMER(pTimer, pFunction, pArg) do {              \
-    init_timer(pTimer);                                         \
-    (pTimer)->function = (pFunction);                           \
-    (pTimer)->data   = (unsigned long)(pArg);                   \
-} while (0)
-
-/*
- * Start a Timer that elapses after 'periodMSec' milli-seconds
- * Support is provided for a one-shot timer. The 'repeatFlag' is
- * ignored.
- */
-#define A_TIMEOUT_MS(pTimer, periodMSec, repeatFlag) do {                   \
-    if (repeatFlag) {                                                       \
-        printk("\n" __FILE__ ":%d: Timer Repeat requested\n",__LINE__);     \
-        panic("Timer Repeat");                                              \
-    }                                                                       \
-    mod_timer((pTimer), jiffies + HZ * (periodMSec) / 1000);                \
-} while (0)
-
-/*
- * Cancel the Timer.
- */
-#define A_UNTIMEOUT(pTimer) do {                                \
-    del_timer((pTimer));                                        \
-} while (0)
-
-#define A_DELETE_TIMER(pTimer) do {                             \
-} while (0)
-
-/*
- * Wait Queue related functions
- */
-typedef wait_queue_head_t               A_WAITQUEUE_HEAD;
-#define A_INIT_WAITQUEUE_HEAD(head)     init_waitqueue_head(head)
-#ifndef wait_event_interruptible_timeout
-#define __wait_event_interruptible_timeout(wq, condition, ret)          \
-do {                                                                    \
-        wait_queue_t __wait;                                            \
-        init_waitqueue_entry(&__wait, current);                         \
-                                                                        \
-        add_wait_queue(&wq, &__wait);                                   \
-        for (;;) {                                                      \
-                set_current_state(TASK_INTERRUPTIBLE);                  \
-                if (condition)                                          \
-                        break;                                          \
-                if (!signal_pending(current)) {                         \
-                        ret = schedule_timeout(ret);                    \
-                        if (!ret)                                       \
-                                break;                                  \
-                        continue;                                       \
-                }                                                       \
-                ret = -ERESTARTSYS;                                     \
-                break;                                                  \
-        }                                                               \
-        current->state = TASK_RUNNING;                                  \
-        remove_wait_queue(&wq, &__wait);                                \
-} while (0)
-
-#define wait_event_interruptible_timeout(wq, condition, timeout)        \
-({                                                                      \
-        long __ret = timeout;                                           \
-        if (!(condition))                                               \
-                __wait_event_interruptible_timeout(wq, condition, __ret); \
-        __ret;                                                          \
-})
-#endif /* wait_event_interruptible_timeout */
-
-#define A_WAIT_EVENT_INTERRUPTIBLE_TIMEOUT(head, condition, timeout) do { \
-    wait_event_interruptible_timeout(head, condition, timeout); \
-} while (0)
-
-#define A_WAKE_UP(head)                 wake_up(head)
-
-#ifdef DEBUG
-#define A_ASSERT(expr)  \
-    if (!(expr)) {   \
-        printk(KERN_ALERT "\n" __FILE__ ":%d: Assertion " #expr " failed!\n",__LINE__); \
-        panic(#expr); \
-    }
-
-#else
-#define A_ASSERT(expr)
-#endif /* DEBUG */
-
-/*
- * Initialization of the network buffer subsystem
- */
-#define A_NETBUF_INIT()
-
-/*
- * Network buffer queue support
- */
-typedef struct sk_buff_head A_NETBUF_QUEUE_T;
-
-#define A_NETBUF_QUEUE_INIT(q)  \
-    a_netbuf_queue_init(q)
-
-#define A_NETBUF_ENQUEUE(q, pkt) \
-    a_netbuf_enqueue((q), (pkt))
-#define A_NETBUF_PREQUEUE(q, pkt) \
-    a_netbuf_prequeue((q), (pkt))
-#define A_NETBUF_DEQUEUE(q) \
-    (a_netbuf_dequeue(q))
-#define A_NETBUF_QUEUE_SIZE(q)  \
-    a_netbuf_queue_size(q)
-#define A_NETBUF_QUEUE_EMPTY(q) \
-    a_netbuf_queue_empty(q)
-
-/*
- * Network buffer support
- */
-#define A_NETBUF_ALLOC(size) \
-    a_netbuf_alloc(size)
-#define A_NETBUF_ALLOC_RAW(size) \
-    a_netbuf_alloc_raw(size)
-#define A_NETBUF_FREE(bufPtr) \
-    a_netbuf_free(bufPtr)
-#define A_NETBUF_DATA(bufPtr) \
-    a_netbuf_to_data(bufPtr)
-#define A_NETBUF_LEN(bufPtr) \
-    a_netbuf_to_len(bufPtr)
-#define A_NETBUF_PUSH(bufPtr, len) \
-    a_netbuf_push(bufPtr, len)
-#define A_NETBUF_PUT(bufPtr, len) \
-    a_netbuf_put(bufPtr, len)
-#define A_NETBUF_TRIM(bufPtr,len) \
-    a_netbuf_trim(bufPtr, len)
-#define A_NETBUF_PULL(bufPtr, len) \
-    a_netbuf_pull(bufPtr, len)
-#define A_NETBUF_HEADROOM(bufPtr)\
-    a_netbuf_headroom(bufPtr)
-#define A_NETBUF_SETLEN(bufPtr,len) \
-    a_netbuf_setlen(bufPtr, len)
-
-/* Add data to end of a buffer  */
-#define A_NETBUF_PUT_DATA(bufPtr, srcPtr,  len) \
-    a_netbuf_put_data(bufPtr, srcPtr, len)
-
-/* Add data to start of the  buffer */
-#define A_NETBUF_PUSH_DATA(bufPtr, srcPtr,  len) \
-    a_netbuf_push_data(bufPtr, srcPtr, len)
-
-/* Remove data at start of the buffer */
-#define A_NETBUF_PULL_DATA(bufPtr, dstPtr, len) \
-    a_netbuf_pull_data(bufPtr, dstPtr, len)
-
-/* Remove data from the end of the buffer */
-#define A_NETBUF_TRIM_DATA(bufPtr, dstPtr, len) \
-    a_netbuf_trim_data(bufPtr, dstPtr, len)
-
-/* View data as "size" contiguous bytes of type "t" */
-#define A_NETBUF_VIEW_DATA(bufPtr, t, size) \
-    (t )( ((struct skbuf *)(bufPtr))->data)
-
-/* return the beginning of the headroom for the buffer */
-#define A_NETBUF_HEAD(bufPtr) \
-        ((((struct sk_buff *)(bufPtr))->head))
-
-/*
- * OS specific network buffer access routines
- */
-void *a_netbuf_alloc(int size);
-void *a_netbuf_alloc_raw(int size);
-void a_netbuf_free(void *bufPtr);
-void *a_netbuf_to_data(void *bufPtr);
-A_UINT32 a_netbuf_to_len(void *bufPtr);
-A_STATUS a_netbuf_push(void *bufPtr, A_INT32 len);
-A_STATUS a_netbuf_push_data(void *bufPtr, char *srcPtr, A_INT32 len);
-A_STATUS a_netbuf_put(void *bufPtr, A_INT32 len);
-A_STATUS a_netbuf_put_data(void *bufPtr, char *srcPtr, A_INT32 len);
-A_STATUS a_netbuf_pull(void *bufPtr, A_INT32 len);
-A_STATUS a_netbuf_pull_data(void *bufPtr, char *dstPtr, A_INT32 len);
-A_STATUS a_netbuf_trim(void *bufPtr, A_INT32 len);
-A_STATUS a_netbuf_trim_data(void *bufPtr, char *dstPtr, A_INT32 len);
-A_STATUS a_netbuf_setlen(void *bufPtr, A_INT32 len);
-A_INT32 a_netbuf_headroom(void *bufPtr);
-void a_netbuf_enqueue(A_NETBUF_QUEUE_T *q, void *pkt);
-void a_netbuf_prequeue(A_NETBUF_QUEUE_T *q, void *pkt);
-void *a_netbuf_dequeue(A_NETBUF_QUEUE_T *q);
-int a_netbuf_queue_size(A_NETBUF_QUEUE_T *q);
-int a_netbuf_queue_empty(A_NETBUF_QUEUE_T *q);
-int a_netbuf_queue_empty(A_NETBUF_QUEUE_T *q);
-void a_netbuf_queue_init(A_NETBUF_QUEUE_T *q);
-
-/*
- * Kernel v.s User space functions
- */
-A_UINT32 a_copy_to_user(void *to, const void *from, A_UINT32 n);
-A_UINT32 a_copy_from_user(void *to, const void *from, A_UINT32 n);
-
-#else /* __KERNEL__ */
-
-#ifdef __GNUC__
-#define __ATTRIB_PACK           __attribute__ ((packed))
-#define __ATTRIB_PRINTF         __attribute__ ((format (printf, 1, 2)))
-#define __ATTRIB_NORETURN       __attribute__ ((noreturn))
-#ifndef INLINE
-#define INLINE                  __inline__
-#endif
-#else /* Not GCC */
-#define __ATTRIB_PACK
-#define __ATTRIB_PRINTF
-#define __ATTRIB_NORETURN
-#ifndef INLINE
-#define INLINE                  __inline
-#endif
-#endif /* End __GNUC__ */
-
-#define PREPACK
-#define POSTPACK                __ATTRIB_PACK
-
-#endif /* __KERNEL__ */
-
-#endif /* _OSAPI_LINUX_H_ */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/wireless_ext.c b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/wireless_ext.c
deleted file mode 100644
index af78ae05f..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/wireless_ext.c
+++ /dev/null
@@ -1,1979 +0,0 @@
-/*
- *
- * Copyright (c) 2004-2007 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#include "ar6000_drv.h"
-
-static A_UINT8 bcast_mac[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
-static void ar6000_set_quality(struct iw_quality *iq, A_INT8 rssi);
-extern unsigned int wmitimeout;
-extern A_WAITQUEUE_HEAD arEvent;
-extern wait_queue_head_t ar6000_scan_queue;
-
-/*
- * Encode a WPA or RSN information element as a custom
- * element using the hostap format.
- */
-static u_int
-encode_ie(void *buf, size_t bufsize,
-    const u_int8_t *ie, size_t ielen,
-    const char *leader, size_t leader_len)
-{
-    u_int8_t *p;
-    int i;
-
-    if (bufsize < leader_len)
-        return 0;
-    p = buf;
-    memcpy(p, leader, leader_len);
-    bufsize -= leader_len;
-    p += leader_len;
-    for (i = 0; i < ielen && bufsize > 2; i++)
-        p += sprintf(p, "%02x", ie[i]);
-    return (i == ielen ? p - (u_int8_t *)buf : 0);
-}
-
-void
-ar6000_scan_node(void *arg, bss_t *ni)
-{
-    struct iw_event iwe;
-#if WIRELESS_EXT > 14
-    char buf[64*2 + 30];
-#endif
-    struct ar_giwscan_param *param;
-    A_CHAR *current_ev;
-    A_CHAR *end_buf;
-    struct ieee80211_common_ie  *cie;
-	struct iw_request_info info;
-
-	info.cmd = 0;
-	info.flags = 0;
-
-    param = (struct ar_giwscan_param *)arg;
-
-    if (param->current_ev >= param->end_buf) {
-        return;
-    }
-    if ((param->firstPass == TRUE) &&
-        ((ni->ni_cie.ie_wpa == NULL) && (ni->ni_cie.ie_rsn == NULL))) {
-        /*
-         * Only forward wpa bss's in first pass
-         */
-        return;
-    }
-
-     if ((param->firstPass == FALSE) &&
-        ((ni->ni_cie.ie_wpa != NULL) || (ni->ni_cie.ie_rsn != NULL))) {
-        /*
-         * Only forward non-wpa bss's in 2nd pass
-         */
-        return;
-    }
-
-    current_ev = param->current_ev;
-    end_buf = param->end_buf;
-
-    cie = &ni->ni_cie;
-
-    A_MEMZERO(&iwe, sizeof(iwe));
-    iwe.cmd = SIOCGIWAP;
-    iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
-    A_MEMCPY(iwe.u.ap_addr.sa_data, ni->ni_macaddr, 6);
-    current_ev = iwe_stream_add_event(&info, current_ev, end_buf, &iwe,
-                                      IW_EV_ADDR_LEN);
-
-    A_MEMZERO(&iwe, sizeof(iwe));
-    iwe.cmd = SIOCGIWESSID;
-    iwe.u.data.flags = 1;
-    iwe.u.data.length = cie->ie_ssid[1];
-    current_ev = iwe_stream_add_point(&info, current_ev, end_buf, &iwe,
-                                      &cie->ie_ssid[2]);
-
-    if (cie->ie_capInfo & (IEEE80211_CAPINFO_ESS|IEEE80211_CAPINFO_IBSS)) {
-        A_MEMZERO(&iwe, sizeof(iwe));
-        iwe.cmd = SIOCGIWMODE;
-        iwe.u.mode = cie->ie_capInfo & IEEE80211_CAPINFO_ESS ?
-                IW_MODE_MASTER : IW_MODE_ADHOC;
-        current_ev = iwe_stream_add_event(&info, current_ev, end_buf, &iwe,
-                                          IW_EV_UINT_LEN);
-    }
-
-    A_MEMZERO(&iwe, sizeof(iwe));
-    iwe.cmd = SIOCGIWFREQ;
-    iwe.u.freq.m = cie->ie_chan * 100000;
-    iwe.u.freq.e = 1;
-    current_ev = iwe_stream_add_event(&info, current_ev, end_buf, &iwe,
-                                      IW_EV_FREQ_LEN);
-
-    A_MEMZERO(&iwe, sizeof(iwe));
-    iwe.cmd = IWEVQUAL;
-    ar6000_set_quality(&iwe.u.qual, ni->ni_snr);
-    current_ev = iwe_stream_add_event(&info, current_ev, end_buf, &iwe,
-                                      IW_EV_QUAL_LEN);
-
-    A_MEMZERO(&iwe, sizeof(iwe));
-    iwe.cmd = SIOCGIWENCODE;
-    if (cie->ie_capInfo & IEEE80211_CAPINFO_PRIVACY) {
-        iwe.u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;
-    } else {
-        iwe.u.data.flags = IW_ENCODE_DISABLED;
-    }
-    iwe.u.data.length = 0;
-    current_ev = iwe_stream_add_point(&info, current_ev, end_buf, &iwe, "");
-
-    A_MEMZERO(&iwe, sizeof(iwe));
-    iwe.cmd = IWEVCUSTOM;
-    snprintf(buf, sizeof(buf), "bcn_int=%d", cie->ie_beaconInt);
-    iwe.u.data.length = strlen(buf);
-    current_ev = iwe_stream_add_point(&info, current_ev, end_buf, &iwe, buf);
-
-    if (cie->ie_wpa != NULL) {
-        static const char wpa_leader[] = "wpa_ie=";
-
-        A_MEMZERO(&iwe, sizeof(iwe));
-        iwe.cmd = IWEVCUSTOM;
-        iwe.u.data.length = encode_ie(buf, sizeof(buf), cie->ie_wpa,
-                                      cie->ie_wpa[1]+2,
-                                      wpa_leader, sizeof(wpa_leader)-1);
-
-        if (iwe.u.data.length != 0) {
-            current_ev = iwe_stream_add_point(&info, current_ev, end_buf, &iwe,
-									   buf);
-        }
-    }
-
-    if (cie->ie_rsn != NULL && cie->ie_rsn[0] == IEEE80211_ELEMID_RSN) {
-        static const char rsn_leader[] = "rsn_ie=";
-
-        A_MEMZERO(&iwe, sizeof(iwe));
-        iwe.cmd = IWEVCUSTOM;
-        iwe.u.data.length = encode_ie(buf, sizeof(buf), cie->ie_rsn,
-                                      cie->ie_rsn[1]+2,
-                                      rsn_leader, sizeof(rsn_leader)-1);
-
-        if (iwe.u.data.length != 0) {
-            current_ev = iwe_stream_add_point(&info, current_ev, end_buf, &iwe,
-									   buf);
-        }
-    }
-
-    if (cie->ie_wmm != NULL) {
-        static const char wmm_leader[] = "wmm_ie=";
-
-        A_MEMZERO(&iwe, sizeof(iwe));
-        iwe.cmd = IWEVCUSTOM;
-        iwe.u.data.length = encode_ie(buf, sizeof(buf), cie->ie_wmm,
-                                      cie->ie_wmm[1]+2,
-                                      wmm_leader, sizeof(wmm_leader)-1);
-        if (iwe.u.data.length != 0) {
-            current_ev = iwe_stream_add_point(&info, current_ev, end_buf, &iwe,
-									   buf);
-        }
-    }
-
-    if (cie->ie_ath != NULL) {
-        static const char ath_leader[] = "ath_ie=";
-
-        A_MEMZERO(&iwe, sizeof(iwe));
-        iwe.cmd = IWEVCUSTOM;
-        iwe.u.data.length = encode_ie(buf, sizeof(buf), cie->ie_ath,
-                                      cie->ie_ath[1]+2,
-                                      ath_leader, sizeof(ath_leader)-1);
-        if (iwe.u.data.length != 0) {
-            current_ev = iwe_stream_add_point(&info, current_ev, end_buf, &iwe,
-									   buf);
-        }
-    }
-
-    param->current_ev = current_ev;
-}
-
-int
-ar6000_ioctl_giwscan(struct net_device *dev,
-            struct iw_request_info *info,
-            struct iw_point *data, char *extra)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    struct ar_giwscan_param param;
-    int i;
-
-    if (ar->arWlanState == WLAN_DISABLED) {
-        return -EIO;
-    }
-
-    if (ar->arWmiReady == FALSE) {
-        return -EIO;
-    }
-
-    param.current_ev = extra;
-    param.end_buf = extra + IW_SCAN_MAX_DATA;
-    param.firstPass = TRUE;
-
-    /*
-     * Do two passes to insure WPA scan candidates
-     * are sorted to the front.  This is a hack to deal with
-     * the wireless extensions capping scan results at
-     * IW_SCAN_MAX_DATA bytes.  In densely populated environments
-     * it's easy to overflow this buffer (especially with WPA/RSN
-     * information elements).  Note this sorting hack does not
-     * guarantee we won't overflow anyway.
-     */
-    for (i = 0; i < 2; i++) {
-        /*
-         * Translate data to WE format.
-         */
-        wmi_iterate_nodes(ar->arWmi, ar6000_scan_node, &param);
-        param.firstPass = FALSE;
-        if (param.current_ev >= param.end_buf) {
-            data->length = param.current_ev - extra;
-            return -E2BIG;
-        }
-    }
-
-    data->length = param.current_ev - extra;
-    return 0;
-}
-
-extern int reconnect_flag;
-/* SIOCSIWESSID */
-static int
-ar6000_ioctl_siwessid(struct net_device *dev,
-                     struct iw_request_info *info,
-                     struct iw_point *data, char *ssid)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    A_STATUS status;
-    A_UINT8     arNetworkType;
-
-    if (ar->arWlanState == WLAN_DISABLED) {
-        return -EIO;
-    }
-
-    if (ar->arWmiReady == FALSE) {
-        return -EIO;
-    }
-
-    /*
-     * iwconfig passes a string with length excluding any trailing NUL.
-     * FIXME: we should be able to set an ESSID of 32 bytes, yet things fall
-     * over badly if we do. So we limit the ESSID to 31 bytes.
-     */
-    if (data->flags && (!data->length || data->length >= sizeof(ar->arSsid))) {
-        /*
-         * ssid is invalid
-         */
-        return -EINVAL;
-    }
-    /* Added for bug 25178, return an IOCTL error instead of target returning
-       Illegal parameter error when either the BSSID or channel is missing
-       and we cannot scan during connect.
-     */
-    if (data->flags) {
-        if (ar->arSkipScan == TRUE &&
-            (ar->arChannelHint == 0 ||
-             (!ar->arReqBssid[0] && !ar->arReqBssid[1] && !ar->arReqBssid[2] &&
-              !ar->arReqBssid[3] && !ar->arReqBssid[4] && !ar->arReqBssid[5])))
-        {
-            return -EINVAL;
-        }
-    }
-
-    if (down_interruptible(&ar->arSem)) {
-        return -ERESTARTSYS;
-    }
-
-    if (ar->arTxPending[WMI_CONTROL_PRI]) {
-        /*
-         * sleep until the command queue drains
-         */
-        wait_event_interruptible_timeout(arEvent,
-            ar->arTxPending[WMI_CONTROL_PRI] == 0, wmitimeout * HZ);
-        if (signal_pending(current)) {
-            return -EINTR;
-        }
-    }
-
-    if (!data->flags) {
-        arNetworkType = ar->arNetworkType;
-        ar6000_init_profile_info(ar);
-        ar->arNetworkType = arNetworkType;
-    }
-
-    /*
-     * The original logic here prevented a disconnect if issuing an "essid off"
-     * if no ESSID was set, presumably to prevent sending multiple disconnects
-     * to the WMI.
-     *
-     * Unfortunately, this also meant that no disconnect was sent when we were
-     * already connected, but the profile has been changed since (which also
-     * clears the ESSID as a reminder that the WMI needs updating.)
-     *
-     * The "1 ||" makes sure we always disconnect or reconnect. The WMI doesn't
-     * seem to mind being sent multiple disconnects.
-     */
-    if (1 || (ar->arSsidLen) || (!data->flags))
-    {
-        if ((!data->flags) ||
-            (A_MEMCMP(ar->arSsid, ssid, ar->arSsidLen) != 0) ||
-            (ar->arSsidLen != (data->length)))
-        {
-            /*
-             * SSID set previously or essid off has been issued.
-             *
-             * Disconnect Command is issued in two cases after wmi is ready
-             * (1) ssid is different from the previous setting
-             * (2) essid off has been issued
-             *
-             */
-            if (ar->arWmiReady == TRUE) {
-                reconnect_flag = 0;
-                status = wmi_disconnect_cmd(ar->arWmi);
-                A_MEMZERO(ar->arSsid, sizeof(ar->arSsid));
-                ar->arSsidLen = 0;
-                if (ar->arSkipScan == FALSE) {
-                    A_MEMZERO(ar->arReqBssid, sizeof(ar->arReqBssid));
-                }
-                if (!data->flags) {
-                    up(&ar->arSem);
-                    return 0;
-                }
-            } else {
-                 up(&ar->arSem);
-            }
-        }
-        else
-        {
-            /*
-             * SSID is same, so we assume profile hasn't changed.
-             * If the interface is up and wmi is ready, we issue
-             * a reconnect cmd. Issue a reconnect only we are already
-             * connected.
-             */
-            if((ar->arConnected == TRUE) && (ar->arWmiReady == TRUE))
-            {
-                reconnect_flag = TRUE;
-                status = wmi_reconnect_cmd(ar->arWmi,ar->arReqBssid,
-                                           ar->arChannelHint);
-                up(&ar->arSem);
-                if (status != A_OK) {
-                    return -EIO;
-                }
-                return 0;
-            }
-            else{
-                /*
-                 * Dont return if connect is pending.
-                 */
-                if(!(ar->arConnectPending)) {
-                    up(&ar->arSem);
-                    return 0;
-                }
-            }
-        }
-    }
-
-    ar->arSsidLen = data->length;
-    A_MEMCPY(ar->arSsid, ssid, ar->arSsidLen);
-
-    /* The ssid length check prevents second "essid off" from the user,
-       to be treated as a connect cmd. The second "essid off" is ignored.
-    */
-    if((ar->arWmiReady == TRUE) && (ar->arSsidLen > 0) )
-    {
-        AR6000_SPIN_LOCK(&ar->arLock, 0);
-        if (SHARED_AUTH == ar->arDot11AuthMode) {
-            ar6000_install_static_wep_keys(ar);
-        }
-        AR_DEBUG_PRINTF("Connect called with authmode %d dot11 auth %d"\
-                        " PW crypto %d PW crypto Len %d GRP crypto %d"\
-                        " GRP crypto Len %d\n",
-                        ar->arAuthMode, ar->arDot11AuthMode,
-                        ar->arPairwiseCrypto, ar->arPairwiseCryptoLen,
-                        ar->arGroupCrypto, ar->arGroupCryptoLen);
-        reconnect_flag = 0;
-        AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-        status = wmi_connect_cmd(ar->arWmi, ar->arNetworkType,
-                                 ar->arDot11AuthMode, ar->arAuthMode,
-                                 ar->arPairwiseCrypto, ar->arPairwiseCryptoLen,
-                                 ar->arGroupCrypto,ar->arGroupCryptoLen,
-                                 ar->arSsidLen, ar->arSsid,
-                                 ar->arReqBssid, ar->arChannelHint,
-                                 ar->arConnectCtrlFlags);
-
-
-        up(&ar->arSem);
-
-        if (status != A_OK) {
-            return -EIO;
-        }
-        ar->arConnectPending = TRUE;
-    }else{
-      up(&ar->arSem);
-    }
-    return 0;
-}
-
-/* SIOCGIWESSID */
-static int
-ar6000_ioctl_giwessid(struct net_device *dev,
-                     struct iw_request_info *info,
-                     struct iw_point *data, char *essid)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-
-    if (ar->arWlanState == WLAN_DISABLED) {
-        return -EIO;
-    }
-
-    data->flags = 1;
-    data->length = ar->arSsidLen;
-    A_MEMCPY(essid, ar->arSsid, ar->arSsidLen);
-
-    return 0;
-}
-
-
-void ar6000_install_static_wep_keys(AR_SOFTC_T *ar)
-{
-    A_UINT8 index;
-    A_UINT8 keyUsage;
-
-    for (index = WMI_MIN_KEY_INDEX; index <= WMI_MAX_KEY_INDEX; index++) {
-        if (ar->arWepKeyList[index].arKeyLen) {
-            keyUsage = GROUP_USAGE;
-            if (index == ar->arDefTxKeyIndex) {
-                keyUsage |= TX_USAGE;
-            }
-            wmi_addKey_cmd(ar->arWmi,
-                           index,
-                           WEP_CRYPT,
-                           keyUsage,
-                           ar->arWepKeyList[index].arKeyLen,
-                           NULL,
-                           ar->arWepKeyList[index].arKey, KEY_OP_INIT_VAL,
-                           NO_SYNC_WMIFLAG);
-        }
-    }
-}
-
-int
-ar6000_ioctl_delkey(struct net_device *dev, struct iw_request_info *info,
-             void *w, char *extra)
-{
-    return 0;
-}
-
-int
-ar6000_ioctl_setmlme(struct net_device *dev, struct iw_request_info *info,
-             void *w, char *extra)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    struct ieee80211req_mlme *mlme = (struct ieee80211req_mlme *)extra;
-
-    if ((ar->arWmiReady == FALSE) || (ar->arConnected != TRUE))
-		return -EIO;
-
-    switch (mlme->im_op) {
-        case IEEE80211_MLME_DISASSOC:
-        case IEEE80211_MLME_DEAUTH:
-            /* Not Supported */
-            break;
-        default:
-            break;
-    }
-    return 0;
-}
-
-
-int
-ar6000_ioctl_setwmmparams(struct net_device *dev, struct iw_request_info *info,
-             void *w, char *extra)
-{
-    return -EIO;            /* for now */
-}
-
-int
-ar6000_ioctl_getwmmparams(struct net_device *dev, struct iw_request_info *info,
-             void *w, char *extra)
-{
-    return -EIO;            /* for now */
-}
-
-int ar6000_ioctl_setoptie(struct net_device *dev, struct iw_request_info *info,
-			  struct iw_point *data, char *extra)
-{
-	/* The target generates the WPA/RSN IE */
-	return 0;
-}
-
-int
-ar6000_ioctl_setauthalg(struct net_device *dev, struct iw_request_info *info,
-             void *w, char *extra)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    struct ieee80211req_authalg *req = (struct ieee80211req_authalg *)extra;
-    int ret = 0;
-
-
-    AR6000_SPIN_LOCK(&ar->arLock, 0);
-
-    if (req->auth_alg == AUTH_ALG_OPEN_SYSTEM) {
-        ar->arDot11AuthMode  = OPEN_AUTH;
-    } else if (req->auth_alg == AUTH_ALG_LEAP) {
-        ar->arDot11AuthMode   = LEAP_AUTH;
-        ar->arPairwiseCrypto  = WEP_CRYPT;
-        ar->arGroupCrypto     = WEP_CRYPT;
-    } else {
-        ret = -EIO;
-    }
-
-    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-
-    return ret;
-}
-static int
-ar6000_ioctl_addpmkid(struct net_device *dev, struct iw_request_info *info,
-             void *w, char *extra)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    struct ieee80211req_addpmkid  *req = (struct ieee80211req_addpmkid *)extra;
-    A_STATUS status;
-
-    if (ar->arWlanState == WLAN_DISABLED) {
-        return -EIO;
-    }
-
-    AR_DEBUG_PRINTF("Add pmkid for %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x en=%d\n",
-                    req->pi_bssid[0], req->pi_bssid[1], req->pi_bssid[2],
-                    req->pi_bssid[3], req->pi_bssid[4], req->pi_bssid[5],
-                    req->pi_enable);
-
-    status = wmi_setPmkid_cmd(ar->arWmi, req->pi_bssid, req->pi_pmkid,
-                              req->pi_enable);
-
-    if (status != A_OK) {
-        return -EIO;
-    }
-
-    return 0;
-}
-
-/*
- * SIOCSIWRATE
- */
-int
-ar6000_ioctl_siwrate(struct net_device *dev,
-            struct iw_request_info *info,
-            struct iw_param *rrq, char *extra)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    A_UINT32  kbps;
-
-    if (rrq->fixed) {
-        kbps = rrq->value / 1000;           /* rrq->value is in bps */
-    } else {
-        kbps = -1;                          /* -1 indicates auto rate */
-    }
-    if(kbps != -1 && wmi_validate_bitrate(ar->arWmi, kbps) == A_EINVAL)
-    {
-        AR_DEBUG_PRINTF("BitRate is not Valid %d\n", kbps);
-        return -EINVAL;
-    }
-    ar->arBitRate = kbps;
-    if(ar->arWmiReady == TRUE)
-    {
-        if (wmi_set_bitrate_cmd(ar->arWmi, kbps) != A_OK) {
-            return -EINVAL;
-        }
-    }
-    return 0;
-}
-
-/*
- * SIOCGIWRATE
- */
-int
-ar6000_ioctl_giwrate(struct net_device *dev,
-            struct iw_request_info *info,
-            struct iw_param *rrq, char *extra)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    int ret = 0;
-
-    if (down_interruptible(&ar->arSem)) {
-        return -ERESTARTSYS;
-    }
-    if(ar->arWmiReady == TRUE)
-    {
-        ar->arBitRate = 0xFFFF;
-        if (wmi_get_bitrate_cmd(ar->arWmi) != A_OK) {
-            up(&ar->arSem);
-            return -EIO;
-        }
-        wait_event_interruptible_timeout(arEvent, ar->arBitRate != 0xFFFF, wmitimeout * HZ);
-        if (signal_pending(current)) {
-            ret = -EINTR;
-        }
-    }
-    /* If the interface is down or wmi is not ready or the target is not
-       connected - return the value stored in the device structure */
-    if (!ret) {
-        if (ar->arBitRate == -1) {
-            rrq->fixed = TRUE;
-            rrq->value = 0;
-        } else {
-            rrq->value = ar->arBitRate * 1000;
-        }
-    }
-
-    up(&ar->arSem);
-
-    return ret;
-}
-
-/*
- * SIOCSIWTXPOW
- */
-static int
-ar6000_ioctl_siwtxpow(struct net_device *dev,
-             struct iw_request_info *info,
-             struct iw_param *rrq, char *extra)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    A_UINT8 dbM;
-
-    if (ar->arWlanState == WLAN_DISABLED) {
-        return -EIO;
-    }
-
-    if (ar->arRadioSwitch == WLAN_ENABLED
-	&& rrq->disabled) {
-	    if (wmi_switch_radio(ar->arWmi, WLAN_DISABLED) < 0)
-		    return -EIO;
-	    ar->arRadioSwitch = WLAN_DISABLED;
-    } else if (ar->arRadioSwitch == WLAN_DISABLED
-	       && !rrq->disabled) {
-	    if (wmi_switch_radio(ar->arWmi, WLAN_ENABLED) < 0)
-		    return -EIO;
-	    ar->arRadioSwitch = WLAN_ENABLED;
-    }
-
-    if (rrq->fixed) {
-        if (rrq->flags != IW_TXPOW_DBM) {
-            return -EOPNOTSUPP;
-        }
-        ar->arTxPwr= dbM = rrq->value;
-        ar->arTxPwrSet = TRUE;
-    } else {
-        ar->arTxPwr = dbM = 0;
-        ar->arTxPwrSet = FALSE;
-    }
-    if(ar->arWmiReady == TRUE)
-    {
-        AR_DEBUG_PRINTF("Set tx pwr cmd %d dbM\n", dbM);
-        wmi_set_txPwr_cmd(ar->arWmi, dbM);
-    }
-    return 0;
-}
-
-/*
- * SIOCGIWTXPOW
- */
-int
-ar6000_ioctl_giwtxpow(struct net_device *dev,
-            struct iw_request_info *info,
-            struct iw_param *rrq, char *extra)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    int ret = 0;
-
-    if (ar->arWlanState == WLAN_DISABLED) {
-        return -EIO;
-    }
-
-    if (ar->arRadioSwitch == WLAN_DISABLED) {
-	    rrq->disabled = 1;
-	    return 0;
-    }
-
-    if (down_interruptible(&ar->arSem)) {
-        return -ERESTARTSYS;
-    }
-    if((ar->arWmiReady == TRUE) && (ar->arConnected == TRUE))
-    {
-        ar->arTxPwr = 0;
-
-        if (wmi_get_txPwr_cmd(ar->arWmi) != A_OK) {
-            up(&ar->arSem);
-            return -EIO;
-        }
-
-        wait_event_interruptible_timeout(arEvent, ar->arTxPwr != 0, wmitimeout * HZ);
-
-        if (signal_pending(current)) {
-            ret = -EINTR;
-         }
-    }
-   /* If the interace is down or wmi is not ready or target is not connected
-      then return value stored in the device structure */
-
-    if (!ret) {
-         if (ar->arTxPwrSet == TRUE) {
-            rrq->fixed = TRUE;
-        }
-        rrq->value = ar->arTxPwr;
-        rrq->flags = IW_TXPOW_DBM;
-    }
-
-    up(&ar->arSem);
-
-    return ret;
-}
-
-/*
- * SIOCSIWRETRY
- * since iwconfig only provides us with one max retry value, we use it
- * to apply to data frames of the BE traffic class.
- */
-static int
-ar6000_ioctl_siwretry(struct net_device *dev,
-             struct iw_request_info *info,
-             struct iw_param *rrq, char *extra)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-
-    if (ar->arWlanState == WLAN_DISABLED) {
-        return -EIO;
-    }
-
-    if (rrq->disabled) {
-        return -EOPNOTSUPP;
-    }
-
-    if ((rrq->flags & IW_RETRY_TYPE) != IW_RETRY_LIMIT) {
-        return -EOPNOTSUPP;
-    }
-
-    if ( !(rrq->value >= WMI_MIN_RETRIES) || !(rrq->value <= WMI_MAX_RETRIES)) {
-            return - EINVAL;
-    }
-    if(ar->arWmiReady == TRUE)
-    {
-        if (wmi_set_retry_limits_cmd(ar->arWmi, DATA_FRAMETYPE, WMM_AC_BE,
-                                     rrq->value, 0) != A_OK){
-            return -EINVAL;
-        }
-    }
-    ar->arMaxRetries = rrq->value;
-    return 0;
-}
-
-/*
- * SIOCGIWRETRY
- */
-static int
-ar6000_ioctl_giwretry(struct net_device *dev,
-             struct iw_request_info *info,
-             struct iw_param *rrq, char *extra)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-
-    if (ar->arWlanState == WLAN_DISABLED) {
-        return -EIO;
-    }
-
-    rrq->disabled = 0;
-    switch (rrq->flags & IW_RETRY_TYPE) {
-    case IW_RETRY_LIFETIME:
-        return -EOPNOTSUPP;
-        break;
-    case IW_RETRY_LIMIT:
-        rrq->flags = IW_RETRY_LIMIT;
-        switch (rrq->flags & IW_RETRY_MODIFIER) {
-        case IW_RETRY_MIN:
-            rrq->flags |= IW_RETRY_MIN;
-            rrq->value = WMI_MIN_RETRIES;
-            break;
-        case IW_RETRY_MAX:
-            rrq->flags |= IW_RETRY_MAX;
-            rrq->value = ar->arMaxRetries;
-            break;
-        }
-        break;
-    }
-    return 0;
-}
-
-/*
- * SIOCSIWENCODE
- */
-static int
-ar6000_ioctl_siwencode(struct net_device *dev,
-              struct iw_request_info *info,
-              struct iw_point *erq, char *keybuf)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    int index;
-    A_INT32 auth = ar->arDot11AuthMode;
-
-    if (ar->arWlanState == WLAN_DISABLED) {
-        return -EIO;
-    }
-
-    index = erq->flags & IW_ENCODE_INDEX;
-
-    if (index && (((index - 1) < WMI_MIN_KEY_INDEX) ||
-                  ((index - 1) > WMI_MAX_KEY_INDEX)))
-    {
-        return -EIO;
-    }
-
-    if (erq->flags & IW_ENCODE_DISABLED) {
-        /*
-         * Encryption disabled
-         */
-        if (index) {
-            /*
-             * If key index was specified then clear the specified key
-             */
-            index--;
-            A_MEMZERO(ar->arWepKeyList[index].arKey,
-                      sizeof(ar->arWepKeyList[index].arKey));
-            ar->arWepKeyList[index].arKeyLen = 0;
-        }
-        ar->arDot11AuthMode       = OPEN_AUTH;
-        ar->arPairwiseCrypto      = NONE_CRYPT;
-        ar->arGroupCrypto         = NONE_CRYPT;
-        ar->arAuthMode            = NONE_AUTH;
-    } else {
-        /*
-         * Enabling WEP encryption
-         */
-        if (index) {
-            index--;                /* keyindex is off base 1 in iwconfig */
-        }
-
-        if (erq->flags & IW_ENCODE_OPEN) {
-            auth = OPEN_AUTH;
-        } else if (erq->flags & IW_ENCODE_RESTRICTED) {
-            auth = SHARED_AUTH;
-        }
-
-        if (erq->length) {
-            if (!IEEE80211_IS_VALID_WEP_CIPHER_LEN(erq->length)) {
-                return -EIO;
-            }
-
-            A_MEMZERO(ar->arWepKeyList[index].arKey,
-                      sizeof(ar->arWepKeyList[index].arKey));
-            A_MEMCPY(ar->arWepKeyList[index].arKey, keybuf, erq->length);
-            ar->arWepKeyList[index].arKeyLen = erq->length;
-        } else {
-            if (ar->arWepKeyList[index].arKeyLen == 0) {
-                return -EIO;
-            }
-            ar->arDefTxKeyIndex = index;
-        }
-
-        ar->arPairwiseCrypto      = WEP_CRYPT;
-        ar->arGroupCrypto         = WEP_CRYPT;
-        ar->arDot11AuthMode       = auth;
-        ar->arAuthMode            = NONE_AUTH;
-    }
-
-    /*
-     * profile has changed.  Erase ssid to signal change
-     */
-    A_MEMZERO(ar->arSsid, sizeof(ar->arSsid));
-    ar->arSsidLen = 0;
-
-    return 0;
-}
-
-static int
-ar6000_ioctl_giwencode(struct net_device *dev,
-              struct iw_request_info *info,
-              struct iw_point *erq, char *key)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    A_UINT8 keyIndex;
-    struct ar_wep_key *wk;
-
-    if (ar->arWlanState == WLAN_DISABLED) {
-        return -EIO;
-    }
-
-    if (ar->arPairwiseCrypto == NONE_CRYPT) {
-        erq->length = 0;
-        erq->flags = IW_ENCODE_DISABLED;
-    } else {
-        /* get the keyIndex */
-        keyIndex = erq->flags & IW_ENCODE_INDEX;
-        if (0 == keyIndex) {
-            keyIndex = ar->arDefTxKeyIndex;
-        } else if ((keyIndex - 1 < WMI_MIN_KEY_INDEX) ||
-                   (keyIndex - 1 > WMI_MAX_KEY_INDEX))
-        {
-            keyIndex = WMI_MIN_KEY_INDEX;
-        } else {
-            keyIndex--;
-        }
-        erq->flags = keyIndex + 1;
-        erq->flags |= IW_ENCODE_ENABLED;
-        wk = &ar->arWepKeyList[keyIndex];
-        if (erq->length > wk->arKeyLen) {
-            erq->length = wk->arKeyLen;
-        }
-        if (wk->arKeyLen) {
-            A_MEMCPY(key, wk->arKey, erq->length);
-        }
-        if (ar->arDot11AuthMode == OPEN_AUTH) {
-            erq->flags |= IW_ENCODE_OPEN;
-        } else if (ar->arDot11AuthMode == SHARED_AUTH) {
-            erq->flags |= IW_ENCODE_RESTRICTED;
-        }
-    }
-
-    return 0;
-}
-
-static int ar6000_ioctl_siwpower(struct net_device *dev,
-				 struct iw_request_info *info,
-				 union iwreq_data *wrqu, char *extra)
-{
-	AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-	WMI_POWER_MODE power_mode;
-
-	if (wrqu->power.disabled)
-		power_mode = MAX_PERF_POWER;
-	else
-		power_mode = REC_POWER;
-
-	if (wmi_powermode_cmd(ar->arWmi, power_mode) < 0)
-		return -EIO;
-
-	return 0;
-}
-
-static int ar6000_ioctl_giwpower(struct net_device *dev,
-				 struct iw_request_info *info,
-				 union iwreq_data *wrqu, char *extra)
-{
-	AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-
-	/*
-	 * FIXME:
-	 * https://docs.openmoko.org/trac/ticket/2267
-	 * When starting wpa_supplicant the kernel oopses.
-	 * The following condition avoids the oops.
-	 * Remove this comment to bless this solution.
-	 */
-	if (ar->arWlanState == WLAN_DISABLED || ar->arWmiReady == FALSE)
-		return -EIO;
-
-	return wmi_get_power_mode_cmd(ar->arWmi);
-}
-
-static int ar6000_ioctl_siwgenie(struct net_device *dev,
-				 struct iw_request_info *info,
-				 struct iw_point *dwrq,
-				 char *extra)
-{
-	/* The target does that for us */
-	return 0;
-}
-
-static int ar6000_ioctl_giwgenie(struct net_device *dev,
-				 struct iw_request_info *info,
-				 struct iw_point *dwrq,
-				 char *extra)
-{
-	return 0;
-}
-
-static int ar6000_ioctl_siwauth(struct net_device *dev,
-				struct iw_request_info *info,
-				struct iw_param *param,
-				char *extra)
-{
-	AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-	int reset = 0;
-
-	switch (param->flags & IW_AUTH_INDEX) {
-	case IW_AUTH_WPA_VERSION:
-		if (param->value & IW_AUTH_WPA_VERSION_DISABLED) {
-			ar->arAuthMode = NONE_AUTH;
-		}
-		if (param->value & IW_AUTH_WPA_VERSION_WPA) {
-			ar->arAuthMode = WPA_AUTH;
-		}
-		if (param->value & IW_AUTH_WPA_VERSION_WPA2) {
-			ar->arAuthMode = WPA2_AUTH;
-		}
-
-		reset = 1;
-		break;
-	case IW_AUTH_CIPHER_PAIRWISE:
-		if (param->value & IW_AUTH_CIPHER_NONE) {
-			ar->arPairwiseCrypto = NONE_CRYPT;
-		}
-		if (param->value & IW_AUTH_CIPHER_WEP40) {
-			ar->arPairwiseCrypto = WEP_CRYPT;
-		}
-		if (param->value & IW_AUTH_CIPHER_TKIP) {
-			ar->arPairwiseCrypto = TKIP_CRYPT;
-		}
-		if (param->value & IW_AUTH_CIPHER_CCMP) {
-			ar->arPairwiseCrypto = AES_CRYPT;
-		}
-
-		reset = 1;
-		break;
-	case IW_AUTH_CIPHER_GROUP:
-		if (param->value & IW_AUTH_CIPHER_NONE) {
-			ar->arGroupCrypto = NONE_CRYPT;
-		}
-		if (param->value & IW_AUTH_CIPHER_WEP40) {
-			ar->arGroupCrypto = WEP_CRYPT;
-		}
-		if (param->value & IW_AUTH_CIPHER_TKIP) {
-			ar->arGroupCrypto = TKIP_CRYPT;
-		}
-		if (param->value & IW_AUTH_CIPHER_CCMP) {
-			ar->arGroupCrypto = AES_CRYPT;
-		}
-
-		reset = 1;
-		break;
-	case IW_AUTH_KEY_MGMT:
-		if (param->value & IW_AUTH_KEY_MGMT_PSK) {
-			if (ar->arAuthMode == WPA_AUTH) {
-				ar->arAuthMode = WPA_PSK_AUTH;
-			} else if (ar->arAuthMode == WPA2_AUTH) {
-				ar->arAuthMode = WPA2_PSK_AUTH;
-			}
-
-			reset = 1;
-		}
-		break;
-
-	case IW_AUTH_TKIP_COUNTERMEASURES:
-		if (ar->arWmiReady == FALSE) {
-			return -EIO;
-		}
-		wmi_set_tkip_countermeasures_cmd(ar->arWmi, param->value);
-		break;
-
-	case IW_AUTH_DROP_UNENCRYPTED:
-		break;
-
-	case IW_AUTH_80211_AUTH_ALG:
-		if (param->value & IW_AUTH_ALG_OPEN_SYSTEM) {
-			ar->arDot11AuthMode  = OPEN_AUTH;
-		}
-		if (param->value & IW_AUTH_ALG_SHARED_KEY) {
-			ar->arDot11AuthMode  = SHARED_AUTH;
-		}
-		if (param->value & IW_AUTH_ALG_LEAP) {
-			ar->arDot11AuthMode   = LEAP_AUTH;
-			ar->arPairwiseCrypto  = WEP_CRYPT;
-			ar->arGroupCrypto     = WEP_CRYPT;
-		}
-
-		reset = 1;
-		break;
-
-	case IW_AUTH_WPA_ENABLED:
-		reset = 1;
-		break;
-
-	case IW_AUTH_RX_UNENCRYPTED_EAPOL:
-		break;
-
-	case IW_AUTH_PRIVACY_INVOKED:
-		break;
-
-	default:
-		printk("%s(): Unknown flag 0x%x\n", __FUNCTION__, param->flags);
-		return -EOPNOTSUPP;
-	}
-
-	if (reset) {
-		A_MEMZERO(ar->arSsid, sizeof(ar->arSsid));
-		ar->arSsidLen = 0;
-	}
-
-	return 0;
-}
-
-static int ar6000_ioctl_giwauth(struct net_device *dev,
-				struct iw_request_info *info,
-				struct iw_param *dwrq,
-				char *extra)
-{
-	return 0;
-}
-
-static int ar6000_ioctl_siwencodeext(struct net_device *dev,
-				     struct iw_request_info *info,
-				     union iwreq_data *wrqu,
-				     char *extra)
-{
-	AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-	struct iw_point *encoding = &wrqu->encoding;
-	struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;
-	int alg = ext->alg, idx;
-
-	if (ar->arWlanState == WLAN_DISABLED) {
-		return -EIO;
-	}
-
-	/* Determine and validate the key index */
-	idx = (encoding->flags & IW_ENCODE_INDEX) - 1;
-	if (idx) {
-		if (idx < 0 || idx > 3)
-			return -EINVAL;
-	}
-
-	if ((alg == IW_ENCODE_ALG_TKIP) || (alg == IW_ENCODE_ALG_CCMP)) {
-		struct ieee80211req_key ik;
-		KEY_USAGE key_usage;
-		CRYPTO_TYPE key_type = NONE_CRYPT;
-		int status;
-
-		ar->user_saved_keys.keyOk = FALSE;
-
-		if (alg == IW_ENCODE_ALG_TKIP) {
-			key_type = TKIP_CRYPT;
-			ik.ik_type = IEEE80211_CIPHER_TKIP;
-		} else {
-			key_type = AES_CRYPT;
-			ik.ik_type = IEEE80211_CIPHER_AES_CCM;
-		}
-
-		ik.ik_keyix = idx;
-		ik.ik_keylen = ext->key_len;
-		ik.ik_flags = IEEE80211_KEY_RECV;
-		if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) {
-			ik.ik_flags |= IEEE80211_KEY_XMIT
-				| IEEE80211_KEY_DEFAULT;
-		}
-
-		if (ext->ext_flags & IW_ENCODE_EXT_RX_SEQ_VALID) {
-			memcpy(&ik.ik_keyrsc, ext->rx_seq, 8);
-		}
-
-		memcpy(ik.ik_keydata, ext->key, ext->key_len);
-
-		ar->user_saved_keys.keyType = key_type;
-		if (ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY) {
-			key_usage = GROUP_USAGE;
-			memset(ik.ik_macaddr, 0, ETH_ALEN);
-			memcpy(&ar->user_saved_keys.bcast_ik, &ik,
-			       sizeof(struct ieee80211req_key));
-		} else {
-			key_usage = PAIRWISE_USAGE;
-			memcpy(ik.ik_macaddr, ext->addr.sa_data, ETH_ALEN);
-			memcpy(&ar->user_saved_keys.ucast_ik, &ik,
-			       sizeof(struct ieee80211req_key));
-		}
-
-		status = wmi_addKey_cmd(ar->arWmi, ik.ik_keyix, key_type,
-					key_usage, ik.ik_keylen,
-					(A_UINT8 *)&ik.ik_keyrsc,
-					ik.ik_keydata,
-					KEY_OP_INIT_VAL, SYNC_BEFORE_WMIFLAG);
-
-		if (status < 0)
-			return -EIO;
-
-		ar->user_saved_keys.keyOk = TRUE;
-
-		return 0;
-
-	} else {
-		/* WEP falls back to SIWENCODE */
-		return -EOPNOTSUPP;
-	}
-
-	return 0;
-}
-
-
-static int ar6000_ioctl_giwencodeext(struct net_device *dev,
-				     struct iw_request_info *info,
-				     struct iw_point *dwrq,
-				     char *extra)
-{
-	return 0;
-}
-
-
-static int
-ar6000_ioctl_setparam(struct net_device *dev,
-                      struct iw_request_info *info,
-                      void *erq, char *extra)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    int *i = (int *)extra;
-    int param = i[0];
-    int value = i[1];
-    int ret = 0;
-    A_BOOL profChanged = FALSE;
-
-    if (ar->arWlanState == WLAN_DISABLED) {
-        return -EIO;
-    }
-
-    switch (param) {
-        case IEEE80211_PARAM_WPA:
-            switch (value) {
-                case WPA_MODE_WPA1:
-                    ar->arAuthMode = WPA_AUTH;
-                    profChanged    = TRUE;
-                    break;
-                case WPA_MODE_WPA2:
-                    ar->arAuthMode = WPA2_AUTH;
-                    profChanged    = TRUE;
-                    break;
-                case WPA_MODE_NONE:
-                    ar->arAuthMode = NONE_AUTH;
-                    profChanged    = TRUE;
-                    break;
-	    default:
-		    printk("IEEE80211_PARAM_WPA: Unknown value %d\n", value);
-            }
-            break;
-        case IEEE80211_PARAM_AUTHMODE:
-            switch(value) {
-                case IEEE80211_AUTH_WPA_PSK:
-                    if (WPA_AUTH == ar->arAuthMode) {
-                        ar->arAuthMode = WPA_PSK_AUTH;
-                        profChanged    = TRUE;
-                    } else if (WPA2_AUTH == ar->arAuthMode) {
-                        ar->arAuthMode = WPA2_PSK_AUTH;
-                        profChanged    = TRUE;
-                    } else {
-                        AR_DEBUG_PRINTF("Error -  Setting PSK mode when WPA "\
-                                        "param was set to %d\n",
-                                        ar->arAuthMode);
-                        ret = -1;
-                    }
-                    break;
-                case IEEE80211_AUTH_WPA_CCKM:
-                    if (WPA2_AUTH == ar->arAuthMode) {
-                        ar->arAuthMode = WPA2_AUTH_CCKM;
-                    } else {
-                        ar->arAuthMode = WPA_AUTH_CCKM;
-                    }
-                    break;
-                default:
-                    break;
-            }
-            break;
-        case IEEE80211_PARAM_UCASTCIPHER:
-            switch (value) {
-                case IEEE80211_CIPHER_AES_CCM:
-                    ar->arPairwiseCrypto = AES_CRYPT;
-                    profChanged          = TRUE;
-                    break;
-                case IEEE80211_CIPHER_TKIP:
-                    ar->arPairwiseCrypto = TKIP_CRYPT;
-                    profChanged          = TRUE;
-                    break;
-                case IEEE80211_CIPHER_WEP:
-                    ar->arPairwiseCrypto = WEP_CRYPT;
-                    profChanged          = TRUE;
-                    break;
-                case IEEE80211_CIPHER_NONE:
-                    ar->arPairwiseCrypto = NONE_CRYPT;
-                    profChanged          = TRUE;
-                    break;
-            }
-            break;
-        case IEEE80211_PARAM_UCASTKEYLEN:
-            if (!IEEE80211_IS_VALID_WEP_CIPHER_LEN(value)) {
-                ret = -EIO;
-            } else {
-                ar->arPairwiseCryptoLen = value;
-            }
-            break;
-        case IEEE80211_PARAM_MCASTCIPHER:
-            switch (value) {
-                case IEEE80211_CIPHER_AES_CCM:
-                    ar->arGroupCrypto = AES_CRYPT;
-                    profChanged       = TRUE;
-                    break;
-                case IEEE80211_CIPHER_TKIP:
-                    ar->arGroupCrypto = TKIP_CRYPT;
-                    profChanged       = TRUE;
-                    break;
-                case IEEE80211_CIPHER_WEP:
-                    ar->arGroupCrypto = WEP_CRYPT;
-                    profChanged       = TRUE;
-                    break;
-                case IEEE80211_CIPHER_NONE:
-                    ar->arGroupCrypto = NONE_CRYPT;
-                    profChanged       = TRUE;
-                    break;
-            }
-            break;
-        case IEEE80211_PARAM_MCASTKEYLEN:
-            if (!IEEE80211_IS_VALID_WEP_CIPHER_LEN(value)) {
-                ret = -EIO;
-            } else {
-                ar->arGroupCryptoLen = value;
-            }
-            break;
-        case IEEE80211_PARAM_COUNTERMEASURES:
-            if (ar->arWmiReady == FALSE) {
-                return -EIO;
-            }
-            wmi_set_tkip_countermeasures_cmd(ar->arWmi, value);
-            break;
-        default:
-            break;
-    }
-
-    if (profChanged == TRUE) {
-        /*
-         * profile has changed.  Erase ssid to signal change
-         */
-	A_MEMZERO(ar->arSsid, sizeof(ar->arSsid));
-	ar->arSsidLen = 0;
-    }
-
-    return ret;
-}
-
-int
-ar6000_ioctl_getparam(struct net_device *dev, struct iw_request_info *info,
-            void *w, char *extra)
-{
-    return -EIO;            /* for now */
-}
-
-int
-ar6000_ioctl_setkey(struct net_device *dev, struct iw_request_info *info,
-		    void *w, char *extra)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    struct ieee80211req_key *ik = (struct ieee80211req_key *)extra;
-    KEY_USAGE keyUsage;
-    A_STATUS status;
-    CRYPTO_TYPE keyType = NONE_CRYPT;
-
-    if (ar->arWlanState == WLAN_DISABLED) {
-        return -EIO;
-    }
-
-    ar->user_saved_keys.keyOk = FALSE;
-
-    if ( 0 == memcmp(ik->ik_macaddr, "\x00\x00\x00\x00\x00\x00",
-                     IEEE80211_ADDR_LEN)) {
-        keyUsage = GROUP_USAGE;
-        A_MEMCPY(&ar->user_saved_keys.bcast_ik, ik,
-                 sizeof(struct ieee80211req_key));
-    } else {
-        keyUsage = PAIRWISE_USAGE;
-        A_MEMCPY(&ar->user_saved_keys.ucast_ik, ik,
-                 sizeof(struct ieee80211req_key));
-    }
-
-    switch (ik->ik_type) {
-        case IEEE80211_CIPHER_WEP:
-            keyType = WEP_CRYPT;
-            break;
-        case IEEE80211_CIPHER_TKIP:
-            keyType = TKIP_CRYPT;
-            break;
-        case IEEE80211_CIPHER_AES_CCM:
-            keyType = AES_CRYPT;
-            break;
-        default:
-            break;
-    }
-    ar->user_saved_keys.keyType = keyType;
-
-    if (IEEE80211_CIPHER_CCKM_KRK != ik->ik_type) {
-        if (NONE_CRYPT == keyType) {
-            return -EIO;
-        }
-
-        status = wmi_addKey_cmd(ar->arWmi, ik->ik_keyix, keyType, keyUsage,
-                                ik->ik_keylen, (A_UINT8 *)&ik->ik_keyrsc,
-                                ik->ik_keydata, KEY_OP_INIT_VAL,
-                                SYNC_BEFORE_WMIFLAG);
-
-        if (status != A_OK) {
-            return -EIO;
-        }
-    } else {
-        status = wmi_add_krk_cmd(ar->arWmi, ik->ik_keydata);
-    }
-
-    ar->user_saved_keys.keyOk = TRUE;
-
-    return 0;
-}
-
-
-/*
- * SIOCGIWNAME
- */
-int
-ar6000_ioctl_giwname(struct net_device *dev,
-           struct iw_request_info *info,
-           char *name, char *extra)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-
-    if (ar->arWlanState == WLAN_DISABLED) {
-        return -EIO;
-    }
-
-    switch (ar->arPhyCapability) {
-    case (WMI_11A_CAPABILITY):
-        strncpy(name, "AR6000 802.11a", IFNAMSIZ);
-        break;
-    case (WMI_11G_CAPABILITY):
-        strncpy(name, "AR6000 802.11g", IFNAMSIZ);
-        break;
-    case (WMI_11AG_CAPABILITY):
-        strncpy(name, "AR6000 802.11ag", IFNAMSIZ);
-        break;
-    default:
-        strncpy(name, "AR6000 802.11", IFNAMSIZ);
-        break;
-    }
-
-    return 0;
-}
-
-/*
- * SIOCSIWFREQ
- */
-int
-ar6000_ioctl_siwfreq(struct net_device *dev,
-            struct iw_request_info *info,
-            struct iw_freq *freq, char *extra)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-
-    if (ar->arWlanState == WLAN_DISABLED) {
-        return -EIO;
-    }
-
-    /*
-     * We support limiting the channels via wmiconfig.
-     *
-     * We use this command to configure the channel hint for the connect cmd
-     * so it is possible the target will end up connecting to a different
-     * channel.
-     */
-    if (freq->e > 1) {
-        return -EINVAL;
-    } else if (freq->e == 1) {
-        ar->arChannelHint = freq->m / 100000;
-    } else {
-        ar->arChannelHint = wlan_ieee2freq(freq->m);
-    }
-
-    A_PRINTF("channel hint set to %d\n", ar->arChannelHint);
-    return 0;
-}
-
-/*
- * SIOCGIWFREQ
- */
-int
-ar6000_ioctl_giwfreq(struct net_device *dev,
-                struct iw_request_info *info,
-                struct iw_freq *freq, char *extra)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-
-    if (ar->arWlanState == WLAN_DISABLED) {
-        return -EIO;
-    }
-
-    if (ar->arConnected != TRUE) {
-        return -EINVAL;
-    }
-
-    freq->m = ar->arBssChannel * 100000;
-    freq->e = 1;
-
-    return 0;
-}
-
-/*
- * SIOCSIWMODE
- */
-int
-ar6000_ioctl_siwmode(struct net_device *dev,
-            struct iw_request_info *info,
-            __u32 *mode, char *extra)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-
-    if (ar->arWlanState == WLAN_DISABLED) {
-        return -EIO;
-    }
-
-    switch (*mode) {
-    case IW_MODE_INFRA:
-        ar->arNetworkType = INFRA_NETWORK;
-        break;
-    case IW_MODE_ADHOC:
-        ar->arNetworkType = ADHOC_NETWORK;
-        break;
-    default:
-        return -EINVAL;
-    }
-
-    return 0;
-}
-
-/*
- * SIOCGIWMODE
- */
-int
-ar6000_ioctl_giwmode(struct net_device *dev,
-            struct iw_request_info *info,
-            __u32 *mode, char *extra)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-
-    if (ar->arWlanState == WLAN_DISABLED) {
-        return -EIO;
-    }
-
-    switch (ar->arNetworkType) {
-    case INFRA_NETWORK:
-        *mode = IW_MODE_INFRA;
-        break;
-    case ADHOC_NETWORK:
-        *mode = IW_MODE_ADHOC;
-        break;
-    default:
-        return -EIO;
-    }
-    return 0;
-}
-
-/*
- * SIOCSIWSENS
- */
-int
-ar6000_ioctl_siwsens(struct net_device *dev,
-            struct iw_request_info *info,
-            struct iw_param *sens, char *extra)
-{
-    return 0;
-}
-
-/*
- * SIOCGIWSENS
- */
-int
-ar6000_ioctl_giwsens(struct net_device *dev,
-            struct iw_request_info *info,
-            struct iw_param *sens, char *extra)
-{
-    sens->value = 0;
-    sens->fixed = 1;
-
-    return 0;
-}
-
-/*
- * SIOCGIWRANGE
- */
-int
-ar6000_ioctl_giwrange(struct net_device *dev,
-             struct iw_request_info *info,
-             struct iw_point *data, char *extra)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    struct iw_range *range = (struct iw_range *) extra;
-    int i, ret = 0;
-
-    if (ar->arWmiReady == FALSE) {
-        return -EIO;
-    }
-
-    if (ar->arWlanState == WLAN_DISABLED) {
-        return -EIO;
-    }
-
-    if (down_interruptible(&ar->arSem)) {
-        return -ERESTARTSYS;
-    }
-    ar->arNumChannels = -1;
-    A_MEMZERO(ar->arChannelList, sizeof (ar->arChannelList));
-
-    if (wmi_get_channelList_cmd(ar->arWmi) != A_OK) {
-        up(&ar->arSem);
-        return -EIO;
-    }
-
-    wait_event_interruptible_timeout(arEvent, ar->arNumChannels != -1, wmitimeout * HZ);
-
-    if (signal_pending(current)) {
-        up(&ar->arSem);
-        return -EINTR;
-    }
-
-    data->length = sizeof(struct iw_range);
-    A_MEMZERO(range, sizeof(struct iw_range));
-
-    range->txpower_capa = IW_TXPOW_DBM;
-
-    range->min_pmp = 1 * 1024;
-    range->max_pmp = 65535 * 1024;
-    range->min_pmt = 1 * 1024;
-    range->max_pmt = 1000 * 1024;
-    range->pmp_flags = IW_POWER_PERIOD;
-    range->pmt_flags = IW_POWER_TIMEOUT;
-    range->pm_capa = 0;
-
-    range->we_version_compiled = WIRELESS_EXT;
-    range->we_version_source = 13;
-
-    range->retry_capa = IW_RETRY_LIMIT;
-    range->retry_flags = IW_RETRY_LIMIT;
-    range->min_retry = 0;
-    range->max_retry = 255;
-
-    range->num_frequency = range->num_channels = ar->arNumChannels;
-    for (i = 0; i < ar->arNumChannels; i++) {
-        range->freq[i].i = wlan_freq2ieee(ar->arChannelList[i]);
-        range->freq[i].m = ar->arChannelList[i] * 100000;
-        range->freq[i].e = 1;
-         /*
-         * Linux supports max of 32 channels, bail out once you
-         * reach the max.
-         */
-        if (i == IW_MAX_FREQUENCIES) {
-            break;
-        }
-    }
-
-    /* Max quality is max field value minus noise floor */
-    range->max_qual.qual  = 0xff - 161;
-
-    /*
-     * In order to use dBm measurements, 'level' must be lower
-     * than any possible measurement (see iw_print_stats() in
-     * wireless tools).  It's unclear how this is meant to be
-     * done, but setting zero in these values forces dBm and
-     * the actual numbers are not used.
-     */
-    range->max_qual.level = 0;
-    range->max_qual.noise = 0;
-
-    range->sensitivity = 3;
-
-    range->max_encoding_tokens = 4;
-    /* XXX query driver to find out supported key sizes */
-    range->num_encoding_sizes = 3;
-    range->encoding_size[0] = 5;        /* 40-bit */
-    range->encoding_size[1] = 13;       /* 104-bit */
-    range->encoding_size[2] = 16;       /* 128-bit */
-
-    range->num_bitrates = 0;
-
-    /* estimated maximum TCP throughput values (bps) */
-    range->throughput = 22000000;
-
-    range->min_rts = 0;
-    range->max_rts = 2347;
-    range->min_frag = 256;
-    range->max_frag = 2346;
-
-    up(&ar->arSem);
-
-    return ret;
-}
-
-
-/*
- * SIOCSIWAP
- * This ioctl is used to set the desired bssid for the connect command.
- */
-int
-ar6000_ioctl_siwap(struct net_device *dev,
-              struct iw_request_info *info,
-              struct sockaddr *ap_addr, char *extra)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-
-    if (ar->arWlanState == WLAN_DISABLED) {
-        return -EIO;
-    }
-
-    if (ap_addr->sa_family != ARPHRD_ETHER) {
-        return -EIO;
-    }
-
-    if (A_MEMCMP(&ap_addr->sa_data, bcast_mac, AR6000_ETH_ADDR_LEN) == 0) {
-        A_MEMZERO(ar->arReqBssid, sizeof(ar->arReqBssid));
-    } else {
-        A_MEMCPY(ar->arReqBssid, &ap_addr->sa_data,  sizeof(ar->arReqBssid));
-    }
-
-    return 0;
-}
-
-/*
- * SIOCGIWAP
- */
-int
-ar6000_ioctl_giwap(struct net_device *dev,
-              struct iw_request_info *info,
-              struct sockaddr *ap_addr, char *extra)
-{
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-
-    if (ar->arWlanState == WLAN_DISABLED) {
-        return -EIO;
-    }
-
-    if (ar->arConnected != TRUE) {
-        return -EINVAL;
-    }
-
-    A_MEMCPY(&ap_addr->sa_data, ar->arBssid, sizeof(ar->arBssid));
-    ap_addr->sa_family = ARPHRD_ETHER;
-
-    return 0;
-}
-
-/*
- * SIOCGIWAPLIST
- */
-int
-ar6000_ioctl_iwaplist(struct net_device *dev,
-            struct iw_request_info *info,
-            struct iw_point *data, char *extra)
-{
-    return -EIO;            /* for now */
-}
-
-/*
- * SIOCSIWSCAN
- */
-int
-ar6000_ioctl_siwscan(struct net_device *dev,
-                     struct iw_request_info *info,
-                     struct iw_point *data, char *extra)
-{
-#define ACT_DWELLTIME_DEFAULT   105
-#define HOME_TXDRAIN_TIME       100
-#define SCAN_INT                HOME_TXDRAIN_TIME + ACT_DWELLTIME_DEFAULT
-    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-    int ret = 0;
-
-    if (ar->arWmiReady == FALSE) {
-        return -EIO;
-    }
-
-    if (ar->arWlanState == WLAN_DISABLED) {
-        return -EIO;
-    }
-
-    /* We ask for everything from the target */
-    if (wmi_bssfilter_cmd(ar->arWmi, ALL_BSS_FILTER, 0) != A_OK) {
-	    printk("Couldn't set filtering\n");
-	    ret = -EIO;
-    }
-
-    if (wmi_startscan_cmd(ar->arWmi, WMI_LONG_SCAN, FALSE, FALSE, \
-                          HOME_TXDRAIN_TIME, SCAN_INT) != A_OK) {
-        ret = -EIO;
-    }
-
-    ar->scan_complete = 0;
-    wait_event_interruptible_timeout(ar6000_scan_queue, ar->scan_complete,
-				     5 * HZ);
-
-    if (wmi_bssfilter_cmd(ar->arWmi, NONE_BSS_FILTER, 0) != A_OK) {
-	    printk("Couldn't set filtering\n");
-	    ret = -EIO;
-    }
-
-    return ret;
-#undef  ACT_DWELLTIME_DEFAULT
-#undef HOME_TXDRAIN_TIME
-#undef SCAN_INT
-}
-
-
-/*
- * Units are in db above the noise floor. That means the
- * rssi values reported in the tx/rx descriptors in the
- * driver are the SNR expressed in db.
- *
- * If you assume that the noise floor is -95, which is an
- * excellent assumption 99.5 % of the time, then you can
- * derive the absolute signal level (i.e. -95 + rssi).
- * There are some other slight factors to take into account
- * depending on whether the rssi measurement is from 11b,
- * 11g, or 11a.   These differences are at most 2db and
- * can be documented.
- *
- * NB: various calculations are based on the orinoco/wavelan
- *     drivers for compatibility
- */
-static void
-ar6000_set_quality(struct iw_quality *iq, A_INT8 rssi)
-{
-    if (rssi < 0) {
-        iq->qual = 0;
-    } else {
-        iq->qual = rssi;
-    }
-
-    /* NB: max is 94 because noise is hardcoded to 161 */
-    if (iq->qual > 94)
-        iq->qual = 94;
-
-    iq->noise = 161;        /* -95dBm */
-    iq->level = iq->noise + iq->qual;
-    iq->updated = 7;
-}
-
-
-/* Structures to export the Wireless Handlers */
-static const iw_handler ath_handlers[] = {
-    (iw_handler) NULL,                          /* SIOCSIWCOMMIT */
-    (iw_handler) ar6000_ioctl_giwname,          /* SIOCGIWNAME */
-    (iw_handler) NULL,                          /* SIOCSIWNWID */
-    (iw_handler) NULL,                          /* SIOCGIWNWID */
-    (iw_handler) ar6000_ioctl_siwfreq,          /* SIOCSIWFREQ */
-    (iw_handler) ar6000_ioctl_giwfreq,          /* SIOCGIWFREQ */
-    (iw_handler) ar6000_ioctl_siwmode,          /* SIOCSIWMODE */
-    (iw_handler) ar6000_ioctl_giwmode,          /* SIOCGIWMODE */
-    (iw_handler) ar6000_ioctl_siwsens,          /* SIOCSIWSENS */
-    (iw_handler) ar6000_ioctl_giwsens,          /* SIOCGIWSENS */
-    (iw_handler) NULL /* not _used */,          /* SIOCSIWRANGE */
-    (iw_handler) ar6000_ioctl_giwrange,         /* SIOCGIWRANGE */
-    (iw_handler) NULL /* not used */,           /* SIOCSIWPRIV */
-    (iw_handler) NULL /* kernel code */,        /* SIOCGIWPRIV */
-    (iw_handler) NULL /* not used */,           /* SIOCSIWSTATS */
-    (iw_handler) NULL /* kernel code */,        /* SIOCGIWSTATS */
-    (iw_handler) NULL,                          /* SIOCSIWSPY */
-    (iw_handler) NULL,                          /* SIOCGIWSPY */
-    (iw_handler) NULL,                          /* SIOCSIWTHRSPY */
-    (iw_handler) NULL,                          /* SIOCGIWTHRSPY */
-    (iw_handler) ar6000_ioctl_siwap,            /* SIOCSIWAP */
-    (iw_handler) ar6000_ioctl_giwap,            /* SIOCGIWAP */
-    (iw_handler) NULL,                          /* -- hole -- */
-    (iw_handler) ar6000_ioctl_iwaplist,         /* SIOCGIWAPLIST */
-    (iw_handler) ar6000_ioctl_siwscan,          /* SIOCSIWSCAN */
-    (iw_handler) ar6000_ioctl_giwscan,          /* SIOCGIWSCAN */
-    (iw_handler) ar6000_ioctl_siwessid,         /* SIOCSIWESSID */
-    (iw_handler) ar6000_ioctl_giwessid,         /* SIOCGIWESSID */
-    (iw_handler) NULL,                          /* SIOCSIWNICKN */
-    (iw_handler) NULL,                          /* SIOCGIWNICKN */
-    (iw_handler) NULL,                          /* -- hole -- */
-    (iw_handler) NULL,                          /* -- hole -- */
-    (iw_handler) ar6000_ioctl_siwrate,          /* SIOCSIWRATE */
-    (iw_handler) ar6000_ioctl_giwrate,          /* SIOCGIWRATE */
-    (iw_handler) NULL,           /* SIOCSIWRTS */
-    (iw_handler) NULL,           /* SIOCGIWRTS */
-    (iw_handler) NULL,          /* SIOCSIWFRAG */
-    (iw_handler) NULL,          /* SIOCGIWFRAG */
-    (iw_handler) ar6000_ioctl_siwtxpow,         /* SIOCSIWTXPOW */
-    (iw_handler) ar6000_ioctl_giwtxpow,         /* SIOCGIWTXPOW */
-    (iw_handler) ar6000_ioctl_siwretry,         /* SIOCSIWRETRY */
-    (iw_handler) ar6000_ioctl_giwretry,         /* SIOCGIWRETRY */
-    (iw_handler) ar6000_ioctl_siwencode,        /* SIOCSIWENCODE */
-    (iw_handler) ar6000_ioctl_giwencode,        /* SIOCGIWENCODE */
-    (iw_handler) ar6000_ioctl_siwpower,         /* SIOCSIWPOWER */
-    (iw_handler) ar6000_ioctl_giwpower,         /* SIOCGIWPOWER */
-    (iw_handler) NULL,	/* -- hole -- */
-    (iw_handler) NULL,	/* -- hole -- */
-    (iw_handler) ar6000_ioctl_siwgenie,	/* SIOCSIWGENIE */
-    (iw_handler) ar6000_ioctl_giwgenie,	/* SIOCGIWGENIE */
-    (iw_handler) ar6000_ioctl_siwauth,	/* SIOCSIWAUTH */
-    (iw_handler) ar6000_ioctl_giwauth,	/* SIOCGIWAUTH */
-    (iw_handler) ar6000_ioctl_siwencodeext,/* SIOCSIWENCODEEXT */
-    (iw_handler) ar6000_ioctl_giwencodeext,/* SIOCGIWENCODEEXT */
-    (iw_handler) NULL,		/* SIOCSIWPMKSA */
-};
-
-static const iw_handler ath_priv_handlers[] = {
-    (iw_handler) ar6000_ioctl_setparam,         /* SIOCWFIRSTPRIV+0 */
-    (iw_handler) ar6000_ioctl_getparam,         /* SIOCWFIRSTPRIV+1 */
-    (iw_handler) ar6000_ioctl_setkey,           /* SIOCWFIRSTPRIV+2 */
-    (iw_handler) ar6000_ioctl_setwmmparams,     /* SIOCWFIRSTPRIV+3 */
-    (iw_handler) ar6000_ioctl_delkey,           /* SIOCWFIRSTPRIV+4 */
-    (iw_handler) ar6000_ioctl_getwmmparams,     /* SIOCWFIRSTPRIV+5 */
-    (iw_handler) ar6000_ioctl_setoptie,         /* SIOCWFIRSTPRIV+6 */
-    (iw_handler) ar6000_ioctl_setmlme,          /* SIOCWFIRSTPRIV+7 */
-    (iw_handler) ar6000_ioctl_addpmkid,         /* SIOCWFIRSTPRIV+8 */
-};
-
-#define IW_PRIV_TYPE_KEY \
-    (IW_PRIV_TYPE_BYTE | sizeof(struct ieee80211req_key))
-#define IW_PRIV_TYPE_DELKEY \
-    (IW_PRIV_TYPE_BYTE | sizeof(struct ieee80211req_del_key))
-#define IW_PRIV_TYPE_MLME \
-    (IW_PRIV_TYPE_BYTE | sizeof(struct ieee80211req_mlme))
-#define IW_PRIV_TYPE_ADDPMKID \
-    (IW_PRIV_TYPE_BYTE | sizeof(struct ieee80211req_addpmkid))
-
-static const struct iw_priv_args ar6000_priv_args[] = {
-    { IEEE80211_IOCTL_SETKEY,
-      IW_PRIV_TYPE_KEY | IW_PRIV_SIZE_FIXED, 0,       "setkey"},
-    { IEEE80211_IOCTL_DELKEY,
-      IW_PRIV_TYPE_DELKEY | IW_PRIV_SIZE_FIXED, 0,    "delkey"},
-    { IEEE80211_IOCTL_SETPARAM,
-      IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 2, 0,   "setparam"},
-    { IEEE80211_IOCTL_GETPARAM,
-      IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-      IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,      "getparam"},
-    { IEEE80211_IOCTL_SETWMMPARAMS,
-      IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 4, 0,   "setwmmparams"},
-    { IEEE80211_IOCTL_GETWMMPARAMS,
-      IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 3,
-      IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,      "getwmmparams"},
-    { IEEE80211_IOCTL_SETOPTIE,
-      IW_PRIV_TYPE_BYTE, 0,       "setie"},
-    { IEEE80211_IOCTL_SETMLME,
-      IW_PRIV_TYPE_MLME, 0,       "setmlme"},
-    { IEEE80211_IOCTL_ADDPMKID,
-      IW_PRIV_TYPE_ADDPMKID | IW_PRIV_SIZE_FIXED, 0,  "addpmkid"},
-};
-
-void ar6000_ioctl_iwsetup(struct iw_handler_def *def)
-{
-    def->private_args = (struct iw_priv_args *)ar6000_priv_args;
-    def->num_private_args = ARRAY_SIZE(ar6000_priv_args);
-}
-
-struct iw_handler_def ath_iw_handler_def = {
-    .standard         = (iw_handler *)ath_handlers,
-    .num_standard     = ARRAY_SIZE(ath_handlers),
-    .private          = (iw_handler *)ath_priv_handlers,
-    .num_private      = ARRAY_SIZE(ath_priv_handlers),
-};
-
-
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/bmi/bmi.c b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/bmi/bmi.c
deleted file mode 100644
index d7b610c15..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/bmi/bmi.c
+++ /dev/null
@@ -1,657 +0,0 @@
-/*
- * Copyright (c) 2004-2007 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#include "hif.h"
-#include "bmi.h"
-#include "htc_api.h"
-#include "bmi_internal.h"
-
-/*
-Although we had envisioned BMI to run on top of HTC, this is not what the
-final implementation boiled down to on dragon. Its a part of BSP and does
-not use the HTC protocol either. On the host side, however, we were still
-living with the original idea. I think the time has come to accept the truth
-and separate it from HTC which has been carrying BMI's burden all this while.
-It shall make HTC state machine relatively simpler
-*/
-
-/* APIs visible to the driver */
-void
-BMIInit(void)
-{
-    bmiDone = FALSE;
-}
-
-A_STATUS
-BMIDone(HIF_DEVICE *device)
-{
-    A_STATUS status;
-    A_UINT32 cid;
-
-    if (bmiDone) {
-        AR_DEBUG_PRINTF (ATH_DEBUG_BMI, ("BMIDone skipped\n"));
-        return A_OK;
-    }
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Done: Enter (device: 0x%p)\n", device));
-    bmiDone = TRUE;
-    cid = BMI_DONE;
-
-    status = bmiBufferSend(device, (A_UCHAR *)&cid, sizeof(cid));
-    if (status != A_OK) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
-        return A_ERROR;
-    }
-    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Done: Exit\n"));
-
-    return A_OK;
-}
-
-A_STATUS
-BMIGetTargetInfo(HIF_DEVICE *device, struct bmi_target_info *targ_info)
-{
-    A_STATUS status;
-    A_UINT32 cid;
-
-    if (bmiDone) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Command disallowed\n"));
-        return A_ERROR;
-    }
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Get Target Info: Enter (device: 0x%p)\n", device));
-    cid = BMI_GET_TARGET_INFO;
-
-    status = bmiBufferSend(device, (A_UCHAR *)&cid, sizeof(cid));
-    if (status != A_OK) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
-        return A_ERROR;
-    }
-
-    status = bmiBufferReceive(device, (A_UCHAR *)&targ_info->target_ver,
-                                                sizeof(targ_info->target_ver));
-    if (status != A_OK) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read Target Version from the device\n"));
-        return A_ERROR;
-    }
-
-    if (targ_info->target_ver == TARGET_VERSION_SENTINAL) {
-        /* Determine how many bytes are in the Target's targ_info */
-        status = bmiBufferReceive(device, (A_UCHAR *)&targ_info->target_info_byte_count,
-                                            sizeof(targ_info->target_info_byte_count));
-        if (status != A_OK) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read Target Info Byte Count from the device\n"));
-            return A_ERROR;
-        }
-
-        /*
-         * The Target's targ_info doesn't match the Host's targ_info.
-         * We need to do some backwards compatibility work to make this OK.
-         */
-        A_ASSERT(targ_info->target_info_byte_count == sizeof(*targ_info));
-
-        /* Read the remainder of the targ_info */
-        status = bmiBufferReceive(device,
-                        ((A_UCHAR *)targ_info)+sizeof(targ_info->target_info_byte_count),
-                        sizeof(*targ_info)-sizeof(targ_info->target_info_byte_count));
-        if (status != A_OK) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read Target Info (%d bytes) from the device\n",
-                        					targ_info->target_info_byte_count));
-            return A_ERROR;
-        }
-    } else {
-        /*
-         * Target must be an AR6001 whose firmware does not
-         * support BMI_GET_TARGET_INFO.  Construct the data
-         * that it would have sent.
-         */
-        targ_info->target_info_byte_count = sizeof(targ_info);
-        targ_info->target_type = TARGET_TYPE_AR6001;
-    }
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Get Target Info: Exit (ver: 0x%x type: 0x%x)\n",
-        							targ_info->target_ver, targ_info->target_type));
-    printk("BMI Get Target Info: Exit (ver: 0x%x type: 0x%x)\n",
-	   targ_info->target_ver, targ_info->target_type);
-
-    return A_OK;
-}
-
-A_STATUS
-BMIReadMemory(HIF_DEVICE *device,
-              A_UINT32 address,
-              A_UCHAR *buffer,
-              A_UINT32 length)
-{
-    A_UINT32 cid;
-    A_STATUS status;
-    A_UINT32 offset;
-    A_UINT32 remaining, rxlen;
-    static A_UCHAR data[BMI_DATASZ_MAX + sizeof(cid) + sizeof(address) + sizeof(length)];
-    memset (&data, 0, BMI_DATASZ_MAX + sizeof(cid) + sizeof(address) + sizeof(length));
-
-    if (bmiDone) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Command disallowed\n"));
-        return A_ERROR;
-    }
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_BMI,
-       			("BMI Read Memory: Enter (device: 0x%p, address: 0x%x, length: %d)\n",
-        			device, address, length));
-
-    cid = BMI_READ_MEMORY;
-
-    remaining = length;
-
-    while (remaining)
-    {
-        rxlen = (remaining < BMI_DATASZ_MAX) ? remaining : BMI_DATASZ_MAX;
-        offset = 0;
-        A_MEMCPY(&data[offset], &cid, sizeof(cid));
-        offset += sizeof(cid);
-        A_MEMCPY(&data[offset], &address, sizeof(address));
-        offset += sizeof(address);
-        A_MEMCPY(&data[offset], &rxlen, sizeof(rxlen));
-        offset += sizeof(length);
-
-        status = bmiBufferSend(device, data, offset);
-        if (status != A_OK) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
-            return A_ERROR;
-        }
-        status = bmiBufferReceive(device, data, rxlen);
-        if (status != A_OK) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read from the device\n"));
-            return A_ERROR;
-        }
-        A_MEMCPY(&buffer[length - remaining], data, rxlen);
-        remaining -= rxlen; address += rxlen;
-    }
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Read Memory: Exit\n"));
-    return A_OK;
-}
-
-A_STATUS
-BMIWriteMemory(HIF_DEVICE *device,
-               A_UINT32 address,
-               A_UCHAR *buffer,
-               A_UINT32 length)
-{
-    A_UINT32 cid;
-    A_STATUS status;
-    A_UINT32 offset;
-    A_UINT32 remaining, txlen;
-    const A_UINT32 header = sizeof(cid) + sizeof(address) + sizeof(length);
-    static A_UCHAR data[BMI_DATASZ_MAX + sizeof(cid) + sizeof(address) + sizeof(length)];
-	memset (&data, 0, header);
-
-    if (bmiDone) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Command disallowed\n"));
-        return A_ERROR;
-    }
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_BMI,
-         ("BMI Write Memory: Enter (device: 0x%p, address: 0x%x, length: %d)\n",
-         device, address, length));
-
-    cid = BMI_WRITE_MEMORY;
-
-    remaining = length;
-    while (remaining)
-    {
-        txlen = (remaining < (BMI_DATASZ_MAX - header)) ?
-                                       remaining : (BMI_DATASZ_MAX - header);
-        offset = 0;
-        A_MEMCPY(&data[offset], &cid, sizeof(cid));
-        offset += sizeof(cid);
-        A_MEMCPY(&data[offset], &address, sizeof(address));
-        offset += sizeof(address);
-        A_MEMCPY(&data[offset], &txlen, sizeof(txlen));
-        offset += sizeof(txlen);
-        A_MEMCPY(&data[offset], &buffer[length - remaining], txlen);
-        offset += txlen;
-        status = bmiBufferSend(device, data, offset);
-        if (status != A_OK) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
-            return A_ERROR;
-        }
-        remaining -= txlen; address += txlen;
-    }
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Write Memory: Exit\n"));
-
-    return A_OK;
-}
-
-A_STATUS
-BMIExecute(HIF_DEVICE *device,
-           A_UINT32 address,
-           A_UINT32 *param)
-{
-    A_UINT32 cid;
-    A_STATUS status;
-    A_UINT32 offset;
-    static A_UCHAR data[sizeof(cid) + sizeof(address) + sizeof(*param)];
-    memset (&data, 0, sizeof(cid) + sizeof(address) + sizeof(*param));
-
-    if (bmiDone) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Command disallowed\n"));
-        return A_ERROR;
-    }
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_BMI,
-       ("BMI Execute: Enter (device: 0x%p, address: 0x%x, param: %d)\n",
-        device, address, *param));
-
-    cid = BMI_EXECUTE;
-
-    offset = 0;
-    A_MEMCPY(&data[offset], &cid, sizeof(cid));
-    offset += sizeof(cid);
-    A_MEMCPY(&data[offset], &address, sizeof(address));
-    offset += sizeof(address);
-    A_MEMCPY(&data[offset], param, sizeof(*param));
-    offset += sizeof(*param);
-    status = bmiBufferSend(device, data, offset);
-    if (status != A_OK) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
-        return A_ERROR;
-    }
-
-    status = bmiBufferReceive(device, data, sizeof(*param));
-    if (status != A_OK) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read from the device\n"));
-        return A_ERROR;
-    }
-
-    A_MEMCPY(param, data, sizeof(*param));
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Execute: Exit (param: %d)\n", *param));
-    return A_OK;
-}
-
-A_STATUS
-BMISetAppStart(HIF_DEVICE *device,
-               A_UINT32 address)
-{
-    A_UINT32 cid;
-    A_STATUS status;
-    A_UINT32 offset;
-    static A_UCHAR data[sizeof(cid) + sizeof(address)];
-    memset (&data, 0, sizeof(cid) + sizeof(address));
-
-    if (bmiDone) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Command disallowed\n"));
-        return A_ERROR;
-    }
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_BMI,
-       ("BMI Set App Start: Enter (device: 0x%p, address: 0x%x)\n",
-        device, address));
-
-    cid = BMI_SET_APP_START;
-
-    offset = 0;
-    A_MEMCPY(&data[offset], &cid, sizeof(cid));
-    offset += sizeof(cid);
-    A_MEMCPY(&data[offset], &address, sizeof(address));
-    offset += sizeof(address);
-    status = bmiBufferSend(device, data, offset);
-    if (status != A_OK) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
-        return A_ERROR;
-    }
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Set App Start: Exit\n"));
-    return A_OK;
-}
-
-A_STATUS
-BMIReadSOCRegister(HIF_DEVICE *device,
-                   A_UINT32 address,
-                   A_UINT32 *param)
-{
-    A_UINT32 cid;
-    A_STATUS status;
-    A_UINT32 offset;
-    static A_UCHAR data[sizeof(cid) + sizeof(address)];
-    memset (&data, 0, sizeof(cid) + sizeof(address));
-
-    if (bmiDone) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Command disallowed\n"));
-        return A_ERROR;
-    }
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_BMI,
-       ("BMI Read SOC Register: Enter (device: 0x%p, address: 0x%x)\n",
-       device, address));
-
-    cid = BMI_READ_SOC_REGISTER;
-
-    offset = 0;
-    A_MEMCPY(&data[offset], &cid, sizeof(cid));
-    offset += sizeof(cid);
-    A_MEMCPY(&data[offset], &address, sizeof(address));
-    offset += sizeof(address);
-
-    status = bmiBufferSend(device, data, offset);
-    if (status != A_OK) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
-        return A_ERROR;
-    }
-
-    status = bmiBufferReceive(device, data, sizeof(*param));
-    if (status != A_OK) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read from the device\n"));
-        return A_ERROR;
-    }
-    A_MEMCPY(param, data, sizeof(*param));
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Read SOC Register: Exit (value: %d)\n", *param));
-    return A_OK;
-}
-
-A_STATUS
-BMIWriteSOCRegister(HIF_DEVICE *device,
-                    A_UINT32 address,
-                    A_UINT32 param)
-{
-    A_UINT32 cid;
-    A_STATUS status;
-    A_UINT32 offset;
-    static A_UCHAR data[sizeof(cid) + sizeof(address) + sizeof(param)];
-
-    memset (&data, 0, sizeof(cid) + sizeof(address) + sizeof(param));
-
-    if (bmiDone) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Command disallowed\n"));
-        return A_ERROR;
-    }
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_BMI,
-     ("BMI Write SOC Register: Enter (device: 0x%p, address: 0x%x, param: %d)\n",
-     device, address, param));
-
-    cid = BMI_WRITE_SOC_REGISTER;
-
-    offset = 0;
-    A_MEMCPY(&data[offset], &cid, sizeof(cid));
-    offset += sizeof(cid);
-    A_MEMCPY(&data[offset], &address, sizeof(address));
-    offset += sizeof(address);
-    A_MEMCPY(&data[offset], &param, sizeof(param));
-    offset += sizeof(param);
-    status = bmiBufferSend(device, data, offset);
-    if (status != A_OK) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
-        return A_ERROR;
-    }
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Read SOC Register: Exit\n"));
-    return A_OK;
-}
-
-A_STATUS
-BMIrompatchInstall(HIF_DEVICE *device,
-                   A_UINT32 ROM_addr,
-                   A_UINT32 RAM_addr,
-                   A_UINT32 nbytes,
-                   A_UINT32 do_activate,
-                   A_UINT32 *rompatch_id)
-{
-    A_UINT32 cid;
-    A_STATUS status;
-    A_UINT32 offset;
-    static A_UCHAR data[sizeof(cid) + sizeof(ROM_addr) + sizeof(RAM_addr) +
-                                sizeof(nbytes) + sizeof(do_activate)];
-
-	memset (&data, 0, sizeof(cid) + sizeof(ROM_addr) + sizeof(RAM_addr) +
-                      sizeof(nbytes) + sizeof(do_activate));
-
-    if (bmiDone) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Command disallowed\n"));
-        return A_ERROR;
-    }
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_BMI,
-         ("BMI rompatch Install: Enter (device: 0x%p, ROMaddr: 0x%x, RAMaddr: 0x%x length: %d activate: %d)\n",
-         device, ROM_addr, RAM_addr, nbytes, do_activate));
-
-    cid = BMI_ROMPATCH_INSTALL;
-
-    offset = 0;
-    A_MEMCPY(&data[offset], &cid, sizeof(cid));
-    offset += sizeof(cid);
-    A_MEMCPY(&data[offset], &ROM_addr, sizeof(ROM_addr));
-    offset += sizeof(ROM_addr);
-    A_MEMCPY(&data[offset], &RAM_addr, sizeof(RAM_addr));
-    offset += sizeof(RAM_addr);
-    A_MEMCPY(&data[offset], &nbytes, sizeof(nbytes));
-    offset += sizeof(nbytes);
-    A_MEMCPY(&data[offset], &do_activate, sizeof(do_activate));
-    offset += sizeof(do_activate);
-    status = bmiBufferSend(device, data, offset);
-    if (status != A_OK) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
-        return A_ERROR;
-    }
-
-    status = bmiBufferReceive(device, (A_UCHAR *)rompatch_id, sizeof(*rompatch_id));
-    if (status != A_OK) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read from the device\n"));
-        return A_ERROR;
-    }
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI rompatch Install: (rompatch_id=%d)\n", *rompatch_id));
-    return A_OK;
-}
-
-A_STATUS
-BMIrompatchUninstall(HIF_DEVICE *device,
-                     A_UINT32 rompatch_id)
-{
-    A_UINT32 cid;
-    A_STATUS status;
-    A_UINT32 offset;
-    static A_UCHAR data[sizeof(cid) + sizeof(rompatch_id)];
-    memset (&data, 0, sizeof(cid) + sizeof(rompatch_id));
-
-    if (bmiDone) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Command disallowed\n"));
-        return A_ERROR;
-    }
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_BMI,
-         ("BMI rompatch Uninstall: Enter (device: 0x%p, rompatch_id: %d)\n",
-         								 device, rompatch_id));
-
-    cid = BMI_ROMPATCH_UNINSTALL;
-
-    offset = 0;
-    A_MEMCPY(&data[offset], &cid, sizeof(cid));
-    offset += sizeof(cid);
-    A_MEMCPY(&data[offset], &rompatch_id, sizeof(rompatch_id));
-    offset += sizeof(rompatch_id);
-    status = bmiBufferSend(device, data, offset);
-    if (status != A_OK) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
-        return A_ERROR;
-    }
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI rompatch UNinstall: (rompatch_id=0x%x)\n", rompatch_id));
-    return A_OK;
-}
-
-static A_STATUS
-_BMIrompatchChangeActivation(HIF_DEVICE *device,
-                             A_UINT32 rompatch_count,
-                             A_UINT32 *rompatch_list,
-                             A_UINT32 do_activate)
-{
-    A_UINT32 cid;
-    A_STATUS status;
-    A_UINT32 offset;
-    static A_UCHAR data[BMI_DATASZ_MAX + sizeof(cid) + sizeof(rompatch_count)];
-    A_UINT32 length;
-
-	memset (&data, 0, BMI_DATASZ_MAX + sizeof(cid) + sizeof(rompatch_count));
-
-    if (bmiDone) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Command disallowed\n"));
-        return A_ERROR;
-    }
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_BMI,
-         ("BMI Change rompatch Activation: Enter (device: 0x%p, count: %d)\n",
-           device, rompatch_count));
-
-    cid = do_activate ? BMI_ROMPATCH_ACTIVATE : BMI_ROMPATCH_DEACTIVATE;
-
-    offset = 0;
-    A_MEMCPY(&data[offset], &cid, sizeof(cid));
-    offset += sizeof(cid);
-    A_MEMCPY(&data[offset], &rompatch_count, sizeof(rompatch_count));
-    offset += sizeof(rompatch_count);
-    length = rompatch_count * sizeof(*rompatch_list);
-    A_MEMCPY(&data[offset], rompatch_list, length);
-    offset += length;
-    status = bmiBufferSend(device, data, offset);
-    if (status != A_OK) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
-        return A_ERROR;
-    }
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Change rompatch Activation: Exit\n"));
-
-    return A_OK;
-}
-
-A_STATUS
-BMIrompatchActivate(HIF_DEVICE *device,
-                    A_UINT32 rompatch_count,
-                    A_UINT32 *rompatch_list)
-{
-    return _BMIrompatchChangeActivation(device, rompatch_count, rompatch_list, 1);
-}
-
-A_STATUS
-BMIrompatchDeactivate(HIF_DEVICE *device,
-                      A_UINT32 rompatch_count,
-                      A_UINT32 *rompatch_list)
-{
-    return _BMIrompatchChangeActivation(device, rompatch_count, rompatch_list, 0);
-}
-
-/* BMI Access routines */
-A_STATUS
-bmiBufferSend(HIF_DEVICE *device,
-              A_UCHAR *buffer,
-              A_UINT32 length)
-{
-    A_STATUS status;
-    A_UINT32 timeout;
-    A_UINT32 address;
-    static A_UINT32 cmdCredits;
-    A_UINT32 mboxAddress[HTC_MAILBOX_NUM_MAX];
-
-    HIFConfigureDevice(device, HIF_DEVICE_GET_MBOX_ADDR,
-                       &mboxAddress, sizeof(mboxAddress));
-
-    cmdCredits = 0;
-    timeout = BMI_COMMUNICATION_TIMEOUT;
-
-    while(timeout-- && !cmdCredits) {
-        /* Read the counter register to get the command credits */
-        address = COUNT_DEC_ADDRESS + (HTC_MAILBOX_NUM_MAX + ENDPOINT1) * 4;
-        /* hit the credit counter with a 4-byte access, the first byte read will hit the counter and cause
-         * a decrement, while the remaining 3 bytes has no effect.  The rationale behind this is to
-         * make all HIF accesses 4-byte aligned */
-        status = HIFReadWrite(device, address, (A_UINT8 *)&cmdCredits, 4,
-            HIF_RD_SYNC_BYTE_INC, NULL);
-        if (status != A_OK) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to decrement the command credit count register\n"));
-            return A_ERROR;
-        }
-        /* the counter is only 8=bits, ignore anything in the upper 3 bytes */
-        cmdCredits &= 0xFF;
-    }
-
-    if (cmdCredits) {
-        address = mboxAddress[ENDPOINT1];
-        status = HIFReadWrite(device, address, buffer, length,
-            HIF_WR_SYNC_BYTE_INC, NULL);
-        if (status != A_OK) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to send the BMI data to the device\n"));
-            return A_ERROR;
-        }
-    } else {
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("BMI Communication timeout\n"));
-        return A_ERROR;
-    }
-
-    return status;
-}
-
-A_STATUS
-bmiBufferReceive(HIF_DEVICE *device,
-                 A_UCHAR *buffer,
-                 A_UINT32 length)
-{
-    A_STATUS status;
-    A_UINT32 address;
-    A_UINT32 timeout;
-    static A_UINT32 cmdCredits;
-    A_UINT32 mboxAddress[HTC_MAILBOX_NUM_MAX];
-
-    HIFConfigureDevice(device, HIF_DEVICE_GET_MBOX_ADDR,
-                       &mboxAddress, sizeof(mboxAddress));
-
-    cmdCredits = 0;
-    timeout = BMI_COMMUNICATION_TIMEOUT;
-    while(timeout-- && !cmdCredits) {
-        /* Read the counter register to get the command credits */
-        address = COUNT_ADDRESS + (HTC_MAILBOX_NUM_MAX + ENDPOINT1) * 1;
-        /* read the counter using a 4-byte read.  Since the counter is NOT auto-decrementing,
-         * we can read this counter multiple times using a non-incrementing address mode.
-         * The rationale here is to make all HIF accesses a multiple of 4 bytes */
-        status = HIFReadWrite(device, address, (A_UINT8 *)&cmdCredits, sizeof(cmdCredits),
-            HIF_RD_SYNC_BYTE_FIX, NULL);
-        if (status != A_OK) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read the command credit count register\n"));
-            return A_ERROR;
-        }
-            /* we did a 4-byte read to the same count register so mask off upper bytes */
-        cmdCredits &= 0xFF;
-        status = A_ERROR;
-    }
-
-    if (cmdCredits) {
-        address = mboxAddress[ENDPOINT1];
-        status = HIFReadWrite(device, address, buffer, length,
-            HIF_RD_SYNC_BYTE_INC, NULL);
-        if (status != A_OK) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read the BMI data from the device\n"));
-            return A_ERROR;
-        }
-    } else {
-        AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Communication timeout\n"));
-        return A_ERROR;
-    }
-
-    return status;
-}
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/bmi/bmi_internal.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/bmi/bmi_internal.h
deleted file mode 100644
index 1e213540c..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/bmi/bmi_internal.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef BMI_INTERNAL_H
-#define BMI_INTERNAL_H
-/*
- *
- * Copyright (c) 2004-2007 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#include "a_config.h"
-#include "athdefs.h"
-#include "a_types.h"
-#include "a_osapi.h"
-#include "a_debug.h"
-#include "AR6Khwreg.h"
-#include "bmi_msg.h"
-
-#define BMI_COMMUNICATION_TIMEOUT       100000
-
-/* ------ Global Variable Declarations ------- */
-A_BOOL bmiDone;
-
-A_STATUS
-bmiBufferSend(HIF_DEVICE *device,
-              A_UCHAR *buffer,
-              A_UINT32 length);
-
-A_STATUS
-bmiBufferReceive(HIF_DEVICE *device,
-                 A_UCHAR *buffer,
-                 A_UINT32 length);
-
-#endif
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/hif/hif.c b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/hif/hif.c
deleted file mode 100644
index d04486c35..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/hif/hif.c
+++ /dev/null
@@ -1,824 +0,0 @@
-/*
- * @file: hif.c
- *
- * @abstract: HIF layer reference implementation for Atheros SDIO stack
- *
- * @notice: Copyright (c) 2004-2006 Atheros Communications Inc.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#include "hif_internal.h"
-
-/* ------ Static Variables ------ */
-
-/* ------ Global Variable Declarations ------- */
-SD_PNP_INFO Ids[] = {
-    {
-        .SDIO_ManufacturerID = MANUFACTURER_ID_AR6001_BASE | 0xB,
-        .SDIO_ManufacturerCode = MANUFACTURER_CODE,
-        .SDIO_FunctionClass = FUNCTION_CLASS,
-        .SDIO_FunctionNo = 1
-    },
-    {
-        .SDIO_ManufacturerID = MANUFACTURER_ID_AR6001_BASE | 0xA,
-        .SDIO_ManufacturerCode = MANUFACTURER_CODE,
-        .SDIO_FunctionClass = FUNCTION_CLASS,
-        .SDIO_FunctionNo = 1
-    },
-    {
-        .SDIO_ManufacturerID = MANUFACTURER_ID_AR6001_BASE | 0x9,
-        .SDIO_ManufacturerCode = MANUFACTURER_CODE,
-        .SDIO_FunctionClass = FUNCTION_CLASS,
-        .SDIO_FunctionNo = 1
-    },
-    {
-        .SDIO_ManufacturerID = MANUFACTURER_ID_AR6001_BASE | 0x8,
-        .SDIO_ManufacturerCode = MANUFACTURER_CODE,
-        .SDIO_FunctionClass = FUNCTION_CLASS,
-        .SDIO_FunctionNo = 1
-    },
-    {
-        .SDIO_ManufacturerID = MANUFACTURER_ID_AR6002_BASE | 0x0,
-        .SDIO_ManufacturerCode = MANUFACTURER_CODE,
-        .SDIO_FunctionClass = FUNCTION_CLASS,
-        .SDIO_FunctionNo = 1
-    },
-    {
-        .SDIO_ManufacturerID = MANUFACTURER_ID_AR6002_BASE | 0x1,
-        .SDIO_ManufacturerCode = MANUFACTURER_CODE,
-        .SDIO_FunctionClass = FUNCTION_CLASS,
-        .SDIO_FunctionNo = 1
-    },
-    {
-    }                      //list is null termintaed
-};
-
-TARGET_FUNCTION_CONTEXT FunctionContext = {
-    .function.Version    = CT_SDIO_STACK_VERSION_CODE,
-    .function.pName      = "sdio_wlan",
-    .function.MaxDevices = 1,
-    .function.NumDevices = 0,
-    .function.pIds       = Ids,
-    .function.pProbe     = hifDeviceInserted,
-    .function.pRemove    = hifDeviceRemoved,
-    .function.pSuspend   = NULL,
-    .function.pResume    = NULL,
-    .function.pWake      = NULL,
-    .function.pContext   = &FunctionContext,
-};
-
-HIF_DEVICE hifDevice[HIF_MAX_DEVICES];
-HTC_CALLBACKS htcCallbacks;
-BUS_REQUEST busRequest[BUS_REQUEST_MAX_NUM];
-static BUS_REQUEST *s_busRequestFreeQueue = NULL;
-OS_CRITICALSECTION lock;
-extern A_UINT32 onebitmode;
-extern A_UINT32 busspeedlow;
-
-#ifdef DEBUG
-extern A_UINT32 debughif;
-#define ATH_DEBUG_ERROR 1
-#define ATH_DEBUG_WARN  2
-#define ATH_DEBUG_TRACE 3
-#define _AR_DEBUG_PRINTX_ARG(arg...) arg
-#define AR_DEBUG_PRINTF(lvl, args)\
-    {if (lvl <= debughif)\
-        A_PRINTF(KERN_ALERT _AR_DEBUG_PRINTX_ARG args);\
-    }
-#else
-#define AR_DEBUG_PRINTF(lvl, args)
-#endif
-
-static BUS_REQUEST *hifAllocateBusRequest(void);
-static void hifFreeBusRequest(BUS_REQUEST *busrequest);
-static THREAD_RETURN insert_helper_func(POSKERNEL_HELPER pHelper);
-static void ResetAllCards(void);
-
-/* ------ Functions ------ */
-int HIFInit(HTC_CALLBACKS *callbacks)
-{
-    SDIO_STATUS status;
-    DBG_ASSERT(callbacks != NULL);
-
-    /* Store the callback and event handlers */
-    htcCallbacks.deviceInsertedHandler = callbacks->deviceInsertedHandler;
-    htcCallbacks.deviceRemovedHandler = callbacks->deviceRemovedHandler;
-    htcCallbacks.deviceSuspendHandler = callbacks->deviceSuspendHandler;
-    htcCallbacks.deviceResumeHandler = callbacks->deviceResumeHandler;
-    htcCallbacks.deviceWakeupHandler = callbacks->deviceWakeupHandler;
-    htcCallbacks.rwCompletionHandler = callbacks->rwCompletionHandler;
-    htcCallbacks.dsrHandler = callbacks->dsrHandler;
-
-    CriticalSectionInit(&lock);
-
-    /* Register with bus driver core */
-    status = SDIO_RegisterFunction(&FunctionContext.function);
-    DBG_ASSERT(SDIO_SUCCESS(status));
-
-    return(0);
-}
-
-A_STATUS
-HIFReadWrite(HIF_DEVICE *device,
-             A_UINT32 address,
-             A_UCHAR *buffer,
-             A_UINT32 length,
-             A_UINT32 request,
-             void *context)
-{
-    A_UINT8 rw;
-    A_UINT8 mode;
-    A_UINT8 funcNo;
-    A_UINT8 opcode;
-    A_UINT16 count;
-    SDREQUEST *sdrequest;
-    SDIO_STATUS sdiostatus;
-    BUS_REQUEST *busrequest;
-    A_STATUS    status = A_OK;
-
-    DBG_ASSERT(device != NULL);
-    DBG_ASSERT(device->handle != NULL);
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Device: %p\n", device));
-
-    do {
-        busrequest = hifAllocateBusRequest();
-        if (busrequest == NULL) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERROR, ("HIF Unable to allocate bus request\n"));
-            status = A_NO_RESOURCE;
-            break;
-        }
-
-        sdrequest = busrequest->request;
-        busrequest->context = context;
-
-        sdrequest->pDataBuffer = buffer;
-        if (request & HIF_SYNCHRONOUS) {
-            sdrequest->Flags = SDREQ_FLAGS_RESP_SDIO_R5 | SDREQ_FLAGS_DATA_TRANS;
-            sdrequest->pCompleteContext = NULL;
-            sdrequest->pCompletion = NULL;
-            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Execution mode: Synchronous\n"));
-        } else if (request & HIF_ASYNCHRONOUS) {
-            sdrequest->Flags = SDREQ_FLAGS_RESP_SDIO_R5 | SDREQ_FLAGS_DATA_TRANS |
-                               SDREQ_FLAGS_TRANS_ASYNC;
-            sdrequest->pCompleteContext = busrequest;
-            sdrequest->pCompletion = hifRWCompletionHandler;
-            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Execution mode: Asynchronous\n"));
-        } else {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERROR,
-                            ("Invalid execution mode: 0x%08x\n", request));
-            status = A_EINVAL;
-            break;
-        }
-
-        if (request & HIF_EXTENDED_IO) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Command type: CMD53\n"));
-            sdrequest->Command = CMD53;
-        } else {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERROR,
-                            ("Invalid command type: 0x%08x\n", request));
-            status = A_EINVAL;
-            break;
-        }
-
-        if (request & HIF_BLOCK_BASIS) {
-            mode = CMD53_BLOCK_BASIS;
-            sdrequest->BlockLen = HIF_MBOX_BLOCK_SIZE;
-            sdrequest->BlockCount = length / HIF_MBOX_BLOCK_SIZE;
-            count = sdrequest->BlockCount;
-            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE,
-                            ("Block mode (BlockLen: %d, BlockCount: %d)\n",
-                            sdrequest->BlockLen, sdrequest->BlockCount));
-        } else if (request & HIF_BYTE_BASIS) {
-            mode = CMD53_BYTE_BASIS;
-            sdrequest->BlockLen = length;
-            sdrequest->BlockCount = 1;
-            count = sdrequest->BlockLen;
-            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE,
-                            ("Byte mode (BlockLen: %d, BlockCount: %d)\n",
-                            sdrequest->BlockLen, sdrequest->BlockCount));
-        } else {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERROR,
-                            ("Invalid data mode: 0x%08x\n", request));
-            status = A_EINVAL;
-            break;
-        }
-
-#if 0
-        /* useful for checking register accesses */
-        if (length & 0x3) {
-            A_PRINTF(KERN_ALERT"HIF (%s) is not a multiple of 4 bytes, addr:0x%X, len:%d\n",
-                                request & HIF_WRITE ? "write":"read", address, length);
-        }
-#endif
-
-        if ((address >= HIF_MBOX_START_ADDR(0)) &&
-            (address <= HIF_MBOX_END_ADDR(3)))
-        {
-
-            DBG_ASSERT(length <= HIF_MBOX_WIDTH);
-
-            /*
-             * Mailbox write. Adjust the address so that the last byte
-             * falls on the EOM address.
-             */
-            address += (HIF_MBOX_WIDTH - length);
-        }
-
-
-
-        if (request & HIF_WRITE) {
-            rw = CMD53_WRITE;
-            sdrequest->Flags |= SDREQ_FLAGS_DATA_WRITE;
-            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Direction: Write\n"));
-        } else if (request & HIF_READ) {
-            rw = CMD53_READ;
-            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Direction: Read\n"));
-        } else {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERROR,
-                            ("Invalid direction: 0x%08x\n", request));
-            status = A_EINVAL;
-            break;
-        }
-
-        if (request & HIF_FIXED_ADDRESS) {
-            opcode = CMD53_FIXED_ADDRESS;
-            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Address mode: Fixed\n"));
-        } else if (request & HIF_INCREMENTAL_ADDRESS) {
-            opcode = CMD53_INCR_ADDRESS;
-            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Address mode: Incremental\n"));
-        } else {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERROR,
-                            ("Invalid address mode: 0x%08x\n", request));
-            status = A_EINVAL;
-            break;
-        }
-
-        funcNo = SDDEVICE_GET_SDIO_FUNCNO(device->handle);
-        AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Function number: %d\n", funcNo));
-        SDIO_SET_CMD53_ARG(sdrequest->Argument, rw, funcNo,
-                           mode, opcode, address, count);
-
-        /* Send the command out */
-        sdiostatus = SDDEVICE_CALL_REQUEST_FUNC(device->handle, sdrequest);
-
-        if (!SDIO_SUCCESS(sdiostatus)) {
-            status = A_ERROR;
-        }
-
-    } while (FALSE);
-
-    if (A_FAILED(status) || (request & HIF_SYNCHRONOUS)) {
-        if (busrequest != NULL) {
-            hifFreeBusRequest(busrequest);
-        }
-    }
-
-    if (A_FAILED(status) && (request & HIF_ASYNCHRONOUS)) {
-            /* call back async handler on failure */
-        htcCallbacks.rwCompletionHandler(context, status);
-    }
-
-    return status;
-}
-
-A_STATUS
-HIFConfigureDevice(HIF_DEVICE *device, HIF_DEVICE_CONFIG_OPCODE opcode,
-                   void *config, A_UINT32 configLen)
-{
-    A_UINT32 count;
-
-    switch(opcode) {
-        case HIF_DEVICE_GET_MBOX_BLOCK_SIZE:
-            ((A_UINT32 *)config)[0] = HIF_MBOX0_BLOCK_SIZE;
-            ((A_UINT32 *)config)[1] = HIF_MBOX1_BLOCK_SIZE;
-            ((A_UINT32 *)config)[2] = HIF_MBOX2_BLOCK_SIZE;
-            ((A_UINT32 *)config)[3] = HIF_MBOX3_BLOCK_SIZE;
-            break;
-
-        case HIF_DEVICE_GET_MBOX_ADDR:
-            for (count = 0; count < 4; count ++) {
-                ((A_UINT32 *)config)[count] = HIF_MBOX_START_ADDR(count);
-            }
-            break;
-        case HIF_DEVICE_GET_IRQ_PROC_MODE:
-                /* the SDIO stack allows the interrupts to be processed either way, ASYNC or SYNC */
-            *((HIF_DEVICE_IRQ_PROCESSING_MODE *)config) = HIF_DEVICE_IRQ_ASYNC_SYNC;
-            break;
-        default:
-            AR_DEBUG_PRINTF(ATH_DEBUG_WARN,
-                            ("Unsupported configuration opcode: %d\n", opcode));
-            return A_ERROR;
-    }
-
-    return A_OK;
-}
-
-void
-HIFShutDownDevice(HIF_DEVICE *device)
-{
-    A_UINT8 data;
-    A_UINT32 count;
-    SDIO_STATUS status;
-    SDCONFIG_BUS_MODE_DATA busSettings;
-    SDCONFIG_FUNC_ENABLE_DISABLE_DATA fData;
-
-    if (device != NULL) {
-        DBG_ASSERT(device->handle != NULL);
-
-        /* Remove the allocated current if any */
-        status = SDLIB_IssueConfig(device->handle,
-                                   SDCONFIG_FUNC_FREE_SLOT_CURRENT, NULL, 0);
-        DBG_ASSERT(SDIO_SUCCESS(status));
-
-        /* Disable the card */
-        fData.EnableFlags = SDCONFIG_DISABLE_FUNC;
-        fData.TimeOut = 1;
-        status = SDLIB_IssueConfig(device->handle, SDCONFIG_FUNC_ENABLE_DISABLE,
-                                   &fData, sizeof(fData));
-        DBG_ASSERT(SDIO_SUCCESS(status));
-
-        /* Perform a soft I/O reset */
-        data = SDIO_IO_RESET;
-        status = SDLIB_IssueCMD52(device->handle, 0, SDIO_IO_ABORT_REG,
-                                  &data, 1, 1);
-        DBG_ASSERT(SDIO_SUCCESS(status));
-
-        /*
-         * WAR - Codetelligence driver does not seem to shutdown correctly in 1
-         * bit mode. By default it configures the HC in the 4 bit. Its later in
-         * our driver that we switch to 1 bit mode. If we try to shutdown, the
-         * driver hangs so we revert to 4 bit mode, to be transparent to the
-         * underlying bus driver.
-         */
-        if (onebitmode) {
-            ZERO_OBJECT(busSettings);
-            busSettings.BusModeFlags = SDDEVICE_GET_BUSMODE_FLAGS(device->handle);
-            SDCONFIG_SET_BUS_WIDTH(busSettings.BusModeFlags,
-                                   SDCONFIG_BUS_WIDTH_4_BIT);
-
-            /* Issue config request to change the bus width to 4 bit */
-            status = SDLIB_IssueConfig(device->handle, SDCONFIG_BUS_MODE_CTRL,
-                                       &busSettings,
-                                       sizeof(SDCONFIG_BUS_MODE_DATA));
-            DBG_ASSERT(SDIO_SUCCESS(status));
-        }
-
-        /* Free the bus requests */
-        for (count = 0; count < BUS_REQUEST_MAX_NUM; count ++) {
-            SDDeviceFreeRequest(device->handle, busRequest[count].request);
-        }
-        /* Clean up the queue */
-        s_busRequestFreeQueue = NULL;
-    } else {
-            /* since we are unloading the driver anyways, reset all cards in case the SDIO card
-             * is externally powered and we are unloading the SDIO stack.  This avoids the problem when
-             * the SDIO stack is reloaded and attempts are made to re-enumerate a card that is already
-             * enumerated */
-        ResetAllCards();
-        /* Unregister with bus driver core */
-        AR_DEBUG_PRINTF(ATH_DEBUG_TRACE,
-                        ("Unregistering with the bus driver\n"));
-        status = SDIO_UnregisterFunction(&FunctionContext.function);
-        DBG_ASSERT(SDIO_SUCCESS(status));
-    }
-}
-
-void
-hifRWCompletionHandler(SDREQUEST *request)
-{
-    A_STATUS status;
-    void *context;
-    BUS_REQUEST *busrequest;
-
-    if (SDIO_SUCCESS(request->Status)) {
-        status = A_OK;
-    } else {
-        status = A_ERROR;
-    }
-
-    DBG_ASSERT(status == A_OK);
-    busrequest = (BUS_REQUEST *) request->pCompleteContext;
-    context = (void *) busrequest->context;
-        /* free the request before calling the callback, in case the
-         * callback submits another request, this guarantees that
-         * there is at least 1 free request available everytime the callback
-         * is invoked */
-    hifFreeBusRequest(busrequest);
-    htcCallbacks.rwCompletionHandler(context, status);
-}
-
-void
-hifIRQHandler(void *context)
-{
-    A_STATUS status;
-    HIF_DEVICE *device;
-
-    device = (HIF_DEVICE *)context;
-    AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Device: %p\n", device));
-    status = htcCallbacks.dsrHandler(device->htc_handle);
-    DBG_ASSERT(status == A_OK);
-}
-
-BOOL
-hifDeviceInserted(SDFUNCTION *function, SDDEVICE *handle)
-{
-    BOOL enabled;
-    A_UINT8 data;
-    A_UINT32 count;
-    HIF_DEVICE *device;
-    SDIO_STATUS status;
-    A_UINT16 maxBlocks;
-    A_UINT16 maxBlockSize;
-    SDCONFIG_BUS_MODE_DATA busSettings;
-    SDCONFIG_FUNC_ENABLE_DISABLE_DATA fData;
-    TARGET_FUNCTION_CONTEXT *functionContext;
-    SDCONFIG_FUNC_SLOT_CURRENT_DATA slotCurrent;
-    SD_BUSCLOCK_RATE                currentBusClock;
-
-    DBG_ASSERT(function != NULL);
-    DBG_ASSERT(handle != NULL);
-
-    device = addHifDevice(handle);
-    AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Device: %p\n", device));
-    functionContext =  (TARGET_FUNCTION_CONTEXT *)function->pContext;
-
-    /*
-     * Issue commands to get the manufacturer ID and stuff and compare it
-     * against the rev Id derived from the ID registered during the
-     * initialization process. Report the device only in the case there
-     * is a match. In the case od SDIO, the bus driver has already queried
-     * these details so we just need to use their data structures to get the
-     * relevant values. Infact, the driver has already matched it against
-     * the Ids that we registered with it so we dont need to the step here.
-     */
-
-    /* Configure the SDIO Bus Width */
-    if (onebitmode) {
-        data = SDIO_BUS_WIDTH_1_BIT;
-        status = SDLIB_IssueCMD52(handle, 0, SDIO_BUS_IF_REG, &data, 1, 1);
-        if (!SDIO_SUCCESS(status)) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERROR,
-                            ("Unable to set the bus width to 1 bit\n"));
-            return FALSE;
-        }
-    }
-
-    /* Get current bus flags */
-    ZERO_OBJECT(busSettings);
-
-    busSettings.BusModeFlags = SDDEVICE_GET_BUSMODE_FLAGS(handle);
-    if (onebitmode) {
-        SDCONFIG_SET_BUS_WIDTH(busSettings.BusModeFlags,
-                               SDCONFIG_BUS_WIDTH_1_BIT);
-    }
-
-        /* get the current operating clock, the bus driver sets us up based
-         * on what our CIS reports and what the host controller can handle
-         * we can use this to determine whether we want to drop our clock rate
-         * down */
-    currentBusClock = SDDEVICE_GET_OPER_CLOCK(handle);
-    busSettings.ClockRate = currentBusClock;
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_TRACE,
-                        ("HIF currently running at: %d \n",currentBusClock));
-
-        /* see if HIF wants to run at a lower clock speed, we may already be
-         * at that lower clock speed */
-    if (currentBusClock > (SDIO_CLOCK_FREQUENCY_DEFAULT >> busspeedlow)) {
-        busSettings.ClockRate = SDIO_CLOCK_FREQUENCY_DEFAULT >> busspeedlow;
-        AR_DEBUG_PRINTF(ATH_DEBUG_WARN,
-                        ("HIF overriding clock to %d \n",busSettings.ClockRate));
-    }
-
-    /* Issue config request to override clock rate */
-    status = SDLIB_IssueConfig(handle, SDCONFIG_FUNC_CHANGE_BUS_MODE, &busSettings,
-                               sizeof(SDCONFIG_BUS_MODE_DATA));
-    if (!SDIO_SUCCESS(status)) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERROR,
-                        ("Unable to configure the host clock\n"));
-        return FALSE;
-    } else {
-        AR_DEBUG_PRINTF(ATH_DEBUG_TRACE,
-                        ("Configured clock: %d, Maximum clock: %d\n",
-                        busSettings.ActualClockRate,
-                        SDDEVICE_GET_MAX_CLOCK(handle)));
-    }
-
-    /*
-     * Check if the target supports block mode. This result of this check
-     * can be used to implement the HIFReadWrite API.
-     */
-    if (SDDEVICE_GET_SDIO_FUNC_MAXBLKSIZE(handle)) {
-        /* Limit block size to operational block limit or card function
-           capability */
-        maxBlockSize = min(SDDEVICE_GET_OPER_BLOCK_LEN(handle),
-                           SDDEVICE_GET_SDIO_FUNC_MAXBLKSIZE(handle));
-
-        /* check if the card support multi-block transfers */
-        if (!(SDDEVICE_GET_SDIOCARD_CAPS(handle) & SDIO_CAPS_MULTI_BLOCK)) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Byte basis only\n"));
-
-            /* Limit block size to max byte basis */
-            maxBlockSize =  min(maxBlockSize,
-                                (A_UINT16)SDIO_MAX_LENGTH_BYTE_BASIS);
-            maxBlocks = 1;
-        } else {
-            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Multi-block capable\n"));
-            maxBlocks = SDDEVICE_GET_OPER_BLOCKS(handle);
-            status = SDLIB_SetFunctionBlockSize(handle, HIF_MBOX_BLOCK_SIZE);
-            if (!SDIO_SUCCESS(status)) {
-                AR_DEBUG_PRINTF(ATH_DEBUG_ERROR,
-                                ("Failed to set block size. Err:%d\n", status));
-                return FALSE;
-            }
-        }
-
-        AR_DEBUG_PRINTF(ATH_DEBUG_TRACE,
-                        ("Bytes Per Block: %d bytes, Block Count:%d \n",
-                        maxBlockSize, maxBlocks));
-    } else {
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERROR,
-                        ("Function does not support Block Mode!\n"));
-        return FALSE;
-    }
-
-    /* Allocate the slot current */
-    status = SDLIB_GetDefaultOpCurrent(handle, &slotCurrent.SlotCurrent);
-    if (SDIO_SUCCESS(status)) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Allocating Slot current: %d mA\n",
-                                slotCurrent.SlotCurrent));
-        status = SDLIB_IssueConfig(handle, SDCONFIG_FUNC_ALLOC_SLOT_CURRENT,
-                                   &slotCurrent, sizeof(slotCurrent));
-        if (!SDIO_SUCCESS(status)) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERROR,
-                            ("Failed to allocate slot current %d\n", status));
-            return FALSE;
-        }
-    }
-
-    /* Enable the dragon function */
-    count = 0;
-    enabled = FALSE;
-    fData.TimeOut = 1;
-    fData.EnableFlags = SDCONFIG_ENABLE_FUNC;
-    while ((count++ < SDWLAN_ENABLE_DISABLE_TIMEOUT) && !enabled)
-    {
-        /* Enable dragon */
-        status = SDLIB_IssueConfig(handle, SDCONFIG_FUNC_ENABLE_DISABLE,
-                                   &fData, sizeof(fData));
-        if (!SDIO_SUCCESS(status)) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE,
-                            ("Attempting to enable the card again\n"));
-            continue;
-        }
-
-        /* Mark the status as enabled */
-        enabled = TRUE;
-    }
-
-    /* Check if we were succesful in enabling the target */
-    if (!enabled) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERROR,
-                        ("Failed to communicate with the target\n"));
-        return FALSE;
-    }
-
-    /* Allocate the bus requests to be used later */
-    A_MEMZERO(busRequest, sizeof(busRequest));
-    for (count = 0; count < BUS_REQUEST_MAX_NUM; count ++) {
-        if ((busRequest[count].request = SDDeviceAllocRequest(handle)) == NULL){
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERROR, ("Unable to allocate memory\n"));
-            /* TODO: Free the memory that has already been allocated */
-            return FALSE;
-        }
-        hifFreeBusRequest(&busRequest[count]);
-
-        AR_DEBUG_PRINTF(ATH_DEBUG_TRACE,
-                ("0x%08x = busRequest[%d].request = 0x%08x\n",
-				(unsigned int) &busRequest[count], count,
-				(unsigned int) busRequest[count].request));
-    }
-
-        /* Schedule a worker to handle device inserted, this is a temporary workaround
-         * to fix a deadlock if the device fails to intialize in the insertion handler
-         * The failure causes the instance to shutdown the HIF layer and unregister the
-         * function driver within the busdriver probe context which can deadlock
-         *
-         * NOTE: we cannot use the default work queue because that would block
-         * SD bus request processing for all synchronous I/O. We must use a kernel
-         * thread that is creating using the helper library.
-         * */
-
-    if (SDIO_SUCCESS(SDLIB_OSCreateHelper(&device->insert_helper,
-                         insert_helper_func,
-                         device))) {
-        device->helper_started = TRUE;
-    }
-
-    return TRUE;
-}
-
-static THREAD_RETURN insert_helper_func(POSKERNEL_HELPER pHelper)
-{
-
-    /*
-     * Adding a wait of around a second before we issue the very first
-     * command to dragon. During the process of loading/unloading the
-     * driver repeatedly it was observed that we get a data timeout
-     * while accessing function 1 registers in the chip. The theory at
-     * this point is that some initialization delay in dragon is
-     * causing the SDIO state in dragon core to be not ready even after
-     * the ready bit indicates that function 1 is ready. Accomodating
-     * for this behavior by adding some delay in the driver before it
-     * issues the first command after switching on dragon. Need to
-     * investigate this a bit more - TODO
-     */
-
-    A_MDELAY(1000);
-        /* Inform HTC */
-    if ((htcCallbacks.deviceInsertedHandler(SD_GET_OS_HELPER_CONTEXT(pHelper))) != A_OK) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Device rejected\n"));
-    }
-
-    return 0;
-}
-
-void
-HIFAckInterrupt(HIF_DEVICE *device)
-{
-    SDIO_STATUS status;
-    DBG_ASSERT(device != NULL);
-    DBG_ASSERT(device->handle != NULL);
-
-    /* Acknowledge our function IRQ */
-    status = SDLIB_IssueConfig(device->handle, SDCONFIG_FUNC_ACK_IRQ,
-                               NULL, 0);
-    DBG_ASSERT(SDIO_SUCCESS(status));
-}
-
-void
-HIFUnMaskInterrupt(HIF_DEVICE *device)
-{
-    SDIO_STATUS status;
-
-    DBG_ASSERT(device != NULL);
-    DBG_ASSERT(device->handle != NULL);
-
-    /* Register the IRQ Handler */
-    SDDEVICE_SET_IRQ_HANDLER(device->handle, hifIRQHandler, device);
-
-    /* Unmask our function IRQ */
-    status = SDLIB_IssueConfig(device->handle, SDCONFIG_FUNC_UNMASK_IRQ,
-                               NULL, 0);
-    DBG_ASSERT(SDIO_SUCCESS(status));
-}
-
-void HIFMaskInterrupt(HIF_DEVICE *device)
-{
-    SDIO_STATUS status;
-    DBG_ASSERT(device != NULL);
-    DBG_ASSERT(device->handle != NULL);
-
-    /* Mask our function IRQ */
-    status = SDLIB_IssueConfig(device->handle, SDCONFIG_FUNC_MASK_IRQ,
-                               NULL, 0);
-    DBG_ASSERT(SDIO_SUCCESS(status));
-
-    /* Unregister the IRQ Handler */
-    SDDEVICE_SET_IRQ_HANDLER(device->handle, NULL, NULL);
-}
-
-static BUS_REQUEST *hifAllocateBusRequest(void)
-{
-    BUS_REQUEST *busrequest;
-
-    /* Acquire lock */
-    CriticalSectionAcquire(&lock);
-
-    /* Remove first in list */
-    if((busrequest = s_busRequestFreeQueue) != NULL)
-    {
-        s_busRequestFreeQueue = busrequest->next;
-    }
-
-    /* Release lock */
-    CriticalSectionRelease(&lock);
-
-    return busrequest;
-}
-
-static void
-hifFreeBusRequest(BUS_REQUEST *busrequest)
-{
-    DBG_ASSERT(busrequest != NULL);
-
-    /* Acquire lock */
-    CriticalSectionAcquire(&lock);
-
-    /* Insert first in list */
-    busrequest->next = s_busRequestFreeQueue;
-    s_busRequestFreeQueue = busrequest;
-
-    /* Release lock */
-    CriticalSectionRelease(&lock);
-}
-
-void
-hifDeviceRemoved(SDFUNCTION *function, SDDEVICE *handle)
-{
-    A_STATUS status;
-    HIF_DEVICE *device;
-    DBG_ASSERT(function != NULL);
-    DBG_ASSERT(handle != NULL);
-
-    device = getHifDevice(handle);
-    status = htcCallbacks.deviceRemovedHandler(device->htc_handle, A_OK);
-
-        /* cleanup the helper thread */
-    if (device->helper_started) {
-        SDLIB_OSDeleteHelper(&device->insert_helper);
-        device->helper_started = FALSE;
-    }
-
-    delHifDevice(handle);
-    DBG_ASSERT(status == A_OK);
-}
-
-HIF_DEVICE *
-addHifDevice(SDDEVICE *handle)
-{
-    DBG_ASSERT(handle != NULL);
-    hifDevice[0].handle = handle;
-    return &hifDevice[0];
-}
-
-HIF_DEVICE *
-getHifDevice(SDDEVICE *handle)
-{
-    DBG_ASSERT(handle != NULL);
-    return &hifDevice[0];
-}
-
-void
-delHifDevice(SDDEVICE *handle)
-{
-    DBG_ASSERT(handle != NULL);
-    hifDevice[0].handle = NULL;
-}
-
-struct device*
-HIFGetOSDevice(HIF_DEVICE *device)
-{
-    return &device->handle->Device->dev;
-}
-
-static void ResetAllCards(void)
-{
-    UINT8       data;
-    SDIO_STATUS status;
-    int         i;
-
-    data = SDIO_IO_RESET;
-
-    /* set the I/O CARD reset bit:
-     * NOTE: we are exploiting a "feature" of the SDIO core that resets the core when you
-     * set the RES bit in the SDIO_IO_ABORT register.  This bit however "normally" resets the
-     * I/O functions leaving the SDIO core in the same state (as per SDIO spec).
-     * In this design, this reset can be used to reset the SDIO core itself */
-    for (i = 0; i < HIF_MAX_DEVICES; i++) {
-        if (hifDevice[i].handle != NULL) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE,
-                        ("Issuing I/O Card reset for instance: %d \n",i));
-                /* set the I/O Card reset bit */
-            status = SDLIB_IssueCMD52(hifDevice[i].handle,
-                                      0,                    /* function 0 space */
-                                      SDIO_IO_ABORT_REG,
-                                      &data,
-                                      1,                    /* 1 byte */
-                                      TRUE);                /* write */
-        }
-    }
-
-}
-
-void HIFSetHandle(void *hif_handle, void *handle)
-{
-    HIF_DEVICE *device = (HIF_DEVICE *) hif_handle;
-
-    device->htc_handle = handle;
-
-    return;
-}
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/hif/hif2.c b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/hif/hif2.c
deleted file mode 100644
index 386d96e66..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/hif/hif2.c
+++ /dev/null
@@ -1,768 +0,0 @@
-/*
- * hif2.c - HIF layer re-implementation for the Linux SDIO stack
- *
- * Copyright (C) 2008, 2009 by OpenMoko, Inc.
- * Written by Werner Almesberger <werner@openmoko.org>
- * All Rights Reserved
- *
- * 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;
- *
- * Based on:
- *
- * @abstract: HIF layer reference implementation for Atheros SDIO stack
- * @notice: Copyright (c) 2004-2006 Atheros Communications Inc.
- */
-
-
-#include <linux/kernel.h>
-#include <linux/kthread.h>
-#include <linux/list.h>
-#include <linux/wait.h>
-#include <linux/spinlock.h>
-#include <linux/mutex.h>
-#include <linux/sched.h>
-#include <linux/mmc/sdio_func.h>
-#include <linux/mmc/sdio.h>
-#include <linux/mmc/sdio_ids.h>
-
-#include "athdefs.h"
-#include "a_types.h"
-#include "hif.h"
-
-
-/* @@@ Hack - this wants cleaning up */
-
-#ifdef CONFIG_MACH_NEO1973_GTA02
-
-#include <mach/gta02-pm-wlan.h>
-
-#else /* CONFIG_MACH_NEO1973_GTA02 */
-
-#define	gta02_wlan_query_rfkill_lock()  1
-#define	gta02_wlan_set_rfkill_cb(cb, hif) ((void) cb)
-#define	gta02_wlan_query_rfkill_unlock()
-#define	gta02_wlan_clear_rfkill_cb()
-
-#endif /* !CONFIG_MACH_NEO1973_GTA02 */
-
-
-/*
- * KNOWN BUGS:
- *
- * - HIF_DEVICE_IRQ_ASYNC_SYNC doesn't work yet (gets MMC errors)
- * - latency can reach hundreds of ms, probably because of scheduling delays
- * - packets go through about three queues before finally hitting the network
- */
-
-/*
- * Differences from Atheros' HIFs:
- *
- * - synchronous and asynchronous requests may get reordered with respect to
- *   each other, e.g., if HIFReadWrite returns for an asynchronous request and
- *   then HIFReadWrite is called for a synchronous request, the synchronous
- *   request may be executed before the asynchronous request.
- *
- * - request queue locking seems unnecessarily complex in the Atheros HIFs.
- *
- * - Atheros mask interrupts by calling sdio_claim_irq/sdio_release_irq, which
- *   can cause quite a bit of overhead. This HIF has its own light-weight
- *   interrupt masking.
- *
- * - Atheros call deviceInsertedHandler from a thread spawned off the probe or
- *   device insertion function. The original explanation for the Atheros SDIO
- *   stack said that this is done because a delay is needed to let the chip
- *   complete initialization. There is indeed a one second delay in the thread.
- *
- *   The Atheros Linux SDIO HIF removes the delay and only retains the thread.
- *   Experimentally removing the thread didn't show any conflicts, so let's get
- *   rid of it for good.
- *
- * - The Atheros SDIO stack with Samuel's driver sets SDIO_CCCR_POWER in
- *   SDIO_POWER_EMPC. Atheros' Linux SDIO code apparently doesn't. We don't
- *   either, and this seems to work fine.
- *   @@@ Need to check this with Atheros.
- */
-
-
-#define MBOXES			4
-
-#define HIF_MBOX_BLOCK_SIZE	128
-#define	HIF_MBOX_BASE_ADDR	0x800
-#define	HIF_MBOX_WIDTH		0x800
-#define	HIF_MBOX_START_ADDR(mbox) \
-    (HIF_MBOX_BASE_ADDR+(mbox)*HIF_MBOX_WIDTH)
-
-
-struct hif_device {
-	void *htc_handle;
-	struct sdio_func *func;
-
-	/*
-	 * @@@ our sweet little bit of bogosity - the mechanism that lets us
-	 * use the SDIO stack from softirqs. This really wants to use skbs.
-	 */
-	struct list_head queue;
-	spinlock_t queue_lock;
-	struct task_struct *io_task;
-	wait_queue_head_t wait;
-
-	/*
-	 * activate_lock protects "active" and the activation/deactivation
-	 * process itself.
-	 *
-	 * Relation to other locks: The SDIO function can be claimed while
-	 * activate_lock is being held, but trying to acquire activate_lock
-	 * while having ownership of the SDIO function could cause a deadlock.
-	 */
-	int active;
-	struct mutex activate_lock;
-};
-
-struct hif_request {
-	struct list_head list;
-	struct sdio_func *func;
-	int (*read)(struct sdio_func *func,
-	    void *dst, unsigned int addr, int count);
-	int (*write)(struct sdio_func *func,
-	    unsigned int addr, void *src, int count);
-	void *buf;
-	unsigned long addr;
-	int len;
-	A_STATUS (*completion)(void *context, A_STATUS status);
-	void *context;
-};
-
-
-static HTC_CALLBACKS htcCallbacks;
-
-/*
- * shutdown_lock prevents recursion through HIFShutDownDevice
- */
-static DEFINE_MUTEX(shutdown_lock);
-
-
-/* ----- Request processing ------------------------------------------------ */
-
-
-static A_STATUS process_request(struct hif_request *req)
-{
-	int ret;
-	A_STATUS status;
-
-	dev_dbg(&req->func->dev, "process_request(req %p)\n", req);
-	sdio_claim_host(req->func);
-	if (req->read) {
-		ret = req->read(req->func, req->buf, req->addr, req->len);
-	} else {
-		ret = req->write(req->func, req->addr, req->buf, req->len);
-	}
-	sdio_release_host(req->func);
-	status = ret ? A_ERROR : A_OK;
-	if (req->completion)
-		req->completion(req->context, status);
-	kfree(req);
-	return status;
-}
-
-
-static void enqueue_request(struct hif_device *hif, struct hif_request *req)
-{
-	unsigned long flags;
-
-	dev_dbg(&req->func->dev, "enqueue_request(req %p)\n", req);
-	spin_lock_irqsave(&hif->queue_lock, flags);
-	list_add_tail(&req->list, &hif->queue);
-	spin_unlock_irqrestore(&hif->queue_lock, flags);
-	wake_up(&hif->wait);
-}
-
-
-static struct hif_request *dequeue_request(struct hif_device *hif)
-{
-	struct hif_request *req;
-	unsigned long flags;
-
-	spin_lock_irqsave(&hif->queue_lock, flags);
-	if (list_empty(&hif->queue))
-		req = NULL;
-	else {
-		req = list_first_entry(&hif->queue,
-		    struct hif_request, list);
-		list_del(&req->list);
-	}
-	spin_unlock_irqrestore(&hif->queue_lock, flags);
-	return req;
-}
-
-
-static void wait_queue_empty(struct hif_device *hif)
-{
-	unsigned long flags;
-	int empty;
-
-	while (1) {
-		spin_lock_irqsave(&hif->queue_lock, flags);
-		empty = list_empty(&hif->queue);
-		spin_unlock_irqrestore(&hif->queue_lock, flags);
-		if (empty)
-			break;
-		else
-			yield();
-	}
-}
-
-
-static int io(void *data)
-{
-	struct hif_device *hif = data;
-	struct sched_param param = { .sched_priority = 2 };
-		/* one priority level slower than ksdioirqd (which is at 1) */
-	DEFINE_WAIT(wait);
-	struct hif_request *req;
-
-	sched_setscheduler(current, SCHED_FIFO, &param);
-
-	while (1) {
-		while (1) {
-			/*
-			 * Since we never use signals here, one might think
-			 * that this ought to be TASK_UNINTERRUPTIBLE. However,
-			 * such a task would increase the load average and,
-			 * worse, it would trigger the softlockup check.
-			 */
-			prepare_to_wait(&hif->wait, &wait, TASK_INTERRUPTIBLE);
-			if (kthread_should_stop()) {
-				finish_wait(&hif->wait, &wait);
-				return 0;
-			}
-			req = dequeue_request(hif);
-			if (req)
-				break;
-			schedule();
-		}
-		finish_wait(&hif->wait, &wait);
-
-		(void) process_request(req);
-	}
-	return 0;
-}
-
-
-A_STATUS HIFReadWrite(HIF_DEVICE *hif, A_UINT32 address, A_UCHAR *buffer,
-    A_UINT32 length, A_UINT32 request, void *context)
-{
-	struct device *dev = HIFGetOSDevice(hif);
-	struct hif_request *req;
-
-	dev_dbg(dev, "HIFReadWrite(device %p, address 0x%x, buffer %p, "
-	    "length %d, request 0x%x, context %p)\n",
-	    hif, address, buffer, length, request, context);
-
-	BUG_ON(!(request & (HIF_SYNCHRONOUS | HIF_ASYNCHRONOUS)));
-	BUG_ON(!(request & (HIF_BYTE_BASIS | HIF_BLOCK_BASIS)));
-	BUG_ON(!(request & (HIF_READ | HIF_WRITE)));
-	BUG_ON(!(request & HIF_EXTENDED_IO));
-
-	if (address >= HIF_MBOX_START_ADDR(0) &&
-	    address < HIF_MBOX_START_ADDR(MBOXES+1)) {
-		BUG_ON(length > HIF_MBOX_WIDTH);
-		/* Adjust the address so that the last byte falls on the EOM
-		   address. */
-		address += HIF_MBOX_WIDTH-length;
-	}
-
-	req = kzalloc(sizeof(*req), GFP_ATOMIC);
-	if (!req) {
-		if (request & HIF_ASYNCHRONOUS)
-			htcCallbacks.rwCompletionHandler(context, A_ERROR);
-		return A_ERROR;
-	}
-
-	req->func = hif->func;
-	req->addr = address;
-	req->buf = buffer;
-	req->len = length;
-
-	if (request & HIF_READ) {
-		if (request & HIF_FIXED_ADDRESS)
-			req->read = sdio_readsb;
-		else
-			req->read = sdio_memcpy_fromio;
-	} else {
-		if (request & HIF_FIXED_ADDRESS)
-			req->write = sdio_writesb;
-		else
-			req->write = sdio_memcpy_toio;
-	}
-
-	if (!(request & HIF_ASYNCHRONOUS))
-		return process_request(req);
-
-	req->completion = htcCallbacks.rwCompletionHandler;
-	req->context = context;
-	enqueue_request(hif, req);
-
-	return A_OK;
-}
-
-
-/* ----- Interrupt handling ------------------------------------------------ */
-
-/*
- * Volatile ought to be good enough to make gcc do the right thing on S3C24xx.
- * No need to use atomic or put barriers, keeping the code more readable.
- *
- * Warning: this story changes if going SMP/SMT.
- */
-
-static volatile int masked = 1;
-static volatile int pending;
-static volatile int in_interrupt;
-
-
-static void ar6000_do_irq(struct sdio_func *func)
-{
-	HIF_DEVICE *hif = sdio_get_drvdata(func);
-	struct device *dev = HIFGetOSDevice(hif);
-	A_STATUS status;
-
-	dev_dbg(dev, "ar6000_do_irq -> %p\n", htcCallbacks.dsrHandler);
-
-	status = htcCallbacks.dsrHandler(hif->htc_handle);
-	BUG_ON(status != A_OK);
-}
-
-
-static void sdio_ar6000_irq(struct sdio_func *func)
-{
-	HIF_DEVICE *hif = sdio_get_drvdata(func);
-	struct device *dev = HIFGetOSDevice(hif);
-
-	dev_dbg(dev, "sdio_ar6000_irq\n");
-
-	in_interrupt = 1;
-	if (masked) {
-		in_interrupt = 0;
-		pending++;
-		return;
-	}
-	/*
-	 * @@@ This is ugly. If we don't drop the lock, we'll deadlock when
-	 * the handler tries to do SDIO. So there are four choices:
-	 *
-	 * 1) Break the call chain by calling the callback from a workqueue.
-	 *    Ugh.
-	 * 2) Make process_request aware that we already have the lock.
-	 * 3) Drop the lock. Which is ugly but should be safe as long as we're
-	 *    making sure the device doesn't go away.
-	 * 4) Change the AR6k driver such that it only issues asynchronous
-	 *    quests when called from an interrupt.
-	 *
-	 * Solution 2) is probably the best for now. Will try it later.
-	 */
-	sdio_release_host(func);
-	ar6000_do_irq(func);
-	sdio_claim_host(func);
-	in_interrupt = 0;
-}
-
-
-void HIFAckInterrupt(HIF_DEVICE *hif)
-{
-	struct device *dev = HIFGetOSDevice(hif);
-
-	dev_dbg(dev, "HIFAckInterrupt\n");
-	/* do nothing */
-}
-
-
-void HIFUnMaskInterrupt(HIF_DEVICE *hif)
-{
-	struct device *dev = HIFGetOSDevice(hif);
-
-	dev_dbg(dev, "HIFUnMaskInterrupt\n");
-	do {
-		masked = 1;
-		if (pending) {
-			pending = 0;
-			ar6000_do_irq(hif->func);
-			/* We may take an interrupt before unmasking and thus
-			   get it pending. In this case, we just loop back. */
-		}
-		masked = 0;
-	}
-	while (pending);
-}
-
-
-void HIFMaskInterrupt(HIF_DEVICE *hif)
-{
-	struct device *dev = HIFGetOSDevice(hif);
-
-	dev_dbg(dev, "HIFMaskInterrupt\n");
-	/*
-	 * Since sdio_ar6000_irq can also be called from a process context, we
-	 * may conceivably end up racing with it. Thus, we need to wait until
-	 * we can be sure that no concurrent interrupt processing is going on
-	 * before we return.
-	 *
-	 * Note: this may be a bit on the paranoid side - the callers may
-	 * actually be nice enough to disable scheduling. Check later.
-	 */
-	masked = 1;
-	while (in_interrupt)
-		yield();
-}
-
-
-/* ----- HIF API glue functions -------------------------------------------- */
-
-
-struct device *HIFGetOSDevice(HIF_DEVICE *hif)
-{
-	return &hif->func->dev;
-}
-
-
-void HIFSetHandle(void *hif_handle, void *handle)
-{
-	HIF_DEVICE *hif = (HIF_DEVICE *) hif_handle;
-
-	hif->htc_handle = handle;
-}
-
-
-/* ----- Device configuration (HIF side) ----------------------------------- */
-
-
-A_STATUS HIFConfigureDevice(HIF_DEVICE *hif,
-    HIF_DEVICE_CONFIG_OPCODE opcode, void *config, A_UINT32 configLen)
-{
-	struct device *dev = HIFGetOSDevice(hif);
-	HIF_DEVICE_IRQ_PROCESSING_MODE *ipm_cfg = config;
-	A_UINT32 *mbs_cfg = config;
-	int i;
-
-	dev_dbg(dev, "HIFConfigureDevice\n");
-
-	switch (opcode) {
-	case HIF_DEVICE_GET_MBOX_BLOCK_SIZE:
-		for (i = 0; i != MBOXES; i++)
-			mbs_cfg[i] = HIF_MBOX_BLOCK_SIZE;
-		break;
-	case HIF_DEVICE_GET_MBOX_ADDR:
-		for (i = 0; i != MBOXES; i++)
-			mbs_cfg[i] = HIF_MBOX_START_ADDR(i);
-		break;
-	case HIF_DEVICE_GET_IRQ_PROC_MODE:
-		*ipm_cfg = HIF_DEVICE_IRQ_SYNC_ONLY;
-//		*ipm_cfg = HIF_DEVICE_IRQ_ASYNC_SYNC;
-		break;
-	default:
-		return A_ERROR;
-	}
-	return A_OK;
-}
-
-
-/* ----- Device probe and removal (Linux side) ----------------------------- */
-
-
-static int ar6000_do_activate(struct hif_device *hif)
-{
-	struct sdio_func *func = hif->func;
-	struct device *dev = &func->dev;
-	int ret;
-
-	dev_dbg(dev, "ar6000_do_activate\n");
-
-	sdio_claim_host(func);
-	sdio_enable_func(func);
-
-	INIT_LIST_HEAD(&hif->queue);
-	init_waitqueue_head(&hif->wait);
-	spin_lock_init(&hif->queue_lock);
-
-	ret = sdio_set_block_size(func, HIF_MBOX_BLOCK_SIZE);
-	if (ret < 0) {
-		dev_err(dev, "sdio_set_block_size returns %d\n", ret);
-		goto out_enabled;
-	}
-	ret = sdio_claim_irq(func, sdio_ar6000_irq);
-	if (ret) {
-		dev_err(dev, "sdio_claim_irq returns %d\n", ret);
-		goto out_enabled;
-	}
-	/* Set SDIO_BUS_CD_DISABLE in SDIO_CCCR_IF ? */
-#if 0
-	sdio_f0_writeb(func, SDIO_CCCR_CAP_E4MI, SDIO_CCCR_CAPS, &ret);
-	if (ret) {
-		dev_err(dev, "sdio_f0_writeb(SDIO_CCCR_CAPS) returns %d\n",
-		    ret);
-		goto out_got_irq;
-	}
-#else
-	if (0) /* avoid warning */
-		goto out_got_irq;
-#endif
-
-	sdio_release_host(func);
-
-	hif->io_task = kthread_run(io, hif, "ar6000_io");
-	ret = IS_ERR(hif->io_task);
-	if (ret) {
-		dev_err(dev, "kthread_run(ar6000_io): %d\n", ret);
-		goto out_func_ready;
-	}
-
-	ret = htcCallbacks.deviceInsertedHandler(hif);
-	if (ret == A_OK)
-		return 0;
-
-	dev_err(dev, "deviceInsertedHandler: %d\n", ret);
-
-	ret = kthread_stop(hif->io_task);
-	if (ret)
-		dev_err(dev, "kthread_stop (ar6000_io): %d\n", ret);
-
-out_func_ready:
-	sdio_claim_host(func);
-
-out_got_irq:
-	sdio_release_irq(func);
-
-out_enabled:
-	sdio_disable_func(func);
-	sdio_release_host(func);
-
-	return ret;
-}
-
-
-static void ar6000_do_deactivate(struct hif_device *hif)
-{
-	struct sdio_func *func = hif->func;
-	struct device *dev = &func->dev;
-	int ret;
-
-	dev_dbg(dev, "ar6000_do_deactivate\n");
-	if (!hif->active)
-		return;
-
-	if (mutex_trylock(&shutdown_lock)) {
-		/*
-		 * Funny, Atheros' HIF does this call, but this just puts us in
-		 * a recursion through HTCShutDown/HIFShutDown if unloading the
-		 * module.
-		 *
-		 * However, we need it for suspend/resume. See the comment at
-		 * HIFShutDown, below.
-		 */
-		ret = htcCallbacks.deviceRemovedHandler(hif->htc_handle, A_OK);
-		if (ret != A_OK)
-			dev_err(dev, "deviceRemovedHandler: %d\n", ret);
-		mutex_unlock(&shutdown_lock);
-	}
-	wait_queue_empty(hif);
-	ret = kthread_stop(hif->io_task);
-	if (ret)
-		dev_err(dev, "kthread_stop (ar6000_io): %d\n", ret);
-	sdio_claim_host(func);
-	sdio_release_irq(func);
-	sdio_disable_func(func);
-	sdio_release_host(func);
-}
-
-
-static int ar6000_activate(struct hif_device *hif)
-{
-	int ret = 0;
-
-	dev_dbg(&hif->func->dev, "ar6000_activate\n");
-	mutex_lock(&hif->activate_lock);
-	if (!hif->active) {
-		ret = ar6000_do_activate(hif);
-		if (ret) {
-			printk(KERN_ERR "%s: Failed to activate %d\n",
-				__func__, ret);
-			goto out;
-		}
-		hif->active = 1;
-	}
-out:
-	mutex_unlock(&hif->activate_lock);
-	return ret;
-}
-
-
-static void ar6000_deactivate(struct hif_device *hif)
-{
-	dev_dbg(&hif->func->dev, "ar6000_deactivate\n");
-	mutex_lock(&hif->activate_lock);
-	if (hif->active) {
-		ar6000_do_deactivate(hif);
-		hif->active = 0;
-	}
-	mutex_unlock(&hif->activate_lock);
-}
-
-
-static int ar6000_rfkill_cb(void *data, int on)
-{
-	struct hif_device *hif = data;
-	struct sdio_func *func = hif->func;
-	struct device *dev = &func->dev;
-
-	dev_dbg(dev, "ar6000_rfkill_cb: on %d\n", on);
-	if (on)
-		return ar6000_activate(hif);
-	ar6000_deactivate(hif);
-	return 0;
-}
-
-
-static int sdio_ar6000_probe(struct sdio_func *func,
-    const struct sdio_device_id *id)
-{
-	struct device *dev = &func->dev;
-	struct hif_device *hif;
-	int ret = 0;
-
-	dev_dbg(dev, "sdio_ar6000_probe\n");
-	BUG_ON(!htcCallbacks.deviceInsertedHandler);
-
-	hif = kzalloc(sizeof(*hif), GFP_KERNEL);
-	if (!hif)
-		return -ENOMEM;
-
-	sdio_set_drvdata(func, hif);
-	hif->func = func;
-	mutex_init(&hif->activate_lock);
-	hif->active = 0;
-
-	if (gta02_wlan_query_rfkill_lock())
-		ret = ar6000_activate(hif);
-	if (!ret) {
-		gta02_wlan_set_rfkill_cb(ar6000_rfkill_cb, hif);
-		return 0;
-	}
-	gta02_wlan_query_rfkill_unlock();
-	sdio_set_drvdata(func, NULL);
-	kfree(hif);
-	return ret;
-}
-
-
-static void sdio_ar6000_remove(struct sdio_func *func)
-{
-	struct device *dev = &func->dev;
-	HIF_DEVICE *hif = sdio_get_drvdata(func);
-
-	dev_dbg(dev, "sdio_ar6000_remove\n");
-	gta02_wlan_clear_rfkill_cb();
-	ar6000_deactivate(hif);
-	sdio_set_drvdata(func, NULL);
-	kfree(hif);
-}
-
-
-/* ----- Device registration/unregistration (called by HIF) ---------------- */
-
-
-#define ATHEROS_SDIO_DEVICE(id, offset) \
-    SDIO_DEVICE(SDIO_VENDOR_ID_ATHEROS, SDIO_DEVICE_ID_ATHEROS_##id | (offset))
-
-static const struct sdio_device_id sdio_ar6000_ids[] = {
-	{ ATHEROS_SDIO_DEVICE(AR6002, 0)	},
-	{ ATHEROS_SDIO_DEVICE(AR6002, 0x1)	},
-	{ ATHEROS_SDIO_DEVICE(AR6001, 0x8)	},
-	{ ATHEROS_SDIO_DEVICE(AR6001, 0x9)	},
-	{ ATHEROS_SDIO_DEVICE(AR6001, 0xa)	},
-	{ ATHEROS_SDIO_DEVICE(AR6001, 0xb)	},
-	{ /* end: all zeroes */			},
-};
-
-MODULE_DEVICE_TABLE(sdio, sdio_ar6000_ids);
-
-
-static struct sdio_driver sdio_ar6000_driver = {
-	.probe		= sdio_ar6000_probe,
-	.remove		= sdio_ar6000_remove,
-	.name		= "sdio_ar6000",
-	.id_table	= sdio_ar6000_ids,
-};
-
-
-int HIFInit(HTC_CALLBACKS *callbacks)
-{
-	int ret;
-
-	BUG_ON(!callbacks);
-
-	printk(KERN_DEBUG "HIFInit\n");
-	htcCallbacks = *callbacks;
-
-	ret = sdio_register_driver(&sdio_ar6000_driver);
-	if (ret) {
-		printk(KERN_ERR
-		    "sdio_register_driver(sdio_ar6000_driver): %d\n", ret);
-		return A_ERROR;
-	}
-
-	return 0;
-}
-
-
-/*
- * We have four possible call chains here:
- *
- * System shutdown/reboot:
- *
- *   kernel_restart_prepare ...> device_shutdown ... > s3cmci_shutdown ->
- *     mmc_remove_host ..> sdio_bus_remove -> sdio_ar6000_remove ->
- *     ar6000_deactivate -> ar6000_do_deactivate ->
- *     deviceRemovedHandler (HTCTargetRemovedHandler) -> HIFShutDownDevice
- *
- *   This is roughly the same sequence as suspend, described below.
- *
- * Module removal:
- *
- *   sys_delete_module -> ar6000_cleanup_module -> HTCShutDown ->
- *     HIFShutDownDevice -> sdio_unregister_driver ...> sdio_bus_remove ->
- *     sdio_ar6000_remove -> ar6000_deactivate -> ar6000_do_deactivate
- *
- *   In this case, HIFShutDownDevice must call sdio_unregister_driver to
- *   notify the driver about its removal. ar6000_do_deactivate must not call
- *   deviceRemovedHandler, because that would loop back into HIFShutDownDevice.
- *
- * Suspend:
- *
- *   device_suspend ...> s3cmci_suspend ...> sdio_bus_remove ->
- *     sdio_ar6000_remove -> ar6000_deactivate -> ar6000_do_deactivate ->
- *     deviceRemovedHandler (HTCTargetRemovedHandler) -> HIFShutDownDevice
- *
- *   We must call deviceRemovedHandler to inform the ar6k stack that the device
- *   has been removed. Since HTCTargetRemovedHandler calls back into
- *   HIFShutDownDevice, we must also prevent the call to
- *   sdio_unregister_driver, or we'd end up recursing into the SDIO stack,
- *   eventually deadlocking somewhere.
- *
- * rfkill:
- *
- *   rfkill_state_store -> rfkill_toggle_radio -> gta02_wlan_toggle_radio ->
- *   ar6000_rfkill_cb -> ar6000_deactivate -> ar6000_do_deactivate ->
- *     deviceRemovedHandler (HTCTargetRemovedHandler) -> HIFShutDownDevice
- *
- *   This is similar to suspend - only the entry point changes.
- */
-
-void HIFShutDownDevice(HIF_DEVICE *hif)
-{
-	/* Beware, HTCShutDown calls us with hif == NULL ! */
-	if (mutex_trylock(&shutdown_lock)) {
-		sdio_unregister_driver(&sdio_ar6000_driver);
-		mutex_unlock(&shutdown_lock);
-	}
-}
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/hif/hif_internal.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/hif/hif_internal.h
deleted file mode 100644
index d8fc10132..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/hif/hif_internal.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * @file: hif_internal.h
- *
- * @abstract: internal header file for hif layer
- *
- * @notice: Copyright (c) 2004-2006 Atheros Communications Inc.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#include <linux/sdio/ctsystem.h>
-#include <linux/sdio/sdio_busdriver.h>
-#include <linux/sdio/_sdio_defs.h>
-#include <linux/sdio/sdio_lib.h>
-#include "a_config.h"
-#include "athdefs.h"
-#include "a_types.h"
-#include "a_osapi.h"
-#include "hif.h"
-
-#define MANUFACTURER_ID_AR6001_BASE        0x100
-#define MANUFACTURER_ID_AR6002_BASE        0x200
-#define FUNCTION_CLASS                     0x0
-#define MANUFACTURER_CODE                  0x271
-
-#define BUS_REQUEST_MAX_NUM                64
-
-#define SDIO_CLOCK_FREQUENCY_DEFAULT       25000000
-#define SDWLAN_ENABLE_DISABLE_TIMEOUT      20
-#define FLAGS_CARD_ENAB                    0x02
-#define FLAGS_CARD_IRQ_UNMSK               0x04
-
-#define HIF_MBOX_BLOCK_SIZE                128
-#define HIF_MBOX_BASE_ADDR                 0x800
-#define HIF_MBOX_WIDTH                     0x800
-#define HIF_MBOX0_BLOCK_SIZE               1
-#define HIF_MBOX1_BLOCK_SIZE               HIF_MBOX_BLOCK_SIZE
-#define HIF_MBOX2_BLOCK_SIZE               HIF_MBOX_BLOCK_SIZE
-#define HIF_MBOX3_BLOCK_SIZE               HIF_MBOX_BLOCK_SIZE
-
-#define HIF_MBOX_START_ADDR(mbox)                        \
-    HIF_MBOX_BASE_ADDR + mbox * HIF_MBOX_WIDTH
-
-#define HIF_MBOX_END_ADDR(mbox)	                         \
-    HIF_MBOX_START_ADDR(mbox) + HIF_MBOX_WIDTH - 1
-
-struct hif_device {
-    SDDEVICE *handle;
-    void *htc_handle;
-    OSKERNEL_HELPER insert_helper;
-    BOOL  helper_started;
-};
-
-typedef struct target_function_context {
-    SDFUNCTION           function; /* function description of the bus driver */
-    OS_SEMAPHORE         instanceSem; /* instance lock. Unused */
-    SDLIST               instanceList; /* list of instances. Unused */
-} TARGET_FUNCTION_CONTEXT;
-
-typedef struct bus_request {
-    struct bus_request *next;
-    SDREQUEST *request;
-    void *context;
-} BUS_REQUEST;
-
-BOOL
-hifDeviceInserted(SDFUNCTION *function, SDDEVICE *device);
-
-void
-hifDeviceRemoved(SDFUNCTION *function, SDDEVICE *device);
-
-SDREQUEST *
-hifAllocateDeviceRequest(SDDEVICE *device);
-
-void
-hifFreeDeviceRequest(SDREQUEST *request);
-
-void
-hifRWCompletionHandler(SDREQUEST *request);
-
-void
-hifIRQHandler(void *context);
-
-HIF_DEVICE *
-addHifDevice(SDDEVICE *handle);
-
-HIF_DEVICE *
-getHifDevice(SDDEVICE *handle);
-
-void
-delHifDevice(SDDEVICE *handle);
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/htc/ar6k.c b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/htc/ar6k.c
deleted file mode 100644
index 72472abb0..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/htc/ar6k.c
+++ /dev/null
@@ -1,991 +0,0 @@
-/*
- * AR6K device layer that handles register level I/O
- *
- * Copyright (c) 2007 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-#include "a_config.h"
-#include "athdefs.h"
-#include "a_types.h"
-#include "AR6Khwreg.h"
-#include "a_osapi.h"
-#include "a_debug.h"
-#include "hif.h"
-#include "htc_packet.h"
-#include "ar6k.h"
-
-#define MAILBOX_FOR_BLOCK_SIZE 1
-
-extern A_UINT32 resetok;
-
-static A_STATUS DevEnableInterrupts(AR6K_DEVICE *pDev);
-static A_STATUS DevDisableInterrupts(AR6K_DEVICE *pDev);
-
-#define LOCK_AR6K(p)      A_MUTEX_LOCK(&(p)->Lock);
-#define UNLOCK_AR6K(p)    A_MUTEX_UNLOCK(&(p)->Lock);
-
-void AR6KFreeIOPacket(AR6K_DEVICE *pDev, HTC_PACKET *pPacket)
-{
-    LOCK_AR6K(pDev);
-    HTC_PACKET_ENQUEUE(&pDev->RegisterIOList,pPacket);
-    UNLOCK_AR6K(pDev);
-}
-
-HTC_PACKET *AR6KAllocIOPacket(AR6K_DEVICE *pDev)
-{
-    HTC_PACKET *pPacket;
-
-    LOCK_AR6K(pDev);
-    pPacket = HTC_PACKET_DEQUEUE(&pDev->RegisterIOList);
-    UNLOCK_AR6K(pDev);
-
-    return pPacket;
-}
-
-A_STATUS DevSetup(AR6K_DEVICE *pDev)
-{
-    A_UINT32 mailboxaddrs[AR6K_MAILBOXES];
-    A_UINT32 blocksizes[AR6K_MAILBOXES];
-    A_STATUS status = A_OK;
-    int      i;
-
-    AR_DEBUG_ASSERT(AR6K_IRQ_PROC_REGS_SIZE == 16);
-    AR_DEBUG_ASSERT(AR6K_IRQ_ENABLE_REGS_SIZE == 4);
-
-    do {
-            /* give a handle to HIF for this target */
-        HIFSetHandle(pDev->HIFDevice, (void *)pDev);
-            /* initialize our free list of IO packets */
-        INIT_HTC_PACKET_QUEUE(&pDev->RegisterIOList);
-        A_MUTEX_INIT(&pDev->Lock);
-
-            /* get the addresses for all 4 mailboxes */
-        status = HIFConfigureDevice(pDev->HIFDevice, HIF_DEVICE_GET_MBOX_ADDR,
-                                    mailboxaddrs, sizeof(mailboxaddrs));
-
-        if (status != A_OK) {
-            AR_DEBUG_ASSERT(FALSE);
-            break;
-        }
-
-            /* carve up register I/O packets (these are for ASYNC register I/O ) */
-        for (i = 0; i < AR6K_MAX_REG_IO_BUFFERS; i++) {
-            HTC_PACKET *pIOPacket;
-            pIOPacket = &pDev->RegIOBuffers[i].HtcPacket;
-            SET_HTC_PACKET_INFO_RX_REFILL(pIOPacket,
-                                          pDev,
-                                          pDev->RegIOBuffers[i].Buffer,
-                                          AR6K_REG_IO_BUFFER_SIZE,
-                                          0); /* don't care */
-            AR6KFreeIOPacket(pDev,pIOPacket);
-        }
-
-            /* get the address of the mailbox we are using */
-        pDev->MailboxAddress = mailboxaddrs[HTC_MAILBOX];
-
-            /* get the block sizes */
-        status = HIFConfigureDevice(pDev->HIFDevice, HIF_DEVICE_GET_MBOX_BLOCK_SIZE,
-                                    blocksizes, sizeof(blocksizes));
-
-        if (status != A_OK) {
-            AR_DEBUG_ASSERT(FALSE);
-            break;
-        }
-
-            /* note: we actually get the block size of a mailbox other than 0, for SDIO the block
-             * size on mailbox 0 is artificially set to 1.  So we use the block size that is set
-             * for the other 3 mailboxes */
-        pDev->BlockSize = blocksizes[MAILBOX_FOR_BLOCK_SIZE];
-            /* must be a power of 2 */
-        AR_DEBUG_ASSERT((pDev->BlockSize & (pDev->BlockSize - 1)) == 0);
-
-            /* assemble mask, used for padding to a block */
-        pDev->BlockMask = pDev->BlockSize - 1;
-
-        AR_DEBUG_PRINTF(ATH_DEBUG_TRC,("BlockSize: %d, MailboxAddress:0x%X \n",
-                    pDev->BlockSize, pDev->MailboxAddress));
-
-        pDev->GetPendingEventsFunc = NULL;
-            /* see if the HIF layer implements the get pending events function  */
-        HIFConfigureDevice(pDev->HIFDevice,
-                           HIF_DEVICE_GET_PENDING_EVENTS_FUNC,
-                           &pDev->GetPendingEventsFunc,
-                           sizeof(pDev->GetPendingEventsFunc));
-
-            /* assume we can process HIF interrupt events asynchronously */
-        pDev->HifIRQProcessingMode = HIF_DEVICE_IRQ_ASYNC_SYNC;
-
-            /* see if the HIF layer overrides this assumption */
-        HIFConfigureDevice(pDev->HIFDevice,
-                           HIF_DEVICE_GET_IRQ_PROC_MODE,
-                           &pDev->HifIRQProcessingMode,
-                           sizeof(pDev->HifIRQProcessingMode));
-
-        switch (pDev->HifIRQProcessingMode) {
-            case HIF_DEVICE_IRQ_SYNC_ONLY:
-                AR_DEBUG_PRINTF(ATH_DEBUG_TRC,("HIF Interrupt processing is SYNC ONLY\n"));
-                break;
-            case HIF_DEVICE_IRQ_ASYNC_SYNC:
-                AR_DEBUG_PRINTF(ATH_DEBUG_TRC,("HIF Interrupt processing is ASYNC and SYNC\n"));
-                break;
-            default:
-                AR_DEBUG_ASSERT(FALSE);
-        }
-
-        pDev->HifMaskUmaskRecvEvent = NULL;
-
-            /* see if the HIF layer implements the mask/unmask recv events function  */
-        HIFConfigureDevice(pDev->HIFDevice,
-                           HIF_DEVICE_GET_RECV_EVENT_MASK_UNMASK_FUNC,
-                           &pDev->HifMaskUmaskRecvEvent,
-                           sizeof(pDev->HifMaskUmaskRecvEvent));
-
-        AR_DEBUG_PRINTF(ATH_DEBUG_TRC,("HIF special overrides : 0x%X , 0x%X\n",
-                 (A_UINT32)pDev->GetPendingEventsFunc, (A_UINT32)pDev->HifMaskUmaskRecvEvent));
-
-        status = DevDisableInterrupts(pDev);
-
-    } while (FALSE);
-
-    if (A_FAILED(status)) {
-            /* make sure handle is cleared */
-        HIFSetHandle(pDev->HIFDevice, NULL);
-    }
-
-    return status;
-
-}
-
-static A_STATUS DevEnableInterrupts(AR6K_DEVICE *pDev)
-{
-    A_STATUS                  status;
-    AR6K_IRQ_ENABLE_REGISTERS regs;
-
-    LOCK_AR6K(pDev);
-
-        /* Enable all the interrupts except for the dragon interrupt */
-    pDev->IrqEnableRegisters.int_status_enable = INT_STATUS_ENABLE_ERROR_SET(0x01) |
-                                      INT_STATUS_ENABLE_CPU_SET(0x01) |
-                                      INT_STATUS_ENABLE_COUNTER_SET(0x01);
-
-    if (NULL == pDev->GetPendingEventsFunc) {
-        pDev->IrqEnableRegisters.int_status_enable |= INT_STATUS_ENABLE_MBOX_DATA_SET(0x01);
-    } else {
-        /* The HIF layer provided us with a pending events function which means that
-         * the detection of pending mbox messages is handled in the HIF layer.
-         * This is the case for the SPI2 interface.
-         * In the normal case we enable MBOX interrupts, for the case
-         * with HIFs that offer this mechanism, we keep these interrupts
-         * masked */
-        pDev->IrqEnableRegisters.int_status_enable &= ~INT_STATUS_ENABLE_MBOX_DATA_SET(0x01);
-    }
-
-
-    /* Set up the CPU Interrupt Status Register */
-    pDev->IrqEnableRegisters.cpu_int_status_enable = CPU_INT_STATUS_ENABLE_BIT_SET(0x00);
-
-    /* Set up the Error Interrupt Status Register */
-    pDev->IrqEnableRegisters.error_status_enable =
-                                  ERROR_STATUS_ENABLE_RX_UNDERFLOW_SET(0x01) |
-                                  ERROR_STATUS_ENABLE_TX_OVERFLOW_SET(0x01);
-
-    /* Set up the Counter Interrupt Status Register (only for debug interrupt to catch fatal errors) */
-    pDev->IrqEnableRegisters.counter_int_status_enable =
-        COUNTER_INT_STATUS_ENABLE_BIT_SET(AR6K_TARGET_DEBUG_INTR_MASK);
-
-        /* copy into our temp area */
-    A_MEMCPY(&regs,&pDev->IrqEnableRegisters,AR6K_IRQ_ENABLE_REGS_SIZE);
-
-    UNLOCK_AR6K(pDev);
-
-        /* always synchronous */
-    status = HIFReadWrite(pDev->HIFDevice,
-                          INT_STATUS_ENABLE_ADDRESS,
-                          &regs.int_status_enable,
-                          AR6K_IRQ_ENABLE_REGS_SIZE,
-                          HIF_WR_SYNC_BYTE_INC,
-                          NULL);
-
-    if (status != A_OK) {
-        /* Can't write it for some reason */
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-                        ("Failed to update interrupt control registers err: %d\n", status));
-
-    }
-
-    return status;
-}
-
-static A_STATUS DevDisableInterrupts(AR6K_DEVICE *pDev)
-{
-    AR6K_IRQ_ENABLE_REGISTERS regs;
-
-    LOCK_AR6K(pDev);
-        /* Disable all interrupts */
-    pDev->IrqEnableRegisters.int_status_enable = 0;
-    pDev->IrqEnableRegisters.cpu_int_status_enable = 0;
-    pDev->IrqEnableRegisters.error_status_enable = 0;
-    pDev->IrqEnableRegisters.counter_int_status_enable = 0;
-        /* copy into our temp area */
-    A_MEMCPY(&regs,&pDev->IrqEnableRegisters,AR6K_IRQ_ENABLE_REGS_SIZE);
-
-    UNLOCK_AR6K(pDev);
-
-        /* always synchronous */
-    return HIFReadWrite(pDev->HIFDevice,
-                        INT_STATUS_ENABLE_ADDRESS,
-                        &regs.int_status_enable,
-                        AR6K_IRQ_ENABLE_REGS_SIZE,
-                        HIF_WR_SYNC_BYTE_INC,
-                        NULL);
-}
-
-/* enable device interrupts */
-A_STATUS DevUnmaskInterrupts(AR6K_DEVICE *pDev)
-{
-        /* Unmask the host controller interrupts */
-    HIFUnMaskInterrupt(pDev->HIFDevice);
-
-    return DevEnableInterrupts(pDev);
-}
-
-/* disable all device interrupts */
-A_STATUS DevMaskInterrupts(AR6K_DEVICE *pDev)
-{
-    A_STATUS status;
-
-    status = DevDisableInterrupts(pDev);
-
-    if (A_SUCCESS(status)) {
-            /* Disable the interrupt at the HIF layer */
-        HIFMaskInterrupt(pDev->HIFDevice);
-    }
-
-    return status;
-}
-
-/* callback when our fetch to enable/disable completes */
-static void DevDoEnableDisableRecvAsyncHandler(void *Context, HTC_PACKET *pPacket)
-{
-    AR6K_DEVICE *pDev = (AR6K_DEVICE *)Context;
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("+DevDoEnableDisableRecvAsyncHandler: (dev: 0x%X)\n", (A_UINT32)pDev));
-
-    if (A_FAILED(pPacket->Status)) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-                (" Failed to disable receiver, status:%d \n", pPacket->Status));
-    }
-        /* free this IO packet */
-    AR6KFreeIOPacket(pDev,pPacket);
-    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("-DevDoEnableDisableRecvAsyncHandler \n"));
-}
-
-/* disable packet reception (used in case the host runs out of buffers)
- * this is the "override" method when the HIF reports another methods to
- * disable recv events */
-static A_STATUS DevDoEnableDisableRecvOverride(AR6K_DEVICE *pDev, A_BOOL EnableRecv, A_BOOL AsyncMode)
-{
-    A_STATUS                  status = A_OK;
-    HTC_PACKET                *pIOPacket = NULL;
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_TRC,("DevDoEnableDisableRecvOverride: Enable:%d Mode:%d\n",
-            EnableRecv,AsyncMode));
-
-    do {
-
-        if (AsyncMode) {
-
-            pIOPacket = AR6KAllocIOPacket(pDev);
-
-            if (NULL == pIOPacket) {
-                status = A_NO_MEMORY;
-                AR_DEBUG_ASSERT(FALSE);
-                break;
-            }
-
-                /* stick in our completion routine when the I/O operation completes */
-            pIOPacket->Completion = DevDoEnableDisableRecvAsyncHandler;
-            pIOPacket->pContext = pDev;
-
-                /* call the HIF layer override and do this asynchronously */
-            status = pDev->HifMaskUmaskRecvEvent(pDev->HIFDevice,
-                                                 EnableRecv ? HIF_UNMASK_RECV : HIF_MASK_RECV,
-                                                 pIOPacket);
-            break;
-        }
-
-            /* if we get here we are doing it synchronously */
-        status = pDev->HifMaskUmaskRecvEvent(pDev->HIFDevice,
-                                             EnableRecv ? HIF_UNMASK_RECV : HIF_MASK_RECV,
-                                             NULL);
-
-    } while (FALSE);
-
-    if (A_FAILED(status) && (pIOPacket != NULL)) {
-        AR6KFreeIOPacket(pDev,pIOPacket);
-    }
-
-    return status;
-}
-
-/* disable packet reception (used in case the host runs out of buffers)
- * this is the "normal" method using the interrupt enable registers through
- * the host I/F */
-static A_STATUS DevDoEnableDisableRecvNormal(AR6K_DEVICE *pDev, A_BOOL EnableRecv, A_BOOL AsyncMode)
-{
-    A_STATUS                  status = A_OK;
-    HTC_PACKET                *pIOPacket = NULL;
-    AR6K_IRQ_ENABLE_REGISTERS regs;
-
-        /* take the lock to protect interrupt enable shadows */
-    LOCK_AR6K(pDev);
-
-    if (EnableRecv) {
-        pDev->IrqEnableRegisters.int_status_enable |= INT_STATUS_ENABLE_MBOX_DATA_SET(0x01);
-    } else {
-        pDev->IrqEnableRegisters.int_status_enable &= ~INT_STATUS_ENABLE_MBOX_DATA_SET(0x01);
-    }
-
-        /* copy into our temp area */
-    A_MEMCPY(&regs,&pDev->IrqEnableRegisters,AR6K_IRQ_ENABLE_REGS_SIZE);
-    UNLOCK_AR6K(pDev);
-
-    do {
-
-        if (AsyncMode) {
-
-            pIOPacket = AR6KAllocIOPacket(pDev);
-
-            if (NULL == pIOPacket) {
-                status = A_NO_MEMORY;
-                AR_DEBUG_ASSERT(FALSE);
-                break;
-            }
-
-                /* copy values to write to our async I/O buffer */
-            A_MEMCPY(pIOPacket->pBuffer,&regs,AR6K_IRQ_ENABLE_REGS_SIZE);
-
-                /* stick in our completion routine when the I/O operation completes */
-            pIOPacket->Completion = DevDoEnableDisableRecvAsyncHandler;
-            pIOPacket->pContext = pDev;
-
-                /* write it out asynchronously */
-            HIFReadWrite(pDev->HIFDevice,
-                         INT_STATUS_ENABLE_ADDRESS,
-                         pIOPacket->pBuffer,
-                         AR6K_IRQ_ENABLE_REGS_SIZE,
-                         HIF_WR_ASYNC_BYTE_INC,
-                         pIOPacket);
-            break;
-        }
-
-        /* if we get here we are doing it synchronously */
-
-        status = HIFReadWrite(pDev->HIFDevice,
-                              INT_STATUS_ENABLE_ADDRESS,
-                              &regs.int_status_enable,
-                              AR6K_IRQ_ENABLE_REGS_SIZE,
-                              HIF_WR_SYNC_BYTE_INC,
-                              NULL);
-
-    } while (FALSE);
-
-    if (A_FAILED(status) && (pIOPacket != NULL)) {
-        AR6KFreeIOPacket(pDev,pIOPacket);
-    }
-
-    return status;
-}
-
-
-A_STATUS DevStopRecv(AR6K_DEVICE *pDev, A_BOOL AsyncMode)
-{
-    if (NULL == pDev->HifMaskUmaskRecvEvent) {
-        return DevDoEnableDisableRecvNormal(pDev,FALSE,AsyncMode);
-    } else {
-        return DevDoEnableDisableRecvOverride(pDev,FALSE,AsyncMode);
-    }
-}
-
-A_STATUS DevEnableRecv(AR6K_DEVICE *pDev, A_BOOL AsyncMode)
-{
-    if (NULL == pDev->HifMaskUmaskRecvEvent) {
-        return DevDoEnableDisableRecvNormal(pDev,TRUE,AsyncMode);
-    } else {
-        return DevDoEnableDisableRecvOverride(pDev,TRUE,AsyncMode);
-    }
-}
-
-void DevDumpRegisters(AR6K_IRQ_PROC_REGISTERS   *pIrqProcRegs,
-                      AR6K_IRQ_ENABLE_REGISTERS *pIrqEnableRegs)
-{
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_DUMP, ("\n<------- Register Table -------->\n"));
-
-    if (pIrqProcRegs != NULL) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_DUMP,
-            ("Int Status:               0x%x\n",pIrqProcRegs->host_int_status));
-        AR_DEBUG_PRINTF(ATH_DEBUG_DUMP,
-            ("CPU Int Status:            0x%x\n",pIrqProcRegs->cpu_int_status));
-        AR_DEBUG_PRINTF(ATH_DEBUG_DUMP,
-            ("Error Int Status:          0x%x\n",pIrqProcRegs->error_int_status));
-        AR_DEBUG_PRINTF(ATH_DEBUG_DUMP,
-            ("Counter Int Status:        0x%x\n",pIrqProcRegs->counter_int_status));
-        AR_DEBUG_PRINTF(ATH_DEBUG_DUMP,
-            ("Mbox Frame:                0x%x\n",pIrqProcRegs->mbox_frame));
-        AR_DEBUG_PRINTF(ATH_DEBUG_DUMP,
-            ("Rx Lookahead Valid:        0x%x\n",pIrqProcRegs->rx_lookahead_valid));
-        AR_DEBUG_PRINTF(ATH_DEBUG_DUMP,
-            ("Rx Lookahead 0:            0x%x\n",pIrqProcRegs->rx_lookahead[0]));
-        AR_DEBUG_PRINTF(ATH_DEBUG_DUMP,
-            ("Rx Lookahead 1:            0x%x\n",pIrqProcRegs->rx_lookahead[1]));
-    }
-
-    if (pIrqEnableRegs != NULL) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_DUMP,
-            ("Int Status Enable:         0x%x\n",pIrqEnableRegs->int_status_enable));
-        AR_DEBUG_PRINTF(ATH_DEBUG_DUMP,
-            ("Counter Int Status Enable: 0x%x\n",pIrqEnableRegs->counter_int_status_enable));
-        AR_DEBUG_PRINTF(ATH_DEBUG_DUMP, ("<------------------------------->\n"));
-    }
-}
-
-
-#ifdef MBOXHW_UNIT_TEST
-
-
-/* This is a mailbox hardware unit test that must be called in a schedulable context
- * This test is very simple, it will send a list of buffers with a counting pattern
- * and the target will invert the data and send the message back
- *
- * the unit test has the following constraints:
- *
- * The target has at least 8 buffers of 256 bytes each. The host will send
- * the following pattern of buffers in rapid succession :
- *
- * 1 buffer - 128 bytes
- * 1 buffer - 256 bytes
- * 1 buffer - 512 bytes
- * 1 buffer - 1024 bytes
- *
- * The host will send the buffers to one mailbox and wait for buffers to be reflected
- * back from the same mailbox. The target sends the buffers FIFO order.
- * Once the final buffer has been received for a mailbox, the next mailbox is tested.
- *
- *
- * Note:  To simplifythe test , we assume that the chosen buffer sizes
- *        will fall on a nice block pad
- *
- * It is expected that higher-order tests will be written to stress the mailboxes using
- * a message-based protocol (with some performance timming) that can create more
- * randomness in the packets sent over mailboxes.
- *
- * */
-
-#define A_ROUND_UP_PWR2(x, align)    (((int) (x) + ((align)-1)) & ~((align)-1))
-
-#define BUFFER_BLOCK_PAD 128
-
-#if 0
-#define BUFFER1 128
-#define BUFFER2 256
-#define BUFFER3 512
-#define BUFFER4 1024
-#endif
-
-#if 1
-#define BUFFER1 80
-#define BUFFER2 200
-#define BUFFER3 444
-#define BUFFER4 800
-#endif
-
-#define TOTAL_BYTES (A_ROUND_UP_PWR2(BUFFER1,BUFFER_BLOCK_PAD) + \
-                     A_ROUND_UP_PWR2(BUFFER2,BUFFER_BLOCK_PAD) + \
-                     A_ROUND_UP_PWR2(BUFFER3,BUFFER_BLOCK_PAD) + \
-                     A_ROUND_UP_PWR2(BUFFER4,BUFFER_BLOCK_PAD) )
-
-#define TEST_BYTES (BUFFER1 +  BUFFER2 + BUFFER3 + BUFFER4)
-
-#define TEST_CREDITS_RECV_TIMEOUT 100
-
-static A_UINT8  g_Buffer[TOTAL_BYTES];
-static A_UINT32 g_MailboxAddrs[AR6K_MAILBOXES];
-static A_UINT32 g_BlockSizes[AR6K_MAILBOXES];
-
-#define BUFFER_PROC_LIST_DEPTH 4
-
-typedef struct _BUFFER_PROC_LIST{
-    A_UINT8  *pBuffer;
-    A_UINT32 length;
-}BUFFER_PROC_LIST;
-
-
-#define PUSH_BUFF_PROC_ENTRY(pList,len,pCurrpos) \
-{                                                   \
-    (pList)->pBuffer = (pCurrpos);                  \
-    (pList)->length = (len);                        \
-    (pCurrpos) += (len);                            \
-    (pList)++;                                      \
-}
-
-/* a simple and crude way to send different "message" sizes */
-static void AssembleBufferList(BUFFER_PROC_LIST *pList)
-{
-    A_UINT8 *pBuffer = g_Buffer;
-
-#if BUFFER_PROC_LIST_DEPTH < 4
-#error "Buffer processing list depth is not deep enough!!"
-#endif
-
-    PUSH_BUFF_PROC_ENTRY(pList,BUFFER1,pBuffer);
-    PUSH_BUFF_PROC_ENTRY(pList,BUFFER2,pBuffer);
-    PUSH_BUFF_PROC_ENTRY(pList,BUFFER3,pBuffer);
-    PUSH_BUFF_PROC_ENTRY(pList,BUFFER4,pBuffer);
-
-}
-
-#define FILL_ZERO     TRUE
-#define FILL_COUNTING FALSE
-static void InitBuffers(A_BOOL Zero)
-{
-    A_UINT16 *pBuffer16 = (A_UINT16 *)g_Buffer;
-    int      i;
-
-        /* fill buffer with 16 bit counting pattern or zeros */
-    for (i = 0; i <  (TOTAL_BYTES / 2) ; i++) {
-        if (!Zero) {
-            pBuffer16[i] = (A_UINT16)i;
-        } else {
-            pBuffer16[i] = 0;
-        }
-    }
-}
-
-
-static A_BOOL CheckOneBuffer(A_UINT16 *pBuffer16, int Length)
-{
-    int      i;
-    A_UINT16 startCount;
-    A_BOOL   success = TRUE;
-
-        /* get the starting count */
-    startCount = pBuffer16[0];
-        /* invert it, this is the expected value */
-    startCount = ~startCount;
-        /* scan the buffer and verify */
-    for (i = 0; i < (Length / 2) ; i++,startCount++) {
-            /* target will invert all the data */
-        if ((A_UINT16)pBuffer16[i] != (A_UINT16)~startCount) {
-            success = FALSE;
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Invalid Data Got:0x%X, Expecting:0x%X (offset:%d, total:%d) \n",
-                        pBuffer16[i], ((A_UINT16)~startCount), i, Length));
-             AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("0x%X 0x%X 0x%X 0x%X \n",
-                        pBuffer16[i], pBuffer16[i + 1], pBuffer16[i + 2],pBuffer16[i+3]));
-            break;
-        }
-    }
-
-    return success;
-}
-
-static A_BOOL CheckBuffers(void)
-{
-    int      i;
-    A_BOOL   success = TRUE;
-    BUFFER_PROC_LIST checkList[BUFFER_PROC_LIST_DEPTH];
-
-        /* assemble the list */
-    AssembleBufferList(checkList);
-
-        /* scan the buffers and verify */
-    for (i = 0; i < BUFFER_PROC_LIST_DEPTH ; i++) {
-        success = CheckOneBuffer((A_UINT16 *)checkList[i].pBuffer, checkList[i].length);
-        if (!success) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Buffer : 0x%X, Length:%d failed verify \n",
-                        (A_UINT32)checkList[i].pBuffer, checkList[i].length));
-            break;
-        }
-    }
-
-    return success;
-}
-
-    /* find the end marker for the last buffer we will be sending */
-static A_UINT16 GetEndMarker(void)
-{
-    A_UINT8  *pBuffer;
-    BUFFER_PROC_LIST checkList[BUFFER_PROC_LIST_DEPTH];
-
-        /* fill up buffers with the normal counting pattern */
-    InitBuffers(FILL_COUNTING);
-
-        /* assemble the list we will be sending down */
-    AssembleBufferList(checkList);
-        /* point to the last 2 bytes of the last buffer */
-    pBuffer = &(checkList[BUFFER_PROC_LIST_DEPTH - 1].pBuffer[(checkList[BUFFER_PROC_LIST_DEPTH - 1].length) - 2]);
-
-        /* the last count in the last buffer is the marker */
-    return (A_UINT16)pBuffer[0] | ((A_UINT16)pBuffer[1] << 8);
-}
-
-#define ATH_PRINT_OUT_ZONE ATH_DEBUG_ERR
-
-/* send the ordered buffers to the target */
-static A_STATUS SendBuffers(AR6K_DEVICE *pDev, int mbox)
-{
-    A_STATUS         status = A_OK;
-    A_UINT32         request = HIF_WR_SYNC_BLOCK_INC;
-    BUFFER_PROC_LIST sendList[BUFFER_PROC_LIST_DEPTH];
-    int              i;
-    int              totalBytes = 0;
-    int              paddedLength;
-    int              totalwPadding = 0;
-
-    AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, ("Sending buffers on mailbox : %d \n",mbox));
-
-        /* fill buffer with counting pattern */
-    InitBuffers(FILL_COUNTING);
-
-        /* assemble the order in which we send */
-    AssembleBufferList(sendList);
-
-    for (i = 0; i < BUFFER_PROC_LIST_DEPTH; i++) {
-
-            /* we are doing block transfers, so we need to pad everything to a block size */
-        paddedLength = (sendList[i].length + (g_BlockSizes[mbox] - 1)) &
-                       (~(g_BlockSizes[mbox] - 1));
-
-            /* send each buffer synchronously */
-        status = HIFReadWrite(pDev->HIFDevice,
-                              g_MailboxAddrs[mbox],
-                              sendList[i].pBuffer,
-                              paddedLength,
-                              request,
-                              NULL);
-        if (status != A_OK) {
-            break;
-        }
-        totalBytes += sendList[i].length;
-        totalwPadding += paddedLength;
-    }
-
-    AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, ("Sent %d bytes (%d padded bytes) to mailbox : %d \n",totalBytes,totalwPadding,mbox));
-
-    return status;
-}
-
-/* poll the mailbox credit counter until we get a credit or timeout */
-static A_STATUS GetCredits(AR6K_DEVICE *pDev, int mbox, int *pCredits)
-{
-    A_STATUS status = A_OK;
-    int      timeout = TEST_CREDITS_RECV_TIMEOUT;
-    A_UINT8  credits = 0;
-    A_UINT32 address;
-
-    while (TRUE) {
-
-            /* Read the counter register to get credits, this auto-decrements  */
-        address = COUNT_DEC_ADDRESS + (AR6K_MAILBOXES + mbox) * 4;
-        status = HIFReadWrite(pDev->HIFDevice, address, &credits, sizeof(credits),
-                              HIF_RD_SYNC_BYTE_FIX, NULL);
-        if (status != A_OK) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-                ("Unable to decrement the command credit count register (mbox=%d)\n",mbox));
-            status = A_ERROR;
-            break;
-        }
-
-        if (credits) {
-            break;
-        }
-
-        timeout--;
-
-        if (timeout <= 0) {
-              AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-                (" Timeout reading credit registers (mbox=%d, address:0x%X) \n",mbox,address));
-            status = A_ERROR;
-            break;
-        }
-
-         /* delay a little, target may not be ready */
-         msleep(1000);
-
-    }
-
-    if (status == A_OK) {
-        *pCredits = credits;
-    }
-
-    return status;
-}
-
-
-/* wait for the buffers to come back */
-static A_STATUS RecvBuffers(AR6K_DEVICE *pDev, int mbox)
-{
-    A_STATUS         status = A_OK;
-    A_UINT32         request = HIF_RD_SYNC_BLOCK_INC;
-    BUFFER_PROC_LIST recvList[BUFFER_PROC_LIST_DEPTH];
-    int              curBuffer;
-    int              credits;
-    int              i;
-    int              totalBytes = 0;
-    int              paddedLength;
-    int              totalwPadding = 0;
-
-    AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, ("Waiting for buffers on mailbox : %d \n",mbox));
-
-        /* zero the buffers */
-    InitBuffers(FILL_ZERO);
-
-        /* assemble the order in which we should receive */
-    AssembleBufferList(recvList);
-
-    curBuffer = 0;
-
-    while (curBuffer < BUFFER_PROC_LIST_DEPTH) {
-
-            /* get number of buffers that have been completed, this blocks
-             * until we get at least 1 credit or it times out */
-        status = GetCredits(pDev, mbox, &credits);
-
-        if (status != A_OK) {
-            break;
-        }
-
-        AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, ("Got %d messages on mailbox : %d \n",credits, mbox));
-
-            /* get all the buffers that are sitting on the queue */
-        for (i = 0; i < credits; i++) {
-            AR_DEBUG_ASSERT(curBuffer < BUFFER_PROC_LIST_DEPTH);
-                /* recv the current buffer synchronously, the buffers should come back in
-                 * order... with padding applied by the target */
-            paddedLength = (recvList[curBuffer].length + (g_BlockSizes[mbox] - 1)) &
-                       (~(g_BlockSizes[mbox] - 1));
-
-            status = HIFReadWrite(pDev->HIFDevice,
-                                  g_MailboxAddrs[mbox],
-                                  recvList[curBuffer].pBuffer,
-                                  paddedLength,
-                                  request,
-                                  NULL);
-            if (status != A_OK) {
-                AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Failed to read %d bytes on mailbox:%d : address:0x%X \n",
-                        recvList[curBuffer].length, mbox, g_MailboxAddrs[mbox]));
-                break;
-            }
-
-            totalwPadding += paddedLength;
-            totalBytes += recvList[curBuffer].length;
-            curBuffer++;
-        }
-
-        if (status != A_OK) {
-            break;
-        }
-            /* go back and get some more */
-        credits = 0;
-    }
-
-    if (totalBytes != TEST_BYTES) {
-        AR_DEBUG_ASSERT(FALSE);
-    }  else {
-        AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, ("Got all buffers on mbox:%d total recv :%d (w/Padding : %d) \n",
-            mbox, totalBytes, totalwPadding));
-    }
-
-    return status;
-
-
-}
-
-static A_STATUS DoOneMboxHWTest(AR6K_DEVICE *pDev, int mbox)
-{
-    A_STATUS status;
-
-    do {
-            /* send out buffers */
-        status = SendBuffers(pDev,mbox);
-
-        if (status != A_OK) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Sending buffers Failed : %d mbox:%d\n",status,mbox));
-            break;
-        }
-
-            /* go get them, this will block */
-        status =  RecvBuffers(pDev, mbox);
-
-        if (status != A_OK) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Recv buffers Failed : %d mbox:%d\n",status,mbox));
-            break;
-        }
-
-            /* check the returned data patterns */
-        if (!CheckBuffers()) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Buffer Verify Failed : mbox:%d\n",mbox));
-            status = A_ERROR;
-            break;
-        }
-
-        AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, (" Send/Recv success! mailbox : %d \n",mbox));
-
-    }  while (FALSE);
-
-    return status;
-}
-
-/* here is where the test starts */
-A_STATUS DoMboxHWTest(AR6K_DEVICE *pDev)
-{
-    int      i;
-    A_STATUS status;
-    int      credits = 0;
-    A_UINT8  params[4];
-    int      numBufs;
-    int      bufferSize;
-    A_UINT16 temp;
-
-
-    AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, (" DoMboxHWTest START -  \n"));
-
-    do {
-            /* get the addresses for all 4 mailboxes */
-        status = HIFConfigureDevice(pDev->HIFDevice, HIF_DEVICE_GET_MBOX_ADDR,
-                                    g_MailboxAddrs, sizeof(g_MailboxAddrs));
-
-        if (status != A_OK) {
-            AR_DEBUG_ASSERT(FALSE);
-            break;
-        }
-
-            /* get the block sizes */
-        status = HIFConfigureDevice(pDev->HIFDevice, HIF_DEVICE_GET_MBOX_BLOCK_SIZE,
-                                    g_BlockSizes, sizeof(g_BlockSizes));
-
-        if (status != A_OK) {
-            AR_DEBUG_ASSERT(FALSE);
-            break;
-        }
-
-            /* note, the HIF layer usually reports mbox 0 to have a block size of
-             * 1, but our test wants to run in block-mode for all mailboxes, so we treat all mailboxes
-             * the same. */
-        g_BlockSizes[0] = g_BlockSizes[1];
-        AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, ("Block Size to use: %d \n",g_BlockSizes[0]));
-
-        if (g_BlockSizes[1] > BUFFER_BLOCK_PAD) {
-            AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, ("%d Block size is too large for buffer pad %d\n",
-                g_BlockSizes[1], BUFFER_BLOCK_PAD));
-            break;
-        }
-
-        AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, ("Waiting for target.... \n"));
-
-            /* the target lets us know it is ready by giving us 1 credit on
-             * mailbox 0 */
-        status = GetCredits(pDev, 0, &credits);
-
-        if (status != A_OK) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Failed to wait for target ready \n"));
-            break;
-        }
-
-        AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, ("Target is ready ...\n"));
-
-            /* read the first 4 scratch registers */
-        status = HIFReadWrite(pDev->HIFDevice,
-                              SCRATCH_ADDRESS,
-                              params,
-                              4,
-                              HIF_RD_SYNC_BYTE_INC,
-                              NULL);
-
-        if (status != A_OK) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Failed to wait get parameters \n"));
-            break;
-        }
-
-        numBufs = params[0];
-        bufferSize = (int)(((A_UINT16)params[2] << 8) | (A_UINT16)params[1]);
-
-        AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE,
-            ("Target parameters: bufs per mailbox:%d, buffer size:%d bytes (total space: %d, minimum required space (w/padding): %d) \n",
-            numBufs, bufferSize, (numBufs * bufferSize), TOTAL_BYTES));
-
-        if ((numBufs * bufferSize) < TOTAL_BYTES) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Not Enough buffer space to run test! need:%d, got:%d \n",
-                TOTAL_BYTES, (numBufs*bufferSize)));
-            status = A_ERROR;
-            break;
-        }
-
-        temp = GetEndMarker();
-
-        status = HIFReadWrite(pDev->HIFDevice,
-                              SCRATCH_ADDRESS + 4,
-                              (A_UINT8 *)&temp,
-                              2,
-                              HIF_WR_SYNC_BYTE_INC,
-                              NULL);
-
-        if (status != A_OK) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Failed to write end marker \n"));
-            break;
-        }
-
-        AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, ("End Marker: 0x%X \n",temp));
-
-        temp = (A_UINT16)g_BlockSizes[1];
-            /* convert to a mask */
-        temp = temp - 1;
-        status = HIFReadWrite(pDev->HIFDevice,
-                              SCRATCH_ADDRESS + 6,
-                              (A_UINT8 *)&temp,
-                              2,
-                              HIF_WR_SYNC_BYTE_INC,
-                              NULL);
-
-        if (status != A_OK) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Failed to write block mask \n"));
-            break;
-        }
-
-        AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, ("Set Block Mask: 0x%X \n",temp));
-
-            /* execute the test on each mailbox */
-        for (i = 0; i < AR6K_MAILBOXES; i++) {
-            status = DoOneMboxHWTest(pDev, i);
-            if (status != A_OK) {
-                break;
-            }
-        }
-
-    } while (FALSE);
-
-    if (status == A_OK) {
-        AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, (" DoMboxHWTest DONE - SUCCESS! -  \n"));
-    } else {
-        AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, (" DoMboxHWTest DONE - FAILED! -  \n"));
-    }
-        /* don't let HTC_Start continue, the target is actually not running any HTC code */
-    return A_ERROR;
-}
-#endif
-
-
-
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/htc/ar6k.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/htc/ar6k.h
deleted file mode 100644
index 301ab34a3..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/htc/ar6k.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- *
- * Copyright (c) 2007 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#ifndef AR6K_H_
-#define AR6K_H_
-
-#define AR6K_MAILBOXES 4
-
-/* HTC runs over mailbox 0 */
-#define HTC_MAILBOX          0
-
-#define AR6K_TARGET_DEBUG_INTR_MASK     0x01
-
-#define OTHER_INTS_ENABLED (INT_STATUS_ENABLE_ERROR_MASK |   \
-                            INT_STATUS_ENABLE_CPU_MASK   |   \
-                            INT_STATUS_ENABLE_COUNTER_MASK)
-
-//#define MBOXHW_UNIT_TEST 1
-
-#include "athstartpack.h"
-typedef PREPACK struct _AR6K_IRQ_PROC_REGISTERS {
-    A_UINT8                      host_int_status;
-    A_UINT8                      cpu_int_status;
-    A_UINT8                      error_int_status;
-    A_UINT8                      counter_int_status;
-    A_UINT8                      mbox_frame;
-    A_UINT8                      rx_lookahead_valid;
-    A_UINT8                      hole[2];
-    A_UINT32                     rx_lookahead[2];
-} POSTPACK AR6K_IRQ_PROC_REGISTERS;
-
-#define AR6K_IRQ_PROC_REGS_SIZE sizeof(AR6K_IRQ_PROC_REGISTERS)
-
-
-
-typedef PREPACK struct _AR6K_IRQ_ENABLE_REGISTERS {
-    A_UINT8                      int_status_enable;
-    A_UINT8                      cpu_int_status_enable;
-    A_UINT8                      error_status_enable;
-    A_UINT8                      counter_int_status_enable;
-} POSTPACK AR6K_IRQ_ENABLE_REGISTERS;
-
-#include "athendpack.h"
-
-#define AR6K_IRQ_ENABLE_REGS_SIZE sizeof(AR6K_IRQ_ENABLE_REGISTERS)
-
-#define AR6K_REG_IO_BUFFER_SIZE     32
-#define AR6K_MAX_REG_IO_BUFFERS     8
-
-/* buffers for ASYNC I/O */
-typedef struct AR6K_ASYNC_REG_IO_BUFFER {
-    HTC_PACKET    HtcPacket;   /* we use an HTC packet as a wrapper for our async register-based I/O */
-    A_UINT8       Buffer[AR6K_REG_IO_BUFFER_SIZE];
-} AR6K_ASYNC_REG_IO_BUFFER;
-
-typedef struct _AR6K_DEVICE {
-    A_MUTEX_T                   Lock;
-    AR6K_IRQ_PROC_REGISTERS     IrqProcRegisters;
-    AR6K_IRQ_ENABLE_REGISTERS   IrqEnableRegisters;
-    void                        *HIFDevice;
-    A_UINT32                    BlockSize;
-    A_UINT32                    BlockMask;
-    A_UINT32                    MailboxAddress;
-    HIF_PENDING_EVENTS_FUNC     GetPendingEventsFunc;
-    void                        *HTCContext;
-    HTC_PACKET_QUEUE            RegisterIOList;
-    AR6K_ASYNC_REG_IO_BUFFER    RegIOBuffers[AR6K_MAX_REG_IO_BUFFERS];
-    void                        (*TargetFailureCallback)(void *Context);
-    A_STATUS                    (*MessagePendingCallback)(void *Context, A_UINT32 LookAhead, A_BOOL *pAsyncProc);
-    HIF_DEVICE_IRQ_PROCESSING_MODE  HifIRQProcessingMode;
-    HIF_MASK_UNMASK_RECV_EVENT      HifMaskUmaskRecvEvent;
-} AR6K_DEVICE;
-
-#define IS_DEV_IRQ_PROCESSING_ASYNC_ALLOWED(pDev) ((pDev)->HifIRQProcessingMode != HIF_DEVICE_IRQ_SYNC_ONLY)
-
-A_STATUS DevSetup(AR6K_DEVICE *pDev);
-A_STATUS DevUnmaskInterrupts(AR6K_DEVICE *pDev);
-A_STATUS DevMaskInterrupts(AR6K_DEVICE *pDev);
-A_STATUS DevPollMboxMsgRecv(AR6K_DEVICE *pDev,
-                            A_UINT32    *pLookAhead,
-                            int          TimeoutMS);
-A_STATUS DevRWCompletionHandler(void *context, A_STATUS status);
-A_STATUS DevDsrHandler(void *context);
-A_STATUS DevCheckPendingRecvMsgsAsync(void *context);
-void     DevDumpRegisters(AR6K_IRQ_PROC_REGISTERS   *pIrqProcRegs,
-                          AR6K_IRQ_ENABLE_REGISTERS *pIrqEnableRegs);
-
-#define DEV_STOP_RECV_ASYNC TRUE
-#define DEV_STOP_RECV_SYNC  FALSE
-#define DEV_ENABLE_RECV_ASYNC TRUE
-#define DEV_ENABLE_RECV_SYNC  FALSE
-A_STATUS DevStopRecv(AR6K_DEVICE *pDev, A_BOOL ASyncMode);
-A_STATUS DevEnableRecv(AR6K_DEVICE *pDev, A_BOOL ASyncMode);
-
-static INLINE A_STATUS DevSendPacket(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, A_UINT32 SendLength) {
-    A_UINT32 paddedLength;
-    A_BOOL   sync = (pPacket->Completion == NULL) ? TRUE : FALSE;
-    A_STATUS status;
-
-       /* adjust the length to be a multiple of block size if appropriate */
-    paddedLength = (SendLength + (pDev->BlockMask)) &
-                    (~(pDev->BlockMask));
-#if 0 // BufferLength may not be set in , fix this...
-    if (paddedLength > pPacket->BufferLength) {
-        AR_DEBUG_ASSERT(FALSE);
-        if (pPacket->Completion != NULL) {
-            COMPLETE_HTC_PACKET(pPacket,A_EINVAL);
-        }
-        return A_EINVAL;
-    }
-#endif
-    AR_DEBUG_PRINTF(ATH_DEBUG_SEND,
-                ("DevSendPacket, Padded Length: %d Mbox:0x%X (mode:%s)\n",
-                paddedLength,
-                pDev->MailboxAddress,
-                sync ? "SYNC" : "ASYNC"));
-
-    status = HIFReadWrite(pDev->HIFDevice,
-                          pDev->MailboxAddress,
-                          pPacket->pBuffer,
-                          paddedLength,     /* the padded length */
-                          sync ? HIF_WR_SYNC_BLOCK_INC : HIF_WR_ASYNC_BLOCK_INC,
-                          sync ? NULL : pPacket);  /* pass the packet as the context to the HIF request */
-
-    if (sync) {
-        pPacket->Status = status;
-    }
-
-    return status;
-}
-
-static INLINE A_STATUS DevRecvPacket(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, A_UINT32 RecvLength) {
-    A_UINT32 paddedLength;
-    A_STATUS status;
-    A_BOOL   sync = (pPacket->Completion == NULL) ? TRUE : FALSE;
-
-        /* adjust the length to be a multiple of block size if appropriate */
-    paddedLength = (RecvLength + (pDev->BlockMask)) &
-                    (~(pDev->BlockMask));
-    if (paddedLength > pPacket->BufferLength) {
-        AR_DEBUG_ASSERT(FALSE);
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-                ("DevRecvPacket, Not enough space for padlen:%d recvlen:%d bufferlen:%d \n",
-                    paddedLength,RecvLength,pPacket->BufferLength));
-        if (pPacket->Completion != NULL) {
-            COMPLETE_HTC_PACKET(pPacket,A_EINVAL);
-        }
-        return A_EINVAL;
-    }
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_RECV,
-                ("DevRecvPacket, Padded Length: %d Mbox:0x%X (mode:%s)\n",
-                paddedLength,
-                pDev->MailboxAddress,
-                sync ? "SYNC" : "ASYNC"));
-
-    status = HIFReadWrite(pDev->HIFDevice,
-                          pDev->MailboxAddress,
-                          pPacket->pBuffer,
-                          paddedLength,
-                          sync ? HIF_RD_SYNC_BLOCK_INC : HIF_RD_ASYNC_BLOCK_INC,
-                          sync ? NULL : pPacket);  /* pass the packet as the context to the HIF request */
-
-    if (sync) {
-        pPacket->Status = status;
-    }
-
-    return status;
-}
-
-#ifdef MBOXHW_UNIT_TEST
-A_STATUS DoMboxHWTest(AR6K_DEVICE *pDev);
-#endif
-
-#endif /*AR6K_H_*/
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/htc/ar6k_events.c b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/htc/ar6k_events.c
deleted file mode 100644
index 91b29af37..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/htc/ar6k_events.c
+++ /dev/null
@@ -1,638 +0,0 @@
-/*
- * AR6K Driver layer event handling (i.e. interrupts, message polling)
- *
- * Copyright (c) 2007 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-#include "a_config.h"
-#include "athdefs.h"
-#include "a_types.h"
-#include "AR6Khwreg.h"
-#include "a_osapi.h"
-#include "a_debug.h"
-#include "hif.h"
-#include "htc_packet.h"
-#include "ar6k.h"
-
-extern void AR6KFreeIOPacket(AR6K_DEVICE *pDev, HTC_PACKET *pPacket);
-extern HTC_PACKET *AR6KAllocIOPacket(AR6K_DEVICE *pDev);
-
-static A_STATUS DevServiceDebugInterrupt(AR6K_DEVICE *pDev);
-
-#define DELAY_PER_INTERVAL_MS 10  /* 10 MS delay per polling interval */
-
-/* completion routine for ALL HIF layer async I/O */
-A_STATUS DevRWCompletionHandler(void *context, A_STATUS status)
-{
-    HTC_PACKET *pPacket = (HTC_PACKET *)context;
-
-    COMPLETE_HTC_PACKET(pPacket,status);
-
-    return A_OK;
-}
-
-/* mailbox recv message polling */
-A_STATUS DevPollMboxMsgRecv(AR6K_DEVICE *pDev,
-                            A_UINT32    *pLookAhead,
-                            int          TimeoutMS)
-{
-    A_STATUS status = A_OK;
-    int      timeout = TimeoutMS/DELAY_PER_INTERVAL_MS;
-
-    AR_DEBUG_ASSERT(timeout > 0);
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_RECV,("+DevPollMboxMsgRecv \n"));
-
-    while (TRUE) {
-
-        if (pDev->GetPendingEventsFunc != NULL)
-		{
-
-            HIF_PENDING_EVENTS_INFO events;
-
-            /* the HIF layer uses a special mechanism to get events, do this
-             * synchronously */
-            status = pDev->GetPendingEventsFunc(pDev->HIFDevice,
-                                            &events,
-                                            NULL);
-            if (A_FAILED(status))
-			{
-                AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Failed to get pending events \n"));
-				break;
-            }
-
-            if (events.Events & HIF_RECV_MSG_AVAIL)
-			{
-                    /*  there is a message available, the lookahead should be valid now */
-                *pLookAhead = events.LookAhead;
-
-                break;
-            }
-        }
-		else
-		{
-
-                /* this is the standard HIF way.... */
-                /* load the register table */
-            status = HIFReadWrite(pDev->HIFDevice,
-                                  HOST_INT_STATUS_ADDRESS,
-                                  (A_UINT8 *)&pDev->IrqProcRegisters,
-                                  AR6K_IRQ_PROC_REGS_SIZE,
-                                  HIF_RD_SYNC_BYTE_INC,
-                                  NULL);
-
-            if (A_FAILED(status))
-			{
-                AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Failed to read register table \n"));
-                break;
-            }
-
-                /* check for MBOX data and valid lookahead */
-            if (pDev->IrqProcRegisters.host_int_status & (1 << HTC_MAILBOX))
-			{
-                if (pDev->IrqProcRegisters.rx_lookahead_valid & (1 << HTC_MAILBOX))
-				{
-                    /* mailbox has a message and the look ahead is valid */
-                    *pLookAhead = pDev->IrqProcRegisters.rx_lookahead[HTC_MAILBOX];
-                    break;
-                }
-            }
-
-        }
-
-        timeout--;
-
-        if (timeout <= 0)
-		{
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, (" Timeout waiting for recv message \n"));
-            status = A_ERROR;
-
-                /* check if the target asserted */
-            if ( pDev->IrqProcRegisters.counter_int_status & AR6K_TARGET_DEBUG_INTR_MASK) {
-                    /* target signaled an assert, process this pending interrupt
-                     * this will call the target failure handler */
-                DevServiceDebugInterrupt(pDev);
-            }
-
-            break;
-        }
-
-            /* delay a little  */
-         msleep(DELAY_PER_INTERVAL_MS);
-         AR_DEBUG_PRINTF(ATH_DEBUG_RECV,("  Retry Mbox Poll : %d \n",timeout));
-    }
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_RECV,("-DevPollMboxMsgRecv \n"));
-
-    return status;
-}
-
-static A_STATUS DevServiceCPUInterrupt(AR6K_DEVICE *pDev)
-{
-    A_STATUS status;
-    A_UINT8  cpu_int_status;
-    A_UINT8  regBuffer[4];
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ, ("CPU Interrupt\n"));
-    cpu_int_status = pDev->IrqProcRegisters.cpu_int_status &
-                     pDev->IrqEnableRegisters.cpu_int_status_enable;
-    AR_DEBUG_ASSERT(cpu_int_status);
-    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,
-                    ("Valid interrupt source(s) in CPU_INT_STATUS: 0x%x\n",
-                    cpu_int_status));
-
-        /* Clear the interrupt */
-    pDev->IrqProcRegisters.cpu_int_status &= ~cpu_int_status; /* W1C */
-
-        /* set up the register transfer buffer to hit the register 4 times , this is done
-         * to make the access 4-byte aligned to mitigate issues with host bus interconnects that
-         * restrict bus transfer lengths to be a multiple of 4-bytes */
-
-        /* set W1C value to clear the interrupt, this hits the register first */
-    regBuffer[0] = cpu_int_status;
-        /* the remaining 4 values are set to zero which have no-effect  */
-    regBuffer[1] = 0;
-    regBuffer[2] = 0;
-    regBuffer[3] = 0;
-
-    status = HIFReadWrite(pDev->HIFDevice,
-                          CPU_INT_STATUS_ADDRESS,
-                          regBuffer,
-                          4,
-                          HIF_WR_SYNC_BYTE_FIX,
-                          NULL);
-
-    AR_DEBUG_ASSERT(status == A_OK);
-    return status;
-}
-
-
-static A_STATUS DevServiceErrorInterrupt(AR6K_DEVICE *pDev)
-{
-    A_STATUS status;
-    A_UINT8  error_int_status;
-    A_UINT8  regBuffer[4];
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ, ("Error Interrupt\n"));
-    error_int_status = pDev->IrqProcRegisters.error_int_status & 0x0F;
-    AR_DEBUG_ASSERT(error_int_status);
-    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,
-                    ("Valid interrupt source(s) in ERROR_INT_STATUS: 0x%x\n",
-                    error_int_status));
-
-    if (ERROR_INT_STATUS_WAKEUP_GET(error_int_status)) {
-        /* Wakeup */
-        AR_DEBUG_PRINTF(ATH_DEBUG_IRQ, ("Error : Wakeup\n"));
-    }
-
-    if (ERROR_INT_STATUS_RX_UNDERFLOW_GET(error_int_status)) {
-        /* Rx Underflow */
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Error : Rx Underflow\n"));
-    }
-
-    if (ERROR_INT_STATUS_TX_OVERFLOW_GET(error_int_status)) {
-        /* Tx Overflow */
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Error : Tx Overflow\n"));
-    }
-
-        /* Clear the interrupt */
-    pDev->IrqProcRegisters.error_int_status &= ~error_int_status; /* W1C */
-
-        /* set up the register transfer buffer to hit the register 4 times , this is done
-         * to make the access 4-byte aligned to mitigate issues with host bus interconnects that
-         * restrict bus transfer lengths to be a multiple of 4-bytes */
-
-        /* set W1C value to clear the interrupt, this hits the register first */
-    regBuffer[0] = error_int_status;
-        /* the remaining 4 values are set to zero which have no-effect  */
-    regBuffer[1] = 0;
-    regBuffer[2] = 0;
-    regBuffer[3] = 0;
-
-    status = HIFReadWrite(pDev->HIFDevice,
-                          ERROR_INT_STATUS_ADDRESS,
-                          regBuffer,
-                          4,
-                          HIF_WR_SYNC_BYTE_FIX,
-                          NULL);
-
-    AR_DEBUG_ASSERT(status == A_OK);
-    return status;
-}
-
-static A_STATUS DevServiceDebugInterrupt(AR6K_DEVICE *pDev)
-{
-    A_UINT32 dummy;
-    A_STATUS status;
-
-    /* Send a target failure event to the application */
-    AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Target debug interrupt\n"));
-
-    if (pDev->TargetFailureCallback != NULL) {
-        pDev->TargetFailureCallback(pDev->HTCContext);
-    }
-
-    /* clear the interrupt , the debug error interrupt is
-     * counter 0 */
-        /* read counter to clear interrupt */
-    status = HIFReadWrite(pDev->HIFDevice,
-                          COUNT_DEC_ADDRESS,
-                          (A_UINT8 *)&dummy,
-                          4,
-                          HIF_RD_SYNC_BYTE_INC,
-                          NULL);
-
-    AR_DEBUG_ASSERT(status == A_OK);
-    return status;
-}
-
-static A_STATUS DevServiceCounterInterrupt(AR6K_DEVICE *pDev)
-{
-    A_UINT8 counter_int_status;
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ, ("Counter Interrupt\n"));
-
-    counter_int_status = pDev->IrqProcRegisters.counter_int_status &
-                         pDev->IrqEnableRegisters.counter_int_status_enable;
-
-    AR_DEBUG_ASSERT(counter_int_status);
-    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,
-                    ("Valid interrupt source(s) in COUNTER_INT_STATUS: 0x%x\n",
-                    counter_int_status));
-
-    /* Check if the debug interrupt is pending */
-    if (counter_int_status & AR6K_TARGET_DEBUG_INTR_MASK) {
-        return DevServiceDebugInterrupt(pDev);
-    }
-
-    return A_OK;
-}
-
-/* callback when our fetch to get interrupt status registers completes */
-static void DevGetEventAsyncHandler(void *Context, HTC_PACKET *pPacket)
-{
-    AR6K_DEVICE *pDev = (AR6K_DEVICE *)Context;
-    A_UINT32    lookAhead = 0;
-    A_BOOL      otherInts = FALSE;
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("+DevGetEventAsyncHandler: (dev: 0x%X)\n", (A_UINT32)pDev));
-
-    do {
-
-        if (A_FAILED(pPacket->Status)) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-                    (" GetEvents I/O request failed, status:%d \n", pPacket->Status));
-            /* bail out, don't unmask HIF interrupt */
-            break;
-        }
-
-        if (pDev->GetPendingEventsFunc != NULL) {
-                /* the HIF layer collected the information for us */
-            HIF_PENDING_EVENTS_INFO *pEvents = (HIF_PENDING_EVENTS_INFO *)pPacket->pBuffer;
-            if (pEvents->Events & HIF_RECV_MSG_AVAIL) {
-                lookAhead = pEvents->LookAhead;
-                if (0 == lookAhead) {
-                    AR_DEBUG_PRINTF(ATH_DEBUG_ERR,(" DevGetEventAsyncHandler1, lookAhead is zero! \n"));
-                }
-            }
-            if (pEvents->Events & HIF_OTHER_EVENTS) {
-                otherInts = TRUE;
-            }
-        } else {
-                /* standard interrupt table handling.... */
-            AR6K_IRQ_PROC_REGISTERS *pReg = (AR6K_IRQ_PROC_REGISTERS *)pPacket->pBuffer;
-            A_UINT8                 host_int_status;
-
-            host_int_status = pReg->host_int_status & pDev->IrqEnableRegisters.int_status_enable;
-
-            if (host_int_status & (1 << HTC_MAILBOX)) {
-                host_int_status &= ~(1 << HTC_MAILBOX);
-                if (pReg->rx_lookahead_valid & (1 << HTC_MAILBOX)) {
-                        /* mailbox has a message and the look ahead is valid */
-                    lookAhead = pReg->rx_lookahead[HTC_MAILBOX];
-                    if (0 == lookAhead) {
-                        AR_DEBUG_PRINTF(ATH_DEBUG_ERR,(" DevGetEventAsyncHandler2, lookAhead is zero! \n"));
-                    }
-                }
-            }
-
-            if (host_int_status) {
-                    /* there are other interrupts to handle */
-                otherInts = TRUE;
-            }
-        }
-
-        if (otherInts || (lookAhead == 0)) {
-            /* if there are other interrupts to process, we cannot do this in the async handler so
-             * ack the interrupt which will cause our sync handler to run again
-             * if however there are no more messages, we can now ack the interrupt  */
-            AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,
-                (" Acking interrupt from DevGetEventAsyncHandler (otherints:%d, lookahead:0x%X)\n",
-                otherInts, lookAhead));
-            HIFAckInterrupt(pDev->HIFDevice);
-        } else {
-            AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,
-                    (" DevGetEventAsyncHandler : detected another message, lookahead :0x%X \n",
-                    lookAhead));
-                /* lookahead is non-zero and there are no other interrupts to service,
-                 * go get the next message */
-            pDev->MessagePendingCallback(pDev->HTCContext, lookAhead, NULL);
-        }
-
-    } while (FALSE);
-
-        /* free this IO packet */
-    AR6KFreeIOPacket(pDev,pPacket);
-    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("-DevGetEventAsyncHandler \n"));
-}
-
-/* called by the HTC layer when it wants us to check if the device has any more pending
- * recv messages, this starts off a series of async requests to read interrupt registers  */
-A_STATUS DevCheckPendingRecvMsgsAsync(void *context)
-{
-    AR6K_DEVICE  *pDev = (AR6K_DEVICE *)context;
-    A_STATUS      status = A_OK;
-    HTC_PACKET   *pIOPacket;
-
-    /* this is called in an ASYNC only context, we may NOT block, sleep or call any apis that can
-     * cause us to switch contexts */
-
-   AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("+DevCheckPendingRecvMsgsAsync: (dev: 0x%X)\n", (A_UINT32)pDev));
-
-   do {
-
-        if (HIF_DEVICE_IRQ_SYNC_ONLY == pDev->HifIRQProcessingMode) {
-                /* break the async processing chain right here, no need to continue.
-                 * The DevDsrHandler() will handle things in a loop when things are driven
-                 * synchronously  */
-            break;
-        }
-            /* first allocate one of our HTC packets we created for async I/O
-             * we reuse HTC packet definitions so that we can use the completion mechanism
-             * in DevRWCompletionHandler() */
-        pIOPacket = AR6KAllocIOPacket(pDev);
-
-        if (NULL == pIOPacket) {
-                /* there should be only 1 asynchronous request out at a time to read these registers
-                 * so this should actually never happen */
-            status = A_NO_MEMORY;
-            AR_DEBUG_ASSERT(FALSE);
-            break;
-        }
-
-            /* stick in our completion routine when the I/O operation completes */
-        pIOPacket->Completion = DevGetEventAsyncHandler;
-        pIOPacket->pContext = pDev;
-
-        if (pDev->GetPendingEventsFunc) {
-                /* HIF layer has it's own mechanism, pass the IO to it.. */
-            status = pDev->GetPendingEventsFunc(pDev->HIFDevice,
-                                                (HIF_PENDING_EVENTS_INFO *)pIOPacket->pBuffer,
-                                                pIOPacket);
-
-        } else {
-                /* standard way, read the interrupt register table asynchronously again */
-            status = HIFReadWrite(pDev->HIFDevice,
-                                  HOST_INT_STATUS_ADDRESS,
-                                  pIOPacket->pBuffer,
-                                  AR6K_IRQ_PROC_REGS_SIZE,
-                                  HIF_RD_ASYNC_BYTE_INC,
-                                  pIOPacket);
-        }
-
-        AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,(" Async IO issued to get interrupt status...\n"));
-   } while (FALSE);
-
-   AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("-DevCheckPendingRecvMsgsAsync \n"));
-
-   return status;
-}
-
-/* process pending interrupts synchronously */
-static A_STATUS ProcessPendingIRQs(AR6K_DEVICE *pDev, A_BOOL *pDone, A_BOOL *pASyncProcessing)
-{
-    A_STATUS    status = A_OK;
-    A_UINT8     host_int_status = 0;
-    A_UINT32    lookAhead = 0;
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("+ProcessPendingIRQs: (dev: 0x%X)\n", (A_UINT32)pDev));
-
-    /*** NOTE: the HIF implementation guarantees that the context of this call allows
-     *         us to perform SYNCHRONOUS I/O, that is we can block, sleep or call any API that
-     *         can block or switch thread/task ontexts.
-     *         This is a fully schedulable context.
-     * */
-    do {
-
-        if (pDev->GetPendingEventsFunc != NULL) {
-            HIF_PENDING_EVENTS_INFO events;
-
-                /* the HIF layer uses a special mechanism to get events
-                 * get this synchronously  */
-            status = pDev->GetPendingEventsFunc(pDev->HIFDevice,
-                                                &events,
-                                                NULL);
-
-            if (A_FAILED(status)) {
-                break;
-            }
-
-            if (events.Events & HIF_RECV_MSG_AVAIL) {
-                lookAhead = events.LookAhead;
-                if (0 == lookAhead) {
-                    AR_DEBUG_PRINTF(ATH_DEBUG_ERR,(" ProcessPendingIRQs1 lookAhead is zero! \n"));
-                }
-            }
-
-            if (!(events.Events & HIF_OTHER_EVENTS) ||
-                !(pDev->IrqEnableRegisters.int_status_enable & OTHER_INTS_ENABLED)) {
-                    /* no need to read the register table, no other interesting interrupts.
-                     * Some interfaces (like SPI) can shadow interrupt sources without
-                     * requiring the host to do a full table read */
-                break;
-            }
-
-            /* otherwise fall through and read the register table */
-        }
-
-        /*
-         * Read the first 28 bytes of the HTC register table. This will yield us
-         * the value of different int status registers and the lookahead
-         * registers.
-         *    length = sizeof(int_status) + sizeof(cpu_int_status) +
-         *             sizeof(error_int_status) + sizeof(counter_int_status) +
-         *             sizeof(mbox_frame) + sizeof(rx_lookahead_valid) +
-         *             sizeof(hole) +  sizeof(rx_lookahead) +
-         *             sizeof(int_status_enable) + sizeof(cpu_int_status_enable) +
-         *             sizeof(error_status_enable) +
-         *             sizeof(counter_int_status_enable);
-         *
-        */
-        status = HIFReadWrite(pDev->HIFDevice,
-                              HOST_INT_STATUS_ADDRESS,
-                              (A_UINT8 *)&pDev->IrqProcRegisters,
-                              AR6K_IRQ_PROC_REGS_SIZE,
-                              HIF_RD_SYNC_BYTE_INC,
-                              NULL);
-
-        if (A_FAILED(status)) {
-            break;
-        }
-
-        if (AR_DEBUG_LVL_CHECK(ATH_DEBUG_IRQ)) {
-            DevDumpRegisters(&pDev->IrqProcRegisters,
-                             &pDev->IrqEnableRegisters);
-        }
-
-            /* Update only those registers that are enabled */
-        host_int_status = pDev->IrqProcRegisters.host_int_status &
-                          pDev->IrqEnableRegisters.int_status_enable;
-
-        if (NULL == pDev->GetPendingEventsFunc) {
-                /* only look at mailbox status if the HIF layer did not provide this function,
-                 * on some HIF interfaces reading the RX lookahead is not valid to do */
-            if (host_int_status & (1 << HTC_MAILBOX)) {
-                    /* mask out pending mailbox value, we use "lookAhead" as the real flag for
-                     * mailbox processing below */
-                host_int_status &= ~(1 << HTC_MAILBOX);
-                if (pDev->IrqProcRegisters.rx_lookahead_valid & (1 << HTC_MAILBOX)) {
-                        /* mailbox has a message and the look ahead is valid */
-                    lookAhead = pDev->IrqProcRegisters.rx_lookahead[HTC_MAILBOX];
-                    if (0 == lookAhead) {
-                        AR_DEBUG_PRINTF(ATH_DEBUG_ERR,(" ProcessPendingIRQs2, lookAhead is zero! \n"));
-                    }
-                }
-            }
-        } else {
-                /* not valid to check if the HIF has another mechanism for reading mailbox pending status*/
-            host_int_status &= ~(1 << HTC_MAILBOX);
-        }
-
-    } while (FALSE);
-
-
-    do {
-
-            /* did the interrupt status fetches succeed? */
-        if (A_FAILED(status)) {
-            break;
-        }
-
-        if ((0 == host_int_status) && (0 == lookAhead)) {
-                /* nothing to process, the caller can use this to break out of a loop */
-            *pDone = TRUE;
-            break;
-        }
-
-        if (lookAhead != 0) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("Pending mailbox message, LookAhead: 0x%X\n",lookAhead));
-                /* Mailbox Interrupt, the HTC layer may issue async requests to empty the
-                 * mailbox...
-                 * When emptying the recv mailbox we use the async handler above called from the
-                 * completion routine of the callers read request. This can improve performance
-                 * by reducing context switching when we rapidly pull packets */
-            status = pDev->MessagePendingCallback(pDev->HTCContext, lookAhead, pASyncProcessing);
-            if (A_FAILED(status)) {
-                break;
-            }
-        }
-
-            /* now handle the rest of them */
-        AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,
-                            (" Valid interrupt source(s) for OTHER interrupts: 0x%x\n",
-                            host_int_status));
-
-        if (HOST_INT_STATUS_CPU_GET(host_int_status)) {
-                /* CPU Interrupt */
-            status = DevServiceCPUInterrupt(pDev);
-            if (A_FAILED(status)){
-                break;
-            }
-        }
-
-        if (HOST_INT_STATUS_ERROR_GET(host_int_status)) {
-                /* Error Interrupt */
-            status = DevServiceErrorInterrupt(pDev);
-            if (A_FAILED(status)){
-                break;
-            }
-        }
-
-        if (HOST_INT_STATUS_COUNTER_GET(host_int_status)) {
-                /* Counter Interrupt */
-            status = DevServiceCounterInterrupt(pDev);
-            if (A_FAILED(status)){
-                break;
-            }
-        }
-
-    } while (FALSE);
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("-ProcessPendingIRQs: (done:%d, async:%d) status=%d \n",
-                *pDone, *pASyncProcessing, status));
-
-    return status;
-}
-
-
-/* Synchronousinterrupt handler, this handler kicks off all interrupt processing.*/
-A_STATUS DevDsrHandler(void *context)
-{
-    AR6K_DEVICE *pDev = (AR6K_DEVICE *)context;
-    A_STATUS    status = A_OK;
-    A_BOOL      done = FALSE;
-    A_BOOL      asyncProc = FALSE;
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("+DevDsrHandler: (dev: 0x%X)\n", (A_UINT32)pDev));
-
-
-    while (!done) {
-        status = ProcessPendingIRQs(pDev, &done, &asyncProc);
-        if (A_FAILED(status)) {
-            break;
-        }
-
-        if (HIF_DEVICE_IRQ_SYNC_ONLY == pDev->HifIRQProcessingMode) {
-            /* the HIF layer does not allow async IRQ processing, override the asyncProc flag */
-            asyncProc = FALSE;
-            /* this will cause us to re-enter ProcessPendingIRQ() and re-read interrupt status registers.
-             * this has a nice side effect of blocking us until all async read requests are completed.
-             * This behavior is required on some HIF implementations that do not allow ASYNC
-             * processing in interrupt handlers (like Windows CE) */
-        }
-
-        if (asyncProc) {
-                /* the function performed some async I/O for performance, we
-                   need to exit the ISR immediately, the check below will prevent the interrupt from being
-                   Ack'd while we handle it asynchronously */
-            break;
-        }
-
-    }
-
-    if (A_SUCCESS(status) && !asyncProc) {
-            /* Ack the interrupt only if :
-             *  1. we did not get any errors in processing interrupts
-             *  2. there are no outstanding async processing requests */
-        AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,(" Acking interrupt from DevDsrHandler \n"));
-        HIFAckInterrupt(pDev->HIFDevice);
-    }
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("-DevDsrHandler \n"));
-    return A_OK;
-}
-
-
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/htc/htc.c b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/htc/htc.c
deleted file mode 100644
index d52ed944e..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/htc/htc.c
+++ /dev/null
@@ -1,508 +0,0 @@
-/*
- *
- * Copyright (c) 2007 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#include "htc_internal.h"
-
-
-static HTC_INIT_INFO  HTCInitInfo = {NULL,NULL,NULL};
-static A_BOOL         HTCInitialized = FALSE;
-
-static A_STATUS HTCTargetInsertedHandler(void *hif_handle);
-static A_STATUS HTCTargetRemovedHandler(void *handle, A_STATUS status);
-static void HTCReportFailure(void *Context);
-
-/* Initializes the HTC layer */
-A_STATUS HTCInit(HTC_INIT_INFO *pInitInfo)
-{
-    HTC_CALLBACKS htcCallbacks;
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("HTCInit: Enter\n"));
-    if (HTCInitialized) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("HTCInit: Exit\n"));
-        return A_OK;
-    }
-
-    A_MEMCPY(&HTCInitInfo,pInitInfo,sizeof(HTC_INIT_INFO));
-
-    A_MEMZERO(&htcCallbacks, sizeof(HTC_CALLBACKS));
-
-        /* setup HIF layer callbacks */
-    htcCallbacks.deviceInsertedHandler = HTCTargetInsertedHandler;
-    htcCallbacks.deviceRemovedHandler = HTCTargetRemovedHandler;
-        /* the device layer handles these */
-    htcCallbacks.rwCompletionHandler = DevRWCompletionHandler;
-    htcCallbacks.dsrHandler = DevDsrHandler;
-    HIFInit(&htcCallbacks);
-    HTCInitialized = TRUE;
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("HTCInit: Exit\n"));
-    return A_OK;
-}
-
-void HTCFreeControlBuffer(HTC_TARGET *target, HTC_PACKET *pPacket, HTC_PACKET_QUEUE *pList)
-{
-    LOCK_HTC(target);
-    HTC_PACKET_ENQUEUE(pList,pPacket);
-    UNLOCK_HTC(target);
-}
-
-HTC_PACKET *HTCAllocControlBuffer(HTC_TARGET *target,  HTC_PACKET_QUEUE *pList)
-{
-    HTC_PACKET *pPacket;
-
-    LOCK_HTC(target);
-    pPacket = HTC_PACKET_DEQUEUE(pList);
-    UNLOCK_HTC(target);
-
-    return pPacket;
-}
-
-/* cleanup the HTC instance */
-static void HTCCleanup(HTC_TARGET *target)
-{
-    if (A_IS_MUTEX_VALID(&target->HTCLock)) {
-        A_MUTEX_DELETE(&target->HTCLock);
-    }
-
-    if (A_IS_MUTEX_VALID(&target->HTCRxLock)) {
-        A_MUTEX_DELETE(&target->HTCRxLock);
-    }
-
-    if (A_IS_MUTEX_VALID(&target->HTCTxLock)) {
-        A_MUTEX_DELETE(&target->HTCTxLock);
-    }
-        /* free our instance */
-    A_FREE(target);
-}
-
-/* registered target arrival callback from the HIF layer */
-static A_STATUS HTCTargetInsertedHandler(void *hif_handle)
-{
-    HTC_TARGET              *target = NULL;
-    A_STATUS                 status;
-    int                      i;
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("htcTargetInserted - Enter\n"));
-
-    do {
-
-            /* allocate target memory */
-        if ((target = (HTC_TARGET *)A_MALLOC(sizeof(HTC_TARGET))) == NULL) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to allocate memory\n"));
-            status = A_ERROR;
-            break;
-        }
-
-        A_MEMZERO(target, sizeof(HTC_TARGET));
-        A_MUTEX_INIT(&target->HTCLock);
-        A_MUTEX_INIT(&target->HTCRxLock);
-        A_MUTEX_INIT(&target->HTCTxLock);
-        INIT_HTC_PACKET_QUEUE(&target->ControlBufferTXFreeList);
-        INIT_HTC_PACKET_QUEUE(&target->ControlBufferRXFreeList);
-
-            /* give device layer the hif device handle */
-        target->Device.HIFDevice = hif_handle;
-            /* give the device layer our context (for event processing)
-             * the device layer will register it's own context with HIF
-             * so we need to set this so we can fetch it in the target remove handler */
-        target->Device.HTCContext = target;
-            /* set device layer target failure callback */
-        target->Device.TargetFailureCallback = HTCReportFailure;
-            /* set device layer recv message pending callback */
-        target->Device.MessagePendingCallback = HTCRecvMessagePendingHandler;
-        target->EpWaitingForBuffers = ENDPOINT_MAX;
-
-            /* setup device layer */
-        status = DevSetup(&target->Device);
-
-        if (A_FAILED(status)) {
-            break;
-        }
-
-            /* carve up buffers/packets for control messages */
-        for (i = 0; i < NUM_CONTROL_RX_BUFFERS; i++) {
-            HTC_PACKET *pControlPacket;
-            pControlPacket = &target->HTCControlBuffers[i].HtcPacket;
-            SET_HTC_PACKET_INFO_RX_REFILL(pControlPacket,
-                                          target,
-                                          target->HTCControlBuffers[i].Buffer,
-                                          HTC_CONTROL_BUFFER_SIZE,
-                                          ENDPOINT_0);
-            HTC_FREE_CONTROL_RX(target,pControlPacket);
-        }
-
-        for (;i < NUM_CONTROL_BUFFERS;i++) {
-             HTC_PACKET *pControlPacket;
-             pControlPacket = &target->HTCControlBuffers[i].HtcPacket;
-             INIT_HTC_PACKET_INFO(pControlPacket,
-                                  target->HTCControlBuffers[i].Buffer,
-                                  HTC_CONTROL_BUFFER_SIZE);
-             HTC_FREE_CONTROL_TX(target,pControlPacket);
-        }
-
-    } while (FALSE);
-
-    if (A_SUCCESS(status)) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_TRC, (" calling AddInstance callback \n"));
-            /* announce ourselves */
-        HTCInitInfo.AddInstance((HTC_HANDLE)target);
-    } else {
-        if (target != NULL) {
-            HTCCleanup(target);
-        }
-    }
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("htcTargetInserted - Exit\n"));
-
-    return status;
-}
-
-/* registered removal callback from the HIF layer */
-static A_STATUS HTCTargetRemovedHandler(void *handle, A_STATUS status)
-{
-    HTC_TARGET *target;
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("+HTCTargetRemovedHandler handle:0x%X \n",(A_UINT32)handle));
-
-    if (NULL == handle) {
-            /* this could be NULL in the event that target initialization failed */
-        return A_OK;
-    }
-
-    target = ((AR6K_DEVICE *)handle)->HTCContext;
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("   removing target:0x%X instance:0x%X ... \n",
-            (A_UINT32)target, (A_UINT32)target->pInstanceContext));
-
-    if (target->pInstanceContext != NULL) {
-            /* let upper layer know, it needs to call HTCStop() */
-        HTCInitInfo.DeleteInstance(target->pInstanceContext);
-    }
-
-    HIFShutDownDevice(target->Device.HIFDevice);
-
-    HTCCleanup(target);
-    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("-HTCTargetRemovedHandler \n"));
-    return A_OK;
-}
-
-/* get the low level HIF device for the caller , the caller may wish to do low level
- * HIF requests */
-void *HTCGetHifDevice(HTC_HANDLE HTCHandle)
-{
-    HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-    return target->Device.HIFDevice;
-}
-
-/* set the instance block for this HTC handle, so that on removal, the blob can be
- * returned to the caller */
-void HTCSetInstance(HTC_HANDLE HTCHandle, void *Instance)
-{
-    HTC_TARGET  *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-
-    target->pInstanceContext = Instance;
-}
-
-/* wait for the target to arrive (sends HTC Ready message)
- * this operation is fully synchronous and the message is polled for */
-A_STATUS HTCWaitTarget(HTC_HANDLE HTCHandle)
-{
-    HTC_TARGET              *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-    A_STATUS                 status;
-    HTC_PACKET              *pPacket = NULL;
-    HTC_READY_MSG           *pRdyMsg;
-    HTC_SERVICE_CONNECT_REQ  connect;
-    HTC_SERVICE_CONNECT_RESP resp;
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("HTCWaitTarget - Enter (target:0x%X) \n", (A_UINT32)target));
-
-    do {
-
-#ifdef MBOXHW_UNIT_TEST
-
-        status = DoMboxHWTest(&target->Device);
-
-        if (status != A_OK) {
-            break;
-        }
-
-#endif
-
-            /* we should be getting 1 control message that the target is ready */
-        status = HTCWaitforControlMessage(target, &pPacket);
-
-        if (A_FAILED(status)) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, (" Target Not Available!!\n"));
-            break;
-        }
-
-            /* we controlled the buffer creation so it has to be properly aligned */
-        pRdyMsg = (HTC_READY_MSG *)pPacket->pBuffer;
-
-        if ((pRdyMsg->MessageID != HTC_MSG_READY_ID) ||
-            (pPacket->ActualLength < sizeof(HTC_READY_MSG))) {
-                /* this message is not valid */
-            AR_DEBUG_ASSERT(FALSE);
-            status = A_EPROTO;
-            break;
-        }
-
-        if (pRdyMsg->CreditCount == 0 || pRdyMsg->CreditSize == 0) {
-              /* this message is not valid */
-            AR_DEBUG_ASSERT(FALSE);
-            status = A_EPROTO;
-            break;
-        }
-
-        target->TargetCredits = pRdyMsg->CreditCount;
-        target->TargetCreditSize = pRdyMsg->CreditSize;
-
-        AR_DEBUG_PRINTF(ATH_DEBUG_TRC, (" Target Ready: credits: %d credit size: %d\n",
-                target->TargetCredits, target->TargetCreditSize));
-
-            /* setup our pseudo HTC control endpoint connection */
-        A_MEMZERO(&connect,sizeof(connect));
-        A_MEMZERO(&resp,sizeof(resp));
-        connect.EpCallbacks.pContext = target;
-        connect.EpCallbacks.EpTxComplete = HTCControlTxComplete;
-        connect.EpCallbacks.EpRecv = HTCControlRecv;
-        connect.EpCallbacks.EpRecvRefill = NULL;  /* not needed */
-        connect.EpCallbacks.EpSendFull = NULL;    /* not needed */
-        connect.EpCallbacks.EpSendAvail = NULL;   /* not needed */
-        connect.MaxSendQueueDepth = NUM_CONTROL_BUFFERS;
-        connect.ServiceID = HTC_CTRL_RSVD_SVC;
-
-            /* connect fake service */
-        status = HTCConnectService((HTC_HANDLE)target,
-                                   &connect,
-                                   &resp);
-
-        if (!A_FAILED(status)) {
-            break;
-        }
-
-    } while (FALSE);
-
-    if (pPacket != NULL) {
-        HTC_FREE_CONTROL_RX(target,pPacket);
-    }
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("HTCWaitTarget - Exit\n"));
-
-    return status;
-}
-
-
-
-/* Start HTC, enable interrupts and let the target know host has finished setup */
-A_STATUS HTCStart(HTC_HANDLE HTCHandle)
-{
-    HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-    HTC_PACKET *pPacket;
-    A_STATUS   status;
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("HTCStart Enter\n"));
-
-        /* now that we are starting, push control receive buffers into the
-         * HTC control endpoint */
-
-    while (1) {
-        pPacket = HTC_ALLOC_CONTROL_RX(target);
-        if (NULL == pPacket) {
-            break;
-        }
-        HTCAddReceivePkt((HTC_HANDLE)target,pPacket);
-    }
-
-    do {
-
-        AR_DEBUG_ASSERT(target->InitCredits != NULL);
-        AR_DEBUG_ASSERT(target->EpCreditDistributionListHead != NULL);
-        AR_DEBUG_ASSERT(target->EpCreditDistributionListHead->pNext != NULL);
-
-            /* call init credits callback to do the distribution ,
-             * NOTE: the first entry in the distribution list is ENDPOINT_0, so
-             * we pass the start of the list after this one. */
-        target->InitCredits(target->pCredDistContext,
-                            target->EpCreditDistributionListHead->pNext,
-                            target->TargetCredits);
-
-        if (AR_DEBUG_LVL_CHECK(ATH_DEBUG_TRC)) {
-            DumpCreditDistStates(target);
-        }
-
-            /* the caller is done connecting to services, so we can indicate to the
-            * target that the setup phase is complete */
-        status = HTCSendSetupComplete(target);
-
-        if (A_FAILED(status)) {
-            break;
-        }
-
-            /* unmask interrupts */
-        status = DevUnmaskInterrupts(&target->Device);
-
-        if (A_FAILED(status)) {
-            HTCStop(target);
-        }
-
-    } while (FALSE);
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("HTCStart Exit\n"));
-    return status;
-}
-
-
-/* stop HTC communications, i.e. stop interrupt reception, and flush all queued buffers */
-void HTCStop(HTC_HANDLE HTCHandle)
-{
-    HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("+HTCStop \n"));
-
-        /* mark that we are shutting down .. */
-    target->HTCStateFlags |= HTC_STATE_STOPPING;
-
-        /* Masking interrupts is a synchronous operation, when this function returns
-         * all pending HIF I/O has completed, we can safely flush the queues */
-    DevMaskInterrupts(&target->Device);
-
-        /* flush all send packets */
-    HTCFlushSendPkts(target);
-        /* flush all recv buffers */
-    HTCFlushRecvBuffers(target);
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("-HTCStop \n"));
-}
-
-/* undo what was done in HTCInit() */
-void HTCShutDown(void)
-{
-    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("+HTCShutDown: \n"));
-    HTCInitialized = FALSE;
-        /* undo HTCInit */
-    HIFShutDownDevice(NULL);
-    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("-HTCShutDown: \n"));
-}
-
-void HTCDumpCreditStates(HTC_HANDLE HTCHandle)
-{
-    HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-
-    LOCK_HTC_TX(target);
-
-    DumpCreditDistStates(target);
-
-    UNLOCK_HTC_TX(target);
-}
-
-/* report a target failure from the device, this is a callback from the device layer
- * which uses a mechanism to report errors from the target (i.e. special interrupts) */
-static void HTCReportFailure(void *Context)
-{
-    HTC_TARGET *target = (HTC_TARGET *)Context;
-
-    target->TargetFailure = TRUE;
-
-    if ((target->pInstanceContext != NULL) && (HTCInitInfo.TargetFailure != NULL)) {
-            /* let upper layer know, it needs to call HTCStop() */
-        HTCInitInfo.TargetFailure(target->pInstanceContext, A_ERROR);
-    }
-}
-
-void DebugDumpBytes(A_UCHAR *buffer, A_UINT16 length, char *pDescription)
-{
-    A_CHAR stream[60];
-    A_UINT32 i;
-    A_UINT16 offset, count;
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, ("<---------Dumping %d Bytes : %s ------>\n", length, pDescription));
-
-    count = 0;
-    offset = 0;
-    for(i = 0; i < length; i++) {
-        sprintf(stream + offset, "%2.2X ", buffer[i]);
-        count ++;
-        offset += 3;
-
-        if(count == 16) {
-            count = 0;
-            offset = 0;
-            AR_DEBUG_PRINTF(ATH_DEBUG_ANY, ("[H]: %s\n", stream));
-            A_MEMZERO(stream, 60);
-        }
-    }
-
-    if(offset != 0) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_ANY, ("[H]: %s\n", stream));
-    }
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, ("<------------------------------------------------->\n"));
-}
-
-A_BOOL HTCGetEndpointStatistics(HTC_HANDLE               HTCHandle,
-                                HTC_ENDPOINT_ID          Endpoint,
-                                HTC_ENDPOINT_STAT_ACTION Action,
-                                HTC_ENDPOINT_STATS       *pStats)
-{
-
-#ifdef HTC_EP_STAT_PROFILING
-    HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-    A_BOOL     clearStats = FALSE;
-    A_BOOL     sample = FALSE;
-
-    switch (Action) {
-        case HTC_EP_STAT_SAMPLE :
-            sample = TRUE;
-            break;
-        case HTC_EP_STAT_SAMPLE_AND_CLEAR :
-            sample = TRUE;
-            clearStats = TRUE;
-            break;
-        case HTC_EP_STAT_CLEAR :
-            clearStats = TRUE;
-            break;
-        default:
-            break;
-    }
-
-    A_ASSERT(Endpoint < ENDPOINT_MAX);
-
-        /* lock out TX and RX while we sample and/or clear */
-    LOCK_HTC_TX(target);
-    LOCK_HTC_RX(target);
-
-    if (sample) {
-        A_ASSERT(pStats != NULL);
-            /* return the stats to the caller */
-        A_MEMCPY(pStats, &target->EndPoint[Endpoint].EndPointStats, sizeof(HTC_ENDPOINT_STATS));
-    }
-
-    if (clearStats) {
-            /* reset stats */
-        A_MEMZERO(&target->EndPoint[Endpoint].EndPointStats, sizeof(HTC_ENDPOINT_STATS));
-    }
-
-    UNLOCK_HTC_RX(target);
-    UNLOCK_HTC_TX(target);
-
-    return TRUE;
-#else
-    return FALSE;
-#endif
-}
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/htc/htc_debug.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/htc/htc_debug.h
deleted file mode 100644
index 08080be51..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/htc/htc_debug.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#ifndef HTC_DEBUG_H_
-#define HTC_DEBUG_H_
-/*
- *
- * Copyright (c) 2004-2007 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-/* ------- Debug related stuff ------- */
-enum {
-    ATH_DEBUG_SEND = 0x0001,
-    ATH_DEBUG_RECV = 0x0002,
-    ATH_DEBUG_SYNC = 0x0004,
-    ATH_DEBUG_DUMP = 0x0008,
-    ATH_DEBUG_IRQ  = 0x0010,
-    ATH_DEBUG_TRC  = 0x0020,
-    ATH_DEBUG_WARN = 0x0040,
-    ATH_DEBUG_ERR  = 0x0080,
-    ATH_DEBUG_ANY  = 0xFFFF,
-};
-
-#ifdef DEBUG
-
-// TODO FIX usage of A_PRINTF!
-#define AR_DEBUG_LVL_CHECK(lvl) (debughtc & (lvl))
-#define AR_DEBUG_PRINTBUF(buffer, length, desc) do {   \
-    if (debughtc & ATH_DEBUG_DUMP) {             \
-        DebugDumpBytes(buffer, length,desc);               \
-    }                                            \
-} while(0)
-#define PRINTX_ARG(arg...) arg
-#define AR_DEBUG_PRINTF(flags, args) do {        \
-    if (debughtc & (flags)) {                    \
-        A_PRINTF(KERN_ALERT PRINTX_ARG args);    \
-    }                                            \
-} while (0)
-#define AR_DEBUG_ASSERT(test) do {               \
-    if (!(test)) {                               \
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Debug Assert Caught, File %s, Line: %d, Test:%s \n",__FILE__, __LINE__,#test));         \
-    }                                            \
-} while(0)
-extern int debughtc;
-#else
-#define AR_DEBUG_PRINTF(flags, args)
-#define AR_DEBUG_PRINTBUF(buffer, length, desc)
-#define AR_DEBUG_ASSERT(test)
-#define AR_DEBUG_LVL_CHECK(lvl) 0
-#endif
-
-void DebugDumpBytes(A_UCHAR *buffer, A_UINT16 length, char *pDescription);
-
-#endif /*HTC_DEBUG_H_*/
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/htc/htc_internal.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/htc/htc_internal.h
deleted file mode 100644
index ebb8ac16e..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/htc/htc_internal.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- *
- * Copyright (c) 2007 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#ifndef _HTC_INTERNAL_H_
-#define _HTC_INTERNAL_H_
-
-/* for debugging, uncomment this to capture the last frame header, on frame header
- * processing errors, the last frame header is dump for comparison */
-//#define HTC_CAPTURE_LAST_FRAME
-
-//#define HTC_EP_STAT_PROFILING
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* Header files */
-#include "a_config.h"
-#include "athdefs.h"
-#include "a_types.h"
-#include "a_osapi.h"
-#include "a_debug.h"
-#include "htc.h"
-#include "htc_api.h"
-#include "bmi_msg.h"
-#include "hif.h"
-#include "ar6k.h"
-
-/* HTC operational parameters */
-#define HTC_TARGET_RESPONSE_TIMEOUT        2000 /* in ms */
-#define HTC_TARGET_DEBUG_INTR_MASK         0x01
-#define HTC_TARGET_CREDIT_INTR_MASK        0xF0
-
-typedef struct _HTC_ENDPOINT {
-    HTC_SERVICE_ID              ServiceID;      /* service ID this endpoint is bound to
-                                                   non-zero value means this endpoint is in use */
-    HTC_PACKET_QUEUE            TxQueue;        /* HTC frame buffer TX queue */
-    HTC_PACKET_QUEUE            RxBuffers;      /* HTC frame buffer RX list */
-    HTC_ENDPOINT_CREDIT_DIST    CreditDist;     /* credit distribution structure (exposed to driver layer) */
-    HTC_EP_CALLBACKS            EpCallBacks;    /* callbacks associated with this endpoint */
-    int                         MaxTxQueueDepth;   /* max depth of the TX queue before we need to
-                                                      call driver's full handler */
-    int                         CurrentTxQueueDepth; /* current TX queue depth */
-    int                         MaxMsgLength;        /* max length of endpoint message */
-#ifdef HTC_EP_STAT_PROFILING
-    HTC_ENDPOINT_STATS          EndPointStats;  /* endpoint statistics */
-#endif
-} HTC_ENDPOINT;
-
-#ifdef HTC_EP_STAT_PROFILING
-#define INC_HTC_EP_STAT(p,stat,count) (p)->EndPointStats.stat += (count);
-#else
-#define INC_HTC_EP_STAT(p,stat,count)
-#endif
-
-#define HTC_SERVICE_TX_PACKET_TAG  HTC_TX_PACKET_TAG_INTERNAL
-
-#define NUM_CONTROL_BUFFERS     8
-#define NUM_CONTROL_TX_BUFFERS  2
-#define NUM_CONTROL_RX_BUFFERS  (NUM_CONTROL_BUFFERS - NUM_CONTROL_TX_BUFFERS)
-
-#define HTC_CONTROL_BUFFER_SIZE (HTC_MAX_CONTROL_MESSAGE_LENGTH + HTC_HDR_LENGTH)
-
-typedef struct HTC_CONTROL_BUFFER {
-    HTC_PACKET    HtcPacket;
-    A_UINT8       Buffer[HTC_CONTROL_BUFFER_SIZE];
-} HTC_CONTROL_BUFFER;
-
-/* our HTC target state */
-typedef struct _HTC_TARGET {
-    HTC_ENDPOINT                EndPoint[ENDPOINT_MAX];
-    HTC_CONTROL_BUFFER          HTCControlBuffers[NUM_CONTROL_BUFFERS];
-    HTC_ENDPOINT_CREDIT_DIST   *EpCreditDistributionListHead;
-    HTC_PACKET_QUEUE            ControlBufferTXFreeList;
-    HTC_PACKET_QUEUE            ControlBufferRXFreeList;
-    HTC_CREDIT_DIST_CALLBACK    DistributeCredits;
-    HTC_CREDIT_INIT_CALLBACK    InitCredits;
-    void                       *pCredDistContext;
-    int                         TargetCredits;
-    int                         TargetCreditSize;
-    A_MUTEX_T                   HTCLock;
-    A_MUTEX_T                   HTCRxLock;
-    A_MUTEX_T                   HTCTxLock;
-    AR6K_DEVICE                 Device;         /* AR6K - specific state */
-    A_UINT32                    HTCStateFlags;
-    HTC_ENDPOINT_ID             EpWaitingForBuffers;
-    A_BOOL                      TargetFailure;
-    void                       *pInstanceContext;
-#define HTC_STATE_WAIT_BUFFERS  (1 << 0)
-#define HTC_STATE_STOPPING      (1 << 1)
-#ifdef HTC_CAPTURE_LAST_FRAME
-    HTC_FRAME_HDR               LastFrameHdr;  /* useful for debugging */
-    A_UINT8                     LastTrailer[256];
-    A_UINT8                     LastTrailerLength;
-#endif
-} HTC_TARGET;
-
-#define HTC_STOPPING(t) ((t)->HTCStateFlags & HTC_STATE_STOPPING)
-#define LOCK_HTC(t)      A_MUTEX_LOCK(&(t)->HTCLock);
-#define UNLOCK_HTC(t)    A_MUTEX_UNLOCK(&(t)->HTCLock);
-#define LOCK_HTC_RX(t)   A_MUTEX_LOCK(&(t)->HTCRxLock);
-#define UNLOCK_HTC_RX(t) A_MUTEX_UNLOCK(&(t)->HTCRxLock);
-#define LOCK_HTC_TX(t)   A_MUTEX_LOCK(&(t)->HTCTxLock);
-#define UNLOCK_HTC_TX(t) A_MUTEX_UNLOCK(&(t)->HTCTxLock);
-
-#define GET_HTC_TARGET_FROM_HANDLE(hnd) ((HTC_TARGET *)(hnd))
-#define HTC_RECYCLE_RX_PKT(target,p)                \
-{                                                   \
-    HTC_PACKET_RESET_RX(pPacket);                   \
-    HTCAddReceivePkt((HTC_HANDLE)(target),(p));     \
-}
-
-/* internal HTC functions */
-void        HTCControlTxComplete(void *Context, HTC_PACKET *pPacket);
-void        HTCControlRecv(void *Context, HTC_PACKET *pPacket);
-A_STATUS    HTCWaitforControlMessage(HTC_TARGET *target, HTC_PACKET **ppControlPacket);
-HTC_PACKET *HTCAllocControlBuffer(HTC_TARGET *target, HTC_PACKET_QUEUE *pList);
-void        HTCFreeControlBuffer(HTC_TARGET *target, HTC_PACKET *pPacket, HTC_PACKET_QUEUE *pList);
-A_STATUS    HTCIssueSend(HTC_TARGET *target, HTC_PACKET *pPacket, A_UINT8 Flags);
-A_STATUS    HTCIssueRecv(HTC_TARGET *target, HTC_PACKET *pPacket);
-void        HTCRecvCompleteHandler(void *Context, HTC_PACKET *pPacket);
-A_STATUS    HTCRecvMessagePendingHandler(void *Context, A_UINT32 LookAhead, A_BOOL *pAsyncProc);
-void        HTCProcessCreditRpt(HTC_TARGET *target, HTC_CREDIT_REPORT *pRpt, int NumEntries, HTC_ENDPOINT_ID FromEndpoint);
-A_STATUS    HTCSendSetupComplete(HTC_TARGET *target);
-void        HTCFlushRecvBuffers(HTC_TARGET *target);
-void        HTCFlushSendPkts(HTC_TARGET *target);
-void        DumpCreditDist(HTC_ENDPOINT_CREDIT_DIST *pEPDist);
-void        DumpCreditDistStates(HTC_TARGET *target);
-void 		DebugDumpBytes(A_UCHAR *buffer, A_UINT16 length, char *pDescription);
-
-static INLINE HTC_PACKET *HTC_ALLOC_CONTROL_TX(HTC_TARGET *target) {
-    HTC_PACKET *pPacket = HTCAllocControlBuffer(target,&target->ControlBufferTXFreeList);
-    if (pPacket != NULL) {
-            /* set payload pointer area with some headroom */
-        pPacket->pBuffer = pPacket->pBufferStart + HTC_HDR_LENGTH;
-    }
-    return pPacket;
-}
-
-#define HTC_FREE_CONTROL_TX(t,p) HTCFreeControlBuffer((t),(p),&(t)->ControlBufferTXFreeList)
-#define HTC_ALLOC_CONTROL_RX(t)  HTCAllocControlBuffer((t),&(t)->ControlBufferRXFreeList)
-#define HTC_FREE_CONTROL_RX(t,p) \
-{                                                                \
-    HTC_PACKET_RESET_RX(p);                                      \
-    HTCFreeControlBuffer((t),(p),&(t)->ControlBufferRXFreeList); \
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _HTC_INTERNAL_H_ */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/htc/htc_recv.c b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/htc/htc_recv.c
deleted file mode 100644
index 4be2b0833..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/htc/htc_recv.c
+++ /dev/null
@@ -1,703 +0,0 @@
-/*
- *
- * Copyright (c) 2007 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#include "htc_internal.h"
-
-#define HTCIssueRecv(t, p) \
-    DevRecvPacket(&(t)->Device,  \
-                  (p),          \
-                  (p)->ActualLength)
-
-#define DO_RCV_COMPLETION(t,p,e)            \
-{                                           \
-    if ((p)->ActualLength > 0) {            \
-        AR_DEBUG_PRINTF(ATH_DEBUG_RECV, (" completing packet 0x%X (%d bytes) on ep : %d \n", \
-            (A_UINT32)(p), (p)->ActualLength, (p)->Endpoint));  \
-        (e)->EpCallBacks.EpRecv((e)->EpCallBacks.pContext,      \
-                                (p));                           \
-    } else {                                                    \
-        AR_DEBUG_PRINTF(ATH_DEBUG_RECV, (" recycling empty packet \n"));  \
-        HTC_RECYCLE_RX_PKT((t), (p));                           \
-    }                                                           \
-}
-
-#ifdef HTC_EP_STAT_PROFILING
-#define HTC_RX_STAT_PROFILE(t,ep,lookAhead)            \
-{                                                      \
-    LOCK_HTC_RX((t));                                  \
-    INC_HTC_EP_STAT((ep), RxReceived, 1);              \
-    if ((lookAhead) != 0) {                            \
-        INC_HTC_EP_STAT((ep), RxLookAheads, 1);        \
-    }                                                  \
-    UNLOCK_HTC_RX((t));                                \
-}
-#else
-#define HTC_RX_STAT_PROFILE(t,ep,lookAhead)
-#endif
-
-static INLINE A_STATUS HTCProcessTrailer(HTC_TARGET *target,
-                                         A_UINT8    *pBuffer,
-                                         int         Length,
-                                         A_UINT32   *pNextLookAhead,
-                                         HTC_ENDPOINT_ID FromEndpoint)
-{
-    HTC_RECORD_HDR          *pRecord;
-    A_UINT8                 *pRecordBuf;
-    HTC_LOOKAHEAD_REPORT    *pLookAhead;
-    A_UINT8                 *pOrigBuffer;
-    int                     origLength;
-    A_STATUS                status;
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_RECV, ("+HTCProcessTrailer (length:%d) \n", Length));
-
-    if (AR_DEBUG_LVL_CHECK(ATH_DEBUG_RECV)) {
-        AR_DEBUG_PRINTBUF(pBuffer,Length,"Recv Trailer");
-    }
-
-    pOrigBuffer = pBuffer;
-    origLength = Length;
-    status = A_OK;
-
-    while (Length > 0) {
-
-        if (Length < sizeof(HTC_RECORD_HDR)) {
-            status = A_EPROTO;
-            break;
-        }
-            /* these are byte aligned structs */
-        pRecord = (HTC_RECORD_HDR *)pBuffer;
-        Length -= sizeof(HTC_RECORD_HDR);
-        pBuffer += sizeof(HTC_RECORD_HDR);
-
-        if (pRecord->Length > Length) {
-                /* no room left in buffer for record */
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-                (" invalid record length: %d (id:%d) buffer has: %d bytes left \n",
-                        pRecord->Length, pRecord->RecordID, Length));
-            status = A_EPROTO;
-            break;
-        }
-            /* start of record follows the header */
-        pRecordBuf = pBuffer;
-
-        switch (pRecord->RecordID) {
-            case HTC_RECORD_CREDITS:
-                AR_DEBUG_ASSERT(pRecord->Length >= sizeof(HTC_CREDIT_REPORT));
-                HTCProcessCreditRpt(target,
-                                    (HTC_CREDIT_REPORT *)pRecordBuf,
-                                    pRecord->Length / (sizeof(HTC_CREDIT_REPORT)),
-                                    FromEndpoint);
-                break;
-            case HTC_RECORD_LOOKAHEAD:
-                AR_DEBUG_ASSERT(pRecord->Length >= sizeof(HTC_LOOKAHEAD_REPORT));
-                pLookAhead = (HTC_LOOKAHEAD_REPORT *)pRecordBuf;
-                if ((pLookAhead->PreValid == ((~pLookAhead->PostValid) & 0xFF)) &&
-                    (pNextLookAhead != NULL)) {
-
-                    AR_DEBUG_PRINTF(ATH_DEBUG_RECV,
-                                (" LookAhead Report Found (pre valid:0x%X, post valid:0x%X) \n",
-                                pLookAhead->PreValid,
-                                pLookAhead->PostValid));
-
-                        /* look ahead bytes are valid, copy them over */
-                    ((A_UINT8 *)pNextLookAhead)[0] = pLookAhead->LookAhead[0];
-                    ((A_UINT8 *)pNextLookAhead)[1] = pLookAhead->LookAhead[1];
-                    ((A_UINT8 *)pNextLookAhead)[2] = pLookAhead->LookAhead[2];
-                    ((A_UINT8 *)pNextLookAhead)[3] = pLookAhead->LookAhead[3];
-
-                    if (AR_DEBUG_LVL_CHECK(ATH_DEBUG_RECV)) {
-                        DebugDumpBytes((A_UINT8 *)pNextLookAhead,4,"Next Look Ahead");
-                    }
-                }
-                break;
-            default:
-                AR_DEBUG_PRINTF(ATH_DEBUG_ERR, (" unhandled record: id:%d length:%d \n",
-                        pRecord->RecordID, pRecord->Length));
-                break;
-        }
-
-        if (A_FAILED(status)) {
-            break;
-        }
-
-            /* advance buffer past this record for next time around */
-        pBuffer += pRecord->Length;
-        Length -= pRecord->Length;
-    }
-
-    if (A_FAILED(status)) {
-        DebugDumpBytes(pOrigBuffer,origLength,"BAD Recv Trailer");
-    }
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_RECV, ("-HTCProcessTrailer \n"));
-    return status;
-
-}
-
-/* process a received message (i.e. strip off header, process any trailer data)
- * note : locks must be released when this function is called */
-static A_STATUS HTCProcessRecvHeader(HTC_TARGET *target, HTC_PACKET *pPacket, A_UINT32 *pNextLookAhead)
-{
-    A_UINT8   temp;
-    A_UINT8   *pBuf;
-    A_STATUS  status = A_OK;
-    A_UINT16  payloadLen;
-    A_UINT32  lookAhead;
-
-    pBuf = pPacket->pBuffer;
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_RECV, ("+HTCProcessRecvHeader \n"));
-
-    if (AR_DEBUG_LVL_CHECK(ATH_DEBUG_RECV)) {
-        AR_DEBUG_PRINTBUF(pBuf,pPacket->ActualLength,"HTC Recv PKT");
-    }
-
-    do {
-        /* note, we cannot assume the alignment of pBuffer, so we use the safe macros to
-         * retrieve 16 bit fields */
-        payloadLen = A_GET_UINT16_FIELD(pBuf, HTC_FRAME_HDR, PayloadLen);
-
-        ((A_UINT8 *)&lookAhead)[0] = pBuf[0];
-        ((A_UINT8 *)&lookAhead)[1] = pBuf[1];
-        ((A_UINT8 *)&lookAhead)[2] = pBuf[2];
-        ((A_UINT8 *)&lookAhead)[3] = pBuf[3];
-
-        if (lookAhead != pPacket->HTCReserved) {
-            /* somehow the lookahead that gave us the full read length did not
-             * reflect the actual header in the pending message */
-             AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-                    ("HTCProcessRecvHeader, lookahead mismatch! \n"));
-             DebugDumpBytes((A_UINT8 *)&pPacket->HTCReserved,4,"Expected Message LookAhead");
-             DebugDumpBytes(pBuf,sizeof(HTC_FRAME_HDR),"Current Frame Header");
-#ifdef HTC_CAPTURE_LAST_FRAME
-            DebugDumpBytes((A_UINT8 *)&target->LastFrameHdr,sizeof(HTC_FRAME_HDR),"Last Frame Header");
-            if (target->LastTrailerLength != 0) {
-                DebugDumpBytes(target->LastTrailer,
-                               target->LastTrailerLength,
-                               "Last trailer");
-            }
-#endif
-            status = A_EPROTO;
-            break;
-        }
-
-            /* get flags */
-        temp = A_GET_UINT8_FIELD(pBuf, HTC_FRAME_HDR, Flags);
-
-        if (temp & HTC_FLAGS_RECV_TRAILER) {
-            /* this packet has a trailer */
-
-                /* extract the trailer length in control byte 0 */
-            temp = A_GET_UINT8_FIELD(pBuf, HTC_FRAME_HDR, ControlBytes[0]);
-
-            if ((temp < sizeof(HTC_RECORD_HDR)) || (temp > payloadLen)) {
-                AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-                    ("HTCProcessRecvHeader, invalid header (payloadlength should be :%d, CB[0] is:%d) \n",
-                        payloadLen, temp));
-                status = A_EPROTO;
-                break;
-            }
-
-                /* process trailer data that follows HDR + application payload */
-            status = HTCProcessTrailer(target,
-                                       (pBuf + HTC_HDR_LENGTH + payloadLen - temp),
-                                       temp,
-                                       pNextLookAhead,
-                                       pPacket->Endpoint);
-
-            if (A_FAILED(status)) {
-                break;
-            }
-
-#ifdef HTC_CAPTURE_LAST_FRAME
-            A_MEMCPY(target->LastTrailer, (pBuf + HTC_HDR_LENGTH + payloadLen - temp), temp);
-            target->LastTrailerLength = temp;
-#endif
-                /* trim length by trailer bytes */
-            pPacket->ActualLength -= temp;
-        }
-#ifdef HTC_CAPTURE_LAST_FRAME
-         else {
-            target->LastTrailerLength = 0;
-        }
-#endif
-
-            /* if we get to this point, the packet is good */
-            /* remove header and adjust length */
-        pPacket->pBuffer += HTC_HDR_LENGTH;
-        pPacket->ActualLength -= HTC_HDR_LENGTH;
-
-    } while (FALSE);
-
-    if (A_FAILED(status)) {
-            /* dump the whole packet */
-        DebugDumpBytes(pBuf,pPacket->ActualLength,"BAD HTC Recv PKT");
-    } else {
-#ifdef HTC_CAPTURE_LAST_FRAME
-        A_MEMCPY(&target->LastFrameHdr,pBuf,sizeof(HTC_FRAME_HDR));
-#endif
-        if (AR_DEBUG_LVL_CHECK(ATH_DEBUG_RECV)) {
-            if (pPacket->ActualLength > 0) {
-                AR_DEBUG_PRINTBUF(pPacket->pBuffer,pPacket->ActualLength,"HTC - Application Msg");
-            }
-        }
-    }
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_RECV, ("-HTCProcessRecvHeader \n"));
-    return status;
-}
-
-/* asynchronous completion handler for recv packet fetching, when the device layer
- * completes a read request, it will call this completion handler */
-void HTCRecvCompleteHandler(void *Context, HTC_PACKET *pPacket)
-{
-    HTC_TARGET      *target = (HTC_TARGET *)Context;
-    HTC_ENDPOINT    *pEndpoint;
-    A_UINT32        nextLookAhead = 0;
-    A_STATUS        status;
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_RECV, ("+HTCRecvCompleteHandler (status:%d, ep:%d) \n",
-                pPacket->Status, pPacket->Endpoint));
-
-    AR_DEBUG_ASSERT(pPacket->Endpoint < ENDPOINT_MAX);
-    pEndpoint = &target->EndPoint[pPacket->Endpoint];
-    pPacket->Completion = NULL;
-
-        /* get completion status */
-    status = pPacket->Status;
-
-    do {
-        if (A_FAILED(status)) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("HTCRecvCompleteHandler: request failed (status:%d, ep:%d) \n",
-                pPacket->Status, pPacket->Endpoint));
-            break;
-        }
-            /* process the header for any trailer data */
-        status = HTCProcessRecvHeader(target,pPacket,&nextLookAhead);
-
-        if (A_FAILED(status)) {
-            break;
-        }
-            /* was there a lookahead for the next packet? */
-        if (nextLookAhead != 0) {
-            A_STATUS nextStatus;
-            AR_DEBUG_PRINTF(ATH_DEBUG_RECV,
-                            ("HTCRecvCompleteHandler - next look ahead was non-zero : 0x%X \n",
-                             nextLookAhead));
-                /* we have another packet, get the next packet fetch started (pipelined) before
-                 * we call into the endpoint's callback, this will start another async request */
-            nextStatus = HTCRecvMessagePendingHandler(target,nextLookAhead,NULL);
-            if (A_EPROTO == nextStatus) {
-                AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-                            ("Next look ahead from recv header was INVALID\n"));
-                DebugDumpBytes((A_UINT8 *)&nextLookAhead,
-                                4,
-                                "BAD lookahead from lookahead report");
-            }
-        } else {
-             AR_DEBUG_PRINTF(ATH_DEBUG_RECV,
-            ("HTCRecvCompleteHandler - rechecking for more messages...\n"));
-            /* if we did not get anything on the look-ahead,
-             * call device layer to asynchronously re-check for messages. If we can keep the async
-             * processing going we get better performance.  If there is a pending message we will keep processing
-             * messages asynchronously which should pipeline things nicely */
-            DevCheckPendingRecvMsgsAsync(&target->Device);
-        }
-
-        HTC_RX_STAT_PROFILE(target,pEndpoint,nextLookAhead);
-        DO_RCV_COMPLETION(target,pPacket,pEndpoint);
-
-    } while (FALSE);
-
-    if (A_FAILED(status)) {
-         AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-                         ("HTCRecvCompleteHandler , message fetch failed (status = %d) \n",
-                         status));
-            /* recyle this packet */
-         HTC_RECYCLE_RX_PKT(target, pPacket);
-    }
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_RECV, ("-HTCRecvCompleteHandler\n"));
-}
-
-/* synchronously wait for a control message from the target,
- * This function is used at initialization time ONLY.  At init messages
- * on ENDPOINT 0 are expected. */
-A_STATUS HTCWaitforControlMessage(HTC_TARGET *target, HTC_PACKET **ppControlPacket)
-{
-    A_STATUS        status;
-    A_UINT32        lookAhead;
-    HTC_PACKET      *pPacket = NULL;
-    HTC_FRAME_HDR   *pHdr;
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_RECV,("+HTCWaitforControlMessage \n"));
-
-    do  {
-
-        *ppControlPacket = NULL;
-
-            /* call the polling function to see if we have a message */
-        status = DevPollMboxMsgRecv(&target->Device,
-                                    &lookAhead,
-                                    HTC_TARGET_RESPONSE_TIMEOUT);
-
-        if (A_FAILED(status)) {
-            break;
-        }
-
-        AR_DEBUG_PRINTF(ATH_DEBUG_RECV,
-                ("HTCWaitforControlMessage : lookAhead : 0x%X \n", lookAhead));
-
-            /* check the lookahead */
-        pHdr = (HTC_FRAME_HDR *)&lookAhead;
-
-        if (pHdr->EndpointID != ENDPOINT_0) {
-                /* unexpected endpoint number, should be zero */
-            AR_DEBUG_ASSERT(FALSE);
-            status = A_EPROTO;
-            break;
-        }
-
-        if (A_FAILED(status)) {
-                /* bad message */
-            AR_DEBUG_ASSERT(FALSE);
-            status = A_EPROTO;
-            break;
-        }
-
-        pPacket = HTC_ALLOC_CONTROL_RX(target);
-
-        if (pPacket == NULL) {
-            AR_DEBUG_ASSERT(FALSE);
-            status = A_NO_MEMORY;
-            break;
-        }
-
-        pPacket->HTCReserved = lookAhead;
-        pPacket->ActualLength = pHdr->PayloadLen + HTC_HDR_LENGTH;
-
-        if (pPacket->ActualLength > pPacket->BufferLength) {
-            AR_DEBUG_ASSERT(FALSE);
-            status = A_EPROTO;
-            break;
-        }
-
-            /* we want synchronous operation */
-        pPacket->Completion = NULL;
-
-            /* get the message from the device, this will block */
-        status = HTCIssueRecv(target, pPacket);
-
-        if (A_FAILED(status)) {
-            break;
-        }
-
-            /* process receive header */
-        status = HTCProcessRecvHeader(target,pPacket,NULL);
-
-        pPacket->Status = status;
-
-        if (A_FAILED(status)) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-                    ("HTCWaitforControlMessage, HTCProcessRecvHeader failed (status = %d) \n",
-                     status));
-            break;
-        }
-
-            /* give the caller this control message packet, they are responsible to free */
-        *ppControlPacket = pPacket;
-
-    } while (FALSE);
-
-    if (A_FAILED(status)) {
-        if (pPacket != NULL) {
-                /* cleanup buffer on error */
-            HTC_FREE_CONTROL_RX(target,pPacket);
-        }
-    }
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_RECV,("-HTCWaitforControlMessage \n"));
-
-    return status;
-}
-
-/* callback when device layer or lookahead report parsing detects a pending message */
-A_STATUS HTCRecvMessagePendingHandler(void *Context, A_UINT32 LookAhead, A_BOOL *pAsyncProc)
-{
-    HTC_TARGET      *target = (HTC_TARGET *)Context;
-    A_STATUS         status = A_OK;
-    HTC_PACKET      *pPacket = NULL;
-    HTC_FRAME_HDR   *pHdr;
-    HTC_ENDPOINT    *pEndpoint;
-    A_BOOL          asyncProc = FALSE;
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_RECV,("+HTCRecvMessagePendingHandler LookAhead:0x%X \n",LookAhead));
-
-    if (IS_DEV_IRQ_PROCESSING_ASYNC_ALLOWED(&target->Device)) {
-            /* We use async mode to get the packets if the device layer supports it.
-             * The device layer interfaces with HIF in which HIF may have restrictions on
-             * how interrupts are processed */
-        asyncProc = TRUE;
-    }
-
-    if (pAsyncProc != NULL) {
-            /* indicate to caller how we decided to process this */
-        *pAsyncProc = asyncProc;
-    }
-
-    while (TRUE) {
-
-        pHdr = (HTC_FRAME_HDR *)&LookAhead;
-
-        if (pHdr->EndpointID >= ENDPOINT_MAX) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Invalid Endpoint in look-ahead: %d \n",pHdr->EndpointID));
-                /* invalid endpoint */
-            status = A_EPROTO;
-            break;
-        }
-
-        if (pHdr->PayloadLen > HTC_MAX_PAYLOAD_LENGTH) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Payload length %d exceeds max HTC : %d !\n",
-                    pHdr->PayloadLen, HTC_MAX_PAYLOAD_LENGTH));
-            status = A_EPROTO;
-            break;
-        }
-
-        pEndpoint = &target->EndPoint[pHdr->EndpointID];
-
-        if (0 == pEndpoint->ServiceID) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Endpoint %d is not connected !\n",pHdr->EndpointID));
-                /* endpoint isn't even connected */
-            status = A_EPROTO;
-            break;
-        }
-
-            /* lock RX to get a buffer */
-        LOCK_HTC_RX(target);
-
-            /* get a packet from the endpoint recv queue */
-        pPacket = HTC_PACKET_DEQUEUE(&pEndpoint->RxBuffers);
-
-        if (NULL == pPacket) {
-                /* check for refill handler */
-            if (pEndpoint->EpCallBacks.EpRecvRefill != NULL) {
-                UNLOCK_HTC_RX(target);
-                    /* call the re-fill handler */
-                pEndpoint->EpCallBacks.EpRecvRefill(pEndpoint->EpCallBacks.pContext,
-                                                    pHdr->EndpointID);
-                LOCK_HTC_RX(target);
-                    /* check if we have more buffers */
-                pPacket = HTC_PACKET_DEQUEUE(&pEndpoint->RxBuffers);
-                    /* fall through */
-            }
-        }
-
-        if (NULL == pPacket) {
-                /* this is not an error, we simply need to mark that we are waiting for buffers.*/
-            target->HTCStateFlags |= HTC_STATE_WAIT_BUFFERS;
-            target->EpWaitingForBuffers = pHdr->EndpointID;
-            status = A_NO_MEMORY;
-        }
-
-        UNLOCK_HTC_RX(target);
-
-        if (A_FAILED(status)) {
-                /* no buffers */
-            break;
-        }
-
-        AR_DEBUG_ASSERT(pPacket->Endpoint == pHdr->EndpointID);
-
-            /* make sure this message can fit in the endpoint buffer */
-        if ((pHdr->PayloadLen + HTC_HDR_LENGTH) > pPacket->BufferLength) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-                    ("Payload Length Error : header reports payload of: %d, endpoint buffer size: %d \n",
-                    pHdr->PayloadLen, pPacket->BufferLength));
-            status = A_EPROTO;
-            break;
-        }
-
-        pPacket->HTCReserved = LookAhead; /* set expected look ahead */
-            /* set the amount of data to fetch */
-        pPacket->ActualLength = pHdr->PayloadLen + HTC_HDR_LENGTH;
-
-        if (asyncProc) {
-                /* we use async mode to get the packet if the device layer supports it
-                 * set our callback and context */
-            pPacket->Completion = HTCRecvCompleteHandler;
-            pPacket->pContext = target;
-        } else {
-                /* fully synchronous */
-            pPacket->Completion = NULL;
-        }
-
-            /* go fetch the packet */
-        status = HTCIssueRecv(target, pPacket);
-
-        if (A_FAILED(status)) {
-            break;
-        }
-
-        if (asyncProc) {
-                /* we did this asynchronously so we can get out of the loop, the asynch processing
-                 * creates a chain of requests to continue processing pending messages in the
-                 * context of callbacks  */
-            break;
-        }
-
-            /* in the sync case, we process the packet, check lookaheads and then repeat */
-
-        LookAhead = 0;
-        status = HTCProcessRecvHeader(target,pPacket,&LookAhead);
-
-        if (A_FAILED(status)) {
-            break;
-        }
-
-        HTC_RX_STAT_PROFILE(target,pEndpoint,LookAhead);
-        DO_RCV_COMPLETION(target,pPacket,pEndpoint);
-
-        pPacket = NULL;
-
-        if (0 == LookAhead) {
-            break;
-        }
-
-    }
-
-    if (A_NO_MEMORY == status) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-                (" Endpoint :%d has no buffers, blocking receiver to prevent overrun.. \n",
-                pHdr->EndpointID));
-            /* try to stop receive at the device layer */
-        DevStopRecv(&target->Device, asyncProc ? DEV_STOP_RECV_ASYNC : DEV_STOP_RECV_SYNC);
-        status = A_OK;
-    } else if (A_FAILED(status)) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-                        ("Failed to get pending message : LookAhead Value: 0x%X (status = %d) \n",
-                        LookAhead, status));
-        if (pPacket != NULL) {
-                /* clean up packet on error */
-            HTC_RECYCLE_RX_PKT(target, pPacket);
-        }
-    }
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_RECV,("-HTCRecvMessagePendingHandler \n"));
-
-    return status;
-}
-
-/* Makes a buffer available to the HTC module */
-A_STATUS HTCAddReceivePkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket)
-{
-    HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-    HTC_ENDPOINT *pEndpoint;
-    A_BOOL       unblockRecv = FALSE;
-    A_STATUS     status = A_OK;
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_SEND,
-                    ("+- HTCAddReceivePkt: endPointId: %d, buffer: 0x%X, length: %d\n",
-                    pPacket->Endpoint, (A_UINT32)pPacket->pBuffer, pPacket->BufferLength));
-
-    do {
-
-        if (HTC_STOPPING(target)) {
-            status = A_ECANCELED;
-            break;
-        }
-
-        AR_DEBUG_ASSERT(pPacket->Endpoint < ENDPOINT_MAX);
-
-        pEndpoint = &target->EndPoint[pPacket->Endpoint];
-
-        LOCK_HTC_RX(target);
-
-            /* store receive packet */
-        HTC_PACKET_ENQUEUE(&pEndpoint->RxBuffers, pPacket);
-
-            /* check if we are blocked waiting for a new buffer */
-        if (target->HTCStateFlags & HTC_STATE_WAIT_BUFFERS) {
-            if (target->EpWaitingForBuffers == pPacket->Endpoint) {
-                AR_DEBUG_PRINTF(ATH_DEBUG_RECV,(" receiver was blocked on ep:%d, unblocking.. \n",
-                    target->EpWaitingForBuffers));
-                target->HTCStateFlags &= ~HTC_STATE_WAIT_BUFFERS;
-                target->EpWaitingForBuffers = ENDPOINT_MAX;
-                unblockRecv = TRUE;
-            }
-        }
-
-        UNLOCK_HTC_RX(target);
-
-        if (unblockRecv && !HTC_STOPPING(target)) {
-                /* TODO : implement a buffer threshold count? */
-            DevEnableRecv(&target->Device,DEV_ENABLE_RECV_SYNC);
-        }
-
-    } while (FALSE);
-
-    return status;
-}
-
-static void HTCFlushEndpointRX(HTC_TARGET *target, HTC_ENDPOINT *pEndpoint)
-{
-    HTC_PACKET  *pPacket;
-
-    LOCK_HTC_RX(target);
-
-    while (1) {
-        pPacket = HTC_PACKET_DEQUEUE(&pEndpoint->RxBuffers);
-        if (NULL == pPacket) {
-            break;
-        }
-        UNLOCK_HTC_RX(target);
-        pPacket->Status = A_ECANCELED;
-        pPacket->ActualLength = 0;
-        AR_DEBUG_PRINTF(ATH_DEBUG_RECV, ("  Flushing RX packet:0x%X, length:%d, ep:%d \n",
-                (A_UINT32)pPacket, pPacket->BufferLength, pPacket->Endpoint));
-            /* give the packet back */
-        pEndpoint->EpCallBacks.EpRecv(pEndpoint->EpCallBacks.pContext,
-                                      pPacket);
-        LOCK_HTC_RX(target);
-    }
-
-    UNLOCK_HTC_RX(target);
-
-
-}
-
-void HTCFlushRecvBuffers(HTC_TARGET *target)
-{
-    HTC_ENDPOINT    *pEndpoint;
-    int             i;
-
-        /* NOTE: no need to flush endpoint 0, these buffers were
-         * allocated as part of the HTC struct */
-    for (i = ENDPOINT_1; i < ENDPOINT_MAX; i++) {
-        pEndpoint = &target->EndPoint[i];
-        if (pEndpoint->ServiceID == 0) {
-                /* not in use.. */
-            continue;
-        }
-        HTCFlushEndpointRX(target,pEndpoint);
-    }
-
-
-}
-
-
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/htc/htc_send.c b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/htc/htc_send.c
deleted file mode 100644
index cf0dabef4..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/htc/htc_send.c
+++ /dev/null
@@ -1,538 +0,0 @@
-/*
- *
- * Copyright (c) 2007 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#include "htc_internal.h"
-
-#define DO_EP_TX_COMPLETION(ep,p)                                    \
-{                                                                    \
-    (p)->Completion = NULL;                                          \
-    (ep)->EpCallBacks.EpTxComplete((ep)->EpCallBacks.pContext,(p));  \
-}
-
-
-/* call the distribute credits callback with the distribution */
-#define DO_DISTRIBUTION(t,reason,description,pList) \
-{                                             \
-    AR_DEBUG_PRINTF(ATH_DEBUG_SEND,           \
-        ("  calling distribute function (%s) (dfn:0x%X, ctxt:0x%X, dist:0x%X) \n", \
-                (description),                                           \
-                (A_UINT32)(t)->DistributeCredits,                        \
-                (A_UINT32)(t)->pCredDistContext,                         \
-                (A_UINT32)pList));                                       \
-    (t)->DistributeCredits((t)->pCredDistContext,                        \
-                           (pList),                                      \
-                           (reason));                                    \
-}
-
-/* our internal send packet completion handler when packets are submited to the AR6K device
- * layer */
-static void HTCSendPktCompletionHandler(void *Context, HTC_PACKET *pPacket)
-{
-    HTC_TARGET      *target = (HTC_TARGET *)Context;
-    HTC_ENDPOINT    *pEndpoint = &target->EndPoint[pPacket->Endpoint];
-
-
-    if (A_FAILED(pPacket->Status)) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-            ("HTCSendPktCompletionHandler: request failed (status:%d, ep:%d) \n",
-                pPacket->Status, pPacket->Endpoint));
-    }
-        /* first, fixup the head room we allocated */
-    pPacket->pBuffer += HTC_HDR_LENGTH;
-        /* do completion */
-    DO_EP_TX_COMPLETION(pEndpoint,pPacket);
-}
-
-A_STATUS HTCIssueSend(HTC_TARGET *target, HTC_PACKET *pPacket, A_UINT8 SendFlags)
-{
-    A_STATUS status;
-    A_UINT8 *pHdrBuf;
-    A_BOOL   sync = FALSE;
-
-        /* caller always provides headrooom */
-    pPacket->pBuffer -= HTC_HDR_LENGTH;
-    pHdrBuf = pPacket->pBuffer;
-        /* setup frame header */
-    A_SET_UINT16_FIELD(pHdrBuf,HTC_FRAME_HDR,PayloadLen,(A_UINT16)pPacket->ActualLength);
-    A_SET_UINT8_FIELD(pHdrBuf,HTC_FRAME_HDR,Flags,SendFlags);
-    A_SET_UINT8_FIELD(pHdrBuf,HTC_FRAME_HDR,EndpointID, (A_UINT8)pPacket->Endpoint);
-
-    if (pPacket->Completion == NULL) {
-            /* mark that this request was synchronously issued */
-        sync = TRUE;
-    }
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_SEND,
-                    ("+-HTCIssueSend: transmit length : %d (%s) \n",
-                    pPacket->ActualLength + HTC_HDR_LENGTH,
-                    sync ? "SYNC" : "ASYNC" ));
-
-        /* send message to device */
-    status = DevSendPacket(&target->Device,
-                           pPacket,
-                           pPacket->ActualLength + HTC_HDR_LENGTH);
-
-    if (sync) {
-            /* use local sync variable.  If this was issued asynchronously, pPacket is no longer
-             * safe to access. */
-        pPacket->pBuffer += HTC_HDR_LENGTH;
-    }
-
-    /* if this request was asynchronous, the packet completion routine will be invoked by
-     * the device layer when the HIF layer completes the request */
-
-    return status;
-}
-
-/* try to send the current packet or a packet at the head of the TX queue,
- * if there are no credits, the packet remains in the queue. */
-static void HTCTrySend(HTC_TARGET      *target,
-                       HTC_PACKET      *pPacketToSend,
-                       HTC_ENDPOINT_ID ep)
-{
-    HTC_PACKET   *pPacket;
-    HTC_ENDPOINT *pEndpoint;
-    int          creditsRequired;
-    A_UINT8      sendFlags;
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_SEND,("+HTCTrySend (pPkt:0x%X)\n",(A_UINT32)pPacketToSend));
-
-    pEndpoint = &target->EndPoint[ep];
-
-    LOCK_HTC_TX(target);
-
-    if (pPacketToSend != NULL) {
-        /* caller supplied us a packet to queue to the tail of the HTC TX queue before
-         * we check the tx queue */
-        HTC_PACKET_ENQUEUE(&pEndpoint->TxQueue,pPacketToSend);
-        pEndpoint->CurrentTxQueueDepth++;
-    }
-
-        /* now drain the TX queue for transmission as long as we have enough
-         * credits */
-
-    while (1) {
-
-        if (HTC_QUEUE_EMPTY(&pEndpoint->TxQueue)) {
-                /* nothing in the queue */
-            break;
-        }
-
-        sendFlags = 0;
-
-            /* get packet at head, but don't remove it */
-        pPacket = HTC_GET_PKT_AT_HEAD(&pEndpoint->TxQueue);
-        AR_DEBUG_PRINTF(ATH_DEBUG_SEND,(" Got head packet:0x%X , Queue Depth: %d\n",
-                (A_UINT32)pPacket, pEndpoint->CurrentTxQueueDepth));
-
-            /* figure out how many credits this message requires */
-        creditsRequired  = pPacket->ActualLength + HTC_HDR_LENGTH;
-        creditsRequired += target->TargetCreditSize - 1;
-        creditsRequired /= target->TargetCreditSize;
-
-        AR_DEBUG_PRINTF(ATH_DEBUG_SEND,(" Creds Required:%d   Got:%d\n",
-                            creditsRequired, pEndpoint->CreditDist.TxCredits));
-
-        if (pEndpoint->CreditDist.TxCredits < creditsRequired) {
-
-            /* not enough credits */
-
-            if (pPacket->Endpoint == ENDPOINT_0) {
-                    /* leave it in the queue */
-                break;
-            }
-                /* invoke the registered distribution function only if this is not
-                 * endpoint 0, we let the driver layer provide more credits if it can.
-                 * We pass the credit distribution list starting at the endpoint in question
-                 * */
-
-                /* set how many credits we need  */
-            pEndpoint->CreditDist.TxCreditsSeek =
-                                    creditsRequired - pEndpoint->CreditDist.TxCredits;
-            DO_DISTRIBUTION(target,
-                            HTC_CREDIT_DIST_SEEK_CREDITS,
-                            "Seek Credits",
-                            &pEndpoint->CreditDist);
-
-            pEndpoint->CreditDist.TxCreditsSeek = 0;
-
-            if (pEndpoint->CreditDist.TxCredits < creditsRequired) {
-                    /* still not enough credits to send, leave packet in the queue */
-                AR_DEBUG_PRINTF(ATH_DEBUG_SEND,
-                    (" Not enough credits for ep %d leaving packet in queue..\n",
-                    pPacket->Endpoint));
-                break;
-            }
-
-        }
-
-        pEndpoint->CreditDist.TxCredits -= creditsRequired;
-        INC_HTC_EP_STAT(pEndpoint, TxCreditsConsummed, creditsRequired);
-
-            /* check if we need credits */
-        if (pEndpoint->CreditDist.TxCredits < pEndpoint->CreditDist.TxCreditsPerMaxMsg) {
-            sendFlags |= HTC_FLAGS_NEED_CREDIT_UPDATE;
-            INC_HTC_EP_STAT(pEndpoint, TxCreditLowIndications, 1);
-            AR_DEBUG_PRINTF(ATH_DEBUG_SEND,(" Host Needs Credits  \n"));
-        }
-
-            /* now we can fully dequeue */
-        pPacket = HTC_PACKET_DEQUEUE(&pEndpoint->TxQueue);
-        pEndpoint->CurrentTxQueueDepth--;
-
-        INC_HTC_EP_STAT(pEndpoint, TxIssued, 1);
-
-        UNLOCK_HTC_TX(target);
-
-        HTCIssueSend(target, pPacket, sendFlags);
-
-        LOCK_HTC_TX(target);
-
-        /* go back and check for more messages */
-    }
-
-    if (pEndpoint->CurrentTxQueueDepth >= pEndpoint->MaxTxQueueDepth) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_SEND, (" Endpoint %d, TX queue is full, Depth:%d, Max:%d \n",
-                        ep, pEndpoint->CurrentTxQueueDepth, pEndpoint->MaxTxQueueDepth));
-        UNLOCK_HTC_TX(target);
-            /* queue is now full, let caller know */
-        if (pEndpoint->EpCallBacks.EpSendFull != NULL) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_SEND, (" Calling driver's send full callback.... \n"));
-            pEndpoint->EpCallBacks.EpSendFull(pEndpoint->EpCallBacks.pContext, ep);
-        }
-    } else {
-        UNLOCK_HTC_TX(target);
-            /* queue is now available for new packet, let caller know */
-        if (pEndpoint->EpCallBacks.EpSendAvail)
-            pEndpoint->EpCallBacks.EpSendAvail(pEndpoint->EpCallBacks.pContext, ep);
-    }
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_SEND,("-HTCTrySend:  \n"));
-}
-
-/* HTC API - HTCSendPkt */
-A_STATUS HTCSendPkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket)
-{
-    HTC_TARGET      *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-    HTC_ENDPOINT    *pEndpoint;
-    HTC_ENDPOINT_ID ep;
-    A_STATUS        status = A_OK;
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_SEND,
-                    ("+HTCSendPkt: Enter endPointId: %d, buffer: 0x%X, length: %d \n",
-                    pPacket->Endpoint, (A_UINT32)pPacket->pBuffer, pPacket->ActualLength));
-
-    ep = pPacket->Endpoint;
-    AR_DEBUG_ASSERT(ep < ENDPOINT_MAX);
-    pEndpoint = &target->EndPoint[ep];
-
-    do {
-
-        if (HTC_STOPPING(target)) {
-            status = A_ECANCELED;
-            pPacket->Status = status;
-            DO_EP_TX_COMPLETION(pEndpoint,pPacket);
-            break;
-        }
-            /* everything sent through this interface is asynchronous */
-            /* fill in HTC completion routines */
-        pPacket->Completion = HTCSendPktCompletionHandler;
-        pPacket->pContext = target;
-
-        HTCTrySend(target, pPacket, ep);
-
-    } while (FALSE);
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("-HTCSendPkt \n"));
-
-    return status;
-}
-
-
-/* check TX queues to drain because of credit distribution update */
-static INLINE void HTCCheckEndpointTxQueues(HTC_TARGET *target)
-{
-    HTC_ENDPOINT                *pEndpoint;
-    HTC_ENDPOINT_CREDIT_DIST    *pDistItem;
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("+HTCCheckEndpointTxQueues \n"));
-    pDistItem = target->EpCreditDistributionListHead;
-
-        /* run through the credit distribution list to see
-         * if there are packets queued
-         * NOTE: no locks need to be taken since the distribution list
-         * is not dynamic (cannot be re-ordered) and we are not modifying any state */
-    while (pDistItem != NULL) {
-        pEndpoint = (HTC_ENDPOINT *)pDistItem->pHTCReserved;
-
-        if (pEndpoint->CurrentTxQueueDepth > 0) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_SEND, (" Ep %d has %d credits and %d Packets in TX Queue \n",
-                    pDistItem->Endpoint, pEndpoint->CreditDist.TxCredits, pEndpoint->CurrentTxQueueDepth));
-                /* try to start the stalled queue, this list is ordered by priority.
-                 * Highest priority queue get's processed first, if there are credits available the
-                 * highest priority queue will get a chance to reclaim credits from lower priority
-                 * ones */
-            HTCTrySend(target, NULL, pDistItem->Endpoint);
-        }
-
-        pDistItem = pDistItem->pNext;
-    }
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("-HTCCheckEndpointTxQueues \n"));
-}
-
-/* process credit reports and call distribution function */
-void HTCProcessCreditRpt(HTC_TARGET *target, HTC_CREDIT_REPORT *pRpt, int NumEntries, HTC_ENDPOINT_ID FromEndpoint)
-{
-    int             i;
-    HTC_ENDPOINT    *pEndpoint;
-    int             totalCredits = 0;
-    A_BOOL          doDist = FALSE;
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("+HTCProcessCreditRpt, Credit Report Entries:%d \n", NumEntries));
-
-        /* lock out TX while we update credits */
-    LOCK_HTC_TX(target);
-
-    for (i = 0; i < NumEntries; i++, pRpt++) {
-        if (pRpt->EndpointID >= ENDPOINT_MAX) {
-            AR_DEBUG_ASSERT(FALSE);
-            break;
-        }
-
-        pEndpoint = &target->EndPoint[pRpt->EndpointID];
-
-        AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("  Endpoint %d got %d credits \n",
-                pRpt->EndpointID, pRpt->Credits));
-
-
-#ifdef HTC_EP_STAT_PROFILING
-
-        INC_HTC_EP_STAT(pEndpoint, TxCreditRpts, 1);
-        INC_HTC_EP_STAT(pEndpoint, TxCreditsReturned, pRpt->Credits);
-
-        if (FromEndpoint == pRpt->EndpointID) {
-                /* this credit report arrived on the same endpoint indicating it arrived in an RX
-                 * packet */
-            INC_HTC_EP_STAT(pEndpoint, TxCreditsFromRx, pRpt->Credits);
-            INC_HTC_EP_STAT(pEndpoint, TxCreditRptsFromRx, 1);
-        } else if (FromEndpoint == ENDPOINT_0) {
-                /* this credit arrived on endpoint 0 as a NULL message */
-            INC_HTC_EP_STAT(pEndpoint, TxCreditsFromEp0, pRpt->Credits);
-            INC_HTC_EP_STAT(pEndpoint, TxCreditRptsFromEp0, 1);
-        } else {
-                /* arrived on another endpoint */
-            INC_HTC_EP_STAT(pEndpoint, TxCreditsFromOther, pRpt->Credits);
-            INC_HTC_EP_STAT(pEndpoint, TxCreditRptsFromOther, 1);
-        }
-
-#endif
-
-        if (ENDPOINT_0 == pRpt->EndpointID) {
-                /* always give endpoint 0 credits back */
-            pEndpoint->CreditDist.TxCredits += pRpt->Credits;
-        } else {
-                /* for all other endpoints, update credits to distribute, the distribution function
-                 * will handle giving out credits back to the endpoints */
-            pEndpoint->CreditDist.TxCreditsToDist += pRpt->Credits;
-                /* flag that we have to do the distribution */
-            doDist = TRUE;
-        }
-
-        totalCredits += pRpt->Credits;
-    }
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("  Report indicated %d credits to distribute \n", totalCredits));
-
-    if (doDist) {
-            /* this was a credit return based on a completed send operations
-             * note, this is done with the lock held */
-        DO_DISTRIBUTION(target,
-                        HTC_CREDIT_DIST_SEND_COMPLETE,
-                        "Send Complete",
-                        target->EpCreditDistributionListHead->pNext);
-    }
-
-    UNLOCK_HTC_TX(target);
-
-    if (totalCredits) {
-        HTCCheckEndpointTxQueues(target);
-    }
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("-HTCProcessCreditRpt \n"));
-}
-
-/* flush endpoint TX queue */
-static void HTCFlushEndpointTX(HTC_TARGET *target, HTC_ENDPOINT *pEndpoint, HTC_TX_TAG Tag)
-{
-    HTC_PACKET          *pPacket;
-    HTC_PACKET_QUEUE    discardQueue;
-
-        /* initialize the discard queue */
-    INIT_HTC_PACKET_QUEUE(&discardQueue);
-
-    LOCK_HTC_TX(target);
-
-        /* interate from the front of the TX queue and flush out packets */
-    ITERATE_OVER_LIST_ALLOW_REMOVE(&pEndpoint->TxQueue, pPacket, HTC_PACKET, ListLink) {
-
-            /* check for removal */
-        if ((HTC_TX_PACKET_TAG_ALL == Tag) || (Tag == pPacket->PktInfo.AsTx.Tag)) {
-                /* remove from queue */
-            HTC_PACKET_REMOVE(pPacket);
-                /* add it to the discard pile */
-            HTC_PACKET_ENQUEUE(&discardQueue, pPacket);
-            pEndpoint->CurrentTxQueueDepth--;
-        }
-
-    } ITERATE_END;
-
-    UNLOCK_HTC_TX(target);
-
-        /* empty the discard queue */
-    while (1) {
-        pPacket = HTC_PACKET_DEQUEUE(&discardQueue);
-        if (NULL == pPacket) {
-            break;
-        }
-        pPacket->Status = A_ECANCELED;
-        AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("  Flushing TX packet:0x%X, length:%d, ep:%d tag:0x%X \n",
-                (A_UINT32)pPacket, pPacket->ActualLength, pPacket->Endpoint, pPacket->PktInfo.AsTx.Tag));
-        DO_EP_TX_COMPLETION(pEndpoint,pPacket);
-    }
-
-}
-
-void DumpCreditDist(HTC_ENDPOINT_CREDIT_DIST *pEPDist)
-{
-#ifdef DEBUG
-    HTC_ENDPOINT *pEndpoint = (HTC_ENDPOINT *)pEPDist->pHTCReserved;
-#endif
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, ("--- EP : %d  ServiceID: 0x%X    --------------\n",
-                        pEPDist->Endpoint, pEPDist->ServiceID));
-    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, (" this:0x%X next:0x%X prev:0x%X\n",
-                (A_UINT32)pEPDist, (A_UINT32)pEPDist->pNext, (A_UINT32)pEPDist->pPrev));
-    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, (" DistFlags          : 0x%X \n", pEPDist->DistFlags));
-    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, (" TxCreditsNorm      : %d \n", pEPDist->TxCreditsNorm));
-    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, (" TxCreditsMin       : %d \n", pEPDist->TxCreditsMin));
-    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, (" TxCredits          : %d \n", pEPDist->TxCredits));
-    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, (" TxCreditsAssigned  : %d \n", pEPDist->TxCreditsAssigned));
-    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, (" TxCreditsSeek      : %d \n", pEPDist->TxCreditsSeek));
-    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, (" TxCreditSize       : %d \n", pEPDist->TxCreditSize));
-    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, (" TxCreditsPerMaxMsg : %d \n", pEPDist->TxCreditsPerMaxMsg));
-    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, (" TxCreditsToDist    : %d \n", pEPDist->TxCreditsToDist));
-    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, (" TxQueueDepth       : %d \n", pEndpoint->CurrentTxQueueDepth));
-    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, ("----------------------------------------------------\n"));
-}
-
-void DumpCreditDistStates(HTC_TARGET *target)
-{
-    HTC_ENDPOINT_CREDIT_DIST *pEPList = target->EpCreditDistributionListHead;
-
-    while (pEPList != NULL) {
-        DumpCreditDist(pEPList);
-        pEPList = pEPList->pNext;
-    }
-
-    if (target->DistributeCredits != NULL) {
-        DO_DISTRIBUTION(target,
-                        HTC_DUMP_CREDIT_STATE,
-                        "Dump State",
-                        NULL);
-    }
-}
-
-/* flush all send packets from all endpoint queues */
-void HTCFlushSendPkts(HTC_TARGET *target)
-{
-    HTC_ENDPOINT    *pEndpoint;
-    int             i;
-
-    DumpCreditDistStates(target);
-
-    for (i = ENDPOINT_0; i < ENDPOINT_MAX; i++) {
-        pEndpoint = &target->EndPoint[i];
-        if (pEndpoint->ServiceID == 0) {
-                /* not in use.. */
-            continue;
-        }
-        HTCFlushEndpointTX(target,pEndpoint,HTC_TX_PACKET_TAG_ALL);
-    }
-
-}
-
-/* HTC API to flush an endpoint's TX queue*/
-void HTCFlushEndpoint(HTC_HANDLE HTCHandle, HTC_ENDPOINT_ID Endpoint, HTC_TX_TAG Tag)
-{
-    HTC_TARGET      *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-    HTC_ENDPOINT    *pEndpoint = &target->EndPoint[Endpoint];
-
-    if (pEndpoint->ServiceID == 0) {
-        AR_DEBUG_ASSERT(FALSE);
-        /* not in use.. */
-        return;
-    }
-
-    HTCFlushEndpointTX(target, pEndpoint, Tag);
-}
-
-/* HTC API to indicate activity to the credit distribution function */
-void HTCIndicateActivityChange(HTC_HANDLE      HTCHandle,
-                               HTC_ENDPOINT_ID Endpoint,
-                               A_BOOL          Active)
-{
-    HTC_TARGET      *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-    HTC_ENDPOINT    *pEndpoint = &target->EndPoint[Endpoint];
-    A_BOOL          doDist = FALSE;
-
-    if (pEndpoint->ServiceID == 0) {
-        AR_DEBUG_ASSERT(FALSE);
-        /* not in use.. */
-        return;
-    }
-
-    LOCK_HTC_TX(target);
-
-    if (Active) {
-        if (!(pEndpoint->CreditDist.DistFlags & HTC_EP_ACTIVE)) {
-                /* mark active now */
-            pEndpoint->CreditDist.DistFlags |= HTC_EP_ACTIVE;
-            doDist = TRUE;
-        }
-    } else {
-        if (pEndpoint->CreditDist.DistFlags & HTC_EP_ACTIVE) {
-                /* mark inactive now */
-            pEndpoint->CreditDist.DistFlags &= ~HTC_EP_ACTIVE;
-            doDist = TRUE;
-        }
-    }
-
-    if (doDist) {
-        /* do distribution again based on activity change
-         * note, this is done with the lock held */
-        DO_DISTRIBUTION(target,
-                        HTC_CREDIT_DIST_ACTIVITY_CHANGE,
-                        "Activity Change",
-                        target->EpCreditDistributionListHead->pNext);
-    }
-
-    UNLOCK_HTC_TX(target);
-
-}
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/htc/htc_services.c b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/htc/htc_services.c
deleted file mode 100644
index e5d50d16d..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/htc/htc_services.c
+++ /dev/null
@@ -1,403 +0,0 @@
-/*
- *
- * Copyright (c) 2007 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#include "htc_internal.h"
-
-void HTCControlTxComplete(void *Context, HTC_PACKET *pPacket)
-{
-        /* not implemented
-         * we do not send control TX frames during normal runtime, only during setup  */
-    AR_DEBUG_ASSERT(FALSE);
-}
-
-    /* callback when a control message arrives on this endpoint */
-void HTCControlRecv(void *Context, HTC_PACKET *pPacket)
-{
-    AR_DEBUG_ASSERT(pPacket->Endpoint == ENDPOINT_0);
-
-        /* the only control messages we are expecting are NULL messages (credit resports), which should
-         * never get here */
-    AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-                    ("HTCControlRecv, got message with length:%d \n",
-                    pPacket->ActualLength + HTC_HDR_LENGTH));
-
-        /* dump header and message */
-    DebugDumpBytes(pPacket->pBuffer - HTC_HDR_LENGTH,
-                   pPacket->ActualLength + HTC_HDR_LENGTH,
-                   "Unexpected ENDPOINT 0 Message");
-
-    HTC_RECYCLE_RX_PKT((HTC_TARGET*)Context,pPacket);
-}
-
-A_STATUS HTCSendSetupComplete(HTC_TARGET *target)
-{
-    HTC_PACKET             *pSendPacket = NULL;
-    A_STATUS                status;
-    HTC_SETUP_COMPLETE_MSG *pSetupComplete;
-
-    do {
-           /* allocate a packet to send to the target */
-        pSendPacket = HTC_ALLOC_CONTROL_TX(target);
-
-        if (NULL == pSendPacket) {
-            status = A_NO_MEMORY;
-            break;
-        }
-
-            /* assemble setup complete message */
-        pSetupComplete = (HTC_SETUP_COMPLETE_MSG *)pSendPacket->pBuffer;
-        A_MEMZERO(pSetupComplete,sizeof(HTC_SETUP_COMPLETE_MSG));
-        pSetupComplete->MessageID = HTC_MSG_SETUP_COMPLETE_ID;
-
-        SET_HTC_PACKET_INFO_TX(pSendPacket,
-                               NULL,
-                               (A_UINT8 *)pSetupComplete,
-                               sizeof(HTC_SETUP_COMPLETE_MSG),
-                               ENDPOINT_0,
-                               HTC_SERVICE_TX_PACKET_TAG);
-
-            /* we want synchronous operation */
-        pSendPacket->Completion = NULL;
-            /* send the message */
-        status = HTCIssueSend(target,pSendPacket,0);
-
-    } while (FALSE);
-
-    if (pSendPacket != NULL) {
-        HTC_FREE_CONTROL_TX(target,pSendPacket);
-    }
-
-    return status;
-}
-
-
-A_STATUS HTCConnectService(HTC_HANDLE               HTCHandle,
-                           HTC_SERVICE_CONNECT_REQ  *pConnectReq,
-                           HTC_SERVICE_CONNECT_RESP *pConnectResp)
-{
-    HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-    A_STATUS                            status = A_OK;
-    HTC_PACKET                          *pRecvPacket = NULL;
-    HTC_PACKET                          *pSendPacket = NULL;
-    HTC_CONNECT_SERVICE_RESPONSE_MSG    *pResponseMsg;
-    HTC_CONNECT_SERVICE_MSG             *pConnectMsg;
-    HTC_ENDPOINT_ID                     assignedEndpoint = ENDPOINT_MAX;
-    HTC_ENDPOINT                        *pEndpoint;
-    int                                 maxMsgSize = 0;
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("+HTCConnectService, target:0x%X SvcID:0x%X \n",
-               (A_UINT32)target, pConnectReq->ServiceID));
-
-    do {
-
-        AR_DEBUG_ASSERT(pConnectReq->ServiceID != 0);
-
-        if (HTC_CTRL_RSVD_SVC == pConnectReq->ServiceID) {
-                /* special case for pseudo control service */
-            assignedEndpoint = ENDPOINT_0;
-            maxMsgSize = HTC_MAX_CONTROL_MESSAGE_LENGTH;
-        } else {
-                /* allocate a packet to send to the target */
-            pSendPacket = HTC_ALLOC_CONTROL_TX(target);
-
-            if (NULL == pSendPacket) {
-                AR_DEBUG_ASSERT(FALSE);
-                status = A_NO_MEMORY;
-                break;
-            }
-                /* assemble connect service message */
-            pConnectMsg = (HTC_CONNECT_SERVICE_MSG *)pSendPacket->pBuffer;
-            AR_DEBUG_ASSERT(pConnectMsg != NULL);
-            A_MEMZERO(pConnectMsg,sizeof(HTC_CONNECT_SERVICE_MSG));
-            pConnectMsg->MessageID = HTC_MSG_CONNECT_SERVICE_ID;
-            pConnectMsg->ServiceID = pConnectReq->ServiceID;
-            pConnectMsg->ConnectionFlags = pConnectReq->ConnectionFlags;
-                /* check caller if it wants to transfer meta data */
-            if ((pConnectReq->pMetaData != NULL) &&
-                (pConnectReq->MetaDataLength <= HTC_SERVICE_META_DATA_MAX_LENGTH)) {
-                    /* copy meta data into message buffer (after header ) */
-                A_MEMCPY((A_UINT8 *)pConnectMsg + sizeof(HTC_CONNECT_SERVICE_MSG),
-                         pConnectReq->pMetaData,
-                         pConnectReq->MetaDataLength);
-                pConnectMsg->ServiceMetaLength = pConnectReq->MetaDataLength;
-            }
-
-            SET_HTC_PACKET_INFO_TX(pSendPacket,
-                                   NULL,
-                                   (A_UINT8 *)pConnectMsg,
-                                   sizeof(HTC_CONNECT_SERVICE_MSG) + pConnectMsg->ServiceMetaLength,
-                                   ENDPOINT_0,
-                                   HTC_SERVICE_TX_PACKET_TAG);
-
-                /* we want synchronous operation */
-            pSendPacket->Completion = NULL;
-
-            status = HTCIssueSend(target,pSendPacket,0);
-
-            if (A_FAILED(status)) {
-                break;
-            }
-
-                /* wait for response */
-            status = HTCWaitforControlMessage(target, &pRecvPacket);
-
-            if (A_FAILED(status)) {
-                break;
-            }
-                /* we controlled the buffer creation so it has to be properly aligned */
-            pResponseMsg = (HTC_CONNECT_SERVICE_RESPONSE_MSG *)pRecvPacket->pBuffer;
-
-            if ((pResponseMsg->MessageID != HTC_MSG_CONNECT_SERVICE_RESPONSE_ID) ||
-                (pRecvPacket->ActualLength < sizeof(HTC_CONNECT_SERVICE_RESPONSE_MSG))) {
-                    /* this message is not valid */
-                AR_DEBUG_ASSERT(FALSE);
-                status = A_EPROTO;
-                break;
-            }
-
-            pConnectResp->ConnectRespCode = pResponseMsg->Status;
-                /* check response status */
-            if (pResponseMsg->Status != HTC_SERVICE_SUCCESS) {
-                AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-                    (" Target failed service 0x%X connect request (status:%d)\n",
-                                pResponseMsg->ServiceID, pResponseMsg->Status));
-                status = A_EPROTO;
-                break;
-            }
-
-            assignedEndpoint = pResponseMsg->EndpointID;
-            maxMsgSize = pResponseMsg->MaxMsgSize;
-
-            if ((pConnectResp->pMetaData != NULL) &&
-                (pResponseMsg->ServiceMetaLength > 0) &&
-                (pResponseMsg->ServiceMetaLength <= HTC_SERVICE_META_DATA_MAX_LENGTH)) {
-                    /* caller supplied a buffer and the target responded with data */
-                int copyLength = min((int)pConnectResp->BufferLength, (int)pResponseMsg->ServiceMetaLength);
-                    /* copy the meta data */
-                A_MEMCPY(pConnectResp->pMetaData,
-                         ((A_UINT8 *)pResponseMsg) + sizeof(HTC_CONNECT_SERVICE_RESPONSE_MSG),
-                         copyLength);
-                pConnectResp->ActualLength = copyLength;
-            }
-
-        }
-
-            /* the rest of these are parameter checks so set the error status */
-        status = A_EPROTO;
-
-        if (assignedEndpoint >= ENDPOINT_MAX) {
-            AR_DEBUG_ASSERT(FALSE);
-            break;
-        }
-
-        if (0 == maxMsgSize) {
-            AR_DEBUG_ASSERT(FALSE);
-            break;
-        }
-
-        pEndpoint = &target->EndPoint[assignedEndpoint];
-
-        if (pEndpoint->ServiceID != 0) {
-            /* endpoint already in use! */
-            AR_DEBUG_ASSERT(FALSE);
-            break;
-        }
-
-            /* return assigned endpoint to caller */
-        pConnectResp->Endpoint = assignedEndpoint;
-        pConnectResp->MaxMsgLength = maxMsgSize;
-
-            /* setup the endpoint */
-        pEndpoint->ServiceID = pConnectReq->ServiceID; /* this marks the endpoint in use */
-        pEndpoint->MaxTxQueueDepth = pConnectReq->MaxSendQueueDepth;
-        pEndpoint->MaxMsgLength = maxMsgSize;
-            /* copy all the callbacks */
-        pEndpoint->EpCallBacks = pConnectReq->EpCallbacks;
-        INIT_HTC_PACKET_QUEUE(&pEndpoint->RxBuffers);
-        INIT_HTC_PACKET_QUEUE(&pEndpoint->TxQueue);
-            /* set the credit distribution info for this endpoint, this information is
-             * passed back to the credit distribution callback function */
-        pEndpoint->CreditDist.ServiceID = pConnectReq->ServiceID;
-        pEndpoint->CreditDist.pHTCReserved = pEndpoint;
-        pEndpoint->CreditDist.Endpoint = assignedEndpoint;
-        pEndpoint->CreditDist.TxCreditSize = target->TargetCreditSize;
-        pEndpoint->CreditDist.TxCreditsPerMaxMsg = maxMsgSize / target->TargetCreditSize;
-
-        if (0 == pEndpoint->CreditDist.TxCreditsPerMaxMsg) {
-            pEndpoint->CreditDist.TxCreditsPerMaxMsg = 1;
-        }
-
-        status = A_OK;
-
-    } while (FALSE);
-
-    if (pSendPacket != NULL) {
-        HTC_FREE_CONTROL_TX(target,pSendPacket);
-    }
-
-    if (pRecvPacket != NULL) {
-        HTC_FREE_CONTROL_RX(target,pRecvPacket);
-    }
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("-HTCConnectService \n"));
-
-    return status;
-}
-
-static void AddToEndpointDistList(HTC_TARGET *target, HTC_ENDPOINT_CREDIT_DIST *pEpDist)
-{
-    HTC_ENDPOINT_CREDIT_DIST *pCurEntry,*pLastEntry;
-
-    if (NULL == target->EpCreditDistributionListHead) {
-        target->EpCreditDistributionListHead = pEpDist;
-        pEpDist->pNext = NULL;
-        pEpDist->pPrev = NULL;
-        return;
-    }
-
-        /* queue to the end of the list, this does not have to be very
-         * fast since this list is built at startup time */
-    pCurEntry = target->EpCreditDistributionListHead;
-
-    while (pCurEntry) {
-        pLastEntry = pCurEntry;
-        pCurEntry = pCurEntry->pNext;
-    }
-
-    pLastEntry->pNext = pEpDist;
-    pEpDist->pPrev = pLastEntry;
-    pEpDist->pNext = NULL;
-}
-
-
-
-/* default credit init callback */
-static void HTCDefaultCreditInit(void                     *Context,
-                                 HTC_ENDPOINT_CREDIT_DIST *pEPList,
-                                 int                      TotalCredits)
-{
-    HTC_ENDPOINT_CREDIT_DIST *pCurEpDist;
-    int                      totalEps = 0;
-    int                      creditsPerEndpoint;
-
-    pCurEpDist = pEPList;
-        /* first run through the list and figure out how many endpoints we are dealing with */
-    while (pCurEpDist != NULL) {
-        pCurEpDist = pCurEpDist->pNext;
-        totalEps++;
-    }
-
-        /* even distribution */
-    creditsPerEndpoint = TotalCredits/totalEps;
-
-    pCurEpDist = pEPList;
-        /* run through the list and set minimum and normal credits and
-         * provide the endpoint with some credits to start */
-    while (pCurEpDist != NULL) {
-
-        if (creditsPerEndpoint < pCurEpDist->TxCreditsPerMaxMsg) {
-                /* too many endpoints and not enough credits */
-            AR_DEBUG_ASSERT(FALSE);
-            break;
-        }
-            /* our minimum is set for at least 1 max message */
-        pCurEpDist->TxCreditsMin = pCurEpDist->TxCreditsPerMaxMsg;
-            /* this value is ignored by our credit alg, since we do
-             * not dynamically adjust credits, this is the policy of
-             * the "default" credit distribution, something simple and easy */
-        pCurEpDist->TxCreditsNorm = 0xFFFF;
-            /* give the endpoint minimum credits */
-        pCurEpDist->TxCredits = creditsPerEndpoint;
-        pCurEpDist->TxCreditsAssigned = creditsPerEndpoint;
-        pCurEpDist = pCurEpDist->pNext;
-    }
-
-}
-
-/* default credit distribution callback, NOTE, this callback holds the TX lock */
-void HTCDefaultCreditDist(void                     *Context,
-                          HTC_ENDPOINT_CREDIT_DIST *pEPDistList,
-                          HTC_CREDIT_DIST_REASON   Reason)
-{
-    HTC_ENDPOINT_CREDIT_DIST *pCurEpDist;
-
-    if (Reason == HTC_CREDIT_DIST_SEND_COMPLETE) {
-        pCurEpDist = pEPDistList;
-            /* simple distribution */
-        while (pCurEpDist != NULL) {
-            if (pCurEpDist->TxCreditsToDist > 0) {
-                    /* just give the endpoint back the credits */
-                pCurEpDist->TxCredits += pCurEpDist->TxCreditsToDist;
-                pCurEpDist->TxCreditsToDist = 0;
-            }
-            pCurEpDist = pCurEpDist->pNext;
-        }
-    }
-
-    /* note we do not need to handle the other reason codes as this is a very
-     * simple distribution scheme, no need to seek for more credits or handle inactivity */
-}
-
-void HTCSetCreditDistribution(HTC_HANDLE               HTCHandle,
-                              void                     *pCreditDistContext,
-                              HTC_CREDIT_DIST_CALLBACK CreditDistFunc,
-                              HTC_CREDIT_INIT_CALLBACK CreditInitFunc,
-                              HTC_SERVICE_ID           ServicePriorityOrder[],
-                              int                      ListLength)
-{
-    HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-    int i;
-    int ep;
-
-    if (CreditInitFunc != NULL) {
-            /* caller has supplied their own distribution functions */
-        target->InitCredits = CreditInitFunc;
-        AR_DEBUG_ASSERT(CreditDistFunc != NULL);
-        target->DistributeCredits = CreditDistFunc;
-        target->pCredDistContext = pCreditDistContext;
-    } else {
-        /* caller wants HTC to do distribution */
-        /* if caller wants service to handle distributions then
-         * it must set both of these to NULL! */
-        AR_DEBUG_ASSERT(CreditDistFunc == NULL);
-        target->InitCredits = HTCDefaultCreditInit;
-        target->DistributeCredits = HTCDefaultCreditDist;
-        target->pCredDistContext = target;
-    }
-
-        /* always add HTC control endpoint first, we only expose the list after the
-         * first one, this is added for TX queue checking */
-    AddToEndpointDistList(target, &target->EndPoint[ENDPOINT_0].CreditDist);
-
-        /* build the list of credit distribution structures in priority order
-         * supplied by the caller, these will follow endpoint 0 */
-    for (i = 0; i < ListLength; i++) {
-            /* match services with endpoints and add the endpoints to the distribution list
-             * in FIFO order */
-        for (ep = ENDPOINT_1; ep < ENDPOINT_MAX; ep++) {
-            if (target->EndPoint[ep].ServiceID == ServicePriorityOrder[i]) {
-                    /* queue this one to the list */
-                AddToEndpointDistList(target, &target->EndPoint[ep].CreditDist);
-                break;
-            }
-        }
-        AR_DEBUG_ASSERT(ep < ENDPOINT_MAX);
-    }
-
-}
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/AR6001_regdump.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/AR6001_regdump.h
deleted file mode 100644
index c1bcadea3..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/AR6001_regdump.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 2006 Atheros Communications Inc.
- * All rights reserved.
- *
- * $ATH_LICENSE_HOSTSDK0_C$
- *
- */
-
-#ifndef __AR6000_REGDUMP_H__
-#define __AR6000_REGDUMP_H__
-
-#if !defined(__ASSEMBLER__)
-/*
- * Target CPU state at the time of failure is reflected
- * in a register dump, which the Host can fetch through
- * the diagnostic window.
- */
-
-struct MIPS_exception_frame_s {
-    A_UINT32 pc;        /* Program Counter */
-    A_UINT32 at;        /* MIPS General Purpose registers */
-    A_UINT32 v0;
-    A_UINT32 v1;
-    A_UINT32 a0;
-    A_UINT32 a1;
-    A_UINT32 a2;
-    A_UINT32 a3;
-    A_UINT32 t0;
-    A_UINT32 t1;
-    A_UINT32 t2;
-    A_UINT32 t3;
-    A_UINT32 t4;
-    A_UINT32 t5;
-    A_UINT32 t6;
-    A_UINT32 t7;
-    A_UINT32 s0;
-    A_UINT32 s1;
-    A_UINT32 s2;
-    A_UINT32 s3;
-    A_UINT32 s4;
-    A_UINT32 s5;
-    A_UINT32 s6;
-    A_UINT32 s7;
-    A_UINT32 t8;
-    A_UINT32 t9;
-    A_UINT32 k0;
-    A_UINT32 k1;
-    A_UINT32 gp;
-    A_UINT32 sp;
-    A_UINT32 s8;
-    A_UINT32 ra;
-    A_UINT32 cause; /* Selected coprocessor regs */
-    A_UINT32 status;
-};
-typedef struct MIPS_exception_frame_s CPU_exception_frame_t;
-
-#endif
-
-/*
- * Offsets into MIPS_exception_frame structure, for use in assembler code
- * MUST MATCH C STRUCTURE ABOVE
- */
-#define RD_pc           0
-#define RD_at           1
-#define RD_v0           2
-#define RD_v1           3
-#define RD_a0           4
-#define RD_a1           5
-#define RD_a2           6
-#define RD_a3           7
-#define RD_t0           8
-#define RD_t1           9
-#define RD_t2           10
-#define RD_t3           11
-#define RD_t4           12
-#define RD_t5           13
-#define RD_t6           14
-#define RD_t7           15
-#define RD_s0           16
-#define RD_s1           17
-#define RD_s2           18
-#define RD_s3           19
-#define RD_s4           20
-#define RD_s5           21
-#define RD_s6           22
-#define RD_s7           23
-#define RD_t8           24
-#define RD_t9           25
-#define RD_k0           26
-#define RD_k1           27
-#define RD_gp           28
-#define RD_sp           29
-#define RD_s8           30
-#define RD_ra           31
-#define RD_cause        32
-#define RD_status       33
-
-#define RD_SIZE         (34*4) /* Space for this number of words */
-
-#endif /* __AR6000_REGDUMP_H__ */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/AR6K_version.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/AR6K_version.h
deleted file mode 100644
index d5b2a20b0..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/AR6K_version.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#define __VER_MAJOR_ 2
-#define __VER_MINOR_ 0
-#define __VER_PATCH_ 0
-
-
-/*
- * Copyright (c) 2004-2007 Atheros Communications Inc.
- * All rights reserved.
- *
- * $ATH_LICENSE_HOSTSDK0_C$
- *
- * The makear6ksdk script (used for release builds) modifies the following line.
- */
-#define __BUILD_NUMBER_ 18
-
-
-/* Format of the version number. */
-#define VER_MAJOR_BIT_OFFSET		28
-#define VER_MINOR_BIT_OFFSET		24
-#define VER_PATCH_BIT_OFFSET		16
-#define VER_BUILD_NUM_BIT_OFFSET	0
-
-
-/*
- * The version has the following format:
- * Bits 28-31: Major version
- * Bits 24-27: Minor version
- * Bits 16-23: Patch version
- * Bits 0-15:  Build number (automatically generated during build process )
- * E.g. Build 1.1.3.7 would be represented as 0x11030007.
- *
- * DO NOT split the following macro into multiple lines as this may confuse the build scripts.
- */
-#define AR6K_SW_VERSION 	( ( __VER_MAJOR_ << VER_MAJOR_BIT_OFFSET ) + ( __VER_MINOR_ << VER_MINOR_BIT_OFFSET ) + ( __VER_PATCH_ << VER_PATCH_BIT_OFFSET ) + ( __BUILD_NUMBER_ << VER_BUILD_NUM_BIT_OFFSET ) )
-
-
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/AR6K_version.h.NEW b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/AR6K_version.h.NEW
deleted file mode 100644
index d5b2a20b0..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/AR6K_version.h.NEW
+++ /dev/null
@@ -1,36 +0,0 @@
-#define __VER_MAJOR_ 2
-#define __VER_MINOR_ 0
-#define __VER_PATCH_ 0
-
-
-/*
- * Copyright (c) 2004-2007 Atheros Communications Inc.
- * All rights reserved.
- *
- * $ATH_LICENSE_HOSTSDK0_C$
- *
- * The makear6ksdk script (used for release builds) modifies the following line.
- */
-#define __BUILD_NUMBER_ 18
-
-
-/* Format of the version number. */
-#define VER_MAJOR_BIT_OFFSET		28
-#define VER_MINOR_BIT_OFFSET		24
-#define VER_PATCH_BIT_OFFSET		16
-#define VER_BUILD_NUM_BIT_OFFSET	0
-
-
-/*
- * The version has the following format:
- * Bits 28-31: Major version
- * Bits 24-27: Minor version
- * Bits 16-23: Patch version
- * Bits 0-15:  Build number (automatically generated during build process )
- * E.g. Build 1.1.3.7 would be represented as 0x11030007.
- *
- * DO NOT split the following macro into multiple lines as this may confuse the build scripts.
- */
-#define AR6K_SW_VERSION 	( ( __VER_MAJOR_ << VER_MAJOR_BIT_OFFSET ) + ( __VER_MINOR_ << VER_MINOR_BIT_OFFSET ) + ( __VER_PATCH_ << VER_PATCH_BIT_OFFSET ) + ( __BUILD_NUMBER_ << VER_BUILD_NUM_BIT_OFFSET ) )
-
-
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/AR6Khwreg.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/AR6Khwreg.h
deleted file mode 100644
index ecfdf20a0..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/AR6Khwreg.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (c) 2004-2007 Atheros Communications Inc.
- * All rights reserved.
- *
- * $ATH_LICENSE_HOSTSDK0_C$
- *
- * This file contains the definitions for AR6001 registers
- * that may be directly manipulated by Host software.
- */
-
-#ifndef __AR6KHWREG_H__
-#define __AR6KHWREG_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Host registers */
-#define HOST_INT_STATUS_ADDRESS                  0x00000400
-#define CPU_INT_STATUS_ADDRESS                   0x00000401
-#define ERROR_INT_STATUS_ADDRESS                 0x00000402
-#define INT_STATUS_ENABLE_ADDRESS                0x00000418
-#define CPU_INT_STATUS_ENABLE_ADDRESS            0x00000419
-#define COUNT_ADDRESS                            0x00000420
-#define COUNT_DEC_ADDRESS                        0x00000440
-#define WINDOW_DATA_ADDRESS                      0x00000474
-#define WINDOW_WRITE_ADDR_ADDRESS                0x00000478
-#define WINDOW_READ_ADDR_ADDRESS                 0x0000047c
-
-/* Target addresses */
-#define RESET_CONTROL_ADDRESS                    0x0c000000
-#define MC_REMAP_VALID_ADDRESS                   0x0c004080
-#define MC_REMAP_SIZE_ADDRESS                    0x0c004100
-#define MC_REMAP_COMPARE_ADDRESS                 0x0c004180
-#define MC_REMAP_TARGET_ADDRESS                  0x0c004200
-#define LOCAL_COUNT_ADDRESS                      0x0c014080
-#define LOCAL_SCRATCH_ADDRESS                    0x0c0140c0
-
-
-#define INT_STATUS_ENABLE_ERROR_MSB              7
-#define INT_STATUS_ENABLE_ERROR_LSB              7
-#define INT_STATUS_ENABLE_ERROR_MASK             0x00000080
-#define INT_STATUS_ENABLE_ERROR_GET(x)           (((x) & INT_STATUS_ENABLE_ERROR_MASK) >> INT_STATUS_ENABLE_ERROR_LSB)
-#define INT_STATUS_ENABLE_ERROR_SET(x)           (((x) << INT_STATUS_ENABLE_ERROR_LSB) & INT_STATUS_ENABLE_ERROR_MASK)
-
-#define INT_STATUS_ENABLE_CPU_MSB                6
-#define INT_STATUS_ENABLE_CPU_LSB                6
-#define INT_STATUS_ENABLE_CPU_MASK               0x00000040
-#define INT_STATUS_ENABLE_CPU_GET(x)             (((x) & INT_STATUS_ENABLE_CPU_MASK) >> INT_STATUS_ENABLE_CPU_LSB)
-#define INT_STATUS_ENABLE_CPU_SET(x)             (((x) << INT_STATUS_ENABLE_CPU_LSB) & INT_STATUS_ENABLE_CPU_MASK)
-
-#define INT_STATUS_ENABLE_COUNTER_MSB            4
-#define INT_STATUS_ENABLE_COUNTER_LSB            4
-#define INT_STATUS_ENABLE_COUNTER_MASK           0x00000010
-#define INT_STATUS_ENABLE_COUNTER_GET(x)         (((x) & INT_STATUS_ENABLE_COUNTER_MASK) >> INT_STATUS_ENABLE_COUNTER_LSB)
-#define INT_STATUS_ENABLE_COUNTER_SET(x)         (((x) << INT_STATUS_ENABLE_COUNTER_LSB) & INT_STATUS_ENABLE_COUNTER_MASK)
-
-#define INT_STATUS_ENABLE_MBOX_DATA_MSB          3
-#define INT_STATUS_ENABLE_MBOX_DATA_LSB          0
-#define INT_STATUS_ENABLE_MBOX_DATA_MASK         0x0000000f
-#define INT_STATUS_ENABLE_MBOX_DATA_GET(x)       (((x) & INT_STATUS_ENABLE_MBOX_DATA_MASK) >> INT_STATUS_ENABLE_MBOX_DATA_LSB)
-#define INT_STATUS_ENABLE_MBOX_DATA_SET(x)       (((x) << INT_STATUS_ENABLE_MBOX_DATA_LSB) & INT_STATUS_ENABLE_MBOX_DATA_MASK)
-
-#define ERROR_STATUS_ENABLE_RX_UNDERFLOW_MSB     1
-#define ERROR_STATUS_ENABLE_RX_UNDERFLOW_LSB     1
-#define ERROR_STATUS_ENABLE_RX_UNDERFLOW_MASK    0x00000002
-#define ERROR_STATUS_ENABLE_RX_UNDERFLOW_GET(x)  (((x) & ERROR_STATUS_ENABLE_RX_UNDERFLOW_MASK) >> ERROR_STATUS_ENABLE_RX_UNDERFLOW_LSB)
-#define ERROR_STATUS_ENABLE_RX_UNDERFLOW_SET(x)  (((x) << ERROR_STATUS_ENABLE_RX_UNDERFLOW_LSB) & ERROR_STATUS_ENABLE_RX_UNDERFLOW_MASK)
-
-#define ERROR_STATUS_ENABLE_TX_OVERFLOW_MSB      0
-#define ERROR_STATUS_ENABLE_TX_OVERFLOW_LSB      0
-#define ERROR_STATUS_ENABLE_TX_OVERFLOW_MASK     0x00000001
-#define ERROR_STATUS_ENABLE_TX_OVERFLOW_GET(x)   (((x) & ERROR_STATUS_ENABLE_TX_OVERFLOW_MASK) >> ERROR_STATUS_ENABLE_TX_OVERFLOW_LSB)
-#define ERROR_STATUS_ENABLE_TX_OVERFLOW_SET(x)   (((x) << ERROR_STATUS_ENABLE_TX_OVERFLOW_LSB) & ERROR_STATUS_ENABLE_TX_OVERFLOW_MASK)
-
-
-#define CPU_INT_STATUS_ENABLE_BIT_MSB            7
-#define CPU_INT_STATUS_ENABLE_BIT_LSB            0
-#define CPU_INT_STATUS_ENABLE_BIT_MASK           0x000000ff
-#define CPU_INT_STATUS_ENABLE_BIT_GET(x)         (((x) & CPU_INT_STATUS_ENABLE_BIT_MASK) >> CPU_INT_STATUS_ENABLE_BIT_LSB)
-#define CPU_INT_STATUS_ENABLE_BIT_SET(x)         (((x) << CPU_INT_STATUS_ENABLE_BIT_LSB) & CPU_INT_STATUS_ENABLE_BIT_MASK)
-
-#define COUNTER_INT_STATUS_ENABLE_BIT_MSB        7
-#define COUNTER_INT_STATUS_ENABLE_BIT_LSB        0
-#define COUNTER_INT_STATUS_ENABLE_BIT_MASK       0x000000ff
-#define COUNTER_INT_STATUS_ENABLE_BIT_GET(x)     (((x) & COUNTER_INT_STATUS_ENABLE_BIT_MASK) >> COUNTER_INT_STATUS_ENABLE_BIT_LSB)
-#define COUNTER_INT_STATUS_ENABLE_BIT_SET(x)     (((x) << COUNTER_INT_STATUS_ENABLE_BIT_LSB) & COUNTER_INT_STATUS_ENABLE_BIT_MASK)
-
-#define ERROR_INT_STATUS_WAKEUP_MSB              2
-#define ERROR_INT_STATUS_WAKEUP_LSB              2
-#define ERROR_INT_STATUS_WAKEUP_MASK             0x00000004
-#define ERROR_INT_STATUS_WAKEUP_GET(x)           (((x) & ERROR_INT_STATUS_WAKEUP_MASK) >> ERROR_INT_STATUS_WAKEUP_LSB)
-#define ERROR_INT_STATUS_WAKEUP_SET(x)           (((x) << ERROR_INT_STATUS_WAKEUP_LSB) & ERROR_INT_STATUS_WAKEUP_MASK)
-
-#define ERROR_INT_STATUS_RX_UNDERFLOW_MSB        1
-#define ERROR_INT_STATUS_RX_UNDERFLOW_LSB        1
-#define ERROR_INT_STATUS_RX_UNDERFLOW_MASK       0x00000002
-#define ERROR_INT_STATUS_RX_UNDERFLOW_GET(x)     (((x) & ERROR_INT_STATUS_RX_UNDERFLOW_MASK) >> ERROR_INT_STATUS_RX_UNDERFLOW_LSB)
-#define ERROR_INT_STATUS_RX_UNDERFLOW_SET(x)     (((x) << ERROR_INT_STATUS_RX_UNDERFLOW_LSB) & ERROR_INT_STATUS_RX_UNDERFLOW_MASK)
-
-#define ERROR_INT_STATUS_TX_OVERFLOW_MSB         0
-#define ERROR_INT_STATUS_TX_OVERFLOW_LSB         0
-#define ERROR_INT_STATUS_TX_OVERFLOW_MASK        0x00000001
-#define ERROR_INT_STATUS_TX_OVERFLOW_GET(x)      (((x) & ERROR_INT_STATUS_TX_OVERFLOW_MASK) >> ERROR_INT_STATUS_TX_OVERFLOW_LSB)
-#define ERROR_INT_STATUS_TX_OVERFLOW_SET(x)      (((x) << ERROR_INT_STATUS_TX_OVERFLOW_LSB) & ERROR_INT_STATUS_TX_OVERFLOW_MASK)
-
-#define HOST_INT_STATUS_ERROR_MSB                7
-#define HOST_INT_STATUS_ERROR_LSB                7
-#define HOST_INT_STATUS_ERROR_MASK               0x00000080
-#define HOST_INT_STATUS_ERROR_GET(x)             (((x) & HOST_INT_STATUS_ERROR_MASK) >> HOST_INT_STATUS_ERROR_LSB)
-#define HOST_INT_STATUS_ERROR_SET(x)             (((x) << HOST_INT_STATUS_ERROR_LSB) & HOST_INT_STATUS_ERROR_MASK)
-
-#define HOST_INT_STATUS_CPU_MSB                  6
-#define HOST_INT_STATUS_CPU_LSB                  6
-#define HOST_INT_STATUS_CPU_MASK                 0x00000040
-#define HOST_INT_STATUS_CPU_GET(x)               (((x) & HOST_INT_STATUS_CPU_MASK) >> HOST_INT_STATUS_CPU_LSB)
-#define HOST_INT_STATUS_CPU_SET(x)               (((x) << HOST_INT_STATUS_CPU_LSB) & HOST_INT_STATUS_CPU_MASK)
-
-#define HOST_INT_STATUS_COUNTER_MSB              4
-#define HOST_INT_STATUS_COUNTER_LSB              4
-#define HOST_INT_STATUS_COUNTER_MASK             0x00000010
-#define HOST_INT_STATUS_COUNTER_GET(x)           (((x) & HOST_INT_STATUS_COUNTER_MASK) >> HOST_INT_STATUS_COUNTER_LSB)
-#define HOST_INT_STATUS_COUNTER_SET(x)           (((x) << HOST_INT_STATUS_COUNTER_LSB) & HOST_INT_STATUS_COUNTER_MASK)
-
-#define RESET_CONTROL_WARM_RST_MSB               7
-#define RESET_CONTROL_WARM_RST_LSB               7
-#define RESET_CONTROL_WARM_RST_MASK              0x00000080
-#define RESET_CONTROL_WARM_RST_GET(x)            (((x) & RESET_CONTROL_WARM_RST_MASK) >> RESET_CONTROL_WARM_RST_LSB)
-#define RESET_CONTROL_WARM_RST_SET(x)            (((x) << RESET_CONTROL_WARM_RST_LSB) & RESET_CONTROL_WARM_RST_MASK)
-
-#define RESET_CONTROL_COLD_RST_MSB               8
-#define RESET_CONTROL_COLD_RST_LSB               8
-#define RESET_CONTROL_COLD_RST_MASK              0x00000100
-#define RESET_CONTROL_COLD_RST_GET(x)            (((x) & RESET_CONTROL_COLD_RST_MASK) >> RESET_CONTROL_COLD_RST_LSB)
-#define RESET_CONTROL_COLD_RST_SET(x)            (((x) << RESET_CONTROL_COLD_RST_LSB) & RESET_CONTROL_COLD_RST_MASK)
-
-#define RESET_CAUSE_LAST_MSB                     2
-#define RESET_CAUSE_LAST_LSB                     0
-#define RESET_CAUSE_LAST_MASK                    0x00000007
-#define RESET_CAUSE_LAST_GET(x)                  (((x) & RESET_CAUSE_LAST_MASK) >> RESET_CAUSE_LAST_LSB)
-#define RESET_CAUSE_LAST_SET(x)                  (((x) << RESET_CAUSE_LAST_LSB) & RESET_CAUSE_LAST_MASK)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __AR6KHWREG_H__ */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/a_config.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/a_config.h
deleted file mode 100644
index 627b2984d..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/a_config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef _A_CONFIG_H_
-#define _A_CONFIG_H_
-/*
- * Copyright (c) 2004-2005 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-/*
- * This file contains software configuration options that enables
- * specific software "features"
- */
-#include "../ar6000/config_linux.h"
-
-#endif
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/a_debug.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/a_debug.h
deleted file mode 100644
index 4b0b35155..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/a_debug.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef _A_DEBUG_H_
-#define _A_DEBUG_H_
-/*
- * Copyright (c) 2004-2006 Atheros Communications Inc.
- * All rights reserved.
- *
- * Copyright (c) 2004-2007 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#include <a_types.h>
-#include <a_osapi.h>
-
-#define DBG_INFO		0x00000001
-#define DBG_ERROR		0x00000002
-#define DBG_WARNING		0x00000004
-#define DBG_SDIO		0x00000008
-#define DBG_HIF			0x00000010
-#define DBG_HTC			0x00000020
-#define DBG_WMI			0x00000040
-#define DBG_WMI2		0x00000080
-#define DBG_DRIVER		0x00000100
-
-#define DBG_DEFAULTS	(DBG_ERROR|DBG_WARNING)
-
-#include "../ar6000/debug_linux.h"
-
-#endif
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/a_drv.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/a_drv.h
deleted file mode 100644
index 07e52d179..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/a_drv.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef _A_DRV_H_
-#define _A_DRV_H_
-/*
- * $Id: //depot/sw/releases/olca2.0-GPL/host/include/a_drv.h#1 $
- *
- * This file contains the definitions of the basic atheros data types.
- * It is used to map the data types in atheros files to a platform specific
- * type.
- *
- * Copyright 2003-2005 Atheros Communications, Inc.,  All Rights Reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#include "../ar6000/athdrv_linux.h"
-
-#endif /* _ADRV_H_ */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/a_drv_api.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/a_drv_api.h
deleted file mode 100644
index 75317260c..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/a_drv_api.h
+++ /dev/null
@@ -1,185 +0,0 @@
-#ifndef _A_DRV_API_H_
-#define _A_DRV_API_H_
-/*
- * Copyright (c) 2004-2006 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/****************************************************************************/
-/****************************************************************************/
-/**                                                                        **/
-/** WMI related hooks                                                      **/
-/**                                                                        **/
-/****************************************************************************/
-/****************************************************************************/
-
-#include <ar6000_api.h>
-
-#define A_WMI_CHANNELLIST_RX(devt, numChan, chanList)	\
-	ar6000_channelList_rx((devt), (numChan), (chanList))
-
-#define A_WMI_SET_NUMDATAENDPTS(devt, num)	\
-	ar6000_set_numdataendpts((devt), (num))
-
-#define A_WMI_CONTROL_TX(devt, osbuf, streamID)	\
-	ar6000_control_tx((devt), (osbuf), (streamID))
-
-#define A_WMI_TARGETSTATS_EVENT(devt, pStats)	\
-	ar6000_targetStats_event((devt), (pStats))
-
-#define A_WMI_SCANCOMPLETE_EVENT(devt, status)	\
-	ar6000_scanComplete_event((devt), (status))
-
-#ifdef CONFIG_HOST_DSET_SUPPORT
-
-#define A_WMI_DSET_DATA_REQ(devt, access_cookie, offset, length, targ_buf, targ_reply_fn, targ_reply_arg)	\
-	ar6000_dset_data_req((devt), (access_cookie), (offset), (length), (targ_buf), (targ_reply_fn), (targ_reply_arg))
-
-#define A_WMI_DSET_CLOSE(devt, access_cookie)	\
-	ar6000_dset_close((devt), (access_cookie))
-
-#endif
-
-#define A_WMI_DSET_OPEN_REQ(devt, id, targ_handle, targ_reply_fn, targ_reply_arg) \
-	ar6000_dset_open_req((devt), (id), (targ_handle), (targ_reply_fn), (targ_reply_arg))
-
-#define A_WMI_CONNECT_EVENT(devt, channel, bssid, listenInterval, beaconInterval, networkType, beaconIeLen, assocReqLen, assocRespLen, assocInfo) \
-	ar6000_connect_event((devt), (channel), (bssid), (listenInterval), (beaconInterval), (networkType), (beaconIeLen), (assocReqLen), (assocRespLen), (assocInfo))
-
-#define A_WMI_REGDOMAIN_EVENT(devt, regCode)	\
-	ar6000_regDomain_event((devt), (regCode))
-
-#define A_WMI_NEIGHBORREPORT_EVENT(devt, numAps, info)	\
-	ar6000_neighborReport_event((devt), (numAps), (info))
-
-#define A_WMI_DISCONNECT_EVENT(devt, reason, bssid, assocRespLen, assocInfo, protocolReasonStatus)	\
-	ar6000_disconnect_event((devt), (reason), (bssid), (assocRespLen), (assocInfo), (protocolReasonStatus))
-
-#define A_WMI_TKIP_MICERR_EVENT(devt, keyid, ismcast)	\
-	ar6000_tkip_micerr_event((devt), (keyid), (ismcast))
-
-#define A_WMI_BITRATE_RX(devt, rateKbps)	\
-	ar6000_bitrate_rx((devt), (rateKbps))
-
-#define A_WMI_TXPWR_RX(devt, txPwr)	\
-	ar6000_txPwr_rx((devt), (txPwr))
-
-#define A_WMI_READY_EVENT(devt, datap, phyCap)	\
-	ar6000_ready_event((devt), (datap), (phyCap))
-
-#define A_WMI_DBGLOG_INIT_DONE(ar) \
-        ar6000_dbglog_init_done(ar);
-
-#define A_WMI_RSSI_THRESHOLD_EVENT(devt, newThreshold, rssi)	\
-	ar6000_rssiThreshold_event((devt), (newThreshold), (rssi))
-
-#define A_WMI_REPORT_ERROR_EVENT(devt, errorVal)	\
-	ar6000_reportError_event((devt), (errorVal))
-
-#define A_WMI_ROAM_TABLE_EVENT(devt, pTbl) \
-	ar6000_roam_tbl_event((devt), (pTbl))
-
-#define A_WMI_ROAM_DATA_EVENT(devt, p) \
-	ar6000_roam_data_event((devt), (p))
-
-#define A_WMI_WOW_LIST_EVENT(devt, num_filters, wow_filters)	\
-	ar6000_wow_list_event((devt), (num_filters), (wow_filters))
-
-#define A_WMI_CAC_EVENT(devt, ac, cac_indication, statusCode, tspecSuggestion)  \
-	ar6000_cac_event((devt), (ac), (cac_indication), (statusCode), (tspecSuggestion))
-
-#define A_WMI_IPTOS_TO_USERPRIORITY(pkt)    \
-	ar6000_iptos_to_userPriority((pkt))
-
-#define A_WMI_PMKID_LIST_EVENT(devt, num_pmkid, pmkid_list)	\
-	ar6000_pmkid_list_event((devt), (num_pmkid), (pmkid_list))
-
-#ifdef CONFIG_HOST_GPIO_SUPPORT
-
-#define A_WMI_GPIO_INTR_RX(intr_mask, input_values) \
-	ar6000_gpio_intr_rx((intr_mask), (input_values))
-
-#define A_WMI_GPIO_DATA_RX(reg_id, value) \
-	ar6000_gpio_data_rx((reg_id), (value))
-
-#define A_WMI_GPIO_ACK_RX() \
-	ar6000_gpio_ack_rx()
-
-#endif
-
-#ifdef SEND_EVENT_TO_APP
-
-#define A_WMI_SEND_EVENT_TO_APP(ar, eventId, datap, len) \
-	ar6000_send_event_to_app((ar), (eventId), (datap), (len))
-
-#else
-
-#define A_WMI_SEND_EVENT_TO_APP(ar, eventId, datap, len)
-
-#endif
-
-#ifdef CONFIG_HOST_TCMD_SUPPORT
-#define A_WMI_TCMD_RX_REPORT_EVENT(devt, results, len) \
-	ar6000_tcmd_rx_report_event((devt), (results), (len))
-#endif
-
-#define A_WMI_HBCHALLENGERESP_EVENT(devt, cookie, source)    \
-    ar6000_hbChallengeResp_event((devt), (cookie), (source))
-
-#define A_WMI_TX_RETRY_ERR_EVENT(devt) \
-	ar6000_tx_retry_err_event((devt))
-
-#define A_WMI_SNR_THRESHOLD_EVENT_RX(devt, newThreshold, snr) \
-	ar6000_snrThresholdEvent_rx((devt), (newThreshold), (snr))
-
-#define A_WMI_LQ_THRESHOLD_EVENT_RX(devt, range, lqVal) \
-	ar6000_lqThresholdEvent_rx((devt), (range), (lqVal))
-
-#define A_WMI_RATEMASK_RX(devt, ratemask) \
-	ar6000_ratemask_rx((devt), (ratemask))
-
-#define A_WMI_KEEPALIVE_RX(devt, configured)    \
-        ar6000_keepalive_rx((devt), (configured))
-
-#define A_WMI_BSSINFO_EVENT_RX(ar, datp, len)   \
-        ar6000_bssInfo_event_rx((ar), (datap), (len))
-
-#define A_WMI_DBGLOG_EVENT(ar, dropped, buffer, length) \
-        ar6000_dbglog_event((ar), (dropped), (buffer), (length));
-
-#define A_WMI_STREAM_TX_ACTIVE(devt,trafficClass) \
-    ar6000_indicate_tx_activity((devt),(trafficClass), TRUE)
-
-#define A_WMI_STREAM_TX_INACTIVE(devt,trafficClass) \
-    ar6000_indicate_tx_activity((devt),(trafficClass), FALSE)
-
-/****************************************************************************/
-/****************************************************************************/
-/**                                                                        **/
-/** HTC related hooks                                                      **/
-/**                                                                        **/
-/****************************************************************************/
-/****************************************************************************/
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/a_osapi.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/a_osapi.h
deleted file mode 100644
index 7d6086712..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/a_osapi.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef _A_OSAPI_H_
-#define _A_OSAPI_H_
-/*
- * $Id: //depot/sw/releases/olca2.0-GPL/host/include/a_osapi.h#1 $
- *
- * This file contains the definitions of the basic atheros data types.
- * It is used to map the data types in atheros files to a platform specific
- * type.
- *
- * Copyright 2003-2005 Atheros Communications, Inc.,  All Rights Reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#include "../ar6000/osapi_linux.h"
-
-#endif /* _OSAPI_H_ */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/a_types.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/a_types.h
deleted file mode 100644
index e2ed09076..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/a_types.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef _A_TYPES_H_
-#define _A_TYPES_H_
-/*
- * $Id: //depot/sw/releases/olca2.0-GPL/host/include/a_types.h#1 $
- *
- * This file contains the definitions of the basic atheros data types.
- * It is used to map the data types in atheros files to a platform specific
- * type.
- *
- * Copyright 2003-2005 Atheros Communications, Inc.,  All Rights Reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#include "../ar6000/athtypes_linux.h"
-
-#endif /* _ATHTYPES_H_ */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/ar6000_api.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/ar6000_api.h
deleted file mode 100644
index abe5de79a..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/ar6000_api.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef _AR6000_API_H_
-#define _AR6000_API_H_
-/*
- * Copyright (c) 2004-2005 Atheros Communications Inc.
- * All rights reserved.
- *
- * This file contains the API to access the OS dependent atheros host driver
- * by the WMI or WLAN generic modules.
- *
- * $Id: //depot/sw/releases/olca2.0-GPL/host/include/ar6000_api.h#1 $
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#include "../ar6000/ar6xapi_linux.h"
-
-#endif /* _AR6000_API_H */
-
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/ar6000_diag.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/ar6000_diag.h
deleted file mode 100644
index 2df131df2..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/ar6000_diag.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *
- * Copyright (c) 2004-2007 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#ifndef AR6000_DIAG_H_
-#define AR6000_DIAG_H_
-
-
-A_STATUS
-ar6000_ReadRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data);
-
-A_STATUS
-ar6000_WriteRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data);
-
-A_STATUS
-ar6000_ReadDataDiag(HIF_DEVICE *hifDevice, A_UINT32 address,
-                    A_UCHAR *data, A_UINT32 length);
-
-A_STATUS
-ar6000_WriteDataDiag(HIF_DEVICE *hifDevice, A_UINT32 address,
-                     A_UCHAR *data, A_UINT32 length);
-
-#endif /*AR6000_DIAG_H_*/
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/athdefs.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/athdefs.h
deleted file mode 100644
index c28c871c5..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/athdefs.h
+++ /dev/null
@@ -1,85 +0,0 @@
-#ifndef __ATHDEFS_H__
-#define __ATHDEFS_H__
-
-/*
- * Copyright (c) 2004-2007 Atheros Communications Inc.
- * All rights reserved.
- *
- * $ATH_LICENSE_HOSTSDK0_C$
- *
- * This file contains definitions that may be used across both
- * Host and Target software.  Nothing here is module-dependent
- * or platform-dependent.
- */
-
-/*
- * Generic error codes that can be used by hw, sta, ap, sim, dk
- * and any other environments. Since these are enums, feel free to
- * add any more codes that you need.
- */
-
-typedef enum {
-    A_ERROR = -1,               /* Generic error return */
-    A_OK = 0,                   /* success */
-                                /* Following values start at 1 */
-    A_DEVICE_NOT_FOUND,         /* not able to find PCI device */
-    A_NO_MEMORY,                /* not able to allocate memory, not available */
-    A_MEMORY_NOT_AVAIL,         /* memory region is not free for mapping */
-    A_NO_FREE_DESC,             /* no free descriptors available */
-    A_BAD_ADDRESS,              /* address does not match descriptor */
-    A_WIN_DRIVER_ERROR,         /* used in NT_HW version, if problem at init */
-    A_REGS_NOT_MAPPED,          /* registers not correctly mapped */
-    A_EPERM,                    /* Not superuser */
-    A_EACCES,                   /* Access denied */
-    A_ENOENT,                   /* No such entry, search failed, etc. */
-    A_EEXIST,                   /* The object already exists (can't create) */
-    A_EFAULT,                   /* Bad address fault */
-    A_EBUSY,                    /* Object is busy */
-    A_EINVAL,                   /* Invalid parameter */
-    A_EMSGSIZE,                 /* Inappropriate message buffer length */
-    A_ECANCELED,                /* Operation canceled */
-    A_ENOTSUP,                  /* Operation not supported */
-    A_ECOMM,                    /* Communication error on send */
-    A_EPROTO,                   /* Protocol error */
-    A_ENODEV,                   /* No such device */
-    A_EDEVNOTUP,                /* device is not UP */
-    A_NO_RESOURCE,              /* No resources for requested operation */
-    A_HARDWARE,                 /* Hardware failure */
-    A_PENDING,                  /* Asynchronous routine; will send up results la
-ter (typically in callback) */
-    A_EBADCHANNEL,              /* The channel cannot be used */
-    A_DECRYPT_ERROR,            /* Decryption error */
-    A_PHY_ERROR,                /* RX PHY error */
-    A_CONSUMED                  /* Object was consumed */
-} A_STATUS;
-
-#define A_SUCCESS(x)        (x == A_OK)
-#define A_FAILED(x)         (!A_SUCCESS(x))
-
-#ifndef TRUE
-#define TRUE 1
-#endif
-
-#ifndef FALSE
-#define FALSE 0
-#endif
-
-/*
- * The following definition is WLAN specific definition
- */
-typedef enum {
-    MODE_11A = 0,   /* 11a Mode */
-    MODE_11G = 1,   /* 11g + 11b Mode */
-    MODE_11B = 2,   /* 11b Mode */
-    MODE_11GONLY = 3, /* 11g only Mode */
-    MODE_UNKNOWN = 4,
-    MODE_MAX = 4
-} WLAN_PHY_MODE;
-
-typedef enum {
-    WLAN_11A_CAPABILITY   = 1,
-    WLAN_11G_CAPABILITY   = 2,
-    WLAN_11AG_CAPABILITY  = 3,
-}WLAN_CAPABILITY;
-
-#endif /* __ATHDEFS_H__ */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/athdrv.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/athdrv.h
deleted file mode 100644
index 19da97e4b..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/athdrv.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2004-2006 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#ifndef _ATHDRV_H_
-#define _ATHDRV_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _ATHDRV_H_ */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/athendpack.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/athendpack.h
deleted file mode 100644
index 42921ae7f..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/athendpack.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- * @file: athendpack.h
- *
- * @abstract: end compiler-specific structure packing
- *
- * Copyright (c) 2004-2007 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-#ifdef VXWORKS
-#endif /* VXWORKS */
-
-#ifdef LINUX
-#endif /* LINUX */
-
-#ifdef QNX
-#endif /* QNX */
-
-#ifdef INTEGRITY
-#include "integrity/athendpack_integrity.h"
-#endif /* INTEGRITY */
-
-#ifdef NUCLEUS
-#endif /* NUCLEUS */
-
-#ifdef UNDER_CE
-#include "../os/wince/include/athendpack_wince.h"
-#endif /* WINCE */
-
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/athstartpack.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/athstartpack.h
deleted file mode 100644
index 6632cc2cb..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/athstartpack.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- * @file: athstartpack.h
- *
- * @abstract: start compiler-specific structure packing
- *
- * Copyright (c) 2004-2007 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#ifdef VXWORKS
-#endif /* VXWORKS */
-
-#ifdef LINUX
-#endif /* LINUX */
-
-#ifdef QNX
-#endif /* QNX */
-
-#ifdef INTEGRITY
-#include "integrity/athstartpack_integrity.h"
-#endif /* INTEGRITY */
-
-#ifdef NUCLEUS
-#endif /* NUCLEUS */
-
-#ifdef UNDER_CE
-#include "../os/wince/include/athstartpack_wince.h"
-#endif /* WINCE */
-
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/bmi.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/bmi.h
deleted file mode 100644
index 2eb7134c7..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/bmi.h
+++ /dev/null
@@ -1,100 +0,0 @@
-#ifndef _BMI_H_
-#define _BMI_H_
-/*
- * Copyright (c) 2004-2005 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- * BMI declarations and prototypes
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* Header files */
-#include "a_config.h"
-#include "athdefs.h"
-#include "a_types.h"
-#include "hif.h"
-#include "a_osapi.h"
-#include "bmi_msg.h"
-
-void
-BMIInit(void);
-
-A_STATUS
-BMIDone(HIF_DEVICE *device);
-
-A_STATUS
-BMIGetTargetInfo(HIF_DEVICE *device, struct bmi_target_info *targ_info);
-
-A_STATUS
-BMIReadMemory(HIF_DEVICE *device,
-              A_UINT32 address,
-              A_UCHAR *buffer,
-              A_UINT32 length);
-
-A_STATUS
-BMIWriteMemory(HIF_DEVICE *device,
-               A_UINT32 address,
-               A_UCHAR *buffer,
-               A_UINT32 length);
-
-A_STATUS
-BMIExecute(HIF_DEVICE *device,
-           A_UINT32 address,
-           A_UINT32 *param);
-
-A_STATUS
-BMISetAppStart(HIF_DEVICE *device,
-               A_UINT32 address);
-
-A_STATUS
-BMIReadSOCRegister(HIF_DEVICE *device,
-                   A_UINT32 address,
-                   A_UINT32 *param);
-
-A_STATUS
-BMIWriteSOCRegister(HIF_DEVICE *device,
-                    A_UINT32 address,
-                    A_UINT32 param);
-
-A_STATUS
-BMIrompatchInstall(HIF_DEVICE *device,
-                   A_UINT32 ROM_addr,
-                   A_UINT32 RAM_addr,
-                   A_UINT32 nbytes,
-                   A_UINT32 do_activate,
-                   A_UINT32 *patch_id);
-
-A_STATUS
-BMIrompatchUninstall(HIF_DEVICE *device,
-                     A_UINT32 rompatch_id);
-
-A_STATUS
-BMIrompatchActivate(HIF_DEVICE *device,
-                    A_UINT32 rompatch_count,
-                    A_UINT32 *rompatch_list);
-
-A_STATUS
-BMIrompatchDeactivate(HIF_DEVICE *device,
-                      A_UINT32 rompatch_count,
-                      A_UINT32 *rompatch_list);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _BMI_H_ */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/bmi_msg.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/bmi_msg.h
deleted file mode 100644
index 7c91ef473..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/bmi_msg.h
+++ /dev/null
@@ -1,199 +0,0 @@
-#ifndef __BMI_MSG_H__
-#define __BMI_MSG_H__
-/*
- *
- * Copyright (c) 2004-2007 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-/*
- * Bootloader Messaging Interface (BMI)
- *
- * BMI is a very simple messaging interface used during initialization
- * to read memory, write memory, execute code, and to define an
- * application entry PC.
- *
- * It is used to download an application to AR6K, to provide
- * patches to code that is already resident on AR6K, and generally
- * to examine and modify state.  The Host has an opportunity to use
- * BMI only once during bootup.  Once the Host issues a BMI_DONE
- * command, this opportunity ends.
- *
- * The Host writes BMI requests to mailbox0, and reads BMI responses
- * from mailbox0.   BMI requests all begin with a command
- * (see below for specific commands), and are followed by
- * command-specific data.
- *
- * Flow control:
- * The Host can only issue a command once the Target gives it a
- * "BMI Command Credit", using AR6K Counter #4.  As soon as the
- * Target has completed a command, it issues another BMI Command
- * Credit (so the Host can issue the next command).
- *
- * BMI handles all required Target-side cache flushing.
- */
-
-
-/* Maximum data size used for BMI transfers */
-#define BMI_DATASZ_MAX                     32
-
-/* BMI Commands */
-
-#define BMI_NO_COMMAND                      0
-
-#define BMI_DONE                            1
-        /*
-         * Semantics: Host is done using BMI
-         * Request format:
-         *    A_UINT32      command (BMI_DONE)
-         * Response format: none
-         */
-
-#define BMI_READ_MEMORY                     2
-        /*
-         * Semantics: Host reads AR6K memory
-         * Request format:
-         *    A_UINT32      command (BMI_READ_MEMORY)
-         *    A_UINT32      address
-         *    A_UINT32      length, at most BMI_DATASZ_MAX
-         * Response format:
-         *    A_UINT8       data[length]
-         */
-
-#define BMI_WRITE_MEMORY                    3
-        /*
-         * Semantics: Host writes AR6K memory
-         * Request format:
-         *    A_UINT32       command (BMI_WRITE_MEMORY)
-         *    A_UINT32      address
-         *    A_UINT32      length, at most BMI_DATASZ_MAX
-         *    A_UINT8       data[length]
-         * Response format: none
-         */
-
-#define BMI_EXECUTE                         4
-        /*
-         * Semantics: Causes AR6K to execute code
-         * Request format:
-         *    A_UINT32      command (BMI_EXECUTE)
-         *    A_UINT32      address
-         *    A_UINT32      parameter
-         * Response format:
-         *    A_UINT32      return value
-         */
-
-#define BMI_SET_APP_START                   5
-        /*
-         * Semantics: Set Target application starting address
-         * Request format:
-         *    A_UINT32      command (BMI_SET_APP_START)
-         *    A_UINT32      address
-         * Response format: none
-         */
-
-#define BMI_READ_SOC_REGISTER               6
-        /*
-         * Semantics: Read a 32-bit Target SOC register.
-         * Request format:
-         *    A_UINT32      command (BMI_READ_REGISTER)
-         *    A_UINT32      address
-         * Response format:
-         *    A_UINT32      value
-         */
-
-#define BMI_WRITE_SOC_REGISTER              7
-        /*
-         * Semantics: Write a 32-bit Target SOC register.
-         * Request format:
-         *    A_UINT32      command (BMI_WRITE_REGISTER)
-         *    A_UINT32      address
-         *    A_UINT32      value
-         *
-         * Response format: none
-         */
-
-#define BMI_GET_TARGET_ID                  8
-#define BMI_GET_TARGET_INFO                8
-        /*
-         * Semantics: Fetch the 4-byte Target information
-         * Request format:
-         *    A_UINT32      command (BMI_GET_TARGET_ID/INFO)
-         * Response format1 (old firmware):
-         *    A_UINT32      TargetVersionID
-         * Response format2 (newer firmware):
-         *    A_UINT32      TARGET_VERSION_SENTINAL
-         *    struct bmi_target_info;
-         */
-
-struct bmi_target_info {
-    A_UINT32 target_info_byte_count; /* size of this structure */
-    A_UINT32 target_ver;             /* Target Version ID */
-    A_UINT32 target_type;            /* Target type */
-};
-#define TARGET_VERSION_SENTINAL 0xffffffff
-#define TARGET_TYPE_AR6001 1
-#define TARGET_TYPE_AR6002 2
-
-
-#define BMI_ROMPATCH_INSTALL               9
-        /*
-         * Semantics: Install a ROM Patch.
-         * Request format:
-         *    A_UINT32      command (BMI_ROMPATCH_INSTALL)
-         *    A_UINT32      Target ROM Address
-         *    A_UINT32      Target RAM Address
-         *    A_UINT32      Size, in bytes
-         *    A_UINT32      Activate? 1-->activate;
-         *                            0-->install but do not activate
-         * Response format:
-         *    A_UINT32      PatchID
-         */
-
-#define BMI_ROMPATCH_UNINSTALL             10
-        /*
-         * Semantics: Uninstall a previously-installed ROM Patch,
-         * automatically deactivating, if necessary.
-         * Request format:
-         *    A_UINT32      command (BMI_ROMPATCH_UNINSTALL)
-         *    A_UINT32      PatchID
-         *
-         * Response format: none
-         */
-
-#define BMI_ROMPATCH_ACTIVATE              11
-        /*
-         * Semantics: Activate a list of previously-installed ROM Patches.
-         * Request format:
-         *    A_UINT32      command (BMI_ROMPATCH_ACTIVATE)
-         *    A_UINT32      rompatch_count
-         *    A_UINT32      PatchID[rompatch_count]
-         *
-         * Response format: none
-         */
-
-#define BMI_ROMPATCH_DEACTIVATE            12
-        /*
-         * Semantics: Deactivate a list of active ROM Patches.
-         * Request format:
-         *    A_UINT32      command (BMI_ROMPATCH_DEACTIVATE)
-         *    A_UINT32      rompatch_count
-         *    A_UINT32      PatchID[rompatch_count]
-         *
-         * Response format: none
-         */
-
-
-#endif /* __BMI_MSG_H__ */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/common_drv.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/common_drv.h
deleted file mode 100644
index 1bdc3dae5..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/common_drv.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *
- * Copyright (c) 2004-2007 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-
-#ifndef COMMON_DRV_H_
-#define COMMON_DRV_H_
-
-#include "hif.h"
-#include "htc_packet.h"
-
-
-
-/* structure that is the state information for the default credit distribution callback
- * drivers should instantiate (zero-init as well) this structure in their driver instance
- * and pass it as a context to the HTC credit distribution functions */
-typedef struct _COMMON_CREDIT_STATE_INFO {
-    int TotalAvailableCredits;      /* total credits in the system at startup */
-    int CurrentFreeCredits;         /* credits available in the pool that have not been
-                                       given out to endpoints */
-    HTC_ENDPOINT_CREDIT_DIST *pLowestPriEpDist;  /* pointer to the lowest priority endpoint dist struct */
-} COMMON_CREDIT_STATE_INFO;
-
-
-/* HTC TX packet tagging definitions */
-#define AR6K_CONTROL_PKT_TAG    HTC_TX_PACKET_TAG_USER_DEFINED
-#define AR6K_DATA_PKT_TAG       (AR6K_CONTROL_PKT_TAG + 1)
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* OS-independent APIs */
-A_STATUS ar6000_setup_credit_dist(HTC_HANDLE HTCHandle, COMMON_CREDIT_STATE_INFO *pCredInfo);
-A_STATUS ar6000_ReadRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data);
-A_STATUS ar6000_WriteRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data);
-A_STATUS ar6000_ReadDataDiag(HIF_DEVICE *hifDevice, A_UINT32 address,  A_UCHAR *data, A_UINT32 length);
-A_STATUS ar6000_reset_device(HIF_DEVICE *hifDevice, A_UINT32 TargetType);
-void ar6000_dump_target_assert_info(HIF_DEVICE *hifDevice, A_UINT32 TargetType);
-A_STATUS ar6000_reset_device_skipflash(HIF_DEVICE *hifDevice);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*COMMON_DRV_H_*/
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/dbglog.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/dbglog.h
deleted file mode 100644
index 3d1e528f7..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/dbglog.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (c) 2004-2007 Atheros Communications Inc.
- * All rights reserved.
- *
- * $ATH_LICENSE_HOSTSDK0_C$
- *
- * This file contains the definitions and data structures associated with
- * the log based debug mechanism.
- *
- */
-
-#ifndef _DBGLOG_H_
-#define _DBGLOG_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define DBGLOG_TIMESTAMP_OFFSET          0
-#define DBGLOG_TIMESTAMP_MASK            0x0000FFFF /* Bit 0-15. Contains bit
-                                                       8-23 of the LF0 timer */
-#define DBGLOG_DBGID_OFFSET              16
-#define DBGLOG_DBGID_MASK                0x03FF0000 /* Bit 16-25 */
-#define DBGLOG_DBGID_NUM_MAX             256 /* Upper limit is width of mask */
-
-#define DBGLOG_MODULEID_OFFSET           26
-#define DBGLOG_MODULEID_MASK             0x3C000000 /* Bit 26-29 */
-#define DBGLOG_MODULEID_NUM_MAX          16 /* Upper limit is width of mask */
-
-/*
- * Please ensure that the definition of any new module intrduced is captured
- * between the DBGLOG_MODULEID_START and DBGLOG_MODULEID_END defines. The
- * structure is required for the parser to correctly pick up the values for
- * different modules.
- */
-#define DBGLOG_MODULEID_START
-#define DBGLOG_MODULEID_INF                   0
-#define DBGLOG_MODULEID_WMI                   1
-#define DBGLOG_MODULEID_CSERV                 2
-#define DBGLOG_MODULEID_PM                    3
-#define DBGLOG_MODULEID_TXRX_MGMTBUF          4
-#define DBGLOG_MODULEID_TXRX_TXBUF            5
-#define DBGLOG_MODULEID_TXRX_RXBUF            6
-#define DBGLOG_MODULEID_WOW                   7
-#define DBGLOG_MODULEID_WHAL                  8
-#define DBGLOG_MODULEID_END
-
-#define DBGLOG_NUM_ARGS_OFFSET             30
-#define DBGLOG_NUM_ARGS_MASK               0xC0000000 /* Bit 30-31 */
-#define DBGLOG_NUM_ARGS_MAX                2 /* Upper limit is width of mask */
-
-#define DBGLOG_MODULE_LOG_ENABLE_OFFSET    0
-#define DBGLOG_MODULE_LOG_ENABLE_MASK      0x0000FFFF
-
-#define DBGLOG_REPORTING_ENABLED_OFFSET    16
-#define DBGLOG_REPORTING_ENABLED_MASK      0x00010000
-
-#define DBGLOG_TIMESTAMP_RESOLUTION_OFFSET 17
-#define DBGLOG_TIMESTAMP_RESOLUTION_MASK   0x000E0000
-
-#define DBGLOG_REPORT_SIZE_OFFSET          20
-#define DBGLOG_REPORT_SIZE_MASK            0x3FF00000
-
-#define DBGLOG_LOG_BUFFER_SIZE             1500
-#define DBGLOG_DBGID_DEFINITION_LEN_MAX    64
-
-struct dbglog_buf_s {
-    struct dbglog_buf_s *next;
-    A_INT8              *buffer;
-    A_UINT32             bufsize;
-    A_UINT32             length;
-    A_UINT32             count;
-    A_UINT32             free;
-};
-
-struct dbglog_hdr_s {
-    struct dbglog_buf_s *dbuf;
-    A_UINT32             dropped;
-};
-
-struct dbglog_config_s {
-    A_UINT32                    cfgvalid; /* Mask with valid config bits */
-    union {
-        /* TODO: Take care of endianness */
-        struct {
-            A_UINT32            mmask:16; /* Mask of modules with logging on */
-            A_UINT32            rep:1; /* Reporting enabled or not */
-            A_UINT32            tsr:3; /* Time stamp resolution. Def: 1 ms */
-            A_UINT32            size:10; /* Report size in number of messages */
-            A_UINT32            reserved:2;
-        } dbglog_config;
-
-        A_UINT32                value;
-    } u;
-};
-
-#define cfgmmask                   u.dbglog_config.mmask
-#define cfgrep                     u.dbglog_config.rep
-#define cfgtsr                     u.dbglog_config.tsr
-#define cfgsize                    u.dbglog_config.size
-#define cfgvalue                   u.value
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _DBGLOG_H_ */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/dbglog_api.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/dbglog_api.h
deleted file mode 100644
index 06c8102e1..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/dbglog_api.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef _DBGLOG_API_H_
-#define _DBGLOG_API_H_
-/*
- * Copyright (c) 2004-2006 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- * This file contains host side debug primitives.
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "dbglog.h"
-
-#define DBGLOG_HOST_LOG_BUFFER_SIZE            DBGLOG_LOG_BUFFER_SIZE
-
-#define DBGLOG_GET_DBGID(arg) \
-    ((arg & DBGLOG_DBGID_MASK) >> DBGLOG_DBGID_OFFSET)
-
-#define DBGLOG_GET_MODULEID(arg) \
-    ((arg & DBGLOG_MODULEID_MASK) >> DBGLOG_MODULEID_OFFSET)
-
-#define DBGLOG_GET_NUMARGS(arg) \
-    ((arg & DBGLOG_NUM_ARGS_MASK) >> DBGLOG_NUM_ARGS_OFFSET)
-
-#define DBGLOG_GET_TIMESTAMP(arg) \
-    ((arg & DBGLOG_TIMESTAMP_MASK) >> DBGLOG_TIMESTAMP_OFFSET)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _DBGLOG_API_H_ */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/dbglog_id.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/dbglog_id.h
deleted file mode 100644
index ce22b1682..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/dbglog_id.h
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
- *
- * Copyright (c) 2004-2007 Atheros Communications Inc.
- * All rights reserved.
- *
- * $ATH_LICENSE_HOSTSDK0_C$
- *
- * This file contains the definitions of the debug identifiers for different
- * modules.
- *
- */
-
-#ifndef _DBGLOG_ID_H_
-#define _DBGLOG_ID_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * The nomenclature for the debug identifiers is MODULE_DESCRIPTION.
- * Please ensure that the definition of any new debugid introduced is captured
- * between the <MODULE>_DBGID_DEFINITION_START and
- * <MODULE>_DBGID_DEFINITION_END defines. The structure is required for the
- * parser to correctly pick up the values for different debug identifiers.
- */
-
-/* INF debug identifier definitions */
-#define INF_DBGID_DEFINITION_START
-#define INF_ASSERTION_FAILED                          1
-#define INF_TARGET_ID                                 2
-#define INF_DBGID_DEFINITION_END
-
-/* WMI debug identifier definitions */
-#define WMI_DBGID_DEFINITION_START
-#define WMI_CMD_RX_XTND_PKT_TOO_SHORT                 1
-#define WMI_EXTENDED_CMD_NOT_HANDLED                  2
-#define WMI_CMD_RX_PKT_TOO_SHORT                      3
-#define WMI_CALLING_WMI_EXTENSION_FN                  4
-#define WMI_CMD_NOT_HANDLED                           5
-#define WMI_IN_SYNC                                   6
-#define WMI_TARGET_WMI_SYNC_CMD                       7
-#define WMI_SET_SNR_THRESHOLD_PARAMS                  8
-#define WMI_SET_RSSI_THRESHOLD_PARAMS                 9
-#define WMI_SET_LQ_TRESHOLD_PARAMS                   10
-#define WMI_TARGET_CREATE_PSTREAM_CMD                11
-#define WMI_WI_DTM_INUSE                             12
-#define WMI_TARGET_DELETE_PSTREAM_CMD                13
-#define WMI_TARGET_IMPLICIT_DELETE_PSTREAM_CMD       14
-#define WMI_TARGET_GET_BIT_RATE_CMD                  15
-#define WMI_GET_RATE_MASK_CMD_FIX_RATE_MASK_IS       16
-#define WMI_TARGET_GET_AVAILABLE_CHANNELS_CMD        17
-#define WMI_TARGET_GET_TX_PWR_CMD                    18
-#define WMI_FREE_EVBUF_WMIBUF                        19
-#define WMI_FREE_EVBUF_DATABUF                       20
-#define WMI_FREE_EVBUF_BADFLAG                       21
-#define WMI_HTC_RX_ERROR_DATA_PACKET                 22
-#define WMI_HTC_RX_SYNC_PAUSING_FOR_MBOX             23
-#define WMI_INCORRECT_WMI_DATA_HDR_DROPPING_PKT      24
-#define WMI_SENDING_READY_EVENT                      25
-#define WMI_SETPOWER_MDOE_TO_MAXPERF                 26
-#define WMI_SETPOWER_MDOE_TO_REC                     27
-#define WMI_BSSINFO_EVENT_FROM                       28
-#define WMI_TARGET_GET_STATS_CMD                     29
-#define WMI_SENDING_SCAN_COMPLETE_EVENT              30
-#define WMI_SENDING_RSSI_INDB_THRESHOLD_EVENT        31
-#define WMI_SENDING_RSSI_INDBM_THRESHOLD_EVENT       32
-#define WMI_SENDING_LINK_QUALITY_THRESHOLD_EVENT     33
-#define WMI_SENDING_ERROR_REPORT_EVENT               34
-#define WMI_SENDING_CAC_EVENT                        35
-#define WMI_TARGET_GET_ROAM_TABLE_CMD                36
-#define WMI_TARGET_GET_ROAM_DATA_CMD                 37
-#define WMI_SENDING_GPIO_INTR_EVENT                  38
-#define WMI_SENDING_GPIO_ACK_EVENT                   39
-#define WMI_SENDING_GPIO_DATA_EVENT                  40
-#define WMI_CMD_RX                                   41
-#define WMI_CMD_RX_XTND                              42
-#define WMI_EVENT_SEND                               43
-#define WMI_EVENT_SEND_XTND                          44
-#define WMI_DBGID_DEFINITION_END
-
-/* CSERV debug identifier definitions */
-#define CSERV_DBGID_DEFINITION_START
-#define CSERV_BEGIN_SCAN1                             1
-#define CSERV_BEGIN_SCAN2                             2
-#define CSERV_END_SCAN1                               3
-#define CSERV_END_SCAN2                               4
-#define CSERV_CHAN_SCAN_START                         5
-#define CSERV_CHAN_SCAN_STOP                          6
-#define CSERV_CHANNEL_OPPPORTUNITY                    7
-#define CSERV_NC_TIMEOUT                              8
-#define CSERV_BACK_HOME                              10
-#define CSERV_CHMGR_CH_CALLBACK1                     11
-#define CSERV_CHMGR_CH_CALLBACK2                     12
-#define CSERV_CHMGR_CH_CALLBACK3                     13
-#define CSERV_SET_SCAN_PARAMS1                       14
-#define CSERV_SET_SCAN_PARAMS2                       15
-#define CSERV_SET_SCAN_PARAMS3                       16
-#define CSERV_SET_SCAN_PARAMS4                       17
-#define CSERV_ABORT_SCAN                             18
-#define CSERV_NEWSTATE                               19
-#define CSERV_MINCHMGR_OP_END                        20
-#define CSERV_CHMGR_OP_END                           21
-#define CSERV_DISCONNECT_TIMEOUT                     22
-#define CSERV_ROAM_TIMEOUT                           23
-#define CSERV_FORCE_SCAN1                            24
-#define CSERV_FORCE_SCAN2                            25
-#define CSERV_FORCE_SCAN3                            26
-#define CSERV_UTIL_TIMEOUT                           27
-#define CSERV_RSSIPOLLER                             28
-#define CSERV_RETRY_CONNECT_TIMEOUT                  29
-#define CSERV_RSSIINDBMPOLLER                        30
-#define CSERV_BGSCAN_ENABLE                          31
-#define CSERV_BGSCAN_DISABLE                         32
-#define CSERV_WLAN_START_SCAN_CMD1                   33
-#define CSERV_WLAN_START_SCAN_CMD2                   34
-#define CSERV_WLAN_START_SCAN_CMD3                   35
-#define CSERV_START_SCAN_CMD                         36
-#define CSERV_START_FORCE_SCAN                       37
-#define CSERV_NEXT_CHAN                              38
-#define CSERV_SET_REGCODE                            39
-#define CSERV_START_ADHOC                            40
-#define CSERV_ADHOC_AT_HOME                          41
-#define CSERV_OPT_AT_HOME                            42
-#define CSERV_WLAN_CONNECT_CMD                       43
-#define CSERV_WLAN_RECONNECT_CMD                     44
-#define CSERV_WLAN_DISCONNECT_CMD                    45
-#define CSERV_BSS_CHANGE_CHANNEL                     46
-#define CSERV_BEACON_RX                              47
-#define CSERV_KEEPALIVE_CHECK                        48
-#define CSERV_RC_BEGIN_SCAN                          49
-#define CSERV_RC_SCAN_START                          50
-#define CSERV_RC_SCAN_STOP                           51
-#define CSERV_RC_NEXT                                52
-#define CSERV_RC_SCAN_END                            53
-#define CSERV_PROBE_CALLBACK                         54
-#define CSERV_ROAM1                                  55
-#define CSERV_ROAM2                                  56
-#define CSERV_ROAM3                                  57
-#define CSERV_CONNECT_EVENT                          58
-#define CSERV_DISCONNECT_EVENT                       59
-#define CSERV_BMISS_HANDLER1                         60
-#define CSERV_BMISS_HANDLER2                         61
-#define CSERV_BMISS_HANDLER3                         62
-#define CSERV_LOWRSSI_HANDLER                        63
-#define CSERV_WLAN_SET_PMKID_CMD                     64
-#define CSERV_RECONNECT_REQUEST                      65
-#define CSERV_KEYSPLUMBED_EVENT                      66
-#define CSERV_NEW_REG                                67
-#define CSERV_SET_RSSI_THOLD                         68
-#define CSERV_RSSITHRESHOLDCHECK                     69
-#define CSERV_RSSIINDBMTHRESHOLDCHECK                70
-#define CSERV_WLAN_SET_OPT_CMD1                      71
-#define CSERV_WLAN_SET_OPT_CMD2                      72
-#define CSERV_WLAN_SET_OPT_CMD3                      73
-#define CSERV_WLAN_SET_OPT_CMD4                      74
-#define CSERV_SCAN_CONNECT_STOP                      75
-#define CSERV_BMISS_HANDLER4                         76
-#define CSERV_INITIALIZE_TIMER                       77
-#define CSERV_ARM_TIMER                              78
-#define CSERV_DISARM_TIMER                           79
-#define CSERV_UNINITIALIZE_TIMER                     80
-#define CSERV_DISCONNECT_EVENT2                      81
-#define CSERV_SCAN_CONNECT_START                     82
-#define CSERV_BSSINFO_MEMORY_ALLOC_FAILED            83
-#define CSERV_SET_SCAN_PARAMS5                       84
-#define CSERV_DBGID_DEFINITION_END
-
-/* TXRX debug identifier definitions */
-#define TXRX_TXBUF_DBGID_DEFINITION_START
-#define TXRX_TXBUF_ALLOCATE_BUF                      1
-#define TXRX_TXBUF_QUEUE_BUF_TO_MBOX                 2
-#define TXRX_TXBUF_QUEUE_BUF_TO_TXQ                  3
-#define TXRX_TXBUF_TXQ_DEPTH                         4
-#define TXRX_TXBUF_IBSS_QUEUE_TO_SFQ                 5
-#define TXRX_TXBUF_IBSS_QUEUE_TO_TXQ_FRM_SFQ         6
-#define TXRX_TXBUF_INITIALIZE_TIMER                  7
-#define TXRX_TXBUF_ARM_TIMER                         8
-#define TXRX_TXBUF_DISARM_TIMER                      9
-#define TXRX_TXBUF_UNINITIALIZE_TIMER                10
-#define TXRX_TXBUF_DBGID_DEFINITION_END
-
-#define TXRX_RXBUF_DBGID_DEFINITION_START
-#define TXRX_RXBUF_ALLOCATE_BUF                      1
-#define TXRX_RXBUF_QUEUE_TO_HOST                     2
-#define TXRX_RXBUF_QUEUE_TO_WLAN                     3
-#define TXRX_RXBUF_ZERO_LEN_BUF                      4
-#define TXRX_RXBUF_QUEUE_TO_HOST_LASTBUF_IN_RXCHAIN  5
-#define TXRX_RXBUF_LASTBUF_IN_RXCHAIN_ZEROBUF        6
-#define TXRX_RXBUF_QUEUE_EMPTY_QUEUE_TO_WLAN         7
-#define TXRX_RXBUF_SEND_TO_RECV_MGMT                 8
-#define TXRX_RXBUF_SEND_TO_IEEE_LAYER                9
-#define TXRX_RXBUF_DBGID_DEFINITION_END
-
-#define TXRX_MGMTBUF_DBGID_DEFINITION_START
-#define TXRX_MGMTBUF_ALLOCATE_BUF                    1
-#define TXRX_MGMTBUF_ALLOCATE_SM_BUF                 2
-#define TXRX_MGMTBUF_ALLOCATE_RMBUF                  3
-#define TXRX_MGMTBUF_GET_BUF                         4
-#define TXRX_MGMTBUF_GET_SM_BUF                      5
-#define TXRX_MGMTBUF_QUEUE_BUF_TO_TXQ                6
-#define TXRX_MGMTBUF_REAPED_BUF                      7
-#define TXRX_MGMTBUF_REAPED_SM_BUF                   8
-#define TXRX_MGMTBUF_WAIT_FOR_TXQ_DRAIN              9
-#define TXRX_MGMTBUF_WAIT_FOR_TXQ_SFQ_DRAIN          10
-#define TXRX_MGMTBUF_ENQUEUE_INTO_SFQ                11
-#define TXRX_MGMTBUF_DEQUEUE_FROM_SFQ                12
-#define TXRX_MGMTBUF_PAUSE_TXQ                       13
-#define TXRX_MGMTBUF_RESUME_TXQ                      14
-#define TXRX_MGMTBUF_WAIT_FORTXQ_DRAIN_TIMEOUT       15
-#define TXRX_MGMTBUF_DRAINQ                          16
-#define TXRX_MGMTBUF_INDICATE_Q_DRAINED              17
-#define TXRX_MGMTBUF_DBGID_DEFINITION_END
-
-/* PM (Power Module) debug identifier definitions */
-#define PM_DBGID_DEFINITION_START
-#define PM_INIT                                      1
-#define PM_ENABLE                                    2
-#define PM_SET_STATE                                 3
-#define PM_SET_POWERMODE                             4
-#define PM_CONN_NOTIFY                               5
-#define PM_REF_COUNT_NEGATIVE                        6
-#define PM_APSD_ENABLE                               7
-#define PM_UPDATE_APSD_STATE                         8
-#define PM_CHAN_OP_REQ                               9
-#define PM_SET_MY_BEACON_POLICY                      10
-#define PM_SET_ALL_BEACON_POLICY                     11
-#define PM_SET_PM_PARAMS1                            12
-#define PM_SET_PM_PARAMS2                            13
-#define PM_ADHOC_SET_PM_CAPS_FAIL                    14
-#define PM_ADHOC_UNKNOWN_IBSS_ATTRIB_ID              15
-#define PM_DBGID_DEFINITION_END
-
-/* Wake on Wireless debug identifier definitions */
-#define WOW_DBGID_DEFINITION_START
-#define WOW_INIT                                        1
-#define WOW_GET_CONFIG_DSET                             2
-#define WOW_NO_CONFIG_DSET                              3
-#define WOW_INVALID_CONFIG_DSET                         4
-#define WOW_USE_DEFAULT_CONFIG                          5
-#define WOW_SETUP_GPIO                                  6
-#define WOW_INIT_DONE                                   7
-#define WOW_SET_GPIO_PIN                                8
-#define WOW_CLEAR_GPIO_PIN                              9
-#define WOW_SET_WOW_MODE_CMD                            10
-#define WOW_SET_HOST_MODE_CMD                           11
-#define WOW_ADD_WOW_PATTERN_CMD                         12
-#define WOW_NEW_WOW_PATTERN_AT_INDEX                    13
-#define WOW_DEL_WOW_PATTERN_CMD                         14
-#define WOW_LIST_CONTAINS_PATTERNS                      15
-#define WOW_GET_WOW_LIST_CMD                            16
-#define WOW_INVALID_FILTER_ID                           17
-#define WOW_INVALID_FILTER_LISTID                       18
-#define WOW_NO_VALID_FILTER_AT_ID                       19
-#define WOW_NO_VALID_LIST_AT_ID                         20
-#define WOW_NUM_PATTERNS_EXCEEDED                       21
-#define WOW_NUM_LISTS_EXCEEDED                          22
-#define WOW_GET_WOW_STATS                               23
-#define WOW_CLEAR_WOW_STATS                             24
-#define WOW_WAKEUP_HOST                                 25
-#define WOW_EVENT_WAKEUP_HOST                           26
-#define WOW_EVENT_DISCARD                               27
-#define WOW_PATTERN_MATCH                               28
-#define WOW_PATTERN_NOT_MATCH                           29
-#define WOW_PATTERN_NOT_MATCH_OFFSET                    30
-#define WOW_DISABLED_HOST_ASLEEP                        31
-#define WOW_ENABLED_HOST_ASLEEP_NO_PATTERNS             32
-#define WOW_ENABLED_HOST_ASLEEP_NO_MATCH_FOUND          33
-#define WOW_DBGID_DEFINITION_END
-
-/* WHAL debug identifier definitions */
-#define WHAL_DBGID_DEFINITION_START
-#define WHAL_ERROR_ANI_CONTROL                      1
-#define WHAL_ERROR_CHIP_TEST1                       2
-#define WHAL_ERROR_CHIP_TEST2                       3
-#define WHAL_ERROR_EEPROM_CHECKSUM                  4
-#define WHAL_ERROR_EEPROM_MACADDR                   5
-#define WHAL_ERROR_INTERRUPT_HIU                    6
-#define WHAL_ERROR_KEYCACHE_RESET                   7
-#define WHAL_ERROR_KEYCACHE_SET                     8
-#define WHAL_ERROR_KEYCACHE_TYPE                    9
-#define WHAL_ERROR_KEYCACHE_TKIPENTRY              10
-#define WHAL_ERROR_KEYCACHE_WEPLENGTH              11
-#define WHAL_ERROR_PHY_INVALID_CHANNEL             12
-#define WHAL_ERROR_POWER_AWAKE                     13
-#define WHAL_ERROR_POWER_SET                       14
-#define WHAL_ERROR_RECV_STOPDMA                    15
-#define WHAL_ERROR_RECV_STOPPCU                    16
-#define WHAL_ERROR_RESET_CHANNF1                   17
-#define WHAL_ERROR_RESET_CHANNF2                   18
-#define WHAL_ERROR_RESET_PM                        19
-#define WHAL_ERROR_RESET_OFFSETCAL                 20
-#define WHAL_ERROR_RESET_RFGRANT                   21
-#define WHAL_ERROR_RESET_RXFRAME                   22
-#define WHAL_ERROR_RESET_STOPDMA                   23
-#define WHAL_ERROR_RESET_RECOVER                   24
-#define WHAL_ERROR_XMIT_COMPUTE                    25
-#define WHAL_ERROR_XMIT_NOQUEUE                    26
-#define WHAL_ERROR_XMIT_ACTIVEQUEUE                27
-#define WHAL_ERROR_XMIT_BADTYPE                    28
-#define WHAL_DBGID_DEFINITION_END
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _DBGLOG_ID_H_ */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/dl_list.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/dl_list.h
deleted file mode 100644
index 4b9c58198..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/dl_list.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- *
- * Double-link list definitions (adapted from Atheros SDIO stack)
- *
- * Copyright (c) 2007 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-#ifndef __DL_LIST_H___
-#define __DL_LIST_H___
-
-#define A_CONTAINING_STRUCT(address, struct_type, field_name)\
-            ((struct_type *)((A_UINT32)(address) - (A_UINT32)(&((struct_type *)0)->field_name)))
-
-/* list functions */
-/* pointers for the list */
-typedef struct _DL_LIST {
-    struct _DL_LIST *pPrev;
-    struct _DL_LIST *pNext;
-}DL_LIST, *PDL_LIST;
-/*
- * DL_LIST_INIT , initialize doubly linked list
-*/
-#define DL_LIST_INIT(pList)\
-    {(pList)->pPrev = pList; (pList)->pNext = pList;}
-
-#define DL_LIST_IS_EMPTY(pList) (((pList)->pPrev == (pList)) && ((pList)->pNext == (pList)))
-#define DL_LIST_GET_ITEM_AT_HEAD(pList) (pList)->pNext
-#define DL_LIST_GET_ITEM_AT_TAIL(pList) (pList)->pPrev
-/*
- * ITERATE_OVER_LIST pStart is the list, pTemp is a temp list member
- * NOT: do not use this function if the items in the list are deleted inside the
- * iteration loop
-*/
-#define ITERATE_OVER_LIST(pStart, pTemp) \
-    for((pTemp) =(pStart)->pNext; pTemp != (pStart); (pTemp) = (pTemp)->pNext)
-
-
-/* safe iterate macro that allows the item to be removed from the list
- * the iteration continues to the next item in the list
- */
-#define ITERATE_OVER_LIST_ALLOW_REMOVE(pStart,pItem,st,offset)  \
-{                                                       \
-    PDL_LIST  pTemp;                                     \
-    pTemp = (pStart)->pNext;                            \
-    while (pTemp != (pStart)) {                         \
-        (pItem) = A_CONTAINING_STRUCT(pTemp,st,offset);   \
-         pTemp = pTemp->pNext;                          \
-
-#define ITERATE_END }}
-
-/*
- * DL_ListInsertTail - insert pAdd to the end of the list
-*/
-static INLINE PDL_LIST DL_ListInsertTail(PDL_LIST pList, PDL_LIST pAdd) {
-        /* insert at tail */
-    pAdd->pPrev = pList->pPrev;
-    pAdd->pNext = pList;
-    pList->pPrev->pNext = pAdd;
-    pList->pPrev = pAdd;
-    return pAdd;
-}
-
-/*
- * DL_ListInsertHead - insert pAdd into the head of the list
-*/
-static INLINE PDL_LIST DL_ListInsertHead(PDL_LIST pList, PDL_LIST pAdd) {
-        /* insert at head */
-    pAdd->pPrev = pList;
-    pAdd->pNext = pList->pNext;
-    pList->pNext->pPrev = pAdd;
-    pList->pNext = pAdd;
-    return pAdd;
-}
-
-#define DL_ListAdd(pList,pItem) DL_ListInsertHead((pList),(pItem))
-/*
- * DL_ListRemove - remove pDel from list
-*/
-static INLINE PDL_LIST DL_ListRemove(PDL_LIST pDel) {
-    pDel->pNext->pPrev = pDel->pPrev;
-    pDel->pPrev->pNext = pDel->pNext;
-        /* point back to itself just to be safe, incase remove is called again */
-    pDel->pNext = pDel;
-    pDel->pPrev = pDel;
-    return pDel;
-}
-
-/*
- * DL_ListRemoveItemFromHead - get a list item from the head
-*/
-static INLINE PDL_LIST DL_ListRemoveItemFromHead(PDL_LIST pList) {
-    PDL_LIST pItem = NULL;
-    if (pList->pNext != pList) {
-        pItem = pList->pNext;
-            /* remove the first item from head */
-        DL_ListRemove(pItem);
-    }
-    return pItem;
-}
-
-#endif /* __DL_LIST_H___ */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/dset_api.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/dset_api.h
deleted file mode 100644
index de5cc6a66..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/dset_api.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2004-2006 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- * $Id: //depot/sw/releases/olca2.0-GPL/host/include/dset_api.h#1 $
- *
- * Host-side DataSet API.
- *
- */
-
-#ifndef _DSET_API_H_
-#define _DSET_API_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * Host-side DataSet support is optional, and is not
- * currently required for correct operation.  To disable
- * Host-side DataSet support, set this to 0.
- */
-#ifndef CONFIG_HOST_DSET_SUPPORT
-#define CONFIG_HOST_DSET_SUPPORT 1
-#endif
-
-/* Called to send a DataSet Open Reply back to the Target. */
-A_STATUS wmi_dset_open_reply(struct wmi_t *wmip,
-                             A_UINT32 status,
-                             A_UINT32 access_cookie,
-                             A_UINT32 size,
-                             A_UINT32 version,
-                             A_UINT32 targ_handle,
-                             A_UINT32 targ_reply_fn,
-                             A_UINT32 targ_reply_arg);
-
-/* Called to send a DataSet Data Reply back to the Target. */
-A_STATUS wmi_dset_data_reply(struct wmi_t *wmip,
-                             A_UINT32 status,
-                             A_UINT8 *host_buf,
-                             A_UINT32 length,
-                             A_UINT32 targ_buf,
-                             A_UINT32 targ_reply_fn,
-                             A_UINT32 targ_reply_arg);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* _DSET_API_H_ */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/dset_internal.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/dset_internal.h
deleted file mode 100644
index f0be380e6..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/dset_internal.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2007 Atheros Communications Inc.
- * All rights reserved.
- *
- * $ATH_LICENSE_HOSTSDK0_C$
- *
- */
-
-#ifndef __DSET_INTERNAL_H__
-#define __DSET_INTERNAL_H__
-
-/*
- * Internal dset definitions, common for DataSet layer.
- */
-
-#define DSET_TYPE_STANDARD      0
-#define DSET_TYPE_BPATCHED      1
-#define DSET_TYPE_COMPRESSED    2
-
-/* Dataset descriptor */
-
-typedef struct dset_descriptor_s {
-  struct dset_descriptor_s  *next;         /* List link. NULL only at the last
-                                              descriptor */
-  A_UINT16                   id;           /* Dset ID */
-  A_UINT16                   size;         /* Dset size. */
-  void                      *DataPtr;      /* Pointer to raw data for standard
-                                              DataSet or pointer to original
-                                              dset_descriptor for patched
-                                              DataSet */
-  A_UINT32                   data_type;    /* DSET_TYPE_*, above */
-
-  void                      *AuxPtr;       /* Additional data that might
-                                              needed for data_type. For
-                                              example, pointer to patch
-                                              Dataset descriptor for BPatch. */
-} dset_descriptor_t;
-
-#endif /* __DSET_INTERNAL_H__ */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/dsetid.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/dsetid.h
deleted file mode 100644
index 85729f8b3..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/dsetid.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2004-2007 Atheros Communications Inc.
- * All rights reserved.
- *
- * $ATH_LICENSE_HOSTSDK0_C$
- *
- */
-
-#ifndef __DSETID_H__
-#define __DSETID_H__
-
-/* Well-known DataSet IDs */
-#define DSETID_UNUSED                     0x00000000
-#define DSETID_BOARD_DATA                 0x00000001 /* Cal and board data */
-#define DSETID_REGDB                      0x00000002 /* Regulatory Database */
-#define DSETID_POWER_CONTROL              0x00000003 /* TX Pwr Lim & Ant Gain */
-#define DSETID_USER_CONFIG                0x00000004 /* User Configuration */
-
-#define DSETID_ANALOG_CONTROL_DATA_START  0x00000005
-#define DSETID_ANALOG_CONTROL_DATA_END    0x00000025
-/*
- * Get DSETID for various reference clock speeds.
- * For each speed there are three DataSets that correspond
- * to the three columns of bank6 data (addr, 11a, 11b/g).
- * This macro returns the dsetid of the first of those
- * three DataSets.
- */
-#define ANALOG_CONTROL_DATA_DSETID(refclk) \
-        (DSETID_ANALOG_CONTROL_DATA_START + 3*refclk)
-
-/*
- * There are TWO STARTUP_PATCH DataSets.
- * DSETID_STARTUP_PATCH is historical, and was applied before BMI on
- * earlier systems.  On AR6002, it is applied after BMI, just like
- * DSETID_STARTUP_PATCH2.
- */
-#define DSETID_STARTUP_PATCH              0x00000026
-#define DSETID_GPIO_CONFIG_PATCH          0x00000027
-#define DSETID_WLANREGS                   0x00000028 /* override wlan regs */
-#define DSETID_STARTUP_PATCH2             0x00000029
-
-#define DSETID_WOW_CONFIG                 0x00000090 /* WoW Configuration */
-
-/* Add WHAL_INI_DATA_ID to DSETID_INI_DATA for a specific WHAL INI table. */
-#define DSETID_INI_DATA                   0x00000100
-/* Reserved for WHAL INI Tables: 0x100..0x11f */
-#define DSETID_INI_DATA_END               0x0000011f
-
-#define DSETID_VENDOR_START               0x00010000 /* Vendor-defined DataSets */
-
-#define DSETID_INDEX_END                  0xfffffffe /* Reserved to indicate the
-                                                        end of a memory-based
-                                                        DataSet Index */
-#define DSETID_INDEX_FREE                 0xffffffff /* An unused index entry */
-
-/*
- * PATCH DataSet format:
- * A list of patches, terminated by a patch with
- * address=PATCH_END.
- *
- * This allows for patches to be stored in flash.
- */
-struct patch_s {
-    A_UINT32 *address;
-    A_UINT32  data;
-};
-
-/*
- * Skip some patches.  Can be used to erase a single patch in a
- * patch DataSet without having to re-write the DataSet.  May
- * also be used to embed information for use by subsequent
- * patch code.  The "data" in a PATCH_SKIP tells how many
- * bytes of length "patch_s" to skip.
- */
-#define PATCH_SKIP      ((A_UINT32 *)0x00000000)
-
-/*
- * Execute code at the address specified by "data".
- * The address of the patch structure is passed as
- * the one parameter.
- */
-#define PATCH_CODE_ABS  ((A_UINT32 *)0x00000001)
-
-/*
- * Same as PATCH_CODE_ABS, but treat "data" as an
- * offset from the start of the patch word.
- */
-#define PATCH_CODE_REL  ((A_UINT32 *)0x00000002)
-
-/* Mark the end of this patch DataSet. */
-#define PATCH_END       ((A_UINT32 *)0xffffffff)
-
-/*
- * A DataSet which contains a Binary Patch to some other DataSet
- * uses the original dsetid with the DSETID_BPATCH_FLAG bit set.
- * Such a BPatch DataSet consists of BPatch metadata followed by
- * the bdiff bytes.  BPatch metadata consists of a single 32-bit
- * word that contains the size of the BPatched final image.
- *
- * To create a suitable bdiff DataSet, use bdiff in host/tools/bdiff
- * to create "diffs":
- *  bdiff -q -O -nooldmd5 -nonewmd5 -d ORIGfile NEWfile diffs
- * Then add BPatch metadata to the start of "diffs".
- *
- * NB: There are some implementation-induced restrictions
- * on which DataSets can be BPatched.
- */
-#define DSETID_BPATCH_FLAG                0x80000000
-
-#endif /* __DSETID_H__ */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/gpio.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/gpio.h
deleted file mode 100644
index 2203c7e01..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/gpio.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2005 Atheros Communications Inc.
- * All rights reserved.
- *
- * $ATH_LICENSE_HOSTSDK0_C$
- *
- */
-
-#if defined(AR6001)
-#define GPIO_PIN_COUNT 18
-#else
-#define GPIO_PIN_COUNT 18
-#endif
-
-/*
- * Possible values for WMIX_GPIO_SET_REGISTER_CMDID.
- * NB: These match hardware order, so that addresses can
- * easily be computed.
- */
-#define GPIO_ID_OUT             0x00000000
-#define GPIO_ID_OUT_W1TS        0x00000001
-#define GPIO_ID_OUT_W1TC        0x00000002
-#define GPIO_ID_ENABLE          0x00000003
-#define GPIO_ID_ENABLE_W1TS     0x00000004
-#define GPIO_ID_ENABLE_W1TC     0x00000005
-#define GPIO_ID_IN              0x00000006
-#define GPIO_ID_STATUS          0x00000007
-#define GPIO_ID_STATUS_W1TS     0x00000008
-#define GPIO_ID_STATUS_W1TC     0x00000009
-#define GPIO_ID_PIN0            0x0000000a
-#define GPIO_ID_PIN(n)          (GPIO_ID_PIN0+(n))
-
-#define GPIO_LAST_REGISTER_ID   GPIO_ID_PIN(17)
-#define GPIO_ID_NONE            0xffffffff
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/gpio_api.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/gpio_api.h
deleted file mode 100644
index 8078aa57f..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/gpio_api.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifndef _GPIO_API_H_
-#define _GPIO_API_H_
-/*
- * Copyright 2005 Atheros Communications, Inc.,  All Rights Reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-/*
- * Host-side General Purpose I/O API.
- *
- * $Id: //depot/sw/releases/olca2.0-GPL/host/include/gpio_api.h#1 $
- */
-
-/*
- * Send a command to the Target in order to change output on GPIO pins.
- */
-A_STATUS wmi_gpio_output_set(struct wmi_t *wmip,
-                             A_UINT32 set_mask,
-                             A_UINT32 clear_mask,
-                             A_UINT32 enable_mask,
-                             A_UINT32 disable_mask);
-
-/*
- * Send a command to the Target requesting input state of GPIO pins.
- */
-A_STATUS wmi_gpio_input_get(struct wmi_t *wmip);
-
-/*
- * Send a command to the Target to change the value of a GPIO register.
- */
-A_STATUS wmi_gpio_register_set(struct wmi_t *wmip,
-                               A_UINT32 gpioreg_id,
-                               A_UINT32 value);
-
-/*
- * Send a command to the Target to fetch the value of a GPIO register.
- */
-A_STATUS wmi_gpio_register_get(struct wmi_t *wmip, A_UINT32 gpioreg_id);
-
-/*
- * Send a command to the Target, acknowledging some GPIO interrupts.
- */
-A_STATUS wmi_gpio_intr_ack(struct wmi_t *wmip, A_UINT32 ack_mask);
-
-#endif /* _GPIO_API_H_ */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/hif.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/hif.h
deleted file mode 100644
index 846a69f36..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/hif.h
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * Copyright (c) 2004-2007 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- * HIF specific declarations and prototypes
- */
-
-#ifndef _HIF_H_
-#define _HIF_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* Header files */
-#include "a_config.h"
-#include "athdefs.h"
-#include "a_types.h"
-#include "a_osapi.h"
-
-typedef struct htc_callbacks HTC_CALLBACKS;
-typedef struct hif_device HIF_DEVICE;
-
-/*
- * direction - Direction of transfer (HIF_READ/HIF_WRITE).
- */
-#define HIF_READ                    0x00000001
-#define HIF_WRITE                   0x00000002
-#define HIF_DIR_MASK                (HIF_READ | HIF_WRITE)
-
-/*
- *     type - An interface may support different kind of read/write commands.
- *            The command type is divided into a basic and an extended command
- *            and can be specified using HIF_BASIC_IO/HIF_EXTENDED_IO.
- */
-#define HIF_BASIC_IO                0x00000004
-#define HIF_EXTENDED_IO             0x00000008
-#define HIF_TYPE_MASK               (HIF_BASIC_IO | HIF_EXTENDED_IO)
-
-/*
- *     emode - This indicates the whether the command is to be executed in a
- *             blocking or non-blocking fashion (HIF_SYNCHRONOUS/
- *             HIF_ASYNCHRONOUS). The read/write data paths in HTC have been
- *             implemented using the asynchronous mode allowing the the bus
- *             driver to indicate the completion of operation through the
- *             registered callback routine. The requirement primarily comes
- *             from the contexts these operations get called from (a driver's
- *             transmit context or the ISR context in case of receive).
- *             Support for both of these modes is essential.
- */
-#define HIF_SYNCHRONOUS             0x00000010
-#define HIF_ASYNCHRONOUS            0x00000020
-#define HIF_EMODE_MASK              (HIF_SYNCHRONOUS | HIF_ASYNCHRONOUS)
-
-/*
- *     dmode - An interface may support different kinds of commands based on
- *             the tradeoff between the amount of data it can carry and the
- *             setup time. Byte and Block modes are supported (HIF_BYTE_BASIS/
- *             HIF_BLOCK_BASIS). In case of latter, the data is rounded off
- *             to the nearest block size by padding. The size of the block is
- *             configurable at compile time using the HIF_BLOCK_SIZE and is
- *             negotiated with the target during initialization after the
- *             dragon interrupts are enabled.
- */
-#define HIF_BYTE_BASIS              0x00000040
-#define HIF_BLOCK_BASIS             0x00000080
-#define HIF_DMODE_MASK              (HIF_BYTE_BASIS | HIF_BLOCK_BASIS)
-
-/*
- *     amode - This indicates if the address has to be incremented on dragon
- *             after every read/write operation (HIF?FIXED_ADDRESS/
- *             HIF_INCREMENTAL_ADDRESS).
- */
-#define HIF_FIXED_ADDRESS           0x00000100
-#define HIF_INCREMENTAL_ADDRESS     0x00000200
-#define HIF_AMODE_MASK              (HIF_FIXED_ADDRESS | HIF_INCREMENTAL_ADDRESS)
-
-#define HIF_WR_ASYNC_BYTE_FIX   \
-    (HIF_WRITE | HIF_ASYNCHRONOUS | HIF_EXTENDED_IO | HIF_BYTE_BASIS | HIF_FIXED_ADDRESS)
-#define HIF_WR_ASYNC_BYTE_INC   \
-    (HIF_WRITE | HIF_ASYNCHRONOUS | HIF_EXTENDED_IO | HIF_BYTE_BASIS | HIF_INCREMENTAL_ADDRESS)
-#define HIF_WR_ASYNC_BLOCK_INC  \
-    (HIF_WRITE | HIF_ASYNCHRONOUS | HIF_EXTENDED_IO | HIF_BLOCK_BASIS | HIF_INCREMENTAL_ADDRESS)
-#define HIF_WR_SYNC_BYTE_FIX    \
-    (HIF_WRITE | HIF_SYNCHRONOUS | HIF_EXTENDED_IO | HIF_BYTE_BASIS | HIF_FIXED_ADDRESS)
-#define HIF_WR_SYNC_BYTE_INC    \
-    (HIF_WRITE | HIF_SYNCHRONOUS | HIF_EXTENDED_IO | HIF_BYTE_BASIS | HIF_INCREMENTAL_ADDRESS)
-#define HIF_WR_SYNC_BLOCK_INC  \
-    (HIF_WRITE | HIF_SYNCHRONOUS | HIF_EXTENDED_IO | HIF_BLOCK_BASIS | HIF_INCREMENTAL_ADDRESS)
-#define HIF_RD_SYNC_BYTE_INC    \
-    (HIF_READ | HIF_SYNCHRONOUS | HIF_EXTENDED_IO | HIF_BYTE_BASIS | HIF_INCREMENTAL_ADDRESS)
-#define HIF_RD_SYNC_BYTE_FIX    \
-    (HIF_READ | HIF_SYNCHRONOUS | HIF_EXTENDED_IO | HIF_BYTE_BASIS | HIF_FIXED_ADDRESS)
-#define HIF_RD_ASYNC_BYTE_FIX   \
-    (HIF_READ | HIF_ASYNCHRONOUS | HIF_EXTENDED_IO | HIF_BYTE_BASIS | HIF_FIXED_ADDRESS)
-#define HIF_RD_ASYNC_BLOCK_FIX  \
-    (HIF_READ | HIF_ASYNCHRONOUS | HIF_EXTENDED_IO | HIF_BLOCK_BASIS | HIF_FIXED_ADDRESS)
-#define HIF_RD_ASYNC_BYTE_INC   \
-    (HIF_READ | HIF_ASYNCHRONOUS | HIF_EXTENDED_IO | HIF_BYTE_BASIS | HIF_INCREMENTAL_ADDRESS)
-#define HIF_RD_ASYNC_BLOCK_INC  \
-    (HIF_READ | HIF_ASYNCHRONOUS | HIF_EXTENDED_IO | HIF_BLOCK_BASIS | HIF_INCREMENTAL_ADDRESS)
-#define HIF_RD_SYNC_BLOCK_INC  \
-    (HIF_READ | HIF_SYNCHRONOUS | HIF_EXTENDED_IO | HIF_BLOCK_BASIS | HIF_INCREMENTAL_ADDRESS)
-
-
-typedef enum {
-    HIF_DEVICE_POWER_STATE = 0,
-    HIF_DEVICE_GET_MBOX_BLOCK_SIZE,
-    HIF_DEVICE_GET_MBOX_ADDR,
-    HIF_DEVICE_GET_PENDING_EVENTS_FUNC,
-    HIF_DEVICE_GET_IRQ_PROC_MODE,
-    HIF_DEVICE_GET_RECV_EVENT_MASK_UNMASK_FUNC,
-} HIF_DEVICE_CONFIG_OPCODE;
-
-/*
- * HIF CONFIGURE definitions:
- *
- *   HIF_DEVICE_GET_MBOX_BLOCK_SIZE
- *   input : none
- *   output : array of 4 A_UINT32s
- *   notes: block size is returned for each mailbox (4)
- *
- *   HIF_DEVICE_GET_MBOX_ADDR
- *   input : none
- *   output : array of 4 A_UINT32
- *   notes: address is returned for each mailbox (4) in the array
- *
- *   HIF_DEVICE_GET_PENDING_EVENTS_FUNC
- *   input : none
- *   output: HIF_PENDING_EVENTS_FUNC function pointer
- *   notes: this is optional for the HIF layer, if the request is
- *          not handled then it indicates that the upper layer can use
- *          the standard device methods to get pending events (IRQs, mailbox messages etc..)
- *          otherwise it can call the function pointer to check pending events.
- *
- *   HIF_DEVICE_GET_IRQ_PROC_MODE
- *   input : none
- *   output : HIF_DEVICE_IRQ_PROCESSING_MODE (interrupt processing mode)
- *   note: the hif layer interfaces with the underlying OS-specific bus driver. The HIF
- *         layer can report whether IRQ processing is requires synchronous behavior or
- *         can be processed using asynchronous bus requests (typically faster).
- *
- *   HIF_DEVICE_GET_RECV_EVENT_MASK_UNMASK_FUNC
- *   input :
- *   output : HIF_MASK_UNMASK_RECV_EVENT function pointer
- *   notes: this is optional for the HIF layer.  The HIF layer may require a special mechanism
- *          to mask receive message events.  The upper layer can call this pointer when it needs
- *          to mask/unmask receive events (in case it runs out of buffers).
- *
- *
- */
-
-typedef enum {
-    HIF_DEVICE_IRQ_SYNC_ONLY,   /* for HIF implementations that require the DSR to process all
-                                   interrupts before returning */
-    HIF_DEVICE_IRQ_ASYNC_SYNC,  /* for HIF implementations that allow DSR to process interrupts
-                                   using ASYNC I/O (that is HIFAckInterrupt can be called at a
-                                   later time */
-} HIF_DEVICE_IRQ_PROCESSING_MODE;
-
-#define HIF_MAX_DEVICES                 1
-
-struct htc_callbacks {
-    A_UCHAR *name;
-    A_UINT32 id;
-    A_STATUS (* deviceInsertedHandler)(void *hif_handle);
-    A_STATUS (* deviceRemovedHandler)(void *htc_handle, A_STATUS status);
-    A_STATUS (* deviceSuspendHandler)(void *htc_handle);
-    A_STATUS (* deviceResumeHandler)(void *htc_handle);
-    A_STATUS (* deviceWakeupHandler)(void *htc_handle);
-    A_STATUS (* rwCompletionHandler)(void *context, A_STATUS status);
-    A_STATUS (* dsrHandler)(void *htc_handle);
-};
-
-
-#define HIF_OTHER_EVENTS     (1 << 0)   /* other interrupts (non-Recv) are pending, host
-                                           needs to read the register table to figure out what */
-#define HIF_RECV_MSG_AVAIL   (1 << 1)   /* pending recv packet */
-
-typedef struct _HIF_PENDING_EVENTS_INFO {
-    A_UINT32 Events;
-    A_UINT32 LookAhead;
-} HIF_PENDING_EVENTS_INFO;
-
-    /* function to get pending events , some HIF modules use special mechanisms
-     * to detect packet available and other interrupts */
-typedef A_STATUS ( *HIF_PENDING_EVENTS_FUNC)(HIF_DEVICE              *device,
-                                             HIF_PENDING_EVENTS_INFO *pEvents,
-                                             void                    *AsyncContext);
-
-#define HIF_MASK_RECV    TRUE
-#define HIF_UNMASK_RECV  FALSE
-    /* function to mask recv events */
-typedef A_STATUS ( *HIF_MASK_UNMASK_RECV_EVENT)(HIF_DEVICE  *device,
-                                                A_BOOL      Mask,
-                                                void        *AsyncContext);
-
-
-/*
- * This API is used by the HTC layer to initialize the HIF layer and to
- * register different callback routines. Support for following events has
- * been captured - DSR, Read/Write completion, Device insertion/removal,
- * Device suspension/resumption/wakeup. In addition to this, the API is
- * also used to register the name and the revision of the chip. The latter
- * can be used to verify the revision of the chip read from the device
- * before reporting it to HTC.
- */
-int HIFInit(HTC_CALLBACKS *callbacks);
-
-/*
- * This API is used to provide the read/write interface over the specific bus
- * interface.
- * address - Starting address in the dragon's address space. For mailbox
- *           writes, it refers to the start of the mbox boundary. It should
- *           be ensured that the last byte falls on the mailbox's EOM. For
- *           mailbox reads, it refers to the end of the mbox boundary.
- * buffer - Pointer to the buffer containg the data to be transmitted or
- *          received.
- * length - Amount of data to be transmitted or received.
- * request - Characterizes the attributes of the command.
- */
-A_STATUS
-HIFReadWrite(HIF_DEVICE    *device,
-             A_UINT32       address,
-             A_UCHAR       *buffer,
-             A_UINT32       length,
-             A_UINT32       request,
-             void          *context);
-
-/*
- * This can be initiated from the unload driver context ie when the HTCShutdown
- * routine is called.
- */
-void HIFShutDownDevice(HIF_DEVICE *device);
-
-/*
- * This should translate to an acknowledgment to the bus driver indicating that
- * the previous interrupt request has been serviced and the all the relevant
- * sources have been cleared. HTC is ready to process more interrupts.
- * This should prevent the bus driver from raising an interrupt unless the
- * previous one has been serviced and acknowledged using the previous API.
- */
-void HIFAckInterrupt(HIF_DEVICE *device);
-
-void HIFMaskInterrupt(HIF_DEVICE *device);
-
-void HIFUnMaskInterrupt(HIF_DEVICE *device);
-
-/*
- * This set of functions are to be used by the bus driver to notify
- * the HIF module about various events.
- * These are not implemented if the bus driver provides an alternative
- * way for this notification though callbacks for instance.
- */
-int HIFInsertEventNotify(void);
-
-int HIFRemoveEventNotify(void);
-
-int HIFIRQEventNotify(void);
-
-int HIFRWCompleteEventNotify(void);
-
-/*
- * This function associates a opaque handle with the HIF layer
- * to be used in communication with upper layer i.e. HTC.
- * This would normaly be a pointer to htc_target data structure.
- */
-void HIFSetHandle(void *hif_handle, void *handle);
-
-A_STATUS
-HIFConfigureDevice(HIF_DEVICE *device, HIF_DEVICE_CONFIG_OPCODE opcode,
-                   void *config, A_UINT32 configLen);
-
-
-struct device;
-struct device*
-HIFGetOSDevice(HIF_DEVICE *device);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _HIF_H_ */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/host_version.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/host_version.h
deleted file mode 100644
index c090115bc..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/host_version.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef _HOST_VERSION_H_
-#define _HOST_VERSION_H_
-/*
- * Copyright (c) 2004-2005 Atheros Communications Inc.
- * All rights reserved.
- *
- * This file contains version information for the sample host driver for the
- * AR6000 chip
- *
- * $Id: //depot/sw/releases/olca2.0-GPL/host/include/host_version.h#2 $
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <AR6K_version.h>
-
-/*
- * The version number is made up of major, minor, patch and build
- * numbers. These are 16 bit numbers.  The build and release script will
- * set the build number using a Perforce counter.  Here the build number is
- * set to 9999 so that builds done without the build-release script are easily
- * identifiable.
- */
-
-#define ATH_SW_VER_MAJOR      __VER_MAJOR_
-#define ATH_SW_VER_MINOR      __VER_MINOR_
-#define ATH_SW_VER_PATCH      __VER_PATCH_
-#define ATH_SW_VER_BUILD 9999
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _HOST_VERSION_H_ */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/htc.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/htc.h
deleted file mode 100644
index 152d867b7..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/htc.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Copyright (c) 2007 Atheros Communications Inc.
- * All rights reserved.
- *
- * $ATH_LICENSE_HOSTSDK0_C$
- *
- */
-
-
-#ifndef __HTC_H__
-#define __HTC_H__
-
-#ifndef ATH_TARGET
-#include "athstartpack.h"
-#endif
-
-#define A_OFFSETOF(type,field) (int)(&(((type *)NULL)->field))
-
-#define ASSEMBLE_UNALIGNED_UINT16(p,highbyte,lowbyte) \
-        (((A_UINT16)(((A_UINT8 *)(p))[(highbyte)])) << 8 | (A_UINT16)(((A_UINT8 *)(p))[(lowbyte)]))
-
-/* alignment independent macros (little-endian) to fetch UINT16s or UINT8s from a
- * structure using only the type and field name.
- * Use these macros if there is the potential for unaligned buffer accesses. */
-#define A_GET_UINT16_FIELD(p,type,field) \
-    ASSEMBLE_UNALIGNED_UINT16(p,\
-                              A_OFFSETOF(type,field) + 1, \
-                              A_OFFSETOF(type,field))
-
-#define A_SET_UINT16_FIELD(p,type,field,value) \
-{                                              \
-    ((A_UINT8 *)(p))[A_OFFSETOF(type,field)] = (A_UINT8)(value);        \
-    ((A_UINT8 *)(p))[A_OFFSETOF(type,field) + 1] = (A_UINT8)((value) >> 8); \
-}
-
-#define A_GET_UINT8_FIELD(p,type,field) \
-            ((A_UINT8 *)(p))[A_OFFSETOF(type,field)]
-
-#define A_SET_UINT8_FIELD(p,type,field,value) \
-    ((A_UINT8 *)(p))[A_OFFSETOF(type,field)] = (value)
-
-/****** DANGER DANGER ***************
- *
- *   The frame header length and message formats defined herein were
- *   selected to accommodate optimal alignment for target processing.  This reduces code
- *   size and improves performance.
- *
- *   Any changes to the header length may alter the alignment and cause exceptions
- *   on the target. When adding to the message structures insure that fields are
- *   properly aligned.
- *
- */
-
-/* HTC frame header */
-typedef PREPACK struct _HTC_FRAME_HDR{
-        /* do not remove or re-arrange these fields, these are minimally required
-         * to take advantage of 4-byte lookaheads in some hardware implementations */
-    A_UINT8   EndpointID;
-    A_UINT8   Flags;
-    A_UINT16  PayloadLen;       /* length of data (including trailer) that follows the header */
-
-    /***** end of 4-byte lookahead ****/
-
-    A_UINT8   ControlBytes[2];
-
-    /* message payload starts after the header */
-
-} POSTPACK HTC_FRAME_HDR;
-
-/* frame header flags */
-#define HTC_FLAGS_NEED_CREDIT_UPDATE (1 << 0)
-#define HTC_FLAGS_RECV_TRAILER       (1 << 1)
-
-
-#define HTC_HDR_LENGTH  (sizeof(HTC_FRAME_HDR))
-#define HTC_MAX_TRAILER_LENGTH   255
-#define HTC_MAX_PAYLOAD_LENGTH   (2048 - sizeof(HTC_FRAME_HDR))
-
-/* HTC control message IDs */
-typedef enum {
-    HTC_MSG_READY_ID = 1,
-    HTC_MSG_CONNECT_SERVICE_ID = 2,
-    HTC_MSG_CONNECT_SERVICE_RESPONSE_ID = 3,
-    HTC_MSG_SETUP_COMPLETE_ID = 4,
-} HTC_MSG_IDS;
-
-#define HTC_MAX_CONTROL_MESSAGE_LENGTH  256
-
-/* base message ID header */
-typedef PREPACK struct {
-    A_UINT16 MessageID;
-} POSTPACK HTC_UNKNOWN_MSG;
-
-/* HTC ready message
- * direction : target-to-host  */
-typedef PREPACK struct {
-    A_UINT16  MessageID;    /* ID */
-    A_UINT16  CreditCount;  /* number of credits the target can offer */
-    A_UINT16  CreditSize;   /* size of each credit */
-    A_UINT8   MaxEndpoints; /* maximum number of endpoints the target has resources for */
-    A_UINT8   _Pad1;
-} POSTPACK HTC_READY_MSG;
-
-#define HTC_SERVICE_META_DATA_MAX_LENGTH 128
-
-/* connect service
- * direction : host-to-target */
-typedef PREPACK struct {
-    A_UINT16  MessageID;
-    A_UINT16  ServiceID;           /* service ID of the service to connect to */
-    A_UINT16  ConnectionFlags;     /* connection flags */
-
-#define HTC_CONNECT_FLAGS_REDUCE_CREDIT_DRIBBLE (1 << 2)  /* reduce credit dribbling when
-                                                             the host needs credits */
-#define HTC_CONNECT_FLAGS_THRESHOLD_LEVEL_MASK             (0x3)
-#define HTC_CONNECT_FLAGS_THRESHOLD_LEVEL_ONE_FOURTH        0x0
-#define HTC_CONNECT_FLAGS_THRESHOLD_LEVEL_ONE_HALF          0x1
-#define HTC_CONNECT_FLAGS_THRESHOLD_LEVEL_THREE_FOURTHS     0x2
-#define HTC_CONNECT_FLAGS_THRESHOLD_LEVEL_UNITY             0x3
-
-    A_UINT8   ServiceMetaLength;   /* length of meta data that follows */
-    A_UINT8   _Pad1;
-
-    /* service-specific meta data starts after the header */
-
-} POSTPACK HTC_CONNECT_SERVICE_MSG;
-
-/* connect response
- * direction : target-to-host */
-typedef PREPACK struct {
-    A_UINT16  MessageID;
-    A_UINT16  ServiceID;            /* service ID that the connection request was made */
-    A_UINT8   Status;               /* service connection status */
-    A_UINT8   EndpointID;           /* assigned endpoint ID */
-    A_UINT16  MaxMsgSize;           /* maximum expected message size on this endpoint */
-    A_UINT8   ServiceMetaLength;    /* length of meta data that follows */
-    A_UINT8   _Pad1;
-
-    /* service-specific meta data starts after the header */
-
-} POSTPACK HTC_CONNECT_SERVICE_RESPONSE_MSG;
-
-typedef PREPACK struct {
-    A_UINT16  MessageID;
-    /* currently, no other fields */
-} POSTPACK HTC_SETUP_COMPLETE_MSG;
-
-
-/* connect response status codes */
-#define HTC_SERVICE_SUCCESS      0  /* success */
-#define HTC_SERVICE_NOT_FOUND    1  /* service could not be found */
-#define HTC_SERVICE_FAILED       2  /* specific service failed the connect */
-#define HTC_SERVICE_NO_RESOURCES 3  /* no resources (i.e. no more endpoints) */
-#define HTC_SERVICE_NO_MORE_EP   4  /* specific service is not allowing any more
-                                       endpoints */
-
-/* report record IDs */
-typedef enum {
-    HTC_RECORD_NULL  = 0,
-    HTC_RECORD_CREDITS   = 1,
-    HTC_RECORD_LOOKAHEAD = 2,
-} HTC_RPT_IDS;
-
-typedef PREPACK struct {
-    A_UINT8 RecordID;     /* Record ID */
-    A_UINT8 Length;       /* Length of record */
-} POSTPACK HTC_RECORD_HDR;
-
-typedef PREPACK struct {
-    A_UINT8 EndpointID;     /* Endpoint that owns these credits */
-    A_UINT8 Credits;        /* credits to report since last report */
-} POSTPACK HTC_CREDIT_REPORT;
-
-typedef PREPACK struct {
-    A_UINT8 PreValid;         /* pre valid guard */
-    A_UINT8 LookAhead[4];     /* 4 byte lookahead */
-    A_UINT8 PostValid;        /* post valid guard */
-
-   /* NOTE: the LookAhead array is guarded by a PreValid and Post Valid guard bytes.
-    * The PreValid bytes must equal the inverse of the PostValid byte */
-
-} POSTPACK HTC_LOOKAHEAD_REPORT;
-
-#ifndef ATH_TARGET
-#include "athendpack.h"
-#endif
-
-
-#endif /* __HTC_H__ */
-
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/htc_api.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/htc_api.h
deleted file mode 100644
index e75692d7e..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/htc_api.h
+++ /dev/null
@@ -1,439 +0,0 @@
-/*
- *
- * Copyright (c) 2007 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#ifndef _HTC_API_H_
-#define _HTC_API_H_
-
-#include <htc.h>
-#include <htc_services.h>
-#include "htc_packet.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* TODO.. for BMI */
-#define ENDPOINT1 0
-// TODO -remove me, but we have to fix BMI first
-#define HTC_MAILBOX_NUM_MAX    4
-
-
-/* ------ Endpoint IDS ------ */
-typedef enum
-{
-    ENDPOINT_UNUSED = -1,
-    ENDPOINT_0 = 0,
-    ENDPOINT_1 = 1,
-    ENDPOINT_2 = 2,
-    ENDPOINT_3,
-    ENDPOINT_4,
-    ENDPOINT_5,
-    ENDPOINT_6,
-    ENDPOINT_7,
-    ENDPOINT_8,
-    ENDPOINT_MAX,
-} HTC_ENDPOINT_ID;
-
-/* this is the amount of header room required by users of HTC */
-#define HTC_HEADER_LEN         HTC_HDR_LENGTH
-
-typedef void *HTC_HANDLE;
-
-typedef A_UINT16 HTC_SERVICE_ID;
-
-typedef struct _HTC_INIT_INFO {
-    void   (*AddInstance)(HTC_HANDLE);
-    void   (*DeleteInstance)(void *Instance);
-    void   (*TargetFailure)(void *Instance, A_STATUS Status);
-} HTC_INIT_INFO;
-
-/* per service connection send completion */
-typedef void   (*HTC_EP_SEND_PKT_COMPLETE)(void *,HTC_PACKET *);
-/* per service connection pkt received */
-typedef void   (*HTC_EP_RECV_PKT)(void *,HTC_PACKET *);
-
-/* Optional per service connection receive buffer re-fill callback,
- * On some OSes (like Linux) packets are allocated from a global pool and indicated up
- * to the network stack.  The driver never gets the packets back from the OS.  For these OSes
- * a refill callback can be used to allocate and re-queue buffers into HTC.
- *
- * On other OSes, the network stack can call into the driver's OS-specifc "return_packet" handler and
- * the driver can re-queue these buffers into HTC. In this regard a refill callback is
- * unnecessary */
-typedef void   (*HTC_EP_RECV_REFILL)(void *, HTC_ENDPOINT_ID Endpoint);
-
-/* Optional per service connection callback when a send queue is full. This can occur if the
- * host continues queueing up TX packets faster than credits can arrive
- * To prevent the host (on some Oses like Linux) from continuously queueing packets
- * and consuming resources, this callback is provided so that that the host
- * can disable TX in the subsystem (i.e. network stack)
- * Other OSes require a "per-packet" indication_RAW_STREAM_NUM_MAX for each completed TX packet, this
- * closed loop mechanism will prevent the network stack from overunning the NIC */
-typedef void (*HTC_EP_SEND_QUEUE_FULL)(void *, HTC_ENDPOINT_ID Endpoint);
-/* Optional per service connection callback when a send queue is available for receive new packet. */
-typedef void (*HTC_EP_SEND_QUEUE_AVAIL)(void *, HTC_ENDPOINT_ID Endpoint);
-
-typedef struct _HTC_EP_CALLBACKS {
-    void                     *pContext;     /* context for each callback */
-    HTC_EP_SEND_PKT_COMPLETE EpTxComplete;  /* tx completion callback for connected endpoint */
-    HTC_EP_RECV_PKT          EpRecv;        /* receive callback for connected endpoint */
-    HTC_EP_RECV_REFILL       EpRecvRefill;  /* OPTIONAL receive re-fill callback for connected endpoint */
-    HTC_EP_SEND_QUEUE_FULL   EpSendFull;    /* OPTIONAL send full callback */
-    HTC_EP_SEND_QUEUE_AVAIL  EpSendAvail;    /* OPTIONAL send available callback */
-} HTC_EP_CALLBACKS;
-
-/* service connection information */
-typedef struct _HTC_SERVICE_CONNECT_REQ {
-    HTC_SERVICE_ID   ServiceID;                 /* service ID to connect to */
-    A_UINT16         ConnectionFlags;           /* connection flags, see htc protocol definition */
-    A_UINT8         *pMetaData;                 /* ptr to optional service-specific meta-data */
-    A_UINT8          MetaDataLength;            /* optional meta data length */
-    HTC_EP_CALLBACKS EpCallbacks;               /* endpoint callbacks */
-    int              MaxSendQueueDepth;         /* maximum depth of any send queue */
-} HTC_SERVICE_CONNECT_REQ;
-
-/* service connection response information */
-typedef struct _HTC_SERVICE_CONNECT_RESP {
-    A_UINT8     *pMetaData;             /* caller supplied buffer to optional meta-data */
-    A_UINT8     BufferLength;           /* length of caller supplied buffer */
-    A_UINT8     ActualLength;           /* actual length of meta data */
-    HTC_ENDPOINT_ID Endpoint;           /* endpoint to communicate over */
-    int         MaxMsgLength;           /* max length of all messages over this endpoint */
-    A_UINT8     ConnectRespCode;        /* connect response code from target */
-} HTC_SERVICE_CONNECT_RESP;
-
-/* endpoint distribution structure */
-typedef struct _HTC_ENDPOINT_CREDIT_DIST {
-    struct _HTC_ENDPOINT_CREDIT_DIST *pNext;
-    struct _HTC_ENDPOINT_CREDIT_DIST *pPrev;
-    HTC_SERVICE_ID      ServiceID;          /* Service ID (set by HTC) */
-    HTC_ENDPOINT_ID     Endpoint;           /* endpoint for this distribution struct (set by HTC) */
-    A_UINT32            DistFlags;          /* distribution flags, distribution function can
-                                               set default activity using SET_EP_ACTIVE() macro */
-    int                 TxCreditsNorm;      /* credits for normal operation, anything above this
-                                               indicates the endpoint is over-subscribed, this field
-                                               is only relevant to the credit distribution function */
-    int                 TxCreditsMin;       /* floor for credit distribution, this field is
-                                               only relevant to the credit distribution function */
-    int                 TxCreditsAssigned;  /* number of credits assigned to this EP, this field
-                                               is only relevant to the credit dist function */
-    int                 TxCredits;          /* current credits available, this field is used by
-                                               HTC to determine whether a message can be sent or
-                                               must be queued */
-    int                 TxCreditsToDist;    /* pending credits to distribute on this endpoint, this
-                                               is set by HTC when credit reports arrive.
-                                               The credit distribution functions sets this to zero
-                                               when it distributes the credits */
-    int                 TxCreditsSeek;      /* this is the number of credits that the current pending TX
-                                               packet needs to transmit.  This is set by HTC when
-                                               and endpoint needs credits in order to transmit */
-    int                 TxCreditSize;       /* size in bytes of each credit (set by HTC) */
-    int                 TxCreditsPerMaxMsg; /* credits required for a maximum sized messages (set by HTC) */
-    void                *pHTCReserved;      /* reserved for HTC use */
-} HTC_ENDPOINT_CREDIT_DIST;
-
-#define HTC_EP_ACTIVE                            (1 << 31)
-
-/* macro to check if an endpoint has gone active, useful for credit
- * distributions */
-#define IS_EP_ACTIVE(epDist)  ((epDist)->DistFlags & HTC_EP_ACTIVE)
-#define SET_EP_ACTIVE(epDist) (epDist)->DistFlags |= HTC_EP_ACTIVE
-
-    /* credit distibution code that is passed into the distrbution function,
-     * there are mandatory and optional codes that must be handled */
-typedef enum _HTC_CREDIT_DIST_REASON {
-    HTC_CREDIT_DIST_SEND_COMPLETE = 0,     /* credits available as a result of completed
-                                              send operations (MANDATORY) resulting in credit reports */
-    HTC_CREDIT_DIST_ACTIVITY_CHANGE = 1,   /* a change in endpoint activity occured (OPTIONAL) */
-    HTC_CREDIT_DIST_SEEK_CREDITS,          /* an endpoint needs to "seek" credits (OPTIONAL) */
-    HTC_DUMP_CREDIT_STATE                  /* for debugging, dump any state information that is kept by
-                                              the distribution function */
-} HTC_CREDIT_DIST_REASON;
-
-typedef void (*HTC_CREDIT_DIST_CALLBACK)(void                     *Context,
-                                         HTC_ENDPOINT_CREDIT_DIST *pEPList,
-                                         HTC_CREDIT_DIST_REASON   Reason);
-
-typedef void (*HTC_CREDIT_INIT_CALLBACK)(void *Context,
-                                         HTC_ENDPOINT_CREDIT_DIST *pEPList,
-                                         int                      TotalCredits);
-
-    /* endpoint statistics action */
-typedef enum _HTC_ENDPOINT_STAT_ACTION {
-    HTC_EP_STAT_SAMPLE = 0,                /* only read statistics */
-    HTC_EP_STAT_SAMPLE_AND_CLEAR = 1,      /* sample and immediately clear statistics */
-    HTC_EP_STAT_CLEAR                      /* clear only */
-} HTC_ENDPOINT_STAT_ACTION;
-
-    /* endpoint statistics */
-typedef struct _HTC_ENDPOINT_STATS {
-    A_UINT32  TxCreditLowIndications;  /* number of times the host set the credit-low flag in a send message on
-                                        this endpoint */
-    A_UINT32  TxIssued;               /* running count of TX packets issued */
-    A_UINT32  TxCreditRpts;           /* running count of total credit reports received for this endpoint */
-    A_UINT32  TxCreditRptsFromRx;
-    A_UINT32  TxCreditRptsFromOther;
-    A_UINT32  TxCreditRptsFromEp0;
-    A_UINT32  TxCreditsFromRx;        /* count of credits received via Rx packets on this endpoint */
-    A_UINT32  TxCreditsFromOther;     /* count of credits received via another endpoint */
-    A_UINT32  TxCreditsFromEp0;       /* count of credits received via another endpoint */
-    A_UINT32  TxCreditsConsummed;     /* count of consummed credits */
-    A_UINT32  TxCreditsReturned;      /* count of credits returned */
-    A_UINT32  RxReceived;             /* count of RX packets received */
-    A_UINT32  RxLookAheads;           /* count of lookahead records
-                                         found in messages received on this endpoint */
-} HTC_ENDPOINT_STATS;
-
-/* ------ Function Prototypes ------ */
-/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-  @desc: Initialize HTC
-  @function name: HTCInit
-  @input:  pInfo - initialization information
-  @output:
-  @return: A_OK on success
-  @notes: The caller initializes global HTC state and registers various instance
-          notification callbacks (see HTC_INIT_INFO).
-
-  @example:
-  @see also: HTCShutdown
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-A_STATUS    HTCInit(HTC_INIT_INFO *pInfo);
-/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-  @desc: Get the underlying HIF device handle
-  @function name: HTCGetHifDevice
-  @input:  HTCHandle - handle passed into the AddInstance callback
-  @output:
-  @return: opaque HIF device handle usable in HIF API calls.
-  @notes:
-  @example:
-  @see also:
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-void       *HTCGetHifDevice(HTC_HANDLE HTCHandle);
-/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-  @desc: Set the associated instance for the HTC handle
-  @function name: HTCSetInstance
-  @input:  HTCHandle - handle passed into the AddInstance callback
-           Instance - caller supplied instance object
-  @output:
-  @return:
-  @notes:  Caller must set the instance information for the HTC handle in order to receive
-           notifications for instance deletion (DeleteInstance callback is called) and for target
-           failure notification.
-  @example:
-  @see also:
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-void        HTCSetInstance(HTC_HANDLE HTCHandle, void *Instance);
-/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-  @desc: Set credit distribution parameters
-  @function name: HTCSetCreditDistribution
-  @input:  HTCHandle - HTC handle
-           pCreditDistCont - caller supplied context to pass into distribution functions
-           CreditDistFunc - Distribution function callback
-           CreditDistInit - Credit Distribution initialization callback
-           ServicePriorityOrder - Array containing list of service IDs, lowest index is highest
-                                  priority
-           ListLength - number of elements in ServicePriorityOrder
-  @output:
-  @return:
-  @notes:  The user can set a custom credit distribution function to handle special requirements
-           for each endpoint.  A default credit distribution routine can be used by setting
-           CreditInitFunc to NULL.  The default credit distribution is only provided for simple
-           "fair" credit distribution without regard to any prioritization.
-
-  @example:
-  @see also:
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-void        HTCSetCreditDistribution(HTC_HANDLE               HTCHandle,
-                                     void                     *pCreditDistContext,
-                                     HTC_CREDIT_DIST_CALLBACK CreditDistFunc,
-                                     HTC_CREDIT_INIT_CALLBACK CreditInitFunc,
-                                     HTC_SERVICE_ID           ServicePriorityOrder[],
-                                     int                      ListLength);
-/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-  @desc: Wait for the target to indicate the HTC layer is ready
-  @function name: HTCWaitTarget
-  @input:  HTCHandle - HTC handle
-  @output:
-  @return:
-  @notes:  This API blocks until the target responds with an HTC ready message.
-           The caller should not connect services until the target has indicated it is
-           ready.
-  @example:
-  @see also: HTCConnectService
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-A_STATUS    HTCWaitTarget(HTC_HANDLE HTCHandle);
-/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-  @desc: Start target service communications
-  @function name: HTCStart
-  @input:  HTCHandle - HTC handle
-  @output:
-  @return:
-  @notes: This API indicates to the target that the service connection phase is complete
-          and the target can freely start all connected services.  This API should only be
-          called AFTER all service connections have been made.  TCStart will issue a
-          SETUP_COMPLETE message to the target to indicate that all service connections
-          have been made and the target can start communicating over the endpoints.
-  @example:
-  @see also: HTCConnectService
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-A_STATUS    HTCStart(HTC_HANDLE HTCHandle);
-/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-  @desc: Add receive packet to HTC
-  @function name: HTCAddReceivePkt
-  @input:  HTCHandle - HTC handle
-           pPacket - HTC receive packet to add
-  @output:
-  @return: A_OK on success
-  @notes:  user must supply HTC packets for capturing incomming HTC frames.  The caller
-           must initialize each HTC packet using the SET_HTC_PACKET_INFO_RX_REFILL()
-           macro.
-  @example:
-  @see also:
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-A_STATUS    HTCAddReceivePkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket);
-/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-  @desc: Connect to an HTC service
-  @function name: HTCConnectService
-  @input:  HTCHandle - HTC handle
-           pReq - connection details
-  @output: pResp - connection response
-  @return:
-  @notes:  Service connections must be performed before HTCStart.  User provides callback handlers
-           for various endpoint events.
-  @example:
-  @see also: HTCStart
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-A_STATUS    HTCConnectService(HTC_HANDLE HTCHandle,
-                              HTC_SERVICE_CONNECT_REQ  *pReq,
-                              HTC_SERVICE_CONNECT_RESP *pResp);
-/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-  @desc: Send an HTC packet
-  @function name: HTCSendPkt
-  @input:  HTCHandle - HTC handle
-           pPacket - packet to send
-  @output:
-  @return: A_OK
-  @notes:  Caller must initialize packet using SET_HTC_PACKET_INFO_TX() macro.
-           This interface is fully asynchronous.  On error, HTC SendPkt will
-           call the registered Endpoint callback to cleanup the packet.
-  @example:
-  @see also: HTCFlushEndpoint
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-A_STATUS    HTCSendPkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket);
-/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-  @desc: Stop HTC service communications
-  @function name: HTCStop
-  @input:  HTCHandle - HTC handle
-  @output:
-  @return:
-  @notes: HTC communications is halted.  All receive and pending TX packets will
-          be flushed.
-  @example:
-  @see also:
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-void        HTCStop(HTC_HANDLE HTCHandle);
-/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-  @desc: Shutdown HTC
-  @function name: HTCShutdown
-  @input:
-  @output:
-  @return:
-  @notes:  This cleans up all resources allocated by HTCInit().
-  @example:
-  @see also: HTCInit
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-void        HTCShutDown(void);
-/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-  @desc: Flush pending TX packets
-  @function name: HTCFlushEndpoint
-  @input:  HTCHandle - HTC handle
-           Endpoint - Endpoint to flush
-           Tag - flush tag
-  @output:
-  @return:
-  @notes:  The Tag parameter is used to selectively flush packets with matching tags.
-           The value of 0 forces all packets to be flush regardless of tag.
-  @example:
-  @see also: HTCSendPkt
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-void        HTCFlushEndpoint(HTC_HANDLE HTCHandle, HTC_ENDPOINT_ID Endpoint, HTC_TX_TAG Tag);
-/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-  @desc: Dump credit distribution state
-  @function name: HTCDumpCreditStates
-  @input:  HTCHandle - HTC handle
-  @output:
-  @return:
-  @notes:  This dumps all credit distribution information to the debugger
-  @example:
-  @see also:
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-void        HTCDumpCreditStates(HTC_HANDLE HTCHandle);
-/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-  @desc: Indicate a traffic activity change on an endpoint
-  @function name: HTCIndicateActivityChange
-  @input:  HTCHandle - HTC handle
-           Endpoint - endpoint in which activity has changed
-           Active - TRUE if active, FALSE if it has become inactive
-  @output:
-  @return:
-  @notes:  This triggers the registered credit distribution function to
-           re-adjust credits for active/inactive endpoints.
-  @example:
-  @see also:
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-void        HTCIndicateActivityChange(HTC_HANDLE      HTCHandle,
-                                      HTC_ENDPOINT_ID Endpoint,
-                                      A_BOOL          Active);
-
-/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-  @desc: Get endpoint statistics
-  @function name: HTCGetEndpointStatistics
-  @input:  HTCHandle - HTC handle
-           Endpoint - Endpoint identifier
-           Action - action to take with statistics
-  @output:
-           pStats - statistics that were sampled (can be NULL if Action is HTC_EP_STAT_CLEAR)
-
-  @return: TRUE if statistics profiling is enabled, otherwise FALSE.
-
-  @notes:  Statistics is a compile-time option and this function may return FALSE
-           if HTC is not compiled with profiling.
-
-           The caller can specify the statistic "action" to take when sampling
-           the statistics.  This includes:
-
-           HTC_EP_STAT_SAMPLE: The pStats structure is filled with the current values.
-           HTC_EP_STAT_SAMPLE_AND_CLEAR: The structure is filled and the current statistics
-                             are cleared.
-           HTC_EP_STAT_CLEA : the statistics are cleared, the called can pass a NULL value for
-                   pStats
-
-  @example:
-  @see also:
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-A_BOOL       HTCGetEndpointStatistics(HTC_HANDLE               HTCHandle,
-                                      HTC_ENDPOINT_ID          Endpoint,
-                                      HTC_ENDPOINT_STAT_ACTION Action,
-                                      HTC_ENDPOINT_STATS       *pStats);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _HTC_API_H_ */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/htc_packet.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/htc_packet.h
deleted file mode 100644
index 9ce871817..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/htc_packet.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- *
- * Copyright (c) 2007 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#ifndef HTC_PACKET_H_
-#define HTC_PACKET_H_
-
-
-#include "dl_list.h"
-
-struct _HTC_PACKET;
-
-typedef void (* HTC_PACKET_COMPLETION)(void *,struct _HTC_PACKET *);
-
-typedef A_UINT16 HTC_TX_TAG;
-
-typedef struct _HTC_TX_PACKET_INFO {
-    HTC_TX_TAG    Tag;            /* tag used to selective flush packets */
-} HTC_TX_PACKET_INFO;
-
-#define HTC_TX_PACKET_TAG_ALL          0    /* a tag of zero is reserved and used to flush ALL packets */
-#define HTC_TX_PACKET_TAG_INTERNAL     1                                /* internal tags start here */
-#define HTC_TX_PACKET_TAG_USER_DEFINED (HTC_TX_PACKET_TAG_INTERNAL + 9) /* user-defined tags start here */
-
-typedef struct _HTC_RX_PACKET_INFO {
-    A_UINT32    Unused;          /* for future use and to make compilers happy */
-} HTC_RX_PACKET_INFO;
-
-/* wrapper around endpoint-specific packets */
-typedef struct _HTC_PACKET {
-    DL_LIST         ListLink;       /* double link */
-    void            *pPktContext;   /* caller's per packet specific context */
-
-    A_UINT8         *pBufferStart;  /* the true buffer start , the caller can
-                                       store the real buffer start here.  In
-                                       receive callbacks, the HTC layer sets pBuffer
-                                       to the start of the payload past the header. This
-                                       field allows the caller to reset pBuffer when it
-                                       recycles receive packets back to HTC */
-    /*
-     * Pointer to the start of the buffer. In the transmit
-     * direction this points to the start of the payload. In the
-     * receive direction, however, the buffer when queued up
-     * points to the start of the HTC header but when returned
-     * to the caller points to the start of the payload
-     */
-    A_UINT8         *pBuffer;       /* payload start (RX/TX) */
-    A_UINT32        BufferLength;   /* length of buffer */
-    A_UINT32        ActualLength;   /* actual length of payload */
-    int             Endpoint;       /* endpoint that this packet was sent/recv'd from */
-    A_STATUS        Status;         /* completion status */
-    union {
-        HTC_TX_PACKET_INFO  AsTx;   /* Tx Packet specific info */
-        HTC_RX_PACKET_INFO  AsRx;   /* Rx Packet specific info */
-    } PktInfo;
-
-    /* the following fields are for internal HTC use */
-    HTC_PACKET_COMPLETION Completion;   /* completion */
-    void                  *pContext;    /* HTC private completion context */
-    A_UINT32              HTCReserved;  /* reserved */
-} HTC_PACKET;
-
-
-
-#define COMPLETE_HTC_PACKET(p,status)        \
-{                                            \
-    (p)->Status = (status);                  \
-    (p)->Completion((p)->pContext,(p));      \
-}
-
-#define INIT_HTC_PACKET_INFO(p,b,len)             \
-{                                                 \
-    (p)->pBufferStart = (b);                      \
-    (p)->BufferLength = (len);                    \
-}
-
-/* macro to set an initial RX packet for refilling HTC */
-#define SET_HTC_PACKET_INFO_RX_REFILL(p,c,b,len,ep) \
-{                                                 \
-    (p)->pPktContext = (c);                       \
-    (p)->pBuffer = (b);                           \
-    (p)->pBufferStart = (b);                      \
-    (p)->BufferLength = (len);                    \
-    (p)->Endpoint = (ep);                         \
-}
-
-/* fast macro to recycle an RX packet that will be re-queued to HTC */
-#define HTC_PACKET_RESET_RX(p)              \
-    (p)->pBuffer = (p)->pBufferStart
-
-/* macro to set packet parameters for TX */
-#define SET_HTC_PACKET_INFO_TX(p,c,b,len,ep,tag)  \
-{                                                 \
-    (p)->pPktContext = (c);                       \
-    (p)->pBuffer = (b);                           \
-    (p)->ActualLength = (len);                    \
-    (p)->Endpoint = (ep);                         \
-    (p)->PktInfo.AsTx.Tag = (tag);                \
-}
-
-/* HTC Packet Queueing Macros */
-typedef DL_LIST HTC_PACKET_QUEUE;
-/* initialize queue */
-#define INIT_HTC_PACKET_QUEUE(pQ) DL_LIST_INIT((pQ))
-/* enqueue HTC packet to the tail of the queue */
-#define HTC_PACKET_ENQUEUE(pQ,p)  DL_ListInsertTail((pQ),&(p)->ListLink)
-/* test if a queue is empty */
-#define HTC_QUEUE_EMPTY(pQ)       DL_LIST_IS_EMPTY((pQ))
-/* get packet at head without removing it */
-#define HTC_GET_PKT_AT_HEAD(pQ)   A_CONTAINING_STRUCT((DL_LIST_GET_ITEM_AT_HEAD(pQ)),HTC_PACKET,ListLink);
-/* remove a packet from the current list it is linked to */
-#define HTC_PACKET_REMOVE(p)      DL_ListRemove(&(p)->ListLink)
-
-/* dequeue an HTC packet from the head of the queue */
-static INLINE HTC_PACKET *HTC_PACKET_DEQUEUE(HTC_PACKET_QUEUE *queue) {
-    DL_LIST    *pItem = DL_ListRemoveItemFromHead(queue);
-    if (pItem != NULL) {
-        return A_CONTAINING_STRUCT(pItem, HTC_PACKET, ListLink);
-    }
-    return NULL;
-}
-
-#endif /*HTC_PACKET_H_*/
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/htc_services.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/htc_services.h
deleted file mode 100644
index fc6fc2966..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/htc_services.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2007 Atheros Communications Inc.
- * All rights reserved.
- *
- * $ATH_LICENSE_HOSTSDK0_C$
- *
- */
-
-#ifndef __HTC_SERVICES_H__
-#define __HTC_SERVICES_H__
-
-/* Current service IDs */
-
-typedef enum {
-    RSVD_SERVICE_GROUP  = 0,
-    WMI_SERVICE_GROUP   = 1,
-
-    HTC_TEST_GROUP = 254,
-    HTC_SERVICE_GROUP_LAST = 255
-}HTC_SERVICE_GROUP_IDS;
-
-#define MAKE_SERVICE_ID(group,index) \
-            (int)(((int)group << 8) | (int)(index))
-
-/* NOTE: service ID of 0x0000 is reserved and should never be used */
-#define HTC_CTRL_RSVD_SVC MAKE_SERVICE_ID(RSVD_SERVICE_GROUP,1)
-#define WMI_CONTROL_SVC   MAKE_SERVICE_ID(WMI_SERVICE_GROUP,0)
-#define WMI_DATA_BE_SVC   MAKE_SERVICE_ID(WMI_SERVICE_GROUP,1)
-#define WMI_DATA_BK_SVC   MAKE_SERVICE_ID(WMI_SERVICE_GROUP,2)
-#define WMI_DATA_VI_SVC   MAKE_SERVICE_ID(WMI_SERVICE_GROUP,3)
-#define WMI_DATA_VO_SVC   MAKE_SERVICE_ID(WMI_SERVICE_GROUP,4)
-#define WMI_MAX_SERVICES  5
-
-/* raw stream service (i.e. flash, tcmd, calibration apps) */
-#define HTC_RAW_STREAMS_SVC MAKE_SERVICE_ID(HTC_TEST_GROUP,0)
-
-#endif /*HTC_SERVICES_H_*/
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/ieee80211.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/ieee80211.h
deleted file mode 100644
index 709004024..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/ieee80211.h
+++ /dev/null
@@ -1,342 +0,0 @@
-/*-
- * Copyright (c) 2001 Atsushi Onoe
- * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting
- * Copyright (c) 2006 Atheros Communications, Inc.
- *
- * Wireless Network driver for Atheros AR6001
- * All rights reserved.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-#ifndef _NET80211_IEEE80211_H_
-#define _NET80211_IEEE80211_H_
-
-#include "athstartpack.h"
-
-/*
- * 802.11 protocol definitions.
- */
-
-#define IEEE80211_ADDR_LEN  6       /* size of 802.11 address */
-/* is 802.11 address multicast/broadcast? */
-#define IEEE80211_IS_MULTICAST(_a)  (*(_a) & 0x01)
-#define IEEE80211_ADDR_EQ(addr1, addr2)     \
-    (A_MEMCMP(addr1, addr2, IEEE80211_ADDR_LEN) == 0)
-
-#define IEEE80211_KEYBUF_SIZE 16
-#define IEEE80211_MICBUF_SIZE (8+8)  /* space for both tx and rx */
-
-/*
- * NB: these values are ordered carefully; there are lots of
- * of implications in any reordering.  In particular beware
- * that 4 is not used to avoid conflicting with IEEE80211_F_PRIVACY.
- */
-#define IEEE80211_CIPHER_WEP            0
-#define IEEE80211_CIPHER_TKIP           1
-#define IEEE80211_CIPHER_AES_OCB        2
-#define IEEE80211_CIPHER_AES_CCM        3
-#define IEEE80211_CIPHER_CKIP           5
-#define IEEE80211_CIPHER_CCKM_KRK       6
-#define IEEE80211_CIPHER_NONE           7       /* pseudo value */
-
-#define IEEE80211_CIPHER_MAX            (IEEE80211_CIPHER_NONE+1)
-
-#define IEEE80211_IS_VALID_WEP_CIPHER_LEN(len) \
-        (((len) == 5) || ((len) == 13) || ((len) == 16))
-
-
-
-/*
- * generic definitions for IEEE 802.11 frames
- */
-PREPACK struct ieee80211_frame {
-    A_UINT8    i_fc[2];
-    A_UINT8    i_dur[2];
-    A_UINT8    i_addr1[IEEE80211_ADDR_LEN];
-    A_UINT8    i_addr2[IEEE80211_ADDR_LEN];
-    A_UINT8    i_addr3[IEEE80211_ADDR_LEN];
-    A_UINT8    i_seq[2];
-    /* possibly followed by addr4[IEEE80211_ADDR_LEN]; */
-    /* see below */
-} POSTPACK;
-
-#define IEEE80211_FC0_VERSION_MASK          0x03
-#define IEEE80211_FC0_VERSION_SHIFT         0
-#define IEEE80211_FC0_VERSION_0             0x00
-#define IEEE80211_FC0_TYPE_MASK             0x0c
-#define IEEE80211_FC0_TYPE_SHIFT            2
-#define IEEE80211_FC0_TYPE_MGT              0x00
-#define IEEE80211_FC0_TYPE_CTL              0x04
-#define IEEE80211_FC0_TYPE_DATA             0x08
-
-#define IEEE80211_FC0_SUBTYPE_MASK          0xf0
-#define IEEE80211_FC0_SUBTYPE_SHIFT         4
-/* for TYPE_MGT */
-#define IEEE80211_FC0_SUBTYPE_ASSOC_REQ     0x00
-#define IEEE80211_FC0_SUBTYPE_ASSOC_RESP    0x10
-#define IEEE80211_FC0_SUBTYPE_REASSOC_REQ   0x20
-#define IEEE80211_FC0_SUBTYPE_REASSOC_RESP  0x30
-#define IEEE80211_FC0_SUBTYPE_PROBE_REQ     0x40
-#define IEEE80211_FC0_SUBTYPE_PROBE_RESP    0x50
-#define IEEE80211_FC0_SUBTYPE_BEACON        0x80
-#define IEEE80211_FC0_SUBTYPE_ATIM          0x90
-#define IEEE80211_FC0_SUBTYPE_DISASSOC      0xa0
-#define IEEE80211_FC0_SUBTYPE_AUTH          0xb0
-#define IEEE80211_FC0_SUBTYPE_DEAUTH        0xc0
-/* for TYPE_CTL */
-#define IEEE80211_FC0_SUBTYPE_PS_POLL       0xa0
-#define IEEE80211_FC0_SUBTYPE_RTS           0xb0
-#define IEEE80211_FC0_SUBTYPE_CTS           0xc0
-#define IEEE80211_FC0_SUBTYPE_ACK           0xd0
-#define IEEE80211_FC0_SUBTYPE_CF_END        0xe0
-#define IEEE80211_FC0_SUBTYPE_CF_END_ACK    0xf0
-/* for TYPE_DATA (bit combination) */
-#define IEEE80211_FC0_SUBTYPE_DATA          0x00
-#define IEEE80211_FC0_SUBTYPE_CF_ACK        0x10
-#define IEEE80211_FC0_SUBTYPE_CF_POLL       0x20
-#define IEEE80211_FC0_SUBTYPE_CF_ACPL       0x30
-#define IEEE80211_FC0_SUBTYPE_NODATA        0x40
-#define IEEE80211_FC0_SUBTYPE_CFACK         0x50
-#define IEEE80211_FC0_SUBTYPE_CFPOLL        0x60
-#define IEEE80211_FC0_SUBTYPE_CF_ACK_CF_ACK 0x70
-#define IEEE80211_FC0_SUBTYPE_QOS           0x80
-#define IEEE80211_FC0_SUBTYPE_QOS_NULL      0xc0
-
-#define IEEE80211_FC1_DIR_MASK              0x03
-#define IEEE80211_FC1_DIR_NODS              0x00    /* STA->STA */
-#define IEEE80211_FC1_DIR_TODS              0x01    /* STA->AP  */
-#define IEEE80211_FC1_DIR_FROMDS            0x02    /* AP ->STA */
-#define IEEE80211_FC1_DIR_DSTODS            0x03    /* AP ->AP  */
-
-#define IEEE80211_FC1_MORE_FRAG             0x04
-#define IEEE80211_FC1_RETRY                 0x08
-#define IEEE80211_FC1_PWR_MGT               0x10
-#define IEEE80211_FC1_MORE_DATA             0x20
-#define IEEE80211_FC1_WEP                   0x40
-#define IEEE80211_FC1_ORDER                 0x80
-
-#define IEEE80211_SEQ_FRAG_MASK             0x000f
-#define IEEE80211_SEQ_FRAG_SHIFT            0
-#define IEEE80211_SEQ_SEQ_MASK              0xfff0
-#define IEEE80211_SEQ_SEQ_SHIFT             4
-
-#define IEEE80211_NWID_LEN                  32
-
-/*
- * 802.11 rate set.
- */
-#define IEEE80211_RATE_SIZE     8       /* 802.11 standard */
-#define IEEE80211_RATE_MAXSIZE  15      /* max rates we'll handle */
-
-#define WMM_NUM_AC                  4   /* 4 AC categories */
-
-#define WMM_PARAM_ACI_M         0x60    /* Mask for ACI field */
-#define WMM_PARAM_ACI_S         5   /* Shift for ACI field */
-#define WMM_PARAM_ACM_M         0x10    /* Mask for ACM bit */
-#define WMM_PARAM_ACM_S         4       /* Shift for ACM bit */
-#define WMM_PARAM_AIFSN_M       0x0f    /* Mask for aifsn field */
-#define WMM_PARAM_LOGCWMIN_M    0x0f    /* Mask for CwMin field (in log) */
-#define WMM_PARAM_LOGCWMAX_M    0xf0    /* Mask for CwMax field (in log) */
-#define WMM_PARAM_LOGCWMAX_S    4   /* Shift for CwMax field */
-
-#define WMM_AC_TO_TID(_ac) (       \
-    ((_ac) == WMM_AC_VO) ? 6 : \
-    ((_ac) == WMM_AC_VI) ? 5 : \
-    ((_ac) == WMM_AC_BK) ? 1 : \
-    0)
-
-#define TID_TO_WMM_AC(_tid) (      \
-    ((_tid) < 1) ? WMM_AC_BE : \
-    ((_tid) < 3) ? WMM_AC_BK : \
-    ((_tid) < 6) ? WMM_AC_VI : \
-    WMM_AC_VO)
-/*
- * Management information element payloads.
- */
-
-enum {
-    IEEE80211_ELEMID_SSID       = 0,
-    IEEE80211_ELEMID_RATES      = 1,
-    IEEE80211_ELEMID_FHPARMS    = 2,
-    IEEE80211_ELEMID_DSPARMS    = 3,
-    IEEE80211_ELEMID_CFPARMS    = 4,
-    IEEE80211_ELEMID_TIM        = 5,
-    IEEE80211_ELEMID_IBSSPARMS  = 6,
-    IEEE80211_ELEMID_COUNTRY    = 7,
-    IEEE80211_ELEMID_CHALLENGE  = 16,
-    /* 17-31 reserved for challenge text extension */
-    IEEE80211_ELEMID_PWRCNSTR   = 32,
-    IEEE80211_ELEMID_PWRCAP     = 33,
-    IEEE80211_ELEMID_TPCREQ     = 34,
-    IEEE80211_ELEMID_TPCREP     = 35,
-    IEEE80211_ELEMID_SUPPCHAN   = 36,
-    IEEE80211_ELEMID_CHANSWITCH = 37,
-    IEEE80211_ELEMID_MEASREQ    = 38,
-    IEEE80211_ELEMID_MEASREP    = 39,
-    IEEE80211_ELEMID_QUIET      = 40,
-    IEEE80211_ELEMID_IBSSDFS    = 41,
-    IEEE80211_ELEMID_ERP        = 42,
-    IEEE80211_ELEMID_RSN        = 48,
-    IEEE80211_ELEMID_XRATES     = 50,
-    IEEE80211_ELEMID_TPC        = 150,
-    IEEE80211_ELEMID_CCKM       = 156,
-    IEEE80211_ELEMID_VENDOR     = 221,  /* vendor private */
-};
-
-#define ATH_OUI             0x7f0300        /* Atheros OUI */
-#define ATH_OUI_TYPE        0x01
-#define ATH_OUI_SUBTYPE     0x01
-#define ATH_OUI_VERSION     0x00
-
-#define WPA_OUI             0xf25000
-#define WPA_OUI_TYPE        0x01
-#define WPA_VERSION         1          /* current supported version */
-
-#define WPA_CSE_NULL        0x00
-#define WPA_CSE_WEP40       0x01
-#define WPA_CSE_TKIP        0x02
-#define WPA_CSE_CCMP        0x04
-#define WPA_CSE_WEP104      0x05
-
-#define WPA_ASE_NONE        0x00
-#define WPA_ASE_8021X_UNSPEC    0x01
-#define WPA_ASE_8021X_PSK   0x02
-
-#define RSN_OUI         0xac0f00
-#define RSN_VERSION     1       /* current supported version */
-
-#define RSN_CSE_NULL        0x00
-#define RSN_CSE_WEP40       0x01
-#define RSN_CSE_TKIP        0x02
-#define RSN_CSE_WRAP        0x03
-#define RSN_CSE_CCMP        0x04
-#define RSN_CSE_WEP104      0x05
-
-#define RSN_ASE_NONE        0x00
-#define RSN_ASE_8021X_UNSPEC    0x01
-#define RSN_ASE_8021X_PSK   0x02
-
-#define RSN_CAP_PREAUTH     0x01
-
-#define WMM_OUI         0xf25000
-#define WMM_OUI_TYPE        0x02
-#define WMM_INFO_OUI_SUBTYPE    0x00
-#define WMM_PARAM_OUI_SUBTYPE   0x01
-#define WMM_VERSION     1
-
-/* WMM stream classes */
-#define WMM_NUM_AC  4
-#define WMM_AC_BE   0       /* best effort */
-#define WMM_AC_BK   1       /* background */
-#define WMM_AC_VI   2       /* video */
-#define WMM_AC_VO   3       /* voice */
-
-/* TSPEC related */
-#define ACTION_CATEGORY_CODE_TSPEC                 17
-#define ACTION_CODE_TSPEC_ADDTS                    0
-#define ACTION_CODE_TSPEC_ADDTS_RESP               1
-#define ACTION_CODE_TSPEC_DELTS                    2
-
-typedef enum {
-    TSPEC_STATUS_CODE_ADMISSION_ACCEPTED = 0,
-    TSPEC_STATUS_CODE_ADDTS_INVALID_PARAMS = 0x1,
-    TSPEC_STATUS_CODE_ADDTS_REQUEST_REFUSED = 0x3,
-    TSPEC_STATUS_CODE_UNSPECIFIED_QOS_RELATED_FAILURE = 0xC8,
-    TSPEC_STATUS_CODE_REQUESTED_REFUSED_POLICY_CONFIGURATION = 0xC9,
-    TSPEC_STATUS_CODE_INSUFFCIENT_BANDWIDTH = 0xCA,
-    TSPEC_STATUS_CODE_INVALID_PARAMS = 0xCB,
-    TSPEC_STATUS_CODE_DELTS_SENT    = 0x30,
-    TSPEC_STATUS_CODE_DELTS_RECV    = 0x31,
-} TSPEC_STATUS_CODE;
-
-/*
- * WMM/802.11e Tspec Element
- */
-typedef PREPACK struct wmm_tspec_ie_t {
-    A_UINT8     elementId;
-    A_UINT8     len;
-    A_UINT8     oui[3];
-    A_UINT8     ouiType;
-    A_UINT8     ouiSubType;
-    A_UINT8     version;
-    A_UINT16    tsInfo_info;
-    A_UINT8     tsInfo_reserved;
-    A_UINT16    nominalMSDU;
-    A_UINT16    maxMSDU;
-    A_UINT32    minServiceInt;
-    A_UINT32    maxServiceInt;
-    A_UINT32    inactivityInt;
-    A_UINT32    suspensionInt;
-    A_UINT32    serviceStartTime;
-    A_UINT32    minDataRate;
-    A_UINT32    meanDataRate;
-    A_UINT32    peakDataRate;
-    A_UINT32    maxBurstSize;
-    A_UINT32    delayBound;
-    A_UINT32    minPhyRate;
-    A_UINT16    sba;
-    A_UINT16    mediumTime;
-} POSTPACK WMM_TSPEC_IE;
-
-
-/*
- * BEACON management packets
- *
- *  octet timestamp[8]
- *  octet beacon interval[2]
- *  octet capability information[2]
- *  information element
- *      octet elemid
- *      octet length
- *      octet information[length]
- */
-
-#define IEEE80211_BEACON_INTERVAL(beacon) \
-    ((beacon)[8] | ((beacon)[9] << 8))
-#define IEEE80211_BEACON_CAPABILITY(beacon) \
-    ((beacon)[10] | ((beacon)[11] << 8))
-
-#define IEEE80211_CAPINFO_ESS               0x0001
-#define IEEE80211_CAPINFO_IBSS              0x0002
-#define IEEE80211_CAPINFO_CF_POLLABLE       0x0004
-#define IEEE80211_CAPINFO_CF_POLLREQ        0x0008
-#define IEEE80211_CAPINFO_PRIVACY           0x0010
-#define IEEE80211_CAPINFO_SHORT_PREAMBLE    0x0020
-#define IEEE80211_CAPINFO_PBCC              0x0040
-#define IEEE80211_CAPINFO_CHNL_AGILITY      0x0080
-/* bits 8-9 are reserved */
-#define IEEE80211_CAPINFO_SHORT_SLOTTIME    0x0400
-#define IEEE80211_CAPINFO_APSD              0x0800
-/* bit 12 is reserved */
-#define IEEE80211_CAPINFO_DSSSOFDM          0x2000
-/* bits 14-15 are reserved */
-
-/*
- * Authentication Modes
- */
-
-enum ieee80211_authmode {
-    IEEE80211_AUTH_NONE     = 0,
-    IEEE80211_AUTH_OPEN     = 1,
-    IEEE80211_AUTH_SHARED   = 2,
-    IEEE80211_AUTH_8021X    = 3,
-    IEEE80211_AUTH_AUTO     = 4,   /* auto-select/accept */
-    /* NB: these are used only for ioctls */
-    IEEE80211_AUTH_WPA      = 5,  /* WPA/RSN  w/ 802.1x */
-    IEEE80211_AUTH_WPA_PSK  = 6,  /* WPA/RSN  w/ PSK */
-    IEEE80211_AUTH_WPA_CCKM = 7,  /* WPA/RSN IE  w/ CCKM */
-};
-
-#include "athendpack.h"
-
-#endif /* _NET80211_IEEE80211_H_ */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/ieee80211_ioctl.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/ieee80211_ioctl.h
deleted file mode 100644
index dab6747c4..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/ieee80211_ioctl.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (c) 2004-2005 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- *
- * $Id: //depot/sw/releases/olca2.0-GPL/host/os/linux/include/ieee80211_ioctl.h#1 $
- */
-
-#ifndef _IEEE80211_IOCTL_H_
-#define _IEEE80211_IOCTL_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Extracted from the MADWIFI net80211/ieee80211_ioctl.h
- */
-
-/*
- * WPA/RSN get/set key request.  Specify the key/cipher
- * type and whether the key is to be used for sending and/or
- * receiving.  The key index should be set only when working
- * with global keys (use IEEE80211_KEYIX_NONE for ``no index'').
- * Otherwise a unicast/pairwise key is specified by the bssid
- * (on a station) or mac address (on an ap).  They key length
- * must include any MIC key data; otherwise it should be no
- more than IEEE80211_KEYBUF_SIZE.
- */
-struct ieee80211req_key {
-	u_int8_t	ik_type;	/* key/cipher type */
-	u_int8_t	ik_pad;
-	u_int16_t	ik_keyix;	/* key index */
-	u_int8_t	ik_keylen;	/* key length in bytes */
-	u_int8_t	ik_flags;
-#define IEEE80211_KEY_XMIT  0x01
-#define IEEE80211_KEY_RECV  0x02
-#define	IEEE80211_KEY_DEFAULT	0x80	/* default xmit key */
-	u_int8_t	ik_macaddr[IEEE80211_ADDR_LEN];
-	u_int64_t	ik_keyrsc;	/* key receive sequence counter */
-	u_int64_t	ik_keytsc;	/* key transmit sequence counter */
-	u_int8_t	ik_keydata[IEEE80211_KEYBUF_SIZE+IEEE80211_MICBUF_SIZE];
-};
-/*
- * Delete a key either by index or address.  Set the index
- * to IEEE80211_KEYIX_NONE when deleting a unicast key.
- */
-struct ieee80211req_del_key {
-	u_int8_t	idk_keyix;	/* key index */
-	u_int8_t	idk_macaddr[IEEE80211_ADDR_LEN];
-};
-/*
- * MLME state manipulation request.  IEEE80211_MLME_ASSOC
- * only makes sense when operating as a station.  The other
- * requests can be used when operating as a station or an
- * ap (to effect a station).
- */
-struct ieee80211req_mlme {
-	u_int8_t	im_op;		/* operation to perform */
-#define	IEEE80211_MLME_ASSOC		1	/* associate station */
-#define	IEEE80211_MLME_DISASSOC		2	/* disassociate station */
-#define	IEEE80211_MLME_DEAUTH		3	/* deauthenticate station */
-#define	IEEE80211_MLME_AUTHORIZE	4	/* authorize station */
-#define	IEEE80211_MLME_UNAUTHORIZE	5	/* unauthorize station */
-	u_int16_t	im_reason;	/* 802.11 reason code */
-	u_int8_t	im_macaddr[IEEE80211_ADDR_LEN];
-};
-
-struct ieee80211req_addpmkid {
-    u_int8_t    pi_bssid[IEEE80211_ADDR_LEN];
-    u_int8_t    pi_enable;
-    u_int8_t    pi_pmkid[16];
-};
-
-#define AUTH_ALG_OPEN_SYSTEM	0x01
-#define AUTH_ALG_SHARED_KEY	0x02
-#define AUTH_ALG_LEAP		0x04
-
-struct ieee80211req_authalg {
-   u_int8_t auth_alg;
-};
-
-/*
- * Request to add an IE to a Management Frame
- */
-enum{
-    IEEE80211_APPIE_FRAME_BEACON     = 0,
-    IEEE80211_APPIE_FRAME_PROBE_REQ  = 1,
-    IEEE80211_APPIE_FRAME_PROBE_RESP = 2,
-    IEEE80211_APPIE_FRAME_ASSOC_REQ  = 3,
-    IEEE80211_APPIE_FRAME_ASSOC_RESP = 4,
-    IEEE80211_APPIE_NUM_OF_FRAME     = 5
-};
-
-/*
- * The Maximum length of the IE that can be added to a Management frame
- */
-#define IEEE80211_APPIE_FRAME_MAX_LEN  78
-
-struct ieee80211req_getset_appiebuf {
-    u_int32_t app_frmtype; /* management frame type for which buffer is added */
-    u_int32_t app_buflen;  /*application supplied buffer length */
-    u_int8_t  app_buf[];
-};
-
-/*
- * The following definitions are used by an application to set filter
- * for receiving management frames
- */
-enum {
-     IEEE80211_FILTER_TYPE_BEACON      =   0x1,
-     IEEE80211_FILTER_TYPE_PROBE_REQ   =   0x2,
-     IEEE80211_FILTER_TYPE_PROBE_RESP  =   0x4,
-     IEEE80211_FILTER_TYPE_ASSOC_REQ   =   0x8,
-     IEEE80211_FILTER_TYPE_ASSOC_RESP  =   0x10,
-     IEEE80211_FILTER_TYPE_AUTH        =   0x20,
-     IEEE80211_FILTER_TYPE_DEAUTH      =   0x40,
-     IEEE80211_FILTER_TYPE_DISASSOC    =   0x80,
-     IEEE80211_FILTER_TYPE_ALL         =   0xFF  /* used to check the valid filter bits */
-};
-
-struct ieee80211req_set_filter {
-      u_int32_t app_filterype; /* management frame filter type */
-};
-
-enum {
-    IEEE80211_PARAM_AUTHMODE = 3,   /* Authentication Mode */
-    IEEE80211_PARAM_MCASTCIPHER = 5,
-    IEEE80211_PARAM_MCASTKEYLEN = 6,    /* multicast key length */
-    IEEE80211_PARAM_UCASTCIPHER = 8,
-    IEEE80211_PARAM_UCASTKEYLEN = 9,    /* unicast key length */
-	IEEE80211_PARAM_WPA		= 10,	/* WPA mode (0,1,2) */
-	IEEE80211_PARAM_ROAMING		= 12,	/* roaming mode */
-	IEEE80211_PARAM_PRIVACY		= 13,	/* privacy invoked */
-	IEEE80211_PARAM_COUNTERMEASURES	= 14,	/* WPA/TKIP countermeasures */
-	IEEE80211_PARAM_DROPUNENCRYPTED	= 15,	/* discard unencrypted frames */
-};
-
-/*
- * Values for IEEE80211_PARAM_WPA
- */
-#define WPA_MODE_WPA1   1
-#define WPA_MODE_WPA2   2
-#define WPA_MODE_AUTO   3
-#define WPA_MODE_NONE   4
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _IEEE80211_IOCTL_H_ */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/ieee80211_node.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/ieee80211_node.h
deleted file mode 100644
index 46b613c09..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/ieee80211_node.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*-
- * Copyright (c) 2001 Atsushi Onoe
- * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting
- * Copyright (c) 2006 Atheros Communications, Inc.
- *
- * Wireless Network driver for Atheros AR6001
- * All rights reserved.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-#ifndef _IEEE80211_NODE_H_
-#define _IEEE80211_NODE_H_
-
-/*
- * Node locking definitions.
- */
-#define IEEE80211_NODE_LOCK_INIT(_nt)   A_MUTEX_INIT(&(_nt)->nt_nodelock)
-#define IEEE80211_NODE_LOCK_DESTROY(_nt)
-#define IEEE80211_NODE_LOCK(_nt)        A_MUTEX_LOCK(&(_nt)->nt_nodelock)
-#define IEEE80211_NODE_UNLOCK(_nt)      A_MUTEX_UNLOCK(&(_nt)->nt_nodelock)
-#define IEEE80211_NODE_LOCK_BH(_nt)     A_MUTEX_LOCK(&(_nt)->nt_nodelock)
-#define IEEE80211_NODE_UNLOCK_BH(_nt)   A_MUTEX_UNLOCK(&(_nt)->nt_nodelock)
-#define IEEE80211_NODE_LOCK_ASSERT(_nt)
-
-/*
- * Node reference counting definitions.
- *
- * ieee80211_node_initref   initialize the reference count to 1
- * ieee80211_node_incref    add a reference
- * ieee80211_node_decref    remove a reference
- * ieee80211_node_dectestref    remove a reference and return 1 if this
- *              is the last reference, otherwise 0
- * ieee80211_node_refcnt    reference count for printing (only)
- */
-#define ieee80211_node_initref(_ni)     ((_ni)->ni_refcnt = 1)
-#define ieee80211_node_incref(_ni)      ((_ni)->ni_refcnt++)
-#define ieee80211_node_decref(_ni)      ((_ni)->ni_refcnt--)
-#define ieee80211_node_dectestref(_ni)  (((_ni)->ni_refcnt--) == 0)
-#define ieee80211_node_refcnt(_ni)      ((_ni)->ni_refcnt)
-
-#define IEEE80211_NODE_HASHSIZE 32
-/* simple hash is enough for variation of macaddr */
-#define IEEE80211_NODE_HASH(addr)   \
-    (((const A_UINT8 *)(addr))[IEEE80211_ADDR_LEN - 1] % \
-        IEEE80211_NODE_HASHSIZE)
-
-/*
- * Table of ieee80211_node instances.  Each ieee80211com
- * has at least one for holding the scan candidates.
- * When operating as an access point or in ibss mode there
- * is a second table for associated stations or neighbors.
- */
-struct ieee80211_node_table {
-    void                   *nt_wmip;       /* back reference */
-    A_MUTEX_T               nt_nodelock;    /* on node table */
-    struct bss              *nt_node_first; /* information of all nodes */
-    struct bss              *nt_node_last;  /* information of all nodes */
-    struct bss              *nt_hash[IEEE80211_NODE_HASHSIZE];
-    const char              *nt_name;   /* for debugging */
-    A_UINT32                nt_scangen; /* gen# for timeout scan */
-    A_TIMER                 nt_inact_timer;
-    A_UINT8                 isTimerArmed;   /* is the node timer armed */
-};
-
-#define WLAN_NODE_INACT_TIMEOUT_MSEC            10000
-
-#endif /* _IEEE80211_NODE_H_ */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/ini_dset.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/ini_dset.h
deleted file mode 100644
index 410f2b525..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/ini_dset.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2004-2007 Atheros Communications Inc.
- * All rights reserved.
- *
- * $ATH_LICENSE_HOSTSDK0_C$
- *
- */
-#ifndef _INI_DSET_H_
-#define _INI_DSET_H_
-
-/*
- * Each of these represents a WHAL INI table, which consists
- * of an "address column" followed by 1 or more "value columns".
- *
- * Software uses the base WHAL_INI_DATA_ID+column to access a
- * DataSet that holds a particular column of data.
- */
-typedef enum {
-    WHAL_INI_DATA_ID_NULL               =0,
-    WHAL_INI_DATA_ID_MODE_SPECIFIC      =1,  /* 2,3 */
-    WHAL_INI_DATA_ID_COMMON             =4,  /* 5 */
-    WHAL_INI_DATA_ID_BB_RFGAIN          =6,  /* 7,8 */
-    WHAL_INI_DATA_ID_ANALOG_BANK1       =9,  /* 10 */
-    WHAL_INI_DATA_ID_ANALOG_BANK2       =11, /* 12 */
-    WHAL_INI_DATA_ID_ANALOG_BANK3       =13, /* 14, 15 */
-    WHAL_INI_DATA_ID_ANALOG_BANK6       =16, /* 17, 18 */
-    WHAL_INI_DATA_ID_ANALOG_BANK7       =19, /* 20 */
-    WHAL_INI_DATA_ID_MODE_OVERRIDES     =21, /* 22,23 */
-    WHAL_INI_DATA_ID_COMMON_OVERRIDES   =24, /* 25 */
-
-    WHAL_INI_DATA_ID_MAX                =25
-} WHAL_INI_DATA_ID;
-
-typedef PREPACK struct {
-    A_UINT16 freqIndex; // 1 - A mode 2 - B or G mode 0 - common
-    A_UINT16 offset;
-    A_UINT32 newValue;
-} POSTPACK INI_DSET_REG_OVERRIDE;
-
-#endif
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/regDb.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/regDb.h
deleted file mode 100644
index b3f665ff5..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/regDb.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2005 Atheros Communications, Inc.
- * All rights reserved.
- *
- *
- * $ATH_LICENSE_HOSTSDK0_C$
- *
- * This module contains the header files for regulatory module,
- * which include the DB schema and DB values.
- * $Id:
- */
-
-#ifndef __REG_DB_H__
-#define __REG_DB_H__
-
-#include "./regulatory/reg_dbschema.h"
-#include "./regulatory/reg_dbvalues.h"
-
-#endif  /* __REG_DB_H__ */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/regdump.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/regdump.h
deleted file mode 100644
index 0106825ce..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/regdump.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef __REGDUMP_H__
-#define __REGDUMP_H__
-/*
- * Copyright (c) 2004-2007 Atheros Communications Inc.
- * All rights reserved.
- *
- * $ATH_LICENSE_HOSTSDK0_C$
- *
- */
-#if defined(AR6001)
-#include "AR6001/AR6001_regdump.h"
-#endif
-#if defined(AR6002)
-#include "AR6002/AR6002_regdump.h"
-#endif
-
-#if !defined(__ASSEMBLER__)
-/*
- * Target CPU state at the time of failure is reflected
- * in a register dump, which the Host can fetch through
- * the diagnostic window.
- */
-struct register_dump_s {
-    A_UINT32 target_id;               /* Target ID */
-    A_UINT32 assline;                 /* Line number (if assertion failure) */
-    A_UINT32 pc;                      /* Program Counter at time of exception */
-    A_UINT32 badvaddr;                /* Virtual address causing exception */
-    CPU_exception_frame_t exc_frame;  /* CPU-specific exception info */
-
-    /* Could copy top of stack here, too.... */
-};
-#endif /* __ASSEMBLER__ */
-#endif /* __REGDUMP_H__ */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/targaddrs.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/targaddrs.h
deleted file mode 100644
index da2a65090..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/targaddrs.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright (c) 2004-2007 Atheros Communications Inc.
- * All rights reserved.
- *
- * $ATH_LICENSE_HOSTSDK0_C$
- *
- */
-
-#ifndef __TARGADDRS_H__
-#define __TARGADDRS_H__
-#if defined(AR6001)
-#include "AR6001/addrs.h"
-#endif
-#if defined(AR6002)
-#include "AR6002/addrs.h"
-#endif
-
-/*
- * AR6K option bits, to enable/disable various features.
- * By default, all option bits are 0.
- * These bits can be set in LOCAL_SCRATCH register 0.
- */
-#define AR6K_OPTION_BMI_DISABLE      0x01 /* Disable BMI comm with Host */
-#define AR6K_OPTION_SERIAL_ENABLE    0x02 /* Enable serial port msgs */
-#define AR6K_OPTION_WDT_DISABLE      0x04 /* WatchDog Timer override */
-#define AR6K_OPTION_SLEEP_DISABLE    0x08 /* Disable system sleep */
-#define AR6K_OPTION_STOP_BOOT        0x10 /* Stop boot processes (for ATE) */
-#define AR6K_OPTION_ENABLE_NOANI     0x20 /* Operate without ANI */
-#define AR6K_OPTION_DSET_DISABLE     0x40 /* Ignore DataSets */
-#define AR6K_OPTION_IGNORE_FLASH     0x80 /* Ignore flash during bootup */
-
-/*
- * xxx_HOST_INTEREST_ADDRESS is the address in Target RAM of the
- * host_interest structure.  It must match the address of the _host_interest
- * symbol (see linker script).
- *
- * Host Interest is shared between Host and Target in order to coordinate
- * between the two, and is intended to remain constant (with additions only
- * at the end) across software releases.
- */
-#define AR6001_HOST_INTEREST_ADDRESS     0x80000600
-#define AR6002_HOST_INTEREST_ADDRESS     0x00500400
-
-#define HOST_INTEREST_MAX_SIZE          0x100
-
-#if !defined(__ASSEMBLER__)
-struct register_dump_s;
-struct dbglog_hdr_s;
-
-/*
- * These are items that the Host may need to access
- * via BMI or via the Diagnostic Window. The position
- * of items in this structure must remain constant
- * across firmware revisions!
- *
- * Types for each item must be fixed size across
- * target and host platforms.
- *
- * More items may be added at the end.
- */
-struct host_interest_s {
-    /*
-     * Pointer to application-defined area, if any.
-     * Set by Target application during startup.
-     */
-    A_UINT32               hi_app_host_interest;                      /* 0x00 */
-
-    /* Pointer to register dump area, valid after Target crash. */
-    A_UINT32               hi_failure_state;                          /* 0x04 */
-
-    /* Pointer to debug logging header */
-    A_UINT32               hi_dbglog_hdr;                             /* 0x08 */
-
-    /* Indicates whether or not flash is present on Target.
-     * NB: flash_is_present indicator is here not just
-     * because it might be of interest to the Host; but
-     * also because it's set early on by Target's startup
-     * asm code and we need it to have a special RAM address
-     * so that it doesn't get reinitialized with the rest
-     * of data.
-     */
-    A_UINT32               hi_flash_is_present;                       /* 0x0c */
-
-    /*
-     * General-purpose flag bits, similar to AR6000_OPTION_* flags.
-     * Can be used by application rather than by OS.
-     */
-    A_UINT32               hi_option_flag;                            /* 0x10 */
-
-    /*
-     * Boolean that determines whether or not to
-     * display messages on the serial port.
-     */
-    A_UINT32               hi_serial_enable;                          /* 0x14 */
-
-    /* Start address of Flash DataSet index, if any */
-    A_UINT32               hi_dset_list_head;                         /* 0x18 */
-
-    /* Override Target application start address */
-    A_UINT32               hi_app_start;                              /* 0x1c */
-
-    /* Clock and voltage tuning */
-    A_UINT32               hi_skip_clock_init;                        /* 0x20 */
-    A_UINT32               hi_core_clock_setting;                     /* 0x24 */
-    A_UINT32               hi_cpu_clock_setting;                      /* 0x28 */
-    A_UINT32               hi_system_sleep_setting;                   /* 0x2c */
-    A_UINT32               hi_xtal_control_setting;                   /* 0x30 */
-    A_UINT32               hi_pll_ctrl_setting_24ghz;                 /* 0x34 */
-    A_UINT32               hi_pll_ctrl_setting_5ghz;                  /* 0x38 */
-    A_UINT32               hi_ref_voltage_trim_setting;               /* 0x3c */
-    A_UINT32               hi_clock_info;                             /* 0x40 */
-
-    /*
-     * Flash configuration overrides, used only
-     * when firmware is not executing from flash.
-     * (When using flash, modify the global variables
-     * with equivalent names.)
-     */
-    A_UINT32               hi_bank0_addr_value;                       /* 0x44 */
-    A_UINT32               hi_bank0_read_value;                       /* 0x48 */
-    A_UINT32               hi_bank0_write_value;                      /* 0x4c */
-    A_UINT32               hi_bank0_config_value;                     /* 0x50 */
-
-    /* Pointer to Board Data  */
-    A_UINT32               hi_board_data;                             /* 0x54 */
-    A_UINT32               hi_board_data_initialized;                 /* 0x58 */
-
-    A_UINT32               hi_dset_RAM_index_table;                   /* 0x5c */
-
-    A_UINT32               hi_desired_baud_rate;                      /* 0x60 */
-    A_UINT32               hi_dbglog_config;                          /* 0x64 */
-    A_UINT32               hi_end_RAM_reserve_sz;                     /* 0x68 */
-    A_UINT32               hi_mbox_io_block_sz;                       /* 0x6c */
-
-    A_UINT32               hi_num_bpatch_streams;                     /* 0x70 */
-    A_UINT32               hi_mbox_isr_yield_limit;                   /* 0x74 */
-
-    A_UINT32               hi_refclk_hz;                              /* 0x78 */
-};
-
-/* Bits defined in hi_option_flag */
-#define HI_OPTION_TIMER_WAR     1 /* not really used */
-
-/*
- * Intended for use by Host software, this macro returns the Target RAM
- * address of any item in the host_interest structure.
- * Example: target_addr = AR6001_HOST_INTEREST_ITEM_ADDRESS(hi_board_data);
- */
-#define AR6001_HOST_INTEREST_ITEM_ADDRESS(item) \
-    ((A_UINT32)&((((struct host_interest_s *)(AR6001_HOST_INTEREST_ADDRESS))->item)))
-
-#define AR6002_HOST_INTEREST_ITEM_ADDRESS(item) \
-    ((A_UINT32)&((((struct host_interest_s *)(AR6002_HOST_INTEREST_ADDRESS))->item)))
-
-
-#endif /* !__ASSEMBLER__ */
-
-#endif /* __TARGADDRS_H__ */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/testcmd.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/testcmd.h
deleted file mode 100644
index 737533adb..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/testcmd.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (c) 2004-2005 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- * $ATH_LICENSE_HOSTSDK0_C$
- *
- */
-
-#ifndef  TESTCMD_H_
-#define  TESTCMD_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef enum {
-    ZEROES_PATTERN = 0,
-    ONES_PATTERN,
-    REPEATING_10,
-    PN7_PATTERN,
-    PN9_PATTERN,
-    PN15_PATTERN
-}TX_DATA_PATTERN;
-
-/* Continous tx
-   mode : TCMD_CONT_TX_OFF - Disabling continous tx
-          TCMD_CONT_TX_SINE - Enable continuous unmodulated tx
-          TCMD_CONT_TX_FRAME- Enable continuous modulated tx
-   freq : Channel freq in Mhz. (e.g 2412 for channel 1 in 11 g)
-dataRate: 0 - 1 Mbps
-          1 - 2 Mbps
-          2 - 5.5 Mbps
-          3 - 11 Mbps
-          4 - 6 Mbps
-          5 - 9 Mbps
-          6 - 12 Mbps
-          7 - 18 Mbps
-          8 - 24 Mbps
-          9 - 36 Mbps
-         10 - 28 Mbps
-         11 - 54 Mbps
-  txPwr: Tx power in dBm[5 -11] for unmod Tx, [5-14] for mod Tx
-antenna:  1 - one antenna
-          2 - two antenna
-Note : Enable/disable continuous tx test cmd works only when target is awake.
-*/
-
-typedef enum {
-    TCMD_CONT_TX_OFF = 0,
-    TCMD_CONT_TX_SINE,
-    TCMD_CONT_TX_FRAME,
-    TCMD_CONT_TX_TX99,
-    TCMD_CONT_TX_TX100
-} TCMD_CONT_TX_MODE;
-
-typedef PREPACK struct {
-    A_UINT32                 testCmdId;
-    A_UINT32                mode;
-    A_UINT32                freq;
-    A_UINT32                dataRate;
-    A_INT32                 txPwr;
-    A_UINT32                antenna;
-    A_UINT32                enANI;
-    A_UINT32                scramblerOff;
-    A_UINT32                aifsn;
-    A_UINT16                pktSz;
-    A_UINT16                txPattern;
-} POSTPACK TCMD_CONT_TX;
-
-#define TCMD_TXPATTERN_ZERONE                 0x1
-#define TCMD_TXPATTERN_ZERONE_DIS_SCRAMBLE    0x2
-
-/* Continuous Rx
- act: TCMD_CONT_RX_PROMIS - promiscuous mode (accept all incoming frames)
-      TCMD_CONT_RX_FILTER - filter mode (accept only frames with dest
-                                             address equal specified
-                                             mac address (set via act =3)
-      TCMD_CONT_RX_REPORT  off mode  (disable cont rx mode and get the
-                                          report from the last cont
-                                          Rx test)
-
-     TCMD_CONT_RX_SETMAC - set MacAddr mode (sets the MAC address for the
-                                                 target. This Overrides
-                                                 the default MAC address.)
-
-*/
-typedef enum {
-    TCMD_CONT_RX_PROMIS =0,
-    TCMD_CONT_RX_FILTER,
-    TCMD_CONT_RX_REPORT,
-    TCMD_CONT_RX_SETMAC
-} TCMD_CONT_RX_ACT;
-
-typedef PREPACK struct {
-    A_UINT32         testCmdId;
-    A_UINT32        act;
-    A_UINT32        enANI;
-    PREPACK union {
-        struct PREPACK TCMD_CONT_RX_PARA {
-            A_UINT32    freq;
-            A_UINT32    antenna;
-        } POSTPACK para;
-        struct PREPACK TCMD_CONT_RX_REPORT {
-            A_UINT32    totalPkt;
-            A_INT32    rssiInDBm;
-        } POSTPACK report;
-        struct PREPACK TCMD_CONT_RX_MAC {
-            A_UCHAR    addr[ATH_MAC_LEN];
-        } POSTPACK mac;
-    } POSTPACK u;
-} POSTPACK TCMD_CONT_RX;
-
-/* Force sleep/wake  test cmd
- mode: TCMD_PM_WAKEUP - Wakeup the target
-       TCMD_PM_SLEEP - Force the target to sleep.
- */
-typedef enum {
-    TCMD_PM_WAKEUP = 1, /* be consistent with target */
-    TCMD_PM_SLEEP
-} TCMD_PM_MODE;
-
-typedef PREPACK struct {
-	A_UINT32  testCmdId;
-    A_UINT32  mode;
-} POSTPACK TCMD_PM;
-
-typedef enum{
-    TCMD_CONT_TX_ID,
-    TCMD_CONT_RX_ID,
-    TCMD_PM_ID
-   } TCMD_ID;
-
-typedef PREPACK union {
-          TCMD_CONT_TX contTx;
-          TCMD_CONT_RX contRx;
-          TCMD_PM pm ;
-} POSTPACK TEST_CMD;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* TESTCMD_H_ */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/wlan_api.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/wlan_api.h
deleted file mode 100644
index aabca4b7b..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/wlan_api.h
+++ /dev/null
@@ -1,101 +0,0 @@
-#ifndef _HOST_WLAN_API_H_
-#define _HOST_WLAN_API_H_
-/*
- * Copyright (c) 2004-2005 Atheros Communications Inc.
- * All rights reserved.
- *
- * This file contains the API for the host wlan module
- *
- * $Id: //depot/sw/releases/olca2.0-GPL/host/include/wlan_api.h#1 $
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct ieee80211_node_table;
-struct ieee80211_frame;
-
-struct ieee80211_common_ie {
-    A_UINT16    ie_chan;
-    A_UINT8     *ie_tstamp;
-    A_UINT8     *ie_ssid;
-    A_UINT8     *ie_rates;
-    A_UINT8     *ie_xrates;
-    A_UINT8     *ie_country;
-    A_UINT8     *ie_wpa;
-    A_UINT8     *ie_rsn;
-    A_UINT8     *ie_wmm;
-    A_UINT8     *ie_ath;
-    A_UINT16    ie_capInfo;
-    A_UINT16    ie_beaconInt;
-    A_UINT8     *ie_tim;
-    A_UINT8     *ie_chswitch;
-    A_UINT8     ie_erp;
-    A_UINT8     *ie_wsc;
-};
-
-typedef struct bss {
-    A_UINT8                      ni_macaddr[6];
-    A_UINT8                      ni_snr;
-    A_INT16                      ni_rssi;
-    struct bss                   *ni_list_next;
-    struct bss                   *ni_list_prev;
-    struct bss                   *ni_hash_next;
-    struct bss                   *ni_hash_prev;
-    struct ieee80211_common_ie   ni_cie;
-    A_UINT8                     *ni_buf;
-    struct ieee80211_node_table *ni_table;
-    A_UINT32                     ni_refcnt;
-    int                          ni_scangen;
-    A_UINT32                     ni_tstamp;
-} bss_t;
-
-typedef void wlan_node_iter_func(void *arg, bss_t *);
-
-bss_t *wlan_node_alloc(struct ieee80211_node_table *nt, int wh_size);
-void wlan_node_free(bss_t *ni);
-void wlan_setup_node(struct ieee80211_node_table *nt, bss_t *ni,
-                const A_UINT8 *macaddr);
-bss_t *wlan_find_node(struct ieee80211_node_table *nt, const A_UINT8 *macaddr);
-void wlan_node_reclaim(struct ieee80211_node_table *nt, bss_t *ni);
-void wlan_free_allnodes(struct ieee80211_node_table *nt);
-void wlan_iterate_nodes(struct ieee80211_node_table *nt, wlan_node_iter_func *f,
-                        void *arg);
-
-void wlan_node_table_init(void *wmip, struct ieee80211_node_table *nt);
-void wlan_node_table_reset(struct ieee80211_node_table *nt);
-void wlan_node_table_cleanup(struct ieee80211_node_table *nt);
-
-A_STATUS wlan_parse_beacon(A_UINT8 *buf, int framelen,
-                           struct ieee80211_common_ie *cie);
-
-A_UINT16 wlan_ieee2freq(int chan);
-A_UINT32 wlan_freq2ieee(A_UINT16 freq);
-
-
-bss_t *
-wlan_find_Ssidnode (struct ieee80211_node_table *nt, A_UCHAR *pSsid,
-					A_UINT32 ssidLength, A_BOOL bIsWPA2);
-
-void
-wlan_node_return (struct ieee80211_node_table *nt, bss_t *ni);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _HOST_WLAN_API_H_ */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/wlan_dset.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/wlan_dset.h
deleted file mode 100644
index 8a876d647..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/wlan_dset.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2007 Atheros Communications, Inc.
- * All rights reserved.
- *
- *
- * $ATH_LICENSE_HOSTSDK0_C$
- *
- */
-
-#ifndef __WLAN_DSET_H__
-#define __WKAN_DSET_H__
-
-typedef PREPACK struct wow_config_dset {
-
-    A_UINT8 valid_dset;
-    A_UINT8 gpio_enable;
-    A_UINT16 gpio_pin;
-} POSTPACK WOW_CONFIG_DSET;
-
-#endif
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/wmi.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/wmi.h
deleted file mode 100644
index 045acd4d3..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/wmi.h
+++ /dev/null
@@ -1,1743 +0,0 @@
-/*
- * Copyright (c) 2004-2006 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- * $ATH_LICENSE_HOSTSDK0_C$
- *
- * This file contains the definitions of the WMI protocol specified in the
- * Wireless Module Interface (WMI).  It includes definitions of all the
- * commands and events. Commands are messages from the host to the WM.
- * Events and Replies are messages from the WM to the host.
- *
- * Ownership of correctness in regards to WMI commands
- * belongs to the host driver and the WM is not required to validate
- * parameters for value, proper range, or any other checking.
- *
- */
-
-#ifndef _WMI_H_
-#define _WMI_H_
-
-#ifndef ATH_TARGET
-#include "athstartpack.h"
-#endif
-
-#include "wmix.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define WMI_PROTOCOL_VERSION    0x0002
-#define WMI_PROTOCOL_REVISION   0x0000
-
-#define ATH_MAC_LEN             6               /* length of mac in bytes */
-#define WMI_CMD_MAX_LEN         100
-#define WMI_CONTROL_MSG_MAX_LEN     256
-#define WMI_OPT_CONTROL_MSG_MAX_LEN 1536
-#define IS_ETHERTYPE(_typeOrLen)        ((_typeOrLen) >= 0x0600)
-#define RFC1042OUI      {0x00, 0x00, 0x00}
-
-#define IP_ETHERTYPE 0x0800
-
-#define WMI_IMPLICIT_PSTREAM 0xFF
-#define WMI_MAX_THINSTREAM 15
-
-struct host_app_area_s {
-    A_UINT32 wmi_protocol_ver;
-};
-
-/*
- * Data Path
- */
-typedef PREPACK struct {
-    A_UINT8     dstMac[ATH_MAC_LEN];
-    A_UINT8     srcMac[ATH_MAC_LEN];
-    A_UINT16    typeOrLen;
-} POSTPACK ATH_MAC_HDR;
-
-typedef PREPACK struct {
-    A_UINT8     dsap;
-    A_UINT8     ssap;
-    A_UINT8     cntl;
-    A_UINT8     orgCode[3];
-    A_UINT16    etherType;
-} POSTPACK ATH_LLC_SNAP_HDR;
-
-typedef enum {
-    DATA_MSGTYPE = 0x0,
-    CNTL_MSGTYPE,
-    SYNC_MSGTYPE
-} WMI_MSG_TYPE;
-
-
-typedef PREPACK struct {
-    A_INT8      rssi;
-    A_UINT8     info;            /* WMI_MSG_TYPE in lower 2 bits - b1b0 */
-                                 /* UP in next 3 bits - b4b3b2 */
-#define WMI_DATA_HDR_MSG_TYPE_MASK  0x03
-#define WMI_DATA_HDR_MSG_TYPE_SHIFT 0
-#define WMI_DATA_HDR_UP_MASK        0x07
-#define WMI_DATA_HDR_UP_SHIFT       2
-#define WMI_DATA_HDR_IS_MSG_TYPE(h, t)  (((h)->info & (WMI_DATA_HDR_MSG_TYPE_MASK)) == (t))
-} POSTPACK WMI_DATA_HDR;
-
-
-#define WMI_DATA_HDR_SET_MSG_TYPE(h, t) (h)->info = (((h)->info & ~(WMI_DATA_HDR_MSG_TYPE_MASK << WMI_DATA_HDR_MSG_TYPE_SHIFT)) | (t << WMI_DATA_HDR_MSG_TYPE_SHIFT))
-#define WMI_DATA_HDR_SET_UP(h, p) (h)->info = (((h)->info & ~(WMI_DATA_HDR_UP_MASK << WMI_DATA_HDR_UP_SHIFT)) | (p << WMI_DATA_HDR_UP_SHIFT))
-
-/*
- * Control Path
- */
-typedef PREPACK struct {
-    A_UINT16    commandId;
-} POSTPACK WMI_CMD_HDR;        /* used for commands and events */
-
-/*
- * List of Commnands
- */
-typedef enum {
-    WMI_CONNECT_CMDID           = 0x0001,
-    WMI_RECONNECT_CMDID,
-    WMI_DISCONNECT_CMDID,
-    WMI_SYNCHRONIZE_CMDID,
-    WMI_CREATE_PSTREAM_CMDID,
-    WMI_DELETE_PSTREAM_CMDID,
-    WMI_START_SCAN_CMDID,
-    WMI_SET_SCAN_PARAMS_CMDID,
-    WMI_SET_BSS_FILTER_CMDID,
-    WMI_SET_PROBED_SSID_CMDID,
-    WMI_SET_LISTEN_INT_CMDID,
-    WMI_SET_BMISS_TIME_CMDID,
-    WMI_SET_DISC_TIMEOUT_CMDID,
-    WMI_GET_CHANNEL_LIST_CMDID,
-    WMI_SET_BEACON_INT_CMDID,
-    WMI_GET_STATISTICS_CMDID,
-    WMI_SET_CHANNEL_PARAMS_CMDID,
-    WMI_SET_POWER_MODE_CMDID,
-    WMI_SET_IBSS_PM_CAPS_CMDID,
-    WMI_SET_POWER_PARAMS_CMDID,
-    WMI_SET_POWERSAVE_TIMERS_POLICY_CMDID,
-    WMI_ADD_CIPHER_KEY_CMDID,
-    WMI_DELETE_CIPHER_KEY_CMDID,
-    WMI_ADD_KRK_CMDID,
-    WMI_DELETE_KRK_CMDID,
-    WMI_SET_PMKID_CMDID,
-    WMI_SET_TX_PWR_CMDID,
-    WMI_GET_TX_PWR_CMDID,
-    WMI_SET_ASSOC_INFO_CMDID,
-    WMI_ADD_BAD_AP_CMDID,
-    WMI_DELETE_BAD_AP_CMDID,
-    WMI_SET_TKIP_COUNTERMEASURES_CMDID,
-    WMI_RSSI_THRESHOLD_PARAMS_CMDID,
-    WMI_TARGET_ERROR_REPORT_BITMASK_CMDID,
-    WMI_SET_ACCESS_PARAMS_CMDID,
-    WMI_SET_RETRY_LIMITS_CMDID,
-    WMI_SET_OPT_MODE_CMDID,
-    WMI_OPT_TX_FRAME_CMDID,
-    WMI_SET_VOICE_PKT_SIZE_CMDID,
-    WMI_SET_MAX_SP_LEN_CMDID,
-    WMI_SET_ROAM_CTRL_CMDID,
-    WMI_GET_ROAM_TBL_CMDID,
-    WMI_GET_ROAM_DATA_CMDID,
-    WMI_ENABLE_RM_CMDID,
-    WMI_SET_MAX_OFFHOME_DURATION_CMDID,
-    WMI_EXTENSION_CMDID,                        /* Non-wireless extensions */
-    WMI_SNR_THRESHOLD_PARAMS_CMDID,
-    WMI_LQ_THRESHOLD_PARAMS_CMDID,
-    WMI_SET_LPREAMBLE_CMDID,
-    WMI_SET_RTS_CMDID,
-    WMI_CLR_RSSI_SNR_CMDID,
-    WMI_SET_FIXRATES_CMDID,
-    WMI_GET_FIXRATES_CMDID,
-    WMI_SET_AUTH_MODE_CMDID,
-    WMI_SET_REASSOC_MODE_CMDID,
-    WMI_SET_WMM_CMDID,
-    WMI_SET_WMM_TXOP_CMDID,
-    WMI_TEST_CMDID,
-    WMI_SET_BT_STATUS_CMDID,
-    WMI_SET_BT_PARAMS_CMDID,
-
-    WMI_SET_KEEPALIVE_CMDID,
-    WMI_GET_KEEPALIVE_CMDID,
-    WMI_SET_APPIE_CMDID,
-    WMI_GET_APPIE_CMDID,
-    WMI_SET_WSC_STATUS_CMDID,
-
-    /* Wake on Wireless */
-    WMI_SET_HOST_SLEEP_MODE_CMDID,
-    WMI_SET_WOW_MODE_CMDID,
-    WMI_GET_WOW_LIST_CMDID,
-    WMI_ADD_WOW_PATTERN_CMDID,
-    WMI_DEL_WOW_PATTERN_CMDID,
-    WMI_SET_MAC_ADDRESS_CMDID,
-    WMI_SET_AKMP_PARAMS_CMDID,
-    WMI_SET_PMKID_LIST_CMDID,
-    WMI_GET_PMKID_LIST_CMDID,
-
-    /*
-     * Developer commands starts at 0xF000
-     */
-    WMI_SET_BITRATE_CMDID = 0xF000,
-    WMI_GET_BITRATE_CMDID,
-    WMI_SET_WHALPARAM_CMDID,
-
-} WMI_COMMAND_ID;
-
-/*
- * Frame Types
- */
-typedef enum {
-    WMI_FRAME_BEACON        =   0,
-    WMI_FRAME_PROBE_REQ,
-    WMI_FRAME_PROBE_RESP,
-    WMI_FRAME_ASSOC_REQ,
-    WMI_FRAME_ASSOC_RESP,
-    WMI_NUM_MGMT_FRAME
-} WMI_MGMT_FRAME_TYPE;
-
-/*
- * Connect Command
- */
-typedef enum {
-    INFRA_NETWORK       = 0x01,
-    ADHOC_NETWORK       = 0x02,
-    ADHOC_CREATOR       = 0x04,
-} NETWORK_TYPE;
-
-typedef enum {
-    OPEN_AUTH           = 0x01,
-    SHARED_AUTH         = 0x02,
-    LEAP_AUTH           = 0x04,  /* different from IEEE_AUTH_MODE definitions */
-} DOT11_AUTH_MODE;
-
-typedef enum {
-    NONE_AUTH           = 0x01,
-    WPA_AUTH            = 0x02,
-    WPA_PSK_AUTH        = 0x03,
-    WPA2_AUTH           = 0x04,
-    WPA2_PSK_AUTH       = 0x05,
-    WPA_AUTH_CCKM       = 0x06,
-    WPA2_AUTH_CCKM      = 0x07,
-} AUTH_MODE;
-
-typedef enum {
-    NONE_CRYPT          = 0x01,
-    WEP_CRYPT           = 0x02,
-    TKIP_CRYPT          = 0x03,
-    AES_CRYPT           = 0x04,
-} CRYPTO_TYPE;
-
-#define WMI_MIN_CRYPTO_TYPE NONE_CRYPT
-#define WMI_MAX_CRYPTO_TYPE (AES_CRYPT + 1)
-
-#define WMI_MIN_KEY_INDEX   0
-#define WMI_MAX_KEY_INDEX   3
-
-#define WMI_MAX_KEY_LEN     32
-
-#define WMI_MAX_SSID_LEN    32
-
-typedef enum {
-    CONNECT_ASSOC_POLICY_USER = 0x0001,
-    CONNECT_SEND_REASSOC = 0x0002,
-    CONNECT_IGNORE_WPAx_GROUP_CIPHER = 0x0004,
-    CONNECT_PROFILE_MATCH_DONE = 0x0008,
-    CONNECT_IGNORE_AAC_BEACON = 0x0010,
-    CONNECT_CSA_FOLLOW_BSS = 0x0020,
-} WMI_CONNECT_CTRL_FLAGS_BITS;
-
-#define DEFAULT_CONNECT_CTRL_FLAGS         (CONNECT_CSA_FOLLOW_BSS)
-
-typedef PREPACK struct {
-    A_UINT8     networkType;
-    A_UINT8     dot11AuthMode;
-    A_UINT8     authMode;
-    A_UINT8     pairwiseCryptoType;
-    A_UINT8     pairwiseCryptoLen;
-    A_UINT8     groupCryptoType;
-    A_UINT8     groupCryptoLen;
-    A_UINT8     ssidLength;
-    A_UCHAR     ssid[WMI_MAX_SSID_LEN];
-    A_UINT16    channel;
-    A_UINT8     bssid[ATH_MAC_LEN];
-    A_UINT32    ctrl_flags;
-} POSTPACK WMI_CONNECT_CMD;
-
-/*
- * WMI_RECONNECT_CMDID
- */
-typedef PREPACK struct {
-    A_UINT16    channel;                    /* hint */
-    A_UINT8     bssid[ATH_MAC_LEN];         /* mandatory if set */
-} POSTPACK WMI_RECONNECT_CMD;
-
-/*
- * WMI_ADD_CIPHER_KEY_CMDID
- */
-typedef enum {
-    PAIRWISE_USAGE      = 0x00,
-    GROUP_USAGE         = 0x01,
-    TX_USAGE            = 0x02,     /* default Tx Key - Static WEP only */
-} KEY_USAGE;
-
-/*
- * Bit Flag
- * Bit 0 - Initialise TSC - default is Initialize
- */
-#define KEY_OP_INIT_TSC       0x01
-#define KEY_OP_INIT_RSC       0x02
-
-#define KEY_OP_INIT_VAL     0x03     /* Default Initialise the TSC & RSC */
-#define KEY_OP_VALID_MASK   0x03
-
-typedef PREPACK struct {
-    A_UINT8     keyIndex;
-    A_UINT8     keyType;
-    A_UINT8     keyUsage;           /* KEY_USAGE */
-    A_UINT8     keyLength;
-    A_UINT8     keyRSC[8];          /* key replay sequence counter */
-    A_UINT8     key[WMI_MAX_KEY_LEN];
-    A_UINT8     key_op_ctrl;       /* Additional Key Control information */
-} POSTPACK WMI_ADD_CIPHER_KEY_CMD;
-
-/*
- * WMI_DELETE_CIPHER_KEY_CMDID
- */
-typedef PREPACK struct {
-    A_UINT8     keyIndex;
-} POSTPACK WMI_DELETE_CIPHER_KEY_CMD;
-
-#define WMI_KRK_LEN     16
-/*
- * WMI_ADD_KRK_CMDID
- */
-typedef PREPACK struct {
-    A_UINT8     krk[WMI_KRK_LEN];
-} POSTPACK WMI_ADD_KRK_CMD;
-
-/*
- * WMI_SET_TKIP_COUNTERMEASURES_CMDID
- */
-typedef enum {
-    WMI_TKIP_CM_DISABLE = 0x0,
-    WMI_TKIP_CM_ENABLE  = 0x1,
-} WMI_TKIP_CM_CONTROL;
-
-typedef PREPACK struct {
-    A_UINT8  cm_en;                     /* WMI_TKIP_CM_CONTROL */
-} POSTPACK WMI_SET_TKIP_COUNTERMEASURES_CMD;
-
-/*
- * WMI_SET_PMKID_CMDID
- */
-
-#define WMI_PMKID_LEN 16
-
-typedef enum {
-   PMKID_DISABLE = 0,
-   PMKID_ENABLE  = 1,
-} PMKID_ENABLE_FLG;
-
-typedef PREPACK struct {
-    A_UINT8     bssid[ATH_MAC_LEN];
-    A_UINT8     enable;                 /* PMKID_ENABLE_FLG */
-    A_UINT8     pmkid[WMI_PMKID_LEN];
-} POSTPACK WMI_SET_PMKID_CMD;
-
-/*
- * WMI_START_SCAN_CMD
- */
-typedef enum {
-    WMI_LONG_SCAN  = 0,
-    WMI_SHORT_SCAN = 1,
-} WMI_SCAN_TYPE;
-
-typedef PREPACK struct {
-    A_BOOL   forceFgScan;
-    A_BOOL   isLegacy;        /* For Legacy Cisco AP compatibility */
-    A_UINT32 homeDwellTime;   /* Maximum duration in the home channel(milliseconds) */
-    A_UINT32 forceScanInterval;    /* Time interval between scans (milliseconds)*/
-    A_UINT8  scanType;           /* WMI_SCAN_TYPE */
-} POSTPACK WMI_START_SCAN_CMD;
-
-/*
- * WMI_SET_SCAN_PARAMS_CMDID
- */
-#define WMI_SHORTSCANRATIO_DEFAULT      3
-typedef enum {
-    CONNECT_SCAN_CTRL_FLAGS = 0x01,    /* set if can scan in the Connect cmd */
-    SCAN_CONNECTED_CTRL_FLAGS = 0x02,  /* set if scan for the SSID it is */
-                                       /* already connected to */
-    ACTIVE_SCAN_CTRL_FLAGS = 0x04,     /* set if enable active scan */
-    ROAM_SCAN_CTRL_FLAGS = 0x08,       /* set if enable roam scan when bmiss and lowrssi */
-    REPORT_BSSINFO_CTRL_FLAGS = 0x10,   /* set if follows customer BSSINFO reporting rule */
-    ENABLE_AUTO_CTRL_FLAGS = 0x20,      /* if disabled, target doesn't
-                                          scan after a disconnect event  */
-    ENABLE_SCAN_ABORT_EVENT = 0x40      /* Scan complete event with canceled status will be generated when a scan is prempted before it gets completed */
-
-} WMI_SCAN_CTRL_FLAGS_BITS;
-
-#define CAN_SCAN_IN_CONNECT(flags)      (flags & CONNECT_SCAN_CTRL_FLAGS)
-#define CAN_SCAN_CONNECTED(flags)       (flags & SCAN_CONNECTED_CTRL_FLAGS)
-#define ENABLE_ACTIVE_SCAN(flags)       (flags & ACTIVE_SCAN_CTRL_FLAGS)
-#define ENABLE_ROAM_SCAN(flags)         (flags & ROAM_SCAN_CTRL_FLAGS)
-#define CONFIG_REPORT_BSSINFO(flags)     (flags & REPORT_BSSINFO_CTRL_FLAGS)
-#define IS_AUTO_SCAN_ENABLED(flags)      (flags & ENABLE_AUTO_CTRL_FLAGS)
-#define SCAN_ABORT_EVENT_ENABLED(flags) (flags & ENABLE_SCAN_ABORT_EVENT)
-
-#define DEFAULT_SCAN_CTRL_FLAGS         (CONNECT_SCAN_CTRL_FLAGS| SCAN_CONNECTED_CTRL_FLAGS| ACTIVE_SCAN_CTRL_FLAGS| ROAM_SCAN_CTRL_FLAGS | ENABLE_AUTO_CTRL_FLAGS)
-
-
-typedef PREPACK struct {
-    A_UINT16    fg_start_period;        /* seconds */
-    A_UINT16    fg_end_period;          /* seconds */
-    A_UINT16    bg_period;              /* seconds */
-    A_UINT16    maxact_chdwell_time;    /* msec */
-    A_UINT16    pas_chdwell_time;       /* msec */
-    A_UINT8     shortScanRatio;         /* how many shorts scan for one long */
-    A_UINT8     scanCtrlFlags;
-    A_UINT16    minact_chdwell_time;    /* msec */
-    A_UINT32    max_dfsch_act_time;  /* msecs */
-} POSTPACK WMI_SCAN_PARAMS_CMD;
-
-/*
- * WMI_SET_BSS_FILTER_CMDID
- */
-typedef enum {
-    NONE_BSS_FILTER = 0x0,              /* no beacons forwarded */
-    ALL_BSS_FILTER,                     /* all beacons forwarded */
-    PROFILE_FILTER,                     /* only beacons matching profile */
-    ALL_BUT_PROFILE_FILTER,             /* all but beacons matching profile */
-    CURRENT_BSS_FILTER,                 /* only beacons matching current BSS */
-    ALL_BUT_BSS_FILTER,                 /* all but beacons matching BSS */
-    PROBED_SSID_FILTER,                 /* beacons matching probed ssid */
-    LAST_BSS_FILTER,                    /* marker only */
-} WMI_BSS_FILTER;
-
-typedef PREPACK struct {
-    A_UINT8    bssFilter;                      /* see WMI_BSS_FILTER */
-    A_UINT32   ieMask;
-} POSTPACK WMI_BSS_FILTER_CMD;
-
-/*
- * WMI_SET_PROBED_SSID_CMDID
- */
-#define MAX_PROBED_SSID_INDEX   5
-
-typedef enum {
-    DISABLE_SSID_FLAG  = 0,                  /* disables entry */
-    SPECIFIC_SSID_FLAG = 0x01,               /* probes specified ssid */
-    ANY_SSID_FLAG      = 0x02,               /* probes for any ssid */
-} WMI_SSID_FLAG;
-
-typedef PREPACK struct {
-    A_UINT8     entryIndex;                     /* 0 to MAX_PROBED_SSID_INDEX */
-    A_UINT8     flag;                           /* WMI_SSID_FLG */
-    A_UINT8     ssidLength;
-    A_UINT8     ssid[32];
-} POSTPACK WMI_PROBED_SSID_CMD;
-
-/*
- * WMI_SET_LISTEN_INT_CMDID
- * The Listen interval is between 15 and 3000 TUs
- */
-#define MIN_LISTEN_INTERVAL 15
-#define MAX_LISTEN_INTERVAL 5000
-#define MIN_LISTEN_BEACONS 1
-#define MAX_LISTEN_BEACONS 50
-
-typedef PREPACK struct {
-    A_UINT16     listenInterval;
-    A_UINT16     numBeacons;
-} POSTPACK WMI_LISTEN_INT_CMD;
-
-/*
- * WMI_SET_BEACON_INT_CMDID
- */
-typedef PREPACK struct {
-    A_UINT16     beaconInterval;
-} POSTPACK WMI_BEACON_INT_CMD;
-
-/*
- * WMI_SET_BMISS_TIME_CMDID
- * valid values are between 1000 and 5000 TUs
- */
-
-#define MIN_BMISS_TIME     1000
-#define MAX_BMISS_TIME     5000
-#define MIN_BMISS_BEACONS  1
-#define MAX_BMISS_BEACONS  50
-
-typedef PREPACK struct {
-    A_UINT16     bmissTime;
-    A_UINT16     numBeacons;
-} POSTPACK WMI_BMISS_TIME_CMD;
-
-/*
- * WMI_SET_POWER_MODE_CMDID
- */
-typedef enum {
-    REC_POWER = 0x01,
-    MAX_PERF_POWER,
-} WMI_POWER_MODE;
-
-typedef PREPACK struct {
-    A_UINT8     powerMode;      /* WMI_POWER_MODE */
-} POSTPACK WMI_POWER_MODE_CMD;
-
-/*
- * WMI_SET_POWER_PARAMS_CMDID
- */
-typedef enum {
-    IGNORE_DTIM = 0x01,
-    NORMAL_DTIM = 0x02,
-    STICK_DTIM  = 0x03,
-} WMI_DTIM_POLICY;
-
-typedef PREPACK struct {
-    A_UINT16    idle_period;             /* msec */
-    A_UINT16    pspoll_number;
-    A_UINT16    dtim_policy;
-} POSTPACK WMI_POWER_PARAMS_CMD;
-
-typedef PREPACK struct {
-    A_UINT8    power_saving;
-    A_UINT8    ttl; /* number of beacon periods */
-    A_UINT16   atim_windows;          /* msec */
-    A_UINT16   timeout_value;         /* msec */
-} POSTPACK WMI_IBSS_PM_CAPS_CMD;
-
-/*
- * WMI_SET_POWERSAVE_TIMERS_POLICY_CMDID
- */
-typedef enum {
-    IGNORE_TIM_ALL_QUEUES_APSD = 0,
-    PROCESS_TIM_ALL_QUEUES_APSD = 1,
-    IGNORE_TIM_SIMULATED_APSD = 2,
-    PROCESS_TIM_SIMULATED_APSD = 3,
-} APSD_TIM_POLICY;
-
-typedef PREPACK struct {
-    A_UINT16    psPollTimeout;          /* msec */
-    A_UINT16    triggerTimeout;         /* msec */
-    A_UINT32    apsdTimPolicy;      /* TIM behavior with  ques APSD enabled. Default is IGNORE_TIM_ALL_QUEUES_APSD */
-    A_UINT32    simulatedAPSDTimPolicy;      /* TIM behavior with  simulated APSD enabled. Default is PROCESS_TIM_SIMULATED_APSD */
-} POSTPACK WMI_POWERSAVE_TIMERS_POLICY_CMD;
-
-/*
- * WMI_SET_VOICE_PKT_SIZE_CMDID
- */
-typedef PREPACK struct {
-    A_UINT16    voicePktSize;
-} POSTPACK WMI_SET_VOICE_PKT_SIZE_CMD;
-
-/*
- * WMI_SET_MAX_SP_LEN_CMDID
- */
-typedef enum {
-    DELIVER_ALL_PKT = 0x0,
-    DELIVER_2_PKT = 0x1,
-    DELIVER_4_PKT = 0x2,
-    DELIVER_6_PKT = 0x3,
-} APSD_SP_LEN_TYPE;
-
-typedef PREPACK struct {
-    A_UINT8    maxSPLen;
-} POSTPACK WMI_SET_MAX_SP_LEN_CMD;
-
-/*
- * WMI_SET_DISC_TIMEOUT_CMDID
- */
-typedef PREPACK struct {
-    A_UINT8     disconnectTimeout;          /* seconds */
-} POSTPACK WMI_DISC_TIMEOUT_CMD;
-
-typedef enum {
-    UPLINK_TRAFFIC = 0,
-    DNLINK_TRAFFIC = 1,
-    BIDIR_TRAFFIC = 2,
-} DIR_TYPE;
-
-typedef enum {
-    DISABLE_FOR_THIS_AC = 0,
-    ENABLE_FOR_THIS_AC  = 1,
-    ENABLE_FOR_ALL_AC   = 2,
-} VOICEPS_CAP_TYPE;
-
-typedef enum {
-    TRAFFIC_TYPE_APERIODIC = 0,
-    TRAFFIC_TYPE_PERIODIC = 1,
-}TRAFFIC_TYPE;
-
-/*
- * WMI_CREATE_PSTREAM_CMDID
- */
-typedef PREPACK struct {
-    A_UINT32        minServiceInt;           /* in milli-sec */
-    A_UINT32        maxServiceInt;           /* in milli-sec */
-    A_UINT32        inactivityInt;           /* in milli-sec */
-    A_UINT32        suspensionInt;           /* in milli-sec */
-    A_UINT32        serviceStartTime;
-    A_UINT32        minDataRate;             /* in bps */
-    A_UINT32        meanDataRate;            /* in bps */
-    A_UINT32        peakDataRate;            /* in bps */
-    A_UINT32        maxBurstSize;
-    A_UINT32        delayBound;
-    A_UINT32        minPhyRate;              /* in bps */
-    A_UINT32        sba;
-    A_UINT32        mediumTime;
-    A_UINT16        nominalMSDU;             /* in octects */
-    A_UINT16        maxMSDU;                 /* in octects */
-    A_UINT8         trafficClass;
-    A_UINT8         trafficType;             /* TRAFFIC_TYPE */
-    A_UINT8         trafficDirection;        /* TRAFFIC_DIR */
-    A_UINT8         voicePSCapability;       /* VOICEPS_CAP_TYPE */
-    A_UINT8         tsid;
-    A_UINT8         userPriority;            /* 802.1D user priority */
-} POSTPACK WMI_CREATE_PSTREAM_CMD;
-
-/*
- * WMI_DELETE_PSTREAM_CMDID
- */
-typedef PREPACK struct {
-    A_UINT8     trafficClass;
-    A_UINT8     tsid;
-} POSTPACK WMI_DELETE_PSTREAM_CMD;
-
-/*
- * WMI_SET_CHANNEL_PARAMS_CMDID
- */
-typedef enum {
-    WMI_11A_MODE  = 0x1,
-    WMI_11G_MODE  = 0x2,
-    WMI_11AG_MODE = 0x3,
-    WMI_11B_MODE  = 0x4,
-    WMI_11GONLY_MODE = 0x5,
-} WMI_PHY_MODE;
-
-#define WMI_MAX_CHANNELS        32
-
-typedef PREPACK struct {
-    A_UINT8     reserved1;
-    A_UINT8     scanParam;              /* set if enable scan */
-    A_UINT8     phyMode;                /* see WMI_PHY_MODE */
-    A_UINT8     numChannels;            /* how many channels follow */
-    A_UINT16    channelList[1];         /* channels in Mhz */
-} POSTPACK WMI_CHANNEL_PARAMS_CMD;
-
-
-/*
- *  WMI_RSSI_THRESHOLD_PARAMS_CMDID
- *  Setting the polltime to 0 would disable polling.
- *  Threshold values are in the ascending order, and should agree to:
- *  (lowThreshold_lowerVal < lowThreshold_upperVal < highThreshold_lowerVal
- *      < highThreshold_upperVal)
- */
-
-typedef PREPACK struct WMI_RSSI_THRESHOLD_PARAMS{
-    A_UINT32    pollTime;               /* Polling time as a factor of LI */
-    A_INT16     thresholdAbove1_Val;          /* lowest of upper */
-    A_INT16     thresholdAbove2_Val;
-    A_INT16     thresholdAbove3_Val;
-    A_INT16     thresholdAbove4_Val;
-    A_INT16     thresholdAbove5_Val;
-    A_INT16     thresholdAbove6_Val;          /* highest of upper */
-    A_INT16     thresholdBelow1_Val;         /* lowest of bellow */
-    A_INT16     thresholdBelow2_Val;
-    A_INT16     thresholdBelow3_Val;
-    A_INT16     thresholdBelow4_Val;
-    A_INT16     thresholdBelow5_Val;
-    A_INT16     thresholdBelow6_Val;         /* highest of bellow */
-    A_UINT8     weight;                  /* "alpha" */
-    A_UINT8     reserved[3];
-} POSTPACK  WMI_RSSI_THRESHOLD_PARAMS_CMD;
-
-/*
- *  WMI_SNR_THRESHOLD_PARAMS_CMDID
- *  Setting the polltime to 0 would disable polling.
- */
-
-typedef PREPACK struct WMI_SNR_THRESHOLD_PARAMS{
-    A_UINT32    pollTime;               /* Polling time as a factor of LI */
-    A_UINT8     weight;                  /* "alpha" */
-    A_UINT8     thresholdAbove1_Val;      /* lowest of uppper*/
-    A_UINT8     thresholdAbove2_Val;
-    A_UINT8     thresholdAbove3_Val;
-    A_UINT8     thresholdAbove4_Val;      /* highest of upper */
-    A_UINT8     thresholdBelow1_Val;     /* lowest of bellow */
-    A_UINT8     thresholdBelow2_Val;
-    A_UINT8     thresholdBelow3_Val;
-    A_UINT8     thresholdBelow4_Val;     /* highest of bellow */
-    A_UINT8     reserved[3];
-} POSTPACK WMI_SNR_THRESHOLD_PARAMS_CMD;
-
-/*
- *  WMI_LQ_THRESHOLD_PARAMS_CMDID
- */
-typedef PREPACK struct WMI_LQ_THRESHOLD_PARAMS {
-    A_UINT8     enable;
-    A_UINT8     thresholdAbove1_Val;
-    A_UINT8     thresholdAbove2_Val;
-    A_UINT8     thresholdAbove3_Val;
-    A_UINT8     thresholdAbove4_Val;
-    A_UINT8     thresholdBelow1_Val;
-    A_UINT8     thresholdBelow2_Val;
-    A_UINT8     thresholdBelow3_Val;
-    A_UINT8     thresholdBelow4_Val;
-    A_UINT8     reserved[3];
-} POSTPACK  WMI_LQ_THRESHOLD_PARAMS_CMD;
-
-typedef enum {
-    WMI_LPREAMBLE_DISABLED = 0,
-    WMI_LPREAMBLE_ENABLED
-} WMI_LPREAMBLE_STATUS;
-
-typedef PREPACK struct {
-    A_UINT8     status;
-}POSTPACK WMI_SET_LPREAMBLE_CMD;
-
-typedef PREPACK struct {
-    A_UINT16    threshold;
-}POSTPACK WMI_SET_RTS_CMD;
-
-/*
- *  WMI_TARGET_ERROR_REPORT_BITMASK_CMDID
- *  Sets the error reporting event bitmask in target. Target clears it
- *  upon an error. Subsequent errors are counted, but not reported
- *  via event, unless the bitmask is set again.
- */
-typedef PREPACK struct {
-    A_UINT32    bitmask;
-} POSTPACK  WMI_TARGET_ERROR_REPORT_BITMASK;
-
-/*
- * WMI_SET_TX_PWR_CMDID
- */
-typedef PREPACK struct {
-    A_UINT8     dbM;                  /* in dbM units */
-} POSTPACK WMI_SET_TX_PWR_CMD, WMI_TX_PWR_REPLY;
-
-/*
- * WMI_SET_ASSOC_INFO_CMDID
- *
- * A maximum of 2 private IEs can be sent in the [Re]Assoc request.
- * A 3rd one, the CCX version IE can also be set from the host.
- */
-#define WMI_MAX_ASSOC_INFO_TYPE    2
-#define WMI_CCX_VER_IE             2 /* ieType to set CCX Version IE */
-
-#define WMI_MAX_ASSOC_INFO_LEN     240
-
-typedef PREPACK struct {
-    A_UINT8     ieType;
-    A_UINT8     bufferSize;
-    A_UINT8     assocInfo[1];       /* up to WMI_MAX_ASSOC_INFO_LEN */
-} POSTPACK WMI_SET_ASSOC_INFO_CMD;
-
-
-/*
- * WMI_GET_TX_PWR_CMDID does not take any parameters
- */
-
-/*
- * WMI_ADD_BAD_AP_CMDID
- */
-#define WMI_MAX_BAD_AP_INDEX      1
-
-typedef PREPACK struct {
-    A_UINT8     badApIndex;         /* 0 to WMI_MAX_BAD_AP_INDEX */
-    A_UINT8     bssid[ATH_MAC_LEN];
-} POSTPACK WMI_ADD_BAD_AP_CMD;
-
-/*
- * WMI_DELETE_BAD_AP_CMDID
- */
-typedef PREPACK struct {
-    A_UINT8     badApIndex;         /* 0 to WMI_MAX_BAD_AP_INDEX */
-} POSTPACK WMI_DELETE_BAD_AP_CMD;
-
-/*
- * WMI_SET_ACCESS_PARAMS_CMDID
- */
-#define WMI_DEFAULT_TXOP_ACPARAM    0       /* implies one MSDU */
-#define WMI_DEFAULT_ECWMIN_ACPARAM  4       /* corresponds to CWmin of 15 */
-#define WMI_DEFAULT_ECWMAX_ACPARAM  10      /* corresponds to CWmax of 1023 */
-#define WMI_MAX_CW_ACPARAM          15      /* maximum eCWmin or eCWmax */
-#define WMI_DEFAULT_AIFSN_ACPARAM   2
-#define WMI_MAX_AIFSN_ACPARAM       15
-typedef PREPACK struct {
-    A_UINT16 txop;                      /* in units of 32 usec */
-    A_UINT8  eCWmin;
-    A_UINT8  eCWmax;
-    A_UINT8  aifsn;
-} POSTPACK WMI_SET_ACCESS_PARAMS_CMD;
-
-
-/*
- * WMI_SET_RETRY_LIMITS_CMDID
- *
- * This command is used to customize the number of retries the
- * wlan device will perform on a given frame.
- */
-#define WMI_MIN_RETRIES 2
-#define WMI_MAX_RETRIES 13
-typedef enum {
-    MGMT_FRAMETYPE    = 0,
-    CONTROL_FRAMETYPE = 1,
-    DATA_FRAMETYPE    = 2
-} WMI_FRAMETYPE;
-
-typedef PREPACK struct {
-    A_UINT8 frameType;                      /* WMI_FRAMETYPE */
-    A_UINT8 trafficClass;                   /* applies only to DATA_FRAMETYPE */
-    A_UINT8 maxRetries;
-    A_UINT8 enableNotify;
-} POSTPACK WMI_SET_RETRY_LIMITS_CMD;
-
-/*
- * WMI_SET_ROAM_CTRL_CMDID
- *
- * This command is used to influence the Roaming behaviour
- * Set the host biases of the BSSs before setting the roam mode as bias
- * based.
- */
-
-/*
- * Different types of Roam Control
- */
-
-typedef enum {
-        WMI_FORCE_ROAM          = 1,      /* Roam to the specified BSSID */
-        WMI_SET_ROAM_MODE       = 2,      /* default ,progd bias, no roam */
-        WMI_SET_HOST_BIAS       = 3,     /* Set the Host Bias */
-        WMI_SET_LOWRSSI_SCAN_PARAMS = 4, /* Set lowrssi Scan parameters */
-} WMI_ROAM_CTRL_TYPE;
-
-#define WMI_MIN_ROAM_CTRL_TYPE WMI_FORCE_ROAM
-#define WMI_MAX_ROAM_CTRL_TYPE WMI_SET_LOWRSSI_SCAN_PARAMS
-
-/*
- * ROAM MODES
- */
-
-typedef enum {
-        WMI_DEFAULT_ROAM_MODE   = 1,  /* RSSI based ROAM */
-        WMI_HOST_BIAS_ROAM_MODE = 2, /* HOST BIAS based ROAM */
-        WMI_LOCK_BSS_MODE  = 3  /* Lock to the Current BSS - no Roam */
-} WMI_ROAM_MODE;
-
-/*
- * BSS HOST BIAS INFO
- */
-
-typedef PREPACK struct {
-        A_UINT8 bssid[ATH_MAC_LEN];
-        A_INT8  bias;
-} POSTPACK WMI_BSS_BIAS;
-
-typedef PREPACK struct {
-        A_UINT8 numBss;
-        WMI_BSS_BIAS bssBias[1];
-} POSTPACK WMI_BSS_BIAS_INFO;
-
-typedef PREPACK struct WMI_LOWRSSI_SCAN_PARAMS {
-        A_UINT16 lowrssi_scan_period;
-        A_INT16  lowrssi_scan_threshold;
-        A_INT16  lowrssi_roam_threshold;
-        A_UINT8  roam_rssi_floor;
-        A_UINT8  reserved[1];              /* For alignment */
-} POSTPACK WMI_LOWRSSI_SCAN_PARAMS;
-
-typedef PREPACK struct {
-    PREPACK union {
-        A_UINT8 bssid[ATH_MAC_LEN]; /* WMI_FORCE_ROAM */
-        A_UINT8 roamMode;           /* WMI_SET_ROAM_MODE  */
-        WMI_BSS_BIAS_INFO bssBiasInfo; /* WMI_SET_HOST_BIAS */
-        WMI_LOWRSSI_SCAN_PARAMS lrScanParams;
-    } POSTPACK info;
-    A_UINT8   roamCtrlType ;
-} POSTPACK WMI_SET_ROAM_CTRL_CMD;
-
-/*
- * WMI_ENABLE_RM_CMDID
- */
-typedef PREPACK struct {
-        A_BOOL enable_radio_measurements;
-} POSTPACK WMI_ENABLE_RM_CMD;
-
-/*
- * WMI_SET_MAX_OFFHOME_DURATION_CMDID
- */
-typedef PREPACK struct {
-        A_UINT8 max_offhome_duration;
-} POSTPACK WMI_SET_MAX_OFFHOME_DURATION_CMD;
-
-typedef PREPACK struct {
-    A_UINT32 frequency;
-    A_UINT8  threshold;
-} POSTPACK WMI_SET_HB_CHALLENGE_RESP_PARAMS_CMD;
-
-typedef enum {
-    BT_STREAM_UNDEF = 0,
-    BT_STREAM_SCO,             /* SCO stream */
-    BT_STREAM_A2DP,            /* A2DP stream */
-    BT_STREAM_MAX
-} BT_STREAM_TYPE;
-
-typedef enum {
-    BT_PARAM_SCO = 1,         /* SCO stream parameters */
-    BT_PARAM_A2DP,            /* A2DP stream parameters */
-    BT_PARAM_MISC,            /* miscellaneous parameters */
-    BT_PARAM_REGS,            /* co-existence register parameters */
-    BT_PARAM_MAX
-} BT_PARAM_TYPE;
-
-typedef enum {
-    BT_STATUS_UNDEF = 0,
-    BT_STATUS_START,
-    BT_STATUS_STOP,
-    BT_STATUS_RESUME,
-    BT_STATUS_SUSPEND,
-    BT_STATUS_MAX
-} BT_STREAM_STATUS;
-
-typedef PREPACK struct {
-    A_UINT8 streamType;
-    A_UINT8 status;
-} POSTPACK WMI_SET_BT_STATUS_CMD;
-
-typedef PREPACK struct {
-    A_UINT8 noSCOPkts;
-    A_UINT8 pspollTimeout;
-    A_UINT8 stompbt;
-} POSTPACK BT_PARAMS_SCO;
-
-typedef PREPACK struct {
-    A_UINT32 period;
-    A_UINT32 dutycycle;
-    A_UINT8  stompbt;
-} POSTPACK BT_PARAMS_A2DP;
-
-typedef PREPACK struct {
-    A_UINT32 mode;
-    A_UINT32 scoWghts;
-    A_UINT32 a2dpWghts;
-    A_UINT32 genWghts;
-    A_UINT32 mode2;
-    A_UINT8  setVal;
-} POSTPACK BT_COEX_REGS;
-
-typedef enum {
-    WLAN_PROTECT_POLICY = 1,
-    WLAN_COEX_CTRL_FLAGS
-} BT_PARAMS_MISC_TYPE;
-
-typedef enum {
-    WLAN_PROTECT_PER_STREAM = 0x01,   /* default */
-    WLAN_PROTECT_ANY_TX = 0x02
-} WLAN_PROTECT_FLAGS;
-
-
-#define WLAN_DISABLE_COEX_IN_DISCONNECT   0x01 /* default */
-#define WLAN_KEEP_COEX_IN_DISCONNECT      0x02
-#define WLAN_STOMPBT_IN_DISCONNECT        0x04
-
-#define WLAN_DISABLE_COEX_IN_ROAM         0x10 /* default */
-#define WLAN_KEEP_COEX_IN_ROAM            0x20
-#define WLAN_STOMPBT_IN_ROAM              0x40
-
-#define WLAN_DISABLE_COEX_IN_SCAN        0x100 /* default */
-#define WLAN_KEEP_COEX_IN_SCAN           0x200
-#define WLAN_STOMPBT_IN_SCAN             0x400
-
-#define WLAN_DISABLE_COEX_BT_OFF        0x1000 /* default */
-#define WLAN_KEEP_COEX_BT_OFF           0x2000
-#define WLAN_STOMPBT_BT_OFF             0x4000
-
-typedef PREPACK struct {
-    A_UINT32 period;
-    A_UINT32 dutycycle;
-    A_UINT8  stompbt;
-    A_UINT8  policy;
-} POSTPACK WLAN_PROTECT_POLICY_TYPE;
-
-typedef PREPACK struct {
-    PREPACK union {
-        WLAN_PROTECT_POLICY_TYPE protectParams;
-        A_UINT16 wlanCtrlFlags;
-    } POSTPACK info;
-    A_UINT8 paramType;
-} POSTPACK BT_PARAMS_MISC;
-
-typedef PREPACK struct {
-    PREPACK union {
-        BT_PARAMS_SCO scoParams;
-        BT_PARAMS_A2DP a2dpParams;
-        BT_PARAMS_MISC miscParams;
-        BT_COEX_REGS regs;
-    } POSTPACK info;
-    A_UINT8 paramType;
-} POSTPACK WMI_SET_BT_PARAMS_CMD;
-
-/*
- * Command Replies
- */
-
-/*
- * WMI_GET_CHANNEL_LIST_CMDID reply
- */
-typedef PREPACK struct {
-    A_UINT8     reserved1;
-    A_UINT8     numChannels;            /* number of channels in reply */
-    A_UINT16    channelList[1];         /* channel in Mhz */
-} POSTPACK WMI_CHANNEL_LIST_REPLY;
-
-typedef enum {
-    A_SUCCEEDED = A_OK,
-    A_FAILED_DELETE_STREAM_DOESNOT_EXIST=250,
-    A_SUCCEEDED_MODIFY_STREAM=251,
-    A_FAILED_INVALID_STREAM = 252,
-    A_FAILED_MAX_THINSTREAMS = 253,
-    A_FAILED_CREATE_REMOVE_PSTREAM_FIRST = 254,
-} PSTREAM_REPLY_STATUS;
-
-/*
- * List of Events (target to host)
- */
-typedef enum {
-    WMI_READY_EVENTID           = 0x1001,
-    WMI_CONNECT_EVENTID,
-    WMI_DISCONNECT_EVENTID,
-    WMI_BSSINFO_EVENTID,
-    WMI_CMDERROR_EVENTID,
-    WMI_REGDOMAIN_EVENTID,
-    WMI_PSTREAM_TIMEOUT_EVENTID,
-    WMI_NEIGHBOR_REPORT_EVENTID,
-    WMI_TKIP_MICERR_EVENTID,
-    WMI_SCAN_COMPLETE_EVENTID,
-    WMI_REPORT_STATISTICS_EVENTID,
-    WMI_RSSI_THRESHOLD_EVENTID,
-    WMI_ERROR_REPORT_EVENTID,
-    WMI_OPT_RX_FRAME_EVENTID,
-    WMI_REPORT_ROAM_TBL_EVENTID,
-    WMI_EXTENSION_EVENTID,
-    WMI_CAC_EVENTID,
-    WMI_SNR_THRESHOLD_EVENTID,
-    WMI_LQ_THRESHOLD_EVENTID,
-    WMI_TX_RETRY_ERR_EVENTID,
-    WMI_REPORT_ROAM_DATA_EVENTID,
-    WMI_TEST_EVENTID,
-    WMI_APLIST_EVENTID,
-    WMI_GET_WOW_LIST_EVENTID,
-    WMI_GET_PMKID_LIST_EVENTID
-} WMI_EVENT_ID;
-
-typedef enum {
-    WMI_11A_CAPABILITY   = 1,
-    WMI_11G_CAPABILITY   = 2,
-    WMI_11AG_CAPABILITY  = 3,
-} WMI_PHY_CAPABILITY;
-
-typedef PREPACK struct {
-    A_UINT8     macaddr[ATH_MAC_LEN];
-    A_UINT8     phyCapability;              /* WMI_PHY_CAPABILITY */
-} POSTPACK WMI_READY_EVENT;
-
-/*
- * Connect Event
- */
-typedef PREPACK struct {
-    A_UINT16    channel;
-    A_UINT8     bssid[ATH_MAC_LEN];
-    A_UINT16    listenInterval;
-    A_UINT16    beaconInterval;
-    A_UINT32    networkType;
-    A_UINT8     beaconIeLen;
-    A_UINT8     assocReqLen;
-    A_UINT8     assocRespLen;
-    A_UINT8     assocInfo[1];
-} POSTPACK WMI_CONNECT_EVENT;
-
-/*
- * Disconnect Event
- */
-typedef enum {
-    NO_NETWORK_AVAIL   = 0x01,
-    LOST_LINK          = 0x02,     /* bmiss */
-    DISCONNECT_CMD     = 0x03,
-    BSS_DISCONNECTED   = 0x04,
-    AUTH_FAILED        = 0x05,
-    ASSOC_FAILED       = 0x06,
-    NO_RESOURCES_AVAIL = 0x07,
-    CSERV_DISCONNECT   = 0x08,
-    INVALID_PROFILE    = 0x0a,
-    DOT11H_CHANNEL_SWITCH = 0x0b,
-} WMI_DISCONNECT_REASON;
-
-typedef PREPACK struct {
-    A_UINT16    protocolReasonStatus;  /* reason code, see 802.11 spec. */
-    A_UINT8     bssid[ATH_MAC_LEN];    /* set if known */
-    A_UINT8     disconnectReason ;      /* see WMI_DISCONNECT_REASON */
-    A_UINT8     assocRespLen;
-    A_UINT8     assocInfo[1];
-} POSTPACK WMI_DISCONNECT_EVENT;
-
-/*
- * BSS Info Event.
- * Mechanism used to inform host of the presence and characteristic of
- * wireless networks present.  Consists of bss info header followed by
- * the beacon or probe-response frame body.  The 802.11 header is not included.
- */
-typedef enum {
-    BEACON_FTYPE = 0x1,
-    PROBERESP_FTYPE,
-    ACTION_MGMT_FTYPE,
-} WMI_BI_FTYPE;
-
-enum {
-    BSS_ELEMID_CHANSWITCH = 0x01,
-    BSS_ELEMID_ATHEROS = 0x02,
-};
-
-typedef PREPACK struct {
-    A_UINT16    channel;
-    A_UINT8     frameType;          /* see WMI_BI_FTYPE */
-    A_UINT8     snr;
-    A_INT16     rssi;
-    A_UINT8     bssid[ATH_MAC_LEN];
-    A_UINT32    ieMask;
-} POSTPACK WMI_BSS_INFO_HDR;
-
-/*
- * Command Error Event
- */
-typedef enum {
-    INVALID_PARAM  = 0x01,
-    ILLEGAL_STATE  = 0x02,
-    INTERNAL_ERROR = 0x03,
-} WMI_ERROR_CODE;
-
-typedef PREPACK struct {
-    A_UINT16    commandId;
-    A_UINT8     errorCode;
-} POSTPACK WMI_CMD_ERROR_EVENT;
-
-/*
- * New Regulatory Domain Event
- */
-typedef PREPACK struct {
-    A_UINT32    regDomain;
-} POSTPACK WMI_REG_DOMAIN_EVENT;
-
-typedef PREPACK struct {
-    A_UINT8     trafficClass;
-} POSTPACK WMI_PSTREAM_TIMEOUT_EVENT;
-
-/*
- * The WMI_NEIGHBOR_REPORT Event is generated by the target to inform
- * the host of BSS's it has found that matches the current profile.
- * It can be used by the host to cache PMKs and/to initiate pre-authentication
- * if the BSS supports it.  The first bssid is always the current associated
- * BSS.
- * The bssid and bssFlags information repeats according to the number
- * or APs reported.
- */
-typedef enum {
-    WMI_DEFAULT_BSS_FLAGS   = 0x00,
-    WMI_PREAUTH_CAPABLE_BSS = 0x01,
-    WMI_PMKID_VALID_BSS     = 0x02,
-} WMI_BSS_FLAGS;
-
-typedef PREPACK struct {
-    A_UINT8     bssid[ATH_MAC_LEN];
-    A_UINT8     bssFlags;            /* see WMI_BSS_FLAGS */
-} POSTPACK WMI_NEIGHBOR_INFO;
-
-typedef PREPACK struct {
-    A_INT8      numberOfAps;
-    WMI_NEIGHBOR_INFO neighbor[1];
-} POSTPACK WMI_NEIGHBOR_REPORT_EVENT;
-
-/*
- * TKIP MIC Error Event
- */
-typedef PREPACK struct {
-    A_UINT8 keyid;
-    A_UINT8 ismcast;
-} POSTPACK WMI_TKIP_MICERR_EVENT;
-
-/*
- * WMI_SCAN_COMPLETE_EVENTID - no parameters (old), staus parameter (new)
- */
-typedef PREPACK struct {
-    A_STATUS status;
-} POSTPACK WMI_SCAN_COMPLETE_EVENT;
-
-#define MAX_OPT_DATA_LEN 1400
-
-/*
- * WMI_SET_ADHOC_BSSID_CMDID
- */
-typedef PREPACK struct {
-    A_UINT8     bssid[ATH_MAC_LEN];
-} POSTPACK WMI_SET_ADHOC_BSSID_CMD;
-
-/*
- * WMI_SET_OPT_MODE_CMDID
- */
-typedef enum {
-    SPECIAL_OFF,
-    SPECIAL_ON,
-} OPT_MODE_TYPE;
-
-typedef PREPACK struct {
-    A_UINT8     optMode;
-} POSTPACK WMI_SET_OPT_MODE_CMD;
-
-/*
- * WMI_TX_OPT_FRAME_CMDID
- */
-typedef enum {
-    OPT_PROBE_REQ   = 0x01,
-    OPT_PROBE_RESP  = 0x02,
-    OPT_CPPP_START  = 0x03,
-    OPT_CPPP_STOP   = 0x04,
-} WMI_OPT_FTYPE;
-
-typedef PREPACK struct {
-    A_UINT16    optIEDataLen;
-    A_UINT8     frmType;
-    A_UINT8     dstAddr[ATH_MAC_LEN];
-    A_UINT8     bssid[ATH_MAC_LEN];
-    A_UINT8     reserved;               /* For alignment */
-    A_UINT8     optIEData[1];
-} POSTPACK WMI_OPT_TX_FRAME_CMD;
-
-/*
- * Special frame receive Event.
- * Mechanism used to inform host of the receiption of the special frames.
- * Consists of special frame info header followed by special frame body.
- * The 802.11 header is not included.
- */
-typedef PREPACK struct {
-    A_UINT16    channel;
-    A_UINT8     frameType;          /* see WMI_OPT_FTYPE */
-    A_INT8      snr;
-    A_UINT8     srcAddr[ATH_MAC_LEN];
-    A_UINT8     bssid[ATH_MAC_LEN];
-} POSTPACK WMI_OPT_RX_INFO_HDR;
-
-/*
- * Reporting statistics.
- */
-typedef PREPACK struct {
-    A_UINT32   tx_packets;
-    A_UINT32   tx_bytes;
-    A_UINT32   tx_unicast_pkts;
-    A_UINT32   tx_unicast_bytes;
-    A_UINT32   tx_multicast_pkts;
-    A_UINT32   tx_multicast_bytes;
-    A_UINT32   tx_broadcast_pkts;
-    A_UINT32   tx_broadcast_bytes;
-    A_UINT32   tx_rts_success_cnt;
-    A_UINT32   tx_packet_per_ac[4];
-    A_UINT32   tx_errors_per_ac[4];
-
-    A_UINT32   tx_errors;
-    A_UINT32   tx_failed_cnt;
-    A_UINT32   tx_retry_cnt;
-    A_UINT32   tx_rts_fail_cnt;
-    A_INT32    tx_unicast_rate;
-}POSTPACK tx_stats_t;
-
-typedef PREPACK struct {
-    A_UINT32   rx_packets;
-    A_UINT32   rx_bytes;
-    A_UINT32   rx_unicast_pkts;
-    A_UINT32   rx_unicast_bytes;
-    A_UINT32   rx_multicast_pkts;
-    A_UINT32   rx_multicast_bytes;
-    A_UINT32   rx_broadcast_pkts;
-    A_UINT32   rx_broadcast_bytes;
-    A_UINT32   rx_fragment_pkt;
-
-    A_UINT32   rx_errors;
-    A_UINT32   rx_crcerr;
-    A_UINT32   rx_key_cache_miss;
-    A_UINT32   rx_decrypt_err;
-    A_UINT32   rx_duplicate_frames;
-    A_INT32    rx_unicast_rate;
-}POSTPACK rx_stats_t;
-
-typedef PREPACK struct {
-    A_UINT32   tkip_local_mic_failure;
-    A_UINT32   tkip_counter_measures_invoked;
-    A_UINT32   tkip_replays;
-    A_UINT32   tkip_format_errors;
-    A_UINT32   ccmp_format_errors;
-    A_UINT32   ccmp_replays;
-}POSTPACK tkip_ccmp_stats_t;
-
-typedef PREPACK struct {
-    A_UINT32   power_save_failure_cnt;
-}POSTPACK pm_stats_t;
-
-typedef PREPACK struct {
-    A_UINT32    cs_bmiss_cnt;
-    A_UINT32    cs_lowRssi_cnt;
-    A_UINT16    cs_connect_cnt;
-    A_UINT16    cs_disconnect_cnt;
-    A_INT16     cs_aveBeacon_rssi;
-    A_UINT16    cs_roam_count;
-    A_UINT16    cs_rssi;
-    A_UINT8     cs_snr;
-    A_UINT8     cs_aveBeacon_snr;
-    A_UINT8     cs_lastRoam_msec;
-} POSTPACK cserv_stats_t;
-
-typedef PREPACK struct {
-    tx_stats_t          tx_stats;
-    rx_stats_t          rx_stats;
-    tkip_ccmp_stats_t   tkipCcmpStats;
-}POSTPACK wlan_net_stats_t;
-
-typedef PREPACK struct {
-    A_UINT32    wow_num_pkts_dropped;
-    A_UINT16    wow_num_events_discarded;
-    A_UINT8     wow_num_host_pkt_wakeups;
-    A_UINT8     wow_num_host_event_wakeups;
-} POSTPACK wlan_wow_stats_t;
-
-typedef PREPACK struct {
-    A_UINT32            lqVal;
-    A_INT32             noise_floor_calibation;
-    pm_stats_t          pmStats;
-    wlan_net_stats_t    txrxStats;
-    wlan_wow_stats_t    wowStats;
-    cserv_stats_t       cservStats;
-} POSTPACK WMI_TARGET_STATS;
-
-/*
- * WMI_RSSI_THRESHOLD_EVENTID.
- * Indicate the RSSI events to host. Events are indicated when we breach a
- * thresold value.
- */
-typedef enum{
-    WMI_RSSI_THRESHOLD1_ABOVE = 0,
-    WMI_RSSI_THRESHOLD2_ABOVE,
-    WMI_RSSI_THRESHOLD3_ABOVE,
-    WMI_RSSI_THRESHOLD4_ABOVE,
-    WMI_RSSI_THRESHOLD5_ABOVE,
-    WMI_RSSI_THRESHOLD6_ABOVE,
-    WMI_RSSI_THRESHOLD1_BELOW,
-    WMI_RSSI_THRESHOLD2_BELOW,
-    WMI_RSSI_THRESHOLD3_BELOW,
-    WMI_RSSI_THRESHOLD4_BELOW,
-    WMI_RSSI_THRESHOLD5_BELOW,
-    WMI_RSSI_THRESHOLD6_BELOW
-}WMI_RSSI_THRESHOLD_VAL;
-
-typedef PREPACK struct {
-    A_INT16 rssi;
-    A_UINT8 range;
-}POSTPACK WMI_RSSI_THRESHOLD_EVENT;
-
-/*
- *  WMI_ERROR_REPORT_EVENTID
- */
-typedef enum{
-    WMI_TARGET_PM_ERR_FAIL      = 0x00000001,
-    WMI_TARGET_KEY_NOT_FOUND    = 0x00000002,
-    WMI_TARGET_DECRYPTION_ERR   = 0x00000004,
-    WMI_TARGET_BMISS            = 0x00000008,
-    WMI_PSDISABLE_NODE_JOIN     = 0x00000010,
-    WMI_TARGET_COM_ERR          = 0x00000020,
-    WMI_TARGET_FATAL_ERR        = 0x00000040
-} WMI_TARGET_ERROR_VAL;
-
-typedef PREPACK struct {
-    A_UINT32 errorVal;
-}POSTPACK  WMI_TARGET_ERROR_REPORT_EVENT;
-
-typedef PREPACK struct {
-    A_UINT8 retrys;
-}POSTPACK  WMI_TX_RETRY_ERR_EVENT;
-
-typedef enum{
-    WMI_SNR_THRESHOLD1_ABOVE = 1,
-    WMI_SNR_THRESHOLD1_BELOW,
-    WMI_SNR_THRESHOLD2_ABOVE,
-    WMI_SNR_THRESHOLD2_BELOW,
-    WMI_SNR_THRESHOLD3_ABOVE,
-    WMI_SNR_THRESHOLD3_BELOW,
-    WMI_SNR_THRESHOLD4_ABOVE,
-    WMI_SNR_THRESHOLD4_BELOW
-} WMI_SNR_THRESHOLD_VAL;
-
-typedef PREPACK struct {
-    A_UINT8 range;  /* WMI_SNR_THRESHOLD_VAL */
-    A_UINT8 snr;
-}POSTPACK  WMI_SNR_THRESHOLD_EVENT;
-
-typedef enum{
-    WMI_LQ_THRESHOLD1_ABOVE = 1,
-    WMI_LQ_THRESHOLD1_BELOW,
-    WMI_LQ_THRESHOLD2_ABOVE,
-    WMI_LQ_THRESHOLD2_BELOW,
-    WMI_LQ_THRESHOLD3_ABOVE,
-    WMI_LQ_THRESHOLD3_BELOW,
-    WMI_LQ_THRESHOLD4_ABOVE,
-    WMI_LQ_THRESHOLD4_BELOW
-} WMI_LQ_THRESHOLD_VAL;
-
-typedef PREPACK struct {
-    A_INT32 lq;
-    A_UINT8 range;  /* WMI_LQ_THRESHOLD_VAL */
-}POSTPACK  WMI_LQ_THRESHOLD_EVENT;
-/*
- * WMI_REPORT_ROAM_TBL_EVENTID
- */
-#define MAX_ROAM_TBL_CAND   5
-
-typedef PREPACK struct {
-    A_INT32 roam_util;
-    A_UINT8 bssid[ATH_MAC_LEN];
-    A_INT8  rssi;
-    A_INT8  rssidt;
-    A_INT8  last_rssi;
-    A_INT8  util;
-    A_INT8  bias;
-    A_UINT8 reserved; /* For alignment */
-} POSTPACK WMI_BSS_ROAM_INFO;
-
-
-typedef PREPACK struct {
-    A_UINT16  roamMode;
-    A_UINT16  numEntries;
-    WMI_BSS_ROAM_INFO bssRoamInfo[1];
-} POSTPACK WMI_TARGET_ROAM_TBL;
-
-/*
- *  WMI_CAC_EVENTID
- */
-typedef enum {
-    CAC_INDICATION_ADMISSION = 0x00,
-    CAC_INDICATION_ADMISSION_RESP = 0x01,
-    CAC_INDICATION_DELETE = 0x02,
-    CAC_INDICATION_NO_RESP = 0x03,
-}CAC_INDICATION;
-
-#define WMM_TSPEC_IE_LEN   63
-
-typedef PREPACK struct {
-    A_UINT8 ac;
-    A_UINT8 cac_indication;
-    A_UINT8 statusCode;
-    A_UINT8 tspecSuggestion[WMM_TSPEC_IE_LEN];
-}POSTPACK  WMI_CAC_EVENT;
-
-/*
- * WMI_APLIST_EVENTID
- */
-
-typedef enum {
-    APLIST_VER1 = 1,
-} APLIST_VER;
-
-typedef PREPACK struct {
-    A_UINT8     bssid[ATH_MAC_LEN];
-    A_UINT16    channel;
-} POSTPACK  WMI_AP_INFO_V1;
-
-typedef PREPACK union {
-    WMI_AP_INFO_V1  apInfoV1;
-} POSTPACK WMI_AP_INFO;
-
-typedef PREPACK struct {
-    A_UINT8     apListVer;
-    A_UINT8     numAP;
-    WMI_AP_INFO apList[1];
-} POSTPACK WMI_APLIST_EVENT;
-
-/*
- * developer commands
- */
-
-/*
- * WMI_SET_BITRATE_CMDID
- *
- * Get bit rate cmd uses same definition as set bit rate cmd
- */
-typedef enum {
-    RATE_AUTO   = -1,
-    RATE_1Mb    = 0,
-    RATE_2Mb    = 1,
-    RATE_5_5Mb  = 2,
-    RATE_11Mb   = 3,
-    RATE_6Mb    = 4,
-    RATE_9Mb    = 5,
-    RATE_12Mb   = 6,
-    RATE_18Mb   = 7,
-    RATE_24Mb   = 8,
-    RATE_36Mb   = 9,
-    RATE_48Mb   = 10,
-    RATE_54Mb   = 11,
-} WMI_BIT_RATE;
-
-typedef PREPACK struct {
-    A_INT8      rateIndex;          /* see WMI_BIT_RATE */
-} POSTPACK WMI_BIT_RATE_CMD, WMI_BIT_RATE_REPLY;
-
-/*
- * WMI_SET_FIXRATES_CMDID
- *
- * Get fix rates cmd uses same definition as set fix rates cmd
- */
-typedef enum {
-    FIX_RATE_1Mb    = 0x1,
-    FIX_RATE_2Mb    = 0x2,
-    FIX_RATE_5_5Mb  = 0x4,
-    FIX_RATE_11Mb   = 0x8,
-    FIX_RATE_6Mb    = 0x10,
-    FIX_RATE_9Mb    = 0x20,
-    FIX_RATE_12Mb   = 0x40,
-    FIX_RATE_18Mb   = 0x80,
-    FIX_RATE_24Mb   = 0x100,
-    FIX_RATE_36Mb   = 0x200,
-    FIX_RATE_48Mb   = 0x400,
-    FIX_RATE_54Mb   = 0x800,
-} WMI_FIX_RATES_MASK;
-
-typedef PREPACK struct {
-    A_UINT16      fixRateMask;          /* see WMI_BIT_RATE */
-} POSTPACK WMI_FIX_RATES_CMD, WMI_FIX_RATES_REPLY;
-
-/*
- * WMI_SET_RECONNECT_AUTH_MODE_CMDID
- *
- * Set authentication mode
- */
-typedef enum {
-    RECONN_DO_AUTH = 0x00,
-    RECONN_NOT_AUTH = 0x01
-} WMI_AUTH_MODE;
-
-typedef PREPACK struct {
-    A_UINT8 mode;
-} POSTPACK WMI_SET_AUTH_MODE_CMD;
-
-/*
- * WMI_SET_REASSOC_MODE_CMDID
- *
- * Set authentication mode
- */
-typedef enum {
-    REASSOC_DO_DISASSOC = 0x00,
-    REASSOC_DONOT_DISASSOC = 0x01
-} WMI_REASSOC_MODE;
-
-typedef PREPACK struct {
-    A_UINT8 mode;
-}POSTPACK WMI_SET_REASSOC_MODE_CMD;
-
-typedef enum {
-    ROAM_DATA_TIME = 1,            /* Get The Roam Time Data */
-} ROAM_DATA_TYPE;
-
-typedef PREPACK struct {
-    A_UINT32        disassoc_time;
-    A_UINT32        no_txrx_time;
-    A_UINT32        assoc_time;
-    A_UINT32        allow_txrx_time;
-    A_UINT32        last_data_txrx_time;
-    A_UINT32        first_data_txrx_time;
-    A_UINT8         disassoc_bssid[ATH_MAC_LEN];
-    A_INT8          disassoc_bss_rssi;
-    A_UINT8         assoc_bssid[ATH_MAC_LEN];
-    A_INT8          assoc_bss_rssi;
-} POSTPACK WMI_TARGET_ROAM_TIME;
-
-typedef PREPACK struct {
-    PREPACK union {
-        WMI_TARGET_ROAM_TIME roamTime;
-    } POSTPACK u;
-    A_UINT8 roamDataType ;
-} POSTPACK WMI_TARGET_ROAM_DATA;
-
-typedef enum {
-    WMI_WMM_DISABLED = 0,
-    WMI_WMM_ENABLED
-} WMI_WMM_STATUS;
-
-typedef PREPACK struct {
-    A_UINT8    status;
-}POSTPACK WMI_SET_WMM_CMD;
-
-typedef enum {
-    WMI_TXOP_DISABLED = 0,
-    WMI_TXOP_ENABLED
-} WMI_TXOP_CFG;
-
-typedef PREPACK struct {
-    A_UINT8    txopEnable;
-}POSTPACK WMI_SET_WMM_TXOP_CMD;
-
-typedef PREPACK struct {
-    A_UINT8 keepaliveInterval;
-} POSTPACK WMI_SET_KEEPALIVE_CMD;
-
-typedef PREPACK struct {
-    A_BOOL configured;
-    A_UINT8 keepaliveInterval;
-} POSTPACK WMI_GET_KEEPALIVE_CMD;
-
-/*
- * Add Application specified IE to a management frame
- */
-#define WMI_MAX_IE_LEN  78
-
-typedef PREPACK struct {
-    A_UINT8 mgmtFrmType;  /* one of WMI_MGMT_FRAME_TYPE */
-    A_UINT8 ieLen;    /* Length  of the IE that should be added to the MGMT frame */
-    A_UINT8 ieInfo[1];
-} POSTPACK WMI_SET_APPIE_CMD;
-
-/*
- * Notify the WSC registration status to the target
- */
-#define WSC_REG_ACTIVE     1
-#define WSC_REG_INACTIVE   0
-/* Generic Hal Interface for setting hal paramters. */
-/* Add new Set HAL Param cmdIds here for newer params */
-typedef enum {
-   WHAL_SETCABTO_CMDID = 1,
-}WHAL_CMDID;
-
-typedef PREPACK struct {
-    A_UINT8 cabTimeOut;
-} POSTPACK WHAL_SETCABTO_PARAM;
-
-typedef PREPACK struct {
-    A_UINT8  whalCmdId;
-    A_UINT8 data[1];
-} POSTPACK WHAL_PARAMCMD;
-
-
-#define WOW_MAX_FILTER_LISTS 1 /*4*/
-#define WOW_MAX_FILTERS_PER_LIST 4
-#define WOW_PATTERN_SIZE 64
-#define WOW_MASK_SIZE 64
-
-typedef PREPACK struct {
-    A_UINT8 wow_valid_filter;
-    A_UINT8 wow_filter_id;
-    A_UINT8 wow_filter_size;
-    A_UINT8 wow_filter_offset;
-    A_UINT8 wow_filter_mask[WOW_MASK_SIZE];
-    A_UINT8 wow_filter_pattern[WOW_PATTERN_SIZE];
-} POSTPACK WOW_FILTER;
-
-
-typedef PREPACK struct {
-    A_UINT8 wow_valid_list;
-    A_UINT8 wow_list_id;
-    A_UINT8 wow_num_filters;
-    A_UINT8 wow_total_list_size;
-    WOW_FILTER list[WOW_MAX_FILTERS_PER_LIST];
-} POSTPACK WOW_FILTER_LIST;
-
-typedef PREPACK struct {
-    A_BOOL awake;
-    A_BOOL asleep;
-} POSTPACK WMI_SET_HOST_SLEEP_MODE_CMD;
-
-typedef PREPACK struct {
-    A_BOOL enable_wow;
-} POSTPACK WMI_SET_WOW_MODE_CMD;
-
-typedef PREPACK struct {
-    A_UINT8 filter_list_id;
-} POSTPACK WMI_GET_WOW_LIST_CMD;
-
-/*
- * WMI_GET_WOW_LIST_CMD reply
- */
-typedef PREPACK struct {
-    A_UINT8     num_filters;     /* number of patterns in reply */
-    A_UINT8     this_filter_num; /*  this is filter # x of total num_filters */
-    A_UINT8     wow_mode;
-    A_UINT8     host_mode;
-    WOW_FILTER  wow_filters[1];
-} POSTPACK WMI_GET_WOW_LIST_REPLY;
-
-typedef PREPACK struct {
-    A_UINT8 filter_list_id;
-    A_UINT8 filter_size;
-    A_UINT8 filter_offset;
-    A_UINT8 filter[1];
-} POSTPACK WMI_ADD_WOW_PATTERN_CMD;
-
-typedef PREPACK struct {
-    A_UINT16 filter_list_id;
-    A_UINT16 filter_id;
-} POSTPACK WMI_DEL_WOW_PATTERN_CMD;
-
-typedef PREPACK struct {
-    A_UINT8 macaddr[ATH_MAC_LEN];
-} POSTPACK WMI_SET_MAC_ADDRESS_CMD;
-
-/*
- * WMI_SET_AKMP_PARAMS_CMD
- */
-
-#define WMI_AKMP_MULTI_PMKID_EN   0x000001
-
-typedef PREPACK struct {
-    A_UINT32    akmpInfo;
-} POSTPACK WMI_SET_AKMP_PARAMS_CMD;
-
-typedef PREPACK struct {
-    A_UINT8 pmkid[WMI_PMKID_LEN];
-} POSTPACK WMI_PMKID;
-
-/*
- * WMI_SET_PMKID_LIST_CMD
- */
-#define WMI_MAX_PMKID_CACHE   8
-
-typedef PREPACK struct {
-    A_UINT32    numPMKID;
-    WMI_PMKID   pmkidList[WMI_MAX_PMKID_CACHE];
-} POSTPACK WMI_SET_PMKID_LIST_CMD;
-
-/*
- * WMI_GET_PMKID_LIST_CMD  Reply
- * Following the Number of PMKIDs is the list of PMKIDs
- */
-typedef PREPACK struct {
-    A_UINT32    numPMKID;
-    WMI_PMKID   pmkidList[1];
-} POSTPACK WMI_PMKID_LIST_REPLY;
-
-/* index used for priority streams */
-typedef enum {
-    WMI_NOT_MAPPED  = -1,
-    WMI_CONTROL_PRI = 0,
-    WMI_BEST_EFFORT_PRI = 1,
-    WMI_LOW_PRI = 2,
-    WMI_HIGH_PRI = 3,
-    WMI_HIGHEST_PRI,
-    WMI_PRI_MAX_COUNT
-} WMI_PRI_STREAM_ID;
-
-#ifndef ATH_TARGET
-#include "athendpack.h"
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _WMI_H_ */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/wmi_api.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/wmi_api.h
deleted file mode 100644
index 267edfd0a..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/wmi_api.h
+++ /dev/null
@@ -1,260 +0,0 @@
-#ifndef _WMI_API_H_
-#define _WMI_API_H_
-/*
- * Copyright (c) 2004-2006 Atheros Communications Inc.
- * All rights reserved.
- *
- * This file contains the definitions for the Wireless Module Interface (WMI).
- *
- * $Id: //depot/sw/releases/olca2.0-GPL/host/include/wmi_api.h#2 $
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * IP QoS Field definitions according to 802.1p
- */
-#define BEST_EFFORT_PRI         0
-#define BACKGROUND_PRI          1
-#define EXCELLENT_EFFORT_PRI    3
-#define CONTROLLED_LOAD_PRI     4
-#define VIDEO_PRI               5
-#define VOICE_PRI               6
-#define NETWORK_CONTROL_PRI     7
-#define MAX_NUM_PRI             8
-
-#define UNDEFINED_PRI           (0xff)
-
-/* simple mapping of IP TOS field to a WMI priority stream
- * this mapping was taken from the original linux driver implementation
- * The operation maps the following
- *
- *  */
-#define IP_TOS_TO_WMI_PRI(tos)  \
-    ((WMI_PRI_STREAM_ID)(((tos) >> 1) & 0x03))
-
-#define WMI_IMPLICIT_PSTREAM_INACTIVITY_INT 5000 /* 5 seconds */
-
-
-struct wmi_t;
-
-void *wmi_init(void *devt);
-
-void wmi_qos_state_init(struct wmi_t *wmip);
-void wmi_shutdown(struct wmi_t *wmip);
-A_UINT16  wmi_get_mapped_qos_queue(struct wmi_t *, A_UINT8);
-A_STATUS wmi_dix_2_dot3(struct wmi_t *wmip, void *osbuf);
-A_STATUS wmi_data_hdr_add(struct wmi_t *wmip, void *osbuf, A_UINT8 msgType);
-A_STATUS wmi_dot3_2_dix(struct wmi_t *wmip, void *osbuf);
-A_STATUS wmi_data_hdr_remove(struct wmi_t *wmip, void *osbuf);
-A_STATUS wmi_syncpoint(struct wmi_t *wmip);
-A_STATUS wmi_syncpoint_reset(struct wmi_t *wmip);
-WMI_PRI_STREAM_ID wmi_get_stream_id(struct wmi_t *wmip, A_UINT8 trafficClass);
-A_UINT8 wmi_implicit_create_pstream(struct wmi_t *wmip, void *osbuf, A_UINT8 dir, A_UINT8 up);
-
-A_STATUS wmi_control_rx(struct wmi_t *wmip, void *osbuf);
-void wmi_iterate_nodes(struct wmi_t *wmip, wlan_node_iter_func *f, void *arg);
-void wmi_free_allnodes(struct wmi_t *wmip);
-bss_t *wmi_find_node(struct wmi_t *wmip, const A_UINT8 *macaddr);
-
-
-typedef enum {
-    NO_SYNC_WMIFLAG = 0,
-    SYNC_BEFORE_WMIFLAG,            /* transmit all queued data before cmd */
-    SYNC_AFTER_WMIFLAG,             /* any new data waits until cmd execs */
-    SYNC_BOTH_WMIFLAG,
-    END_WMIFLAG                     /* end marker */
-} WMI_SYNC_FLAG;
-
-A_STATUS wmi_cmd_send(struct wmi_t *wmip, void *osbuf, WMI_COMMAND_ID cmdId,
-                      WMI_SYNC_FLAG flag);
-A_STATUS wmi_connect_cmd(struct wmi_t *wmip,
-                         NETWORK_TYPE netType,
-                         DOT11_AUTH_MODE dot11AuthMode,
-                         AUTH_MODE authMode,
-                         CRYPTO_TYPE pairwiseCrypto,
-                         A_UINT8 pairwiseCryptoLen,
-                         CRYPTO_TYPE groupCrypto,
-                         A_UINT8 groupCryptoLen,
-                         int ssidLength,
-                         A_UCHAR *ssid,
-                         A_UINT8 *bssid,
-                         A_UINT16 channel,
-                         A_UINT32 ctrl_flags);
-A_STATUS wmi_reconnect_cmd(struct wmi_t *wmip,
-                           A_UINT8 *bssid,
-                           A_UINT16 channel);
-A_STATUS wmi_disconnect_cmd(struct wmi_t *wmip);
-A_STATUS wmi_getrev_cmd(struct wmi_t *wmip);
-A_STATUS wmi_startscan_cmd(struct wmi_t *wmip, WMI_SCAN_TYPE scanType,
-                           A_BOOL forceFgScan, A_BOOL isLegacy,
-                           A_UINT32 homeDwellTime, A_UINT32 forceScanInterval);
-A_STATUS wmi_scanparams_cmd(struct wmi_t *wmip, A_UINT16 fg_start_sec,
-                            A_UINT16 fg_end_sec, A_UINT16 bg_sec,
-                            A_UINT16 minact_chdw_msec,
-                            A_UINT16 maxact_chdw_msec, A_UINT16 pas_chdw_msec,
-                            A_UINT8 shScanRatio, A_UINT8 scanCtrlFlags,
-                            A_UINT32 max_dfsch_act_time);
-A_STATUS wmi_bssfilter_cmd(struct wmi_t *wmip, A_UINT8 filter, A_UINT32 ieMask);
-A_STATUS wmi_probedSsid_cmd(struct wmi_t *wmip, A_UINT8 index, A_UINT8 flag,
-                            A_UINT8 ssidLength, A_UCHAR *ssid);
-A_STATUS wmi_listeninterval_cmd(struct wmi_t *wmip, A_UINT16 listenInterval, A_UINT16 listenBeacons);
-A_STATUS wmi_bmisstime_cmd(struct wmi_t *wmip, A_UINT16 bmisstime, A_UINT16 bmissbeacons);
-A_STATUS wmi_associnfo_cmd(struct wmi_t *wmip, A_UINT8 ieType,
-                           A_UINT8 ieLen, A_UINT8 *ieInfo);
-A_STATUS wmi_powermode_cmd(struct wmi_t *wmip, A_UINT8 powerMode);
-A_STATUS wmi_ibsspmcaps_cmd(struct wmi_t *wmip, A_UINT8 pmEnable, A_UINT8 ttl,
-                            A_UINT16 atim_windows, A_UINT16 timeout_value);
-A_STATUS wmi_pmparams_cmd(struct wmi_t *wmip, A_UINT16 idlePeriod,
-                           A_UINT16 psPollNum, A_UINT16 dtimPolicy);
-A_STATUS wmi_disctimeout_cmd(struct wmi_t *wmip, A_UINT8 timeout);
-A_STATUS wmi_sync_cmd(struct wmi_t *wmip, A_UINT8 syncNumber);
-A_STATUS wmi_create_pstream_cmd(struct wmi_t *wmip, WMI_CREATE_PSTREAM_CMD *pstream);
-A_STATUS wmi_delete_pstream_cmd(struct wmi_t *wmip, A_UINT8 trafficClass, A_UINT8 streamID);
-A_STATUS wmi_set_bitrate_cmd(struct wmi_t *wmip, A_INT32 rate);
-A_STATUS wmi_get_bitrate_cmd(struct wmi_t *wmip);
-A_INT8   wmi_validate_bitrate(struct wmi_t *wmip, A_INT32 rate);
-A_STATUS wmi_get_regDomain_cmd(struct wmi_t *wmip);
-A_STATUS wmi_get_channelList_cmd(struct wmi_t *wmip);
-A_STATUS wmi_set_channelParams_cmd(struct wmi_t *wmip, A_UINT8 scanParam,
-                                   WMI_PHY_MODE mode, A_INT8 numChan,
-                                   A_UINT16 *channelList);
-
-A_STATUS wmi_set_snr_threshold_params(struct wmi_t *wmip,
-                                       WMI_SNR_THRESHOLD_PARAMS_CMD *snrCmd);
-A_STATUS wmi_set_rssi_threshold_params(struct wmi_t *wmip,
-                                        WMI_RSSI_THRESHOLD_PARAMS_CMD *rssiCmd);
-A_STATUS wmi_clr_rssi_snr(struct wmi_t *wmip);
-A_STATUS wmi_set_lq_threshold_params(struct wmi_t *wmip,
-                                      WMI_LQ_THRESHOLD_PARAMS_CMD *lqCmd);
-A_STATUS wmi_set_rts_cmd(struct wmi_t *wmip, A_UINT16 threshold);
-A_STATUS wmi_set_lpreamble_cmd(struct wmi_t *wmip, A_UINT8 status);
-
-A_STATUS wmi_set_error_report_bitmask(struct wmi_t *wmip, A_UINT32 bitmask);
-
-A_STATUS wmi_get_challenge_resp_cmd(struct wmi_t *wmip, A_UINT32 cookie,
-                                    A_UINT32 source);
-A_STATUS wmi_config_debug_module_cmd(struct wmi_t *wmip, A_UINT16 mmask,
-                                     A_UINT16 tsr, A_BOOL rep, A_UINT16 size,
-                                     A_UINT32 valid);
-A_STATUS wmi_get_stats_cmd(struct wmi_t *wmip);
-A_STATUS wmi_addKey_cmd(struct wmi_t *wmip, A_UINT8 keyIndex,
-                        CRYPTO_TYPE keyType, A_UINT8 keyUsage,
-                        A_UINT8 keyLength,A_UINT8 *keyRSC,
-                        A_UINT8 *keyMaterial, A_UINT8 key_op_ctrl,
-                        WMI_SYNC_FLAG sync_flag);
-A_STATUS wmi_add_krk_cmd(struct wmi_t *wmip, A_UINT8 *krk);
-A_STATUS wmi_delete_krk_cmd(struct wmi_t *wmip);
-A_STATUS wmi_deleteKey_cmd(struct wmi_t *wmip, A_UINT8 keyIndex);
-A_STATUS wmi_set_akmp_params_cmd(struct wmi_t *wmip,
-                                 WMI_SET_AKMP_PARAMS_CMD *akmpParams);
-A_STATUS wmi_get_pmkid_list_cmd(struct wmi_t *wmip);
-A_STATUS wmi_set_pmkid_list_cmd(struct wmi_t *wmip,
-                                WMI_SET_PMKID_LIST_CMD *pmkInfo);
-A_STATUS wmi_set_txPwr_cmd(struct wmi_t *wmip, A_UINT8 dbM);
-A_STATUS wmi_get_txPwr_cmd(struct wmi_t *wmip);
-A_STATUS wmi_switch_radio(struct wmi_t *wmip, A_UINT8 on);
-A_STATUS wmi_addBadAp_cmd(struct wmi_t *wmip, A_UINT8 apIndex, A_UINT8 *bssid);
-A_STATUS wmi_deleteBadAp_cmd(struct wmi_t *wmip, A_UINT8 apIndex);
-A_STATUS wmi_set_tkip_countermeasures_cmd(struct wmi_t *wmip, A_BOOL en);
-A_STATUS wmi_setPmkid_cmd(struct wmi_t *wmip, A_UINT8 *bssid, A_UINT8 *pmkId,
-                          A_BOOL set);
-A_STATUS wmi_set_access_params_cmd(struct wmi_t *wmip, A_UINT16 txop,
-                                   A_UINT8 eCWmin, A_UINT8 eCWmax,
-                                   A_UINT8 aifsn);
-A_STATUS wmi_set_retry_limits_cmd(struct wmi_t *wmip, A_UINT8 frameType,
-                                  A_UINT8 trafficClass, A_UINT8 maxRetries,
-                                  A_UINT8 enableNotify);
-
-void wmi_get_current_bssid(struct wmi_t *wmip, A_UINT8 *bssid);
-
-A_STATUS wmi_get_roam_tbl_cmd(struct wmi_t *wmip);
-A_STATUS wmi_get_roam_data_cmd(struct wmi_t *wmip, A_UINT8 roamDataType);
-A_STATUS wmi_set_roam_ctrl_cmd(struct wmi_t *wmip, WMI_SET_ROAM_CTRL_CMD *p,
-                               A_UINT8 size);
-A_STATUS wmi_set_powersave_timers_cmd(struct wmi_t *wmip,
-                            WMI_POWERSAVE_TIMERS_POLICY_CMD *pCmd,
-                            A_UINT8 size);
-
-A_STATUS wmi_set_opt_mode_cmd(struct wmi_t *wmip, A_UINT8 optMode);
-A_STATUS wmi_opt_tx_frame_cmd(struct wmi_t *wmip,
-                              A_UINT8 frmType,
-                              A_UINT8 *dstMacAddr,
-                              A_UINT8 *bssid,
-                              A_UINT16 optIEDataLen,
-                              A_UINT8 *optIEData);
-
-A_STATUS wmi_set_adhoc_bconIntvl_cmd(struct wmi_t *wmip, A_UINT16 intvl);
-A_STATUS wmi_set_voice_pkt_size_cmd(struct wmi_t *wmip, A_UINT16 voicePktSize);
-A_STATUS wmi_set_max_sp_len_cmd(struct wmi_t *wmip, A_UINT8 maxSpLen);
-A_UINT8  convert_userPriority_to_trafficClass(A_UINT8 userPriority);
-A_UINT8 wmi_get_power_mode_cmd(struct wmi_t *wmip);
-A_STATUS wmi_verify_tspec_params(WMI_CREATE_PSTREAM_CMD *pCmd, A_BOOL tspecCompliance);
-
-#ifdef CONFIG_HOST_TCMD_SUPPORT
-A_STATUS wmi_test_cmd(struct wmi_t *wmip, A_UINT8 *buf, A_UINT32  len);
-#endif
-
-A_STATUS wmi_set_bt_status_cmd(struct wmi_t *wmip, A_UINT8 streamType, A_UINT8 status);
-A_STATUS wmi_set_bt_params_cmd(struct wmi_t *wmip, WMI_SET_BT_PARAMS_CMD* cmd);
-
-
-/*
- *  This function is used to configure the fix rates mask to the target.
- */
-A_STATUS wmi_set_fixrates_cmd(struct wmi_t *wmip, A_INT16 fixRatesMask);
-A_STATUS wmi_get_ratemask_cmd(struct wmi_t *wmip);
-
-A_STATUS wmi_set_authmode_cmd(struct wmi_t *wmip, A_UINT8 mode);
-
-A_STATUS wmi_set_reassocmode_cmd(struct wmi_t *wmip, A_UINT8 mode);
-
-A_STATUS wmi_set_wmm_cmd(struct wmi_t *wmip, WMI_WMM_STATUS status);
-A_STATUS wmi_set_wmm_txop(struct wmi_t *wmip, WMI_TXOP_CFG txEnable);
-
-A_STATUS wmi_get_keepalive_configured(struct wmi_t *wmip);
-A_UINT8 wmi_get_keepalive_cmd(struct wmi_t *wmip);
-A_STATUS wmi_set_keepalive_cmd(struct wmi_t *wmip, A_UINT8 keepaliveInterval);
-
-A_STATUS wmi_set_appie_cmd(struct wmi_t *wmip, A_UINT8 mgmtFrmType,
-                           A_UINT8 ieLen,A_UINT8 *ieInfo);
-
-A_STATUS wmi_set_halparam_cmd(struct wmi_t *wmip, A_UINT8 *cmd, A_UINT16 dataLen);
-A_INT32 wmi_get_rate(A_INT8 rateindex);
-
-/*Wake on Wireless WMI commands*/
-A_STATUS wmi_set_host_sleep_mode_cmd(struct wmi_t *wmip, WMI_SET_HOST_SLEEP_MODE_CMD *cmd);
-A_STATUS wmi_set_wow_mode_cmd(struct wmi_t *wmip, WMI_SET_WOW_MODE_CMD *cmd);
-A_STATUS wmi_get_wow_list_cmd(struct wmi_t *wmip, WMI_GET_WOW_LIST_CMD *cmd);
-A_STATUS wmi_add_wow_pattern_cmd(struct wmi_t *wmip,
-                                 WMI_ADD_WOW_PATTERN_CMD *cmd, A_UINT8* pattern, A_UINT8* mask, A_UINT8 pattern_size);
-A_STATUS wmi_del_wow_pattern_cmd(struct wmi_t *wmip,
-                                 WMI_DEL_WOW_PATTERN_CMD *cmd);
-A_STATUS wmi_set_wsc_status_cmd(struct wmi_t *wmip, A_UINT32 status);
-
-bss_t *
-wmi_find_Ssidnode (struct wmi_t *wmip, A_UCHAR *pSsid,
-				   A_UINT32 ssidLength, A_BOOL bIsWPA2);
-
-void
-wmi_node_return (struct wmi_t *wmip, bss_t *bss);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _WMI_API_H_ */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/wmix.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/wmix.h
deleted file mode 100644
index 8f12b5e55..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/include/wmix.h
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Copyright (c) 2004-2005 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- * $ATH_LICENSE_HOSTSDK0_C$
- *
- * This file contains extensions of the WMI protocol specified in the
- * Wireless Module Interface (WMI).  It includes definitions of all
- * extended commands and events.  Extensions include useful commands
- * that are not directly related to wireless activities.  They may
- * be hardware-specific, and they might not be supported on all
- * implementations.
- *
- * Extended WMIX commands are encapsulated in a WMI message with
- * cmd=WMI_EXTENSION_CMD.
- *
- */
-
-#ifndef _WMIX_H_
-#define _WMIX_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef ATH_TARGET
-#include "athstartpack.h"
-#endif
-
-#include "dbglog.h"
-
-/*
- * Extended WMI commands are those that are needed during wireless
- * operation, but which are not really wireless commands.  This allows,
- * for instance, platform-specific commands.  Extended WMI commands are
- * embedded in a WMI command message with WMI_COMMAND_ID=WMI_EXTENSION_CMDID.
- * Extended WMI events are similarly embedded in a WMI event message with
- * WMI_EVENT_ID=WMI_EXTENSION_EVENTID.
- */
-typedef PREPACK struct {
-    A_UINT32    commandId;
-} POSTPACK WMIX_CMD_HDR;
-
-typedef enum {
-    WMIX_DSETOPEN_REPLY_CMDID           = 0x2001,
-    WMIX_DSETDATA_REPLY_CMDID,
-    WMIX_GPIO_OUTPUT_SET_CMDID,
-    WMIX_GPIO_INPUT_GET_CMDID,
-    WMIX_GPIO_REGISTER_SET_CMDID,
-    WMIX_GPIO_REGISTER_GET_CMDID,
-    WMIX_GPIO_INTR_ACK_CMDID,
-    WMIX_HB_CHALLENGE_RESP_CMDID,
-    WMIX_DBGLOG_CFG_MODULE_CMDID,
-} WMIX_COMMAND_ID;
-
-typedef enum {
-    WMIX_DSETOPENREQ_EVENTID            = 0x3001,
-    WMIX_DSETCLOSE_EVENTID,
-    WMIX_DSETDATAREQ_EVENTID,
-    WMIX_GPIO_INTR_EVENTID,
-    WMIX_GPIO_DATA_EVENTID,
-    WMIX_GPIO_ACK_EVENTID,
-    WMIX_HB_CHALLENGE_RESP_EVENTID,
-    WMIX_DBGLOG_EVENTID,
-} WMIX_EVENT_ID;
-
-/*
- * =============DataSet support=================
- */
-
-/*
- * WMIX_DSETOPENREQ_EVENTID
- * DataSet Open Request Event
- */
-typedef PREPACK struct {
-    A_UINT32 dset_id;
-    A_UINT32 targ_dset_handle;  /* echo'ed, not used by Host, */
-    A_UINT32 targ_reply_fn;     /* echo'ed, not used by Host, */
-    A_UINT32 targ_reply_arg;    /* echo'ed, not used by Host, */
-} POSTPACK WMIX_DSETOPENREQ_EVENT;
-
-/*
- * WMIX_DSETCLOSE_EVENTID
- * DataSet Close Event
- */
-typedef PREPACK struct {
-    A_UINT32 access_cookie;
-} POSTPACK WMIX_DSETCLOSE_EVENT;
-
-/*
- * WMIX_DSETDATAREQ_EVENTID
- * DataSet Data Request Event
- */
-typedef PREPACK struct {
-    A_UINT32 access_cookie;
-    A_UINT32 offset;
-    A_UINT32 length;
-    A_UINT32 targ_buf;         /* echo'ed, not used by Host, */
-    A_UINT32 targ_reply_fn;    /* echo'ed, not used by Host, */
-    A_UINT32 targ_reply_arg;   /* echo'ed, not used by Host, */
-} POSTPACK WMIX_DSETDATAREQ_EVENT;
-
-typedef PREPACK struct {
-    A_UINT32              status;
-    A_UINT32              targ_dset_handle;
-    A_UINT32              targ_reply_fn;
-    A_UINT32              targ_reply_arg;
-    A_UINT32              access_cookie;
-    A_UINT32              size;
-    A_UINT32              version;
-} POSTPACK WMIX_DSETOPEN_REPLY_CMD;
-
-typedef PREPACK struct {
-    A_UINT32              status;
-    A_UINT32              targ_buf;
-    A_UINT32              targ_reply_fn;
-    A_UINT32              targ_reply_arg;
-    A_UINT32              length;
-    A_UINT8               buf[1];
-} POSTPACK WMIX_DSETDATA_REPLY_CMD;
-
-
-/*
- * =============GPIO support=================
- * All masks are 18-bit masks with bit N operating on GPIO pin N.
- */
-
-#include "gpio.h"
-
-/*
- * Set GPIO pin output state.
- * In order for output to be driven, a pin must be enabled for output.
- * This can be done during initialization through the GPIO Configuration
- * DataSet, or during operation with the enable_mask.
- *
- * If a request is made to simultaneously set/clear or set/disable or
- * clear/disable or disable/enable, results are undefined.
- */
-typedef PREPACK struct {
-    A_UINT32              set_mask;             /* pins to set */
-    A_UINT32              clear_mask;           /* pins to clear */
-    A_UINT32              enable_mask;          /* pins to enable for output */
-    A_UINT32              disable_mask;         /* pins to disable/tristate */
-} POSTPACK WMIX_GPIO_OUTPUT_SET_CMD;
-
-/*
- * Set a GPIO register.  For debug/exceptional cases.
- * Values for gpioreg_id are GPIO_REGISTER_IDs, defined in a
- * platform-dependent header.
- */
-typedef PREPACK struct {
-    A_UINT32              gpioreg_id;           /* GPIO register ID */
-    A_UINT32              value;                /* value to write */
-} POSTPACK WMIX_GPIO_REGISTER_SET_CMD;
-
-/* Get a GPIO register.  For debug/exceptional cases. */
-typedef PREPACK struct {
-    A_UINT32              gpioreg_id;           /* GPIO register to read */
-} POSTPACK WMIX_GPIO_REGISTER_GET_CMD;
-
-/*
- * Host acknowledges and re-arms GPIO interrupts.  A single
- * message should be used to acknowledge all interrupts that
- * were delivered in an earlier WMIX_GPIO_INTR_EVENT message.
- */
-typedef PREPACK struct {
-    A_UINT32              ack_mask;             /* interrupts to acknowledge */
-} POSTPACK WMIX_GPIO_INTR_ACK_CMD;
-
-/*
- * Target informs Host of GPIO interrupts that have ocurred since the
- * last WMIX_GIPO_INTR_ACK_CMD was received.  Additional information --
- * the current GPIO input values is provided -- in order to support
- * use of a GPIO interrupt as a Data Valid signal for other GPIO pins.
- */
-typedef PREPACK struct {
-    A_UINT32              intr_mask;            /* pending GPIO interrupts */
-    A_UINT32              input_values;         /* recent GPIO input values */
-} POSTPACK WMIX_GPIO_INTR_EVENT;
-
-/*
- * Target responds to Host's earlier WMIX_GPIO_INPUT_GET_CMDID request
- * using a GPIO_DATA_EVENT with
- *   value set to the mask of GPIO pin inputs and
- *   reg_id set to GPIO_ID_NONE
- *
- *
- * Target responds to Hosts's earlier WMIX_GPIO_REGISTER_GET_CMDID request
- * using a GPIO_DATA_EVENT with
- *   value set to the value of the requested register and
- *   reg_id identifying the register (reflects the original request)
- * NB: reg_id supports the future possibility of unsolicited
- * WMIX_GPIO_DATA_EVENTs (for polling GPIO input), and it may
- * simplify Host GPIO support.
- */
-typedef PREPACK struct {
-    A_UINT32              value;
-    A_UINT32              reg_id;
-} POSTPACK WMIX_GPIO_DATA_EVENT;
-
-/*
- * =============Error Detection support=================
- */
-
-/*
- * WMIX_HB_CHALLENGE_RESP_CMDID
- * Heartbeat Challenge Response command
- */
-typedef PREPACK struct {
-    A_UINT32              cookie;
-    A_UINT32              source;
-} POSTPACK WMIX_HB_CHALLENGE_RESP_CMD;
-
-/*
- * WMIX_HB_CHALLENGE_RESP_EVENTID
- * Heartbeat Challenge Response Event
- */
-#define WMIX_HB_CHALLENGE_RESP_EVENT WMIX_HB_CHALLENGE_RESP_CMD
-
-typedef PREPACK struct {
-    struct dbglog_config_s config;
-} POSTPACK WMIX_DBGLOG_CFG_MODULE_CMD;
-
-#ifndef ATH_TARGET
-#include "athendpack.h"
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _WMIX_H_ */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/miscdrv/common_drv.c b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/miscdrv/common_drv.c
deleted file mode 100644
index 4f1273466..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/miscdrv/common_drv.c
+++ /dev/null
@@ -1,467 +0,0 @@
-
-/*
- *
- * Copyright (c) 2004-2007 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#include "a_config.h"
-#include "athdefs.h"
-#include "a_types.h"
-#include "AR6Khwreg.h"
-#include "targaddrs.h"
-#include "a_osapi.h"
-#include "hif.h"
-#include "htc_api.h"
-#include "bmi.h"
-#include "bmi_msg.h"
-#include "common_drv.h"
-#include "a_debug.h"
-#include "targaddrs.h"
-
-#define HOST_INTEREST_ITEM_ADDRESS(target, item)    \
-(((TargetType) == TARGET_TYPE_AR6001) ?     \
-   AR6001_HOST_INTEREST_ITEM_ADDRESS(item) :    \
-   AR6002_HOST_INTEREST_ITEM_ADDRESS(item))
-
-
-/* Compile the 4BYTE version of the window register setup routine,
- * This mitigates host interconnect issues with non-4byte aligned bus requests, some
- * interconnects use bus adapters that impose strict limitations.
- * Since diag window access is not intended for performance critical operations, the 4byte mode should
- * be satisfactory even though it generates 4X the bus activity. */
-
-#ifdef USE_4BYTE_REGISTER_ACCESS
-
-    /* set the window address register (using 4-byte register access ). */
-A_STATUS ar6000_SetAddressWindowRegister(HIF_DEVICE *hifDevice, A_UINT32 RegisterAddr, A_UINT32 Address)
-{
-    A_STATUS status;
-    A_UINT8 addrValue[4];
-    int i;
-
-        /* write bytes 1,2,3 of the register to set the upper address bytes, the LSB is written
-         * last to initiate the access cycle */
-
-    for (i = 1; i <= 3; i++) {
-            /* fill the buffer with the address byte value we want to hit 4 times*/
-        addrValue[0] = ((A_UINT8 *)&Address)[i];
-        addrValue[1] = addrValue[0];
-        addrValue[2] = addrValue[0];
-        addrValue[3] = addrValue[0];
-
-            /* hit each byte of the register address with a 4-byte write operation to the same address,
-             * this is a harmless operation */
-        status = HIFReadWrite(hifDevice,
-                              RegisterAddr+i,
-                              addrValue,
-                              4,
-                              HIF_WR_SYNC_BYTE_FIX,
-                              NULL);
-        if (status != A_OK) {
-            break;
-        }
-    }
-
-    if (status != A_OK) {
-        AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Cannot write initial bytes of 0x%x to window reg: 0x%X \n",
-             RegisterAddr, Address));
-        return status;
-    }
-
-        /* write the address register again, this time write the whole 4-byte value.
-         * The effect here is that the LSB write causes the cycle to start, the extra
-         * 3 byte write to bytes 1,2,3 has no effect since we are writing the same values again */
-    status = HIFReadWrite(hifDevice,
-                          RegisterAddr,
-                          (A_UCHAR *)(&Address),
-                          4,
-                          HIF_WR_SYNC_BYTE_INC,
-                          NULL);
-
-    if (status != A_OK) {
-        AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Cannot write 0x%x to window reg: 0x%X \n",
-            RegisterAddr, Address));
-        return status;
-    }
-
-    return A_OK;
-
-
-
-}
-
-
-#else
-
-    /* set the window address register */
-A_STATUS ar6000_SetAddressWindowRegister(HIF_DEVICE *hifDevice, A_UINT32 RegisterAddr, A_UINT32 Address)
-{
-    A_STATUS status;
-
-        /* write bytes 1,2,3 of the register to set the upper address bytes, the LSB is written
-         * last to initiate the access cycle */
-    status = HIFReadWrite(hifDevice,
-                          RegisterAddr+1,  /* write upper 3 bytes */
-                          ((A_UCHAR *)(&Address))+1,
-                          sizeof(A_UINT32)-1,
-                          HIF_WR_SYNC_BYTE_INC,
-                          NULL);
-
-    if (status != A_OK) {
-        AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Cannot write initial bytes of 0x%x to window reg: 0x%X \n",
-             RegisterAddr, Address));
-        return status;
-    }
-
-        /* write the LSB of the register, this initiates the operation */
-    status = HIFReadWrite(hifDevice,
-                          RegisterAddr,
-                          (A_UCHAR *)(&Address),
-                          sizeof(A_UINT8),
-                          HIF_WR_SYNC_BYTE_INC,
-                          NULL);
-
-    if (status != A_OK) {
-        AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Cannot write 0x%x to window reg: 0x%X \n",
-            RegisterAddr, Address));
-        return status;
-    }
-
-    return A_OK;
-}
-
-#endif
-
-/*
- * Read from the AR6000 through its diagnostic window.
- * No cooperation from the Target is required for this.
- */
-A_STATUS
-ar6000_ReadRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data)
-{
-    A_STATUS status;
-
-        /* set window register to start read cycle */
-    status = ar6000_SetAddressWindowRegister(hifDevice,
-                                             WINDOW_READ_ADDR_ADDRESS,
-                                             *address);
-
-    if (status != A_OK) {
-        return status;
-    }
-
-        /* read the data */
-    status = HIFReadWrite(hifDevice,
-                          WINDOW_DATA_ADDRESS,
-                          (A_UCHAR *)data,
-                          sizeof(A_UINT32),
-                          HIF_RD_SYNC_BYTE_INC,
-                          NULL);
-    if (status != A_OK) {
-        AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Cannot read from WINDOW_DATA_ADDRESS\n"));
-        return status;
-    }
-
-    return status;
-}
-
-
-/*
- * Write to the AR6000 through its diagnostic window.
- * No cooperation from the Target is required for this.
- */
-A_STATUS
-ar6000_WriteRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data)
-{
-    A_STATUS status;
-
-        /* set write data */
-    status = HIFReadWrite(hifDevice,
-                          WINDOW_DATA_ADDRESS,
-                          (A_UCHAR *)data,
-                          sizeof(A_UINT32),
-                          HIF_WR_SYNC_BYTE_INC,
-                          NULL);
-    if (status != A_OK) {
-        AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Cannot write 0x%x to WINDOW_DATA_ADDRESS\n", *data));
-        return status;
-    }
-
-        /* set window register, which starts the write cycle */
-    return ar6000_SetAddressWindowRegister(hifDevice,
-                                           WINDOW_WRITE_ADDR_ADDRESS,
-                                           *address);
-}
-
-A_STATUS
-ar6000_ReadDataDiag(HIF_DEVICE *hifDevice, A_UINT32 address,
-                    A_UCHAR *data, A_UINT32 length)
-{
-    A_UINT32 count;
-    A_STATUS status = A_OK;
-
-    for (count = 0; count < length; count += 4, address += 4) {
-        if ((status = ar6000_ReadRegDiag(hifDevice, &address,
-                                         (A_UINT32 *)&data[count])) != A_OK)
-        {
-            break;
-        }
-    }
-
-    return status;
-}
-
-A_STATUS
-ar6000_WriteDataDiag(HIF_DEVICE *hifDevice, A_UINT32 address,
-                     A_UCHAR *data, A_UINT32 length)
-{
-    A_UINT32 count;
-    A_STATUS status = A_OK;
-
-    for (count = 0; count < length; count += 4, address += 4) {
-        if ((status = ar6000_WriteRegDiag(hifDevice, &address,
-                                          (A_UINT32 *)&data[count])) != A_OK)
-        {
-            break;
-        }
-    }
-
-    return status;
-}
-
-A_STATUS
-ar6000_reset_device_skipflash(HIF_DEVICE *hifDevice)
-{
-    int i;
-    struct forceROM_s {
-        A_UINT32 addr;
-        A_UINT32 data;
-    };
-    struct forceROM_s *ForceROM;
-    int szForceROM;
-    A_UINT32 instruction;
-
-    static struct forceROM_s ForceROM_REV2[] = {
-        /* NB: This works for old REV2 ROM (old). */
-        {0x00001ff0, 0x175b0027}, /* jump instruction at 0xa0001ff0 */
-        {0x00001ff4, 0x00000000}, /* nop instruction at 0xa0001ff4 */
-
-        {MC_REMAP_TARGET_ADDRESS, 0x00001ff0}, /* remap to 0xa0001ff0 */
-        {MC_REMAP_COMPARE_ADDRESS, 0x01000040},/* ...from 0xbfc00040 */
-        {MC_REMAP_SIZE_ADDRESS, 0x00000000},   /* ...1 cache line */
-        {MC_REMAP_VALID_ADDRESS, 0x00000001},  /* ...remap is valid */
-
-        {LOCAL_COUNT_ADDRESS+0x10, 0}, /* clear BMI credit counter */
-
-        {RESET_CONTROL_ADDRESS, RESET_CONTROL_WARM_RST_MASK},
-    };
-
-    static struct forceROM_s ForceROM_NEW[] = {
-        /* NB: This works for AR6000 ROM REV3 and beyond.  */
-        {LOCAL_SCRATCH_ADDRESS, AR6K_OPTION_IGNORE_FLASH},
-        {LOCAL_COUNT_ADDRESS+0x10, 0}, /* clear BMI credit counter */
-        {RESET_CONTROL_ADDRESS, RESET_CONTROL_WARM_RST_MASK},
-    };
-
-    /*
-     * Examine a semi-arbitrary instruction that's different
-     * in REV2 and other revisions.
-     * NB: If a Host port does not require simultaneous support
-     * for multiple revisions of Target ROM, this code can be elided.
-     */
-    (void)ar6000_ReadDataDiag(hifDevice, 0x01000040,
-                              (A_UCHAR *)&instruction, 4);
-
-    AR_DEBUG_PRINTF(ATH_LOG_ERR, ("instruction=0x%x\n", instruction));
-
-    if (instruction == 0x3c1aa200) {
-        /* It's an old ROM */
-        ForceROM = ForceROM_REV2;
-        szForceROM = sizeof(ForceROM_REV2)/sizeof(*ForceROM);
-        AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Using OLD method\n"));
-    } else {
-        ForceROM = ForceROM_NEW;
-        szForceROM = sizeof(ForceROM_NEW)/sizeof(*ForceROM);
-        AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Using NEW method\n"));
-    }
-
-    AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Force Target to execute from ROM....\n"));
-    for (i = 0; i < szForceROM; i++)
-    {
-        if (ar6000_WriteRegDiag(hifDevice,
-                                &ForceROM[i].addr,
-                                &ForceROM[i].data) != A_OK)
-        {
-            AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Cannot force Target to execute ROM!\n"));
-            return A_ERROR;
-        }
-    }
-
-    msleep(50); /* delay to allow dragon to come to BMI phase  */
-    return A_OK;
-}
-
-/* reset device */
-A_STATUS ar6000_reset_device(HIF_DEVICE *hifDevice, A_UINT32 TargetType)
-{
-
-#if !defined(DWSIM)
-    A_STATUS status = A_OK;
-    A_UINT32 address;
-    A_UINT32 data;
-
-    do {
-
-        // address = RESET_CONTROL_ADDRESS;
-        data = RESET_CONTROL_COLD_RST_MASK;
-
-          /* Hardcode the address of RESET_CONTROL_ADDRESS based on the target type */
-        if (TargetType == TARGET_TYPE_AR6001) {
-            address = 0x0C000000;
-        } else {
-            if (TargetType == TARGET_TYPE_AR6002) {
-                address = 0x00004000;
-            } else {
-                A_ASSERT(0);
-            }
-        }
-
-        status = ar6000_WriteRegDiag(hifDevice, &address, &data);
-
-        if (A_FAILED(status)) {
-            break;
-        }
-
-        /*
-         * Read back the RESET CAUSE register to ensure that the cold reset
-         * went through.
-         */
-        msleep(2000); /* 2 second delay to allow things to settle down */
-
-
-        // address = RESET_CAUSE_ADDRESS;
-        /* Hardcode the address of RESET_CAUSE_ADDRESS based on the target type */
-        if (TargetType == TARGET_TYPE_AR6001) {
-            address = 0x0C0000CC;
-        } else {
-            if (TargetType == TARGET_TYPE_AR6002) {
-                address = 0x000040C0;
-            } else {
-                A_ASSERT(0);
-            }
-        }
-
-        data = 0;
-        status = ar6000_ReadRegDiag(hifDevice, &address, &data);
-
-        if (A_FAILED(status)) {
-            break;
-        }
-
-        AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Reset Cause readback: 0x%X \n",data));
-        data &= RESET_CAUSE_LAST_MASK;
-        if (data != 2) {
-            AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Unable to cold reset the target \n"));
-        }
-
-    } while (FALSE);
-
-    if (A_FAILED(status)) {
-        AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Failed to reset target \n"));
-    }
-#endif
-    return A_OK;
-}
-
-#define REG_DUMP_COUNT_AR6001   38  /* WORDs, derived from AR6001_regdump.h */
-#define REG_DUMP_COUNT_AR6002   32  /* WORDs, derived from AR6002_regdump.h */
-
-
-#if REG_DUMP_COUNT_AR6001 <= REG_DUMP_COUNT_AR6002
-#define REGISTER_DUMP_LEN_MAX  REG_DUMP_COUNT_AR6002
-#else
-#define REGISTER_DUMP_LEN_MAX  REG_DUMP_COUNT_AR6001
-#endif
-
-void ar6000_dump_target_assert_info(HIF_DEVICE *hifDevice, A_UINT32 TargetType)
-{
-    A_UINT32 address;
-    A_UINT32 regDumpArea = 0;
-    A_STATUS status;
-    A_UINT32 regDumpValues[REGISTER_DUMP_LEN_MAX];
-    A_UINT32 regDumpCount = 0;
-    A_UINT32 i;
-
-    do {
-
-            /* the reg dump pointer is copied to the host interest area */
-        address = HOST_INTEREST_ITEM_ADDRESS(TargetType, hi_failure_state);
-
-        if (TargetType == TARGET_TYPE_AR6001) {
-                /* for AR6001, this is a fixed location because the ptr is actually stuck in cache,
-                 * this may be fixed in later firmware versions */
-            address = 0x18a0;
-            regDumpCount = REG_DUMP_COUNT_AR6001;
-
-        } else  if (TargetType == TARGET_TYPE_AR6002) {
-
-            regDumpCount = REG_DUMP_COUNT_AR6002;
-
-        } else {
-            A_ASSERT(0);
-        }
-
-            /* read RAM location through diagnostic window */
-        status = ar6000_ReadRegDiag(hifDevice, &address, &regDumpArea);
-
-        if (A_FAILED(status)) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("AR6K: Failed to get ptr to register dump area \n"));
-            break;
-        }
-
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("AR6K: Location of register dump data: 0x%X \n",regDumpArea));
-
-        if (regDumpArea == 0) {
-                /* no reg dump */
-            break;
-        }
-
-        if (TargetType == TARGET_TYPE_AR6001) {
-            regDumpArea &= 0x0FFFFFFF;  /* convert to physical address in target memory */
-        }
-
-            /* fetch register dump data */
-        status = ar6000_ReadDataDiag(hifDevice,
-                                     regDumpArea,
-                                     (A_UCHAR *)&regDumpValues[0],
-                                     regDumpCount * (sizeof(A_UINT32)));
-
-        if (A_FAILED(status)) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("AR6K: Failed to get register dump \n"));
-            break;
-        }
-
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("AR6K: Register Dump: \n"));
-
-        for (i = 0; i < regDumpCount; i++) {
-            AR_DEBUG_PRINTF(ATH_DEBUG_ERR,(" %d :  0x%8.8X \n",i, regDumpValues[i]));
-        }
-
-    } while (FALSE);
-
-}
-
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/miscdrv/credit_dist.c b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/miscdrv/credit_dist.c
deleted file mode 100644
index 8d37d6272..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/miscdrv/credit_dist.c
+++ /dev/null
@@ -1,346 +0,0 @@
-
-/*
- *
- * Copyright (c) 2004-2007 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#include "a_config.h"
-#include "athdefs.h"
-#include "a_types.h"
-#include "a_osapi.h"
-#include "a_debug.h"
-#include "htc_api.h"
-#include "common_drv.h"
-
-/********* CREDIT DISTRIBUTION FUNCTIONS ******************************************/
-
-#define NO_VO_SERVICE 1 /* currently WMI only uses 3 data streams, so we leave VO service inactive */
-
-#ifdef NO_VO_SERVICE
-#define DATA_SVCS_USED 3
-#else
-#define DATA_SVCS_USED 4
-#endif
-
-static void RedistributeCredits(COMMON_CREDIT_STATE_INFO *pCredInfo,
-                                HTC_ENDPOINT_CREDIT_DIST *pEPDistList);
-
-static void SeekCredits(COMMON_CREDIT_STATE_INFO *pCredInfo,
-                        HTC_ENDPOINT_CREDIT_DIST *pEPDistList);
-
-/* reduce an ep's credits back to a set limit */
-static INLINE void ReduceCredits(COMMON_CREDIT_STATE_INFO *pCredInfo,
-                                HTC_ENDPOINT_CREDIT_DIST  *pEpDist,
-                                int                       Limit)
-{
-    int credits;
-
-        /* set the new limit */
-    pEpDist->TxCreditsAssigned = Limit;
-
-    if (pEpDist->TxCredits <= Limit) {
-        return;
-    }
-
-        /* figure out how much to take away */
-    credits = pEpDist->TxCredits - Limit;
-        /* take them away */
-    pEpDist->TxCredits -= credits;
-    pCredInfo->CurrentFreeCredits += credits;
-}
-
-/* give an endpoint some credits from the free credit pool */
-#define GiveCredits(pCredInfo,pEpDist,credits)      \
-{                                                   \
-    (pEpDist)->TxCredits += (credits);              \
-    (pEpDist)->TxCreditsAssigned += (credits);      \
-    (pCredInfo)->CurrentFreeCredits -= (credits);   \
-}
-
-
-/* default credit init callback.
- * This function is called in the context of HTCStart() to setup initial (application-specific)
- * credit distributions */
-static void ar6000_credit_init(void                     *Context,
-                               HTC_ENDPOINT_CREDIT_DIST *pEPList,
-                               int                      TotalCredits)
-{
-    HTC_ENDPOINT_CREDIT_DIST *pCurEpDist;
-    int                      count;
-    COMMON_CREDIT_STATE_INFO *pCredInfo = (COMMON_CREDIT_STATE_INFO *)Context;
-
-    pCredInfo->CurrentFreeCredits = TotalCredits;
-    pCredInfo->TotalAvailableCredits = TotalCredits;
-
-    pCurEpDist = pEPList;
-
-        /* run through the list and initialize */
-    while (pCurEpDist != NULL) {
-
-            /* set minimums for each endpoint */
-        pCurEpDist->TxCreditsMin = pCurEpDist->TxCreditsPerMaxMsg;
-
-        if (pCurEpDist->ServiceID == WMI_CONTROL_SVC) {
-                /* give control service some credits */
-            GiveCredits(pCredInfo,pCurEpDist,pCurEpDist->TxCreditsMin);
-                /* control service is always marked active, it never goes inactive EVER */
-            SET_EP_ACTIVE(pCurEpDist);
-        } else if (pCurEpDist->ServiceID == WMI_DATA_BK_SVC) {
-                /* this is the lowest priority data endpoint, save this off for easy access */
-            pCredInfo->pLowestPriEpDist = pCurEpDist;
-        }
-
-        /* Streams have to be created (explicit | implicit)for all kinds
-         * of traffic. BE endpoints are also inactive in the beginning.
-         * When BE traffic starts it creates implicit streams that
-         * redistributes credits.
-         */
-
-        /* note, all other endpoints have minimums set but are initially given NO credits.
-         * Credits will be distributed as traffic activity demands */
-        pCurEpDist = pCurEpDist->pNext;
-    }
-
-    if (pCredInfo->CurrentFreeCredits <= 0) {
-        AR_DEBUG_PRINTF(ATH_LOG_INF, ("Not enough credits (%d) to do credit distributions \n", TotalCredits));
-        A_ASSERT(FALSE);
-        return;
-    }
-
-        /* reset list */
-    pCurEpDist = pEPList;
-        /* now run through the list and set max operating credit limits for everyone */
-    while (pCurEpDist != NULL) {
-        if (pCurEpDist->ServiceID == WMI_CONTROL_SVC) {
-                /* control service max is just 1 max message */
-            pCurEpDist->TxCreditsNorm = pCurEpDist->TxCreditsPerMaxMsg;
-        } else {
-                /* for the remaining data endpoints, we assume that each TxCreditsPerMaxMsg are
-                 * the same.
-                 * We use a simple calculation here, we take the remaining credits and
-                 * determine how many max messages this can cover and then set each endpoint's
-                 * normal value equal to half this amount.
-                 * */
-            count = (pCredInfo->CurrentFreeCredits/pCurEpDist->TxCreditsPerMaxMsg) * pCurEpDist->TxCreditsPerMaxMsg;
-            count = count >> 1;
-            count = max(count,pCurEpDist->TxCreditsPerMaxMsg);
-                /* set normal */
-            pCurEpDist->TxCreditsNorm = count;
-
-        }
-        pCurEpDist = pCurEpDist->pNext;
-    }
-
-}
-
-
-/* default credit distribution callback
- * This callback is invoked whenever endpoints require credit distributions.
- * A lock is held while this function is invoked, this function shall NOT block.
- * The pEPDistList is a list of distribution structures in prioritized order as
- * defined by the call to the HTCSetCreditDistribution() api.
- *
- */
-static void ar6000_credit_distribute(void                     *Context,
-                                     HTC_ENDPOINT_CREDIT_DIST *pEPDistList,
-                                     HTC_CREDIT_DIST_REASON   Reason)
-{
-    HTC_ENDPOINT_CREDIT_DIST *pCurEpDist;
-    COMMON_CREDIT_STATE_INFO *pCredInfo = (COMMON_CREDIT_STATE_INFO *)Context;
-
-    switch (Reason) {
-        case HTC_CREDIT_DIST_SEND_COMPLETE :
-            pCurEpDist = pEPDistList;
-                /* we are given the start of the endpoint distribution list.
-                 * There may be one or more endpoints to service.
-                 * Run through the list and distribute credits */
-            while (pCurEpDist != NULL) {
-
-                if (pCurEpDist->TxCreditsToDist > 0) {
-                        /* return the credits back to the endpoint */
-                    pCurEpDist->TxCredits += pCurEpDist->TxCreditsToDist;
-                        /* always zero out when we are done */
-                    pCurEpDist->TxCreditsToDist = 0;
-
-                    if (pCurEpDist->TxCredits > pCurEpDist->TxCreditsAssigned) {
-                            /* reduce to the assigned limit, previous credit reductions
-                             * could have caused the limit to change */
-                        ReduceCredits(pCredInfo, pCurEpDist, pCurEpDist->TxCreditsAssigned);
-                    }
-
-                    if (pCurEpDist->TxCredits > pCurEpDist->TxCreditsNorm) {
-                            /* oversubscribed endpoints need to reduce back to normal */
-                        ReduceCredits(pCredInfo, pCurEpDist, pCurEpDist->TxCreditsNorm);
-                    }
-                }
-
-                pCurEpDist = pCurEpDist->pNext;
-            }
-
-            A_ASSERT(pCredInfo->CurrentFreeCredits <= pCredInfo->TotalAvailableCredits);
-
-            break;
-
-        case HTC_CREDIT_DIST_ACTIVITY_CHANGE :
-            RedistributeCredits(pCredInfo,pEPDistList);
-            break;
-        case HTC_CREDIT_DIST_SEEK_CREDITS :
-            SeekCredits(pCredInfo,pEPDistList);
-            break;
-        case HTC_DUMP_CREDIT_STATE :
-            AR_DEBUG_PRINTF(ATH_LOG_INF, ("Credit Distribution, total : %d, free : %d\n",
-            								pCredInfo->TotalAvailableCredits, pCredInfo->CurrentFreeCredits));
-            break;
-        default:
-            break;
-
-    }
-
-}
-
-/* redistribute credits based on activity change */
-static void RedistributeCredits(COMMON_CREDIT_STATE_INFO *pCredInfo,
-                                HTC_ENDPOINT_CREDIT_DIST *pEPDistList)
-{
-    HTC_ENDPOINT_CREDIT_DIST *pCurEpDist = pEPDistList;
-
-        /* walk through the list and remove credits from inactive endpoints */
-    while (pCurEpDist != NULL) {
-
-        if (pCurEpDist->ServiceID != WMI_CONTROL_SVC) {
-            if (!IS_EP_ACTIVE(pCurEpDist)) {
-                    /* EP is inactive, reduce credits back to zero */
-                ReduceCredits(pCredInfo, pCurEpDist, 0);
-            }
-        }
-
-        /* NOTE in the active case, we do not need to do anything further,
-         * when an EP goes active and needs credits, HTC will call into
-         * our distribution function using a reason code of HTC_CREDIT_DIST_SEEK_CREDITS  */
-
-        pCurEpDist = pCurEpDist->pNext;
-    }
-
-    A_ASSERT(pCredInfo->CurrentFreeCredits <= pCredInfo->TotalAvailableCredits);
-
-}
-
-/* HTC has an endpoint that needs credits, pEPDist is the endpoint in question */
-static void SeekCredits(COMMON_CREDIT_STATE_INFO *pCredInfo,
-                        HTC_ENDPOINT_CREDIT_DIST *pEPDist)
-{
-    HTC_ENDPOINT_CREDIT_DIST *pCurEpDist;
-    int                      credits = 0;
-    int                      need;
-
-    do {
-
-        if (pEPDist->ServiceID == WMI_CONTROL_SVC) {
-                /* we never oversubscribe on the control service, this is not
-                 * a high performance path and the target never holds onto control
-                 * credits for too long */
-            break;
-        }
-
-        /* for all other services, we follow a simple algorithm of
-         * 1. checking the free pool for credits
-         * 2. checking lower priority endpoints for credits to take */
-
-        if (pCredInfo->CurrentFreeCredits >= 2 * pEPDist->TxCreditsSeek) {
-                /* try to give more credits than it needs */
-            credits = 2 * pEPDist->TxCreditsSeek;
-        } else {
-                /* give what we can */
-            credits = min(pCredInfo->CurrentFreeCredits,pEPDist->TxCreditsSeek);
-        }
-
-        if (credits >= pEPDist->TxCreditsSeek) {
-                /* we found some to fullfill the seek request */
-            break;
-        }
-
-        /* we don't have enough in the free pool, try taking away from lower priority services
-         *
-         * The rule for taking away credits:
-         *   1. Only take from lower priority endpoints
-         *   2. Only take what is allocated above the minimum (never starve an endpoint completely)
-         *   3. Only take what you need.
-         *
-         * */
-
-            /* starting at the lowest priority */
-        pCurEpDist = pCredInfo->pLowestPriEpDist;
-
-            /* work backwards until we hit the endpoint again */
-        while (pCurEpDist != pEPDist) {
-                /* calculate how many we need so far */
-            need = pEPDist->TxCreditsSeek - pCredInfo->CurrentFreeCredits;
-
-            if ((pCurEpDist->TxCreditsAssigned - need) > pCurEpDist->TxCreditsMin) {
-                    /* the current one has been allocated more than it's minimum and it
-                     * has enough credits assigned above it's minimum to fullfill our need
-                     * try to take away just enough to fullfill our need */
-                ReduceCredits(pCredInfo,
-                              pCurEpDist,
-                              pCurEpDist->TxCreditsAssigned - need);
-
-                if (pCredInfo->CurrentFreeCredits >= pEPDist->TxCreditsSeek) {
-                        /* we have enough */
-                    break;
-                }
-            }
-
-            pCurEpDist = pCurEpDist->pPrev;
-        }
-
-            /* return what we can get */
-        credits = min(pCredInfo->CurrentFreeCredits,pEPDist->TxCreditsSeek);
-
-    } while (FALSE);
-
-        /* did we find some credits? */
-    if (credits) {
-            /* give what we can */
-        GiveCredits(pCredInfo, pEPDist, credits);
-    }
-
-}
-
-/* initialize and setup credit distribution */
-A_STATUS ar6000_setup_credit_dist(HTC_HANDLE HTCHandle, COMMON_CREDIT_STATE_INFO *pCredInfo)
-{
-    HTC_SERVICE_ID servicepriority[5];
-
-    A_MEMZERO(pCredInfo,sizeof(COMMON_CREDIT_STATE_INFO));
-
-    servicepriority[0] = WMI_CONTROL_SVC;  /* highest */
-    servicepriority[1] = WMI_DATA_VO_SVC;
-    servicepriority[2] = WMI_DATA_VI_SVC;
-    servicepriority[3] = WMI_DATA_BE_SVC;
-    servicepriority[4] = WMI_DATA_BK_SVC; /* lowest */
-
-        /* set callbacks and priority list */
-    HTCSetCreditDistribution(HTCHandle,
-                             pCredInfo,
-                             ar6000_credit_distribute,
-                             ar6000_credit_init,
-                             servicepriority,
-                             5);
-
-    return A_OK;
-}
-
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/wlan/wlan_node.c b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/wlan/wlan_node.c
deleted file mode 100644
index b12484597..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/wlan/wlan_node.c
+++ /dev/null
@@ -1,371 +0,0 @@
-/*-
- * Copyright (c) 2001 Atsushi Onoe
- * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting
- * Copyright (c) 2004-2005 Atheros Communications
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id: //depot/sw/releases/olca2.0-GPL/host/wlan/src/wlan_node.c#1 $
- */
-/*
- * IEEE 802.11 node handling support.
- */
-#include <a_config.h>
-#include <athdefs.h>
-#include <a_types.h>
-#include <a_osapi.h>
-#include <a_debug.h>
-#include <ieee80211.h>
-#include <wlan_api.h>
-#include <ieee80211_node.h>
-#include <htc_api.h>
-#include <wmi.h>
-#include <wmi_api.h>
-
-static void wlan_node_timeout(A_ATH_TIMER arg);
-static bss_t * _ieee80211_find_node(struct ieee80211_node_table *nt,
-                                    const A_UINT8 *macaddr);
-
-bss_t *
-wlan_node_alloc(struct ieee80211_node_table *nt, int wh_size)
-{
-    bss_t *ni;
-
-    ni = A_MALLOC_NOWAIT(sizeof(bss_t));
-
-    if (ni != NULL) {
-        ni->ni_buf = A_MALLOC_NOWAIT(wh_size);
-        if (ni->ni_buf == NULL) {
-            A_FREE(ni);
-            ni = NULL;
-            return ni;
-        }
-    } else {
-        return ni;
-    }
-
-    /* Make sure our lists are clean */
-    ni->ni_list_next = NULL;
-    ni->ni_list_prev = NULL;
-    ni->ni_hash_next = NULL;
-    ni->ni_hash_prev = NULL;
-
-    //
-    // ni_scangen never initialized before and during suspend/resume of winmobile, customer (LG/SEMCO) identified
-    // that some junk has been stored in this, due to this scan list didn't properly updated
-    //
-    ni->ni_scangen	 = 0;
-
-    return ni;
-}
-
-void
-wlan_node_free(bss_t *ni)
-{
-    if (ni->ni_buf != NULL) {
-        A_FREE(ni->ni_buf);
-    }
-    A_FREE(ni);
-}
-
-void
-wlan_setup_node(struct ieee80211_node_table *nt, bss_t *ni,
-                const A_UINT8 *macaddr)
-{
-    int hash;
-
-    A_MEMCPY(ni->ni_macaddr, macaddr, IEEE80211_ADDR_LEN);
-    hash = IEEE80211_NODE_HASH(macaddr);
-    ieee80211_node_initref(ni);     /* mark referenced */
-
-    ni->ni_tstamp = A_GET_MS(WLAN_NODE_INACT_TIMEOUT_MSEC);
-    IEEE80211_NODE_LOCK_BH(nt);
-
-    /* Insert at the end of the node list */
-    ni->ni_list_next = NULL;
-    ni->ni_list_prev = nt->nt_node_last;
-    if(nt->nt_node_last != NULL)
-    {
-        nt->nt_node_last->ni_list_next = ni;
-    }
-    nt->nt_node_last = ni;
-    if(nt->nt_node_first == NULL)
-    {
-        nt->nt_node_first = ni;
-    }
-
-    /* Insert into the hash list i.e. the bucket */
-    if((ni->ni_hash_next = nt->nt_hash[hash]) != NULL)
-    {
-        nt->nt_hash[hash]->ni_hash_prev = ni;
-    }
-    ni->ni_hash_prev = NULL;
-    nt->nt_hash[hash] = ni;
-
-    if (!nt->isTimerArmed) {
-        A_TIMEOUT_MS(&nt->nt_inact_timer, WLAN_NODE_INACT_TIMEOUT_MSEC, 0);
-        nt->isTimerArmed = TRUE;
-    }
-
-    IEEE80211_NODE_UNLOCK_BH(nt);
-}
-
-static bss_t *
-_ieee80211_find_node(struct ieee80211_node_table *nt,
-    const A_UINT8 *macaddr)
-{
-    bss_t *ni;
-    int hash;
-
-    IEEE80211_NODE_LOCK_ASSERT(nt);
-
-    hash = IEEE80211_NODE_HASH(macaddr);
-    for(ni = nt->nt_hash[hash]; ni; ni = ni->ni_hash_next) {
-        if (IEEE80211_ADDR_EQ(ni->ni_macaddr, macaddr)) {
-            ieee80211_node_incref(ni);  /* mark referenced */
-            return ni;
-        }
-    }
-    return NULL;
-}
-
-bss_t *
-wlan_find_node(struct ieee80211_node_table *nt, const A_UINT8 *macaddr)
-{
-    bss_t *ni;
-
-    IEEE80211_NODE_LOCK(nt);
-    ni = _ieee80211_find_node(nt, macaddr);
-    IEEE80211_NODE_UNLOCK(nt);
-    return ni;
-}
-
-/*
- * Reclaim a node.  If this is the last reference count then
- * do the normal free work.  Otherwise remove it from the node
- * table and mark it gone by clearing the back-reference.
- */
-void
-wlan_node_reclaim(struct ieee80211_node_table *nt, bss_t *ni)
-{
-    IEEE80211_NODE_LOCK(nt);
-
-    if(ni->ni_list_prev == NULL)
-    {
-        /* First in list so fix the list head */
-        nt->nt_node_first = ni->ni_list_next;
-    }
-    else
-    {
-        ni->ni_list_prev->ni_list_next = ni->ni_list_next;
-    }
-
-    if(ni->ni_list_next == NULL)
-    {
-        /* Last in list so fix list tail */
-        nt->nt_node_last = ni->ni_list_prev;
-    }
-    else
-    {
-        ni->ni_list_next->ni_list_prev = ni->ni_list_prev;
-    }
-
-    if(ni->ni_hash_prev == NULL)
-    {
-        /* First in list so fix the list head */
-        int hash;
-        hash = IEEE80211_NODE_HASH(ni->ni_macaddr);
-        nt->nt_hash[hash] = ni->ni_hash_next;
-    }
-    else
-    {
-        ni->ni_hash_prev->ni_hash_next = ni->ni_hash_next;
-    }
-
-    if(ni->ni_hash_next != NULL)
-    {
-        ni->ni_hash_next->ni_hash_prev = ni->ni_hash_prev;
-    }
-    wlan_node_free(ni);
-
-    IEEE80211_NODE_UNLOCK(nt);
-}
-
-static void
-wlan_node_dec_free(bss_t *ni)
-{
-    if (ieee80211_node_dectestref(ni)) {
-        wlan_node_free(ni);
-    }
-}
-
-void
-wlan_free_allnodes(struct ieee80211_node_table *nt)
-{
-    bss_t *ni;
-
-    while ((ni = nt->nt_node_first) != NULL) {
-        wlan_node_reclaim(nt, ni);
-    }
-}
-
-void
-wlan_iterate_nodes(struct ieee80211_node_table *nt, wlan_node_iter_func *f,
-                   void *arg)
-{
-    bss_t *ni;
-    A_UINT32 gen;
-
-    gen = ++nt->nt_scangen;
-
-    IEEE80211_NODE_LOCK(nt);
-    for (ni = nt->nt_node_first; ni; ni = ni->ni_list_next) {
-        if (ni->ni_scangen != gen) {
-            ni->ni_scangen = gen;
-            (void) ieee80211_node_incref(ni);
-            (*f)(arg, ni);
-            wlan_node_dec_free(ni);
-        }
-    }
-    IEEE80211_NODE_UNLOCK(nt);
-}
-
-/*
- * Node table support.
- */
-void
-wlan_node_table_init(void *wmip, struct ieee80211_node_table *nt)
-{
-    int i;
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_WLAN, ("node table = 0x%x\n", (A_UINT32)nt));
-    IEEE80211_NODE_LOCK_INIT(nt);
-
-    nt->nt_node_first = nt->nt_node_last = NULL;
-    for(i = 0; i < IEEE80211_NODE_HASHSIZE; i++)
-    {
-        nt->nt_hash[i] = NULL;
-    }
-    A_INIT_TIMER(&nt->nt_inact_timer, wlan_node_timeout, nt);
-    nt->isTimerArmed = FALSE;
-    nt->nt_wmip = wmip;
-}
-
-static void
-wlan_node_timeout(A_ATH_TIMER arg)
-{
-    struct ieee80211_node_table *nt = (struct ieee80211_node_table *)arg;
-    bss_t *bss, *nextBss;
-    A_UINT8 myBssid[IEEE80211_ADDR_LEN], reArmTimer = FALSE;
-
-    wmi_get_current_bssid(nt->nt_wmip, myBssid);
-
-    bss = nt->nt_node_first;
-    while (bss != NULL)
-    {
-        nextBss = bss->ni_list_next;
-        if (A_MEMCMP(myBssid, bss->ni_macaddr, sizeof(myBssid)) != 0)
-        {
-
-            if (bss->ni_tstamp <= A_GET_MS(0))
-            {
-               /*
-                * free up all but the current bss - if set
-                */
-                wlan_node_reclaim(nt, bss);
-            }
-            else
-            {
-                /*
-                 * Re-arm timer, only when we have a bss other than
-                 * current bss AND it is not aged-out.
-                 */
-                reArmTimer = TRUE;
-            }
-        }
-        bss = nextBss;
-    }
-
-    if(reArmTimer)
-        A_TIMEOUT_MS(&nt->nt_inact_timer, WLAN_NODE_INACT_TIMEOUT_MSEC, 0);
-
-    nt->isTimerArmed = reArmTimer;
-}
-
-void
-wlan_node_table_cleanup(struct ieee80211_node_table *nt)
-{
-    A_UNTIMEOUT(&nt->nt_inact_timer);
-    A_DELETE_TIMER(&nt->nt_inact_timer);
-    wlan_free_allnodes(nt);
-    IEEE80211_NODE_LOCK_DESTROY(nt);
-}
-
-bss_t *
-wlan_find_Ssidnode (struct ieee80211_node_table *nt, A_UCHAR *pSsid,
-					A_UINT32 ssidLength, A_BOOL bIsWPA2)
-{
-    bss_t   *ni = NULL;
-	A_UCHAR *pIESsid = NULL;
-
-    IEEE80211_NODE_LOCK (nt);
-
-    for (ni = nt->nt_node_first; ni; ni = ni->ni_list_next) {
-		pIESsid = ni->ni_cie.ie_ssid;
-		if (pIESsid[1] <= 32) {
-
-			// Step 1 : Check SSID
-			if (0x00 == memcmp (pSsid, &pIESsid[2], ssidLength)) {
-
-				// Step 2 : if SSID matches, check WPA or WPA2
-				if (TRUE == bIsWPA2 && NULL != ni->ni_cie.ie_rsn) {
-					ieee80211_node_incref (ni);  /* mark referenced */
-					IEEE80211_NODE_UNLOCK (nt);
-					return ni;
-				}
-				if (FALSE == bIsWPA2 && NULL != ni->ni_cie.ie_wpa) {
-					ieee80211_node_incref(ni);  /* mark referenced */
-					IEEE80211_NODE_UNLOCK (nt);
-					return ni;
-				}
-			}
-		}
-    }
-
-    IEEE80211_NODE_UNLOCK (nt);
-
-    return NULL;
-}
-
-void
-wlan_node_return (struct ieee80211_node_table *nt, bss_t *ni)
-{
-	IEEE80211_NODE_LOCK (nt);
-	wlan_node_dec_free (ni);
-	IEEE80211_NODE_UNLOCK (nt);
-}
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/wlan/wlan_recv_beacon.c b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/wlan/wlan_recv_beacon.c
deleted file mode 100644
index 15beabb65..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/wlan/wlan_recv_beacon.c
+++ /dev/null
@@ -1,192 +0,0 @@
-/*-
- * Copyright (c) 2001 Atsushi Onoe
- * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*
- * IEEE 802.11 input handling.
- */
-
-#include "a_config.h"
-#include "athdefs.h"
-#include "a_types.h"
-#include "a_osapi.h"
-#include <wmi.h>
-#include <ieee80211.h>
-#include <wlan_api.h>
-
-#define IEEE80211_VERIFY_LENGTH(_len, _minlen) do {         \
-    if ((_len) < (_minlen)) {                   \
-        return A_EINVAL;                         \
-    }                               \
-} while (0)
-
-#define IEEE80211_VERIFY_ELEMENT(__elem, __maxlen) do {         \
-    if ((__elem) == NULL) {                     \
-        return A_EINVAL;                         \
-    }                               \
-    if ((__elem)[1] > (__maxlen)) {                 \
-        return A_EINVAL;                         \
-    }                               \
-} while (0)
-
-
-/* unaligned little endian access */
-#define LE_READ_2(p)                            \
-    ((A_UINT16)                            \
-     ((((A_UINT8 *)(p))[0]      ) | (((A_UINT8 *)(p))[1] <<  8)))
-
-#define LE_READ_4(p)                            \
-    ((A_UINT32)                            \
-     ((((A_UINT8 *)(p))[0]      ) | (((A_UINT8 *)(p))[1] <<  8) | \
-      (((A_UINT8 *)(p))[2] << 16) | (((A_UINT8 *)(p))[3] << 24)))
-
-
-static int __inline
-iswpaoui(const A_UINT8 *frm)
-{
-    return frm[1] > 3 && LE_READ_4(frm+2) == ((WPA_OUI_TYPE<<24)|WPA_OUI);
-}
-
-static int __inline
-iswmmoui(const A_UINT8 *frm)
-{
-    return frm[1] > 3 && LE_READ_4(frm+2) == ((WMM_OUI_TYPE<<24)|WMM_OUI);
-}
-
-static int __inline
-iswmmparam(const A_UINT8 *frm)
-{
-    return frm[1] > 5 && frm[6] == WMM_PARAM_OUI_SUBTYPE;
-}
-
-static int __inline
-iswmminfo(const A_UINT8 *frm)
-{
-    return frm[1] > 5 && frm[6] == WMM_INFO_OUI_SUBTYPE;
-}
-
-static int __inline
-isatherosoui(const A_UINT8 *frm)
-{
-    return frm[1] > 3 && LE_READ_4(frm+2) == ((ATH_OUI_TYPE<<24)|ATH_OUI);
-}
-
-static int __inline
-iswscoui(const A_UINT8 *frm)
-{
-    return frm[1] > 3 && LE_READ_4(frm+2) == ((0x04<<24)|WPA_OUI);
-}
-
-A_STATUS
-wlan_parse_beacon(A_UINT8 *buf, int framelen, struct ieee80211_common_ie *cie)
-{
-    A_UINT8 *frm, *efrm;
-
-    frm = buf;
-    efrm = (A_UINT8 *) (frm + framelen);
-
-    /*
-     * beacon/probe response frame format
-     *  [8] time stamp
-     *  [2] beacon interval
-     *  [2] capability information
-     *  [tlv] ssid
-     *  [tlv] supported rates
-     *  [tlv] country information
-     *  [tlv] parameter set (FH/DS)
-     *  [tlv] erp information
-     *  [tlv] extended supported rates
-     *  [tlv] WMM
-     *  [tlv] WPA or RSN
-     *  [tlv] Atheros Advanced Capabilities
-     */
-    IEEE80211_VERIFY_LENGTH(efrm - frm, 12);
-    A_MEMZERO(cie, sizeof(*cie));
-
-    cie->ie_tstamp = frm; frm += 8;
-    cie->ie_beaconInt = A_LE2CPU16(*(A_UINT16 *)frm);  frm += 2;
-    cie->ie_capInfo = A_LE2CPU16(*(A_UINT16 *)frm);  frm += 2;
-    cie->ie_chan = 0;
-
-    while (frm < efrm) {
-        switch (*frm) {
-        case IEEE80211_ELEMID_SSID:
-            cie->ie_ssid = frm;
-            break;
-        case IEEE80211_ELEMID_RATES:
-            cie->ie_rates = frm;
-            break;
-        case IEEE80211_ELEMID_COUNTRY:
-            cie->ie_country = frm;
-            break;
-        case IEEE80211_ELEMID_FHPARMS:
-            break;
-        case IEEE80211_ELEMID_DSPARMS:
-            cie->ie_chan = frm[2];
-            break;
-        case IEEE80211_ELEMID_TIM:
-            cie->ie_tim = frm;
-            break;
-        case IEEE80211_ELEMID_IBSSPARMS:
-            break;
-        case IEEE80211_ELEMID_XRATES:
-            cie->ie_xrates = frm;
-            break;
-        case IEEE80211_ELEMID_ERP:
-            if (frm[1] != 1) {
-                //A_PRINTF("Discarding ERP Element - Bad Len\n");
-                return A_EINVAL;
-            }
-            cie->ie_erp = frm[2];
-            break;
-        case IEEE80211_ELEMID_RSN:
-            cie->ie_rsn = frm;
-            break;
-        case IEEE80211_ELEMID_VENDOR:
-            if (iswpaoui(frm)) {
-                cie->ie_wpa = frm;
-            } else if (iswmmoui(frm)) {
-                cie->ie_wmm = frm;
-            } else if (isatherosoui(frm)) {
-                cie->ie_ath = frm;
-            } else if(iswscoui(frm)) {
-                cie->ie_wsc = frm;
-            }
-            break;
-        default:
-            break;
-        }
-        frm += frm[1] + 2;
-    }
-    IEEE80211_VERIFY_ELEMENT(cie->ie_rates, IEEE80211_RATE_MAXSIZE);
-    IEEE80211_VERIFY_ELEMENT(cie->ie_ssid, IEEE80211_NWID_LEN);
-
-    return A_OK;
-}
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/wlan/wlan_utils.c b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/wlan/wlan_utils.c
deleted file mode 100644
index fd5aac90e..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/wlan/wlan_utils.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2004-2005 Atheros Communications Inc.
- * All rights reserved.
- *
- * This module implements frequently used wlan utilies
- *
- * $Id: //depot/sw/releases/olca2.0-GPL/host/wlan/src/wlan_utils.c#1 $
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#include <a_config.h>
-#include <athdefs.h>
-#include <a_types.h>
-#include <a_osapi.h>
-
-/*
- * converts ieee channel number to frequency
- */
-A_UINT16
-wlan_ieee2freq(int chan)
-{
-    if (chan == 14) {
-        return 2484;
-    }
-    if (chan < 14) {    /* 0-13 */
-        return (2407 + (chan*5));
-    }
-    if (chan < 27) {    /* 15-26 */
-        return (2512 + ((chan-15)*20));
-    }
-    return (5000 + (chan*5));
-}
-
-/*
- * Converts MHz frequency to IEEE channel number.
- */
-A_UINT32
-wlan_freq2ieee(A_UINT16 freq)
-{
-    if (freq == 2484)
-        return 14;
-    if (freq < 2484)
-        return (freq - 2407) / 5;
-    if (freq < 5000)
-        return 15 + ((freq - 2512) / 20);
-    return (freq - 5000) / 5;
-}
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/wmi/wmi.c b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/wmi/wmi.c
deleted file mode 100644
index d322cf3f5..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/wmi/wmi.c
+++ /dev/null
@@ -1,3954 +0,0 @@
-/*
- * Copyright (c) 2004-2007 Atheros Communications Inc.
- * All rights reserved.
- *
- * This module implements the hardware independent layer of the
- * Wireless Module Interface (WMI) protocol.
- *
- * $Id: //depot/sw/releases/olca2.0-GPL/host/wmi/wmi.c#3 $
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#include <a_config.h>
-#include <athdefs.h>
-#include <a_types.h>
-#include <a_osapi.h>
-#include "htc.h"
-#include "htc_api.h"
-#include "wmi.h"
-#include <ieee80211.h>
-#include <ieee80211_node.h>
-#include <wlan_api.h>
-#include <wmi_api.h>
-#include "dset_api.h"
-#include "gpio_api.h"
-#include "wmi_host.h"
-#include "a_drv.h"
-#include "a_drv_api.h"
-#include "a_debug.h"
-#include "dbglog_api.h"
-
-static A_STATUS wmi_ready_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-
-static A_STATUS wmi_connect_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
-                                     int len);
-static A_STATUS wmi_disconnect_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
-                                        int len);
-static A_STATUS wmi_tkip_micerr_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
-                                        int len);
-static A_STATUS wmi_bssInfo_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
-                                     int len);
-static A_STATUS wmi_opt_frame_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
-                                       int len);
-static A_STATUS wmi_pstream_timeout_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
-                                     int len);
-static A_STATUS wmi_sync_point(struct wmi_t *wmip);
-
-static A_STATUS wmi_bitrate_reply_rx(struct wmi_t *wmip, A_UINT8 *datap,
-                                     int len);
-static A_STATUS wmi_ratemask_reply_rx(struct wmi_t *wmip, A_UINT8 *datap,
-                                     int len);
-static A_STATUS wmi_channelList_reply_rx(struct wmi_t *wmip, A_UINT8 *datap,
-                                         int len);
-static A_STATUS wmi_regDomain_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
-                                       int len);
-static A_STATUS wmi_txPwr_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-static A_STATUS wmi_neighborReport_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
-                                             int len);
-
-static A_STATUS wmi_dset_open_req_rx(struct wmi_t *wmip, A_UINT8 *datap,
-                                     int len);
-#ifdef CONFIG_HOST_DSET_SUPPORT
-static A_STATUS wmi_dset_close_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-static A_STATUS wmi_dset_data_req_rx(struct wmi_t *wmip, A_UINT8 *datap,
-                                     int len);
-#endif /* CONFIG_HOST_DSET_SUPPORT */
-
-
-static A_STATUS wmi_scanComplete_rx(struct wmi_t *wmip, A_UINT8 *datap,
-                                     int len);
-static A_STATUS wmi_errorEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-static A_STATUS wmi_statsEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-static A_STATUS wmi_rssiThresholdEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-static A_STATUS wmi_hbChallengeResp_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-static A_STATUS wmi_reportErrorEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-static A_STATUS wmi_cac_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-static A_STATUS wmi_roam_tbl_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
-                                      int len);
-static A_STATUS wmi_roam_data_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
-                                      int len);
-static A_STATUS wmi_get_wow_list_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
-                                      int len);
-static A_STATUS
-wmi_get_pmkid_list_event_rx(struct wmi_t *wmip, A_UINT8 *datap, A_UINT32 len);
-
-#ifdef CONFIG_HOST_GPIO_SUPPORT
-static A_STATUS wmi_gpio_intr_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-static A_STATUS wmi_gpio_data_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-static A_STATUS wmi_gpio_ack_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-#endif /* CONFIG_HOST_GPIO_SUPPORT */
-
-#ifdef CONFIG_HOST_TCMD_SUPPORT
-static A_STATUS
-wmi_tcmd_test_report_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-#endif
-
-static A_STATUS
-wmi_txRetryErrEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-
-static A_STATUS
-wmi_snrThresholdEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-
-static A_STATUS
-wmi_lqThresholdEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-
-static A_BOOL
-wmi_is_bitrate_index_valid(struct wmi_t *wmip, A_UINT32 rateIndex);
-
-static A_STATUS
-wmi_aplistEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-
-static A_STATUS
-wmi_dbglog_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-
-static A_STATUS wmi_keepalive_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-
-int wps_enable;
-static const A_INT32 wmi_rateTable[] = {
-    1000,
-    2000,
-    5500,
-    11000,
-    6000,
-    9000,
-    12000,
-    18000,
-    24000,
-    36000,
-    48000,
-    54000,
-    0};
-
-#define MODE_A_SUPPORT_RATE_START       4
-#define MODE_A_SUPPORT_RATE_STOP        11
-
-#define MODE_GONLY_SUPPORT_RATE_START   MODE_A_SUPPORT_RATE_START
-#define MODE_GONLY_SUPPORT_RATE_STOP    MODE_A_SUPPORT_RATE_STOP
-
-#define MODE_B_SUPPORT_RATE_START       0
-#define MODE_B_SUPPORT_RATE_STOP        3
-
-#define MODE_G_SUPPORT_RATE_START       0
-#define MODE_G_SUPPORT_RATE_STOP        11
-
-#define MAX_NUMBER_OF_SUPPORT_RATES     (MODE_G_SUPPORT_RATE_STOP + 1)
-
-/* 802.1d to AC mapping. Refer pg 57 of WMM-test-plan-v1.2 */
-const A_UINT8 up_to_ac[]= {
-                WMM_AC_BE,
-                WMM_AC_BK,
-                WMM_AC_BK,
-                WMM_AC_BE,
-                WMM_AC_VI,
-                WMM_AC_VI,
-                WMM_AC_VO,
-                WMM_AC_VO,
-            };
-
-void *
-wmi_init(void *devt)
-{
-    struct wmi_t *wmip;
-
-    wmip = A_MALLOC(sizeof(struct wmi_t));
-    if (wmip == NULL) {
-        return (NULL);
-    }
-    A_MEMZERO(wmip, sizeof(*wmip));
-    A_MUTEX_INIT(&wmip->wmi_lock);
-    wmip->wmi_devt = devt;
-    wlan_node_table_init(wmip, &wmip->wmi_scan_table);
-    wmi_qos_state_init(wmip);
-    wmip->wmi_powerMode = REC_POWER;
-    wmip->wmi_phyMode = WMI_11G_MODE;
-
-    return (wmip);
-}
-
-void
-wmi_qos_state_init(struct wmi_t *wmip)
-{
-    A_UINT8 i;
-
-    if (wmip == NULL) {
-        return;
-    }
-    LOCK_WMI(wmip);
-
-    /* Initialize QoS States */
-    wmip->wmi_numQoSStream = 0;
-
-    wmip->wmi_fatPipeExists = 0;
-
-    for (i=0; i < WMM_NUM_AC; i++) {
-        wmip->wmi_streamExistsForAC[i]=0;
-    }
-
-        /* Initialize the static Wmi stream Pri to WMM AC mappings Arrays */
-    WMI_INIT_WMISTREAM_AC_MAP(wmip);
-
-    UNLOCK_WMI(wmip);
-
-    A_WMI_SET_NUMDATAENDPTS(wmip->wmi_devt, 1);
-}
-
-void
-wmi_shutdown(struct wmi_t *wmip)
-{
-    if (wmip != NULL) {
-        wlan_node_table_cleanup(&wmip->wmi_scan_table);
-        if (A_IS_MUTEX_VALID(&wmip->wmi_lock)) {
-            A_MUTEX_DELETE(&wmip->wmi_lock);
-        }
-        A_FREE(wmip);
-    }
-}
-
-/*
- *  performs DIX to 802.3 encapsulation for transmit packets.
- *  uses passed in buffer.  Returns buffer or NULL if failed.
- *  Assumes the entire DIX header is contigous and that there is
- *  enough room in the buffer for a 802.3 mac header and LLC+SNAP headers.
- */
-A_STATUS
-wmi_dix_2_dot3(struct wmi_t *wmip, void *osbuf)
-{
-    A_UINT8          *datap;
-    A_UINT16         typeorlen;
-    ATH_MAC_HDR      macHdr;
-    ATH_LLC_SNAP_HDR *llcHdr;
-
-    A_ASSERT(osbuf != NULL);
-
-    if (A_NETBUF_HEADROOM(osbuf) <
-        (sizeof(ATH_LLC_SNAP_HDR) + sizeof(WMI_DATA_HDR)))
-    {
-        return A_NO_MEMORY;
-    }
-
-    datap = A_NETBUF_DATA(osbuf);
-
-    typeorlen = *(A_UINT16 *)(datap + ATH_MAC_LEN + ATH_MAC_LEN);
-
-    if (!IS_ETHERTYPE(A_BE2CPU16(typeorlen))) {
-        /*
-         * packet is already in 802.3 format - return success
-         */
-        A_DPRINTF(DBG_WMI, (DBGFMT "packet already 802.3\n", DBGARG));
-        return (A_OK);
-    }
-
-    /*
-     * Save mac fields and length to be inserted later
-     */
-    A_MEMCPY(macHdr.dstMac, datap, ATH_MAC_LEN);
-    A_MEMCPY(macHdr.srcMac, datap + ATH_MAC_LEN, ATH_MAC_LEN);
-    macHdr.typeOrLen = A_CPU2BE16(A_NETBUF_LEN(osbuf) - sizeof(ATH_MAC_HDR) +
-                                  sizeof(ATH_LLC_SNAP_HDR));
-
-    /*
-     * Make room for LLC+SNAP headers
-     */
-    if (A_NETBUF_PUSH(osbuf, sizeof(ATH_LLC_SNAP_HDR)) != A_OK) {
-        return A_NO_MEMORY;
-    }
-
-    datap = A_NETBUF_DATA(osbuf);
-
-    A_MEMCPY(datap, &macHdr, sizeof (ATH_MAC_HDR));
-
-    llcHdr = (ATH_LLC_SNAP_HDR *)(datap + sizeof(ATH_MAC_HDR));
-    llcHdr->dsap      = 0xAA;
-    llcHdr->ssap      = 0xAA;
-    llcHdr->cntl      = 0x03;
-    llcHdr->orgCode[0] = 0x0;
-    llcHdr->orgCode[1] = 0x0;
-    llcHdr->orgCode[2] = 0x0;
-    llcHdr->etherType = typeorlen;
-
-    return (A_OK);
-}
-
-/*
- * Adds a WMI data header
- * Assumes there is enough room in the buffer to add header.
- */
-A_STATUS
-wmi_data_hdr_add(struct wmi_t *wmip, void *osbuf, A_UINT8 msgType)
-{
-    WMI_DATA_HDR     *dtHdr;
-
-    A_ASSERT(osbuf != NULL);
-
-    if (A_NETBUF_PUSH(osbuf, sizeof(WMI_DATA_HDR)) != A_OK) {
-        return A_NO_MEMORY;
-    }
-
-    dtHdr = (WMI_DATA_HDR *)A_NETBUF_DATA(osbuf);
-    dtHdr->info = msgType;
-    dtHdr->rssi = 0;
-
-    return (A_OK);
-}
-
-A_UINT8 wmi_implicit_create_pstream(struct wmi_t *wmip, void *osbuf, A_UINT8 dir, A_UINT8 up)
-{
-    A_UINT8         *datap;
-    A_UINT8         trafficClass = WMM_AC_BE, userPriority = up;
-    ATH_LLC_SNAP_HDR *llcHdr;
-    A_UINT16        ipType = IP_ETHERTYPE;
-    WMI_DATA_HDR     *dtHdr;
-    WMI_CREATE_PSTREAM_CMD  cmd;
-    A_BOOL           streamExists = FALSE;
-
-    A_ASSERT(osbuf != NULL);
-
-    datap = A_NETBUF_DATA(osbuf);
-
-    if (up == UNDEFINED_PRI) {
-    llcHdr = (ATH_LLC_SNAP_HDR *)(datap + sizeof(WMI_DATA_HDR) +
-                                  sizeof(ATH_MAC_HDR));
-
-        if (llcHdr->etherType == A_CPU2BE16(ipType)) {
-        /* Extract the endpoint info from the TOS field in the IP header */
-        userPriority = A_WMI_IPTOS_TO_USERPRIORITY(((A_UINT8 *)llcHdr) + sizeof(ATH_LLC_SNAP_HDR));
-        }
-    }
-
-    if (userPriority < MAX_NUM_PRI) {
-        trafficClass = convert_userPriority_to_trafficClass(userPriority);
-    }
-
-    dtHdr = (WMI_DATA_HDR *)datap;
-    if(dir==UPLINK_TRAFFIC)
-        dtHdr->info |= (userPriority & WMI_DATA_HDR_UP_MASK) << WMI_DATA_HDR_UP_SHIFT;  /* lower 3-bits are 802.1d priority */
-
-    LOCK_WMI(wmip);
-    streamExists = wmip->wmi_fatPipeExists;
-    UNLOCK_WMI(wmip);
-
-    if (!(streamExists & (1 << trafficClass))) {
-
-        A_MEMZERO(&cmd, sizeof(cmd));
-	    cmd.trafficClass = trafficClass;
-	    cmd.userPriority = userPriority;
-		cmd.inactivityInt = WMI_IMPLICIT_PSTREAM_INACTIVITY_INT;
-            /* Implicit streams are created with TSID 0xFF */
-        cmd.tsid = WMI_IMPLICIT_PSTREAM;
-        wmi_create_pstream_cmd(wmip, &cmd);
-    }
-
-    return trafficClass;
-}
-
-WMI_PRI_STREAM_ID
-wmi_get_stream_id(struct wmi_t *wmip, A_UINT8 trafficClass)
-{
-    return WMI_ACCESSCATEGORY_WMISTREAM(wmip, trafficClass);
-}
-
-/*
- *  performs 802.3 to DIX encapsulation for received packets.
- *  Assumes the entire 802.3 header is contigous.
- */
-A_STATUS
-wmi_dot3_2_dix(struct wmi_t *wmip, void *osbuf)
-{
-    A_UINT8          *datap;
-    ATH_MAC_HDR      macHdr;
-    ATH_LLC_SNAP_HDR *llcHdr;
-
-    A_ASSERT(osbuf != NULL);
-    datap = A_NETBUF_DATA(osbuf);
-
-    A_MEMCPY(&macHdr, datap, sizeof(ATH_MAC_HDR));
-    llcHdr = (ATH_LLC_SNAP_HDR *)(datap + sizeof(ATH_MAC_HDR));
-    macHdr.typeOrLen = llcHdr->etherType;
-
-    if (A_NETBUF_PULL(osbuf, sizeof(ATH_LLC_SNAP_HDR)) != A_OK) {
-        return A_NO_MEMORY;
-    }
-
-    datap = A_NETBUF_DATA(osbuf);
-
-    A_MEMCPY(datap, &macHdr, sizeof (ATH_MAC_HDR));
-
-    return (A_OK);
-}
-
-/*
- * Removes a WMI data header
- */
-A_STATUS
-wmi_data_hdr_remove(struct wmi_t *wmip, void *osbuf)
-{
-    A_ASSERT(osbuf != NULL);
-
-    return (A_NETBUF_PULL(osbuf, sizeof(WMI_DATA_HDR)));
-}
-
-void
-wmi_iterate_nodes(struct wmi_t *wmip, wlan_node_iter_func *f, void *arg)
-{
-    wlan_iterate_nodes(&wmip->wmi_scan_table, f, arg);
-}
-
-/*
- * WMI Extended Event received from Target.
- */
-A_STATUS
-wmi_control_rx_xtnd(struct wmi_t *wmip, void *osbuf)
-{
-    WMIX_CMD_HDR *cmd;
-    A_UINT16 id;
-    A_UINT8 *datap;
-    A_UINT32 len;
-    A_STATUS status = A_OK;
-
-    if (A_NETBUF_LEN(osbuf) < sizeof(WMIX_CMD_HDR)) {
-        A_DPRINTF(DBG_WMI, (DBGFMT "bad packet 1\n", DBGARG));
-        wmip->wmi_stats.cmd_len_err++;
-        A_NETBUF_FREE(osbuf);
-        return A_ERROR;
-    }
-
-    cmd = (WMIX_CMD_HDR *)A_NETBUF_DATA(osbuf);
-    id = cmd->commandId;
-
-    if (A_NETBUF_PULL(osbuf, sizeof(WMIX_CMD_HDR)) != A_OK) {
-        A_DPRINTF(DBG_WMI, (DBGFMT "bad packet 2\n", DBGARG));
-        wmip->wmi_stats.cmd_len_err++;
-        A_NETBUF_FREE(osbuf);
-        return A_ERROR;
-    }
-
-    datap = A_NETBUF_DATA(osbuf);
-    len = A_NETBUF_LEN(osbuf);
-
-    switch (id) {
-    case (WMIX_DSETOPENREQ_EVENTID):
-        status = wmi_dset_open_req_rx(wmip, datap, len);
-        break;
-#ifdef CONFIG_HOST_DSET_SUPPORT
-    case (WMIX_DSETCLOSE_EVENTID):
-        status = wmi_dset_close_rx(wmip, datap, len);
-        break;
-    case (WMIX_DSETDATAREQ_EVENTID):
-        status = wmi_dset_data_req_rx(wmip, datap, len);
-        break;
-#endif /* CONFIG_HOST_DSET_SUPPORT */
-#ifdef CONFIG_HOST_GPIO_SUPPORT
-    case (WMIX_GPIO_INTR_EVENTID):
-        wmi_gpio_intr_rx(wmip, datap, len);
-        break;
-    case (WMIX_GPIO_DATA_EVENTID):
-        wmi_gpio_data_rx(wmip, datap, len);
-        break;
-    case (WMIX_GPIO_ACK_EVENTID):
-        wmi_gpio_ack_rx(wmip, datap, len);
-        break;
-#endif /* CONFIG_HOST_GPIO_SUPPORT */
-    case (WMIX_HB_CHALLENGE_RESP_EVENTID):
-        wmi_hbChallengeResp_rx(wmip, datap, len);
-        break;
-    case (WMIX_DBGLOG_EVENTID):
-        wmi_dbglog_event_rx(wmip, datap, len);
-        break;
-    default:
-        A_DPRINTF(DBG_WMI|DBG_ERROR,
-            (DBGFMT "Unknown id 0x%x\n", DBGARG, id));
-        wmip->wmi_stats.cmd_id_err++;
-        status = A_ERROR;
-        break;
-    }
-
-    return status;
-}
-
-/*
- * Control Path
- */
-A_UINT32 cmdRecvNum;
-
-A_STATUS
-wmi_control_rx(struct wmi_t *wmip, void *osbuf)
-{
-    WMI_CMD_HDR *cmd;
-    A_UINT16 id;
-    A_UINT8 *datap;
-    A_UINT32 len, i, loggingReq;
-    A_STATUS status = A_OK;
-
-    A_ASSERT(osbuf != NULL);
-    if (A_NETBUF_LEN(osbuf) < sizeof(WMI_CMD_HDR)) {
-        A_DPRINTF(DBG_WMI, (DBGFMT "bad packet 1\n", DBGARG));
-        wmip->wmi_stats.cmd_len_err++;
-        A_NETBUF_FREE(osbuf);
-        return A_ERROR;
-    }
-
-    cmd = (WMI_CMD_HDR *)A_NETBUF_DATA(osbuf);
-    id = cmd->commandId;
-
-    if (A_NETBUF_PULL(osbuf, sizeof(WMI_CMD_HDR)) != A_OK) {
-        A_DPRINTF(DBG_WMI, (DBGFMT "bad packet 2\n", DBGARG));
-        wmip->wmi_stats.cmd_len_err++;
-        A_NETBUF_FREE(osbuf);
-        return A_ERROR;
-    }
-
-    datap = A_NETBUF_DATA(osbuf);
-    len = A_NETBUF_LEN(osbuf);
-
-    ar6000_get_driver_cfg(wmip->wmi_devt,
-                    AR6000_DRIVER_CFG_LOG_RAW_WMI_MSGS,
-                    &loggingReq);
-
-    if(loggingReq) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_WMI, ("WMI %d \n",id));
-        AR_DEBUG_PRINTF(ATH_DEBUG_WMI, ("WMI recv, MsgNo %d : ", cmdRecvNum));
-        for(i = 0; i < len; i++)
-            AR_DEBUG_PRINTF(ATH_DEBUG_WMI, ("%x ", datap[i]));
-        AR_DEBUG_PRINTF(ATH_DEBUG_WMI, ("\n"));
-    }
-
-    LOCK_WMI(wmip);
-    cmdRecvNum++;
-    UNLOCK_WMI(wmip);
-
-    switch (id) {
-    case (WMI_GET_BITRATE_CMDID):
-        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_GET_BITRATE_CMDID\n", DBGARG));
-        status = wmi_bitrate_reply_rx(wmip, datap, len);
-        break;
-    case (WMI_GET_CHANNEL_LIST_CMDID):
-        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_GET_CHANNEL_LIST_CMDID\n", DBGARG));
-        status = wmi_channelList_reply_rx(wmip, datap, len);
-        break;
-    case (WMI_GET_TX_PWR_CMDID):
-        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_GET_TX_PWR_CMDID\n", DBGARG));
-        status = wmi_txPwr_reply_rx(wmip, datap, len);
-        break;
-    case (WMI_READY_EVENTID):
-        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_READY_EVENTID\n", DBGARG));
-        status = wmi_ready_event_rx(wmip, datap, len);
-        A_WMI_SEND_EVENT_TO_APP(wmip->wmi_devt, id, datap, len);
-        A_WMI_DBGLOG_INIT_DONE(wmip->wmi_devt);
-        break;
-    case (WMI_CONNECT_EVENTID):
-        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_CONNECT_EVENTID\n", DBGARG));
-        status = wmi_connect_event_rx(wmip, datap, len);
-        A_WMI_SEND_EVENT_TO_APP(wmip->wmi_devt, id, datap, len);
-        break;
-    case (WMI_DISCONNECT_EVENTID):
-        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_DISCONNECT_EVENTID\n", DBGARG));
-        status = wmi_disconnect_event_rx(wmip, datap, len);
-        A_WMI_SEND_EVENT_TO_APP(wmip->wmi_devt, id, datap, len);
-        break;
-    case (WMI_TKIP_MICERR_EVENTID):
-        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_TKIP_MICERR_EVENTID\n", DBGARG));
-        status = wmi_tkip_micerr_event_rx(wmip, datap, len);
-        break;
-    case (WMI_BSSINFO_EVENTID):
-        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_BSSINFO_EVENTID\n", DBGARG));
-        status = wmi_bssInfo_event_rx(wmip, datap, len);
-        A_WMI_SEND_EVENT_TO_APP(wmip->wmi_devt, id, datap, len);
-        break;
-    case (WMI_REGDOMAIN_EVENTID):
-        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_REGDOMAIN_EVENTID\n", DBGARG));
-        status = wmi_regDomain_event_rx(wmip, datap, len);
-        break;
-    case (WMI_PSTREAM_TIMEOUT_EVENTID):
-        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_PSTREAM_TIMEOUT_EVENTID\n", DBGARG));
-        status = wmi_pstream_timeout_event_rx(wmip, datap, len);
-            /* pstreams are fatpipe abstractions that get implicitly created.
-             * User apps only deal with thinstreams. creation of a thinstream
-             * by the user or data traffic flow in an AC triggers implicit
-             * pstream creation. Do we need to send this event to App..?
-             * no harm in sending it.
-             */
-        A_WMI_SEND_EVENT_TO_APP(wmip->wmi_devt, id, datap, len);
-        break;
-    case (WMI_NEIGHBOR_REPORT_EVENTID):
-        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_NEIGHBOR_REPORT_EVENTID\n", DBGARG));
-        status = wmi_neighborReport_event_rx(wmip, datap, len);
-        break;
-    case (WMI_SCAN_COMPLETE_EVENTID):
-        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_SCAN_COMPLETE_EVENTID\n", DBGARG));
-        status = wmi_scanComplete_rx(wmip, datap, len);
-        A_WMI_SEND_EVENT_TO_APP(wmip->wmi_devt, id, datap, len);
-        break;
-    case (WMI_CMDERROR_EVENTID):
-        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_CMDERROR_EVENTID\n", DBGARG));
-        status = wmi_errorEvent_rx(wmip, datap, len);
-        break;
-    case (WMI_REPORT_STATISTICS_EVENTID):
-        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_REPORT_STATISTICS_EVENTID\n", DBGARG));
-        status = wmi_statsEvent_rx(wmip, datap, len);
-        break;
-    case (WMI_RSSI_THRESHOLD_EVENTID):
-        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_RSSI_THRESHOLD_EVENTID\n", DBGARG));
-        status = wmi_rssiThresholdEvent_rx(wmip, datap, len);
-        break;
-    case (WMI_ERROR_REPORT_EVENTID):
-        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_ERROR_REPORT_EVENTID\n", DBGARG));
-        status = wmi_reportErrorEvent_rx(wmip, datap, len);
-        A_WMI_SEND_EVENT_TO_APP(wmip->wmi_devt, id, datap, len);
-        break;
-    case (WMI_OPT_RX_FRAME_EVENTID):
-        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_OPT_RX_FRAME_EVENTID\n", DBGARG));
-        status = wmi_opt_frame_event_rx(wmip, datap, len);
-        break;
-    case (WMI_REPORT_ROAM_TBL_EVENTID):
-        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_REPORT_ROAM_TBL_EVENTID\n", DBGARG));
-        status = wmi_roam_tbl_event_rx(wmip, datap, len);
-        break;
-    case (WMI_EXTENSION_EVENTID):
-        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_EXTENSION_EVENTID\n", DBGARG));
-        status = wmi_control_rx_xtnd(wmip, osbuf);
-        break;
-    case (WMI_CAC_EVENTID):
-        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_CAC_EVENTID\n", DBGARG));
-        status = wmi_cac_event_rx(wmip, datap, len);
-        break;
-    case (WMI_REPORT_ROAM_DATA_EVENTID):
-        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_REPORT_ROAM_DATA_EVENTID\n", DBGARG));
-        status = wmi_roam_data_event_rx(wmip, datap, len);
-        break;
-#ifdef CONFIG_HOST_TCMD_SUPPORT
-    case (WMI_TEST_EVENTID):
-        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_TEST_EVENTID\n", DBGARG));
-        status = wmi_tcmd_test_report_rx(wmip, datap, len);
-        break;
-#endif
-    case (WMI_GET_FIXRATES_CMDID):
-        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_GET_FIXRATES_CMDID\n", DBGARG));
-        status = wmi_ratemask_reply_rx(wmip, datap, len);
-        break;
-    case (WMI_TX_RETRY_ERR_EVENTID):
-        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_TX_RETRY_ERR_EVENTID\n", DBGARG));
-        status = wmi_txRetryErrEvent_rx(wmip, datap, len);
-        A_WMI_SEND_EVENT_TO_APP(wmip->wmi_devt, id, datap, len);
-        break;
-    case (WMI_SNR_THRESHOLD_EVENTID):
-        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_SNR_THRESHOLD_EVENTID\n", DBGARG));
-        status = wmi_snrThresholdEvent_rx(wmip, datap, len);
-        A_WMI_SEND_EVENT_TO_APP(wmip->wmi_devt, id, datap, len);
-        break;
-    case (WMI_LQ_THRESHOLD_EVENTID):
-        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_LQ_THRESHOLD_EVENTID\n", DBGARG));
-        status = wmi_lqThresholdEvent_rx(wmip, datap, len);
-        A_WMI_SEND_EVENT_TO_APP(wmip->wmi_devt, id, datap, len);
-        break;
-    case (WMI_APLIST_EVENTID):
-        AR_DEBUG_PRINTF(ATH_DEBUG_WMI, ("Received APLIST Event\n"));
-        status = wmi_aplistEvent_rx(wmip, datap, len);
-        break;
-    case (WMI_GET_KEEPALIVE_CMDID):
-        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_GET_KEEPALIVE_CMDID\n", DBGARG));
-        status = wmi_keepalive_reply_rx(wmip, datap, len);
-        break;
-    case (WMI_GET_WOW_LIST_EVENTID):
-        status = wmi_get_wow_list_event_rx(wmip, datap, len);
-        break;
-    case (WMI_GET_PMKID_LIST_EVENTID):
-        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_GET_PMKID_LIST Event\n", DBGARG));
-        status = wmi_get_pmkid_list_event_rx(wmip, datap, len);
-        break;
-    default:
-        A_DPRINTF(DBG_WMI|DBG_ERROR,
-            (DBGFMT "Unknown id 0x%x\n", DBGARG, id));
-        wmip->wmi_stats.cmd_id_err++;
-        status = A_ERROR;
-        break;
-    }
-
-    A_NETBUF_FREE(osbuf);
-
-    return status;
-}
-
-static A_STATUS
-wmi_ready_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-{
-    WMI_READY_EVENT *ev = (WMI_READY_EVENT *)datap;
-
-    if (len < sizeof(WMI_READY_EVENT)) {
-        return A_EINVAL;
-    }
-    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-    wmip->wmi_ready = TRUE;
-    A_WMI_READY_EVENT(wmip->wmi_devt, ev->macaddr, ev->phyCapability);
-
-    return A_OK;
-}
-
-static A_STATUS
-wmi_connect_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-{
-    WMI_CONNECT_EVENT *ev;
-
-    if (len < sizeof(WMI_CONNECT_EVENT)) {
-        return A_EINVAL;
-    }
-    ev = (WMI_CONNECT_EVENT *)datap;
-    A_DPRINTF(DBG_WMI,
-        (DBGFMT "freq %d bssid %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n",
-        DBGARG, ev->channel,
-        ev->bssid[0], ev->bssid[1], ev->bssid[2],
-        ev->bssid[3], ev->bssid[4], ev->bssid[5]));
-
-    A_MEMCPY(wmip->wmi_bssid, ev->bssid, ATH_MAC_LEN);
-
-    A_WMI_CONNECT_EVENT(wmip->wmi_devt, ev->channel, ev->bssid,
-                         ev->listenInterval, ev->beaconInterval,
-                         ev->networkType, ev->beaconIeLen,
-                         ev->assocReqLen, ev->assocRespLen,
-                         ev->assocInfo);
-
-    return A_OK;
-}
-
-static A_STATUS
-wmi_regDomain_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-{
-    WMI_REG_DOMAIN_EVENT *ev;
-
-    if (len < sizeof(*ev)) {
-        return A_EINVAL;
-    }
-    ev = (WMI_REG_DOMAIN_EVENT *)datap;
-
-    A_WMI_REGDOMAIN_EVENT(wmip->wmi_devt, ev->regDomain);
-
-    return A_OK;
-}
-
-static A_STATUS
-wmi_neighborReport_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-{
-    WMI_NEIGHBOR_REPORT_EVENT *ev;
-    int numAps;
-
-    if (len < sizeof(*ev)) {
-        return A_EINVAL;
-    }
-    ev = (WMI_NEIGHBOR_REPORT_EVENT *)datap;
-    numAps = ev->numberOfAps;
-
-    if (len < (int)(sizeof(*ev) + ((numAps - 1) * sizeof(WMI_NEIGHBOR_INFO)))) {
-        return A_EINVAL;
-    }
-
-    A_WMI_NEIGHBORREPORT_EVENT(wmip->wmi_devt, numAps, ev->neighbor);
-
-    return A_OK;
-}
-
-static A_STATUS
-wmi_disconnect_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-{
-    WMI_DISCONNECT_EVENT *ev;
-
-    if (len < sizeof(WMI_DISCONNECT_EVENT)) {
-        return A_EINVAL;
-    }
-    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-
-    ev = (WMI_DISCONNECT_EVENT *)datap;
-
-    A_MEMZERO(wmip->wmi_bssid, sizeof(wmip->wmi_bssid));
-
-    A_WMI_DISCONNECT_EVENT(wmip->wmi_devt, ev->disconnectReason, ev->bssid,
-                            ev->assocRespLen, ev->assocInfo, ev->protocolReasonStatus);
-
-    return A_OK;
-}
-
-static A_STATUS
-wmi_tkip_micerr_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-{
-    WMI_TKIP_MICERR_EVENT *ev;
-
-    if (len < sizeof(*ev)) {
-        return A_EINVAL;
-    }
-    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-
-    ev = (WMI_TKIP_MICERR_EVENT *)datap;
-    A_WMI_TKIP_MICERR_EVENT(wmip->wmi_devt, ev->keyid, ev->ismcast);
-
-    return A_OK;
-}
-
-static A_STATUS
-wmi_bssInfo_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-{
-    bss_t *bss;
-    WMI_BSS_INFO_HDR *bih;
-    A_UINT8 *buf;
-    A_UINT32 nodeCachingAllowed;
-
-    if (len <= sizeof(WMI_BSS_INFO_HDR)) {
-        return A_EINVAL;
-    }
-
-    A_WMI_BSSINFO_EVENT_RX(wmip->wmi_devt, datap, len);
-    /* What is driver config for wlan node caching? */
-    if(ar6000_get_driver_cfg(wmip->wmi_devt,
-                    AR6000_DRIVER_CFG_GET_WLANNODECACHING,
-                    &nodeCachingAllowed) != A_OK) {
-        return A_EINVAL;
-    }
-
-    if(!nodeCachingAllowed) {
-        return A_OK;
-    }
-
-
-    bih = (WMI_BSS_INFO_HDR *)datap;
-    buf = datap + sizeof(WMI_BSS_INFO_HDR);
-    len -= sizeof(WMI_BSS_INFO_HDR);
-
-    A_DPRINTF(DBG_WMI2, (DBGFMT "bssInfo event - ch %u, rssi %02x, "
-              "bssid \"%02x:%02x:%02x:%02x:%02x:%02x\"\n", DBGARG,
-              bih->channel, (unsigned char) bih->rssi, bih->bssid[0],
-              bih->bssid[1], bih->bssid[2], bih->bssid[3], bih->bssid[4],
-              bih->bssid[5]));
-
-    if(wps_enable && (bih->frameType == PROBERESP_FTYPE) ) {
-	    printk("%s() A_OK 2\n", __FUNCTION__);
-		return A_OK;
-    }
-
-    bss = wlan_find_node(&wmip->wmi_scan_table, bih->bssid);
-    if (bss != NULL) {
-        /*
-         * Free up the node.  Not the most efficient process given
-         * we are about to allocate a new node but it is simple and should be
-         * adequate.
-         */
-        wlan_node_reclaim(&wmip->wmi_scan_table, bss);
-    }
-
-    bss = wlan_node_alloc(&wmip->wmi_scan_table, len);
-    if (bss == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    bss->ni_snr        = bih->snr;
-    bss->ni_rssi       = bih->rssi;
-    A_ASSERT(bss->ni_buf != NULL);
-    A_MEMCPY(bss->ni_buf, buf, len);
-
-    if (wlan_parse_beacon(bss->ni_buf, len, &bss->ni_cie) != A_OK) {
-        wlan_node_free(bss);
-        return A_EINVAL;
-    }
-
-    /*
-     * Update the frequency in ie_chan, overwriting of channel number
-     * which is done in wlan_parse_beacon
-     */
-    bss->ni_cie.ie_chan = bih->channel;
-    wlan_setup_node(&wmip->wmi_scan_table, bss, bih->bssid);
-
-    return A_OK;
-}
-
-static A_STATUS
-wmi_opt_frame_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-{
-    bss_t *bss;
-    WMI_OPT_RX_INFO_HDR *bih;
-    A_UINT8 *buf;
-
-    if (len <= sizeof(WMI_OPT_RX_INFO_HDR)) {
-        return A_EINVAL;
-    }
-
-    bih = (WMI_OPT_RX_INFO_HDR *)datap;
-    buf = datap + sizeof(WMI_OPT_RX_INFO_HDR);
-    len -= sizeof(WMI_OPT_RX_INFO_HDR);
-
-    A_DPRINTF(DBG_WMI2, (DBGFMT "opt frame event %2.2x:%2.2x\n", DBGARG,
-        bih->bssid[4], bih->bssid[5]));
-
-    bss = wlan_find_node(&wmip->wmi_scan_table, bih->bssid);
-    if (bss != NULL) {
-        /*
-         * Free up the node.  Not the most efficient process given
-         * we are about to allocate a new node but it is simple and should be
-         * adequate.
-         */
-        wlan_node_reclaim(&wmip->wmi_scan_table, bss);
-    }
-
-    bss = wlan_node_alloc(&wmip->wmi_scan_table, len);
-    if (bss == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    bss->ni_snr        = bih->snr;
-    bss->ni_cie.ie_chan = bih->channel;
-    A_ASSERT(bss->ni_buf != NULL);
-    A_MEMCPY(bss->ni_buf, buf, len);
-    wlan_setup_node(&wmip->wmi_scan_table, bss, bih->bssid);
-
-    return A_OK;
-}
-
-    /* This event indicates inactivity timeout of a fatpipe(pstream)
-     * at the target
-     */
-static A_STATUS
-wmi_pstream_timeout_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-{
-    WMI_PSTREAM_TIMEOUT_EVENT *ev;
-
-    if (len < sizeof(WMI_PSTREAM_TIMEOUT_EVENT)) {
-        return A_EINVAL;
-    }
-
-    A_DPRINTF(DBG_WMI, (DBGFMT "wmi_pstream_timeout_event_rx\n", DBGARG));
-
-    ev = (WMI_PSTREAM_TIMEOUT_EVENT *)datap;
-
-        /* When the pstream (fat pipe == AC) timesout, it means there were no
-         * thinStreams within this pstream & it got implicitly created due to
-         * data flow on this AC. We start the inactivity timer only for
-         * implicitly created pstream. Just reset the host state.
-         */
-        /* Set the activeTsids for this AC to 0 */
-    LOCK_WMI(wmip);
-    wmip->wmi_streamExistsForAC[ev->trafficClass]=0;
-    wmip->wmi_fatPipeExists &= ~(1 << ev->trafficClass);
-    UNLOCK_WMI(wmip);
-
-        /*Indicate inactivity to driver layer for this fatpipe (pstream)*/
-    A_WMI_STREAM_TX_INACTIVE(wmip->wmi_devt, ev->trafficClass);
-
-    return A_OK;
-}
-
-static A_STATUS
-wmi_bitrate_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-{
-    WMI_BIT_RATE_CMD *reply;
-    A_INT32 rate;
-
-    if (len < sizeof(WMI_BIT_RATE_CMD)) {
-        return A_EINVAL;
-    }
-    reply = (WMI_BIT_RATE_CMD *)datap;
-    A_DPRINTF(DBG_WMI,
-        (DBGFMT "Enter - rateindex %d\n", DBGARG, reply->rateIndex));
-
-    if (reply->rateIndex == RATE_AUTO) {
-        rate = RATE_AUTO;
-    } else {
-        rate = wmi_rateTable[(A_UINT32) reply->rateIndex];
-    }
-
-    A_WMI_BITRATE_RX(wmip->wmi_devt, rate);
-
-    return A_OK;
-}
-
-static A_STATUS
-wmi_ratemask_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-{
-    WMI_FIX_RATES_CMD *reply;
-
-    if (len < sizeof(WMI_BIT_RATE_CMD)) {
-        return A_EINVAL;
-    }
-    reply = (WMI_FIX_RATES_CMD *)datap;
-    A_DPRINTF(DBG_WMI,
-        (DBGFMT "Enter - fixed rate mask %x\n", DBGARG, reply->fixRateMask));
-
-    A_WMI_RATEMASK_RX(wmip->wmi_devt, reply->fixRateMask);
-
-    return A_OK;
-}
-
-static A_STATUS
-wmi_channelList_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-{
-    WMI_CHANNEL_LIST_REPLY *reply;
-
-    if (len < sizeof(WMI_CHANNEL_LIST_REPLY)) {
-        return A_EINVAL;
-    }
-    reply = (WMI_CHANNEL_LIST_REPLY *)datap;
-    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-
-    A_WMI_CHANNELLIST_RX(wmip->wmi_devt, reply->numChannels,
-                          reply->channelList);
-
-    return A_OK;
-}
-
-static A_STATUS
-wmi_txPwr_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-{
-    WMI_TX_PWR_REPLY *reply;
-
-    if (len < sizeof(*reply)) {
-        return A_EINVAL;
-    }
-    reply = (WMI_TX_PWR_REPLY *)datap;
-    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-
-    A_WMI_TXPWR_RX(wmip->wmi_devt, reply->dbM);
-
-    return A_OK;
-}
-static A_STATUS
-wmi_keepalive_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-{
-    WMI_GET_KEEPALIVE_CMD *reply;
-
-    if (len < sizeof(*reply)) {
-        return A_EINVAL;
-    }
-    reply = (WMI_GET_KEEPALIVE_CMD *)datap;
-    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-
-    A_WMI_KEEPALIVE_RX(wmip->wmi_devt, reply->configured);
-
-    return A_OK;
-}
-
-
-static A_STATUS
-wmi_dset_open_req_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-{
-    WMIX_DSETOPENREQ_EVENT *dsetopenreq;
-
-    if (len < sizeof(WMIX_DSETOPENREQ_EVENT)) {
-        return A_EINVAL;
-    }
-    dsetopenreq = (WMIX_DSETOPENREQ_EVENT *)datap;
-    A_DPRINTF(DBG_WMI,
-        (DBGFMT "Enter - dset_id=0x%x\n", DBGARG, dsetopenreq->dset_id));
-    A_WMI_DSET_OPEN_REQ(wmip->wmi_devt,
-                        dsetopenreq->dset_id,
-                        dsetopenreq->targ_dset_handle,
-                        dsetopenreq->targ_reply_fn,
-                        dsetopenreq->targ_reply_arg);
-
-    return A_OK;
-}
-
-#ifdef CONFIG_HOST_DSET_SUPPORT
-static A_STATUS
-wmi_dset_close_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-{
-    WMIX_DSETCLOSE_EVENT *dsetclose;
-
-    if (len < sizeof(WMIX_DSETCLOSE_EVENT)) {
-        return A_EINVAL;
-    }
-    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-
-    dsetclose = (WMIX_DSETCLOSE_EVENT *)datap;
-    A_WMI_DSET_CLOSE(wmip->wmi_devt, dsetclose->access_cookie);
-
-    return A_OK;
-}
-
-static A_STATUS
-wmi_dset_data_req_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-{
-    WMIX_DSETDATAREQ_EVENT *dsetdatareq;
-
-    if (len < sizeof(WMIX_DSETDATAREQ_EVENT)) {
-        return A_EINVAL;
-    }
-    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-
-    dsetdatareq = (WMIX_DSETDATAREQ_EVENT *)datap;
-    A_WMI_DSET_DATA_REQ(wmip->wmi_devt,
-                         dsetdatareq->access_cookie,
-                         dsetdatareq->offset,
-                         dsetdatareq->length,
-                         dsetdatareq->targ_buf,
-                         dsetdatareq->targ_reply_fn,
-                         dsetdatareq->targ_reply_arg);
-
-    return A_OK;
-}
-#endif /* CONFIG_HOST_DSET_SUPPORT */
-
-static A_STATUS
-wmi_scanComplete_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-{
-    WMI_SCAN_COMPLETE_EVENT *ev;
-
-    ev = (WMI_SCAN_COMPLETE_EVENT *)datap;
-    A_WMI_SCANCOMPLETE_EVENT(wmip->wmi_devt, ev->status);
-
-    return A_OK;
-}
-
-/*
- * Target is reporting a programming error.  This is for
- * developer aid only.  Target only checks a few common violations
- * and it is responsibility of host to do all error checking.
- * Behavior of target after wmi error event is undefined.
- * A reset is recommended.
- */
-static A_STATUS
-wmi_errorEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-{
-    WMI_CMD_ERROR_EVENT *ev;
-
-    ev = (WMI_CMD_ERROR_EVENT *)datap;
-    AR_DEBUG_PRINTF(ATH_DEBUG_WMI, ("Programming Error: cmd=%d ", ev->commandId));
-    switch (ev->errorCode) {
-    case (INVALID_PARAM):
-        AR_DEBUG_PRINTF(ATH_DEBUG_WMI, ("Illegal Parameter\n"));
-        break;
-    case (ILLEGAL_STATE):
-        AR_DEBUG_PRINTF(ATH_DEBUG_WMI, ("Illegal State\n"));
-        break;
-    case (INTERNAL_ERROR):
-        AR_DEBUG_PRINTF(ATH_DEBUG_WMI, ("Internal Error\n"));
-        break;
-    }
-
-    return A_OK;
-}
-
-
-static A_STATUS
-wmi_statsEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-{
-    WMI_TARGET_STATS *reply;
-
-    if (len < sizeof(*reply)) {
-        return A_EINVAL;
-    }
-    reply = (WMI_TARGET_STATS *)datap;
-    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-
-    A_WMI_TARGETSTATS_EVENT(wmip->wmi_devt, reply);
-
-    return A_OK;
-}
-
-static A_STATUS
-wmi_rssiThresholdEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-{
-    WMI_RSSI_THRESHOLD_EVENT *reply;
-
-    if (len < sizeof(*reply)) {
-        return A_EINVAL;
-    }
-    reply = (WMI_RSSI_THRESHOLD_EVENT *)datap;
-    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-
-    A_WMI_RSSI_THRESHOLD_EVENT(wmip->wmi_devt, reply->range, reply->rssi);
-
-    return A_OK;
-}
-
-
-static A_STATUS
-wmi_reportErrorEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-{
-    WMI_TARGET_ERROR_REPORT_EVENT *reply;
-
-    if (len < sizeof(*reply)) {
-        return A_EINVAL;
-    }
-    reply = (WMI_TARGET_ERROR_REPORT_EVENT *)datap;
-    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-
-    A_WMI_REPORT_ERROR_EVENT(wmip->wmi_devt, reply->errorVal);
-
-    return A_OK;
-}
-
-static A_STATUS
-wmi_cac_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-{
-    WMI_CAC_EVENT *reply;
-
-    if (len < sizeof(*reply)) {
-        return A_EINVAL;
-    }
-    reply = (WMI_CAC_EVENT *)datap;
-    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-
-    A_WMI_CAC_EVENT(wmip->wmi_devt, reply->ac,
-                reply->cac_indication, reply->statusCode,
-                reply->tspecSuggestion);
-
-    return A_OK;
-}
-
-static A_STATUS
-wmi_hbChallengeResp_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-{
-    WMIX_HB_CHALLENGE_RESP_EVENT *reply;
-
-    if (len < sizeof(*reply)) {
-        return A_EINVAL;
-    }
-    reply = (WMIX_HB_CHALLENGE_RESP_EVENT *)datap;
-    A_DPRINTF(DBG_WMI, (DBGFMT "wmi: challenge response event\n", DBGARG));
-
-    A_WMI_HBCHALLENGERESP_EVENT(wmip->wmi_devt, reply->cookie, reply->source);
-
-    return A_OK;
-}
-
-static A_STATUS
-wmi_roam_tbl_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-{
-    WMI_TARGET_ROAM_TBL *reply;
-
-    if (len < sizeof(*reply)) {
-        return A_EINVAL;
-    }
-    reply = (WMI_TARGET_ROAM_TBL *)datap;
-    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-
-    A_WMI_ROAM_TABLE_EVENT(wmip->wmi_devt, reply);
-
-    return A_OK;
-}
-
-static A_STATUS
-wmi_roam_data_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-{
-    WMI_TARGET_ROAM_DATA *reply;
-
-    if (len < sizeof(*reply)) {
-        return A_EINVAL;
-    }
-    reply = (WMI_TARGET_ROAM_DATA *)datap;
-    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-
-    A_WMI_ROAM_DATA_EVENT(wmip->wmi_devt, reply);
-
-    return A_OK;
-}
-
-static A_STATUS
-wmi_txRetryErrEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-{
-    WMI_TX_RETRY_ERR_EVENT *reply;
-
-    if (len < sizeof(*reply)) {
-        return A_EINVAL;
-    }
-    reply = (WMI_TX_RETRY_ERR_EVENT *)datap;
-    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-
-    A_WMI_TX_RETRY_ERR_EVENT(wmip->wmi_devt);
-
-    return A_OK;
-}
-
-static A_STATUS
-wmi_snrThresholdEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-{
-    WMI_SNR_THRESHOLD_EVENT *reply;
-
-    if (len < sizeof(*reply)) {
-        return A_EINVAL;
-    }
-    reply = (WMI_SNR_THRESHOLD_EVENT *)datap;
-    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-
-    A_WMI_SNR_THRESHOLD_EVENT_RX(wmip->wmi_devt, reply->range, reply->snr);
-
-    return A_OK;
-}
-
-static A_STATUS
-wmi_lqThresholdEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-{
-    WMI_LQ_THRESHOLD_EVENT *reply;
-
-    if (len < sizeof(*reply)) {
-        return A_EINVAL;
-    }
-    reply = (WMI_LQ_THRESHOLD_EVENT *)datap;
-    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-
-    A_WMI_LQ_THRESHOLD_EVENT_RX(wmip->wmi_devt, reply->range, reply->lq);
-
-    return A_OK;
-}
-
-static A_STATUS
-wmi_aplistEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-{
-    A_UINT16 ap_info_entry_size;
-    WMI_APLIST_EVENT *ev = (WMI_APLIST_EVENT *)datap;
-    WMI_AP_INFO_V1 *ap_info_v1;
-    A_UINT8 i;
-
-    if (len < sizeof(WMI_APLIST_EVENT)) {
-        return A_EINVAL;
-    }
-
-    if (ev->apListVer == APLIST_VER1) {
-        ap_info_entry_size = sizeof(WMI_AP_INFO_V1);
-        ap_info_v1 = (WMI_AP_INFO_V1 *)ev->apList;
-    } else {
-        return A_EINVAL;
-    }
-
-    AR_DEBUG_PRINTF(ATH_DEBUG_WMI, ("Number of APs in APLIST Event is %d\n", ev->numAP));
-    if (len < (int)(sizeof(WMI_APLIST_EVENT) +
-              (ev->numAP - 1) * ap_info_entry_size))
-    {
-        return A_EINVAL;
-    }
-
-    /*
-     * AP List Ver1 Contents
-     */
-    for (i = 0; i < ev->numAP; i++) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_WMI, ("AP#%d BSSID %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x "\
-                    "Channel %d\n", i,
-                   ap_info_v1->bssid[0], ap_info_v1->bssid[1],
-                   ap_info_v1->bssid[2], ap_info_v1->bssid[3],
-                   ap_info_v1->bssid[4], ap_info_v1->bssid[5],
-                   ap_info_v1->channel));
-        ap_info_v1++;
-    }
-    return A_OK;
-}
-
-static A_STATUS
-wmi_dbglog_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-{
-    A_UINT32 dropped;
-
-    dropped = *((A_UINT32 *)datap);
-    datap += sizeof(dropped);
-    len -= sizeof(dropped);
-    A_WMI_DBGLOG_EVENT(wmip->wmi_devt, dropped, datap, len);
-    return A_OK;
-}
-
-#ifdef CONFIG_HOST_GPIO_SUPPORT
-static A_STATUS
-wmi_gpio_intr_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-{
-    WMIX_GPIO_INTR_EVENT *gpio_intr = (WMIX_GPIO_INTR_EVENT *)datap;
-
-    A_DPRINTF(DBG_WMI,
-        (DBGFMT "Enter - intrmask=0x%x input=0x%x.\n", DBGARG,
-        gpio_intr->intr_mask, gpio_intr->input_values));
-
-    A_WMI_GPIO_INTR_RX(gpio_intr->intr_mask, gpio_intr->input_values);
-
-    return A_OK;
-}
-
-static A_STATUS
-wmi_gpio_data_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-{
-    WMIX_GPIO_DATA_EVENT *gpio_data = (WMIX_GPIO_DATA_EVENT *)datap;
-
-    A_DPRINTF(DBG_WMI,
-        (DBGFMT "Enter - reg=%d value=0x%x\n", DBGARG,
-        gpio_data->reg_id, gpio_data->value));
-
-    A_WMI_GPIO_DATA_RX(gpio_data->reg_id, gpio_data->value);
-
-    return A_OK;
-}
-
-static A_STATUS
-wmi_gpio_ack_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-{
-    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-
-    A_WMI_GPIO_ACK_RX();
-
-    return A_OK;
-}
-#endif /* CONFIG_HOST_GPIO_SUPPORT */
-
-/*
- * Called to send a wmi command. Command specific data is already built
- * on osbuf and current osbuf->data points to it.
- */
-A_STATUS
-wmi_cmd_send(struct wmi_t *wmip, void *osbuf, WMI_COMMAND_ID cmdId,
-               WMI_SYNC_FLAG syncflag)
-{
-#define IS_LONG_CMD(cmdId) ((cmdId == WMI_OPT_TX_FRAME_CMDID) || (cmdId == WMI_ADD_WOW_PATTERN_CMDID))
-    WMI_CMD_HDR         *cHdr;
-    WMI_PRI_STREAM_ID   streamID = WMI_CONTROL_PRI;
-
-    A_ASSERT(osbuf != NULL);
-
-    if (syncflag >= END_WMIFLAG) {
-        return A_EINVAL;
-    }
-
-    if ((syncflag == SYNC_BEFORE_WMIFLAG) || (syncflag == SYNC_BOTH_WMIFLAG)) {
-        /*
-         * We want to make sure all data currently queued is transmitted before
-         * the cmd execution.  Establish a new sync point.
-         */
-        wmi_sync_point(wmip);
-    }
-
-    if (A_NETBUF_PUSH(osbuf, sizeof(WMI_CMD_HDR)) != A_OK) {
-        return A_NO_MEMORY;
-    }
-
-    cHdr = (WMI_CMD_HDR *)A_NETBUF_DATA(osbuf);
-    cHdr->commandId = cmdId;
-
-    /*
-     * Send cmd, some via control pipe, others via data pipe
-     */
-    if (IS_LONG_CMD(cmdId)) {
-        wmi_data_hdr_add(wmip, osbuf, CNTL_MSGTYPE);
-        // TODO ... these can now go through the control endpoint via HTC 2.0
-        streamID = WMI_BEST_EFFORT_PRI;
-    }
-    A_WMI_CONTROL_TX(wmip->wmi_devt, osbuf, streamID);
-
-    if ((syncflag == SYNC_AFTER_WMIFLAG) || (syncflag == SYNC_BOTH_WMIFLAG)) {
-        /*
-         * We want to make sure all new data queued waits for the command to
-         * execute. Establish a new sync point.
-         */
-        wmi_sync_point(wmip);
-    }
-    return (A_OK);
-#undef IS_LONG_CMD
-}
-
-A_STATUS
-wmi_cmd_send_xtnd(struct wmi_t *wmip, void *osbuf, WMI_COMMAND_ID cmdId,
-                  WMI_SYNC_FLAG syncflag)
-{
-    WMIX_CMD_HDR     *cHdr;
-
-    if (A_NETBUF_PUSH(osbuf, sizeof(WMIX_CMD_HDR)) != A_OK) {
-        return A_NO_MEMORY;
-    }
-
-    cHdr = (WMIX_CMD_HDR *)A_NETBUF_DATA(osbuf);
-    cHdr->commandId = cmdId;
-
-    return wmi_cmd_send(wmip, osbuf, WMI_EXTENSION_CMDID, syncflag);
-}
-
-A_STATUS
-wmi_connect_cmd(struct wmi_t *wmip, NETWORK_TYPE netType,
-                DOT11_AUTH_MODE dot11AuthMode, AUTH_MODE authMode,
-                CRYPTO_TYPE pairwiseCrypto, A_UINT8 pairwiseCryptoLen,
-                CRYPTO_TYPE groupCrypto,A_UINT8 groupCryptoLen,
-                int ssidLength, A_UCHAR *ssid,
-                A_UINT8 *bssid, A_UINT16 channel, A_UINT32 ctrl_flags)
-{
-    void *osbuf;
-    WMI_CONNECT_CMD *cc;
-
-    if ((pairwiseCrypto == NONE_CRYPT) && (groupCrypto != NONE_CRYPT)) {
-        return A_EINVAL;
-    }
-    if ((pairwiseCrypto != NONE_CRYPT) && (groupCrypto == NONE_CRYPT)) {
-        return A_EINVAL;
-    }
-
-    osbuf = A_NETBUF_ALLOC(sizeof(WMI_CONNECT_CMD));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(WMI_CONNECT_CMD));
-
-    cc = (WMI_CONNECT_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cc, sizeof(*cc));
-
-    A_MEMCPY(cc->ssid, ssid, ssidLength);
-    cc->ssidLength          = ssidLength;
-    cc->networkType         = netType;
-    cc->dot11AuthMode       = dot11AuthMode;
-    cc->authMode            = authMode;
-    cc->pairwiseCryptoType  = pairwiseCrypto;
-    cc->pairwiseCryptoLen   = pairwiseCryptoLen;
-    cc->groupCryptoType     = groupCrypto;
-    cc->groupCryptoLen      = groupCryptoLen;
-    cc->channel             = channel;
-    cc->ctrl_flags          = ctrl_flags;
-
-    if (bssid != NULL) {
-        A_MEMCPY(cc->bssid, bssid, ATH_MAC_LEN);
-    }
-    if (wmi_set_keepalive_cmd(wmip, wmip->wmi_keepaliveInterval) != A_OK) {
-        return(A_ERROR);
-    }
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_CONNECT_CMDID, NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_reconnect_cmd(struct wmi_t *wmip, A_UINT8 *bssid, A_UINT16 channel)
-{
-    void *osbuf;
-    WMI_RECONNECT_CMD *cc;
-
-    osbuf = A_NETBUF_ALLOC(sizeof(WMI_RECONNECT_CMD));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(WMI_RECONNECT_CMD));
-
-    cc = (WMI_RECONNECT_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cc, sizeof(*cc));
-
-    cc->channel = channel;
-
-    if (bssid != NULL) {
-        A_MEMCPY(cc->bssid, bssid, ATH_MAC_LEN);
-    }
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_RECONNECT_CMDID, NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_disconnect_cmd(struct wmi_t *wmip)
-{
-    void *osbuf;
-    A_STATUS status;
-
-    osbuf = A_NETBUF_ALLOC(0);      /* no payload */
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    /* Bug fix for 24817(elevator bug) - the disconnect command does not
-       need to do a SYNC before.*/
-    status = (wmi_cmd_send(wmip, osbuf, WMI_DISCONNECT_CMDID,
-                         NO_SYNC_WMIFLAG));
-
-    return status;
-}
-
-A_STATUS
-wmi_startscan_cmd(struct wmi_t *wmip, WMI_SCAN_TYPE scanType,
-                  A_BOOL forceFgScan, A_BOOL isLegacy,
-                  A_UINT32 homeDwellTime, A_UINT32 forceScanInterval)
-{
-    void *osbuf;
-    WMI_START_SCAN_CMD *sc;
-
-    if ((scanType != WMI_LONG_SCAN) && (scanType != WMI_SHORT_SCAN)) {
-        return A_EINVAL;
-    }
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*sc));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*sc));
-
-    sc = (WMI_START_SCAN_CMD *)(A_NETBUF_DATA(osbuf));
-    sc->scanType = scanType;
-    sc->forceFgScan = forceFgScan;
-    sc->isLegacy = isLegacy;
-    sc->homeDwellTime = homeDwellTime;
-    sc->forceScanInterval = forceScanInterval;
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_START_SCAN_CMDID, NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_scanparams_cmd(struct wmi_t *wmip, A_UINT16 fg_start_sec,
-                   A_UINT16 fg_end_sec, A_UINT16 bg_sec,
-                   A_UINT16 minact_chdw_msec, A_UINT16 maxact_chdw_msec,
-                   A_UINT16 pas_chdw_msec,
-                   A_UINT8 shScanRatio, A_UINT8 scanCtrlFlags,
-                   A_UINT32 max_dfsch_act_time)
-{
-    void *osbuf;
-    WMI_SCAN_PARAMS_CMD *sc;
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*sc));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*sc));
-
-    sc = (WMI_SCAN_PARAMS_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(sc, sizeof(*sc));
-    sc->fg_start_period  = fg_start_sec;
-    sc->fg_end_period    = fg_end_sec;
-    sc->bg_period        = bg_sec;
-    sc->minact_chdwell_time = minact_chdw_msec;
-    sc->maxact_chdwell_time = maxact_chdw_msec;
-    sc->pas_chdwell_time = pas_chdw_msec;
-    sc->shortScanRatio   = shScanRatio;
-    sc->scanCtrlFlags    = scanCtrlFlags;
-    sc->max_dfsch_act_time = max_dfsch_act_time;
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_SCAN_PARAMS_CMDID,
-                         NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_bssfilter_cmd(struct wmi_t *wmip, A_UINT8 filter, A_UINT32 ieMask)
-{
-    void *osbuf;
-    WMI_BSS_FILTER_CMD *cmd;
-
-    if (filter >= LAST_BSS_FILTER) {
-        return A_EINVAL;
-    }
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-
-    cmd = (WMI_BSS_FILTER_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, sizeof(*cmd));
-    cmd->bssFilter = filter;
-    cmd->ieMask = ieMask;
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_BSS_FILTER_CMDID,
-                         NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_probedSsid_cmd(struct wmi_t *wmip, A_UINT8 index, A_UINT8 flag,
-                   A_UINT8 ssidLength, A_UCHAR *ssid)
-{
-    void *osbuf;
-    WMI_PROBED_SSID_CMD *cmd;
-
-    if (index > MAX_PROBED_SSID_INDEX) {
-        return A_EINVAL;
-    }
-    if (ssidLength > sizeof(cmd->ssid)) {
-        return A_EINVAL;
-    }
-    if ((flag & (DISABLE_SSID_FLAG | ANY_SSID_FLAG)) && (ssidLength > 0)) {
-        return A_EINVAL;
-    }
-    if ((flag & SPECIFIC_SSID_FLAG) && !ssidLength) {
-        return A_EINVAL;
-    }
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-
-    cmd = (WMI_PROBED_SSID_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, sizeof(*cmd));
-    cmd->entryIndex = index;
-    cmd->flag       = flag;
-    cmd->ssidLength = ssidLength;
-    A_MEMCPY(cmd->ssid, ssid, ssidLength);
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_PROBED_SSID_CMDID,
-                         NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_listeninterval_cmd(struct wmi_t *wmip, A_UINT16 listenInterval, A_UINT16 listenBeacons)
-{
-    void *osbuf;
-    WMI_LISTEN_INT_CMD *cmd;
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-
-    cmd = (WMI_LISTEN_INT_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, sizeof(*cmd));
-    cmd->listenInterval = listenInterval;
-    cmd->numBeacons = listenBeacons;
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_LISTEN_INT_CMDID,
-                         NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_bmisstime_cmd(struct wmi_t *wmip, A_UINT16 bmissTime, A_UINT16 bmissBeacons)
-{
-    void *osbuf;
-    WMI_BMISS_TIME_CMD *cmd;
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-
-    cmd = (WMI_BMISS_TIME_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, sizeof(*cmd));
-    cmd->bmissTime = bmissTime;
-    cmd->numBeacons =  bmissBeacons;
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_BMISS_TIME_CMDID,
-                         NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_associnfo_cmd(struct wmi_t *wmip, A_UINT8 ieType,
-                     A_UINT8 ieLen, A_UINT8 *ieInfo)
-{
-    void *osbuf;
-    WMI_SET_ASSOC_INFO_CMD *cmd;
-    A_UINT16 cmdLen;
-
-    cmdLen = sizeof(*cmd) + ieLen - 1;
-    osbuf = A_NETBUF_ALLOC(cmdLen);
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, cmdLen);
-
-    cmd = (WMI_SET_ASSOC_INFO_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, cmdLen);
-    cmd->ieType = ieType;
-    cmd->bufferSize = ieLen;
-    A_MEMCPY(cmd->assocInfo, ieInfo, ieLen);
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_ASSOC_INFO_CMDID,
-                         NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_powermode_cmd(struct wmi_t *wmip, A_UINT8 powerMode)
-{
-    void *osbuf;
-    WMI_POWER_MODE_CMD *cmd;
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-
-    cmd = (WMI_POWER_MODE_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, sizeof(*cmd));
-    cmd->powerMode = powerMode;
-    wmip->wmi_powerMode = powerMode;
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_POWER_MODE_CMDID,
-                         NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_ibsspmcaps_cmd(struct wmi_t *wmip, A_UINT8 pmEnable, A_UINT8 ttl,
-                   A_UINT16 atim_windows, A_UINT16 timeout_value)
-{
-    void *osbuf;
-    WMI_IBSS_PM_CAPS_CMD *cmd;
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-
-    cmd = (WMI_IBSS_PM_CAPS_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, sizeof(*cmd));
-    cmd->power_saving = pmEnable;
-    cmd->ttl = ttl;
-    cmd->atim_windows = atim_windows;
-    cmd->timeout_value = timeout_value;
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_IBSS_PM_CAPS_CMDID,
-                         NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_pmparams_cmd(struct wmi_t *wmip, A_UINT16 idlePeriod,
-                 A_UINT16 psPollNum, A_UINT16 dtimPolicy)
-{
-    void *osbuf;
-    WMI_POWER_PARAMS_CMD *pm;
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*pm));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*pm));
-
-    pm = (WMI_POWER_PARAMS_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(pm, sizeof(*pm));
-    pm->idle_period   = idlePeriod;
-    pm->pspoll_number = psPollNum;
-    pm->dtim_policy   = dtimPolicy;
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_POWER_PARAMS_CMDID,
-                         NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_disctimeout_cmd(struct wmi_t *wmip, A_UINT8 timeout)
-{
-    void *osbuf;
-    WMI_DISC_TIMEOUT_CMD *cmd;
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-
-    cmd = (WMI_DISC_TIMEOUT_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, sizeof(*cmd));
-    cmd->disconnectTimeout = timeout;
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_DISC_TIMEOUT_CMDID,
-                         NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_addKey_cmd(struct wmi_t *wmip, A_UINT8 keyIndex, CRYPTO_TYPE keyType,
-               A_UINT8 keyUsage, A_UINT8 keyLength, A_UINT8 *keyRSC,
-               A_UINT8 *keyMaterial, A_UINT8 key_op_ctrl,
-               WMI_SYNC_FLAG sync_flag)
-{
-    void *osbuf;
-    WMI_ADD_CIPHER_KEY_CMD *cmd;
-
-    if ((keyIndex > WMI_MAX_KEY_INDEX) || (keyLength > WMI_MAX_KEY_LEN) ||
-        (keyMaterial == NULL))
-    {
-        return A_EINVAL;
-    }
-
-    if ((WEP_CRYPT != keyType) && (NULL == keyRSC)) {
-        return A_EINVAL;
-    }
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-
-    cmd = (WMI_ADD_CIPHER_KEY_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, sizeof(*cmd));
-    cmd->keyIndex = keyIndex;
-    cmd->keyType  = keyType;
-    cmd->keyUsage = keyUsage;
-    cmd->keyLength = keyLength;
-    A_MEMCPY(cmd->key, keyMaterial, keyLength);
-    if (NULL != keyRSC) {
-        A_MEMCPY(cmd->keyRSC, keyRSC, sizeof(cmd->keyRSC));
-    }
-    cmd->key_op_ctrl = key_op_ctrl;
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_ADD_CIPHER_KEY_CMDID, sync_flag));
-}
-
-A_STATUS
-wmi_add_krk_cmd(struct wmi_t *wmip, A_UINT8 *krk)
-{
-    void *osbuf;
-    WMI_ADD_KRK_CMD *cmd;
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-
-    cmd = (WMI_ADD_KRK_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, sizeof(*cmd));
-    A_MEMCPY(cmd->krk, krk, WMI_KRK_LEN);
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_ADD_KRK_CMDID, NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_delete_krk_cmd(struct wmi_t *wmip)
-{
-    void *osbuf;
-
-    osbuf = A_NETBUF_ALLOC(0);
-
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_DELETE_KRK_CMDID, NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_deleteKey_cmd(struct wmi_t *wmip, A_UINT8 keyIndex)
-{
-    void *osbuf;
-    WMI_DELETE_CIPHER_KEY_CMD *cmd;
-
-    if (keyIndex > WMI_MAX_KEY_INDEX) {
-        return A_EINVAL;
-    }
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-
-    cmd = (WMI_DELETE_CIPHER_KEY_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, sizeof(*cmd));
-    cmd->keyIndex = keyIndex;
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_DELETE_CIPHER_KEY_CMDID,
-                         NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_setPmkid_cmd(struct wmi_t *wmip, A_UINT8 *bssid, A_UINT8 *pmkId,
-                 A_BOOL set)
-{
-    void *osbuf;
-    WMI_SET_PMKID_CMD *cmd;
-
-    if (bssid == NULL) {
-        return A_EINVAL;
-    }
-
-    if ((set == TRUE) && (pmkId == NULL)) {
-        return A_EINVAL;
-    }
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-
-    cmd = (WMI_SET_PMKID_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMCPY(cmd->bssid, bssid, sizeof(cmd->bssid));
-    if (set == TRUE) {
-        A_MEMCPY(cmd->pmkid, pmkId, sizeof(cmd->pmkid));
-        cmd->enable = PMKID_ENABLE;
-    } else {
-        A_MEMZERO(cmd->pmkid, sizeof(cmd->pmkid));
-        cmd->enable = PMKID_DISABLE;
-    }
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_PMKID_CMDID, NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_set_tkip_countermeasures_cmd(struct wmi_t *wmip, A_BOOL en)
-{
-    void *osbuf;
-    WMI_SET_TKIP_COUNTERMEASURES_CMD *cmd;
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-
-    cmd = (WMI_SET_TKIP_COUNTERMEASURES_CMD *)(A_NETBUF_DATA(osbuf));
-    cmd->cm_en = (en == TRUE)? WMI_TKIP_CM_ENABLE : WMI_TKIP_CM_DISABLE;
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_TKIP_COUNTERMEASURES_CMDID,
-            NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_set_akmp_params_cmd(struct wmi_t *wmip,
-                        WMI_SET_AKMP_PARAMS_CMD *akmpParams)
-{
-    void *osbuf;
-    WMI_SET_AKMP_PARAMS_CMD *cmd;
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-    cmd = (WMI_SET_AKMP_PARAMS_CMD *)(A_NETBUF_DATA(osbuf));
-    cmd->akmpInfo = akmpParams->akmpInfo;
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_AKMP_PARAMS_CMDID,
-            NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_set_pmkid_list_cmd(struct wmi_t *wmip,
-                       WMI_SET_PMKID_LIST_CMD *pmkInfo)
-{
-    void *osbuf;
-    WMI_SET_PMKID_LIST_CMD *cmd;
-    A_UINT16 cmdLen;
-    A_UINT8 i;
-
-    cmdLen = sizeof(pmkInfo->numPMKID) +
-             pmkInfo->numPMKID * sizeof(WMI_PMKID);
-
-    osbuf = A_NETBUF_ALLOC(cmdLen);
-
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, cmdLen);
-    cmd = (WMI_SET_PMKID_LIST_CMD *)(A_NETBUF_DATA(osbuf));
-    cmd->numPMKID = pmkInfo->numPMKID;
-
-    for (i = 0; i < cmd->numPMKID; i++) {
-        A_MEMCPY(&cmd->pmkidList[i], &pmkInfo->pmkidList[i],
-                 WMI_PMKID_LEN);
-    }
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_PMKID_LIST_CMDID,
-            NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_get_pmkid_list_cmd(struct wmi_t *wmip)
-{
-    void *osbuf;
-
-    osbuf = A_NETBUF_ALLOC(0);      /* no payload */
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_GET_PMKID_LIST_CMDID,
-                         NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_dataSync_send(struct wmi_t *wmip, void *osbuf, WMI_PRI_STREAM_ID streamID)
-{
-    WMI_DATA_HDR     *dtHdr;
-
-    A_ASSERT(streamID != WMI_CONTROL_PRI);
-    A_ASSERT(osbuf != NULL);
-
-    if (A_NETBUF_PUSH(osbuf, sizeof(WMI_DATA_HDR)) != A_OK) {
-        return A_NO_MEMORY;
-    }
-
-    dtHdr = (WMI_DATA_HDR *)A_NETBUF_DATA(osbuf);
-    dtHdr->info =
-      (SYNC_MSGTYPE & WMI_DATA_HDR_MSG_TYPE_MASK) << WMI_DATA_HDR_MSG_TYPE_SHIFT;
-
-    A_DPRINTF(DBG_WMI, (DBGFMT "Enter - streamID %d\n", DBGARG, streamID));
-
-    return (A_WMI_CONTROL_TX(wmip->wmi_devt, osbuf, streamID));
-}
-
-typedef struct _WMI_DATA_SYNC_BUFS {
-    A_UINT8            trafficClass;
-    void               *osbuf;
-}WMI_DATA_SYNC_BUFS;
-
-static A_STATUS
-wmi_sync_point(struct wmi_t *wmip)
-{
-	void *cmd_osbuf;
-    WMI_DATA_SYNC_BUFS dataSyncBufs[WMM_NUM_AC];
-	A_UINT8 i,numPriStreams=0;
-	A_STATUS status;
-
-	A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-
-    memset(dataSyncBufs,0,sizeof(dataSyncBufs));
-
-    /* lock out while we walk through the priority list and assemble our local array */
-    LOCK_WMI(wmip);
-
-    for (i=0; i < WMM_NUM_AC ; i++) {
-		if (wmip->wmi_fatPipeExists & (1 << i)) {
-            numPriStreams++;
-            dataSyncBufs[numPriStreams-1].trafficClass = i;
-        }
-    }
-
-    UNLOCK_WMI(wmip);
-
-    /* dataSyncBufs is now filled with entries (starting at index 0) containing valid streamIDs */
-
-    do {
-	    /*
-	     * We allocate all network buffers needed so we will be able to
-	     * send all required frames.
-	     */
-	    cmd_osbuf = A_NETBUF_ALLOC(0);      /* no payload */
-	    if (cmd_osbuf == NULL) {
-		    status = A_NO_MEMORY;
-            break;
-	    }
-
-	    for (i=0; i < numPriStreams ; i++) {
-	        dataSyncBufs[i].osbuf = A_NETBUF_ALLOC(0);
-            if (dataSyncBufs[i].osbuf == NULL) {
-                status = A_NO_MEMORY;
-                break;
-            }
-	    } //end for
-
-	    /*
-	     * Send sync cmd followed by sync data messages on all endpoints being
-	     * used
-	     */
-	    status = wmi_cmd_send(wmip, cmd_osbuf, WMI_SYNCHRONIZE_CMDID,
-						  NO_SYNC_WMIFLAG);
-
-        if (A_FAILED(status)) {
-            break;
-        }
-            /* cmd buffer sent, we no longer own it */
-        cmd_osbuf = NULL;
-
-		for(i=0; i < numPriStreams; i++) {
-            A_ASSERT(dataSyncBufs[i].osbuf != NULL);
-
-            status = wmi_dataSync_send(wmip, dataSyncBufs[i].osbuf,
-                        WMI_ACCESSCATEGORY_WMISTREAM(wmip,dataSyncBufs[i].trafficClass));
-
-            if (A_FAILED(status)) {
-                break;
-            }
-            /* we don't own this buffer anymore, NULL it out of the array so it
-             * won't get cleaned up */
-            dataSyncBufs[i].osbuf = NULL;
-		} //end for
-
-    } while(FALSE);
-
-    /* free up any resources left over (possibly due to an error) */
-
-    if (cmd_osbuf != NULL) {
-        A_NETBUF_FREE(cmd_osbuf);
-    }
-
-    for (i = 0; i < numPriStreams; i++) {
-        if (dataSyncBufs[i].osbuf != NULL) {
-            A_NETBUF_FREE(dataSyncBufs[i].osbuf);
-        }
-    }
-
-	return (status);
-}
-
-A_STATUS
-wmi_create_pstream_cmd(struct wmi_t *wmip, WMI_CREATE_PSTREAM_CMD *params)
-{
-    void *osbuf;
-    WMI_CREATE_PSTREAM_CMD *cmd;
-	A_UINT16 activeTsids=0;
-    A_UINT8 fatPipeExistsForAC=0;
-
-    /* Validate all the parameters. */
-    if( !((params->userPriority < 8) &&
-         (params->userPriority <= 0x7) &&
-         (convert_userPriority_to_trafficClass(params->userPriority) == params->trafficClass)  &&
-         (params->trafficDirection == UPLINK_TRAFFIC ||
-            params->trafficDirection == DNLINK_TRAFFIC ||
-            params->trafficDirection == BIDIR_TRAFFIC) &&
-         (params->trafficType == TRAFFIC_TYPE_APERIODIC ||
-            params->trafficType == TRAFFIC_TYPE_PERIODIC ) &&
-         (params->voicePSCapability == DISABLE_FOR_THIS_AC  ||
-            params->voicePSCapability == ENABLE_FOR_THIS_AC ||
-            params->voicePSCapability == ENABLE_FOR_ALL_AC) &&
-         (params->tsid == WMI_IMPLICIT_PSTREAM || params->tsid <= WMI_MAX_THINSTREAM)) )
-    {
-        return  A_EINVAL;
-    }
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-
-    A_DPRINTF(DBG_WMI,
-        (DBGFMT "Sending create_pstream_cmd: ac=%d    tsid:%d\n", DBGARG,
-        params->trafficClass, params->tsid));
-
-    cmd = (WMI_CREATE_PSTREAM_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, sizeof(*cmd));
-    A_MEMCPY(cmd, params, sizeof(*cmd));
-
-        /* this is an implicitly created Fat pipe */
-    if (params->tsid == WMI_IMPLICIT_PSTREAM) {
-        LOCK_WMI(wmip);
-        fatPipeExistsForAC = (wmip->wmi_fatPipeExists & (1 << params->trafficClass));
-        wmip->wmi_fatPipeExists |= (1<<params->trafficClass);
-        UNLOCK_WMI(wmip);
-    } else {
-            /* this is an explicitly created thin stream within a fat pipe */
-        LOCK_WMI(wmip);
-        fatPipeExistsForAC = (wmip->wmi_fatPipeExists & (1 << params->trafficClass));
-        activeTsids = wmip->wmi_streamExistsForAC[params->trafficClass];
-        wmip->wmi_streamExistsForAC[params->trafficClass] |= (1<<params->tsid);
-            /* if a thinstream becomes active, the fat pipe automatically
-            * becomes active
-            */
-        wmip->wmi_fatPipeExists |= (1<<params->trafficClass);
-        UNLOCK_WMI(wmip);
-    }
-
-        /* Indicate activty change to driver layer only if this is the
-         * first TSID to get created in this AC explicitly or an implicit
-         * fat pipe is getting created.
-         */
-    if (!fatPipeExistsForAC) {
-        A_WMI_STREAM_TX_ACTIVE(wmip->wmi_devt, params->trafficClass);
-    }
-
-    /* mike: should be SYNC_BEFORE_WMIFLAG */
-    return (wmi_cmd_send(wmip, osbuf, WMI_CREATE_PSTREAM_CMDID,
-                         NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_delete_pstream_cmd(struct wmi_t *wmip, A_UINT8 trafficClass, A_UINT8 tsid)
-{
-    void *osbuf;
-    WMI_DELETE_PSTREAM_CMD *cmd;
-    A_STATUS status;
-	A_UINT16 activeTsids=0;
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-
-    cmd = (WMI_DELETE_PSTREAM_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, sizeof(*cmd));
-
-    cmd->trafficClass = trafficClass;
-    cmd->tsid = tsid;
-
-    LOCK_WMI(wmip);
-    activeTsids = wmip->wmi_streamExistsForAC[trafficClass];
-    UNLOCK_WMI(wmip);
-
-        /* Check if the tsid was created & exists */
-    if (!(activeTsids & (1<<tsid))) {
-
-        A_DPRINTF(DBG_WMI,
-        (DBGFMT "TSID %d does'nt exist for trafficClass: %d\n", DBGARG, tsid, trafficClass));
-            /* TODO: return a more appropriate err code */
-        return A_ERROR;
-    }
-
-    A_DPRINTF(DBG_WMI,
-        (DBGFMT "Sending delete_pstream_cmd: trafficClass: %d tsid=%d\n", DBGARG, trafficClass, tsid));
-
-    status = (wmi_cmd_send(wmip, osbuf, WMI_DELETE_PSTREAM_CMDID,
-                         SYNC_BEFORE_WMIFLAG));
-
-    LOCK_WMI(wmip);
-    wmip->wmi_streamExistsForAC[trafficClass] &= ~(1<<tsid);
-    activeTsids = wmip->wmi_streamExistsForAC[trafficClass];
-    UNLOCK_WMI(wmip);
-
-
-        /* Indicate stream inactivity to driver layer only if all tsids
-         * within this AC are deleted.
-         */
-    if(!activeTsids) {
-        A_WMI_STREAM_TX_INACTIVE(wmip->wmi_devt, trafficClass);
-        wmip->wmi_fatPipeExists &= ~(1<<trafficClass);
-    }
-
-    return status;
-}
-
-/*
- * used to set the bit rate.  rate is in Kbps.  If rate == -1
- * then auto selection is used.
- */
-A_STATUS
-wmi_set_bitrate_cmd(struct wmi_t *wmip, A_INT32 rate)
-{
-    void *osbuf;
-    WMI_BIT_RATE_CMD *cmd;
-    A_INT8 index;
-
-    if (rate != -1) {
-        index = wmi_validate_bitrate(wmip, rate);
-        if(index == A_EINVAL){
-            return A_EINVAL;
-        }
-    } else {
-        index = -1;
-    }
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-
-    cmd = (WMI_BIT_RATE_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, sizeof(*cmd));
-
-    cmd->rateIndex = index;
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_BITRATE_CMDID, NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_get_bitrate_cmd(struct wmi_t *wmip)
-{
-    void *osbuf;
-
-    osbuf = A_NETBUF_ALLOC(0);      /* no payload */
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_GET_BITRATE_CMDID, NO_SYNC_WMIFLAG));
-}
-
-/*
- * Returns TRUE iff the given rate index is legal in the current PHY mode.
- */
-A_BOOL
-wmi_is_bitrate_index_valid(struct wmi_t *wmip, A_UINT32 rateIndex)
-{
-    WMI_PHY_MODE phyMode = wmip->wmi_phyMode;
-    A_BOOL isValid = TRUE;
-    switch(phyMode) {
-        case WMI_11A_MODE:
-            if ((rateIndex < MODE_A_SUPPORT_RATE_START) || (rateIndex > MODE_A_SUPPORT_RATE_STOP)) {
-                isValid = FALSE;
-            }
-            break;
-
-        case WMI_11B_MODE:
-            if ((rateIndex < MODE_B_SUPPORT_RATE_START) || (rateIndex > MODE_B_SUPPORT_RATE_STOP)) {
-                isValid = FALSE;
-            }
-            break;
-
-        case WMI_11GONLY_MODE:
-            if ((rateIndex < MODE_GONLY_SUPPORT_RATE_START) || (rateIndex > MODE_GONLY_SUPPORT_RATE_STOP)) {
-                isValid = FALSE;
-            }
-            break;
-
-        case WMI_11G_MODE:
-        case WMI_11AG_MODE:
-            if ((rateIndex < MODE_G_SUPPORT_RATE_START) || (rateIndex > MODE_G_SUPPORT_RATE_STOP)) {
-                isValid = FALSE;
-            }
-            break;
-
-        default:
-            A_ASSERT(FALSE);
-            break;
-    }
-
-    return isValid;
-}
-
-A_INT8
-wmi_validate_bitrate(struct wmi_t *wmip, A_INT32 rate)
-{
-    A_INT8 i;
-    if (rate != -1)
-    {
-        for (i=0;;i++)
-        {
-            if (wmi_rateTable[(A_UINT32) i] == 0) {
-                return A_EINVAL;
-            }
-            if (wmi_rateTable[(A_UINT32) i] == rate) {
-                break;
-            }
-        }
-    }
-    else{
-     i = -1;
-    }
-
-    if(wmi_is_bitrate_index_valid(wmip, i) != TRUE) {
-        return A_EINVAL;
-    }
-
-    return i;
-}
-
-A_STATUS
-wmi_set_fixrates_cmd(struct wmi_t *wmip, A_INT16 fixRatesMask)
-{
-    void *osbuf;
-    WMI_FIX_RATES_CMD *cmd;
-    A_UINT32 rateIndex;
-
-    /* Make sure all rates in the mask are valid in the current PHY mode */
-    for(rateIndex = 0; rateIndex < MAX_NUMBER_OF_SUPPORT_RATES; rateIndex++) {
-       if((1 << rateIndex) & (A_UINT32)fixRatesMask) {
-            if(wmi_is_bitrate_index_valid(wmip, rateIndex) != TRUE) {
-                A_DPRINTF(DBG_WMI, (DBGFMT "Set Fix Rates command failed: Given rate is illegal in current PHY mode\n", DBGARG));
-                return A_EINVAL;
-            }
-       }
-    }
-
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-
-    cmd = (WMI_FIX_RATES_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, sizeof(*cmd));
-
-    cmd->fixRateMask = fixRatesMask;
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_FIXRATES_CMDID, NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_get_ratemask_cmd(struct wmi_t *wmip)
-{
-    void *osbuf;
-
-    osbuf = A_NETBUF_ALLOC(0);      /* no payload */
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_GET_FIXRATES_CMDID, NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_get_channelList_cmd(struct wmi_t *wmip)
-{
-    void *osbuf;
-
-    osbuf = A_NETBUF_ALLOC(0);      /* no payload */
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_GET_CHANNEL_LIST_CMDID,
-                         NO_SYNC_WMIFLAG));
-}
-
-/*
- * used to generate a wmi sey channel Parameters cmd.
- * mode should always be specified and corresponds to the phy mode of the
- * wlan.
- * numChan should alway sbe specified. If zero indicates that all available
- * channels should be used.
- * channelList is an array of channel frequencies (in Mhz) which the radio
- * should limit its operation to.  It should be NULL if numChan == 0.  Size of
- * array should correspond to numChan entries.
- */
-A_STATUS
-wmi_set_channelParams_cmd(struct wmi_t *wmip, A_UINT8 scanParam,
-                          WMI_PHY_MODE mode, A_INT8 numChan,
-                          A_UINT16 *channelList)
-{
-    void *osbuf;
-    WMI_CHANNEL_PARAMS_CMD *cmd;
-    A_INT8 size;
-
-    size = sizeof (*cmd);
-
-    if (numChan) {
-        if (numChan > WMI_MAX_CHANNELS) {
-            return A_EINVAL;
-        }
-        size += sizeof(A_UINT16) * (numChan - 1);
-    }
-
-    osbuf = A_NETBUF_ALLOC(size);
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, size);
-
-    cmd = (WMI_CHANNEL_PARAMS_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, size);
-
-    wmip->wmi_phyMode = mode;
-    cmd->scanParam   = scanParam;
-    cmd->phyMode     = mode;
-    cmd->numChannels = numChan;
-    A_MEMCPY(cmd->channelList, channelList, numChan * sizeof(A_UINT16));
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_CHANNEL_PARAMS_CMDID,
-                         NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_set_rssi_threshold_params(struct wmi_t *wmip,
-                              WMI_RSSI_THRESHOLD_PARAMS_CMD *rssiCmd)
-{
-    void    *osbuf;
-    A_INT8  size;
-    WMI_RSSI_THRESHOLD_PARAMS_CMD *cmd;
-    /* These values are in ascending order */
-    if( rssiCmd->thresholdAbove6_Val <= rssiCmd->thresholdAbove5_Val ||
-        rssiCmd->thresholdAbove5_Val <= rssiCmd->thresholdAbove4_Val ||
-        rssiCmd->thresholdAbove4_Val <= rssiCmd->thresholdAbove3_Val ||
-        rssiCmd->thresholdAbove3_Val <= rssiCmd->thresholdAbove2_Val ||
-        rssiCmd->thresholdAbove2_Val <= rssiCmd->thresholdAbove1_Val ||
-        rssiCmd->thresholdBelow6_Val <= rssiCmd->thresholdBelow5_Val ||
-        rssiCmd->thresholdBelow5_Val <= rssiCmd->thresholdBelow4_Val ||
-        rssiCmd->thresholdBelow4_Val <= rssiCmd->thresholdBelow3_Val ||
-        rssiCmd->thresholdBelow3_Val <= rssiCmd->thresholdBelow2_Val ||
-        rssiCmd->thresholdBelow2_Val <= rssiCmd->thresholdBelow1_Val) {
-
-        return A_EINVAL;
-    }
-
-    size = sizeof (*cmd);
-
-    osbuf = A_NETBUF_ALLOC(size);
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, size);
-
-    cmd = (WMI_RSSI_THRESHOLD_PARAMS_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, size);
-    A_MEMCPY(cmd, rssiCmd, sizeof(WMI_RSSI_THRESHOLD_PARAMS_CMD));
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_RSSI_THRESHOLD_PARAMS_CMDID,
-                            NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_set_host_sleep_mode_cmd(struct wmi_t *wmip,
-                              WMI_SET_HOST_SLEEP_MODE_CMD *hostModeCmd)
-{
-    void    *osbuf;
-    A_INT8  size;
-    WMI_SET_HOST_SLEEP_MODE_CMD *cmd;
-
-    if( hostModeCmd->awake == hostModeCmd->asleep) {
-        return A_EINVAL;
-    }
-
-    size = sizeof (*cmd);
-
-    osbuf = A_NETBUF_ALLOC(size);
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, size);
-
-    cmd = (WMI_SET_HOST_SLEEP_MODE_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, size);
-    A_MEMCPY(cmd, hostModeCmd, sizeof(WMI_SET_HOST_SLEEP_MODE_CMD));
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_HOST_SLEEP_MODE_CMDID,
-                            NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_set_wow_mode_cmd(struct wmi_t *wmip,
-                              WMI_SET_WOW_MODE_CMD *wowModeCmd)
-{
-    void    *osbuf;
-    A_INT8  size;
-    WMI_SET_WOW_MODE_CMD *cmd;
-
-    size = sizeof (*cmd);
-
-    osbuf = A_NETBUF_ALLOC(size);
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, size);
-
-    cmd = (WMI_SET_WOW_MODE_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, size);
-    A_MEMCPY(cmd, wowModeCmd, sizeof(WMI_SET_WOW_MODE_CMD));
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_WOW_MODE_CMDID,
-                            NO_SYNC_WMIFLAG));
-
-}
-
-A_STATUS
-wmi_get_wow_list_cmd(struct wmi_t *wmip,
-                              WMI_GET_WOW_LIST_CMD *wowListCmd)
-{
-    void    *osbuf;
-    A_INT8  size;
-    WMI_GET_WOW_LIST_CMD *cmd;
-
-    size = sizeof (*cmd);
-
-    osbuf = A_NETBUF_ALLOC(size);
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, size);
-
-    cmd = (WMI_GET_WOW_LIST_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, size);
-    A_MEMCPY(cmd, wowListCmd, sizeof(WMI_GET_WOW_LIST_CMD));
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_GET_WOW_LIST_CMDID,
-                            NO_SYNC_WMIFLAG));
-
-}
-
-static A_STATUS
-wmi_get_wow_list_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-{
-    WMI_GET_WOW_LIST_REPLY *reply;
-
-    if (len < sizeof(WMI_GET_WOW_LIST_REPLY)) {
-        return A_EINVAL;
-    }
-    reply = (WMI_GET_WOW_LIST_REPLY *)datap;
-
-    A_WMI_WOW_LIST_EVENT(wmip->wmi_devt, reply->num_filters,
-                          reply);
-
-    return A_OK;
-}
-
-A_STATUS wmi_add_wow_pattern_cmd(struct wmi_t *wmip,
-                                 WMI_ADD_WOW_PATTERN_CMD *addWowCmd,
-                                 A_UINT8* pattern, A_UINT8* mask,
-                                 A_UINT8 pattern_size)
-{
-    void    *osbuf;
-    A_INT8  size;
-    WMI_ADD_WOW_PATTERN_CMD *cmd;
-    A_UINT8 *filter_mask = NULL;
-
-    size = sizeof (*cmd);
-
-    size += ((2 * addWowCmd->filter_size)* sizeof(A_UINT8));
-    osbuf = A_NETBUF_ALLOC(size);
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, size);
-
-    cmd = (WMI_ADD_WOW_PATTERN_CMD *)(A_NETBUF_DATA(osbuf));
-    cmd->filter_list_id = addWowCmd->filter_list_id;
-    cmd->filter_offset = addWowCmd->filter_offset;
-    cmd->filter_size = addWowCmd->filter_size;
-
-    A_MEMCPY(cmd->filter, pattern, addWowCmd->filter_size);
-
-    filter_mask = (A_UINT8*)(cmd->filter + cmd->filter_size);
-    A_MEMCPY(filter_mask, mask, addWowCmd->filter_size);
-
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_ADD_WOW_PATTERN_CMDID,
-                            NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_del_wow_pattern_cmd(struct wmi_t *wmip,
-                              WMI_DEL_WOW_PATTERN_CMD *delWowCmd)
-{
-    void    *osbuf;
-    A_INT8  size;
-    WMI_DEL_WOW_PATTERN_CMD *cmd;
-
-    size = sizeof (*cmd);
-
-    osbuf = A_NETBUF_ALLOC(size);
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, size);
-
-    cmd = (WMI_DEL_WOW_PATTERN_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, size);
-    A_MEMCPY(cmd, delWowCmd, sizeof(WMI_DEL_WOW_PATTERN_CMD));
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_DEL_WOW_PATTERN_CMDID,
-                            NO_SYNC_WMIFLAG));
-
-}
-
-A_STATUS
-wmi_set_snr_threshold_params(struct wmi_t *wmip,
-                             WMI_SNR_THRESHOLD_PARAMS_CMD *snrCmd)
-{
-    void    *osbuf;
-    A_INT8  size;
-    WMI_SNR_THRESHOLD_PARAMS_CMD *cmd;
-    /* These values are in ascending order */
-    if( snrCmd->thresholdAbove4_Val <= snrCmd->thresholdAbove3_Val ||
-        snrCmd->thresholdAbove3_Val <= snrCmd->thresholdAbove2_Val ||
-        snrCmd->thresholdAbove2_Val <= snrCmd->thresholdAbove1_Val ||
-        snrCmd->thresholdBelow4_Val <= snrCmd->thresholdBelow3_Val ||
-        snrCmd->thresholdBelow3_Val <= snrCmd->thresholdBelow2_Val ||
-        snrCmd->thresholdBelow2_Val <= snrCmd->thresholdBelow1_Val) {
-
-        return A_EINVAL;
-    }
-
-    size = sizeof (*cmd);
-
-    osbuf = A_NETBUF_ALLOC(size);
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, size);
-
-    cmd = (WMI_SNR_THRESHOLD_PARAMS_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, size);
-    A_MEMCPY(cmd, snrCmd, sizeof(WMI_SNR_THRESHOLD_PARAMS_CMD));
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SNR_THRESHOLD_PARAMS_CMDID,
-                            NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_clr_rssi_snr(struct wmi_t *wmip)
-{
-    void    *osbuf;
-
-    osbuf = A_NETBUF_ALLOC(sizeof(int));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_CLR_RSSI_SNR_CMDID,
-                            NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_set_lq_threshold_params(struct wmi_t *wmip,
-                             WMI_LQ_THRESHOLD_PARAMS_CMD *lqCmd)
-{
-    void    *osbuf;
-    A_INT8  size;
-    WMI_LQ_THRESHOLD_PARAMS_CMD *cmd;
-    /* These values are in ascending order */
-    if( lqCmd->thresholdAbove4_Val <= lqCmd->thresholdAbove3_Val ||
-        lqCmd->thresholdAbove3_Val <= lqCmd->thresholdAbove2_Val ||
-        lqCmd->thresholdAbove2_Val <= lqCmd->thresholdAbove1_Val ||
-        lqCmd->thresholdBelow4_Val <= lqCmd->thresholdBelow3_Val ||
-        lqCmd->thresholdBelow3_Val <= lqCmd->thresholdBelow2_Val ||
-        lqCmd->thresholdBelow2_Val <= lqCmd->thresholdBelow1_Val ) {
-
-        return A_EINVAL;
-    }
-
-    size = sizeof (*cmd);
-
-    osbuf = A_NETBUF_ALLOC(size);
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, size);
-
-    cmd = (WMI_LQ_THRESHOLD_PARAMS_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, size);
-    A_MEMCPY(cmd, lqCmd, sizeof(WMI_LQ_THRESHOLD_PARAMS_CMD));
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_LQ_THRESHOLD_PARAMS_CMDID,
-                            NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_set_error_report_bitmask(struct wmi_t *wmip, A_UINT32 mask)
-{
-    void    *osbuf;
-    A_INT8  size;
-    WMI_TARGET_ERROR_REPORT_BITMASK *cmd;
-
-    size = sizeof (*cmd);
-
-    osbuf = A_NETBUF_ALLOC(size);
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, size);
-
-    cmd = (WMI_TARGET_ERROR_REPORT_BITMASK *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, size);
-
-    cmd->bitmask = mask;
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_TARGET_ERROR_REPORT_BITMASK_CMDID,
-                            NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_get_challenge_resp_cmd(struct wmi_t *wmip, A_UINT32 cookie, A_UINT32 source)
-{
-    void *osbuf;
-    WMIX_HB_CHALLENGE_RESP_CMD *cmd;
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-
-    cmd = (WMIX_HB_CHALLENGE_RESP_CMD *)(A_NETBUF_DATA(osbuf));
-    cmd->cookie = cookie;
-    cmd->source = source;
-
-    return (wmi_cmd_send_xtnd(wmip, osbuf, WMIX_HB_CHALLENGE_RESP_CMDID,
-                              NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_config_debug_module_cmd(struct wmi_t *wmip, A_UINT16 mmask,
-                            A_UINT16 tsr, A_BOOL rep, A_UINT16 size,
-                            A_UINT32 valid)
-{
-    void *osbuf;
-    WMIX_DBGLOG_CFG_MODULE_CMD *cmd;
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-
-    cmd = (WMIX_DBGLOG_CFG_MODULE_CMD *)(A_NETBUF_DATA(osbuf));
-    cmd->config.cfgmmask = mmask;
-    cmd->config.cfgtsr = tsr;
-    cmd->config.cfgrep = rep;
-    cmd->config.cfgsize = size;
-    cmd->config.cfgvalid = valid;
-
-    return (wmi_cmd_send_xtnd(wmip, osbuf, WMIX_DBGLOG_CFG_MODULE_CMDID,
-                              NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_get_stats_cmd(struct wmi_t *wmip)
-{
-    void *osbuf;
-
-    osbuf = A_NETBUF_ALLOC(0);      /* no payload */
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_GET_STATISTICS_CMDID,
-                         NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_addBadAp_cmd(struct wmi_t *wmip, A_UINT8 apIndex, A_UINT8 *bssid)
-{
-    void *osbuf;
-    WMI_ADD_BAD_AP_CMD *cmd;
-
-    if ((bssid == NULL) || (apIndex > WMI_MAX_BAD_AP_INDEX)) {
-        return A_EINVAL;
-    }
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-
-    cmd = (WMI_ADD_BAD_AP_CMD *)(A_NETBUF_DATA(osbuf));
-    cmd->badApIndex = apIndex;
-    A_MEMCPY(cmd->bssid, bssid, sizeof(cmd->bssid));
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_ADD_BAD_AP_CMDID, NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_deleteBadAp_cmd(struct wmi_t *wmip, A_UINT8 apIndex)
-{
-    void *osbuf;
-    WMI_DELETE_BAD_AP_CMD *cmd;
-
-    if (apIndex > WMI_MAX_BAD_AP_INDEX) {
-        return A_EINVAL;
-    }
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-
-    cmd = (WMI_DELETE_BAD_AP_CMD *)(A_NETBUF_DATA(osbuf));
-    cmd->badApIndex = apIndex;
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_DELETE_BAD_AP_CMDID,
-                         NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_set_txPwr_cmd(struct wmi_t *wmip, A_UINT8 dbM)
-{
-    void *osbuf;
-    WMI_SET_TX_PWR_CMD *cmd;
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-
-    cmd = (WMI_SET_TX_PWR_CMD *)(A_NETBUF_DATA(osbuf));
-    cmd->dbM = dbM;
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_TX_PWR_CMDID, NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_get_txPwr_cmd(struct wmi_t *wmip)
-{
-    void *osbuf;
-
-    osbuf = A_NETBUF_ALLOC(0);      /* no payload */
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_GET_TX_PWR_CMDID, NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_switch_radio(struct wmi_t *wmip, A_UINT8 on)
-{
-	WMI_SCAN_PARAMS_CMD scParams = {0, 0, 0, 0, 0,
-					WMI_SHORTSCANRATIO_DEFAULT,
-					DEFAULT_SCAN_CTRL_FLAGS,
-					0};
-
-	if (on) {
-		/* Enable foreground scanning */
-                if (wmi_scanparams_cmd(wmip, scParams.fg_start_period,
-                                       scParams.fg_end_period,
-                                       scParams.bg_period,
-                                       scParams.minact_chdwell_time,
-                                       scParams.maxact_chdwell_time,
-                                       scParams.pas_chdwell_time,
-                                       scParams.shortScanRatio,
-                                       scParams.scanCtrlFlags,
-                                       scParams.max_dfsch_act_time) != A_OK) {
-			return -EIO;
-		}
-	} else {
-		wmi_disconnect_cmd(wmip);
-		if (wmi_scanparams_cmd(wmip, 0xFFFF, 0, 0, 0,
-				       0, 0, 0, 0xFF, 0) != A_OK) {
-			return -EIO;
-		}
-	}
-
-	return A_OK;
-}
-
-
-A_UINT16
-wmi_get_mapped_qos_queue(struct wmi_t *wmip, A_UINT8 trafficClass)
-{
-	A_UINT16 activeTsids=0;
-
-    LOCK_WMI(wmip);
-    activeTsids = wmip->wmi_streamExistsForAC[trafficClass];
-    UNLOCK_WMI(wmip);
-
-    return activeTsids;
-}
-
-A_STATUS
-wmi_get_roam_tbl_cmd(struct wmi_t *wmip)
-{
-    void *osbuf;
-
-    osbuf = A_NETBUF_ALLOC(0);      /* no payload */
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_GET_ROAM_TBL_CMDID,
-                         NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_get_roam_data_cmd(struct wmi_t *wmip, A_UINT8 roamDataType)
-{
-    void *osbuf;
-    A_UINT32 size = sizeof(A_UINT8);
-    WMI_TARGET_ROAM_DATA *cmd;
-
-    osbuf = A_NETBUF_ALLOC(size);      /* no payload */
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, size);
-
-    cmd = (WMI_TARGET_ROAM_DATA *)(A_NETBUF_DATA(osbuf));
-    cmd->roamDataType = roamDataType;
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_GET_ROAM_DATA_CMDID,
-                         NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_set_roam_ctrl_cmd(struct wmi_t *wmip, WMI_SET_ROAM_CTRL_CMD *p,
-                      A_UINT8 size)
-{
-    void *osbuf;
-    WMI_SET_ROAM_CTRL_CMD *cmd;
-
-    osbuf = A_NETBUF_ALLOC(size);
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, size);
-
-    cmd = (WMI_SET_ROAM_CTRL_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, size);
-
-    A_MEMCPY(cmd, p, size);
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_ROAM_CTRL_CMDID,
-                         NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_set_powersave_timers_cmd(struct wmi_t *wmip,
-                            WMI_POWERSAVE_TIMERS_POLICY_CMD *pCmd,
-                            A_UINT8 size)
-{
-    void *osbuf;
-    WMI_POWERSAVE_TIMERS_POLICY_CMD *cmd;
-
-    /* These timers can't be zero */
-    if(!pCmd->psPollTimeout || !pCmd->triggerTimeout ||
-       !(pCmd->apsdTimPolicy == IGNORE_TIM_ALL_QUEUES_APSD ||
-         pCmd->apsdTimPolicy == PROCESS_TIM_ALL_QUEUES_APSD) ||
-       !(pCmd->simulatedAPSDTimPolicy == IGNORE_TIM_SIMULATED_APSD ||
-         pCmd->simulatedAPSDTimPolicy == PROCESS_TIM_SIMULATED_APSD))
-        return A_EINVAL;
-
-    osbuf = A_NETBUF_ALLOC(size);
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, size);
-
-    cmd = (WMI_POWERSAVE_TIMERS_POLICY_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, size);
-
-    A_MEMCPY(cmd, pCmd, size);
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_POWERSAVE_TIMERS_POLICY_CMDID,
-                         NO_SYNC_WMIFLAG));
-}
-
-#ifdef CONFIG_HOST_GPIO_SUPPORT
-/* Send a command to Target to change GPIO output pins. */
-A_STATUS
-wmi_gpio_output_set(struct wmi_t *wmip,
-                    A_UINT32 set_mask,
-                    A_UINT32 clear_mask,
-                    A_UINT32 enable_mask,
-                    A_UINT32 disable_mask)
-{
-    void *osbuf;
-    WMIX_GPIO_OUTPUT_SET_CMD *output_set;
-    int size;
-
-    size = sizeof(*output_set);
-
-    A_DPRINTF(DBG_WMI,
-        (DBGFMT "Enter - set=0x%x clear=0x%x enb=0x%x dis=0x%x\n", DBGARG,
-        set_mask, clear_mask, enable_mask, disable_mask));
-
-    osbuf = A_NETBUF_ALLOC(size);
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-    A_NETBUF_PUT(osbuf, size);
-    output_set = (WMIX_GPIO_OUTPUT_SET_CMD *)(A_NETBUF_DATA(osbuf));
-
-    output_set->set_mask                   = set_mask;
-    output_set->clear_mask                 = clear_mask;
-    output_set->enable_mask                = enable_mask;
-    output_set->disable_mask               = disable_mask;
-
-    return (wmi_cmd_send_xtnd(wmip, osbuf, WMIX_GPIO_OUTPUT_SET_CMDID,
-                             NO_SYNC_WMIFLAG));
-}
-
-/* Send a command to the Target requesting state of the GPIO input pins */
-A_STATUS
-wmi_gpio_input_get(struct wmi_t *wmip)
-{
-    void *osbuf;
-
-    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-
-    osbuf = A_NETBUF_ALLOC(0);
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    return (wmi_cmd_send_xtnd(wmip, osbuf, WMIX_GPIO_INPUT_GET_CMDID,
-                             NO_SYNC_WMIFLAG));
-}
-
-/* Send a command to the Target that changes the value of a GPIO register. */
-A_STATUS
-wmi_gpio_register_set(struct wmi_t *wmip,
-                      A_UINT32 gpioreg_id,
-                      A_UINT32 value)
-{
-    void *osbuf;
-    WMIX_GPIO_REGISTER_SET_CMD *register_set;
-    int size;
-
-    size = sizeof(*register_set);
-
-    A_DPRINTF(DBG_WMI,
-        (DBGFMT "Enter - reg=%d value=0x%x\n", DBGARG, gpioreg_id, value));
-
-    osbuf = A_NETBUF_ALLOC(size);
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-    A_NETBUF_PUT(osbuf, size);
-    register_set = (WMIX_GPIO_REGISTER_SET_CMD *)(A_NETBUF_DATA(osbuf));
-
-    register_set->gpioreg_id               = gpioreg_id;
-    register_set->value                    = value;
-
-    return (wmi_cmd_send_xtnd(wmip, osbuf, WMIX_GPIO_REGISTER_SET_CMDID,
-                             NO_SYNC_WMIFLAG));
-}
-
-/* Send a command to the Target to fetch the value of a GPIO register. */
-A_STATUS
-wmi_gpio_register_get(struct wmi_t *wmip,
-                      A_UINT32 gpioreg_id)
-{
-    void *osbuf;
-    WMIX_GPIO_REGISTER_GET_CMD *register_get;
-    int size;
-
-    size = sizeof(*register_get);
-
-    A_DPRINTF(DBG_WMI, (DBGFMT "Enter - reg=%d\n", DBGARG, gpioreg_id));
-
-    osbuf = A_NETBUF_ALLOC(size);
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-    A_NETBUF_PUT(osbuf, size);
-    register_get = (WMIX_GPIO_REGISTER_GET_CMD *)(A_NETBUF_DATA(osbuf));
-
-    register_get->gpioreg_id               = gpioreg_id;
-
-    return (wmi_cmd_send_xtnd(wmip, osbuf, WMIX_GPIO_REGISTER_GET_CMDID,
-                             NO_SYNC_WMIFLAG));
-}
-
-/* Send a command to the Target acknowledging some GPIO interrupts. */
-A_STATUS
-wmi_gpio_intr_ack(struct wmi_t *wmip,
-                  A_UINT32 ack_mask)
-{
-    void *osbuf;
-    WMIX_GPIO_INTR_ACK_CMD *intr_ack;
-    int size;
-
-    size = sizeof(*intr_ack);
-
-    A_DPRINTF(DBG_WMI, (DBGFMT "Enter ack_mask=0x%x\n", DBGARG, ack_mask));
-
-    osbuf = A_NETBUF_ALLOC(size);
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-    A_NETBUF_PUT(osbuf, size);
-    intr_ack = (WMIX_GPIO_INTR_ACK_CMD *)(A_NETBUF_DATA(osbuf));
-
-    intr_ack->ack_mask               = ack_mask;
-
-    return (wmi_cmd_send_xtnd(wmip, osbuf, WMIX_GPIO_INTR_ACK_CMDID,
-                             NO_SYNC_WMIFLAG));
-}
-#endif /* CONFIG_HOST_GPIO_SUPPORT */
-
-A_STATUS
-wmi_set_access_params_cmd(struct wmi_t *wmip, A_UINT16 txop, A_UINT8 eCWmin,
-                          A_UINT8 eCWmax, A_UINT8 aifsn)
-{
-    void *osbuf;
-    WMI_SET_ACCESS_PARAMS_CMD *cmd;
-
-    if ((eCWmin > WMI_MAX_CW_ACPARAM) || (eCWmax > WMI_MAX_CW_ACPARAM) ||
-        (aifsn > WMI_MAX_AIFSN_ACPARAM))
-    {
-        return A_EINVAL;
-    }
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-
-    cmd = (WMI_SET_ACCESS_PARAMS_CMD *)(A_NETBUF_DATA(osbuf));
-    cmd->txop   = txop;
-    cmd->eCWmin = eCWmin;
-    cmd->eCWmax = eCWmax;
-    cmd->aifsn  = aifsn;
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_ACCESS_PARAMS_CMDID,
-                         NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_set_retry_limits_cmd(struct wmi_t *wmip, A_UINT8 frameType,
-                         A_UINT8 trafficClass, A_UINT8 maxRetries,
-                         A_UINT8 enableNotify)
-{
-    void *osbuf;
-    WMI_SET_RETRY_LIMITS_CMD *cmd;
-
-    if ((frameType != MGMT_FRAMETYPE) && (frameType != CONTROL_FRAMETYPE) &&
-        (frameType != DATA_FRAMETYPE))
-    {
-        return A_EINVAL;
-    }
-
-    if (maxRetries > WMI_MAX_RETRIES) {
-        return A_EINVAL;
-    }
-
-    if (frameType != DATA_FRAMETYPE) {
-        trafficClass = 0;
-    }
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-
-    cmd = (WMI_SET_RETRY_LIMITS_CMD *)(A_NETBUF_DATA(osbuf));
-    cmd->frameType    = frameType;
-    cmd->trafficClass = trafficClass;
-    cmd->maxRetries   = maxRetries;
-    cmd->enableNotify = enableNotify;
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_RETRY_LIMITS_CMDID,
-                         NO_SYNC_WMIFLAG));
-}
-
-void
-wmi_get_current_bssid(struct wmi_t *wmip, A_UINT8 *bssid)
-{
-    if (bssid != NULL) {
-        A_MEMCPY(bssid, wmip->wmi_bssid, ATH_MAC_LEN);
-    }
-}
-
-A_STATUS
-wmi_set_opt_mode_cmd(struct wmi_t *wmip, A_UINT8 optMode)
-{
-    void *osbuf;
-    WMI_SET_OPT_MODE_CMD *cmd;
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-
-    cmd = (WMI_SET_OPT_MODE_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, sizeof(*cmd));
-    cmd->optMode = optMode;
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_OPT_MODE_CMDID,
-                         SYNC_BOTH_WMIFLAG));
-}
-
-A_STATUS
-wmi_opt_tx_frame_cmd(struct wmi_t *wmip,
-                      A_UINT8 frmType,
-                      A_UINT8 *dstMacAddr,
-                      A_UINT8 *bssid,
-                      A_UINT16 optIEDataLen,
-                      A_UINT8 *optIEData)
-{
-    void *osbuf;
-    WMI_OPT_TX_FRAME_CMD *cmd;
-    osbuf = A_NETBUF_ALLOC(optIEDataLen + sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, (optIEDataLen + sizeof(*cmd)));
-
-    cmd = (WMI_OPT_TX_FRAME_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, (optIEDataLen + sizeof(*cmd)-1));
-
-    cmd->frmType    = frmType;
-    cmd->optIEDataLen   = optIEDataLen;
-    //cmd->optIEData     = (A_UINT8 *)((int)cmd + sizeof(*cmd));
-    A_MEMCPY(cmd->bssid, bssid, sizeof(cmd->bssid));
-    A_MEMCPY(cmd->dstAddr, dstMacAddr, sizeof(cmd->dstAddr));
-    A_MEMCPY(&cmd->optIEData[0], optIEData, optIEDataLen);
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_OPT_TX_FRAME_CMDID,
-                         NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_set_adhoc_bconIntvl_cmd(struct wmi_t *wmip, A_UINT16 intvl)
-{
-    void *osbuf;
-    WMI_BEACON_INT_CMD *cmd;
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-
-    cmd = (WMI_BEACON_INT_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, sizeof(*cmd));
-    cmd->beaconInterval = intvl;
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_BEACON_INT_CMDID,
-            NO_SYNC_WMIFLAG));
-}
-
-
-A_STATUS
-wmi_set_voice_pkt_size_cmd(struct wmi_t *wmip, A_UINT16 voicePktSize)
-{
-    void *osbuf;
-    WMI_SET_VOICE_PKT_SIZE_CMD *cmd;
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-
-    cmd = (WMI_SET_VOICE_PKT_SIZE_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, sizeof(*cmd));
-    cmd->voicePktSize = voicePktSize;
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_VOICE_PKT_SIZE_CMDID,
-            NO_SYNC_WMIFLAG));
-}
-
-
-A_STATUS
-wmi_set_max_sp_len_cmd(struct wmi_t *wmip, A_UINT8 maxSPLen)
-{
-    void *osbuf;
-    WMI_SET_MAX_SP_LEN_CMD *cmd;
-
-    /* maxSPLen is a two-bit value. If user trys to set anything
-     * other than this, then its invalid
-     */
-    if(maxSPLen & ~0x03)
-        return  A_EINVAL;
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-
-    cmd = (WMI_SET_MAX_SP_LEN_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, sizeof(*cmd));
-    cmd->maxSPLen = maxSPLen;
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_MAX_SP_LEN_CMDID,
-            NO_SYNC_WMIFLAG));
-}
-
-A_UINT8
-convert_userPriority_to_trafficClass(A_UINT8 userPriority)
-{
-        return  (up_to_ac[userPriority & 0x7]);
-}
-
-A_UINT8
-wmi_get_power_mode_cmd(struct wmi_t *wmip)
-{
-    return wmip->wmi_powerMode;
-}
-
-A_STATUS
-wmi_verify_tspec_params(WMI_CREATE_PSTREAM_CMD *pCmd, A_BOOL tspecCompliance)
-{
-    return A_OK;
-}
-
-#ifdef CONFIG_HOST_TCMD_SUPPORT
-static A_STATUS
-wmi_tcmd_test_report_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-{
-
-   A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-
-   A_WMI_TCMD_RX_REPORT_EVENT(wmip->wmi_devt, datap, len);
-
-   return A_OK;
-}
-
-#endif /* CONFIG_HOST_TCMD_SUPPORT*/
-
-A_STATUS
-wmi_set_authmode_cmd(struct wmi_t *wmip, A_UINT8 mode)
-{
-    void *osbuf;
-    WMI_SET_AUTH_MODE_CMD *cmd;
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-
-    cmd = (WMI_SET_AUTH_MODE_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, sizeof(*cmd));
-    cmd->mode = mode;
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_AUTH_MODE_CMDID,
-            NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_set_reassocmode_cmd(struct wmi_t *wmip, A_UINT8 mode)
-{
-    void *osbuf;
-    WMI_SET_REASSOC_MODE_CMD *cmd;
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-
-    cmd = (WMI_SET_REASSOC_MODE_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, sizeof(*cmd));
-    cmd->mode = mode;
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_REASSOC_MODE_CMDID,
-            NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_set_lpreamble_cmd(struct wmi_t *wmip, A_UINT8 status)
-{
-    void *osbuf;
-    WMI_SET_LPREAMBLE_CMD *cmd;
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-
-    cmd = (WMI_SET_LPREAMBLE_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, sizeof(*cmd));
-    cmd->status = status;
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_LPREAMBLE_CMDID,
-            NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_set_rts_cmd(struct wmi_t *wmip, A_UINT16 threshold)
-{
-    void *osbuf;
-    WMI_SET_RTS_CMD *cmd;
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-
-    cmd = (WMI_SET_RTS_CMD*)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, sizeof(*cmd));
-    cmd->threshold = threshold;
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_RTS_CMDID,
-            NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_set_wmm_cmd(struct wmi_t *wmip, WMI_WMM_STATUS status)
-{
-    void *osbuf;
-    WMI_SET_WMM_CMD *cmd;
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-
-    cmd = (WMI_SET_WMM_CMD*)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, sizeof(*cmd));
-    cmd->status = status;
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_WMM_CMDID,
-            NO_SYNC_WMIFLAG));
-
-}
-
-A_STATUS
-wmi_set_wmm_txop(struct wmi_t *wmip, WMI_TXOP_CFG cfg)
-{
-    void *osbuf;
-    WMI_SET_WMM_TXOP_CMD *cmd;
-
-    if( !((cfg == WMI_TXOP_DISABLED) || (cfg == WMI_TXOP_ENABLED)) )
-        return A_EINVAL;
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-
-    cmd = (WMI_SET_WMM_TXOP_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, sizeof(*cmd));
-    cmd->txopEnable = cfg;
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_WMM_TXOP_CMDID,
-            NO_SYNC_WMIFLAG));
-
-}
-
-#ifdef CONFIG_HOST_TCMD_SUPPORT
-/* WMI  layer doesn't need to know the data type of the test cmd.
-   This would be beneficial for customers like Qualcomm, who might
-   have different test command requirements from differnt manufacturers
- */
-A_STATUS
-wmi_test_cmd(struct wmi_t *wmip, A_UINT8 *buf, A_UINT32  len)
-{
-    void *osbuf;
-    char *data;
-
-    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-
-    osbuf= A_NETBUF_ALLOC(len);
-    if(osbuf == NULL)
-    {
-        return A_NO_MEMORY;
-    }
-    A_NETBUF_PUT(osbuf, len);
-    data = A_NETBUF_DATA(osbuf);
-    A_MEMCPY(data, buf, len);
-
-    return(wmi_cmd_send(wmip, osbuf, WMI_TEST_CMDID,
-         NO_SYNC_WMIFLAG));
-}
-
-#endif
-
-A_STATUS
-wmi_set_bt_status_cmd(struct wmi_t *wmip, A_UINT8 streamType, A_UINT8 status)
-{
-    void *osbuf;
-    WMI_SET_BT_STATUS_CMD *cmd;
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-
-    cmd = (WMI_SET_BT_STATUS_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, sizeof(*cmd));
-    cmd->streamType = streamType;
-    cmd->status = status;
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_BT_STATUS_CMDID,
-            NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_set_bt_params_cmd(struct wmi_t *wmip, WMI_SET_BT_PARAMS_CMD* cmd)
-{
-    void *osbuf;
-    WMI_SET_BT_PARAMS_CMD* alloc_cmd;
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-
-    alloc_cmd = (WMI_SET_BT_PARAMS_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(alloc_cmd, sizeof(*cmd));
-    A_MEMCPY(alloc_cmd, cmd, sizeof(*cmd));
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_BT_PARAMS_CMDID,
-            NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_get_keepalive_configured(struct wmi_t *wmip)
-{
-    void *osbuf;
-    WMI_GET_KEEPALIVE_CMD *cmd;
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-    cmd = (WMI_GET_KEEPALIVE_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, sizeof(*cmd));
-    return (wmi_cmd_send(wmip, osbuf, WMI_GET_KEEPALIVE_CMDID,
-                         NO_SYNC_WMIFLAG));
-}
-
-A_UINT8
-wmi_get_keepalive_cmd(struct wmi_t *wmip)
-{
-    return wmip->wmi_keepaliveInterval;
-}
-
-A_STATUS
-wmi_set_keepalive_cmd(struct wmi_t *wmip, A_UINT8 keepaliveInterval)
-{
-    void *osbuf;
-    WMI_SET_KEEPALIVE_CMD *cmd;
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-
-    cmd = (WMI_SET_KEEPALIVE_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, sizeof(*cmd));
-    cmd->keepaliveInterval = keepaliveInterval;
-    wmip->wmi_keepaliveInterval = keepaliveInterval;
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_KEEPALIVE_CMDID,
-                         NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_set_appie_cmd(struct wmi_t *wmip, A_UINT8 mgmtFrmType, A_UINT8 ieLen,
-                  A_UINT8 *ieInfo)
-{
-    void *osbuf;
-    WMI_SET_APPIE_CMD *cmd;
-    A_UINT16 cmdLen;
-
-    if (ieLen > WMI_MAX_IE_LEN) {
-        return A_ERROR;
-    }
-    cmdLen = sizeof(*cmd) + ieLen - 1;
-    osbuf = A_NETBUF_ALLOC(cmdLen);
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, cmdLen);
-
-    cmd = (WMI_SET_APPIE_CMD *)(A_NETBUF_DATA(osbuf));
-    A_MEMZERO(cmd, cmdLen);
-
-    cmd->mgmtFrmType = mgmtFrmType;
-    cmd->ieLen = ieLen;
-    A_MEMCPY(cmd->ieInfo, ieInfo, ieLen);
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_APPIE_CMDID, NO_SYNC_WMIFLAG));
-}
-
-A_STATUS
-wmi_set_halparam_cmd(struct wmi_t *wmip, A_UINT8 *cmd, A_UINT16 dataLen)
-{
-    void *osbuf;
-    A_UINT8 *data;
-
-    osbuf = A_NETBUF_ALLOC(dataLen);
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, dataLen);
-
-    data = A_NETBUF_DATA(osbuf);
-
-    A_MEMCPY(data, cmd, dataLen);
-
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_WHALPARAM_CMDID, NO_SYNC_WMIFLAG));
-}
-
-A_INT32
-wmi_get_rate(A_INT8 rateindex)
-{
-    if (rateindex == RATE_AUTO) {
-        return 0;
-    } else {
-        return(wmi_rateTable[(A_UINT32) rateindex]);
-    }
-}
-
-void
-wmi_node_return (struct wmi_t *wmip, bss_t *bss)
-{
-	if (NULL != bss)
-	{
-		wlan_node_return (&wmip->wmi_scan_table, bss);
-	}
-}
-
-bss_t *
-wmi_find_Ssidnode (struct wmi_t *wmip, A_UCHAR *pSsid,
-				   A_UINT32 ssidLength, A_BOOL bIsWPA2)
-{
-	bss_t *node = NULL;
-    node = wlan_find_Ssidnode (&wmip->wmi_scan_table, pSsid,
-							   ssidLength, bIsWPA2);
-	return node;
-}
-
-void
-wmi_free_allnodes(struct wmi_t *wmip)
-{
-	wlan_free_allnodes(&wmip->wmi_scan_table);
-}
-
-bss_t *
-wmi_find_node(struct wmi_t *wmip, const A_UINT8 *macaddr)
-{
-	bss_t *ni=NULL;
-	ni=wlan_find_node(&wmip->wmi_scan_table,macaddr);
-	return ni;
-}
-
-A_STATUS
-wmi_dset_open_reply(struct wmi_t *wmip,
-                    A_UINT32 status,
-                    A_UINT32 access_cookie,
-                    A_UINT32 dset_size,
-                    A_UINT32 dset_version,
-                    A_UINT32 targ_handle,
-                    A_UINT32 targ_reply_fn,
-                    A_UINT32 targ_reply_arg)
-{
-    void *osbuf;
-    WMIX_DSETOPEN_REPLY_CMD *open_reply;
-
-    A_DPRINTF(DBG_WMI, (DBGFMT "Enter - wmip=0x%x\n", DBGARG, (int)wmip));
-
-    osbuf = A_NETBUF_ALLOC(sizeof(*open_reply));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    A_NETBUF_PUT(osbuf, sizeof(*open_reply));
-    open_reply = (WMIX_DSETOPEN_REPLY_CMD *)(A_NETBUF_DATA(osbuf));
-
-    open_reply->status                   = status;
-    open_reply->targ_dset_handle         = targ_handle;
-    open_reply->targ_reply_fn            = targ_reply_fn;
-    open_reply->targ_reply_arg           = targ_reply_arg;
-    open_reply->access_cookie            = access_cookie;
-    open_reply->size                     = dset_size;
-    open_reply->version                  = dset_version;
-
-    return (wmi_cmd_send_xtnd(wmip, osbuf, WMIX_DSETOPEN_REPLY_CMDID,
-                             NO_SYNC_WMIFLAG));
-}
-
-static A_STATUS
-wmi_get_pmkid_list_event_rx(struct wmi_t *wmip, A_UINT8 *datap, A_UINT32 len)
-{
-    WMI_PMKID_LIST_REPLY *reply;
-    A_UINT32 expected_len;
-
-    if (len < sizeof(WMI_PMKID_LIST_REPLY)) {
-        return A_EINVAL;
-    }
-    reply = (WMI_PMKID_LIST_REPLY *)datap;
-    expected_len = sizeof(reply->numPMKID) + reply->numPMKID * WMI_PMKID_LEN;
-
-    if (len < expected_len) {
-        return A_EINVAL;
-    }
-
-    A_WMI_PMKID_LIST_EVENT(wmip->wmi_devt, reply->numPMKID,
-                           reply->pmkidList);
-
-    return A_OK;
-}
-
-#ifdef CONFIG_HOST_DSET_SUPPORT
-A_STATUS
-wmi_dset_data_reply(struct wmi_t *wmip,
-                    A_UINT32 status,
-                    A_UINT8 *user_buf,
-                    A_UINT32 length,
-                    A_UINT32 targ_buf,
-                    A_UINT32 targ_reply_fn,
-                    A_UINT32 targ_reply_arg)
-{
-    void *osbuf;
-    WMIX_DSETDATA_REPLY_CMD *data_reply;
-    int size;
-
-    size = sizeof(*data_reply) + length;
-
-    A_DPRINTF(DBG_WMI,
-        (DBGFMT "Enter - length=%d status=%d\n", DBGARG, length, status));
-
-    osbuf = A_NETBUF_ALLOC(size);
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-    A_NETBUF_PUT(osbuf, size);
-    data_reply = (WMIX_DSETDATA_REPLY_CMD *)(A_NETBUF_DATA(osbuf));
-
-    data_reply->status                     = status;
-    data_reply->targ_buf                   = targ_buf;
-    data_reply->targ_reply_fn              = targ_reply_fn;
-    data_reply->targ_reply_arg             = targ_reply_arg;
-    data_reply->length                     = length;
-
-    if (status == A_OK) {
-        if (a_copy_from_user(data_reply->buf, user_buf, length)) {
-            return A_ERROR;
-        }
-    }
-
-    return (wmi_cmd_send_xtnd(wmip, osbuf, WMIX_DSETDATA_REPLY_CMDID,
-                             NO_SYNC_WMIFLAG));
-}
-#endif /* CONFIG_HOST_DSET_SUPPORT */
-
-A_STATUS
-wmi_set_wsc_status_cmd(struct wmi_t *wmip, A_UINT32 status)
-{
-    void *osbuf;
-    char *cmd;
-
-	wps_enable = status;
-
-    osbuf = a_netbuf_alloc(sizeof(1));
-    if (osbuf == NULL) {
-        return A_NO_MEMORY;
-    }
-
-    a_netbuf_put(osbuf, sizeof(1));
-
-    cmd = (char *)(a_netbuf_to_data(osbuf));
-
-    A_MEMZERO(cmd, sizeof(*cmd));
-    cmd[0] = (status?1:0);
-    return (wmi_cmd_send(wmip, osbuf, WMI_SET_WSC_STATUS_CMDID,
-                         NO_SYNC_WMIFLAG));
-}
-
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/wmi/wmi_doc.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/wmi/wmi_doc.h
deleted file mode 100644
index 19cd9386c..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/wmi/wmi_doc.h
+++ /dev/null
@@ -1,4421 +0,0 @@
-/*
- *
- * Copyright (c) 2004-2007 Atheros Communications Inc.
- * All rights reserved.
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-
-#if 0
-Wireless Module Interface (WMI) Documentaion
-
-   This section describes the format and the usage model for WMI control and
-   data messages between the host and the AR6000-based targets. The header
-   file include/wmi.h contains all command and event manifest constants as
-   well as structure typedefs for each set of command and reply parameters.
-
-Data Frames
-
-   The data payload transmitted and received by the target follows RFC-1042
-   encapsulation and thus starts with an 802.2-style LLC-SNAP header. The
-   WLAN module completes 802.11 encapsulation of the payload, including the
-   MAC header, FCS, and WLAN security related fields. At the interface to the
-   message transport (HTC), a data frame is encapsulated in a WMI message.
-
-WMI Message Structure
-
-   The WMI protocol leverages an 802.3-style Ethernet header in communicating
-   the source and destination information between the host and the AR6000
-   modules using a 14-byte 802.3 header ahead of the 802.2-style payload. In
-   addition, the WMI protocol adds a header to all data messages:
-
-    {
-    INT8    rssi
-                  The RSSI of the received packet and its units are shown in db above the
-                      noise floor, and the noise floor is shown in dbm.
-    UINT8   info
-                      Contains information on message type and user priority. Message type
-                      differentiates between a data packet and a synchronization message.
-    } WMI_DATA_HDR
-
-   User priority contains the 802.1d user priority info from host to target. Host
-   software translates the host Ethernet format to 802.3 format prior to Tx and
-   802.3 format to host format in the Rx direction. The host does not transmit the
-   FCS that follows the data. MsgType differentiates between a regular data
-   packet (msgType=0) and a synchronization message (msgType=1).
-
-Data Endpoints
-
-   The AR6000 chipset provides several data endpoints to support quality of
-   service (QoS) and maintains separate queues and separate DMA engines for
-   each data endpoint. A data endpoint can be bi-directional.
-
-   Best effort (BE) class traffic uses the default data endpoint (2). The host can
-   establish up to two additional data endpoints for other traffic classes. Once
-   such a data endpoint is established, it sends and receives corresponding QoS
-   traffic in a manner similar to the default data endpoint.
-
-   If QoS is desired over the interconnect, host software must classify each data
-   packet and place it on the appropriate data endpoint. The information
-   required to classify data is generally available in-band as an 802.1p/q style
-   tag or as the ToS field in the IP header. The information may also be available
-   out-of-band depending on the host DDI.
-
-Connection States
-
-   Table B-1 describes the AR6000 WLAN connection states:
-
-   Table B-1.  AR6000 Connection States
-
-Connection State
-    Description
-
-   DISCONNECTED
-    In this state, the AR6000 device is not connected to a wireless
-   network. The device is in this state after reset when it sends the
-   WIRELESS MODULE “READY” EVENT, after it processes a
-   DISCONNECT command, and when it loses its link with the
-   access point (AP) that it was connected to. The device signals a
-   transition to the DISCONNECTED state with a “DISCONNECT”
-   event.
-
-CONNECTED
-    In this state, the AR6000 device is connected to wireless networks.
-   The device enters this state after successfully processing a
-   CONNECT, which establishes a connection with a wireless
-   network. The device signals a transition to the CONNECTED state
-   with a “CONNECT” event.
-
-
-Message Types
-
-   WMI uses commands, replies, and events for the control and configuration of
-   the AR6000 device. The control protocol is asynchronous. Table B-2 describes
-   AR6000 message types:
-
-Table B-2.  AR6000 Message Types
-
-Message Type
-    Description
-
-Commands
-    Control messages that flow from the host to the device
-
-Replies/Events
-    Control messages that flow from the device to the host.
-
-   The device issues a reply to some WMI commands, but not to others.
-   The payload in a reply is command-specific, and some commands do
-   not trigger a reply message at all. Events are control messages issued
-   by the device to signal the occurrence of an asynchronous event.
-
-
-WMI Message Format
-
-   All WMI control commands, replies and events use the header format:
-
-   WMI_CMD_HDR Header Format
-   {
-        UINT16 id
-                 This 16-bit constant identifies which WMI command the host is issuing,
-                 which command the target is replying to, or which event has occurred.
-        WMI_CMD_HDR
-   }
-
-
-   A variable-size command-, reply-, or event-specific payload follows the
-   header. Over the interconnect, all fields in control messages (including
-   WMI_CMD_HDR and the command specific payload) use 32-bit little Endian
-   byte ordering and fields are packed. The AR6000 device always executes
-   commands in order, and the host may send multiple commands without
-   waiting for previous commands to complete. A majority of commands are
-   processed to completion once received. Other commands trigger a longer
-   duration activity whose completion is signaled to the host through an event.
-
-Command Restrictions
-
-   Some commands may only be issued when the AR6000 device is in a certain
-   state. The host is required to wait for an event signaling a state transition
-   before such a command can be issued. For example, if a command requires
-   the device to be in the CONNECTED state, then the host is required to wait
-   for a “CONNECT” event before it issues that command.
-
-   The device ignores any commands inappropriate for its current state. If the
-   command triggers a reply, the device generates an error reply. Otherwise, the
-   device silently ignores the inappropriate command.
-
-Command and Data Synchronization
-
-   WMI provides a mechanism for a host to advise the device of necessary
-   synchronization between commands and data. The device implements
-   synchronization; no implicit synchronization exists between endpoints.
-
-   The host controls synchronization using the “SYNCHRONIZE” command
-   over the control channel and synchronization messages over data channels.
-   The device stops each data channel upon receiving a synchronization message
-   on that channel, processing all data packets received prior to that message.
-   After the device receives synchronization messages for each data endpoint
-   and the “SYNCHRONIZE” command, it resumes all channels.
-
-   When the host must guarantee a command executes before processing new
-   data packets, it first issues the command, then issues the “SYNCHRONIZE”
-   command and sends synchronization messages on data channels. When the
-   host must guarantee the device has processed all old data packets before a
-   processing a new command, it issues a “SYNCHRONIZE” command and
-   synchronization messages on all data channels, then issues the desired
-   command.
-
-
-
-WMI Commands
-
-   ADD_BAD_AP
-    Cause the AR6000 device to avoid a particular AP
-   ADD_CIPHER_KEY
-    Add or replace any of the four AR6000 encryption keys
-   ADD_WOW_PATTERN
-    Used to add a pattern to the WoW pattern list
-   CLR_RSSI_SNR
-    Clear the current calculated RSSI and SNR value
-   CONNECT_CMD
-    Request that the AR6000 device establish a wireless connection
-        with the specified SSID
-   CREATE_PSTREAM
-    Create prioritized data endpoint between the host and device
-   DELETE_BAD_AP
-    Clear an entry in the bad AP table
-   DELETE_CIPHER_KEY
-    Delete a previously added cipher key
-   DELETE_PSTREAM
-    Delete a prioritized data endpoint
-   DELETE_WOW_PATTERN
-    Remove a pre-specified pattern from the WoW pattern list
-   EXTENSION
-    WMI message interface command
-   GET_BIT_RATE
-    Retrieve rate most recently used by the AR6000
-   GET_CHANNEL_LIST
-    Retrieve list of channels used by the AR6000
-   GET_FIXRATES
-    Retrieves the rate-mask set via the SET_FIXRATES command.
-   GET_PMKID_LIST_CMD
-    Retrieve the firmware list of PMKIDs
-   GET_ROAM_DATA
-    Internal use for data collection; available in special build only
-   GET_ROAM_TBL
-    Retrieve the roaming table maintained on the target
-   GET_TARGET_STATS
-    Request that the target send the statistics it maintains
-   GET_TX_PWR
-    Retrieve the current AR6000 device Tx power levels
-   GET_WOW_LIST
-    Retrieve the current list of WoW patterns
-   LQ_THRESHOLD_PARAMS
-    Set the link quality thresholds
-   OPT_TX_FRAME
-    Send a special frame (special feature)
-   RECONNECT
-    Request a reconnection to a BSS
-   RSSI_THRESHOLD_PARAMS
-    Configure how the AR6000 device monitors and reports signal
-       strength (RSSI) of the connected BSS
-   SCAN_PARAMS
-    Determine dwell time and changes scanned channels
-   SET_ACCESS_PARAMS
-    Set access parameters for the wireless network
-   SET_ADHOC_BSSID
-    Set the BSSID for an ad hoc network
-   SET_AKMP_PARAMS
-    Set multiPMKID mode
-   SET_APPIE
-    Add application-specified IE to a management frame
-   SET_ASSOC_INFO
-    Specify the IEs the device should add to association or
-        reassociation requests
-   SET_AUTH_MODE
-    Set 802.11 authentication mode of reconnection
-   SET_BEACON_INT
-    Set the beacon interval for an ad hoc network
-   SET_BIT_RATE
-    Set the AR6000 to a specific fixed bit rate
-   SET_BMISS_TIME
-    Set the beacon miss time
-   SET_BSS_FILTER
-    Inform the AR6000 of network types about which it wants to
-        receive information using a “BSSINFO” event
-   SET_BT_PARAMS
-    Set the status of a Bluetooth stream (SCO or A2DP) or set
-        Bluetooth coexistence register parameters
-   SET_BT_STATUS
-    Set the status of a Bluetooth stream (SCO or A2DP)
-   SET_CHANNEL_PARAMETERS
-    Configure WLAN channel parameters
-   SET_DISC_TIMEOUT
-    Set the amount of time the AR6000 spends attempting to
-        reestablish a connection
-   SET_FIXRATES
-    Set the device to a specific fixed PHY rate (supported subset)
-   SET_HALPARAM
-    Internal AR6000 command to set certain hardware parameters
-   SET_HOST_SLEEP_MODE
-    Set the host mode to asleep or awake
-   SET_IBSS_PM_CAPS
-    Support a non-standard power management scheme for an
-        ad hoc network
-   SET_LISTEN_INT
-    Request a listen interval
-   SET_LPREAMBLE
-    Override the short preamble capability of the AR6000 device
-   SET_MAX_SP_LEN
-    Set the maximum service period
-   SET_OPT_MODE
-    Set the special mode on/off (special feature)
-   SET_PMKID
-    Set the pairwise master key ID (PMKID)
-   SET_PMKID_LIST_CMD
-    Configure the firmware list of PMKIDs
-   SET_POWER_MODE
-    Set guidelines on trade-off between power utilization
-   SET_POWER_PARAMS
-    Configure power parameters
-   SET_POWERSAVE_PARAMS
-    Set the two AR6000 power save timers
-   SET_PROBED_SSID
-    Provide list of SSIDs the device should seek
-   SET_REASSOC_MODE
-    Specify whether the disassociated frame should be sent upon
-        reassociation
-   SET_RETRY_LIMITS
-    Limit how many times the device tries to send a frame
-   SET_ROAM_CTRL
-    Control roaming behavior
-   SET_RTS
-    Determine when RTS should be sent
-   SET_SCAN_PARAMS
-    Set the AR6000 scan parameters
-   SET_TKIP_COUNTERMEASURES
-    Enable/disable reports of TKIP MIC errors
-   SET_TX_PWR
-    Specify the AR6000 device Tx power levels
-   SET_VOICE_PKT_SIZE
-    Set voice packet size
-   SET_WMM
-    Override the AR6000 WMM capability
-   SET_WMM_TXOP
-    Configure TxOP bursting when sending traffic to a WMM-
-    capable AP
-   SET_WOW_MODE
-    Enable/disable WoW mode
-   SET_WSC_STATUS
-    Enable/disable profile check in cserv when the WPS protocol
-    is in progress
-   SNR_THRESHOLD_PARAMS
-    Configure how the device monitors and reports SNR of BSS
-   START_SCAN
-    Start a long or short channel scan
-   SYNCHRONIZE
-    Force a synchronization point between command and data
-    paths
-   TARGET_REPORT_ERROR_BITMASK
-    Control “ERROR_REPORT” events from the AR6000
-
-
-
-
-Name
-    ADD_BAD_AP
-
-Synopsis
-    The host uses this command to cause the AR6000 to avoid a particular AP. The
-    AR6000 maintain a table with up to two APs to avoid. An ADD_BAD_AP command
-    adds or replaces the specified entry in this bad AP table.
-
-    If the AR6000 are currently connected to the AP specified in this command, they
-    disassociate.
-
-Command
-    wmiconfig eth1 --badap <bssid> <badApIndex>
-
-Command Parameters
-    UINT8 badApIndex    Index [0...1] that identifies which entry in the
-                        bad AP table to use
-
-
-    UINT8 bssid[6]  MAC address of the AP to avoid
-
-Command Values
-    badApIndex = 0, 1    Entry in the bad AP table to use
-
-Reset Value
-    The bad AP table is cleared
-
-Restrictions
-    None
-
-See Also
-    “DELETE_BAD_AP” on page B-13
-
-=====================================================================
-Name
-    ADD_CIPHER_KEY
-
-Synopsis
-    The host uses this command to add/replace any of four encryption keys on the
-    AR6000. The ADD_CIPHER_KEY command is issued after the CONNECT event
-    has been received by the host for all dot11Auth modes except for SHARED_AUTH.
-    When the dot11AuthMode is SHARED_AUTH, then the ADD_CIPHER_KEY
-    command should be issued before the “CONNECT” command.
-
-Command
-    wmiconfig eth1 --cipherkey <keyIndex> <keyType> <keyUsage>
-                            <keyLength> <keyopctrl> <keyRSC> <key>
-
-Command Parameters
-    UINT8 keyIndex      Index (0...3) of the key to add/replace;
-                        uniquely identifies the key
-    UINT8 keyType    CRYPTO_TYPE
-    UINT8 keyUsage   Specifies usage parameters of the key when
-                     keyType = WEP_CRYPT
-    UINT8 keyLength  Length of the key in bytes
-    UINT8 keyOpCtrl  bit[0] = Initialize TSC (default),
-                     bit[1] = Initialize RSC
-    UINT8 keyRSC[8]  Key replay sequence counter (RSC) initial
-                     value the device should use
-    UINT8 key[32]    Key material used for this connection
-    Command Values
-    {
-        NONE_CRYPT = 1
-        WEP_CRYPT  = 2
-        TKIP_CRYPT = 3
-        AES_CRYPT  = 4
-        KEY_OP_INIT_TSC   0x01
-        KEY_OP_INIT_RSC   0x02
-        KEY_OP_INIT_VAL   0x03
-                Default is to Initialize the TSC
-        KEY_OP_VALID_MASK 0x04
-                Two operations defined
-    } CRYPTO_TYPE
-
-    {
-        PAIRWISE_USAGE  = 0  Set if the key is used for unicast traffic only
-        GROUP_USAGE     = 1  Set if the key is used to receive multicast
-                              traffic (also set for static WEP keys)
-        TX_USAGE        = 2  Set for the GROUP key used to transmit frames
-                All others are reserved
-    } KEY_USAGE
-
-Reset Value
-    The four available keys are disabled.
-
-Restrictions
-    The cipher should correspond to the encryption mode specified in the “CONNECT”
-    command.
-
-See Also
-    “DELETE_CIPHER_KEY”
-
-=====================================================================
-
-
-Name
-    ADD_WOW_PATTERN
-
-Synopsis
-    The host uses this command to add a pattern to the WoW pattern list; used for
-    pattern-matching for host wakeups by the WoW module. If the host mode is asleep
-    and WoW is enabled, all packets are matched against the existing WoW patterns. If a
-    packet matches any of the patterns specified, the target will wake up the host. All
-    non-matching packets are discarded by the target without being sent up to the host.
-
-Command
-    wmiconfig –addwowpattern <list-id> <filter-size> <filter-offset>
-    <pattern> <mask>
-
-Command Parameters
-    A_UINT8  filter_list_id    ID of the list that is to include the new pattern
-    A_UINT8  filter_size       Size of the new pattern
-    A_UINT8  filter_offset     Offset at which the pattern matching for this
-                                new pattern should begin at
-    A_UINT8  filter[1]         Byte stream that contains both the pattern and
-                                the mask of the new WoW wake-up pattern
-
-Reply Parameters
-    None
-
-Reset Value
-    None defined (default host mode is awake)
-
-Restrictions
-    None
-
-See Also
-    “DELETE_WOW_PATTERN”
-
-=====================================================================
-
-
-Name
-    CLR_RSSI_SNR
-
-Synopsis
-    Clears the current calculated RSSI and SNR value. RSSI and SNR are reported by
-    running-average value. This command will clear the history and have a fresh start
-    for the running-average mechanism.
-
-Command
-    wmiconfig eth1 --cleanRssiSnr
-
-Command Parameters
-    None
-
-Reply Parameters
-    None
-
-Reset Value
-    None defined
-
-Restrictions
-    None
-
-=====================================================================
-
-Name
-    CONNECT_CMD
-
-Synopsis
-    New connect control information (connectCtrl) is added, with 32 possible modifiers.
-
-    CONNECT_SEND_REASSOC
-        Valid only for a host-controlled connection to a
-        particular AP. If this bit is set, a reassociation frame is
-        sent. If this bit is clear, an association request frame is
-        sent to the AP.
-
-    CONNECT_IGNORE_WPAx_GROUP_CIPHER
-        No group key is issued in the CONNECT command,
-        so use the group key advertised by the AP. In a target-
-        initiated roaming situation this allows a STA to roam
-        between APs that support different multicast ciphers.
-
-    CONNECT_PROFILE_MATCH_DONE
-        In a host-controlled connection case, it is possible that
-        during connect, firmware may not have the
-        information for a profile match (e.g, when the AP
-        supports hidden SSIDs and the device may not
-        transmit probe requests during connect). By setting
-        this bit in the connection control information, the
-        firmware waits for a beacon from the AP with the
-        BSSID supplied in the CONNECT command. No
-        additional profile checks are done.
-
-    CONNECT_IGNORE_AAC_BEACON
-        Ignore the Admission Capacity information in the
-        beacon of the AP
-
-    CONNECT_ASSOC_POLICY_USER
-        When set, the CONNECT_SEND_REASSOC setting
-        determines if an Assoc or Reassoc is sent to an AP
-
-Command
-    wmiconfig --setconnectctrl <ctrl flags bitmask>
-
-Command Parameters
-    typedef struct{
-    A_UINT8 networktype;
-    A_UINT8 dot11authmode;
-    A_UINT8 authmode;
-    A_UINT8 pairwiseCryptoType; /*CRYPTO_TYPE*/
-    A_UINT8 pairwiseCryptoLen;
-    A_UINT8 groupCryptoType; /*CRYPTO_TYPE*/
-    A_UINT8 groupCryptoLen;
-    A_UINT8 ssidLength;
-    A_UCHAR ssid[WMI_MAX_SSID_LEN];
-    A_UINT16 channel;
-    A_UINT8 bssid[AUTH_MAC_LEN];
-    A_UINT8 ctrl_flags; /*WMI_CONNECT_CTRL_FLAGS_BITS*/
-    } WMI_CONNECT_CMD;
-
-    ctrl flags bitmask
-        = 0x0001 CONNECT_ASSOC_POLICY_USER
-            Assoc frames are sent using the policy specified by
-            the flag
-        = 0x0002 CONNECT_SEND_REASSOC
-            Send Reassoc frame while connecting, otherwise send
-            assoc frames
-        = 0x0004 CONNECT_IGNORE_WPAx_GROUP_CIPHER
-            Ignore WPAx group cipher for WPA/WPA2
-        = 0x0008 CONNECT_PROFILE_MATCH_DONE
-            Ignore any profile check
-        = 0x0010 CONNECT_IGNORE_AAC_BEACON
-            Ignore the admission control information in the
-            beacon
-        ... CONNECT_CMD, continued
-        Command Values
-        typedef enum {
-            INFRA_NETWORK       = 0x01,
-            ADHOC_NETWORK       = 0x02,
-            ADHOC_CREATOR       = 0x04,
-        } NETWORK_TYPE;
-
-        typedef enum {
-            OPEN_AUTH           = 0x01,
-            SHARED_AUTH         = 0x02,
-            LEAP_AUTH           = 0x04,
-        } DOT11_AUTH_MODE;
-        typedef enum {
-            NONE_AUTH           = 0x01,
-            WPA_AUTH            = 0x02,
-            WPA_PSK_AUTH        = 0x03,
-            WPA2_AUTH           = 0x04,
-            WPA2_PSK_AUTH       = 0x05,
-            WPA_AUTH_CCKM       = 0x06,
-            WPA2_AUTH_CCKM      = 0x07,
-        } AUTH_MODE;
-        typedef enum {
-            NONE_CRYPT          = 0x01,
-            WEP_CRYPT           = 0x02,
-            TKIP_CRYPT          = 0x03,
-            AES_CRYPT           = 0x04,
-        } CRYPTO_TYPE;
-        typedef enum {
-            CONNECT_ASSOC_POLICY_USER = 0x0001,
-            CONNECT_SEND_REASSOC = 0x0002,
-            CONNECT_IGNORE_WPAx_GROUP_CIPHER = 0x0004,
-            CONNECT_PROFILE_MATCH_DONE = 0x0008,
-            CONNECT_IGNORE_AAC_BEACON = 0x0010,
-        } WMI_CONNECT_CTRL_FLAGS_BITS;
-
-    pairwiseCryptoLen and groupCryptoLen are valid when the respective
-    CryptoTypesis WEP_CRYPT, otherwise this value should be 0. This is the length in
-    bytes.
-
-Reset Value
-    None defined
-
-Restrictions
-    None
-
-=====================================================================
-
-
-Name
-    CREATE_PSTREAM
-
-Synopsis
-    The host uses this command to create a new prioritized data endpoint between the
-    host and the AR6000 device that carries a prioritized stream of data. If the AP that the
-    device connects to requires TSPEC stream establishment, the device requests the
-    corresponding TSPEC with the AP. The maximum and minimum service interval
-    ranges from 0 – 0x7FFFFFFF (ms), where 0 = disabled. The device does not send a
-    reply event for this command, as it is always assumed the command has succeeded.
-    An AP admission control response comes to the host via a WMI_CAC_INDICATION
-    event, once the response for the ADDTS frame comes.
-
-    Examples of cases where reassociation is generated (when WMM) and cases where
-    ADDTS is generated (when WMM and enabling ACM) are when:
-        Changing UAPSD flags in WMM mode, reassociation is generated
-        Changing the interval of sending auto QoS Null frame in WMM mode;
-            reassociation is not generated
-        Issuing a command with same previous parameters in WMM mode and enabling
-            ACM, an ADDTS request is generated
-        Changing the interval of a QoS null frame sending in WMM mode and enabling
-            ACM, an ADDTS request is generated
-        Issuing the command in disconnected state, reassociation or ADDTS is not
-            generated but the parameters are available after (re)association
-
-Command
-    --createqos <user priority> <direction> <traffic class>
-<trafficType> <voice PS capability> <min service interval> <max
-service interval> <inactivity interval> <suspension interval>
-<service start time> <tsid> <nominal MSDU> <max MSDU> <min data
-rate> <mean data rate> <peak data rate> <max burst size> <delay
-bound> <min phy rate> <sba> <medium time> where:
-
-    <user priority>
-    802.1D user priority range (0–7)
-    <direction>
-        = 0    Tx (uplink) traffic
-        = 1    Rx (downlink) traffic
-        = 2    Bi-directional traffic
-    <traffic class>
-        = 1    BK
-        = 2    VI
-        = 3    VO
-    <trafficType>
-        = 0    Aperiodic
-        = 1    Periodic
-    <voice PS capability>
-        Specifies whether the voice power save mechanism
-    (APSD if AP supports it or legacy/simulated APSD
-    [using PS-Poll]) should be used
-        = 0    Disable voice power save for traffic class
-        = 1    Enable APSD voice power save for traffic class
-        = 2    Enable voice power save for all traffic classes
-    <min service interval>
-        (In ms)
-    <max service interval>
-        Inactivity interval (in ms) (0 = Infinite)
-    <suspension interval>
-        (In ms)
-    <service start time>
-        Service start time
-    <tsid>
-        TSID range (0–15)
-    <nominal MSDU>
-        Nominal MAC SDU size
-    <max MSDU>
-        Maximum MAC SDU size
-    <min data rate>
-        Minimum data rate (in bps)
-    <mean data rate>
-        Mean data rate (in bps)
-    <peak data rate>
-        Peak data rate (in bps)
-    <max burst size>
-        Maximum burst size (in bps)
-    <delay bound>
-        Delay bound
-    <min phy rate>
-        Minimum PHY rate (in bps)
-    <sba>
-        Surplus bandwidth allowance
-    <medium time>
-        Medium time in TU of 32-ms periods per sec
-    ... CREATE_PSTREAM (continued)
-
-Command Parameters
-    UINT8 trafficClass    TRAFFIC_CLASS value
-    UINT8 traffic
-    Direction
-    DIR_TYPE value
-    UINT8    rxQueueNum
-        AR6000 device mailbox index (2 or 3)
-        corresponding to the endpoint the host
-        wishes to use to receive packets for the
-        prioritized stream
-    UINT8 trafficType  TRAFFIC_TYPE value
-    UINT8 voicePS
-Capability
-    VOICEPS_CAP_TYPE value
-    UINT8 tsid          Traffic stream ID
-    UINT8 userPriority  802.1D user priority
-    UINT16 nominalMSDU  Nominal MSDU in octets
-    UINT16 maxMSDU      Maximum MSDU in octets
-    UINT32 minServiceInt Minimum service interval: the min.
-                            period of traffic specified (in ms)
-    UINT32 maxServiceInt  Maximum service interval: the max.
-                        period of traffic specified (in ms)
-    UINT32 inactivityInt Indicates how many ms an established
-                        stream is inactive before the prioritized
-                        data endpoint is taken down and the
-                        corresponding T-SPEC deleted
-    UINT32 suspensionInt  Suspension interval (in ms)
-    UINT32 service       StartTime Service start time
-    UINT32 minDataRate  Minimum data rate (in bps)
-    UINT32 meanDataRate Mean data rate (in bps)
-    UINT32 peakDataRate Peak data rate (in bps)
-    UINT32 maxBurstSize
-    UINT32 delayBound
-    UINT32 minPhyRate   Minimum PHY rate for TSPEC (in bps)
-    UINT32 sba          Surplus bandwidth allowance
-    UINT32 mediumTime   Medium TSPEC time (in units of 32 ms)
-Command Values
-    {
-        WMM_AC_BE = 0   Best Effort
-        WMM_AC_BK = 1   Background
-        WMM_AC_VI = 2   Video
-        WMM_AC_VO = 3   Voice
-        All other values reserved
-    } TRAFFIC_CLASS
-    {
-        UPLINK_TRAFFIC   = 0  From the AR6000 device to the AP
-        DOWNLINK_TRAFFIC = 1  From the AP to the AR6000 device
-        BIDIR_TRAFFIC    = 2  Bi-directional traffic
-        All other values reserved
-    } DIR_TYPE
-    {
-        DISABLE_FOR_THIS_AC = 0
-        ENABLE_FOR_THIS_AC  = 1
-        ENABLE_FOR_ALL_AC   = 2
-        All other values reserved
-    } VOICEPS_CAP_TYPE
-
-    ... CREATE_PSTREAM (continued)
-
-
-        VI  BE   BK    Supported, Y/N?
-   0    0    0    0    Y
-   0    0    0    1    Y
-   0    0    1    0    N
-   0    0    1    1    N
-   0    1    0    0    Y
-   0    1    0    1    Y
-   0    1    1    0    N
-   0    1    1    1    N
-   1    0    0    0    Y
-   1    0    0    1    Y
-   1    0    1    0    N
-   1    1    0    0    N
-   1    1    0    1    Y
-   1    1    0    0    N
-   1    1    1    0    N
-   1    1    1    1    Y
-
-Reset Value
-    No pstream is present after reset; each of the BE, BK, VI,VO pstreams must be created
-    (either implicitly by data flow or explicitly by user)
-
-Restrictions
-    This command can only be issued when the device is in the CONNECTED state. If
-    the device receives the command while in DISCONNECTED state, it replies with a
-    failure indication. At most four prioritized data endpoints can be created, one for
-    each AC.
-
-See Also
-    “DELETE_PSTREAM”
-=====================================================================
-
-Name
-    DELETE_BAD_AP
-
-Synopsis
-    The host uses this command to clear a particular entry in the bad AP table
-
-Command
-    wmiconfig eth1 --rmAP [--num=<index>] // used to clear a badAP
-    entry. num is index from 0-3
-
-Command Parameters
-    UINT8  badApIndex   Index [0...n] that identifies the entry in the bad
-                        AP table to delete
-
-Command Values
-    badApIndex   = 0, 1, 2, 3
-            Entry in the bad AP table
-
-Reset Value
-    None defined
-
-Restrictions
-    None
-
-See Also
-    “ADD_BAD_AP”
-
-=====================================================================
-
-
-Name
-    DELETE_CIPHER_KEY
-
-Synopsis
-    The host uses this command to delete a key that was previously added with the
-    “ADD_CIPHER_KEY” command.
-
-Command
-    TBD
-
-Command Parameters
-    UINT8   keyIndex    Index (0...3) of the key to be deleted
-
-Command Values
-    keyIndex    = 0, 1,2, 3    Key to delete
-
-Reset Value
-    None
-
-Restrictions
-    The host should not delete a key that is currently in use by the AR6000.
-
-See Also
-    “ADD_CIPHER_KEY”
-
-=====================================================================
-
-Name
-    DELETE_PSTREAM
-
-Synopsis
-    The host uses this command to delete a prioritized data endpoint created by a
-    previous “CREATE_PSTREAM” command
-
-Command
-    --deleteqos <trafficClass> <tsid>, where:
-
-    <traffic class>
-        = 0    BE
-        = 1    BK
-        = 2    VI
-        = 3    VO
-    <tsid>
-        The TSpec ID; use the -qosqueue option
-        to get the active TSpec IDs for each traffic class
-
-Command Parameters
-    A_UINT8    trafficClass    Indicate the traffic class of the stream
-                            being deleted
-
-Command Values
-    {
-        WMM_AC_BE = 0    Best effort
-        WMM_AC_BK = 1    Background
-        WMM_AC_VI = 2    Video
-        WMM_AC_VO = 3    Voice
-    } TRAFFIC CLASS
-
-    0-15 for TSID
-
-Reply Values
-    N/A
-
-Restrictions
-    This command should only be issued after a “CREATE_PSTREAM” command has
-    successfully created a prioritized stream
-
-See Also
-    “CREATE_PSTREAM”
-
-=====================================================================
-
-
-Name
-    DELETE_WOW_PATTERN
-
-Synopsis
-    The host uses this command to remove a pre-specified pattern from the
-    WoW pattern list.
-
-Command
-    wmiconfig –delwowpattern <list-id> <pattern-id>
-
-Command Parameters
-    A_UINT8    filter_list_id    ID of the list that contains the WoW filter
-                                 pattern to delete
-    A_UINT8    filter_id    ID of the WoW filter pattern to delete
-
-Reply Parameters
-    None
-
-
-
-Reset Value
-    None defined
-
-Restrictions
-    None
-
-See Also
-    “ADD_WOW_PATTERN”
-
-=====================================================================
-
-
-Name
-    EXTENSION
-
-Synopsis
-    The WMI message interface is used mostly for wireless control messages to a wireless
-    module applicable to wireless module management regardless of the target platform
-    implementation. However, some commands only peripherally related to wireless
-    management are desired during operation. These wireless extension commands may
-    be platform-specific or implementation-dependent.
-
-Command
-    N/A
-
-Command Parameters
-    Command-specific
-
-Command Values
-    Command-specific
-
-Reply Parameters
-    Command-specific
-
-Reset Values
-    None defined
-
-Restrictions
-    None defined
-
-=====================================================================
-
-
-Name
-    GET_BIT_RATE
-
-Synopsis
-    Used by the host to obtain the rate most recently used by the AR6000 device
-
-Command
-    wmiconfig eth1 --getfixrates
-
-Command Parameters
-    None
-
-
-
-Reply Parameters
-    INT8
-    rateIndex
-    See the “SET_BIT_RATE” command
-
-Reset Values
-    None
-
-Restrictions
-    This command should only be used during development/debug; it is not intended
-for use in production. It is only valid when the device is in the CONNECTED state
-
-See Also
-    “SET_BIT_RATE”
-
-=====================================================================
-
-
-Name
-    GET_CHANNEL_LIST
-
-Synopsis
-    Used by the host uses to retrieve the list of channels that can be used by the device
-    while in the current wireless mode and in the current regulatory domain.
-
-Command
-    TBD
-
-Command Parameters
-    None
-
-Reply Parameters
-    UINT8    reserved    Reserved
-    UINT8    numberOfChannels    Number of channels the reply contains
-    UINT16    channelList[numberOfChannels]  Array of channel frequencies (in MHz)
-
-Reset Values
-    None defined
-
-Restrictions
-    The maximum number of channels that can be reported are 32
-
-=====================================================================
-
-
-Name
-    GET_FIXRATES
-
-Synopsis
-    Clears the current calculated RSSI and SNR value. RSSI and SNR are reported by
-    running-average value. This command will clear the history and have a fresh start for
-    the running-average mechanism.
-
-Synopsis
-    This returns rate-mask set via WMI_SET_FIXRATES to retrieve the current fixed rate
-    that the AR6001 or AR6001 is using. See “SET_FIXRATES”.
-
-Command
-    wmiconfig eth1 --getfixrates
-
-Command Parameters
-    A_UINT16    fixRateMask;    Note: if this command is used prior to
-                using WMI_SET_FIXRATES, AR6000
-                returns 0xffff as fixRateMask, indicating
-                all the rates are enabled
-
-Reply Parameters
-    None
-
-Reset Value
-    None defined
-
-Restrictions
-    None
-
-See Also
-    “SET_FIXRATES”
-
-=====================================================================
-
-
-
-Name
-    GET_PMKID_LIST_CMD
-
-Synopsis
-    Retrieves the list of PMKIDs on the firmware. The
-    WMI_GET_PMKID_LIST_EVENT is generated by the firmware.
-
-Command
-    TBD
-
-Command Parameters
-
-Reset Values
-    None
-
-Restrictions
-    None
-
-See Also
-    SET_PMKID_LIST_CMD GET_PMKID_LIST_EVENT
-
-=====================================================================
-
-
-Name
-    GET_ROAM_TBL
-
-Synopsis
-    Retrieve the roaming table maintained on the target. The response is reported
-    asynchronously through the ROAM_TBL_EVENT.
-
-Command
-    wmiconfig --getroamtable <roamctrl> <info>
-
-Command Parameters
-    A_UINT8    roamCtrlType;
-    A_UINT16   roamMode
-    A_UINT16   numEntries
-    WMI_BSS_ROAM_INFO bssRoamInfo[1]
-
-Reply Value
-    Reported asynchronously through the ROAM_TBL_EVENT
-
-Reset Value
-    None defined
-
-Restrictions
-    None
-
-See Also
-    SET_KEEPALIVE
-
-=====================================================================
-
-
-Name
-    GET_TARGET_STATS
-
-Synopsis
-    The host uses this command to request that the target send the statistics that it
-    maintains. The statistics obtained from the target are accrued in the host every time
-    the GET_TARGET_STATS command is issued. The --clearStats option is added to
-    clear the target statistics maintained in the host.
-
-Command
-    wmiconfig --getTargetStats --clearStats
-
-Command Parameters
-    TARGET_STATS    targetStats
-    WMI_TARGET_STATS
-    UINT8   clearStats
-
-
-Reply Value
-    RSSI return value (0–100)
-
-Reset Values
-    All statistics are cleared (zeroed)
-
-Restrictions
-    The --getTargetStats option must be used; the --clearStats option is also available also
-
-
-=====================================================================
-
-Name
-    GET_TX_PWR
-
-Synopsis
-    The host uses this command to retrieve the current Tx power level
-
-Command
-    wmiconfig -i eth1 --getpower
-
-Command Parameters
-    None
-
-Reply Parameters
-    UINT16 dbM    The current Tx power level specified in dbM
-
-Reset Values
-    The maximum permitted by the regulatory domain
-
-Restrictions
-    None
-
-See Also
-    “SET_TX_PWR”
-
-=====================================================================
-
-
-Name
-    GET_WOW_LIST
-
-Synopsis
-    The host uses this command to retrieve the current list of WoW patterns.
-
-Command
-    wmiconfig –getwowlist <list-id>
-
-Command Parameters
-    A_UINT8 filter_list_id    ID of the list of WoW patterns to retrieve
-
-Reply Value(s)
-    A_UINT16  num_filters    Number of WoW patterns contained in the list
-    A_UINT8   wow_mode    Current mode of WoW (enabled or disabled)
-    A_UINT8    host_mode    Current host mode (asleep or awake)
-    WOW_FILTER    wow_filters[1]
-        Contents of the WoW filter pattern list
-        (contains mask, pattern, offset and size
-    information for each of the patterns)
-
-Reset Value
-    None defined
-
-Restrictions
-    None
-
-See Also
-    “SET_WSC_STATUS”
-
-=====================================================================
-
-
-Name
-    LQ_THRESHOLD_PARAMS
-
-Synopsis
-    Sets Link Quality thresholds, the sampling will happen at every unicast data frame
-    Tx if a certain threshold is met, and the corresponding event will be sent to the host.
-
-Command
-    --lqThreshold <enable> <upper_threshold_1> ...
-    <upper_threshold_4> <lower_threshold_1> ... <lower_threshold_4>
-
-Command Parameters
-    <enable>    = 0    Disable link quality sampling
-                = 1    Enable link quality sampling
-    <upper_threshold_x>  Above thresholds (value in [0,100]), in
-                    ascending order
-    <lower_threshold_x> Below thresholds (value in [0,100]), in
-                    ascending order
-
-Command Values
-    See command parameters
-
-Reset Value
-    None defined
-
-Restrictions
-    None
-
-=====================================================================
-
-
-Name
-    OPT_TX_FRAME
-
-Synopsis
-    Special feature, sends a special frame.
-
-Command
-    wmiconfig --sendframe <frmType> <dstaddr> <bssid> <optIEDatalen>
-    <optIEData>
-
-Command Parameters
-    {
-        A_UINT16    optIEDataLen;
-        A_UINT8    frmType;
-        A_UINT8    dstAddr[ATH_MAC_LEN];
-        A_UINT8    bssid[ATH_MAC_LEN];
-        A_UINT8    optIEData[1];
-    } WMI_OPT_TX_FRAME_CMD;
-
-Command Values
-    <frmtype>   = 1    Probe request frame
-                = 2    Probe response frame
-                = 3    CPPP start
-                = 4    CPPP stop
-
-Reset Value
-    None defined
-
-Restrictions
-    Send a special frame only when special mode is on.
-
-=====================================================================
-
-
-Name
-    RECONNECT
-
-Synopsis
-    This command requests a reconnection to a BSS to which the AR6000 device was
-    formerly connected
-
-Command
-    TBD
-
-Command Parameters
-    UINT16    channel    Provides a hint as to which channel was
-                        used for a previous connection
-    UINT8    bssid[6]    If set, indicates which BSSID to connect to
-
-Command Values
-    None
-
-Reset Values
-    None
-
-Restrictions
-    None
-
-See Also
-    “CONNECT_CMD”
-
-=====================================================================
-
-
-Name
-    RSSI_THRESHOLD_PARAMS
-
-Synopsis
-    Configures how the AR6000 device monitors and reports signal strength (RSSI) of the
-    connected BSS, which is used as a link quality metric. The four RSSI threshold sets (in
-    dbM) of the host specification divide the signal strength range into six segments.
-    When signal strength increases or decreases across one of the boundaries, an
-    RSSI_THRESHOLD event is signaled to the host. The host may then choose to take
-    action (such as influencing roaming).
-
-Command
-    wmiconfig eth1 --rssiThreshold <weight> <pollTime>
-        <above_threshold_val_1> ... <above_threshold_tag_6>
-        <above_threshold_val_6>
-        <below_threshold_tag_1> <below_threshold_val_1> ...
-        <below_threshold_tag_6> <below_threshold_val_6>
-
-Command Parameters
-    UINT8    weight    Range in [1, 16] used to calculate average RSSI
-    UINT32   pollTime   RSSI (signal strength) sampling frequency in
-                seconds (if pollTime = 0, single strength
-        sampling is disabled)
-    USER_RSS__THOLD tholds[12]  Thresholds (6 x 2)
-
-Command Values
-    None defined
-
-Reset Values
-    pollTime is 0, and sampling is disabled
-
-Restrictions
-    Can only be issued if the AR6000 device is connected
-
-
-=====================================================================
-
-Name
-    SCAN_PARAMS
-
-Synopsis
-    The minact parameter determines the minimum active channel dwell time, within
-    which if the STA receives any beacon, it remains on that channel until the maxact
-    channel dwell time. If the STA does not receive a beacon within the minact dwell
-    time, it switches to scan the next channel.
-
-Command
-    wmiconfig -scan -minact=<ms> --maxact=<ms>
-
-Command Parameters
-    UINT16    maxact    Channel dwell time (in ms), default = 0
-    UINT16    minact    Channel dwell time (in ms), default = 105
-
-Command Values
-    See channel parameters
-
-Reset Values
-    None defined
-
-Restrictions
-    The minact value should be greater than 0; maxact should be between 5–65535 ms
-    and greater than minact
-
-=====================================================================
-
-
-Name
-    SET_ACCESS_PARAMS
-
-Synopsis
-    Allows the host to set access parameters for the wireless network. A thorough
-    understanding of IEEE 802.11 is required to properly manipulate these parameters.
-
-Command
-    wmiconfig eth1 --acparams --txop <limit> --cwmin <0-15>
-    --cwmax <0-15> --aifsn<0-15>
-
-Command Parameters
-    UINT16    txop    The maximum time (expressed in units of
-                        32 ms) the device can spend transmitting
-                        after acquiring the right to transmit
-    UINT8    eCWmin    Minimum contention window
-    UINT8    eCWmax    Maximum contention window
-    UINT8    aifsn    The arbitration inter-frame space number
-
-Command Values
-    None
-
-Reset Values
-    Reasonable defaults that vary, between endpoints (prioritized streams)
-
-Restrictions
-    None
-
-=====================================================================
-
-
-Name
-    SET_ADHOC_BSSID
-
-Synopsis
-    Allows the host to set the BSSID for an ad hoc network. If a network with this BSSID
-    is not found, the target creates an ad hoc network with this BSSID after the connect
-    WMI command is triggered (e.g., by the SIOCSIWESSID IOCTL).
-
-Command
-    wmiconfig eth1 --adhocbssid <bssid>
-
-Command Parameters
-    A_UINT8     bssid[ATH_MAC_LEN]    BSSID is specified in xx:xx:xx:xx:xx:xx format
-
-Command Values
-    None
-
-Reset Values
-    None
-
-Restrictions
-    None
-
-=====================================================================
-
-
-Name
-    SET_AKMP_PARAMS
-
-Synopsis
-    Enables or disables multi PMKID mode.
-
-Command
-    wmiconfig eth1 --setakmp --multipmkid=<on/off>
-
-Command Parameters
-    typedef struct {
-      A_UINT32    akmpInfo;
-    } WMI_SET_AKMP_PARAMS_CMD;
-
-Command Values
-    akmpInfo;
-    bit[0] = 0
-        MultiPMKID mode is disabled and PMKIDs that
-        were set using the WMI_SET_PMKID_CMD are
-        used in the [Re]AssocRequest frame.
-     bit[0] = 1
-        MultiPMKID mode is enabled and PMKIDs issued
-        by the WMI_SET_PMKID_LIST_CMD are used in
-        the next [Re]AssocRequest sent to the AP.
-
-Reset Values
-    MultiPMKID mode is disabled
-
-Restrictions
-    None
-
-=====================================================================
-
-
-Name
-    SET_APPIE
-
-Synopsis
-    Add an application-specified IE to a management frame. The maximum length is
-    76 bytes. Including the length and the element ID, this translates to 78 bytes.
-
-Command
-    wmiconfig --setappie <frame> <IE>, where:
-
-    frame
-        One of beacon, probe, respon, assoc
-
-    IE
-        A hex string beginning with DD (if = 0, no
-        IE is sent in the management frame)
-
-Command Parameters
-    mgmtFrmType;
-        A WMI_MGMT_FRAME_TYPE
-
-    ieLen;
-        Length of the IE to add to the GMT frame
-
-Command Values
-    None
-
-Reset Value
-    None defined
-
-Restrictions
-    Supported only for the probe request and association request management frame
-types. Also, only one IE can be added per management frame type.
-
-=====================================================================
-
-
-Name
-    SET_ASSOC_INFO
-
-Synopsis
-    The host uses this command to specify any information elements (IEs) it wishes the
-    AR6000 device to add to all future association and reassociation requests. IEs must be
-    correct and are used as is by the device. IEs specified through this command are
-    cleared with a DISCONNECT.
-
-Command
-    wmiconfig eth1 --setAssocIe <IE>
-
-Command Parameters
-    UINT8    ieType    Used directly in 802.11 frames
-    UINT8    bufferSize    Size of assocInfo (in bytes) ranging from
-                        0–240. If = 0, previously set IEs are cleared.
-    UINT8    assocInfo[bufferSize]    Used directly in 802.11 frames
-
-Command Values
-    None
-
-Reset Values
-    IEs are cleared
-
-Restrictions
-    This command can only be issued in the DISCONNECTED state
-
-=====================================================================
-
-
-Name
-    SET_AUTHMODE
-
-Synopsis
-    Sets the 802.11 authentication mode of reconnection
-
-Command
-    wmiconfig eth1 --setauthmode <mode>
-
-Command Parameters
-    UINT8    mode
-
-Command Values
-    mode    = 0x00    Proceed with authentication during reconnect
-            = 0x01    Do not proceed with authentication during reconnect
-
-Reset Values
-    Authentication
-
-Restrictions
-    None
-
-=====================================================================
-
-
-Name
-    SET_BEACON_INT
-
-Synopsis
-    Sets the beacon interval for an ad hoc network. Beacon interval selection may have an
-    impact on power savings. To some degree, a longer interval reduces power
-    consumption but also decreases throughput. A thorough understanding of IEEE
-    802.11 ad hoc networks is required to use this command effectively.
-
-Command
-    wmiconfig eth1 --ibssconintv
-
-Command Parameters
-    UINT16    beaconInterval    Specifies the beacon interval in TU units (1024 ms)
-
-Command Values
-    None
-
-Reset Values
-    The default beacon interval is 100 TUs (102.4 ms)
-
-Restrictions
-    This command can only be issued before the AR6000 device starts an ad hoc network
-
-See Also
-    “SET_IBSS_PM_CAPS”
-
-=====================================================================
-
-
-Name
-    SET_BIT_RATE
-
-Synopsis
-    The host uses this command to set the AR6000 device to a specific fixed rate.
-
-Command
-    wmiconfig eth1 --setfixrates <rate_0> ... <rate_n>
-
-Command Parameters
-    INT8    rateIndex
-    A WMI_BIT_RATE value
-    {
-        RATE_AUTO    = -1
-        RATE_1Mb     = 0
-        RATE_2Mb     = 1
-        RATE_5_5M    = 2
-        RATE_11Mb    = 3
-        RATE_6Mb     = 4
-        RATE_9Mb     = 5
-        RATE_12Mb    = 6
-        RATE_18Mb    = 7
-        RATE_24Mb    = 8
-        RATE_36Mb    = 9
-        RATE_48Mb    = 10
-        RATE_54Mb    = 11
-      } WMI_BIT_RATE
-
-
-Command Values
-    See command parameters
-
-Reset Values
-    The dynamic rate is determined by the AR6000 device
-
-Restrictions
-    This command is intended for use only during development/debug; it is not
-intended for use in production
-
-See Also
-    “GET_BIT_RATE”
-
-=====================================================================
-
-
-Name
-    SET_BMISS_TIME
-
-Synopsis
-    This command sets the beacon miss (BMISS) time, which the AR6000 hardware use
-    to recognize missed beacons. When an excessive number (15) of consecutive beacons
-    are missed, the AR6000 consider switching to a different BSS. The time can be
-    specified in number of beacons or in TUs.
-
-Command(s)
-    wmiconfig eth1 --setbmissbeacons=<val>
-    wmiconfig eth1 --setbmisstime=<val>
-
-Command Parameters
-    UINT16    bmissTime    Specifies the beacon miss time
-                            [1000...5000] in TUs (1024 ms)
-    UINT16    bmissbeacons  Specifies the number of beacons [5...50]
-
-Command Values
-    None
-
-Reset Values
-    bmissTime is 1500 TUs (1536 ms)
-
-Restrictions
-    None
-
-=====================================================================
-
-
-Name
-    SET_BSS_FILTER
-
-Synopsis
-    The host uses this to inform the AR6000 device of the types of networks about which
-    it wants to receive information from the “BSSINFO” event. As the device performs
-    either foreground or background scans, it applies the filter and sends “BSSINFO”
-    events only for the networks that pass the filter. If any of the  bssFilter or the ieMask
-    filter matches, a BSS Info is sent to the host. The ieMask currently is used as a match
-    for the IEs in the beacons, probe reponses and channel switch action management
-    frame. See also “Scan and Roam” on page C-1.
-
-    The BSS filter command has been enhanced to support IE based filtering. The IEs can
-    be specified as a bitmask through this command using this enum.
-
-Command
-    wmiconfig eth1 –filter = <filter> --ieMask 0x<mask>
-
-Command Parameters
-    UINT8    BssFilter
-
- Command Values
-    typedef struct {
-        A_UINT8    bssFilter;    See WMI_BSS_FILTER
-        A_UINT32    ieMask;
-    } __ATTRIB_PACK WMI_BSS_FILTER_CMD;
-
-    The ieMask can take this combination of values:
-
-    enum {
-        BSS_ELEMID_CHANSWITCH   = 0x01
-        BSS_ELEMID_ATHEROS      = 0x02,
-    }
-
-Reply Value
-    None
-
-Reset Value
-    BssFilter = NONE_BSS_FILTER (0)
-
-Restrictions
-    None
-
-See Also
-    “CONNECT_CMD”
-
-=====================================================================
-
-
-Name
-    SET_BT_PARAMS
-
-Synopsis
-    This command is used to set the status of a Bluetooth stream or set Bluetooth
-    coexistence register parameters. The stream may be an SCO or an A2DP stream and
-    its status can be started/stopped/suspended/resumed.
-
-Command
-    wmiconfig –setBTparams <paramType> <params>
-
-Command Parameters
-    struct {
-       union {
-            BT_PARAMS_SCO    scoParams;
-            BT_PARAMS_A2DP   a2dpParams;
-            BT_PARAMS_MISC   miscParams;
-            BT_COEX_REGS     regs;
-        } info;
-         A_UINT8 paramType;
-        struct {
-            A_UINT8 noSCOPkts;    Number of SCO packets between consecutive PS-POLLs
-            A_UINT8 pspollTimeout;
-            A_UINT8 stompbt;
-        } BT_PARAMS_SCO;
-        struct {
-            A2DP BT stream parameters
-            A_UINT32   period;
-            A_UINT32   dutycycle;
-            A_UINT8    stompbt;
-        } BT_PARAMS_A2DP;
-        struct {
-            union {
-               WLAN_PROTECT_POLICY_TYPE   protectParams;
-               A_UINT16    wlanCtrlFlags;
-            }info;
-        A_UINT8 paramType;
-        } BT_PARAMS_MISC;
-        struct {
-            BT coexistence registers values
-            A_UINT32    mode;     Coexistence mode
-            A_UINT32    scoWghts; WLAN and BT weights
-            A_UINT32    a2dpWghts;
-            A_UINT32    genWghts;
-            A_UINT32    mode2;    Coexistence mode2
-            A_UINT8    setVal;
-        } BT_COEX_REGS;
-
-Command Values
-    None defined
-
-Reset Value
-    None
-
-Restrictions
-    None
-
-=====================================================================
-
-
-Name
-    SET_BT_STATUS
-
-Synopsis
-    Sets the status of a Bluetooth stream. The stream may be a SCO or an A2DP stream
-    and its status can be started/stopped/suspended/resumed.
-
-Command
-    wmiconfig –setBTstatus <streamType> <status>
-
-Command Parameters
-    {
-        A_UINT8        streamType;    Stream type
-        A_UINT8        status;    Stream status
-    }WMI_SET_BT_STATUS_CMD;
-
-Command Values
-    {
-        BT_STREAM_UNDEF    = 0
-        BT_STREAM_SCO
-        SCO stream
-        BT_STREAM_A2DP
-        A2DP stream
-        BT_STREAM_MAX
-    } BT_STREAM_TYPE;
-
-    {
-        BT_STATUS_UNDEF    = 0
-        BT_STATUS_START
-        BT_STATUS_STOP
-        BT_STATUS_RESUME
-        BT_STATUS_SUSPEND
-        BT_STATUS_MAX
-    } BT_STREAM_STATUS;
-
-Reset Value
-    None defined
-
-Restrictions
-    None
-
-=====================================================================
-
-
-Name
-    SET_CHANNEL_PARAMETERS
-
-Synopsis
-    Configures various WLAN parameters related to channels, sets the wireless mode,
-    and can restrict the AR6000 device to a subset of available channels. The list of
-    available channels varies depending on the wireless mode and the regulatory
-    domain. The device never operates on a channel outside of its regulatory domain. The
-    device starts to scan the list of channels right after this command.
-
-Command
-    wmiconfig eth1 --wmode <mode> <list>
-
-Command Parameters
-    UINT8    phyMode    See Values below.
-    UINT8    numberOfChannels
-        Number of channels in the channel array that
-        follows. If = 0, then the device uses all of the
-        channels permitted by the regulatory domain
-        and by the specified phyMode.
-    UINT16    channel[numberOfChannels]
-        Array listing the subset of channels (expressed
-        as frequencies in MHz) the host wants the
-        device to use. Any channel not permitted by
-        the specified phyMode or by the specified
-        regulatory domain is ignored by the device.
-
-Command Values
-    phyMode = {
-        Wireless mode
-        11a    = 0x01
-        11g    = 0x02
-        11ag   = 0x03
-        11b    = 0x04
-        11g only    = 0x05
-        }
-
-Reset Values
-    phyMode
-    11ag
-    802.11a/g modules
-        11g
-    802.11g module
-    channels
-        Defaults to all channels permitted by the
-        current regulatory domain.
-
-Restrictions
-    This command, if issued, should be issued soon after reset and prior to the first
-    connection. This command should only be issued in the DISCONNECTED state.
-
-=====================================================================
-
-
-Name
-    SET_DISC_TIMEOUT
-
-Synopsis
-    The host uses this command to configure the amount of time that the AR6000 should
-    spend when it attempts to reestablish a connection after losing link with its current
-    BSS. If this time limit is exceeded, the AR6000 send a “DISCONNECT” event. After
-    sending the “DISCONNECT” event the AR6000 continues to attempt to reestablish a
-    connection, but they do so at the interval corresponding to a foreground scan as
-    established by the “SET_SCAN_PARAMS” command.
-
-    A timeout value of 0 indicates that the AR6000 will disable all autonomous roaming,
-    so that the AR6000 will not perform any scans after sending a “DISCONNECT”
-    event to the host. The state is maintained until a shutdown or host sets different
-    timeout value from 0.
-
-Command
-    wmiconfig eth1 --disc=<timeout in seconds>
-
-Command Parameters
-    UINT8    disconnectTimeout
-        Specifies the time limit (in seconds) after
-        which a failure to reestablish a connection
-        results in a “DISCONNECT” event
-
-Command Values
-    None
-
-Reset Values
-    disconnectTimeout is 10 seconds
-
-Restrictions
-    This command can only be issued while in a DISCONNECTED state
-
-=====================================================================
-
-
-Name
-    SET_FIXRATES
-
-Synopsis
-    By default, the AR6000 device uses all PHY rates based on mode of operation. If the
-    host application requires the device to use subset of supported rates, it can set those
-    rates with this command. In 802.11g mode, the AR6000 device takes the entire
-    802.11g basic rate set and the rates specified with this command and uses it as the
-    supported rate set.
-
-    This rate set is advertised in the probe request and the assoc/re-assoc request as
-    supported rates. Upon successful association, the device modifies the rate set pool
-    using the: intersection of AP-supported rates with the union of the 802.11g basic rate
-    set and rates set using this command. The device picks transmission rates from this
-    pool based on a rate control algorithm.
-
-Command
-    TBD
-
-Command Parameters
-    A_UINT16    fixRateMask;
-        The individual bit is an index for rate table,
-        and setting the that index to 1 would set that
-        corresponding rate. E.g., fixRateMask = 9
-        (1001) sets 1 Mbps and 11 Mbps.
-
-Command Values
-    None
-
-Reset Value
-    None defined
-
-Restrictions
-    None
-
-See Also
-    “GET_FIXRATES”
-
-=====================================================================
-
-
-Name
-    SET_WHAL_PARAM
-
-Synopsis
-    An internal AR6000 command that is used to set certain hardware parameters. The
-    description of this command is in $WORKAREA/include/halapi.h.
-
-Command
-    TBD
-
-Command Parameters
-    ATH_HAL_SETCABTO_CMDID
-        Sets the timeout waiting for the multicast
-        traffic after a DTIM beacon (in TUs).
-
-Command Values
-    None
-
-Reset Value
-    Default = 10 TUs
-
-Restrictions
-    This command should be executed before issuing a connect command.
-
-=====================================================================
-
-
-Name
-    SET_HOST_SLEEP_MODE
-
-Synopsis
-    The host uses this command to set the host mode to asleep or awake. All packets are
-    delivered to the host when the host mode is awake. When host mode is asleep, only if
-    WoW is enabled and the incoming packet matches one of the specified WoW
-    patterns, will the packet be delivered to the host. The host will also be woken up by
-    the target for pattern-matching packets and important events.
-
-Command
-    wmiconfig –sethostmode=<asleep/awake>
-
-Command Parameters
-    A_BOOL    awake    Set the host mode to awake
-    A_BOOL    asleep   Set the host mode to asleep
-
-Command Values
-    1 = awake, 0 = asleep
-
-Reset Value
-    None defined (default host mode is awake)
-
-Restrictions
-    None
-
-
-=====================================================================
-
-Name
-    SET_IBSS_PM_CAPS
-
-Synopsis
-    Used to support a non-standard power management scheme for an ad hoc wireless
-    network consisting of up to eight stations (STAs) that support this form of power
-    saving (e.g., Atheros-based STAs). A thorough understanding of IEEE 802.11 ad hoc
-    networks is required to use this command effectively.
-
-Command
-    wmiconfig eth1 --ibsspmcaps --ps=<enable/disable>
-        --aw=<ATIM Windows in ms>
-        --ttl=<Time to live in number of beacon periods>
-        --to=<timeout in ms>
-
-Command Parameters
-    UINT8    power_saving
-        = 0
-        The non-standard power saving scheme is
-        disabled and maximum throughput (with no
-        power saving) is obtained.
-
-        = 1
-        Ad hoc power saving scheme is enabled (but
-        throughput may be decreased)
-
-    UINT16    atim_windows
-        Specifies the length (in ms) of the ad hoc traffic
-        indication message (ATIM) windows used in an ad
-        hoc network. All Atheros-based STAs that join the
-        network use this duration ATIM window.
-
-    The duration is communicated between wireless
-    STAs through an IE in beacons and probe responses.
-
-    The host sets atim_windows to control trade-offs
-    between power use and throughput. The value
-    chosen should be based on the beacon interval (see
-    the “SET_BEACON_INT” command) on the
-    expected number of STAs in the IBSS, and on the
-    amount of traffic and traffic patterns between STAs.
-
-    UINT16    timeout_value
-        Specifies the timeout (in ms). The value is the same
-        for all ad hoc connections, but tracks separately for
-        each.
-
-        Applicable only for a beacon period and used to
-        derive actual timeout values on the Tx and Rx sides.
-        On the Tx side, the value defines a window during
-        which the STA accepts the frame(s) from the host for a
-        particular connection. Until closed, the window
-        restarts with every frame received from the host. On
-        the Rx side, indicates the time until which the STA
-        continues accepting frames from a particular
-        connection. The value resets with every frame
-        received. The value can be used to determine the
-        trade off between throughput and power.
-        Default = 10 ms
-
-    UINT8    ttl
-        Specifies the value in number of beacon periods. The
-        value is used to set a limit on the time until which a
-        frame is kept alive in the AR6001 before being
-        discarded. Default = 5
-
-Command Values
-    None
-
-Reset Values
-    By default, power_saving is enabled with atim_window = 20 ms
-
-Restrictions
-    Can only be issued before the AR6000 starts an ad hoc network
-
-See Also
-    “SET_BEACON_INT”
-
-=====================================================================
-
-
-
-Name
-    SET_LISTEN_INT
-
-Synopsis
-    The host uses this command to request a listen interval, which determines how often
-    the AR6000 device should wake up and listen for traffic. The listen interval can be set
-    by the TUs or by the number of beacons. The device may not be able to comply with
-    the request (e.g., if the beacon interval is greater than the requested listen interval, the
-    device sets the listen interval to the beacon interval). The actual listen interval used
-    by the device is available in the “CONNECT” event.
-
-Command
-    wmiconfig eth1 --listen=<#of TUs, can range from 15 to 3000>
-
-    --listenbeacons=<#of beacons, can range from 1 to 50>
-
-Command Parameters
-    UINT16    listenInterval
-        Specifies the listen interval in Kms
-        (1024 ms), ranging from 100 to 1000
-
-    UINT16    listenbeacons
-        Specifies the listen interval in beacons,
-        ranging from 1 to 50
-
-Command Values
-    None
-
-Reset Values
-    The device sets the listen interval equal to the beacon interval of the AP it associates
-    to.
-
-Restrictions
-    None
-
-=====================================================================
-
-
-Name
-    SET_LPREAMBLE
-
-Synopsis
-    Overrides the short preamble capability of the AR6000 device
-
-Command
-    TBD
-
-Command Parameters
-    WMI_LPREAMBLE_DISABLED
-        The device is short-preamble capable
-
-    WMI_LPREAMBLE_ENABLED
-        The device supports only the long-
-    preamble mode
-
-Command Values
-    None
-
-Reset Value
-    None defined
-
-Restrictions
-    None
-
-
-=====================================================================
-
-Name
-    SET_MAX_SP_LEN
-
-Synopsis
-    Set the maximum service period; indicates the number of packets the AR6001 can
-    receive from the AP when triggered
-
-Command
-    wmiconfig eth1 --setMaxSPLength <maxSPLen>
-
-Command Parameters
-    UINT8    maxSPLen
-        An APSD_SP_LEN_TYPE value
-
-Command Values
-    {
-        DELIVER_ALL_PKT  = 0x0
-        DELIVER_2_PKT    = 0x1
-        DELIVER_4_PKT    = 0x2
-        DELIVER_6_PKT    = 0x3
-    }APSD_SP_LEN_TYPE
-
-
-Reset Values
-    maxSPLen is DELIVER_ALL_PKT
-
-Restrictions
-    None
-
-=====================================================================
-
-
-Name
-    SET_OPT_MODE
-
-Synopsis
-    Special feature, sets the special mode on/off
-
-Command
-    wmiconfig eth1 --mode <mode>
-    Set the optional mode, where mode is special or off
-
-Command Parameters
-    enum {
-        SPECIAL_OFF
-        SPECIAL_ON
-    } OPT_MODE_TYPE;
-
-Command Values
-
-Reset Value
-    Mode = Off
-
-Restrictions
-    None
-
-=====================================================================
-
-
-Name
-    SET_PMKID
-
-Synopsis
-    The host uses this command to enable or disable a pairwise master key ID (PMKID)
-    in the AR6000 PMKID cache. The AR6000 clears its PMKID cache on receipt of a
-    DISCONNECT command from the host. Individual entries in the cache might be
-    deleted as the AR6000 detect new APs and decides to remove old ones.
-
-Command
-    wmiconfig eth1 --setbsspmkid --bssid=<aabbccddeeff>
-    --bsspmkid=<pmkid>
-
-Command Parameters
-    UINT8    bssid[6]
-        The MAC address of the AP that the
-        PMKID corresponds to (6 bytes in hex
-        format)
-
-    UINT8    enable
-        Either PMKID_DISABLE (0) to disable
-        the PMKID or PMKID_ENABLE (1) to
-        enable it (16 bytes in hex format)
-
-    UINT8    pmkid[16]
-        Meaningful only if enable is
-        PMKID_ENABLE, when it is the PMKID
-        that the AR6000 should use on the next
-        reassociation with the specified AP
-
-Command Values
-    enable
-    = 0 (disable), 1 (enable)
-    PKMID enabled/disabled
-
-Reset Values
-    None defined
-
-Restrictions
-    Only supported in infrastructure networks
-
-=====================================================================
-
-
-Name
-    SET_PMKID_LIST_CMD
-
-Synopsis
-    Configures the list of PMKIDs on the firmware.
-
-Command
-    wmiconfig --setpmkidlist --numpmkid=<n> --pmkid=<pmkid_1>
-    ... --pmkid=<pmkid_n>
-
-    Where n is the number of pmkids (maximum = 8) and pmkid_i is the ith pmkid (16
-    bytes in hex format)
-
-Command Parameters
-    {
-        A_UINT8 pmkid[WMI_PMKID_LEN];
-    } __ATTRIB_PACK WMI_PMKID;
-
-    {
-        A_UINT32 numPMKID;
-        WMI_PMKID pmkidList[WMI_MAX_PMKID_CACHE];
-    } __ATTRIB_PACK WMI_SET_PMKID_LIST_CMD;
-
-Command Values
-    None
-
-Reset Values
-    None
-
-Restrictions
-    Supported only in infrastructure modes
-
-=====================================================================
-
-
-Name
-    SET_POWER_MODE
-
-Synopsis
-    The host uses this command to provide the AR6000 device with guidelines on the
-    desired trade-off between power utilization and performance.
-
-        In normal power mode, the device enters a sleep state if they have nothing to do,
-        which conserves power but may cost performance as it can take up to 2 ms to
-        resume operation after leaving sleep state.
-
-        In maximum performance mode, the device never enters sleep state, thus no time
-        is spent waking up, resulting in higher power consumption and better
-        performance.
-
-Command
-    TBD
-
-Command Parameters
-    UINT8    powerMode
-        WMI_POWER_MODE value
-    {
-        REC_POWER   = 1
-            (Recommended setting) Tries to conserve
-            power without sacrificing performance
-        MAX_PERF_POWER    = 2
-            Setting that maximizes performance at
-            the expense of power
-
-            All other values are reserved
-    } WMI_POWER_MODE
-
-Command Values
-    See command parameters
-
-Reset Values
-    powerMode is REC_POWER
-
-Restrictions
-    This command should only be issued in the DISCONNECTED state for the
-    infrastructure network.
-
-            For a PM-disabled ad hoc network, the power mode should remain in
-            MAX_PERF_POWER.
-
-            For a PM-enabled ad hoc network, the device can have REC_POWER or
-            MAX_PERF_POWER set, but either way it must follow the power save ad hoc
-            protocol. The host can change power modes in the CONNECTED state.
-
-    Host changes to the PS setting when the STA is off the home channel take no effect
-    and cause a TARGET_PM_FAIL event.
-
-=====================================================================
-
-
-Name
-    SET_POWER_PARAMS
-
-Synopsis
-    The host uses this command to configure power parameters
-
-Command
-    wmiconfig eth1 --pmparams --it=<ms> --np=<number of PS POLL>
-    --dp=<DTIM policy: ignore/normal/stick>
-
-Command Parameters
-    UINT16    idle_period
-        Length of time (in ms) the AR6000 device
-        remains awake after frame Rx/Tx before going
-        to SLEEP state
-
-    UINT16    pspoll_number
-            The number of PowerSavePoll (PS-poll)
-            messages the device should send before
-            notifying the AP it is awake
-
-    UINT16    dtim_policy
-            A WMI_POWER_PARAMS_CMD value
-
-    {
-        IGNORE_DTIM    =1
-            The device does not listen to any content after
-            beacon (CAB) traffic
-        NORMAL_DTIM    = 2
-            DTIM period follows the listen interval (e.g., if
-            the listen interval is 4 and the DTIM period is 2,
-            the device wakes up every fourth beacon)
-        STICK_DTIM    = 3
-            Device attempt to receive all CAB traffic (e.g., if
-            the DTIM period is 2 and the listen interval is 4,
-            the device wakes up every second beacon)
-    } WMI_POWER_PARAMS_CMD
-
-Command Parameters
-    See command parameters
-
-Reset Values
-    idle_period
-        200 ms
-
-    pspoll_number
-    = 1
-
-    dtim_policy
-    = NORMAL_DTIM
-
-Restrictions
-    None
-
-=====================================================================
-
-
-Name
-    SET_POWERSAVE_PARAMS
-
-Synopsis
-    Set the two AR6000 power save timers (PS-POLL timer and APSD trigger timer) and
-    the two ASPD TIM policies
-
-Command
-    wmiconfig eth1--psparams --psPollTimer=<psPollTimeout in ms>
-    --triggerTimer=<triggerTimeout in ms> --apsdTimPolicy=<ignore/
-    adhere> --simulatedAPSDTimPolicy=<ignore/adhere>
-
-Command Parameters
-    typedef struct {
-        A_UINT16    psPollTimeout;
-            Timeout (in ms) after sending PS-POLL; the
-            AR6000 device sleeps if it does not receive a
-            data packet from the AP
-
-        A_UINT16    triggerTimeout;
-            Timeout (in ms) after sending a trigger; the
-            device sleeps if it does not receive any data
-            or null frame from the AP
-
-        APSD_TIM_POLICY    apsdTimPolicy;
-            TIM behavior with queue APSD enabled
-
-        APSD_TIM_POLICY    simulatedAPSD
-
-        TimPolicy;
-            TIM behavior with simulated APSD
-            enabled
-
-    typedef enum {
-        IGNORE_TIM_ALL_QUEUES_APSD = 0,
-        PROCESS_TIM_ALL_QUEUES_APSD = 1,
-        IGNORE_TIM_SIMULATED_APSD = 2,
-        POWERSAVE_TIMERS_POLICY = 3,
-    } APSD_TIM_POLICY;
-
-Command Values
-    None
-
-Reset Values
-    psPollTimeout is 50 ms; triggerTimeout is 10 ms;
-    apsdTimPolicy = IGNORE_TIM_ALL_QUEUES_APSD;
-    simulatedAPSDTimPolicy = POWERSAVE_TIMERS_POLICY
-
-Restrictions
-    When this command is used, all parameters must be set; this command does not
-    allow setting only one parameter.
-
-=====================================================================
-
-
-Name
-    SET_PROBED_SSID
-
-Synopsis
-    The host uses this command to provide a list of up to MAX_PROBED_SSID_INDEX
-    (six) SSIDs that the AR6000 device should actively look for. It lists the active SSID
-    table. By default, the device actively looks for only the SSID specified in the
-    “CONNECT_CMD” command, and only when the regulatory domain allows active
-    probing. With this command, specified SSIDs are probed for, even if they are hidden.
-
-Command
-    wmiconfig eth1 --ssid=<ssid> [--num=<index>]
-
-Command Parameters
-    {
-        A_UINT8    numSsids
-            A number from 0 to
-            MAX_PROBED_SSID_INDEX indicating
-            the active SSID table entry index for this
-            command (if the specified entry index
-            already has an SSID, the SSID specified in
-            this command replaces it)
-
-        WMI_PROBED_SSID_INFO    probedSSID[1]
-    } WMI_PROBED_SSID_CMD
-
-    {
-        A_UINT8    flag
-            WMI_SSID_FLAG indicates the current
-            entry in the active SSID table
-        A_UINT8    ssidLength
-            Length of the specified SSID in bytes.
-            If = 0, the entry corresponding to the
-            index is erased
-        A_UINT8    ssid[32]
-            SSID string actively probed for when
-            permitted by the regulatory domain
-    } WMI_PROBED_SSID_INFO
-
-Command Values
-    WMI_SSID_FLAG
-    {
-         DISABLE_SSID_FLAG    = 0
-            Disables entry
-        SPECIFIC_SSID_FLAG    = 1
-            Probes specified SSID
-        ANY_SSID_FLAG    = 2
-            Probes for any SSID
-    } WMI_SSID_FLAG
-
-Reset Value
-    The entries are unused.
-
-Restrictions
-    None
-
-=====================================================================
-
-
-Name
-    SET_REASSOC_MODE
-
-Synopsis
-    Specify whether the disassociated frame should be sent or not upon reassociation.
-
-Command
-    wmiconfig eth1 --setreassocmode <mode>
-
-Command Parameters
-    UINT8    mode
-
-Command Values
-    mode
-        = 0x00
-        Send disassoc to a previously connected AP
-        upon reassociation
-        = 0x01
-        Do not send disassoc to previously connected
-        AP upon reassociation
-
-Reset Values
-    None defined
-
-Restrictions
-    None
-
-
-=====================================================================
-
-Name
-    SET_RETRY_LIMITS
-
-Synopsis
-    Allows the host to influence the number of times that the AR6000 device should
-    attempt to send a frame before they give up.
-
-Command
-    wmiconfig --setretrylimits <frameType> <trafficClass> <maxRetries>
-    <enableNotify>
-
-Command Parameters
-    {
-        UINT8    frameType
-            A WMI_FRAMETYPE specifying
-            which type of frame is of interest.
-        UINT8    trafficClass
-            Specifies a traffic class (see
-            “CREATE_PSTREAM”). This
-            parameter is only significant when
-            frameType = DATA_FRAMETYPE.
-        UINT8    maxRetries
-            Maximum number of times the
-            device attempts to retry a frame Tx,
-            ranging from WMI_MIN_RETRIES
-            (2) to WMI_MAX_RETRIES (15). If
-            the special value 0 is used,
-            maxRetries is set to 15.
-        A_UINT8    enableNotify
-            Notify when enabled
-    } WMI_RETRY_LIMIT_INFO
-
-    {
-        A_UINT8    numEntries
-        WMI_RETRY_LIMIT_INFO  retryLimitInfo[1]
-    } WMI_SET_RETRY_LIMITS_CMD
-
-Command Values
-    {
-        MGMT_FRAMETYPE    = 0    Management frame
-        CONTROL_FRAMETYPE = 1    Control frame
-        DATA_FRAMETYPE    = 2    Data frame
-    } WMI_FRAMETYPE
-
-Reset Values
-    Retries are set to 15
-
-Restrictions
-    None
-
-=====================================================================
-
-
-Name
-    SET_ROAM_CTRL
-
-Synopsis
-    Affects how the AR6000 device selects a BSS. The host uses this command to set and
-    enable low RSSI scan parameters. The time period of low RSSI background scan is
-    mentioned in scan period. Low RSSI scan is triggered when the current RSSI
-    threshold (75% of current RSSI) is equal to or less than scan threshold.
-
-    Low RSSI roam is triggered when the current RSSI threshold falls below the roam
-    threshold and roams to a better AP by the end of the scan cycle. During Low RSSI
-    roam, if the STA finds a new AP with an RSSI greater than roam RSSI to floor, during
-    scan, it roams immediately to it instead of waiting for the end of the scan cycle. See
-    also “Scan and Roam” on page C-1.
-
-Command
-    wmiconfig --roam <roamctrl> <info>, where info is <scan period>
-    <scan threshold> <roam threshold> <roam rssi floor>
-
-Command Parameters
-    A_UINT8    roamCtrlType;
-
-Command Values
-    WMI_FORCE_ROAM     = 1
-    Roam to the specified BSSID
-
-    WMI_SET_ROAM_MODE  = 2
-    Default, progd bias, no roam
-
-    WMI_SET_HOST_BIAS  = 3
-    Set the host bias
-
-    WMI_SET_LOWRSSI_SCAN_PARAMS  = 4
-    Info parameters
-
-    A_UINT8    bssid[ATH_MAC_LEN];
-    WMI_FORCE_ROAM
-
-    A_UINT8    roamMode;
-    WMI_SET_ROAM_MODE
-
-    A_UINT8    bssBiasInfo;
-    WMI_SET_HOST_BIAS
-
-    A_UINT16    lowrssi_scan_period;
-    WMI_SET_LOWRSSI_SCAN_PARAMS
-
-    A_INT16
-    lowrssi_scan_threshold;
-    WMI_SET_LOWRSSI_SCAN_PARAMS
-
-    A_INT16    lowrssi_roam_threshold;
-    WMI_SET_LOWRSSI_SCAN_PARAMS
-
-    A_UINT8    roam_rssi_floor;
-    WMI_SET_LOWRSSI_SCAN_PARAMS
-
-Reset Value
-    None defined (default lowrssi scan is disabled. Enabled only when scan period is set.)
-
-Restrictions
-    None
-
-=====================================================================
-
-
-Name
-    SET_RTS
-
-Synopsis
-    Decides when RTS should be sent.
-
-Command
-    wmiconfig eth1 --setRTS <pkt length threshold>
-
-Command Parameters
-    A_UINT16
-    threshold;
-    Command parameter threshold in bytes. An RTS is
-    sent if the data length is more than this threshold.
-    The default is to NOT send RTS.
-
-Command Values
-    None
-
-Reset Value
-    Not to send RTS.
-
-Restrictions
-    None
-
-
-=====================================================================
-
-Name
-    SET_SCAN_PARAMS
-
-Synopsis
-    The host uses this command to set the AR6000 scan parameters, including the duty
-    cycle for both foreground and background scanning. Foreground scanning takes
-    place when the AR6000 device is not connected, and discovers all available wireless
-    networks to find the best BSS to join. Background scanning takes place when the
-    device is already connected to a network and scans for potential roaming candidates
-    and maintains them in order of best to worst. A second priority of background
-    scanning is to find new wireless networks.
-
-    The device initiates a scan when necessary. For example, a foreground scan is always
-    started on receipt of a “CONNECT_CMD” command or when the device cannot find
-    a BSS to connect to. Foreground scanning is disabled by default until receipt of a
-    CONNECT command. Background scanning is enabled by default and occurs every
-    60 seconds after the device is connected.
-
-    The device implements a binary backoff interval for foreground scanning when it
-    enters the DISCONNECTED state after losing connectivity with an AP or when a
-    CONNECT command is received. The first interval is ForegroundScanStartPeriod,
-    which doubles after each scan until the interval reaches ForegroundScanEndPeriod.
-    If the host terminates a connection with DISCONNECT, the foreground scan period
-    is ForegroundScanEndPeriod. All scan intervals are measured from the time a full
-    scan ends to the time the next full scan starts. The host starts a scan by issuing a
-    “START_SCAN” command. See also “Scan and Roam” on page C-1.
-
-Command
-    wmiconfig eth1 --scan --fgstart=<sec> --fgend=<sec> --bg=<sec> --
-    act=<msec> --pas=<msec> --sr=<short scan ratio> --scanctrlflags
-    <connScan> <scanConnected> <activeScan> <reportBSSINFO>
-
-Command Parameters
-    UINT16    fgStartPeriod
-        First interval used by the device when it
-        disconnects from an AP or receives a
-        CONNECT command, specified in seconds (0–
-        65535). If = 0, the device uses the reset value.
-        If = 65535, the device disables foreground
-        scanning.
-
-    UINT16    fgEndPeriod
-        The maximum interval the device waits between
-        foreground scans specified in seconds (from
-        ForegroundScanStartPeriod to 65535). If = 0, the
-        device uses the reset value.
-
-    UINT16    bgScanPeriod
-        The period of background scan specified in
-        seconds (0–65535). By default, it is set to the reset
-        value of 60 seconds. If 0 or 65535 is specified, the
-        device disables background scanning.
-
-    UINT16    maxactChDwellTime
-        The period of time the device stays on a
-        particular channel while active scanning. It is
-        specified in ms (10–65535). If the special value of
-        0 is specified, the device uses the reset value.
-
-    UINT16    PasChDwellTime
-        The period of time the device remains on a
-        particular channel while passive scanning. It is
-        specified in ms (10–65535). If the special value of
-        0 is specified, the device uses the reset value.
-
-    UINT8    shortScanRatio
-        Number of short scans to perform for each
-        long scan.
-
-    UINT8    scanCtrlFlasgs
-
-    UINT16    minactChDwellTime
-        Specified in ms
-
-    UINT32    maxDFSchActTime
-        The maximum time a DFS channel can stay
-        active before being marked passive, specified in
-        ms.
-
-Command Values
-    None
-
-Reset Values
-    ForegroundScanStart
-Period
-        1 sec
-
-    ForegroundScanEndPeriod
-        60 sec
-
-    BackgroundScanPeriod
-        60 sec
-
-    ActiveChannelDwellTime
-        105 ms
-
-=====================================================================
-
-
-Name
-    SET_TKIP_COUNTERMEASURES
-
-Synopsis
-    The host issues this command to tell the target whether to enable or disable TKIP
-    countermeasures.
-
-Command
-    TBD
-
-Command Parameters
-    UINT8    WMI_TKIP_CM_ENABLE
-        Enables the countermeasures
-
-
-    UINT8    TKIP_CM_DISABLE
-        Disables the countermeasures
-
-Command Values
-    None
-
-Reset Values
-    By default, TKIP MIC reporting is disabled
-
-Restrictions
-    None
-
-=====================================================================
-
-
-Name
-    SET_TX_PWR
-
-Synopsis
-    The host uses this command to specify the Tx power level of the AR6000. Cannot be
-    used to exceed the power limit permitted by the regulatory domain. The maximum
-    output power is limited in the chip to 31.5 dBm; the range is 0 – 31.5 dbm.
-
-Command
-    wmiconfig --power <dbM>
-
-Command Parameters
-    UINT8    dbM
-        The desired Tx power specified in dbM.
-        If = 0, the device chooses the maximum
-        permitted by the regulatory domain.
-
-Command Values
-    None
-
-Reset Values
-    The maximum permitted by the regulatory domain
-
-Restrictions
-    None
-
-See Also
-    “GET_TX_PWR”
-
-
-=====================================================================
-
-Name
-    SET_VOICE_PKT_SIZE
-
-Synopsis
-    If an AP does not support WMM, it has no way to differentiate voice from data.
-    Because the voice packet is typically small, packet in size less than voicePktSize are
-    assumed to be voice, otherwise it is treated as data.
-
-Command
-    wmiconfig eth1 --setVoicePktSize <size-in-bytes>
-
-Command Parameters
-    UINT16    voicePktSize
-        Packet size in octets
-
-Command Values
-    None
-
-Reset Values
-    voicePktSize default is 400 bytes
-
-Restrictions
-    No effect if WMM is unavailable
-
-
-=====================================================================
-
-Name
-    SET_WMM
-
-Synopsis
-    Overrides the AR6000 device WMM capability
-
-Command
-    wmiconfig eth1 --setwmm <enable>
-
-Command Parameters
-    WMI_WMM_ENABLED
-        Enables WMM
-
-    WMI_WMM_DISABLED
-        Disables WMM support
-
-Command Values
-    0 = disabled
-    1 = enabled
-
-Reset Value
-    WMM Disabled
-
-Restrictions
-    None
-
-
-=====================================================================
-
-Name
-    SET_WMM_TXOP
-
-Synopsis
-    Configures TxOP Bursting when sending traffic to a WMM capable AP
-
-Command
-    wmiconfig eth1 --txopbursting <burstEnable>
-
-    <burstEnable>
-        = 0
-    Disallow TxOp bursting
-
-        = 1
-    Allow TxOp bursting
-
-Command Parameters
-    txopEnable
-        = WMI_TXOP_DISABLED
-        Disabled
-
-        = WMI_TXOP_ENABLED
-        Enabled
-
-Command Values
-    txopEnable
-        = 0    Disabled
-
-        = 1    Enabled
-
-Reset Value
-    Bursting is off by default
-
-Restrictions
-    None
-
-=====================================================================
-
-
-Name
-    SET_WOW_MODE
-
-Synopsis
-    The host uses this command to enable or disable the WoW mode. When WoW mode
-    is enabled and the host is asleep, pattern matching takes place at the target level.
-    Only packets that match any of the pre-specified WoW filter patterns, will be passed
-    up to the host. The host will also be woken up by the target. Packets which do not
-    match any of the WoW patterns are discarded.
-
-Command
-    wmiconfig –setwowmode <enable/disable>
-
-Command Parameters
-    A_BOOL    enable_wow
-        Enable or disable WoW:
-
-Command Values
-        = 0
-    Disable WoW
-
-        = 1
-    Enable WoW
-
-Reset Value
-    None defined (default WoW mode is disabled).
-
-Restrictions
-    None
-
-See Also
-    “GET_WOW_LIST”
-
-
-=====================================================================
-
-Name
-    SET_WSC_STATUS
-
-Synopsis
-    The supplicant uses this command to inform the target about the status of the WSC
-    registration protocol. During the WSC registration protocol, a flag is set so the target
-    bypasses some of the checks in the CSERV module. At the end of the registration, this
-    flag is reset.
-
-Command
-    N/A
-
-Command Parameters
-    A_BOOL status
-        = 1    WSC registration in progress
-        = 0    WSC protocol not running
-
-Reply Parameters
-    None
-
-Reset Value
-    None defined (default = 0)
-
-Restrictions
-    None
-
-
-=====================================================================
-
-Name
-    SNR_THRESHOLD_PARAMS
-
-Synopsis
-    Configures how the AR6000 device monitors and reports SNR of the connected BSS,
-    used as a link quality metric.
-
-Command
-    --snrThreshold <weight> <upper_threshold_1> ...
-    <upper_threshold_4> <lower_threshold_1> ... <lower_threshold_4>
-    <pollTimer>
-
-Command Parameters
-    <weight>
-        Share with rssiThreshold. Range in [1, 16], used
-        in the formula to calculate average RSSI
-
-    <upper_threshold_x>
-        Above thresholds expressed in db, in ascending
-        order
-
-    <lower_threshold_x>
-        Below thresholds expressed in db, in ascending
-        order
-
-    <pollTimer>
-        The signal strength sampling frequency in
-        seconds. If polltime = 0, signal strength
-        sampling is disabled
-
-Command Values
-    None
-
-Reset Value
-    None defined
-
-Restrictions
-    None
-
-=====================================================================
-
-
-Name
-    START_SCAN
-
-Synopsis
-    The host uses this command to start a long or short channel scan. All future scans are
-    relative to the time the AR6000 device processes this command. The device performs
-    a channel scan on receipt of this command, even if a scan was already in progress.
-    The host uses this command when it wishes to refresh its cached database of wireless
-    networks. The isLegacy field will be removed (0 for now) because it is achieved by
-    setting CONNECT_PROFILE_MATCH_DONE in the CONNECT command. See also
-    “Scan and Roam”
-
-Command
-    wmiconfig eth1 --startscan <scan type> <forcefgscan> 0
-    <homeDwellTime> <forceScanInterval>
-
-Command Parameters
-    UINT8    scanType
-        WMI_SCAN_TYPE
-
-Command Values
-    {
-        WMI_LONG_SCAN    =0x0
-            Requests a full scan
-        WMI_SHORT_SCAN   =0x1
-            Requests a short scan
-    } WMI_SCAN_TYPE
-
-    A_BOOL    forceFgScan
-        forceFgScan
-        = 0
-        Disable the foreground scan
-
-        forceFgScan
-        = 1
-        Forces a foreground scan
-
-    A_UINT32    homeDwellTime
-        Maximum duration in the home
-        channel (in ms)
-
-    A_UINT32     forceScanInterval
-        Time interval between scans (in ms)
-
-    A_UINT32     scanType
-        WMI_SCAN_TYPE
-
-Reset Value
-    Disable forcing foreground scan
-
-Restrictions
-    isLegacy field will no longer be supported (pass as 0 for now)
-
-
-=====================================================================
-
-Name
-    SYNCHRONIZE
-
-Synopsis
-    The host uses this command to force a synchronization point between the command
-    and data paths
-
-Command
-    TBD
-
-Command Parameters
-    None
-
-
-
-Command Values
-    None
-
-
-
-Reset Values
-    None
-
-
-
-Restrictions
-    None
-
-
-=====================================================================
-
-Name
-    TARGET_ERROR_REPORT_BITMASK
-
-Synopsis
-    Allows the host to control “ERROR_REPORT” events from the AR6000 device.
-
-        If error reporting is disabled for an error type, a count of errors of that type is
-        maintained by the device.
-
-        If error reporting is enabled for an error type, an “ERROR_REPORT” event is
-        sent when an error occurs and the error report bit is cleared.
-
-    Error counts for each error type are available through the “GET_TARGET_STATS”
-    command.
-
-Command
-    wmiconfig eth1 --setErrorReportingBitmask
-
-Command Parameters
-    UINT32    bitmask
-        Represents the set of
-        WMI_TARGET_ERROR_VAL error types
-        enabled for reporting
-
-Command Values
-    {
-        WMI_TARGET_PM_ERR_FAIL    = 0x00000001
-            Power save fails (only two cases):
-               Retry out of null function/QoS null
-               function to associated AP for PS
-               indication'
-               Host changes the PS setting when
-               STA is off home channel
-
-        WMI_TARGET_KEY_NOT_FOUND    = 0x00000002
-            No cipher key
-        WMI_TARGET_DECRYPTION_ERR   = 0x00000004
-            Decryption error
-        WMI_TARGET_BMISS            = 0x00000008
-            Beacon miss
-        WMI_PSDISABLE_NODE_JOIN     = 0x00000010
-            A non-PS-enabled STA joined the
-            PS-enabled network
-        WMI_TARGET_COM_ERR          = 0x00000020
-            Host/target communication error
-        WMI_TARGET_FATAL_ERR        = 0x00000040
-            Fatal error
-    } WMI_TARGET_ERROR_VAL
-
-Reset Values
-    Bitmask is 0, and all error reporting is disabled
-
-Restrictions
-    None
-
-
-=====================================================================
-WMI Events
-
-Event
-    Description
-    Page
-
-
-BSSINFO
-    Contains information describing BSSs collected during a scan
-
-CAC_EVENTID
-    Indicates signalling events in admission control
-
-CMDERROR
-    The AR6000 device encounters an error while attempting to process
-    a command
-
-CONNECT
-    The device has connected to a wireless network
-
-DISCONNECT
-    The device lost connectivity with a wireless network
-
-ERROR_REPORT
-    An error has occurred for which the host previously requested
-    notification with the command
-    “TARGET_ERROR_REPORT_BITMASK”
-
-EXTENSION
-    WMI extension event
-
-GET_PMKID_LIST_EVENT
-    Created in response to a “GET_PMKID_LIST_CMD” command
-
-GET_WOW_LIST_EVENT
-    Response to the wmiconfig “GET_WOW_LIST” command to
-    retrieve the configured WoW patterns
-
-NEIGHBOR_REPORT
-    Neighbor APs that match the current profile were detected
-
-OPT_RX_FRAME_EVENT
-    (Special feature) informs the host of the reception of a special frame
-
-PSTREAM_TIMEOUT
-    A prioritized stream has been idle for a specified interval
-
-READY
-    The AR6000 device is ready to accept commands
-
-REGDOMAIN
-    The regulatory domain has changed
-
-REPORT_ROAM_DATA_EVENT
-    Reports the roam time calculations made by the device
-    (generated with a special build)
-    —
-
-REPORT_STATISTICS
-    Reply to a “GET_TARGET_STATS” command
-
-ROAM_TBL_EVENT
-    Reports the roam table
-
-RSSI_THRESHOLD
-    Signal strength from the connected AP has crossed the threshold
-    defined in the “RSSI_THRESHOLD_PARAMS” command
-
-SCAN_COMPLETE_EVENT
-    A scan has completed (added status SCAN_ABORTED in release 2.0)
-
-TEST_EVENT
-    Event generated by the TCMD
-
-TKIP_MICERROR
-    TKIP MIC errors were detected
-
-=====================================================================
-
-Name
-    BSSINFO
-
-Synopsis
-    Contains information describing one or more BSSs as collected during a scan.
-    Information includes the BSSID, SSID, RSSI, network type, channel, supported rates,
-    and IEs. BSSINFO events are sent only after the device receives a beacon or probe-
-    response frame that pass the filter specified in the “SET_BSS_FILTER” command.
-    BSSINFO events consist of a small header followed by a copy of the beacon or probe
-    response frame. The 802.11 header is not present. For formats of beacon and probe-
-    response frames please consult the IEEE 802.11 specification.
-
-    The beacons or probe responses containing the IE specified by the
-    WMI_BSS_FILTER_CMD are passed to the host through the
-    WMI_BSSINFO_EVENT. The event carries a 32-bit bitmask that indicates the IEs that
-    were detected in the management frame. The frame type field has been extended to
-    indicate action management frames. This would be helpful to route these frames
-    through the same event mechanism as used by the beacon processing function.
-
-    If the bssFilter in the SET_BSS_FILTER matches, then the ieMask is not relevant
-    because the BSSINFO event is sent to the host. If the bssFilter doesnot match in the
-    beacons/probe respones, then the ieMask match dictates whether the BSSINFO
-    event is sent to the host. In the case of action management frames, the ieMask is the
-    filter that is applied.
-
-Event ID
-    0x1004
-
-Event Parameters
-    typedef struct {
-        A_UINT16    channel;
-            Specifies the frequency (in MHz) where the
-            frame was received
-        A_UINT8    frameType;
-            A WMI_BI_FTYPE value
-        A_UINT8    snr;
-        A_INT16    rssi;
-            Indicates signal strength
-        A_UINT8    bssid[ATH_MAC_LEN];
-        A_UINT32    ieMask;
-    } _ATTRIB_PACK_WMI_BSS_INFO_HDR;
-
-    Beacon or Probe Response Frame
-
-Event Values
-    {
-        BEACON_FTYPE    = 0x1
-            Indicates a beacon frame
-        PROBERESP_FTYPE
-            Indicates a probe response frame
-        ACTION_MGMT_FTYPE
-     } WMI_BI_FTYPE
-
-=====================================================================
-
-Name
-    CAC_EVENTID
-
-Synopsis
-    Indicates signalling events in admission control. Events are generated when
-    admission is accepted, rejected, or deleted by either the host or the AP. If the AP does
-    not respond to an admission request within a timeout of 500 ms, an event is
-    generated to the host.
-
-Event ID
-    0x1011
-
-Event Parameters
-    UINT8
-    ac
-    Access class pertaining to the
-signalling
-
-    UINT8    cac_indication
-        Type of indication; indications are
-        listed in WMI_CAC_INDICATION
-
-    UINT8    statusCode
-        AP response status code for a
-        request
-
-    UINT8    tspecSuggestion[63]
-        Suggested TSPEC from AP
-
-Event Values
-    {
-        CAC_INDICATION_ADMISSION = 0x00
-        CAC_INDICATION_ADMISSION_RESP    = 0x01
-        CAC_INDICATION_DELETE    = 0x02
-        CAC_INDICATION_NO_RESP   = 0x03
-    } WMI_CAC_INDICATION
-
-
-=====================================================================
-
-
-Name
-    CMDERROR
-
-Synopsis
-    Indicates that the AR6000 device encountered an error while attempting to process a
-    command. This error is fatal and indicates that the device requires a reset.
-
-Event ID
-    0x1005
-
-Event Parameters
-    UINT16    commandId
-        Corresponds to the command which generated
-        the error
-    UINT8    errorCode
-        A WMI_ERROR_CODE value
-
-Event Values
-    {
-        INVALID_PARAM    = 1
-            Invalid parameter
-        ILLEGAL_STATE    = 2
-            Illegal state
-        INTERNAL_ERROR   = 3
-            Internal Error
-        All other values reserved
-    } WMI_ERROR_CODE
-
-
-=====================================================================
-
-
-Name
-    CONNECT
-
-Synopsis
-    Signals that the AR6000 connected to a wireless network. Connection occurs due to a
-    “CONNECT” command or roaming to a new AP. For infrastructure networks, shows
-    that the AR6000 successfully performed 802.11 authentication and AP association.
-
-Event ID
-    0x1002
-
-Event Parameters
-    UINT16    channel
-        Channel frequency (in MHz) of the network the
-        AR6000 are connected to
-
-    UINT8    bssid[6]
-        MAC address of the AP the AR6000 are
-        connected to or the BSSID of the ad hoc
-        network
-
-    UINT16    listenInterval
-        Listen interval (in Kms) that the AR6000 are
-        using
-
-    UINT 8    beaconIeLen
-        Length (in bytes) of the beacon IEs
-
-    UINT8    assocInfo
-        Pointer to an array containing beacon IEs,
-        followed first by association request IEs then by
-        association response IEs
-
-    UINT8    assocReqLen
-        Length (in bytes) of the assocReqIEs array
-
-    UINT8    assocRespLen
-        Length (in bytes) of the assocRespIEs array
-
-Event Values
-    None defined
-
-=====================================================================
-
-
-Name
-    DISCONNECT
-
-Synopsis
-    Signals that the AR6000 device lost connectivity with the wireless network.
-    DISCONENCT is generated when the device fails to complete a “CONNECT”
-    command or as a result of a transition from a connected state to disconnected state.
-
-    After sending the “DISCONNECT” event the device continually tries to re-establish
-    a connection. A LOST_LINK occurs when STA cannot receive beacons within the
-    specified time for the SET_BMISS_TIME command.
-
-Event ID
-    0x1003
-
-Event Parameters
-    UINT8    disconnect
-        Reason
-        A WMI_DISCONNECT_REASON value
-
-    UINT8    bssid[6]
-        Indicates which BSS the device was connected to
-
-    UINT8    assocRespLen
-        Length of the 802.11 association response frame
-        that triggered this event, or 0 if not applicable
-
-    UINT8    assocInfo[assocRespLen]
-        Copy of the 802.11 association response frame
-
-Event Values
-    {
-        NO_NETWORK_AVAIL    =0x01
-            Indicates that the device was unable to
-            establish or find the desired network
-        LOST_LINK    =0x02
-            Indicates the devices is no longer receiving
-            beacons from the BSS it was previously
-            connected to
-
-        DISCONNECT_CMD  =0x03
-            Indicates a “DISCONNECT” command was
-            processed
-        BSS_DISCONNECTED =0x04
-            Indicates the BSS explicitly disconnected the
-            device. Possible mechanisms include the AP
-            sending 802.11 management frames
-            (e.g., disassociate or deauthentication
-            messages).
-        AUTH_FAILED    =0x05
-            Indicates that the device failed 802.11
-            authentication with the BSS
-        ASSOC_FAILED    =0x06
-            Indicates that the device failed 802.11
-            association with the BSS
-        NO_RESOURCES_AVAIL    =0x07
-            Indicates that a connection failed because the
-            AP had insufficient resources to complete the
-            connection
-        CSERV_DISCONNECT    =0x08
-            Indicates that the device’s connection services
-            module decided to disconnect from a BSS,
-            which can happen for a variety of reasons (e.g.,
-            the host marks the current connected AP as a
-            bad AP).
-        INVALID_PROFILE    =0x0A
-            Indicates that an attempt was made to
-            reconnect to a BSS that no longer matches the
-            current profile
-        All other values are reserved
-    } WMI_DISCONNECT_REASON
-
-
-=====================================================================
-
-
-Name
-    ERROR_REPORT
-
-Synopsis
-    Signals that a type of error has occurred for which the host previously requested
-    notification through the “TARGET_ERROR_REPORT_BITMASK” command.
-
-Event ID
-    0x100D
-
-Event Parameters
-    UINT32    errorVal
-            WMI_TARGET_ERROR_VAL value. See
-            “TARGET_ERROR_REPORT_BITMASK”.
-
-Event Values
-    errorVal
-    = 0x00000001
-    Power save fails
-
-        = 0x00000002
-    No cipher key
-
-        = 0x00000004
-    Decryption error
-
-        = 0x00000008
-    Beacon miss
-
-        = 0x00000010
-    A non-power save disabled node has joined
-    the PS-enabled network
-
-
-=====================================================================
-
-
-Name
-    EXTENSION
-
-Synopsis
-    The WMI is used mostly for wireless control messages to a wireless module that
-    apply to wireless module management regardless of the target platform
-    implementation. However, some events peripherally related to wireless management
-    are desired during operation. These wireless extension events may be platform-
-    specific or implementation-dependent. See “WMI Extension Commands”
-
-
-Event ID
-    0x1010
-
-
-=====================================================================
-
-
-Name
-    GET_PMKID_LIST_EVENT
-
-Synopsis
-    Generated by firmware in response to a “GET_PMKID_LIST_CMD” command.
-
-Event Parameters
-    typedef struct {
-        A_UINT32    numPMKID;
-            Contains the number of PMKIDs in the reply
-        WMI_PMKID   pmkidList[1];
-    } __ATTRIB_PACK WMI_PMKID_LIST_REPLY;
-
-Event Values
-    None
-
-
-=====================================================================
-
-
-Name
-    GET_WOW_LIST_EVENT
-
-Synopsis
-    Response to the wmiconfig –getwowlist command to retrieve the configured Wake on
-    Wireless patterns
-
-Event ID
-    0x10018
-
-Event Parameters
-    {
-
-    A_UINT8    num_filters
-        Total number of patterns in the list
-    A_UINT8    this_filter_num
-        The filter number
-    A_UINT8    wow_mode
-        Shows whether WoW is enabled or disabled
-    A_UINT8    host_mode
-        Shows whether the host is asleep or awake
-    WOW_FILTER    wow_filters[1]
-        List of WoW filters (pattern and mask data bytes)
-    } WMI_GET_WOW_LIST_REPLY;
-
-    {
-        Each wow_filter_list element shows:
-    A_UINT8    wow_valid_filter
-        Whether the filter is valid
-    A_UINT8    wow_filter_list_id
-        Filter List ID (23 = default)
-    A_UINT8    wow_filter_size
-        Size in bytes of the filter
-    A_UINT8    wow_filter_offset
-        Offset of the pattern to search in the data packet
-    A_UINT8    wow_filter_mask[MASK_SIZE]
-        The mask to be applied to the pattern
-    A_UINT8    wow_filter_pattern[WOW_PATTERN_SIZE]
-        The pattern that to match to wake up the host
-    } WOW_FILTER
-
-Event Values
-    None
-
-=====================================================================
-
-
-
-Name
-    NEIGHBOR_REPORT
-
-Synopsis
-    Indicates the existence of neighbor APs that match the current profile. The host uses
-    this event to populate the PMKID cache on the AR6000 and/or to perform
-    preauthentication. This event is only generated in infrastructure mode.
-
-    A total of numberOfAps pairs of bssid/bssFlags exist, one pair for each AP.
-
-Event ID
-    0x1008
-
-Event Parameters
-    UINT8    numberOfAps
-        The number of APs reported about in
-        this event
-    {
-        UINT8    bssid[6]
-            MAC address of a neighbor AP
-        UINT8    bssFlags
-            A WMI_BSS_FLAGS value
-    }[numberOfAps]
-
-
-Event Values
-    {
-        WMI_DEFAULT_BSS_FLAGS    = 0
-            Logical OR of 1 or more
-        WMI_BSS_FLAGS
-        WMI_PREAUTH_CAPABLE_BSS
-            = 1
-            Indicates that this AP is capable of
-            preauthentication
-        WMI_PMKID_VALID_BSS
-            = 2
-            Indicates that the AR6000 have a
-            valid pairwise master key for this AP
-    } WMI_BSS_FLAGS
-
-
-=====================================================================
-
-
-
-Name
-    OPT_RX_FRAME_EVENT
-
-Synopsis
-    Special feature, informs host of the reception of a special frame.
-
-Event ID
-    0x100E
-
-Event Parameters
-    {
-        A_UINT16    channel;
-        A_UINT8    frameType;
-        A_INT8    snr;
-        A_UINT8    srcAddr[ATH_MAC_LEN];
-        A_UINT8    bssid[ATH_MAC_LEN];
-        }WMI_OPT_RX_INFO_HDR
-
-Event Values
-    None
-
-=====================================================================
-
-
-
-Name
-    PSTREAM_TIMEOUT
-
-Synopsis
-    Indicates that a priority stream that got created as a result of priority-marked data
-    flow (priority marked in IP TOS) being idle for the default inactivity interval period
-    (specified in the “CREATE_PSTREAM” command) used for priority streams created
-    implicitly by the driver. This event is not indicated for user-created priority streams.
-    User-created priority streams exist until the users delete them explicitly. They do not
-    timeout due to data inactivity.
-
-Event ID
-    0x1007
-
-Event Parameters
-    A_UINT8
-    trafficClass
-    Indicated the traffic class of priority
-    stream that timed out
-
-Event Values
-    {
-        WMM_AC_BE    = 0
-            Best effort
-        WMM_AC_BK    = 1
-            Background
-        WMM_AC_VI    = 2
-            Video
-        WMM_AC_VO     = 3
-            Voice
-    } TRAFFIC CLASS
-
-
-=====================================================================
-
-Name
-    READY
-
-Synopsis
-    Indicates that the AR6000 device is prepared to accept commands. It is sent once after
-    power on or reset. It also indicates the MAC address of the device.
-
-Event ID
-    0x1001
-
-Event Parameters
-    UINT8    macAddr[6]
-        Device MAC address
-    UINT8    phyCapability
-        A WMI_PHY_CAPABILITY value. Indicates the
-        capabilities of the device wireless module’s radio
-
-Event Values
-    {
-        WMI_11A_CAPABILITY       = 1
-        WMI_11G_CAPABILITY       = 2
-        WMI_11AG_CAPABILITY      = 3
-    } WMI_PHY_CAPABILITY
-
-
-=====================================================================
-
-Name
-    REGDOMAIN
-
-Synopsis
-    Indicates that the regulatory domain has changed. It initially occurs when the
-    AR6000 device reads the board data information. The regulatory domain can also
-    change when the device is a world-mode SKU. In this case, the regulatory domain is
-    based on the country advertised by APs per the IEEE 802.11d specification. A
-    potential side effect of a regulatory domain change is a change in the list of available
-    channels. Any channel restrictions that exist as a result of a previous
-    “SET_CHANNEL_PARAMETERS” command are lifted.
-
-Event ID
-    0x1006
-
-Event Parameters
-    UINT32    regDomain
-        The range of 0x0000 – 0x00FF
-        corresponds to an ISO country code.
-
-    Other regCodes are reserved for world
-    mode settings and specific regulatory
-    domains.
-
-Event Values
-    None
-
-
-=====================================================================
-
-
-
-Name
-    REPORT_STATISTICS
-
-Synopsis
-    A reply to a “GET_TARGET_STATS” command.
-
-Event ID
-    0x100B
-
-Event Parameters
-    When the statistics are sent to the host, the AR6001 clear them so that a new set of
-    statistics are collected for the next report.
-
-    UINT32    tx_packets
-    UINT32    tx_bytes
-    UINT32    tx_unicast_pkts
-    UINT32    tx_unicast_bytes
-    UINT32    tx_multicast_pkts
-    UINT32    tx_multicast_bytes
-    UINT32    tx_broadcast_pkts
-    UINT32    tx_broadcast_bytes
-    UINT32    tx_rts_success_cnt
-    UINT32    tx_packet_per_ac[4]
-        Tx packets per AC: [0] = BE, [1] = BK,
-        [2] = VI, [3] = VO
-    UINT32    tx_errors
-        Number of packets which failed Tx, due
-        to all failures
-    ... REPORT_STATISTICS, continued
-    UINT32    tx_failed_cnt
-        Number of data packets that failed Tx
-    UINT32    tx_retry_cnt
-        Number of Tx retries for all packets
-    UINT32    tx_rts_fail_cnt
-        Number of RTS Tx failed count
-    UINT32    rx_packets
-    UINT32    rx_bytes
-    UINT32    rx_unicast_pkts
-    UINT32    rx_unicast_bytes
-    UINT32    rx_multicast_pkts
-    UINT32    rx_multicast_bytes
-    UINT32    rx_broadcast_pkts
-    UINT32    rx_broadcast_bytes
-    UINT32    rx_fragment_pkt
-        Number of fragmented packets received
-    UINT32    rx_errors
-        Number of Rx errors due to all failures
-    UINT32    rx_crcerr
-        Number of Rx errors due to CRC errors
-    UINT32    rx_key_cache_miss
-        Number of Rx errors due to a key not
-        being plumbed
-    UINT32    rx_decrypt_err
-        Number of Rx errors due to decryption
-        failure
-    UINT32    rx_duplicate_frames
-        Number of duplicate frames received
-    UINT32    tkip_local_mic_failure
-        Number of TKIP MIC errors detected
-    UINT32    tkip_counter_measures_invoked
-        Number of times TKIP countermeasures
-        were invoked
-    UINT32    tkip_replays
-        Number of frames that replayed a TKIP
-        encrypted frame received earlier
-    UINT32    tkip_format_errors
-        Number of frames that did not conform
-        to the TKIP frame format
-    UINT32    ccmp_format_errors
-        Number of frames that did not conform
-        to the CCMP frame format
-    UINT32    ccmp_replays
-        Number of frames that replayed a CCMP
-        encrypted frame received earlier
-    UINT32    power_save_failure_cnt
-        Number of failures that occurred when
-        the AR6001 could not go to sleep
-    UINT32    cs_bmiss_cnt
-        Number of BMISS interrupts since
-    connection
-    UINT32    cs_lowRssi_cnt
-        Number of the times the RSSI went below
-        the low RSSI threshold
-    UINT16    cs_connect_cnt
-        Number of connection times
-    UINT16    cs_disconnect_cnt
-        Number of disconnection times
-    UINT8    cs_aveBeacon_rssi
-        The current averaged value of the RSSI
-        from the beacons of the connected BSS
-    UINT8    cs_lastRoam_msec
-        Time that the last roaming took, in ms.
-        This time is the difference between
-        roaming start and actual connection.
-
-Event Values
-    None defined
-
-
-=====================================================================
-
-Name
-    ROAM_TBL_EVENT
-
-Synopsis
-    Reports the roam table, which contains the current roam mode and this information
-    for every BSS:
-
-Event ID
-    0x100F
-
-Event Parameters
-    A_UINT8     bssid[ATH_MAC_LEN];
-        BSSID
-    A_UINT8     rssi
-        Averaged RSSI
-    A_UINT8     rssidt
-        Change in RSSI
-    A_UINT8     last_rssi
-        Last recorded RSSI
-    A_UINT8     roam_util
-        Utility value used in roaming decision
-    A_UINT8     util
-        Base utility with the BSS
-    A_UINT8     bias
-        Host configured for this BSS
-
-Event Values
-    roamMode
-        Current roam mode
-
-        = 1
-    RSSI based roam
-
-        = 2
-    Host bias-based roam
-
-        = 3
-    Lock to the current BSS
-
-        = 4
-    Autonomous roaming disabled
-
-
-=====================================================================
-
-Name
-    RSSI_THRESHOLD
-
-Synopsis
-    Alerts the host that the signal strength from the connected AP has crossed a
-    interesting threshold as defined in a previous “RSSI_THRESHOLD_PARAMS”
-    command.
-
-Event ID
-    0x100C
-
-Event Parameters
-    UINT8    range
-        A WMI_RSSI_THRESHOLD_VAL
-        value, which indicates the range of
-        the average signal strength
-
-Event Values
-    {
-        WMI_RSSI_LOWTHRESHOLD_BELOW_LOWERVAL  = 1
-        WMI_RSSI_LOWTHRESHOLD_LOWERVAL        = 2
-        WMI_RSSI_LOWTHRESHOLD_UPPERVAL        = 3
-        WMI_RSSI_HIGHTHRESHOLD_LOWERVAL       = 4
-        WMI_RSSI_HIGHTHRESHOLD_HIGHERVAL      = 5
-    } WMI_RSSI_THRESHOLD_VAL
-
-
-=====================================================================
-
-Name
-    SCAN_COMPLETE_EVENT
-
-Synopsis
-    Indicates the scan status. if the Scan was not completed, this event is generated with
-    the status A_ECANCELED.
-
-Event ID
-    0x100A
-
-Event Parameters
-    A_UINT8    scanStatus
-
-Event Values
-    {
-        #define     SCAN_ABORTED 16
-        #define     SCAN_COMPLETED 0
-        A_UINT8     scanStatus
-            A_OK or A_ECANCELED
-    } WMI_SCAN_COMPLETE_EVENT;
-
-
-=====================================================================
-
-Name
-    TEST_EVENT
-
-Synopsis
-    The TCMD application uses a single WMI event (WMI_TEST_EVENTID) to
-    communicate events from target to host. The events are parsed by the TCMD
-    application and WMI layer is oblivious of it.
-
-Event ID
-    0x1016
-
-Event Parameters
-    WMI_TEST_EVENTID
-
-
-Event Values
-    None
-
-
-=====================================================================
-
-
-
-Name
-    TKIP_MICERR
-
-Synopsis
-    Indicates that TKIP MIC errors were detected.
-
-Event ID
-    0x1009
-
-Event Parameters
-    UINT8    keyid
-        Indicates the TKIP key ID
-
-    UINT8    ismcast
-        0 = Unicast
-        1 = Multicast
-
-Event Values
-    See event parameters
-
-=====================================================================
-
-WMI Extension Commands
-
-The WMI EXTENSION command is used to multiplex a collection of
-commands that:
-
-        Are not generic wireless commands
-        May be implementation-specific
-        May be target platform-specific
-        May be optional for a host implementation
-
-    An extension command is sent to the AR6000 targets like any other WMI
-command message and uses the WMI_EXTENSION. The first field of the
-payload for this EXTENSION command is another commandId, sometimes
-called the subcommandId, which indicates which extension command is
-being used. A subcommandId-specific payload follows the subcommandId.
-
-All extensions (subcommandIds) are listed in the header file include/wmix.h.
-See also “WMI Extension Events” on page B-58.
-
-
-WMI Extension Commands
-
-
-GPIO_INPUT_GET
-    Read GPIO pins configured for input
-
-GPIO_INTR_ACK
-    Acknowledge and re-arm GPIO interrupts reported earlier
-
-GPIO_OUTPUT_SET
-    Manage output on GPIO pins configured for output
-
-GPIO_REGISTER_GET
-    Read an arbitrary GPIO register
-
-GPIO_REGISTER_SET
-    Dynamically change GPIO configuration
-
-SET_LQTHRESHOLD
-    Set link quality thresholds; the sampling happens at every unicast
-    data frame Tx, if certain thresholds are met, and corresponding
-    events are sent to the host
-
-
-=====================================================================
-
-Name
-    GPIO_INPUT_GET
-
-Synopsis
-    Allows the host to read GPIO pins that are configured for input. The values read are
-    returned through a “GPIO_DATA” extension event.
-
-NOTE: Support for GPIO is optional.
-
-Command
-    N/A
-
-Command Parameters
-    None
-
-
-
-Reply Parameters
-    None
-
-
-Reset Value
-    None
-
-
-
-Restrictions
-    None
-
-=====================================================================
-
-
-Name
-    GPIO_INTR_ACK
-
-Synopsis
-    The host uses this command to acknowledge and to re-arm GPIO interrupts reported
-    through an earlier “GPIO_INTR” extension event. A single “GPIO_INTR_ACK”
-    command should be used to acknowledge all GPIO interrupts that the host knows to
-    be outstanding (if pending interrupts are not acknowledged through
-    “GPIO_INTR_ACK”, another “GPIO_INTR” extension event is raised).
-
-NOTE: Support for GPIO is optional.
-
-Command
-    N/A
-
-Command Parameters
-    UINT32    ack_mask
-        A mask of interrupting GPIO pins (e.g., ack_mask
-        bit [3] acknowledges an interrupt from the pin GPIO3).
-
-Command Values
-    None
-
-Reset Value
-    None
-
-Restrictions
-    The host should acknowledge only interrupts about which it was notified.
-
-
-=====================================================================
-
-Name
-    GPIO_OUTPUT_SET
-
-Synopsis
-    Manages output on GPIO pins configured for output.
-
-    Conflicts between set_mask and clear_mask or enable_mask and disable_mask result
-    in undefined behavior.
-
-NOTE: Support for GPIO is optional.
-
-Command
-    N/A
-
-Command Parameters
-    UINT32    set_mask
-        Specifies which pins should drive a 1 out
-    UINT32    clear_mask
-        Specifies which pins should drive a 0 out
-    UINT32    enable_mask
-        Specifies which pins should be enabled for output
-    UINT32    disable_mask
-        Specifies which pins should be disabled for output
-
-Command Values
-    None
-
-
-Reset Value
-    None
-
-
-Restrictions
-    None
-
-
-
-=====================================================================
-
-
-Name
-    GPIO_REGISTER_GET
-
-Synopsis
-    Allows the host to read an arbitrary GPIO register. It is intended for use during
-    bringup/debug. The target responds to this command with a “GPIO_DATA” event.
-
-NOTE: Support for GPIO is optional.
-
-Command
-    N/A
-
-Command Parameters
-    UINT32
-    gpioreg_id
-    Specifies a GPIO register identifier, as defined
-in include/AR6000/AR6000_gpio.h
-
-Reply Parameters
-    None
-
-Reset Value
-    N/A
-
-Restrictions
-    None
-
-
-=====================================================================
-
-Name
-    GPIO_REGISTER_SET
-
-Synopsis
-    Allows the host to dynamically change GPIO configuration (usually handled
-    statically through the GPIO configuration DataSet).
-
-NOTE: Support for GPIO is optional.
-
-Command
-    N/A
-
-Command Parameters
-    UINT32    gpioreg_id
-        Specifies a GPIO register identifier, as defined in
-        include/AR6000/AR6000_gpio.h
-    UINT32    value
-        Specifies a value to write to the specified
-        GPIO register
-
-Command Values
-    None
-
-
-Reset Value
-    Initial hardware configuration is as defined in the AR6001 or AR6002 ROCmTM
-    Single-Chip MAC/BB/Radio for 2.4/5 GHz Embedded WLAN Applications data sheet. This
-    configuration is modified by the GPIO Configuration DataSet, if one exists.
-
-Restrictions
-    None
-
-
-=====================================================================
-
-
-Name
-    SET_LQTHRESHOLD
-
-Synopsis
-    Set link quality thresholds, the sampling happens at every unicast data frame Tx, if
-    certain threshold is met, corresponding event will be sent to host.
-
-Command
-    wmiconfig eth1 --lqThreshold <enable> <upper_threshold_1>...
-    <upper_threshold_4> <lower_threshold_1>... <lower_threshold_4>
-
-Command Parameters
-    A_UINT8   enable;
-    A_UINT8   thresholdAbove1_Val;
-    A_UINT8   thresholdAbove2_Val;
-    A_UINT8   thresholdAbove3_Val;
-    A_UINT8   thresholdAbove4_Val;
-    A_UINT8   thresholdBelow1_Val;
-    A_UINT8   thresholdBelow2_Val;
-    A_UINT8   thresholdBelow3_Val;
-    A_UINT8   thresholdBelow4_Val;
-
-Command Values
-    enable
-    = 0
-    Disable link quality sampling
-
-        = 1
-    Enable link quality sampling
-
-
-    thresholdAbove_Val
-    [1...4]
-    Above thresholds (value in [0,100]), in ascending
-    order threshold
-
-    Below_Val [1...4] = below thresholds (value
-    in [0,100]), in ascending order
-
-Reset Values
-    None
-
-Restrictions
-    None
-
-=====================================================================
-WMI Extension Events
-
-The WMI EXTENSION event is used for a collection of events that:
-
-    Are not generic wireless events
-    May be implementation-specific
-    May be target platform-specific
-    May be optional for a host implementation
-
-    An extension event is sent from the AR6000 device targets to the host just like
-any other WMI event message, using the WMI_EXTENSION_EVENTID. The
-first field of the payload for this “EXTENSION” event is another commandId
-(sometimes called the subcommandId) that indicates which “EXTENSION”
-event is being used. A subcommandId-specific payload follows the
-subcommandId.
-
-All extensions (subcommandIds) are listed in the header file include/wmix.h.
-See also “WMI Extension Commands” on page B-55.
-
-
-WMI Extension Events
-
-
-GPIO_ACK
-    Acknowledges a host set command has been processed by the device
-
-GPIO_DATA
-    Response to a host’s request for data
-
-GPIO_INTR
-    Signals that GPIO interrupts are pending
-
-
-=====================================================================
-
-Name
-    GPIO_ACK
-
-Synopsis
-    Acknowledges that a host set command (either “GPIO_OUTPUT_SET” or
-    “GPIO_REGISTER_SET”) has been processed by the AR6000 device.
-
-NOTE: Support for GPIO is optional.
-
-Event ID
-    N/A
-
-Event Parameters
-    None
-
-
-Event Values
-    None
-
-=====================================================================
-
-
-Name
-    GPIO_DATA
-
-Synopsis
-    The AR6000 device uses this event to respond to the host’s earlier request for data
-    (through either a “GPIO_REGISTER_GET” or a “GPIO_INPUT_GET” command).
-
-NOTE: Support for GPIO is optional.
-
-Event ID
-    N/A
-
-Event Parameters
-    UINT32    value
-        Holds the data of interest, which is either a register value
-        (in the case of “GPIO_REGISTER_GET”) or a mask of
-        pin inputs (in the case of “GPIO_INPUT_GET”).
-    UINT32    reg_id
-        Indicates which register was read (in the case of
-        “GPIO_REGISTER_GET”) or is GPIO_ID_NONE (in the
-        case of “GPIO_INPUT_GET”)
-
-Event Values
-    None
-
-
-=====================================================================
-
-
-
-Name
-    GPIO_INTR
-
-Synopsis
-    The AR6000 device raises this event to signal that GPIO interrupts are pending.
-    These GPIOs may be interrupts that occurred after the last “GPIO_INTR_ACK”
-    command was issued, or may be GPIO interrupts that the host failed to acknowledge
-    in the last “GPIO_INTR_ACK”. The AR6000 will not raise another GPIO_INTR
-    event until this event is acknowledged through a “GPIO_INTR_ACK” command.
-
-NOTE: Support for GPIO is optional.
-
-Event ID
-    N/A
-
-Event Parameters
-    UINT32    intr_mask
-        Indicates which GPIO interrupts are currently pending
-
-    UINT32    input_values
-        A recent copy of the GPIO input values, taken at the
-        time the most recent GPIO interrupt was processed
-
-Event Values
-    None
-
-
-
-=====================================================================
-#endif
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/wmi/wmi_host.h b/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/wmi/wmi_host.h
deleted file mode 100644
index 57844bcf3..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/wmi/wmi_host.h
+++ /dev/null
@@ -1,71 +0,0 @@
-#ifndef _WMI_HOST_H_
-#define _WMI_HOST_H_
-/*
- * Copyright (c) 2004-2006 Atheros Communications Inc.
- * All rights reserved.
- *
- * This file contains local definitios for the wmi host module.
- *
- * $Id: //depot/sw/releases/olca2.0-GPL/host/wmi/wmi_host.h#1 $
- *
- *
- *  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;
- *
- *  Software distributed under the License is distributed on an "AS
- *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- *  implied. See the License for the specific language governing
- *  rights and limitations under the License.
- *
- *
- *
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct wmi_stats {
-    A_UINT32    cmd_len_err;
-    A_UINT32    cmd_id_err;
-};
-
-struct wmi_t {
-    A_BOOL                          wmi_ready;
-    A_BOOL                          wmi_numQoSStream;
-    A_UINT8                         wmi_wmiStream2AcMapping[WMI_PRI_MAX_COUNT];
-    WMI_PRI_STREAM_ID               wmi_ac2WmiStreamMapping[WMM_NUM_AC];
-    A_UINT16                        wmi_streamExistsForAC[WMM_NUM_AC];
-    A_UINT8                         wmi_fatPipeExists;
-    void                           *wmi_devt;
-    struct wmi_stats                wmi_stats;
-    struct ieee80211_node_table     wmi_scan_table;
-    A_UINT8                         wmi_bssid[ATH_MAC_LEN];
-    A_UINT8                         wmi_powerMode;
-    A_UINT8                         wmi_phyMode;
-    A_UINT8                         wmi_keepaliveInterval;
-    A_MUTEX_T                       wmi_lock;
-};
-
-#define WMI_INIT_WMISTREAM_AC_MAP(w) \
-{  (w)->wmi_wmiStream2AcMapping[WMI_BEST_EFFORT_PRI] = WMM_AC_BE; \
-   (w)->wmi_wmiStream2AcMapping[WMI_LOW_PRI] = WMM_AC_BK; \
-   (w)->wmi_wmiStream2AcMapping[WMI_HIGH_PRI] = WMM_AC_VI; \
-   (w)->wmi_wmiStream2AcMapping[WMI_HIGHEST_PRI] = WMM_AC_VO; \
-   (w)->wmi_ac2WmiStreamMapping[WMM_AC_BE] = WMI_BEST_EFFORT_PRI; \
-   (w)->wmi_ac2WmiStreamMapping[WMM_AC_BK] = WMI_LOW_PRI; \
-   (w)->wmi_ac2WmiStreamMapping[WMM_AC_VI] = WMI_HIGH_PRI; \
-   (w)->wmi_ac2WmiStreamMapping[WMM_AC_VO] = WMI_HIGHEST_PRI; }
-
-#define WMI_WMISTREAM_ACCESSCATEGORY(w,s)      (w)->wmi_wmiStream2AcMapping[s]
-#define WMI_ACCESSCATEGORY_WMISTREAM(w,ac)       (w)->wmi_ac2WmiStreamMapping[ac]
-
-#define LOCK_WMI(w)     A_MUTEX_LOCK(&(w)->wmi_lock);
-#define UNLOCK_WMI(w)   A_MUTEX_UNLOCK(&(w)->wmi_lock);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _WMI_HOST_H_ */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/input/misc/lis302dl.c b/target/linux/s3c24xx/files-2.6.30/drivers/input/misc/lis302dl.c
deleted file mode 100644
index dc6602a8e..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/input/misc/lis302dl.c
+++ /dev/null
@@ -1,957 +0,0 @@
-/* Linux kernel driver for the ST LIS302D 3-axis accelerometer
- *
- * Copyright (C) 2007-2008 by Openmoko, Inc.
- * Author: Harald Welte <laforge@openmoko.org>
- *         converted to private bitbang by:
- *         Andy Green <andy@openmoko.com>
- *         ability to set acceleration threshold added by:
- *         Simon Kagstrom <simon.kagstrom@gmail.com>
- * All rights reserved.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
- * TODO
- * 	* statistics for overflow events
- * 	* configuration interface (sysfs) for
- * 		* enable/disable x/y/z axis data ready
- * 		* enable/disable resume from freee fall / click
- * 		* free fall / click parameters
- * 		* high pass filter parameters
- */
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/module.h>
-#include <linux/device.h>
-#include <linux/platform_device.h>
-#include <linux/delay.h>
-#include <linux/irq.h>
-#include <linux/interrupt.h>
-#include <linux/sysfs.h>
-#include <linux/spi/spi.h>
-
-#include <linux/lis302dl.h>
-
-/* Utility functions */
-static u8 __reg_read(struct lis302dl_info *lis, u8 reg)
-{
-	struct spi_message msg;
-	struct spi_transfer t;
-	u8 data[2] = {0xc0 | reg};
-	int rc;
-
-	spi_message_init(&msg);
-	memset(&t, 0, sizeof t);
-	t.len = 2;
-	spi_message_add_tail(&t, &msg);
-	t.tx_buf = &data[0];
-	t.rx_buf = &data[0];
-
-	/* Should complete without blocking */
-	rc = spi_non_blocking_transfer(lis->spi, &msg);
-	if (rc < 0) {
-		dev_err(lis->dev, "Error reading register\n");
-		return rc;
-	}
-
-	return data[1];
-}
-
-static void __reg_write(struct lis302dl_info *lis, u8 reg, u8 val)
-{
-	struct spi_message msg;
-	struct spi_transfer t;
-	u8 data[2] = {reg, val};
-
-	spi_message_init(&msg);
-	memset(&t, 0, sizeof t);
-	t.len = 2;
-	spi_message_add_tail(&t, &msg);
-	t.tx_buf = &data[0];
-	t.rx_buf = &data[0];
-
-	/* Completes without blocking */
-	if (spi_non_blocking_transfer(lis->spi, &msg) < 0)
-		dev_err(lis->dev, "Error writing register\n");
-}
-
-static void __reg_set_bit_mask(struct lis302dl_info *lis, u8 reg, u8 mask,
-		u8 val)
-{
-	u_int8_t tmp;
-
-	val &= mask;
-
-	tmp = __reg_read(lis, reg);
-	tmp &= ~mask;
-	tmp |= val;
-	__reg_write(lis, reg, tmp);
-}
-
-static int __ms_to_duration(struct lis302dl_info *lis, int ms)
-{
-	/* If we have 400 ms sampling rate, the stepping is 2.5 ms,
-	 * on 100 ms the stepping is 10ms */
-	if (lis->flags & LIS302DL_F_DR)
-		return min((ms * 10) / 25, 637);
-
-	return min(ms / 10, 2550);
-}
-
-static int __duration_to_ms(struct lis302dl_info *lis, int duration)
-{
-	if (lis->flags & LIS302DL_F_DR)
-		return (duration * 25) / 10;
-
-	return duration * 10;
-}
-
-static u8 __mg_to_threshold(struct lis302dl_info *lis, int mg)
-{
-	/* If FS is set each bit is 71mg, otherwise 18mg. The THS register
-	 * has 7 bits for the threshold value */
-	if (lis->flags & LIS302DL_F_FS)
-		return min(mg / 71, 127);
-
-	return min(mg / 18, 127);
-}
-
-static int __threshold_to_mg(struct lis302dl_info *lis, u8 threshold)
-{
-	if (lis->flags & LIS302DL_F_FS)
-		return threshold * 71;
-
-	return threshold * 18;
-}
-
-/* interrupt handling related */
-
-enum lis302dl_intmode {
-	LIS302DL_INTMODE_GND		= 0x00,
-	LIS302DL_INTMODE_FF_WU_1	= 0x01,
-	LIS302DL_INTMODE_FF_WU_2	= 0x02,
-	LIS302DL_INTMODE_FF_WU_12	= 0x03,
-	LIS302DL_INTMODE_DATA_READY	= 0x04,
-	LIS302DL_INTMODE_CLICK		= 0x07,
-};
-
-static void __lis302dl_int_mode(struct device *dev, int int_pin,
-			      enum lis302dl_intmode mode)
-{
-	struct lis302dl_info *lis = dev_get_drvdata(dev);
-
-	switch (int_pin) {
-	case 1:
-		__reg_set_bit_mask(lis, LIS302DL_REG_CTRL3, 0x07, mode);
-		break;
-	case 2:
-		__reg_set_bit_mask(lis, LIS302DL_REG_CTRL3, 0x38, mode << 3);
-		break;
-	default:
-		BUG();
-	}
-}
-
-static void __enable_wakeup(struct lis302dl_info *lis)
-{
-	__reg_write(lis, LIS302DL_REG_CTRL1, 0);
-
-	/* First zero to get to a known state */
-	__reg_write(lis, LIS302DL_REG_FF_WU_CFG_1, LIS302DL_FFWUCFG_XHIE |
-			LIS302DL_FFWUCFG_YHIE | LIS302DL_FFWUCFG_ZHIE |
-			LIS302DL_FFWUCFG_LIR);
-	__reg_write(lis, LIS302DL_REG_FF_WU_THS_1,
-			__mg_to_threshold(lis, lis->wakeup.threshold));
-	__reg_write(lis, LIS302DL_REG_FF_WU_DURATION_1,
-			__ms_to_duration(lis, lis->wakeup.duration));
-
-	/* Route the interrupt for wakeup */
-	__lis302dl_int_mode(lis->dev, 1,
-			LIS302DL_INTMODE_FF_WU_1);
-
-	__reg_read(lis, LIS302DL_REG_HP_FILTER_RESET);
-	__reg_read(lis, LIS302DL_REG_OUT_X);
-	__reg_read(lis, LIS302DL_REG_OUT_Y);
-	__reg_read(lis, LIS302DL_REG_OUT_Z);
-	__reg_read(lis, LIS302DL_REG_STATUS);
-	__reg_read(lis, LIS302DL_REG_FF_WU_SRC_1);
-	__reg_read(lis, LIS302DL_REG_FF_WU_SRC_2);
-	__reg_write(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_PD | 7);
-}
-
-static void __enable_data_collection(struct lis302dl_info *lis)
-{
-	u_int8_t ctrl1 = LIS302DL_CTRL1_PD | LIS302DL_CTRL1_Xen |
-			 LIS302DL_CTRL1_Yen | LIS302DL_CTRL1_Zen;
-
-	/* make sure we're powered up and generate data ready */
-	__reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, ctrl1, ctrl1);
-
-	/* If the threshold is zero, let the device generated an interrupt
-	 * on each datum */
-	if (lis->threshold == 0) {
-		__reg_write(lis, LIS302DL_REG_CTRL2, 0);
-		__lis302dl_int_mode(lis->dev, 1, LIS302DL_INTMODE_DATA_READY);
-		__lis302dl_int_mode(lis->dev, 2, LIS302DL_INTMODE_DATA_READY);
-	} else {
-		__reg_write(lis, LIS302DL_REG_CTRL2,
-				LIS302DL_CTRL2_HPFF1);
-		__reg_write(lis, LIS302DL_REG_FF_WU_THS_1,
-				__mg_to_threshold(lis, lis->threshold));
-		__reg_write(lis, LIS302DL_REG_FF_WU_DURATION_1,
-				__ms_to_duration(lis, lis->duration));
-
-		/* Clear the HP filter "starting point" */
-		__reg_read(lis, LIS302DL_REG_HP_FILTER_RESET);
-		__reg_write(lis, LIS302DL_REG_FF_WU_CFG_1,
-				LIS302DL_FFWUCFG_XHIE | LIS302DL_FFWUCFG_YHIE |
-				LIS302DL_FFWUCFG_ZHIE | LIS302DL_FFWUCFG_LIR);
-		__lis302dl_int_mode(lis->dev, 1, LIS302DL_INTMODE_FF_WU_12);
-		__lis302dl_int_mode(lis->dev, 2, LIS302DL_INTMODE_FF_WU_12);
-	}
-}
-
-#if 0
-static void _report_btn_single(struct input_dev *inp, int btn)
-{
-	input_report_key(inp, btn, 1);
-	input_sync(inp);
-	input_report_key(inp, btn, 0);
-}
-
-static void _report_btn_double(struct input_dev *inp, int btn)
-{
-	input_report_key(inp, btn, 1);
-	input_sync(inp);
-	input_report_key(inp, btn, 0);
-	input_sync(inp);
-	input_report_key(inp, btn, 1);
-	input_sync(inp);
-	input_report_key(inp, btn, 0);
-}
-#endif
-
-
-static void lis302dl_bitbang_read_sample(struct lis302dl_info *lis)
-{
-	u8 data[(LIS302DL_REG_OUT_Z - LIS302DL_REG_STATUS) + 2] = {0xC0 | LIS302DL_REG_STATUS};
-	u8 *read = data + 1;
-	unsigned long flags;
-	int mg_per_sample = __threshold_to_mg(lis, 1);
-	struct spi_message msg;
-	struct spi_transfer t;
-
-	spi_message_init(&msg);
-	memset(&t, 0, sizeof t);
-	t.len = sizeof(data);
-	spi_message_add_tail(&t, &msg);
-	t.tx_buf = &data[0];
-	t.rx_buf = &data[0];
-
-	/* grab the set of register containing status and XYZ data */
-
-	local_irq_save(flags);
-
-	/* Should complete without blocking */
-	if (spi_non_blocking_transfer(lis->spi, &msg) < 0)
-		dev_err(lis->dev, "Error reading registers\n");
-
-	local_irq_restore(flags);
-
-	/*
-	 * at the minute the test below fails 50% of the time due to
-	 * a problem with level interrupts causing ISRs to get called twice.
-	 * This is a workaround for that, but actually this test is still
-	 * valid and the information can be used for overrrun stats.
-	 */
-
-	/* has any kind of overrun been observed by the lis302dl? */
-	if (read[0] & (LIS302DL_STATUS_XOR |
-		       LIS302DL_STATUS_YOR |
-		       LIS302DL_STATUS_ZOR))
-		lis->overruns++;
-
-	/* we have a valid sample set? */
-	if (read[0] & LIS302DL_STATUS_XYZDA) {
-		input_report_abs(lis->input_dev, ABS_X, mg_per_sample *
-			    (s8)read[LIS302DL_REG_OUT_X - LIS302DL_REG_STATUS]);
-		input_report_abs(lis->input_dev, ABS_Y, mg_per_sample *
-			    (s8)read[LIS302DL_REG_OUT_Y - LIS302DL_REG_STATUS]);
-		input_report_abs(lis->input_dev, ABS_Z, mg_per_sample *
-			    (s8)read[LIS302DL_REG_OUT_Z - LIS302DL_REG_STATUS]);
-
-		input_sync(lis->input_dev);
-	}
-
-	if (lis->threshold)
-		/* acknowledge the wakeup source */
-		__reg_read(lis,	LIS302DL_REG_FF_WU_SRC_1);
-}
-
-static irqreturn_t lis302dl_interrupt(int irq, void *_lis)
-{
-	struct lis302dl_info *lis = _lis;
-
-	lis302dl_bitbang_read_sample(lis);
-	return IRQ_HANDLED;
-}
-
-/* sysfs */
-
-static ssize_t show_overruns(struct device *dev, struct device_attribute *attr,
-			 char *buf)
-{
-	struct lis302dl_info *lis = dev_get_drvdata(dev);
-
-	return sprintf(buf, "%u\n", lis->overruns);
-}
-
-static DEVICE_ATTR(overruns, S_IRUGO, show_overruns, NULL);
-
-static ssize_t show_rate(struct device *dev, struct device_attribute *attr,
-			 char *buf)
-{
-	struct lis302dl_info *lis = dev_get_drvdata(dev);
-	u8 ctrl1;
-	unsigned long flags;
-
-	local_irq_save(flags);
-	ctrl1 = __reg_read(lis, LIS302DL_REG_CTRL1);
-	local_irq_restore(flags);
-
-	return sprintf(buf, "%d\n", ctrl1 & LIS302DL_CTRL1_DR ? 400 : 100);
-}
-
-static ssize_t set_rate(struct device *dev, struct device_attribute *attr,
-			const char *buf, size_t count)
-{
-	struct lis302dl_info *lis = dev_get_drvdata(dev);
-	unsigned long flags;
-
-	local_irq_save(flags);
-
-	if (!strcmp(buf, "400\n")) {
-		__reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_DR,
-				 LIS302DL_CTRL1_DR);
-		lis->flags |= LIS302DL_F_DR;
-	} else {
-		__reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_DR,
-				0);
-		lis->flags &= ~LIS302DL_F_DR;
-	}
-	local_irq_restore(flags);
-
-	return count;
-}
-
-static DEVICE_ATTR(sample_rate, S_IRUGO | S_IWUSR, show_rate, set_rate);
-
-static ssize_t show_scale(struct device *dev, struct device_attribute *attr,
-			  char *buf)
-{
-	struct lis302dl_info *lis = dev_get_drvdata(dev);
-	u_int8_t ctrl1;
-	unsigned long flags;
-
-	local_irq_save(flags);
-	ctrl1 = __reg_read(lis, LIS302DL_REG_CTRL1);
-	local_irq_restore(flags);
-
-	return sprintf(buf, "%s\n", ctrl1 & LIS302DL_CTRL1_FS ? "9.2" : "2.3");
-}
-
-static ssize_t set_scale(struct device *dev, struct device_attribute *attr,
-			 const char *buf, size_t count)
-{
-	struct lis302dl_info *lis = dev_get_drvdata(dev);
-	unsigned long flags;
-
-	local_irq_save(flags);
-
-	if (!strcmp(buf, "9.2\n")) {
-		__reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_FS,
-				 LIS302DL_CTRL1_FS);
-		lis->flags |= LIS302DL_F_FS;
-	} else {
-		__reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_FS,
-				0);
-		lis->flags &= ~LIS302DL_F_FS;
-	}
-
-	if (lis->flags & LIS302DL_F_INPUT_OPEN)
-		__enable_data_collection(lis);
-
-	local_irq_restore(flags);
-
-	return count;
-}
-
-static DEVICE_ATTR(full_scale, S_IRUGO | S_IWUSR, show_scale, set_scale);
-
-static ssize_t show_threshold(struct device *dev, struct device_attribute *attr,
-		 char *buf)
-{
-	struct lis302dl_info *lis = dev_get_drvdata(dev);
-
-	/* Display the device view of the threshold setting */
-	return sprintf(buf, "%d\n", __threshold_to_mg(lis,
-			__mg_to_threshold(lis, lis->threshold)));
-}
-
-static ssize_t set_threshold(struct device *dev, struct device_attribute *attr,
-		 const char *buf, size_t count)
-{
-	struct lis302dl_info *lis = dev_get_drvdata(dev);
-	unsigned int val;
-
-	if (sscanf(buf, "%u\n", &val) != 1)
-		return -EINVAL;
-	/* 8g is the maximum if FS is 1 */
-	if (val > 8000)
-		return -ERANGE;
-
-	/* Set the threshold and write it out if the device is used */
-	lis->threshold = val;
-
-	if (lis->flags & LIS302DL_F_INPUT_OPEN) {
-		unsigned long flags;
-
-		local_irq_save(flags);
-		__enable_data_collection(lis);
-		local_irq_restore(flags);
-	}
-
-	return count;
-}
-
-static DEVICE_ATTR(threshold, S_IRUGO | S_IWUSR, show_threshold, set_threshold);
-
-static ssize_t show_duration(struct device *dev, struct device_attribute *attr,
-		 char *buf)
-{
-	struct lis302dl_info *lis = dev_get_drvdata(dev);
-
-	return sprintf(buf, "%d\n", __duration_to_ms(lis,
-			__ms_to_duration(lis, lis->duration)));
-}
-
-static ssize_t set_duration(struct device *dev, struct device_attribute *attr,
-		 const char *buf, size_t count)
-{
-	struct lis302dl_info *lis = dev_get_drvdata(dev);
-	unsigned int val;
-
-	if (sscanf(buf, "%u\n", &val) != 1)
-		return -EINVAL;
-	if (val > 2550)
-		return -ERANGE;
-
-	lis->duration = val;
-	if (lis->flags & LIS302DL_F_INPUT_OPEN)
-		__reg_write(lis, LIS302DL_REG_FF_WU_DURATION_1,
-				__ms_to_duration(lis, lis->duration));
-
-	return count;
-}
-
-static DEVICE_ATTR(duration, S_IRUGO | S_IWUSR, show_duration, set_duration);
-
-static ssize_t lis302dl_dump(struct device *dev, struct device_attribute *attr,
-								      char *buf)
-{
-	struct lis302dl_info *lis = dev_get_drvdata(dev);
-	int n = 0;
-	u8 reg[0x40];
-	char *end = buf;
-	unsigned long flags;
-
-	local_irq_save(flags);
-
-	for (n = 0; n < sizeof(reg); n++)
-		reg[n] = __reg_read(lis, n);
-
-	local_irq_restore(flags);
-
-	for (n = 0; n < sizeof(reg); n += 16) {
-		hex_dump_to_buffer(reg + n, 16, 16, 1, end, 128, 0);
-		end += strlen(end);
-		*end++ = '\n';
-		*end++ = '\0';
-	}
-
-	return end - buf;
-}
-static DEVICE_ATTR(dump, S_IRUGO, lis302dl_dump, NULL);
-
-/* Configure freefall/wakeup interrupts */
-static ssize_t set_wakeup_threshold(struct device *dev,
-		struct device_attribute *attr, const char *buf, size_t count)
-{
-	struct lis302dl_info *lis = dev_get_drvdata(dev);
-	unsigned int threshold;
-
-	if (sscanf(buf, "%u\n", &threshold) != 1)
-		return -EINVAL;
-
-	if (threshold > 8000)
-		return -ERANGE;
-
-	/* Zero turns the feature off */
-	if (threshold == 0) {
-		if (lis->flags & LIS302DL_F_IRQ_WAKE) {
-			disable_irq_wake(lis->pdata->interrupt);
-			lis->flags &= ~LIS302DL_F_IRQ_WAKE;
-		}
-
-		return count;
-	}
-
-	lis->wakeup.threshold = threshold;
-
-	if (!(lis->flags & LIS302DL_F_IRQ_WAKE)) {
-		enable_irq_wake(lis->pdata->interrupt);
-		lis->flags |= LIS302DL_F_IRQ_WAKE;
-	}
-
-	return count;
-}
-
-static ssize_t show_wakeup_threshold(struct device *dev,
-		struct device_attribute *attr, char *buf)
-{
-	struct lis302dl_info *lis = dev_get_drvdata(dev);
-
-	/* All events off? */
-	if (lis->wakeup.threshold == 0)
-		return sprintf(buf, "off\n");
-
-	return sprintf(buf, "%u\n", lis->wakeup.threshold);
-}
-
-static DEVICE_ATTR(wakeup_threshold, S_IRUGO | S_IWUSR, show_wakeup_threshold,
-		set_wakeup_threshold);
-
-static ssize_t set_wakeup_duration(struct device *dev,
-		struct device_attribute *attr, const char *buf, size_t count)
-{
-	struct lis302dl_info *lis = dev_get_drvdata(dev);
-	unsigned int duration;
-
-	if (sscanf(buf, "%u\n", &duration) != 1)
-		return -EINVAL;
-
-	if (duration > 2550)
-		return -ERANGE;
-
-	lis->wakeup.duration = duration;
-
-	return count;
-}
-
-static ssize_t show_wakeup_duration(struct device *dev,
-		struct device_attribute *attr, char *buf)
-{
-	struct lis302dl_info *lis = dev_get_drvdata(dev);
-
-	return sprintf(buf, "%u\n", lis->wakeup.duration);
-}
-
-static DEVICE_ATTR(wakeup_duration, S_IRUGO | S_IWUSR, show_wakeup_duration,
-		set_wakeup_duration);
-
-static struct attribute *lis302dl_sysfs_entries[] = {
-	&dev_attr_sample_rate.attr,
-	&dev_attr_full_scale.attr,
-	&dev_attr_threshold.attr,
-	&dev_attr_duration.attr,
-	&dev_attr_dump.attr,
-	&dev_attr_wakeup_threshold.attr,
-	&dev_attr_wakeup_duration.attr,
-	&dev_attr_overruns.attr,
-	NULL
-};
-
-static struct attribute_group lis302dl_attr_group = {
-	.name	= NULL,
-	.attrs	= lis302dl_sysfs_entries,
-};
-
-/* input device handling and driver core interaction */
-
-static int lis302dl_input_open(struct input_dev *inp)
-{
-	struct lis302dl_info *lis = input_get_drvdata(inp);
-	unsigned long flags;
-
-	local_irq_save(flags);
-
-	__enable_data_collection(lis);
-	lis->flags |= LIS302DL_F_INPUT_OPEN;
-
-	local_irq_restore(flags);
-
-	return 0;
-}
-
-static void lis302dl_input_close(struct input_dev *inp)
-{
-	struct lis302dl_info *lis = input_get_drvdata(inp);
-	u_int8_t ctrl1 = LIS302DL_CTRL1_Xen | LIS302DL_CTRL1_Yen |
-			 LIS302DL_CTRL1_Zen;
-	unsigned long flags;
-
-	local_irq_save(flags);
-
-	/* since the input core already serializes access and makes sure we
-	 * only see close() for the close of the last user, we can safely
-	 * disable the data ready events */
-	__reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, ctrl1, 0x00);
-	lis->flags &= ~LIS302DL_F_INPUT_OPEN;
-
-	/* however, don't power down the whole device if still needed */
-	if (!(lis->flags & LIS302DL_F_WUP_FF ||
-	      lis->flags & LIS302DL_F_WUP_CLICK)) {
-		__reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_PD,
-				 0x00);
-	}
-	local_irq_restore(flags);
-}
-
-/* get the device to reload its coefficients from EEPROM and wait for it
- * to complete
- */
-
-static int __lis302dl_reset_device(struct lis302dl_info *lis)
-{
-	int timeout = 10;
-
-	__reg_write(lis, LIS302DL_REG_CTRL2,
-			LIS302DL_CTRL2_BOOT | LIS302DL_CTRL2_FDS);
-
-	while ((__reg_read(lis, LIS302DL_REG_CTRL2)
-			& LIS302DL_CTRL2_BOOT) && (timeout--))
-		mdelay(1);
-
-	return !!(timeout < 0);
-}
-
-static int __devinit lis302dl_probe(struct spi_device *spi)
-{
-	int rc;
-	struct lis302dl_info *lis;
-	u_int8_t wai;
-	unsigned long flags;
-	struct lis302dl_platform_data *pdata = spi->dev.platform_data;
-
-	spi->mode = SPI_MODE_3;
-	rc = spi_setup(spi);
-	if (rc < 0) {
-		dev_err(&spi->dev, "spi_setup failed\n");
-		return rc;
-	}
-
-	lis = kzalloc(sizeof(*lis), GFP_KERNEL);
-	if (!lis)
-		return -ENOMEM;
-
-	lis->dev = &spi->dev;
-	lis->spi = spi;
-
-	dev_set_drvdata(lis->dev, lis);
-
-	lis->pdata = pdata;
-
-	rc = sysfs_create_group(&lis->dev->kobj, &lis302dl_attr_group);
-	if (rc) {
-		dev_err(lis->dev, "error creating sysfs group\n");
-		goto bail_free_lis;
-	}
-
-	/* initialize input layer details */
-	lis->input_dev = input_allocate_device();
-	if (!lis->input_dev) {
-		dev_err(lis->dev, "Unable to allocate input device\n");
-		goto bail_sysfs;
-	}
-
-	input_set_drvdata(lis->input_dev, lis);
-	lis->input_dev->name = pdata->name;
-	 /* SPI Bus not defined as a valid bus for input subsystem*/
-	lis->input_dev->id.bustype = BUS_I2C; /* lie about it */
-	lis->input_dev->open = lis302dl_input_open;
-	lis->input_dev->close = lis302dl_input_close;
-
-	rc = input_register_device(lis->input_dev);
-	if (rc) {
-		dev_err(lis->dev, "error %d registering input device\n", rc);
-		goto bail_inp_dev;
-	}
-
-	local_irq_save(flags);
-	/* Configure our IO */
-	(lis->pdata->lis302dl_suspend_io)(lis, 1);
-
-	wai = __reg_read(lis, LIS302DL_REG_WHO_AM_I);
-	if (wai != LIS302DL_WHO_AM_I_MAGIC) {
-		dev_err(lis->dev, "unknown who_am_i signature 0x%02x\n", wai);
-		dev_set_drvdata(lis->dev, NULL);
-		rc = -ENODEV;
-		local_irq_restore(flags);
-		goto bail_inp_reg;
-	}
-
-	set_bit(EV_ABS, lis->input_dev->evbit);
-	input_set_abs_params(lis->input_dev, ABS_X, 0, 0, 0, 0);
-	input_set_abs_params(lis->input_dev, ABS_Y, 0, 0, 0, 0);
-	input_set_abs_params(lis->input_dev, ABS_Z, 0, 0, 0, 0);
-
-	lis->threshold = 0;
-	lis->duration = 0;
-	memset(&lis->wakeup, 0, sizeof(lis->wakeup));
-
-	if (__lis302dl_reset_device(lis))
-		dev_err(lis->dev, "device BOOT reload failed\n");
-
-	/* force us powered */
-	__reg_write(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_PD |
-			LIS302DL_CTRL1_Xen |
-			LIS302DL_CTRL1_Yen |
-			LIS302DL_CTRL1_Zen);
-	mdelay(1);
-
-	__reg_write(lis, LIS302DL_REG_CTRL2, 0);
-	__reg_write(lis, LIS302DL_REG_CTRL3,
-			LIS302DL_CTRL3_PP_OD | LIS302DL_CTRL3_IHL);
-	__reg_write(lis, LIS302DL_REG_FF_WU_THS_1, 0x0);
-	__reg_write(lis, LIS302DL_REG_FF_WU_DURATION_1, 0x00);
-	__reg_write(lis, LIS302DL_REG_FF_WU_CFG_1, 0x0);
-
-	/* start off in powered down mode; we power up when someone opens us */
-	__reg_write(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_Xen |
-			LIS302DL_CTRL1_Yen | LIS302DL_CTRL1_Zen);
-
-	if (pdata->open_drain)
-		/* switch interrupt to open collector, active-low */
-		__reg_write(lis, LIS302DL_REG_CTRL3,
-				LIS302DL_CTRL3_PP_OD | LIS302DL_CTRL3_IHL);
-	else
-		/* push-pull, active-low */
-		__reg_write(lis, LIS302DL_REG_CTRL3, LIS302DL_CTRL3_IHL);
-
-	__lis302dl_int_mode(lis->dev, 1, LIS302DL_INTMODE_GND);
-	__lis302dl_int_mode(lis->dev, 2, LIS302DL_INTMODE_GND);
-
-	__reg_read(lis, LIS302DL_REG_STATUS);
-	__reg_read(lis, LIS302DL_REG_FF_WU_SRC_1);
-	__reg_read(lis, LIS302DL_REG_FF_WU_SRC_2);
-	__reg_read(lis, LIS302DL_REG_CLICK_SRC);
-	local_irq_restore(flags);
-
-	dev_info(lis->dev, "Found %s\n", pdata->name);
-
-	lis->pdata = pdata;
-
-	set_irq_handler(lis->pdata->interrupt, handle_level_irq);
-
-	rc = request_irq(lis->pdata->interrupt, lis302dl_interrupt,
-			 IRQF_TRIGGER_LOW, "lis302dl", lis);
-
-	if (rc < 0) {
-		dev_err(lis->dev, "error requesting IRQ %d\n",
-			lis->pdata->interrupt);
-		goto bail_inp_reg;
-	}
-	return 0;
-
-bail_inp_reg:
-	input_unregister_device(lis->input_dev);
-bail_inp_dev:
-	input_free_device(lis->input_dev);
-bail_sysfs:
-	sysfs_remove_group(&lis->dev->kobj, &lis302dl_attr_group);
-bail_free_lis:
-	kfree(lis);
-	return rc;
-}
-
-static int __devexit lis302dl_remove(struct spi_device *spi)
-{
-	struct lis302dl_info *lis = dev_get_drvdata(&spi->dev);
-	unsigned long flags;
-
-	/* Disable interrupts */
-	if (lis->flags & LIS302DL_F_IRQ_WAKE)
-		disable_irq_wake(lis->pdata->interrupt);
-	free_irq(lis->pdata->interrupt, lis);
-
-	/* Reset and power down the device */
-	local_irq_save(flags);
-	__reg_write(lis, LIS302DL_REG_CTRL3, 0x00);
-	__reg_write(lis, LIS302DL_REG_CTRL2, 0x00);
-	__reg_write(lis, LIS302DL_REG_CTRL1, 0x00);
-	local_irq_restore(flags);
-
-	/* Cleanup resources */
-	sysfs_remove_group(&spi->dev.kobj, &lis302dl_attr_group);
-	input_unregister_device(lis->input_dev);
-	if (lis->input_dev)
-		input_free_device(lis->input_dev);
-	dev_set_drvdata(lis->dev, NULL);
-	kfree(lis);
-
-	return 0;
-}
-
-#ifdef CONFIG_PM
-
-static u8 regs_to_save[] = {
-	LIS302DL_REG_CTRL1,
-	LIS302DL_REG_CTRL2,
-	LIS302DL_REG_CTRL3,
-	LIS302DL_REG_FF_WU_CFG_1,
-	LIS302DL_REG_FF_WU_THS_1,
-	LIS302DL_REG_FF_WU_DURATION_1,
-	LIS302DL_REG_FF_WU_CFG_2,
-	LIS302DL_REG_FF_WU_THS_2,
-	LIS302DL_REG_FF_WU_DURATION_2,
-	LIS302DL_REG_CLICK_CFG,
-	LIS302DL_REG_CLICK_THSY_X,
-	LIS302DL_REG_CLICK_THSZ,
-	LIS302DL_REG_CLICK_TIME_LIMIT,
-	LIS302DL_REG_CLICK_LATENCY,
-	LIS302DL_REG_CLICK_WINDOW,
-
-};
-
-static int lis302dl_suspend(struct spi_device *spi, pm_message_t state)
-{
-	struct lis302dl_info *lis = dev_get_drvdata(&spi->dev);
-	unsigned long flags;
-	u_int8_t tmp;
-	int n;
-
-	/* determine if we want to wake up from the accel. */
-	if (lis->flags & LIS302DL_F_WUP_CLICK)
-		return 0;
-
-	disable_irq(lis->pdata->interrupt);
-	local_irq_save(flags);
-
-	/*
-	 * When we share SPI over multiple sensors, there is a race here
-	 * that one or more sensors will lose.  In that case, the shared
-	 * SPI bus GPIO will be in sleep mode and partially pulled down.  So
-	 * we explicitly put our IO into "wake" mode here before the final
-	 * traffic to the sensor.
-	 */
-	(lis->pdata->lis302dl_suspend_io)(lis, 1);
-
-	/* save registers */
-	for (n = 0; n < ARRAY_SIZE(regs_to_save); n++)
-		lis->regs[regs_to_save[n]] =
-			__reg_read(lis, regs_to_save[n]);
-
-	/* power down or enable wakeup */
-
-	if (lis->wakeup.threshold == 0) {
-		tmp = __reg_read(lis, LIS302DL_REG_CTRL1);
-		tmp &= ~LIS302DL_CTRL1_PD;
-		__reg_write(lis, LIS302DL_REG_CTRL1, tmp);
-	} else
-		__enable_wakeup(lis);
-
-	/* place our IO to the device in sleep-compatible states */
-	(lis->pdata->lis302dl_suspend_io)(lis, 0);
-
-	local_irq_restore(flags);
-
-	return 0;
-}
-
-static int lis302dl_resume(struct spi_device *spi)
-{
-	struct lis302dl_info *lis = dev_get_drvdata(&spi->dev);
-	unsigned long flags;
-	int n;
-
-	if (lis->flags & LIS302DL_F_WUP_CLICK)
-		return 0;
-
-	local_irq_save(flags);
-
-	/* get our IO to the device back in operational states */
-	(lis->pdata->lis302dl_suspend_io)(lis, 1);
-
-	/* resume from powerdown first! */
-	__reg_write(lis, LIS302DL_REG_CTRL1,
-			LIS302DL_CTRL1_PD |
-			LIS302DL_CTRL1_Xen |
-			LIS302DL_CTRL1_Yen |
-			LIS302DL_CTRL1_Zen);
-	mdelay(1);
-
-	if (__lis302dl_reset_device(lis))
-		dev_err(&spi->dev, "device BOOT reload failed\n");
-
-	lis->regs[LIS302DL_REG_CTRL1] |=	LIS302DL_CTRL1_PD |
-						LIS302DL_CTRL1_Xen |
-						LIS302DL_CTRL1_Yen |
-						LIS302DL_CTRL1_Zen;
-
-	/* restore registers after resume */
-	for (n = 0; n < ARRAY_SIZE(regs_to_save); n++)
-		__reg_write(lis, regs_to_save[n], lis->regs[regs_to_save[n]]);
-
-	/* if someone had us open, reset the non-wake threshold stuff */
-	if (lis->flags & LIS302DL_F_INPUT_OPEN)
-		__enable_data_collection(lis);
-
-	local_irq_restore(flags);
-	enable_irq(lis->pdata->interrupt);
-
-	return 0;
-}
-#else
-#define lis302dl_suspend	NULL
-#define lis302dl_resume		NULL
-#endif
-
-static struct spi_driver lis302dl_spi_driver = {
-	.driver = {
-		.name = "lis302dl",
-		.owner = THIS_MODULE,
-	},
-
-	.probe 	= lis302dl_probe,
-	.remove	= __devexit_p(lis302dl_remove),
-	.suspend = lis302dl_suspend,
-	.resume	 = lis302dl_resume,
-};
-
-static int __devinit lis302dl_init(void)
-{
-	return spi_register_driver(&lis302dl_spi_driver);
-}
-
-static void __exit lis302dl_exit(void)
-{
-	spi_unregister_driver(&lis302dl_spi_driver);
-}
-
-MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
-MODULE_LICENSE("GPL");
-
-module_init(lis302dl_init);
-module_exit(lis302dl_exit);
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/input/touchscreen/s3c2410_ts.c b/target/linux/s3c24xx/files-2.6.30/drivers/input/touchscreen/s3c2410_ts.c
deleted file mode 100644
index f980bfcce..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/input/touchscreen/s3c2410_ts.c
+++ /dev/null
@@ -1,593 +0,0 @@
-/*
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Copyright (c) 2004 Arnaud Patard <arnaud.patard@rtp-net.org>
- * iPAQ H1940 touchscreen support
- *
- * ChangeLog
- *
- * 2004-09-05: Herbert Pötzl <herbert@13thfloor.at>
- *      - added clock (de-)allocation code
- *
- * 2005-03-06: Arnaud Patard <arnaud.patard@rtp-net.org>
- *      - h1940_ -> s3c2410 (this driver is now also used on the n30
- *        machines :P)
- *      - Debug messages are now enabled with the config option
- *        TOUCHSCREEN_S3C2410_DEBUG
- *      - Changed the way the value are read
- *      - Input subsystem should now work
- *      - Use ioremap and readl/writel
- *
- * 2005-03-23: Arnaud Patard <arnaud.patard@rtp-net.org>
- *      - Make use of some undocumented features of the touchscreen
- *        controller
- *
- * 2007-05-23: Harald Welte <laforge@openmoko.org>
- *      - Add proper support for S32440
- *
- * 2008-06-23: Andy Green <andy@openmoko.com>
- *      - removed averaging system
- *      - added generic Touchscreen filter stuff
- *
- * 2008-11-27: Nelson Castillo <arhuaco@freaks-unidos.net>
- *      - improve interrupt handling
- */
-
-#include <linux/errno.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/input.h>
-#include <linux/init.h>
-#include <linux/serio.h>
-#include <linux/timer.h>
-#include <linux/kfifo.h>
-#include <linux/delay.h>
-#include <linux/platform_device.h>
-#include <linux/clk.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-
-#include <mach/regs-gpio.h>
-#include <mach/ts.h>
-#include <mach/hardware.h>
-#include <plat/regs-adc.h>
-
-#include <linux/touchscreen/ts_filter_chain.h>
-
-/* For ts.dev.id.version */
-#define S3C2410TSVERSION	0x0101
-
-#define TSC_SLEEP  (S3C2410_ADCTSC_PULL_UP_DISABLE | S3C2410_ADCTSC_XY_PST(0))
-
-#define WAIT4INT(x)  (((x)<<8) | \
-		     S3C2410_ADCTSC_YM_SEN | \
-		     S3C2410_ADCTSC_YP_SEN | \
-		     S3C2410_ADCTSC_XP_SEN | \
-		     S3C2410_ADCTSC_XY_PST(3))
-
-#define AUTOPST	     (S3C2410_ADCTSC_YM_SEN | \
-		      S3C2410_ADCTSC_YP_SEN | \
-		      S3C2410_ADCTSC_XP_SEN | \
-		      S3C2410_ADCTSC_AUTO_PST | \
-		      S3C2410_ADCTSC_XY_PST(0))
-
-#define DEBUG_LVL    KERN_DEBUG
-
-MODULE_AUTHOR("Arnaud Patard <arnaud.patard@rtp-net.org>");
-MODULE_DESCRIPTION("s3c2410 touchscreen driver");
-MODULE_LICENSE("GPL");
-
-/*
- * Definitions & global arrays.
- */
-
-static char *s3c2410ts_name = "s3c2410 TouchScreen";
-
-#define TS_RELEASE_TIMEOUT (HZ >> 7 ? HZ >> 7 : 1) /* 8ms (5ms if HZ is 200) */
-#define TS_EVENT_FIFO_SIZE (2 << 6) /* must be a power of 2 */
-
-#define TS_STATE_STANDBY 0 /* initial state */
-#define TS_STATE_PRESSED 1
-#define TS_STATE_RELEASE_PENDING 2
-#define TS_STATE_RELEASE 3
-
-/*
- * Per-touchscreen data.
- */
-
-struct s3c2410ts {
-	struct input_dev *dev;
-	struct ts_filter_chain *chain;
-	int is_down;
-	int state;
-	struct kfifo *event_fifo;
-};
-
-static struct s3c2410ts ts;
-
-static void __iomem *base_addr;
-
-/*
- * A few low level functions.
- */
-
-static inline void s3c2410_ts_connect(void)
-{
-	s3c2410_gpio_cfgpin(S3C2410_GPG12, S3C2410_GPG12_XMON);
-	s3c2410_gpio_cfgpin(S3C2410_GPG13, S3C2410_GPG13_nXPON);
-	s3c2410_gpio_cfgpin(S3C2410_GPG14, S3C2410_GPG14_YMON);
-	s3c2410_gpio_cfgpin(S3C2410_GPG15, S3C2410_GPG15_nYPON);
-}
-
-static void s3c2410_ts_start_adc_conversion(void)
-{
-	writel(S3C2410_ADCTSC_PULL_UP_DISABLE | AUTOPST,
-	       base_addr + S3C2410_ADCTSC);
-	writel(readl(base_addr + S3C2410_ADCCON) | S3C2410_ADCCON_ENABLE_START,
-	       base_addr + S3C2410_ADCCON);
-}
-
-/*
- * Just send the input events.
- */
-
-enum ts_input_event {IE_DOWN = 0, IE_UP};
-
-static void ts_input_report(int event, int coords[])
-{
-#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG
-	static char *s[] = {"down", "up"};
-	struct timeval tv;
-
-	do_gettimeofday(&tv);
-#endif
-
-	if (event == IE_DOWN) {
-		input_report_abs(ts.dev, ABS_X, coords[0]);
-		input_report_abs(ts.dev, ABS_Y, coords[1]);
-		input_report_key(ts.dev, BTN_TOUCH, 1);
-		input_report_abs(ts.dev, ABS_PRESSURE, 1);
-
-#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG
-		printk(DEBUG_LVL "T:%06d %6s (X:%03d, Y:%03d)\n",
-		       (int)tv.tv_usec, s[event], coords[0], coords[1]);
-#endif
-	} else {
-		input_report_key(ts.dev, BTN_TOUCH, 0);
-		input_report_abs(ts.dev, ABS_PRESSURE, 0);
-
-#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG
-		printk(DEBUG_LVL "T:%06d %6s\n",
-		       (int)tv.tv_usec, s[event]);
-#endif
-	}
-
-	input_sync(ts.dev);
-}
-
-/*
- * Manage the state of the touchscreen.
- */
-
-static void event_send_timer_f(unsigned long data);
-
-static struct timer_list event_send_timer =
-		TIMER_INITIALIZER(event_send_timer_f, 0, 0);
-
-static void event_send_timer_f(unsigned long data)
-{
-	static int noop_counter;
-	int event_type;
-
-	while (__kfifo_get(ts.event_fifo, (unsigned char *)&event_type,
-			   sizeof(int))) {
-		int buf[2];
-
-		switch (event_type) {
-		case 'D':
-			if (ts.state == TS_STATE_RELEASE_PENDING)
-				/* Ignore short UP event */
-				ts.state = TS_STATE_PRESSED;
-			break;
-
-		case 'U':
-			ts.state = TS_STATE_RELEASE_PENDING;
-			break;
-
-		case 'P':
-			if (ts.is_down) /* stylus_action needs a conversion */
-				s3c2410_ts_start_adc_conversion();
-
-			if (unlikely(__kfifo_get(ts.event_fifo,
-						 (unsigned char *)buf,
-						 sizeof(int) * 2)
-				     != sizeof(int) * 2))
-				goto ts_exit_error;
-
-			ts_input_report(IE_DOWN, buf);
-			ts.state = TS_STATE_PRESSED;
-			break;
-
-		default:
-			goto ts_exit_error;
-		}
-
-		noop_counter = 0;
-	}
-
-	if (noop_counter++ >= 1) {
-		noop_counter = 0;
-		if (ts.state == TS_STATE_RELEASE_PENDING) {
-			/*
-			 * We delay the UP event for a while to avoid jitter.
-			 * If we get a DOWN event we do not send it.
-			 */
-			ts_input_report(IE_UP, NULL);
-			ts.state = TS_STATE_STANDBY;
-
-			ts_filter_chain_clear(ts.chain);
-		}
-	} else {
-		mod_timer(&event_send_timer, jiffies + TS_RELEASE_TIMEOUT);
-	}
-
-	return;
-
-ts_exit_error: /* should not happen unless we have a bug */
-	printk(KERN_ERR __FILE__ ": event_send_timer_f failed\n");
-}
-
-/*
- * Manage interrupts.
- */
-
-static irqreturn_t stylus_updown(int irq, void *dev_id)
-{
-	unsigned long data0;
-	unsigned long data1;
-	int event_type;
-
-	data0 = readl(base_addr+S3C2410_ADCDAT0);
-	data1 = readl(base_addr+S3C2410_ADCDAT1);
-
-	ts.is_down = (!(data0 & S3C2410_ADCDAT0_UPDOWN)) &&
-					    (!(data1 & S3C2410_ADCDAT0_UPDOWN));
-
-	event_type = ts.is_down ? 'D' : 'U';
-
-	if (unlikely(__kfifo_put(ts.event_fifo, (unsigned char *)&event_type,
-		     sizeof(int)) != sizeof(int))) /* should not happen */
-		printk(KERN_ERR __FILE__": stylus_updown lost event!\n");
-
-	if (ts.is_down)
-		s3c2410_ts_start_adc_conversion();
-	else
-		writel(WAIT4INT(0), base_addr+S3C2410_ADCTSC);
-
-	mod_timer(&event_send_timer, jiffies + 1);
-
-	return IRQ_HANDLED;
-}
-
-static irqreturn_t stylus_action(int irq, void *dev_id)
-{
-	int buf[3];
-
-	/* Grab the ADC results. */
-	buf[1] = readl(base_addr + S3C2410_ADCDAT0) &
-		       S3C2410_ADCDAT0_XPDATA_MASK;
-	buf[2] = readl(base_addr + S3C2410_ADCDAT1) &
-		       S3C2410_ADCDAT1_YPDATA_MASK;
-
-	switch (ts_filter_chain_feed(ts.chain, &buf[1])) {
-	case 0:
-		/* The filter wants more points. */
-		s3c2410_ts_start_adc_conversion();
-		return IRQ_HANDLED;
-	case 1:
-		/* We have a point from the filters or no filtering enabled. */
-		buf[0] = 'P';
-		break;
-	default:
-		printk(KERN_ERR __FILE__
-		       ":%d Invalid ts_filter_chain_feed return value.\n",
-		       __LINE__);
-	case -1:
-		/* Error. Ignore the event. */
-		ts_filter_chain_clear(ts.chain);
-		writel(WAIT4INT(1), base_addr + S3C2410_ADCTSC);
-		return IRQ_HANDLED;
-	};
-
-	if (unlikely(__kfifo_put(ts.event_fifo, (unsigned char *)buf,
-		     sizeof(int) * 3) != sizeof(int) * 3))
-		printk(KERN_ERR __FILE__":stylus_action bug.\n");
-
-	writel(WAIT4INT(1), base_addr + S3C2410_ADCTSC);
-	mod_timer(&event_send_timer, jiffies + 1);
-
-	return IRQ_HANDLED;
-}
-
-static struct clk	*adc_clock;
-
-/*
- * The functions for inserting/removing us as a module.
- */
-
-static int __init s3c2410ts_probe(struct platform_device *pdev)
-{
-	int rc;
-	struct s3c2410_ts_mach_info *info;
-	struct input_dev *input_dev;
-	int ret = 0;
-
-	dev_info(&pdev->dev, "Starting\n");
-
-	info = (struct s3c2410_ts_mach_info *)pdev->dev.platform_data;
-
-	if (!info)
-	{
-		dev_err(&pdev->dev, "Hm... too bad: no platform data for ts\n");
-		return -EINVAL;
-	}
-
-#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG
-	printk(DEBUG_LVL "Entering s3c2410ts_init\n");
-#endif
-
-	adc_clock = clk_get(NULL, "adc");
-	if (!adc_clock) {
-		dev_err(&pdev->dev, "failed to get adc clock source\n");
-		return -ENOENT;
-	}
-	clk_enable(adc_clock);
-
-#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG
-	printk(DEBUG_LVL "got and enabled clock\n");
-#endif
-
-	base_addr = ioremap(S3C2410_PA_ADC,0x20);
-	if (base_addr == NULL) {
-		dev_err(&pdev->dev, "Failed to remap register block\n");
-		ret = -ENOMEM;
-		goto bail0;
-	}
-
-
-	/* If we acutally are a S3C2410: Configure GPIOs */
-	if (!strcmp(pdev->name, "s3c2410-ts"))
-		s3c2410_ts_connect();
-
-	if ((info->presc & 0xff) > 0)
-		writel(S3C2410_ADCCON_PRSCEN |
-		       S3C2410_ADCCON_PRSCVL(info->presc&0xFF),
-						    base_addr + S3C2410_ADCCON);
-	else
-		writel(0, base_addr+S3C2410_ADCCON);
-
-	/* Initialise registers */
-	if ((info->delay & 0xffff) > 0)
-		writel(info->delay & 0xffff,  base_addr + S3C2410_ADCDLY);
-
-	writel(WAIT4INT(0), base_addr + S3C2410_ADCTSC);
-
-	/* Initialise input stuff */
-	memset(&ts, 0, sizeof(struct s3c2410ts));
-	input_dev = input_allocate_device();
-
-	if (!input_dev) {
-		dev_err(&pdev->dev, "Unable to allocate the input device\n");
-		ret = -ENOMEM;
-		goto bail1;
-	}
-
-	ts.dev = input_dev;
-	ts.dev->evbit[0] = BIT_MASK(EV_SYN) | BIT_MASK(EV_KEY) |
-			   BIT_MASK(EV_ABS);
-	ts.dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
-	input_set_abs_params(ts.dev, ABS_X, 0, 0x3FF, 0, 0);
-	input_set_abs_params(ts.dev, ABS_Y, 0, 0x3FF, 0, 0);
-	input_set_abs_params(ts.dev, ABS_PRESSURE, 0, 1, 0, 0);
-
-	ts.dev->name = s3c2410ts_name;
-	ts.dev->id.bustype = BUS_RS232;
-	ts.dev->id.vendor = 0xDEAD;
-	ts.dev->id.product = 0xBEEF;
-	ts.dev->id.version = S3C2410TSVERSION;
-	ts.state = TS_STATE_STANDBY;
-	ts.event_fifo = kfifo_alloc(TS_EVENT_FIFO_SIZE, GFP_KERNEL, NULL);
-	if (IS_ERR(ts.event_fifo)) {
-		ret = -EIO;
-		goto bail2;
-	}
-
-	/* create the filter chain set up for the 2 coordinates we produce */
-	ts.chain = ts_filter_chain_create(pdev, info->filter_config, 2);
-
-	if (IS_ERR(ts.chain))
-		goto bail2;
-
-	ts_filter_chain_clear(ts.chain);
-
-	/* Get irqs */
-	if (request_irq(IRQ_ADC, stylus_action, IRQF_SAMPLE_RANDOM,
-						    "s3c2410_action", ts.dev)) {
-		dev_err(&pdev->dev, "Could not allocate ts IRQ_ADC !\n");
-		iounmap(base_addr);
-		ret = -EIO;
-		goto bail3;
-	}
-	if (request_irq(IRQ_TC, stylus_updown, IRQF_SAMPLE_RANDOM,
-			"s3c2410_action", ts.dev)) {
-		dev_err(&pdev->dev, "Could not allocate ts IRQ_TC !\n");
-		free_irq(IRQ_ADC, ts.dev);
-		iounmap(base_addr);
-		ret = -EIO;
-		goto bail4;
-	}
-
-	dev_info(&pdev->dev, "Successfully loaded\n");
-
-	/* All went ok, so register to the input system */
-	rc = input_register_device(ts.dev);
-	if (rc) {
-		ret = -EIO;
-		goto bail5;
-	}
-
-	return 0;
-
-bail5:
-	free_irq(IRQ_TC, ts.dev);
-	free_irq(IRQ_ADC, ts.dev);
-	clk_disable(adc_clock);
-	iounmap(base_addr);
-	disable_irq(IRQ_TC);
-bail4:
-	disable_irq(IRQ_ADC);
-bail3:
-	ts_filter_chain_destroy(ts.chain);
-	kfifo_free(ts.event_fifo);
-bail2:
-	input_unregister_device(ts.dev);
-bail1:
-	iounmap(base_addr);
-bail0:
-
-	return ret;
-}
-
-static int s3c2410ts_remove(struct platform_device *pdev)
-{
-	disable_irq(IRQ_ADC);
-	disable_irq(IRQ_TC);
-	free_irq(IRQ_TC,ts.dev);
-	free_irq(IRQ_ADC,ts.dev);
-
-	if (adc_clock) {
-		clk_disable(adc_clock);
-		clk_put(adc_clock);
-		adc_clock = NULL;
-	}
-
-	input_unregister_device(ts.dev);
-	iounmap(base_addr);
-
-	ts_filter_chain_destroy(ts.chain);
-
-	kfifo_free(ts.event_fifo);
-
-	return 0;
-}
-
-#ifdef CONFIG_PM
-static int s3c2410ts_suspend(struct platform_device *pdev, pm_message_t state)
-{
-	writel(TSC_SLEEP, base_addr+S3C2410_ADCTSC);
-	writel(readl(base_addr+S3C2410_ADCCON) | S3C2410_ADCCON_STDBM,
-	       base_addr+S3C2410_ADCCON);
-
-	disable_irq(IRQ_ADC);
-	disable_irq(IRQ_TC);
-
-	clk_disable(adc_clock);
-
-	return 0;
-}
-
-static int s3c2410ts_resume(struct platform_device *pdev)
-{
-	struct s3c2410_ts_mach_info *info =
-		( struct s3c2410_ts_mach_info *)pdev->dev.platform_data;
-
-	clk_enable(adc_clock);
-	mdelay(1);
-
-	ts_filter_chain_clear(ts.chain);
-
-	enable_irq(IRQ_ADC);
-	enable_irq(IRQ_TC);
-
-	if ((info->presc&0xff) > 0)
-		writel(S3C2410_ADCCON_PRSCEN |
-		       S3C2410_ADCCON_PRSCVL(info->presc&0xFF),
-						      base_addr+S3C2410_ADCCON);
-	else
-		writel(0,base_addr+S3C2410_ADCCON);
-
-	/* Initialise registers */
-	if ((info->delay & 0xffff) > 0)
-		writel(info->delay & 0xffff,  base_addr+S3C2410_ADCDLY);
-
-	writel(WAIT4INT(0), base_addr+S3C2410_ADCTSC);
-
-	return 0;
-}
-
-#else
-#define s3c2410ts_suspend NULL
-#define s3c2410ts_resume  NULL
-#endif
-
-static struct platform_driver s3c2410ts_driver = {
-       .driver         = {
-	       .name   = "s3c2410-ts",
-	       .owner  = THIS_MODULE,
-       },
-       .probe          = s3c2410ts_probe,
-       .remove         = s3c2410ts_remove,
-       .suspend        = s3c2410ts_suspend,
-       .resume         = s3c2410ts_resume,
-
-};
-
-static struct platform_driver s3c2440ts_driver = {
-       .driver         = {
-	       .name   = "s3c2440-ts",
-	       .owner  = THIS_MODULE,
-       },
-       .probe          = s3c2410ts_probe,
-       .remove         = s3c2410ts_remove,
-       .suspend        = s3c2410ts_suspend,
-       .resume         = s3c2410ts_resume,
-
-};
-
-static int __init s3c2410ts_init(void)
-{
-	int rc;
-
-	rc = platform_driver_register(&s3c2410ts_driver);
-	if (rc < 0)
-		return rc;
-
-	rc = platform_driver_register(&s3c2440ts_driver);
-	if (rc < 0)
-		platform_driver_unregister(&s3c2410ts_driver);
-
-	return rc;
-}
-
-static void __exit s3c2410ts_exit(void)
-{
-	platform_driver_unregister(&s3c2440ts_driver);
-	platform_driver_unregister(&s3c2410ts_driver);
-}
-
-module_init(s3c2410ts_init);
-module_exit(s3c2410ts_exit);
-
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/input/touchscreen/ts_filter_chain.c b/target/linux/s3c24xx/files-2.6.30/drivers/input/touchscreen/ts_filter_chain.c
deleted file mode 100644
index e6bb38270..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/input/touchscreen/ts_filter_chain.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Copyright (c) 2008,2009 Andy Green <andy@openmoko.com>
- */
-
-#include <linux/kernel.h>
-#include <linux/device.h>
-
-#include <linux/touchscreen/ts_filter_chain.h>
-#include <linux/touchscreen/ts_filter.h>
-
-/*
- * Tux, would you like the following function in /lib?
- * It helps us avoid silly code.
- */
-
-/**
- * sptrlen - Count how many non-null pointers are in a pointer array
- * @arr: The array of pointers
- */
-static int sptrlen(const void *arr)
-{
-	/* All pointers have the same size. */
-	const int **p = (const int **)arr;
-	int len = 0;
-
-	while (*(p++))
-		len++;
-
-	return len;
-}
-
-
-struct ts_filter_chain {
-	/* All of the filters. */
-	struct ts_filter **arr;
-	/* Filters that can propagate values in the chain. */
-	struct ts_filter **pchain;
-	/* Length of the pchain array. */
-	int pchain_len;
-	/* FIXME: Add a spinlock and use it. */
-};
-
-struct ts_filter_chain *ts_filter_chain_create(
-	struct platform_device *pdev,
-	const struct ts_filter_chain_configuration conf[],
-	int count_coords)
-{
-	struct ts_filter_chain *c;
-	int count = 0;
-	int len;
-
-	BUG_ON((count_coords < 1));
-	BUG_ON(count_coords > MAX_TS_FILTER_COORDS);
-
-	c = kzalloc(sizeof(struct ts_filter_chain), GFP_KERNEL);
-	if (!c)
-		goto create_err_1;
-
-	len = (sptrlen(conf) + 1);
-	/* Memory for two null-terminated arrays of filters. */
-	c->arr = kzalloc(2 * sizeof(struct ts_filter *) * len, GFP_KERNEL);
-	if (!c->arr)
-		goto create_err_1;
-	c->pchain = c->arr + len;
-
-	while (conf->api) {
-		/* TODO: Can we get away with only sending pdev->dev? */
-		struct ts_filter *f =
-			(conf->api->create)(pdev, conf->config, count_coords);
-		if (!f) {
-			dev_info(&pdev->dev, "Filter %d creation failed\n",
-				 count);
-			goto create_err_2;
-		}
-
-		f->api = conf->api;
-		c->arr[count++] = f;
-
-		if (f->api->haspoint && f->api->getpoint && f->api->process)
-			c->pchain[c->pchain_len++] = f;
-
-		conf++;
-	}
-
-	dev_info(&pdev->dev, "%d filter(s) initialized\n", count);
-
-	return c;
-
-create_err_2:
-	ts_filter_chain_destroy(c); /* Also frees c. */
-create_err_1:
-	dev_info(&pdev->dev, "Error in filter chain initialization\n");
-	/*
-	 * FIXME: Individual filters have to return errors this way.
-	 * We only have to forward the errors we find.
-	 */
-	return ERR_PTR(-ENOMEM);
-}
-EXPORT_SYMBOL_GPL(ts_filter_chain_create);
-
-void ts_filter_chain_destroy(struct ts_filter_chain *c)
-{
-	if (c->arr) {
-		struct ts_filter **a = c->arr;
-		while (*a) {
-			((*a)->api->destroy)(*a);
-			a++;
-		}
-		kfree(c->arr);
-	}
-	kfree(c);
-}
-EXPORT_SYMBOL_GPL(ts_filter_chain_destroy);
-
-void ts_filter_chain_clear(struct ts_filter_chain *c)
-{
-	struct ts_filter **a = c->arr;
-
-	while (*a) {
-		if ((*a)->api->clear)
-			((*a)->api->clear)(*a);
-		a++;
-	}
-}
-EXPORT_SYMBOL_GPL(ts_filter_chain_clear);
-
-static void ts_filter_chain_scale(struct ts_filter_chain *c, int *coords)
-{
-	struct ts_filter **a = c->arr;
-	while (*a) {
-		if ((*a)->api->scale)
-			((*a)->api->scale)(*a, coords);
-		a++;
-	}
-}
-
-int ts_filter_chain_feed(struct ts_filter_chain *c, int *coords)
-{
-	int len = c->pchain_len;
-	int i = len - 1;
-
-	if (!c->pchain[0])
-		return 1; /* Nothing to do. */
-
-	BUG_ON(c->pchain[0]->api->haspoint(c->pchain[0]));
-
-	if (c->pchain[0]->api->process(c->pchain[0], coords))
-		return -1;
-
-	while (i >= 0 && i < len) {
-		if (c->pchain[i]->api->haspoint(c->pchain[i])) {
-			c->pchain[i]->api->getpoint(c->pchain[i], coords);
-			if (++i < len &&
-			    c->pchain[i]->api->process(c->pchain[i], coords))
-				return -1; /* Error. */
-		} else {
-			i--;
-		}
-	}
-
-	if (i >= 0) {	/* Same as i == len. */
-		ts_filter_chain_scale(c, coords);
-		return 1;
-	}
-
-	return 0;
-}
-EXPORT_SYMBOL_GPL(ts_filter_chain_feed);
-
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/input/touchscreen/ts_filter_group.c b/target/linux/s3c24xx/files-2.6.30/drivers/input/touchscreen/ts_filter_group.c
deleted file mode 100644
index f53f16daf..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/input/touchscreen/ts_filter_group.c
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Copyright (C) 2008,2009 by Openmoko, Inc.
- * Author: Nelson Castillo <arhuaco@freaks-unidos.net>
- * All rights reserved.
- *
- *
- * This filter is useful to reject samples that are not reliable. We consider
- * that a sample is not reliable if it deviates form the Majority.
- *
- * 1) We collect S samples.
- *
- * 2) For each dimension:
- *
- *  - We sort the points.
- *  - Points that are "close enough" are considered to be in the same set.
- *  - We choose the set with more elements. If more than "threshold"
- *    points are in this set we use the first and the last point of the set
- *    to define the valid range for this dimension [min, max], otherwise we
- *    discard all the points and go to step 1.
- *
- * 3) We consider the unsorted S samples and try to feed them to the next
- *    filter in the chain. If one of the points of each sample
- *    is not in the allowed range for its dimension, we discard the sample.
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/sort.h>
-#include <linux/touchscreen/ts_filter_group.h>
-
-struct ts_filter_group {
-	/* Private filter configuration. */
-	struct ts_filter_group_configuration *config;
-	/* Filter API. */
-	struct ts_filter tsf;
-
-	int N;			/* How many samples we have. */
-	int *samples[MAX_TS_FILTER_COORDS];	/* The samples: our input. */
-
-	int *group_size;	/* Used for temporal computations. */
-	int *sorted_samples;	/* Used for temporal computations. */
-
-	int range_max[MAX_TS_FILTER_COORDS];	/* Max. computed ranges. */
-	int range_min[MAX_TS_FILTER_COORDS];	/* Min. computed ranges. */
-
-	int tries_left;		/* We finish if we don't get enough samples. */
-	int ready;		/* If we are ready to deliver samples. */
-	int result;		/* Index of the point being returned. */
-};
-
-#define ts_filter_to_filter_group(f) \
-	container_of(f, struct ts_filter_group, tsf)
-
-
-static void ts_filter_group_clear_internal(struct ts_filter_group *tsfg,
-					   int attempts)
-{
-	tsfg->N = 0;
-	tsfg->tries_left = attempts;
-	tsfg->ready = 0;
-	tsfg->result = 0;
-}
-
-static void ts_filter_group_clear(struct ts_filter *tsf)
-{
-	struct ts_filter_group *tsfg = ts_filter_to_filter_group(tsf);
-
-	ts_filter_group_clear_internal(tsfg, tsfg->config->attempts);
-}
-
-static struct ts_filter *ts_filter_group_create(
-	struct platform_device *pdev,
-	const struct ts_filter_configuration *conf,
-	int count_coords)
-{
-	struct ts_filter_group *tsfg;
-	int i;
-
-	tsfg = kzalloc(sizeof(struct ts_filter_group), GFP_KERNEL);
-	if (!tsfg)
-		return NULL;
-
-	tsfg->config = container_of(conf,
-				    struct ts_filter_group_configuration,
-				    config);
-	tsfg->tsf.count_coords = count_coords;
-
-	BUG_ON(tsfg->config->attempts <= 0);
-
-	tsfg->samples[0] = kmalloc((2 + count_coords) * sizeof(int) *
-				   tsfg->config->length, GFP_KERNEL);
-	if (!tsfg->samples[0]) {
-		kfree(tsfg);
-		return NULL;
-	}
-	for (i = 1; i < count_coords; ++i)
-		tsfg->samples[i] = tsfg->samples[0] + i * tsfg->config->length;
-	tsfg->sorted_samples = tsfg->samples[0] + count_coords *
-			       tsfg->config->length;
-	tsfg->group_size = tsfg->samples[0] + (1 + count_coords) *
-			       tsfg->config->length;
-
-	ts_filter_group_clear_internal(tsfg, tsfg->config->attempts);
-
-	dev_info(&pdev->dev, "Created Group filter len:%d coords:%d close:%d "
-		 "thresh:%d\n", tsfg->config->length, count_coords,
-		 tsfg->config->close_enough, tsfg->config->threshold);
-
-	return &tsfg->tsf;
-}
-
-static void ts_filter_group_destroy(struct ts_filter *tsf)
-{
-	struct ts_filter_group *tsfg = ts_filter_to_filter_group(tsf);
-
-	kfree(tsfg->samples[0]); /* first guy has pointer from kmalloc */
-	kfree(tsf);
-}
-
-static int int_cmp(const void *_a, const void *_b)
-{
-	const int *a = _a;
-	const int *b = _b;
-
-	if (*a > *b)
-		return 1;
-	if (*a < *b)
-		return -1;
-	return 0;
-}
-
-static void ts_filter_group_prepare_next(struct ts_filter *tsf);
-
-static int ts_filter_group_process(struct ts_filter *tsf, int *coords)
-{
-	struct ts_filter_group *tsfg = ts_filter_to_filter_group(tsf);
-	int n;
-	int i;
-
-	BUG_ON(tsfg->N >= tsfg->config->length);
-	BUG_ON(tsfg->ready);
-
-	for (n = 0; n < tsf->count_coords; n++)
-		tsfg->samples[n][tsfg->N] = coords[n];
-
-	if (++tsfg->N < tsfg->config->length)
-		return 0;	/* We need more samples. */
-
-	for (n = 0; n < tsfg->tsf.count_coords; n++) {
-		int *v = tsfg->sorted_samples;
-		int ngroups = 0;
-		int best_size;
-		int best_idx = 0;
-		int idx = 0;
-
-		memcpy(v, tsfg->samples[n], tsfg->N * sizeof(int));
-		/*
-		 * FIXME: Remove this sort call. We already have the
-		 * algorithm for this modification. The filter will
-		 * need less points (about half) if there is not a
-		 * lot of noise. Right now we are doing a constant
-		 * amount of work no matter how much noise we are
-		 * dealing with.
-		 */
-		sort(v, tsfg->N, sizeof(int), int_cmp, NULL);
-
-		tsfg->group_size[0] = 1;
-		for (i = 1; i < tsfg->N; ++i) {
-			if (v[i] - v[i - 1] <= tsfg->config->close_enough)
-				tsfg->group_size[ngroups]++;
-			else
-				tsfg->group_size[++ngroups] = 1;
-		}
-		ngroups++;
-
-		best_size = tsfg->group_size[0];
-		for (i = 1; i < ngroups; i++) {
-			idx += tsfg->group_size[i - 1];
-			if (best_size < tsfg->group_size[i]) {
-				best_size = tsfg->group_size[i];
-				best_idx = idx;
-			}
-		}
-
-		if (best_size < tsfg->config->threshold) {
-			/* This set is not good enough for us. */
-			if (--tsfg->tries_left) {
-				ts_filter_group_clear_internal
-					(tsfg, tsfg->tries_left);
-				/* No errors but we need more samples. */
-				return 0;
-			}
-			return 1; /* We give up: error. */
-		}
-
-		tsfg->range_min[n] = v[best_idx];
-		tsfg->range_max[n] = v[best_idx + best_size - 1];
-	}
-
-	ts_filter_group_prepare_next(tsf);
-
-	return 0;
-}
-
-/*
- * This private function prepares a point that will be returned
- * in ts_filter_group_getpoint if it is available. It updates
- * the priv->ready state also.
- */
-static void ts_filter_group_prepare_next(struct ts_filter *tsf)
-{
-	struct ts_filter_group *priv = ts_filter_to_filter_group(tsf);
-	int n;
-
-	while (priv->result < priv->N) {
-		for (n = 0; n < priv->tsf.count_coords; ++n) {
-			if (priv->samples[n][priv->result] <
-			    priv->range_min[n] ||
-			    priv->samples[n][priv->result] > priv->range_max[n])
-				break;
-		}
-
-		if (n == priv->tsf.count_coords) /* Sample is OK. */
-			break;
-
-		priv->result++;
-	}
-
-	if (unlikely(priv->result >= priv->N)) { /* No sample to deliver. */
-		ts_filter_group_clear_internal(priv, priv->config->attempts);
-		priv->ready = 0;
-	} else {
-		priv->ready = 1;
-	}
-}
-
-static int ts_filter_group_haspoint(struct ts_filter *tsf)
-{
-	struct ts_filter_group *priv = ts_filter_to_filter_group(tsf);
-
-	return priv->ready;
-}
-
-static void ts_filter_group_getpoint(struct ts_filter *tsf, int *point)
-{
-	struct ts_filter_group *priv = ts_filter_to_filter_group(tsf);
-	int n;
-
-	BUG_ON(!priv->ready);
-
-	for (n = 0; n < priv->tsf.count_coords; n++)
-		point[n] = priv->samples[n][priv->result];
-
-	priv->result++;
-
-	/* This call will update priv->ready. */
-	ts_filter_group_prepare_next(tsf);
-}
-
-/*
- * Get ready to process the next batch of points, forget
- * points we could have delivered.
- */
-static void ts_filter_group_scale(struct ts_filter *tsf, int *coords)
-{
-	struct ts_filter_group *priv = ts_filter_to_filter_group(tsf);
-
-	ts_filter_group_clear_internal(priv, priv->config->attempts);
-}
-
-const struct ts_filter_api ts_filter_group_api = {
-	.create =	ts_filter_group_create,
-	.destroy =	ts_filter_group_destroy,
-	.clear =	ts_filter_group_clear,
-	.process =	ts_filter_group_process,
-	.haspoint =	ts_filter_group_haspoint,
-	.getpoint =	ts_filter_group_getpoint,
-	.scale =	ts_filter_group_scale,
-};
-EXPORT_SYMBOL_GPL(ts_filter_group_api);
-
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/input/touchscreen/ts_filter_linear.c b/target/linux/s3c24xx/files-2.6.30/drivers/input/touchscreen/ts_filter_linear.c
deleted file mode 100644
index 0a595c599..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/input/touchscreen/ts_filter_linear.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * 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; version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Copyright (C) 2008,2009 by Openmoko, Inc.
- * Author: Nelson Castillo <arhuaco@freaks-unidos.net>
- * All rights reserved.
- *
- * Linearly scale touchscreen values.
- *
- * Expose the TS_FILTER_LINEAR_NCONSTANTS for the linear transformation
- * using sysfs.
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/string.h>
-
-#include <linux/touchscreen/ts_filter_linear.h>
-
-struct ts_filter_linear;
-
-/* Sysfs code. */
-
-struct const_obj {
-	/* The actual private object. */
-	struct ts_filter_linear *tsfl;
-	/* Our kobject. */
-	struct kobject kobj;
-};
-
-#define to_const_obj(x) container_of(x, struct const_obj, kobj)
-
-struct const_attribute {
-	struct attribute attr;
-	ssize_t (*show)(struct const_obj *const, struct const_attribute *attr,
-			char *buf);
-	ssize_t (*store)(struct const_obj *const, struct const_attribute *attr,
-			 const char *buf, size_t count);
-};
-
-#define to_const_attr(x) container_of(x, struct const_attribute, attr)
-
-
-/* Private linear filter structure. */
-
-struct ts_filter_linear {
-	/* Private configuration for this filter. */
-	struct ts_filter_linear_configuration *config;
-
-	/* Generic filter API. */
-	struct ts_filter tsf;
-
-	/* Linear constants for the transformation. */
-	int constants[TS_FILTER_LINEAR_NCONSTANTS];
-
-	/* Sysfs. */
-
-	/* Our const_object. */
-	struct const_obj c_obj;
-	/* Our type. We will stick operations to it. */
-	struct kobj_type const_ktype;
-	/* Attrs. of the virtual files. */
-	struct const_attribute kattrs[TS_FILTER_LINEAR_NCONSTANTS];
-	/* Default Attrs. Always NULL for us. */
-	struct attribute *attrs[TS_FILTER_LINEAR_NCONSTANTS + 1];
-	/* Storage for the name of the virtual files. */
-	char attr_names[TS_FILTER_LINEAR_NCONSTANTS][2];
-};
-
-#define ts_filter_to_filter_linear(f) \
-	container_of(f, struct ts_filter_linear, tsf)
-
-/* Sysfs functions. */
-
-static ssize_t const_attr_show(struct kobject *kobj,
-			       struct attribute *attr,
-			       char *buf)
-{
-	struct const_attribute *a = to_const_attr(attr);
-
-	return a->show(to_const_obj(kobj), a, buf);
-}
-
-static ssize_t const_attr_store(struct kobject *kobj,
-				struct attribute *attr,
-				const char *buf, size_t len)
-{
-	struct const_attribute *a = to_const_attr(attr);
-
-	return a->store(to_const_obj(kobj), a, buf, len);
-}
-
-static struct sysfs_ops const_sysfs_ops = {
-	.show =		const_attr_show,
-	.store =	const_attr_store,
-};
-
-static void const_release(struct kobject *kobj)
-{
-	kfree(to_const_obj(kobj)->tsfl);
-}
-
-static ssize_t const_show(struct const_obj *obj, struct const_attribute *attr,
-			  char *buf)
-{
-	int who;
-
-	sscanf(attr->attr.name, "%d", &who);
-	return sprintf(buf, "%d\n", obj->tsfl->constants[who]);
-}
-
-static ssize_t const_store(struct const_obj *obj, struct const_attribute *attr,
-			   const char *buf, size_t count)
-{
-	int who;
-
-	sscanf(attr->attr.name, "%d", &who);
-	sscanf(buf, "%d", &obj->tsfl->constants[who]);
-	return count;
-}
-
-/* Filter functions. */
-
-static struct ts_filter *ts_filter_linear_create(
-	struct platform_device *pdev,
-	const struct ts_filter_configuration *conf,
-	int count_coords)
-{
-	struct ts_filter_linear *tsfl;
-	int i;
-	int ret;
-
-	tsfl = kzalloc(sizeof(struct ts_filter_linear), GFP_KERNEL);
-	if (!tsfl)
-		return NULL;
-
-	tsfl->config = container_of(conf,
-				    struct ts_filter_linear_configuration,
-				    config);
-
-	tsfl->tsf.count_coords = count_coords;
-
-	for (i = 0; i < TS_FILTER_LINEAR_NCONSTANTS; ++i) {
-		tsfl->constants[i] = tsfl->config->constants[i];
-
-		/* sysfs */
-		sprintf(tsfl->attr_names[i], "%d", i);
-		tsfl->kattrs[i].attr.name = tsfl->attr_names[i];
-		tsfl->kattrs[i].attr.mode = 0666;
-		tsfl->kattrs[i].show = const_show;
-		tsfl->kattrs[i].store = const_store;
-		tsfl->attrs[i] = &tsfl->kattrs[i].attr;
-	}
-	tsfl->attrs[i] = NULL;
-
-	tsfl->const_ktype.sysfs_ops = &const_sysfs_ops;
-	tsfl->const_ktype.release = const_release;
-	tsfl->const_ktype.default_attrs = tsfl->attrs;
-	tsfl->c_obj.tsfl = tsfl; /* kernel frees tsfl in const_release */
-
-	ret = kobject_init_and_add(&tsfl->c_obj.kobj, &tsfl->const_ktype,
-				   &pdev->dev.kobj, "calibration");
-	if (ret) {
-		kobject_put(&tsfl->c_obj.kobj);
-		return NULL;
-	}
-
-	dev_info(&pdev->dev, "Created Linear filter coords:%d\n", count_coords);
-
-	return &tsfl->tsf;
-}
-
-static void ts_filter_linear_destroy(struct ts_filter *tsf)
-{
-	struct ts_filter_linear *tsfl = ts_filter_to_filter_linear(tsf);
-
-	/* Kernel frees tsfl in const_release. */
-	kobject_put(&tsfl->c_obj.kobj);
-}
-
-static void ts_filter_linear_scale(struct ts_filter *tsf, int *coords)
-{
-	struct ts_filter_linear *tsfl = ts_filter_to_filter_linear(tsf);
-
-	int *k = tsfl->constants;
-	int c0 = coords[tsfl->config->coord0];
-	int c1 = coords[tsfl->config->coord1];
-
-	coords[tsfl->config->coord0] = (k[2] + k[0] * c0 + k[1] * c1) / k[6];
-	coords[tsfl->config->coord1] = (k[5] + k[3] * c0 + k[4] * c1) / k[6];
-}
-
-const struct ts_filter_api ts_filter_linear_api = {
-	.create =	ts_filter_linear_create,
-	.destroy =	ts_filter_linear_destroy,
-	.scale =	ts_filter_linear_scale,
-};
-EXPORT_SYMBOL_GPL(ts_filter_linear_api);
-
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/input/touchscreen/ts_filter_mean.c b/target/linux/s3c24xx/files-2.6.30/drivers/input/touchscreen/ts_filter_mean.c
deleted file mode 100644
index 8b85f676f..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/input/touchscreen/ts_filter_mean.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Copyright (c) 2008,2009
- *       Andy Green <andy@openmoko.com>
- *       Nelson Castillo <arhuaco@freaks-unidos.net>
- *
- * Simple mean filter.
- *
- */
-
-#include <linux/errno.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-
-#include <linux/touchscreen/ts_filter_mean.h>
-
-struct ts_filter_mean {
-	/* Copy of the private filter configuration. */
-	struct ts_filter_mean_configuration *config;
-	/* Filter API. */
-	struct ts_filter tsf;
-
-	/* Index on a circular buffer. */
-	int curr;
-	/* Useful to tell if the circular buffer is full(read:ready). */
-	int count;
-	/* Sumation used to compute the mean. */
-	int sum[MAX_TS_FILTER_COORDS];
-	/* Keep point values and decrement them from the sum on time. */
-	int *fifo[MAX_TS_FILTER_COORDS];
-	/* Store the output of this filter. */
-	int ready;
-};
-
-#define ts_filter_to_filter_mean(f) container_of(f, struct ts_filter_mean, tsf)
-
-
-static void ts_filter_mean_clear(struct ts_filter *tsf);
-
-static struct ts_filter *ts_filter_mean_create(
-	struct platform_device *pdev,
-	const struct ts_filter_configuration *conf,
-	int count_coords)
-{
-	struct ts_filter_mean *priv;
-	int *v;
-	int n;
-
-	priv = kzalloc(sizeof(struct ts_filter_mean), GFP_KERNEL);
-	if (!priv)
-		return NULL;
-
-	priv->tsf.count_coords = count_coords;
-	priv->config = container_of(conf,
-				    struct ts_filter_mean_configuration,
-				    config);
-
-	BUG_ON(priv->config->length <= 0);
-
-	v = kmalloc(priv->config->length * sizeof(int) * count_coords,
-		    GFP_KERNEL);
-	if (!v)
-		return NULL;
-
-	for (n = 0; n < count_coords; n++) {
-		priv->fifo[n] = v;
-		v += priv->config->length;
-	}
-
-	ts_filter_mean_clear(&priv->tsf);
-
-	dev_info(&pdev->dev, "Created Mean filter len:%d coords:%d\n",
-		 priv->config->length, count_coords);
-
-	return &priv->tsf;
-}
-
-static void ts_filter_mean_destroy(struct ts_filter *tsf)
-{
-	struct ts_filter_mean *priv = ts_filter_to_filter_mean(tsf);
-
-	kfree(priv->fifo[0]); /* first guy has pointer from kmalloc */
-	kfree(tsf);
-}
-
-static void ts_filter_mean_clear(struct ts_filter *tsf)
-{
-	struct ts_filter_mean *priv = ts_filter_to_filter_mean(tsf);
-
-	priv->count = 0;
-	priv->curr = 0;
-	priv->ready = 0;
-	memset(priv->sum, 0, tsf->count_coords * sizeof(int));
-}
-
-static int ts_filter_mean_process(struct ts_filter *tsf, int *coords)
-{
-	struct ts_filter_mean *priv = ts_filter_to_filter_mean(tsf);
-	int n;
-
-	BUG_ON(priv->ready);
-
-	for (n = 0; n < tsf->count_coords; n++) {
-		priv->sum[n] += coords[n];
-		priv->fifo[n][priv->curr] = coords[n];
-	}
-
-	if (priv->count + 1 == priv->config->length)
-		priv->ready = 1;
-	else
-		priv->count++;
-
-	priv->curr = (priv->curr + 1) % priv->config->length;
-
-	return 0; /* No error. */
-}
-
-static int ts_filter_mean_haspoint(struct ts_filter *tsf)
-{
-	struct ts_filter_mean *priv = ts_filter_to_filter_mean(tsf);
-
-	return priv->ready;
-}
-
-static void ts_filter_mean_getpoint(struct ts_filter *tsf, int *point)
-{
-	struct ts_filter_mean *priv = ts_filter_to_filter_mean(tsf);
-	int n;
-
-	BUG_ON(!priv->ready);
-
-	for (n = 0; n < tsf->count_coords; n++) {
-		point[n] = priv->sum[n];
-		priv->sum[n] -= priv->fifo[n][priv->curr];
-	}
-
-	priv->ready = 0;
-}
-
-static void ts_filter_mean_scale(struct ts_filter *tsf, int *coords)
-{
-	int n;
-	struct ts_filter_mean *priv = ts_filter_to_filter_mean(tsf);
-
-	for (n = 0; n < tsf->count_coords; n++) {
-		coords[n] += priv->config->length >> 1; /* Rounding. */
-		coords[n] /= priv->config->length;
-	}
-}
-
-const struct ts_filter_api ts_filter_mean_api = {
-	.create =	ts_filter_mean_create,
-	.destroy =	ts_filter_mean_destroy,
-	.clear =	ts_filter_mean_clear,
-	.process =	ts_filter_mean_process,
-	.scale =	ts_filter_mean_scale,
-	.haspoint =	ts_filter_mean_haspoint,
-	.getpoint =	ts_filter_mean_getpoint,
-};
-EXPORT_SYMBOL_GPL(ts_filter_mean_api);
-
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/input/touchscreen/ts_filter_median.c b/target/linux/s3c24xx/files-2.6.30/drivers/input/touchscreen/ts_filter_median.c
deleted file mode 100644
index 4c230f174..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/input/touchscreen/ts_filter_median.c
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Copyright (c) 2008 Andy Green <andy@openmoko.com>
- *
- *
- * Median averaging stuff.  We sort incoming raw samples into an array of
- * MEDIAN_SIZE length, discarding the oldest sample each time once we are full.
- * We then return the sum of the middle three samples for X and Y.  It means
- * the final result must be divided by (3 * scaling factor) to correct for
- * avoiding the repeated /3.
- *
- * This strongly rejects brief excursions away from a central point that is
- * sticky in time compared to the excursion duration.
- *
- * Thanks to Dale Schumacher (who wrote some example code) and Carl-Daniel
- * Halifinger who pointed out this would be a good method.
- */
-
-#include <linux/errno.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/touchscreen/ts_filter_median.h>
-
-struct ts_filter_median {
-	/* Private configuration. */
-	struct ts_filter_median_configuration *config;
-	/* Generic Filter API. */
-	struct ts_filter tsf;
-
-	/* Count raw samples we get. */
-	int samples_count;
-	/*
-	 * Remember the last coordinates we got in order to know if
-	 * we are moving slow or fast.
-	 */
-	int last_issued[MAX_TS_FILTER_COORDS];
-	/* How many samples in the sort buffer are valid. */
-	int valid;
-	/* Samples taken for median in sorted form. */
-	int *sort[MAX_TS_FILTER_COORDS];
-	/* Samples taken for median. */
-	int *fifo[MAX_TS_FILTER_COORDS];
-	/* Where we are in the fifo sample memory. */
-	int pos;
-	/* Do we have a sample to deliver? */
-	int ready;
-};
-
-#define ts_filter_to_filter_median(f) \
-	container_of(f, struct ts_filter_median, tsf)
-
-
-static void ts_filter_median_insert(int *p, int sample, int count)
-{
-	int n;
-
-	/* Search through what we got so far to find where to put sample. */
-	for (n = 0; n < count; n++)
-		if (sample < p[n]) {	/* We met somebody bigger than us? */
-			/* Starting from the end, push bigger guys down one. */
-			for (count--; count >= n; count--)
-				p[count + 1] = p[count];
-			p[n] = sample; /* Put us in place of first bigger. */
-			return;
-		}
-
-	p[count] = sample; /* Nobody was bigger than us, add us on the end. */
-}
-
-static void ts_filter_median_del(int *p, int value, int count)
-{
-	int index;
-
-	for (index = 0; index < count; index++)
-		if (p[index] == value) {
-			for (; index < count; index++)
-				p[index] = p[index + 1];
-			return;
-		}
-}
-
-
-static void ts_filter_median_clear(struct ts_filter *tsf)
-{
-	struct ts_filter_median *tsfm = ts_filter_to_filter_median(tsf);
-
-	tsfm->pos = 0;
-	tsfm->valid = 0;
-	tsfm->ready = 0;
-	memset(&tsfm->last_issued[0], 1, tsf->count_coords * sizeof(int));
-}
-
-static struct ts_filter *ts_filter_median_create(
-	struct platform_device *pdev,
-	const struct ts_filter_configuration *conf,
-	int count_coords)
-{
-	int *p;
-	int n;
-	struct ts_filter_median *tsfm = kzalloc(sizeof(struct ts_filter_median),
-								    GFP_KERNEL);
-
-	if (!tsfm)
-		return NULL;
-
-	tsfm->config = container_of(conf,
-				    struct ts_filter_median_configuration,
-				    config);
-
-	tsfm->tsf.count_coords = count_coords;
-
-	tsfm->config->midpoint = (tsfm->config->extent >> 1) + 1;
-
-	p = kmalloc(2 * count_coords * sizeof(int) * (tsfm->config->extent + 1),
-		    GFP_KERNEL);
-	if (!p) {
-		kfree(tsfm);
-		return NULL;
-	}
-
-	for (n = 0; n < count_coords; n++) {
-		tsfm->sort[n] = p;
-		p += tsfm->config->extent + 1;
-		tsfm->fifo[n] = p;
-		p += tsfm->config->extent + 1;
-	}
-
-	ts_filter_median_clear(&tsfm->tsf);
-
-	dev_info(&pdev->dev,
-		 "Created Median filter len:%d coords:%d dec_threshold:%d\n",
-		 tsfm->config->extent, count_coords,
-		 tsfm->config->decimation_threshold);
-
-	return &tsfm->tsf;
-}
-
-static void ts_filter_median_destroy(struct ts_filter *tsf)
-{
-	struct ts_filter_median *tsfm = ts_filter_to_filter_median(tsf);
-
-	kfree(tsfm->sort[0]); /* First guy has pointer from kmalloc. */
-	kfree(tsf);
-}
-
-static void ts_filter_median_scale(struct ts_filter *tsf, int *coords)
-{
-	int n;
-
-	for (n = 0; n < tsf->count_coords; n++)
-		coords[n] = (coords[n] + 2) / 3;
-}
-
-/*
- * Give us the raw sample data coords, and if we return 1 then you can
- * get a filtered coordinate from coords. If we return 0 you didn't
- * fill all the filters with samples yet.
- */
-
-static int ts_filter_median_process(struct ts_filter *tsf, int *coords)
-{
-	struct ts_filter_median *tsfm = ts_filter_to_filter_median(tsf);
-	int n;
-	int movement = 1;
-
-	for (n = 0; n < tsf->count_coords; n++) {
-		/* Grab copy in insertion order to remove when oldest. */
-		tsfm->fifo[n][tsfm->pos] = coords[n];
-		/* Insert these samples in sorted order in the median arrays. */
-		ts_filter_median_insert(tsfm->sort[n], coords[n], tsfm->valid);
-	}
-	/* Move us on in the fifo. */
-	if (++tsfm->pos == (tsfm->config->extent + 1))
-		tsfm->pos = 0;
-
-	/* Have we finished a median sampling? */
-	if (++tsfm->valid < tsfm->config->extent)
-		goto process_exit; /* No valid sample to use. */
-
-	BUG_ON(tsfm->valid != tsfm->config->extent);
-
-	tsfm->valid--;
-
-	/*
-	 * Sum the middle 3 in the median sorted arrays. We don't divide back
-	 * down which increases the sum resolution by a factor of 3 until the
-	 * scale API function is called.
-	 */
-	for (n = 0; n < tsf->count_coords; n++)
-		/* Perform the deletion of the oldest sample. */
-		ts_filter_median_del(tsfm->sort[n], tsfm->fifo[n][tsfm->pos],
-				     tsfm->valid);
-
-	tsfm->samples_count--;
-	if (tsfm->samples_count >= 0)
-		goto process_exit;
-
-	for (n = 0; n < tsf->count_coords; n++) {
-		/* Give the coordinate result from summing median 3. */
-		coords[n] = tsfm->sort[n][tsfm->config->midpoint - 1] +
-			    tsfm->sort[n][tsfm->config->midpoint] +
-			    tsfm->sort[n][tsfm->config->midpoint + 1];
-
-		movement += abs(tsfm->last_issued[n] - coords[n]);
-	}
-
-	if (movement > tsfm->config->decimation_threshold) /* Moving fast. */
-		tsfm->samples_count = tsfm->config->decimation_above;
-	else
-		tsfm->samples_count = tsfm->config->decimation_below;
-
-	memcpy(&tsfm->last_issued[0], coords, tsf->count_coords * sizeof(int));
-
-	tsfm->ready = 1;
-
-process_exit:
-	return 0;
-}
-
-static int ts_filter_median_haspoint(struct ts_filter *tsf)
-{
-	struct ts_filter_median *priv = ts_filter_to_filter_median(tsf);
-
-	return priv->ready;
-}
-
-static void ts_filter_median_getpoint(struct ts_filter *tsf, int *point)
-{
-	struct ts_filter_median *priv = ts_filter_to_filter_median(tsf);
-
-	BUG_ON(!priv->ready);
-
-	memcpy(point, &priv->last_issued[0], tsf->count_coords * sizeof(int));
-
-	priv->ready = 0;
-}
-
-const struct ts_filter_api ts_filter_median_api = {
-	.create =	ts_filter_median_create,
-	.destroy =	ts_filter_median_destroy,
-	.clear =	ts_filter_median_clear,
-	.process =	ts_filter_median_process,
-	.scale =	ts_filter_median_scale,
-	.haspoint =	ts_filter_median_haspoint,
-	.getpoint =	ts_filter_median_getpoint,
-};
-EXPORT_SYMBOL_GPL(ts_filter_median_api);
-
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/leds/leds-gta02-vibrator.c b/target/linux/s3c24xx/files-2.6.30/drivers/leds/leds-gta02-vibrator.c
deleted file mode 100644
index 41dd77430..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/leds/leds-gta02-vibrator.c
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * LED driver for the vibrator of the Openmoko GTA01/GTA02 GSM Phones
- *
- * (C) 2006-2008 by Openmoko, Inc.
- * Author: Harald Welte <laforge@openmoko.org>
- * All rights reserved.
- *
- * 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.
- *
- * Javi Roman <javiroman@kernel-labs.org>:
- *	Implement PWM support for GTA01Bv4 and later
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/leds.h>
-#include <mach/hardware.h>
-#include <asm/mach-types.h>
-#include <plat/pwm.h>
-#include <mach/regs-gpio.h>
-#include <plat/regs-timer.h>
-#include <linux/gta02-vibrator.h>
-
-#define COUNTER 64
-
-static struct gta02_vib_priv {
-	struct led_classdev cdev;
-	unsigned int gpio;
-	spinlock_t lock;
-	unsigned int has_pwm;
-	struct s3c2410_pwm pwm;
-
-	unsigned long vib_gpio_pin; /* which pin to meddle with */
-	u8 vib_pwm; /* 0 = OFF -- will ensure GPIO deasserted and stop FIQ */
-	u8 vib_pwm_latched;
-	u32 fiq_count;
-
-	struct gta02_vib_platform_data *pdata;
-} gta02_vib_priv;
-
-int gta02_vibrator_fiq_handler(void)
-{
-	gta02_vib_priv.fiq_count++;
-
-	if (!gta02_vib_priv.vib_pwm_latched && !gta02_vib_priv.vib_pwm)
-		/* idle */
-		return 0;
-
-	if ((u8)gta02_vib_priv.fiq_count == gta02_vib_priv.vib_pwm_latched)
-		s3c2410_gpio_setpin(gta02_vib_priv.vib_gpio_pin, 0);
-
-	if ((u8)gta02_vib_priv.fiq_count)
-		return 1;
-
-	gta02_vib_priv.vib_pwm_latched = gta02_vib_priv.vib_pwm;
-	if (gta02_vib_priv.vib_pwm_latched)
-		s3c2410_gpio_setpin(gta02_vib_priv.vib_gpio_pin, 1);
-
-	return 1;
-}
-
-static void gta02_vib_vib_set(struct led_classdev *led_cdev,
-				enum led_brightness value)
-{
-    gta02_vib_priv.vib_pwm = value; /* set it for FIQ */
-    gta02_vib_priv.pdata->kick_fiq(); /* start up FIQs if not already going */
-}
-
-static struct gta02_vib_priv gta02_vib_led = {
-	.cdev = {
-		.name = "gta02:vibrator",
-		.brightness_set = gta02_vib_vib_set,
-	},
-};
-
-static int gta02_vib_init_hw(struct gta02_vib_priv *vp)
-{
-	int rc;
-
-	rc = s3c2410_pwm_init(&vp->pwm);
-	if (rc)
-		return rc;
-
-	vp->pwm.timerid = PWM3;
-	/* use same prescaler as arch/arm/plat-s3c24xx/time.c */
-	vp->pwm.prescaler = (6 - 1) / 2;
-	vp->pwm.divider = S3C2410_TCFG1_MUX3_DIV2;
-	vp->pwm.counter = COUNTER;
-	vp->pwm.comparer = COUNTER;
-
-	rc = s3c2410_pwm_enable(&vp->pwm);
-	if (rc)
-		return rc;
-
-	s3c2410_pwm_start(&vp->pwm);
-
-	return 0;
-}
-
-#ifdef CONFIG_PM
-static int gta02_vib_suspend(struct platform_device *dev, pm_message_t state)
-{
-	led_classdev_suspend(&gta02_vib_led.cdev);
-	if (gta02_vib_priv.pdata)
-		gta02_vib_priv.pdata->disable_fiq();
-	return 0;
-}
-
-static int gta02_vib_resume(struct platform_device *dev)
-{
-	struct gta02_vib_priv *vp = platform_get_drvdata(dev);
-
-	if (vp->has_pwm)
-		gta02_vib_init_hw(vp);
-
-	led_classdev_resume(&gta02_vib_led.cdev);
-	if (gta02_vib_priv.pdata)
-		gta02_vib_priv.pdata->enable_fiq();
-
-	return 0;
-}
-#endif /* CONFIG_PM */
-
-static int __init gta02_vib_probe(struct platform_device *pdev)
-{
-	struct resource *r;
-
-	r = platform_get_resource(pdev, 0, 0);
-	if (!r || !r->start)
-		return -EIO;
-
-	gta02_vib_led.gpio = r->start;
-
-	gta02_vib_priv.pdata = pdev->dev.platform_data;
-	platform_set_drvdata(pdev, &gta02_vib_led);
-
-    s3c2410_gpio_setpin(gta02_vib_led.gpio, 0); /* off */
-    s3c2410_gpio_cfgpin(gta02_vib_led.gpio, S3C2410_GPIO_OUTPUT);
-    /* safe, kmalloc'd copy needed for FIQ ISR */
-    gta02_vib_priv.vib_gpio_pin = gta02_vib_led.gpio;
-    gta02_vib_priv.vib_pwm = 0; /* off */
-	spin_lock_init(&gta02_vib_led.lock);
-
-	return led_classdev_register(&pdev->dev, &gta02_vib_led.cdev);
-}
-
-static int gta02_vib_remove(struct platform_device *pdev)
-{
-    gta02_vib_priv.vib_pwm = 0; /* off */
-	/* would only need kick if already off so no kick needed */
-
-	if (gta02_vib_led.has_pwm)
-		s3c2410_pwm_disable(&gta02_vib_led.pwm);
-
-	led_classdev_unregister(&gta02_vib_led.cdev);
-
-	return 0;
-}
-
-static struct platform_driver gta02_vib_driver = {
-	.probe		= gta02_vib_probe,
-	.remove		= gta02_vib_remove,
-#ifdef CONFIG_PM
-	.suspend	= gta02_vib_suspend,
-	.resume		= gta02_vib_resume,
-#endif
-	.driver		= {
-		.name		= "gta02-vibrator",
-	},
-};
-
-static int __init gta02_vib_init(void)
-{
-	return platform_driver_register(&gta02_vib_driver);
-}
-
-static void __exit gta02_vib_exit(void)
-{
-	platform_driver_unregister(&gta02_vib_driver);
-}
-
-module_init(gta02_vib_init);
-module_exit(gta02_vib_exit);
-
-MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
-MODULE_DESCRIPTION("Openmoko Freerunner vibrator driver");
-MODULE_LICENSE("GPL");
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/Kconfig b/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/Kconfig
deleted file mode 100644
index 8c93bcbdb..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/Kconfig
+++ /dev/null
@@ -1,41 +0,0 @@
-config MFD_GLAMO
-	bool "Smedia Glamo 336x/337x support"
-	select MFD_CORE
-	help
-	  This enables the core driver for the Smedia Glamo 336x/337x
-	  multi-function device.  It includes irq_chip demultiplex as
-	  well as clock / power management and GPIO support.
-
-config MFD_GLAMO_FB
-	tristate "Smedia Glamo 336x/337x framebuffer support"
-	depends on FB && MFD_GLAMO
-	select FB_CFB_FILLRECT
-	select FB_CFB_COPYAREA
-	select FB_CFB_IMAGEBLIT
-	help
-	  Frame buffer driver for the LCD controller in the Smedia Glamo
-	  336x/337x.
-
-	  This driver is also available as a module ( = code which can be
-	  inserted and removed from the running kernel whenever you want). The
-	  module will be called glamofb. If you want to compile it as a module,
-	  say M here and read <file:Documentation/modules.txt>.
-
-	  If unsure, say N.
-
-config MFD_GLAMO_GPIO
-	tristate "Glamo GPIO support"
-	depends on MFD_GLAMO
-
-	help
-		Enable a bitbanging SPI adapter driver for the Smedia Glamo.
-
-config MFD_GLAMO_MCI
-	tristate "Glamo S3C SD/MMC Card Interface support"
-	depends on MFD_GLAMO && MMC && REGULATOR
-	help
-	  This selects a driver for the MCI interface found in
-	  the S-Media GLAMO chip, as used in Openmoko
-	  neo1973 GTA-02.
-
-	  If unsure, say N.
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/Makefile b/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/Makefile
deleted file mode 100644
index ebf26f7e4..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Makefile for the Smedia Glamo framebuffer driver
-#
-
-obj-$(CONFIG_MFD_GLAMO)			+= glamo-core.o
-obj-$(CONFIG_MFD_GLAMO_GPIO)		+= glamo-gpio.o
-obj-$(CONFIG_MFD_GLAMO_SPI)		+= glamo-spi.o
-
-obj-$(CONFIG_MFD_GLAMO_FB)		+= glamo-fb.o
-obj-$(CONFIG_MFD_GLAMO_MCI)		+= glamo-mci.o
-
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-core.c b/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-core.c
deleted file mode 100644
index 10f2c7a2a..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-core.c
+++ /dev/null
@@ -1,1301 +0,0 @@
-/* Smedia Glamo 336x/337x driver
- *
- * (C) 2007 by Openmoko, Inc.
- * Author: Harald Welte <laforge@openmoko.org>
- * All rights reserved.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/string.h>
-#include <linux/mm.h>
-#include <linux/delay.h>
-#include <linux/fb.h>
-#include <linux/init.h>
-#include <linux/irq.h>
-#include <linux/interrupt.h>
-#include <linux/workqueue.h>
-#include <linux/platform_device.h>
-#include <linux/kernel_stat.h>
-#include <linux/spinlock.h>
-#include <linux/mfd/core.h>
-#include <linux/mfd/glamo.h>
-#include <linux/glamofb.h>
-#include <linux/io.h>
-
-#include <asm/div64.h>
-
-#include <linux/pm.h>
-
-#include "glamo-regs.h"
-#include "glamo-core.h"
-
-#define GLAMO_MEM_REFRESH_COUNT 0x100
-
-/*
- * Glamo internal settings
- *
- * We run the memory interface from the faster PLLB on 2.6.28 kernels and
- * above.  Couple of GTA02 users report trouble with memory bus when they
- * upgraded from 2.6.24.  So this parameter allows reversion to 2.6.24
- * scheme if their Glamo chip needs it.
- *
- * you can override the faster default on kernel commandline using
- *
- *   glamo3362.slow_memory=1
- *
- * for example
- */
-
-static int slow_memory = 0;
-module_param(slow_memory, int, 0644);
-
-struct reg_range {
-	int start;
-	int count;
-	char *name;
-	char dump;
-};
-
-struct reg_range reg_range[] = {
-	{ 0x0000, 0x76,		"General",	1 },
-	{ 0x0200, 0x18,		"Host Bus",	1 },
-	{ 0x0300, 0x38,		"Memory",	1 },
-/*	{ 0x0400, 0x100,	"Sensor",	0 }, */
-/*		{ 0x0500, 0x300,	"ISP",		0 }, */
-/*		{ 0x0800, 0x400,	"JPEG",		0 }, */
-/*		{ 0x0c00, 0xcc,		"MPEG",		0 }, */
-	{ 0x1100, 0xb2,		"LCD 1",	1 },
-	{ 0x1200, 0x64,		"LCD 2",	1 },
-	{ 0x1400, 0x42,		"MMC",		1 },
-/*		{ 0x1500, 0x080,	"MPU 0",	0 },
-	{ 0x1580, 0x080,	"MPU 1",	0 },
-	{ 0x1600, 0x080,	"Cmd Queue",	0 },
-	{ 0x1680, 0x080,	"RISC CPU",	0 },*/
-	{ 0x1700, 0x400,	"2D Unit",	0 },
-/*	{ 0x1b00, 0x900,	"3D Unit",	0 }, */
-};
-
-static inline void __reg_write(struct glamo_core *glamo,
-				u_int16_t reg, u_int16_t val)
-{
-	writew(val, glamo->base + reg);
-}
-
-static inline u_int16_t __reg_read(struct glamo_core *glamo,
-				   u_int16_t reg)
-{
-	return readw(glamo->base + reg);
-}
-
-static void __reg_set_bit_mask(struct glamo_core *glamo,
-				u_int16_t reg, u_int16_t mask,
-				u_int16_t val)
-{
-	u_int16_t tmp;
-
-	val &= mask;
-
-	tmp = __reg_read(glamo, reg);
-	tmp &= ~mask;
-	tmp |= val;
-	__reg_write(glamo, reg, tmp);
-}
-
-static void reg_set_bit_mask(struct glamo_core *glamo,
-				u_int16_t reg, u_int16_t mask,
-				u_int16_t val)
-{
-	spin_lock(&glamo->lock);
-	__reg_set_bit_mask(glamo, reg, mask, val);
-	spin_unlock(&glamo->lock);
-}
-
-static inline void __reg_set_bit(struct glamo_core *glamo,
-				 u_int16_t reg, u_int16_t bit)
-{
-	__reg_set_bit_mask(glamo, reg, bit, 0xffff);
-}
-
-static inline void __reg_clear_bit(struct glamo_core *glamo,
-				   u_int16_t reg, u_int16_t bit)
-{
-	__reg_set_bit_mask(glamo, reg, bit, 0);
-}
-
-/***********************************************************************
- * resources of sibling devices
- ***********************************************************************/
-
-static struct resource glamo_fb_resources[] = {
-	{
-		.name	= "glamo-fb-regs",
-		.start	= GLAMO_REGOFS_LCD,
-		.end	= GLAMO_REGOFS_MMC - 1,
-		.flags	= IORESOURCE_MEM,
-	}, {
-		.name	= "glamo-fb-mem",
-		.start	= GLAMO_OFFSET_FB,
-		.end	= GLAMO_OFFSET_FB + GLAMO_FB_SIZE - 1,
-		.flags	= IORESOURCE_MEM,
-	},
-};
-
-static struct resource glamo_mmc_resources[] = {
-	{
-		.start	= GLAMO_REGOFS_MMC,
-		.end	= GLAMO_REGOFS_MPROC0 - 1,
-		.flags	= IORESOURCE_MEM
-	}, {
-		.start	= IRQ_GLAMO_MMC,
-		.end	= IRQ_GLAMO_MMC,
-		.flags	= IORESOURCE_IRQ,
-	}, { /* our data buffer for MMC transfers */
-		.start	= GLAMO_OFFSET_FB + GLAMO_FB_SIZE,
-		.end	= GLAMO_OFFSET_FB + GLAMO_FB_SIZE +
-				  GLAMO_MMC_BUFFER_SIZE - 1,
-		.flags	= IORESOURCE_MEM
-	},
-};
-
-enum glamo_cells {
-	GLAMO_CELL_FB,
-	GLAMO_CELL_MMC,
-	GLAMO_CELL_GPIO,
-};
-
-static struct mfd_cell glamo_cells[] = {
-	[GLAMO_CELL_FB] = {
-		.name = "glamo-fb",
-		.num_resources = ARRAY_SIZE(glamo_fb_resources),
-		.resources = glamo_fb_resources,
-	},
-	[GLAMO_CELL_MMC] = {
-		.name = "glamo-mci",
-		.num_resources = ARRAY_SIZE(glamo_mmc_resources),
-		.resources = glamo_mmc_resources,
-	},
-	[GLAMO_CELL_GPIO] = {
-		.name = "glamo-gpio",
-	},
-};
-
-
-/***********************************************************************
- * IRQ demultiplexer
- ***********************************************************************/
-#define irq2glamo(x)	(x - IRQ_GLAMO(0))
-
-static void glamo_ack_irq(unsigned int irq)
-{
-	struct glamo_core *glamo = (struct glamo_core*)get_irq_chip_data(irq);
-	/* clear interrupt source */
-	__reg_write(glamo, GLAMO_REG_IRQ_CLEAR,
-		    1 << irq2glamo(irq));
-}
-
-static void glamo_mask_irq(unsigned int irq)
-{
-	struct glamo_core *glamo = (struct glamo_core*)get_irq_chip_data(irq);
-	u_int16_t tmp;
-
-	/* clear bit in enable register */
-	tmp = __reg_read(glamo, GLAMO_REG_IRQ_ENABLE);
-	tmp &= ~(1 << irq2glamo(irq));
-	__reg_write(glamo, GLAMO_REG_IRQ_ENABLE, tmp);
-}
-
-static void glamo_unmask_irq(unsigned int irq)
-{
-	struct glamo_core *glamo = (struct glamo_core*)get_irq_chip_data(irq);
-	u_int16_t tmp;
-
-	/* set bit in enable register */
-	tmp = __reg_read(glamo, GLAMO_REG_IRQ_ENABLE);
-	tmp |= (1 << irq2glamo(irq));
-	__reg_write(glamo, GLAMO_REG_IRQ_ENABLE, tmp);
-}
-
-static struct irq_chip glamo_irq_chip = {
-	.name   = "glamo",
-	.ack	= glamo_ack_irq,
-	.mask	= glamo_mask_irq,
-	.unmask	= glamo_unmask_irq,
-};
-
-static void glamo_irq_demux_handler(unsigned int irq, struct irq_desc *desc)
-{
-	struct glamo_core *glamo = get_irq_desc_chip_data(desc);
-	desc->status &= ~(IRQ_REPLAY | IRQ_WAITING);
-
-	if (unlikely(desc->status & IRQ_INPROGRESS)) {
-		desc->status |= (IRQ_PENDING | IRQ_MASKED);
-		desc->chip->mask(irq);
-		desc->chip->ack(irq);
-		return;
-	}
-	kstat_incr_irqs_this_cpu(irq, desc);
-
-	desc->chip->ack(irq);
-	desc->status |= IRQ_INPROGRESS;
-
-	do {
-		u_int16_t irqstatus;
-		int i;
-
-		if (unlikely((desc->status &
-				(IRQ_PENDING | IRQ_MASKED | IRQ_DISABLED)) ==
-				(IRQ_PENDING | IRQ_MASKED))) {
-			/* dealing with pending IRQ, unmasking */
-			desc->chip->unmask(irq);
-			desc->status &= ~IRQ_MASKED;
-		}
-
-		desc->status &= ~IRQ_PENDING;
-
-		/* read IRQ status register */
-		irqstatus = __reg_read(glamo, GLAMO_REG_IRQ_STATUS);
-		for (i = 0; i < 9; i++)
-			if (irqstatus & (1 << i))
-				desc_handle_irq(IRQ_GLAMO(i),
-				    irq_desc+IRQ_GLAMO(i));
-
-	} while ((desc->status & (IRQ_PENDING | IRQ_DISABLED)) == IRQ_PENDING);
-
-	desc->status &= ~IRQ_INPROGRESS;
-}
-
-
-static ssize_t regs_write(struct device *dev, struct device_attribute *attr,
-			   const char *buf, size_t count)
-{
-	unsigned long reg = simple_strtoul(buf, NULL, 10);
-	struct glamo_core *glamo = dev_get_drvdata(dev);
-
-	while (*buf && (*buf != ' '))
-		buf++;
-	if (*buf != ' ')
-		return -EINVAL;
-	while (*buf && (*buf == ' '))
-		buf++;
-	if (!*buf)
-		return -EINVAL;
-
-	printk(KERN_INFO"reg 0x%02lX <-- 0x%04lX\n",
-	       reg, simple_strtoul(buf, NULL, 10));
-
-	__reg_write(glamo, reg, simple_strtoul(buf, NULL, 10));
-
-	return count;
-}
-
-static ssize_t regs_read(struct device *dev, struct device_attribute *attr,
-			char *buf)
-{
-	struct glamo_core *glamo = dev_get_drvdata(dev);
-	int n, n1 = 0, r;
-	char * end = buf;
-
-	spin_lock(&glamo->lock);
-
-	for (r = 0; r < ARRAY_SIZE(reg_range); r++) {
-		if (!reg_range[r].dump)
-			continue;
-		n1 = 0;
-		end += sprintf(end, "\n%s\n", reg_range[r].name);
-		for (n = reg_range[r].start;
-		     n < reg_range[r].start + reg_range[r].count; n += 2) {
-			if (((n1++) & 7) == 0)
-				end += sprintf(end, "\n%04X:  ", n);
-			end += sprintf(end, "%04x ", __reg_read(glamo, n));
-		}
-		end += sprintf(end, "\n");
-		if (!attr) {
-			printk("%s", buf);
-			end = buf;
-		}
-	}
-	spin_unlock(&glamo->lock);
-
-	return end - buf;
-}
-
-static DEVICE_ATTR(regs, 0644, regs_read, regs_write);
-static struct attribute *glamo_sysfs_entries[] = {
-	&dev_attr_regs.attr,
-	NULL
-};
-static struct attribute_group glamo_attr_group = {
-	.name	= NULL,
-	.attrs	= glamo_sysfs_entries,
-};
-
-
-
-/***********************************************************************
- * 'engine' support
- ***********************************************************************/
-
-int __glamo_engine_enable(struct glamo_core *glamo, enum glamo_engine engine)
-{
-	switch (engine) {
-	case GLAMO_ENGINE_LCD:
-		__reg_set_bit_mask(glamo, GLAMO_REG_HOSTBUS(2),
-				   GLAMO_HOSTBUS2_MMIO_EN_LCD,
-				   GLAMO_HOSTBUS2_MMIO_EN_LCD);
-		__reg_write(glamo, GLAMO_REG_CLOCK_LCD,
-			    GLAMO_CLOCK_LCD_EN_M5CLK |
-			    GLAMO_CLOCK_LCD_EN_DHCLK |
-			    GLAMO_CLOCK_LCD_EN_DMCLK |
-			    GLAMO_CLOCK_LCD_EN_DCLK |
-			    GLAMO_CLOCK_LCD_DG_M5CLK |
-			    GLAMO_CLOCK_LCD_DG_DMCLK);
-		__reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_GEN5_1,
-			    GLAMO_CLOCK_GEN51_EN_DIV_DHCLK |
-			    GLAMO_CLOCK_GEN51_EN_DIV_DMCLK |
-			    GLAMO_CLOCK_GEN51_EN_DIV_DCLK, 0xffff);
-		break;
-	case GLAMO_ENGINE_MMC:
-		__reg_set_bit_mask(glamo, GLAMO_REG_HOSTBUS(2),
-				   GLAMO_HOSTBUS2_MMIO_EN_MMC,
-				   GLAMO_HOSTBUS2_MMIO_EN_MMC);
-		__reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_MMC,
-				   GLAMO_CLOCK_MMC_EN_M9CLK |
-				   GLAMO_CLOCK_MMC_EN_TCLK |
-				   GLAMO_CLOCK_MMC_DG_M9CLK |
-				   GLAMO_CLOCK_MMC_DG_TCLK,
-				   0xffff);
-		/* enable the TCLK divider clk input */
-		__reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_GEN5_1,
-						 GLAMO_CLOCK_GEN51_EN_DIV_TCLK,
-						 GLAMO_CLOCK_GEN51_EN_DIV_TCLK);
-		break;
-	case GLAMO_ENGINE_2D:
-		__reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_2D,
-				   GLAMO_CLOCK_2D_EN_M7CLK |
-				   GLAMO_CLOCK_2D_EN_GCLK |
-				   GLAMO_CLOCK_2D_DG_M7CLK |
-				   GLAMO_CLOCK_2D_DG_GCLK, 0xffff);
-		__reg_set_bit_mask(glamo, GLAMO_REG_HOSTBUS(2),
-				   GLAMO_HOSTBUS2_MMIO_EN_2D,
-				   GLAMO_HOSTBUS2_MMIO_EN_2D);
-		__reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_GEN5_1,
-		                   GLAMO_CLOCK_GEN51_EN_DIV_GCLK,
-						   0xffff);
-		break;
-	case GLAMO_ENGINE_CMDQ:
-		__reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_2D,
-				   GLAMO_CLOCK_2D_EN_M6CLK, 0xffff);
-		__reg_set_bit_mask(glamo, GLAMO_REG_HOSTBUS(2),
-				   GLAMO_HOSTBUS2_MMIO_EN_CQ,
-				   GLAMO_HOSTBUS2_MMIO_EN_CQ);
-		__reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_GEN5_1,
-		                   GLAMO_CLOCK_GEN51_EN_DIV_MCLK,
-						   0xffff);
-		break;
-	/* FIXME: Implementation */
-	default:
-		return -EINVAL;
-	}
-
-	glamo->engine_enabled_bitfield |= 1 << engine;
-
-	return 0;
-}
-
-int glamo_engine_enable(struct glamo_core *glamo, enum glamo_engine engine)
-{
-	int ret;
-
-	spin_lock(&glamo->lock);
-
-	ret = __glamo_engine_enable(glamo, engine);
-
-	spin_unlock(&glamo->lock);
-
-	return ret;
-}
-EXPORT_SYMBOL_GPL(glamo_engine_enable);
-
-int __glamo_engine_disable(struct glamo_core *glamo, enum glamo_engine engine)
-{
-	switch (engine) {
-	case GLAMO_ENGINE_LCD:
-		/* remove pixel clock to LCM */
-		__reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_LCD,
-			    GLAMO_CLOCK_LCD_EN_DCLK, 0);
-		__reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_LCD,
-			    GLAMO_CLOCK_LCD_EN_DHCLK |
-			    GLAMO_CLOCK_LCD_EN_DMCLK, 0);
-		/* kill memory clock */
-		__reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_LCD,
-			    GLAMO_CLOCK_LCD_EN_M5CLK, 0);
-		/* stop dividing the clocks */
-		__reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_GEN5_1,
-			    GLAMO_CLOCK_GEN51_EN_DIV_DHCLK |
-			    GLAMO_CLOCK_GEN51_EN_DIV_DMCLK |
-			    GLAMO_CLOCK_GEN51_EN_DIV_DCLK, 0);
-		break;
-
-	case GLAMO_ENGINE_MMC:
-		__reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_MMC,
-						   GLAMO_CLOCK_MMC_EN_M9CLK |
-						   GLAMO_CLOCK_MMC_EN_TCLK |
-						   GLAMO_CLOCK_MMC_DG_M9CLK |
-						   GLAMO_CLOCK_MMC_DG_TCLK, 0);
-		/* disable the TCLK divider clk input */
-		__reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_GEN5_1,
-					GLAMO_CLOCK_GEN51_EN_DIV_TCLK, 0);
-		break;
-	case GLAMO_ENGINE_CMDQ:
-			__reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_2D,
-			                   GLAMO_CLOCK_2D_EN_M6CLK,
-							   0);
-			__reg_set_bit_mask(glamo, GLAMO_REG_HOSTBUS(2),
-			                   GLAMO_HOSTBUS2_MMIO_EN_CQ,
-			                   GLAMO_HOSTBUS2_MMIO_EN_CQ);
-/*			__reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_GEN5_1,
-			                   GLAMO_CLOCK_GEN51_EN_DIV_MCLK,
-							   0);*/
-		break;
-	case GLAMO_ENGINE_2D:
-			__reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_2D,
-							   GLAMO_CLOCK_2D_EN_M7CLK |
-							   GLAMO_CLOCK_2D_EN_GCLK |
-							   GLAMO_CLOCK_2D_DG_M7CLK |
-							   GLAMO_CLOCK_2D_DG_GCLK,
-							   0);
-			__reg_set_bit_mask(glamo, GLAMO_REG_HOSTBUS(2),
-			                   GLAMO_HOSTBUS2_MMIO_EN_2D,
-			                   GLAMO_HOSTBUS2_MMIO_EN_2D);
-			__reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_GEN5_1,
-			                   GLAMO_CLOCK_GEN51_EN_DIV_GCLK,
-							   0);
-		break;
-	default:
-		return -EINVAL;
-	}
-
-	glamo->engine_enabled_bitfield &= ~(1 << engine);
-
-	return 0;
-}
-int glamo_engine_disable(struct glamo_core *glamo, enum glamo_engine engine)
-{
-	int ret;
-
-	spin_lock(&glamo->lock);
-
-	ret = __glamo_engine_disable(glamo, engine);
-
-	spin_unlock(&glamo->lock);
-
-	return ret;
-}
-EXPORT_SYMBOL_GPL(glamo_engine_disable);
-
-static const u_int16_t engine_clock_regs[__NUM_GLAMO_ENGINES] = {
-	[GLAMO_ENGINE_LCD]	= GLAMO_REG_CLOCK_LCD,
-	[GLAMO_ENGINE_MMC]	= GLAMO_REG_CLOCK_MMC,
-	[GLAMO_ENGINE_ISP]	= GLAMO_REG_CLOCK_ISP,
-	[GLAMO_ENGINE_JPEG]	= GLAMO_REG_CLOCK_JPEG,
-	[GLAMO_ENGINE_3D]	= GLAMO_REG_CLOCK_3D,
-	[GLAMO_ENGINE_2D]	= GLAMO_REG_CLOCK_2D,
-	[GLAMO_ENGINE_MPEG_ENC] = GLAMO_REG_CLOCK_MPEG,
-	[GLAMO_ENGINE_MPEG_DEC] = GLAMO_REG_CLOCK_MPEG,
-};
-
-void glamo_engine_clkreg_set(struct glamo_core *glamo,
-			     enum glamo_engine engine,
-			     u_int16_t mask, u_int16_t val)
-{
-	reg_set_bit_mask(glamo, engine_clock_regs[engine], mask, val);
-}
-EXPORT_SYMBOL_GPL(glamo_engine_clkreg_set);
-
-u_int16_t glamo_engine_clkreg_get(struct glamo_core *glamo,
-				  enum glamo_engine engine)
-{
-	u_int16_t val;
-
-	spin_lock(&glamo->lock);
-	val = __reg_read(glamo, engine_clock_regs[engine]);
-	spin_unlock(&glamo->lock);
-
-	return val;
-}
-EXPORT_SYMBOL_GPL(glamo_engine_clkreg_get);
-
-static const struct glamo_script engine_div_regs[__NUM_GLAMO_ENGINES] = {
-	[GLAMO_ENGINE_LCD] = {GLAMO_REG_CLOCK_GEN5_1, GLAMO_CLOCK_GEN51_EN_DIV_DCLK},
-	[GLAMO_ENGINE_MMC] = {GLAMO_REG_CLOCK_GEN5_1, GLAMO_CLOCK_GEN51_EN_DIV_TCLK},
-	[GLAMO_ENGINE_2D]  = {GLAMO_REG_CLOCK_GEN5_1, GLAMO_CLOCK_GEN51_EN_DIV_GCLK},
-};
-
-void glamo_engine_div_enable(struct glamo_core *glamo, enum glamo_engine engine)
-{
-	uint16_t reg = engine_div_regs[engine].reg;
-	uint16_t bit = engine_div_regs[engine].val;
-	uint16_t val;
-
-	spin_lock(&glamo->lock);
-	val = __reg_read(glamo, reg);
-	__reg_write(glamo, reg, val | bit);
-	spin_unlock(&glamo->lock);
-	mdelay(5);
-}
-EXPORT_SYMBOL_GPL(glamo_engine_div_enable);
-
-void glamo_engine_div_disable(struct glamo_core *glamo, enum glamo_engine engine)
-{
-	uint16_t reg = engine_div_regs[engine].reg;
-	uint16_t bit = engine_div_regs[engine].val;
-	uint16_t val;
-
-	spin_lock(&glamo->lock);
-	val = __reg_read(glamo, reg);
-	__reg_write(glamo, reg, val & ~bit);
-	spin_unlock(&glamo->lock);
-}
-EXPORT_SYMBOL_GPL(glamo_engine_div_disable);
-
-static const struct glamo_script reset_regs[] = {
-	[GLAMO_ENGINE_LCD] = {
-		GLAMO_REG_CLOCK_LCD, GLAMO_CLOCK_LCD_RESET
-	},
-#if 0
-	[GLAMO_ENGINE_HOST] = {
-		GLAMO_REG_CLOCK_HOST, GLAMO_CLOCK_HOST_RESET
-	},
-	[GLAMO_ENGINE_MEM] = {
-		GLAMO_REG_CLOCK_MEM, GLAMO_CLOCK_MEM_RESET
-	},
-#endif
-	[GLAMO_ENGINE_MMC] = {
-		GLAMO_REG_CLOCK_MMC, GLAMO_CLOCK_MMC_RESET
-	},
-	[GLAMO_ENGINE_CMDQ] = {
-		GLAMO_REG_CLOCK_2D, GLAMO_CLOCK_2D_CQ_RESET
-	},
-	[GLAMO_ENGINE_2D] = {
-		GLAMO_REG_CLOCK_2D, GLAMO_CLOCK_2D_RESET
-	},
-	[GLAMO_ENGINE_JPEG] = {
-		GLAMO_REG_CLOCK_JPEG, GLAMO_CLOCK_JPEG_RESET
-	},
-};
-
-void glamo_engine_reset(struct glamo_core *glamo, enum glamo_engine engine)
-{
-	uint16_t reg = reset_regs[engine].reg;
-	uint16_t val = reset_regs[engine].val;
-
-	if (engine >= ARRAY_SIZE(reset_regs)) {
-		dev_warn(&glamo->pdev->dev, "unknown engine %u ", engine);
-		return;
-	}
-
-
-	spin_lock(&glamo->lock);
-	__reg_set_bit(glamo, reg, val);
-	__reg_clear_bit(glamo, reg, val);
-	spin_unlock(&glamo->lock);
-}
-EXPORT_SYMBOL_GPL(glamo_engine_reset);
-
-int glamo_pll_rate(struct glamo_core *glamo,
-			  enum glamo_pll pll)
-{
-	u_int16_t reg;
-	unsigned int osci = glamo->pdata->osci_clock_rate;
-
-	switch (pll) {
-	case GLAMO_PLL1:
-		reg = __reg_read(glamo, GLAMO_REG_PLL_GEN1);
-		break;
-	case GLAMO_PLL2:
-		reg = __reg_read(glamo, GLAMO_REG_PLL_GEN3);
-		break;
-	default:
-		return -EINVAL;
-	}
-	return osci*reg;
-}
-EXPORT_SYMBOL_GPL(glamo_pll_rate);
-
-int glamo_engine_reclock(struct glamo_core *glamo,
-			 enum glamo_engine engine,
-			 int hz)
-{
-	int pll;
-	u_int16_t reg, mask, div;
-
-	if (!hz)
-		return -EINVAL;
-
-	switch (engine) {
-	case GLAMO_ENGINE_LCD:
-		pll = GLAMO_PLL1;
-		reg = GLAMO_REG_CLOCK_GEN7;
-		mask = 0xff;
-		break;
-	case GLAMO_ENGINE_MMC:
-		pll = GLAMO_PLL1;
-		reg = GLAMO_REG_CLOCK_GEN8;
-		mask = 0xff;
-		break;
-	default:
-		dev_warn(&glamo->pdev->dev,
-			 "reclock of engine 0x%x not supported\n", engine);
-		return -EINVAL;
-		break;
-	}
-
-	pll = glamo_pll_rate(glamo, pll);
-
-	div = pll / hz;
-
-	if (div != 0 && pll / div <= hz)
-		--div;
-
-	if (div > mask)
-		div = mask;
-
-	dev_dbg(&glamo->pdev->dev,
-			"PLL %d, kHZ %d, div %d\n", pll, hz / 1000, div);
-
-	reg_set_bit_mask(glamo, reg, mask, div);
-	mdelay(5); /* wait some time to stabilize */
-
-	return pll / (div + 1);
-}
-EXPORT_SYMBOL_GPL(glamo_engine_reclock);
-
-/***********************************************************************
- * script support
- ***********************************************************************/
-
-int glamo_run_script(struct glamo_core *glamo, const struct glamo_script *script,
-		     int len, int may_sleep)
-{
-	int i;
-    const struct glamo_script *line = script;
-
-	for (i = 0; i < len; ++i, ++line) {
-		switch (line->reg) {
-		case 0xffff:
-			return 0;
-		case 0xfffe:
-			if (may_sleep)
-				msleep(line->val);
-			else
-				mdelay(line->val * 4);
-			break;
-		case 0xfffd:
-			/* spin until PLLs lock */
-			while ((__reg_read(glamo, GLAMO_REG_PLL_GEN5) & 3) != 3)
-				;
-			break;
-
-		/*
-		 * couple of people reported artefacts with 2.6.28 changes, this
-		 * allows reversion to 2.6.24 settings
-		 */
-
-		case 0x200:
-			switch (slow_memory) {
-			/* choice 1 is the most conservative */
-			case 1: /* 3 waits on Async BB R & W, Use PLL 1 for mem bus */
-				__reg_write(glamo, script[i].reg, 0xef0);
-				break;
-			case 2: /* 2 waits on Async BB R & W, Use PLL 1 for mem bus */
-				__reg_write(glamo, script[i].reg, 0xea0);
-				break;
-			case 3: /* 1 waits on Async BB R & W, Use PLL 1 for mem bus */
-				__reg_write(glamo, script[i].reg, 0xe50);
-				break;
-			case 4: /* 0 waits on Async BB R & W, Use PLL 1 for mem bus */
-				__reg_write(glamo, script[i].reg, 0xe00);
-				break;
-
-			/* using PLL2 for memory bus increases CPU bandwidth significantly */
-			case 5: /* 3 waits on Async BB R & W, Use PLL 2 for mem bus */
-				__reg_write(glamo, script[i].reg, 0xef3);
-				break;
-			case 6: /* 2 waits on Async BB R & W, Use PLL 2 for mem bus */
-				__reg_write(glamo, script[i].reg, 0xea3);
-				break;
-			case 7: /* 1 waits on Async BB R & W, Use PLL 2 for mem bus */
-				__reg_write(glamo, script[i].reg, 0xe53);
-				break;
-			/* default of 0 or >7 is fastest */
-			default: /* 0 waits on Async BB R & W, Use PLL 2 for mem bus */
-				__reg_write(glamo, script[i].reg, 0xe03);
-				break;
-			}
-			break;
-
-		default:
-			__reg_write(glamo, script[i].reg, script[i].val);
-			break;
-		}
-	}
-
-	return 0;
-}
-EXPORT_SYMBOL(glamo_run_script);
-
-static const struct glamo_script glamo_init_script[] = {
-	{ GLAMO_REG_CLOCK_HOST,		0x1000 },
-		{ 0xfffe, 2 },
-	{ GLAMO_REG_CLOCK_MEMORY, 	0x1000 },
-	{ GLAMO_REG_CLOCK_MEMORY,	0x2000 },
-	{ GLAMO_REG_CLOCK_LCD,		0x1000 },
-	{ GLAMO_REG_CLOCK_MMC,		0x1000 },
-	{ GLAMO_REG_CLOCK_ISP,		0x1000 },
-	{ GLAMO_REG_CLOCK_ISP,		0x3000 },
-	{ GLAMO_REG_CLOCK_JPEG,		0x1000 },
-	{ GLAMO_REG_CLOCK_3D,		0x1000 },
-	{ GLAMO_REG_CLOCK_3D,		0x3000 },
-	{ GLAMO_REG_CLOCK_2D,		0x1000 },
-	{ GLAMO_REG_CLOCK_2D,		0x3000 },
-	{ GLAMO_REG_CLOCK_RISC1,	0x1000 },
-	{ GLAMO_REG_CLOCK_MPEG,		0x3000 },
-	{ GLAMO_REG_CLOCK_MPEG,		0x3000 },
-	{ GLAMO_REG_CLOCK_MPROC,	0x1000 /*0x100f*/ },
-		{ 0xfffe, 2 },
-	{ GLAMO_REG_CLOCK_HOST,		0x0000 },
-	{ GLAMO_REG_CLOCK_MEMORY,	0x0000 },
-	{ GLAMO_REG_CLOCK_LCD,		0x0000 },
-	{ GLAMO_REG_CLOCK_MMC,		0x0000 },
-#if 0
-/* unused engines must be left in reset to stop MMC block read "blackouts" */
-	{ GLAMO_REG_CLOCK_ISP,		0x0000 },
-	{ GLAMO_REG_CLOCK_ISP,		0x0000 },
-	{ GLAMO_REG_CLOCK_JPEG,		0x0000 },
-	{ GLAMO_REG_CLOCK_3D,		0x0000 },
-	{ GLAMO_REG_CLOCK_3D,		0x0000 },
-	{ GLAMO_REG_CLOCK_2D,		0x0000 },
-	{ GLAMO_REG_CLOCK_2D,		0x0000 },
-	{ GLAMO_REG_CLOCK_RISC1,	0x0000 },
-	{ GLAMO_REG_CLOCK_MPEG,		0x0000 },
-	{ GLAMO_REG_CLOCK_MPEG,		0x0000 },
-#endif
-	{ GLAMO_REG_PLL_GEN1,		0x05db },	/* 48MHz */
-	{ GLAMO_REG_PLL_GEN3,		0x0aba },	/* 90MHz */
-	{ 0xfffd, 0 },
-	/*
-	 * b9 of this register MUST be zero to get any interrupts on INT#
-	 * the other set bits enable all the engine interrupt sources
-	 */
-	{ GLAMO_REG_IRQ_ENABLE,		0x01ff },
-	{ GLAMO_REG_CLOCK_GEN6,		0x2000 },
-	{ GLAMO_REG_CLOCK_GEN7,		0x0101 },
-	{ GLAMO_REG_CLOCK_GEN8,		0x0100 },
-	{ GLAMO_REG_CLOCK_HOST,		0x000d },
-	/*
-	 * b7..b4 = 0 = no wait states on read or write
-	 * b0 = 1 select PLL2 for Host interface, b1 = enable it
-	 */
-	{ 0x200,	0x0e03 /* this is replaced by script parser */ },
-	{ 0x202, 	0x07ff },
-	{ 0x212,	0x0000 },
-	{ 0x214,	0x4000 },
-	{ 0x216,	0xf00e },
-
-	/* S-Media recommended "set tiling mode to 512 mode for memory access
-	 * more efficiency when 640x480" */
-	{ GLAMO_REG_MEM_TYPE,		0x0c74 }, /* 8MB, 16 word pg wr+rd */
-	{ GLAMO_REG_MEM_GEN,		0xafaf }, /* 63 grants min + max */
-
-	{ GLAMO_REGOFS_HOSTBUS + 2,	0xffff }, /* enable  on MMIO*/
-
-	{ GLAMO_REG_MEM_TIMING1,	0x0108 },
-	{ GLAMO_REG_MEM_TIMING2,	0x0010 }, /* Taa = 3 MCLK */
-	{ GLAMO_REG_MEM_TIMING3,	0x0000 },
-	{ GLAMO_REG_MEM_TIMING4,	0x0000 }, /* CE1# delay fall/rise */
-	{ GLAMO_REG_MEM_TIMING5,	0x0000 }, /* UB# LB# */
-	{ GLAMO_REG_MEM_TIMING6,	0x0000 }, /* OE# */
-	{ GLAMO_REG_MEM_TIMING7,	0x0000 }, /* WE# */
-	{ GLAMO_REG_MEM_TIMING8,	0x1002 }, /* MCLK delay, was 0x1000 */
-	{ GLAMO_REG_MEM_TIMING9,	0x6006 },
-	{ GLAMO_REG_MEM_TIMING10,	0x00ff },
-	{ GLAMO_REG_MEM_TIMING11,	0x0001 },
-	{ GLAMO_REG_MEM_POWER1,		0x0020 },
-	{ GLAMO_REG_MEM_POWER2,		0x0000 },
-	{ GLAMO_REG_MEM_DRAM1,		0x0000 },
-		{ 0xfffe, 1 },
-	{ GLAMO_REG_MEM_DRAM1,		0xc100 },
-		{ 0xfffe, 1 },
-	{ GLAMO_REG_MEM_DRAM1,		0xe100 },
-	{ GLAMO_REG_MEM_DRAM2,		0x01d6 },
-	{ GLAMO_REG_CLOCK_MEMORY,	0x000b },
-};
-#if 0
-static struct glamo_script glamo_resume_script[] = {
-
-	{ GLAMO_REG_PLL_GEN1,		0x05db },	/* 48MHz */
-	{ GLAMO_REG_PLL_GEN3,		0x0aba },	/* 90MHz */
-	{ GLAMO_REG_DFT_GEN6, 1 },
-		{ 0xfffe, 100 },
-		{ 0xfffd, 0 },
-	{ 0x200,	0x0e03 },
-
-	/*
-	 * b9 of this register MUST be zero to get any interrupts on INT#
-	 * the other set bits enable all the engine interrupt sources
-	 */
-	{ GLAMO_REG_IRQ_ENABLE,		0x01ff },
-	{ GLAMO_REG_CLOCK_HOST,		0x0018 },
-	{ GLAMO_REG_CLOCK_GEN5_1, 0x18b1 },
-
-	{ GLAMO_REG_MEM_DRAM1,		0x0000 },
-		{ 0xfffe, 1 },
-	{ GLAMO_REG_MEM_DRAM1,		0xc100 },
-		{ 0xfffe, 1 },
-	{ GLAMO_REG_MEM_DRAM1,		0xe100 },
-	{ GLAMO_REG_MEM_DRAM2,		0x01d6 },
-	{ GLAMO_REG_CLOCK_MEMORY,	0x000b },
-};
-#endif
-
-enum glamo_power {
-	GLAMO_POWER_ON,
-	GLAMO_POWER_SUSPEND,
-};
-
-static void glamo_power(struct glamo_core *glamo,
-			enum glamo_power new_state)
-{
-	int n;
-	unsigned long flags;
-
-	spin_lock_irqsave(&glamo->lock, flags);
-
-	dev_info(&glamo->pdev->dev, "***** glamo_power -> %d\n", new_state);
-
-	/*
-Power management
-static const REG_VALUE_MASK_TYPE reg_powerOn[] =
-{
-    { REG_GEN_DFT6,     REG_BIT_ALL,    REG_DATA(1u << 0)           },
-    { REG_GEN_PLL3,     0u,             REG_DATA(1u << 13)          },
-    { REG_GEN_MEM_CLK,  REG_BIT_ALL,    REG_BIT_EN_MOCACLK          },
-    { REG_MEM_DRAM2,    0u,             REG_BIT_EN_DEEP_POWER_DOWN  },
-    { REG_MEM_DRAM1,    0u,             REG_BIT_SELF_REFRESH        }
-};
-
-static const REG_VALUE_MASK_TYPE reg_powerStandby[] =
-{
-    { REG_MEM_DRAM1,    REG_BIT_ALL,    REG_BIT_SELF_REFRESH    },
-    { REG_GEN_MEM_CLK,  0u,             REG_BIT_EN_MOCACLK      },
-    { REG_GEN_PLL3,     REG_BIT_ALL,    REG_DATA(1u << 13)      },
-    { REG_GEN_DFT5,     REG_BIT_ALL,    REG_DATA(1u << 0)       }
-};
-
-static const REG_VALUE_MASK_TYPE reg_powerSuspend[] =
-{
-    { REG_MEM_DRAM2,    REG_BIT_ALL,    REG_BIT_EN_DEEP_POWER_DOWN  },
-    { REG_GEN_MEM_CLK,  0u,             REG_BIT_EN_MOCACLK          },
-    { REG_GEN_PLL3,     REG_BIT_ALL,    REG_DATA(1u << 13)          },
-    { REG_GEN_DFT5,     REG_BIT_ALL,    REG_DATA(1u << 0)           }
-};
-*/
-
-	switch (new_state) {
-	case GLAMO_POWER_ON:
-
-		/*
-		 * glamo state on resume is nondeterministic in some
-		 * fundamental way, it has also been observed that the
-		 * Glamo reset pin can get asserted by, eg, touching it with
-		 * a scope probe.  So the only answer is to roll with it and
-		 * force an external reset on the Glamo during resume.
-		 */
-
-		(glamo->pdata->glamo_external_reset)(0);
-		udelay(10);
-		(glamo->pdata->glamo_external_reset)(1);
-		mdelay(5);
-
-		glamo_run_script(glamo, glamo_init_script,
-			 ARRAY_SIZE(glamo_init_script), 0);
-
-		break;
-
-	case GLAMO_POWER_SUSPEND:
-
-		/* nuke interrupts */
-		__reg_write(glamo, GLAMO_REG_IRQ_ENABLE, 0x200);
-
-		/* stash a copy of which engines were running */
-		glamo->engine_enabled_bitfield_suspend =
-						 glamo->engine_enabled_bitfield;
-
-		/* take down each engine before we kill mem and pll */
-		for (n = 0; n < __NUM_GLAMO_ENGINES; n++)
-			if (glamo->engine_enabled_bitfield & (1 << n))
-				__glamo_engine_disable(glamo, n);
-
-		/* enable self-refresh */
-
-		__reg_write(glamo, GLAMO_REG_MEM_DRAM1,
-					GLAMO_MEM_DRAM1_EN_DRAM_REFRESH |
-					GLAMO_MEM_DRAM1_EN_GATE_CKE |
-					GLAMO_MEM_DRAM1_SELF_REFRESH |
-					GLAMO_MEM_REFRESH_COUNT);
-		__reg_write(glamo, GLAMO_REG_MEM_DRAM1,
-					GLAMO_MEM_DRAM1_EN_MODEREG_SET |
-					GLAMO_MEM_DRAM1_EN_DRAM_REFRESH |
-					GLAMO_MEM_DRAM1_EN_GATE_CKE |
-					GLAMO_MEM_DRAM1_SELF_REFRESH |
-					GLAMO_MEM_REFRESH_COUNT);
-
-		/* force RAM into deep powerdown */
-
-		__reg_write(glamo, GLAMO_REG_MEM_DRAM2,
-					GLAMO_MEM_DRAM2_DEEP_PWRDOWN |
-					(7 << 6) | /* tRC */
-					(1 << 4) | /* tRP */
-					(1 << 2) | /* tRCD */
-					2); /* CAS latency */
-
-		/* disable clocks to memory */
-		__reg_write(glamo, GLAMO_REG_CLOCK_MEMORY, 0);
-
-		/* all dividers from OSCI */
-		__reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_GEN5_1, 0x400, 0x400);
-
-		/* PLL2 into bypass */
-		__reg_set_bit_mask(glamo, GLAMO_REG_PLL_GEN3, 1 << 12, 1 << 12);
-
-		__reg_write(glamo, 0x200, 0x0e00);
-
-
-		/* kill PLLS 1 then 2 */
-		__reg_write(glamo, GLAMO_REG_DFT_GEN5, 0x0001);
-		__reg_set_bit_mask(glamo, GLAMO_REG_PLL_GEN3, 1 << 13, 1 << 13);
-
-		break;
-	}
-
-	spin_unlock_irqrestore(&glamo->lock, flags);
-}
-
-#if 0
-#define MEMDETECT_RETRY	6
-static unsigned int detect_memsize(struct glamo_core *glamo)
-{
-	int i;
-
-	/*static const u_int16_t pattern[] = {
-		0x1111, 0x8a8a, 0x2222, 0x7a7a,
-		0x3333, 0x6a6a, 0x4444, 0x5a5a,
-		0x5555, 0x4a4a, 0x6666, 0x3a3a,
-		0x7777, 0x2a2a, 0x8888, 0x1a1a
-	}; */
-
-	for (i = 0; i < MEMDETECT_RETRY; i++) {
-		switch (glamo->type) {
-		case 3600:
-			__reg_write(glamo, GLAMO_REG_MEM_TYPE, 0x0072);
-			__reg_write(glamo, GLAMO_REG_MEM_DRAM1, 0xc100);
-			break;
-		case 3650:
-			switch (glamo->revision) {
-			case GLAMO_CORE_REV_A0:
-				if (i & 1)
-					__reg_write(glamo, GLAMO_REG_MEM_TYPE,
-						    0x097a);
-				else
-					__reg_write(glamo, GLAMO_REG_MEM_TYPE,
-						    0x0173);
-
-				__reg_write(glamo, GLAMO_REG_MEM_DRAM1, 0x0000);
-				msleep(1);
-				__reg_write(glamo, GLAMO_REG_MEM_DRAM1, 0xc100);
-				break;
-			default:
-				if (i & 1)
-					__reg_write(glamo, GLAMO_REG_MEM_TYPE,
-						    0x0972);
-				else
-					__reg_write(glamo, GLAMO_REG_MEM_TYPE,
-						    0x0872);
-
-				__reg_write(glamo, GLAMO_REG_MEM_DRAM1, 0x0000);
-				msleep(1);
-				__reg_write(glamo, GLAMO_REG_MEM_DRAM1, 0xe100);
-				break;
-			}
-			break;
-		case 3700:
-			/* FIXME */
-		default:
-			break;
-		}
-
-#if 0
-		/* FIXME: finish implementation */
-		for (j = 0; j < 8; j++) {
-			__
-#endif
-	}
-
-	return 0;
-}
-#endif
-
-/* Find out if we can support this version of the Glamo chip */
-static int glamo_supported(struct glamo_core *glamo)
-{
-	u_int16_t dev_id, rev_id; /*, memsize; */
-
-	dev_id = __reg_read(glamo, GLAMO_REG_DEVICE_ID);
-	rev_id = __reg_read(glamo, GLAMO_REG_REVISION_ID);
-
-	switch (dev_id) {
-	case 0x3650:
-		switch (rev_id) {
-		case GLAMO_CORE_REV_A2:
-			break;
-		case GLAMO_CORE_REV_A0:
-		case GLAMO_CORE_REV_A1:
-		case GLAMO_CORE_REV_A3:
-			dev_warn(&glamo->pdev->dev, "untested core revision "
-				 "%04x, your mileage may vary\n", rev_id);
-			break;
-		default:
-			dev_warn(&glamo->pdev->dev, "unknown glamo revision "
-				 "%04x, your mileage may vary\n", rev_id);
-			/* maybe should abort ? */
-		}
-		break;
-	case 0x3600:
-	case 0x3700:
-	default:
-		dev_err(&glamo->pdev->dev, "unsupported Glamo device %04x\n",
-			dev_id);
-		return 0;
-	}
-
-	dev_dbg(&glamo->pdev->dev, "Detected Glamo core %04x Revision %04x "
-		 "(%uHz CPU / %uHz Memory)\n", dev_id, rev_id,
-		 glamo_pll_rate(glamo, GLAMO_PLL1),
-		 glamo_pll_rate(glamo, GLAMO_PLL2));
-
-	return 1;
-}
-
-static int __init glamo_probe(struct platform_device *pdev)
-{
-	int rc = 0, irq;
-	struct glamo_core *glamo;
-
-	glamo = kmalloc(GFP_KERNEL, sizeof(*glamo));
-	if (!glamo)
-		return -ENOMEM;
-
-	spin_lock_init(&glamo->lock);
-	glamo->pdev = pdev;
-	glamo->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	glamo->irq = platform_get_irq(pdev, 0);
-	glamo->pdata = pdev->dev.platform_data;
-	if (!glamo->mem || !glamo->pdata) {
-		dev_err(&pdev->dev, "platform device with no MEM/PDATA ?\n");
-		rc = -ENOENT;
-		goto bail_free;
-	}
-
-	/* register a number of sibling devices whoise IOMEM resources
-	 * are siblings of pdev's IOMEM resource */
-
-	/* only remap the generic, hostbus and memory controller registers */
-	glamo->base = ioremap(glamo->mem->start, 0x4000 /*GLAMO_REGOFS_VIDCAP*/);
-	if (!glamo->base) {
-		dev_err(&pdev->dev, "failed to ioremap() memory region\n");
-		goto bail_free;
-	}
-
-	platform_set_drvdata(pdev, glamo);
-
-	(glamo->pdata->glamo_external_reset)(0);
-	udelay(10);
-	(glamo->pdata->glamo_external_reset)(1);
-	mdelay(10);
-
-	/*
-	 * finally set the mfd interrupts up
-	 * can't do them earlier or sibling probes blow up
-	 */
-
-	for (irq = IRQ_GLAMO(0); irq <= IRQ_GLAMO(8); irq++) {
-		set_irq_chip_and_handler(irq, &glamo_irq_chip, handle_level_irq);
-		set_irq_flags(irq, IRQF_VALID);
-		set_irq_chip_data(irq, glamo);
-	}
-
-	if (glamo->pdata->glamo_irq_is_wired &&
-	    !glamo->pdata->glamo_irq_is_wired()) {
-		set_irq_chained_handler(glamo->irq, glamo_irq_demux_handler);
-		set_irq_type(glamo->irq, IRQ_TYPE_EDGE_FALLING);
-		set_irq_chip_data(glamo->irq, glamo);
-		dev_info(&pdev->dev, "Glamo interrupt registered\n");
-		glamo->irq_works = 1;
-	} else {
-		dev_err(&pdev->dev, "Glamo interrupt not used\n");
-		glamo->irq_works = 0;
-	}
-
-	/* confirm it isn't insane version */
-	if (!glamo_supported(glamo)) {
-		dev_err(&pdev->dev, "This Glamo is not supported\n");
-		goto bail_irq;
-	}
-
-	/* sysfs */
-	rc = sysfs_create_group(&pdev->dev.kobj, &glamo_attr_group);
-	if (rc < 0) {
-		dev_err(&pdev->dev, "cannot create sysfs group\n");
-		goto bail_irq;
-	}
-
-	/* init the chip with canned register set */
-
-	dev_dbg(&glamo->pdev->dev, "running init script\n");
-	glamo_run_script(glamo, glamo_init_script,
-			 ARRAY_SIZE(glamo_init_script), 1);
-
-	dev_info(&glamo->pdev->dev, "Glamo core PLL1: %uHz, PLL2: %uHz\n",
-		 glamo_pll_rate(glamo, GLAMO_PLL1),
-		 glamo_pll_rate(glamo, GLAMO_PLL2));
-
-	mfd_add_devices(&pdev->dev, pdev->id, glamo_cells,
-	                      ARRAY_SIZE(glamo_cells),
-						  glamo->mem, 0);
-
-	/* only request the generic, hostbus and memory controller MMIO */
-	glamo->mem = request_mem_region(glamo->mem->start,
-					GLAMO_REGOFS_VIDCAP, "glamo-core");
-	if (!glamo->mem) {
-		dev_err(&pdev->dev, "failed to request memory region\n");
-		goto bail_irq;
-	}
-
-	return 0;
-
-bail_irq:
-	disable_irq(glamo->irq);
-	set_irq_chained_handler(glamo->irq, NULL);
-	set_irq_chip_data(glamo->irq, NULL);
-
-	for (irq = IRQ_GLAMO(0); irq <= IRQ_GLAMO(8); irq++) {
-		set_irq_flags(irq, 0);
-		set_irq_chip(irq, NULL);
-		set_irq_chip_data(irq, NULL);
-	}
-
-	iounmap(glamo->base);
-bail_free:
-	platform_set_drvdata(pdev, NULL);
-	kfree(glamo);
-
-	return rc;
-}
-
-static int glamo_remove(struct platform_device *pdev)
-{
-	struct glamo_core *glamo = platform_get_drvdata(pdev);
-	int irq;
-
-	disable_irq(glamo->irq);
-	set_irq_chained_handler(glamo->irq, NULL);
-	set_irq_chip_data(glamo->irq, NULL);
-
-	for (irq = IRQ_GLAMO(0); irq <= IRQ_GLAMO(8); irq++) {
-		set_irq_flags(irq, 0);
-		set_irq_chip(irq, NULL);
-		set_irq_chip_data(irq, NULL);
-	}
-
-	platform_set_drvdata(pdev, NULL);
-	mfd_remove_devices(&pdev->dev);
-	iounmap(glamo->base);
-	release_mem_region(glamo->mem->start, GLAMO_REGOFS_VIDCAP);
-	kfree(glamo);
-
-	return 0;
-}
-
-#ifdef CONFIG_PM
-
-static int glamo_suspend(struct device *dev)
-{
-	struct glamo_core *glamo = dev_get_drvdata(dev);
-	glamo->suspending = 1;
-	glamo_power(glamo, GLAMO_POWER_SUSPEND);
-
-	return 0;
-}
-
-static int glamo_resume(struct device *dev)
-{
-	struct glamo_core *glamo = dev_get_drvdata(dev);
-	glamo_power(glamo, GLAMO_POWER_ON);
-	glamo->suspending = 0;
-	return 0;
-}
-
-static struct dev_pm_ops glamo_pm_ops = {
-	.suspend = glamo_suspend,
-	.resume  = glamo_resume,
-};
-
-#define GLAMO_PM_OPS (&glamo_pm_ops)
-
-#else
-#define GLAMO_PM_OPS NULL
-#endif
-
-static struct platform_driver glamo_driver = {
-	.probe		= glamo_probe,
-	.remove		= glamo_remove,
-	.driver		= {
-		.name	= "glamo3362",
-		.owner	= THIS_MODULE,
-		.pm     = GLAMO_PM_OPS,
-	},
-};
-
-static int __devinit glamo_init(void)
-{
-	return platform_driver_register(&glamo_driver);
-}
-
-static void __exit glamo_cleanup(void)
-{
-	platform_driver_unregister(&glamo_driver);
-}
-
-module_init(glamo_init);
-module_exit(glamo_cleanup);
-
-MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
-MODULE_DESCRIPTION("Smedia Glamo 336x/337x core/resource driver");
-MODULE_LICENSE("GPL");
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-core.h b/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-core.h
deleted file mode 100644
index f0c2ec3ee..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-core.h
+++ /dev/null
@@ -1,67 +0,0 @@
-#ifndef __GLAMO_CORE_H
-#define __GLAMO_CORE_H
-
-#include <asm/system.h>
-#include <linux/mfd/glamo.h>
-
-/* for the time being, we put the on-screen framebuffer into the lowest
- * VRAM space.  This should make the code easily compatible with the various
- * 2MB/4MB/8MB variants of the Smedia chips */
-#define GLAMO_OFFSET_VRAM	0x800000
-#define GLAMO_OFFSET_FB	(GLAMO_OFFSET_VRAM)
-
-/* we only allocate the minimum possible size for the framebuffer to make
- * sure we have sufficient memory for other functions of the chip */
-//#define GLAMO_FB_SIZE	(640*480*4)	/* == 0x12c000 */
-#define GLAMO_INTERNAL_RAM_SIZE 0x800000
-#define GLAMO_MMC_BUFFER_SIZE (64 * 1024)
-#define GLAMO_FB_SIZE	(GLAMO_INTERNAL_RAM_SIZE - GLAMO_MMC_BUFFER_SIZE)
-
-enum glamo_pll {
-    GLAMO_PLL1,
-    GLAMO_PLL2,
-};
-
-struct glamo_core {
-	int irq;
-	int irq_works; /* 0 means PCB does not support Glamo IRQ */
-	struct resource *mem;
-	struct resource *mem_core;
-	void __iomem *base;
-	struct platform_device *pdev;
-	struct glamo_platform_data *pdata;
-	u_int16_t type;
-	u_int16_t revision;
-	spinlock_t lock;
-	u32 engine_enabled_bitfield;
-	u32 engine_enabled_bitfield_suspend;
-	int suspending;
-};
-
-struct glamo_script {
-	u_int16_t reg;
-	u_int16_t val;
-};
-
-void glamo_engine_div_enable(struct glamo_core *glamo, enum glamo_engine engine);
-void glamo_engine_div_disable(struct glamo_core *glamo, enum glamo_engine engine);
-
-
-int glamo_pll_rate(struct glamo_core *glamo, enum glamo_pll pll);
-
-int glamo_run_script(struct glamo_core *glamo,
-		     const struct glamo_script *script, int len, int may_sleep);
-
-int glamo_engine_enable(struct glamo_core *glamo, enum glamo_engine engine);
-int glamo_engine_disable(struct glamo_core *glamo, enum glamo_engine engine);
-void glamo_engine_reset(struct glamo_core *glamo, enum glamo_engine engine);
-int glamo_engine_reclock(struct glamo_core *glamo,
-			 enum glamo_engine engine, int ps);
-
-void glamo_engine_clkreg_set(struct glamo_core *glamo,
-			     enum glamo_engine engine,
-			     u_int16_t mask, u_int16_t val);
-
-u_int16_t glamo_engine_clkreg_get(struct glamo_core *glamo,
-				  enum glamo_engine engine);
-#endif /* __GLAMO_CORE_H */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-fb.c b/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-fb.c
deleted file mode 100644
index 7bb2201f6..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-fb.c
+++ /dev/null
@@ -1,1026 +0,0 @@
-/* Smedia Glamo 336x/337x driver
- *
- * (C) 2007-2008 by Openmoko, Inc.
- * Author: Harald Welte <laforge@openmoko.org>
- * All rights reserved.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/mm.h>
-#include <linux/delay.h>
-#include <linux/fb.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/spinlock.h>
-#include <linux/io.h>
-#include <linux/mfd/glamo.h>
-
-#include <asm/div64.h>
-
-#ifdef CONFIG_PM
-#include <linux/pm.h>
-#endif
-
-#include <linux/glamofb.h>
-
-#include "glamo-regs.h"
-#include "glamo-core.h"
-
-static void glamofb_program_mode(struct glamofb_handle* glamo);
-
-struct glamofb_handle {
-	struct glamo_core *core;
-	struct fb_info *fb;
-	struct device *dev;
-	struct resource *reg;
-	struct resource *fb_res;
-	char __iomem *base;
-	struct glamo_fb_platform_data *mach_info;
-	char __iomem *cursor_addr;
-	int cursor_on;
-	u_int32_t pseudo_pal[16];
-	spinlock_t lock_cmd;
-	int blank_mode;
-	int mode_set; /* 0 if the current display mode hasn't been set on the glamo */
-	int output_enabled; /* 0 if the video output is disabled */
-};
-
-static void glamo_output_enable(struct glamofb_handle *gfb) {
-	struct glamo_core *gcore = gfb->core;
-
-	if (gfb->output_enabled)
-		return;
-
-	/* enable the pixel clock if off */
-	glamo_engine_clkreg_set(gcore,
-		GLAMO_ENGINE_LCD,
-		GLAMO_CLOCK_LCD_EN_DCLK,
-		GLAMO_CLOCK_LCD_EN_DCLK);
-
-	gfb->output_enabled = 1;
-	if (!gfb->mode_set)
-		glamofb_program_mode(gfb);
-}
-
-static void glamo_output_disable(struct glamofb_handle *gfb) {
-	struct glamo_core *gcore = gfb->core;
-
-	if (!gfb->output_enabled)
-		return;
-
-	/* enable the pixel clock if off */
-	glamo_engine_clkreg_set(gcore,
-		GLAMO_ENGINE_LCD,
-		GLAMO_CLOCK_LCD_EN_DCLK,
-		0);
-
-	gfb->output_enabled = 0;
-}
-
-
-static int reg_read(struct glamofb_handle *glamo,
-			   u_int16_t reg)
-{
-	int i = 0;
-
-	for (i = 0; i != 2; i++)
-		nop();
-
-	return readw(glamo->base + reg);
-}
-
-static void reg_write(struct glamofb_handle *glamo,
-			     u_int16_t reg, u_int16_t val)
-{
-	int i = 0;
-
-	for (i = 0; i != 2; i++)
-		nop();
-
-	writew(val, glamo->base + reg);
-}
-
-static struct glamo_script glamo_regs[] = {
-	{ GLAMO_REG_LCD_MODE1, 0x0020 },
-	/* no display rotation, no hardware cursor, no dither, no gamma,
-	 * no retrace flip, vsync low-active, hsync low active,
-	 * no TVCLK, no partial display, hw dest color from fb,
-	 * no partial display mode, LCD1, software flip,  */
-	{ GLAMO_REG_LCD_MODE2, 0x9020 },
-	  /* video flip, no ptr, no ptr, dhclk off,
-	   * normal mode,  no cpuif,
-	   * res, serial msb first, single fb, no fr ctrl,
-	   * cpu if bits all zero, no crc
-	   * 0000 0000 0010  0000 */
-	{ GLAMO_REG_LCD_MODE3, 0x0b40 },
-	  /* src data rgb565, res, 18bit rgb666
-	   * 000 01 011 0100 0000 */
-	{ GLAMO_REG_LCD_POLARITY, 0x440c },
-	  /* DE high active, no cpu/lcd if, cs0 force low, a0 low active,
-	   * np cpu if, 9bit serial data, sclk rising edge latch data
-	   * 01 00 0 100 0 000 01 0 0 */
-	/* The following values assume 640*480@16bpp */
-	{ GLAMO_REG_LCD_A_BASE1, 0x0000 }, /* display A base address 15:0 */
-	{ GLAMO_REG_LCD_A_BASE2, 0x0000 }, /* display A base address 22:16 */
-	{ GLAMO_REG_LCD_CURSOR_BASE1, 0xC000 }, /* cursor base address 15:0 */
-	{ GLAMO_REG_LCD_CURSOR_BASE2, 0x0012 }, /* cursor base address 22:16 */
-	{ GLAMO_REG_LCD_COMMAND2, 0x0000 }, /* display page A */
-};
-
-static int glamofb_run_script(struct glamofb_handle *glamo,
-				struct glamo_script *script, int len)
-{
-	int i;
-
-	if (glamo->core->suspending) {
-		dev_err(&glamo->core->pdev->dev,
-				"IGNORING glamofb_run_script while "
-								 "suspended\n");
-		return -EBUSY;
-	}
-
-	for (i = 0; i < len; i++) {
-		struct glamo_script *line = &script[i];
-
-		if (line->reg == 0xffff)
-			return 0;
-		else if (line->reg == 0xfffe)
-			msleep(line->val);
-		else
-			reg_write(glamo, script[i].reg, script[i].val);
-	}
-
-	return 0;
-}
-
-static int glamofb_check_var(struct fb_var_screeninfo *var,
-			     struct fb_info *info)
-{
-	struct glamofb_handle *glamo = info->par;
-
-	if (glamo->core->suspending) {
-		dev_err(&glamo->core->pdev->dev,
-				"IGNORING glamofb_check_var while "
-								 "suspended\n");
-		return -EBUSY;
-	}
-
-	if (var->bits_per_pixel != 16)
-		var->bits_per_pixel = 16;
-
-	var->height = glamo->mach_info->height;
-	var->width = glamo->mach_info->width;
-
-	/* FIXME: set rgb positions */
-	switch (var->bits_per_pixel) {
-	case 16:
-		switch (reg_read(glamo, GLAMO_REG_LCD_MODE3) & 0xc000) {
-		case GLAMO_LCD_SRC_RGB565:
-			var->red.offset		= 11;
-			var->green.offset	= 5;
-			var->blue.offset	= 0;
-			var->red.length		= 5;
-			var->green.length	= 6;
-			var->blue.length	= 5;
-			var->transp.length	= 0;
-			break;
-		case GLAMO_LCD_SRC_ARGB1555:
-			var->transp.offset	= 15;
-			var->red.offset		= 10;
-			var->green.offset	= 5;
-			var->blue.offset	= 0;
-			var->transp.length	= 1;
-			var->red.length		= 5;
-			var->green.length	= 5;
-			var->blue.length	= 5;
-			break;
-		case GLAMO_LCD_SRC_ARGB4444:
-			var->transp.offset	= 12;
-			var->red.offset		= 8;
-			var->green.offset	= 4;
-			var->blue.offset	= 0;
-			var->transp.length	= 4;
-			var->red.length		= 4;
-			var->green.length	= 4;
-			var->blue.length	= 4;
-			break;
-		}
-		break;
-	case 24:
-	case 32:
-	default:
-		/* The Smedia Glamo doesn't support anything but 16bit color */
-		printk(KERN_ERR
-		       "Smedia driver does not [yet?] support 24/32bpp\n");
-		return -EINVAL;
-	}
-
-	return 0;
-}
-
-static void reg_set_bit_mask(struct glamofb_handle *glamo,
-			     u_int16_t reg, u_int16_t mask,
-			     u_int16_t val)
-{
-	u_int16_t tmp;
-
-	val &= mask;
-
-	tmp = reg_read(glamo, reg);
-	tmp &= ~mask;
-	tmp |= val;
-	reg_write(glamo, reg, tmp);
-}
-
-#define GLAMO_LCD_WIDTH_MASK 0x03FF
-#define GLAMO_LCD_HEIGHT_MASK 0x03FF
-#define GLAMO_LCD_PITCH_MASK 0x07FE
-#define GLAMO_LCD_HV_TOTAL_MASK 0x03FF
-#define GLAMO_LCD_HV_RETR_START_MASK 0x03FF
-#define GLAMO_LCD_HV_RETR_END_MASK 0x03FF
-#define GLAMO_LCD_HV_RETR_DISP_START_MASK 0x03FF
-#define GLAMO_LCD_HV_RETR_DISP_END_MASK 0x03FF
-
-/* the caller has to enxure lock_cmd is held and we are in cmd mode */
-static void __rotate_lcd(struct glamofb_handle *glamo, __u32 rotation)
-{
-	int glamo_rot;
-
-	if (glamo->core->suspending) {
-		dev_err(&glamo->core->pdev->dev,
-				"IGNORING rotate_lcd while "
-								 "suspended\n");
-		return;
-	}
-
-	switch (rotation) {
-	case FB_ROTATE_CW:
-		glamo_rot = GLAMO_LCD_ROT_MODE_90;
-		break;
-	case FB_ROTATE_UD:
-		glamo_rot = GLAMO_LCD_ROT_MODE_180;
-		break;
-	case FB_ROTATE_CCW:
-		glamo_rot = GLAMO_LCD_ROT_MODE_270;
-		break;
-	default:
-		glamo_rot = GLAMO_LCD_ROT_MODE_0;
-		break;
-	}
-
-	reg_set_bit_mask(glamo,
-			 GLAMO_REG_LCD_WIDTH,
-			 GLAMO_LCD_ROT_MODE_MASK,
-			 glamo_rot);
-	reg_set_bit_mask(glamo,
-			 GLAMO_REG_LCD_MODE1,
-			 GLAMO_LCD_MODE1_ROTATE_EN,
-			 (glamo_rot != GLAMO_LCD_ROT_MODE_0) ?
-				 GLAMO_LCD_MODE1_ROTATE_EN : 0);
-}
-
-static void glamofb_program_mode(struct glamofb_handle* gfb) {
-	int sync, bp, disp, fp, total;
-	unsigned long flags;
-	struct glamo_core *gcore = gfb->core;
-	struct fb_var_screeninfo *var = &gfb->fb->var;
-
-	dev_dbg(&gcore->pdev->dev,
-			  "glamofb_program_mode spin_lock_irqsave\n");
-	spin_lock_irqsave(&gfb->lock_cmd, flags);
-
-	if (glamofb_cmd_mode(gfb, 1))
-		goto out_unlock;
-
-	if (var->pixclock)
-		glamo_engine_reclock(gcore,
-				     GLAMO_ENGINE_LCD,
-				     (1000000000UL / gfb->fb->var.pixclock) * 1000);
-
-	reg_set_bit_mask(gfb,
-			 GLAMO_REG_LCD_WIDTH,
-			 GLAMO_LCD_WIDTH_MASK,
-			 var->xres);
-	reg_set_bit_mask(gfb,
-			 GLAMO_REG_LCD_HEIGHT,
-			 GLAMO_LCD_HEIGHT_MASK,
-			 var->yres);
-	reg_set_bit_mask(gfb,
-			 GLAMO_REG_LCD_PITCH,
-			 GLAMO_LCD_PITCH_MASK,
-			 gfb->fb->fix.line_length);
-
-	/* honour the rotation request */
-	__rotate_lcd(gfb, var->rotate);
-
-	/* update scannout timings */
-	sync = 0;
-	bp = sync + var->hsync_len;
-	disp = bp + var->left_margin;
-	fp = disp + var->xres;
-	total = fp + var->right_margin;
-
-	reg_set_bit_mask(gfb, GLAMO_REG_LCD_HORIZ_TOTAL,
-			 GLAMO_LCD_HV_TOTAL_MASK, total);
-	reg_set_bit_mask(gfb, GLAMO_REG_LCD_HORIZ_RETR_START,
-			 GLAMO_LCD_HV_RETR_START_MASK, sync);
-	reg_set_bit_mask(gfb, GLAMO_REG_LCD_HORIZ_RETR_END,
-			 GLAMO_LCD_HV_RETR_END_MASK, bp);
-	reg_set_bit_mask(gfb, GLAMO_REG_LCD_HORIZ_DISP_START,
-			  GLAMO_LCD_HV_RETR_DISP_START_MASK, disp);
-	reg_set_bit_mask(gfb, GLAMO_REG_LCD_HORIZ_DISP_END,
-			 GLAMO_LCD_HV_RETR_DISP_END_MASK, fp);
-
-	sync = 0;
-	bp = sync + var->vsync_len;
-	disp = bp + var->upper_margin;
-	fp = disp + var->yres;
-	total = fp + var->lower_margin;
-
-	reg_set_bit_mask(gfb, GLAMO_REG_LCD_VERT_TOTAL,
-			 GLAMO_LCD_HV_TOTAL_MASK, total);
-	reg_set_bit_mask(gfb, GLAMO_REG_LCD_VERT_RETR_START,
-			  GLAMO_LCD_HV_RETR_START_MASK, sync);
-	reg_set_bit_mask(gfb, GLAMO_REG_LCD_VERT_RETR_END,
-			 GLAMO_LCD_HV_RETR_END_MASK, bp);
-	reg_set_bit_mask(gfb, GLAMO_REG_LCD_VERT_DISP_START,
-			 GLAMO_LCD_HV_RETR_DISP_START_MASK, disp);
-	reg_set_bit_mask(gfb, GLAMO_REG_LCD_VERT_DISP_END,
-			 GLAMO_LCD_HV_RETR_DISP_END_MASK, fp);
-
-	glamofb_cmd_mode(gfb, 0);
-
-	gfb->mode_set = 1;
-
-out_unlock:
-	dev_dbg(&gcore->pdev->dev,
-		      "glamofb_program_mode spin_unlock_irqrestore\n");
-	spin_unlock_irqrestore(&gfb->lock_cmd, flags);
-}
-
-
-static int glamofb_pan_display(struct fb_var_screeninfo *var,
-		struct fb_info *info)
-{
-	return 0;
-}
-
-static struct fb_videomode *glamofb_find_mode(struct fb_info *info,
-        struct fb_var_screeninfo *var) {
-	struct glamofb_handle *glamo = info->par;
-	struct glamo_fb_platform_data *mach_info = glamo->mach_info;
-	struct fb_videomode *mode;
-	int i;
-
-	for(i = mach_info->num_modes, mode = mach_info->modes; i > 0; --i, ++mode) {
-		if (mode->xres == var->xres &&
-		    mode->yres == var->yres)
-			return mode;
-	}
-
-	return NULL;
-}
-
-static int glamofb_set_par(struct fb_info *info)
-{
-	struct glamofb_handle *glamo = info->par;
-	struct fb_var_screeninfo *var = &info->var;
-	struct fb_videomode *mode;
-
-	if (glamo->core->suspending) {
-		dev_err(&glamo->core->pdev->dev,
-				"IGNORING glamofb_set_par while "
-								 "suspended\n");
-		return -EBUSY;
-	}
-
-	mode = glamofb_find_mode(info, var);
-	if (!mode)
-		return -EINVAL;
-
-	fb_videomode_to_var(var, mode);
-
-	info->mode = mode;
-
-	glamo->mode_set = 0;
-
-	switch(var->rotate) {
-	case FB_ROTATE_CW:
-	case FB_ROTATE_CCW:
-		info->fix.line_length = (var->yres * var->bits_per_pixel) / 8;
-		/* FIXME: Limit pixelclock */
-		var->pixclock *= 2;
-		break;
-	default:
-		info->fix.line_length = (var->xres * var->bits_per_pixel) / 8;
-		break;
-	}
-
-	if(glamo->output_enabled)
-		glamofb_program_mode(glamo);
-
-	return 0;
-}
-
-static int glamofb_blank(int blank_mode, struct fb_info *info)
-{
-	struct glamofb_handle *gfb = info->par;
-
-	dev_dbg(gfb->dev, "glamofb_blank(%u)\n", blank_mode);
-
-	switch (blank_mode) {
-	case FB_BLANK_VSYNC_SUSPEND:
-	case FB_BLANK_HSYNC_SUSPEND:
-		/* FIXME: add pdata hook/flag to indicate whether
-		 * we should already switch off pixel clock here */
-		break;
-	case FB_BLANK_POWERDOWN:
-		/* disable the pixel clock */
-		glamo_output_disable(gfb);
-		gfb->blank_mode = blank_mode;
-		break;
-	case FB_BLANK_UNBLANK:
-	case FB_BLANK_NORMAL:
-		glamo_output_enable(gfb);
-		gfb->blank_mode = blank_mode;
-		break;
-	}
-
-	/* FIXME: once we have proper clock management in glamo-core,
-	 * we can determine if other units need MCLK1 or the PLL, and
-	 * disable it if not used. */
-	return 0;
-}
-
-static inline unsigned int chan_to_field(unsigned int chan,
-					 struct fb_bitfield *bf)
-{
-	chan &= 0xffff;
-	chan >>= 16 - bf->length;
-	return chan << bf->offset;
-}
-
-static int glamofb_setcolreg(unsigned regno,
-			     unsigned red, unsigned green, unsigned blue,
-			     unsigned transp, struct fb_info *info)
-{
-	struct glamofb_handle *glamo = info->par;
-	unsigned int val;
-
-	if (glamo->core->suspending) {
-		dev_err(&glamo->core->pdev->dev,
-				"IGNORING glamofb_set_par while "
-								 "suspended\n");
-		return -EBUSY;
-	}
-
-	switch (glamo->fb->fix.visual) {
-	case FB_VISUAL_TRUECOLOR:
-	case FB_VISUAL_DIRECTCOLOR:
-		/* true-colour, use pseuo-palette */
-
-		if (regno < 16) {
-			u32 *pal = glamo->fb->pseudo_palette;
-
-			val  = chan_to_field(red, &glamo->fb->var.red);
-			val |= chan_to_field(green, &glamo->fb->var.green);
-			val |= chan_to_field(blue, &glamo->fb->var.blue);
-
-			pal[regno] = val;
-		};
-		break;
-	default:
-		return 1; /* unknown type */
-	}
-
-	return 0;
-}
-
-static int glamofb_ioctl(struct fb_info *info, unsigned int cmd,
-                         unsigned long arg) {
-	struct glamofb_handle *gfb = (struct glamofb_handle*)info->par;
-	struct glamo_core *gcore = gfb->core;
-	int retval = -ENOTTY;
-
-	switch (cmd) {
-	case GLAMOFB_ENGINE_ENABLE:
-		retval = glamo_engine_enable(gcore, arg);
-		break;
-	case GLAMOFB_ENGINE_DISABLE:
-		retval = glamo_engine_disable(gcore, arg);
-		break;
-	case GLAMOFB_ENGINE_RESET:
-		glamo_engine_reset(gcore, arg);
-		retval = 0;
-		break;
-	default:
-		break;
-	}
-
-	return retval;
-}
-
-
-#ifdef CONFIG_MFD_GLAMO_HWACCEL
-static inline void glamofb_vsync_wait(struct glamofb_handle *glamo,
-		int line, int size, int range)
-{
-	int count[2];
-
-	do {
-		count[0] = reg_read(glamo, GLAMO_REG_LCD_STATUS2) & 0x3ff;
-		count[1] = reg_read(glamo, GLAMO_REG_LCD_STATUS2) & 0x3ff;
-	} while (count[0] != count[1] ||
-			(line < count[0] + range &&
-			 size > count[0] - range) ||
-			count[0] < range * 2);
-}
-
-/*
- * Enable/disable the hardware cursor mode altogether
- * (for blinking and such, use glamofb_cursor()).
- */
-static void glamofb_cursor_onoff(struct glamofb_handle *glamo, int on)
-{
-	int y, size;
-
-	if (glamo->cursor_on) {
-		y = reg_read(glamo, GLAMO_REG_LCD_CURSOR_Y_POS);
-		size = reg_read(glamo, GLAMO_REG_LCD_CURSOR_Y_SIZE);
-
-		glamofb_vsync_wait(glamo, y, size, 30);
-	}
-
-	reg_set_bit_mask(glamo, GLAMO_REG_LCD_MODE1,
-			GLAMO_LCD_MODE1_CURSOR_EN,
-			on ? GLAMO_LCD_MODE1_CURSOR_EN : 0);
-	glamo->cursor_on = on;
-
-	/* Hide the cursor by default */
-	reg_write(glamo, GLAMO_REG_LCD_CURSOR_X_SIZE, 0);
-}
-
-static int glamofb_cursor(struct fb_info *info, struct fb_cursor *cursor)
-{
-	struct glamofb_handle *glamo = info->par;
-	unsigned long flags;
-
-	spin_lock_irqsave(&glamo->lock_cmd, flags);
-
-	reg_write(glamo, GLAMO_REG_LCD_CURSOR_X_SIZE,
-			cursor->enable ? cursor->image.width : 0);
-
-	if (cursor->set & FB_CUR_SETPOS) {
-		reg_write(glamo, GLAMO_REG_LCD_CURSOR_X_POS,
-			  cursor->image.dx);
-		reg_write(glamo, GLAMO_REG_LCD_CURSOR_Y_POS,
-			  cursor->image.dy);
-	}
-
-	if (cursor->set & FB_CUR_SETCMAP) {
-		uint16_t fg = glamo->pseudo_pal[cursor->image.fg_color];
-		uint16_t bg = glamo->pseudo_pal[cursor->image.bg_color];
-
-		reg_write(glamo, GLAMO_REG_LCD_CURSOR_FG_COLOR, fg);
-		reg_write(glamo, GLAMO_REG_LCD_CURSOR_BG_COLOR, bg);
-		reg_write(glamo, GLAMO_REG_LCD_CURSOR_DST_COLOR, fg);
-	}
-
-	if (cursor->set & FB_CUR_SETHOT)
-		reg_write(glamo, GLAMO_REG_LCD_CURSOR_PRESET,
-				(cursor->hot.x << 8) | cursor->hot.y);
-
-	if ((cursor->set & FB_CUR_SETSIZE) ||
-	    (cursor->set & (FB_CUR_SETIMAGE | FB_CUR_SETSHAPE))) {
-		int x, y, pitch, op;
-		const uint8_t *pcol = cursor->image.data;
-		const uint8_t *pmsk = cursor->mask;
-		uint8_t __iomem *dst = glamo->cursor_addr;
-		uint8_t dcol = 0;
-		uint8_t dmsk = 0;
-		uint8_t byte = 0;
-
-		if (cursor->image.depth > 1) {
-			spin_unlock_irqrestore(&glamo->lock_cmd, flags);
-			return -EINVAL;
-		}
-
-		pitch = ((cursor->image.width + 7) >> 2) & ~1;
-		reg_write(glamo, GLAMO_REG_LCD_CURSOR_PITCH,
-			pitch);
-		reg_write(glamo, GLAMO_REG_LCD_CURSOR_Y_SIZE,
-			cursor->image.height);
-
-		for (y = 0; y < cursor->image.height; y++) {
-			byte = 0;
-			for (x = 0; x < cursor->image.width; x++) {
-				if ((x % 8) == 0) {
-					dcol = *pcol++;
-					dmsk = *pmsk++;
-				} else {
-					dcol >>= 1;
-					dmsk >>= 1;
-				}
-
-				if (cursor->rop == ROP_COPY)
-					op = (dmsk & 1) ?
-						(dcol & 1) ? 1 : 3 : 0;
-				else
-					op = ((dmsk & 1) << 1) |
-						((dcol & 1) << 0);
-				byte |= op << ((x & 3) << 1);
-
-				if (x % 4 == 3) {
-					writeb(byte, dst + x / 4);
-					byte = 0;
-				}
-			}
-			if (x % 4) {
-				writeb(byte, dst + x / 4);
-				byte = 0;
-			}
-
-			dst += pitch;
-		}
-	}
-
-	spin_unlock_irqrestore(&glamo->lock_cmd, flags);
-
-	return 0;
-}
-#endif
-
-static inline int glamofb_cmdq_empty(struct glamofb_handle *gfb)
-{
-	/* DGCMdQempty -- 1 == command queue is empty */
-	return reg_read(gfb, GLAMO_REG_LCD_STATUS1) & (1 << 15);
-}
-
-/* call holding gfb->lock_cmd  when locking, until you unlock */
-int glamofb_cmd_mode(struct glamofb_handle *gfb, int on)
-{
-	int timeout = 2000000;
-
-	if (gfb->core->suspending) {
-		dev_err(&gfb->core->pdev->dev,
-				"IGNORING glamofb_cmd_mode while "
-								 "suspended\n");
-		return -EBUSY;
-	}
-
-	dev_dbg(gfb->dev, "glamofb_cmd_mode(gfb=%p, on=%d)\n", gfb, on);
-	if (on) {
-		dev_dbg(gfb->dev, "%s: waiting for cmdq empty: ",
-			__func__);
-		while ((!glamofb_cmdq_empty(gfb)) && (timeout--))
-			cpu_relax();
-		if (timeout < 0) {
-			printk(KERN_ERR"*************"
-				       "glamofb cmd_queue never got empty"
-				       "*************\n");
-			return -EIO;
-		}
-		dev_dbg(gfb->dev, "empty!\n");
-
-		/* display the entire frame then switch to command */
-		reg_write(gfb, GLAMO_REG_LCD_COMMAND1,
-			  GLAMO_LCD_CMD_TYPE_DISP |
-			  GLAMO_LCD_CMD_DATA_FIRE_VSYNC);
-
-		/* wait until lcd idle */
-		dev_dbg(gfb->dev, "waiting for lcd idle: ");
-		timeout = 2000000;
-		while ((!reg_read(gfb, GLAMO_REG_LCD_STATUS2) & (1 << 12)) &&
-		      (timeout--))
-			cpu_relax();
-		if (timeout < 0) {
-			printk(KERN_ERR"*************"
-				       "glamofb lcd never idle"
-				       "*************\n");
-			return -EIO;
-		}
-
-		mdelay(100);
-
-		dev_dbg(gfb->dev, "cmd mode entered\n");
-
-	} else {
-		/* RGB interface needs vsync/hsync */
-		if (reg_read(gfb, GLAMO_REG_LCD_MODE3) & GLAMO_LCD_MODE3_RGB)
-			reg_write(gfb, GLAMO_REG_LCD_COMMAND1,
-				  GLAMO_LCD_CMD_TYPE_DISP |
-				  GLAMO_LCD_CMD_DATA_DISP_SYNC);
-
-		reg_write(gfb, GLAMO_REG_LCD_COMMAND1,
-			  GLAMO_LCD_CMD_TYPE_DISP |
-			  GLAMO_LCD_CMD_DATA_DISP_FIRE);
-	}
-
-	return 0;
-}
-EXPORT_SYMBOL_GPL(glamofb_cmd_mode);
-
-
-int glamofb_cmd_write(struct glamofb_handle *gfb, u_int16_t val)
-{
-	int timeout = 200000;
-
-	if (gfb->core->suspending) {
-		dev_err(&gfb->core->pdev->dev,
-				"IGNORING glamofb_cmd_write while "
-								 "suspended\n");
-		return -EBUSY;
-	}
-
-	dev_dbg(gfb->dev, "%s: waiting for cmdq empty\n", __func__);
-	while ((!glamofb_cmdq_empty(gfb)) && (timeout--))
-		yield();
-	if (timeout < 0) {
-		printk(KERN_ERR"*************"
-				"glamofb cmd_queue never got empty"
-				"*************\n");
-		return 1;
-	}
-	dev_dbg(gfb->dev, "idle, writing 0x%04x\n", val);
-
-	reg_write(gfb, GLAMO_REG_LCD_COMMAND1, val);
-
-	return 0;
-}
-EXPORT_SYMBOL_GPL(glamofb_cmd_write);
-
-static struct fb_ops glamofb_ops = {
-	.owner		= THIS_MODULE,
-	.fb_check_var	= glamofb_check_var,
-	.fb_pan_display	= glamofb_pan_display,
-	.fb_set_par	= glamofb_set_par,
-	.fb_blank	= glamofb_blank,
-	.fb_setcolreg	= glamofb_setcolreg,
-	.fb_ioctl = glamofb_ioctl,
-#ifdef CONFIG_MFD_GLAMO_HWACCEL
-	.fb_cursor	= glamofb_cursor,
-#endif
-	.fb_fillrect	= cfb_fillrect,
-	.fb_copyarea	= cfb_copyarea,
-	.fb_imageblit	= cfb_imageblit,
-};
-
-static int glamofb_init_regs(struct glamofb_handle *glamo)
-{
-	struct fb_info *info = glamo->fb;
-
-	glamofb_check_var(&info->var, info);
-	glamofb_run_script(glamo, glamo_regs, ARRAY_SIZE(glamo_regs));
-	glamofb_set_par(info);
-
-	return 0;
-}
-
-static int __init glamofb_probe(struct platform_device *pdev)
-{
-	int rc = -EIO;
-	struct fb_info *fbinfo;
-	struct glamofb_handle *glamofb;
-	struct glamo_core *core = dev_get_drvdata(pdev->dev.parent);
-	struct glamo_fb_platform_data *mach_info;
-
-	printk(KERN_INFO "SMEDIA Glamo frame buffer driver (C) 2007 "
-		"Openmoko, Inc.\n");
-
-	if (!core->pdata || !core->pdata->fb_data)
-		return -ENOENT;
-
-
-	fbinfo = framebuffer_alloc(sizeof(struct glamofb_handle), &pdev->dev);
-	if (!fbinfo)
-		return -ENOMEM;
-
-
-	glamofb = fbinfo->par;
-	glamofb->fb = fbinfo;
-	glamofb->dev = &pdev->dev;
-
-	glamofb->blank_mode = FB_BLANK_POWERDOWN;
-
-	strcpy(fbinfo->fix.id, "SMedia Glamo");
-
-	glamofb->reg = platform_get_resource_byname(pdev, IORESOURCE_MEM,
-						    "glamo-fb-regs");
-	if (!glamofb->reg) {
-		dev_err(&pdev->dev, "platform device with no registers?\n");
-		rc = -ENOENT;
-		goto out_free;
-	}
-
-	glamofb->fb_res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
-							"glamo-fb-mem");
-	if (!glamofb->fb_res) {
-		dev_err(&pdev->dev, "platform device with no memory ?\n");
-		rc = -ENOENT;
-		goto out_free;
-	}
-
-	glamofb->reg = request_mem_region(glamofb->reg->start,
-					  resource_size(glamofb->reg), pdev->name);
-	if (!glamofb->reg) {
-		dev_err(&pdev->dev, "failed to request mmio region\n");
-		goto out_free;
-	}
-
-	glamofb->fb_res = request_mem_region(glamofb->fb_res->start,
-					     resource_size(glamofb->fb_res),
-					     pdev->name);
-	if (!glamofb->fb_res) {
-		dev_err(&pdev->dev, "failed to request vram region\n");
-		goto out_release_reg;
-	}
-
-	/* we want to remap only the registers required for this core
-	 * driver. */
-	glamofb->base = ioremap_nocache(glamofb->reg->start, resource_size(glamofb->reg));
-	if (!glamofb->base) {
-		dev_err(&pdev->dev, "failed to ioremap() mmio memory\n");
-		goto out_release_fb;
-	}
-
-	fbinfo->fix.smem_start = (unsigned long) glamofb->fb_res->start;
-	fbinfo->fix.smem_len = (__u32) resource_size(glamofb->fb_res);
-
-	fbinfo->screen_base = ioremap(glamofb->fb_res->start,
-				       resource_size(glamofb->fb_res));
-	if (!fbinfo->screen_base) {
-		dev_err(&pdev->dev, "failed to ioremap() vram memory\n");
-		goto out_release_fb;
-	}
-	glamofb->cursor_addr = fbinfo->screen_base + 0x12C000;
-
-	platform_set_drvdata(pdev, glamofb);
-
-	mach_info = core->pdata->fb_data;
-	glamofb->core = core;
-	glamofb->mach_info = mach_info;
-
-	fbinfo->fix.visual = FB_VISUAL_TRUECOLOR;
-	fbinfo->fix.type = FB_TYPE_PACKED_PIXELS;
-	fbinfo->fix.type_aux = 0;
-	fbinfo->fix.xpanstep = 0;
-	fbinfo->fix.ypanstep = 0;
-	fbinfo->fix.ywrapstep = 0;
-	fbinfo->fix.accel = FB_ACCEL_GLAMO;
-
-
-	fbinfo->fbops = &glamofb_ops;
-	fbinfo->flags = FBINFO_FLAG_DEFAULT;
-	fbinfo->pseudo_palette = &glamofb->pseudo_pal;
-
-	fbinfo->mode = mach_info->modes;
-	fb_videomode_to_var(&fbinfo->var, fbinfo->mode);
-	fbinfo->var.bits_per_pixel = 16;
-	fbinfo->var.nonstd = 0;
-	fbinfo->var.activate = FB_ACTIVATE_NOW;
-	fbinfo->var.height = mach_info->height;
-	fbinfo->var.width = mach_info->width;
-	fbinfo->var.accel_flags = 0;
-	fbinfo->var.vmode = FB_VMODE_NONINTERLACED;
-
-	glamo_engine_enable(core, GLAMO_ENGINE_LCD);
-	glamo_engine_reset(core, GLAMO_ENGINE_LCD);
-	glamofb->output_enabled = 1;
-	glamofb->mode_set = 1;
-
-	dev_info(&pdev->dev, "spin_lock_init\n");
-	spin_lock_init(&glamofb->lock_cmd);
-	glamofb_init_regs(glamofb);
-#ifdef CONFIG_MFD_GLAMO_HWACCEL
-	glamofb_cursor_onoff(glamofb, 1);
-#endif
-
-	fb_videomode_to_modelist(mach_info->modes, mach_info->num_modes,
-	                         &fbinfo->modelist);
-
-	rc = register_framebuffer(fbinfo);
-	if (rc < 0) {
-		dev_err(&pdev->dev, "failed to register framebuffer\n");
-		goto out_unmap_fb;
-	}
-
-	printk(KERN_INFO "fb%d: %s frame buffer device\n",
-		fbinfo->node, fbinfo->fix.id);
-
-	return 0;
-
-out_unmap_fb:
-	iounmap(fbinfo->screen_base);
-	iounmap(glamofb->base);
-out_release_fb:
-	release_mem_region(glamofb->fb_res->start, resource_size(glamofb->fb_res));
-out_release_reg:
-	release_mem_region(glamofb->reg->start, resource_size(glamofb->reg));
-out_free:
-	framebuffer_release(fbinfo);
-	return rc;
-}
-
-static int glamofb_remove(struct platform_device *pdev)
-{
-	struct glamofb_handle *glamofb = platform_get_drvdata(pdev);
-
-	platform_set_drvdata(pdev, NULL);
-	iounmap(glamofb->base);
-	release_mem_region(glamofb->reg->start, resource_size(glamofb->reg));
-	kfree(glamofb);
-
-	return 0;
-}
-
-#ifdef CONFIG_PM
-
-static int glamofb_suspend(struct device *dev)
-{
-	struct glamofb_handle *gfb = dev_get_drvdata(dev);
-
-	/* we need to stop anything touching our framebuffer */
-	fb_set_suspend(gfb->fb, 1);
-
-	/* seriously -- nobody is allowed to touch glamo memory when we
-	 * are suspended or we lock on nWAIT
-	 */
-	/* iounmap(gfb->fb->screen_base); */
-
-	return 0;
-}
-
-static int glamofb_resume(struct device *dev)
-{
-	struct glamofb_handle *gfb = dev_get_drvdata(dev);
-
-	/* OK let's allow framebuffer ops again */
-	/* gfb->fb->screen_base = ioremap(gfb->fb_res->start,
-				       resource_size(gfb->fb_res)); */
-	glamo_engine_enable(gfb->core, GLAMO_ENGINE_LCD);
-	glamo_engine_reset(gfb->core, GLAMO_ENGINE_LCD);
-
-	glamofb_init_regs(gfb);
-#ifdef CONFIG_MFD_GLAMO_HWACCEL
-	glamofb_cursor_onoff(gfb, 1);
-#endif
-
-	fb_set_suspend(gfb->fb, 0);
-
-	return 0;
-}
-
-static struct dev_pm_ops glamofb_pm_ops = {
-	.suspend = glamofb_suspend,
-	.resume = glamofb_resume,
-};
-
-#define GLAMOFB_PM_OPS (&glamofb_pm_ops)
-
-#else
-#define GLAMOFB_PM_OPS NULL
-#endif
-
-static struct platform_driver glamofb_driver = {
-	.probe		= glamofb_probe,
-	.remove		= glamofb_remove,
-	.driver		= {
-		.name	= "glamo-fb",
-		.owner	= THIS_MODULE,
-		.pm     = GLAMOFB_PM_OPS
-	},
-};
-
-static int __devinit glamofb_init(void)
-{
-	return platform_driver_register(&glamofb_driver);
-}
-
-static void __exit glamofb_cleanup(void)
-{
-	platform_driver_unregister(&glamofb_driver);
-}
-
-module_init(glamofb_init);
-module_exit(glamofb_cleanup);
-
-MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
-MODULE_DESCRIPTION("Smedia Glamo 336x/337x framebuffer driver");
-MODULE_LICENSE("GPL");
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-gpio.c b/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-gpio.c
deleted file mode 100644
index 6978e6223..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-gpio.c
+++ /dev/null
@@ -1,281 +0,0 @@
-/* Smedia Glamo 336x/337x gpio driver
- *
- * (C) 2009 Lars-Peter Clausen
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/spinlock.h>
-#include <linux/io.h>
-#include <linux/platform_device.h>
-
-#include <linux/gpio.h>
-#include <linux/mfd/glamo.h>
-
-#include "glamo-core.h"
-#include "glamo-regs.h"
-
-#define GLAMO_NR_GPIO 21
-#define GLAMO_NR_GPIO_REGS DIV_ROUND_UP(GLAMO_NR_GPIO, 4)
-
-#define GLAMO_REG_GPIO(x) (((x) * 2) + GLAMO_REG_GPIO_GEN1)
-
-struct glamo_gpio {
-	struct glamo_core *glamo;
-	struct gpio_chip chip;
-	uint16_t saved_regs[GLAMO_NR_GPIO_REGS];
-};
-
-#define REG_OF_GPIO(gpio)   (GLAMO_REG_GPIO(gpio >> 2))
-#define NUM_OF_GPIO(gpio)	(gpio & 0x3)
-#define DIRECTION_BIT(gpio)	(1 << (NUM_OF_GPIO(gpio) + 0))
-#define OUTPUT_BIT(gpio)	(1 << (NUM_OF_GPIO(gpio) + 4))
-#define INPUT_BIT(gpio)		(1 << (NUM_OF_GPIO(gpio) + 8))
-#define FUNC_BIT(gpio)		(1 << (NUM_OF_GPIO(gpio) + 12))
-
-
-static inline struct glamo_core *chip_to_glamo(struct gpio_chip *chip)
-{
-	return container_of(chip, struct glamo_gpio, chip)->glamo;
-}
-
-static void glamo_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
-{
-	struct glamo_core *glamo = chip_to_glamo(chip);
-	unsigned int reg = REG_OF_GPIO(offset);
-	u_int16_t tmp;
-
-	spin_lock(&glamo->lock);
-	tmp = readw(glamo->base + reg);
-	if (value)
-		tmp |= OUTPUT_BIT(offset);
-	else
-		tmp &= ~OUTPUT_BIT(offset);
-	writew(tmp, glamo->base + reg);
-	spin_unlock(&glamo->lock);
-}
-
-static int glamo_gpio_get(struct gpio_chip *chip, unsigned offset)
-{
-	struct glamo_core *glamo = chip_to_glamo(chip);
-	return readw(glamo->base + REG_OF_GPIO(offset)) & INPUT_BIT(offset) ? 1 : 0;
-}
-
-static int glamo_gpio_request(struct gpio_chip *chip, unsigned offset)
-{
-	struct glamo_core *glamo = chip_to_glamo(chip);
-	unsigned int reg = REG_OF_GPIO(offset);
-	u_int16_t tmp;
-
-	spin_lock(&glamo->lock);
-	tmp = readw(glamo->base + reg);
-	if ((tmp & FUNC_BIT(offset)) == 0) {
-		tmp |= FUNC_BIT(offset);
-		writew(tmp, glamo->base + reg);
-	}
-	spin_unlock(&glamo->lock);
-
-	return 0;
-}
-
-static void glamo_gpio_free(struct gpio_chip *chip, unsigned offset)
-{
-	struct glamo_core *glamo = chip_to_glamo(chip);
-	unsigned int reg = REG_OF_GPIO(offset);
-	u_int16_t tmp;
-
-	spin_lock(&glamo->lock);
-	tmp = readw(glamo->base + reg);
-	if ((tmp & FUNC_BIT(offset)) == 1) {
-		tmp &= ~FUNC_BIT(offset);
-		writew(tmp, glamo->base + reg);
-	}
-	spin_unlock(&glamo->lock);
-}
-
-static int glamo_gpio_direction_output(struct gpio_chip *chip, unsigned offset,
-						int value)
-{
-	struct glamo_core *glamo = chip_to_glamo(chip);
-	unsigned int reg = REG_OF_GPIO(offset);
-	u_int16_t tmp;
-
-	spin_lock(&glamo->lock);
-	tmp = readw(glamo->base + reg);
-    tmp &= ~DIRECTION_BIT(offset);
-
-	if (value)
-		tmp |= OUTPUT_BIT(offset);
-	else
-		tmp &= ~OUTPUT_BIT(offset);
-
-	writew(tmp, glamo->base + reg);
-	spin_unlock(&glamo->lock);
-
-	return 0;
-}
-
-static int glamo_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
-{
-	struct glamo_core *glamo = chip_to_glamo(chip);
-	unsigned int reg = REG_OF_GPIO(offset);
-	u_int16_t tmp;
-
-	spin_lock(&glamo->lock);
-	tmp = readw(glamo->base + reg);
-	if ((tmp & DIRECTION_BIT(offset)) == 0) {
-		tmp |= DIRECTION_BIT(offset);
-		writew(tmp, glamo->base + reg);
-	}
-	spin_unlock(&glamo->lock);
-
-	return 0;
-}
-
-static const struct __devinit gpio_chip glamo_gpio_chip = {
-	.label				= "glamo",
-	.request			= glamo_gpio_request,
-	.free				= glamo_gpio_free,
-	.direction_input	= glamo_gpio_direction_input,
-	.get				= glamo_gpio_get,
-	.direction_output	= glamo_gpio_direction_output,
-	.set				= glamo_gpio_set,
-	.base				= -1,
-	.ngpio				= GLAMO_NR_GPIO,
-	.can_sleep			= 0,
-	.owner             = THIS_MODULE,
-};
-
-static int __devinit glamo_gpio_probe(struct platform_device *pdev)
-{
-	struct glamo_platform_data *pdata = pdev->dev.parent->platform_data;
-	struct glamo_gpio *glamo_gpio;
-	int ret;
-
-	glamo_gpio = kzalloc(sizeof(struct glamo_gpio), GFP_KERNEL);
-	if (!glamo_gpio)
-		return -ENOMEM;
-
-	glamo_gpio->glamo = dev_get_drvdata(pdev->dev.parent);
-	glamo_gpio->chip = glamo_gpio_chip;
-	glamo_gpio->chip.dev = &pdev->dev;
-	if (pdata)
-		glamo_gpio->chip.base = pdata->gpio_base;
-
-	ret = gpiochip_add(&glamo_gpio->chip);
-
-	if (ret) {
-		dev_err(&pdev->dev, "Could not register gpio chip: %d\n", ret);
-		goto err;
-	}
-
-	platform_set_drvdata(pdev, glamo_gpio);
-	return 0;
-err:
-	kfree(glamo_gpio);
-	return ret;
-}
-
-static int __devexit glamo_gpio_remove(struct platform_device *pdev)
-{
-	struct glamo_gpio *glamo_gpio = platform_get_drvdata(pdev);
-	int ret;
-
-	ret = gpiochip_remove(&glamo_gpio->chip);
-	if (!ret)
-		goto done;
-
-	platform_set_drvdata(pdev, NULL);
-	kfree(glamo_gpio);
-
-done:
-	return ret;
-}
-
-#ifdef CONFIG_PM
-
-static int glamo_gpio_suspend(struct device *dev)
-{
-	struct glamo_gpio *glamo_gpio = dev_get_drvdata(dev);
-	struct glamo_core *glamo = glamo_gpio->glamo;
-	uint16_t *saved_regs = glamo_gpio->saved_regs;
-	int i;
-
-	spin_lock(&glamo->lock);
-	for (i = 0; i < GLAMO_NR_GPIO / 4; ++i)
-		saved_regs[i] = readw(glamo->base + GLAMO_REG_GPIO(i));
-	spin_unlock(&glamo->lock);
-
-	return 0;
-}
-
-static int glamo_gpio_resume(struct device *dev)
-{
-	struct glamo_gpio *glamo_gpio = dev_get_drvdata(dev);
-	struct glamo_core *glamo = glamo_gpio->glamo;
-	uint16_t *saved_regs = glamo_gpio->saved_regs;
-	int i;
-
-	spin_lock(&glamo->lock);
-	for (i = 0; i < GLAMO_NR_GPIO_REGS; ++i)
-		writew(saved_regs[i], glamo->base + GLAMO_REG_GPIO(i));
-	spin_unlock(&glamo->lock);
-	return 0;
-}
-
-static const struct dev_pm_ops glamo_pm_ops = {
-	.suspend = glamo_gpio_suspend,
-	.resume  = glamo_gpio_resume,
-	.freeze  = glamo_gpio_suspend,
-	.thaw    = glamo_gpio_resume,
-};
-
-#define GLAMO_GPIO_PM_OPS (&glamo_pm_ops)
-
-#else
-#define GLAMO_GPIO_PM_OPS NULL
-#endif
-
-static struct platform_driver glamo_gpio_driver = {
-	.driver = {
-		.name  = "glamo-gpio",
-		.owner = THIS_MODULE,
-		.pm    = GLAMO_GPIO_PM_OPS,
-	},
-	.probe = glamo_gpio_probe,
-	.remove = __devexit_p(glamo_gpio_remove),
-};
-
-static int __devinit glamo_gpio_init(void)
-{
-	return platform_driver_register(&glamo_gpio_driver);
-}
-
-static void __exit glamo_gpio_exit(void)
-{
-	platform_driver_unregister(&glamo_gpio_driver);
-}
-
-module_init(glamo_gpio_init);
-module_exit(glamo_gpio_exit);
-
-MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
-MODULE_DESCRIPTION("GPIO interface for the Glamo multimedia device");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:glamo-gpio");
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-mci.c b/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-mci.c
deleted file mode 100644
index b728c8745..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-mci.c
+++ /dev/null
@@ -1,987 +0,0 @@
-/*
- *  linux/drivers/mmc/host/glamo-mmc.c - Glamo MMC driver
- *
- *  Copyright (C) 2007 Openmoko, Inc,  Andy Green <andy@openmoko.com>
- *  Based on S3C MMC driver that was:
- *  Copyright (C) 2004-2006 maintech GmbH, Thomas Kleffel <tk@maintech.de>
- *
- * 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.
- */
-
-#include <linux/module.h>
-#include <linux/mmc/mmc.h>
-#include <linux/mmc/sd.h>
-#include <linux/mmc/host.h>
-#include <linux/platform_device.h>
-#include <linux/irq.h>
-#include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/workqueue.h>
-#include <linux/crc7.h>
-#include <linux/scatterlist.h>
-#include <linux/io.h>
-#include <linux/regulator/consumer.h>
-#include <linux/mfd/glamo.h>
-
-#include "glamo-core.h"
-#include "glamo-regs.h"
-
-#define DRIVER_NAME "glamo-mci"
-
-struct glamo_mci_host {
-	struct glamo_mmc_platform_data *pdata;
-	struct platform_device *pdev;
-	struct glamo_core      *core;
-	struct mmc_host        *mmc;
-	struct resource        *mmio_mem;
-	struct resource        *data_mem;
-	void __iomem           *mmio_base;
-	u16 __iomem            *data_base;
-
-	struct regulator *regulator;
-	struct mmc_request *mrq;
-
-	unsigned int clk_rate;
-
-	unsigned short vdd;
-	char           power_mode;
-
-	unsigned char request_counter;
-
-	struct timer_list disable_timer;
-
-	struct work_struct irq_work;
-	struct work_struct read_work;
-
-	unsigned clk_enabled : 1;
-
-};
-
-static void glamo_mci_send_request(struct mmc_host *mmc, struct mmc_request* mrq);
-static void glamo_mci_send_command(struct glamo_mci_host *host,
-				  struct mmc_command *cmd);
-
-/*
- * Max SD clock rate
- *
- * held at /(3 + 1) due to concerns of 100R recommended series resistor
- * allows 16MHz @ 4-bit --> 8MBytes/sec raw
- *
- * you can override this on kernel commandline using
- *
- *   glamo_mci.sd_max_clk=10000000
- *
- * for example
- */
-
-static int sd_max_clk = 21000000;
-module_param(sd_max_clk, int, 0644);
-
-/*
- * Slow SD clock rate
- *
- * you can override this on kernel commandline using
- *
- *   glamo_mci.sd_slow_ratio=8
- *
- * for example
- *
- * platform callback is used to decide effective clock rate, if not
- * defined then max is used, if defined and returns nonzero, rate is
- * divided by this factor
- */
-
-static int sd_slow_ratio = 8;
-module_param(sd_slow_ratio, int, 0644);
-
-/*
- * Post-power SD clock rate
- *
- * you can override this on kernel commandline using
- *
- *   glamo_mci.sd_post_power_clock=1000000
- *
- * for example
- *
- * After changing power to card, clock is held at this rate until first bulk
- * transfer completes
- */
-
-static int sd_post_power_clock = 1000000;
-module_param(sd_post_power_clock, int, 0644);
-
-
-static inline void glamo_reg_write(struct glamo_mci_host *glamo,
-				u_int16_t reg, u_int16_t val)
-{
-	writew(val, glamo->mmio_base + reg);
-}
-
-static inline u_int16_t glamo_reg_read(struct glamo_mci_host *glamo,
-				   u_int16_t reg)
-{
-	return readw(glamo->mmio_base + reg);
-}
-
-static void glamo_reg_set_bit_mask(struct glamo_mci_host *glamo,
-				u_int16_t reg, u_int16_t mask,
-				u_int16_t val)
-{
-	u_int16_t tmp;
-
-	val &= mask;
-
-	tmp = glamo_reg_read(glamo, reg);
-	tmp &= ~mask;
-	tmp |= val;
-	glamo_reg_write(glamo, reg, tmp);
-}
-
-static void glamo_mci_clock_disable(struct glamo_mci_host *host) {
-	if (host->clk_enabled) {
-		glamo_engine_div_disable(host->core, GLAMO_ENGINE_MMC);
-		host->clk_enabled = 0;
-	}
-}
-
-static void glamo_mci_clock_enable(struct glamo_mci_host *host) {
-	del_timer_sync(&host->disable_timer);
-
-	if (!host->clk_enabled) {
-		glamo_engine_div_enable(host->core, GLAMO_ENGINE_MMC);
-		host->clk_enabled = 1;
-	}
-}
-
-static void glamo_mci_disable_timer(unsigned long data) {
-	struct glamo_mci_host *host = (struct glamo_mci_host *)data;
-	glamo_mci_clock_disable(host);
-}
-
-
-static void do_pio_read(struct glamo_mci_host *host, struct mmc_data *data)
-{
-	struct scatterlist *sg;
-	u16 __iomem *from_ptr = host->data_base;
-	void *sg_pointer;
-
-	dev_dbg(&host->pdev->dev, "pio_read():\n");
-	for (sg = data->sg; sg; sg = sg_next(sg)) {
-		sg_pointer = page_address(sg_page(sg)) + sg->offset;
-
-
-		memcpy(sg_pointer, from_ptr, sg->length);
-		from_ptr += sg->length >> 1;
-
-		data->bytes_xfered += sg->length;
-	}
-
-	dev_dbg(&host->pdev->dev, "pio_read(): "
-			"complete (no more data).\n");
-}
-
-static void do_pio_write(struct glamo_mci_host *host, struct mmc_data *data)
-{
-	struct scatterlist *sg;
-	u16 __iomem *to_ptr = host->data_base;
-	void *sg_pointer;
-
-	dev_dbg(&host->pdev->dev, "pio_write():\n");
-	for (sg = data->sg; sg; sg = sg_next(sg)) {
-		sg_pointer = page_address(sg_page(sg)) + sg->offset;
-
-		data->bytes_xfered += sg->length;
-
-		memcpy(to_ptr, sg_pointer, sg->length);
-		to_ptr += sg->length >> 1;
-	}
-
-	dev_dbg(&host->pdev->dev, "pio_write(): complete\n");
-}
-
-static int glamo_mci_set_card_clock(struct glamo_mci_host *host, int freq)
-{
-	int real_rate = 0;
-
-	if (freq) {
-		glamo_mci_clock_enable(host);
-		real_rate = glamo_engine_reclock(host->core, GLAMO_ENGINE_MMC, freq);
-	} else {
-		glamo_mci_clock_disable(host);
-	}
-
-	return real_rate;
-}
-
-static void glamo_mci_request_done(struct glamo_mci_host *host, struct
-mmc_request *mrq) {
-	mod_timer(&host->disable_timer, jiffies + HZ / 16);
-	mmc_request_done(host->mmc, mrq);
-}
-
-
-static void glamo_mci_irq_worker(struct work_struct *work)
-{
-	struct glamo_mci_host *host = container_of(work, struct glamo_mci_host,
-												irq_work);
-	struct mmc_command *cmd;
-	uint16_t status;
-	if (!host->mrq || !host->mrq->cmd)
-		return;
-
-	cmd = host->mrq->cmd;
-
-#if 0
-	if (cmd->data->flags & MMC_DATA_READ) {
-		return;
-	}
-#endif
-
-	status = glamo_reg_read(host, GLAMO_REG_MMC_RB_STAT1);
-	dev_dbg(&host->pdev->dev, "status = 0x%04x\n", status);
-
-	/* we ignore a data timeout report if we are also told the data came */
-	if (status & GLAMO_STAT1_MMC_RB_DRDY)
-		status &= ~GLAMO_STAT1_MMC_DTOUT;
-
-	if (status & (GLAMO_STAT1_MMC_RTOUT | GLAMO_STAT1_MMC_DTOUT))
-		cmd->error = -ETIMEDOUT;
-	if (status & (GLAMO_STAT1_MMC_BWERR | GLAMO_STAT1_MMC_BRERR)) {
-		cmd->error = -EILSEQ;
-	}
-	if (cmd->error) {
-		dev_info(&host->pdev->dev, "Error after cmd: 0x%x\n", status);
-		goto done;
-	}
-
-	/* issue STOP if we have been given one to use */
-	if (host->mrq->stop) {
-		glamo_mci_send_command(host, host->mrq->stop);
-	}
-
-	if (cmd->data->flags & MMC_DATA_READ)
-		do_pio_read(host, cmd->data);
-
-done:
-	host->mrq = NULL;
-	glamo_mci_request_done(host, cmd->mrq);
-}
-
-static void glamo_mci_read_worker(struct work_struct *work)
-{
-	struct glamo_mci_host *host = container_of(work, struct glamo_mci_host,
-												read_work);
-	struct mmc_command *cmd;
-	uint16_t status;
-	uint16_t blocks_ready;
-	size_t data_read = 0;
-	size_t data_ready;
-	struct scatterlist *sg;
-	u16 __iomem *from_ptr = host->data_base;
-	void *sg_pointer;
-
-
-	cmd = host->mrq->cmd;
-	sg = cmd->data->sg;
-	do {
-		status = glamo_reg_read(host, GLAMO_REG_MMC_RB_STAT1);
-
-		if (status & (GLAMO_STAT1_MMC_RTOUT | GLAMO_STAT1_MMC_DTOUT))
-			cmd->error = -ETIMEDOUT;
-		if (status & (GLAMO_STAT1_MMC_BWERR | GLAMO_STAT1_MMC_BRERR))
-			cmd->error = -EILSEQ;
-		if (cmd->error) {
-			dev_info(&host->pdev->dev, "Error after cmd: 0x%x\n", status);
-			goto done;
-		}
-
-		blocks_ready = glamo_reg_read(host, GLAMO_REG_MMC_RB_BLKCNT);
-		data_ready = blocks_ready * cmd->data->blksz;
-
-		if (data_ready == data_read)
-			yield();
-
-		while(sg && data_read + sg->length <= data_ready) {
-			sg_pointer = page_address(sg_page(sg)) + sg->offset;
-			memcpy(sg_pointer, from_ptr, sg->length);
-			from_ptr += sg->length >> 1;
-
-			data_read += sg->length;
-			sg = sg_next(sg);
-		}
-
-	} while(sg);
-	cmd->data->bytes_xfered = data_read;
-
-	do {
-		status = glamo_reg_read(host, GLAMO_REG_MMC_RB_STAT1);
-	} while (!(status & GLAMO_STAT1_MMC_IDLE));
-
-	if (host->mrq->stop)
-		glamo_mci_send_command(host, host->mrq->stop);
-
-	do {
-		status = glamo_reg_read(host, GLAMO_REG_MMC_RB_STAT1);
-	} while (!(status & GLAMO_STAT1_MMC_IDLE));
-done:
-	host->mrq = NULL;
-	glamo_mci_request_done(host, cmd->mrq);
-}
-
-static irqreturn_t glamo_mci_irq(int irq, void *devid)
-{
-	struct glamo_mci_host *host = (struct glamo_mci_host*)devid;
-	schedule_work(&host->irq_work);
-
-	return IRQ_HANDLED;
-}
-
-static void glamo_mci_send_command(struct glamo_mci_host *host,
-				  struct mmc_command *cmd)
-{
-	u8 u8a[6];
-	u16 fire = 0;
-	unsigned int timeout = 1000000;
-	u16 * reg_resp = (u16 *)(host->mmio_base + GLAMO_REG_MMC_CMD_RSP1);
-	u16 status;
-	int triggers_int = 1;
-
-	/* if we can't do it, reject as busy */
-	if (!glamo_reg_read(host, GLAMO_REG_MMC_RB_STAT1) &
-		 GLAMO_STAT1_MMC_IDLE) {
-		cmd->error = -EBUSY;
-		return;
-	}
-
-	/* create an array in wire order for CRC computation */
-	u8a[0] = 0x40 | (cmd->opcode & 0x3f);
-	u8a[1] = (u8)(cmd->arg >> 24);
-	u8a[2] = (u8)(cmd->arg >> 16);
-	u8a[3] = (u8)(cmd->arg >> 8);
-	u8a[4] = (u8)cmd->arg;
-	u8a[5] = (crc7(0, u8a, 5) << 1) | 0x01; /* crc7 on first 5 bytes of packet */
-
-	/* issue the wire-order array including CRC in register order */
-	glamo_reg_write(host, GLAMO_REG_MMC_CMD_REG1, ((u8a[4] << 8) | u8a[5]));
-	glamo_reg_write(host, GLAMO_REG_MMC_CMD_REG2, ((u8a[2] << 8) | u8a[3]));
-	glamo_reg_write(host, GLAMO_REG_MMC_CMD_REG3, ((u8a[0] << 8) | u8a[1]));
-
-	/* command index toggle */
-	fire |= (host->request_counter & 1) << 12;
-
-	/* set type of command */
-	switch (mmc_cmd_type(cmd)) {
-	case MMC_CMD_BC:
-		fire |= GLAMO_FIRE_MMC_CMDT_BNR;
-		break;
-	case MMC_CMD_BCR:
-		fire |= GLAMO_FIRE_MMC_CMDT_BR;
-		break;
-	case MMC_CMD_AC:
-		fire |= GLAMO_FIRE_MMC_CMDT_AND;
-		break;
-	case MMC_CMD_ADTC:
-		fire |= GLAMO_FIRE_MMC_CMDT_AD;
-		break;
-	}
-	/*
-	 * if it expects a response, set the type expected
-	 *
-	 * R1, Length  : 48bit, Normal response
-	 * R1b, Length : 48bit, same R1, but added card busy status
-	 * R2, Length  : 136bit (really 128 bits with CRC snipped)
-	 * R3, Length  : 48bit (OCR register value)
-	 * R4, Length  : 48bit, SDIO_OP_CONDITION, Reverse SDIO Card
-	 * R5, Length  : 48bit, IO_RW_DIRECTION, Reverse SDIO Card
-	 * R6, Length  : 48bit (RCA register)
-	 * R7, Length  : 48bit (interface condition, VHS(voltage supplied),
-	 *                     check pattern, CRC7)
-	 */
-	switch (mmc_resp_type(cmd)) {
-	case MMC_RSP_R1: /* same index as R6 and R7 */
-		fire |= GLAMO_FIRE_MMC_RSPT_R1;
-		break;
-	case MMC_RSP_R1B:
-		fire |= GLAMO_FIRE_MMC_RSPT_R1b;
-		break;
-	case MMC_RSP_R2:
-		fire |= GLAMO_FIRE_MMC_RSPT_R2;
-		break;
-	case MMC_RSP_R3:
-		fire |= GLAMO_FIRE_MMC_RSPT_R3;
-		break;
-	/* R4 and R5 supported by chip not defined in linux/mmc/core.h (sdio) */
-	}
-	/*
-	 * From the command index, set up the command class in the host ctrllr
-	 *
-	 * missing guys present on chip but couldn't figure out how to use yet:
-	 *     0x0 "stream read"
-	 *     0x9 "cancel running command"
-	 */
-	switch (cmd->opcode) {
-	case MMC_READ_SINGLE_BLOCK:
-		fire |= GLAMO_FIRE_MMC_CC_SBR; /* single block read */
-		break;
-	case MMC_SWITCH: /* 64 byte payload */
-	case SD_APP_SEND_SCR:
-	case MMC_READ_MULTIPLE_BLOCK:
-		/* we will get an interrupt off this */
-		if (!cmd->mrq->stop)
-			/* multiblock no stop */
-			fire |= GLAMO_FIRE_MMC_CC_MBRNS;
-		else
-			 /* multiblock with stop */
-			fire |= GLAMO_FIRE_MMC_CC_MBRS;
-		break;
-	case MMC_WRITE_BLOCK:
-		fire |= GLAMO_FIRE_MMC_CC_SBW; /* single block write */
-		break;
-	case MMC_WRITE_MULTIPLE_BLOCK:
-		if (cmd->mrq->stop)
-			 /* multiblock with stop */
-			fire |= GLAMO_FIRE_MMC_CC_MBWS;
-		else
-			 /* multiblock NO stop-- 'RESERVED'? */
-			fire |= GLAMO_FIRE_MMC_CC_MBWNS;
-		break;
-	case MMC_STOP_TRANSMISSION:
-		fire |= GLAMO_FIRE_MMC_CC_STOP; /* STOP */
-		triggers_int = 0;
-		break;
-	default:
-		fire |= GLAMO_FIRE_MMC_CC_BASIC; /* "basic command" */
-		triggers_int = 0;
-		break;
-	}
-
-	if (cmd->data)
-		host->mrq = cmd->mrq;
-
-	/* always largest timeout */
-	glamo_reg_write(host, GLAMO_REG_MMC_TIMEOUT, 0xfff);
-
-	/* Generate interrupt on txfer */
-	glamo_reg_set_bit_mask(host, GLAMO_REG_MMC_BASIC, 0xff36,
-			0x0800 |
-			GLAMO_BASIC_MMC_NO_CLK_RD_WAIT |
-			GLAMO_BASIC_MMC_EN_COMPL_INT |
-			GLAMO_BASIC_MMC_EN_DATA_PUPS |
-			GLAMO_BASIC_MMC_EN_CMD_PUP);
-
-	/* send the command out on the wire */
-	/* dev_info(&host->pdev->dev, "Using FIRE %04X\n", fire); */
-	glamo_reg_write(host, GLAMO_REG_MMC_CMD_FIRE, fire);
-
-	/* we are deselecting card?  because it isn't going to ack then... */
-	if ((cmd->opcode == 7) && (cmd->arg == 0))
-		return;
-
-	/*
-	 * we must spin until response is ready or timed out
-	 * -- we don't get interrupts unless there is a bulk rx
-	 */
-	do
-		status = glamo_reg_read(host, GLAMO_REG_MMC_RB_STAT1);
-	while (((((status >> 15) & 1) != (host->request_counter & 1)) ||
-		(!(status & (GLAMO_STAT1_MMC_RB_RRDY |
-				 GLAMO_STAT1_MMC_RTOUT |
-				 GLAMO_STAT1_MMC_DTOUT |
-				 GLAMO_STAT1_MMC_BWERR |
-				 GLAMO_STAT1_MMC_BRERR)))) && (timeout--));
-
-	if ((status & (GLAMO_STAT1_MMC_RTOUT |
-				   GLAMO_STAT1_MMC_DTOUT)) ||
-		(timeout == 0)) {
-		cmd->error = -ETIMEDOUT;
-	} else if (status & (GLAMO_STAT1_MMC_BWERR | GLAMO_STAT1_MMC_BRERR)) {
-		cmd->error = -EILSEQ;
-	}
-
-	if (cmd->flags & MMC_RSP_PRESENT) {
-		if (cmd->flags & MMC_RSP_136) {
-			cmd->resp[3] = readw(&reg_resp[0]) |
-						   (readw(&reg_resp[1]) << 16);
-			cmd->resp[2] = readw(&reg_resp[2]) |
-						   (readw(&reg_resp[3]) << 16);
-			cmd->resp[1] = readw(&reg_resp[4]) |
-						   (readw(&reg_resp[5]) << 16);
-			cmd->resp[0] = readw(&reg_resp[6]) |
-						   (readw(&reg_resp[7]) << 16);
-		} else {
-			cmd->resp[0] = (readw(&reg_resp[0]) >> 8) |
-						   (readw(&reg_resp[1]) << 8) |
-						   ((readw(&reg_resp[2])) << 24);
-		}
-	}
-
-#if 0
-	/* We'll only get an interrupt when all data has been transfered.
-	   By starting to copy data when it's avaiable we can increase throughput by
-	   up to 30%. */
-	if (cmd->data && (cmd->data->flags & MMC_DATA_READ))
-		schedule_work(&host->read_work);
-#endif
-
-}
-
-static int glamo_mci_prepare_pio(struct glamo_mci_host *host,
-				 struct mmc_data *data)
-{
-	/* set up the block info */
-	glamo_reg_write(host, GLAMO_REG_MMC_DATBLKLEN, data->blksz);
-	glamo_reg_write(host, GLAMO_REG_MMC_DATBLKCNT, data->blocks);
-
-	data->bytes_xfered = 0;
-
-	/* if write, prep the write into the shared RAM before the command */
-	if (data->flags & MMC_DATA_WRITE) {
-		do_pio_write(host, data);
-	}
-
-	dev_dbg(&host->pdev->dev, "(blksz=%d, count=%d)\n",
-				   data->blksz, data->blocks);
-	return 0;
-}
-
-static int glamo_mci_irq_poll(struct glamo_mci_host *host,
-				struct mmc_command *cmd)
-{
-	int timeout = 1000000;
-	/*
-	 * if the glamo INT# line isn't wired (*cough* it can happen)
-	 * I'm afraid we have to spin on the IRQ status bit and "be
-	 * our own INT# line"
-	 */
-	/*
-	 * we have faith we will get an "interrupt"...
-	 * but something insane like suspend problems can mean
-	 * we spin here forever, so we timeout after a LONG time
-	 */
-	while ((!(readw(host->core->base +
-		 GLAMO_REG_IRQ_STATUS) & GLAMO_IRQ_MMC)) &&
-		   (timeout--));
-
-	if (timeout < 0) {
-		if (cmd->data->error)
-			cmd->data->error = -ETIMEDOUT;
-		dev_err(&host->pdev->dev, "Payload timeout\n");
-		return -ETIMEDOUT;
-	}
-	/* ack this interrupt source */
-	writew(GLAMO_IRQ_MMC, host->core->base +
-		   GLAMO_REG_IRQ_CLEAR);
-
-	/* yay we are an interrupt controller! -- call the ISR
-	 * it will stop clock to card
-	 */
-	glamo_mci_irq(IRQ_GLAMO(GLAMO_IRQIDX_MMC), host);
-
-	return 0;
-}
-
-static void glamo_mci_send_request(struct mmc_host *mmc, struct mmc_request *mrq)
-{
-	struct glamo_mci_host *host = mmc_priv(mmc);
-	struct mmc_command *cmd = mrq->cmd;
-
-	glamo_mci_clock_enable(host);
-	host->request_counter++;
-	if (cmd->data) {
-		if(glamo_mci_prepare_pio(host, cmd->data)) {
-			cmd->error = -EIO;
-			cmd->data->error = -EIO;
-			goto done;
-		}
-	}
-
-	dev_dbg(&host->pdev->dev,"cmd 0x%x, "
-		 "arg 0x%x data=%p mrq->stop=%p flags 0x%x\n",
-		 cmd->opcode, cmd->arg, cmd->data, cmd->mrq->stop,
-		 cmd->flags);
-
-	glamo_mci_send_command(host, cmd);
-
-	/*
-	 * if we don't have bulk data to take care of, we're done
-	 */
-	if (!cmd->data || cmd->error)
-		goto done;
-
-
-	if (!host->core->irq_works) {
-		if (glamo_mci_irq_poll(host, mrq->cmd))
-			goto done;
-	}
-
-	/*
-	 * Otherwise can can use the interrupt as async completion --
-	 * if there is read data coming, or we wait for write data to complete,
-	 * exit without mmc_request_done() as the payload interrupt
-	 * will service it
-	 */
-	dev_dbg(&host->pdev->dev, "Waiting for payload data\n");
-	return;
-done:
-	glamo_mci_request_done(host, mrq);
-}
-
-static void glamo_mci_set_power_mode(struct glamo_mci_host *host,
-				unsigned char power_mode) {
-	int ret;
-
-	if (power_mode == host->power_mode)
-		return;
-
-	switch(power_mode) {
-	case MMC_POWER_UP:
-		if (host->power_mode == MMC_POWER_OFF) {
-			ret = regulator_enable(host->regulator);
-			if (ret)
-				dev_err(&host->pdev->dev, "Failed to enable regulator: %d\n", ret);
-		}
-		break;
-	case MMC_POWER_ON:
-		break;
-	case MMC_POWER_OFF:
-	default:
-		glamo_engine_disable(host->core,
-				     GLAMO_ENGINE_MMC);
-
-		ret = regulator_disable(host->regulator);
-		if (ret)
-			dev_warn(&host->pdev->dev, "Failed to disable regulator: %d\n", ret);
-		break;
-	}
-	host->power_mode = power_mode;
-}
-
-static void glamo_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
-{
-	struct glamo_mci_host *host = mmc_priv(mmc);
-	int bus_width = 0;
-	int rate;
-	int sd_drive;
-	int ret;
-
-	/* Set power */
-	glamo_mci_set_power_mode(host, ios->power_mode);
-
-	if (host->vdd != ios->vdd) {
-		ret = mmc_regulator_set_ocr(host->regulator, ios->vdd);
-		if (ret)
-			dev_err(&host->pdev->dev, "Failed to set regulator voltage: %d\n", ret);
-		else
-			host->vdd = ios->vdd;
-	}
-	rate = glamo_mci_set_card_clock(host, ios->clock);
-
-	if ((ios->power_mode == MMC_POWER_ON) ||
-	    (ios->power_mode == MMC_POWER_UP)) {
-		dev_info(&host->pdev->dev,
-			"powered (vdd = %hu) clk: %dkHz div=%hu (req: %ukHz). "
-			"Bus width=%d\n", ios->vdd,
-			rate / 1000, 0,
-			ios->clock / 1000, (int)ios->bus_width);
-	} else {
-		dev_info(&host->pdev->dev, "glamo_mci_set_ios: power down.\n");
-	}
-
-	/* set bus width */
-	if (ios->bus_width == MMC_BUS_WIDTH_4)
-		bus_width = GLAMO_BASIC_MMC_EN_4BIT_DATA;
-
-	sd_drive = (rate * 4) / host->clk_rate;
-	if (sd_drive > 3)
-		sd_drive = 3;
-
-	glamo_reg_set_bit_mask(host, GLAMO_REG_MMC_BASIC,
-					       GLAMO_BASIC_MMC_EN_4BIT_DATA | 0xb0,
-						   bus_width | sd_drive << 6);
-}
-
-
-/*
- * no physical write protect supported by us
- */
-static int glamo_mci_get_ro(struct mmc_host *mmc)
-{
-	return 0;
-}
-
-static struct mmc_host_ops glamo_mci_ops = {
-	.request	= glamo_mci_send_request,
-	.set_ios	= glamo_mci_set_ios,
-	.get_ro		= glamo_mci_get_ro,
-};
-
-static int glamo_mci_probe(struct platform_device *pdev)
-{
-	struct mmc_host *mmc;
-	struct glamo_mci_host *host;
-	struct glamo_core *core = dev_get_drvdata(pdev->dev.parent);
-	int ret;
-
-	dev_info(&pdev->dev, "glamo_mci driver (C)2007 Openmoko, Inc\n");
-
-	mmc = mmc_alloc_host(sizeof(struct glamo_mci_host), &pdev->dev);
-	if (!mmc) {
-		ret = -ENOMEM;
-		goto probe_out;
-	}
-
-	host = mmc_priv(mmc);
-	host->mmc = mmc;
-	host->pdev = pdev;
-	if (core->pdata)
-		host->pdata = core->pdata->mmc_data;
-	host->power_mode = MMC_POWER_OFF;
-	host->clk_enabled = 0;
-	host->core = core;
-
-	INIT_WORK(&host->irq_work, glamo_mci_irq_worker);
-	INIT_WORK(&host->read_work, glamo_mci_read_worker);
-
-	host->regulator = regulator_get(pdev->dev.parent, "SD_3V3");
-	if (!host->regulator) {
-		dev_err(&pdev->dev, "Cannot proceed without regulator.\n");
-		ret = -ENODEV;
-		goto probe_free_host;
-	}
-
-	host->mmio_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	if (!host->mmio_mem) {
-		dev_err(&pdev->dev,
-			"failed to get io memory region resouce.\n");
-		ret = -ENOENT;
-		goto probe_regulator_put;
-	}
-
-	host->mmio_mem = request_mem_region(host->mmio_mem->start,
-	                                    resource_size(host->mmio_mem),
-	                                    pdev->name);
-
-	if (!host->mmio_mem) {
-		dev_err(&pdev->dev, "failed to request io memory region.\n");
-		ret = -ENOENT;
-		goto probe_regulator_put;
-	}
-
-	host->mmio_base = ioremap(host->mmio_mem->start,
-	                          resource_size(host->mmio_mem));
-	if (!host->mmio_base) {
-		dev_err(&pdev->dev, "failed to ioremap() io memory region.\n");
-		ret = -EINVAL;
-		goto probe_free_mem_region_mmio;
-	}
-
-
-	/* Get ahold of our data buffer we use for data in and out on MMC */
-	host->data_mem = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-	if (!host->data_mem) {
-		dev_err(&pdev->dev,
-			"failed to get io memory region resource.\n");
-		ret = -ENOENT;
-		goto probe_iounmap_mmio;
-	}
-
-	host->data_mem = request_mem_region(host->data_mem->start,
-	                                    resource_size(host->data_mem),
-										pdev->name);
-
-	if (!host->data_mem) {
-		dev_err(&pdev->dev, "failed to request io memory region.\n");
-		ret = -ENOENT;
-		goto probe_iounmap_mmio;
-	}
-	host->data_base = ioremap(host->data_mem->start,
-	                          resource_size(host->data_mem));
-
-	if (host->data_base == 0) {
-		dev_err(&pdev->dev, "failed to ioremap() io memory region.\n");
-		ret = -EINVAL;
-		goto probe_free_mem_region_data;
-	}
-
-	ret = request_irq(IRQ_GLAMO(GLAMO_IRQIDX_MMC), glamo_mci_irq, IRQF_SHARED,
-	               pdev->name, host);
-	if (ret) {
-		dev_err(&pdev->dev, "failed to register irq.\n");
-		goto probe_iounmap_data;
-	}
-
-
-	host->vdd = 0;
-	host->clk_rate = glamo_pll_rate(host->core, GLAMO_PLL1);
-
-	/* explain our host controller capabilities */
-	mmc->ops       = &glamo_mci_ops;
-	mmc->ocr_avail = mmc_regulator_get_ocrmask(host->regulator);
-	mmc->caps      = MMC_CAP_4_BIT_DATA |
-	                 MMC_CAP_MMC_HIGHSPEED |
-	                 MMC_CAP_SD_HIGHSPEED;
-	mmc->f_min     = host->clk_rate / 256;
-	mmc->f_max     = sd_max_clk;
-
-	mmc->max_blk_count = (1 << 16) - 1; /* GLAMO_REG_MMC_RB_BLKCNT */
-	mmc->max_blk_size  = (1 << 12) - 1; /* GLAMO_REG_MMC_RB_BLKLEN */
-	mmc->max_req_size  = resource_size(host->data_mem);
-	mmc->max_seg_size  = mmc->max_req_size;
-	mmc->max_phys_segs = 128;
-	mmc->max_hw_segs   = 128;
-
-	if (mmc->ocr_avail < 0) {
-		dev_warn(&pdev->dev, "Failed to get ocr list for regulator: %d.\n",
-				mmc->ocr_avail);
-		mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
-	}
-
-	platform_set_drvdata(pdev, mmc);
-
-	glamo_engine_enable(host->core, GLAMO_ENGINE_MMC);
-	glamo_engine_reset(host->core, GLAMO_ENGINE_MMC);
-
-	glamo_reg_write(host, GLAMO_REG_MMC_WDATADS1,
-			(u16)(host->data_mem->start));
-	glamo_reg_write(host, GLAMO_REG_MMC_WDATADS2,
-			(u16)(host->data_mem->start >> 16));
-
-	glamo_reg_write(host, GLAMO_REG_MMC_RDATADS1,
-			(u16)(host->data_mem->start));
-	glamo_reg_write(host, GLAMO_REG_MMC_RDATADS2,
-			(u16)(host->data_mem->start >> 16));
-
-	setup_timer(&host->disable_timer, glamo_mci_disable_timer,
-				(unsigned long)host);
-
-	if ((ret = mmc_add_host(mmc))) {
-		dev_err(&pdev->dev, "failed to add mmc host.\n");
-		goto probe_freeirq;
-	}
-
-	dev_info(&pdev->dev,"initialisation done.\n");
-	return 0;
-
-probe_freeirq:
-	free_irq(IRQ_GLAMO(GLAMO_IRQIDX_MMC), host);
-probe_iounmap_data:
-	iounmap(host->data_base);
-probe_free_mem_region_data:
-	release_mem_region(host->data_mem->start, resource_size(host->data_mem));
-probe_iounmap_mmio:
-	iounmap(host->mmio_base);
-probe_free_mem_region_mmio:
-	release_mem_region(host->mmio_mem->start, resource_size(host->mmio_mem));
-probe_regulator_put:
-	regulator_put(host->regulator);
-probe_free_host:
-	mmc_free_host(mmc);
-probe_out:
-	return ret;
-}
-
-static int glamo_mci_remove(struct platform_device *pdev)
-{
-	struct mmc_host	*mmc = platform_get_drvdata(pdev);
-	struct glamo_mci_host *host = mmc_priv(mmc);
-
-	free_irq(IRQ_GLAMO(GLAMO_IRQIDX_MMC), host);
-
-	mmc_remove_host(mmc);
-	iounmap(host->mmio_base);
-	iounmap(host->data_base);
-	release_mem_region(host->mmio_mem->start, resource_size(host->mmio_mem));
-	release_mem_region(host->data_mem->start, resource_size(host->data_mem));
-
-	regulator_put(host->regulator);
-
-	mmc_free_host(mmc);
-
-	glamo_engine_disable(host->core, GLAMO_ENGINE_MMC);
-	return 0;
-}
-
-
-#ifdef CONFIG_PM
-
-static int glamo_mci_suspend(struct device *dev)
-{
-	struct mmc_host *mmc = dev_get_drvdata(dev);
-	struct glamo_mci_host *host = mmc_priv(mmc);
-	int ret;
-
-	cancel_work_sync(&host->irq_work);
-
-	ret = mmc_suspend_host(mmc, PMSG_SUSPEND);
-	glamo_mci_clock_enable(host);
-
-	return ret;
-}
-
-static int glamo_mci_resume(struct device *dev)
-{
-	struct mmc_host *mmc = dev_get_drvdata(dev);
-	struct glamo_mci_host *host = mmc_priv(mmc);
-	int ret;
-
-	glamo_engine_enable(host->core, GLAMO_ENGINE_MMC);
-	glamo_engine_reset(host->core, GLAMO_ENGINE_MMC);
-
-	glamo_reg_write(host, GLAMO_REG_MMC_WDATADS1,
-			(u16)(host->data_mem->start));
-	glamo_reg_write(host, GLAMO_REG_MMC_WDATADS2,
-			(u16)(host->data_mem->start >> 16));
-
-	glamo_reg_write(host, GLAMO_REG_MMC_RDATADS1,
-			(u16)(host->data_mem->start));
-	glamo_reg_write(host, GLAMO_REG_MMC_RDATADS2,
-			(u16)(host->data_mem->start >> 16));
-	mdelay(5);
-
-	ret = mmc_resume_host(host->mmc);
-/*	glamo_mci_clock_disable(host);*/
-
-	return 0;
-}
-
-static struct dev_pm_ops glamo_mci_pm_ops = {
-	.suspend = glamo_mci_suspend,
-	.resume  = glamo_mci_resume,
-};
-#define GLAMO_MCI_PM_OPS (&glamo_mci_pm_ops)
-
-#else /* CONFIG_PM */
-#define GLAMO_MCI_PM_OPS NULL
-#endif /* CONFIG_PM */
-
-
-static struct platform_driver glamo_mci_driver =
-{
-	.probe  = glamo_mci_probe,
-	.remove = glamo_mci_remove,
-	.driver = {
-		.name  = "glamo-mci",
-		.owner = THIS_MODULE,
-		.pm    = GLAMO_MCI_PM_OPS,
-	},
-};
-
-static int __init glamo_mci_init(void)
-{
-	platform_driver_register(&glamo_mci_driver);
-	return 0;
-}
-
-static void __exit glamo_mci_exit(void)
-{
-	platform_driver_unregister(&glamo_mci_driver);
-}
-
-module_init(glamo_mci_init);
-module_exit(glamo_mci_exit);
-
-MODULE_DESCRIPTION("Glamo MMC/SD Card Interface driver");
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Andy Green <andy@openmoko.com>");
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-regs.h b/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-regs.h
deleted file mode 100644
index 2328b8ac9..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-regs.h
+++ /dev/null
@@ -1,632 +0,0 @@
-#ifndef _GLAMO_REGS_H
-#define _GLAMO_REGS_H
-
-/* Smedia Glamo 336x/337x driver
- *
- * (C) 2007 by Openmoko, Inc.
- * Author: Harald Welte <laforge@openmoko.org>
- * All rights reserved.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-enum glamo_regster_offsets {
-	GLAMO_REGOFS_GENERIC	= 0x0000,
-	GLAMO_REGOFS_HOSTBUS	= 0x0200,
-	GLAMO_REGOFS_MEMORY	= 0x0300,
-	GLAMO_REGOFS_VIDCAP	= 0x0400,
-	GLAMO_REGOFS_ISP	= 0x0500,
-	GLAMO_REGOFS_JPEG	= 0x0800,
-	GLAMO_REGOFS_MPEG	= 0x0c00,
-	GLAMO_REGOFS_LCD	= 0x1100,
-	GLAMO_REGOFS_MMC	= 0x1400,
-	GLAMO_REGOFS_MPROC0	= 0x1500,
-	GLAMO_REGOFS_MPROC1	= 0x1580,
-	GLAMO_REGOFS_CMDQUEUE	= 0x1600,
-	GLAMO_REGOFS_RISC	= 0x1680,
-	GLAMO_REGOFS_2D		= 0x1700,
-	GLAMO_REGOFS_3D		= 0x1b00,
-	GLAMO_REGOFS_END	= 0x2400,
-};
-
-
-enum glamo_register_generic {
-	GLAMO_REG_GCONF1	= 0x0000,
-	GLAMO_REG_GCONF2	= 0x0002,
-#define	GLAMO_REG_DEVICE_ID	GLAMO_REG_GCONF2
-	GLAMO_REG_GCONF3	= 0x0004,
-#define	GLAMO_REG_REVISION_ID	GLAMO_REG_GCONF3
-	GLAMO_REG_IRQ_GEN1	= 0x0006,
-#define GLAMO_REG_IRQ_ENABLE	GLAMO_REG_IRQ_GEN1
-	GLAMO_REG_IRQ_GEN2	= 0x0008,
-#define GLAMO_REG_IRQ_SET	GLAMO_REG_IRQ_GEN2
-	GLAMO_REG_IRQ_GEN3	= 0x000a,
-#define GLAMO_REG_IRQ_CLEAR	GLAMO_REG_IRQ_GEN3
-	GLAMO_REG_IRQ_GEN4	= 0x000c,
-#define GLAMO_REG_IRQ_STATUS	GLAMO_REG_IRQ_GEN4
-	GLAMO_REG_CLOCK_HOST	= 0x0010,
-	GLAMO_REG_CLOCK_MEMORY	= 0x0012,
-	GLAMO_REG_CLOCK_LCD	= 0x0014,
-	GLAMO_REG_CLOCK_MMC	= 0x0016,
-	GLAMO_REG_CLOCK_ISP	= 0x0018,
-	GLAMO_REG_CLOCK_JPEG	= 0x001a,
-	GLAMO_REG_CLOCK_3D	= 0x001c,
-	GLAMO_REG_CLOCK_2D	= 0x001e,
-	GLAMO_REG_CLOCK_RISC1	= 0x0020,	/* 3365 only? */
-	GLAMO_REG_CLOCK_RISC2	= 0x0022,	/* 3365 only? */
-	GLAMO_REG_CLOCK_MPEG	= 0x0024,
-	GLAMO_REG_CLOCK_MPROC	= 0x0026,
-
-	GLAMO_REG_CLOCK_GEN5_1	= 0x0030,
-	GLAMO_REG_CLOCK_GEN5_2	= 0x0032,
-	GLAMO_REG_CLOCK_GEN6	= 0x0034,
-	GLAMO_REG_CLOCK_GEN7	= 0x0036,
-	GLAMO_REG_CLOCK_GEN8	= 0x0038,
-	GLAMO_REG_CLOCK_GEN9	= 0x003a,
-	GLAMO_REG_CLOCK_GEN10	= 0x003c,
-	GLAMO_REG_CLOCK_GEN11	= 0x003e,
-	GLAMO_REG_PLL_GEN1	= 0x0040,
-	GLAMO_REG_PLL_GEN2	= 0x0042,
-	GLAMO_REG_PLL_GEN3	= 0x0044,
-	GLAMO_REG_PLL_GEN4	= 0x0046,
-	GLAMO_REG_PLL_GEN5	= 0x0048,
-	GLAMO_REG_GPIO_GEN1	= 0x0050,
-	GLAMO_REG_GPIO_GEN2	= 0x0052,
-	GLAMO_REG_GPIO_GEN3	= 0x0054,
-	GLAMO_REG_GPIO_GEN4	= 0x0056,
-	GLAMO_REG_GPIO_GEN5	= 0x0058,
-	GLAMO_REG_GPIO_GEN6	= 0x005a,
-	GLAMO_REG_GPIO_GEN7	= 0x005c,
-	GLAMO_REG_GPIO_GEN8	= 0x005e,
-	GLAMO_REG_GPIO_GEN9	= 0x0060,
-	GLAMO_REG_GPIO_GEN10	= 0x0062,
-	GLAMO_REG_DFT_GEN1	= 0x0070,
-	GLAMO_REG_DFT_GEN2	= 0x0072,
-	GLAMO_REG_DFT_GEN3	= 0x0074,
-	GLAMO_REG_DFT_GEN4	= 0x0076,
-
-	GLAMO_REG_DFT_GEN5	= 0x01e0,
-	GLAMO_REG_DFT_GEN6	= 0x01f0,
-};
-
-#define GLAMO_REG_HOSTBUS(x)	(GLAMO_REGOFS_HOSTBUS-2+(x*2))
-
-#define REG_MEM(x)		(GLAMO_REGOFS_MEMORY+(x))
-#define GLAMO_REG_MEM_TIMING(x)	(GLAMO_REG_MEM_TIMING1-2+(x*2))
-
-enum glamo_register_mem {
-	GLAMO_REG_MEM_TYPE	= REG_MEM(0x00),
-	GLAMO_REG_MEM_GEN	= REG_MEM(0x02),
-	GLAMO_REG_MEM_TIMING1	= REG_MEM(0x04),
-	GLAMO_REG_MEM_TIMING2	= REG_MEM(0x06),
-	GLAMO_REG_MEM_TIMING3	= REG_MEM(0x08),
-	GLAMO_REG_MEM_TIMING4	= REG_MEM(0x0a),
-	GLAMO_REG_MEM_TIMING5	= REG_MEM(0x0c),
-	GLAMO_REG_MEM_TIMING6	= REG_MEM(0x0e),
-	GLAMO_REG_MEM_TIMING7	= REG_MEM(0x10),
-	GLAMO_REG_MEM_TIMING8	= REG_MEM(0x12),
-	GLAMO_REG_MEM_TIMING9	= REG_MEM(0x14),
-	GLAMO_REG_MEM_TIMING10	= REG_MEM(0x16),
-	GLAMO_REG_MEM_TIMING11	= REG_MEM(0x18),
-	GLAMO_REG_MEM_POWER1	= REG_MEM(0x1a),
-	GLAMO_REG_MEM_POWER2	= REG_MEM(0x1c),
-	GLAMO_REG_MEM_LCD_BUF1	= REG_MEM(0x1e),
-	GLAMO_REG_MEM_LCD_BUF2	= REG_MEM(0x20),
-	GLAMO_REG_MEM_LCD_BUF3	= REG_MEM(0x22),
-	GLAMO_REG_MEM_LCD_BUF4	= REG_MEM(0x24),
-	GLAMO_REG_MEM_BIST1	= REG_MEM(0x26),
-	GLAMO_REG_MEM_BIST2	= REG_MEM(0x28),
-	GLAMO_REG_MEM_BIST3	= REG_MEM(0x2a),
-	GLAMO_REG_MEM_BIST4	= REG_MEM(0x2c),
-	GLAMO_REG_MEM_BIST5	= REG_MEM(0x2e),
-	GLAMO_REG_MEM_MAH1	= REG_MEM(0x30),
-	GLAMO_REG_MEM_MAH2	= REG_MEM(0x32),
-	GLAMO_REG_MEM_DRAM1	= REG_MEM(0x34),
-	GLAMO_REG_MEM_DRAM2	= REG_MEM(0x36),
-	GLAMO_REG_MEM_CRC	= REG_MEM(0x38),
-};
-
-#define GLAMO_MEM_TYPE_MASK	0x03
-
-enum glamo_reg_mem_dram1 {
-	/* b0 - b10 == refresh period, 1 -> 2048 clocks */
-	GLAMO_MEM_DRAM1_EN_GATE_CLK	= (1 << 11),
-	GLAMO_MEM_DRAM1_SELF_REFRESH	= (1 << 12),
-	GLAMO_MEM_DRAM1_EN_GATE_CKE	= (1 << 13),
-	GLAMO_MEM_DRAM1_EN_DRAM_REFRESH	= (1 << 14),
-	GLAMO_MEM_DRAM1_EN_MODEREG_SET	= (1 << 15),
-};
-
-enum glamo_reg_mem_dram2 {
-	GLAMO_MEM_DRAM2_DEEP_PWRDOWN	= (1 << 12),
-};
-
-enum glamo_irq_index {
-	GLAMO_IRQIDX_HOSTBUS	= 0,
-	GLAMO_IRQIDX_JPEG	= 1,
-	GLAMO_IRQIDX_MPEG	= 2,
-	GLAMO_IRQIDX_MPROC1	= 3,
-	GLAMO_IRQIDX_MPROC0	= 4,
-	GLAMO_IRQIDX_CMDQUEUE	= 5,
-	GLAMO_IRQIDX_2D		= 6,
-	GLAMO_IRQIDX_MMC	= 7,
-	GLAMO_IRQIDX_RISC	= 8,
-};
-
-enum glamo_irq {
-	GLAMO_IRQ_HOSTBUS	= (1 << GLAMO_IRQIDX_HOSTBUS),
-	GLAMO_IRQ_JPEG		= (1 << GLAMO_IRQIDX_JPEG),
-	GLAMO_IRQ_MPEG		= (1 << GLAMO_IRQIDX_MPEG),
-	GLAMO_IRQ_MPROC1	= (1 << GLAMO_IRQIDX_MPROC1),
-	GLAMO_IRQ_MPROC0	= (1 << GLAMO_IRQIDX_MPROC0),
-	GLAMO_IRQ_CMDQUEUE	= (1 << GLAMO_IRQIDX_CMDQUEUE),
-	GLAMO_IRQ_2D		= (1 << GLAMO_IRQIDX_2D),
-	GLAMO_IRQ_MMC		= (1 << GLAMO_IRQIDX_MMC),
-	GLAMO_IRQ_RISC		= (1 << GLAMO_IRQIDX_RISC),
-};
-
-enum glamo_reg_clock_host {
-	GLAMO_CLOCK_HOST_DG_BCLK	= 0x0001,
-	GLAMO_CLOCK_HOST_DG_M0CLK	= 0x0004,
-	GLAMO_CLOCK_HOST_RESET		= 0x1000,
-};
-
-enum glamo_reg_clock_mem {
-	GLAMO_CLOCK_MEM_DG_M1CLK	= 0x0001,
-	GLAMO_CLOCK_MEM_EN_M1CLK	= 0x0002,
-	GLAMO_CLOCK_MEM_DG_MOCACLK	= 0x0004,
-	GLAMO_CLOCK_MEM_EN_MOCACLK	= 0x0008,
-	GLAMO_CLOCK_MEM_RESET		= 0x1000,
-	GLAMO_CLOCK_MOCA_RESET		= 0x2000,
-};
-
-enum glamo_reg_clock_lcd {
-	GLAMO_CLOCK_LCD_DG_DCLK		= 0x0001,
-	GLAMO_CLOCK_LCD_EN_DCLK		= 0x0002,
-	GLAMO_CLOCK_LCD_DG_DMCLK	= 0x0004,
-	GLAMO_CLOCK_LCD_EN_DMCLK	= 0x0008,
-	//
-	GLAMO_CLOCK_LCD_EN_DHCLK	= 0x0020,
-	GLAMO_CLOCK_LCD_DG_M5CLK	= 0x0040,
-	GLAMO_CLOCK_LCD_EN_M5CLK	= 0x0080,
-	GLAMO_CLOCK_LCD_RESET		= 0x1000,
-};
-
-enum glamo_reg_clock_mmc {
-	GLAMO_CLOCK_MMC_DG_TCLK		= 0x0001,
-	GLAMO_CLOCK_MMC_EN_TCLK		= 0x0002,
-	GLAMO_CLOCK_MMC_DG_M9CLK	= 0x0004,
-	GLAMO_CLOCK_MMC_EN_M9CLK	= 0x0008,
-	GLAMO_CLOCK_MMC_RESET		= 0x1000,
-};
-
-enum glamo_reg_basic_mmc {
-	/* set to disable CRC error rejection */
-	GLAMO_BASIC_MMC_DISABLE_CRC	= 0x0001,
-	/* enable completion interrupt */
-	GLAMO_BASIC_MMC_EN_COMPL_INT	= 0x0002,
-	/* stop MMC clock while enforced idle waiting for data from card */
-	GLAMO_BASIC_MMC_NO_CLK_RD_WAIT	= 0x0004,
-	/* 0 = 1-bit bus to card, 1 = use 4-bit bus (has to be negotiated) */
-	GLAMO_BASIC_MMC_EN_4BIT_DATA	= 0x0008,
-	/* enable 75K pullups on D3..D0 */
-	GLAMO_BASIC_MMC_EN_DATA_PUPS	= 0x0010,
-	/* enable 75K pullup on CMD */
-	GLAMO_BASIC_MMC_EN_CMD_PUP	= 0x0020,
-	/* IO drive strength 00=weak -> 11=strongest */
-	GLAMO_BASIC_MMC_EN_DR_STR0	= 0x0040,
-	GLAMO_BASIC_MMC_EN_DR_STR1	= 0x0080,
-	/* TCLK delay stage A, 0000 = 500ps --> 1111 = 8ns */
-	GLAMO_BASIC_MMC_EN_TCLK_DLYA0	= 0x0100,
-	GLAMO_BASIC_MMC_EN_TCLK_DLYA1	= 0x0200,
-	GLAMO_BASIC_MMC_EN_TCLK_DLYA2	= 0x0400,
-	GLAMO_BASIC_MMC_EN_TCLK_DLYA3	= 0x0800,
-	/* TCLK delay stage B (cumulative), 0000 = 500ps --> 1111 = 8ns */
-	GLAMO_BASIC_MMC_EN_TCLK_DLYB0	= 0x1000,
-	GLAMO_BASIC_MMC_EN_TCLK_DLYB1	= 0x2000,
-	GLAMO_BASIC_MMC_EN_TCLK_DLYB2	= 0x4000,
-	GLAMO_BASIC_MMC_EN_TCLK_DLYB3	= 0x8000,
-};
-
-enum glamo_reg_stat1_mmc {
-	/* command "counter" (really: toggle) */
-	GLAMO_STAT1_MMC_CMD_CTR	= 0x8000,
-	/* engine is idle */
-	GLAMO_STAT1_MMC_IDLE	= 0x4000,
-	/* readback response is ready */
-	GLAMO_STAT1_MMC_RB_RRDY	= 0x0200,
-	/* readback data is ready */
-	GLAMO_STAT1_MMC_RB_DRDY	= 0x0100,
-	/* no response timeout */
-	GLAMO_STAT1_MMC_RTOUT	= 0x0020,
-	/* no data timeout */
-	GLAMO_STAT1_MMC_DTOUT	= 0x0010,
-	/* CRC error on block write */
-	GLAMO_STAT1_MMC_BWERR	= 0x0004,
-	/* CRC error on block read */
-	GLAMO_STAT1_MMC_BRERR	= 0x0002
-};
-
-enum glamo_reg_fire_mmc {
-	/* command "counter" (really: toggle)
-	 * the STAT1 register reflects this so you can ensure you don't look
-	 * at status for previous command
-	 */
-	GLAMO_FIRE_MMC_CMD_CTR	= 0x8000,
-	/* sets kind of response expected */
-	GLAMO_FIRE_MMC_RES_MASK	= 0x0700,
-	/* sets command type */
-	GLAMO_FIRE_MMC_TYP_MASK	= 0x00C0,
-	/* sets command class */
-	GLAMO_FIRE_MMC_CLS_MASK	= 0x000F,
-};
-
-enum glamo_fire_mmc_response_types {
-	GLAMO_FIRE_MMC_RSPT_R1	= 0x0000,
-	GLAMO_FIRE_MMC_RSPT_R1b	= 0x0100,
-	GLAMO_FIRE_MMC_RSPT_R2	= 0x0200,
-	GLAMO_FIRE_MMC_RSPT_R3	= 0x0300,
-	GLAMO_FIRE_MMC_RSPT_R4	= 0x0400,
-	GLAMO_FIRE_MMC_RSPT_R5	= 0x0500,
-};
-
-enum glamo_fire_mmc_command_types {
-	/* broadcast, no response */
-	GLAMO_FIRE_MMC_CMDT_BNR	= 0x0000,
-	/* broadcast, with response */
-	GLAMO_FIRE_MMC_CMDT_BR	= 0x0040,
-	/* addressed, no data */
-	GLAMO_FIRE_MMC_CMDT_AND	= 0x0080,
-	/* addressed, with data */
-	GLAMO_FIRE_MMC_CMDT_AD	= 0x00C0,
-};
-
-enum glamo_fire_mmc_command_class {
-	/* "Stream Read" */
-	GLAMO_FIRE_MMC_CC_STRR	= 0x0000,
-	/* Single Block Read */
-	GLAMO_FIRE_MMC_CC_SBR	= 0x0001,
-	/* Multiple Block Read With Stop */
-	GLAMO_FIRE_MMC_CC_MBRS	= 0x0002,
-	/* Multiple Block Read No Stop */
-	GLAMO_FIRE_MMC_CC_MBRNS	= 0x0003,
-	/* RESERVED for "Stream Write" */
-	GLAMO_FIRE_MMC_CC_STRW	= 0x0004,
-	/* "Stream Write" */
-	GLAMO_FIRE_MMC_CC_SBW	= 0x0005,
-	/* RESERVED for Multiple Block Write With Stop */
-	GLAMO_FIRE_MMC_CC_MBWS	= 0x0006,
-	/* Multiple Block Write No Stop */
-	GLAMO_FIRE_MMC_CC_MBWNS	= 0x0007,
-	/* STOP command */
-	GLAMO_FIRE_MMC_CC_STOP	= 0x0008,
-	/* Cancel on Running Command */
-	GLAMO_FIRE_MMC_CC_CANCL	= 0x0009,
-	/* "Basic Command" */
-	GLAMO_FIRE_MMC_CC_BASIC	= 0x000a,
-};
-
-/* these are offsets from the start of the MMC register region */
-enum glamo_register_mmc {
-	/* MMC command, b15..8 = cmd arg b7..0; b7..1 = CRC; b0 = end bit */
-	GLAMO_REG_MMC_CMD_REG1	= 0x00,
-	/* MMC command, b15..0 = cmd arg b23 .. 8 */
-	GLAMO_REG_MMC_CMD_REG2	= 0x02,
-	/* MMC command, b15=start, b14=transmission,
-	 * b13..8=cmd idx, b7..0=cmd arg b31..24
-	 */
-	GLAMO_REG_MMC_CMD_REG3	= 0x04,
-	GLAMO_REG_MMC_CMD_FIRE	= 0x06,
-	GLAMO_REG_MMC_CMD_RSP1	= 0x10,
-	GLAMO_REG_MMC_CMD_RSP2	= 0x12,
-	GLAMO_REG_MMC_CMD_RSP3	= 0x14,
-	GLAMO_REG_MMC_CMD_RSP4	= 0x16,
-	GLAMO_REG_MMC_CMD_RSP5	= 0x18,
-	GLAMO_REG_MMC_CMD_RSP6	= 0x1a,
-	GLAMO_REG_MMC_CMD_RSP7	= 0x1c,
-	GLAMO_REG_MMC_CMD_RSP8	= 0x1e,
-	GLAMO_REG_MMC_RB_STAT1	= 0x20,
-	GLAMO_REG_MMC_RB_BLKCNT	= 0x22,
-	GLAMO_REG_MMC_RB_BLKLEN	= 0x24,
-	GLAMO_REG_MMC_BASIC	= 0x30,
-	GLAMO_REG_MMC_RDATADS1	= 0x34,
-	GLAMO_REG_MMC_RDATADS2	= 0x36,
-	GLAMO_REG_MMC_WDATADS1	= 0x38,
-	GLAMO_REG_MMC_WDATADS2	= 0x3a,
-	GLAMO_REG_MMC_DATBLKCNT	= 0x3c,
-	GLAMO_REG_MMC_DATBLKLEN	= 0x3e,
-	GLAMO_REG_MMC_TIMEOUT	= 0x40,
-
-};
-
-enum glamo_reg_clock_isp {
-	GLAMO_CLOCK_ISP_DG_I1CLK	= 0x0001,
-	GLAMO_CLOCK_ISP_EN_I1CLK	= 0x0002,
-	GLAMO_CLOCK_ISP_DG_CCLK		= 0x0004,
-	GLAMO_CLOCK_ISP_EN_CCLK		= 0x0008,
-	//
-	GLAMO_CLOCK_ISP_EN_SCLK		= 0x0020,
-	GLAMO_CLOCK_ISP_DG_M2CLK	= 0x0040,
-	GLAMO_CLOCK_ISP_EN_M2CLK	= 0x0080,
-	GLAMO_CLOCK_ISP_DG_M15CLK	= 0x0100,
-	GLAMO_CLOCK_ISP_EN_M15CLK	= 0x0200,
-	GLAMO_CLOCK_ISP1_RESET		= 0x1000,
-	GLAMO_CLOCK_ISP2_RESET		= 0x2000,
-};
-
-enum glamo_reg_clock_jpeg {
-	GLAMO_CLOCK_JPEG_DG_JCLK	= 0x0001,
-	GLAMO_CLOCK_JPEG_EN_JCLK	= 0x0002,
-	GLAMO_CLOCK_JPEG_DG_M3CLK	= 0x0004,
-	GLAMO_CLOCK_JPEG_EN_M3CLK	= 0x0008,
-	GLAMO_CLOCK_JPEG_RESET		= 0x1000,
-};
-
-enum glamo_reg_clock_2d {
-	GLAMO_CLOCK_2D_DG_GCLK		= 0x0001,
-	GLAMO_CLOCK_2D_EN_GCLK		= 0x0002,
-	GLAMO_CLOCK_2D_DG_M7CLK		= 0x0004,
-	GLAMO_CLOCK_2D_EN_M7CLK		= 0x0008,
-	GLAMO_CLOCK_2D_DG_M6CLK		= 0x0010,
-	GLAMO_CLOCK_2D_EN_M6CLK		= 0x0020,
-	GLAMO_CLOCK_2D_RESET		= 0x1000,
-	GLAMO_CLOCK_2D_CQ_RESET		= 0x2000,
-};
-
-enum glamo_reg_clock_3d {
-	GLAMO_CLOCK_3D_DG_ECLK		= 0x0001,
-	GLAMO_CLOCK_3D_EN_ECLK		= 0x0002,
-	GLAMO_CLOCK_3D_DG_RCLK		= 0x0004,
-	GLAMO_CLOCK_3D_EN_RCLK		= 0x0008,
-	GLAMO_CLOCK_3D_DG_M8CLK		= 0x0010,
-	GLAMO_CLOCK_3D_EN_M8CLK		= 0x0020,
-	GLAMO_CLOCK_3D_BACK_RESET	= 0x1000,
-	GLAMO_CLOCK_3D_FRONT_RESET	= 0x2000,
-};
-
-enum glamo_reg_clock_mpeg {
-	GLAMO_CLOCK_MPEG_DG_X0CLK	= 0x0001,
-	GLAMO_CLOCK_MPEG_EN_X0CLK	= 0x0002,
-	GLAMO_CLOCK_MPEG_DG_X1CLK	= 0x0004,
-	GLAMO_CLOCK_MPEG_EN_X1CLK	= 0x0008,
-	GLAMO_CLOCK_MPEG_DG_X2CLK	= 0x0010,
-	GLAMO_CLOCK_MPEG_EN_X2CLK	= 0x0020,
-	GLAMO_CLOCK_MPEG_DG_X3CLK	= 0x0040,
-	GLAMO_CLOCK_MPEG_EN_X3CLK	= 0x0080,
-	GLAMO_CLOCK_MPEG_DG_X4CLK	= 0x0100,
-	GLAMO_CLOCK_MPEG_EN_X4CLK	= 0x0200,
-	GLAMO_CLOCK_MPEG_DG_X6CLK	= 0x0400,
-	GLAMO_CLOCK_MPEG_EN_X6CLK	= 0x0800,
-	GLAMO_CLOCK_MPEG_ENC_RESET	= 0x1000,
-	GLAMO_CLOCK_MPEG_DEC_RESET	= 0x2000,
-};
-
-enum glamo_reg_clock51 {
-	GLAMO_CLOCK_GEN51_EN_DIV_MCLK	= 0x0001,
-	GLAMO_CLOCK_GEN51_EN_DIV_SCLK	= 0x0002,
-	GLAMO_CLOCK_GEN51_EN_DIV_JCLK	= 0x0004,
-	GLAMO_CLOCK_GEN51_EN_DIV_DCLK	= 0x0008,
-	GLAMO_CLOCK_GEN51_EN_DIV_DMCLK	= 0x0010,
-	GLAMO_CLOCK_GEN51_EN_DIV_DHCLK	= 0x0020,
-	GLAMO_CLOCK_GEN51_EN_DIV_GCLK	= 0x0040,
-	GLAMO_CLOCK_GEN51_EN_DIV_TCLK	= 0x0080,
-	/* FIXME: higher bits */
-};
-
-enum glamo_reg_hostbus2 {
-	GLAMO_HOSTBUS2_MMIO_EN_ISP	= 0x0001,
-	GLAMO_HOSTBUS2_MMIO_EN_JPEG	= 0x0002,
-	GLAMO_HOSTBUS2_MMIO_EN_MPEG	= 0x0004,
-	GLAMO_HOSTBUS2_MMIO_EN_LCD	= 0x0008,
-	GLAMO_HOSTBUS2_MMIO_EN_MMC	= 0x0010,
-	GLAMO_HOSTBUS2_MMIO_EN_MICROP0	= 0x0020,
-	GLAMO_HOSTBUS2_MMIO_EN_MICROP1	= 0x0040,
-	GLAMO_HOSTBUS2_MMIO_EN_CQ	= 0x0080,
-	GLAMO_HOSTBUS2_MMIO_EN_RISC	= 0x0100,
-	GLAMO_HOSTBUS2_MMIO_EN_2D	= 0x0200,
-	GLAMO_HOSTBUS2_MMIO_EN_3D	= 0x0400,
-};
-
-/* LCD Controller */
-
-#define REG_LCD(x)	(x)
-enum glamo_reg_lcd {
-	GLAMO_REG_LCD_MODE1		= REG_LCD(0x00),
-	GLAMO_REG_LCD_MODE2		= REG_LCD(0x02),
-	GLAMO_REG_LCD_MODE3		= REG_LCD(0x04),
-	GLAMO_REG_LCD_WIDTH		= REG_LCD(0x06),
-	GLAMO_REG_LCD_HEIGHT		= REG_LCD(0x08),
-	GLAMO_REG_LCD_POLARITY		= REG_LCD(0x0a),
-	GLAMO_REG_LCD_A_BASE1		= REG_LCD(0x0c),
-	GLAMO_REG_LCD_A_BASE2		= REG_LCD(0x0e),
-	GLAMO_REG_LCD_B_BASE1		= REG_LCD(0x10),
-	GLAMO_REG_LCD_B_BASE2		= REG_LCD(0x12),
-	GLAMO_REG_LCD_C_BASE1		= REG_LCD(0x14),
-	GLAMO_REG_LCD_C_BASE2		= REG_LCD(0x16),
-	GLAMO_REG_LCD_PITCH		= REG_LCD(0x18),
-	/* RES */
-	GLAMO_REG_LCD_HORIZ_TOTAL	= REG_LCD(0x1c),
-	/* RES */
-	GLAMO_REG_LCD_HORIZ_RETR_START	= REG_LCD(0x20),
-	/* RES */
-	GLAMO_REG_LCD_HORIZ_RETR_END	= REG_LCD(0x24),
-	/* RES */
-	GLAMO_REG_LCD_HORIZ_DISP_START	= REG_LCD(0x28),
-	/* RES */
-	GLAMO_REG_LCD_HORIZ_DISP_END	= REG_LCD(0x2c),
-	/* RES */
-	GLAMO_REG_LCD_VERT_TOTAL	= REG_LCD(0x30),
-	/* RES */
-	GLAMO_REG_LCD_VERT_RETR_START	= REG_LCD(0x34),
-	/* RES */
-	GLAMO_REG_LCD_VERT_RETR_END	= REG_LCD(0x38),
-	/* RES */
-	GLAMO_REG_LCD_VERT_DISP_START	= REG_LCD(0x3c),
-	/* RES */
-	GLAMO_REG_LCD_VERT_DISP_END	= REG_LCD(0x40),
-	/* RES */
-	GLAMO_REG_LCD_POL		= REG_LCD(0x44),
-	GLAMO_REG_LCD_DATA_START	= REG_LCD(0x46),
-	GLAMO_REG_LCD_FRATE_CONTRO	= REG_LCD(0x48),
-	GLAMO_REG_LCD_DATA_CMD_HDR	= REG_LCD(0x4a),
-	GLAMO_REG_LCD_SP_START		= REG_LCD(0x4c),
-	GLAMO_REG_LCD_SP_END		= REG_LCD(0x4e),
-	GLAMO_REG_LCD_CURSOR_BASE1	= REG_LCD(0x50),
-	GLAMO_REG_LCD_CURSOR_BASE2	= REG_LCD(0x52),
-	GLAMO_REG_LCD_CURSOR_PITCH	= REG_LCD(0x54),
-	GLAMO_REG_LCD_CURSOR_X_SIZE	= REG_LCD(0x56),
-	GLAMO_REG_LCD_CURSOR_Y_SIZE	= REG_LCD(0x58),
-	GLAMO_REG_LCD_CURSOR_X_POS	= REG_LCD(0x5a),
-	GLAMO_REG_LCD_CURSOR_Y_POS	= REG_LCD(0x5c),
-	GLAMO_REG_LCD_CURSOR_PRESET	= REG_LCD(0x5e),
-	GLAMO_REG_LCD_CURSOR_FG_COLOR	= REG_LCD(0x60),
-	/* RES */
-	GLAMO_REG_LCD_CURSOR_BG_COLOR	= REG_LCD(0x64),
-	/* RES */
-	GLAMO_REG_LCD_CURSOR_DST_COLOR	= REG_LCD(0x68),
-	/* RES */
-	GLAMO_REG_LCD_STATUS1		= REG_LCD(0x80),
-	GLAMO_REG_LCD_STATUS2		= REG_LCD(0x82),
-	GLAMO_REG_LCD_STATUS3		= REG_LCD(0x84),
-	GLAMO_REG_LCD_STATUS4		= REG_LCD(0x86),
-	/* RES */
-	GLAMO_REG_LCD_COMMAND1		= REG_LCD(0xa0),
-	GLAMO_REG_LCD_COMMAND2		= REG_LCD(0xa2),
-	/* RES */
-	GLAMO_REG_LCD_WFORM_DELAY1	= REG_LCD(0xb0),
-	GLAMO_REG_LCD_WFORM_DELAY2	= REG_LCD(0xb2),
-	/* RES */
-	GLAMO_REG_LCD_GAMMA_CORR	= REG_LCD(0x100),
-	/* RES */
-	GLAMO_REG_LCD_GAMMA_R_ENTRY01	= REG_LCD(0x110),
-	GLAMO_REG_LCD_GAMMA_R_ENTRY23	= REG_LCD(0x112),
-	GLAMO_REG_LCD_GAMMA_R_ENTRY45	= REG_LCD(0x114),
-	GLAMO_REG_LCD_GAMMA_R_ENTRY67	= REG_LCD(0x116),
-	GLAMO_REG_LCD_GAMMA_R_ENTRY8	= REG_LCD(0x118),
-	/* RES */
-	GLAMO_REG_LCD_GAMMA_G_ENTRY01	= REG_LCD(0x130),
-	GLAMO_REG_LCD_GAMMA_G_ENTRY23	= REG_LCD(0x132),
-	GLAMO_REG_LCD_GAMMA_G_ENTRY45	= REG_LCD(0x134),
-	GLAMO_REG_LCD_GAMMA_G_ENTRY67	= REG_LCD(0x136),
-	GLAMO_REG_LCD_GAMMA_G_ENTRY8	= REG_LCD(0x138),
-	/* RES */
-	GLAMO_REG_LCD_GAMMA_B_ENTRY01	= REG_LCD(0x150),
-	GLAMO_REG_LCD_GAMMA_B_ENTRY23	= REG_LCD(0x152),
-	GLAMO_REG_LCD_GAMMA_B_ENTRY45	= REG_LCD(0x154),
-	GLAMO_REG_LCD_GAMMA_B_ENTRY67	= REG_LCD(0x156),
-	GLAMO_REG_LCD_GAMMA_B_ENTRY8	= REG_LCD(0x158),
-	/* RES */
-	GLAMO_REG_LCD_SRAM_DRIVING1	= REG_LCD(0x160),
-	GLAMO_REG_LCD_SRAM_DRIVING2	= REG_LCD(0x162),
-	GLAMO_REG_LCD_SRAM_DRIVING3	= REG_LCD(0x164),
-};
-
-enum glamo_reg_lcd_mode1 {
-	GLAMO_LCD_MODE1_PWRSAVE		= 0x0001,
-	GLAMO_LCD_MODE1_PARTIAL_PRT	= 0x0002,
-	GLAMO_LCD_MODE1_HWFLIP		= 0x0004,
-	GLAMO_LCD_MODE1_LCD2		= 0x0008,
-	/* RES */
-	GLAMO_LCD_MODE1_PARTIAL_MODE	= 0x0020,
-	GLAMO_LCD_MODE1_CURSOR_DSTCOLOR	= 0x0040,
-	GLAMO_LCD_MODE1_PARTIAL_ENABLE	= 0x0080,
-	GLAMO_LCD_MODE1_TVCLK_IN_ENABLE	= 0x0100,
-	GLAMO_LCD_MODE1_HSYNC_HIGH_ACT	= 0x0200,
-	GLAMO_LCD_MODE1_VSYNC_HIGH_ACT	= 0x0400,
-	GLAMO_LCD_MODE1_HSYNC_FLIP	= 0x0800,
-	GLAMO_LCD_MODE1_GAMMA_COR_EN	= 0x1000,
-	GLAMO_LCD_MODE1_DITHER_EN	= 0x2000,
-	GLAMO_LCD_MODE1_CURSOR_EN	= 0x4000,
-	GLAMO_LCD_MODE1_ROTATE_EN	= 0x8000,
-};
-
-enum glamo_reg_lcd_mode2 {
-	GLAMO_LCD_MODE2_CRC_CHECK_EN	= 0x0001,
-	GLAMO_LCD_MODE2_DCMD_PER_LINE	= 0x0002,
-	GLAMO_LCD_MODE2_NOUSE_BDEF	= 0x0004,
-	GLAMO_LCD_MODE2_OUT_POS_MODE	= 0x0008,
-	GLAMO_LCD_MODE2_FRATE_CTRL_EN	= 0x0010,
-	GLAMO_LCD_MODE2_SINGLE_BUFFER	= 0x0020,
-	GLAMO_LCD_MODE2_SER_LSB_TO_MSB	= 0x0040,
-	/* FIXME */
-};
-
-enum glamo_reg_lcd_mode3 {
-	/* LCD color source data format */
-	GLAMO_LCD_SRC_RGB565		= 0x0000,
-	GLAMO_LCD_SRC_ARGB1555		= 0x4000,
-	GLAMO_LCD_SRC_ARGB4444		= 0x8000,
-	/* interface type */
-	GLAMO_LCD_MODE3_LCD		= 0x1000,
-	GLAMO_LCD_MODE3_RGB		= 0x0800,
-	GLAMO_LCD_MODE3_CPU		= 0x0000,
-	/* mode */
-	GLAMO_LCD_MODE3_RGB332		= 0x0000,
-	GLAMO_LCD_MODE3_RGB444		= 0x0100,
-	GLAMO_LCD_MODE3_RGB565		= 0x0200,
-	GLAMO_LCD_MODE3_RGB666		= 0x0300,
-	/* depth */
-	GLAMO_LCD_MODE3_6BITS		= 0x0000,
-	GLAMO_LCD_MODE3_8BITS		= 0x0010,
-	GLAMO_LCD_MODE3_9BITS		= 0x0020,
-	GLAMO_LCD_MODE3_16BITS		= 0x0030,
-	GLAMO_LCD_MODE3_18BITS		= 0x0040,
-};
-
-enum glamo_lcd_rot_mode {
-        GLAMO_LCD_ROT_MODE_0            = 0x0000,
-        GLAMO_LCD_ROT_MODE_180          = 0x2000,
-        GLAMO_LCD_ROT_MODE_MIRROR       = 0x4000,
-        GLAMO_LCD_ROT_MODE_FLIP         = 0x6000,
-        GLAMO_LCD_ROT_MODE_90           = 0x8000,
-        GLAMO_LCD_ROT_MODE_270          = 0xa000,
-};
-#define GLAMO_LCD_ROT_MODE_MASK         0xe000
-
-enum glamo_lcd_cmd_type {
-	GLAMO_LCD_CMD_TYPE_DISP		= 0x0000,
-	GLAMO_LCD_CMD_TYPE_PARALLEL	= 0x4000,
-	GLAMO_LCD_CMD_TYPE_SERIAL	= 0x8000,
-	GLAMO_LCD_CMD_TYPE_SERIAL_DIRECT= 0xc000,
-};
-#define GLAMO_LCD_CMD_TYPE_MASK		0xc000
-
-enum glamo_lcd_cmds {
-	GLAMO_LCD_CMD_DATA_DISP_FIRE	= 0x00,
-	GLAMO_LCD_CMD_DATA_DISP_SYNC	= 0x01,		/* RGB only */
-	/* switch to command mode, no display */
-	GLAMO_LCD_CMD_DATA_FIRE_NO_DISP	= 0x02,
-	/* display until VSYNC, switch to command */
-	GLAMO_LCD_CMD_DATA_FIRE_VSYNC	= 0x11,
-	/* display until HSYNC, switch to command */
-	GLAMO_LCD_CMD_DATA_FIRE_HSYNC	= 0x12,
-	/* display until VSYNC, 1 black frame, VSYNC, switch to command */
-	GLAMO_LCD_CMD_DATA_FIRE_VSYNC_B	= 0x13,
-	/* don't care about display and switch to command */
-	GLAMO_LCD_CMD_DATA_FIRE_FREE	= 0x14,		/* RGB only */
-	/* don't care about display, keep data display but disable data,
-	 * and switch to command */
-	GLAMO_LCD_CMD_DATA_FIRE_FREE_D	= 0x15,		/* RGB only */
-};
-
-enum glamo_core_revisions {
-	GLAMO_CORE_REV_A0		= 0x0000,
-	GLAMO_CORE_REV_A1		= 0x0001,
-	GLAMO_CORE_REV_A2		= 0x0002,
-	GLAMO_CORE_REV_A3		= 0x0003,
-};
-
-#endif /* _GLAMO_REGS_H */
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/misc/gta02_pm_host.c b/target/linux/s3c24xx/files-2.6.30/drivers/misc/gta02_pm_host.c
deleted file mode 100644
index ad7cfd882..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/misc/gta02_pm_host.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Bluetooth PM code for the FIC gta02 GSM Phone
- *
- * (C) 2007 by Openmoko Inc.
- * Author: Harald Welte <laforge@openmoko.org>
- * All rights reserved.
- *
- * 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
- *
- */
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/platform_device.h>
-
-#include <mach/hardware.h>
-#include <asm/mach-types.h>
-
-#include <mach/gta02.h>
-#include <linux/mfd/pcf50633/gpio.h>
-
-static ssize_t pm_host_read(struct device *dev, struct device_attribute *attr,
-			    char *buf)
-{
-	return sprintf(buf, "%d\n",
-		       pcf50633_gpio_get(gta02_pcf, PCF50633_GPO)
-		       				== PCF50633_GPOCFG_GPOSEL_1);
-}
-
-static ssize_t pm_host_write(struct device *dev, struct device_attribute *attr,
-			     const char *buf, size_t count)
-{
-	unsigned long on = simple_strtoul(buf, NULL, 10);
-	u8 val;
-
-	if (on)
-		val = PCF50633_GPOCFG_GPOSEL_1;
-	else
-		val = PCF50633_GPOCFG_GPOSEL_0;
-
-
-	pcf50633_gpio_set(gta02_pcf, PCF50633_GPO, val);
-
-	return count;
-}
-
-static DEVICE_ATTR(hostmode, 0644, pm_host_read, pm_host_write);
-
-static struct attribute *gta02_pm_host_sysfs_entries[] = {
-	&dev_attr_hostmode.attr,
-	NULL
-};
-
-static struct attribute_group gta02_pm_host_attr_group = {
-	.name	= NULL,
-	.attrs	= gta02_pm_host_sysfs_entries,
-};
-
-static int __init gta02_pm_host_probe(struct platform_device *pdev)
-{
-	dev_info(&pdev->dev, "starting\n");
-	return sysfs_create_group(&pdev->dev.kobj, &gta02_pm_host_attr_group);
-}
-
-static int gta02_pm_host_remove(struct platform_device *pdev)
-{
-	sysfs_remove_group(&pdev->dev.kobj, &gta02_pm_host_attr_group);
-	return 0;
-}
-
-static struct platform_driver gta02_pm_host_driver = {
-	.probe		= gta02_pm_host_probe,
-	.remove		= gta02_pm_host_remove,
-	.driver		= {
-		.name		= "gta02-pm-host",
-	},
-};
-
-static int __devinit gta02_pm_host_init(void)
-{
-	return platform_driver_register(&gta02_pm_host_driver);
-}
-
-static void gta02_pm_host_exit(void)
-{
-	platform_driver_unregister(&gta02_pm_host_driver);
-}
-
-module_init(gta02_pm_host_init);
-module_exit(gta02_pm_host_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Andy Green <andy@openmoko.com>");
-MODULE_DESCRIPTION("Openmoko Freerunner USB Host Power Management");
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/misc/gta02_pm_resume_reason.c b/target/linux/s3c24xx/files-2.6.30/drivers/misc/gta02_pm_resume_reason.c
deleted file mode 100644
index 3820d7c66..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/misc/gta02_pm_resume_reason.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Resume reason sysfs for the Openmoko Freerunner GSM Phone
- *
- * (C) 2008 by Openmoko Inc.
- * Author: Andy Green <andy@openmoko.com>
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License resume_reason 2 as
- * published by the Free Software Foundation
- *
- */
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/platform_device.h>
-#include <linux/io.h>
-
-#include <mach/regs-gpio.h>
-
-static unsigned int *gstatus4_mapped;
-static char *resume_reasons[17] = {
-	"EINT00_ACCEL1",
-	"EINT01_GSM",
-	"EINT02_BLUETOOTH",
-	"EINT03_DEBUGBRD",
-	"EINT04_JACK",
-	"EINT05_WLAN",
-	"EINT06_AUXKEY",
-	"EINT07_HOLDKEY",
-	"EINT08_ACCEL2",
-	"EINT09_PMU",
-	"EINT10_NULL",
-	"EINT11_NULL",
-	"EINT12_GLAMO",
-	"EINT13_NULL",
-	"EINT14_NULL",
-	"EINT15_NULL",
-	NULL
-};
-
-static ssize_t resume_reason_read(struct device *dev,
-				  struct device_attribute *attr,
-				  char *buf)
-{
-	int bit = 0;
-	char *end = buf;
-
-	for (bit = 0; resume_reasons[bit]; bit++) {
-		if ((*gstatus4_mapped) & (1 << bit))
-			end += sprintf(end, "* %s\n", resume_reasons[bit]);
-		else
-			end += sprintf(end, "  %s\n", resume_reasons[bit]);
-
-	}
-
-	return end - buf;
-}
-
-
-static DEVICE_ATTR(resume_reason, 0644, resume_reason_read, NULL);
-
-static struct attribute *gta02_resume_reason_sysfs_entries[] = {
-	&dev_attr_resume_reason.attr,
-	NULL
-};
-
-static struct attribute_group gta02_resume_reason_attr_group = {
-	.name	= NULL,
-	.attrs	= gta02_resume_reason_sysfs_entries,
-};
-
-static int __init gta02_resume_reason_probe(struct platform_device *pdev)
-{
-	dev_info(&pdev->dev, "starting\n");
-
-	gstatus4_mapped = ioremap(S3C24XX_GSTATUS4, 0x4);
-	if (!gstatus4_mapped) {
-		dev_err(&pdev->dev, "failed to ioremap() memory region\n");
-		return -EINVAL;
-	}
-
-	return sysfs_create_group(&pdev->dev.kobj,
-					    &gta02_resume_reason_attr_group);
-}
-
-static int gta02_resume_reason_remove(struct platform_device *pdev)
-{
-	sysfs_remove_group(&pdev->dev.kobj, &gta02_resume_reason_attr_group);
-	iounmap(gstatus4_mapped);
-	return 0;
-}
-
-static struct platform_driver gta02_resume_reason_driver = {
-	.probe		= gta02_resume_reason_probe,
-	.remove		= gta02_resume_reason_remove,
-	.driver		= {
-		.name		= "gta02-resume-reason",
-	},
-};
-
-static int __devinit gta02_resume_reason_init(void)
-{
-	return platform_driver_register(&gta02_resume_reason_driver);
-}
-
-static void gta02_resume_reason_exit(void)
-{
-	platform_driver_unregister(&gta02_resume_reason_driver);
-}
-
-module_init(gta02_resume_reason_init);
-module_exit(gta02_resume_reason_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Andy Green <andy@openmoko.com>");
-MODULE_DESCRIPTION("GTA02 resume_reason");
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/power/bq27000_battery.c b/target/linux/s3c24xx/files-2.6.30/drivers/power/bq27000_battery.c
deleted file mode 100644
index 32655dce1..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/power/bq27000_battery.c
+++ /dev/null
@@ -1,477 +0,0 @@
-/*
- * Driver for batteries with bq27000 chips inside via HDQ
- *
- * Copyright 2008 Openmoko, Inc
- * Andy Green <andy@openmoko.com>
- *
- * based on ds2760 driver, original copyright notice for that --->
- *
- * Copyright © 2007 Anton Vorontsov
- *	       2004-2007 Matt Reimer
- *	       2004 Szabolcs Gyurko
- *
- * Use consistent with the GNU GPL is permitted,
- * provided that this copyright notice is
- * preserved in its entirety in all copies and derived works.
- *
- * Author:  Anton Vorontsov <cbou@mail.ru>
- *	    February 2007
- *
- *	    Matt Reimer <mreimer@vpop.net>
- *	    April 2004, 2005, 2007
- *
- *	    Szabolcs Gyurko <szabolcs.gyurko@tlt.hu>
- *	    September 2004
- */
-
-#include <linux/module.h>
-#include <linux/param.h>
-#include <linux/jiffies.h>
-#include <linux/delay.h>
-#include <linux/pm.h>
-#include <linux/workqueue.h>
-#include <linux/platform_device.h>
-#include <linux/power_supply.h>
-#include <linux/bq27000_battery.h>
-
-enum bq27000_regs {
-	/* RAM regs */
-		/* read-write after this */
-	BQ27000_CTRL = 0, /* Device Control Register */
-	BQ27000_MODE, /* Device Mode Register */
-	BQ27000_AR_L, /* At-Rate H L */
-	BQ27000_AR_H,
-		/* read-only after this */
-	BQ27000_ARTTE_L, /* At-Rate Time To Empty H L */
-	BQ27000_ARTTE_H,
-	BQ27000_TEMP_L, /* Reported Temperature H L */
-	BQ27000_TEMP_H,
-	BQ27000_VOLT_L, /* Reported Voltage H L */
-	BQ27000_VOLT_H,
-	BQ27000_FLAGS, /* Status Flags */
-	BQ27000_RSOC, /* Relative State of Charge */
-	BQ27000_NAC_L, /* Nominal Available Capacity H L */
-	BQ27000_NAC_H,
-	BQ27000_CACD_L, /* Discharge Compensated H L */
-	BQ27000_CACD_H,
-	BQ27000_CACT_L, /* Temperature Compensated H L */
-	BQ27000_CACT_H,
-	BQ27000_LMD_L, /* Last measured discharge H L */
-	BQ27000_LMD_H,
-	BQ27000_AI_L, /* Average Current H L */
-	BQ27000_AI_H,
-	BQ27000_TTE_L, /* Time to Empty H L */
-	BQ27000_TTE_H,
-	BQ27000_TTF_L, /* Time to Full H L */
-	BQ27000_TTF_H,
-	BQ27000_SI_L, /* Standby Current H L */
-	BQ27000_SI_H,
-	BQ27000_STTE_L, /* Standby Time To Empty H L */
-	BQ27000_STTE_H,
-	BQ27000_MLI_L, /* Max Load Current H L */
-	BQ27000_MLI_H,
-	BQ27000_MLTTE_L, /* Max Load Time To Empty H L */
-	BQ27000_MLTTE_H,
-	BQ27000_SAE_L, /* Available Energy H L */
-	BQ27000_SAE_H,
-	BQ27000_AP_L, /* Available Power H L */
-	BQ27000_AP_H,
-	BQ27000_TTECP_L, /* Time to Empty at Constant Power H L */
-	BQ27000_TTECP_H,
-	BQ27000_CYCL_L, /* Cycle count since learning cycle H L */
-	BQ27000_CYCL_H,
-	BQ27000_CYCT_L, /* Cycle Count Total H L */
-	BQ27000_CYCT_H,
-	BQ27000_CSOC, /* Compensated State Of Charge */
-	/* EEPROM regs */
-		/* read-write after this */
-	BQ27000_EE_EE_EN = 0x6e, /* EEPROM Program Enable */
-	BQ27000_EE_ILMD = 0x76, /* Initial Last Measured Discharge High Byte */
-	BQ27000_EE_SEDVF, /* Scaled EDVF Threshold */
-	BQ27000_EE_SEDV1, /* Scaled EDV1 Threshold */
-	BQ27000_EE_ISLC, /* Initial Standby Load Current */
-	BQ27000_EE_DMFSD, /* Digital Magnitude Filter and Self Discharge */
-	BQ27000_EE_TAPER, /* Aging Estimate Enable, Charge Termination Taper */
-	BQ27000_EE_PKCFG, /* Pack Configuration Values */
-	BQ27000_EE_IMLC, /* Initial Max Load Current or ID #3 */
-	BQ27000_EE_DCOMP, /* Discharge rate compensation constants or ID #2 */
-	BQ27000_EE_TCOMP, /* Temperature Compensation constants or ID #1 */
-};
-
-enum bq27000_status_flags {
-	BQ27000_STATUS_CHGS = 0x80, /* 1 = being charged */
-	BQ27000_STATUS_NOACT = 0x40, /* 1 = no activity */
-	BQ27000_STATUS_IMIN = 0x20, /* 1 = Lion taper current mode */
-	BQ27000_STATUS_CI = 0x10, /* 1 = capacity likely  innacurate */
-	BQ27000_STATUS_CALIP = 0x08, /* 1 = calibration in progress */
-	BQ27000_STATUS_VDQ = 0x04, /* 1 = capacity should be accurate */
-	BQ27000_STATUS_EDV1 = 0x02, /* 1 = end of discharge.. <6% left */
-	BQ27000_STATUS_EDVF = 0x01, /* 1 = no, it's really empty now */
-};
-
-#define NANOVOLTS_UNIT 3750
-
-struct bq27000_bat_regs {
-	int		ai;
-	int		flags;
-	int		lmd;
-	int		rsoc;
-	int		temp;
-	int		tte;
-	int		ttf;
-	int		volt;
-};
-
-struct bq27000_device_info {
-	struct device *dev;
-	struct power_supply bat;
-	struct power_supply ac;
-	struct power_supply usb;
-	struct delayed_work work;
-	struct bq27000_platform_data *pdata;
-
-	struct bq27000_bat_regs regs;
-};
-
-static unsigned int cache_time = 5000;
-module_param(cache_time, uint, 0644);
-MODULE_PARM_DESC(cache_time, "cache time in milliseconds");
-
-/*
- * reading 16 bit values over HDQ has a special hazard where the
- * hdq device firmware can update the 16-bit register during the time we
- * read the two halves.  TI document SLUS556D recommends the algorithm here
- * to avoid trouble
- */
-
-static int hdq_read16(struct bq27000_device_info *di, int address)
-{
-	int acc;
-	int high;
-	int retries = 3;
-
-	while (retries--) {
-
-		high = (di->pdata->hdq_read)(address + 1); /* high part */
-
-		if (high < 0)
-			return high;
-		acc = (di->pdata->hdq_read)(address);
-		if (acc < 0)
-			return acc;
-
-		/* confirm high didn't change between reading it and low */
-		if (high == (di->pdata->hdq_read)(address + 1))
-			return (high << 8) | acc;
-	}
-
-	return -ETIME;
-}
-
-static void bq27000_battery_external_power_changed(struct power_supply *psy)
-{
-	struct bq27000_device_info *di = container_of(psy, struct bq27000_device_info, bat);
-
-	dev_dbg(di->dev, "%s\n", __FUNCTION__);
-	schedule_delayed_work(&di->work, 0);
-}
-
-static int bq27000_battery_get_property(struct power_supply *psy,
-				       enum power_supply_property psp,
-				       union power_supply_propval *val)
-{
-	int n;
-	struct bq27000_device_info *di = container_of(psy, struct bq27000_device_info, bat);
-
-	if (di->regs.rsoc < 0 && psp != POWER_SUPPLY_PROP_PRESENT)
-		return -ENODEV;
-
-	switch (psp) {
-	case POWER_SUPPLY_PROP_STATUS:
-		val->intval = POWER_SUPPLY_STATUS_UNKNOWN;
-
-		if (!di->pdata->get_charger_online_status)
-			goto use_bat;
-		if ((di->pdata->get_charger_online_status)()) {
-			/*
-			 * charger is definitively present
-			 * we report our state in terms of what it says it
-			 * is doing
-			 */
-			if (!di->pdata->get_charger_active_status)
-				goto use_bat;
-
-			if ((di->pdata->get_charger_active_status)()) {
-				val->intval = POWER_SUPPLY_STATUS_CHARGING;
-				break;
-			}
-			val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
-			break;
-		}
-
-		/*
-		 * platform provided definite indication of charger presence,
-		 * and it is telling us it isn't there... but we are on so we
-		 * must be running from battery --->
-		 */
-
-		val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
-		break;
-
-use_bat:
-		/*
-		 * either the charger is not connected, or the
-		 * platform doesn't give info about charger, use battery state
-		 * but... battery state can be out of date by 4 seconds or
-		 * so... use the platform callbacks if possible.
-		 */
-
-		/* no real activity on the battery */
-		if (di->regs.ai < 2) {
-			if (!di->regs.ttf)
-				val->intval = POWER_SUPPLY_STATUS_FULL;
-			else
-				val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
-			break;
-		}
-		/* power is actually going in or out... */
-		if (di->regs.flags < 0)
-			return di->regs.flags;
-		if (di->regs.flags & BQ27000_STATUS_CHGS)
-			val->intval = POWER_SUPPLY_STATUS_CHARGING;
-		else
-			val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
-		break;
-	case POWER_SUPPLY_PROP_HEALTH:
-		val->intval = POWER_SUPPLY_HEALTH_UNKNOWN;
-		/* Do we have accurate readings... */
-		if (di->regs.flags < 0)
-			return di->regs.flags;
-		if (di->regs.flags & BQ27000_STATUS_VDQ)
-			val->intval = POWER_SUPPLY_HEALTH_GOOD;
-		break;
-	case POWER_SUPPLY_PROP_VOLTAGE_NOW:
-		if (di->regs.volt < 0)
-			return di->regs.volt;
-		/* mV -> uV */
-		val->intval = di->regs.volt * 1000;
-		break;
-	case POWER_SUPPLY_PROP_CURRENT_NOW:
-		if (di->regs.flags < 0)
-			return di->regs.flags;
-		if (di->regs.flags & BQ27000_STATUS_CHGS)
-			n = -NANOVOLTS_UNIT;
-		else
-			n = NANOVOLTS_UNIT;
-		if (di->regs.ai < 0)
-			return di->regs.ai;
-		val->intval = (di->regs.ai * n) / di->pdata->rsense_mohms;
-		break;
-	case POWER_SUPPLY_PROP_CHARGE_FULL:
-		if (di->regs.lmd < 0)
-			return di->regs.lmd;
-		val->intval = (di->regs.lmd * 3570) / di->pdata->rsense_mohms;
-		break;
-	case POWER_SUPPLY_PROP_TEMP:
-		if (di->regs.temp < 0)
-			return di->regs.temp;
-		/* K (in 0.25K units) is 273.15 up from C (in 0.1C)*/
-		/* 10926 = 27315 * 4 / 10 */
-		val->intval = (((long)di->regs.temp * 10l) - 10926) / 4;
-		break;
-	case POWER_SUPPLY_PROP_TECHNOLOGY:
-		val->intval = POWER_SUPPLY_TECHNOLOGY_LION;
-		break;
-	case POWER_SUPPLY_PROP_CAPACITY:
-		val->intval = di->regs.rsoc;
-		if (val->intval < 0)
-			return val->intval;
-		break;
-	case POWER_SUPPLY_PROP_PRESENT:
-		val->intval = !(di->regs.rsoc < 0);
-		break;
-	case POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW:
-		if (di->regs.tte < 0)
-			return di->regs.tte;
-		val->intval = 60 * di->regs.tte;
-		break;
-	case POWER_SUPPLY_PROP_TIME_TO_FULL_NOW:
-		if (di->regs.ttf < 0)
-			return di->regs.ttf;
-		val->intval = 60 * di->regs.ttf;
-		break;
-	case POWER_SUPPLY_PROP_ONLINE:
-		if (di->pdata->get_charger_online_status)
-			val->intval = (di->pdata->get_charger_online_status)();
-		else
-			return -EINVAL;
-		break;
-	default:
-		return -EINVAL;
-	}
-
-	return 0;
-}
-
-static void bq27000_battery_work(struct work_struct *work)
-{
-	struct bq27000_device_info *di =
-		container_of(work, struct bq27000_device_info, work.work);
-
-	if ((di->pdata->hdq_initialized)()) {
-		struct bq27000_bat_regs regs;
-
-		regs.ai    = hdq_read16(di, BQ27000_AI_L);
-		regs.flags = (di->pdata->hdq_read)(BQ27000_FLAGS);
-		regs.lmd   = hdq_read16(di, BQ27000_LMD_L);
-		regs.rsoc  = (di->pdata->hdq_read)(BQ27000_RSOC);
-		regs.temp  = hdq_read16(di, BQ27000_TEMP_L);
-		regs.tte   = hdq_read16(di, BQ27000_TTE_L);
-		regs.ttf   = hdq_read16(di, BQ27000_TTF_L);
-		regs.volt  = hdq_read16(di, BQ27000_VOLT_L);
-
-		if (memcmp (&regs, &di->regs, sizeof(regs)) != 0) {
-			di->regs = regs;
-			power_supply_changed(&di->bat);
-		}
-	}
-
-	if (!schedule_delayed_work(&di->work, cache_time))
-		dev_err(di->dev, "battery service reschedule failed\n");
-}
-
-static enum power_supply_property bq27000_battery_props[] = {
-	POWER_SUPPLY_PROP_STATUS,
-	POWER_SUPPLY_PROP_HEALTH,
-	POWER_SUPPLY_PROP_VOLTAGE_NOW,
-	POWER_SUPPLY_PROP_CURRENT_NOW,
-	POWER_SUPPLY_PROP_CHARGE_FULL,
-	POWER_SUPPLY_PROP_TEMP,
-	POWER_SUPPLY_PROP_TECHNOLOGY,
-	POWER_SUPPLY_PROP_PRESENT,
-	POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW,
-	POWER_SUPPLY_PROP_TIME_TO_FULL_NOW,
-	POWER_SUPPLY_PROP_CAPACITY,
-	POWER_SUPPLY_PROP_ONLINE
-};
-
-static int bq27000_battery_probe(struct platform_device *pdev)
-{
-	int retval = 0;
-	struct bq27000_device_info *di;
-	struct bq27000_platform_data *pdata;
-
-	dev_info(&pdev->dev, "BQ27000 Battery Driver (C) 2008 Openmoko, Inc\n");
-
-	di = kzalloc(sizeof(*di), GFP_KERNEL);
-	if (!di) {
-		retval = -ENOMEM;
-		goto di_alloc_failed;
-	}
-
-	platform_set_drvdata(pdev, di);
-
-	pdata = pdev->dev.platform_data;
-	di->dev		= &pdev->dev;
-	/* di->w1_dev	     = pdev->dev.parent; */
-	di->bat.name	   = pdata->name;
-	di->bat.type	   = POWER_SUPPLY_TYPE_BATTERY;
-	di->bat.properties     = bq27000_battery_props;
-	di->bat.num_properties = ARRAY_SIZE(bq27000_battery_props);
-	di->bat.get_property   = bq27000_battery_get_property;
-	di->bat.external_power_changed =
-				  bq27000_battery_external_power_changed;
-	di->bat.use_for_apm = 1;
-	di->pdata = pdata;
-
-	retval = power_supply_register(&pdev->dev, &di->bat);
-	if (retval) {
-		dev_err(di->dev, "failed to register battery\n");
-		goto batt_failed;
-	}
-
-	INIT_DELAYED_WORK(&di->work, bq27000_battery_work);
-
-	if (!schedule_delayed_work(&di->work, 0))
-		dev_err(di->dev, "failed to schedule bq27000_battery_work\n");
-
-	return 0;
-
-batt_failed:
-	kfree(di);
-di_alloc_failed:
-	return retval;
-}
-
-static int bq27000_battery_remove(struct platform_device *pdev)
-{
-	struct bq27000_device_info *di = platform_get_drvdata(pdev);
-
-	cancel_delayed_work(&di->work);
-
-	power_supply_unregister(&di->bat);
-
-	return 0;
-}
-
-void bq27000_charging_state_change(struct platform_device *pdev)
-{
-	struct bq27000_device_info *di = platform_get_drvdata(pdev);
-
-	if (!di)
-	    return;
-}
-EXPORT_SYMBOL_GPL(bq27000_charging_state_change);
-
-#ifdef CONFIG_PM
-
-static int bq27000_battery_suspend(struct platform_device *pdev,
-				  pm_message_t state)
-{
-	struct bq27000_device_info *di = platform_get_drvdata(pdev);
-
-	cancel_delayed_work(&di->work);
-	return 0;
-}
-
-static int bq27000_battery_resume(struct platform_device *pdev)
-{
-	struct bq27000_device_info *di = platform_get_drvdata(pdev);
-
-	schedule_delayed_work(&di->work, 0);
-	return 0;
-}
-
-#else
-
-#define bq27000_battery_suspend NULL
-#define bq27000_battery_resume NULL
-
-#endif /* CONFIG_PM */
-
-static struct platform_driver bq27000_battery_driver = {
-	.driver = {
-		.name = "bq27000-battery",
-	},
-	.probe	  = bq27000_battery_probe,
-	.remove   = bq27000_battery_remove,
-	.suspend  = bq27000_battery_suspend,
-	.resume	  = bq27000_battery_resume,
-};
-
-static int __init bq27000_battery_init(void)
-{
-	return platform_driver_register(&bq27000_battery_driver);
-}
-
-static void __exit bq27000_battery_exit(void)
-{
-	platform_driver_unregister(&bq27000_battery_driver);
-}
-
-module_init(bq27000_battery_init);
-module_exit(bq27000_battery_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Andy Green <andy@openmoko.com>");
-MODULE_DESCRIPTION("bq27000 battery driver");
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/power/hdq.c b/target/linux/s3c24xx/files-2.6.30/drivers/power/hdq.c
deleted file mode 100644
index f03fabfb1..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/power/hdq.c
+++ /dev/null
@@ -1,515 +0,0 @@
-/*
- * HDQ generic GPIO bitbang driver using FIQ
- *
- * (C) 2006-2007 by Openmoko, Inc.
- * Author: Andy Green <andy@openmoko.com>
- * All rights reserved.
- *
- * 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.
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/platform_device.h>
-#include <linux/hdq.h>
-
-#define HDQ_READ 0
-#define HDQ_WRITE 0x80
-
-enum hdq_bitbang_states {
-	HDQB_IDLE = 0,
-	HDQB_TX_BREAK,
-	HDQB_TX_BREAK_RECOVERY,
-	HDQB_ADS_CALC,
-	HDQB_ADS_LOW,
-	HDQB_ADS_HIGH,
-	HDQB_WAIT_RX,
-	HDQB_DATA_RX_LOW,
-	HDQB_DATA_RX_HIGH,
-	HDQB_WAIT_TX,
-};
-
-static struct hdq_priv {
-	u8 hdq_probed; /* nonzero after HDQ driver probed */
-	struct mutex hdq_lock; /* if you want to use hdq, you have to take lock */
-	unsigned long hdq_gpio_pin; /* GTA02 = GPD14 which pin to meddle with */
-	u8 hdq_ads; /* b7..b6 = register address, b0 = r/w */
-	u8 hdq_tx_data; /* data to tx for write action */
-	u8 hdq_rx_data; /* data received in read action */
-	u8 hdq_request_ctr; /* incremented by "user" to request a transfer */
-	u8 hdq_transaction_ctr; /* incremented after each transfer */
-	u8 hdq_error; /* 0 = no error */
-	u8 hdq_ctr;
-	u8 hdq_ctr2;
-	u8 hdq_bit;
-	u8 hdq_shifter;
-	u8 hdq_tx_data_done;
-	enum hdq_bitbang_states hdq_state;
-	int reported_error;
-
-	struct hdq_platform_data *pdata;
-} hdq_priv;
-
-
-static void hdq_bad(void)
-{
-	if (!hdq_priv.reported_error)
-		printk(KERN_ERR "HDQ error: %d\n", hdq_priv.hdq_error);
-	hdq_priv.reported_error = 1;
-}
-
-static void hdq_good(void)
-{
-	if (hdq_priv.reported_error)
-		printk(KERN_INFO "HDQ responds again\n");
-	hdq_priv.reported_error = 0;
-}
-
-int hdq_fiq_handler(void)
-{
-	if (!hdq_priv.hdq_probed)
-		return 0;
-
-	switch (hdq_priv.hdq_state) {
-	case HDQB_IDLE:
-		if (hdq_priv.hdq_request_ctr == hdq_priv.hdq_transaction_ctr)
-			break;
-		hdq_priv.hdq_ctr = 250 / HDQ_SAMPLE_PERIOD_US;
-		hdq_priv.pdata->gpio_set(0);
-		hdq_priv.pdata->gpio_dir_out();
-		hdq_priv.hdq_tx_data_done = 0;
-		hdq_priv.hdq_state = HDQB_TX_BREAK;
-		break;
-
-	case HDQB_TX_BREAK: /* issue low for > 190us */
-		if (--hdq_priv.hdq_ctr == 0) {
-			hdq_priv.hdq_ctr = 60 / HDQ_SAMPLE_PERIOD_US;
-			hdq_priv.hdq_state = HDQB_TX_BREAK_RECOVERY;
-			hdq_priv.pdata->gpio_set(1);
-		}
-		break;
-
-	case HDQB_TX_BREAK_RECOVERY: /* issue low for > 40us */
-		if (--hdq_priv.hdq_ctr)
-			break;
-		hdq_priv.hdq_shifter = hdq_priv.hdq_ads;
-		hdq_priv.hdq_bit = 8; /* 8 bits of ads / rw */
-		hdq_priv.hdq_tx_data_done = 0; /* doing ads */
-		/* fallthru on last one */
-	case HDQB_ADS_CALC:
-		if (hdq_priv.hdq_shifter & 1)
-			hdq_priv.hdq_ctr = 50 / HDQ_SAMPLE_PERIOD_US;
-		else
-			hdq_priv.hdq_ctr = 120 / HDQ_SAMPLE_PERIOD_US;
-		/* carefully precompute the other phase length */
-		hdq_priv.hdq_ctr2 = (210 - (hdq_priv.hdq_ctr * HDQ_SAMPLE_PERIOD_US)) /
-				HDQ_SAMPLE_PERIOD_US;
-		hdq_priv.hdq_state = HDQB_ADS_LOW;
-		hdq_priv.hdq_shifter >>= 1;
-		hdq_priv.hdq_bit--;
-		hdq_priv.pdata->gpio_set(0);
-		break;
-
-	case HDQB_ADS_LOW:
-		if (--hdq_priv.hdq_ctr)
-			break;
-		hdq_priv.pdata->gpio_set(1);
-		hdq_priv.hdq_state = HDQB_ADS_HIGH;
-		break;
-
-	case HDQB_ADS_HIGH:
-		if (--hdq_priv.hdq_ctr2 > 1) /* account for HDQB_ADS_CALC */
-			break;
-		if (hdq_priv.hdq_bit) { /* more bits to do */
-			hdq_priv.hdq_state = HDQB_ADS_CALC;
-			break;
-		}
-		/* no more bits, wait it out until hdq_priv.hdq_ctr2 exhausted */
-		if (hdq_priv.hdq_ctr2)
-			break;
-		/* ok no more bits and very last state */
-		hdq_priv.hdq_ctr = 60 / HDQ_SAMPLE_PERIOD_US;
-		/* FIXME 0 = read */
-		if (hdq_priv.hdq_ads & 0x80) { /* write the byte out */
-			 /* set delay before payload */
-			hdq_priv.hdq_ctr = 300 / HDQ_SAMPLE_PERIOD_US;
- 			/* already high, no need to write */
-			hdq_priv.hdq_state = HDQB_WAIT_TX;
-			break;
-		}
-		/* read the next byte */
-		hdq_priv.hdq_bit = 8; /* 8 bits of data */
-		hdq_priv.hdq_ctr = 2500 / HDQ_SAMPLE_PERIOD_US;
-		hdq_priv.hdq_state = HDQB_WAIT_RX;
-		hdq_priv.pdata->gpio_dir_in();
-		break;
-
-	case HDQB_WAIT_TX: /* issue low for > 40us */
-		if (--hdq_priv.hdq_ctr)
-			break;
-		if (!hdq_priv.hdq_tx_data_done) { /* was that the data sent? */
-			hdq_priv.hdq_tx_data_done++;
-			hdq_priv.hdq_shifter = hdq_priv.hdq_tx_data;
-			hdq_priv.hdq_bit = 8; /* 8 bits of data */
-			hdq_priv.hdq_state = HDQB_ADS_CALC; /* start sending */
-			break;
-		}
-		hdq_priv.hdq_error = 0;
-		hdq_priv.hdq_transaction_ctr = hdq_priv.hdq_request_ctr;
-		hdq_priv.hdq_state = HDQB_IDLE; /* all tx is done */
-		/* idle in input mode, it's pulled up by 10K */
-		hdq_priv.pdata->gpio_dir_in();
-		break;
-
-	case HDQB_WAIT_RX: /* wait for battery to talk to us */
-		if (hdq_priv.pdata->gpio_get() == 0) {
-			/* it talks to us! */
-			hdq_priv.hdq_ctr2 = 1;
-			hdq_priv.hdq_bit = 8; /* 8 bits of data */
-			/* timeout */
-			hdq_priv.hdq_ctr = 500 / HDQ_SAMPLE_PERIOD_US;
-			hdq_priv.hdq_state = HDQB_DATA_RX_LOW;
-			break;
-		}
-		if (--hdq_priv.hdq_ctr == 0) { /* timed out, error */
-			hdq_priv.hdq_error = 1;
-			hdq_priv.hdq_transaction_ctr = hdq_priv.hdq_request_ctr;
-			hdq_priv.hdq_state = HDQB_IDLE; /* abort */
-		}
-		break;
-
-	/*
-	 * HDQ basically works by measuring the low time of the bit cell
-	 * 32-50us --> '1', 80 - 145us --> '0'
-	 */
-
-	case HDQB_DATA_RX_LOW:
-		if (hdq_priv.pdata->gpio_get()) {
-			hdq_priv.hdq_rx_data >>= 1;
-			if (hdq_priv.hdq_ctr2 <= (65 / HDQ_SAMPLE_PERIOD_US))
-				hdq_priv.hdq_rx_data |= 0x80;
-
-			if (--hdq_priv.hdq_bit == 0) {
-				hdq_priv.hdq_error = 0;
-				hdq_priv.hdq_transaction_ctr =
-							hdq_priv.hdq_request_ctr;
-
-				hdq_priv.hdq_state = HDQB_IDLE;
-			} else
-				hdq_priv.hdq_state = HDQB_DATA_RX_HIGH;
-			/* timeout */
-			hdq_priv.hdq_ctr = 1000 / HDQ_SAMPLE_PERIOD_US;
-			hdq_priv.hdq_ctr2 = 1;
-			break;
-		}
-		hdq_priv.hdq_ctr2++;
-		if (--hdq_priv.hdq_ctr)
-			break;
-		 /* timed out, error */
-		hdq_priv.hdq_error = 2;
-		hdq_priv.hdq_transaction_ctr = hdq_priv.hdq_request_ctr;
-		hdq_priv.hdq_state = HDQB_IDLE; /* abort */
-		break;
-
-	case HDQB_DATA_RX_HIGH:
-		if (!hdq_priv.pdata->gpio_get()) {
-			/* it talks to us! */
-			hdq_priv.hdq_ctr2 = 1;
-			/* timeout */
-			hdq_priv.hdq_ctr = 400 / HDQ_SAMPLE_PERIOD_US;
-			hdq_priv.hdq_state = HDQB_DATA_RX_LOW;
-			break;
-		}
-		if (--hdq_priv.hdq_ctr)
-			break;
-		/* timed out, error */
-		hdq_priv.hdq_error = 3;
-		hdq_priv.hdq_transaction_ctr = hdq_priv.hdq_request_ctr;
-
-		/* we're in input mode already */
-		hdq_priv.hdq_state = HDQB_IDLE; /* abort */
-		break;
-	}
-
-	/* Are we interested in keeping the FIQ source alive ? */
-	if (hdq_priv.hdq_state != HDQB_IDLE)
-		return 1;
-	else
-		return 0;
-}
-static int fiq_busy(void)
-{
-	int request = (volatile u8)hdq_priv.hdq_request_ctr;
-	int transact = (volatile u8)hdq_priv.hdq_transaction_ctr;
-
-
-	return (request != transact);
-}
-
-int hdq_initialized(void)
-{
-	return hdq_priv.hdq_probed;
-}
-EXPORT_SYMBOL_GPL(hdq_initialized);
-
-int hdq_read(int address)
-{
-	int count_sleeps = 5;
-	int ret = -ETIME;
-
-	if (!hdq_priv.hdq_probed)
-		return -EINVAL;
-
-	mutex_lock(&hdq_priv.hdq_lock);
-
-	hdq_priv.hdq_error = 0;
-	hdq_priv.hdq_ads = address | HDQ_READ;
-	hdq_priv.hdq_request_ctr++;
-	hdq_priv.pdata->kick_fiq();
-	/*
-	 * FIQ takes care of it while we block our calling process
-	 * But we're not spinning -- other processes run normally while
-	 * we wait for the result
-	 */
-	while (count_sleeps--) {
-		msleep(10); /* valid transaction always completes in < 10ms */
-
-		if (fiq_busy())
-			continue;
-
-		if (hdq_priv.hdq_error) {
-			hdq_bad();
-			goto done; /* didn't see a response in good time */
-		}
-		hdq_good();
-
-		ret = hdq_priv.hdq_rx_data;
-		goto done;
-	}
-
-done:
-	mutex_unlock(&hdq_priv.hdq_lock);
-	return ret;
-}
-EXPORT_SYMBOL_GPL(hdq_read);
-
-int hdq_write(int address, u8 data)
-{
-	int count_sleeps = 5;
-	int ret = -ETIME;
-
-	if (!hdq_priv.hdq_probed)
-		return -EINVAL;
-
-	mutex_lock(&hdq_priv.hdq_lock);
-
-	hdq_priv.hdq_error = 0;
-	hdq_priv.hdq_ads = address | HDQ_WRITE;
-	hdq_priv.hdq_tx_data = data;
-	hdq_priv.hdq_request_ctr++;
-	hdq_priv.pdata->kick_fiq();
-	/*
-	 * FIQ takes care of it while we block our calling process
-	 * But we're not spinning -- other processes run normally while
-	 * we wait for the result
-	 */
-	while (count_sleeps--) {
-		msleep(10); /* valid transaction always completes in < 10ms */
-
-		if (fiq_busy())
-			continue; /* something bad with FIQ */
-
-		if (hdq_priv.hdq_error) {
-			hdq_bad();
-			goto done; /* didn't see a response in good time */
-		}
-		hdq_good();
-
-		ret = 0;
-		goto done;
-	}
-
-done:
-	mutex_unlock(&hdq_priv.hdq_lock);
-	return ret;
-}
-EXPORT_SYMBOL_GPL(hdq_write);
-
-/* sysfs */
-
-static ssize_t hdq_sysfs_dump(struct device *dev, struct device_attribute *attr,
-			 char *buf)
-{
-	int n;
-	int v;
-	u8 u8a[128]; /* whole address space for HDQ */
-	char *end = buf;
-
-	if (!hdq_priv.hdq_probed)
-		return -EINVAL;
-
-	/* the dump does not take care about 16 bit regs, because at this
-	 * bus level we don't know about the chip details
-	 */
-	for (n = 0; n < sizeof(u8a); n++) {
-		v = hdq_read(n);
-		if (v < 0)
-			goto bail;
-		u8a[n] = v;
-	}
-
-	for (n = 0; n < sizeof(u8a); n += 16) {
-		hex_dump_to_buffer(u8a + n, sizeof(u8a), 16, 1, end, 4096, 0);
-		end += strlen(end);
-		*end++ = '\n';
-		*end = '\0';
-	}
-	return (end - buf);
-
-bail:
-	return sprintf(buf, "ERROR %d\n", v);
-}
-
-/* you write by <address> <data>, eg, "34 128" */
-
-#define atoi(str) simple_strtoul(((str != NULL) ? str : ""), NULL, 0)
-
-static ssize_t hdq_sysfs_write(struct device *dev,
-			       struct device_attribute *attr,
-			       const char *buf, size_t count)
-{
-	const char *end = buf + count;
-	int address = atoi(buf);
-
-	if (!hdq_priv.hdq_probed)
-		return -EINVAL;
-
-	while ((buf != end) && (*buf != ' '))
-		buf++;
-	if (buf >= end)
-		return 0;
-	while ((buf < end) && (*buf == ' '))
-		buf++;
-	if (buf >= end)
-		return 0;
-
-	hdq_write(address, atoi(buf));
-
-	return count;
-}
-
-static DEVICE_ATTR(dump, 0400, hdq_sysfs_dump, NULL);
-static DEVICE_ATTR(write, 0600, NULL, hdq_sysfs_write);
-
-static struct attribute *hdq_sysfs_entries[] = {
-	&dev_attr_dump.attr,
-	&dev_attr_write.attr,
-	NULL
-};
-
-static struct attribute_group hdq_attr_group = {
-	.name	= "hdq",
-	.attrs	= hdq_sysfs_entries,
-};
-
-
-#ifdef CONFIG_PM
-static int hdq_suspend(struct platform_device *pdev, pm_message_t state)
-{
-	/* after 18s of this, the battery monitor will also go to sleep */
-	hdq_priv.pdata->gpio_dir_in();
-	hdq_priv.pdata->disable_fiq();
-	return 0;
-}
-
-static int hdq_resume(struct platform_device *pdev)
-{
-	hdq_priv.pdata->gpio_set(1);
-	hdq_priv.pdata->gpio_dir_out();
-	hdq_priv.pdata->enable_fiq();
-	return 0;
-}
-#endif
-
-static int __init hdq_probe(struct platform_device *pdev)
-{
-	struct resource *r = platform_get_resource(pdev, 0, 0);
-	int ret;
-	struct hdq_platform_data *pdata = pdev->dev.platform_data;
-
-	if (!r || !pdata)
-		return -EINVAL;
-
-	platform_set_drvdata(pdev, NULL);
-
-	mutex_init(&hdq_priv.hdq_lock);
-
-	/* set our HDQ comms pin from the platform data */
-	hdq_priv.hdq_gpio_pin = r->start;
-	hdq_priv.pdata = pdata;
-
-	hdq_priv.pdata->gpio_set(1);
-	hdq_priv.pdata->gpio_dir_out();
-
-	/* Initialize FIQ */
-	if (hdq_priv.pdata->enable_fiq() < 0) {
-		dev_err(&pdev->dev, "Could not enable FIQ source\n");
-		return -EINVAL;
-	}
-
-	ret = sysfs_create_group(&pdev->dev.kobj, &hdq_attr_group);
-	if (ret)
-		return ret;
-
-	hdq_priv.hdq_probed = 1; /* we are ready to do stuff now */
-
-	/*
-	 * if wanted, users can defer registration of devices
-	 * that depend on HDQ until after we register, and can use our
-	 * device as parent so suspend-resume ordering is correct
-	 */
-	if (pdata->attach_child_devices)
-		(pdata->attach_child_devices)(&pdev->dev);
-
-	hdq_priv.pdata = pdata;
-
-	return 0;
-}
-
-static int hdq_remove(struct platform_device *pdev)
-{
-	sysfs_remove_group(&pdev->dev.kobj, &hdq_attr_group);
-	return 0;
-}
-
-static struct platform_driver hdq_driver = {
-	.probe		= hdq_probe,
-	.remove		= hdq_remove,
-#ifdef CONFIG_PM
-	.suspend	= hdq_suspend,
-	.resume		= hdq_resume,
-#endif
-	.driver		= {
-		.name		= "hdq",
-	},
-};
-
-static int __init hdq_init(void)
-{
-	return platform_driver_register(&hdq_driver);
-}
-
-static void __exit hdq_exit(void)
-{
- 	platform_driver_unregister(&hdq_driver);
-}
-
-module_init(hdq_init);
-module_exit(hdq_exit);
-
-MODULE_AUTHOR("Andy Green <andy@openmoko.com>");
-MODULE_DESCRIPTION("HDQ driver");
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/video/display/jbt6k74.c b/target/linux/s3c24xx/files-2.6.30/drivers/video/display/jbt6k74.c
deleted file mode 100644
index 87f0d6731..000000000
--- a/target/linux/s3c24xx/files-2.6.30/drivers/video/display/jbt6k74.c
+++ /dev/null
@@ -1,835 +0,0 @@
-/* Linux kernel driver for the tpo JBT6K74-AS LCM ASIC
- *
- * Copyright (C) 2006-2007 by Openmoko, Inc.
- * Author: Harald Welte <laforge@openmoko.org>,
- * 	   Stefan Schmidt <stefan@openmoko.org>
- * Copyright (C) 2008 by Harald Welte <laforge@openmoko.org>
- * Copyright (C) 2009 by Lars-Peter Clausen <lars@metafoo.de>
- * All rights reserved.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/module.h>
-#include <linux/device.h>
-#include <linux/platform_device.h>
-#include <linux/delay.h>
-#include <linux/workqueue.h>
-#include <linux/jbt6k74.h>
-#include <linux/fb.h>
-#include <linux/lcd.h>
-#include <linux/time.h>
-
-enum jbt_register {
-	JBT_REG_SLEEP_IN		= 0x10,
-	JBT_REG_SLEEP_OUT		= 0x11,
-
-	JBT_REG_DISPLAY_OFF		= 0x28,
-	JBT_REG_DISPLAY_ON		= 0x29,
-
-	JBT_REG_RGB_FORMAT		= 0x3a,
-	JBT_REG_QUAD_RATE		= 0x3b,
-
-	JBT_REG_POWER_ON_OFF		= 0xb0,
-	JBT_REG_BOOSTER_OP		= 0xb1,
-	JBT_REG_BOOSTER_MODE		= 0xb2,
-	JBT_REG_BOOSTER_FREQ		= 0xb3,
-	JBT_REG_OPAMP_SYSCLK		= 0xb4,
-	JBT_REG_VSC_VOLTAGE		= 0xb5,
-	JBT_REG_VCOM_VOLTAGE		= 0xb6,
-	JBT_REG_EXT_DISPL		= 0xb7,
-	JBT_REG_OUTPUT_CONTROL		= 0xb8,
-	JBT_REG_DCCLK_DCEV		= 0xb9,
-	JBT_REG_DISPLAY_MODE1		= 0xba,
-	JBT_REG_DISPLAY_MODE2		= 0xbb,
-	JBT_REG_DISPLAY_MODE		= 0xbc,
-	JBT_REG_ASW_SLEW		= 0xbd,
-	JBT_REG_DUMMY_DISPLAY		= 0xbe,
-	JBT_REG_DRIVE_SYSTEM		= 0xbf,
-
-	JBT_REG_SLEEP_OUT_FR_A		= 0xc0,
-	JBT_REG_SLEEP_OUT_FR_B		= 0xc1,
-	JBT_REG_SLEEP_OUT_FR_C		= 0xc2,
-	JBT_REG_SLEEP_IN_LCCNT_D	= 0xc3,
-	JBT_REG_SLEEP_IN_LCCNT_E	= 0xc4,
-	JBT_REG_SLEEP_IN_LCCNT_F	= 0xc5,
-	JBT_REG_SLEEP_IN_LCCNT_G	= 0xc6,
-
-	JBT_REG_GAMMA1_FINE_1		= 0xc7,
-	JBT_REG_GAMMA1_FINE_2		= 0xc8,
-	JBT_REG_GAMMA1_INCLINATION	= 0xc9,
-	JBT_REG_GAMMA1_BLUE_OFFSET	= 0xca,
-
-	/* VGA */
-	JBT_REG_BLANK_CONTROL		= 0xcf,
-	JBT_REG_BLANK_TH_TV		= 0xd0,
-	JBT_REG_CKV_ON_OFF		= 0xd1,
-	JBT_REG_CKV_1_2			= 0xd2,
-	JBT_REG_OEV_TIMING		= 0xd3,
-	JBT_REG_ASW_TIMING_1		= 0xd4,
-	JBT_REG_ASW_TIMING_2		= 0xd5,
-
-	/* QVGA */
-	JBT_REG_BLANK_CONTROL_QVGA	= 0xd6,
-	JBT_REG_BLANK_TH_TV_QVGA	= 0xd7,
-	JBT_REG_CKV_ON_OFF_QVGA		= 0xd8,
-	JBT_REG_CKV_1_2_QVGA		= 0xd9,
-	JBT_REG_OEV_TIMING_QVGA		= 0xde,
-	JBT_REG_ASW_TIMING_1_QVGA	= 0xdf,
-	JBT_REG_ASW_TIMING_2_QVGA	= 0xe0,
-
-
-	JBT_REG_HCLOCK_VGA		= 0xec,
-	JBT_REG_HCLOCK_QVGA		= 0xed,
-
-};
-
-enum jbt_resolution {
-	JBT_RESOLUTION_VGA,
-	JBT_RESOLUTION_QVGA,
-};
-
-enum jbt_power_mode {
-	JBT_POWER_MODE_DEEP_STANDBY,
-	JBT_POWER_MODE_SLEEP,
-	JBT_POWER_MODE_NORMAL,
-};
-
-static const char *jbt_power_mode_names[] = {
-	[JBT_POWER_MODE_DEEP_STANDBY]	= "deep-standby",
-	[JBT_POWER_MODE_SLEEP]		= "sleep",
-	[JBT_POWER_MODE_NORMAL]		= "normal",
-};
-
-static const char *jbt_resolution_names[] = {
-	[JBT_RESOLUTION_VGA] = "vga",
-	[JBT_RESOLUTION_QVGA] = "qvga",
-};
-
-struct jbt_info {
-	struct mutex lock;		/* protects this structure */
-	enum jbt_resolution resolution;
-	enum jbt_power_mode power_mode;
-	enum jbt_power_mode suspend_mode;
-	int suspended;
-	struct spi_device *spi_dev;
-	struct lcd_device *lcd_dev;
-	unsigned long last_sleep;
-	struct delayed_work blank_work;
-	int blank_mode;
-	u16 tx_buf[4];
-	u16 reg_cache[0xEE];
-};
-
-#define JBT_COMMAND	0x000
-#define JBT_DATA	0x100
-
-static int jbt_reg_write_nodata(struct jbt_info *jbt, u8 reg)
-{
-	int rc;
-
-	jbt->tx_buf[0] = JBT_COMMAND | reg;
-	rc = spi_write(jbt->spi_dev, (u8 *)jbt->tx_buf,
-	               1*sizeof(u16));
-	if (rc == 0)
-		jbt->reg_cache[reg] = 0;
-	else
-		dev_err(&jbt->spi_dev->dev, "jbt_reg_write_nodata spi_write ret %d\n",
-		       rc);
-
-	return rc;
-}
-
-
-static int jbt_reg_write(struct jbt_info *jbt, u8 reg, u8 data)
-{
-	int rc;
-
-	jbt->tx_buf[0] = JBT_COMMAND | reg;
-	jbt->tx_buf[1] = JBT_DATA | data;
-	rc = spi_write(jbt->spi_dev, (u8 *)jbt->tx_buf,
-	               2*sizeof(u16));
-	if (rc == 0)
-		jbt->reg_cache[reg] = data;
-	else
-		dev_err(&jbt->spi_dev->dev, "jbt_reg_write spi_write ret %d\n", rc);
-
-	return rc;
-}
-
-static int jbt_reg_write16(struct jbt_info *jbt, u8 reg, u16 data)
-{
-	int rc;
-
-	jbt->tx_buf[0] = JBT_COMMAND | reg;
-	jbt->tx_buf[1] = JBT_DATA | (data >> 8);
-	jbt->tx_buf[2] = JBT_DATA | (data & 0xff);
-
-	rc = spi_write(jbt->spi_dev, (u8 *)jbt->tx_buf,
-	               3*sizeof(u16));
-	if (rc == 0)
-		jbt->reg_cache[reg] = data;
-	else
-		dev_err(&jbt->spi_dev->dev, "jbt_reg_write16 spi_write ret %d\n", rc);
-
-	return rc;
-}
-
-static int jbt_init_regs(struct jbt_info *jbt)
-{
-	int rc;
-
-	dev_dbg(&jbt->spi_dev->dev, "entering %cVGA mode\n",
-			jbt->resolution == JBT_RESOLUTION_QVGA ? 'Q' : ' ');
-
-	rc = jbt_reg_write(jbt, JBT_REG_DISPLAY_MODE1, 0x01);
-	rc |= jbt_reg_write(jbt, JBT_REG_DISPLAY_MODE2, 0x00);
-	rc |= jbt_reg_write(jbt, JBT_REG_RGB_FORMAT, 0x60);
-	rc |= jbt_reg_write(jbt, JBT_REG_DRIVE_SYSTEM, 0x10);
-	rc |= jbt_reg_write(jbt, JBT_REG_BOOSTER_OP, 0x56);
-	rc |= jbt_reg_write(jbt, JBT_REG_BOOSTER_MODE, 0x33);
-	rc |= jbt_reg_write(jbt, JBT_REG_BOOSTER_FREQ, 0x11);
-	rc |= jbt_reg_write(jbt, JBT_REG_OPAMP_SYSCLK, 0x02);
-	rc |= jbt_reg_write(jbt, JBT_REG_VSC_VOLTAGE, 0x2b);
-	rc |= jbt_reg_write(jbt, JBT_REG_VCOM_VOLTAGE, 0x40);
-	rc |= jbt_reg_write(jbt, JBT_REG_EXT_DISPL, 0x03);
-	rc |= jbt_reg_write(jbt, JBT_REG_DCCLK_DCEV, 0x04);
-	/*
-	 * default of 0x02 in JBT_REG_ASW_SLEW responsible for 72Hz requirement
-	 * to avoid red / blue flicker
-	 */
-	rc |= jbt_reg_write(jbt, JBT_REG_ASW_SLEW, 0x04 | (1 << 5));
-	rc |= jbt_reg_write(jbt, JBT_REG_DUMMY_DISPLAY, 0x00);
-
-	rc |= jbt_reg_write(jbt, JBT_REG_SLEEP_OUT_FR_A, 0x11);
-	rc |= jbt_reg_write(jbt, JBT_REG_SLEEP_OUT_FR_B, 0x11);
-	rc |= jbt_reg_write(jbt, JBT_REG_SLEEP_OUT_FR_C, 0x11);
-	rc |= jbt_reg_write16(jbt, JBT_REG_SLEEP_IN_LCCNT_D, 0x2040);
-	rc |= jbt_reg_write16(jbt, JBT_REG_SLEEP_IN_LCCNT_E, 0x60c0);
-	rc |= jbt_reg_write16(jbt, JBT_REG_SLEEP_IN_LCCNT_F, 0x1020);
-	rc |= jbt_reg_write16(jbt, JBT_REG_SLEEP_IN_LCCNT_G, 0x60c0);
-
-	rc |= jbt_reg_write16(jbt, JBT_REG_GAMMA1_FINE_1, 0x5533);
-	rc |= jbt_reg_write(jbt, JBT_REG_GAMMA1_FINE_2, 0x00);
-	rc |= jbt_reg_write(jbt, JBT_REG_GAMMA1_INCLINATION, 0x00);
-	rc |= jbt_reg_write(jbt, JBT_REG_GAMMA1_BLUE_OFFSET, 0x00);
-
-	if (jbt->resolution != JBT_RESOLUTION_QVGA) {
-		rc |= jbt_reg_write16(jbt, JBT_REG_HCLOCK_VGA, 0x1f0);
-		rc |= jbt_reg_write(jbt, JBT_REG_BLANK_CONTROL, 0x02);
-		rc |= jbt_reg_write16(jbt, JBT_REG_BLANK_TH_TV, 0x0804);
-
-		rc |= jbt_reg_write(jbt, JBT_REG_CKV_ON_OFF, 0x01);
-		rc |= jbt_reg_write16(jbt, JBT_REG_CKV_1_2, 0x0000);
-
-		rc |= jbt_reg_write16(jbt, JBT_REG_OEV_TIMING, 0x0d0e);
-		rc |= jbt_reg_write16(jbt, JBT_REG_ASW_TIMING_1, 0x11a4);
-		rc |= jbt_reg_write(jbt, JBT_REG_ASW_TIMING_2, 0x0e);
-	} else {
-		rc |= jbt_reg_write16(jbt, JBT_REG_HCLOCK_QVGA, 0x00ff);
-		rc |= jbt_reg_write(jbt, JBT_REG_BLANK_CONTROL_QVGA, 0x02);
-		rc |= jbt_reg_write16(jbt, JBT_REG_BLANK_TH_TV_QVGA, 0x0804);
-
-		rc |= jbt_reg_write(jbt, JBT_REG_CKV_ON_OFF_QVGA, 0x01);
-		rc |= jbt_reg_write16(jbt, JBT_REG_CKV_1_2_QVGA, 0x0008);
-
-		rc |= jbt_reg_write16(jbt, JBT_REG_OEV_TIMING_QVGA, 0x050a);
-		rc |= jbt_reg_write16(jbt, JBT_REG_ASW_TIMING_1_QVGA, 0x0a19);
-		rc |= jbt_reg_write(jbt, JBT_REG_ASW_TIMING_2_QVGA, 0x0a);
-	}
-
-	return rc ? -EIO : 0;
-}
-
-static int standby_to_sleep(struct jbt_info *jbt)
-{
-	int rc;
-
-	/* three times command zero */
-	rc = jbt_reg_write_nodata(jbt, 0x00);
-	mdelay(1);
-	rc |= jbt_reg_write_nodata(jbt, 0x00);
-	mdelay(1);
-	rc |= jbt_reg_write_nodata(jbt, 0x00);
-	mdelay(1);
-
-	/* deep standby out */
-	rc |= jbt_reg_write(jbt, JBT_REG_POWER_ON_OFF, 0x11);
-	mdelay(1);
-	rc = jbt_reg_write(jbt, JBT_REG_DISPLAY_MODE, 0x28);
-
-	/* (re)initialize register set */
-	rc |= jbt_init_regs(jbt);
-
-	return rc ? -EIO : 0;
-}
-
-static int sleep_to_normal(struct jbt_info *jbt)
-{
-	int rc;
-
-	/* Make sure we are 120 ms after SLEEP_OUT */
-	if (time_before(jiffies, jbt->last_sleep))
-		mdelay(jiffies_to_msecs(jbt->last_sleep - jiffies));
-
-	if (jbt->resolution == JBT_RESOLUTION_VGA) {
-		/* RGB I/F on, RAM wirte off, QVGA through, SIGCON enable */
-		rc = jbt_reg_write(jbt, JBT_REG_DISPLAY_MODE, 0x80);
-
-		/* Quad mode off */
-		rc |= jbt_reg_write(jbt, JBT_REG_QUAD_RATE, 0x00);
-	} else {
-		/* RGB I/F on, RAM wirte off, QVGA through, SIGCON enable */
-		rc = jbt_reg_write(jbt, JBT_REG_DISPLAY_MODE, 0x81);
-
-		/* Quad mode on */
-		rc |= jbt_reg_write(jbt, JBT_REG_QUAD_RATE, 0x22);
-	}
-
-	/* AVDD on, XVDD on */
-	rc |= jbt_reg_write(jbt, JBT_REG_POWER_ON_OFF, 0x16);
-
-	/* Output control */
-	rc |= jbt_reg_write16(jbt, JBT_REG_OUTPUT_CONTROL, 0xfff9);
-
-	/* Turn on display */
-	rc |= jbt_reg_write_nodata(jbt, JBT_REG_DISPLAY_ON);
-
-	/* Sleep mode off */
-	rc |= jbt_reg_write_nodata(jbt, JBT_REG_SLEEP_OUT);
-	jbt->last_sleep = jiffies + msecs_to_jiffies(120);
-
-	/* Allow the booster and display controller to restart stably */
-	mdelay(5);
-
-	return rc ? -EIO : 0;
-}
-
-static int normal_to_sleep(struct jbt_info *jbt)
-{
-	int rc;
-
-	/* Make sure we are 120 ms after SLEEP_OUT */
-	while (time_before(jiffies, jbt->last_sleep))
-		cpu_relax();
-
-	rc = jbt_reg_write_nodata(jbt, JBT_REG_DISPLAY_OFF);
-	rc |= jbt_reg_write16(jbt, JBT_REG_OUTPUT_CONTROL, 0x8000 | 1 << 3);
-	rc |= jbt_reg_write_nodata(jbt, JBT_REG_SLEEP_IN);
-	jbt->last_sleep = jiffies + msecs_to_jiffies(120);
-
-	/* Allow the internal circuits to stop automatically */
-	mdelay(5);
-
-	return rc ? -EIO : 0;
-}
-
-static int sleep_to_standby(struct jbt_info *jbt)
-{
-	return jbt_reg_write(jbt, JBT_REG_POWER_ON_OFF, 0x00);
-}
-
-int jbt6k74_enter_power_mode(struct jbt_info *jbt, enum jbt_power_mode new_mode)
-{
-	struct jbt6k74_platform_data *pdata = jbt->spi_dev->dev.platform_data;
-	int rc = -EINVAL;
-
-	dev_dbg(&jbt->spi_dev->dev, "entering (old_state=%s, new_state=%s)\n",
-			jbt_power_mode_names[jbt->power_mode],
-			jbt_power_mode_names[new_mode]);
-
-	mutex_lock(&jbt->lock);
-
-	if (jbt->suspended) {
-		switch (new_mode) {
-		case JBT_POWER_MODE_DEEP_STANDBY:
-		case JBT_POWER_MODE_SLEEP:
-		case JBT_POWER_MODE_NORMAL:
-			rc = 0;
-			jbt->suspend_mode = new_mode;
-			break;
-		default:
-			break;
-		}
-	} else if (new_mode == JBT_POWER_MODE_NORMAL &&
-	           pdata->enable_pixel_clock) {
-		pdata->enable_pixel_clock(&jbt->spi_dev->dev, 1);
-	}
-
-	switch (jbt->power_mode) {
-	case JBT_POWER_MODE_DEEP_STANDBY:
-		switch (new_mode) {
-		case JBT_POWER_MODE_DEEP_STANDBY:
-			rc = 0;
-			break;
-		case JBT_POWER_MODE_SLEEP:
-			rc = standby_to_sleep(jbt);
-			break;
-		case JBT_POWER_MODE_NORMAL:
-			/* first transition into sleep */
-			rc = standby_to_sleep(jbt);
-			/* then transition into normal */
-			rc |= sleep_to_normal(jbt);
-			break;
-		}
-		break;
-	case JBT_POWER_MODE_SLEEP:
-		switch (new_mode) {
-		case JBT_POWER_MODE_SLEEP:
-			rc = 0;
-			break;
-		case JBT_POWER_MODE_DEEP_STANDBY:
-			rc = sleep_to_standby(jbt);
-			break;
-		case JBT_POWER_MODE_NORMAL:
-			rc = sleep_to_normal(jbt);
-			break;
-		}
-		break;
-	case JBT_POWER_MODE_NORMAL:
-		switch (new_mode) {
-		case JBT_POWER_MODE_NORMAL:
-			rc = 0;
-			break;
-		case JBT_POWER_MODE_DEEP_STANDBY:
-			/* first transition into sleep */
-			rc = normal_to_sleep(jbt);
-			/* then transition into deep standby */
-			rc |= sleep_to_standby(jbt);
-			break;
-		case JBT_POWER_MODE_SLEEP:
-			rc = normal_to_sleep(jbt);
-			break;
-		}
-	}
-
-	if (rc == 0) {
-		jbt->power_mode = new_mode;
-		if (new_mode != JBT_POWER_MODE_NORMAL &&
-		    pdata->enable_pixel_clock)
-			pdata->enable_pixel_clock(&jbt->spi_dev->dev, 0);
-	} else {
-		dev_err(&jbt->spi_dev->dev, "Failed enter state '%s')\n",
-				jbt_power_mode_names[new_mode]);
-	}
-
-	mutex_unlock(&jbt->lock);
-
-	return rc;
-}
-EXPORT_SYMBOL_GPL(jbt6k74_enter_power_mode);
-
-int jbt6k74_set_resolution(struct jbt_info *jbt, enum jbt_resolution new_resolution) {
-	int rc = 0;
-	enum jbt_resolution old_resolution;
-
-	if (new_resolution != JBT_RESOLUTION_VGA &&
-	    new_resolution != JBT_RESOLUTION_QVGA)
-		return -EINVAL;
-
-	mutex_lock(&jbt->lock);
-
-	if (jbt->resolution == new_resolution)
-		goto out_unlock;
-
-	old_resolution = jbt->resolution;
-	jbt->resolution = new_resolution;
-
-	if (jbt->power_mode == JBT_POWER_MODE_NORMAL) {
-
-		/* first transition into sleep */
-		rc = normal_to_sleep(jbt);
-		/* second transition into deep standby */
-/*		rc |= sleep_to_standby(jbt);*/
-		/* third transition into sleep */
-/*		rc |= standby_to_sleep(jbt);*/
-		/* fourth transition into normal */
-		rc |= sleep_to_normal(jbt);
-
-		if (rc) {
-			jbt->resolution = old_resolution;
-			dev_err(&jbt->spi_dev->dev, "Failed to set resolution '%s')\n",
-			        jbt_resolution_names[new_resolution]);
-		}
-	}
-
-out_unlock:
-	mutex_unlock(&jbt->lock);
-
-	return rc;
-}
-EXPORT_SYMBOL_GPL(jbt6k74_set_resolution);
-
-static ssize_t resolution_read(struct device *dev, struct device_attribute *attr,
-			  char *buf)
-{
-	struct jbt_info *jbt = dev_get_drvdata(dev);
-
-	if (jbt->resolution >= ARRAY_SIZE(jbt_resolution_names))
-		return -EIO;
-
-	return sprintf(buf, "%s\n", jbt_resolution_names[jbt->resolution]);
-}
-
-static ssize_t resolution_write(struct device *dev, struct device_attribute *attr,
-			   const char *buf, size_t count)
-{
-	struct jbt_info *jbt = dev_get_drvdata(dev);
-	int i, rc;
-
-	for (i = 0; i < ARRAY_SIZE(jbt_resolution_names); i++) {
-		if (!strncmp(buf, jbt_resolution_names[i],
-		       strlen(jbt_resolution_names[i]))) {
-			rc = jbt6k74_set_resolution(jbt, i);
-			if (rc)
-				return rc;
-			return count;
-		}
-	}
-
-	return -EINVAL;
-}
-
-static DEVICE_ATTR(resolution, 0644, resolution_read, resolution_write);
-
-static int reg_by_string(const char *name)
-{
-	if (!strcmp(name, "gamma_fine1"))
-		return JBT_REG_GAMMA1_FINE_1;
-	else if (!strcmp(name, "gamma_fine2"))
-		return JBT_REG_GAMMA1_FINE_2;
-	else if (!strcmp(name, "gamma_inclination"))
-		return JBT_REG_GAMMA1_INCLINATION;
-	else
-		return JBT_REG_GAMMA1_BLUE_OFFSET;
-}
-
-static ssize_t gamma_read(struct device *dev, struct device_attribute *attr,
-			  char *buf)
-{
-	struct jbt_info *jbt = dev_get_drvdata(dev);
-	int reg = reg_by_string(attr->attr.name);
-	u16 val;
-
-	mutex_lock(&jbt->lock);
-	val = jbt->reg_cache[reg];
-		mutex_unlock(&jbt->lock);
-
-	return sprintf(buf, "0x%04x\n", val);
-}
-
-static ssize_t gamma_write(struct device *dev, struct device_attribute *attr,
-			   const char *buf, size_t count)
-{
-	struct jbt_info *jbt = dev_get_drvdata(dev);
-	int reg = reg_by_string(attr->attr.name);
-	unsigned long val = simple_strtoul(buf, NULL, 10);
-
-	dev_info(dev, "writing gama %lu\n", val & 0xff);
-
-	mutex_lock(&jbt->lock);
-	jbt_reg_write(jbt, reg, val & 0xff);
-	mutex_unlock(&jbt->lock);
-
-	return count;
-}
-
-static ssize_t reset_write(struct device *dev, struct device_attribute *attr,
-			   const char *buf, size_t count)
-{
-	int rc;
-	struct jbt_info *jbt = dev_get_drvdata(dev);
-	struct jbt6k74_platform_data *pdata = jbt->spi_dev->dev.platform_data;
-
-	dev_info(dev, "reset\n");
-
-	mutex_lock(&jbt->lock);
-
-	/* hard reset the jbt6k74 */
-	(pdata->reset)(0, 0);
-	mdelay(1);
-	(pdata->reset)(0, 1);
-	mdelay(120);
-
-	rc = jbt_reg_write_nodata(jbt, 0x01);
-	if (rc < 0)
-		dev_err(&jbt->spi_dev->dev, "cannot soft reset\n");
-	mdelay(120);
-
-	mutex_unlock(&jbt->lock);
-
-	jbt6k74_enter_power_mode(jbt, jbt->power_mode);
-
-	return count;
-}
-
-static DEVICE_ATTR(gamma_fine1, 0644, gamma_read, gamma_write);
-static DEVICE_ATTR(gamma_fine2, 0644, gamma_read, gamma_write);
-static DEVICE_ATTR(gamma_inclination, 0644, gamma_read, gamma_write);
-static DEVICE_ATTR(gamma_blue_offset, 0644, gamma_read, gamma_write);
-static DEVICE_ATTR(reset, 0600, NULL, reset_write);
-
-static struct attribute *jbt_sysfs_entries[] = {
-	&dev_attr_resolution.attr,
-	&dev_attr_gamma_fine1.attr,
-	&dev_attr_gamma_fine2.attr,
-	&dev_attr_gamma_inclination.attr,
-	&dev_attr_gamma_blue_offset.attr,
-	&dev_attr_reset.attr,
-	NULL,
-};
-
-static struct attribute_group jbt_attr_group = {
-	.name	= NULL,
-	.attrs	= jbt_sysfs_entries,
-};
-
-/* FIXME: This in an ugly hack to delay display blanking.
-  When the jbt is in sleep mode it displays an all white screen and thus one
-  will a see a short flash.
-  By delaying the blanking we will give the backlight a chance to turn off and
-  thus avoid getting the flash */
-static void jbt_blank_worker(struct work_struct *work) {
-	struct jbt_info *jbt  = container_of(work, struct jbt_info,
-						blank_work.work);
-
-	switch (jbt->blank_mode) {
-	case FB_BLANK_NORMAL:
-		jbt6k74_enter_power_mode(jbt, JBT_POWER_MODE_SLEEP);
-		break;
-	case FB_BLANK_POWERDOWN:
-		jbt6k74_enter_power_mode(jbt, JBT_POWER_MODE_DEEP_STANDBY);
-		break;
-	default:
-		break;
-	}
-}
-
-static int jbt6k74_set_mode(struct lcd_device *ld, struct fb_videomode *m) {
-	int rc = -EINVAL;
-	struct jbt_info *jbt = dev_get_drvdata(&ld->dev);
-
-	if (m->xres == 240 && m->yres == 320) {
-		rc = jbt6k74_set_resolution(jbt, JBT_RESOLUTION_QVGA);
-	} else if (m->xres == 480 && m->yres == 640) {
-		rc = jbt6k74_set_resolution(jbt, JBT_RESOLUTION_VGA);
-	} else {
-		dev_err(&jbt->spi_dev->dev, "Unknown resolution. Entering sleep mode.\n");
-		jbt6k74_enter_power_mode(jbt, JBT_POWER_MODE_SLEEP);
-	}
-
-	return rc;
-}
-
-static int jbt6k74_set_power(struct lcd_device *ld, int power) {
-	int rc = -EINVAL;
-	struct jbt_info *jbt = dev_get_drvdata(&ld->dev);
-
-	jbt->blank_mode = power;
-	cancel_rearming_delayed_work(&jbt->blank_work);
-
-	switch (power) {
-	case FB_BLANK_UNBLANK:
-		dev_dbg(&jbt->spi_dev->dev, "unblank\n");
-		rc = jbt6k74_enter_power_mode(jbt, JBT_POWER_MODE_NORMAL);
-		break;
-	case FB_BLANK_NORMAL:
-		dev_dbg(&jbt->spi_dev->dev, "blank\n");
-		rc = schedule_delayed_work(&jbt->blank_work, HZ);
-		break;
-	case FB_BLANK_POWERDOWN:
-		dev_dbg(&jbt->spi_dev->dev, "powerdown\n");
-		rc = schedule_delayed_work(&jbt->blank_work, HZ);
-		break;
-	default:
-		break;
-	}
-
-	return rc;
-}
-
-static int jbt6k74_get_power(struct lcd_device *ld) {
-	struct jbt_info *jbt = dev_get_drvdata(&ld->dev);
-
-	switch (jbt->power_mode) {
-        case JBT_POWER_MODE_NORMAL:
-		return FB_BLANK_UNBLANK;
-        case JBT_POWER_MODE_SLEEP:
-		return FB_BLANK_NORMAL;
-        default:
-		return JBT_POWER_MODE_DEEP_STANDBY;
-	}
-}
-
-struct lcd_ops jbt6k74_lcd_ops = {
-	.set_power = jbt6k74_set_power,
-	.get_power = jbt6k74_get_power,
-	.set_mode  = jbt6k74_set_mode,
-};
-
-/* linux device model infrastructure */
-
-static int __devinit jbt_probe(struct spi_device *spi)
-{
-	int rc;
-	struct jbt_info *jbt;
-	struct jbt6k74_platform_data *pdata = spi->dev.platform_data;
-
-	/* the controller doesn't have a MISO pin; we can't do detection */
-
-	spi->mode = SPI_CPOL | SPI_CPHA;
-	spi->bits_per_word = 9;
-
-	rc = spi_setup(spi);
-	if (rc < 0) {
-		dev_err(&spi->dev,
-			"error during spi_setup of jbt6k74 driver\n");
-		return rc;
-	}
-
-	jbt = kzalloc(sizeof(*jbt), GFP_KERNEL);
-	if (!jbt)
-		return -ENOMEM;
-
-	jbt->spi_dev = spi;
-
-	jbt->lcd_dev = lcd_device_register("jbt6k74-lcd", &spi->dev,
-	                   jbt, &jbt6k74_lcd_ops);
-
-	if (IS_ERR(jbt->lcd_dev)) {
-		rc = PTR_ERR(jbt->lcd_dev);
-		goto err_free_drvdata;
-	}
-
-	INIT_DELAYED_WORK(&jbt->blank_work, jbt_blank_worker);
-
-	jbt->resolution = JBT_RESOLUTION_VGA;
-	jbt->power_mode = JBT_POWER_MODE_DEEP_STANDBY;
-	jbt->last_sleep = jiffies + msecs_to_jiffies(120);
-	mutex_init(&jbt->lock);
-
-	dev_set_drvdata(&spi->dev, jbt);
-
-	rc = jbt6k74_enter_power_mode(jbt, JBT_POWER_MODE_NORMAL);
-	if (rc < 0) {
-		dev_err(&spi->dev, "cannot enter NORMAL state\n");
-		goto err_unregister_lcd;
-	}
-
-	rc = sysfs_create_group(&spi->dev.kobj, &jbt_attr_group);
-	if (rc < 0) {
-		dev_err(&spi->dev, "cannot create sysfs group\n");
-		goto err_standby;
-	}
-
-	if (pdata->probe_completed)
-		(pdata->probe_completed)(&spi->dev);
-
-	return 0;
-
-err_standby:
-	jbt6k74_enter_power_mode(jbt, JBT_POWER_MODE_DEEP_STANDBY);
-err_unregister_lcd:
-	lcd_device_unregister(jbt->lcd_dev);
-err_free_drvdata:
-	dev_set_drvdata(&spi->dev, NULL);
-	kfree(jbt);
-
-	return rc;
-}
-
-static int __devexit jbt_remove(struct spi_device *spi)
-{
-	struct jbt_info *jbt = dev_get_drvdata(&spi->dev);
-
-	/* We don't want to switch off the display in case the user
-	 * accidentially unloads the module (whose use count normally is 0) */
-	jbt6k74_enter_power_mode(jbt, JBT_POWER_MODE_NORMAL);
-
-	sysfs_remove_group(&spi->dev.kobj, &jbt_attr_group);
-	dev_set_drvdata(&spi->dev, NULL);
-
-	lcd_device_unregister(jbt->lcd_dev);
-
-	kfree(jbt);
-
-	return 0;
-}
-
-#ifdef CONFIG_PM
-static int jbt_suspend(struct spi_device *spi, pm_message_t state)
-{
-	struct jbt_info *jbt = dev_get_drvdata(&spi->dev);
-
-	jbt->suspend_mode = jbt->power_mode;
-
-	jbt6k74_enter_power_mode(jbt, JBT_POWER_MODE_DEEP_STANDBY);
-	jbt->suspended = 1;
-
-	dev_info(&spi->dev, "suspended\n");
-
-	return 0;
-}
-
-int jbt6k74_resume(struct spi_device *spi)
-{
-	struct jbt_info *jbt = dev_get_drvdata(&spi->dev);
-
-	jbt->suspended = 0;
-	jbt6k74_enter_power_mode(jbt, jbt->suspend_mode);
-
-	dev_info(&spi->dev, "resumed\n");
-
-	return 0;
-}
-EXPORT_SYMBOL_GPL(jbt6k74_resume);
-
-#else
-#define jbt_suspend	NULL
-#define jbt6k74_resume	NULL
-#endif
-
-static struct spi_driver jbt6k74_driver = {
-	.driver = {
-		.name	= "jbt6k74",
-		.owner	= THIS_MODULE,
-	},
-
-	.probe	 = jbt_probe,
-	.remove	 = __devexit_p(jbt_remove),
-	.suspend = jbt_suspend,
-	.resume	 = jbt6k74_resume,
-};
-
-static int __init jbt_init(void)
-{
-	return spi_register_driver(&jbt6k74_driver);
-}
-
-static void __exit jbt_exit(void)
-{
-	spi_unregister_driver(&jbt6k74_driver);
-}
-
-MODULE_DESCRIPTION("SPI driver for tpo JBT6K74-AS LCM control interface");
-MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
-MODULE_LICENSE("GPL");
-
-module_init(jbt_init);
-module_exit(jbt_exit);
diff --git a/target/linux/s3c24xx/files-2.6.30/include/linux/bq27000_battery.h b/target/linux/s3c24xx/files-2.6.30/include/linux/bq27000_battery.h
deleted file mode 100644
index a617466a5..000000000
--- a/target/linux/s3c24xx/files-2.6.30/include/linux/bq27000_battery.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef __BQ27000_BATTERY_H__
-#define __BQ27000_BATTERY_H__
-
-void bq27000_charging_state_change(struct platform_device *pdev);
-
-struct bq27000_platform_data {
-	const char 	*name;
-	int		rsense_mohms;
-	int (*hdq_read)(int);
-	int (*hdq_write)(int, u8);
-	int (*hdq_initialized)(void);
-	int (*get_charger_online_status)(void);
-	int (*get_charger_active_status)(void);
-};
-
-#endif
diff --git a/target/linux/s3c24xx/files-2.6.30/include/linux/gta02-vibrator.h b/target/linux/s3c24xx/files-2.6.30/include/linux/gta02-vibrator.h
deleted file mode 100644
index 9c24aac31..000000000
--- a/target/linux/s3c24xx/files-2.6.30/include/linux/gta02-vibrator.h
+++ /dev/null
@@ -1,5 +0,0 @@
-struct gta02_vib_platform_data {
-	int (* enable_fiq)(void);
-	void (*disable_fiq)(void);
-	void (*kick_fiq)(void);
-};
diff --git a/target/linux/s3c24xx/files-2.6.30/include/linux/gta02_hdq.h b/target/linux/s3c24xx/files-2.6.30/include/linux/gta02_hdq.h
deleted file mode 100644
index ae0c70e24..000000000
--- a/target/linux/s3c24xx/files-2.6.30/include/linux/gta02_hdq.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef __GTA02HDQ_H__
-#define __GTA02HDQ_H__
-
-/* platform data */
-
-struct gta02_hdq_platform_data {
-	/*
-	 * give an opportunity to use us as parent for
-	 * devices that depend on us
-	 */
-	void (*attach_child_devices)(struct device *parent_device);
-};
-
-int gta02hdq_read(int address);
-int gta02hdq_write(int address, u8 data);
-int gta02hdq_initialized(void);
-
-#endif
diff --git a/target/linux/s3c24xx/files-2.6.30/include/linux/hdq.h b/target/linux/s3c24xx/files-2.6.30/include/linux/hdq.h
deleted file mode 100644
index 377ab387e..000000000
--- a/target/linux/s3c24xx/files-2.6.30/include/linux/hdq.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef __LINUX_HDQ_H__
-#define __LINUX_HDQ_H__
-
-#include <linux/device.h>
-
-#define HDQ_SAMPLE_PERIOD_US	10
-
-/* platform data */
-
-struct hdq_platform_data {
-	/*
-	 * give an opportunity to use us as parent for
-	 * devices that depend on us
-	 */
-	void (*attach_child_devices)(struct device *parent_device);
-	
-	void (*gpio_dir_out)(void);
-	void (*gpio_dir_in)(void);
-	void (*gpio_set)(int);
-	int (*gpio_get)(void);
-
-	int (*enable_fiq)(void);
-	void (*disable_fiq)(void);
-	void (*kick_fiq)(void);
-
-};
-
-int hdq_read(int address);
-int hdq_write(int address, u8 data);
-int hdq_initialized(void);
-
-#endif
diff --git a/target/linux/s3c24xx/files-2.6.30/include/linux/jbt6k74.h b/target/linux/s3c24xx/files-2.6.30/include/linux/jbt6k74.h
deleted file mode 100644
index b0ae90546..000000000
--- a/target/linux/s3c24xx/files-2.6.30/include/linux/jbt6k74.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __JBT6K74_H__
-#define __JBT6K74_H__
-
-#include <linux/spi/spi.h>
-
-struct jbt6k74_platform_data {
-	void (*reset)(int devindex, int level);
-	void (*probe_completed)(struct device *dev);
-	void (*enable_pixel_clock)(struct device *dev, int enable);
-};
-
-#endif
diff --git a/target/linux/s3c24xx/files-2.6.30/include/linux/lis302dl.h b/target/linux/s3c24xx/files-2.6.30/include/linux/lis302dl.h
deleted file mode 100644
index 0c1fc3097..000000000
--- a/target/linux/s3c24xx/files-2.6.30/include/linux/lis302dl.h
+++ /dev/null
@@ -1,152 +0,0 @@
-#ifndef _LINUX_LIS302DL_H
-#define _LINUX_LIS302DL_H
-
-#include <linux/types.h>
-#include <linux/spi/spi.h>
-#include <linux/input.h>
-#include <linux/workqueue.h>
-
-struct lis302dl_info;
-
-struct lis302dl_platform_data {
-	char *name;
-	unsigned long pin_chip_select;
-	unsigned long pin_clk;
-	unsigned long pin_mosi;
-	unsigned long pin_miso;
-	int open_drain;
-	int interrupt;
-	void (*lis302dl_suspend_io)(struct lis302dl_info *, int resuming);
-};
-
-struct lis302dl_info {
-	struct lis302dl_platform_data *pdata;
-	struct device *dev;
-	struct input_dev *input_dev;
-	unsigned int flags;
-	unsigned int threshold;
-	unsigned int duration;
-	u32 overruns;
-	struct {
-		unsigned int threshold; /* mg */
-		unsigned int duration;  /* ms */
-	} wakeup;
-
-	struct spi_device *spi;
-	u_int8_t regs[0x40];
-};
-
-enum lis302dl_reg {
-	LIS302DL_REG_WHO_AM_I		= 0x0f,
-	LIS302DL_REG_CTRL1		= 0x20,
-	LIS302DL_REG_CTRL2		= 0x21,
-	LIS302DL_REG_CTRL3		= 0x22,
-	LIS302DL_REG_HP_FILTER_RESET	= 0x23,
-	LIS302DL_REG_STATUS		= 0x27,
-	LIS302DL_REG_OUT_X		= 0x29,
-	LIS302DL_REG_OUT_Y		= 0x2b,
-	LIS302DL_REG_OUT_Z		= 0x2d,
-	LIS302DL_REG_FF_WU_CFG_1	= 0x30,
-	LIS302DL_REG_FF_WU_SRC_1	= 0x31,
-	LIS302DL_REG_FF_WU_THS_1	= 0x32,
-	LIS302DL_REG_FF_WU_DURATION_1	= 0x33,
-	LIS302DL_REG_FF_WU_CFG_2	= 0x34,
-	LIS302DL_REG_FF_WU_SRC_2	= 0x35,
-	LIS302DL_REG_FF_WU_THS_2	= 0x36,
-	LIS302DL_REG_FF_WU_DURATION_2	= 0x37,
-	LIS302DL_REG_CLICK_CFG		= 0x38,
-	LIS302DL_REG_CLICK_SRC		= 0x39,
-	LIS302DL_REG_CLICK_THSY_X	= 0x3b,
-	LIS302DL_REG_CLICK_THSZ		= 0x3c,
-	LIS302DL_REG_CLICK_TIME_LIMIT	= 0x3d,
-	LIS302DL_REG_CLICK_LATENCY	= 0x3e,
-	LIS302DL_REG_CLICK_WINDOW	= 0x3f,
-};
-
-enum lis302dl_reg_ctrl1 {
-	LIS302DL_CTRL1_Xen		= 0x01,
-	LIS302DL_CTRL1_Yen		= 0x02,
-	LIS302DL_CTRL1_Zen		= 0x04,
-	LIS302DL_CTRL1_STM		= 0x08,
-	LIS302DL_CTRL1_STP		= 0x10,
-	LIS302DL_CTRL1_FS		= 0x20,
-	LIS302DL_CTRL1_PD		= 0x40,
-	LIS302DL_CTRL1_DR		= 0x80,
-};
-
-enum lis302dl_reg_ctrl2 {
-	LIS302DL_CTRL2_HPC1		= 0x01,
-	LIS302DL_CTRL2_HPC2		= 0x02,
-	LIS302DL_CTRL2_HPFF1		= 0x04,
-	LIS302DL_CTRL2_HPFF2		= 0x08,
-	LIS302DL_CTRL2_FDS		= 0x10,
-	LIS302DL_CTRL2_BOOT		= 0x40,
-	LIS302DL_CTRL2_SIM		= 0x80,
-};
-enum lis302dl_reg_ctrl3 {
-	LIS302DL_CTRL3_PP_OD		= 0x40,
-	LIS302DL_CTRL3_IHL		= 0x80,
-};
-
-enum lis302dl_reg_status {
-	LIS302DL_STATUS_XDA		= 0x01,
-	LIS302DL_STATUS_YDA		= 0x02,
-	LIS302DL_STATUS_ZDA		= 0x04,
-	LIS302DL_STATUS_XYZDA		= 0x08,
-	LIS302DL_STATUS_XOR		= 0x10,
-	LIS302DL_STATUS_YOR		= 0x20,
-	LIS302DL_STATUS_ZOR		= 0x40,
-	LIS302DL_STATUS_XYZOR		= 0x80,
-};
-
-/* Wakeup/freefall interrupt defs */
-enum lis302dl_reg_ffwucfg {
-	LIS302DL_FFWUCFG_XLIE		= 0x01,
-	LIS302DL_FFWUCFG_XHIE		= 0x02,
-	LIS302DL_FFWUCFG_YLIE		= 0x04,
-	LIS302DL_FFWUCFG_YHIE		= 0x08,
-	LIS302DL_FFWUCFG_ZLIE		= 0x10,
-	LIS302DL_FFWUCFG_ZHIE		= 0x20,
-	LIS302DL_FFWUCFG_LIR		= 0x40,
-	LIS302DL_FFWUCFG_AOI		= 0x80,
-};
-
-enum lis302dl_reg_ffwuths {
-	LIS302DL_FFWUTHS_DCRM		= 0x80,
-};
-
-enum lis302dl_reg_ffwusrc {
-	LIS302DL_FFWUSRC_XL		= 0x01,
-	LIS302DL_FFWUSRC_XH		= 0x02,
-	LIS302DL_FFWUSRC_YL		= 0x04,
-	LIS302DL_FFWUSRC_YH		= 0x08,
-	LIS302DL_FFWUSRC_ZL		= 0x10,
-	LIS302DL_FFWUSRC_ZH		= 0x20,
-	LIS302DL_FFWUSRC_IA		= 0x40,
-};
-
-enum lis302dl_reg_cloik_src {
-	LIS302DL_CLICKSRC_SINGLE_X	= 0x01,
-	LIS302DL_CLICKSRC_DOUBLE_X	= 0x02,
-	LIS302DL_CLICKSRC_SINGLE_Y	= 0x04,
-	LIS302DL_CLICKSRC_DOUBLE_Y	= 0x08,
-	LIS302DL_CLICKSRC_SINGLE_Z	= 0x10,
-	LIS302DL_CLICKSRC_DOUBLE_Z	= 0x20,
-	LIS302DL_CLICKSRC_IA		= 0x40,
-};
-
-#define LIS302DL_WHO_AM_I_MAGIC		0x3b
-
-#define LIS302DL_F_WUP_FF_1		0x0001	/* wake up from free fall */
-#define LIS302DL_F_WUP_FF_2		0x0002
-#define LIS302DL_F_WUP_FF		0x0003
-#define LIS302DL_F_WUP_CLICK	0x0004
-#define LIS302DL_F_POWER		0x0010
-#define LIS302DL_F_FS			0x0020 	/* ADC full scale */
-#define LIS302DL_F_INPUT_OPEN 	0x0040  /* Set if input device is opened */
-#define LIS302DL_F_IRQ_WAKE 	0x0080  /* IRQ is setup in wake mode */
-#define LIS302DL_F_DR			0x0100 	/* Data rate, 400Hz/100Hz */
-
-
-#endif /* _LINUX_LIS302DL_H */
-
diff --git a/target/linux/s3c24xx/files-2.6.30/include/linux/mfd/glamo.h b/target/linux/s3c24xx/files-2.6.30/include/linux/mfd/glamo.h
deleted file mode 100644
index af9688ba3..000000000
--- a/target/linux/s3c24xx/files-2.6.30/include/linux/mfd/glamo.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#ifndef __GLAMO_MFD_H
-#define __GLAMO_MFD_H
-
-struct glamo_core;
-struct glamo_spigpio_platform_data;
-struct glamo_fb_platform_data;
-
-struct glamo_mmc_platform_data {
-	int	(*glamo_mmc_use_slow)(void);
-
-    struct glamo_core *core;
-};
-
-struct glamo_platform_data {
-    struct glamo_fb_platform_data      *fb_data;
-    struct glamo_spigpio_platform_data *spigpio_data;
-    struct glamo_mmc_platform_data     *mmc_data;
-    int gpio_base;
-
-    unsigned int osci_clock_rate;
-
-    int (*glamo_irq_is_wired)(void);
-    void (*glamo_external_reset)(int);
-};
-
-enum glamo_engine {
-	GLAMO_ENGINE_CAPTURE = 0,
-	GLAMO_ENGINE_ISP = 1,
-	GLAMO_ENGINE_JPEG = 2,
-	GLAMO_ENGINE_MPEG_ENC = 3,
-	GLAMO_ENGINE_MPEG_DEC = 4,
-	GLAMO_ENGINE_LCD = 5,
-	GLAMO_ENGINE_CMDQ = 6,
-	GLAMO_ENGINE_2D = 7,
-	GLAMO_ENGINE_3D = 8,
-	GLAMO_ENGINE_MMC = 9,
-	GLAMO_ENGINE_MICROP0 = 10,
-	GLAMO_ENGINE_RISC = 11,
-	GLAMO_ENGINE_MICROP1_MPEG_ENC = 12,
-	GLAMO_ENGINE_MICROP1_MPEG_DEC = 13,
-#if 0
-	GLAMO_ENGINE_H264_DEC = 14,
-	GLAMO_ENGINE_RISC1 = 15,
-	GLAMO_ENGINE_SPI = 16,
-#endif
-	__NUM_GLAMO_ENGINES
-};
-
-
-#endif
diff --git a/target/linux/s3c24xx/files-2.6.30/include/linux/touchscreen/ts_filter.h b/target/linux/s3c24xx/files-2.6.30/include/linux/touchscreen/ts_filter.h
deleted file mode 100644
index aac1e028d..000000000
--- a/target/linux/s3c24xx/files-2.6.30/include/linux/touchscreen/ts_filter.h
+++ /dev/null
@@ -1,74 +0,0 @@
-#ifndef __TS_FILTER_H__
-#define __TS_FILTER_H__
-
-/*
- * Touchscreen filter.
- *
- * (c) 2008,2009 Andy Green <andy@openmoko.com>
- */
-
-#include <linux/platform_device.h>
-
-#define MAX_TS_FILTER_COORDS		3  /* X, Y and Z (pressure). */
-
-struct ts_filter;
-struct ts_filter_configuration;
-
-/* Operations that a filter can perform. */
-
-struct ts_filter_api {
-	/* Create the filter - mandatory. */
-	struct ts_filter * (*create)(
-		struct platform_device *pdev,
-		const struct ts_filter_configuration *config,
-		int count_coords);
-	/* Destroy the filter - mandatory. */
-	void (*destroy)(struct ts_filter *filter);
-	/* Clear the filter - optional. */
-	void (*clear)(struct ts_filter *filter);
-
-
-	/*
-	 * The next three API functions only make sense if all of them are
-	 * set for a filter. If a filter has the next three methods then
-	 * it can propagate coordinates in the chain.
-	 */
-
-	/*
-	 * Process the filter.
-	 * It returns non-zero if the filter reaches an error.
-	 */
-	int (*process)(struct ts_filter *filter, int *coords);
-	/*
-	 * Is the filter ready to return a point?
-	 * Please do not code side effects in this function.
-	 */
-	int (*haspoint)(struct ts_filter *filter);
-	/*
-	 * Get a point.
-	 * Do not call unless the filter actually has a point to deliver.
-	 */
-	void (*getpoint)(struct ts_filter *filter, int *coords);
-
-	/*
-	 * Scale the points - optional.
-	 * A filter could only scale coordinates.
-	 */
-	void (*scale)(struct ts_filter *filter, int *coords);
-};
-
-/*
- * Generic filter configuration. Actual configurations have this structure
- * as a member.
- */
-struct ts_filter_configuration {
-};
-
-struct ts_filter {
-	/* Operations for this filter. */
-	const struct ts_filter_api *api;
-	/* Number of coordinates to process. */
-	int count_coords;
-};
-
-#endif
diff --git a/target/linux/s3c24xx/files-2.6.30/include/linux/touchscreen/ts_filter_chain.h b/target/linux/s3c24xx/files-2.6.30/include/linux/touchscreen/ts_filter_chain.h
deleted file mode 100644
index 806bffe6c..000000000
--- a/target/linux/s3c24xx/files-2.6.30/include/linux/touchscreen/ts_filter_chain.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#ifndef __TS_FILTER_CHAIN_H__
-#define __TS_FILTER_CHAIN_H__
-
-/*
- * Touchscreen filter chains.
- *
- * (c) 2008,2009 Andy Green <andy@openmoko.com>
- */
-
-#include "ts_filter.h"
-
-#include <linux/err.h>
-
-struct ts_filter_chain_configuration {
-	/* API to use. */
-	const struct ts_filter_api *api;
-	/* Generic filter configuration. Different for each filter. */
-	const struct ts_filter_configuration *config;
-};
-
-struct ts_filter_chain;
-
-#ifdef CONFIG_TOUCHSCREEN_FILTER
-
-/*
- * Create a filter chain. It will allocate an array of
- * null-terminated pointers to filters. On error it will return
- * an error you can check with IS_ERR.
- */
-extern struct ts_filter_chain *ts_filter_chain_create(
-	struct platform_device *pdev,
-	const struct ts_filter_chain_configuration conf[],
-	int count_coords);
-
-/* Destroy the chain. */
-extern void ts_filter_chain_destroy(struct ts_filter_chain *c);
-
-/* Clear the filter chain. */
-extern void ts_filter_chain_clear(struct ts_filter_chain *c);
-
-/*
- * Try to get one point. Returns 0 if no points are available.
- * coords will be used as temporal space, thus you supply a point
- * using coords but you shouldn't rely on its value on return unless
- * it returns a nonzero value that is not -1.
- * If one of the filters find an error then this function will
- * return -1.
- */
-int ts_filter_chain_feed(struct ts_filter_chain *c, int *coords);
-
-#else /* !CONFIG_TOUCHSCREEN_FILTER */
-#define ts_filter_chain_create(pdev, config, count_coords) (NULL)
-#define ts_filter_chain_destroy(c) do { } while (0)
-#define ts_filter_chain_clear(c) do { } while (0)
-#define ts_filter_chain_feed(c, coords) (1)
-#endif
-
-#endif
diff --git a/target/linux/s3c24xx/files-2.6.30/include/linux/touchscreen/ts_filter_group.h b/target/linux/s3c24xx/files-2.6.30/include/linux/touchscreen/ts_filter_group.h
deleted file mode 100644
index d1e3590e9..000000000
--- a/target/linux/s3c24xx/files-2.6.30/include/linux/touchscreen/ts_filter_group.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef __TS_FILTER_GROUP_H__
-#define __TS_FILTER_GROUP_H__
-
-#include "ts_filter.h"
-
-/*
- * Touchscreen group filter.
- *
- * Copyright (C) 2008,2009 by Openmoko, Inc.
- * Author: Nelson Castillo <arhuaco@freaks-unidos.net>
- *
- */
-
-struct ts_filter_group_configuration {
-	/* Size of the filter. */
-	int length;
-	/*
-	 * If two points are separated by this distance or less they
-	 * are considered to be members of the same group.
-	 */
-	int close_enough;
-	/* Minimum allowed size for the biggest group in the sample set. */
-	int threshold;
-	/*
-	 * Number of times we try to get a group of points with at least
-	 * threshold points.
-	 */
-	int attempts;
-
-	/* Generic filter configuration. */
-	struct ts_filter_configuration config;
-};
-
-extern const struct ts_filter_api ts_filter_group_api;
-
-#endif
diff --git a/target/linux/s3c24xx/files-2.6.30/include/linux/touchscreen/ts_filter_linear.h b/target/linux/s3c24xx/files-2.6.30/include/linux/touchscreen/ts_filter_linear.h
deleted file mode 100644
index 82df3d25b..000000000
--- a/target/linux/s3c24xx/files-2.6.30/include/linux/touchscreen/ts_filter_linear.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef __TS_FILTER_LINEAR_H__
-#define __TS_FILTER_LINEAR_H__
-
-#include "ts_filter.h"
-#include <linux/kobject.h>
-
-/*
- * Touchscreen linear filter.
- *
- * Copyright (C) 2008,2009 by Openmoko, Inc.
- * Author: Nelson Castillo <arhuaco@freaks-unidos.net>
- *
- */
-
-#define TS_FILTER_LINEAR_NCONSTANTS 7
-
-struct ts_filter_linear_configuration {
-	/* Calibration constants. */
-	int constants[TS_FILTER_LINEAR_NCONSTANTS];
-	/* First coordinate. */
-	int coord0;
-	/* Second coordinate. */
-	int coord1;
-
-	/* Generic filter configuration. */
-	struct ts_filter_configuration config;
-};
-
-extern const struct ts_filter_api ts_filter_linear_api;
-
-#endif
diff --git a/target/linux/s3c24xx/files-2.6.30/include/linux/touchscreen/ts_filter_mean.h b/target/linux/s3c24xx/files-2.6.30/include/linux/touchscreen/ts_filter_mean.h
deleted file mode 100644
index f5b5e4bbe..000000000
--- a/target/linux/s3c24xx/files-2.6.30/include/linux/touchscreen/ts_filter_mean.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef __TS_FILTER_MEAN_H__
-#define __TS_FILTER_MEAN_H__
-
-#include "ts_filter.h"
-
-/*
- * Touchscreen filter.
- *
- * mean
- *
- * (c) 2008,2009
- *     Andy Green <andy@openmoko.com>
- *     Nelson Castillo <arhuaco@freaks-unidos.net>
- */
-
-/* Configuration for this filter. */
-struct ts_filter_mean_configuration {
-	/* Number of points for the mean. */
-	int length;
-
-	/* Generic filter configuration. */
-	struct ts_filter_configuration config;
-};
-
-/* API functions for the mean filter */
-extern const struct ts_filter_api ts_filter_mean_api;
-
-#endif /* __TS_FILTER_MEAN_H__ */
diff --git a/target/linux/s3c24xx/files-2.6.30/include/linux/touchscreen/ts_filter_median.h b/target/linux/s3c24xx/files-2.6.30/include/linux/touchscreen/ts_filter_median.h
deleted file mode 100644
index 1c19472e3..000000000
--- a/target/linux/s3c24xx/files-2.6.30/include/linux/touchscreen/ts_filter_median.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef __TS_FILTER_MEDIAN_H__
-#define __TS_FILTER_MEDIAN_H__
-
-#include "ts_filter.h"
-
-/*
- * Touchscreen filter.
- *
- * median
- *
- * (c) 2008 Andy Green <andy@openmoko.com>
- */
-
-struct ts_filter_median_configuration {
-	/* Size of the filter. */
-	int extent;
-	/* Precomputed midpoint. */
-	int midpoint;
-	/* A reference value for us to check if we are going fast or slow. */
-	int decimation_threshold;
-	/* How many points to replace if we're going fast. */
-	int decimation_above;
-	/* How many points to replace if we're going slow. */
-	int decimation_below;
-
-	/* Generic configuration. */
-	struct ts_filter_configuration config;
-};
-
-extern const struct ts_filter_api ts_filter_median_api;
-
-#endif
diff --git a/target/linux/s3c24xx/files-2.6.30/sound/soc/s3c24xx/gta02_wm8753.c b/target/linux/s3c24xx/files-2.6.30/sound/soc/s3c24xx/gta02_wm8753.c
deleted file mode 100644
index e82c60a3e..000000000
--- a/target/linux/s3c24xx/files-2.6.30/sound/soc/s3c24xx/gta02_wm8753.c
+++ /dev/null
@@ -1,535 +0,0 @@
-/*
- * neo1973_gta02_wm8753.c  --  SoC audio for Openmoko freerunner
- *
- * Copyright 2007 Openmoko Inc
- * Author: Graeme Gregory <graeme@openmoko.org>
- * Copyright 2007 Wolfson Microelectronics PLC.
- * Author: Graeme Gregory <linux@wolfsonmicro.com>
- * Copyright 2009 Wolfson Microelectronics
- *
- *  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/moduleparam.h>
-#include <linux/timer.h>
-#include <linux/interrupt.h>
-#include <linux/platform_device.h>
-#include <sound/core.h>
-#include <sound/pcm.h>
-#include <sound/soc.h>
-#include <sound/soc-dapm.h>
-#include <sound/jack.h>
-
-#include <asm/mach-types.h>
-
-#include <plat/regs-iis.h>
-
-#include <mach/regs-clock.h>
-#include <mach/regs-gpio.h>
-#include <mach/hardware.h>
-#include <asm/io.h>
-#include <mach/regs-gpioj.h>
-#include <mach/gta02.h>
-#include "../codecs/wm8753.h"
-#include "s3c24xx-pcm.h"
-#include "s3c24xx-i2s.h"
-
-static struct snd_soc_card neo1973_gta02;
-static struct snd_soc_jack gta02_hs_jack;
-
-static int neo1973_gta02_hifi_hw_params(struct snd_pcm_substream *substream,
-	struct snd_pcm_hw_params *params)
-{
-	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-	struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;
-	struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
-	unsigned int pll_out = 0, bclk = 0;
-	int ret = 0;
-	unsigned long iis_clkrate;
-
-	iis_clkrate = s3c24xx_i2s_get_clockrate();
-
-	switch (params_rate(params)) {
-	case 8000:
-	case 16000:
-		pll_out = 12288000;
-		break;
-	case 48000:
-		bclk = WM8753_BCLK_DIV_4;
-		pll_out = 12288000;
-		break;
-	case 96000:
-		bclk = WM8753_BCLK_DIV_2;
-		pll_out = 12288000;
-		break;
-	case 11025:
-		bclk = WM8753_BCLK_DIV_16;
-		pll_out = 11289600;
-		break;
-	case 22050:
-		bclk = WM8753_BCLK_DIV_8;
-		pll_out = 11289600;
-		break;
-	case 44100:
-		bclk = WM8753_BCLK_DIV_4;
-		pll_out = 11289600;
-		break;
-	case 88200:
-		bclk = WM8753_BCLK_DIV_2;
-		pll_out = 11289600;
-		break;
-	}
-
-	/* set codec DAI configuration */
-	ret = snd_soc_dai_set_fmt(codec_dai,
-		SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-		SND_SOC_DAIFMT_CBM_CFM);
-	if (ret < 0)
-		return ret;
-
-	/* set cpu DAI configuration */
-	ret = snd_soc_dai_set_fmt(cpu_dai,
-		SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-		SND_SOC_DAIFMT_CBM_CFM);
-	if (ret < 0)
-		return ret;
-
-	/* set the codec system clock for DAC and ADC */
-	ret = snd_soc_dai_set_sysclk(codec_dai, WM8753_MCLK, pll_out,
-		SND_SOC_CLOCK_IN);
-	if (ret < 0)
-		return ret;
-
-	/* set MCLK division for sample rate */
-	ret = snd_soc_dai_set_clkdiv(cpu_dai, S3C24XX_DIV_MCLK,
-		S3C2410_IISMOD_32FS);
-	if (ret < 0)
-		return ret;
-
-	/* set codec BCLK division for sample rate */
-	ret = snd_soc_dai_set_clkdiv(codec_dai,
-					WM8753_BCLKDIV, bclk);
-	if (ret < 0)
-		return ret;
-
-	/* set prescaler division for sample rate */
-	ret = snd_soc_dai_set_clkdiv(cpu_dai, S3C24XX_DIV_PRESCALER,
-		S3C24XX_PRESCALE(4, 4));
-	if (ret < 0)
-		return ret;
-
-	/* codec PLL input is PCLK/4 */
-	ret = snd_soc_dai_set_pll(codec_dai, WM8753_PLL1,
-		iis_clkrate / 4, pll_out);
-	if (ret < 0)
-		return ret;
-
-	return 0;
-}
-
-static int neo1973_gta02_hifi_hw_free(struct snd_pcm_substream *substream)
-{
-	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-	struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;
-
-	/* disable the PLL */
-	return snd_soc_dai_set_pll(codec_dai, WM8753_PLL1, 0, 0);
-}
-
-/*
- * Neo1973 WM8753 HiFi DAI opserations.
- */
-static struct snd_soc_ops neo1973_gta02_hifi_ops = {
-	.hw_params = neo1973_gta02_hifi_hw_params,
-	.hw_free = neo1973_gta02_hifi_hw_free,
-};
-
-static int neo1973_gta02_voice_hw_params(
-	struct snd_pcm_substream *substream,
-	struct snd_pcm_hw_params *params)
-{
-	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-	struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;
-	unsigned int pcmdiv = 0;
-	int ret = 0;
-	unsigned long iis_clkrate;
-
-	iis_clkrate = s3c24xx_i2s_get_clockrate();
-
-	if (params_rate(params) != 8000)
-		return -EINVAL;
-	if (params_channels(params) != 1)
-		return -EINVAL;
-
-	pcmdiv = WM8753_PCM_DIV_6; /* 2.048 MHz */
-
-	/* todo: gg check mode (DSP_B) against CSR datasheet */
-	/* set codec DAI configuration */
-	ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_DSP_B |
-		SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS);
-	if (ret < 0)
-		return ret;
-
-	/* set the codec system clock for DAC and ADC */
-	ret = snd_soc_dai_set_sysclk(codec_dai, WM8753_PCMCLK,
-		12288000, SND_SOC_CLOCK_IN);
-	if (ret < 0)
-		return ret;
-
-	/* set codec PCM division for sample rate */
-	ret = snd_soc_dai_set_clkdiv(codec_dai, WM8753_PCMDIV,
-					pcmdiv);
-	if (ret < 0)
-		return ret;
-
-	/* configue and enable PLL for 12.288MHz output */
-	ret = snd_soc_dai_set_pll(codec_dai, WM8753_PLL2,
-		iis_clkrate / 4, 12288000);
-	if (ret < 0)
-		return ret;
-
-	return 0;
-}
-
-static int neo1973_gta02_voice_hw_free(struct snd_pcm_substream *substream)
-{
-	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-	struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;
-
-	/* disable the PLL */
-	return snd_soc_dai_set_pll(codec_dai, WM8753_PLL2, 0, 0);
-}
-
-static struct snd_soc_ops neo1973_gta02_voice_ops = {
-	.hw_params = neo1973_gta02_voice_hw_params,
-	.hw_free = neo1973_gta02_voice_hw_free,
-};
-
-#define LM4853_AMP 1
-#define LM4853_SPK 2
-
-static u8 lm4853_state;
-
-/* This has no effect, it exists only to maintain compatibility with
- * existing ALSA state files.
- */
-static int lm4853_set_state(struct snd_kcontrol *kcontrol,
-	struct snd_ctl_elem_value *ucontrol)
-{
-	int val = ucontrol->value.integer.value[0];
-
-	if (val)
-		lm4853_state |= LM4853_AMP;
-	else
-		lm4853_state &= ~LM4853_AMP;
-
-	return 0;
-}
-
-static int lm4853_get_state(struct snd_kcontrol *kcontrol,
-	struct snd_ctl_elem_value *ucontrol)
-{
-	ucontrol->value.integer.value[0] = lm4853_state & LM4853_AMP;
-
-	return 0;
-}
-
-static int lm4853_set_spk(struct snd_kcontrol *kcontrol,
-	struct snd_ctl_elem_value *ucontrol)
-{
-	int val = ucontrol->value.integer.value[0];
-
-	if (val) {
-		lm4853_state |= LM4853_SPK;
-		s3c2410_gpio_setpin(GTA02_GPIO_HP_IN, 0);
-	} else {
-		lm4853_state &= ~LM4853_SPK;
-		s3c2410_gpio_setpin(GTA02_GPIO_HP_IN, 1);
-	}
-
-	return 0;
-}
-
-static int lm4853_get_spk(struct snd_kcontrol *kcontrol,
-	struct snd_ctl_elem_value *ucontrol)
-{
-	ucontrol->value.integer.value[0] = (lm4853_state & LM4853_SPK) >> 1;
-
-	return 0;
-}
-
-static int lm4853_event(struct snd_soc_dapm_widget *w,
-			struct snd_kcontrol *k,
-			int event)
-{
-	if (SND_SOC_DAPM_EVENT_ON(event))
-		s3c2410_gpio_setpin(GTA02_GPIO_AMP_SHUT, 0);
-
-	if (SND_SOC_DAPM_EVENT_OFF(event))
-		s3c2410_gpio_setpin(GTA02_GPIO_AMP_SHUT, 1);
-
-	return 0;
-}
-
-static const struct snd_soc_dapm_widget wm8753_dapm_widgets[] = {
-	SND_SOC_DAPM_SPK("Stereo Out", lm4853_event),
-	SND_SOC_DAPM_LINE("GSM Line Out", NULL),
-	SND_SOC_DAPM_LINE("GSM Line In", NULL),
-	SND_SOC_DAPM_MIC("Headset Mic", NULL),
-	SND_SOC_DAPM_MIC("Handset Mic", NULL),
-	SND_SOC_DAPM_SPK("Handset Spk", NULL),
-};
-
-
-/* example machine audio_mapnections */
-static const struct snd_soc_dapm_route audio_map[] = {
-
-	/* Connections to the lm4853 amp */
-	{"Stereo Out", NULL, "LOUT1"},
-	{"Stereo Out", NULL, "ROUT1"},
-
-	/* Connections to the GSM Module */
-	{"GSM Line Out", NULL, "MONO1"},
-	{"GSM Line Out", NULL, "MONO2"},
-	{"RXP", NULL, "GSM Line In"},
-	{"RXN", NULL, "GSM Line In"},
-
-	/* Connections to Headset */
-	{"MIC1", NULL, "Mic Bias"},
-	{"Mic Bias", NULL, "Headset Mic"},
-
-	/* Call Mic */
-	{"MIC2", NULL, "Mic Bias"},
-	{"MIC2N", NULL, "Mic Bias"},
-	{"Mic Bias", NULL, "Handset Mic"},
-
-	/* Call Speaker */
-	{"Handset Spk", NULL, "LOUT2"},
-	{"Handset Spk", NULL, "ROUT2"},
-
-	/* Connect the ALC pins */
-	{"ACIN", NULL, "ACOP"},
-};
-
-static const struct snd_kcontrol_new wm8753_neo1973_gta02_controls[] = {
-	SOC_DAPM_PIN_SWITCH("Stereo Out"),
-	SOC_DAPM_PIN_SWITCH("GSM Line Out"),
-	SOC_DAPM_PIN_SWITCH("GSM Line In"),
-	SOC_DAPM_PIN_SWITCH("Headset Mic"),
-	SOC_DAPM_PIN_SWITCH("Handset Mic"),
-	SOC_DAPM_PIN_SWITCH("Handset Spk"),
-
-	/* This has no effect, it exists only to maintain compatibility with
-	 * existing ALSA state files.
-	 */
-	SOC_SINGLE_EXT("Amp State Switch", 6, 0, 1, 0,
-		lm4853_get_state,
-		lm4853_set_state),
-	SOC_SINGLE_EXT("Amp Spk Switch", 7, 0, 1, 0,
-		lm4853_get_spk,
-		lm4853_set_spk),
-};
-
-static struct snd_soc_jack_pin gta02_hs_jack_pins[] = {
-	{
-		.pin = "Headset Mic",
-		.mask = SND_JACK_MICROPHONE
-	},
-	{
-		.pin = "Stereo Out",
-		.mask = SND_JACK_HEADPHONE,
-        .invert = 1,
-	},
-};
-
-static struct snd_soc_jack_gpio gta02_hs_jack_gpios[] = {
-	{
-		.gpio = GTA02_GPIO_JACK_INSERT,
-		.name = "headset-gpio",
-		.report = SND_JACK_HEADSET,
-		.debounce_time = 100,
-	},
-};
-
-/*
- * This is an example machine initialisation for a wm8753 connected to a
- * neo1973 GTA02.
- */
-static int neo1973_gta02_wm8753_init(struct snd_soc_codec *codec)
-{
-	int err;
-
-	/* set up NC codec pins */
-	snd_soc_dapm_nc_pin(codec, "OUT3");
-	snd_soc_dapm_nc_pin(codec, "OUT4");
-	snd_soc_dapm_nc_pin(codec, "LINE1");
-	snd_soc_dapm_nc_pin(codec, "LINE2");
-
-	/* Add neo1973 gta02 specific widgets */
-	snd_soc_dapm_new_controls(codec, wm8753_dapm_widgets,
-				  ARRAY_SIZE(wm8753_dapm_widgets));
-
-	/* add neo1973 gta02 specific controls */
-	err = snd_soc_add_controls(codec, wm8753_neo1973_gta02_controls,
-		ARRAY_SIZE(wm8753_neo1973_gta02_controls));
-
-	if (err < 0)
-		return err;
-
-	/* set up neo1973 gta02 specific audio path audio_map */
-	snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
-
-	/* set endpoints to default off mode */
-	snd_soc_dapm_disable_pin(codec, "Stereo Out");
-	snd_soc_dapm_disable_pin(codec, "GSM Line Out");
-	snd_soc_dapm_disable_pin(codec, "GSM Line In");
-	snd_soc_dapm_disable_pin(codec, "Headset Mic");
-	snd_soc_dapm_disable_pin(codec, "Handset Mic");
-	snd_soc_dapm_disable_pin(codec, "Handset Spk");
-
-	snd_soc_dapm_sync(codec);
-
-    err = snd_soc_jack_new(&neo1973_gta02, "Headset Jack",
-					SND_JACK_HEADSET, &gta02_hs_jack);
-	if (err) {
-		dev_err(codec->card->dev, "failed to alloc headset jack\n");
-        return err;
-	}
-
-	err = snd_soc_jack_add_pins(&gta02_hs_jack, ARRAY_SIZE(gta02_hs_jack_pins),
-					gta02_hs_jack_pins);
-	if (err) {
-		dev_err(codec->card->dev, "failed to add headset jack pins\n");
-        return err;
-	}
-
-	err = snd_soc_jack_add_gpios(&gta02_hs_jack, ARRAY_SIZE(gta02_hs_jack_gpios),
-					gta02_hs_jack_gpios);
-	if (err) {
-		dev_err(codec->card->dev, "failed to add headset jack gpios\n");
-        return err;
-	}
-
-
-	return 0;
-}
-
-/*
- * BT Codec DAI
- */
-static struct snd_soc_dai bt_dai = {
-	.name = "Bluetooth",
-	.id = 0,
-	.playback = {
-		.channels_min = 1,
-		.channels_max = 1,
-		.rates = SNDRV_PCM_RATE_8000,
-		.formats = SNDRV_PCM_FMTBIT_S16_LE,},
-	.capture = {
-		.channels_min = 1,
-		.channels_max = 1,
-		.rates = SNDRV_PCM_RATE_8000,
-		.formats = SNDRV_PCM_FMTBIT_S16_LE,},
-};
-
-static struct snd_soc_dai_link neo1973_gta02_dai[] = {
-{ /* Hifi Playback - for similatious use with voice below */
-	.name = "WM8753",
-	.stream_name = "WM8753 HiFi",
-	.cpu_dai = &s3c24xx_i2s_dai,
-	.codec_dai = &wm8753_dai[WM8753_DAI_HIFI],
-	.init = neo1973_gta02_wm8753_init,
-	.ops = &neo1973_gta02_hifi_ops,
-},
-{ /* Voice via BT */
-	.name = "Bluetooth",
-	.stream_name = "Voice",
-	.cpu_dai = &bt_dai,
-	.codec_dai = &wm8753_dai[WM8753_DAI_VOICE],
-	.ops = &neo1973_gta02_voice_ops,
-},
-};
-
-static struct snd_soc_card neo1973_gta02 = {
-	.name = "neo1973-gta02",
-	.platform = &s3c24xx_soc_platform,
-	.dai_link = neo1973_gta02_dai,
-	.num_links = ARRAY_SIZE(neo1973_gta02_dai),
-};
-
-static struct snd_soc_device neo1973_gta02_snd_devdata = {
-	.card = &neo1973_gta02,
-	.codec_dev = &soc_codec_dev_wm8753,
-};
-
-static struct platform_device *neo1973_gta02_snd_device;
-
-
-static int __init neo1973_gta02_init(void)
-{
-	int ret;
-
-	if (!machine_is_neo1973_gta02()) {
-		printk(KERN_INFO
-		       "Only GTA02 is supported by this ASoC driver\n");
-		return -ENODEV;
-	}
-
-	/* register bluetooth DAI here */
-	ret = snd_soc_register_dai(&bt_dai);
-	if (ret)
-		return ret;
-
-	neo1973_gta02_snd_device = platform_device_alloc("soc-audio", -1);
-	if (!neo1973_gta02_snd_device) {
-		ret = -ENOMEM;
-        goto err_unregister_dai;
-    }
-
-	platform_set_drvdata(neo1973_gta02_snd_device,
-			&neo1973_gta02_snd_devdata);
-	neo1973_gta02_snd_devdata.dev = &neo1973_gta02_snd_device->dev;
-	ret = platform_device_add(neo1973_gta02_snd_device);
-
-	if (ret) {
-		platform_device_put(neo1973_gta02_snd_device);
-        goto err_unregister_dai;
-	}
-
-	/* Initialise GPIOs used by amp */
-	s3c2410_gpio_cfgpin(GTA02_GPIO_HP_IN, S3C2410_GPIO_OUTPUT);
-	s3c2410_gpio_cfgpin(GTA02_GPIO_AMP_SHUT, S3C2410_GPIO_OUTPUT);
-
-	/* Amp off by default */
-	s3c2410_gpio_setpin(GTA02_GPIO_AMP_SHUT, 1);
-
-	/* Speaker off by default */
-	s3c2410_gpio_setpin(GTA02_GPIO_HP_IN, 1);
-
-
-	return 0;
-
-err_unregister_dai:
-	snd_soc_unregister_dai(&bt_dai);
-    return ret;
-}
-module_init(neo1973_gta02_init);
-
-static void __exit neo1973_gta02_exit(void)
-{
-	snd_soc_unregister_dai(&bt_dai);
-    snd_soc_jack_free_gpios(&gta02_hs_jack, ARRAY_SIZE(gta02_hs_jack_gpios),
-            gta02_hs_jack_gpios);
-
-	platform_device_unregister(neo1973_gta02_snd_device);
-}
-module_exit(neo1973_gta02_exit);
-
-/* Module information */
-MODULE_AUTHOR("Graeme Gregory, graeme@openmoko.org");
-MODULE_DESCRIPTION("ALSA SoC WM8753 Neo1973 GTA02");
-MODULE_LICENSE("GPL");
diff --git a/target/linux/s3c24xx/image/Makefile b/target/linux/s3c24xx/image/Makefile
deleted file mode 100644
index e71a348f6..000000000
--- a/target/linux/s3c24xx/image/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# 
-# Copyright (C) 2006-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/image.mk
-
-JFFS2_BLOCKSIZE=128k
-JFFS2OPTS += --little-endian --pagesize=0x800 --no-cleanmarkers --pad
-
-#:mkfs.jffs2 -x lzo --root=/data/moko/build/tmp/rootfs --faketime --output=/data/moko/build/tmp/deploy/glibc/images/fic-gta01/OpenMoko-openmoko-devel-image-glibc-P1-August-Snapshot-20070829-fic-gta01.rootfs.jffs2 --little-endian --eraseblock=0x4000 --pad -n
-
-
-define Image/BuildKernel
-	$(TARGET_CROSS)objcopy -O binary -R .note -R .comment -S $(LINUX_DIR)/arch/arm/boot/compressed/vmlinux linux.bin
-	mkimage -A arm -O linux -T kernel -C none -a 30008000 -e 30008000 -n "Openmoko Kernel Image Freerunner (Neo1973(GTA02))" -d linux.bin uImage
-
-	cp uImage $(BIN_DIR)/$(IMG_PREFIX)-$(KERNEL)-uImage
-endef
-
-define Image/Build/squashfs
-    $(call prepare_generic_squashfs,$(BIN_DIR)/$(IMG_PREFIX)-root.$(1))
-endef
-
-define Image/Build
-	$(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-root.$(1)
-	$(call Image/Build/$(1),$(1))
-endef
-
-
-$(eval $(call BuildImage))
diff --git a/target/linux/s3c24xx/modules.mk b/target/linux/s3c24xx/modules.mk
deleted file mode 100644
index 320437e8d..000000000
--- a/target/linux/s3c24xx/modules.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-ifeq ($(CONFIG_TARGET_s3c24xx),y)
-	SOUNDCORE_FILES = \
-		$(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX) \
-		$(LINUX_DIR)/sound/core/snd.$(LINUX_KMOD_SUFFIX) \
-		$(LINUX_DIR)/sound/core/snd-page-alloc.$(LINUX_KMOD_SUFFIX) \
-		$(LINUX_DIR)/sound/core/snd-hwdep.$(LINUX_KMOD_SUFFIX) \
-		$(LINUX_DIR)/sound/core/seq/snd-seq-device.$(LINUX_KMOD_SUFFIX) \
-		$(LINUX_DIR)/sound/core/snd-timer.$(LINUX_KMOD_SUFFIX) \
-		$(LINUX_DIR)/sound/core/snd-pcm.$(LINUX_KMOD_SUFFIX) \
-		$(LINUX_DIR)/sound/soc/snd-soc-core.$(LINUX_KMOD_SUFFIX) \
-		$(LINUX_DIR)/sound/soc/s3c24xx/snd-soc-s3c24xx-i2s.$(LINUX_KMOD_SUFFIX) \
-		$(LINUX_DIR)/sound/soc/s3c24xx/snd-soc-s3c24xx.$(LINUX_KMOD_SUFFIX) \
-		$(LINUX_DIR)/sound/soc/s3c24xx/snd-soc-neo1973-gta02-wm8753.$(LINUX_KMOD_SUFFIX) \
-		$(LINUX_DIR)/sound/soc/codecs/snd-soc-wm8753.$(LINUX_KMOD_SUFFIX)
-	SOUNDCORE_LOAD = \
-		soundcore \
-		snd \
-		snd-page-alloc \
-		snd-hwdep \
-		snd-seq-device \
-		snd-timer \
-		snd-pcm \
-		snd-soc-core \
-		snd-soc-wm8753 \
-		snd-soc-s3c24xx-i2s \
-		snd-soc-s3c24xx \
-		snd-soc-neo1973-gta02-wm8753
-endif
diff --git a/target/linux/s3c24xx/patches-2.6.30/001-merge-openmoko.patch b/target/linux/s3c24xx/patches-2.6.30/001-merge-openmoko.patch
deleted file mode 100644
index 1a515a489..000000000
--- a/target/linux/s3c24xx/patches-2.6.30/001-merge-openmoko.patch
+++ /dev/null
@@ -1,2207 +0,0 @@
-Merge OpenMoko kernel patches
-git://git.openmoko.org/git/kernel.git#(no
-
-lars@lars-laptop   Thu May 14 18:33:23 UTC 2009
-
----
-
---- /dev/null
-+++ b/arch/arm/mach-s3c2410/include/mach/mci.h
-@@ -0,0 +1,13 @@
-+#ifndef _ARCH_MCI_H
-+#define _ARCH_MCI_H
-+
-+struct s3c24xx_mci_pdata {
-+	unsigned int	gpio_detect;
-+	unsigned int	gpio_wprotect;
-+	unsigned long	ocr_avail;
-+	unsigned int	do_dma;
-+	void		(*set_power)(unsigned char power_mode,
-+				     unsigned short vdd);
-+};
-+
-+#endif /* _ARCH_NCI_H */
---- a/arch/arm/mach-s3c2410/include/mach/regs-sdi.h
-+++ b/arch/arm/mach-s3c2410/include/mach/regs-sdi.h
-@@ -30,6 +30,7 @@
- #define S3C2410_SDIFSTA               (0x38)
- 
- #define S3C2410_SDIDATA               (0x3C)
-+#define S3C2410_SDIDATA_BYTE          (0x3C)
- #define S3C2410_SDIIMSK               (0x40)
- 
- #define S3C2440_SDIDATA               (0x40)
-@@ -37,6 +38,8 @@
- 
- #define S3C2440_SDICON_SDRESET        (1<<8)
- #define S3C2440_SDICON_MMCCLOCK       (1<<5)
-+#define S3C2440_SDIDATA_BYTE          (0x48)
-+
- #define S3C2410_SDICON_BYTEORDER      (1<<4)
- #define S3C2410_SDICON_SDIOIRQ        (1<<3)
- #define S3C2410_SDICON_RWAITEN        (1<<2)
---- a/arch/arm/mach-s3c2440/s3c2440.c
-+++ b/arch/arm/mach-s3c2440/s3c2440.c
-@@ -46,6 +46,9 @@ int __init s3c2440_init(void)
- 	s3c_device_wdt.resource[1].start = IRQ_S3C2440_WDT;
- 	s3c_device_wdt.resource[1].end   = IRQ_S3C2440_WDT;
- 
-+	/* make sure SD/MMC driver can distinguish 2440 from 2410 */
-+	s3c_device_sdi.name = "s3c2440-sdi";
-+
- 	/* register our system device for everything else */
- 
- 	return sysdev_register(&s3c2440_sysdev);
---- a/arch/arm/mach-s3c2442/s3c2442.c
-+++ b/arch/arm/mach-s3c2442/s3c2442.c
-@@ -21,6 +21,7 @@
- 
- #include <plat/s3c2442.h>
- #include <plat/cpu.h>
-+#include <plat/devs.h>
- 
- static struct sys_device s3c2442_sysdev = {
- 	.cls		= &s3c2442_sysclass,
-@@ -30,5 +31,8 @@ int __init s3c2442_init(void)
- {
- 	printk("S3C2442: Initialising architecture\n");
- 
-+	/* make sure SD/MMC driver can distinguish 2440 from 2410 */
-+	s3c_device_sdi.name = "s3c2440-sdi";
-+
- 	return sysdev_register(&s3c2442_sysdev);
- }
---- a/arch/arm/Makefile
-+++ b/arch/arm/Makefile
-@@ -55,7 +55,8 @@ ifeq ($(CONFIG_CPU_32v6),y)
- arch-$(CONFIG_CPU_32v6K)	:=-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6k,-march=armv5t -Wa$(comma)-march=armv6k)
- endif
- arch-$(CONFIG_CPU_32v5)		:=-D__LINUX_ARM_ARCH__=5 $(call cc-option,-march=armv5te,-march=armv4t)
--arch-$(CONFIG_CPU_32v4T)	:=-D__LINUX_ARM_ARCH__=4 -march=armv4t
-+# We can't load armv4t modules, but still need to assemble some armv4t code to be linked in.
-+arch-$(CONFIG_CPU_32v4T)	:=-D__LINUX_ARM_ARCH__=4 -march=armv4 -Wa,-march=armv4t
- arch-$(CONFIG_CPU_32v4)		:=-D__LINUX_ARM_ARCH__=4 -march=armv4
- arch-$(CONFIG_CPU_32v3)		:=-D__LINUX_ARM_ARCH__=3 -march=armv3
- 
---- /dev/null
-+++ b/arch/arm/plat-s3c/include/mach/cpu.h
-@@ -0,0 +1,165 @@
-+/*
-+ * arch/arm/plat-s3c/include/mach/cpu.h
-+ *
-+ *  S3C cpu type detection
-+ *
-+ *  Copyright (C) 2008 Samsung Electronics
-+ *  Kyungmin Park <kyungmin.park@samsung.com>
-+ *
-+ * Derived from OMAP cpu.h
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ */
-+
-+#ifndef __ASM_ARCH_S3C_CPU_H
-+#define __ASM_ARCH_S3C_CPU_H
-+
-+extern unsigned int system_rev;
-+
-+#define S3C_SYSTEM_REV_ATAG (system_rev & 0xffff)
-+#define S3C_SYSTEM_REV_CPU (system_rev & 0xffff0000)
-+
-+/*
-+ * cpu_is_s3c24xx():	True for s3c2400, s3c2410, s3c2440 and so on
-+ * cpu_is_s3c241x():	True fro s3c2410, s3c2412
-+ * cpu_is_s3c244x():	True fro s3c2440, s3c2442, s3c2443
-+ * cpu_is_s3c64xx():	True for s3c6400, s3c6410
-+ */
-+#define GET_S3C_CLASS	((system_rev >> 24) & 0xff)
-+
-+#define IS_S3C_CLASS(class, id)						\
-+static inline int is_s3c ##class (void)					\
-+{									\
-+	return (GET_S3C_CLASS == (id)) ? 1 : 0;				\
-+}
-+
-+#define GET_S3C_SUBCLASS	((system_rev >> 20) & 0xfff)
-+
-+#define IS_S3C_SUBCLASS(subclass, id)					\
-+static inline int is_s3c ##subclass (void)				\
-+{									\
-+	return (GET_S3C_SUBCLASS == (id)) ? 1 : 0;			\
-+}
-+
-+IS_S3C_CLASS(24xx, 0x24)
-+IS_S3C_CLASS(64xx, 0x64)
-+
-+IS_S3C_SUBCLASS(241x, 0x241)
-+IS_S3C_SUBCLASS(244x, 0x244)
-+
-+#define cpu_is_s3c24xx()		0
-+#define cpu_is_s3c241x()		0
-+#define cpu_is_s3c244x()		0
-+#define cpu_is_s3c64xx()		0
-+
-+#if defined(CONFIG_ARCH_S3C2410)
-+# undef  cpu_is_s3c24xx
-+# undef  cpu_is_s3c241x
-+# undef  cpu_is_s3c244x
-+# define cpu_is_s3c24xx()		is_s3c24xx()
-+# define cpu_is_s3c241x()		is_s3c241x()
-+# define cpu_is_s3c244x()		is_s3c244x()
-+#endif
-+
-+#if defined(CONFIG_ARCH_S3C64XX)
-+# undef  cpu_is_s3c64xx
-+# define cpu_is_s3c64xx()		is_s3c64xx()
-+#endif
-+
-+/*
-+ * Macros to detect individual cpu types.
-+ * cpu_is_s3c2410():	True for s3c2410
-+ * cpu_is_s3c2440():	True for s3c2440
-+ * cpu_is_s3c6400():	True for s3c6400
-+ * cpu_is_s3c6410():	True for s3c6410
-+ *
-+ * Exception:
-+ * Store Revision A to 1
-+ * s3c2410a -> s3c2411
-+ * s3c2440a -> s3c2441
-+ */
-+
-+#define GET_S3C_TYPE	((system_rev >> 16) & 0xffff)
-+
-+#define IS_S3C_TYPE(type, id)						\
-+static inline int is_s3c ##type (void)					\
-+{									\
-+	return (GET_S3C_TYPE == (id)) ? 1 : 0;				\
-+}
-+
-+IS_S3C_TYPE(2400, 0x2400)
-+IS_S3C_TYPE(2410, 0x2410)
-+IS_S3C_TYPE(2410a, 0x2411)
-+IS_S3C_TYPE(2412, 0x2412)
-+IS_S3C_TYPE(2440, 0x2440)
-+IS_S3C_TYPE(2440a, 0x2441)
-+IS_S3C_TYPE(2442, 0x2442)
-+IS_S3C_TYPE(2443, 0x2443)
-+IS_S3C_TYPE(6400, 0x6400)
-+IS_S3C_TYPE(6410, 0x6410)
-+
-+#define cpu_is_s3c2400()		0
-+#define cpu_is_s3c2410()		0
-+#define cpu_is_s3c2410a()		0
-+#define cpu_is_s3c2412()		0
-+#define cpu_is_s3c2440()		0
-+#define cpu_is_s3c2440a()		0
-+#define cpu_is_s3c2442()		0
-+#define cpu_is_s3c2443()		0
-+#define cpu_is_s3c6400()		0
-+#define cpu_is_s3c6410()		0
-+
-+#if defined(CONFIG_ARCH_S3C2410)
-+# undef  cpu_is_s3c2400
-+# define cpu_is_s3c2400()		is_s3c2400()
-+#endif
-+
-+#if defined(CONFIG_CPU_S3C2410)
-+# undef  cpu_is_s3c2410
-+# undef  cpu_is_s3c2410a
-+# define cpu_is_s3c2410()		is_s3c2410()
-+# define cpu_is_s3c2410a()		is_s3c2410a()
-+#endif
-+
-+#if defined(CONFIG_CPU_S3C2412)
-+# undef  cpu_is_s3c2412
-+# define cpu_is_s3c2412()		is_s3c2412()
-+#endif
-+
-+#if defined(CONFIG_CPU_S3C2440)
-+# undef  cpu_is_s3c2440
-+# undef  cpu_is_s3c2440a
-+# define cpu_is_s3c2440()		is_s3c2440()
-+# define cpu_is_s3c2440a()		is_s3c2440a()
-+#endif
-+
-+#if defined(CONFIG_CPU_S3C2442)
-+# undef  cpu_is_s3c2442
-+# define cpu_is_s3c2442()		is_s3c2442()
-+#endif
-+
-+#if defined(CONFIG_CPU_S3C2443)
-+# undef  cpu_is_s3c2443
-+# define cpu_is_s3c2443()		is_s3c2443()
-+#endif
-+
-+#if defined(CONFIG_ARCH_S3C64XX)
-+# undef  cpu_is_s3c6400
-+# undef  cpu_is_s3c6410
-+# define cpu_is_s3c6400()		is_s3c6400()
-+# define cpu_is_s3c6410()		is_s3c6410()
-+#endif
-+
-+#endif
---- a/arch/arm/plat-s3c/include/plat/devs.h
-+++ b/arch/arm/plat-s3c/include/plat/devs.h
-@@ -16,6 +16,10 @@ struct s3c24xx_uart_resources {
- 	unsigned long		 nr_resources;
- };
- 
-+struct s3c_plat_otg_data {
-+	int		phyclk;
-+};
-+
- extern struct s3c24xx_uart_resources s3c2410_uart_resources[];
- extern struct s3c24xx_uart_resources s3c64xx_uart_resources[];
- 
---- a/arch/arm/plat-s3c/include/plat/gpio-core.h
-+++ b/arch/arm/plat-s3c/include/plat/gpio-core.h
-@@ -20,6 +20,19 @@
-  * specific code.
- */
- 
-+struct s3c_gpio_chip;
-+
-+/**
-+ * struct s3c_gpio_pm - power management (suspend/resume) information
-+ * @save: Routine to save the state of the GPIO block
-+ * @resume: Routine to resume the GPIO block.
-+ */
-+struct s3c_gpio_pm {
-+	void (*save)(struct s3c_gpio_chip *chip);
-+	void (*resume)(struct s3c_gpio_chip *chip);
-+};
-+
-+
- struct s3c_gpio_cfg;
- 
- /**
-@@ -27,6 +40,7 @@ struct s3c_gpio_cfg;
-  * @chip: The chip structure to be exported via gpiolib.
-  * @base: The base pointer to the gpio configuration registers.
-  * @config: special function and pull-resistor control information.
-+ * @pm_save: Save information for suspend/resume support.
-  *
-  * This wrapper provides the necessary information for the Samsung
-  * specific gpios being registered with gpiolib.
-@@ -34,7 +48,11 @@ struct s3c_gpio_cfg;
- struct s3c_gpio_chip {
- 	struct gpio_chip	chip;
- 	struct s3c_gpio_cfg	*config;
-+	struct s3c_gpio_pm	*pm;
- 	void __iomem		*base;
-+#ifdef CONFIG_PM
-+	u32			pm_save[4];
-+#endif
- };
- 
- static inline struct s3c_gpio_chip *to_s3c_gpio(struct gpio_chip *gpc)
-@@ -75,3 +93,16 @@ static inline struct s3c_gpio_chip *s3c_
- 
- static inline void s3c_gpiolib_track(struct s3c_gpio_chip *chip) { }
- #endif
-+
-+#ifdef CONFIG_PM
-+extern struct s3c_gpio_pm s3c_gpio_pm_1bit;
-+extern struct s3c_gpio_pm s3c_gpio_pm_2bit;
-+extern struct s3c_gpio_pm s3c_gpio_pm_4bit;
-+#define __gpio_pm(x) x
-+#else
-+#define s3c_gpio_pm_1bit NULL
-+#define s3c_gpio_pm_2bit NULL
-+#define s3c_gpio_pm_4bit NULL
-+#define __gpio_pm(x) NULL
-+
-+#endif /* CONFIG_PM */
---- a/arch/arm/plat-s3c/include/plat/map-base.h
-+++ b/arch/arm/plat-s3c/include/plat/map-base.h
-@@ -36,5 +36,7 @@
- #define S3C_VA_TIMER	S3C_ADDR(0x00300000)	/* timer block */
- #define S3C_VA_WATCHDOG	S3C_ADDR(0x00400000)	/* watchdog */
- #define S3C_VA_UART	S3C_ADDR(0x01000000)	/* UART */
-+#define S3C_VA_OTG	S3C_ADDR(0x03900000)	/* OTG */
-+#define S3C_VA_OTGSFR	S3C_ADDR(0x03a00000)	/* OTGSFR */
- 
- #endif /* __ASM_PLAT_MAP_H */
---- a/arch/arm/plat-s3c/include/plat/nand.h
-+++ b/arch/arm/plat-s3c/include/plat/nand.h
-@@ -21,11 +21,14 @@
-  * partitions	 = mtd partition list
- */
- 
-+#define S3C2410_NAND_BBT	0x0001
-+
- struct s3c2410_nand_set {
- 	unsigned int		disable_ecc : 1;
- 
- 	int			nr_chips;
- 	int			nr_partitions;
-+	unsigned int		flags;
- 	char			*name;
- 	int			*nr_map;
- 	struct mtd_partition	*partitions;
-@@ -44,6 +47,9 @@ struct s3c2410_platform_nand {
- 	int			nr_sets;
- 	struct s3c2410_nand_set *sets;
- 
-+	/* force software_ecc at runtime */
-+	int	software_ecc;
-+
- 	void			(*select_chip)(struct s3c2410_nand_set *,
- 					       int chip);
- };
---- a/arch/arm/plat-s3c/include/plat/pm.h
-+++ b/arch/arm/plat-s3c/include/plat/pm.h
-@@ -9,6 +9,8 @@
-  * published by the Free Software Foundation.
- */
- 
-+#include <linux/sysdev.h>
-+
- /* s3c_pm_init
-  *
-  * called from board at initialisation time to setup the power
-@@ -44,6 +46,8 @@ extern void (*pm_cpu_sleep)(void);
- 
- extern unsigned long s3c_pm_flags;
- 
-+extern unsigned char pm_uart_udivslot;  /* true to save UART UDIVSLOT */
-+
- /* from sleep.S */
- 
- extern int  s3c_cpu_save(unsigned long *saveblk);
-@@ -88,6 +92,7 @@ struct pm_uart_save {
- 	u32	ufcon;
- 	u32	umcon;
- 	u32	ubrdiv;
-+	u32	udivslot;
- };
- 
- /* helper functions to save/restore lists of registers. */
---- a/arch/arm/plat-s3c/include/plat/sdhci.h
-+++ b/arch/arm/plat-s3c/include/plat/sdhci.h
-@@ -29,6 +29,7 @@ struct mmc_ios;
-  *            is necessary the controllers and/or GPIO blocks require the
-  *	      changing of driver-strength and other controls dependant on
-  *	      the card and speed of operation.
-+ * sdhci_host: Pointer kept during init, allows presence change notification
-  *
-  * Initialisation data specific to either the machine or the platform
-  * for the device driver to use or call-back when configuring gpio or
-@@ -45,8 +46,11 @@ struct s3c_sdhci_platdata {
- 			    void __iomem *regbase,
- 			    struct mmc_ios *ios,
- 			    struct mmc_card *card);
-+	struct sdhci_host * sdhci_host;
- };
- 
-+extern void sdhci_s3c_force_presence_change(struct platform_device *pdev);
-+
- /**
-  * s3c_sdhci0_set_platdata - Set platform data for S3C SDHCI device.
-  * @pd: Platform data to register to device.
---- a/arch/arm/plat-s3c/init.c
-+++ b/arch/arm/plat-s3c/init.c
-@@ -31,6 +31,34 @@
- 
- static struct cpu_table *cpu;
- 
-+static void __init set_system_rev(unsigned int idcode)
-+{
-+	/*
-+	 * system_rev encoding is as follows
-+	 * system_rev & 0xff000000 -> S3C Class (24xx/64xx)
-+	 * system_rev & 0xfff00000 -> S3C Sub Class (241x/244x)
-+	 * system_rev & 0xffff0000 -> S3C Type (2410/2440/6400/6410)
-+	 *
-+	 * Remaining[15:0] are preserved from the value set by ATAG
-+	 *
-+	 * Exception:
-+	 *  Store Revision A to 1 such as
-+	 *  s3c2410A to s3c2411
-+	 *  s3c2440A to s3c2441
-+	 */
-+
-+	system_rev &= 0xffff;
-+	system_rev |= (idcode & 0x0ffff000) << 4;
-+
-+	if (idcode == 0x32410002 || idcode == 0x32440001)
-+		system_rev |= (0x1 << 16);
-+	if (idcode == 0x32440aaa	/* s3c2442 */
-+	    || idcode == 0x32440aab)	/* s3c2442b */
-+		system_rev |= (0x2 << 16);
-+	if (idcode == 0x0)		/* s3c2400 */
-+		system_rev |= (0x2400 << 16);
-+}
-+
- static struct cpu_table * __init s3c_lookup_cpu(unsigned long idcode,
- 						struct cpu_table *tab,
- 						unsigned int count)
-@@ -53,6 +81,8 @@ void __init s3c_init_cpu(unsigned long i
- 		panic("Unknown S3C24XX CPU");
- 	}
- 
-+	set_system_rev(idcode);
-+
- 	printk("CPU %s (id 0x%08lx)\n", cpu->name, idcode);
- 
- 	if (cpu->map_io == NULL || cpu->init == NULL) {
---- a/arch/arm/plat-s3c/Makefile
-+++ b/arch/arm/plat-s3c/Makefile
-@@ -21,6 +21,7 @@ obj-y				+= gpio-config.o
- # PM support
- 
- obj-$(CONFIG_PM)		+= pm.o
-+obj-$(CONFIG_PM)		+= pm-gpio.o
- obj-$(CONFIG_S3C2410_PM_CHECK)	+= pm-check.o
- 
- # devices
---- a/arch/arm/plat-s3c/pm.c
-+++ b/arch/arm/plat-s3c/pm.c
-@@ -21,11 +21,10 @@
- 
- #include <asm/cacheflush.h>
- #include <mach/hardware.h>
-+#include <mach/map.h>
- 
- #include <plat/regs-serial.h>
- #include <mach/regs-clock.h>
--#include <mach/regs-gpio.h>
--#include <mach/regs-mem.h>
- #include <mach/regs-irq.h>
- #include <asm/irq.h>
- 
-@@ -70,6 +69,8 @@ static inline void s3c_pm_debug_init(voi
- 
- /* Save the UART configurations if we are configured for debug. */
- 
-+unsigned char pm_uart_udivslot;
-+
- #ifdef CONFIG_S3C2410_PM_DEBUG
- 
- struct pm_uart_save uart_save[CONFIG_SERIAL_SAMSUNG_UARTS];
-@@ -83,6 +84,12 @@ static void s3c_pm_save_uart(unsigned in
- 	save->ufcon = __raw_readl(regs + S3C2410_UFCON);
- 	save->umcon = __raw_readl(regs + S3C2410_UMCON);
- 	save->ubrdiv = __raw_readl(regs + S3C2410_UBRDIV);
-+
-+	if (pm_uart_udivslot)
-+		save->udivslot = __raw_readl(regs + S3C2443_DIVSLOT);
-+
-+	S3C_PMDBG("UART[%d]: ULCON=%04x, UCON=%04x, UFCON=%04x, UBRDIV=%04x\n",
-+		  uart, save->ulcon, save->ucon, save->ufcon, save->ubrdiv);
- }
- 
- static void s3c_pm_save_uarts(void)
-@@ -98,11 +105,16 @@ static void s3c_pm_restore_uart(unsigned
- {
- 	void __iomem *regs = S3C_VA_UARTx(uart);
- 
-+	s3c_pm_arch_update_uart(regs, save);
-+
- 	__raw_writel(save->ulcon, regs + S3C2410_ULCON);
- 	__raw_writel(save->ucon,  regs + S3C2410_UCON);
- 	__raw_writel(save->ufcon, regs + S3C2410_UFCON);
- 	__raw_writel(save->umcon, regs + S3C2410_UMCON);
- 	__raw_writel(save->ubrdiv, regs + S3C2410_UBRDIV);
-+
-+	if (pm_uart_udivslot)
-+		__raw_writel(save->udivslot, regs + S3C2443_DIVSLOT);
- }
- 
- static void s3c_pm_restore_uarts(void)
-@@ -289,11 +301,14 @@ static int s3c_pm_enter(suspend_state_t 
- 
- 	s3c_pm_arch_stop_clocks();
- 
--	/* s3c_cpu_save will also act as our return point from when
--	 * we resume as it saves its own register state and restores it
--	 * during the resume.  */
--
--	s3c_cpu_save(regs_save);
-+	/* s3c2410_cpu_save will also act as our return point from when
-+	 * we resume as it saves its own register state, so use the return
-+	 * code to differentiate return from save and return from sleep */
-+
-+	if (s3c_cpu_save(regs_save) == 0) {
-+		flush_cache_all();
-+		pm_cpu_sleep();
-+	}
- 
- 	/* restore the cpu state using the kernel's cpu init code. */
- 
---- /dev/null
-+++ b/arch/arm/plat-s3c/pm-gpio.c
-@@ -0,0 +1,378 @@
-+/* linux/arch/arm/plat-s3c/pm-gpio.c
-+ *
-+ * Copyright 2008 Openmoko, Inc.
-+ * Copyright 2008 Simtec Electronics
-+ *	Ben Dooks <ben@simtec.co.uk>
-+ *	http://armlinux.simtec.co.uk/
-+ *
-+ * S3C series GPIO PM code
-+ *
-+ * 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.
-+*/
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/io.h>
-+#include <linux/gpio.h>
-+
-+#include <mach/gpio-core.h>
-+#include <plat/pm.h>
-+
-+/* PM GPIO helpers */
-+
-+#define OFFS_CON	(0x00)
-+#define OFFS_DAT	(0X04)
-+#define OFFS_UP		(0X08)
-+
-+static void s3c_gpio_pm_1bit_save(struct s3c_gpio_chip *chip)
-+{
-+	chip->pm_save[0] = __raw_readl(chip->base + OFFS_CON);
-+	chip->pm_save[1] = __raw_readl(chip->base + OFFS_DAT);
-+}
-+
-+static void s3c_gpio_pm_1bit_resume(struct s3c_gpio_chip *chip)
-+{
-+	void __iomem *base = chip->base;
-+	u32 old_gpcon = __raw_readl(base + OFFS_CON);
-+	u32 old_gpdat = __raw_readl(base + OFFS_DAT);
-+	u32 gps_gpcon = chip->pm_save[0];
-+	u32 gps_gpdat = chip->pm_save[1];
-+	u32 gpcon;
-+
-+	/* GPACON only has one bit per control / data and no PULLUPs.
-+	 * GPACON[x] = 0 => Output, 1 => SFN */
-+
-+	/* first set all SFN bits to SFN */
-+
-+	gpcon = old_gpcon | gps_gpcon;
-+	__raw_writel(gpcon, base + OFFS_CON);
-+
-+	/* now set all the other bits */
-+
-+	__raw_writel(gps_gpdat, base + OFFS_DAT);
-+	__raw_writel(gps_gpcon, base + OFFS_CON);
-+
-+	S3C_PMDBG("%s: CON %08x => %08x, DAT %08x => %08x\n",
-+		  chip->chip.label, old_gpcon, gps_gpcon, old_gpdat, gps_gpdat);
-+}
-+
-+struct s3c_gpio_pm s3c_gpio_pm_1bit = {
-+	.save	= s3c_gpio_pm_1bit_save,
-+	.resume = s3c_gpio_pm_1bit_resume,
-+};
-+
-+static void s3c_gpio_pm_2bit_save(struct s3c_gpio_chip *chip)
-+{
-+	chip->pm_save[0] = __raw_readl(chip->base + OFFS_CON);
-+	chip->pm_save[1] = __raw_readl(chip->base + OFFS_DAT);
-+	chip->pm_save[2] = __raw_readl(chip->base + OFFS_UP);
-+}
-+
-+/* Test whether the given masked+shifted bits of an GPIO configuration
-+ * are one of the SFN (special function) modes. */
-+
-+static inline int is_sfn(unsigned long con)
-+{
-+	return con >= 2;
-+}
-+
-+/* Test if the given masked+shifted GPIO configuration is an input */
-+
-+static inline int is_in(unsigned long con)
-+{
-+	return con == 0;
-+}
-+
-+/* Test if the given masked+shifted GPIO configuration is an output */
-+
-+static inline int is_out(unsigned long con)
-+{
-+	return con == 1;
-+}
-+
-+/**
-+ * s3c_gpio_pm_2bit_resume() - restore the given GPIO bank
-+ * @chip: The chip information to resume.
-+ *
-+ * Restore one of the GPIO banks that was saved during suspend. This is
-+ * not as simple as once thought, due to the possibility of glitches
-+ * from the order that the CON and DAT registers are set in.
-+ *
-+ * The three states the pin can be are {IN,OUT,SFN} which gives us 9
-+ * combinations of changes to check. Three of these, if the pin stays
-+ * in the same configuration can be discounted. This leaves us with
-+ * the following:
-+ *
-+ * { IN => OUT }  Change DAT first
-+ * { IN => SFN }  Change CON first
-+ * { OUT => SFN } Change CON first, so new data will not glitch
-+ * { OUT => IN }  Change CON first, so new data will not glitch
-+ * { SFN => IN }  Change CON first
-+ * { SFN => OUT } Change DAT first, so new data will not glitch [1]
-+ *
-+ * We do not currently deal with the UP registers as these control
-+ * weak resistors, so a small delay in change should not need to bring
-+ * these into the calculations.
-+ *
-+ * [1] this assumes that writing to a pin DAT whilst in SFN will set the
-+ *     state for when it is next output.
-+ */
-+static void s3c_gpio_pm_2bit_resume(struct s3c_gpio_chip *chip)
-+{
-+	void __iomem *base = chip->base;
-+	u32 old_gpcon = __raw_readl(base + OFFS_CON);
-+	u32 old_gpdat = __raw_readl(base + OFFS_DAT);
-+	u32 gps_gpcon = chip->pm_save[0];
-+	u32 gps_gpdat = chip->pm_save[1];
-+	u32 gpcon, old, new, mask;
-+	u32 change_mask = 0x0;
-+	int nr;
-+
-+	/* restore GPIO pull-up settings */
-+	__raw_writel(chip->pm_save[2], base + OFFS_UP);
-+
-+	/* Create a change_mask of all the items that need to have
-+	 * their CON value changed before their DAT value, so that
-+	 * we minimise the work between the two settings.
-+	 */
-+
-+	for (nr = 0, mask = 0x03; nr < 32; nr += 2, mask <<= 2) {
-+		old = (old_gpcon & mask) >> nr;
-+		new = (gps_gpcon & mask) >> nr;
-+
-+		/* If there is no change, then skip */
-+
-+		if (old == new)
-+			continue;
-+
-+		/* If both are special function, then skip */
-+
-+		if (is_sfn(old) && is_sfn(new))
-+			continue;
-+
-+		/* Change is IN => OUT, do not change now */
-+
-+		if (is_in(old) && is_out(new))
-+			continue;
-+
-+		/* Change is SFN => OUT, do not change now */
-+
-+		if (is_sfn(old) && is_out(new))
-+			continue;
-+
-+		/* We should now be at the case of IN=>SFN,
-+		 * OUT=>SFN, OUT=>IN, SFN=>IN. */
-+
-+		change_mask |= mask;
-+	}
-+
-+
-+	/* Write the new CON settings */
-+
-+	gpcon = old_gpcon & ~change_mask;
-+	gpcon |= gps_gpcon & change_mask;
-+
-+	__raw_writel(gpcon, base + OFFS_CON);
-+
-+	/* Now change any items that require DAT,CON */
-+
-+	__raw_writel(gps_gpdat, base + OFFS_DAT);
-+	__raw_writel(gps_gpcon, base + OFFS_CON);
-+
-+	S3C_PMDBG("%s: CON %08x => %08x, DAT %08x => %08x\n",
-+		  chip->chip.label, old_gpcon, gps_gpcon, old_gpdat, gps_gpdat);
-+}
-+
-+struct s3c_gpio_pm s3c_gpio_pm_2bit = {
-+	.save	= s3c_gpio_pm_2bit_save,
-+	.resume = s3c_gpio_pm_2bit_resume,
-+};
-+
-+#ifdef CONFIG_ARCH_S3C64XX
-+static void s3c_gpio_pm_4bit_save(struct s3c_gpio_chip *chip)
-+{
-+	chip->pm_save[1] = __raw_readl(chip->base + OFFS_CON);
-+	chip->pm_save[2] = __raw_readl(chip->base + OFFS_DAT);
-+	chip->pm_save[3] = __raw_readl(chip->base + OFFS_UP);
-+
-+	if (chip->chip.ngpio > 8)
-+		chip->pm_save[0] = __raw_readl(chip->base - 4);
-+}
-+
-+static u32 s3c_gpio_pm_4bit_mask(u32 old_gpcon, u32 gps_gpcon)
-+{
-+	u32 old, new, mask;
-+	u32 change_mask = 0x0;
-+	int nr;
-+
-+	for (nr = 0, mask = 0x0f; nr < 16; nr += 4, mask <<= 4) {
-+		old = (old_gpcon & mask) >> nr;
-+		new = (gps_gpcon & mask) >> nr;
-+
-+		/* If there is no change, then skip */
-+
-+		if (old == new)
-+			continue;
-+
-+		/* If both are special function, then skip */
-+
-+		if (is_sfn(old) && is_sfn(new))
-+			continue;
-+
-+		/* Change is IN => OUT, do not change now */
-+
-+		if (is_in(old) && is_out(new))
-+			continue;
-+
-+		/* Change is SFN => OUT, do not change now */
-+
-+		if (is_sfn(old) && is_out(new))
-+			continue;
-+
-+		/* We should now be at the case of IN=>SFN,
-+		 * OUT=>SFN, OUT=>IN, SFN=>IN. */
-+
-+		change_mask |= mask;
-+	}
-+
-+	return change_mask;
-+}
-+
-+static void s3c_gpio_pm_4bit_con(struct s3c_gpio_chip *chip, int index)
-+{
-+	void __iomem *con = chip->base + (index * 4);
-+	u32 old_gpcon = __raw_readl(con);
-+	u32 gps_gpcon = chip->pm_save[index + 1];
-+	u32 gpcon, mask;
-+
-+	mask = s3c_gpio_pm_4bit_mask(old_gpcon, gps_gpcon);
-+
-+	gpcon = old_gpcon & ~mask;
-+	gpcon |= gps_gpcon & mask;
-+
-+	__raw_writel(gpcon, con);
-+}
-+
-+static void s3c_gpio_pm_4bit_resume(struct s3c_gpio_chip *chip)
-+{
-+	void __iomem *base = chip->base;
-+	u32 old_gpcon[2];
-+	u32 old_gpdat = __raw_readl(base + OFFS_DAT);
-+	u32 gps_gpdat = chip->pm_save[2];
-+
-+	/* First, modify the CON settings */
-+
-+	old_gpcon[0] = 0;
-+	old_gpcon[1] = __raw_readl(base + OFFS_CON);
-+
-+	s3c_gpio_pm_4bit_con(chip, 0);
-+	if (chip->chip.ngpio > 8) {
-+		old_gpcon[0] = __raw_readl(base - 4);
-+		s3c_gpio_pm_4bit_con(chip, -1);
-+	}
-+
-+	/* Now change the configurations that require DAT,CON */
-+
-+	__raw_writel(chip->pm_save[2], base + OFFS_DAT);
-+	__raw_writel(chip->pm_save[1], base + OFFS_CON);
-+	if (chip->chip.ngpio > 8)
-+		__raw_writel(chip->pm_save[0], base - 4);
-+
-+	__raw_writel(chip->pm_save[2], base + OFFS_DAT);
-+	__raw_writel(chip->pm_save[3], base + OFFS_UP);
-+
-+	if (chip->chip.ngpio > 8) {
-+		S3C_PMDBG("%s: CON4 %08x,%08x => %08x,%08x, DAT %08x => %08x\n",
-+			  chip->chip.label, old_gpcon[0], old_gpcon[1],
-+			  __raw_readl(base - 4),
-+			  __raw_readl(base + OFFS_CON),
-+			  old_gpdat, gps_gpdat);
-+	} else
-+		S3C_PMDBG("%s: CON4 %08x => %08x, DAT %08x => %08x\n",
-+			  chip->chip.label, old_gpcon[1],
-+			  __raw_readl(base + OFFS_CON),
-+			  old_gpdat, gps_gpdat);
-+}
-+
-+struct s3c_gpio_pm s3c_gpio_pm_4bit = {
-+	.save	= s3c_gpio_pm_4bit_save,
-+	.resume = s3c_gpio_pm_4bit_resume,
-+};
-+#endif /* CONFIG_ARCH_S3C64XX */
-+
-+/**
-+ * s3c_pm_save_gpio() - save gpio chip data for suspend
-+ * @ourchip: The chip for suspend.
-+ */
-+static void s3c_pm_save_gpio(struct s3c_gpio_chip *ourchip)
-+{
-+	struct s3c_gpio_pm *pm = ourchip->pm;
-+
-+	if (pm == NULL || pm->save == NULL)
-+		S3C_PMDBG("%s: no pm for %s\n", __func__, ourchip->chip.label);
-+	else
-+		pm->save(ourchip);
-+}
-+
-+/**
-+ * s3c_pm_save_gpios() - Save the state of the GPIO banks.
-+ *
-+ * For all the GPIO banks, save the state of each one ready for going
-+ * into a suspend mode.
-+ */
-+void s3c_pm_save_gpios(void)
-+{
-+	struct s3c_gpio_chip *ourchip;
-+	unsigned int gpio_nr;
-+
-+	for (gpio_nr = 0; gpio_nr < S3C_GPIO_END; gpio_nr++) {
-+		ourchip = s3c_gpiolib_getchip(gpio_nr);
-+		if (!ourchip)
-+			continue;
-+
-+		s3c_pm_save_gpio(ourchip);
-+
-+		S3C_PMDBG("%s: save %08x,%08x,%08x,%08x\n",
-+			  ourchip->chip.label,
-+			  ourchip->pm_save[0],
-+			  ourchip->pm_save[1],
-+			  ourchip->pm_save[2],
-+			  ourchip->pm_save[3]);
-+
-+		gpio_nr += ourchip->chip.ngpio;
-+		gpio_nr += CONFIG_S3C_GPIO_SPACE;
-+	}
-+}
-+
-+/**
-+ * s3c_pm_resume_gpio() - restore gpio chip data after suspend
-+ * @ourchip: The suspended chip.
-+ */
-+static void s3c_pm_resume_gpio(struct s3c_gpio_chip *ourchip)
-+{
-+	struct s3c_gpio_pm *pm = ourchip->pm;
-+
-+	if (pm == NULL || pm->resume == NULL)
-+		S3C_PMDBG("%s: no pm for %s\n", __func__, ourchip->chip.label);
-+	else
-+		pm->resume(ourchip);
-+}
-+
-+void s3c_pm_restore_gpios(void)
-+{
-+	struct s3c_gpio_chip *ourchip;
-+	unsigned int gpio_nr;
-+
-+	for (gpio_nr = 0; gpio_nr < S3C_GPIO_END; gpio_nr++) {
-+		ourchip = s3c_gpiolib_getchip(gpio_nr);
-+		if (!ourchip)
-+			continue;
-+
-+		s3c_pm_resume_gpio(ourchip);
-+
-+		gpio_nr += ourchip->chip.ngpio;
-+		gpio_nr += CONFIG_S3C_GPIO_SPACE;
-+	}
-+}
---- a/arch/arm/plat-s3c24xx/clock-dclk.c
-+++ b/arch/arm/plat-s3c24xx/clock-dclk.c
-@@ -18,6 +18,7 @@
- 
- #include <mach/regs-clock.h>
- #include <mach/regs-gpio.h>
-+#include <mach/hardware.h>
- 
- #include <plat/clock.h>
- #include <plat/cpu.h>
---- a/arch/arm/plat-s3c24xx/cpu.c
-+++ b/arch/arm/plat-s3c24xx/cpu.c
-@@ -61,6 +61,7 @@ static const char name_s3c2410[]  = "S3C
- static const char name_s3c2412[]  = "S3C2412";
- static const char name_s3c2440[]  = "S3C2440";
- static const char name_s3c2442[]  = "S3C2442";
-+static const char name_s3c2442b[]  = "S3C2442B";
- static const char name_s3c2443[]  = "S3C2443";
- static const char name_s3c2410a[] = "S3C2410A";
- static const char name_s3c2440a[] = "S3C2440A";
-@@ -112,6 +113,15 @@ static struct cpu_table cpu_ids[] __init
- 		.name		= name_s3c2442
- 	},
- 	{
-+		.idcode		= 0x32440aab,
-+		.idmask		= 0xffffffff,
-+		.map_io		= s3c244x_map_io,
-+		.init_clocks	= s3c244x_init_clocks,
-+		.init_uarts	= s3c244x_init_uarts,
-+		.init		= s3c2442_init,
-+		.name		= name_s3c2442b
-+	},
-+	{
- 		.idcode		= 0x32412001,
- 		.idmask		= 0xffffffff,
- 		.map_io		= s3c2412_map_io,
---- a/arch/arm/plat-s3c24xx/gpiolib.c
-+++ b/arch/arm/plat-s3c24xx/gpiolib.c
-@@ -19,9 +19,10 @@
- #include <linux/io.h>
- #include <linux/gpio.h>
- 
--#include <mach/gpio-core.h>
-+#include <plat/gpio-core.h>
- #include <mach/hardware.h>
- #include <asm/irq.h>
-+#include <plat/pm.h>
- 
- #include <mach/regs-gpio.h>
- 
-@@ -78,6 +79,7 @@ static int s3c24xx_gpiolib_bankg_toirq(s
- struct s3c_gpio_chip s3c24xx_gpios[] = {
- 	[0] = {
- 		.base	= S3C24XX_GPIO_BASE(S3C2410_GPA0),
-+		.pm	= __gpio_pm(&s3c_gpio_pm_1bit),
- 		.chip	= {
- 			.base			= S3C2410_GPA0,
- 			.owner			= THIS_MODULE,
-@@ -89,6 +91,7 @@ struct s3c_gpio_chip s3c24xx_gpios[] = {
- 	},
- 	[1] = {
- 		.base	= S3C24XX_GPIO_BASE(S3C2410_GPB0),
-+		.pm	= __gpio_pm(&s3c_gpio_pm_2bit),
- 		.chip	= {
- 			.base			= S3C2410_GPB0,
- 			.owner			= THIS_MODULE,
-@@ -98,6 +101,7 @@ struct s3c_gpio_chip s3c24xx_gpios[] = {
- 	},
- 	[2] = {
- 		.base	= S3C24XX_GPIO_BASE(S3C2410_GPC0),
-+		.pm	= __gpio_pm(&s3c_gpio_pm_2bit),
- 		.chip	= {
- 			.base			= S3C2410_GPC0,
- 			.owner			= THIS_MODULE,
-@@ -107,6 +111,7 @@ struct s3c_gpio_chip s3c24xx_gpios[] = {
- 	},
- 	[3] = {
- 		.base	= S3C24XX_GPIO_BASE(S3C2410_GPD0),
-+		.pm	= __gpio_pm(&s3c_gpio_pm_2bit),
- 		.chip	= {
- 			.base			= S3C2410_GPD0,
- 			.owner			= THIS_MODULE,
-@@ -116,6 +121,7 @@ struct s3c_gpio_chip s3c24xx_gpios[] = {
- 	},
- 	[4] = {
- 		.base	= S3C24XX_GPIO_BASE(S3C2410_GPE0),
-+		.pm	= __gpio_pm(&s3c_gpio_pm_2bit),
- 		.chip	= {
- 			.base			= S3C2410_GPE0,
- 			.label			= "GPIOE",
-@@ -125,6 +131,7 @@ struct s3c_gpio_chip s3c24xx_gpios[] = {
- 	},
- 	[5] = {
- 		.base	= S3C24XX_GPIO_BASE(S3C2410_GPF0),
-+		.pm	= __gpio_pm(&s3c_gpio_pm_2bit),
- 		.chip	= {
- 			.base			= S3C2410_GPF0,
- 			.owner			= THIS_MODULE,
-@@ -135,12 +142,23 @@ struct s3c_gpio_chip s3c24xx_gpios[] = {
- 	},
- 	[6] = {
- 		.base	= S3C24XX_GPIO_BASE(S3C2410_GPG0),
-+		.pm	= __gpio_pm(&s3c_gpio_pm_2bit),
- 		.chip	= {
- 			.base			= S3C2410_GPG0,
- 			.owner			= THIS_MODULE,
- 			.label			= "GPIOG",
--			.ngpio			= 10,
- 			.to_irq			= s3c24xx_gpiolib_bankg_toirq,
-+			.ngpio			= 16,
-+		},
-+	},
-+	[7] = {
-+		.base	= S3C24XX_GPIO_BASE(S3C2410_GPH0),
-+		.pm	= __gpio_pm(&s3c_gpio_pm_2bit),
-+		.chip	= {
-+			.base			= S3C2410_GPH0,
-+			.owner			= THIS_MODULE,
-+			.label			= "GPIOH",
-+			.ngpio			= 11,
- 		},
- 	},
- };
---- a/arch/arm/plat-s3c24xx/include/plat/pm-core.h
-+++ b/arch/arm/plat-s3c24xx/include/plat/pm-core.h
-@@ -57,3 +57,8 @@ static inline void s3c_pm_arch_show_resu
- 	s3c_pm_show_resume_irqs(IRQ_EINT4-4, __raw_readl(S3C2410_EINTPEND),
- 				s3c_irqwake_eintmask);
- }
-+
-+static inline void s3c_pm_arch_update_uart(void __iomem *regs,
-+					   struct pm_uart_save *save)
-+{
-+}
---- a/arch/arm/plat-s3c24xx/irq-pm.c
-+++ b/arch/arm/plat-s3c24xx/irq-pm.c
-@@ -15,6 +15,7 @@
- #include <linux/module.h>
- #include <linux/interrupt.h>
- #include <linux/sysdev.h>
-+#include <linux/irq.h>
- 
- #include <plat/cpu.h>
- #include <plat/pm.h>
-@@ -80,7 +81,9 @@ int s3c24xx_irq_suspend(struct sys_devic
- 
- int s3c24xx_irq_resume(struct sys_device *dev)
- {
--	unsigned int i;
-+	unsigned int i, irq;
-+	unsigned long eintpnd;
-+	struct irq_desc *desc;
- 
- 	for (i = 0; i < ARRAY_SIZE(save_extint); i++)
- 		__raw_writel(save_extint[i], S3C24XX_EXTINT0 + (i*4));
-@@ -91,5 +94,25 @@ int s3c24xx_irq_resume(struct sys_device
- 	s3c_pm_do_restore(irq_save, ARRAY_SIZE(irq_save));
- 	__raw_writel(save_eintmask, S3C24XX_EINTMASK);
- 
-+	/*
-+	 * ACK those interrupts which are now masked and pending.
-+	 * Level interrupts if not ACKed here, create an interrupt storm
-+	 * because they are not handled at all.
-+	 */
-+
-+	eintpnd = __raw_readl(S3C24XX_EINTPEND);
-+
-+	eintpnd &= save_eintmask;
-+	eintpnd &= ~0xff;	/* ignore lower irqs */
-+
-+	while (eintpnd) {
-+		irq = __ffs(eintpnd);
-+		eintpnd &= ~(1 << irq);
-+
-+		irq += (IRQ_EINT4 - 4);
-+		desc = irq_to_desc(irq);
-+		desc->chip->ack(irq);
-+	}
-+
- 	return 0;
- }
---- a/arch/arm/plat-s3c24xx/pm.c
-+++ b/arch/arm/plat-s3c24xx/pm.c
-@@ -39,6 +39,7 @@
- #include <mach/regs-gpio.h>
- #include <mach/regs-mem.h>
- #include <mach/regs-irq.h>
-+#include <mach/hardware.h>
- 
- #include <asm/mach/time.h>
- 
-@@ -75,43 +76,10 @@ static struct sleep_save core_save[] = {
- 	SAVE_ITEM(S3C2410_CLKSLOW),
- };
- 
--static struct gpio_sleep {
--	void __iomem	*base;
--	unsigned int	 gpcon;
--	unsigned int	 gpdat;
--	unsigned int	 gpup;
--} gpio_save[] = {
--	[0] = {
--		.base	= S3C2410_GPACON,
--	},
--	[1] = {
--		.base	= S3C2410_GPBCON,
--	},
--	[2] = {
--		.base	= S3C2410_GPCCON,
--	},
--	[3] = {
--		.base	= S3C2410_GPDCON,
--	},
--	[4] = {
--		.base	= S3C2410_GPECON,
--	},
--	[5] = {
--		.base	= S3C2410_GPFCON,
--	},
--	[6] = {
--		.base	= S3C2410_GPGCON,
--	},
--	[7] = {
--		.base	= S3C2410_GPHCON,
--	},
--};
--
- static struct sleep_save misc_save[] = {
- 	SAVE_ITEM(S3C2410_DCLKCON),
- };
- 
--
- /* s3c_pm_check_resume_pin
-  *
-  * check to see if the pin is configured correctly for sleep mode, and
-@@ -165,186 +133,6 @@ void s3c_pm_configure_extint(void)
- 	}
- }
- 
--/* offsets for CON/DAT/UP registers */
--
--#define OFFS_CON	(S3C2410_GPACON - S3C2410_GPACON)
--#define OFFS_DAT	(S3C2410_GPADAT - S3C2410_GPACON)
--#define OFFS_UP		(S3C2410_GPBUP  - S3C2410_GPBCON)
--
--/* s3c_pm_save_gpios()
-- *
-- * Save the state of the GPIOs
-- */
--
--void s3c_pm_save_gpios(void)
--{
--	struct gpio_sleep *gps = gpio_save;
--	unsigned int gpio;
--
--	for (gpio = 0; gpio < ARRAY_SIZE(gpio_save); gpio++, gps++) {
--		void __iomem *base = gps->base;
--
--		gps->gpcon = __raw_readl(base + OFFS_CON);
--		gps->gpdat = __raw_readl(base + OFFS_DAT);
--
--		if (gpio > 0)
--			gps->gpup = __raw_readl(base + OFFS_UP);
--
--	}
--}
--
--/* Test whether the given masked+shifted bits of an GPIO configuration
-- * are one of the SFN (special function) modes. */
--
--static inline int is_sfn(unsigned long con)
--{
--	return (con == 2 || con == 3);
--}
--
--/* Test if the given masked+shifted GPIO configuration is an input */
--
--static inline int is_in(unsigned long con)
--{
--	return con == 0;
--}
--
--/* Test if the given masked+shifted GPIO configuration is an output */
--
--static inline int is_out(unsigned long con)
--{
--	return con == 1;
--}
--
--/**
-- * s3c2410_pm_restore_gpio() - restore the given GPIO bank
-- * @index: The number of the GPIO bank being resumed.
-- * @gps: The sleep confgiuration for the bank.
-- *
-- * Restore one of the GPIO banks that was saved during suspend. This is
-- * not as simple as once thought, due to the possibility of glitches
-- * from the order that the CON and DAT registers are set in.
-- *
-- * The three states the pin can be are {IN,OUT,SFN} which gives us 9
-- * combinations of changes to check. Three of these, if the pin stays
-- * in the same configuration can be discounted. This leaves us with
-- * the following:
-- *
-- * { IN => OUT }  Change DAT first
-- * { IN => SFN }  Change CON first
-- * { OUT => SFN } Change CON first, so new data will not glitch
-- * { OUT => IN }  Change CON first, so new data will not glitch
-- * { SFN => IN }  Change CON first
-- * { SFN => OUT } Change DAT first, so new data will not glitch [1]
-- *
-- * We do not currently deal with the UP registers as these control
-- * weak resistors, so a small delay in change should not need to bring
-- * these into the calculations.
-- *
-- * [1] this assumes that writing to a pin DAT whilst in SFN will set the
-- *     state for when it is next output.
-- */
--
--static void s3c2410_pm_restore_gpio(int index, struct gpio_sleep *gps)
--{
--	void __iomem *base = gps->base;
--	unsigned long gps_gpcon = gps->gpcon;
--	unsigned long gps_gpdat = gps->gpdat;
--	unsigned long old_gpcon;
--	unsigned long old_gpdat;
--	unsigned long old_gpup = 0x0;
--	unsigned long gpcon;
--	int nr;
--
--	old_gpcon = __raw_readl(base + OFFS_CON);
--	old_gpdat = __raw_readl(base + OFFS_DAT);
--
--	if (base == S3C2410_GPACON) {
--		/* GPACON only has one bit per control / data and no PULLUPs.
--		 * GPACON[x] = 0 => Output, 1 => SFN */
--
--		/* first set all SFN bits to SFN */
--
--		gpcon = old_gpcon | gps->gpcon;
--		__raw_writel(gpcon, base + OFFS_CON);
--
--		/* now set all the other bits */
--
--		__raw_writel(gps_gpdat, base + OFFS_DAT);
--		__raw_writel(gps_gpcon, base + OFFS_CON);
--	} else {
--		unsigned long old, new, mask;
--		unsigned long change_mask = 0x0;
--
--		old_gpup = __raw_readl(base + OFFS_UP);
--
--		/* Create a change_mask of all the items that need to have
--		 * their CON value changed before their DAT value, so that
--		 * we minimise the work between the two settings.
--		 */
--
--		for (nr = 0, mask = 0x03; nr < 32; nr += 2, mask <<= 2) {
--			old = (old_gpcon & mask) >> nr;
--			new = (gps_gpcon & mask) >> nr;
--
--			/* If there is no change, then skip */
--
--			if (old == new)
--				continue;
--
--			/* If both are special function, then skip */
--
--			if (is_sfn(old) && is_sfn(new))
--				continue;
--
--			/* Change is IN => OUT, do not change now */
--
--			if (is_in(old) && is_out(new))
--				continue;
--
--			/* Change is SFN => OUT, do not change now */
--
--			if (is_sfn(old) && is_out(new))
--				continue;
--
--			/* We should now be at the case of IN=>SFN,
--			 * OUT=>SFN, OUT=>IN, SFN=>IN. */
--
--			change_mask |= mask;
--		}
--
--		/* Write the new CON settings */
--
--		gpcon = old_gpcon & ~change_mask;
--		gpcon |= gps_gpcon & change_mask;
--
--		__raw_writel(gpcon, base + OFFS_CON);
--
--		/* Now change any items that require DAT,CON */
--
--		__raw_writel(gps_gpdat, base + OFFS_DAT);
--		__raw_writel(gps_gpcon, base + OFFS_CON);
--		__raw_writel(gps->gpup, base + OFFS_UP);
--	}
--
--	S3C_PMDBG("GPIO[%d] CON %08lx => %08lx, DAT %08lx => %08lx\n",
--		  index, old_gpcon, gps_gpcon, old_gpdat, gps_gpdat);
--}
--
--
--/** s3c2410_pm_restore_gpios()
-- *
-- * Restore the state of the GPIOs
-- */
--
--void s3c_pm_restore_gpios(void)
--{
--	struct gpio_sleep *gps = gpio_save;
--	int gpio;
--
--	for (gpio = 0; gpio < ARRAY_SIZE(gpio_save); gpio++, gps++) {
--		s3c2410_pm_restore_gpio(gpio, gps);
--	}
--}
- 
- void s3c_pm_restore_core(void)
- {
---- a/drivers/mmc/host/Kconfig
-+++ b/drivers/mmc/host/Kconfig
-@@ -37,13 +37,6 @@ config MMC_SDHCI
- 
- 	  If unsure, say N.
- 
--config MMC_SDHCI_IO_ACCESSORS
--	bool
--	depends on MMC_SDHCI
--	help
--	  This is silent Kconfig symbol that is selected by the drivers that
--	  need to overwrite SDHCI IO memory accessors.
--
- config MMC_SDHCI_PCI
- 	tristate "SDHCI support on PCI bus"
- 	depends on MMC_SDHCI && PCI
-@@ -55,6 +48,18 @@ config MMC_SDHCI_PCI
- 
- 	  If unsure, say N.
- 
-+config MMC_SDHCI_S3C
-+	tristate "SDHCI support on Samsung S3C SoC"
-+	depends on MMC_SDHCI && PLAT_S3C24XX
-+	help
-+	  This selects the Secure Digital Host Controller Interface (SDHCI)
-+	  often referrered to as the HSMMC block in some of the Samsung S3C
-+	  range of SoC.
-+
-+	  If you have a controller with this interface, say Y or M here.
-+
-+	  If unsure, say N.
-+
- config MMC_RICOH_MMC
- 	tristate "Ricoh MMC Controller Disabler  (EXPERIMENTAL)"
- 	depends on MMC_SDHCI_PCI
-@@ -72,17 +77,6 @@ config MMC_RICOH_MMC
- 
- 	  If unsure, say Y.
- 
--config MMC_SDHCI_OF
--	tristate "SDHCI support on OpenFirmware platforms"
--	depends on MMC_SDHCI && PPC_OF
--	select MMC_SDHCI_IO_ACCESSORS
--	help
--	  This selects the OF support for Secure Digital Host Controller
--	  Interfaces. So far, only the Freescale eSDHC controller is known
--	  to exist on OF platforms.
--
--	  If unsure, say N.
--
- config MMC_OMAP
- 	tristate "TI OMAP Multimedia Card Interface support"
- 	depends on ARCH_OMAP
-@@ -163,16 +157,6 @@ config MMC_IMX
- 
- 	  If unsure, say N.
- 
--config MMC_MXC
--	tristate "Freescale i.MX2/3 Multimedia Card Interface support"
--	depends on ARCH_MXC
--	help
--	  This selects the Freescale i.MX2/3 Multimedia card Interface.
--	  If you have a i.MX platform with a Multimedia Card slot,
--	  say Y or M here.
--
--	  If unsure, say N.
--
- config MMC_TIFM_SD
- 	tristate "TI Flash Media MMC/SD Interface support  (EXPERIMENTAL)"
- 	depends on EXPERIMENTAL && PCI
---- a/drivers/mmc/host/Makefile
-+++ b/drivers/mmc/host/Makefile
-@@ -9,11 +9,10 @@ endif
- obj-$(CONFIG_MMC_ARMMMCI)	+= mmci.o
- obj-$(CONFIG_MMC_PXA)		+= pxamci.o
- obj-$(CONFIG_MMC_IMX)		+= imxmmc.o
--obj-$(CONFIG_MMC_MXC)		+= mxcmmc.o
- obj-$(CONFIG_MMC_SDHCI)		+= sdhci.o
- obj-$(CONFIG_MMC_SDHCI_PCI)	+= sdhci-pci.o
-+obj-$(CONFIG_MMC_SDHCI_S3C)	+= sdhci-s3c.o
- obj-$(CONFIG_MMC_RICOH_MMC)	+= ricoh_mmc.o
--obj-$(CONFIG_MMC_SDHCI_OF)	+= sdhci-of.o
- obj-$(CONFIG_MMC_WBSD)		+= wbsd.o
- obj-$(CONFIG_MMC_AU1X)		+= au1xmmc.o
- obj-$(CONFIG_MMC_OMAP)		+= omap.o
-@@ -21,7 +20,6 @@ obj-$(CONFIG_MMC_OMAP_HS)	+= omap_hsmmc.
- obj-$(CONFIG_MMC_AT91)		+= at91_mci.o
- obj-$(CONFIG_MMC_ATMELMCI)	+= atmel-mci.o
- obj-$(CONFIG_MMC_TIFM_SD)	+= tifm_sd.o
--obj-$(CONFIG_MMC_MVSDIO)	+= mvsdio.o
- obj-$(CONFIG_MMC_SPI)		+= mmc_spi.o
- ifeq ($(CONFIG_OF),y)
- obj-$(CONFIG_MMC_SPI)		+= of_mmc_spi.o
---- a/drivers/mmc/host/s3cmci.c
-+++ b/drivers/mmc/host/s3cmci.c
-@@ -2,6 +2,7 @@
-  *  linux/drivers/mmc/s3cmci.h - Samsung S3C MCI driver
-  *
-  *  Copyright (C) 2004-2006 maintech GmbH, Thomas Kleffel <tk@maintech.de>
-+ *  Copyright (C) 2007 Harald Welte <laforge@gnumonks.org>
-  *
-  * Current driver maintained by Ben Dooks and Simtec Electronics
-  *  Copyright (C) 2008 Simtec Electronics <ben-linux@fluff.org>
-@@ -24,9 +25,18 @@
- 
- #include <mach/regs-sdi.h>
- #include <mach/regs-gpio.h>
-+#include <mach/hardware.h>
- 
- #include <plat/mci.h>
- 
-+#include <asm/dma.h>
-+#include <asm/dma-mapping.h>
-+
-+#include <asm/io.h>
-+#include <mach/regs-gpio.h>
-+#include <mach/mci.h>
-+#include <mach/dma.h>
-+
- #include "s3cmci.h"
- 
- #define DRIVER_NAME "s3c-mci"
-@@ -47,6 +57,9 @@ static const int dbgmap_err   = dbg_fail
- static const int dbgmap_info  = dbg_info | dbg_conf;
- static const int dbgmap_debug = dbg_err | dbg_debug;
- 
-+static int f_max = -1; /* override maximum frequency limit */
-+static int persist; /* keep interface alive across suspend/resume */
-+
- #define dbg(host, channels, args...)		  \
- 	do {					  \
- 	if (dbgmap_err & channels) 		  \
-@@ -280,8 +293,11 @@ static void do_pio_read(struct s3cmci_ho
- 		 * an even multiple of 4. */
- 		if (fifo >= host->pio_bytes)
- 			fifo = host->pio_bytes;
--		else
-+		else {
- 			fifo -= fifo & 3;
-+			if (!fifo)
-+				break;
-+		}
- 
- 		host->pio_bytes -= fifo;
- 		host->pio_count += fifo;
-@@ -329,7 +345,7 @@ static void do_pio_write(struct s3cmci_h
- 
- 	to_ptr = host->base + host->sdidata;
- 
--	while ((fifo = fifo_free(host)) > 3) {
-+	while ((fifo = fifo_free(host))) {
- 		if (!host->pio_bytes) {
- 			res = get_data_buffer(host, &host->pio_bytes,
- 							&host->pio_ptr);
-@@ -353,8 +369,11 @@ static void do_pio_write(struct s3cmci_h
- 		 * words, so round down to an even multiple of 4. */
- 		if (fifo >= host->pio_bytes)
- 			fifo = host->pio_bytes;
--		else
-+		else {
- 			fifo -= fifo & 3;
-+			if (!fifo)
-+				break;
-+		}
- 
- 		host->pio_bytes -= fifo;
- 		host->pio_count += fifo;
-@@ -373,7 +392,6 @@ static void pio_tasklet(unsigned long da
- {
- 	struct s3cmci_host *host = (struct s3cmci_host *) data;
- 
--
- 	disable_irq(host->irq);
- 
- 	if (host->pio_active == XFER_WRITE)
-@@ -614,7 +632,6 @@ irq_out:
- 
- 	spin_unlock_irqrestore(&host->complete_lock, iflags);
- 	return IRQ_HANDLED;
--
- }
- 
- /*
-@@ -789,11 +806,11 @@ static void s3cmci_dma_setup(struct s3cm
- 
- 	last_source = source;
- 
--	s3c2410_dma_devconfig(host->dma, source, 3,
-+	s3c2410_dma_devconfig(host->dma, source,
- 			      host->mem->start + host->sdidata);
- 
- 	if (!setup_ok) {
--		s3c2410_dma_config(host->dma, 4, 0);
-+		s3c2410_dma_config(host->dma, 4);
- 		s3c2410_dma_set_buffdone_fn(host->dma,
- 					    s3cmci_dma_done_callback);
- 		s3c2410_dma_setflags(host->dma, S3C2410_DMAF_AUTOSTART);
-@@ -1026,6 +1043,7 @@ static void s3cmci_send_request(struct m
- 			dbg(host, dbg_err, "data prepare error %d\n", res);
- 			cmd->error = res;
- 			cmd->data->error = res;
-+			cmd->data->error = -EIO;
- 
- 			mmc_request_done(mmc, mrq);
- 			return;
-@@ -1263,10 +1281,8 @@ static int __devinit s3cmci_probe(struct
- 	host->is2440	= is2440;
- 
- 	host->pdata = pdev->dev.platform_data;
--	if (!host->pdata) {
--		pdev->dev.platform_data = &s3cmci_def_pdata;
-+	if (!host->pdata)
- 		host->pdata = &s3cmci_def_pdata;
--	}
- 
- 	spin_lock_init(&host->complete_lock);
- 	tasklet_init(&host->pio_tasklet, pio_tasklet, (unsigned long) host);
-@@ -1379,6 +1395,18 @@ static int __devinit s3cmci_probe(struct
- 	mmc->f_min 	= host->clk_rate / (host->clk_div * 256);
- 	mmc->f_max 	= host->clk_rate / host->clk_div;
- 
-+	if (f_max >= 0) {
-+		unsigned f = f_max;
-+
-+		if (f < mmc->f_min)
-+			f = mmc->f_min;
-+		if (mmc->f_max > f) {
-+			dev_info(&pdev->dev, "f_max lowered from %u to %u Hz\n",
-+			    mmc->f_max, f);
-+			mmc->f_max = f;
-+		}
-+	}
-+
- 	if (host->pdata->ocr_avail)
- 		mmc->ocr_avail = host->pdata->ocr_avail;
- 
-@@ -1491,18 +1519,60 @@ static int __devinit s3cmci_2440_probe(s
- 
- #ifdef CONFIG_PM
- 
-+static int save_regs(struct mmc_host *mmc)
-+{
-+	struct s3cmci_host *host = mmc_priv(mmc);
-+	unsigned long flags;
-+	unsigned from;
-+	u32 *to = host->saved;
-+
-+	mmc_flush_scheduled_work();
-+
-+	local_irq_save(flags);
-+	for (from = S3C2410_SDICON; from != S3C2410_SDIIMSK+4; from += 4)
-+		if (from != host->sdidata)
-+			*to++ = readl(host->base + from);
-+	BUG_ON(to-host->saved != ARRAY_SIZE(host->saved));
-+	local_irq_restore(flags);
-+
-+	return 0;
-+}
-+
-+static int restore_regs(struct mmc_host *mmc)
-+{
-+	struct s3cmci_host *host = mmc_priv(mmc);
-+	unsigned long flags;
-+	unsigned to;
-+	u32 *from = host->saved;
-+
-+	/*
-+	 * Before we begin with the necromancy, make sure we don't
-+	 * inadvertently start something we'll regret microseconds later.
-+	 */
-+	from[S3C2410_SDICMDCON - S3C2410_SDICON] = 0;
-+
-+	local_irq_save(flags);
-+	for (to = S3C2410_SDICON; to != S3C2410_SDIIMSK+4; to += 4)
-+		if (to != host->sdidata)
-+			writel(*from++, host->base + to);
-+	BUG_ON(from-host->saved != ARRAY_SIZE(host->saved));
-+	local_irq_restore(flags);
-+
-+	return 0;
-+}
-+
- static int s3cmci_suspend(struct platform_device *dev, pm_message_t state)
- {
- 	struct mmc_host *mmc = platform_get_drvdata(dev);
- 
--	return  mmc_suspend_host(mmc, state);
-+	return persist ? save_regs(mmc) : mmc_suspend_host(mmc, state);
- }
- 
- static int s3cmci_resume(struct platform_device *dev)
- {
- 	struct mmc_host *mmc = platform_get_drvdata(dev);
- 
--	return mmc_resume_host(mmc);
-+	return persist ? restore_regs(mmc) : mmc_resume_host(mmc);
- }
- 
- #else /* CONFIG_PM */
-@@ -1560,9 +1630,13 @@ static void __exit s3cmci_exit(void)
- module_init(s3cmci_init);
- module_exit(s3cmci_exit);
- 
-+module_param(f_max, int, 0644);
-+module_param(persist, int, 0644);
-+
- MODULE_DESCRIPTION("Samsung S3C MMC/SD Card Interface driver");
- MODULE_LICENSE("GPL v2");
- MODULE_AUTHOR("Thomas Kleffel <tk@maintech.de>, Ben Dooks <ben-linux@fluff.org>");
- MODULE_ALIAS("platform:s3c2410-sdi");
- MODULE_ALIAS("platform:s3c2412-sdi");
- MODULE_ALIAS("platform:s3c2440-sdi");
-+
---- a/drivers/mmc/host/s3cmci.h
-+++ b/drivers/mmc/host/s3cmci.h
-@@ -8,6 +8,10 @@
-  * published by the Free Software Foundation.
-  */
- 
-+
-+#include <mach/regs-sdi.h>
-+#include <linux/regulator/consumer.h>
-+
- /* FIXME: DMA Resource management ?! */
- #define S3CMCI_DMA 0
- 
-@@ -68,7 +72,16 @@ struct s3cmci_host {
- 	unsigned int		ccnt, dcnt;
- 	struct tasklet_struct	pio_tasklet;
- 
-+	/*
-+	 * Here's where we save the registers during suspend. Note that we skip
-+	 * SDIDATA, which is at different positions on 2410 and 2440, so
-+	 * there's no "+1" in the array size.
-+	 */
-+	u32			saved[(S3C2410_SDIIMSK-S3C2410_SDICON)/4];
-+
- #ifdef CONFIG_CPU_FREQ
- 	struct notifier_block	freq_transition;
- #endif
-+
-+	struct regulator *regulator;
- };
---- /dev/null
-+++ b/drivers/mmc/host/sdhci-s3c.c
-@@ -0,0 +1,419 @@
-+/* linux/drivers/mmc/host/sdhci-s3c.c
-+ *
-+ * Copyright 2008 Openmoko Inc.
-+ * Copyright 2008 Simtec Electronics
-+ *      Ben Dooks <ben@simtec.co.uk>
-+ *      http://armlinux.simtec.co.uk/
-+ *
-+ * SDHCI (HSMMC) support for Samsung SoC
-+ *
-+ * 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.
-+ */
-+
-+#include <linux/delay.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/platform_device.h>
-+#include <linux/clk.h>
-+#include <linux/io.h>
-+
-+#include <linux/mmc/host.h>
-+
-+#include <plat/regs-sdhci.h>
-+#include <plat/sdhci.h>
-+
-+#include "sdhci.h"
-+
-+#define MAX_BUS_CLK	(4)
-+
-+struct sdhci_s3c {
-+	struct sdhci_host	*host;
-+	struct platform_device	*pdev;
-+	struct resource		*ioarea;
-+	struct s3c_sdhci_platdata *pdata;
-+	unsigned int		cur_clk;
-+
-+	struct clk		*clk_io;	/* clock for io bus */
-+	struct clk		*clk_bus[MAX_BUS_CLK];
-+};
-+
-+static inline struct sdhci_s3c *to_s3c(struct sdhci_host *host)
-+{
-+	return sdhci_priv(host);
-+}
-+
-+static u32 get_curclk(u32 ctrl2)
-+{
-+	ctrl2 &= S3C_SDHCI_CTRL2_SELBASECLK_MASK;
-+	ctrl2 >>= S3C_SDHCI_CTRL2_SELBASECLK_SHIFT;
-+
-+	return ctrl2;
-+}
-+
-+static void sdhci_s3c_check_sclk(struct sdhci_host *host)
-+{
-+	struct sdhci_s3c *ourhost = to_s3c(host);
-+	u32 tmp = readl(host->ioaddr + S3C_SDHCI_CONTROL2);
-+
-+	if (get_curclk(tmp) != ourhost->cur_clk) {
-+		dev_dbg(&ourhost->pdev->dev, "restored ctrl2 clock setting\n");
-+
-+		tmp &= ~S3C_SDHCI_CTRL2_SELBASECLK_MASK;
-+		tmp |= ourhost->cur_clk << S3C_SDHCI_CTRL2_SELBASECLK_SHIFT;
-+		writel(tmp, host->ioaddr + 0x80);
-+	}
-+}
-+
-+static unsigned int sdhci_s3c_get_max_clk(struct sdhci_host *host)
-+{
-+	struct sdhci_s3c *ourhost = to_s3c(host);
-+	struct clk *busclk;
-+	unsigned int rate, max;
-+	int clk;
-+
-+	/* note, a reset will reset the clock source */
-+
-+	sdhci_s3c_check_sclk(host);
-+
-+	for (max = 0, clk = 0; clk < MAX_BUS_CLK; clk++) {
-+		busclk = ourhost->clk_bus[clk];
-+		if (!busclk)
-+			continue;
-+
-+		rate = clk_get_rate(busclk);
-+		if (rate > max)
-+			max = rate;
-+	}
-+
-+	return max;
-+}
-+
-+static unsigned int sdhci_s3c_get_timeout_clk(struct sdhci_host *host)
-+{
-+	return sdhci_s3c_get_max_clk(host) / 1000000;
-+}
-+
-+static void sdhci_s3c_set_ios(struct sdhci_host *host,
-+			      struct mmc_ios *ios)
-+{
-+	struct sdhci_s3c *ourhost = to_s3c(host);
-+	struct s3c_sdhci_platdata *pdata = ourhost->pdata;
-+	int width;
-+
-+	sdhci_s3c_check_sclk(host);
-+
-+	if (ios->power_mode != MMC_POWER_OFF) {
-+		switch (ios->bus_width) {
-+		case MMC_BUS_WIDTH_4:
-+			width = 4;
-+			break;
-+		case MMC_BUS_WIDTH_1:
-+			width = 1;
-+			break;
-+		default:
-+			BUG();
-+		}
-+
-+		if (pdata->cfg_gpio)
-+			pdata->cfg_gpio(ourhost->pdev, width);
-+	}
-+
-+	if (pdata->cfg_card)
-+		pdata->cfg_card(ourhost->pdev, host->ioaddr,
-+				ios, host->mmc->card);
-+}
-+
-+static unsigned int sdhci_s3c_consider_clock(struct sdhci_s3c *ourhost,
-+					     unsigned int src,
-+					     unsigned int wanted)
-+{
-+	unsigned long rate;
-+	struct clk *clksrc = ourhost->clk_bus[src];
-+	int div;
-+
-+	if (!clksrc)
-+		return UINT_MAX;
-+
-+	rate = clk_get_rate(clksrc);
-+
-+	for (div = 1; div < 256; div *= 2) {
-+		if ((rate / div) <= wanted)
-+			break;
-+	}
-+
-+	dev_dbg(&ourhost->pdev->dev, "clk %d: rate %ld, want %d, got %ld\n",
-+		src, rate, wanted, rate / div);
-+
-+	return (wanted - (rate / div));
-+}
-+
-+static void sdhci_s3c_change_clock(struct sdhci_host *host, unsigned int clock)
-+{
-+	struct sdhci_s3c *ourhost = to_s3c(host);
-+	unsigned int best = UINT_MAX;
-+	unsigned int delta;
-+	int best_src = 0;
-+	int src;
-+	u32 ctrl;
-+
-+	for (src = 0; src < MAX_BUS_CLK; src++) {
-+		delta = sdhci_s3c_consider_clock(ourhost, src, clock);
-+		if (delta < best) {
-+			best = delta;
-+			best_src = src;
-+		}
-+	}
-+
-+	dev_dbg(&ourhost->pdev->dev,
-+		"selected source %d, clock %d, delta %d\n",
-+		 best_src, clock, best);
-+
-+	/* turn clock off to card before changing clock source */
-+	writew(0, host->ioaddr + SDHCI_CLOCK_CONTROL);
-+
-+	/* select the new clock source */
-+
-+	if (ourhost->cur_clk != best_src) {
-+		struct clk *clk = ourhost->clk_bus[best_src];
-+
-+		ourhost->cur_clk = best_src;
-+		host->max_clk = clk_get_rate(clk);
-+		host->timeout_clk = host->max_clk / 1000000;
-+
-+		ctrl = readl(host->ioaddr + S3C_SDHCI_CONTROL2);
-+		ctrl &= ~S3C_SDHCI_CTRL2_SELBASECLK_MASK;
-+		ctrl |= best_src << S3C_SDHCI_CTRL2_SELBASECLK_SHIFT;
-+		writel(ctrl, host->ioaddr + S3C_SDHCI_CONTROL2);
-+	}
-+
-+	sdhci_change_clock(host, clock);
-+}
-+
-+static struct sdhci_ops sdhci_s3c_ops = {
-+	.get_max_clock		= sdhci_s3c_get_max_clk,
-+	.get_timeout_clock	= sdhci_s3c_get_timeout_clk,
-+	.change_clock		= sdhci_s3c_change_clock,
-+	.set_ios		= sdhci_s3c_set_ios,
-+};
-+
-+/*
-+ * call this when you need sd stack to recognize insertion or removal of card
-+ * that can't be told by SDHCI regs
-+ */
-+
-+void sdhci_s3c_force_presence_change(struct platform_device *pdev)
-+{
-+	struct s3c_sdhci_platdata *pdata = pdev->dev.platform_data;
-+
-+	dev_info(&pdev->dev, "sdhci_s3c_force_presence_change called\n");
-+	mmc_detect_change(pdata->sdhci_host->mmc, msecs_to_jiffies(200));
-+}
-+EXPORT_SYMBOL_GPL(sdhci_s3c_force_presence_change);
-+
-+
-+static int __devinit sdhci_s3c_probe(struct platform_device *pdev)
-+{
-+	struct s3c_sdhci_platdata *pdata = pdev->dev.platform_data;
-+	struct device *dev = &pdev->dev;
-+	struct sdhci_host *host;
-+	struct sdhci_s3c *sc;
-+	struct resource *res;
-+	int ret, irq, ptr, clks;
-+
-+	if (!pdata) {
-+		dev_err(dev, "no device data specified\n");
-+		return -ENOENT;
-+	}
-+
-+	irq = platform_get_irq(pdev, 0);
-+	if (irq < 0) {
-+		dev_err(dev, "no irq specified\n");
-+		return irq;
-+	}
-+
-+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if (!res) {
-+		dev_err(dev, "no memory specified\n");
-+		return -ENOENT;
-+	}
-+
-+	host = sdhci_alloc_host(dev, sizeof(struct sdhci_s3c));
-+	if (IS_ERR(host)) {
-+		dev_err(dev, "sdhci_alloc_host() failed\n");
-+		return PTR_ERR(host);
-+	}
-+
-+	pdata->sdhci_host = host;
-+
-+	sc = sdhci_priv(host);
-+
-+	sc->host = host;
-+	sc->pdev = pdev;
-+	sc->pdata = pdata;
-+
-+	platform_set_drvdata(pdev, host);
-+
-+	sc->clk_io = clk_get(dev, "hsmmc");
-+	if (IS_ERR(sc->clk_io)) {
-+		dev_err(dev, "failed to get io clock\n");
-+		ret = PTR_ERR(sc->clk_io);
-+		goto err_io_clk;
-+	}
-+
-+	/* enable the local io clock and keep it running for the moment. */
-+	clk_enable(sc->clk_io);
-+
-+	for (clks = 0, ptr = 0; ptr < MAX_BUS_CLK; ptr++) {
-+		struct clk *clk;
-+		char *name = pdata->clocks[ptr];
-+
-+		if (name == NULL)
-+			continue;
-+
-+		clk = clk_get(dev, name);
-+		if (IS_ERR(clk)) {
-+			dev_err(dev, "failed to get clock %s\n", name);
-+			continue;
-+		}
-+
-+		clks++;
-+		sc->clk_bus[ptr] = clk;
-+		clk_enable(clk);
-+
-+		dev_info(dev, "clock source %d: %s (%ld Hz)\n",
-+			 ptr, name, clk_get_rate(clk));
-+	}
-+
-+	if (clks == 0) {
-+		dev_err(dev, "failed to find any bus clocks\n");
-+		ret = -ENOENT;
-+		goto err_no_busclks;
-+	}
-+
-+	sc->ioarea = request_mem_region(res->start, resource_size(res),
-+					mmc_hostname(host->mmc));
-+	if (!sc->ioarea) {
-+		dev_err(dev, "failed to reserve register area\n");
-+		ret = -ENXIO;
-+		goto err_req_regs;
-+	}
-+
-+	host->ioaddr = ioremap_nocache(res->start, resource_size(res));
-+	if (!host->ioaddr) {
-+		dev_err(dev, "failed to map registers\n");
-+		ret = -ENXIO;
-+		goto err_req_regs;
-+	}
-+
-+	/* Ensure we have minimal gpio selected CMD/CLK/Detect */
-+	if (pdata->cfg_gpio)
-+		pdata->cfg_gpio(pdev, 0);
-+
-+	sdhci_s3c_check_sclk(host);
-+
-+	host->hw_name = "samsung-hsmmc";
-+	host->ops = &sdhci_s3c_ops;
-+	host->quirks = 0;
-+	host->irq = irq;
-+
-+	/* Setup quirks for the controller */
-+
-+	/* Currently with ADMA enabled we are getting some length
-+	 * interrupts that are not being dealt with, do disable
-+	 * ADMA until this is sorted out. */
-+	host->quirks |= SDHCI_QUIRK_BROKEN_ADMA;
-+	host->quirks |= SDHCI_QUIRK_32BIT_ADMA_SIZE;
-+
-+	/* It seems we do not get an DATA transfer complete on non-busy
-+	 * transfers, not sure if this is a problem with this specific
-+	 * SDHCI block, or a missing configuration that needs to be set. */
-+	host->quirks |= SDHCI_QUIRK_NO_TCIRQ_ON_NOT_BUSY;
-+
-+	host->quirks |= (SDHCI_QUIRK_32BIT_DMA_ADDR |
-+			 SDHCI_QUIRK_32BIT_DMA_SIZE);
-+
-+	ret = sdhci_add_host(host);
-+	if (ret) {
-+		dev_err(dev, "sdhci_add_host() failed\n");
-+		goto err_add_host;
-+	}
-+
-+	return 0;
-+
-+ err_add_host:
-+	release_resource(sc->ioarea);
-+	kfree(sc->ioarea);
-+
-+ err_req_regs:
-+	for (ptr = 0; ptr < MAX_BUS_CLK; ptr++) {
-+		clk_disable(sc->clk_bus[ptr]);
-+		clk_put(sc->clk_bus[ptr]);
-+	}
-+
-+ err_no_busclks:
-+	clk_disable(sc->clk_io);
-+	clk_put(sc->clk_io);
-+
-+ err_io_clk:
-+	sdhci_free_host(host);
-+
-+	return ret;
-+}
-+
-+static int __devexit sdhci_s3c_remove(struct platform_device *pdev)
-+{
-+	return 0;
-+}
-+
-+#ifdef CONFIG_PM
-+
-+static int sdhci_s3c_suspend(struct platform_device *dev, pm_message_t pm)
-+{
-+	struct sdhci_host *host = platform_get_drvdata(dev);
-+
-+	sdhci_suspend_host(host, pm);
-+	return 0;
-+}
-+
-+static int sdhci_s3c_resume(struct platform_device *dev)
-+{
-+	struct sdhci_host *host = platform_get_drvdata(dev);
-+
-+	sdhci_resume_host(host);
-+	return 0;
-+}
-+
-+#else
-+#define sdhci_s3c_suspend NULL
-+#define sdhci_s3c_resume NULL
-+#endif
-+
-+static struct platform_driver sdhci_s3c_driver = {
-+	.probe		= sdhci_s3c_probe,
-+	.remove		= __devexit_p(sdhci_s3c_remove),
-+	.suspend	= sdhci_s3c_suspend,
-+	.resume	        = sdhci_s3c_resume,
-+	.driver		= {
-+		.owner	= THIS_MODULE,
-+		.name	= "s3c-sdhci",
-+	},
-+};
-+
-+static int __init sdhci_s3c_init(void)
-+{
-+	return platform_driver_register(&sdhci_s3c_driver);
-+}
-+
-+static void __exit sdhci_s3c_exit(void)
-+{
-+	platform_driver_unregister(&sdhci_s3c_driver);
-+}
-+
-+module_init(sdhci_s3c_init);
-+module_exit(sdhci_s3c_exit);
-+
-+MODULE_DESCRIPTION("Samsung SDHCI (HSMMC) glue");
-+MODULE_AUTHOR("Ben Dooks, <ben@simtec.co.uk>");
-+MODULE_LICENSE("GPL v2");
-+MODULE_ALIAS("platform:s3c-sdhci");
---- a/drivers/mtd/nand/s3c2410.c
-+++ b/drivers/mtd/nand/s3c2410.c
-@@ -438,7 +438,7 @@ static int s3c2410_nand_correct_data(str
- 	if ((diff0 & ~(1<<fls(diff0))) == 0)
- 		return 1;
- 
--	return -1;
-+	return -EBADMSG;
- }
- 
- /* ECC functions
-@@ -530,7 +530,12 @@ static void s3c2410_nand_read_buf(struct
- static void s3c2440_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
- {
- 	struct s3c2410_nand_info *info = s3c2410_nand_mtd_toinfo(mtd);
-+	u8 *ptr = buf + (len & ~3);
-+	int i;
-+
- 	readsl(info->regs + S3C2440_NFDATA, buf, len / 4);
-+	for (i = 0; i != (len & 3); i++)
-+		ptr[i] = readb(info->regs + S3C2440_NFDATA);
- }
- 
- static void s3c2410_nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len)
-@@ -645,17 +650,31 @@ static int s3c2410_nand_remove(struct pl
- }
- 
- #ifdef CONFIG_MTD_PARTITIONS
-+const char *part_probes[] = { "cmdlinepart", NULL };
- static int s3c2410_nand_add_partition(struct s3c2410_nand_info *info,
- 				      struct s3c2410_nand_mtd *mtd,
- 				      struct s3c2410_nand_set *set)
- {
-+	struct mtd_partition *part_info;
-+	int nr_part = 0;
-+
- 	if (set == NULL)
- 		return add_mtd_device(&mtd->mtd);
- 
--	if (set->nr_partitions > 0 && set->partitions != NULL) {
--		return add_mtd_partitions(&mtd->mtd, set->partitions, set->nr_partitions);
-+	if (set->nr_partitions == 0) {
-+		mtd->mtd.name = set->name;
-+		nr_part = parse_mtd_partitions(&mtd->mtd, part_probes,
-+						&part_info, 0);
-+	} else {
-+		if (set->nr_partitions > 0 && set->partitions != NULL) {
-+			nr_part = set->nr_partitions;
-+			part_info = set->partitions;
-+		}
- 	}
- 
-+	if (nr_part > 0 && part_info)
-+		return add_mtd_partitions(&mtd->mtd, part_info, nr_part);
-+
- 	return add_mtd_device(&mtd->mtd);
- }
- #else
-@@ -684,9 +703,13 @@ static void s3c2410_nand_init_chip(struc
- 	chip->select_chip  = s3c2410_nand_select_chip;
- 	chip->chip_delay   = 50;
- 	chip->priv	   = nmtd;
--	chip->options	   = 0;
- 	chip->controller   = &info->controller;
- 
-+	if (set->flags & S3C2410_NAND_BBT)
-+		chip->options	   = NAND_USE_FLASH_BBT;
-+	else
-+		chip->options	   = 0;
-+
- 	switch (info->cpu_type) {
- 	case TYPE_S3C2410:
- 		chip->IO_ADDR_W = regs + S3C2410_NFDATA;
-@@ -726,7 +749,7 @@ static void s3c2410_nand_init_chip(struc
- 	nmtd->mtd.owner    = THIS_MODULE;
- 	nmtd->set	   = set;
- 
--	if (hardware_ecc) {
-+	if (!info->platform->software_ecc && hardware_ecc) {
- 		chip->ecc.calculate = s3c2410_nand_calculate_ecc;
- 		chip->ecc.correct   = s3c2410_nand_correct_data;
- 		chip->ecc.mode	    = NAND_ECC_HW;
---- a/drivers/mmc/core/core.c
-+++ b/drivers/mmc/core/core.c
-@@ -59,10 +59,11 @@ static int mmc_schedule_delayed_work(str
- /*
-  * Internal function. Flush all scheduled work from the MMC work queue.
-  */
--static void mmc_flush_scheduled_work(void)
-+void mmc_flush_scheduled_work(void)
- {
- 	flush_workqueue(workqueue);
- }
-+EXPORT_SYMBOL_GPL(mmc_flush_scheduled_work);
- 
- /**
-  *	mmc_request_done - finish processing an MMC request
diff --git a/target/linux/s3c24xx/patches-2.6.30/010-s3c-dma.patch b/target/linux/s3c24xx/patches-2.6.30/010-s3c-dma.patch
deleted file mode 100644
index e0ff7c442..000000000
--- a/target/linux/s3c24xx/patches-2.6.30/010-s3c-dma.patch
+++ /dev/null
@@ -1,1324 +0,0 @@
---- a/arch/arm/mach-s3c2410/include/mach/dma.h
-+++ b/arch/arm/mach-s3c2410/include/mach/dma.h
-@@ -3,7 +3,7 @@
-  * Copyright (C) 2003,2004,2006 Simtec Electronics
-  *	Ben Dooks <ben@simtec.co.uk>
-  *
-- * Samsung S3C241XX DMA support
-+ * Samsung S3C24XX DMA support
-  *
-  * 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
-@@ -13,8 +13,8 @@
- #ifndef __ASM_ARCH_DMA_H
- #define __ASM_ARCH_DMA_H __FILE__
- 
-+#include <plat/dma.h>
- #include <linux/sysdev.h>
--#include <mach/hardware.h>
- 
- #define MAX_DMA_TRANSFER_SIZE   0x100000 /* Data Unit is half word  */
- 
-@@ -55,9 +55,9 @@ enum dma_ch {
- 
- /* we have 4 dma channels */
- #ifndef CONFIG_CPU_S3C2443
--#define S3C2410_DMA_CHANNELS		(4)
-+#define S3C_DMA_CHANNELS		(4)
- #else
--#define S3C2410_DMA_CHANNELS		(6)
-+#define S3C_DMA_CHANNELS		(6)
- #endif
- 
- /* types */
-@@ -68,7 +68,6 @@ enum s3c2410_dma_state {
- 	S3C2410_DMA_PAUSED
- };
- 
--
- /* enum s3c2410_dma_loadst
-  *
-  * This represents the state of the DMA engine, wrt to the loaded / running
-@@ -104,32 +103,6 @@ enum s3c2410_dma_loadst {
- 	S3C2410_DMALOAD_1LOADED_1RUNNING,
- };
- 
--enum s3c2410_dma_buffresult {
--	S3C2410_RES_OK,
--	S3C2410_RES_ERR,
--	S3C2410_RES_ABORT
--};
--
--enum s3c2410_dmasrc {
--	S3C2410_DMASRC_HW,		/* source is memory */
--	S3C2410_DMASRC_MEM		/* source is hardware */
--};
--
--/* enum s3c2410_chan_op
-- *
-- * operation codes passed to the DMA code by the user, and also used
-- * to inform the current channel owner of any changes to the system state
--*/
--
--enum s3c2410_chan_op {
--	S3C2410_DMAOP_START,
--	S3C2410_DMAOP_STOP,
--	S3C2410_DMAOP_PAUSE,
--	S3C2410_DMAOP_RESUME,
--	S3C2410_DMAOP_FLUSH,
--	S3C2410_DMAOP_TIMEOUT,		/* internal signal to handler */
--	S3C2410_DMAOP_STARTED,		/* indicate channel started */
--};
- 
- /* flags */
- 
-@@ -137,19 +110,18 @@ enum s3c2410_chan_op {
- 					    * waiting for reloads */
- #define S3C2410_DMAF_AUTOSTART    (1<<1)   /* auto-start if buffer queued */
- 
-+#define S3C2410_DMAF_CIRCULAR	  (0x00)   /* circular enqueue not supp. */
-+
- /* dma buffer */
- 
--struct s3c2410_dma_client {
--	char                *name;
--};
-+struct s3c2410_dma_buf;
- 
--/* s3c2410_dma_buf_s
-+/* s3c2410_dma_buf
-  *
-  * internally used buffer structure to describe a queued or running
-  * buffer.
- */
- 
--struct s3c2410_dma_buf;
- struct s3c2410_dma_buf {
- 	struct s3c2410_dma_buf	*next;
- 	int			 magic;		/* magic */
-@@ -161,20 +133,6 @@ struct s3c2410_dma_buf {
- 
- /* [1] is this updated for both recv/send modes? */
- 
--struct s3c2410_dma_chan;
--
--/* s3c2410_dma_cbfn_t
-- *
-- * buffer callback routine type
--*/
--
--typedef void (*s3c2410_dma_cbfn_t)(struct s3c2410_dma_chan *,
--				   void *buf, int size,
--				   enum s3c2410_dma_buffresult result);
--
--typedef int  (*s3c2410_dma_opfn_t)(struct s3c2410_dma_chan *,
--				   enum s3c2410_chan_op );
--
- struct s3c2410_dma_stats {
- 	unsigned long		loads;
- 	unsigned long		timeout_longest;
-@@ -206,10 +164,10 @@ struct s3c2410_dma_chan {
- 
- 	/* channel configuration */
- 	enum s3c2410_dmasrc	 source;
-+	enum dma_ch		 req_ch;
- 	unsigned long		 dev_addr;
- 	unsigned long		 load_timeout;
- 	unsigned int		 flags;		/* channel flags */
--	unsigned int		 hw_cfg;	/* last hw config */
- 
- 	struct s3c24xx_dma_map	*map;		/* channel hw maps */
- 
-@@ -236,213 +194,12 @@ struct s3c2410_dma_chan {
- 	struct sys_device	dev;
- };
- 
--/* the currently allocated channel information */
--extern struct s3c2410_dma_chan s3c2410_chans[];
--
--/* note, we don't really use dma_device_t at the moment */
- typedef unsigned long dma_device_t;
- 
--/* functions --------------------------------------------------------------- */
--
--/* s3c2410_dma_request
-- *
-- * request a dma channel exclusivley
--*/
--
--extern int s3c2410_dma_request(unsigned int channel,
--			       struct s3c2410_dma_client *, void *dev);
--
--
--/* s3c2410_dma_ctrl
-- *
-- * change the state of the dma channel
--*/
--
--extern int s3c2410_dma_ctrl(unsigned int channel, enum s3c2410_chan_op op);
--
--/* s3c2410_dma_setflags
-- *
-- * set the channel's flags to a given state
--*/
--
--extern int s3c2410_dma_setflags(unsigned int channel,
--				unsigned int flags);
--
--/* s3c2410_dma_free
-- *
-- * free the dma channel (will also abort any outstanding operations)
--*/
--
--extern int s3c2410_dma_free(unsigned int channel, struct s3c2410_dma_client *);
--
--/* s3c2410_dma_enqueue
-- *
-- * place the given buffer onto the queue of operations for the channel.
-- * The buffer must be allocated from dma coherent memory, or the Dcache/WB
-- * drained before the buffer is given to the DMA system.
--*/
--
--extern int s3c2410_dma_enqueue(unsigned int channel, void *id,
--			       dma_addr_t data, int size);
--
--/* s3c2410_dma_config
-- *
-- * configure the dma channel
--*/
--
--extern int s3c2410_dma_config(unsigned int channel, int xferunit, int dcon);
--
--/* s3c2410_dma_devconfig
-- *
-- * configure the device we're talking to
--*/
--
--extern int s3c2410_dma_devconfig(int channel, enum s3c2410_dmasrc source,
--				 int hwcfg, unsigned long devaddr);
--
--/* s3c2410_dma_getposition
-- *
-- * get the position that the dma transfer is currently at
--*/
--
--extern int s3c2410_dma_getposition(unsigned int channel,
--				   dma_addr_t *src, dma_addr_t *dest);
--
--extern int s3c2410_dma_set_opfn(unsigned int, s3c2410_dma_opfn_t rtn);
--extern int s3c2410_dma_set_buffdone_fn(unsigned int, s3c2410_dma_cbfn_t rtn);
--
--/* DMA Register definitions */
--
--#define S3C2410_DMA_DISRC       (0x00)
--#define S3C2410_DMA_DISRCC      (0x04)
--#define S3C2410_DMA_DIDST       (0x08)
--#define S3C2410_DMA_DIDSTC      (0x0C)
--#define S3C2410_DMA_DCON        (0x10)
--#define S3C2410_DMA_DSTAT       (0x14)
--#define S3C2410_DMA_DCSRC       (0x18)
--#define S3C2410_DMA_DCDST       (0x1C)
--#define S3C2410_DMA_DMASKTRIG   (0x20)
--#define S3C2412_DMA_DMAREQSEL	(0x24)
--#define S3C2443_DMA_DMAREQSEL	(0x24)
--
--#define S3C2410_DISRCC_INC	(1<<0)
--#define S3C2410_DISRCC_APB	(1<<1)
--
--#define S3C2410_DMASKTRIG_STOP   (1<<2)
--#define S3C2410_DMASKTRIG_ON     (1<<1)
--#define S3C2410_DMASKTRIG_SWTRIG (1<<0)
--
--#define S3C2410_DCON_DEMAND     (0<<31)
--#define S3C2410_DCON_HANDSHAKE  (1<<31)
--#define S3C2410_DCON_SYNC_PCLK  (0<<30)
--#define S3C2410_DCON_SYNC_HCLK  (1<<30)
--
--#define S3C2410_DCON_INTREQ     (1<<29)
--
--#define S3C2410_DCON_CH0_XDREQ0	(0<<24)
--#define S3C2410_DCON_CH0_UART0	(1<<24)
--#define S3C2410_DCON_CH0_SDI	(2<<24)
--#define S3C2410_DCON_CH0_TIMER	(3<<24)
--#define S3C2410_DCON_CH0_USBEP1	(4<<24)
--
--#define S3C2410_DCON_CH1_XDREQ1	(0<<24)
--#define S3C2410_DCON_CH1_UART1	(1<<24)
--#define S3C2410_DCON_CH1_I2SSDI	(2<<24)
--#define S3C2410_DCON_CH1_SPI	(3<<24)
--#define S3C2410_DCON_CH1_USBEP2	(4<<24)
--
--#define S3C2410_DCON_CH2_I2SSDO	(0<<24)
--#define S3C2410_DCON_CH2_I2SSDI	(1<<24)
--#define S3C2410_DCON_CH2_SDI	(2<<24)
--#define S3C2410_DCON_CH2_TIMER	(3<<24)
--#define S3C2410_DCON_CH2_USBEP3	(4<<24)
--
--#define S3C2410_DCON_CH3_UART2	(0<<24)
--#define S3C2410_DCON_CH3_SDI	(1<<24)
--#define S3C2410_DCON_CH3_SPI	(2<<24)
--#define S3C2410_DCON_CH3_TIMER	(3<<24)
--#define S3C2410_DCON_CH3_USBEP4	(4<<24)
--
--#define S3C2410_DCON_SRCSHIFT   (24)
--#define S3C2410_DCON_SRCMASK	(7<<24)
--
--#define S3C2410_DCON_BYTE       (0<<20)
--#define S3C2410_DCON_HALFWORD   (1<<20)
--#define S3C2410_DCON_WORD       (2<<20)
--
--#define S3C2410_DCON_AUTORELOAD (0<<22)
--#define S3C2410_DCON_NORELOAD   (1<<22)
--#define S3C2410_DCON_HWTRIG     (1<<23)
--
--#ifdef CONFIG_CPU_S3C2440
--#define S3C2440_DIDSTC_CHKINT	(1<<2)
--
--#define S3C2440_DCON_CH0_I2SSDO	(5<<24)
--#define S3C2440_DCON_CH0_PCMIN	(6<<24)
--
--#define S3C2440_DCON_CH1_PCMOUT	(5<<24)
--#define S3C2440_DCON_CH1_SDI	(6<<24)
--
--#define S3C2440_DCON_CH2_PCMIN	(5<<24)
--#define S3C2440_DCON_CH2_MICIN	(6<<24)
--
--#define S3C2440_DCON_CH3_MICIN	(5<<24)
--#define S3C2440_DCON_CH3_PCMOUT	(6<<24)
--#endif
--
--#ifdef CONFIG_CPU_S3C2412
--
--#define S3C2412_DMAREQSEL_SRC(x)	((x)<<1)
--
--#define S3C2412_DMAREQSEL_HW		(1)
--
--#define S3C2412_DMAREQSEL_SPI0TX	S3C2412_DMAREQSEL_SRC(0)
--#define S3C2412_DMAREQSEL_SPI0RX	S3C2412_DMAREQSEL_SRC(1)
--#define S3C2412_DMAREQSEL_SPI1TX	S3C2412_DMAREQSEL_SRC(2)
--#define S3C2412_DMAREQSEL_SPI1RX	S3C2412_DMAREQSEL_SRC(3)
--#define S3C2412_DMAREQSEL_I2STX		S3C2412_DMAREQSEL_SRC(4)
--#define S3C2412_DMAREQSEL_I2SRX		S3C2412_DMAREQSEL_SRC(5)
--#define S3C2412_DMAREQSEL_TIMER		S3C2412_DMAREQSEL_SRC(9)
--#define S3C2412_DMAREQSEL_SDI		S3C2412_DMAREQSEL_SRC(10)
--#define S3C2412_DMAREQSEL_USBEP1	S3C2412_DMAREQSEL_SRC(13)
--#define S3C2412_DMAREQSEL_USBEP2	S3C2412_DMAREQSEL_SRC(14)
--#define S3C2412_DMAREQSEL_USBEP3	S3C2412_DMAREQSEL_SRC(15)
--#define S3C2412_DMAREQSEL_USBEP4	S3C2412_DMAREQSEL_SRC(16)
--#define S3C2412_DMAREQSEL_XDREQ0	S3C2412_DMAREQSEL_SRC(17)
--#define S3C2412_DMAREQSEL_XDREQ1	S3C2412_DMAREQSEL_SRC(18)
--#define S3C2412_DMAREQSEL_UART0_0	S3C2412_DMAREQSEL_SRC(19)
--#define S3C2412_DMAREQSEL_UART0_1	S3C2412_DMAREQSEL_SRC(20)
--#define S3C2412_DMAREQSEL_UART1_0	S3C2412_DMAREQSEL_SRC(21)
--#define S3C2412_DMAREQSEL_UART1_1	S3C2412_DMAREQSEL_SRC(22)
--#define S3C2412_DMAREQSEL_UART2_0	S3C2412_DMAREQSEL_SRC(23)
--#define S3C2412_DMAREQSEL_UART2_1	S3C2412_DMAREQSEL_SRC(24)
--
--#endif
--
--#define S3C2443_DMAREQSEL_SRC(x)	((x)<<1)
--
--#define S3C2443_DMAREQSEL_HW		(1)
- 
--#define S3C2443_DMAREQSEL_SPI0TX	S3C2443_DMAREQSEL_SRC(0)
--#define S3C2443_DMAREQSEL_SPI0RX	S3C2443_DMAREQSEL_SRC(1)
--#define S3C2443_DMAREQSEL_SPI1TX	S3C2443_DMAREQSEL_SRC(2)
--#define S3C2443_DMAREQSEL_SPI1RX	S3C2443_DMAREQSEL_SRC(3)
--#define S3C2443_DMAREQSEL_I2STX		S3C2443_DMAREQSEL_SRC(4)
--#define S3C2443_DMAREQSEL_I2SRX		S3C2443_DMAREQSEL_SRC(5)
--#define S3C2443_DMAREQSEL_TIMER		S3C2443_DMAREQSEL_SRC(9)
--#define S3C2443_DMAREQSEL_SDI		S3C2443_DMAREQSEL_SRC(10)
--#define S3C2443_DMAREQSEL_XDREQ0	S3C2443_DMAREQSEL_SRC(17)
--#define S3C2443_DMAREQSEL_XDREQ1	S3C2443_DMAREQSEL_SRC(18)
--#define S3C2443_DMAREQSEL_UART0_0	S3C2443_DMAREQSEL_SRC(19)
--#define S3C2443_DMAREQSEL_UART0_1	S3C2443_DMAREQSEL_SRC(20)
--#define S3C2443_DMAREQSEL_UART1_0	S3C2443_DMAREQSEL_SRC(21)
--#define S3C2443_DMAREQSEL_UART1_1	S3C2443_DMAREQSEL_SRC(22)
--#define S3C2443_DMAREQSEL_UART2_0	S3C2443_DMAREQSEL_SRC(23)
--#define S3C2443_DMAREQSEL_UART2_1	S3C2443_DMAREQSEL_SRC(24)
--#define S3C2443_DMAREQSEL_UART3_0	S3C2443_DMAREQSEL_SRC(25)
--#define S3C2443_DMAREQSEL_UART3_1	S3C2443_DMAREQSEL_SRC(26)
--#define S3C2443_DMAREQSEL_PCMOUT	S3C2443_DMAREQSEL_SRC(27)
--#define S3C2443_DMAREQSEL_PCMIN 	S3C2443_DMAREQSEL_SRC(28)
--#define S3C2443_DMAREQSEL_MICIN		S3C2443_DMAREQSEL_SRC(29)
-+static int s3c_dma_has_circular(void)
-+{
-+	return 0;
-+}
- 
- #endif /* __ASM_ARCH_DMA_H */
---- a/arch/arm/mach-s3c2442/Kconfig
-+++ b/arch/arm/mach-s3c2442/Kconfig
-@@ -11,6 +11,7 @@ config CPU_S3C2442
- 	select S3C2410_CLOCK
- 	select S3C2410_GPIO
- 	select S3C2410_PM if PM
-+	select S3C2440_DMA if S3C2410_DMA
- 	select CPU_S3C244X
- 	select CPU_LLSERIAL_S3C2440
- 	help
---- /dev/null
-+++ b/arch/arm/plat-s3c/dma.c
-@@ -0,0 +1,86 @@
-+/* linux/arch/arm/plat-s3c/dma.c
-+ *
-+ * Copyright (c) 2003-2005,2006,2009 Simtec Electronics
-+ *	Ben Dooks <ben@simtec.co.uk>
-+ *	http://armlinux.simtec.co.uk/
-+ *
-+ * S3C DMA core
-+ *
-+ * 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.
-+*/
-+
-+struct s3c2410_dma_buf;
-+
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/errno.h>
-+
-+#include <mach/dma.h>
-+#include <mach/irqs.h>
-+
-+#include <plat/dma-plat.h>
-+
-+/* dma channel state information */
-+struct s3c2410_dma_chan s3c2410_chans[S3C_DMA_CHANNELS];
-+struct s3c2410_dma_chan *s3c_dma_chan_map[DMACH_MAX];
-+
-+/* s3c_dma_lookup_channel
-+ *
-+ * change the dma channel number given into a real dma channel id
-+*/
-+
-+struct s3c2410_dma_chan *s3c_dma_lookup_channel(unsigned int channel)
-+{
-+	if (channel & DMACH_LOW_LEVEL)
-+		return &s3c2410_chans[channel & ~DMACH_LOW_LEVEL];
-+	else
-+		return s3c_dma_chan_map[channel];
-+}
-+
-+/* do we need to protect the settings of the fields from
-+ * irq?
-+*/
-+
-+int s3c2410_dma_set_opfn(unsigned int channel, s3c2410_dma_opfn_t rtn)
-+{
-+	struct s3c2410_dma_chan *chan = s3c_dma_lookup_channel(channel);
-+
-+	if (chan == NULL)
-+		return -EINVAL;
-+
-+	pr_debug("%s: chan=%p, op rtn=%p\n", __func__, chan, rtn);
-+
-+	chan->op_fn = rtn;
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL(s3c2410_dma_set_opfn);
-+
-+int s3c2410_dma_set_buffdone_fn(unsigned int channel, s3c2410_dma_cbfn_t rtn)
-+{
-+	struct s3c2410_dma_chan *chan = s3c_dma_lookup_channel(channel);
-+
-+	if (chan == NULL)
-+		return -EINVAL;
-+
-+	pr_debug("%s: chan=%p, callback rtn=%p\n", __func__, chan, rtn);
-+
-+	chan->callback_fn = rtn;
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL(s3c2410_dma_set_buffdone_fn);
-+
-+int s3c2410_dma_setflags(unsigned int channel, unsigned int flags)
-+{
-+	struct s3c2410_dma_chan *chan = s3c_dma_lookup_channel(channel);
-+
-+	if (chan == NULL)
-+		return -EINVAL;
-+
-+	chan->flags = flags;
-+	return 0;
-+}
-+EXPORT_SYMBOL(s3c2410_dma_setflags);
---- /dev/null
-+++ b/arch/arm/plat-s3c/include/plat/dma-core.h
-@@ -0,0 +1,22 @@
-+/* arch/arm/plat-s3c/include/plat/dma.h
-+ *
-+ * Copyright 2008 Openmoko, Inc.
-+ * Copyright 2008 Simtec Electronics
-+ *	Ben Dooks <ben@simtec.co.uk>
-+ *	http://armlinux.simtec.co.uk/
-+ *
-+ * Samsung S3C DMA core support
-+ *
-+ * 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.
-+*/
-+
-+extern struct s3c2410_dma_chan *s3c_dma_lookup_channel(unsigned int channel);
-+
-+extern struct s3c2410_dma_chan *s3c_dma_chan_map[];
-+
-+/* the currently allocated channel information */
-+extern struct s3c2410_dma_chan s3c2410_chans[];
-+
-+
---- /dev/null
-+++ b/arch/arm/plat-s3c/include/plat/dma.h
-@@ -0,0 +1,128 @@
-+/* arch/arm/plat-s3c/include/plat/dma.h
-+ *
-+ * Copyright (C) 2003,2004,2006 Simtec Electronics
-+ *	Ben Dooks <ben@simtec.co.uk>
-+ *
-+ * Samsung S3C DMA support
-+ *
-+ * 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.
-+*/
-+
-+enum s3c2410_dma_buffresult {
-+	S3C2410_RES_OK,
-+	S3C2410_RES_ERR,
-+	S3C2410_RES_ABORT
-+};
-+
-+enum s3c2410_dmasrc {
-+	S3C2410_DMASRC_HW,		/* source is memory */
-+	S3C2410_DMASRC_MEM		/* source is hardware */
-+};
-+
-+/* enum s3c2410_chan_op
-+ *
-+ * operation codes passed to the DMA code by the user, and also used
-+ * to inform the current channel owner of any changes to the system state
-+*/
-+
-+enum s3c2410_chan_op {
-+	S3C2410_DMAOP_START,
-+	S3C2410_DMAOP_STOP,
-+	S3C2410_DMAOP_PAUSE,
-+	S3C2410_DMAOP_RESUME,
-+	S3C2410_DMAOP_FLUSH,
-+	S3C2410_DMAOP_TIMEOUT,		/* internal signal to handler */
-+	S3C2410_DMAOP_STARTED,		/* indicate channel started */
-+};
-+
-+struct s3c2410_dma_client {
-+	char                *name;
-+};
-+
-+struct s3c2410_dma_chan;
-+
-+/* s3c2410_dma_cbfn_t
-+ *
-+ * buffer callback routine type
-+*/
-+
-+typedef void (*s3c2410_dma_cbfn_t)(struct s3c2410_dma_chan *,
-+				   void *buf, int size,
-+				   enum s3c2410_dma_buffresult result);
-+
-+typedef int  (*s3c2410_dma_opfn_t)(struct s3c2410_dma_chan *,
-+				   enum s3c2410_chan_op );
-+
-+
-+
-+/* s3c2410_dma_request
-+ *
-+ * request a dma channel exclusivley
-+*/
-+
-+extern int s3c2410_dma_request(unsigned int channel,
-+			       struct s3c2410_dma_client *, void *dev);
-+
-+
-+/* s3c2410_dma_ctrl
-+ *
-+ * change the state of the dma channel
-+*/
-+
-+extern int s3c2410_dma_ctrl(unsigned int channel, enum s3c2410_chan_op op);
-+
-+/* s3c2410_dma_setflags
-+ *
-+ * set the channel's flags to a given state
-+*/
-+
-+extern int s3c2410_dma_setflags(unsigned int channel,
-+				unsigned int flags);
-+
-+/* s3c2410_dma_free
-+ *
-+ * free the dma channel (will also abort any outstanding operations)
-+*/
-+
-+extern int s3c2410_dma_free(unsigned int channel, struct s3c2410_dma_client *);
-+
-+/* s3c2410_dma_enqueue
-+ *
-+ * place the given buffer onto the queue of operations for the channel.
-+ * The buffer must be allocated from dma coherent memory, or the Dcache/WB
-+ * drained before the buffer is given to the DMA system.
-+*/
-+
-+extern int s3c2410_dma_enqueue(unsigned int channel, void *id,
-+			       dma_addr_t data, int size);
-+
-+
-+/* s3c2410_dma_config
-+ *
-+ * configure the dma channel
-+*/
-+
-+extern int s3c2410_dma_config(unsigned int channel, int xferunit);
-+
-+/* s3c2410_dma_devconfig
-+ *
-+ * configure the device we're talking to
-+*/
-+
-+extern int s3c2410_dma_devconfig(int channel, enum s3c2410_dmasrc source,
-+				 unsigned long devaddr);
-+
-+/* s3c2410_dma_getposition
-+ *
-+ * get the position that the dma transfer is currently at
-+*/
-+
-+extern int s3c2410_dma_getposition(unsigned int channel,
-+				   dma_addr_t *src, dma_addr_t *dest);
-+
-+extern int s3c2410_dma_set_opfn(unsigned int, s3c2410_dma_opfn_t rtn);
-+extern int s3c2410_dma_set_buffdone_fn(unsigned int, s3c2410_dma_cbfn_t rtn);
-+
-+
---- a/arch/arm/plat-s3c/Kconfig
-+++ b/arch/arm/plat-s3c/Kconfig
-@@ -150,6 +150,13 @@ config S3C_GPIO_CFG_S3C64XX
- 	  Internal configuration to enable S3C64XX style GPIO configuration
- 	  functions.
- 
-+# DMA
-+
-+config S3C_DMA
-+	bool
-+	help
-+	  Internal configuration for S3C DMA core
-+
- # device definitions to compile in
- 
- config S3C_DEV_HSMMC
---- a/arch/arm/plat-s3c/Makefile
-+++ b/arch/arm/plat-s3c/Makefile
-@@ -18,6 +18,10 @@ obj-y				+= pwm-clock.o
- obj-y				+= gpio.o
- obj-y				+= gpio-config.o
- 
-+# DMA support
-+
-+obj-$(CONFIG_S3C_DMA)		+= dma.o
-+
- # PM support
- 
- obj-$(CONFIG_PM)		+= pm.o
-@@ -31,3 +35,5 @@ obj-$(CONFIG_S3C_DEV_HSMMC1)	+= dev-hsmm
- obj-y				+= dev-i2c0.o
- obj-$(CONFIG_S3C_DEV_I2C1)	+= dev-i2c1.o
- obj-$(CONFIG_S3C_DEV_FB)	+= dev-fb.o
-+obj-$(CONFIG_S3C_DMA)		+= dma.o
-+
---- a/arch/arm/plat-s3c24xx/dma.c
-+++ b/arch/arm/plat-s3c24xx/dma.c
-@@ -31,10 +31,11 @@
- #include <asm/irq.h>
- #include <mach/hardware.h>
- #include <mach/dma.h>
--
- #include <mach/map.h>
- 
--#include <plat/dma.h>
-+#include <plat/dma-core.h>
-+#include <plat/regs-dma.h>
-+#include <plat/dma-plat.h>
- 
- /* io map for dma */
- static void __iomem *dma_base;
-@@ -44,8 +45,6 @@ static int dma_channels;
- 
- static struct s3c24xx_dma_selection dma_sel;
- 
--/* dma channel state information */
--struct s3c2410_dma_chan s3c2410_chans[S3C2410_DMA_CHANNELS];
- 
- /* debugging functions */
- 
-@@ -135,21 +134,6 @@ dmadbg_showregs(const char *fname, int l
- #define dbg_showchan(chan) do { } while(0)
- #endif /* CONFIG_S3C2410_DMA_DEBUG */
- 
--static struct s3c2410_dma_chan *dma_chan_map[DMACH_MAX];
--
--/* lookup_dma_channel
-- *
-- * change the dma channel number given into a real dma channel id
--*/
--
--static struct s3c2410_dma_chan *lookup_dma_channel(unsigned int channel)
--{
--	if (channel & DMACH_LOW_LEVEL)
--		return &s3c2410_chans[channel & ~DMACH_LOW_LEVEL];
--	else
--		return dma_chan_map[channel];
--}
--
- /* s3c2410_dma_stats_timeout
-  *
-  * Update DMA stats from timeout info
-@@ -214,8 +198,6 @@ s3c2410_dma_waitforload(struct s3c2410_d
- 	return 0;
- }
- 
--
--
- /* s3c2410_dma_loadbuffer
-  *
-  * load a buffer, and update the channel state
-@@ -453,7 +435,7 @@ s3c2410_dma_canload(struct s3c2410_dma_c
- int s3c2410_dma_enqueue(unsigned int channel, void *id,
- 			dma_addr_t data, int size)
- {
--	struct s3c2410_dma_chan *chan = lookup_dma_channel(channel);
-+	struct s3c2410_dma_chan *chan = s3c_dma_lookup_channel(channel);
- 	struct s3c2410_dma_buf *buf;
- 	unsigned long flags;
- 
-@@ -804,7 +786,7 @@ EXPORT_SYMBOL(s3c2410_dma_request);
- 
- int s3c2410_dma_free(unsigned int channel, struct s3c2410_dma_client *client)
- {
--	struct s3c2410_dma_chan *chan = lookup_dma_channel(channel);
-+	struct s3c2410_dma_chan *chan = s3c_dma_lookup_channel(channel);
- 	unsigned long flags;
- 
- 	if (chan == NULL)
-@@ -836,7 +818,7 @@ int s3c2410_dma_free(unsigned int channe
- 	chan->irq_claimed = 0;
- 
- 	if (!(channel & DMACH_LOW_LEVEL))
--		dma_chan_map[channel] = NULL;
-+		s3c_dma_chan_map[channel] = NULL;
- 
- 	local_irq_restore(flags);
- 
-@@ -995,7 +977,7 @@ static int s3c2410_dma_started(struct s3
- int
- s3c2410_dma_ctrl(unsigned int channel, enum s3c2410_chan_op op)
- {
--	struct s3c2410_dma_chan *chan = lookup_dma_channel(channel);
-+	struct s3c2410_dma_chan *chan = s3c_dma_lookup_channel(channel);
- 
- 	if (chan == NULL)
- 		return -EINVAL;
-@@ -1038,14 +1020,13 @@ EXPORT_SYMBOL(s3c2410_dma_ctrl);
- /* s3c2410_dma_config
-  *
-  * xfersize:     size of unit in bytes (1,2,4)
-- * dcon:         base value of the DCONx register
- */
- 
- int s3c2410_dma_config(unsigned int channel,
--		       int xferunit,
--		       int dcon)
-+		       int xferunit)
- {
--	struct s3c2410_dma_chan *chan = lookup_dma_channel(channel);
-+	struct s3c2410_dma_chan *chan = s3c_dma_lookup_channel(channel);
-+	unsigned int dcon;
- 
- 	pr_debug("%s: chan=%d, xfer_unit=%d, dcon=%08x\n",
- 		 __func__, channel, xferunit, dcon);
-@@ -1055,10 +1036,33 @@ int s3c2410_dma_config(unsigned int chan
- 
- 	pr_debug("%s: Initial dcon is %08x\n", __func__, dcon);
- 
--	dcon |= chan->dcon & dma_sel.dcon_mask;
-+	dcon = chan->dcon & dma_sel.dcon_mask;
- 
- 	pr_debug("%s: New dcon is %08x\n", __func__, dcon);
- 
-+	switch (chan->req_ch) {
-+	case DMACH_I2S_IN:
-+	case DMACH_I2S_OUT:
-+	case DMACH_PCM_IN:
-+	case DMACH_PCM_OUT:
-+	case DMACH_MIC_IN:
-+	default:
-+		dcon |= S3C2410_DCON_HANDSHAKE;
-+		dcon |= S3C2410_DCON_SYNC_PCLK;
-+		break;
-+
-+	case DMACH_SDI:
-+		/* note, ensure if need HANDSHAKE or not */
-+		dcon |= S3C2410_DCON_SYNC_PCLK;
-+		break;		
-+
-+	case DMACH_XD0:
-+	case DMACH_XD1:
-+		dcon |= S3C2410_DCON_HANDSHAKE;
-+		dcon |= S3C2410_DCON_SYNC_HCLK;
-+		break;
-+	}
-+
- 	switch (xferunit) {
- 	case 1:
- 		dcon |= S3C2410_DCON_BYTE;
-@@ -1089,10 +1093,10 @@ int s3c2410_dma_config(unsigned int chan
- }
- 
- EXPORT_SYMBOL(s3c2410_dma_config);
--
-+#if 0 /* moved to plat-s3c? */
- int s3c2410_dma_setflags(unsigned int channel, unsigned int flags)
- {
--	struct s3c2410_dma_chan *chan = lookup_dma_channel(channel);
-+	struct s3c2410_dma_chan *chan = s3c_dma_lookup_channel(channel);
- 
- 	if (chan == NULL)
- 		return -EINVAL;
-@@ -1105,43 +1109,7 @@ int s3c2410_dma_setflags(unsigned int ch
- }
- 
- EXPORT_SYMBOL(s3c2410_dma_setflags);
--
--
--/* do we need to protect the settings of the fields from
-- * irq?
--*/
--
--int s3c2410_dma_set_opfn(unsigned int channel, s3c2410_dma_opfn_t rtn)
--{
--	struct s3c2410_dma_chan *chan = lookup_dma_channel(channel);
--
--	if (chan == NULL)
--		return -EINVAL;
--
--	pr_debug("%s: chan=%p, op rtn=%p\n", __func__, chan, rtn);
--
--	chan->op_fn = rtn;
--
--	return 0;
--}
--
--EXPORT_SYMBOL(s3c2410_dma_set_opfn);
--
--int s3c2410_dma_set_buffdone_fn(unsigned int channel, s3c2410_dma_cbfn_t rtn)
--{
--	struct s3c2410_dma_chan *chan = lookup_dma_channel(channel);
--
--	if (chan == NULL)
--		return -EINVAL;
--
--	pr_debug("%s: chan=%p, callback rtn=%p\n", __func__, chan, rtn);
--
--	chan->callback_fn = rtn;
--
--	return 0;
--}
--
--EXPORT_SYMBOL(s3c2410_dma_set_buffdone_fn);
-+#endif
- 
- /* s3c2410_dma_devconfig
-  *
-@@ -1150,29 +1118,38 @@ EXPORT_SYMBOL(s3c2410_dma_set_buffdone_f
-  * source:    S3C2410_DMASRC_HW: source is hardware
-  *            S3C2410_DMASRC_MEM: source is memory
-  *
-- * hwcfg:     the value for xxxSTCn register,
-- *            bit 0: 0=increment pointer, 1=leave pointer
-- *            bit 1: 0=source is AHB, 1=source is APB
-- *
-  * devaddr:   physical address of the source
- */
- 
- int s3c2410_dma_devconfig(int channel,
- 			  enum s3c2410_dmasrc source,
--			  int hwcfg,
- 			  unsigned long devaddr)
- {
--	struct s3c2410_dma_chan *chan = lookup_dma_channel(channel);
-+	struct s3c2410_dma_chan *chan = s3c_dma_lookup_channel(channel);
-+	unsigned int hwcfg;
- 
- 	if (chan == NULL)
- 		return -EINVAL;
- 
--	pr_debug("%s: source=%d, hwcfg=%08x, devaddr=%08lx\n",
--		 __func__, (int)source, hwcfg, devaddr);
-+	pr_debug("%s: source=%d, devaddr=%08lx\n",
-+		 __func__, (int)source, devaddr);
- 
- 	chan->source = source;
- 	chan->dev_addr = devaddr;
--	chan->hw_cfg = hwcfg;
-+
-+	switch (chan->req_ch) {
-+	case DMACH_XD0:
-+	case DMACH_XD1:
-+		hwcfg = 0; /* AHB */
-+		break;
-+
-+	default:
-+		hwcfg = S3C2410_DISRCC_APB;
-+	}
-+
-+	/* always assume our peripheral desintation is a fixed
-+	 * address in memory. */
-+	 hwcfg |= S3C2410_DISRCC_INC;
- 
- 	switch (source) {
- 	case S3C2410_DMASRC_HW:
-@@ -1219,7 +1196,7 @@ EXPORT_SYMBOL(s3c2410_dma_devconfig);
- 
- int s3c2410_dma_getposition(unsigned int channel, dma_addr_t *src, dma_addr_t *dst)
- {
-- 	struct s3c2410_dma_chan *chan = lookup_dma_channel(channel);
-+ 	struct s3c2410_dma_chan *chan = s3c_dma_lookup_channel(channel);
- 
- 	if (chan == NULL)
- 		return -EINVAL;
-@@ -1278,8 +1255,8 @@ static int s3c2410_dma_resume(struct sys
- 
- 	printk(KERN_INFO "dma%d: restoring configuration\n", cp->number);
- 
--	s3c2410_dma_config(no, cp->xfer_unit, cp->dcon);
--	s3c2410_dma_devconfig(no, cp->source, cp->hw_cfg, cp->dev_addr);
-+	s3c2410_dma_config(no, cp->xfer_unit);
-+	s3c2410_dma_devconfig(no, cp->source, cp->dev_addr);
- 
- 	/* re-select the dma source for this channel */
- 
-@@ -1476,7 +1453,8 @@ static struct s3c2410_dma_chan *s3c2410_
-  found:
- 	dmach = &s3c2410_chans[ch];
- 	dmach->map = ch_map;
--	dma_chan_map[channel] = dmach;
-+	dmach->req_ch = channel;
-+	s3c_dma_chan_map[channel] = dmach;
- 
- 	/* select the channel */
- 
---- a/arch/arm/plat-s3c24xx/include/plat/dma.h
-+++ /dev/null
-@@ -1,82 +0,0 @@
--/* linux/include/asm-arm/plat-s3c24xx/dma.h
-- *
-- * Copyright (C) 2006 Simtec Electronics
-- *	Ben Dooks <ben@simtec.co.uk>
-- *
-- * Samsung S3C24XX DMA support
-- *
-- * 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.
--*/
--
--extern struct sysdev_class dma_sysclass;
--extern struct s3c2410_dma_chan s3c2410_chans[S3C2410_DMA_CHANNELS];
--
--#define DMA_CH_VALID		(1<<31)
--#define DMA_CH_NEVER		(1<<30)
--
--struct s3c24xx_dma_addr {
--	unsigned long		from;
--	unsigned long		to;
--};
--
--/* struct s3c24xx_dma_map
-- *
-- * this holds the mapping information for the channel selected
-- * to be connected to the specified device
--*/
--
--struct s3c24xx_dma_map {
--	const char		*name;
--	struct s3c24xx_dma_addr  hw_addr;
--
--	unsigned long		 channels[S3C2410_DMA_CHANNELS];
--	unsigned long		 channels_rx[S3C2410_DMA_CHANNELS];
--};
--
--struct s3c24xx_dma_selection {
--	struct s3c24xx_dma_map	*map;
--	unsigned long		 map_size;
--	unsigned long		 dcon_mask;
--
--	void	(*select)(struct s3c2410_dma_chan *chan,
--			  struct s3c24xx_dma_map *map);
--
--	void	(*direction)(struct s3c2410_dma_chan *chan,
--			     struct s3c24xx_dma_map *map,
--			     enum s3c2410_dmasrc dir);
--};
--
--extern int s3c24xx_dma_init_map(struct s3c24xx_dma_selection *sel);
--
--/* struct s3c24xx_dma_order_ch
-- *
-- * channel map for one of the `enum dma_ch` dma channels. the list
-- * entry contains a set of low-level channel numbers, orred with
-- * DMA_CH_VALID, which are checked in the order in the array.
--*/
--
--struct s3c24xx_dma_order_ch {
--	unsigned int	list[S3C2410_DMA_CHANNELS];	/* list of channels */
--	unsigned int	flags;				/* flags */
--};
--
--/* struct s3c24xx_dma_order
-- *
-- * information provided by either the core or the board to give the
-- * dma system a hint on how to allocate channels
--*/
--
--struct s3c24xx_dma_order {
--	struct s3c24xx_dma_order_ch	channels[DMACH_MAX];
--};
--
--extern int s3c24xx_dma_order_set(struct s3c24xx_dma_order *map);
--
--/* DMA init code, called from the cpu support code */
--
--extern int s3c2410_dma_init(void);
--
--extern int s3c24xx_dma_init(unsigned int channels, unsigned int irq,
--			    unsigned int stride);
---- /dev/null
-+++ b/arch/arm/plat-s3c24xx/include/plat/dma-plat.h
-@@ -0,0 +1,84 @@
-+/* linux/arch/arm/plat-s3c24xx/include/plat/dma-plat.h
-+ *
-+ * Copyright (C) 2006 Simtec Electronics
-+ *	Ben Dooks <ben@simtec.co.uk>
-+ *
-+ * Samsung S3C24XX DMA support
-+ *
-+ * 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.
-+*/
-+
-+#include <plat/dma-core.h>
-+
-+extern struct sysdev_class dma_sysclass;
-+extern struct s3c2410_dma_chan s3c2410_chans[S3C_DMA_CHANNELS];
-+
-+#define DMA_CH_VALID		(1<<31)
-+#define DMA_CH_NEVER		(1<<30)
-+
-+struct s3c24xx_dma_addr {
-+	unsigned long		from;
-+	unsigned long		to;
-+};
-+
-+/* struct s3c24xx_dma_map
-+ *
-+ * this holds the mapping information for the channel selected
-+ * to be connected to the specified device
-+*/
-+
-+struct s3c24xx_dma_map {
-+	const char		*name;
-+	struct s3c24xx_dma_addr  hw_addr;
-+
-+	unsigned long		 channels[S3C_DMA_CHANNELS];
-+	unsigned long		 channels_rx[S3C_DMA_CHANNELS];
-+};
-+
-+struct s3c24xx_dma_selection {
-+	struct s3c24xx_dma_map	*map;
-+	unsigned long		 map_size;
-+	unsigned long		 dcon_mask;
-+
-+	void	(*select)(struct s3c2410_dma_chan *chan,
-+			  struct s3c24xx_dma_map *map);
-+
-+	void	(*direction)(struct s3c2410_dma_chan *chan,
-+			     struct s3c24xx_dma_map *map,
-+			     enum s3c2410_dmasrc dir);
-+};
-+
-+extern int s3c24xx_dma_init_map(struct s3c24xx_dma_selection *sel);
-+
-+/* struct s3c24xx_dma_order_ch
-+ *
-+ * channel map for one of the `enum dma_ch` dma channels. the list
-+ * entry contains a set of low-level channel numbers, orred with
-+ * DMA_CH_VALID, which are checked in the order in the array.
-+*/
-+
-+struct s3c24xx_dma_order_ch {
-+	unsigned int	list[S3C_DMA_CHANNELS];	/* list of channels */
-+	unsigned int	flags;				/* flags */
-+};
-+
-+/* struct s3c24xx_dma_order
-+ *
-+ * information provided by either the core or the board to give the
-+ * dma system a hint on how to allocate channels
-+*/
-+
-+struct s3c24xx_dma_order {
-+	struct s3c24xx_dma_order_ch	channels[DMACH_MAX];
-+};
-+
-+extern int s3c24xx_dma_order_set(struct s3c24xx_dma_order *map);
-+
-+/* DMA init code, called from the cpu support code */
-+
-+extern int s3c2410_dma_init(void);
-+
-+extern int s3c24xx_dma_init(unsigned int channels, unsigned int irq,
-+			    unsigned int stride);
---- /dev/null
-+++ b/arch/arm/plat-s3c24xx/include/plat/regs-dma.h
-@@ -0,0 +1,145 @@
-+/* arch/arm/mach-s3c2410/include/mach/dma.h
-+ *
-+ * Copyright (C) 2003,2004,2006 Simtec Electronics
-+ *	Ben Dooks <ben@simtec.co.uk>
-+ *
-+ * Samsung S3C24XX DMA support
-+ *
-+ * 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.
-+*/
-+
-+/* DMA Register definitions */
-+
-+#define S3C2410_DMA_DISRC		(0x00)
-+#define S3C2410_DMA_DISRCC		(0x04)
-+#define S3C2410_DMA_DIDST		(0x08)
-+#define S3C2410_DMA_DIDSTC		(0x0C)
-+#define S3C2410_DMA_DCON		(0x10)
-+#define S3C2410_DMA_DSTAT		(0x14)
-+#define S3C2410_DMA_DCSRC		(0x18)
-+#define S3C2410_DMA_DCDST		(0x1C)
-+#define S3C2410_DMA_DMASKTRIG		(0x20)
-+#define S3C2412_DMA_DMAREQSEL		(0x24)
-+#define S3C2443_DMA_DMAREQSEL		(0x24)
-+
-+#define S3C2410_DISRCC_INC		(1<<0)
-+#define S3C2410_DISRCC_APB		(1<<1)
-+
-+#define S3C2410_DMASKTRIG_STOP		(1<<2)
-+#define S3C2410_DMASKTRIG_ON		(1<<1)
-+#define S3C2410_DMASKTRIG_SWTRIG	(1<<0)
-+
-+#define S3C2410_DCON_DEMAND		(0<<31)
-+#define S3C2410_DCON_HANDSHAKE		(1<<31)
-+#define S3C2410_DCON_SYNC_PCLK		(0<<30)
-+#define S3C2410_DCON_SYNC_HCLK		(1<<30)
-+
-+#define S3C2410_DCON_INTREQ		(1<<29)
-+
-+#define S3C2410_DCON_CH0_XDREQ0		(0<<24)
-+#define S3C2410_DCON_CH0_UART0		(1<<24)
-+#define S3C2410_DCON_CH0_SDI		(2<<24)
-+#define S3C2410_DCON_CH0_TIMER		(3<<24)
-+#define S3C2410_DCON_CH0_USBEP1		(4<<24)
-+
-+#define S3C2410_DCON_CH1_XDREQ1		(0<<24)
-+#define S3C2410_DCON_CH1_UART1		(1<<24)
-+#define S3C2410_DCON_CH1_I2SSDI		(2<<24)
-+#define S3C2410_DCON_CH1_SPI		(3<<24)
-+#define S3C2410_DCON_CH1_USBEP2		(4<<24)
-+
-+#define S3C2410_DCON_CH2_I2SSDO		(0<<24)
-+#define S3C2410_DCON_CH2_I2SSDI		(1<<24)
-+#define S3C2410_DCON_CH2_SDI		(2<<24)
-+#define S3C2410_DCON_CH2_TIMER		(3<<24)
-+#define S3C2410_DCON_CH2_USBEP3		(4<<24)
-+
-+#define S3C2410_DCON_CH3_UART2		(0<<24)
-+#define S3C2410_DCON_CH3_SDI		(1<<24)
-+#define S3C2410_DCON_CH3_SPI		(2<<24)
-+#define S3C2410_DCON_CH3_TIMER		(3<<24)
-+#define S3C2410_DCON_CH3_USBEP4		(4<<24)
-+
-+#define S3C2410_DCON_SRCSHIFT		(24)
-+#define S3C2410_DCON_SRCMASK		(7<<24)
-+
-+#define S3C2410_DCON_BYTE		(0<<20)
-+#define S3C2410_DCON_HALFWORD		(1<<20)
-+#define S3C2410_DCON_WORD		(2<<20)
-+
-+#define S3C2410_DCON_AUTORELOAD		(0<<22)
-+#define S3C2410_DCON_NORELOAD		(1<<22)
-+#define S3C2410_DCON_HWTRIG		(1<<23)
-+
-+#if defined(CONFIG_CPU_S3C2440) || defined(CONFIG_CPU_S3C2442)
-+#define S3C2440_DIDSTC_CHKINT		(1<<2)
-+
-+#define S3C2440_DCON_CH0_I2SSDO		(5<<24)
-+#define S3C2440_DCON_CH0_PCMIN		(6<<24)
-+
-+#define S3C2440_DCON_CH1_PCMOUT		(5<<24)
-+#define S3C2440_DCON_CH1_SDI		(6<<24)
-+
-+#define S3C2440_DCON_CH2_PCMIN		(5<<24)
-+#define S3C2440_DCON_CH2_MICIN		(6<<24)
-+
-+#define S3C2440_DCON_CH3_MICIN		(5<<24)
-+#define S3C2440_DCON_CH3_PCMOUT		(6<<24)
-+#endif
-+
-+#ifdef CONFIG_CPU_S3C2412
-+
-+#define S3C2412_DMAREQSEL_SRC(x)	((x)<<1)
-+
-+#define S3C2412_DMAREQSEL_HW		(1)
-+
-+#define S3C2412_DMAREQSEL_SPI0TX	S3C2412_DMAREQSEL_SRC(0)
-+#define S3C2412_DMAREQSEL_SPI0RX	S3C2412_DMAREQSEL_SRC(1)
-+#define S3C2412_DMAREQSEL_SPI1TX	S3C2412_DMAREQSEL_SRC(2)
-+#define S3C2412_DMAREQSEL_SPI1RX	S3C2412_DMAREQSEL_SRC(3)
-+#define S3C2412_DMAREQSEL_I2STX		S3C2412_DMAREQSEL_SRC(4)
-+#define S3C2412_DMAREQSEL_I2SRX		S3C2412_DMAREQSEL_SRC(5)
-+#define S3C2412_DMAREQSEL_TIMER		S3C2412_DMAREQSEL_SRC(9)
-+#define S3C2412_DMAREQSEL_SDI		S3C2412_DMAREQSEL_SRC(10)
-+#define S3C2412_DMAREQSEL_USBEP1	S3C2412_DMAREQSEL_SRC(13)
-+#define S3C2412_DMAREQSEL_USBEP2	S3C2412_DMAREQSEL_SRC(14)
-+#define S3C2412_DMAREQSEL_USBEP3	S3C2412_DMAREQSEL_SRC(15)
-+#define S3C2412_DMAREQSEL_USBEP4	S3C2412_DMAREQSEL_SRC(16)
-+#define S3C2412_DMAREQSEL_XDREQ0	S3C2412_DMAREQSEL_SRC(17)
-+#define S3C2412_DMAREQSEL_XDREQ1	S3C2412_DMAREQSEL_SRC(18)
-+#define S3C2412_DMAREQSEL_UART0_0	S3C2412_DMAREQSEL_SRC(19)
-+#define S3C2412_DMAREQSEL_UART0_1	S3C2412_DMAREQSEL_SRC(20)
-+#define S3C2412_DMAREQSEL_UART1_0	S3C2412_DMAREQSEL_SRC(21)
-+#define S3C2412_DMAREQSEL_UART1_1	S3C2412_DMAREQSEL_SRC(22)
-+#define S3C2412_DMAREQSEL_UART2_0	S3C2412_DMAREQSEL_SRC(23)
-+#define S3C2412_DMAREQSEL_UART2_1	S3C2412_DMAREQSEL_SRC(24)
-+
-+#endif
-+
-+#define S3C2443_DMAREQSEL_SRC(x)	((x)<<1)
-+
-+#define S3C2443_DMAREQSEL_HW		(1)
-+
-+#define S3C2443_DMAREQSEL_SPI0TX	S3C2443_DMAREQSEL_SRC(0)
-+#define S3C2443_DMAREQSEL_SPI0RX	S3C2443_DMAREQSEL_SRC(1)
-+#define S3C2443_DMAREQSEL_SPI1TX	S3C2443_DMAREQSEL_SRC(2)
-+#define S3C2443_DMAREQSEL_SPI1RX	S3C2443_DMAREQSEL_SRC(3)
-+#define S3C2443_DMAREQSEL_I2STX		S3C2443_DMAREQSEL_SRC(4)
-+#define S3C2443_DMAREQSEL_I2SRX		S3C2443_DMAREQSEL_SRC(5)
-+#define S3C2443_DMAREQSEL_TIMER		S3C2443_DMAREQSEL_SRC(9)
-+#define S3C2443_DMAREQSEL_SDI		S3C2443_DMAREQSEL_SRC(10)
-+#define S3C2443_DMAREQSEL_XDREQ0	S3C2443_DMAREQSEL_SRC(17)
-+#define S3C2443_DMAREQSEL_XDREQ1	S3C2443_DMAREQSEL_SRC(18)
-+#define S3C2443_DMAREQSEL_UART0_0	S3C2443_DMAREQSEL_SRC(19)
-+#define S3C2443_DMAREQSEL_UART0_1	S3C2443_DMAREQSEL_SRC(20)
-+#define S3C2443_DMAREQSEL_UART1_0	S3C2443_DMAREQSEL_SRC(21)
-+#define S3C2443_DMAREQSEL_UART1_1	S3C2443_DMAREQSEL_SRC(22)
-+#define S3C2443_DMAREQSEL_UART2_0	S3C2443_DMAREQSEL_SRC(23)
-+#define S3C2443_DMAREQSEL_UART2_1	S3C2443_DMAREQSEL_SRC(24)
-+#define S3C2443_DMAREQSEL_UART3_0	S3C2443_DMAREQSEL_SRC(25)
-+#define S3C2443_DMAREQSEL_UART3_1	S3C2443_DMAREQSEL_SRC(26)
-+#define S3C2443_DMAREQSEL_PCMOUT	S3C2443_DMAREQSEL_SRC(27)
-+#define S3C2443_DMAREQSEL_PCMIN 	S3C2443_DMAREQSEL_SRC(28)
-+#define S3C2443_DMAREQSEL_MICIN		S3C2443_DMAREQSEL_SRC(29)
---- a/arch/arm/plat-s3c24xx/Kconfig
-+++ b/arch/arm/plat-s3c24xx/Kconfig
-@@ -71,6 +71,7 @@ config PM_SIMTEC
- config S3C2410_DMA
- 	bool "S3C2410 DMA support"
- 	depends on ARCH_S3C2410
-+	select S3C_DMA
- 	help
- 	  S3C2410 DMA support. This is needed for drivers like sound which
- 	  use the S3C2410's DMA system to move data to and from the
---- a/arch/arm/mach-s3c2410/dma.c
-+++ b/arch/arm/mach-s3c2410/dma.c
-@@ -17,14 +17,16 @@
- #include <linux/sysdev.h>
- #include <linux/serial_core.h>
- 
-+#include <mach/map.h>
- #include <mach/dma.h>
- 
- #include <plat/cpu.h>
--#include <plat/dma.h>
-+#include <plat/dma-plat.h>
- 
- #include <plat/regs-serial.h>
- #include <mach/regs-gpio.h>
- #include <plat/regs-ac97.h>
-+#include <plat/regs-dma.h>
- #include <mach/regs-mem.h>
- #include <mach/regs-lcd.h>
- #include <mach/regs-sdi.h>
---- a/arch/arm/mach-s3c2440/dma.c
-+++ b/arch/arm/mach-s3c2440/dma.c
-@@ -17,14 +17,16 @@
- #include <linux/sysdev.h>
- #include <linux/serial_core.h>
- 
-+#include <mach/map.h>
- #include <mach/dma.h>
- 
--#include <plat/dma.h>
-+#include <plat/dma-plat.h>
- #include <plat/cpu.h>
- 
- #include <plat/regs-serial.h>
- #include <mach/regs-gpio.h>
- #include <plat/regs-ac97.h>
-+#include <plat/regs-dma.h>
- #include <mach/regs-mem.h>
- #include <mach/regs-lcd.h>
- #include <mach/regs-sdi.h>
---- a/sound/soc/s3c24xx/s3c24xx-pcm.c
-+++ b/sound/soc/s3c24xx/s3c24xx-pcm.c
-@@ -218,24 +218,17 @@ static int s3c24xx_pcm_prepare(struct sn
- 	 * sync to pclk, half-word transfers to the IIS-FIFO. */
- 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
- 		s3c2410_dma_devconfig(prtd->params->channel,
--				S3C2410_DMASRC_MEM, S3C2410_DISRCC_INC |
--				S3C2410_DISRCC_APB, prtd->params->dma_addr);
--
--		s3c2410_dma_config(prtd->params->channel,
--				prtd->params->dma_size,
--				S3C2410_DCON_SYNC_PCLK |
--				S3C2410_DCON_HANDSHAKE);
-+				      S3C2410_DMASRC_MEM,
-+				      prtd->params->dma_addr);
- 	} else {
--		s3c2410_dma_config(prtd->params->channel,
--				prtd->params->dma_size,
--				S3C2410_DCON_HANDSHAKE |
--				S3C2410_DCON_SYNC_PCLK);
--
- 		s3c2410_dma_devconfig(prtd->params->channel,
--					S3C2410_DMASRC_HW, 0x3,
--					prtd->params->dma_addr);
-+				      S3C2410_DMASRC_HW,
-+				      prtd->params->dma_addr);
- 	}
- 
-+	s3c2410_dma_config(prtd->params->channel,
-+			   prtd->params->dma_size);
-+
- 	/* flush the DMA channel */
- 	s3c2410_dma_ctrl(prtd->params->channel, S3C2410_DMAOP_FLUSH);
- 	prtd->dma_loaded = 0;
diff --git a/target/linux/s3c24xx/patches-2.6.30/011-s3c-pwm.patch b/target/linux/s3c24xx/patches-2.6.30/011-s3c-pwm.patch
deleted file mode 100644
index 5e097d8bb..000000000
--- a/target/linux/s3c24xx/patches-2.6.30/011-s3c-pwm.patch
+++ /dev/null
@@ -1,802 +0,0 @@
---- /dev/null
-+++ b/arch/arm/plat-s3c/include/plat/pwm.h
-@@ -0,0 +1,45 @@
-+#ifndef __S3C2410_PWM_H
-+#define __S3C2410_PWM_H
-+
-+#include <linux/err.h>
-+#include <linux/platform_device.h>
-+#include <linux/clk.h>
-+
-+#include <mach/io.h>
-+#include <mach/hardware.h>
-+#include <asm/mach-types.h>
-+#include <plat/regs-timer.h>
-+
-+enum pwm_timer {
-+	PWM0,
-+	PWM1,
-+	PWM2,
-+	PWM3,
-+	PWM4
-+};
-+
-+struct s3c2410_pwm {
-+	enum pwm_timer timerid;
-+	struct clk *pclk;
-+	unsigned long pclk_rate;
-+	unsigned long prescaler;
-+	unsigned long divider;
-+	unsigned long counter;
-+	unsigned long comparer;
-+};
-+
-+struct s3c24xx_pwm_platform_data{
-+        /* callback to attach platform children (to enforce suspend / resume
-+         * ordering */
-+        void (*attach_child_devices)(struct device *parent_device);
-+};
-+
-+int s3c2410_pwm_init(struct s3c2410_pwm *s3c2410_pwm);
-+int s3c2410_pwm_enable(struct s3c2410_pwm *s3c2410_pwm);
-+int s3c2410_pwm_disable(struct s3c2410_pwm *s3c2410_pwm);
-+int s3c2410_pwm_start(struct s3c2410_pwm *s3c2410_pwm);
-+int s3c2410_pwm_stop(struct s3c2410_pwm *s3c2410_pwm);
-+int s3c2410_pwm_duty_cycle(int reg_value, struct s3c2410_pwm *s3c2410_pwm);
-+int s3c2410_pwm_dumpregs(void);
-+
-+#endif /* __S3C2410_PWM_H */
---- a/arch/arm/plat-s3c/Kconfig
-+++ b/arch/arm/plat-s3c/Kconfig
-@@ -157,6 +157,11 @@ config S3C_DMA
- 	help
- 	  Internal configuration for S3C DMA core
- 
-+config S3C_PWM
-+	bool
-+	help
-+	  PWM timer code for the S3C2410, and similar processors
-+
- # device definitions to compile in
- 
- config S3C_DEV_HSMMC
---- a/arch/arm/plat-s3c/Makefile
-+++ b/arch/arm/plat-s3c/Makefile
-@@ -35,5 +35,6 @@ obj-$(CONFIG_S3C_DEV_HSMMC1)	+= dev-hsmm
- obj-y				+= dev-i2c0.o
- obj-$(CONFIG_S3C_DEV_I2C1)	+= dev-i2c1.o
- obj-$(CONFIG_S3C_DEV_FB)	+= dev-fb.o
-+obj-$(CONFIG_S3C_PWM)		+= pwm.o
- obj-$(CONFIG_S3C_DMA)		+= dma.o
- 
---- /dev/null
-+++ b/arch/arm/plat-s3c/pwm.c
-@@ -0,0 +1,288 @@
-+/*
-+ * arch/arm/plat-s3c/pwm.c
-+ *
-+ * Copyright (c) by Javi Roman <javiroman@kernel-labs.org>
-+ * 		 for the Openmoko Project.
-+ *
-+ *     S3C2410A SoC PWM support
-+ *
-+ * 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.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-+ *
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/clk.h>
-+#include <linux/device.h>
-+#include <mach/hardware.h>
-+#include <plat/regs-timer.h>
-+#include <plat/pwm.h>
-+#include <asm/io.h>
-+
-+#ifdef CONFIG_PM
-+	static unsigned long standby_reg_tcon;
-+	static unsigned long standby_reg_tcfg0;
-+	static unsigned long standby_reg_tcfg1;
-+#endif
-+
-+int s3c2410_pwm_disable(struct s3c2410_pwm *pwm)
-+{
-+	unsigned long tcon;
-+
-+	/* stop timer */
-+	tcon = __raw_readl(S3C2410_TCON);
-+	tcon &= 0xffffff00;
-+	__raw_writel(tcon, S3C2410_TCON);
-+
-+	clk_disable(pwm->pclk);
-+	clk_put(pwm->pclk);
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL_GPL(s3c2410_pwm_disable);
-+
-+int s3c2410_pwm_init(struct s3c2410_pwm *pwm)
-+{
-+	pwm->pclk = clk_get(NULL, "timers");
-+	if (IS_ERR(pwm->pclk))
-+		return PTR_ERR(pwm->pclk);
-+
-+	clk_enable(pwm->pclk);
-+	pwm->pclk_rate = clk_get_rate(pwm->pclk);
-+	return 0;
-+}
-+EXPORT_SYMBOL_GPL(s3c2410_pwm_init);
-+
-+int s3c2410_pwm_enable(struct s3c2410_pwm *pwm)
-+{
-+	unsigned long tcfg0, tcfg1, tcnt, tcmp;
-+
-+	/* control registers bits */
-+	tcfg1 = __raw_readl(S3C2410_TCFG1);
-+	tcfg0 = __raw_readl(S3C2410_TCFG0);
-+
-+	/* divider & scaler slection */
-+	switch (pwm->timerid) {
-+	case PWM0:
-+		tcfg1 &= ~S3C2410_TCFG1_MUX0_MASK;
-+		tcfg0 &= ~S3C2410_TCFG_PRESCALER0_MASK;
-+		break;
-+	case PWM1:
-+		tcfg1 &= ~S3C2410_TCFG1_MUX1_MASK;
-+		tcfg0 &= ~S3C2410_TCFG_PRESCALER0_MASK;
-+		break;
-+	case PWM2:
-+		tcfg1 &= ~S3C2410_TCFG1_MUX2_MASK;
-+		tcfg0 &= ~S3C2410_TCFG_PRESCALER1_MASK;
-+		break;
-+	case PWM3:
-+		tcfg1 &= ~S3C2410_TCFG1_MUX3_MASK;
-+		tcfg0 &= ~S3C2410_TCFG_PRESCALER1_MASK;
-+		break;
-+	case PWM4:
-+		/* timer four is not capable of doing PWM */
-+		break;
-+	default:
-+		clk_disable(pwm->pclk);
-+		clk_put(pwm->pclk);
-+		return -1;
-+	}
-+
-+	/* divider & scaler values */
-+	tcfg1 |= pwm->divider;
-+	__raw_writel(tcfg1, S3C2410_TCFG1);
-+
-+	switch (pwm->timerid) {
-+	case PWM0:
-+	case PWM1:
-+		tcfg0 |= pwm->prescaler;
-+		__raw_writel(tcfg0, S3C2410_TCFG0);
-+		break;
-+	default:
-+		if ((tcfg0 | pwm->prescaler) != tcfg0) {
-+			printk(KERN_WARNING "not changing prescaler of PWM %u,"
-+			       " since it's shared with timer4 (clock tick)\n",
-+			       pwm->timerid);
-+		}
-+		break;
-+	}
-+
-+	/* timer count and compare buffer initial values */
-+	tcnt = pwm->counter;
-+	tcmp = pwm->comparer;
-+
-+	__raw_writel(tcnt, S3C2410_TCNTB(pwm->timerid));
-+	__raw_writel(tcmp, S3C2410_TCMPB(pwm->timerid));
-+
-+	/* ensure timer is stopped */
-+	s3c2410_pwm_stop(pwm);
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL_GPL(s3c2410_pwm_enable);
-+
-+int s3c2410_pwm_start(struct s3c2410_pwm *pwm)
-+{
-+	unsigned long tcon;
-+
-+	tcon = __raw_readl(S3C2410_TCON);
-+
-+	switch (pwm->timerid) {
-+	case PWM0:
-+		tcon |= S3C2410_TCON_T0START;
-+		tcon &= ~S3C2410_TCON_T0MANUALUPD;
-+		break;
-+	case PWM1:
-+		tcon |= S3C2410_TCON_T1START;
-+		tcon &= ~S3C2410_TCON_T1MANUALUPD;
-+		break;
-+	case PWM2:
-+		tcon |= S3C2410_TCON_T2START;
-+		tcon &= ~S3C2410_TCON_T2MANUALUPD;
-+		break;
-+	case PWM3:
-+		tcon |= S3C2410_TCON_T3START;
-+		tcon &= ~S3C2410_TCON_T3MANUALUPD;
-+		break;
-+	case PWM4:
-+		/* timer four is not capable of doing PWM */
-+	default:
-+		return -ENODEV;
-+	}
-+
-+	__raw_writel(tcon, S3C2410_TCON);
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL_GPL(s3c2410_pwm_start);
-+
-+int s3c2410_pwm_stop(struct s3c2410_pwm *pwm)
-+{
-+	unsigned long tcon;
-+
-+	tcon = __raw_readl(S3C2410_TCON);
-+
-+	switch (pwm->timerid) {
-+	case PWM0:
-+		tcon &= ~0x00000000;
-+		tcon |= S3C2410_TCON_T0RELOAD;
-+		tcon |= S3C2410_TCON_T0MANUALUPD;
-+		break;
-+	case PWM1:
-+		tcon &= ~0x00000080;
-+		tcon |= S3C2410_TCON_T1RELOAD;
-+		tcon |= S3C2410_TCON_T1MANUALUPD;
-+		break;
-+	case PWM2:
-+		tcon &= ~0x00000800;
-+		tcon |= S3C2410_TCON_T2RELOAD;
-+		tcon |= S3C2410_TCON_T2MANUALUPD;
-+		break;
-+	case PWM3:
-+		tcon &= ~0x00008000;
-+		tcon |= S3C2410_TCON_T3RELOAD;
-+		tcon |= S3C2410_TCON_T3MANUALUPD;
-+		break;
-+	case PWM4:
-+		/* timer four is not capable of doing PWM */
-+	default:
-+		return -ENODEV;
-+	}
-+
-+	__raw_writel(tcon, S3C2410_TCON);
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL_GPL(s3c2410_pwm_stop);
-+
-+int s3c2410_pwm_duty_cycle(int reg_value, struct s3c2410_pwm *pwm)
-+{
-+	__raw_writel(reg_value, S3C2410_TCMPB(pwm->timerid));
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL_GPL(s3c2410_pwm_duty_cycle);
-+
-+int s3c2410_pwm_dumpregs(void)
-+{
-+	printk(KERN_INFO "TCON: %08lx, TCFG0: %08lx, TCFG1: %08lx\n",
-+			(unsigned long)	__raw_readl(S3C2410_TCON),
-+			(unsigned long)	__raw_readl(S3C2410_TCFG0),
-+			(unsigned long)	__raw_readl(S3C2410_TCFG1));
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL_GPL(s3c2410_pwm_dumpregs);
-+
-+static int __init s3c24xx_pwm_probe(struct platform_device *pdev)
-+{
-+	struct s3c24xx_pwm_platform_data *pdata = pdev->dev.platform_data;
-+
-+	dev_info(&pdev->dev, "s3c24xx_pwm is registered \n");
-+
-+	/* if platform was interested, give him a chance to register
-+	 * platform devices that switch power with us as the parent
-+	 * at registration time -- ensures suspend / resume ordering
-+	 */
-+	if (pdata)
-+		if (pdata->attach_child_devices)
-+			(pdata->attach_child_devices)(&pdev->dev);
-+
-+	return 0;
-+}
-+
-+#ifdef CONFIG_PM
-+static int s3c24xx_pwm_suspend(struct platform_device *pdev, pm_message_t state)
-+{
-+	/* PWM config should be kept in suspending */
-+	standby_reg_tcon = __raw_readl(S3C2410_TCON);
-+	standby_reg_tcfg0 = __raw_readl(S3C2410_TCFG0);
-+	standby_reg_tcfg1 = __raw_readl(S3C2410_TCFG1);
-+
-+	return 0;
-+}
-+
-+static int s3c24xx_pwm_resume(struct platform_device *pdev)
-+{
-+	__raw_writel(standby_reg_tcon, S3C2410_TCON);
-+	__raw_writel(standby_reg_tcfg0, S3C2410_TCFG0);
-+	__raw_writel(standby_reg_tcfg1, S3C2410_TCFG1);
-+
-+	return 0;
-+}
-+#else
-+#define s3c24xx_pwm_suspend	NULL
-+#define s3c24xx_pwm_resume	NULL
-+#endif
-+
-+static struct platform_driver s3c24xx_pwm_driver = {
-+	.driver = {
-+		.name	= "s3c24xx_pwm",
-+		.owner	= THIS_MODULE,
-+	},
-+	.probe	 = s3c24xx_pwm_probe,
-+	.suspend = s3c24xx_pwm_suspend,
-+	.resume	 = s3c24xx_pwm_resume,
-+};
-+
-+static int __init s3c24xx_pwm_init(void)
-+{
-+	return platform_driver_register(&s3c24xx_pwm_driver);
-+}
-+
-+static void __exit s3c24xx_pwm_exit(void)
-+{
-+}
-+
-+MODULE_AUTHOR("Javi Roman <javiroman@kernel-labs.org>");
-+MODULE_LICENSE("GPL");
-+
-+module_init(s3c24xx_pwm_init);
-+module_exit(s3c24xx_pwm_exit);
---- /dev/null
-+++ b/arch/arm/plat-s3c24xx/pwm-clock.c
-@@ -0,0 +1,437 @@
-+/* linux/arch/arm/plat-s3c24xx/pwm-clock.c
-+ *
-+ * Copyright (c) 2007 Simtec Electronics
-+ * Copyright (c) 2007, 2008 Ben Dooks
-+ *	Ben Dooks <ben-linux@fluff.org>
-+ *
-+ * 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.
-+*/
-+
-+#include <linux/init.h>
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/list.h>
-+#include <linux/errno.h>
-+#include <linux/clk.h>
-+#include <linux/err.h>
-+#include <linux/io.h>
-+
-+#include <mach/hardware.h>
-+#include <asm/irq.h>
-+
-+#include <mach/regs-clock.h>
-+#include <mach/regs-gpio.h>
-+
-+#include <asm/plat-s3c24xx/clock.h>
-+#include <asm/plat-s3c24xx/cpu.h>
-+
-+#include <asm/plat-s3c/regs-timer.h>
-+
-+/* Each of the timers 0 through 5 go through the following
-+ * clock tree, with the inputs depending on the timers.
-+ *
-+ * pclk ---- [ prescaler 0 ] -+---> timer 0
-+ *			      +---> timer 1
-+ *
-+ * pclk ---- [ prescaler 1 ] -+---> timer 2
-+ *			      +---> timer 3
-+ *			      \---> timer 4
-+ *
-+ * Which are fed into the timers as so:
-+ *
-+ * prescaled 0 ---- [ div 2,4,8,16 ] ---\
-+ *				       [mux] -> timer 0
-+ * tclk 0 ------------------------------/
-+ *
-+ * prescaled 0 ---- [ div 2,4,8,16 ] ---\
-+ *				       [mux] -> timer 1
-+ * tclk 0 ------------------------------/
-+ *
-+ *
-+ * prescaled 1 ---- [ div 2,4,8,16 ] ---\
-+ *				       [mux] -> timer 2
-+ * tclk 1 ------------------------------/
-+ *
-+ * prescaled 1 ---- [ div 2,4,8,16 ] ---\
-+ *				       [mux] -> timer 3
-+ * tclk 1 ------------------------------/
-+ *
-+ * prescaled 1 ---- [ div 2,4,8, 16 ] --\
-+ *				       [mux] -> timer 4
-+ * tclk 1 ------------------------------/
-+ *
-+ * Since the mux and the divider are tied together in the
-+ * same register space, it is impossible to set the parent
-+ * and the rate at the same time. To avoid this, we add an
-+ * intermediate 'prescaled-and-divided' clock to select
-+ * as the parent for the timer input clock called tdiv.
-+ *
-+ * prescaled clk --> pwm-tdiv ---\
-+ *                             [ mux ] --> timer X
-+ * tclk -------------------------/
-+*/
-+
-+static unsigned long clk_pwm_scaler_getrate(struct clk *clk)
-+{
-+	unsigned long tcfg0 = __raw_readl(S3C2410_TCFG0);
-+
-+	if (clk->id == 1) {
-+		tcfg0 &= S3C2410_TCFG_PRESCALER1_MASK;
-+		tcfg0 >>= S3C2410_TCFG_PRESCALER1_SHIFT;
-+	} else {
-+		tcfg0 &= S3C2410_TCFG_PRESCALER0_MASK;
-+	}
-+
-+	return clk_get_rate(clk->parent) / (tcfg0 + 1);
-+}
-+
-+/* TODO - add set rate calls. */
-+
-+static struct clk clk_timer_scaler[] = {
-+	[0]	= {
-+		.name		= "pwm-scaler0",
-+		.id		= -1,
-+		.get_rate	= clk_pwm_scaler_getrate,
-+	},
-+	[1]	= {
-+		.name		= "pwm-scaler1",
-+		.id		= -1,
-+		.get_rate	= clk_pwm_scaler_getrate,
-+	},
-+};
-+
-+static struct clk clk_timer_tclk[] = {
-+	[0]	= {
-+		.name		= "pwm-tclk0",
-+		.id		= -1,
-+	},
-+	[1]	= {
-+		.name		= "pwm-tclk1",
-+		.id		= -1,
-+	},
-+};
-+
-+struct pwm_tdiv_clk {
-+	struct clk	clk;
-+	unsigned int	divisor;
-+};
-+
-+static inline struct pwm_tdiv_clk *to_tdiv(struct clk *clk)
-+{
-+	return container_of(clk, struct pwm_tdiv_clk, clk);
-+}
-+
-+static inline unsigned long tcfg_to_divisor(unsigned long tcfg1)
-+{
-+	return 1 << (1 + tcfg1);
-+}
-+
-+static unsigned long clk_pwm_tdiv_get_rate(struct clk *clk)
-+{
-+	unsigned long tcfg1 = __raw_readl(S3C2410_TCFG1);
-+	unsigned int divisor;
-+
-+	tcfg1 >>= S3C2410_TCFG1_SHIFT(clk->id);
-+	tcfg1 &= S3C2410_TCFG1_MUX_MASK;
-+
-+	if (tcfg1 == S3C2410_TCFG1_MUX_TCLK)
-+		divisor = to_tdiv(clk)->divisor;
-+	else
-+		divisor = tcfg_to_divisor(tcfg1);
-+
-+	return clk_get_rate(clk->parent) / divisor;
-+}
-+
-+static unsigned long clk_pwm_tdiv_round_rate(struct clk *clk,
-+					     unsigned long rate)
-+{
-+	unsigned long parent_rate;
-+	unsigned long divisor;
-+
-+	parent_rate = clk_get_rate(clk->parent);
-+	divisor = parent_rate / rate;
-+
-+	if (divisor <= 2)
-+		divisor = 2;
-+	else if (divisor <= 4)
-+		divisor = 4;
-+	else if (divisor <= 8)
-+		divisor = 8;
-+	else
-+		divisor = 16;
-+
-+	return parent_rate / divisor;
-+}
-+
-+static unsigned long clk_pwm_tdiv_bits(struct pwm_tdiv_clk *divclk)
-+{
-+	unsigned long bits;
-+
-+	switch (divclk->divisor) {
-+	case 2:
-+		bits = S3C2410_TCFG1_MUX_DIV2;
-+		break;
-+	case 4:
-+		bits = S3C2410_TCFG1_MUX_DIV4;
-+		break;
-+	case 8:
-+		bits = S3C2410_TCFG1_MUX_DIV8;
-+		break;
-+	case 16:
-+	default:
-+		bits = S3C2410_TCFG1_MUX_DIV16;
-+		break;
-+	}
-+
-+	return bits;
-+}
-+
-+static void clk_pwm_tdiv_update(struct pwm_tdiv_clk *divclk)
-+{
-+	unsigned long tcfg1 = __raw_readl(S3C2410_TCFG1);
-+	unsigned long bits = clk_pwm_tdiv_bits(divclk);
-+	unsigned long flags;
-+	unsigned long shift =  S3C2410_TCFG1_SHIFT(divclk->clk.id);
-+
-+	local_irq_save(flags);
-+
-+	tcfg1 = __raw_readl(S3C2410_TCFG1);
-+	tcfg1 &= ~(S3C2410_TCFG1_MUX_MASK << shift);
-+	tcfg1 |= bits << shift;
-+	__raw_writel(tcfg1, S3C2410_TCFG1);
-+
-+	local_irq_restore(flags);
-+}
-+
-+static int clk_pwm_tdiv_set_rate(struct clk *clk, unsigned long rate)
-+{
-+	struct pwm_tdiv_clk *divclk = to_tdiv(clk);
-+	unsigned long tcfg1 = __raw_readl(S3C2410_TCFG1);
-+	unsigned long parent_rate = clk_get_rate(clk->parent);
-+	unsigned long divisor;
-+
-+	tcfg1 >>= S3C2410_TCFG1_SHIFT(clk->id);
-+	tcfg1 &= S3C2410_TCFG1_MUX_MASK;
-+
-+	rate = clk_round_rate(clk, rate);
-+	divisor = parent_rate / rate;
-+
-+	if (divisor > 16)
-+		return -EINVAL;
-+
-+	divclk->divisor = divisor;
-+
-+	/* Update the current MUX settings if we are currently
-+	 * selected as the clock source for this clock. */
-+
-+	if (tcfg1 != S3C2410_TCFG1_MUX_TCLK)
-+		clk_pwm_tdiv_update(divclk);
-+
-+	return 0;
-+}
-+
-+static struct pwm_tdiv_clk clk_timer_tdiv[] = {
-+	[0]	= {
-+		.clk	= {
-+			.name		= "pwm-tdiv",
-+			.parent		= &clk_timer_scaler[0],
-+			.get_rate	= clk_pwm_tdiv_get_rate,
-+			.set_rate	= clk_pwm_tdiv_set_rate,
-+			.round_rate	= clk_pwm_tdiv_round_rate,
-+		},
-+	},
-+	[1]	= {
-+		.clk	= {
-+			.name		= "pwm-tdiv",
-+			.parent		= &clk_timer_scaler[0],
-+			.get_rate	= clk_pwm_tdiv_get_rate,
-+			.set_rate	= clk_pwm_tdiv_set_rate,
-+			.round_rate	= clk_pwm_tdiv_round_rate,
-+		}
-+	},
-+	[2]	= {
-+		.clk	= {
-+			.name		= "pwm-tdiv",
-+			.parent		= &clk_timer_scaler[1],
-+			.get_rate	= clk_pwm_tdiv_get_rate,
-+			.set_rate	= clk_pwm_tdiv_set_rate,
-+			.round_rate	= clk_pwm_tdiv_round_rate,
-+		},
-+	},
-+	[3]	= {
-+		.clk	= {
-+			.name		= "pwm-tdiv",
-+			.parent		= &clk_timer_scaler[1],
-+			.get_rate	= clk_pwm_tdiv_get_rate,
-+			.set_rate	= clk_pwm_tdiv_set_rate,
-+			.round_rate	= clk_pwm_tdiv_round_rate,
-+		},
-+	},
-+	[4]	= {
-+		.clk	= {
-+			.name		= "pwm-tdiv",
-+			.parent		= &clk_timer_scaler[1],
-+			.get_rate	= clk_pwm_tdiv_get_rate,
-+			.set_rate	= clk_pwm_tdiv_set_rate,
-+			.round_rate	= clk_pwm_tdiv_round_rate,
-+		},
-+	},
-+};
-+
-+static int __init clk_pwm_tdiv_register(unsigned int id)
-+{
-+	struct pwm_tdiv_clk *divclk = &clk_timer_tdiv[id];
-+	unsigned long tcfg1 = __raw_readl(S3C2410_TCFG1);
-+
-+	tcfg1 >>= S3C2410_TCFG1_SHIFT(id);
-+	tcfg1 &= S3C2410_TCFG1_MUX_MASK;
-+
-+	divclk->clk.id = id;
-+	divclk->divisor = tcfg_to_divisor(tcfg1);
-+
-+	return s3c24xx_register_clock(&divclk->clk);
-+}
-+
-+static inline struct clk *s3c24xx_pwmclk_tclk(unsigned int id)
-+{
-+	return (id >= 2) ? &clk_timer_tclk[1] : &clk_timer_tclk[0];
-+}
-+
-+static inline struct clk *s3c24xx_pwmclk_tdiv(unsigned int id)
-+{
-+	return &clk_timer_tdiv[id].clk;
-+}
-+
-+static int clk_pwm_tin_set_parent(struct clk *clk, struct clk *parent)
-+{
-+	unsigned int id = clk->id;
-+	unsigned long tcfg1;
-+	unsigned long flags;
-+	unsigned long bits;
-+	unsigned long shift = S3C2410_TCFG1_SHIFT(id);
-+
-+	if (parent == s3c24xx_pwmclk_tclk(id))
-+		bits = S3C2410_TCFG1_MUX_TCLK << shift;
-+	else if (parent == s3c24xx_pwmclk_tdiv(id))
-+		bits = clk_pwm_tdiv_bits(to_tdiv(parent)) << shift;
-+	else
-+		return -EINVAL;
-+
-+	clk->parent = parent;
-+
-+	local_irq_save(flags);
-+
-+	tcfg1 = __raw_readl(S3C2410_TCFG1);
-+	tcfg1 &= ~(S3C2410_TCFG1_MUX_MASK << shift);
-+	__raw_writel(tcfg1 | bits, S3C2410_TCFG1);
-+
-+	local_irq_restore(flags);
-+
-+	return 0;
-+}
-+
-+static struct clk clk_tin[] = {
-+	[0]	= {
-+		.name		= "pwm-tin",
-+		.id		= 0,
-+		.set_parent	= clk_pwm_tin_set_parent,
-+	},
-+	[1]	= {
-+		.name		= "pwm-tin",
-+		.id		= 1,
-+		.set_parent	= clk_pwm_tin_set_parent,
-+	},
-+	[2]	= {
-+		.name		= "pwm-tin",
-+		.id		= 2,
-+		.set_parent	= clk_pwm_tin_set_parent,
-+	},
-+	[3]	= {
-+		.name		= "pwm-tin",
-+		.id		= 3,
-+		.set_parent	= clk_pwm_tin_set_parent,
-+	},
-+	[4]	= {
-+		.name		= "pwm-tin",
-+		.id		= 4,
-+		.set_parent	= clk_pwm_tin_set_parent,
-+	},
-+};
-+
-+static __init int clk_pwm_tin_register(struct clk *pwm)
-+{
-+	unsigned long tcfg1 = __raw_readl(S3C2410_TCFG1);
-+	unsigned int id = pwm->id;
-+
-+	struct clk *parent;
-+	int ret;
-+
-+	ret = s3c24xx_register_clock(pwm);
-+	if (ret < 0)
-+		return ret;
-+
-+	tcfg1 >>= S3C2410_TCFG1_SHIFT(id);
-+	tcfg1 &= S3C2410_TCFG1_MUX_MASK;
-+
-+	if (tcfg1 == S3C2410_TCFG1_MUX_TCLK)
-+		parent = s3c24xx_pwmclk_tclk(id);
-+	else
-+		parent = s3c24xx_pwmclk_tdiv(id);
-+
-+	return clk_set_parent(pwm, parent);
-+}
-+
-+static __init int s3c24xx_pwmclk_init(void)
-+{
-+	struct clk *clk_timers;
-+	unsigned int clk;
-+	int ret;
-+
-+	clk_timers = clk_get(NULL, "timers");
-+	if (IS_ERR(clk_timers)) {
-+		printk(KERN_ERR "%s: no parent clock\n", __func__);
-+		return -EINVAL;
-+	}
-+
-+	for (clk = 0; clk < ARRAY_SIZE(clk_timer_scaler); clk++) {
-+		clk_timer_scaler[clk].parent = clk_timers;
-+		ret = s3c24xx_register_clock(&clk_timer_scaler[clk]);
-+		if (ret < 0) {
-+			printk(KERN_ERR "error adding pwm scaler%d clock\n", clk);
-+			goto err;
-+		}
-+	}
-+
-+	for (clk = 0; clk < ARRAY_SIZE(clk_timer_tclk); clk++) {
-+		ret = s3c24xx_register_clock(&clk_timer_tclk[clk]);
-+		if (ret < 0) {
-+			printk(KERN_ERR "error adding pww tclk%d\n", clk);
-+			goto err;
-+		}
-+	}
-+
-+	for (clk = 0; clk < ARRAY_SIZE(clk_timer_tdiv); clk++) {
-+		ret = clk_pwm_tdiv_register(clk);
-+		if (ret < 0) {
-+			printk(KERN_ERR "error adding pwm%d tdiv clock\n", clk);
-+			goto err;
-+		}
-+	}
-+
-+	for (clk = 0; clk < ARRAY_SIZE(clk_tin); clk++) {
-+		ret = clk_pwm_tin_register(&clk_tin[clk]);
-+		if (ret < 0) {
-+			printk(KERN_ERR "error adding pwm%d tin clock\n", clk);
-+			goto err;
-+		}
-+	}
-+
-+	return 0;
-+
-+ err:
-+	return ret;
-+}
-+
-+arch_initcall(s3c24xx_pwmclk_init);
diff --git a/target/linux/s3c24xx/patches-2.6.30/012-s3c-usb.patch b/target/linux/s3c24xx/patches-2.6.30/012-s3c-usb.patch
deleted file mode 100644
index 0e8a5e9da..000000000
--- a/target/linux/s3c24xx/patches-2.6.30/012-s3c-usb.patch
+++ /dev/null
@@ -1,478 +0,0 @@
---- /dev/null
-+++ b/arch/arm/plat-s3c/dev-usb.c
-@@ -0,0 +1,50 @@
-+/* linux/arch/arm/plat-s3c/dev-usb.c
-+ *
-+ * Copyright 2008 Simtec Electronics
-+ *	Ben Dooks <ben@simtec.co.uk>
-+ *	http://armlinux.simtec.co.uk/
-+ *
-+ * S3C series device definition for USB host
-+ *
-+ * 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.
-+*/
-+
-+#include <linux/kernel.h>
-+#include <linux/string.h>
-+#include <linux/platform_device.h>
-+
-+#include <mach/irqs.h>
-+#include <mach/map.h>
-+
-+#include <plat/devs.h>
-+
-+
-+static struct resource s3c_usb_resource[] = {
-+	[0] = {
-+		.start = S3C24XX_PA_USBHOST,
-+		.end   = S3C24XX_PA_USBHOST + 0x100 - 1,
-+		.flags = IORESOURCE_MEM,
-+	},
-+	[1] = {
-+		.start = IRQ_USBH,
-+		.end   = IRQ_USBH,
-+		.flags = IORESOURCE_IRQ,
-+	}
-+};
-+
-+static u64 s3c_device_usb_dmamask = 0xffffffffUL;
-+
-+struct platform_device s3c_device_usb = {
-+	.name		  = "s3c-ohci",
-+	.id		  = -1,
-+	.num_resources	  = ARRAY_SIZE(s3c_usb_resource),
-+	.resource	  = s3c_usb_resource,
-+	.dev              = {
-+		.dma_mask = &s3c_device_usb_dmamask,
-+		.coherent_dma_mask = 0xffffffffUL
-+	}
-+};
-+
-+EXPORT_SYMBOL(s3c_device_usb);
---- /dev/null
-+++ b/arch/arm/plat-s3c/include/plat/regs-usb-hs-otg.h
-@@ -0,0 +1,360 @@
-+/* linux/include/asm-arm/arch-s3c2410/regs-udc.h
-+ *
-+ * Copyright (C) 2008 Samsung Electronics
-+ * Copyright (C) 2004 Herbert Poetzl <herbert@13thfloor.at>
-+ *
-+ * This include file 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.
-+*/
-+
-+#ifndef __ASM_ARCH_REGS_USB_HS_OTG_H
-+#define __ASM_ARCH_REGS_USB_HS_OTG_H
-+
-+/* USB2.0 OTG Controller register */
-+#define S3C_USBOTG_PHYREG(x)	((x) + 0x100000 /* S3C64XX_VA_OTGSFR */)
-+#define S3C_USBOTG_PHYPWR		S3C_USBOTG_PHYREG(0x0)
-+#define S3C_USBOTG_PHYCLK		S3C_USBOTG_PHYREG(0x4)
-+#define S3C_USBOTG_RSTCON		S3C_USBOTG_PHYREG(0x8)
-+
-+/* USB2.0 OTG Controller register */
-+/* Core Global Registers */
-+#define S3C_USBOTGREG(x)		((x) /*+ S3C64XX_VA_OTG */)
-+/* OTG Control & Status */
-+#define S3C_UDC_OTG_GOTGCTL		S3C_USBOTGREG(0x000)
-+/* OTG Interrupt */
-+#define S3C_UDC_OTG_GOTGINT		S3C_USBOTGREG(0x004)
-+/* Core AHB Configuration */
-+#define S3C_UDC_OTG_GAHBCFG		S3C_USBOTGREG(0x008)
-+/* Core USB Configuration */
-+#define S3C_UDC_OTG_GUSBCFG		S3C_USBOTGREG(0x00C)
-+/* Core Reset */
-+#define S3C_UDC_OTG_GRSTCTL		S3C_USBOTGREG(0x010)
-+/* Core Interrupt */
-+#define S3C_UDC_OTG_GINTSTS		S3C_USBOTGREG(0x014)
-+/* Core Interrupt Mask */
-+#define S3C_UDC_OTG_GINTMSK		S3C_USBOTGREG(0x018)
-+/* Receive Status Debug Read/Status Read */
-+#define S3C_UDC_OTG_GRXSTSR		S3C_USBOTGREG(0x01C)
-+/* Receive Status Debug Pop/Status Pop */
-+#define S3C_UDC_OTG_GRXSTSP		S3C_USBOTGREG(0x020)
-+/* Receive FIFO Size */
-+#define S3C_UDC_OTG_GRXFSIZ		S3C_USBOTGREG(0x024)
-+/* Non-Periodic Transmit FIFO Size */
-+#define S3C_UDC_OTG_GNPTXFSIZ	S3C_USBOTGREG(0x028)
-+/* Non-Periodic Transmit FIFO/Queue Status */
-+#define S3C_UDC_OTG_GNPTXSTS	S3C_USBOTGREG(0x02C)
-+
-+/* Host Periodic Transmit FIFO Size */
-+#define S3C_UDC_OTG_HPTXFSIZ	S3C_USBOTGREG(0x100)
-+/* Device Periodic Transmit FIFO-1 Size */
-+#define S3C_UDC_OTG_DPTXFSIZ1	S3C_USBOTGREG(0x104)
-+/* Device Periodic Transmit FIFO-2 Size */
-+#define S3C_UDC_OTG_DPTXFSIZ2	S3C_USBOTGREG(0x108)
-+/* Device Periodic Transmit FIFO-3 Size */
-+#define S3C_UDC_OTG_DPTXFSIZ3	S3C_USBOTGREG(0x10C)
-+/* Device Periodic Transmit FIFO-4 Size */
-+#define S3C_UDC_OTG_DPTXFSIZ4	S3C_USBOTGREG(0x110)
-+/* Device Periodic Transmit FIFO-5 Size */
-+#define S3C_UDC_OTG_DPTXFSIZ5	S3C_USBOTGREG(0x114)
-+/* Device Periodic Transmit FIFO-6 Size */
-+#define S3C_UDC_OTG_DPTXFSIZ6	S3C_USBOTGREG(0x118)
-+/* Device Periodic Transmit FIFO-7 Size */
-+#define S3C_UDC_OTG_DPTXFSIZ7	S3C_USBOTGREG(0x11C)
-+/* Device Periodic Transmit FIFO-8 Size */
-+#define S3C_UDC_OTG_DPTXFSIZ8	S3C_USBOTGREG(0x120)
-+/* Device Periodic Transmit FIFO-9 Size */
-+#define S3C_UDC_OTG_DPTXFSIZ9	S3C_USBOTGREG(0x124)
-+/* Device Periodic Transmit FIFO-10 Size */
-+#define S3C_UDC_OTG_DPTXFSIZ10	S3C_USBOTGREG(0x128)
-+/* Device Periodic Transmit FIFO-11 Size */
-+#define S3C_UDC_OTG_DPTXFSIZ11	S3C_USBOTGREG(0x12C)
-+/* Device Periodic Transmit FIFO-12 Size */
-+#define S3C_UDC_OTG_DPTXFSIZ12	S3C_USBOTGREG(0x130)
-+/* Device Periodic Transmit FIFO-13 Size */
-+#define S3C_UDC_OTG_DPTXFSIZ13	S3C_USBOTGREG(0x134)
-+/* Device Periodic Transmit FIFO-14 Size */
-+#define S3C_UDC_OTG_DPTXFSIZ14	S3C_USBOTGREG(0x138)
-+/* Device Periodic Transmit FIFO-15 Size */
-+#define S3C_UDC_OTG_DPTXFSIZ15	S3C_USBOTGREG(0x13C)
-+
-+/* Host Mode Registers
-+ * Host Global Registers */
-+/* Host Configuration */
-+#define S3C_UDC_OTG_HCFG		S3C_USBOTGREG(0x400)
-+/* Host Frame Interval */
-+#define S3C_UDC_OTG_HFIR		S3C_USBOTGREG(0x404)
-+/* Host Frame Number/Frame Time Remaining */
-+#define S3C_UDC_OTG_HFNUM		S3C_USBOTGREG(0x408)
-+/* Host Periodic Transmit FIFO/Queue Status */
-+#define S3C_UDC_OTG_HPTXSTS		S3C_USBOTGREG(0x410)
-+/* Host All Channels Interrupt */
-+#define S3C_UDC_OTG_HAINT		S3C_USBOTGREG(0x414)
-+/* Host All Channels Interrupt Mask */
-+#define S3C_UDC_OTG_HAINTMSK	S3C_USBOTGREG(0x418)
-+
-+/* Host Port Control & Status Registers */
-+#define S3C_UDC_OTG_HPRT		S3C_USBOTGREG(0x440)
-+
-+/* Host Channel-Specific Registers */
-+/* Host Channel-0 Characteristics */
-+#define  S3C_UDC_OTG_HCCHAR0	S3C_USBOTGREG(0x500)
-+/* Host Channel-0 Split Control */
-+#define  S3C_UDC_OTG_HCSPLT0	S3C_USBOTGREG(0x504)
-+/* Host Channel-0 Interrupt */
-+#define  S3C_UDC_OTG_HCINT0		S3C_USBOTGREG(0x508)
-+/* Host Channel-0 Interrupt Mask */
-+#define  S3C_UDC_OTG_HCINTMSK0	S3C_USBOTGREG(0x50C)
-+/* Host Channel-0 Transfer Size */
-+#define  S3C_UDC_OTG_HCTSIZ0	S3C_USBOTGREG(0x510)
-+/* Host Channel-0 DMA Address */
-+#define  S3C_UDC_OTG_HCDMA0		S3C_USBOTGREG(0x514)
-+
-+/* Device Mode Registers
-+ * Device Global Registers */
-+/* Device Configuration */
-+#define  S3C_UDC_OTG_DCFG		S3C_USBOTGREG(0x800)
-+/* Device Control */
-+#define  S3C_UDC_OTG_DCTL		S3C_USBOTGREG(0x804)
-+/* Device Status */
-+#define  S3C_UDC_OTG_DSTS		S3C_USBOTGREG(0x808)
-+/* Device IN Endpoint Common Interrupt Mask */
-+#define  S3C_UDC_OTG_DIEPMSK	S3C_USBOTGREG(0x810)
-+/* Device OUT Endpoint Common Interrupt Mask */
-+#define  S3C_UDC_OTG_DOEPMSK	S3C_USBOTGREG(0x814)
-+/* Device All Endpoints Interrupt */
-+#define  S3C_UDC_OTG_DAINT		S3C_USBOTGREG(0x818)
-+/* Device All Endpoints Interrupt Mask */
-+#define  S3C_UDC_OTG_DAINTMSK	S3C_USBOTGREG(0x81C)
-+/* Device IN Token Sequence Learning Queue Read 1 */
-+#define  S3C_UDC_OTG_DTKNQR1	S3C_USBOTGREG(0x820)
-+/* Device IN Token Sequence Learning Queue Read 2 */
-+#define  S3C_UDC_OTG_DTKNQR2	S3C_USBOTGREG(0x824)
-+/* Device VBUS Discharge Time */
-+#define  S3C_UDC_OTG_DVBUSDIS	S3C_USBOTGREG(0x828)
-+/* Device VBUS Pulsing Time */
-+#define  S3C_UDC_OTG_DVBUSPULSE	S3C_USBOTGREG(0x82C)
-+/* Device IN Token Sequence Learning Queue Read 3 */
-+#define  S3C_UDC_OTG_DTKNQR3	S3C_USBOTGREG(0x830)
-+/* Device IN Token Sequence Learning Queue Read 4 */
-+#define  S3C_UDC_OTG_DTKNQR4	S3C_USBOTGREG(0x834)
-+
-+/* Device Logical IN Endpoint-Specific Registers */
-+/* Device IN Endpoint 0 Control */
-+#define  S3C_UDC_OTG_DIEPCTL0	S3C_USBOTGREG(0x900)
-+/* Device IN Endpoint 0 Interrupt */
-+#define  S3C_UDC_OTG_DIEPINT0	S3C_USBOTGREG(0x908)
-+/* Device IN Endpoint 0 Transfer Size */
-+#define  S3C_UDC_OTG_DIEPTSIZ0	S3C_USBOTGREG(0x910)
-+/* Device IN Endpoint 0 DMA Address */
-+#define  S3C_UDC_OTG_DIEPDMA0	S3C_USBOTGREG(0x914)
-+
-+/* Device IN Endpoint 2 Control */
-+#define  S3C_UDC_OTG_DIEPCTL2	S3C_USBOTGREG(0x940)
-+/* Device IN Endpoint 2 Interrupt */
-+#define  S3C_UDC_OTG_DIEPINT2	S3C_USBOTGREG(0x948)
-+/* Device IN Endpoint 2 Transfer Size */
-+#define  S3C_UDC_OTG_DIEPTSIZ2	S3C_USBOTGREG(0x950)
-+/* Device IN Endpoint 2 DMA Address */
-+#define  S3C_UDC_OTG_DIEPDMA2	S3C_USBOTGREG(0x954)
-+
-+/* Device IN Endpoint 3 Control */
-+#define  S3C_UDC_OTG_DIEPCTL3	S3C_USBOTGREG(0x960)
-+/* Device IN Endpoint 3 Interrupt */
-+#define  S3C_UDC_OTG_DIEPINT3	S3C_USBOTGREG(0x968)
-+/* Device IN Endpoint 3 Transfer Size */
-+#define  S3C_UDC_OTG_DIEPTSIZ3	S3C_USBOTGREG(0x970)
-+/* Device IN Endpoint 3 DMA Address */
-+#define  S3C_UDC_OTG_DIEPDMA3	S3C_USBOTGREG(0x974)
-+
-+/* Device Logical OUT Endpoint-Specific Registers */
-+/* Device OUT Endpoint 0 Control */
-+#define  S3C_UDC_OTG_DOEPCTL0	S3C_USBOTGREG(0xB00)
-+/* Device OUT Endpoint 0 Interrupt */
-+#define  S3C_UDC_OTG_DOEPINT0	S3C_USBOTGREG(0xB08)
-+/* Device OUT Endpoint 0 Transfer Size */
-+#define  S3C_UDC_OTG_DOEPTSIZ0	S3C_USBOTGREG(0xB10)
-+/* Device OUT Endpoint 0 DMA Address */
-+#define  S3C_UDC_OTG_DOEPDMA0	S3C_USBOTGREG(0xB14)
-+
-+/* Device OUT Endpoint 1 Control */
-+#define  S3C_UDC_OTG_DOEPCTL1	S3C_USBOTGREG(0xB20)
-+/* Device OUT Endpoint 1 Interrupt */
-+#define  S3C_UDC_OTG_DOEPINT1	S3C_USBOTGREG(0xB28)
-+/* Device OUT Endpoint 1 Transfer Size */
-+#define  S3C_UDC_OTG_DOEPTSIZ1	S3C_USBOTGREG(0xB30)
-+/* Device OUT Endpoint 1 DMA Address */
-+#define  S3C_UDC_OTG_DOEPDMA1	S3C_USBOTGREG(0xB34)
-+
-+/* Endpoint FIFO address */
-+#define S3C_UDC_OTG_EP0_FIFO	S3C_USBOTGREG(0x1000)
-+#define S3C_UDC_OTG_EP1_FIFO	S3C_USBOTGREG(0x2000)
-+#define S3C_UDC_OTG_EP2_FIFO	S3C_USBOTGREG(0x3000)
-+#define S3C_UDC_OTG_EP3_FIFO	S3C_USBOTGREG(0x4000)
-+#define S3C_UDC_OTG_EP4_FIFO	S3C_USBOTGREG(0x5000)
-+#define S3C_UDC_OTG_EP5_FIFO	S3C_USBOTGREG(0x6000)
-+#define S3C_UDC_OTG_EP6_FIFO	S3C_USBOTGREG(0x7000)
-+#define S3C_UDC_OTG_EP7_FIFO	S3C_USBOTGREG(0x8000)
-+#define S3C_UDC_OTG_EP8_FIFO	S3C_USBOTGREG(0x9000)
-+
-+/* S3C_USBOTG_PHYPWR */
-+#define OTG_ENABLE			(0x0<<4)
-+#define OTG_DISABLE			(0x1<<4)
-+#define ANALOG_PWR_UP		(0x0<<3)
-+#define ANALOG_PWR_DOWN		(0x1<<3)
-+#define SUSPEND_DISABLE		(0x0<<0)
-+#define SUSPEND_ENABLE		(0x1<<0)
-+
-+/* S3C_USBOTG_PHYCLK */
-+#define REF_CLK_CRYSTAL		(0x0<<5)
-+#define REF_CLK_OSCC		(0x1<<5)
-+
-+/* S3C_USBOTG_RSTCON */
-+#define SW_RST_OFF			(0x0<<0)
-+#define SW_RST_ON			(0x1<<0)
-+
-+/* S3C_UDC_OTG_GOTGCTL */
-+#define B_SESSION_VALID		(0x1<<19)
-+#define A_SESSION_VALID		(0x1<<18)
-+
-+/* S3C_UDC_OTG_GAHBCFG */
-+#define PTXFE_HALF			(0x0<<8)
-+#define PTXFE_ZERO			(0x1<<8)
-+#define NPTXFE_HALF			(0x0<<7)
-+#define NPTXFE_ZERO			(0x1<<7)
-+#define MODE_SLAVE			(0x0<<5)
-+#define MODE_DMA			(0x1<<5)
-+#define BURST_SINGLE		(0x0<<1)
-+#define BURST_INCR			(0x1<<1)
-+#define BURST_INCR4			(0x3<<1)
-+#define BURST_INCR8			(0x5<<1)
-+#define BURST_INCR16		(0x7<<1)
-+#define GBL_INT_UNMASK		(0x1<<0)
-+#define GBL_INT_MASK		(0x0<<0)
-+
-+/* S3C_UDC_OTG_GUSBCFG */
-+#define PHY_CLK_480M		(0x0<<15)
-+#define PHY_CLK_48M			(0x1<<15)
-+#define TXFIFO_RE_DIS		(0x0<<14)
-+#define TXFIFO_RE_EN		(0x1<<14)
-+#define TURN_AROUND			(0x5<<10)
-+#define HNP_DISABLE			(0x0<<9)
-+#define HNP_ENABLE			(0x1<<9)
-+#define SRP_DISABLE			(0x0<<8)
-+#define SRP_ENABLE			(0x1<<8)
-+#define ULPI_DDR			(0x0<<7)
-+#define HS_UTMI				(0x0<<6)
-+#define INTERF_UTMI			(0x0<<4)
-+#define INTERF_ULPI			(0x1<<4)
-+#define PHY_INTERF_8		(0x0<<3)
-+#define PHY_INTERF_16		(0x1<<3)
-+#define TIME_OUT_CAL		(0x7<<0)
-+
-+/* S3C_UDC_OTG_GRSTCTL */
-+#define AHB_MASTER_IDLE		(1u<<31)
-+#define CORE_SOFT_RESET		(0x1<<0)
-+
-+/* S3C_UDC_OTG_GINTSTS/S3C_UDC_OTG_GINTMSK core interrupt register */
-+#define INT_RESUME			(0x1<<31)
-+#define INT_DISCONN			(0x1<<29)
-+#define INT_CONN_CNG		(0x1<<28)
-+#define INT_OUT_EP			(0x1<<19)
-+#define INT_IN_EP			(0x1<<18)
-+#define INT_ENUMDONE		(0x1<<13)
-+#define INT_RESET			(0x1<<12)
-+#define INT_SUSPEND			(0x1<<11)
-+#define INT_EARLY_SUSPEND	(0x1<<10)
-+#define INT_TX_FIFO_EMPTY	(0x1<<5)
-+#define INT_RX_FIFO_NOT_EMPTY	(0x1<<4)
-+#define INT_SOF				(0x1<<3)
-+#define INT_DEV_MODE		(0x0<<0)
-+#define INT_HOST_MODE		(0x1<<1)
-+
-+#define FULL_SPEED_CONTROL_PKT_SIZE		8
-+#define FULL_SPEED_BULK_PKT_SIZE		64
-+
-+#define HIGH_SPEED_CONTROL_PKT_SIZE		64
-+#define HIGH_SPEED_BULK_PKT_SIZE		512
-+
-+/* S3C_UDC_OTG_DSTS */
-+#define RX_FIFO_SIZE		(2048<<0)
-+#define NPTX_FIFO_START_ADDR	(RX_FIFO_SIZE<<0)
-+#define NPTX_FIFO_SIZE		(2048<<16)
-+#define PTX_FIFO_SIZE		(2048<<16)
-+#define USB_HIGH_30_60MHZ	(0x0<<1)
-+#define USB_FULL_30_60MHZ	(0x1<<1)
-+#define USB_LOW_6MHZ		(0x2<<1)
-+#define USB_FULL_48MHZ		(0x3<<1)
-+
-+/* S3C_UDC_OTG_GRXSTSP */
-+#define BYTE_COUNT(x)		((x & (0x7FF<<4)) >> 4)
-+#define PKT_STS(x)			((x & (0xF<<17)) >> 17)
-+#define EP_NUM(x)			(x & 0xF)
-+
-+#define OUT_PKT_RECEIVED	(0x2)
-+#define OUT_COMPLELTED		(0x3)
-+#define SETUP_COMPLETED		(0x4)
-+#define SETUP_PKT_RECEIVED	(0x6)
-+
-+/* S3C_UDC_OTG_DCFG */
-+#define EP_MIS_CNT(x)		(x<<18)
-+#define DEVICE_ADDR(x)		(x<<4)
-+#define SPEED_2_HIGH		(0x0<<0)
-+#define SPEED_2_FULL		(0x1<<0)
-+#define SPEED_1_LOW			(0x2<<0)
-+#define SPEED_1_FULL		(0x3<<0)
-+
-+/* S3C_UDC_OTG_DCTL device control register */
-+#define NORMAL_OPERATION	(0x1<<0)
-+#define SOFT_DISCONNECT		(0x1<<1)
-+
-+/* S3C_UDC_OTG_DSTS */
-+#define ENUM_SPEED(x)		(x & (0x3<<1))
-+#define FRAME_CNT(x)		(x & (0x3ff<<8))
-+
-+/* S3C_UDC_OTG_DAINT device all endpoint interrupt register */
-+#define S3C_UDC_INT_IN_EP0	(0x1<<0)
-+#define S3C_UDC_INT_IN_EP2	(0x1<<2)
-+#define S3C_UDC_INT_IN_EP3	(0x1<<3)
-+#define S3C_UDC_INT_OUT_EP0	(0x1<<16)
-+#define S3C_UDC_INT_OUT_EP1	(0x1<<17)
-+#define S3C_UDC_INT_OUT_EP4	(0x1<<20)
-+
-+/* S3C_UDC_OTG_DIEPCTL0/DOEPCTL0 device control
-+   IN/OUT endpoint 0 control register */
-+#define DEPCTL_EPENA		(0x1<<31)
-+#define DEPCTL_EPDIS		(0x1<<30)
-+#define DEPCTL_SNAK			(0x1<<27)
-+#define DEPCTL_CNAK			(0x1<<26)
-+#define DEPCTL_CTRL_TYPE	(0x0<<18)
-+#define DEPCTL_ISO_TYPE		(0x1<<18)
-+#define DEPCTL_BULK_TYPE	(0x2<<18)
-+#define DEPCTL_INTR_TYPE	(0x3<<18)
-+#define DEPCTL_USBACTEP		(0x1<<15)
-+#define DEPCTL0_MPS_64		(0x0<<0)
-+#define DEPCTL0_MPS_32		(0x1<<0)
-+#define DEPCTL0_MPS_16		(0x2<<0)
-+#define DEPCTL0_MPS_8		(0x3<<0)
-+
-+/* S3C_UDC_OTG_DIEPINTn */
-+#define IN_EP_NAK_EFF		(0x1<<6)
-+#define IN_TK_EPMIS			(0x1<<5)
-+#define IN_TK_TXFEMP		(0x1<<4)
-+#define IN_EP_TIMEOUT		(0x1<<3)
-+
-+/* S3C_UDC_OTG_DOEPINTn */
-+#define BACK2BACK_SETUP		(0x1<<6)
-+#define OUT_TK_EP_DIS		(0x1<<4)
-+#define SETUP_PHASE_DONE	(0x1<<3)
-+
-+/* S3C_UDC_OTG_DIEPINTn/DOEPINTn */
-+#define AHB_ERROR			(0x1<<2)
-+#define EPDISBLD			(0x1<<1)
-+#define TRANSFER_DONE		(0x1<<0)
-+
-+/* S3C_UDC_OTG_DIEPTSIZn */
-+#define PKT_CNT(x)			(x<<19)
-+#define XFERSIZE(x)			(x<<0)
-+
-+#endif
---- a/arch/arm/plat-s3c/Kconfig
-+++ b/arch/arm/plat-s3c/Kconfig
-@@ -184,4 +184,9 @@ config S3C_DEV_FB
- 	help
- 	  Compile in platform device definition for framebuffer
- 
-+config S3C_DEV_USB_HOST
-+	bool
-+	help
-+	  Compile in platform device definition for USB host.
-+
- endif
---- a/arch/arm/plat-s3c/Makefile
-+++ b/arch/arm/plat-s3c/Makefile
-@@ -35,6 +35,8 @@ obj-$(CONFIG_S3C_DEV_HSMMC1)	+= dev-hsmm
- obj-y				+= dev-i2c0.o
- obj-$(CONFIG_S3C_DEV_I2C1)	+= dev-i2c1.o
- obj-$(CONFIG_S3C_DEV_FB)	+= dev-fb.o
-+obj-$(CONFIG_S3C_DEV_USB_HOST)	+= dev-usb.o
-+
- obj-$(CONFIG_S3C_PWM)		+= pwm.o
- obj-$(CONFIG_S3C_DMA)		+= dma.o
- 
---- a/arch/arm/plat-s3c24xx/devs.c
-+++ b/arch/arm/plat-s3c24xx/devs.c
-@@ -136,36 +136,6 @@ struct platform_device *s3c24xx_uart_src
- struct platform_device *s3c24xx_uart_devs[4] = {
- };
- 
--/* USB Host Controller */
--
--static struct resource s3c_usb_resource[] = {
--	[0] = {
--		.start = S3C24XX_PA_USBHOST,
--		.end   = S3C24XX_PA_USBHOST + S3C24XX_SZ_USBHOST - 1,
--		.flags = IORESOURCE_MEM,
--	},
--	[1] = {
--		.start = IRQ_USBH,
--		.end   = IRQ_USBH,
--		.flags = IORESOURCE_IRQ,
--	}
--};
--
--static u64 s3c_device_usb_dmamask = 0xffffffffUL;
--
--struct platform_device s3c_device_usb = {
--	.name		  = "s3c2410-ohci",
--	.id		  = -1,
--	.num_resources	  = ARRAY_SIZE(s3c_usb_resource),
--	.resource	  = s3c_usb_resource,
--	.dev              = {
--		.dma_mask = &s3c_device_usb_dmamask,
--		.coherent_dma_mask = 0xffffffffUL
--	}
--};
--
--EXPORT_SYMBOL(s3c_device_usb);
--
- /* LCD Controller */
- 
- static struct resource s3c_lcd_resource[] = {
diff --git a/target/linux/s3c24xx/patches-2.6.30/013-fiq_c_handler.patch b/target/linux/s3c24xx/patches-2.6.30/013-fiq_c_handler.patch
deleted file mode 100644
index de12e10cd..000000000
--- a/target/linux/s3c24xx/patches-2.6.30/013-fiq_c_handler.patch
+++ /dev/null
@@ -1,286 +0,0 @@
---- a/arch/arm/kernel/fiq.c
-+++ b/arch/arm/kernel/fiq.c
-@@ -8,6 +8,8 @@
-  *
-  *  FIQ support re-written by Russell King to be more generic
-  *
-+ *  FIQ handler in C supoprt written by Andy Green <andy@openmoko.com>
-+ *
-  * We now properly support a method by which the FIQ handlers can
-  * be stacked onto the vector.  We still do not support sharing
-  * the FIQ vector itself.
-@@ -124,6 +126,83 @@ void __naked get_fiq_regs(struct pt_regs
- 	: "r" (&regs->ARM_r8), "I" (PSR_I_BIT | PSR_F_BIT | FIQ_MODE));
- }
- 
-+/* -------- FIQ handler in C ---------
-+ *
-+ * Major Caveats for using this
-+ *  ---------------------------
-+ *  *
-+ *  * 1) it CANNOT touch any vmalloc()'d memory, only memory
-+ *    that was kmalloc()'d.  Static allocations in the monolithic kernel
-+ *    are kmalloc()'d so they are okay.  You can touch memory-mapped IO, but
-+ *    the pointer for it has to have been stored in kmalloc'd memory.  The
-+ *    reason for this is simple: every now and then Linux turns off interrupts
-+ *    and reorders the paging tables.  If a FIQ happens during this time, the
-+ *    virtual memory space can be partly or entirely disordered or missing.
-+ *
-+ * 2) Because vmalloc() is used when a module is inserted, THIS FIQ
-+ *    ISR HAS TO BE IN THE MONOLITHIC KERNEL, not a module.  But the way
-+ *    it is set up, you can all to enable and disable it from your module
-+ *    and intercommunicate with it through struct fiq_ipc
-+ *    fiq_ipc which you can define in
-+ *    asm/archfiq_ipc_type.h.  The reason is the same as above, a
-+ *    FIQ could happen while even the ISR is not present in virtual memory
-+ *    space due to pagetables being changed at the time.
-+ *
-+ * 3) You can't call any Linux API code except simple macros
-+ *    - understand that FIQ can come in at any time, no matter what
-+ *      state of undress the kernel may privately be in, thinking it
-+ *      locked the door by turning off interrupts... FIQ is an
-+ *      unstoppable monster force (which is its value)
-+ *    - they are not vmalloc()'d memory safe
-+ *    - they might do crazy stuff like sleep: FIQ pisses fire and
-+ *      is not interested in 'sleep' that the weak seem to need
-+ *    - calling APIs from FIQ can re-enter un-renterable things
-+ *    - summary: you cannot interoperate with linux APIs directly in the FIQ ISR
-+ *
-+ * If you follow these rules, it is fantastic, an extremely powerful, solid,
-+ * genuine hard realtime feature.
-+ */
-+
-+static void (*current_fiq_c_isr)(void);
-+#define FIQ_C_ISR_STACK_SIZE 	256
-+
-+static void __attribute__((naked)) __jump_to_isr(void)
-+{
-+	asm __volatile__ ("mov pc, r8");
-+}
-+
-+
-+static void __attribute__((naked)) __actual_isr(void)
-+{
-+	asm __volatile__ (
-+		"stmdb	sp!, {r0-r12, lr};"
-+		"mov     fp, sp;"
-+	);
-+
-+	current_fiq_c_isr();
-+
-+	asm __volatile__ (
-+		"ldmia	sp!, {r0-r12, lr};"
-+		"subs	pc, lr, #4;"
-+	);
-+}
-+
-+void set_fiq_c_handler(void (*isr)(void))
-+{
-+	struct pt_regs regs;
-+
-+	memset(&regs, 0, sizeof(regs));
-+	regs.ARM_r8 = (unsigned long) __actual_isr;
-+	regs.ARM_sp = 0xffff001c + FIQ_C_ISR_STACK_SIZE;
-+
-+	set_fiq_handler(__jump_to_isr, 4);
-+
-+	current_fiq_c_isr = isr;
-+
-+	set_fiq_regs(&regs);
-+}
-+/* -------- FIQ handler in C ---------*/
-+
- int claim_fiq(struct fiq_handler *f)
- {
- 	int ret = 0;
---- a/arch/arm/include/asm/fiq.h
-+++ b/arch/arm/include/asm/fiq.h
-@@ -29,8 +29,9 @@ struct fiq_handler {
- extern int claim_fiq(struct fiq_handler *f);
- extern void release_fiq(struct fiq_handler *f);
- extern void set_fiq_handler(void *start, unsigned int length);
--extern void set_fiq_regs(struct pt_regs *regs);
--extern void get_fiq_regs(struct pt_regs *regs);
-+extern void set_fiq_c_handler(void (*handler)(void));
-+extern void __attribute__((naked)) set_fiq_regs(struct pt_regs *regs);
-+extern void __attribute__((naked)) get_fiq_regs(struct pt_regs *regs);
- extern void enable_fiq(int fiq);
- extern void disable_fiq(int fiq);
- 
---- a/arch/arm/plat-s3c24xx/include/plat/irq.h
-+++ b/arch/arm/plat-s3c24xx/include/plat/irq.h
-@@ -12,6 +12,7 @@
- 
- #include <linux/io.h>
- 
-+#include <mach/irqs.h>
- #include <mach/hardware.h>
- #include <mach/regs-irq.h>
- #include <mach/regs-gpio.h>
-@@ -31,8 +32,15 @@ s3c_irqsub_mask(unsigned int irqno, unsi
- {
- 	unsigned long mask;
- 	unsigned long submask;
-+#ifdef CONFIG_S3C2440_C_FIQ
-+	unsigned long flags;
-+#endif
- 
- 	submask = __raw_readl(S3C2410_INTSUBMSK);
-+#ifdef CONFIG_S3C2440_C_FIQ
-+	local_save_flags(flags);
-+	local_fiq_disable();
-+#endif
- 	mask = __raw_readl(S3C2410_INTMSK);
- 
- 	submask |= (1UL << (irqno - IRQ_S3CUART_RX0));
-@@ -45,6 +53,9 @@ s3c_irqsub_mask(unsigned int irqno, unsi
- 
- 	/* write back masks */
- 	__raw_writel(submask, S3C2410_INTSUBMSK);
-+#ifdef CONFIG_S3C2440_C_FIQ
-+	local_irq_restore(flags);
-+#endif
- 
- }
- 
-@@ -53,8 +64,15 @@ s3c_irqsub_unmask(unsigned int irqno, un
- {
- 	unsigned long mask;
- 	unsigned long submask;
-+#ifdef CONFIG_S3C2440_C_FIQ
-+	unsigned long flags;
-+#endif
- 
- 	submask = __raw_readl(S3C2410_INTSUBMSK);
-+#ifdef CONFIG_S3C2440_C_FIQ
-+	local_save_flags(flags);
-+	local_fiq_disable();
-+#endif
- 	mask = __raw_readl(S3C2410_INTMSK);
- 
- 	submask &= ~(1UL << (irqno - IRQ_S3CUART_RX0));
-@@ -63,6 +81,9 @@ s3c_irqsub_unmask(unsigned int irqno, un
- 	/* write back masks */
- 	__raw_writel(submask, S3C2410_INTSUBMSK);
- 	__raw_writel(mask, S3C2410_INTMSK);
-+#ifdef CONFIG_S3C2440_C_FIQ
-+	local_irq_restore(flags);
-+#endif
- }
- 
- 
---- a/arch/arm/plat-s3c24xx/irq.c
-+++ b/arch/arm/plat-s3c24xx/irq.c
-@@ -28,6 +28,8 @@
- #include <asm/mach/irq.h>
- 
- #include <plat/regs-irqtype.h>
-+#include <mach/regs-irq.h>
-+#include <mach/regs-gpio.h>
- 
- #include <plat/cpu.h>
- #include <plat/pm.h>
-@@ -37,12 +39,20 @@ static void
- s3c_irq_mask(unsigned int irqno)
- {
- 	unsigned long mask;
--
-+#ifdef CONFIG_S3C2440_C_FIQ
-+	unsigned long flags;
-+#endif
- 	irqno -= IRQ_EINT0;
--
-+#ifdef CONFIG_S3C2440_C_FIQ
-+	local_save_flags(flags);
-+	local_fiq_disable();
-+#endif
- 	mask = __raw_readl(S3C2410_INTMSK);
- 	mask |= 1UL << irqno;
- 	__raw_writel(mask, S3C2410_INTMSK);
-+#ifdef CONFIG_S3C2440_C_FIQ
-+	local_irq_restore(flags);
-+#endif
- }
- 
- static inline void
-@@ -59,9 +69,19 @@ s3c_irq_maskack(unsigned int irqno)
- {
- 	unsigned long bitval = 1UL << (irqno - IRQ_EINT0);
- 	unsigned long mask;
--
-+#ifdef CONFIG_S3C2440_C_FIQ
-+	unsigned long flags;
-+#endif
-+
-+#ifdef CONFIG_S3C2440_C_FIQ
-+	local_save_flags(flags);
-+	local_fiq_disable();
-+#endif
- 	mask = __raw_readl(S3C2410_INTMSK);
- 	__raw_writel(mask|bitval, S3C2410_INTMSK);
-+#ifdef CONFIG_S3C2440_C_FIQ
-+	local_irq_restore(flags);
-+#endif
- 
- 	__raw_writel(bitval, S3C2410_SRCPND);
- 	__raw_writel(bitval, S3C2410_INTPND);
-@@ -72,15 +92,25 @@ static void
- s3c_irq_unmask(unsigned int irqno)
- {
- 	unsigned long mask;
-+#ifdef CONFIG_S3C2440_C_FIQ
-+	unsigned long flags;
-+#endif
- 
- 	if (irqno != IRQ_TIMER4 && irqno != IRQ_EINT8t23)
- 		irqdbf2("s3c_irq_unmask %d\n", irqno);
- 
- 	irqno -= IRQ_EINT0;
- 
-+#ifdef CONFIG_S3C2440_C_FIQ
-+	local_save_flags(flags);
-+	local_fiq_disable();
-+#endif
- 	mask = __raw_readl(S3C2410_INTMSK);
- 	mask &= ~(1UL << irqno);
- 	__raw_writel(mask, S3C2410_INTMSK);
-+#ifdef CONFIG_S3C2440_C_FIQ
-+	local_irq_restore(flags);
-+#endif
- }
- 
- struct irq_chip s3c_irq_level_chip = {
-@@ -523,26 +553,26 @@ void __init s3c24xx_init_irq(void)
- 
- 	last = 0;
- 	for (i = 0; i < 4; i++) {
--		pend = __raw_readl(S3C2410_INTPND);
-+		pend = __raw_readl(S3C2410_SUBSRCPND);
- 
- 		if (pend == 0 || pend == last)
- 			break;
- 
--		__raw_writel(pend, S3C2410_SRCPND);
--		__raw_writel(pend, S3C2410_INTPND);
--		printk("irq: clearing pending status %08x\n", (int)pend);
-+		printk("irq: clearing subpending status %08x\n", (int)pend);
-+		__raw_writel(pend, S3C2410_SUBSRCPND);
- 		last = pend;
- 	}
- 
- 	last = 0;
- 	for (i = 0; i < 4; i++) {
--		pend = __raw_readl(S3C2410_SUBSRCPND);
-+		pend = __raw_readl(S3C2410_INTPND);
- 
- 		if (pend == 0 || pend == last)
- 			break;
- 
--		printk("irq: clearing subpending status %08x\n", (int)pend);
--		__raw_writel(pend, S3C2410_SUBSRCPND);
-+		__raw_writel(pend, S3C2410_SRCPND);
-+		__raw_writel(pend, S3C2410_INTPND);
-+		printk("irq: clearing pending status %08x\n", (int)pend);
- 		last = pend;
- 	}
- 
diff --git a/target/linux/s3c24xx/patches-2.6.30/014-neo1973_mach.patch b/target/linux/s3c24xx/patches-2.6.30/014-neo1973_mach.patch
deleted file mode 100644
index 926af21b8..000000000
--- a/target/linux/s3c24xx/patches-2.6.30/014-neo1973_mach.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/arch/arm/plat-s3c24xx/Kconfig
-+++ b/arch/arm/plat-s3c24xx/Kconfig
-@@ -112,4 +112,20 @@ config MACH_SMDK
- 	help
- 	  Common machine code for SMDK2410 and SMDK2440
- 
-+config MACH_NEO1973
-+	bool
-+	select RFKILL
-+	select SERIAL_SAMSUNG
-+	select SERIAL_SAMSUNG_CONSOLE
-+	help
-+	  Common machine code for Neo1973 hardware
-+
-+config MACH_NEO1973
-+	bool
-+	select RFKILL
-+	select SERIAL_SAMSUNG
-+	select SERIAL_SAMSUNG_CONSOLE
-+	help
-+	  Common machine code for Neo1973 hardware
-+
- endif
---- a/arch/arm/mach-s3c2442/Makefile
-+++ b/arch/arm/mach-s3c2442/Makefile
-@@ -14,3 +14,8 @@ obj-$(CONFIG_CPU_S3C2442)	+= clock.o
- 
- # Machine support
- 
-+obj-$(CONFIG_MACH_NEO1973)	+= \
-+                                   gta02-pm-gsm.o \
-+                                   gta02-pm-gps.o \
-+                                   gta02-pm-bt.o  \
-+                                   gta02-pm-wlan.o
---- a/drivers/misc/Makefile
-+++ b/drivers/misc/Makefile
-@@ -21,3 +21,6 @@ obj-$(CONFIG_HP_ILO)		+= hpilo.o
- obj-$(CONFIG_ISL29003)		+= isl29003.o
- obj-$(CONFIG_C2PORT)		+= c2port/
- obj-y				+= eeprom/
-+obj-$(CONFIG_MACH_NEO1973)      += gta02_pm_host.o \
-+                                   gta02_pm_resume_reason.o
-+
diff --git a/target/linux/s3c24xx/patches-2.6.30/015-mach-gta02.patch b/target/linux/s3c24xx/patches-2.6.30/015-mach-gta02.patch
deleted file mode 100644
index dae9ce6cb..000000000
--- a/target/linux/s3c24xx/patches-2.6.30/015-mach-gta02.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- a/arch/arm/mach-s3c2442/Kconfig
-+++ b/arch/arm/mach-s3c2442/Kconfig
-@@ -25,6 +25,21 @@ config SMDK2440_CPU2442
- 	depends on ARCH_S3C2440
- 	select CPU_S3C2442
- 
-+config MACH_NEO1973_GTA02
-+	bool "Openmoko Freerunner GSM Phone (GTA02 Hardware)"
-+	select CPU_S3C2442
-+	select MFD_PCF50633
-+	select PCF50633_GPIO
-+	select I2C
-+	select POWER_SUPPLY
-+	select MACH_NEO1973
-+	select S3C_PWM
-+	select FIQ
-+	select S3C_DEV_USB_HOST
-+	select S3C24XX_GPIO_EXTRA64
-+	help
-+	   Say Y here if you are using the Openmoko Freerunner GSM Phone
-+
- 
- endmenu
- 
---- a/arch/arm/mach-s3c2442/Makefile
-+++ b/arch/arm/mach-s3c2442/Makefile
-@@ -9,8 +9,11 @@ obj-m				:=
- obj-n				:=
- obj-				:=
- 
-+obj-$(CONFIG_S3C2440_C_FIQ)	+= fiq_c_isr.o
-+
- obj-$(CONFIG_CPU_S3C2442)	+= s3c2442.o
- obj-$(CONFIG_CPU_S3C2442)	+= clock.o
-+obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o
- 
- # Machine support
- 
---- a/arch/arm/mach-s3c2410/include/mach/irqs.h
-+++ b/arch/arm/mach-s3c2410/include/mach/irqs.h
-@@ -153,9 +153,9 @@
- #define IRQ_S3C2443_AC97	S3C2410_IRQSUB(28)
- 
- #ifdef CONFIG_CPU_S3C2443
--#define NR_IRQS (IRQ_S3C2443_AC97+1)
-+#define _NR_IRQS (IRQ_S3C2443_AC97+1)
- #else
--#define NR_IRQS (IRQ_S3C2440_AC97+1)
-+#define _NR_IRQS (IRQ_S3C2440_AC97+1)
- #endif
- 
- /* compatibility define. */
-@@ -167,4 +167,33 @@
- /* Our FIQs are routable from IRQ_EINT0 to IRQ_ADCPARENT */
- #define FIQ_START		IRQ_EINT0
- 
-+
-+/*
-+ * The next 16 interrupts are for board specific purposes.  Since
-+ * the kernel can only run on one machine at a time, we can re-use
-+ * these.  If you need more, increase IRQ_BOARD_END, but keep it
-+ * within sensible limits.
-+ */
-+#define IRQ_BOARD_START         _NR_IRQS
-+#define IRQ_BOARD_END           (_NR_IRQS + 10)
-+
-+#if defined(CONFIG_MACH_NEO1973_GTA02)
-+#define NR_IRQS                 (IRQ_BOARD_END)
-+#else
-+#define NR_IRQS                 (IRQ_BOARD_START)
-+#endif
-+
-+/* Neo1973 GTA02 interrupts */
-+#define NEO1973_GTA02_IRQ(x)    (IRQ_BOARD_START + (x))
-+#define IRQ_GLAMO(x)            NEO1973_GTA02_IRQ(x)
-+#define IRQ_GLAMO_HOSTBUS       IRQ_GLAMO(0)
-+#define IRQ_GLAMO_JPEG          IRQ_GLAMO(1)
-+#define IRQ_GLAMO_MPEG          IRQ_GLAMO(2)
-+#define IRQ_GLAMO_MPROC1        IRQ_GLAMO(3)
-+#define IRQ_GLAMO_MPROC0        IRQ_GLAMO(4)
-+#define IRQ_GLAMO_CMDQUEUE      IRQ_GLAMO(5)
-+#define IRQ_GLAMO_2D            IRQ_GLAMO(6)
-+#define IRQ_GLAMO_MMC           IRQ_GLAMO(7)
-+#define IRQ_GLAMO_RISC          IRQ_GLAMO(8)
-+
- #endif /* __ASM_ARCH_IRQ_H */
diff --git a/target/linux/s3c24xx/patches-2.6.30/030-dont-override-logo-with-early-printks.patch b/target/linux/s3c24xx/patches-2.6.30/030-dont-override-logo-with-early-printks.patch
deleted file mode 100644
index 305af188a..000000000
--- a/target/linux/s3c24xx/patches-2.6.30/030-dont-override-logo-with-early-printks.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- a/drivers/video/console/fbcon.c
-+++ b/drivers/video/console/fbcon.c
-@@ -562,7 +562,7 @@ static void fbcon_prepare_logo(struct vc
- 	/* Need to make room for the logo */
- 	struct fbcon_ops *ops = info->fbcon_par;
- 	int cnt, erase = vc->vc_video_erase_char, step;
--	unsigned short *save = NULL, *r, *q;
-+	unsigned short *r, *q;
- 	int logo_height;
- 
- 	if (info->flags & FBINFO_MODULE) {
-@@ -581,37 +581,18 @@ static void fbcon_prepare_logo(struct vc
- 	q = (unsigned short *) (vc->vc_origin +
- 				vc->vc_size_row * rows);
- 	step = logo_lines * cols;
--	for (r = q - logo_lines * cols; r < q; r++)
--		if (scr_readw(r) != vc->vc_video_erase_char)
--			break;
--	if (r != q && new_rows >= rows + logo_lines) {
--		save = kmalloc(logo_lines * new_cols * 2, GFP_KERNEL);
--		if (save) {
--			int i = cols < new_cols ? cols : new_cols;
--			scr_memsetw(save, erase, logo_lines * new_cols * 2);
--			r = q - step;
--			for (cnt = 0; cnt < logo_lines; cnt++, r += i)
--				scr_memcpyw(save + cnt * new_cols, r, 2 * i);
--			r = q;
--		}
--	}
--	if (r == q) {
--		/* We can scroll screen down */
--		r = q - step - cols;
--		for (cnt = rows - logo_lines; cnt > 0; cnt--) {
--			scr_memcpyw(r + step, r, vc->vc_size_row);
--			r -= cols;
--		}
--		if (!save) {
--			int lines;
--			if (vc->vc_y + logo_lines >= rows)
--				lines = rows - vc->vc_y - 1;
--			else
--				lines = logo_lines;
--			vc->vc_y += lines;
--			vc->vc_pos += lines * vc->vc_size_row;
--		}
--	}
-+	r = q - step - cols;
-+	for (cnt = rows - logo_lines; cnt > 0; cnt--) {
-+		scr_memcpyw(r + step, r, vc->vc_size_row);
-+		r -= cols;
-+	}
-+	int lines;
-+	if (vc->vc_y + logo_lines >= rows)
-+		lines = rows - vc->vc_y - 1;
-+	else
-+		lines = logo_lines;
-+	vc->vc_y += lines;
-+	vc->vc_pos += lines * vc->vc_size_row;
- 	scr_memsetw((unsigned short *) vc->vc_origin,
- 		    erase,
- 		    vc->vc_size_row * logo_lines);
-@@ -621,16 +602,6 @@ static void fbcon_prepare_logo(struct vc
- 		update_screen(vc);
- 	}
- 
--	if (save) {
--		q = (unsigned short *) (vc->vc_origin +
--					vc->vc_size_row *
--					rows);
--		scr_memcpyw(q, save, logo_lines * new_cols * 2);
--		vc->vc_y += logo_lines;
--		vc->vc_pos += logo_lines * vc->vc_size_row;
--		kfree(save);
--	}
--
- 	if (logo_lines > vc->vc_bottom) {
- 		logo_shown = FBCON_LOGO_CANSHOW;
- 		printk(KERN_INFO
diff --git a/target/linux/s3c24xx/patches-2.6.30/031-add-openwrt-logo.patch b/target/linux/s3c24xx/patches-2.6.30/031-add-openwrt-logo.patch
deleted file mode 100644
index 3e1a59c84..000000000
--- a/target/linux/s3c24xx/patches-2.6.30/031-add-openwrt-logo.patch
+++ /dev/null
@@ -1,38448 +0,0 @@
---- a/drivers/video/logo/Kconfig
-+++ b/drivers/video/logo/Kconfig
-@@ -82,4 +82,8 @@ config LOGO_M32R_CLUT224
- 	depends on M32R
- 	default y
- 
-+config LOGO_OPENWRT_CLUT224
-+	bool "224-color OpenWrt Linux logo"
-+	default y
-+
- endif # LOGO
---- a/drivers/video/logo/logo.c
-+++ b/drivers/video/logo/logo.c
-@@ -35,6 +35,7 @@ extern const struct linux_logo logo_supe
- extern const struct linux_logo logo_superh_vga16;
- extern const struct linux_logo logo_superh_clut224;
- extern const struct linux_logo logo_m32r_clut224;
-+extern const struct linux_logo logo_openwrt_clut224;
- 
- static int nologo;
- module_param(nologo, bool, 0);
-@@ -115,6 +116,10 @@ const struct linux_logo * __init_refok f
- 		/* M32R Linux logo */
- 		logo = &logo_m32r_clut224;
- #endif
-+#ifdef CONFIG_LOGO_OPENWRT_CLUT224
-+		/* OpenWrt logo */
-+		logo = &logo_openwrt_clut224;
-+#endif
- 	}
- 	return logo;
- }
---- /dev/null
-+++ b/drivers/video/logo/logo_openwrt_clut224.ppm
-@@ -0,0 +1,38403 @@
-+P3
-+480 480
-+255
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+69 83 130  70 84 131  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  70 85 132  70 85 132
-+71 85 132  72 84 131  72 85 132  70 84 131  42 58 112  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  34 50 107  67 81 129
-+73 86 133  73 86 133  73 86 133  73 86 133  72 85 132  72 85 132
-+73 86 133  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 134  74 87 134  74 87 134  74 87 134  74 87 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  74 87 134  74 87 134
-+73 86 134  73 86 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 133  73 86 133  72 85 132  73 86 133
-+73 86 133  73 86 133  73 86 134  51 66 119  25 42 101  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 43 102  61 75 125  72 85 132
-+72 85 132  72 84 131  71 85 132  70 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+70 84 131  69 83 130  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  69 83 131  68 82 130
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  68 82 130  67 81 129  67 81 129  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  67 80 128  35 51 108  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  27 44 103
-+65 79 128  66 80 129  65 79 128  66 80 129  66 80 128  66 80 127
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+65 79 128  64 78 128  64 78 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  64 78 127  63 77 126  63 77 126
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+63 77 126  63 77 126  48 64 116  23 40 99  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+44 59 113  62 76 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  58 73 123  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  57 72 122
-+58 73 123  58 73 123  58 73 123  57 72 122  44 60 114  23 40 99
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  34 50 107
-+57 72 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  54 70 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  30 46 104  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  26 43 102  43 58 114  51 66 119  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  47 63 116  37 53 109  23 40 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  44 59 113  46 61 115  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  40 57 112  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  27 44 102  38 54 110
-+40 56 111  40 56 111  39 55 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  69 83 130
-+70 84 131  71 85 132  70 84 131  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  70 85 132  71 85 132
-+72 84 131  72 85 132  70 83 130  43 58 114  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  44 59 113  71 84 131  73 86 133
-+72 85 132  73 86 133  73 86 133  72 85 132  73 86 133  73 86 133
-+74 87 134  73 86 133  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  73 86 134
-+73 86 134  74 87 134  74 87 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+74 87 133  74 87 133  74 87 133  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 134  75 88 134  74 87 134
-+74 87 134  73 86 134  73 86 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 133  74 87 134  73 86 133  73 86 133  72 85 132
-+73 86 133  73 86 133  72 85 132  74 87 134  61 75 125  32 50 106
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  26 43 101  57 72 122
-+72 85 132  72 85 132  71 85 132  71 85 132  70 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  70 84 131
-+71 85 132  70 84 131  69 83 130  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  69 83 131  69 83 131  69 83 131
-+68 82 130  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+68 82 130  69 83 131  68 82 130  67 81 129  68 82 130  68 82 130
-+68 82 130  68 82 130  67 81 129  69 83 130  59 74 124  26 43 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+43 59 113  68 81 130  66 80 129  66 80 129  66 80 128  66 80 128
-+66 80 127  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  65 79 128  64 78 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  64 78 127  65 79 128  64 78 127  63 77 126
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+63 77 126  62 76 125  58 73 123  30 46 104  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+31 47 105  59 74 124  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  59 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  59 74 124  58 73 123  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+57 72 122  58 73 123  58 73 123  58 73 123  53 68 119  26 43 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 100  25 42 101
-+55 69 121  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  56 70 122  54 70 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 69 120  53 68 119  54 69 120
-+54 69 120  54 69 120  53 68 119  55 70 121  38 54 109  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  38 54 110  51 66 119  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 63 117  42 58 112  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  39 55 110  46 61 115  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  26 43 102  36 52 108
-+40 56 111  40 56 111  39 55 111  39 55 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  26 44 102  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  69 83 130
-+70 84 131  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  70 85 132  71 85 132  72 84 131
-+72 85 132  72 85 132  40 56 111  23 40 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  54 69 120  72 85 132  73 86 133  72 85 132
-+73 86 133  72 85 132  72 85 132  73 86 133  74 87 134  74 87 134
-+73 86 133  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 134  74 87 134
-+74 87 134  75 88 134  75 88 134  74 87 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 133  74 87 133  74 87 133
-+74 87 133  74 87 133  74 87 133  74 87 133  74 87 133  74 87 133
-+75 88 134  75 88 134  75 88 134  74 87 133  74 87 133  74 87 133
-+74 87 133  74 87 133  74 87 133  74 87 133  74 87 133  74 87 133
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  74 87 134  75 88 134
-+75 88 134  74 87 134  74 87 134  73 86 134  73 86 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 133  74 87 134  73 86 133  72 85 132
-+72 85 132  73 86 133  73 86 133  72 85 132  73 86 133  67 80 128
-+38 54 109  23 40 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  27 44 102
-+58 73 123  72 85 132  71 84 131  71 85 132  71 85 132  70 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+70 84 131  71 85 132  69 83 130  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  69 83 131
-+69 83 131  68 82 130  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  68 82 130  67 81 129  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  67 81 129  69 83 131  46 61 115
-+23 39 99  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+28 45 103  59 74 124  66 80 129  65 79 128  66 80 129  66 80 128
-+66 80 127  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  65 79 128  65 79 128  64 78 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  63 77 126
-+64 78 127  63 77 126  62 76 125  42 58 112  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+27 44 102  50 65 118  61 75 125  59 74 124  61 75 125  61 75 125
-+61 75 125  60 75 125  59 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  59 74 124  60 75 125  58 73 123  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  59 74 124
-+57 72 122  58 73 123  58 73 123  58 73 123  56 71 121  34 50 107
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+44 60 115  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  54 70 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  55 70 121  53 68 119  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  47 63 116  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  34 50 107  50 65 118  50 65 118
-+49 64 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 63 117  44 60 114  27 44 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  34 50 107  46 61 115  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  44 60 114  44 60 114  43 59 113  44 60 114  29 45 103
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  34 50 107
-+40 56 111  39 55 111  40 56 111  39 55 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  29 45 103  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+70 84 131  70 84 131  70 84 131  70 84 131  69 83 130  70 84 131
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  70 85 132  71 85 132  72 84 131  72 85 132
-+73 85 132  38 54 110  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+27 44 102  63 77 126  72 85 132  73 86 133  72 85 132  73 86 133
-+72 85 132  73 86 133  73 86 133  74 87 134  73 86 133  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 134  73 86 134  74 87 134  74 87 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  74 87 133
-+74 87 133  74 87 133  74 87 133  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+76 89 135  76 89 135  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+74 87 133  74 87 133  74 87 133  74 87 133  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+74 87 134  75 88 134  74 87 134  74 87 134  74 87 134  73 86 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  73 86 133  74 87 134  73 86 133
-+73 86 133  72 85 132  73 86 133  73 86 133  73 86 133  73 86 133
-+72 85 132  42 58 112  23 40 99  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+26 43 101  62 76 125  72 85 132  71 84 131  72 85 132  70 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  70 84 131  69 83 130  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  69 83 131  70 84 131
-+69 83 131  68 82 130  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  68 82 130  69 83 131  68 82 130  67 81 129  68 82 130
-+68 82 130  68 82 130  68 82 130  67 81 129  68 82 130  67 81 129
-+31 47 105  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  43 58 114  66 80 128  66 80 129  66 80 129  66 80 129
-+66 80 128  66 80 127  66 80 128  66 80 128  66 80 128  66 80 128
-+65 79 128  66 80 128  65 79 128  64 78 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  64 78 127  65 79 128  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  62 76 125  63 77 126  53 67 120  27 44 102  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  40 56 111  61 75 125  61 75 125  61 75 125  61 75 125
-+60 75 125  61 75 125  59 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  58 73 123  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+57 72 122  58 73 123  58 73 123  58 73 123  58 73 123  42 58 112
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+36 52 108  57 72 122  55 69 121  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  54 70 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 69 120  53 68 119  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  55 70 121  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  29 45 103  48 63 117  50 65 118
-+49 64 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 63 117  46 61 115  29 47 104
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  29 47 104  46 61 115  45 60 114  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  34 50 107
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  33 49 106
-+40 56 111  40 56 111  40 56 111  39 55 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  31 47 105  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+70 84 131  70 84 131  70 84 131  69 83 130  70 84 131  71 85 132
-+70 84 131  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  70 85 132  71 85 132  72 85 132  72 85 132  71 84 131
-+43 59 113  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  29 47 104
-+63 77 126  73 86 133  72 85 132  73 86 133  73 86 133  72 85 132
-+73 86 133  74 87 134  73 86 133  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+73 86 134  73 86 134  74 87 134  75 88 134  74 87 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  74 87 133
-+74 87 133  74 87 133  75 88 134  75 88 134  75 88 134  75 88 134
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  75 88 134  76 89 135
-+76 89 135  76 89 135  76 89 135  75 88 134  75 88 134  75 88 134
-+75 88 134  74 87 133  74 87 133  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 134  75 88 134  75 88 134
-+74 87 134  74 87 134  73 86 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 133  72 85 132  72 85 132  73 86 133  72 85 132
-+72 85 132  74 87 134  48 63 117  24 41 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  63 77 126  72 85 132  72 85 132  72 84 131
-+71 85 132  70 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  70 84 131  69 83 130  69 83 130
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  69 83 131
-+70 84 131  69 83 131  68 82 130  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  68 82 130  67 81 129
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+56 71 121  23 40 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  29 46 103  59 74 124  66 80 129  66 80 129  66 80 129
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  65 79 128  66 80 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  64 78 127
-+63 77 126  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+63 77 126  64 78 127  63 77 126  63 77 126  33 49 106  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  32 48 105  57 72 122  61 75 125  61 75 125  61 75 125
-+61 75 125  60 75 125  60 75 125  59 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  59 74 124  59 74 124  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  57 72 122  58 73 123  58 73 123  58 73 123  49 64 117
-+27 44 102  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+30 46 104  55 69 121  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  53 68 119
-+54 69 120  54 69 120  54 69 120  54 69 120  55 70 121  34 50 107
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  47 63 116  50 65 118
-+49 64 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  49 65 117  48 63 117  34 50 107
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  29 45 103  44 60 114  46 61 115  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+45 60 114  43 60 114  44 60 114  44 60 114  44 60 114  38 54 109
-+23 40 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  31 47 105
-+39 55 110  40 56 111  40 56 111  39 55 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  34 50 107  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+70 84 131  70 84 131  70 84 131  69 83 130  71 85 132  70 84 131
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+70 85 132  71 85 132  71 85 132  71 84 131  72 85 132  49 64 117
-+24 41 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  23 40 100  33 49 106  63 77 126
-+74 87 134  73 86 133  73 86 133  73 86 133  72 85 132  73 86 133
-+74 87 134  73 86 133  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 134  73 86 134
-+74 87 134  74 87 134  75 88 134  74 87 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 133  74 87 133  75 88 134
-+75 88 134  75 88 134  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  75 88 134  76 89 135  76 89 135  76 89 135
-+75 88 134  75 88 134  75 88 134  74 87 133  74 87 133  74 87 133
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  74 87 134
-+75 88 134  74 87 134  74 87 134  73 86 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+73 86 133  74 87 134  73 86 133  72 85 132  72 85 132  73 86 133
-+73 86 133  72 85 132  73 86 133  51 66 119  26 43 102  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  29 45 103  63 77 126  72 85 132  72 85 132
-+71 85 132  70 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  70 84 131  71 85 132  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+69 83 131  70 84 131  68 82 130  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  68 82 130  68 82 130  68 82 130
-+67 81 129  68 82 130  68 82 130  68 82 130  68 82 130  67 81 129
-+66 80 128  38 54 110  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 99  45 60 114  66 80 129  65 79 128  66 80 128
-+66 80 129  66 80 127  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  65 79 128  64 78 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  64 78 127  65 79 128
-+63 77 126  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  63 77 126  64 78 127  46 61 115  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  51 66 119  59 74 124  61 75 125  61 75 125
-+61 75 125  61 75 125  60 75 125  59 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  59 74 124  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  57 72 122  58 73 123  58 73 123  58 73 123  56 71 121
-+30 46 104  25 42 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+27 44 102  48 63 117  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  53 68 119
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  43 59 113
-+23 40 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  23 40 99  42 57 112  51 66 119
-+50 65 118  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 116  48 64 117  37 53 109
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  27 44 102  42 57 112  46 61 115  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  43 60 114  44 60 114  44 60 114  44 60 114  42 58 112
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  29 45 103
-+39 55 110  40 56 111  40 56 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  35 51 108  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+70 84 131  70 84 131  69 83 130  70 84 131  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+70 85 132  71 85 132  71 84 131  73 86 133  53 67 120  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  23 39 99  35 51 108  66 80 128  74 87 134
-+72 85 132  72 85 132  72 85 132  72 85 132  73 86 133  74 87 134
-+73 86 133  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  73 86 134  74 87 134  74 87 134
-+75 88 134  75 88 134  74 87 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  74 87 133  74 87 133  75 88 134  75 88 134  75 88 134
-+76 89 135  76 89 135  75 88 134  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  75 88 134
-+76 89 135  76 89 135  75 88 134  75 88 134  75 88 134  74 87 133
-+74 87 133  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+74 87 134  75 88 134  74 87 134  74 87 134  73 86 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 133  74 87 134  73 86 133  73 86 133  72 85 132
-+73 86 133  73 86 133  73 86 133  73 86 133  54 69 120  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  33 49 106  66 80 128  72 85 132
-+71 85 132  71 85 132  70 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  70 84 131  71 85 132  69 83 130
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  69 83 131  68 82 130  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  68 82 130
-+67 81 129  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  56 71 121  27 44 102  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  26 43 101  62 76 125  66 80 129  66 80 129
-+66 80 129  66 80 128  66 80 127  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  65 79 128  66 80 128  64 78 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+64 78 127  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  63 77 126  63 77 126  61 75 125  26 43 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 100  40 56 111  59 74 124  61 75 125  61 75 125
-+61 75 125  61 75 125  60 75 125  60 75 125  59 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  59 74 124  59 74 124
-+58 73 123  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  58 73 123  57 72 122  58 73 123  57 72 122  59 74 124
-+36 52 108  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 101  42 58 112  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  53 68 119
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  51 67 118
-+23 40 99  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  35 51 108  51 66 119
-+50 65 118  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  49 65 117  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  48 64 117  40 57 112
-+26 43 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  39 55 110  46 61 115  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  43 60 114  44 60 114  44 60 114  43 59 113  43 59 113
-+26 43 102  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  26 43 102
-+38 54 110  40 56 111  39 55 111  40 56 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  36 52 108  26 43 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+70 84 131  69 83 130  70 84 131  71 85 132  70 84 131  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  70 85 132
-+71 85 132  71 84 131  73 86 133  58 73 123  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 100  36 52 108  68 82 130  73 86 133  72 85 132
-+73 86 133  73 86 133  73 86 133  73 86 133  73 86 133  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 134  74 87 134  75 88 134  75 88 134
-+74 87 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  74 87 133
-+74 87 133  75 88 134  75 88 134  76 89 135  76 89 135  76 89 135
-+75 88 134  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  75 88 134
-+75 88 134  74 87 133  74 87 133  74 87 133  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  74 87 134  75 88 134  75 88 134  74 87 134  73 86 134
-+73 86 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 133  74 87 134  74 87 134  73 86 133
-+72 85 132  73 86 133  72 85 132  73 86 133  73 86 133  57 72 122
-+23 40 99  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  37 53 109  72 85 132
-+71 84 131  72 85 132  71 85 132  70 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  70 84 131
-+69 83 130  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  69 83 131  70 84 131  69 83 131  68 82 130  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+68 82 130  67 81 129  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  37 53 109  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  23 40 100  42 58 112  68 81 130  65 79 128
-+66 80 128  66 80 129  66 80 127  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  65 79 128  64 78 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  64 78 127
-+64 78 127  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  63 77 126  62 76 125  64 78 127  39 55 110
-+23 40 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  26 43 102  61 75 125  59 74 124  61 75 125
-+61 75 125  61 75 125  61 75 125  60 75 125  59 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 74 124
-+58 73 123  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+59 74 124  58 73 123  57 72 122  58 73 123  57 72 122  58 73 123
-+47 63 116  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  36 52 108  55 69 121  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  55 70 121  54 70 120  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+53 68 119  54 69 120  54 69 120  54 69 120  53 68 119  53 68 119
-+29 46 104  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  28 45 103  51 66 119
-+50 65 118  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  48 64 117  44 61 114
-+27 44 102  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  37 53 109  46 61 115  45 60 114
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  43 60 114  44 60 114  44 60 114  44 60 114  43 59 113
-+30 46 104  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 101
-+38 54 109  39 55 110  40 56 111  40 56 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  37 53 109  27 44 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+69 83 130  70 84 131  71 85 132  70 84 131  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  70 85 132  71 85 132
-+72 85 132  72 85 132  63 77 126  27 43 102  25 42 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  34 50 107  67 81 129  73 86 133  73 86 133  73 86 133
-+72 85 132  73 86 133  74 87 134  73 86 133  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+73 86 134  74 87 134  75 88 134  75 88 134  74 87 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 133  75 88 134  75 88 134  75 88 134
-+76 89 135  76 89 135  75 88 134  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  75 88 134  75 88 134  74 87 133
-+74 87 133  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+74 87 134  73 86 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 133  74 87 134
-+73 86 133  72 85 132  73 86 133  73 86 133  72 85 132  73 86 133
-+57 72 122  24 41 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  23 40 99  43 59 113
-+72 85 132  72 85 132  72 84 131  71 85 132  70 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  70 84 131
-+70 84 131  69 83 130  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  69 83 131  68 82 130  68 82 130
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+68 82 130  67 81 129  68 82 130  68 82 130  68 82 130  68 82 130
-+67 81 129  68 82 130  59 74 124  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 101  63 77 126  66 80 129
-+65 79 128  66 80 128  66 80 128  66 80 127  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  65 79 128  64 78 128
-+64 78 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  64 78 127  63 77 126  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  63 77 126  63 77 126  57 72 122
-+23 40 99  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  23 40 99  50 65 118  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  60 75 125  59 75 125  59 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 74 124
-+58 73 123  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  57 72 122  58 73 123  58 73 123  58 73 123
-+58 73 123  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  31 47 105  53 67 120  55 69 121  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  55 70 121  54 70 120  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+53 68 119  54 69 120  54 69 120  54 69 120  54 69 120  53 68 119
-+37 53 109  23 40 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  23 40 99  49 64 117
-+50 65 118  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  48 64 117
-+28 45 103  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  34 50 106  45 60 114  45 60 114
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  43 60 114  44 60 114  44 60 114  43 59 113
-+33 49 106  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+36 52 108  40 56 111  40 56 111  40 56 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  38 54 110  28 45 103
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+69 83 130  70 84 131  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  70 85 132  71 85 132  71 85 132
-+72 85 132  67 80 128  34 50 106  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+33 49 106  65 79 128  74 87 133  72 85 132  73 86 133  72 85 132
-+73 86 133  74 87 134  73 86 133  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 134  73 86 134
-+74 87 134  75 88 134  74 87 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  74 87 133  75 88 134  75 88 134  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 88 135  76 88 135  76 88 135  76 88 135  76 88 135
-+76 88 135  76 88 135  76 88 135  76 88 135  76 88 135  76 88 135
-+76 88 135  76 88 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  75 88 134  76 89 135  75 88 134  75 88 134
-+75 88 134  74 87 133  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  74 87 134
-+75 88 134  74 87 134  73 86 134  73 86 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  73 86 133
-+74 87 134  73 86 133  72 85 132  73 86 133  73 86 133  72 85 132
-+73 86 133  53 67 120  25 42 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  23 40 99
-+50 65 118  72 85 132  72 85 132  72 84 131  70 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+70 84 131  70 84 131  69 83 130  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  69 83 131  70 84 131  69 83 131  68 82 130
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  68 82 130
-+69 83 131  68 82 130  67 81 129  68 82 130  68 82 130  68 82 130
-+68 82 130  67 81 129  71 85 132  40 56 111  23 40 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  42 57 112  68 81 130
-+66 80 129  66 80 129  66 80 128  66 80 128  66 80 127  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  65 79 128
-+64 78 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  64 78 127  63 77 126  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  63 77 126  63 77 126  63 77 126
-+32 50 106  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  34 50 107  63 77 126  59 74 124
-+61 75 125  61 75 125  60 75 125  61 75 125  60 75 125  59 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  59 74 124  60 75 125
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  59 74 124  58 73 123  58 73 123  58 73 123  57 72 122
-+59 74 124  34 50 107  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  50 65 118  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+53 68 119  54 69 120  54 69 120  54 69 120  54 69 120  53 68 119
-+44 59 113  23 40 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  23 40 100  42 58 112
-+51 66 119  50 65 118  49 64 117  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 116  49 65 117
-+32 50 106  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  31 47 105  44 60 114  45 60 114
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  45 60 114  43 60 114  44 60 114  44 60 114  43 59 113
-+37 53 109  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+33 49 106  40 56 111  40 56 111  40 56 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  29 46 104
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+70 84 131  71 85 132  70 84 131  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  70 85 132  71 85 132  71 85 132  71 84 131
-+71 84 131  42 57 112  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  23 40 100  29 47 104
-+65 79 128  74 87 133  72 85 132  73 86 133  72 85 132  73 86 133
-+73 86 133  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 134  74 87 134
-+74 87 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  74 87 133
-+74 87 133  75 88 134  76 89 135  76 89 135  75 88 134  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 88 135  76 88 135  76 88 135  76 88 135
-+76 88 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 88 135  76 88 135  76 88 135  76 88 135  76 88 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+75 88 134  75 88 134  74 87 133  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+74 87 134  75 88 134  74 87 134  74 87 134  73 86 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+73 86 133  74 87 134  73 86 133  72 85 132  73 86 133  73 86 133
-+73 86 133  72 85 132  49 64 117  23 40 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+26 43 102  57 72 122  73 85 132  72 84 131  71 85 132  70 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  70 84 131  70 84 131  69 83 130  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  69 83 131  68 82 130
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+68 82 130  69 83 131  67 81 129  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  64 78 127  25 42 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 101  29 46 104  61 75 125
-+66 80 129  65 79 128  66 80 129  66 80 128  66 80 127  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  65 79 128
-+64 78 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  64 78 127  64 78 127  63 77 126  64 78 127  64 78 127
-+64 78 127  64 78 127  63 77 126  64 78 127  63 77 126  63 77 126
-+49 64 117  23 40 99  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  58 73 123  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  60 75 125  59 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  46 61 115  23 40 99  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 99  44 59 113  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  56 70 122  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+48 64 116  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  36 52 108
-+52 67 118  50 65 118  49 64 117  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  49 65 117  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  48 64 117
-+37 53 109  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  27 44 103  44 59 113  45 60 114
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  43 60 114  44 60 114  44 60 114  44 60 114
-+39 55 110  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+29 47 104  40 56 111  40 56 111  40 56 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  39 55 111  31 47 105
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+71 85 132  70 84 131  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  72 85 132  71 84 131  73 85 132
-+52 67 118  23 40 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  27 44 102  65 79 128
-+73 86 133  72 85 132  73 86 133  73 86 133  73 86 133  74 87 134
-+74 87 134  73 86 133  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  73 86 134  74 87 134  75 88 134
-+75 88 134  74 87 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  74 87 133  75 88 134
-+75 88 134  76 89 135  75 88 134  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 88 135
-+76 88 135  76 88 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 88 135  76 88 135  76 88 135  76 88 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  75 88 134
-+76 89 135  76 89 135  75 88 134  74 87 133  74 87 133  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  74 87 134  75 88 134  75 88 134  74 87 134  73 86 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 133  74 87 134  73 86 133  72 85 132  73 86 133
-+72 85 132  73 86 133  73 86 133  45 60 114  23 40 99  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  31 47 105  65 79 128  72 85 132  72 85 132  71 85 132
-+70 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+70 84 131  71 85 132  70 84 131  69 83 130  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  69 83 131  70 84 131  69 83 131
-+68 82 130  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  68 82 130  67 81 129  68 82 130  68 82 130
-+68 82 130  68 82 130  67 81 129  68 82 130  46 61 115  23 40 99
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  47 63 116
-+66 80 129  66 80 129  66 80 129  66 80 128  66 80 127  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+65 79 128  64 78 128  65 79 128  65 79 128  65 79 128  65 79 128
-+64 78 127  65 79 128  64 78 127  63 77 126  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  63 77 126  63 77 126
-+57 72 122  27 44 102  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  46 61 115  62 76 125
-+61 75 125  61 75 125  61 75 125  61 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  56 71 121  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  35 51 108  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  55 70 121
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+50 65 118  30 46 104  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  29 45 103
-+53 67 120  50 65 118  49 64 117  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  50 65 118  49 65 117  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 64 117
-+43 59 113  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 100  43 58 114  45 60 114
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  43 60 114  44 60 114  44 60 114  44 60 114
-+40 56 111  26 43 102  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+28 45 103  40 56 111  40 56 111  40 56 111  39 55 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  33 49 106
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  70 85 132  71 85 132  72 84 131  72 85 132  63 77 126
-+23 40 99  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  26 43 102  59 74 124  73 86 133
-+72 85 132  73 86 133  72 85 132  73 86 133  74 87 134  73 86 133
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 134  73 86 134  74 87 134  74 87 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  74 87 133  74 87 133  75 88 134  76 89 135  76 89 135
-+75 88 134  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 88 135  76 88 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 90 135  76 90 135  76 90 135  76 89 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 89 135
-+76 90 135  76 90 135  76 90 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 88 135  76 88 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  75 88 134  75 88 134
-+74 87 133  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 134  75 88 134  74 87 134
-+73 86 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 133  74 87 134  73 86 133  72 85 132
-+73 86 133  73 86 133  72 85 132  74 87 134  39 55 111  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 99  40 57 112  70 84 131  72 85 132  72 84 131
-+71 85 132  70 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  70 84 131  71 85 132  70 84 131  69 83 130  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+69 83 131  68 82 130  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  68 82 130  67 81 129  67 81 129  68 82 130
-+68 82 130  68 82 130  68 82 130  67 81 129  63 77 126  27 44 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  35 52 107
-+63 77 126  66 80 129  66 80 128  66 80 129  66 80 128  66 80 127
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  63 77 126  64 78 127  63 77 126
-+61 75 125  37 53 109  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  34 50 107  62 76 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  59 74 124  57 72 122  58 73 123  58 73 123
-+57 72 122  57 72 122  32 50 106  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  26 43 102  55 70 121  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  55 70 121  54 70 120
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+52 67 118  34 50 107  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+50 65 118  50 65 118  49 64 117  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 64 117
-+47 63 116  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  23 40 100  40 56 111  46 61 115
-+45 60 114  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  43 60 114  43 60 114  44 60 114  44 60 114
-+40 57 112  28 45 103  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  40 56 111  39 55 110  40 56 111  40 56 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  35 51 108
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+70 85 132  71 85 132  72 84 131  72 85 132  68 81 130  29 47 104
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 100  50 65 118  73 86 133  73 86 133
-+73 86 133  72 85 132  73 86 133  74 87 134  73 86 133  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+73 86 134  74 87 134  74 87 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+74 87 133  75 88 134  75 88 134  76 89 135  75 88 134  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 88 135  76 88 135
-+76 89 135  76 89 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 89 135  76 90 135  76 90 135  76 90 135
-+76 89 135  76 89 135  76 89 135  76 88 135  76 88 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  75 88 134  76 89 135  76 89 135
-+75 88 134  74 87 133  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  74 87 134  75 88 134
-+74 87 134  73 86 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  73 86 133  74 87 134  73 86 133
-+72 85 132  73 86 133  73 86 133  72 85 132  70 84 131  35 51 108
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  23 39 99  51 66 119  73 86 133  71 84 131
-+71 85 132  70 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  70 84 131  71 85 132  69 83 130  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  69 83 131
-+69 83 131  68 82 130  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  68 82 130  67 81 129  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  67 81 129  43 58 114
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 101
-+55 70 121  65 79 128  66 80 129  66 80 129  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  65 79 128
-+66 80 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  64 78 127  65 79 128  63 77 126  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  62 76 125
-+63 77 126  46 61 115  25 42 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  29 46 103  57 72 122
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  59 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  58 73 123  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  57 72 122  58 73 123  58 73 123
-+58 73 123  57 72 122  40 57 112  23 40 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  23 40 99  50 65 118  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  55 70 121  56 70 122  54 70 120
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+54 69 120  53 68 119  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  38 54 110  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+44 60 114  51 66 119  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 64 116
-+50 65 118  27 44 102  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  23 40 100  37 53 109  46 61 115
-+45 60 114  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  43 60 114  44 60 114  44 60 114
-+43 59 113  29 47 104  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  39 55 110  40 56 111  40 56 111  40 56 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  37 53 109
-+26 43 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  70 85 132
-+71 85 132  72 85 132  72 85 132  71 84 131  42 58 112  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 99  44 59 113  73 86 133  73 86 133  72 85 132
-+73 86 133  72 85 132  73 86 133  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+73 86 134  74 87 134  75 88 134  74 87 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  74 87 133
-+74 87 133  75 88 134  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 88 135  76 88 135  76 89 135  76 89 135
-+76 89 135  76 90 135  76 89 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 89 135
-+76 90 135  76 90 135  76 89 135  76 89 135  76 89 135  76 88 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  75 88 134
-+76 89 135  75 88 134  74 87 133  74 87 133  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  74 87 134
-+75 88 134  74 87 134  73 86 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 133  74 87 134
-+73 86 133  72 85 132  73 86 133  72 85 132  73 86 133  64 78 127
-+29 46 104  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  61 75 125  73 86 133
-+72 84 131  71 85 132  70 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  70 84 131  69 83 130
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+69 83 131  69 83 131  68 82 130  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  68 82 130  68 82 130  67 81 129
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  57 72 122
-+27 44 103  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  23 40 99
-+39 55 111  65 79 128  65 79 128  66 80 128  66 80 129  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  64 78 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  64 78 127  63 77 126  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  63 77 126
-+63 77 126  55 69 121  28 45 103  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  26 43 102  49 64 117
-+61 75 125  59 74 124  61 75 125  61 75 125  61 75 125  60 75 125
-+59 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  59 74 124  58 73 123  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  58 73 123  57 72 122  58 73 123
-+58 73 123  57 72 122  49 65 117  23 40 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  23 40 100  40 57 112  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  54 70 120
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+55 70 121  53 68 119  54 69 120  54 69 120  54 69 120  53 68 119
-+54 69 120  43 59 113  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+39 55 111  51 66 119  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 64 117
-+48 64 117  34 50 106  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  32 50 106  46 61 115
-+45 60 114  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  43 60 114  44 60 114  44 60 114
-+44 60 114  32 48 107  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  36 52 108  40 56 111  40 56 111  40 56 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  38 54 110
-+26 43 102  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  70 85 132
-+71 85 132  72 85 132  72 85 132  57 72 122  25 42 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+23 40 100  35 52 107  73 86 133  73 86 133  72 85 132  73 86 133
-+72 85 132  73 86 133  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  73 86 134
-+74 87 134  75 88 134  74 87 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  74 87 133  75 88 134
-+75 88 134  76 89 135  75 88 134  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 88 135  76 88 135  76 89 135  76 89 135  76 90 135  76 90 135
-+76 90 135  76 89 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 89 135  76 89 135
-+76 88 135  76 88 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  75 88 134  75 88 134  74 87 133  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 134  73 86 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  73 86 133
-+73 86 133  72 85 132  73 86 133  73 86 133  73 86 133  73 86 133
-+57 72 122  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  33 50 105  70 83 130
-+72 85 132  72 84 131  70 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  70 84 131  71 85 132  70 84 131
-+69 83 130  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  69 83 131  68 82 130  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  68 82 130  69 83 131  68 82 130  67 81 129
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+36 52 108  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  64 78 127  66 80 129  66 80 129  66 80 129  66 80 127
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  65 79 128  64 78 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  64 78 127  65 79 128  63 77 126  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  63 77 126  64 78 127
-+62 76 125  63 77 126  32 50 106  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  40 57 112
-+61 75 125  61 75 125  61 75 125  61 75 125  60 75 125  61 75 125
-+59 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+59 74 124  60 75 125  58 73 123  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  58 73 123  59 74 124  57 72 122  58 73 123
-+58 73 123  58 73 123  53 67 120  28 45 103  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  32 48 105  57 72 122  55 69 121
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  54 70 120
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  53 68 119  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  48 63 117  27 44 102  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+34 50 107  52 67 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  50 65 118  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  38 54 110  23 40 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  28 45 104  46 61 115
-+45 60 114  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  43 60 114  44 60 114  44 60 113
-+44 60 114  34 50 107  24 41 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  34 50 106  40 56 111  40 56 111  40 56 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+27 44 102  24 41 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+71 85 132  71 85 132  71 85 132  71 85 132  70 85 132  71 85 132
-+72 84 131  72 85 132  68 81 130  32 50 106  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+28 45 103  68 82 130  73 86 133  73 86 133  73 86 133  72 85 132
-+73 86 133  74 87 134  73 86 133  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  73 86 134  73 86 134  74 87 134
-+74 87 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 133  74 87 133  75 88 134  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 88 135  76 88 135  76 89 135
-+76 89 135  76 90 135  76 90 135  76 89 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 89 135
-+76 90 135  76 89 135  76 89 135  76 88 135  76 88 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  75 88 134  76 89 135  75 88 134  74 87 133
-+74 87 133  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  74 87 134  75 88 134  74 87 134  73 86 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 133  72 85 132  72 85 132  73 86 133  72 85 132
-+75 88 134  46 61 115  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  47 63 116
-+72 85 132  72 85 132  71 85 132  70 85 132  70 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  70 84 131
-+69 83 130  69 83 130  70 84 131  70 84 131  70 84 131  70 84 131
-+69 83 131  70 84 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  68 82 130  69 83 131  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  67 81 129  69 83 130
-+54 69 120  25 42 101  25 42 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+23 40 99  46 61 115  67 81 129  65 79 128  66 80 128  66 80 129
-+66 80 127  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  64 78 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  64 78 127  63 77 126
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+63 77 126  64 78 127  43 59 113  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  34 50 107
-+58 73 123  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+60 75 125  59 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  58 73 123  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  58 73 123  57 72 122  58 73 123
-+58 73 123  58 73 123  56 71 121  34 50 107  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  55 70 121
-+54 70 120  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  53 68 119  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  52 67 118  29 45 103  24 41 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+29 47 104  51 66 119  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  43 60 114  23 40 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 100  46 61 115
-+46 61 115  45 60 114  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  43 60 114  44 60 114  44 60 114
-+44 60 114  37 53 109  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  31 47 105  40 56 111  40 56 111  39 55 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+28 45 104  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+71 85 132  71 85 132  71 85 132  71 85 132  70 85 132  71 85 132
-+72 84 131  73 86 133  45 60 114  23 39 99  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  26 43 101
-+57 72 122  73 86 133  72 85 132  73 86 133  72 85 132  73 86 133
-+74 87 134  73 86 133  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 134  74 87 134  74 87 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  74 87 133  74 87 133  75 88 134  76 89 135  75 88 134
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 88 135  76 89 135  76 89 135  76 90 135
-+76 90 135  76 89 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 89 135  76 90 135  76 90 135  76 89 135  76 89 135  76 88 135
-+76 88 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  75 88 134  75 88 134  75 88 134
-+75 88 134  74 87 133  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 134  75 88 134  74 87 134  73 86 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+73 86 133  74 87 134  73 86 133  72 85 132  73 86 133  73 86 133
-+72 85 132  74 87 133  38 54 110  23 40 99  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  28 45 103
-+62 76 125  71 84 131  72 85 132  71 85 132  70 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  70 84 131  71 85 132
-+70 84 131  69 83 130  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  69 83 131  70 84 131  68 82 130  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  68 82 130
-+67 81 129  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+69 83 130  31 47 105  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  27 44 103  66 80 129  66 80 129  66 80 129  66 80 129
-+66 80 128  66 80 127  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  65 79 128  64 78 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  64 78 127  64 78 127  63 77 126
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  63 77 126
-+63 77 126  63 77 126  56 71 121  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  27 43 102
-+55 70 121  61 75 125  61 75 125  61 75 125  61 75 125  60 75 125
-+60 75 125  59 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  59 74 124  58 73 123  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  58 73 123  58 73 123  57 72 122
-+58 73 123  58 73 123  58 73 123  40 56 111  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  49 64 117  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  55 70 121  56 70 122
-+54 70 120  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  54 69 120  53 68 119  54 69 120  54 69 120  54 69 120
-+54 69 120  55 70 121  32 48 105  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+28 45 103  48 63 117  50 65 118  49 64 117  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 116  47 63 116  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  23 40 100  43 58 114
-+46 61 115  45 60 114  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  43 60 114  44 60 114  44 60 114
-+44 60 114  38 56 110  26 43 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  28 45 103  40 56 111  40 56 111  40 56 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+31 47 105  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+71 85 132  71 85 132  71 85 132  70 85 132  71 85 132  72 84 131
-+73 86 133  58 73 123  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  44 59 113
-+72 85 132  73 86 133  73 86 133  72 85 132  73 86 133  74 87 134
-+73 86 133  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 134  74 87 134  75 88 134  74 87 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+74 87 133  75 88 134  75 88 134  76 89 135  75 88 134  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 88 135  76 89 135  76 89 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 89 135  76 90 135  76 89 135  76 89 135
-+76 89 135  76 88 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+75 88 134  74 87 133  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 134  75 88 134  74 87 134
-+73 86 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 133  74 87 134  73 86 133  72 85 132  73 86 133
-+72 85 132  73 86 133  66 80 128  31 47 105  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  23 40 100
-+38 54 109  72 85 132  71 84 131  71 85 132  71 85 132  70 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  69 83 131  68 82 130  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  68 82 130  69 83 131
-+67 81 129  68 82 130  68 82 130  68 82 130  68 82 130  67 81 129
-+69 83 130  51 66 119  23 39 99  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  53 67 120  67 81 129  65 79 128  66 80 128
-+66 80 128  66 80 127  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  65 79 128  65 79 128  64 78 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  64 78 127  63 77 126
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+63 77 126  62 76 125  64 78 127  29 46 103  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  23 40 99
-+49 64 117  59 74 124  61 75 125  61 75 125  61 75 125  61 75 125
-+60 75 125  59 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  59 74 124  58 73 123  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  57 72 122
-+58 73 123  57 72 122  58 73 123  44 61 114  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  42 57 112  57 72 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  55 70 121
-+54 70 120  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+54 69 120  55 70 121  53 68 119  54 69 120  54 69 120  54 69 120
-+53 67 120  55 70 121  37 53 109  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+27 44 102  45 60 114  51 66 119  49 64 117  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  48 65 116
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  47 63 116  28 45 103  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  39 55 111
-+46 61 115  45 60 114  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  44 60 114  43 60 114  44 60 114
-+44 60 114  40 57 112  26 43 102  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  26 43 101  40 57 112  39 55 110  40 56 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+34 50 107  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+71 85 132  71 85 132  71 85 132  70 85 132  72 85 132  72 85 132
-+71 84 131  31 47 105  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  29 46 104  70 84 131
-+73 86 133  72 85 132  73 86 133  72 85 132  73 86 133  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 134  74 87 134  75 88 134  74 87 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  74 87 133
-+75 88 134  76 89 135  76 89 135  75 88 134  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 88 135
-+76 88 135  76 89 135  76 90 135  76 90 135  76 89 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 88 135  76 88 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  75 88 134
-+76 89 135  75 88 134  74 87 133  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+74 87 134  73 86 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 133  74 87 134  72 85 132  73 86 133
-+73 86 133  72 85 132  73 86 133  55 69 121  25 42 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+23 40 99  55 70 121  73 85 132  72 84 131  71 85 132  70 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  70 84 131
-+71 85 132  69 83 130  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  69 83 131  70 84 131  68 82 130  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+68 82 130  67 81 129  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  67 81 129  27 44 102  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  36 52 108  68 81 130  66 80 129  66 80 129
-+66 80 128  66 80 127  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  65 79 128  64 78 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  64 78 127
-+63 77 126  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  64 78 127  42 58 112  23 40 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  23 40 100
-+38 54 110  59 74 124  61 75 125  61 75 125  61 75 125  61 75 125
-+60 75 125  59 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  59 74 124  58 73 123  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  57 72 122
-+58 73 123  58 73 123  58 73 123  51 66 119  27 44 103  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  34 50 107  57 72 122
-+55 69 121  56 70 122  56 70 122  56 70 122  56 70 122  55 70 121
-+54 70 120  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  54 69 120  53 68 119  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  44 60 113  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  42 57 112  51 66 119  49 64 117  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  50 65 118  48 65 116
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  47 63 116  32 50 106  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  35 51 108
-+46 61 115  45 60 114  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  45 60 114  44 60 114  43 60 114  44 60 114
-+44 60 114  43 60 114  27 44 102  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  39 55 110  40 56 111  40 56 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+35 51 108  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+71 85 132  71 85 132  70 85 132  71 85 132  72 85 132  73 86 133
-+48 63 117  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  60 75 125  74 87 133
-+72 85 132  73 86 133  73 86 133  73 86 133  74 87 134  73 86 133
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  73 86 134
-+73 86 134  74 87 134  74 87 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  74 87 133  75 88 134
-+76 89 135  75 88 134  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 88 135  76 89 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+77 90 136  77 90 136  76 90 135  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 89 135  76 90 135  76 89 135  76 88 135  76 88 135  76 88 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  75 88 134  75 88 134  74 87 133  74 87 133  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  74 87 134
-+75 88 134  74 87 134  73 86 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  73 86 133  73 86 133  72 85 132
-+72 85 132  73 86 133  73 86 133  72 85 132  39 55 110  25 42 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  26 43 102  70 83 130  72 85 132  72 84 131  71 85 132
-+70 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+70 84 131  71 85 132  69 83 130  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  69 83 131  68 82 130
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+68 82 130  67 81 129  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  44 61 114  23 40 99  25 42 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  29 45 103  59 74 124  66 80 129  65 79 128
-+66 80 129  66 80 128  66 80 127  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  65 79 128  64 78 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  64 78 127
-+63 77 126  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  63 77 126  56 71 121  23 40 99  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+27 44 103  59 74 124  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  60 75 125  59 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  59 74 124  58 73 123  58 73 123  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  57 72 122
-+57 72 122  58 73 123  58 73 123  56 71 121  30 46 104  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  29 47 104  55 69 121
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  55 70 121
-+54 70 120  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  54 69 120  53 68 119  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  50 65 118  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  39 55 111  51 66 119  49 64 117  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  48 65 116
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 64 117
-+49 65 117  47 63 116  36 52 108  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  32 48 107
-+47 63 116  45 60 114  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  43 60 114  44 60 114
-+43 59 113  44 61 114  28 45 103  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  37 53 109  40 56 111  40 56 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+38 54 109  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+71 85 132  70 85 132  71 85 132  71 85 132  72 85 132  64 78 127
-+31 47 105  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  23 40 99  46 61 115  75 88 134  72 85 132
-+73 86 133  73 86 133  73 86 133  74 87 134  73 86 133  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 134  74 87 134
-+74 87 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 133  75 88 134  76 89 135
-+75 88 134  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 88 135  76 88 135  76 89 135  76 90 135
-+76 89 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  76 90 135  77 90 136  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 89 135  76 89 135  76 88 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  75 88 134  75 88 134  74 87 133
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+74 87 134  75 88 134  74 87 134  73 86 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  73 86 133
-+73 86 133  72 85 132  72 85 132  73 86 133  65 79 128  27 44 103
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  43 58 114  73 86 133  72 85 132  72 85 132
-+70 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  70 84 131  69 83 130  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  69 83 131  69 83 131  68 82 130
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+68 82 130  68 82 130  67 81 129  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  60 75 125  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  48 63 117  66 80 129  66 80 128
-+66 80 129  66 80 128  66 80 127  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  65 79 128  64 78 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  64 78 127
-+63 77 126  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  62 76 125  63 77 126  28 45 102  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+23 40 99  56 70 122  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  60 75 125  59 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  59 74 124  58 73 123  59 74 124
-+59 74 124  59 74 124  59 74 124  58 73 123  59 74 124  58 73 123
-+57 72 122  58 73 123  58 73 123  59 74 124  34 50 107  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  28 45 103  51 66 119
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  54 69 120  54 69 120  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  55 70 121  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  36 52 108  50 65 118  50 65 118  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  48 65 116
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  47 63 116  39 55 111  23 40 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  27 44 103
-+47 63 116  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  43 60 114  44 60 114
-+44 60 114  45 60 114  31 47 105  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  36 52 108  40 56 111  40 56 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  24 41 100  24 41 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+71 85 132  70 85 132  71 85 132  72 84 131  71 84 131  48 63 117
-+23 40 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 100  34 50 106  70 84 131  73 86 133  73 86 133
-+73 86 133  72 85 132  73 86 133  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 134  74 87 134
-+75 88 134  74 87 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 133  75 88 134  76 89 135  75 88 134
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 88 135  76 89 135  76 89 135  76 90 135  76 89 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  77 90 136  77 90 136  76 90 135  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  76 90 135  77 90 136
-+77 90 136  77 90 136  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 89 135  76 90 135  76 90 135  76 89 135
-+76 88 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  75 88 134  76 89 135  75 88 134  74 87 133
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  74 87 134  75 88 134  74 87 134  73 86 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 133  74 87 134
-+73 86 133  72 85 132  73 86 133  72 85 132  75 88 134  55 69 121
-+23 39 99  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  27 44 103  61 75 125  72 85 132  72 84 131
-+71 85 132  70 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  70 84 131  70 84 131  69 83 130  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  69 83 131  69 83 131
-+68 82 130  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  68 82 130  67 81 129  68 82 130  68 82 130  68 82 130
-+68 82 130  67 81 129  65 79 128  37 53 109  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  38 54 110  64 78 128  66 80 129
-+66 80 129  66 80 128  66 80 128  66 80 127  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  65 79 128  65 79 128  64 78 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  64 78 127
-+64 78 127  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  63 77 126  63 77 126  39 55 111  23 40 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+23 40 100  44 60 114  62 76 125  61 75 125  61 75 125  61 75 125
-+61 75 125  60 75 125  59 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  59 74 124  58 73 123  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+57 72 122  58 73 123  57 72 122  59 74 124  42 57 112  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  26 43 102  47 63 116
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  53 68 119  54 69 120  54 69 120
-+54 69 120  53 68 119  55 70 121  31 47 105  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  32 48 105  49 64 117  51 66 119  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  48 65 116
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 63 117  42 58 112  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+46 61 115  46 61 115  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  43 60 114  44 60 114
-+44 60 114  44 60 114  34 50 107  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  34 50 106  40 56 111  40 56 111  39 55 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  38 54 110
-+39 55 111  26 43 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+70 85 132  71 85 132  72 85 132  72 85 132  67 80 128  26 43 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  57 72 122  73 86 133  72 85 132  73 86 133
-+72 85 132  73 86 133  74 87 134  73 86 133  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  74 87 133  75 88 134  76 89 135  75 88 134  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 88 135  76 89 135  76 90 135  76 90 135  76 89 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  77 90 136
-+77 90 136  76 90 135  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  76 90 135  77 90 136  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 89 135  76 90 135
-+76 89 135  76 88 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  75 88 134  76 89 135  75 88 134
-+74 87 133  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 134  73 86 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  72 85 132  73 86 133  73 86 133  73 86 133  73 86 133
-+38 54 110  23 40 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  42 57 112  71 84 131  72 85 132
-+71 85 132  70 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  70 84 131  69 83 130  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  69 83 131
-+68 82 130  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  68 82 130  67 81 129  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  49 64 117  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  29 46 104  59 74 124  66 80 129
-+66 80 128  66 80 129  66 80 128  66 80 127  66 80 128  66 80 128
-+66 80 128  66 80 128  65 79 128  66 80 128  65 79 128  64 78 128
-+65 79 128  65 79 128  65 79 128  65 79 128  64 78 127  65 79 128
-+64 78 127  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+63 77 126  64 78 127  63 77 126  63 77 126  51 66 119  23 39 99
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  33 49 106  62 76 125  59 74 124  61 75 125  61 75 125
-+61 75 125  61 75 125  60 75 125  59 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  59 74 124  58 73 123  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+57 72 122  58 73 123  58 73 123  58 73 123  49 65 117  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  43 58 114
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  55 69 121  37 53 109  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  29 46 103  48 63 117  50 65 118  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 63 117  43 60 114  26 43 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+43 58 114  46 61 115  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  43 60 114  44 60 114
-+44 60 114  44 60 114  37 53 109  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  32 48 105  40 56 111  40 56 111  40 56 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  28 45 103  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+71 85 132  71 85 132  72 85 132  73 86 133  43 58 114  23 40 99
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  39 55 110  71 84 131  73 86 133  73 86 133  72 85 132
-+72 85 132  73 86 133  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 134  74 87 134  75 88 134  74 87 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+74 87 133  75 88 134  76 89 135  75 88 134  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 88 135
-+76 89 135  76 90 135  76 89 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  76 90 135  77 90 136
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 89 135  76 88 135  76 88 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  75 88 134
-+75 88 134  74 87 133  74 87 133  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 134  75 88 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+73 86 133  74 87 134  72 85 132  73 86 133  73 86 133  73 86 133
-+64 78 127  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  27 44 102  61 75 125  72 85 132
-+72 85 132  71 85 132  70 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  70 84 131  69 83 130  69 83 130
-+70 84 131  70 84 131  70 84 131  70 84 131  69 83 131  70 84 131
-+69 83 131  68 82 130  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  68 82 130  67 81 129  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  59 74 124  29 46 103  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  23 40 99  55 69 121  65 79 128
-+66 80 129  66 80 129  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  63 77 126  62 76 125  57 72 122  27 43 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  60 75 125  59 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  59 74 124  60 75 125  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+57 72 122  58 73 123  58 73 123  58 73 123  57 72 122  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  38 54 110
-+55 69 121  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  54 70 120  54 70 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  44 60 114  23 40 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  26 43 102  47 63 116  50 65 118  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 63 117  46 61 115  28 45 103  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+40 56 111  46 61 115  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  45 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  39 55 111  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  29 47 104  40 56 111  39 55 110  40 56 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  30 46 104  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+71 85 132  72 84 131  72 85 132  65 79 128  23 40 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+27 43 102  61 75 125  74 87 133  72 85 132  72 85 132  73 86 133
-+73 86 133  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 134  74 87 134  74 87 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+74 87 133  75 88 134  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 88 135  76 89 135
-+76 90 135  76 89 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  77 90 136  76 90 135  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  76 89 135  76 89 135
-+76 89 135  76 89 135  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 89 135  76 90 135  76 89 135  76 88 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  75 88 134  74 87 133  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 134  75 88 134  73 86 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 133  72 85 132  73 86 133  72 85 132
-+72 85 132  46 61 115  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  23 40 99  42 58 112  71 84 131
-+71 84 131  71 85 132  71 85 132  70 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  70 84 131  71 85 132  70 84 131  69 83 130
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+69 83 131  68 82 130  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  36 52 108  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  23 40 100  40 56 111  65 79 128
-+65 79 128  66 80 128  66 80 129  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  65 79 128  66 80 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  64 78 127
-+65 79 128  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  64 78 127  63 77 126  59 74 124  34 50 107
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  52 67 118  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  60 75 125  59 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  59 74 124
-+58 73 123  58 73 123  58 73 123  57 72 122  60 75 125  29 46 104
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  34 50 107
-+54 69 120  56 70 122  56 70 122  56 70 122  56 70 122  55 70 121
-+56 70 122  55 70 121  54 70 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  54 69 120  53 68 119  54 69 120
-+54 69 120  54 69 120  54 69 120  50 65 118  23 40 99  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  23 40 100  46 61 115  50 65 118  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  46 61 115  31 47 105  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+37 53 109  46 61 115  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  43 59 113  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  29 45 103  40 56 111  40 56 111  40 56 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  32 48 105  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+71 85 132  72 84 131  74 87 134  38 54 109  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+42 57 112  74 87 134  73 86 133  73 86 133  72 85 132  73 86 133
-+74 87 134  73 86 133  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 134  74 87 134  74 87 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  74 87 133
-+75 88 134  76 89 135  75 88 134  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 88 135  76 89 135  76 90 135
-+76 89 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  77 90 136
-+77 90 136  76 90 135  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  76 89 135  76 89 135  76 89 135  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  76 89 135
-+76 89 135  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  76 90 135  77 90 136  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 89 135  76 90 135  76 89 135  76 88 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  75 88 134  75 88 134  74 87 133  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  74 87 134
-+73 86 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 133  73 86 133  72 85 132  73 86 133  73 86 133
-+73 86 133  64 78 127  29 46 104  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  64 78 127
-+72 85 132  72 85 132  71 85 132  70 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  68 82 130  69 83 131  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  67 81 129  69 83 131  48 63 117  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  26 43 102  65 79 128
-+65 79 128  66 80 129  66 80 129  66 80 127  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  64 78 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  63 77 126  62 76 125  40 56 111
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  43 58 114  62 76 125  61 75 125  61 75 125
-+61 75 125  61 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  58 73 123  58 73 123  58 73 123  59 74 124  38 54 110
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  29 47 104
-+52 67 118  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  54 70 120  55 70 121  55 70 121  55 70 121
-+55 70 121  54 69 120  55 70 121  54 69 120  53 68 119  54 69 120
-+54 69 120  54 69 120  53 68 119  53 68 119  25 42 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 100  40 57 112  51 66 119  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  49 65 117  47 63 116  32 50 106  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+35 52 107  46 61 115  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  24 41 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  28 45 103  39 55 110  40 56 111  40 56 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  34 50 107  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+72 84 131  72 85 132  61 75 125  27 44 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+70 84 131  73 86 133  72 85 132  73 86 133  73 86 133  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+73 86 134  74 87 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  74 87 133  75 88 134
-+76 89 135  75 88 134  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 88 135  76 89 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  76 89 135
-+76 89 135  77 90 136  77 90 136  77 90 136  77 90 136  78 91 137
-+78 91 137  78 91 137  78 91 137  77 90 136  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  77 90 136  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  77 90 136  77 90 136
-+77 90 136  76 89 135  76 89 135  76 89 135  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  76 90 135  77 90 136  77 90 136  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 89 135  76 90 135  76 89 135  76 88 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+75 88 134  76 89 135  76 89 135  74 87 133  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  74 87 134  75 88 134
-+74 87 134  73 86 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  73 86 133  72 85 132  73 86 133
-+73 86 133  74 87 134  45 60 114  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  23 40 100  40 56 111
-+74 87 133  71 84 131  72 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  70 84 131  71 85 132  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  69 83 131
-+70 84 131  68 82 130  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  67 81 129  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  64 78 127  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  23 39 99  56 70 122
-+66 80 129  66 80 129  66 80 129  66 80 128  66 80 127  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  65 79 128
-+64 78 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  62 76 125  63 77 126  47 63 116
-+25 42 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  34 50 107  63 77 126  59 74 124  61 75 125
-+61 75 125  60 75 125  61 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  59 74 124  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  46 61 115
-+23 40 99  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  26 43 102
-+50 65 118  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  54 70 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 69 120  53 68 119  54 69 120
-+54 69 120  54 69 120  54 69 120  53 68 119  29 47 104  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 100  37 53 109  51 66 119  50 65 118  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  48 64 117  35 52 107  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+32 48 107  46 61 115  45 60 114  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  44 60 114
-+44 60 114  43 59 113  44 60 114  27 44 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  27 44 102  38 54 109  40 56 111  40 56 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  36 52 108  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+72 85 132  72 85 132  42 58 112  25 42 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  23 40 99  49 64 117
-+74 87 133  72 85 132  73 86 133  72 85 132  73 86 133  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+73 86 134  74 87 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 133  75 88 134  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 88 135  76 89 135  76 90 135  76 89 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  77 90 136  76 90 135  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  76 89 135  76 89 135  77 90 136  77 90 136  77 90 136
-+78 91 137  78 91 137  77 90 136  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  77 90 136  77 90 136  77 90 136
-+76 89 135  76 89 135  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  76 90 135  77 90 136
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 89 135
-+76 88 135  76 88 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  75 88 134  76 89 135  75 88 134  74 87 133
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+74 87 134  73 86 134  73 86 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 133  74 87 134  73 86 133  72 85 132
-+73 86 133  73 86 133  68 82 130  27 43 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  23 40 100
-+65 79 128  72 85 132  72 84 131  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  70 84 131
-+69 83 130  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+69 83 131  70 84 131  68 82 130  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  68 82 130  69 83 131  67 81 129  68 82 130
-+68 82 130  68 82 130  68 82 130  67 81 129  70 84 131  34 50 107
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  23 40 100  40 57 112
-+68 81 130  65 79 128  66 80 129  66 80 129  66 80 127  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+64 78 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+64 78 127  65 79 128  63 77 126  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  63 77 126  64 78 127  63 77 126  53 68 119
-+27 44 102  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  30 46 104  58 73 123  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  57 72 122  58 73 123  58 73 123  58 73 123  54 69 120
-+23 40 99  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  23 40 100
-+49 64 117  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  54 70 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 69 120  53 68 119  54 69 120
-+54 69 120  54 69 120  54 69 120  53 68 119  35 52 107  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  33 49 106  51 66 119  50 65 118  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+48 65 116  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  48 64 117  37 53 109  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+30 46 104  46 61 115  46 61 115  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  29 47 104  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  27 44 102  37 53 109  40 56 111  40 56 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  37 53 109  24 41 100  24 41 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+72 85 132  64 78 127  31 47 105  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  29 45 103  70 83 130
-+72 85 132  73 86 133  72 85 132  73 86 133  74 87 134  73 86 133
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  73 86 134
-+74 87 134  75 88 134  74 87 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 133  75 88 134  75 88 134  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 88 135  76 89 135  76 90 135  76 89 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  77 90 136  76 90 135  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+76 89 135  77 90 136  77 90 136  77 90 136  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  77 90 136  78 91 137  78 91 137  77 90 136
-+77 90 136  76 89 135  76 89 135  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  76 90 135
-+77 90 136  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 89 135  76 90 135
-+76 89 135  76 88 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  75 88 134  75 88 134  74 87 133
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  74 87 134  74 87 134  73 86 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 133  73 86 133
-+73 86 133  72 85 132  75 88 134  48 63 117  23 40 99  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+40 57 112  73 86 133  72 85 132  71 85 132  70 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  70 84 131  71 85 132
-+69 83 130  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  68 82 130  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  68 82 130  67 81 129
-+68 82 130  68 82 130  68 82 130  68 82 130  69 83 130  51 66 119
-+23 40 99  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  27 44 102
-+68 81 130  66 80 129  66 80 129  66 80 129  66 80 127  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+64 78 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  63 77 126  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  63 77 126  59 74 124
-+29 47 104  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  28 45 103  54 69 120  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  59 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+59 74 124  57 72 122  58 73 123  58 73 123  57 72 122  58 73 123
-+25 42 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  23 40 99
-+44 60 114  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  56 70 122  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 69 120  53 68 119  54 69 120
-+54 69 120  54 69 120  54 69 120  53 68 119  39 55 110  23 40 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  29 46 104  51 66 119  50 65 118  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  48 64 117  39 55 111  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+29 46 104  45 60 114  46 61 115  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  34 50 106  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  26 43 101  36 52 108  40 56 111  40 56 111
-+39 55 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+38 54 110  38 54 110  25 42 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+71 84 131  52 67 118  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  23 40 99  50 65 118  72 85 132
-+72 85 132  73 86 133  72 85 132  73 86 133  73 86 133  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  73 86 134
-+75 88 134  74 87 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 133  75 88 134  76 89 135  75 88 134
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 88 135
-+76 89 135  76 90 135  76 89 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  76 89 135  76 89 135
-+77 90 136  78 91 137  78 91 137  78 91 137  77 90 136  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  77 90 136  78 91 137
-+78 91 137  77 90 136  77 90 136  76 89 135  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+76 90 135  77 90 136  77 90 136  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 89 135
-+76 90 135  76 89 135  76 88 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  75 88 134  75 88 134
-+74 87 133  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+74 87 134  75 88 134  74 87 134  73 86 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  73 86 133  74 87 134  72 85 132
-+73 86 133  73 86 133  73 86 133  71 84 131  27 44 102  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+29 45 103  65 79 128  72 85 132  72 85 132  70 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+70 84 131  69 83 130  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  69 83 131  68 82 130  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  68 82 130  68 82 130  67 81 129
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  66 80 128
-+23 40 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+58 73 123  66 80 129  66 80 129  66 80 129  66 80 128  66 80 127
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+65 79 128  64 78 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  63 77 126  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  62 76 125  64 78 127
-+34 50 106  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  26 43 101  48 63 117  61 75 125  60 75 125
-+61 75 125  61 75 125  61 75 125  60 75 125  59 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  57 72 122  58 73 123  58 73 123  58 73 123  57 72 122
-+32 48 105  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  23 40 100
-+38 54 110  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  53 68 119  44 59 113  23 40 99
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  51 66 119  50 65 118  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  48 64 117  42 57 112  26 43 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+28 45 103  43 59 113  46 61 115  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  43 60 114
-+44 60 114  44 60 114  44 60 114  35 51 108  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  36 52 108  40 56 111  39 55 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  25 43 102  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+69 83 130  34 50 107  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  29 47 104  64 78 127  73 86 133
-+73 86 133  72 85 132  73 86 133  73 86 133  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 134  74 87 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  74 87 133  75 88 134  76 89 135  75 88 134  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 88 135  76 89 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  77 90 136
-+77 90 136  76 90 135  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  76 89 135  77 90 136  77 90 136
-+77 90 136  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+77 90 136  78 91 137  78 91 137  77 90 136  76 89 135  76 89 135
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 89 135  76 90 135  76 89 135  76 88 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+75 88 134  74 87 133  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  73 86 133
-+72 85 132  73 86 133  72 85 132  73 86 133  51 66 119  23 39 99
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  49 64 117  73 86 133  72 85 132  71 85 132  70 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  70 84 131
-+70 84 131  69 83 130  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  69 83 131  69 83 131  68 82 130  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  68 82 130  67 81 129
-+68 82 130  68 82 130  68 82 130  68 82 130  67 81 129  68 82 130
-+35 52 107  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+44 61 114  68 81 130  66 80 129  66 80 128  66 80 128  66 80 127
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  65 79 128
-+65 79 128  64 78 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  64 78 127  63 77 126  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  62 76 125  64 78 127
-+42 58 112  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  43 59 113  61 75 125  61 75 125
-+61 75 125  61 75 125  60 75 125  61 75 125  59 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 74 124
-+58 73 123  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  57 72 122  58 73 123  58 73 123  58 73 123  57 72 122
-+38 54 110  23 40 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+33 49 106  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  55 70 121  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  47 63 116  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  23 40 99  49 64 117  50 65 118  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  48 64 117  43 60 114  26 43 102  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+27 44 102  42 57 112  46 61 115  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  45 60 114  43 60 114
-+44 60 114  44 60 114  44 60 114  38 54 110  23 40 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  34 50 107  40 56 111  40 56 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  27 44 102  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+62 76 125  23 39 99  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  42 57 112  73 86 133  73 86 133
-+72 85 132  72 85 132  73 86 133  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  73 86 134  73 86 134  74 87 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+74 87 133  75 88 134  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 88 135  76 89 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+76 89 135  76 89 135  76 89 135  77 90 136  78 91 137  77 90 136
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  77 90 136  78 91 137  78 91 137  77 90 136
-+76 89 135  76 89 135  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  76 90 135  77 90 136  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 89 135  76 88 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+75 88 134  74 87 133  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 134  73 86 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+73 86 133  72 85 132  73 86 133  72 85 132  68 81 130  28 45 103
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  36 52 108  68 81 130  72 85 132  71 85 132  70 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+70 84 131  69 83 130  69 83 130  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  69 83 131  68 82 130  68 82 130  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  68 82 130  67 81 129
-+67 81 129  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+49 64 117  23 40 99  24 41 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+34 50 107  68 82 130  66 80 129  66 80 129  66 80 128  66 80 127
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+65 79 128  64 78 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  64 78 127  63 77 126  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  63 77 126  63 77 126  63 77 126
-+50 65 118  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  38 54 110  59 74 124  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  59 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 74 124
-+58 73 123  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  57 72 122  58 73 123  58 73 123  57 72 122
-+43 60 114  23 40 99  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+27 44 102  56 70 122  55 69 121  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  48 64 116  26 43 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  23 40 100  46 61 115  51 66 119  49 64 117
-+49 64 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  46 61 115  27 44 102  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+26 43 102  40 56 111  46 61 115  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  43 60 114
-+44 60 114  44 60 114  44 60 114  40 56 111  23 40 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 101  24 41 100  34 50 106  40 56 111  40 56 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  28 45 103  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+40 57 112  23 40 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  26 43 102  59 74 124  74 87 133  72 85 132
-+72 85 132  73 86 133  74 87 134  73 86 133  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  73 86 134  74 87 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+74 87 133  75 88 134  75 88 134  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 88 135  76 89 135  76 90 135
-+76 89 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+76 89 135  77 90 136  77 90 136  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  77 90 136  77 90 136
-+77 90 136  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  77 90 136  77 90 136  77 90 136  77 90 136  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  77 90 136  78 91 137
-+77 90 136  77 90 136  76 89 135  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  76 90 135  77 90 136
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 89 135  76 89 135  76 88 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  75 88 134
-+76 89 135  75 88 134  74 87 133  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 134  75 88 134  74 87 134  73 86 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  73 86 133
-+73 86 133  72 85 132  73 86 133  73 86 133  71 85 132  45 60 114
-+23 40 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  26 43 101  61 75 125  72 85 132  71 85 132  71 85 132
-+70 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  70 84 131  69 83 130  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  69 83 131  68 82 130  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  68 82 130
-+67 81 129  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+59 74 124  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+29 46 104  62 76 125  66 80 129  66 80 129  66 80 128  66 80 128
-+66 80 127  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+65 79 128  65 79 128  64 78 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  64 78 127  63 77 126  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  63 77 126  63 77 126
-+58 73 123  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  34 50 106  58 73 123  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  59 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 74 124
-+58 73 123  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  59 74 124  57 72 122  58 73 123  58 73 123  57 72 122
-+49 65 117  23 40 99  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+23 40 99  55 69 121  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  50 65 118  29 45 103
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  23 40 100  40 57 112  51 66 119  50 65 118
-+49 64 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  48 64 117  28 45 103  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  39 55 110  46 61 115  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  43 60 114
-+44 60 114  44 60 114  44 60 114  42 58 112  23 40 100  24 41 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  33 49 106  39 55 110  40 56 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  29 46 104  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+26 43 102  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  34 50 107  74 87 134  73 86 133  73 86 133
-+72 85 132  73 86 133  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 134  74 87 134  74 87 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  74 87 133
-+75 88 134  75 88 134  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 88 135  76 89 135  76 90 135  76 89 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  77 90 136  76 90 135  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  76 89 135
-+77 90 136  78 91 137  78 91 137  77 90 136  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  77 90 136  77 90 136  77 90 136  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  77 90 136
-+77 90 136  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  77 90 136
-+78 91 137  77 90 136  77 90 136  76 89 135  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  76 90 135
-+77 90 136  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 89 135  76 90 135  76 89 135  76 88 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+75 88 134  76 89 135  74 87 133  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 134  74 87 134  73 86 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+73 86 133  73 86 133  72 85 132  73 86 133  73 86 133  59 74 124
-+27 44 102  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 99  47 63 116  71 84 131  72 85 132  71 85 132
-+70 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  70 84 131  69 83 130  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  69 83 131  68 82 130  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  68 82 130
-+67 81 129  68 82 130  68 82 130  68 82 130  68 82 130  67 81 129
-+64 78 127  32 48 105  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+27 44 102  55 69 121  66 80 129  66 80 129  66 80 129  66 80 128
-+66 80 127  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  65 79 128  64 78 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  64 78 127  64 78 127  63 77 126  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  63 77 126  62 76 125
-+64 78 127  27 44 102  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  29 46 104  56 71 121  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  60 75 125  59 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 74 124
-+58 73 123  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  57 72 122  58 73 123  58 73 123  58 73 123
-+52 67 118  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+23 40 99  50 65 118  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  51 66 119  32 48 105
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  37 53 109  51 66 119  50 65 118
-+49 64 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 116  50 65 118  29 46 103  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  38 54 109  46 61 115  45 60 114  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  43 60 114
-+44 60 114  44 60 114  43 59 113  43 59 113  25 42 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  32 48 105  39 55 110  40 56 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  31 47 105  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 100  55 70 121  74 87 134  72 85 132  73 86 133
-+73 86 133  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 134  74 87 134  75 88 134  74 87 134
-+75 88 134  75 88 134  75 88 134  75 88 134  74 87 133  75 88 134
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 88 135  76 89 135  76 89 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  77 90 136  76 90 135  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  76 89 135  77 90 136
-+78 91 137  77 90 136  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+77 90 136  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  77 90 136  77 90 136  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+77 90 136  78 91 137  78 91 137  76 89 135  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 89 135  76 90 135  76 89 135
-+76 88 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  75 88 134  74 87 133  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  74 87 134
-+73 86 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 133  72 85 132  73 86 133  73 86 133  71 85 132
-+34 50 107  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  29 45 103  71 84 131  71 84 131  72 85 132
-+71 85 132  70 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  70 84 131  69 83 130  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  69 83 131  68 82 130
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+68 82 130  67 81 129  68 82 130  68 82 130  68 82 130  68 82 130
-+66 80 129  40 56 111  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  47 63 116  67 80 128  65 79 128  66 80 129  66 80 128
-+66 80 127  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  65 79 128  64 78 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  64 78 127  63 77 126  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  63 77 126
-+64 78 127  36 52 108  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 101  54 69 120  61 75 125
-+61 75 125  61 75 125  61 75 125  60 75 125  60 75 125  59 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 74 124
-+58 73 123  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  57 72 122  58 73 123  58 73 123  58 73 123
-+53 67 120  29 45 103  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+23 40 100  44 60 114  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  56 70 122  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  52 67 118  34 50 107
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  33 49 106  52 67 118  50 65 118
-+49 64 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  49 65 117  32 48 105  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  37 53 109  46 61 115  45 60 114  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  43 60 114
-+44 60 114  44 60 114  44 60 114  43 59 113  27 43 102  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  31 47 105  39 55 110  40 56 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  32 48 107  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  27 43 102  73 86 134  73 86 133  73 86 133  72 85 132
-+73 86 133  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  75 88 134  74 87 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 88 135  76 88 135  76 89 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+77 90 136  76 90 135  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  76 89 135  76 89 135  77 90 136  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  77 90 136  77 90 136  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  77 90 136  76 89 135  74 87 130  74 87 130
-+74 87 130  73 86 130  73 86 130  73 86 130  74 87 130  74 87 130
-+74 87 130  75 88 134  76 89 135  77 90 136  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  77 90 136  77 90 136
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  77 90 136  78 91 137  77 90 136  76 89 135
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 89 135  76 88 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  75 88 134  74 87 133  74 87 133  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  74 87 134
-+73 86 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 133  72 85 132  72 85 132  72 85 132  74 87 134
-+49 64 117  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  23 39 99  59 74 124  72 85 132  72 85 132
-+71 85 132  70 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  70 84 131  69 83 130  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  69 83 131  68 82 130
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+68 82 130  67 81 129  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  48 64 117  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  40 56 111  65 79 128  66 80 129  66 80 129  66 80 128
-+66 80 127  66 80 127  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  65 79 128  64 78 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  64 78 127  63 77 126  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  63 77 126
-+64 78 127  45 60 114  23 40 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  23 40 99  50 65 118  59 74 124
-+61 75 125  61 75 125  61 75 125  61 75 125  60 75 125  59 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+59 74 124  58 73 123  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  57 72 122  58 73 123  58 73 123  58 73 123
-+55 70 121  32 48 105  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  39 55 110  57 72 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  53 68 119
-+54 69 120  54 69 120  54 69 120  54 69 120  53 67 120  36 52 108
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  31 47 105  53 67 120  50 65 118
-+49 64 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  49 64 117  36 52 108  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  35 51 108  44 60 115  45 60 114  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  43 60 114
-+44 60 114  44 60 114  44 60 114  43 59 113  28 45 103  24 41 100
-+25 42 101  25 42 101  24 41 99  18 31 73  15 19 34  24 40 99
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  29 46 104  39 55 110  40 56 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  33 49 106  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+23 40 99  47 63 116  74 87 133  72 85 132  73 86 133  72 85 132
-+74 87 134  73 86 133  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 134  74 87 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  76 89 135
-+75 88 134  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 88 135  76 89 135  76 90 135  76 89 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  77 90 136
-+76 90 135  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  76 89 135  77 90 136  78 91 137  77 90 136
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  77 90 136  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  74 87 130  59 73 120
-+49 61 101  39 49 83  33 41 67  31 35 49  15 19 34  12 14 18
-+6 8 19  6 7 9  6 7 9  6 7 9  6 7 9  12 14 18
-+20 20 21  15 19 34  31 35 49  33 41 67  42 55 96  49 61 101
-+59 73 120  73 86 130  78 91 137  78 91 137  78 91 137  78 91 137
-+77 90 136  77 90 136  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  77 90 136  77 90 136  77 90 136
-+76 89 135  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  76 90 135  77 90 136  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 89 135
-+76 89 135  76 88 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  75 88 134  74 87 133  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  74 87 134
-+74 87 134  73 86 134  74 87 134  74 87 134  74 87 134  74 87 134
-+73 86 133  74 87 134  73 86 133  72 85 132  73 86 133  73 86 133
-+67 81 129  26 43 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  23 40 100  39 55 111  74 87 133  72 84 131
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+68 82 130  67 81 129  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  55 70 121  27 44 102  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  34 50 107  62 76 125  66 80 129  66 80 128  66 80 129
-+66 80 128  66 80 127  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  65 79 128  65 79 128  64 78 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  64 78 127  63 77 126  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  63 77 126
-+63 77 126  53 67 120  23 40 99  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  23 40 99  44 59 113  59 74 124
-+61 75 125  61 75 125  61 75 125  61 75 125  60 75 125  59 75 125
-+60 75 125  60 75 125  49 62 109  49 61 101  49 61 101  49 61 101
-+49 61 101  49 61 101  49 61 101  49 61 101  49 61 101  49 61 101
-+49 61 101  49 61 101  49 61 101  44 57 102  49 61 101  49 61 101
-+44 57 102  22 36 89  22 36 89  22 36 89  22 36 89  22 36 89
-+22 36 89  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  22 36 89  22 36 89
-+22 36 89  22 36 89  44 57 102  44 57 102  44 57 102  44 57 102
-+44 57 102  44 57 102  44 57 102  42 55 96  44 57 102  44 57 102
-+44 57 102  44 57 102  44 57 102  42 55 96  44 57 102  42 55 96
-+42 55 96  49 62 109  54 69 120  54 69 120  54 69 120  38 54 110
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  22 36 89
-+22 36 89  22 36 89  22 36 89  22 36 89  22 36 89  22 36 89
-+22 36 89  22 36 89  22 36 89  22 36 89  22 36 89  22 36 89
-+22 36 89  22 36 89  22 36 89  22 36 89  42 55 96  42 55 96
-+42 55 96  42 55 96  42 55 96  44 57 102  50 65 118  50 65 118
-+50 65 118  49 65 117  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  48 64 117  38 54 110  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  34 50 106  45 60 114  45 60 114  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+43 60 114  44 60 114  44 60 114  43 59 113  30 46 104  24 41 100
-+24 41 99  18 31 73  15 19 34  0 0 0  6 7 9  24 40 99
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  29 45 103  39 55 110  40 56 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  34 50 107  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+23 40 100  66 80 128  73 86 133  73 86 133  72 85 132  73 86 133
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 134  75 88 134  74 87 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 133  75 88 134  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  76 89 135  77 90 136  78 91 137  77 90 136  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+77 90 136  77 90 136  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  76 90 135  49 61 101  33 41 67  15 19 34  12 14 18
-+0 1 1  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  2 3 5
-+12 14 18  15 19 34  33 41 67  49 61 101  76 90 135  78 91 137
-+78 91 137  77 90 136  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  77 90 136
-+77 90 136  76 89 135  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  76 90 135  77 90 136  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 89 135  76 89 135  76 88 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  75 88 134  75 88 134  74 87 133
-+75 88 134  75 88 134  75 88 134  75 88 134  74 87 134  75 88 134
-+74 87 134  73 86 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 133  73 86 133  73 86 133  73 86 133
-+75 88 134  37 53 109  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  70 83 130  72 85 132
-+72 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  70 84 131  71 85 132  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  69 83 131  70 84 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  61 75 125  31 47 105  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  28 45 103  59 74 124  66 80 129  66 80 129  66 80 129
-+66 80 128  66 80 127  66 80 128  66 80 128  66 80 128  66 80 128
-+65 79 128  66 80 128  65 79 128  64 78 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  64 78 127  64 78 127  63 77 126
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  63 77 126
-+63 77 126  61 75 125  23 39 99  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  23 40 100  38 54 110  59 74 124
-+61 75 125  61 75 125  61 75 125  61 75 125  60 75 125  59 75 125
-+60 75 125  60 75 125  31 35 49  6 7 9  6 8 19  6 8 19
-+6 8 19  6 8 19  6 8 19  6 8 19  6 8 19  6 8 19
-+6 8 19  6 8 19  6 8 19  6 8 19  6 8 19  6 8 19
-+6 8 19  6 7 9  6 7 9  6 7 9  6 7 9  6 7 9
-+6 8 19  25 42 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  17 24 45  2 3 5
-+6 7 9  6 7 9  6 8 19  6 8 19  6 8 19  6 8 19
-+6 8 19  6 8 19  6 8 19  6 8 19  6 8 19  6 8 19
-+6 8 19  6 8 19  6 8 19  6 8 19  6 8 19  6 8 19
-+6 7 9  31 35 49  54 69 120  53 67 120  54 69 120  40 57 112
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 100  6 8 19
-+6 7 9  6 7 9  6 7 9  6 7 9  6 7 9  6 7 9
-+6 7 9  6 7 9  6 7 9  6 7 9  6 7 9  6 7 9
-+6 7 9  6 7 9  6 7 9  6 7 9  6 7 9  6 7 9
-+6 7 9  6 7 9  6 7 9  17 26 56  50 65 118  50 65 118
-+50 65 118  49 65 117  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  48 64 117  40 56 111  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  32 48 107  45 60 114  45 60 114  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  45 60 114
-+43 60 114  44 60 114  44 60 114  43 59 113  32 48 105  18 31 73
-+15 19 34  1 2 4  0 0 0  0 0 0  6 8 19  24 40 99
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  27 44 102  38 54 110  40 56 111
-+40 56 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  35 51 108  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+36 52 108  70 84 131  72 85 132  73 86 133  72 85 132  73 86 133
-+73 86 133  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+73 86 134  74 87 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 133  76 89 135  75 88 134
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 90 135  76 89 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+76 89 135  77 90 136  78 91 137  77 90 136  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  77 90 136
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  75 88 134
-+33 41 67  12 14 18  5 5 5  0 0 1  0 0 0  0 0 0
-+0 0 0  0 0 1  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 1  0 0 1  0 0 0
-+0 0 0  0 0 0  0 0 1  5 5 5  12 14 18  33 41 67
-+74 87 130  78 91 137  77 90 136  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  77 90 136  78 91 137
-+78 91 137  76 89 135  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 89 135  76 88 135  76 89 135  76 89 135
-+76 89 135  76 89 135  75 88 134  76 89 135  75 88 134  74 87 133
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 133  74 87 134  73 86 133  73 86 133  72 85 132
-+74 87 133  58 73 123  23 39 99  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  55 70 121  73 86 133
-+72 85 132  70 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  68 82 130
-+69 83 131  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  34 50 106  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  23 40 100  56 70 122  66 80 129  66 80 129  66 80 129
-+66 80 128  66 80 127  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  65 79 128  64 78 128  65 79 128  65 79 128
-+65 79 128  65 79 128  64 78 127  65 79 128  64 78 127  63 77 126
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  63 77 126
-+62 76 125  63 77 126  27 44 103  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  32 48 105  59 74 124
-+61 75 125  61 75 125  61 75 125  61 75 125  60 75 125  59 75 125
-+60 75 125  60 75 125  33 41 67  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  25 42 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  2 3 5  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  15 19 34  49 62 109  54 69 120  54 69 120  43 59 113
-+25 42 101  25 42 101  25 42 101  25 42 101  22 36 89  0 1 1
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 1 1  33 41 67  50 65 118  50 65 118
-+50 65 118  49 65 117  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  49 65 117  48 64 117  42 58 112  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  31 47 105  44 60 114  45 60 114  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+43 60 114  44 60 114  44 60 114  42 55 96  15 19 34  1 2 4
-+0 0 0  0 0 0  0 0 0  0 0 0  6 8 19  24 40 99
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  26 43 102  38 54 110  40 56 111
-+39 55 111  40 56 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  35 51 108  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  23 40 99
-+50 65 118  72 85 132  73 86 133  72 85 132  72 85 132  73 86 133
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+73 86 134  74 87 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 133  75 88 134  75 88 134  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 88 135  76 89 135
-+76 90 135  76 89 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  77 90 136  76 90 135  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  76 89 135  76 89 135
-+77 90 136  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  77 90 136  77 90 136  78 91 137
-+78 91 137  78 91 137  78 91 137  74 87 130  33 41 67  0 0 0
-+0 0 0  0 0 0  0 0 1  0 0 0  5 5 5  6 7 9
-+20 20 21  80 80 80  132 132 134  177 177 177  209 209 209  243 243 243
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+230 230 230  209 209 209  177 177 177  132 132 134  80 80 80  20 20 21
-+6 7 9  5 5 5  0 0 0  0 0 1  0 0 0  0 0 0
-+0 0 0  33 41 67  71 84 128  78 91 137  78 91 137  77 90 136
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+77 90 136  78 91 137  77 90 136  76 89 135  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  75 88 134  76 89 135  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  74 87 134  73 86 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  73 86 133  72 85 132  73 86 133
-+73 86 133  73 86 133  25 43 102  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  39 55 110  74 87 133
-+72 85 132  72 85 132  70 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  70 84 131  69 83 130  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  69 83 131
-+68 82 130  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+67 81 129  70 84 131  40 57 112  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 99  49 64 117  65 79 128  66 80 129  66 80 129
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  65 79 128  64 78 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  64 78 127  63 77 126
-+64 78 127  64 78 127  64 78 127  64 78 127  63 77 126  64 78 127
-+63 77 126  63 77 126  34 50 107  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  26 43 102  59 74 124
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  60 75 125
-+59 75 125  60 75 125  49 61 101  0 0 0  0 0 0  0 0 0
-+6 7 9  6 7 9  6 7 9  6 7 9  6 7 9  6 7 9
-+6 7 9  6 7 9  6 7 9  6 7 9  6 7 9  6 7 9
-+6 7 9  6 7 9  6 7 9  6 7 9  5 5 5  0 0 0
-+0 0 0  22 36 89  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  22 36 89  0 0 0  0 0 0
-+5 5 5  6 7 9  6 7 9  6 7 9  6 7 9  6 7 9
-+6 7 9  6 7 9  6 7 9  6 7 9  6 7 9  6 7 9
-+6 7 9  6 7 9  6 7 9  6 7 9  12 14 18  0 1 1
-+0 0 0  2 3 5  42 55 96  54 69 120  54 69 120  44 61 114
-+26 43 102  25 42 101  25 42 101  25 42 101  17 26 56  0 1 1
-+0 0 0  5 5 5  6 7 9  6 7 9  6 7 9  6 7 9
-+6 7 9  6 7 9  6 7 9  6 7 9  6 7 9  6 7 9
-+6 7 9  6 7 9  6 7 9  6 7 9  6 7 9  6 7 9
-+0 1 1  0 0 0  2 3 5  39 49 83  50 65 118  50 65 118
-+50 65 118  49 65 117  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  46 61 115  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  29 46 103  44 59 113  45 60 114  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+43 60 114  42 55 96  17 24 45  0 0 0  0 0 0  0 0 0
-+0 0 0  6 7 9  0 0 0  0 0 0  6 8 19  24 40 99
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  38 54 110  40 56 111
-+40 56 111  40 56 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  36 52 108  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  27 44 102
-+61 75 125  73 86 133  73 86 133  72 85 132  73 86 133  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  73 86 134
-+74 87 134  74 87 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  74 87 133  75 88 134  75 88 134  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 88 135  76 90 135
-+76 89 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  77 90 136  76 90 135  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+78 91 137  77 90 136  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  77 90 136  78 91 137  78 91 137  78 91 137
-+78 91 137  74 87 130  39 49 83  6 7 9  0 0 0  0 0 0
-+0 0 1  0 1 1  31 31 31  80 80 80  154 154 154  230 230 230
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  254 254 254  255 255 255  254 254 254  254 254 254  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+209 209 209  146 146 148  80 80 80  44 44 44  1 2 4  0 0 1
-+0 0 0  0 0 0  6 7 9  39 49 83  71 84 128  77 90 136
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  77 90 136  77 90 136  77 90 136  76 89 135  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  76 90 135  77 90 136
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 89 135  76 90 135  76 88 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  75 88 134
-+74 87 133  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+74 87 134  75 88 134  73 86 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 133  74 87 134  72 85 132  73 86 133
-+72 85 132  73 86 133  43 59 113  23 40 99  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  30 46 104  68 82 130
-+72 85 132  72 85 132  70 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  70 84 131  71 85 132  69 83 130  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  69 83 131  70 84 131
-+68 82 130  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  68 82 130  67 81 129  68 82 130  68 82 130  68 82 130
-+68 82 130  69 83 130  50 65 118  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 100  40 57 112  65 79 128  66 80 129  66 80 128
-+66 80 129  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  64 78 127  63 77 126
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+63 77 126  63 77 126  40 57 112  23 40 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  23 40 99  58 73 123
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  60 75 125
-+59 75 125  60 75 125  55 67 113  6 7 9  0 0 0  0 0 0
-+243 243 243  251 251 251  248 248 248  248 248 248  248 248 248  248 248 248
-+248 248 248  248 248 248  248 248 248  248 248 248  248 248 248  248 248 248
-+248 248 248  248 248 248  248 248 248  251 251 251  118 119 119  0 0 0
-+0 0 0  17 26 56  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  17 24 45  0 0 0  0 0 0
-+118 119 119  248 248 248  248 248 248  248 248 248  248 248 248  248 248 248
-+248 248 248  248 248 248  248 248 248  248 248 248  248 248 248  248 248 248
-+248 248 248  248 248 248  248 248 248  248 248 248  255 255 255  55 55 55
-+0 0 0  0 0 0  39 49 83  54 69 120  54 69 120  48 64 116
-+27 44 102  25 42 101  25 42 101  25 42 101  17 24 45  0 0 1
-+0 0 0  96 96 96  251 251 251  248 248 248  248 248 248  248 248 248
-+248 248 248  248 248 248  248 248 248  248 248 248  248 248 248  248 248 248
-+248 248 248  248 248 248  248 248 248  248 248 248  251 251 251  209 209 209
-+20 20 21  0 0 0  6 7 9  48 60 105  50 65 118  50 65 118
-+50 65 118  49 65 117  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  47 63 116  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  27 44 103  44 59 113  45 60 114  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  42 55 96
-+17 26 56  1 2 4  0 0 0  0 0 0  0 0 0  12 14 18
-+80 80 80  177 177 177  0 0 0  0 0 0  6 8 19  24 40 99
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  38 54 109  40 56 111
-+40 56 111  40 56 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  36 52 108  26 43 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  34 50 107
-+68 81 130  73 86 133  73 86 133  72 85 132  73 86 133  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  73 86 134
-+74 87 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  74 87 133  75 88 134  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 88 135  76 89 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  78 91 137
-+77 90 136  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  77 90 136  78 91 137  78 91 137  78 91 137  78 91 137
-+55 67 113  17 24 45  0 0 0  0 0 0  0 0 0  0 0 0
-+66 66 66  154 154 154  209 209 209  255 255 255  255 255 255  255 255 255
-+255 255 255  254 254 254  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  254 254 254  255 255 255
-+255 255 255  255 255 255  255 255 255  209 209 209  154 154 154  80 80 80
-+0 0 0  0 0 0  0 0 0  0 0 0  15 19 34  49 61 101
-+77 90 136  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  77 90 136  76 89 135  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 89 135  76 88 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  75 88 134  76 89 135
-+74 87 133  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  73 86 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  72 85 132  73 86 133
-+73 86 133  73 86 133  59 74 124  23 39 99  25 42 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  27 44 102  58 73 123
-+72 85 132  72 85 132  70 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  69 83 130  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+68 82 130  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+68 82 130  69 83 131  67 81 129  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  59 74 124  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  33 49 106  65 79 128  66 80 129  66 80 129
-+66 80 129  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  65 79 128  66 80 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  64 78 127  63 77 126
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+63 77 126  63 77 126  47 63 116  23 40 99  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  23 40 99  53 67 120
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  60 75 125
-+59 75 125  60 75 125  56 69 119  15 19 34  0 0 0  0 0 0
-+177 177 177  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  177 177 177  0 0 0
-+0 0 0  15 19 34  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  6 8 19  0 0 0  0 0 0
-+177 177 177  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  141 141 145
-+0 0 0  0 0 0  17 24 45  53 68 119  54 69 120  50 65 118
-+28 45 103  25 42 101  25 42 101  25 42 101  6 8 19  0 0 0
-+2 3 5  137 138 138  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  177 177 177
-+0 1 1  0 0 0  6 8 19  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  49 65 117  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  27 43 102  43 59 113  45 60 114  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  42 55 96  17 24 45  6 7 9
-+0 0 0  0 0 0  0 0 0  0 0 0  96 96 96  177 177 177
-+255 255 255  251 251 251  0 0 0  0 0 0  6 8 19  24 40 99
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  38 54 109  39 55 111
-+40 56 111  40 56 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  37 53 109  26 43 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  40 57 112
-+74 87 133  73 86 133  72 85 132  73 86 133  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 134  74 87 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  74 87 133  75 88 134  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 88 135  76 89 135  76 89 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  76 89 135  77 90 136  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+77 90 136  78 91 137  78 91 137  78 91 137  78 91 137  39 49 83
-+6 7 9  0 0 0  0 0 0  0 0 1  44 44 44  177 177 177
-+243 243 243  255 255 255  255 255 255  255 255 255  254 254 254  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  254 254 254  255 255 255  255 255 255  255 255 255  243 243 243
-+209 209 209  55 55 55  0 0 1  0 0 0  0 0 0  6 7 9
-+39 49 83  77 90 136  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  77 90 136  76 89 135
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  76 90 135
-+77 90 136  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 89 135  76 90 135  76 88 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+74 87 133  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 134  73 86 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 133  72 85 132
-+73 86 133  73 86 133  67 80 128  28 45 103  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  49 64 117
-+73 86 133  72 84 131  71 85 132  70 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  69 83 130  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+68 82 130  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  67 81 129  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 81 130  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  26 43 101  65 79 128  65 79 128  66 80 129
-+66 80 129  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+63 77 126  63 77 126  53 68 119  23 39 99  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  23 40 99  47 63 116
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  60 75 125
-+59 75 125  60 75 125  59 74 124  31 35 49  0 0 0  0 0 0
-+118 119 119  255 255 255  254 254 254  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  209 209 209  0 0 0
-+0 0 0  6 7 9  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  22 36 89  0 1 1  0 0 0  20 20 21
-+209 209 209  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  230 230 230
-+0 0 0  0 0 0  6 7 9  53 68 119  54 69 120  52 67 118
-+29 45 103  25 42 101  25 42 101  22 39 98  6 8 19  0 0 0
-+12 14 18  177 177 177  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  254 254 254  132 132 134
-+0 0 0  0 0 0  17 24 45  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 116  49 65 117  27 44 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  43 58 114  45 60 114  44 59 113  45 60 114
-+45 60 114  39 56 109  17 24 45  2 3 5  0 0 0  0 0 0
-+0 0 0  0 0 0  80 80 80  209 209 209  243 243 243  255 255 255
-+255 255 255  248 248 248  0 0 0  0 0 0  6 8 19  24 40 99
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  23 40 100  37 53 109  40 56 111
-+40 56 111  40 56 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  37 53 109  27 44 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  26 43 101  53 67 120
-+74 87 133  72 85 132  72 85 132  73 86 133  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 134  74 87 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+74 87 133  75 88 134  76 89 135  75 88 134  76 89 135  76 89 135
-+76 89 135  76 89 135  76 88 135  76 88 135  76 89 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  76 89 135  77 90 136  77 90 136  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  39 49 83  0 1 1
-+0 0 0  0 0 0  6 7 9  132 132 134  254 254 254  255 255 255
-+254 254 254  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  254 254 254
-+255 255 255  255 255 255  141 141 145  6 7 9  0 0 0  0 0 0
-+0 0 0  33 41 67  75 88 134  77 90 136  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  77 90 136  78 91 137  77 90 136
-+76 89 135  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+76 90 135  77 90 136  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 89 135  76 89 135  76 88 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  75 88 134
-+75 88 134  74 87 133  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 134  73 86 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 133  72 85 132
-+73 86 133  73 86 133  70 84 131  39 55 110  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  40 57 112
-+71 84 131  72 85 132  71 85 132  70 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  70 84 131  70 84 131  69 83 130
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+69 83 131  68 82 130  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  67 81 129  68 82 130  68 82 130  68 82 130
-+68 82 130  67 81 129  70 84 131  30 48 104  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  23 39 99  61 75 125  66 80 129  66 80 129
-+66 80 129  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+63 77 126  62 76 125  56 71 121  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  23 40 100  40 57 112
-+62 76 125  61 75 125  61 75 125  61 75 125  61 75 125  60 75 125
-+59 75 125  60 75 125  60 75 125  33 41 67  0 0 0  0 0 0
-+55 55 55  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  230 230 230  20 20 21
-+0 0 0  0 0 0  25 42 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  17 26 56  0 0 1  0 0 0  66 66 66
-+243 243 243  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  254 254 254  255 255 255
-+31 31 31  0 0 0  0 0 0  44 57 102  54 69 120  54 69 120
-+29 46 103  25 42 101  25 42 101  22 36 89  6 7 9  0 0 0
-+20 20 21  209 209 209  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  243 243 243  80 80 80
-+0 0 0  0 0 0  33 41 67  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  49 65 117  29 45 103
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  43 58 114  46 61 115  45 60 114  39 56 109
-+17 26 56  0 1 1  0 0 0  0 0 0  0 0 0  0 1 1
-+44 44 44  209 209 209  255 255 255  255 255 255  254 254 254  255 255 255
-+255 255 255  248 248 248  0 0 0  0 0 0  6 8 19  24 40 99
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  36 52 108  40 56 111
-+40 56 111  40 56 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  37 53 109  27 44 103  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  27 44 102  64 78 127
-+73 86 133  73 86 133  72 85 132  73 86 133  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 134  74 87 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+74 87 133  75 88 134  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 88 135  76 89 135  76 90 135  76 89 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  76 89 135  77 90 136  77 90 136  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  77 90 136
-+78 91 137  78 91 137  78 91 137  39 49 83  0 0 0  0 0 0
-+0 0 1  44 44 44  177 177 177  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  209 209 209  44 44 44  0 0 1
-+0 0 0  0 0 0  33 41 67  76 89 135  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  77 90 136  78 91 137
-+76 89 135  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 89 135  76 88 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+75 88 134  75 88 134  74 87 133  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 134  74 87 134  73 86 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 133  73 86 133
-+72 85 132  73 86 133  72 85 132  49 64 117  23 40 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  34 50 107
-+66 80 128  72 85 132  71 85 132  70 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  70 84 131  69 83 130
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  69 83 131
-+69 83 131  68 82 130  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  68 82 130  67 81 129  68 82 130  68 82 130
-+68 82 130  68 82 130  69 83 131  40 57 112  23 40 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  23 39 99  55 69 121  66 80 129  66 80 129
-+66 80 129  66 80 128  66 80 127  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+63 77 126  63 77 126  57 72 122  27 44 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  36 52 108
-+62 76 125  61 75 125  61 75 125  61 75 125  61 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  42 55 96  6 7 9  0 0 0
-+31 31 31  243 243 243  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  230 230 230  66 66 66
-+0 0 0  0 0 0  18 31 73  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  15 19 34  0 0 0  0 0 0  118 119 119
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+118 119 119  0 0 0  0 0 0  31 35 49  53 68 119  55 70 121
-+29 47 104  24 41 100  25 42 101  18 31 73  2 3 5  0 0 0
-+31 31 31  254 254 254  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  254 254 254  230 230 230  31 31 31
-+0 0 0  0 0 0  48 60 105  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  49 64 117  31 47 105
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 100  42 57 112  44 57 102  33 41 67  6 7 9
-+0 0 0  0 0 0  0 0 0  5 5 5  55 55 55  154 154 154
-+255 255 255  255 255 255  254 254 254  254 254 254  255 255 255  255 255 255
-+255 255 255  248 248 248  0 0 0  0 0 0  6 8 19  24 40 99
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  35 52 107  40 56 111
-+40 56 111  40 56 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  37 53 109  28 45 103  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  31 47 105  74 87 134
-+73 86 133  73 86 133  73 86 133  73 86 133  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+77 90 136  76 90 135  77 90 136  77 90 136  77 90 136  77 90 136
-+76 89 135  77 90 136  77 90 136  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  77 90 136  78 91 137
-+78 91 137  78 91 137  39 49 83  0 0 0  0 0 0  0 0 1
-+80 80 80  230 230 230  255 255 255  254 254 254  254 254 254  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  254 254 254  254 254 254  255 255 255  230 230 230  80 80 80
-+0 0 1  0 0 0  0 0 0  33 41 67  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+77 90 136  76 89 135  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 89 135  76 89 135
-+76 88 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  75 88 134  74 87 133  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 134  73 86 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  73 86 133
-+72 85 132  73 86 133  73 86 133  57 72 122  26 43 102  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  27 44 102
-+63 77 126  72 85 132  71 85 132  71 85 132  70 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  70 84 131  69 83 130
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+69 83 131  68 82 130  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  68 82 130  68 82 130  67 81 129  68 82 130  68 82 130
-+68 82 130  68 82 130  69 83 130  50 65 118  23 40 99  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  23 40 99  46 61 115  67 81 129  66 80 129
-+66 80 128  66 80 129  66 80 127  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  64 78 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  63 77 126
-+64 78 127  63 77 126  58 73 123  31 47 105  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  31 47 105
-+63 77 126  61 75 125  61 75 125  61 75 125  60 75 125  61 75 125
-+60 75 125  60 75 125  60 75 125  55 67 113  6 8 19  0 0 0
-+20 20 21  209 209 209  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  248 248 248  96 96 96
-+0 0 0  0 0 0  17 26 56  25 42 101  25 42 101  25 42 101
-+25 42 101  22 39 98  6 8 19  0 0 0  6 7 9  177 177 177
-+255 255 255  254 254 254  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+209 209 209  0 0 0  0 0 0  6 8 19  54 69 120  55 70 121
-+33 49 106  24 41 100  25 42 101  17 26 56  0 0 0  0 0 0
-+66 66 66  255 255 255  254 254 254  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  209 209 209  0 0 0
-+0 0 0  6 7 9  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  48 64 117  33 49 106
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  22 36 89  17 26 56  6 8 19  0 0 0  0 0 0
-+0 0 0  0 0 0  66 66 66  154 154 154  248 248 248  255 255 255
-+255 255 255  254 254 254  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  0 0 0  0 0 0  6 8 19  24 40 99
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  34 50 107  40 56 111
-+40 56 111  40 56 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 110  28 45 103  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  42 58 112  75 88 134
-+72 85 132  73 86 133  73 86 133  74 87 134  73 86 133  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  75 88 134
-+74 87 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  76 89 135  75 88 134  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 90 135  76 89 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+76 89 135  77 90 136  78 91 137  77 90 136  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  77 90 136  78 91 137  78 91 137
-+78 91 137  42 55 96  2 3 5  0 0 0  0 0 1  96 96 96
-+230 230 230  255 255 255  254 254 254  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  254 254 254  255 255 255  243 243 243
-+96 96 96  0 0 1  0 0 0  1 2 4  39 49 83  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  77 90 136
-+77 90 136  76 89 135  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 89 135
-+76 88 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  75 88 134  74 87 133  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 134  73 86 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  73 86 133
-+72 85 132  73 86 133  73 86 133  64 78 127  29 47 104  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  23 39 99
-+58 73 123  71 84 131  72 85 132  71 85 132  70 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  70 84 131  69 83 130
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+69 83 131  68 82 130  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  68 82 130  67 81 129  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  58 73 123  23 39 99  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  23 40 100  38 54 110  68 81 130  66 80 129
-+66 80 129  66 80 129  66 80 127  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  65 79 128  64 78 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  59 74 124  34 50 107  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  26 43 102
-+63 77 126  59 74 124  61 75 125  61 75 125  61 75 125  61 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  12 14 18  0 0 0
-+5 5 5  154 154 154  255 255 255  254 254 254  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  132 132 134
-+0 0 0  0 0 0  15 19 34  25 42 101  25 42 101  25 42 101
-+25 42 101  18 31 73  2 3 5  0 0 0  20 20 21  230 230 230
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  254 254 254
-+230 230 230  20 20 21  0 0 0  0 0 0  49 62 109  55 70 121
-+36 52 108  24 41 100  25 42 100  17 24 45  0 0 0  0 0 0
-+118 119 119  255 255 255  254 254 254  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  177 177 177  0 0 0
-+0 0 0  17 24 45  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  48 64 117  35 52 107
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 99  17 24 45  0 0 0  0 0 0  0 0 0  0 0 0
-+44 44 44  177 177 177  243 243 243  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  0 0 0  0 0 0  6 8 19  24 40 99
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  33 49 106  40 56 111
-+40 56 111  40 56 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 110  29 46 104  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  23 40 100  55 70 121  74 87 134
-+73 86 133  73 86 133  73 86 133  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  73 86 134  74 87 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  74 87 133
-+75 88 134  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 88 135  76 89 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  78 91 137  77 90 136  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  77 90 136  78 91 137  78 91 137  78 91 137
-+59 73 120  12 14 18  0 0 0  0 0 0  66 66 66  243 243 243
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+243 243 243  80 80 80  0 0 0  0 0 0  6 7 9  55 67 113
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  77 90 136  76 89 135  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 89 135  76 90 135
-+76 89 135  76 88 135  76 89 135  76 89 135  76 89 135  76 89 135
-+75 88 134  76 89 135  75 88 134  74 87 133  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 134  75 88 134  74 87 134  73 86 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  73 86 133
-+72 85 132  72 85 132  73 86 133  71 84 131  34 50 107  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  23 40 99
-+48 64 117  71 84 131  72 85 132  71 85 132  70 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  70 84 131
-+69 83 130  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+69 83 131  68 82 130  68 82 130  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  68 82 130  67 81 129  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  66 80 128  23 39 99  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  32 48 107  68 82 130  65 79 128
-+66 80 129  66 80 129  66 80 127  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  64 78 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  61 75 125  37 53 109  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+60 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  31 35 49  0 0 0
-+0 0 0  118 119 119  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  177 177 177
-+6 7 9  0 0 0  6 8 19  25 42 101  25 42 101  25 42 101
-+25 42 101  17 26 56  0 0 0  0 0 0  44 44 44  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+243 243 243  80 80 80  0 0 0  0 0 0  33 41 67  55 70 121
-+38 54 109  24 41 100  24 40 99  15 19 34  0 0 0  0 0 0
-+177 177 177  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  254 254 254  255 255 255  96 96 96  0 0 0
-+0 0 0  33 41 67  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  49 65 117  48 64 117  37 53 109
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 99  17 24 45  0 0 0  0 0 0  20 20 21  154 154 154
-+254 254 254  255 255 255  254 254 254  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  0 0 0  0 0 0  6 8 19  24 40 99
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  32 48 105  40 56 111
-+40 56 111  40 56 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 110  29 46 104  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  23 39 99  67 81 129  73 86 133
-+73 86 133  72 85 132  73 86 133  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  73 86 134  75 88 134  74 87 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  74 87 133
-+76 89 135  75 88 134  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 88 135  76 90 135  76 89 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  77 90 136  76 90 135
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  76 89 135
-+77 90 136  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  76 89 135
-+31 35 49  0 0 0  0 0 1  31 31 31  230 230 230  255 255 255
-+254 254 254  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  254 254 254
-+255 255 255  230 230 230  31 31 31  0 0 1  0 0 0  17 24 45
-+73 87 131  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  77 90 136  77 90 136  76 89 135  77 90 136  77 90 136
-+77 90 136  77 90 136  76 90 135  77 90 136  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 89 135  76 88 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  75 88 134  74 87 133  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  74 87 134  73 86 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 133  74 87 134
-+73 86 133  72 85 132  72 85 132  75 88 134  40 56 111  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  23 40 100
-+39 55 110  71 84 131  72 85 132  71 85 132  70 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  70 84 131
-+69 83 130  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  69 83 131  68 82 130  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  68 82 130  67 81 129  68 82 130  68 82 130
-+68 82 130  68 82 130  67 81 129  68 82 130  26 43 102  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  26 43 101  68 82 130  66 80 129
-+66 80 129  66 80 129  66 80 127  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  64 78 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  64 78 127
-+63 77 126  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  62 76 125  40 56 111  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+57 72 122  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  39 49 83  0 1 1
-+0 0 0  80 80 80  243 243 243  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  209 209 209
-+20 20 21  0 0 0  6 7 9  22 36 89  25 42 101  25 42 101
-+24 41 99  15 19 34  0 0 0  0 0 0  118 119 119  255 255 255
-+254 254 254  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  132 132 134  0 0 0  0 0 0  15 19 34  55 70 121
-+40 56 111  24 41 100  22 36 89  6 8 19  0 0 0  0 0 0
-+230 230 230  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  254 254 254  255 255 255  31 31 31  0 0 0
-+0 0 0  44 57 102  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  38 54 109
-+23 40 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 99  17 24 45  0 0 0  0 0 0  154 154 154  255 255 255
-+255 255 255  254 254 254  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  0 0 0  0 0 0  6 8 19  24 40 99
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  32 48 105  40 56 111
-+40 56 111  40 56 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 111  29 46 104  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  26 43 102  74 87 134  73 86 133
-+73 86 133  72 85 132  74 87 134  73 86 133  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  73 86 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  74 87 133
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 88 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  76 89 135
-+78 91 137  77 90 136  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  49 61 101
-+0 0 0  0 0 0  0 0 1  177 177 177  255 255 255  254 254 254
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+254 254 254  255 255 255  209 209 209  2 3 5  0 0 0  0 0 0
-+39 49 83  77 90 136  78 91 137  78 91 137  78 91 137  78 91 137
-+77 90 136  78 91 137  77 90 136  76 89 135  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 89 135  76 88 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  75 88 134  74 87 133  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  74 87 134  73 86 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+73 86 133  72 85 132  72 85 132  74 87 134  49 64 117  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+29 47 104  71 84 131  72 85 132  71 85 132  70 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  70 84 131
-+69 83 130  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  69 83 131  68 82 130  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  68 82 130  68 82 130  67 81 129  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  32 50 106  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  64 78 127  66 80 129
-+66 80 129  66 80 129  66 80 127  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  64 78 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  64 78 127  65 79 128
-+63 77 126  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  63 77 126  43 58 114  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+53 67 120  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  49 62 109  0 0 0
-+0 0 0  44 44 44  230 230 230  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  230 230 230
-+44 44 44  0 0 0  2 3 5  18 31 73  25 42 101  25 42 101
-+22 36 89  6 8 19  0 0 0  0 0 0  209 209 209  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  177 177 177  12 14 18  0 0 0  6 7 9  49 65 116
-+42 58 112  24 41 100  22 36 89  0 1 1  0 0 0  6 7 9
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  243 243 243  0 0 0  0 0 0
-+6 7 9  47 62 113  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  40 56 111
-+23 40 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 99  17 24 45  0 0 0  0 0 0  146 146 148  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  0 0 0  0 0 0  6 8 19  24 40 99
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  31 47 105  40 56 111
-+40 56 111  40 56 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  29 47 104  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  23 40 100  37 53 109  74 87 134  72 85 132
-+73 86 133  72 85 132  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  73 86 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  74 87 133  75 88 134
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 88 135  76 89 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  76 89 135
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  77 90 136  78 91 137  78 91 137  77 90 136  6 7 9
-+0 0 0  0 0 1  137 138 138  255 255 255  254 254 254  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  254 254 254  255 255 255  146 146 148  0 0 1  0 0 0
-+2 3 5  73 86 133  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  74 87 134  73 86 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+73 86 133  72 85 132  73 86 133  74 87 133  59 74 124  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+23 40 99  70 84 131  72 85 132  72 85 132  71 85 132  70 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  70 84 131
-+69 83 130  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  69 83 131  68 82 130  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  68 82 130  67 81 129  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  38 54 110  23 40 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  59 74 124  66 80 129
-+66 80 129  66 80 129  66 80 128  66 80 127  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  64 78 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+63 77 126  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  63 77 126  45 60 114  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+50 65 118  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  6 7 9
-+0 0 0  0 0 0  209 209 209  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+55 55 55  0 0 0  1 2 4  17 26 56  25 42 101  25 42 101
-+22 36 89  0 0 0  0 0 0  12 14 18  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  230 230 230  44 44 44  0 0 0  2 3 5  39 49 83
-+45 60 114  24 41 100  18 31 73  0 0 0  0 0 0  66 66 66
-+255 255 255  254 254 254  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  177 177 177  0 0 0  0 0 0
-+15 19 34  47 63 116  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  42 58 112
-+23 40 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 99  17 24 45  0 0 0  0 0 0  146 146 148  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  0 0 0  0 0 0  6 8 19  24 40 99
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  30 46 104  40 56 111
-+40 56 111  40 56 111  39 55 111  38 54 111  39 55 111  39 55 111
-+39 55 111  38 54 110  39 55 111  29 47 104  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  23 40 99  46 61 115  74 87 133  73 86 133
-+73 86 133  72 85 132  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 134  74 87 134  74 87 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  74 87 133  75 88 134
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 88 135  76 89 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  76 89 135  77 90 136
-+77 90 136  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+77 90 136  78 91 137  78 91 137  78 91 137  33 41 67  0 0 0
-+0 0 0  55 55 55  243 243 243  255 255 255  254 254 254  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  254 254 254  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  254 254 254  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  254 254 254  255 255 255  243 243 243  55 55 55  0 0 0
-+0 0 0  33 41 67  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  75 88 134  55 67 113  42 55 96
-+39 49 83  33 41 67  33 41 67  39 49 83  49 61 101  67 81 125
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+73 86 133  73 86 133  73 86 133  73 86 133  67 80 128  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+23 39 99  63 77 126  72 85 132  72 85 132  71 85 132  70 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  70 84 131
-+69 83 130  69 83 130  70 84 131  70 84 131  70 84 131  70 84 131
-+59 73 120  49 61 101  39 49 83  33 41 67  33 41 67  33 41 67
-+33 41 67  33 41 67  39 49 83  42 55 96  49 61 101  63 77 126
-+68 82 130  68 82 130  68 82 130  68 82 130  44 60 113  23 40 99
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  54 69 120  67 81 129
-+66 80 129  66 80 129  66 80 128  66 80 127  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  64 78 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+63 77 126  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  63 77 126  47 63 116  25 42 101  24 41 100
-+25 42 101  22 36 89  18 31 73  17 26 56  17 26 56  17 24 45
-+17 26 56  17 26 56  18 31 73  22 39 98  25 42 101  24 41 100
-+47 63 116  62 76 125  61 75 125  61 75 125  61 75 125  61 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  17 24 45
-+0 0 0  0 0 0  154 154 154  254 254 254  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+96 96 96  0 0 0  0 0 0  17 24 45  25 42 101  25 42 101
-+17 26 56  0 0 0  0 0 0  96 96 96  255 255 255  254 254 254
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  66 66 66  0 0 0  0 0 0  31 35 49
-+46 61 115  24 41 100  17 26 56  0 0 0  0 0 0  132 132 134
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  118 119 119  0 0 0  0 0 0
-+33 41 67  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  43 59 113
-+23 40 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  22 36 89  17 26 56  17 24 45  17 24 45
-+17 26 56  18 31 73  24 40 99  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 100  17 24 45  0 0 0  0 0 0  146 146 148  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  0 0 0  0 0 0  6 8 19  24 40 99
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  29 46 104  40 56 111
-+40 56 111  40 56 111  40 56 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  31 47 105  24 41 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  23 39 99  56 71 121  73 86 133  73 86 133
-+72 85 132  73 86 133  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 134  74 87 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  74 87 133  75 88 134
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 88 135  76 89 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  76 89 135  77 90 136  77 90 136
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+77 90 136  78 91 137  78 91 137  73 86 130  6 7 9  0 0 1
-+0 0 0  177 177 177  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  248 248 248  230 230 230  177 177 177
-+96 96 96  66 66 66  44 44 44  55 55 55  80 80 80  118 119 119
-+177 177 177  230 230 230  251 251 251  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  177 177 177  0 0 0
-+0 0 1  2 3 5  73 86 130  78 91 137  78 91 137  78 91 137
-+77 90 136  42 55 96  33 41 67  33 41 67  33 41 67  33 41 67
-+33 41 67  33 41 67  33 41 67  33 41 67  33 41 67  33 41 67
-+33 41 67  33 41 67  33 41 67  33 41 67  33 41 67  33 41 67
-+33 41 67  33 41 67  33 41 67  39 49 83  75 88 134  74 87 133
-+67 81 125  39 49 83  15 19 34  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+2 3 5  31 35 49  49 61 101  67 81 125  74 87 133  73 86 133
-+74 87 134  73 86 133  73 86 133  73 86 133  74 87 134  26 43 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+23 39 99  54 69 120  73 85 132  72 85 132  71 85 132  70 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  70 84 131  71 85 132
-+67 81 125  59 73 120  49 61 101  31 35 49  12 14 18  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+2 3 5  15 19 34  33 41 67  49 61 101  44 57 102  22 39 98
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  49 65 117  67 81 129
-+66 80 129  66 80 129  66 80 128  49 61 101  33 41 67  33 41 67
-+33 41 67  33 41 67  33 41 67  33 41 67  33 41 67  33 41 67
-+33 41 67  33 41 67  33 41 67  33 41 67  33 41 67  33 41 67
-+33 41 67  33 41 67  33 41 67  33 41 67  33 41 67  39 49 83
-+59 73 120  64 78 127  62 76 125  44 57 102  18 31 73  15 19 34
-+1 2 4  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  6 7 9  17 24 45
-+42 55 96  58 72 120  61 75 125  61 75 125  61 75 125  61 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  33 41 67
-+0 0 0  0 0 0  96 96 96  254 254 254  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+141 141 145  0 1 1  0 0 0  15 19 34  24 41 99  25 42 101
-+6 8 19  0 0 0  0 0 0  177 177 177  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+254 254 254  255 255 255  132 132 134  1 2 4  0 0 0  15 19 34
-+46 61 113  24 41 100  15 19 34  0 0 0  0 0 0  177 177 177
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  44 44 44  0 0 0  0 0 0
-+39 49 83  44 58 112  17 26 56  17 26 56  17 26 56  17 26 56
-+17 26 56  17 26 56  17 26 56  17 26 56  17 26 56  17 26 56
-+17 26 56  17 26 56  17 26 56  17 26 56  17 26 56  17 26 56
-+17 24 45  17 24 45  17 24 45  17 24 45  18 31 73  22 36 89
-+17 24 45  1 2 4  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  6 8 19  17 26 56  22 36 89
-+24 41 99  22 36 89  17 24 45  17 24 45  17 24 45  17 24 45
-+17 24 45  6 8 19  0 0 0  0 0 0  146 146 148  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  0 0 0  0 0 0  2 3 5  17 24 45
-+17 24 45  17 24 45  17 24 45  17 24 45  17 24 45  17 24 45
-+17 24 45  18 31 73  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  29 45 103  40 56 111
-+40 56 111  40 56 111  40 56 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  31 47 105  24 41 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  22 39 98  64 78 127  73 86 133  73 86 133
-+72 85 132  73 86 133  73 86 133  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 134  74 87 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  74 87 133  75 88 134
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 88 135
-+76 89 135  76 89 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  76 89 135  77 90 136  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  77 90 136
-+78 91 137  78 91 137  78 91 137  39 49 83  1 2 4  0 0 1
-+55 55 55  230 230 230  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+254 254 254  255 255 255  209 209 209  118 119 119  12 14 18  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  31 31 31  132 132 134  230 230 230  255 255 255  254 254 254
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  230 230 230  55 55 55
-+0 0 1  0 1 1  33 41 67  78 91 137  78 91 137  78 91 137
-+76 89 135  17 24 45  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  15 19 34  49 61 101  33 41 67
-+6 7 9  0 0 0  0 0 0  0 0 0  0 0 1  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  12 14 18  33 41 67  67 81 125
-+74 87 134  73 86 133  73 86 133  72 85 132  76 88 135  33 49 106
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+23 40 99  46 61 115  73 86 133  72 85 132  71 85 132  70 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  62 76 125  39 49 83
-+17 24 45  6 7 9  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 1  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  6 7 9  15 19 34
-+17 26 56  22 36 89  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  46 61 115  68 81 130
-+66 80 129  66 80 129  66 80 128  33 41 67  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  12 14 18
-+59 73 120  49 61 101  31 35 49  6 7 9  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  15 19 34  39 49 83  61 75 125  61 75 125  61 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  49 62 109
-+0 0 0  0 0 0  44 44 44  254 254 254  254 254 254  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+177 177 177  2 3 5  0 0 0  6 8 19  22 36 89  24 41 99
-+0 0 0  0 0 0  0 0 0  243 243 243  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  209 209 209  5 5 5  0 0 0  6 8 19
-+44 57 102  24 41 100  6 7 9  0 0 0  0 0 0  243 243 243
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  243 243 243  6 7 9  0 0 0  6 7 9
-+42 55 96  44 57 102  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  6 8 19  1 2 4
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 1 1
-+15 19 34  15 19 34  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  146 146 148  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  17 26 56  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  28 45 103  40 56 111
-+40 56 111  40 56 111  40 56 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  31 47 105  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  68 82 130  73 86 133  73 86 133
-+72 85 132  73 86 133  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 134  74 87 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 133  75 88 134  75 88 134
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 88 135
-+76 89 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  76 89 135  77 90 136  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  77 90 136
-+78 91 137  78 91 137  74 87 130  15 19 34  0 0 0  2 3 5
-+132 132 134  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  254 254 254
-+255 255 255  177 177 177  31 31 31  0 0 0  0 0 1  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 1  0 0 0  44 44 44  209 209 209  255 255 255
-+254 254 254  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  132 132 134
-+2 3 5  0 0 0  15 19 34  74 87 133  78 91 137  78 91 137
-+76 89 135  17 24 45  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  6 7 9  6 7 9  0 0 0
-+0 0 0  0 0 1  0 0 1  0 0 0  55 55 55  96 96 96
-+132 132 134  137 138 138  137 138 138  118 119 119  96 96 96  55 55 55
-+0 0 0  0 0 1  0 0 1  0 0 0  0 0 0  12 14 18
-+42 55 96  73 86 133  73 86 133  73 86 133  75 88 134  42 57 112
-+23 40 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+23 40 100  38 54 110  73 86 133  72 85 132  71 85 132  70 85 132
-+71 85 132  71 85 132  70 84 131  33 41 67  12 14 18  0 1 1
-+0 0 0  0 0 0  0 0 1  0 0 1  0 0 0  12 14 18
-+55 55 55  96 96 96  118 119 119  132 132 134  137 138 138  141 141 145
-+137 138 138  132 132 134  118 119 119  96 96 96  66 66 66  44 44 44
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 1  6 8 19  17 24 45  24 41 99  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  40 57 112  68 81 130
-+66 80 129  66 80 129  66 80 128  33 41 67  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  15 19 34
-+33 41 67  6 8 19  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  44 44 44  96 96 96  118 119 119  132 132 134  137 138 138
-+132 132 134  118 119 119  80 80 80  31 31 31  0 0 0  0 0 0
-+0 0 0  0 0 0  2 3 5  17 24 45  56 69 119  61 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+5 5 5  0 0 0  0 0 0  243 243 243  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+243 243 243  1 2 4  0 0 0  6 7 9  22 36 89  18 31 73
-+0 0 0  0 0 0  66 66 66  251 251 251  254 254 254  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  20 20 21  0 0 0  0 0 0
-+39 49 83  24 40 99  0 0 0  0 0 0  31 31 31  248 248 248
-+254 254 254  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  177 177 177  5 5 5  0 0 0  12 14 18
-+49 62 109  44 57 102  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  55 55 55  118 119 119  137 138 138  137 138 138
-+118 119 119  80 80 80  20 20 21  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 1  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  141 141 145  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  17 26 56  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  27 44 103  40 56 111
-+40 56 111  40 56 111  40 56 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  32 48 107  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  29 46 104  70 84 131  73 86 133  73 86 133
-+72 85 132  73 86 133  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 134  73 86 134  74 87 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 133  75 88 134  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 88 135
-+76 89 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  76 89 135  76 89 135  77 90 136  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  77 90 136  77 90 136
-+78 91 137  78 91 137  55 67 113  6 7 9  0 0 0  12 14 18
-+230 230 230  255 255 255  254 254 254  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  254 254 254  255 255 255
-+177 177 177  0 0 0  0 0 1  0 0 0  0 0 0  15 19 34
-+49 61 101  67 81 125  76 90 135  74 87 130  59 73 120  39 49 83
-+12 14 18  0 0 0  0 0 1  0 0 1  5 5 5  209 209 209
-+255 255 255  254 254 254  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  254 254 254  255 255 255  209 209 209
-+20 20 21  0 0 0  6 7 9  55 67 113  78 91 137  78 91 137
-+76 89 135  17 24 45  0 0 0  1 2 4  96 96 96  154 154 154
-+154 154 154  154 154 154  154 154 154  154 154 154  154 154 154  154 154 154
-+154 154 154  154 154 154  154 154 154  154 154 154  154 154 154  154 154 154
-+118 119 119  0 0 0  0 0 1  0 0 0  0 0 0  0 0 1
-+0 0 1  55 55 55  177 177 177  243 243 243  248 248 248  251 251 251
-+251 251 251  254 254 254  251 251 251  251 251 251  251 251 251  248 248 248
-+243 243 243  154 154 154  31 31 31  0 0 1  0 0 0  0 0 0
-+0 0 0  31 35 49  73 86 133  73 86 133  74 87 134  49 64 117
-+23 40 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  32 48 105  74 87 133  72 85 132  71 85 132  71 85 132
-+71 85 132  49 61 101  6 8 19  0 1 1  0 0 0  0 0 0
-+0 0 1  0 0 0  55 55 55  146 146 148  230 230 230  248 248 248
-+248 248 248  251 251 251  251 251 251  251 251 251  251 251 251  254 254 254
-+251 251 251  251 251 251  251 251 251  251 251 251  248 248 248  248 248 248
-+243 243 243  209 209 209  132 132 134  44 44 44  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  6 7 9  22 36 89  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  38 54 110  68 82 130
-+66 80 129  66 80 129  66 80 128  33 41 67  0 0 0  0 0 0
-+66 66 66  154 154 154  154 154 154  154 154 154  154 154 154  154 154 154
-+154 154 154  154 154 154  154 154 154  154 154 154  154 154 154  154 154 154
-+154 154 154  154 154 154  132 132 134  0 0 0  0 0 0  0 1 1
-+0 1 1  0 0 0  0 0 0  0 0 0  44 44 44  154 154 154
-+243 243 243  248 248 248  251 251 251  251 251 251  251 251 251  254 254 254
-+251 251 251  251 251 251  248 248 248  248 248 248  209 209 209  118 119 119
-+0 1 1  0 0 0  0 0 0  0 0 0  12 14 18  55 67 113
-+61 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+15 19 34  0 0 0  0 0 0  177 177 177  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  31 31 31  0 0 0  0 0 0  22 36 89  15 19 34
-+0 0 0  0 0 0  137 138 138  254 254 254  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  254 254 254  255 255 255  96 96 96  0 0 0  0 0 0
-+33 41 67  18 31 73  0 0 0  0 0 0  80 80 80  251 251 251
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+254 254 254  255 255 255  132 132 134  2 3 5  0 0 0  15 19 34
-+51 66 119  44 57 102  0 0 0  0 0 0  44 44 44  146 146 148
-+154 154 154  154 154 154  154 154 154  154 154 154  154 154 154  154 154 154
-+154 154 154  154 154 154  154 154 154  154 154 154  154 154 154  154 154 154
-+146 146 148  66 66 66  0 0 0  0 0 0  0 0 0  0 0 0
-+96 96 96  230 230 230  248 248 248  251 251 251  251 251 251  254 254 254
-+251 251 251  248 248 248  248 248 248  209 209 209  80 80 80  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  66 66 66  154 154 154
-+154 154 154  154 154 154  154 154 154  154 154 154  209 209 209  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  251 251 251  146 146 148  154 154 154  154 154 154  154 154 154
-+154 154 154  154 154 154  154 154 154  154 154 154  80 80 80  0 0 0
-+0 0 0  17 26 56  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  27 44 103  40 56 111
-+40 56 111  40 56 111  40 56 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  32 50 106  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  34 50 107  70 84 131  73 86 133  73 86 133
-+72 85 132  73 86 133  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 134  74 87 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 133  75 88 134  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 88 135
-+76 89 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  76 89 135  77 90 136  78 91 137  77 90 136
-+78 91 137  78 91 137  78 91 137  78 91 137  77 90 136  78 91 137
-+78 91 137  78 91 137  39 49 83  0 0 0  0 0 0  55 55 55
-+255 255 255  254 254 254  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  254 254 254  255 255 255  209 209 209
-+6 7 9  0 0 0  0 0 0  6 8 19  67 77 99  82 95 139
-+82 95 139  82 95 139  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  42 55 96  6 7 9  0 0 0  0 0 0  20 20 21
-+243 243 243  255 255 255  254 254 254  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+55 55 55  0 0 0  0 0 0  39 49 83  78 91 137  78 91 137
-+76 89 135  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+209 209 209  0 0 0  0 0 0  0 0 0  0 0 0  31 31 31
-+177 177 177  255 255 255  255 255 255  255 255 255  254 254 254  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  254 254 254
-+255 255 255  255 255 255  255 255 255  154 154 154  31 31 31  0 0 0
-+0 0 1  0 0 0  31 35 49  71 84 128  74 87 133  56 71 121
-+23 40 99  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  27 43 102  74 87 133  71 84 131  72 85 132  69 82 127
-+33 41 67  0 0 0  0 0 0  0 0 1  1 2 4  31 31 31
-+118 119 119  230 230 230  255 255 255  255 255 255  255 255 255  254 254 254
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  254 254 254
-+255 255 255  255 255 255  255 255 255  255 255 255  230 230 230  118 119 119
-+31 31 31  1 2 4  0 0 0  0 0 0  0 0 0  17 26 56
-+24 41 99  25 42 101  25 42 101  24 41 100  35 52 107  68 82 130
-+66 80 129  66 80 129  66 80 128  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  230 230 230  0 0 0  0 0 0  0 0 0
-+0 0 0  0 1 1  44 44 44  177 177 177  255 255 255  255 255 255
-+255 255 255  254 254 254  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  254 254 254  255 255 255  255 255 255
-+243 243 243  80 80 80  5 5 5  0 0 0  0 0 0  12 14 18
-+55 67 113  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+33 41 67  0 0 0  0 0 0  118 119 119  255 255 255  254 254 254
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  80 80 80  0 0 0  0 0 0  18 31 73  2 3 5
-+0 0 0  0 0 0  209 209 209  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  177 177 177  0 0 0  0 0 0
-+15 19 34  17 26 56  0 0 0  0 0 0  118 119 119  251 251 251
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  80 80 80  0 0 0  0 0 0  17 26 56
-+51 66 119  44 57 102  0 0 0  0 0 0  66 66 66  254 254 254
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+254 254 254  96 96 96  0 0 0  0 0 0  20 20 21  154 154 154
-+255 255 255  255 255 255  254 254 254  255 255 255  255 255 255  255 255 255
-+255 255 255  254 254 254  254 254 254  255 255 255  255 255 255  230 230 230
-+66 66 66  0 0 0  0 0 0  0 0 0  93 98 116  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  254 254 254
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+254 254 254  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  132 132 134  0 0 0
-+0 0 0  17 26 56  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  26 43 102  40 56 111
-+40 56 111  40 56 111  40 56 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  32 50 106  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 100  39 55 110  71 84 131  73 86 133  73 86 133
-+72 85 132  73 86 133  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 134  74 87 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 133  75 88 134  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 88 135  76 89 135
-+76 89 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  77 90 136  76 90 135  77 90 136  77 90 136
-+77 90 136  77 90 136  76 89 135  77 90 136  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  77 90 136  78 91 137
-+78 91 137  76 89 135  31 35 49  0 0 0  0 0 1  154 154 154
-+255 255 255  254 254 254  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  248 248 248  80 80 80
-+0 0 0  0 0 0  12 14 18  67 81 125  82 95 139  82 95 139
-+82 95 139  82 95 139  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  80 93 136  67 77 99  6 8 19  0 0 0  0 0 0
-+96 96 96  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  254 254 254  255 255 255
-+137 138 138  0 0 1  0 0 0  31 35 49  75 88 134  78 91 137
-+76 89 135  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+209 209 209  0 0 0  0 0 0  1 2 4  96 96 96  248 248 248
-+255 255 255  255 255 255  254 254 254  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  254 254 254  254 254 254  255 255 255  230 230 230  96 96 96
-+0 0 0  0 0 0  0 0 0  31 35 49  72 85 132  61 75 125
-+23 39 99  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  72 85 132  72 85 132  62 76 125  31 35 49
-+0 0 0  0 0 0  0 0 1  31 31 31  132 132 134  230 230 230
-+255 255 255  255 255 255  254 254 254  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+230 230 230  132 132 134  31 31 31  0 0 0  0 0 0  0 0 0
-+15 19 34  22 39 98  25 42 101  24 41 100  32 50 106  68 82 130
-+65 79 128  66 80 129  66 80 128  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  230 230 230  0 0 0  0 0 0  0 0 0
-+6 7 9  118 119 119  243 243 243  255 255 255  255 255 255  254 254 254
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  254 254 254
-+255 255 255  255 255 255  146 146 148  6 7 9  0 0 0  0 0 0
-+17 24 45  59 74 124  60 75 125  60 75 125  60 75 125  60 75 125
-+42 55 96  0 0 0  0 0 0  44 44 44  255 255 255  254 254 254
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  146 146 148  0 0 0  0 0 0  6 8 19  0 0 0
-+0 0 0  44 44 44  230 230 230  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  251 251 251  0 0 0  0 0 0
-+1 2 4  6 8 19  0 0 0  0 0 0  177 177 177  254 254 254
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  243 243 243  55 55 55  0 0 0  1 2 4  33 41 67
-+51 66 119  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+248 248 248  96 96 96  0 0 0  5 5 5  177 177 177  255 255 255
-+255 255 255  254 254 254  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+80 80 80  0 0 0  0 0 0  0 0 0  96 96 96  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  132 132 134  0 0 0
-+0 0 0  17 26 56  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  26 44 102  40 56 111
-+40 56 111  40 56 111  40 56 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  33 49 106  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 100  42 58 112  71 85 132  73 86 133  72 85 132
-+73 86 133  73 86 133  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 134  74 87 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 133  75 88 134  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 88 135  76 89 135
-+76 90 135  76 89 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  76 89 135  77 90 136  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  74 87 130  12 14 18  0 0 0  0 0 0  243 243 243
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  209 209 209  12 14 18
-+0 0 1  1 2 4  49 61 101  82 95 139  82 95 139  82 95 139
-+82 95 139  82 95 139  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  82 95 139  80 93 136  39 49 83  2 3 5  0 0 1
-+20 20 21  209 209 209  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+230 230 230  0 0 0  0 0 0  20 20 21  71 84 128  78 91 137
-+76 89 135  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+209 209 209  0 0 0  2 3 5  132 132 134  251 251 251  255 255 255
-+254 254 254  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  248 248 248
-+118 119 119  0 0 1  0 0 0  0 0 0  39 49 83  67 80 128
-+23 39 99  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  68 81 130  59 73 120  15 19 34  0 0 0
-+0 0 1  0 0 1  96 96 96  209 209 209  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  254 254 254  254 254 254
-+255 255 255  255 255 255  209 209 209  80 80 80  0 0 0  0 0 0
-+0 0 0  15 19 34  24 41 99  25 42 101  31 47 105  67 81 129
-+66 80 129  66 80 129  66 80 128  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  230 230 230  0 0 0  0 0 0  12 14 18
-+177 177 177  255 255 255  255 255 255  254 254 254  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+254 254 254  255 255 255  255 255 255  177 177 177  0 0 0  0 0 0
-+0 0 0  33 41 67  60 75 125  60 75 125  60 75 125  60 75 125
-+49 62 109  6 7 9  0 0 0  0 0 0  251 251 251  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  209 209 209  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  80 80 80  248 248 248  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  254 254 254  255 255 255  66 66 66  0 0 0
-+0 0 0  0 0 1  0 0 0  6 7 9  209 209 209  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  209 209 209  31 31 31  0 0 0  2 3 5  42 55 96
-+51 66 119  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+248 248 248  96 96 96  0 0 0  154 154 154  255 255 255  254 254 254
-+254 254 254  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  209 209 209
-+20 20 21  0 0 0  0 0 0  0 0 0  96 96 96  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  132 132 134  0 0 0
-+0 0 0  17 26 56  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  26 43 102  40 56 111
-+40 56 111  40 56 111  40 56 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  33 49 106  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 100  45 60 114  72 85 132  73 86 133  72 85 132
-+73 86 133  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 134  74 87 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 133  75 88 134  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 88 135  76 89 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  71 84 128  0 0 0  0 0 0  31 31 31  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  251 251 251  132 132 134  0 0 0
-+0 0 0  15 19 34  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  82 95 139  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  82 95 139  82 95 139  80 93 136  12 14 18  0 0 0
-+0 0 0  141 141 145  254 254 254  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  6 7 9  0 0 0  0 1 1  67 81 125  78 91 137
-+76 89 135  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+209 209 209  0 0 0  118 119 119  255 255 255  255 255 255  254 254 254
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  254 254 254  254 254 254  255 255 255
-+255 255 255  96 96 96  0 0 1  0 0 0  0 0 0  55 67 113
-+23 39 99  24 41 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  59 73 120  17 24 45  0 0 0  0 0 1
-+0 1 1  132 132 134  248 248 248  255 255 255  255 255 255  254 254 254
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+254 254 254  255 255 255  255 255 255  254 254 254  118 119 119  0 0 0
-+0 0 0  0 0 0  15 19 34  25 42 101  31 47 105  65 79 128
-+66 80 129  66 80 129  66 80 128  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  230 230 230  0 0 0  12 14 18  177 177 177
-+255 255 255  255 255 255  254 254 254  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  254 254 254  255 255 255  255 255 255  154 154 154  0 0 0
-+0 0 0  0 1 1  55 67 113  60 75 125  60 75 125  60 75 125
-+56 69 119  15 19 34  0 0 0  0 0 0  177 177 177  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  0 0 0  0 0 0  0 0 0  0 0 0
-+0 1 1  132 132 134  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  154 154 154  0 0 0
-+0 0 0  0 0 0  0 0 0  31 31 31  209 209 209  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  177 177 177  6 7 9  0 0 0  6 7 9  42 57 112
-+51 66 119  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+248 248 248  96 96 96  80 80 80  248 248 248  255 255 255  254 254 254
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  251 251 251  132 132 134
-+0 0 0  0 0 0  0 0 0  0 0 0  96 96 96  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  132 132 134  0 0 0
-+0 0 0  17 26 56  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 43 102  40 56 111
-+40 56 111  40 56 111  40 56 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  33 49 106  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 99  48 63 117  72 85 132  73 86 133  72 85 132
-+73 86 133  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 134  74 87 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 133  75 88 134  75 88 134  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 88 135  76 89 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  78 91 137  77 90 136  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  49 61 101  0 0 0  0 0 1  96 96 96  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  254 254 254  243 243 243  55 55 55  0 0 1
-+0 0 0  49 61 101  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  82 95 139  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  82 95 139  82 95 139  82 95 139  39 49 83  0 0 0
-+0 0 1  80 80 80  243 243 243  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  66 66 66  0 0 1  0 0 0  55 67 113  78 91 137
-+76 89 135  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+209 209 209  80 80 80  255 255 255  255 255 255  254 254 254  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+254 254 254  255 255 255  55 55 55  0 0 1  0 0 0  12 14 18
-+23 40 99  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 99  33 41 67  0 0 0  0 0 1  5 5 5
-+132 132 134  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  254 254 254  254 254 254  255 255 255  118 119 119
-+0 0 0  0 0 0  0 0 0  17 26 56  31 47 105  64 78 128
-+66 80 129  66 80 129  66 80 128  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  230 230 230  5 5 5  154 154 154  255 255 255
-+254 254 254  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  254 254 254  243 243 243  66 66 66
-+0 0 0  0 0 0  31 35 49  60 75 125  60 75 125  60 75 125
-+59 74 124  31 35 49  0 0 0  0 0 0  132 132 134  255 255 255
-+254 254 254  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+254 254 254  255 255 255  44 44 44  0 0 0  0 0 0  0 0 0
-+12 14 18  177 177 177  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  251 251 251  254 254 254  254 254 254  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  209 209 209  0 0 0
-+0 0 0  0 0 0  0 0 0  66 66 66  230 230 230  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  137 138 138  0 0 0  0 0 0  15 19 34  40 57 112
-+51 66 119  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+248 248 248  118 119 119  209 209 209  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  230 230 230  31 31 31
-+0 0 0  0 0 0  0 0 0  0 0 0  96 96 96  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  132 132 134  0 0 0
-+0 0 0  17 26 56  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 43 102  40 56 111
-+40 56 111  40 56 111  40 56 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  34 50 107  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 99  50 65 118  72 85 132  73 86 133  72 85 132
-+73 86 133  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 134  74 87 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 133  75 88 134  76 89 135  75 88 134
-+76 89 135  76 89 135  76 89 135  76 89 135  76 88 135  76 89 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  39 49 83  0 0 0  0 0 0  146 146 148  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  230 230 230  0 1 1  0 0 0
-+0 0 1  82 95 139  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  82 95 139  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  82 95 139  82 95 139  82 95 139  76 90 135  0 0 0
-+0 0 0  20 20 21  230 230 230  254 254 254  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  118 119 119  0 0 0  0 0 0  39 49 83  78 91 137
-+76 89 135  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+230 230 230  251 251 251  255 255 255  254 254 254  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+254 254 254  255 255 255  209 209 209  20 20 21  0 0 1  0 0 0
-+17 26 56  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  18 31 73  0 0 0  0 0 0  0 0 1  118 119 119
-+255 255 255  255 255 255  254 254 254  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  254 254 254  254 254 254  255 255 255
-+118 119 119  0 0 0  0 0 0  0 0 0  22 36 89  63 77 126
-+66 80 129  66 80 129  66 80 128  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  230 230 230  141 141 145  255 255 255  254 254 254
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  154 154 154
-+5 5 5  0 0 0  6 8 19  56 69 119  60 75 125  60 75 125
-+60 75 125  33 41 67  0 0 0  0 0 0  66 66 66  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  96 96 96  0 0 0  0 0 0  0 0 0
-+31 31 31  243 243 243  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  177 177 177  230 230 230  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  254 254 254  230 230 230  44 44 44
-+0 0 0  0 0 0  0 0 0  96 96 96  254 254 254  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+248 248 248  96 96 96  0 0 0  0 0 0  17 26 56  40 57 112
-+51 66 119  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+248 248 248  209 209 209  243 243 243  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  254 254 254  255 255 255  177 177 177  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  96 96 96  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  132 132 134  0 0 0
-+0 0 0  17 26 56  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  40 56 111
-+40 56 111  40 56 111  40 56 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  34 50 107  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 99  52 67 118  72 85 132  73 86 133  72 85 132
-+73 86 133  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 134  74 87 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 133  75 88 134  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 88 135  76 89 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  31 35 49  0 0 0  0 0 0  177 177 177  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  209 209 209  0 0 0  0 0 0
-+15 19 34  82 95 139  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  82 95 139  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  82 95 139  82 95 139  82 95 139  82 95 139  12 14 18
-+0 0 0  0 0 0  209 209 209  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  154 154 154  0 0 0  0 0 0  33 41 67  78 91 137
-+76 89 135  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  254 254 254
-+255 255 255  255 255 255  254 254 254  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  118 119 119  0 1 1  0 0 0
-+6 8 19  22 36 89  25 42 101  25 42 101  25 42 101  25 42 101
-+22 39 98  2 3 5  0 0 0  0 0 1  118 119 119  255 255 255
-+255 255 255  254 254 254  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  254 254 254  254 254 254  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  254 254 254  255 255 255
-+243 243 243  66 66 66  0 0 0  0 0 0  6 8 19  59 74 124
-+66 80 129  66 80 129  66 80 129  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  248 248 248  255 255 255  254 254 254  254 254 254
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  230 230 230
-+31 31 31  0 0 0  2 3 5  39 49 83  60 75 125  60 75 125
-+60 75 125  42 55 96  6 7 9  0 0 0  31 31 31  243 243 243
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  154 154 154  0 0 0  0 0 0  0 0 0
-+80 80 80  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+254 254 254  255 255 255  96 96 96  146 146 148  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  248 248 248  96 96 96
-+0 0 0  0 0 0  0 0 0  132 132 134  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+230 230 230  44 44 44  0 0 0  0 0 0  22 36 89  40 57 112
-+51 66 119  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+254 254 254  251 251 251  255 255 255  254 254 254  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  254 254 254  255 255 255  31 31 31  0 0 0
-+0 0 0  6 8 19  0 0 0  0 0 0  96 96 96  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  132 132 134  0 0 0
-+0 0 0  17 26 56  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  40 56 111
-+40 56 111  40 56 111  40 56 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  34 50 107  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 99  53 67 120  73 86 133  73 86 133  72 85 132
-+73 86 133  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 134  74 87 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 133  75 88 134  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 88 135  76 89 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  15 19 34  0 0 0  0 0 0  230 230 230  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  154 154 154  0 0 0  0 0 0
-+33 41 67  82 95 139  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  82 95 139  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  82 95 139  82 95 139  82 95 139  82 95 139  31 35 49
-+0 0 0  0 0 0  177 177 177  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  209 209 209  0 0 0  0 0 0  31 35 49  77 90 136
-+76 89 135  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  254 254 254  255 255 255  230 230 230  20 20 21  0 0 0
-+0 1 1  17 26 56  25 42 101  25 42 101  25 42 101  25 42 101
-+15 19 34  0 0 0  0 0 0  55 55 55  230 230 230  255 255 255
-+254 254 254  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+254 254 254  254 254 254  255 255 255  255 255 255  230 230 230  209 209 209
-+209 209 209  230 230 230  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  209 209 209  20 20 21  0 0 0  0 1 1  39 49 83
-+66 80 129  66 80 129  66 80 129  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  254 254 254  255 255 255  255 255 255  254 254 254  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+80 80 80  0 0 0  0 0 0  31 35 49  60 75 125  60 75 125
-+60 75 125  49 62 109  6 8 19  0 0 0  20 20 21  209 209 209
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  209 209 209  0 0 0  0 0 0  0 0 0
-+154 154 154  255 255 255  254 254 254  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  251 251 251  55 55 55  55 55 55  255 255 255  254 254 254
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  154 154 154
-+0 0 0  0 0 0  6 7 9  154 154 154  255 255 255  254 254 254
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  254 254 254
-+230 230 230  0 0 0  0 0 0  1 2 4  25 42 101  40 57 112
-+51 66 119  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  254 254 254  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  177 177 177  0 0 0  0 0 0
-+6 7 9  17 26 56  0 0 0  0 0 0  96 96 96  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  132 132 134  0 0 0
-+0 0 0  17 26 56  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  40 56 111
-+40 56 111  40 56 111  40 56 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  34 50 107  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 99  54 69 120  73 86 133  73 86 133  72 85 132
-+73 86 133  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 134  74 87 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 133  75 88 134  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 88 135  76 89 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  77 90 136  78 91 137  78 91 137
-+78 91 137  12 14 18  0 0 0  0 0 0  230 230 230  254 254 254
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  118 119 119  0 0 0  0 0 0
-+42 55 96  82 95 139  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  82 95 139  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  82 95 139  82 95 139  82 95 139  82 95 139  39 49 83
-+0 0 0  0 0 0  146 146 148  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  230 230 230  0 0 0  0 0 0  15 19 34  77 90 136
-+76 89 135  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+254 254 254  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  254 254 254  255 255 255  118 119 119  0 0 1
-+0 0 0  15 19 34  24 40 99  25 42 101  25 42 101  22 36 89
-+2 3 5  0 0 0  6 7 9  177 177 177  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  251 251 251  154 154 154  31 31 31  0 0 0  0 0 0
-+0 0 0  0 0 0  31 31 31  154 154 154  248 248 248  255 255 255
-+254 254 254  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+254 254 254  255 255 255  96 96 96  0 0 0  0 0 0  15 19 34
-+59 73 120  66 80 129  66 80 129  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+154 154 154  0 1 1  0 0 0  17 24 45  58 72 120  60 75 125
-+60 75 125  60 75 125  12 14 18  0 0 0  6 7 9  154 154 154
-+255 255 255  254 254 254  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  254 254 254  230 230 230  12 14 18  0 0 0  0 0 0
-+230 230 230  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  209 209 209  31 31 31  0 0 0  248 248 248  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  209 209 209
-+20 20 21  0 0 0  20 20 21  209 209 209  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+177 177 177  0 0 0  0 0 0  6 8 19  25 42 101  40 57 112
-+51 66 119  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  55 55 55  0 0 0  0 0 0
-+17 26 56  17 26 56  0 0 0  0 0 0  96 96 96  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  132 132 134  0 0 0
-+0 0 0  17 26 56  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  40 56 111
-+40 56 111  40 56 111  40 56 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  34 50 107  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 99  54 69 120  73 86 133  73 86 133  72 85 132
-+73 86 133  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 134  74 87 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 133  75 88 134  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 88 135  76 89 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  77 90 136  78 91 137  78 91 137
-+78 91 137  6 7 9  0 0 0  12 14 18  243 243 243  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  96 96 96  0 0 0  0 0 0
-+67 77 99  82 95 139  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  82 95 139  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  82 95 139  82 95 139  82 95 139  82 95 139  39 49 83
-+0 0 0  0 0 0  118 119 119  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  243 243 243  0 0 0  0 0 0  20 20 21  77 90 136
-+76 89 135  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  254 254 254  254 254 254  255 255 255
-+255 255 255  230 230 230  209 209 209  230 230 230  243 243 243  255 255 255
-+255 255 255  254 254 254  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  230 230 230  0 1 1
-+0 0 0  1 2 4  22 36 89  25 42 101  25 42 101  17 24 45
-+0 0 0  0 0 0  66 66 66  251 251 251  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  254 254 254  255 255 255
-+230 230 230  80 80 80  0 0 1  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 1  0 0 1  80 80 80  230 230 230
-+255 255 255  254 254 254  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+254 254 254  255 255 255  230 230 230  6 7 9  0 0 0  0 0 0
-+49 61 101  66 80 129  66 80 129  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  254 254 254  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  254 254 254  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+209 209 209  0 1 1  0 0 0  12 14 18  55 67 113  60 75 125
-+60 75 125  60 75 125  17 24 45  0 0 0  0 0 0  118 119 119
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  230 230 230  55 55 55  0 0 0  31 31 31
-+255 255 255  254 254 254  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  154 154 154  5 5 5  0 0 0  177 177 177  255 255 255
-+254 254 254  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  243 243 243
-+55 55 55  0 0 0  31 31 31  243 243 243  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+118 119 119  0 0 0  0 0 0  17 26 56  25 42 101  40 57 112
-+51 66 119  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  254 254 254
-+254 254 254  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  209 209 209  5 5 5  0 0 0  2 3 5
-+22 36 89  17 26 56  0 0 0  0 0 0  93 98 116  254 254 254
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  254 254 254
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+254 254 254  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  132 132 134  0 0 0
-+0 0 0  17 26 56  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  40 56 111
-+40 56 111  40 56 111  40 56 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  34 50 107  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 99  54 69 120  73 86 133  73 86 133  72 85 132
-+73 86 133  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 134  74 87 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 133  75 88 134  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 88 135  76 89 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  2 3 5  0 0 0  20 20 21  243 243 243  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  80 80 80  0 0 0  0 0 0
-+59 73 120  82 95 139  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  82 95 139  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  82 95 139  82 95 139  82 95 139  82 95 139  49 61 101
-+0 0 0  0 0 0  118 119 119  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+254 254 254  243 243 243  0 0 0  0 0 0  12 14 18  77 90 136
-+76 89 135  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  254 254 254  254 254 254  255 255 255  209 209 209
-+96 96 96  55 55 55  44 44 44  44 44 44  80 80 80  154 154 154
-+255 255 255  254 254 254  254 254 254  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  254 254 254  255 255 255  80 80 80
-+0 0 0  0 0 0  18 31 73  25 42 101  22 36 89  6 8 19
-+0 0 0  0 1 1  177 177 177  255 255 255  254 254 254  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  254 254 254  254 254 254
-+66 66 66  0 0 1  0 0 0  0 0 0  12 14 18  15 19 34
-+15 19 34  12 14 18  0 0 0  0 0 0  0 0 1  80 80 80
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  254 254 254  255 255 255  96 96 96  0 0 0  0 0 0
-+33 41 67  66 80 129  66 80 129  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  254 254 254
-+255 255 255  255 255 255  230 230 230  177 177 177  177 177 177  209 209 209
-+248 248 248  255 255 255  255 255 255  254 254 254  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+254 254 254  0 1 1  0 0 0  6 8 19  49 62 109  60 75 125
-+60 75 125  60 75 125  33 41 67  0 1 1  0 0 0  80 80 80
-+243 243 243  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  243 243 243  96 96 96  0 0 0  132 132 134
-+255 255 255  254 254 254  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+251 251 251  118 119 119  0 0 0  0 0 0  80 80 80  255 255 255
-+254 254 254  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+96 96 96  0 0 0  55 55 55  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  254 254 254  255 255 255
-+55 55 55  0 0 0  0 0 0  22 36 89  25 42 101  40 57 112
-+51 66 119  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  254 254 254  255 255 255
-+255 255 255  209 209 209  154 154 154  146 146 148  177 177 177  209 209 209
-+255 255 255  255 255 255  96 96 96  0 0 0  0 0 0  15 19 34
-+25 42 101  17 26 56  0 0 0  0 0 0  80 80 80  177 177 177
-+177 177 177  177 177 177  177 177 177  177 177 177  230 230 230  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  251 251 251  177 177 177  177 177 177  177 177 177  177 177 177
-+177 177 177  177 177 177  177 177 177  177 177 177  96 96 96  0 0 0
-+0 0 0  17 26 56  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  40 56 111
-+40 56 111  40 56 111  40 56 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  34 50 107  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 99  53 67 120  72 85 132  73 86 133  72 85 132
-+73 86 133  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 134  74 87 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 133  75 88 134  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 88 135  76 89 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  0 1 1  0 0 0  31 31 31  243 243 243  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  66 66 66  0 0 0  0 0 0
-+67 81 125  82 95 139  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  82 95 139  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  82 95 139  82 95 139  82 95 139  82 95 139  49 61 101
-+0 0 0  0 0 0  118 119 119  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  243 243 243  0 0 0  0 0 0  12 14 18  77 90 136
-+76 89 135  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  254 254 254  255 255 255  137 138 138  12 14 18
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  2 3 5
-+96 96 96  255 255 255  254 254 254  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  254 254 254  255 255 255  177 177 177
-+0 0 0  0 0 0  15 19 34  25 42 101  18 31 73  0 1 1
-+0 0 0  20 20 21  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  254 254 254  255 255 255  137 138 138
-+0 0 1  0 0 0  0 0 0  39 49 83  62 76 125  63 77 126
-+63 77 126  59 73 120  39 49 83  0 0 1  0 0 0  0 1 1
-+154 154 154  255 255 255  254 254 254  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  254 254 254  255 255 255  230 230 230  0 0 0  0 0 0
-+6 7 9  66 80 129  66 80 129  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  254 254 254  255 255 255
-+248 248 248  96 96 96  20 20 21  12 14 18  12 14 18  12 14 18
-+31 31 31  154 154 154  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  12 14 18  0 0 0  2 3 5  49 61 101  60 75 125
-+60 75 125  60 75 125  48 60 105  0 1 1  0 0 0  44 44 44
-+230 230 230  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  118 119 119  0 0 0  209 209 209
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+243 243 243  66 66 66  0 0 0  0 0 0  31 31 31  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  254 254 254  255 255 255
-+154 154 154  1 2 4  96 96 96  255 255 255  254 254 254  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+0 0 0  0 0 0  1 2 4  22 39 98  25 42 101  40 57 112
-+51 66 119  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  248 248 248
-+93 98 116  20 20 21  6 7 9  5 5 5  6 7 9  20 20 21
-+55 55 55  118 119 119  31 31 31  0 0 0  1 2 4  17 26 56
-+25 42 101  17 26 56  0 0 0  0 0 0  5 5 5  12 14 18
-+12 14 18  12 14 18  12 14 18  6 7 9  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  5 5 5  12 14 18  12 14 18  12 14 18
-+12 14 18  12 14 18  12 14 18  12 14 18  6 7 9  0 0 0
-+0 0 0  17 26 56  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  40 56 111
-+40 56 111  40 56 111  40 56 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  34 50 107  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 99  51 66 119  72 85 132  73 86 133  72 85 132
-+73 86 133  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 134  74 87 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 133  75 88 134  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 88 135  76 89 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  0 0 1  0 0 0  31 31 31  243 243 243  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  66 66 66  0 0 0  0 0 0
-+67 81 125  82 95 139  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  82 95 139  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  82 95 139  82 95 139  82 95 139  82 95 139  49 61 101
-+0 0 0  0 0 0  118 119 119  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+254 254 254  243 243 243  0 0 0  0 0 0  12 14 18  78 91 137
-+76 89 135  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  154 154 154  6 7 9  0 0 0
-+0 0 1  1 2 4  1 2 4  1 2 4  0 1 1  0 0 0
-+0 0 1  93 98 116  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  248 248 248
-+0 0 0  0 0 0  2 3 5  25 42 101  17 26 56  0 0 0
-+0 0 0  118 119 119  255 255 255  254 254 254  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  5 5 5
-+0 0 0  0 0 0  39 49 83  68 81 130  68 82 130  68 82 130
-+68 82 130  68 82 130  67 80 128  31 35 49  0 0 0  0 0 0
-+55 55 55  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  254 254 254  254 254 254  44 44 44  0 0 1
-+0 0 0  55 67 113  66 80 128  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  230 230 230
-+44 44 44  0 0 1  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  177 177 177  254 254 254  254 254 254  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  31 31 31  0 0 0  0 0 0  49 61 101  60 75 125
-+60 75 125  60 75 125  59 74 124  2 3 5  0 0 0  5 5 5
-+209 209 209  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  154 154 154  31 31 31  251 251 251
-+254 254 254  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+230 230 230  6 7 9  0 0 0  0 0 0  20 20 21  209 209 209
-+255 255 255  254 254 254  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+230 230 230  5 5 5  154 154 154  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  209 209 209
-+0 0 0  0 0 0  6 8 19  23 40 99  25 42 101  40 57 112
-+51 66 119  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  248 248 248  96 96 96
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  6 7 9  25 42 101
-+25 42 101  17 26 56  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  146 146 148  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  17 26 56  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  40 56 111
-+40 56 111  40 56 111  40 56 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  34 50 107  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 99  49 64 117  72 85 132  73 86 133  72 85 132
-+73 86 133  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 134  74 87 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 133  75 88 134  76 89 135  75 88 134
-+76 89 135  76 89 135  76 89 135  76 89 135  76 88 135  76 89 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  1 2 4  0 0 0  20 20 21  243 243 243  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  66 66 66  0 0 0  0 0 0
-+59 73 120  82 95 139  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  82 95 139  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  82 95 139  82 95 139  82 95 139  82 95 139  42 55 96
-+0 0 0  0 0 0  118 119 119  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  243 243 243  0 0 0  0 0 0  12 14 18  78 91 137
-+76 89 135  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  230 230 230  44 44 44  0 0 1  0 0 0
-+12 14 18  49 61 101  67 81 125  59 73 120  31 35 49  0 1 1
-+0 0 0  0 0 0  209 209 209  255 255 255  254 254 254  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  254 254 254  251 251 251
-+55 55 55  0 0 0  0 0 0  22 36 89  15 19 34  0 0 0
-+0 0 0  209 209 209  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  177 177 177  0 0 0
-+0 0 0  0 1 1  15 19 34  15 19 34  15 19 34  15 19 34
-+15 19 34  15 19 34  17 24 45  12 14 18  0 1 1  0 0 0
-+31 31 31  209 209 209  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  254 254 254  118 119 119  0 0 0
-+0 0 0  33 41 67  66 80 128  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  254 254 254  248 248 248  96 96 96
-+0 0 1  0 0 0  1 2 4  12 14 18  6 8 19  6 8 19
-+0 0 0  0 0 0  20 20 21  248 248 248  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  55 55 55  0 0 0  0 0 0  49 61 101  60 75 125
-+60 75 125  60 75 125  59 74 124  15 19 34  0 0 0  0 0 0
-+177 177 177  254 254 254  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  177 177 177  118 119 119  251 251 251
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+177 177 177  0 0 0  0 0 0  0 0 0  2 3 5  137 138 138
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  254 254 254
-+255 255 255  44 44 44  209 209 209  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  132 132 134
-+0 0 0  0 0 0  17 24 45  24 41 99  25 42 101  40 57 112
-+51 66 119  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  254 254 254  255 255 255  177 177 177  0 0 0
-+0 0 0  0 0 1  6 8 19  6 8 19  6 8 19  2 3 5
-+0 0 0  0 0 0  0 0 0  0 0 0  17 26 56  25 42 101
-+25 42 101  18 31 73  6 8 19  6 8 19  6 8 19  6 8 19
-+6 8 19  2 3 5  0 0 0  0 0 0  146 146 148  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  0 0 0  0 0 0  1 2 4  6 8 19
-+6 8 19  6 8 19  6 8 19  6 8 19  6 8 19  6 8 19
-+6 8 19  18 31 73  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 43 102  40 56 111
-+40 56 111  40 56 111  40 56 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  34 50 107  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 99  47 63 116  72 85 132  73 86 133  72 85 132
-+73 86 133  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 134  74 87 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 133  74 87 133  75 88 134  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 88 135  76 89 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  78 91 137  77 90 136  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  6 7 9  0 0 0  12 14 18  243 243 243  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  80 80 80  0 0 0  0 0 0
-+67 77 99  82 95 139  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  82 95 139  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  82 95 139  82 95 139  82 95 139  80 93 136  39 49 83
-+0 0 0  0 0 0  137 138 138  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  230 230 230  0 0 0  0 0 0  15 19 34  78 91 137
-+76 89 135  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  254 254 254  177 177 177  0 0 0  0 0 0  6 7 9
-+67 81 125  76 89 135  76 89 135  75 88 134  73 86 130  17 24 45
-+0 0 0  0 0 0  80 80 80  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  251 251 251
-+118 119 119  0 0 0  0 0 0  18 31 73  6 7 9  0 0 0
-+12 14 18  255 255 255  254 254 254  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  254 254 254  255 255 255  96 96 96  0 0 0
-+0 0 1  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+6 7 9  177 177 177  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  254 254 254  177 177 177  0 0 0
-+0 0 0  17 24 45  66 80 128  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  254 254 254  209 209 209  12 14 18
-+0 0 1  0 0 0  33 41 67  55 67 113  29 46 103  22 36 89
-+6 8 19  0 0 0  0 0 0  177 177 177  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  55 55 55  0 0 0  0 0 0  49 61 101  60 75 125
-+60 75 125  60 75 125  59 74 124  33 41 67  0 0 0  0 0 0
-+118 119 119  254 254 254  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  209 209 209  209 209 209  254 254 254
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  254 254 254  255 255 255
-+96 96 96  0 0 0  0 0 0  0 0 0  0 0 0  96 96 96
-+251 251 251  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  254 254 254
-+255 255 255  141 141 145  254 254 254  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  254 254 254  255 255 255  66 66 66
-+0 0 0  0 0 0  18 31 73  24 41 100  25 42 101  40 57 112
-+51 66 119  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  20 20 21  0 0 0
-+0 0 0  17 24 45  25 42 100  25 42 101  22 39 98  18 31 73
-+17 24 45  6 8 19  0 0 0  1 2 4  24 41 99  25 42 101
-+25 42 101  24 41 99  22 39 98  22 39 98  22 39 98  22 39 98
-+22 36 89  15 19 34  0 0 0  0 0 0  146 146 148  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  0 0 0  0 0 0  6 8 19  22 36 89
-+22 39 98  22 39 98  22 39 98  22 39 98  22 39 98  22 39 98
-+22 39 98  24 41 99  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 43 102  40 56 111
-+40 56 111  40 56 111  40 56 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  33 49 106  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 100  44 60 114  71 85 132  73 86 133  72 85 132
-+73 86 133  73 86 133  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 134  74 87 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 133  75 88 134  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 88 135  76 89 135
-+76 90 135  76 89 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  76 89 135  77 90 136  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  12 14 18  0 0 0  0 0 0  230 230 230  254 254 254
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  118 119 119  0 0 0  0 0 0
-+49 61 101  82 95 139  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  82 95 139  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  82 95 139  82 95 139  80 93 136  82 95 139  33 41 67
-+0 0 0  0 0 0  154 154 154  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  209 209 209  0 0 0  0 0 0  17 24 45  78 91 137
-+76 89 135  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  251 251 251  96 96 96  0 0 0  0 0 0  33 41 67
-+76 89 135  76 89 135  76 89 135  76 89 135  74 87 133  42 55 96
-+5 5 5  0 0 0  44 44 44  230 230 230  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  254 254 254
-+154 154 154  0 0 0  0 0 0  17 24 45  0 0 0  0 0 0
-+66 66 66  255 255 255  254 254 254  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  44 44 44  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  137 138 138  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  209 209 209  0 0 0
-+0 0 0  6 7 9  66 80 128  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  154 154 154  0 0 0
-+0 0 0  15 19 34  63 77 126  59 74 124  29 47 104  24 41 100
-+17 26 56  0 0 0  0 0 0  118 119 119  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  55 55 55  0 0 0  0 0 0  49 61 101  60 75 125
-+60 75 125  60 75 125  59 74 124  48 60 105  0 0 0  0 0 0
-+55 55 55  251 251 251  254 254 254  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  248 248 248  251 251 251  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  254 254 254  255 255 255
-+6 7 9  0 0 0  0 0 0  0 0 0  0 0 0  44 44 44
-+230 230 230  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  243 243 243  255 255 255  254 254 254  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  12 14 18
-+0 0 0  2 3 5  18 31 73  24 41 100  25 42 101  42 57 112
-+51 66 119  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  177 177 177  0 0 0  0 0 0
-+6 8 19  24 40 99  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  22 36 89  18 31 73  17 26 56  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 99  17 24 45  0 0 0  0 0 0  146 146 148  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  0 0 0  0 0 0  6 8 19  24 40 99
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 43 102  40 56 111
-+40 56 111  40 56 111  40 56 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  33 49 106  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 100  40 56 111  71 84 131  73 86 133  73 86 133
-+72 85 132  73 86 133  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 134  74 87 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 133  75 88 134  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 88 135  76 89 135
-+76 89 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  76 89 135  77 90 136  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  77 90 136  78 91 137
-+78 91 137  15 19 34  0 0 0  0 0 0  230 230 230  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  137 138 138  0 0 0  0 0 0
-+39 49 83  82 95 139  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  82 95 139  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  82 95 139  80 93 136  82 95 139  82 95 139  17 24 45
-+0 0 0  0 0 0  177 177 177  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  177 177 177  0 0 0  0 0 0  31 35 49  78 91 137
-+76 89 135  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  44 44 44  0 0 0  0 0 0  59 73 120
-+76 89 135  76 89 135  76 89 135  76 89 135  74 87 133  67 81 125
-+6 8 19  0 0 1  20 20 21  209 209 209  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+177 177 177  0 0 0  0 0 0  6 8 19  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  230 230 230  209 209 209
-+209 209 209  209 209 209  209 209 209  209 209 209  209 209 209  209 209 209
-+209 209 209  209 209 209  209 209 209  209 209 209  209 209 209  209 209 209
-+209 209 209  230 230 230  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  209 209 209  31 31 31
-+0 0 1  0 1 1  66 80 128  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  96 96 96  0 0 0
-+0 0 0  33 41 67  63 77 126  57 72 122  30 46 104  24 41 100
-+18 31 73  0 0 0  0 0 0  80 80 80  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  55 55 55  0 0 0  0 0 0  49 61 101  60 75 125
-+60 75 125  60 75 125  59 74 124  59 74 124  0 1 1  0 0 0
-+0 0 0  248 248 248  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  254 254 254  255 255 255  255 255 255  254 254 254
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  209 209 209
-+0 0 0  0 0 0  12 14 18  1 2 4  0 0 0  5 5 5
-+209 209 209  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+254 254 254  255 255 255  254 254 254  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  209 209 209  5 5 5
-+0 0 0  6 8 19  22 36 89  24 41 100  25 43 102  42 58 112
-+51 66 119  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  80 80 80  0 0 0  0 0 0
-+17 26 56  25 42 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 99  17 24 45  0 0 0  0 0 0  146 146 148  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  0 0 0  0 0 0  6 8 19  24 40 99
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  26 43 102  40 56 111
-+40 56 111  40 56 111  40 56 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  33 49 106  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  36 52 108  70 84 131  73 86 133  73 86 133
-+72 85 132  73 86 133  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 134  74 87 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 133  75 88 134  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 88 135
-+76 89 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  77 90 136  76 90 135  77 90 136  77 90 136
-+77 90 136  77 90 136  76 89 135  77 90 136  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  77 90 136  78 91 137
-+78 91 137  31 35 49  0 0 0  0 0 0  209 209 209  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  177 177 177  0 0 0  0 0 0
-+31 35 49  82 95 139  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  82 95 139  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  80 93 136  82 95 139  82 95 139  82 95 139  6 8 19
-+0 0 0  0 0 0  230 230 230  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  154 154 154  0 0 0  0 0 0  33 41 67  78 91 137
-+76 89 135  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  12 14 18  0 0 0  0 0 0  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  74 87 133  75 88 134
-+12 14 18  0 0 0  12 14 18  177 177 177  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+209 209 209  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+141 141 145  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  254 254 254  254 254 254  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  254 254 254  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  230 230 230  44 44 44
-+0 0 0  0 1 1  59 73 120  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  55 55 55  0 0 1
-+0 0 0  49 62 109  63 77 126  57 72 122  29 46 104  24 41 100
-+18 31 73  0 0 0  0 0 0  66 66 66  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  55 55 55  0 0 0  0 0 0  49 61 101  60 75 125
-+60 75 125  60 75 125  59 74 124  59 74 124  15 19 34  0 0 0
-+0 0 0  209 209 209  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  254 254 254  255 255 255  118 119 119
-+0 0 0  0 0 0  33 41 67  17 24 45  0 0 0  0 0 0
-+146 146 148  254 254 254  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  254 254 254  255 255 255  146 146 148  2 3 5
-+0 0 0  15 19 34  24 41 99  24 41 100  26 43 102  43 58 114
-+51 66 119  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  20 20 21  0 0 0  0 0 0
-+18 31 73  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 99  17 24 45  0 0 0  0 0 0  146 146 148  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  0 0 0  0 0 0  6 8 19  24 40 99
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  26 44 102  40 56 111
-+40 56 111  40 56 111  40 56 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  32 48 107  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  32 48 107  70 84 131  73 86 133  73 86 133
-+72 85 132  73 86 133  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 134  73 86 134  74 87 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 133  75 88 134  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 88 135
-+76 89 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  76 89 135  77 90 136  78 91 137  77 90 136
-+78 91 137  78 91 137  78 91 137  78 91 137  77 90 136  78 91 137
-+78 91 137  33 41 67  0 0 0  0 0 0  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  230 230 230  0 0 0  0 0 0
-+6 7 9  80 93 136  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  82 95 139  82 95 139  82 95 139  82 95 139  82 95 139
-+80 93 136  80 93 136  82 95 139  82 95 139  76 90 135  0 0 0
-+0 0 0  20 20 21  230 230 230  254 254 254  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  118 119 119  0 0 1  0 0 0  42 55 96  78 91 137
-+76 89 135  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  243 243 243  0 0 0  0 0 0  6 7 9  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  74 87 133  75 88 134
-+20 20 21  0 0 0  5 5 5  177 177 177  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+209 209 209  6 7 9  0 0 0  0 0 0  0 0 0  0 0 0
-+154 154 154  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  230 230 230  66 66 66
-+0 0 0  0 1 1  49 61 101  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  31 31 31  0 0 0
-+0 0 0  62 76 125  63 77 126  56 71 121  29 45 103  24 41 100
-+22 36 89  0 0 0  0 0 0  66 66 66  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  55 55 55  0 0 0  0 0 0  49 61 101  60 75 125
-+60 75 125  60 75 125  59 74 124  59 74 124  33 41 67  0 0 0
-+0 0 0  118 119 119  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  31 31 31
-+0 0 0  0 0 0  39 49 83  39 49 83  0 0 0  0 0 0
-+80 80 80  251 251 251  254 254 254  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  96 96 96  0 0 0
-+0 0 0  17 24 45  25 42 101  24 41 100  26 43 102  43 59 113
-+51 66 119  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  230 230 230  6 7 9  0 0 0  6 7 9
-+22 36 89  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 99  17 24 45  0 0 0  0 0 0  146 146 148  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  0 0 0  0 0 0  6 8 19  24 40 99
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  26 43 102  40 56 111
-+40 56 111  40 56 111  40 56 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  32 50 106  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  27 44 102  69 83 130  72 85 132  73 86 133
-+72 85 132  73 86 133  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 134  74 87 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 133  75 88 134  75 88 134
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 88 135
-+76 89 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  76 89 135  77 90 136  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  77 90 136
-+78 91 137  49 61 101  0 0 0  0 0 1  96 96 96  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  254 254 254  243 243 243  31 31 31  0 0 0
-+0 0 0  67 81 125  82 95 139  82 95 139  80 93 136  80 93 136
-+80 93 136  80 93 136  80 93 136  80 93 136  82 95 139  82 95 139
-+82 95 139  82 95 139  82 95 139  82 95 139  49 61 101  0 0 0
-+0 0 1  66 66 66  243 243 243  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  254 254 254
-+255 255 255  66 66 66  0 0 1  0 0 0  55 67 113  78 91 137
-+76 89 135  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  243 243 243  0 0 0  0 0 0  12 14 18  76 89 135
-+76 89 135  76 89 135  75 88 134  76 89 135  74 87 133  75 88 134
-+15 19 34  0 0 0  2 3 5  154 154 154  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+209 209 209  12 14 18  0 0 0  0 0 0  0 0 0  0 0 0
-+177 177 177  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  243 243 243  80 80 80
-+0 0 0  0 0 1  49 61 101  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  12 14 18  0 0 0
-+0 0 0  64 78 127  63 77 126  54 69 120  28 45 103  24 41 100
-+22 36 89  0 0 0  0 0 0  66 66 66  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  55 55 55  0 0 0  0 0 0  49 61 101  60 75 125
-+60 75 125  60 75 125  59 74 124  59 74 124  42 55 96  0 0 0
-+0 0 0  55 55 55  255 255 255  254 254 254  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  230 230 230  5 5 5
-+0 0 0  6 7 9  48 60 105  55 69 121  0 0 0  0 0 0
-+2 3 5  248 248 248  254 254 254  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  248 248 248  55 55 55  0 0 0
-+1 2 4  17 26 56  25 42 101  24 41 100  27 43 102  44 60 114
-+51 66 119  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  177 177 177  6 7 9  0 0 0  6 8 19
-+22 36 89  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 99  17 24 45  0 0 0  0 0 0  146 146 148  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  0 0 0  0 0 0  6 8 19  24 40 99
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  27 44 103  40 56 111
-+40 56 111  40 56 111  40 56 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  32 50 106  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  23 40 99  68 81 130  73 86 133  73 86 133
-+72 85 132  73 86 133  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 134  74 87 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  74 87 133  75 88 134
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 88 135
-+76 89 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  76 89 135  77 90 136  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  77 90 136
-+78 91 137  67 81 125  0 0 0  0 0 0  44 44 44  255 255 255
-+254 254 254  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  248 248 248  96 96 96  0 0 1
-+0 0 0  31 35 49  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  82 95 139  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  82 95 139  82 95 139  82 95 139  17 24 45  0 0 0
-+0 0 0  132 132 134  251 251 251  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  5 5 5  0 0 0  0 1 1  68 81 126  78 91 137
-+76 89 135  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  243 243 243  0 0 0  0 0 0  12 14 18  76 89 135
-+76 89 135  76 89 135  76 89 135  75 88 134  74 87 133  75 88 134
-+15 19 34  0 0 0  5 5 5  177 177 177  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+209 209 209  12 14 18  0 0 0  0 0 0  0 0 0  0 0 0
-+177 177 177  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  243 243 243  80 80 80
-+0 0 0  0 0 1  42 55 96  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  6 7 9  0 0 0
-+1 2 4  64 78 127  63 77 126  52 67 118  27 44 102  24 41 100
-+22 36 89  0 0 0  0 0 0  66 66 66  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  55 55 55  0 0 0  0 0 0  49 61 101  60 75 125
-+60 75 125  60 75 125  59 74 124  59 74 124  49 62 109  2 3 5
-+0 0 0  0 0 0  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  146 146 148  1 2 4
-+0 0 0  15 19 34  55 67 113  56 70 122  15 19 34  0 0 0
-+0 0 0  177 177 177  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  209 209 209  31 31 31  0 0 0
-+2 3 5  22 36 89  25 42 101  24 41 100  27 44 102  45 60 114
-+51 66 119  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  154 154 154  5 5 5  0 0 0  15 19 34
-+24 41 99  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 99  17 24 45  0 0 0  0 0 0  146 146 148  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  0 0 0  0 0 0  6 8 19  24 40 99
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  27 44 103  40 56 111
-+40 56 111  40 56 111  40 56 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  32 48 107  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  22 39 98  61 75 125  73 86 133  73 86 133
-+72 85 132  73 86 133  73 86 133  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 134  74 87 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  74 87 133  75 88 134
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 88 135
-+76 89 135  76 89 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  76 89 135  77 90 136  77 90 136
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  77 90 136
-+78 91 137  73 86 130  6 7 9  0 0 0  0 0 0  251 251 251
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  177 177 177  0 0 0
-+0 0 1  2 3 5  71 84 128  82 95 139  82 95 139  82 95 139
-+82 95 139  82 95 139  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  82 95 139  82 95 139  67 81 125  6 7 9  0 0 1
-+6 7 9  177 177 177  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+209 209 209  0 0 0  0 0 0  12 14 18  71 84 128  78 91 137
-+76 89 135  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  243 243 243  0 0 0  0 0 0  6 7 9  76 89 135
-+76 89 135  76 89 135  76 89 135  74 87 133  75 88 134  75 88 134
-+12 14 18  0 0 0  6 7 9  177 177 177  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+209 209 209  6 7 9  0 0 0  0 0 0  0 0 0  0 0 0
-+154 154 154  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  243 243 243  80 80 80
-+0 0 0  0 0 1  42 55 96  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  6 7 9  0 0 0
-+1 2 4  64 78 127  63 77 126  51 66 119  26 43 102  24 41 100
-+22 36 89  0 0 0  0 0 0  66 66 66  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  55 55 55  0 0 0  0 0 0  49 61 101  60 75 125
-+60 75 125  60 75 125  59 74 124  59 74 124  55 67 113  15 19 34
-+0 0 0  0 0 0  209 209 209  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  80 80 80  0 0 0
-+0 0 0  31 35 49  56 70 122  56 70 122  33 41 67  0 0 0
-+0 0 0  96 96 96  255 255 255  254 254 254  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  177 177 177  12 14 18  0 0 0
-+6 7 9  24 41 99  25 42 101  24 41 100  27 44 102  46 61 115
-+51 66 119  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  132 132 134  2 3 5  0 0 0  15 19 34
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 99  17 24 45  0 0 0  0 0 0  146 146 148  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  0 0 0  0 0 0  6 8 19  24 40 99
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  28 45 103  40 56 111
-+40 56 111  40 56 111  40 56 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  31 47 105  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  23 39 99  51 66 119  73 86 133  73 86 133
-+72 85 132  73 86 133  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 134  74 87 134  74 87 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  74 87 133  75 88 134
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 88 135  76 89 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  76 89 135  77 90 136
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+77 90 136  74 88 133  17 24 45  0 0 0  0 0 1  177 177 177
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  230 230 230  55 55 55
-+0 0 1  0 0 1  31 35 49  77 90 136  82 95 139  82 95 139
-+82 95 139  82 95 139  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  82 95 139  80 93 136  31 35 49  0 0 1  0 0 0
-+55 55 55  243 243 243  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  254 254 254  255 255 255
-+141 141 145  0 0 1  0 0 0  31 35 49  75 88 134  78 91 137
-+76 89 135  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  20 20 21  0 0 0  0 0 0  75 88 134
-+76 89 135  76 89 135  76 89 135  75 88 134  75 88 134  73 86 130
-+6 8 19  0 0 1  20 20 21  177 177 177  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+209 209 209  5 5 5  0 0 0  1 2 4  0 0 0  0 0 0
-+137 138 138  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  254 254 254  254 254 254  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  254 254 254  96 96 96
-+0 0 0  0 0 1  39 49 83  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  6 7 9  0 0 0
-+1 2 4  64 78 127  63 77 126  48 63 117  25 42 101  24 41 100
-+22 36 89  0 0 0  0 0 0  66 66 66  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  55 55 55  0 0 0  0 0 0  49 61 101  60 75 125
-+60 75 125  60 75 125  59 74 124  59 74 124  58 72 120  17 24 45
-+0 0 0  0 0 0  132 132 134  255 255 255  254 254 254  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  230 230 230  44 44 44  0 0 0
-+2 3 5  39 49 83  56 70 122  56 70 122  44 57 102  0 0 0
-+0 0 0  20 20 21  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  146 146 148  0 0 0  0 0 0
-+6 8 19  25 42 101  25 42 101  24 41 100  27 44 103  46 61 115
-+51 66 119  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  118 119 119  0 1 1  0 0 0  15 19 34
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 99  17 24 45  0 0 0  0 0 0  146 146 148  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  0 0 0  0 0 0  6 8 19  24 40 99
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  29 46 104  40 56 111
-+40 56 111  40 56 111  40 56 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  31 47 105  24 41 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  23 40 100  42 57 112  74 87 133  73 86 133
-+73 86 133  72 85 132  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  73 86 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  74 87 133  75 88 134
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 88 135  76 89 135  76 89 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  76 89 135  77 90 136
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  77 90 136  39 49 83  0 0 0  0 0 1  80 80 80
-+255 255 255  254 254 254  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  154 154 154
-+1 2 4  0 0 0  0 1 1  31 35 49  76 90 135  82 95 139
-+82 95 139  82 95 139  82 95 139  82 95 139  82 95 139  82 95 139
-+82 95 139  80 93 136  31 35 49  0 1 1  0 0 0  0 0 0
-+177 177 177  255 255 255  254 254 254  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+55 55 55  0 0 0  0 0 0  39 49 83  78 91 137  78 91 137
-+76 89 135  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  66 66 66  0 0 1  0 0 0  49 61 101
-+76 89 135  75 88 134  76 89 135  75 88 134  75 88 134  55 67 113
-+6 7 9  0 0 0  31 31 31  209 209 209  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+209 209 209  0 0 0  0 0 0  6 8 19  0 0 0  0 0 0
-+96 96 96  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  177 177 177  154 154 154
-+154 154 154  154 154 154  154 154 154  154 154 154  154 154 154  154 154 154
-+154 154 154  154 154 154  154 154 154  154 154 154  154 154 154  154 154 154
-+154 154 154  154 154 154  154 154 154  154 154 154  154 154 154  154 154 154
-+154 154 154  154 154 154  154 154 154  154 154 154  154 154 154  154 154 154
-+154 154 154  154 154 154  154 154 154  154 154 154  154 154 154  55 55 55
-+0 0 0  0 0 1  39 49 83  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  6 7 9  0 0 0
-+1 2 4  62 76 125  63 77 126  46 61 115  24 41 101  24 41 100
-+22 36 89  0 0 0  0 0 0  66 66 66  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  55 55 55  0 0 0  0 0 0  49 61 101  60 75 125
-+60 75 125  60 75 125  59 74 124  59 74 124  59 74 124  33 41 67
-+0 0 0  0 0 0  66 66 66  255 255 255  254 254 254  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  177 177 177  20 20 21  0 0 0
-+6 7 9  49 62 109  56 70 122  56 70 122  49 62 109  12 14 18
-+0 0 0  0 0 0  209 209 209  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  248 248 248  93 98 116  0 0 0  0 0 0
-+17 26 56  25 42 101  25 42 101  24 41 100  28 45 103  47 63 116
-+51 66 119  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  96 96 96  0 0 0  0 0 1  17 24 45
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 99  17 24 45  0 0 0  0 0 0  146 146 148  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  0 0 0  0 0 0  6 8 19  24 40 99
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  29 46 104  40 56 111
-+40 56 111  39 55 111  40 56 111  38 54 111  39 55 111  39 55 111
-+39 55 111  38 54 111  39 55 111  29 47 104  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  31 47 105  74 87 134  72 85 132
-+73 86 133  72 85 132  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  73 86 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  74 87 133
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 88 135  76 89 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  76 89 135
-+78 91 137  77 90 136  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  77 90 136  49 61 101  5 5 5  0 0 0  20 20 21
-+230 230 230  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  254 254 254  255 255 255  255 255 255
-+96 96 96  0 0 1  0 0 0  0 0 0  6 7 9  39 49 83
-+74 87 130  82 95 139  82 95 139  82 95 139  82 95 139  73 86 130
-+39 49 83  6 7 9  0 0 0  0 0 0  0 0 1  96 96 96
-+255 255 255  255 255 255  254 254 254  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  230 230 230
-+20 20 21  0 0 0  6 7 9  55 67 113  78 91 137  78 91 137
-+76 89 135  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  254 254 254  137 138 138  0 0 0  0 0 0  15 19 34
-+76 89 135  76 89 135  75 88 134  75 88 134  75 88 134  39 49 83
-+1 2 4  0 0 0  55 55 55  248 248 248  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  254 254 254
-+177 177 177  0 0 0  0 0 0  15 19 34  2 3 5  0 0 0
-+55 55 55  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  55 55 55  2 3 5
-+2 3 5  2 3 5  2 3 5  2 3 5  2 3 5  2 3 5
-+2 3 5  2 3 5  2 3 5  2 3 5  2 3 5  2 3 5
-+2 3 5  2 3 5  2 3 5  2 3 5  2 3 5  2 3 5
-+2 3 5  2 3 5  2 3 5  2 3 5  2 3 5  2 3 5
-+2 3 5  2 3 5  2 3 5  2 3 5  2 3 5  0 1 1
-+0 0 0  0 0 1  39 49 83  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  6 7 9  0 0 0
-+1 2 4  63 77 126  63 77 126  44 59 113  24 41 100  24 41 100
-+22 36 89  0 0 0  0 0 0  66 66 66  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  55 55 55  0 0 0  0 0 0  49 61 101  60 75 125
-+60 75 125  60 75 125  59 74 124  59 74 124  59 74 124  39 49 83
-+2 3 5  0 0 0  31 31 31  248 248 248  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  141 141 145  0 0 0  0 0 0
-+12 14 18  56 70 122  56 70 122  56 70 122  55 68 119  17 24 45
-+0 0 0  0 0 0  132 132 134  255 255 255  254 254 254  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  243 243 243  66 66 66  0 0 0  0 0 0
-+18 31 73  25 42 101  25 42 101  24 41 100  28 45 103  48 63 117
-+51 66 119  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  96 96 96  0 0 0  0 0 1  17 24 45
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 99  17 24 45  0 0 0  0 0 0  146 146 148  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  0 0 0  0 0 0  6 8 19  24 40 99
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  31 47 105  40 56 111
-+40 56 111  40 56 111  39 55 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 110  39 55 111  30 46 104  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  23 40 100  72 85 132  73 86 133
-+73 86 133  72 85 132  74 87 134  73 86 133  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  73 86 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  74 87 133
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 88 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  77 90 136  76 90 135
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  76 89 135
-+77 90 136  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  69 82 127  15 19 34  0 0 0  5 5 5
-+146 146 148  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  254 254 254
-+255 255 255  96 96 96  2 3 5  0 0 1  0 0 0  0 0 0
-+0 0 0  5 5 5  12 14 18  12 14 18  2 3 5  0 0 0
-+0 0 0  0 0 0  0 0 1  1 2 4  96 96 96  255 255 255
-+254 254 254  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  141 141 145
-+5 5 5  0 0 0  15 19 34  73 86 130  78 91 137  78 91 137
-+75 88 134  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  209 209 209  12 14 18  0 0 1  0 0 1
-+33 41 67  73 86 130  74 87 133  73 87 131  59 73 120  20 20 21
-+0 0 0  0 0 0  118 119 119  255 255 255  254 254 254  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  254 254 254
-+137 138 138  0 0 0  0 0 0  17 26 56  6 8 19  0 0 0
-+5 5 5  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  254 254 254  255 255 255  96 96 96  0 0 0
-+0 0 1  0 0 1  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 1
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 1  0 0 0
-+0 0 0  0 0 1  39 49 83  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  6 7 9  0 0 0
-+1 2 4  63 77 126  62 76 125  42 57 112  24 41 100  25 42 101
-+22 36 89  0 0 0  0 0 0  66 66 66  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  55 55 55  0 0 0  0 0 0  49 61 101  60 75 125
-+59 74 124  60 75 125  59 74 124  59 74 124  59 74 124  48 60 105
-+6 8 19  0 0 0  20 20 21  209 209 209  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  243 243 243  96 96 96  0 0 0  0 0 0
-+33 41 67  56 70 122  56 70 122  56 70 122  55 70 121  33 41 67
-+0 0 0  0 0 0  55 55 55  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  230 230 230  12 14 18  0 0 0  0 0 0
-+25 42 101  25 42 101  25 42 101  24 41 100  29 46 104  49 64 117
-+50 65 118  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  80 80 80  0 0 0  0 1 1  17 26 56
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 99  17 24 45  0 0 0  0 0 0  146 146 148  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  0 0 0  0 0 0  6 8 19  24 40 99
-+25 42 101  25 42 101  24 41 99  22 36 89  22 36 89  15 19 34
-+17 26 56  25 42 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  31 47 105  40 56 111
-+40 56 111  40 56 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  30 46 104  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  23 40 99  61 75 125  73 86 133
-+73 86 133  72 85 132  73 86 133  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  73 86 134  75 88 134  74 87 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  74 87 133
-+76 89 135  75 88 134  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 88 135  76 90 135  76 89 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  78 91 137  77 90 136  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  77 90 136  33 41 67  0 1 1  0 0 0
-+66 66 66  243 243 243  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  254 254 254
-+254 254 254  255 255 255  154 154 154  44 44 44  0 0 0  0 0 1
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 1  0 0 0  44 44 44  154 154 154  255 255 255  254 254 254
-+254 254 254  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  243 243 243  66 66 66
-+0 0 1  0 1 1  33 41 67  78 91 137  78 91 137  78 91 137
-+76 89 135  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  251 251 251  118 119 119  0 0 0  0 0 0
-+0 0 0  15 19 34  33 41 67  33 41 67  12 14 18  0 0 0
-+0 0 1  20 20 21  230 230 230  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  251 251 251
-+96 96 96  0 0 0  0 0 0  18 31 73  15 19 34  0 0 0
-+0 0 0  209 209 209  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  177 177 177  0 0 0
-+0 0 0  0 0 0  15 19 34  17 24 45  17 24 45  17 24 45
-+17 24 45  17 24 45  17 24 45  17 24 45  5 5 5  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 1
-+2 3 5  6 7 9  39 49 83  31 35 49  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  6 7 9  0 0 0
-+1 2 4  63 77 126  61 75 125  39 55 110  24 41 100  25 42 101
-+22 36 89  0 0 0  0 0 0  66 66 66  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  55 55 55  0 0 0  0 0 0  49 61 101  60 75 125
-+60 75 125  59 74 124  58 73 123  59 74 124  59 74 124  58 73 123
-+12 14 18  0 0 0  6 7 9  154 154 154  255 255 255  254 254 254
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  254 254 254  230 230 230  31 31 31  0 0 0  0 0 0
-+48 60 105  56 70 122  56 70 122  55 70 121  54 70 120  42 55 96
-+6 7 9  0 0 0  20 20 21  230 230 230  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  209 209 209  0 0 0  0 0 0  6 8 19
-+25 42 101  25 42 101  25 42 101  24 41 100  30 46 104  50 65 118
-+50 65 118  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  80 80 80  0 0 0  0 1 1  17 26 56
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 99  17 24 45  0 0 0  0 0 0  141 141 145  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  0 0 0  0 0 0  2 3 5  22 36 89
-+18 31 73  17 26 56  17 24 45  6 8 19  0 0 0  0 0 0
-+17 24 45  24 41 99  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  32 48 107  40 56 111
-+40 56 111  40 56 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 111  29 46 104  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  49 63 116  74 87 134
-+72 85 132  73 86 133  73 86 133  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 90 135  76 89 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  77 90 136
-+76 90 135  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+76 89 135  77 90 136  78 91 137  77 90 136  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  59 73 120  2 3 5  0 0 1
-+5 5 5  177 177 177  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+254 254 254  255 255 255  255 255 255  230 230 230  177 177 177  96 96 96
-+44 44 44  5 5 5  0 0 0  0 0 0  6 7 9  44 44 44
-+96 96 96  177 177 177  230 230 230  255 255 255  255 255 255  254 254 254
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  177 177 177  5 5 5
-+0 0 1  1 2 4  67 81 125  78 91 137  78 91 137  77 90 136
-+76 89 135  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  254 254 254  255 255 255  243 243 243  80 80 80  0 0 1
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 1
-+0 0 1  177 177 177  255 255 255  254 254 254  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  254 254 254  251 251 251
-+44 44 44  0 0 0  0 0 0  24 41 99  17 26 56  0 0 0
-+0 0 0  96 96 96  255 255 255  254 254 254  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  20 20 21
-+0 0 0  0 0 0  17 24 45  69 83 131  69 83 131  68 82 130
-+68 82 130  69 83 131  68 82 130  39 49 83  2 3 5  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 1
-+2 3 5  6 7 9  15 19 34  17 24 45  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  6 7 9  0 0 0
-+1 2 4  63 77 126  60 75 125  36 52 108  24 41 100  25 42 101
-+22 36 89  0 0 0  0 0 0  66 66 66  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  55 55 55  0 0 0  0 0 0  49 61 101  60 75 125
-+60 75 125  59 74 124  58 73 123  59 74 124  59 74 124  59 74 124
-+17 24 45  0 0 0  0 0 0  118 119 119  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  209 209 209  0 0 0  0 0 0  6 7 9
-+56 70 122  56 70 122  56 70 122  55 70 121  54 70 120  52 67 118
-+12 14 18  0 0 0  6 7 9  177 177 177  255 255 255  254 254 254
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  137 138 138  0 0 0  0 0 0  17 24 45
-+25 42 101  25 42 101  25 42 101  24 41 100  29 47 104  51 66 119
-+50 65 118  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  80 80 80  0 0 0  0 1 1  17 26 56
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 100  17 24 45  0 0 0  0 0 0  132 132 134  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  6 7 9  0 0 0  0 0 1  6 8 19
-+2 3 5  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+15 19 34  24 41 99  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  33 49 106  40 56 111
-+40 56 111  40 56 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 110  29 46 104  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  35 51 108  75 88 134
-+73 86 133  73 86 133  73 86 133  74 87 134  73 86 133  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  75 88 134
-+74 87 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  76 89 135  75 88 134  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+76 89 135  77 90 136  77 90 136  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  77 90 136  31 35 49  0 0 0
-+0 0 1  66 66 66  243 243 243  254 254 254  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  254 254 254  255 255 255  255 255 255  255 255 255  248 248 248
-+243 243 243  243 243 243  243 243 243  243 243 243  243 243 243  243 243 243
-+248 248 248  254 254 254  255 255 255  255 255 255  254 254 254  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  254 254 254  248 248 248  66 66 66  0 0 1
-+0 0 0  31 35 49  78 91 137  78 91 137  78 91 137  78 91 137
-+75 88 134  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  254 254 254  255 255 255  254 254 254  137 138 138
-+1 2 4  0 0 0  0 0 0  0 0 0  0 0 0  31 31 31
-+209 209 209  254 254 254  255 255 255  254 254 254  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  230 230 230
-+0 0 0  0 0 0  6 8 19  25 42 101  18 31 73  1 2 4
-+0 0 0  12 14 18  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  254 254 254  255 255 255  177 177 177
-+0 0 1  0 0 0  0 0 0  15 19 34  49 61 101  62 76 125
-+62 76 125  49 61 101  17 24 45  0 1 1  0 0 0  0 0 1
-+44 44 44  209 209 209  177 177 177  154 154 154  132 132 134  96 96 96
-+66 66 66  44 44 44  6 7 9  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 1  0 0 0
-+0 0 0  0 0 0  31 35 49  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  6 7 9  0 0 0
-+1 2 4  63 77 126  59 74 124  33 49 106  24 41 100  25 42 101
-+22 36 89  0 0 0  0 0 0  66 66 66  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  55 55 55  0 0 0  0 0 0  49 61 101  60 75 125
-+60 75 125  59 74 124  58 73 123  59 74 124  59 74 124  59 74 124
-+33 41 67  0 1 1  0 0 0  80 80 80  243 243 243  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  132 132 134  0 0 0  0 0 0  17 26 56
-+56 70 122  56 70 122  56 70 122  55 70 121  54 70 120  55 70 121
-+17 24 45  0 0 0  0 0 0  118 119 119  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  80 80 80  0 0 0  0 0 0  18 31 73
-+25 42 101  25 42 101  25 42 101  24 41 100  31 47 105  52 67 118
-+50 65 118  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  80 80 80  0 0 0  0 1 1  17 26 56
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 100  17 24 45  0 0 0  0 0 0  118 119 119  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+254 254 254  255 255 255  80 80 80  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+6 8 19  24 40 99  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  34 50 107  40 56 111
-+40 56 111  40 56 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 110  29 45 103  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 100  27 44 103  70 84 131
-+73 86 133  73 86 133  73 86 133  73 86 133  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 88 135  76 89 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+77 90 136  76 90 135  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  76 89 135  77 90 136  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  69 82 127  0 1 1
-+0 0 0  0 0 1  154 154 154  255 255 255  254 254 254  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  254 254 254  255 255 255  177 177 177  0 0 1  0 0 0
-+0 0 0  71 84 128  78 91 137  78 91 137  77 90 136  78 91 137
-+74 87 133  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  254 254 254  255 255 255
-+248 248 248  177 177 177  132 132 134  132 132 134  177 177 177  255 255 255
-+255 255 255  254 254 254  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  254 254 254  255 255 255  146 146 148
-+0 0 0  0 0 0  17 24 45  25 42 101  22 36 89  6 8 19
-+0 0 0  1 2 4  154 154 154  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  254 254 254  255 255 255
-+118 119 119  0 0 0  0 0 1  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 1  0 0 1  20 20 21
-+209 209 209  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  230 230 230  209 209 209
-+177 177 177  146 146 148  118 119 119  96 96 96  20 20 21  0 0 1
-+0 0 0  6 7 9  64 79 127  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  6 7 9  0 0 0
-+1 2 4  63 77 126  57 72 122  30 46 104  24 41 100  25 42 101
-+22 36 89  0 0 0  0 0 0  66 66 66  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  55 55 55  0 0 0  0 0 0  49 61 101  60 75 125
-+60 75 125  59 74 124  58 73 123  59 74 124  59 74 124  59 74 124
-+49 61 101  0 1 1  0 0 0  44 44 44  230 230 230  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+254 254 254  255 255 255  55 55 55  0 0 0  0 0 0  42 55 96
-+56 70 122  56 70 122  56 70 122  55 70 121  54 70 120  55 70 121
-+39 49 83  0 1 1  0 0 0  66 66 66  243 243 243  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  6 7 9  0 0 0  0 0 0  24 40 99
-+25 42 101  25 42 101  25 42 101  25 42 101  33 49 106  53 67 120
-+50 65 118  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  80 80 80  0 0 0  0 1 1  17 26 56
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  17 26 56  0 0 0  0 0 0  96 96 96  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  243 243 243  55 55 55  12 14 18  12 14 18
-+20 20 21  44 44 44  118 119 119  209 209 209  0 0 0  0 0 0
-+6 8 19  24 40 99  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  34 50 107  40 56 111
-+40 56 111  40 56 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 110  28 45 103  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  26 43 102  58 73 123
-+73 86 133  73 86 133  72 85 132  73 86 133  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 134  74 87 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+74 87 133  75 88 134  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 88 135  76 89 135  76 90 135  76 89 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  76 89 135  76 89 135  77 90 136  77 90 136  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  39 49 83
-+0 0 0  0 0 0  5 5 5  209 209 209  255 255 255  254 254 254
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+254 254 254  255 255 255  230 230 230  12 14 18  0 0 0  0 0 0
-+39 49 83  78 91 137  78 91 137  78 91 137  78 91 137  77 90 136
-+74 87 133  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+254 254 254  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  44 44 44
-+0 0 0  0 0 0  18 31 73  25 42 101  24 41 100  17 26 56
-+0 0 1  0 0 1  55 55 55  243 243 243  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+248 248 248  118 119 119  20 20 21  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  6 7 9  80 80 80  230 230 230
-+255 255 255  254 254 254  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  254 254 254  254 254 254  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  243 243 243  20 20 21  0 0 0
-+0 0 0  39 49 83  66 80 127  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  6 7 9  0 0 0
-+1 2 4  63 77 126  57 72 122  26 43 101  24 41 100  25 42 101
-+22 36 89  0 0 0  0 0 0  66 66 66  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  55 55 55  0 0 0  0 0 0  49 61 101  60 75 125
-+60 75 125  59 74 124  58 73 123  59 74 124  59 74 124  59 74 124
-+59 74 124  2 3 5  0 0 0  6 7 9  209 209 209  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  243 243 243  0 0 0  0 0 0  1 2 4  55 68 119
-+56 70 122  56 70 122  56 70 122  55 70 121  54 70 120  55 70 121
-+49 65 116  1 2 4  0 0 0  20 20 21  209 209 209  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  230 230 230  0 0 0  0 0 0  6 8 19  24 41 99
-+25 42 101  25 42 101  25 42 101  25 42 101  35 52 107  52 67 118
-+50 65 118  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  80 80 80  0 0 0  0 1 1  17 26 56
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 101  17 26 56  0 0 0  0 0 0  66 66 66  255 255 255
-+254 254 254  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  254 254 254  255 255 255  255 255 255  230 230 230  209 209 209
-+243 243 243  255 255 255  255 255 255  255 255 255  0 1 1  0 0 0
-+2 3 5  22 39 98  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  36 52 108  40 56 111
-+40 56 111  40 56 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  37 53 109  27 44 103  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  47 63 116
-+74 87 134  73 86 133  72 85 132  73 86 133  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 134  74 87 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+74 87 133  75 88 134  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 88 135  76 89 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  77 90 136  76 90 135  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  76 89 135  78 91 137  77 90 136
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  74 87 133
-+15 19 34  0 0 0  0 0 1  44 44 44  243 243 243  255 255 255
-+254 254 254  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  254 254 254
-+255 255 255  243 243 243  55 55 55  0 0 1  0 0 0  15 19 34
-+73 86 130  78 91 137  77 90 136  78 91 137  78 91 137  77 90 136
-+75 88 134  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  254 254 254  255 255 255  177 177 177  0 0 0
-+0 0 0  6 8 19  22 36 89  25 42 101  24 41 100  42 55 96
-+6 7 9  0 0 1  5 5 5  154 154 154  255 255 255  254 254 254
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  254 254 254
-+255 255 255  254 254 254  209 209 209  132 132 134  80 80 80  44 44 44
-+44 44 44  66 66 66  118 119 119  177 177 177  248 248 248  255 255 255
-+254 254 254  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+254 254 254  255 255 255  255 255 255  66 66 66  0 0 1  0 0 0
-+15 19 34  66 80 128  66 80 128  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  6 7 9  0 0 0
-+1 2 4  63 77 126  55 70 121  23 40 99  24 41 100  25 42 101
-+22 36 89  0 0 0  0 0 0  66 66 66  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  55 55 55  0 0 0  0 0 0  49 61 101  60 75 125
-+60 75 125  59 74 124  58 73 123  59 74 124  59 74 124  59 74 124
-+59 74 124  15 19 34  0 0 0  0 0 0  177 177 177  254 254 254
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  154 154 154  0 0 0  0 0 0  15 19 34  55 69 121
-+56 70 122  56 70 122  56 70 122  55 70 121  54 70 120  55 70 121
-+55 70 121  12 14 18  0 0 0  0 0 0  177 177 177  254 254 254
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  154 154 154  0 0 0  0 0 0  15 19 34  25 42 100
-+25 42 101  25 42 101  25 42 101  25 42 101  37 53 109  52 67 118
-+50 65 118  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  80 80 80  0 0 0  0 1 1  17 26 56
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  18 31 73  1 2 4  0 0 0  31 31 31  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  254 254 254  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  254 254 254  255 255 255  31 31 31  0 0 0
-+0 0 0  22 36 89  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  37 53 109  40 56 111
-+40 56 111  40 56 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  37 53 109  27 44 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  37 53 109
-+71 85 132  73 86 133  73 86 133  72 85 132  73 86 133  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  73 86 134
-+74 87 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  74 87 133  75 88 134  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 88 135  76 89 135  76 89 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  76 89 135  77 90 136  78 91 137
-+77 90 136  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+55 67 113  6 7 9  0 0 0  0 0 0  80 80 80  251 251 251
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+251 251 251  96 96 96  0 0 0  0 0 0  6 7 9  49 61 101
-+78 91 137  78 91 137  78 91 137  77 90 136  77 90 136  76 89 135
-+75 88 134  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  55 55 55  0 0 0
-+0 0 0  17 24 45  25 42 101  25 42 101  26 43 102  54 69 120
-+31 35 49  0 0 0  0 0 1  31 31 31  230 230 230  254 254 254
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+254 254 254  255 255 255  255 255 255  251 251 251  243 243 243  243 243 243
-+243 243 243  243 243 243  251 251 251  255 255 255  255 255 255  254 254 254
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+254 254 254  255 255 255  118 119 119  0 0 1  0 0 0  2 3 5
-+49 62 109  66 80 128  66 80 128  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  6 7 9  0 0 0
-+1 2 4  63 77 126  50 65 118  23 40 99  25 42 101  25 42 101
-+22 36 89  0 0 0  0 0 0  66 66 66  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  55 55 55  0 0 0  0 0 0  49 61 101  59 74 124
-+60 75 125  59 74 124  58 73 123  59 74 124  59 74 124  59 74 124
-+59 74 124  33 41 67  0 0 0  0 0 0  118 119 119  254 254 254
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  254 254 254
-+255 255 255  80 80 80  0 0 0  0 0 0  33 41 67  56 70 122
-+56 70 122  56 70 122  56 70 122  55 70 121  54 70 120  55 70 121
-+55 70 121  33 41 67  0 0 0  0 0 0  118 119 119  251 251 251
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  254 254 254
-+255 255 255  80 80 80  0 0 0  0 0 0  17 26 56  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  39 55 110  51 66 119
-+50 65 118  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  80 80 80  0 0 0  0 1 1  17 26 56
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  18 31 73  6 7 9  0 0 0  20 20 21  243 243 243
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  66 66 66  0 0 0
-+0 0 0  22 36 89  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 101  24 40 99  37 53 109  39 55 110
-+40 56 111  40 56 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  37 53 109  27 43 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  29 47 104
-+64 78 127  73 86 133  73 86 133  72 85 132  73 86 133  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  73 86 134
-+74 87 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  74 87 133  75 88 134  75 88 134  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 88 135  76 89 135
-+76 89 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  77 90 136  76 90 135  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  76 89 135  77 90 136
-+78 91 137  77 90 136  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  33 41 67  1 2 4  0 0 0  0 0 1  132 132 134
-+248 248 248  255 255 255  254 254 254  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  254 254 254  255 255 255  251 251 251
-+137 138 138  0 0 1  0 0 0  0 1 1  33 41 67  78 91 137
-+78 91 137  78 91 137  77 90 136  77 90 136  76 89 135  77 90 136
-+75 88 134  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  154 154 154  6 7 9  0 0 0
-+6 7 9  18 31 73  25 42 101  25 42 101  29 45 103  64 78 127
-+69 82 127  6 7 9  0 0 0  0 0 1  96 96 96  254 254 254
-+255 255 255  254 254 254  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  177 177 177  12 14 18  0 0 0  0 0 0  33 41 67
-+66 80 128  66 80 128  66 80 128  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  6 7 9  0 0 0
-+1 2 4  63 77 126  44 59 113  23 40 99  25 42 101  25 42 101
-+22 36 89  0 0 0  0 0 0  66 66 66  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  55 55 55  0 0 0  0 0 0  49 61 101  60 75 125
-+59 74 124  59 74 124  58 73 123  59 74 124  59 74 124  59 74 124
-+59 74 124  49 61 101  0 0 0  0 0 0  55 55 55  251 251 251
-+254 254 254  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  6 7 9  0 0 0  1 2 4  42 55 96  56 70 122
-+56 70 122  56 70 122  56 70 122  55 70 121  54 70 120  55 70 121
-+55 70 121  48 60 105  0 0 0  0 0 0  31 31 31  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  20 20 21  0 0 0  0 1 1  18 31 73  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  42 58 112  51 66 119
-+50 65 118  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  80 80 80  0 0 0  0 1 1  17 26 56
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  22 36 89  6 8 19  0 0 0  12 14 18  177 177 177
-+255 255 255  254 254 254  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  96 96 96  0 0 0
-+0 0 0  18 31 73  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 100  38 54 109  39 55 111
-+40 56 111  40 56 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  36 52 108  26 43 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+56 71 121  73 86 133  73 86 133  72 85 132  72 85 132  73 86 133
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  73 86 134
-+73 86 134  74 87 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 133  75 88 134  75 88 134  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 88 135  76 89 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  76 89 135  76 89 135
-+77 90 136  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  31 35 49  0 0 0  0 0 0  0 0 1
-+132 132 134  248 248 248  255 255 255  254 254 254  254 254 254  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  254 254 254  254 254 254  255 255 255  248 248 248  132 132 134
-+0 0 1  0 0 0  0 0 0  31 35 49  78 91 137  78 91 137
-+78 91 137  77 90 136  77 90 136  76 89 135  77 90 136  77 90 136
-+75 88 134  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+254 254 254  255 255 255  230 230 230  44 44 44  0 0 0  0 0 0
-+15 19 34  25 42 101  25 42 101  24 41 100  33 49 106  73 86 133
-+72 85 132  49 61 101  0 0 0  0 0 0  0 0 1  132 132 134
-+255 255 255  255 255 255  254 254 254  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  254 254 254  255 255 255
-+209 209 209  31 31 31  0 0 0  0 0 0  15 19 34  59 73 120
-+66 80 129  66 80 128  66 80 128  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  6 7 9  0 0 0
-+1 2 4  63 77 126  38 54 110  23 40 100  25 42 101  25 42 101
-+22 36 89  0 0 0  0 0 0  66 66 66  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  55 55 55  0 0 0  0 0 0  49 61 101  60 75 125
-+59 74 124  58 73 123  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  0 0 0  0 0 0  2 3 5  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+177 177 177  2 3 5  0 0 0  12 14 18  49 62 109  56 70 122
-+56 70 122  56 70 122  55 70 121  56 70 122  54 70 120  55 70 121
-+55 70 121  55 70 121  6 7 9  0 0 0  0 0 0  230 230 230
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+230 230 230  5 5 5  0 0 0  6 8 19  22 36 89  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  44 60 114  51 66 119
-+50 65 118  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  80 80 80  0 0 0  0 1 1  17 26 56
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  29 45 103  15 19 34  0 0 0  1 2 4  118 119 119
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  132 132 134  0 0 0
-+0 0 0  17 26 56  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  38 54 110  40 56 111
-+40 56 111  40 56 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  36 52 108  26 43 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  23 40 100
-+44 59 113  71 85 132  72 85 132  73 86 133  72 85 132  73 86 133
-+73 86 133  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+73 86 134  74 87 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 133  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 88 135
-+76 89 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  77 90 136  77 90 136  76 90 135
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  76 89 135
-+77 90 136  78 91 137  77 90 136  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  76 89 135  31 35 49  0 0 0  0 0 0
-+0 0 1  80 80 80  230 230 230  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  230 230 230  80 80 80  0 0 1
-+0 0 0  0 0 0  31 35 49  75 88 134  78 91 137  77 90 136
-+78 91 137  77 90 136  76 89 135  77 90 136  77 90 136  77 90 136
-+75 88 134  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  254 254 254  254 254 254  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  254 254 254
-+255 255 255  254 254 254  80 80 80  0 0 0  0 0 0  2 3 5
-+22 36 89  25 42 101  25 42 101  24 41 100  46 61 115  73 86 133
-+72 84 131  70 85 132  33 41 67  0 0 0  0 0 0  0 0 0
-+132 132 134  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  254 254 254  254 254 254  255 255 255  209 209 209
-+44 44 44  0 0 0  0 0 0  6 7 9  55 67 113  66 80 129
-+66 80 128  66 80 127  66 80 128  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  6 7 9  0 0 0
-+1 2 4  63 77 126  32 48 105  24 41 100  25 42 101  25 42 101
-+22 36 89  0 0 0  0 0 0  66 66 66  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  55 55 55  0 0 0  0 0 0  49 61 101  60 75 125
-+59 74 124  58 73 123  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  15 19 34  0 0 0  0 0 0  209 209 209
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  254 254 254  255 255 255
-+118 119 119  0 1 1  0 0 0  17 24 45  55 69 121  56 70 122
-+56 70 122  56 70 122  56 70 122  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  17 26 56  0 0 0  0 0 0  141 141 145
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+154 154 154  5 5 5  0 0 0  6 8 19  22 39 98  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  47 63 116  51 66 119
-+50 65 118  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  80 80 80  0 0 0  0 1 1  17 26 56
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  30 46 104  33 41 67  0 1 1  0 0 0  55 55 55
-+230 230 230  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  154 154 154  0 0 0
-+0 0 0  17 24 45  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  26 43 102  38 54 110  40 56 111
-+40 56 111  40 56 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  36 52 108  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+28 45 103  69 83 130  73 86 133  73 86 133  72 85 132  73 86 133
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 133  76 89 135  75 88 134
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 90 135  76 89 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+76 89 135  77 90 136  78 91 137  77 90 136  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  74 87 130  31 35 49  0 0 0
-+0 0 0  0 0 0  31 31 31  177 177 177  255 255 255  255 255 255
-+254 254 254  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  254 254 254
-+255 255 255  255 255 255  177 177 177  31 31 31  0 0 0  0 0 0
-+0 0 0  31 35 49  73 86 130  78 91 137  77 90 136  78 91 137
-+77 90 136  76 89 135  77 90 136  77 90 136  77 90 136  77 90 136
-+75 88 134  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  251 251 251  177 177 177  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  254 254 254  255 255 255
-+255 255 255  80 80 80  0 0 0  0 0 0  0 0 0  18 31 73
-+25 42 101  25 42 101  25 42 101  24 41 100  63 77 126  72 85 132
-+72 85 132  71 85 132  68 81 126  17 24 45  0 0 0  0 0 1
-+2 3 5  118 119 119  254 254 254  255 255 255  254 254 254  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  254 254 254  255 255 255  255 255 255  177 177 177  20 20 21
-+0 0 0  0 0 0  0 1 1  49 62 109  66 80 129  66 80 129
-+66 80 128  66 80 127  66 80 128  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  6 7 9  0 0 0
-+1 2 4  63 77 126  24 41 101  24 41 100  25 42 101  25 42 101
-+22 36 89  0 0 0  0 0 0  66 66 66  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  55 55 55  0 0 0  0 0 0  49 61 101  60 75 125
-+59 74 124  58 73 123  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  31 35 49  0 0 0  0 0 0  132 132 134
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  254 254 254
-+55 55 55  0 0 0  0 1 1  33 41 67  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  42 55 96  0 0 0  0 0 0  55 55 55
-+255 255 255  254 254 254  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  254 254 254  255 255 255
-+118 119 119  0 1 1  0 0 0  15 19 34  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  50 65 118  50 65 118
-+49 64 117  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  80 80 80  0 0 0  0 1 1  17 26 56
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  31 47 105  39 56 109  2 3 5  0 0 0  0 0 0
-+154 154 154  254 254 254  254 254 254  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  209 209 209  0 0 0
-+0 0 0  15 19 34  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  27 43 102  38 54 110  40 56 111
-+39 55 111  40 56 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  35 51 108  25 42 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 101
-+23 39 99  57 72 122  73 86 133  73 86 133  73 86 133  72 85 132
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 134  75 88 134  74 87 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 133  75 88 134  76 89 135
-+75 88 134  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 90 135  76 89 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  76 89 135  77 90 136  78 91 137  77 90 136  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  77 90 136  31 35 49
-+1 2 4  0 0 0  0 0 1  0 0 1  96 96 96  243 243 243
-+254 254 254  255 255 255  255 255 255  254 254 254  254 254 254  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  254 254 254  255 255 255  255 255 255  254 254 254
-+243 243 243  96 96 96  0 0 1  0 0 1  0 0 0  1 2 4
-+31 35 49  77 90 136  78 91 137  78 91 137  78 91 137  77 90 136
-+77 90 136  76 89 135  77 90 136  77 90 136  77 90 136  77 90 136
-+75 88 134  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  243 243 243  20 20 21  154 154 154  251 251 251  255 255 255
-+255 255 255  254 254 254  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  254 254 254  255 255 255  255 255 255  243 243 243
-+66 66 66  0 0 0  0 0 0  0 0 0  17 26 56  25 42 101
-+25 42 101  25 42 101  24 41 100  31 47 105  73 86 133  72 85 132
-+71 85 132  71 85 132  71 85 132  67 81 125  15 19 34  0 0 0
-+0 0 0  0 0 1  80 80 80  243 243 243  254 254 254  255 255 255
-+255 255 255  254 254 254  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  254 254 254  255 255 255
-+255 255 255  255 255 255  248 248 248  132 132 134  5 5 5  0 0 0
-+0 0 0  1 2 4  42 55 96  66 80 129  66 80 129  66 80 129
-+66 80 128  66 80 127  66 80 128  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  6 7 9  0 0 0
-+1 2 4  57 72 122  23 39 99  25 42 101  25 42 101  25 42 101
-+22 36 89  0 0 0  0 0 0  66 66 66  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  55 55 55  0 0 0  0 0 0  49 61 101  60 75 125
-+59 74 124  58 73 123  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  42 55 96  0 0 0  0 0 0  66 66 66
-+255 255 255  254 254 254  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  209 209 209
-+31 31 31  0 0 0  6 7 9  42 55 96  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  49 62 109  6 7 9  0 0 0  0 0 0
-+243 243 243  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+66 66 66  0 0 0  0 1 1  17 26 56  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  53 67 120  50 65 118
-+49 64 117  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  80 80 80  0 0 0  0 1 1  17 26 56
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  33 49 106  45 60 114  17 26 56  0 0 0  0 0 0
-+6 7 9  209 209 209  255 255 255  255 255 255  254 254 254  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  230 230 230  0 0 0
-+0 0 0  6 8 19  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  28 45 103  39 55 110  40 56 111
-+40 56 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  35 51 108  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+23 40 100  36 52 108  74 87 134  72 85 132  73 86 133  72 85 132
-+74 87 134  73 86 133  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 134  74 87 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  74 87 133  75 88 134
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 88 135  76 88 135  76 89 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  76 89 135  77 90 136  78 91 137  77 90 136
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+39 49 83  6 8 19  0 0 0  0 0 0  0 0 1  6 7 9
-+132 132 134  209 209 209  243 243 243  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  248 248 248  209 209 209  132 132 134
-+6 7 9  0 0 1  0 0 0  0 0 0  6 8 19  39 49 83
-+78 91 137  78 91 137  78 91 137  77 90 136  77 90 136  76 89 135
-+76 89 135  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+75 88 134  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  6 7 9  0 0 0  118 119 119  230 230 230
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  254 254 254
-+254 254 254  255 255 255  255 255 255  248 248 248  177 177 177  44 44 44
-+0 0 0  0 0 0  0 0 0  17 24 45  25 42 100  25 42 101
-+25 42 101  25 42 101  23 40 99  48 64 116  73 86 133  72 84 131
-+71 85 132  70 85 132  71 85 132  71 85 132  69 82 127  15 19 34
-+0 0 0  0 0 0  0 0 1  12 14 18  154 154 154  230 230 230
-+255 255 255  255 255 255  255 255 255  255 255 255  254 254 254  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  254 254 254  254 254 254  255 255 255  255 255 255  255 255 255
-+230 230 230  177 177 177  66 66 66  0 0 0  0 0 0  0 0 0
-+6 7 9  18 31 73  63 77 126  66 80 129  66 80 128  66 80 129
-+66 80 128  66 80 127  66 80 128  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  6 7 9  0 0 0
-+1 2 4  49 64 117  23 40 99  25 42 101  25 42 101  25 42 101
-+22 36 89  0 0 0  0 0 0  66 66 66  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  55 55 55  0 0 0  0 0 0  49 61 101  60 75 125
-+59 74 124  58 73 123  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  48 60 105  1 2 4  0 0 0  5 5 5
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  177 177 177
-+5 5 5  0 0 0  6 8 19  55 69 121  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  52 66 118  15 19 34  0 0 0  0 0 0
-+154 154 154  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  230 230 230
-+44 44 44  0 0 0  2 3 5  18 31 73  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  28 45 103  53 67 120  50 65 118
-+49 64 117  44 57 102  0 0 0  0 0 0  66 66 66  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  80 80 80  0 0 0  0 1 1  17 26 56
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  34 50 107  45 60 114  45 60 114  6 8 19  0 0 0
-+0 0 0  20 20 21  209 209 209  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  254 254 254  254 254 254  255 255 255  243 243 243  2 3 5
-+0 0 0  6 7 9  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  29 46 104  39 55 110  40 56 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  34 50 107  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 39 99  67 80 128  73 86 133  72 85 132  73 86 133
-+73 86 133  74 87 134  73 86 133  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  74 87 133  75 88 134
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 88 135  76 89 135  76 90 135  76 89 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  77 90 136  76 90 135  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  76 89 135  77 90 136  78 91 137
-+78 91 137  77 90 136  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  59 73 120  31 35 49  0 0 0  0 0 0  0 0 1
-+0 0 0  12 14 18  80 80 80  132 132 134  177 177 177  243 243 243
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  254 254 254  255 255 255  255 255 255  255 255 255  254 254 254
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  209 209 209  141 141 145  80 80 80  20 20 21  0 0 0
-+0 0 1  0 0 0  0 0 0  31 35 49  59 73 120  78 91 137
-+77 90 136  78 91 137  78 91 137  77 90 136  76 89 135  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+75 88 134  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  6 7 9  0 0 0  0 0 0  44 44 44
-+132 132 134  230 230 230  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  254 254 254  254 254 254  255 255 255  255 255 255  255 255 255
-+255 255 255  251 251 251  177 177 177  96 96 96  6 7 9  0 0 1
-+0 0 0  0 0 0  17 26 56  24 41 99  25 42 101  25 42 101
-+25 42 101  24 41 100  23 40 100  67 80 128  72 85 132  72 85 132
-+71 85 132  70 85 132  71 85 132  71 85 132  71 85 132  69 82 127
-+33 41 67  1 2 4  0 0 0  0 0 1  0 0 0  44 44 44
-+118 119 119  177 177 177  243 243 243  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  254 254 254  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  243 243 243  177 177 177  118 119 119
-+66 66 66  0 0 0  0 0 0  0 0 0  0 0 0  6 8 19
-+18 31 73  43 59 113  66 80 129  66 80 129  66 80 129  66 80 128
-+66 80 127  66 80 128  66 80 128  33 41 67  0 0 0  0 0 0
-+118 119 119  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  6 7 9  0 0 0
-+1 2 4  40 56 111  23 40 100  25 42 101  25 42 101  25 42 101
-+22 36 89  0 0 0  0 0 0  66 66 66  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  55 55 55  0 0 0  0 0 0  49 61 101  59 74 124
-+58 73 123  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  55 67 113  12 14 18  0 0 0  0 0 0
-+209 209 209  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  118 119 119
-+0 0 0  0 0 0  17 24 45  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  33 41 67  0 0 0  0 0 0
-+80 80 80  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  209 209 209
-+20 20 21  0 0 0  6 7 9  22 39 98  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  31 47 105  53 67 120  50 65 118
-+49 64 117  44 57 102  0 0 0  0 0 0  66 66 66  251 251 251
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  80 80 80  0 0 0  0 1 1  17 26 56
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 101
-+24 41 100  36 52 108  46 61 115  45 60 114  42 55 96  6 8 19
-+0 0 0  0 0 0  6 7 9  118 119 119  209 209 209  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  254 254 254
-+255 255 255  254 254 254  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  251 251 251  209 209 209  20 20 21
-+0 0 0  0 1 1  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  29 47 104  39 55 110  40 56 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  33 49 106  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  43 59 113  75 88 134  72 85 132  73 86 133
-+73 86 133  73 86 133  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 134  74 87 134  75 88 134  74 87 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  74 87 133
-+75 88 134  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 88 135  76 89 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  77 90 136  76 90 135  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  76 89 135  77 90 136
-+77 90 136  78 91 137  77 90 136  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  75 88 134  49 61 101  15 19 34  0 0 0
-+0 0 0  0 0 1  0 0 1  0 0 0  20 20 21  31 31 31
-+55 55 55  118 119 119  154 154 154  209 209 209  230 230 230  251 251 251
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  209 209 209  177 177 177  132 132 134  80 80 80
-+31 31 31  20 20 21  5 5 5  0 0 1  0 0 1  0 0 0
-+0 0 0  15 19 34  49 61 101  75 88 134  78 91 137  78 91 137
-+78 91 137  77 90 136  77 90 136  76 89 135  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  76 90 135
-+75 88 134  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  6 7 9  0 0 0  0 0 0  0 0 0
-+1 2 4  20 20 21  66 66 66  141 141 145  209 209 209  248 248 248
-+255 255 255  255 255 255  255 255 255  255 255 255  230 230 230  177 177 177
-+96 96 96  44 44 44  12 14 18  0 0 1  0 0 0  0 0 0
-+2 3 5  18 31 73  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 100  37 53 109  71 84 131  71 84 131  71 85 132
-+70 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+70 84 131  49 61 101  12 14 18  0 0 0  0 0 0  0 0 1
-+0 0 0  12 14 18  31 31 31  66 66 66  118 119 119  177 177 177
-+209 209 209  230 230 230  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  251 251 251  230 230 230  209 209 209
-+154 154 154  118 119 119  66 66 66  31 31 31  20 20 21  0 0 0
-+0 0 0  0 0 0  0 0 0  0 1 1  17 26 56  22 39 98
-+26 43 101  50 65 118  66 80 129  65 79 128  66 80 129  66 80 128
-+66 80 127  66 80 128  66 80 128  33 41 67  0 0 0  0 0 0
-+12 14 18  44 44 44  31 31 31  31 31 31  31 31 31  31 31 31
-+31 31 31  31 31 31  31 31 31  31 31 31  31 31 31  31 31 31
-+31 31 31  31 31 31  31 31 31  31 31 31  0 1 1  0 0 0
-+1 2 4  31 47 105  24 41 100  25 42 101  25 42 101  25 42 101
-+22 36 89  0 0 0  0 0 0  6 7 9  44 44 44  31 31 31
-+31 31 31  31 31 31  31 31 31  31 31 31  31 31 31  31 31 31
-+31 31 31  31 31 31  31 31 31  31 31 31  31 31 31  31 31 31
-+44 44 44  6 7 9  0 0 0  0 0 0  49 61 101  59 74 124
-+58 73 123  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  55 69 119  17 24 45  0 0 0  0 0 0
-+31 31 31  44 44 44  31 31 31  31 31 31  31 31 31  31 31 31
-+31 31 31  31 31 31  31 31 31  31 31 31  31 31 31  31 31 31
-+31 31 31  31 31 31  31 31 31  31 31 31  31 31 31  12 14 18
-+0 0 0  0 0 0  39 49 83  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  56 70 122  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  39 49 83  2 3 5  0 0 0
-+6 7 9  44 44 44  31 31 31  31 31 31  31 31 31  31 31 31
-+31 31 31  31 31 31  31 31 31  31 31 31  31 31 31  31 31 31
-+31 31 31  31 31 31  31 31 31  31 31 31  31 31 31  31 31 31
-+0 1 1  0 0 0  6 8 19  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  35 51 108  52 67 118  50 65 118
-+49 64 117  44 57 102  0 0 0  0 0 0  6 7 9  31 31 31
-+31 31 31  31 31 31  31 31 31  31 31 31  31 31 31  31 31 31
-+31 31 31  31 31 31  31 31 31  31 31 31  31 31 31  31 31 31
-+31 31 31  44 44 44  12 14 18  0 0 0  0 1 1  17 26 56
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  37 53 109  46 61 115  45 60 114  44 59 113  39 49 83
-+6 7 9  0 0 0  0 0 0  0 1 1  20 20 21  66 66 66
-+132 132 134  177 177 177  230 230 230  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  248 248 248  230 230 230  177 177 177
-+154 154 154  118 119 119  66 66 66  31 31 31  20 20 21  1 2 4
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  31 47 105  39 55 110  40 56 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  31 47 105  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+31 47 105  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  28 45 103  68 82 130  73 86 133  73 86 133
-+72 85 132  73 86 133  74 87 134  73 86 133  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 134  74 87 134  74 87 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  74 87 133
-+75 88 134  75 88 134  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 88 135  76 90 135  76 89 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  76 89 135
-+76 89 135  77 90 136  78 91 137  77 90 136  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  55 67 113
-+15 19 34  0 1 1  0 1 1  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 1  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  6 7 9  20 20 21  20 20 21  20 20 21  6 7 9
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 1  0 0 0
-+0 0 0  0 0 0  0 0 0  0 1 1  0 1 1  15 19 34
-+49 61 101  78 91 137  78 91 137  78 91 137  78 91 137  77 90 136
-+77 90 136  77 90 136  76 89 135  76 89 135  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  76 90 135  77 90 136
-+74 88 133  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  6 7 9  0 0 0  0 0 1  0 1 1
-+0 0 0  0 0 0  0 0 0  0 0 1  0 0 0  0 0 0
-+0 0 0  6 7 9  5 5 5  0 0 0  0 0 0  0 0 1
-+0 0 0  0 0 0  0 0 0  0 0 1  0 1 1  17 24 45
-+24 40 99  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  23 40 99  55 70 121  71 84 131  72 85 132  71 85 132
-+70 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  70 84 131  69 83 130  33 41 67  6 7 9  0 0 1
-+0 0 1  0 0 0  0 0 0  0 0 0  0 0 1  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  5 5 5  6 7 9
-+6 7 9  2 3 5  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 1  0 1 1  15 19 34  22 36 89  25 42 101  25 42 101
-+28 45 103  58 73 123  66 80 129  66 80 129  66 80 129  66 80 128
-+66 80 127  66 80 128  66 80 128  33 41 67  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+1 2 4  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+22 36 89  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  49 61 101  59 74 124
-+58 73 123  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  57 72 122  33 41 67  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  55 69 121  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  48 60 105  6 8 19  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  17 24 45  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  39 55 111  51 66 119  50 65 118
-+49 64 117  44 57 102  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 1 1  17 26 56
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  38 54 110  46 61 115  44 59 113  45 60 114  45 60 114
-+42 55 96  6 8 19  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  6 7 9
-+6 7 9  5 5 5  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 1  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  32 50 106  39 55 110  40 56 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  31 47 105  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+51 66 119  23 39 99  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  50 65 118  74 87 134  72 85 132
-+72 85 132  72 85 132  73 86 133  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  73 86 134  74 87 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+74 87 133  75 88 134  75 88 134  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 88 135  76 89 135  76 90 135
-+76 89 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+76 89 135  76 89 135  77 90 136  78 91 137  77 90 136  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  67 81 125  33 41 67  15 19 34  12 14 18  6 7 9
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+2 3 5  6 8 19  15 19 34  33 41 67  59 73 120  78 91 137
-+78 91 137  78 91 137  78 91 137  77 90 136  78 91 137  78 91 137
-+77 90 136  76 89 135  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  76 90 135  77 90 136  76 90 135
-+73 87 131  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  6 7 9  0 0 0  6 7 9  39 49 83
-+12 14 18  6 7 9  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  1 2 4  12 14 18  17 24 45  49 61 101  37 53 109
-+24 41 100  25 42 100  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  31 47 105  64 78 127  72 85 132  71 85 132  70 85 132
-+70 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  70 84 131  69 83 130  70 84 131  69 83 130  39 49 83
-+15 19 34  12 14 18  6 7 9  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  1 2 4  6 7 9  6 8 19
-+17 26 56  22 36 89  25 42 101  25 42 101  25 42 101  25 42 101
-+31 47 105  65 79 128  66 80 129  66 80 129  66 80 128  66 80 127
-+66 80 127  66 80 128  66 80 128  33 41 67  2 3 5  6 7 9
-+6 7 9  6 7 9  6 7 9  6 7 9  6 7 9  6 7 9
-+6 7 9  6 7 9  6 7 9  6 7 9  6 7 9  6 7 9
-+6 7 9  6 7 9  6 7 9  6 7 9  6 7 9  2 3 5
-+6 7 9  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+22 36 89  0 0 0  2 3 5  2 3 5  2 3 5  2 3 5
-+2 3 5  2 3 5  2 3 5  2 3 5  6 7 9  6 7 9
-+6 7 9  6 7 9  6 7 9  6 7 9  6 7 9  6 7 9
-+6 7 9  6 7 9  6 7 9  1 2 4  49 61 101  59 74 124
-+58 73 123  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  59 74 124  57 72 122  39 49 83  6 7 9  6 7 9
-+2 3 5  2 3 5  2 3 5  2 3 5  2 3 5  2 3 5
-+2 3 5  2 3 5  2 3 5  2 3 5  2 3 5  2 3 5
-+2 3 5  2 3 5  2 3 5  2 3 5  2 3 5  2 3 5
-+1 2 4  15 19 34  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  15 19 34  2 3 5
-+2 3 5  2 3 5  2 3 5  2 3 5  2 3 5  2 3 5
-+2 3 5  2 3 5  2 3 5  2 3 5  2 3 5  2 3 5
-+2 3 5  2 3 5  2 3 5  2 3 5  2 3 5  2 3 5
-+2 3 5  1 2 4  18 31 73  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  23 40 100  43 60 114  51 66 119  49 64 117
-+49 64 117  44 57 102  0 1 1  2 3 5  2 3 5  2 3 5
-+2 3 5  2 3 5  2 3 5  2 3 5  2 3 5  2 3 5
-+2 3 5  2 3 5  2 3 5  2 3 5  2 3 5  2 3 5
-+2 3 5  2 3 5  2 3 5  2 3 5  2 3 5  17 26 56
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+26 43 101  40 56 111  46 61 115  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  33 41 67  6 8 19  2 3 5  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  1 2 4  6 7 9  6 8 19
-+6 8 19  17 26 56  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  34 50 106  40 56 111  40 56 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  29 46 104  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+68 81 130  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  36 52 108  70 83 130  73 86 133
-+73 86 133  72 85 132  73 86 133  73 86 133  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 134  74 87 134
-+74 87 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  74 87 133  75 88 134  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 88 135  76 89 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  77 90 136
-+76 90 135  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  76 89 135  76 89 135  77 90 136  77 90 136
-+78 91 137  77 90 136  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  67 81 125  49 61 101
-+39 49 83  33 41 67  31 35 49  15 19 34  12 14 18  12 14 18
-+6 7 9  2 3 5  2 3 5  1 2 4  2 3 5  5 5 5
-+6 7 9  12 14 18  15 19 34  17 24 45  31 35 49  33 41 67
-+49 61 101  59 73 120  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  77 90 136  78 91 137  78 91 137  77 90 136  76 89 135
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  76 90 135  76 90 135
-+74 88 133  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  6 7 9  0 0 0  5 5 5  75 88 134
-+71 84 128  49 61 101  33 41 67  31 35 49  15 19 34  12 14 18
-+6 7 9  2 3 5  5 5 5  6 7 9  12 14 18  17 24 45
-+31 35 49  39 49 83  55 67 113  73 86 133  62 76 125  23 40 99
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  42 58 112  71 84 131  72 85 132  71 85 132  70 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  70 84 131
-+70 84 131  69 83 130  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  59 73 120  42 55 96  33 41 67  31 35 49  17 24 45
-+15 19 34  12 14 18  6 8 19  6 7 9  2 3 5  2 3 5
-+2 3 5  6 7 9  6 7 9  6 8 19  12 14 18  15 19 34
-+15 19 34  15 19 34  17 26 56  18 31 73  22 36 89  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+38 56 110  68 82 130  65 79 128  66 80 129  66 80 128  66 80 127
-+66 80 128  66 80 128  66 80 128  55 67 113  42 55 96  42 55 96
-+42 55 96  42 55 96  42 55 96  42 55 96  42 55 96  42 55 96
-+42 55 96  42 55 96  42 55 96  42 55 96  42 55 96  42 55 96
-+42 55 96  42 55 96  42 55 96  42 55 96  42 55 96  42 55 96
-+39 49 83  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+22 39 98  18 31 73  18 31 73  18 31 73  18 31 73  18 31 73
-+18 31 73  18 31 73  18 31 73  33 41 67  39 49 83  42 55 96
-+42 55 96  42 55 96  42 55 96  42 55 96  42 55 96  42 55 96
-+42 55 96  42 55 96  39 49 83  39 49 83  56 69 119  59 74 124
-+58 73 123  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  57 72 122  58 73 123  55 67 113  42 55 96  39 49 83
-+33 41 67  18 31 73  18 31 73  18 31 73  18 31 73  18 31 73
-+18 31 73  18 31 73  18 31 73  18 31 73  18 31 73  18 31 73
-+18 31 73  18 31 73  18 31 73  18 31 73  18 31 73  18 31 73
-+18 31 73  48 60 105  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  55 70 121  42 55 96  39 49 83
-+39 49 83  39 49 83  39 49 83  39 49 83  39 49 83  18 31 73
-+18 31 73  18 31 73  18 31 73  18 31 73  18 31 73  18 31 73
-+18 31 73  18 31 73  18 31 73  18 31 73  18 31 73  18 31 73
-+18 31 73  18 31 73  24 41 99  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  23 40 99  47 63 116  51 66 119  49 64 117
-+50 65 118  47 62 113  39 49 83  39 49 83  39 49 83  39 49 83
-+39 49 83  39 49 83  39 49 83  39 49 83  39 49 83  39 49 83
-+39 49 83  39 49 83  39 49 83  39 49 83  18 31 73  18 31 73
-+18 31 73  18 31 73  18 31 73  18 31 73  18 31 73  22 36 89
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+27 44 102  40 57 112  46 61 115  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 58 112  39 49 83  17 26 56
-+17 24 45  15 19 34  6 8 19  6 7 9  2 3 5  1 2 4
-+1 2 4  2 3 5  2 3 5  6 7 9  6 8 19  6 8 19
-+15 19 34  17 24 45  17 26 56  18 31 73  22 36 89  22 39 98
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 101  34 50 107  40 56 111  40 56 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  27 44 103  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+70 84 131  43 59 113  23 40 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  57 72 122  73 86 133
-+73 86 133  73 86 133  72 85 132  73 86 133  73 86 133  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 134  74 87 134
-+75 88 134  74 87 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  76 89 135  75 88 134  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 88 135
-+76 89 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+77 90 136  76 90 135  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  76 89 135  77 90 136
-+77 90 136  78 91 137  77 90 136  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  74 87 130  71 84 128  67 81 125  67 81 125
-+67 81 125  59 73 120  59 73 120  59 73 120  59 73 120  59 73 120
-+67 81 125  67 81 125  69 82 127  73 86 130  76 89 135  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  77 90 136
-+78 91 137  78 91 137  77 90 136  77 90 136  76 89 135  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  76 90 135  77 90 136  76 90 135  76 90 135  76 90 135
-+74 88 133  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  6 7 9  0 0 0  5 5 5  75 88 134
-+75 88 134  75 88 134  74 87 134  71 84 128  67 81 125  59 73 120
-+59 73 120  59 73 120  59 73 120  59 73 120  67 81 125  68 81 126
-+71 84 131  73 86 133  72 85 132  74 87 133  38 54 109  23 40 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+26 43 102  56 71 121  73 85 132  72 84 131  71 85 132  70 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+70 84 131  69 83 130  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  69 83 131  69 83 131  68 82 130  68 82 130  67 81 125
-+59 73 120  59 73 120  59 73 120  55 67 113  55 67 113  55 67 113
-+55 67 113  55 67 113  55 67 113  58 72 120  59 73 120  59 73 120
-+25 42 100  24 41 99  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+51 66 119  67 81 129  66 80 129  66 80 128  66 80 128  66 80 127
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  65 79 128
-+65 79 128  64 78 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  64 78 127  63 77 126  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  62 76 125  64 78 127
-+37 53 109  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  46 61 115  61 75 125  59 74 124
-+61 75 125  61 75 125  60 75 125  61 75 125  59 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  57 72 122  58 73 123  58 73 123  58 73 123  57 72 122
-+35 52 107  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+35 52 107  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  53 68 119  46 61 115  23 40 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 40 99  50 65 118  50 65 118  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  48 64 117  43 59 113  26 43 102  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+27 44 103  43 58 114  46 61 115  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  45 60 114  43 60 114
-+42 58 112  39 56 109  42 55 96  28 45 102  22 36 89  22 36 89
-+22 36 89  22 36 89  22 36 89  22 36 89  22 36 89  22 36 89
-+24 40 99  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  35 51 108  40 56 111  40 56 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  26 43 102  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+72 85 132  58 73 123  26 43 102  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  23 40 100  39 55 110  71 85 132
-+72 85 132  73 86 133  72 85 132  73 86 133  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  73 86 134
-+74 87 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  76 89 135  75 88 134
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 88 135
-+76 89 135  76 90 135  76 89 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  76 89 135
-+77 90 136  77 90 136  78 91 137  78 91 137  77 90 136  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+77 90 136  77 90 136  76 89 135  76 89 135  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+76 90 135  77 90 136  76 90 135  76 90 135  76 90 135  76 90 135
-+74 88 133  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  6 7 9  0 0 0  5 5 5  75 88 134
-+74 87 134  75 88 134  74 87 134  73 86 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  73 86 133  74 87 134  72 85 132
-+73 86 133  72 85 132  73 86 133  62 76 125  23 40 99  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+32 48 107  71 85 132  72 85 132  72 85 132  70 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+69 83 130  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  69 83 131  68 82 130  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  68 82 130  67 81 129
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  59 74 124
-+23 39 99  25 42 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 100  24 41 100
-+63 77 126  66 80 129  66 80 129  66 80 129  66 80 128  66 80 127
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+65 79 128  64 78 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  63 77 126  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  63 77 126  62 76 125
-+31 47 105  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  27 44 102  51 66 119  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  60 75 125  59 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  57 72 122  58 73 123  58 73 123  57 72 122  57 72 122
-+29 46 104  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  23 40 100
-+40 56 111  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  56 70 122  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 69 120  53 68 119  54 69 120
-+54 69 120  54 69 120  54 69 120  53 68 119  42 58 112  23 40 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  27 43 102  51 66 119  50 65 118  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  48 64 117  40 57 112  26 43 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+28 45 103  44 59 113  46 61 115  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  43 60 114
-+44 60 114  44 60 114  44 60 114  34 50 107  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  36 52 108  40 56 111  39 55 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  25 42 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+72 85 132  68 82 130  35 51 108  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  23 39 99  63 77 126
-+73 86 133  73 86 133  73 86 133  72 85 132  74 87 134  73 86 133
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  75 88 134  74 87 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 133  74 87 133  75 88 134  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 88 135  76 89 135  76 90 135  76 89 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+76 89 135  76 89 135  77 90 136  77 90 136  78 91 137  78 91 137
-+77 90 136  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  77 90 136  78 91 137  78 91 137  77 90 136  77 90 136
-+77 90 136  76 89 135  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  76 90 135
-+77 90 136  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+74 88 133  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  6 7 9  0 0 0  5 5 5  75 88 134
-+75 88 134  74 87 134  73 86 134  73 86 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 133  74 87 134  73 86 133  73 86 133
-+73 86 133  73 86 133  75 88 134  34 50 107  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+51 67 118  73 86 133  72 84 131  71 85 132  70 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  70 84 131  71 85 132
-+69 83 130  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  68 82 130  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  67 81 129  68 82 130
-+68 82 130  68 82 130  68 82 130  68 81 130  69 83 131  43 59 113
-+23 40 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  33 49 106
-+68 81 130  66 80 129  66 80 129  66 80 129  66 80 127  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+64 78 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  63 77 126  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  63 77 126  64 78 127  63 77 126  56 71 121
-+29 46 103  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  29 46 104  56 70 122  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  59 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+59 74 124  57 72 122  58 73 123  58 73 123  58 73 123  57 72 122
-+23 40 99  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  23 40 99
-+46 61 115  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  54 70 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 69 120  53 68 119  54 69 120
-+54 69 120  54 69 120  54 69 120  53 68 119  37 53 109  23 40 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  31 47 105  51 66 119  50 65 118  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+48 65 116  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  48 64 117  38 54 110  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+29 46 104  46 61 115  46 61 115  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  31 47 105  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  26 43 102  37 53 109  40 56 111  40 56 111
-+39 55 111  38 54 111  38 54 111  39 55 111  39 55 111  39 55 111
-+38 54 110  38 54 110  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+71 84 131  73 86 133  50 65 118  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  23 40 100  35 52 107
-+74 87 133  73 86 133  73 86 133  73 86 133  73 86 133  74 87 134
-+73 86 133  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+73 86 134  74 87 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  74 87 133  75 88 134
-+75 88 134  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 90 135  76 90 135  76 89 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  77 90 136  76 90 135
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  76 89 135  76 89 135  76 89 135
-+77 90 136  77 90 136  77 90 136  78 91 137  78 91 137  78 91 137
-+77 90 136  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+77 90 136  77 90 136  77 90 136  76 89 135  76 89 135  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+74 88 133  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  6 7 9  0 0 0  5 5 5  74 87 134
-+74 87 134  73 86 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  73 86 133  72 85 132  73 86 133
-+73 86 133  74 87 133  57 72 122  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  27 44 103
-+73 85 132  72 85 132  72 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  70 84 131  71 85 132  69 83 130
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  69 83 131  68 82 130  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  68 82 130  67 81 129  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  69 83 131  27 44 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  23 40 99  47 63 116
-+67 81 129  66 80 129  66 80 129  66 80 128  66 80 127  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  65 79 128
-+64 78 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  64 78 127  63 77 126  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  62 76 125  63 77 126  50 65 118
-+26 43 102  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  31 47 105  61 75 125  61 75 125  61 75 125
-+61 75 125  60 75 125  61 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  59 74 124  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  50 65 118
-+23 40 99  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+50 65 118  55 69 121  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  54 70 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 69 120  53 68 119  54 69 120
-+54 69 120  54 69 120  54 69 120  53 68 119  32 50 106  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  35 51 108  51 66 119  50 65 118  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  48 64 117  36 52 108  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 100
-+30 48 104  47 63 116  45 60 114  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  29 46 103  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  27 44 102  38 54 109  40 56 111  40 56 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  37 53 109  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+72 85 132  72 85 132  68 82 130  30 46 104  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  23 39 99
-+57 72 122  74 87 134  72 85 132  73 86 133  73 86 133  73 86 133
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 134  74 87 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  74 87 133  75 88 134
-+76 89 135  75 88 134  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 88 135  76 89 135  76 89 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  77 90 136
-+76 90 135  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+76 89 135  76 89 135  77 90 136  77 90 136  77 90 136  77 90 136
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  78 91 137  78 91 137  78 91 137  78 91 137
-+78 91 137  78 91 137  77 90 136  77 90 136  77 90 136  77 90 136
-+76 89 135  76 89 135  76 89 135  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  76 90 135  77 90 136  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+74 88 133  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  6 7 9  0 0 0  5 5 5  75 88 134
-+74 87 134  73 86 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 133  73 86 133  72 85 132  73 86 133
-+73 86 133  71 85 132  36 52 108  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  23 39 99  53 68 119
-+73 86 133  72 84 131  71 85 132  70 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  69 83 131
-+70 84 131  68 82 130  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  67 81 129  68 82 130  68 82 130
-+68 82 130  68 82 130  67 81 129  68 82 130  56 71 121  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  23 40 100  61 75 125
-+66 80 129  66 80 129  66 80 129  66 80 127  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  64 78 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  63 77 126  63 77 126  44 60 114
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  38 56 110  62 76 125  59 74 124  61 75 125
-+61 75 125  61 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  42 58 112
-+23 40 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  28 45 103
-+51 66 119  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  54 70 120  55 70 121  55 70 121  55 70 121
-+55 70 121  54 69 120  55 70 121  54 69 120  53 68 119  54 69 120
-+54 69 120  54 69 120  53 68 119  53 68 119  27 44 102  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 100  39 55 111  51 66 119  50 65 118  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  48 64 117  34 50 107  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+34 50 106  46 61 115  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  44 60 114
-+44 60 114  43 59 113  44 61 114  26 43 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  27 44 103  39 55 110  40 56 111  40 56 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  34 50 108  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+71 85 132  72 84 131  74 87 133  50 65 118  23 40 99  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+31 47 105  71 84 131  73 86 133  72 85 132  72 85 132  73 86 133
-+74 87 134  73 86 133  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 134  74 87 134  75 88 134  74 87 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  74 87 133
-+75 88 134  76 89 135  75 88 134  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 88 135  76 89 135  76 90 135
-+76 89 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+77 90 136  76 90 135  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  76 89 135  76 89 135  76 89 135  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  76 89 135  76 89 135  76 89 135
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+76 90 135  77 90 136  77 90 136  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+74 88 133  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  6 7 9  0 0 0  5 5 5  74 87 134
-+73 86 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 133  73 86 133  72 85 132  73 86 133  73 86 133
-+73 86 133  56 71 121  25 42 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  31 47 105  70 83 130
-+72 85 132  71 85 132  71 85 132  70 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  70 84 131  69 83 130
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  68 82 130  69 83 131  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 81 130  70 84 131  40 57 112  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  33 49 106  65 79 128
-+65 79 128  66 80 129  66 80 129  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  64 78 127  63 77 126  61 75 125  37 53 109
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  47 63 116  62 76 125  61 75 125  61 75 125
-+61 75 125  61 75 125  60 75 125  59 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  58 73 123  58 73 123  58 73 123  59 74 124  34 50 107
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  32 48 107
-+53 67 120  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  54 70 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  54 69 120  53 68 119  54 69 120
-+54 69 120  54 69 120  54 69 120  53 68 119  23 40 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 99  44 60 114  51 66 119  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  49 65 117  47 63 116  32 48 107  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+36 52 108  46 61 115  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  24 41 100  24 41 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  28 45 103  39 55 110  40 56 111  40 56 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  33 49 106  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+71 85 132  72 85 132  72 85 132  72 85 132  29 46 104  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  49 64 117  74 87 133  73 86 133  72 85 132  72 85 132
-+73 86 133  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 134  74 87 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+74 87 133  75 88 134  76 89 135  75 88 134  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 88 135  76 89 135
-+76 90 135  76 89 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  77 90 136  77 90 136  76 90 135  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  76 90 135
-+77 90 136  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+74 87 133  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  6 7 9  0 0 0  5 5 5  73 86 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+73 86 133  74 87 134  73 86 133  72 85 132  73 86 133  146 146 148
-+141 141 145  137 138 138  137 138 138  137 138 138  141 141 145  93 98 116
-+26 43 101  25 42 101  44 58 112  132 132 134  137 138 138  137 138 138
-+137 138 138  137 138 138  141 141 145  134 136 146  71 85 132  71 85 132
-+71 85 132  141 141 145  141 141 145  137 138 138  137 138 138  137 138 138
-+141 141 145  120 125 141  70 84 131  141 141 145  141 141 145  137 138 138
-+137 138 138  137 138 138  141 141 145  102 109 134  69 83 131  69 83 131
-+69 83 131  69 83 131  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  64 78 127  32 48 105  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  23 40 99  46 61 115  65 79 128
-+66 80 129  66 80 128  66 80 129  66 80 128  82 95 139  141 141 145
-+137 138 138  137 138 138  137 138 138  141 141 145  134 136 146  68 81 130
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  64 78 127
-+65 79 128  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  63 77 126  63 77 126  58 73 123  31 47 105
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  57 72 122  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  60 75 125  59 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  59 74 124
-+58 73 123  58 73 123  58 73 123  57 72 122  102 109 134  141 141 145
-+137 138 138  137 138 138  137 138 138  137 138 138  137 138 138  137 138 138
-+137 138 138  137 138 138  137 138 138  137 138 138  137 138 138  137 138 138
-+141 141 145  120 125 141  25 42 101  25 42 101  24 41 100  36 52 108
-+55 69 121  56 70 122  56 70 122  56 70 122  56 70 122  55 70 121
-+56 70 122  55 70 121  54 70 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  47 63 116  23 40 99  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  47 63 116  50 65 118  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  102 109 134  141 141 145  137 138 138
-+137 138 138  137 138 138  141 141 145  102 109 134  49 65 117  49 65 117
-+49 65 117  48 64 117  46 61 115  29 46 104  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+38 54 111  46 61 115  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  40 57 112  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 100  30 46 104  40 56 111  40 56 111  40 56 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  31 47 105  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+70 85 132  71 85 132  72 85 132  72 85 132  56 70 122  23 40 99
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  31 47 105  65 79 128  73 86 133  73 86 133  73 86 133
-+72 85 132  73 86 133  73 86 133  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  73 86 134  74 87 134  75 88 134
-+74 87 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  74 87 133  75 88 134  76 89 135  75 88 134  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  77 90 136  77 90 136
-+76 90 135  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 89 135  76 90 135
-+74 88 133  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  6 7 9  0 0 0  5 5 5  73 86 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  73 86 133
-+74 87 134  72 85 132  73 86 133  73 86 133  72 85 132  137 138 138
-+55 55 55  12 14 18  20 20 21  20 20 21  66 66 66  102 109 134
-+29 46 103  25 42 101  59 73 120  118 119 119  31 31 31  20 20 21
-+20 20 21  20 20 21  44 44 44  146 146 148  76 90 135  71 85 132
-+72 85 132  141 141 145  44 44 44  20 20 21  20 20 21  20 20 21
-+80 80 80  120 125 141  70 84 131  141 141 145  55 55 55  12 14 18
-+20 20 21  20 20 21  96 96 96  102 109 134  69 83 131  69 83 131
-+69 83 131  69 83 131  68 82 130  67 81 129  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  55 69 121  27 44 102  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 101  58 73 123  66 80 129
-+66 80 129  66 80 129  66 80 128  66 80 127  82 95 139  96 96 96
-+20 20 21  20 20 21  20 20 21  55 55 55  120 125 141  67 80 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+64 78 127  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  63 77 126  63 77 126  55 70 121  23 40 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  27 44 103  63 77 126  59 74 124  61 75 125  61 75 125
-+60 75 125  61 75 125  60 75 125  59 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+57 72 122  58 73 123  58 73 123  58 73 123  102 109 134  80 80 80
-+20 20 21  20 20 21  20 20 21  20 20 21  20 20 21  20 20 21
-+20 20 21  20 20 21  20 20 21  20 20 21  20 20 21  12 14 18
-+66 66 66  120 125 141  25 42 101  24 41 100  24 41 100  40 56 111
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  40 57 112  23 40 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  27 44 103  48 63 117  50 65 118  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  102 109 134  80 80 80  12 14 18
-+20 20 21  20 20 21  66 66 66  120 125 141  49 65 117  49 65 117
-+49 65 117  48 63 117  44 60 114  27 44 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+42 57 112  46 61 115  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  38 56 110  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  31 47 105  40 56 111  40 56 111  40 56 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  29 46 104  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+70 85 132  71 85 132  71 85 132  71 84 131  70 84 131  35 52 107
-+23 40 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 100  23 40 100  46 61 115  72 85 132  72 85 132  73 86 133
-+72 85 132  73 86 133  74 87 134  73 86 133  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 134  74 87 134
-+75 88 134  74 87 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 133  75 88 134  76 89 135  75 88 134
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 88 135  76 88 135  76 89 135  76 90 135  76 89 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+76 90 135  77 90 136  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 89 135  76 90 135  76 89 135
-+74 87 133  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  6 7 9  0 0 0  5 5 5  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 133  74 87 134
-+73 86 133  73 86 133  73 86 133  72 85 132  73 86 133  120 125 141
-+66 66 66  0 0 0  0 0 0  0 0 0  31 31 31  120 125 141
-+32 48 105  26 43 102  102 108 129  80 80 80  0 0 1  0 0 0
-+0 0 0  0 0 0  0 0 0  137 138 138  97 107 139  71 85 132
-+82 95 139  141 141 145  0 0 0  0 0 0  0 0 0  0 0 0
-+96 96 96  120 125 141  70 84 131  141 141 145  44 44 44  0 0 0
-+0 0 0  0 0 0  80 80 80  102 109 134  69 83 131  69 83 131
-+69 83 131  68 82 130  67 81 129  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  67 81 129  44 59 113  24 40 99  24 41 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  34 50 107  62 76 125  66 80 129
-+66 80 128  66 80 129  66 80 128  66 80 127  82 95 139  96 96 96
-+0 0 0  0 0 0  0 0 0  31 31 31  118 119 119  67 80 128
-+65 79 128  65 79 128  65 79 128  65 79 128  64 78 127  65 79 128
-+64 78 127  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+63 77 126  64 78 127  63 77 126  63 77 126  46 61 115  23 40 99
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+23 40 100  39 55 111  62 76 125  61 75 125  61 75 125  61 75 125
-+61 75 125  60 75 125  60 75 125  59 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  59 74 124  58 73 123  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+57 72 122  58 73 123  58 73 123  58 73 123  102 109 134  66 66 66
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+55 55 55  120 125 141  25 42 101  24 41 100  25 42 101  45 60 114
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  55 70 121  34 50 107  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  29 47 104  48 64 117  51 66 119  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  102 109 134  66 66 66  0 0 0
-+0 0 0  0 0 0  44 44 44  120 125 141  49 65 117  49 65 117
-+49 65 117  48 63 117  43 59 113  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+44 60 114  46 61 115  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  43 60 114  44 60 114
-+44 60 114  44 60 114  36 52 108  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  33 49 106  40 56 111  40 56 111  40 56 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  27 44 102  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+71 85 132  70 85 132  71 85 132  72 85 132  72 85 132  57 72 122
-+26 43 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  62 76 125  73 86 133  72 85 132
-+73 86 133  72 85 132  73 86 133  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 134  74 87 134
-+74 87 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 133  75 88 134  76 89 135
-+75 88 134  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 88 135  76 89 135  76 90 135  76 89 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  77 90 136  77 90 136  77 90 136  76 90 135  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 89 135  76 90 135  76 89 135  76 88 135
-+73 86 133  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  6 7 9  0 0 0  5 5 5  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  73 86 133
-+73 86 133  72 85 132  73 86 133  73 86 133  74 87 134  93 98 116
-+96 96 96  0 0 0  0 0 0  0 0 0  20 20 21  118 119 119
-+34 50 106  28 45 102  120 125 141  55 55 55  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  96 96 96  120 125 141  71 85 132
-+102 109 134  118 119 119  0 0 0  0 0 0  0 0 0  1 2 4
-+118 119 119  97 107 139  70 84 131  141 141 145  96 96 96  66 66 66
-+66 66 66  66 66 66  118 119 119  102 109 134  69 83 131  69 83 131
-+69 83 131  68 82 130  67 81 129  68 82 130  68 82 130  68 82 130
-+68 82 130  67 81 129  64 78 127  31 47 105  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  43 59 113  66 80 129  66 80 129
-+66 80 129  66 80 128  66 80 128  66 80 127  82 95 139  96 96 96
-+0 1 1  0 0 0  0 0 0  31 31 31  118 119 119  67 80 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  64 78 127
-+64 78 127  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  63 77 126  63 77 126  34 50 107  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+23 40 99  50 65 118  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  60 75 125  59 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  59 74 124  58 73 123  59 74 124
-+59 74 124  59 74 124  59 74 124  58 73 123  59 74 124  58 73 123
-+57 72 122  58 73 123  57 72 122  59 74 124  97 107 139  66 66 66
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+44 44 44  120 125 141  25 42 101  24 41 100  27 44 103  49 64 117
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  53 68 119  54 69 120  54 69 120
-+54 69 120  53 68 119  55 70 121  28 45 103  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  34 50 107  50 65 118  50 65 118  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  102 109 134  66 66 66  0 0 0
-+0 0 0  0 0 0  44 44 44  120 125 141  49 65 117  49 65 117
-+49 65 117  48 63 117  40 57 112  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  26 43 101
-+47 63 116  46 61 115  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  43 60 114  44 60 114
-+44 60 114  44 60 114  32 50 106  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  35 52 107  40 56 111  40 56 111  39 55 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  38 54 110
-+39 55 111  25 42 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+71 85 132  70 85 132  70 85 132  71 85 132  72 85 132  70 84 131
-+37 53 109  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  31 47 105  73 87 133  73 86 133
-+73 86 133  73 86 133  73 86 133  74 87 134  73 86 133  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  73 86 134
-+73 86 134  74 87 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  74 87 133  75 88 134
-+76 89 135  75 88 134  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 88 135  76 89 135  76 90 135
-+76 90 135  76 89 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  77 90 136  77 90 136
-+76 90 135  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  76 90 135  77 90 136  77 90 136  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 89 135  76 90 135  76 89 135  76 88 135  76 88 135
-+74 87 133  17 24 45  0 0 0  5 5 5  154 154 154  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  248 248 248  6 7 9  0 0 0  5 5 5  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  73 86 133
-+72 85 132  73 86 133  72 85 132  74 87 134  52 67 118  55 67 113
-+118 119 119  6 7 9  0 0 0  0 0 0  12 14 18  118 119 119
-+49 62 109  30 48 104  132 132 134  31 31 31  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  44 44 44  141 141 145  71 85 132
-+120 125 141  96 96 96  0 0 0  0 0 0  0 0 0  6 7 9
-+146 146 148  80 93 136  70 84 131  120 125 141  120 125 141  120 125 141
-+120 125 141  120 125 141  120 125 141  82 95 139  69 83 131  69 83 131
-+68 82 130  67 81 129  67 81 129  68 82 130  68 82 130  68 82 130
-+68 82 130  73 87 131  62 76 125  23 40 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  32 48 105
-+34 50 106  34 50 106  34 50 106  53 67 120  66 80 129  65 79 128
-+66 80 129  66 80 128  66 80 127  66 80 128  82 95 139  96 96 96
-+0 1 1  0 0 0  0 0 0  31 31 31  118 119 119  68 81 130
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  64 78 127
-+63 77 126  70 83 130  70 83 130  71 84 128  65 79 128  64 78 127
-+64 78 127  63 77 126  63 77 126  61 75 125  23 40 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  33 50 105
-+34 50 106  34 50 106  34 50 106  25 42 101  25 42 101  24 41 100
-+24 40 99  59 74 124  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  60 75 125  62 76 125  67 80 128  67 80 128  67 80 128
-+64 78 127  60 75 125  60 75 125  59 74 124  58 73 123  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  57 72 122
-+57 72 122  58 73 123  58 73 123  59 74 124  97 107 139  66 66 66
-+0 0 0  0 0 0  0 0 0  0 0 0  96 96 96  137 138 138
-+137 138 138  137 138 138  137 138 138  137 138 138  137 138 138  137 138 138
-+141 141 145  120 125 141  25 42 101  24 41 100  29 46 104  53 67 120
-+56 70 122  56 70 122  56 70 122  56 70 122  63 77 126  63 77 126
-+55 70 121  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  54 69 120  59 73 120  59 73 120  61 75 125  57 72 122
-+54 69 120  54 69 120  53 68 119  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  34 50 106  34 50 106  34 50 106  32 48 105  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  37 53 109  51 66 119  49 64 117  52 67 118  58 72 120
-+58 72 120  52 66 118  50 65 118  102 109 134  66 66 66  0 0 0
-+0 0 0  0 0 0  44 44 44  120 125 141  49 65 117  48 64 117
-+49 65 117  47 63 116  38 54 109  23 40 100  25 42 101  27 44 102
-+34 50 106  34 50 106  33 50 105  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  30 48 104  34 50 106  34 50 106  24 41 100  29 46 104
-+47 63 116  45 60 114  44 59 113  45 60 114  52 66 118  52 67 118
-+52 66 118  45 60 114  45 60 114  44 60 114  43 60 114  44 60 114
-+43 60 114  44 61 114  29 46 104  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  36 52 108  40 56 111  40 56 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+38 54 110  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+71 85 132  71 85 132  70 85 132  71 85 132  72 84 131  73 85 132
-+59 74 124  27 44 102  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  44 60 114  74 87 134
-+73 86 133  72 85 132  72 85 132  73 86 133  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+73 86 134  74 87 134  75 88 134  74 87 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  74 87 133
-+75 88 134  76 89 135  75 88 134  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 88 135  76 88 135
-+76 89 135  76 90 135  76 90 135  76 89 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+76 90 135  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 89 135  76 90 135
-+76 90 135  76 89 135  76 88 135  76 88 135  76 89 135  76 89 135
-+74 87 133  17 24 45  0 0 0  2 3 5  118 119 119  177 177 177
-+177 177 177  177 177 177  177 177 177  177 177 177  177 177 177  177 177 177
-+177 177 177  177 177 177  177 177 177  177 177 177  177 177 177  177 177 177
-+177 177 177  177 177 177  6 7 9  0 0 0  5 5 5  74 87 134
-+74 87 134  74 87 134  73 86 133  74 87 134  73 86 133  72 85 132
-+73 86 133  73 86 133  73 86 133  65 79 128  31 47 105  32 48 105
-+132 132 134  31 31 31  0 0 0  0 0 0  0 0 0  96 96 96
-+67 81 125  67 81 125  118 119 119  6 7 9  0 0 0  0 0 0
-+1 2 4  0 0 0  0 0 0  6 7 9  146 146 148  80 93 136
-+141 141 145  55 55 55  0 0 0  0 0 0  0 0 0  44 44 44
-+141 141 145  73 86 133  69 83 131  120 125 141  132 132 134  120 125 141
-+120 125 141  120 125 141  120 125 141  97 107 139  69 83 131  97 107 139
-+134 136 146  120 125 141  120 125 141  120 125 141  132 132 134  120 125 141
-+141 141 145  137 138 138  137 138 138  141 141 145  120 125 141  32 48 105
-+25 42 101  27 44 102  59 73 120  120 125 141  141 141 145  137 138 138
-+137 138 138  137 138 138  137 138 138  141 141 145  120 125 141  97 107 139
-+68 81 130  66 80 128  66 80 127  66 80 128  82 95 139  96 96 96
-+0 1 1  0 0 0  0 0 0  31 31 31  118 119 119  68 81 130
-+65 79 128  65 79 128  65 79 128  68 82 130  102 109 134  134 136 146
-+141 141 145  137 138 138  137 138 138  137 138 138  141 141 145  137 138 138
-+120 125 141  80 93 136  63 77 126  49 64 117  23 40 99  25 42 101
-+25 42 101  32 48 105  93 98 116  132 132 134  141 141 145  137 138 138
-+137 138 138  137 138 138  137 138 138  141 141 145  132 132 134  74 87 130
-+39 56 109  59 74 124  61 75 125  61 75 125  61 75 125  73 86 130
-+120 125 141  137 138 138  141 141 145  137 138 138  137 138 138  137 138 138
-+137 138 138  141 141 145  120 125 141  80 93 136  60 75 125  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  57 72 122
-+58 73 123  58 73 123  58 73 123  54 69 120  97 107 139  66 66 66
-+0 0 0  0 0 0  0 0 0  0 0 0  118 119 119  93 98 116
-+49 62 109  49 62 109  49 62 109  49 62 109  49 62 109  49 62 109
-+49 62 109  44 58 112  67 81 125  120 125 141  120 125 141  120 125 141
-+120 125 141  132 132 134  102 109 134  141 141 145  137 138 138  137 138 138
-+141 141 145  120 125 141  61 75 125  55 70 121  57 72 122  80 93 136
-+132 132 134  141 141 145  137 138 138  137 138 138  137 138 138  137 138 138
-+141 141 145  120 125 141  74 87 130  26 43 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  29 46 103  55 67 113  120 125 141
-+141 141 145  137 138 138  137 138 138  137 138 138  137 138 138  141 141 145
-+120 125 141  59 73 120  30 46 104  25 42 101  25 42 101  24 41 100
-+24 41 100  40 57 112  69 82 127  120 125 141  141 141 145  137 138 138
-+137 138 138  141 141 145  120 125 141  120 125 141  66 66 66  0 0 0
-+0 0 0  0 0 0  44 44 44  120 125 141  49 65 117  49 65 117
-+48 64 117  47 63 116  49 63 116  102 108 129  137 138 138  141 141 145
-+137 138 138  137 138 138  137 138 138  141 141 145  120 125 141  67 81 125
-+27 44 102  25 42 101  25 42 101  25 42 101  36 52 108  120 125 141
-+120 125 141  120 125 141  120 125 141  120 125 141  74 87 130  74 87 130
-+137 138 138  137 138 138  137 138 138  137 138 138  141 141 145  102 109 134
-+58 72 120  55 68 119  102 109 134  141 141 145  137 138 138  137 138 138
-+137 138 138  137 138 138  80 93 136  46 61 115  43 60 114  44 60 114
-+44 60 114  44 60 114  27 44 102  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  38 54 110  40 56 111  40 56 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+36 52 108  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+71 85 132  71 85 132  71 85 132  70 85 132  71 85 132  72 84 131
-+74 87 133  42 58 112  23 40 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  58 73 123
-+74 87 133  73 85 132  73 86 133  72 85 132  73 86 133  73 86 133
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 134  74 87 134  75 88 134  74 87 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+74 87 133  75 88 134  76 89 135  75 88 134  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 88 135  76 89 135  76 89 135  76 90 135  76 90 135  76 89 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  77 90 136  77 90 136  77 90 136  77 90 136  77 90 136
-+77 90 136  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 89 135  76 90 135  76 89 135
-+76 89 135  76 88 135  76 89 135  76 89 135  76 89 135  76 89 135
-+74 87 133  17 24 45  0 0 0  0 0 0  1 2 4  2 3 5
-+2 3 5  2 3 5  2 3 5  2 3 5  2 3 5  2 3 5
-+2 3 5  2 3 5  2 3 5  2 3 5  2 3 5  2 3 5
-+2 3 5  2 3 5  0 0 0  0 0 0  5 5 5  74 87 134
-+74 87 134  74 87 134  74 87 134  73 86 133  72 85 132  73 86 133
-+73 86 133  72 85 132  72 85 132  42 58 112  23 40 100  30 46 104
-+120 125 141  44 44 44  0 0 0  0 0 0  0 0 0  80 80 80
-+102 108 129  120 125 141  96 96 96  0 0 0  0 0 0  2 3 5
-+55 55 55  0 0 0  0 0 0  2 3 5  118 119 119  102 109 134
-+146 146 148  31 31 31  0 0 0  0 0 0  0 0 0  80 80 80
-+134 136 146  70 84 131  70 84 131  141 141 145  80 80 80  44 44 44
-+55 55 55  55 55 55  96 96 96  102 109 134  68 82 130  97 107 139
-+132 132 134  44 44 44  55 55 55  55 55 55  96 96 96  154 154 154
-+96 96 96  20 20 21  5 5 5  55 55 55  137 138 138  38 54 109
-+36 52 108  102 109 134  132 132 134  96 96 96  44 44 44  20 20 21
-+5 5 5  5 5 5  20 20 21  44 44 44  96 96 96  132 132 134
-+134 136 146  74 87 130  66 80 128  66 80 128  82 95 139  96 96 96
-+0 1 1  0 0 0  0 0 0  31 31 31  118 119 119  68 81 130
-+65 79 128  65 79 128  80 93 136  141 141 145  118 119 119  80 80 80
-+31 31 31  12 14 18  2 3 5  6 7 9  31 31 31  55 55 55
-+96 96 96  137 138 138  120 125 141  39 55 110  24 41 100  25 42 101
-+49 62 109  134 136 146  118 119 119  80 80 80  31 31 31  12 14 18
-+0 1 1  2 3 5  12 14 18  31 31 31  66 66 66  132 132 134
-+120 125 141  68 81 126  61 75 125  61 75 125  97 107 139  141 141 145
-+118 119 119  55 55 55  31 31 31  6 7 9  0 1 1  5 5 5
-+20 20 21  44 44 44  96 96 96  137 138 138  102 109 134  61 75 125
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  57 72 122
-+58 73 123  57 72 122  58 73 123  48 64 116  82 95 139  66 66 66
-+0 0 0  0 0 0  0 0 0  0 0 0  118 119 119  71 84 128
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  93 98 116  96 96 96  55 55 55  55 55 55
-+44 44 44  118 119 119  146 146 148  80 80 80  12 14 18  6 7 9
-+66 66 66  146 146 148  69 82 127  68 81 126  134 136 146  132 132 134
-+80 80 80  44 44 44  12 14 18  2 3 5  6 7 9  20 20 21
-+55 55 55  96 96 96  132 132 134  102 108 129  33 50 105  25 42 101
-+25 42 101  25 42 101  36 52 108  102 109 134  132 132 134  96 96 96
-+44 44 44  20 20 21  2 3 5  6 7 9  20 20 21  44 44 44
-+96 96 96  132 132 134  120 125 141  36 52 108  25 42 101  24 41 100
-+26 43 102  74 87 130  141 141 145  96 96 96  44 44 44  6 7 9
-+6 7 9  31 31 31  96 96 96  141 141 145  66 66 66  0 0 0
-+0 0 0  0 0 0  44 44 44  120 125 141  49 65 117  49 65 117
-+49 65 117  97 107 139  141 141 145  118 119 119  66 66 66  31 31 31
-+6 7 9  5 5 5  20 20 21  44 44 44  96 96 96  132 132 134
-+120 125 141  44 58 112  25 42 101  25 42 101  39 56 109  118 119 119
-+55 55 55  55 55 55  55 55 55  80 80 80  146 146 148  132 132 134
-+80 80 80  20 20 21  5 5 5  12 14 18  44 44 44  118 119 119
-+120 125 141  146 146 148  118 119 119  55 55 55  12 14 18  5 5 5
-+20 20 21  80 80 80  137 138 138  93 98 116  43 60 114  44 60 114
-+44 60 114  42 58 112  27 43 102  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 101  25 42 101  40 56 111  40 56 111  40 56 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+34 50 107  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  72 84 131
-+72 85 132  69 83 130  29 46 104  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  33 49 106
-+67 81 129  73 86 133  73 86 133  73 86 133  72 85 132  73 86 133
-+73 86 133  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 134  74 87 134  75 88 134  74 87 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  74 87 133  75 88 134  76 89 135  75 88 134  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 88 135  76 88 135  76 89 135  76 89 135  76 90 135
-+76 89 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 89 135  76 90 135  76 89 135  76 89 135
-+76 88 135  76 88 135  76 89 135  76 89 135  76 89 135  76 89 135
-+74 87 133  17 24 45  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  5 5 5  74 87 134
-+74 87 134  73 86 133  74 87 134  72 85 132  73 86 133  73 86 133
-+72 85 132  73 86 133  55 69 121  24 41 100  24 41 100  27 44 102
-+102 109 134  66 66 66  0 0 0  0 0 0  0 0 0  55 55 55
-+120 125 141  137 138 138  55 55 55  0 0 0  0 0 0  6 7 9
-+118 119 119  6 7 9  0 0 0  0 1 1  80 80 80  141 141 145
-+146 146 148  0 0 0  0 0 0  0 0 0  0 0 0  118 119 119
-+102 109 134  69 83 131  70 84 131  134 136 146  44 44 44  0 0 0
-+0 0 0  0 0 0  80 80 80  102 109 134  69 83 131  97 107 139
-+118 119 119  0 0 0  0 0 0  0 0 0  66 66 66  118 119 119
-+5 5 5  0 0 0  0 0 0  55 55 55  132 132 134  30 48 104
-+120 125 141  118 119 119  31 31 31  0 0 0  0 0 0  0 0 0
-+5 5 5  5 5 5  0 0 0  0 0 0  0 0 0  31 31 31
-+118 119 119  134 136 146  73 86 130  66 80 128  82 95 139  96 96 96
-+0 1 1  0 0 0  0 0 0  31 31 31  118 119 119  68 81 130
-+65 79 128  80 93 136  146 146 148  96 96 96  12 14 18  0 0 0
-+0 0 0  0 0 0  6 7 9  0 0 0  0 0 0  0 0 0
-+0 0 0  55 55 55  132 132 134  93 98 116  24 41 100  30 48 104
-+120 125 141  96 96 96  12 14 18  0 0 0  0 0 0  20 20 21
-+44 44 44  31 31 31  0 0 0  0 0 0  0 0 0  20 20 21
-+118 119 119  102 109 134  61 75 125  73 86 130  141 141 145  66 66 66
-+0 0 0  0 0 0  0 0 0  31 31 31  44 44 44  20 20 21
-+0 0 0  0 0 0  0 0 0  44 44 44  132 132 134  80 93 136
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  57 72 122
-+58 73 123  58 73 123  58 73 123  42 58 112  93 98 116  66 66 66
-+0 0 0  0 0 0  0 0 0  0 0 0  118 119 119  120 125 141
-+102 109 134  102 109 134  102 109 134  102 109 134  102 109 134  102 108 129
-+55 67 113  25 42 101  97 107 139  66 66 66  0 0 0  0 0 0
-+0 0 0  118 119 119  96 96 96  0 0 0  0 0 0  0 0 0
-+80 80 80  134 136 146  67 81 125  141 141 145  96 96 96  20 20 21
-+0 0 0  0 0 0  0 0 0  5 5 5  2 3 5  0 0 0
-+0 0 0  0 0 0  44 44 44  118 119 119  102 108 129  25 42 101
-+25 42 101  33 50 105  120 125 141  118 119 119  31 31 31  0 0 0
-+0 0 0  0 0 0  2 3 5  5 5 5  0 0 0  0 0 0
-+0 0 0  31 31 31  118 119 119  120 125 141  30 48 104  24 41 100
-+49 62 109  146 146 148  80 80 80  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  55 55 55  66 66 66  0 0 0
-+0 0 0  0 0 0  44 44 44  120 125 141  49 65 117  49 65 117
-+82 95 139  137 138 138  66 66 66  0 1 1  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  31 31 31
-+96 96 96  134 136 146  36 52 108  25 42 101  39 56 109  118 119 119
-+6 7 9  0 0 0  0 0 0  55 55 55  118 119 119  31 31 31
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  20 20 21
-+132 132 134  96 96 96  6 7 9  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  55 55 55  141 141 145  43 60 114  44 60 114
-+44 60 114  40 56 111  26 43 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  27 44 102  40 56 111  39 55 110  40 56 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+32 48 107  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+72 84 131  72 85 132  59 74 124  23 40 99  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+43 59 113  72 85 132  72 85 132  73 86 133  72 85 132  73 86 133
-+74 87 134  73 86 133  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 134  73 86 134  74 87 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 133  75 88 134  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 88 135  76 88 135  76 89 135  76 89 135
-+76 90 135  76 89 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 89 135  76 90 135  76 90 135  76 89 135  76 88 135  76 88 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  75 88 134  75 88 134  74 87 133
-+74 87 133  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 134  75 88 134  74 87 134  73 86 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+73 86 133  74 87 134  73 86 133  73 86 133  73 86 133  72 85 132
-+73 86 133  67 80 128  25 42 101  24 41 100  25 42 101  25 42 101
-+74 87 130  96 96 96  5 5 5  0 0 0  0 0 0  31 31 31
-+137 138 138  141 141 145  20 20 21  0 0 0  0 0 0  44 44 44
-+137 138 138  31 31 31  0 0 0  0 0 0  44 44 44  154 154 154
-+118 119 119  0 0 0  0 0 0  0 0 0  0 0 0  146 146 148
-+82 95 139  70 84 131  69 83 131  134 136 146  55 55 55  0 0 0
-+0 0 0  0 0 0  80 80 80  102 109 134  69 83 131  97 107 139
-+118 119 119  0 0 0  0 0 0  0 0 0  12 14 18  20 20 21
-+0 0 0  0 0 0  0 0 0  118 119 119  71 84 128  74 87 130
-+132 132 134  20 20 21  0 0 0  0 0 0  1 2 4  66 66 66
-+118 119 119  118 119 119  80 80 80  5 5 5  0 0 0  0 0 0
-+20 20 21  118 119 119  97 107 139  66 80 128  82 95 139  96 96 96
-+0 1 1  0 0 0  0 0 0  31 31 31  118 119 119  68 81 130
-+68 81 130  120 125 141  96 96 96  5 5 5  0 0 0  0 0 0
-+12 14 18  96 96 96  118 119 119  118 119 119  44 44 44  0 0 0
-+0 0 0  0 0 0  55 55 55  141 141 145  44 58 112  44 58 112
-+132 132 134  20 20 21  0 0 0  0 0 0  44 44 44  118 119 119
-+120 125 141  132 132 134  80 80 80  5 5 5  12 14 18  31 31 31
-+80 80 80  141 141 145  61 75 125  82 95 139  118 119 119  6 7 9
-+0 0 0  0 0 0  66 66 66  132 132 134  132 132 134  118 119 119
-+55 55 55  2 3 5  20 20 21  31 31 31  118 119 119  120 125 141
-+59 74 124  59 74 124  59 74 124  58 73 123  58 73 123  57 72 122
-+58 73 123  58 73 123  57 72 122  37 53 109  93 98 116  66 66 66
-+0 0 0  0 0 0  0 0 0  0 0 0  44 44 44  55 55 55
-+55 55 55  55 55 55  55 55 55  55 55 55  55 55 55  118 119 119
-+71 84 128  25 42 101  93 98 116  66 66 66  0 1 1  0 0 0
-+0 0 0  31 31 31  6 7 9  0 0 0  0 0 0  5 5 5
-+137 138 138  97 107 139  102 109 134  118 119 119  12 14 18  0 0 0
-+0 0 0  5 5 5  80 80 80  118 119 119  118 119 119  66 66 66
-+0 0 0  0 0 0  0 0 0  31 31 31  141 141 145  59 73 120
-+25 42 101  93 98 116  132 132 134  20 20 21  0 0 0  0 0 0
-+0 0 0  80 80 80  118 119 119  118 119 119  80 80 80  0 0 0
-+0 0 0  0 0 0  12 14 18  137 138 138  93 98 116  24 41 100
-+102 109 134  118 119 119  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  12 14 18  0 0 0  0 0 0  12 14 18  0 0 0
-+0 0 0  0 0 0  44 44 44  120 125 141  49 65 117  59 73 120
-+141 141 145  66 66 66  0 0 0  0 0 0  0 0 0  1 2 4
-+44 44 44  66 66 66  20 20 21  0 0 0  0 0 0  0 0 0
-+12 14 18  118 119 119  102 108 129  26 43 101  39 56 109  118 119 119
-+12 14 18  0 0 0  0 0 0  44 44 44  31 31 31  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+31 31 31  5 5 5  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  132 132 134  44 60 114  44 60 114
-+44 60 114  37 53 109  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  30 46 104  40 56 111  40 56 111  39 55 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+30 46 104  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+71 85 132  71 85 132  71 85 132  71 85 132  70 85 132  71 85 132
-+72 85 132  71 84 131  71 84 131  44 60 114  23 40 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 100
-+23 39 99  56 71 121  73 86 133  73 86 133  72 85 132  73 86 133
-+73 86 133  74 87 134  74 87 134  73 86 133  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 134  74 87 134
-+75 88 134  74 87 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 133  74 87 133  75 88 134
-+76 89 135  75 88 134  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 90 135  76 90 135  76 89 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 89 135  76 90 135  76 90 135  76 90 135
-+76 89 135  76 89 135  76 88 135  76 88 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+75 88 134  76 89 135  75 88 134  75 88 134  74 87 133  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+74 87 134  75 88 134  75 88 134  73 86 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  73 86 133
-+74 87 134  73 86 133  72 85 132  73 86 133  72 85 132  73 86 133
-+71 85 132  31 47 105  24 41 100  25 42 101  25 42 101  25 42 101
-+59 73 120  118 119 119  6 7 9  0 0 0  0 0 0  6 7 9
-+137 138 138  118 119 119  0 0 1  0 0 0  0 0 0  96 96 96
-+154 154 154  55 55 55  0 0 0  0 0 0  20 20 21  132 132 134
-+96 96 96  0 0 0  0 0 0  0 0 0  31 31 31  146 146 148
-+73 87 133  70 84 131  69 83 131  134 136 146  55 55 55  0 0 0
-+0 0 0  0 0 0  80 80 80  102 109 134  68 82 130  97 107 139
-+118 119 119  0 0 0  0 0 0  0 0 0  0 0 0  1 2 4
-+96 96 96  137 138 138  132 132 134  132 132 134  39 56 109  141 141 145
-+66 66 66  0 0 0  0 0 0  0 0 0  55 55 55  146 146 148
-+67 81 125  82 95 139  141 141 145  66 66 66  0 0 0  0 0 0
-+0 0 1  66 66 66  134 136 146  67 80 128  82 95 139  96 96 96
-+0 1 1  0 0 0  0 0 0  31 31 31  118 119 119  68 81 130
-+74 87 130  132 132 134  31 31 31  0 0 1  0 0 0  2 3 5
-+96 96 96  141 141 145  82 95 139  102 109 134  146 146 148  20 20 21
-+0 0 0  0 0 0  0 0 0  118 119 119  102 108 129  44 58 112
-+102 108 129  6 7 9  0 0 0  0 0 0  80 80 80  146 146 148
-+67 81 125  67 81 125  137 138 138  137 138 138  137 138 138  137 138 138
-+141 141 145  134 136 146  61 75 125  97 107 139  80 80 80  0 1 1
-+0 0 0  5 5 5  96 96 96  134 136 146  80 93 136  102 109 134
-+141 141 145  137 138 138  137 138 138  141 141 145  137 138 138  120 125 141
-+59 74 124  59 74 124  58 73 123  59 74 124  57 72 122  58 73 123
-+58 73 123  58 73 123  54 70 120  31 47 105  93 98 116  66 66 66
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  96 96 96
-+71 84 128  25 42 101  93 98 116  66 66 66  0 1 1  0 0 0
-+0 0 0  0 0 0  0 0 0  96 96 96  137 138 138  132 132 134
-+146 146 148  62 76 125  137 138 138  44 44 44  0 0 0  0 0 0
-+0 0 0  80 80 80  141 141 145  80 93 136  102 109 134  146 146 148
-+31 31 31  0 0 0  0 0 0  0 0 0  96 96 96  120 125 141
-+29 45 103  134 136 146  44 44 44  0 0 0  0 0 0  0 0 0
-+66 66 66  146 146 148  74 87 130  71 84 128  146 146 148  66 66 66
-+0 0 0  0 0 0  0 0 0  55 55 55  134 136 146  36 52 108
-+141 141 145  44 44 44  0 0 0  0 0 0  0 0 0  5 5 5
-+118 119 119  141 141 145  137 138 138  44 44 44  0 0 0  0 0 0
-+0 0 0  0 0 0  44 44 44  120 125 141  49 65 117  102 109 134
-+118 119 119  0 0 0  0 0 0  0 0 0  6 7 9  96 96 96
-+141 141 145  132 132 134  132 132 134  44 44 44  0 0 0  0 0 0
-+0 0 0  55 55 55  137 138 138  27 44 102  39 56 109  118 119 119
-+12 14 18  0 0 0  0 0 0  0 0 0  6 7 9  96 96 96
-+137 138 138  96 96 96  6 7 9  0 0 0  0 0 0  0 0 0
-+0 0 0  20 20 21  118 119 119  132 132 134  44 44 44  0 0 0
-+0 0 0  0 0 0  0 0 0  96 96 96  44 60 114  43 59 113
-+44 60 114  35 51 108  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  32 48 105  40 56 111  40 56 111  40 56 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  38 54 110  39 55 111
-+28 45 102  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  70 85 132
-+71 85 132  71 85 132  72 85 132  65 79 128  31 47 105  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 100  61 75 125  74 87 134  72 85 132  73 86 133
-+72 85 132  73 86 133  73 86 133  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  73 86 134
-+74 87 134  75 88 134  74 87 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  74 87 133
-+75 88 134  76 89 135  76 89 135  75 88 134  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 88 135  76 88 135  76 88 135  76 89 135  76 89 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 89 135  76 90 135  76 89 135  76 89 135  76 89 135
-+76 88 135  76 88 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  75 88 134
-+76 89 135  75 88 134  75 88 134  74 87 133  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  74 87 134  74 87 134  73 86 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 133  74 87 134
-+73 86 133  72 85 132  73 86 133  73 86 133  73 86 133  72 85 132
-+40 57 112  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+49 62 109  132 132 134  12 14 18  0 0 0  0 0 0  0 0 0
-+132 132 134  80 80 80  0 0 0  0 0 0  0 0 0  137 138 138
-+146 146 148  80 80 80  1 2 4  0 0 0  6 7 9  118 119 119
-+66 66 66  0 0 0  0 0 0  0 0 0  66 66 66  134 136 146
-+70 84 131  69 83 131  68 82 130  134 136 146  55 55 55  0 0 0
-+0 0 0  0 0 0  80 80 80  102 109 134  68 82 130  97 107 139
-+118 119 119  0 0 0  0 0 0  0 0 0  0 0 1  66 66 66
-+146 146 148  67 81 125  93 98 116  67 81 125  55 67 113  146 146 148
-+6 7 9  0 0 0  0 0 0  0 0 0  118 119 119  93 98 116
-+34 50 106  69 83 130  102 109 134  118 119 119  6 7 9  0 0 0
-+0 0 0  31 31 31  132 132 134  68 82 130  82 95 139  96 96 96
-+0 1 1  0 0 0  0 0 0  31 31 31  118 119 119  67 81 129
-+97 107 139  96 96 96  5 5 5  0 0 0  0 0 0  31 31 31
-+132 132 134  76 90 135  67 80 128  70 83 130  134 136 146  66 66 66
-+0 0 0  0 0 0  0 0 0  66 66 66  134 136 146  39 56 109
-+118 119 119  6 7 9  0 0 0  0 0 0  12 14 18  96 96 96
-+137 138 138  137 138 138  141 141 145  141 141 145  102 109 134  71 84 128
-+61 75 125  60 75 125  61 75 125  97 107 139  96 96 96  2 3 5
-+0 0 0  0 0 0  44 44 44  118 119 119  137 138 138  141 141 145
-+141 141 145  141 141 145  102 109 134  71 84 128  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  58 73 123  57 72 122  58 73 123
-+58 73 123  58 73 123  52 67 118  25 42 101  93 98 116  66 66 66
-+0 0 0  0 0 0  0 0 0  0 0 0  1 2 4  2 3 5
-+2 3 5  2 3 5  2 3 5  2 3 5  0 0 0  96 96 96
-+71 84 128  25 42 101  93 98 116  66 66 66  0 1 1  0 0 0
-+0 0 0  0 0 0  96 96 96  146 146 148  97 107 139  102 109 134
-+80 93 136  69 82 127  118 119 119  12 14 18  0 0 0  0 0 0
-+20 20 21  118 119 119  80 93 136  57 72 122  58 72 120  120 125 141
-+96 96 96  0 0 0  0 0 0  0 0 0  44 44 44  146 146 148
-+55 67 113  132 132 134  6 7 9  0 0 0  0 0 0  0 0 0
-+132 132 134  102 108 129  25 42 101  25 42 101  102 108 129  132 132 134
-+0 0 0  0 0 0  0 0 0  6 7 9  134 136 146  67 81 125
-+146 146 148  0 0 0  0 0 0  0 0 0  0 0 0  80 80 80
-+141 141 145  74 87 130  120 125 141  146 146 148  6 7 9  0 0 0
-+0 0 0  0 0 0  44 44 44  120 125 141  49 65 117  141 141 145
-+66 66 66  0 0 0  0 0 0  0 0 0  44 44 44  146 146 148
-+49 62 109  25 42 101  102 109 134  118 119 119  6 7 9  0 0 0
-+0 0 0  12 14 18  118 119 119  49 62 109  39 56 109  118 119 119
-+12 14 18  0 0 0  0 0 0  0 0 0  96 96 96  141 141 145
-+71 84 128  141 141 145  44 44 44  0 0 0  0 0 0  0 0 0
-+1 2 4  137 138 138  120 125 141  102 109 134  146 146 148  6 7 9
-+0 0 0  0 0 0  0 0 0  80 80 80  44 60 114  44 60 114
-+44 60 114  33 49 106  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  35 52 107  40 56 111  40 56 111  40 56 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+26 43 102  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+70 85 132  71 85 132  71 85 132  73 86 133  55 70 121  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  29 47 104  64 78 127  74 87 133  72 85 132
-+73 86 133  72 85 132  73 86 133  74 87 134  73 86 133  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+73 86 134  74 87 134  75 88 134  74 87 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+74 87 133  75 88 134  75 88 134  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 88 135  76 88 135  76 89 135
-+76 89 135  76 90 135  76 90 135  76 90 135  76 89 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 89 135  76 90 135
-+76 90 135  76 90 135  76 89 135  76 89 135  76 88 135  76 88 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  75 88 134  76 89 135
-+75 88 134  75 88 134  74 87 133  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  74 87 134
-+74 87 134  74 87 134  73 86 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  73 86 133  74 87 134  73 86 133
-+72 85 132  73 86 133  73 86 133  72 85 132  73 85 132  50 65 118
-+25 42 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+33 50 105  134 136 146  31 31 31  0 0 0  0 0 0  0 0 0
-+55 55 55  20 20 21  0 0 0  0 0 0  20 20 21  146 146 148
-+102 109 134  118 119 119  6 7 9  0 0 0  0 0 0  55 55 55
-+20 20 21  0 0 0  0 0 0  0 0 0  96 96 96  120 125 141
-+69 83 131  69 83 131  68 82 130  134 136 146  55 55 55  0 0 0
-+0 0 0  0 0 0  80 80 80  102 109 134  68 82 130  97 107 139
-+118 119 119  0 0 0  0 0 0  0 0 0  6 7 9  93 98 116
-+71 84 128  24 41 100  25 42 101  25 42 101  67 81 125  132 132 134
-+0 0 0  0 0 0  0 0 0  0 0 0  118 119 119  118 119 119
-+118 119 119  118 119 119  118 119 119  96 96 96  12 14 18  0 0 0
-+0 0 0  12 14 18  118 119 119  73 86 130  82 95 139  96 96 96
-+0 1 1  0 0 0  0 0 0  31 31 31  118 119 119  67 81 129
-+102 109 134  96 96 96  0 0 0  0 0 0  0 0 0  31 31 31
-+118 119 119  118 119 119  118 119 119  118 119 119  132 132 134  66 66 66
-+0 0 0  0 0 0  0 0 0  31 31 31  146 146 148  39 56 109
-+134 136 146  44 44 44  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  20 20 21  44 44 44  66 66 66  96 96 96  132 132 134
-+134 136 146  74 87 130  61 75 125  80 93 136  132 132 134  20 20 21
-+0 0 0  0 0 0  0 0 0  0 0 0  6 7 9  31 31 31
-+44 44 44  80 80 80  118 119 119  132 132 134  120 125 141  68 81 126
-+59 74 124  59 74 124  59 74 124  57 72 122  58 73 123  58 73 123
-+58 73 123  57 72 122  46 61 115  23 40 99  93 98 116  66 66 66
-+0 0 0  0 0 0  0 0 0  0 0 0  66 66 66  80 80 80
-+80 80 80  80 80 80  80 80 80  80 80 80  80 80 80  132 132 134
-+71 84 128  25 42 101  93 98 116  66 66 66  0 1 1  0 0 0
-+0 0 0  2 3 5  141 141 145  80 93 136  56 70 122  54 70 120
-+55 70 121  80 93 136  96 96 96  0 0 0  0 0 0  0 0 0
-+31 31 31  118 119 119  118 119 119  118 119 119  118 119 119  132 132 134
-+96 96 96  0 0 0  0 0 0  0 0 0  0 1 1  146 146 148
-+74 87 130  96 96 96  6 7 9  0 0 0  0 0 0  12 14 18
-+118 119 119  118 119 119  118 119 119  118 119 119  118 119 119  118 119 119
-+0 0 0  0 0 0  0 0 0  1 2 4  118 119 119  102 108 129
-+132 132 134  0 0 0  0 0 0  0 0 0  0 0 0  132 132 134
-+97 107 139  50 65 118  50 65 118  141 141 145  55 55 55  0 0 0
-+0 0 0  0 0 0  44 44 44  120 125 141  49 65 117  146 146 148
-+31 31 31  0 0 0  0 0 0  0 0 0  96 96 96  102 108 129
-+25 42 101  25 42 101  36 52 108  132 132 134  31 31 31  0 0 0
-+0 0 0  0 0 0  118 119 119  67 81 125  38 54 109  118 119 119
-+12 14 18  0 0 0  0 0 0  12 14 18  118 119 119  55 67 113
-+25 42 101  93 98 116  80 80 80  0 1 1  0 0 0  0 0 0
-+44 44 44  141 141 145  49 63 116  49 63 116  134 136 146  31 31 31
-+0 0 0  0 0 0  0 0 0  80 80 80  44 60 114  44 60 114
-+43 59 113  31 47 105  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  37 53 109  40 56 111  40 56 111  40 56 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  37 53 109
-+26 43 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+70 85 132  71 85 132  72 84 131  72 85 132  73 86 133  43 58 114
-+23 40 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  36 52 108  68 82 130  73 86 133
-+73 86 133  73 86 133  72 85 132  73 86 133  74 87 134  73 86 133
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+73 86 134  73 86 134  74 87 134  75 88 134  74 87 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+74 87 133  74 87 133  74 87 133  75 88 134  76 89 135  75 88 134
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 88 135  76 88 135
-+76 88 135  76 89 135  76 89 135  76 89 135  76 90 135  76 90 135
-+76 89 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 89 135  76 90 135  76 90 135  76 90 135  76 89 135
-+76 89 135  76 89 135  76 88 135  76 88 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  75 88 134  76 89 135  76 89 135  75 88 134
-+74 87 133  74 87 133  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  74 87 134  75 88 134
-+74 87 134  73 86 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 133  72 85 132
-+73 86 133  73 86 133  72 85 132  73 86 133  59 74 124  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  102 109 134  80 80 80  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  80 80 80  134 136 146
-+80 93 136  134 136 146  20 20 21  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 1  132 132 134  97 107 139
-+69 83 131  68 82 130  69 83 131  134 136 146  55 55 55  0 0 0
-+0 0 0  0 0 0  80 80 80  102 109 134  67 81 129  97 107 139
-+118 119 119  0 0 0  0 0 0  0 0 0  20 20 21  118 119 119
-+42 57 112  24 41 100  25 42 101  25 42 101  67 81 125  118 119 119
-+0 0 0  0 0 0  0 0 0  0 0 0  12 14 18  12 14 18
-+12 14 18  12 14 18  12 14 18  5 5 5  0 0 0  0 0 0
-+0 0 0  0 0 0  118 119 119  80 93 136  82 95 139  96 96 96
-+0 1 1  0 0 0  0 0 0  31 31 31  118 119 119  67 81 129
-+102 109 134  80 80 80  0 0 0  0 0 0  0 0 0  5 5 5
-+12 14 18  12 14 18  12 14 18  12 14 18  20 20 21  0 0 0
-+0 0 0  0 0 0  0 0 0  5 5 5  146 146 148  27 44 102
-+93 98 116  137 138 138  55 55 55  12 14 18  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  20 20 21
-+96 96 96  134 136 146  66 80 127  66 80 127  120 125 141  118 119 119
-+44 44 44  5 5 5  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  44 44 44  118 119 119  120 125 141
-+59 74 124  59 74 124  59 74 124  57 72 122  58 73 123  58 73 123
-+58 73 123  57 72 122  37 53 109  23 40 100  80 93 136  66 66 66
-+0 0 0  0 0 0  0 0 0  0 0 0  118 119 119  120 125 141
-+74 87 130  80 93 136  80 93 136  80 93 136  80 93 136  74 87 130
-+49 62 109  24 41 100  93 98 116  66 66 66  0 1 1  0 0 0
-+0 0 0  31 31 31  141 141 145  56 70 122  55 70 121  54 70 120
-+55 70 121  82 95 139  96 96 96  0 0 0  0 0 0  0 0 0
-+5 5 5  12 14 18  12 14 18  12 14 18  12 14 18  20 20 21
-+0 1 1  0 0 0  0 0 0  0 0 0  0 0 0  141 141 145
-+93 98 116  96 96 96  5 5 5  0 0 0  0 0 0  2 3 5
-+12 14 18  12 14 18  12 14 18  12 14 18  12 14 18  6 7 9
-+0 0 0  0 0 0  0 0 0  0 0 0  96 96 96  102 109 134
-+118 119 119  0 0 0  0 0 0  0 0 0  0 0 0  146 146 148
-+68 81 126  50 65 118  50 65 118  120 125 141  66 66 66  0 0 0
-+0 0 0  0 0 0  44 44 44  120 125 141  55 69 119  146 146 148
-+12 14 18  0 0 0  0 0 0  0 0 0  96 96 96  71 84 128
-+25 42 101  25 42 101  34 50 106  120 125 141  31 31 31  0 0 0
-+0 0 0  0 0 0  96 96 96  71 84 128  38 54 109  118 119 119
-+12 14 18  0 0 0  0 0 0  20 20 21  118 119 119  29 45 103
-+25 42 101  74 87 130  80 80 80  0 1 1  0 0 0  0 0 0
-+44 44 44  120 125 141  45 60 114  45 60 114  134 136 146  31 31 31
-+0 0 0  0 0 0  0 0 0  80 80 80  44 60 114  44 60 114
-+42 58 112  29 46 104  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 101
-+24 41 100  40 56 111  40 56 111  40 56 111  40 56 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  36 52 108
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+71 85 132  70 84 131  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  72 85 132  72 85 132  73 86 133
-+32 50 106  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 100  23 40 100  44 60 114  71 85 132
-+73 86 133  72 85 132  73 86 133  73 86 133  73 86 133  74 87 134
-+74 87 134  73 86 133  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 134  73 86 134  74 87 134  75 88 134
-+74 87 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 133  75 88 134  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 88 135  76 88 135  76 88 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 89 135  76 90 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 88 135  76 88 135  76 88 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+75 88 134  76 89 135  76 89 135  75 88 134  74 87 133  74 87 133
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 134  74 87 134  73 86 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 133  72 85 132
-+72 85 132  73 86 133  73 86 133  66 80 128  25 42 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  80 93 136  118 119 119  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  118 119 119  120 125 141
-+72 85 132  134 136 146  55 55 55  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  20 20 21  132 132 134  74 87 133
-+68 82 130  69 83 131  69 83 131  134 136 146  55 55 55  0 0 0
-+0 0 0  0 0 0  80 80 80  102 109 134  68 82 130  97 107 139
-+118 119 119  0 0 0  0 0 0  0 0 0  20 20 21  118 119 119
-+38 54 109  25 42 101  25 42 101  25 42 101  67 81 125  118 119 119
-+0 0 0  0 0 0  0 0 0  0 0 0  80 80 80  80 80 80
-+80 80 80  80 80 80  80 80 80  80 80 80  80 80 80  80 80 80
-+80 80 80  80 80 80  132 132 134  76 90 135  82 95 139  96 96 96
-+0 1 1  0 0 0  0 0 0  31 31 31  118 119 119  67 81 129
-+102 109 134  80 80 80  0 0 0  0 0 0  0 0 0  20 20 21
-+80 80 80  80 80 80  80 80 80  80 80 80  80 80 80  80 80 80
-+80 80 80  80 80 80  80 80 80  80 80 80  146 146 148  26 43 102
-+29 45 103  74 87 130  137 138 138  118 119 119  96 96 96  80 80 80
-+44 44 44  12 14 18  0 0 0  0 0 0  0 0 0  0 0 0
-+6 7 9  132 132 134  102 109 134  61 75 125  71 84 128  120 125 141
-+132 132 134  118 119 119  96 96 96  66 66 66  31 31 31  5 5 5
-+0 0 0  0 0 0  0 0 0  0 0 0  44 44 44  137 138 138
-+64 79 127  59 74 124  58 73 123  57 72 122  58 73 123  58 73 123
-+58 73 123  57 72 122  27 44 103  24 41 100  80 93 136  66 66 66
-+0 0 0  0 0 0  0 0 0  0 0 0  118 119 119  67 81 125
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  97 107 139  66 66 66  0 1 1  0 0 0
-+0 0 0  44 44 44  132 132 134  56 70 122  55 70 121  55 70 121
-+55 70 121  82 95 139  96 96 96  0 0 0  0 0 0  0 0 0
-+20 20 21  66 66 66  80 80 80  80 80 80  80 80 80  80 80 80
-+80 80 80  80 80 80  80 80 80  80 80 80  80 80 80  141 141 145
-+93 98 116  96 96 96  5 5 5  0 0 0  0 0 0  6 7 9
-+66 66 66  80 80 80  80 80 80  80 80 80  80 80 80  80 80 80
-+80 80 80  80 80 80  80 80 80  80 80 80  118 119 119  102 108 129
-+132 132 134  0 0 0  0 0 0  0 0 0  0 0 0  146 146 148
-+74 87 130  50 65 118  50 65 118  132 132 134  66 66 66  0 0 0
-+0 0 0  0 0 0  44 44 44  120 125 141  54 69 120  146 146 148
-+20 20 21  0 0 0  0 0 0  0 0 0  96 96 96  74 87 130
-+25 42 101  25 42 101  36 52 108  120 125 141  31 31 31  0 0 0
-+0 0 0  0 0 0  118 119 119  71 84 128  38 54 109  118 119 119
-+12 14 18  0 0 0  0 0 0  20 20 21  118 119 119  30 46 104
-+25 42 101  74 87 130  80 80 80  0 1 1  0 0 0  0 0 0
-+44 44 44  120 125 141  45 60 114  45 60 114  134 136 146  31 31 31
-+0 0 0  0 0 0  0 0 0  80 80 80  44 60 114  44 60 114
-+40 57 112  27 44 103  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+27 44 102  40 56 111  40 56 111  39 55 111  40 56 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  34 50 107
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+70 84 131  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  70 85 132  71 85 132  72 84 131  72 85 132
-+65 79 128  29 46 103  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  23 39 99  48 64 116
-+73 86 133  73 86 133  72 85 132  73 86 133  72 85 132  73 86 133
-+73 86 133  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 134  74 87 134
-+75 88 134  74 87 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  74 87 133  75 88 134
-+75 88 134  76 89 135  76 89 135  75 88 134  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 88 135  76 88 135  76 88 135  76 88 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 90 135
-+76 90 135  76 90 135  76 90 135  76 90 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 88 135
-+76 88 135  76 88 135  76 88 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  75 88 134  76 89 135
-+76 89 135  75 88 134  75 88 134  74 87 133  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  74 87 134  75 88 134  74 87 134  73 86 134  73 86 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 133  74 87 134  73 86 133  72 85 132  73 86 133
-+72 85 132  74 87 133  65 79 128  29 45 103  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  71 84 128  141 141 145  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  12 14 18  132 132 134  82 95 139
-+70 84 131  120 125 141  96 96 96  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  55 55 55  137 138 138  68 82 130
-+69 83 131  69 83 131  69 83 131  134 136 146  55 55 55  0 0 0
-+0 0 0  0 0 0  80 80 80  102 109 134  68 82 130  97 107 139
-+118 119 119  0 0 0  0 0 0  0 0 0  20 20 21  118 119 119
-+36 52 108  25 42 101  25 42 101  25 42 101  55 67 113  146 146 148
-+0 0 0  0 0 0  0 0 0  0 0 0  132 132 134  120 125 141
-+102 109 134  102 109 134  102 109 134  102 109 134  102 109 134  102 109 134
-+102 109 134  102 109 134  120 125 141  73 86 130  82 95 139  96 96 96
-+0 1 1  0 0 0  0 0 0  31 31 31  118 119 119  67 81 129
-+102 109 134  96 96 96  0 0 0  0 0 0  0 0 0  44 44 44
-+137 138 138  102 109 134  102 109 134  102 109 134  102 109 134  102 109 134
-+102 109 134  93 98 116  93 98 116  93 98 116  93 98 116  25 42 101
-+25 42 101  25 42 101  44 58 112  93 98 116  134 136 146  132 132 134
-+141 141 145  141 141 145  118 119 119  31 31 31  0 0 0  0 0 0
-+0 0 0  80 80 80  120 125 141  61 75 125  60 75 125  63 77 126
-+80 93 136  120 125 141  141 141 145  137 138 138  141 141 145  137 138 138
-+96 96 96  6 7 9  0 0 0  0 0 0  5 5 5  118 119 119
-+76 90 135  59 74 124  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  53 68 119  23 39 99  25 42 101  80 93 136  66 66 66
-+0 0 0  0 0 0  0 0 0  0 0 0  118 119 119  71 84 128
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 100  102 109 134  66 66 66  0 1 1  0 0 0
-+0 0 0  55 55 55  120 125 141  56 70 122  55 70 121  55 70 121
-+55 70 121  74 87 130  118 119 119  6 7 9  0 0 0  0 0 0
-+31 31 31  132 132 134  102 109 134  102 109 134  102 109 134  102 109 134
-+102 108 129  93 98 116  93 98 116  93 98 116  93 98 116  93 98 116
-+67 81 125  118 119 119  6 7 9  0 0 0  0 0 0  6 7 9
-+132 132 134  102 109 134  93 98 116  93 98 116  93 98 116  93 98 116
-+93 98 116  93 98 116  93 98 116  93 98 116  93 98 116  67 81 125
-+146 146 148  0 0 0  0 0 0  0 0 0  0 0 0  118 119 119
-+120 125 141  49 65 117  71 84 128  146 146 148  31 31 31  0 0 0
-+0 0 0  0 0 0  44 44 44  120 125 141  48 64 117  146 146 148
-+44 44 44  0 0 0  0 0 0  0 0 0  66 66 66  120 125 141
-+29 46 103  25 42 101  55 67 113  118 119 119  20 20 21  0 0 0
-+0 0 0  5 5 5  118 119 119  55 67 113  39 56 109  118 119 119
-+12 14 18  0 0 0  0 0 0  20 20 21  118 119 119  30 46 104
-+25 42 101  74 87 130  80 80 80  0 1 1  0 0 0  0 0 0
-+44 44 44  120 125 141  45 60 114  45 60 114  134 136 146  31 31 31
-+0 0 0  0 0 0  0 0 0  80 80 80  44 60 114  44 60 114
-+40 56 111  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+29 46 103  40 56 111  40 56 111  40 56 111  39 55 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  32 50 106
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+70 84 131  71 85 132  70 84 131  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  70 85 132  71 85 132  71 85 132  71 84 131
-+72 85 132  55 70 121  26 43 102  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+47 63 116  74 87 134  73 86 133  72 85 132  73 86 133  72 85 132
-+73 86 133  74 87 134  73 86 133  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 134  74 87 134
-+74 87 134  75 88 134  74 87 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  74 87 133
-+74 87 133  75 88 134  75 88 134  76 89 135  76 89 135  75 88 134
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 88 135  76 88 135
-+76 88 135  76 88 135  76 88 135  76 88 135  76 88 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 88 135  76 88 135
-+76 88 135  76 88 135  76 88 135  76 88 135  76 88 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  75 88 134  76 89 135  75 88 134
-+75 88 134  74 87 133  74 87 133  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+74 87 134  75 88 134  74 87 134  73 86 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  73 86 133
-+74 87 134  74 87 134  73 86 133  72 85 132  73 86 133  73 86 133
-+73 86 133  67 80 128  34 50 107  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+33 49 106  74 87 130  146 146 148  20 20 21  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  44 44 44  137 138 138  71 85 132
-+71 85 132  97 107 139  137 138 138  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  80 80 80  120 125 141  69 83 131
-+69 83 131  69 83 131  69 83 131  134 136 146  55 55 55  0 0 0
-+0 0 0  0 0 0  80 80 80  102 109 134  68 82 130  97 107 139
-+118 119 119  0 0 0  0 0 0  0 0 0  31 31 31  120 125 141
-+35 52 107  25 42 101  25 42 101  25 42 101  34 50 106  146 146 148
-+44 44 44  0 0 0  0 0 0  0 0 0  80 80 80  134 136 146
-+73 87 131  67 81 129  120 125 141  141 141 145  141 141 145  137 138 138
-+120 125 141  120 125 141  102 109 134  67 80 128  82 95 139  96 96 96
-+0 1 1  0 0 0  0 0 0  31 31 31  118 119 119  67 81 129
-+80 93 136  118 119 119  20 20 21  0 0 0  0 0 0  20 20 21
-+118 119 119  102 109 134  64 78 127  74 87 130  134 136 146  141 141 145
-+137 138 138  120 125 141  102 109 134  102 108 129  67 81 125  93 98 116
-+141 141 145  141 141 145  137 138 138  137 138 138  137 138 138  132 132 134
-+25 42 101  55 67 113  120 125 141  118 119 119  0 0 0  0 0 0
-+0 0 0  80 80 80  120 125 141  120 125 141  141 141 145  137 138 138
-+137 138 138  137 138 138  141 141 145  102 109 134  62 76 125  97 107 139
-+146 146 148  55 55 55  0 0 0  0 0 0  1 2 4  118 119 119
-+74 87 130  59 74 124  58 73 123  58 73 123  58 73 123  58 73 123
-+59 74 124  40 57 112  23 40 100  25 42 101  80 93 136  66 66 66
-+0 0 0  0 0 0  0 0 0  0 0 0  118 119 119  71 84 128
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  23 40 99  102 109 134  66 66 66  0 1 1  0 0 0
-+0 0 0  66 66 66  120 125 141  55 70 121  55 70 121  55 70 121
-+55 70 121  63 77 126  132 132 134  31 31 31  0 0 0  0 0 0
-+6 7 9  118 119 119  120 125 141  55 70 121  62 76 125  120 125 141
-+141 141 145  141 141 145  132 132 134  120 125 141  102 108 129  93 98 116
-+38 54 109  134 136 146  20 20 21  0 0 0  0 0 0  0 0 0
-+93 98 116  132 132 134  30 48 104  27 43 102  102 109 134  141 141 145
-+141 141 145  132 132 134  120 125 141  102 108 129  74 87 130  49 65 116
-+141 141 145  44 44 44  0 0 0  0 0 0  0 0 0  31 31 31
-+146 146 148  132 132 134  141 141 145  118 119 119  0 0 0  0 0 0
-+0 0 0  0 0 0  44 44 44  120 125 141  48 64 117  120 125 141
-+96 96 96  0 0 0  0 0 0  0 0 0  20 20 21  137 138 138
-+102 108 129  67 81 125  141 141 145  80 80 80  0 0 0  0 0 0
-+0 0 0  31 31 31  132 132 134  33 50 105  39 56 109  118 119 119
-+12 14 18  0 0 0  0 0 0  20 20 21  118 119 119  30 46 104
-+25 42 101  74 87 130  80 80 80  0 1 1  0 0 0  0 0 0
-+44 44 44  120 125 141  45 60 114  45 60 114  134 136 146  31 31 31
-+0 0 0  0 0 0  0 0 0  80 80 80  44 60 114  43 60 114
-+38 54 110  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+32 48 105  40 56 111  40 56 111  40 56 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  39 55 111  31 47 105
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+70 84 131  70 84 131  71 85 132  70 84 131  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  70 85 132  70 85 132  71 85 132
-+72 85 132  72 85 132  44 61 114  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+26 43 101  50 65 118  74 87 133  73 86 133  73 86 133  73 86 133
-+72 85 132  73 86 133  74 87 134  73 86 133  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  73 86 134
-+74 87 134  74 87 134  75 88 134  74 87 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  74 87 133  75 88 134  75 88 134  75 88 134  76 89 135
-+75 88 134  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 88 135
-+76 88 135  76 88 135  76 88 135  76 88 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  75 88 134  76 89 135  76 89 135  75 88 134  75 88 134
-+74 87 133  74 87 133  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  74 87 134  75 88 134
-+75 88 134  74 87 134  73 86 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 133  74 87 134
-+73 86 133  73 86 133  72 85 132  73 86 133  73 86 133  72 85 132
-+70 84 131  36 52 108  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 102
-+66 80 128  72 85 132  141 141 145  66 66 66  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  80 80 80  120 125 141  71 85 132
-+70 84 131  76 90 135  146 146 148  31 31 31  0 0 0  0 0 0
-+0 0 0  0 0 0  1 2 4  96 96 96  102 109 134  68 82 130
-+69 83 131  69 83 131  69 83 131  134 136 146  55 55 55  0 0 0
-+0 0 0  0 0 0  80 80 80  102 109 134  68 82 130  97 107 139
-+118 119 119  0 0 0  0 0 0  0 0 0  31 31 31  120 125 141
-+35 52 107  25 42 101  25 42 101  25 42 101  25 42 101  120 125 141
-+118 119 119  0 0 0  0 0 0  0 0 0  12 14 18  118 119 119
-+132 132 134  132 132 134  118 119 119  55 55 55  31 31 31  44 44 44
-+66 66 66  118 119 119  134 136 146  69 82 127  82 95 139  96 96 96
-+0 1 1  0 0 0  0 0 0  31 31 31  118 119 119  68 81 130
-+70 83 130  141 141 145  55 55 55  0 0 1  0 0 0  0 0 0
-+55 55 55  132 132 134  132 132 134  132 132 134  118 119 119  31 31 31
-+31 31 31  55 55 55  66 66 66  141 141 145  102 109 134  93 98 116
-+96 96 96  31 31 31  12 14 18  0 0 0  20 20 21  118 119 119
-+132 132 134  102 109 134  134 136 146  80 80 80  0 0 0  0 0 0
-+0 0 0  118 119 119  102 109 134  132 132 134  80 80 80  20 20 21
-+6 7 9  0 0 0  44 44 44  132 132 134  120 125 141  120 125 141
-+137 138 138  31 31 31  0 0 0  0 0 0  31 31 31  132 132 134
-+69 82 127  58 73 123  57 72 122  58 73 123  58 73 123  57 72 122
-+60 75 125  28 45 103  24 41 100  25 42 101  80 93 136  66 66 66
-+0 0 0  0 0 0  0 0 0  0 0 0  118 119 119  71 84 128
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  27 44 102  102 109 134  66 66 66  0 1 1  0 0 0
-+0 0 0  66 66 66  120 125 141  55 70 121  54 70 120  55 70 121
-+55 70 121  58 73 123  120 125 141  80 80 80  0 0 0  0 0 0
-+0 0 0  44 44 44  118 119 119  132 132 134  132 132 134  118 119 119
-+31 31 31  31 31 31  55 55 55  66 66 66  132 132 134  134 136 146
-+25 42 101  102 109 134  96 96 96  0 0 0  0 0 0  0 0 0
-+20 20 21  118 119 119  132 132 134  132 132 134  132 132 134  44 44 44
-+31 31 31  44 44 44  55 55 55  118 119 119  134 136 146  49 64 117
-+120 125 141  118 119 119  0 0 0  0 0 0  0 0 0  0 0 0
-+31 31 31  80 80 80  66 66 66  0 0 0  31 31 31  5 5 5
-+0 0 0  0 0 0  44 44 44  120 125 141  48 64 116  74 87 130
-+137 138 138  31 31 31  0 0 0  0 0 0  0 0 0  44 44 44
-+118 119 119  118 119 119  80 80 80  6 7 9  0 0 0  0 0 0
-+1 2 4  96 96 96  120 125 141  26 43 101  39 56 109  118 119 119
-+12 14 18  0 0 0  0 0 0  20 20 21  118 119 119  30 46 104
-+25 42 101  74 87 130  80 80 80  0 1 1  0 0 0  0 0 0
-+44 44 44  120 125 141  45 60 114  45 60 114  134 136 146  31 31 31
-+0 0 0  0 0 0  0 0 0  80 80 80  44 60 114  43 59 113
-+35 51 108  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+35 52 107  40 56 111  40 56 111  40 56 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  38 54 110  29 46 104
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+70 84 131  69 83 130  70 84 131  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  70 85 132
-+72 84 131  72 85 132  73 85 132  37 53 109  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  55 69 121  72 85 132  73 86 133  72 85 132
-+73 86 133  73 86 133  73 86 133  74 87 134  74 87 134  73 86 133
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  74 87 133  74 87 133
-+75 88 134  75 88 134  75 88 134  76 89 135  75 88 134  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  75 88 134  76 89 135  76 89 135
-+75 88 134  75 88 134  75 88 134  74 87 133  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 134  75 88 134  75 88 134  74 87 134
-+73 86 134  73 86 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  73 86 133  74 87 134  73 86 133
-+72 85 132  73 86 133  73 86 133  72 85 132  73 86 133  71 85 132
-+37 53 109  23 40 99  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 101  61 75 125
-+72 85 132  71 84 131  120 125 141  96 96 96  0 0 0  0 0 0
-+0 0 0  0 0 0  5 5 5  118 119 119  97 107 139  71 85 132
-+70 84 131  69 83 130  134 136 146  80 80 80  0 0 0  0 0 0
-+0 0 0  0 0 0  12 14 18  118 119 119  82 95 139  69 83 131
-+69 83 131  69 83 131  69 83 131  134 136 146  55 55 55  0 0 0
-+0 0 0  0 0 0  80 80 80  102 109 134  68 82 130  97 107 139
-+118 119 119  0 0 0  0 0 0  0 0 0  31 31 31  120 125 141
-+35 52 107  25 42 101  25 42 101  25 42 101  25 42 101  49 62 109
-+141 141 145  80 80 80  0 0 0  0 0 0  0 0 0  6 7 9
-+44 44 44  55 55 55  20 20 21  0 0 0  0 0 0  0 0 0
-+44 44 44  132 132 134  97 107 139  65 79 128  82 95 139  96 96 96
-+0 1 1  0 0 0  0 0 0  31 31 31  118 119 119  68 81 130
-+65 79 128  102 109 134  132 132 134  44 44 44  0 0 0  0 0 0
-+0 0 0  20 20 21  55 55 55  44 44 44  5 5 5  0 0 0
-+0 0 0  0 0 0  80 80 80  137 138 138  49 62 109  59 73 120
-+132 132 134  31 31 31  0 0 0  0 0 0  0 0 0  20 20 21
-+66 66 66  80 80 80  55 55 55  2 3 5  0 0 0  0 0 0
-+55 55 55  141 141 145  74 87 130  102 109 134  118 119 119  5 5 5
-+0 0 0  0 0 0  0 0 0  44 44 44  66 66 66  80 80 80
-+31 31 31  0 0 0  0 0 0  0 1 1  96 96 96  134 136 146
-+59 74 124  58 73 123  57 72 122  58 73 123  58 73 123  58 73 123
-+54 69 120  24 41 100  25 42 101  25 42 101  80 93 136  66 66 66
-+0 0 0  0 0 0  0 0 0  0 0 0  118 119 119  71 84 128
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  33 49 106  102 109 134  66 66 66  0 1 1  0 0 0
-+0 0 0  66 66 66  120 125 141  55 70 121  54 70 120  55 70 121
-+55 70 121  55 70 121  80 93 136  141 141 145  55 55 55  0 0 0
-+0 0 0  0 0 0  20 20 21  55 55 55  44 44 44  6 7 9
-+0 0 0  0 0 0  0 0 0  55 55 55  141 141 145  59 73 120
-+25 42 101  55 67 113  146 146 148  66 66 66  0 0 0  0 0 0
-+0 0 0  6 7 9  44 44 44  55 55 55  12 14 18  0 0 0
-+0 0 0  0 0 0  44 44 44  137 138 138  74 87 130  51 66 119
-+69 82 127  146 146 148  44 44 44  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  44 44 44  118 119 119  1 2 4
-+0 0 0  0 0 0  44 44 44  120 125 141  48 64 117  47 63 116
-+102 109 134  118 119 119  20 20 21  0 0 0  0 0 0  0 0 0
-+0 0 0  1 2 4  0 0 0  0 0 0  0 0 0  0 0 0
-+80 80 80  141 141 145  55 67 113  25 42 101  39 56 109  118 119 119
-+12 14 18  0 0 0  0 0 0  20 20 21  118 119 119  30 46 104
-+25 42 101  74 87 130  80 80 80  0 1 1  0 0 0  0 0 0
-+44 44 44  120 125 141  45 60 114  45 60 114  134 136 146  31 31 31
-+0 0 0  0 0 0  0 0 0  80 80 80  44 60 114  43 59 113
-+32 48 107  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+37 53 109  39 55 110  40 56 111  40 56 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  37 53 109  28 45 103
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+70 84 131  69 83 130  70 84 131  71 85 132  70 84 131  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  70 85 132
-+71 85 132  72 84 131  72 85 132  70 84 131  35 52 107  23 40 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  54 69 120  73 87 133  73 86 133
-+72 85 132  73 86 133  72 85 132  73 86 133  73 86 133  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 134  74 87 134  74 87 134  75 88 134
-+74 87 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+74 87 133  74 87 133  75 88 134  75 88 134  76 89 135  76 89 135
-+76 89 135  75 88 134  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  75 88 134  76 89 135  76 89 135  75 88 134  75 88 134
-+74 87 133  74 87 133  74 87 133  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  74 87 134  75 88 134  74 87 134  74 87 134  73 86 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 133  74 87 134  73 86 133  72 85 132
-+73 86 133  73 86 133  72 85 132  74 87 133  68 81 130  37 53 109
-+23 40 99  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  53 67 120  72 85 132
-+71 84 131  71 85 132  97 107 139  132 132 134  0 0 0  0 0 0
-+0 0 0  0 0 0  20 20 21  132 132 134  80 93 136  70 84 131
-+69 83 130  70 84 131  102 109 134  132 132 134  0 0 0  0 0 0
-+0 0 0  0 0 0  20 20 21  132 132 134  76 90 135  69 83 131
-+69 83 131  69 83 131  69 83 131  134 136 146  44 44 44  0 0 0
-+0 0 0  0 0 0  80 80 80  102 109 134  68 82 130  97 107 139
-+118 119 119  0 0 0  0 0 0  0 0 0  20 20 21  120 125 141
-+35 52 107  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+67 81 125  141 141 145  96 96 96  20 20 21  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  12 14 18  80 80 80
-+137 138 138  120 125 141  69 82 127  66 80 128  82 95 139  96 96 96
-+0 0 0  0 0 0  0 0 0  31 31 31  118 119 119  67 80 128
-+64 78 127  66 80 127  120 125 141  132 132 134  80 80 80  6 7 9
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+31 31 31  96 96 96  141 141 145  59 73 120  25 42 101  30 46 104
-+102 109 134  132 132 134  55 55 55  5 5 5  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  12 14 18  80 80 80
-+137 138 138  102 109 134  60 75 125  71 84 128  134 136 146  118 119 119
-+44 44 44  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  31 31 31  96 96 96  141 141 145  76 90 135
-+59 74 124  58 73 123  57 72 122  58 73 123  57 72 122  59 74 124
-+42 58 112  24 41 100  25 42 101  25 42 101  82 95 139  66 66 66
-+0 0 0  0 0 0  0 0 0  0 0 0  93 98 116  71 84 128
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  39 55 110  102 109 134  66 66 66  0 0 0  0 0 0
-+0 0 0  55 55 55  120 125 141  55 70 121  54 70 120  55 70 121
-+55 70 121  55 70 121  56 71 121  102 109 134  137 138 138  80 80 80
-+12 14 18  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  20 20 21  96 96 96  141 141 145  71 84 128  25 42 101
-+25 42 101  25 42 101  67 81 125  146 146 148  96 96 96  20 20 21
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+12 14 18  80 80 80  137 138 138  102 108 129  32 48 105  51 66 119
-+50 65 118  102 109 134  132 132 134  55 55 55  0 0 0  0 0 0
-+0 0 0  0 0 0  55 55 55  137 138 138  118 119 119  0 0 0
-+0 0 0  0 0 0  44 44 44  120 125 141  48 64 117  43 59 113
-+38 54 109  120 125 141  132 132 134  66 66 66  6 7 9  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  31 31 31  96 96 96
-+141 141 145  67 81 125  25 42 101  25 42 101  39 56 109  93 98 116
-+2 3 5  0 0 0  0 0 0  6 7 9  118 119 119  30 46 104
-+25 42 101  74 87 130  66 66 66  0 0 0  0 0 0  0 0 0
-+44 44 44  120 125 141  45 60 114  45 60 114  134 136 146  20 20 21
-+0 0 0  0 0 0  0 0 0  80 80 80  44 60 114  43 59 113
-+28 45 103  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+38 54 109  39 55 111  39 55 111  40 56 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  37 53 109  27 43 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+70 84 131  70 84 131  69 83 130  70 84 131  71 85 132  70 84 131
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+70 85 132  71 85 132  72 84 131  72 85 132  66 80 128  34 50 107
-+23 40 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  49 64 117  74 87 134
-+73 86 133  72 85 132  73 86 133  72 85 132  73 86 133  74 87 134
-+73 86 133  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  73 86 134  73 86 134  74 87 134
-+75 88 134  75 88 134  74 87 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 133  74 87 133  75 88 134  75 88 134
-+75 88 134  76 89 135  76 89 135  76 89 135  75 88 134  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  75 88 134  75 88 134  75 88 134  74 87 133
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 134  73 86 134  73 86 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 133  74 87 134  73 86 133  72 85 132  73 86 133
-+73 86 133  72 85 132  73 86 133  66 80 128  36 52 108  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 100  47 63 116  71 84 131  72 85 132
-+71 85 132  71 85 132  77 90 136  146 146 148  137 138 138  137 138 138
-+137 138 138  137 138 138  137 138 138  134 136 146  74 88 133  69 83 130
-+70 84 131  70 84 131  80 93 136  146 146 148  137 138 138  137 138 138
-+137 138 138  137 138 138  137 138 138  120 125 141  74 87 133  69 83 131
-+69 83 131  69 83 131  69 83 131  141 141 145  137 138 138  137 138 138
-+137 138 138  137 138 138  141 141 145  102 109 134  68 82 130  97 107 139
-+146 146 148  137 138 138  137 138 138  137 138 138  137 138 138  120 125 141
-+35 52 107  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  55 67 113  132 132 134  137 138 138  132 132 134  96 96 96
-+96 96 96  96 96 96  96 96 96  132 132 134  137 138 138  141 141 145
-+97 107 139  66 80 128  65 79 128  66 80 128  80 93 136  141 141 145
-+137 138 138  137 138 138  137 138 138  137 138 138  134 136 146  68 81 130
-+64 78 127  63 77 126  65 79 128  102 109 134  141 141 145  137 138 138
-+118 119 119  96 96 96  96 96 96  96 96 96  118 119 119  132 132 134
-+141 141 145  120 125 141  49 62 109  25 42 101  25 42 101  25 42 101
-+27 44 102  93 98 116  141 141 145  137 138 138  118 119 119  96 96 96
-+80 80 80  96 96 96  96 96 96  118 119 119  137 138 138  134 136 146
-+97 107 139  62 76 125  60 75 125  59 75 125  71 84 128  120 125 141
-+141 141 145  132 132 134  118 119 119  96 96 96  80 80 80  96 96 96
-+118 119 119  132 132 134  141 141 145  120 125 141  74 87 130  59 74 124
-+58 73 123  58 73 123  57 72 122  58 73 123  58 73 123  59 74 124
-+32 50 106  24 41 100  25 42 101  25 42 101  74 87 130  141 141 145
-+137 138 138  137 138 138  137 138 138  137 138 138  141 141 145  67 81 125
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+26 43 101  45 60 114  102 109 134  141 141 145  137 138 138  137 138 138
-+137 138 138  141 141 145  120 125 141  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  80 93 136  134 136 146
-+137 138 138  118 119 119  96 96 96  96 96 96  96 96 96  118 119 119
-+132 132 134  137 138 138  132 132 134  58 72 120  26 43 102  25 42 101
-+25 42 101  25 42 101  25 42 101  49 62 109  120 125 141  141 141 145
-+132 132 134  96 96 96  96 96 96  96 96 96  96 96 96  132 132 134
-+137 138 138  132 132 134  67 81 125  25 42 101  38 54 110  51 66 119
-+50 65 118  52 66 118  102 109 134  141 141 145  118 119 119  96 96 96
-+96 96 96  132 132 134  141 141 145  120 125 141  146 146 148  137 138 138
-+137 138 138  137 138 138  137 138 138  102 109 134  48 64 117  39 55 110
-+25 42 101  30 48 104  93 98 116  141 141 145  137 138 138  118 119 119
-+96 96 96  96 96 96  93 98 116  132 132 134  141 141 145  120 125 141
-+49 62 109  25 42 101  25 42 101  25 42 101  39 56 109  141 141 145
-+137 138 138  137 138 138  137 138 138  137 138 138  141 141 145  30 46 104
-+25 42 101  67 81 125  141 141 145  137 138 138  137 138 138  137 138 138
-+137 138 138  120 125 141  45 60 114  45 60 114  120 125 141  137 138 138
-+137 138 138  137 138 138  137 138 138  141 141 145  43 59 113  43 59 113
-+25 42 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  27 44 103
-+38 56 110  40 56 111  40 56 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  36 52 108  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+70 84 131  70 84 131  70 84 131  69 83 130  70 84 131  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+70 85 132  70 85 132  71 85 132  72 84 131  72 85 132  62 76 125
-+30 46 104  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  46 61 115
-+73 86 133  73 86 133  73 86 133  73 86 133  72 85 132  73 86 133
-+74 87 134  74 87 134  73 86 133  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  73 86 134
-+74 87 134  74 87 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  74 87 133  74 87 133
-+75 88 134  75 88 134  75 88 134  75 88 134  76 89 135  76 89 135
-+76 89 135  75 88 134  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+75 88 134  76 89 135  76 89 135  76 89 135  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 133  74 87 133  74 87 133  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  74 87 134  75 88 134
-+74 87 134  74 87 134  74 87 134  73 86 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 133  72 85 132  73 86 133  73 86 133
-+72 85 132  73 86 133  68 82 130  33 49 106  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  40 56 111  72 85 132  72 85 132  72 84 131
-+71 85 132  70 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  70 84 131  71 85 132  70 84 131  69 83 130
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  69 83 131  68 82 130  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  68 82 130  68 82 130  67 81 129
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  67 81 129
-+64 78 127  30 46 104  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  23 40 100  53 67 120  65 79 128  65 79 128  66 80 128
-+66 80 129  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  65 79 128  64 78 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  64 78 127  65 79 128
-+63 77 126  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  62 76 125  64 78 127  38 56 110  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  27 44 102  55 69 121  61 75 125  61 75 125  61 75 125
-+61 75 125  60 75 125  60 75 125  59 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  59 74 124  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  57 72 122  58 73 123  58 73 123  58 73 123  53 68 119
-+28 45 103  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+28 45 103  51 66 119  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  53 68 119
-+54 69 120  54 69 120  54 69 120  54 69 120  55 69 121  38 54 110
-+23 40 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  23 40 99  45 60 114  51 66 119
-+49 64 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 116  48 64 117  36 52 108
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  27 44 103  43 58 114  46 61 115  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+45 60 114  43 60 114  44 60 114  44 60 114  44 60 114  40 56 111
-+23 40 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  29 46 104
-+39 55 110  40 56 111  40 56 111  39 55 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  35 51 108  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  71 85 132
-+71 85 132  70 84 131  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  70 85 132  71 85 132  72 84 131  73 86 133
-+58 73 123  27 44 102  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 40 99
-+47 63 116  71 84 131  73 86 133  72 85 132  73 86 133  73 86 133
-+72 85 132  73 86 133  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 134  73 86 134  74 87 134  74 87 134  75 88 134
-+75 88 134  74 87 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 133  74 87 133  74 87 133
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  76 89 135  76 89 135  76 89 135  76 89 135
-+76 89 135  76 89 135  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 133  74 87 133  74 87 133  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  74 87 134  75 88 134  74 87 134  74 87 134  73 86 134
-+73 86 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 133  74 87 134
-+73 86 133  72 85 132  72 85 132  73 86 133  72 85 132  73 86 133
-+73 86 133  66 80 128  29 46 104  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  37 53 109  73 86 133  72 85 132  72 84 131  70 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  70 84 131  71 85 132  70 84 131  69 83 130  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  69 83 131  70 84 131
-+70 84 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  68 82 130  69 83 131  67 81 129  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 81 130  68 82 130
-+44 61 114  23 40 99  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  35 51 108  63 77 126  66 80 129  66 80 128  66 80 129
-+66 80 128  66 80 127  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  64 78 127  65 79 128  63 77 126
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  63 77 126  58 73 123  30 46 104  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  36 52 108  58 73 123  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  59 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  59 74 124  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+58 73 123  57 72 122  58 73 123  58 73 123  58 73 123  44 61 114
-+25 43 102  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+31 47 105  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  55 70 121  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 69 120  53 68 119  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  55 70 121  29 46 104
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  26 43 102  47 63 116  50 65 118
-+49 64 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  49 65 117  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  47 63 116  32 48 105
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  29 46 104  45 60 114  46 61 115  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  36 52 108
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  32 48 105
-+39 55 110  40 56 111  40 56 111  39 55 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  33 49 106  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+70 84 131  70 84 131  70 84 131  70 84 131  69 83 130  70 84 131
-+70 84 131  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  70 85 132  71 85 132  71 84 131
-+74 87 133  56 71 121  27 44 103  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+23 39 99  42 57 112  68 81 130  74 87 134  72 85 132  72 85 132
-+73 86 133  72 85 132  73 86 133  74 87 134  74 87 134  73 86 133
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  73 86 134  74 87 134  74 87 134
-+74 87 134  75 88 134  74 87 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+74 87 133  74 87 133  74 87 133  74 87 133  74 87 133  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 133  74 87 133  74 87 133
-+74 87 133  74 87 133  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  74 87 134
-+75 88 134  75 88 134  74 87 134  74 87 134  73 86 134  73 86 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 133  74 87 134  74 87 134  73 86 133
-+72 85 132  73 86 133  73 86 133  73 86 133  73 86 133  73 86 133
-+58 73 123  27 44 102  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+39 55 110  71 84 131  72 85 132  71 84 131  71 85 132  70 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+70 84 131  71 85 132  70 84 131  69 83 130  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  69 83 131
-+69 83 131  68 82 130  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  68 82 130  69 83 131  68 82 130  67 81 129  68 82 130
-+68 82 130  68 82 130  68 82 130  67 81 129  68 82 130  60 75 125
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  50 65 118  67 80 128  65 79 128  66 80 129  66 80 128
-+66 80 128  66 80 127  66 80 128  66 80 128  66 80 128  66 80 128
-+65 79 128  66 80 128  65 79 128  64 78 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  63 77 126
-+64 78 127  62 76 125  63 77 126  48 63 117  25 42 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  46 61 115  61 75 125  60 75 125  61 75 125  61 75 125
-+60 75 125  61 75 125  59 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  59 74 124  60 75 125  58 73 123  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+57 72 122  58 73 123  58 73 123  58 73 123  57 72 122  38 54 110
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+39 55 111  57 72 122  55 69 121  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  54 70 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 69 120  53 68 119  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  51 66 119  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  31 47 105  49 64 117  50 65 118
-+49 64 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 63 117  46 61 115  29 45 103
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  32 48 107  47 63 116  45 60 114  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  31 47 105
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  34 50 107
-+40 56 111  40 56 111  40 56 111  39 55 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  31 47 105  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  69 83 130
-+70 84 131  71 85 132  70 84 131  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  70 85 132  71 85 132
-+71 84 131  73 86 133  58 73 123  28 45 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 99  34 50 107  62 76 125  74 87 134  73 86 133
-+73 86 133  73 86 133  72 85 132  73 86 133  73 86 133  74 87 134
-+73 86 133  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 134  73 86 134
-+74 87 134  74 87 134  75 88 134  75 88 134  74 87 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  74 87 133
-+74 87 133  74 87 133  74 87 133  74 87 133  74 87 133  74 87 133
-+74 87 133  74 87 133  74 87 133  74 87 133  74 87 133  74 87 133
-+74 87 133  74 87 133  74 87 133  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+74 87 134  74 87 134  73 86 134  73 86 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  73 86 133  73 86 133  72 85 132
-+73 86 133  73 86 133  72 85 132  73 86 133  73 86 133  50 65 118
-+27 43 102  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  39 55 110
-+68 82 130  72 85 132  72 84 131  71 85 132  70 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  70 84 131  69 83 130  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  69 83 131
-+68 82 130  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  68 82 130  67 81 129  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  32 50 106
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+33 49 106  65 79 128  66 80 129  65 79 128  66 80 129  66 80 128
-+66 80 127  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  65 79 128  65 79 128  64 78 128  65 79 128  65 79 128
-+65 79 128  65 79 128  64 78 127  65 79 128  64 78 127  63 77 126
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+63 77 126  63 77 126  61 75 125  36 52 108  24 41 100  25 42 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+29 45 103  56 71 121  61 75 125  59 74 124  61 75 125  61 75 125
-+61 75 125  60 75 125  59 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  59 74 124  58 73 123  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  59 74 124
-+57 72 122  58 73 123  58 73 123  58 73 123  54 69 120  29 47 104
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+50 65 118  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  56 70 122  54 70 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  55 70 121  53 68 119  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  43 59 113  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  36 52 108  50 65 118  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  43 59 113  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  37 53 109  46 61 115  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  44 60 114  44 60 114  43 59 113  44 61 114  26 43 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  36 52 108
-+40 56 111  39 55 111  40 56 111  39 55 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  27 44 103  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+69 83 130  70 84 131  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  70 85 132  70 85 132
-+71 85 132  72 84 131  72 85 132  58 73 123  28 45 103  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  28 45 103  58 73 123  73 86 133
-+72 85 132  73 86 133  73 86 133  72 85 132  72 85 132  73 86 133
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+73 86 134  73 86 134  74 87 134  74 87 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 134  75 88 134  74 87 134  74 87 134
-+74 87 134  73 86 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+73 86 133  74 87 134  73 86 133  72 85 132  72 85 132  72 85 132
-+73 86 133  72 85 132  73 86 133  73 86 133  40 57 112  24 41 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  36 52 108  70 84 131
-+72 85 132  71 85 132  71 85 132  70 85 132  70 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  70 84 131
-+71 85 132  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  69 83 131  69 83 131  68 82 130
-+68 82 130  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+68 82 130  69 83 131  68 82 130  67 81 129  68 82 130  68 82 130
-+68 82 130  68 82 130  67 81 129  70 84 131  47 63 116  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+55 69 121  67 80 128  65 79 128  66 80 128  66 80 128  66 80 127
-+66 80 127  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  65 79 128  64 78 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  64 78 127  63 77 126  63 77 126
-+64 78 127  64 78 127  64 78 127  64 78 127  63 77 126  64 78 127
-+63 77 126  63 77 126  56 71 121  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+36 52 108  62 76 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  59 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  58 73 123  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+57 72 122  58 73 123  58 73 123  57 72 122  50 65 118  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  28 45 103
-+57 72 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  54 70 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 69 120  53 68 119  54 69 120
-+54 69 120  54 69 120  53 68 119  55 70 121  34 50 106  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  40 57 112  51 66 119  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  49 65 117  47 63 116  40 56 111  23 40 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  40 57 112  46 61 115  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  45 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  42 58 112  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  26 43 102  37 53 109
-+40 56 111  40 56 111  39 55 111  38 54 111  38 54 111  39 55 111
-+39 55 111  39 55 111  38 54 111  38 54 110  25 42 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  69 83 130  70 84 131  71 85 132  70 84 131  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+70 85 132  71 85 132  71 84 131  73 86 133  57 72 122  28 45 103
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  23 40 99  51 66 119
-+71 85 132  73 86 133  73 86 133  72 85 132  73 86 133  72 85 132
-+72 85 132  73 86 133  74 87 134  74 87 134  73 86 133  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  73 86 134  73 86 134  74 87 134
-+74 87 134  74 87 134  75 88 134  75 88 134  74 87 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  74 87 134  75 88 134  75 88 134
-+74 87 134  74 87 134  74 87 134  73 86 134  73 86 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  72 85 132  72 85 132  73 86 133  73 86 133  72 85 132
-+73 86 133  73 86 133  66 80 128  31 47 105  23 40 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  37 53 109  73 85 132  72 85 132
-+72 84 131  71 85 132  70 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+70 84 131  69 83 130  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  69 83 131  70 84 131  69 83 131  68 82 130  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  68 82 130
-+69 83 131  68 82 130  67 81 129  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  60 75 125  29 46 104  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  36 52 108
-+68 82 130  65 79 128  66 80 128  66 80 129  66 80 127  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  65 79 128
-+65 79 128  64 78 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  64 78 127  63 77 126  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  63 77 126
-+62 76 125  63 77 126  40 57 112  23 40 99  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+51 66 119  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  58 73 123  59 74 124  57 72 122
-+58 73 123  58 73 123  57 72 122  57 72 122  39 55 110  23 40 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  39 55 110
-+57 72 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  53 67 120  29 45 103  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  27 44 102  44 60 115  51 66 119  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  47 63 116  34 50 107  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  46 61 115  46 61 115  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+43 60 114  44 60 114  44 60 114  44 60 114  39 55 110  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  27 44 102  39 55 110
-+40 56 111  40 56 111  39 55 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  37 53 109  23 40 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+70 84 131  69 83 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  69 83 130  70 84 131  71 85 132  70 84 131
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  70 85 132  71 85 132  71 84 131  74 87 133  59 74 124
-+31 47 105  23 40 99  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 101  23 39 99
-+38 56 110  64 78 127  73 86 133  73 86 133  73 86 133  73 86 133
-+73 86 133  72 85 132  73 86 133  73 86 133  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  73 86 134
-+73 86 134  74 87 134  74 87 134  74 87 134  75 88 134  75 88 134
-+75 88 134  74 87 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  74 87 134  75 88 134  75 88 134  74 87 134  74 87 134
-+74 87 134  73 86 134  73 86 134  73 86 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  73 86 133  73 86 133  73 86 133
-+73 86 133  72 85 132  73 86 133  73 86 133  72 85 132  73 86 133
-+72 85 132  54 69 120  27 44 102  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  42 58 112  72 85 132  72 85 132  72 84 131
-+71 85 132  70 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  70 84 131  70 84 131  70 84 131
-+69 83 130  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  69 83 131  68 82 130  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+68 82 130  67 81 129  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  67 81 129  67 81 129  40 57 112  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  61 75 125
-+66 80 129  66 80 129  66 80 129  66 80 128  66 80 127  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+65 79 128  64 78 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  64 78 127  64 78 127  63 77 126  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  63 77 126
-+63 77 126  59 74 124  25 42 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  29 46 104
-+62 76 125  61 75 125  61 75 125  61 75 125  60 75 125  61 75 125
-+60 75 125  59 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  59 74 124  58 73 123  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  57 72 122
-+58 73 123  58 73 123  58 73 123  57 72 122  27 44 103  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  23 40 99  50 65 118
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  55 70 121
-+56 70 122  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  54 69 120  55 70 121  53 68 119  54 69 120  54 69 120
-+54 69 120  53 68 119  54 69 120  46 61 115  27 43 102  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  29 46 104  49 64 117  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 116  47 63 116  29 45 103  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  29 45 103  47 63 116  45 60 114  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+43 60 114  44 60 114  44 60 114  44 60 114  34 50 107  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  29 46 103  40 56 111
-+40 56 111  40 56 111  39 55 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  34 50 107  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+69 83 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  69 83 130  70 84 131  70 84 131  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  70 85 132  71 85 132  71 84 131  73 86 133
-+63 77 126  35 52 107  23 40 99  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  30 46 104  52 67 118  74 87 134  73 86 133  72 85 132
-+73 86 133  73 86 133  72 85 132  73 86 133  73 86 133  74 87 134
-+73 86 133  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 134  73 86 134  73 86 134  74 87 134  74 87 134
-+74 87 134  75 88 134  75 88 134  75 88 134  74 87 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 134  74 87 134  74 87 134  73 86 134
-+73 86 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 133  74 87 134  74 87 134  73 86 133  72 85 132
-+72 85 132  73 86 133  72 85 132  72 85 132  75 88 134  68 81 130
-+40 56 111  25 42 101  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  47 63 116  71 84 131  72 85 132  72 84 131  71 85 132
-+71 85 132  70 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  70 84 131  71 85 132  70 84 131  69 83 130
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+69 83 131  70 84 131  69 83 131  68 82 130  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  68 82 130  69 83 131
-+67 81 129  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+67 81 129  68 82 130  55 70 121  25 42 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  23 40 99  46 61 115  66 80 129
-+65 79 128  66 80 128  66 80 129  66 80 127  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  65 79 128  66 80 128
-+64 78 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  64 78 127  63 77 126  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  63 77 126  63 77 126
-+64 78 127  42 58 112  23 40 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  23 40 99  47 63 116
-+61 75 125  59 74 124  61 75 125  61 75 125  61 75 125  60 75 125
-+60 75 125  59 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+59 74 124  60 75 125  59 74 124  58 73 123  59 74 124  59 74 124
-+59 74 124  59 74 124  58 73 123  59 74 124  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  49 65 117  23 40 99  25 42 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  29 46 104  56 70 122
-+55 69 121  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  40 56 111  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  33 49 106  52 67 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  49 65 117  48 64 117  47 63 116  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  34 50 107  46 61 115  45 60 114  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+43 60 114  44 60 114  43 59 113  44 61 114  29 46 104  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  31 47 105  40 56 111
-+39 55 110  40 56 111  39 55 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  31 47 105  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+69 83 131  70 84 131  69 83 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  69 83 130  69 83 130  70 84 131
-+70 84 131  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  70 85 132  70 85 132  71 85 132  72 84 131
-+72 85 132  67 81 129  37 53 109  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  25 42 101  37 53 109  69 83 131  74 87 133
-+72 85 132  72 85 132  73 86 133  72 85 132  72 85 132  73 86 133
-+74 87 134  74 87 134  73 86 133  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 134  73 86 134
-+74 87 134  74 87 134  74 87 134  74 87 134  75 88 134  75 88 134
-+75 88 134  75 88 134  74 87 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 134  73 86 134  73 86 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 133  73 86 133  72 85 132  73 86 133
-+73 86 133  73 86 133  73 86 133  74 87 134  55 69 121  28 45 103
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  23 40 100
-+54 69 120  72 85 132  72 85 132  72 85 132  71 85 132  71 85 132
-+70 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  70 84 131  71 85 132  70 84 131  69 83 130  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  69 83 131  68 82 130  68 82 130  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  68 82 130  69 83 131  68 82 130
-+67 81 129  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  67 80 128  27 44 103  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  32 50 106  61 75 125  66 80 129
-+66 80 129  66 80 129  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  65 79 128
-+64 78 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+64 78 127  65 79 128  63 77 126  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  63 77 126  63 77 126  63 77 126
-+60 75 125  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  27 44 102  59 74 124
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  60 75 125
-+59 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  59 74 124  58 73 123  58 73 123  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  58 73 123  57 72 122  58 73 123
-+58 73 123  57 72 122  59 74 124  34 50 107  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  23 40 100  39 55 111  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  52 67 118  34 50 107  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  40 56 111  51 66 119  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  50 65 118
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  48 64 117  40 57 112  23 40 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+23 40 100  40 57 112  46 61 115  45 60 114  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  45 60 114  44 60 114
-+43 60 114  44 60 114  44 60 114  43 59 113  27 44 102  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  34 50 107  40 56 111
-+40 56 111  39 55 111  38 54 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  27 44 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+68 82 130  69 83 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  69 83 130
-+70 84 131  71 85 132  70 84 131  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  70 85 132  71 85 132
-+72 84 131  72 85 132  72 85 132  39 55 111  25 42 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  55 70 121
-+71 85 132  73 86 133  73 86 133  72 85 132  73 86 133  73 86 133
-+72 85 132  73 86 133  73 86 133  74 87 134  74 87 134  73 86 133
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  73 86 134  73 86 134  73 86 134
-+73 86 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  75 88 134  75 88 134  75 88 134
-+75 88 134  75 88 134  75 88 134  75 88 134  75 88 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 134  73 86 134  73 86 134  73 86 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 133  74 87 134  74 87 134  73 86 133
-+73 86 133  72 85 132  72 85 132  73 86 133  72 85 132  72 85 132
-+73 86 133  72 85 132  68 81 130  40 57 112  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  27 44 102  59 74 124
-+73 86 133  71 84 131  72 85 132  70 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  70 84 131  69 83 130  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  69 83 131  70 84 131
-+69 83 131  68 82 130  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  68 82 130  67 81 129
-+68 82 130  68 82 130  68 82 130  68 82 130  67 81 129  68 82 130
-+69 83 130  38 54 109  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  49 64 117  66 80 129  66 80 128
-+66 80 129  66 80 129  66 80 128  66 80 127  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  64 78 127
-+65 79 128  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  63 77 126  64 78 127  62 76 125  64 78 127
-+42 58 112  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  23 40 100  43 59 113  59 74 124
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  60 75 125
-+59 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  59 74 124  58 73 123  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  58 73 123  57 72 122  58 73 123
-+58 73 123  58 73 123  55 70 121  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  49 64 117  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  50 65 118  29 45 103  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  47 63 116  50 65 118  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 116  48 64 117  32 48 107  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 100  44 60 115  46 61 115  45 60 114  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  43 60 114
-+44 60 114  44 60 114  44 60 114  40 56 111  26 43 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  37 53 109  40 56 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  25 42 100  24 41 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+69 83 131  68 82 130  69 83 131  70 84 131  69 83 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+69 83 130  70 84 131  71 85 132  70 84 131  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  70 85 132
-+71 85 132  72 84 131  72 85 132  73 86 133  49 64 117  27 44 103
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  23 40 100
-+39 55 111  61 75 125  73 86 133  73 86 133  73 86 133  72 85 132
-+73 86 133  72 85 132  72 85 132  73 86 133  73 86 133  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  73 86 134  73 86 134  73 86 134  73 86 134  73 86 134
-+73 86 134  73 86 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+73 86 134  73 86 134  73 86 134  73 86 134  73 86 134  73 86 134
-+73 86 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+73 86 133  74 87 134  74 87 134  73 86 133  73 86 133  72 85 132
-+72 85 132  73 86 133  73 86 133  73 86 133  73 86 133  74 87 134
-+68 82 130  53 67 120  29 46 104  23 39 99  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  35 52 107  64 78 127  72 85 132
-+71 84 131  71 85 132  71 85 132  70 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  70 84 131
-+70 84 131  70 84 131  69 83 130  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  69 83 131  70 84 131  69 83 131
-+68 82 130  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  68 82 130  67 81 129  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  69 83 130
-+50 65 118  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  34 50 107  65 79 128  66 80 129  65 79 128
-+66 80 128  66 80 128  66 80 127  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  65 79 128  66 80 128  65 79 128  64 78 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  63 77 126  63 77 126  58 73 123
-+29 47 104  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  26 43 102  55 69 121  61 75 125
-+61 75 125  61 75 125  61 75 125  60 75 125  60 75 125  59 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+59 74 124  58 73 123  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  58 73 123  58 73 123  57 72 122  58 73 123
-+57 72 122  59 74 124  42 58 112  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  31 47 105  53 67 120  55 69 121
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  55 70 121
-+54 70 120  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  54 69 120  53 68 119  54 69 120  54 69 120  54 69 120
-+54 69 120  53 68 119  46 61 115  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  28 45 103  52 67 118  50 65 118  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  48 64 117
-+49 65 117  48 64 117  48 64 117  26 43 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+29 46 104  46 61 115  45 60 114  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  43 60 114
-+44 60 114  43 59 113  44 60 114  36 52 108  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  40 56 111  40 56 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  36 52 108  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+69 83 131  69 83 131  68 82 130  69 83 131  70 84 131  69 83 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+69 83 130  70 84 131  70 84 131  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+70 85 132  71 85 132  72 84 131  72 85 132  72 85 132  58 73 123
-+31 47 105  23 40 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+23 40 99  27 44 103  42 58 112  64 78 127  74 87 134  73 86 133
-+72 85 132  73 86 133  73 86 133  72 85 132  72 85 132  73 86 133
-+73 86 133  74 87 134  74 87 134  73 86 133  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 134  73 86 134  73 86 134  73 86 134
-+73 86 134  73 86 134  73 86 134  73 86 134  73 86 134  73 86 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 133  74 87 134
-+74 87 134  73 86 133  73 86 133  73 86 133  72 85 132  72 85 132
-+73 86 133  73 86 133  72 85 132  73 86 133  74 87 134  55 69 121
-+35 52 107  24 40 99  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  23 39 99  44 59 113  67 81 129  72 85 132  72 85 132
-+71 85 132  71 85 132  70 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  70 84 131  71 85 132
-+70 84 131  69 83 130  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  69 83 131  70 84 131  69 83 131  68 82 130
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  68 82 130  68 82 130  68 82 130  67 81 129  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  59 74 124
-+29 45 103  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  59 74 124  66 80 129  65 79 128  66 80 128
-+66 80 128  66 80 127  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  65 79 128  65 79 128  64 78 128
-+65 79 128  65 79 128  65 79 128  65 79 128  64 78 127  65 79 128
-+64 78 127  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  64 78 127  62 76 125  63 77 126  46 61 115
-+25 42 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  37 53 109  59 74 124  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  60 75 125  59 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 74 124
-+59 74 124  58 73 123  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  58 73 123  57 72 122  58 73 123  58 73 123
-+58 73 123  57 72 122  31 47 105  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  38 54 110  55 69 121  56 70 122
-+56 70 122  56 70 122  56 70 122  55 70 121  56 70 122  55 70 121
-+54 70 120  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+55 70 121  54 69 120  53 68 119  54 69 120  54 69 120  54 69 120
-+54 69 120  53 68 119  37 53 109  23 40 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  37 53 109  52 67 118  50 65 118  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  50 65 118  49 65 117
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  48 64 117  44 60 114  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+35 51 108  46 61 115  45 60 114  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  43 60 114
-+44 60 114  44 60 114  44 60 114  34 50 106  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  28 45 103  40 56 111  39 55 110
-+39 55 111  40 56 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  33 49 106  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+69 83 131  69 83 131  69 83 131  68 82 130  69 83 131  70 84 131
-+69 83 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  69 83 130  69 83 130  70 84 131  70 84 131  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+70 85 132  71 85 132  71 85 132  71 85 132  72 85 132  72 85 132
-+68 81 130  37 53 109  23 40 99  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  27 44 102  46 61 115  71 85 132
-+73 86 133  72 85 132  72 85 132  73 86 133  72 85 132  72 85 132
-+72 85 132  73 86 133  73 86 133  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  73 86 133  74 87 134  74 87 134  73 86 133
-+73 86 133  72 85 132  72 85 132  72 85 132  73 86 133  73 86 133
-+72 85 132  73 86 133  75 88 134  61 75 125  34 50 107  25 42 101
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  56 71 121  71 84 131  72 85 132  72 84 131  72 84 131
-+71 85 132  70 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  70 84 131  71 85 132  70 84 131
-+69 83 130  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  69 83 131  68 82 130  68 82 130
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+68 82 130  69 83 131  68 82 130  67 81 129  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  67 81 129  65 79 128  37 53 109
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+23 39 99  47 63 116  67 80 128  66 80 129  66 80 129  66 80 129
-+66 80 128  66 80 127  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  65 79 128  64 78 128  64 78 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  64 78 127
-+63 77 126  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  63 77 126  62 76 125  59 74 124  33 49 106
-+24 41 100  25 42 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  26 43 102  48 63 117  61 75 125  61 75 125
-+61 75 125  61 75 125  60 75 125  61 75 125  59 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+59 74 124  58 73 123  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  58 73 123  57 72 122  58 73 123  57 72 122
-+58 73 123  49 65 117  27 44 102  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  26 43 102  46 61 115  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  55 70 121  54 70 120
-+54 70 120  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+54 69 120  53 68 119  53 68 119  54 69 120  54 69 120  54 69 120
-+53 68 119  53 68 119  27 44 103  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+23 40 99  46 61 115  51 66 119  49 64 117  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  48 65 116
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  48 64 117  37 53 109  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  23 40 100
-+40 56 111  46 61 115  45 60 114  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  43 60 114  43 60 114
-+44 60 114  44 60 114  43 59 113  29 47 104  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  32 50 106  40 56 111  40 56 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  29 46 104  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+69 83 131  69 83 131  69 83 131  69 83 131  68 82 130  69 83 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  69 83 130  70 84 131  71 85 132
-+70 84 131  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  70 85 132  71 85 132  72 84 131
-+72 85 132  74 87 133  49 64 117  26 43 101  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  23 40 100  26 43 101
-+51 66 119  70 84 131  72 85 132  73 86 133  73 86 133  72 85 132
-+73 86 133  73 86 133  72 85 132  72 85 132  72 85 132  73 86 133
-+73 86 133  73 86 133  74 87 134  74 87 134  73 86 133  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  73 86 133  74 87 134  74 87 134
-+73 86 133  73 86 133  73 86 133  72 85 132  72 85 132  72 85 132
-+73 86 133  73 86 133  72 85 132  72 85 132  73 86 133  73 86 133
-+71 85 132  64 78 127  38 54 110  23 40 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  33 49 106
-+64 78 127  72 85 132  71 84 131  72 85 132  71 85 132  70 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  70 84 131  69 83 130
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  69 83 131  70 84 131  69 83 131  68 82 130  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  67 81 129  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 81 130  68 82 130  68 82 130  48 64 117  23 40 99
-+24 41 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+34 50 107  66 80 129  65 79 128  66 80 128  66 80 129  66 80 128
-+66 80 127  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  65 79 128  64 78 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  64 78 127
-+63 77 126  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  63 77 126  63 77 126  50 65 118  23 40 99
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  31 47 105  59 74 124  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  59 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 74 124
-+58 73 123  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  59 74 124  57 72 122  58 73 123  58 73 123  58 73 123
-+58 73 123  40 57 112  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  29 46 104  53 67 120  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  55 70 121  54 70 120
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+54 69 120  53 68 119  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  48 64 117  23 40 99  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+26 43 102  51 66 119  50 65 118  49 64 117  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  48 65 116
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  49 65 117  31 47 105  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+43 58 114  45 60 114  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  43 60 114  44 60 114
-+44 60 114  44 60 114  40 57 112  28 45 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  36 52 108  40 56 111  40 56 111
-+40 56 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  27 44 102  24 41 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  27 44 102
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  68 82 130
-+69 83 131  70 84 131  69 83 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  69 83 130  70 84 131
-+71 85 132  70 84 131  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  70 85 132  71 85 132
-+72 85 132  71 84 131  73 86 133  61 75 125  36 52 108  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+23 40 99  30 46 104  50 65 118  64 78 127  73 86 133  74 87 133
-+73 86 133  72 85 132  73 86 133  73 86 133  73 86 133  72 85 132
-+72 85 132  73 86 133  73 86 133  73 86 133  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+73 86 133  74 87 134  74 87 134  74 87 134  73 86 133  73 86 133
-+73 86 133  72 85 132  72 85 132  72 85 132  73 86 133  73 86 133
-+73 86 133  72 85 132  73 86 133  74 87 134  69 83 131  59 74 124
-+40 57 112  24 41 100  23 40 99  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  23 40 100  27 44 102  45 60 114  68 82 130
-+73 86 133  72 85 132  71 85 132  71 85 132  70 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  70 84 131  71 85 132  70 84 131  69 83 130  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+69 83 131  70 84 131  69 83 131  68 82 130  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  68 82 130  69 83 131
-+68 82 130  67 81 129  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  67 81 129  69 83 131  55 69 121  23 40 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  27 44 102
-+58 73 123  65 79 128  66 80 129  66 80 129  66 80 128  66 80 127
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+65 79 128  66 80 128  64 78 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  64 78 127  64 78 127  63 77 126
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  63 77 126  62 76 125  30 46 104  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  46 61 115  62 76 125  59 74 124  61 75 125
-+61 75 125  60 75 125  61 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  57 72 122  58 73 123  58 73 123  58 73 123
-+55 70 121  31 47 105  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  37 53 109  57 72 122  55 69 121  56 70 122
-+56 70 122  56 70 122  56 70 122  55 70 121  55 70 121  54 70 120
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+54 69 120  53 68 119  54 69 120  54 69 120  54 69 120  53 68 119
-+55 70 121  37 53 109  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+35 51 108  51 66 119  50 65 118  49 64 117  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  49 65 117  48 65 116
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 64 117
-+48 64 117  46 61 115  27 44 102  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  30 46 104
-+44 60 114  45 60 114  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  45 60 114  43 60 114  44 60 114
-+44 60 114  44 60 114  40 56 111  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  40 56 111  40 56 111  40 56 111
-+40 56 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  37 53 109  26 43 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  30 46 104
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+68 82 130  69 83 131  70 84 131  69 83 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  69 83 130  70 84 131
-+70 84 131  71 85 132  70 84 131  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  70 85 132  71 85 132
-+71 85 132  72 85 132  72 85 132  73 86 133  68 81 130  50 65 118
-+25 43 102  23 40 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  23 40 100  29 47 104  40 57 112  58 73 123
-+73 86 133  74 87 134  73 86 133  72 85 132  73 86 133  73 86 133
-+73 86 133  72 85 132  72 85 132  72 85 132  73 86 133  73 86 133
-+73 86 133  74 87 134  74 87 134  74 87 134  74 87 134  73 86 133
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  73 86 133  74 87 134  74 87 134
-+74 87 134  73 86 133  73 86 133  73 86 133  73 86 133  72 85 132
-+72 85 132  73 86 133  73 86 133  73 86 133  72 85 132  73 86 133
-+73 86 133  75 88 134  68 82 130  50 65 118  36 52 108  25 42 101
-+23 40 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  23 40 99  36 52 108  59 74 124  72 85 132  72 85 132
-+72 84 131  71 85 132  71 85 132  70 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+70 84 131  71 85 132  70 84 131  69 83 130  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  69 83 131
-+70 84 131  69 83 131  68 82 130  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  68 82 130
-+68 82 130  67 81 129  68 82 130  68 82 130  68 82 130  68 82 130
-+67 81 129  69 83 130  59 74 124  27 44 103  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  44 60 115
-+65 79 128  66 80 129  66 80 128  66 80 129  66 80 128  66 80 127
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  65 79 128
-+66 80 128  65 79 128  64 78 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  64 78 127  63 77 126
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+63 77 126  63 77 126  64 78 127  46 61 115  23 40 99  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  28 45 103  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  59 74 124  60 75 125  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  57 72 122  58 73 123  58 73 123  58 73 123  57 72 122
-+49 65 117  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  48 63 117  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  55 70 121  54 70 120  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+53 68 119  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  26 43 102  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  23 40 100
-+44 60 114  51 66 119  49 64 117  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 64 117
-+48 64 117  40 57 112  26 43 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  34 50 107
-+45 60 114  46 61 115  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  43 60 114  44 60 114
-+44 60 114  43 59 113  37 53 109  24 41 100  24 41 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  27 44 103  40 56 111  39 55 110  39 55 111
-+40 56 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  34 50 108  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  32 48 105
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  68 82 130  69 83 131  70 84 131  69 83 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  69 83 130
-+70 84 131  70 84 131  71 85 132  70 84 131  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  70 85 132
-+70 85 132  71 85 132  72 84 131  72 84 131  72 85 132  71 84 131
-+65 79 128  37 53 109  23 40 99  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  24 41 100  26 43 101
-+31 47 105  52 66 118  71 85 132  74 87 134  73 86 133  73 86 133
-+73 86 133  73 86 133  73 86 133  73 86 133  72 85 132  72 85 132
-+72 85 132  73 86 133  73 86 133  73 86 133  73 86 133  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 133  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  73 86 133  74 87 134  74 87 134
-+74 87 134  74 87 134  74 87 134  74 87 134  73 86 133  73 86 133
-+73 86 133  72 85 132  72 85 132  72 85 132  72 85 132  73 86 133
-+73 86 133  73 86 133  73 86 133  72 85 132  73 86 133  74 87 134
-+64 78 127  40 57 112  27 44 102  25 42 101  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 101  49 64 117  68 82 130  72 85 132  72 85 132  72 84 131
-+71 85 132  70 85 132  70 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  70 84 131  71 85 132
-+71 85 132  70 84 131  69 83 130  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  69 83 131  70 84 131
-+69 83 131  68 82 130  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  68 82 130  68 82 130  67 81 129
-+67 81 129  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  64 78 127  33 49 106  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  32 48 105  64 78 128
-+66 80 129  65 79 128  66 80 129  66 80 128  66 80 127  66 80 127
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+65 79 128  64 78 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  64 78 127  65 79 128  63 77 126  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  63 77 126
-+63 77 126  63 77 126  60 75 125  27 44 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+23 40 99  47 63 116  61 75 125  59 74 124  61 75 125  61 75 125
-+60 75 125  61 75 125  60 75 125  59 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+59 74 124  58 73 123  58 73 123  58 73 123  57 72 122  58 73 123
-+36 52 108  23 40 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  29 45 103  57 72 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  56 70 122  54 70 120  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  55 70 121
-+53 68 119  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+46 61 115  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  27 44 103
-+47 63 116  50 65 118  49 64 117  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  49 65 116
-+48 64 117  36 52 108  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  37 53 109
-+46 61 115  45 60 114  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  43 60 114  44 60 114  44 60 114
-+44 60 114  43 59 113  32 48 105  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  32 48 105  40 56 111  40 56 111  40 56 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  38 54 111
-+39 55 111  32 48 107  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  35 51 108
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  68 82 130  69 83 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  71 85 132  71 85 132  70 84 131
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  70 85 132  71 85 132  72 85 132  72 85 132
-+72 85 132  72 85 132  52 67 118  28 45 103  25 42 101  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  23 40 100  24 41 101  40 57 112  62 76 125  70 84 131
-+71 85 132  73 86 133  73 86 133  73 86 133  72 85 132  73 86 133
-+73 86 133  73 86 133  73 86 133  73 86 133  72 85 132  72 85 132
-+72 85 132  72 85 132  72 85 132  72 85 132  73 86 133  73 86 133
-+73 86 133  73 86 133  73 86 133  73 86 133  73 86 133  73 86 133
-+73 86 133  73 86 133  73 86 133  73 86 133  73 86 133  73 86 133
-+73 86 133  73 86 133  73 86 133  73 86 133  73 86 133  72 85 132
-+72 85 132  72 85 132  72 85 132  72 85 132  73 86 133  73 86 133
-+73 86 133  73 86 133  73 86 133  72 85 132  73 86 133  73 86 133
-+73 86 133  72 85 132  71 84 131  69 83 130  53 68 119  33 49 106
-+23 40 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  25 42 101  35 52 107
-+65 79 128  73 86 133  72 85 132  72 84 131  71 85 132  70 85 132
-+70 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  70 84 131  71 85 132  70 84 131
-+69 83 130  69 83 130  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  69 83 131  70 84 131  69 83 131
-+68 82 130  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  68 82 130  69 83 131  68 82 130  67 81 129  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  67 81 129  68 82 130
-+66 80 129  42 58 112  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  59 74 124  66 80 129
-+65 79 128  66 80 128  66 80 128  66 80 127  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+65 79 128  64 78 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  63 77 126  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  63 77 126
-+62 76 125  64 78 127  40 57 112  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+28 45 103  61 75 125  59 74 124  61 75 125  61 75 125  61 75 125
-+61 75 125  60 75 125  59 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  59 74 124  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  59 74 124
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  56 71 121
-+23 40 99  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+23 40 100  42 58 112  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  56 70 122  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  53 68 119
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  55 70 121
-+36 52 108  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  34 50 106
-+49 64 117  50 65 118  49 64 117  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 63 117
-+47 63 116  31 47 105  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  26 43 102  40 57 112
-+46 61 115  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  45 60 114  43 60 114  44 60 114  44 60 114
-+43 59 113  43 59 113  27 44 102  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 101  24 41 100  35 51 108  40 56 111  40 56 111  40 56 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  29 47 104  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  35 51 108
-+69 83 131  68 82 130  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  68 82 130  69 83 131  70 84 131
-+69 83 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  69 83 130  70 84 131  70 84 131  71 85 132
-+70 84 131  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  70 85 132  71 85 132  71 85 132
-+72 84 131  72 85 132  74 87 133  67 80 128  44 59 113  29 46 103
-+23 40 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  23 40 99  23 39 99  31 47 105
-+44 60 115  57 72 122  64 78 127  70 84 131  74 87 134  74 87 133
-+73 86 133  73 86 133  72 85 132  73 86 133  73 86 133  73 86 133
-+73 86 133  73 86 133  73 86 133  73 86 133  72 85 132  72 85 132
-+72 85 132  72 85 132  72 85 132  72 85 132  72 85 132  72 85 132
-+72 85 132  72 85 132  72 85 132  72 85 132  72 85 132  72 85 132
-+72 85 132  72 85 132  72 85 132  72 85 132  72 85 132  73 86 133
-+73 86 133  73 86 133  73 86 133  73 86 133  73 86 133  73 86 133
-+72 85 132  73 86 133  73 86 133  74 87 134  73 86 133  68 81 130
-+61 75 125  52 67 118  39 55 110  24 41 101  23 39 99  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  35 52 107  54 69 120  73 86 133
-+72 85 132  71 84 131  71 85 132  71 85 132  70 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  70 84 131  71 85 132  70 84 131  69 83 130
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  69 83 131  70 84 131  70 84 131  69 83 131  68 82 130
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+68 82 130  69 83 131  68 82 130  67 81 129  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  67 81 129  68 82 130
-+48 64 117  23 40 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  49 64 117  68 81 130  65 79 128
-+66 80 128  66 80 129  66 80 128  66 80 127  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  65 79 128
-+64 78 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+64 78 127  65 79 128  64 78 127  63 77 126  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  63 77 126  64 78 127  62 76 125
-+63 77 126  56 71 121  28 45 103  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  23 40 100
-+47 63 116  59 74 124  61 75 125  61 75 125  61 75 125  61 75 125
-+60 75 125  60 75 125  59 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  59 74 124  58 73 123  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+58 73 123  58 73 123  58 73 123  57 72 122  59 74 124  39 55 110
-+23 40 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  55 69 121  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 69 120  55 70 121  53 68 119
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  52 67 118
-+28 45 103  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  39 55 110
-+51 66 119  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 63 117
-+44 60 114  27 44 102  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  28 45 103  44 60 114
-+46 61 115  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  43 60 114  44 60 114  44 60 114
-+44 60 114  42 58 112  23 40 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 100  38 54 109  39 55 110  39 55 111  40 56 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+38 54 110  28 45 103  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  28 45 103  35 51 108
-+68 82 130  69 83 131  68 82 130  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  68 82 130  69 83 131
-+70 84 131  69 83 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  69 83 130  70 84 131  70 84 131
-+71 85 132  70 84 131  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  70 85 132  70 85 132
-+71 85 132  72 85 132  71 84 131  72 85 132  72 85 132  62 76 125
-+45 60 114  24 41 100  23 40 99  25 42 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+23 40 100  24 41 100  29 47 104  37 53 109  46 61 115  56 70 122
-+67 80 128  76 88 135  75 88 134  74 87 134  73 86 133  73 86 133
-+72 85 132  73 86 133  73 86 133  73 86 133  73 86 133  73 86 133
-+73 86 133  73 86 133  73 86 133  73 86 133  73 86 133  73 86 133
-+73 86 133  73 86 133  73 86 133  73 86 133  73 86 133  73 86 133
-+73 86 133  73 86 133  73 86 133  73 86 133  73 86 133  73 86 133
-+73 86 133  73 86 133  72 85 132  73 86 133  74 87 133  74 87 134
-+76 89 135  72 85 132  62 76 125  51 66 119  40 57 112  34 50 107
-+27 44 102  23 40 100  23 40 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+22 39 98  32 48 107  54 69 120  68 81 130  73 86 133  72 85 132
-+72 85 132  71 85 132  71 85 132  70 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+70 84 131  71 85 132  71 85 132  70 84 131  69 83 130  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+69 83 131  70 84 131  69 83 131  69 83 131  68 82 130  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  68 82 130  68 82 130  67 81 129  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  67 81 129  70 84 131  51 66 119
-+25 42 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 99  42 57 112  66 80 129  65 79 128  66 80 129
-+66 80 129  66 80 128  66 80 127  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  65 79 128  65 79 128  65 79 128
-+64 78 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  64 78 127  64 78 127  63 77 126  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  63 77 126  63 77 126
-+62 76 125  40 57 112  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  31 47 105
-+57 72 122  61 75 125  61 75 125  61 75 125  61 75 125  60 75 125
-+60 75 125  59 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  59 74 124  59 74 124  58 73 123  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+57 72 122  58 73 123  58 73 123  58 73 123  57 72 122  26 43 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  23 40 100
-+37 53 109  56 70 122  55 69 121  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  53 68 119
-+54 69 120  54 69 120  54 69 120  53 68 119  54 69 120  45 60 114
-+26 43 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  27 43 102  44 60 114
-+51 66 119  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  50 65 118  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  49 65 117  47 63 116
-+40 57 112  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  32 48 105  46 61 115
-+45 60 114  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  36 52 108  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  27 44 103  38 54 110  40 56 111  40 56 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+36 52 108  26 43 102  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  31 47 105  35 51 108
-+67 81 129  68 82 130  69 83 131  68 82 130  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  68 82 130
-+69 83 131  70 84 131  69 83 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  69 83 130  69 83 130
-+70 84 131  71 85 132  70 84 131  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  72 85 132  72 85 132  72 85 132
-+71 84 131  65 79 128  40 56 111  23 40 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 100  24 41 100  24 41 100  24 41 100  25 42 101  26 43 102
-+27 44 102  29 47 104  42 57 112  53 68 119  63 77 126  73 86 133
-+74 87 134  74 87 133  73 86 133  73 86 133  73 86 133  73 86 133
-+72 85 132  73 86 133  73 86 133  73 86 133  73 86 133  73 86 133
-+73 86 133  73 86 133  73 86 133  73 86 133  73 86 133  73 86 133
-+73 86 133  73 86 133  73 86 133  73 86 133  73 86 133  73 86 133
-+74 87 133  74 87 134  75 88 134  70 82 131  58 73 123  48 63 117
-+36 52 108  28 45 103  27 44 102  25 42 101  24 41 100  24 41 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  23 40 100  27 44 102
-+53 67 120  68 82 130  71 84 131  72 85 132  72 85 132  72 84 131
-+71 85 132  71 85 132  70 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  70 84 131  70 84 131  69 83 130  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  69 83 131  68 82 130  68 82 130  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  68 82 130
-+68 82 130  67 81 129  67 81 129  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  67 81 129  69 83 131  55 69 121  26 43 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  33 49 106  61 75 125  66 80 129  65 79 128  66 80 128
-+66 80 129  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  65 79 128  64 78 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  64 78 127  63 77 126  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  63 77 126  64 78 127  63 77 126  63 77 126
-+56 71 121  26 43 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  44 60 114
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+60 75 125  59 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  59 74 124  59 74 124  58 73 123  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  57 72 122
-+57 72 122  58 73 123  57 72 122  59 74 124  42 58 112  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  23 40 100
-+48 63 117  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  56 70 122  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  53 67 120  37 53 109
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  29 46 104  50 65 118
-+50 65 118  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  47 63 116
-+34 50 108  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  37 53 109  46 61 115
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  29 47 104  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  29 47 104  39 55 110  40 56 111  40 56 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+35 51 108  24 41 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  33 49 106  35 51 108
-+68 82 130  67 81 129  68 82 130  69 83 131  68 82 130  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+68 82 130  69 83 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+69 83 130  70 84 131  70 84 131  71 85 132  70 84 131  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  70 85 132  70 85 132  71 85 132  71 85 132
-+71 84 131  72 85 132  73 86 133  63 77 126  37 53 109  27 44 102
-+25 42 101  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  23 40 100  23 40 99  23 40 100
-+31 47 105  39 55 110  47 63 116  54 69 120  61 75 125  66 80 128
-+68 82 130  68 82 130  70 83 130  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+69 83 130  68 82 130  68 82 130  64 78 127  58 73 123  51 66 119
-+43 60 114  35 52 107  26 43 102  23 40 99  23 40 99  24 41 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  25 42 101  28 45 103  48 63 117  71 84 131
-+72 85 132  72 85 132  72 85 132  72 85 132  71 85 132  70 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  70 84 131  71 85 132  71 85 132
-+70 84 131  69 83 130  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  69 83 131  70 84 131
-+69 83 131  68 82 130  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  68 82 130  69 83 131  68 82 130
-+67 81 129  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  67 81 129  68 82 130  59 74 124  29 46 104  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+27 44 102  55 69 121  66 80 129  65 79 128  66 80 129  66 80 129
-+66 80 128  66 80 127  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  65 79 128  66 80 128  65 79 128  64 78 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+64 78 127  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  63 77 126  62 76 125  63 77 126
-+37 53 109  23 40 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  30 46 104  57 72 122
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  60 75 125
-+59 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+59 74 124  60 75 125  58 73 123  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  57 72 122
-+58 73 123  58 73 123  58 73 123  57 72 122  31 47 105  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  31 47 105
-+53 67 120  55 69 121  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  54 70 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  50 65 118  29 47 104
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  36 52 108  52 67 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  50 65 118  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  49 65 117  48 64 117  47 63 116
-+27 44 102  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  43 58 114  46 61 115
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  33 49 106  40 56 111  40 56 111  40 56 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  38 54 110
-+33 49 106  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  34 50 107  35 51 108
-+68 82 130  68 82 130  67 81 129  68 82 130  69 83 131  68 82 130
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  68 82 130  69 83 131  70 84 131  69 83 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  69 83 130  69 83 130  70 84 131  71 85 132  70 84 131
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  70 85 132  71 85 132
-+71 85 132  72 85 132  72 85 132  72 85 132  74 87 134  61 75 125
-+42 58 112  31 47 105  24 41 100  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  23 40 100  23 40 99  23 39 99  23 39 99  22 39 98
-+23 40 100  27 43 102  29 46 103  32 48 105  33 49 106  34 50 107
-+35 51 108  35 51 108  35 52 107  34 50 107  32 50 106  29 47 104
-+28 45 103  25 42 101  23 39 99  22 39 98  23 39 99  23 39 99
-+23 40 99  24 41 100  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  23 40 100
-+26 43 101  36 52 108  50 65 118  70 83 130  74 87 133  72 85 132
-+72 84 131  72 85 132  71 85 132  71 85 132  70 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  70 84 131  71 85 132  70 84 131  70 84 131
-+69 83 130  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  69 83 131  70 84 131  69 83 131
-+68 82 130  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  68 82 130  69 83 131  68 82 130  67 81 129
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+67 81 129  68 82 130  63 77 126  34 50 106  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+47 63 116  68 81 130  65 79 128  66 80 129  66 80 128  66 80 128
-+66 80 127  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+65 79 128  66 80 128  65 79 128  64 78 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  64 78 127  65 79 128
-+63 77 126  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  63 77 126  63 77 126  64 78 127  52 67 118
-+23 40 99  24 41 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  44 59 113  62 76 125
-+59 74 124  61 75 125  61 75 125  60 75 125  61 75 125  59 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  59 74 124  58 73 123  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  57 72 122  58 73 123
-+58 73 123  58 73 123  58 73 123  47 63 116  26 43 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  39 55 111
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  55 70 121
-+56 70 122  55 70 121  54 70 120  55 70 121  55 70 121  55 70 121
-+55 70 121  54 69 120  55 70 121  54 69 120  53 68 119  54 69 120
-+54 69 120  54 69 120  54 69 120  53 68 119  46 61 115  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  44 60 114  51 66 119
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  48 64 117  44 60 114
-+23 40 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  27 44 103  46 61 115  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  43 60 114  44 60 114  44 60 114  44 60 114
-+38 54 111  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  36 52 108  40 56 111  39 55 111  40 56 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  38 54 110
-+30 46 104  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  27 43 102  34 50 107  35 51 108
-+68 82 130  68 82 130  68 82 130  67 81 129  68 82 130  69 83 131
-+68 82 130  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  68 82 130  69 83 131  70 84 131  70 84 131
-+69 83 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  69 83 130  70 84 131  71 85 132
-+71 85 132  70 84 131  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  70 85 132
-+70 85 132  71 85 132  71 85 132  72 84 131  72 85 132  72 85 132
-+72 85 132  64 78 127  53 67 120  37 53 109  23 40 99  23 40 99
-+24 41 100  24 41 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 101
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  23 39 99  28 45 102  44 60 114
-+58 73 123  68 82 130  73 86 133  72 85 132  71 84 131  72 85 132
-+71 85 132  71 85 132  70 85 132  70 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  70 84 131  71 85 132  70 84 131  70 84 131  69 83 130
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  69 83 131  68 82 130
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  68 82 130  68 82 130  67 81 129
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  67 81 129
-+68 82 130  65 79 128  34 50 107  23 40 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  23 39 99  42 58 112
-+66 80 129  66 80 129  65 79 128  66 80 128  66 80 128  66 80 127
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  65 79 128  65 79 128  64 78 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  64 78 127  65 79 128  64 78 127
-+63 77 126  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  63 77 126  63 77 126  61 75 125  28 45 103
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  29 45 103  59 74 124  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 74 124
-+60 75 125  58 73 123  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  58 73 123  59 74 124  57 72 122  58 73 123
-+58 73 123  58 73 123  56 71 121  37 53 109  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  27 44 102  49 64 117
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  55 70 121  54 70 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  54 69 120  53 68 119  54 69 120
-+54 69 120  54 69 120  54 69 120  53 68 119  37 53 109  23 40 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  27 44 102  51 66 119  50 65 118
-+49 64 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  48 64 117  36 52 108
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  35 52 107  46 61 115  45 60 114
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  43 60 114  44 60 114  43 59 113  44 60 114
-+32 50 106  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+27 44 102  37 53 109  40 56 111  40 56 111  39 55 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  38 54 110  38 54 110
-+26 43 102  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  29 45 103  34 50 107  35 51 108
-+68 82 130  68 82 130  68 82 130  68 82 130  67 81 129  68 82 130
-+69 83 131  68 82 130  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  68 82 130  69 83 131  69 83 131
-+70 84 131  69 83 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  71 85 132  70 84 131  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  70 85 132  71 85 132  71 85 132  71 85 132  72 85 132
-+72 85 132  72 85 132  71 84 131  70 83 130  64 78 127  44 60 114
-+26 43 101  23 40 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  23 40 99  32 48 105  54 69 120  68 81 130  70 84 131
-+72 85 132  72 85 132  72 85 132  72 84 131  71 85 132  71 85 132
-+71 85 132  70 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+70 84 131  71 85 132  70 84 131  70 84 131  69 83 130  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  69 83 131  69 83 131  69 83 131  69 83 131  68 82 130
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  68 82 130  68 82 130  67 81 129  67 81 129  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  67 81 129  68 82 130
-+67 81 129  32 50 106  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  23 40 100  36 52 108  64 78 128
-+66 80 129  65 79 128  66 80 128  66 80 129  66 80 128  66 80 127
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  65 79 128  64 78 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  64 78 127  63 77 126
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+63 77 126  64 78 127  62 76 125  64 78 127  40 56 111  25 42 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  23 39 99  50 65 118  61 75 125  59 74 124
-+61 75 125  61 75 125  60 75 125  61 75 125  60 75 125  59 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  58 73 123  57 72 122  58 73 123
-+58 73 123  58 73 123  53 68 119  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  32 48 107  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  53 68 119  54 69 120  26 43 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  37 53 109  52 67 118  50 65 118
-+49 64 117  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+50 65 118  49 65 117  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  49 65 117  48 64 116  50 65 118  27 44 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  23 40 100  42 57 112  46 61 115  45 60 114
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+45 60 114  44 60 114  43 60 114  44 60 114  44 60 114  44 60 114
-+28 45 102  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+28 45 103  38 56 110  40 56 111  40 56 111  39 55 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  37 53 109
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  31 47 105  35 51 108  35 51 108
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  67 81 129
-+68 82 130  69 83 131  68 82 130  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  68 82 130
-+69 83 131  70 84 131  70 84 131  69 83 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+69 83 130  69 83 130  70 84 131  71 85 132  71 85 132  70 84 131
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  70 85 132  70 85 132
-+71 85 132  71 85 132  72 85 132  72 84 131  72 85 132  73 86 133
-+71 85 132  55 70 121  36 52 108  27 44 102  26 43 101  24 41 100
-+24 41 100  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  24 41 100  25 42 101  26 43 102  30 46 104
-+44 59 113  64 78 127  74 87 133  72 85 132  72 85 132  72 84 131
-+71 85 132  71 85 132  71 85 132  70 85 132  70 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  70 84 131  71 85 132  70 84 131
-+70 84 131  69 83 130  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  69 83 131
-+70 84 131  69 83 131  68 82 130  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  68 82 130
-+69 83 131  68 82 130  67 81 129  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  67 81 129  68 82 130  65 79 128
-+36 52 108  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  31 47 105  61 75 125  66 80 129
-+66 80 128  66 80 129  66 80 129  66 80 127  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+65 79 128  64 78 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  64 78 127  63 77 126
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  62 76 125  63 77 126  54 69 120  28 45 103  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 100  24 41 100  34 50 107  61 75 125  59 74 124  61 75 125
-+61 75 125  61 75 125  61 75 125  60 75 125  59 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+59 74 124  58 73 123  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  58 73 123  58 73 123  58 73 123  58 73 123
-+57 72 122  58 73 123  40 56 111  23 40 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  45 60 114  56 70 122
-+55 69 121  56 70 122  56 70 122  56 70 122  56 70 122  55 70 121
-+54 70 120  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  54 69 120  54 69 120  53 68 119  54 69 120  54 69 120
-+54 69 120  53 68 119  54 69 120  43 59 113  23 40 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  23 40 100  47 63 116  50 65 118  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  48 64 117  43 59 113  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  26 43 102  46 61 115  45 60 114  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  43 60 114  44 60 114  44 60 114  44 60 114  40 57 112
-+26 43 102  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+31 47 105  40 56 111  39 55 110  40 56 111  39 55 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  34 50 107
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  32 48 107  35 51 108  35 51 108
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+67 81 129  68 82 130  69 83 131  69 83 131  68 82 130  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+68 82 130  69 83 131  69 83 131  70 84 131  69 83 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  69 83 130  70 84 131  70 84 131  71 85 132
-+70 84 131  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+70 85 132  71 85 132  71 85 132  71 85 132  72 85 132  72 84 131
-+72 85 132  73 86 133  74 87 133  67 80 128  53 68 119  40 57 112
-+34 50 107  27 44 102  23 40 100  23 40 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  24 41 100  23 40 99
-+24 41 100  31 47 105  37 53 109  46 61 115  58 73 123  71 85 132
-+74 87 133  72 85 132  71 84 131  72 85 132  71 85 132  71 85 132
-+71 85 132  70 85 132  70 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  70 84 131  71 85 132  70 84 131  70 84 131
-+69 83 130  69 83 130  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+69 83 131  68 82 130  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  68 82 130  69 83 131
-+68 82 130  67 81 129  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  67 81 129  68 82 130  65 79 128  39 55 111
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  27 44 102  55 69 121  66 80 129  65 79 128
-+66 80 129  66 80 128  66 80 128  66 80 127  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  65 79 128  66 80 128
-+64 78 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  64 78 127  64 78 127  63 77 126  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  63 77 126  64 78 127
-+63 77 126  62 76 125  61 75 125  38 54 109  24 41 100  24 41 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  52 67 118  59 74 124  61 75 125  61 75 125
-+61 75 125  61 75 125  60 75 125  60 75 125  59 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 74 124
-+58 73 123  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  59 74 124  58 73 123  57 72 122  58 73 123  58 73 123
-+58 73 123  55 70 121  25 43 102  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  27 44 102  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  55 70 121  56 70 122
-+54 70 120  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+54 69 120  55 70 121  53 68 119  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  55 70 121  29 47 104  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  29 46 104  51 66 119  50 65 118  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 116  49 65 117  35 51 108  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  33 49 106  46 61 115  45 60 114  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  43 60 114  44 60 114  43 59 113  44 60 114  37 53 109
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+35 52 107  40 56 111  40 56 111  39 55 111  39 55 111  38 54 111
-+39 55 111  39 55 111  39 55 111  38 54 111  39 55 111  29 46 104
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  26 43 102  33 49 106  35 51 108  35 51 108
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  67 81 129  68 82 130  68 82 130  69 83 131  68 82 130
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  68 82 130  68 82 130  69 83 131  70 84 131  69 83 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  69 83 130  69 83 130  70 84 131  70 84 131
-+71 85 132  70 84 131  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  70 85 132  70 85 132  70 85 132  71 85 132  71 85 132
-+72 85 132  72 85 132  72 85 132  72 85 132  73 86 133  73 86 133
-+67 80 128  59 74 124  53 67 120  43 58 114  32 50 106  24 41 100
-+23 39 99  23 40 99  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+23 40 100  23 39 99  23 39 99  27 43 102  37 53 109  47 63 116
-+57 72 122  63 77 126  70 83 130  73 86 133  72 85 132  72 85 132
-+72 84 131  72 85 132  71 85 132  71 85 132  71 85 132  70 85 132
-+70 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+70 84 131  71 85 132  71 85 132  70 84 131  69 83 130  69 83 130
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  69 83 131  69 83 131  69 83 131
-+69 83 131  68 82 130  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  68 82 130  69 83 131  68 82 130
-+68 82 130  67 81 129  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  67 81 129  68 82 130  67 81 129  37 53 109  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 101  23 40 99  51 66 119  66 81 129  66 80 129  65 79 128
-+66 80 129  66 80 128  66 80 127  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  65 79 128  66 80 128  65 79 128
-+64 78 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  64 78 127  64 78 127  63 77 126  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  63 77 126
-+63 77 126  63 77 126  50 65 118  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  37 53 109  59 74 124  61 75 125  61 75 125  61 75 125
-+61 75 125  60 75 125  60 75 125  59 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  59 74 124  59 74 124
-+58 73 123  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  58 73 123  57 72 122  58 73 123  57 72 122
-+59 74 124  39 55 110  23 40 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  23 40 99  42 58 112  56 70 122  55 69 121
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  55 70 121
-+54 70 120  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  54 69 120  53 68 119  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  48 63 117  24 41 100  25 42 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 99  40 57 112  51 66 119  50 65 118  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+49 65 117  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  48 64 117  48 63 117  28 45 103  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  23 40 100  39 55 111  46 61 115  45 60 114  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  43 60 114  44 60 114  44 60 114  44 60 114  33 49 106
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+39 55 110  40 56 111  40 56 111  39 55 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 110  39 55 111  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  27 44 102  34 50 107  35 51 108  35 51 108
-+68 82 130  67 81 129  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  67 81 129  67 81 129  68 82 130  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  68 82 130  68 82 130  69 83 131  70 84 131
-+69 83 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  69 83 130  69 83 130
-+70 84 131  71 85 132  71 85 132  70 84 131  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  70 85 132  71 85 132
-+71 85 132  71 85 132  72 85 132  72 85 132  72 84 131  72 85 132
-+72 85 132  72 85 132  71 85 132  70 84 131  68 82 130  67 80 128
-+59 72 123  46 61 115  36 52 108  25 42 101  23 40 99  23 40 100
-+23 40 100  24 41 100  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  24 41 100  23 40 100  23 40 99  23 40 99  29 45 103
-+40 56 111  50 65 118  63 77 126  68 82 130  70 83 130  71 84 131
-+72 85 132  72 85 132  72 85 132  72 85 132  72 85 132  72 85 132
-+71 85 132  71 85 132  71 85 132  70 85 132  70 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  70 84 131
-+71 85 132  70 84 131  70 84 131  69 83 130  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  69 83 131  70 84 131  70 84 131  69 83 131  68 82 130
-+68 82 130  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  68 82 130  69 83 131  68 82 130  68 82 130
-+67 81 129  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+67 81 129  68 82 130  67 81 129  34 50 106  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+23 40 99  50 65 118  66 80 129  66 80 129  65 79 128  66 80 128
-+66 80 128  66 80 127  66 80 127  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  65 79 128  66 80 128  65 79 128  64 78 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+64 78 127  65 79 128  64 78 127  63 77 126  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  63 77 126
-+63 77 126  62 76 125  27 44 103  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+27 44 102  53 67 120  61 75 125  61 75 125  61 75 125  61 75 125
-+60 75 125  61 75 125  60 75 125  59 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  59 74 124  59 74 124  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  57 72 122  58 73 123  58 73 123  58 73 123
-+55 70 121  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  26 43 102  55 69 121  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  55 70 121  56 70 122  54 70 120
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  53 68 119  54 69 120  54 69 120  54 69 120  54 69 120
-+53 68 119  55 70 121  35 52 107  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  47 63 116  50 65 118  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  48 64 117  42 58 112  26 43 102  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  26 43 102  43 58 114  45 60 114  44 59 113  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+43 60 114  43 60 114  44 60 114  44 60 114  42 58 112  29 46 104
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  27 44 103
-+40 56 111  40 56 111  40 56 111  39 55 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  36 52 108  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  28 45 103  35 51 108  35 51 108  35 51 108
-+51 67 118  68 82 130  68 82 130  67 81 129  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  67 81 129  68 82 130
-+69 83 131  68 82 130  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  68 82 130  68 82 130
-+69 83 131  70 84 131  70 84 131  69 83 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+69 83 130  69 83 130  70 84 131  70 84 131  71 85 132  71 85 132
-+70 84 131  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  70 85 132  70 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  72 85 132  72 85 132  72 84 131  72 85 132
-+72 85 132  73 85 132  73 86 133  73 86 133  67 80 128  58 73 123
-+49 64 117  40 57 112  34 50 107  30 46 104  28 45 103  27 44 102
-+27 44 102  27 43 102  26 43 102  26 43 102  26 43 101  26 43 101
-+26 43 101  26 43 101  26 43 101  26 43 101  26 43 101  26 43 102
-+26 43 102  27 44 102  27 44 102  27 44 103  28 45 103  31 47 105
-+38 54 110  44 61 114  53 67 120  61 75 125  71 84 131  74 87 133
-+73 86 133  72 85 132  72 85 132  71 84 131  72 85 132  72 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  70 85 132  70 85 132
-+70 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  70 84 131  70 84 131
-+69 83 130  69 83 130  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  69 83 131
-+70 84 131  70 84 131  69 83 131  68 82 130  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+68 82 130  69 83 131  69 83 131  67 81 129  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  67 81 129
-+68 82 130  64 78 127  34 50 107  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+44 60 114  66 80 129  65 79 128  66 80 128  66 80 129  66 80 128
-+66 80 127  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  65 79 128  64 78 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  63 77 126  64 78 127  63 77 126  62 76 125
-+64 78 127  37 53 109  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+38 56 110  63 77 126  61 75 125  61 75 125  61 75 125  60 75 125
-+61 75 125  59 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  59 74 124  60 75 125  58 73 123  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+58 73 123  57 72 122  58 73 123  58 73 123  58 73 123  59 74 124
-+38 54 110  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  23 40 100  40 56 111  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  56 70 122  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+54 69 120  53 68 119  54 69 120  54 69 120  54 69 120  53 68 119
-+54 69 120  51 66 119  28 45 103  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 101
-+24 41 100  33 49 106  49 64 117  50 65 118  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  48 64 117  37 53 109  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  31 47 105  44 60 114  45 60 114  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  44 60 114
-+43 60 114  44 60 114  44 60 114  44 60 114  40 56 111  26 43 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  32 48 105
-+40 56 111  40 56 111  40 56 111  39 55 111  38 54 111  39 55 111
-+39 55 111  39 55 111  38 54 111  39 55 111  32 48 107  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  29 47 104  35 51 108  35 51 108  35 51 108
-+24 41 100  48 63 117  67 81 129  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  67 81 129
-+68 82 130  69 83 131  69 83 131  68 82 130  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+68 82 130  69 83 131  69 83 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  69 83 130  69 83 130  70 84 131  70 84 131
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  70 85 132  70 85 132
-+70 85 132  71 85 132  71 85 132  71 85 132  71 85 132  72 85 132
-+72 85 132  72 85 132  72 84 131  72 85 132  72 85 132  73 86 133
-+73 86 133  74 87 133  74 87 133  74 87 134  71 84 131  67 80 128
-+63 77 126  61 75 125  58 73 123  56 71 121  54 69 120  53 68 119
-+52 67 118  52 67 118  53 68 119  54 69 120  55 70 121  57 72 122
-+59 74 124  62 76 125  65 79 128  68 82 130  73 85 132  74 87 134
-+74 87 133  73 86 133  73 86 133  72 85 132  72 85 132  71 84 131
-+72 85 132  72 85 132  72 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  70 85 132  70 85 132  70 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+70 84 131  71 85 132  70 84 131  70 84 131  70 84 131  69 83 130
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  69 83 131  70 84 131
-+69 83 131  69 83 131  68 82 130  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  68 82 130  68 82 130  67 81 129  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  67 81 129  68 82 130
-+62 76 125  36 52 108  23 40 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  39 55 110
-+64 78 127  66 80 129  66 80 128  66 80 129  66 80 128  66 80 127
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  65 79 128  65 79 128  64 78 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  64 78 127  65 79 128
-+64 78 127  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  63 77 126  62 76 125  64 78 127
-+49 64 117  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  27 44 103
-+58 73 123  61 75 125  60 75 125  61 75 125  61 75 125  61 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  59 74 124  58 73 123  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  57 72 122  58 73 123  58 73 123  58 73 123  53 67 120
-+28 45 103  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  27 43 102  50 65 118  55 69 121  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  55 70 121
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  42 58 112  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 100  39 55 111  51 66 119  49 64 117  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  48 65 116
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 63 117  47 63 116  31 47 105  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  36 52 108  46 61 115  45 60 114  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+43 60 114  44 60 114  44 60 114  43 59 113  37 53 109  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  37 53 109
-+40 56 111  40 56 111  40 56 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 110  39 55 111  28 45 103  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  33 49 106  35 51 108  35 51 108  35 51 108
-+24 41 100  25 42 101  44 60 114  68 82 130  68 82 130  67 81 129
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+67 81 129  68 82 130  68 82 130  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+68 82 130  68 82 130  69 83 131  70 84 131  70 84 131  69 83 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  69 83 130  70 84 131
-+70 84 131  71 85 132  71 85 132  71 85 132  70 84 131  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  70 85 132  70 85 132  70 85 132  70 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  72 85 132  72 85 132  72 85 132
-+72 85 132  72 85 132  71 85 132  72 85 132  72 85 132  72 85 132
-+72 85 132  72 85 132  73 85 132  73 86 133  73 86 133  73 86 133
-+73 86 133  73 86 133  73 86 133  73 86 133  73 86 133  73 85 132
-+72 85 132  72 85 132  72 85 132  72 85 132  72 85 132  72 85 132
-+72 85 132  72 85 132  72 85 132  72 85 132  72 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  70 85 132  70 85 132
-+70 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  70 84 131  71 85 132
-+71 85 132  70 84 131  70 84 131  69 83 130  69 83 130  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  69 83 131  70 84 131  70 84 131  69 83 131
-+68 82 130  68 82 130  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  68 82 130  69 83 131
-+68 82 130  68 82 130  67 81 129  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  67 81 129  69 83 131  59 74 124
-+32 50 106  23 40 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  23 40 100  36 52 108  64 78 127
-+66 80 129  65 79 128  66 80 129  66 80 128  66 80 128  66 80 127
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+65 79 128  66 80 128  65 79 128  64 78 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  64 78 127
-+64 78 127  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  64 78 127  62 76 125  63 77 126  57 72 122
-+30 46 104  24 41 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 101  23 39 99  49 64 117
-+62 76 125  59 74 124  61 75 125  61 75 125  60 75 125  61 75 125
-+60 75 125  59 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  59 74 124  60 75 125  58 73 123  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  59 74 124
-+57 72 122  58 73 123  58 73 123  58 73 123  58 73 123  40 57 112
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 100
-+24 41 100  36 52 108  55 69 121  55 69 121  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  55 70 121  54 70 120  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+52 67 118  34 50 107  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+27 44 102  46 61 115  51 66 119  49 64 117  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  50 65 118  48 65 116
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 64 117
-+49 65 117  48 64 117  44 60 114  26 43 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+26 43 102  40 56 111  46 61 115  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  43 60 114
-+44 60 114  44 60 114  44 60 114  43 59 113  32 48 107  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  40 56 111
-+40 56 111  39 55 111  40 56 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  26 43 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 101  25 42 101  35 51 108  35 51 108  35 51 108  35 51 108
-+25 42 101  24 41 100  24 41 100  38 54 110  70 82 131  68 82 130
-+67 81 129  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+67 81 129  67 81 129  67 81 129  68 82 130  68 82 130  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  68 82 130  69 83 131  69 83 131  70 84 131
-+70 84 131  69 83 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  69 83 130
-+69 83 130  70 84 131  70 84 131  70 84 131  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  70 85 132  70 85 132
-+70 85 132  70 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  72 85 132  72 85 132  72 85 132  72 85 132
-+72 85 132  72 85 132  72 85 132  72 85 132  72 85 132  72 85 132
-+72 85 132  72 85 132  72 85 132  72 85 132  72 85 132  72 85 132
-+72 85 132  72 85 132  72 85 132  72 85 132  72 85 132  72 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+70 85 132  70 85 132  70 85 132  70 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  70 84 131  71 85 132  71 85 132  70 84 131
-+70 84 131  69 83 130  69 83 130  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  69 83 131  69 83 131  68 82 130
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  68 82 130  69 83 131  68 82 130
-+68 82 130  67 81 129  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  67 81 129  69 83 131  56 71 121  27 44 102
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  23 40 100  34 50 106  65 79 128  66 80 129
-+65 79 128  66 80 129  66 80 128  66 80 127  66 80 127  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  65 79 128
-+66 80 128  65 79 128  64 78 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  64 78 127  64 78 127  63 77 126
-+63 77 126  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+63 77 126  64 78 127  63 77 126  62 76 125  62 76 125  39 55 111
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  23 40 100  37 53 109  59 74 124
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  60 75 125
-+59 75 125  59 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+57 72 122  58 73 123  58 73 123  57 72 122  54 69 120  29 46 104
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+26 43 102  46 61 115  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  56 70 122  55 70 121  54 70 120  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+53 68 119  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+49 64 117  26 43 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+31 47 105  51 66 119  50 65 118  49 64 117  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  48 65 116
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  47 63 116  38 54 111  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+28 45 103  44 60 114  46 61 115  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  45 60 114  43 60 114
-+44 60 114  44 60 114  43 59 113  43 59 113  26 43 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  29 47 104  40 56 111
-+39 55 110  40 56 111  39 55 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  34 50 107  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  28 45 103  35 51 108  34 50 107  35 51 108  35 51 108
-+25 42 101  25 42 101  25 42 101  24 41 100  34 50 107  65 79 128
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  67 81 129  68 82 130  68 82 130
-+69 83 131  68 82 130  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  68 82 130  68 82 130
-+69 83 131  70 84 131  70 84 131  69 83 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  69 83 130  69 83 130  70 84 131
-+70 84 131  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  70 85 132  70 85 132  70 85 132  70 85 132  70 85 132
-+70 85 132  70 85 132  70 85 132  70 85 132  70 85 132  70 85 132
-+70 85 132  70 85 132  70 85 132  70 85 132  70 85 132  70 85 132
-+70 85 132  70 85 132  70 85 132  70 85 132  70 85 132  70 85 132
-+70 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  70 84 131  71 85 132
-+71 85 132  70 84 131  70 84 131  69 83 130  69 83 130  69 83 130
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  69 83 131  70 84 131
-+70 84 131  69 83 131  69 83 131  68 82 130  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  68 82 130  69 83 131  69 83 131  68 82 130  67 81 129
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+67 81 129  68 82 130  68 81 130  54 69 120  27 43 102  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  32 50 106  65 79 128  66 80 129  65 79 128
-+66 80 128  66 80 129  66 80 128  66 80 127  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+65 79 128  64 78 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  64 78 127  65 79 128  63 77 126  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  62 76 125  63 77 126  52 66 118  23 40 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  27 44 102  55 69 121  61 75 125
-+61 75 125  61 75 125  61 75 125  60 75 125  61 75 125  60 75 125
-+59 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  59 74 124  58 73 123  59 74 124  59 74 124
-+59 74 124  59 74 124  58 73 123  59 74 124  58 73 123  58 73 123
-+58 73 123  58 73 123  57 72 122  58 73 123  43 59 113  23 40 99
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+31 47 105  55 69 121  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+53 68 119  54 69 120  54 69 120  54 69 120  53 68 119  53 68 119
-+39 55 111  23 40 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+40 56 111  51 66 119  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  50 65 118  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  49 65 117
-+48 64 116  47 63 116  31 47 105  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+33 49 106  47 63 116  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  39 55 111  23 40 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 101  24 41 100  34 50 107  40 56 111
-+40 56 111  40 56 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  32 48 107  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  31 47 105  35 51 108  35 51 108  35 51 108  35 51 108
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  32 48 105
-+59 74 124  68 82 130  67 81 129  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  67 81 129  68 82 130
-+68 82 130  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+68 82 130  69 83 131  69 83 131  70 84 131  70 84 131  69 83 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  69 83 130
-+70 84 131  70 84 131  70 84 131  71 85 132  71 85 132  71 85 132
-+70 84 131  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  70 84 131
-+70 84 131  70 84 131  69 83 130  69 83 130  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  69 83 131  70 84 131  69 83 131
-+69 83 131  68 82 130  68 82 130  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+68 82 130  69 83 131  68 82 130  68 82 130  67 81 129  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  67 81 129
-+68 82 130  67 81 129  48 64 117  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  34 50 107  62 76 125  66 80 129  65 79 128  66 80 128
-+66 80 129  66 80 128  66 80 127  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  65 79 128
-+64 78 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  64 78 127  65 79 128  64 78 127  63 77 126  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  63 77 126
-+63 77 126  63 77 126  63 77 126  58 73 123  27 44 103  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 100  42 57 112  59 74 124  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  60 75 125  59 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  59 74 124  58 73 123  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  58 73 123  58 73 123  57 72 122
-+58 73 123  58 73 123  58 73 123  56 71 121  26 43 102  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+45 60 114  56 70 122  55 69 121  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  55 70 121  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  53 68 119
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  53 68 119
-+27 44 103  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  26 43 101
-+50 65 118  50 65 118  49 64 117  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 64 117
-+48 64 117  46 61 115  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+39 55 111  46 61 115  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  44 60 114
-+44 60 114  43 59 113  44 60 114  33 49 106  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 100  38 54 110  39 55 110
-+39 55 111  40 56 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 110  29 46 104  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  34 50 107  35 51 108  35 51 108  35 51 108  35 51 108
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+29 46 104  53 68 119  70 84 131  67 81 129  67 81 129  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  67 81 129
-+68 82 130  69 83 131  69 83 131  68 82 130  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  68 82 130  68 82 130  69 83 131  69 83 131  70 84 131
-+69 83 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+69 83 130  69 83 130  69 83 130  70 84 131  70 84 131  70 84 131
-+71 85 132  71 85 132  70 84 131  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  70 84 131
-+71 85 132  71 85 132  70 84 131  70 84 131  70 84 131  69 83 130
-+69 83 130  69 83 130  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  69 83 131  70 84 131  70 84 131  69 83 131  69 83 131
-+68 82 130  68 82 130  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  68 82 130  69 83 131
-+69 83 131  68 82 130  67 81 129  67 81 129  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  67 81 129  69 83 130
-+65 79 128  39 55 111  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+33 49 106  61 75 125  66 80 129  66 80 129  66 80 128  66 80 129
-+66 80 128  66 80 127  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  65 79 128  65 79 128  65 79 128
-+64 78 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+64 78 127  65 79 128  64 78 127  63 77 126  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  63 77 126  64 78 127
-+63 77 126  63 77 126  63 77 126  34 50 106  23 40 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  29 47 104  58 73 123  61 75 125  59 74 124
-+61 75 125  61 75 125  60 75 125  61 75 125  59 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 74 124
-+59 74 124  59 74 124  58 73 123  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  58 73 123  57 72 122  58 73 123
-+58 73 123  57 72 122  59 74 124  38 54 110  23 40 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  29 46 104
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  56 70 122  54 70 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 69 120  54 69 120  53 68 119
-+54 69 120  54 69 120  54 69 120  53 67 120  54 69 120  43 59 113
-+23 40 99  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  35 51 108
-+52 67 118  50 65 118  49 64 117  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  50 65 118  49 65 117  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 64 117
-+48 64 117  36 52 108  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  26 43 101
-+46 61 115  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  45 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  28 45 103  39 55 110  40 56 111
-+40 56 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  37 53 109  27 44 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  35 51 108  34 50 107  35 51 108  35 51 108  34 50 107
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  44 60 114  69 83 130  68 82 130  67 81 129
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+67 81 129  68 82 130  68 82 130  69 83 131  68 82 130  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  68 82 130  68 82 130  69 83 131  69 83 131
-+70 84 131  70 84 131  69 83 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  69 83 130  69 83 130  70 84 131
-+70 84 131  70 84 131  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  70 84 131  71 85 132  71 85 132
-+70 84 131  70 84 131  70 84 131  69 83 130  69 83 130  69 83 130
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  69 83 131  69 83 131  68 82 130  68 82 130
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  68 82 130
-+68 82 130  67 81 129  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  67 81 129  68 82 130  62 76 125
-+32 50 106  24 41 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  31 47 105
-+64 78 128  66 80 129  66 80 129  65 79 128  66 80 129  66 80 128
-+66 80 127  66 80 127  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  65 79 128  66 80 128  65 79 128  64 78 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  64 78 127  63 77 126  63 77 126  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  63 77 126
-+62 76 125  64 78 127  40 57 112  25 42 101  24 41 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  50 65 118  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  60 75 125  59 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+59 74 124  58 73 123  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  58 73 123  57 72 122  57 72 122  58 73 123
-+58 73 123  58 73 123  53 67 120  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  23 40 99  46 61 115
-+56 70 122  55 69 121  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  54 70 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  55 70 121  53 68 119  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  55 70 121  27 44 103
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 101  23 40 99  48 63 117
-+50 65 118  49 64 117  49 64 117  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  48 65 116  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  49 65 117  48 64 116
-+48 64 117  26 43 102  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  32 50 106
-+46 61 115  45 60 114  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  43 60 114  44 60 114
-+44 60 114  44 60 114  38 56 110  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  32 48 105  39 55 110  40 56 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  35 51 108  24 41 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+28 45 104  35 51 108  35 51 108  35 51 108  35 51 108  35 51 108
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  38 56 110  64 78 127  68 82 130
-+68 82 130  67 81 129  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  67 81 129  68 82 130  68 82 130  69 83 131
-+69 83 131  68 82 130  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+68 82 130  69 83 131  69 83 131  70 84 131  70 84 131  69 83 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  69 83 130  69 83 130  69 83 130  70 84 131
-+70 84 131  70 84 131  70 84 131  71 85 132  71 85 132  71 85 132
-+70 84 131  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+70 84 131  70 84 131  70 84 131  70 84 131  69 83 130  69 83 130
-+69 83 130  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  69 83 131  70 84 131  70 84 131  69 83 131
-+69 83 131  68 82 130  68 82 130  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  68 82 130  69 83 131  68 82 130  68 82 130  67 81 129
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  67 81 129  68 82 130  67 81 129  57 72 122  28 45 103
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  34 50 107  65 79 128
-+66 80 129  65 79 128  66 80 128  66 80 129  66 80 128  66 80 127
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+65 79 128  66 80 128  66 80 128  64 78 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  64 78 127
-+65 79 128  64 78 127  63 77 126  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  63 77 126  64 78 127  64 78 127  63 77 126
-+63 77 126  51 66 119  27 43 102  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  38 54 110  63 77 126  59 74 124  61 75 125  61 75 125
-+60 75 125  61 75 125  61 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 74 124
-+58 73 123  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  58 73 123  57 72 122  58 73 123  58 73 123
-+58 73 123  59 74 124  35 51 108  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  31 47 105  56 70 122
-+55 69 121  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  54 69 120  55 70 121  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  53 68 119  54 69 120  44 60 114  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  31 47 105  51 66 119
-+50 65 118  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 116  48 64 117
-+42 58 112  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  40 57 112
-+46 61 115  45 60 114  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  45 60 114  44 60 114  43 60 114  44 60 114
-+44 60 113  44 60 114  32 50 106  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  35 52 107  40 56 111  39 55 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  33 49 106  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+31 47 105  35 51 108  35 51 108  35 51 108  35 51 108  35 51 108
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  23 40 99  33 49 106  57 72 122
-+69 83 131  68 82 130  67 81 129  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  67 81 129  67 81 129  68 82 130
-+68 82 130  69 83 131  68 82 130  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  68 82 130  68 82 130  69 83 131  69 83 131  70 84 131
-+70 84 131  69 83 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  69 83 130
-+69 83 130  69 83 130  70 84 131  70 84 131  70 84 131  70 84 131
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  70 84 131
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  70 84 131  71 85 132  71 85 132
-+71 85 132  71 85 132  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  69 83 130  69 83 130  69 83 130  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  69 83 131  70 84 131  69 83 131  69 83 131  68 82 130
-+68 82 130  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  68 82 130  67 81 129  67 81 129  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  65 79 128  47 63 116  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  37 53 109  63 77 126  66 80 129
-+65 79 128  66 80 128  66 80 129  66 80 128  66 80 127  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  65 79 128  65 79 128  64 78 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  64 78 127  65 79 128
-+64 78 127  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  63 77 126  63 77 126  63 77 126
-+58 73 123  31 47 105  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+29 47 104  59 74 124  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  60 75 125  60 75 125  59 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  59 74 124  60 75 125  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  59 74 124  57 72 122  58 73 123  58 73 123  58 73 123
-+58 73 123  49 64 117  26 43 102  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  46 61 115  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  55 70 121  56 70 122
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  32 48 107  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  23 40 100  43 58 114  51 66 119
-+49 64 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  49 65 117  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  49 64 117
-+32 50 106  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  27 43 102  46 61 115
-+45 60 114  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  44 60 114  43 60 114  44 60 114
-+44 60 114  43 60 114  27 44 103  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  26 43 102  37 53 109  40 56 111  40 56 111
-+39 55 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  29 45 103  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+34 50 107  34 50 107  35 51 108  35 51 108  35 51 108  35 51 108
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  23 40 100  28 45 102
-+46 61 115  67 81 129  68 82 130  67 81 129  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  67 81 129
-+67 81 129  68 82 130  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  68 82 130  68 82 130  69 83 131
-+69 83 131  70 84 131  70 84 131  69 83 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  69 83 130  69 83 130  69 83 130  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  70 84 131
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  70 84 131  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  69 83 130  69 83 130  69 83 130
-+69 83 130  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  69 83 131  70 84 131
-+70 84 131  70 84 131  69 83 131  69 83 131  68 82 130  68 82 130
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  68 82 130  69 83 131
-+68 82 130  68 82 130  68 82 130  67 81 129  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  67 81 129
-+69 83 130  60 75 125  36 52 108  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 99  39 55 111  63 77 126  66 80 129  66 80 129
-+66 80 128  66 80 129  66 80 128  66 80 127  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  65 79 128
-+65 79 128  65 79 128  64 78 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  64 78 127  65 79 128  64 78 127
-+63 77 126  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  63 77 126  63 77 126  62 76 125  64 78 127
-+37 53 109  23 40 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 43 102
-+51 66 119  61 75 125  59 74 124  61 75 125  61 75 125  61 75 125
-+61 75 125  60 75 125  59 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  59 74 124  60 75 125  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  57 72 122  58 73 123  58 73 123  57 72 122
-+56 71 121  36 52 108  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  32 48 105  53 67 120  55 69 121
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  53 68 119  54 69 120  46 61 115  26 43 102  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  29 45 103  48 63 117  51 66 119
-+49 64 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  48 64 117  46 61 115
-+27 44 102  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  34 50 107  46 61 115
-+45 60 114  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  43 60 114  44 60 114  44 60 114
-+44 60 114  39 55 110  26 43 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  29 45 103  40 56 111  40 56 111  40 56 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+38 54 110  38 54 110  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  26 44 102
-+34 50 107  35 51 108  35 51 108  35 51 108  35 51 108  34 50 107
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  36 52 108  64 78 127  68 82 130  67 81 129  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+67 81 129  68 82 130  68 82 130  68 82 130  69 83 131  68 82 130
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  68 82 130  68 82 130
-+69 83 131  69 83 131  69 83 131  70 84 131  70 84 131  69 83 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  69 83 130
-+69 83 130  69 83 130  69 83 130  69 83 130  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  71 85 132  71 85 132  71 85 132
-+71 85 132  71 85 132  71 85 132  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  69 83 130  69 83 130
-+69 83 130  69 83 130  69 83 130  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  69 83 131  70 84 131  69 83 131
-+69 83 131  69 83 131  68 82 130  68 82 130  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  68 82 130  69 83 131  69 83 131  68 82 130
-+68 82 130  67 81 129  67 81 129  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  67 81 129  67 81 129  69 83 130
-+54 69 120  27 44 102  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+23 39 99  44 60 114  65 79 128  66 80 129  65 79 128  66 80 129
-+66 80 129  66 80 128  66 80 127  66 80 127  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  65 79 128  66 80 128
-+65 79 128  64 78 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  64 78 127  65 79 128  64 78 127  63 77 126
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  63 77 126  62 76 125  64 78 127  42 57 112
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  40 56 111
-+59 74 124  61 75 125  61 75 125  61 75 125  61 75 125  60 75 125
-+60 75 125  59 75 125  59 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  59 74 124  58 73 123  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+59 74 124  57 72 122  58 73 123  58 73 123  58 73 123  58 73 123
-+49 64 117  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  43 59 113  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  55 70 121  56 70 122  55 70 121
-+54 70 120  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+54 69 120  55 70 121  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  53 68 119  37 53 109  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 101  24 41 100  36 52 108  50 65 118  50 65 118
-+49 64 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  50 65 118  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  49 65 116  48 64 117  38 56 110
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  42 58 112  45 60 114
-+44 59 113  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  43 60 114  44 60 114  43 59 113
-+44 60 114  34 50 107  24 41 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  32 48 105  40 56 111  39 55 110  40 56 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  34 50 107  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  29 46 104
-+34 50 107  35 51 108  35 51 108  35 51 108  35 51 108  34 50 107
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  27 44 102  56 71 121  67 81 129  68 82 130
-+68 82 130  67 81 129  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  67 81 129  68 82 130  68 82 130
-+68 82 130  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  68 82 130  68 82 130  69 83 131  69 83 131
-+69 83 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  69 83 130  69 83 130
-+69 83 130  69 83 130  69 83 130  69 83 130  69 83 130  69 83 130
-+69 83 130  69 83 130  69 83 130  69 83 130  69 83 130  69 83 130
-+69 83 130  69 83 130  69 83 130  69 83 130  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  69 83 131  70 84 131
-+70 84 131  69 83 131  69 83 131  69 83 131  68 82 130  68 82 130
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+68 82 130  69 83 131  69 83 131  68 82 130  67 81 129  67 81 129
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  67 81 129  68 82 130  68 82 130  65 79 128  40 57 112
-+23 39 99  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+47 63 116  66 80 129  65 79 128  66 80 128  66 80 129  66 80 129
-+66 80 128  66 80 127  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  65 79 128  66 80 128  66 80 128  64 78 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  64 78 127  65 79 128  64 78 127  63 77 126  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  63 77 126
-+64 78 127  63 77 126  62 76 125  63 77 126  50 65 118  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  29 47 104  57 72 122
-+61 75 125  59 74 124  61 75 125  61 75 125  60 75 125  61 75 125
-+59 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  59 74 124  60 75 125  59 74 124  58 73 123  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  57 72 122  58 73 123  58 73 123  58 73 123  57 72 122
-+31 47 105  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  30 46 104  55 69 121  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  55 70 121  54 70 120
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+55 70 121  54 69 120  53 68 119  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  50 65 118  28 45 103  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  26 43 102  44 60 114  51 66 119  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+50 65 118  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 63 117  47 63 116  32 50 106
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  29 46 104  44 59 113  45 60 114
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  43 60 114  44 60 114  44 60 114  44 60 114
-+42 58 112  30 46 104  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  36 52 108  40 56 111  40 56 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  38 54 110
-+39 55 111  29 46 104  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 100  31 47 105
-+35 51 108  35 51 108  35 51 108  35 51 108  34 50 107  34 50 107
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  23 40 99  42 58 112  62 76 125
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  67 81 129  67 81 129
-+68 82 130  69 83 131  69 83 131  68 82 130  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  68 82 130  68 82 130
-+69 83 131  69 83 131  69 83 131  70 84 131  70 84 131  70 84 131
-+69 83 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  69 83 131
-+69 83 131  69 83 131  68 82 130  68 82 130  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  68 82 130  69 83 131
-+69 83 131  68 82 130  68 82 130  67 81 129  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+67 81 129  68 82 130  68 81 130  54 69 120  31 47 105  23 40 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  27 44 102  50 65 118
-+66 80 129  66 80 129  66 80 128  66 80 129  66 80 128  66 80 128
-+66 80 127  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  65 79 128  65 79 128  64 78 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  64 78 127  63 77 126  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  63 77 126  64 78 127
-+63 77 126  62 76 125  63 77 126  55 70 121  28 45 103  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  51 66 119  62 76 125
-+59 74 124  61 75 125  61 75 125  60 75 125  61 75 125  60 75 125
-+59 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  59 74 124  58 73 123  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+57 72 122  58 73 123  58 73 123  57 72 122  59 74 124  44 59 113
-+23 40 99  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  43 58 114  57 72 122  55 69 121  56 70 122
-+56 70 122  56 70 122  56 70 122  55 70 121  55 70 121  54 70 120
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+54 69 120  54 69 120  53 68 119  54 69 120  54 69 120  54 69 120
-+53 68 119  54 69 120  40 57 112  23 40 100  25 42 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  31 47 105  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  49 65 117  48 63 117  43 60 114  26 43 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  35 51 108  45 60 114  45 60 114
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  45 60 114  43 60 114  44 60 114  44 60 114  44 60 114
-+40 56 111  26 43 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  26 43 101  40 56 111  40 56 111  39 55 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  32 50 106
-+35 51 108  35 51 108  35 51 108  35 51 108  35 51 108  34 50 107
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  31 47 105
-+50 65 118  69 83 131  68 82 130  67 81 129  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+67 81 129  68 82 130  68 82 130  69 83 131  69 83 131  68 82 130
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+68 82 130  68 82 130  68 82 130  69 83 131  69 83 131  69 83 131
-+70 84 131  70 84 131  69 83 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  69 83 131
-+70 84 131  70 84 131  69 83 131  69 83 131  69 83 131  68 82 130
-+68 82 130  68 82 130  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  68 82 130  69 83 131  68 82 130
-+68 82 130  67 81 129  67 81 129  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  67 81 129  68 82 130
-+70 84 131  63 77 126  39 55 111  26 43 102  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  23 40 99  30 46 104  56 70 122  66 80 129
-+66 80 129  65 79 128  66 80 129  66 80 128  66 80 128  66 80 127
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  65 79 128  65 79 128  65 79 128  64 78 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+64 78 127  65 79 128  63 77 126  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  63 77 126
-+63 77 126  62 76 125  59 74 124  33 49 106  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  23 40 99  44 60 114  62 76 125  59 74 124
-+61 75 125  61 75 125  61 75 125  61 75 125  60 75 125  59 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+59 74 124  60 75 125  58 73 123  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  58 73 123  58 73 123  58 73 123
-+57 72 122  58 73 123  57 72 122  58 73 123  54 69 120  26 43 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  30 46 104  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  56 70 122  54 70 120  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+54 69 120  53 68 119  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  53 68 119  27 44 102  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 101  40 56 111  52 67 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  47 63 116  38 54 110  23 40 100
-+25 42 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  26 43 101  39 55 111  46 61 115  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  43 60 114  44 60 114  44 60 114  43 59 113
-+36 52 108  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  31 47 105  40 56 111  39 55 110  40 56 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+35 51 108  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  27 44 102  34 50 107
-+35 51 108  35 51 108  35 51 108  35 51 108  35 51 108  33 49 106
-+25 42 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+25 42 101  35 52 107  63 77 126  69 83 130  68 82 130  67 81 129
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  67 81 129  68 82 130  68 82 130  68 82 130  69 83 131
-+69 83 131  68 82 130  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  68 82 130  68 82 130  69 83 131
-+69 83 131  69 83 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  69 83 131  70 84 131  70 84 131  70 84 131
-+69 83 131  69 83 131  69 83 131  68 82 130  68 82 130  68 82 130
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  68 82 130  69 83 131  69 83 131  68 82 130  68 82 130
-+67 81 129  67 81 129  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+50 65 118  27 44 103  25 42 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 99  34 50 107  63 77 126  66 80 129  66 80 129
-+65 79 128  66 80 128  66 80 128  66 80 127  66 80 127  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+65 79 128  66 80 128  65 79 128  64 78 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  64 78 127
-+65 79 128  64 78 127  63 77 126  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  63 77 126  62 76 125
-+62 76 125  64 78 127  36 52 108  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 100  36 52 108  59 74 124  61 75 125  59 74 124
-+61 75 125  61 75 125  60 75 125  61 75 125  60 75 125  59 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 74 124
-+60 75 125  59 74 124  58 73 123  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  57 72 122
-+58 73 123  58 73 123  58 73 123  59 74 124  35 51 108  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+23 40 99  49 63 116  56 70 122  55 69 121  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  55 70 121  54 70 120  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+54 69 120  53 68 119  54 69 120  54 69 120  54 69 120  53 68 119
-+54 69 120  40 57 112  23 40 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  26 43 101  51 66 119  50 65 118  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  50 65 118
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  49 65 117  48 64 116  47 63 116  29 45 103  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  28 45 103  44 60 114  46 61 115  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  43 60 114  44 60 114  44 60 114  44 60 114  43 59 113
-+29 46 104  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  37 53 109  40 56 111  40 56 111  40 56 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  38 54 110  39 55 111
-+30 46 104  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  28 45 103  35 51 108
-+35 51 108  35 51 108  35 51 108  35 51 108  35 51 108  33 49 106
-+57 72 122  28 45 103  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 100  48 64 117  65 79 128  68 82 130
-+68 82 130  67 81 129  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  67 81 129  67 81 129
-+68 82 130  68 82 130  68 82 130  69 83 131  68 82 130  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  68 82 130  68 82 130  68 82 130  69 83 131
-+69 83 131  69 83 131  69 83 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  69 83 131  70 84 131  70 84 131  70 84 131  70 84 131
-+69 83 131  69 83 131  69 83 131  68 82 130  68 82 130  68 82 130
-+68 82 130  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  68 82 130  69 83 131  69 83 131
-+68 82 130  68 82 130  68 82 130  67 81 129  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+67 81 129  68 82 130  68 82 130  67 81 129  63 77 126  37 53 109
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  40 56 111  64 78 128  66 80 129  66 80 129  66 80 128
-+66 80 129  66 80 128  66 80 127  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  65 79 128  66 80 128
-+66 80 128  64 78 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+64 78 127  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  63 77 126  64 78 127  63 77 126  63 77 126
-+63 77 126  42 58 112  23 40 99  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  29 46 103  56 71 121  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  60 75 125  59 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  59 74 124  60 75 125
-+59 74 124  58 73 123  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  58 73 123  57 72 122  58 73 123
-+58 73 123  58 73 123  58 73 123  48 63 117  26 43 102  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 100  24 41 100
-+34 50 107  56 70 122  55 69 121  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+53 68 119  54 69 120  54 69 120  54 69 120  53 67 120  54 69 120
-+54 69 120  26 43 102  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  38 54 110  51 66 119  50 65 118  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  50 65 118  49 65 117
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  48 64 117  43 58 114  23 40 99  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  34 50 106  47 63 116  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  43 60 114  44 60 114  44 60 114  44 60 114  43 59 113
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+26 43 101  40 56 111  39 55 110  39 55 111  40 56 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 110
-+26 43 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  31 47 105  35 51 108
-+35 51 108  35 51 108  35 51 108  35 51 108  34 50 107  33 49 106
-+66 80 129  60 75 125  36 52 108  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  23 40 99  34 50 107  55 69 121
-+66 80 129  69 83 130  68 82 130  67 81 129  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+67 81 129  67 81 129  68 82 130  68 82 130  69 83 131  69 83 131
-+68 82 130  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  68 82 130
-+68 82 130  68 82 130  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+69 83 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  69 83 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  69 83 131  69 83 131  69 83 131  69 83 131
-+68 82 130  68 82 130  68 82 130  68 82 130  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  68 82 130  68 82 130
-+67 81 129  67 81 129  67 81 129  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  67 81 129
-+68 82 130  68 82 130  62 76 125  46 61 115  25 43 102  23 40 99
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  23 40 100  27 44 102
-+46 61 115  66 80 129  66 80 129  65 79 128  66 80 129  66 80 129
-+66 80 128  66 80 127  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  65 79 128
-+65 79 128  64 78 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  64 78 127  64 78 127  64 78 127
-+63 77 126  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  64 78 127  63 77 126  62 76 125  63 77 126
-+46 61 115  23 40 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  48 63 117  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  60 75 125  60 75 125  59 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 74 124
-+59 74 124  58 73 123  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  59 74 124  57 72 122  58 73 123  58 73 123
-+58 73 123  57 72 122  56 71 121  34 50 106  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+49 64 117  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  56 70 122  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 69 120  55 70 121  53 68 119
-+54 69 120  54 69 120  54 69 120  54 69 120  53 68 119  55 70 121
-+40 56 111  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  50 65 118  50 65 118  49 64 117  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  49 65 117
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  48 64 117
-+49 65 117  48 64 116  49 64 117  31 47 105  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  42 57 112  46 61 115  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  45 60 114
-+44 60 114  44 60 114  44 60 114  43 60 114  44 60 114  35 51 108
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+31 47 105  40 56 111  40 56 111  40 56 111  39 55 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  35 51 108
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  34 50 107  35 51 108
-+35 51 108  35 51 108  35 51 108  35 51 108  34 50 107  33 49 106
-+66 80 129  66 80 129  63 77 126  46 61 115  23 40 99  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  23 40 100  25 42 101
-+37 53 109  56 71 121  69 83 131  68 82 130  67 81 129  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  67 81 129  67 81 129  68 82 130  68 82 130
-+69 83 131  69 83 131  68 82 130  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  69 83 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  70 84 131  70 84 131  70 84 131  70 84 131
-+70 84 131  70 84 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  68 82 130  68 82 130  68 82 130  68 82 130
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  68 82 130
-+69 83 131  69 83 131  68 82 130  68 82 130  68 82 130  67 81 129
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  67 81 129  67 81 129  69 83 130
-+67 81 129  47 63 116  31 47 105  23 40 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  23 40 99  32 50 106  56 70 122
-+67 81 129  66 80 129  65 79 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 127  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  65 79 128  65 79 128  65 79 128
-+64 78 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  64 78 127  65 79 128  64 78 127  63 77 126
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+63 77 126  64 78 127  63 77 126  62 76 125  63 77 126  50 65 118
-+26 43 102  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+39 55 111  61 75 125  61 75 125  59 74 124  61 75 125  61 75 125
-+60 75 125  61 75 125  60 75 125  59 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  59 74 124  59 74 124
-+58 73 123  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  59 74 124  58 73 123  58 73 123  58 73 123  58 73 123
-+57 72 122  58 73 123  45 60 114  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  36 52 108
-+55 69 121  55 69 121  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  53 68 119
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  51 66 119
-+29 46 103  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  23 40 100
-+37 53 109  51 66 119  50 65 118  49 64 117  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  48 65 116
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  48 64 117  45 60 114  25 42 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  28 45 103  46 61 115  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 113  44 60 114  27 44 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+36 52 108  40 56 111  40 56 111  40 56 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  39 55 111  32 48 107
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  26 43 102  35 51 108  35 52 107
-+35 51 108  35 51 108  34 50 107  35 51 108  34 50 107  33 49 106
-+66 80 129  65 79 128  66 80 129  65 79 128  56 70 122  27 44 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  26 43 102  38 56 110  64 78 127  69 83 130  68 82 130
-+67 81 129  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  67 81 129  68 82 130
-+68 82 130  68 82 130  69 83 131  69 83 131  69 83 131  68 82 130
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+70 84 131  70 84 131  70 84 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  68 82 130  69 83 131  69 83 131
-+68 82 130  68 82 130  68 82 130  67 81 129  67 81 129  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  67 81 129  68 82 130  70 84 131  53 68 119
-+29 46 103  25 42 101  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  39 55 111  62 76 125  66 80 129
-+66 80 129  65 79 128  66 80 128  66 80 129  66 80 128  66 80 127
-+66 80 127  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  65 79 128  66 80 128  65 79 128  64 78 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  64 78 127  65 79 128  64 78 127  63 77 126  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  62 76 125  63 77 126  56 71 121  27 44 102
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  32 48 105
-+61 75 125  61 75 125  59 74 124  61 75 125  61 75 125  60 75 125
-+61 75 125  60 75 125  59 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  59 74 124  59 74 124  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  57 72 122  57 72 122  58 73 123  58 73 123
-+58 73 123  56 71 121  25 42 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  27 44 102  49 64 117
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  55 70 121
-+56 70 122  55 70 121  54 70 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  55 70 121  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  55 68 119  54 69 120  40 57 112
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+47 63 116  50 65 118  49 64 117  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  48 65 116  48 65 116
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 116  49 65 117  34 50 107  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  37 53 109  46 61 115  45 60 114  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+43 60 114  44 60 114  44 60 114  44 60 114  39 55 111  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  26 43 102
-+38 54 110  39 55 110  39 55 111  40 56 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  38 54 110  29 46 103
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  30 46 104  35 51 108  34 50 108
-+35 51 108  35 51 108  35 51 108  34 50 107  34 50 107  31 47 105
-+66 80 129  66 80 129  66 80 128  65 79 128  66 80 129  61 75 125
-+34 50 108  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  44 60 114  64 78 127
-+67 81 129  68 82 130  68 82 130  67 81 129  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  67 81 129  67 81 129  68 82 130  68 82 130
-+68 82 130  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  68 82 130
-+69 83 131  69 83 131  68 82 130  68 82 130  67 81 129  67 81 129
-+67 81 129  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  67 81 129  67 81 129
-+68 82 130  68 82 130  66 80 129  58 73 123  32 48 107  23 40 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  26 43 102  46 61 115  67 81 129  66 80 129  65 79 128
-+66 80 129  66 80 129  66 80 129  66 80 127  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+65 79 128  66 80 128  66 80 128  64 78 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  64 78 127  63 77 126  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  63 77 126  64 78 127
-+63 77 126  62 76 125  63 77 126  59 74 124  27 44 103  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  27 44 103  59 72 123
-+61 75 125  61 75 125  61 75 125  61 75 125  60 75 125  61 75 125
-+60 75 125  59 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  59 74 124  58 73 123  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+59 74 124  58 73 123  57 72 122  58 73 123  57 72 122  58 73 123
-+59 74 124  34 50 107  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  37 53 109  57 72 122
-+55 69 121  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  54 69 120  55 70 121  54 69 120  53 68 119  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  51 66 119  31 47 105
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  34 50 107
-+50 65 118  50 65 118  49 64 117  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  49 65 117  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 64 116
-+48 64 117  46 61 115  27 44 102  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  45 60 114  46 61 115  45 60 114  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+43 60 114  44 60 114  44 60 114  44 60 114  32 48 107  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  30 48 104
-+39 55 110  40 56 111  40 56 111  39 55 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  36 52 108  26 43 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  33 49 106  35 51 108  35 51 108
-+35 51 108  35 51 108  35 51 108  34 50 107  34 50 107  28 45 103
-+66 80 128  66 80 128  66 80 129  66 80 128  65 79 128  66 80 129
-+65 79 128  44 60 114  28 45 103  23 40 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  23 40 99  27 44 103
-+46 61 115  59 74 124  68 82 130  68 82 130  68 82 130  67 81 129
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  67 81 129  67 81 129
-+68 82 130  68 82 130  68 82 130  69 83 131  69 83 131  69 83 131
-+68 82 130  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+68 82 130  68 82 130  68 82 130  67 81 129  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  67 81 129  68 82 130  69 83 130
-+65 79 128  55 69 121  38 54 109  23 40 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+34 50 107  57 72 122  68 82 130  65 79 128  65 79 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 127  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  65 79 128
-+66 80 128  65 79 128  65 79 128  64 78 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  64 78 127
-+64 78 127  64 78 127  63 77 126  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  63 77 126  64 78 127  63 77 126
-+62 76 125  63 77 126  58 73 123  29 47 104  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  26 43 102  51 66 119  61 75 125
-+59 74 124  61 75 125  61 75 125  61 75 125  61 75 125  60 75 125
-+60 75 125  59 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  59 74 124  60 75 125  58 73 123  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  57 72 122  58 73 123  58 73 123  57 72 122  58 73 123
-+46 61 115  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  27 44 102  54 69 120  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  55 70 121
-+55 70 121  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  54 69 120  53 68 119  54 69 120
-+54 69 120  54 69 120  53 68 119  54 69 120  44 59 113  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  42 58 112
-+51 66 119  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  49 65 117
-+48 64 117  38 56 110  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+33 49 106  46 61 115  45 60 114  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  43 60 114
-+44 60 114  44 60 114  44 60 114  43 59 113  26 43 102  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  35 52 107
-+40 56 111  39 55 111  40 56 111  39 55 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  34 50 107  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 43 102  35 51 108  34 50 107  35 51 108
-+35 51 108  34 50 107  35 51 108  34 50 107  34 50 107  25 42 101
-+66 80 127  66 80 128  66 80 128  66 80 129  66 80 129  65 79 128
-+66 80 129  67 81 129  56 71 121  36 52 108  23 40 99  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+23 40 100  30 46 104  40 57 112  58 73 123  69 83 131  68 82 130
-+67 81 129  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+67 81 129  67 81 129  67 81 129  68 82 130  68 82 130  68 82 130
-+69 83 131  69 83 131  69 83 131  68 82 130  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  68 82 130  69 83 131
-+69 83 131  69 83 131  68 82 130  68 82 130  68 82 130  68 82 130
-+67 81 129  67 81 129  67 81 129  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  67 81 129  68 82 130  69 83 131  67 81 129  50 65 118
-+36 52 108  25 42 101  23 40 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  46 61 115
-+63 77 126  66 80 129  65 79 128  66 80 129  66 80 128  66 80 129
-+66 80 128  66 80 127  66 80 127  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  65 79 128  66 80 128
-+65 79 128  65 79 128  64 78 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  64 78 127  65 79 128
-+64 78 127  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  63 77 126  64 78 127  63 77 126  62 76 125
-+63 77 126  58 73 123  33 49 106  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  44 60 114  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  60 75 125  60 75 125  60 75 125
-+59 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+59 74 124  60 75 125  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  59 74 124
-+57 72 122  58 73 123  58 73 123  58 73 123  58 73 123  53 67 120
-+29 45 103  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 100  23 40 100  45 60 114  56 70 122  55 69 121
-+56 70 122  56 70 122  56 70 122  56 70 122  55 70 121  56 70 122
-+54 70 120  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  54 69 120  54 69 120  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  53 67 120  54 69 120  29 46 103  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 100  29 47 104  50 65 118
-+50 65 118  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  50 65 118  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 64 117
-+47 63 116  32 48 107  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+40 57 112  46 61 115  45 60 114  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  43 60 114
-+44 60 114  43 59 113  44 60 114  37 53 109  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  26 44 102  37 53 109
-+40 56 111  40 56 111  39 55 111  39 55 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  30 46 104  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  29 46 104  35 51 108  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  34 50 107  32 48 107  24 41 100
-+66 80 128  66 80 127  66 80 127  66 80 128  66 80 129  66 80 128
-+65 79 128  66 80 129  66 80 129  64 78 127  46 61 115  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  25 42 100  26 43 101  36 52 108  58 73 123
-+70 84 131  68 82 130  67 81 129  67 81 129  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  67 81 129  67 81 129  68 82 130
-+68 82 130  68 82 130  68 82 130  69 83 131  69 83 131  69 83 131
-+68 82 130  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  68 82 130  69 83 131  69 83 131  69 83 131  68 82 130
-+68 82 130  68 82 130  68 82 130  67 81 129  67 81 129  67 81 129
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  69 83 130  68 81 130  48 63 117  29 46 104  25 42 101
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  23 40 100  29 47 104  59 74 124  65 79 128
-+66 80 129  66 80 129  66 80 128  66 80 129  66 80 129  66 80 128
-+66 80 127  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  65 79 128  66 80 128  65 79 128
-+64 78 128  64 78 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  64 78 127  65 79 128  64 78 127
-+63 77 126  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  63 77 126  62 76 125  62 76 125
-+61 75 125  35 52 107  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  37 53 109  61 75 125  61 75 125  59 74 124
-+61 75 125  61 75 125  61 75 125  61 75 125  60 75 125  59 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  59 74 124  58 73 123  58 73 123  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  58 73 123  59 74 124  58 73 123
-+57 72 122  58 73 123  58 73 123  57 72 122  57 72 122  38 54 110
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  33 49 106  55 69 121  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  55 70 121  56 70 122  55 70 121
-+54 70 120  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+54 69 120  55 70 121  53 68 119  54 69 120  54 69 120  54 69 120
-+54 69 120  53 68 119  54 69 120  42 58 112  23 40 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  40 56 111  51 66 119
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  49 65 117  48 63 117
-+43 60 114  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  29 46 104
-+44 60 114  45 60 114  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  43 60 114  43 60 114
-+44 60 114  44 60 114  43 59 113  32 48 105  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 101  29 46 104  40 56 111
-+40 56 111  40 56 111  39 55 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 110  38 54 110  25 42 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  32 48 107  35 51 108  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  34 50 107  29 45 103  24 41 100
-+66 80 128  66 80 128  66 80 128  66 80 127  66 80 128  66 80 129
-+66 80 129  66 80 129  65 79 128  66 80 129  68 81 130  58 73 123
-+31 47 105  25 42 101  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  23 40 99
-+33 49 106  56 71 121  65 79 128  67 81 129  68 82 130  68 82 130
-+68 81 130  67 81 129  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  67 81 129  67 81 129  67 81 129  67 81 129
-+68 82 130  68 82 130  68 82 130  68 82 130  69 83 131  69 83 131
-+69 83 131  69 83 131  68 82 130  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  68 82 130
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  68 82 130
-+68 82 130  68 82 130  68 82 130  67 81 129  67 81 129  67 81 129
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  66 80 129
-+63 77 126  46 61 115  26 43 102  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  26 43 101  44 60 114  67 81 129  66 80 129  65 79 128
-+66 80 128  66 80 129  66 80 129  66 80 128  66 80 127  66 80 127
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  65 79 128  64 78 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  64 78 127  64 78 127  64 78 127  64 78 127  63 77 126
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+63 77 126  64 78 127  63 77 126  62 76 125  63 77 126  62 76 125
-+38 54 109  23 40 99  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 101
-+24 41 100  31 47 105  61 75 125  61 75 125  60 75 125  61 75 125
-+61 75 125  60 75 125  61 75 125  60 75 125  59 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 74 124
-+60 75 125  59 74 124  58 73 123  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  58 73 123  59 74 124  58 73 123  57 72 122
-+58 73 123  58 73 123  57 72 122  58 73 123  49 65 117  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  49 64 117  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  56 70 122  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+55 70 121  53 68 119  54 69 120  54 69 120  54 69 120  54 69 120
-+53 68 119  54 69 120  54 69 120  25 43 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  27 44 102  51 66 119  50 65 118
-+49 64 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  49 65 117  48 64 116  47 63 116
-+35 51 108  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  36 52 108
-+46 61 115  45 60 114  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  44 60 114  43 60 114  44 60 114
-+44 60 114  44 60 114  40 57 112  27 44 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  34 50 106  40 56 111
-+40 56 111  39 55 111  39 55 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  34 50 108  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 102  34 50 107  34 50 108  35 51 108  35 51 108
-+35 51 108  34 50 107  34 50 107  34 50 107  26 43 102  24 41 100
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 127  66 80 128
-+66 80 128  66 80 129  66 80 128  66 80 129  65 79 128  66 80 129
-+66 80 129  46 61 115  29 46 104  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  23 39 99  31 47 105  47 63 116  58 73 123  66 80 128
-+69 83 130  68 82 130  67 81 129  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+67 81 129  67 81 129  67 81 129  67 81 129  68 82 130  68 82 130
-+68 82 130  68 82 130  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  68 82 130  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  67 81 129
-+67 81 129  67 81 129  67 81 129  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  67 81 129
-+68 82 130  68 82 130  69 83 130  63 77 126  54 69 120  40 56 111
-+25 42 101  23 39 99  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+36 52 108  56 70 122  68 81 130  66 80 129  66 80 129  66 80 128
-+66 80 129  66 80 128  66 80 128  66 80 127  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+65 79 128  66 80 128  65 79 128  65 79 128  64 78 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+64 78 127  65 79 128  64 78 127  63 77 126  63 77 126  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  63 77 126
-+64 78 127  63 77 126  62 76 125  63 77 126  61 75 125  38 54 109
-+23 39 99  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  23 40 100
-+29 47 104  57 72 122  61 75 125  59 74 124  61 75 125  61 75 125
-+60 75 125  61 75 125  60 75 125  59 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  59 74 124  60 75 125
-+59 74 124  58 73 123  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  58 73 123  58 73 123  57 72 122
-+58 73 123  57 72 122  58 73 123  55 71 121  29 46 103  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  37 53 109  55 69 121  55 69 121  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+54 69 120  53 68 119  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  55 70 121  38 56 110  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 100  23 40 100  40 57 112  51 66 119  50 65 118
-+49 64 117  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+50 65 118  49 65 117  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  48 64 117  47 63 116
-+25 42 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  27 43 102  40 57 112
-+46 61 115  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  43 60 114  44 60 114
-+44 60 114  43 59 113  38 54 109  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  38 54 110  40 56 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  39 55 111  29 46 104  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  28 45 103  34 50 107  35 51 108  35 51 108  35 51 108
-+35 51 108  34 50 107  33 49 106  32 48 107  25 42 101  25 42 101
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 127
-+66 80 127  66 80 128  66 80 129  66 80 129  66 80 128  65 79 128
-+66 80 129  66 80 129  59 74 124  42 57 112  23 40 99  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  23 40 99  27 44 103  36 52 108
-+47 63 116  62 76 125  71 85 132  69 83 130  68 82 130  67 81 129
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  67 81 129  67 81 129
-+67 81 129  67 81 129  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  69 83 131
-+69 83 131  69 83 131  69 83 131  69 83 131  69 83 131  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  67 81 129  67 81 129  67 81 129  67 81 129  67 81 129
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  67 81 129  68 82 130  70 84 131
-+68 82 130  55 71 121  42 57 112  32 50 106  25 42 101  23 40 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  23 40 99  31 47 105  51 66 119
-+64 78 127  67 81 129  66 80 129  65 79 128  66 80 129  66 80 129
-+66 80 128  66 80 127  66 80 127  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  65 79 128
-+66 80 128  65 79 128  65 79 128  64 78 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  64 78 127
-+65 79 128  64 78 127  63 77 126  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  63 77 126  64 78 127
-+63 77 126  62 76 125  63 77 126  61 75 125  37 53 109  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  28 45 103
-+53 67 120  61 75 125  59 74 124  61 75 125  61 75 125  61 75 125
-+61 75 125  60 75 125  60 75 125  59 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 74 124
-+58 73 123  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  58 73 123  58 73 123  57 72 122  58 73 123
-+58 73 123  57 72 122  59 74 124  35 51 108  23 40 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+28 45 102  51 66 119  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  56 70 122  55 70 121  54 70 120  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  55 70 121
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  53 68 119
-+54 69 120  49 65 117  28 45 103  24 41 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  28 45 103  50 65 118  50 65 118  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  49 65 117  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  49 65 117  48 64 116  48 64 117  37 53 109
-+23 40 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  31 47 105  46 61 115
-+45 60 114  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  45 60 114  43 60 114  44 60 114  44 60 114
-+43 59 113  43 59 113  31 47 105  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  28 45 104  40 56 111  39 55 110
-+39 55 111  40 56 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 110  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  31 47 105  35 51 108  35 51 108  35 51 108  35 51 108
-+35 51 108  34 50 107  34 50 107  30 46 104  25 42 101  25 42 101
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 127  66 80 128  66 80 128  66 80 129  66 80 128
-+65 79 128  66 80 129  66 80 129  65 79 128  57 72 122  32 50 106
-+23 40 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+25 42 101  27 44 102  34 50 107  52 67 118  67 81 129  69 83 130
-+68 82 130  67 81 129  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  67 81 129  67 81 129  67 81 129  67 81 129
-+67 81 129  67 81 129  67 81 129  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  67 81 129
-+67 81 129  67 81 129  67 81 129  67 81 129  67 81 129  67 81 129
-+67 81 129  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+67 81 129  68 82 130  68 82 130  69 83 131  63 77 126  45 60 114
-+30 46 104  26 43 102  25 42 101  24 41 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  44 60 114  63 77 126  66 80 129
-+66 80 129  65 79 128  66 80 129  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 127  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  65 79 128  66 80 128
-+65 79 128  64 78 128  64 78 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  64 78 127  65 79 128
-+64 78 127  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  63 77 126
-+62 76 125  62 76 125  61 75 125  38 54 109  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  26 43 101  48 64 116
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  60 75 125
-+60 75 125  59 75 125  59 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  59 74 124  60 75 125  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  58 73 123  57 72 122  58 73 123  58 73 123
-+57 72 122  59 74 124  44 59 113  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+40 57 112  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  54 70 120  54 70 120  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+53 68 119  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  38 56 110  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 101  23 40 99  42 58 112  51 66 119  49 64 117  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  48 64 117  48 64 116  26 43 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  38 54 109  46 61 115
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  43 60 114  44 60 114  44 60 114
-+44 60 114  42 58 112  24 41 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  35 52 107  40 56 111  40 56 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  33 49 106  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  32 50 106  35 51 108  35 51 108  35 51 108  35 51 108
-+34 50 107  34 50 107  33 49 106  27 44 103  24 41 100  25 42 101
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 127  66 80 128  66 80 128
-+66 80 129  66 80 129  66 80 128  65 79 128  66 80 129  66 80 128
-+47 63 116  28 45 103  25 42 101  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  23 40 99  25 42 101  39 55 111
-+56 71 121  65 79 128  66 80 129  67 81 129  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  67 81 129  68 82 130  68 82 130  68 82 130  67 81 129
-+65 79 128  63 77 126  49 64 117  32 48 105  23 39 99  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+25 42 101  34 50 107  59 74 124  68 81 130  66 80 129  65 79 128
-+66 80 128  66 80 129  66 80 128  66 80 128  66 80 127  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  65 79 128  66 80 128  65 79 128  65 79 128
-+64 78 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  64 78 127  65 79 128  64 78 127
-+63 77 126  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  63 77 126  64 78 127  63 77 126  62 76 125
-+63 77 126  61 75 125  38 56 110  23 40 99  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  43 58 114  63 77 126
-+59 74 124  61 75 125  61 75 125  61 75 125  60 75 125  61 75 125
-+59 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  59 74 124  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+59 74 124  58 73 123  57 72 122  58 73 123  58 73 123  58 73 123
-+58 73 123  53 68 119  28 45 103  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  29 46 104
-+57 72 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  56 70 122  55 70 121  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+53 68 119  54 69 120  54 69 120  54 69 120  54 69 120  53 68 119
-+49 64 117  27 44 103  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  30 46 104  48 63 117  50 65 118  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  48 64 117  37 53 109  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  46 61 115  46 61 115
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  45 60 114  44 60 114  44 60 114  44 60 114  43 59 113
-+44 60 114  34 50 107  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  40 56 111  39 55 110  39 55 111
-+40 56 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  28 45 103  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+27 44 102  34 50 107  35 51 108  35 51 108  35 51 108  35 51 108
-+35 51 108  33 49 106  33 49 106  27 43 102  24 41 100  25 42 101
-+66 80 128  65 79 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 127  66 80 127
-+66 80 128  66 80 128  66 80 129  66 80 128  65 79 128  66 80 129
-+68 82 130  62 76 125  42 58 112  29 46 104  23 40 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  23 40 100
-+23 39 99  27 44 102  39 55 110  50 65 118  57 72 122  63 77 126
-+68 82 130  69 83 130  68 82 130  68 82 130  68 82 130  67 81 129
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+69 83 130  69 83 131  66 80 128  60 75 125  55 69 121  46 61 115
-+34 50 107  23 40 100  23 39 99  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 100  35 52 107
-+51 66 119  68 81 130  66 80 129  65 79 128  66 80 129  66 80 128
-+66 80 129  66 80 128  66 80 128  66 80 127  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  65 79 128  66 80 128  65 79 128  64 78 128  64 78 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  64 78 127  65 79 128  65 79 128  64 78 127  63 77 126
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  64 78 127  63 77 126  62 76 125  63 77 126
-+59 74 124  37 53 109  23 39 99  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  40 56 111  63 77 126  59 74 124
-+61 75 125  61 75 125  61 75 125  60 75 125  61 75 125  60 75 125
-+59 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  59 74 124  59 74 124  59 74 124  58 73 123  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  59 74 124
-+58 73 123  57 72 122  58 73 123  58 73 123  58 73 123  57 72 122
-+57 72 122  36 52 108  24 41 100  25 42 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  50 65 118
-+56 70 122  55 69 121  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  54 70 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 69 120  54 69 120  53 68 119
-+54 69 120  54 69 120  54 69 120  54 69 120  53 68 119  54 69 120
-+37 53 109  23 40 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 101  39 55 110  51 66 119  49 64 117  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  50 65 118
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  48 64 117  47 63 116  27 44 103  25 42 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  35 51 108  46 61 115  45 60 114
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 113  26 43 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  31 47 105  40 56 111  40 56 111  40 56 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  37 53 109  25 43 102  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+29 46 104  35 51 108  34 50 107  35 51 108  35 51 108  34 50 107
-+35 51 108  33 49 106  31 47 105  25 42 101  24 41 100  25 42 101
-+65 79 128  66 80 128  65 79 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 127  66 80 128  66 80 128  66 80 129  66 80 128  66 80 129
-+65 79 128  66 80 129  67 80 128  59 74 124  44 60 114  26 43 101
-+23 40 99  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  23 40 100  23 40 99  27 44 102  33 49 106
-+38 54 110  47 63 116  57 72 122  66 80 129  70 84 131  69 83 131
-+69 83 130  68 82 130  68 82 130  68 81 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  69 83 130  70 84 131  70 84 131  62 76 125
-+53 68 119  43 59 113  36 52 108  31 47 105  25 42 100  23 40 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  23 39 99  34 50 107  52 67 118  63 77 126
-+67 80 128  66 80 129  65 79 128  66 80 128  66 80 129  66 80 129
-+66 80 128  66 80 128  66 80 127  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  65 79 128  64 78 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+64 78 127  65 79 128  64 78 127  64 78 127  63 77 126  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+63 77 126  64 78 127  63 77 126  62 76 125  63 77 126  58 73 123
-+35 52 107  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  23 40 100  40 57 112  59 74 124  61 75 125  59 74 124
-+61 75 125  61 75 125  60 75 125  61 75 125  60 75 125  59 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  59 74 124  58 73 123  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+58 73 123  57 72 122  58 73 123  58 73 123  57 72 122  58 73 123
-+43 60 114  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 101  23 40 99  40 57 112  56 70 122
-+55 69 121  56 70 122  56 70 122  56 70 122  56 70 122  55 70 121
-+56 70 122  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  55 70 121  53 68 119  54 69 120
-+54 69 120  54 69 120  54 69 120  53 67 120  54 69 120  49 63 116
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+27 44 103  48 63 117  50 65 118  49 64 117  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  49 65 116  48 64 117  39 55 111  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 100  44 60 114  45 60 114  45 60 114
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+45 60 114  44 60 114  43 60 114  44 60 114  43 60 114  44 60 114
-+37 53 109  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  37 53 109  40 56 111  40 56 111  40 56 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  38 54 110
-+39 55 111  32 50 106  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+32 48 107  35 51 108  35 51 108  35 51 108  35 51 108  35 51 108
-+34 50 107  33 49 106  29 46 104  24 41 100  25 42 101  25 42 101
-+64 78 128  65 79 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 127  66 80 128  66 80 128  66 80 129  66 80 129
-+66 80 128  66 80 129  66 80 129  66 80 129  65 79 128  63 77 126
-+42 58 112  24 41 100  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 101  24 41 100  24 41 100
-+24 41 100  25 42 101  26 43 102  27 44 103  34 50 107  45 60 114
-+55 70 121  65 79 128  69 83 131  69 83 130  68 82 130  68 82 130
-+68 82 130  67 81 129  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  67 81 129  68 82 130  68 82 130  68 82 130  69 83 131
-+69 83 131  61 75 125  50 65 118  39 55 111  29 46 103  27 44 102
-+26 43 101  25 42 101  24 41 100  24 41 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+23 40 100  29 46 104  53 67 120  64 78 127  66 80 129  66 80 129
-+65 79 128  65 79 128  66 80 129  66 80 129  66 80 128  66 80 128
-+66 80 127  66 80 127  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  65 79 128
-+65 79 128  65 79 128  65 79 128  64 78 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  64 78 127  63 77 126  63 77 126  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  62 76 125  63 77 126  60 75 125  33 49 106
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  37 53 109  59 74 124  61 75 125  59 74 124  61 75 125
-+61 75 125  61 75 125  61 75 125  60 75 125  59 75 125  59 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+59 74 124  60 75 125  58 73 123  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+57 72 122  58 73 123  58 73 123  57 72 122  58 73 123  53 68 119
-+25 42 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  32 48 107  53 67 120  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  55 70 121  56 70 122
-+55 70 121  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 69 120  53 68 119  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  55 70 121  29 47 104
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+38 54 110  51 66 119  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  50 65 118  48 65 116
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  47 63 116  31 47 105  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  33 49 106  46 61 115  45 60 114  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  43 60 114  43 60 114  44 60 114  44 60 113  44 60 114
-+29 46 104  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  28 45 103  38 56 110  39 55 110  39 55 111  40 56 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+38 54 110  29 46 104  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+35 51 108  35 51 108  35 51 108  35 51 108  35 51 108  35 51 108
-+34 50 107  33 49 106  26 43 102  24 41 100  25 42 101  25 42 101
-+65 79 128  64 78 128  64 78 128  65 79 128  66 80 128  66 80 128
-+65 79 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 127  66 80 128
-+66 80 129  66 80 129  66 80 128  66 80 129  65 79 128  66 80 129
-+66 80 129  61 75 125  38 54 110  27 44 102  25 42 101  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  24 41 100
-+23 40 100  23 40 99  28 45 103  37 53 109  47 63 116  55 70 121
-+63 77 126  65 79 128  65 79 128  66 80 128  66 81 129  67 81 129
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  68 82 130  68 82 130  68 82 130  68 82 130
-+68 82 130  68 82 130  67 81 129  67 81 129  66 80 129  66 80 128
-+65 79 128  64 79 127  59 74 124  51 67 118  42 58 112  34 50 106
-+25 42 101  23 40 99  23 40 100  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  25 42 101  29 46 103
-+49 64 117  66 80 129  66 80 129  66 80 129  66 80 129  66 80 128
-+66 80 129  66 80 129  66 80 128  66 80 127  66 80 127  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  65 79 128  66 80 128  65 79 128  65 79 128
-+64 78 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  64 78 127  65 79 128  65 79 128
-+64 78 127  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  63 77 126  64 78 127  64 78 127
-+63 77 126  62 76 125  63 77 126  59 74 124  30 46 104  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+32 50 106  58 73 123  61 75 125  59 74 124  61 75 125  61 75 125
-+60 75 125  61 75 125  60 75 125  59 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  59 74 124  60 75 125
-+60 75 125  58 73 123  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  58 73 123  59 74 124  58 73 123  57 72 122
-+58 73 123  58 73 123  57 72 122  58 73 123  57 72 122  27 44 103
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  26 43 101  46 61 115  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  55 70 121  56 70 122  55 70 121
-+54 70 120  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+54 69 120  55 70 121  54 69 120  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  42 58 112  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  27 44 102
-+50 65 118  50 65 118  49 64 117  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  50 65 118  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  48 63 117  43 59 113  25 42 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  42 57 112  46 61 115  45 60 114  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  43 60 114  44 60 114  43 59 113  44 60 114  40 56 111
-+26 43 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  32 50 106  39 55 111  39 55 111  40 56 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+37 53 109  26 43 102  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  28 45 103
-+35 51 108  35 51 108  35 51 108  35 51 108  35 51 108  35 51 108
-+34 50 107  33 49 106  24 41 101  24 41 100  25 42 101  25 42 101
-+65 79 128  65 79 128  65 79 128  64 78 128  65 79 128  65 79 128
-+66 80 128  65 79 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 127
-+66 80 128  66 80 128  66 80 129  66 80 129  66 80 128  66 80 129
-+66 80 129  66 80 129  68 82 130  58 73 123  40 57 112  29 47 104
-+24 41 100  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 100  24 41 100  23 40 100  23 40 99  23 39 99
-+23 39 99  27 44 102  32 50 106  37 53 109  42 58 112  47 63 116
-+51 66 119  54 69 120  56 71 121  57 72 122  59 74 124  60 75 125
-+62 76 125  63 77 126  64 78 127  64 78 127  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  64 78 128  64 78 127
-+63 77 126  63 77 126  61 75 125  59 74 124  58 73 123  57 72 122
-+55 70 121  53 68 119  49 64 117  45 60 114  40 56 111  35 51 108
-+30 46 104  24 41 100  22 39 98  23 39 99  23 40 100  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  23 40 100  26 43 101  35 51 108  49 65 117  66 80 129
-+68 81 130  66 80 129  65 79 128  66 80 129  66 80 129  66 80 129
-+66 80 128  66 80 128  66 80 127  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  65 79 128  66 80 128  65 79 128  65 79 128  64 78 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  64 78 127  65 79 128  64 78 127  64 78 127
-+63 77 126  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  63 77 126  64 78 127  63 77 126  63 77 126
-+62 76 125  63 77 126  54 69 120  29 45 103  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  23 40 100  33 49 106
-+58 73 123  61 75 125  59 74 124  61 75 125  61 75 125  61 75 125
-+61 75 125  60 75 125  59 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 74 124
-+59 74 124  58 73 123  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  58 73 123  57 72 122  58 73 123
-+58 73 123  58 73 123  58 73 123  57 72 122  36 52 108  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  36 52 108  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  55 70 121  55 70 121
-+54 70 120  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  53 68 119  54 69 120  51 66 119  29 45 103  24 41 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 100  23 40 100  40 56 111
-+51 66 119  50 65 118  49 64 117  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  49 65 117
-+48 64 116  48 64 117  33 49 106  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  31 47 105  44 60 114  46 61 115  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+44 60 114  43 60 114  44 60 114  44 60 114  44 60 114  34 50 107
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  36 52 108  40 56 111  40 56 111  39 55 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  38 54 110
-+34 50 107  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  32 48 107
-+35 51 108  35 51 108  35 51 108  35 51 108  35 51 108  34 50 107
-+34 50 107  30 46 104  24 41 100  25 42 101  25 42 101  25 42 101
-+65 79 128  65 79 128  65 79 128  65 79 128  64 78 128  65 79 128
-+65 79 128  66 80 128  65 79 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 127  66 80 127  66 80 128  66 80 128  66 80 129  66 80 129
-+66 80 129  65 79 128  65 79 128  66 80 129  67 81 129  59 74 124
-+49 64 117  33 49 106  23 39 99  23 40 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  24 41 100  24 41 100  23 40 100  23 40 99
-+23 40 99  24 41 100  25 42 101  27 44 102  29 46 104  29 47 104
-+32 48 105  33 49 106  34 50 106  34 50 107  35 52 107  35 51 108
-+35 51 108  36 52 108  35 51 108  35 52 107  34 50 107  34 50 107
-+33 49 106  32 50 106  31 47 105  30 46 104  28 45 103  27 43 102
-+25 42 101  23 40 99  23 40 99  23 40 100  23 40 100  24 41 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  23 40 99
-+26 43 102  40 57 112  55 70 121  63 77 126  67 81 129  66 80 129
-+65 79 128  66 80 129  66 80 128  66 80 129  66 80 128  66 80 128
-+66 80 128  66 80 127  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+65 79 128  66 80 128  65 79 128  65 79 128  64 78 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  64 78 127  64 78 127  63 77 126
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  63 77 126  63 77 126  62 76 125
-+63 77 126  50 65 118  28 45 103  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  23 40 99  33 49 106  57 72 122
-+61 75 125  59 74 124  61 75 125  61 75 125  61 75 125  60 75 125
-+61 75 125  59 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  59 74 124  59 74 124  59 74 124
-+58 73 123  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  59 74 124  57 72 122  58 73 123  58 73 123
-+58 73 123  57 72 122  58 73 123  43 60 114  25 42 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  28 45 103  55 69 121  56 70 122  55 69 121  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  55 70 121  54 70 120
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+55 70 121  54 69 120  53 68 119  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  55 68 119  39 55 110  24 41 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  29 46 104  50 65 118
-+50 65 118  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  50 65 118  49 65 117  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 64 117
-+48 64 117  44 60 114  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  37 53 109  46 61 115  45 60 114  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  45 60 114
-+43 60 114  44 60 114  44 60 114  44 60 114  42 58 112  29 45 103
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+27 44 103  39 55 110  40 56 111  40 56 111  39 55 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  38 54 111  38 54 110
-+29 46 104  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  35 51 108
-+35 52 107  35 51 108  35 51 108  34 50 107  35 51 108  34 50 107
-+34 50 107  26 43 102  24 41 100  25 42 101  25 42 101  25 42 101
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  64 78 128
-+65 79 128  65 79 128  66 80 128  65 79 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 127  66 80 128  66 80 128  66 80 128
-+66 80 129  66 80 128  66 80 129  66 80 129  66 80 129  66 80 129
-+65 79 128  64 78 127  57 72 122  36 52 108  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  23 40 100  26 43 101  46 61 115
-+61 75 125  65 79 128  66 80 129  66 80 129  66 80 128  65 79 128
-+66 80 128  66 80 129  66 80 129  66 80 128  66 80 128  66 80 127
-+66 80 127  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  65 79 128  66 80 128
-+66 80 128  65 79 128  64 78 128  64 78 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+64 78 127  65 79 128  64 78 127  63 77 126  63 77 126  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  63 77 126  62 76 125  62 76 125  63 77 126
-+48 63 117  25 42 101  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  32 48 105  56 70 122  61 75 125
-+59 74 124  61 75 125  61 75 125  61 75 125  60 75 125  61 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  59 74 124  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  59 74 124  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  52 67 118  26 43 102  24 41 100  25 42 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+23 40 100  49 64 117  56 70 122  55 69 121  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  56 70 122  54 70 120  54 70 120
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+54 69 120  53 68 119  53 68 119  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  50 65 118  27 44 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  23 40 100  43 60 114  51 66 119
-+49 64 117  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  48 65 116  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  49 65 117  48 64 116
-+49 65 117  31 47 105  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+28 45 103  43 59 113  46 61 115  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+43 60 114  44 60 114  44 60 114  44 60 113  39 55 110  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+32 48 105  40 56 111  40 56 111  40 56 111  39 55 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 110  37 53 109
-+25 42 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  29 46 104  35 51 108
-+34 50 108  35 51 108  35 51 108  35 51 108  34 50 107  34 50 107
-+32 48 107  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  66 80 128
-+65 79 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 127
-+66 80 128  66 80 128  66 80 128  66 80 129  66 80 129  66 80 128
-+66 80 129  65 79 128  66 80 129  68 81 130  60 75 125  40 57 112
-+27 44 102  25 42 101  24 41 100  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+25 42 101  26 43 101  32 48 105  50 65 118  67 80 128  66 80 129
-+66 80 129  65 79 128  66 80 129  66 80 128  66 80 129  66 80 129
-+66 80 128  66 80 128  66 80 127  66 80 127  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  65 79 128  66 80 128  65 79 128  65 79 128
-+64 78 128  64 78 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  63 77 126  63 77 126  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  63 77 126  64 78 127
-+64 78 127  63 77 126  62 76 125  63 77 126  62 76 125  44 59 113
-+23 39 99  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  30 46 104  55 70 121  61 75 125  59 74 124
-+61 75 125  61 75 125  61 75 125  60 75 125  61 75 125  60 75 125
-+59 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  59 74 124  60 75 125  59 74 124  58 73 123  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+59 74 124  58 73 123  57 72 122  58 73 123  58 73 123  57 72 122
-+58 73 123  56 71 121  29 46 104  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+39 55 111  56 70 122  55 69 121  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  56 70 122  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  55 70 121
-+54 69 120  53 68 119  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  53 68 119  36 52 108  23 40 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  31 47 105  49 64 117  50 65 118
-+49 64 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  49 65 117  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 116  48 64 117
-+43 59 113  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+34 50 106  47 63 116  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  43 60 114
-+44 60 114  44 60 114  43 59 113  43 59 113  31 47 105  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+38 54 109  40 56 111  40 56 111  39 55 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  39 55 111  32 48 107
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  33 49 106  35 52 107
-+35 51 108  35 51 108  35 51 108  35 51 108  34 50 107  34 50 107
-+29 46 104  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  64 78 128  64 78 128  65 79 128  65 79 128
-+66 80 128  65 79 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 127  66 80 127  66 80 128  66 80 128  66 80 128  66 80 129
-+66 80 129  66 80 128  65 79 128  65 79 128  66 80 129  68 81 130
-+64 78 128  49 64 117  37 53 109  30 46 104  24 41 100  23 40 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  23 40 100  26 43 102  34 50 106
-+42 58 112  56 71 121  67 81 129  67 81 129  66 80 129  65 79 128
-+66 80 129  66 80 128  66 80 129  66 80 129  66 80 128  66 80 128
-+66 80 127  66 80 127  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+65 79 128  66 80 128  66 80 128  65 79 128  64 78 128  64 78 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  63 77 126
-+63 77 126  62 76 125  63 77 126  59 74 124  37 53 109  23 40 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+23 40 100  31 47 105  55 69 121  62 76 125  59 74 124  61 75 125
-+61 75 125  61 75 125  60 75 125  61 75 125  60 75 125  59 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+59 74 124  60 75 125  59 74 124  58 73 123  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  57 72 122  58 73 123  58 73 123  57 72 122  58 73 123
-+57 72 122  35 52 107  23 40 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  31 47 105
-+54 69 120  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  56 70 122  55 70 121  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+53 68 119  54 69 120  54 69 120  54 69 120  54 69 120  53 68 119
-+54 69 120  47 63 116  23 40 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  42 57 112  51 66 119  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  50 65 118  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  48 64 117  48 64 117
-+31 47 105  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 100  25 42 101
-+42 58 112  46 61 115  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  42 58 112  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  28 45 103
-+40 57 112  39 55 110  39 55 111  40 56 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  26 43 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  27 43 102  34 50 107  34 50 108
-+35 51 108  35 51 108  35 51 108  34 50 107  34 50 107  34 50 107
-+26 43 102  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  64 78 128  64 78 128
-+65 79 128  66 80 128  66 80 128  65 79 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 127  66 80 127  66 80 127  66 80 128
-+66 80 128  66 80 129  66 80 128  66 80 129  66 80 129  65 79 128
-+66 80 129  67 81 129  65 79 128  58 73 123  51 66 119  38 54 110
-+25 42 102  23 39 99  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 100  24 41 100
-+23 40 99  23 39 99  31 47 105  44 60 114  55 69 121  62 76 125
-+67 81 129  66 80 129  66 80 129  65 79 128  66 80 129  66 80 128
-+66 80 129  66 80 129  66 80 128  66 80 128  66 80 128  66 80 127
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  65 79 128
-+66 80 128  65 79 128  65 79 128  64 78 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  64 78 127  65 79 128  65 79 128  64 78 127  63 77 126
-+63 77 126  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  63 77 126  63 77 126  63 77 126
-+62 76 125  63 77 126  56 71 121  32 50 106  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  23 40 99
-+32 50 106  55 70 121  61 75 125  59 74 124  61 75 125  61 75 125
-+61 75 125  60 75 125  61 75 125  60 75 125  59 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  59 74 124  59 74 124  58 73 123  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  59 74 124
-+57 72 122  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+39 55 111  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  26 43 102  47 63 116
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 69 120  55 70 121  53 68 119
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+53 68 119  28 45 103  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  31 47 105  50 65 118  50 65 118  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+50 65 118  49 65 117  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  49 65 116  48 64 117  42 57 112
-+26 43 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  32 48 105
-+46 61 115  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  45 60 114  44 60 114  44 60 114
-+44 60 114  43 59 113  44 60 114  34 50 106  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  36 52 108
-+40 56 111  40 56 111  40 56 111  39 55 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  36 52 108  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  29 46 104  34 50 107  35 51 108
-+35 51 108  35 51 108  35 51 108  34 50 107  34 50 106  32 48 105
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+65 79 128  64 78 127  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  66 80 128  65 79 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 127  66 80 127
-+66 80 128  66 80 128  66 80 129  66 80 129  66 80 129  66 80 128
-+66 80 129  65 79 128  66 80 129  66 80 129  66 80 129  64 78 128
-+63 77 126  52 67 118  35 51 108  24 41 100  23 40 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  23 40 100  27 44 103
-+43 59 113  59 74 124  64 78 127  65 79 128  66 80 129  66 80 129
-+66 80 129  65 79 128  66 80 129  66 80 128  66 80 129  66 80 129
-+66 80 128  66 80 128  66 80 127  66 80 127  66 80 127  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  65 79 128  66 80 128  66 80 128
-+65 79 128  65 79 128  64 78 128  64 78 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+64 78 127  65 79 128  64 78 127  64 78 127  63 77 126  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  63 77 126  64 78 127  63 77 126  62 76 125
-+64 78 127  52 66 118  26 43 102  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  32 48 107
-+56 71 121  61 75 125  59 74 124  61 75 125  61 75 125  61 75 125
-+60 75 125  61 75 125  60 75 125  59 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 74 124
-+59 74 124  58 73 123  58 73 123  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  58 73 123  59 74 124  58 73 123
-+57 72 122  58 73 123  58 73 123  58 73 123  58 73 123  46 61 115
-+25 42 101  24 41 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  38 54 110  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  55 70 121
-+56 70 122  55 70 121  54 70 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  55 70 121  54 69 120  53 68 119
-+54 69 120  54 69 120  54 69 120  54 69 120  53 68 119  55 70 121
-+37 53 109  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  44 60 114  51 66 119  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  47 63 116  33 49 106
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 101  24 41 99  43 58 114
-+46 61 115  45 60 114  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  43 60 114  44 60 114
-+44 60 114  44 60 114  43 59 113  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  27 43 102  40 56 111
-+40 56 111  39 55 111  40 56 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 110  39 55 111  29 46 104  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  32 48 107  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  34 50 107  34 50 107  29 46 104
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+64 78 127  64 78 127  64 78 127  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  64 78 128  64 78 128  65 79 128  65 79 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 127  66 80 127  66 80 128  66 80 128
-+66 80 129  66 80 129  66 80 129  66 80 128  66 80 129  65 79 128
-+65 79 128  66 80 129  67 81 129  64 78 128  50 65 118  36 52 108
-+27 44 102  26 43 102  25 42 101  24 41 100  24 41 100  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  24 41 100  24 41 100
-+25 42 101  26 43 102  29 47 104  43 58 114  57 72 122  68 81 130
-+67 80 128  66 80 129  65 79 128  66 80 129  66 80 129  66 80 128
-+66 80 129  66 80 129  66 80 128  66 80 128  66 80 127  66 80 127
-+66 80 127  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+65 79 128  66 80 128  65 79 128  65 79 128  65 79 128  64 78 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  64 78 127  65 79 128
-+64 78 127  64 78 127  63 77 126  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  63 77 126  62 76 125  63 77 126  62 76 125
-+44 60 114  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  31 47 105  57 72 122
-+61 75 125  59 74 124  61 75 125  61 75 125  61 75 125  60 75 125
-+61 75 125  60 75 125  59 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  59 74 124  60 75 125  59 74 124
-+58 73 123  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  57 72 122
-+58 73 123  58 73 123  57 72 122  58 73 123  52 67 118  27 44 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  31 47 105  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  55 70 121
-+55 70 121  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  54 69 120  55 70 121  54 69 120  53 68 119  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  47 63 116
-+27 44 102  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  32 48 107  53 67 120  50 65 118  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  48 63 117  43 59 113  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  32 48 107  46 61 115
-+45 60 114  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  43 60 114  44 60 114
-+44 60 114  44 60 114  35 52 107  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  34 50 106  40 56 111
-+40 56 111  40 56 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  37 53 109  26 43 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  26 43 102  34 50 107  35 51 108  35 51 108
-+35 51 108  35 51 108  35 51 108  33 49 106  33 49 106  27 44 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+63 77 126  63 77 126  64 78 127  65 79 128  65 79 128  64 78 127
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  64 78 128  65 79 128
-+65 79 128  66 80 128  66 80 128  65 79 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 127  66 80 127
-+66 80 128  66 80 128  66 80 128  66 80 129  66 80 129  66 80 128
-+66 80 129  66 80 129  65 79 128  66 80 129  67 81 129  68 82 130
-+64 78 128  53 67 120  43 59 113  36 52 108  31 47 105  26 43 102
-+23 40 100  23 40 100  24 41 100  24 41 100  24 41 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+24 41 100  23 40 100  24 41 100  28 45 103  34 50 107  39 55 110
-+48 63 117  58 73 123  68 81 130  68 81 130  66 80 129  66 80 129
-+65 79 128  66 80 129  66 80 128  66 80 129  66 80 129  66 80 129
-+66 80 128  66 80 128  66 80 128  66 80 127  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  65 79 128  66 80 128
-+66 80 128  65 79 128  65 79 128  64 78 128  64 78 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  64 78 127  65 79 128  65 79 128  64 78 127
-+63 77 126  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  63 77 126  64 78 127
-+63 77 126  63 77 126  62 76 125  63 77 126  58 73 123  38 54 109
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  23 40 100  34 50 107  58 73 123  61 75 125
-+59 74 124  61 75 125  61 75 125  61 75 125  60 75 125  61 75 125
-+60 75 125  59 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  59 74 124  60 75 125  59 74 124  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  58 73 123  58 73 123  57 72 122  58 73 123
-+58 73 123  57 72 122  58 73 123  55 70 121  31 47 105  23 40 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  27 44 102  52 67 118  56 70 122  55 69 121
-+56 70 122  56 70 122  56 70 122  56 70 122  55 70 121  56 70 122
-+54 70 120  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  54 69 120  53 68 119  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  53 68 119  34 50 107
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  48 63 117  50 65 118  49 64 117  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  50 65 118  49 65 117
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  49 65 117  48 64 116  48 64 117  34 50 107  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  40 57 112  46 61 115
-+45 60 114  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  43 60 114  44 60 114  44 60 114
-+44 60 114  43 59 113  27 44 102  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  38 54 110  40 56 111
-+39 55 111  40 56 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  39 55 111  33 49 106  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  28 45 103  35 51 108  35 52 107  35 51 108
-+35 51 108  34 50 107  35 51 108  33 49 106  32 48 105  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+64 78 127  64 78 127  63 77 126  64 78 127  64 78 127  65 79 128
-+65 79 128  64 78 127  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  64 78 128
-+64 78 128  65 79 128  65 79 128  66 80 128  66 80 128  65 79 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 127  66 80 127  66 80 128  66 80 128  66 80 128  66 80 129
-+66 80 129  66 80 129  66 80 129  66 80 129  66 80 129  65 79 128
-+66 80 129  66 80 129  68 81 130  65 79 128  60 75 125  55 70 121
-+49 64 117  40 56 111  32 50 106  25 42 100  23 39 99  23 40 99
-+23 40 100  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  23 40 100  23 40 99  23 39 99  28 45 103
-+36 52 108  44 60 114  52 67 118  57 72 122  62 76 125  67 81 129
-+67 81 129  66 80 129  66 80 129  65 79 128  66 80 129  66 80 129
-+66 80 128  66 80 129  66 80 129  66 80 128  66 80 128  66 80 128
-+66 80 127  66 80 127  66 80 127  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  65 79 128  66 80 128  65 79 128
-+65 79 128  64 78 128  64 78 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  64 78 127  65 79 128  64 78 127  64 78 127  63 77 126
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  63 77 126  64 78 127  63 77 126
-+63 77 126  63 77 126  64 78 127  51 66 119  31 47 105  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  23 40 100  38 54 109  58 73 123  61 75 125  59 74 124
-+61 75 125  61 75 125  61 75 125  60 75 125  61 75 125  60 75 125
-+59 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  59 74 124  59 74 124  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  59 74 124  58 73 123  57 72 122  58 73 123  58 73 123
-+57 72 122  58 73 123  57 72 122  33 49 106  23 40 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  46 61 115  56 70 122  55 69 121  56 70 122
-+56 70 122  56 70 122  56 70 122  55 70 121  56 70 122  55 70 121
-+54 70 120  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  54 69 120  54 69 120  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  53 68 119  54 69 120  43 59 113  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 100  23 40 100
-+39 55 111  51 66 119  50 65 118  49 64 117  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  49 65 117
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  48 64 117  43 60 114  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  31 47 105  45 60 114  46 61 115
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  44 60 114  43 60 114  44 60 114  43 59 113
-+44 60 114  37 53 109  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  30 46 104  39 55 110  39 55 111
-+40 56 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 110  29 46 104  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  32 48 107  35 51 108  34 50 108  35 51 108
-+35 51 108  35 51 108  34 50 107  33 49 106  30 46 104  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+64 78 127  64 78 127  64 78 127  63 77 126  64 78 127  64 78 127
-+64 78 127  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  64 78 128  65 79 128  65 79 128  65 79 128  66 80 128
-+65 79 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 127  66 80 127  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 129  66 80 129  66 80 128  66 80 129
-+66 80 129  66 80 129  65 79 128  66 80 129  66 80 129  66 80 129
-+65 79 128  64 78 128  64 78 127  62 76 125  56 70 122  46 61 115
-+37 53 109  27 44 103  23 40 99  23 40 100  23 40 100  24 41 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  24 41 100  23 40 100  23 40 99
-+24 41 101  31 47 105  40 57 112  50 65 118  60 75 125  63 77 126
-+64 78 127  65 79 128  66 80 129  66 80 129  66 80 129  66 80 129
-+65 79 128  66 80 129  66 80 129  66 80 129  66 80 129  66 80 129
-+66 80 129  66 80 128  66 80 128  66 80 128  66 80 127  66 80 127
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  65 79 128  66 80 128  66 80 128  65 79 128  65 79 128
-+64 78 128  64 78 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+64 78 127  65 79 128  64 78 127  64 78 127  63 77 126  63 77 126
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  63 77 126  64 78 127  63 77 126  62 76 125
-+63 77 126  63 77 126  43 58 114  26 43 102  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  38 54 110  58 73 123  61 75 125  59 74 124  61 75 125
-+61 75 125  61 75 125  60 75 125  61 75 125  60 75 125  59 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  59 74 124  59 74 124  58 73 123  58 73 123  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+59 74 124  58 73 123  57 72 122  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  36 52 108  24 41 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  38 54 110  55 69 121  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  56 70 122  55 70 121  54 70 120
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+54 69 120  55 70 121  53 68 119  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  52 67 118  25 43 102  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  30 46 104
-+48 63 117  51 66 119  49 64 117  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  48 65 116
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 64 117
-+49 65 117  48 64 116  50 65 118  29 46 104  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  38 54 109  46 61 115  45 60 114
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  45 60 114  43 60 114  44 60 114  44 60 114  44 60 114
-+43 59 113  31 47 105  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  34 50 107  40 56 111  39 55 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  36 52 108  25 42 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 101  25 42 101  35 51 108  35 51 108  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  33 49 106  27 44 103  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+63 77 126  64 78 127  64 78 127  65 79 128  65 79 128  64 78 127
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  64 78 128  64 78 128
-+65 79 128  65 79 128  66 80 128  66 80 128  65 79 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 127  66 80 127  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 129  66 80 129  66 80 129  66 80 129  66 80 129
-+66 80 129  66 80 129  65 79 128  66 80 129  66 80 129  66 80 129
-+67 81 129  68 81 130  64 78 128  56 70 122  48 63 117  40 57 112
-+34 50 107  28 45 103  27 44 102  27 44 102  26 43 102  26 43 101
-+25 42 101  25 42 101  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  26 43 101  26 43 102  27 44 102
-+27 44 102  31 47 105  37 53 109  44 60 114  52 67 118  59 75 125
-+67 81 129  68 81 130  67 80 128  66 80 129  66 80 129  65 79 128
-+66 80 129  66 80 129  66 80 129  66 80 129  66 80 128  66 80 129
-+66 80 129  66 80 129  66 80 128  66 80 128  66 80 128  66 80 127
-+66 80 127  66 80 127  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  65 79 128  66 80 128
-+65 79 128  65 79 128  65 79 128  64 78 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  64 78 127  65 79 128  64 78 127
-+64 78 127  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+63 77 126  64 78 127  63 77 126  63 77 126  63 77 126  63 77 126
-+58 73 123  36 52 108  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+38 54 110  61 75 125  61 75 125  59 74 124  61 75 125  61 75 125
-+61 75 125  60 75 125  61 75 125  60 75 125  59 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 74 124
-+60 75 125  59 74 124  58 73 123  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  59 74 124
-+58 73 123  57 72 122  58 73 123  58 73 123  58 73 123  57 72 122
-+57 72 122  42 57 112  25 42 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+29 47 104  53 67 120  56 70 122  55 69 121  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  55 70 121  54 70 120  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+54 69 120  53 68 119  54 69 120  54 69 120  54 69 120  54 69 120
-+53 68 119  54 69 120  54 69 120  34 50 106  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  40 56 111
-+51 66 119  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  49 65 117  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 116  48 64 117  40 57 112  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  29 45 103  44 60 114  46 61 115  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  43 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+40 56 111  26 43 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  27 44 102  38 54 109  40 56 111  40 56 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  33 49 106  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  29 46 104  35 51 108  35 51 108  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  33 49 106  24 41 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  63 77 126  64 78 127  64 78 127  65 79 128
-+64 78 127  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+64 78 128  65 79 128  65 79 128  65 79 128  66 80 128  66 80 128
-+65 79 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 127  66 80 127  66 80 127
-+66 80 128  66 80 128  66 80 128  66 80 129  66 80 129  66 80 129
-+66 80 129  66 80 129  66 80 129  66 80 129  66 80 129  66 80 129
-+66 80 129  65 79 128  66 80 129  66 80 129  67 81 129  68 81 130
-+68 82 130  68 81 130  63 77 126  58 73 123  55 69 121  51 66 119
-+47 63 116  43 59 113  40 56 111  38 54 110  37 53 109  36 52 108
-+35 52 107  34 50 107  33 49 106  32 50 106  32 48 107  31 47 105
-+31 47 105  31 47 105  31 47 105  32 48 105  32 48 107  32 50 106
-+33 49 106  34 50 107  35 51 108  36 52 108  37 53 109  39 55 111
-+42 57 112  45 60 114  49 64 117  53 68 119  56 71 121  61 75 125
-+65 79 128  68 82 130  68 82 130  68 81 130  67 81 129  66 80 129
-+66 80 129  65 79 128  66 80 129  66 80 129  66 80 129  66 80 129
-+66 80 129  66 80 128  66 80 129  66 80 129  66 80 129  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 127  66 80 127  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  65 79 128
-+65 79 128  64 78 128  64 78 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  64 78 127  65 79 128  65 79 128  64 78 127  64 78 127
-+63 77 126  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  63 77 126  64 78 127
-+64 78 127  63 77 126  62 76 125  63 77 126  62 76 125  50 65 118
-+29 46 103  23 40 99  25 42 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  26 43 101  43 60 114
-+62 76 125  61 75 125  59 74 124  61 75 125  61 75 125  61 75 125
-+60 75 125  61 75 125  60 75 125  59 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  59 74 124  60 75 125
-+59 74 124  58 73 123  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+58 73 123  57 72 122  58 73 123  58 73 123  57 72 122  58 73 123
-+47 63 116  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  26 43 102
-+49 64 117  56 70 122  55 69 121  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  55 70 121  54 70 120  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  55 70 121
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+53 68 119  54 69 120  42 58 112  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  31 47 105  50 65 118
-+50 65 118  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  49 65 116
-+48 64 117  47 63 116  29 46 103  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  36 52 108  46 61 115  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+45 60 114  43 60 114  44 60 114  44 60 114  43 59 113  43 59 113
-+34 50 106  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  31 47 105  40 56 111  40 56 111  40 56 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+38 54 110  38 54 110  27 44 102  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  33 49 106  35 51 108  35 51 108  35 51 108  35 51 108
-+35 51 108  34 50 107  34 50 107  30 46 104  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  63 77 126  63 77 126  64 78 127  64 78 127
-+65 79 128  65 79 128  64 78 127  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  64 78 128  64 78 128  64 78 128  65 79 128  65 79 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 127  66 80 127  66 80 127  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 129  66 80 129  66 80 129  66 80 129  66 80 128
-+66 80 129  66 80 129  66 80 129  66 80 129  66 80 129  66 80 129
-+65 79 128  66 80 129  66 80 129  66 80 129  66 80 129  67 80 128
-+67 81 129  68 81 130  68 81 130  67 80 128  65 79 128  64 78 128
-+63 77 126  63 77 126  61 75 125  61 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  61 75 125
-+62 76 125  63 77 126  64 78 127  65 79 128  66 80 129  68 81 130
-+68 81 130  67 81 129  67 81 129  66 80 129  66 80 129  66 80 129
-+66 80 129  66 80 129  66 80 129  66 80 129  66 80 129  66 80 129
-+66 80 129  66 80 129  66 80 129  66 80 128  66 80 129  66 80 129
-+66 80 129  66 80 129  66 80 128  66 80 128  66 80 128  66 80 127
-+66 80 127  66 80 127  66 80 127  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+65 79 128  66 80 128  65 79 128  65 79 128  65 79 128  64 78 128
-+64 78 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+64 78 127  65 79 128  64 78 127  64 78 127  63 77 126  63 77 126
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  63 77 126
-+63 77 126  62 76 125  63 77 126  58 73 123  38 54 110  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  27 44 103  49 64 117  61 75 125
-+61 75 125  59 74 124  61 75 125  61 75 125  61 75 125  60 75 125
-+61 75 125  60 75 125  59 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 74 124
-+59 74 124  58 73 123  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  58 73 123  58 73 123  58 73 123
-+57 72 122  58 73 123  58 73 123  57 72 122  59 74 124  48 64 116
-+26 43 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  23 40 100  46 61 115
-+57 72 122  55 69 121  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 69 120  55 70 121  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  53 68 119
-+54 69 120  49 64 117  28 45 103  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  44 60 114  51 66 119
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  50 65 118  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 64 117
-+48 64 117  39 55 110  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  26 43 102  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  43 60 114  44 60 114  44 60 114  44 60 114  42 58 112
-+25 42 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  37 53 109  40 56 111  39 55 111  39 55 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  36 52 108  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+27 44 102  35 51 108  34 50 107  35 51 108  35 51 108  34 50 107
-+35 51 108  34 50 107  34 50 107  26 43 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  63 77 126  63 77 126
-+64 78 127  64 78 127  65 79 128  64 78 127  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  64 78 128  65 79 128
-+65 79 128  65 79 128  66 80 128  66 80 128  65 79 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 127  66 80 127  66 80 127
-+66 80 127  66 80 128  66 80 128  66 80 128  66 80 128  66 80 129
-+66 80 129  66 80 129  66 80 129  66 80 129  66 80 129  66 80 129
-+66 80 129  66 80 129  66 80 129  66 80 129  66 80 129  66 80 129
-+66 80 129  66 80 129  65 79 128  66 80 129  66 80 129  66 80 129
-+66 80 129  66 80 129  66 80 129  66 80 129  66 80 129  66 80 129
-+66 80 129  66 80 129  66 80 129  66 80 129  66 80 129  66 80 129
-+66 80 129  66 80 129  66 80 129  66 80 129  66 80 129  66 80 129
-+66 80 129  66 80 129  66 80 129  66 80 129  66 80 129  66 80 129
-+66 80 129  66 80 129  66 80 129  66 80 129  66 80 128  66 80 129
-+66 80 129  66 80 129  66 80 129  66 80 129  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 127  66 80 127  66 80 127  66 80 127
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  65 79 128  65 79 128  64 78 128  64 78 128  64 78 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  64 78 127
-+65 79 128  64 78 127  63 77 126  63 77 126  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  63 77 126  64 78 127  63 77 126  62 76 125
-+62 76 125  64 78 127  53 67 120  29 46 103  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  27 44 103  53 67 120  61 75 125  61 75 125
-+60 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+60 75 125  59 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  59 74 124  59 74 124  58 73 123
-+58 73 123  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  58 73 123  59 74 124  58 73 123  57 72 122
-+58 73 123  58 73 123  57 72 122  58 73 123  51 66 119  26 43 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 101  23 40 99  40 56 111  55 69 121
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  56 70 122  54 70 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  53 68 119
-+53 68 119  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+53 68 119  36 52 108  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  34 50 108  51 66 119  50 65 118
-+49 64 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  50 65 118  49 65 117  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  49 65 117  48 63 117
-+46 61 115  29 47 104  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  37 53 109  46 61 115  45 60 114  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  45 60 114
-+44 60 114  44 60 114  44 60 114  43 59 113  44 60 114  34 50 107
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  28 45 103  40 56 111  40 56 111  39 55 111  40 56 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  38 54 110
-+39 55 111  29 46 104  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+31 47 105  35 51 108  35 51 108  35 51 108  35 51 108  35 51 108
-+34 50 107  34 50 107  32 48 105  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+63 77 126  64 78 127  63 77 126  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  64 78 127  64 78 127  65 79 128  65 79 128
-+64 78 127  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  64 78 128  64 78 128  65 79 128  65 79 128  65 79 128
-+66 80 128  66 80 128  66 80 128  65 79 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 127  66 80 127
-+66 80 127  66 80 127  66 80 127  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 129  66 80 129  66 80 129
-+66 80 129  66 80 129  66 80 129  66 80 129  66 80 129  66 80 129
-+66 80 128  66 80 129  66 80 129  66 80 129  66 80 129  66 80 129
-+66 80 129  66 80 129  66 80 129  66 80 129  66 80 129  66 80 129
-+66 80 129  66 80 129  66 80 129  66 80 129  66 80 129  66 80 129
-+66 80 129  66 80 129  66 80 129  66 80 129  66 80 129  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 127
-+66 80 127  66 80 127  66 80 127  66 80 127  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  65 79 128  65 79 128  65 79 128  64 78 128
-+64 78 128  64 78 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  64 78 127  64 78 127
-+63 77 126  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  63 77 126  62 76 125  63 77 126  63 77 126
-+61 75 125  40 56 111  23 40 99  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  31 47 105  58 73 123  61 75 125  59 74 124  61 75 125
-+61 75 125  61 75 125  60 75 125  61 75 125  60 75 125  59 75 125
-+59 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  59 74 124  60 75 125  59 74 124  58 73 123  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  59 74 124  59 74 124  57 72 122  58 73 123  58 73 123
-+58 73 123  57 72 122  58 73 123  53 68 119  29 46 103  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  34 50 107  54 69 120  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  55 70 121  56 70 122
-+56 70 122  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  55 70 121  54 69 120  53 68 119
-+54 69 120  54 69 120  54 69 120  54 69 120  53 68 119  54 69 120
-+45 60 114  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  26 43 102  50 65 118  50 65 118  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+50 65 118  49 65 117  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  49 65 117  48 64 116  47 63 116
-+40 56 111  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+27 44 102  46 61 115  45 60 114  45 60 114  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  45 60 114  44 60 114
-+43 60 114  44 60 114  43 59 113  44 60 114  43 59 113  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  36 52 108  40 56 111  40 56 111  40 56 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+37 53 109  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+34 50 107  34 50 107  35 51 108  35 51 108  35 51 108  35 51 108
-+34 50 107  34 50 107  28 45 103  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+62 76 125  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  63 77 126  63 77 126  64 78 127  64 78 127
-+65 79 128  65 79 128  64 78 127  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  64 78 128  64 78 128  64 78 128
-+65 79 128  65 79 128  65 79 128  66 80 128  66 80 128  65 79 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 127  66 80 127  66 80 127
-+66 80 127  66 80 127  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 129  66 80 129  66 80 129  66 80 129  66 80 129  66 80 129
-+66 80 129  66 80 129  66 80 129  66 80 129  66 80 129  66 80 129
-+66 80 129  66 80 129  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 127  66 80 127  66 80 127  66 80 127  66 80 127  66 80 127
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  65 79 128  66 80 128  66 80 128
-+65 79 128  65 79 128  65 79 128  64 78 128  64 78 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+64 78 127  65 79 128  64 78 127  64 78 127  64 78 127  63 77 126
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  63 77 126  64 78 127
-+63 77 126  63 77 126  62 76 125  63 77 126  62 76 125  50 65 118
-+29 46 104  23 40 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+37 53 109  59 74 124  61 75 125  59 74 124  61 75 125  61 75 125
-+61 75 125  60 75 125  61 75 125  60 75 125  59 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+59 74 124  60 75 125  59 74 124  58 73 123  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  58 73 123  57 72 122  58 73 123  58 73 123
-+57 72 122  58 73 123  54 69 120  32 48 107  24 41 100  24 41 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  28 45 103  50 65 118  56 70 122  55 69 121
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  54 69 120  55 70 121  54 69 120  53 68 119  54 69 120
-+54 69 120  54 69 120  54 69 120  53 68 119  54 69 120  51 66 119
-+27 44 102  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  40 57 112  51 66 119  50 65 118  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  49 65 117  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  48 64 117  47 63 116
-+27 44 102  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+38 54 110  46 61 115  45 60 114  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  44 60 114
-+43 60 114  44 60 114  43 60 114  44 60 114  33 49 106  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+27 43 102  40 56 111  39 55 110  39 55 111  40 56 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  38 54 110  39 55 111
-+31 47 105  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  28 45 103
-+34 50 107  35 51 108  35 51 108  35 51 108  35 51 108  34 50 107
-+34 50 107  34 50 106  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+63 77 126  63 77 126  63 77 126  64 78 127  64 78 127  63 77 126
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  63 77 126  64 78 127
-+64 78 127  64 78 127  65 79 128  65 79 128  64 78 127  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+64 78 128  64 78 128  65 79 128  65 79 128  65 79 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 127  66 80 127  66 80 127  66 80 127
-+66 80 127  66 80 127  66 80 127  66 80 127  66 80 127  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 127  66 80 127  66 80 127
-+66 80 127  66 80 127  66 80 127  66 80 127  66 80 127  66 80 127
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+65 79 128  66 80 128  66 80 128  66 80 128  65 79 128  65 79 128
-+65 79 128  64 78 128  64 78 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  64 78 127  64 78 127  63 77 126  63 77 126  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  63 77 126  64 78 127  64 78 127  63 77 126
-+63 77 126  63 77 126  65 79 128  56 71 121  36 52 108  25 42 101
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  44 60 114
-+59 74 124  61 75 125  59 74 124  61 75 125  61 75 125  61 75 125
-+60 75 125  61 75 125  60 75 125  59 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  59 74 124  59 74 124  58 73 123  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+58 73 123  58 73 123  57 72 122  58 73 123  58 73 123  57 72 122
-+58 73 123  57 72 122  32 50 106  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 101  48 63 117  56 70 122  55 69 121  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  55 70 121
-+54 70 120  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  32 48 105
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  32 50 106  50 65 118  50 65 118  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  49 65 117  48 64 116  49 65 117  36 52 108
-+23 40 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  29 45 103
-+44 60 114  45 60 114  45 60 114  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  43 60 114
-+44 60 114  44 60 114  44 60 114  42 58 112  26 43 102  25 42 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  23 40 100
-+35 52 107  40 56 111  40 56 111  40 56 111  39 55 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  38 54 110
-+26 43 102  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  31 47 105
-+35 51 108  35 51 108  35 51 108  35 51 108  34 50 107  35 51 108
-+34 50 107  31 47 105  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+55 68 119  64 78 127  63 77 126  63 77 126  63 77 126  64 78 127
-+64 78 127  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  63 77 126
-+63 77 126  63 77 126  64 78 127  64 78 127  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  64 78 128  64 78 128  65 79 128  65 79 128
-+65 79 128  65 79 128  66 80 128  66 80 128  65 79 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 127
-+66 80 127  66 80 127  66 80 127  66 80 127  66 80 127  66 80 127
-+66 80 127  66 80 127  66 80 127  66 80 127  66 80 127  66 80 127
-+66 80 127  66 80 127  66 80 127  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  65 79 128  65 79 128  65 79 128  65 79 128  64 78 128
-+64 78 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  64 78 127  65 79 128  64 78 127  64 78 127
-+64 78 127  63 77 126  63 77 126  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  63 77 126  63 77 126  62 76 125
-+63 77 126  62 76 125  42 58 112  27 44 102  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 43 102  52 67 118  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  60 75 125  59 75 125  59 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 74 124
-+59 74 124  58 73 123  58 73 123  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  59 74 124
-+58 73 123  57 72 122  58 73 123  58 73 123  57 72 122  58 73 123
-+58 73 123  31 47 105  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 101
-+23 40 99  44 60 115  56 70 122  56 70 122  55 69 121  56 70 122
-+56 70 122  56 70 122  56 70 122  55 70 121  55 70 121  54 70 120
-+54 70 120  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+54 69 120  55 70 121  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  53 68 119  55 70 121  39 55 110  25 42 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+26 43 102  44 60 114  51 66 119  49 64 117  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  50 65 118
-+48 65 116  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  48 64 117  44 60 114  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  37 53 109
-+46 61 115  46 61 115  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  43 60 114  43 60 114
-+44 60 114  43 59 113  44 60 114  35 52 107  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  27 43 102
-+38 54 110  40 56 111  39 55 111  40 56 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  39 55 111  33 49 106
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  26 43 102  33 49 106
-+35 51 108  35 51 108  35 51 108  35 51 108  35 51 108  34 50 107
-+34 50 107  27 44 103  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  40 57 112  59 74 124  62 76 125  63 77 126  62 76 125
-+63 77 126  64 78 127  64 78 127  63 77 126  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  63 77 126  63 77 126  64 78 127
-+64 78 127  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  64 78 128  64 78 128  65 79 128  65 79 128  65 79 128
-+65 79 128  66 80 128  66 80 128  66 80 128  65 79 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  65 79 128  66 80 128  66 80 128
-+66 80 128  65 79 128  65 79 128  65 79 128  65 79 128  64 78 128
-+64 78 128  64 78 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  64 78 127  65 79 128
-+65 79 128  64 78 127  64 78 127  63 77 126  63 77 126  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  63 77 126  64 78 127
-+64 78 127  63 77 126  63 77 126  62 76 125  63 77 126  62 76 125
-+55 69 121  31 47 105  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  32 48 107  58 73 123  61 75 125  59 74 124
-+61 75 125  61 75 125  61 75 125  60 75 125  61 75 125  61 75 125
-+60 75 125  59 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  59 74 124  60 75 125  59 74 124
-+58 73 123  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  58 73 123  59 74 124  59 74 124  57 72 122
-+58 73 123  58 73 123  58 73 123  57 72 122  58 73 123  57 72 122
-+34 50 107  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+39 55 111  56 70 122  55 69 121  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  56 70 122  55 70 121  54 70 120  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  54 69 120  53 68 119  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  47 63 116  27 44 102  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+34 50 107  52 67 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  50 65 118  48 65 116
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  49 65 116  48 64 117  48 64 117  31 47 105  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  28 45 103  43 59 113
-+46 61 115  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  43 60 114  44 60 114
-+44 60 114  44 60 114  42 58 112  28 45 103  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  32 48 105
-+39 55 110  39 55 111  40 56 111  39 55 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  38 54 110  29 45 103
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 100  29 45 103  35 51 108
-+34 50 107  35 51 108  35 51 108  34 50 107  35 51 108  33 49 106
-+32 48 107  26 43 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  23 40 99  30 46 104  48 63 117  58 73 123  64 78 127
-+63 77 126  63 77 126  63 77 126  64 78 127  64 78 127  63 77 126
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  63 77 126
-+63 77 126  64 78 127  64 78 127  65 79 128  65 79 128  64 78 127
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  64 78 128  64 78 128  64 78 128
-+65 79 128  65 79 128  65 79 128  65 79 128  66 80 128  66 80 128
-+66 80 128  66 80 128  65 79 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+65 79 128  66 80 128  66 80 128  66 80 128  65 79 128  65 79 128
-+65 79 128  65 79 128  64 78 128  64 78 128  64 78 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  64 78 127  65 79 128  65 79 128  64 78 127
-+64 78 127  64 78 127  63 77 126  63 77 126  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  63 77 126  64 78 127  63 77 126
-+63 77 126  62 76 125  63 77 126  63 77 126  55 70 121  39 55 110
-+23 40 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  40 56 111  59 74 124  61 75 125  59 74 124  61 75 125
-+61 75 125  61 75 125  60 75 125  61 75 125  60 75 125  60 75 125
-+59 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  59 74 124  60 75 125  59 74 124  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  58 73 123  58 73 123  57 72 122
-+58 73 123  58 73 123  57 72 122  58 73 123  56 71 121  37 53 109
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  34 50 107
-+55 69 121  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+54 69 120  53 68 119  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  52 67 118  32 48 107  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  27 44 103
-+49 64 117  51 66 119  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  48 65 116
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 116  48 64 117  40 56 111  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  36 52 108  47 63 116
-+45 60 114  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  45 60 114  43 60 114  44 60 114  44 60 114
-+44 60 114  43 59 113  37 53 109  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  26 43 101  36 52 108
-+40 56 111  40 56 111  39 55 111  39 55 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  36 52 108  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  32 48 107  35 51 108
-+35 51 108  35 51 108  35 51 108  35 51 108  34 50 107  33 49 106
-+31 47 105  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  33 49 106  48 63 117
-+63 77 126  63 77 126  62 76 125  63 77 126  63 77 126  64 78 127
-+63 77 126  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+63 77 126  63 77 126  63 77 126  64 78 127  64 78 127  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+64 78 128  64 78 128  64 78 128  64 78 128  65 79 128  65 79 128
-+65 79 128  65 79 128  66 80 128  66 80 128  66 80 128  66 80 128
-+65 79 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  65 79 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  65 79 128  65 79 128  65 79 128  65 79 128  64 78 128
-+64 78 128  64 78 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+64 78 127  65 79 128  65 79 128  64 78 127  64 78 127  63 77 126
-+63 77 126  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  64 78 127  64 78 127  63 77 126  63 77 126
-+63 77 126  64 78 127  58 73 123  40 56 111  27 44 103  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  23 40 100  27 44 102
-+49 64 117  59 74 124  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  60 75 125  60 75 125  59 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  59 74 124  59 74 124  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  58 73 123  58 73 123  57 72 122  58 73 123
-+58 73 123  57 72 122  58 73 123  58 73 123  37 53 109  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  29 46 104  52 67 118
-+56 70 122  55 69 121  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  56 70 122  55 70 121  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  55 70 121
-+54 69 120  53 68 119  54 69 120  54 69 120  54 69 120  54 69 120
-+53 68 119  54 69 120  38 54 110  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 101  23 40 99  44 60 114
-+51 66 119  50 65 118  49 64 117  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  50 65 118  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 64 117
-+49 65 117  48 63 117  46 61 115  31 47 105  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  27 44 102  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  43 60 114  44 60 114  44 60 114
-+43 59 113  44 60 114  28 45 103  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  29 46 104  40 56 111
-+40 56 111  40 56 111  39 55 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  32 48 105  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  26 43 101  35 51 108  35 51 108
-+35 51 108  35 51 108  35 51 108  35 51 108  34 50 107  33 49 106
-+27 44 103  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  25 42 101
-+32 50 106  55 70 121  64 78 127  63 77 126  63 77 126  63 77 126
-+64 78 127  64 78 127  63 77 126  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  63 77 126  64 78 127  64 78 127
-+64 78 127  64 78 127  65 79 128  64 78 127  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  64 78 128  64 78 128
-+64 78 128  64 78 128  65 79 128  65 79 128  65 79 128  65 79 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  65 79 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  65 79 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  64 78 128  64 78 128  64 78 128  64 78 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  64 78 127  65 79 128
-+65 79 128  64 78 127  64 78 127  64 78 127  63 77 126  63 77 126
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  63 77 126  63 77 126  62 76 125  63 77 126
-+63 77 126  43 59 113  27 44 102  25 42 101  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  23 40 99  34 50 106  57 72 122
-+61 75 125  61 75 125  59 74 124  61 75 125  61 75 125  61 75 125
-+61 75 125  60 75 125  60 75 125  59 75 125  59 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  59 74 124  59 74 124  58 73 123  58 73 123  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  59 74 124  58 73 123  57 72 122  58 73 123  58 73 123
-+57 72 122  58 73 123  59 74 124  35 52 107  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  51 66 119  56 70 122
-+56 70 122  55 69 121  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  54 70 120  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 69 120  55 70 121  54 69 120
-+53 68 119  54 69 120  54 69 120  54 69 120  54 69 120  53 68 119
-+54 69 120  46 61 115  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  23 40 100  36 52 108  51 66 119
-+50 65 118  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  50 65 118  49 65 117  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  47 63 116  40 56 111  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  23 40 100  38 54 110  46 61 115  45 60 114
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  45 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  37 53 109  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  34 50 108  40 56 111
-+39 55 110  40 56 111  39 55 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 110  38 54 110  25 42 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  29 47 104  35 51 108  34 50 107
-+35 51 108  35 51 108  34 50 107  35 51 108  34 50 107  33 49 106
-+25 42 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  23 40 99  37 53 109  57 72 122  62 76 125  63 77 126
-+62 76 125  63 77 126  63 77 126  63 77 126  64 78 127  63 77 126
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  64 78 127  64 78 127  64 78 127  65 79 128
-+65 79 128  65 79 128  64 78 127  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+64 78 128  64 78 128  64 78 128  64 78 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  66 80 128  66 80 128  66 80 128
-+66 80 128  66 80 128  66 80 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  64 78 128  64 78 128
-+64 78 128  64 78 128  64 78 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  64 78 127  64 78 127  64 78 127
-+63 77 126  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  63 77 126  64 78 127  64 78 127  63 77 126
-+63 77 126  62 76 125  63 77 126  63 77 126  61 75 125  50 65 118
-+27 44 103  24 41 100  25 42 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 101  24 41 100  26 43 102  40 57 112  59 74 124  61 75 125
-+60 75 125  61 75 125  61 75 125  61 75 125  60 75 125  61 75 125
-+60 75 125  60 75 125  59 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  59 74 124  60 75 125
-+59 74 124  59 74 124  58 73 123  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  59 74 124
-+59 74 124  57 72 122  58 73 123  58 73 123  58 73 123  57 72 122
-+58 73 123  57 72 122  36 52 108  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  49 64 117  56 70 122  55 69 121
-+56 70 122  56 70 122  56 70 122  56 70 122  55 70 121  56 70 122
-+55 70 121  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  53 68 119  54 69 120
-+50 65 118  25 43 102  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 100  24 41 100  28 45 103  48 63 117  50 65 118
-+49 64 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  49 65 117  49 65 116
-+48 64 117  47 63 116  26 43 102  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  29 45 103  46 61 115  45 60 114  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+45 60 114  44 60 114  43 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  26 43 102  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  27 43 102  40 56 111  40 56 111
-+39 55 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  39 55 111  33 49 106  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  34 50 108  35 52 107  35 51 108
-+35 51 108  34 50 107  35 51 108  34 50 107  34 50 107  30 46 104
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  23 40 100  25 42 101  40 57 112  54 69 120
-+63 77 126  63 77 126  62 76 125  63 77 126  63 77 126  64 78 127
-+64 78 127  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  63 77 126  63 77 126  63 77 126  64 78 127
-+64 78 127  64 78 127  65 79 128  65 79 128  65 79 128  64 78 127
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  64 78 128  64 78 128
-+64 78 128  64 78 128  64 78 128  64 78 128  64 78 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  64 78 128  64 78 128  64 78 128
-+64 78 128  64 78 128  64 78 128  64 78 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  64 78 127  65 79 128  65 79 128
-+64 78 127  64 78 127  64 78 127  63 77 126  63 77 126  63 77 126
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  64 78 127  63 77 126  63 77 126  62 76 125
-+63 77 126  64 78 127  58 73 123  49 64 117  34 50 106  23 40 99
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+23 40 100  31 47 105  49 64 117  62 76 125  61 75 125  59 74 124
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  60 75 125
-+60 75 125  59 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 74 124
-+59 74 124  58 73 123  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+58 73 123  57 72 122  58 73 123  58 73 123  57 72 122  58 73 123
-+56 71 121  38 54 109  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  44 60 114  56 70 122  55 69 121  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  55 70 121
-+54 70 120  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 69 120  53 68 119  54 69 120
-+54 69 120  54 69 120  54 69 120  53 68 119  54 69 120  53 68 119
-+31 47 105  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  40 57 112  51 66 119  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  49 65 117  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  48 64 116
-+49 64 117  34 50 107  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  40 56 111  46 61 115  45 60 114  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  44 60 114  43 60 114  44 60 114  43 59 113  44 60 114
-+35 51 108  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  34 50 107  40 56 111  39 55 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 111  26 43 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  29 45 103  35 51 108  34 50 108  35 51 108
-+35 51 108  35 51 108  34 50 107  34 50 107  34 50 107  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 101  24 41 100  23 40 100  28 45 103
-+38 54 110  53 67 120  64 78 127  63 77 126  62 76 125  63 77 126
-+63 77 126  64 78 127  64 78 127  63 77 126  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  63 77 126
-+63 77 126  64 78 127  64 78 127  64 78 127  64 78 127  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  64 78 128
-+64 78 128  64 78 128  64 78 128  64 78 128  64 78 128  64 78 128
-+64 78 128  64 78 128  64 78 128  64 78 128  64 78 128  64 78 128
-+64 78 128  64 78 128  64 78 128  64 78 128  64 78 128  64 78 128
-+64 78 128  64 78 128  64 78 128  64 78 128  64 78 128  64 78 128
-+64 78 128  64 78 128  64 78 128  64 78 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+64 78 127  65 79 128  65 79 128  65 79 128  64 78 127  64 78 127
-+64 78 127  63 77 126  63 77 126  63 77 126  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  63 77 126  64 78 127
-+64 78 127  64 78 127  63 77 126  63 77 126  63 77 126  64 78 127
-+62 76 125  46 61 115  33 49 106  24 41 100  24 41 100  25 42 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 100
-+40 57 112  57 72 122  62 76 125  61 75 125  59 74 124  61 75 125
-+61 75 125  61 75 125  60 75 125  61 75 125  60 75 125  60 75 125
-+59 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  59 74 124  59 74 124  59 74 124
-+58 73 123  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  58 73 123  59 74 124  58 73 123  58 73 123
-+57 72 122  58 73 123  58 73 123  57 72 122  58 73 123  57 72 122
-+36 52 108  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  40 57 112  55 69 121  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  55 70 121  56 70 122  54 70 120
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  54 69 120  53 68 119  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  53 68 119  38 54 109
-+25 42 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  32 50 106  51 66 119  50 65 118  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  50 65 118  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 116  48 64 117
-+42 58 112  24 41 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  31 47 105  45 60 114  46 61 115  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  43 60 114  44 60 114  44 60 114  44 60 114  42 58 112
-+27 44 102  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  27 43 102  39 55 111  40 56 111  39 55 111
-+40 56 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+38 54 110  39 55 111  34 50 107  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 100  33 49 106  35 51 108  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  34 50 107  31 47 105  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 101  26 43 101  35 52 107  56 71 121  64 78 127  63 77 126
-+63 77 126  63 77 126  63 77 126  64 78 127  64 78 127  63 77 126
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  63 77 126  63 77 126  64 78 127  64 78 127
-+64 78 127  64 78 127  65 79 128  65 79 128  65 79 128  64 78 127
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  64 78 127  64 78 127  64 78 127  64 78 127  63 77 126
-+63 77 126  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  63 77 126  64 78 127  63 77 126
-+63 77 126  63 77 126  63 77 126  63 77 126  63 77 126  46 61 115
-+28 45 102  25 42 101  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  27 44 102  51 66 119
-+59 74 124  61 75 125  59 74 124  61 75 125  61 75 125  61 75 125
-+61 75 125  60 75 125  61 75 125  60 75 125  60 75 125  59 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  59 74 124  60 75 125  59 74 124  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  59 74 124  58 73 123  58 73 123  57 72 122
-+58 73 123  58 73 123  57 72 122  58 73 123  58 73 123  33 49 106
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+37 53 109  56 70 122  56 70 122  55 69 121  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  56 70 122  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+54 69 120  55 70 121  53 68 119  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  53 68 119  54 69 120  46 61 115  25 42 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  49 64 117  50 65 118  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+50 65 118  49 65 117  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  48 64 117  47 63 116
-+28 45 103  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 43 102  39 55 110  46 61 115  45 60 114  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+43 60 114  43 60 114  44 60 114  43 59 113  44 60 114  36 52 108
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  34 50 107  40 56 111  39 55 110  40 56 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  27 43 102  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  27 44 102  34 50 107  34 50 107  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  34 50 107  27 44 102  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  23 40 99  34 50 107  55 69 121
-+61 75 125  63 77 126  63 77 126  62 76 125  63 77 126  63 77 126
-+64 78 127  64 78 127  64 78 127  63 77 126  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  63 77 126  63 77 126  64 78 127  64 78 127
-+64 78 127  64 78 127  65 79 128  65 79 128  65 79 128  64 78 127
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  64 78 127  65 79 128  65 79 128  65 79 128
-+65 79 128  64 78 127  64 78 127  64 78 127  64 78 127  63 77 126
-+63 77 126  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  63 77 126
-+64 78 127  64 78 127  63 77 126  63 77 126  62 76 125  63 77 126
-+63 77 126  62 76 125  59 74 124  47 63 116  27 44 102  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  25 42 101  36 52 108  59 74 124  61 75 125
-+59 74 124  61 75 125  61 75 125  61 75 125  61 75 125  60 75 125
-+61 75 125  61 75 125  60 75 125  59 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  59 74 124  59 74 124  58 73 123  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  58 73 123  57 72 122  58 73 123  58 73 123
-+58 73 123  57 72 122  58 73 123  56 71 121  32 50 106  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  34 50 107
-+57 72 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  56 70 122  55 70 121  54 70 120  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  53 68 119  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  53 68 119  54 69 120  51 66 119  26 43 102  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  42 58 112  51 66 119  50 65 118  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  50 65 118
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  49 65 117  48 64 117  48 64 117  37 53 109
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+31 47 105  46 61 115  46 61 115  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+43 60 114  44 60 114  44 60 114  44 60 114  42 58 112  29 45 103
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  27 44 102  38 54 110  39 55 110  40 56 111  40 56 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  38 54 110
-+39 55 111  34 50 108  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  31 47 105  34 50 108  35 51 108  35 51 108  35 51 108
-+34 50 107  34 50 107  34 50 106  32 48 105  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  23 40 100
-+34 50 107  49 64 117  57 72 122  63 77 126  63 77 126  62 76 125
-+63 77 126  63 77 126  63 77 126  64 78 127  64 78 127  63 77 126
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  63 77 126  63 77 126
-+63 77 126  64 78 127  64 78 127  64 78 127  64 78 127  65 79 128
-+65 79 128  65 79 128  65 79 128  64 78 127  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  64 78 127  65 79 128
-+65 79 128  65 79 128  65 79 128  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  63 77 126  63 77 126  63 77 126  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  63 77 126  64 78 127  64 78 127
-+63 77 126  63 77 126  63 77 126  63 77 126  63 77 126  62 76 125
-+54 69 120  42 58 112  27 44 103  23 39 99  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  31 47 105  49 64 117  62 76 125  61 75 125  59 74 124
-+61 75 125  61 75 125  61 75 125  61 75 125  60 75 125  61 75 125
-+60 75 125  60 75 125  59 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 74 124
-+59 74 124  59 74 124  58 73 123  58 73 123  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+58 73 123  58 73 123  57 72 122  58 73 123  58 73 123  58 73 123
-+57 72 122  58 73 123  54 69 120  34 50 107  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  33 49 106  56 71 121
-+56 70 122  55 69 121  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  56 70 122  55 70 121  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  55 70 121
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+53 68 119  54 69 120  52 67 118  29 47 104  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 101  24 41 100
-+34 50 107  51 66 119  50 65 118  49 64 117  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  50 65 118  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  47 63 116  44 60 114  27 44 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 100  25 42 101
-+40 57 112  46 61 115  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  45 60 114  43 60 114
-+44 60 114  44 60 114  43 60 114  43 59 113  37 53 109  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  32 48 105  39 55 110  40 56 111  40 56 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+38 54 110  30 46 104  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+26 43 101  33 49 106  35 51 108  35 51 108  35 51 108  35 51 108
-+35 51 108  34 50 107  34 50 107  29 46 104  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  24 41 100  31 47 105  40 56 111  55 70 121  64 78 127
-+63 77 126  62 76 125  63 77 126  63 77 126  63 77 126  64 78 127
-+64 78 127  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  63 77 126  63 77 126  63 77 126  64 78 127
-+64 78 127  64 78 127  64 78 127  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  64 78 127  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+64 78 127  65 79 128  65 79 128  65 79 128  65 79 128  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  63 77 126  63 77 126
-+63 77 126  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  64 78 127  64 78 127  63 77 126  63 77 126
-+62 76 125  63 77 126  64 78 127  61 75 125  48 63 117  36 52 108
-+27 44 102  23 40 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  23 40 100  25 42 101
-+43 58 114  57 72 122  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  60 75 125  61 75 125  61 75 125  60 75 125
-+59 75 125  59 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  59 74 124  60 75 125
-+59 74 124  58 73 123  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  59 74 124
-+58 73 123  57 72 122  58 73 123  58 73 123  58 73 123  57 72 122
-+58 73 123  54 69 120  31 47 105  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  32 50 106  53 67 120  56 70 122
-+55 69 121  56 70 122  56 70 122  56 70 122  56 70 122  55 70 121
-+56 70 122  55 70 121  54 70 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  53 68 119
-+54 69 120  54 69 120  35 51 108  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  29 46 104
-+48 63 117  51 66 119  49 64 117  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  49 65 117
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  49 65 117  48 64 116  48 64 117  34 50 106  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  33 49 106
-+46 61 115  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  45 60 114  44 60 114  43 60 114
-+44 60 114  44 60 114  44 60 113  43 60 114  27 44 102  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+26 43 102  37 53 109  40 56 111  39 55 111  40 56 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+36 52 108  26 43 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+28 45 103  35 51 108  35 51 108  35 51 108  35 51 108  35 51 108
-+35 51 108  33 49 106  33 49 106  27 43 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  25 42 101  26 43 101  32 50 106
-+50 65 118  63 77 126  63 77 126  63 77 126  63 77 126  63 77 126
-+63 77 126  64 78 127  64 78 127  63 77 126  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  63 77 126  63 77 126
-+63 77 126  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  64 78 127  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+63 77 126  63 77 126  63 77 126  63 77 126  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  63 77 126  64 78 127
-+64 78 127  64 78 127  63 77 126  63 77 126  62 76 125  63 77 126
-+64 78 127  59 74 124  42 57 112  27 44 103  25 42 101  24 41 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  23 40 100  34 50 107  55 71 121
-+59 74 124  61 75 125  61 75 125  59 74 124  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  60 75 125  60 75 125  59 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  59 74 124  60 75 125  60 75 125  59 74 124
-+58 73 123  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  58 73 123  59 74 124  58 73 123
-+57 72 122  58 73 123  58 73 123  58 73 123  57 72 122  58 73 123
-+51 67 118  28 45 103  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  29 46 104  53 67 120  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  55 70 121  56 70 122
-+55 70 121  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 69 120  54 69 120  53 68 119
-+53 68 119  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  40 56 111  25 42 101  25 42 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  26 43 101  42 58 112
-+51 66 119  50 65 118  49 64 117  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  48 65 116
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 64 117
-+49 65 117  48 64 116  48 64 117  40 57 112  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  45 60 114
-+46 61 115  45 60 114  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  43 60 114  44 60 114
-+44 60 114  43 59 113  44 60 114  35 51 108  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+30 46 104  40 56 111  40 56 111  40 56 111  39 55 111  38 54 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  38 54 110
-+32 48 107  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+32 48 105  35 51 108  34 50 107  35 51 108  35 51 108  34 50 107
-+35 51 108  33 49 106  31 47 105  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+23 40 100  27 44 103  45 60 114  58 73 123  61 75 125  62 76 125
-+63 77 126  62 76 125  63 77 126  63 77 126  63 77 126  64 78 127
-+64 78 127  64 78 127  63 77 126  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  63 77 126  63 77 126  63 77 126  63 77 126
-+63 77 126  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  63 77 126  63 77 126  63 77 126  63 77 126
-+63 77 126  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  63 77 126  63 77 126  63 77 126
-+62 76 125  63 77 126  63 77 126  62 76 125  61 75 125  53 67 120
-+36 52 108  24 41 100  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  27 44 103  46 61 115  61 75 125  61 75 125
-+59 74 124  61 75 125  61 75 125  61 75 125  61 75 125  60 75 125
-+61 75 125  60 75 125  60 75 125  59 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  59 74 124  60 75 125  59 74 124  58 73 123  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  58 73 123  58 73 123  58 73 123  57 72 122
-+58 73 123  58 73 123  57 72 122  58 73 123  58 73 123  49 64 117
-+27 43 102  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  27 44 103  51 66 119  56 70 122  55 69 121  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  55 70 121
-+54 70 120  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  54 69 120  55 70 121  54 69 120  53 68 119  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  53 68 119  54 69 120
-+47 63 116  25 42 102  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  34 50 107  51 66 119
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 116  48 64 117  47 63 116  26 43 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  37 53 109  46 61 115
-+45 60 114  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  43 60 114  44 60 114
-+43 59 113  44 60 114  43 59 113  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+37 53 109  40 56 111  40 56 111  39 55 111  39 55 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  38 54 110
-+25 43 102  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  26 43 101
-+35 51 108  34 50 107  35 51 108  35 51 108  34 50 107  35 51 108
-+34 50 107  33 49 106  28 45 103  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 100  24 41 100  23 40 99  24 41 100  36 52 108  48 63 117
-+56 71 121  62 76 125  64 78 127  63 77 126  62 76 125  63 77 126
-+63 77 126  63 77 126  64 78 127  64 78 127  64 78 127  63 77 126
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  63 77 126  63 77 126  63 77 126  63 77 126  63 77 126
-+63 77 126  63 77 126  63 77 126  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  63 77 126
-+63 77 126  63 77 126  63 77 126  63 77 126  63 77 126  63 77 126
-+63 77 126  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  63 77 126  64 78 127  64 78 127
-+63 77 126  63 77 126  63 77 126  62 76 125  63 77 126  63 77 126
-+64 78 127  59 74 124  53 67 120  44 59 113  29 47 104  23 39 99
-+23 40 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  23 40 100
-+27 44 103  39 55 110  56 70 122  62 76 125  61 75 125  59 74 124
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+60 75 125  59 75 125  59 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 74 124
-+60 75 125  60 75 125  59 74 124  58 73 123  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  59 74 124  58 73 123  57 72 122  57 72 122  58 73 123
-+58 73 123  57 72 122  58 73 123  58 73 123  46 61 115  26 44 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+29 46 104  51 66 119  56 70 122  55 69 121  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  55 70 121  55 70 121  55 70 121
-+54 70 120  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  53 68 119  54 69 120  50 65 118
-+28 45 103  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  28 45 103  50 65 118  51 66 119
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  50 65 118  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  49 65 117
-+48 64 117  48 64 117  34 50 107  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  29 46 104  44 60 114  46 61 115
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  43 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  33 49 106  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  29 46 104
-+40 57 112  39 55 110  39 55 111  40 56 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  39 55 111  32 50 106
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  31 47 105
-+35 51 108  35 51 108  35 51 108  35 51 108  35 51 108  34 50 107
-+34 50 107  33 49 106  25 42 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  24 41 100
-+29 46 104  35 51 108  44 61 114  57 72 122  64 78 127  64 78 127
-+63 77 126  63 77 126  63 77 126  63 77 126  63 77 126  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  63 77 126  63 77 126  63 77 126
-+63 77 126  63 77 126  63 77 126  63 77 126  63 77 126  63 77 126
-+63 77 126  63 77 126  63 77 126  63 77 126  63 77 126  63 77 126
-+63 77 126  63 77 126  63 77 126  63 77 126  63 77 126  63 77 126
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+63 77 126  64 78 127  64 78 127  64 78 127  63 77 126  63 77 126
-+63 77 126  62 76 125  63 77 126  64 78 127  63 77 126  52 67 118
-+40 56 111  32 50 106  26 43 102  23 40 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  23 40 100  37 53 109
-+52 67 118  61 75 125  61 75 125  59 74 124  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  59 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  59 74 124  60 75 125
-+59 74 124  59 74 124  58 73 123  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+59 74 124  58 73 123  57 72 122  58 73 123  58 73 123  58 73 123
-+57 72 122  58 73 123  59 74 124  40 57 112  25 42 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  29 46 104
-+50 65 118  56 70 122  55 69 121  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  56 70 122  55 70 121  54 70 120
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+54 69 120  55 70 121  54 69 120  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  53 68 119  54 69 120  52 67 118  31 47 105
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  47 63 116  51 66 119  50 65 118
-+49 64 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  50 65 118  49 65 117  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 64 116
-+48 64 117  40 57 112  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  38 54 110  46 61 115  45 60 114
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  44 60 114  43 60 114  44 60 114  43 59 113
-+44 60 114  40 56 111  26 43 102  25 42 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 100  38 54 110
-+40 56 111  40 56 111  40 56 111  39 55 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  38 54 110  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  34 50 107
-+35 51 108  35 51 108  35 51 108  35 51 108  35 51 108  34 50 107
-+34 50 107  30 46 104  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  24 41 100  25 42 101  26 43 102  33 49 106  47 63 116
-+61 75 125  64 78 127  63 77 126  63 77 126  63 77 126  63 77 126
-+63 77 126  63 77 126  64 78 127  64 78 127  64 78 127  63 77 126
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  63 77 126  64 78 127  64 78 127
-+64 78 127  63 77 126  63 77 126  63 77 126  63 77 126  63 77 126
-+63 77 126  63 77 126  54 69 120  40 56 111  27 44 103  26 43 101
-+25 42 101  24 41 100  24 41 100  25 42 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  23 40 99  31 47 105  52 67 118  59 74 124
-+61 75 125  61 75 125  59 74 124  61 75 125  61 75 125  61 75 125
-+61 75 125  60 75 125  61 75 125  61 75 125  60 75 125  59 75 125
-+59 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  59 74 124  60 75 125  59 74 124
-+58 73 123  58 73 123  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  57 72 122  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  57 72 122  36 52 108  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  27 44 102  50 65 118
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  56 70 122  55 70 121  54 70 120  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  54 69 120  53 68 119  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  55 68 119  33 49 106  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  23 40 100  42 57 112  51 66 119  50 65 118  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  49 65 117  48 63 117
-+46 61 115  30 46 104  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 101  29 46 104  44 61 114  46 61 115  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  45 60 114  43 60 114  44 60 114  44 60 114  44 60 114
-+43 59 113  32 50 106  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  31 47 105  40 56 111
-+39 55 110  39 55 111  40 56 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 110  39 55 111  32 48 105  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  30 46 104  35 51 108
-+34 50 107  35 51 108  35 51 108  34 50 107  35 51 108  34 50 107
-+34 50 107  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+36 52 108  25 42 101  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+23 40 100  33 49 106  47 63 116  58 73 123  61 75 125  62 76 125
-+63 77 126  63 77 126  63 77 126  62 76 125  63 77 126  63 77 126
-+63 77 126  63 77 126  64 78 127  64 78 127  64 78 127  64 78 127
-+63 77 126  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+63 77 126  63 77 126  63 77 126  63 77 126  62 76 125  62 76 125
-+63 77 126  63 77 126  62 76 125  61 75 125  60 75 125  54 69 120
-+40 56 111  27 44 102  23 40 99  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+25 42 101  28 45 103  46 61 115  61 75 125  61 75 125  59 74 124
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  59 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  59 74 124  60 75 125  59 74 124  58 73 123  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  58 73 123  59 74 124  58 73 123  57 72 122
-+57 72 122  58 73 123  58 73 123  57 72 122  57 72 122  58 73 123
-+55 70 121  35 52 107  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  26 43 101  50 65 118  56 70 122
-+55 69 121  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  55 70 121
-+54 69 120  53 68 119  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  53 68 119  39 55 110  24 41 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  34 50 107  50 65 118  50 65 118  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 116  48 64 117
-+37 53 109  23 40 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  40 56 111  46 61 115  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+45 60 114  43 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+40 56 111  25 43 102  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  38 54 109  39 55 110
-+39 55 111  40 56 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  39 55 111  38 54 110  26 43 102  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  34 50 107  34 50 107
-+35 51 108  35 51 108  35 51 108  35 51 108  34 50 107  34 50 107
-+31 47 105  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+62 76 125  51 66 119  36 52 108  26 43 101  23 40 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  23 40 99  23 40 100  32 50 106  42 58 112
-+50 65 118  56 71 121  59 74 124  64 78 127  63 77 126  63 77 126
-+63 77 126  63 77 126  63 77 126  63 77 126  63 77 126  63 77 126
-+64 78 127  64 78 127  64 78 127  64 78 127  63 77 126  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  63 77 126  63 77 126  63 77 126  63 77 126
-+63 77 126  62 76 125  63 77 126  63 77 126  64 78 127  63 77 126
-+58 73 123  53 68 119  47 63 116  37 53 109  28 45 102  23 39 99
-+23 40 100  24 41 100  24 41 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  23 40 100  29 47 104
-+42 58 112  58 73 123  62 76 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  60 75 125  61 75 125  61 75 125
-+60 75 125  59 75 125  59 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  59 74 124  58 73 123  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  59 74 124  58 73 123  57 72 122  58 73 123
-+58 73 123  58 73 123  57 72 122  58 73 123  59 74 124  51 66 119
-+31 47 105  23 40 99  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  28 45 103  49 64 117  57 72 122  55 69 121
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  55 70 121
-+55 70 121  55 70 121  54 70 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 69 120  55 70 121  54 69 120
-+53 68 119  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+53 68 119  54 69 120  43 59 113  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+28 45 103  47 63 116  51 66 119  49 64 117  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  50 65 118
-+49 65 117  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  49 65 117  48 64 116  48 64 117  43 60 114
-+24 41 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  32 50 106  47 63 116  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  45 60 114
-+44 60 114  43 60 114  44 60 114  44 60 114  43 59 113  44 60 114
-+31 47 105  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  31 47 105  39 55 110  40 56 111
-+40 56 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  32 50 106  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  28 45 103  34 50 107  35 51 108
-+35 51 108  35 51 108  35 51 108  34 50 107  34 50 107  34 50 107
-+26 43 102  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+61 75 125  61 75 125  59 74 124  51 66 119  38 54 109  24 41 100
-+23 40 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  23 40 100
-+24 41 100  29 45 103  34 50 106  39 55 110  47 63 116  55 70 121
-+63 77 126  65 79 128  64 78 127  63 77 126  62 76 125  63 77 126
-+63 77 126  63 77 126  63 77 126  63 77 126  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  63 77 126  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  63 77 126  63 77 126
-+63 77 126  63 77 126  63 77 126  62 76 125  63 77 126  63 77 126
-+64 78 127  64 78 127  59 74 124  51 66 119  43 59 113  36 52 108
-+31 47 105  27 43 102  23 40 100  24 41 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  23 40 99  29 46 103  45 60 114  56 71 121
-+62 76 125  61 75 125  59 74 124  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  60 75 125  60 75 125
-+59 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 74 124
-+59 74 124  59 74 124  59 74 124  58 73 123  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  58 73 123  57 72 122  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  44 61 114  28 45 103
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  29 46 103  49 64 117  56 70 122  55 69 121  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  55 70 121  56 70 122
-+55 70 121  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  55 70 121  54 69 120  53 68 119
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  53 68 119
-+55 70 121  44 61 114  26 43 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+44 60 114  51 66 119  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  48 64 117  47 63 116  28 45 103
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+27 43 102  45 60 114  45 60 114  45 60 114  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  43 59 113  44 60 114  39 55 110
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  26 43 101  36 52 108  40 56 111  39 55 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 110  28 45 103  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  32 48 107  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  35 51 108  34 50 106  31 47 105
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+61 75 125  59 74 124  61 75 125  61 75 125  59 74 124  54 69 120
-+34 50 107  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  24 41 100  24 41 100  25 42 101  26 43 102
-+28 45 103  36 52 108  44 61 114  56 71 121  64 78 127  64 78 127
-+63 77 126  63 77 126  63 77 126  63 77 126  63 77 126  63 77 126
-+63 77 126  63 77 126  63 77 126  63 77 126  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  63 77 126  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  64 78 127
-+64 78 127  64 78 127  64 78 127  64 78 127  64 78 127  63 77 126
-+63 77 126  63 77 126  63 77 126  63 77 126  63 77 126  62 76 125
-+63 77 126  63 77 126  64 78 127  64 78 127  61 75 125  51 67 118
-+40 57 112  31 47 105  27 44 102  26 43 102  25 42 101  24 41 100
-+24 41 100  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+23 40 100  25 42 101  45 60 114  58 73 123  59 74 124  61 75 125
-+60 75 125  59 74 124  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  59 74 124  60 75 125  60 75 125
-+59 74 124  58 73 123  58 73 123  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+58 73 123  58 73 123  58 73 123  57 72 122  58 73 123  58 73 123
-+58 73 123  57 72 122  57 72 122  40 57 112  25 42 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+28 45 103  50 65 118  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  55 70 121  56 70 122  55 70 121
-+54 70 120  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 69 120  53 68 119  53 68 119
-+54 69 120  54 69 120  54 69 120  54 69 120  53 68 119  54 69 120
-+48 64 117  26 43 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  23 40 100  39 55 110
-+51 66 119  50 65 118  49 64 117  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  50 65 118  48 65 116
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  48 64 116  48 64 117  34 50 107  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+39 55 111  46 61 115  45 60 114  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  45 60 114  44 60 114
-+43 60 114  44 60 114  44 60 114  44 60 114  44 60 114  27 44 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 101  30 46 104  40 56 111  40 56 111  40 56 111
-+39 55 111  38 54 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  35 52 107  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  27 44 102  34 50 107  35 51 108  35 51 108
-+35 51 108  35 51 108  35 51 108  34 50 107  34 50 107  27 44 103
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+61 75 125  61 75 125  61 75 125  61 75 125  59 74 124  61 75 125
-+62 76 125  53 68 119  34 50 106  25 42 101  25 42 100  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  24 41 100  23 40 100  24 41 101  32 48 105
-+40 57 112  49 64 117  57 72 122  59 74 124  61 75 125  61 75 125
-+62 76 125  63 77 126  63 77 126  63 77 126  63 77 126  63 77 126
-+63 77 126  62 76 125  62 76 125  63 77 126  63 77 126  63 77 126
-+63 77 126  63 77 126  63 77 126  63 77 126  63 77 126  63 77 126
-+63 77 126  63 77 126  63 77 126  63 77 126  63 77 126  63 77 126
-+63 77 126  63 77 126  63 77 126  63 77 126  63 77 126  63 77 126
-+63 77 126  63 77 126  63 77 126  63 77 126  63 77 126  63 77 126
-+63 77 126  63 77 126  63 77 126  63 77 126  63 77 126  62 76 125
-+62 76 125  62 76 125  63 77 126  63 77 126  63 77 126  63 77 126
-+63 77 126  62 76 125  62 76 125  61 75 125  59 74 124  59 74 124
-+54 69 120  44 61 114  37 53 109  27 44 103  23 40 100  23 40 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  25 42 101  28 45 103
-+43 58 114  61 75 125  61 75 125  61 75 125  59 74 124  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+60 75 125  60 75 125  59 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  59 74 124  60 75 125  60 75 125  59 74 124  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  58 73 123  59 74 124  59 74 124  58 73 123
-+57 72 122  58 73 123  58 73 123  58 73 123  57 72 122  58 73 123
-+58 73 123  56 71 121  36 52 108  23 40 99  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  27 44 103
-+51 66 119  56 70 122  55 69 121  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  55 70 121  54 70 120
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+54 69 120  55 70 121  54 69 120  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  53 68 119  54 69 120  50 65 118
-+28 45 103  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  33 49 106  51 66 119
-+50 65 118  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 64 117
-+49 65 117  48 64 117  48 64 117  40 57 112  26 43 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  31 47 105
-+44 60 114  45 60 114  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  43 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  35 52 107  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  36 52 108  40 56 111  40 56 111  39 55 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  28 45 103  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  29 47 104  35 51 108  34 50 107  35 51 108
-+35 51 108  34 50 107  35 51 108  33 49 106  32 48 107  26 43 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+59 74 124  61 75 125  62 76 125  51 66 119  38 54 109  29 45 103
-+23 40 100  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+23 40 100  23 40 99  23 39 99  26 44 102  32 50 106  38 54 109
-+43 58 114  48 63 117  51 66 119  54 69 120  56 71 121  58 73 123
-+61 75 125  63 77 126  64 78 127  64 78 127  64 78 127  63 77 126
-+63 77 126  63 77 126  63 77 126  63 77 126  63 77 126  63 77 126
-+63 77 126  62 76 125  62 76 125  62 76 125  62 76 125  62 76 125
-+62 76 125  62 76 125  62 76 125  62 76 125  62 76 125  62 76 125
-+62 76 125  63 77 126  63 77 126  63 77 126  63 77 126  63 77 126
-+63 77 126  63 77 126  63 77 126  63 77 126  64 78 127  64 78 127
-+64 78 127  62 76 125  59 74 124  57 72 122  55 70 121  53 67 120
-+50 65 118  46 61 115  40 56 111  36 52 108  30 46 104  24 41 100
-+23 39 99  23 40 99  23 40 100  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  23 40 100  25 42 101  33 49 106  43 59 113  58 73 123
-+62 76 125  61 75 125  59 74 124  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  60 75 125  61 75 125  60 75 125  60 75 125
-+60 75 125  59 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 74 124
-+60 75 125  60 75 125  59 74 124  59 74 124  58 73 123  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  58 73 123  58 73 123  57 72 122
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+50 65 118  29 47 104  23 40 99  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  31 47 105  51 66 119
-+56 70 122  55 69 121  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  55 70 121  55 70 121  54 70 120  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+55 70 121  54 69 120  53 68 119  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  53 68 119  54 69 120  52 66 118  33 49 106
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  29 46 104  48 63 117  51 66 119
-+49 64 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  50 65 118  49 65 117  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  48 63 117  46 61 115  29 46 104  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  26 43 101  40 56 111
-+46 61 115  45 60 114  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  44 60 114  43 60 114
-+44 60 114  43 59 113  44 60 114  40 57 112  27 43 102  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  29 46 103  40 57 112  39 55 110  39 55 111  40 56 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  38 54 110
-+39 55 111  35 51 108  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  34 50 107  35 51 108  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  33 49 106  29 47 104  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+61 75 125  60 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  54 69 120
-+44 60 114  30 46 104  23 40 99  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  24 41 100  24 41 100
-+23 40 100  23 40 100  25 42 101  27 44 102  30 46 104  32 48 105
-+34 50 107  36 52 108  39 55 110  42 57 112  45 60 114  48 63 117
-+50 65 118  53 67 120  56 71 121  57 72 122  59 74 124  61 75 125
-+63 77 126  64 78 127  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  65 79 128  65 79 128  65 79 128  65 79 128  65 79 128
-+65 79 128  64 78 127  62 76 125  61 75 125  58 73 123  57 72 122
-+55 69 121  52 67 118  49 65 117  47 63 116  44 59 113  40 56 111
-+37 53 109  35 51 108  33 49 106  31 47 105  29 45 103  26 43 101
-+24 41 100  23 40 99  23 40 100  24 41 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  23 40 100
-+24 41 100  37 53 109  49 64 117  58 73 123  62 76 125  61 75 125
-+59 74 124  60 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+60 75 125  61 75 125  61 75 125  60 75 125  60 75 125  59 75 125
-+59 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  59 74 124  60 75 125
-+59 74 124  59 74 124  58 73 123  58 73 123  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  59 74 124  58 73 123  58 73 123  57 72 122  57 72 122
-+58 73 123  58 73 123  57 72 122  58 73 123  58 73 123  43 59 113
-+27 44 102  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  32 48 107  51 66 119  56 70 122
-+55 69 121  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  56 70 122  55 70 121  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  55 70 121
-+54 69 120  53 68 119  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  53 67 120  54 69 120  54 69 120  34 50 107  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  26 43 101  44 60 114  51 66 119  50 65 118
-+49 64 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  49 65 117  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  49 65 117
-+48 64 116  48 64 117  34 50 107  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  33 49 106  46 61 115
-+45 60 114  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  45 60 114  43 60 114  44 60 114
-+44 60 114  44 60 114  43 59 113  34 50 106  24 41 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 101  38 54 110  40 56 111  40 56 111  40 56 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  27 44 102  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  30 46 104  35 51 108  34 50 107  35 51 108  35 51 108
-+34 50 107  35 51 108  34 50 107  33 49 106  26 43 102  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+60 75 125  61 75 125  61 75 125  60 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  59 74 124  61 75 125  61 75 125
-+59 74 124  58 73 123  49 64 117  29 47 104  23 40 100  24 41 100
-+25 42 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+26 43 101  26 43 102  27 43 102  27 44 102  27 44 102  27 44 102
-+27 44 102  27 44 103  28 45 103  29 46 104  30 46 104  31 47 105
-+31 47 105  31 47 105  31 47 105  30 46 104  30 46 104  28 45 103
-+27 44 103  27 44 102  27 44 102  27 44 102  27 44 102  27 43 102
-+26 43 102  26 43 102  26 43 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  24 41 101  38 56 110
-+56 70 122  59 74 124  61 75 125  61 75 125  59 74 124  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  60 75 125
-+61 75 125  60 75 125  60 75 125  59 75 125  59 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  59 74 124  60 75 125  59 74 124
-+58 73 123  58 73 123  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+59 74 124  58 73 123  58 73 123  57 72 122  58 73 123  58 73 123
-+58 73 123  57 72 122  58 73 123  58 73 123  36 52 108  24 41 101
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  31 47 105  54 69 120  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  55 70 121
-+56 70 122  55 70 121  54 70 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+53 68 119  53 68 119  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  55 70 121  34 50 107  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  39 55 110  51 66 119  50 65 118  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  50 65 118  48 65 116  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  49 65 117  48 64 116
-+48 64 117  40 57 112  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  44 60 114  46 61 115
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  45 60 114  44 60 114  43 60 114  44 60 114
-+44 60 114  44 60 114  40 56 111  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+32 48 105  40 56 111  39 55 110  39 55 111  40 56 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  38 54 110  39 55 111
-+34 50 107  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  35 52 107  35 51 108  35 51 108  35 51 108  35 51 108
-+35 51 108  34 50 107  34 50 107  31 47 105  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+59 75 125  59 75 125  60 75 125  60 75 125  61 75 125  61 75 125
-+60 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+59 74 124  59 74 124  61 75 125  62 76 125  52 67 118  34 50 107
-+26 43 102  25 42 101  24 41 100  24 41 100  25 42 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+24 41 100  26 43 101  28 45 103  42 58 112  59 74 124  61 75 125
-+61 75 125  59 74 124  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  60 75 125  60 75 125
-+59 75 125  59 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+59 74 124  60 75 125  59 74 124  59 74 124  58 73 123  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  58 73 123  58 73 123  58 73 123
-+58 73 123  57 72 122  58 73 123  58 73 123  58 73 123  57 72 122
-+58 73 123  58 73 123  52 67 118  28 45 104  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  33 49 106  56 70 122  56 70 122  55 69 121  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 69 120  55 70 121  54 69 120
-+53 68 119  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  37 53 109  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  33 49 106  53 67 120  50 65 118  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+50 65 118  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  48 64 116  48 64 117
-+46 61 115  26 43 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  39 55 111  46 61 115  45 60 114
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  45 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  43 59 113  31 47 105  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+38 54 110  39 55 110  39 55 111  40 56 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  39 55 111  38 54 110
-+27 44 102  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 101  24 41 100
-+29 46 104  35 51 108  35 51 108  35 51 108  35 51 108  35 51 108
-+35 51 108  34 50 107  34 50 107  27 44 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+60 75 125  60 75 125  59 75 125  59 75 125  60 75 125  60 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  59 74 124  61 75 125  62 76 125
-+55 69 121  42 57 112  33 49 106  26 43 101  23 40 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  24 41 100  29 46 104
-+36 52 108  48 63 117  59 74 124  62 76 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+60 75 125  61 75 125  60 75 125  60 75 125  60 75 125  59 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 74 124
-+60 75 125  59 74 124  59 74 124  58 73 123  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  59 74 124  59 74 124  58 73 123  57 72 122
-+57 72 122  58 73 123  58 73 123  58 73 123  57 72 122  58 73 123
-+57 72 122  44 60 114  26 43 102  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+37 53 109  56 70 122  56 70 122  55 69 121  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  55 70 121  55 70 121  55 70 121
-+54 70 120  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  55 70 121  54 69 120  53 68 119
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  53 68 119
-+53 68 119  40 56 111  25 42 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+31 47 105  51 66 119  50 65 118  49 64 117  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  50 65 118
-+49 65 117  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  49 65 116  48 64 117  47 63 116
-+31 47 105  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 100  24 41 100  32 48 107  46 61 115  45 60 114  45 60 114
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  44 60 114  44 60 114  44 60 114  43 59 113
-+44 60 114  38 56 110  23 40 100  25 42 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  32 48 105
-+39 55 110  40 56 111  40 56 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  33 49 106
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+34 50 107  34 50 107  35 51 108  35 51 108  35 51 108  35 51 108
-+34 50 107  34 50 107  32 48 105  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+60 75 125  60 75 125  60 75 125  60 75 125  59 75 125  60 75 125
-+60 75 125  61 75 125  61 75 125  60 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  59 74 124  61 75 125
-+61 75 125  62 76 125  58 73 123  51 66 119  40 57 112  29 46 104
-+23 39 99  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  23 40 99  24 41 100  35 51 108  47 63 116  55 69 121
-+61 75 125  61 75 125  61 75 125  59 74 124  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  60 75 125  61 75 125
-+61 75 125  60 75 125  60 75 125  59 75 125  59 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  59 74 124  60 75 125  60 75 125
-+59 74 124  59 74 124  58 73 123  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  59 74 124  58 73 123  58 73 123  57 72 122  58 73 123
-+58 73 123  58 73 123  57 72 122  57 72 122  59 74 124  54 69 120
-+34 50 107  25 42 101  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 101  25 42 100  40 57 112
-+55 69 121  56 70 122  55 69 121  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  56 70 122  55 70 121  54 70 120
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  54 69 120  55 70 121  54 69 120  53 68 119  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  53 68 119  54 69 120
-+40 57 112  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  29 46 104
-+47 63 116  51 66 119  50 65 118  49 64 117  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  50 65 118  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  49 65 117  48 64 117  48 63 117  37 53 109
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  27 44 102  43 58 114  45 60 114  45 60 114  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+45 60 114  44 60 114  43 60 114  44 60 114  44 60 114  44 60 114
-+43 59 113  26 43 102  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  26 43 102  38 54 109
-+40 56 111  39 55 111  40 56 111  39 55 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  37 53 109  28 45 103
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  29 45 103
-+34 50 107  34 50 108  35 51 108  35 51 108  35 51 108  34 50 107
-+34 50 107  34 50 107  27 44 102  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 75 125
-+59 75 125  60 75 125  60 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  59 74 124  61 75 125  61 75 125  59 74 124  58 73 123
-+51 66 119  36 52 108  24 41 100  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  23 40 100
-+27 44 103  43 60 114  56 71 121  59 74 124  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  60 75 125  61 75 125  60 75 125
-+60 75 125  59 75 125  59 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  59 74 124  59 74 124
-+58 73 123  58 73 123  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+59 74 124  58 73 123  57 72 122  57 72 122  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  59 74 124  46 61 115  27 44 102
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 101  24 41 100  45 60 114  56 70 122
-+56 70 122  55 69 121  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  56 70 122  55 70 121  54 70 120  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+54 69 120  55 70 121  54 69 120  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  53 68 119  55 70 121  43 59 113
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  26 43 101  43 59 113
-+51 66 119  50 65 118  49 64 117  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  48 65 116
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  49 65 117  48 64 117  47 63 116  43 59 113  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 100  37 53 109  46 61 115  46 61 115  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  43 60 114  43 60 114  44 60 114  43 59 113  44 61 114
-+32 50 106  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  32 48 105  40 56 111
-+40 56 111  40 56 111  39 55 111  38 54 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  34 50 107  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  32 48 107
-+35 51 108  35 51 108  35 51 108  35 51 108  35 51 108  34 50 107
-+34 50 107  32 48 105  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  59 75 125  59 75 125  59 75 125  60 75 125
-+60 75 125  61 75 125  61 75 125  60 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  59 74 124
-+61 75 125  62 76 125  58 73 123  46 61 115  31 47 105  26 43 102
-+25 42 101  24 41 100  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+24 41 100  25 42 100  26 43 101  28 45 103  38 54 110  53 67 120
-+62 76 125  61 75 125  61 75 125  59 74 124  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  60 75 125
-+61 75 125  60 75 125  60 75 125  60 75 125  59 75 125  59 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 74 124
-+60 75 125  59 74 124  59 74 124  58 73 123  58 73 123  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  58 73 123  59 74 124  59 74 124  58 73 123
-+57 72 122  57 72 122  58 73 123  58 73 123  58 73 123  57 72 122
-+58 73 123  58 73 123  55 70 121  38 54 109  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  26 43 101  48 63 117  56 70 122  55 69 121
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+55 70 121  54 69 120  53 68 119  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  44 60 114  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  38 54 110  53 67 120
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  49 65 117  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 64 117
-+49 65 117  48 64 116  48 64 117  47 63 116  28 45 103  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+29 46 104  45 60 114  46 61 115  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  44 60 114
-+43 60 114  44 60 114  44 60 114  44 60 114  44 60 114  39 55 111
-+26 43 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  39 55 110  40 56 111
-+39 55 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  27 44 103  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  27 44 102  34 50 108
-+35 51 108  35 51 108  35 51 108  35 51 108  35 51 108  34 50 107
-+34 50 107  28 45 103  24 41 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 75 125
-+59 75 125  60 75 125  60 75 125  61 75 125  61 75 125  60 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  59 74 124  61 75 125  62 76 125  62 76 125  55 69 121
-+44 60 114  35 51 108  29 47 104  25 42 100  23 40 100  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 100  24 41 100  24 41 100  23 40 100  27 44 102
-+32 50 106  39 55 110  49 64 117  59 74 124  63 77 126  61 75 125
-+59 74 124  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  60 75 125  61 75 125  61 75 125  61 75 125
-+60 75 125  60 75 125  59 75 125  59 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+59 74 124  58 73 123  58 73 123  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  59 74 124  58 73 123  58 73 123  57 72 122
-+58 73 123  58 73 123  58 73 123  58 73 123  57 72 122  58 73 123
-+58 73 123  48 63 117  31 47 105  23 40 99  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  30 46 104  50 65 118  56 70 122  55 69 121  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  55 70 121  56 70 122
-+55 70 121  55 70 121  54 70 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 69 120  55 70 121  55 70 121
-+54 69 120  53 68 119  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  53 68 119  54 69 120  45 60 114  25 42 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  36 52 108  52 67 118  50 65 118
-+49 64 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  50 65 118  49 65 117  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 116  48 64 117  48 64 117  32 50 106  23 40 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+40 57 112  46 61 115  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  45 60 114  44 60 114
-+43 60 114  44 60 114  44 60 114  44 60 114  43 59 113  31 47 105
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 101  24 41 100  34 50 107  40 56 111  39 55 110
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  39 55 111  34 50 106  23 40 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  31 47 105  35 51 108
-+34 50 107  35 51 108  35 51 108  34 50 107  35 51 108  33 49 106
-+32 48 107  25 43 102  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+59 75 125  59 75 125  60 75 125  60 75 125  60 75 125  61 75 125
-+61 75 125  60 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+62 76 125  59 74 124  55 70 121  49 64 117  40 57 112  31 47 105
-+24 40 99  23 40 99  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+23 40 100  23 39 99  27 44 102  36 52 108  46 61 115  52 67 118
-+58 73 123  62 76 125  61 75 125  61 75 125  59 74 124  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  60 75 125  61 75 125  60 75 125  60 75 125  60 75 125
-+59 75 125  59 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  59 74 124  60 75 125  59 74 124  59 74 124
-+59 74 124  58 73 123  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  59 74 124  58 73 123  58 73 123  57 72 122  57 72 122
-+58 73 123  58 73 123  58 73 123  57 72 122  58 73 123  55 70 121
-+38 54 110  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  23 40 100
-+34 50 107  51 66 119  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  55 70 121  56 70 122  55 70 121
-+55 70 121  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  55 70 121  54 69 120  54 69 120
-+53 68 119  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+53 68 119  54 69 120  44 61 114  27 44 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 100  34 50 107  50 65 118  50 65 118  50 65 118
-+49 64 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  50 65 118  49 65 117  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  49 65 117
-+48 64 116  49 65 117  37 53 109  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  23 40 100  36 52 108
-+46 61 115  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  43 60 114
-+44 60 114  44 60 114  44 60 114  43 59 113  38 54 110  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  28 45 103  39 55 111  39 55 111  39 55 111
-+40 56 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 110  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  27 44 102  35 51 108  35 51 108
-+35 51 108  35 51 108  35 51 108  35 51 108  34 50 107  33 49 106
-+30 46 104  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+60 75 125  60 75 125  59 74 124  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  59 75 125  59 75 125  60 75 125  60 75 125
-+60 75 125  61 75 125  61 75 125  60 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+59 74 124  61 75 125  61 75 125  61 75 125  59 74 124  58 73 123
-+57 72 122  46 61 115  34 50 107  24 41 101  23 40 100  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  23 40 99  28 45 103
-+39 55 111  52 67 118  58 73 123  59 74 124  59 74 124  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  60 75 125  61 75 125
-+61 75 125  61 75 125  60 75 125  60 75 125  59 75 125  59 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+59 74 124  60 75 125  60 75 125  59 74 124  59 74 124  58 73 123
-+58 73 123  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  59 74 124
-+59 74 124  58 73 123  57 72 122  57 72 122  58 73 123  58 73 123
-+58 73 123  57 72 122  58 73 123  58 73 123  48 64 116  28 45 103
-+25 42 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  23 40 99  38 54 110
-+55 69 121  56 70 122  56 70 122  55 69 121  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  56 70 122  55 70 121  54 70 120
-+54 70 120  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 69 120  53 68 119  53 68 119
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  53 68 119
-+54 69 120  47 63 116  25 42 101  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  31 47 105  48 63 117  51 66 119  49 64 117  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+50 65 118  49 65 117  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 64 116
-+48 64 117  40 57 112  26 43 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  30 46 104  45 60 114
-+45 60 114  44 59 113  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  45 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  43 59 113  44 60 114  26 43 102  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  36 52 108  40 56 111  39 55 110  40 56 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+38 54 110  39 55 111  31 47 105  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  31 47 105  35 51 108  34 50 107
-+35 51 108  35 51 108  34 50 107  35 51 108  34 50 107  33 49 106
-+26 43 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+58 73 123  59 74 124  59 74 124  59 74 124  60 75 125  59 74 124
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+59 75 125  59 75 125  60 75 125  60 75 125  60 75 125  61 75 125
-+61 75 125  60 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  62 76 125  61 75 125  50 65 118  39 55 111
-+29 46 104  27 43 102  26 43 101  25 42 101  24 41 100  24 41 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  25 42 101
-+26 43 102  27 44 102  34 50 107  44 60 115  57 72 122  62 76 125
-+61 75 125  61 75 125  60 75 125  59 74 124  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+60 75 125  61 75 125  61 75 125  61 75 125  60 75 125  60 75 125
-+59 75 125  59 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  59 74 124  60 75 125  60 75 125  60 75 125
-+59 74 124  59 74 124  58 73 123  58 73 123  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  59 74 124  59 74 124  58 73 123  58 73 123
-+57 72 122  57 72 122  58 73 123  58 73 123  58 73 123  57 72 122
-+58 73 123  57 72 122  55 70 121  36 52 108  23 40 99  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  43 59 113  56 70 122
-+55 69 121  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  56 70 122  55 70 121  54 70 120  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+54 69 120  55 70 121  54 69 120  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+47 62 113  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+27 44 103  46 61 115  51 66 119  49 64 117  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  49 65 117  48 64 116  48 64 117
-+46 61 115  29 46 104  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  42 57 112  46 61 115
-+45 60 114  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  45 60 114  44 60 114  43 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  33 49 106  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  30 46 104  39 55 110  39 55 111  40 56 111  40 56 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  38 54 110
-+39 55 111  36 52 108  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  26 43 102  35 51 108  34 50 107  35 51 108
-+35 51 108  34 50 107  35 51 108  34 50 107  34 50 107  31 47 105
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+59 74 124  58 73 123  58 73 123  59 74 124  59 74 124  60 75 125
-+60 75 125  59 74 124  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  59 75 125  59 75 125  59 75 125  60 75 125
-+60 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  59 74 124  61 75 125  61 75 125  62 76 125
-+62 76 125  57 72 122  48 64 117  40 57 112  35 51 108  31 47 105
-+27 44 103  24 41 100  23 40 100  24 41 100  24 41 100  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  24 41 100  23 40 100
-+23 40 100  26 43 101  30 46 104  34 50 106  38 54 110  44 60 114
-+52 67 118  60 75 125  63 77 126  62 76 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  60 75 125  61 75 125
-+61 75 125  60 75 125  60 75 125  60 75 125  59 75 125  59 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  59 74 124  60 75 125  59 74 124  59 74 124  59 74 124
-+58 73 123  58 73 123  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  59 74 124  58 73 123  58 73 123  57 72 122  57 72 122
-+58 73 123  58 73 123  58 73 123  57 72 122  57 72 122  58 73 123
-+56 71 121  44 61 114  27 44 103  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  29 46 104  46 61 115  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  56 70 122  55 70 121  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+55 70 121  54 69 120  53 68 119  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  53 68 119  54 69 120  44 61 114
-+26 43 102  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  26 43 101
-+43 60 114  52 67 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  50 65 118
-+49 65 117  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  49 65 117  48 64 117  48 64 116  48 63 117
-+34 50 106  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  36 52 108  44 60 115  45 60 114
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  44 60 114  43 60 114  44 60 114
-+43 59 113  44 60 114  39 55 110  24 41 100  24 41 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  36 52 108  40 56 111  39 55 111  40 56 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+38 54 111  31 47 105  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  32 50 106  35 51 108  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  34 50 107  33 49 106  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+59 74 124  59 74 124  59 74 124  58 73 123  58 73 123  59 74 124
-+59 74 124  60 75 125  59 74 124  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 75 125
-+59 75 125  60 75 125  60 75 125  61 75 125  61 75 125  61 75 125
-+60 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  59 74 124
-+61 75 125  61 75 125  61 75 125  62 76 125  59 74 124  57 72 122
-+53 67 120  49 64 117  44 59 113  37 53 109  31 47 105  25 42 101
-+23 39 99  23 40 99  23 40 100  24 41 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  23 40 100
-+23 40 99  23 40 99  23 40 100  28 45 103  34 50 107  40 56 111
-+47 63 116  51 66 119  55 69 121  58 73 123  62 76 125  62 76 125
-+61 75 125  61 75 125  59 74 124  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  60 75 125
-+60 75 125  60 75 125  59 75 125  59 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 74 124
-+60 75 125  60 75 125  59 74 124  59 74 124  58 73 123  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+59 74 124  58 73 123  58 73 123  57 72 122  58 73 123  58 73 123
-+58 73 123  58 73 123  57 72 122  58 73 123  59 74 124  49 64 117
-+33 49 106  25 42 101  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 100
-+23 40 99  34 50 107  51 66 119  56 70 122  56 70 122  55 69 121
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  55 70 121
-+56 70 122  55 70 121  54 70 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  55 70 121
-+54 69 120  53 68 119  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  53 68 119  54 69 120  44 61 114  27 44 102
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 100  42 58 112
-+51 66 119  50 65 118  49 64 117  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  50 65 118  49 65 117
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  48 64 116  50 65 118  36 52 108
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  29 46 104  44 60 114  46 61 115  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  44 60 114  43 60 114  44 60 114  43 59 113
-+44 60 114  42 58 112  28 45 103  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+29 47 104  40 56 111  40 56 111  40 56 111  39 55 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+37 53 109  26 43 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  27 44 102  34 50 107  34 50 107  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  34 50 107  30 46 104  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  58 73 123
-+59 74 124  59 74 124  60 75 125  60 75 125  60 75 125  59 74 124
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+59 75 125  59 75 125  59 75 125  60 75 125  60 75 125  60 75 125
-+61 75 125  61 75 125  61 75 125  60 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  60 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  59 74 124  59 74 124  58 73 123  58 73 123
-+55 69 121  47 63 116  40 56 111  34 50 106  26 43 101  23 40 99
-+23 40 100  23 40 100  24 41 100  24 41 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  24 41 100
-+24 41 100  23 40 100  23 40 99  24 41 100  29 47 104  37 53 109
-+43 60 114  51 66 119  57 72 122  58 73 123  59 74 124  59 74 124
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  59 74 124
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  60 75 125  61 75 125
-+61 75 125  61 75 125  60 75 125  60 75 125  60 75 125  59 75 125
-+59 75 125  59 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+59 74 124  59 74 124  58 73 123  58 73 123  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  58 73 123  59 74 124  59 74 124
-+58 73 123  58 73 123  57 72 122  58 73 123  58 73 123  58 73 123
-+58 73 123  57 72 122  58 73 123  56 71 121  36 52 108  26 43 101
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+39 55 111  55 69 121  56 70 122  55 69 121  55 69 121  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+53 68 119  53 68 119  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  53 68 119  55 70 121  44 60 114  24 41 100  24 41 100
-+24 41 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  40 57 112  50 65 118
-+50 65 118  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  50 65 118  49 65 117  48 65 116
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 116  48 64 117  40 56 111  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  42 58 112  46 61 115  45 60 114  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  45 60 114  43 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  34 50 107  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+38 54 109  40 56 111  39 55 110  40 56 111  39 55 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  38 54 110  38 54 110
-+31 47 105  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 100  31 47 105  35 51 108  35 51 108  35 51 108  35 51 108
-+35 51 108  34 50 107  34 50 107  34 50 106  26 43 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  58 73 123  58 73 123  59 74 124  59 74 124
-+60 75 125  60 75 125  59 74 124  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 75 125
-+59 75 125  59 75 125  60 75 125  60 75 125  60 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  60 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  59 74 124
-+61 75 125  61 75 125  61 75 125  62 76 125  62 76 125  59 74 124
-+53 68 119  48 63 117  42 57 112  37 53 109  32 48 105  28 45 103
-+27 44 102  27 43 102  26 43 102  26 43 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  26 43 101  26 43 101
-+26 43 102  27 44 102  27 44 102  29 46 104  34 50 107  40 56 111
-+45 60 114  50 65 118  57 72 122  62 76 125  62 76 125  61 75 125
-+61 75 125  61 75 125  61 75 125  59 74 124  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  60 75 125
-+61 75 125  61 75 125  61 75 125  60 75 125  60 75 125  60 75 125
-+59 75 125  59 75 125  59 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  59 74 124  59 74 124  59 74 124  58 73 123
-+58 73 123  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  59 74 124  58 73 123  58 73 123  58 73 123  57 72 122
-+58 73 123  58 73 123  58 73 123  58 73 123  57 72 122  58 73 123
-+58 73 123  56 71 121  47 63 116  27 44 102  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 101  24 41 100  27 43 102  43 60 114
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  56 70 122  55 70 121  54 70 120
-+54 70 120  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  55 70 121  54 69 120  53 68 119
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  43 59 113  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  37 53 109  50 65 118  50 65 118
-+49 64 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  50 65 118  49 65 117  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 64 117
-+49 65 117  48 64 117  48 64 117  43 60 114  26 43 102  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  36 52 108  46 61 115  45 60 114  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  43 60 114  44 60 114  44 60 114  43 59 113  44 60 114
-+40 56 111  26 43 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  32 48 105
-+40 56 111  39 55 110  40 56 111  39 55 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  39 55 111  37 53 109
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+27 43 102  34 50 107  35 51 108  35 51 108  35 51 108  35 51 108
-+35 51 108  34 50 107  34 50 107  30 46 104  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  58 73 123
-+59 74 124  59 74 124  60 75 125  60 75 125  59 74 124  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  59 75 125  59 75 125  59 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  61 75 125  61 75 125  61 75 125
-+60 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  59 74 124  61 75 125
-+61 75 125  61 75 125  62 76 125  62 76 125  63 77 126  62 76 125
-+58 73 123  55 70 121  53 67 120  49 64 117  47 63 116  44 60 114
-+42 58 112  39 55 111  37 53 109  36 52 108  36 52 108  35 52 107
-+34 50 107  33 49 106  33 49 106  33 49 106  32 48 107  32 48 105
-+32 48 105  32 48 105  32 48 105  32 48 107  32 50 106  32 50 106
-+33 49 106  34 50 106  34 50 107  35 52 107  36 52 108  37 53 109
-+39 55 110  40 57 112  43 58 114  46 61 115  48 63 117  50 65 118
-+54 69 120  57 72 122  61 75 125  63 77 126  63 77 126  62 76 125
-+62 76 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+60 75 125  60 75 125  60 75 125  59 75 125  59 75 125  59 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  59 74 124  60 75 125  60 75 125
-+59 74 124  59 74 124  59 74 124  58 73 123  58 73 123  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  59 74 124
-+59 74 124  58 73 123  58 73 123  57 72 122  57 72 122  58 73 123
-+58 73 123  58 73 123  58 73 123  57 72 122  58 73 123  57 72 122
-+48 64 117  34 50 106  23 40 99  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  31 47 105  48 63 117  57 72 122
-+56 70 122  55 69 121  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  56 70 122  55 70 121  54 70 120  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  54 69 120  55 70 121  54 69 120  53 68 119  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  53 68 119
-+54 69 120  42 57 112  25 42 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  34 50 107  50 65 118  50 65 118  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  49 65 117  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  49 65 117
-+48 64 117  48 63 117  46 61 115  29 47 104  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 100  24 41 100
-+31 47 105  46 61 115  45 60 114  45 60 114  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  45 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  43 60 114  43 59 113
-+29 47 104  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  27 44 102  40 56 111
-+40 56 111  39 55 111  40 56 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  28 45 103
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+29 47 104  35 51 108  34 50 107  35 51 108  35 51 108  34 50 107
-+35 51 108  33 49 106  33 49 106  27 43 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  59 74 124  59 74 124  59 74 124  60 75 125  60 75 125
-+60 75 125  59 74 124  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 75 125
-+59 75 125  59 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+61 75 125  61 75 125  61 75 125  60 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  59 74 124  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  62 76 125
-+62 76 125  62 76 125  62 76 125  61 75 125  60 75 125  59 74 124
-+58 73 123  58 73 123  58 73 123  57 72 122  57 72 122  57 72 122
-+57 72 122  57 72 122  57 72 122  57 72 122  57 72 122  58 73 123
-+58 73 123  58 73 123  59 74 124  59 74 124  61 75 125  62 76 125
-+62 76 125  62 76 125  62 76 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  59 74 124  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  60 75 125  61 75 125
-+61 75 125  61 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+59 75 125  59 75 125  59 75 125  59 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  59 74 124  59 74 124
-+59 74 124  58 73 123  58 73 123  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  58 73 123  59 74 124  58 73 123
-+58 73 123  57 72 122  57 72 122  58 73 123  58 73 123  58 73 123
-+58 73 123  57 72 122  58 73 123  59 74 124  50 65 118  35 51 108
-+26 43 101  24 41 100  25 42 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  39 55 110  53 67 120  56 70 122  55 69 121
-+55 69 121  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  53 67 120  53 68 119  55 70 121
-+40 56 111  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+23 40 100  33 49 106  50 65 118  51 66 119  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  50 65 118  49 65 117  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  49 65 117  48 64 117
-+47 63 116  48 64 117  34 50 106  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  27 44 103
-+43 58 114  45 60 114  45 60 114  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  45 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  43 59 113  44 60 114  36 52 108
-+24 41 100  24 41 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 100  36 52 108  40 56 111
-+39 55 110  40 56 111  39 55 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 110  39 55 111  34 50 107  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  26 43 101
-+34 50 108  35 51 108  35 51 108  35 51 108  35 51 108  35 51 108
-+34 50 107  33 49 106  31 47 105  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  58 73 123  58 73 123  59 74 124  59 74 124
-+59 74 124  60 75 125  59 74 124  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  59 75 125  59 75 125  59 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  60 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  59 74 124  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+60 75 125  61 75 125  61 75 125  61 75 125  61 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  59 75 125  59 75 125  59 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 74 124
-+60 75 125  60 75 125  59 74 124  59 74 124  59 74 124  58 73 123
-+58 73 123  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  59 74 124  59 74 124  58 73 123  58 73 123
-+57 72 122  57 72 122  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  55 70 121  36 52 108  25 42 101  24 41 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  44 60 115  55 69 121  56 70 122  55 69 121  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  55 70 121
-+55 70 121  55 70 121  55 70 121  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+54 69 120  54 69 120  54 69 120  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  53 68 119  54 69 120  55 70 121  37 53 109
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+32 48 105  50 65 118  50 65 118  49 64 117  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+50 65 118  49 65 117  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  47 63 116
-+49 65 117  36 52 108  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  37 53 109
-+46 61 115  46 61 115  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  43 60 114
-+43 60 114  44 60 114  43 59 113  44 60 114  40 57 112  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  29 47 104  39 55 110  39 55 110
-+39 55 111  40 56 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  26 43 102  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  31 47 105
-+35 51 108  34 50 107  35 51 108  35 51 108  34 50 107  35 51 108
-+34 50 107  33 49 106  27 44 102  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+58 73 123  58 73 123  59 74 124  59 74 124  58 73 123  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  58 73 123  59 74 124  59 74 124  59 74 124  60 75 125
-+60 75 125  59 74 124  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  59 75 125  59 75 125  59 75 125  59 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  60 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  59 75 125  59 75 125  59 75 125  59 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+59 74 124  60 75 125  60 75 125  60 75 125  59 74 124  59 74 124
-+59 74 124  58 73 123  58 73 123  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  58 73 123  59 74 124  59 74 124
-+58 73 123  58 73 123  58 73 123  57 72 122  58 73 123  58 73 123
-+58 73 123  58 73 123  57 72 122  58 73 123  58 73 123  57 72 122
-+55 70 121  43 58 114  25 42 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 101  24 41 100  25 42 101  30 46 104
-+51 66 119  56 70 122  55 69 121  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  55 70 121  56 70 122  55 70 121
-+54 70 120  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 69 120  55 70 121  54 69 120
-+53 68 119  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  53 68 119  54 69 120  53 68 119  36 52 108  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  30 46 104
-+49 64 117  50 65 118  49 64 117  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  50 65 118  50 65 118
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  49 65 116  48 64 117  48 64 117
-+40 57 112  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  32 48 105  46 61 115
-+46 61 115  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  45 60 114  44 60 114  43 60 114
-+44 60 114  43 59 113  44 60 114  44 60 113  28 45 103  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  26 43 102  36 52 108  40 56 111  39 55 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  32 48 107  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  26 43 101  35 51 108
-+34 50 107  35 51 108  35 51 108  34 50 107  35 51 108  34 50 107
-+34 50 107  32 48 105  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+57 72 122  58 73 123  58 73 123  58 73 123  59 74 124  59 74 124
-+58 73 123  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  58 73 123  58 73 123  59 74 124  59 74 124
-+59 74 124  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+59 75 125  59 75 125  59 75 125  59 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  60 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  59 75 125  59 75 125
-+59 75 125  59 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  59 74 124  60 75 125
-+60 75 125  59 74 124  59 74 124  59 74 124  58 73 123  58 73 123
-+58 73 123  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  58 73 123
-+58 73 123  57 72 122  57 72 122  58 73 123  58 73 123  58 73 123
-+58 73 123  57 72 122  58 73 123  58 73 123  54 69 120  44 60 113
-+29 46 103  23 40 99  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  26 43 102  39 55 110  56 71 121
-+56 70 122  55 69 121  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  55 70 121  54 70 120
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  55 70 121  54 69 120  53 68 119
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+53 68 119  54 69 120  51 67 118  35 52 107  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  29 46 104  47 63 116
-+51 66 119  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  49 65 117
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  49 65 117  48 64 117  48 64 117  43 59 113
-+26 43 102  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  27 44 102  44 60 114  46 61 115
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  45 60 114  44 60 114  43 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  35 51 108  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 100  31 47 105  40 56 111  40 56 111  40 56 111
-+39 55 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  37 53 109  26 43 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  32 48 107  35 51 108
-+35 51 108  35 51 108  35 51 108  35 51 108  34 50 107  34 50 107
-+34 50 107  26 43 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+58 73 123  57 72 122  57 72 122  57 72 122  58 73 123  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  58 73 123
-+58 73 123  59 74 124  59 74 124  60 75 125  60 75 125  60 75 125
-+59 74 124  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  59 75 125  59 75 125
-+59 75 125  59 75 125  59 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  60 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 75 125
-+59 75 125  59 75 125  59 75 125  59 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 74 124
-+59 74 124  59 74 124  58 73 123  58 73 123  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  59 74 124  58 73 123  58 73 123  58 73 123  57 72 122
-+57 72 122  58 73 123  58 73 123  58 73 123  58 73 123  57 72 122
-+58 73 123  59 74 124  55 71 121  40 57 112  29 47 104  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 100  23 40 100  30 46 104  48 63 117  56 70 122  56 70 122
-+55 69 121  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  55 70 121  55 70 121  55 70 121  54 70 120
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  54 69 120  55 70 121  54 69 120  54 69 120  53 68 119
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  53 68 119
-+54 69 120  51 66 119  32 48 105  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  27 44 102  46 61 115  51 66 119
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  49 65 117  48 65 116
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  49 65 117  48 64 117  48 63 117  46 61 115  28 45 103
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  40 57 112  46 61 115  45 60 114
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  43 60 114  44 60 114  44 60 114
-+44 60 114  43 60 114  40 57 112  26 43 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  26 43 102  39 55 110  40 56 111  39 55 110  39 55 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+38 54 110  38 54 110  31 47 105  24 41 100  25 42 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  27 44 103  34 50 107  34 50 107
-+35 51 108  35 51 108  35 51 108  35 51 108  34 50 107  34 50 107
-+29 47 104  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+58 73 123  58 73 123  58 73 123  58 73 123  57 72 122  58 73 123
-+58 73 123  58 73 123  59 74 124  59 74 124  58 73 123  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  58 73 123  58 73 123  59 74 124  59 74 124  59 74 124
-+60 75 125  60 75 125  60 75 125  59 74 124  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  59 75 125  59 75 125  59 75 125
-+59 75 125  59 75 125  59 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  61 75 125  61 75 125  61 75 125
-+61 75 125  61 75 125  61 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 75 125
-+59 75 125  59 75 125  59 75 125  59 75 125  59 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  59 74 124  60 75 125
-+60 75 125  60 75 125  59 74 124  59 74 124  59 74 124  58 73 123
-+58 73 123  58 73 123  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  58 73 123  57 72 122  57 72 122  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+57 72 122  40 57 112  27 44 102  25 42 101  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+23 40 100  38 54 110  55 69 121  56 70 122  56 70 122  55 69 121
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  56 70 122  55 70 121  54 70 120  54 70 120  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+54 69 120  55 70 121  54 69 120  54 69 120  53 68 119  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  53 68 119  54 69 120
-+49 64 117  27 44 103  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  26 43 102  47 63 116  51 66 119  49 64 117
-+49 64 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  50 65 118  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 64 117
-+49 65 117  48 64 117  47 63 116  48 64 117  31 47 105  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  38 54 110  46 61 115  45 60 114  44 59 113
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  45 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+43 59 113  44 60 114  29 46 104  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  35 51 108  40 56 111  39 55 110  39 55 111  40 56 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  37 53 109  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  31 47 105  35 51 108  35 51 108
-+35 51 108  35 51 108  35 51 108  34 50 107  34 50 107  34 50 106
-+26 43 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+58 73 123  57 72 122  57 72 122  58 73 123  58 73 123  58 73 123
-+58 73 123  57 72 122  57 72 122  58 73 123  58 73 123  58 73 123
-+59 74 124  59 74 124  58 73 123  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+58 73 123  58 73 123  59 74 124  59 74 124  59 74 124  60 75 125
-+60 75 125  60 75 125  60 75 125  59 74 124  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 75 125
-+59 75 125  59 75 125  59 75 125  59 75 125  59 75 125  59 75 125
-+59 75 125  59 75 125  59 75 125  59 75 125  59 75 125  59 75 125
-+59 75 125  59 75 125  59 75 125  59 75 125  59 75 125  59 75 125
-+59 75 125  59 75 125  59 75 125  59 75 125  59 75 125  59 75 125
-+59 75 125  59 75 125  59 75 125  59 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 74 124
-+60 75 125  60 75 125  60 75 125  59 74 124  59 74 124  59 74 124
-+58 73 123  58 73 123  58 73 123  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  58 73 123  58 73 123  57 72 122
-+57 72 122  57 72 122  58 73 123  58 73 123  58 73 123  58 73 123
-+57 72 122  58 73 123  58 73 123  57 72 122  55 70 121  43 59 113
-+26 43 102  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  27 44 103
-+47 63 116  56 70 122  55 69 121  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  55 70 121
-+55 70 121  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  55 70 121
-+55 70 121  53 68 119  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  53 68 119  54 69 120  54 69 120  46 61 115
-+26 43 102  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  27 43 102  46 61 115  51 66 119  50 65 118  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  50 65 118  50 65 118  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 116  48 63 117  48 64 117  33 49 106  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  32 48 107  45 60 114  45 60 114  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  43 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  35 52 107  23 40 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+29 46 104  40 56 111  39 55 110  39 55 111  40 56 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  27 44 103  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  27 44 102  34 50 107  35 51 108  35 51 108
-+35 51 108  35 51 108  35 51 108  34 50 107  34 50 107  30 46 104
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+54 69 120  59 74 124  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  57 72 122  57 72 122  58 73 123
-+58 73 123  58 73 123  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  58 73 123  58 73 123  58 73 123  59 74 124
-+59 74 124  59 74 124  59 74 124  60 75 125  60 75 125  60 75 125
-+59 74 124  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+59 74 124  59 74 124  59 74 124  58 73 123  58 73 123  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  59 74 124
-+58 73 123  58 73 123  58 73 123  57 72 122  57 72 122  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  57 72 122  58 73 123
-+58 73 123  58 73 123  51 67 118  40 57 112  28 45 103  23 40 99
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  36 52 108  53 67 120
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  55 70 121  55 70 121  55 70 121
-+54 70 120  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 69 120  55 70 121  54 69 120
-+54 69 120  53 68 119  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  53 68 119  54 69 120  54 69 120  44 59 113  26 43 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+27 44 102  44 60 114  51 66 119  50 65 118  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+50 65 118  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  49 65 116
-+48 64 117  48 63 117  36 52 108  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+27 44 102  42 58 112  46 61 115  45 60 114  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  43 60 114  44 60 114  44 60 114  43 59 113  44 60 114
-+39 55 111  24 41 100  25 42 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  26 43 101
-+38 54 109  39 55 111  39 55 111  40 56 111  39 55 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  38 54 110  39 55 111
-+33 49 106  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  31 47 105  35 51 108  34 50 107  35 51 108
-+35 51 108  34 50 107  35 51 108  33 49 106  33 49 106  26 43 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+31 47 105  40 57 112  55 70 121  59 74 124  58 73 123  57 72 122
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  57 72 122
-+57 72 122  58 73 123  58 73 123  59 74 124  59 74 124  59 74 124
-+58 73 123  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+58 73 123  58 73 123  59 74 124  59 74 124  59 74 124  59 74 124
-+60 75 125  60 75 125  60 75 125  60 75 125  59 74 124  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  58 73 123  58 73 123  58 73 123  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+58 73 123  57 72 122  57 72 122  57 72 122  58 73 123  58 73 123
-+58 73 123  58 73 123  57 72 122  58 73 123  58 73 123  59 74 124
-+48 63 117  36 52 108  28 45 103  23 40 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  23 40 100  31 47 105  47 63 116  55 69 121  56 70 122
-+55 69 121  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  56 70 122  56 70 122  55 70 121  54 70 120
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  55 70 121  54 69 120  54 69 120
-+53 68 119  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+53 68 119  54 69 120  55 69 121  38 54 110  25 42 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 102
-+44 60 114  51 66 119  50 65 118  49 64 117  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  49 65 117  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  49 65 117  48 64 117
-+48 64 117  38 56 110  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 100  24 41 101
-+40 56 111  46 61 115  45 60 114  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  45 60 114
-+44 60 114  43 60 114  44 60 114  43 59 113  44 60 114  42 58 112
-+27 44 103  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 100  33 49 106
-+39 55 110  39 55 110  40 56 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  39 55 111  37 53 109
-+26 43 102  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  27 44 103  35 51 108  35 51 108  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  33 49 106  31 47 105  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  26 43 102  37 53 109  54 69 120  59 74 124
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  57 72 122  57 72 122  58 73 123  58 73 123  58 73 123
-+59 74 124  59 74 124  58 73 123  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  58 73 123  58 73 123  58 73 123  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  60 75 125  60 75 125
-+60 75 125  60 75 125  59 74 124  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  58 73 123  58 73 123  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+59 74 124  59 74 124  58 73 123  58 73 123  58 73 123  57 72 122
-+57 72 122  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  57 72 122  58 73 123  58 73 123  46 61 115  30 46 104
-+26 43 101  24 41 100  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 100  39 55 110  54 69 120  56 70 122  56 70 122  55 69 121
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  56 70 122  55 70 121  55 70 121  54 70 120  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  54 69 120  55 70 121  54 69 120  53 68 119  53 68 119
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  53 68 119  34 50 107  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 100  46 61 115
-+51 66 119  50 65 118  49 64 117  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  50 65 118
-+48 65 116  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  49 65 117  48 64 116  48 64 117
-+42 58 112  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  23 40 100  37 53 109
-+46 61 115  45 60 114  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  45 60 114  44 60 114
-+43 60 114  44 60 114  44 60 114  44 60 114  43 59 113  34 50 106
-+25 42 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  27 44 102  38 54 110
-+40 56 111  39 55 111  40 56 111  39 55 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  31 47 105
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  33 49 106  35 51 108  34 50 107  35 51 108  35 51 108
-+34 50 107  35 51 108  34 50 107  33 49 106  26 43 102  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 100  24 41 100  24 41 100  34 50 107
-+51 66 119  56 71 121  57 72 122  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  57 72 122
-+57 72 122  57 72 122  58 73 123  58 73 123  58 73 123  59 74 124
-+59 74 124  58 73 123  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  58 73 123  58 73 123  58 73 123
-+58 73 123  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  59 74 124  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  58 73 123  58 73 123  58 73 123  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  59 74 124  59 74 124  59 74 124  58 73 123  58 73 123
-+58 73 123  57 72 122  57 72 122  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  57 72 122  58 73 123  58 73 123
-+57 72 122  55 71 121  44 60 113  28 45 103  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  25 42 101  29 46 104
-+48 64 117  57 72 122  56 70 122  55 69 121  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  55 70 121  56 70 122
-+55 70 121  55 70 121  54 70 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+55 70 121  55 70 121  54 69 120  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  53 68 119  54 69 120  54 69 120
-+50 65 118  32 50 106  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  26 43 102  44 60 115  51 66 119
-+50 65 118  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  50 65 118  50 65 118  48 65 116
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 116  48 64 117  44 61 114
-+25 42 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  32 48 105  46 61 115
-+45 60 114  45 60 114  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  45 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  43 59 113  44 60 114  38 54 110  25 42 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  35 51 108  40 56 111
-+39 55 110  39 55 111  39 55 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  36 52 108  26 43 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 101  24 41 100
-+29 45 103  35 51 108  34 50 107  35 51 108  35 51 108  34 50 107
-+35 51 108  34 50 107  34 50 107  31 47 105  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+23 40 100  32 48 105  43 60 114  51 66 119  57 72 122  58 73 123
-+58 73 123  57 72 122  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  57 72 122  57 72 122  58 73 123  58 73 123
-+58 73 123  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  59 74 124  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  58 73 123  58 73 123  58 73 123
-+58 73 123  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  59 74 124
-+59 74 124  58 73 123  58 73 123  58 73 123  57 72 122  57 72 122
-+57 72 122  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+57 72 122  58 73 123  58 73 123  59 74 124  55 70 121  48 64 116
-+38 54 110  26 43 101  23 40 99  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  28 45 103  40 56 111  56 71 121
-+56 70 122  55 69 121  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  56 70 122  56 70 122  55 70 121
-+54 70 120  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  55 70 121
-+54 69 120  54 69 120  53 68 119  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  53 68 119  54 69 120  54 69 120  47 63 116
-+29 46 104  23 40 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  27 44 102  43 60 114  51 66 119  50 65 118
-+49 64 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  50 65 118  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  49 65 117  48 64 116  48 64 117  44 60 114  26 43 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  28 45 103  44 60 114  46 61 115
-+45 60 114  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  45 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  43 59 113  44 60 114  42 58 112  27 43 102  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  29 47 104  40 57 112  39 55 110
-+39 55 111  40 56 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 110  39 55 111  29 46 104  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+33 49 106  35 52 107  35 51 108  35 51 108  35 51 108  35 51 108
-+34 50 107  34 50 107  33 49 106  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  23 40 100  28 45 103  35 51 108  46 61 115
-+56 71 121  59 74 124  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  57 72 122  57 72 122
-+57 72 122  58 73 123  58 73 123  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  59 74 124
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  59 74 124  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+58 73 123  58 73 123  57 72 122  57 72 122  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  57 72 122  58 73 123
-+58 73 123  59 74 124  51 66 119  40 56 111  32 48 105  25 42 101
-+23 40 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  37 53 109  50 65 118  56 70 122  56 70 122
-+55 69 121  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  55 70 121  55 70 121  54 70 120
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 69 120  55 70 121  54 69 120
-+53 68 119  53 68 119  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  40 56 111  26 43 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  26 43 101  44 60 114  51 66 119  50 65 118  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  49 65 117  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 64 117
-+49 65 117  48 64 116  48 64 117  44 60 115  29 46 103  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  26 43 101  40 56 111  46 61 115  45 60 114
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  44 60 114  43 60 114  44 60 114
-+44 60 114  44 60 113  44 60 114  30 46 104  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  26 43 102  39 55 110  40 56 111  39 55 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  39 55 111  34 50 107  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  30 46 104
-+34 50 107  34 50 108  35 51 108  35 51 108  35 51 108  35 51 108
-+34 50 107  34 50 107  29 46 103  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  24 41 100  25 42 101
-+27 44 102  37 53 109  53 68 119  58 73 123  58 73 123  57 72 122
-+57 72 122  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+57 72 122  57 72 122  57 72 122  58 73 123  58 73 123  58 73 123
-+58 73 123  59 74 124  59 74 124  58 73 123  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  60 75 125  60 75 125  60 75 125
-+60 75 125  60 75 125  60 75 125  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  59 74 124
-+59 74 124  59 74 124  58 73 123  58 73 123  58 73 123  57 72 122
-+57 72 122  57 72 122  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  57 72 122  58 73 123  58 73 123  58 73 123
-+46 61 115  31 47 105  26 43 101  25 42 101  24 41 100  24 41 100
-+25 42 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  23 40 100
-+31 47 105  50 65 118  55 69 121  56 70 122  56 70 122  55 69 121
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  56 70 122  55 70 121  54 70 120  54 70 120  54 70 120
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  53 68 119
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+53 67 120  54 69 120  53 68 119  36 52 108  25 42 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+26 43 102  47 63 116  51 66 119  50 65 118  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  50 65 118  48 65 116  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  49 65 117
-+48 64 117  48 63 117  47 63 116  31 47 105  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  37 53 109  46 61 115  45 60 114  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  43 60 114  44 60 114  44 60 114
-+43 59 113  44 61 114  34 50 106  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  36 52 108  40 56 111  39 55 110  39 55 111
-+40 56 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 111  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  26 43 101  33 49 106
-+35 51 108  35 51 108  35 51 108  35 51 108  35 51 108  34 50 107
-+34 50 107  32 48 107  25 42 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  23 40 99  31 47 105  46 61 115  55 70 121
-+57 72 122  58 73 123  58 73 123  58 73 123  57 72 122  57 72 122
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+57 72 122  57 72 122  58 73 123  58 73 123  58 73 123  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  59 74 124
-+59 74 124  59 74 124  58 73 123  58 73 123  58 73 123  58 73 123
-+57 72 122  57 72 122  57 72 122  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  57 72 122  56 71 121  52 67 118  39 55 110  25 42 101
-+23 40 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  27 44 102  42 57 112
-+56 70 122  56 70 122  55 69 121  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  54 70 120  54 70 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+55 70 121  55 70 121  54 69 120  53 68 119  53 68 119  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  53 68 119  54 69 120
-+54 69 120  51 66 119  32 48 105  23 40 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  27 44 103
-+46 61 115  51 66 119  50 65 118  49 64 117  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  50 65 118
-+50 65 118  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 64 116
-+48 64 117  47 63 116  33 49 106  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  32 48 107  47 63 116  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+45 60 114  44 60 114  43 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  38 54 110  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  31 47 105  39 55 110  39 55 110  40 56 111  40 56 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  38 54 110
-+39 55 111  39 55 111  29 46 104  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  29 46 104  35 51 108
-+34 50 107  35 51 108  35 51 108  34 50 107  35 51 108  34 50 107
-+34 50 107  28 45 103  24 41 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 101  24 41 100  23 40 99  25 42 101
-+36 52 108  46 61 115  51 67 118  57 72 122  59 74 124  58 73 123
-+58 73 123  57 72 122  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  57 72 122  57 72 122  57 72 122  57 72 122
-+58 73 123  58 73 123  58 73 123  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  59 74 124  59 74 124  59 74 124  58 73 123
-+58 73 123  58 73 123  58 73 123  57 72 122  57 72 122  57 72 122
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+57 72 122  57 72 122  58 73 123  58 73 123  58 73 123  54 69 120
-+49 65 117  40 57 112  31 47 105  23 40 100  23 40 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  23 40 100  27 44 103  37 53 109  51 66 119  57 72 122
-+56 70 122  55 69 121  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  55 70 121  55 70 121  55 70 121
-+55 70 121  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  55 70 121
-+54 69 120  54 69 120  53 68 119  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+44 61 114  27 44 102  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  29 45 103  46 61 115
-+51 66 119  50 65 118  49 64 117  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  50 65 118  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 116  48 64 117
-+47 63 116  34 50 107  23 40 99  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+30 46 104  46 61 115  45 60 114  45 60 114  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  45 60 114
-+44 60 114  43 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+42 58 112  28 45 103  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+26 43 102  37 53 109  40 56 111  39 55 111  40 56 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  38 54 111
-+39 55 111  34 50 108  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  34 50 107  35 51 108
-+35 51 108  35 51 108  35 51 108  35 51 108  34 50 107  33 49 106
-+32 48 107  26 43 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+24 41 100  24 41 100  28 45 103  34 50 106  42 58 112  51 67 118
-+59 74 124  59 74 124  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+57 72 122  57 72 122  57 72 122  58 73 123  58 73 123  58 73 123
-+58 73 123  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  58 73 123  59 74 124  59 74 124
-+59 74 124  59 74 124  58 73 123  58 73 123  58 73 123  57 72 122
-+57 72 122  57 72 122  57 72 122  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  57 72 122  58 73 123
-+58 73 123  59 74 124  55 71 121  47 63 116  37 53 109  31 47 105
-+26 43 101  23 40 100  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  37 53 109  48 63 117  56 70 122  56 70 122  55 69 121
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  56 70 122  56 70 122  55 70 121  54 70 120
-+54 70 120  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+54 69 120  53 68 119  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  53 68 119  54 69 120  54 69 120  38 54 109
-+25 42 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  23 40 100  29 46 104  47 63 116  51 66 119
-+50 65 118  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  49 65 117
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  49 65 116  48 64 117  47 63 116
-+34 50 107  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  28 45 103
-+43 58 114  46 61 115  45 60 114  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  43 59 113  44 60 114
-+32 48 105  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+33 49 106  40 56 111  39 55 111  40 56 111  39 55 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+38 54 110  28 45 103  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  31 47 105  35 51 108  34 50 107
-+35 51 108  35 51 108  34 50 107  35 51 108  34 50 107  33 49 106
-+28 45 103  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  24 41 100  25 42 101  26 43 102
-+29 46 104  39 55 111  52 67 118  59 74 124  58 73 123  58 73 123
-+57 72 122  57 72 122  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  57 72 122  57 72 122  57 72 122
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  59 74 124
-+59 74 124  59 74 124  59 74 124  58 73 123  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  58 73 123
-+58 73 123  58 73 123  57 72 122  57 72 122  57 72 122  57 72 122
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  59 74 124  57 72 122
-+47 63 116  34 50 107  27 44 102  26 43 101  24 41 100  24 41 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  23 40 99  31 47 105
-+49 64 117  55 69 121  56 70 122  56 70 122  55 69 121  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  55 70 121  54 70 120  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  55 70 121  54 69 120  53 68 119
-+53 68 119  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  53 68 119  54 69 120  52 67 118  32 48 105  24 41 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  31 47 105  49 64 117  51 66 119  49 64 117
-+49 64 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  50 65 118  48 65 116  48 65 116
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  49 65 117  48 64 117  47 63 116  35 51 108
-+25 42 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  26 43 101  39 55 110
-+46 61 115  46 61 115  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  45 60 114  44 60 114
-+43 60 114  44 60 114  44 60 114  43 59 113  44 60 114  36 52 108
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  28 45 103
-+40 56 111  40 56 111  39 55 110  39 55 111  38 54 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  38 54 110
-+33 49 106  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  27 44 102  35 51 108  35 51 108  35 51 108
-+35 51 108  35 51 108  35 51 108  34 50 107  34 50 107  32 48 105
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  23 40 99  27 44 103  39 55 110  50 65 118
-+55 70 121  56 71 121  57 72 122  58 73 123  58 73 123  58 73 123
-+57 72 122  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  57 72 122  57 72 122
-+57 72 122  57 72 122  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  58 73 123  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+57 72 122  57 72 122  57 72 122  57 72 122  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  57 72 122  58 73 123  58 73 123  58 73 123  58 73 123
-+57 72 122  56 71 121  54 69 120  45 60 114  33 49 106  24 41 100
-+23 40 100  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  25 42 101  29 46 104  46 61 115  56 70 122
-+56 70 122  55 69 121  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  55 70 121  56 70 122  56 70 122
-+55 70 121  54 70 120  54 70 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  53 68 119  53 68 119  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  53 68 119
-+54 69 120  54 69 120  47 63 116  25 42 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  32 48 107  49 64 117  50 65 118  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  50 65 118  50 65 118  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 64 117
-+49 65 117  49 65 116  48 64 117  47 63 116  38 54 110  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  36 52 108  47 63 116
-+45 60 114  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  45 60 114  44 60 114  43 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  39 55 111  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  38 54 110
-+40 56 111  39 55 111  40 56 111  39 55 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  39 55 111  38 54 110
-+25 42 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  33 49 106  35 52 107  35 51 108  35 51 108
-+35 51 108  35 51 108  35 51 108  34 50 107  34 50 107  27 44 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  23 40 100  23 40 99
-+27 43 102  36 52 108  43 59 113  49 64 117  53 67 120  57 72 122
-+59 74 124  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  57 72 122  57 72 122  57 72 122  57 72 122
-+57 72 122  57 72 122  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  57 72 122  57 72 122  57 72 122  57 72 122  57 72 122
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  57 72 122  58 73 123
-+58 73 123  58 73 123  58 73 123  55 70 121  51 66 119  46 61 115
-+38 56 110  31 47 105  24 41 100  23 40 99  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+24 41 100  31 47 105  42 57 112  55 69 121  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  55 70 121  55 70 121
-+54 70 120  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+54 69 120  54 69 120  54 69 120  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  53 68 119  54 69 120
-+52 67 118  39 55 110  24 41 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+34 50 107  49 64 117  51 66 119  49 64 117  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+50 65 118  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 116  48 64 117  48 64 117  38 54 110  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  33 49 106  47 63 116  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  43 60 114  44 60 114
-+44 60 114  43 59 113  44 60 114  42 58 112  27 44 102  24 41 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  34 50 107  40 56 111
-+39 55 110  40 56 111  39 55 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  38 54 111  28 45 103
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  29 46 104  34 50 107  34 50 108  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  34 50 107  31 47 105  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 100
-+24 41 100  24 41 100  23 40 100  25 42 101  30 46 104  34 50 107
-+39 55 110  47 63 116  54 69 120  59 74 124  59 74 124  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  57 72 122  57 72 122  57 72 122  57 72 122
-+57 72 122  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  59 74 124  59 74 124  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  57 72 122  57 72 122  57 72 122  57 72 122  57 72 122
-+57 72 122  57 72 122  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+57 72 122  58 73 123  58 73 123  59 74 124  60 75 125  57 72 122
-+50 65 118  43 59 113  36 52 108  32 50 106  28 45 103  24 41 100
-+23 40 100  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  23 40 100  31 47 105
-+44 60 114  53 67 120  57 72 122  56 70 122  55 69 121  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  55 70 121  55 70 121  55 70 121  54 70 120
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 69 120  55 70 121  55 70 121
-+54 69 120  53 68 119  53 68 119  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  53 68 119  53 68 119  55 70 121  48 63 117
-+31 47 105  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  23 40 99  38 54 110
-+50 65 118  51 66 119  50 65 118  49 64 117  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  49 65 117  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  49 65 116
-+48 64 117  48 64 117  37 53 109  24 41 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  23 40 100  32 48 105  45 60 114  45 60 114  45 60 114
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  45 60 114  43 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  43 59 113  31 47 105  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 100  24 41 100  30 46 104  39 55 110  39 55 110
-+39 55 111  40 56 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 110  39 55 111  32 50 106  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  33 49 106  35 51 108  35 51 108  35 51 108  35 51 108
-+35 51 108  34 50 107  34 50 107  33 49 106  26 43 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  24 41 100  24 41 100
-+25 42 101  26 43 101  26 43 102  29 46 103  37 53 109  46 61 115
-+54 70 120  59 74 124  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  57 72 122  57 72 122  57 72 122  57 72 122  57 72 122
-+57 72 122  57 72 122  57 72 122  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  57 72 122
-+57 72 122  57 72 122  57 72 122  57 72 122  57 72 122  57 72 122
-+57 72 122  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  57 72 122  58 73 123  58 73 123  58 73 123
-+59 74 124  58 73 123  50 65 118  42 58 112  32 50 106  27 44 102
-+26 43 102  25 42 101  24 41 100  24 41 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  23 40 100  27 44 103  44 60 115  55 69 121
-+55 69 121  56 70 122  55 69 121  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  55 70 121
-+56 70 122  56 70 122  55 70 121  54 70 120  54 70 120  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  54 69 120
-+53 68 119  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  40 57 112  26 43 102
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  40 56 111  50 65 118
-+50 65 118  49 64 117  49 64 117  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  50 65 118
-+48 65 116  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  49 65 117  48 64 117
-+48 64 117  37 53 109  25 42 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  29 46 104  44 59 113  46 61 115  44 59 113  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  45 60 114  44 60 114  43 60 114  44 60 114  44 60 114
-+43 59 113  44 60 114  36 52 108  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  26 43 102  37 53 109  40 56 111  39 55 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  39 55 111  36 52 108  26 43 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+29 46 104  35 51 108  35 51 108  35 51 108  35 51 108  35 51 108
-+34 50 107  34 50 107  34 50 107  29 46 104  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  24 41 100
-+23 40 99  26 43 102  34 50 108  42 58 112  51 67 118  55 70 121
-+56 71 121  56 71 121  57 72 122  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  57 72 122  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  57 72 122  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  57 72 122
-+57 72 122  56 71 121  55 71 121  54 69 120  47 63 116  39 55 110
-+31 47 105  24 41 100  23 40 100  24 41 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+25 42 101  29 45 103  43 58 114  56 70 122  56 70 122  55 69 121
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  56 70 122  55 70 121  55 70 121
-+55 70 121  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+55 70 121  55 70 121  54 69 120  53 68 119  53 68 119  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  53 68 119
-+54 69 120  54 69 120  51 66 119  35 52 107  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  26 43 102  40 57 112  51 66 119  50 65 118
-+49 64 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  50 65 118  50 65 118  48 65 116
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  49 65 117  49 65 116  48 64 117  47 63 116
-+39 55 111  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+27 44 102  40 57 112  46 61 115  45 60 114  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  43 60 114  44 60 114  44 60 114  44 60 113
-+44 60 114  39 55 111  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  33 49 106  40 56 111  39 55 110  40 56 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 110  30 46 104  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+34 50 107  35 51 108  35 51 108  35 51 108  35 51 108  35 51 108
-+34 50 107  33 49 106  32 48 107  26 43 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  23 40 100  23 39 99  24 41 101
-+30 46 104  36 52 108  40 56 111  44 61 114  48 64 116  51 66 119
-+54 69 120  56 71 121  58 73 123  59 74 124  59 74 124  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  57 72 122  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  59 74 124  59 74 124
-+57 72 122  54 70 120  52 67 118  50 65 118  47 63 116  43 59 113
-+38 54 109  33 49 106  27 44 103  23 39 99  23 40 99  23 40 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  23 40 100  26 43 101  32 50 106
-+42 58 112  55 69 121  57 72 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  56 70 122  56 70 122  55 70 121  55 70 121  54 70 120
-+54 70 120  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  55 70 121
-+54 69 120  54 69 120  53 68 119  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  53 67 120  54 69 120
-+53 68 119  45 60 114  29 45 103  23 40 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  28 45 103  42 58 112  52 67 118  50 65 118  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 116  48 64 117  48 64 117  38 56 110
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+38 54 110  47 63 116  45 60 114  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+44 60 114  43 60 114  44 60 114  44 60 114  43 59 113  44 60 114
-+40 57 112  25 42 102  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  29 46 104  40 56 111  39 55 111  39 55 111  40 56 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+38 54 110  39 55 111  34 50 107  25 42 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  32 48 105
-+35 51 108  34 50 107  35 51 108  35 51 108  34 50 107  35 51 108
-+34 50 107  33 49 106  29 46 104  24 41 100  24 41 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  24 41 100  23 40 100  23 40 100  25 42 101  27 44 103
-+29 47 104  33 49 106  35 51 108  38 54 110  42 58 112  46 61 115
-+49 65 117  53 67 120  57 72 122  60 75 125  60 75 125  59 74 124
-+59 74 124  59 74 124  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  57 72 122  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+57 72 122  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+59 74 124  59 74 124  59 74 124  59 74 124  60 75 125  58 73 123
-+55 70 121  51 67 118  48 63 117  44 60 113  40 56 111  36 52 108
-+34 50 107  31 47 105  29 46 104  26 43 102  24 41 100  23 40 100
-+24 41 100  24 41 100  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  23 40 100  24 41 101  36 52 108  47 63 116  54 69 120
-+56 70 122  56 70 122  55 69 121  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  55 70 121
-+56 70 122  55 70 121  55 70 121  54 70 120  54 70 120  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 69 120  55 70 121  54 69 120
-+54 69 120  53 68 119  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  53 68 119  54 69 120  50 65 118
-+35 51 108  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 101  23 40 100
-+31 47 105  46 61 115  51 66 119  50 65 118  50 65 118  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  49 65 117  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  49 65 116  48 64 117  48 64 117  37 53 109  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  38 54 109
-+46 61 115  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  45 60 114
-+43 60 114  44 60 114  44 60 114  43 59 113  44 60 114  42 58 112
-+28 45 103  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+27 43 102  38 56 110  40 56 111  39 55 110  40 56 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  26 43 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  28 45 103  35 51 108
-+34 50 107  35 51 108  35 51 108  35 51 108  35 51 108  34 50 107
-+34 50 107  32 50 106  25 42 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 101  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+26 43 101  26 43 102  27 44 102  27 44 102  31 47 105  35 51 108
-+39 55 110  42 58 112  44 61 114  49 64 117  52 67 118  55 70 121
-+57 72 122  58 73 123  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  59 74 124  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  58 73 123  58 73 123  58 73 123  58 73 123  58 73 123
-+58 73 123  59 74 124  59 74 124  59 74 124  59 74 124  59 74 124
-+59 74 124  58 73 123  56 71 121  53 67 120  50 65 118  47 63 116
-+44 60 114  40 57 112  37 53 109  34 50 106  29 46 104  27 44 102
-+27 44 102  26 43 102  26 43 101  25 42 101  25 42 101  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+25 42 100  38 54 110  51 66 119  55 69 121  56 70 122  56 70 122
-+55 69 121  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  55 70 121  56 70 122
-+55 70 121  55 70 121  54 70 120  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  54 69 120  55 70 121  55 70 121  54 69 120  54 69 120
-+53 68 119  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  53 68 119  53 67 120  54 69 120  46 61 115  27 44 102
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  33 49 106
-+48 63 117  51 66 119  49 64 117  49 64 117  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  50 65 118  48 65 116  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 64 117
-+49 65 117  48 64 117  48 64 117  37 53 109  25 42 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  37 53 109  45 60 114
-+45 60 114  44 59 113  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  45 60 114  44 60 114
-+43 60 114  44 60 114  44 60 114  44 60 114  43 59 113  32 48 107
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 100
-+36 52 108  40 56 111  39 55 110  39 55 111  40 56 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  38 54 110
-+39 55 111  28 45 103  24 41 100  24 41 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  33 49 106  35 51 108
-+35 51 108  35 51 108  35 51 108  34 50 107  35 51 108  34 50 107
-+34 50 107  27 44 103  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 101  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  23 40 100  23 40 100  23 40 100
-+23 40 100  23 40 100  25 42 101  27 44 102  29 45 103  31 47 105
-+31 47 105  32 50 106  34 50 107  35 51 108  36 52 108  36 52 108
-+36 52 108  36 52 108  36 52 108  36 52 108  35 51 108  34 50 107
-+34 50 107  33 50 105  31 47 105  29 46 104  27 44 103  26 43 101
-+25 42 100  23 40 99  23 40 100  23 40 100  23 40 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  24 41 100  25 42 101  27 44 102  39 55 110
-+55 69 121  56 70 122  56 70 122  55 69 121  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  56 70 122  55 70 121  55 70 121  54 70 120
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+55 70 121  55 70 121  54 69 120  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  53 68 119
-+54 69 120  54 69 120  52 67 118  36 52 108  23 40 99  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  34 50 107  50 65 118
-+51 66 119  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+49 65 117  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 116
-+48 64 117  47 63 116  39 55 111  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  33 49 106  45 60 114  45 60 114
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  45 60 114  45 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 113  43 60 114  37 53 109  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  32 48 105
-+39 55 110  39 55 111  40 56 111  40 56 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+33 49 106  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  30 46 104  34 50 107  35 51 108
-+35 51 108  35 51 108  35 51 108  34 50 107  34 50 107  34 50 107
-+31 47 105  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+29 47 104  25 42 101  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+23 40 100  23 40 100  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+24 41 100  27 44 102  33 49 106  43 58 114  54 69 120  57 72 122
-+56 70 122  56 71 121  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  55 70 121
-+56 70 122  56 70 122  55 70 121  55 70 121  54 70 120  54 70 120
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 69 120  55 70 121  55 70 121
-+54 69 120  54 69 120  53 68 119  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  53 68 119  54 69 120
-+53 68 119  43 59 113  28 45 103  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  26 43 102  38 54 110  51 66 119  51 66 119
-+50 65 118  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  49 65 117  49 65 117
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  49 65 117  48 64 116  48 64 117
-+48 64 117  37 53 109  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  31 47 105  44 60 114  46 61 115  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  44 60 114  43 60 114  44 60 114
-+44 60 114  43 59 113  44 60 114  38 56 110  24 41 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  27 44 103  38 54 110
-+40 56 111  39 55 111  40 56 111  39 55 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  39 55 111  37 53 109
-+25 42 101  24 41 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  26 43 102  34 50 107  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  34 50 107  33 49 106  33 49 106
-+26 43 102  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  28 45 103
-+51 66 119  44 60 115  35 51 108  25 42 100  23 40 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  23 40 99  29 46 104
-+40 56 111  48 63 117  55 69 121  56 70 122  56 70 122  55 69 121
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  55 70 121  56 70 122  56 70 122
-+55 70 121  55 70 121  54 70 120  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  54 69 120
-+53 68 119  53 68 119  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  53 68 119  54 69 120  55 70 121  49 63 116
-+34 50 107  25 42 101  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  28 45 103  43 60 114  51 66 119  50 65 118  50 65 118
-+49 64 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  50 65 118  49 65 117  48 65 116
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  49 65 117  48 64 116  48 64 117  47 63 116
-+34 50 108  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  28 45 103  44 60 114  46 61 115  45 60 114  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  44 60 114  43 60 114  44 60 114  44 60 114
-+43 59 113  44 60 114  39 55 111  26 43 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 100  25 42 101  36 52 108  40 56 111
-+39 55 110  40 56 111  39 55 111  39 55 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  38 54 110  29 46 104
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 100  31 47 105  35 51 108  34 50 107  35 51 108
-+35 51 108  35 51 108  35 51 108  34 50 107  34 50 107  29 45 103
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  26 43 102  30 46 104
-+56 70 122  56 70 122  55 69 121  53 67 120  40 57 112  27 44 102
-+23 40 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  24 41 100  33 49 106  47 63 116  54 69 120
-+55 69 121  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  56 70 122  56 70 122  55 70 121  55 70 121
-+55 70 121  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+54 69 120  55 70 121  54 69 120  54 69 120  54 69 120  53 68 119
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  53 68 119  54 69 120  53 68 119  38 56 110  26 43 102
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+29 46 104  47 63 116  51 66 119  50 65 118  49 64 117  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  50 65 118  49 65 117  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  49 65 117  48 64 117  48 63 117  47 63 116  35 51 108
-+25 42 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+27 44 102  45 60 114  46 61 115  45 60 114  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  45 60 114  43 60 114  44 60 114  44 60 114  43 59 113
-+44 60 114  42 58 112  27 44 103  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  34 50 107  40 56 111  40 56 111
-+39 55 111  40 56 111  38 54 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  33 49 106  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  27 43 102  35 51 108  35 51 108  34 50 108  35 51 108
-+35 51 108  34 50 107  35 51 108  33 49 106  32 48 107  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 101  25 42 100  29 45 103  30 46 104
-+56 70 122  56 70 122  55 69 121  56 70 122  56 70 122  56 70 122
-+46 61 115  32 50 106  26 43 102  25 42 101  24 41 100  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  24 41 101  25 42 101
-+27 44 103  39 55 111  53 67 120  57 72 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  55 70 121  56 70 122
-+55 70 121  55 70 121  55 70 121  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  53 68 119  53 68 119  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  53 68 119  54 69 120
-+54 69 120  53 68 119  48 63 117  31 47 105  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  32 50 106
-+51 66 119  51 66 119  50 65 118  49 64 117  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 116  48 64 117  47 63 116  34 50 108  24 41 100
-+24 41 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  26 43 102
-+42 58 112  46 61 115  45 60 114  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  45 60 114
-+44 60 114  43 60 114  44 60 114  44 60 114  43 60 114  44 60 114
-+43 59 113  31 47 105  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  29 46 104  40 56 111  39 55 110  39 55 111
-+40 56 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  39 55 111  38 54 110  25 42 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  34 50 107  35 51 108  35 51 108  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  33 49 106  28 45 103  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  26 43 102  29 45 103  30 46 104
-+56 70 122  56 70 122  56 70 122  56 70 122  55 69 121  56 70 122
-+56 70 122  59 72 123  51 66 119  40 56 111  33 49 106  27 44 103
-+23 40 100  24 41 100  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  23 40 100  25 42 101  29 47 104  36 52 108  46 61 115
-+55 69 121  57 72 122  56 70 122  55 69 121  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  56 70 122  56 70 122  55 70 121
-+55 70 121  54 70 120  54 70 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  55 70 121  54 69 120  54 69 120
-+54 69 120  53 68 119  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  53 68 119  54 69 120  54 69 120
-+49 64 117  37 53 109  24 41 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  26 43 102  38 54 110  53 67 120
-+50 65 118  50 65 118  49 64 117  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  50 65 118
-+49 65 117  49 65 117  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  49 65 117
-+48 64 116  48 64 117  46 61 115  33 49 106  23 40 99  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  26 43 101  39 55 111
-+46 61 115  45 60 114  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  45 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  43 59 113  44 60 114
-+34 50 107  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 101
-+24 41 100  27 44 102  38 54 110  38 56 110  39 55 111  40 56 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+38 54 110  39 55 111  38 54 110  27 44 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+29 47 104  35 51 108  34 50 107  35 51 108  35 51 108  34 50 107
-+35 51 108  34 50 107  34 50 107  32 48 105  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  28 45 104  30 46 104  30 46 104
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 69 121  56 70 122  56 70 122  55 69 121  49 64 117
-+43 59 113  34 50 106  25 42 101  23 40 100  24 41 100  25 42 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  23 40 100  23 40 99
-+29 46 104  38 54 110  46 61 115  51 66 119  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  56 70 122  56 70 122  55 70 121  55 70 121  54 70 120
-+54 70 120  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+54 69 120  55 70 121  55 70 121  54 69 120  54 69 120  53 68 119
-+53 68 119  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  53 68 119  54 69 120  53 68 119  39 55 110
-+28 45 103  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  27 44 103  44 60 114  51 66 119  50 65 118
-+49 64 117  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  50 65 118  49 65 117
-+49 65 117  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  49 65 117  48 64 116
-+48 64 117  46 61 115  31 47 105  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 101  39 55 110  46 61 115
-+45 60 114  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  44 60 114
-+43 60 114  44 60 114  44 60 114  43 59 113  44 61 114  35 51 108
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  36 52 108  40 56 111  39 55 111  40 56 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+38 54 111  39 55 111  31 47 105  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  27 44 102
-+34 50 107  34 50 107  35 51 108  35 51 108  35 51 108  35 51 108
-+34 50 107  34 50 107  34 50 106  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  26 43 102  29 46 103  29 45 103  30 46 104
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 69 121  55 69 121  56 70 122  56 70 122
-+55 70 121  55 69 121  53 67 120  43 59 113  31 47 105  23 40 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  23 40 100  26 43 101  37 53 109  50 65 118
-+54 69 120  55 69 121  56 70 122  56 70 122  56 70 122  55 69 121
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  55 70 121  56 70 122
-+56 70 122  55 70 121  55 70 121  55 70 121  54 70 120  54 70 120
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+55 70 121  54 69 120  54 69 120  53 68 119  53 68 119  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+53 68 119  54 69 120  55 70 121  45 60 114  28 45 103  25 42 101
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+23 40 100  32 48 105  49 64 117  51 66 119  50 65 118  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  50 65 118  49 65 117  48 65 116
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  49 65 117  48 64 116  48 64 117
-+46 61 115  29 46 104  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  39 55 111  46 61 115  45 60 114
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  45 60 114  43 60 114  43 60 114
-+44 60 114  44 60 114  43 59 113  44 60 114  37 53 109  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+32 48 105  40 56 111  40 56 111  39 55 111  40 56 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  38 54 110
-+39 55 111  34 50 107  25 42 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  32 48 107
-+35 51 108  35 51 108  35 51 108  35 51 108  35 51 108  35 51 108
-+34 50 107  34 50 107  28 45 103  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  29 46 104  30 46 104  29 45 103  29 45 103
-+56 70 122  55 70 121  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 69 121  56 70 122  56 70 122  56 70 122  53 67 120
-+40 57 112  30 46 104  26 43 102  25 42 101  24 41 100  24 41 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 101  24 41 100  24 41 100  24 41 100  25 42 101  26 43 101
-+27 44 102  35 51 108  47 63 116  56 70 122  56 70 122  56 70 122
-+55 69 121  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  56 70 122  56 70 122  55 70 121  55 70 121  55 70 121
-+54 70 120  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  54 69 120
-+53 68 119  53 68 119  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  53 68 119  54 69 120  54 69 120
-+53 68 119  49 65 117  34 50 106  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+37 53 109  51 66 119  50 65 118  50 65 118  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  50 65 118  49 65 117  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  49 65 117  49 65 116  48 64 117  48 64 117  44 61 114
-+27 43 102  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 100  38 54 109  46 61 115  45 60 114  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  43 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  39 55 111  26 43 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  28 45 102
-+40 56 111  40 56 111  39 55 111  40 56 111  39 55 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+37 53 109  27 44 102  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  28 45 103  35 52 107
-+35 51 108  35 51 108  35 51 108  35 51 108  35 51 108  34 50 107
-+34 50 106  32 48 105  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  26 43 102  30 46 104  29 46 104  30 46 104  30 46 104
-+55 70 121  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+57 72 122  58 73 123  51 66 119  43 58 114  35 51 108  31 47 105
-+26 43 102  23 40 100  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+24 41 100  25 42 100  28 45 103  33 49 106  38 54 110  47 63 116
-+55 69 121  57 72 122  56 70 122  56 70 122  55 69 121  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  55 70 121  56 70 122
-+56 70 122  55 70 121  55 70 121  54 70 120  54 70 120  54 70 120
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+54 69 120  55 70 121  54 69 120  54 69 120  54 69 120  53 68 119
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  53 67 120  54 69 120  54 69 120  49 64 117
-+38 54 110  25 42 101  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 100  24 41 100  28 45 103  42 58 112
-+51 66 119  50 65 118  49 64 117  49 64 117  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+50 65 118  50 65 118  49 65 117  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 64 117
-+49 65 117  48 64 117  48 64 117  48 64 117  42 58 112  26 43 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  36 52 108  44 61 114  46 61 115  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  45 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+43 59 113  44 60 114  40 57 112  27 44 103  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  26 43 102  38 54 110
-+40 56 111  39 55 110  40 56 111  39 55 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  38 54 110  39 55 111
-+31 47 105  24 41 100  24 41 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  34 50 107  35 51 108
-+34 50 107  35 51 108  35 51 108  34 50 107  35 51 108  33 49 106
-+33 49 106  27 44 103  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  29 46 104  29 45 103  30 46 104  29 45 103  29 46 104
-+54 70 120  55 70 121  55 70 121  56 70 122  56 70 122  55 70 121
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 69 121  56 70 122  56 70 122  56 70 122  51 66 119
-+48 63 117  42 58 112  35 51 108  27 44 102  23 39 99  23 40 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  23 40 99  25 42 100  31 47 105
-+38 54 110  46 61 115  50 65 118  55 69 121  57 72 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  56 70 122  56 70 122  55 70 121
-+55 70 121  55 70 121  54 70 120  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  55 70 121
-+55 70 121  54 69 120  54 69 120  53 68 119  53 68 119  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  53 68 119  55 70 121  51 67 118  38 54 109  28 45 103
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  23 40 100  34 50 106  47 63 116  51 66 119
-+50 65 118  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  50 65 118
-+49 65 117  49 65 117  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  49 65 117
-+48 64 117  48 63 117  48 64 117  38 56 110  26 43 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+35 52 107  45 60 114  46 61 115  45 60 114  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+45 60 114  44 60 114  44 60 114  44 60 114  44 60 114  43 59 113
-+44 60 114  43 59 113  29 46 103  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  36 52 108  40 56 111
-+39 55 110  39 55 111  40 56 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  39 55 111  34 50 107
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  32 48 105  35 51 108  34 50 107
-+35 51 108  35 51 108  34 50 107  35 51 108  34 50 107  33 49 106
-+31 47 105  24 41 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+27 44 103  30 46 104  29 46 104  30 46 104  30 46 104  29 45 103
-+54 70 120  54 70 120  54 70 120  55 70 121  55 70 121  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  55 69 121  56 70 122  56 70 122
-+56 70 122  55 69 121  55 69 121  54 69 120  50 65 118  40 56 111
-+31 47 105  23 40 100  24 41 100  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+23 40 100  27 43 101  35 51 108  44 60 115  53 67 120  55 69 121
-+55 69 121  56 70 122  56 70 122  56 70 122  55 69 121  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  56 70 122  56 70 122  55 70 121  55 70 121  54 70 120
-+54 70 120  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  55 70 121  55 70 121  54 69 120
-+54 69 120  53 68 119  53 68 119  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  53 68 119
-+54 69 120  55 70 121  40 57 112  27 44 102  25 42 101  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 101  40 56 111  50 65 118  51 66 119  50 65 118
-+50 65 118  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+48 65 116  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 64 117
-+47 63 116  48 64 117  37 53 109  25 42 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  23 40 100  34 50 107
-+46 61 115  46 61 115  45 60 114  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  43 60 114  43 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  29 45 103  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  32 50 106  39 55 111  39 55 110
-+39 55 111  40 56 111  39 55 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 110  39 55 111  36 52 108  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  28 45 103  35 51 108  35 51 108  35 51 108
-+35 51 108  35 51 108  35 51 108  34 50 107  33 49 106  33 49 106
-+26 43 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  26 43 101
-+29 45 103  29 45 103  30 46 104  29 45 103  30 46 104  26 43 101
-+55 70 121  55 70 121  55 70 121  55 70 121  54 70 120  54 70 120
-+54 70 120  55 70 121  55 70 121  55 70 121  56 70 122  56 70 122
-+55 70 121  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  55 69 121  56 70 122  56 70 122
-+57 72 122  55 69 121  46 61 115  37 53 109  29 45 103  26 43 102
-+26 43 101  25 42 101  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  25 42 101  26 43 102  27 44 102  33 49 106  42 57 112
-+50 65 118  57 72 122  56 70 122  56 70 122  56 70 122  55 69 121
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  56 70 122  56 70 122  55 70 121  55 70 121
-+55 70 121  54 70 120  54 70 120  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+55 70 121  54 69 120  54 69 120  53 68 119  53 68 119  53 68 119
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  53 68 119  54 69 120  54 69 120  53 68 119
-+44 61 114  27 44 103  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+28 45 103  44 60 114  51 66 119  50 65 118  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  50 65 118  50 65 118  49 65 117  48 65 116
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  49 65 117  48 64 117  48 64 117
-+47 63 116  34 50 107  23 40 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  33 49 106  46 61 115
-+45 60 114  45 60 114  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  45 60 114  44 60 114
-+43 60 114  44 60 114  44 60 114  43 59 113  44 60 114  44 60 114
-+31 47 105  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  29 46 103  39 55 110  40 56 111  40 56 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  39 55 111  38 54 110  27 44 102  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 102  34 50 107  34 50 107  35 51 108  35 51 108
-+35 51 108  35 51 108  35 51 108  34 50 107  34 50 107  29 45 103
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  28 45 103
-+30 46 104  30 46 104  29 45 103  30 46 104  28 45 103  24 41 100
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  54 70 120  54 70 120  55 70 121  55 70 121  55 70 121
-+56 70 122  56 70 122  56 70 122  55 70 121  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 69 121  56 70 122  56 70 122  57 72 122  59 72 123  53 67 120
-+46 61 115  39 55 111  35 52 107  31 47 105  28 45 103  25 42 101
-+23 40 100  24 41 100  24 41 100  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+24 41 100  23 40 100  24 41 100  27 43 102  30 46 104  33 49 106
-+37 53 109  43 58 114  49 64 117  55 70 121  57 72 122  57 72 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  55 70 121
-+56 70 122  56 70 122  55 70 121  55 70 121  55 70 121  54 70 120
-+54 70 120  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 69 120  55 70 121  55 70 121
-+54 69 120  54 69 120  53 68 119  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+53 68 119  54 69 120  55 70 121  52 67 118  44 60 113  32 48 105
-+23 40 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  34 50 107
-+48 64 117  51 66 119  50 65 118  49 64 117  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  50 65 118  49 65 117  49 65 117  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  49 65 117  49 65 117  48 64 116  48 64 117  46 61 115
-+31 47 105  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  33 49 106  45 60 114  46 61 115
-+45 60 114  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  45 60 114  44 60 114  43 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  43 59 113  34 50 107
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  26 43 102  38 54 109  40 56 111  39 55 110  40 56 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 110  31 47 105  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  31 47 105  34 50 108  35 51 108  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  34 50 107  31 47 105  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 101  26 43 102  29 46 104
-+30 46 104  30 46 104  30 46 104  29 46 104  25 42 101  24 41 101
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 70 120  54 70 120  54 70 120
-+55 70 121  55 70 121  55 70 121  56 70 122  56 70 122  55 70 121
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  55 69 121  56 70 122  56 70 122
-+56 70 122  57 72 122  56 70 122  53 67 120  50 65 118  47 63 116
-+43 58 114  38 54 109  33 49 106  27 44 102  23 40 100  23 40 99
-+23 40 100  24 41 100  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  23 40 100  23 40 99  23 40 99  24 41 101  30 46 104
-+35 52 107  40 56 111  46 61 115  48 63 117  51 66 119  55 69 121
-+57 72 122  56 70 122  56 70 122  56 70 122  55 69 121  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  56 70 122  56 70 122  56 70 122
-+55 70 121  55 70 121  55 70 121  54 70 120  54 70 120  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  54 69 120  55 70 121  55 70 121  54 69 120  54 69 120
-+53 68 119  53 68 119  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  53 68 119
-+54 69 120  53 68 119  42 58 112  32 48 105  25 42 101  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  27 44 103  42 58 112  51 66 119
-+51 66 119  50 65 118  49 64 117  49 64 117  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  49 65 117  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  48 64 116  48 64 117  44 60 114  29 45 103
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  33 49 106  45 60 114  46 61 115  45 60 114
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  45 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  43 59 113  44 60 114  36 52 108  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  37 53 109  40 56 111  39 55 110  39 55 111  40 56 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+38 54 110  39 55 111  34 50 107  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 100
-+27 44 102  34 50 107  35 51 108  35 51 108  35 51 108  35 51 108
-+34 50 107  35 51 108  34 50 107  33 49 106  26 43 102  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 100  28 45 103  30 46 104
-+29 46 104  29 45 103  30 46 104  27 44 102  24 41 101  25 42 101
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+54 70 120  54 70 120  55 70 121  55 70 121  55 70 121  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 69 121  56 70 122  56 70 122  56 70 122  56 70 122
-+55 69 121  55 69 121  55 69 121  54 69 120  51 66 119  47 63 116
-+40 57 112  35 52 107  28 45 103  23 40 100  23 40 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  24 41 100  24 41 100  23 40 100  23 40 99  26 43 101
-+32 48 105  37 53 109  44 60 114  50 65 118  53 67 120  54 69 120
-+55 69 121  55 69 121  56 70 122  56 70 122  56 70 122  56 70 122
-+55 69 121  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  56 70 122  56 70 122  55 70 121  55 70 121  55 70 121
-+54 70 120  54 70 120  54 70 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+55 70 121  55 70 121  54 69 120  54 69 120  54 69 120  53 68 119
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  53 68 119  54 69 120  55 70 121
-+44 59 113  29 45 103  25 42 101  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 100  24 41 100  32 48 107  48 64 117  51 66 119  50 65 118
-+50 65 118  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  50 65 118
-+49 65 117  48 65 116  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 64 117
-+48 64 117  47 63 116  48 64 117  42 58 112  25 42 101  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  32 48 107  46 61 115  46 61 115  45 60 114  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  43 60 114  43 60 114  44 60 114
-+44 60 114  43 59 113  44 60 114  37 53 109  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+35 51 108  40 56 111  39 55 110  39 55 111  40 56 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  25 42 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+33 49 106  35 51 108  34 50 107  35 51 108  35 51 108  35 51 108
-+35 51 108  34 50 107  34 50 107  29 46 104  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  26 43 102  30 46 104  29 45 103
-+30 46 104  30 46 104  29 45 103  25 42 101  24 41 100  25 42 101
-+55 70 121  54 69 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 70 120  54 70 120
-+54 70 120  55 70 121  55 70 121  55 70 121  55 70 121  56 70 122
-+56 70 122  55 70 121  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  55 69 121  56 70 122  56 70 122
-+56 70 122  56 70 122  57 72 122  56 70 122  50 65 118  46 61 115
-+40 56 111  36 52 108  31 47 105  27 44 102  27 43 102  26 43 102
-+26 43 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  25 42 100  25 42 101
-+25 42 101  25 42 101  26 43 101  26 43 102  27 44 102  28 45 103
-+33 49 106  38 54 110  43 58 114  48 63 117  55 69 121  57 72 122
-+56 70 122  56 70 122  56 70 122  56 70 122  55 69 121  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  56 70 122  56 70 122  56 70 122  55 70 121  55 70 121
-+55 70 121  54 70 120  54 70 120  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  54 69 120  55 70 121  55 70 121  54 69 120  54 69 120
-+54 69 120  53 68 119  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  53 68 119
-+54 69 120  54 69 120  53 68 119  53 68 119  45 60 114  28 45 103
-+23 40 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+26 43 102  40 57 112  53 67 120  51 66 119  50 65 118  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  50 65 118  50 65 118  48 65 116
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  49 65 117  49 65 117  48 64 116
-+48 63 117  48 64 117  38 54 110  24 41 100  25 42 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+32 48 107  46 61 115  45 60 114  45 60 114  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+45 60 114  44 60 114  43 60 114  44 60 114  44 60 114  43 59 113
-+44 60 114  44 60 114  38 54 110  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  31 47 105
-+39 55 110  39 55 110  40 56 111  40 56 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  38 54 110  39 55 111
-+39 55 111  26 44 102  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  30 46 104
-+35 51 108  34 50 107  35 51 108  35 51 108  34 50 107  35 51 108
-+34 50 107  33 49 106  32 48 105  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 100  30 46 104  29 45 103  30 46 104
-+29 45 103  29 46 104  27 44 102  24 41 100  25 42 101  25 42 101
-+54 69 120  55 70 121  55 70 121  54 69 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  54 70 120  54 70 120  54 70 120  55 70 121  55 70 121
-+55 70 121  56 70 122  56 70 122  56 70 122  55 70 121  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 69 121  56 70 122  56 70 122  56 70 122
-+57 72 122  57 72 122  59 72 123  57 72 122  53 67 120  50 65 118
-+47 63 116  44 60 114  40 57 112  38 54 110  36 52 108  34 50 107
-+33 49 106  31 47 105  31 47 105  29 46 104  28 45 103  27 44 102
-+27 43 102  26 43 101  25 42 101  24 41 100  23 40 100  23 40 100
-+23 40 100  23 40 100  23 40 100  23 40 100  23 40 100  23 40 100
-+23 40 100  23 40 100  23 40 100  23 40 100  23 40 100  23 40 100
-+23 40 100  23 40 100  23 40 100  23 40 100  24 41 100  25 42 100
-+25 42 101  26 43 101  27 44 102  27 44 103  29 46 104  30 46 104
-+31 47 105  32 48 107  33 49 106  35 52 107  37 53 109  39 55 111
-+42 57 112  44 60 115  48 63 117  51 66 119  55 69 121  57 72 122
-+57 72 122  57 72 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  55 70 121  56 70 122  56 70 122
-+56 70 122  55 70 121  55 70 121  55 70 121  54 70 120  54 70 120
-+54 70 120  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+55 70 121  55 70 121  54 69 120  54 69 120  53 68 119  53 68 119
-+53 68 119  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  50 65 118  42 58 112  29 47 104  23 40 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  32 50 106
-+47 63 116  51 66 119  50 65 118  49 64 117  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  50 65 118  49 65 117  49 65 117  48 65 116
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  48 64 116  48 64 117
-+47 63 116  34 50 107  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  33 49 106
-+45 60 114  46 61 115  45 60 114  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  45 60 114
-+44 60 114  43 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  38 56 110  26 43 102  25 42 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  28 45 103  39 55 110
-+40 56 111  39 55 111  40 56 111  39 55 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  39 55 111  39 55 111
-+30 46 104  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  27 44 103  35 51 108
-+34 50 107  35 51 108  35 51 108  35 51 108  35 51 108  34 50 107
-+34 50 107  34 50 107  27 44 102  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 101  28 45 103  30 46 104  30 46 104  30 46 104
-+30 46 104  29 45 103  24 41 101  24 41 100  25 42 101  25 42 101
-+53 68 119  54 69 120  54 69 120  55 70 121  55 70 121  54 69 120
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 70 120  54 70 120
-+54 70 120  55 70 121  55 70 121  55 70 121  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 69 121  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  57 72 122  57 72 122  56 70 122
-+55 69 121  53 67 120  51 66 119  50 65 118  50 65 118  49 64 117
-+48 63 117  47 63 116  47 63 116  46 61 115  44 60 115  45 60 114
-+44 60 114  43 58 114  43 58 114  42 57 112  40 57 112  40 57 112
-+40 57 112  40 57 112  40 57 112  40 57 112  42 57 112  42 57 112
-+43 58 114  43 58 114  44 60 114  45 60 114  44 60 115  46 61 115
-+47 63 116  48 63 117  48 63 117  49 64 117  50 65 118  51 66 119
-+53 67 120  54 69 120  55 69 121  56 70 122  57 72 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 71 121
-+55 69 121  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  56 70 122  56 70 122  56 70 122  55 70 121  55 70 121
-+55 70 121  55 70 121  54 70 120  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  55 70 121  55 70 121  55 70 121
-+54 69 120  54 69 120  54 69 120  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  53 68 119  54 69 120  55 70 121  49 64 117
-+37 53 109  29 46 104  24 41 100  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  23 40 100  27 43 102  40 57 112  50 65 118
-+51 66 119  50 65 118  49 64 117  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  50 65 118  49 65 117  49 65 117  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  48 64 117  48 64 116  48 64 117  44 60 115
-+29 47 104  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  32 50 106  45 60 114
-+46 61 115  45 60 114  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  45 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  43 59 113  44 60 114
-+40 56 111  27 43 102  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  26 43 101  38 54 110  40 56 111
-+39 55 110  40 56 111  39 55 111  39 55 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  33 49 106
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  33 49 106  35 51 108
-+35 51 108  35 51 108  35 51 108  34 50 107  35 51 108  34 50 107
-+34 50 107  30 46 104  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  26 43 101  29 45 103  29 45 103  30 46 104  29 45 103
-+30 46 104  26 43 102  24 41 100  25 42 101  25 42 101  25 42 101
-+53 68 119  53 68 119  54 69 120  54 69 120  54 69 120  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+54 70 120  54 70 120  54 70 120  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  56 70 122  56 70 122  56 70 122  55 70 121
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  55 69 121  55 69 121  55 69 121  55 69 121
-+55 69 121  55 69 121  55 69 121  55 69 121  55 69 121  55 69 121
-+55 69 121  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  55 69 121  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  55 70 121  56 70 122  56 70 122
-+56 70 122  55 70 121  55 70 121  55 70 121  55 70 121  54 70 120
-+54 70 120  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+54 69 120  55 70 121  55 70 121  54 69 120  54 69 120  54 69 120
-+53 68 119  53 68 119  53 68 119  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+53 68 119  54 69 120  55 70 121  48 63 117  34 50 106  25 42 101
-+25 42 101  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  34 50 107  49 64 117  50 65 118  50 65 118
-+50 65 118  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  50 65 118
-+50 65 118  49 65 117  48 65 116  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  49 65 117  47 63 116  49 65 117  40 57 112  26 43 101
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  23 40 100  33 49 106  46 61 115  46 61 115
-+45 60 114  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  43 60 114
-+43 60 114  44 60 114  44 60 114  43 59 113  44 60 114  42 58 112
-+26 43 101  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  37 53 109  40 56 111  39 55 110
-+39 55 111  40 56 111  38 54 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  37 53 109  26 43 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 100  31 47 105  35 51 108  34 50 107
-+35 51 108  35 51 108  35 51 108  35 51 108  34 50 107  34 50 107
-+33 49 106  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  27 44 103  30 46 104  30 46 104  30 46 104  30 46 104
-+27 44 103  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+54 69 120  54 69 120  54 69 120  54 69 120  53 68 119  53 68 119
-+53 68 119  54 69 120  54 69 120  54 69 120  55 70 121  55 70 121
-+54 69 120  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  54 70 120  54 70 120  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  55 70 121  56 70 122  56 70 122  56 70 122  56 70 122
-+55 70 121  55 70 121  55 70 121  55 70 121  54 70 120  54 70 120
-+54 70 120  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  54 69 120  55 70 121  55 70 121  55 70 121  54 69 120
-+54 69 120  53 68 119  53 68 119  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  53 68 119  54 69 120  54 69 120  53 68 119
-+52 67 118  46 61 115  32 48 105  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+27 44 102  40 57 112  51 66 119  50 65 118  50 65 118  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  50 65 118  49 65 117
-+48 65 116  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 64 117
-+48 64 116  48 64 117  47 63 116  38 54 110  25 42 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  34 50 107  46 61 115  45 60 114  45 60 114
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  45 60 114  44 60 114  43 60 114  44 60 114
-+44 60 114  43 59 113  44 60 114  44 60 114  42 58 112  25 42 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  34 50 108  40 56 111  39 55 110  40 56 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  39 55 111  38 54 110  27 44 103  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  27 44 102  34 50 108  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  34 50 107  33 49 106  34 50 107
-+26 43 102  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+26 43 102  29 46 104  29 45 103  29 46 104  30 46 104  30 46 104
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  53 68 119  53 68 119  54 69 120  54 69 120  54 69 120
-+55 70 121  55 70 121  55 70 121  54 69 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 70 120  54 70 120
-+54 70 120  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  55 70 121  55 70 121  55 70 121
-+54 70 120  54 70 120  54 70 120  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+55 70 121  55 70 121  54 69 120  54 69 120  54 69 120  54 69 120
-+53 68 119  53 68 119  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+53 68 119  54 69 120  54 69 120  54 69 120  49 64 117  40 57 112
-+31 47 105  23 40 100  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  26 43 101  34 50 108
-+48 63 117  52 67 118  50 65 118  49 64 117  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  50 65 118  50 65 118  49 65 117  48 65 116
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  48 64 116  48 64 116
-+48 64 117  46 61 115  34 50 107  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 100  35 52 107  45 60 114  46 61 115  45 60 114  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  45 60 114  44 60 114  43 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  40 57 112  27 44 102  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 100  32 48 105  39 55 110  39 55 110  39 55 111  40 56 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+38 54 110  39 55 111  38 54 111  29 46 104  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  33 49 106  35 51 108  34 50 107  35 51 108
-+35 51 108  34 50 107  35 51 108  34 50 107  34 50 107  29 46 104
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 101  25 42 101
-+28 45 103  30 46 104  29 46 104  30 46 104  30 46 104  27 44 102
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  53 68 119  53 68 119  53 68 119
-+54 69 120  54 69 120  54 69 120  55 70 121  55 70 121  54 69 120
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 70 120  54 70 120  54 70 120  54 70 120
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  55 70 121  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  55 70 121  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 70 120  54 70 120  54 70 120  54 70 120
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  55 70 121  55 70 121  55 70 121
-+54 69 120  54 69 120  54 69 120  53 68 119  53 68 119  53 68 119
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  53 68 119  54 69 120
-+55 70 121  54 69 120  44 59 113  34 50 107  28 45 103  23 40 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  31 47 105  43 60 114  51 66 119
-+51 66 119  50 65 118  49 64 117  49 64 117  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  50 65 118  49 65 117  49 65 117  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  49 65 117  49 65 117  48 64 117  48 64 117
-+42 57 112  29 46 104  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 100  24 41 100
-+36 52 108  45 60 114  46 61 115  45 60 114  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+45 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+43 59 113  44 60 114  42 58 112  28 45 103  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+29 46 104  39 55 110  40 56 111  39 55 111  40 56 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+38 54 111  39 55 111  31 47 105  24 41 100  24 41 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 101
-+24 41 100  31 47 105  35 51 108  34 50 107  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  33 49 106  32 48 107  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  27 44 103
-+30 46 104  29 45 103  30 46 104  30 46 104  29 45 103  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+53 68 119  53 68 119  54 69 120  54 69 120  54 69 120  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+54 70 120  54 70 120  54 70 120  54 70 120  54 70 120  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  55 70 121
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 70 120  54 70 120  54 70 120
-+54 70 120  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+54 69 120  55 70 121  55 70 121  54 69 120  54 69 120  54 69 120
-+53 68 119  53 68 119  53 68 119  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  53 68 119  54 69 120  55 69 121  52 67 118
-+38 54 110  28 45 102  25 42 101  24 41 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 101  40 56 111  50 65 118  51 66 119  50 65 118
-+50 65 118  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+50 65 118  49 65 117  48 65 116  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  49 65 117  48 64 117  48 64 116  48 64 117  38 56 110
-+26 43 101  24 41 100  25 42 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  38 54 110
-+46 61 115  46 61 115  45 60 114  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  43 60 114  43 60 114  44 60 114  44 60 114  43 59 113
-+44 60 114  43 59 113  28 45 103  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  26 43 102
-+39 55 111  40 56 111  39 55 110  40 56 111  39 55 111  38 54 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  38 54 110
-+39 55 111  34 50 107  25 42 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+29 45 103  35 51 108  35 51 108  35 51 108  35 51 108  35 51 108
-+34 50 107  35 51 108  34 50 107  33 49 106  27 44 102  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  30 46 104
-+30 46 104  30 46 104  30 46 104  29 45 103  27 44 102  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+52 67 118  54 69 120  54 69 120  54 69 120  53 68 119  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  53 68 119  53 68 119
-+53 68 119  54 69 120  54 69 120  54 69 120  54 69 120  55 70 121
-+55 70 121  55 70 121  54 69 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 70 120  54 70 120
-+54 70 120  54 70 120  54 70 120  54 70 120  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  55 70 121  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  55 70 121  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 70 120
-+54 70 120  54 70 120  54 70 120  54 70 120  54 70 120  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  54 69 120
-+54 69 120  53 68 119  53 68 119  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  53 68 119  54 69 120  54 69 120
-+54 69 120  53 68 119  52 67 118  47 63 116  34 50 107  24 41 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  25 42 101
-+32 48 107  49 64 117  51 66 119  50 65 118  50 65 118  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  50 65 118  50 65 118  49 65 117
-+48 65 116  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  49 65 117
-+48 64 116  48 64 117  48 64 117  47 63 116  35 52 107  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  25 42 101  38 54 109  46 61 115
-+45 60 114  45 60 114  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  45 60 114  44 60 114
-+43 60 114  44 60 114  44 60 114  43 60 114  44 60 113  44 60 114
-+43 59 113  27 44 103  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  38 54 110
-+40 56 111  39 55 111  40 56 111  39 55 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  38 54 110  39 55 111
-+36 52 108  26 43 102  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  26 43 102
-+34 50 107  34 50 107  35 51 108  35 51 108  35 51 108  35 51 108
-+35 51 108  34 50 107  34 50 107  29 47 104  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  28 45 103  29 45 103
-+30 46 104  29 46 104  30 46 104  29 45 103  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+34 50 106  42 58 112  49 64 117  53 68 119  54 69 120  54 69 120
-+54 69 120  53 68 119  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  53 68 119  53 68 119  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  55 70 121  55 70 121  55 70 121  54 69 120
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 70 120  54 70 120
-+54 70 120  54 70 120  54 70 120  54 70 120  54 70 120  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  56 70 122  56 70 122  56 70 122
-+56 70 122  56 70 122  56 70 122  56 70 122  56 70 122  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  54 70 120  54 70 120  54 70 120
-+54 70 120  54 70 120  54 70 120  54 70 120  54 70 120  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  55 70 121  55 70 121  55 70 121
-+54 69 120  54 69 120  54 69 120  54 69 120  53 68 119  53 68 119
-+53 68 119  53 68 119  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  55 69 121  51 66 119
-+46 61 115  39 55 110  29 46 103  23 40 99  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  31 47 105  42 58 112
-+51 66 119  50 65 118  50 65 118  49 64 117  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  49 65 117  48 65 116
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  49 65 117  48 64 117
-+48 63 117  48 64 117  43 59 113  29 46 104  23 40 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  26 43 102  38 54 110  46 61 115  45 60 114
-+44 59 113  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  45 60 114  44 60 114  43 60 114
-+44 60 114  44 60 114  44 60 114  44 60 113  44 60 114  42 58 112
-+28 45 103  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  36 52 108  40 56 111
-+39 55 110  40 56 111  39 55 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  39 55 111  38 54 110
-+28 45 103  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  32 48 105
-+35 51 108  35 51 108  35 51 108  35 51 108  35 51 108  35 51 108
-+34 50 107  34 50 107  32 48 107  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 101  26 43 102  29 45 103  29 46 104
-+30 46 104  30 46 104  30 46 104  25 42 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  28 45 103  33 49 106  40 57 112  50 65 118
-+55 70 121  54 69 120  54 69 120  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  53 68 119  53 68 119
-+53 68 119  54 69 120  54 69 120  54 69 120  54 69 120  55 70 121
-+55 70 121  55 70 121  54 69 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 70 120
-+54 70 120  54 70 120  54 70 120  54 70 120  54 70 120  54 70 120
-+54 70 120  54 70 120  54 70 120  54 70 120  54 70 120  54 70 120
-+54 70 120  54 70 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+54 70 120  54 70 120  54 70 120  54 70 120  54 70 120  54 70 120
-+54 70 120  54 70 120  54 70 120  54 70 120  54 70 120  54 70 120
-+54 70 120  54 70 120  54 70 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+55 70 121  55 70 121  55 70 121  54 69 120  54 69 120  54 69 120
-+54 69 120  53 68 119  53 68 119  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  53 68 119
-+54 69 120  55 70 121  55 70 121  47 63 116  37 53 109  31 47 105
-+26 43 102  23 40 100  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  23 40 99  27 44 103  40 56 111  48 63 117  51 66 119
-+50 65 118  49 64 117  49 64 117  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  50 65 118  49 65 117  49 65 117  48 65 116  48 65 116
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 116  48 64 117
-+48 64 117  37 53 109  26 43 102  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  26 43 101  39 55 111  46 61 115  45 60 114  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  45 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  43 60 114  44 60 114  42 58 112  29 46 104
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  34 50 107  40 56 111  39 55 110
-+39 55 111  40 56 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 111  39 55 111  29 46 104
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  29 46 104  35 51 108
-+35 51 108  35 51 108  35 51 108  35 51 108  34 50 107  35 51 108
-+34 50 107  33 49 106  26 43 102  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  29 45 103  30 46 104  30 46 104
-+29 45 103  30 46 104  27 44 103  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  24 41 100  25 42 101  26 43 102
-+32 50 106  43 59 113  53 67 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  53 68 119  53 68 119  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 70 120  54 70 120  54 70 120  54 70 120
-+54 70 120  54 70 120  54 70 120  54 70 120  54 70 120  54 70 120
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  55 70 121  55 70 121  55 70 121
-+54 69 120  54 69 120  54 69 120  54 69 120  53 68 119  53 68 119
-+53 68 119  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  53 67 120  54 69 120  54 69 120  55 70 121
-+50 65 118  39 55 110  28 45 102  26 43 101  25 42 101  24 41 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 101  36 52 108  48 63 117  51 66 119  50 65 118  50 65 118
-+50 65 118  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+50 65 118  49 65 117  49 65 117  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  48 64 117  48 64 116  48 64 117  47 63 116
-+31 47 105  25 42 101  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+27 44 102  43 58 114  46 61 115  45 60 114  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  43 60 114  43 60 114  44 60 114
-+44 60 114  43 59 113  44 60 114  43 60 114  29 45 103  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  32 48 107  40 56 111  40 56 111  39 55 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 110  39 55 111  31 47 105  25 42 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  26 43 101  35 51 108  35 51 108
-+34 50 107  35 51 108  35 51 108  34 50 107  35 51 108  34 50 107
-+34 50 106  29 45 103  25 42 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  27 43 102  30 46 104  30 46 104  30 46 104
-+30 46 104  29 45 103  25 42 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 100
-+24 41 100  24 41 100  25 42 101  34 50 107  46 61 115  52 67 118
-+53 68 119  54 69 120  54 69 120  54 69 120  53 68 119  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  53 68 119  53 68 119  53 68 119  54 69 120
-+54 69 120  54 69 120  54 69 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  54 69 120
-+54 69 120  54 69 120  54 69 120  53 68 119  53 68 119  53 68 119
-+53 68 119  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  53 68 119  54 69 120  54 69 120
-+54 69 120  53 68 119  52 67 118  50 65 118  40 57 112  29 46 103
-+24 41 100  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  25 42 101  30 46 104
-+46 61 115  52 67 118  51 66 119  49 64 117  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  50 65 118  49 65 117  49 65 117
-+49 65 117  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  49 65 117
-+48 64 117  48 64 116  48 63 117  47 63 116  42 58 112  25 43 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  28 45 103
-+43 60 114  46 61 115  45 60 114  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+45 60 114  44 60 114  43 60 114  44 60 114  44 60 114  43 59 113
-+44 60 114  44 60 114  43 59 113  27 44 103  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  30 46 104  40 57 112  39 55 110  39 55 111  40 56 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  34 50 107  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  34 50 107  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  35 51 108  34 50 107  34 50 107
-+31 47 105  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  29 46 104  29 45 103  30 46 104  30 46 104
-+30 46 104  26 43 102  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  23 39 99  27 44 102
-+35 51 108  43 59 113  48 63 117  52 67 118  55 70 121  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  53 68 119
-+53 68 119  53 68 119  53 68 119  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  54 69 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  54 69 120  55 70 121  55 70 121  55 70 121  55 70 121
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  53 68 119
-+53 68 119  53 68 119  53 68 119  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+53 68 119  54 69 120  54 69 120  54 69 120  54 69 120  50 65 118
-+46 61 115  40 56 111  32 48 107  23 40 100  23 40 100  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 101  24 41 100  24 41 101  31 47 105  42 58 112  53 67 120
-+51 66 119  50 65 118  49 64 117  49 64 117  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  50 65 118  49 65 117  49 65 117  48 65 116
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 64 117
-+48 64 116  48 64 117  46 61 115  36 52 108  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 100  24 41 100  31 47 105  43 58 114
-+46 61 115  45 60 114  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  45 60 114
-+44 60 114  43 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  42 58 112  28 45 103  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+29 46 104  40 56 111  39 55 111  39 55 111  40 56 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+38 54 110  39 55 111  36 52 108  26 43 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 100  31 47 105  35 51 108  34 50 107  35 51 108
-+35 51 108  34 50 107  35 51 108  34 50 107  34 50 107  33 49 106
-+26 43 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 101  29 46 103  30 46 104  29 46 104  30 46 104  30 46 104
-+27 44 103  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  24 41 100  27 44 102  32 48 105  37 53 109  44 60 114
-+52 67 118  55 70 121  55 69 121  54 69 120  54 69 120  53 67 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  53 68 119  53 68 119  53 68 119
-+53 68 119  53 68 119  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  54 69 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  53 68 119  53 68 119  53 68 119  53 68 119  53 68 119
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+55 70 121  55 70 121  49 64 117  40 57 112  34 50 107  30 46 104
-+25 43 102  24 41 100  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+23 40 99  30 46 104  42 58 112  49 64 117  51 66 119  50 65 118
-+50 65 118  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  48 65 116  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  49 65 117  48 64 116  48 64 117
-+50 65 118  40 57 112  29 47 104  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  23 40 100  34 50 107  44 60 114  46 61 115
-+45 60 114  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  45 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  43 59 113  44 60 114
-+42 58 112  29 45 103  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 100  24 41 100  28 45 103
-+38 54 110  40 56 111  39 55 110  40 56 111  39 55 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  38 54 110
-+39 55 111  38 54 110  27 44 102  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  28 45 104  34 50 107  34 50 107  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  34 50 107  34 50 107  27 44 103
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+27 44 102  30 46 104  29 45 103  30 46 104  29 45 103  29 46 104
-+25 42 102  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  24 41 100  25 42 101  26 43 101
-+26 43 101  32 48 105  40 57 112  51 66 119  55 69 121  54 69 120
-+54 69 120  53 68 119  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  53 68 119  53 68 119  53 68 119  53 68 119
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  54 69 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+54 69 120  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  53 68 119  53 68 119  53 68 119
-+53 68 119  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+53 68 119  54 69 120  54 69 120  54 69 120  54 69 120  47 63 116
-+37 53 109  28 45 103  26 43 101  25 42 101  24 41 100  24 41 100
-+24 41 100  24 41 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  27 43 102
-+42 57 112  49 64 117  51 66 119  50 65 118  50 65 118  49 64 117
-+49 64 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+49 65 117  49 65 117  49 65 117  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  49 65 117  48 64 117  48 64 117  48 64 117
-+35 52 107  25 42 101  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  36 52 108  45 60 114  46 61 115  45 60 114
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  43 60 114
-+43 60 114  44 60 114  44 60 114  43 59 113  44 60 114  42 58 112
-+27 44 102  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  26 43 102  37 53 109
-+40 56 111  39 55 110  40 56 111  39 55 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  27 44 102  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+26 43 102  34 50 107  35 51 108  35 51 108  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  34 50 107  29 47 104  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+29 45 103  29 45 103  30 46 104  29 46 104  30 46 104  27 44 103
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  23 40 100  28 45 103  38 54 109
-+46 61 115  52 67 118  52 67 118  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  53 68 119  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+53 68 119  53 68 119  53 68 119  53 68 119  53 68 119  53 68 119
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 70 121  55 70 121  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  53 68 119  53 68 119  53 68 119  53 68 119
-+53 68 119  53 68 119  53 68 119  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+55 68 119  54 69 120  54 69 120  54 69 120  53 68 119  53 68 119
-+52 67 118  50 65 118  43 59 113  33 49 106  25 42 101  23 40 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  25 42 101  26 43 102  37 53 109  50 65 118
-+51 66 119  50 65 118  49 64 117  49 64 117  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  49 65 117
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  49 65 117
-+48 64 117  48 64 116  48 64 117  47 63 116  44 60 114  30 46 104
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  37 53 109  46 61 115  45 60 114  45 60 114  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  45 60 114  44 60 114  43 60 114  44 60 114
-+44 60 114  43 59 113  44 60 114  44 60 114  42 58 112  26 43 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  36 52 108  40 56 111
-+39 55 110  40 56 111  40 56 111  39 55 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  39 55 111  39 55 111
-+29 46 103  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+32 48 107  35 51 108  34 50 107  35 51 108  35 51 108  34 50 107
-+35 51 108  34 50 107  34 50 106  32 48 107  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 100  28 45 102
-+30 46 104  30 46 104  29 45 103  30 46 104  29 46 104  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  23 40 100
-+23 40 99  25 42 101  32 50 106  38 54 110  44 60 114  48 63 117
-+51 66 119  54 69 120  55 69 121  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+53 68 119  53 68 119  53 68 119  53 68 119  53 68 119  53 68 119
-+53 68 119  53 68 119  53 68 119  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  53 68 119  53 68 119
-+53 68 119  53 68 119  53 68 119  53 68 119  53 68 119  53 68 119
-+53 68 119  53 68 119  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  53 68 119  54 69 120  54 69 120  54 69 120
-+55 70 121  53 67 120  49 65 117  46 61 115  42 58 112  36 52 108
-+29 46 103  23 40 100  23 40 99  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  28 45 103  36 52 108  48 63 117  52 67 118  50 65 118
-+50 65 118  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  50 65 118  49 65 117  49 65 117  49 65 117  48 65 116
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  49 65 117  48 64 117
-+48 64 117  48 64 117  46 61 115  38 54 110  25 42 101  24 41 100
-+25 42 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  27 43 102
-+38 54 110  46 61 115  45 60 114  44 59 113  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  45 60 114  44 60 114  43 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  40 56 111  27 44 102  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  36 52 108  40 56 111  39 55 110
-+39 55 111  40 56 111  39 55 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  38 54 110  32 48 107
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  30 46 104
-+35 51 108  34 50 107  35 51 108  35 51 108  35 51 108  35 51 108
-+34 50 107  33 49 106  33 49 106  27 44 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 101  26 43 101  29 45 103
-+30 46 104  30 46 104  30 46 104  29 46 104  25 42 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  27 44 102
-+31 47 105  34 50 106  39 55 110  44 60 114  50 65 118  55 70 121
-+55 70 121  55 70 121  54 69 120  54 69 120  53 67 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  53 68 119  53 68 119
-+53 68 119  53 68 119  53 68 119  53 68 119  53 68 119  53 68 119
-+53 68 119  53 68 119  53 68 119  53 68 119  53 68 119  53 68 119
-+53 68 119  53 68 119  53 68 119  53 68 119  53 68 119  53 68 119
-+53 68 119  53 68 119  53 68 119  53 68 119  53 68 119  53 68 119
-+53 68 119  53 68 119  53 68 119  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  53 68 119  54 69 120
-+54 69 120  55 70 121  56 71 121  53 67 120  48 63 117  42 58 112
-+37 53 109  32 50 106  29 46 104  26 43 101  24 41 100  24 41 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  23 40 99  27 44 103
-+38 54 110  47 63 116  51 66 119  50 65 118  50 65 118  49 64 117
-+49 64 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+50 65 118  49 65 117  49 65 117  48 65 116  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  47 63 116
-+48 64 117  42 58 112  31 47 105  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  23 40 100  29 46 104  40 57 112
-+46 61 115  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+43 59 113  44 60 114  39 55 111  27 44 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  35 52 107  40 56 111  39 55 110  39 55 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 110  39 55 111  34 50 107  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  28 45 103  35 52 107
-+35 51 108  35 51 108  35 51 108  35 51 108  34 50 107  35 51 108
-+34 50 107  34 50 107  29 46 104  24 41 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  29 45 103  30 46 104
-+29 45 103  29 45 103  30 46 104  27 44 102  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+24 41 100  24 41 100  25 42 101  25 42 101  26 43 102  27 44 103
-+34 50 106  40 57 112  48 63 117  54 69 120  55 70 121  54 69 120
-+54 69 120  54 69 120  53 68 119  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  53 68 119
-+54 69 120  54 69 120  54 69 120  54 69 120  55 70 121  51 66 119
-+45 60 114  38 54 109  31 47 105  27 44 102  26 43 101  25 42 101
-+25 42 101  24 41 100  24 41 100  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  26 43 101  39 55 111  49 64 117
-+50 65 118  50 65 118  50 65 118  49 64 117  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  48 65 116  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  48 64 117  48 64 116  48 64 117  48 64 117
-+35 51 108  25 42 101  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  31 47 105  44 59 113  46 61 115
-+45 60 114  44 59 113  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  45 60 114
-+44 60 114  44 60 114  43 60 114  44 60 114  44 60 114  43 59 113
-+44 60 114  38 56 110  25 42 101  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  34 50 107  40 56 111  39 55 110  39 55 111  40 56 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  39 55 111  36 52 108  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  27 43 102  34 50 107  35 51 108
-+34 50 107  35 51 108  35 51 108  34 50 107  35 51 108  34 50 107
-+34 50 107  32 48 107  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  27 44 102  30 46 104  29 45 103
-+30 46 104  30 46 104  29 45 103  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  24 41 100  23 40 100  24 41 100  30 46 104  36 52 108
-+42 58 112  48 63 117  51 67 118  52 67 118  52 67 118  53 68 119
-+53 68 119  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  53 68 119  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  53 68 119  53 68 119  52 67 118  52 67 118
-+50 65 118  44 61 114  39 55 110  33 49 106  26 43 102  23 40 100
-+24 41 100  24 41 100  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+25 42 101  26 43 102  37 53 109  50 65 118  51 66 119  50 65 118
-+49 64 117  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  50 65 118  50 65 118  49 65 117  49 65 117  48 65 116
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  48 64 116  48 63 117  47 63 116  43 60 114  27 44 103
-+24 41 100  25 42 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  32 48 107  46 61 115  46 61 115  45 60 114
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  45 60 114  44 60 114  43 60 114
-+44 60 114  44 60 114  44 60 114  43 59 113  44 60 114  44 60 114
-+37 53 109  24 41 100  25 42 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+31 47 105  40 56 111  40 56 111  40 56 111  40 56 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  38 54 111
-+39 55 111  39 55 111  37 53 109  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  32 48 107  35 51 108  35 51 108
-+35 51 108  35 51 108  35 51 108  35 51 108  34 50 107  34 50 106
-+34 50 107  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  30 46 104  29 45 103  30 46 104
-+29 45 103  29 45 103  27 43 102  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  24 41 100
-+23 40 100  23 40 99  24 41 100  29 46 104  33 49 106  37 53 109
-+40 57 112  45 60 114  46 61 115  48 64 116  50 65 118  52 67 118
-+54 69 120  55 70 121  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  53 68 119  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  53 67 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+55 69 121  55 70 121  53 68 119  51 66 119  49 65 117  47 63 116
-+46 61 115  43 59 113  40 56 111  36 52 108  31 47 105  27 44 102
-+23 40 99  23 40 99  23 40 100  24 41 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  24 41 101  29 47 104
-+38 54 110  49 64 117  52 67 118  50 65 118  50 65 118  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  49 65 117  48 65 116  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  48 64 117  48 64 116
-+48 64 117  48 64 117  44 61 114  35 51 108  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+26 43 101  36 52 108  46 61 115  45 60 114  45 60 114  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  45 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 59 113  36 52 108
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  31 47 105
-+40 56 111  40 56 111  39 55 111  40 56 111  39 55 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  38 54 110
-+39 55 111  37 53 109  26 43 102  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  30 46 104  35 51 108  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  35 51 108  34 50 107  33 49 106
-+27 44 102  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  29 45 103  29 45 103  30 46 104  29 46 104
-+30 46 104  28 45 103  25 42 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  24 41 100  24 41 100
-+23 40 100  24 41 100  26 43 102  28 45 103  29 47 104  32 48 105
-+34 50 107  36 52 108  38 56 110  42 58 112  46 61 115  48 64 116
-+51 66 119  53 68 119  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 69 121  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  53 68 119  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  54 69 120
-+54 69 120  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  52 67 118  50 65 118  47 63 116  44 59 113  40 57 112
-+38 54 110  35 52 107  33 49 106  31 47 105  29 46 104  27 44 102
-+25 42 101  24 41 100  23 40 100  24 41 100  24 41 100  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  24 41 100  33 49 106  42 58 112  48 64 117
-+51 66 119  50 65 118  50 65 118  49 64 117  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  50 65 118
-+49 65 117  49 65 117  48 65 116  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  49 65 117  49 65 117  48 64 116  48 64 117
-+48 64 117  38 54 110  28 45 103  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  27 44 102
-+39 55 111  46 61 115  45 60 114  45 60 114  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  44 60 114  43 60 114  44 60 114
-+44 60 114  43 59 113  43 60 114  44 60 114  34 50 107  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  32 48 105  39 55 111
-+40 56 111  39 55 110  40 56 111  39 55 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+38 54 110  28 45 103  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  28 45 103  35 52 107  35 51 108  34 50 107  35 51 108
-+35 51 108  34 50 107  35 51 108  34 50 107  34 50 106  29 46 104
-+24 41 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 101  27 44 102  30 46 104  29 46 104  30 46 104  30 46 104
-+29 46 104  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 101  25 42 101  25 42 101  26 43 101  26 43 102
-+26 43 102  27 43 102  27 44 103  31 47 105  34 50 106  36 52 108
-+39 55 110  40 57 112  44 59 113  47 63 116  48 64 116  50 65 118
-+52 67 118  54 69 120  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 70 121  55 69 121  55 69 121  54 69 120  54 69 120
-+54 69 120  54 69 120  54 69 120  54 69 120  54 69 120  55 69 121
-+55 69 121  55 70 121  55 70 121  55 70 121  55 70 121  55 70 121
-+55 70 121  55 68 119  52 67 118  49 65 117  47 63 116  44 61 114
-+43 59 113  40 56 111  38 54 110  35 52 107  32 50 106  29 46 104
-+27 44 102  26 43 102  26 43 102  26 43 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  33 49 106  47 63 116  50 65 118  51 66 119  50 65 118
-+50 65 118  49 64 117  49 64 117  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  50 65 118  50 65 118  49 65 117
-+49 65 117  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  48 64 116  48 64 117  44 60 114
-+29 46 104  25 42 101  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  28 45 104  43 58 114
-+46 61 115  46 61 115  44 59 113  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  45 60 114  43 60 114  43 60 114  44 60 114  44 60 114
-+43 59 113  44 60 114  44 60 114  31 47 105  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  31 47 105  39 55 110  40 56 111
-+39 55 110  39 55 111  40 56 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  38 54 110  39 55 111
-+28 45 104  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+26 43 102  34 50 107  35 51 108  34 50 107  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  34 50 107  32 48 105  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  29 46 104  30 46 104  30 46 104  29 45 103  30 46 104
-+26 43 102  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  23 40 100  23 40 100
-+23 40 100  23 40 100  24 41 100  25 42 101  26 43 102  27 44 103
-+29 46 103  30 46 104  29 47 104  31 47 105  31 47 105  32 48 105
-+32 48 105  32 48 105  32 48 105  32 48 105  32 48 105  30 48 104
-+29 47 104  29 46 103  28 45 103  27 44 102  25 42 102  24 41 101
-+23 40 100  23 40 100  23 40 100  23 40 100  23 40 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  25 42 101  25 42 101  34 50 108
-+48 63 117  52 67 118  51 66 119  50 65 118  49 64 117  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+50 65 118  50 65 118  49 65 117  49 65 117  48 65 116  48 65 116
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  49 65 117  49 65 117
-+48 64 117  48 63 117  48 63 117  47 63 116  37 53 109  24 41 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 100  24 41 100  25 42 101  31 47 105  46 61 115  46 61 115
-+45 60 114  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  45 60 114  44 60 114
-+44 60 114  43 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  43 58 114  31 47 105  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 101  25 42 100  29 46 103  39 55 110  40 56 111  39 55 111
-+40 56 111  40 56 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 110  39 55 111  39 55 111  29 46 104
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+34 50 107  34 50 107  35 51 108  35 51 108  35 51 108  34 50 107
-+35 51 108  35 51 108  34 50 107  33 49 106  26 43 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+29 45 103  30 46 104  29 46 104  30 46 104  30 46 104  27 44 103
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+24 41 100  25 42 101  31 47 105  38 54 109  48 63 117  52 67 118
-+50 65 118  50 65 118  50 65 118  49 64 117  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  49 65 117  48 65 116  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  48 64 116
-+48 64 117  47 63 116  40 56 111  29 45 103  23 40 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  26 43 101  36 52 108  47 63 116  46 61 115  45 60 114
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  44 60 114
-+43 60 114  44 60 114  44 60 114  44 60 114  43 59 113  44 60 114
-+40 57 112  29 46 104  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  29 45 103  39 55 110  40 56 111  39 55 110  40 56 111
-+39 55 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  39 55 111  38 54 111  31 47 105  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  31 47 105
-+34 50 108  35 51 108  35 51 108  35 51 108  35 51 108  35 51 108
-+34 50 107  34 50 107  33 49 106  27 44 103  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  27 44 102
-+30 46 104  29 45 103  30 46 104  30 46 104  29 45 103  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  23 40 100  26 43 102
-+36 52 108  43 60 114  49 64 117  51 66 119  50 65 118  50 65 118
-+49 64 117  49 64 117  49 64 117  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  50 65 118  49 65 117  49 65 117
-+49 65 117  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  49 65 117  48 64 117  48 64 116  48 64 117  49 65 117
-+42 58 112  31 47 105  25 42 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+27 44 103  40 56 111  46 61 115  46 61 115  45 60 114  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  45 60 114  44 60 114  43 60 114
-+44 60 114  44 60 114  44 60 114  43 59 113  44 60 114  40 56 111
-+28 45 103  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+29 46 104  39 55 110  40 56 111  39 55 110  39 55 111  40 56 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 56 110  32 50 106  24 41 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  29 46 104  34 50 108
-+35 51 108  35 51 108  35 51 108  35 51 108  34 50 107  35 51 108
-+34 50 107  34 50 107  29 46 104  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  26 43 101  29 46 104
-+29 45 103  30 46 104  29 46 104  30 46 104  27 43 102  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  23 40 100  27 44 102  40 57 112  49 64 117
-+50 65 118  51 66 119  50 65 118  50 65 118  50 65 118  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  50 65 118  50 65 118  49 65 117  49 65 117  48 65 116
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 64 117
-+49 65 117  48 64 117  48 64 117  48 64 117  47 63 116  32 48 107
-+25 42 101  24 41 100  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  30 46 104
-+44 59 113  46 61 115  46 61 115  45 60 114  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  45 60 114  44 60 114  43 60 114  44 60 114
-+44 60 114  44 60 114  43 59 113  44 60 114  37 53 109  25 42 101
-+24 41 100  24 41 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  29 45 103
-+38 54 110  40 56 111  39 55 110  39 55 111  40 56 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+38 54 110  39 55 111  34 50 107  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  26 43 102  35 51 108  35 51 108
-+34 50 107  35 51 108  35 51 108  35 51 108  35 51 108  34 50 107
-+34 50 107  31 47 105  25 42 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  29 45 103  30 46 104
-+29 46 104  30 46 104  30 46 104  27 44 103  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  24 41 100  25 42 101
-+26 43 102  32 48 105  44 60 114  51 66 119  51 66 119  50 65 118
-+50 65 118  49 64 117  49 64 117  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  50 65 118  50 65 118
-+49 65 117  49 65 117  48 65 116  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  49 65 117  48 64 117  48 64 116
-+48 64 117  48 64 117  47 63 116  39 55 110  25 42 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  35 52 107  46 61 115
-+46 61 115  45 60 114  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+43 59 113  44 60 114  44 60 114  37 53 109  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  27 44 102  38 54 109
-+40 56 111  39 55 111  40 56 111  40 56 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  38 54 110  39 55 111
-+39 55 111  35 51 108  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  34 50 107  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  35 51 108  34 50 107  33 49 106
-+32 48 107  26 43 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  27 44 102  29 46 104  30 46 104
-+29 46 104  30 46 104  30 46 104  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  24 41 100  26 43 102  31 47 105  38 54 110
-+47 63 116  52 67 118  51 66 119  50 65 118  50 65 118  49 64 117
-+49 64 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  50 65 118  50 65 118  49 65 117  49 65 117
-+48 65 116  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  49 65 117  49 65 117  48 64 117  48 64 117  48 64 117
-+47 63 116  40 56 111  29 46 104  23 40 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  27 44 102  38 54 110  46 61 115  46 61 115
-+45 60 114  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  45 60 114
-+44 60 114  43 60 114  43 60 114  44 60 114  44 60 114  43 59 113
-+44 60 114  43 59 113  34 50 107  25 42 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  27 44 103  38 54 109  40 56 111
-+39 55 110  40 56 111  39 55 111  39 55 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  39 55 111  39 55 111
-+34 50 108  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  33 49 106  35 51 108  34 50 107  35 51 108
-+35 51 108  34 50 107  35 51 108  34 50 107  34 50 107  33 49 106
-+27 44 103  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 101  26 43 101  29 45 103  30 46 104  30 46 104
-+30 46 104  30 46 104  26 43 102  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  23 40 100
-+23 40 100  31 47 105  38 56 110  44 60 115  50 65 118  51 66 119
-+51 66 119  50 65 118  50 65 118  49 64 117  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+50 65 118  50 65 118  49 65 117  49 65 117  49 65 117  48 65 116
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 64 117
-+49 65 117  48 64 117  48 64 116  48 64 117  48 64 117  40 56 111
-+31 47 105  24 41 101  24 41 100  25 42 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+23 40 100  32 48 105  42 58 112  46 61 115  45 60 114  45 60 114
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  45 60 114  44 60 114
-+43 60 114  44 60 114  44 60 114  44 60 114  43 59 113  44 60 114
-+42 58 112  31 47 105  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  28 45 103  38 54 109  40 56 111  39 55 110
-+39 55 111  40 56 111  39 55 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  34 50 108
-+26 43 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  31 47 105  35 52 107  34 50 107  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  34 50 107  34 50 107  28 45 103
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  29 45 103  30 46 104  29 45 103  29 45 103
-+30 46 104  27 44 103  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 100  24 41 100  24 41 100  25 42 101  37 53 109
-+47 63 116  49 64 117  50 65 118  51 66 119  50 65 118  50 65 118
-+50 65 118  49 64 117  49 64 117  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  49 65 117  48 65 116  48 65 116  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  49 65 117  49 65 117
-+48 64 116  48 64 117  48 64 117  44 60 114  29 46 104  25 42 101
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 100
-+37 53 109  45 60 114  46 61 115  45 60 114  44 59 113  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  45 60 114  45 60 114  44 60 114  43 60 114
-+44 60 114  44 60 114  44 60 114  44 59 113  44 60 114  40 57 112
-+27 44 103  24 41 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  28 45 103  38 54 110  40 56 111  39 55 110  39 55 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 111  36 52 108  26 43 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 100
-+29 46 104  35 51 108  35 51 108  35 51 108  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  34 50 107  30 46 104  24 41 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  27 44 103  30 46 104  29 45 103  30 46 104  30 46 104
-+29 45 103  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+29 46 104  26 43 101  25 42 101  24 41 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  24 41 100  24 41 100
-+25 42 101  26 43 102  33 49 106  44 59 113  51 66 119  51 66 119
-+50 65 118  50 65 118  49 64 117  49 64 117  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  49 65 117  48 65 116
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  49 65 117  48 64 117  48 64 116  48 64 117  48 64 117
-+47 63 116  44 61 114  33 49 106  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 101  27 44 102  39 55 111
-+46 61 115  45 60 114  45 60 114  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  45 60 114  44 60 114  43 60 114  43 60 114  44 60 114
-+44 60 114  43 59 113  44 60 114  43 59 113  39 55 111  26 43 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+27 44 102  38 54 109  40 56 111  39 55 111  40 56 111  40 56 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  39 55 111  38 54 110  25 42 102  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 101  24 41 100  26 43 102
-+34 50 108  35 52 107  35 51 108  35 51 108  35 51 108  34 50 107
-+35 51 108  34 50 107  34 50 106  31 47 105  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 101  24 41 100
-+26 43 102  30 46 104  29 46 104  30 46 104  29 45 103  29 46 104
-+27 43 102  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+53 67 120  46 61 115  38 54 110  32 48 105  28 45 103  24 41 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  24 41 100  25 42 101  30 46 104  34 50 107
-+42 58 112  49 64 117  53 67 120  51 66 119  50 65 118  50 65 118
-+49 64 117  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  50 65 118
-+49 65 117  49 65 117  49 65 117  48 65 116  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  49 65 117
-+49 65 117  48 64 117  48 64 117  48 64 117  48 64 117  43 59 113
-+35 51 108  25 42 101  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  31 47 105  44 59 113  46 61 115
-+45 60 114  44 59 113  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+45 60 114  44 60 114  43 60 114  44 60 114  44 60 114  44 60 114
-+43 59 113  44 60 114  43 59 113  37 53 109  25 42 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  27 44 103
-+38 54 109  40 56 111  39 55 110  40 56 111  39 55 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+38 54 110  39 55 111  37 53 109  26 43 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  27 43 102  34 50 107
-+35 51 108  34 50 108  35 51 108  35 51 108  34 50 107  35 51 108
-+34 50 107  33 49 106  32 50 106  26 43 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 43 102
-+29 46 104  29 45 103  30 46 104  29 45 103  30 46 104  28 45 103
-+25 42 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+50 65 118  50 65 118  52 67 118  50 65 118  47 63 116  42 57 112
-+35 51 108  28 45 103  23 40 99  23 40 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  23 40 99
-+24 41 101  31 47 105  38 54 110  44 60 114  48 63 117  51 66 119
-+51 66 119  50 65 118  50 65 118  49 64 117  49 64 117  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+49 65 117  48 65 116  48 65 116  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  49 65 117  48 64 117
-+48 64 116  48 64 117  48 64 117  44 60 114  34 50 107  27 44 102
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  27 43 102  38 54 109  44 61 114  46 61 115  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  45 60 114  45 60 114
-+44 60 114  43 60 114  44 60 114  44 60 114  44 60 114  43 59 113
-+44 60 114  43 59 113  32 48 105  25 42 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  29 45 103  38 54 109
-+40 56 111  39 55 110  39 55 111  40 56 111  39 55 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  38 54 110
-+39 55 111  36 52 108  27 44 102  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  26 43 101  33 49 106  35 51 108
-+34 50 107  35 51 108  35 51 108  34 50 107  35 51 108  34 50 107
-+33 49 106  34 50 107  27 44 103  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  28 45 103
-+30 46 104  30 46 104  30 46 104  30 46 104  29 45 103  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+49 64 117  50 65 118  50 65 118  50 65 118  51 66 119  51 66 119
-+50 65 118  49 64 117  46 61 115  36 52 108  27 44 102  24 41 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  24 41 100  24 41 101  31 47 105  40 57 112
-+48 63 117  49 64 117  50 65 118  51 66 119  50 65 118  50 65 118
-+50 65 118  49 64 117  49 64 117  49 64 117  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  50 65 118  49 65 117  49 65 117  49 65 117  48 65 116
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  49 65 117  49 65 117  48 64 116  48 64 117
-+48 64 117  46 61 115  33 49 106  25 42 101  24 41 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+29 46 104  43 58 114  46 61 115  46 61 115  45 60 114  45 60 114
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  43 59 113  44 60 114
-+42 58 112  28 45 103  25 42 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  29 45 103  38 54 110  40 56 111
-+39 55 110  39 55 111  40 56 111  39 55 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+37 53 109  27 44 102  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  32 48 107  35 51 108  34 50 107
-+35 51 108  35 51 108  35 51 108  35 51 108  34 50 107  33 49 106
-+34 50 107  29 45 103  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  26 43 102  30 46 104
-+30 46 104  30 46 104  29 45 103  30 46 104  26 43 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+50 65 118  50 65 118  50 65 118  50 65 118  49 64 117  49 64 117
-+50 65 118  50 65 118  51 66 119  51 66 119  53 67 120  47 63 116
-+38 54 110  29 46 104  26 43 101  25 42 101  25 42 101  24 41 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  24 41 100  24 41 100  25 42 101  26 43 101
-+27 44 102  32 50 106  42 57 112  50 65 118  51 66 119  51 66 119
-+50 65 118  50 65 118  49 64 117  49 64 117  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  50 65 118  49 65 117  49 65 117
-+49 65 117  48 65 116  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  49 65 117
-+48 64 117  48 64 116  48 64 117  48 64 117  47 63 116  46 61 115
-+34 50 108  24 41 100  24 41 100  24 41 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  25 42 101  35 52 107
-+46 61 115  46 61 115  45 60 114  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  45 60 114  45 60 114  44 60 114  43 60 114  44 60 114
-+44 60 114  44 60 114  43 59 113  44 60 114  43 59 113  40 56 111
-+26 43 102  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 100  28 45 103  38 56 110  40 56 111  39 55 111
-+40 56 111  40 56 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  39 55 111  38 54 110
-+27 44 103  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  29 46 104  35 51 108  34 50 107  35 51 108
-+35 51 108  35 51 108  34 50 107  35 51 108  34 50 107  34 50 107
-+31 47 105  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  29 46 104  29 45 103
-+30 46 104  30 46 104  30 46 104  27 44 102  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 64 117  49 64 117  49 64 117  50 65 118  50 65 118  51 66 119
-+52 67 118  53 67 120  48 63 117  40 57 112  35 51 108  31 47 105
-+27 44 103  24 41 101  24 41 100  24 41 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  24 41 100
-+24 41 100  26 43 102  29 46 104  32 50 106  37 53 109  44 60 114
-+50 65 118  53 67 120  51 66 119  50 65 118  50 65 118  50 65 118
-+49 64 117  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  49 65 117  48 65 116
-+48 65 116  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  49 65 117  49 65 117  48 64 117
-+48 64 117  48 64 117  47 63 116  42 58 112  34 50 108  25 42 101
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  29 46 104  40 56 111  46 61 115
-+45 60 114  45 60 114  44 59 113  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+45 60 114  44 60 114  44 60 114  43 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  43 59 113  36 52 108  25 42 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  29 46 103  39 55 110  40 56 111  39 55 110  40 56 111
-+39 55 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 110  39 55 111  37 53 109  27 44 103
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  29 45 103  35 51 108  35 52 107  35 51 108  35 51 108
-+35 51 108  34 50 107  35 51 108  34 50 107  34 50 106  31 47 105
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 101  29 45 103  30 46 104  29 46 104
-+30 46 104  29 46 104  28 45 103  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 64 117  49 64 117  49 64 117  49 64 117
-+50 65 118  50 65 118  51 66 119  51 66 119  51 66 119  49 64 117
-+46 61 115  43 58 114  38 54 110  32 48 107  26 43 102  23 40 99
-+23 40 100  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  23 40 100  23 40 100  29 46 103  34 50 107
-+40 57 112  44 60 114  47 63 116  51 66 119  51 66 119  51 66 119
-+50 65 118  50 65 118  50 65 118  49 64 117  49 64 117  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  50 65 118  50 65 118
-+49 65 117  49 65 117  49 65 117  48 65 116  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  49 65 117  49 65 117  48 64 117  48 64 116  48 64 117
-+48 64 117  40 57 112  32 48 105  26 43 102  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 100  35 51 108  44 59 113  46 61 115  45 60 114
-+45 60 114  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  44 60 114  43 60 114  44 60 114  44 60 114  44 60 114
-+43 59 113  44 60 114  42 58 112  31 47 105  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+31 47 105  39 55 110  40 56 111  39 55 110  39 55 111  40 56 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  39 55 111  37 53 109  27 44 103  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+28 45 103  35 52 107  35 51 108  34 50 108  35 51 108  35 51 108
-+34 50 107  35 51 108  34 50 107  33 49 106  33 49 106  26 43 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 101  25 42 100  27 44 102  30 46 104  29 45 103  30 46 104
-+29 45 103  30 46 104  26 43 102  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 64 117  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+51 66 119  51 66 119  50 65 118  50 65 118  49 64 117  46 61 115
-+38 54 110  31 47 105  25 42 100  24 41 100  24 41 100  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  24 41 100  23 40 100
-+27 43 102  34 50 107  42 57 112  48 63 117  49 64 117  50 65 118
-+51 66 119  51 66 119  50 65 118  50 65 118  50 65 118  50 65 118
-+49 64 117  49 64 117  49 64 117  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  49 65 117
-+49 65 117  48 65 116  48 65 116  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  49 65 117
-+49 65 117  48 64 117  48 64 117  48 64 117  48 64 117  40 57 112
-+28 45 103  25 42 101  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 101  24 41 100
-+28 45 103  42 58 112  45 60 114  46 61 115  45 60 114  44 59 113
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  45 60 114  45 60 114
-+43 60 114  43 60 114  44 60 114  44 60 114  44 60 114  43 59 113
-+44 60 114  40 57 112  26 43 102  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  31 47 105
-+39 55 110  40 56 111  39 55 110  39 55 111  40 56 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  37 53 109  27 44 103  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  27 44 102
-+34 50 107  35 51 108  34 50 107  35 51 108  35 51 108  34 50 107
-+35 51 108  34 50 107  33 49 106  34 50 107  27 44 102  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  27 44 102  29 46 104  29 45 103  30 46 104  29 46 104
-+30 46 104  27 44 103  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 64 117
-+49 64 117  49 64 117  50 65 118  50 65 118  50 65 118  51 66 119
-+51 66 119  51 66 119  51 66 119  46 61 115  38 54 110  32 48 107
-+27 44 102  26 43 101  25 42 101  25 42 101  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 101  25 42 101
-+25 42 101  26 43 102  28 45 103  35 52 107  42 57 112  49 64 117
-+52 67 118  51 66 119  51 66 119  50 65 118  50 65 118  50 65 118
-+49 64 117  49 64 117  49 64 117  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  50 65 118  50 65 118
-+49 65 117  49 65 117  49 65 117  48 65 116  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  49 65 117  49 65 117  49 65 117  48 64 116  48 64 117
-+48 64 117  47 63 116  47 63 116  40 56 111  27 44 102  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  25 42 101  34 50 107
-+45 60 114  46 61 115  45 60 114  44 59 113  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  43 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+36 52 108  25 42 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  29 47 104  39 55 111
-+40 56 111  39 55 111  40 56 111  40 56 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  38 54 110
-+39 55 111  38 54 110  27 44 103  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  26 43 102  33 49 106
-+35 51 108  35 51 108  35 51 108  35 51 108  35 51 108  35 51 108
-+34 50 107  33 49 106  34 50 107  28 45 103  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  29 45 103  30 46 104  30 46 104  29 45 103  30 46 104
-+29 46 104  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+50 65 118  50 65 118  49 65 117  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 64 117  49 64 117  49 64 117  49 64 117
-+50 65 118  50 65 118  50 65 118  51 66 119  51 66 119  53 67 120
-+51 66 119  47 63 116  42 57 112  37 53 109  34 50 106  31 47 105
-+28 45 103  26 43 101  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  24 41 100  24 41 100  23 40 100
-+24 41 100  27 44 102  29 46 104  31 47 105  35 51 108  39 55 111
-+44 60 114  48 63 117  53 67 120  52 67 118  51 66 119  50 65 118
-+50 65 118  50 65 118  50 65 118  49 64 117  49 64 117  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  50 65 118  50 65 118  50 65 118  49 65 117  49 65 117
-+49 65 117  48 65 116  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 64 117
-+49 65 117  48 64 117  48 64 116  48 64 117  48 64 117  47 63 116
-+43 59 113  37 53 109  28 45 103  23 40 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  29 46 104  39 55 110  47 63 116
-+45 60 114  45 60 114  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  45 60 114  44 60 114  44 60 114  43 60 114  44 60 114
-+44 60 114  44 60 114  43 59 113  44 60 114  42 58 112  33 49 106
-+24 41 100  24 41 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  32 48 105  40 56 111  40 56 111
-+39 55 110  40 56 111  39 55 111  39 55 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  38 54 110  39 55 111
-+37 53 109  27 44 103  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  32 48 107  35 51 108
-+34 50 107  35 51 108  35 51 108  35 51 108  34 50 107  35 51 108
-+34 50 107  34 50 107  29 46 104  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+27 44 103  30 46 104  29 45 103  29 45 103  30 46 104  29 45 103
-+25 42 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+49 65 117  49 65 117  50 65 118  50 65 118  49 65 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 64 117  49 64 117  49 64 117  49 64 117  50 65 118  50 65 118
-+50 65 118  51 66 119  51 66 119  51 66 119  51 66 119  49 64 117
-+47 63 116  44 60 114  42 57 112  38 54 110  34 50 107  29 47 104
-+26 43 101  23 40 99  23 40 99  23 40 100  24 41 100  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  24 41 100  24 41 100  23 40 100
-+23 40 99  24 41 100  27 44 102  31 47 105  36 52 108  40 56 111
-+43 58 114  44 60 115  47 63 116  50 65 118  52 67 118  51 66 119
-+51 66 119  50 65 118  50 65 118  50 65 118  50 65 118  49 64 117
-+49 64 117  49 64 117  49 64 117  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  50 65 118  50 65 118
-+50 65 118  49 65 117  49 65 117  49 65 117  48 65 116  48 65 116
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  49 65 117  49 65 117  49 65 117
-+48 64 116  48 64 117  48 64 117  48 64 117  40 56 111  32 50 106
-+27 43 102  24 41 100  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  26 43 101  36 52 108  44 60 114  46 61 115  45 60 114
-+45 60 114  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+45 60 114  44 60 114  43 60 114  43 60 114  44 60 114  44 60 114
-+43 59 113  43 60 114  44 61 114  39 55 110  29 45 103  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  34 50 107  40 56 111  40 56 111  39 55 110
-+39 55 111  40 56 111  39 55 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  39 55 111  37 53 109
-+27 44 102  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 100  32 48 107  35 51 108  34 50 107
-+35 51 108  35 51 108  35 51 108  34 50 107  35 51 108  34 50 107
-+34 50 106  29 47 104  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  27 44 103
-+30 46 104  29 45 103  30 46 104  30 46 104  29 45 103  26 43 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+48 65 116  49 65 117  49 65 117  49 65 117  50 65 118  50 65 118
-+50 65 118  49 65 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 64 117  49 64 117
-+49 64 117  50 65 118  50 65 118  50 65 118  50 65 118  51 66 119
-+51 66 119  51 66 119  51 66 119  50 65 118  50 65 118  49 64 117
-+49 64 117  48 63 117  43 59 113  38 54 110  34 50 107  29 46 104
-+25 42 101  23 40 100  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+23 40 100  23 40 100  27 43 102  32 48 105  36 52 108  40 57 112
-+45 60 114  48 64 117  49 64 117  50 65 118  50 65 118  51 66 119
-+51 66 119  51 66 119  51 66 119  50 65 118  50 65 118  50 65 118
-+50 65 118  49 64 117  49 64 117  49 64 117  49 64 117  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  50 65 118  50 65 118  49 65 117  49 65 117
-+49 65 117  49 65 117  48 65 116  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  49 65 117  48 64 117  48 64 116  48 64 117
-+48 64 117  47 63 116  38 54 109  27 44 103  25 42 101  24 41 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+29 47 104  43 58 114  45 60 114  46 61 115  45 60 114  45 60 114
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  43 60 114  44 60 114  44 60 114  44 60 114  43 59 113
-+44 60 114  44 60 114  35 52 107  25 42 101  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  35 52 107  40 56 111  40 56 111  39 55 110  40 56 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  37 53 109  26 44 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 101  32 48 105  34 50 108  35 52 107  35 51 108
-+35 51 108  35 51 108  34 50 107  35 51 108  34 50 107  34 50 107
-+31 47 105  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  26 43 102  29 46 104
-+30 46 104  30 46 104  30 46 104  29 46 104  27 44 103  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+49 65 117  49 65 117  49 65 117  49 65 117  48 65 116  48 65 116
-+49 65 117  49 65 117  49 65 117  50 65 118  50 65 118  50 65 118
-+49 65 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 64 117
-+49 64 117  49 64 117  49 64 117  49 64 117  50 65 118  50 65 118
-+50 65 118  50 65 118  51 66 119  51 66 119  51 66 119  51 66 119
-+52 67 118  49 64 117  44 60 115  40 57 112  37 53 109  33 49 106
-+30 46 104  27 44 102  26 43 102  26 43 102  26 43 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  25 42 100
-+25 42 101  25 42 101  25 42 101  25 42 101  26 43 101  26 43 102
-+26 43 102  27 44 103  31 47 105  35 51 108  38 54 110  43 58 114
-+47 63 116  51 66 119  52 67 118  51 66 119  51 66 119  51 66 119
-+51 66 119  50 65 118  50 65 118  50 65 118  50 65 118  49 64 117
-+49 64 117  49 64 117  49 64 117  49 64 117  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  50 65 118  50 65 118  50 65 118  49 65 117
-+49 65 117  49 65 117  48 65 116  48 65 116  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  49 65 117  49 65 117  48 64 117
-+48 64 116  48 64 117  48 63 117  48 63 117  47 63 116  44 61 114
-+35 51 108  25 42 101  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 100  26 43 102  37 53 109
-+47 63 116  46 61 115  45 60 114  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  45 60 114  45 60 114  44 60 114  43 60 114
-+43 60 114  44 60 114  44 60 114  43 59 113  44 60 114  44 60 114
-+42 58 112  31 47 105  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+35 51 108  40 56 111  39 55 110  40 56 111  40 56 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+38 54 110  39 55 111  39 55 111  38 54 110  26 43 102  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 100  30 46 104  34 50 108  34 50 107  35 51 108  35 51 108
-+35 51 108  35 51 108  35 51 108  34 50 107  34 50 107  33 49 106
-+25 42 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  29 46 104  29 45 103
-+30 46 104  29 45 103  30 46 104  29 45 103  25 42 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 65 116  48 65 116  48 65 116  49 65 117  49 65 117  49 65 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 64 117  49 64 117
-+49 64 117  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  51 66 119  51 66 119  52 67 118  52 67 118
-+53 67 120  53 67 120  50 65 118  47 63 116  44 60 115  42 58 112
-+40 57 112  38 54 110  36 52 108  34 50 107  33 49 106  32 48 105
-+31 47 105  29 47 104  29 46 104  29 45 103  27 44 103  27 44 102
-+26 43 102  26 43 101  25 42 101  25 42 101  25 42 100  24 41 100
-+24 41 100  23 40 100  23 40 100  23 40 100  23 40 100  23 40 100
-+23 40 100  23 40 100  23 40 100  23 40 100  23 40 100  23 40 100
-+23 40 100  23 40 100  24 41 100  24 41 100  25 42 100  25 42 101
-+25 42 101  26 43 101  27 43 102  27 44 102  28 45 103  29 45 103
-+29 46 104  29 47 104  31 47 105  32 50 106  33 49 106  35 52 107
-+37 53 109  39 55 110  40 57 112  44 60 114  46 61 115  48 63 117
-+50 65 118  53 67 120  53 67 120  52 67 118  51 66 119  51 66 119
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 64 117  49 64 117  49 64 117  49 64 117  49 64 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  50 65 118
-+50 65 118  50 65 118  49 65 117  49 65 117  49 65 117  49 65 117
-+48 65 116  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  49 65 117  49 65 117  48 64 117  48 64 116  48 64 117
-+48 64 117  48 64 117  44 60 114  39 55 111  31 47 105  24 41 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 101  24 41 100  25 42 101  32 50 106  43 59 113  46 61 115
-+45 60 114  45 60 114  44 59 113  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  45 60 114  44 60 114  44 60 114  43 60 114  44 60 114
-+44 60 114  44 60 114  43 59 113  44 60 114  44 60 114  38 56 110
-+27 44 103  24 41 100  24 41 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  27 44 102  36 52 108
-+40 56 111  39 55 110  39 55 111  40 56 111  39 55 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  38 54 110
-+39 55 111  39 55 111  36 52 108  26 43 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+28 45 103  34 50 107  35 51 108  35 51 108  35 51 108  35 51 108
-+35 51 108  34 50 107  34 50 107  34 50 107  33 49 106  27 43 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  27 44 103  29 46 103  30 46 104
-+29 46 104  30 46 104  29 45 103  25 43 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 65 116  48 65 116  48 65 116  48 65 116
-+49 65 117  49 65 117  49 65 117  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 64 117  49 64 117  49 64 117  49 64 117
-+49 64 117  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  51 66 119  51 66 119  51 66 119
-+51 66 119  51 66 119  51 66 119  52 67 118  51 66 119  50 65 118
-+49 64 117  48 63 117  47 63 116  47 63 116  46 61 115  44 60 115
-+44 60 115  44 60 114  44 60 114  43 58 114  43 58 114  42 58 112
-+42 58 112  42 57 112  40 57 112  40 56 111  40 57 112  40 57 112
-+40 57 112  40 57 112  40 57 112  40 57 112  40 57 112  40 57 112
-+40 57 112  42 57 112  42 58 112  42 58 112  43 58 114  43 59 113
-+44 60 114  44 60 114  45 60 114  46 61 115  46 61 115  47 63 116
-+48 63 117  48 64 117  50 65 118  50 65 118  51 66 119  52 67 118
-+51 66 119  51 66 119  51 66 119  51 66 119  51 66 119  51 66 119
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 64 117  49 64 117  49 64 117  49 64 117  49 64 117  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+49 65 117  49 65 117  49 65 117  48 65 116  48 65 116  48 65 116
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  49 65 117
-+49 65 117  48 64 117  48 64 116  48 64 117  49 65 117  47 63 116
-+39 55 111  33 49 106  27 44 103  24 41 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 40 99  29 47 104  39 55 111  45 60 114  46 61 115  45 60 114
-+45 60 114  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+45 60 114  44 60 114  44 60 114  43 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  43 59 113  33 49 106  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  28 45 103  37 53 109  40 56 111
-+39 55 110  39 55 111  40 56 111  39 55 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  35 51 108  26 43 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  28 45 103
-+34 50 107  35 51 108  34 50 107  35 51 108  35 51 108  35 51 108
-+34 50 107  35 51 108  33 49 106  33 49 106  27 44 102  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  27 44 102  29 46 104  30 46 104  30 46 104
-+29 45 103  29 46 104  26 43 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 65 116  48 65 116  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  50 65 118  50 65 118  50 65 118  49 65 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 64 117  49 64 117  49 64 117  49 64 117
-+49 64 117  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  51 66 119  51 66 119  51 66 119  51 66 119  51 66 119
-+51 66 119  51 66 119  51 66 119  51 66 119  51 66 119  51 66 119
-+51 66 119  51 66 119  51 66 119  51 66 119  51 66 119  51 66 119
-+51 66 119  51 66 119  51 66 119  51 66 119  51 66 119  51 66 119
-+51 66 119  51 66 119  51 66 119  51 66 119  51 66 119  51 66 119
-+51 66 119  51 66 119  51 66 119  51 66 119  51 66 119  51 66 119
-+51 66 119  51 66 119  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 64 117  49 64 117  49 64 117  49 64 117  49 64 117  49 64 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  49 65 117  49 65 117  48 65 116
-+48 65 116  48 65 116  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 64 117
-+48 64 117  48 64 117  49 65 117  46 61 115  34 50 107  27 44 102
-+25 42 101  24 41 100  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+38 54 110  45 60 114  46 61 115  45 60 114  45 60 114  44 59 113
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  45 60 114
-+44 60 114  44 60 114  43 60 114  44 60 114  44 60 114  44 60 114
-+43 59 113  44 60 114  40 57 112  28 45 103  25 42 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  28 45 103  39 55 110  40 56 111  39 55 110
-+39 55 111  40 56 111  39 55 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  38 54 110  39 55 111
-+36 52 108  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  27 44 102  34 50 107
-+35 51 108  34 50 107  35 51 108  35 51 108  35 51 108  34 50 107
-+35 51 108  34 50 107  33 49 106  27 44 103  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  30 46 104  30 46 104  29 46 104  29 45 103
-+30 46 104  27 44 103  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 65 116  48 65 116  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 64 117  49 64 117  49 64 117  49 64 117  49 64 117  49 64 117
-+49 64 117  49 64 117  49 64 117  49 64 117  49 64 117  49 64 117
-+49 64 117  49 64 117  49 64 117  49 64 117  49 64 117  49 64 117
-+49 64 117  49 64 117  49 64 117  49 64 117  49 64 117  49 64 117
-+49 64 117  49 64 117  49 64 117  49 64 117  49 64 117  49 64 117
-+49 64 117  49 64 117  49 64 117  49 64 117  49 64 117  49 64 117
-+49 64 117  49 64 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  50 65 118  50 65 118
-+50 65 118  49 65 117  49 65 117  49 65 117  49 65 117  48 65 116
-+48 65 116  48 65 116  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  49 65 117  49 65 117
-+48 64 117  48 64 116  48 64 117  48 63 117  48 64 117  47 63 116
-+46 61 115  40 57 112  29 46 104  24 41 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  25 42 101  31 47 105  44 59 113
-+46 61 115  45 60 114  45 60 114  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  44 60 114  43 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+43 59 113  37 53 109  25 42 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 100  29 46 103  40 56 111  40 56 111  39 55 110  40 56 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 110  39 55 111  39 55 111  35 51 108
-+25 42 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  27 43 102  34 50 107  34 50 107
-+35 51 108  35 51 108  35 51 108  34 50 107  35 51 108  35 51 108
-+34 50 107  33 49 106  30 46 104  24 41 100  24 41 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 101  30 46 104  29 45 103  30 46 104  29 46 104  30 46 104
-+28 45 103  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+49 65 117  48 64 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 65 116  48 65 116  48 65 116
-+48 65 116  49 65 117  49 65 117  49 65 117  49 65 117  50 65 118
-+50 65 118  50 65 118  49 65 117  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  49 65 117
-+49 65 117  49 65 117  48 65 116  48 65 116  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  49 65 117  49 65 117  49 65 117  48 64 116  48 64 117
-+48 64 117  48 64 117  48 64 116  44 60 114  40 56 111  34 50 107
-+26 43 102  23 40 99  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  30 46 104  39 55 110  46 61 115  46 61 115
-+45 60 114  44 59 113  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  45 60 114  44 60 114  44 60 114  43 60 114  43 60 114
-+44 60 114  44 60 114  43 60 114  44 60 113  44 60 114  40 56 111
-+31 47 105  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+32 48 105  40 56 111  39 55 111  39 55 110  39 55 111  40 56 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  39 55 111  38 56 110  34 50 107  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  26 43 102  33 49 106  35 51 108  35 51 108
-+35 51 108  35 51 108  35 51 108  35 51 108  34 50 107  34 50 107
-+34 50 107  29 47 104  24 41 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+29 45 103  29 45 103  30 46 104  30 46 104  29 45 103  29 46 104
-+26 43 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+48 64 117  49 65 117  49 65 117  49 65 117  48 64 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 65 116  48 65 116  48 65 116  48 65 116  48 65 116  49 65 117
-+49 65 117  49 65 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 65 116
-+48 65 116  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  49 65 117  49 65 117
-+49 65 117  48 64 117  48 64 116  48 64 117  48 64 117  49 65 117
-+44 61 114  38 54 110  32 50 106  27 44 103  24 41 100  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+27 44 103  37 53 109  44 60 114  46 61 115  45 60 114  45 60 114
-+45 60 114  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+45 60 114  44 60 114  44 60 114  43 60 114  44 60 114  44 60 114
-+44 60 114  43 59 113  44 60 114  44 60 114  35 52 107  26 43 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  34 50 107
-+40 56 111  39 55 110  39 55 111  40 56 111  40 56 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  32 48 107  25 42 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 43 102  32 48 107  35 51 108  34 50 107  35 51 108
-+35 51 108  35 51 108  34 50 107  35 51 108  34 50 107  34 50 107
-+31 47 105  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 101  27 44 102
-+29 45 103  29 46 104  30 46 104  29 45 103  30 46 104  26 43 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+48 64 117  48 64 117  48 64 116  48 64 117  49 65 117  49 65 117
-+49 65 117  48 64 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 65 116  48 65 116
-+48 65 116  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 65 116  48 65 116  48 65 116  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  49 65 117  49 65 117  48 64 117  48 64 117
-+48 64 117  48 64 117  48 64 117  47 63 116  38 54 110  29 47 104
-+26 43 101  25 42 101  24 41 100  24 41 100  24 41 100  24 41 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 100  24 41 100  25 42 100  36 52 108
-+45 60 114  45 60 114  46 61 115  45 60 114  45 60 114  44 59 113
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  43 60 114  43 60 114  44 60 114  44 60 114  44 60 114
-+43 59 113  44 60 114  42 58 112  29 46 104  25 42 101  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  36 52 108  40 56 111
-+40 56 111  39 55 111  40 56 111  39 55 111  39 55 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+38 54 110  39 55 111  31 47 105  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 101  33 49 106  35 51 108  35 52 107  35 51 108  35 51 108
-+35 51 108  34 50 107  35 51 108  34 50 107  34 50 107  31 47 105
-+25 42 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  26 43 102  30 46 104
-+30 46 104  30 46 104  29 45 103  30 46 104  27 44 102  24 41 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+35 51 108  43 59 113  47 63 116  47 63 116  48 64 117  48 64 117
-+48 64 117  48 64 117  48 64 117  48 64 117  49 65 117  49 65 117
-+48 64 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 65 116  48 65 116  48 65 116  48 65 116  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  49 65 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 65 116  48 65 116  48 65 116
-+48 65 116  48 65 116  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  49 65 117  49 65 117  49 65 117  48 64 117
-+48 64 116  48 64 117  48 63 117  48 64 117  47 63 116  47 63 116
-+46 61 115  39 55 111  31 47 105  24 41 100  24 41 100  24 41 100
-+24 41 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  25 42 101  31 47 105  44 59 113  46 61 115
-+45 60 114  45 60 114  44 59 113  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  45 60 114  44 60 114  44 60 114  43 60 114
-+43 60 114  44 60 114  44 60 114  43 59 113  44 60 114  44 60 114
-+43 59 113  37 53 109  25 42 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  26 43 101  38 54 110  40 56 111  39 55 110
-+39 55 111  40 56 111  39 55 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 111  38 54 110  39 55 111
-+38 54 110  30 46 104  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  25 42 101
-+33 49 106  35 51 108  34 50 107  35 51 108  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  34 50 107  32 48 107  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  29 46 104  29 45 103
-+30 46 104  30 46 104  30 46 104  27 44 103  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  23 40 100  27 44 102  34 50 107  40 56 111  43 59 113
-+47 63 116  48 64 117  48 64 117  48 64 117  48 64 117  48 64 116
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  48 65 116
-+48 65 116  48 65 116  48 65 116  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  49 65 117  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 65 116  48 65 116
-+48 65 116  48 65 116  48 65 116  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  49 65 117
-+49 65 117  49 65 117  48 64 117  48 64 117  48 64 117  48 64 117
-+48 64 117  48 64 117  44 61 114  42 58 112  37 53 109  31 47 105
-+24 41 100  23 40 100  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+25 42 101  30 46 104  39 55 110  46 61 115  46 61 115  45 60 114
-+45 60 114  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  43 60 114  43 60 114  44 60 114
-+44 60 114  44 60 114  43 59 113  44 60 114  44 60 114  40 56 111
-+31 47 105  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  29 46 104  39 55 110  40 56 111  39 55 110  39 55 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  38 54 110
-+29 46 104  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  32 48 107
-+35 51 108  34 50 107  35 51 108  35 51 108  35 51 108  34 50 107
-+35 51 108  34 50 107  34 50 107  33 49 106  26 43 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  29 45 103  30 46 104  29 46 104
-+30 46 104  30 46 104  29 45 103  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  24 41 100  24 41 100  27 44 102
-+29 47 104  34 50 107  40 56 111  46 61 115  49 65 117  48 64 117
-+48 64 117  48 64 116  48 64 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 65 116  48 65 116
-+48 65 116  48 65 116  48 65 116  48 65 116  48 65 116  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+49 65 117  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 65 116  48 65 116
-+48 65 116  48 65 116  48 65 116  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  49 65 117  49 65 117  49 65 117  48 64 117
-+48 64 116  48 64 117  48 64 117  49 65 117  49 65 117  43 59 113
-+37 53 109  32 48 107  28 45 103  25 42 101  24 41 100  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  29 46 104
-+39 55 110  45 60 114  46 61 115  45 60 114  45 60 114  44 59 113
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  45 60 114
-+44 60 114  44 60 114  44 60 114  43 60 114  44 60 114  44 60 114
-+44 60 114  43 59 113  44 60 114  43 59 113  34 50 107  26 43 102
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+32 48 105  39 55 110  40 56 111  39 55 110  39 55 111  40 56 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 110  39 55 111  37 53 109  28 45 103
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  31 47 105  35 51 108
-+35 51 108  35 51 108  35 51 108  35 51 108  35 51 108  35 51 108
-+34 50 107  34 50 107  33 49 106  26 43 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 101  28 45 104  30 46 104  29 45 103  30 46 104
-+29 45 103  30 46 104  26 43 102  24 41 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+24 41 100  25 42 101  25 42 101  26 43 101  29 46 104  37 53 109
-+44 60 114  49 65 117  48 64 117  48 64 117  48 64 116  48 64 117
-+48 64 117  49 65 117  49 65 117  49 65 117  48 64 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 65 116  48 65 116
-+48 65 116  48 65 116  48 65 116  48 65 116  48 65 116  48 65 116
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  50 65 118  50 65 118  50 65 118
-+50 65 118  50 65 118  50 65 118  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 65 116  48 65 116  48 65 116
-+48 65 116  48 65 116  48 65 116  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  48 64 116  48 64 117  48 64 117
-+48 64 117  47 63 116  40 57 112  33 49 106  27 44 102  26 43 101
-+25 42 101  24 41 100  24 41 100  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 101  24 41 100  26 43 102  39 55 110  45 60 114
-+46 61 115  46 61 115  45 60 114  45 60 114  44 59 113  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  45 60 114  44 60 114
-+44 60 114  43 60 114  43 60 114  44 60 114  44 60 114  44 60 114
-+43 59 113  44 60 114  40 57 112  28 45 103  25 42 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  35 51 108
-+39 55 110  40 56 111  39 55 110  40 56 111  40 56 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  39 55 111  37 53 109  26 43 101  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  31 47 105  35 51 108  35 51 108
-+34 50 107  35 51 108  35 51 108  35 51 108  34 50 107  35 51 108
-+34 50 107  33 49 106  26 43 102  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  27 44 102  30 46 104  29 45 103  30 46 104  29 45 103
-+30 46 104  27 44 103  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+24 41 100  26 43 102  34 50 107  40 57 112  46 61 115  47 63 116
-+47 63 116  48 63 117  48 64 117  48 64 117  48 64 117  48 64 117
-+48 64 117  48 64 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 65 116  48 65 116  48 65 116  48 65 116  48 65 116  48 65 116
-+48 65 116  48 65 116  48 65 116  48 65 116  48 65 116  48 65 116
-+48 65 116  48 65 116  48 65 116  48 65 116  48 65 116  48 65 116
-+48 65 116  48 65 116  48 65 116  48 65 116  48 65 116  48 65 116
-+48 65 116  48 65 116  48 65 116  48 65 116  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  48 64 117  48 64 116  48 64 117  48 64 117  48 63 117
-+48 64 117  47 63 116  47 63 116  47 63 116  43 60 114  37 53 109
-+30 46 104  24 41 100  24 41 100  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+25 42 101  26 43 101  36 52 108  46 61 115  46 61 115  46 61 115
-+45 60 114  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  45 60 114  44 60 114  44 60 114  44 60 114  43 60 114
-+44 60 114  44 60 114  44 60 114  43 59 113  44 60 114  43 60 114
-+43 59 113  34 50 108  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  26 43 102  37 53 109  40 56 111
-+39 55 110  39 55 111  40 56 111  39 55 111  38 54 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  38 54 110
-+39 55 111  39 55 111  36 52 108  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  31 47 105  35 51 108  34 50 107  35 51 108
-+35 51 108  35 51 108  34 50 107  35 51 108  34 50 107  33 49 106
-+33 49 106  28 45 102  25 42 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+26 43 102  29 46 104  29 45 103  30 46 104  29 45 103  30 46 104
-+29 45 103  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  24 41 100  23 40 100  24 41 100  29 46 103
-+34 50 107  39 55 111  42 58 112  46 61 115  47 63 116  48 64 117
-+48 64 117  48 64 117  48 64 117  48 64 117  48 64 117  48 64 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  48 64 117  48 64 117  48 64 117  48 64 116
-+48 64 117  48 64 117  48 64 117  48 64 117  46 61 115  43 60 114
-+40 57 112  37 53 109  32 48 105  27 43 102  23 40 100  23 40 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 100  24 41 100  24 41 100  27 44 103
-+34 50 107  44 60 114  46 61 115  46 61 115  45 60 114  45 60 114
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+45 60 114  44 60 114  44 60 114  43 60 114  43 60 114  44 60 114
-+44 60 114  44 60 114  43 59 113  44 60 114  43 59 113  38 54 110
-+28 45 103  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  28 45 103  37 53 109  40 56 111  39 55 110
-+39 55 111  40 56 111  39 55 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 110  34 50 107  25 42 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  29 47 104  34 50 108  34 50 107  35 51 108  35 51 108
-+35 51 108  34 50 107  35 51 108  34 50 107  34 50 107  33 49 106
-+28 45 103  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+29 45 103  30 46 104  29 46 104  29 45 103  30 46 104  29 45 103
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+24 41 100  24 41 100  26 43 102  29 45 103  31 47 105  34 50 107
-+39 55 111  43 59 113  48 63 117  49 65 117  48 64 117  48 64 117
-+48 64 117  48 64 117  48 64 117  48 64 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  48 64 117
-+48 64 117  48 64 116  48 64 117  48 64 117  49 65 117  50 65 118
-+46 61 115  40 57 112  37 53 109  32 50 106  30 46 104  27 44 102
-+24 41 101  24 41 100  24 41 100  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  27 44 102  36 52 108  42 58 112
-+46 61 115  46 61 115  45 60 114  45 60 114  44 59 113  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  43 60 114  43 60 114  44 60 114  44 60 114  44 60 114
-+43 59 113  44 60 114  44 61 114  40 57 112  31 47 105  25 42 101
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  32 48 105  38 54 110  40 56 111  38 56 110  40 56 111
-+40 56 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  39 55 111  39 55 111
-+31 47 105  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+30 46 104  34 50 107  35 51 108  35 51 108  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  34 50 107  34 50 107  27 44 103
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  29 46 104
-+30 46 104  29 45 103  30 46 104  30 46 104  29 45 103  26 43 101
-+24 41 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 101  24 41 100  24 41 100  24 41 100  25 42 101
-+25 42 101  26 43 101  27 43 101  29 47 104  36 52 108  40 57 112
-+46 61 115  48 64 117  48 64 117  48 64 117  48 64 117  48 64 117
-+48 64 117  48 64 117  48 64 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  48 64 117  48 64 116  48 64 117  48 64 117  48 64 117
-+48 64 117  49 65 117  44 60 114  39 55 110  34 50 107  27 44 103
-+26 43 101  25 42 101  25 42 101  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  25 42 101  36 52 108  44 60 114  45 60 114  46 61 115
-+45 60 114  45 60 114  45 60 114  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  45 60 114  44 60 114  44 60 114
-+44 60 114  43 60 114  44 60 114  44 60 114  44 60 114  43 60 114
-+44 60 114  43 59 113  34 50 107  25 42 101  24 41 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+34 50 107  39 55 110  40 56 111  39 55 110  39 55 111  40 56 111
-+39 55 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 110  39 55 111  39 55 111  29 45 103
-+24 41 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  30 46 104
-+35 51 108  35 51 108  34 50 107  35 51 108  35 51 108  35 51 108
-+34 50 107  35 51 108  33 49 106  34 50 107  28 45 103  24 41 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  29 45 103  30 46 104
-+29 45 103  30 46 104  29 45 103  29 46 104  27 43 102  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 101  24 41 100  24 41 100  24 41 100
-+23 40 100  27 44 102  32 50 106  37 53 109  42 58 112  46 61 115
-+47 63 116  47 63 116  47 63 116  47 63 116  48 64 117  48 64 117
-+48 63 117  48 64 117  48 64 117  48 64 116  48 64 117  48 64 117
-+48 64 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  48 64 117  48 64 117  48 64 116  48 64 117
-+49 65 117  48 64 117  48 64 117  48 64 117  48 64 117  47 63 116
-+47 63 116  47 63 116  46 61 115  44 61 114  40 56 111  35 52 107
-+29 46 103  25 42 101  24 41 100  24 41 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  25 42 101  26 43 102
-+34 50 107  45 60 114  46 61 115  45 60 114  45 60 114  44 59 113
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  44 60 114  43 60 114  43 60 114  44 60 114
-+44 60 114  44 60 114  43 59 113  44 60 114  44 60 114  43 59 113
-+39 55 111  28 45 102  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  26 43 102  36 52 108
-+40 56 111  39 55 110  39 55 111  40 56 111  39 55 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  37 53 109  27 44 102  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  30 46 104  35 51 108
-+34 50 107  35 51 108  35 51 108  35 51 108  34 50 107  35 51 108
-+34 50 107  33 49 106  34 50 107  29 46 103  25 42 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  27 44 102  29 46 104  30 46 104
-+30 46 104  29 45 103  30 46 104  27 44 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  23 40 100  23 40 99  24 41 100
-+28 45 103  31 47 105  35 52 107  38 54 110  40 57 112  42 58 112
-+44 60 114  46 61 115  47 63 116  48 64 117  48 64 117  48 64 117
-+48 64 117  49 65 117  48 64 117  48 64 117  48 64 117  48 64 117
-+48 64 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  48 64 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  48 64 117  48 64 117  48 64 117  48 64 116  48 64 117
-+48 64 117  48 64 117  48 64 117  48 64 117  48 64 117  48 64 117
-+47 63 116  46 61 115  43 59 113  42 58 112  40 56 111  36 52 108
-+34 50 106  30 46 104  26 43 101  23 40 99  23 40 100  24 41 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  24 41 100  29 45 103  35 52 107  44 60 114
-+46 61 115  46 61 115  45 60 114  45 60 114  44 59 113  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  45 60 114
-+44 60 114  44 60 114  43 60 114  43 60 114  44 60 114  44 60 114
-+44 60 114  43 59 113  44 60 114  44 60 114  40 56 111  33 49 106
-+24 41 100  24 41 100  24 41 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  29 45 103  38 54 109  40 56 111
-+39 55 110  40 56 111  40 56 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+38 54 110  39 55 111  36 52 108  27 44 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  30 46 104  35 51 108  34 50 107
-+35 51 108  35 51 108  35 51 108  34 50 107  35 51 108  34 50 107
-+34 50 107  34 50 107  30 46 104  24 41 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  26 43 102  29 45 103  30 46 104  30 46 104
-+29 45 103  30 46 104  28 45 103  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  26 43 102
-+28 45 103  30 46 104  31 47 105  33 49 106  36 52 108  38 56 110
-+42 57 112  44 60 114  47 63 116  50 65 118  50 65 118  49 65 117
-+48 64 117  49 65 117  48 64 117  48 64 117  48 64 117  48 64 117
-+48 64 117  48 64 117  48 64 117  48 64 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+48 64 117  48 64 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  49 65 117  49 65 117
-+49 65 117  49 65 117  49 65 117  49 65 117  48 64 117  48 64 117
-+48 64 117  48 64 117  48 64 116  48 64 117  48 64 117  48 64 117
-+49 64 117  48 64 117  49 65 117  49 65 117  50 65 118  48 64 117
-+46 61 115  43 59 113  40 57 112  38 54 110  34 50 107  32 50 106
-+31 47 105  29 45 103  27 44 102  25 42 101  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  29 46 104  38 54 109  43 59 113  46 61 115  46 61 115
-+45 60 114  45 60 114  44 59 113  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  45 60 114  45 60 114  44 60 114
-+44 60 114  43 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+43 59 113  44 60 114  43 59 113  34 50 107  26 43 102  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  33 49 106  39 55 110  40 56 111  39 55 110
-+39 55 111  40 56 111  39 55 111  39 55 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  38 54 110  38 54 111
-+39 55 111  34 50 107  26 43 102  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  30 46 104  34 50 107  35 51 108  35 51 108
-+35 51 108  35 51 108  35 51 108  35 51 108  34 50 107  34 50 107
-+34 50 107  30 46 104  25 42 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  26 43 101  29 46 104  30 46 104  29 45 103  29 45 103
-+30 46 104  29 45 103  25 42 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  26 43 101  26 43 102  26 43 102  29 47 104  32 50 106
-+36 52 108  39 55 110  40 57 112  44 61 114  47 63 116  49 64 117
-+48 64 117  48 64 117  48 64 117  48 64 117  48 64 117  48 64 117
-+48 64 117  48 64 117  48 64 117  48 64 117  48 64 117  48 64 116
-+48 64 117  48 64 117  48 64 117  48 64 117  48 64 117  48 64 117
-+48 64 117  48 64 117  48 64 117  48 64 117  48 64 117  48 64 117
-+49 65 117  49 65 117  48 64 117  48 64 117  48 64 117  48 64 117
-+48 64 117  48 64 117  48 64 117  48 64 117  48 64 117  48 64 117
-+48 64 117  48 64 117  48 64 117  48 64 116  48 64 117  48 64 117
-+48 64 117  48 64 117  48 64 117  48 64 117  48 64 117  48 64 117
-+48 64 117  48 64 117  49 65 117  48 64 116  46 61 115  43 59 113
-+40 57 112  37 53 109  34 50 107  31 47 105  28 45 103  26 43 102
-+26 43 102  26 43 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 101  24 41 100  23 40 100  29 46 104
-+40 56 111  45 60 114  46 61 115  46 61 115  45 60 114  45 60 114
-+45 60 114  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  45 60 114  44 60 114  44 60 114  43 60 114
-+43 60 114  44 60 114  44 60 114  44 60 114  43 59 113  44 60 114
-+44 61 114  37 53 109  26 43 102  25 42 101  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  36 52 108  39 55 110  40 56 111  39 55 110  39 55 111
-+40 56 111  39 55 111  38 54 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  39 55 111  39 55 111
-+31 47 105  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  30 46 104  35 51 108  35 51 108  34 50 107  35 51 108
-+35 51 108  35 51 108  34 50 107  35 51 108  33 49 106  34 50 107
-+29 46 104  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  29 46 104  29 45 103  29 45 103  30 46 104  30 46 104
-+29 45 103  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  23 40 100  24 41 100
-+27 44 102  29 45 103  31 47 105  34 50 106  35 51 108  37 53 109
-+39 55 110  40 57 112  42 58 112  43 60 114  46 61 115  46 61 115
-+46 61 115  46 61 115  46 61 115  47 63 116  47 63 116  47 63 116
-+47 63 116  47 63 116  47 63 116  47 63 116  47 63 116  47 63 116
-+47 63 116  47 63 116  47 63 116  47 63 116  47 63 116  47 63 116
-+47 63 116  47 63 116  47 63 116  47 63 116  47 63 116  47 63 116
-+46 61 115  46 61 115  46 61 115  46 61 115  44 61 114  43 59 113
-+40 57 112  40 56 111  38 56 110  36 52 108  34 50 107  32 50 106
-+29 47 104  27 44 102  25 42 101  23 40 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  25 42 100  25 42 101  30 46 104  40 57 112  46 61 115
-+46 61 115  45 60 114  45 60 114  44 59 113  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  44 60 114  43 60 114  43 60 114  44 60 114  44 60 114
-+44 60 114  43 59 113  44 60 114  44 60 114  43 59 113  40 56 111
-+29 46 103  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  27 44 102
-+38 56 110  40 56 111  39 55 110  40 56 111  40 56 111  40 56 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 110  39 55 111  38 54 110  29 47 104
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+30 46 104  35 51 108  34 50 107  35 51 108  35 51 108  35 51 108
-+34 50 107  35 51 108  34 50 107  33 49 106  34 50 107  30 46 104
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 100
-+29 45 103  29 45 103  30 46 104  30 46 104  30 46 104  29 45 103
-+26 43 102  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 101
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  23 40 100
-+23 40 100  23 40 100  23 40 100  23 40 99  23 40 99  23 40 100
-+24 41 100  25 42 101  26 43 101  27 44 102  27 44 103  28 45 103
-+29 45 103  29 46 104  29 46 104  29 47 104  29 47 104  29 47 104
-+29 47 104  31 47 105  29 47 104  29 47 104  29 47 104  30 46 104
-+29 46 104  29 46 104  29 46 104  28 45 103  27 44 102  27 44 102
-+26 43 101  25 42 101  24 41 100  23 40 99  23 40 99  23 40 100
-+23 40 100  23 40 100  23 40 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+27 44 102  33 49 106  40 56 111  46 61 115  46 61 115  45 60 114
-+45 60 114  44 59 113  44 59 113  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  45 60 114  44 60 114  44 60 114
-+44 60 114  43 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+43 60 114  44 60 114  44 60 114  40 56 111  33 49 106  25 42 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  25 42 101  31 47 105  40 56 111
-+40 56 111  39 55 110  39 55 111  40 56 111  39 55 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+38 54 110  38 54 111  39 55 111  36 52 108  28 45 104  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  30 46 104
-+34 50 108  34 50 107  35 51 108  35 51 108  35 51 108  34 50 107
-+35 51 108  34 50 107  34 50 107  34 50 107  29 47 104  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  27 44 103
-+29 46 104  30 46 104  30 46 104  29 45 103  30 46 104  27 44 102
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 100  24 41 100  23 40 100  29 46 103  37 53 109
-+42 57 112  46 61 115  46 61 115  45 60 114  45 60 114  44 59 113
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  45 60 114  45 60 114  44 60 114  44 60 114  43 60 114
-+43 60 114  44 60 114  44 60 114  44 60 114  44 60 114  43 59 113
-+44 60 114  42 58 112  33 49 106  26 43 102  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  26 43 102  35 51 108  40 56 111  40 56 111
-+39 55 110  39 55 111  40 56 111  39 55 111  38 54 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  38 54 110
-+39 55 111  39 55 111  34 50 107  26 43 102  24 41 100  25 42 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  29 47 104  34 50 107
-+35 51 108  35 51 108  35 51 108  35 51 108  35 51 108  35 51 108
-+34 50 107  34 50 107  34 50 107  30 46 104  25 42 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  27 44 102  29 46 104
-+30 46 104  30 46 104  29 45 103  30 46 104  27 44 103  25 42 100
-+24 41 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  31 47 105  40 56 111  45 60 114  45 60 114
-+46 61 115  46 61 115  45 60 114  45 60 114  44 59 113  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+45 60 114  44 60 114  44 60 114  43 60 114  43 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  43 59 113  44 60 114  44 60 114
-+34 50 107  26 43 101  25 42 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 101
-+24 41 100  29 46 103  38 54 110  40 56 111  40 56 111  39 55 111
-+40 56 111  40 56 111  39 55 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+38 54 111  32 48 105  25 42 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  31 47 105  35 51 108  35 51 108
-+34 50 107  35 51 108  35 51 108  35 51 108  34 50 107  35 51 108
-+33 49 106  34 50 107  30 46 104  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  26 43 102  30 46 104  30 46 104
-+29 46 104  29 45 103  30 46 104  28 45 103  25 42 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  25 42 101  26 43 101
-+32 48 107  42 58 112  46 61 115  46 61 115  45 60 114  45 60 114
-+44 59 113  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  44 60 114
-+43 60 114  43 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+43 59 113  44 60 114  44 60 114  43 59 113  37 53 109  26 43 102
-+24 41 100  25 42 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  25 42 101
-+33 49 106  40 56 111  40 56 111  39 55 110  39 55 111  40 56 111
-+39 55 111  38 54 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 110  38 54 111  39 55 111  38 54 110
-+30 48 104  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  24 41 100  31 47 105  35 51 108  34 50 107  35 51 108
-+35 51 108  35 51 108  34 50 107  35 51 108  34 50 107  33 49 106
-+34 50 107  30 46 104  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  25 42 101  30 46 104  29 45 103  30 46 104
-+29 46 104  30 46 104  29 45 103  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 100
-+24 41 100  24 41 100  26 43 101  30 46 104  36 52 108  44 59 113
-+47 63 116  46 61 115  45 60 114  45 60 114  44 59 113  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  45 60 114  44 60 114  44 60 114  44 60 114  43 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  43 59 113  44 60 114
-+44 60 114  42 58 112  37 53 109  29 46 103  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  27 44 102  36 52 108
-+40 56 111  39 55 110  39 55 111  40 56 111  40 56 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  39 55 111  39 55 111  36 52 108  28 45 103
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  31 47 105  35 51 108  34 50 107  35 51 108  35 51 108
-+35 51 108  34 50 107  35 51 108  34 50 107  34 50 107  34 50 107
-+29 47 104  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 101
-+24 41 100  26 43 101  29 46 104  29 45 103  30 46 104  29 46 104
-+30 46 104  29 46 104  26 43 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  23 40 100
-+27 44 103  35 52 107  40 56 111  45 60 114  46 61 115  46 61 115
-+45 60 114  45 60 114  45 60 114  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  45 60 114
-+45 60 114  44 60 114  44 60 114  43 60 114  43 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  43 59 113  44 60 114  43 60 114
-+36 52 108  29 46 103  24 41 101  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  31 47 105  38 54 109  40 56 111
-+40 56 111  39 55 111  40 56 111  39 55 111  39 55 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  34 50 107  26 43 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+32 48 107  35 51 108  35 51 108  35 51 108  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  34 50 107  34 50 107  30 46 104
-+25 42 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  29 45 103  29 46 103  30 46 104  30 46 104  29 45 103
-+29 46 104  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  24 41 100  31 47 105  39 55 111
-+44 60 114  45 60 114  46 61 115  46 61 115  45 60 114  45 60 114
-+44 59 113  44 59 113  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  45 60 114  44 60 114
-+44 60 114  43 60 114  43 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  43 59 113  44 60 114  44 60 114  38 54 110  27 44 103
-+25 42 101  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  26 43 101  36 52 108  39 55 110  40 56 111  39 55 110
-+39 55 111  40 56 111  39 55 111  38 54 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  38 54 110
-+39 55 111  39 55 111  31 47 105  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 101  33 49 106
-+35 51 108  35 51 108  34 50 107  35 51 108  35 51 108  35 51 108
-+34 50 107  35 51 108  33 49 106  34 50 107  29 46 104  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 101
-+28 45 104  30 46 104  29 45 103  30 46 104  29 45 103  30 46 104
-+26 43 102  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  24 41 100  24 41 100
-+25 42 101  27 44 102  34 50 107  43 59 113  46 61 115  46 61 115
-+45 60 114  45 60 114  44 59 113  44 59 113  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+45 60 114  44 60 114  44 60 114  44 60 114  43 60 114  43 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  43 59 113  44 60 114
-+44 60 114  43 59 113  39 55 111  29 45 103  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 101  24 41 100  25 42 101
-+28 45 103  38 54 109  40 56 111  39 55 110  39 55 111  40 56 111
-+40 56 111  38 54 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  39 55 111  39 55 111
-+37 53 109  28 45 103  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  26 43 101  33 49 106  35 51 108
-+34 50 107  35 51 108  35 51 108  35 51 108  34 50 107  35 51 108
-+34 50 107  33 49 106  34 50 107  30 46 104  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 101  28 45 103
-+30 46 104  29 46 104  30 46 104  30 46 104  30 46 104  27 44 102
-+24 41 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  25 42 101  28 45 103  32 50 106
-+39 55 111  44 60 115  47 63 116  46 61 115  45 60 114  45 60 114
-+45 60 114  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  45 60 114  45 60 114
-+44 60 114  44 60 114  43 60 114  43 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  43 59 113  44 60 114  44 60 114  42 58 112
-+38 54 110  30 46 104  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  26 43 102  33 49 106
-+40 56 111  40 56 111  39 55 110  40 56 111  40 56 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 110  39 55 111  39 55 111  34 50 107
-+25 42 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  26 43 102  32 50 106  35 51 108  34 50 107
-+35 51 108  35 51 108  35 51 108  34 50 107  35 51 108  34 50 107
-+34 50 107  34 50 107  30 46 104  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  27 44 103  30 46 104
-+29 45 103  30 46 104  29 45 103  30 46 104  27 44 102  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+23 40 99  27 44 102  34 50 107  39 55 110  43 58 114  46 61 115
-+46 61 115  45 60 114  45 60 114  45 60 114  44 59 113  44 59 113
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  44 60 114
-+43 60 114  43 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  43 59 113  44 60 114  43 59 113  36 52 108  29 46 103
-+25 42 101  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  29 46 104  37 53 109  40 56 111
-+40 56 111  39 55 110  39 55 111  40 56 111  39 55 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  39 55 111  39 55 110  31 47 105  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  26 43 102  34 50 107  35 51 108  35 52 107  35 51 108
-+35 51 108  35 51 108  35 51 108  35 51 108  34 50 107  34 50 107
-+34 50 107  29 46 103  25 42 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  27 44 102  30 46 104  29 45 103
-+30 46 104  29 45 103  30 46 104  28 45 103  25 42 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  24 41 100  31 47 105
-+40 56 111  44 60 114  45 60 114  46 61 115  46 61 115  46 61 115
-+45 60 114  45 60 114  44 59 113  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+45 60 114  45 60 114  44 60 114  44 60 114  44 60 114  43 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  43 59 113  43 60 114
-+44 60 114  44 60 114  36 52 108  27 44 102  25 42 101  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 100  33 49 106  39 55 110  40 56 111  39 55 110
-+39 55 111  40 56 111  40 56 111  39 55 111  38 54 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+38 54 110  39 55 111  37 53 109  26 43 102  25 42 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+27 44 102  34 50 107  35 51 108  34 50 107  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  35 51 108  34 50 106  34 50 107
-+28 45 103  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  26 43 102  30 46 104  29 45 103  30 46 104
-+29 46 104  30 46 104  29 45 103  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  24 41 100  24 41 100
-+25 42 101  25 42 101  29 46 104  38 54 110  44 60 115  46 61 115
-+46 61 115  45 60 114  45 60 114  45 60 114  44 59 113  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  45 60 114  45 60 114  44 60 114  44 60 114
-+44 60 114  43 60 114  43 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  43 59 113  44 60 114  44 60 114  43 59 113  42 58 112
-+36 52 108  26 43 101  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  25 42 101
-+27 44 102  38 54 109  40 56 111  39 55 110  39 55 111  40 56 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  38 54 110  39 55 111
-+38 54 110  34 50 108  25 42 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  28 45 103
-+34 50 107  34 50 107  35 51 108  35 51 108  35 51 108  35 51 108
-+34 50 107  35 51 108  34 50 107  33 49 106  33 49 106  28 45 103
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 101
-+24 41 100  26 43 102  30 46 104  29 45 103  30 46 104  29 45 103
-+30 46 104  29 46 104  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  24 41 100  25 42 101  28 45 103  32 48 107
-+37 53 109  43 59 113  46 61 115  46 61 115  46 61 115  45 60 114
-+45 60 114  44 59 113  44 59 113  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  44 60 114  44 60 114  43 60 114
-+43 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  43 60 114  40 56 111  34 50 107  27 43 102
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  26 43 101  33 49 106
-+40 56 111  40 56 111  39 55 110  39 55 111  40 56 111  39 55 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 110  39 55 111  39 55 111  37 53 109
-+31 47 105  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  28 45 103  34 50 107
-+35 51 108  35 51 108  35 51 108  35 51 108  35 51 108  35 51 108
-+35 51 108  34 50 107  34 50 107  33 49 106  28 45 103  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+26 43 101  29 46 104  29 45 103  30 46 104  30 46 104  30 46 104
-+29 45 103  26 43 101  25 42 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 101  24 41 100  23 40 100
-+24 41 100  29 46 104  36 52 108  40 56 111  43 58 114  46 61 115
-+46 61 115  46 61 115  45 60 114  45 60 114  45 60 114  44 59 113
-+44 59 113  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  45 60 114  45 60 114
-+44 60 114  44 60 114  44 60 114  43 60 114  43 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  43 59 113  44 60 114  44 60 114
-+44 60 114  38 54 109  31 47 105  26 44 102  24 41 100  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  30 46 104  37 53 109  40 56 111
-+40 56 111  39 55 111  40 56 111  40 56 111  39 55 111  38 54 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  39 55 111  39 55 111  34 50 107  27 44 102
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 101  30 46 104  34 50 107  35 51 108
-+34 50 107  35 51 108  35 51 108  35 51 108  34 50 107  35 51 108
-+34 50 107  34 50 107  33 49 106  27 44 102  24 41 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  26 43 101
-+29 46 104  29 45 103  29 46 104  30 46 104  29 45 103  30 46 104
-+26 43 102  24 41 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  24 41 100  25 42 100  30 46 104  37 53 109
-+43 58 114  45 60 114  45 60 114  46 61 115  46 61 115  46 61 115
-+45 60 114  45 60 114  45 60 114  44 59 113  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  44 60 114
-+44 60 114  43 60 114  43 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  37 53 109
-+28 45 103  25 42 101  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  25 42 101  35 51 108  39 55 110  40 56 111  40 56 111
-+39 55 110  40 56 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 111  32 48 107  25 42 101  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  31 47 105  34 50 107  35 51 108  34 50 107
-+35 51 108  35 51 108  35 51 108  34 50 107  35 51 108  34 50 107
-+34 50 107  33 49 106  26 43 102  25 42 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  29 46 104
-+30 46 104  29 46 104  30 46 104  29 45 103  30 46 104  26 43 102
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+35 51 108  28 45 103  25 42 101  25 42 101  24 41 101  24 41 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  24 41 100  24 41 100  25 42 101  25 42 101
-+26 43 102  31 47 105  38 54 110  45 60 114  46 61 115  46 61 115
-+45 60 114  45 60 114  45 60 114  45 60 114  44 59 113  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  44 60 114  44 60 114  43 60 114  43 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  43 59 113  42 58 112  36 52 108  26 43 102  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  25 42 101
-+28 45 103  38 54 110  40 56 111  39 55 110  39 55 111  40 56 111
-+39 55 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  38 54 110  39 55 111
-+38 54 110  38 54 110  28 45 103  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  31 47 105  35 51 108  34 50 107  35 51 108  35 51 108
-+35 51 108  34 50 107  35 51 108  35 51 108  34 50 107  34 50 107
-+33 49 106  27 43 102  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  29 45 103  30 46 104
-+29 46 104  29 45 103  30 46 104  30 46 104  27 44 102  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+46 61 115  46 61 115  43 58 114  38 54 110  33 49 106  30 46 104
-+27 44 102  25 42 100  24 41 100  24 41 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  24 41 100
-+24 41 100  25 43 102  28 45 103  31 47 105  35 51 108  40 56 111
-+45 60 114  47 63 116  46 61 115  46 61 115  45 60 114  45 60 114
-+45 60 114  44 59 113  44 59 113  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  45 60 114  45 60 114  44 60 114  44 60 114
-+44 60 114  43 60 114  43 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  43 59 113  44 60 114  44 60 114  43 59 113
-+39 55 110  34 50 106  26 43 102  23 40 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  27 44 102  34 50 107
-+40 56 111  40 56 111  39 55 110  40 56 111  40 56 111  39 55 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  38 54 110
-+34 50 107  26 43 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  26 43 101
-+32 48 105  35 51 108  35 52 107  35 51 108  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  34 50 107  34 50 107  32 48 107
-+26 43 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  29 45 103  30 46 104  29 45 103
-+30 46 104  30 46 104  30 46 104  27 44 102  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+45 60 114  45 60 114  46 61 115  46 61 115  46 61 115  44 60 114
-+42 57 112  39 55 110  35 51 108  29 47 104  25 42 101  23 40 100
-+24 41 100  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  23 40 100  24 41 100  27 44 103  32 48 107
-+37 53 109  40 56 111  43 58 114  46 61 115  46 61 115  46 61 115
-+46 61 115  45 60 114  45 60 114  45 60 114  44 59 113  44 59 113
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+45 60 114  45 60 114  44 60 114  44 60 114  44 60 114  43 60 114
-+43 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 61 114  40 57 112  34 50 107  30 46 104
-+25 42 101  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 100  32 50 106  38 54 110  40 56 111
-+40 56 111  39 55 110  39 55 111  40 56 111  39 55 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 110  39 55 111  37 53 109  29 46 103
-+25 42 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 101  24 41 100  27 44 102  33 49 106
-+35 51 108  34 50 107  35 51 108  35 51 108  35 51 108  35 51 108
-+34 50 107  35 51 108  34 50 107  34 50 107  31 47 105  26 43 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  28 45 103  30 46 104  29 45 103  30 46 104
-+29 45 103  30 46 104  27 44 102  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  46 61 115
-+46 61 115  46 61 115  45 60 114  45 60 114  44 60 114  40 57 112
-+35 52 107  28 45 103  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  24 41 100  24 41 100
-+25 42 101  31 47 105  38 54 109  43 59 113  44 60 114  45 60 114
-+46 61 115  46 61 115  46 61 115  46 61 115  45 60 114  45 60 114
-+45 60 114  44 59 113  44 59 113  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  44 60 114  44 60 114  43 60 114  43 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  43 59 113  44 60 114
-+44 60 114  40 57 112  31 47 105  26 43 101  25 42 101  24 41 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  28 45 103  38 54 109  39 55 110  40 56 111  39 55 110
-+39 55 111  40 56 111  40 56 111  39 55 111  38 54 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+38 54 110  39 55 111  39 55 111  34 50 107  26 43 102  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  28 45 103  34 50 107  35 51 108
-+34 50 107  35 51 108  35 51 108  35 51 108  35 51 108  34 50 107
-+35 51 108  34 50 107  34 50 107  31 47 105  25 42 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  28 45 103  30 46 104  29 45 103  30 46 104  29 45 103
-+30 46 104  28 45 103  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+45 60 114  45 60 114  45 60 114  45 60 114  44 59 113  44 59 113
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  46 61 115
-+46 61 115  46 61 115  45 60 114  40 56 111  34 50 107  29 46 103
-+26 43 101  25 42 101  25 42 101  24 41 101  24 41 100  24 41 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  25 42 101
-+25 42 101  26 43 101  27 43 102  31 47 105  37 53 109  42 58 112
-+47 63 116  46 61 115  46 61 115  46 61 115  45 60 114  45 60 114
-+45 60 114  44 59 113  44 59 113  44 59 113  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  44 60 114  44 60 114  43 60 114  43 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  43 59 113
-+44 60 114  44 60 114  44 60 114  43 59 113  43 59 113  37 53 109
-+28 45 103  23 40 100  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  26 43 101
-+34 50 107  40 56 111  40 56 111  39 55 110  39 55 111  40 56 111
-+40 56 111  39 55 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  38 54 110  39 55 111
-+39 55 111  38 54 110  29 46 104  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  28 45 103  34 50 108  35 51 108  35 51 108
-+35 51 108  35 51 108  35 51 108  35 51 108  35 51 108  35 51 108
-+34 50 107  33 49 106  31 47 105  25 42 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+27 44 103  30 46 104  29 45 103  29 46 104  30 46 104  30 46 104
-+29 45 103  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 59 113  44 59 113  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  46 61 115  46 61 115  47 63 116
-+45 60 114  40 56 111  37 53 109  33 49 106  29 47 104  28 45 103
-+26 43 102  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  25 42 101  27 44 102  29 46 103  31 47 105  34 50 107
-+38 54 110  42 58 112  46 61 115  47 63 116  46 61 115  46 61 115
-+45 60 114  45 60 114  45 60 114  45 60 114  44 59 113  44 59 113
-+44 59 113  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  45 60 114  45 60 114  44 60 114  44 60 114
-+44 60 114  43 60 114  43 60 114  43 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  42 58 112  38 54 110  32 50 106  26 43 102  23 40 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  25 42 101  29 47 104  38 54 110
-+40 56 111  40 56 111  39 55 111  40 56 111  40 56 111  39 55 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  39 55 111  38 56 110
-+34 50 107  26 43 102  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  30 46 104  35 51 108  35 51 108  34 50 107  35 51 108
-+35 51 108  35 51 108  34 50 107  35 51 108  34 50 107  34 50 107
-+33 49 106  30 46 104  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 101  27 44 103
-+30 46 104  29 45 103  30 46 104  29 45 103  30 46 104  27 44 103
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 59 113  44 59 113
-+44 59 113  44 59 113  45 60 114  45 60 114  45 60 114  45 60 114
-+46 61 115  46 61 115  46 61 115  46 61 115  45 60 114  43 58 114
-+40 56 111  38 54 110  36 52 108  32 48 107  28 45 103  25 42 101
-+23 40 100  23 40 100  24 41 100  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+24 41 100  23 40 100  23 40 100  26 43 102  29 47 104  34 50 107
-+37 53 109  39 55 111  42 57 112  44 59 113  46 61 115  46 61 115
-+46 61 115  46 61 115  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 59 113  44 59 113  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+45 60 114  45 60 114  44 60 114  44 60 114  44 60 114  43 60 114
-+43 60 114  43 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  43 59 113  44 60 114  44 60 114  44 60 114  39 55 110
-+33 49 106  28 45 103  25 42 101  24 41 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  29 46 104  36 52 108  40 56 111  40 56 111
-+40 56 111  40 56 111  40 56 111  39 55 111  39 55 111  38 54 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  39 55 111  39 55 111  37 53 109  29 46 104
-+25 42 101  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 43 102
-+32 48 107  35 51 108  35 51 108  34 50 107  35 51 108  35 51 108
-+35 51 108  34 50 107  35 51 108  34 50 107  34 50 107  33 49 106
-+27 44 103  24 41 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 101  28 45 103  30 46 104
-+29 45 103  30 46 104  29 46 104  30 46 104  28 45 103  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 59 113  44 59 113  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  46 61 115  46 61 115
-+46 61 115  46 61 115  45 60 114  45 60 114  44 60 114  44 60 114
-+42 57 112  37 53 109  34 50 106  29 46 104  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  23 40 100  26 43 102  31 47 105
-+35 51 108  39 55 110  43 58 114  44 60 114  45 60 114  45 60 114
-+46 61 115  46 61 115  46 61 115  46 61 115  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 59 113  44 59 113  44 59 113
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  44 60 114  44 60 114  43 60 114  43 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  43 59 113
-+44 60 114  44 60 114  42 58 112  34 50 108  27 44 102  25 42 101
-+25 42 101  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+26 43 101  35 51 108  39 55 110  40 56 111  40 56 111  39 55 110
-+39 55 111  40 56 111  39 55 111  38 54 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  33 49 106  26 43 101  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  33 49 106
-+35 51 108  34 50 107  35 51 108  35 51 108  35 51 108  35 51 108
-+34 50 107  35 51 108  34 50 107  33 49 106  33 49 106  27 44 102
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  27 44 103  30 46 104  29 45 103
-+30 46 104  30 46 104  29 45 103  29 46 103  25 42 100  24 41 100
-+24 41 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 59 113  44 59 113  44 59 113
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+46 61 115  46 61 115  46 61 115  46 61 115  47 63 116  44 59 113
-+39 55 111  36 52 108  32 48 105  27 44 103  26 43 102  26 43 101
-+25 42 101  25 42 101  25 42 101  24 41 101  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  26 43 101  27 44 102  30 46 104
-+34 50 107  37 53 109  40 57 112  44 60 115  46 61 115  46 61 115
-+46 61 115  46 61 115  46 61 115  45 60 114  45 60 114  45 60 114
-+45 60 114  44 59 113  44 59 113  44 59 113  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  45 60 114  45 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  43 60 114  43 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+43 59 113  44 60 114  44 60 114  44 60 114  43 59 113  42 58 112
-+38 54 110  29 46 104  24 41 100  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 100  25 42 101  31 47 105
-+39 55 111  40 56 111  39 55 110  40 56 111  40 56 111  39 55 111
-+39 55 111  38 54 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 111  38 54 110  39 55 111
-+38 54 110  38 54 110  29 46 103  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 101  26 43 102  34 50 107  35 51 108
-+34 50 107  35 51 108  35 51 108  35 51 108  35 51 108  35 51 108
-+35 51 108  34 50 107  34 50 107  33 49 106  27 43 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  27 44 102  30 46 104  29 45 103  30 46 104
-+29 45 103  30 46 104  29 45 103  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+45 60 114  45 60 114  44 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 59 113  44 59 113  44 59 113  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  46 61 115
-+46 61 115  46 61 115  47 63 116  47 63 116  46 61 115  43 58 114
-+40 56 111  38 54 110  35 51 108  33 49 106  31 47 105  30 46 104
-+29 45 103  27 44 102  26 43 102  25 42 101  24 41 100  24 41 100
-+24 41 100  24 41 100  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 101  25 43 102
-+27 44 102  27 44 103  29 46 104  31 47 105  32 48 105  34 50 107
-+36 52 108  38 54 110  42 57 112  44 60 114  47 63 116  47 63 116
-+46 61 115  46 61 115  46 61 115  46 61 115  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 59 113  44 59 113  44 59 113
-+44 59 113  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  44 60 114
-+44 60 114  43 60 114  43 60 114  43 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  43 60 114  40 57 112  37 53 109  32 50 106  25 42 101
-+23 40 100  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  25 42 101  30 46 104  37 53 109  40 56 111
-+40 56 111  39 55 110  39 55 111  40 56 111  39 55 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  38 54 110
-+34 50 107  26 43 101  24 41 100  24 41 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  28 45 104  34 50 107  35 51 108  34 50 107
-+35 51 108  35 51 108  35 51 108  34 50 107  35 51 108  35 51 108
-+34 50 107  34 50 106  32 48 105  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  27 44 102  30 46 104  29 45 103  30 46 104  29 45 103
-+30 46 104  29 45 103  25 42 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+44 60 114  44 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 59 113
-+44 59 113  44 59 113  44 59 113  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  46 61 115  46 61 115  46 61 115
-+46 61 115  46 61 115  46 61 115  46 61 115  46 61 115  45 60 114
-+43 58 114  42 58 112  40 57 112  40 56 111  39 55 110  37 53 109
-+36 52 108  34 50 107  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  23 40 100  23 40 100  23 40 100  23 40 100
-+23 40 100  24 41 101  26 43 101  27 44 102  29 45 103  31 47 105
-+33 49 106  34 50 107  36 52 108  38 54 109  39 55 110  40 56 111
-+42 57 112  42 58 112  44 59 113  45 60 114  46 61 115  46 61 115
-+46 61 115  46 61 115  46 61 115  46 61 115  46 61 115  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 59 113  44 59 113
-+44 59 113  44 59 113  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  43 60 114  43 60 114
-+43 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  43 59 113  44 60 114  44 60 114  44 60 114  40 57 112
-+36 52 108  29 47 104  27 44 102  24 41 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  28 45 103  35 51 108  39 55 110  40 56 111  40 56 111
-+39 55 111  40 56 111  40 56 111  39 55 111  39 55 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  39 55 111  39 55 111  36 52 108  28 45 103
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  31 47 105  35 51 108  35 51 108  34 50 107  35 51 108
-+35 51 108  35 51 108  34 50 107  35 51 108  34 50 107  34 50 107
-+34 50 107  31 47 105  25 42 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+27 44 103  29 46 104  29 45 103  30 46 104  30 46 104  30 46 104
-+29 45 103  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+43 60 114  44 60 114  44 60 114  44 60 114  44 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 59 113  44 59 113
-+44 59 113  44 59 113  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  46 61 115  46 61 115  46 61 115
-+46 61 115  46 61 115  46 61 115  46 61 115  46 61 115  46 61 115
-+45 60 114  45 60 114  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  26 43 102
-+27 44 103  28 45 103  29 46 104  30 46 104  31 47 105  33 49 106
-+34 50 107  35 51 108  37 53 109  38 54 110  40 56 111  42 57 112
-+44 59 113  44 59 113  44 60 114  44 60 114  44 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  46 61 115  46 61 115  46 61 115
-+46 61 115  46 61 115  46 61 115  46 61 115  46 61 115  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 59 113
-+44 59 113  44 59 113  44 59 113  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  43 60 114  43 60 114  43 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  43 60 114  44 60 113
-+44 60 114  44 60 114  42 58 112  36 52 108  28 45 103  25 42 101
-+25 42 101  24 41 100  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  25 42 101  25 42 101  25 42 101  24 41 100  26 43 102
-+36 52 108  39 55 110  40 56 111  40 56 111  39 55 110  40 56 111
-+40 56 111  39 55 111  39 55 111  38 54 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+38 54 110  39 55 111  39 55 111  30 46 104  25 42 101  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+33 49 106  35 51 108  35 51 108  35 51 108  35 51 108  35 51 108
-+35 51 108  34 50 107  35 51 108  34 50 107  33 49 106  34 50 107
-+29 46 104  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  27 44 103
-+29 46 104  29 45 103  29 46 104  30 46 104  29 45 103  30 46 104
-+25 42 101  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+44 60 114  44 60 114  44 60 114  44 60 114  43 60 114  43 60 114
-+43 60 114  43 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 59 113  44 59 113  44 59 113  44 59 113
-+44 59 113  44 59 113  44 59 113  44 59 113  45 60 114  45 60 114
-+45 60 114  45 60 114  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  46 61 115  46 61 115  46 61 115
-+46 61 115  46 61 115  46 61 115  46 61 115  46 61 115  46 61 115
-+46 61 115  46 61 115  46 61 115  46 61 115  46 61 115  46 61 115
-+46 61 115  46 61 115  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 59 113
-+44 59 113  44 59 113  44 59 113  44 59 113  44 59 113  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  43 60 114  43 60 114  43 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  43 59 113
-+44 60 114  44 60 114  44 60 114  43 59 113  43 59 113  40 57 112
-+35 51 108  28 45 103  24 41 100  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  24 41 100  25 42 101  25 42 101  31 47 105  38 56 110
-+40 56 111  40 56 111  39 55 111  40 56 111  40 56 111  39 55 111
-+39 55 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  39 55 111  39 55 111
-+38 54 110  35 51 108  26 43 102  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  26 43 102  34 50 107
-+35 51 108  34 50 107  35 51 108  35 51 108  35 51 108  35 51 108
-+34 50 107  35 51 108  34 50 107  33 49 106  33 49 106  28 45 103
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  27 44 102  29 46 104
-+29 45 103  30 46 104  29 45 103  30 46 104  29 46 103  26 43 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  43 60 114  43 60 114  43 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 59 113  44 59 113
-+44 59 113  44 59 113  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  46 61 115  46 61 115  46 61 115
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 59 113  44 59 113  44 59 113
-+44 59 113  44 59 113  44 59 113  44 59 113  44 59 113  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  44 60 114  44 60 114  43 60 114  43 60 114  43 60 114
-+43 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  43 59 113  44 60 114  44 60 114  44 60 114
-+43 59 113  40 56 111  38 54 109  34 50 107  29 45 103  24 41 100
-+24 41 100  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  26 43 102  31 47 105  38 54 109  40 56 111  40 56 111
-+39 55 110  39 55 111  40 56 111  39 55 111  39 55 111  38 54 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 110  39 55 111  39 55 111  36 52 108
-+31 47 105  25 42 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 100  29 45 103  34 50 107  35 51 108
-+34 50 107  35 51 108  35 51 108  35 51 108  34 50 107  35 51 108
-+35 51 108  34 50 107  34 50 106  33 49 106  27 44 102  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  27 44 102  29 46 104  29 45 103
-+29 46 104  29 45 103  30 46 104  29 45 103  26 43 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+44 60 114  44 60 114  44 60 114  43 59 113  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  43 60 114
-+43 60 114  43 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  45 60 114  45 60 114  45 60 114
-+44 59 113  44 59 113  44 59 113  44 59 113  44 59 113  44 59 113
-+44 59 113  44 59 113  44 59 113  44 59 113  44 59 113  44 59 113
-+44 59 113  44 59 113  44 59 113  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+43 60 114  43 60 114  43 60 114  43 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  43 59 113
-+44 60 114  44 60 114  44 61 114  43 59 113  38 54 110  34 50 107
-+29 47 104  27 44 102  25 42 100  24 41 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  37 53 109  40 56 111  40 56 111  39 55 110  39 55 111
-+40 56 111  40 56 111  39 55 111  39 55 111  38 54 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  31 47 105  26 43 102
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  31 47 105  34 50 107  35 51 108  35 51 108
-+35 51 108  35 51 108  35 51 108  34 50 107  35 51 108  34 50 107
-+34 50 107  34 50 107  32 48 105  26 43 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  27 44 103  29 46 104  29 45 103  29 46 104
-+30 46 104  30 46 104  29 45 103  26 43 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+32 50 106  39 55 111  44 60 114  44 60 114  44 60 114  44 60 114
-+43 59 113  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  43 60 114  43 60 114  43 60 114  43 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  44 59 113  44 59 113  44 59 113
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  44 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  43 60 114  43 60 114  43 60 114  43 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+43 59 113  36 52 108  29 46 104  26 43 101  25 42 101  25 42 101
-+24 41 100  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  40 56 111  39 55 110  39 55 111  40 56 111
-+39 55 111  39 55 111  38 54 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  38 54 110
-+39 55 111  39 55 111  35 51 108  26 43 102  25 42 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+26 43 101  33 49 106  35 51 108  35 51 108  34 50 107  35 51 108
-+35 51 108  35 51 108  35 51 108  35 51 108  34 50 107  33 49 106
-+34 50 107  31 47 105  25 42 101  24 41 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  27 44 103  29 46 104  29 45 103  29 46 104  30 46 104
-+29 45 103  30 46 104  26 43 101  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  25 42 101  29 47 104  36 52 108  40 57 112
-+43 59 113  43 59 113  43 59 113  44 60 114  44 60 114  44 60 114
-+43 59 113  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  43 60 114  43 60 114
-+43 60 114  43 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+43 60 114  43 60 114  43 60 114  43 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  43 59 113  44 60 114  44 60 114  44 60 114  44 60 114
-+43 59 113  43 59 113  42 58 112  39 55 110  34 50 107  27 44 102
-+24 41 100  24 41 100  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  40 56 111  40 56 111  39 55 111  39 55 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 110  39 55 111  38 54 110
-+37 53 109  29 46 104  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  27 44 102
-+34 50 107  35 52 107  34 50 108  35 51 108  35 51 108  35 51 108
-+34 50 107  35 51 108  35 51 108  34 50 107  33 49 106  34 50 107
-+29 46 104  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+27 44 102  29 46 104  29 45 103  30 46 104  29 45 103  30 46 104
-+29 46 103  26 43 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  24 41 100  24 41 100
-+27 44 102  31 47 105  36 52 108  38 56 110  40 57 112  43 59 113
-+44 60 114  44 60 114  44 60 114  44 60 114  43 59 113  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  43 60 114  43 60 114  43 60 114  43 60 114
-+43 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+44 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  43 60 114  43 60 114  43 60 114  43 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  43 60 114  44 60 113  44 60 114
-+44 60 114  44 60 114  44 60 114  42 58 112  40 56 111  37 53 109
-+34 50 107  30 46 104  25 42 101  23 40 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  39 55 111  39 55 111  38 54 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  39 55 111  39 55 111  37 53 109  32 48 107
-+25 42 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  30 46 104  34 50 107
-+35 51 108  35 51 108  35 51 108  35 51 108  35 51 108  34 50 107
-+35 51 108  34 50 107  34 50 107  34 50 107  32 50 106  27 44 103
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 101  27 44 102
-+30 46 104  29 45 103  29 46 104  29 45 103  30 46 104  29 45 103
-+26 43 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  24 41 100  24 41 100  25 42 101  27 44 102  30 46 104
-+32 50 106  36 52 108  40 56 111  44 60 114  44 61 114  44 60 114
-+44 60 114  44 60 114  43 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  43 60 114  43 60 114  43 60 114  43 60 114  43 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  44 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  43 60 114  43 60 114  43 60 114
-+43 60 114  43 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+43 59 113  44 60 114  44 60 114  44 60 114  44 60 115  42 58 112
-+38 54 110  34 50 107  31 47 105  28 45 103  26 43 102  24 41 100
-+24 41 100  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  39 55 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 110  32 48 107  27 44 102  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  26 43 102  32 48 107  35 51 108  35 51 108
-+34 50 107  35 51 108  35 51 108  35 51 108  35 51 108  35 51 108
-+34 50 107  34 50 107  34 50 107  32 48 105  26 43 102  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 101  27 44 103  30 46 104
-+29 45 103  30 46 104  30 46 104  30 46 104  29 45 103  26 43 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 101  25 42 101  25 42 101  26 43 101  29 46 104  34 50 108
-+39 55 110  43 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+43 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+43 60 114  43 60 114  43 60 114  43 60 114  43 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  44 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  43 60 114  43 60 114
-+43 60 114  43 60 114  43 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  43 59 113  44 60 114  44 60 114  44 60 114
-+45 60 114  42 58 112  37 53 109  32 48 105  27 44 102  26 43 101
-+25 42 101  25 42 101  24 41 100  24 41 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  38 54 110
-+39 55 111  35 51 108  27 43 102  25 42 101  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  27 44 103  34 50 107  35 51 108  35 51 108  34 50 107
-+35 51 108  35 51 108  35 51 108  34 50 107  35 51 108  35 51 108
-+33 49 106  34 50 107  31 47 105  25 42 101  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  27 44 103  30 46 104  29 45 103
-+30 46 104  30 46 104  29 45 103  30 46 104  26 43 101  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+24 41 100  24 41 100  27 44 102  32 50 106  37 53 109  40 57 112
-+42 58 112  43 59 113  43 59 113  43 59 113  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  43 59 113  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  43 60 114
-+43 60 114  43 60 114  43 60 114  43 60 114  43 60 114  43 60 114
-+43 60 114  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  45 60 114  45 60 114  45 60 114
-+45 60 114  45 60 114  45 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  43 60 114  43 60 114  43 60 114  43 60 114
-+43 60 114  43 60 114  43 60 114  43 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  43 59 113  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  43 59 113
-+43 59 113  43 59 113  42 58 112  39 55 111  34 50 107  29 47 104
-+25 42 101  24 41 100  24 41 100  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  38 54 110  38 54 110
-+29 46 104  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  25 42 101
-+29 46 104  35 52 107  35 51 108  35 51 108  35 51 108  35 51 108
-+35 51 108  34 50 107  35 51 108  35 51 108  34 50 107  33 49 106
-+33 49 106  29 46 104  24 41 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  27 44 103  30 46 104  29 45 103  30 46 104
-+29 45 103  30 46 104  29 45 103  26 43 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  24 41 100  23 40 99
-+26 43 101  29 46 104  32 50 106  36 52 108  38 54 110  39 55 110
-+40 57 112  42 58 112  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 113  43 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  43 60 114  43 60 114
-+43 60 114  43 60 114  43 60 114  43 60 114  43 60 114  43 60 114
-+43 60 114  43 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+43 59 113  42 58 112  40 56 111  38 56 110  37 53 109  34 50 107
-+31 47 105  27 44 103  24 41 100  23 40 100  24 41 100  24 41 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  39 55 111  39 55 111  39 55 111  39 55 111
-+38 54 110  39 55 111  39 55 111  36 52 108  31 47 105  25 42 101
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  26 43 102  31 47 105
-+35 51 108  35 51 108  34 50 107  35 51 108  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  34 50 107  34 50 107  32 50 106
-+27 44 103  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  27 44 102  30 46 104  29 45 103  30 46 104  29 45 103
-+30 46 104  29 45 103  25 42 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  26 43 101
-+27 44 103  29 46 104  31 47 105  33 49 106  36 52 108  38 56 110
-+40 57 112  43 60 114  44 61 114  45 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  43 59 113  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  43 60 114  43 60 114  43 60 114
-+43 60 114  43 60 114  43 60 114  43 60 114  43 60 114  43 60 114
-+43 60 114  43 60 114  43 60 114  43 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  43 60 114
-+44 60 113  44 60 114  44 60 114  44 60 114  44 60 114  44 61 114
-+44 61 114  42 58 112  40 56 111  37 53 109  34 50 108  32 48 105
-+29 47 104  28 45 103  27 44 102  25 42 101  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  39 55 111  39 55 111  38 54 110  39 55 111
-+39 55 111  38 54 110  31 47 105  26 43 102  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  28 45 103  33 49 106  35 51 108
-+34 50 107  35 51 108  35 51 108  35 51 108  35 51 108  34 50 107
-+35 51 108  35 51 108  34 50 107  34 50 107  31 47 105  26 43 101
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  25 42 101
-+28 45 103  30 46 104  29 45 103  30 46 104  30 46 104  30 46 104
-+29 45 103  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+26 43 101  26 43 101  27 44 103  31 47 105  34 50 107  37 53 109
-+40 57 112  43 59 113  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  43 59 113  44 60 114  44 60 114
-+44 60 114  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  43 59 113
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  42 58 112  38 56 110  36 52 108  32 50 106  29 46 104
-+26 43 101  26 43 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  39 55 111  38 54 110  39 55 111  38 54 111
-+32 50 106  25 42 101  25 42 101  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  31 47 105  34 50 107  35 51 108  34 50 107
-+35 51 108  35 51 108  35 51 108  35 51 108  34 50 107  35 51 108
-+34 50 107  34 50 107  34 50 107  29 46 104  25 42 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  28 45 103
-+30 46 104  29 45 103  30 46 104  30 46 104  29 45 103  30 46 104
-+25 42 101  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  25 42 101  27 44 103  31 47 105  34 50 106
-+36 52 108  38 56 110  40 57 112  42 58 112  42 58 112  43 59 113
-+43 59 113  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  44 60 114  43 60 114  43 59 113  43 59 113
-+43 59 113  43 59 113  43 59 113  42 58 112  42 58 112  42 58 112
-+40 56 111  37 53 109  35 52 107  32 48 107  29 46 104  27 44 102
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  39 55 111  38 54 110  35 51 108  26 43 102
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  24 41 101
-+26 43 101  33 49 106  35 51 108  34 50 107  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  35 51 108  35 51 108  34 50 107
-+34 50 107  33 49 106  27 44 103  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  27 44 103  30 46 104
-+29 45 103  29 46 104  29 45 103  29 46 104  29 45 103  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  23 40 100  23 40 100  24 41 100  25 43 102  27 44 102
-+29 46 104  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  44 60 114  44 60 114  44 60 114
-+44 60 114  44 60 114  43 59 113  43 59 113  43 59 113  42 58 112
-+42 58 112  40 57 112  40 57 112  40 56 111  40 56 111  39 55 110
-+38 56 110  38 54 110  37 53 109  36 52 108  35 52 107  33 49 106
-+32 48 105  29 47 104  28 45 103  27 43 102  25 42 100  23 40 100
-+23 40 100  23 40 100  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  34 50 107  28 45 103  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  28 45 103
-+34 50 108  35 51 108  34 50 107  35 51 108  35 51 108  35 51 108
-+35 51 108  34 50 107  35 51 108  34 50 107  34 50 107  34 50 107
-+32 48 105  26 43 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  29 45 103  30 46 104  29 45 103
-+30 46 104  30 46 104  30 46 104  28 45 103  25 42 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  24 41 100
-+24 41 100  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  32 50 106  32 48 107  31 47 105
-+31 47 105  31 47 105  29 47 104  29 47 104  29 46 104  29 46 104
-+28 45 103  28 45 103  27 44 103  27 44 102  26 43 102  26 43 101
-+25 42 101  24 41 101  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  32 48 105  34 50 107
-+35 51 108  35 51 108  35 51 108  35 51 108  35 51 108  35 51 108
-+34 50 107  35 51 108  34 50 107  33 49 106  34 50 107  29 46 104
-+25 42 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  25 42 101  29 45 103  30 46 104  29 45 103  30 46 104
-+29 46 104  30 46 104  27 44 103  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 100  24 41 101  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  28 45 103  34 50 107  35 52 107  35 51 108
-+34 50 107  35 51 108  35 51 108  35 51 108  35 51 108  35 51 108
-+35 51 108  34 50 107  34 50 107  34 50 107  27 44 102  24 41 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  29 46 104  30 46 104  29 46 104  30 46 104  29 45 103
-+30 46 104  29 46 104  24 41 100  24 41 100  24 41 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  24 41 100  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+25 42 101  31 47 105  34 50 108  34 50 107  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  35 51 108  35 51 108  34 50 107
-+33 49 106  33 49 106  32 50 106  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  26 43 102
-+29 46 104  29 45 103  29 46 104  29 45 103  30 46 104  30 46 104
-+28 45 103  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  24 41 100  27 44 102  30 46 104  36 52 108
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  27 44 103
-+33 49 106  35 51 108  35 51 108  35 51 108  35 51 108  35 51 108
-+35 51 108  34 50 107  35 51 108  34 50 107  34 50 107  34 50 106
-+33 49 106  30 46 104  24 41 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  26 43 102  30 46 104
-+29 45 103  29 46 104  30 46 104  30 46 104  30 46 104  27 44 102
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+24 41 100  28 45 103  34 50 107  37 53 109  40 56 111  40 56 111
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  25 42 101  31 47 105  34 50 107
-+35 51 108  34 50 107  35 51 108  35 51 108  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  34 50 107  34 50 107  33 49 106
-+27 44 103  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  25 42 101  27 44 102  29 46 104  29 45 103
-+30 46 104  30 46 104  29 45 103  30 46 104  27 44 102  25 42 101
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  25 42 101  31 47 105
-+37 53 109  39 55 110  40 56 111  40 56 111  40 56 111  39 55 110
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  26 43 102  33 49 106  35 51 108  35 51 108
-+34 50 107  35 51 108  35 51 108  35 51 108  35 51 108  34 50 107
-+35 51 108  35 51 108  33 49 106  34 50 107  31 47 105  25 42 101
-+24 41 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  27 44 103  30 46 104  30 46 104  30 46 104
-+30 46 104  29 45 103  30 46 104  27 44 102  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+25 42 101  25 42 101  26 43 102  34 50 107  39 55 110  40 56 111
-+40 56 111  39 55 110  40 56 111  39 55 111  40 56 111  39 55 111
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+25 42 101  29 46 104  35 51 108  35 51 108  34 50 107  35 51 108
-+35 51 108  35 51 108  35 51 108  35 51 108  35 51 108  35 51 108
-+34 50 107  33 49 106  33 49 106  29 45 103  25 42 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 101  28 45 103  30 46 104  29 45 103  30 46 104  29 45 103
-+30 46 104  30 46 104  27 44 102  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  24 41 100  25 42 101  27 44 103
-+31 47 105  36 52 108  40 56 111  40 56 111  40 56 111  39 55 110
-+39 55 111  40 56 111  40 56 111  40 56 111  39 55 111  39 55 111
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  27 44 102
-+32 50 106  35 51 108  34 50 107  35 51 108  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  35 51 108  34 50 107  34 50 107
-+34 50 107  31 47 105  26 44 102  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  25 42 101
-+28 45 103  30 46 104  29 45 103  30 46 104  29 46 104  30 46 104
-+29 45 103  26 43 102  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  26 43 102  31 47 105  36 52 108  38 54 110
-+40 56 111  40 56 111  40 56 111  39 55 110  40 56 111  39 55 111
-+40 56 111  39 55 111  39 55 111  39 55 111  38 54 111  38 54 111
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  31 47 105  34 50 107
-+35 51 108  34 50 107  35 51 108  35 51 108  35 51 108  35 51 108
-+34 50 107  35 51 108  35 51 108  34 50 107  34 50 107  33 49 106
-+29 46 104  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  28 45 103
-+30 46 104  29 46 104  30 46 104  29 45 103  30 46 104  29 46 104
-+26 43 101  24 41 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  24 41 100
-+29 46 104  36 52 108  38 56 110  39 55 110  40 56 111  40 56 111
-+40 56 111  39 55 110  39 55 111  40 56 111  40 56 111  40 56 111
-+39 55 111  39 55 111  38 54 111  38 54 111  39 55 111  39 55 111
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  27 44 102  34 50 107  34 50 108  35 51 108
-+34 50 107  35 51 108  35 51 108  35 51 108  35 51 108  34 50 107
-+35 51 108  34 50 107  34 50 107  34 50 107  33 49 106  26 43 102
-+25 42 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  25 42 101  30 46 104  29 46 104
-+29 45 103  30 46 104  29 45 103  30 46 104  29 45 103  25 42 101
-+25 42 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+24 41 100  25 42 101  25 42 101  27 44 102  33 49 106  39 55 110
-+40 56 111  40 56 111  40 56 111  39 55 111  39 55 111  40 56 111
-+40 56 111  39 55 111  39 55 111  39 55 111  38 54 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+25 42 101  31 47 105  35 51 108  34 50 107  35 51 108  35 51 108
-+35 51 108  35 51 108  35 51 108  34 50 107  35 51 108  34 50 107
-+34 50 107  33 49 106  33 49 106  31 47 105  24 41 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  26 43 102  30 46 104  29 45 103  30 46 104
-+30 46 104  30 46 104  30 46 104  28 45 103  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  25 42 101  24 41 100  24 41 100  24 41 100  26 43 101
-+28 45 103  32 48 105  36 52 108  40 56 111  40 56 111  40 56 111
-+39 55 110  40 56 111  39 55 111  40 56 111  40 56 111  39 55 111
-+39 55 111  38 54 111  38 54 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  25 42 101  27 44 103
-+33 49 106  35 51 108  35 51 108  35 51 108  35 51 108  35 51 108
-+35 51 108  34 50 107  35 51 108  35 51 108  34 50 107  33 49 106
-+34 50 107  32 48 107  28 45 103  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+25 42 100  27 44 102  30 46 104  29 45 103  30 46 104  30 46 104
-+29 45 103  30 46 104  27 44 103  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  36 52 108
-+39 55 110  40 56 111  40 56 111  40 56 111  39 55 110  40 56 111
-+40 56 111  40 56 111  40 56 111  39 55 111  39 55 111  39 55 111
-+38 54 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  27 43 102  32 48 105  35 52 107
-+35 51 108  34 50 107  35 51 108  35 51 108  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  34 50 107  34 50 107  34 50 107
-+30 46 104  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+28 45 103  29 45 103  30 46 104  30 46 104  29 46 104  29 45 103
-+30 46 104  27 44 102  25 42 101  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  40 56 111
-+40 56 111  40 56 111  40 56 111  39 55 111  40 56 111  40 56 111
-+39 55 111  39 55 111  39 55 111  38 54 111  38 54 111  38 54 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  38 54 110  39 55 111
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  29 46 104  34 50 107  35 52 107  35 51 108
-+34 50 107  35 51 108  35 51 108  35 51 108  35 51 108  34 50 107
-+35 51 108  35 51 108  33 49 106  34 50 107  33 49 106  26 43 102
-+25 42 101  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  25 42 101  28 45 103
-+30 46 104  30 46 104  29 45 103  29 46 104  30 46 104  29 46 104
-+26 43 102  25 42 101  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+40 56 111  40 56 111  39 55 111  39 55 111  39 55 111  38 54 111
-+38 54 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+38 54 110  39 55 111  39 55 111  38 54 110  38 54 110  36 52 108
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  24 41 100  24 41 100  25 42 101
-+26 43 101  33 49 106  35 51 108  35 52 107  34 50 108  35 51 108
-+35 51 108  35 51 108  35 51 108  35 51 108  35 51 108  35 51 108
-+34 50 107  33 49 106  33 49 106  31 47 105  25 42 101  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  25 42 101  29 46 104  29 45 103
-+29 46 104  30 46 104  29 45 103  30 46 104  29 45 103  27 43 102
-+25 42 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+39 55 111  39 55 111  38 54 111  38 54 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  38 54 110  39 55 111
-+39 55 111  38 54 111  36 52 108  34 50 106  28 45 103  24 41 100
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  34 50 107
-+34 50 107  32 48 107  27 44 103  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  26 43 102  29 45 103  29 45 103  30 46 104
-+30 46 104  29 45 103  30 46 104  29 45 103  26 43 101  24 41 100
-+24 41 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+38 54 111  38 54 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 110  39 55 111  39 55 111  38 54 111
-+34 50 107  29 46 104  26 43 102  24 41 100  24 41 100  24 41 100
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  33 49 106
-+29 46 104  25 42 101  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 101  24 41 100  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+38 54 110  39 55 111  39 55 111  37 53 109  31 47 105  25 42 101
-+25 42 101  24 41 100  24 41 100  24 41 100  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  26 43 102
-+25 42 101  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  25 42 101  25 42 101  25 42 101  25 42 101  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  29 46 104  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+39 55 111  39 55 111  39 55 111  39 55 111  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+27 44 102  25 42 101  24 41 100  24 41 100  24 41 100  24 41 100
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+39 55 111  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+37 53 109  36 52 108  33 49 106  29 47 104  27 44 102  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  24 41 100  24 41 100  25 42 101  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+39 55 111  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+40 56 111  40 56 111  39 55 110  39 55 110  39 55 110  38 54 109
-+35 51 108  31 47 105  26 43 102  24 41 100  24 41 100  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  24 41 100  24 41 100  25 42 101
-+29 46 103  32 50 106  37 53 109  39 55 110  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+38 54 110  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+40 56 111  39 55 111  40 56 111  40 56 111  39 55 110  40 56 111
-+40 56 111  40 56 111  40 56 111  39 55 110  36 52 108  31 47 105
-+27 44 103  25 42 101  25 42 101  25 42 101  25 42 101  24 41 100
-+24 41 100  24 41 100  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+24 41 100  24 41 100  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  26 43 102  30 46 104  33 49 106  37 53 109  40 56 111
-+40 56 111  40 56 111  40 56 111  39 55 110  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+38 54 110  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+39 55 111  40 56 111  40 56 111  40 56 111  39 55 111  40 56 111
-+40 56 111  40 56 111  39 55 110  40 56 111  40 56 111  40 56 111
-+40 56 111  39 55 111  37 53 109  34 50 107  31 47 105  29 46 104
-+27 44 103  26 43 102  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  27 44 102  28 45 103  29 47 104  33 49 106  35 51 108
-+38 54 109  40 56 111  40 56 111  40 56 111  40 56 111  40 56 111
-+39 55 111  40 56 111  40 56 111  39 55 111  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+27 44 103  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+38 54 111  39 55 111  39 55 111  39 55 111  40 56 111  40 56 111
-+40 56 111  40 56 111  39 55 111  40 56 111  40 56 111  40 56 111
-+40 56 111  40 56 111  40 56 111  40 56 111  40 56 111  39 55 111
-+38 54 110  37 53 109  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+36 52 108  37 53 109  39 55 110  40 56 111  40 56 111  40 56 111
-+40 56 111  40 56 111  39 55 110  40 56 111  40 56 111  40 56 111
-+39 55 111  40 56 111  40 56 111  40 56 111  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+24 41 100  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+38 54 111  38 54 111  38 54 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  40 56 111  40 56 111  40 56 111  40 56 111
-+40 56 111  40 56 111  40 56 111  40 56 111  40 56 111  40 56 111
-+40 56 111  40 56 111  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+40 56 111  40 56 111  40 56 111  40 56 111  39 55 110  40 56 111
-+40 56 111  40 56 111  39 55 111  40 56 111  40 56 111  40 56 111
-+40 56 111  39 55 111  39 55 111  39 55 111  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  38 54 111  38 54 111  38 54 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  40 56 111  40 56 111
-+40 56 111  40 56 111  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+39 55 111  40 56 111  40 56 111  40 56 111  40 56 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 111  38 54 111  38 54 111
-+38 54 111  38 54 111  39 55 111  39 55 111  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  38 54 111
-+38 54 111  38 54 111  38 54 111  39 55 111  39 55 111  39 55 111
-+39 55 111  40 56 111  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  32 48 105
-+29 47 104  29 46 104  28 45 103  27 44 102  27 43 102  26 43 101
-+25 42 101  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+40 56 111  39 55 111  39 55 111  39 55 111  39 55 111  38 54 111
-+38 54 111  38 54 111  38 54 111  38 54 111  39 55 111  39 55 111
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+25 42 100  27 43 102  29 47 104  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  38 54 111  38 54 111  38 54 111
-+38 54 111  39 55 111  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  40 56 111
-+40 56 111  39 55 111  39 55 110  38 54 109  37 53 109  36 52 108
-+36 52 108  35 52 107  34 50 107  32 50 106  31 47 105  29 47 104
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+24 41 100  24 41 100  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+39 55 111  38 54 111  38 54 111  38 54 111  38 54 111  38 54 111
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  26 43 102
-+31 47 105  34 50 107  35 51 108  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 111  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  40 56 111
-+39 55 110  40 56 111  40 56 111  40 56 111  40 56 111  40 56 111
-+40 56 111  40 56 111  40 56 111  39 55 110  39 55 110  39 55 110
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+36 52 108  37 53 109  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  25 42 101  31 47 105  34 50 107
-+34 50 107  35 51 108  34 50 107  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+38 54 110  38 54 110  38 54 110  39 55 111  39 55 111  39 55 111
-+39 55 111  38 54 110  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  40 56 111
-+40 56 111  40 56 111  40 56 111  40 56 111  40 56 111  39 55 111
-+40 56 111  40 56 111  40 56 111  40 56 111  40 56 111  40 56 111
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+40 56 111  40 56 111  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+25 42 101  25 42 101  30 46 104  35 51 108  35 51 108  34 50 107
-+35 51 108  35 51 108  35 51 108  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  25 42 101  0 0 0  0 0 0  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+26 43 102  29 46 104  32 50 106  34 50 108  36 52 108  38 54 110
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  38 54 110
-+39 55 111  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  39 55 111  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  40 56 111
-+40 56 111  40 56 111  40 56 111  40 56 111  40 56 111  40 56 111
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+40 56 111  40 56 111  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  24 41 100  24 41 100  24 41 100  26 43 102
-+29 46 104  34 50 107  35 51 108  35 51 108  35 51 108  35 51 108
-+35 51 108  35 51 108  35 51 108  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+27 44 103  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+24 41 100  24 41 100  24 41 100  25 42 101  26 43 102  27 44 103
-+29 46 104  32 50 106  35 51 108  38 54 110  39 55 111  39 55 111
-+39 55 111  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  38 54 111
-+38 54 111  38 54 111  38 54 111  38 54 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+40 56 111  40 56 111  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  24 41 100  24 41 100  26 43 102  31 47 105  33 49 106
-+35 51 108  35 51 108  34 50 107  35 51 108  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+30 46 104  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  24 41 100  24 41 100  24 41 100
-+24 41 100  25 42 101  25 42 101  25 42 101  27 44 102  30 46 104
-+34 50 106  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  38 54 111  38 54 111
-+38 54 111  38 54 111  38 54 111  38 54 111  38 54 111  38 54 111
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+39 55 111  39 55 111  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  24 41 100
-+24 41 100  25 42 101  31 47 105  34 50 107  34 50 107  35 51 108
-+34 50 107  35 51 108  35 51 108  35 51 108  35 51 108  35 51 108
-+35 51 108  35 51 108  35 51 108  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 100  24 41 100
-+24 41 100  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+39 55 111  39 55 111  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  24 41 100  25 42 101  26 43 101
-+29 47 104  35 51 108  35 51 108  34 50 107  35 51 108  35 51 108
-+35 51 108  35 51 108  35 51 108  35 51 108  35 51 108  35 51 108
-+34 50 107  34 50 107  33 49 106  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+39 55 111  39 55 111  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  27 44 102  29 47 104  34 50 107
-+35 51 108  35 51 108  35 51 108  35 51 108  35 51 108  35 51 108
-+35 51 108  35 51 108  34 50 107  35 51 108  34 50 107  34 50 107
-+34 50 107  34 50 107  33 49 106  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+39 55 111  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  34 50 107  35 51 108  35 51 108
-+34 50 107  35 51 108  35 51 108  35 51 108  35 51 108  35 51 108
-+34 50 107  35 51 108  35 51 108  34 50 107  34 50 107  34 50 107
-+34 50 107  31 47 105  27 43 102  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  39 55 111  39 55 111
-+39 55 111  39 55 111  39 55 111  39 55 111  38 54 111  39 55 110
-+39 55 111  39 55 111  39 55 111  39 55 111  39 55 111  39 55 111
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+39 55 111  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  35 51 108  34 50 107  35 51 108
-+35 51 108  35 51 108  35 51 108  35 51 108  35 51 108  34 50 107
-+35 51 108  34 50 107  34 50 107  34 50 106  34 50 107  32 48 107
-+26 43 102  25 42 101  24 41 100  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  26 43 101  28 45 103
-+29 47 104  32 48 107  34 50 107  36 52 108  37 53 109  38 54 110
-+38 54 110  38 54 110  38 54 110  38 54 110  38 54 110  38 54 110
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+39 55 111  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  35 51 108  35 51 108  35 51 108
-+35 51 108  35 51 108  35 51 108  35 51 108  34 50 107  34 50 107
-+33 49 106  34 50 107  33 49 106  32 50 106  27 44 102  25 42 100
-+24 41 100  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  24 41 100  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  25 42 101
-+27 43 102  27 44 102  29 45 103  30 46 104  31 47 105  32 50 106
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+37 53 109  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  35 51 108  35 51 108
-+34 50 107  35 51 108  34 50 107  34 50 107  34 50 107  34 50 107
-+33 49 106  31 47 105  27 44 103  25 42 100  24 41 100  24 41 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  24 41 101  24 41 100
-+24 41 100  24 41 100  24 41 100  24 41 100  24 41 100  24 41 100
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+27 44 103  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  34 50 107  35 51 108
-+35 51 108  34 50 107  34 50 107  34 50 107  34 50 106  31 47 105
-+27 43 102  25 42 101  24 41 100  24 41 100  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+24 41 100  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  35 51 108  34 50 107
-+34 50 107  34 50 107  34 50 107  31 47 105  26 43 101  25 42 101
-+24 41 100  24 41 100  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  33 49 106
-+33 49 106  31 47 105  26 43 102  24 41 100  24 41 100  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  24 41 100  24 41 100  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  25 42 101  25 42 101  25 42 101  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  25 42 101  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  25 42 101  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 42 101
-+25 42 101  25 42 101  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  25 42 101  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  25 42 101  25 42 101
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  0 0 0  0 0 0
-+25 42 101  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 42 101  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
---- a/drivers/video/logo/Makefile
-+++ b/drivers/video/logo/Makefile
-@@ -15,6 +15,7 @@ obj-$(CONFIG_LOGO_SUPERH_MONO)		+= logo_
- obj-$(CONFIG_LOGO_SUPERH_VGA16)		+= logo_superh_vga16.o
- obj-$(CONFIG_LOGO_SUPERH_CLUT224)	+= logo_superh_clut224.o
- obj-$(CONFIG_LOGO_M32R_CLUT224)		+= logo_m32r_clut224.o
-+obj-$(CONFIG_LOGO_OPENWRT_CLUT224)	+= logo_openwrt_clut224.o
- 
- obj-$(CONFIG_SPU_BASE)			+= logo_spe_clut224.o
- 
diff --git a/target/linux/s3c24xx/patches-2.6.30/040-rename-serialdevs.patch b/target/linux/s3c24xx/patches-2.6.30/040-rename-serialdevs.patch
deleted file mode 100644
index 4176dbc87..000000000
--- a/target/linux/s3c24xx/patches-2.6.30/040-rename-serialdevs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/drivers/serial/samsung.c
-+++ b/drivers/serial/samsung.c
-@@ -878,7 +878,7 @@ static struct uart_ops s3c24xx_serial_op
- 
- static struct uart_driver s3c24xx_uart_drv = {
- 	.owner		= THIS_MODULE,
--	.dev_name	= "s3c2410_serial",
-+	.dev_name	= "ttySAC",
- 	.nr		= CONFIG_SERIAL_SAMSUNG_UARTS,
- 	.cons		= S3C24XX_SERIAL_CONSOLE,
- 	.driver_name	= S3C24XX_SERIAL_NAME,
diff --git a/target/linux/s3c24xx/patches-2.6.30/050-s3c2442-touchscreen.patch b/target/linux/s3c24xx/patches-2.6.30/050-s3c2442-touchscreen.patch
deleted file mode 100644
index c0de0e6af..000000000
--- a/target/linux/s3c24xx/patches-2.6.30/050-s3c2442-touchscreen.patch
+++ /dev/null
@@ -1,142 +0,0 @@
---- a/arch/arm/plat-s3c24xx/devs.c
-+++ b/arch/arm/plat-s3c24xx/devs.c
-@@ -26,6 +26,8 @@
- #include <asm/mach/irq.h>
- #include <mach/fb.h>
- #include <mach/hardware.h>
-+#include <mach/ts.h>
-+#include <asm/io.h>
- #include <asm/irq.h>
- 
- #include <plat/regs-serial.h>
-@@ -199,6 +201,24 @@ struct platform_device s3c_device_nand =
- 
- EXPORT_SYMBOL(s3c_device_nand);
- 
-+/* Touchscreen */
-+struct platform_device s3c_device_ts = {
-+	.name		  = "s3c2410-ts",
-+	.id		  = -1,
-+};
-+
-+EXPORT_SYMBOL(s3c_device_ts);
-+
-+static struct s3c2410_ts_mach_info s3c2410ts_info;
-+
-+void set_s3c2410ts_info(const struct s3c2410_ts_mach_info *hard_s3c2410ts_info)
-+{
-+	memcpy(&s3c2410ts_info, hard_s3c2410ts_info,
-+	       sizeof(struct s3c2410_ts_mach_info));
-+	s3c_device_ts.dev.platform_data = &s3c2410ts_info;
-+}
-+EXPORT_SYMBOL(set_s3c2410ts_info);
-+
- /* USB Device (Gadget)*/
- 
- static struct resource s3c_usbgadget_resource[] = {
---- a/arch/arm/plat-s3c24xx/s3c244x.c
-+++ b/arch/arm/plat-s3c24xx/s3c244x.c
-@@ -59,6 +59,8 @@ void __init s3c244x_init_uarts(struct s3
- 	s3c24xx_init_uartdevs("s3c2440-uart", s3c2410_uart_resources, cfg, no);
- }
- 
-+extern struct platform_device s3c_device_ts;
-+
- void __init s3c244x_map_io(void)
- {
- 	/* register our io-tables */
-@@ -70,6 +72,7 @@ void __init s3c244x_map_io(void)
- 	s3c_device_sdi.name  = "s3c2440-sdi";
- 	s3c_device_i2c0.name  = "s3c2440-i2c";
- 	s3c_device_nand.name = "s3c2440-nand";
-+	s3c_device_ts.name = "s3c2440-ts";
- 	s3c_device_usbgadget.name = "s3c2440-usbgadget";
- }
- 
---- a/drivers/input/touchscreen/Kconfig
-+++ b/drivers/input/touchscreen/Kconfig
-@@ -124,6 +124,24 @@ config TOUCHSCREEN_FUJITSU
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called fujitsu-ts.
- 
-+config TOUCHSCREEN_S3C2410
-+	tristate "Samsung S3C2410 touchscreen input driver"
-+	depends on ARCH_S3C2410 && INPUT && INPUT_TOUCHSCREEN
-+	select SERIO
-+	help
-+	  Say Y here if you have the s3c2410 touchscreen.
-+
-+	  If unsure, say N.
-+
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called s3c2410_ts.
-+
-+config TOUCHSCREEN_S3C2410_DEBUG
-+	boolean "Samsung S3C2410 touchscreen debug messages"
-+	depends on TOUCHSCREEN_S3C2410
-+	help
-+	  Select this if you want debug messages
-+
- config TOUCHSCREEN_GUNZE
- 	tristate "Gunze AHL-51S touchscreen"
- 	select SERIO
---- a/drivers/input/touchscreen/Makefile
-+++ b/drivers/input/touchscreen/Makefile
-@@ -37,3 +37,4 @@ wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9712)	+
- wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9713)	+= wm9713.o
- obj-$(CONFIG_TOUCHSCREEN_WM97XX_MAINSTONE)	+= mainstone-wm97xx.o
- obj-$(CONFIG_TOUCHSCREEN_WM97XX_ZYLONITE)	+= zylonite-wm97xx.o
-+obj-$(CONFIG_TOUCHSCREEN_S3C2410)	+= s3c2410_ts.o
---- /dev/null
-+++ b/arch/arm/mach-s3c2410/include/mach/ts.h
-@@ -0,0 +1,35 @@
-+/* arch/arm/mach-s3c2410/include/mach/ts.h
-+ *
-+ * Copyright (c) 2005 Arnaud Patard <arnaud.patard@rtp-net.org>
-+ *
-+ *
-+ * 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.
-+ *
-+ *
-+ *  Changelog:
-+ *     24-Mar-2005     RTP     Created file
-+ *     03-Aug-2005     RTP     Renamed to ts.h
-+ */
-+
-+#ifndef __ASM_ARM_TS_H
-+#define __ASM_ARM_TS_H
-+
-+#include <linux/touchscreen/ts_filter.h>
-+
-+struct s3c2410_ts_mach_info {
-+	/* Touchscreen delay. */
-+	int delay;
-+	/* Prescaler value. */
-+	int presc;
-+	/*
-+	 * Null-terminated array of pointers to filter APIs and configurations
-+	 * we want to use. In the same order they will be applied.
-+	 */
-+	const struct ts_filter_chain_configuration *filter_config;
-+};
-+
-+void set_s3c2410ts_info(const struct s3c2410_ts_mach_info *hard_s3c2410ts_info);
-+
-+#endif /* __ASM_ARM_TS_H */
---- a/arch/arm/plat-s3c/include/plat/devs.h
-+++ b/arch/arm/plat-s3c/include/plat/devs.h
-@@ -50,10 +50,11 @@ extern struct platform_device s3c_device
- 
- extern struct platform_device s3c_device_usbgadget;
- 
-+extern struct platform_device s3c_device_ts;
-+
- /* s3c2440 specific devices */
- 
- #ifdef CONFIG_CPU_S3C2440
- 
- extern struct platform_device s3c_device_camif;
--
- #endif
diff --git a/target/linux/s3c24xx/patches-2.6.30/052-touchscreen_filter.patch b/target/linux/s3c24xx/patches-2.6.30/052-touchscreen_filter.patch
deleted file mode 100644
index 1a04bce68..000000000
--- a/target/linux/s3c24xx/patches-2.6.30/052-touchscreen_filter.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- a/drivers/input/touchscreen/Kconfig
-+++ b/drivers/input/touchscreen/Kconfig
-@@ -11,6 +11,54 @@ menuconfig INPUT_TOUCHSCREEN
- 
- if INPUT_TOUCHSCREEN
- 
-+menuconfig TOUCHSCREEN_FILTER
-+	boolean "Touchscreen Filtering"
-+	depends on INPUT_TOUCHSCREEN
-+	select TOUCHSCREEN_FILTER_GROUP
-+	select TOUCHSCREEN_FILTER_MEDIAN
-+	select TOUCHSCREEN_FILTER_MEAN
-+	select TOUCHSCREEN_FILTER_LINEAR
-+	help
-+	  Select this to include kernel touchscreen filter support.  The filters
-+	  can be combined in any order in your machine init and the parameters
-+	  for them can also be set there.
-+
-+if TOUCHSCREEN_FILTER
-+
-+config TOUCHSCREEN_FILTER_GROUP
-+	bool "Group Touchscreen Filter"
-+	depends on INPUT_TOUCHSCREEN && TOUCHSCREEN_FILTER
-+	default Y
-+	help
-+	  Say Y here if you want to use the Group touchscreen filter, it
-+	  avoids using atypical samples.
-+
-+config TOUCHSCREEN_FILTER_MEDIAN
-+	bool "Median Average Touchscreen Filter"
-+	depends on INPUT_TOUCHSCREEN && TOUCHSCREEN_FILTER
-+	default Y
-+	help
-+	  Say Y here if you want to use the Median touchscreen filter, it's
-+	  highly effective if you data is noisy with occasional excursions.
-+
-+config TOUCHSCREEN_FILTER_MEAN
-+	bool "Mean Average Touchscreen Filter"
-+	depends on INPUT_TOUCHSCREEN && TOUCHSCREEN_FILTER
-+	default Y
-+	help
-+	  Say Y here if you want to use the Mean touchscreen filter, it
-+	  can further improve decent quality data by removing jitter
-+
-+config TOUCHSCREEN_FILTER_LINEAR
-+	bool "Linear Touchscreen Filter"
-+	depends on INPUT_TOUCHSCREEN && TOUCHSCREEN_FILTER
-+	default Y
-+	help
-+	  Say Y here if you want to use the Linear touchscreen filter, it
-+	  enables the use of calibration data for the touchscreen.
-+
-+endif
-+
- config TOUCHSCREEN_ADS7846
- 	tristate "ADS7846/TSC2046 and ADS7843 based touchscreens"
- 	depends on SPI_MASTER
---- a/drivers/input/touchscreen/Makefile
-+++ b/drivers/input/touchscreen/Makefile
-@@ -38,3 +38,8 @@ wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9713)	+
- obj-$(CONFIG_TOUCHSCREEN_WM97XX_MAINSTONE)	+= mainstone-wm97xx.o
- obj-$(CONFIG_TOUCHSCREEN_WM97XX_ZYLONITE)	+= zylonite-wm97xx.o
- obj-$(CONFIG_TOUCHSCREEN_S3C2410)	+= s3c2410_ts.o
-+obj-$(CONFIG_TOUCHSCREEN_FILTER)	+= ts_filter_chain.o
-+obj-$(CONFIG_TOUCHSCREEN_FILTER_GROUP)	+= ts_filter_group.o
-+obj-$(CONFIG_TOUCHSCREEN_FILTER_LINEAR)	+= ts_filter_linear.o
-+obj-$(CONFIG_TOUCHSCREEN_FILTER_MEDIAN)	+= ts_filter_median.o
-+obj-$(CONFIG_TOUCHSCREEN_FILTER_MEAN)	+= ts_filter_mean.o
diff --git a/target/linux/s3c24xx/patches-2.6.30/053-glamo.patch b/target/linux/s3c24xx/patches-2.6.30/053-glamo.patch
deleted file mode 100644
index f756e9f3c..000000000
--- a/target/linux/s3c24xx/patches-2.6.30/053-glamo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/drivers/mfd/Kconfig
-+++ b/drivers/mfd/Kconfig
-@@ -241,6 +241,8 @@ config PCF50633_GPIO
- 	 Say yes here if you want to include support GPIO for pins on
- 	 the PCF50633 chip.
- 
-+source "drivers/mfd/glamo/Kconfig"
-+
- endmenu
- 
- menu "Multimedia Capabilities Port drivers"
---- a/drivers/mfd/Makefile
-+++ b/drivers/mfd/Makefile
-@@ -4,6 +4,7 @@
- 
- obj-$(CONFIG_MFD_SM501)		+= sm501.o
- obj-$(CONFIG_MFD_ASIC3)		+= asic3.o
-+obj-$(CONFIG_MFD_GLAMO)		+= glamo/
- 
- obj-$(CONFIG_HTC_EGPIO)		+= htc-egpio.o
- obj-$(CONFIG_HTC_PASIC3)	+= htc-pasic3.o
diff --git a/target/linux/s3c24xx/patches-2.6.30/054-bq27000.patch b/target/linux/s3c24xx/patches-2.6.30/054-bq27000.patch
deleted file mode 100644
index 36de12f8c..000000000
--- a/target/linux/s3c24xx/patches-2.6.30/054-bq27000.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/drivers/power/Kconfig
-+++ b/drivers/power/Kconfig
-@@ -88,4 +88,16 @@ config CHARGER_PCF50633
- 	help
- 	 Say Y to include support for NXP PCF50633 Main Battery Charger.
- 
-+config BATTERY_BQ27000_HDQ
-+	tristate "BQ27000 HDQ battery monitor driver"
-+	help
-+	  Say Y to enable support for the battery on the Neo Freerunner
-+
-+config HDQ_GPIO_BITBANG
-+	bool "Generic gpio based HDQ bitbang"
-+	help
-+	  Say Y to enable supoort for generic gpio based HDQ bitbang driver.
-+	  This can not be built as a module.
-+
- endif # POWER_SUPPLY
-+
---- a/drivers/power/Makefile
-+++ b/drivers/power/Makefile
-@@ -25,4 +25,7 @@ obj-$(CONFIG_BATTERY_TOSA)	+= tosa_batte
- obj-$(CONFIG_BATTERY_WM97XX)	+= wm97xx_battery.o
- obj-$(CONFIG_BATTERY_BQ27x00)	+= bq27x00_battery.o
- obj-$(CONFIG_BATTERY_DA9030)	+= da9030_battery.o
--obj-$(CONFIG_CHARGER_PCF50633)	+= pcf50633-charger.o
-\ No newline at end of file
-+obj-$(CONFIG_CHARGER_PCF50633)	+= pcf50633-charger.o
-+obj-$(CONFIG_BATTERY_BQ27000_HDQ)	+= bq27000_battery.o
-+
-+obj-$(CONFIG_HDQ_GPIO_BITBANG)  += hdq.o
diff --git a/target/linux/s3c24xx/patches-2.6.30/055-gta02-leds.patch b/target/linux/s3c24xx/patches-2.6.30/055-gta02-leds.patch
deleted file mode 100644
index 7f5514503..000000000
--- a/target/linux/s3c24xx/patches-2.6.30/055-gta02-leds.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -227,6 +227,12 @@ config LEDS_BD2802
- 	  This option enables support for BD2802GU RGB LED driver chips
- 	  accessed via the I2C bus.
- 
-+config LEDS_GTA02_VIBRATOR
-+	boolean "Vibrator Support for the Openmoko Freerunner GSM phone"
-+	depends on LEDS_CLASS && MACH_NEO1973_GTA02
-+ 	help
-+	  This option enables support for the vibrator on the Openmoko Freerunner.
-+
- comment "LED Triggers"
- 
- config LEDS_TRIGGERS
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -30,6 +30,7 @@ obj-$(CONFIG_LEDS_PWM)			+= leds-pwm.o
- 
- # LED SPI Drivers
- obj-$(CONFIG_LEDS_DAC124S085)		+= leds-dac124s085.o
-+obj-$(CONFIG_LEDS_GTA02_VIBRATOR)	+= leds-gta02-vibrator.o
- 
- # LED Triggers
- obj-$(CONFIG_LEDS_TRIGGER_TIMER)	+= ledtrig-timer.o
diff --git a/target/linux/s3c24xx/patches-2.6.30/055-jbt6k74.patch b/target/linux/s3c24xx/patches-2.6.30/055-jbt6k74.patch
deleted file mode 100644
index aa7020536..000000000
--- a/target/linux/s3c24xx/patches-2.6.30/055-jbt6k74.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/drivers/video/display/Kconfig
-+++ b/drivers/video/display/Kconfig
-@@ -21,4 +21,15 @@ config DISPLAY_SUPPORT
- comment "Display hardware drivers"
- 	depends on DISPLAY_SUPPORT
- 
-+config DISPLAY_JBT6K74
-+	tristate "TPO JBT6K74-AS TFT display ASIC control interface"
-+	depends on SPI_MASTER && SYSFS && LCD_CLASS_DEVICE
-+	help
-+	  SPI driver for the control interface of TFT panels containing
-+	  the TPO JBT6K74-AS controller ASIC, such as the TPO TD028TTEC1
-+	  TFT diplay module used in the Openmoko Freerunner GSM phone.
-+
-+	  The control interface is required for display operation, as it
-+	  controls power management, display timing and gamma calibration.
-+
- endmenu
---- a/drivers/video/display/Makefile
-+++ b/drivers/video/display/Makefile
-@@ -3,4 +3,5 @@
- display-objs				:= display-sysfs.o
- 
- obj-$(CONFIG_DISPLAY_SUPPORT)		+= display.o
-+obj-$(CONFIG_DISPLAY_JBT6K74)		+= jbt6k74.o
- 
diff --git a/target/linux/s3c24xx/patches-2.6.30/056-pcf50633.patch b/target/linux/s3c24xx/patches-2.6.30/056-pcf50633.patch
deleted file mode 100644
index dcd8d3aa6..000000000
--- a/target/linux/s3c24xx/patches-2.6.30/056-pcf50633.patch
+++ /dev/null
@@ -1,461 +0,0 @@
---- a/drivers/mfd/pcf50633-core.c
-+++ b/drivers/mfd/pcf50633-core.c
-@@ -15,6 +15,7 @@
- #include <linux/kernel.h>
- #include <linux/device.h>
- #include <linux/sysfs.h>
-+#include <linux/device.h>
- #include <linux/module.h>
- #include <linux/types.h>
- #include <linux/interrupt.h>
-@@ -345,6 +346,8 @@ static void pcf50633_irq_worker(struct w
- 		goto out;
- 	}
- 
-+	pcf50633_reg_write(pcf, PCF50633_REG_OOCSHDWN,	0x04 );  /* defeat 8s death from lowsys on A5 */
-+
- 	/* We immediately read the usb and adapter status. We thus make sure
- 	 * only of USBINS/USBREM IRQ handlers are called */
- 	if (pcf_int[0] & (PCF50633_INT1_USBINS | PCF50633_INT1_USBREM)) {
-@@ -482,13 +485,13 @@ pcf50633_client_dev_register(struct pcf5
- }
- 
- #ifdef CONFIG_PM
--static int pcf50633_suspend(struct device *dev, pm_message_t state)
-+static int pcf50633_suspend(struct i2c_client *client, pm_message_t state)
- {
- 	struct pcf50633 *pcf;
- 	int ret = 0, i;
- 	u8 res[5];
- 
--	pcf = dev_get_drvdata(dev);
-+	pcf = i2c_get_clientdata(client);
- 
- 	/* Make sure our interrupt handlers are not called
- 	 * henceforth */
-@@ -523,12 +526,12 @@ out:
- 	return ret;
- }
- 
--static int pcf50633_resume(struct device *dev)
-+static int pcf50633_resume(struct i2c_client *client)
- {
- 	struct pcf50633 *pcf;
- 	int ret;
- 
--	pcf = dev_get_drvdata(dev);
-+	pcf = i2c_get_clientdata(client);
- 
- 	/* Write the saved mask registers */
- 	ret = pcf50633_write_block(pcf, PCF50633_REG_INT1M,
-@@ -625,6 +628,7 @@ static int __devinit pcf50633_probe(stru
- 	}
- 
- 	if (client->irq) {
-+		set_irq_handler(client->irq, handle_level_irq);
- 		ret = request_irq(client->irq, pcf50633_irq,
- 				IRQF_TRIGGER_LOW, "pcf50633", pcf);
- 
-@@ -683,12 +687,12 @@ static struct i2c_device_id pcf50633_id_
- static struct i2c_driver pcf50633_driver = {
- 	.driver = {
- 		.name	= "pcf50633",
--		.suspend = pcf50633_suspend,
--		.resume	= pcf50633_resume,
- 	},
- 	.id_table = pcf50633_id_table,
- 	.probe = pcf50633_probe,
- 	.remove = __devexit_p(pcf50633_remove),
-+	.suspend = pcf50633_suspend,
-+	.resume	= pcf50633_resume,
- };
- 
- static int __init pcf50633_init(void)
---- a/drivers/power/pcf50633-charger.c
-+++ b/drivers/power/pcf50633-charger.c
-@@ -36,6 +36,7 @@ struct pcf50633_mbc {
- 
- 	struct power_supply usb;
- 	struct power_supply adapter;
-+	struct power_supply ac;
- 
- 	struct delayed_work charging_restart_work;
- };
-@@ -47,16 +48,21 @@ int pcf50633_mbc_usb_curlim_set(struct p
- 	u8 bits;
- 	int charging_start = 1;
- 	u8 mbcs2, chgmod;
-+	unsigned int mbcc5;
- 
--	if (ma >= 1000)
-+	if (ma >= 1000) {
- 		bits = PCF50633_MBCC7_USB_1000mA;
--	else if (ma >= 500)
-+		ma = 1000;
-+	} else if (ma >= 500) {
- 		bits = PCF50633_MBCC7_USB_500mA;
--	else if (ma >= 100)
-+		ma = 500;
-+	} else if (ma >= 100) {
- 		bits = PCF50633_MBCC7_USB_100mA;
--	else {
-+		ma = 100;
-+	} else {
- 		bits = PCF50633_MBCC7_USB_SUSPEND;
- 		charging_start = 0;
-+		ma = 0;
- 	}
- 
- 	ret = pcf50633_reg_set_bit_mask(pcf, PCF50633_REG_MBCC7,
-@@ -66,7 +72,22 @@ int pcf50633_mbc_usb_curlim_set(struct p
- 	else
- 		dev_info(pcf->dev, "usb curlim to %d mA\n", ma);
- 
--	/* Manual charging start */
-+	/*
-+	 * We limit the charging current to be the USB current limit.
-+	 * The reason is that on pcf50633, when it enters PMU Standby mode,
-+	 * which it does when the device goes "off", the USB current limit
-+	 * reverts to the variant default.  In at least one common case, that
-+	 * default is 500mA.  By setting the charging current to be the same
-+	 * as the USB limit we set here before PMU standby, we enforce it only
-+	 * using the correct amount of current even when the USB current limit
-+	 * gets reset to the wrong thing
-+	 */
-+
-+	mbcc5 = (ma << 8) / mbc->pcf->pdata->chg_ref_current_ma;
-+	if (mbcc5 > 255)
-+		mbcc5 = 255;
-+	pcf50633_reg_write(mbc->pcf, PCF50633_REG_MBCC5, mbcc5);
-+
- 	mbcs2 = pcf50633_reg_read(pcf, PCF50633_REG_MBCS2);
- 	chgmod = (mbcs2 & PCF50633_MBCS2_MBC_MASK);
- 
-@@ -81,7 +102,7 @@ int pcf50633_mbc_usb_curlim_set(struct p
- 				PCF50633_MBCC1_RESUME, PCF50633_MBCC1_RESUME);
- 
- 	mbc->usb_active = charging_start;
--
-+	
- 	power_supply_changed(&mbc->usb);
- 
- 	return ret;
-@@ -156,9 +177,44 @@ static ssize_t set_usblim(struct device 
- 
- static DEVICE_ATTR(usb_curlim, S_IRUGO | S_IWUSR, show_usblim, set_usblim);
- 
-+static ssize_t
-+show_chglim(struct device *dev, struct device_attribute *attr, char *buf)
-+{
-+	struct pcf50633_mbc *mbc = dev_get_drvdata(dev);
-+	u8 mbcc5 = pcf50633_reg_read(mbc->pcf, PCF50633_REG_MBCC5);
-+	unsigned int ma;
-+
-+	ma = (mbc->pcf->pdata->chg_ref_current_ma *  mbcc5) >> 8;
-+
-+	return sprintf(buf, "%u\n", ma);
-+}
-+
-+static ssize_t set_chglim(struct device *dev,
-+		struct device_attribute *attr, const char *buf, size_t count)
-+{
-+	struct pcf50633_mbc *mbc = dev_get_drvdata(dev);
-+	unsigned long ma;
-+	unsigned int mbcc5;
-+	int ret;
-+
-+	ret = strict_strtoul(buf, 10, &ma);
-+	if (ret)
-+		return -EINVAL;
-+
-+	mbcc5 = (ma << 8) / mbc->pcf->pdata->chg_ref_current_ma;
-+	if (mbcc5 > 255)
-+		mbcc5 = 255;
-+	pcf50633_reg_write(mbc->pcf, PCF50633_REG_MBCC5, mbcc5);
-+
-+	return count;
-+}
-+
-+static DEVICE_ATTR(chg_curlim, S_IRUGO | S_IWUSR, show_chglim, set_chglim);
-+
- static struct attribute *pcf50633_mbc_sysfs_entries[] = {
- 	&dev_attr_chgmode.attr,
- 	&dev_attr_usb_curlim.attr,
-+	&dev_attr_chg_curlim.attr,
- 	NULL,
- };
- 
-@@ -239,6 +295,7 @@ pcf50633_mbc_irq_handler(int irq, void *
- 
- 	power_supply_changed(&mbc->usb);
- 	power_supply_changed(&mbc->adapter);
-+	power_supply_changed(&mbc->ac);
- 
- 	if (mbc->pcf->pdata->mbc_event_callback)
- 		mbc->pcf->pdata->mbc_event_callback(mbc->pcf, irq);
-@@ -248,8 +305,7 @@ static int adapter_get_property(struct p
- 			enum power_supply_property psp,
- 			union power_supply_propval *val)
- {
--	struct pcf50633_mbc *mbc = container_of(psy,
--				struct pcf50633_mbc, adapter);
-+	struct pcf50633_mbc *mbc = container_of(psy, struct pcf50633_mbc, adapter);
- 	int ret = 0;
- 
- 	switch (psp) {
-@@ -269,10 +325,34 @@ static int usb_get_property(struct power
- {
- 	struct pcf50633_mbc *mbc = container_of(psy, struct pcf50633_mbc, usb);
- 	int ret = 0;
-+	u8 usblim = pcf50633_reg_read(mbc->pcf, PCF50633_REG_MBCC7) &
-+						PCF50633_MBCC7_USB_MASK;
- 
- 	switch (psp) {
- 	case POWER_SUPPLY_PROP_ONLINE:
--		val->intval = mbc->usb_online;
-+		val->intval = mbc->usb_online &&
-+			       	(usblim <= PCF50633_MBCC7_USB_500mA);
-+		break;
-+	default:
-+		ret = -EINVAL;
-+		break;
-+	}
-+	return ret;
-+}
-+
-+static int ac_get_property(struct power_supply *psy,
-+			enum power_supply_property psp,
-+			union power_supply_propval *val)
-+{
-+	struct pcf50633_mbc *mbc = container_of(psy, struct pcf50633_mbc, ac);
-+	int ret = 0;
-+	u8 usblim = pcf50633_reg_read(mbc->pcf, PCF50633_REG_MBCC7) &
-+						PCF50633_MBCC7_USB_MASK;
-+
-+	switch (psp) {
-+	case POWER_SUPPLY_PROP_ONLINE:
-+		val->intval = mbc->usb_online &&
-+			       	(usblim == PCF50633_MBCC7_USB_1000mA);
- 		break;
- 	default:
- 		ret = -EINVAL;
-@@ -337,6 +417,17 @@ static int __devinit pcf50633_mbc_probe(
- 	mbc->usb.supplied_to		= mbc->pcf->pdata->batteries;
- 	mbc->usb.num_supplicants	= mbc->pcf->pdata->num_batteries;
- 
-+	mbc->ac.name			= "ac";
-+	mbc->ac.type			= POWER_SUPPLY_TYPE_MAINS;
-+	mbc->ac.properties		= power_props;
-+	mbc->ac.num_properties		= ARRAY_SIZE(power_props);
-+	mbc->ac.get_property		= ac_get_property;
-+	mbc->ac.supplied_to		= mbc->pcf->pdata->batteries;
-+	mbc->ac.num_supplicants		= mbc->pcf->pdata->num_batteries;
-+
-+	INIT_DELAYED_WORK(&mbc->charging_restart_work,
-+				pcf50633_mbc_charging_restart);
-+
- 	ret = power_supply_register(&pdev->dev, &mbc->adapter);
- 	if (ret) {
- 		dev_err(mbc->pcf->dev, "failed to register adapter\n");
-@@ -352,9 +443,15 @@ static int __devinit pcf50633_mbc_probe(
- 		return ret;
- 	}
- 
--	INIT_DELAYED_WORK(&mbc->charging_restart_work,
--				pcf50633_mbc_charging_restart);
--
-+	ret = power_supply_register(&pdev->dev, &mbc->ac);
-+	if (ret) {
-+		dev_err(mbc->pcf->dev, "failed to register ac\n");
-+		power_supply_unregister(&mbc->adapter);
-+		power_supply_unregister(&mbc->usb);
-+		kfree(mbc);
-+		return ret;
-+	}
-+	
- 	ret = sysfs_create_group(&pdev->dev.kobj, &mbc_attr_group);
- 	if (ret)
- 		dev_err(mbc->pcf->dev, "failed to create sysfs entries\n");
---- a/drivers/rtc/rtc-pcf50633.c
-+++ b/drivers/rtc/rtc-pcf50633.c
-@@ -58,6 +58,7 @@ struct pcf50633_time {
- struct pcf50633_rtc {
- 	int alarm_enabled;
- 	int second_enabled;
-+	int alarm_pending;
- 
- 	struct pcf50633 *pcf;
- 	struct rtc_device *rtc_dev;
-@@ -70,7 +71,7 @@ static void pcf2rtc_time(struct rtc_time
- 	rtc->tm_hour = bcd2bin(pcf->time[PCF50633_TI_HOUR]);
- 	rtc->tm_wday = bcd2bin(pcf->time[PCF50633_TI_WKDAY]);
- 	rtc->tm_mday = bcd2bin(pcf->time[PCF50633_TI_DAY]);
--	rtc->tm_mon = bcd2bin(pcf->time[PCF50633_TI_MONTH]);
-+	rtc->tm_mon = bcd2bin(pcf->time[PCF50633_TI_MONTH]) - 1;
- 	rtc->tm_year = bcd2bin(pcf->time[PCF50633_TI_YEAR]) + 100;
- }
- 
-@@ -81,7 +82,7 @@ static void rtc2pcf_time(struct pcf50633
- 	pcf->time[PCF50633_TI_HOUR] = bin2bcd(rtc->tm_hour);
- 	pcf->time[PCF50633_TI_WKDAY] = bin2bcd(rtc->tm_wday);
- 	pcf->time[PCF50633_TI_DAY] = bin2bcd(rtc->tm_mday);
--	pcf->time[PCF50633_TI_MONTH] = bin2bcd(rtc->tm_mon);
-+	pcf->time[PCF50633_TI_MONTH] = bin2bcd(rtc->tm_mon + 1);
- 	pcf->time[PCF50633_TI_YEAR] = bin2bcd(rtc->tm_year % 100);
- }
- 
-@@ -209,6 +210,7 @@ static int pcf50633_rtc_read_alarm(struc
- 	rtc = dev_get_drvdata(dev);
- 
- 	alrm->enabled = rtc->alarm_enabled;
-+	alrm->pending = rtc->alarm_pending;
- 
- 	ret = pcf50633_read_block(rtc->pcf, PCF50633_REG_RTCSCA,
- 				PCF50633_TI_EXTENT, &pcf_tm.time[0]);
-@@ -244,9 +246,12 @@ static int pcf50633_rtc_set_alarm(struct
- 	/* Returns 0 on success */
- 	ret = pcf50633_write_block(rtc->pcf, PCF50633_REG_RTCSCA,
- 				PCF50633_TI_EXTENT, &pcf_tm.time[0]);
-+	if (!alrm->enabled)
-+		rtc->alarm_pending = 0;
- 
--	if (!alarm_masked)
-+	if (!alarm_masked || alrm->enabled)
- 		pcf50633_irq_unmask(rtc->pcf, PCF50633_IRQ_ALARM);
-+	rtc->alarm_enabled = alrm->enabled;
- 
- 	return ret;
- }
-@@ -267,6 +272,7 @@ static void pcf50633_rtc_irq(int irq, vo
- 	switch (irq) {
- 	case PCF50633_IRQ_ALARM:
- 		rtc_update_irq(rtc->rtc_dev, 1, RTC_AF | RTC_IRQF);
-+		rtc->alarm_pending = 1;
- 		break;
- 	case PCF50633_IRQ_SECOND:
- 		rtc_update_irq(rtc->rtc_dev, 1, RTC_UF | RTC_IRQF);
---- a/include/linux/mfd/pcf50633/core.h
-+++ b/include/linux/mfd/pcf50633/core.h
-@@ -31,6 +31,8 @@ struct pcf50633_platform_data {
- 
- 	int charging_restart_interval;
- 
-+	int chg_ref_current_ma;
-+
- 	/* Callbacks */
- 	void (*probe_done)(struct pcf50633 *);
- 	void (*mbc_event_callback)(struct pcf50633 *, int);
-@@ -208,7 +210,8 @@ enum pcf50633_reg_int5 {
- };
- 
- /* misc. registers */
--#define PCF50633_REG_OOCSHDWN	0x0c
-+#define PCF50633_REG_OOCSHDWN		0x0c
-+#define PCF50633_OOCSHDWN_GOSTDBY 	0x01
- 
- /* LED registers */
- #define PCF50633_REG_LEDOUT 0x28
---- a/drivers/regulator/pcf50633-regulator.c
-+++ b/drivers/regulator/pcf50633-regulator.c
-@@ -24,11 +24,12 @@
- #include <linux/mfd/pcf50633/core.h>
- #include <linux/mfd/pcf50633/pmic.h>
- 
--#define PCF50633_REGULATOR(_name, _id) 		\
-+#define PCF50633_REGULATOR(_name, _id, _n) 		\
- 	{					\
- 		.name = _name, 			\
- 		.id = _id,			\
- 		.ops = &pcf50633_regulator_ops,	\
-+		.n_voltages = _n, \
- 		.type = REGULATOR_VOLTAGE, 	\
- 		.owner = THIS_MODULE, 		\
- 	}
-@@ -193,6 +194,40 @@ static int pcf50633_regulator_get_voltag
- 	return millivolts * 1000;
- }
- 
-+static int pcf50633_regulator_list_voltage(struct regulator_dev *rdev,
-+						unsigned int index)
-+{
-+	struct pcf50633 *pcf;
-+	int regulator_id, millivolts;
-+
-+	pcf = rdev_get_drvdata(rdev);;
-+
-+	regulator_id = rdev_get_id(rdev);
-+
-+	switch (regulator_id) {
-+	case PCF50633_REGULATOR_AUTO:
-+		millivolts = auto_voltage_value(index + 0x2f);
-+		break;
-+	case PCF50633_REGULATOR_DOWN1:
-+	case PCF50633_REGULATOR_DOWN2:
-+		millivolts = down_voltage_value(index);
-+		break;
-+	case PCF50633_REGULATOR_LDO1:
-+	case PCF50633_REGULATOR_LDO2:
-+	case PCF50633_REGULATOR_LDO3:
-+	case PCF50633_REGULATOR_LDO4:
-+	case PCF50633_REGULATOR_LDO5:
-+	case PCF50633_REGULATOR_LDO6:
-+	case PCF50633_REGULATOR_HCLDO:
-+		millivolts = ldo_voltage_value(index);
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	return millivolts * 1000;
-+}
-+
- static int pcf50633_regulator_enable(struct regulator_dev *rdev)
- {
- 	struct pcf50633 *pcf = rdev_get_drvdata(rdev);
-@@ -246,6 +281,7 @@ static int pcf50633_regulator_is_enabled
- static struct regulator_ops pcf50633_regulator_ops = {
- 	.set_voltage = pcf50633_regulator_set_voltage,
- 	.get_voltage = pcf50633_regulator_get_voltage,
-+	.list_voltage = pcf50633_regulator_list_voltage,
- 	.enable = pcf50633_regulator_enable,
- 	.disable = pcf50633_regulator_disable,
- 	.is_enabled = pcf50633_regulator_is_enabled,
-@@ -253,27 +289,27 @@ static struct regulator_ops pcf50633_reg
- 
- static struct regulator_desc regulators[] = {
- 	[PCF50633_REGULATOR_AUTO] =
--		PCF50633_REGULATOR("auto", PCF50633_REGULATOR_AUTO),
-+		PCF50633_REGULATOR("auto", PCF50633_REGULATOR_AUTO, 80),
- 	[PCF50633_REGULATOR_DOWN1] =
--		PCF50633_REGULATOR("down1", PCF50633_REGULATOR_DOWN1),
-+		PCF50633_REGULATOR("down1", PCF50633_REGULATOR_DOWN1, 95),
- 	[PCF50633_REGULATOR_DOWN2] =
--		PCF50633_REGULATOR("down2", PCF50633_REGULATOR_DOWN2),
-+		PCF50633_REGULATOR("down2", PCF50633_REGULATOR_DOWN2, 95),
- 	[PCF50633_REGULATOR_LDO1] =
--		PCF50633_REGULATOR("ldo1", PCF50633_REGULATOR_LDO1),
-+		PCF50633_REGULATOR("ldo1", PCF50633_REGULATOR_LDO1, 27),
- 	[PCF50633_REGULATOR_LDO2] =
--		PCF50633_REGULATOR("ldo2", PCF50633_REGULATOR_LDO2),
-+		PCF50633_REGULATOR("ldo2", PCF50633_REGULATOR_LDO2, 27),
- 	[PCF50633_REGULATOR_LDO3] =
--		PCF50633_REGULATOR("ldo3", PCF50633_REGULATOR_LDO3),
-+		PCF50633_REGULATOR("ldo3", PCF50633_REGULATOR_LDO3, 27),
- 	[PCF50633_REGULATOR_LDO4] =
--		PCF50633_REGULATOR("ldo4", PCF50633_REGULATOR_LDO4),
-+		PCF50633_REGULATOR("ldo4", PCF50633_REGULATOR_LDO4, 27),
- 	[PCF50633_REGULATOR_LDO5] =
--		PCF50633_REGULATOR("ldo5", PCF50633_REGULATOR_LDO5),
-+		PCF50633_REGULATOR("ldo5", PCF50633_REGULATOR_LDO5, 27),
- 	[PCF50633_REGULATOR_LDO6] =
--		PCF50633_REGULATOR("ldo6", PCF50633_REGULATOR_LDO6),
-+		PCF50633_REGULATOR("ldo6", PCF50633_REGULATOR_LDO6, 27),
- 	[PCF50633_REGULATOR_HCLDO] =
--		PCF50633_REGULATOR("hcldo", PCF50633_REGULATOR_HCLDO),
-+		PCF50633_REGULATOR("hcldo", PCF50633_REGULATOR_HCLDO, 26),
- 	[PCF50633_REGULATOR_MEMLDO] =
--		PCF50633_REGULATOR("memldo", PCF50633_REGULATOR_MEMLDO),
-+		PCF50633_REGULATOR("memldo", PCF50633_REGULATOR_MEMLDO, 27),
- };
- 
- static int __devinit pcf50633_regulator_probe(struct platform_device *pdev)
diff --git a/target/linux/s3c24xx/patches-2.6.30/057-lis302dl.patch b/target/linux/s3c24xx/patches-2.6.30/057-lis302dl.patch
deleted file mode 100644
index ebb194bf3..000000000
--- a/target/linux/s3c24xx/patches-2.6.30/057-lis302dl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/drivers/input/misc/Kconfig
-+++ b/drivers/input/misc/Kconfig
-@@ -220,6 +220,15 @@ config HP_SDC_RTC
- 	  Say Y here if you want to support the built-in real time clock
- 	  of the HP SDC controller.
- 
-+config INPUT_LIS302DL
-+	tristate "STmicro LIS302DL 3-axis accelerometer"
-+	depends on SPI_MASTER
-+	help
-+	  SPI driver for the STmicro LIS302DL 3-axis accelerometer.
-+
-+	  The userspece interface is a 3-axis (X/Y/Z) relative movement
-+	  Linux input device, reporting REL_[XYZ] events.
-+
- config INPUT_PCF50633_PMU
- 	tristate "PCF50633 PMU events"
- 	depends on MFD_PCF50633
---- a/drivers/input/misc/Makefile
-+++ b/drivers/input/misc/Makefile
-@@ -25,3 +25,4 @@ obj-$(CONFIG_INPUT_UINPUT)		+= uinput.o
- obj-$(CONFIG_INPUT_WISTRON_BTNS)	+= wistron_btns.o
- obj-$(CONFIG_INPUT_YEALINK)		+= yealink.o
- obj-$(CONFIG_INPUT_GPIO_BUTTONS)	+= gpio_buttons.o
-+obj-$(CONFIG_INPUT_LIS302DL)		+= lis302dl.o
diff --git a/target/linux/s3c24xx/patches-2.6.30/058-gta02-wm8752.patch b/target/linux/s3c24xx/patches-2.6.30/058-gta02-wm8752.patch
deleted file mode 100644
index d72f3874f..000000000
--- a/target/linux/s3c24xx/patches-2.6.30/058-gta02-wm8752.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/sound/soc/s3c24xx/Kconfig
-+++ b/sound/soc/s3c24xx/Kconfig
-@@ -42,10 +42,20 @@ config SND_S3C24XX_SOC_JIVE_WM8750
- 	tristate "SoC I2S Audio support for Jive"
- 	depends on SND_S3C24XX_SOC && MACH_JIVE
- 	select SND_SOC_WM8750
-+	select SND_SOC_WM8750_SPI
- 	select SND_S3C2412_SOC_I2S
- 	help
- 	  Sat Y if you want to add support for SoC audio on the Jive.
- 
-+config SND_S3C24XX_SOC_NEO1973_GTA02_WM8753
-+	tristate "SoC I2S Audio support for Openmoko Freerunner - WM8753"
-+	depends on SND_S3C24XX_SOC && MACH_NEO1973_GTA02
-+	select SND_S3C24XX_SOC_I2S
-+	select SND_SOC_WM8753
-+	help
-+	  Say Y if you want to add support for SoC audio on Openmoko Freerunner
-+	  with the WM8753 codec
-+
- config SND_S3C24XX_SOC_SMDK2443_WM9710
- 	tristate "SoC AC97 Audio support for SMDK2443 - WM9710"
- 	depends on SND_S3C24XX_SOC && MACH_SMDK2443
---- a/sound/soc/s3c24xx/Makefile
-+++ b/sound/soc/s3c24xx/Makefile
-@@ -19,9 +19,11 @@ snd-soc-neo1973-wm8753-objs := neo1973_w
- snd-soc-smdk2443-wm9710-objs := smdk2443_wm9710.o
- snd-soc-ln2440sbc-alc650-objs := ln2440sbc_alc650.o
- snd-soc-s3c24xx-uda134x-objs := s3c24xx_uda134x.o
-+snd-soc-neo1973-gta02-wm8753-objs := gta02_wm8753.o
- 
- obj-$(CONFIG_SND_S3C24XX_SOC_JIVE_WM8750) += snd-soc-jive-wm8750.o
- obj-$(CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753) += snd-soc-neo1973-wm8753.o
- obj-$(CONFIG_SND_S3C24XX_SOC_SMDK2443_WM9710) += snd-soc-smdk2443-wm9710.o
- obj-$(CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650) += snd-soc-ln2440sbc-alc650.o
- obj-$(CONFIG_SND_S3C24XX_SOC_S3C24XX_UDA134X) += snd-soc-s3c24xx-uda134x.o
-+obj-$(CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753) += snd-soc-neo1973-gta02-wm8753.o
diff --git a/target/linux/s3c24xx/patches-2.6.30/060-spi-gpio-non-blocking.patch b/target/linux/s3c24xx/patches-2.6.30/060-spi-gpio-non-blocking.patch
deleted file mode 100644
index 3dcf9c048..000000000
--- a/target/linux/s3c24xx/patches-2.6.30/060-spi-gpio-non-blocking.patch
+++ /dev/null
@@ -1,418 +0,0 @@
---- a/arch/arm/mach-s3c2410/include/mach/spi-gpio.h
-+++ b/arch/arm/mach-s3c2410/include/mach/spi-gpio.h
-@@ -21,7 +21,8 @@ struct s3c2410_spigpio_info {
- 	int			 num_chipselect;
- 	int			 bus_num;
- 
--	void (*chip_select)(struct s3c2410_spigpio_info *spi, int cs);
-+	int			 non_blocking_transfer;
-+	void (*chip_select)(struct s3c2410_spigpio_info *spi, int csid, int cs);
- };
- 
- 
---- a/drivers/spi/spi_bitbang.c
-+++ b/drivers/spi/spi_bitbang.c
-@@ -264,6 +264,123 @@ static int spi_bitbang_bufs(struct spi_d
-  * Drivers can provide word-at-a-time i/o primitives, or provide
-  * transfer-at-a-time ones to leverage dma or fifo hardware.
-  */
-+
-+/* Synchronous non blocking transfer */ 
-+int
-+spi_bitbang_transfer_sync(struct spi_device *spi, struct spi_message *m)
-+{
-+	struct spi_bitbang *bitbang = spi_master_get_devdata(spi->master);
-+	struct spi_transfer *t;
-+	unsigned long flags;
-+	int cs_change = 1;
-+	int status;
-+	int nsecs;
-+	int (*setup_transfer)(struct spi_device *, struct spi_transfer *);
-+
-+	/* FIXME this is made-up ... the correct value is known to
-+	 * word-at-a-time bitbang code, and presumably chipselect()
-+	 * should enforce these requirements too?
-+	 */
-+	nsecs = 100;
-+	cs_change = 1;
-+	status = 0;
-+	setup_transfer = NULL;
-+
-+	local_irq_save(flags);
-+	list_for_each_entry (t, &m->transfers, transfer_list) {
-+		/* override or restore speed and wordsize */
-+		if (t->speed_hz || t->bits_per_word) {
-+			setup_transfer = bitbang->setup_transfer;
-+			if (!setup_transfer) {
-+				status = -ENOPROTOOPT;
-+				break;
-+			}
-+		}
-+		if (setup_transfer) {
-+			status = setup_transfer(spi, t);
-+			if (status < 0)
-+				break;
-+		}
-+		
-+		/* set up default clock polarity, and activate chip;
-+		 * this implicitly updates clock and spi modes as
-+		 * previously recorded for this device via setup().
-+		 * (and also deselects any other chip that might be
-+		 * selected ...)
-+		 */
-+		
-+		if (cs_change) {
-+			bitbang->chipselect(spi, BITBANG_CS_ACTIVE);
-+			ndelay(nsecs);
-+		}
-+
-+		cs_change = t->cs_change;
-+		if (!t->tx_buf && !t->rx_buf && t->len) {
-+			status = -EINVAL;
-+			break;
-+		}
-+		
-+		/* transfer data.  the lower level code handles any
-+		 * new dma mappings it needs. our caller always gave
-+		 * us dma-safe buffers.
-+		 */
-+		if (t->len) {
-+			/* REVISIT dma API still needs a designated
-+			 * DMA_ADDR_INVALID; ~0 might be better.
-+			 */
-+			if (!m->is_dma_mapped)
-+				t->rx_dma = t->tx_dma = 0;
-+			status = bitbang->txrx_bufs(spi, t);
-+		}
-+
-+		if (status > 0)
-+			m->actual_length += status;
-+		if (status != t->len) {
-+			/* always report some kind of error */
-+			if (status >= 0)
-+				status = -EREMOTEIO;
-+			break;
-+		}
-+		status = 0;
-+			/* protocol tweaks before next transfer */
-+		if (t->delay_usecs)
-+			udelay(t->delay_usecs);
-+			if (!cs_change)
-+			continue;
-+		if (t->transfer_list.next == &m->transfers)
-+			break;
-+			/* sometimes a short mid-message deselect of the chip
-+		 * may be needed to terminate a mode or command
-+		 */
-+		ndelay(nsecs);
-+		bitbang->chipselect(spi, BITBANG_CS_INACTIVE);
-+		ndelay(nsecs);
-+	}
-+	
-+	m->status = status;
-+	if (m->complete)
-+		m->complete(m->context);
-+
-+	/* restore speed and wordsize */
-+	if (setup_transfer)
-+		setup_transfer(spi, NULL);
-+
-+	/* normally deactivate chipselect ... unless no error and
-+	 * cs_change has hinted that the next message will probably
-+	 * be for this chip too.
-+	 */
-+	if (!(status == 0 && cs_change)) {
-+		ndelay(nsecs);
-+		bitbang->chipselect(spi, BITBANG_CS_INACTIVE);
-+		ndelay(nsecs);
-+	}
-+
-+	local_irq_restore(flags);
-+
-+	return status;
-+}
-+EXPORT_SYMBOL_GPL(spi_bitbang_transfer_sync);
-+
- static void bitbang_work(struct work_struct *work)
- {
- 	struct spi_bitbang	*bitbang =
-@@ -274,120 +391,13 @@ static void bitbang_work(struct work_str
- 	bitbang->busy = 1;
- 	while (!list_empty(&bitbang->queue)) {
- 		struct spi_message	*m;
--		struct spi_device	*spi;
--		unsigned		nsecs;
--		struct spi_transfer	*t = NULL;
--		unsigned		tmp;
--		unsigned		cs_change;
--		int			status;
--		int			(*setup_transfer)(struct spi_device *,
--						struct spi_transfer *);
- 
- 		m = container_of(bitbang->queue.next, struct spi_message,
- 				queue);
- 		list_del_init(&m->queue);
--		spin_unlock_irqrestore(&bitbang->lock, flags);
--
--		/* FIXME this is made-up ... the correct value is known to
--		 * word-at-a-time bitbang code, and presumably chipselect()
--		 * should enforce these requirements too?
--		 */
--		nsecs = 100;
--
--		spi = m->spi;
--		tmp = 0;
--		cs_change = 1;
--		status = 0;
--		setup_transfer = NULL;
--
--		list_for_each_entry (t, &m->transfers, transfer_list) {
--
--			/* override or restore speed and wordsize */
--			if (t->speed_hz || t->bits_per_word) {
--				setup_transfer = bitbang->setup_transfer;
--				if (!setup_transfer) {
--					status = -ENOPROTOOPT;
--					break;
--				}
--			}
--			if (setup_transfer) {
--				status = setup_transfer(spi, t);
--				if (status < 0)
--					break;
--			}
--
--			/* set up default clock polarity, and activate chip;
--			 * this implicitly updates clock and spi modes as
--			 * previously recorded for this device via setup().
--			 * (and also deselects any other chip that might be
--			 * selected ...)
--			 */
--			if (cs_change) {
--				bitbang->chipselect(spi, BITBANG_CS_ACTIVE);
--				ndelay(nsecs);
--			}
--			cs_change = t->cs_change;
--			if (!t->tx_buf && !t->rx_buf && t->len) {
--				status = -EINVAL;
--				break;
--			}
--
--			/* transfer data.  the lower level code handles any
--			 * new dma mappings it needs. our caller always gave
--			 * us dma-safe buffers.
--			 */
--			if (t->len) {
--				/* REVISIT dma API still needs a designated
--				 * DMA_ADDR_INVALID; ~0 might be better.
--				 */
--				if (!m->is_dma_mapped)
--					t->rx_dma = t->tx_dma = 0;
--				status = bitbang->txrx_bufs(spi, t);
--			}
--			if (status > 0)
--				m->actual_length += status;
--			if (status != t->len) {
--				/* always report some kind of error */
--				if (status >= 0)
--					status = -EREMOTEIO;
--				break;
--			}
--			status = 0;
--
--			/* protocol tweaks before next transfer */
--			if (t->delay_usecs)
--				udelay(t->delay_usecs);
--
--			if (!cs_change)
--				continue;
--			if (t->transfer_list.next == &m->transfers)
--				break;
--
--			/* sometimes a short mid-message deselect of the chip
--			 * may be needed to terminate a mode or command
--			 */
--			ndelay(nsecs);
--			bitbang->chipselect(spi, BITBANG_CS_INACTIVE);
--			ndelay(nsecs);
--		}
--
--		m->status = status;
--		m->complete(m->context);
--
--		/* restore speed and wordsize */
--		if (setup_transfer)
--			setup_transfer(spi, NULL);
--
--		/* normally deactivate chipselect ... unless no error and
--		 * cs_change has hinted that the next message will probably
--		 * be for this chip too.
--		 */
--		if (!(status == 0 && cs_change)) {
--			ndelay(nsecs);
--			bitbang->chipselect(spi, BITBANG_CS_INACTIVE);
--			ndelay(nsecs);
--		}
- 
-+		spin_unlock_irqrestore(&bitbang->lock, flags);
-+		spi_bitbang_transfer_sync(m->spi, m);
- 		spin_lock_irqsave(&bitbang->lock, flags);
- 	}
- 	bitbang->busy = 0;
-@@ -459,6 +469,9 @@ int spi_bitbang_start(struct spi_bitbang
- 
- 	if (!bitbang->master->transfer)
- 		bitbang->master->transfer = spi_bitbang_transfer;
-+	if (!bitbang->master->transfer_sync && bitbang->non_blocking_transfer)
-+		bitbang->master->transfer_sync = spi_bitbang_transfer_sync;
-+
- 	if (!bitbang->txrx_bufs) {
- 		bitbang->use_dma = 0;
- 		bitbang->txrx_bufs = spi_bitbang_bufs;
---- a/drivers/spi/spi_s3c24xx_gpio.c
-+++ b/drivers/spi/spi_s3c24xx_gpio.c
-@@ -91,7 +91,7 @@ static void s3c2410_spigpio_chipselect(s
- 	struct s3c2410_spigpio *sg = spidev_to_sg(dev);
- 
- 	if (sg->info && sg->info->chip_select)
--		(sg->info->chip_select)(sg->info, value);
-+		(sg->info->chip_select)(sg->info, dev->chip_select, value);
- }
- 
- static int s3c2410_spigpio_probe(struct platform_device *dev)
-@@ -112,14 +112,17 @@ static int s3c2410_spigpio_probe(struct 
- 
- 	platform_set_drvdata(dev, sp);
- 
--	/* copy in the plkatform data */
-+	/* copy in the platform data */
- 	info = sp->info = dev->dev.platform_data;
- 
-+	master->num_chipselect = info->num_chipselect;
-+
- 	/* setup spi bitbang adaptor */
- 	sp->bitbang.master = spi_master_get(master);
- 	sp->bitbang.master->bus_num = info->bus_num;
- 	sp->bitbang.master->num_chipselect = info->num_chipselect;
- 	sp->bitbang.chipselect = s3c2410_spigpio_chipselect;
-+	sp->bitbang.non_blocking_transfer = info->non_blocking_transfer;
- 
- 	sp->bitbang.txrx_word[SPI_MODE_0] = s3c2410_spigpio_txrx_mode0;
- 	sp->bitbang.txrx_word[SPI_MODE_1] = s3c2410_spigpio_txrx_mode1;
---- a/include/linux/mmc/core.h
-+++ b/include/linux/mmc/core.h
-@@ -129,6 +129,8 @@ struct mmc_request {
- struct mmc_host;
- struct mmc_card;
- 
-+extern void mmc_flush_scheduled_work(void);
-+
- extern void mmc_wait_for_req(struct mmc_host *, struct mmc_request *);
- extern int mmc_wait_for_cmd(struct mmc_host *, struct mmc_command *, int);
- extern int mmc_wait_for_app_cmd(struct mmc_host *, struct mmc_card *,
---- a/include/linux/mmc/sdio_ids.h
-+++ b/include/linux/mmc/sdio_ids.h
-@@ -25,5 +25,9 @@
- 
- #define SDIO_VENDOR_ID_MARVELL			0x02df
- #define SDIO_DEVICE_ID_MARVELL_LIBERTAS		0x9103
-+#define SDIO_DEVICE_ID_MARVELL_88W8688		0x9104
-+#define SDIO_VENDOR_ID_ATHEROS			0x0271
-+#define SDIO_DEVICE_ID_ATHEROS_AR6001		0x0100
-+#define SDIO_DEVICE_ID_ATHEROS_AR6002		0x0200
- 
- #endif
---- a/include/linux/spi/spi_bitbang.h
-+++ b/include/linux/spi/spi_bitbang.h
-@@ -31,6 +31,9 @@ struct spi_bitbang {
- 	u8			use_dma;
- 	u8			flags;		/* extra spi->mode support */
- 
-+	/* Support for synchronous non blocking transfers */
-+	int 			non_blocking_transfer; 
-+
- 	struct spi_master	*master;
- 
- 	/* setup_transfer() changes clock and/or wordsize to match settings
-@@ -62,6 +65,8 @@ extern void spi_bitbang_cleanup(struct s
- extern int spi_bitbang_transfer(struct spi_device *spi, struct spi_message *m);
- extern int spi_bitbang_setup_transfer(struct spi_device *spi,
- 				      struct spi_transfer *t);
-+extern int spi_bitbang_transfer_sync(struct spi_device *spi,
-+				      struct spi_message *m);
- 
- /* start or stop queue processing */
- extern int spi_bitbang_start(struct spi_bitbang *spi);
---- a/include/linux/spi/spi.h
-+++ b/include/linux/spi/spi.h
-@@ -204,7 +204,6 @@ static inline void spi_unregister_driver
-  *	SPI slaves, and are numbered from zero to num_chipselects.
-  *	each slave has a chipselect signal, but it's common that not
-  *	every chipselect is connected to a slave.
-- * @dma_alignment: SPI controller constraint on DMA buffers alignment.
-  * @setup: updates the device mode and clocking records used by a
-  *	device's SPI controller; protocol code may call this.  This
-  *	must fail if an unrecognized or unsupported mode is requested.
-@@ -240,17 +239,7 @@ struct spi_master {
- 	 */
- 	u16			num_chipselect;
- 
--	/* some SPI controllers pose alignment requirements on DMAable
--	 * buffers; let protocol drivers know about these requirements.
--	 */
--	u16			dma_alignment;
--
--	/* Setup mode and clock, etc (spi driver may call many times).
--	 *
--	 * IMPORTANT:  this may be called when transfers to another
--	 * device are active.  DO NOT UPDATE SHARED REGISTERS in ways
--	 * which could break those transfers.
--	 */
-+	/* setup mode and clock, etc (spi driver may call many times) */
- 	int			(*setup)(struct spi_device *spi);
- 
- 	/* bidirectional bulk transfers
-@@ -275,6 +264,13 @@ struct spi_master {
- 	int			(*transfer)(struct spi_device *spi,
- 						struct spi_message *mesg);
- 
-+	/* 
-+	 * Synchronous non blocking transfer function. Should guarantee
-+	 * data availability when it returns 
-+	 */
-+	int			(*transfer_sync)(struct spi_device *spi,
-+						struct spi_message *mesg);
-+
- 	/* called on release() to free memory provided by spi_master */
- 	void			(*cleanup)(struct spi_device *spi);
- };
-@@ -584,6 +580,29 @@ spi_async(struct spi_device *spi, struct
- 	return spi->master->transfer(spi, message);
- }
- 
-+/**
-+ * spi_non_blocking_transfer - Synchronous, non blocking transfer
-+ * @spi: device with which data will be exchanged
-+ * @message: describes the data transfers with optional completion handlers
-+ * Context: any (irqs may be blocked, etc)
-+ *
-+ * Data is guaranteed to be written or read when this function returns.
-+ *
-+ * Note : This may not be supported by all spi masters.
-+ */
-+
-+static inline int
-+spi_non_blocking_transfer(struct spi_device *spi, struct spi_message *message)
-+{
-+	if (unlikely(!spi->master->transfer_sync)) {
-+		dev_err(&spi->master->dev,
-+			       	"non-blocking transfers not supported\n");
-+		return -EIO;
-+	}
-+
-+	return spi->master->transfer_sync(spi, message);
-+}
-+
- /*---------------------------------------------------------------------------*/
- 
- /* All these synchronous SPI transfer routines are utilities layered
diff --git a/target/linux/s3c24xx/patches-2.6.30/068-ar6000.patch b/target/linux/s3c24xx/patches-2.6.30/068-ar6000.patch
deleted file mode 100644
index d5565efab..000000000
--- a/target/linux/s3c24xx/patches-2.6.30/068-ar6000.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -1401,6 +1401,8 @@ source "drivers/usb/Kconfig"
- 
- source "drivers/uwb/Kconfig"
- 
-+source "drivers/ar6000/Kconfig"
-+
- source "drivers/mmc/Kconfig"
- 
- source "drivers/memstick/Kconfig"
---- a/drivers/Makefile
-+++ b/drivers/Makefile
-@@ -91,6 +91,7 @@ obj-$(CONFIG_CPU_IDLE)		+= cpuidle/
- obj-y				+= idle/
- obj-$(CONFIG_MMC)		+= mmc/
- obj-$(CONFIG_MEMSTICK)		+= memstick/
-+obj-$(CONFIG_AR6000_WLAN)	+= ar6000/
- obj-$(CONFIG_NEW_LEDS)		+= leds/
- obj-$(CONFIG_INFINIBAND)	+= infiniband/
- obj-$(CONFIG_SGI_SN)		+= sn/
diff --git a/target/linux/s3c24xx/patches-2.6.30/070-s3c24xx-time.patch b/target/linux/s3c24xx/patches-2.6.30/070-s3c24xx-time.patch
deleted file mode 100644
index 8b850452e..000000000
--- a/target/linux/s3c24xx/patches-2.6.30/070-s3c24xx-time.patch
+++ /dev/null
@@ -1,483 +0,0 @@
---- /dev/null
-+++ b/arch/arm/plat-s3c24xx/time.c
-@@ -0,0 +1,480 @@
-+/* linux/arch/arm/plat-s3c24xx/time.c
-+ *
-+ * Copyright (C) 2003-2005 Simtec Electronics
-+ *	Ben Dooks, <ben@simtec.co.uk>
-+ *
-+ * dyn_tick support by Andrzej Zaborowski based on omap_dyn_tick_timer.
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/sched.h>
-+#include <linux/init.h>
-+#include <linux/interrupt.h>
-+#include <linux/irq.h>
-+#include <linux/err.h>
-+#include <linux/clk.h>
-+
-+#include <asm/system.h>
-+#include <asm/leds.h>
-+#include <asm/mach-types.h>
-+
-+#include <asm/io.h>
-+#include <asm/irq.h>
-+#include <mach/map.h>
-+#include <asm/plat-s3c/regs-timer.h>
-+#include <mach/regs-irq.h>
-+#include <asm/mach/time.h>
-+
-+#include <asm/plat-s3c24xx/clock.h>
-+#include <asm/plat-s3c24xx/cpu.h>
-+
-+static unsigned long timer_startval;
-+static unsigned long timer_usec_ticks;
-+static struct work_struct resume_work;
-+
-+unsigned long pclk;
-+struct clk *clk;
-+
-+#define TIMER_USEC_SHIFT 16
-+
-+/* we use the shifted arithmetic to work out the ratio of timer ticks
-+ * to usecs, as often the peripheral clock is not a nice even multiple
-+ * of 1MHz.
-+ *
-+ * shift of 14 and 15 are too low for the 12MHz, 16 seems to be ok
-+ * for the current HZ value of 200 without producing overflows.
-+ *
-+ * Original patch by Dimitry Andric, updated by Ben Dooks
-+*/
-+
-+
-+/* timer_mask_usec_ticks
-+ *
-+ * given a clock and divisor, make the value to pass into timer_ticks_to_usec
-+ * to scale the ticks into usecs
-+*/
-+
-+static inline unsigned long
-+timer_mask_usec_ticks(unsigned long scaler, unsigned long pclk)
-+{
-+	unsigned long den = pclk / 1000;
-+
-+	return ((1000 << TIMER_USEC_SHIFT) * scaler + (den >> 1)) / den;
-+}
-+
-+/* timer_ticks_to_usec
-+ *
-+ * convert timer ticks to usec.
-+*/
-+
-+static inline unsigned long timer_ticks_to_usec(unsigned long ticks)
-+{
-+	unsigned long res;
-+
-+	res = ticks * timer_usec_ticks;
-+	res += 1 << (TIMER_USEC_SHIFT - 4);	/* round up slightly */
-+
-+	return res >> TIMER_USEC_SHIFT;
-+}
-+
-+/***
-+ * Returns microsecond  since last clock interrupt.  Note that interrupts
-+ * will have been disabled by do_gettimeoffset()
-+ * IRQs are disabled before entering here from do_gettimeofday()
-+ */
-+
-+#define SRCPND_TIMER4 (1<<(IRQ_TIMER4 - IRQ_EINT0))
-+
-+unsigned long s3c2410_gettimeoffset (void)
-+{
-+	unsigned long tdone;
-+	unsigned long irqpend;
-+	unsigned long tval;
-+
-+	/* work out how many ticks have gone since last timer interrupt */
-+
-+        tval =  __raw_readl(S3C2410_TCNTO(4));
-+	tdone = timer_startval - tval;
-+
-+	/* check to see if there is an interrupt pending */
-+
-+	irqpend = __raw_readl(S3C2410_SRCPND);
-+	if (irqpend & SRCPND_TIMER4) {
-+		/* re-read the timer, and try and fix up for the missed
-+		 * interrupt. Note, the interrupt may go off before the
-+		 * timer has re-loaded from wrapping.
-+		 */
-+
-+		tval =  __raw_readl(S3C2410_TCNTO(4));
-+		tdone = timer_startval - tval;
-+
-+		if (tval != 0)
-+			tdone += timer_startval;
-+	}
-+
-+	return timer_ticks_to_usec(tdone);
-+}
-+
-+
-+/*
-+ * IRQ handler for the timer
-+ */
-+static irqreturn_t
-+s3c2410_timer_interrupt(int irq, void *dev_id)
-+{
-+	timer_tick();
-+	return IRQ_HANDLED;
-+}
-+
-+static struct irqaction s3c2410_timer_irq = {
-+	.name		= "S3C2410 Timer Tick",
-+	.flags		= IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
-+	.handler	= s3c2410_timer_interrupt,
-+};
-+
-+#define use_tclk1_12() ( \
-+	machine_is_bast()	|| \
-+	machine_is_vr1000()	|| \
-+	machine_is_anubis()	|| \
-+	machine_is_osiris() )
-+
-+/*
-+ * Set up timer interrupt, and return the current time in seconds.
-+ *
-+ * Currently we only use timer4, as it is the only timer which has no
-+ * other function that can be exploited externally
-+ */
-+static void s3c2410_timer_setup (void)
-+{
-+	unsigned long tcon;
-+	unsigned long tcnt;
-+	unsigned long tcfg1;
-+	unsigned long tcfg0;
-+
-+	tcnt = 0xffff;  /* default value for tcnt */
-+
-+	/* read the current timer configuration bits */
-+
-+	tcon = __raw_readl(S3C2410_TCON);
-+	tcfg1 = __raw_readl(S3C2410_TCFG1);
-+	tcfg0 = __raw_readl(S3C2410_TCFG0);
-+
-+	/* configure the system for whichever machine is in use */
-+
-+	if (use_tclk1_12()) {
-+		/* timer is at 12MHz, scaler is 1 */
-+		timer_usec_ticks = timer_mask_usec_ticks(1, 12000000);
-+		tcnt = 12000000 / HZ;
-+
-+		tcfg1 &= ~S3C2410_TCFG1_MUX4_MASK;
-+		tcfg1 |= S3C2410_TCFG1_MUX4_TCLK1;
-+	} else {
-+		/* since values around 50 to
-+		 * 70MHz are not values we can directly generate the timer
-+		 * value from, we need to pre-scale and divide before using it.
-+		 *
-+		 * for instance, using 50.7MHz and dividing by 6 gives 8.45MHz
-+		 * (8.45 ticks per usec)
-+		 */
-+
-+		/* configure clock tick */
-+		timer_usec_ticks = timer_mask_usec_ticks(6, pclk);
-+		printk("timer_usec_ticks = %lu\n", timer_usec_ticks);
-+
-+		tcfg1 &= ~S3C2410_TCFG1_MUX4_MASK;
-+		tcfg1 |= S3C2410_TCFG1_MUX4_DIV2;
-+
-+		tcfg0 &= ~S3C2410_TCFG_PRESCALER1_MASK;
-+		tcfg0 |= ((6 - 1) / 2) << S3C2410_TCFG_PRESCALER1_SHIFT;
-+
-+		tcnt = (pclk / 6) / HZ;
-+	}
-+
-+	/* timers reload after counting zero, so reduce the count by 1 */
-+
-+	tcnt--;
-+
-+	printk("timer tcon=%08lx, tcnt %04lx, tcfg %08lx,%08lx, usec %08lx\n",
-+	       tcon, tcnt, tcfg0, tcfg1, timer_usec_ticks);
-+
-+	/* check to see if timer is within 16bit range... */
-+	if (tcnt > 0xffff) {
-+		panic("setup_timer: HZ is too small, cannot configure timer!");
-+		return;
-+	}
-+
-+	__raw_writel(tcfg1, S3C2410_TCFG1);
-+	__raw_writel(tcfg0, S3C2410_TCFG0);
-+
-+	timer_startval = tcnt;
-+	__raw_writel(tcnt, S3C2410_TCNTB(4));
-+
-+	/* ensure timer is stopped... */
-+
-+	tcon &= ~(7<<20);
-+	tcon |= S3C2410_TCON_T4RELOAD;
-+	tcon |= S3C2410_TCON_T4MANUALUPD;
-+
-+	__raw_writel(tcon, S3C2410_TCON);
-+	__raw_writel(tcnt, S3C2410_TCNTB(4));
-+	__raw_writel(tcnt, S3C2410_TCMPB(4));
-+
-+	/* start the timer running */
-+	tcon |= S3C2410_TCON_T4START;
-+	tcon &= ~S3C2410_TCON_T4MANUALUPD;
-+	__raw_writel(tcon, S3C2410_TCON);
-+
-+	__raw_writel(__raw_readl(S3C2410_INTMSK) & (~(1UL << 14)),
-+		     S3C2410_INTMSK);
-+
-+}
-+
-+struct sys_timer s3c24xx_timer;
-+static void timer_resume_work(struct work_struct *work)
-+{
-+	clk_enable(clk);
-+
-+#ifdef CONFIG_NO_IDLE_HZ
-+	if (s3c24xx_timer.dyn_tick->state & DYN_TICK_ENABLED)
-+		s3c24xx_timer.dyn_tick->enable();
-+	else
-+#endif
-+		s3c2410_timer_setup();
-+}
-+
-+static void __init s3c2410_timer_init (void)
-+{
-+	if (!use_tclk1_12()) {
-+		/* for the h1940 (and others), we use the pclk from the core
-+		 * to generate the timer values.
-+		 */
-+
-+		/* this is used as default if no other timer can be found */
-+		clk = clk_get(NULL, "timers");
-+		if (IS_ERR(clk))
-+			panic("failed to get clock for system timer");
-+
-+		clk_enable(clk);
-+
-+		pclk = clk_get_rate(clk);
-+		printk("pclk = %lu\n", pclk);
-+	}
-+
-+	INIT_WORK(&resume_work, timer_resume_work);
-+	s3c2410_timer_setup();
-+	setup_irq(IRQ_TIMER4, &s3c2410_timer_irq);
-+}
-+
-+static void s3c2410_timer_resume_work(struct work_struct *work)
-+{
-+	s3c2410_timer_setup();
-+}
-+
-+static void s3c2410_timer_resume(void)
-+{
-+	static DECLARE_WORK(work, s3c2410_timer_resume_work);
-+	int res;
-+
-+	res = schedule_work(&work);
-+	if (!res)
-+		printk(KERN_ERR
-+		    "s3c2410_timer_resume_work already queued ???\n");
-+}
-+
-+#ifdef CONFIG_NO_IDLE_HZ
-+/*
-+ * We'll set a constant prescaler so we don't have to bother setting it
-+ * when reprogramming and so that we avoid costly divisions.
-+ *
-+ * (2 * HZ) << INPUT_FREQ_SHIFT is the desired frequency after prescaler.
-+ * At HZ == 200, HZ * 1024 should work for PCLKs of up to ~53.5 MHz.
-+ */
-+#define INPUT_FREQ_SHIFT	9
-+
-+static int ticks_last;
-+static int ticks_left;
-+static uint32_t tcnto_last;
-+
-+static inline int s3c24xx_timer_read(void)
-+{
-+	uint32_t tcnto = __raw_readl(S3C2410_TCNTO(4));
-+
-+	/*
-+	 * WARNING: sometimes we get called before TCNTB has been
-+	 * loaded into the counter and TCNTO then returns its previous
-+	 * value and kill us, so don't do anything before counter is
-+	 * reloaded.
-+	 */
-+	if (unlikely(tcnto == tcnto_last))
-+		return ticks_last;
-+
-+	tcnto_last = -1;
-+	return tcnto <<
-+		((__raw_readl(S3C2410_TCFG1) >> S3C2410_TCFG1_MUX4_SHIFT) & 3);
-+}
-+
-+static inline void s3c24xx_timer_program(int ticks)
-+{
-+	uint32_t tcon = __raw_readl(S3C2410_TCON) & ~(7 << 20);
-+	uint32_t tcfg1 = __raw_readl(S3C2410_TCFG1) & ~S3C2410_TCFG1_MUX4_MASK;
-+
-+	/* Just make sure the timer is stopped.  */
-+	__raw_writel(tcon, S3C2410_TCON);
-+
-+	/* TODO: add likely()ies / unlikely()ies */
-+	if (ticks >> 18) {
-+		ticks_last = min(ticks, 0xffff << 3);
-+		ticks_left = ticks - ticks_last;
-+		__raw_writel(tcfg1 | S3C2410_TCFG1_MUX4_DIV16, S3C2410_TCFG1);
-+		__raw_writel(ticks_last >> 3, S3C2410_TCNTB(4));
-+	} else if (ticks >> 17) {
-+		ticks_last = ticks;
-+		ticks_left = 0;
-+		__raw_writel(tcfg1 | S3C2410_TCFG1_MUX4_DIV8, S3C2410_TCFG1);
-+		__raw_writel(ticks_last >> 2, S3C2410_TCNTB(4));
-+	} else if (ticks >> 16) {
-+		ticks_last = ticks;
-+		ticks_left = 0;
-+		__raw_writel(tcfg1 | S3C2410_TCFG1_MUX4_DIV4, S3C2410_TCFG1);
-+		__raw_writel(ticks_last >> 1, S3C2410_TCNTB(4));
-+	} else {
-+		ticks_last = ticks;
-+		ticks_left = 0;
-+		__raw_writel(tcfg1 | S3C2410_TCFG1_MUX4_DIV2, S3C2410_TCFG1);
-+		__raw_writel(ticks_last >> 0, S3C2410_TCNTB(4));
-+	}
-+
-+	tcnto_last = __raw_readl(S3C2410_TCNTO(4));
-+	__raw_writel(tcon | S3C2410_TCON_T4MANUALUPD,
-+			S3C2410_TCON);
-+	__raw_writel(tcon | S3C2410_TCON_T4START,
-+			S3C2410_TCON);
-+}
-+
-+/*
-+ * If we have already waited all the time we were supposed to wait,
-+ * kick the timer, setting the longest allowed timeout value just
-+ * for time-keeping.
-+ */
-+static inline void s3c24xx_timer_program_idle(void)
-+{
-+	s3c24xx_timer_program(0xffff << 3);
-+}
-+
-+static inline void s3c24xx_timer_update(int restart)
-+{
-+	int ticks_cur = s3c24xx_timer_read();
-+	int jiffies_elapsed = (ticks_last - ticks_cur) >> INPUT_FREQ_SHIFT;
-+	int subjiffy = ticks_last - (jiffies_elapsed << INPUT_FREQ_SHIFT);
-+
-+	if (restart) {
-+		if (ticks_left >= (1 << INPUT_FREQ_SHIFT))
-+			s3c24xx_timer_program(ticks_left);
-+		else
-+			s3c24xx_timer_program_idle();
-+		ticks_last += subjiffy;
-+	} else
-+		ticks_last = subjiffy;
-+
-+	while (jiffies_elapsed --)
-+		timer_tick();
-+}
-+
-+/* Called when the timer expires.  */
-+static irqreturn_t s3c24xx_timer_handler(int irq, void *dev_id)
-+{
-+	tcnto_last = -1;
-+	s3c24xx_timer_update(1);
-+
-+	return IRQ_HANDLED;
-+}
-+
-+/* Called to update jiffies with time elapsed.  */
-+static irqreturn_t s3c24xx_timer_handler_dyn_tick(int irq, void *dev_id)
-+{
-+	s3c24xx_timer_update(0);
-+
-+	return IRQ_HANDLED;
-+}
-+
-+/*
-+ * Programs the next timer interrupt needed.  Called when dynamic tick is
-+ * enabled, and to reprogram the ticks to skip from pm_idle.  The CPU goes
-+ * to sleep directly after this.
-+ */
-+static void s3c24xx_timer_reprogram_dyn_tick(unsigned long next_jiffies)
-+{
-+	int subjiffy_left = ticks_last - s3c24xx_timer_read();
-+
-+	s3c24xx_timer_program(max((int) next_jiffies, 1) << INPUT_FREQ_SHIFT);
-+	ticks_last += subjiffy_left;
-+}
-+
-+static unsigned long s3c24xx_timer_offset_dyn_tick(void)
-+{
-+	/* TODO */
-+	return 0;
-+}
-+
-+static int s3c24xx_timer_enable_dyn_tick(void)
-+{
-+	/* Set our constant prescaler.  */
-+	uint32_t tcfg0 = __raw_readl(S3C2410_TCFG0);
-+	int prescaler =
-+		max(min(256, (int) pclk / (HZ << (INPUT_FREQ_SHIFT + 1))), 1);
-+
-+	tcfg0 &= ~S3C2410_TCFG_PRESCALER1_MASK;
-+	tcfg0 |= (prescaler - 1) << S3C2410_TCFG_PRESCALER1_SHIFT;
-+	__raw_writel(tcfg0, S3C2410_TCFG0);
-+
-+	/* Override handlers.  */
-+	s3c2410_timer_irq.handler = s3c24xx_timer_handler;
-+	s3c24xx_timer.offset = s3c24xx_timer_offset_dyn_tick;
-+
-+	printk(KERN_INFO "dyn_tick enabled on s3c24xx timer 4, "
-+			"%li Hz pclk with prescaler %i\n", pclk, prescaler);
-+
-+	s3c24xx_timer_program_idle();
-+
-+	return 0;
-+}
-+
-+static int s3c24xx_timer_disable_dyn_tick(void)
-+{
-+	s3c2410_timer_irq.handler = s3c2410_timer_interrupt;
-+	s3c24xx_timer.offset = s3c2410_gettimeoffset;
-+	s3c2410_timer_setup();
-+
-+	return 0;
-+}
-+
-+static struct dyn_tick_timer s3c24xx_dyn_tick_timer = {
-+	.enable		= s3c24xx_timer_enable_dyn_tick,
-+	.disable	= s3c24xx_timer_disable_dyn_tick,
-+	.reprogram	= s3c24xx_timer_reprogram_dyn_tick,
-+	.handler	= s3c24xx_timer_handler_dyn_tick,
-+};
-+#endif	/* CONFIG_NO_IDLE_HZ */
-+
-+struct sys_timer s3c24xx_timer = {
-+	.init		= s3c2410_timer_init,
-+	.offset		= s3c2410_gettimeoffset,
-+	.resume		= s3c2410_timer_resume,
-+#ifdef CONFIG_NO_IDLE_HZ
-+	.dyn_tick	= &s3c24xx_dyn_tick_timer,
-+#endif
-+};
diff --git a/target/linux/s3c24xx/patches-2.6.30/080-nr-tty-devices.patch b/target/linux/s3c24xx/patches-2.6.30/080-nr-tty-devices.patch
deleted file mode 100644
index e58152d0c..000000000
--- a/target/linux/s3c24xx/patches-2.6.30/080-nr-tty-devices.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/include/linux/vt.h
-+++ b/include/linux/vt.h
-@@ -18,8 +18,19 @@ extern int unregister_vt_notifier(struct
-  * resizing).
-  */
- #define MIN_NR_CONSOLES 1       /* must be at least 1 */
-+#if (CONFIG_NR_TTY_DEVICES < 4)
-+/* Lower Limit */
-+#define MAX_NR_CONSOLES	4	/* serial lines start at 64 */
-+#define MAX_NR_USER_CONSOLES 4	/* must be root to allocate above this */
-+#elif (CONFIG_NR_TTY_DEVICES > 63)
-+/* Upper Limit */
- #define MAX_NR_CONSOLES	63	/* serial lines start at 64 */
- #define MAX_NR_USER_CONSOLES 63	/* must be root to allocate above this */
-+#else
-+/* They chose a sensible number */
-+#define MAX_NR_CONSOLES CONFIG_NR_TTY_DEVICES
-+#define MAX_NR_USER_CONSOLES CONFIG_NR_TTY_DEVICES
-+#endif
- 		/* Note: the ioctl VT_GETSTATE does not work for
- 		   consoles 16 and higher (since it returns a short) */
- 
---- a/drivers/char/Kconfig
-+++ b/drivers/char/Kconfig
-@@ -66,6 +66,18 @@ config VT_CONSOLE
- 
- 	  If unsure, say Y.
- 
-+config NR_TTY_DEVICES
-+	int "Maximum tty device number"
-+	depends on VT
-+	default 63
-+	---help---
-+	  This is the highest numbered device created in /dev. You will actually have
-+	  NR_TTY_DEVICES+1 devices in /dev. The default is 63, which will result in
-+	  64 /dev entries. The lowest number you can set is 11, anything below that, 
-+	  and it will default to 11. 63 is also the upper limit so we don't overrun
-+	  the serial consoles.
-+
-+
- config HW_CONSOLE
- 	bool
- 	depends on VT && !S390 && !UML
diff --git a/target/linux/s3c24xx/patches-2.6.30/100-udc-poll-vbus.patch b/target/linux/s3c24xx/patches-2.6.30/100-udc-poll-vbus.patch
deleted file mode 100644
index 5658e8d37..000000000
--- a/target/linux/s3c24xx/patches-2.6.30/100-udc-poll-vbus.patch
+++ /dev/null
@@ -1,224 +0,0 @@
---- a/drivers/usb/gadget/s3c2410_udc.c
-+++ b/drivers/usb/gadget/s3c2410_udc.c
-@@ -74,6 +74,7 @@ static void __iomem		*base_addr;
- static u64			rsrc_start;
- static u64			rsrc_len;
- static struct dentry		*s3c2410_udc_debugfs_root;
-+static struct timer_list	vbus_poll_timer;
- 
- static inline u32 udc_read(u32 reg)
- {
-@@ -134,6 +135,8 @@ static int dprintk(int level, const char
- 	return 0;
- }
- #endif
-+
-+#ifdef CONFIG_USB_GADGET_DEBUG_FS
- static int s3c2410_udc_debugfs_seq_show(struct seq_file *m, void *p)
- {
- 	u32 addr_reg,pwr_reg,ep_int_reg,usb_int_reg;
-@@ -197,6 +200,7 @@ static const struct file_operations s3c2
- 	.release	= single_release,
- 	.owner		= THIS_MODULE,
- };
-+#endif
- 
- /* io macros */
- 
-@@ -843,6 +847,7 @@ static void s3c2410_udc_handle_ep(struct
- 	u32			ep_csr1;
- 	u32			idx;
- 
-+handle_ep_again:
- 	if (likely (!list_empty(&ep->queue)))
- 		req = list_entry(ep->queue.next,
- 				struct s3c2410_request, queue);
-@@ -882,6 +887,8 @@ static void s3c2410_udc_handle_ep(struct
- 
- 		if ((ep_csr1 & S3C2410_UDC_OCSR1_PKTRDY) && req) {
- 			s3c2410_udc_read_fifo(ep,req);
-+			if (s3c2410_udc_fifo_count_out())
-+				goto handle_ep_again;
- 		}
- 	}
- }
-@@ -1520,6 +1527,20 @@ static irqreturn_t s3c2410_udc_vbus_irq(
- 	return IRQ_HANDLED;
- }
- 
-+static void s3c2410_udc_vbus_poll(unsigned long _data)
-+{
-+	struct s3c2410_udc	*data = (struct s3c2410_udc *)_data;
-+	int			v;
-+
-+	dprintk(DEBUG_NORMAL, "%s()\n", __func__);
-+	if (udc_info && udc_info->get_vbus_status) {
-+		v = udc_info->get_vbus_status();
-+		if ((v > -1) && (v != data->vbus))
-+			s3c2410_udc_vbus_session(&data->gadget, v);
-+		mod_timer(&vbus_poll_timer, jiffies + msecs_to_jiffies(900));
-+	}
-+}
-+
- static int s3c2410_vbus_draw(struct usb_gadget *_gadget, unsigned ma)
- {
- 	dprintk(DEBUG_NORMAL, "%s()\n", __func__);
-@@ -1677,6 +1698,11 @@ int usb_gadget_register_driver(struct us
- 		goto register_error;
- 	}
- 
-+	if (udc_info && udc_info->get_vbus_status && !udc_info->vbus_pin) {
-+		mod_timer(&vbus_poll_timer, jiffies + msecs_to_jiffies(50));
-+		return 0; /* just return, vbus change will enable udc */
-+	}
-+
- 	/* Enable udc */
- 	s3c2410_udc_enable(udc);
- 
-@@ -1707,6 +1733,7 @@ int usb_gadget_unregister_driver(struct 
- 	if (driver->disconnect)
- 		driver->disconnect(&udc->gadget);
- 
-+	driver->unbind(&udc->gadget);
- 	device_del(&udc->gadget.dev);
- 	udc->driver = NULL;
- 
-@@ -1893,10 +1920,16 @@ static int s3c2410_udc_probe(struct plat
- 		}
- 
- 		dev_dbg(dev, "got irq %i\n", irq);
-+	} else if (udc_info && udc_info->get_vbus_status) {
-+		udc->vbus = 0;
-+		init_timer(&vbus_poll_timer);
-+		vbus_poll_timer.function = s3c2410_udc_vbus_poll;
-+		vbus_poll_timer.data = (unsigned long) udc;
- 	} else {
- 		udc->vbus = 1;
- 	}
- 
-+#ifdef CONFIG_USB_GADGET_DEBUG_FS
- 	if (s3c2410_udc_debugfs_root) {
- 		udc->regs_info = debugfs_create_file("registers", S_IRUGO,
- 				s3c2410_udc_debugfs_root,
-@@ -1904,6 +1937,7 @@ static int s3c2410_udc_probe(struct plat
- 		if (!udc->regs_info)
- 			dev_warn(dev, "debugfs file creation failed\n");
- 	}
-+#endif
- 
- 	dev_dbg(dev, "probe ok\n");
- 
-@@ -1939,6 +1973,8 @@ static int s3c2410_udc_remove(struct pla
- 	if (udc_info && udc_info->vbus_pin > 0) {
- 		irq = gpio_to_irq(udc_info->vbus_pin);
- 		free_irq(irq, udc);
-+	} else if (udc_info && udc_info->get_vbus_status) {
-+		del_timer_sync(&vbus_poll_timer);
- 	}
- 
- 	free_irq(IRQ_USBD, udc);
-@@ -2013,12 +2049,14 @@ static int __init udc_init(void)
- 
- 	dprintk(DEBUG_NORMAL, "%s: version %s\n", gadget_name, DRIVER_VERSION);
- 
-+#ifdef CONFIG_USB_GADGET_DEBUG_FS
- 	s3c2410_udc_debugfs_root = debugfs_create_dir(gadget_name, NULL);
- 	if (IS_ERR(s3c2410_udc_debugfs_root)) {
- 		printk(KERN_ERR "%s: debugfs dir creation failed %ld\n",
- 			gadget_name, PTR_ERR(s3c2410_udc_debugfs_root));
- 		s3c2410_udc_debugfs_root = NULL;
- 	}
-+#endif
- 
- 	retval = platform_driver_register(&udc_driver_2410);
- 	if (retval)
---- a/drivers/usb/host/ohci-s3c2410.c
-+++ b/drivers/usb/host/ohci-s3c2410.c
-@@ -21,6 +21,8 @@
- 
- #include <linux/platform_device.h>
- #include <linux/clk.h>
-+#include <mach/hardware.h>
-+#include <mach/regs-gpio.h>
- #include <plat/usb-control.h>
- 
- #define valid_port(idx) ((idx) == 1 || (idx) == 2)
-@@ -306,6 +308,42 @@ static void s3c2410_hcd_oc(struct s3c241
- 	local_irq_restore(flags);
- }
- 
-+/* switching of USB pads */
-+static ssize_t show_usb_mode(struct device *dev, struct device_attribute *attr,
-+			     char *buf)
-+{
-+	if (__raw_readl(S3C24XX_MISCCR) & S3C2410_MISCCR_USBHOST)
-+		return sprintf(buf, "host\n");
-+
-+	return sprintf(buf, "device\n");
-+}
-+
-+static ssize_t set_usb_mode(struct device *dev, struct device_attribute *attr,
-+			    const char *buf, size_t count)
-+{
-+	if (!strncmp(buf, "host", 4)) {
-+		printk(KERN_WARNING "s3c2410: changing usb to host\n");
-+		s3c2410_modify_misccr(S3C2410_MISCCR_USBHOST,
-+				      S3C2410_MISCCR_USBHOST);
-+		/* FIXME:
-+		 * - call machine-specific disable-pullup function i
-+		 * - enable +Vbus (if hardware supports it)
-+		 */
-+		s3c2410_gpio_setpin(S3C2410_GPB9, 0);
-+	} else if (!strncmp(buf, "device", 6)) {
-+		printk(KERN_WARNING "s3c2410: changing usb to device\n");
-+		s3c2410_modify_misccr(S3C2410_MISCCR_USBHOST, 0);
-+		s3c2410_gpio_setpin(S3C2410_GPB9, 1);
-+	} else {
-+		printk(KERN_WARNING "s3c2410: unknown mode\n");
-+		return -EINVAL;
-+	}
-+
-+	return count;
-+}
-+
-+static DEVICE_ATTR(usb_mode, S_IRUGO | S_IWUSR, show_usb_mode, set_usb_mode);
-+
- /* may be called without controller electrically present */
- /* may be called with controller, bus, and devices active */
- 
-@@ -486,15 +524,23 @@ static int ohci_hcd_s3c2410_drv_remove(s
- 	return 0;
- }
- 
-+static int ohci_hcd_s3c2410_drv_resume(struct platform_device *pdev)
-+{
-+	struct usb_hcd *hcd = platform_get_drvdata(pdev);
-+
-+	ohci_finish_controller_resume(hcd);
-+	return 0;
-+}
-+
- static struct platform_driver ohci_hcd_s3c2410_driver = {
- 	.probe		= ohci_hcd_s3c2410_drv_probe,
- 	.remove		= ohci_hcd_s3c2410_drv_remove,
- 	.shutdown	= usb_hcd_platform_shutdown,
- 	/*.suspend	= ohci_hcd_s3c2410_drv_suspend, */
--	/*.resume	= ohci_hcd_s3c2410_drv_resume, */
-+	.resume		= ohci_hcd_s3c2410_drv_resume,
- 	.driver		= {
- 		.owner	= THIS_MODULE,
--		.name	= "s3c2410-ohci",
-+		.name	= "s3c-ohci",
- 	},
- };
- 
---- a/arch/arm/plat-s3c24xx/include/plat/udc.h
-+++ b/arch/arm/plat-s3c24xx/include/plat/udc.h
-@@ -27,6 +27,7 @@ enum s3c2410_udc_cmd_e {
- struct s3c2410_udc_mach_info {
- 	void	(*udc_command)(enum s3c2410_udc_cmd_e);
-  	void	(*vbus_draw)(unsigned int ma);
-+	int	(*get_vbus_status)(void);
- 	unsigned int vbus_pin;
- 	unsigned char vbus_pin_inverted;
- };
diff --git a/target/linux/s3c24xx/patches-2.6.30/110-serial.patch b/target/linux/s3c24xx/patches-2.6.30/110-serial.patch
deleted file mode 100644
index e01394b6f..000000000
--- a/target/linux/s3c24xx/patches-2.6.30/110-serial.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/drivers/serial/samsung.c
-+++ b/drivers/serial/samsung.c
-@@ -1263,6 +1263,13 @@ module_exit(s3c24xx_serial_modexit);
- #ifdef CONFIG_SERIAL_SAMSUNG_CONSOLE
- 
- static struct uart_port *cons_uart;
-+static int cons_silenced;
-+
-+void s3c24xx_serial_console_set_silence(int silenced)
-+{
-+	cons_silenced = silenced;
-+}
-+EXPORT_SYMBOL(s3c24xx_serial_console_set_silence);
- 
- static int
- s3c24xx_serial_console_txrdy(struct uart_port *port, unsigned int ufcon)
-@@ -1287,9 +1294,21 @@ static void
- s3c24xx_serial_console_putchar(struct uart_port *port, int ch)
- {
- 	unsigned int ufcon = rd_regl(cons_uart, S3C2410_UFCON);
-+	unsigned int umcon = rd_regl(cons_uart, S3C2410_UMCON);
-+
-+	if (cons_silenced)
-+		return;
-+
-+	/* If auto HW flow control enabled, temporarily turn it off */
-+	if (umcon & S3C2410_UMCOM_AFC)
-+		wr_regl(port, S3C2410_UMCON, (umcon & !S3C2410_UMCOM_AFC));
-+
- 	while (!s3c24xx_serial_console_txrdy(port, ufcon))
- 		barrier();
- 	wr_regb(cons_uart, S3C2410_UTXH, ch);
-+
-+	if (umcon & S3C2410_UMCOM_AFC)
-+		wr_regl(port, S3C2410_UMCON, umcon);
- }
- 
- static void
diff --git a/target/linux/s3c24xx/patches-2.6.30/120-fix-wm8753-reg_cache.patch b/target/linux/s3c24xx/patches-2.6.30/120-fix-wm8753-reg_cache.patch
deleted file mode 100644
index 19d44c9ac..000000000
--- a/target/linux/s3c24xx/patches-2.6.30/120-fix-wm8753-reg_cache.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/sound/soc/codecs/wm8753.c
-+++ b/sound/soc/codecs/wm8753.c
-@@ -79,7 +79,7 @@ static const u16 wm8753_reg[] = {
- 	0x0097, 0x0097, 0x0000, 0x0004,
- 	0x0000, 0x0083, 0x0024, 0x01ba,
- 	0x0000, 0x0083, 0x0024, 0x01ba,
--	0x0000, 0x0000
-+	0x0000, 0x0000, 0x0000
- };
- 
- /* codec private data */
-@@ -1660,11 +1660,11 @@ static int wm8753_register(struct wm8753
- 	codec->set_bias_level = wm8753_set_bias_level;
- 	codec->dai = wm8753_dai;
- 	codec->num_dai = 2;
--	codec->reg_cache_size = ARRAY_SIZE(wm8753->reg_cache);
--	codec->reg_cache = &wm8753->reg_cache;
-+	codec->reg_cache_size = ARRAY_SIZE(wm8753->reg_cache) + 1;
-+	codec->reg_cache = wm8753->reg_cache;
- 	codec->private_data = wm8753;
- 
--	memcpy(codec->reg_cache, wm8753_reg, sizeof(wm8753->reg_cache));
-+	memcpy(codec->reg_cache, wm8753_reg, sizeof(wm8753_reg));
- 	INIT_DELAYED_WORK(&codec->delayed_work, wm8753_work);
- 
- 	ret = wm8753_reset(codec);
diff --git a/target/linux/s3c24xx/patches-2.6.30/130-fix-s3c_gpiolib_getchip.patch b/target/linux/s3c24xx/patches-2.6.30/130-fix-s3c_gpiolib_getchip.patch
deleted file mode 100644
index 9e257bd56..000000000
--- a/target/linux/s3c24xx/patches-2.6.30/130-fix-s3c_gpiolib_getchip.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/arm/mach-s3c2410/include/mach/gpio-core.h
-+++ b/arch/arm/mach-s3c2410/include/mach/gpio-core.h
-@@ -28,7 +28,7 @@ static inline struct s3c_gpio_chip *s3c_
- 		return NULL;
- 
- 	chip = &s3c24xx_gpios[pin/32];
--	return (S3C2410_GPIO_OFFSET(pin) > chip->chip.ngpio) ? chip : NULL;
-+	return (S3C2410_GPIO_OFFSET(pin) < chip->chip.ngpio) ? chip : NULL;
- }
- 
- #endif /* __ASM_ARCH_GPIO_CORE_H */
diff --git a/target/linux/s3c24xx/patches-2.6.30/150-ignore-init-argument.patch b/target/linux/s3c24xx/patches-2.6.30/150-ignore-init-argument.patch
deleted file mode 100644
index 5bdbfad66..000000000
--- a/target/linux/s3c24xx/patches-2.6.30/150-ignore-init-argument.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/init/main.c
-+++ b/init/main.c
-@@ -831,11 +831,11 @@ static noinline int init_post(void)
- 	 * The Bourne shell can be used instead of init if we are
- 	 * trying to recover a really broken machine.
- 	 */
--	if (execute_command) {
--		run_init_process(execute_command);
--		printk(KERN_WARNING "Failed to execute %s.  Attempting "
--					"defaults...\n", execute_command);
--	}
-+	//if (execute_command) {
-+	//	run_init_process(execute_command);
-+	//	printk(KERN_WARNING "Failed to execute %s.  Attempting "
-+	//				"defaults...\n", execute_command);
-+	//}
- 	run_init_process("/etc/preinit");
- 
- 	panic("No init found.  Try passing init= option to kernel.");
diff --git a/target/linux/s3c24xx/profiles/100-gta02-minimal.mk b/target/linux/s3c24xx/profiles/100-gta02-minimal.mk
deleted file mode 100644
index b252889b4..000000000
--- a/target/linux/s3c24xx/profiles/100-gta02-minimal.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/openmoko-gta02-minimal
-  NAME:=Openmoko GTA-02 (minimal)
-  PACKAGES:=
-endef
-
-define Profile/openmoko-gta02-minimal/Description
-	minimal Package set compatible with the Openmoko GTA-02 hardware
-endef
-$(eval $(call Profile,openmoko-gta02-minimal))
-
diff --git a/target/linux/s3c24xx/profiles/101-gta02-full.mk b/target/linux/s3c24xx/profiles/101-gta02-full.mk
deleted file mode 100644
index 966dbd1d2..000000000
--- a/target/linux/s3c24xx/profiles/101-gta02-full.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/openmoko-gta02-full
-  NAME:=Openmoko GTA-02 (full)
-  PACKAGES:=xserver-xorg xf86-video-glamo xf86-input-tslib enlightenment fso-gsm0710muxd python fso-frameworkd fso-gpsd paroli wireless-tools
-endef
-
-define Profile/openmoko-gta02-full/Description
-	Package set with accelerated x11-environment and phone-suite (paroli)
-endef
-$(eval $(call Profile,openmoko-gta02-full))
-
diff --git a/target/linux/sibyte/Makefile b/target/linux/sibyte/Makefile
deleted file mode 100644
index b21860ade..000000000
--- a/target/linux/sibyte/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2006-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-ARCH:=mips
-BOARD:=sibyte
-BOARDNAME:=Broadcom/SiByte SB-1
-FEATURES:=fpu
-CFLAGS:=-Os -pipe -march=sb1 -funit-at-a-time
-
-LINUX_VERSION:=2.6.32.10
-
-include $(INCLUDE_DIR)/target.mk
-
-define Target/Description
-	Build firmware images for Broadcom/SiByte SB-1 boards
-endef
-
-$(eval $(call BuildTarget))
diff --git a/target/linux/sibyte/base-files/etc/inittab b/target/linux/sibyte/base-files/etc/inittab
deleted file mode 100644
index fa7937df4..000000000
--- a/target/linux/sibyte/base-files/etc/inittab
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright (C) 2006-2009 OpenWrt.org
-
-::sysinit:/etc/init.d/rcS
-duart0::askfirst:/bin/ash --login
diff --git a/target/linux/sibyte/config-default b/target/linux/sibyte/config-default
deleted file mode 100644
index 375f2fe30..000000000
--- a/target/linux/sibyte/config-default
+++ /dev/null
@@ -1,208 +0,0 @@
-# CONFIG_32BIT is not set
-CONFIG_64BIT=y
-# CONFIG_AR7 is not set
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_ARCH_SUPPORTS_OPROFILE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-# CONFIG_ARPD is not set
-# CONFIG_BCM47XX is not set
-# CONFIG_BCM63XX is not set
-# CONFIG_BINARY_PRINTF is not set
-CONFIG_BINFMT_ELF32=y
-CONFIG_BITREVERSE=y
-CONFIG_BLOCK_COMPAT=y
-CONFIG_BOOT_ELF32=y
-CONFIG_BROADCOM_PHY=y
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
-# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
-CONFIG_CEVT_SB1250=y
-CONFIG_CFE=y
-CONFIG_CMDLINE="rootfstype=squashfs,jffs2 noinitrd console=duart0,115200"
-CONFIG_COMPAT=y
-# CONFIG_COMPUTONE is not set
-CONFIG_CONNECTOR=m
-CONFIG_CPU_BIG_ENDIAN=y
-# CONFIG_CPU_CAVIUM_OCTEON is not set
-CONFIG_CPU_HAS_LLSC=y
-CONFIG_CPU_HAS_PREFETCH=y
-CONFIG_CPU_HAS_SYNC=y
-# CONFIG_CPU_LITTLE_ENDIAN is not set
-# CONFIG_CPU_LOONGSON2 is not set
-# CONFIG_CPU_MIPS32_R1 is not set
-# CONFIG_CPU_MIPS32_R2 is not set
-# CONFIG_CPU_MIPS64_R1 is not set
-# CONFIG_CPU_MIPS64_R2 is not set
-# CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R10000 is not set
-# CONFIG_CPU_R3000 is not set
-# CONFIG_CPU_R4300 is not set
-# CONFIG_CPU_R4X00 is not set
-# CONFIG_CPU_R5000 is not set
-# CONFIG_CPU_R5432 is not set
-# CONFIG_CPU_R5500 is not set
-# CONFIG_CPU_R6000 is not set
-# CONFIG_CPU_R8000 is not set
-# CONFIG_CPU_RM7000 is not set
-# CONFIG_CPU_RM9000 is not set
-# CONFIG_CPU_SB1_PASS_1 is not set
-# CONFIG_CPU_SB1_PASS_2_112x is not set
-# CONFIG_CPU_SB1_PASS_2_1250 is not set
-# CONFIG_CPU_SB1_PASS_2_2 is not set
-CONFIG_CPU_SB1_PASS_3=y
-# CONFIG_CPU_SB1_PASS_4 is not set
-CONFIG_CPU_SB1=y
-CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_HIGHMEM=y
-# CONFIG_CPU_TX39XX is not set
-# CONFIG_CPU_TX49XX is not set
-# CONFIG_CPU_VR41XX is not set
-CONFIG_CSRC_SB1250=y
-# CONFIG_CYCLADES is not set
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DEVPORT=y
-# CONFIG_DIGIEPCA is not set
-# CONFIG_DM9000 is not set
-CONFIG_DMA_COHERENT=y
-CONFIG_EARLY_PRINTK=y
-CONFIG_FW_LOADER=m
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
-CONFIG_HAVE_IDE=y
-CONFIG_HAVE_MLOCK=y
-CONFIG_HAVE_OPROFILE=y
-CONFIG_HAVE_SYSCALL_WRAPPERS=y
-CONFIG_HW_HAS_PCI=y
-CONFIG_HWMON_DEBUG_CHIP=y
-CONFIG_HWMON=y
-CONFIG_HW_RANDOM=m
-# CONFIG_HZ_100 is not set
-CONFIG_HZ=250
-CONFIG_HZ_250=y
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_SIBYTE=y
-CONFIG_I2C=y
-CONFIG_INITRAMFS_ROOT_GID=0
-CONFIG_INITRAMFS_ROOT_UID=0
-CONFIG_INITRAMFS_SOURCE="../../root"
-CONFIG_INPUT=m
-# CONFIG_IP_ROUTE_VERBOSE is not set
-CONFIG_IRQ_CPU=y
-# CONFIG_ISI is not set
-# CONFIG_LEMOTE_FULONG is not set
-CONFIG_LOG_BUF_SHIFT=15
-# CONFIG_MACH_ALCHEMY is not set
-# CONFIG_MACH_DECSTATION is not set
-# CONFIG_MACH_JAZZ is not set
-# CONFIG_MACH_LOONGSON is not set
-# CONFIG_MACH_TX39XX is not set
-# CONFIG_MACH_TX49XX is not set
-# CONFIG_MACH_VR41XX is not set
-# CONFIG_MIKROTIK_RB532 is not set
-CONFIG_MINI_FO=m
-CONFIG_MIPS32_COMPAT=y
-# CONFIG_MIPS32_N32 is not set
-CONFIG_MIPS32_O32=y
-# CONFIG_MIPS_COBALT is not set
-CONFIG_MIPS_L1_CACHE_SHIFT=5
-# CONFIG_MIPS_MACHINE is not set
-# CONFIG_MIPS_MALTA is not set
-CONFIG_MIPS_MT_DISABLED=y
-# CONFIG_MIPS_MT_SMP is not set
-# CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_SIM is not set
-CONFIG_MIPS=y
-# CONFIG_MOXA_INTELLIO is not set
-# CONFIG_MOXA_SMARTIO is not set
-CONFIG_MTD_PHYSMAP=y
-# CONFIG_N_HDLC is not set
-# CONFIG_NO_IOPORT is not set
-# CONFIG_NXP_STB220 is not set
-# CONFIG_NXP_STB225 is not set
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PHYLIB=y
-CONFIG_PHYS_ADDR_T_64BIT=y
-# CONFIG_PMC_MSP is not set
-# CONFIG_PMC_YOSEMITE is not set
-# CONFIG_PNX8550_JBS is not set
-# CONFIG_PNX8550_STB810 is not set
-# CONFIG_PROBE_INITRD_HEADER is not set
-# CONFIG_PROC_KCORE is not set
-# CONFIG_RIO is not set
-# CONFIG_RISCOM8 is not set
-# CONFIG_ROCKETPORT is not set
-CONFIG_RTC_CLASS=y
-# CONFIG_RTC_DRV_CMOS is not set
-# CONFIG_RTC_DRV_M41T80_WDT is not set
-CONFIG_RTC_DRV_M41T80=y
-CONFIG_SB1250_MAC=y
-# CONFIG_SB1_CERR_STALL is not set
-# CONFIG_SB1_CEX_ALWAYS_FATAL is not set
-# CONFIG_SB1XXX_CORELIS is not set
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-# CONFIG_SCSI_DMA is not set
-CONFIG_SENSORS_LM90=y
-# CONFIG_SERIAL_8250 is not set
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_SERIAL_SB1250_DUART_CONSOLE=y
-CONFIG_SERIAL_SB1250_DUART=y
-# CONFIG_SGI_IP22 is not set
-# CONFIG_SGI_IP27 is not set
-# CONFIG_SGI_IP28 is not set
-# CONFIG_SGI_IP32 is not set
-CONFIG_SIBYTE_BCM1125H=y
-CONFIG_SIBYTE_BCM112X=y
-# CONFIG_SIBYTE_BIGSUR is not set
-# CONFIG_SIBYTE_BUS_WATCHER is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_CFE_CONSOLE is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SIBYTE_DMA_PAGEOPS is not set
-CONFIG_SIBYTE_ENABLE_LDT_IF_PCI=y
-CONFIG_SIBYTE_HAS_LDT=y
-CONFIG_SIBYTE_HAS_ZBUS_PROFILING=y
-# CONFIG_SIBYTE_LITTLESUR is not set
-CONFIG_SIBYTE_RHONE=y
-CONFIG_SIBYTE_SB1xxx_SOC=y
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_SWARM is not set
-# CONFIG_SIBYTE_TBPROF is not set
-# CONFIG_SLOW_WORK is not set
-# CONFIG_SPECIALIX is not set
-# CONFIG_STALDRV is not set
-CONFIG_SWAP_IO_SPACE=y
-# CONFIG_SX is not set
-# CONFIG_SYNCLINK_GT is not set
-# CONFIG_SYNCLINKMP is not set
-CONFIG_SYS_HAS_CPU_SB1=y
-CONFIG_SYS_HAS_EARLY_PRINTK=y
-CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
-CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
-CONFIG_SYSVIPC_COMPAT=y
-# CONFIG_TC35815 is not set
-CONFIG_TRACING_SUPPORT=y
-# CONFIG_WATCHDOG is not set
-CONFIG_WEAK_ORDERING=y
-# CONFIG_WLAN_80211 is not set
-CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/sibyte/image/Makefile b/target/linux/sibyte/image/Makefile
deleted file mode 100644
index 9a25ace61..000000000
--- a/target/linux/sibyte/image/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Copyright (C) 2007-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/image.mk
-
-define Image/BuildKernel
-	cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/$(IMG_PREFIX)-vmlinux
-# uImage
-	dd if=$(KDIR)/vmlinux of=$(KDIR)/$(IMG_PREFIX)-vmlinux bs=64k conv=sync
-	mkimage -A mips -O linux -T kernel -a 0x80100000 -C none -e \
-		0x80100000 \
-		-n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
-		-d $(KDIR)/$(IMG_PREFIX)-vmlinux $(BIN_DIR)/$(IMG_PREFIX)-uImage
-endef
-
-define Image/Build
-	$(call Image/Build/$(1),$(1))
-endef
-
-define Image/Build/jffs2-64k
-	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(1).img bs=65536 conv=sync
-endef
-
-define Image/Build/jffs2-128k
-	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(1).img bs=131072 conv=sync
-	$(call Image/Build/slug,$(1))
-endef
-
-define Image/Build/squashfs
-	$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
-	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(1).img bs=131072 conv=sync
-endef
-
-$(eval $(call BuildImage))
diff --git a/target/linux/sibyte/patches/101-rhone_physmap.patch b/target/linux/sibyte/patches/101-rhone_physmap.patch
deleted file mode 100644
index e0d774e96..000000000
--- a/target/linux/sibyte/patches/101-rhone_physmap.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- a/arch/mips/sibyte/swarm/platform.c
-+++ b/arch/mips/sibyte/swarm/platform.c
-@@ -5,6 +5,7 @@
- #include <linux/platform_device.h>
- #include <linux/ata_platform.h>
- 
-+#include <asm/addrspace.h>
- #include <asm/sibyte/board.h>
- #include <asm/sibyte/sb1250_genbus.h>
- #include <asm/sibyte/sb1250_regs.h>
-@@ -83,3 +84,71 @@ static int __init swarm_pata_init(void)
- device_initcall(swarm_pata_init);
- 
- #endif /* defined(CONFIG_SIBYTE_SWARM) || defined(CONFIG_SIBYTE_LITTLESUR) */
-+
-+#ifdef CONFIG_SIBYTE_RHONE
-+
-+#include <linux/mtd/partitions.h>
-+#include <linux/mtd/physmap.h>
-+
-+/* The board has 16MB flash but CFE sets up only 2MB */
-+#define PHYS_TO_K1(a) CKSEG1ADDR(a)
-+#define BOOTROM_SIZE 0x100
-+
-+static void fixup_cs0_size(void)
-+{
-+	SBWRITECSR(((A_IO_EXT_CS_BASE(0)) + R_IO_EXT_MULT_SIZE), BOOTROM_SIZE);
-+}
-+
-+static struct mtd_partition flash_parts[] = {
-+	{
-+		.name           = "cfe",
-+		.offset         = 0x00000000,
-+		.size           = 0x00200000,
-+		.mask_flags     = MTD_WRITEABLE,
-+	},
-+	{
-+		.name           = "os",
-+		.offset         = 0x00200000,
-+		.size           = 0x00d00000,
-+	},
-+	{
-+		.name           = "environment",
-+		.offset         = 0x00f00000,
-+		.size           = 0x00100000,
-+		.mask_flags     = MTD_WRITEABLE,
-+	},
-+};
-+
-+static struct physmap_flash_data flash_data = {
-+	.width		= 1,
-+	.nr_parts	= ARRAY_SIZE(flash_parts),
-+	.parts		= flash_parts,
-+};
-+
-+static struct resource flash_resource = {
-+	.start		= 0x1fc00000,
-+	.end		= 0x20bfffff,
-+	.flags		= IORESOURCE_MEM,
-+};
-+
-+static struct platform_device flash_device = {
-+	.name		= "physmap-flash",
-+	.id		= 0,
-+	.resource	= &flash_resource,
-+	.num_resources	= 1,
-+	.dev		= {
-+		.platform_data = &flash_data,
-+	},
-+};
-+
-+static int __init flash_setup(void)
-+{
-+	fixup_cs0_size();
-+	platform_device_register(&flash_device);
-+
-+	return 0;
-+};
-+
-+device_initcall(flash_setup);
-+
-+#endif /* CONFIG_SIBYTE_RHONE */
diff --git a/target/linux/sibyte/patches/103-m41t80_smbus.patch b/target/linux/sibyte/patches/103-m41t80_smbus.patch
deleted file mode 100644
index c6a07c6d5..000000000
--- a/target/linux/sibyte/patches/103-m41t80_smbus.patch
+++ /dev/null
@@ -1,367 +0,0 @@
---- a/drivers/rtc/rtc-m41t80.c
-+++ b/drivers/rtc/rtc-m41t80.c
-@@ -6,6 +6,7 @@
-  * Based on m41t00.c by Mark A. Greer <mgreer@mvista.com>
-  *
-  * 2006 (c) mycable GmbH
-+ * Copyright (c) 2008  Maciej W. Rozycki
-  *
-  * 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
-@@ -38,6 +39,8 @@
- #define M41T80_REG_DAY	5
- #define M41T80_REG_MON	6
- #define M41T80_REG_YEAR	7
-+#define M41T80_REG_CONTROL	8
-+#define M41T80_REG_WATCHDOG	9
- #define M41T80_REG_ALARM_MON	0xa
- #define M41T80_REG_ALARM_DAY	0xb
- #define M41T80_REG_ALARM_HOUR	0xc
-@@ -66,7 +69,7 @@
- #define M41T80_FEATURE_WD	(1 << 3)	/* Extra watchdog resolution */
- #define M41T80_FEATURE_SQ_ALT	(1 << 4)	/* RSx bits are in reg 4 */
- 
--#define DRV_VERSION "0.05"
-+#define DRV_VERSION "0.06"
- 
- static const struct i2c_device_id m41t80_id[] = {
- 	{ "m41t62", M41T80_FEATURE_SQ | M41T80_FEATURE_SQ_ALT },
-@@ -88,31 +91,88 @@ struct m41t80_data {
- 	struct rtc_device *rtc;
- };
- 
--static int m41t80_get_datetime(struct i2c_client *client,
--			       struct rtc_time *tm)
-+
-+static int m41t80_write_block_data(struct i2c_client *client,
-+				   u8 reg, u8 num, u8 *buf)
- {
--	u8 buf[M41T80_DATETIME_REG_SIZE], dt_addr[1] = { M41T80_REG_SEC };
--	struct i2c_msg msgs[] = {
--		{
--			.addr	= client->addr,
--			.flags	= 0,
--			.len	= 1,
--			.buf	= dt_addr,
--		},
--		{
--			.addr	= client->addr,
--			.flags	= I2C_M_RD,
--			.len	= M41T80_DATETIME_REG_SIZE - M41T80_REG_SEC,
--			.buf	= buf + M41T80_REG_SEC,
--		},
--	};
-+	int i, rc;
- 
--	if (i2c_transfer(client->adapter, msgs, 2) < 0) {
--		dev_err(&client->dev, "read error\n");
--		return -EIO;
-+	if (i2c_check_functionality(client->adapter,
-+				    I2C_FUNC_SMBUS_WRITE_I2C_BLOCK)) {
-+		i = i2c_smbus_write_i2c_block_data(client, reg, num, buf);
-+	} else {
-+		for (i = 0; i < num; i++) {
-+			rc = i2c_smbus_write_byte_data(client, reg + i,
-+						       buf[i]);
-+			if (rc < 0) {
-+				i = rc;
-+				goto out;
-+			}
-+		}
- 	}
-+out:
-+	return i;
-+}
-+
-+static int m41t80_read_block_data(struct i2c_client *client,
-+				  u8 reg, u8 num, u8 *buf)
-+{
-+	int i, rc;
-+
-+	if (i2c_check_functionality(client->adapter,
-+				    I2C_FUNC_SMBUS_READ_I2C_BLOCK)) {
-+		i = i2c_smbus_read_i2c_block_data(client, reg, num, buf);
-+	} else {
-+		for (i = 0; i < num; i++) {
-+			rc = i2c_smbus_read_byte_data(client, reg + i);
-+			if (rc < 0) {
-+				i = rc;
-+				goto out;
-+			}
-+			buf[i] = rc;
-+		}
-+	}
-+out:
-+	return i;
-+}
-+
-+static int m41t80_get_datetime(struct i2c_client *client, struct rtc_time *tm)
-+{
-+	u8 buf[M41T80_DATETIME_REG_SIZE];
-+	int loops = 2;
-+	int sec0, sec1;
-+
-+	/*
-+	 * Time registers are latched by this chip if an I2C block
-+	 * transfer is used, but with SMBus-style byte accesses
-+	 * this is not the case, so check seconds for a wraparound.
-+	 */
-+	do {
-+		if (m41t80_read_block_data(client, M41T80_REG_SEC,
-+					   M41T80_DATETIME_REG_SIZE -
-+					   M41T80_REG_SEC,
-+					   buf + M41T80_REG_SEC) < 0) {
-+			dev_err(&client->dev, "read error\n");
-+			return -EIO;
-+		}
-+		if (i2c_check_functionality(client->adapter,
-+					    I2C_FUNC_SMBUS_READ_I2C_BLOCK)) {
-+			sec1 = buf[M41T80_REG_SEC];
-+			break;
-+		}
-+
-+		sec0 = buf[M41T80_REG_SEC];
-+		sec1 = i2c_smbus_read_byte_data(client, M41T80_REG_SEC);
-+		if (sec1 < 0) {
-+			dev_err(&client->dev, "read error\n");
-+			return -EIO;
-+		}
-+
-+		sec0 = bcd2bin(sec0 & 0x7f);
-+		sec1 = bcd2bin(sec1 & 0x7f);
-+	} while (sec1 < sec0 && --loops);
- 
--	tm->tm_sec = bcd2bin(buf[M41T80_REG_SEC] & 0x7f);
-+	tm->tm_sec = sec1;
- 	tm->tm_min = bcd2bin(buf[M41T80_REG_MIN] & 0x7f);
- 	tm->tm_hour = bcd2bin(buf[M41T80_REG_HOUR] & 0x3f);
- 	tm->tm_mday = bcd2bin(buf[M41T80_REG_DAY] & 0x3f);
-@@ -127,39 +187,16 @@ static int m41t80_get_datetime(struct i2
- /* Sets the given date and time to the real time clock. */
- static int m41t80_set_datetime(struct i2c_client *client, struct rtc_time *tm)
- {
--	u8 wbuf[1 + M41T80_DATETIME_REG_SIZE];
--	u8 *buf = &wbuf[1];
--	u8 dt_addr[1] = { M41T80_REG_SEC };
--	struct i2c_msg msgs_in[] = {
--		{
--			.addr	= client->addr,
--			.flags	= 0,
--			.len	= 1,
--			.buf	= dt_addr,
--		},
--		{
--			.addr	= client->addr,
--			.flags	= I2C_M_RD,
--			.len	= M41T80_DATETIME_REG_SIZE - M41T80_REG_SEC,
--			.buf	= buf + M41T80_REG_SEC,
--		},
--	};
--	struct i2c_msg msgs[] = {
--		{
--			.addr	= client->addr,
--			.flags	= 0,
--			.len	= 1 + M41T80_DATETIME_REG_SIZE,
--			.buf	= wbuf,
--		 },
--	};
-+	u8 buf[M41T80_DATETIME_REG_SIZE];
- 
- 	/* Read current reg values into buf[1..7] */
--	if (i2c_transfer(client->adapter, msgs_in, 2) < 0) {
-+	if (m41t80_read_block_data(client, M41T80_REG_SEC,
-+				   M41T80_DATETIME_REG_SIZE - M41T80_REG_SEC,
-+				   buf + M41T80_REG_SEC) < 0) {
- 		dev_err(&client->dev, "read error\n");
- 		return -EIO;
- 	}
- 
--	wbuf[0] = 0; /* offset into rtc's regs */
- 	/* Merge time-data and register flags into buf[0..7] */
- 	buf[M41T80_REG_SSEC] = 0;
- 	buf[M41T80_REG_SEC] =
-@@ -177,7 +214,8 @@ static int m41t80_set_datetime(struct i2
- 	/* assume 20YY not 19YY */
- 	buf[M41T80_REG_YEAR] = bin2bcd(tm->tm_year % 100);
- 
--	if (i2c_transfer(client->adapter, msgs, 1) != 1) {
-+	if (m41t80_write_block_data(client, M41T80_REG_SSEC,
-+				    M41T80_DATETIME_REG_SIZE, buf) < 0) {
- 		dev_err(&client->dev, "write error\n");
- 		return -EIO;
- 	}
-@@ -251,34 +289,11 @@ err:
- static int m41t80_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *t)
- {
- 	struct i2c_client *client = to_i2c_client(dev);
--	u8 wbuf[1 + M41T80_ALARM_REG_SIZE];
--	u8 *buf = &wbuf[1];
-+	u8 buf[M41T80_ALARM_REG_SIZE];
- 	u8 *reg = buf - M41T80_REG_ALARM_MON;
--	u8 dt_addr[1] = { M41T80_REG_ALARM_MON };
--	struct i2c_msg msgs_in[] = {
--		{
--			.addr	= client->addr,
--			.flags	= 0,
--			.len	= 1,
--			.buf	= dt_addr,
--		},
--		{
--			.addr	= client->addr,
--			.flags	= I2C_M_RD,
--			.len	= M41T80_ALARM_REG_SIZE,
--			.buf	= buf,
--		},
--	};
--	struct i2c_msg msgs[] = {
--		{
--			.addr	= client->addr,
--			.flags	= 0,
--			.len	= 1 + M41T80_ALARM_REG_SIZE,
--			.buf	= wbuf,
--		 },
--	};
- 
--	if (i2c_transfer(client->adapter, msgs_in, 2) < 0) {
-+	if (m41t80_read_block_data(client, M41T80_REG_ALARM_MON,
-+				   M41T80_ALARM_REG_SIZE, buf) < 0) {
- 		dev_err(&client->dev, "read error\n");
- 		return -EIO;
- 	}
-@@ -288,7 +303,6 @@ static int m41t80_rtc_set_alarm(struct d
- 	reg[M41T80_REG_ALARM_MIN] = 0;
- 	reg[M41T80_REG_ALARM_SEC] = 0;
- 
--	wbuf[0] = M41T80_REG_ALARM_MON; /* offset into rtc's regs */
- 	reg[M41T80_REG_ALARM_SEC] |= t->time.tm_sec >= 0 ?
- 		bin2bcd(t->time.tm_sec) : 0x80;
- 	reg[M41T80_REG_ALARM_MIN] |= t->time.tm_min >= 0 ?
-@@ -302,7 +316,8 @@ static int m41t80_rtc_set_alarm(struct d
- 	else
- 		reg[M41T80_REG_ALARM_DAY] |= 0x40;
- 
--	if (i2c_transfer(client->adapter, msgs, 1) != 1) {
-+	if (m41t80_write_block_data(client, M41T80_REG_ALARM_MON,
-+				    M41T80_ALARM_REG_SIZE, buf) < 0) {
- 		dev_err(&client->dev, "write error\n");
- 		return -EIO;
- 	}
-@@ -322,24 +337,10 @@ static int m41t80_rtc_read_alarm(struct 
- {
- 	struct i2c_client *client = to_i2c_client(dev);
- 	u8 buf[M41T80_ALARM_REG_SIZE + 1]; /* all alarm regs and flags */
--	u8 dt_addr[1] = { M41T80_REG_ALARM_MON };
- 	u8 *reg = buf - M41T80_REG_ALARM_MON;
--	struct i2c_msg msgs[] = {
--		{
--			.addr	= client->addr,
--			.flags	= 0,
--			.len	= 1,
--			.buf	= dt_addr,
--		},
--		{
--			.addr	= client->addr,
--			.flags	= I2C_M_RD,
--			.len	= M41T80_ALARM_REG_SIZE + 1,
--			.buf	= buf,
--		},
--	};
- 
--	if (i2c_transfer(client->adapter, msgs, 2) < 0) {
-+	if (m41t80_read_block_data(client, M41T80_REG_ALARM_MON,
-+				   M41T80_ALARM_REG_SIZE + 1, buf) < 0) {
- 		dev_err(&client->dev, "read error\n");
- 		return -EIO;
- 	}
-@@ -512,26 +513,16 @@ static int boot_flag;
-  */
- static void wdt_ping(void)
- {
--	unsigned char i2c_data[2];
--	struct i2c_msg msgs1[1] = {
--		{
--			.addr	= save_client->addr,
--			.flags	= 0,
--			.len	= 2,
--			.buf	= i2c_data,
--		},
--	};
--	struct m41t80_data *clientdata = i2c_get_clientdata(save_client);
-+	u8 wdt = 0x80;				/* WDS = 1 (0x80)  */
- 
--	i2c_data[0] = 0x09;		/* watchdog register */
-+	struct m41t80_data *clientdata = i2c_get_clientdata(save_client);
- 
- 	if (wdt_margin > 31)
--		i2c_data[1] = (wdt_margin & 0xFC) | 0x83; /* resolution = 4s */
-+		/* mulitplier = WD_TIMO / 4, resolution = 4s (0x3)  */
-+		wdt |= (wdt_margin & 0xfc) | 0x3;
- 	else
--		/*
--		 * WDS = 1 (0x80), mulitplier = WD_TIMO, resolution = 1s (0x02)
--		 */
--		i2c_data[1] = wdt_margin<<2 | 0x82;
-+		/* mulitplier = WD_TIMO, resolution = 1s (0x2)  */
-+		wdt |= wdt_margin << 2 | 0x2;
- 
- 	/*
- 	 * M41T65 has three bits for watchdog resolution.  Don't set bit 7, as
-@@ -540,7 +531,7 @@ static void wdt_ping(void)
- 	if (clientdata->features & M41T80_FEATURE_WD)
- 		i2c_data[1] &= ~M41T80_WATCHDOG_RB2;
- 
--	i2c_transfer(save_client->adapter, msgs1, 1);
-+	i2c_smbus_write_byte_data(save_client, M41T80_REG_WATCHDOG, wdt);
- }
- 
- /**
-@@ -550,36 +541,8 @@ static void wdt_ping(void)
-  */
- static void wdt_disable(void)
- {
--	unsigned char i2c_data[2], i2c_buf[0x10];
--	struct i2c_msg msgs0[2] = {
--		{
--			.addr	= save_client->addr,
--			.flags	= 0,
--			.len	= 1,
--			.buf	= i2c_data,
--		},
--		{
--			.addr	= save_client->addr,
--			.flags	= I2C_M_RD,
--			.len	= 1,
--			.buf	= i2c_buf,
--		},
--	};
--	struct i2c_msg msgs1[1] = {
--		{
--			.addr	= save_client->addr,
--			.flags	= 0,
--			.len	= 2,
--			.buf	= i2c_data,
--		},
--	};
--
--	i2c_data[0] = 0x09;
--	i2c_transfer(save_client->adapter, msgs0, 2);
--
--	i2c_data[0] = 0x09;
--	i2c_data[1] = 0x00;
--	i2c_transfer(save_client->adapter, msgs1, 1);
-+	i2c_smbus_read_byte_data(save_client, M41T80_REG_WATCHDOG);
-+	i2c_smbus_write_byte_data(save_client, M41T80_REG_WATCHDOG, 0);
- }
- 
- /**
-@@ -772,8 +735,8 @@ static int m41t80_probe(struct i2c_clien
- 	struct rtc_time tm;
- 	struct m41t80_data *clientdata = NULL;
- 
--	if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C
--				     | I2C_FUNC_SMBUS_BYTE_DATA)) {
-+	if (!i2c_check_functionality(client->adapter,
-+				     I2C_FUNC_SMBUS_BYTE_DATA)) {
- 		rc = -ENODEV;
- 		goto exit;
- 	}
diff --git a/target/linux/sibyte/patches/104-sibyte_rtc_cleanup.patch b/target/linux/sibyte/patches/104-sibyte_rtc_cleanup.patch
deleted file mode 100644
index f789dada9..000000000
--- a/target/linux/sibyte/patches/104-sibyte_rtc_cleanup.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- a/arch/mips/sibyte/swarm/setup.c
-+++ b/arch/mips/sibyte/swarm/setup.c
-@@ -56,14 +56,6 @@ extern void sb1250_setup(void);
- #error invalid SiByte board configuration
- #endif
- 
--extern int xicor_probe(void);
--extern int xicor_set_time(unsigned long);
--extern unsigned long xicor_get_time(void);
--
--extern int m41t81_probe(void);
--extern int m41t81_set_time(unsigned long);
--extern unsigned long m41t81_get_time(void);
--
- const char *get_system_type(void)
- {
- 	return "SiByte " SIBYTE_BOARD_NAME;
-@@ -79,49 +71,18 @@ int swarm_be_handler(struct pt_regs *reg
- 	return (is_fixup ? MIPS_BE_FIXUP : MIPS_BE_FATAL);
- }
- 
--enum swarm_rtc_type {
--	RTC_NONE,
--	RTC_XICOR,
--	RTC_M4LT81
--};
--
--enum swarm_rtc_type swarm_rtc_type;
--
- void read_persistent_clock(struct timespec *ts)
- {
- 	unsigned long sec;
- 
--	switch (swarm_rtc_type) {
--	case RTC_XICOR:
--		sec = xicor_get_time();
--		break;
--
--	case RTC_M4LT81:
--		sec = m41t81_get_time();
--		break;
--
--	case RTC_NONE:
--	default:
--		sec = mktime(2000, 1, 1, 0, 0, 0);
--		break;
--	}
-+	sec = mktime(2000, 1, 1, 0, 0, 0);
- 	ts->tv_sec = sec;
- 	ts->tv_nsec = 0;
- }
- 
- int rtc_mips_set_time(unsigned long sec)
- {
--	switch (swarm_rtc_type) {
--	case RTC_XICOR:
--		return xicor_set_time(sec);
--
--	case RTC_M4LT81:
--		return m41t81_set_time(sec);
--
--	case RTC_NONE:
--	default:
- 		return -1;
--	}
- }
- 
- void __init plat_mem_setup(void)
-@@ -138,11 +99,6 @@ void __init plat_mem_setup(void)
- 
- 	board_be_handler = swarm_be_handler;
- 
--	if (xicor_probe())
--		swarm_rtc_type = RTC_XICOR;
--	if (m41t81_probe())
--		swarm_rtc_type = RTC_M4LT81;
--
- #ifdef CONFIG_VT
- 	screen_info = (struct screen_info) {
- 		0, 0,           /* orig-x, orig-y */
diff --git a/target/linux/sibyte/patches/105-sibyte_hwmon.patch b/target/linux/sibyte/patches/105-sibyte_hwmon.patch
deleted file mode 100644
index 93dd4230d..000000000
--- a/target/linux/sibyte/patches/105-sibyte_hwmon.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/arch/mips/sibyte/swarm/swarm-i2c.c
-+++ b/arch/mips/sibyte/swarm/swarm-i2c.c
-@@ -13,6 +13,11 @@
- #include <linux/init.h>
- #include <linux/kernel.h>
- 
-+static struct i2c_board_info swarm_i2c_info0[] __initdata = {
-+	{
-+		I2C_BOARD_INFO("lm90", 0x2a),
-+	},
-+};
- 
- static struct i2c_board_info swarm_i2c_info1[] __initdata = {
- 	{
-@@ -24,6 +29,8 @@ static int __init swarm_i2c_init(void)
- {
- 	int err;
- 
-+	err = i2c_register_board_info(0, swarm_i2c_info0,
-+				      ARRAY_SIZE(swarm_i2c_info0));
- 	err = i2c_register_board_info(1, swarm_i2c_info1,
- 				      ARRAY_SIZE(swarm_i2c_info1));
- 	if (err < 0)
diff --git a/target/linux/sibyte/patches/106-no_module_reloc.patch b/target/linux/sibyte/patches/106-no_module_reloc.patch
deleted file mode 100644
index 3b1f12427..000000000
--- a/target/linux/sibyte/patches/106-no_module_reloc.patch
+++ /dev/null
@@ -1,368 +0,0 @@
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -85,7 +85,7 @@ all-$(CONFIG_BOOT_ELF64)	:= $(vmlinux-64
- cflags-y			+= -G 0 -mno-abicalls -fno-pic -pipe
- cflags-y			+= -msoft-float
- LDFLAGS_vmlinux			+= -G 0 -static -n -nostdlib
--MODFLAGS			+= -mno-long-calls
-+MODFLAGS			+= -mlong-calls
- 
- cflags-y += -ffreestanding
- 
---- a/arch/mips/include/asm/module.h
-+++ b/arch/mips/include/asm/module.h
-@@ -9,11 +9,6 @@ struct mod_arch_specific {
- 	struct list_head dbe_list;
- 	const struct exception_table_entry *dbe_start;
- 	const struct exception_table_entry *dbe_end;
--
--	void *phys_plt_tbl;
--	void *virt_plt_tbl;
--	unsigned int phys_plt_offset;
--	unsigned int virt_plt_offset;
- };
- 
- typedef uint8_t Elf64_Byte;		/* Type for a 8-bit quantity.  */
---- a/arch/mips/kernel/module.c
-+++ b/arch/mips/kernel/module.c
-@@ -43,117 +43,6 @@ static struct mips_hi16 *mips_hi16_list;
- static LIST_HEAD(dbe_list);
- static DEFINE_SPINLOCK(dbe_lock);
- 
--/*
-- * Get the potential max trampolines size required of the init and
-- * non-init sections. Only used if we cannot find enough contiguous
-- * physically mapped memory to put the module into.
-- */
--static unsigned int
--get_plt_size(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,
--             const char *secstrings, unsigned int symindex, bool is_init)
--{
--	unsigned long ret = 0;
--	unsigned int i, j;
--	Elf_Sym *syms;
--
--	/* Everything marked ALLOC (this includes the exported symbols) */
--	for (i = 1; i < hdr->e_shnum; ++i) {
--		unsigned int info = sechdrs[i].sh_info;
--
--		if (sechdrs[i].sh_type != SHT_REL
--		    && sechdrs[i].sh_type != SHT_RELA)
--			continue;
--
--		/* Not a valid relocation section? */
--		if (info >= hdr->e_shnum)
--			continue;
--
--		/* Don't bother with non-allocated sections */
--		if (!(sechdrs[info].sh_flags & SHF_ALLOC))
--			continue;
--
--		/* If it's called *.init*, and we're not init, we're
--                   not interested */
--		if ((strstr(secstrings + sechdrs[i].sh_name, ".init") != 0)
--		    != is_init)
--			continue;
--
--		syms = (Elf_Sym *) sechdrs[symindex].sh_addr;
--		if (sechdrs[i].sh_type == SHT_REL) {
--			Elf_Mips_Rel *rel = (void *) sechdrs[i].sh_addr;
--			unsigned int size = sechdrs[i].sh_size / sizeof(*rel);
--
--			for (j = 0; j < size; ++j) {
--				Elf_Sym *sym;
--
--				if (ELF_MIPS_R_TYPE(rel[j]) != R_MIPS_26)
--					continue;
--
--				sym = syms + ELF_MIPS_R_SYM(rel[j]);
--				if (!is_init && sym->st_shndx != SHN_UNDEF)
--					continue;
--
--				ret += 4 * sizeof(int);
--			}
--		} else {
--			Elf_Mips_Rela *rela = (void *) sechdrs[i].sh_addr;
--			unsigned int size = sechdrs[i].sh_size / sizeof(*rela);
--
--			for (j = 0; j < size; ++j) {
--				Elf_Sym *sym;
--
--				if (ELF_MIPS_R_TYPE(rela[j]) != R_MIPS_26)
--					continue;
--
--				sym = syms + ELF_MIPS_R_SYM(rela[j]);
--				if (!is_init && sym->st_shndx != SHN_UNDEF)
--					continue;
--
--				ret += 4 * sizeof(int);
--			}
--		}
--	}
--
--	return ret;
--}
--
--#ifndef MODULE_START
--static void *alloc_phys(unsigned long size)
--{
--	unsigned order;
--	struct page *page;
--	struct page *p;
--
--	size = PAGE_ALIGN(size);
--	order = get_order(size);
--
--	page = alloc_pages(GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN |
--			__GFP_THISNODE, order);
--	if (!page)
--		return NULL;
--
--	split_page(page, order);
--
--	for (p = page + (size >> PAGE_SHIFT); p < page + (1 << order); ++p)
--		__free_page(p);
--
--	return page_address(page);
--}
--#endif
--
--static void free_phys(void *ptr, unsigned long size)
--{
--	struct page *page;
--	struct page *end;
--
--	page = virt_to_page(ptr);
--	end = page + (PAGE_ALIGN(size) >> PAGE_SHIFT);
--
--	for (; page < end; ++page)
--		__free_page(page);
--}
--
--
- void *module_alloc(unsigned long size)
- {
- #ifdef MODULE_START
-@@ -169,99 +58,21 @@ void *module_alloc(unsigned long size)
- 
- 	return __vmalloc_area(area, GFP_KERNEL, PAGE_KERNEL);
- #else
--	void *ptr;
--
- 	if (size == 0)
- 		return NULL;
--
--	ptr = alloc_phys(size);
--
--	/* If we failed to allocate physically contiguous memory,
--	 * fall back to regular vmalloc. The module loader code will
--	 * create jump tables to handle long jumps */
--	if (!ptr)
--		return vmalloc(size);
--
--	return ptr;
--#endif
--}
--
--static inline bool is_phys_addr(void *ptr)
--{
--#ifdef CONFIG_64BIT
--	return (KSEGX((unsigned long)ptr) == CKSEG0);
--#else
--	return (KSEGX(ptr) == KSEG0);
-+	return vmalloc(size);
- #endif
- }
- 
- /* Free memory returned from module_alloc */
- void module_free(struct module *mod, void *module_region)
- {
--	if (is_phys_addr(module_region)) {
--		if (mod->module_init == module_region)
--			free_phys(module_region, mod->init_size);
--		else if (mod->module_core == module_region)
--			free_phys(module_region, mod->core_size);
--		else
--			BUG();
--	} else {
--		vfree(module_region);
--	}
--}
--
--static void *__module_alloc(int size, bool phys)
--{
--	void *ptr;
--
--	if (phys)
--		ptr = kmalloc(size, GFP_KERNEL);
--	else
--		ptr = vmalloc(size);
--	return ptr;
--}
--
--static void __module_free(void *ptr)
--{
--	if (is_phys_addr(ptr))
--		kfree(ptr);
--	else
--		vfree(ptr);
-+	vfree(module_region);
- }
- 
- int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
- 			      char *secstrings, struct module *mod)
- {
--	unsigned int symindex = 0;
--	unsigned int core_size, init_size;
--	int i;
--
--	for (i = 1; i < hdr->e_shnum; i++)
--		if (sechdrs[i].sh_type == SHT_SYMTAB)
--			symindex = i;
--
--	core_size = get_plt_size(hdr, sechdrs, secstrings, symindex, false);
--	init_size = get_plt_size(hdr, sechdrs, secstrings, symindex, true);
--
--	mod->arch.phys_plt_offset = 0;
--	mod->arch.virt_plt_offset = 0;
--	mod->arch.phys_plt_tbl = NULL;
--	mod->arch.virt_plt_tbl = NULL;
--
--	if ((core_size + init_size) == 0)
--		return 0;
--
--	mod->arch.phys_plt_tbl = __module_alloc(core_size + init_size, 1);
--	if (!mod->arch.phys_plt_tbl)
--		return -ENOMEM;
--
--	mod->arch.virt_plt_tbl = __module_alloc(core_size + init_size, 0);
--	if (!mod->arch.virt_plt_tbl) {
--		__module_free(mod->arch.phys_plt_tbl);
--		mod->arch.phys_plt_tbl = NULL;
--		return -ENOMEM;
--	}
--
- 	return 0;
- }
- 
-@@ -284,36 +95,28 @@ static int apply_r_mips_32_rela(struct m
- 	return 0;
- }
- 
--static Elf_Addr add_plt_entry_to(unsigned *plt_offset,
--				 void *start, Elf_Addr v)
-+static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
- {
--	unsigned *tramp = start + *plt_offset;
--	*plt_offset += 4 * sizeof(int);
--
--	/* adjust carry for addiu */
--	if (v & 0x00008000)
--		v += 0x10000;
--
--	tramp[0] = 0x3c190000 | (v >> 16);      /* lui t9, hi16 */
--	tramp[1] = 0x27390000 | (v & 0xffff);   /* addiu t9, t9, lo16 */
--	tramp[2] = 0x03200008;                  /* jr t9 */
--	tramp[3] = 0x00000000;                  /* nop */
-+	if (v % 4) {
-+		pr_err("module %s: dangerous R_MIPS_26 REL relocation\n",
-+		       me->name);
-+		return -ENOEXEC;
-+	}
- 
--	return (Elf_Addr) tramp;
--}
-+	if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
-+		printk(KERN_ERR
-+		       "module %s: relocation overflow\n",
-+		       me->name);
-+		return -ENOEXEC;
-+	}
- 
--static Elf_Addr add_plt_entry(struct module *me, void *location, Elf_Addr v)
--{
--	if (is_phys_addr(location))
--		return add_plt_entry_to(&me->arch.phys_plt_offset,
--				me->arch.phys_plt_tbl, v);
--	else
--		return add_plt_entry_to(&me->arch.virt_plt_offset,
--				me->arch.virt_plt_tbl, v);
-+	*location = (*location & ~0x03ffffff) |
-+	            ((*location + (v >> 2)) & 0x03ffffff);
- 
-+	return 0;
- }
- 
--static int set_r_mips_26(struct module *me, u32 *location, u32 ofs, Elf_Addr v)
-+static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)
- {
- 	if (v % 4) {
- 		pr_err("module %s: dangerous R_MIPS_26 RELArelocation\n",
-@@ -322,31 +125,17 @@ static int set_r_mips_26(struct module *
- 	}
- 
- 	if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
--	    v = add_plt_entry(me, location, v + (ofs << 2));
--		if (!v) {
--			printk(KERN_ERR
-+		printk(KERN_ERR
- 		       "module %s: relocation overflow\n",
- 		       me->name);
--			return -ENOEXEC;
--		}
--		ofs = 0;
-+		return -ENOEXEC;
- 	}
- 
--	*location = (*location & ~0x03ffffff) | ((ofs + (v >> 2)) & 0x03ffffff);
-+	*location = (*location & ~0x03ffffff) | ((v >> 2) & 0x03ffffff);
- 
- 	return 0;
- }
- 
--static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
--{
--	return set_r_mips_26(me, location, *location & 0x03ffffff, v);
--}
--
--static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)
--{
--	return set_r_mips_26(me, location, 0, v);
--}
--
- static int apply_r_mips_hi16_rel(struct module *me, u32 *location, Elf_Addr v)
- {
- 	struct mips_hi16 *n;
-@@ -611,32 +400,11 @@ int module_finalize(const Elf_Ehdr *hdr,
- 		list_add(&me->arch.dbe_list, &dbe_list);
- 		spin_unlock_irq(&dbe_lock);
- 	}
--
--	/* Get rid of the fixup trampoline if we're running the module
--	 * from physically mapped address space */
--	if (me->arch.phys_plt_offset == 0) {
--		__module_free(me->arch.phys_plt_tbl);
--		me->arch.phys_plt_tbl = NULL;
--	}
--	if (me->arch.virt_plt_offset == 0) {
--		__module_free(me->arch.virt_plt_tbl);
--		me->arch.virt_plt_tbl = NULL;
--	}
--
- 	return 0;
- }
- 
- void module_arch_cleanup(struct module *mod)
- {
--	if (mod->arch.phys_plt_tbl) {
--		__module_free(mod->arch.phys_plt_tbl);
--		mod->arch.phys_plt_tbl = NULL;
--	}
--	if (mod->arch.virt_plt_tbl) {
--		__module_free(mod->arch.virt_plt_tbl);
--		mod->arch.virt_plt_tbl = NULL;
--	}
--
- 	spin_lock_irq(&dbe_lock);
- 	list_del(&mod->arch.dbe_list);
- 	spin_unlock_irq(&dbe_lock);
diff --git a/target/linux/ubicom32/Makefile b/target/linux/ubicom32/Makefile
deleted file mode 100644
index 62996d7bb..000000000
--- a/target/linux/ubicom32/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Copyright (C) 2006-2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-#Add target specific (nommu) flags
-TARGET_CFLAGS+= -DNO_FORK
-
-ARCH:=ubicom32
-BOARD:=ubicom32
-BOARDNAME:=Ubicom IPxx
-FEATURES:=nommu ramdisk
-
-LINUX_VERSION:=2.6.30.10
-
-include $(INCLUDE_DIR)/target.mk
-
-KERNEL_MAKEOPTS += LDFLAGS_BUILD_ID=""
-
-define Target/Description
-	Build firmware images for Ubicom based routers and media devices.
-endef
-
-$(eval $(call BuildTarget))
diff --git a/target/linux/ubicom32/config-default b/target/linux/ubicom32/config-default
deleted file mode 100644
index 57dbce039..000000000
--- a/target/linux/ubicom32/config-default
+++ /dev/null
@@ -1,176 +0,0 @@
-# CONFIG_ACCESS_OK_CHECKS_ENABLED is not set
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_ARCH_SUPPORTS_AOUT=y
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-# CONFIG_ARPD is not set
-# CONFIG_BINARY_PRINTF is not set
-CONFIG_BINFMT_ELF_FDPIC=y
-CONFIG_BINFMT_FLAT=y
-# CONFIG_BINFMT_SHARED_FLAT is not set
-CONFIG_BINFMT_ZFLAT=y
-CONFIG_BITREVERSE=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_RAM=y
-# CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="console=ttyUM0 console=ttyUS0 serdes=0x02004000,61,250000000"
-# CONFIG_CMDLINE_OVERRIDE is not set
-CONFIG_CPU_BIG_ENDIAN=y
-CONFIG_CRC_CCITT=y
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_ARC4=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_RNG2=y
-# CONFIG_CRYPTO_UBICOM32 is not set
-CONFIG_CRYPTO_WORKQUEUE=y
-# CONFIG_DEBUG_FS is not set
-# CONFIG_DEBUG_IRQMEASURE is not set
-# CONFIG_DEBUG_PCIMEASURE is not set
-CONFIG_DEBUG_VERBOSE=y
-CONFIG_DECOMPRESS_LZMA=y
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_IOSCHED="noop"
-CONFIG_DEFAULT_NOOP=y
-CONFIG_DEVKMEM=y
-CONFIG_DEVPORT=y
-CONFIG_EARLY_PRINTK=y
-CONFIG_ENABLE_MUST_CHECK=y
-# CONFIG_EPOLL is not set
-# CONFIG_EVENTFD is not set
-CONFIG_FORCE_MAX_ZONEORDER=14
-# CONFIG_FPU is not set
-# CONFIG_FUTEX is not set
-# CONFIG_FW_LOADER is not set
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_GPIO=y
-# CONFIG_GEN_RTC is not set
-CONFIG_GPIOLIB=y
-# CONFIG_HAMRADIO is not set
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAVE_CLK=y
-# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
-CONFIG_HAVE_OPROFILE=y
-CONFIG_HW_RANDOM_UBICOM32=y
-CONFIG_HW_RANDOM=y
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
-CONFIG_INITRAMFS_ROOT_GID=0
-CONFIG_INITRAMFS_ROOT_UID=0
-CONFIG_INITRAMFS_SOURCE="../romfs ../vendors/Ubicom/RouterGateway/initramfs_list"
-# CONFIG_INPUT_MISC is not set
-CONFIG_INPUT_POLLDEV=y
-CONFIG_INPUT=y
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IP5160DEV is not set
-# CONFIG_IP5160EVAL is not set
-# CONFIG_IP5170DPF is not set
-# CONFIG_IP7145DPF is not set
-# CONFIG_IP7160BRINGUP is not set
-# CONFIG_IP7160DPF is not set
-# CONFIG_IP7160RGWLCD is not set
-CONFIG_IP7160RGW=y
-# CONFIG_IP7500AV is not set
-# CONFIG_IP7500IAP is not set
-# CONFIG_IP7500MEDIA is not set
-# CONFIG_IP7500MODULE is not set
-# CONFIG_IP7500WSPKR is not set
-CONFIG_IRQ_PER_CPU=y
-# CONFIG_IRQSTACKS is not set
-# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-# CONFIG_JFFS2_SUMMARY is not set
-CONFIG_LDM_DEBUG=y
-CONFIG_LDM_PARTITION=y
-CONFIG_LEDS_GPIO=y
-# CONFIG_LEDS_TRIGGERS is not set
-CONFIG_LEGACY_PTY_COUNT=256
-CONFIG_LEGACY_PTYS=y
-CONFIG_LIBCRC32C=y
-# CONFIG_LINKER_RELAXATION is not set
-CONFIG_MIN_RAMSIZE=0x02000000
-# CONFIG_MISC_DEVICES is not set
-# CONFIG_MMC_UBICOM32 is not set
-# CONFIG_MMU is not set
-CONFIG_MODULE_FORCE_LOAD=y
-# CONFIG_MODULE_UNLOAD is not set
-# CONFIG_MTD_CFI is not set
-CONFIG_MTD_CMDLINE_PARTS=y
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-# CONFIG_MTD_NAND_SPI_ER is not set
-CONFIG_MTD_UBI32_M25P80=y
-# CONFIG_MTD_UBI32_NAND_SPI_ER is not set
-# CONFIG_NET_ETHERNET is not set
-# CONFIG_NOBOARD is not set
-CONFIG_NO_HZ=y
-CONFIG_NO_IOPORT=y
-# CONFIG_NO_KERNEL_MSG is not set
-CONFIG_NOMMU_INITIAL_TRIM_EXCESS=1
-CONFIG_OCM_MODULES_FALLBACK_TO_DDR=y
-CONFIG_OCM_MODULES_MAY_CONSUME_REMAINING_CODESPACE=y
-CONFIG_OCM_MODULES_RESERVATION=41
-CONFIG_OLD_40400010_SYSTEM_CALL=y
-# CONFIG_PACKET_MMAP is not set
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PCI=y
-CONFIG_PCI_DEV0_IDSEL=0x001000000
-CONFIG_PCI_DEV1_IDSEL=0x002000000
-CONFIG_PRINTK_TIME=y
-CONFIG_PROTECT_KERNEL=y
-CONFIG_RAMKERNEL=y
-# CONFIG_RTC is not set
-# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
-CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-# CONFIG_SCSI_DMA is not set
-# CONFIG_SERIAL_8250 is not set
-CONFIG_SERIAL_UBI32_MAILBOX_CONSOLE=y
-CONFIG_SERIAL_UBI32_MAILBOX=y
-# CONFIG_SERIAL_UBI32_SERDES is not set
-# CONFIG_SERIAL_UBI32_UARTTIO is not set
-# CONFIG_SIGNALFD is not set
-# CONFIG_SLOW_WORK is not set
-# CONFIG_SND_UBI32 is not set
-CONFIG_SPI_BITBANG=y
-# CONFIG_SPI_GPIO is not set
-CONFIG_SPI_MASTER=y
-# CONFIG_SPI_SPIDEV is not set
-CONFIG_SPI_UBICOM32_GPIO=y
-CONFIG_SPI=y
-# CONFIG_STOP_ON_BUG is not set
-# CONFIG_STOP_ON_TRAP is not set
-# CONFIG_SYSCTL_SYSCALL_CHECK is not set
-CONFIG_SYSFS_DEPRECATED_V2=y
-CONFIG_SYSFS_DEPRECATED=y
-CONFIG_TIME_LOW_RES=y
-CONFIG_TIMER_EXTRA_ALLOC=0
-# CONFIG_TIMERFD is not set
-CONFIG_TRACING_SUPPORT=y
-CONFIG_UBI32_WDT=y
-CONFIG_UBICOM32_GMAC=y
-CONFIG_UBICOM32_OCM_FOR_SKB=y
-# CONFIG_UBICOM32_PLIO is not set
-CONFIG_UBICOM32_V4=y
-CONFIG_UBICOM32=y
-# CONFIG_UBICOM_HID is not set
-# CONFIG_UBICOM_INPUT_I2C is not set
-CONFIG_UBICOM_INPUT=y
-CONFIG_UBICOM_SWITCH_BCM539X=y
-CONFIG_UBICOM_SWITCH=y
-# CONFIG_UNALIGNED_ACCESS_DISABLED is not set
-CONFIG_UNALIGNED_ACCESS_ENABLED=y
-# CONFIG_UNALIGNED_ACCESS_USERSPACE_ONLY is not set
-# CONFIG_WIRELESS_OLD_REGULATORY is not set
diff --git a/target/linux/ubicom32/files/arch/ubicom32/Kconfig b/target/linux/ubicom32/files/arch/ubicom32/Kconfig
deleted file mode 100644
index acc611630..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/Kconfig
+++ /dev/null
@@ -1,403 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see Documentation/kbuild/kconfig-language.txt.
-#
-
-mainmenu "uClinux/ubicom32 (w/o MMU) Kernel Configuration"
-
-config UBICOM32
-	bool
-	select HAVE_OPROFILE
-	default y
-
-config RAMKERNEL
-	bool
-	default y
-
-config CPU_BIG_ENDIAN
-	bool
-	default y
-
-config FORCE_MAX_ZONEORDER
-	int
-	default "14"
-
-config HAVE_CLK
-	bool
-	default y
-
-config MMU
-	bool
-	default n
-
-config FPU
-	bool
-	default n
-
-config ZONE_DMA
-	bool
-	default y
-
-config RWSEM_GENERIC_SPINLOCK
-	bool
-	default y
-
-config RWSEM_XCHGADD_ALGORITHM
-	bool
-	default n
-
-config ARCH_HAS_ILOG2_U32
-	bool
-	default n
-
-config ARCH_HAS_ILOG2_U64
-	bool
-	default n
-
-config GENERIC_FIND_NEXT_BIT
-	bool
-	default y
-
-config GENERIC_GPIO
-	bool
-	default y
-
-config GPIOLIB
-	bool
-	default y
-
-config GENERIC_HWEIGHT
-	bool
-	default y
-
-config GENERIC_HARDIRQS
-	bool
-	default y
-
-config STACKTRACE_SUPPORT
-	bool
-	default y
-
-config LOCKDEP_SUPPORT
-	bool
-	default y
-
-config GENERIC_CALIBRATE_DELAY
-	bool
-	default y
-
-config GENERIC_TIME
-	bool
-	default y
-
-config TIME_LOW_RES
-	bool
-	default y
-
-config GENERIC_CLOCKEVENTS
-	bool
-	default y
-
-config GENERIC_CLOCKEVENTS_BROADCAST
-	bool
-	depends on GENERIC_CLOCKEVENTS
-	default y if SMP && !LOCAL_TIMERS
-
-config NO_IOPORT
-	def_bool y
-
-config ARCH_SUPPORTS_AOUT
-	def_bool y
-
-config IRQ_PER_CPU
-	bool
-	default y
-
-config SCHED_NO_NO_OMIT_FRAME_POINTER
-	bool
-	default y
-
-config UBICOM32_PLIO
-	bool
-	default n
-
-menu "Processor type and features"
-
-comment "Processor type will be selected by Board"
-
-config UBICOM32_V3
-	bool
-	help
-	  Ubicom IP5xxx series processor support.
-
-config UBICOM32_V4
-	bool
-	help
-	  Ubicom IP7xxx series processor support.
-
-comment "Board"
-choice
-	prompt "Board type"
-	help
-		Select your board.
-
-config NOBOARD
-	bool "No board selected"
-	help
-		Default. Don't select any board specific config. Will not build unless you change!
-
-# Add your boards here
-source "arch/ubicom32/mach-ip5k/Kconfig"
-source "arch/ubicom32/mach-ip7k/Kconfig"
-
-endchoice
-
-comment "Kernel Options"
-config SMP
-	bool "Symmetric multi-processing support"
-	select USE_GENERIC_SMP_HELPERS
-	default n
-	help
-	  Enables multithreading support.  Enabling SMP support increases
-	  the size of system data structures.  SMP support can have either
-	  positive or negative impact on performance depending on workloads.
-
-	  If you do not know what to do here, say N.
-config OLD_40400010_SYSTEM_CALL
-	bool "Provide old system call interface at 0x40400010"
-	default y
-	help
-	  Provides the old system call interface, does not affect the
-	  new system_call interface.
-
-config NR_CPUS
-	int "Number of configured CPUs"
-	range 2 32
-	default 2
-	depends on SMP
-	help
-		Upper bound on the number of CPUs. Space is reserved
-		at compile time for this many CPUs.
-
-config LOCAL_TIMERS
-	bool "Use local timer interrupts"
-	depends on SMP
-	default y
-	help
-	  Enable support for local timers on SMP platforms, rather then the
-	  legacy IPI broadcast method.  Local timers allows the system
-	  accounting to be spread across the timer interval, preventing a
-	  "thundering herd" at every timer tick.  A physical timer is allocated
-	  per cpu.
-
-config TIMER_EXTRA_ALLOC
-	int "Number of additional physical timer events to create"
-	depends on GENERIC_CLOCKEVENTS
-	default 0
-	help
-		The Ubicom32 processor has a number of event timers that can be wrapped
-		in Linux clock event structures (assuming that the timers are not being
-		used for another purpose).  Based on the value of LOCAL_TIMERS, either
-		2 timers will be used or a timer will be used for every CPU.  This value
-		allows the programmer to select additional timers over that amount.
-
-config IRQSTACKS
-	bool "Create separate stacks for interrupt handling"
-	default n
-	help
-		Selecting this causes interrupts to be created on a separate
-		stack instead of nesting the interrupts on the kernel stack.
-
-config IRQSTACKS_USEOCM
-	bool "Use OCM for interrupt stacks"
-	default n
-	depends on IRQSTACKS
-	help
-		Selecting this cause the interrupt stacks to be placed in OCM
-		reducing cache misses at the expense of using the OCM for servicing
-		interrupts.
-
-menu "OCM Instruction Heap"
-
-config OCM_MODULES_RESERVATION
-	int "OCM Instruction heap reservation. 0-192 kB"
-	range 0 192
-	default "0"
-	help
-	  The minimum amount of OCM memory to reserve for kernel loadable module
-	  code. If you are not using this memory it cannot be used for anything
-	  else. Leave it as 0 if you have prebuilt modules that are compiled with
-	  OCM support.
-
-config OCM_MODULES_MAY_CONSUME_REMAINING_CODESPACE
-	bool "Give all unused ocm code space to the ocm instruction heap."
-	default n
-	help
-	  Allow the OCM instruction heap allocation to consume any remaining
-	  unused OCM code space.  The result of this is that you will not have
-	  and deterministic results, but you will not have any waste either.
-
-config OCM_MODULES_FALLBACK_TO_DDR
-	bool "Loadable Modules requiring OCM may fallback to use DDR."
-	default n
-	help
-	  If a module cannot get the OCM code it requires allow DDR to
-	  be used instead.
-endmenu
-
-config HZ
-	int "Frequency of 'jiffies' (for polling)"
-	default 1000
-	help
-		100 is common for embedded systems, but 1000 allows
-		you to do more drivers without actually having
-		interrupts working properly.
-
-comment "RAM configuration"
-
-config MIN_RAMSIZE
-	hex "Minimum Size of RAM (in bytes)"
-	range 0x01000000 0x08000000
-	default "0x02000000"
-	help
-		Define the minimum acceptable size of the system
-		RAM. Must be at least 16MB (0x01000000)
-
-comment "Build options"
-config LINKER_RELAXATION
-	bool "Linker Relaxation"
-	default y
-	help
-	  Turns on linker relaxation that will produce smaller
-	  faster code. Increases link time.
-
-comment "Driver options"
-menu "PCI Bus"
-config PCI
-	bool "PCI bus"
-	default true
-	help
-	  Enable/Disable PCI bus
-	source "drivers/pci/Kconfig"
-
-
-config PCI_DEV0_IDSEL
-	hex "slot 0 address"
-	depends on PCI
-	default "0x01000000"
-	help
-	  Slot 0 address.  This address should correspond to the address line
-	  which the IDSEL bit for this slot is connected to.
-
-config PCI_DEV1_IDSEL
-	hex "slot 1 address"
-	depends on PCI
-	default "0x02000000"
-	help
-	  Slot 1 address.  This address should correspond to the address line
-	  which the IDSEL bit for this slot is connected to.
-endmenu
-# End PCI
-
-menu "Input devices"
-config UBICOM_INPUT
-	bool "Ubicom polled GPIO input driver"
-	select INPUT
-	select INPUT_POLLDEV
-	help
-		Polling input driver, much like the GPIO input driver, except that it doesn't
-		rely on interrupts.  It will report events via the input subsystem.
-	default n
-
-config UBICOM_INPUT_I2C
-	bool "Ubicom polled GPIO input driver over I2C"
-	select INPUT
-	select INPUT_POLLDEV
-	help
-		Polling input driver, much like the PCA953x driver, it can support a variety of
-		different I2C I/O expanders.  This device polls the I2C I/O expander for events
-		and reports them via the input subsystem.
-	default n
-endmenu
-# Input devices
-
-source "arch/ubicom32/mach-common/Kconfig.switch"
-
-menu "Misc devices"
-config UBICOM_HID
-	bool "Ubicom HID driver"
-	select INPUT
-	select INPUT_POLLDEV
-	select LCD_CLASS_DEVICE
-	help
-		Driver for HID chip found on some Ubicom reference designs.  This chip handles
-		PWM, button input, and IR remote control.  It registers as an input device and
-		a backlight device.
-	default n
-endmenu
-# Misc devices
-
-config CMDLINE_BOOL
-	bool "Built-in kernel command line"
-	default n
-	help
-	  Allow for specifying boot arguments to the kernel at
-	  build time.  On some systems (e.g. embedded ones), it is
-	  necessary or convenient to provide some or all of the
-	  kernel boot arguments with the kernel itself (that is,
-	  to not rely on the boot loader to provide them.)
-
-	  To compile command line arguments into the kernel,
-	  set this option to 'Y', then fill in the
-	  the boot arguments in CONFIG_CMDLINE.
-
-	  Systems with fully functional boot loaders (i.e. non-embedded)
-	  should leave this option set to 'N'.
-
-config CMDLINE
-	string "Built-in kernel command string"
-	depends on CMDLINE_BOOL
-	default ""
-	help
-	  Enter arguments here that should be compiled into the kernel
-	  image and used at boot time.  If the boot loader provides a
-	  command line at boot time, it is appended to this string to
-	  form the full kernel command line, when the system boots.
-
-	  However, you can use the CONFIG_CMDLINE_OVERRIDE option to
-	  change this behavior.
-
-	  In most cases, the command line (whether built-in or provided
-	  by the boot loader) should specify the device for the root
-	  file system.
-
-config CMDLINE_OVERRIDE
-	bool "Built-in command line overrides boot loader arguments"
-	default n
-	depends on CMDLINE_BOOL
-	help
-	  Set this option to 'Y' to have the kernel ignore the boot loader
-	  command line, and use ONLY the built-in command line.
-
-	  This is used to work around broken boot loaders.  This should
-	  be set to 'N' under normal conditions.
-
-endmenu
-# End Processor type and features
-
-source "arch/ubicom32/Kconfig.debug"
-
-menu "Executable file formats"
-source "fs/Kconfig.binfmt"
-endmenu
-
-source "init/Kconfig"
-source "kernel/Kconfig.preempt"
-source "kernel/time/Kconfig"
-source "mm/Kconfig"
-source "net/Kconfig"
-source "drivers/Kconfig"
-source "fs/Kconfig"
-source "security/Kconfig"
-source "crypto/Kconfig"
-source "lib/Kconfig"
diff --git a/target/linux/ubicom32/files/arch/ubicom32/Kconfig.debug b/target/linux/ubicom32/files/arch/ubicom32/Kconfig.debug
deleted file mode 100644
index 330c75806..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/Kconfig.debug
+++ /dev/null
@@ -1,129 +0,0 @@
-menu "Kernel hacking"
-
-config TRACE_IRQFLAGS_SUPPORT
-	def_bool y
-
-config DEBUG_VERBOSE
-        bool "Verbose fault messages"
-        default y
-        select PRINTK
-        help
-          When a program crashes due to an exception, or the kernel detects
-          an internal error, the kernel can print a not so brief message
-          explaining what the problem was. This debugging information is
-          useful to developers and kernel hackers when tracking down problems,
-          but mostly meaningless to other people. This is always helpful for
-          debugging but serves no purpose on a production system.
-          Most people should say N here.
-
-config PROTECT_KERNEL
-	default y
-	bool 'Enable Kernel range register Protection'
-	help
-	  Adds code to enable/disable range registers to protect static
-	  kernel code/data from userspace.  Currently the ranges covered
-	  do no protect kernel loadable modules or dynamically allocated
-	  kernel data.
-
-config NO_KERNEL_MSG
-	bool "Suppress Kernel BUG Messages"
-	help
-	  Do not output any debug BUG messages within the kernel.
-
-config EARLY_PRINTK
-	bool "Use the driver that you selected as console also for early printk (to debug kernel bootup)."
-	default n
-	help
-	  If you want to use the serdes driver (console=ttyUS0) for
-	  early printk, you must also supply an additional kernel boot
-	  parameter like this:
-
-		serdes=ioportaddr,irq,clockrate,baud
-
-	  For an IP7160RGW eval board, you could use this:
-
-		serdes=0x2004000,61,250000000,57600
-
-	  which will let you see early printk output at 57600 baud.
-
-config STOP_ON_TRAP
-	bool "Enable stopping at the LDSR for all traps"
-	default n
-	help
-	Cause the LDSR to stop all threads whenever a trap is about to be serviced
-
-config STOP_ON_BUG
-	bool "Enable stopping on failed BUG_ON()"
-	default n
-	help
-	Cause all BUG_ON failures to stop all threads
-
-config DEBUG_IRQMEASURE
-	bool "Enable IRQ handler measurements"
-	default n
-	help
-	When enabled each IRQ's min/avg/max times will be printed.  If the handler
-	re-enables interrupt, the times will show the full time including to service
-	nested interrupts.  See /proc/irq_measurements.
-
-config DEBUG_PCIMEASURE
-	bool "Enable PCI transaction measurements"
-	default n
-	help
-	When enabled the system will measure the min/avg/max timer for each PCI transactions.
-	See /proc/pci_measurements.
-
-config ACCESS_OK_CHECKS_ENABLED
-	bool "Enable user space access checks"
-	default n
-	help
-	Enabling this check causes the kernel to verify that addresses passed
-	to the kernel by the user space code are within the processes
-	address space.  On a no-mmu system, this is done by examining the
-	processes memory data structures (adversly affecting performance) but
-	ensuring that a process does not ask the kernel to violate another
-	processes address space.  Sadly, the kernel uses access_ok() for
-	address that are in the kernel which results in a large volume of
-	false positives.
-
-choice
-	prompt "Unaligned Access Support"
-	default UNALIGNED_ACCESS_ENABLED
-	help
-		Kernel / Userspace unaligned access handling.
-
-config  UNALIGNED_ACCESS_ENABLED
-	bool "Kernel and Userspace"
-	help
-
-config  UNALIGNED_ACCESS_USERSPACE_ONLY
-	bool "Userspace Only"
-	help
-
-config  UNALIGNED_ACCESS_DISABLED
-	bool "Disabled"
-	help
-
-endchoice
-
-config DEBUG_STACKOVERFLOW
-	bool "Check for stack overflows"
-	default n
-	depends on DEBUG_KERNEL
-	help
-	  This option will cause messages to be printed if free kernel stack space
-	  drops below a certain limit (THREAD_SIZE /8).
-
-config DEBUG_STACK_USAGE
-	bool "Stack utilization instrumentation"
-	default n
-	depends on DEBUG_KERNEL
-	help
-	  Enables the display of the minimum amount of free kernel stack which each
-	  task has ever had available in the sysrq-T and sysrq-P debug output.
-
-	  This option will slow down process creation somewhat.
-
-source "lib/Kconfig.debug"
-
-endmenu
diff --git a/target/linux/ubicom32/files/arch/ubicom32/Makefile b/target/linux/ubicom32/files/arch/ubicom32/Makefile
deleted file mode 100644
index c5712d8c8..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/Makefile
+++ /dev/null
@@ -1,104 +0,0 @@
-#
-# arch/ubicom32/Makefile
-#	<TODO: Replace with short file description>
-#
-# (C) Copyright 2009, Ubicom, Inc.
-#
-# This file is part of the Ubicom32 Linux Kernel Port.
-#
-# The Ubicom32 Linux Kernel Port 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.
-#
-# The Ubicom32 Linux Kernel Port is distributed in the hope that it
-# will be useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
-# the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with the Ubicom32 Linux Kernel Port.  If not,
-# see <http://www.gnu.org/licenses/>.
-#
-# Ubicom32 implementation derived from (with many thanks):
-#   arch/m68knommu
-#   arch/blackfin
-#   arch/parisc
-#
-
-KBUILD_DEFCONFIG :=
-
-# setup the machine name and machine dependent settings
-machine-$(CONFIG_UBICOM32_V3)	:= ip5k
-machine-$(CONFIG_UBICOM32_V4)	:= ip7k
-MACHINE := $(machine-y)
-export MACHINE
-
-model-$(CONFIG_RAMKERNEL)	:= ram
-model-$(CONFIG_ROMKERNEL)	:= rom
-MODEL := $(model-y)
-export MODEL
-
-CPUCLASS := $(cpuclass-y)
-
-export CPUCLASS
-
-#
-# We want the core kernel built using the fastcall ABI but modules need
-# to be built using the slower calling convention because they could be
-# loaded out of range for fast calls.
-#
-CFLAGS_KERNEL    += -mfastcall
-CFLAGS_MODULE    += -mno-fastcall
-
-#
-# Some CFLAG additions based on specific CPU type.
-#
-cflags-$(CONFIG_UBICOM32_V3)		:= -march=ubicom32v3 -DIP5000
-cflags-$(CONFIG_UBICOM32_V4)		:= -march=ubicom32v4 -DIP7000
-
-ldflags-$(CONFIG_LINKER_RELAXATION)	:= --relax
-LDFLAGS_vmlinux := $(ldflags-y)
-
-GCCLIBDIR := $(dir $(shell $(CC) $(cflags-y) -print-libgcc-file-name))
-GCC_LIBS := $(GCCLIBDIR)/libgcc.a
-
-KBUILD_CFLAGS += $(cflags-y) -ffunction-sections
-KBUILD_AFLAGS += $(cflags-y)
-
-KBUILD_CFLAGS += -D__linux__ -Dlinux
-KBUILD_CFLAGS += -DUTS_SYSNAME=\"uClinux\"
-
-# include any machine specific directory
-ifneq ($(machine-y),)
-core-y += arch/$(ARCH)/mach-$(MACHINE)/
-endif
-
-head-y := arch/$(ARCH)/kernel/head.o
-
-core-y	+= arch/$(ARCH)/kernel/ \
-	   arch/$(ARCH)/mm/ \
-	   arch/$(ARCH)/crypto/ \
-	   arch/$(ARCH)/mach-common/
-
-drivers-$(CONFIG_OPROFILE)	+= arch/ubicom32/oprofile/
-
-libs-y	+= arch/$(ARCH)/lib/
-libs-y	+= $(GCC_LIBS)
-
-archclean:
-
-# make sure developer has selected a valid board
-ifeq ($(CONFIG_NOBOARD),y)
-# $(error have to select a valid board file $(CONFIG_NOBOARD), please run kernel config again)
-_all: config_board_error
-endif
-
-config_board_error:
-	@echo "*************************************************"
-	@echo "You have not selected a proper board."
-	@echo "Please run menuconfig (or config) against your"
-	@echo "kernel and choose your board under Processor"
-	@echo "options"
-	@echo "*************************************************"
-	@exit 1
diff --git a/target/linux/ubicom32/files/arch/ubicom32/crypto/Makefile b/target/linux/ubicom32/files/arch/ubicom32/crypto/Makefile
deleted file mode 100644
index 2d8e5863c..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/crypto/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# arch/ubicom32/crypto/Makefile
-#	<TODO: Replace with short file description>
-#
-# (C) Copyright 2009, Ubicom, Inc.
-#
-# This file is part of the Ubicom32 Linux Kernel Port.
-#
-# The Ubicom32 Linux Kernel Port 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.
-#
-# The Ubicom32 Linux Kernel Port is distributed in the hope that it
-# will be useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
-# the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with the Ubicom32 Linux Kernel Port.  If not,
-# see <http://www.gnu.org/licenses/>.
-#
-# Ubicom32 implementation derived from (with many thanks):
-#   arch/m68knommu
-#   arch/blackfin
-#   arch/parisc
-#
-obj-$(CONFIG_CRYPTO_UBICOM32) += crypto_ubicom32.o
-obj-$(CONFIG_CRYPTO_AES_UBICOM32) += aes_ubicom32.o
-obj-$(CONFIG_CRYPTO_DES_UBICOM32) += des.o
-obj-$(CONFIG_CRYPTO_MD5_UBICOM32) += md5.o
-obj-$(CONFIG_CRYPTO_SHA1_UBICOM32) += sha1.o
-
-des-y := des_ubicom32.o des_check_key.o
-md5-y := md5_ubicom32.o md5_ubicom32_asm.o
-sha1-y := sha1_ubicom32.o
diff --git a/target/linux/ubicom32/files/arch/ubicom32/crypto/aes_ubicom32.c b/target/linux/ubicom32/files/arch/ubicom32/crypto/aes_ubicom32.c
deleted file mode 100644
index f0b9f86bc..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/crypto/aes_ubicom32.c
+++ /dev/null
@@ -1,458 +0,0 @@
-/*
- * arch/ubicom32/crypto/aes_ubicom32.c
- *   Ubicom32 implementation of the AES Cipher Algorithm.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <crypto/aes.h>
-#include <crypto/algapi.h>
-#include <linux/err.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/spinlock.h>
-#include "crypto_ubicom32.h"
-#include <asm/linkage.h>
-
-struct ubicom32_aes_ctx {
-	u8 key[AES_MAX_KEY_SIZE];
-	u32 ctrl;
-	int key_len;
-};
-
-static inline void aes_hw_set_key(const u8 *key, u8 key_len)
-{
-	/*
-	 * switch case has more overhead than 4 move.4 instructions, so just copy 256 bits
-	 */
-	SEC_SET_KEY_256(key);
-}
-
-static inline void aes_hw_set_iv(const u8 *iv)
-{
-	SEC_SET_IV_4W(iv);
-}
-
-static inline void aes_hw_cipher(u8 *out, const u8 *in)
-{
-	SEC_SET_INPUT_4W(in);
-
-	asm volatile (
-	"	; start AES by writing 0x40(SECURITY_BASE)	\n\t"
-	"	move.4 0x40(%0), #0x01				\n\t"
-	"	pipe_flush 0                                    \n\t"
-	"							\n\t"
-	"	; wait for the module to calculate the output	\n\t"
-	"	btst 0x04(%0), #0				\n\t"
-	"	jmpne.f .-4					\n\t"
-		:
-		: "a" (SEC_BASE)
-		: "cc"
-	);
-
-	SEC_GET_OUTPUT_4W(out);
-}
-
-static int __ocm_text aes_set_key(struct crypto_tfm *tfm, const u8 *in_key,
-		       unsigned int key_len)
-{
-	struct ubicom32_aes_ctx *uctx = crypto_tfm_ctx(tfm);
-
-	uctx->key_len = key_len;
-	memcpy(uctx->key, in_key, key_len);
-
-	/*
-	 * leave out HASH_ALG (none = 0), CBC (no = 0), DIR (unknown) yet
-	 */
-	switch (uctx->key_len) {
-	case 16:
-		uctx->ctrl = SEC_KEY_128_BITS | SEC_ALG_AES;
-		break;
-	case 24:
-		uctx->ctrl = SEC_KEY_192_BITS | SEC_ALG_AES;
-		break;
-	case 32:
-		uctx->ctrl = SEC_KEY_256_BITS | SEC_ALG_AES;
-		break;
-	}
-
-	return 0;
-}
-
-static inline void aes_cipher(struct crypto_tfm *tfm, u8 *out, const u8 *in, u32 extra_flags)
-{
-	const struct ubicom32_aes_ctx *uctx = crypto_tfm_ctx(tfm);
-
-	hw_crypto_lock();
-	hw_crypto_check();
-	hw_crypto_set_ctrl(uctx->ctrl | extra_flags);
-
-	aes_hw_set_key(uctx->key, uctx->key_len);
-	aes_hw_cipher(out, in);
-
-	hw_crypto_unlock();
-}
-
-static void aes_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
-{
-	aes_cipher(tfm, out, in, SEC_DIR_ENCRYPT);
-}
-
-static void aes_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
-{
-	aes_cipher(tfm, out, in, SEC_DIR_DECRYPT);
-}
-
-static struct crypto_alg aes_alg = {
-	.cra_name		=	"aes",
-	.cra_driver_name	=	"aes-ubicom32",
-	.cra_priority		=	CRYPTO_UBICOM32_PRIORITY,
-	.cra_flags		=	CRYPTO_ALG_TYPE_CIPHER,
-	.cra_blocksize		=	AES_BLOCK_SIZE,
-	.cra_ctxsize		=	sizeof(struct ubicom32_aes_ctx),
-	.cra_alignmask		=	CRYPTO_UBICOM32_ALIGNMENT - 1,
-	.cra_module		=	THIS_MODULE,
-	.cra_list		=	LIST_HEAD_INIT(aes_alg.cra_list),
-	.cra_u			=	{
-		.cipher = {
-			.cia_min_keysize	=	AES_MIN_KEY_SIZE,
-			.cia_max_keysize	=	AES_MAX_KEY_SIZE,
-			.cia_setkey		=	aes_set_key,
-			.cia_encrypt		=	aes_encrypt,
-			.cia_decrypt		=	aes_decrypt,
-		}
-	}
-};
-
-static void __ocm_text ecb_aes_crypt_loop(u8 *out, u8 *in, unsigned int n)
-{
-	while (likely(n)) {
-		aes_hw_cipher(out, in);
-		out += AES_BLOCK_SIZE;
-		in += AES_BLOCK_SIZE;
-		n -= AES_BLOCK_SIZE;
-	}
-}
-
-static int __ocm_text ecb_aes_crypt(struct blkcipher_desc *desc, struct scatterlist *dst,
-			 struct scatterlist *src, unsigned int nbytes, u32 extra_flags)
-{
-	const struct ubicom32_aes_ctx *uctx = crypto_blkcipher_ctx(desc->tfm);
-	int ret;
-
-	struct blkcipher_walk walk;
-	blkcipher_walk_init(&walk, dst, src, nbytes);
-	ret = blkcipher_walk_virt(desc, &walk);
-        if (ret) {
-                return ret;
-        }
-
-	hw_crypto_lock();
-	hw_crypto_check();
-
-        hw_crypto_set_ctrl(uctx->ctrl | extra_flags);
-        aes_hw_set_key(uctx->key, uctx->key_len);
-
-	while (likely((nbytes = walk.nbytes))) {
-		/* only use complete blocks */
-		unsigned int n = nbytes & ~(AES_BLOCK_SIZE - 1);
-		u8 *out = walk.dst.virt.addr;
-		u8 *in = walk.src.virt.addr;
-
-		/* finish n/16 blocks */
-		ecb_aes_crypt_loop(out, in, n);
-
-		nbytes &= AES_BLOCK_SIZE - 1;
-		ret = blkcipher_walk_done(desc, &walk, nbytes);
-	}
-
-	hw_crypto_unlock();
-	return ret;
-}
-
-static int ecb_aes_encrypt(struct blkcipher_desc *desc,
-			   struct scatterlist *dst, struct scatterlist *src,
-			   unsigned int nbytes)
-{
-	return ecb_aes_crypt(desc, dst, src, nbytes, SEC_DIR_ENCRYPT);
-}
-
-static int ecb_aes_decrypt(struct blkcipher_desc *desc,
-			   struct scatterlist *dst, struct scatterlist *src,
-			   unsigned int nbytes)
-{
-	return ecb_aes_crypt(desc, dst, src, nbytes, SEC_DIR_DECRYPT);
-}
-
-static struct crypto_alg ecb_aes_alg = {
-	.cra_name		=	"ecb(aes)",
-	.cra_driver_name	=	"ecb-aes-ubicom32",
-	.cra_priority		=	CRYPTO_UBICOM32_COMPOSITE_PRIORITY,
-	.cra_flags		=	CRYPTO_ALG_TYPE_BLKCIPHER,
-	.cra_blocksize		=	AES_BLOCK_SIZE,
-	.cra_ctxsize		=	sizeof(struct ubicom32_aes_ctx),
-	.cra_alignmask          =       CRYPTO_UBICOM32_ALIGNMENT - 1,
-	.cra_type		=	&crypto_blkcipher_type,
-	.cra_module		=	THIS_MODULE,
-	.cra_list		=	LIST_HEAD_INIT(ecb_aes_alg.cra_list),
-	.cra_u			=	{
-		.blkcipher = {
-			.min_keysize		=	AES_MIN_KEY_SIZE,
-			.max_keysize		=	AES_MAX_KEY_SIZE,
-			.setkey			=	aes_set_key,
-			.encrypt		=	ecb_aes_encrypt,
-			.decrypt		=	ecb_aes_decrypt,
-		}
-	}
-};
-
-#if CRYPTO_UBICOM32_LOOP_ASM
-void __ocm_text cbc_aes_encrypt_loop(u8 *out, u8 *in, u8 *iv, unsigned int n)
-{
-	asm volatile (
-	"; set init. iv 4w			\n\t"
-	"	move.4 0x50(%0), 0x0(%3)	\n\t"
-	"	move.4 0x54(%0), 0x4(%3)	\n\t"
-	"	move.4 0x58(%0), 0x8(%3)	\n\t"
-	"	move.4 0x5c(%0), 0xc(%3)	\n\t"
-	"					\n\t"
-	"; we know n > 0, so we can always	\n\t"
-	"; load the first block			\n\t"
-	"; set input 4w				\n\t"
-	"	move.4 0x30(%0), 0x0(%2)	\n\t"
-	"	move.4 0x34(%0), 0x4(%2)	\n\t"
-	"	move.4 0x38(%0), 0x8(%2)	\n\t"
-	"	move.4 0x3c(%0), 0xc(%2)	\n\t"
-	"					\n\t"
-	"; kickoff hw				\n\t"
-	"	move.4 0x40(%0), %2		\n\t"
-	"					\n\t"
-	"; update n & flush			\n\t"
-	"	add.4 %4, #-16, %4		\n\t"
-	"	pipe_flush 0			\n\t"
-	"					\n\t"
-	"; while (n):  work on 2nd block	\n\t"
-	" 1:	lsl.4 d15, %4, #0x0		\n\t"
-	"	jmpeq.f 5f			\n\t"
-	"					\n\t"
-	"; set input 4w	(2nd)			\n\t"
-	"	move.4 0x30(%0), 0x10(%2)	\n\t"
-	"	move.4 0x34(%0), 0x14(%2)	\n\t"
-	"	move.4 0x38(%0), 0x18(%2)	\n\t"
-	"	move.4 0x3c(%0), 0x1c(%2)	\n\t"
-	"					\n\t"
-	"; update n/in asap while waiting	\n\t"
-	"	add.4 %4, #-16, %4		\n\t"
-	"	move.4 d15, 16(%2)++		\n\t"
-	"					\n\t"
-	"; wait for the previous output		\n\t"
-	"	btst 0x04(%0), #0		\n\t"
-	"	jmpne.f -4			\n\t"
-	"					\n\t"
-	"; read previous output			\n\t"
-	"	move.4 0x0(%1), 0x50(%0)	\n\t"
-	"	move.4 0x4(%1), 0x54(%0)	\n\t"
-	"	move.4 0x8(%1), 0x58(%0)	\n\t"
-	"	move.4 0xc(%1), 0x5c(%0)	\n\t"
-	"					\n\t"
-	"; kick off hw for 2nd input		\n\t"
-	"	move.4 0x40(%0), %2		\n\t"
-	"					\n\t"
-	"; update out asap			\n\t"
-	"	move.4 d15, 16(%1)++		\n\t"
-	"					\n\t"
-	"; go back to loop			\n\t"
-	"	jmpt 1b				\n\t"
-	"					\n\t"
-	"; wait for last output			\n\t"
-	" 5:	btst 0x04(%0), #0               \n\t"
-        "       jmpne.f -4                      \n\t"
-        "                                       \n\t"
-	"; read last output			\n\t"
-	"	move.4 0x0(%1), 0x50(%0)	\n\t"
-	"	move.4 0x4(%1), 0x54(%0)	\n\t"
-	"	move.4 0x8(%1), 0x58(%0)	\n\t"
-	"	move.4 0xc(%1), 0x5c(%0)	\n\t"
-        "                                       \n\t"
-	"; copy out iv				\n\t"
-	"	move.4 0x0(%3), 0x50(%0)	\n\t"
-	"	move.4 0x4(%3), 0x54(%0)	\n\t"
-	"	move.4 0x8(%3), 0x58(%0)	\n\t"
-	"	move.4 0xc(%3), 0x5c(%0)	\n\t"
-        "                                       \n\t"
-		:
-		: "a" (SEC_BASE), "a" (out), "a" (in), "a" (iv), "d" (n)
-		: "d15", "cc"
-	);
-}
-
-#else
-
-static void __ocm_text cbc_aes_encrypt_loop(u8 *out, u8 *in, u8 *iv, unsigned int n)
-{
-	aes_hw_set_iv(iv);
-	while (likely(n)) {
-		aes_hw_cipher(out, in);
-		out += AES_BLOCK_SIZE;
-		in += AES_BLOCK_SIZE;
-		n -= AES_BLOCK_SIZE;
-	}
-	SEC_COPY_4W(iv, out - AES_BLOCK_SIZE);
-}
-
-#endif
-
-static void __ocm_text cbc_aes_decrypt_loop(u8 *out, u8 *in, u8 *iv, unsigned int n)
-{
-        while (likely(n)) {
-                aes_hw_set_iv(iv);
-		SEC_COPY_4W(iv, in);
-                aes_hw_cipher(out, in);
-                out += AES_BLOCK_SIZE;
-                in += AES_BLOCK_SIZE;
-                n -= AES_BLOCK_SIZE;
-        }
-}
-
-static int __ocm_text cbc_aes_crypt(struct blkcipher_desc *desc,
-                           struct scatterlist *dst, struct scatterlist *src,
-                           unsigned int nbytes, u32 extra_flags)
-{
-	struct ubicom32_aes_ctx *uctx = crypto_blkcipher_ctx(desc->tfm);
-	int ret;
-
-        struct blkcipher_walk walk;
-        blkcipher_walk_init(&walk, dst, src, nbytes);
-	ret = blkcipher_walk_virt(desc, &walk);
-	if (unlikely(ret)) {
-		return ret;
-	}
-
-        hw_crypto_lock();
-	hw_crypto_check();
-
-        hw_crypto_set_ctrl(uctx->ctrl | extra_flags);
-        aes_hw_set_key(uctx->key, uctx->key_len);
-
-	while (likely((nbytes = walk.nbytes))) {
-                /* only use complete blocks */
-                unsigned int n = nbytes & ~(AES_BLOCK_SIZE - 1);
-		if (likely(n)) {
-	                u8 *out = walk.dst.virt.addr;
-		        u8 *in = walk.src.virt.addr;
-
-			if (extra_flags & SEC_DIR_ENCRYPT) {
-				cbc_aes_encrypt_loop(out, in, walk.iv, n);
-			} else {
-				cbc_aes_decrypt_loop(out, in, walk.iv, n);
-			}
-		}
-
-		nbytes &= AES_BLOCK_SIZE - 1;
-                ret = blkcipher_walk_done(desc, &walk, nbytes);
-	}
-	hw_crypto_unlock();
-
-	return ret;
-}
-
-static int __ocm_text cbc_aes_encrypt(struct blkcipher_desc *desc,
-			   struct scatterlist *dst, struct scatterlist *src,
-			   unsigned int nbytes)
-{
-	return cbc_aes_crypt(desc, dst, src, nbytes, SEC_DIR_ENCRYPT | SEC_CBC_SET);
-}
-
-static int __ocm_text cbc_aes_decrypt(struct blkcipher_desc *desc,
-			   struct scatterlist *dst, struct scatterlist *src,
-			   unsigned int nbytes)
-{
-	return cbc_aes_crypt(desc, dst, src, nbytes, SEC_DIR_DECRYPT | SEC_CBC_SET);
-}
-
-static struct crypto_alg cbc_aes_alg = {
-	.cra_name		=	"cbc(aes)",
-	.cra_driver_name	=	"cbc-aes-ubicom32",
-	.cra_priority		=	CRYPTO_UBICOM32_COMPOSITE_PRIORITY,
-	.cra_flags		=	CRYPTO_ALG_TYPE_BLKCIPHER,
-	.cra_blocksize		=	AES_BLOCK_SIZE,
-	.cra_ctxsize		=	sizeof(struct ubicom32_aes_ctx),
-	.cra_alignmask          =       CRYPTO_UBICOM32_ALIGNMENT - 1,
-	.cra_type		=	&crypto_blkcipher_type,
-	.cra_module		=	THIS_MODULE,
-	.cra_list		=	LIST_HEAD_INIT(cbc_aes_alg.cra_list),
-	.cra_u			=	{
-		.blkcipher = {
-			.min_keysize		=	AES_MIN_KEY_SIZE,
-			.max_keysize		=	AES_MAX_KEY_SIZE,
-			.ivsize			=	AES_BLOCK_SIZE,
-			.setkey			=	aes_set_key,
-			.encrypt		=	cbc_aes_encrypt,
-			.decrypt		=	cbc_aes_decrypt,
-		}
-	}
-};
-
-static int __init aes_init(void)
-{
-	int ret;
-
-	hw_crypto_init();
-
-	ret = crypto_register_alg(&aes_alg);
-	if (ret)
-		goto aes_err;
-
-	ret = crypto_register_alg(&ecb_aes_alg);
-	if (ret)
-		goto ecb_aes_err;
-
-	ret = crypto_register_alg(&cbc_aes_alg);
-	if (ret)
-		goto cbc_aes_err;
-
-out:
-	return ret;
-
-cbc_aes_err:
-	crypto_unregister_alg(&ecb_aes_alg);
-ecb_aes_err:
-	crypto_unregister_alg(&aes_alg);
-aes_err:
-	goto out;
-}
-
-static void __exit aes_fini(void)
-{
-	crypto_unregister_alg(&cbc_aes_alg);
-	crypto_unregister_alg(&ecb_aes_alg);
-	crypto_unregister_alg(&aes_alg);
-}
-
-module_init(aes_init);
-module_exit(aes_fini);
-
-MODULE_ALIAS("aes");
-
-MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm");
-MODULE_LICENSE("GPL");
diff --git a/target/linux/ubicom32/files/arch/ubicom32/crypto/crypto_des.h b/target/linux/ubicom32/files/arch/ubicom32/crypto/crypto_des.h
deleted file mode 100644
index 3fc0ac361..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/crypto/crypto_des.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * arch/ubicom32/crypto/crypto_des.h
- *   Function for checking keys for the DES and Triple DES Encryption
- *   algorithms.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef __CRYPTO_DES_H__
-#define __CRYPTO_DES_H__
-
-extern int crypto_des_check_key(const u8*, unsigned int, u32*);
-
-#endif /* __CRYPTO_DES_H__ */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/crypto/crypto_ubicom32.c b/target/linux/ubicom32/files/arch/ubicom32/crypto/crypto_ubicom32.c
deleted file mode 100644
index 237ebbd9f..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/crypto/crypto_ubicom32.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * arch/ubicom32/crypto/crypto_ubicom32.c
- *   Generic code to support ubicom32 hardware crypto accelerator
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include "crypto_ubicom32.h"
-
-spinlock_t crypto_ubicom32_lock;
-bool crypto_ubicom32_inited = false;
-volatile bool crypto_ubicom32_on = false;
-volatile unsigned long crypto_ubicom32_last_use;
-
-struct timer_list crypto_ubicom32_ps_timer;
-void crypto_ubicom32_ps_check(unsigned long data)
-{
-	unsigned long idle_time = msecs_to_jiffies(HW_CRYPTO_PS_MAX_IDLE_MS);
-
-	BUG_ON(!crypto_ubicom32_on);
-
-	if (((jiffies - crypto_ubicom32_last_use) > idle_time) && spin_trylock_bh(&crypto_ubicom32_lock)) {
-                hw_crypto_turn_off();
-                spin_unlock_bh(&crypto_ubicom32_lock);
-		return;
-	}
-
-	/* keep monitoring */
-	hw_crypto_ps_start();
-}
diff --git a/target/linux/ubicom32/files/arch/ubicom32/crypto/crypto_ubicom32.h b/target/linux/ubicom32/files/arch/ubicom32/crypto/crypto_ubicom32.h
deleted file mode 100644
index e754c19b9..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/crypto/crypto_ubicom32.h
+++ /dev/null
@@ -1,346 +0,0 @@
-/*
- * arch/ubicom32/crypto/crypto_ubicom32.h
- *   Support for Ubicom32 cryptographic instructions.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _CRYPTO_ARCH_UBICOM32_CRYPT_H
-#define _CRYPTO_ARCH_UBICOM32_CRYPT_H
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/jiffies.h>
-#include <linux/timer.h>
-#include <linux/spinlock.h>
-#include <asm/errno.h>
-#include <asm/io.h>
-#include <asm/ip5000.h>
-
-#define CRYPTO_UBICOM32_LOOP_ASM 1
-#define CRYPTO_UBICOM32_ALIGNMENT 4
-#define SEC_ALIGNED(p) (((u32)p & 3) == 0)
-
-#define SEC_BASE		SECURITY_BASE
-#define SEC_KEY_OFFSET		SECURITY_KEY_VALUE(0)
-#define SEC_INPUT_OFFSET	SECURITY_KEY_IN(0)
-#define SEC_OUTPUT_OFFSET	SECURITY_KEY_OUT(0)
-#define SEC_HASH_OFFSET		SECURITY_KEY_HASH(0)
-
-#define SEC_KEY_128_BITS	SECURITY_CTRL_KEY_SIZE(0)
-#define SEC_KEY_192_BITS	SECURITY_CTRL_KEY_SIZE(1)
-#define SEC_KEY_256_BITS	SECURITY_CTRL_KEY_SIZE(2)
-
-#define SEC_HASH_NONE		SECURITY_CTRL_HASH_ALG_NONE
-#define SEC_HASH_MD5		SECURITY_CTRL_HASH_ALG_MD5
-#define SEC_HASH_SHA1		SECURITY_CTRL_HASH_ALG_SHA1
-
-#define SEC_CBC_SET		SECURITY_CTRL_CBC
-#define SEC_CBC_NONE		0
-
-#define SEC_ALG_AES		SECURITY_CTRL_CIPHER_ALG_AES
-#define SEC_ALG_NONE		SECURITY_CTRL_CIPHER_ALG_NONE
-#define SEC_ALG_DES		SECURITY_CTRL_CIPHER_ALG_DES
-#define SEC_ALG_3DES		SECURITY_CTRL_CIPHER_ALG_3DES
-
-#define SEC_DIR_ENCRYPT		SECURITY_CTRL_ENCIPHER
-#define SEC_DIR_DECRYPT		0
-
-#define CRYPTO_UBICOM32_PRIORITY 300
-#define CRYPTO_UBICOM32_COMPOSITE_PRIORITY 400
-
-#define HW_CRYPTO_PS_MAX_IDLE_MS 100    /* idle time (ms) before shuting down sm */
-
-extern spinlock_t crypto_ubicom32_lock;
-extern bool crypto_ubicom32_inited;
-extern volatile bool crypto_ubicom32_on;
-extern volatile unsigned long crypto_ubicom32_last_use;
-extern struct timer_list crypto_ubicom32_ps_timer;
-extern void crypto_ubicom32_ps_check(unsigned long data);
-
-#define SEC_COPY_2W(t, s)				\
-	asm volatile (					\
-	"	move.4 0(%0), 0(%1)		\n\t"	\
-	"	move.4 4(%0), 4(%1)		\n\t"	\
-							\
-		:					\
-		: "a" (t), "a" (s)			\
-	)
-
-#define SEC_COPY_4W(t, s)				\
-	asm volatile (					\
-	"	move.4 0(%0), 0(%1)		\n\t"	\
-	"	move.4 4(%0), 4(%1)		\n\t"	\
-	"	move.4 8(%0), 8(%1)		\n\t"	\
-	"	move.4 12(%0), 12(%1)		\n\t"	\
-		:					\
-		: "a" (t), "a" (s)			\
-	)
-
-#define SEC_COPY_5W(t, s)				\
-	asm volatile (					\
-	"	move.4 0(%0), 0(%1)		\n\t"	\
-	"	move.4 4(%0), 4(%1)		\n\t"	\
-	"	move.4 8(%0), 8(%1)		\n\t"	\
-	"	move.4 12(%0), 12(%1)		\n\t"	\
-	"	move.4 16(%0), 16(%1)		\n\t"	\
-		:					\
-		: "a" (t), "a" (s)			\
-	)
-
-#define SEC_SET_KEY_2W(x)				\
-	asm volatile (					\
-	"	; write key to Security Keyblock \n\t"	\
-	"	move.4 0x10(%0), 0(%1)		\n\t"	\
-	"	move.4 0x14(%0), 4(%1)		\n\t"	\
-		:					\
-		: "a" (SECURITY_BASE), "a" (x)		\
-	)
-
-#define SEC_SET_KEY_4W(x) \
-	asm volatile ( \
-	"	; write key to Security Keyblock \n\t"	\
-	"	move.4 0x10(%0), 0(%1)		\n\t"	\
-	"	move.4 0x14(%0), 4(%1)		\n\t"	\
-	"	move.4 0x18(%0), 8(%1)		\n\t"	\
-	"	move.4 0x1c(%0), 12(%1)		\n\t"	\
-		:					\
-		: "a"(SECURITY_BASE), "a"(x)		\
-	)
-
-#define SEC_SET_KEY_6W(x)				\
-	asm volatile (					\
-	"	; write key to Security Keyblock \n\t"	\
-	"	move.4 0x10(%0), 0(%1)		\n\t"	\
-	"	move.4 0x14(%0), 4(%1)		\n\t"	\
-	"	move.4 0x18(%0), 8(%1)		\n\t"	\
-	"	move.4 0x1c(%0), 12(%1)		\n\t"	\
-	"	move.4 0x20(%0), 16(%1)		\n\t"	\
-	"	move.4 0x24(%0), 20(%1)		\n\t"	\
-		:					\
-		: "a" (SECURITY_BASE), "a" (x)		\
-	)
-
-#define SEC_SET_KEY_8W(x)				\
-	asm volatile (					\
-	"	; write key to Security Keyblock \n\t"	\
-	"	move.4 0x10(%0), 0(%1)		\n\t"	\
-	"	move.4 0x14(%0), 4(%1)		\n\t"	\
-	"	move.4 0x18(%0), 8(%1)		\n\t"	\
-	"	move.4 0x1c(%0), 12(%1)		\n\t"	\
-	"	move.4 0x20(%0), 16(%1)		\n\t"	\
-	"	move.4 0x24(%0), 20(%1)		\n\t"	\
-	"	move.4 0x28(%0), 24(%1)		\n\t"	\
-	"	move.4 0x2c(%0), 28(%1)		\n\t"	\
-		:					\
-		: "a" (SECURITY_BASE), "a" (x)		\
-	)
-
-#define SEC_SET_KEY_64(k)	SEC_SET_KEY_2W(k)
-#define SEC_SET_KEY_128(k)	SEC_SET_KEY_4W(k)
-#define SEC_SET_KEY_192(k)	SEC_SET_KEY_6W(k)
-#define SEC_SET_KEY_256(k)	SEC_SET_KEY_8W(k)
-
-#define DES_SET_KEY(x) 		SEC_SET_KEY_64(x)
-#define DES3_SET_KEY(x) 	SEC_SET_KEY_192(x)
-
-#define SEC_SET_INPUT_2W(x)				\
-	asm volatile (					\
-	"	; write key to Security Keyblock \n\t"	\
-	"	move.4 0x30(%0), 0(%1)		\n\t"	\
-	"	move.4 0x34(%0), 4(%1)		\n\t"	\
-		:					\
-		: "a" (SECURITY_BASE), "a" (x)		\
-	)
-
-#define SEC_GET_OUTPUT_2W(x)				\
-	asm volatile (					\
-	"	; write key to Security Keyblock \n\t"	\
-	"	move.4 0(%1), 0x50(%0)		\n\t"	\
-	"	move.4 4(%1), 0x54(%0)		\n\t"	\
-		:					\
-		: "a" (SECURITY_BASE), "a" (x)		\
-	)
-
-#define SEC_SET_INPUT_4W(x) \
-	asm volatile ( \
-	"	; write key to Security Keyblock \n\t"	\
-	"	move.4 0x30(%0), 0(%1)		\n\t"	\
-	"	move.4 0x34(%0), 4(%1)		\n\t"	\
-	"	move.4 0x38(%0), 8(%1)		\n\t"	\
-	"	move.4 0x3c(%0), 12(%1)		\n\t"	\
-		:					\
-		: "a" (SECURITY_BASE), "a" (x)		\
-	)
-
-#define SEC_GET_OUTPUT_4W(x)				\
-	asm volatile (					\
-	"	; read output from Security Keyblock \n\t" \
-	"	move.4 0(%1), 0x50(%0)		\n\t"	\
-	"	move.4 4(%1), 0x54(%0)		\n\t"	\
-	"	move.4 8(%1), 0x58(%0)		\n\t"	\
-	"	move.4 12(%1), 0x5c(%0)		\n\t"	\
-		:					\
-		: "a" (SECURITY_BASE), "a" (x)		\
-	)
-
-#define SEC_SET_IV_4W(x)				\
-	asm volatile (					\
-	"	; write IV to Security Keyblock  \n\t"	\
-	"	move.4 0x50(%0), 0(%1)		\n\t"	\
-	"	move.4 0x54(%0), 4(%1)		\n\t"	\
-	"	move.4 0x58(%0), 8(%1)		\n\t"	\
-	"	move.4 0x5c(%0), 12(%1)		\n\t"	\
-		:					\
-		: "a" (SECURITY_BASE), "a" (x)		\
-	)
-
-#define SEC_PIPE_FLUSH() asm volatile ( " pipe_flush 0 \n\t" )
-
-static inline void hw_crypto_set_ctrl(uint32_t c)
-{
-	asm volatile (
-	"	move.4	0(%0), %1		\n\t"
-		:
-		: "a" (SECURITY_BASE + SECURITY_CTRL), "d" (c)
-	);
-}
-
-static inline void hw_crypto_ps_start(void)
-{
-	crypto_ubicom32_ps_timer.expires = jiffies + msecs_to_jiffies(HW_CRYPTO_PS_MAX_IDLE_MS >> 1);
-	add_timer(&crypto_ubicom32_ps_timer);
-}
-
-static inline void hw_crypto_turn_on(void)
-{
-	asm volatile (
-	"	moveai  A4, %0			\n\t"
-	"	bset    0x0(A4), 0x0(A4), %1	\n\t"
-	"	cycles 11			\n\t"
-		:
-		: "i" (OCP_BASE >> 7), "i" (GEN_CLK_PLL_SECURITY_BIT_NO)
-		: "a4", "cc"
-	);
-	crypto_ubicom32_on = true;
-}
-
-static inline void hw_crypto_turn_off(void)
-{
-	asm volatile (
-	"	moveai  A4, %0			\n\t"
-	"	bclr    0x0(A4), 0x0(A4), %1	\n\t"
-		:
-		: "i" (OCP_BASE >> 7), "i" (GEN_CLK_PLL_SECURITY_BIT_NO)
-		: "a4", "cc"
-	);
-	crypto_ubicom32_on = false;
-}
-
-/*
- * hw_crypto_check
- * 	Most probably hw crypto is called in clusters and it makes no sense to turn it off
- * 	and on and waster 13 cycles every time.
- */
-static inline void hw_crypto_check(void)
-{
-	if (likely(crypto_ubicom32_on)) {
-		return;
-	}
-	crypto_ubicom32_last_use = jiffies;
-	hw_crypto_turn_on();
-	hw_crypto_ps_start();
-}
-
-/*
- * hw_crypto_ps_init
- * 	Init power save timer
- */
-static inline void hw_crypto_ps_init(void)
-{
-	init_timer_deferrable(&crypto_ubicom32_ps_timer);
-	crypto_ubicom32_ps_timer.function = crypto_ubicom32_ps_check;
-	crypto_ubicom32_ps_timer.data = 0;
-}
-
-/*
- * hw_crypto_init()
- *      Initialize OCP security module lock and disables its clock.
- */
-static inline void hw_crypto_init(void)
-{
-	if (!crypto_ubicom32_inited) {
-		crypto_ubicom32_inited = true;
-		spin_lock_init(&crypto_ubicom32_lock);
-		hw_crypto_ps_init();
-		hw_crypto_turn_off();
-	}
-}
-
-/*
- * hw_crypto_lock()
- *      Locks the OCP security module and enables its clock.
- */
-static inline void hw_crypto_lock(void)
-{
-	spin_lock_bh(&crypto_ubicom32_lock);
-}
-
-/*
- * hw_crypto_unlock()
- *      Unlocks the OCP security module and disables its clock.
- */
-static inline void hw_crypto_unlock(void)
-{
-	crypto_ubicom32_last_use = jiffies;
-	spin_unlock_bh(&crypto_ubicom32_lock);
-}
-
-#define CONFIG_CRYPTO_UBICOM32_DEBUG 1
-
-#ifdef CONFIG_CRYPTO_UBICOM32_DEBUG
-static inline void hex_dump(void *buf, int b_size, const char *msg)
-{
-	u8 *b = (u8 *)buf;
-	int i;
-	if (msg) {
-		printk("%s:\t", msg);
-	}
-
-	for (i=0; i < b_size; i++) {
-		printk("%02x ", b[i]);
-		if ((i & 3) == 3) {
-			printk(" ");
-		}
-		if ((i & 31) == 31) {
-			printk("\n");
-		}
-	}
-	printk("\n");
-}
-#define UBICOM32_SEC_DUMP(a, b, c) hex_dump(a, b, c)
-#else
-#define UBICOM32_SEC_DUMP(a, b, c)
-#endif
-
-#endif	/* _CRYPTO_ARCH_UBICOM32_CRYPT_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/crypto/des_check_key.c b/target/linux/ubicom32/files/arch/ubicom32/crypto/des_check_key.c
deleted file mode 100644
index 162e52477..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/crypto/des_check_key.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * arch/ubicom32/crypto/des_check_key.c
- *   Ubicom32 architecture function for checking keys for the DES and
- *   Tripple DES Encryption algorithms.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * Originally released as descore by Dana L. How <how@isl.stanford.edu>.
- * Modified by Raimar Falke <rf13@inf.tu-dresden.de> for the Linux-Kernel.
- * Derived from Cryptoapi and Nettle implementations, adapted for in-place
- * scatterlist interface.  Changed LGPL to GPL per section 3 of the LGPL.
- *
- * s390 Version:
- *   Copyright IBM Corp. 2003
- *   Author(s): Thomas Spatzier
- *		Jan Glauber (jan.glauber@de.ibm.com)
- *
- * Derived from "crypto/des.c"
- *   Copyright (c) 1992 Dana L. How.
- *   Copyright (c) Raimar Falke <rf13@inf.tu-dresden.de>
- *   Copyright (c) Gisle Sflensminde <gisle@ii.uib.no>
- *   Copyright (C) 2001 Niels Mvller.
- *   Copyright (c) 2002 James Morris <jmorris@intercode.com.au>
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/errno.h>
-#include <linux/crypto.h>
-#include "crypto_des.h"
-
-#define ROR(d,c,o)	((d) = (d) >> (c) | (d) << (o))
-
-static const u8 parity[] = {
-	8,1,0,8,0,8,8,0,0,8,8,0,8,0,2,8,0,8,8,0,8,0,0,8,8,0,0,8,0,8,8,3,
-	0,8,8,0,8,0,0,8,8,0,0,8,0,8,8,0,8,0,0,8,0,8,8,0,0,8,8,0,8,0,0,8,
-	0,8,8,0,8,0,0,8,8,0,0,8,0,8,8,0,8,0,0,8,0,8,8,0,0,8,8,0,8,0,0,8,
-	8,0,0,8,0,8,8,0,0,8,8,0,8,0,0,8,0,8,8,0,8,0,0,8,8,0,0,8,0,8,8,0,
-	0,8,8,0,8,0,0,8,8,0,0,8,0,8,8,0,8,0,0,8,0,8,8,0,0,8,8,0,8,0,0,8,
-	8,0,0,8,0,8,8,0,0,8,8,0,8,0,0,8,0,8,8,0,8,0,0,8,8,0,0,8,0,8,8,0,
-	8,0,0,8,0,8,8,0,0,8,8,0,8,0,0,8,0,8,8,0,8,0,0,8,8,0,0,8,0,8,8,0,
-	4,8,8,0,8,0,0,8,8,0,0,8,0,8,8,0,8,5,0,8,0,8,8,0,0,8,8,0,8,0,6,8,
-};
-
-/*
- * RFC2451: Weak key checks SHOULD be performed.
- */
-int
-crypto_des_check_key(const u8 *key, unsigned int keylen, u32 *flags)
-{
-	u32 n, w;
-
-	n  = parity[key[0]]; n <<= 4;
-	n |= parity[key[1]]; n <<= 4;
-	n |= parity[key[2]]; n <<= 4;
-	n |= parity[key[3]]; n <<= 4;
-	n |= parity[key[4]]; n <<= 4;
-	n |= parity[key[5]]; n <<= 4;
-	n |= parity[key[6]]; n <<= 4;
-	n |= parity[key[7]];
-	w = 0x88888888L;
-
-	if ((*flags & CRYPTO_TFM_REQ_WEAK_KEY)
-	    && !((n - (w >> 3)) & w)) {  /* 1 in 10^10 keys passes this test */
-		if (n < 0x41415151) {
-			if (n < 0x31312121) {
-				if (n < 0x14141515) {
-					/* 01 01 01 01 01 01 01 01 */
-					if (n == 0x11111111) goto weak;
-					/* 01 1F 01 1F 01 0E 01 0E */
-					if (n == 0x13131212) goto weak;
-				} else {
-					/* 01 E0 01 E0 01 F1 01 F1 */
-					if (n == 0x14141515) goto weak;
-					/* 01 FE 01 FE 01 FE 01 FE */
-					if (n == 0x16161616) goto weak;
-				}
-			} else {
-				if (n < 0x34342525) {
-					/* 1F 01 1F 01 0E 01 0E 01 */
-					if (n == 0x31312121) goto weak;
-					/* 1F 1F 1F 1F 0E 0E 0E 0E (?) */
-					if (n == 0x33332222) goto weak;
-				} else {
-					/* 1F E0 1F E0 0E F1 0E F1 */
-					if (n == 0x34342525) goto weak;
-					/* 1F FE 1F FE 0E FE 0E FE */
-					if (n == 0x36362626) goto weak;
-				}
-			}
-		} else {
-			if (n < 0x61616161) {
-				if (n < 0x44445555) {
-					/* E0 01 E0 01 F1 01 F1 01 */
-					if (n == 0x41415151) goto weak;
-					/* E0 1F E0 1F F1 0E F1 0E */
-					if (n == 0x43435252) goto weak;
-				} else {
-					/* E0 E0 E0 E0 F1 F1 F1 F1 (?) */
-					if (n == 0x44445555) goto weak;
-					/* E0 FE E0 FE F1 FE F1 FE */
-					if (n == 0x46465656) goto weak;
-				}
-			} else {
-				if (n < 0x64646565) {
-					/* FE 01 FE 01 FE 01 FE 01 */
-					if (n == 0x61616161) goto weak;
-					/* FE 1F FE 1F FE 0E FE 0E */
-					if (n == 0x63636262) goto weak;
-				} else {
-					/* FE E0 FE E0 FE F1 FE F1 */
-					if (n == 0x64646565) goto weak;
-					/* FE FE FE FE FE FE FE FE */
-					if (n == 0x66666666) goto weak;
-				}
-			}
-		}
-	}
-	return 0;
-weak:
-	*flags |= CRYPTO_TFM_RES_WEAK_KEY;
-	return -EINVAL;
-}
-
-EXPORT_SYMBOL(crypto_des_check_key);
-
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Key Check function for DES &  DES3 Cipher Algorithms");
diff --git a/target/linux/ubicom32/files/arch/ubicom32/crypto/des_ubicom32.c b/target/linux/ubicom32/files/arch/ubicom32/crypto/des_ubicom32.c
deleted file mode 100644
index 14e5fb24e..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/crypto/des_ubicom32.c
+++ /dev/null
@@ -1,761 +0,0 @@
-/*
- * arch/ubicom32/crypto/des_ubicom32.c
- *   Ubicom32 implementation of the DES Cipher Algorithm.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <crypto/algapi.h>
-#include <linux/init.h>
-#include <linux/module.h>
-
-#include "crypto_ubicom32.h"
-extern int crypto_des_check_key(const u8 *key, unsigned int keylen, u32 *flags);
-
-#define DES_BLOCK_SIZE 8
-#define DES_KEY_SIZE 8
-
-#define DES3_192_KEY_SIZE	(3 * DES_KEY_SIZE)
-#define DES3_192_BLOCK_SIZE	DES_BLOCK_SIZE
-
-#define DES3_SUB_KEY(key, i) 	(((u8 *)key) + (i * DES_KEY_SIZE))
-
-enum des_ops {
-	DES_ENCRYPT,
-	DES_DECRYPT,
-
-	DES3_EDE_ENCRYPT,
-	DES3_EDE_DECRYPT,
-
-#ifdef DES3_EEE
-	DES3_EEE_ENCRYPT,
-	DES3_EEE_DECRYPT,
-#endif
-};
-
-struct ubicom32_des_ctx {
-	u8 key[3 * DES_KEY_SIZE];
-	u32 ctrl;
-	int key_len;
-};
-
-static inline void des_hw_set_key(const u8 *key, u8 key_len)
-{
-	/*
-	 * HW 3DES is not tested yet, use DES just as ipOS
-	 */
-	DES_SET_KEY(key);
-}
-
-static inline void des_hw_cipher(u8 *out, const u8 *in)
-{
-	SEC_SET_INPUT_2W(in);
-
-	asm volatile (
-	"	; start DES by writing 0x38(SECURITY_BASE)	\n\t"
-	"	move.4 0x38(%0), #0x01				\n\t"
-	"	pipe_flush 0					\n\t"
-	"							\n\t"
-	"	; wait for the module to calculate the output	\n\t"
-	"	btst 0x04(%0), #0				\n\t"
-	"	jmpne.f .-4					\n\t"
-		:
-		: "a" (SEC_BASE)
-		: "cc"
-	);
-
-	SEC_GET_OUTPUT_2W(out);
-}
-
-
-static void inline des3_hw_ede_encrypt(u8 *keys, u8 *out, const u8 *in)
-{
-	hw_crypto_set_ctrl(SEC_ALG_DES | SEC_DIR_ENCRYPT);
-	des_hw_set_key(DES3_SUB_KEY(keys, 0), DES_KEY_SIZE);
-	des_hw_cipher(out, in);
-
-	hw_crypto_set_ctrl(SEC_ALG_DES | SEC_DIR_DECRYPT);
-	des_hw_set_key(DES3_SUB_KEY(keys, 1), DES_KEY_SIZE);
-	des_hw_cipher(out, out);
-
-	hw_crypto_set_ctrl(SEC_ALG_DES | SEC_DIR_ENCRYPT);
-	des_hw_set_key(DES3_SUB_KEY(keys, 2), DES_KEY_SIZE);
-	des_hw_cipher(out, out);
-}
-
-static void inline des3_hw_ede_decrypt(u8 *keys, u8 *out, const u8 *in)
-{
-	hw_crypto_set_ctrl(SEC_ALG_DES | SEC_DIR_DECRYPT);
-	des_hw_set_key(DES3_SUB_KEY(keys, 2), DES_KEY_SIZE);
-	des_hw_cipher(out, in);
-
-	hw_crypto_set_ctrl(SEC_ALG_DES | SEC_DIR_ENCRYPT);
-	des_hw_set_key(DES3_SUB_KEY(keys, 1), DES_KEY_SIZE);
-	des_hw_cipher(out, out);
-
-	hw_crypto_set_ctrl(SEC_ALG_DES | SEC_DIR_DECRYPT);
-	des_hw_set_key(DES3_SUB_KEY(keys, 0), DES_KEY_SIZE);
-	des_hw_cipher(out, out);
-}
-
-#ifdef DES3_EEE
-static void inline des3_hw_eee_encrypt(u8 *keys, u8 *out, const u8 *in)
-{
-	hw_crypto_set_ctrl(SEC_ALG_DES | SEC_DIR_ENCRYPT);
-	des_hw_set_key(DES3_SUB_KEY(keys, 0), 2);
-	des_hw_cipher(out, in);
-
-	hw_crypto_set_ctrl(SEC_ALG_DES | SEC_DIR_ENCRYPT);
-	des_hw_set_key(DES3_SUB_KEY(keys, 1), 2);
-	des_hw_cipher(out, out);
-
-	hw_crypto_set_ctrl(SEC_ALG_DES | SEC_DIR_ENCRYPT);
-	des_hw_set_key(DES3_SUB_KEY(keys, 2), 2);
-	des_hw_cipher(out, out);
-}
-
-static void inline des3_hw_eee_decrypt(u8 *keys, u8 *out, const u8 *in)
-{
-	hw_crypto_set_ctrl(SEC_ALG_DES | SEC_DIR_DECRYPT);
-	des_hw_set_key(DES3_SUB_KEY(keys, 2), 2);
-	des_hw_cipher(out, in);
-
-	hw_crypto_set_ctrl(SEC_ALG_DES | SEC_DIR_DECRYPT);
-	des_hw_set_key(DES3_SUB_KEY(keys, 1), 2);
-	des_hw_cipher(out, out);
-
-	hw_crypto_set_ctrl(SEC_ALG_DES | SEC_DIR_DECRYPT);
-	des_hw_set_key(DES3_SUB_KEY(keys, 0), 2);
-	des_hw_cipher(out, out);
-}
-#endif
-
-static int des_setkey(struct crypto_tfm *tfm, const u8 *key,
-		      unsigned int keylen)
-{
-	struct ubicom32_des_ctx *dctx = crypto_tfm_ctx(tfm);
-	u32 *flags = &tfm->crt_flags;
-	int ret;
-
-	/* test if key is valid (not a weak key) */
-	ret = crypto_des_check_key(key, keylen, flags);
-	if (ret == 0) {
-		memcpy(dctx->key, key, keylen);
-		dctx->key_len = keylen;
-		//dctx->ctrl = (keylen == DES_KEY_SIZE) ? SEC_ALG_DES : SEC_ALG_3DES
-		/* 2DES and 3DES are both implemented with DES hw function */
-		dctx->ctrl = SEC_ALG_DES;
-	}
-	return ret;
-}
-
-static inline void des_cipher_1b(struct crypto_tfm *tfm, u8 *out, const u8 *in, u32 extra_flags)
-{
-	const struct ubicom32_des_ctx *uctx = crypto_tfm_ctx(tfm);
-
-	hw_crypto_lock();
-	hw_crypto_check();
-	hw_crypto_set_ctrl(uctx->ctrl | extra_flags);
-
-	des_hw_set_key(uctx->key, uctx->key_len);
-	des_hw_cipher(out, in);
-
-	hw_crypto_unlock();
-}
-
-static void des_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
-{
-	des_cipher_1b(tfm, out, in, SEC_DIR_ENCRYPT);
-}
-
-static void des_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
-{
-	des_cipher_1b(tfm, out, in, SEC_DIR_DECRYPT);
-}
-
-static struct crypto_alg des_alg = {
-	.cra_name		=	"des",
-	.cra_driver_name	=	"des-ubicom32",
-	.cra_priority		=	CRYPTO_UBICOM32_PRIORITY,
-	.cra_flags		=	CRYPTO_ALG_TYPE_CIPHER,
-	.cra_blocksize		=	DES_BLOCK_SIZE,
-	.cra_ctxsize		=	sizeof(struct ubicom32_des_ctx),
-	.cra_alignmask		=	CRYPTO_UBICOM32_ALIGNMENT - 1,
-	.cra_alignmask		=	CRYPTO_UBICOM32_ALIGNMENT - 1,
-	.cra_module		=	THIS_MODULE,
-	.cra_list		=	LIST_HEAD_INIT(des_alg.cra_list),
-	.cra_u			= {
-		.cipher = {
-			.cia_min_keysize	=	DES_KEY_SIZE,
-			.cia_max_keysize	=	DES_KEY_SIZE,
-			.cia_setkey		=	des_setkey,
-			.cia_encrypt		=	des_encrypt,
-			.cia_decrypt		=	des_decrypt,
-		}
-	}
-};
-
-static void ecb_des_ciper_loop(u8 *out, u8 *in, unsigned int n)
-{
-	while (likely(n)) {
-		des_hw_cipher(out, in);
-		out += DES_BLOCK_SIZE;
-		in += DES_BLOCK_SIZE;
-		n -= DES_BLOCK_SIZE;
-	}
-}
-
-static void ecb_des3_ede_encrypt_loop(u8 *keys, u8 *out, u8 *in, unsigned int n)
-{
-	while (likely(n)) {
-		des3_hw_ede_encrypt(keys, out, in);
-
-		out += DES_BLOCK_SIZE;
-		in += DES_BLOCK_SIZE;
-		n -= DES_BLOCK_SIZE;
-	}
-}
-
-static void ecb_des3_ede_decrypt_loop(u8 *keys, u8 *out, u8 *in, unsigned int n)
-{
-	while (likely(n)) {
-		des3_hw_ede_decrypt(keys, out, in);
-
-		out += DES_BLOCK_SIZE;
-		in += DES_BLOCK_SIZE;
-		n -= DES_BLOCK_SIZE;
-	}
-}
-
-#ifdef DES3_EEE
-static void ecb_des3_eee_encrypt_loop(u8 *keys, u8 *out, u8 *in, unsigned int n)
-{
-	while (likely(n)) {
-		des3_hw_eee_encrypt(keys, out, in);
-
-		out += DES_BLOCK_SIZE;
-		in += DES_BLOCK_SIZE;
-		n -= DES_BLOCK_SIZE;
-	}
-}
-
-static void ecb_des3_eee_decrypt_loop(u8 *keys, u8 *out, u8 *in, unsigned int n)
-{
-	while (likely(n)) {
-		des3_hw_eee_decrypt(keys, out, in);
-
-		out += DES_BLOCK_SIZE;
-		in += DES_BLOCK_SIZE;
-		n -= DES_BLOCK_SIZE;
-	}
-}
-#endif
-
-static inline void ecb_des_cipher_n(struct ubicom32_des_ctx *uctx, enum des_ops op, u8 *out, u8 *in, unsigned int n)
-{
-	switch (op) {
-	case DES_ENCRYPT:
-	case DES_DECRYPT:
-		/* set the right algo, direction and key once */
-		hw_crypto_set_ctrl(SEC_ALG_DES | (op == DES_ENCRYPT ? SEC_DIR_ENCRYPT : 0));
-		des_hw_set_key(uctx->key, uctx->key_len);
-		ecb_des_ciper_loop(out, in, n);
-		break;
-
-	case DES3_EDE_ENCRYPT:
-		ecb_des3_ede_encrypt_loop(uctx->key, out, in, n);
-		break;
-
-	case DES3_EDE_DECRYPT:
-		ecb_des3_ede_decrypt_loop(uctx->key, out, in, n);
-		break;
-
-#ifdef DES3_EEE
-	case DES3_EEE_ENCRYPT:
-		ecb_des3_eee_encrypt_loop(uctx->key, out, in, n);
-		break;
-
-	case DES3_EEE_DECRYPT:
-		ecb_des3_eee_decrypt_loop(uctx->key, out, in, n);
-		break;
-#endif
-	}
-}
-
-static inline void des_xor_2w(u32 *data, u32 *iv)
-{
-	data[0] ^= iv[0];
-	data[1] ^= iv[1];
-}
-
-static void cbc_des_encrypt_loop(u8 *out, u8 *in, u8 *iv, unsigned int n)
-{
-	while (likely(n)) {
-		des_xor_2w((u32 *)in, (u32 *)iv);
-		des_hw_cipher(out, in);
-		SEC_COPY_2W(iv, out);
-		out += DES_BLOCK_SIZE;
-		in += DES_BLOCK_SIZE;
-		n -= DES_BLOCK_SIZE;
-	}
-}
-
-static void cbc_des_decrypt_loop(u8 *out, u8 *in, u8 *iv, unsigned int n)
-{
-	u8 next_iv[DES_BLOCK_SIZE];
-	while (likely(n)) {
-		SEC_COPY_2W(next_iv, in);
-		des_hw_cipher(out, in);
-		des_xor_2w((u32 *)out, (u32 *)iv);
-		SEC_COPY_2W(iv, next_iv);
-
-		out += DES_BLOCK_SIZE;
-		in += DES_BLOCK_SIZE;
-		n -= DES_BLOCK_SIZE;
-	}
-}
-
-static void cbc_des3_ede_encrypt_loop(u8 *keys, u8 *out, u8 *in, u8 *iv, unsigned int n)
-{
-	while (likely(n)) {
-		des_xor_2w((u32 *)in, (u32 *)iv);
-		des3_hw_ede_encrypt(keys, out, in);
-		SEC_COPY_2W(iv, out);
-
-		out += DES_BLOCK_SIZE;
-		in += DES_BLOCK_SIZE;
-		n -= DES_BLOCK_SIZE;
-	}
-}
-
-static void cbc_des3_ede_decrypt_loop(u8 *keys, u8 *out, u8 *in, u8 *iv, unsigned int n)
-{
-	u8 next_iv[DES_BLOCK_SIZE];
-	while (likely(n)) {
-		SEC_COPY_2W(next_iv, in);
-		des3_hw_ede_decrypt(keys, out, in);
-		des_xor_2w((u32 *)out, (u32 *)iv);
-		SEC_COPY_2W(iv, next_iv);
-
-		out += DES_BLOCK_SIZE;
-		in += DES_BLOCK_SIZE;
-		n -= DES_BLOCK_SIZE;
-	}
-}
-
-#ifdef DES3_EEE
-static void cbc_des3_eee_encrypt_loop(u8 *keys, u8 *out, u8 *in, u8 *iv, unsigned int n)
-{
-	while (likely(n)) {
-		des_xor_2w((u32 *)in, (u32 *)iv);
-		des3_hw_eee_encrypt(keys, out, in);
-		SEC_COPY_2W(iv, out);
-
-		out += DES_BLOCK_SIZE;
-		in += DES_BLOCK_SIZE;
-		n -= DES_BLOCK_SIZE;
-	}
-}
-
-static void cbc_des3_eee_decrypt_loop(u8 *keys, u8 *out, u8 *in, u8 *iv, unsigned int n)
-{
-	u8 next_iv[DES_BLOCK_SIZE];
-	while (likely(n)) {
-		SEC_COPY_2W(next_iv, in);
-		des3_hw_eee_decrypt(keys, out, in);
-		des_xor_2w((u32 *)out, (u32 *)iv);
-		SEC_COPY_2W(iv, next_iv);
-
-		out += DES_BLOCK_SIZE;
-		in += DES_BLOCK_SIZE;
-		n -= DES_BLOCK_SIZE;
-	}
-}
-#endif
-
-static inline void cbc_des_cipher_n(struct ubicom32_des_ctx *uctx, enum des_ops op, u8 *out, u8 *in, u8 *iv, unsigned int n)
-{
-	switch (op) {
-	case DES_ENCRYPT:
-		hw_crypto_set_ctrl(SEC_ALG_DES | SEC_DIR_ENCRYPT);
-		des_hw_set_key(uctx->key, uctx->key_len);
-		cbc_des_encrypt_loop(out, in, iv, n);
-		break;
-
-	case DES_DECRYPT:
-		/* set the right algo, direction and key once */
-		hw_crypto_set_ctrl(SEC_ALG_DES | SEC_DIR_DECRYPT);
-		des_hw_set_key(uctx->key, uctx->key_len);
-		cbc_des_decrypt_loop(out, in, iv, n);
-		break;
-
-	case DES3_EDE_ENCRYPT:
-		cbc_des3_ede_encrypt_loop(uctx->key, out, in, iv, n);
-		break;
-
-	case DES3_EDE_DECRYPT:
-		cbc_des3_ede_decrypt_loop(uctx->key, out, in, iv, n);
-		break;
-
-#ifdef DES3_EEE
-	case DES3_EEE_ENCRYPT:
-		cbc_des3_eee_encrypt_loop(uctx->key, out, in, iv, n);
-		break;
-
-	case DES3_EEE_DECRYPT:
-		cbc_des3_eee_decrypt_loop(uctx->key, out, in, iv, n);
-		break;
-#endif
-	}
-}
-
-static int des_cipher(struct blkcipher_desc *desc, struct scatterlist *dst,
-		      struct scatterlist *src, unsigned int nbytes, u32 extra_flags, enum des_ops op)
-{
-	struct ubicom32_des_ctx *uctx = crypto_blkcipher_ctx(desc->tfm);
-	int ret;
-
-	struct blkcipher_walk walk;
-	blkcipher_walk_init(&walk, dst, src, nbytes);
-	ret = blkcipher_walk_virt(desc, &walk);
-	if (ret) {
-		return ret;
-	}
-
-	hw_crypto_lock();
-	hw_crypto_check();
-
-	while ((nbytes = walk.nbytes)) {
-		/* only use complete blocks */
-		unsigned int n = nbytes & ~(DES_BLOCK_SIZE - 1);
-		u8 *out = walk.dst.virt.addr;
-		u8 *in = walk.src.virt.addr;
-
-		/* finish n/16 blocks */
-		if (extra_flags & SEC_CBC_SET) {
-			cbc_des_cipher_n(uctx, op, out, in, walk.iv, n);
-		} else {
-			ecb_des_cipher_n(uctx, op, out, in, n);
-		}
-
-		nbytes &= DES_BLOCK_SIZE - 1;
-		ret = blkcipher_walk_done(desc, &walk, nbytes);
-	}
-
-	hw_crypto_unlock();
-	return ret;
-}
-
-static int ecb_des_encrypt(struct blkcipher_desc *desc,
-			   struct scatterlist *dst, struct scatterlist *src,
-			   unsigned int nbytes)
-{
-	return des_cipher(desc, dst, src, nbytes, SEC_CBC_NONE, DES_ENCRYPT);
-}
-
-static int ecb_des_decrypt(struct blkcipher_desc *desc,
-			   struct scatterlist *dst, struct scatterlist *src,
-			   unsigned int nbytes)
-{
-	return des_cipher(desc, dst, src, nbytes, SEC_CBC_NONE, DES_DECRYPT);
-}
-
-static struct crypto_alg ecb_des_alg = {
-	.cra_name		=	"ecb(des)",
-	.cra_driver_name	=	"ecb-des-ubicom32",
-	.cra_priority		=	CRYPTO_UBICOM32_COMPOSITE_PRIORITY,
-	.cra_flags		=	CRYPTO_ALG_TYPE_BLKCIPHER,
-	.cra_blocksize		=	DES_BLOCK_SIZE,
-	.cra_ctxsize		=	sizeof(struct ubicom32_des_ctx),
-	.cra_alignmask		=	CRYPTO_UBICOM32_ALIGNMENT - 1,
-	.cra_type		=	&crypto_blkcipher_type,
-	.cra_module		=	THIS_MODULE,
-	.cra_list		=	LIST_HEAD_INIT(ecb_des_alg.cra_list),
-	.cra_u			= {
-		.blkcipher = {
-			.min_keysize		=	DES_KEY_SIZE,
-			.max_keysize		=	DES_KEY_SIZE,
-			.setkey			=	des_setkey,
-			.encrypt		=	ecb_des_encrypt,
-			.decrypt		=	ecb_des_decrypt,
-		}
-	}
-};
-
-static int cbc_des_encrypt(struct blkcipher_desc *desc,
-			   struct scatterlist *dst, struct scatterlist *src,
-			   unsigned int nbytes)
-{
-	return des_cipher(desc, dst, src, nbytes, SEC_CBC_SET, DES_ENCRYPT);
-}
-
-static int cbc_des_decrypt(struct blkcipher_desc *desc,
-			   struct scatterlist *dst, struct scatterlist *src,
-			   unsigned int nbytes)
-{
-	return des_cipher(desc, dst, src, nbytes, SEC_CBC_SET, DES_DECRYPT);
-}
-
-static struct crypto_alg cbc_des_alg = {
-	.cra_name		=	"cbc(des)",
-	.cra_driver_name	=	"cbc-des-ubicom32",
-	.cra_priority		=	CRYPTO_UBICOM32_COMPOSITE_PRIORITY,
-	.cra_flags		=	CRYPTO_ALG_TYPE_BLKCIPHER,
-	.cra_blocksize		=	DES_BLOCK_SIZE,
-	.cra_ctxsize		=	sizeof(struct ubicom32_des_ctx),
-	.cra_alignmask		=	CRYPTO_UBICOM32_ALIGNMENT - 1,
-	.cra_type		=	&crypto_blkcipher_type,
-	.cra_module		=	THIS_MODULE,
-	.cra_list		=	LIST_HEAD_INIT(cbc_des_alg.cra_list),
-	.cra_u			= {
-		.blkcipher = {
-			.min_keysize		=	DES_KEY_SIZE,
-			.max_keysize		=	DES_KEY_SIZE,
-			.ivsize			=	DES_BLOCK_SIZE,
-			.setkey			=	des_setkey,
-			.encrypt		=	cbc_des_encrypt,
-			.decrypt		=	cbc_des_decrypt,
-		}
-	}
-};
-
-/*
- * RFC2451:
- *
- *   For DES-EDE3, there is no known need to reject weak or
- *   complementation keys.  Any weakness is obviated by the use of
- *   multiple keys.
- *
- *   However, if the first two or last two independent 64-bit keys are
- *   equal (k1 == k2 or k2 == k3), then the DES3 operation is simply the
- *   same as DES.  Implementers MUST reject keys that exhibit this
- *   property.
- *
- */
-static int des3_192_setkey(struct crypto_tfm *tfm, const u8 *key,
-			   unsigned int keylen)
-{
-	int i, ret;
-	struct ubicom32_des_ctx *dctx = crypto_tfm_ctx(tfm);
-	const u8 *temp_key = key;
-	u32 *flags = &tfm->crt_flags;
-
-	if (!(memcmp(key, &key[DES_KEY_SIZE], DES_KEY_SIZE) &&
-	    memcmp(&key[DES_KEY_SIZE], &key[DES_KEY_SIZE * 2],
-		   DES_KEY_SIZE))) {
-
-		*flags |= CRYPTO_TFM_RES_BAD_KEY_SCHED;
-		return -EINVAL;
-	}
-	for (i = 0; i < 3; i++, temp_key += DES_KEY_SIZE) {
-		ret = crypto_des_check_key(temp_key, DES_KEY_SIZE, flags);
-		if (ret < 0)
-			return ret;
-	}
-	memcpy(dctx->key, key, keylen);
-	dctx->ctrl = SEC_ALG_DES;	//hw 3DES not working yet
-	dctx->key_len = keylen;
-	return 0;
-}
-
-static void des3_192_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
-{
-	struct ubicom32_des_ctx *uctx = crypto_tfm_ctx(tfm);
-
-	hw_crypto_lock();
-	hw_crypto_check();
-
-	des3_hw_ede_encrypt(uctx->key, dst, src);
-
-	hw_crypto_unlock();
-}
-
-static void des3_192_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
-{
-	struct ubicom32_des_ctx *uctx = crypto_tfm_ctx(tfm);
-
-	hw_crypto_lock();
-	hw_crypto_check();
-
-	des3_hw_ede_decrypt(uctx->key, dst, src);
-
-	hw_crypto_unlock();
-}
-
-static struct crypto_alg des3_192_alg = {
-	.cra_name		=	"des3_ede",
-	.cra_driver_name	=	"des3_ede-ubicom32",
-	.cra_priority		=	CRYPTO_UBICOM32_PRIORITY,
-	.cra_flags		=	CRYPTO_ALG_TYPE_CIPHER,
-	.cra_blocksize		=	DES3_192_BLOCK_SIZE,
-	.cra_ctxsize		=	sizeof(struct ubicom32_des_ctx),
-	.cra_alignmask		=	CRYPTO_UBICOM32_ALIGNMENT - 1,
-	.cra_module		=	THIS_MODULE,
-	.cra_list		=	LIST_HEAD_INIT(des3_192_alg.cra_list),
-	.cra_u			= {
-		.cipher = {
-			.cia_min_keysize	=	DES3_192_KEY_SIZE,
-			.cia_max_keysize	=	DES3_192_KEY_SIZE,
-			.cia_setkey		=	des3_192_setkey,
-			.cia_encrypt		=	des3_192_encrypt,
-			.cia_decrypt		=	des3_192_decrypt,
-		}
-	}
-};
-
-static int ecb_des3_192_encrypt(struct blkcipher_desc *desc,
-				struct scatterlist *dst,
-				struct scatterlist *src, unsigned int nbytes)
-{
-	return des_cipher(desc, dst, src, nbytes, SEC_CBC_NONE, DES3_EDE_ENCRYPT);
-}
-
-static int ecb_des3_192_decrypt(struct blkcipher_desc *desc,
-				struct scatterlist *dst,
-				struct scatterlist *src, unsigned int nbytes)
-{
-	return des_cipher(desc, dst, src, nbytes, SEC_CBC_NONE, DES3_EDE_DECRYPT);
-}
-
-static struct crypto_alg ecb_des3_192_alg = {
-	.cra_name		=	"ecb(des3_ede)",
-	.cra_driver_name	=	"ecb-des3_ede-ubicom32",
-	.cra_priority		=	CRYPTO_UBICOM32_COMPOSITE_PRIORITY,
-	.cra_flags		=	CRYPTO_ALG_TYPE_BLKCIPHER,
-	.cra_blocksize		=	DES3_192_BLOCK_SIZE,
-	.cra_ctxsize		=	sizeof(struct ubicom32_des_ctx),
-	.cra_alignmask		=	CRYPTO_UBICOM32_ALIGNMENT - 1,
-	.cra_type		=	&crypto_blkcipher_type,
-	.cra_module		=	THIS_MODULE,
-	.cra_list		=	LIST_HEAD_INIT(
-						ecb_des3_192_alg.cra_list),
-	.cra_u			= {
-		.blkcipher = {
-			.min_keysize		=	DES3_192_KEY_SIZE,
-			.max_keysize		=	DES3_192_KEY_SIZE,
-			.setkey			=	des3_192_setkey,
-			.encrypt		=	ecb_des3_192_encrypt,
-			.decrypt		=	ecb_des3_192_decrypt,
-		}
-	}
-};
-
-static int cbc_des3_192_encrypt(struct blkcipher_desc *desc,
-				struct scatterlist *dst,
-				struct scatterlist *src, unsigned int nbytes)
-{
-	return des_cipher(desc, dst, src, nbytes, SEC_CBC_SET, DES3_EDE_ENCRYPT);
-}
-
-static int cbc_des3_192_decrypt(struct blkcipher_desc *desc,
-				struct scatterlist *dst,
-				struct scatterlist *src, unsigned int nbytes)
-{
-	return des_cipher(desc, dst, src, nbytes, SEC_CBC_SET, DES3_EDE_DECRYPT);
-}
-
-static struct crypto_alg cbc_des3_192_alg = {
-	.cra_name		=	"cbc(des3_ede)",
-	.cra_driver_name	=	"cbc-des3_ede-ubicom32",
-	.cra_priority		=	CRYPTO_UBICOM32_COMPOSITE_PRIORITY,
-	.cra_flags		=	CRYPTO_ALG_TYPE_BLKCIPHER,
-	.cra_blocksize		=	DES3_192_BLOCK_SIZE,
-	.cra_ctxsize		=	sizeof(struct ubicom32_des_ctx),
-	.cra_alignmask		=	CRYPTO_UBICOM32_ALIGNMENT - 1,
-	.cra_type		=	&crypto_blkcipher_type,
-	.cra_module		=	THIS_MODULE,
-	.cra_list		=	LIST_HEAD_INIT(
-						cbc_des3_192_alg.cra_list),
-	.cra_u			= {
-		.blkcipher = {
-			.min_keysize		=	DES3_192_KEY_SIZE,
-			.max_keysize		=	DES3_192_KEY_SIZE,
-			.ivsize			=	DES3_192_BLOCK_SIZE,
-			.setkey			=	des3_192_setkey,
-			.encrypt		=	cbc_des3_192_encrypt,
-			.decrypt		=	cbc_des3_192_decrypt,
-		}
-	}
-};
-
-static int init(void)
-{
-	int ret = 0;
-
-	hw_crypto_init();
-
-	ret = crypto_register_alg(&des_alg);
-	if (ret)
-		goto des_err;
-	ret = crypto_register_alg(&ecb_des_alg);
-	if (ret)
-		goto ecb_des_err;
-	ret = crypto_register_alg(&cbc_des_alg);
-	if (ret)
-		goto cbc_des_err;
-
-	ret = crypto_register_alg(&des3_192_alg);
-	if (ret)
-		goto des3_192_err;
-	ret = crypto_register_alg(&ecb_des3_192_alg);
-	if (ret)
-		goto ecb_des3_192_err;
-	ret = crypto_register_alg(&cbc_des3_192_alg);
-	if (ret)
-		goto cbc_des3_192_err;
-
-out:
-	return ret;
-
-cbc_des3_192_err:
-	crypto_unregister_alg(&ecb_des3_192_alg);
-ecb_des3_192_err:
-	crypto_unregister_alg(&des3_192_alg);
-des3_192_err:
-	crypto_unregister_alg(&cbc_des_alg);
-cbc_des_err:
-	crypto_unregister_alg(&ecb_des_alg);
-ecb_des_err:
-	crypto_unregister_alg(&des_alg);
-des_err:
-	goto out;
-}
-
-static void __exit fini(void)
-{
-	crypto_unregister_alg(&cbc_des3_192_alg);
-	crypto_unregister_alg(&ecb_des3_192_alg);
-	crypto_unregister_alg(&des3_192_alg);
-	crypto_unregister_alg(&cbc_des_alg);
-	crypto_unregister_alg(&ecb_des_alg);
-	crypto_unregister_alg(&des_alg);
-}
-
-module_init(init);
-module_exit(fini);
-
-MODULE_ALIAS("des");
-MODULE_ALIAS("des3_ede");
-
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("DES & Triple DES EDE Cipher Algorithms");
diff --git a/target/linux/ubicom32/files/arch/ubicom32/crypto/md5_ubicom32.c b/target/linux/ubicom32/files/arch/ubicom32/crypto/md5_ubicom32.c
deleted file mode 100644
index 1f2b978ea..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/crypto/md5_ubicom32.c
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * arch/ubicom32/crypto/md5_ubicom32.c
- *   Ubicom32 implementation of the MD5 Secure Hash Algorithm
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/crypto.h>
-
-#include "crypto_ubicom32.h"
-
-#define MD5_DIGEST_SIZE	16
-#define MD5_BLOCK_SIZE	64
-#define MD5_HASH_WORDS	4
-
-extern void _md5_ip5k_init_digest(u32_t *digest);
-extern void _md5_ip5k_transform(u32_t *data_input);
-extern void _md5_ip5k_get_digest(u32_t *digest);
-
-struct ubicom32_md5_ctx {
-	u64 count;		/* message length */
-	u32 state[MD5_HASH_WORDS];
-	u8 buf[2 * MD5_BLOCK_SIZE];
-};
-
-static void md5_init(struct crypto_tfm *tfm)
-{
-	struct ubicom32_md5_ctx *mctx = crypto_tfm_ctx(tfm);
-	mctx->state[0] = 0x01234567;
-	mctx->state[1] = 0x89abcdef;
-	mctx->state[2] = 0xfedcba98;
-	mctx->state[3] = 0x76543210;
-
-	mctx->count = 0;
-}
-
-static inline void _md5_process(u32 *digest, const u8 *data)
-{
-	_md5_ip5k_transform((u32 *)data);
-}
-
-static void md5_update(struct crypto_tfm *tfm, const u8 *data,
-			unsigned int len)
-{
-	struct ubicom32_md5_ctx *mctx = crypto_tfm_ctx(tfm);
-	int index, clen;
-
-	/* how much is already in the buffer? */
-	index = mctx->count & 0x3f;
-
-	mctx->count += len;
-
-	if (index + len < MD5_BLOCK_SIZE) {
-		goto store_only;
-	}
-
-	hw_crypto_lock();
-	hw_crypto_check();
-
-	/* init digest set ctrl register too */
-	_md5_ip5k_init_digest(mctx->state);
-
-	if (unlikely(index == 0 && SEC_ALIGNED(data))) {
-fast_process:
-		while (len >= MD5_BLOCK_SIZE) {
-			_md5_process(mctx->state, data);
-			data += MD5_BLOCK_SIZE;
-			len -= MD5_BLOCK_SIZE;
-		}
-		goto store;
-	}
-
-	/* process one stored block */
-	if (index) {
-		clen = MD5_BLOCK_SIZE - index;
-		memcpy(mctx->buf + index, data, clen);
-		_md5_process(mctx->state, mctx->buf);
-		data += clen;
-		len -= clen;
-		index = 0;
-	}
-
-	if (likely(SEC_ALIGNED(data))) {
-		goto fast_process;
-	}
-
-	/* process as many blocks as possible */
-	while (len >= MD5_BLOCK_SIZE) {
-		memcpy(mctx->buf, data, MD5_BLOCK_SIZE);
-		_md5_process(mctx->state, mctx->buf);
-		data += MD5_BLOCK_SIZE;
-		len -= MD5_BLOCK_SIZE;
-	}
-
-store:
-	_md5_ip5k_get_digest(mctx->state);
-	hw_crypto_unlock();
-
-store_only:
-	/* anything left? */
-	if (len)
-		memcpy(mctx->buf + index , data, len);
-}
-
-/* Add padding and return the message digest. */
-static void md5_final(struct crypto_tfm *tfm, u8 *out)
-{
-	struct ubicom32_md5_ctx *mctx = crypto_tfm_ctx(tfm);
-	u32 bits[2];
-	unsigned int index, end;
-
-	/* must perform manual padding */
-	index = mctx->count & 0x3f;
-	end =  (index < 56) ? MD5_BLOCK_SIZE : (2 * MD5_BLOCK_SIZE);
-
-	/* start pad with 1 */
-	mctx->buf[index] = 0x80;
-
-	/* pad with zeros */
-	index++;
-	memset(mctx->buf + index, 0x00, end - index - 8);
-
-	/* append message length */
-	bits[0] = mctx->count << 3;
-	bits[1] = mctx->count >> 29;
-	__cpu_to_le32s(bits);
-	__cpu_to_le32s(bits + 1);
-
-	memcpy(mctx->buf + end - 8, &bits, sizeof(bits));
-
-	/* force to use the mctx->buf and ignore the partial buf */
-	mctx->count = mctx->count & ~0x3f;
-	md5_update(tfm, mctx->buf, end);
-
-	/* copy digest to out */
-	memcpy(out, mctx->state, MD5_DIGEST_SIZE);
-
-	/* wipe context */
-	memset(mctx, 0, sizeof *mctx);
-}
-
-static struct crypto_alg alg = {
-	.cra_name	=	"md5",
-	.cra_driver_name=	"md5-ubicom32",
-	.cra_priority	=	CRYPTO_UBICOM32_PRIORITY,
-	.cra_flags	=	CRYPTO_ALG_TYPE_DIGEST,
-	.cra_blocksize	=	MD5_BLOCK_SIZE,
-	.cra_ctxsize	=	sizeof(struct ubicom32_md5_ctx),
-	.cra_module	=	THIS_MODULE,
-	.cra_list	=	LIST_HEAD_INIT(alg.cra_list),
-	.cra_u = {
-		.digest = {
-			.dia_digestsize =       MD5_DIGEST_SIZE,
-			.dia_init       =       md5_init,
-			.dia_update     =       md5_update,
-			.dia_final      =       md5_final,
-		}
-	}
-};
-
-static int __init init(void)
-{
-	hw_crypto_init();
-	return crypto_register_alg(&alg);
-}
-
-static void __exit fini(void)
-{
-	crypto_unregister_alg(&alg);
-}
-
-module_init(init);
-module_exit(fini);
-
-MODULE_ALIAS("md5");
-
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("MD5 Secure Hash Algorithm");
diff --git a/target/linux/ubicom32/files/arch/ubicom32/crypto/md5_ubicom32_asm.S b/target/linux/ubicom32/files/arch/ubicom32/crypto/md5_ubicom32_asm.S
deleted file mode 100644
index 963a3579a..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/crypto/md5_ubicom32_asm.S
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * arch/ubicom32/crypto/md5_ubicom32_asm.S
- *	MD5 (Message Digest 5) support for Ubicom32 v3 architecture
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#define __ASM__
-#include <asm/ip5000.h>
-
-#ifndef RP
-#define RP A5
-#endif
-
-;*****************************************************************************************
-; The function prototypes
-;*****************************************************************************************
-; void md5_ip5k_init(void)
-; void md5_ip5k_transform(u32_t *data_input)
-; void md5_get_digest(u32_t *digest)
-
-;*****************************************************************************************
-; Inputs
-;*****************************************************************************************;
-; data_input is the pointer to the block of data over which the digest will be calculated.
-;	It should be word aligned.
-;
-; digest is the pointer to the block of data into which the digest (the output) will be written.
-;	It should be word aligned.
-;
-
-;*****************************************************************************************
-; Outputs
-;*****************************************************************************************
-; None
-
-;*****************************************************************************************
-; An: Address Registers
-;*****************************************************************************************
-#define an_digest A3
-#define an_data_input A3
-#define an_security_block A4
-
-;*****************************************************************************************
-; Hash Constants
-;*****************************************************************************************
-#define HASH_MD5_IN0 0x01234567
-#define HASH_MD5_IN1 0x89abcdef
-#define HASH_MD5_IN2 0xfedcba98
-#define HASH_MD5_IN3 0x76543210
-
-#define HASH_SECURITY_BLOCK_CONTROL_INIT_NO_ENCYPTION 2
-#define HASH_SECURITY_BLOCK_CONTROL_INIT_MD5 ((1 << 4) | HASH_SECURITY_BLOCK_CONTROL_INIT_NO_ENCYPTION)
-
-;*****************************************************************************************
-; Hash related defines
-;*****************************************************************************************
-#define hash_control 0x00(an_security_block)
-#define hash_control_low 0x02(an_security_block)
-#define hash_status 0x04(an_security_block)
-
-#define hash_input_0 0x30(an_security_block)
-#define hash_input_1 0x34(an_security_block)
-#define hash_input_2 0x38(an_security_block)
-#define hash_input_3 0x3c(an_security_block)
-#define hash_input_4 0x40(an_security_block)
-
-#define hash_output_0 0x70(an_security_block)
-#define hash_output_0_low 0x72(an_security_block)
-#define hash_output_1 0x74(an_security_block)
-#define hash_output_1_low 0x76(an_security_block)
-#define hash_output_2 0x78(an_security_block)
-#define hash_output_2_low 0x7a(an_security_block)
-#define hash_output_3 0x7c(an_security_block)
-#define hash_output_3_low 0x7e(an_security_block)
-
-;*****************************************************************************************
-; Assembly macros
-;*****************************************************************************************
-	; C compiler reserves RP (A5) for return address during subroutine call.
-	; Use RP to return to caller
-.macro	call_return_macro
-	calli	RP, 0(RP)
-.endm
-
-#if 0
-;*****************************************************************************************
-;	void md5_ip5k_init(void)
-;		initialize the output registers of the hash module
-;
-	;.section .text.md5_ip5k_init,"ax",@progbits
-	.section .text
-	.global	_md5_ip5k_init
-	.func md5_ip5k_init, _md5_ip5k_init
-
-_md5_ip5k_init:
-	moveai an_security_block, #SECURITY_BASE_EFFECTIVE_ADDRESS
-
-	movei hash_control, #%hi(HASH_SECURITY_BLOCK_CONTROL_INIT_MD5)
-	movei hash_control_low, #%lo(HASH_SECURITY_BLOCK_CONTROL_INIT_MD5)
-
-	movei hash_output_0, #%hi(HASH_MD5_IN0)
-	movei hash_output_0_low, #%lo(HASH_MD5_IN0)
-
-	movei hash_output_1, #%hi(HASH_MD5_IN1)
-	movei hash_output_1_low, #%lo(HASH_MD5_IN1)
-
-	movei hash_output_2, #%hi(HASH_MD5_IN2)
-	movei hash_output_2_low, #%lo(HASH_MD5_IN2)
-
-	movei hash_output_3, #%hi(HASH_MD5_IN3)
-	movei hash_output_3_low, #%lo(HASH_MD5_IN3)
-
-	call_return_macro
-	.endfunc
-#endif
-
-;*****************************************************************************************
-;	void md5_ip5k_init_digest(u32_t *hash_input)
-;		initialize the output registers of the hash module
-
-	;.section .text.md5_ip5k_init_digest,"ax",@progbits
-	.section .text
-	.global	_md5_ip5k_init_digest
-	.func md5_ip5k_init_digest, _md5_ip5k_init_digest
-
-_md5_ip5k_init_digest:
-	movea an_data_input, D0
-
-	moveai an_security_block, #SECURITY_BASE_EFFECTIVE_ADDRESS
-
-	movei hash_control, #%hi(HASH_SECURITY_BLOCK_CONTROL_INIT_MD5)
-	movei hash_control_low, #%lo(HASH_SECURITY_BLOCK_CONTROL_INIT_MD5)
-
-	move.4 hash_output_0, (an_data_input)4++
-	move.4 hash_output_1, (an_data_input)4++
-	move.4 hash_output_2, (an_data_input)4++
-	move.4 hash_output_3, (an_data_input)4++
-
-	call_return_macro
-	.endfunc
-
-;*****************************************************************************************
-;	void md5_ip5k_transform(u32_t *data_input)
-;		performs intermediate transformation step for the hash calculation
-;
-	;.sect .text.md5_ip5k_transform,"ax",@progbits
-	.section .text
-	.global	_md5_ip5k_transform
-	.func md5_ip5k_transform, _md5_ip5k_transform
-
-_md5_ip5k_transform:
-	movea an_data_input, D0
-
-	moveai an_security_block, #SECURITY_BASE_EFFECTIVE_ADDRESS
-
-	; Write the first 128bits (16 bytes)
-	move.4 hash_input_0, (an_data_input)4++
-	move.4 hash_input_1, (an_data_input)4++
-	move.4 hash_input_2, (an_data_input)4++
-	move.4 hash_input_3, (an_data_input)4++
-	move.4 hash_input_4, D0
-
-	move.4 hash_input_0, (an_data_input)4++
-	move.4 hash_input_1, (an_data_input)4++
-	move.4 hash_input_2, (an_data_input)4++
-	move.4 hash_input_3, (an_data_input)4++
-	move.4 hash_input_4, D0
-
-	move.4 hash_input_0, (an_data_input)4++
-	move.4 hash_input_1, (an_data_input)4++
-	move.4 hash_input_2, (an_data_input)4++
-	move.4 hash_input_3, (an_data_input)4++
-	move.4 hash_input_4, D0
-
-	move.4 hash_input_0, (an_data_input)4++
-	move.4 hash_input_1, (an_data_input)4++
-	move.4 hash_input_2, (an_data_input)4++
-	move.4 hash_input_3, (an_data_input)4++
-	move.4 hash_input_4, D0
-
-	pipe_flush 0
-
-md5_ip5k_transform_wait:
-	; wait for the module to calculate the output hash
-	btst hash_status, #0
-	jmpne.f md5_ip5k_transform_wait
-
-	call_return_macro
-	.endfunc
-
-;*****************************************************************************************
-;	void md5_ip5k_get_digest(u32_t *digest)
-;		Return the hash of the input data
-;
-	;.sect .text.md5_get_digest,"ax",@progbits
-	.section .text
-	.global	_md5_ip5k_get_digest
-	.func md5_ip5k_get_digest, _md5_ip5k_get_digest
-
-_md5_ip5k_get_digest:
-	movea an_digest, D0
-
-	moveai an_security_block, #SECURITY_BASE_EFFECTIVE_ADDRESS
-
-	; we have finished
-	move.4 0(an_digest), hash_output_0
-	move.4 4(an_digest), hash_output_1
-	move.4 8(an_digest), hash_output_2
-	move.4 12(an_digest), hash_output_3
-
-	call_return_macro
-	.endfunc
diff --git a/target/linux/ubicom32/files/arch/ubicom32/crypto/sha1_ubicom32.c b/target/linux/ubicom32/files/arch/ubicom32/crypto/sha1_ubicom32.c
deleted file mode 100644
index 2d0c870eb..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/crypto/sha1_ubicom32.c
+++ /dev/null
@@ -1,354 +0,0 @@
-/*
- * arch/ubicom32/crypto/sha1_ubicom32.c
- *   Ubicom32 implementation of the SHA1 Secure Hash Algorithm.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/crypto.h>
-#include <crypto/sha.h>
-#include <asm/linkage.h>
-
-#include "crypto_ubicom32.h"
-#define HASH_SECURITY_BLOCK_CONTROL_INIT_NO_ENCYPTION 2
-#define HASH_SECURITY_BLOCK_CONTROL_INIT_SHA1 ((1 << 5) | HASH_SECURITY_BLOCK_CONTROL_INIT_NO_ENCYPTION)
-
-struct ubicom32_sha1_ctx {
-	u64 count;		/* message length */
-	u32 state[5];
-	u8 buf[2 * SHA1_BLOCK_SIZE];
-};
-
-static inline void sha1_clear_2ws(u8 *buf, int wc)
-{
-	asm volatile (
-	"1:	move.4	(%0)4++, #0		\n\t"
-	"	move.4	(%0)4++, #0		\n\t"
-	"	sub.4	%1, #2, %1		\n\t"
-	"	jmple.f	1b			\n\t"
-		:
-		: "a" (buf), "d" (wc)
-		: "cc"
-	);
-}
-
-/* only wipe out count, state, and 1st half of buf - 9 bytes at most */
-#define sha1_wipe_out(sctx) sha1_clear_2ws((u8 *)sctx, 2 + 5 + 16 - 2)
-
-static inline void sha1_init_digest(u32 *digest)
-{
-	hw_crypto_set_ctrl(HASH_SECURITY_BLOCK_CONTROL_INIT_SHA1);
-	asm volatile (
-	"	; move digests to hash_output regs	\n\t"
-	"	move.4	0x70(%0), 0x0(%1)		\n\t"
-	"	move.4	0x74(%0), 0x4(%1)		\n\t"
-	"	move.4	0x78(%0), 0x8(%1)		\n\t"
-	"	move.4	0x7c(%0), 0xc(%1)		\n\t"
-	"	move.4	0x80(%0), 0x10(%1)		\n\t"
-		:
-		: "a" (SEC_BASE), "a" (digest)
-	);
-}
-
-static inline void sha1_transform_feed(const u8 *in)
-{
-	asm volatile (
-	"	; write the 1st 16 bytes	\n\t"
-	"	move.4	0x30(%0), 0x0(%1)	\n\t"
-	"	move.4	0x34(%0), 0x4(%1)	\n\t"
-	"	move.4	0x38(%0), 0x8(%1)	\n\t"
-	"	move.4	0x3c(%0), 0xc(%1)	\n\t"
-	"	move.4	0x40(%0), %1		\n\t"
-	"	; write the 2nd 16 bytes	\n\t"
-	"	move.4	0x30(%0), 0x10(%1)	\n\t"
-	"	move.4	0x34(%0), 0x14(%1)	\n\t"
-	"	move.4	0x38(%0), 0x18(%1)	\n\t"
-	"	move.4	0x3c(%0), 0x1c(%1)	\n\t"
-	"	move.4	0x40(%0), %1		\n\t"
-	"	; write the 3rd 16 bytes	\n\t"
-	"	move.4	0x30(%0), 0x20(%1)	\n\t"
-	"	move.4	0x34(%0), 0x24(%1)	\n\t"
-	"	move.4	0x38(%0), 0x28(%1)	\n\t"
-	"	move.4	0x3c(%0), 0x2c(%1)	\n\t"
-	"	move.4	0x40(%0), %1		\n\t"
-	"	; write the 4th 16 bytes	\n\t"
-	"	move.4	0x30(%0), 0x30(%1)	\n\t"
-	"	move.4	0x34(%0), 0x34(%1)	\n\t"
-	"	move.4	0x38(%0), 0x38(%1)	\n\t"
-	"	move.4	0x3c(%0), 0x3c(%1)	\n\t"
-	"	move.4	0x40(%0), %1		\n\t"
-	"	pipe_flush 0			\n\t"
-		:
-		: "a"(SEC_BASE), "a"(in)
-	);
-}
-
-static inline void sha1_transform_wait(void)
-{
-	asm volatile (
-	"	btst	0x04(%0), #0		\n\t"
-	"	jmpne.f -4			\n\t"
-		:
-		: "a"(SEC_BASE)
-		: "cc"
-	);
-}
-
-static inline void sha1_output_digest(u32 *digest)
-{
-	asm volatile (
-	"	move.4	0x0(%1), 0x70(%0)		\n\t"
-	"	move.4	0x4(%1), 0x74(%0)		\n\t"
-	"	move.4	0x8(%1), 0x78(%0)		\n\t"
-	"	move.4	0xc(%1), 0x7c(%0)		\n\t"
-	"	move.4	0x10(%1), 0x80(%0)		\n\t"
-		:
-		: "a" (SEC_BASE), "a" (digest)
-	);
-}
-
-static __ocm_text void sha1_init(struct crypto_tfm *tfm)
-{
-	struct ubicom32_sha1_ctx *sctx = crypto_tfm_ctx(tfm);
-
-	sctx->state[0] = SHA1_H0;
-	sctx->state[1] = SHA1_H1;
-	sctx->state[2] = SHA1_H2;
-	sctx->state[3] = SHA1_H3;
-	sctx->state[4] = SHA1_H4;
-	sctx->count = 0;
-}
-
-static void __ocm_text sha1_update(struct crypto_tfm *tfm, const u8 *data,
-			unsigned int len)
-{
-	struct ubicom32_sha1_ctx *sctx = crypto_tfm_ctx(tfm);
-	int index, clen;
-
-	/* how much is already in the buffer? */
-	index = sctx->count & 0x3f;
-
-	sctx->count += len;
-
-	if (index + len < SHA1_BLOCK_SIZE) {
-		goto store_only;
-	}
-
-	hw_crypto_lock();
-	hw_crypto_check();
-
-	/* init digest set ctrl register too */
-	sha1_init_digest(sctx->state);
-
-	if (unlikely(index == 0 && SEC_ALIGNED(data))) {
-fast_process:
-#if CRYPTO_UBICOM32_LOOP_ASM
-		if (likely(len >= SHA1_BLOCK_SIZE)) {
-			register unsigned int cnt = len >> 6; 	// loop = len / 64;
-			sha1_transform_feed(data);
-			data += SHA1_BLOCK_SIZE;
-
-			/* cnt is pre-decremented in the loop */
-			asm volatile (
-			"; while (--loop):  work on 2nd block   \n\t"
-			"1:	add.4	%2, #-1, %2		\n\t"
-			"	jmpeq.f	5f			\n\t"
-			"					\n\t"
-			"	; write the 1st 16 bytes	\n\t"
-			"	move.4	0x30(%1), (%0)4++	\n\t"
-			"	move.4	0x34(%1), (%0)4++	\n\t"
-			"	move.4	0x38(%1), (%0)4++	\n\t"
-			"	move.4	0x3c(%1), (%0)4++	\n\t"
-			"	; can not kick off hw before it \n\t"
-			"	; is done with the prev block   \n\t"
-			"					\n\t"
-			"	btst	0x04(%1), #0		\n\t"
-			"	jmpne.f	-4			\n\t"
-			"					\n\t"
-			"	; tell hw to load 1st 16 bytes  \n\t"
-			"	move.4	0x40(%1), %2		\n\t"
-			"					\n\t"
-			"	; write the 2nd 16 bytes	\n\t"
-			"	move.4	0x30(%1), (%0)4++	\n\t"
-			"	move.4	0x34(%1), (%0)4++	\n\t"
-			"	move.4	0x38(%1), (%0)4++	\n\t"
-			"	move.4	0x3c(%1), (%0)4++	\n\t"
-			"	move.4	0x40(%1), %2		\n\t"
-			"					\n\t"
-			"	; write the 3rd 16 bytes	\n\t"
-			"	move.4	0x30(%1), (%0)4++	\n\t"
-			"	move.4	0x34(%1), (%0)4++	\n\t"
-			"	move.4	0x38(%1), (%0)4++	\n\t"
-			"	move.4	0x3c(%1), (%0)4++	\n\t"
-			"	move.4	0x40(%1), %2		\n\t"
-			"					\n\t"
-			"	; write the 4th 16 bytes	\n\t"
-			"	move.4	0x30(%1), (%0)4++	\n\t"
-			"	move.4	0x34(%1), (%0)4++	\n\t"
-			"	move.4	0x38(%1), (%0)4++	\n\t"
-			"	move.4	0x3c(%1), (%0)4++	\n\t"
-			"	move.4	0x40(%1), %2		\n\t"
-			"					\n\t"
-			"; no need flush, enough insts		\n\t"
-			"; before next hw wait			\n\t"
-			"					\n\t"
-			"; go back to loop			\n\t"
-			"	jmpt 1b				\n\t"
-			"					\n\t"
-			"; wait hw for last block		\n\t"
-			"5:	btst 0x04(%1), #0		\n\t"
-			"	jmpne.f -4			\n\t"
-			"					\n\t"
-				: "+a" (data)
-				: "a"( SEC_BASE), "d" (cnt)
-				: "cc"
-			);
-
-			len = len & (64 - 1);
-		}
-#else
-		while (likely(len >= SHA1_BLOCK_SIZE)) {
-			sha1_transform_feed(data);
-			data += SHA1_BLOCK_SIZE;
-			len -= SHA1_BLOCK_SIZE;
-			sha1_transform_wait();
-		}
-#endif
-		goto store;
-	}
-
-	/* process one stored block */
-	if (index) {
-		clen = SHA1_BLOCK_SIZE - index;
-		memcpy(sctx->buf + index, data, clen);
-		sha1_transform_feed(sctx->buf);
-		data += clen;
-		len -= clen;
-		index = 0;
-		sha1_transform_wait();
-	}
-
-	if (likely(SEC_ALIGNED(data))) {
-		goto fast_process;
-	}
-
-	/* process as many blocks as possible */
-	if (likely(len >= SHA1_BLOCK_SIZE)) {
-		memcpy(sctx->buf, data, SHA1_BLOCK_SIZE);
-		do {
-			sha1_transform_feed(sctx->buf);
-			data += SHA1_BLOCK_SIZE;
-			len -= SHA1_BLOCK_SIZE;
-			if (likely(len >= SHA1_BLOCK_SIZE)) {
-				memcpy(sctx->buf, data, SHA1_BLOCK_SIZE);
-				sha1_transform_wait();
-				continue;
-			}
-			/* it is the last block */
-			sha1_transform_wait();
-			break;
-		} while (1);
-	}
-
-store:
-	sha1_output_digest(sctx->state);
-	hw_crypto_unlock();
-
-store_only:
-	/* anything left? */
-	if (len)
-		memcpy(sctx->buf + index , data, len);
-}
-
-/* Add padding and return the message digest. */
-static void __ocm_text sha1_final(struct crypto_tfm *tfm, u8 *out)
-{
-	struct ubicom32_sha1_ctx *sctx = crypto_tfm_ctx(tfm);
-	u64 bits;
-	unsigned int index, end;
-
-	/* must perform manual padding */
-	index = sctx->count & 0x3f;
-	end =  (index < 56) ? SHA1_BLOCK_SIZE : (2 * SHA1_BLOCK_SIZE);
-
-	/* start pad with 1 */
-	sctx->buf[index] = 0x80;
-
-	/* pad with zeros */
-	index++;
-	memset(sctx->buf + index, 0x00, end - index - 8);
-
-	/* append message length */
-	bits = sctx->count << 3 ;
-	SEC_COPY_2W(sctx->buf + end - 8, &bits);
-
-	/* force to use the sctx->buf and ignore the partial buf */
-	sctx->count = sctx->count & ~0x3f;
-	sha1_update(tfm, sctx->buf, end);
-
-	/* copy digest to out */
-	SEC_COPY_5W(out, sctx->state);
-
-	/* wipe context */
-	sha1_wipe_out(sctx);
-}
-
-static struct crypto_alg alg = {
-	.cra_name	=	"sha1",
-	.cra_driver_name=	"sha1-ubicom32",
-	.cra_priority	=	CRYPTO_UBICOM32_PRIORITY,
-	.cra_flags	=	CRYPTO_ALG_TYPE_DIGEST,
-	.cra_blocksize	=	SHA1_BLOCK_SIZE,
-	.cra_ctxsize	=	sizeof(struct ubicom32_sha1_ctx),
-	.cra_module	=	THIS_MODULE,
-	.cra_list	=	LIST_HEAD_INIT(alg.cra_list),
-	.cra_u	  = {
-		.digest = {
-			.dia_digestsize =       SHA1_DIGEST_SIZE,
-			.dia_init       =       sha1_init,
-			.dia_update     =       sha1_update,
-			.dia_final      =       sha1_final,
-		}
-	}
-};
-
-static int __init init(void)
-{
-	hw_crypto_init();
-	return crypto_register_alg(&alg);
-}
-
-static void __exit fini(void)
-{
-	crypto_unregister_alg(&alg);
-}
-
-module_init(init);
-module_exit(fini);
-
-MODULE_ALIAS("sha1");
-
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm");
diff --git a/target/linux/ubicom32/files/arch/ubicom32/crypto/sha1_ubicom32_asm.S b/target/linux/ubicom32/files/arch/ubicom32/crypto/sha1_ubicom32_asm.S
deleted file mode 100644
index f610b7e9f..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/crypto/sha1_ubicom32_asm.S
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * arch/ubicom32/crypto/sha1_ubicom32_asm.S
- *	SHA1 hash support for Ubicom32 architecture V3.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#define __ASM__
-#include <asm/ip5000.h>
-
-#ifndef RP
-#define RP A5
-#endif
-
-;*****************************************************************************************
-; The function prototype
-;*****************************************************************************************
-; void sha1_ip5k_init(void)
-; void sha1_ip5k_transform(u32_t *data_input)
-; void sha1_ip5k_output(u32_t *digest)
-
-;*****************************************************************************************
-; Inputs
-;*****************************************************************************************
-; data_input is the pointer to the block of data over which the digest will be calculated.
-;	It should be word aligned.
-;
-; digest is the pointer to the block of data into which the digest (the output) will be written.
-;	It should be word aligned.
-;
-
-;*****************************************************************************************
-; Outputs
-;*****************************************************************************************
-; None
-
-;*****************************************************************************************
-; Hash Constants
-;*****************************************************************************************
-#define HASH_SHA1_IN0 0x67452301
-#define HASH_SHA1_IN1 0xefcdab89
-#define HASH_SHA1_IN2 0x98badcfe
-#define HASH_SHA1_IN3 0x10325476
-#define HASH_SHA1_IN4 0xc3d2e1f0
-
-#define HASH_SECURITY_BLOCK_CONTROL_INIT_NO_ENCYPTION 2
-#define HASH_SECURITY_BLOCK_CONTROL_INIT_SHA1 ((1 << 5) | HASH_SECURITY_BLOCK_CONTROL_INIT_NO_ENCYPTION)
-
-;*****************************************************************************************
-; An: Address Registers
-;*****************************************************************************************
-#define an_digest a4
-#define an_data_input a4
-#define an_security_block a3
-
-;*****************************************************************************************
-; Hash related defines
-;*****************************************************************************************
-#define hash_control 0x00(an_security_block)
-#define hash_control_low 0x02(an_security_block)
-#define hash_status 0x04(an_security_block)
-
-#define hash_input_0 0x30(an_security_block)
-#define hash_input_1 0x34(an_security_block)
-#define hash_input_2 0x38(an_security_block)
-#define hash_input_3 0x3c(an_security_block)
-#define hash_input_4 0x40(an_security_block)
-
-#define hash_output_0 0x70(an_security_block)
-#define hash_output_0_low 0x72(an_security_block)
-#define hash_output_1 0x74(an_security_block)
-#define hash_output_1_low 0x76(an_security_block)
-#define hash_output_2 0x78(an_security_block)
-#define hash_output_2_low 0x7a(an_security_block)
-#define hash_output_3 0x7c(an_security_block)
-#define hash_output_3_low 0x7e(an_security_block)
-#define hash_output_4 0x80(an_security_block)
-#define hash_output_4_low 0x82(an_security_block)
-
-;*****************************************************************************************
-; Assembly macros
-;*****************************************************************************************
-	; C compiler reserves RP (A5) for return address during subroutine call.
-	; Use RP to return to caller
-.macro	call_return_macro
-	calli	RP, 0(RP)
-.endm
-
-;*****************************************************************************************
-;	void sha1_ip5k_init(void)
-;		initialize the output registers of the hash module
-
-	;.section .text.sha1_ip5k_init,"ax",@progbits
-	.section .ocm_text,"ax",@progbits
-	.global	_sha1_ip5k_init
-	.func sha1_ip5k_init, _sha1_ip5k_init
-
-_sha1_ip5k_init:
-	moveai an_security_block, #SECURITY_BASE_EFFECTIVE_ADDRESS
-
-	movei hash_control, #%hi(HASH_SECURITY_BLOCK_CONTROL_INIT_SHA1)
-	movei hash_control_low, #%lo(HASH_SECURITY_BLOCK_CONTROL_INIT_SHA1)
-
-	movei hash_output_0, #%hi(HASH_SHA1_IN0)
-	movei hash_output_0_low, #%lo(HASH_SHA1_IN0)
-
-	movei hash_output_1, #%hi(HASH_SHA1_IN1)
-	movei hash_output_1_low, #%lo(HASH_SHA1_IN1)
-
-	movei hash_output_2, #%hi(HASH_SHA1_IN2)
-	movei hash_output_2_low, #%lo(HASH_SHA1_IN2)
-
-	movei hash_output_3, #%hi(HASH_SHA1_IN3)
-	movei hash_output_3_low, #%lo(HASH_SHA1_IN3)
-
-	movei hash_output_4, #%hi(HASH_SHA1_IN4)
-	movei hash_output_4_low, #%lo(HASH_SHA1_IN4)
-
-	call_return_macro
-	.endfunc
-
-;*****************************************************************************************
-;	void sha1_ip5k_init_digest(u32_t *hash_input)
-;		initialize the output registers of the hash module
-
-	;.section .text.sha1_ip5k_init_digest,"ax",@progbits
-	.section .ocm_text,"ax",@progbits
-	.global	_sha1_ip5k_init_digest
-	.func sha1_ip5k_init_digest, _sha1_ip5k_init_digest
-
-_sha1_ip5k_init_digest:
-	movea an_data_input, D0
-
-	moveai an_security_block, #SECURITY_BASE_EFFECTIVE_ADDRESS
-
-	movei hash_control, #%hi(HASH_SECURITY_BLOCK_CONTROL_INIT_SHA1)
-	movei hash_control_low, #%lo(HASH_SECURITY_BLOCK_CONTROL_INIT_SHA1)
-
-	move.4 hash_output_0, (an_data_input)4++
-	move.4 hash_output_1, (an_data_input)4++
-	move.4 hash_output_2, (an_data_input)4++
-	move.4 hash_output_3, (an_data_input)4++
-	move.4 hash_output_4, (an_data_input)4++
-
-	call_return_macro
-	.endfunc
-
-;*****************************************************************************************
-;	void sha1_ip5k_transform(u32_t *data_input)
-;		performs intermediate transformation step for the hash calculation
-
-	;.section .text.sha1_ip5k_transform,"ax",@progbits
-	.section .ocm_text,"ax",@progbits
-	.global	_sha1_ip5k_transform
-	.func sha1_ip5k_transform, _sha1_ip5k_transform
-
-_sha1_ip5k_transform:
-	movea an_data_input, D0
-
-	moveai an_security_block, #SECURITY_BASE_EFFECTIVE_ADDRESS
-
-	; Write the first 128bits (16 bytes)
-	move.4 hash_input_0, (an_data_input)4++
-	move.4 hash_input_1, (an_data_input)4++
-	move.4 hash_input_2, (an_data_input)4++
-	move.4 hash_input_3, (an_data_input)4++
-	move.4 hash_input_4, D0
-
-	move.4 hash_input_0, (an_data_input)4++
-	move.4 hash_input_1, (an_data_input)4++
-	move.4 hash_input_2, (an_data_input)4++
-	move.4 hash_input_3, (an_data_input)4++
-	move.4 hash_input_4, D0
-
-	move.4 hash_input_0, (an_data_input)4++
-	move.4 hash_input_1, (an_data_input)4++
-	move.4 hash_input_2, (an_data_input)4++
-	move.4 hash_input_3, (an_data_input)4++
-	move.4 hash_input_4, D0
-
-	move.4 hash_input_0, (an_data_input)4++
-	move.4 hash_input_1, (an_data_input)4++
-	move.4 hash_input_2, (an_data_input)4++
-	move.4 hash_input_3, (an_data_input)4++
-	move.4 hash_input_4, D0
-
-	pipe_flush 0
-
-sha1_ip5k_transform_wait:
-	; wait for the module to calculate the output hash
-	btst hash_status, #0
-	jmpne.f sha1_ip5k_transform_wait
-
-	call_return_macro
-	.endfunc
-
-;*****************************************************************************************
-;	void sha1_ip5k_output(u32_t *digest)
-;		Return the hash of the input data
-
-	;.section .text.sha1_ip5k_output,"ax",@progbits
-	.section .ocm_text,"ax",@progbits
-	.global	_sha1_ip5k_output
-	.func sha1_ip5k_output, _sha1_ip5k_output
-
-_sha1_ip5k_output:
-	movea an_digest, D0
-
-	moveai an_security_block, #SECURITY_BASE_EFFECTIVE_ADDRESS
-
-	; we have finished
-	move.4 0(an_digest), hash_output_0
-	move.4 4(an_digest), hash_output_1
-	move.4 8(an_digest), hash_output_2
-	move.4 12(an_digest), hash_output_3
-	move.4 16(an_digest), hash_output_4
-
-	call_return_macro
-	.endfunc
-
-;*****************************************************************************************
-;END			;End of program code
-;*****************************************************************************************
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/.gitignore b/target/linux/ubicom32/files/arch/ubicom32/include/asm/.gitignore
deleted file mode 100644
index c6b1010db..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/ocm_size.h
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/Kbuild b/target/linux/ubicom32/files/arch/ubicom32/include/asm/Kbuild
deleted file mode 100644
index c68e1680d..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/Kbuild
+++ /dev/null
@@ -1 +0,0 @@
-include include/asm-generic/Kbuild.asm
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/a.out.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/a.out.h
deleted file mode 100644
index 8eb0ade88..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/a.out.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * arch/ubicom32/include/asm/a.out.h
- *   Definitions for Ubicom32 a.out executable format.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_A_OUT_H
-#define _ASM_UBICOM32_A_OUT_H
-
-struct exec
-{
-  unsigned long a_info;		/* Use macros N_MAGIC, etc for access */
-  unsigned a_text;		/* length of text, in bytes */
-  unsigned a_data;		/* length of data, in bytes */
-  unsigned a_bss;		/* length of uninitialized data area for file, in bytes */
-  unsigned a_syms;		/* length of symbol table data in file, in bytes */
-  unsigned a_entry;		/* start address */
-  unsigned a_trsize;		/* length of relocation info for text, in bytes */
-  unsigned a_drsize;		/* length of relocation info for data, in bytes */
-};
-
-#define N_TRSIZE(a)	((a).a_trsize)
-#define N_DRSIZE(a)	((a).a_drsize)
-#define N_SYMSIZE(a)	((a).a_syms)
-
-#endif /* _ASM_UBICOM32_A_OUT_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/atomic.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/atomic.h
deleted file mode 100644
index aaf772602..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/atomic.h
+++ /dev/null
@@ -1,353 +0,0 @@
-/*
- * arch/ubicom32/include/asm/atomic.h
- *   Atomic operations definitions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_ATOMIC_H
-#define _ASM_UBICOM32_ATOMIC_H
-
-#include <asm/system.h>
-#include <asm/ubicom32-common.h>
-#include <asm/types.h>
-
-/*
- * Most instructions on the Ubicom32 processor are atomic in that they
- * execute in one clock cycle.  However, Linux has several operations
- * (e.g. compare and swap) which will require more than a single instruction
- * to perform.   To achieve this, the Ubicom32 processor uses a single
- * global bit in a scratchpad register as a critical section lock. All
- * atomic operations acquire this lock.
- *
- * NOTE: To AVOID DEADLOCK(s), the atomic lock must only be used for atomic
- * operations or by the ldsr to avoid disabling a thread performing an atomic
- * operation.
- *
- * Do not attempt to disable interrupts while holding the atomic operations
- * lock or you will DEADLOCK the system.
- */
-
-#define ATOMIC_INIT(i)	{ (i) }
-
-/*
- * __atomic_add()
- * 	Add i to v and return the result.
- */
-static inline void __atomic_add(int i, atomic_t *v)
-{
-	atomic_t *vt = v;
-
-	__atomic_lock_acquire();
-	vt->counter += i;
-	__atomic_lock_release();
-}
-
-/*
- * __atomic_sub()
- * 	Subtract i from v and return the result.
- */
-static inline void __atomic_sub(int i, atomic_t *v)
-{
-	atomic_t *vt = v;
-
-	__atomic_lock_acquire();
-	vt->counter -= i;
-	__atomic_lock_release();
-}
-
-/*
- * __atomic_add_return()
- * 	Add i to v and return the result.
- *
- * The implementation here looks rather odd because we appear to be doing
- * the addition twice.  In fact that's exactly what we're doing but with
- * the ubicom32 instruction set we can do the inner load and add with two
- * instructions whereas generating both the atomic result and the "ret"
- * result requires three instructions.  The second add is generally only as
- * costly as a move instruction and in cases where we compare the result
- * with a constant the compiler can fold two constant values and do a
- * single instruction, thus saving an instruction overall!
- *
- * At the worst we save one instruction inside the atomic lock.
- */
-static inline int __atomic_add_return(int i, atomic_t *v)
-{
-	int ret;
-	atomic_t *vt = v;
-
-	__atomic_lock_acquire();
-	ret = vt->counter;
-	vt->counter = ret + i;
-	__atomic_lock_release();
-
-	return ret + i;
-}
-
-/*
- * __atomic_sub_return()
- * 	Subtract i from v and return the result.
- *
- * The implementation here looks rather odd because we appear to be doing
- * the subtraction twice.  In fact that's exactly what we're doing but with
- * the ubicom32 instruction set we can do the inner load and sub with two
- * instructions whereas generating both the atomic result and the "ret"
- * result requires three instructions.  The second sub is generally only as
- * costly as a move instruction and in cases where we compare the result
- * with a constant the compiler can fold two constant values and do a
- * single instruction, thus saving an instruction overall!
- *
- * At the worst we save one instruction inside the atomic lock.
- */
-static inline int __atomic_sub_return(int i, atomic_t *v)
-{
-	int ret;
-	atomic_t *vt = v;
-
-	__atomic_lock_acquire();
-	ret = vt->counter;
-	vt->counter = ret - i;
-	__atomic_lock_release();
-
-	return ret - i;
-}
-
-/*
- * PUBLIC API FOR ATOMIC!
- */
-#define atomic_add(i,v)	(__atomic_add( ((int)i),(v)))
-#define atomic_sub(i,v)	(__atomic_sub( ((int)i),(v)))
-#define atomic_inc(v)	(__atomic_add(   1,(v)))
-#define atomic_dec(v)	(__atomic_sub(   1,(v)))
-#define atomic_add_return(i,v)	(__atomic_add_return( ((int)i),(v)))
-#define atomic_sub_return(i,v)	(__atomic_sub_return( ((int)i),(v)))
-#define atomic_inc_return(v)	(__atomic_add_return(   1,(v)))
-#define atomic_dec_return(v)	(__atomic_sub_return(   1,(v)))
-#define atomic_inc_and_test(v)	(atomic_inc_return(v) == 0)
-#define atomic_dec_and_test(v)	(atomic_dec_return(v) == 0)
-#define atomic_add_negative(a, v)	(atomic_add_return((a), (v)) < 0)
-#define atomic_sub_and_test(i,v)	(atomic_sub_return((i),(v)) == 0)
-
-/*
- * atomic_read()
- * 	Acquire the atomic lock and read the variable.
- */
-static inline int atomic_read(const atomic_t *v)
-{
-	int ret;
-	const atomic_t *vt = v;
-
-	__atomic_lock_acquire();
-	ret = vt->counter;
-	__atomic_lock_release();
-
-	return ret;
-}
-
-/*
- * atomic_set()
- * 	Acquire the atomic lock and set the variable.
- */
-static inline void atomic_set(atomic_t *v, int i)
-{
-	atomic_t *vt = v;
-
-	__atomic_lock_acquire();
-	vt->counter = i;
-	__atomic_lock_release();
-}
-
-/*
- * atomic_cmpxchg
- * 	Acquire the atomic lock and exchange if current == old.
- */
-static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
-{
-	int prev;
-	atomic_t *vt = v;
-
-	__atomic_lock_acquire();
-	prev = vt->counter;
-	if (prev == old) {
-		vt->counter = new;
-	}
-	__atomic_lock_release();
-
-	return prev;
-}
-
-/*
- * atomic_xchg()
- * 	Acquire the atomic lock and exchange values.
- */
-static inline int atomic_xchg(atomic_t *v, int new)
-{
-	int prev;
-	atomic_t *vt = v;
-
-	__atomic_lock_acquire();
-	prev = vt->counter;
-	vt->counter = new;
-	__atomic_lock_release();
-
-	return prev;
-}
-
-/*
- * atomic_add_unless()
- * 	Acquire the atomic lock and add a unless the value is u.
- */
-static inline int atomic_add_unless(atomic_t *v, int a, int u)
-{
-	int prev;
-	atomic_t *vt = v;
-
-	__atomic_lock_acquire();
-	prev = vt->counter;
-	if (prev != u) {
-		vt->counter += a;
-		__atomic_lock_release();
-		return 1;
-	}
-
-	__atomic_lock_release();
-	return 0;
-}
-
-#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
-
-#include <linux/version.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)
-#include <asm-generic/atomic-long.h>
-#else
-#include <asm-generic/atomic.h>
-#endif
-
-/*
- * The following is not a real function.  The compiler should remove the function
- * call as long as the user does not pass in a size that __xchg and __cmpxchg
- * are not prepared for.  If the user does pass in an unknown size, the user
- * will get a link time error.
- *
- * The no return is to prevent a compiler error that can occur when dealing with
- * uninitialized variables. Given that the function doesn't exist there is no
- * net effect (and if it did it would not return).
- */
-extern void __xchg_called_with_bad_pointer(void) __attribute__((noreturn));
-
-/*
- * __xchg()
- *	Xchange *ptr for x atomically.
- *
- * Must be both locally atomic and atomic on SMP. Ubicom32 does not have an
- * atomic exchange instruction so we use the global atomic_lock.
- */
-static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size)
-{
-	unsigned long ret;
-
-	__atomic_lock_acquire();
-
-	switch (size) {
-	case 1:
-		ret = *(volatile unsigned char *)ptr;
-		*(volatile unsigned char *)ptr = x;
-		break;
-
-	case 2:
-		ret = *(volatile unsigned short *)ptr;
-		*(volatile unsigned short *)ptr = x;
-		break;
-
-	case 4:
-		ret = *(volatile unsigned int *)ptr;
-		*(volatile unsigned int *)ptr = x;
-		break;
-
-	default:
-		__xchg_called_with_bad_pointer();
-		break;
-	}
-	__atomic_lock_release();
-	return ret;
-}
-
-#define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
-
-/*
- * __cmpxchg()
- *	Compare and Xchange *ptr for x atomically.
- *
- * Must be both locally atomic and atomic on SMP. Ubicom32 does not have an
- * atomic exchange instruction so we use the global atomic_lock.
- */
-static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old, unsigned long next, int size)
-{
-	unsigned long prev;
-
-	__atomic_lock_acquire();
-	switch (size) {
-	case 1:
-		prev = *(u8 *)ptr;
-		if (prev == old) {
-			*(u8 *)ptr = (u8)next;
-		}
-		break;
-
-	case 2:
-		prev = *(u16 *)ptr;
-		if (prev == old) {
-			*(u16 *)ptr = (u16)next;
-		}
-		break;
-
-	case 4:
-		prev = *(u32 *)ptr;
-		if (prev == old) {
-			*(u32 *)ptr = (u32)next;
-		}
-		break;
-
-	default:
-		__xchg_called_with_bad_pointer();
-		break;
-	}
-	__atomic_lock_release();
-	return prev;
-}
-
-/*
- * cmpxchg_local and cmpxchg64_local are atomic wrt current CPU. Always make
- * them available.
- */
-#define cmpxchg_local(ptr, o, n) \
-	((__typeof__(*(ptr)))__cmpxchg((ptr), (unsigned long)(o), (unsigned long)(n), sizeof(*(ptr))))
-
-#define cmpxchg(ptr, o, n) __cmpxchg((ptr), (o), (n), sizeof(*(ptr)))
-
-#define smp_mb__before_atomic_inc() asm volatile ("" : : : "memory")
-#define smp_mb__after_atomic_inc() asm volatile ("" : : : "memory")
-#define smp_mb__before_atomic_dec() asm volatile ("" : : : "memory")
-#define smp_mb__after_atomic_dec() asm volatile ("" : : : "memory")
-
-#endif /* _ASM_UBICOM32_ATOMIC_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/audio.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/audio.h
deleted file mode 100644
index 974d0cd63..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/audio.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * arch/ubicom32/include/asm/audio.h
- *	Audio include file
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef _AUDIO_H
-#define _AUDIO_H
-
-#include <asm/devtree.h>
-#include <asm/audionode.h>
-
-/*
- * Resource indices used to access IRQs via platform_get_resource
- */
-#define AUDIO_MEM_RESOURCE	0
-#define AUDIO_TX_IRQ_RESOURCE	0
-#define AUDIO_RX_IRQ_RESOURCE	1
-
-extern struct platform_device * __init audio_device_alloc(const char *driver_name, const char *node_name, const char *inst_name, int priv_size);
-
-#define audio_device_priv(pdev) (((struct ubi32pcm_platform_data *)(((struct platform_device *)(pdev))->dev.platform_data))->priv_data)
-#endif
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/audionode.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/audionode.h
deleted file mode 100644
index f18a0e817..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/audionode.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * audionode.h
- *	audionode and DMA descriptors
- *
- * Copyright �© 2009 Ubicom Inc. <www.ubicom.com>.  All rights reserved.
- *
- * This file contains confidential information of Ubicom, Inc. and your use of
- * this file is subject to the Ubicom Software License Agreement distributed with
- * this file. If you are uncertain whether you are an authorized user or to report
- * any unauthorized use, please contact Ubicom, Inc. at +1-408-789-2200.
- * Unauthorized reproduction or distribution of this file is subject to civil and
- * criminal penalties.
- *
- */
-#ifndef _AUDIONODE_H_
-#define _AUDIONODE_H_
-
-#define AUDIO_INT_FLAG_MORE_SAMPLES 0x00000001
-#define AUDIO_INT_FLAG_COMMAND      0x00000002
-
-/*
- * Commands the Primary OS sends to the audio device
- */
-enum audio_command {
-	AUDIO_CMD_NONE,
-	AUDIO_CMD_START,
-	AUDIO_CMD_STOP,
-	AUDIO_CMD_PAUSE,
-	AUDIO_CMD_RESUME,
-	AUDIO_CMD_MUTE,
-	AUDIO_CMD_UNMUTE,
-	AUDIO_CMD_SETUP,
-	AUDIO_CMD_ENABLE,
-	AUDIO_CMD_DISABLE,
-};
-
-/*
- * Flag bits passed in the registers
- */
-#define CMD_START_FLAG_LE		(1 << 0)	/* Use Little Endian Mode */
-
-/*
- * Status bits that audio device can set to indicate reason
- * for interrupting the Primary OS
- */
-#define AUDIO_STATUS_PLAY_DMA0_REQUEST (1 << 0) /* Audio device needs samples in DMA0 for playback */
-#define AUDIO_STATUS_PLAY_DMA1_REQUEST (1 << 1) /* Audio device needs samples in DMA1 for playback */
-
-struct audio_dma {
-	/*
-	 * NOTE: The active flag shall only be SET by the producer and CLEARED
-	 * by the consumer, NEVER the other way around.  For playback, the
-	 * Primary OS sets this flag and ipAudio clears it.
-	 *
-	 * The producer shall not modify the ptr or ctr fields when the transfer
-	 * is marked as active, as these are used by the consumer to do the
-	 * transfer.
-	 */
-	volatile u32_t active; 		/* Nonzero if data in ptr/ctr ready to be transferred */
-	volatile void *ptr;		/* Pointer to data to be transferred */
-	volatile u32_t ctr; 		/* Counter: number of data units to transfer */
-};
-
-#define AUDIONODE_CAP_BE	(1 << 0)
-#define AUDIONODE_CAP_LE	(1 << 1)
-
-#define AUDIONODE_VERSION	7
-struct audio_node {
-	struct devtree_node dn;
-
-	/*
-	 * Version of this node
-	 */
-	u32_t			version;
-
-	/*
-	 * Pointer to the registers
-	 */
-	struct audio_regs	*regs;
-};
-
-/*
- * [OCM] Audio registers
- *	Registers exposed as part of our MMIO area
- */
-#define AUDIO_REGS_VERSION	7
-struct audio_regs {
-	/*
-	 * Version of this register set
-	 */
-	u32_t version;
-
-	/*
-	 * Interrupt status
-	 */
-	volatile u32_t int_status;
-
-	/*
-	 * Interrupt request
-	 */
-	volatile u32_t int_req;
-
-	/*
-	 * Current IRQ being serviced
-	 */
-	u32_t cur_irq;
-
-	/*
-	 * Maximum number of devices supported
-	 */
-	u32_t max_devs;
-
-	/*
-	 * [DDR] Device registers for each of the devices
-	 */
-	struct audio_dev_regs *adr;
-};
-
-#define AUDIO_DEV_REGS_VERSION 2
-struct audio_dev_regs {
-	u32_t version;					/* Version of this register set */
-
-	u8_t name[32];					/* Name of this driver */
-	u32_t caps;					/* Capabilities of this driver */
-	const u32_t *sample_rates;			/* Sample Rates supported by this driver */
-	u32_t n_sample_rates;				/* Number of sample rates supported by this driver */
-	u32_t channel_mask;				/* A bit set in a particular position means we support this channel configuration */
-	volatile u32_t int_flags;			/* Reason for interrupting audio device */
-	volatile enum audio_command command;	/* Command from Primary OS */
-	volatile u32_t flags;				/* Flag bits for this command */
-	volatile u32_t channels;			/* Number of channels */
-	volatile u32_t sample_rate;			/* Sample rate */
-	volatile u32_t status;				/* Status bits sent from ipAudio to Primary OS */
-	void *primary_os_buffer_ptr;			/*
-							 * Playback: Pointer to next sample to be removed from
-							 *           Primary OS sample buffer
-							 * Capture: Pointer to where next sample will be inserted
-							 *          into Primary OS sample buffer
-							 */
-
-	/*
-	 * These are the transfer requests.  They are used in alternating
-	 * order so that when ipAudio is processing one request, the
-	 * Primary OS can fill in the other one.
-	 *
-	 * NOTE: The active bit shall always be SET by the producer and
-	 * CLEARED by the consumer, NEVER the other way around.
-	 */
-	struct audio_dma dma_xfer_requests[2];
-};
-
-#endif
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/auxvec.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/auxvec.h
deleted file mode 100644
index b2275c857..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/auxvec.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * arch/ubicom32/include/asm/auxvec.h
- *   Symbolic values for the entries in the auxiliary table
- *   put on the initial stack.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_AUXVEC_H
-#define _ASM_UBICOM32_AUXVEC_H
-
-#endif /* _ASM_UBICOM32_AUXVEC_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/bitops.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/bitops.h
deleted file mode 100644
index c63837b2e..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/bitops.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * arch/ubicom32/include/asm/bitops.h
- *   Bit manipulation definitions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_BITOPS_H
-#define _ASM_UBICOM32_BITOPS_H
-
-/*
- * Copyright 1992, Linus Torvalds.
- */
-
-#include <linux/compiler.h>
-#include <asm/byteorder.h>	/* swab32 */
-
-#ifdef __KERNEL__
-
-#ifndef _LINUX_BITOPS_H
-#error only <linux/bitops.h> can be included directly
-#endif
-
-#include <asm-generic/bitops/ffs.h>
-#include <asm-generic/bitops/__ffs.h>
-
-#include <asm-generic/bitops/sched.h>
-#include <asm-generic/bitops/ffz.h>
-
-#include <asm/ubicom32-common.h>
-
-static inline void set_bit(int bit, volatile unsigned long *p)
-{
-	unsigned long mask = 1UL << (bit & 31);
-
-	p += bit >> 5;
-
-	__atomic_lock_acquire();
-	*p |= mask;
-	__atomic_lock_release();
-}
-
-static inline void clear_bit(int bit, volatile unsigned long *p)
-{
-	unsigned long mask = 1UL << (bit & 31);
-
-	p += bit >> 5;
-
-	__atomic_lock_acquire();
-	*p &= ~mask;
-	__atomic_lock_release();
-}
-
-/*
- * clear_bit() doesn't provide any barrier for the compiler.
- */
-#define smp_mb__before_clear_bit()	barrier()
-#define smp_mb__after_clear_bit()	barrier()
-
-static inline void change_bit(int bit, volatile unsigned long *p)
-{
-	unsigned long mask = 1UL << (bit & 31);
-
-	p += bit >> 5;
-
-	__atomic_lock_acquire();
-	*p ^= mask;
-	__atomic_lock_release();
-}
-
-static inline int test_and_set_bit(int bit, volatile unsigned long *p)
-{
-	unsigned int res;
-	unsigned long mask = 1UL << (bit & 31);
-
-	p += bit >> 5;
-
-	__atomic_lock_acquire();
-	res = *p;
-	*p = res | mask;
-	__atomic_lock_release();
-
-	return res & mask;
-}
-
-static inline int test_and_clear_bit(int bit, volatile unsigned long *p)
-{
-	unsigned int res;
-	unsigned long mask = 1UL << (bit & 31);
-
-	p += bit >> 5;
-
-	__atomic_lock_acquire();
-	res = *p;
-	*p = res & ~mask;
-	__atomic_lock_release();
-
-	return res & mask;
-}
-
-static inline int test_and_change_bit(int bit, volatile unsigned long *p)
-{
-	unsigned int res;
-	unsigned long mask = 1UL << (bit & 31);
-
-	p += bit >> 5;
-
-	__atomic_lock_acquire();
-	res = *p;
-	*p = res ^ mask;
-	__atomic_lock_release();
-
-	return res & mask;
-}
-
-#include <asm-generic/bitops/non-atomic.h>
-
-/*
- * This routine doesn't need to be atomic.
- */
-static inline int __constant_test_bit(int nr, const volatile unsigned long *addr)
-{
-	return ((1UL << (nr & 31)) & (((const volatile unsigned int *) addr)[nr >> 5])) != 0;
-}
-
-static inline int __test_bit(int nr, const volatile unsigned long *addr)
-{
-	int 	* a = (int *) addr;
-	int	mask;
-
-	a += nr >> 5;
-	mask = 1 << (nr & 0x1f);
-	return ((mask & *a) != 0);
-}
-
-#define test_bit(nr,addr) (__builtin_constant_p(nr) ?  __constant_test_bit((nr),(addr)) :  __test_bit((nr),(addr)))
-
-#include <asm-generic/bitops/find.h>
-#include <asm-generic/bitops/hweight.h>
-#include <asm-generic/bitops/lock.h>
-
-#include <asm-generic/bitops/ext2-non-atomic.h>
-#include <asm-generic/bitops/ext2-atomic.h>
-#include <asm-generic/bitops/minix.h>
-
-#endif /* __KERNEL__ */
-
-#include <asm-generic/bitops/fls.h>
-#include <asm-generic/bitops/__fls.h>
-#include <asm-generic/bitops/fls64.h>
-
-#endif /* _ASM_UBICOM32_BITOPS_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/bitsperlong.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/bitsperlong.h
deleted file mode 100644
index 6dc0bb0c1..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/bitsperlong.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/bitsperlong.h>
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/board.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/board.h
deleted file mode 100644
index 9df4c0f04..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/board.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * arch/ubicom32/include/asm/board.h
- *   Board init and revision definitions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_BOARD_H
-#define _ASM_UBICOM32_BOARD_H
-
-extern const char *board_get_revision(void);
-extern void __init board_init(void);
-
-#endif /* _ASM_UBICOM32_BOARD_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/bootargs.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/bootargs.h
deleted file mode 100644
index 95ec393c6..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/bootargs.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * arch/ubicom32/include/asm/bootargs.h
- *   Kernel command line via the devtree API.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_BOOTARGS_H
-#define _ASM_UBICOM32_BOOTARGS_H
-
-extern const char *bootargs_get_cmdline(void);
-extern void __init bootargs_init(void);
-
-#endif /* _ASM_UBICOM32_BOOTARGS_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/bootinfo.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/bootinfo.h
deleted file mode 100644
index 79653911e..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/bootinfo.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * arch/ubicom32/include/asm/bootinfo.h
- *   Definitions of firmware boot parameters passed to the kernel.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#ifndef _ASM_UBICOM32_BOOTINFO_H
-#define _ASM_UBICOM32_BOOTINFO_H
-
-/* Nothing for ubicom32 */
-
-#endif /* _ASM_UBICOM32_BOOTINFO_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/bug.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/bug.h
deleted file mode 100644
index b6a000dac..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/bug.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * arch/ubicom32/include/asm/bug.h
- *   Generic bug.h for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_BUG_H
-#define _ASM_UBICOM32_BUG_H
-
-#include <linux/kernel.h>
-#include <asm/thread.h>
-
-#if defined(CONFIG_BUG) && defined(CONFIG_STOP_ON_BUG)
-
-/*
- * BUG()
- *	Ubicom specific version of the BUG() macro.
- *
- * This implementation performs a THREAD_STALL stopping all threads before
- * calling panic.  This enables a developer to see the "real" state of the
- * machine (since panic alters the system state).  We do the printf first
- * because while it is slow, it does not alter system state (like
- * interrupts).
- *
- * TODO: Implement the trap sequence used by other architectures.
- */
-#define BUG() do { \
-	printk("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __func__); \
-	THREAD_STALL; \
-	panic("BUG!"); \
-} while (0)
-
-
-/*
- * __WARN()
- *	WARN() using printk() for now.
- *
- * TODO: Implement the trap sequence used by other architectures.
- */
-#define __WARN()							\
-	do {								\
-		printk("WARN: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __func__); \
-	} while(0)
-
-/*
- * WARN_ON()
- *	Ubicom specific version of the WARN_ON macro.
- *
- * This implementation performs a printk for the WARN_ON() instead
- * of faulting into the kernel and using report_bug().
- *
- * TODO: Implement the trap sequence used by other architectures.
- */
-#define WARN_ON(x) ({						\
-	int __ret_warn_on = !!(x);				\
-	if (__builtin_constant_p(__ret_warn_on)) {		\
-		if (__ret_warn_on)				\
-			__WARN();				\
-	} else {						\
-		if (unlikely(__ret_warn_on))			\
-			__WARN();				\
-	}							\
-	unlikely(__ret_warn_on);				\
-})
-
-
-#define HAVE_ARCH_BUG
-#define HAVE_ARCH_WARN_ON
-
-#endif
-
-#include <asm-generic/bug.h>
-
-#endif /* _ASM_UBICOM32_BUG_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/bugs.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/bugs.h
deleted file mode 100644
index 66adfe7b0..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/bugs.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * arch/ubicom32/include/asm/bugs.h
- *   Definition of check_bugs() for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- * Copyright (C) 1994  Linus Torvalds
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-/*
- * This is included by init/main.c to check for architecture-dependent bugs.
- *
- * Needs:
- *	void check_bugs(void);
- */
-
-#ifndef _ASM_UBICOM32_BUGS_H
-#define _ASM_UBICOM32_BUGS_H
-
-static void check_bugs(void)
-{
-}
-
-#endif /* _ASM_UBICOM32_BUGS_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/byteorder.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/byteorder.h
deleted file mode 100644
index e4cd7c92f..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/byteorder.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * arch/ubicom32/include/asm/byteorder.h
- *   Byte order swapping utility routines.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_BYTEORDER_H
-#define _ASM_UBICOM32_BYTEORDER_H
-
-#include <linux/byteorder/big_endian.h>
-
-#endif /* _ASM_UBICOM32_BYTEORDER_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/cache.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/cache.h
deleted file mode 100644
index 5fcd36db7..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/cache.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * arch/ubicom32/include/asm/cache.h
- *   Cache line definitions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_CACHE_H
-#define _ASM_UBICOM32_CACHE_H
-
-/*
- * bytes per L1 cache line
- */
-#define L1_CACHE_SHIFT  5
-#define L1_CACHE_BYTES  (1 << L1_CACHE_SHIFT)
-
-#define __cacheline_aligned
-#define ____cacheline_aligned
-
-#endif /* _ASM_UBICOM32_CACHE_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/cachectl.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/cachectl.h
deleted file mode 100644
index 12a9159e5..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/cachectl.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * arch/ubicom32/include/asm/cachectl.h
- *   Ubicom32 cache control definitions.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_CACHECTL_H
-#define _ASM_UBICOM32_CACHECTL_H
-
-#include <asm/ip5000.h>
-
-/*
- * mem_cache_control()
- *	Special cache control operation
- */
-extern void mem_cache_control(unsigned long cc, unsigned long begin_addr, unsigned long end_addr, unsigned long op);
-
-#endif /* _ASM_UBICOM32_CACHECTL_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/cacheflush.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/cacheflush.h
deleted file mode 100644
index 10a8141e5..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/cacheflush.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * arch/ubicom32/include/asm/cacheflush.h
- *   Cache flushing definitions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_CACHEFLUSH_H
-#define _ASM_UBICOM32_CACHEFLUSH_H
-
-/*
- * (C) Copyright 2000-2004, Greg Ungerer <gerg@snapgear.com>
- */
-#include <linux/mm.h>
-#include <asm/cachectl.h>
-#include <asm/ip5000.h>
-
-#define flush_cache_all()			__flush_cache_all()
-#define flush_cache_mm(mm)			do { } while (0)
-#define flush_cache_dup_mm(mm)			do { } while (0)
-#define flush_cache_range(vma, start, end)	__flush_cache_all()
-#define flush_cache_page(vma, vmaddr)		do { } while (0)
-#define flush_dcache_page(page)			do { } while (0)
-#define flush_dcache_mmap_lock(mapping)		do { } while (0)
-#define flush_dcache_mmap_unlock(mapping)	do { } while (0)
-
-#define flush_dcache_range(start, end)					\
-do {									\
-	/* Flush the data cache and invalidate the I cache. */		\
-	mem_cache_control(DCCR_BASE, start, end, CCR_CTRL_FLUSH_ADDR);	\
-	mem_cache_control(ICCR_BASE, start, end, CCR_CTRL_INV_ADDR);	\
-} while (0)
-
-#define flush_icache_range(start, end)					\
-do {									\
-	/* Flush the data cache and invalidate the I cache. */		\
-	mem_cache_control(DCCR_BASE, start, end, CCR_CTRL_FLUSH_ADDR);	\
-	mem_cache_control(ICCR_BASE, start, end, CCR_CTRL_INV_ADDR);	\
-} while (0)
-
-#define flush_icache_page(vma,pg)		do { } while (0)
-#define flush_icache_user_range(vma,pg,adr,len)	do { } while (0)
-#define flush_cache_vmap(start, end)		do { } while (0)
-#define flush_cache_vunmap(start, end)		do { } while (0)
-
-#define copy_to_user_page(vma, page, vaddr, dst, src, len) \
-	memcpy(dst, src, len)
-#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
-	memcpy(dst, src, len)
-
-/*
- * Cache handling for IP5000
- */
-extern inline void mem_cache_invalidate_all(unsigned long cc)
-{
-	if (cc == DCCR_BASE)
-		UBICOM32_LOCK(DCCR_LOCK_BIT);
-	else
-		UBICOM32_LOCK(ICCR_LOCK_BIT);
-
-	asm volatile (
-	"	bset	"D(CCR_CTRL)"(%0), "D(CCR_CTRL)"(%0), #"D(CCR_CTRL_RESET)"	\n\t"
-	"	nop									\n\t"
-	"	bclr	"D(CCR_CTRL)"(%0), "D(CCR_CTRL)"(%0), #"D(CCR_CTRL_RESET)"	\n\t"
-	"	pipe_flush 0								\n\t"
-		:
-		: "a"(cc)
-		: "cc"
-	);
-
-	if (cc == DCCR_BASE)
-		UBICOM32_UNLOCK(DCCR_LOCK_BIT);
-	else
-		UBICOM32_UNLOCK(ICCR_LOCK_BIT);
-
-}
-
-static inline void __flush_cache_all(void)
-{
-	/*
-	 * Flush Icache
-	 */
-	mem_cache_invalidate_all(ICCR_BASE);
-
-	/*
-	 * Flush Dcache
-	 */
-	mem_cache_invalidate_all(DCCR_BASE);
-}
-
-#endif /* _ASM_UBICOM32_CACHEFLUSH_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/checksum.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/checksum.h
deleted file mode 100644
index 25f8ca61c..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/checksum.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * arch/ubicom32/include/asm/checksum.h
- *   Checksum utilities for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_CHECKSUM_H
-#define _ASM_UBICOM32_CHECKSUM_H
-
-#include <linux/in6.h>
-
-/*
- * computes the checksum of a memory block at buff, length len,
- * and adds in "sum" (32-bit)
- *
- * returns a 32-bit number suitable for feeding into itself
- * or csum_tcpudp_magic
- *
- * this function must be called with even lengths, except
- * for the last fragment, which may be odd
- *
- * it's best to have buff aligned on a 32-bit boundary
- */
-__wsum csum_partial(const void *buff, int len, __wsum sum);
-
-/*
- * the same as csum_partial, but copies from src while it
- * checksums
- *
- * here even more important to align src and dst on a 32-bit (or even
- * better 64-bit) boundary
- */
-
-__wsum csum_partial_copy_nocheck(const void *src, void *dst,
-	int len, __wsum sum);
-
-
-/*
- * the same as csum_partial_copy, but copies from user space.
- *
- * here even more important to align src and dst on a 32-bit (or even
- * better 64-bit) boundary
- */
-
-extern __wsum csum_partial_copy_from_user(const void __user *src,
-	void *dst, int len, __wsum sum, int *csum_err);
-
-__sum16 ip_fast_csum(const void *iph, unsigned int ihl);
-
-/*
- *	Fold a partial checksum
- */
-
-static inline __sum16 csum_fold(__wsum sum)
-{
-	asm volatile (
-	"	lsr.4	d15, %0, #16	\n\t"
-	"	bfextu	%0, %0, #16	\n\t"
-	"	add.4	%0, d15, %0	\n\t"
-	"	lsr.4	d15, %0, #16	\n\t"
-	"	bfextu	%0, %0, #16	\n\t"
-	"	add.4	%0, d15, %0	\n\t"
-		: "=&d" (sum)
-		: "0"(sum)
-		: "d15"
-	);
-	return (__force __sum16)~sum;
-}
-
-
-/*
- * computes the checksum of the TCP/UDP pseudo-header
- * returns a 16-bit checksum, already complemented
- */
-
-static inline __wsum
-csum_tcpudp_nofold(__be32 saddr, __be32 daddr, unsigned short len,
-		  unsigned short proto, __wsum sum)
-{
-	asm volatile (
-	"	add.4	%0, %2, %0	\n\t"
-	"	addc	%0, %3, %0	\n\t"
-	"	addc	%0, %4, %0	\n\t"
-	"	addc	%0, %5, %0	\n\t"
-	"	addc	%0, #0, %0	\n\t"
-		: "=&d" (sum)
-		: "0"(sum), "r" (saddr), "r" (daddr), "r" (len), "r"(proto)
-	);
-	return sum;
-}
-
-static inline __sum16
-csum_tcpudp_magic(__be32 saddr, __be32 daddr, unsigned short len,
-		  unsigned short proto, __wsum sum)
-{
-	return csum_fold(csum_tcpudp_nofold(saddr,daddr,len,proto,sum));
-}
-
-/*
- * this routine is used for miscellaneous IP-like checksums, mainly
- * in icmp.c
- */
-extern __sum16 ip_compute_csum(const void *buff, int len);
-
-#define _HAVE_ARCH_IPV6_CSUM
-
-static __inline__ __sum16
-csum_ipv6_magic(const struct in6_addr *saddr, const struct in6_addr *daddr,
-		__u32 len, unsigned short proto, __wsum sum)
-{
-	asm volatile (
-	"	add.4	%0, 0(%2), %0	\n\t"
-	"	addc	%0, 4(%2), %0	\n\t"
-	"	addc	%0, 8(%2), %0	\n\t"
-	"	addc	%0, 12(%2), %0	\n\t"
-	"	addc	%0, 0(%3), %0	\n\t"
-	"	addc	%0, 4(%3), %0	\n\t"
-	"	addc	%0, 8(%3), %0	\n\t"
-	"	addc	%0, 12(%3), %0	\n\t"
-	"	addc	%0, %4, %0	\n\t"
-	"	addc	%0, #0, %0	\n\t"
-		: "=&d" (sum)
-		: "0" (sum), "a" (saddr), "a" (daddr), "d" (len + proto)
-	);
-	return csum_fold(sum);
-}
-
-#endif /* _ASM_UBICOM32_CHECKSUM_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/cpu.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/cpu.h
deleted file mode 100644
index c713b6253..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/cpu.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * arch/ubicom32/include/asm/cpu.h
- *   CPU definitions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- * Copyright (C) 2004-2005 ARM Ltd.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_CPU_H
-#define _ASM_UBICOM32_CPU_H
-
-#include <linux/percpu.h>
-
-struct cpuinfo_ubicom32 {
-	unsigned long tid;			/* Hardware thread number */
-
-#ifdef CONFIG_SMP
-	volatile unsigned long ipi_pending;	/* Bit map of operations to execute */
-	unsigned long ipi_count;		/* Number of IPI(s) taken on this cpu */
-#endif
-};
-
-DECLARE_PER_CPU(struct cpuinfo_ubicom32, cpu_data);
-
-#endif /* _ASM_UBICOM32_CPU_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/cputime.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/cputime.h
deleted file mode 100644
index c79444342..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/cputime.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * arch/ubicom32/include/asm/cputime.h
- *   Generic cputime.h for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_CPUTIME_H
-#define _ASM_UBICOM32_CPUTIME_H
-
-#include <asm-generic/cputime.h>
-
-#endif /* _ASM_UBICOM32_CPUTIME_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/current.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/current.h
deleted file mode 100644
index 2d549bbf7..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/current.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * arch/ubicom32/include/asm/current.h
- *   Definition of get_current() for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- * (C) Copyright 2000, Lineo, David McCullough <davidm@uclinux.org>
- * (C) Copyright 2002, Greg Ungerer (gerg@snapgear.com)
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_CURRENT_H
-#define _ASM_UBICOM32_CURRENT_H
-
-#include <linux/thread_info.h>
-
-struct task_struct;
-
-static inline struct task_struct *get_current(void)
-{
-	return(current_thread_info()->task);
-}
-
-#define	current	get_current()
-
-#endif /* _ASM_UBICOM32_CURRENT_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/delay.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/delay.h
deleted file mode 100644
index 0e5025c46..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/delay.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * arch/ubicom32/include/asm/delay.h
- *   Definition of delay routines for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_DELAY_H
-#define _ASM_UBICOM32_DELAY_H
-
-#include <asm/param.h>
-#include <asm/ip5000.h>
-
-static inline void __delay(unsigned long loops)
-{
-	if (loops == 0) {
-		return;
-	}
-
-	asm volatile (
-	"1:	add.4	%0, #-1, %0		\n\t"
-	"	jmpne.t	1b			\n\t"
-	: "+d" (loops)
-	);
-}
-
-/*
- *	Ubicom32 processor uses fixed 12MHz external OSC.
- *	So we use that as reference to count 12 cycles/us
- */
-
-extern unsigned long loops_per_jiffy;
-
-static inline void _udelay(unsigned long usecs)
-{
-#if defined(CONFIG_UBICOM32_V4) || defined(CONFIG_UBICOM32_V3)
-	asm volatile (
-		"	add.4		d15, 0(%0), %1			\n\t"
-		"	sub.4		#0, 0(%0), d15			\n\t"
-		"	jmpmi.w.f	.-4				\n\t"
-		:
-		: "a"(TIMER_BASE + TIMER_MPTVAL), "d"(usecs * (12000000/1000000))
-		: "d15"
-	);
-#else
-	BUG();
-#endif
-}
-
-/*
- *	Moved the udelay() function into library code, no longer inlined.
- */
-extern void udelay(unsigned long usecs);
-
-#endif /* _ASM_UBICOM32_DELAY_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/device.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/device.h
deleted file mode 100644
index 53de082b0..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/device.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * arch/ubicom32/include/asm/device.h
- *   Generic device.h for Ubicom32 architecture.
- *
- *   Used for arch specific extensions to struct device
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_DEVICE_H
-#define _ASM_UBICOM32_DEVICE_H
-
-#include <asm-generic/device.h>
-
-#endif /* _ASM_UBICOM32_DEVICE_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/devtree.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/devtree.h
deleted file mode 100644
index 3380c2bea..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/devtree.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * arch/ubicom32/include/asm/devtree.h
- *   Device Tree Header File (Shared between ultra and the Host OS)
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#ifndef _ASM_UBICOM32_DEVTREE_H
-#define _ASM_UBICOM32_DEVTREE_H
-
-#define DEVTREE_MAX_NAME 32
-#define DEVTREE_IRQ_NONE 0xff
-#define DEVTREE_IRQ_DONTCARE 0xff
-#define DEVTREE_NODE_MAGIC 0x10203040
-
-struct devtree_node {
-	struct devtree_node *next;
-	unsigned char sendirq;
-	unsigned char recvirq;
-	char name[DEVTREE_MAX_NAME];
-	unsigned int magic;
-};
-
-extern struct devtree_node *devtree;
-extern struct devtree_node *devtree_find_by_irq(uint8_t sendirq, uint8_t recvirq);
-extern struct devtree_node *devtree_find_node(const char *str);
-extern struct devtree_node *devtree_find_next(struct devtree_node **cur);
-extern int devtree_irq(struct devtree_node *dn, unsigned char *sendirq, unsigned char *recvirq);
-extern void devtree_print(void);
-
-#endif /* _ASM_UBICOM32_DEVTREE_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/div64.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/div64.h
deleted file mode 100644
index 97702617b..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/div64.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * arch/ubicom32/include/asm/div64.h
- *   Generic div64.h for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_DIV64_H
-#define _ASM_UBICOM32_DIV64_H
-
-#include <asm-generic/div64.h>
-
-#endif /* _ASM_UBICOM32_DIV64_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/dma-mapping.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/dma-mapping.h
deleted file mode 100644
index 87639a429..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/dma-mapping.h
+++ /dev/null
@@ -1,328 +0,0 @@
-/*
- * arch/ubicom32/include/asm/dma-mapping.h
- *   Generic dma-mapping.h for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_DMA_MAPPING_H
-#define _ASM_UBICOM32_DMA_MAPPING_H
-
-#include <linux/scatterlist.h>
-#ifdef CONFIG_PCI
-
-/* we implement the API below in terms of the existing PCI one,
- * so include it */
-#include <linux/pci.h>
-/* need struct page definitions */
-#include <linux/mm.h>
-
-static inline int
-dma_supported(struct device *dev, u64 mask)
-{
-	BUG_ON(dev->bus != &pci_bus_type);
-
-	return pci_dma_supported(to_pci_dev(dev), mask);
-}
-
-static inline int
-dma_set_mask(struct device *dev, u64 dma_mask)
-{
-	BUG_ON(dev->bus != &pci_bus_type);
-
-	return pci_set_dma_mask(to_pci_dev(dev), dma_mask);
-}
-
-static inline void *
-dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
-		   gfp_t flag)
-{
-	BUG_ON(dev->bus != &pci_bus_type);
-
-	return pci_alloc_consistent(to_pci_dev(dev), size, dma_handle);
-}
-
-static inline void
-dma_free_coherent(struct device *dev, size_t size, void *cpu_addr,
-		    dma_addr_t dma_handle)
-{
-	BUG_ON(dev->bus != &pci_bus_type);
-
-	pci_free_consistent(to_pci_dev(dev), size, cpu_addr, dma_handle);
-}
-
-static inline dma_addr_t
-dma_map_single(struct device *dev, void *cpu_addr, size_t size,
-	       enum dma_data_direction direction)
-{
-	BUG_ON(dev->bus != &pci_bus_type);
-
-	return pci_map_single(to_pci_dev(dev), cpu_addr, size, (int)direction);
-}
-
-static inline void
-dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
-		 enum dma_data_direction direction)
-{
-	BUG_ON(dev->bus != &pci_bus_type);
-
-	pci_unmap_single(to_pci_dev(dev), dma_addr, size, (int)direction);
-}
-
-static inline dma_addr_t
-dma_map_page(struct device *dev, struct page *page,
-	     unsigned long offset, size_t size,
-	     enum dma_data_direction direction)
-{
-	BUG_ON(dev->bus != &pci_bus_type);
-
-	return pci_map_page(to_pci_dev(dev), page, offset, size, (int)direction);
-}
-
-static inline void
-dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size,
-	       enum dma_data_direction direction)
-{
-	BUG_ON(dev->bus != &pci_bus_type);
-
-	pci_unmap_page(to_pci_dev(dev), dma_address, size, (int)direction);
-}
-
-static inline int
-dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
-	   enum dma_data_direction direction)
-{
-	BUG_ON(dev->bus != &pci_bus_type);
-
-	return pci_map_sg(to_pci_dev(dev), sg, nents, (int)direction);
-}
-
-static inline void
-dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries,
-	     enum dma_data_direction direction)
-{
-	BUG_ON(dev->bus != &pci_bus_type);
-
-	pci_unmap_sg(to_pci_dev(dev), sg, nhwentries, (int)direction);
-}
-
-static inline void
-dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, size_t size,
-			enum dma_data_direction direction)
-{
-	BUG_ON(dev->bus != &pci_bus_type);
-
-	pci_dma_sync_single_for_cpu(to_pci_dev(dev), dma_handle,
-				    size, (int)direction);
-}
-
-static inline void
-dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, size_t size,
-			   enum dma_data_direction direction)
-{
-	BUG_ON(dev->bus != &pci_bus_type);
-
-	pci_dma_sync_single_for_device(to_pci_dev(dev), dma_handle,
-				       size, (int)direction);
-}
-
-static inline void
-dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems,
-		    enum dma_data_direction direction)
-{
-	BUG_ON(dev->bus != &pci_bus_type);
-
-	pci_dma_sync_sg_for_cpu(to_pci_dev(dev), sg, nelems, (int)direction);
-}
-
-static inline void
-dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nelems,
-		       enum dma_data_direction direction)
-{
-	BUG_ON(dev->bus != &pci_bus_type);
-
-	pci_dma_sync_sg_for_device(to_pci_dev(dev), sg, nelems, (int)direction);
-}
-
-static inline int
-dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
-{
-	return pci_dma_mapping_error(to_pci_dev(dev), dma_addr);
-}
-
-
-#else
-
-static inline int
-dma_supported(struct device *dev, u64 mask)
-{
-	return 0;
-}
-
-static inline int
-dma_set_mask(struct device *dev, u64 dma_mask)
-{
-	BUG();
-	return 0;
-}
-
-static inline void *
-dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
-		   gfp_t flag)
-{
-	BUG();
-	return NULL;
-}
-
-static inline void
-dma_free_coherent(struct device *dev, size_t size, void *cpu_addr,
-		    dma_addr_t dma_handle)
-{
-	BUG();
-}
-
-static inline dma_addr_t
-dma_map_single(struct device *dev, void *cpu_addr, size_t size,
-	       enum dma_data_direction direction)
-{
-	BUG();
-	return 0;
-}
-
-static inline void
-dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
-		 enum dma_data_direction direction)
-{
-	BUG();
-}
-
-static inline dma_addr_t
-dma_map_page(struct device *dev, struct page *page,
-	     unsigned long offset, size_t size,
-	     enum dma_data_direction direction)
-{
-	BUG();
-	return 0;
-}
-
-static inline void
-dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size,
-	       enum dma_data_direction direction)
-{
-	BUG();
-}
-
-static inline int
-dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
-	   enum dma_data_direction direction)
-{
-	BUG();
-	return 0;
-}
-
-static inline void
-dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries,
-	     enum dma_data_direction direction)
-{
-	BUG();
-}
-
-static inline void
-dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, size_t size,
-			enum dma_data_direction direction)
-{
-	BUG();
-}
-
-static inline void
-dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, size_t size,
-			   enum dma_data_direction direction)
-{
-	BUG();
-}
-
-static inline void
-dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems,
-		    enum dma_data_direction direction)
-{
-	BUG();
-}
-
-static inline void
-dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nelems,
-		       enum dma_data_direction direction)
-{
-	BUG();
-}
-
-static inline int
-dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
-{
-	return 0;
-}
-
-#endif
-
-/* Now for the API extensions over the pci_ one */
-
-#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
-#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
-#define dma_is_consistent(d, h)	(1)
-
-static inline int
-dma_get_cache_alignment(void)
-{
-	/* no easy way to get cache size on all processors, so return
-	 * the maximum possible, to be safe */
-	return (1 << INTERNODE_CACHE_SHIFT);
-}
-
-static inline void
-dma_sync_single_range_for_cpu(struct device *dev, dma_addr_t dma_handle,
-			      unsigned long offset, size_t size,
-			      enum dma_data_direction direction)
-{
-	/* just sync everything, that's all the pci API can do */
-	dma_sync_single_for_cpu(dev, dma_handle, offset+size, direction);
-}
-
-static inline void
-dma_sync_single_range_for_device(struct device *dev, dma_addr_t dma_handle,
-				 unsigned long offset, size_t size,
-				 enum dma_data_direction direction)
-{
-	/* just sync everything, that's all the pci API can do */
-	dma_sync_single_for_device(dev, dma_handle, offset+size, direction);
-}
-
-static inline void
-dma_cache_sync(struct device *dev, void *vaddr, size_t size,
-	       enum dma_data_direction direction)
-{
-	/* could define this in terms of the dma_cache ... operations,
-	 * but if you get this on a platform, you should convert the platform
-	 * to using the generic device DMA API */
-	BUG();
-}
-
-#endif /* _ASM_UBICOM32_DMA_MAPPING_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/dma.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/dma.h
deleted file mode 100644
index c3a10acf9..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/dma.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * arch/ubicom32/include/asm/dma.h
- *   DMA definitions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_DMA_H
-#define _ASM_UBICOM32_DMA_H
-
-/* Nothing so far */
-#define MAX_DMA_ADDRESS 0x00	/* This is quite suspicious */
-
-#endif /* _ASM_UBICOM32_DMA_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/elf.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/elf.h
deleted file mode 100644
index 3abc202ac..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/elf.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * arch/ubicom32/include/asm/elf.h
- *   Definitions for elf executable format for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_ELF_H
-#define _ASM_UBICOM32_ELF_H
-
-/*
- * ELF register definitions..
- */
-
-#include <asm/ptrace.h>
-#include <asm/user.h>
-
-/*
- * Processor specific flags for the ELF header e_flags field.
- */
-#define EF_UBICOM32_V3		0x00000001	/* -fmarch=ubicom32v3 */
-#define EF_UBICOM32_V4		0x00000002	/* -fmarch=ubicom32v4 */
-#define EF_UBICOM32_PIC		0x80000000	/* -fpic */
-#define EF_UBICOM32_FDPIC	0x40000000	/* -mfdpic */
-
-/*
- * Ubicom32 ELF relocation types
- */
-#define R_UBICOM32_NONE			0
-#define R_UBICOM32_16			1
-#define R_UBICOM32_32			2
-#define R_UBICOM32_LO16			3
-#define R_UBICOM32_HI16			4
-#define R_UBICOM32_21_PCREL		5
-#define R_UBICOM32_24_PCREL		6
-#define R_UBICOM32_HI24			7
-#define R_UBICOM32_LO7_S		8
-#define R_UBICOM32_LO7_2_S		9
-#define R_UBICOM32_LO7_4_S		10
-#define R_UBICOM32_LO7_D		11
-#define R_UBICOM32_LO7_2_D		12
-#define R_UBICOM32_LO7_4_D		13
-#define R_UBICOM32_32_HARVARD		14
-#define R_UBICOM32_LO7_CALLI		15
-#define R_UBICOM32_LO16_CALLI		16
-#define R_UBICOM32_GOT_HI24		17
-#define R_UBICOM32_GOT_LO7_S		18
-#define R_UBICOM32_GOT_LO7_2_S		19
-#define R_UBICOM32_GOT_LO7_4_S		20
-#define R_UBICOM32_GOT_LO7_D		21
-#define R_UBICOM32_GOT_LO7_2_D		22
-#define R_UBICOM32_GOT_LO7_4_D		23
-#define R_UBICOM32_FUNCDESC_GOT_HI24    24
-#define R_UBICOM32_FUNCDESC_GOT_LO7_S   25
-#define R_UBICOM32_FUNCDESC_GOT_LO7_2_S 26
-#define R_UBICOM32_FUNCDESC_GOT_LO7_4_S 27
-#define R_UBICOM32_FUNCDESC_GOT_LO7_D   28
-#define R_UBICOM32_FUNCDESC_GOT_LO7_2_D 29
-#define R_UBICOM32_FUNCDESC_GOT_LO7_4_D 30
-#define R_UBICOM32_GOT_LO7_CALLI        31
-#define R_UBICOM32_FUNCDESC_GOT_LO7_CALLI 32
-#define R_UBICOM32_FUNCDESC_VALUE       33
-#define R_UBICOM32_FUNCDESC             34
-#define R_UBICOM32_GOTOFFSET_LO         35
-#define R_UBICOM32_GOTOFFSET_HI         36
-#define R_UBICOM32_FUNCDESC_GOTOFFSET_LO 37
-#define R_UBICOM32_FUNCDESC_GOTOFFSET_HI 38
-#define R_UBICOM32_GNU_VTINHERIT        200
-#define R_UBICOM32_GNU_VTENTRY          201
-
-typedef unsigned long elf_greg_t;
-
-#define ELF_NGREG (sizeof(struct pt_regs) / sizeof(elf_greg_t))
-typedef elf_greg_t elf_gregset_t[ELF_NGREG];
-
-typedef struct user_ubicom32fp_struct elf_fpregset_t;
-
-/*
- * This is used to ensure we don't load something for the wrong architecture.
- */
-#define elf_check_arch(x) ((x)->e_machine == EM_UBICOM32)
-
-#define elf_check_fdpic(x) ((x)->e_flags & EF_UBICOM32_FDPIC)
-
-#define elf_check_const_displacement(x) ((x)->e_flags & EF_UBICOM32_PIC)
-
-/*
- * These are used to set parameters in the core dumps.
- */
-#define ELF_CLASS	ELFCLASS32
-#define ELF_DATA	ELFDATA2MSB
-#define ELF_ARCH	EM_UBICOM32
-
-/* For SVR4/m68k the function pointer to be registered with `atexit' is
-   passed in %a1.  Although my copy of the ABI has no such statement, it
-   is actually used on ASV.  */
-#define ELF_PLAT_INIT(_r, load_addr)	_r->a1 = 0
-
-#define ELF_FDPIC_PLAT_INIT(_regs, _exec_map_addr, _interp_map_addr,	\
-			    _dynamic_addr)				\
-	do {								\
-		_regs->dn[1]	= _exec_map_addr;			\
-		_regs->dn[2]	= _interp_map_addr;			\
-		_regs->dn[3]	= _dynamic_addr;			\
-		_regs->an[1]	= 0; /* dl_fini will be set by ldso */	\
-	} while (0)
-
-#define USE_ELF_CORE_DUMP
-#define ELF_EXEC_PAGESIZE	4096
-
-#ifdef __KERNEL__
-#ifdef CONFIG_UBICOM32_V4
-#define ELF_FDPIC_CORE_EFLAGS	(EF_UBICOM32_FDPIC | EF_UBICOM32_V4)
-#elif defined CONFIG_UBICOM32_V3
-#define ELF_FDPIC_CORE_EFLAGS	(EF_UBICOM32_FDPIC | EF_UBICOM32_V3)
-#else
-#error Unknown/Unsupported ubicom32 architecture.
-#endif
-#endif
-
-/* This is the location that an ET_DYN program is loaded if exec'ed.  Typical
-   use of this is to invoke "./ld.so someprog" to test out a new version of
-   the loader.  We need to make sure that it is out of the way of the program
-   that it will "exec", and that there is sufficient room for the brk.  */
-
-#define ELF_ET_DYN_BASE         0xD0000000UL
-
-/*
- * For Ubicom32, the elf_gregset_t and struct pt_regs are the same size
- * data structure so a copy is performed instead of providing the
- * ELF_CORE_COPY_REGS macro.
- */
-
-/*
- * ELF_CORE_COPY_TASK_REGS is needed to dump register state from multi threaded user projects.
- */
-extern int dump_task_regs(struct task_struct *, elf_gregset_t *);
-#define ELF_CORE_COPY_TASK_REGS(tsk, elf_regs) dump_task_regs(tsk, elf_regs)
-
-/* This yields a mask that user programs can use to figure out what
-   instruction set this cpu supports.  */
-
-#define ELF_HWCAP	(0)
-
-/* This yields a string that ld.so will use to load implementation
-   specific libraries for optimization.  This is more specific in
-   intent than poking at uname or /proc/cpuinfo.  */
-
-#define ELF_PLATFORM  (NULL)
-
-#define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX)
-
-#endif /* _ASM_UBICOM32_ELF_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/emergency-restart.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/emergency-restart.h
deleted file mode 100644
index ea39e58ce..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/emergency-restart.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * arch/ubicom32/include/asm/emergency-restart.h
- *   Generic emergency-restart.h for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_EMERGENCY_RESTART_H
-#define _ASM_UBICOM32_EMERGENCY_RESTART_H
-
-#include <asm-generic/emergency-restart.h>
-
-#endif /* _ASM_UBICOM32_EMERGENCY_RESTART_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/entry.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/entry.h
deleted file mode 100644
index 5ef46e62d..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/entry.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * arch/ubicom32/include/asm/entry.h
- *   Entry register/stack definitions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_ENTRY_H
-#define _ASM_UBICOM32_ENTRY_H
-
-#include <asm/setup.h>
-#include <asm/page.h>
-
-#endif /* _ASM_UBICOM32_ENTRY_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/errno.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/errno.h
deleted file mode 100644
index bf995b16a..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/errno.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * arch/ubicom32/include/asm/errno.h
- *   Generic errno.h for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_ERRNO_H
-#define _ASM_UBICOM32_ERRNO_H
-
-#include <asm-generic/errno.h>
-
-#endif /* _ASM_UBICOM32_ERRNO_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/fb.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/fb.h
deleted file mode 100644
index 9e9cc6bc7..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/fb.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * arch/ubicom32/include/asm/fb.h
- *   Definition of fb_is_primary_device() for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_FB_H
-#define _ASM_UBICOM32_FB_H
-#include <linux/fb.h>
-
-#define fb_pgprotect(...) do {} while (0)
-
-static inline int fb_is_primary_device(struct fb_info *info)
-{
-	return 0;
-}
-
-#endif /* _ASM_UBICOM32_FB_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/fcntl.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/fcntl.h
deleted file mode 100644
index 810638c57..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/fcntl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * arch/ubicom32/include/asm/fcntl.h
- *   File control bit definitions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_FCNTL_H
-#define _ASM_UBICOM32_FCNTL_H
-
-#define O_DIRECTORY	040000	/* must be a directory */
-#define O_NOFOLLOW	0100000	/* don't follow links */
-#define O_DIRECT	0200000	/* direct disk access hint - currently ignored */
-#define O_LARGEFILE	0400000
-
-#include <asm-generic/fcntl.h>
-
-#endif /* _ASM_UBICOM32_FCNTL_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/flat.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/flat.h
deleted file mode 100644
index 84edd478b..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/flat.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * arch/ubicom32/include/asm/flat.h
- *   Definitions to support flat-format executables.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#ifndef _ASM_UBICOM32_FLAT_H
-#define _ASM_UBICOM32_FLAT_H
-
-#define ARCH_FLAT_ALIGN 0x80
-#define ARCH_FLAT_ALIGN_TEXT 1
-
-#define  R_UBICOM32_32		2
-#define  R_UBICOM32_HI24	7
-#define  R_UBICOM32_LO7_S	8
-#define  R_UBICOM32_LO7_2_S	9
-#define  R_UBICOM32_LO7_4_S	10
-#define  R_UBICOM32_LO7_D	11
-#define  R_UBICOM32_LO7_2_D	12
-#define  R_UBICOM32_LO7_4_D	13
-#define  R_UBICOM32_LO7_CALLI	15
-#define  R_UBICOM32_LO16_CALLI	16
-
-extern void ubicom32_flat_put_addr_at_rp(unsigned long *rp, u32_t val, u32_t rval, unsigned long  *p);
-extern unsigned long ubicom32_flat_get_addr_from_rp(unsigned long *rp, u32_t relval, u32_t flags, unsigned long *p);
-
-#define	flat_stack_align(sp)			/* nothing needed */
-#define	flat_argvp_envp_on_stack()		1
-#define	flat_old_ram_flag(flags)		(flags)
-#define	flat_reloc_valid(reloc, size)		((reloc) <= (size))
-#define	flat_get_addr_from_rp(rp, relval, flags, p)	(ubicom32_flat_get_addr_from_rp(rp, relval,flags, p))
-#define	flat_put_addr_at_rp(rp, val, relval)	do {ubicom32_flat_put_addr_at_rp(rp, val, relval, &persistent);} while(0)
-#define	flat_get_relocate_addr(rel)		((persistent) ? (persistent & 0x07ffffff) : (rel & 0x07ffffff))
-
-static inline int flat_set_persistent(unsigned int relval, unsigned long *p)
-{
-	if (*p) {
-		return 0;
-	} else {
-		if ((relval >> 27) != R_UBICOM32_32) {
-			/*
-			 * Something other than UBICOM32_32. The next entry has the relocation.
-			 */
-			*p = relval;
-			return 1;
-		}
-	}
-	return 0;
-}
-
-#endif /* _ASM_UBICOM32_FLAT_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/fpu.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/fpu.h
deleted file mode 100644
index 496b7ddc3..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/fpu.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * arch/ubicom32/include/asm/fpu.h
- *   Floating point state definitions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_FPU_H
-#define _ASM_UBICOM32_FPU_H
-
-/*
- * MAX floating point unit state size (FSAVE/FRESTORE)
- */
-/* No FP unit present then... */
-#define FPSTATESIZE (2) /* dummy size */
-
-#endif /* _ASM_UBICOM32_FPU_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ftrace.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/ftrace.h
deleted file mode 100644
index 40a8c178f..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ftrace.h
+++ /dev/null
@@ -1 +0,0 @@
-/* empty */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/futex.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/futex.h
deleted file mode 100644
index 8c84b31f3..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/futex.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * arch/ubicom32/include/asm/futex.h
- *   Generic futex.h for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_FUTEX_H
-#define _ASM_UBICOM32_FUTEX_H
-
-#include <asm-generic/futex.h>
-
-#endif /* _ASM_UBICOM32_FUTEX_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/gpio.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/gpio.h
deleted file mode 100644
index 1f834f35b..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/gpio.h
+++ /dev/null
@@ -1,453 +0,0 @@
-/*
- * arch/ubicom32/include/asm/gpio.h
- *   Definitions for GPIO operations on Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_GPIO_H
-#define _ASM_UBICOM32_GPIO_H
-
-#include <linux/compiler.h>
-#include <asm/irq.h>
-
-#include <asm/ip5000.h>
-
-#define ARCH_NR_GPIOS	         512
-#define MAX_UBICOM_ONCHIP_GPIO   (9 * 32)
-
-/*
- * Macros for manipulating GPIO numbers
- */
-#define gpio_bit(gn)			(1 << (gn & 0x1f))
-#define gpio_bank(gn)			(gn >> 5)
-
-#define gpio_pin_index(gn)		(gn & 0x1f)
-#define gpio_port_index(gn)		(gn >> 5)
-
-#define GPIO_RA_0    ((32 * 0) + 0)
-#define GPIO_RA_1    ((32 * 0) + 1)
-#define GPIO_RA_2    ((32 * 0) + 2)
-#define GPIO_RA_3    ((32 * 0) + 3)
-#define GPIO_RA_4    ((32 * 0) + 4)
-#define GPIO_RA_5    ((32 * 0) + 5)
-#define GPIO_RA_6    ((32 * 0) + 6)
-#define GPIO_RA_7    ((32 * 0) + 7)
-
-#define GPIO_RB_0    ((32 * 1) + 0)
-#define GPIO_RB_1    ((32 * 1) + 1)
-#define GPIO_RB_2    ((32 * 1) + 2)
-#define GPIO_RB_3    ((32 * 1) + 3)
-#define GPIO_RB_4    ((32 * 1) + 4)
-#define GPIO_RB_5    ((32 * 1) + 5)
-#define GPIO_RB_6    ((32 * 1) + 6)
-#define GPIO_RB_7    ((32 * 1) + 7)
-#define GPIO_RB_8    ((32 * 1) + 8)
-#define GPIO_RB_9    ((32 * 1) + 9)
-#define GPIO_RB_10   ((32 * 1) + 10)
-#define GPIO_RB_11   ((32 * 1) + 11)
-#define GPIO_RB_12   ((32 * 1) + 12)
-#define GPIO_RB_13   ((32 * 1) + 13)
-#define GPIO_RB_14   ((32 * 1) + 14)
-#define GPIO_RB_15   ((32 * 1) + 15)
-#define GPIO_RB_16   ((32 * 1) + 16)
-#define GPIO_RB_17   ((32 * 1) + 17)
-#define GPIO_RB_18   ((32 * 1) + 18)
-#define GPIO_RB_19   ((32 * 1) + 19)
-
-#define GPIO_RC_0    ((32 * 2) + 0)
-#define GPIO_RC_1    ((32 * 2) + 1)
-#define GPIO_RC_2    ((32 * 2) + 2)
-#define GPIO_RC_3    ((32 * 2) + 3)
-#define GPIO_RC_4    ((32 * 2) + 4)
-#define GPIO_RC_5    ((32 * 2) + 5)
-#define GPIO_RC_6    ((32 * 2) + 6)
-#define GPIO_RC_7    ((32 * 2) + 7)
-#define GPIO_RC_8    ((32 * 2) + 8)
-#define GPIO_RC_9    ((32 * 2) + 9)
-#define GPIO_RC_10   ((32 * 2) + 10)
-#define GPIO_RC_11   ((32 * 2) + 11)
-#define GPIO_RC_12   ((32 * 2) + 12)
-#define GPIO_RC_13   ((32 * 2) + 13)
-#define GPIO_RC_14   ((32 * 2) + 14)
-#define GPIO_RC_15   ((32 * 2) + 15)
-#define GPIO_RC_16   ((32 * 2) + 16)
-#define GPIO_RC_17   ((32 * 2) + 17)
-#define GPIO_RC_18   ((32 * 2) + 18)
-#define GPIO_RC_19   ((32 * 2) + 19)
-#define GPIO_RC_20   ((32 * 2) + 20)
-#define GPIO_RC_21   ((32 * 2) + 21)
-#define GPIO_RC_22   ((32 * 2) + 22)
-#define GPIO_RC_23   ((32 * 2) + 23)
-#define GPIO_RC_24   ((32 * 2) + 24)
-#define GPIO_RC_25   ((32 * 2) + 25)
-#define GPIO_RC_26   ((32 * 2) + 26)
-#define GPIO_RC_27   ((32 * 2) + 27)
-#define GPIO_RC_28   ((32 * 2) + 28)
-#define GPIO_RC_29   ((32 * 2) + 29)
-#define GPIO_RC_30   ((32 * 2) + 30)
-#define GPIO_RC_31   ((32 * 2) + 31)
-
-#define GPIO_RD_0    ((32 * 3) + 0)
-#define GPIO_RD_1    ((32 * 3) + 1)
-#define GPIO_RD_2    ((32 * 3) + 2)
-#define GPIO_RD_3    ((32 * 3) + 3)
-#define GPIO_RD_4    ((32 * 3) + 4)
-#define GPIO_RD_5    ((32 * 3) + 5)
-#define GPIO_RD_6    ((32 * 3) + 6)
-#define GPIO_RD_7    ((32 * 3) + 7)
-#define GPIO_RD_8    ((32 * 3) + 8)
-#define GPIO_RD_9    ((32 * 3) + 9)
-#define GPIO_RD_10   ((32 * 3) + 10)
-#define GPIO_RD_11   ((32 * 3) + 11)
-
-#define GPIO_RE_0    ((32 * 4) + 0)
-#define GPIO_RE_1    ((32 * 4) + 1)
-#define GPIO_RE_2    ((32 * 4) + 2)
-#define GPIO_RE_3    ((32 * 4) + 3)
-#define GPIO_RE_4    ((32 * 4) + 4)
-#define GPIO_RE_5    ((32 * 4) + 5)
-#define GPIO_RE_6    ((32 * 4) + 6)
-#define GPIO_RE_7    ((32 * 4) + 7)
-
-#define GPIO_RF_0    ((32 * 5) + 0)
-#define GPIO_RF_1    ((32 * 5) + 1)
-#define GPIO_RF_2    ((32 * 5) + 2)
-#define GPIO_RF_3    ((32 * 5) + 3)
-#define GPIO_RF_4    ((32 * 5) + 4)
-#define GPIO_RF_5    ((32 * 5) + 5)
-#define GPIO_RF_6    ((32 * 5) + 6)
-#define GPIO_RF_7    ((32 * 5) + 7)
-#define GPIO_RF_8    ((32 * 5) + 8)
-#define GPIO_RF_9    ((32 * 5) + 9)
-#define GPIO_RF_10   ((32 * 5) + 10)
-#define GPIO_RF_11   ((32 * 5) + 11)
-#define GPIO_RF_12   ((32 * 5) + 12)
-#define GPIO_RF_13   ((32 * 5) + 13)
-#define GPIO_RF_14   ((32 * 5) + 14)
-#define GPIO_RF_15   ((32 * 5) + 15)
-
-#define GPIO_RG_0    ((32 * 6) + 0)
-#define GPIO_RG_1    ((32 * 6) + 1)
-#define GPIO_RG_2    ((32 * 6) + 2)
-#define GPIO_RG_3    ((32 * 6) + 3)
-#define GPIO_RG_4    ((32 * 6) + 4)
-#define GPIO_RG_5    ((32 * 6) + 5)
-#define GPIO_RG_6    ((32 * 6) + 6)
-#define GPIO_RG_7    ((32 * 6) + 7)
-#define GPIO_RG_8    ((32 * 6) + 8)
-#define GPIO_RG_9    ((32 * 6) + 9)
-#define GPIO_RG_10   ((32 * 6) + 10)
-#define GPIO_RG_11   ((32 * 6) + 11)
-#define GPIO_RG_12   ((32 * 6) + 12)
-#define GPIO_RG_13   ((32 * 6) + 13)
-#define GPIO_RG_14   ((32 * 6) + 14)
-#define GPIO_RG_15   ((32 * 6) + 15)
-#define GPIO_RG_16   ((32 * 6) + 16)
-#define GPIO_RG_17   ((32 * 6) + 17)
-#define GPIO_RG_18   ((32 * 6) + 18)
-#define GPIO_RG_19   ((32 * 6) + 19)
-#define GPIO_RG_20   ((32 * 6) + 20)
-#define GPIO_RG_21   ((32 * 6) + 21)
-#define GPIO_RG_22   ((32 * 6) + 22)
-#define GPIO_RG_23   ((32 * 6) + 23)
-#define GPIO_RG_24   ((32 * 6) + 24)
-#define GPIO_RG_25   ((32 * 6) + 25)
-#define GPIO_RG_26   ((32 * 6) + 26)
-#define GPIO_RG_27   ((32 * 6) + 27)
-#define GPIO_RG_28   ((32 * 6) + 28)
-#define GPIO_RG_29   ((32 * 6) + 29)
-#define GPIO_RG_30   ((32 * 6) + 30)
-#define GPIO_RG_31   ((32 * 6) + 31)
-
-#define GPIO_RH_0    ((32 * 7) + 0)
-#define GPIO_RH_1    ((32 * 7) + 1)
-#define GPIO_RH_2    ((32 * 7) + 2)
-#define GPIO_RH_3    ((32 * 7) + 3)
-#define GPIO_RH_4    ((32 * 7) + 4)
-#define GPIO_RH_5    ((32 * 7) + 5)
-#define GPIO_RH_6    ((32 * 7) + 6)
-#define GPIO_RH_7    ((32 * 7) + 7)
-#define GPIO_RH_8    ((32 * 7) + 8)
-#define GPIO_RH_9    ((32 * 7) + 9)
-
-#define GPIO_RI_0    ((32 * 8) + 0)
-#define GPIO_RI_1    ((32 * 8) + 1)
-#define GPIO_RI_2    ((32 * 8) + 2)
-#define GPIO_RI_3    ((32 * 8) + 3)
-#define GPIO_RI_4    ((32 * 8) + 4)
-#define GPIO_RI_5    ((32 * 8) + 5)
-#define GPIO_RI_6    ((32 * 8) + 6)
-#define GPIO_RI_7    ((32 * 8) + 7)
-#define GPIO_RI_8    ((32 * 8) + 8)
-#define GPIO_RI_9    ((32 * 8) + 9)
-#define GPIO_RI_10   ((32 * 8) + 10)
-#define GPIO_RI_11   ((32 * 8) + 11)
-#define GPIO_RI_12   ((32 * 8) + 12)
-#define GPIO_RI_13   ((32 * 8) + 13)
-#define GPIO_RI_14   ((32 * 8) + 14)
-#define GPIO_RI_15   ((32 * 8) + 15)
-
-/*
- * The following section defines extra GPIO available to some boards.
- * These GPIO are generally external to the processor (i.e. SPI/I2C
- * expander chips).
- *
- * Note that these defines show all possible GPIO available, however,
- * depending on the actual board configuration, some GPIO are not
- * available for use.
- */
-#ifdef CONFIG_IP7500MEDIA
-/*
- * U15
- */
-#define IP7500MEDIA_U15_BASE	(32 * 10)
-#define IP7500MEDIA_IO0		(IP7500MEDIA_U15_BASE + 0)
-#define IP7500MEDIA_IO1		(IP7500MEDIA_U15_BASE + 1)
-#define IP7500MEDIA_IO2		(IP7500MEDIA_U15_BASE + 2)
-#define IP7500MEDIA_IO3		(IP7500MEDIA_U15_BASE + 3)
-#define IP7500MEDIA_IO4		(IP7500MEDIA_U15_BASE + 4)
-#define IP7500MEDIA_IO5		(IP7500MEDIA_U15_BASE + 5)
-#define IP7500MEDIA_IO6		(IP7500MEDIA_U15_BASE + 6)
-#define IP7500MEDIA_IO7		(IP7500MEDIA_U15_BASE + 7)
-
-/*
- * U16
- */
-#define IP7500MEDIA_U16_BASE	(32 * 11)
-#define IP7500MEDIA_IO8		(IP7500MEDIA_U16_BASE + 0)
-#define IP7500MEDIA_IO9		(IP7500MEDIA_U16_BASE + 1)
-#define IP7500MEDIA_IO10	(IP7500MEDIA_U16_BASE + 2)
-#define IP7500MEDIA_IO11	(IP7500MEDIA_U16_BASE + 3)
-#define IP7500MEDIA_IO12	(IP7500MEDIA_U16_BASE + 4)
-#define IP7500MEDIA_IO13	(IP7500MEDIA_U16_BASE + 5)
-#define IP7500MEDIA_IO14	(IP7500MEDIA_U16_BASE + 6)
-#define IP7500MEDIA_IO15	(IP7500MEDIA_U16_BASE + 7)
-
-/*
- * U17
- */
-#define IP7500MEDIA_U17_BASE	(32 * 12)
-#define IP7500MEDIA_IO16	(IP7500MEDIA_U17_BASE + 0)
-#define IP7500MEDIA_IO17	(IP7500MEDIA_U17_BASE + 1)
-#define IP7500MEDIA_IO18	(IP7500MEDIA_U17_BASE + 2)
-#define IP7500MEDIA_IO19	(IP7500MEDIA_U17_BASE + 3)
-#define IP7500MEDIA_IO20	(IP7500MEDIA_U17_BASE + 4)
-#define IP7500MEDIA_IO21	(IP7500MEDIA_U17_BASE + 5)
-#define IP7500MEDIA_IO22	(IP7500MEDIA_U17_BASE + 6)
-#define IP7500MEDIA_IO23	(IP7500MEDIA_U17_BASE + 7)
-
-/*
- * U18
- */
-#define IP7500MEDIA_U18_BASE	(32 * 13)
-#define IP7500MEDIA_IO24	(IP7500MEDIA_U18_BASE + 0)
-#define IP7500MEDIA_IO25	(IP7500MEDIA_U18_BASE + 1)
-#define IP7500MEDIA_IO26	(IP7500MEDIA_U18_BASE + 2)
-#define IP7500MEDIA_IO27	(IP7500MEDIA_U18_BASE + 3)
-#define IP7500MEDIA_IO28	(IP7500MEDIA_U18_BASE + 4)
-#define IP7500MEDIA_IO29	(IP7500MEDIA_U18_BASE + 5)
-#define IP7500MEDIA_IO30	(IP7500MEDIA_U18_BASE + 6)
-#define IP7500MEDIA_IO31	(IP7500MEDIA_U18_BASE + 7)
-#endif
-
-#ifdef CONFIG_IP7145DPF
-/*
- * U48
- */
-#define IP7145DPF_U48_BASE	(32 * 10)
-#define IP7145DPF_IO0		(IP7145DPF_U48_BASE + 0)
-#define IP7145DPF_IO1		(IP7145DPF_U48_BASE + 1)
-#define IP7145DPF_IO2		(IP7145DPF_U48_BASE + 2)
-#define IP7145DPF_IO3		(IP7145DPF_U48_BASE + 3)
-#define IP7145DPF_IO4		(IP7145DPF_U48_BASE + 4)
-#define IP7145DPF_IO5		(IP7145DPF_U48_BASE + 5)
-#define IP7145DPF_IO6		(IP7145DPF_U48_BASE + 6)
-#define IP7145DPF_IO7		(IP7145DPF_U48_BASE + 7)
-
-/*
- * U72
- */
-#define IP7145DPF_U72_BASE	(32 * 11)
-#define IP7145DPF_IOB0		(IP7145DPF_U72_BASE + 0)
-#define IP7145DPF_IOB1		(IP7145DPF_U72_BASE + 1)
-#define IP7145DPF_IOB2		(IP7145DPF_U72_BASE + 2)
-#define IP7145DPF_IOB3		(IP7145DPF_U72_BASE + 3)
-#define IP7145DPF_IOB4		(IP7145DPF_U72_BASE + 4)
-#define IP7145DPF_IOB5		(IP7145DPF_U72_BASE + 5)
-#define IP7145DPF_IOB6		(IP7145DPF_U72_BASE + 6)
-#define IP7145DPF_IOB7		(IP7145DPF_U72_BASE + 7)
-#endif
-
-#include <asm-generic/gpio.h>
-
-/*
- * The following macros bypass gpiolib to generate direct references
- * to the port registers.  These assume, minimally, that either
- * gpio_direction_input() or gpio_direction_output() have already been
- * called to setup the pin direction and to enable the pin function to
- * be gpio.  These macros generate the hardware port address based on
- * the assumption that all ports are 32 bits wide (even though we know
- * they are not).  This is so we can efficiently turn pin numbers into
- * port addresses without a lookup.
- *
- * These operations must be done in one instruction to prevent clobbering
- * other thread's accesses to the same port.
- */
-#define UBICOM32_GPIO_ENABLE(pin)				\
-	do {							\
-		asm volatile ("or.4 (%[port]), (%[port]), %[mask]\n\t"						\
-				:										\
-				: [port] "a" (&UBICOM32_IO_PORT(IO_BASE + (gpio_bank(pin) << 12))->gpio_mask),	\
-				  [mask] "d" (gpio_bit(pin))							\
-				: "cc", "memory"								\
-		);												\
-	} while (0);
-
-#define UBICOM32_GPIO_DISABLE(pin)				\
-	do {							\
-		asm volatile ("and.4 (%[port]), (%[port]), %[mask]\n\t"						\
-				:										\
-				: [port] "a" (&UBICOM32_IO_PORT(IO_BASE + (gpio_bank(pin) << 12))->gpio_mask),	\
-				  [mask] "d" (~gpio_bit(pin))							\
-				: "cc", "memory"								\
-		);												\
-	} while (0);
-
-#define UBICOM32_GPIO_SET_PIN_INPUT(pin)			\
-	do {							\
-		asm volatile ("and.4 (%[port]), (%[port]), %[mask]\n\t"						\
-				:										\
-				: [port] "a" (&UBICOM32_IO_PORT(IO_BASE + (gpio_bank(pin) << 12))->gpio_ctl),	\
-				  [mask] "d" (~gpio_bit(pin))							\
-				: "cc", "memory"								\
-		);												\
-	} while (0);
-
-#define UBICOM32_GPIO_SET_PIN_OUTPUT(pin)			\
-	do {							\
-		asm volatile ("or.4 (%[port]), (%[port]), %[mask]\n\t"						\
-				:										\
-				: [port] "a" (&UBICOM32_IO_PORT(IO_BASE + (gpio_bank(pin) << 12))->gpio_ctl),	\
-				  [mask] "d" (gpio_bit(pin))							\
-				: "cc", "memory"								\
-		);												\
-	} while (0);
-
-#define UBICOM32_GPIO_SET_PIN_TOGGLE(pin)			\
-	do {							\
-		asm volatile ("xor.4 (%[port]), (%[port]), %[mask]\n\t"						\
-				:										\
-				: [port] "a" (&UBICOM32_IO_PORT(IO_BASE + (gpio_bank(pin) << 12))->gpio_out),	\
-				  [mask] "d" (gpio_bit(pin))							\
-				: "cc", "memory"								\
-		);												\
-	} while (0);
-
-#define UBICOM32_GPIO_SET_PIN_HIGH(pin)				\
-	do {							\
-		asm volatile ("or.4 (%[port]), (%[port]), %[mask]\n\t"						\
-				:										\
-				: [port] "a" (&UBICOM32_IO_PORT(IO_BASE + (gpio_bank(pin) << 12))->gpio_out),	\
-				  [mask] "d" (gpio_bit(pin))							\
-				: "cc", "memory"								\
-		);												\
-	} while (0);
-
-#define UBICOM32_GPIO_SET_PIN_LOW(pin)				\
-	do {							\
-		asm volatile ("and.4 (%[port]), (%[port]), %[mask]\n\t"						\
-				:										\
-				: [port] "a" (&UBICOM32_IO_PORT(IO_BASE + (gpio_bank(pin) << 12))->gpio_out),	\
-				  [mask] "d" (~gpio_bit(pin))							\
-				: "cc", "memory"								\
-		);												\
-	} while (0);
-
-#define UBICOM32_GPIO_SET_PIN(pin, val) \
-  if ( val ) {                          \
-    UBICOM32_GPIO_SET_PIN_HIGH(pin);    \
-  } else {                              \
-    UBICOM32_GPIO_SET_PIN_LOW(pin);	\
-  }
-
-#define UBICOM32_GPIO_GET_PIN(pin)                                    \
-  (0 != (UBICOM32_IO_PORT(IO_BASE + (gpio_bank(pin) << 12))->gpio_in  \
-	 & gpio_bit(pin)))
-
-
-static inline int gpio_get_value(unsigned gpio)
-{
-  if (gpio <= MAX_UBICOM_ONCHIP_GPIO)
-    return UBICOM32_GPIO_GET_PIN(gpio);
-  else
-    return __gpio_get_value(gpio);
-}
-
-static inline void gpio_set_value(unsigned gpio, int value)
-{
-  if (gpio <= MAX_UBICOM_ONCHIP_GPIO)
-    {
-      UBICOM32_GPIO_SET_PIN(gpio, value);
-    }
-  else
-    {
-      __gpio_set_value(gpio, value);
-    }
-}
-
-static inline int gpio_cansleep(unsigned gpio)
-{
-  return __gpio_cansleep(gpio);
-}
-
-static inline int gpio_to_irq(unsigned gpio)
-{
-#if defined(IP5000) || defined(IP5000_REV2)
-  if ((gpio >= GPIO_RA_4) && (gpio <= GPIO_RA_6))
-    return 25;
-  else
-    return -ENXIO;
-
-#elif defined(IP7000) || defined(IP7000_REV2)
-  if ((gpio >= GPIO_RA_4) && (gpio <= GPIO_RA_6))
-    return 44 + (gpio - GPIO_RA_4);
-  else
-    return -ENXIO;
-
-#else
-    return -ENXIO;
-
-#endif
-}
-
-static inline int irq_to_gpio(unsigned gpio)
-{
-	return -ENXIO;
-}
-
-extern struct ubicom32_io_port *ubi_gpio_get_port(unsigned gpio);
-
-extern int __init ubi_gpio_init(void);
-
-#endif /* _ASM_UBICOM32_GPIO_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/hardirq.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/hardirq.h
deleted file mode 100644
index e230481a1..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/hardirq.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * arch/ubicom32/include/asm/hardirq.h
- *   Definition of ack_bad_irq() for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- * Copyright (C) 1997, 98, 99, 2000, 01, 05 Ralf Baechle (ralf@linux-mips.org)
- * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
- * Copyright (C) 2001 MIPS Technologies, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_HARDIRQ_H
-#define _ASM_UBICOM32_HARDIRQ_H
-
-#include <linux/threads.h>
-#include <linux/irq.h>
-
-/*
- * The hardirq mask has to be large enough to have space
- * for potentially all IRQ sources in the system nesting
- * on a single CPU.  For Ubicom32, we have 64 IRQ sources.
- */
-#define HARDIRQ_BITS	6
-#if (1 << HARDIRQ_BITS) < NR_IRQS
-# error HARDIRQ_BITS is too low!
-#endif
-
-typedef struct {
-	unsigned int __softirq_pending;
-} ____cacheline_aligned irq_cpustat_t;
-
-#include <linux/irq_cpustat.h>	/* Standard mappings for irq_cpustat_t above */
-
-extern void ack_bad_irq(unsigned int irq);
-
-#endif /* _ASM_UBICOM32_HARDIRQ_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/hw_irq.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/hw_irq.h
deleted file mode 100644
index 9dece3108..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/hw_irq.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * arch/ubicom32/include/asm/hw_irq.h
- *   Ubicom32 architecture APIC support.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_HW_IRQ_H
-#define _ASM_UBICOM32_HW_IRQ_H
-
-#endif /* _ASM_UBICOM32_HW_IRQ_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/io.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/io.h
deleted file mode 100644
index ad526a338..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/io.h
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
- * arch/ubicom32/include/asm/io.h
- *   I/O memory accessor functions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_IO_H
-#define _ASM_UBICOM32_IO_H
-
-#ifdef __KERNEL__
-#include <linux/string.h>
-#include <linux/compiler.h>
-
-static inline unsigned short _swapw(volatile unsigned short v)
-{
-    return ((v << 8) | (v >> 8));
-}
-
-static inline unsigned int _swapl(volatile unsigned long v)
-{
-    return ((v << 24) | ((v & 0xff00) << 8) | ((v & 0xff0000) >> 8) | (v >> 24));
-}
-
-#ifndef CONFIG_PCI
-#define readb(addr) \
-    ({ unsigned char __v = (*(volatile unsigned char *) (addr)); __v; })
-#define readw(addr) \
-    ({ unsigned short __v = (*(volatile unsigned short *) (addr)); __v; })
-#define readl(addr) \
-    ({ unsigned int __v = (*(volatile unsigned int *) (addr)); __v; })
-
-#define writeb(b,addr) (void)((*(volatile unsigned char *) (addr)) = (b))
-#define writew(b,addr) (void)((*(volatile unsigned short *) (addr)) = (b))
-#define writel(b,addr) (void)((*(volatile unsigned int *) (addr)) = (b))
-#else /*CONFIG_PCI */
-
-#define PCI_CPU_REG_BASE (0x00000000UL)   /* taking lower 2GB space */
-#define PCI_DEV_REG_BASE (0x80000000UL)
-
-#if PCI_CPU_REG_BASE > PCI_DEV_REG_BASE
-#define IS_PCI_ADDRESS(x) (((unsigned int)(x)&(PCI_CPU_REG_BASE)) == 0)
-#else
-#define IS_PCI_ADDRESS(x) ((unsigned int)(x)&(PCI_DEV_REG_BASE))
-#endif
-
-extern unsigned int ubi32_pci_read_u32(const volatile void __iomem *addr);
-extern unsigned short ubi32_pci_read_u16(const volatile void __iomem *addr);
-extern unsigned char ubi32_pci_read_u8(const volatile void __iomem *addr);
-extern  void ubi32_pci_write_u32(unsigned int val, const volatile void __iomem *addr);
-extern  void ubi32_pci_write_u16(unsigned short val, const volatile void __iomem *addr);
-extern  void ubi32_pci_write_u8(unsigned char val, const volatile void __iomem *addr);
-
-static  inline unsigned char readb(const volatile void __iomem *addr)
-{
-	if (IS_PCI_ADDRESS(addr))
-		return ubi32_pci_read_u8(addr);
-	else
-		return (unsigned char)(*(volatile unsigned char *)addr);
-}
-static inline unsigned short readw(const volatile void __iomem *addr)
-{
-	if (IS_PCI_ADDRESS(addr))
-		return ubi32_pci_read_u16(addr);
-	else
-		return (unsigned short)(*(volatile unsigned short *)addr);
-}
-
-static  inline unsigned int  readl(const volatile void __iomem *addr)
-{
-	if (IS_PCI_ADDRESS(addr))
-		return ubi32_pci_read_u32(addr);
-	else
-		return (unsigned int)(*(volatile unsigned int *)addr);
-}
-
-static inline void writel(unsigned int val, volatile void __iomem *addr)
-{
-	if (IS_PCI_ADDRESS(addr))
-                ubi32_pci_write_u32(val, addr);
-        else
-		*(volatile unsigned int *)addr = val;
-}
-
-static inline void writew(unsigned short val, volatile void __iomem *addr)
-{
-	if (IS_PCI_ADDRESS(addr))
-                ubi32_pci_write_u16(val, addr);
-        else
-		*(volatile unsigned short *)addr = val;
-}
-
-static inline void writeb(unsigned char val, volatile void __iomem *addr)
-{
-	if (IS_PCI_ADDRESS(addr))
-                ubi32_pci_write_u8(val, addr);
-        else
-		*(volatile unsigned char *)addr = val;
-}
-#endif
-
-#define readb_relaxed(addr) readb(addr)
-#define readw_relaxed(addr) readw(addr)
-#define readl_relaxed(addr) readl(addr)
-
-
-#define __raw_readb readb
-#define __raw_readw readw
-#define __raw_readl readl
-#define __raw_writeb writeb
-#define __raw_writew writew
-#define __raw_writel writel
-
-static inline void io_outsb(unsigned int addr, const void *buf, int len)
-{
-	volatile unsigned char *ap = (volatile unsigned char *) addr;
-	unsigned char *bp = (unsigned char *) buf;
-	while (len--)
-		*ap = *bp++;
-}
-
-static inline void io_outsw(unsigned int addr, const void *buf, int len)
-{
-	volatile unsigned short *ap = (volatile unsigned short *) addr;
-	unsigned short *bp = (unsigned short *) buf;
-	while (len--)
-		*ap = _swapw(*bp++);
-}
-
-static inline void io_outsl(unsigned int addr, const void *buf, int len)
-{
-	volatile unsigned int *ap = (volatile unsigned int *) addr;
-	unsigned int *bp = (unsigned int *) buf;
-	while (len--)
-		*ap = _swapl(*bp++);
-}
-
-static inline void io_insb(unsigned int addr, void *buf, int len)
-{
-	volatile unsigned char *ap = (volatile unsigned char *) addr;
-	unsigned char *bp = (unsigned char *) buf;
-	while (len--)
-		*bp++ = *ap;
-}
-
-static inline void io_insw(unsigned int addr, void *buf, int len)
-{
-	volatile unsigned short *ap = (volatile unsigned short *) addr;
-	unsigned short *bp = (unsigned short *) buf;
-	while (len--)
-		*bp++ = _swapw(*ap);
-}
-
-static inline void io_insl(unsigned int addr, void *buf, int len)
-{
-	volatile unsigned int *ap = (volatile unsigned int *) addr;
-	unsigned int *bp = (unsigned int *) buf;
-	while (len--)
-		*bp++ = _swapl(*ap);
-}
-
-#define mmiowb()
-
-/*
- *	make the short names macros so specific devices
- *	can override them as required
- */
-#ifndef CONFIG_PCI
-#define memset_io(a,b,c)	memset((void *)(a),(b),(c))
-#define memcpy_fromio(a,b,c)	memcpy((a),(void *)(b),(c))
-#define memcpy_toio(a,b,c)	memcpy((void *)(a),(b),(c))
-#else
-extern void memcpy_fromio(void *to, const volatile void __iomem *from, unsigned len);
-extern void memcpy_toio(volatile void __iomem *to, const void *from, unsigned len);
-extern void memset_io(volatile void __iomem *addr, int val, size_t count);
-#endif
-
-#define inb(addr)    readb(addr)
-#define inw(addr)    readw(addr)
-#define inl(addr)    readl(addr)
-#define outb(x,addr) ((void) writeb(x,addr))
-#define outw(x,addr) ((void) writew(x,addr))
-#define outl(x,addr) ((void) writel(x,addr))
-
-#define inb_p(addr)    inb(addr)
-#define inw_p(addr)    inw(addr)
-#define inl_p(addr)    inl(addr)
-#define outb_p(x,addr) outb(x,addr)
-#define outw_p(x,addr) outw(x,addr)
-#define outl_p(x,addr) outl(x,addr)
-
-#define outsb(a,b,l) io_outsb(a,b,l)
-#define outsw(a,b,l) io_outsw(a,b,l)
-#define outsl(a,b,l) io_outsl(a,b,l)
-
-#define insb(a,b,l) io_insb(a,b,l)
-#define insw(a,b,l) io_insw(a,b,l)
-#define insl(a,b,l) io_insl(a,b,l)
-
-#ifndef CONFIG_PCI
-#define ioread8_rep(a,d,c)	insb(a,d,c)
-#define ioread16_rep(a,d,c)	insw(a,d,c)
-#define ioread32_rep(a,d,c)	insl(a,d,c)
-#define iowrite8_rep(a,s,c)	outsb(a,s,c)
-#define iowrite16_rep(a,s,c)	outsw(a,s,c)
-#define iowrite32_rep(a,s,c)	outsl(a,s,c)
-#else
-extern void  ioread8_rep(void __iomem *port, void *buf, unsigned long count);
-extern void  ioread16_rep(void __iomem *port, void *buf, unsigned long count);
-extern void  ioread32_rep(void __iomem *port, void *buf, unsigned long count);
-extern void  iowrite8_rep(void __iomem *port, const void *buf, unsigned long count);
-extern void  iowrite16_rep(void __iomem *port, const void *buf, unsigned long count);
-extern void  iowrite32_rep(void __iomem *port, const void *buf, unsigned long count);
-#endif
-
-
-#ifndef CONFIG_PCI
-#define ioread8(X)			readb(X)
-#define ioread16(X)			readw(X)
-#define ioread32(X)			readl(X)
-#define iowrite8(val,X)			writeb(val,X)
-#define iowrite16(val,X)		writew(val,X)
-#define iowrite32(val,X)		writel(val,X)
-#else /*CONFIG_PCI */
-extern  unsigned char  ioread8(void __iomem *addr);
-extern  unsigned short ioread16(void __iomem *addr);
-extern  unsigned int  ioread32(void __iomem *addr);
-extern  void iowrite8(unsigned char val, void __iomem *addr);
-extern  void iowrite16(unsigned short val, void __iomem *addr);
-extern  void iowrite32(unsigned int val, void __iomem *addr);
-#endif /* CONFIG_PCI */
-
-#define IO_SPACE_LIMIT 0xffff
-
-/* Values for nocacheflag and cmode */
-#define IOMAP_FULL_CACHING		0
-#define IOMAP_NOCACHE_SER		1
-#define IOMAP_NOCACHE_NONSER		2
-#define IOMAP_WRITETHROUGH		3
-
-extern void *__ioremap(unsigned long physaddr, unsigned long size, int cacheflag);
-extern void __iounmap(void *addr, unsigned long size);
-
-static inline void *ioremap(unsigned long physaddr, unsigned long size)
-{
-	return __ioremap(physaddr, size, IOMAP_NOCACHE_SER);
-}
-static inline void *ioremap_nocache(unsigned long physaddr, unsigned long size)
-{
-	return __ioremap(physaddr, size, IOMAP_NOCACHE_SER);
-}
-static inline void *ioremap_writethrough(unsigned long physaddr, unsigned long size)
-{
-	return __ioremap(physaddr, size, IOMAP_WRITETHROUGH);
-}
-static inline void *ioremap_fullcache(unsigned long physaddr, unsigned long size)
-{
-	return __ioremap(physaddr, size, IOMAP_FULL_CACHING);
-}
-
-extern void iounmap(void *addr);
-
-#define ioport_map(port, nr)            ((void __iomem*)(port))
-#define ioport_unmap(addr)
-
-
-/* Pages to physical address... */
-#define page_to_phys(page)      ((page - mem_map) << PAGE_SHIFT)
-#define page_to_bus(page)       ((page - mem_map) << PAGE_SHIFT)
-
-/*
- * Macros used for converting between virtual and physical mappings.
- */
-#define phys_to_virt(vaddr)	((void *) (vaddr))
-#define virt_to_phys(vaddr)	((unsigned long) (vaddr))
-
-#define virt_to_bus virt_to_phys
-#define bus_to_virt phys_to_virt
-
-/*
- * Convert a physical pointer to a virtual kernel pointer for /dev/mem
- * access
- */
-#define xlate_dev_mem_ptr(p)	__va(p)
-
-/*
- * Convert a virtual cached pointer to an uncached pointer
- */
-#define xlate_dev_kmem_ptr(p)	p
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_UBICOM32_IO_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ioctl.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/ioctl.h
deleted file mode 100644
index 10d8dd75f..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ioctl.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * arch/ubicom32/include/asm/ioctl.h
- *   Generic ioctl.h for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_IOCTL_H
-#define _ASM_UBICOM32_IOCTL_H
-
-#include <asm-generic/ioctl.h>
-
-#endif /* _ASM_UBICOM32_IOCTL_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ioctls.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/ioctls.h
deleted file mode 100644
index c8e2c7901..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ioctls.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * arch/ubicom32/include/asm/ioctls.h
- *   Definitions of ioctls for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_IOCTLS_H
-#define _ASM_UBICOM32_IOCTLS_H
-
-#include <asm/ioctl.h>
-
-/* 0x54 is just a magic number to make these relatively unique ('T') */
-
-#define TCGETS		0x5401
-#define TCSETS		0x5402
-#define TCSETSW		0x5403
-#define TCSETSF		0x5404
-#define TCGETA		0x5405
-#define TCSETA		0x5406
-#define TCSETAW		0x5407
-#define TCSETAF		0x5408
-#define TCSBRK		0x5409
-#define TCXONC		0x540A
-#define TCFLSH		0x540B
-#define TIOCEXCL	0x540C
-#define TIOCNXCL	0x540D
-#define TIOCSCTTY	0x540E
-#define TIOCGPGRP	0x540F
-#define TIOCSPGRP	0x5410
-#define TIOCOUTQ	0x5411
-#define TIOCSTI		0x5412
-#define TIOCGWINSZ	0x5413
-#define TIOCSWINSZ	0x5414
-#define TIOCMGET	0x5415
-#define TIOCMBIS	0x5416
-#define TIOCMBIC	0x5417
-#define TIOCMSET	0x5418
-#define TIOCGSOFTCAR	0x5419
-#define TIOCSSOFTCAR	0x541A
-#define FIONREAD	0x541B
-#define TIOCINQ		FIONREAD
-#define TIOCLINUX	0x541C
-#define TIOCCONS	0x541D
-#define TIOCGSERIAL	0x541E
-#define TIOCSSERIAL	0x541F
-#define TIOCPKT		0x5420
-#define FIONBIO		0x5421
-#define TIOCNOTTY	0x5422
-#define TIOCSETD	0x5423
-#define TIOCGETD	0x5424
-#define TCSBRKP		0x5425	/* Needed for POSIX tcsendbreak() */
-#define TIOCSBRK	0x5427  /* BSD compatibility */
-#define TIOCCBRK	0x5428  /* BSD compatibility */
-#define TIOCGSID	0x5429  /* Return the session ID of FD */
-#define TCGETS2		_IOR('T',0x2A, struct termios2)
-#define TCSETS2		_IOW('T',0x2B, struct termios2)
-#define TCSETSW2	_IOW('T',0x2C, struct termios2)
-#define TCSETSF2	_IOW('T',0x2D, struct termios2)
-#define TIOCGPTN	_IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
-#define TIOCSPTLCK	_IOW('T',0x31, int)  /* Lock/unlock Pty */
-
-#define FIONCLEX	0x5450  /* these numbers need to be adjusted. */
-#define FIOCLEX		0x5451
-#define FIOASYNC	0x5452
-#define TIOCSERCONFIG	0x5453
-#define TIOCSERGWILD	0x5454
-#define TIOCSERSWILD	0x5455
-#define TIOCGLCKTRMIOS	0x5456
-#define TIOCSLCKTRMIOS	0x5457
-#define TIOCSERGSTRUCT	0x5458 /* For debugging only */
-#define TIOCSERGETLSR   0x5459 /* Get line status register */
-#define TIOCSERGETMULTI 0x545A /* Get multiport config  */
-#define TIOCSERSETMULTI 0x545B /* Set multiport config */
-
-#define TIOCMIWAIT	0x545C	/* wait for a change on serial input line(s) */
-#define TIOCGICOUNT	0x545D	/* read serial port inline interrupt counts */
-#define FIOQSIZE	0x545E
-
-/* Used for packet mode */
-#define TIOCPKT_DATA		 0
-#define TIOCPKT_FLUSHREAD	 1
-#define TIOCPKT_FLUSHWRITE	 2
-#define TIOCPKT_STOP		 4
-#define TIOCPKT_START		 8
-#define TIOCPKT_NOSTOP		16
-#define TIOCPKT_DOSTOP		32
-
-#define TIOCSER_TEMT    0x01	/* Transmitter physically empty */
-
-#endif /* _ASM_UBICOM32_IOCTLS_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ip5000-asm.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/ip5000-asm.h
deleted file mode 100644
index 62929e49f..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ip5000-asm.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * arch/ubicom32/include/asm/ip5000-asm.h
- *	Instruction macros for the IP5000.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#ifndef _ASM_UBICOM32_IP5000_ASM_H
-#define _ASM_UBICOM32_IP5000_ASM_H
-
-#if !defined(__LINKER__)
-
-#if defined(__ASSEMBLY__)
-.macro	cycles	quant
-.if	(\quant) == 1
-	nop
-.else
-.if	(((\quant) + 3) / 8) > 0
-.rept	(((\quant) + 3) / 8)
-	jmpt.f		.+4
-.endr
-.endif
-.if	((((\quant) + 3) % 8) / 4) > 0
-	jmpt.t		.+4
-.endif
-.endif
-.endm
-#else
-/*
- * Same macro as above just in C inline asm
- */
-asm ("					\n\
-.macro	cycles	quant			\n\
-.if	(\\quant) == 1			\n\
-	nop				\n\
-.else					\n\
-.if	(((\\quant) + 3) / 8) > 0	\n\
-.rept	(((\\quant) + 3) / 8)		\n\
-	jmpt.f		.+4		\n\
-.endr					\n\
-.endif					\n\
-.if	((((\\quant) + 3) % 8) / 4) > 0	\n\
-	jmpt.t		.+4		\n\
-.endif					\n\
-.endif					\n\
-.endm					\n\
-");
-#endif
-
-
-#if defined(__ASSEMBLY__)
-.macro	pipe_flush	cyc
-	cycles		11 - (\cyc)
-.endm
-#else
-/*
- * Same macro as above just in C inline asm
- */
-asm ("					\n\
-.macro	pipe_flush	cyc		\n\
-	cycles		11 - (\\cyc)	\n\
-.endm					\n\
-");
-
-#endif
-
-#if defined(__ASSEMBLY__)
-.macro	setcsr_flush	cyc
-	cycles		5 - (\cyc)
-.endm
-#else
-/*
- * Same macro as above just in C inline asm
- */
-asm ("					\n\
-.macro	setcsr_flush	cyc		\n\
-	cycles		5 - (\\cyc)	\n\
-.endm					\n\
-");
-#endif
-
-/*
- * Macros for prefetch (using miss-aligned memory write)
- */
-#if defined(__ASSEMBLY__)
-
-.macro	pre_fetch_macro	thread_num, Ascratch, Aaddress length
-	bclr		MT_TRAP_EN, MT_TRAP_EN, #(\thread_num)
-	bset		\Ascratch, \Aaddress, #0	; force a miss-aligned address
-	jmpt.t		.+4				; delay for both address setup and trap disable
-	move.4		(\Ascratch), #0
-	.if		(\length > 32)
-	move.4		32(\Ascratch), #0
-	.endif
-	.if		(\length > 64)
-	move.4		64(\Ascratch), #0
-	.endif
-	.if		(\length > 96)
-	move.4		96(\Ascratch), #0
-	.endif
-	.if		(\length > 128)
-	invalid_instruction				; maximum pre-fetch size is 4 cache lines
-	.endif
-	bset		MT_TRAP_EN, MT_TRAP_EN, #(\thread_num)
-.endm
-
-#else
-/*
- * Same macro as above just in C inline asm
- */
-asm ("								\n\
-.macro	pre_fetch_macro	thread_num, Ascratch, Aaddress length	\n\
-	bclr		MT_TRAP_EN, MT_TRAP_EN, #(\thread_num)	\n\
-	bset		\\Ascratch, \\Aaddress, #0	; force a miss-aligned address \n\
-	jmpt.t		.+4				; delay for both address setup and trap disable \n\
-	move.4		(\\Ascratch), #0			\n\
-	.if		(\\length > 32)				\n\
-	move.4		32(\\Ascratch), #0			\n\
-	.endif							\n\
-	.if		(\\length > 64)				\n\
-	move.4		64(\\Ascratch), #0			\n\
-	.endif							\n\
-	.if		(\\length > 96)				\n\
-	move.4		96(\\Ascratch), #0			\n\
-	.endif							\n\
-	.if		(\\length > 128)			\n\
-	invalid_instruction				; maximum pre-fetch size is 4 cache lines \n\
-	.endif							\n\
-	bset		MT_TRAP_EN, MT_TRAP_EN, #(\\thread_num)	\n\
-.endm								\n\
-");
-#endif
-
-#endif /* !defined(__LINKER__) */
-#endif /* defined _ASM_UBICOM32_IP5000_ASM_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ip5000.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/ip5000.h
deleted file mode 100644
index b616ebe5f..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ip5000.h
+++ /dev/null
@@ -1,845 +0,0 @@
-/*
- * arch/ubicom32/include/asm/ip5000.h
- *   Specific details for the Ubicom IP5000 processor.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#ifndef _ASM_UBICOM32_IP5000_H
-#define _ASM_UBICOM32_IP5000_H
-
-#include <asm/memory_map.h>
-
-/*
- * Inline assembly define
- */
-#define S(arg) #arg
-#define D(arg) S(arg)
-
-/*
- * Assembler include file
- */
-#include <asm/ip5000-asm.h>
-
-/*
- * Timing
- */
-#define JMPT_PENALTY 3
-#define JMPF_PENALTY 7
-#define RET_PENALTY 7
-
-/*
- * Threads
- */
-#if defined(IP5000) || defined(IP5000_REV2)
-#define THREAD_COUNT 10
-#elif defined(IP7000) || defined(IP7000_REV2)
-#define THREAD_COUNT 12
-#else
-#error "Unknown IP5K silicon"
-#endif
-
-/*
- * Arch
- */
-#if defined(IP5000) || defined(IP5000_REV2)
-#define UBICOM32_ARCH_VERSION 3
-#elif defined(IP7000) || defined(IP7000_REV2)
-#define UBICOM32_ARCH_VERSION 4
-#else
-#error "Unknown IP5K silicon"
-#endif
-
-
-/*
- * Registers
- */
-#define ROSR_INT (1 << 0)
-
-/* Interrupts */
-#define INT_CHIP(reg, bit) (((reg) << 5) | (bit))
-#define INT_REG(interrupt) (((interrupt) >> 5) * 4)
-#define INT_SET(interrupt) 0x0114 + INT_REG(interrupt)
-#define INT_CLR(interrupt) 0x0124 + INT_REG(interrupt)
-#define INT_STAT(interrupt) 0x0104 + INT_REG(interrupt)
-#define INT_MASK(interrupt) 0x00C0 + INT_REG(interrupt)
-#define INT_BIT(interrupt) ((interrupt) & 0x1F)
-#define INT_BIT_MASK(interrupt) (1 << INT_BIT(interrupt))
-
-/*
- * The LOCK_INT and THREAD_INT are used to wake up corresponding thread. They are sharing
- * the same set of SW interrupt resource.
- *
- * LOCK_INT(n): One SW INT per NRT thread that can participate lock operation.
- *	The threads that can participate lock are application threads and DSR thread.
- *	(Lock locks - numbers are hard-coded in lock.h)
- * THREAD_INT(n):   One SW INT per HRT thread for wake up trigger.
- */
-#define LOCK_INT(thread)	INT_CHIP(0, (thread))
-#define THREAD_INT(thread)	INT_CHIP(0, (thread))
-
-/*
- * The SYSTEM_INT and DSR_INT are sharing the same set of SW interrupt resource.
- *
- * SYSTEM_INT(n): One SW INT per NRT threads (application threads) as system queue interrupt,
- *	and for DSR as self-trigger interrupt.
- *	(The application threads include at least thread 0)
- * DSR_INT(n):    One SW INT per HRT thread to request DSR service.
- */
-#define SYSTEM_INT(thread)	INT_CHIP(0, THREAD_COUNT + (thread))
-#define DSR_INT(thread)		INT_CHIP(0, THREAD_COUNT + (thread))
-
-/* GLOBAL_CTRL */
-#define GLOBAL_CTRL_TRAP_RST_EN (1 << 9)
-#define GLOBAL_CTRL_AERROR_RST_EN (1 << 8)
-#define GLOBAL_CTRL_MT_MIN_DELAY(x) ((x) << 3)
-#define GLOBAL_CTRL_HRT_BANK_SELECT (1 << 2)
-#define GLOBAL_CTRL_INT_EN (1 << 0)
-
-/*
- * HRT Tables
- */
-#define HRT_TABLE0_BASE 0x0800
-#define HRT_TABLE1_BASE 0x0900
-#define HRT_TABLE_SIZE 64
-
-/*
- * Break Point Trap Register
- */
-#define ASYNCERROR_INT INT_CHIP(0, 31)
-#define BREAKPOINT_INT INT_CHIP(1, 31)
-
-/*
- * Port interrupts
- *	The non-existing FIFO INTs are mapped to INT2 for the ports.
- */
-#define IO_PORT_PTR_TO_NUM(port) (((port) & 0x0000ffff) >> 12)
-#define RX_FIFO_INT(port) \
-	((IO_PORT_PTR_TO_NUM(port) == 0) ? INT_CHIP(0, 25) : \
-	((IO_PORT_PTR_TO_NUM(port) == 1) ? INT_CHIP(0, 26) : \
-	((IO_PORT_PTR_TO_NUM(port) == 2) ? INT_CHIP(0, 29) : \
-	((IO_PORT_PTR_TO_NUM(port) == 3) ? INT_CHIP(1, 24) : \
-	((IO_PORT_PTR_TO_NUM(port) == 4) ? INT_CHIP(1, 27) : \
-	((IO_PORT_PTR_TO_NUM(port) == 5) ? INT_CHIP(1, 16) : \
-	((IO_PORT_PTR_TO_NUM(port) == 6) ? INT_CHIP(1, 19) : \
-	((IO_PORT_PTR_TO_NUM(port) == 7) ? INT_CHIP(1, 20) : \
-	((IO_PORT_PTR_TO_NUM(port) == 8) ? INT_CHIP(1, 21) : \
-	INT_CHIP(1, 15))))))))))
-#define TX_FIFO_INT(port) \
-	((IO_PORT_PTR_TO_NUM(port) == 0) ? INT_CHIP(0, 24) : \
-	((IO_PORT_PTR_TO_NUM(port) == 1) ? INT_CHIP(0, 27) : \
-	((IO_PORT_PTR_TO_NUM(port) == 2) ? INT_CHIP(0, 29) : \
-	((IO_PORT_PTR_TO_NUM(port) == 3) ? INT_CHIP(1, 25) : \
-	((IO_PORT_PTR_TO_NUM(port) == 4) ? INT_CHIP(1, 28) : \
-	((IO_PORT_PTR_TO_NUM(port) == 5) ? INT_CHIP(1, 17) : \
-	((IO_PORT_PTR_TO_NUM(port) == 6) ? INT_CHIP(1, 19) : \
-	((IO_PORT_PTR_TO_NUM(port) == 7) ? INT_CHIP(1, 20) : \
-	((IO_PORT_PTR_TO_NUM(port) == 8) ? INT_CHIP(1, 22) : \
-	INT_CHIP(1, 15))))))))))
-#define PORT_OTHER_INT(port) \
-	((IO_PORT_PTR_TO_NUM(port) == 0) ? INT_CHIP(0, 25) : \
-	((IO_PORT_PTR_TO_NUM(port) == 1) ? INT_CHIP(0, 28) : \
-	((IO_PORT_PTR_TO_NUM(port) == 2) ? INT_CHIP(0, 29) : \
-	((IO_PORT_PTR_TO_NUM(port) == 3) ? INT_CHIP(1, 26) : \
-	((IO_PORT_PTR_TO_NUM(port) == 4) ? INT_CHIP(1, 29) : \
-	((IO_PORT_PTR_TO_NUM(port) == 5) ? INT_CHIP(1, 18) : \
-	((IO_PORT_PTR_TO_NUM(port) == 6) ? INT_CHIP(1, 19) : \
-	((IO_PORT_PTR_TO_NUM(port) == 7) ? INT_CHIP(1, 20) : \
-	((IO_PORT_PTR_TO_NUM(port) == 8) ? INT_CHIP(1, 23) : \
-	INT_CHIP(1, 15))))))))))
-
-/*
- * On Chip Peripherals Base.
- */
-#define OCP_BASE	0x01000000
-#define OCP_GENERAL	0x000
-#define OCP_TIMERS	0x100
-#define OCP_TRNG	0x200	/* True Random Number Generator Control Reigsters */
-#define OCP_DEBUG	0x300
-#define OCP_SECURITY	0x400
-#define OCP_ICCR	0x500	/* I-Cache Control Registers */
-#define OCP_DCCR	0x600	/* D-Cache Control Registers */
-#define OCP_OCMC	0x700	/* On Chip Memory Control Registers */
-#define OCP_STATISTICS	0x800	/* Statistics Counters */
-#define OCP_MTEST	0x900	/* Memory Test Registers */
-#define OCP_MCFG	0xa00	/* Memory Configuration Registers -- IP7000 only */
-#define OCP_DEBUG_INST	0x000	/* Up to 16M */
-
-/*
- * General Configuration Registers (PLL)
- */
-#define GENERAL_CFG_BASE (OCP_BASE + OCP_GENERAL)
-#define GEN_CLK_CORE_CFG 0x00
-#define GEN_CLK_IO_CFG 0x04
-#define GEN_CLK_DDR_CFG 0x08
-#define GEN_CLK_DDRDS_CFG 0x0c
-#define GEN_CLK_SLIP_CLR 0x10
-#define GEN_CLK_SLIP_START 0x14
-#define GEN_CLK_SERDES_SEL 0x18	/* IP7000 only */
-#define GEN_CLK_DDR_CFG2 0x1c	/* IP7000 only */
-#define GEN_DDR_CAL_CTRL 0x30	/* IP5000 only */
-#define GEN_DDR_CAL_STAT 0x34	/* IP5000 only */
-#define GEN_USB_DFT_CTRL 0x38	/* IP5000 only */
-#define GEN_USB_DFT_STAT 0x3c	/* IP5000 only */
-#define GEN_USB_PHY_CFG 0x40	/* IP7000 only */
-#define GEN_USB_PHY_TEST 0x44	/* IP7000 only */
-#define GEN_USB_PHY_STAT 0x48	/* IP7000 only */
-#define GEN_SW_RESET 0x80
-#define GEN_RESET_REASON 0x84
-#define GEN_BOND_CFG 0x88
-#define GEN_IO_PU_CFG 0x8c
-#define GEN_MEM_RM_CFG 0x90
-#define GEN_IO_CONFIG 0x94
-
-#define GEN_CLK_PLL_SECURITY_BIT_NO 31
-#define GEN_CLK_PLL_SECURITY (1 << GEN_CLK_PLL_SECURITY_BIT_NO)
-#define GEN_CLK_PLL_ENSAT (1 << 30)
-#define GEN_CLK_PLL_FASTEN (1 << 29)
-#define GEN_CLK_PLL_NR(v) (((v) - 1) << 23)
-#define GEN_CLK_PLL_NF(v) (((v) - 1) << 11)
-#define GEN_CLK_PLL_OD(v) (((v) - 1) << 8)
-#define GEN_CLK_PLL_RESET (1 << 7)
-#define GEN_CLK_PLL_BYPASS (1 << 6)
-#define GEN_CLK_PLL_POWERDOWN (1 << 5)
-#define GEN_CLK_PLL_SELECT (1 << 4)
-
-#define GEN_GET_CLK_PLL_NR(v) ((((v) >> 23) & 0x003f) + 1)
-#define GEN_GET_CLK_PLL_NF(v) ((((v) >> 11) & 0x0fff) + 1)
-#define GEN_GET_CLK_PLL_OD(v) ((((v) >> 8) & 0x7) + 1)
-
-
-#define RESET_FLAG_DST_MEM_ERROR (1 << 18)
-#define RESET_FLAG_SRC1_MEM_ERROR (1 << 17)
-#define RESET_FLAG_WRITE_ADDR (1 << 16)
-#define RESET_FLAG_DST_SYNC_ERROR (1 << 15)
-#define RESET_FLAG_SRC1_SYNC_ERROR (1 << 14)
-#define RESET_FLAG_DST_ALGN_ERROR (1 << 13)
-#define RESET_FLAG_SRC1_ALGN_ERROR (1 << 12)
-#define RESET_FLAG_DST_ADDR_ERROR (1 << 11)
-#define RESET_FLAG_SRC1_ADDR_ERROR (1 << 10)
-#define RESET_FLAG_ILLEGAL_INST (1 << 9)
-#define RESET_FLAG_INST_SYNC_ERROR (1 << 8)
-#define RESET_FLAG_INST_ADDR_ERROR (1 << 7)
-#define RESET_FLAG_DATA_PORT_ERROR (1 << 6)
-#define RESET_FLAG_INST_PORT_ERROR (1 << 5)
-#define RESET_FLAG_SW_RESET (1 << 4)
-#define RESET_FLAG_DEBUG (1 << 3)
-#define RESET_FLAG_WATCHDOG (1 << 2)
-#define RESET_FLAG_POWER_ON (1 << 1)
-#define RESET_FLAG_EXTERNAL (1 << 0)
-
-/*
- * Timer block
- */
-#define TIMER_BASE (OCP_BASE + OCP_TIMERS)
-#define TIMER_MPTVAL 0x00
-#define TIMER_RTCOM 0x04
-#define TIMER_TKEY 0x08
-#define TIMER_WDCOM 0x0c
-#define TIMER_WDCFG 0x10
-#define TIMER_SYSVAL 0x14
-#define TIMER_SYSCOM(tmr) (0x18 + (tmr) * 4)
-#define TIMER_TRN_CFG 0x100
-#define TIMER_TRN 0x104
-
-#define TIMER_COUNT 10
-#define TIMER_INT(tmr) INT_CHIP(1, (tmr))
-#define TIMER_TKEYVAL 0xa1b2c3d4
-#define TIMER_WATCHDOG_DISABLE 0x4d3c2b1a
-#define TIMER_TRN_CFG_ENABLE_OSC 0x00000007
-
-#ifndef __ASSEMBLY__
-/*
- * ubicom32_io_timer
- */
-struct ubicom32_io_timer {
-	volatile u32_t mptval;
-	volatile u32_t rtcom;
-	volatile u32_t tkey;
-	volatile u32_t wdcom;
-	volatile u32_t wdcfg;
-	volatile u32_t sysval;
-	volatile u32_t syscom[TIMER_COUNT];
-	volatile u32_t reserved[64 - 6 - TIMER_COUNT];	// skip all the way to OCP-TRNG section
-	volatile u32_t rsgcfg;
-	volatile u32_t trn;
-};
-
-#define UBICOM32_IO_TIMER ((struct ubicom32_io_timer *)TIMER_BASE)
-#endif
-
-#define UBICOM32_VECTOR_TO_TIMER_INDEX(vector) (vector - TIMER_INT(0))
-
-/*
- * OCP-Debug Module (Mailbox)
- */
-#define ISD_MAILBOX_BASE (OCP_BASE + OCP_DEBUG)
-#define ISD_MAILBOX_IN 0x00
-#define ISD_MAILBOX_OUT 0x04
-#define ISD_MAILBOX_STATUS 0x08
-
-#define ISD_MAILBOX_INT INT_CHIP(1, 30)
-
-#define ISD_MAILBOX_STATUS_IN_FULL (1 << 31)
-#define ISD_MAILBOX_STATUS_IN_EMPTY (1 << 30)
-#define ISD_MAILBOX_STATUS_OUT_FULL (1 << 29)
-#define ISD_MAILBOX_STATUS_OUT_EMPTY (1 << 28)
-
-/*
- * OCP-Security
- */
-#define SECURITY_BASE (OCP_BASE + OCP_SECURITY)
-#define SECURITY_BASE_EFFECTIVE_ADDRESS (SECURITY_BASE >> 7) // To load the base address in a single instruction
-#define SECURITY_CTRL 0x00
-#define SECURITY_CTRL_BYTE_OFFSET(x) ((x) << 16)
-#define SECURITY_CTRL_KEY_SIZE(x) ((x) << 8)
-#define SECURITY_CTRL_HASH_ALG_NONE (0 << 4)
-#define SECURITY_CTRL_HASH_ALG_MD5 (1 << 4)
-#define SECURITY_CTRL_HASH_ALG_SHA1 (2 << 4)
-#define SECURITY_CTRL_CBC (1 << 3)
-#define SECURITY_CTRL_CIPHER_ALG_AES (0 << 1)
-#define SECURITY_CTRL_CIPHER_ALG_NONE (1 << 1)
-#define SECURITY_CTRL_CIPHER_ALG_DES (2 << 1)
-#define SECURITY_CTRL_CIPHER_ALG_3DES (3 << 1)
-#define SECURITY_CTRL_ENCIPHER (1 << 0)
-#define SECURITY_CTRL_DECIPHER (0 << 0)
-#define SECURITY_STAT 0x04
-#define SECURITY_STAT_BUSY (1 << 0)
-#define SECURITY_KEY_VALUE(x) (0x10 + (x) * 4)
-#define SECURITY_KEY_IN(x) (0x30 + (x) * 4)
-#define SECURITY_KEY_OUT(x) (0x50 + (x) * 4)
-#define SECURITY_KEY_HASH(x) (0x70 + (x) * 4)
-
-/*
- * OCP-ICCR
- */
-#define ICCR_BASE (OCP_BASE + OCP_ICCR)
-#define ICACHE_TOTAL_SIZE 16384			/* in bytes */
-
-/*
- * OCP-DCCR
- */
-#define DCCR_BASE (OCP_BASE + OCP_DCCR)
-#if defined(IP5000) || defined(IP5000_REV2)
-#define DCACHE_TOTAL_SIZE 8192			/* in bytes */
-#elif defined(IP7000) || defined(IP7000_REV2)
-#define DCACHE_TOTAL_SIZE 16384			/* in bytes */
-#endif
-
-#if defined(IP5000) || defined(IP5000_REV2) || defined(IP7000) || defined(IP7000_REV2)
-#define DCACHE_WRITE_QUEUE_LENGTH 6
-#else
-#error "Unknown IP5K silicon"
-#endif
-
-#define CACHE_LINE_SIZE 32			/* in bytes */
-
-#define CCR_ADDR 0x00
-#define CCR_RDD 0x04
-#define CCR_WRD 0x08
-#define CCR_STAT 0x0c
-#define CCR_CTRL 0x10
-
-#define CCR_STAT_MCBE 0
-#define CCR_STAT_WIDEL 1			/* D-cache only */
-
-#define CCR_CTRL_DONE 0
-#define CCR_CTRL_RESET 2
-#define CCR_CTRL_VALID 3
-#define CCR_CTRL_RD_DATA (1 << 4)
-#define CCR_CTRL_RD_TAG (2 << 4)
-#define CCR_CTRL_WR_DATA (3 << 4)
-#define CCR_CTRL_WR_TAG (4 << 4)
-#define CCR_CTRL_INV_INDEX (5 << 4)
-#define CCR_CTRL_INV_ADDR (6 << 4)
-#define CCR_CTRL_FLUSH_INDEX (7 << 4)		/* D-cache only */
-#define CCR_CTRL_FLUSH_INV_INDEX (8 << 4)	/* D-cache only */
-#define CCR_CTRL_FLUSH_ADDR (9 << 4)		/* D-cache only */
-#define CCR_CTRL_FLUSH_INV_ADDR (10 << 4)	/* D-cache only */
-
-/*
- * OCP-OCMC
- */
-#define OCMC_BASE (OCP_BASE + OCP_OCMC)
-#define OCMC_BANK_MASK 0x00
-#define OCMC_BIST_CNTL 0x04	/* IP5000 only */
-#define OCMC_BIST_STAT 0x08	/* IP5000 only */
-
-#define OCMC_BANK_PROG(n) ((1<<(n))-1)
-
-#define OCMC_BIST_WRCK (1 << 7)
-#define OCMC_BIST_RESET (1 << 5)
-#define OCMC_BIST_SMART (1 << 4)
-#define OCMC_BIST_RUN (1 << 3)
-#define OCMC_BIST_REPAIR (1 << 2)
-
-#define OCMC_BIST_READY (1 << 3)
-#define OCMC_BIST_FAIL (1 << 2)
-
-/*
- * OCP-STATISTICS
- */
-#define STATISTICS_BASE (OCP_BASE + OCP_STATISTICS)
-#define STAT_COUNTER_CTRL(n) ((n)*8)
-#define STAT_COUNTER(n) ((n)*8 + 4)
-
-#define STAT_EVENT_MP_INST 0
-#define STAT_EVENT_OCM_ACCESS 4
-#define STAT_EVENT_OCM_REQ 5
-#define STAT_EVENT_IC_REQ_INVAL 13
-#define STAT_EVENT_IC_MISS_INVAL 14
-#define STAT_EVENT_IC_REQ_INVAL_NACK 15
-#define STAT_EVENT_IC_REQ_VAL 16
-#define STAT_EVENT_IC_MISS_VAL 17
-#define STAT_EVENT_IC_REQ_VAL_NACK 18
-#define STAT_EVENT_IC_MISS_Q 19
-#define STAT_EVENT_DC_RD_REQ 20
-#define STAT_EVENT_DC_RD_MISS 21
-#define STAT_EVENT_DC_WR_REQ 22
-#define STAT_EVENT_DC_WR_MISS 23
-#define STAT_EVENT_DC_MISS_Q 24
-#define STAT_EVENT_DC_WB_FULL 25
-#define STAT_EVENT_DC_REQ_NACK 26
-#define STAT_EVENT_DC_CORE_REQ 27
-#define STAT_EVENT_DC_MISS 28
-#define STAT_EVENT_DC_EVICT 29
-#define STAT_EVENT_TRUE 30
-#define STAT_EVENT_FALSE 31
-
-/*
- * OCP_MTEST
- */
-#define MTEST_BASE (OCP_BASE + OCP_MTEST)
-#define MTEST_ADDR 0x00
-#define MTEST_WR 0x04
-#define MTEST_RD 0x08
-#define MTEST_CTRL 0x0c
-
-/*
- * OCP_MCFG (IP7000 only)
- */
-#define MCFG_BASE (OCP_BASE + OCP_MCFG)
-#define MCFG_CTRL 0x00
-#define MCFG_WCFG 0x04
-#define MCFG_RCFG 0x08
-
-/*
- * Port registers
- */
-#define IO_BASE 0x02000000
-#define RA (IO_BASE + 0x00000000)
-#define RB (IO_BASE + 0x00001000)
-#define RC (IO_BASE + 0x00002000)
-#define RD (IO_BASE + 0x00003000)
-#define RE (IO_BASE + 0x00004000)
-#define RF (IO_BASE + 0x00005000)
-#define RG (IO_BASE + 0x00006000)
-#define RH (IO_BASE + 0x00007000)
-#define RI (IO_BASE + 0x00008000)
-#define RJ (IO_BASE + 0x00009000)
-#define RLATCH (IO_BASE + 0x00ff0000)	// For latched output only
-#define IO_PORT_BR_OFFSET 0x00000800
-
-/*
- * General I/O Register Map (per port)
- */
-#define IO_FUNC 0x00
-#define IO_GPIO_CTL 0x04
-#define IO_GPIO_OUT 0x08
-#define IO_GPIO_IN 0x0C
-#define IO_INT_STATUS 0x10
-#define IO_INT_MASK 0x14
-#define IO_INT_SET 0x18
-#define IO_INT_CLR 0x1C
-#define IO_TX_FIFO 0x20
-#define IO_TX_FIFO_HI 0x24
-#define IO_RX_FIFO 0x28
-#define IO_RX_FIFO_HI 0x2c
-#define IO_CTL0 0x30
-#define IO_CTL1 0x34
-#define IO_CTL2 0x38
-#define IO_STATUS0 0x3c
-#define IO_STATUS1 0x40
-#define IO_STATUS2 0x44
-#define IO_FIFO_WATER 0x48
-#define IO_FIFO_LEVEL 0x4c
-#define IO_GPIO_MASK 0x50
-
-#define IO_FUNC_FUNCTION_RESET(func) ((1 << ((func) - 1)) << 4)	/* Function 0 doesn't need reset */
-#define IO_FUNC_RX_FIFO (1 << 3)
-#define IO_FUNC_SELECT(func) ((func) << 0)
-
-/*
- * External interrupt pins.
- */
-#define EXT_INT_IO_BIT(pin) ((pin) + 5)	// Interrupt pin number -> I/O INT bit
-#define EXT_INT_RISING_EDGE(pin) (0x2 << (2*(pin) + 7))
-#define EXT_INT_FALLING_EDGE(pin) (0x1 << (2*(pin) + 7))
-
-/*
- * Flash
- */
-#define IO_XFL_BASE RA
-
-#define IO_XFL_INT_START (1 << 16)
-#define IO_XFL_INT_ERR (1 << 8)
-#define IO_XFL_INT_DONE (1 << 0)
-
-#define IO_XFL_CTL0_MASK (0xffe07fff)
-#define IO_XFL_CTL0_RD_CMD(cmd) (((cmd) & 0xff) << 24)
-#define IO_XFL_CTL0_RD_DUMMY(n) (((n) & 0x7) << 21)
-#define IO_XFL_CTL0_CLK_WIDTH(core_cycles) ((((core_cycles) + 1) & 0x7e) << 8)	/* must be even number */
-#define IO_XFL_CTL0_CE_WAIT(spi_cycles) (((spi_cycles) & 0x3f) << 2)
-#define IO_XFL_CTL0_MCB_LOCK (1 << 1)
-#define IO_XFL_CTL0_ENABLE (1 << 0)
-#define IO_XFL_CTL0_FAST_VALUE(div, wait) (IO_XFL_CTL0_RD_CMD(0xb) | IO_XFL_CTL0_RD_DUMMY(1) | IO_XFL_CTL0_CLK_WIDTH(div) | IO_XFL_CTL0_CE_WAIT(wait) | IO_XFL_CTL0_ENABLE)
-#define IO_XFL_CTL0_VALUE(div, wait) (IO_XFL_CTL0_RD_CMD(3) | IO_XFL_CTL0_CLK_WIDTH(div) | IO_XFL_CTL0_CE_WAIT(wait) | IO_XFL_CTL0_ENABLE)
-
-#define IO_XFL_CTL1_MASK (0xc0003fff)
-#define IO_XFL_CTL1_FC_INST(inst) (((inst) & 0x3) << 30)
-#define IO_XFL_CTL1_FC_DATA(n) (((n) & 0x3ff) << 4)
-#define IO_XFL_CTL1_FC_DUMMY(n) (((n) & 0x7) << 1)
-#define IO_XFL_CTL1_FC_ADDR (1 << 0)
-
-#define IO_XFL_CTL2_FC_CMD(cmd) (((cmd) & 0xff) << 24)
-#define IO_XFL_CTL2_FC_ADDR(addr) ((addr) & 0x00ffffff)	/* Only up to 24 bits */
-
-#define IO_XFL_STATUS0_MCB_ACTIVE (1 << 0)
-#define IO_XFL_STATUS0_IOPCS_ACTIVE (1 << 1)
-
-/*
- * SDRAM
- */
-#define IO_SDRAM_DATA_BASE RG
-#define IO_SDRAM_CNTL_BASE RH
-
-#define IO_SDRAM_CTRL0_EN_REF (1 << 0)
-
-/*
- * Port function code (common fucntion codes for all I/O ports)
- */
-#define IO_PORTX_FUNC_GPIO 0x00
-#define IO_PORTX_FUNC_XFL 0x01
-#define IO_PORTX_FUNC_PCI 0x01
-#define IO_PORTX_FUNC_SERDES 0x01
-#define IO_PORTX_FUNC_GMII 0x01
-#define IO_PORTX_FUNC_DDR 0x01
-#define IO_PORTX_FUNC_PCIX 0x01
-#define IO_PORTX_FUNC_USB2_0 0x01
-#define IO_PORTX_FUNC_GPIO_INT_CLK 0x02
-#define IO_PORTX_FUNC_PLIO 0x02
-#define IO_PORTX_FUNC_GPIO_INT 0x03
-#define IO_PORTX_FUNC_MII 0x03
-
-/*
- * Port 0
- */
-#define IO_PORT0_FUNC_GPIO IO_PORTX_FUNC_GPIO
-#define IO_PORT0_FUNC_XFL_INT_CLK IO_PORTX_FUNC_XFL	// Default mode after reset
-#define IO_PORT0_FUNC_GPIO_INT_CLK IO_PORTX_FUNC_GPIO_INT_CLK
-#define IO_PORT0_FUNC_GPIO_INT IO_PORTX_FUNC_GPIO_INT
-
-/*
- * Port 1
- */
-#define IO_PORT1_FUNC_GPIO IO_PORTX_FUNC_GPIO
-#define IO_PORT1_FUNC_PCI IO_PORTX_FUNC_PCI		// PCI control
-#define IO_PORT1_FUNC_MII IO_PORTX_FUNC_MII		// port 4 MII extension
-
-/*
- * Port 2
- */
-#define IO_PORT2_FUNC_GPIO IO_PORTX_FUNC_GPIO
-#define IO_PORT2_FUNC_PCI IO_PORTX_FUNC_PCI		// PCI data I/O
-#define IO_PORT2_FUNC_PLIO IO_PORTX_FUNC_PLIO		// Extended LM
-
-/*
- * Port 3
- */
-#define IO_PORT3_FUNC_GPIO IO_PORTX_FUNC_GPIO
-#define IO_PORT3_FUNC_SERDES IO_PORTX_FUNC_SERDES
-#define IO_PORT3_FUNC_PLIO IO_PORTX_FUNC_PLIO
-
-/*
- * Port 4
- */
-#define IO_PORT4_FUNC_GPIO IO_PORTX_FUNC_GPIO
-#define IO_PORT4_FUNC_SERDES IO_PORTX_FUNC_SERDES
-#define IO_PORT4_FUNC_PLIO IO_PORTX_FUNC_PLIO		// Extended LM
-#define IO_PORT4_FUNC_MII IO_PORTX_FUNC_MII
-
-/*
- * Port 5
- */
-#define IO_PORT5_FUNC_GPIO IO_PORTX_FUNC_GPIO
-#define IO_PORT5_FUNC_GMII IO_PORTX_FUNC_GMII
-
-/*
- * Port 6
- */
-#define IO_PORT6_FUNC_GPIO IO_PORTX_FUNC_GPIO
-#define IO_PORT6_FUNC_DDR IO_PORTX_FUNC_DDR
-
-/*
- * Port 7
- */
-#define IO_PORT7_FUNC_GPIO IO_PORTX_FUNC_GPIO
-#define IO_PORT7_FUNC_DDR IO_PORTX_FUNC_DDR
-
-/*
- * Port 8
- */
-#define IO_PORT8_FUNC_GPIO IO_PORTX_FUNC_GPIO
-#define IO_PORT8_FUNC_PCIX IO_PORTX_FUNC_PCIX
-#define IO_PORT8_FUNC_PLIO IO_PORTX_FUNC_PLIO		// Extended LM
-#define IO_PORT8_FUNC_MII IO_PORTX_FUNC_MII		// port 4 MII extension
-
-/*
- * Port 9
- */
-#define IO_PORT9_FUNC_USB2_0 IO_PORTX_FUNC_USB2_0
-
-/*
- * FIFO
- */
-#define IO_PORTX_INT_FIFO_TX_RESET (1 << 31)
-#define IO_PORTX_INT_FIFO_RX_RESET (1 << 30)
-#define IO_PORTX_INT_FIFO_TX_UF (1 << 15)
-#define IO_PORTX_INT_FIFO_TX_WM (1 << 14)
-#define IO_PORTX_INT_FIFO_RX_OF (1 << 13)
-#define IO_PORTX_INT_FIFO_RX_WM (1 << 12)
-
-#define IO_PORTX_FUNC_FIFO_TX_WM(n) ((n) << 16)
-#define IO_PORTX_FUNC_FIFO_RX_WM(n) ((n) << 0)
-
-/*
- * MII
- */
-#define IO_PORTX_INT_MII_TX_ERR_SEND (1 << 18)
-#define IO_PORTX_INT_MII_TX_HALT (1 << 17)
-#define IO_PORTX_INT_MII_TX_START (1 << 16)
-#define IO_PORTX_INT_MII_THRESHOLD (1 << 8)
-#define IO_PORTX_INT_MII_RX_EOP (1 << 7)
-#define IO_PORTX_INT_MII_RX_SFD (1 << 6)
-#define IO_PORTX_INT_MII_RX_ERR (1 << 5)
-#define IO_PORTX_INT_MII_TX_EOP (1 << 4)
-#define IO_PORTX_INT_MII_COL (1 << 3)
-#define IO_PORTX_INT_MII_CRS (1 << 2)
-#define IO_PORTX_INT_MII_ODD_NIB_ERR (1 << 1)
-#define IO_PORTX_INT_MII_FALSE_CARRIER (1 << 0)
-
-/*
- * SerDes
- */
-#define IO_PORTX_INT_SERDES_TXBUF_VALID (1 << 16)
-#define IO_PORTX_INT_SERDES_RXERR (1 << 7)
-#define IO_PORTX_INT_SERDES_RXEOP (1 << 6)
-#define IO_PORTX_INT_SERDES_SYND (1 << 5)
-#define IO_PORTX_INT_SERDES_TXBE (1 << 4)
-#define IO_PORTX_INT_SERDES_TXEOP (1 << 3)
-#define IO_PORTX_INT_SERDES_SXLP (1 << 2)
-#define IO_PORTX_INT_SERDES_RXBF (1 << 1)
-#define IO_PORTX_INT_SERDES_RXCRS (1 << 0)
-
-#ifndef __ASSEMBLY__
-struct ubicom32_io_port {
-	volatile u32_t function;
-	volatile u32_t gpio_ctl;
-	volatile u32_t gpio_out;
-	volatile u32_t gpio_in;
-	volatile u32_t int_status;
-	volatile u32_t int_mask;
-	volatile u32_t int_set;
-	volatile u32_t int_clr;
-	volatile u32_t tx_fifo;
-	volatile u32_t tx_fifo_hi;
-	volatile u32_t rx_fifo;
-	volatile u32_t rx_fifo_hi;
-	volatile u32_t ctl0;
-	volatile u32_t ctl1;
-	volatile u32_t ctl2;
-	volatile u32_t status0;
-	volatile u32_t status1;
-	volatile u32_t status2;
-	volatile u32_t fifo_watermark;
-	volatile u32_t fifo_level;
-	volatile u32_t gpio_mask;
-};
-
-#define UBICOM32_IO_PORT(port) ((struct ubicom32_io_port *)((port)))
-#endif
-
-#ifndef __ASSEMBLY__
-/*
- * ubicom32_set_interrupt()
- */
-extern inline void ubicom32_set_interrupt(u8_t interrupt)
-{
-	u32_t ibit = INT_BIT_MASK(interrupt);
-
-	if (INT_REG(interrupt) == INT_REG(INT_CHIP(0, 0))) {
-		asm volatile (
-			"move.4		"D(INT_SET(INT_CHIP(0, 0)))", %0\n\t"
-			:
-			: "r" (ibit)
-		);
-
-		return;
-	}
-
-	asm volatile (
-		"move.4		"D(INT_SET(INT_CHIP(1, 0)))", %0\n\t"
-		:
-		: "r" (ibit)
-	);
-}
-
-/*
- * ubicom32_clear_interrupt()
- */
-extern inline void ubicom32_clear_interrupt(u8_t interrupt)
-{
-	u32_t ibit = INT_BIT_MASK(interrupt);
-
-	if (INT_REG(interrupt) == INT_REG(INT_CHIP(0, 0))) {
-		asm volatile (
-			"move.4		"D(INT_CLR(INT_CHIP(0, 0)))", %0\n\t"
-			:
-			: "r" (ibit)
-		);
-
-		return;
-	}
-
-	asm volatile (
-		"move.4		"D(INT_CLR(INT_CHIP(1, 0)))", %0\n\t"
-		:
-		: "r" (ibit)
-	);
-}
-
-/*
- * ubicom32_enable_interrupt()
- */
-extern inline void ubicom32_enable_interrupt(u8_t interrupt)
-{
-	u32_t ibit = INT_BIT_MASK(interrupt);
-
-	if (INT_REG(interrupt) == INT_REG(INT_CHIP(0, 0))) {
-		asm volatile (
-			"or.4		"D(INT_MASK(INT_CHIP(0, 0)))", "D(INT_MASK(INT_CHIP(0, 0)))", %0\n\t"
-			:
-			: "d" (ibit)
-		);
-
-		return;
-	}
-
-	asm volatile (
-		"or.4		"D(INT_MASK(INT_CHIP(1, 0)))", "D(INT_MASK(INT_CHIP(1, 0)))", %0\n\t"
-		:
-		: "d" (ibit)
-	);
-}
-
-/*
- * ubicom32_disable_interrupt()
- */
-extern inline void ubicom32_disable_interrupt(u8_t interrupt)
-{
-	u32_t ibit = ~INT_BIT_MASK(interrupt);
-
-	if (INT_REG(interrupt) == INT_REG(INT_CHIP(0, 0))) {
-		asm volatile (
-			"and.4		"D(INT_MASK(INT_CHIP(0, 0)))", "D(INT_MASK(INT_CHIP(0, 0)))", %0\n\t"
-			:
-			: "d" (ibit)
-		);
-
-		return;
-	}
-
-	asm volatile (
-		"and.4		"D(INT_MASK(INT_CHIP(1, 0)))", "D(INT_MASK(INT_CHIP(1, 0)))", %0\n\t"
-		:
-		: "d" (ibit)
-	);
-}
-
-/*
- * ubicom32_enable_global_interrupts()
- */
-extern inline void ubicom32_enable_global_interrupts(void)
-{
-	asm volatile(
-		"bset		GLOBAL_CTRL, GLOBAL_CTRL, #%bit("D(GLOBAL_CTRL_INT_EN)")"
-	);
-}
-
-/*
- * ubicom32_disable_global_interrupts()
- */
-extern inline void ubicom32_disable_global_interrupts(void)
-{
-	asm volatile(
-		"bclr		GLOBAL_CTRL, GLOBAL_CTRL, #%bit("D(GLOBAL_CTRL_INT_EN)")"
-	);
-}
-
-/*
- * ubicom32_get_reset_reason()
- */
-extern inline u32_t ubicom32_get_reset_reason(void)
-{
-	return *(u32_t *)(GENERAL_CFG_BASE + GEN_RESET_REASON);
-}
-
-/*
- * ubicom32_read_reg()
- */
-extern inline u32_t ubicom32_read_reg(volatile void *reg)
-{
-	u32_t v;
-	asm volatile (
-		"move.4		%[dest], %[src]	\n\t"
-		: [dest] "=r" (v)
-		: [src] "m" (*(u32_t *)reg)
-	);
-	return v;
-}
-
-/*
- * ubicom32_write_reg()
- */
-extern inline void ubicom32_write_reg(volatile void *reg, u32_t v)
-{
-	asm volatile (
-		"move.4		%[dest], %[src]	\n\t"
-		:
-		: [src] "r" (v), [dest] "m" (*(u32_t *)reg)
-	);
-}
-
-#endif /* __ASSEMBLY__ */
-#endif /* _ASM_UBICOM32_IP5000_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ipcbuf.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/ipcbuf.h
deleted file mode 100644
index 76acafb20..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ipcbuf.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * arch/ubicom32/include/asm/ipcbuf.h
- *   Definition of ipc64_perm struct for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_IPCBUF_H
-#define _ASM_UBICOM32_IPCBUF_H
-
-/*
- * The user_ipc_perm structure for m68k architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 32-bit mode_t and seq
- * - 2 miscellaneous 32-bit values
- */
-struct ipc64_perm
-{
-	__kernel_key_t		key;
-	__kernel_uid32_t	uid;
-	__kernel_gid32_t	gid;
-	__kernel_uid32_t	cuid;
-	__kernel_gid32_t	cgid;
-	__kernel_mode_t		mode;
-	unsigned short		__pad1;
-	unsigned short		seq;
-	unsigned short		__pad2;
-	unsigned long		__unused1;
-	unsigned long		__unused2;
-};
-
-#endif /* _ASM_UBICOM32_IPCBUF_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/irq.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/irq.h
deleted file mode 100644
index b5525894e..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/irq.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * arch/ubicom32/include/asm/irq.h
- *   IRQ definitions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_IRQ_H
-#define _ASM_UBICOM32_IRQ_H
-
-#include <asm/irqflags.h>
-
-/*
- * We setup the IRQS to cover the full range of interrupt registers in
- * processor.
- */
-#define NR_IRQS		64
-
-#define irq_canonicalize(irq) (irq)
-
-extern int irq_soft_alloc(unsigned int *soft);
-extern void ack_bad_irq(unsigned int irq);
-extern void do_IRQ(int irq, struct pt_regs *fp);
-
-#endif /* _ASM_UBICOM32_IRQ_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/irq_regs.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/irq_regs.h
deleted file mode 100644
index afc33e40e..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/irq_regs.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * arch/ubicom32/include/asm/irq_regs.h
- *   Generic irq_regs.h for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_IRQ_REGS_H
-#define _ASM_UBICOM32_IRQ_REGS_H
-
-#include <asm-generic/irq_regs.h>
-
-#endif /* _ASM_UBICOM32_IRQ_REGS_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/irqflags.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/irqflags.h
deleted file mode 100644
index f40906e5a..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/irqflags.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * arch/ubicom32/include/asm/irqflags.h
- *   Raw implementation of local IRQ functions.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_IRQFLAGS_H
-#define _ASM_UBICOM32_IRQFLAGS_H
-
-#include <linux/thread_info.h>
-#include <asm/ubicom32-common.h>
-#if defined(CONFIG_SMP)
-#include <asm/smp.h>
-#endif
-#include <asm/ldsr.h>
-
-#if defined(CONFIG_PREEMPT)
-#error Not supported by Ubicom32 irq handling, yet!
-#endif
-
-/*
- * raw_local_irq_enable()
- *	Enable interrupts for this thread.
- */
-static inline void raw_local_irq_enable(void)
-{
-	ldsr_local_irq_enable();
-}
-
-/*
- * raw_local_irq_disable()
- *	Disable interrupts for this thread.
- */
-static inline void raw_local_irq_disable(void)
-{
-	ldsr_local_irq_disable();
-}
-
-/*
- * raw_local_save_flags()
- *	Get the current IRQ state.
- */
-#define raw_local_save_flags(flags) 		\
-do {						\
-	(flags) = ldsr_local_irq_is_disabled();	\
-} while (0)
-
-/*
- * raw_local_irq_save()
- *	Save the current interrupt state and disable interrupts.
- */
-#define raw_local_irq_save(flags)		\
-do {						\
-	(flags) = ldsr_local_irq_save();	\
-} while (0)
-
-/*
- * raw_local_irq_restore()
- *	Restore the IRQ state back to flags.
- */
-static inline void raw_local_irq_restore(unsigned long flags)
-{
-	ldsr_local_irq_restore(flags);
-}
-
-/*
- * raw_irqs_disabled_flags()
- *	Return true if the flags indicate that IRQ(s) are disabled.
- */
-static inline int raw_irqs_disabled_flags(unsigned long flags)
-{
-	return (flags);
-}
-
-#endif /* _ASM_UBICOM32_IRQFLAGS_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/kdebug.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/kdebug.h
deleted file mode 100644
index 514bd2765..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/kdebug.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * arch/ubicom32/include/asm/kdebug.h
- *   Generic kdebug.h for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_KDEBUG_H
-#define _ASM_UBICOM32_KDEBUG_H
-
-#include <asm-generic/kdebug.h>
-
-#endif /* _ASM_UBICOM32_KDEBUG_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/kmap_types.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/kmap_types.h
deleted file mode 100644
index 5f4ffeacb..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/kmap_types.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * arch/ubicom32/include/asm/kmap_types.h
- *   Definition of km_type's for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_KMAP_TYPES_H
-#define _ASM_UBICOM32_KMAP_TYPES_H
-
-enum km_type {
-	KM_BOUNCE_READ,
-	KM_SKB_SUNRPC_DATA,
-	KM_SKB_DATA_SOFTIRQ,
-	KM_USER0,
-	KM_USER1,
-	KM_BIO_SRC_IRQ,
-	KM_BIO_DST_IRQ,
-	KM_PTE0,
-	KM_PTE1,
-	KM_IRQ0,
-	KM_IRQ1,
-	KM_SOFTIRQ0,
-	KM_SOFTIRQ1,
-	KM_TYPE_NR
-};
-
-#endif /* _ASM_UBICOM32_KMAP_TYPES_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ldsr.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/ldsr.h
deleted file mode 100644
index b829c8790..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ldsr.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * arch/ubicom32/include/asm/ldsr.h
- *   Ubicom32 LDSR interface definitions.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_LDSR_H
-#define _ASM_UBICOM32_LDSR_H
-
-#include <asm/ubicom32-common.h>
-#include <asm/types.h>
-#include <asm/thread.h>
-
-extern unsigned int ldsr_soft_irq_mask;
-
-/*
- * ldsr_local_irq_is_disabled()
- *	Test if interrupts are disabled for this thread?
- */
-static inline int ldsr_local_irq_is_disabled(void)
-{
-	int ret;
-	thread_t self = thread_get_self();
-	unsigned int mask = (1 << self);
-
-	asm volatile (
-	"	and.4	%0, scratchpad1, %1	\n\t"
-		: "=r" (ret)
-		: "d" (mask)
-		: "cc"
-	);
-
-	/*
-	 *  We return a simple 1 == disabled, 0 == enabled
-	 *  losing which tid this is for, because Linux
-	 *  can restore interrupts on a different thread.
-	 */
-	return ret >> self;
-}
-
-/*
- * ldsr_local_irq_save()
- *	Get the current interrupt state and disable interrupts.
- */
-static inline unsigned int ldsr_local_irq_save(void)
-{
-	int ret;
-	thread_t self = thread_get_self();
-	unsigned int mask = (1 << self);
-
-	/*
-	 * Ensure the compiler can not optimize out the code
-	 * (volatile) and that it does not "cache" values around
-	 * the interrupt state change (memory).  This ensures
-	 * that interrupt changes are treated as a critical
-	 * section.
-	 */
-	asm volatile (
-	"	and.4	%0, scratchpad1, %1		\n\t"
-	"	or.4	scratchpad1, scratchpad1, %1	\n\t"
-		: "=&r" (ret)
-		: "d" (mask)
-		: "cc", "memory"
-	);
-
-	/*
-	 *  We return a simple 1 == disabled, 0 == enabled
-	 *  losing which tid this is for, because Linux
-	 *  can restore interrupts on a different thread.
-	 */
-	return ret >> self;
-}
-
-/*
- * ldsr_local_irq_restore()
- * 	Restore this cpu's interrupt enable/disable state.
- *
- * Note: flags is either 0 or 1.
- */
-static inline void ldsr_local_irq_restore(unsigned int flags)
-{
-	unsigned int temp;
-	thread_t self = thread_get_self();
-	unsigned int mask = (1 << self);
-	flags = (flags << self);
-
-	/*
-	 * Ensure the compiler can not optimize out the code
-	 * (volatile) and that it does not "cache" values around
-	 * the interrupt state change (memory).  This ensures
-	 * that interrupt changes are treated as a critical
-	 * section.
-	 *
-	 * Atomic change to our bit in scratchpad1 without
-	 * causing any temporary glitch in the value and
-	 * without effecting other values.  Also this uses
-	 * no branches so no penalties.
-	 */
-	asm volatile (
-	"	xor.4	%0, scratchpad1, %1		\n\t"
-	"	and.4	%0, %2, %0			\n\t"
-	"	xor.4	scratchpad1, scratchpad1, %0	\n\t"
-	"	move.4	int_set0, %3			\n\t"
-		: "=&d"(temp)
-		: "d"(flags), "r"(mask), "r"(ldsr_soft_irq_mask)
-		: "cc", "memory"
-	);
-}
-
-/*
- * ldsr_local_irq_disable_interrupt()
- * 	Disable ints for this thread.
- */
-static inline void ldsr_local_irq_disable(void)
-{
-	unsigned int mask = (1 << thread_get_self());
-
-	/*
-	 * Ensure the compiler can not optimize out the code
-	 * (volatile) and that it does not "cache" values around
-	 * the interrupt state change (memory).  This ensures
-	 * that interrupt changes are treated as a critical
-	 * section.
-	 */
-	asm  volatile (
-	"	or.4	scratchpad1, scratchpad1, %0	\n\t"
-		:
-		: "d" (mask)
-		: "cc", "memory"
-	);
-}
-
-/*
- * ldsr_local_irq_enable_interrupt
- * 	Enable ints for this thread.
- */
-static inline void ldsr_local_irq_enable(void)
-{
-	unsigned int mask = (1 << thread_get_self());
-
-	/*
-	 * Ensure the compiler can not optimize out the code
-	 * (volatile) and that it does not "cache" values around
-	 * the interrupt state change (memory).  This ensures
-	 * that interrupt changes are treated as a critical
-	 * section.
-	 */
-	asm volatile (
-	"	and.4	scratchpad1, scratchpad1, %0	\n\t"
-	"	move.4	int_set0, %1			\n\t"
-		:
-		: "d" (~mask), "r" (ldsr_soft_irq_mask)
-		: "cc", "memory"
-	);
-}
-
-extern void ldsr_init(void);
-extern void ldsr_set_trap_irq(unsigned int irq);
-extern void ldsr_mask_vector(unsigned int vector);
-extern void ldsr_unmask_vector(unsigned int vector);
-extern void ldsr_enable_vector(unsigned int vector);
-extern void ldsr_disable_vector(unsigned int vector);
-extern thread_t ldsr_get_threadid(void);
-
-#endif /* _ASM_UBICOM32_LDSR_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/linkage.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/linkage.h
deleted file mode 100644
index 63d56a2c4..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/linkage.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * arch/ubicom32/include/asm/linkage.h
- *   Definition of Ubicom32 architecture specific linkage types.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_LINKAGE_H
-#define _ASM_UBICOM32_LINKAGE_H
-
-#define __ocm_text __section(.ocm_text)
-#define __ocm_data __section(.ocm_data)
-
-#endif	/* _ASM_UBICOM32_LINKAGE_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/local.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/local.h
deleted file mode 100644
index 9c7931730..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/local.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * arch/ubicom32/include/asm/local.h
- *   Generic local.h for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_LOCAL_H
-#define _ASM_UBICOM32_LOCAL_H
-
-#include <asm-generic/local.h>
-
-#endif /* _ASM_UBICOM32_LOCAL_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/machdep.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/machdep.h
deleted file mode 100644
index c35815479..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/machdep.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * arch/ubicom32/include/asm/machdep.h
- *   Machine dependent utility routines.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_MACHDEP_H
-#define _ASM_UBICOM32_MACHDEP_H
-
-#include <linux/interrupt.h>
-
-/* Hardware clock functions */
-extern unsigned long hw_timer_offset(void);
-
-/* machine dependent power off functions */
-extern void (*mach_reset)(void);
-extern void (*mach_halt)(void);
-extern void (*mach_power_off)(void);
-
-extern void config_BSP(char *command, int len);
-
-#endif /* _ASM_UBICOM32_MACHDEP_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/mc146818rtc.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/mc146818rtc.h
deleted file mode 100644
index 89b3c568b..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/mc146818rtc.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * arch/ubicom32/include/asm/mc146818rtc.h
- *   Generic mc146818rtc.h for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-/*
- * Machine dependent access functions for RTC registers.
- */
-#ifndef _ASM_UBICOM32_MC146818RTC_H
-#define _ASM_UBICOM32_MC146818RTC_H
-
-/* empty include file to satisfy the include in genrtc.c/ide-geometry.c */
-
-#endif /* _ASM_UBICOM32_MC146818RTC_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/memory_map.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/memory_map.h
deleted file mode 100644
index a1c3219b3..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/memory_map.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * arch/ubicom32/include/asm/memory_map.h
- *   Machine memory maps/
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_MEMORY_MAP_H
-#define _ASM_UBICOM32_MEMORY_MAP_H
-
-/*
- * Memory Size
- */
-#define OCM_SECTOR_SIZE	0x00008000		/* 32K */
-
-#if defined(CONFIG_UBICOM32_V3)
-#define OCMSIZE	0x00030000	/* 192K on-chip RAM for both program and data */
-#elif defined(CONFIG_UBICOM32_V4)
-#define OCMSIZE	0x0003C000	/* 240K on-chip RAM for both program and data */
-#else
-#error "Unknown IP5K silicon"
-#endif
-
-#define OCMSTART	0x3ffc0000 /* alias from 0x03000000 for easy
-				    * jump to/from SDRAM */
-#define OCMEND		(OCMSTART + OCMSIZE)
-
-#define SDRAMSTART	0x40000000
-
-#define KERNELSTART	(SDRAMSTART + 0x00400000)
-
-#define FLASHSTART	0x60000000
-
-/*
- * CODELOADER / OS_SYSCALL OCM Reservations
- * Don't change these unless you know what you are doing.
- */
-#define CODELOADER_SIZE  0x30
-#define CODELOADER_BEGIN OCMSTART /* Must be OCM start for gdb to work. */
-#define CODELOADER_END	 (CODELOADER_BEGIN + CODELOADER_SIZE)
-
-#define OS_SYSCALL_BEGIN CODELOADER_END	/* system_call at this address */
-#define OS_SYSCALL_SIZE  (512 - CODELOADER_SIZE)
-#define OS_SYSCALL_END	 (OS_SYSCALL_BEGIN + OS_SYSCALL_SIZE)
-
-#endif /* _ASM_UBICOM32_MEMORY_MAP_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/mman.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/mman.h
deleted file mode 100644
index a2a3efe05..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/mman.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * arch/ubicom32/include/asm/mman.h
- *   Memory mapping definitions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_MMAN_H
-#define _ASM_UBICOM32_MMAN_H
-
-#include <asm-generic/mman.h>
-
-#define MAP_GROWSDOWN	0x0100		/* stack-like segment */
-#define MAP_DENYWRITE	0x0800		/* ETXTBSY */
-#define MAP_EXECUTABLE	0x1000		/* mark it as an executable */
-#define MAP_LOCKED	0x2000		/* pages are locked */
-#define MAP_NORESERVE	0x4000		/* don't check for reservations */
-#define MAP_POPULATE	0x8000		/* populate (prefault) pagetables */
-#define MAP_NONBLOCK	0x10000		/* do not block on IO */
-
-#define MCL_CURRENT	1		/* lock all current mappings */
-#define MCL_FUTURE	2		/* lock all future mappings */
-
-#endif /* _ASM_UBICOM32_MMAN_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/mmu.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/mmu.h
deleted file mode 100644
index 71b604b52..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/mmu.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * arch/ubicom32/include/asm/mmu.h
- *   Definition of mm_context_t struct for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- * Copyright (C) 2002, David McCullough <davidm@snapgear.com>
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_MMU_H
-#define _ASM_UBICOM32_MMU_H
-
-typedef struct {
-	struct vm_list_struct	*vmlist;
-	unsigned long		end_brk;
-#ifdef CONFIG_BINFMT_ELF_FDPIC
-	unsigned long	exec_fdpic_loadmap;
-	unsigned long	interp_fdpic_loadmap;
-#endif
-} mm_context_t;
-
-#endif /* _ASM_UBICOM32_MMU_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/mmu_context.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/mmu_context.h
deleted file mode 100644
index 0123a6c91..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/mmu_context.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * arch/ubicom32/include/asm/mmu_context.h
- *   MMU context definitions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- * Copyright (C) 2004, Microtronix Datacom Ltd., All rights reserved.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#ifndef _ASM_UBICOM32_MMU_CONTEXT_H
-#define _ASM_UBICOM32_MMU_CONTEXT_H
-
-#include <asm/setup.h>
-#include <asm/page.h>
-#include <asm/pgalloc.h>
-
-static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
-{
-}
-
-extern inline int
-init_new_context(struct task_struct *tsk, struct mm_struct *mm)
-{
-	// mm->context = virt_to_phys(mm->pgd);
-	return(0);
-}
-
-#define destroy_context(mm)		do { } while(0)
-
-static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, struct task_struct *tsk)
-{
-}
-
-#define deactivate_mm(tsk,mm)	do { } while (0)
-
-extern inline void activate_mm(struct mm_struct *prev_mm, struct mm_struct *next_mm)
-{
-}
-
-#endif /* _ASM_UBICOM32_MMU_CONTEXT_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/module.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/module.h
deleted file mode 100644
index 1c891c674..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/module.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * arch/ubicom32/include/asm/module.h
- *   Ubicom32 architecture specific module definitions.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_MODULE_H
-#define _ASM_UBICOM32_MODULE_H
-
-struct mod_arch_specific {
-	void *ocm_inst;
-	int ocm_inst_size;
-};
-
-#define Elf_Shdr Elf32_Shdr
-#define Elf_Sym Elf32_Sym
-#define Elf_Ehdr Elf32_Ehdr
-
-#define ARCH_PROC_MODULES_EXTRA(m,mod) \
-	seq_printf(m, " OCM(%d bytes @ 0x%p)", \
-		   (mod)->arch.ocm_inst_size, (mod)->arch.ocm_inst)
-
-#define ARCH_OOPS_MODULE_EXTRA(mod) \
-	printk(KERN_INFO "%p %u OCM(%p %u)\n", \
-		(mod)->module_core, (mod)->core_size, \
-		(mod)->arch.ocm_inst, (mod)->arch.ocm_inst_size)
-#endif /* _ASM_UBICOM32_MODULE_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/msgbuf.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/msgbuf.h
deleted file mode 100644
index 8d575e0f9..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/msgbuf.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * arch/ubicom32/include/asm/msgbuf.h
- *   Definition of msqid64_ds struct for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_MSGBUF_H
-#define _ASM_UBICOM32_MSGBUF_H
-
-/*
- * The msqid64_ds structure for ubicom32 architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 64-bit time_t to solve y2038 problem
- * - 2 miscellaneous 32-bit values
- */
-
-struct msqid64_ds {
-	struct ipc64_perm msg_perm;
-	__kernel_time_t msg_stime;	/* last msgsnd time */
-	unsigned long	__unused1;
-	__kernel_time_t msg_rtime;	/* last msgrcv time */
-	unsigned long	__unused2;
-	__kernel_time_t msg_ctime;	/* last change time */
-	unsigned long	__unused3;
-	unsigned long  msg_cbytes;	/* current number of bytes on queue */
-	unsigned long  msg_qnum;	/* number of messages in queue */
-	unsigned long  msg_qbytes;	/* max number of bytes on queue */
-	__kernel_pid_t msg_lspid;	/* pid of last msgsnd */
-	__kernel_pid_t msg_lrpid;	/* last receive pid */
-	unsigned long  __unused4;
-	unsigned long  __unused5;
-};
-
-#endif /* _ASM_UBICOM32_MSGBUF_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/mutex.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/mutex.h
deleted file mode 100644
index 5ab4de0da..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/mutex.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * arch/ubicom32/include/asm/mutex.h
- *   Generic mutex.h for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-/*
- * Pull in the generic implementation for the mutex fastpath.
- *
- * TODO: implement optimized primitives instead, or leave the generic
- * implementation in place, or pick the atomic_xchg() based generic
- * implementation. (see asm-generic/mutex-xchg.h for details)
- */
-
-#ifndef _ASM_UBICOM32_MUTEX_H
-#define _ASM_UBICOM32_MUTEX_H
-
-#include <asm-generic/mutex-dec.h>
-
-#endif /* _ASM_UBICOM32_MUTEX_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/namei.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/namei.h
deleted file mode 100644
index 8010c148f..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/namei.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * arch/ubicom32/include/asm/namei.h
- *   Definition of __emul_prefix() for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_NAMEI_H
-#define _ASM_UBICOM32_NAMEI_H
-
-/* This dummy routine maybe changed to something useful
- * for /usr/gnemul/ emulation stuff.
- * Look at asm-sparc/namei.h for details.
- */
-
-#define __emul_prefix() NULL
-
-#endif /* _ASM_UBICOM32_NAMEI_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ocm-alloc.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/ocm-alloc.h
deleted file mode 100644
index ee29d8410..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ocm-alloc.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * arch/ubicom32/include/asm/ocm-alloc.h
- *   Ubicom32 architecture specific ocm definitions.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_OCM_ALLOC_H
-#define _ASM_UBICOM32_OCM_ALLOC_H
-
-
-extern void *ocm_inst_alloc(size_t size, pid_t pid);
-extern int ocm_free(const void *ptr);
-extern int ocm_inst_free(const void *ptr);
-
-#endif /* _ASM_UBICOM32_OCM_ALLOC_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ocm_size.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/ocm_size.h
deleted file mode 100644
index 55778fe19..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ocm_size.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define APP_OCM_CODE_SIZE (0x3ffc2e00-0x3ffc0000)
-#define APP_OCM_DATA_SIZE (0x3ffd3500-0x3ffc8000)
-
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ocm_text.lds.inc b/target/linux/ubicom32/files/arch/ubicom32/include/asm/ocm_text.lds.inc
deleted file mode 100644
index 5456cab55..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ocm_text.lds.inc
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * arch/ubicom32/include/asm/ocm_text.lds.inc
- *	<TODO: Replace with short file description>
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-*(.text.do_csum)
-*(.text.tcp_packet)
-*(.text.ipt_do_table)
-*(.text.nf_conntrack_in)
-*(.text.ip_forward)
-*(.text.dev_queue_xmit)
-*(.text.netif_receive_skb)
-*(.text.ip_route_input)
-*(.text.ip_finish_output)
-*(.text.nf_iterate)
-*(.text.__hash_conntrack)
-*(.text.memset)
-*(.text.memcpy)
-*(.text.ip_rcv)
-*(.text.__nf_conntrack_find)
-*(.text.dev_hard_start_xmit)
-*(.text.vlan_dev_hard_start_xmit)
-*(.text.vlan_dev_hard_header)
-*(.text.__nf_ct_refresh_acct)
-*(.text.tcp_error)
-*(.text.pfifo_fast_enqueue)
-*(.text.ipv4_confirm)
-*(.text.ip_output)
-*(.text.neigh_connected_output)
-*(.text.nf_hook_slow)
-*(.text.nf_nat_packet)
-*(.text.local_bh_enable)
-*(.text.pfifo_fast_dequeue)
-*(.text.ubi32_eth_receive)
-*(.text.nf_nat_fn)
-*(.text.skb_checksum)
-*(.text.memmove)
-*(.text.ubi32_eth_tx_done)
-*(.text.eth_header)
-*(.text.skb_release_data)
-*(.text.nf_conntrack_find_get)
-*(.text.process_backlog)
-*(.text.vlan_skb_recv)
-*(.text.ip_rcv_finish)
-*(.text.__qdisc_run)
-*(.text.skb_push)
-*(.text.eth_type_trans)
-*(.text.__alloc_skb)
-*(.text.netif_rx)
-*(.text.nf_ip_checksum)
-*(.text.__skb_checksum_complete_head)
-*(.text.ipv4_conntrack_defrag)
-*(.text.tcp_pkt_to_tuple)
-*(.text.kfree)
-*(.text.tcp_manip_pkt)
-*(.text.skb_put)
-*(.text.nf_ct_get_tuple)
-*(.text.__kmalloc)
-*(.text.ubi32_eth_start_xmit)
-*(.text.free_block)
-*(.text.ipt_hook)
-*(.text.kmem_cache_free)
-*(.text.skb_pull_rcsum)
-*(.text.cache_alloc_refill)
-*(.text.skb_release_head_state)
-*(.text.manip_pkt)
-*(.text.ip_sabotage_in)
-*(.text.ip_forward_finish)
-*(.text.kmem_cache_alloc)
-*(.text.local_bh_disable)
-*(.text.ipv4_pkt_to_tuple)
-*(.text.inet_proto_csum_replace4)
-*(.text.__nf_ct_l4proto_find)
-*(.text.csum_partial)
-*(.text.neigh_resolve_output)
-*(.text.__kfree_skb)
-*(.text.kfree_skb)
-*(.text.__find_vlan_dev)
-*(.text.ldsr_ctxsw_thread)
-*(.text.__do_IRQ)
-*(.text.skb_pull)
-*(.text.ipv4_invert_tuple)
-*(.text.nf_ct_invert_tuplepr)
-*(.text.skb_make_writable)
-*(.text.ipv4_get_l4proto)
-*(.text.handle_IRQ_event)
-*(.text.net_rx_action)
-*(.text.__do_softirq)
-*(.text.nf_nat_in)
-*(.text.note_interrupt)
-*(.text.ipv4_conntrack_in)
-*(.text.dst_release)
-*(.text.tasklet_action)
-*(.text.nf_nat_out)
-*(.text.nf_ct_invert_tuple)
-*(.text.do_IRQ)
-*(.text.__tasklet_schedule)
-*(.text.__skb_checksum_complete)
-*(.text.ubi32_eth_interrupt)
-*(.text.dev_kfree_skb_any)
-*(.text.ret_from_interrupt_to_kernel)
-*(.text.preemptive_context_save)
-*(.text.irq_ack_vector)
-*(.text.update_wall_time)
-*(.text.ldsr_thread)
-*(.text.irq_exit)
-*(.text.ubi32_eth_do_tasklet)
-*(.text.__napi_schedule)
-*(.text.idle_cpu)
-*(.text.run_timer_softirq)
-*(.text.ldsr_mask_vector)
-*(.text.irq_enter)
-*(.text.ldsr_get_lsb)
-*(.text.ldsr_unmask_vector)
-*(.text.ip_fast_csum)
-*(.text.hrtimer_run_queues)
-*(.text.tcp_invert_tuple)
-*(.text.T___705)
-*(.text.run_posix_cpu_timers)
-*(.text.free_hot_cold_page)
-*(.text.lock_timer_base)
-*(.text.calc_delta_mine)
-*(.text.slab_destroy)
-*(.text.rcu_pending)
-*(.text.scheduler_tick)
-*(.text.hrtimer_run_pending)
-*(.text.do_softirq)
-*(.text.del_timer)
-*(.text.irq_end_vector)
-*(.text.pci_read_u32)
-*(.text.udivmodsi4)
-*(.text.memcmp)
-*(.text.memset)
-*(.text.__slab_alloc)
-*(.text.br_handle_frame)
-*(.text.br_fdb_update)
-*(.text.__br_fdb_get)
-*(.text.br_forward)
-*(.text.br_handle_frame_finish)
-*(.text.pci_write_u32)
-*(.text.kmem_freepages)
-*(.text.br_dev_queue_push_xmit)
-*(.text.ioread32)
-*(.text.next_zones_zonelist)
-*(.text.ubi32_pci_read_u32)
-*(.text.zone_watermark_ok)
-*(.text.__rmqueue_smallest)
-*(.text.ubi32_eth_napi_poll)
-*(.text.ubi32_pci_write_u32)
-*(.text.ubi32_pci_read_u32)
-*(.text._local_bh_enable)
-*(.text._local_bh_disable)
-*(.text.get_slab)
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/page.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/page.h
deleted file mode 100644
index 1ecb174a6..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/page.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * arch/ubicom32/include/asm/page.h
- *   Memory page related operations and definitions.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_PAGE_H
-#define _ASM_UBICOM32_PAGE_H
-
-#include <linux/const.h>
-
-/* PAGE_SHIFT determines the page size */
-
-#define PAGE_SHIFT	(12)
-#define PAGE_SIZE	(_AC(1,UL) << PAGE_SHIFT)
-#define PAGE_MASK	(~(PAGE_SIZE-1))
-
-#include <asm/setup.h>
-
-#ifndef __ASSEMBLY__
-
-#define get_user_page(vaddr)		__get_free_page(GFP_KERNEL)
-#define free_user_page(page, addr)	free_page(addr)
-
-#define clear_page(page)	memset((page), 0, PAGE_SIZE)
-#define copy_page(to,from)	memcpy((to), (from), PAGE_SIZE)
-
-#define clear_user_page(page, vaddr, pg)	clear_page(page)
-#define copy_user_page(to, from, vaddr, pg)	copy_page(to, from)
-
-#define __alloc_zeroed_user_highpage(movableflags, vma, vaddr) \
-	alloc_page_vma(GFP_HIGHUSER | __GFP_ZERO | movableflags, vma, vaddr)
-#define __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE
-
-/*
- * These are used to make use of C type-checking..
- */
-typedef struct { unsigned long pte; } pte_t;
-typedef struct { unsigned long pmd[16]; } pmd_t;
-typedef struct { unsigned long pgd; } pgd_t;
-typedef struct { unsigned long pgprot; } pgprot_t;
-typedef struct page *pgtable_t;
-
-#define pte_val(x)	((x).pte)
-#define pmd_val(x)	((&x)->pmd[0])
-#define pgd_val(x)	((x).pgd)
-#define pgprot_val(x)	((x).pgprot)
-
-#define __pte(x)	((pte_t) { (x) } )
-#define __pmd(x)	((pmd_t) { (x) } )
-#define __pgd(x)	((pgd_t) { (x) } )
-#define __pgprot(x)	((pgprot_t) { (x) } )
-
-extern unsigned long memory_start;
-extern unsigned long memory_end;
-
-#endif /* !__ASSEMBLY__ */
-
-#include <asm/page_offset.h>
-
-#define PAGE_OFFSET		(PAGE_OFFSET_RAW)
-
-#ifndef __ASSEMBLY__
-
-#define __pa(vaddr)		virt_to_phys((void *)(vaddr))
-#define __va(paddr)		phys_to_virt((unsigned long)(paddr))
-
-#define virt_to_pfn(kaddr)	(__pa(kaddr) >> PAGE_SHIFT)
-#define pfn_to_virt(pfn)	__va((pfn) << PAGE_SHIFT)
-
-#define virt_to_page(addr)	(mem_map + (((unsigned long)(addr)-PAGE_OFFSET) >> PAGE_SHIFT))
-#define page_to_virt(page)	((((page) - mem_map) << PAGE_SHIFT) + PAGE_OFFSET)
-
-#define pfn_to_page(pfn)	virt_to_page(pfn_to_virt(pfn))
-#define page_to_pfn(page)	virt_to_pfn(page_to_virt(page))
-#define pfn_valid(pfn)	        ((pfn) < max_mapnr)
-
-#define	virt_addr_valid(kaddr)	(((void *)(kaddr) >= (void *)PAGE_OFFSET) && \
-				((void *)(kaddr) < (void *)memory_end))
-
-#endif /* __ASSEMBLY__ */
-
-#define VM_DATA_DEFAULT_FLAGS \
-	(VM_READ | VM_WRITE | \
-	((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \
-		VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
-
-#include <linux/version.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)
-#include <asm-generic/getorder.h>
-#else
-#include <asm-generic/page.h>
-#endif
-
-#endif /* _ASM_UBICOM32_PAGE_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/page_offset.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/page_offset.h
deleted file mode 100644
index 8536568a9..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/page_offset.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * arch/ubicom32/include/asm/page_offset.h
- *   Definition of PAGE_OFFSET_RAW for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#ifndef _ASM_UBICOM32_PAGE_OFFSET_H
-#define _ASM_UBICOM32_PAGE_OFFSET_H
-
-/* This handles the memory map.. */
-#define	PAGE_OFFSET_RAW		0x3ffc0000
-
-#endif /* _ASM_UBICOM32_PAGE_OFFSET_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/param.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/param.h
deleted file mode 100644
index 00e5a7903..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/param.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * arch/ubicom32/include/asm/param.h
- *   Definition of miscellaneous constants, including HZ.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_PARAM_H
-#define _ASM_UBICOM32_PARAM_H
-
-#ifdef __KERNEL__
-#define HZ CONFIG_HZ
-#define	USER_HZ		HZ
-#define	CLOCKS_PER_SEC	(USER_HZ)
-#endif
-
-#ifndef HZ
-#define HZ	100
-#endif
-
-#define EXEC_PAGESIZE	4096
-
-#ifndef NOGROUP
-#define NOGROUP		(-1)
-#endif
-
-#define MAXHOSTNAMELEN	64	/* max length of hostname */
-
-#endif /* _ASM_UBICOM32_PARAM_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/pci.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/pci.h
deleted file mode 100644
index 0dce8bdc6..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/pci.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * arch/ubicom32/include/asm/pci.h
- *   Definitions of PCI operations for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_PCI_H
-#define _ASM_UBICOM32_PCI_H
-
-#include <asm/io.h>
-
-/* The PCI address space does equal the physical memory
- * address space.  The networking and block device layers use
- * this boolean for bounce buffer decisions.
- */
-#define PCI_DMA_BUS_IS_PHYS	(1)
-
-
-
-/*
- * Perform a master read/write to the PCI bus.
- * These functions return a PCI_RESP_xxx code.
- */
-extern u8 pci_read_u32(u8 pci_cmd, u32 address, u32 *data);
-extern u8 pci_write_u32(u8 pci_cmd, u32 address, u32 data);
-extern u8 pci_read_u16(u8 pci_cmd, u32 address, u16 *data);
-extern u8 pci_write_u16(u8 pci_cmd, u32 address, u16 data);
-extern u8 pci_read_u8(u8 pci_cmd, u32 address, u8 *data);
-extern u8 pci_write_u8(u8 pci_cmd, u32 address, u8 data);
-
-
-#define PCIBIOS_MIN_IO          0x100
-#define PCIBIOS_MIN_MEM         0x10000000
-
-#define pcibios_assign_all_busses()	0
-#define pcibios_scan_all_fns(a, b)	0
-extern void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
-	struct resource *res);
-
-extern void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
-	struct pci_bus_region *region);
-
-struct pci_sys_data;
-struct pci_bus;
-
-struct hw_pci {
-        struct list_head buses;
-        int             nr_controllers;
-        int             (*setup)(int nr, struct pci_sys_data *);
-        struct pci_bus *(*scan)(int nr, struct pci_sys_data *);
-        void            (*preinit)(void);
-        void            (*postinit)(void);
-        u8              (*swizzle)(struct pci_dev *dev, u8 *pin);
-        int             (*map_irq)(struct pci_dev *dev, u8 slot, u8 pin);
-};
-
-/*
- * Per-controller structure
- */
-struct pci_sys_data {
-        struct list_head node;
-        int             busnr;          /* primary bus number                   */
-        u64             mem_offset;     /* bus->cpu memory mapping offset       */
-        unsigned long   io_offset;      /* bus->cpu IO mapping offset           */
-        struct pci_bus  *bus;           /* PCI bus                              */
-        struct resource *resource[3];   /* Primary PCI bus resources            */
-                                        /* Bridge swizzling                     */
-        u8              (*swizzle)(struct pci_dev *, u8 *);
-                                        /* IRQ mapping                          */
-        int             (*map_irq)(struct pci_dev *, u8, u8);
-        struct hw_pci   *hw;
-};
-
-static  inline struct resource *
-pcibios_select_root(struct pci_dev *pdev, struct resource *res)
-{
-        struct resource *root = NULL;
-
-        if (res->flags & IORESOURCE_IO)
-                root = &ioport_resource;
-        if (res->flags & IORESOURCE_MEM)
-                root = &iomem_resource;
-
-        return root;
-}
-
-static inline void pcibios_set_master(struct pci_dev *dev)
-{
-        /* No special bus mastering setup handling */
-}
-#define HAVE_ARCH_PCI_SET_DMA_MAX_SEGMENT_SIZE 1
-#define HAVE_ARCH_PCI_SET_DMA_SEGMENT_BOUNDARY 1
-
-#ifdef CONFIG_PCI
-static inline void * pci_alloc_consistent(struct pci_dev *hwdev, size_t size,
-                     dma_addr_t *dma_handle)
-{
-    void *vaddr = kmalloc(size, GFP_KERNEL);
-    if(vaddr != NULL) {
-        *dma_handle = virt_to_phys(vaddr);
-    }
-    return vaddr;
-}
-
-static  inline int pci_dma_supported(struct pci_dev *hwdev, dma_addr_t mask)
-{
-	return 1;
-}
-
-static  inline void pci_free_consistent(struct pci_dev *hwdev, size_t size,
-	void *cpu_addr, dma_addr_t dma_handle)
-{
-	kfree(cpu_addr);
-	return;
-}
-
-static inline dma_addr_t pci_map_single(struct pci_dev *hwdev, void *ptr,
-	size_t size, int direction)
-{
-	 return virt_to_phys(ptr);
-}
-
-static inline void pci_unmap_single(struct pci_dev *hwdev, dma_addr_t dma_addr,
-	size_t size, int direction)
-{
-	 return;
-}
-
-static inline dma_addr_t
-pci_map_page(struct pci_dev *hwdev, struct page *page,
-             unsigned long offset, size_t size, int direction)
-{
-	 return pci_map_single(hwdev, page_address(page) + offset, size, (int)direction);
-}
-
-static inline void
-pci_unmap_page(struct pci_dev *hwdev, dma_addr_t dma_address,
-               size_t size, int direction)
-{
-	pci_unmap_single(hwdev, dma_address, size, direction);
-}
-
-static inline int
-pci_map_sg(struct pci_dev *hwdev, struct scatterlist *sg,
-           int nents, int direction)
-{
-        return nents;
-}
-
-static inline void
-pci_unmap_sg(struct pci_dev *hwdev, struct scatterlist *sg,
-             int nents, int direction)
-{
-}
-
-static inline void
-pci_dma_sync_sg_for_cpu(struct pci_dev *hwdev, struct scatterlist *sg,
-                int nelems, int direction)
-{
-}
-
-static inline void
-pci_dma_sync_sg_for_device(struct pci_dev *hwdev, struct scatterlist *sg,
-                int nelems, int direction)
-{
-}
-
-static inline void
-pci_dma_sync_single_for_cpu(struct pci_dev *hwdev, dma_addr_t dma_handle,
-                    size_t size, int direction)
-{
-}
-
-static inline void
-pci_dma_sync_single_for_device(struct pci_dev *hwdev, dma_addr_t dma_handle,
-                    size_t size, int direction)
-{
-}
-
-static inline int
-pci_dma_mapping_error(struct pci_dev *hwdev, dma_addr_t dma_addr)
-{
-        return dma_addr == 0;
-}
-extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max);
-extern void pci_iounmap(struct pci_dev *dev, void __iomem *);
-#endif
-
-#endif /* _ASM_UBICOM32_PCI_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/pcm_tio.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/pcm_tio.h
deleted file mode 100644
index 13b5fc1e8..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/pcm_tio.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * arch/ubicom32/include/asm/pcm_tio.h
- *   Ubicom32 architecture PCM TIO definitions.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- */
-#ifndef _ASM_UBICOM32_PCM_TIO_H
-#define _ASM_UBICOM32_PCM_TIO_H
-
-#include <asm/devtree.h>
-
-#define PCM_TIO_REGS_VERSION	2
-struct pcm_tio_regs {
-	/*
-	 * set this value to 1 to reload the parameters and restart the HRT
-	 */
-	u32_t		reload;
-
-	/*
-	 * Pointers to the input and output buffers
-	 */
-	void		*input_buf;
-	void		*output_buf;
-
-	/*
-	 * Buffer size (see pcm_hrt.S for constraints)
-	 */
-	u32_t		buffer_size;
-
-	/*
-	 * Current cycle.  This variable increases every time half the buffer
-	 * is consumed.
-	 */
-	u32_t		cycle;
-
-	/*
-	 * Fields below this line are not accessed by the HRT.  They are purely
-	 * informational for the user of this TIO.
-	 */
-
-	/*
-	 * Version of this structure
-	 */
-	u32_t		version;
-
-	/*
-	 * Number of channels supported
-	 */
-	u32_t		channels;
-
-	/*
-	 * Maximum buffer size
-	 */
-	u32_t		max_buffer_size;
-};
-
-/*
- * Our device node
- */
-#define PCM_TIO_NODE_VERSION	1
-struct pcm_tio_node {
-	struct devtree_node	dn;
-	u32_t			version;
-	struct pcm_tio_regs	*regs;
-};
-
-#endif
-
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/percpu.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/percpu.h
deleted file mode 100644
index 4d51e6055..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/percpu.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * arch/ubicom32/include/asm/percpu.h
- *   Generic percpu.h for the Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_PERCPU_H
-#define _ASM_UBICOM32_PERCPU_H
-
-#include <asm-generic/percpu.h>
-
-#endif /* _ASM_UBICOM32_PERCPU_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/pgalloc.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/pgalloc.h
deleted file mode 100644
index 397d19e41..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/pgalloc.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * arch/ubicom32/include/asm/pgalloc.h
- *   Page table allocation definitions.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_PGALLOC_H
-#define _ASM_UBICOM32_PGALLOC_H
-
-#include <linux/mm.h>
-#include <asm/setup.h>
-
-#define check_pgt_cache()	do { } while (0)
-
-#endif /* _ASM_UBICOM32_PGALLOC_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/pgtable.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/pgtable.h
deleted file mode 100644
index ffb30a9ec..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/pgtable.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * arch/ubicom32/include/asm/pgtable.h
- *   Ubicom32 pseudo page table definitions and operations.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- * Copyright (C) 2004   Microtronix Datacom Ltd
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- *   and various works, Alpha, ix86, M68K, Sparc, ...et al
- */
-#ifndef _ASM_UBICOM32_PGTABLE_H
-#define _ASM_UBICOM32_PGTABLE_H
-
-#include <asm-generic/4level-fixup.h>
-
-//vic - this bit copied from m68knommu version
-#include <asm/setup.h>
-#include <asm/io.h>
-#include <linux/sched.h>
-
-typedef pte_t *pte_addr_t;
-
-#define pgd_present(pgd)     	(1)       /* pages are always present on NO_MM */
-#define pgd_none(pgd)		(0)
-#define pgd_bad(pgd)		(0)
-#define pgd_clear(pgdp)
-#define kern_addr_valid(addr) 	(1)
-#define	pmd_offset(a, b)	((void *)0)
-
-#define PAGE_NONE		__pgprot(0)    /* these mean nothing to NO_MM */
-#define PAGE_SHARED		__pgprot(0)    /* these mean nothing to NO_MM */
-#define PAGE_COPY		__pgprot(0)    /* these mean nothing to NO_MM */
-#define PAGE_READONLY		__pgprot(0)    /* these mean nothing to NO_MM */
-#define PAGE_KERNEL		__pgprot(0)    /* these mean nothing to NO_MM */
-//vic - this bit copied from m68knommu version
-
-extern void paging_init(void);
-#define swapper_pg_dir ((pgd_t *) 0)
-
-#define __swp_type(x)		(0)
-#define __swp_offset(x)		(0)
-#define __swp_entry(typ,off)	((swp_entry_t) { ((typ) | ((off) << 7)) })
-#define __pte_to_swp_entry(pte)	((swp_entry_t) { pte_val(pte) })
-#define __swp_entry_to_pte(x)	((pte_t) { (x).val })
-
-/*
- * pgprot_noncached() is only for infiniband pci support, and a real
- * implementation for RAM would be more complicated.
- */
-#define pgprot_noncached(prot)	(prot)
-
-static inline int pte_file(pte_t pte) { return 0; }
-
-/*
- * ZERO_PAGE is a global shared page that is always zero: used
- * for zero-mapped memory areas etc..
- */
-#define ZERO_PAGE(vaddr)	(virt_to_page(0))
-
-extern unsigned int kobjsize(const void *objp);
-extern int is_in_rom(unsigned long);
-
-/*
- * No page table caches to initialise
- */
-#define pgtable_cache_init()   do { } while (0)
-
-#define io_remap_pfn_range(vma, vaddr, pfn, size, prot)		\
-		remap_pfn_range(vma, vaddr, pfn, size, prot)
-
-extern inline void flush_cache_mm(struct mm_struct *mm)
-{
-}
-
-extern inline void flush_cache_range(struct mm_struct *mm,
-				     unsigned long start,
-				     unsigned long end)
-{
-}
-
-/* Push the page at kernel virtual address and clear the icache */
-extern inline void flush_page_to_ram (unsigned long address)
-{
-}
-
-/* Push n pages at kernel virtual address and clear the icache */
-extern inline void flush_pages_to_ram (unsigned long address, int n)
-{
-}
-
-/*
- * All 32bit addresses are effectively valid for vmalloc...
- * Sort of meaningless for non-VM targets.
- */
-#define	VMALLOC_START	0
-#define	VMALLOC_END	0xffffffff
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)
-#include <asm-generic/pgtable.h>
-#else
-#define arch_enter_lazy_mmu_mode()	do {} while (0)
-#define arch_leave_lazy_mmu_mode()	do {} while (0)
-#define arch_flush_lazy_mmu_mode()	do {} while (0)
-#define arch_enter_lazy_cpu_mode()	do {} while (0)
-#define arch_leave_lazy_cpu_mode()	do {} while (0)
-#define arch_flush_lazy_cpu_mode()	do {} while (0)
-#endif
-
-#endif /* _ASM_UBICOM32_PGTABLE_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/plio.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/plio.h
deleted file mode 100644
index ade78f246..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/plio.h
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
- * plio.h
- *	PLIO defines.
- *
- * Copyright © 2009 Ubicom Inc. <www.ubicom.com>.  All Rights Reserved.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- * This file contains confidential information of Ubicom, Inc. and your use of
- * this file is subject to the Ubicom Software License Agreement distributed with
- * this file. If you are uncertain whether you are an authorized user or to report
- * any unauthorized use, please contact Ubicom, Inc. at +1-408-789-2200.
- * Unauthorized reproduction or distribution of this file is subject to civil and
- * criminal penalties.
- */
-
-#ifndef __PLIO__H__
-#define __PLIO__H__
-
-#include <asm/ip5000.h>
-#include <asm/thread.h>
-
-#define PLIO_PORT		RD
-#define PLIO_EXT_PORT		RI
-
-#define TRANSMIT_FIFO_WATERMARK 8
-
-/*
- * PLIO non-blocking register definitions
- */
-#define PLIO_FN		2
-
-typedef struct {
-	unsigned	: 10;
-	unsigned	rxfifo_thread_enable: 1;   /* allowed rxfifo thread enable */
-	unsigned	: 1;
-	unsigned	rxfifo_thread: 4;          /* allowed rxfifo thread access */
-	unsigned	: 4;
-	unsigned	br_thread: 4;              /* allowed blocking region thread access */
-	unsigned	fn_reset: 4;               /* function reset bit vector */
-	unsigned	rxfifo_sel: 1;             /* select between RXFIFO 0 and 1 */
-	unsigned	fn_sel: 3;                 /* select port function */
-} plio_io_function_t;
-
-typedef struct {
-	unsigned	: 24;
-	unsigned	pin:8;
-} plio_gpio_t;
-
-typedef struct {
-	unsigned 	: 16;
-	unsigned 	txfifo_uf: 1;              /* TXFIFO underflow */
-	unsigned 	txfifo_wm: 1;              /* TXFIFO watermark */
-	unsigned 	rxfifo_of: 1;              /* RXFIFO overflow */
-	unsigned 	rxfifo_wm: 1;              /* RXFIFO watermark */
-	unsigned 	: 5;
-	unsigned 	lreg_int_addr_rd: 1;       /* read from specified LREG address */
-	unsigned 	lreg_int_addr_wr: 1;       /* write to specified LREG address */
-	unsigned 	extctl_int: 4;             /* synchronized external interrupts */
-	unsigned 	pfsm_int: 1;               /* state machine */
-} plio_intstat_t;
-
-typedef struct {
-	unsigned 	txfifo_reset: 1;           /* TXFIFO reset for int_set only */
-	unsigned 	rxfifo_reset: 1;           /* RXFIFO reset for int_set only */
-	unsigned 	: 11;
-	unsigned 	idif_txfifo_flush: 1;      /* flush TXFIFO and idif_txfifo */
-	unsigned 	idif_rxfifo_flush: 1;      /* flush RXFIFO and idif_rxfifo */
-	unsigned 	pfsm_start: 1;             /* input to fsm */
-	unsigned 	txfifo_uf: 1;              /* TXFIFO underflow */
-	unsigned 	txfifo_wm: 1;              /* TXFIFO watermark */
-	unsigned 	rxfifo_of: 1;              /* RXFIFO overflow */
-	unsigned 	rxfifo_wm: 1;              /* RXFIFO watermark */
-	unsigned 	: 5;
-	unsigned 	lreg_int_addr_rd: 1;       /* read from specified LREG address */
-	unsigned 	lreg_int_addr_wr: 1;       /* write to specified LREG address */
-	unsigned 	extctl_int: 4;             /* synchronized external interrupts */
-	unsigned 	pfsm_int: 1;               /* state machine */
-} plio_intset_t;
-
-typedef enum {
-	PLIO_PORT_MODE_D,
-	PLIO_PORT_MODE_DE,
-	PLIO_PORT_MODE_DI,
-	PLIO_PORT_MODE_DEI,
-	PLIO_PORT_MODE_DC,
-} plio_port_mode_t;
-
-typedef enum {
-	PLIO_CLK_CORE,	/* CORE CLK */
-	PLIO_CLK_IO,	/* IO CLK */
-	PLIO_CLK_EXT, 	/* EXT CLK */
-} plio_clk_src_t;
-typedef struct {
-	unsigned 		: 4;
-	unsigned 		edif_iaena_sel: 1;         /* Input Address Enable Select */
-	unsigned 		edif_iaclk_sel: 1;         /* Input Address Clock Select */
-	unsigned 		edif_iald_inv: 1;          /* Input Address Strobe Invert */
-	unsigned 		edif_idclk_sel: 1;         /* Input Data Clock Select */
-	unsigned 		edif_idld_inv: 1;          /* Input Data Strobe Invert */
-	unsigned 		edif_ds: 3;                /* specify IDR and ODR data shift */
-	unsigned 		edif_cmp_mode: 1;          /* configure IDR comparator output */
-	unsigned 		edif_idena_sel: 1;         /* Input Data Enable Select */
-	unsigned 		ecif_extclk_ena: 1;        /* plio_extctl output select */
-	unsigned 		idif_tx_fifo_cmd_sel: 1;   /* select pfsm_cmd data word position */
-	unsigned 		ptif_porti_cfg: 2;         /* select port I pin configuration */
-	unsigned 		ptif_portd_cfg: 3;         /* select port D pin configuration */
-	plio_port_mode_t	ptif_port_mode: 3;      /* select other plio ports  */
-	unsigned		icif_clk_plio_ext_inv: 1;  /* invert external plio clock when set */
-	unsigned		icif_rst_plio: 1;          /* reset plio function and io fifos */
-	plio_clk_src_t		icif_clk_src_sel: 2;      /* select plio clock source */
-	unsigned		pfsm_prog: 1;              /* enable pfsm programming */
-	unsigned 		pfsm_cmd: 3;               /* software input to pfsm */
-} plio_fctl0_t;
-
-typedef struct {
-	unsigned 	: 2;
-	unsigned 	idif_byteswap_tx: 3;       /* swap TXFIFO byte order */
-	unsigned 	idif_byteswap_rx: 3;       /* swap RXFIFO byte order */
-	unsigned 	: 1;
-	unsigned 	lreg_ena: 1;               /* enable local register map */
-	unsigned 	lreg_addr_fifo_cmp_ena: 1; /* enable a specific LREG address from/to TX/RX fifos */
-	unsigned 	lreg_addr_fifo_cmp: 5;     /* LREG address routed from/to TX/RX fifos */
-	unsigned 	: 1;
-	unsigned 	dcod_iald_idld_sel: 2;     /* select address/data strobes */
-	unsigned 	dcod_rw_src_sel: 1;        /* select LREG strobe source */
-	unsigned 	dcod_rd_sel: 5;            /* select read strobe source */
-	unsigned 	dcod_wr_sel: 5;            /* select write strobe source */
-	unsigned 	dcod_rd_lvl: 1;            /* select active level of read strobe */
-	unsigned 	dcod_wr_lvl: 1;            /* select active level of read strobe */
-} plio_fctl1_t;
-
-typedef struct {
-	unsigned 	icif_eclk_div: 16;         /* external plio clock divider */
-	unsigned 	icif_iclk_div: 16;         /* internal plio clock divider */
-} plio_fctl2_t;
-
-typedef struct {
-	unsigned 	: 27;
-	unsigned 	pfsm_state: 5;             /* current pfsm state */
-} plio_stat_0_t;
-
-typedef struct {
-	unsigned 	: 3;
-	unsigned 	lreg_r_int_addr: 5;
-	unsigned 	: 11;
-	unsigned 	lreg_w_int_addr: 5;
-	unsigned 	lreg_w_int_data: 8;
-} plio_stat_1_t;
-
-typedef struct {
-	unsigned 	: 32;
-} plio_stat_2_t;
-
-typedef struct {
-	unsigned 	tx: 16;
-	unsigned 	rx: 16;
-} plio_io_fifo_wm_t, plio_io_fifo_lvl_t;
-
-
-/* plio blocking region register definitions
- */
-typedef struct {
-	unsigned	 ns1: 5;
-	unsigned	 ic1: 7;
-	unsigned	 ec1: 4;
-	unsigned	 ns0: 5;
-	unsigned	 ic0: 7;
-	unsigned	 ec0: 4;
-} plio_sram_t;
-
-typedef struct {
-	unsigned	 : 2;
-	unsigned	 s9: 3;
-	unsigned	 s8: 3;
-	unsigned	 s7: 3;
-	unsigned	 s6: 3;
-	unsigned	 s5: 3;
-	unsigned	 s4: 3;
-	unsigned	 s3: 3;
-	unsigned	 s2: 3;
-	unsigned	 s1: 3;
-	unsigned	 s0: 3;
-} plio_grpsel_t;
-
-typedef struct {
-	unsigned 	s7: 4;
-	unsigned 	s6: 4;
-	unsigned 	s5: 4;
-	unsigned 	s4: 4;
-	unsigned 	s3: 4;
-	unsigned 	s2: 4;
-	unsigned 	s1: 4;
-	unsigned 	s0: 4;
-} plio_cs_lut_t;
-
-typedef struct {
-	unsigned 	lut3: 8;
-	unsigned 	lut2: 8;
-	unsigned 	lut1: 8;
-	unsigned 	lut0: 8;
-} plio_extctl_t;
-
-typedef struct {
-	plio_grpsel_t	grpsel[4];
-	u16_t		cv[16];
-	plio_cs_lut_t	cs_lut[4];
-	plio_extctl_t	extctl_o_lut[8];
-} plio_pfsm_t;
-
-typedef struct {
-	u32_t		odr_oe_sel;
-	u32_t		odr_oe;
-	u32_t		cmp;
-	u32_t		ncmp;
-	u32_t		cmp_mask;
-} plio_edif_t;
-
-typedef enum {
-	PLIO_ECIF_CLK_OUT	= 9,
-	PLIO_ECIF_IALD		= 9,
-	PLIO_ECIF_CLK_IN	= 8,
-	PLIO_ECIF_IDLD		= 8,
-	PLIO_ECIF_INT		= 2,
-} plio_ecif_output_t;
-
-typedef struct {
-	u32_t 		bypass_sync;
-	u32_t 		ift;
-	u32_t 		output_type;
-	u32_t 		output_ena;
-	u32_t 		output_lvl;
-} plio_ecif_t;
-
-typedef struct {
-	u32_t 		idr_addr_pos_mask;
-	u32_t 		reserved;
-	u32_t 		lreg_bar;
-} plio_dcod_t;
-
-typedef struct {
-	u32_t 		addr_rd_ena;
-	u32_t 		addr_wr_ena;
-	u32_t 		addr_rd_int_ena;
-	u32_t 		addr_wr_int_ena;
-} plio_lcfg_t;
-
-
-/*
- * PLIO configuration
- */
-typedef struct {
-	plio_fctl0_t 	fctl0;
-	plio_fctl1_t 	fctl1;
-	plio_fctl2_t 	fctl2;
-} plio_fctl_t;
-
-typedef struct {
-	plio_pfsm_t 	pfsm;
-	plio_edif_t 	edif;
-	plio_ecif_t 	ecif;
-	plio_dcod_t 	dcod;
-	plio_lcfg_t 	lcfg;
-} plio_config_t;
-
-typedef struct {
-	plio_io_function_t	function;
-	plio_gpio_t		gpio_ctl;
-	plio_gpio_t		gpio_out;
-	plio_gpio_t		gpio_in;
-	plio_intstat_t		intstat;
-	plio_intstat_t		intmask;
-	plio_intset_t		intset;
-	plio_intstat_t		intclr;
-	unsigned		tx_lo;
-	unsigned		tx_hi;
-	unsigned		rx_lo;
-	unsigned		rx_hi;
-	plio_fctl0_t		fctl0;
-	plio_fctl1_t		fctl1;
-	plio_fctl2_t		fctl2;
-	plio_stat_0_t		stat0;
-	plio_stat_1_t		stat1;
-	plio_stat_2_t		stat2;
-	plio_io_fifo_wm_t	fifo_wm;
-	plio_io_fifo_lvl_t	fifo_lvl;
-} plio_nbr_t;
-
-typedef struct {
-	u32_t			pfsm_sram[256];
-	plio_config_t		config;
-} plio_br_t;
-
-#define PLIO_NBR	((plio_nbr_t *)(PLIO_PORT))
-#define PLIO_BR		((plio_br_t *)((PLIO_PORT + IO_PORT_BR_OFFSET)))
-#define PEXT_NBR	((plio_nbr_t *)(PLIO_EXT_PORT))
-
-extern void plio_init(const plio_fctl_t *plio_fctl, const plio_config_t *plio_config, const plio_sram_t plio_sram_cfg[], int sram_cfg_size);
-
-#endif // __PLIO__H__
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/poll.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/poll.h
deleted file mode 100644
index 8e92b7637..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/poll.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * arch/ubicom32/include/asm/poll.h
- *   Ubicom32 specific poll() related flags definitions.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_POLL_H
-#define _ASM_UBICOM32_POLL_H
-
-#define POLLWRNORM	POLLOUT
-#define POLLWRBAND	0x0100
-
-#include <asm-generic/poll.h>
-
-#endif /* _ASM_UBICOM32_POLL_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/posix_types.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/posix_types.h
deleted file mode 100644
index 40b69f851..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/posix_types.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * arch/ubicom32/include/asm/posix_types.h
- *   Ubicom32 architecture posix types.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- * Copyright (C) 2004   Microtronix Datacom Ltd
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef __ARCH_UBICOM32_POSIX_TYPES_H
-#define __ARCH_UBICOM32_POSIX_TYPES_H
-
-/*
- * This file is generally used by user-level software, so you need to
- * be a little careful about namespace pollution etc.  Also, we cannot
- * assume GCC is being used.
- */
-
-typedef unsigned long	__kernel_ino_t;
-typedef unsigned short	__kernel_mode_t;
-typedef unsigned short	__kernel_nlink_t;
-typedef long		__kernel_off_t;
-typedef int		__kernel_pid_t;
-typedef unsigned short	__kernel_ipc_pid_t;
-typedef unsigned short	__kernel_uid_t;
-typedef unsigned short	__kernel_gid_t;
-typedef unsigned int	__kernel_size_t;
-typedef int		__kernel_ssize_t;
-typedef int		__kernel_ptrdiff_t;
-typedef long		__kernel_time_t;
-typedef long		__kernel_suseconds_t;
-typedef long		__kernel_clock_t;
-typedef int		__kernel_timer_t;
-typedef int		__kernel_clockid_t;
-typedef int		__kernel_daddr_t;
-typedef char *		__kernel_caddr_t;
-typedef unsigned short	__kernel_uid16_t;
-typedef unsigned short	__kernel_gid16_t;
-typedef unsigned int	__kernel_uid32_t;
-typedef unsigned int	__kernel_gid32_t;
-
-typedef unsigned short	__kernel_old_uid_t;
-typedef unsigned short	__kernel_old_gid_t;
-typedef unsigned short	__kernel_old_dev_t;
-
-#ifdef __GNUC__
-typedef long long	__kernel_loff_t;
-#endif
-
-typedef struct {
-#if defined(__KERNEL__) || defined(__USE_ALL)
-	int	val[2];
-#else /* !defined(__KERNEL__) && !defined(__USE_ALL) */
-	int	__val[2];
-#endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */
-} __kernel_fsid_t;
-
-#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
-
-#undef	__FD_SET
-#define	__FD_SET(d, set)	((set)->fds_bits[__FDELT(d)] |= __FDMASK(d))
-
-#undef	__FD_CLR
-#define	__FD_CLR(d, set)	((set)->fds_bits[__FDELT(d)] &= ~__FDMASK(d))
-
-#undef	__FD_ISSET
-#define	__FD_ISSET(d, set)	((set)->fds_bits[__FDELT(d)] & __FDMASK(d))
-
-#undef	__FD_ZERO
-#define __FD_ZERO(fdsetp) (memset (fdsetp, 0, sizeof(*(fd_set *)fdsetp)))
-
-#endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */
-
-#endif
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/processor.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/processor.h
deleted file mode 100644
index 92e49e81a..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/processor.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * arch/ubicom32/include/asm/processor.h
- *   Thread related definitions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- * Copyright (C) 1995 Hamish Macdonald
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#ifndef _ASM_UBICOM32_PROCESSOR_H
-#define _ASM_UBICOM32_PROCESSOR_H
-
-/*
- * Default implementation of macro that returns current
- * instruction pointer ("program counter").
- */
-#define current_text_addr() ({ __label__ _l; _l: &&_l;})
-
-#include <linux/compiler.h>
-#include <linux/threads.h>
-#include <asm/types.h>
-#include <asm/segment.h>
-#include <asm/fpu.h>
-#include <asm/ptrace.h>
-#include <asm/current.h>
-#include <asm/thread_info.h>
-
-#if defined(CONFIG_UBICOM32_V3)
-	#define	CPU "IP5K"
-#endif
-#if defined(CONFIG_UBICOM32_V4)
-	#define	CPU "IP7K"
-#endif
-#ifndef CPU
-	#define	CPU "UNKNOWN"
-#endif
-
-/*
- * User space process size: 1st byte beyond user address space.
- */
-extern unsigned long memory_end;
-#define TASK_SIZE	(memory_end)
-
-/*
- * This decides where the kernel will search for a free chunk of vm
- * space during mmap's. We won't be using it
- */
-#define TASK_UNMAPPED_BASE	0
-
-/*
- * This is the structure where we are going to save callee-saved registers.
- * A5 is the return address, A7 is the stack pointer, A6 is the frame
- * pointer.  This is the frame that is created because of switch_to. This
- * is not the frame due to interrupt preemption or because of syscall entry.
- */
-
-struct thread_struct {
-	unsigned long  d10;		/* D10  */
-	unsigned long  d11;		/* D11  */
-	unsigned long  d12;		/* D12  */
-	unsigned long  d13;		/* D13  */
-	unsigned long  a1;		/* A1  */
-	unsigned long  a2;		/* A2  */
-	unsigned long  a5;		/* A5 return address. */
-	unsigned long  a6;		/* A6 */
-	unsigned long  sp;		/* A7 kernel stack pointer. */
-};
-
-#define INIT_THREAD  { \
-	0, 0, 0, 0, 0, 0, 0, 0, \
-	sizeof(init_stack) + (unsigned long) init_stack - 8, \
-}
-
-/*
- * Do necessary setup to start up a newly executed thread.
- *
- * pass the data segment into user programs if it exists,
- * it can't hurt anything as far as I can tell
- */
-/*
- * Do necessary setup to start up a newly executed thread.
- */
-#define start_thread(regs, new_pc, new_sp)	 \
-	do {					 \
-		regs->pc = new_pc & ~3;		 \
-		regs->an[5] = new_pc & ~3;	 \
-		regs->an[7] = new_sp;		 \
-		regs->nesting_level = -1;	 \
-		regs->frame_type = UBICOM32_FRAME_TYPE_NEW_THREAD; \
-		regs->thread_type = NORMAL_THREAD; \
-	} while(0)
-
-/* Forward declaration, a strange C thing */
-struct task_struct;
-
-/* Free all resources held by a thread. */
-static inline void release_thread(struct task_struct *dead_task)
-{
-}
-
-/* Prepare to copy thread state - unlazy all lazy status */
-#define prepare_to_copy(tsk)	do { } while (0)
-
-extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
-
-/*
- * Free current thread data structures etc..
- */
-static inline void exit_thread(void)
-{
-}
-
-unsigned long thread_saved_pc(struct task_struct *tsk);
-unsigned long get_wchan(struct task_struct *p);
-
-#define	KSTK_EIP(tsk)	(tsk->thread.a5)
-#define	KSTK_ESP(tsk)	(tsk->thread.sp)
-
-#define cpu_relax()    barrier()
-
-extern void processor_init(void);
-extern unsigned int processor_timers(void);
-extern unsigned int processor_threads(void);
-extern unsigned int processor_frequency(void);
-extern int processor_interrupts(unsigned int *int0, unsigned int *int1);
-extern void processor_ocm(unsigned long *socm, unsigned long *eocm);
-extern void processor_dram(unsigned long *sdram, unsigned long *edram);
-
-#define THREAD_SIZE_LONGS      (THREAD_SIZE/sizeof(unsigned long))
-#define KSTK_TOP(info)                                                 \
-({                                                                     \
-       unsigned long *__ptr = (unsigned long *)(info);                 \
-       (unsigned long)(&__ptr[THREAD_SIZE_LONGS]);                     \
-})
-
-#define task_pt_regs(task)                                             \
-({                                                                     \
-       struct pt_regs *__regs__;                                       \
-       __regs__ = (struct pt_regs *)(KSTK_TOP(task_stack_page(task))-8); \
-       __regs__ - 1;                                                   \
-})
-
-#endif	/* _ASM_UBICOM32_PROCESSOR_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/profilesample.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/profilesample.h
deleted file mode 100644
index 6e42269e3..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/profilesample.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * arch/ubicom32/mach-common/profile.h
- *   Private data for the profile module
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- */
-
-
-#ifndef _PROFILESAMPLE_H_
-#define _PROFILESAMPLE_H_
-
-/*
- * a sample taken by the ipProfile package for sending to the profilertool
- */
-struct profile_sample {
-	unsigned int pc;			/* PC value */
-	unsigned int a5;			/* a5 contents for parent of leaf function */
-	unsigned int parent;			/* return address from stack, to find the caller */
-	unsigned int latency;			/* CPU clocks since the last message dispatch in this thread (thread 0 ony for now) */
-	unsigned short active;			/* which threads are active - for accurate counting */
-	unsigned short d_blocked;		/* which threads are blocked due to D cache misses */
-	unsigned short i_blocked;		/* which threads are blocked due to I cache misses */
-	unsigned char cond_codes;		/* for branch prediction */
-	unsigned char thread;			/* I-blocked, D-blocked, 4-bit thread number */
-};
-
-#endif
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ptrace.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/ptrace.h
deleted file mode 100644
index aeae2c78c..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ptrace.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * arch/ubicom32/include/asm/ptrace.h
- *   Ubicom32 architecture ptrace support.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_PTRACE_H
-#define _ASM_UBICOM32_PTRACE_H
-
-#ifndef __ASSEMBLY__
-
-/*
- * We use hard coded constants because this is shared with user
- * space and the values are NOT allowed to change.  Only fields
- * that are intended to be exposed get values.
- */
-#define PT_D0           0
-#define PT_D1           4
-#define PT_D2           8
-#define PT_D3           12
-#define PT_D4           16
-#define PT_D5           20
-#define PT_D6           24
-#define PT_D7           28
-#define PT_D8           32
-#define PT_D9           36
-#define PT_D10          40
-#define PT_D11          44
-#define PT_D12          48
-#define PT_D13          52
-#define PT_D14          56
-#define PT_D15          60
-#define PT_A0           64
-#define PT_A1           68
-#define PT_A2           72
-#define PT_A3           76
-#define PT_A4           80
-#define PT_A5           84
-#define PT_A6           88
-#define PT_A7           92
-#define PT_SP           92
-#define PT_ACC0HI       96
-#define PT_ACC0LO       100
-#define PT_MAC_RC16     104
-#define PT_ACC1HI       108
-#define PT_ACC1LO       112
-#define PT_SOURCE3      116
-#define PT_INST_CNT     120
-#define PT_CSR          124
-#define PT_DUMMY_UNUSED 128
-#define PT_INT_MASK0    132
-#define PT_INT_MASK1    136
-#define PT_TRAP_CAUSE   140
-#define PT_PC           144
-#define PT_ORIGINAL_D0  148
-#define PT_FRAME_TYPE   152
-
-/*
- * The following 'registers' are not registers at all but are used
- * locate the relocated sections.
- */
-#define PT_TEXT_ADDR		200
-#define PT_TEXT_END_ADDR	204
-#define PT_DATA_ADDR		208
-#define PT_EXEC_FDPIC_LOADMAP	212
-#define PT_INTERP_FDPIC_LOADMAP	216
-
-/*
- * This struct defines the way the registers are stored on the
- * stack during a system call.
- */
-enum thread_type {
-	NORMAL_THREAD,
-	KERNEL_THREAD,
-};
-
-#define UBICOM32_FRAME_TYPE_SYSCALL	-1 /* System call frame */
-#define UBICOM32_FRAME_TYPE_INVALID	0 /* Invalid frame, no longer in use */
-#define UBICOM32_FRAME_TYPE_INTERRUPT	1 /* Interrupt frame */
-#define UBICOM32_FRAME_TYPE_TRAP	2 /* Trap frame */
-#define UBICOM32_FRAME_TYPE_SIGTRAMP	3 /* Signal trampoline frame. */
-#define UBICOM32_FRAME_TYPE_NEW_THREAD	4 /* New Thread. */
-
-struct pt_regs {
-	/*
-	 * Data Registers
-	 */
-	unsigned long dn[16];
-
-	/*
-	 * Address Registers
-	 */
-	unsigned long an[8];
-
-	/*
-	 * Per thread misc registers.
-	 */
-	unsigned long acc0[2];
-	unsigned long mac_rc16;
-	unsigned long acc1[2];
-	unsigned long source3;
-	unsigned long inst_cnt;
-	unsigned long csr;
-	unsigned long dummy_unused;
-	unsigned long int_mask0;
-	unsigned long int_mask1;
-	unsigned long trap_cause;
-	unsigned long pc;
-	unsigned long original_dn_0;
-
-	/*
-	 * Frame type. Syscall frames are -1. For other types look above.
-	 */
-	unsigned long frame_type;
-
-	/*
-	 * These fields are not exposed to ptrace.
-	 */
-	unsigned long previous_pc;
-	long nesting_level;		/* When the kernel in in user space this
-					 * will be -1. */
-	unsigned long thread_type;	/* This indicates if this is a kernel
-					 * thread. */
-};
-
-/*
- * This is the extended stack used by signal handlers and the context
- * switcher: it's pushed after the normal "struct pt_regs".
- */
-struct switch_stack {
-	unsigned long  dummy;
-};
-
-#ifdef __KERNEL__
-
-/* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */
-#define PTRACE_GETREGS		12
-#define PTRACE_SETREGS		13
-
-#ifndef PS_S
-#define PS_S  (0x2000)
-#define PS_M  (0x1000)
-#endif
-
-extern  int __user_mode(unsigned long sp);
-
-#define user_mode(regs) (__user_mode((regs->an[7])))
-#define user_stack(regs) ((regs)->an[7])
-#define instruction_pointer(regs) ((regs)->pc)
-#define profile_pc(regs) instruction_pointer(regs)
-extern void show_regs(struct pt_regs *);
-#endif /* __KERNEL__ */
-
-#endif /* __ASSEMBLY__ */
-
-#endif /* _ASM_UBICOM32_PTRACE_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/range-protect-asm.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/range-protect-asm.h
deleted file mode 100644
index 87459e4e9..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/range-protect-asm.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * arch/ubicom32/include/asm/range-protect-asm.h
- *   Assembly macros for enabling memory protection.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#ifndef _ASM_UBICOM32_RANGE_PROTECT_ASM_H
-#define _ASM_UBICOM32_RANGE_PROTECT_ASM_H
-
-#if defined(__ASSEMBLY__)
-
-#include <asm/thread-asm.h>
-
-/*
- * You should only use the enable/disable ranges when you have the atomic lock,
- * if you do not there will be problems.
- */
-
-/*
- * enable_kernel_ranges
- *	Enable the kernel ranges (disabling protection) for thread,
- *	where thread == (1 << thread number)
- */
-.macro	enable_kernel_ranges thread
-#ifdef CONFIG_PROTECT_KERNEL
-	or.4	I_RANGE0_EN, I_RANGE0_EN, \thread	 /* Enable Range Register */
-	or.4	D_RANGE0_EN, D_RANGE0_EN, \thread
-	or.4	D_RANGE1_EN, D_RANGE1_EN, \thread
-#endif
-.endm
-
-/*
- * enable_kernel_ranges_for_current
- *	Enable the kernel ranges (disabling protection) for this thread
- */
-.macro	enable_kernel_ranges_for_current scratch_reg
-#ifdef CONFIG_PROTECT_KERNEL
-	thread_get_self_mask \scratch_reg
-	enable_kernel_ranges \scratch_reg
-#endif
-.endm
-
-/*
- * disable_kernel_ranges
- *	Disables the kernel ranges (enabling protection) for thread
- *	where thread == (1 << thread number)
- */
-.macro	disable_kernel_ranges thread
-#ifdef CONFIG_PROTECT_KERNEL
-	not.4	\thread, \thread
-	and.4	I_RANGE0_EN, I_RANGE0_EN, \thread	 /* Disable Range Register */
-	and.4	D_RANGE0_EN, D_RANGE0_EN, \thread
-	and.4	D_RANGE1_EN, D_RANGE1_EN, \thread
-#endif
-.endm
-
-/*
- * disable_kernel_ranges_for_current
- *	Disable kernel ranges (enabling protection) for this thread
- */
-.macro	disable_kernel_ranges_for_current scratch_reg
-#ifdef CONFIG_PROTECT_KERNEL
-	thread_get_self_mask \scratch_reg
-	disable_kernel_ranges \scratch_reg
-#endif
-.endm
-#endif
-
-#endif  /* _ASM_UBICOM32_RANGE_PROTECT_ASM_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/range-protect.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/range-protect.h
deleted file mode 100644
index b4bd2f043..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/range-protect.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * arch/ubicom32/include/asm/range-protect.h
- *   Assembly macros declared in C for enabling memory protection.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#ifndef _ASM_UBICOM32_RANGE_PROTECT_H
-#define _ASM_UBICOM32_RANGE_PROTECT_H
-
-#if !defined(__ASSEMBLY__)
-#include <asm/thread.h>
-/*
- * The following macros should be the identical to the ones in
- * range-protect-asm.h
- *
- * You should only use the enable/disable ranges when you have the atomic lock,
- * if you do not there will be problems.
- */
-
-/*
- * enable_kernel_ranges
- *	Enable the kernel ranges (disabling protection) for thread,
- *	where thread == (1 << thread number)
- */
-asm (
-	".macro	enable_kernel_ranges thread			\n\t"
-#ifdef CONFIG_PROTECT_KERNEL
-	"	or.4	I_RANGE0_EN, I_RANGE0_EN, \\thread	\n\t" /* Enable Range Register */
-	"	or.4	D_RANGE0_EN, D_RANGE0_EN, \\thread	\n\t"
-	"	or.4	D_RANGE1_EN, D_RANGE1_EN, \\thread	\n\t"
-#endif
-	".endm							\n\t"
-);
-
-#else /* __ASSEMBLY__ */
-
-#include <asm/range-protect-asm.h>
-
-#endif
-#endif  /* _ASM_UBICOM32_RANGE_PROTECT_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/resource.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/resource.h
deleted file mode 100644
index 0a59a4f25..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/resource.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * arch/ubicom32/include/asm/resource.h
- *   Generic definitions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_RESOURCE_H
-#define _ASM_UBICOM32_RESOURCE_H
-
-#include <asm-generic/resource.h>
-
-#endif /* _ASM_UBICOM32_RESOURCE_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ring_tio.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/ring_tio.h
deleted file mode 100644
index c02a44520..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ring_tio.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * arch/ubicom32/include/asm/ring_tio.h
- *   Ubicom32 architecture Ring TIO definitions.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- */
-#ifndef _ASM_UBICOM32_RING_TIO_H
-#define _ASM_UBICOM32_RING_TIO_H
-
-#include <asm/devtree.h>
-
-#define RING_TIO_NODE_VERSION	2
-
-/*
- * Devtree node for ring
- */
-struct ring_tio_node {
-	struct devtree_node	dn;
-
-	u32_t			version;
-	void			*regs;
-};
-
-extern void ring_tio_init(const char *node_name);
-
-#endif /* _ASM_UBICOM32_RING_TIO_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/scatterlist.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/scatterlist.h
deleted file mode 100644
index 4fb4df171..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/scatterlist.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * arch/ubicom32/include/asm/scatterlist.h
- *   Definitions of struct scatterlist for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_SCATTERLIST_H
-#define _ASM_UBICOM32_SCATTERLIST_H
-
-#include <linux/mm.h>
-#include <asm/types.h>
-
-struct scatterlist {
-#ifdef CONFIG_DEBUG_SG
-	unsigned long	sg_magic;
-#endif
-	unsigned long	page_link;
-	unsigned int	offset;
-	dma_addr_t	dma_address;
-	unsigned int	length;
-};
-
-#define sg_dma_address(sg)      ((sg)->dma_address)
-#define sg_dma_len(sg)          ((sg)->length)
-
-#define ISA_DMA_THRESHOLD	(0xffffffff)
-
-#endif /* _ASM_UBICOM32_SCATTERLIST_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/sd_tio.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/sd_tio.h
deleted file mode 100644
index ecb2b8272..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/sd_tio.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * arch/ubicom32/include/asm/sd_tio.h
- *   SD TIO definitions
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- */
-#ifndef _ASM_UBICOM32_SD_TIO_H
-#define _ASM_UBICOM32_SD_TIO_H
-
-#include <asm/devtree.h>
-
-/*
- * Devtree node for SD
- */
-struct sd_tio_node {
-	struct devtree_node	dn;
-	void			*regs;
-};
-
-#endif /* _ASM_UBICOM32_SD_TIO_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/sections.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/sections.h
deleted file mode 100644
index eb7d24bc2..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/sections.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * arch/ubicom32/include/asm/sections.h
- *   Generic sections.h definitions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_SECTIONS_H
-#define _ASM_UBICOM32_SECTIONS_H
-
-#include <asm-generic/sections.h>
-
-#endif /* _ASM_UBICOM32_SECTIONS_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/segment.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/segment.h
deleted file mode 100644
index 3f1049076..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/segment.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * arch/ubicom32/include/asm/segment.h
- *   Memory segment definitions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_SEGMENT_H
-#define _ASM_UBICOM32_SEGMENT_H
-
-/* define constants */
-/* Address spaces (FC0-FC2) */
-#define USER_DATA     (1)
-#ifndef __USER_DS
-#define __USER_DS     (USER_DATA)
-#endif
-#define USER_PROGRAM  (2)
-#define SUPER_DATA    (5)
-#ifndef __KERNEL_DS
-#define __KERNEL_DS   (SUPER_DATA)
-#endif
-#define SUPER_PROGRAM (6)
-#define CPU_SPACE     (7)
-
-#ifndef __ASSEMBLY__
-
-typedef struct {
-	unsigned long seg;
-} mm_segment_t;
-
-#define MAKE_MM_SEG(s)	((mm_segment_t) { (s) })
-#define USER_DS		MAKE_MM_SEG(__USER_DS)
-#define KERNEL_DS	MAKE_MM_SEG(__KERNEL_DS)
-
-/*
- * Get/set the SFC/DFC registers for MOVES instructions
- */
-
-static inline mm_segment_t get_fs(void)
-{
-    return USER_DS;
-}
-
-static inline mm_segment_t get_ds(void)
-{
-    /* return the supervisor data space code */
-    return KERNEL_DS;
-}
-
-static inline void set_fs(mm_segment_t val)
-{
-}
-
-#define segment_eq(a,b)	((a).seg == (b).seg)
-
-#endif /* __ASSEMBLY__ */
-
-#endif /* _ASM_UBICOM32_SEGMENT_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/semaphore-helper.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/semaphore-helper.h
deleted file mode 100644
index ad0aaf0a2..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/semaphore-helper.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * arch/ubicom32/include/asm/semaphore-helper.h
- *   Semaphore related definitions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_SEMAPHORE_HELPER_H
-#define _ASM_UBICOM32_SEMAPHORE_HELPER_H
-
-/*
- * SMP- and interrupt-safe semaphores helper functions.
- *
- * (C) Copyright 1996 Linus Torvalds
- *
- * m68k version by Andreas Schwab
- */
-
-
-/*
- * These two _must_ execute atomically wrt each other.
- */
-static inline void wake_one_more(struct semaphore * sem)
-{
-	atomic_inc(&sem->waking);
-}
-
-static inline int waking_non_zero(struct semaphore *sem)
-{
-	int ret;
-	unsigned long flags;
-
-	spin_lock_irqsave(&semaphore_wake_lock, flags);
-	ret = 0;
-	if (atomic_read(&sem->waking) > 0) {
-		atomic_dec(&sem->waking);
-		ret = 1;
-	}
-	spin_unlock_irqrestore(&semaphore_wake_lock, flags);
-	return ret;
-}
-
-/*
- * waking_non_zero_interruptible:
- *	1	got the lock
- *	0	go to sleep
- *	-EINTR	interrupted
- */
-static inline int waking_non_zero_interruptible(struct semaphore *sem,
-						struct task_struct *tsk)
-{
-	int ret;
-	unsigned long flags;
-
-	spin_lock_irqsave(&semaphore_wake_lock, flags);
-	ret = 0;
-	if (atomic_read(&sem->waking) > 0) {
-		atomic_dec(&sem->waking);
-		ret = 1;
-	} else if (signal_pending(tsk)) {
-		atomic_inc(&sem->count);
-		ret = -EINTR;
-	}
-	spin_unlock_irqrestore(&semaphore_wake_lock, flags);
-	return ret;
-}
-
-/*
- * waking_non_zero_trylock:
- *	1	failed to lock
- *	0	got the lock
- */
-static inline int waking_non_zero_trylock(struct semaphore *sem)
-{
-	int ret;
-	unsigned long flags;
-
-	spin_lock_irqsave(&semaphore_wake_lock, flags);
-	ret = 1;
-	if (atomic_read(&sem->waking) > 0) {
-		atomic_dec(&sem->waking);
-		ret = 0;
-	} else
-		atomic_inc(&sem->count);
-	spin_unlock_irqrestore(&semaphore_wake_lock, flags);
-	return ret;
-}
-
-#endif /* _ASM_UBICOM32_SEMAPHORE_HELPER_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/semaphore.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/semaphore.h
deleted file mode 100644
index d20ead310..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/semaphore.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * arch/ubicom32/include/asm/semaphore.h
- *   Interrupt-safe semaphores for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- * (C) Copyright 1996 Linus Torvalds
- * m68k version by Andreas Schwab
- * Copyright (C) 2004   Microtronix Datacom Ltd
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_SEMAPHORE_H
-#define _ASM_UBICOM32_SEMAPHORE_H
-
-#define RW_LOCK_BIAS		 0x01000000
-
-#ifndef __ASSEMBLY__
-
-#include <linux/linkage.h>
-#include <linux/wait.h>
-#include <linux/spinlock.h>
-#include <linux/rwsem.h>
-
-#include <asm/system.h>
-#include <asm/atomic.h>
-
-struct semaphore {
-	atomic_t count;
-	atomic_t waking;
-	wait_queue_head_t wait;
-};
-
-#define __SEMAPHORE_INITIALIZER(name, n)				\
-{									\
-	.count		= ATOMIC_INIT(n),				\
-	.waking		= ATOMIC_INIT(0),				\
-	.wait		= __WAIT_QUEUE_HEAD_INITIALIZER((name).wait)	\
-}
-
-#define __DECLARE_SEMAPHORE_GENERIC(name,count) \
-	struct semaphore name = __SEMAPHORE_INITIALIZER(name,count)
-
-#define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1)
-#define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0)
-
-static inline void sema_init (struct semaphore *sem, int val)
-{
-	*sem = (struct semaphore)__SEMAPHORE_INITIALIZER(*sem, val);
-}
-
-static inline void init_MUTEX (struct semaphore *sem)
-{
-	sema_init(sem, 1);
-}
-
-static inline void init_MUTEX_LOCKED (struct semaphore *sem)
-{
-	sema_init(sem, 0);
-}
-
-asmlinkage void __down_failed(void /* special register calling convention */);
-asmlinkage int  __down_failed_interruptible(void  /* params in registers */);
-asmlinkage int  __down_failed_trylock(void  /* params in registers */);
-asmlinkage void __up_wakeup(void /* special register calling convention */);
-
-asmlinkage void __down(struct semaphore * sem);
-asmlinkage int  __down_interruptible(struct semaphore * sem);
-asmlinkage int  __down_trylock(struct semaphore * sem);
-asmlinkage void __up(struct semaphore * sem);
-
-extern spinlock_t semaphore_wake_lock;
-
-/*
- * This is ugly, but we want the default case to fall through.
- * "down_failed" is a special asm handler that calls the C
- * routine that actually waits.
- */
-static inline void down(struct semaphore * sem)
-{
-	might_sleep();
-
-	if (atomic_dec_return(&sem->count) < 0)
-		__down(sem);
-}
-
-static inline int down_interruptible(struct semaphore * sem)
-{
-	int ret = 0;
-
-
-	might_sleep();
-
-	if(atomic_dec_return(&sem->count) < 0)
-		ret = __down_interruptible(sem);
-	return ret;
-}
-
-static inline int down_trylock(struct semaphore * sem)
-{
-	int ret = 0;
-
-	if (atomic_dec_return (&sem->count) < 0)
-		ret = __down_trylock(sem);
-	return ret;
-}
-
-/*
- * Note! This is subtle. We jump to wake people up only if
- * the semaphore was negative (== somebody was waiting on it).
- * The default case (no contention) will result in NO
- * jumps for both down() and up().
- */
-static inline void up(struct semaphore * sem)
-{
-	if (atomic_inc_return(&sem->count) <= 0)
-		__up(sem);
-}
-
-#endif /* __ASSEMBLY__ */
-
-#endif /* _ASM_UBICOM32_SEMAPHORE_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/sembuf.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/sembuf.h
deleted file mode 100644
index 996a7a011..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/sembuf.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * arch/ubicom32/include/asm/sembuf.h
- *   The semid64_ds structure for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_SEMBUF_H
-#define _ASM_UBICOM32_SEMBUF_H
-
-/*
- * The semid64_ds structure for ubicom32 architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 64-bit time_t to solve y2038 problem
- * - 2 miscellaneous 32-bit values
- */
-
-struct semid64_ds {
-	struct ipc64_perm sem_perm;		/* permissions .. see ipc.h */
-	__kernel_time_t	sem_otime;		/* last semop time */
-	unsigned long	__unused1;
-	__kernel_time_t	sem_ctime;		/* last change time */
-	unsigned long	__unused2;
-	unsigned long	sem_nsems;		/* no. of semaphores in array */
-	unsigned long	__unused3;
-	unsigned long	__unused4;
-};
-
-#endif /* _ASM_UBICOM32_SEMBUF_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/setup.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/setup.h
deleted file mode 100644
index ad8dc5760..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/setup.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * arch/ubicom32/include/asm/setup.h
- *   Kernel command line length definition.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- * Copyright (C) 2004, Microtronix Datacom Ltd., All rights reserved.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#ifndef _ASM_UBICOM32_SETUP_H
-#define _ASM_UBICOM32_SETUP_H
-
-#define COMMAND_LINE_SIZE 512
-
-#endif /* _ASM_UBICOM32_SETUP_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/shmbuf.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/shmbuf.h
deleted file mode 100644
index 7cc433966..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/shmbuf.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * arch/ubicom32/include/asm/shmbuf.h
- *   The shmid64_ds structure for the Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_SHMBUF_H
-#define _ASM_UBICOM32_SHMBUF_H
-
-/*
- * The shmid64_ds structure for m68k architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 64-bit time_t to solve y2038 problem
- * - 2 miscellaneous 32-bit values
- */
-
-struct shmid64_ds {
-	struct ipc64_perm	shm_perm;	/* operation perms */
-	size_t			shm_segsz;	/* size of segment (bytes) */
-	__kernel_time_t		shm_atime;	/* last attach time */
-	unsigned long		__unused1;
-	__kernel_time_t		shm_dtime;	/* last detach time */
-	unsigned long		__unused2;
-	__kernel_time_t		shm_ctime;	/* last change time */
-	unsigned long		__unused3;
-	__kernel_pid_t		shm_cpid;	/* pid of creator */
-	__kernel_pid_t		shm_lpid;	/* pid of last operator */
-	unsigned long		shm_nattch;	/* no. of current attaches */
-	unsigned long		__unused4;
-	unsigned long		__unused5;
-};
-
-struct shminfo64 {
-	unsigned long	shmmax;
-	unsigned long	shmmin;
-	unsigned long	shmmni;
-	unsigned long	shmseg;
-	unsigned long	shmall;
-	unsigned long	__unused1;
-	unsigned long	__unused2;
-	unsigned long	__unused3;
-	unsigned long	__unused4;
-};
-
-#endif /* _ASM_UBICOM32_SHMBUF_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/shmparam.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/shmparam.h
deleted file mode 100644
index 851d06270..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/shmparam.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * arch/ubicom32/include/asm/shmparam.h
- *   Shared memory definitions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- * Copyright (C) 2004   Microtronix Datacom Ltd
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- *   Alpha, ix86, M68K, Sparc, ...et al
- */
-#ifndef _ASM_UBICOM32_SHMPARAM_H
-#define _ASM_UBICOM32_SHMPARAM_H
-
-#define	SHMLBA		PAGE_SIZE	/* attach addr a multiple of this */
-
-#endif /* _ASM_UBICOM32_SHMPARAM_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/sigcontext.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/sigcontext.h
deleted file mode 100644
index 8bbeb82a7..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/sigcontext.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * arch/ubicom32/include/asm/sigcontext.h
- *   Definition of sigcontext struct for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_SIGCONTEXT_H
-#define _ASM_UBICOM32_SIGCONTEXT_H
-
-#include <asm/ptrace.h>
-
-struct sigcontext {
-	struct pt_regs sc_regs;
-};
-
-#endif /* _ASM_UBICOM32_SIGCONTEXT_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/siginfo.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/siginfo.h
deleted file mode 100644
index be0a4653c..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/siginfo.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * arch/ubicom32/include/asm/siginfo.h
- *   Generic siginfo.h definitions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_SIGINFO_H
-#define _ASM_UBICOM32_SIGINFO_H
-
-#include <asm-generic/siginfo.h>
-
-#endif /* _ASM_UBICOM32_SIGINFO_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/signal.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/signal.h
deleted file mode 100644
index 946b3f77d..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/signal.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * arch/ubicom32/include/asm/signal.h
- *   Signal related definitions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_SIGNAL_H
-#define _ASM_UBICOM32_SIGNAL_H
-
-#include <linux/types.h>
-
-/* Avoid too many header ordering problems.  */
-struct siginfo;
-
-#ifdef __KERNEL__
-/* Most things should be clean enough to redefine this at will, if care
-   is taken to make libc match.  */
-
-#define _NSIG		64
-#define _NSIG_BPW	32
-#define _NSIG_WORDS	(_NSIG / _NSIG_BPW)
-
-typedef unsigned long old_sigset_t;		/* at least 32 bits */
-
-typedef struct {
-	unsigned long sig[_NSIG_WORDS];
-} sigset_t;
-
-#endif /* __KERNEL__ */
-
-#define SIGHUP		 1
-#define SIGINT		 2
-#define SIGQUIT		 3
-#define SIGILL		 4
-#define SIGTRAP		 5
-#define SIGABRT		 6
-#define SIGIOT		 6
-#define SIGBUS		 7
-#define SIGFPE		 8
-#define SIGKILL		 9
-#define SIGUSR1		10
-#define SIGSEGV		11
-#define SIGUSR2		12
-#define SIGPIPE		13
-#define SIGALRM		14
-#define SIGTERM		15
-#define SIGSTKFLT	16
-#define SIGCHLD		17
-#define SIGCONT		18
-#define SIGSTOP		19
-#define SIGTSTP		20
-#define SIGTTIN		21
-#define SIGTTOU		22
-#define SIGURG		23
-#define SIGXCPU		24
-#define SIGXFSZ		25
-#define SIGVTALRM	26
-#define SIGPROF		27
-#define SIGWINCH	28
-#define SIGIO		29
-#define SIGPOLL		SIGIO
-/*
-#define SIGLOST		29
-*/
-#define SIGPWR		30
-#define SIGSYS		31
-#define	SIGUNUSED	31
-
-/* These should not be considered constants from userland.  */
-#define SIGRTMIN	32
-#define SIGRTMAX	_NSIG
-
-/*
- * SA_FLAGS values:
- *
- * SA_ONSTACK indicates that a registered stack_t will be used.
- * SA_RESTART flag to get restarting signals (which were the default long ago)
- * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
- * SA_RESETHAND clears the handler when the signal is delivered.
- * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies.
- * SA_NODEFER prevents the current signal from being masked in the handler.
- *
- * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
- * Unix names RESETHAND and NODEFER respectively.
- */
-#define SA_NOCLDSTOP	0x00000001
-#define SA_NOCLDWAIT	0x00000002
-#define SA_SIGINFO	0x00000004
-#define SA_ONSTACK	0x08000000
-#define SA_RESTART	0x10000000
-#define SA_NODEFER	0x40000000
-#define SA_RESETHAND	0x80000000
-
-#define SA_NOMASK	SA_NODEFER
-#define SA_ONESHOT	SA_RESETHAND
-
-/*
- * sigaltstack controls
- */
-#define SS_ONSTACK	1
-#define SS_DISABLE	2
-
-#define MINSIGSTKSZ	2048
-#define SIGSTKSZ	8192
-
-#include <linux/version.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)
-#include <asm-generic/signal-defs.h>
-#else
-#include <asm-generic/signal.h>
-#endif
-
-#ifdef __KERNEL__
-struct old_sigaction {
-	__sighandler_t sa_handler;
-	old_sigset_t sa_mask;
-	unsigned long sa_flags;
-	void (*sa_restorer)(void);
-};
-
-struct sigaction {
-	__sighandler_t sa_handler;
-	unsigned long sa_flags;
-	void (*sa_restorer)(void);
-	sigset_t sa_mask;		/* mask last for extensibility */
-};
-
-struct k_sigaction {
-	struct sigaction sa;
-};
-#else
-/* Here we must cater to libcs that poke about in kernel headers.  */
-
-struct sigaction {
-	union {
-	  __sighandler_t _sa_handler;
-	  void (*_sa_sigaction)(int, struct siginfo *, void *);
-	} _u;
-	sigset_t sa_mask;
-	unsigned long sa_flags;
-	void (*sa_restorer)(void);
-};
-
-#define sa_handler	_u._sa_handler
-#define sa_sigaction	_u._sa_sigaction
-
-#endif /* __KERNEL__ */
-
-typedef struct sigaltstack {
-	void *ss_sp;
-	int ss_flags;
-	size_t ss_size;
-} stack_t;
-
-#ifdef __KERNEL__
-
-#include <asm/sigcontext.h>
-#undef __HAVE_ARCH_SIG_BITOPS
-
-#define ptrace_signal_deliver(regs, cookie) do { } while (0)
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_UBICOM32_SIGNAL_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/smp.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/smp.h
deleted file mode 100644
index 651a53695..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/smp.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * arch/ubicom32/include/asm/smp.h
- *   SMP definitions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_SMP_H
-#define _ASM_UBICOM32_SMP_H
-
-#ifndef CONFIG_SMP
-#error you should not include smp.h if smp is off
-#endif
-
-#ifndef ASSEMBLY
-#include <linux/bitops.h>
-#include <linux/threads.h>
-#include <linux/cpumask.h>
-#include <asm/ip5000.h>
-
-typedef unsigned long address_t;
-extern unsigned int smp_ipi_irq;
-
-/*
- * This magic constant controls our willingness to transfer
- * a process across CPUs.
- *
- * Such a transfer incurs cache and tlb
- * misses. The current value is inherited from i386. Still needs
- * to be tuned for parisc.
- */
-#define PROC_CHANGE_PENALTY	15		/* Schedule penalty */
-#define NO_PROC_ID		0xFF		/* No processor magic marker */
-#define ANY_PROC_ID		0xFF		/* Any processor magic marker */
-
-#ifdef CONFIG_SMP
-#define raw_smp_processor_id()	(current_thread_info()->cpu)
-#endif /* CONFIG_SMP */
-
-static inline int __cpu_disable (void)
-{
-  return 0;
-}
-
-static inline void __cpu_die (unsigned int cpu)
-{
-	while(1) {
-	};
-}
-
-extern int __cpu_up(unsigned int cpu);
-extern void smp_send_timer_all(void);
-extern void smp_timer_broadcast(const struct cpumask *mask);
-extern void smp_set_affinity(unsigned int irq, const struct cpumask *dest);
-extern void arch_send_call_function_single_ipi(int cpu);
-#define arch_send_call_function_ipi_mask arch_send_call_function_ipi_mask
-extern void arch_send_call_function_ipi_mask(const struct cpumask *mask);
-
-/*
- * TODO: Once these are fully tested, we should turn them into
- * inline macros for performance.
- */
-extern unsigned long smp_get_affinity(unsigned int irq, int *all);
-extern void smp_reset_ipi(unsigned long mask);
-
-#endif /* !ASSEMBLY */
-#endif /*  _ASM_UBICOM32_SMP_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/socket.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/socket.h
deleted file mode 100644
index 24ac11314..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/socket.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * arch/ubicom32/include/asm/socket.h
- *   Socket options definitions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_SOCKET_H
-#define _ASM_UBICOM32_SOCKET_H
-
-#include <asm/sockios.h>
-
-/* For setsockopt(2) */
-#define SOL_SOCKET	1
-
-#define SO_DEBUG	1
-#define SO_REUSEADDR	2
-#define SO_TYPE		3
-#define SO_ERROR	4
-#define SO_DONTROUTE	5
-#define SO_BROADCAST	6
-#define SO_SNDBUF	7
-#define SO_RCVBUF	8
-#define SO_SNDBUFFORCE	32
-#define SO_RCVBUFFORCE	33
-#define SO_KEEPALIVE	9
-#define SO_OOBINLINE	10
-#define SO_NO_CHECK	11
-#define SO_PRIORITY	12
-#define SO_LINGER	13
-#define SO_BSDCOMPAT	14
-/* To add :#define SO_REUSEPORT 15 */
-#define SO_PASSCRED	16
-#define SO_PEERCRED	17
-#define SO_RCVLOWAT	18
-#define SO_SNDLOWAT	19
-#define SO_RCVTIMEO	20
-#define SO_SNDTIMEO	21
-
-/* Security levels - as per NRL IPv6 - don't actually do anything */
-#define SO_SECURITY_AUTHENTICATION		22
-#define SO_SECURITY_ENCRYPTION_TRANSPORT	23
-#define SO_SECURITY_ENCRYPTION_NETWORK		24
-
-#define SO_BINDTODEVICE	25
-
-/* Socket filtering */
-#define SO_ATTACH_FILTER        26
-#define SO_DETACH_FILTER        27
-
-#define SO_PEERNAME             28
-#define SO_TIMESTAMP		29
-#define SCM_TIMESTAMP		SO_TIMESTAMP
-
-#define SO_ACCEPTCONN		30
-
-#define SO_PEERSEC              31
-#define SO_PASSSEC		34
-#define SO_TIMESTAMPNS		35
-#define SCM_TIMESTAMPNS		SO_TIMESTAMPNS
-
-#define SO_MARK			36
-
-#define SO_TIMESTAMPING		37
-#define SCM_TIMESTAMPING	SO_TIMESTAMPING
-
-#define SO_PROTOCOL		38
-#define SO_DOMAIN		39
-
-#endif /* _ASM_UBICOM32_SOCKET_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/sockios.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/sockios.h
deleted file mode 100644
index 5a7708d96..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/sockios.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * arch/ubicom32/include/asm/sockios.h
- *   Socket-level ioctl definitions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_SOCKIOS_H
-#define _ASM_UBICOM32_SOCKIOS_H
-
-/* Socket-level I/O control calls. */
-#define FIOSETOWN	0x8901
-#define SIOCSPGRP	0x8902
-#define FIOGETOWN	0x8903
-#define SIOCGPGRP	0x8904
-#define SIOCATMARK	0x8905
-#define SIOCGSTAMP	0x8906		/* Get stamp (timeval) */
-#define SIOCGSTAMPNS	0x8907		/* Get stamp (timespec) */
-
-#endif /* _ASM_UBICOM32_SOCKIOS_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/spinlock.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/spinlock.h
deleted file mode 100644
index 40080584c..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/spinlock.h
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * arch/ubicom32/include/asm/spinlock.h
- *   Spinlock related definitions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_SPINLOCK_H
-#define _ASM_UBICOM32_SPINLOCK_H
-
-#include <asm/system.h>
-#include <asm/processor.h>
-#include <asm/spinlock_types.h>
-
-/*
- * __raw_spin_lock()
- *	Lock the lock.
- */
-static inline void __raw_spin_lock(raw_spinlock_t *x)
-{
-	asm volatile (
-	"1:	bset	%0, %0, #0	\n\t"
-	"	jmpne.f	1b		\n\t"
-		: "+U4" (x->lock)
-		:
-		: "memory", "cc"
-	);
-}
-
-/*
- * __raw_spin_unlock()
- *	Unlock the lock.
- */
-static inline void __raw_spin_unlock(raw_spinlock_t *x)
-{
-	asm volatile (
-	"	bclr	%0, %0, #0	\n\t"
-		: "+U4" (x->lock)
-		:
-		: "memory", "cc"
-	);
-}
-
-/*
- * __raw_spin_is_locked()
- *	Test if the lock is locked.
- */
-static inline int __raw_spin_is_locked(raw_spinlock_t *x)
-{
-	return x->lock;
-}
-
-/*
- * __raw_spin_unlock_wait()
- *	Wait for the lock to be unlocked.
- *
- * Note: the caller has not guarantee that the lock will not
- * be acquired before they get to it.
- */
-static inline void __raw_spin_unlock_wait(raw_spinlock_t *x)
-{
-	do {
-		cpu_relax();
-	} while (__raw_spin_is_locked(x));
-}
-
-/*
- * __raw_spin_trylock()
- *	Try the lock, return 0 on failure, 1 on success.
- */
-static inline int __raw_spin_trylock(raw_spinlock_t *x)
-{
-	int ret = 0;
-
-	asm volatile (
-	"	bset	%1, %1, #0	\n\t"
-	"	jmpne.f	1f		\n\t"
-	"	move.4	%0, #1		\n\t"
-	"1:				\n\t"
-		: "+r" (ret), "+U4" (x->lock)
-		:
-		: "memory", "cc"
-	);
-
-	return ret;
-}
-
-/*
- * __raw_spin_lock_flags()
- *	Spin waiting for the lock (enabling IRQ(s))
- */
-static inline void __raw_spin_lock_flags(raw_spinlock_t *x, unsigned long flags)
-{
-	mb();
-	while (!__raw_spin_trylock(x)) {
-		/*
-		 * If the flags from the IRQ are set, interrupts are disabled and we
-		 * need to re-enable them.
-		 */
-		if (!flags) {
-			cpu_relax();
-		} else {
-			raw_local_irq_enable();
-			cpu_relax();
-			raw_local_irq_disable();
-		}
-	}
-	mb();
-}
-
-/*
- * Read-write spinlocks, allowing multiple readers but only one writer.
- * Linux rwlocks are unfair to writers; they can be starved for an indefinite
- * time by readers.  With care, they can also be taken in interrupt context.
- *
- * In Ubicom32 architecture implementation, we have a spinlock and a counter.
- * Readers use the lock to serialise their access to the counter (which
- * records how many readers currently hold the lock).
- * Writers hold the spinlock, preventing any readers or other writers from
- * grabbing the rwlock.
- */
-
-/*
- * __raw_read_lock()
- *	Increment the counter in the rwlock.
- *
- * Note that we have to ensure interrupts are disabled in case we're
- * interrupted by some other code that wants to grab the same read lock
- */
-static inline void __raw_read_lock(raw_rwlock_t *rw)
-{
-	unsigned long flags;
-	raw_local_irq_save(flags);
-	__raw_spin_lock_flags(&rw->lock, flags);
-	rw->counter++;
-	__raw_spin_unlock(&rw->lock);
-	raw_local_irq_restore(flags);
-}
-
-/*
- * __raw_read_unlock()
- *	Decrement the counter.
- *
- * Note that we have to ensure interrupts are disabled in case we're
- * interrupted by some other code that wants to grab the same read lock
- */
-static inline void __raw_read_unlock(raw_rwlock_t *rw)
-{
-	unsigned long flags;
-	raw_local_irq_save(flags);
-	__raw_spin_lock_flags(&rw->lock, flags);
-	rw->counter--;
-	__raw_spin_unlock(&rw->lock);
-	raw_local_irq_restore(flags);
-}
-
-/*
- * __raw_read_trylock()
- *	Increment the counter if we can.
- *
- * Note that we have to ensure interrupts are disabled in case we're
- * interrupted by some other code that wants to grab the same read lock
- */
-static inline int __raw_read_trylock(raw_rwlock_t *rw)
-{
-	unsigned long flags;
- retry:
-	raw_local_irq_save(flags);
-	if (__raw_spin_trylock(&rw->lock)) {
-		rw->counter++;
-		__raw_spin_unlock(&rw->lock);
-		raw_local_irq_restore(flags);
-		return 1;
-	}
-
-	raw_local_irq_restore(flags);
-
-	/*
-	 * If write-locked, we fail to acquire the lock
-	 */
-	if (rw->counter < 0) {
-		return 0;
-	}
-
-	/*
-	 * Wait until we have a realistic chance at the lock
-	 */
-	while (__raw_spin_is_locked(&rw->lock) && rw->counter >= 0) {
-		cpu_relax();
-	}
-
-	goto retry;
-}
-
-/*
- * __raw_write_lock()
- *
- * Note that we have to ensure interrupts are disabled in case we're
- * interrupted by some other code that wants to read_trylock() this lock
- */
-static inline void __raw_write_lock(raw_rwlock_t *rw)
-{
-	unsigned long flags;
-retry:
-	raw_local_irq_save(flags);
-	__raw_spin_lock_flags(&rw->lock, flags);
-
-	if (rw->counter != 0) {
-		__raw_spin_unlock(&rw->lock);
-		raw_local_irq_restore(flags);
-
-		while (rw->counter != 0)
-			cpu_relax();
-
-		goto retry;
-	}
-
-	rw->counter = -1; /* mark as write-locked */
-	mb();
-	raw_local_irq_restore(flags);
-}
-
-static inline void __raw_write_unlock(raw_rwlock_t *rw)
-{
-	rw->counter = 0;
-	__raw_spin_unlock(&rw->lock);
-}
-
-/* Note that we have to ensure interrupts are disabled in case we're
- * interrupted by some other code that wants to read_trylock() this lock */
-static inline int __raw_write_trylock(raw_rwlock_t *rw)
-{
-	unsigned long flags;
-	int result = 0;
-
-	raw_local_irq_save(flags);
-	if (__raw_spin_trylock(&rw->lock)) {
-		if (rw->counter == 0) {
-			rw->counter = -1;
-			result = 1;
-		} else {
-			/* Read-locked.  Oh well. */
-			__raw_spin_unlock(&rw->lock);
-		}
-	}
-	raw_local_irq_restore(flags);
-
-	return result;
-}
-
-/*
- * read_can_lock - would read_trylock() succeed?
- * @lock: the rwlock in question.
- */
-static inline int __raw_read_can_lock(raw_rwlock_t *rw)
-{
-	return rw->counter >= 0;
-}
-
-/*
- * write_can_lock - would write_trylock() succeed?
- * @lock: the rwlock in question.
- */
-static inline int __raw_write_can_lock(raw_rwlock_t *rw)
-{
-	return !rw->counter;
-}
-
-#define __raw_read_lock_flags(lock, flags) __raw_read_lock(lock)
-#define __raw_write_lock_flags(lock, flags) __raw_write_lock(lock)
-
-#define _raw_spin_relax(lock)	cpu_relax()
-#define _raw_read_relax(lock)	cpu_relax()
-#define _raw_write_relax(lock)	cpu_relax()
-
-#endif /* _ASM_UBICOM32_SPINLOCK_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/spinlock_types.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/spinlock_types.h
deleted file mode 100644
index 3745bca63..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/spinlock_types.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * arch/ubicom32/include/asm/spinlock_types.h
- *   Spinlock related structure definitions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_SPINLOCK_TYPES_H
-#define _ASM_UBICOM32_SPINLOCK_TYPES_H
-
-typedef struct {
-	volatile unsigned int lock;
-} raw_spinlock_t;
-
-typedef struct {
-	raw_spinlock_t lock;
-	volatile int counter;
-} raw_rwlock_t;
-
-#define __RAW_SPIN_LOCK_UNLOCKED	{ 0 }
-#define __RAW_RW_LOCK_UNLOCKED		{ __RAW_SPIN_LOCK_UNLOCKED, 0 }
-
-#endif /* _ASM_UBICOM32_SPINLOCK_TYPES_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/stacktrace.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/stacktrace.h
deleted file mode 100644
index f278ac7b5..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/stacktrace.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * arch/ubicom32/include/asm/stacktrace.h
- *   Stacktrace functions for the Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_STACKTRACE_H
-#define _ASM_UBICOM32_STACKTRACE_H
-
-#define between(a, b, c)	(( \
-			((unsigned long) a) >= ((unsigned long) b)) && \
-			(((unsigned long)a) <= ((unsigned long)c)))
-
-/*
- * These symbols are filled in by the linker.
- */
-extern unsigned long _stext;
-extern unsigned long _etext;
-
-/* OCM text goes from __ocm_text_run_begin to __data_begin */
-extern unsigned long __ocm_text_run_begin;
-extern unsigned long __data_begin;
-
-/* Account for OCM case - see stacktrace.c maybe combine(also trap.c) */
-/*
- * ubicom32_is_kernel()
- *
- * 	Check to see if the given address belongs to the kernel.
- * NOMMU does not permit any other means.
- */
-static inline int ubicom32_is_kernel(unsigned long addr)
-{
-	int is_kernel = between(addr, &_stext, &_etext) || \
-			between(addr, &__ocm_text_run_begin, &__data_begin);
-
-#ifdef CONFIG_MODULES
-	if (!is_kernel)
-		is_kernel = is_module_address(addr);
-#endif
-	return is_kernel;
-}
-
-extern unsigned long stacktrace_iterate(
-				unsigned long **trace,
-				unsigned long stext, unsigned long etext,
-				unsigned long ocm_stext, unsigned long ocm_etext,
-				unsigned long sstack, unsigned long estack);
-#ifdef CONFIG_STACKTRACE
-void stacktrace_save_entries(struct task_struct *tsk, struct stack_trace *trace, unsigned long sp);
-#endif
-#endif /* _ASM_UBICOM32_STACKTRACE_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/stat.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/stat.h
deleted file mode 100644
index e333c60e6..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/stat.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * arch/ubicom32/include/asm/stat.h
- *   File status definitions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_STAT_H
-#define _ASM_UBICOM32_STAT_H
-
-struct __old_kernel_stat {
-	unsigned short st_dev;
-	unsigned short st_ino;
-	unsigned short st_mode;
-	unsigned short st_nlink;
-	unsigned short st_uid;
-	unsigned short st_gid;
-	unsigned short st_rdev;
-	unsigned long  st_size;
-	unsigned long  st_atime;
-	unsigned long  st_mtime;
-	unsigned long  st_ctime;
-};
-
-struct stat {
-	unsigned short st_dev;
-	unsigned short __pad1;
-	unsigned long  st_ino;
-	unsigned short st_mode;
-	unsigned short st_nlink;
-	unsigned short st_uid;
-	unsigned short st_gid;
-	unsigned short st_rdev;
-	unsigned short __pad2;
-	unsigned long  st_size;
-	unsigned long  st_blksize;
-	unsigned long  st_blocks;
-	unsigned long  st_atime;
-	unsigned long  __unused1;
-	unsigned long  st_mtime;
-	unsigned long  __unused2;
-	unsigned long  st_ctime;
-	unsigned long  __unused3;
-	unsigned long  __unused4;
-	unsigned long  __unused5;
-};
-
-/* This matches struct stat64 in glibc2.1, hence the absolutely
- * insane amounts of padding around dev_t's.
- */
-struct stat64 {
-	unsigned long long	st_dev;
-	unsigned char	__pad1[2];
-
-#define STAT64_HAS_BROKEN_ST_INO	1
-	unsigned long	__st_ino;
-
-	unsigned int	st_mode;
-	unsigned int	st_nlink;
-
-	unsigned long	st_uid;
-	unsigned long	st_gid;
-
-	unsigned long long	st_rdev;
-	unsigned char	__pad3[2];
-
-	long long	st_size;
-	unsigned long	st_blksize;
-
-	unsigned long long	st_blocks;	/* Number 512-byte blocks allocated. */
-
-	unsigned long	st_atime;
-	unsigned long	st_atime_nsec;
-
-	unsigned long	st_mtime;
-	unsigned long	st_mtime_nsec;
-
-	unsigned long	st_ctime;
-	unsigned long	st_ctime_nsec;
-
-	unsigned long long	st_ino;
-};
-
-#endif /* _ASM_UBICOM32_STAT_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/statfs.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/statfs.h
deleted file mode 100644
index 15890d436..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/statfs.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * arch/ubicom32/include/asm/statfs.h
- *   Generic statfs.h definitions
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_STATFS_H
-#define _ASM_UBICOM32_STATFS_H
-
-#include <asm-generic/statfs.h>
-
-#endif /* _ASM_UBICOM32_STATFS_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/string.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/string.h
deleted file mode 100644
index 7f24bf593..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/string.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * arch/ubicom32/include/asm/string.h
- *   String operation definitions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_STRING_H
-#define _ASM_UBICOM32_STRING_H
-
-#define __HAVE_ARCH_MEMSET
-extern void *memset(void *b, int c, size_t len);
-
-#define __HAVE_ARCH_MEMCPY
-extern void *memcpy(void *to, const void *from, size_t len);
-
-#define __HAVE_ARCH_MEMMOVE
-extern void * memmove(void *to, const void *from, size_t len);
-
-#endif /* _ASM_UBICOM32_STRING_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/swab.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/swab.h
deleted file mode 100644
index 180a50311..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/swab.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * arch/ubicom32/include/asm/byteorder.h
- *   Byte order swapping utility routines.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_BYTEORDER_H
-#define _ASM_UBICOM32_BYTEORDER_H
-
-#include <linux/types.h>
-
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__)
-#  define __BYTEORDER_HAS_U64__
-#  define __SWAB_64_THRU_32__
-#endif
-
-#if defined(IP7000) || defined(IP7000_REV2)
-
-#define __arch__swab16 __builtin_ubicom32_swapb_2
-#define __arch__swab32 __builtin_ubicom32_swapb_4
-
-#endif /* IP7000 */
-
-#endif /* _ASM_UBICOM32_BYTEORDER_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/switch-dev.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/switch-dev.h
deleted file mode 100644
index ed67e94aa..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/switch-dev.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * arch/ubicom32/include/asm/switch-dev.h
- *   generic Ethernet switch platform data definitions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_SWITCH_DEV_H
-#define _ASM_UBICOM32_SWITCH_DEV_H
-
-#define SWITCH_DEV_FLAG_HW_RESET	0x01
-#define SWITCH_DEV_FLAG_SW_RESET	0x02
-
-struct switch_core_platform_data {
-	/*
-	 * See flags above
-	 */
-	u32_t		flags;
-
-	/*
-	 * GPIO to use for nReset
-	 */
-	int		pin_reset;
-
-	/*
-	 * Name of this switch
-	 */
-	const char	*name;
-};
-
-#endif /* _ASM_UBICOM32_SWITCH_DEV_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/system.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/system.h
deleted file mode 100644
index c3ec6083e..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/system.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * arch/ubicom32/include/asm/system.h
- *   Low level switching definitions.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_SYSTEM_H
-#define _ASM_UBICOM32_SYSTEM_H
-
-#include <linux/irqflags.h>
-#include <linux/linkage.h>
-#include <asm/segment.h>
-#include <asm/entry.h>
-#include <asm/ldsr.h>
-#include <asm/irq.h>
-#include <asm/percpu.h>
-#include <asm/ubicom32-common.h>
-#include <asm/processor.h>
-
-/*
- * switch_to(n) should switch tasks to task ptr, first checking that
- * ptr isn't the current task, in which case it does nothing.
- */
-asmlinkage void resume(void);
-extern void *__switch_to(struct task_struct *prev,
-		struct thread_struct *prev_switch,
-		struct thread_struct *next_switch);
-
-/*
- * We will need a per linux thread sw_ksp for the switch_to macro to
- * track the kernel stack pointer for the current thread on that linux thread.
- */
-#define switch_to(prev,next,last)					\
-({									\
-	void *_last;							\
-	_last = (void *)						\
-		__switch_to(prev, &prev->thread, &next->thread);	\
-	(last) = _last;							\
-})
-
-/*
- * Force strict CPU ordering.
- * Not really required on ubicom32...
- */
-#define nop()  asm volatile ("nop"::)
-#define mb()   asm volatile (""   : : :"memory")
-#define rmb()  asm volatile (""   : : :"memory")
-#define wmb()  asm volatile (""   : : :"memory")
-#define set_mb(var, value)	({ (var) = (value); wmb(); })
-
-#ifdef CONFIG_SMP
-#define smp_mb()	mb()
-#define smp_rmb()	rmb()
-#define smp_wmb()	wmb()
-#define smp_read_barrier_depends()	read_barrier_depends()
-#else
-#define smp_mb()	mb()
-#define smp_rmb()	rmb()
-#define smp_wmb()	wmb()
-#define smp_read_barrier_depends()	do { } while(0)
-#endif
-
-#define read_barrier_depends()  ((void)0)
-
-/*
- * The following defines change how the scheduler calls the switch_to()
- * macro.
- *
- * 1) The first causes the runqueue to be unlocked on entry to
- * switch_to().  Since our ctx code does not play with the runqueue
- * we do not need it unlocked.
- *
- * 2) The later turns interrupts on during a ctxsw to reduce the latency of
- * interrupts during ctx.  At this point in the port, we believe that this
- * latency is not a problem since we have very little code to perform a ctxsw.
- */
-// #define __ARCH_WANT_UNLOCKED_CTXSW
-// #define __ARCH_WANT_INTERRUPTS_ON_CTXSW
-
-#endif /* _ASM_UBICOM32_SYSTEM_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/termbits.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/termbits.h
deleted file mode 100644
index a7b3381f8..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/termbits.h
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * arch/ubicom32/include/asm/termbits.h
- *   Terminal/serial port definitions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_TERMBITS_H
-#define _ASM_UBICOM32_TERMBITS_H
-
-#include <linux/posix_types.h>
-
-typedef unsigned char	cc_t;
-typedef unsigned int	speed_t;
-typedef unsigned int	tcflag_t;
-
-#define NCCS 19
-struct termios {
-	tcflag_t c_iflag;		/* input mode flags */
-	tcflag_t c_oflag;		/* output mode flags */
-	tcflag_t c_cflag;		/* control mode flags */
-	tcflag_t c_lflag;		/* local mode flags */
-	cc_t c_line;			/* line discipline */
-	cc_t c_cc[NCCS];		/* control characters */
-};
-
-struct termios2 {
-	tcflag_t c_iflag;		/* input mode flags */
-	tcflag_t c_oflag;		/* output mode flags */
-	tcflag_t c_cflag;		/* control mode flags */
-	tcflag_t c_lflag;		/* local mode flags */
-	cc_t c_line;			/* line discipline */
-	cc_t c_cc[NCCS];		/* control characters */
-	speed_t c_ispeed;		/* input speed */
-	speed_t c_ospeed;		/* output speed */
-};
-
-struct ktermios {
-	tcflag_t c_iflag;		/* input mode flags */
-	tcflag_t c_oflag;		/* output mode flags */
-	tcflag_t c_cflag;		/* control mode flags */
-	tcflag_t c_lflag;		/* local mode flags */
-	cc_t c_line;			/* line discipline */
-	cc_t c_cc[NCCS];		/* control characters */
-	speed_t c_ispeed;		/* input speed */
-	speed_t c_ospeed;		/* output speed */
-};
-
-/* c_cc characters */
-#define VINTR 0
-#define VQUIT 1
-#define VERASE 2
-#define VKILL 3
-#define VEOF 4
-#define VTIME 5
-#define VMIN 6
-#define VSWTC 7
-#define VSTART 8
-#define VSTOP 9
-#define VSUSP 10
-#define VEOL 11
-#define VREPRINT 12
-#define VDISCARD 13
-#define VWERASE 14
-#define VLNEXT 15
-#define VEOL2 16
-
-
-/* c_iflag bits */
-#define IGNBRK	0000001
-#define BRKINT	0000002
-#define IGNPAR	0000004
-#define PARMRK	0000010
-#define INPCK	0000020
-#define ISTRIP	0000040
-#define INLCR	0000100
-#define IGNCR	0000200
-#define ICRNL	0000400
-#define IUCLC	0001000
-#define IXON	0002000
-#define IXANY	0004000
-#define IXOFF	0010000
-#define IMAXBEL	0020000
-#define IUTF8	0040000
-
-/* c_oflag bits */
-#define OPOST	0000001
-#define OLCUC	0000002
-#define ONLCR	0000004
-#define OCRNL	0000010
-#define ONOCR	0000020
-#define ONLRET	0000040
-#define OFILL	0000100
-#define OFDEL	0000200
-#define NLDLY	0000400
-#define   NL0	0000000
-#define   NL1	0000400
-#define CRDLY	0003000
-#define   CR0	0000000
-#define   CR1	0001000
-#define   CR2	0002000
-#define   CR3	0003000
-#define TABDLY	0014000
-#define   TAB0	0000000
-#define   TAB1	0004000
-#define   TAB2	0010000
-#define   TAB3	0014000
-#define   XTABS	0014000
-#define BSDLY	0020000
-#define   BS0	0000000
-#define   BS1	0020000
-#define VTDLY	0040000
-#define   VT0	0000000
-#define   VT1	0040000
-#define FFDLY	0100000
-#define   FF0	0000000
-#define   FF1	0100000
-
-/* c_cflag bit meaning */
-#define CBAUD	0010017
-#define  B0	0000000		/* hang up */
-#define  B50	0000001
-#define  B75	0000002
-#define  B110	0000003
-#define  B134	0000004
-#define  B150	0000005
-#define  B200	0000006
-#define  B300	0000007
-#define  B600	0000010
-#define  B1200	0000011
-#define  B1800	0000012
-#define  B2400	0000013
-#define  B4800	0000014
-#define  B9600	0000015
-#define  B19200	0000016
-#define  B38400	0000017
-#define EXTA B19200
-#define EXTB B38400
-#define CSIZE	0000060
-#define   CS5	0000000
-#define   CS6	0000020
-#define   CS7	0000040
-#define   CS8	0000060
-#define CSTOPB	0000100
-#define CREAD	0000200
-#define PARENB	0000400
-#define PARODD	0001000
-#define HUPCL	0002000
-#define CLOCAL	0004000
-#define CBAUDEX 0010000
-#define    BOTHER 0010000
-#define    B57600 0010001
-#define   B115200 0010002
-#define   B230400 0010003
-#define   B460800 0010004
-#define   B500000 0010005
-#define   B576000 0010006
-#define   B921600 0010007
-#define  B1000000 0010010
-#define  B1152000 0010011
-#define  B1500000 0010012
-#define  B2000000 0010013
-#define  B2500000 0010014
-#define  B3000000 0010015
-#define  B3500000 0010016
-#define  B4000000 0010017
-#define CIBAUD	  002003600000		/* input baud rate */
-#define CMSPAR	  010000000000		/* mark or space (stick) parity */
-#define CRTSCTS	  020000000000		/* flow control */
-
-#define IBSHIFT	16			/* Shift from CBAUD to CIBAUD */
-
-/* c_lflag bits */
-#define ISIG	0000001
-#define ICANON	0000002
-#define XCASE	0000004
-#define ECHO	0000010
-#define ECHOE	0000020
-#define ECHOK	0000040
-#define ECHONL	0000100
-#define NOFLSH	0000200
-#define TOSTOP	0000400
-#define ECHOCTL	0001000
-#define ECHOPRT	0002000
-#define ECHOKE	0004000
-#define FLUSHO	0010000
-#define PENDIN	0040000
-#define IEXTEN	0100000
-
-
-/* tcflow() and TCXONC use these */
-#define	TCOOFF		0
-#define	TCOON		1
-#define	TCIOFF		2
-#define	TCION		3
-
-/* tcflush() and TCFLSH use these */
-#define	TCIFLUSH	0
-#define	TCOFLUSH	1
-#define	TCIOFLUSH	2
-
-/* tcsetattr uses these */
-#define	TCSANOW		0
-#define	TCSADRAIN	1
-#define	TCSAFLUSH	2
-
-#endif /* _ASM_UBICOM32_TERMBITS_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/termios.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/termios.h
deleted file mode 100644
index 5c16fe7e9..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/termios.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * arch/ubicom32/include/asm/termios.h
- *   Ubicom32 termio definitions.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_TERMIOS_H
-#define _ASM_UBICOM32_TERMIOS_H
-
-#include <asm/termbits.h>
-#include <asm/ioctls.h>
-
-struct winsize {
-	unsigned short ws_row;
-	unsigned short ws_col;
-	unsigned short ws_xpixel;
-	unsigned short ws_ypixel;
-};
-
-#define NCC 8
-struct termio {
-	unsigned short c_iflag;		/* input mode flags */
-	unsigned short c_oflag;		/* output mode flags */
-	unsigned short c_cflag;		/* control mode flags */
-	unsigned short c_lflag;		/* local mode flags */
-	unsigned char c_line;		/* line discipline */
-	unsigned char c_cc[NCC];	/* control characters */
-};
-
-#ifdef __KERNEL__
-/*	intr=^C		quit=^|		erase=del	kill=^U
-	eof=^D		vtime=\0	vmin=\1		sxtc=\0
-	start=^Q	stop=^S		susp=^Z		eol=\0
-	reprint=^R	discard=^U	werase=^W	lnext=^V
-	eol2=\0
-*/
-#define INIT_C_CC "\003\034\177\025\004\0\1\0\021\023\032\0\022\017\027\026\0"
-#endif
-
-/* modem lines */
-#define TIOCM_LE	0x001
-#define TIOCM_DTR	0x002
-#define TIOCM_RTS	0x004
-#define TIOCM_ST	0x008
-#define TIOCM_SR	0x010
-#define TIOCM_CTS	0x020
-#define TIOCM_CAR	0x040
-#define TIOCM_RNG	0x080
-#define TIOCM_DSR	0x100
-#define TIOCM_CD	TIOCM_CAR
-#define TIOCM_RI	TIOCM_RNG
-#define TIOCM_OUT1	0x2000
-#define TIOCM_OUT2	0x4000
-#define TIOCM_LOOP	0x8000
-
-/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
-
-#ifdef __KERNEL__
-
-/*
- * Translate a "termio" structure into a "termios". Ugh.
- */
-#define user_termio_to_kernel_termios(termios, termio) \
-({ \
-	unsigned short tmp; \
-	get_user(tmp, &(termio)->c_iflag); \
-	(termios)->c_iflag = (0xffff0000 & ((termios)->c_iflag)) | tmp; \
-	get_user(tmp, &(termio)->c_oflag); \
-	(termios)->c_oflag = (0xffff0000 & ((termios)->c_oflag)) | tmp; \
-	get_user(tmp, &(termio)->c_cflag); \
-	(termios)->c_cflag = (0xffff0000 & ((termios)->c_cflag)) | tmp; \
-	get_user(tmp, &(termio)->c_lflag); \
-	(termios)->c_lflag = (0xffff0000 & ((termios)->c_lflag)) | tmp; \
-	get_user((termios)->c_line, &(termio)->c_line); \
-	copy_from_user((termios)->c_cc, (termio)->c_cc, NCC); \
-})
-
-/*
- * Translate a "termios" structure into a "termio". Ugh.
- */
-#define kernel_termios_to_user_termio(termio, termios) \
-({ \
-	put_user((termios)->c_iflag, &(termio)->c_iflag); \
-	put_user((termios)->c_oflag, &(termio)->c_oflag); \
-	put_user((termios)->c_cflag, &(termio)->c_cflag); \
-	put_user((termios)->c_lflag, &(termio)->c_lflag); \
-	put_user((termios)->c_line,  &(termio)->c_line); \
-	copy_to_user((termio)->c_cc, (termios)->c_cc, NCC); \
-})
-
-#define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios2))
-#define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios2))
-#define user_termios_to_kernel_termios_1(k, u) copy_from_user(k, u, sizeof(struct termios))
-#define kernel_termios_to_user_termios_1(u, k) copy_to_user(u, k, sizeof(struct termios))
-
-#endif	/* __KERNEL__ */
-
-#endif /* _ASM_UBICOM32_TERMIOS_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/thread-asm.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/thread-asm.h
deleted file mode 100644
index f9566037e..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/thread-asm.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * arch/ubicom32/include/asm/thread-asm.h
- *   Ubicom32 architecture specific thread definitions.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_THREAD_ASM_H
-#define _ASM_UBICOM32_THREAD_ASM_H
-
-/*
- * thread_get_self
- *	Read and shift the current thread into reg
- *
- * Note that we don't need to mask the result as bits 6 through 31 of the
- * ROSR are zeroes.
- */
-.macro	thread_get_self reg
-	lsr.4	\reg, ROSR, #2
-.endm
-
-/*
- * thread_get_self_mask
- *	Read and shift the current thread mask into reg
- */
-.macro	thread_get_self_mask reg
-	lsr.4	\reg, ROSR, #2
-	lsl.4	\reg, #1, \reg	 /* Thread bit */
-.endm
-
-#endif /* _ASM_UBICOM32_THREAD_ASM_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/thread.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/thread.h
deleted file mode 100644
index 69c925ea4..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/thread.h
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- * arch/ubicom32/include/asm/thread.h
- *   Ubicom32 architecture specific thread definitions.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_THREAD_H
-#define _ASM_UBICOM32_THREAD_H
-
-#if !defined(__ASSEMBLY__)
-
-#include <asm/ptrace.h>
-#include <asm/ubicom32-common.h>
-
-typedef int thread_t;
-typedef unsigned char thread_type_t;
-typedef void (*thread_exec_fn_t)(void *arg);
-
-#define THREAD_NULL 0x40
-#define THREAD_TYPE_HRT (1 << 0)
-#define THREAD_TYPE_SPECIAL 0
-#define THREAD_TYPE_NORMAL 0
-#define THREAD_TYPE_BACKGROUND (1 << 1)
-
-/*
- * This is the upper bound on the maximum hardware threads that one will find
- * on a Ubicom processor. It is used to size per hardware thread data structures.
- */
-#define THREAD_ARCHITECTURAL_MAX 16
-
-/*
- * TODO: Rename this at some point to be thread_
- */
-extern unsigned int sw_ksp[THREAD_ARCHITECTURAL_MAX];
-
-
-/*
- * thread_get_self()
- */
-static inline thread_t thread_get_self(void)
-{
-	thread_t result;
-
-	/*
-	 * Note that ROSR has zeroes in bits 6 through 31 and so we don't need
-	 * to do any additional bit masking here.
-	 */
-	asm (
-		"lsr.4	%0, ROSR, #2	\n\t"
-		: "=d" (result)
-		:
-		: "cc"
-	);
-
-	return result;
-}
-
-/*
- * thread_suspend()
- */
-static inline void thread_suspend(void)
-{
-	asm volatile (
-		"suspend\n\t"
-		:
-		:
-	);
-}
-
-/*
- * thread_resume()
- */
-static inline void thread_resume(thread_t thread)
-{
-	asm volatile (
-		"move.4		MT_ACTIVE_SET, %0	\n\t"
-		"pipe_flush	0			\n\t"
-		"pipe_flush	0			\n\t"
-		:
-		: "d" (1 << thread)
-	);
-}
-
-
-
-/*
- * thread_enable_mask()
- *	Enable all threads in the mask.
- *
- * All writes to MT_EN must be protected by the MT_EN_LOCK bit
- */
-static inline void thread_enable_mask(unsigned int mask)
-{
-	/*
-	 * must flush the pipeline twice.
-	 * first pipe_flush is to ensure write to MT_EN is completed
-	 * second one is to ensure any new instructions from
-	 * the targeted thread (the one being disabled), that
-	 * are issued while the write to MT_EN is being executed,
-	 * are completed.
-	 */
-	UBICOM32_LOCK(MT_EN_LOCK_BIT);
-	asm volatile (
-		"or.4		MT_EN, MT_EN, %0	\n\t"
-		"pipe_flush	0			\n\t"
-		"pipe_flush	0			\n\t"
-		:
-		: "d" (mask)
-		: "cc"
-	);
-	UBICOM32_UNLOCK(MT_EN_LOCK_BIT);
-}
-
-/*
- * thread_enable()
- */
-static inline void thread_enable(thread_t thread)
-{
-	thread_enable_mask(1 << thread);
-}
-
-/*
- * thread_disable_mask()
- *	Disable all threads in the mask.
- *
- * All writes to MT_EN must be protected by the MT_EN_LOCK bit
- */
-static inline void thread_disable_mask(unsigned int mask)
-{
-	/*
-	 * must flush the pipeline twice.
-	 * first pipe_flush is to ensure write to MT_EN is completed
-	 * second one is to ensure any new instructions from
-	 * the targeted thread (the one being disabled), that
-	 * are issued while the write to MT_EN is being executed,
-	 * are completed.
-	 */
-	UBICOM32_LOCK(MT_EN_LOCK_BIT);
-	asm volatile (
-		"and.4		MT_EN, MT_EN, %0	\n\t"
-		"pipe_flush	0			\n\t"
-		"pipe_flush	0			\n\t"
-		:
-		: "d" (~mask)
-		: "cc"
-	);
-	UBICOM32_UNLOCK(MT_EN_LOCK_BIT);
-}
-
-/*
- * thread_disable()
- */
-static inline void thread_disable(thread_t thread)
-{
-	thread_disable_mask(1 << thread);
-}
-
-/*
- * thread_disable_others()
- *	Disable all other threads
- */
-static inline void thread_disable_others(void)
-{
-	thread_t self = thread_get_self();
-	thread_disable_mask(~(1 << self));
-}
-
-/*
- * thread_is_trapped()
- *	Is the specified tid trapped?
- */
-static inline int thread_is_trapped(thread_t tid)
-{
-	int thread_mask = (1 << tid);
-	int trap_thread;
-
-	asm (
-		"move.4		%0, MT_TRAP		\n\t"
-		: "=d" (trap_thread)
-		:
-	);
-	return (trap_thread & thread_mask);
-}
-
-/*
- * thread_is_enabled()
- *	Is the specified tid enabled?
- */
-static inline int thread_is_enabled(thread_t tid)
-{
-	int thread_mask = (1 << tid);
-	int enabled_threads;
-
-	asm (
-		"move.4		%0, MT_EN		\n\t"
-		: "=d" (enabled_threads)
-		:
-	);
-	return (enabled_threads & thread_mask);
-}
-
-/*
- * thread_get_instruction_count()
- */
-static inline unsigned int thread_get_instruction_count(void)
-{
-	unsigned int result;
-	asm (
-		"move.4		%0, INST_CNT		\n\t"
-		: "=r" (result)
-	);
-	return result;
-}
-
-/*
- * thread_get_pc()
- *	pc could point to a speculative and cancelled instruction unless thread is disabled
- */
-static inline void *thread_get_pc(thread_t thread)
-{
-	void *result;
-	asm (
-		"move.4		csr, %1		\n\t"
-		"setcsr_flush	0		\n\t"
-		"move.4		%0, pc		\n\t"
-		"move.4		csr, #0		\n\t"
-		"setcsr_flush	0		\n\t"
-		: "=r" (result)
-		: "r" ((thread << 9) | (1 << 8))
-	);
-	return result;
-}
-
-/*
- * thread_get_trap_cause()
- *	This should be called only when the thread is not running
- */
-static inline unsigned int thread_get_trap_cause(thread_t thread)
-{
-	unsigned int result;
-	asm (
-		"move.4		csr, %1		\n\t"
-		"setcsr_flush	0		\n\t"
-		"move.4		%0, trap_cause	\n\t"
-		"move.4		csr, #0		\n\t"
-		"setcsr_flush	0		\n\t"
-		: "=r" (result)
-		: "r" ((thread << 9) | (1 << 8))
-	);
-	return result;
-}
-
-/*
- * THREAD_STALL macro.
- */
-#define THREAD_STALL \
-		asm volatile ( \
-			"move.4	mt_dbg_active_clr, #-1	\n\t" \
-			"pipe_flush 0			\n\t" \
-			: \
-			: \
-		)
-
-extern unsigned int thread_get_mainline(void);
-extern void thread_set_mainline(thread_t tid);
-extern thread_t thread_alloc(void);
-extern thread_t thread_start(thread_t thread, thread_exec_fn_t exec, void *arg, unsigned int *sp_high, thread_type_t type);
-
-/*
- * asm macros
- */
-asm (
-/*
- * thread_get_self
- *	Read and shift the current thread into reg
- *
- * Note that we don't need to mask the result as bits 6 through 31 of the
- * ROSR are zeroes.
- */
-".macro	thread_get_self reg		\n\t"
-"	lsr.4	\\reg, ROSR, #2		\n\t"
-".endm					\n\t"
-
-/*
- * thread_get_self_mask
- *	Read and shift the current thread mask into reg
- */
-".macro	thread_get_self_mask reg	\n\t"
-"	lsr.4	\\reg, ROSR, #2		\n\t"
-"	lsl.4	\\reg, #1, \\reg	\n\t"	 /* Thread bit */
-".endm					\n\t"
-);
-
-#else /* __ASSEMBLY__ */
-
-#include <asm/thread-asm.h>
-
-#endif /* __ASSEMBLY__ */
-#endif /* _ASM_UBICOM32_THREAD_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/thread_info.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/thread_info.h
deleted file mode 100644
index 55c69dadd..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/thread_info.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * arch/ubicom32/include/asm/thread_info.h
- *   Ubicom32 architecture low-level thread information.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- * Adapted from the i386 and PPC versions by Greg Ungerer (gerg@snapgear.com)
- * Copyright (C) 2002  David Howells (dhowells@redhat.com)
- * - Incorporating suggestions made by Linus Torvalds and Dave Miller
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#ifndef _ASM_UBICOM32_THREAD_INFO_H
-#define _ASM_UBICOM32_THREAD_INFO_H
-
-#include <asm/page.h>
-
-/*
- * Size of kernel stack for each process. This must be a power of 2...
- */
-#ifdef CONFIG_4KSTACKS
-#define THREAD_SIZE_ORDER (0)
-#else
-#define THREAD_SIZE_ORDER (1)
-#endif
-
-/*
- * for asm files, THREAD_SIZE is now generated by asm-offsets.c
- */
-#define THREAD_SIZE (PAGE_SIZE<<THREAD_SIZE_ORDER)
-
-#ifdef __KERNEL__
-
-#ifndef __ASSEMBLY__
-
-/*
- * low level task data.
- */
-struct thread_info {
-	struct task_struct *task;		/* main task structure */
-	struct exec_domain *exec_domain;	/* execution domain */
-	unsigned long	   flags;		/* low level flags */
-	int		   cpu;			/* cpu we're on */
-	int		   preempt_count;	/* 0 => preemptable, <0 => BUG */
-	int		   interrupt_nesting; 	/* Interrupt nesting level. */
-	struct restart_block restart_block;
-};
-
-/*
- * macros/functions for gaining access to the thread information structure
- */
-#define INIT_THREAD_INFO(tsk)			\
-{						\
-	.task		= &tsk,			\
-	.exec_domain	= &default_exec_domain,	\
-	.flags		= 0,			\
-	.cpu		= 0,			\
-	.interrupt_nesting	= 0,		\
-	.restart_block	= {			\
-		.fn = do_no_restart_syscall,	\
-	},					\
-}
-
-#define init_thread_info	(init_thread_union.thread_info)
-#define init_stack		(init_thread_union.stack)
-
-
-/* how to get the thread information struct from C */
-static inline struct thread_info *current_thread_info(void)
-{
-	struct thread_info *ti;
-
-	asm (
-		"and.4	%0, sp, %1\n\t"
-		: "=&r" (ti)
-		: "d" (~(THREAD_SIZE-1))
-		: "cc"
-	);
-
-	return ti;
-}
-
-#define STACK_WARN (THREAD_SIZE / 8)
-
-#define __HAVE_ARCH_THREAD_INFO_ALLOCATOR 1
-
-/* thread information allocation */
-#define alloc_thread_info(tsk) ((struct thread_info *) \
-				__get_free_pages(GFP_KERNEL, THREAD_SIZE_ORDER))
-#define free_thread_info(ti)	free_pages((unsigned long) (ti), THREAD_SIZE_ORDER)
-#endif /* __ASSEMBLY__ */
-
-#define	PREEMPT_ACTIVE	0x4000000
-
-/*
- * thread information flag bit numbers
- */
-#define TIF_SYSCALL_TRACE	0	/* syscall trace active */
-#define TIF_SIGPENDING		1	/* signal pending */
-#define TIF_NEED_RESCHED	2	/* rescheduling necessary */
-#define TIF_POLLING_NRFLAG	3	/* true if poll_idle() is polling
-					   TIF_NEED_RESCHED */
-#define TIF_MEMDIE		4
-
-/* as above, but as bit values */
-#define _TIF_SYSCALL_TRACE	(1<<TIF_SYSCALL_TRACE)
-#define _TIF_SIGPENDING		(1<<TIF_SIGPENDING)
-#define _TIF_NEED_RESCHED	(1<<TIF_NEED_RESCHED)
-#define _TIF_POLLING_NRFLAG	(1<<TIF_POLLING_NRFLAG)
-
-#define _TIF_WORK_MASK		0x0000FFFE	/* work to do on interrupt/exception return */
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_UBICOM32_THREAD_INFO_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/timex.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/timex.h
deleted file mode 100644
index 93ee3db05..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/timex.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * arch/ubicom32/include/asm/timex.h
- *   Ubicom32 architecture timex specifications.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_TIMEX_H
-#define _ASM_UBICOM32_TIMEX_H
-
-#define CLOCK_TICK_RATE	266000000
-
-// #define ARCH_HAS_READ_CURRENT_TIMER
-
-typedef unsigned long cycles_t;
-
-static inline cycles_t get_cycles(void)
-{
-	return 0;
-}
-
-extern int timer_alloc(void);
-extern void timer_set(int timervector, unsigned int cycles);
-extern int timer_reset(int timervector, unsigned int cycles);
-extern void timer_tick_init(void);
-extern void timer_device_init(void);
-
-#if defined(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST)
-extern void local_timer_interrupt(void);
-#endif
-
-#if defined(CONFIG_LOCAL_TIMERS) || defined(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST)
-extern int local_timer_setup(unsigned int cpu);
-#endif
-
-#endif /* _ASM_UBICOM32_TIMEX_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/tlb.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/tlb.h
deleted file mode 100644
index cd45996d5..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/tlb.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * arch/ubicom32/include/asm/tlb.h
- *   Ubicom32 architecture TLB operations.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_TLB_H
-#define _ASM_UBICOM32_TLB_H
-
-/*
- * ubicom32 doesn't need any special per-pte or
- * per-vma handling..
- */
-#define tlb_start_vma(tlb, vma)	do { } while (0)
-#define tlb_end_vma(tlb, vma)	do { } while (0)
-#define __tlb_remove_tlb_entry(tlb, ptep, address)	do { } while (0)
-
-/*
- * .. because we flush the whole mm when it
- * fills up.
- */
-#define tlb_flush(tlb)
-
-#include <asm-generic/tlb.h>
-
-#endif /* _ASM_UBICOM32_TLB_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/tlbflush.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/tlbflush.h
deleted file mode 100644
index 0317aca8d..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/tlbflush.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * arch/ubicom32/include/asm/tlbflush.h
- *   TLB operations for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- * Copyright (C) 2000 Lineo, David McCullough <davidm@uclinux.org>
- * Copyright (C) 2000-2002, Greg Ungerer <gerg@snapgear.com>
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_TLB_FLUSH_H
-#define _ASM_UBICOM32_TLB_FLUSH_H
-
-#include <asm/setup.h>
-
-/*
- * flush all user-space atc entries.
- */
-static inline void __flush_tlb(void)
-{
-	BUG();
-}
-
-static inline void __flush_tlb_one(unsigned long addr)
-{
-	BUG();
-}
-
-#define flush_tlb() __flush_tlb()
-
-/*
- * flush all atc entries (both kernel and user-space entries).
- */
-static inline void flush_tlb_all(void)
-{
-	BUG();
-}
-
-static inline void flush_tlb_mm(struct mm_struct *mm)
-{
-	BUG();
-}
-
-static inline void flush_tlb_page(struct vm_area_struct *vma, unsigned long addr)
-{
-	BUG();
-}
-
-static inline void flush_tlb_range(struct mm_struct *mm,
-				   unsigned long start, unsigned long end)
-{
-	BUG();
-}
-
-static inline void flush_tlb_kernel_page(unsigned long addr)
-{
-	BUG();
-}
-
-#endif /* _ASM_UBICOM32_TLB_FLUSH_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/topology.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/topology.h
deleted file mode 100644
index b4de1437d..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/topology.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * arch/ubicom32/include/asm/topology.h
- *   Generic topology.h definitions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_TOPOLOGY_H
-#define _ASM_UBICOM32_TOPOLOGY_H
-
-#include <asm-generic/topology.h>
-
-#endif /* _ASM_UBICOM32_TOPOLOGY_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/traps.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/traps.h
deleted file mode 100644
index 9edcca9b5..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/traps.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * arch/ubicom32/include/asm/traps.h
- *   Trap related definitions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#ifndef _ASM_UBICOM32_TRAPS_H
-#define _ASM_UBICOM32_TRAPS_H
-
-/*
- * Trap causes passed from ultra to Host OS
- */
-#define TRAP_CAUSE_TOTAL		13
-#define TRAP_CAUSE_DST_RANGE_ERR	12
-#define TRAP_CAUSE_SRC1_RANGE_ERR	11
-#define TRAP_CAUSE_I_RANGE_ERR		10
-#define TRAP_CAUSE_DCAPT		9
-#define TRAP_CAUSE_DST_SERROR		8
-#define TRAP_CAUSE_SRC1_SERROR		7
-#define TRAP_CAUSE_DST_MISALIGNED	6
-#define TRAP_CAUSE_SRC1_MISALIGNED	5
-#define TRAP_CAUSE_DST_DECODE_ERR	4
-#define TRAP_CAUSE_SRC1_DECODE_ERR	3
-#define TRAP_CAUSE_ILLEGAL_INST		2
-#define TRAP_CAUSE_I_SERROR		1
-#define TRAP_CAUSE_I_DECODE_ERR		0
-
-extern void trap_handler(int irq, struct pt_regs *regs);
-extern void trap_init_interrupt(void);
-extern void unaligned_emulate(unsigned int thread);
-extern int unaligned_only(unsigned int cause);
-
-#endif /* _ASM_UBICOM32_TRAPS_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/types.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/types.h
deleted file mode 100644
index 5b960dda3..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/types.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * arch/ubicom32/include/asm/types.h
- *   Date type definitions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_TYPES_H
-#define _ASM_UBICOM32_TYPES_H
-
-/*
- * This file is never included by application software unless
- * explicitly requested (e.g., via linux/types.h) in which case the
- * application is Linux specific so (user-) name space pollution is
- * not a major issue.  However, for interoperability, libraries still
- * need to be careful to avoid a name clashes.
- */
-
-#include <asm-generic/int-ll64.h>
-
-#ifndef __ASSEMBLY__
-
-typedef unsigned short umode_t;
-
-#endif /* __ASSEMBLY__ */
-
-/*
- * These aren't exported outside the kernel to avoid name space clashes
- */
-#ifdef __KERNEL__
-
-#define BITS_PER_LONG 32
-
-#ifndef __ASSEMBLY__
-
-/* DMA addresses are always 32-bits wide */
-
-typedef u32 dma_addr_t;
-typedef u32 dma64_addr_t;
-
-/*
- * XXX These are "Ubicom style" typedefs. They should be removed in all files used by linux.
- */
-typedef u32 u32_t;
-typedef s32 s32_t;
-typedef u16 u16_t;
-typedef s16 s16_t;
-typedef u8 u8_t;
-typedef s8 s8_t;
-
-#endif /* __ASSEMBLY__ */
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_UBICOM32_TYPES_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/uaccess.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/uaccess.h
deleted file mode 100644
index eef739d12..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/uaccess.h
+++ /dev/null
@@ -1,347 +0,0 @@
-/*
- * arch/ubicom32/include/asm/uaccess.h
- *   User space memory access functions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- *   arch/alpha
- */
-#ifndef _ASM_UBICOM32_UACCESS_H
-#define _ASM_UBICOM32_UACCESS_H
-
-/*
- * User space memory access functions
- */
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/string.h>
-
-#include <asm/segment.h>
-
-#define VERIFY_READ	0
-#define VERIFY_WRITE	1
-
-/*
- * The exception table consists of pairs of addresses: the first is the
- * address of an instruction that is allowed to fault, and the second is
- * the address at which the program should continue.  No registers are
- * modified, so it is entirely up to the continuation code to figure out
- * what to do.
- *
- * All the routines below use bits of fixup code that are out of line
- * with the main instruction path.  This means when everything is well,
- * we don't even have to jump over them.  Further, they do not intrude
- * on our cache or tlb entries.
- */
-struct exception_table_entry
-{
-	unsigned long insn, fixup;
-};
-
-/*
- * Ubicom32 does not currently support the exception table handling.
- */
-extern unsigned long search_exception_table(unsigned long);
-
-
-#if defined(CONFIG_ACCESS_OK_CHECKS_ENABLED)
-extern int __access_ok(unsigned long addr, unsigned long size);
-#else
-static inline int __access_ok(unsigned long addr, unsigned long size)
-{
-	return 1;
-}
-#endif
-#define access_ok(type, addr, size) \
-	likely(__access_ok((unsigned long)(addr), (size)))
-
-/*
- * The following functions do not exist.  They keep callers
- * of put_user and get_user from passing unsupported argument
- * types.  They result in a link time error.
- */
-extern int __put_user_bad(void);
-extern int __get_user_bad(void);
-
-/*
- * __put_user_no_check()
- *	Put the requested data into the user space verifying the address
- *
- * Careful to not
- * (a) re-use the arguments for side effects (sizeof/typeof is ok)
- * (b) require any knowledge of processes at this stage
- */
-#define __put_user_no_check(x, ptr, size)		\
-({							\
-	int __pu_err = 0;				\
-	__typeof__(*(ptr)) __user *__pu_addr = (ptr);	\
-	switch (size) {					\
-	case 1:						\
-	case 2:						\
-	case 4:						\
-	case 8:						\
-		*__pu_addr = (__typeof__(*(ptr)))x;	\
-		break;					\
-	default:					\
-		__pu_err = __put_user_bad();		\
-		break;					\
-	}						\
-	__pu_err;					\
-})
-
-/*
- * __put_user_check()
- *	Put the requested data into the user space verifying the address
- *
- * Careful to not
- * (a) re-use the arguments for side effects (sizeof/typeof is ok)
- * (b) require any knowledge of processes at this stage
- *
- * If requested, access_ok() will verify that ptr is a valid user
- * pointer.
- */
-#define __put_user_check(x, ptr, size)				\
-({								\
-	int __pu_err = -EFAULT;					\
-	__typeof__(*(ptr)) __user *__pu_addr = (ptr);		\
-	if (access_ok(VERIFY_WRITE, __pu_addr, size)) {		\
-		__pu_err = 0;					\
-		switch (size) {					\
-		case 1:						\
-		case 2:						\
-		case 4:						\
-		case 8:						\
-			*__pu_addr = (__typeof__(*(ptr)))x;	\
-			break;					\
-		default:					\
-			__pu_err = __put_user_bad();		\
-			break;					\
-		}						\
-	}							\
-	__pu_err;						\
-})
-
-/*
- * __get_user_no_check()
- *	Read the value at ptr into x.
- *
- * If requested, access_ok() will verify that ptr is a valid user
- * pointer.  If the caller passes a modifying argument for ptr (e.g. x++)
- * this macro will not work.
- */
-#define __get_user_no_check(x, ptr, size)			\
-({								\
-	int __gu_err = 0;					\
-	__typeof__((x)) __gu_val = 0;				\
-	const __typeof__(*(ptr)) __user *__gu_addr = (ptr);	\
-	switch (size) {						\
-	case 1:							\
-	case 2:							\
-	case 4:							\
-	case 8:							\
-		__gu_val = (__typeof__((x)))*(__gu_addr);	\
-		break;						\
-	default:						\
-		__gu_err = __get_user_bad();			\
-		(x) = 0;					\
-		break;						\
-	}							\
-	(x) = __gu_val;						\
-	__gu_err;						\
-})
-
-/*
- * __get_user_check()
- *	Read the value at ptr into x.
- *
- * If requested, access_ok() will verify that ptr is a valid user
- * pointer.
- */
-#define __get_user_check(x, ptr, size)					\
-({									\
-	int __gu_err = -EFAULT;						\
-	__typeof__(x) __gu_val = 0;					\
-	const __typeof__(*(ptr)) __user *__gu_addr = (ptr);		\
-	if (access_ok(VERIFY_READ, __gu_addr, size)) {			\
-		__gu_err = 0;						\
-		switch (size) {						\
-		case 1:							\
-		case 2:							\
-		case 4:							\
-		case 8:							\
-			__gu_val = (__typeof__((x)))*(__gu_addr);	\
-			break;						\
-		default:						\
-			__gu_err = __get_user_bad();			\
-			(x) = 0;					\
-			break;						\
-		}							\
-	}								\
-	(x) = __gu_val;							\
-	__gu_err;							\
-})
-
-/*
- * The "xxx" versions are allowed to perform some amount of address
- * space checking.  See access_ok().
- */
-#define put_user(x,ptr) \
-	__put_user_check((__typeof__(*(ptr)))(x),(ptr), sizeof(*(ptr)))
-#define get_user(x,ptr) \
-	__get_user_check((x), (ptr), sizeof(*(ptr)))
-
-/*
- * The "__xxx" versions do not do address space checking, useful when
- * doing multiple accesses to the same area (the programmer has to do the
- * checks by hand with "access_ok()")
- */
-#define __put_user(x,ptr) \
-	__put_user_no_check((__typeof__(*(ptr)))(x),(ptr), sizeof(*(ptr)))
-#define __get_user(x,ptr) \
-	__get_user_no_check((x), (ptr), sizeof(*(ptr)))
-
-/*
- * __copy_tofrom_user_no_check()
- *	Copy the data either to or from user space.
- *
- * Return the number of bytes NOT copied.
- */
-static inline unsigned long
-__copy_tofrom_user_no_check(void *to, const void *from, unsigned long n)
-{
-	memcpy(to, from, n);
-	return 0;
-}
-
-/*
- * copy_to_user()
- * 	Copy the kernel data to user space.
- *
- * Return the number of bytes that were copied.
- */
-static inline unsigned long
-copy_to_user(void __user *to, const void *from, unsigned long n)
-{
-	if (!access_ok(VERIFY_WRITE, to, n)) {
-		return n;
-	}
-	return __copy_tofrom_user_no_check((__force void *)to, from, n);
-}
-
-/*
- * copy_from_user()
- * 	Copy the user data to kernel space.
- *
- * Return the number of bytes that were copied.  On error, we zero
- * out the destination.
- */
-static inline unsigned long
-copy_from_user(void *to, const void __user *from, unsigned long n)
-{
-	if (!access_ok(VERIFY_READ, from, n)) {
-		return n;
-	}
-	return __copy_tofrom_user_no_check(to, (__force void *)from, n);
-}
-
-#define __copy_to_user(to, from, n) \
-	__copy_tofrom_user_no_check((__force void *)to, from, n)
-#define __copy_from_user(to, from, n) \
-	__copy_tofrom_user_no_check(to, (__force void *)from, n)
-#define __copy_to_user_inatomic(to, from, n) \
-	__copy_tofrom_user_no_check((__force void *)to, from, n)
-#define __copy_from_user_inatomic(to, from, n) \
-	__copy_tofrom_user_no_check(to, (__force void *)from, n)
-
-#define copy_to_user_ret(to, from, n, retval) \
-	({ if (copy_to_user(to, from, n)) return retval; })
-
-#define copy_from_user_ret(to, from, n, retval) \
-	({ if (copy_from_user(to, from, n)) return retval; })
-
-/*
- * strncpy_from_user()
- *	Copy a null terminated string from userspace.
- *
- * dst - Destination in kernel space.  The buffer must be at least count.
- * src - Address of string in user space.
- * count - Maximum number of bytes to copy (including the trailing NULL).
- *
- * Returns the length of the string (not including the trailing NULL.  If
- * count is smaller than the length of the string, we copy count bytes
- * and return count.
- *
- */
-static inline long strncpy_from_user(char *dst, const __user char *src, long count)
-{
-	char *tmp;
-	if (!access_ok(VERIFY_READ, src, 1)) {
-		return -EFAULT;
-	}
-
-	strncpy(dst, src, count);
-	for (tmp = dst; *tmp && count > 0; tmp++, count--) {
-		;
-	}
-	return(tmp - dst);
-}
-
-/*
- * strnlen_user()
- *	Return the size of a string (including the ending 0)
- *
- * Return -EFAULT on exception, a value greater than <n> if too long
- */
-static inline long strnlen_user(const __user char *src, long n)
-{
-	if (!access_ok(VERIFY_READ, src, 1)) {
-		return -EFAULT;
-	}
-	return(strlen(src) + 1);
-}
-
-#define strlen_user(str) strnlen_user(str, 32767)
-
-/*
- * __clear_user()
- *	Zero Userspace
- */
-static inline unsigned long __clear_user(__user void *to, unsigned long n)
-{
-	memset(to, 0, n);
-	return 0;
-}
-
-/*
- * clear_user()
- *	Zero user space (check for valid addresses)
- */
-static inline unsigned long clear_user(__user void *to, unsigned long n)
-{
-	if (!access_ok(VERIFY_WRITE, to, n)) {
-		return -EFAULT;
-	}
-	return __clear_user(to, n);
-}
-
-#endif /* _ASM_UBICOM32_UACCESS_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/uart_tio.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/uart_tio.h
deleted file mode 100644
index 19ef82efa..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/uart_tio.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * arch/ubicom32/include/asm/uart_tio.h
- *   Ubicom32 architecture UART TIO definitions.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- */
-#ifndef _ASM_UBICOM32_UART_TIO_H
-#define _ASM_UBICOM32_UART_TIO_H
-
-#include <asm/devtree.h>
-
-#define UARTTIO_RX_FIFO_SIZE		16
-#define UARTTIO_TX_FIFO_SIZE		16
-
-/*
- * Interrupt flags
- */
-#define UARTTIO_UART_INT_RX		0x00000001	// set when a character has been recevied (TODO: add watermark)
-#define UARTTIO_UART_INT_RXOVF		0x00000002	// set when the receive buffer has overflowed
-#define UARTTIO_UART_INT_RXFRAME	0x00000004	// set when there has been a framing error
-
-#define UARTTIO_UART_INT_TX		0x00000100	// set every time a character is transmitted
-#define UARTTIO_UART_INT_TXBE		0x00000200	// set when the transmit buffer is empty (TODO: add watermark)
-
-#define UARTTIO_UART_FLAG_ENABLED	0x80000000
-#define UARTTIO_UART_FLAG_SET_RATE      0x00000001      // set to update baud rate
-#define UARTTIO_UART_FLAG_RESET         0x00000002      // set to reset the port
-struct uarttio_uart {
-	volatile u32_t			flags;
-
-	volatile u32_t			baud_rate;
-	volatile u32_t			current_baud_rate;
-	u32_t				bit_time;
-
-	/*
-	 * Modem status register
-	 */
-	volatile u32_t			status;
-
-	/*
-	 * Interrupt registers
-	 */
-	volatile u32_t			int_mask;
-	volatile u32_t			int_flags;
-
-	/*
-	 * Ports and pins
-	 */
-	u32_t				rx_port;
-	u32_t				tx_port;
-
-	u8_t				rx_pin;
-	u8_t				tx_pin;
-
-	/*
-	 * Configuration Data
-	 */
-	u8_t				rx_bits;
-	u8_t				rx_stop_bits;
-	u8_t				tx_bits;
-	u8_t				tx_stop_bits;
-
-	/*
-	 * RX state machine data
-	 */
-	u32_t				rx_timer;
-	u32_t				rx_bit_pos;
-	u32_t				rx_byte;
-	u32_t				rx_fifo_head;
-	u32_t				rx_fifo_tail;
-	u32_t				rx_fifo_size;
-
-	/*
-	 * TX state machine data
-	 */
-	u32_t				tx_timer;
-	u32_t				tx_bit_pos;
-	u32_t				tx_byte;
-	u32_t				tx_fifo_head;
-	u32_t				tx_fifo_tail;
-	u32_t				tx_fifo_size;
-
-	/*
-	 * FIFOs
-	 */
-	u8_t				rx_fifo[UARTTIO_RX_FIFO_SIZE];
-	u8_t				tx_fifo[UARTTIO_TX_FIFO_SIZE];
-};
-
-#define UARTTIO_VP_VERSION		1
-struct uarttio_regs {
-	u32_t				version;
-
-	u32_t				thread;
-
-	u32_t				max_uarts;
-
-	struct uarttio_uart		uarts[0];
-};
-
-#define UARTTIO_NODE_VERSION		1
-struct uarttio_node {
-	struct devtree_node		dn;
-
-	u32_t				version;
-	struct uarttio_regs		*regs;
-	u32_t				regs_sz;
-};
-
-#endif /* _ASM_UBICOM32_UART_TIO_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubi32-cs4384.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubi32-cs4384.h
deleted file mode 100644
index 18e7634ff..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubi32-cs4384.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * arch/ubicom32/include/asm/ubi32-cs4384.h
- *   Ubicom32 architecture CS4384 driver platform data definitions.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- */
-#ifndef _ASM_UBICOM32_UBI32_CS4384_H
-#define _ASM_UBICOM32_UBI32_CS4384_H
-
-enum ubi32_cs4384_mclk_source {
-	UBI32_CS4384_MCLK_PWM_0,
-	UBI32_CS4384_MCLK_PWM_1,
-	UBI32_CS4384_MCLK_PWM_2,
-	UBI32_CS4384_MCLK_CLKDIV_1,
-	UBI32_CS4384_MCLK_OTHER,
-};
-
-struct ubi32_cs4384_mclk_entry {
-	/*
-	 * Rate, in Hz, of this entry
-	 */
-	int rate;
-
-	/*
-	 * The divider to program to get the rate
-	 */
-	int div;
-};
-
-struct ubi32_cs4384_platform_data {
-	enum ubi32_cs4384_mclk_source	mclk_src;
-
-	int				n_mclk;
-	struct ubi32_cs4384_mclk_entry	*mclk_entries;
-};
-#endif /* _ASM_UBICOM32_UBI32_CS4384_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubi32-pcm.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubi32-pcm.h
deleted file mode 100644
index ab14b3681..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubi32-pcm.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * arch/ubicom32/include/asm/ubi32-pcm.h
- *   Ubicom32 architecture PCM driver platform data definitions.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- */
-#ifndef _ASM_UBICOM32_UBI32_PCM_H
-#define _ASM_UBICOM32_UBI32_PCM_H
-
-/*
- * This function is called when the sample rate has changed
- */
-typedef int (*ubi32_pcm_set_rate_fn_t)(void *appdata, int rate);
-
-struct ubi32pcm_platform_data {
-	/*
-	 * Name of the audio node/inst
-	 */
-	const char		*node_name;
-	const char		*inst_name;
-	int			inst_num;
-
-	/*
-	 * Application specific data provided when calling functions
-	 */
-	void			*appdata;
-
-	/*
-	 * Functions called when various things happen
-	 */
-	ubi32_pcm_set_rate_fn_t	set_rate;
-
-	/*
-	 * Pointer to optional upper layer data (i.e. DAC config, etc)
-	 */
-	void			*priv_data;
-};
-#endif /* _ASM_UBICOM32_UBI32_PCM_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32-common-asm.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32-common-asm.h
deleted file mode 100644
index 82696bbbf..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32-common-asm.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * arch/ubicom32/include/asm/ubicom32-common-asm.h
- *   Ubicom32 atomic lock operations.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#ifndef _ASM_UBICOM32_UBICOM32_COMMON_ASM_H
-#define _ASM_UBICOM32_UBICOM32_COMMON_ASM_H
-
-/*
- * atomic_lock_acquire macro
- *	Equivalent to __atomic_lock_acquire()
- */
-.macro atomic_lock_acquire
-	bset scratchpad1, scratchpad1, #ATOMIC_LOCK_BIT
-	jmpne.f	.-4
-.endm
-
-/*
- * atomic_lock_release macro
- *	Equivalent to __atomic_lock_release()
- */
-.macro atomic_lock_release
-	bclr scratchpad1, scratchpad1, #ATOMIC_LOCK_BIT
-.endm
-
-#endif /* _ASM_UBICOM32_UBICOM32_COMMON_ASM_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32-common.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32-common.h
deleted file mode 100644
index 1f05a8cd3..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32-common.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * arch/ubicom32/include/asm/ubicom32-common.h
- *   Ubicom32 atomic lock operations.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#ifndef _ASM_UBICOM32_UBICOM32_COMMON_H
-#define _ASM_UBICOM32_UBICOM32_COMMON_H
-
-#define S(arg) #arg
-#define D(arg) S(arg)
-/*
- * scratchpad1 is owned by the LDSR.
- *
- * The upper bits provide 16 global spinlocks.  Acquiring one of these
- * global spinlocks synchornizes across multiple threads and prevents
- * the LDSR from delivering any interrupts while the lock is held.
- * Use these locks only when absolutely required.
- *
- * The lower 16 bits of scratchpad1 are used as per thread interrupt
- * enable/disable bits.  These bits will prevent a thread from receiving
- * any interrupts.
- *
- * Bit Usage:
- * - MT_EN_LOCK_BIT   - Protects writes to MT_EN, so code can read current value
- *			then write a new value atomically (profiler for example)
- * - ATOMIC_LOCK_BIT - Used to provide general purpose atomic handling.
- * - LDSR_LOCK_BIT   - Used by the LDSR exclusively to provide protection.
- * - DCCR_LOCK_BIT   - Used to limit access to the DCCR cache control peripheral
- * - ICCR_LOCK_BIT   - Used to limit access to the ICCR cache control peripheral
- * - LSB 16 bits     - Used by the LDSR to represent thread enable/disable bits.
- */
-#define MT_EN_LOCK_BIT	31
-#define ATOMIC_LOCK_BIT 30
-#define LDSR_LOCK_BIT   29
-#define PCI_LOCK_BIT	28
-#define ICCR_LOCK_BIT	27
-#define DCCR_LOCK_BIT	26
-
-#if !defined(__ASSEMBLY__)
-
-#define UBICOM32_TRYLOCK(bit) \
-	asm volatile (						      \
-	"	move.4 %0, #0					\n\t" \
-	"	bset scratchpad1, scratchpad1, #"D(bit)"	\n\t" \
-	"	jmpne.f	1f					\n\t" \
-	"	move.4 %0, #1					\n\t" \
-	"1:							\n\t" \
-		: "=r" (ret)					      \
-		:						      \
-		: "cc", "memory"				      \
-	)							      \
-
-#define UBICOM32_UNLOCK(bit) \
-	asm volatile (						      \
-	"	bclr scratchpad1, scratchpad1, #"D(bit)"	\n\t" \
-		:						      \
-		:						      \
-		: "cc", "memory"				      \
-	)							      \
-
-#define UBICOM32_LOCK(bit) \
-	asm volatile (						      \
-	"1:	bset scratchpad1, scratchpad1, #"D(bit)"	\n\t" \
-	"	jmpne.f	1b					\n\t" \
-		:						      \
-		:						      \
-		: "cc", "memory"				      \
-	)							      \
-
-/*
- * __atomic_lock_trylock()
- *	Attempt to acquire the lock, return TRUE if acquired.
- */
-static inline int __atomic_lock_trylock(void)
-{
-	int ret;
-	UBICOM32_TRYLOCK(ATOMIC_LOCK_BIT);
-	return ret;
-}
-
-/*
- * __atomic_lock_release()
- *	Release the global atomic lock.
- *
- * Note: no one is suspended waiting since this lock is a spinning lock.
- */
-static inline void __atomic_lock_release(void)
-{
-	UBICOM32_UNLOCK(ATOMIC_LOCK_BIT);
-}
-
-/*
- * __atomic_lock_acquire()
- *	Acquire the global atomic lock, spin if not available.
- */
-static inline void __atomic_lock_acquire(void)
-{
-	UBICOM32_LOCK(ATOMIC_LOCK_BIT);
-}
-#else /* __ASSEMBLY__ */
-
-#include <asm/ubicom32-common-asm.h>
-
-#endif /* __ASSEMBLY__ */
-#endif /* _ASM_UBICOM32_UBICOM32_COMMON_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32-spi-gpio.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32-spi-gpio.h
deleted file mode 100644
index b5379e3ef..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32-spi-gpio.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * arch/ubicom32/include/asm/ubicom32-spi-gpio.h
- *   Platform driver data definitions for GPIO based SPI driver.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_UBICOM32_SPI_GPIO_H
-#define _ASM_UBICOM32_UBICOM32_SPI_GPIO_H
-
-struct ubicom32_spi_gpio_platform_data {
-	/*
-	 * GPIO to use for MOSI, MISO, CLK
-	 */
-	int	pin_mosi;
-	int	pin_miso;
-	int	pin_clk;
-
-	/*
-	 * Default state of CLK line
-	 */
-	int	clk_default;
-
-	/*
-	 * Number of chip selects on this bus
-	 */
-	int	num_chipselect;
-
-	/*
-	 * The bus number of this chip
-	 */
-	int	bus_num;
-};
-
-struct ubicom32_spi_gpio_controller_data {
-	/*
-	 * GPIO to use for chip select
-	 */
-	int	pin_cs;
-};
-
-#endif /* _ASM_UBICOM32_UBICOM32_SPI_GPIO_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32-tio.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32-tio.h
deleted file mode 100644
index 4d87e5c0e..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32-tio.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * arch/ubicom32/include/asm/ubicom32-tio.h
- *   Threaded I/O interface definitions.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_UBICOM32_TIO_H
-#define _ASM_UBICOM32_UBICOM32_TIO_H
-
-extern u8_t usb_tio_read_u16(u32_t address, u16_t *data);
-extern u8_t usb_tio_read_u8(u32_t address, u8_t *data);
-
-extern u8_t usb_tio_write_u16(u32_t address, u16_t data);
-extern u8_t usb_tio_write_u8(u32_t address, u8_t data);
-
-extern u8_t usb_tio_read_fifo(u32_t address, u32_t buffer, u32_t bytes);
-extern u8_t usb_tio_write_fifo(u32_t address, u32_t buffer, u32_t bytes);
-extern u8_t usb_tio_write_fifo_sync(u32_t address, u32_t buffer, u32_t bytes);
-extern void usb_tio_read_int_status(u8_t *int_usb, u16_t *int_tx, u16_t *int_rx);
-
-#endif /* _ASM_UBICOM32_UBICOM32_TIO_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32bl.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32bl.h
deleted file mode 100644
index 498c75496..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32bl.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * arch/ubicom32/include/asm/ubicom32bl.h
- *   Ubicom32 architecture backlight driver platform data definitions.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_UBICOM32_BL_H
-#define _ASM_UBICOM32_UBICOM32_BL_H
-
-/*
- * Different backlight control mechanisms
- */
-enum ubicom32bl_pwm_types {
-	/*
-	 * PWM controlled backlight
-	 */
-	UBICOM32BL_TYPE_PWM,
-
-	/*
-	 * HRT based PWM backlight
-	 */
-	UBICOM32BL_TYPE_PWM_HRT,
-
-	/*
-	 * No dimming, just on or off
-	 */
-	UBICOM32BL_TYPE_BINARY,
-};
-
-struct ubicom32bl_platform_data {
-	/*
-	 * Default intensity of the backlight 0-255
-	 */
-	u8_t				default_intensity;
-
-	/*
-	 * TRUE if the backlight sense is active low. (inverted)
-	 * FALSE if the backlight sense is active high.
-	 */
-	bool				invert;
-
-	/*
-	 * Type of the backlight
-	 */
-	enum ubicom32bl_pwm_types	type;
-
-	/*
-	 * GPIO of the backlight if UBICOM32BL_TYPE_PWM_HRT, UBICOM32BL_TYPE_BINARY
-	 */
-	unsigned			gpio;
-
-	/*
-	 * PWM channel and parameters of the backlight if UBICOM32BL_TYPE_PWM
-	 *	pre_scaler: sets the rate at which the PWM timer is clocked. (clk_core / 2^pre_scaler)
-	 *	period: sets the period of the timer in timer cycles
-	 * The duty cycle will be directly proportional to the brightness setting.
-	 */
-	u32_t				pwm_channel;
-	u8_t				pwm_prescale;
-	u16_t				pwm_period;
-};
-
-#endif /* _ASM_UBICOM32_UBICOM32_BL_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32fb.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32fb.h
deleted file mode 100644
index ae994e261..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32fb.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * arch/ubicom32/include/asm/ubicom32fb.h
- *   Ubicom32 architecture video frame buffer definitions.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- */
-#ifndef _ASM_UBICOM32_UBICOM32FB_H
-#define _ASM_UBICOM32_UBICOM32FB_H
-
-#include <linux/ioctl.h>
-
-/*
- * Set next frame
- */
-#define UBICOM32FB_IOCTL_SET_NEXT_FRAME		_IOW('r',  1, void *)
-#define UBICOM32FB_IOCTL_SET_NEXT_FRAME_SYNC	_IOW('r',  2, void *)
-
-/*
- * Set Mode
- */
-#define UBICOM32FB_IOCTL_SET_MODE		_IOW('r',  3, void *)
-struct ubicom32fb_mode {
-	unsigned long	width;
-	unsigned long	height;
-	unsigned long	flags;
-	void		*next_frame;
-};
-#define UBICOM32FB_IOCTL_SET_MODE_FLAG_YUV_SCAN_ORDER	(1 << 8)
-
-#define UBICOM32FB_IOCTL_SET_MODE_FLAG_YUV_BLOCK_ORDER	(1 << 7)
-#define UBICOM32FB_IOCTL_SET_MODE_FLAG_YUV		(1 << 6)
-#define UBICOM32FB_IOCTL_SET_MODE_FLAG_VSUB		(1 << 5)
-#define UBICOM32FB_IOCTL_SET_MODE_FLAG_VRANGE_16_255	(1 << 4)
-
-#define UBICOM32FB_IOCTL_SET_MODE_FLAG_VRANGE_0_255	(1 << 3)
-#define UBICOM32FB_IOCTL_SET_MODE_FLAG_HSUB_2_1		(1 << 2)
-#define UBICOM32FB_IOCTL_SET_MODE_FLAG_HSUB_1_1		(1 << 1)
-#define UBICOM32FB_IOCTL_SET_MODE_FLAG_SCALE_ENABLE	(1 << 0)
-
-#endif /* _ASM_UBICOM32_UBICOM32FB_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32hid.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32hid.h
deleted file mode 100644
index d324313f1..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32hid.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * arch/ubicom32/include/asm/ubicom32hid.h
- *   Ubicom32 architecture HID driver platform data definitions.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_UBICOM32_HID_H
-#define _ASM_UBICOM32_UBICOM32_HID_H
-
-enum ubicom32hid_bl_types {
-	/*
-	 * On or off, using command SET_BL_EN, PB4
-	 */
-	UBICOM32HID_BL_TYPE_BINARY,
-
-	/*
-	 * Dimmable, using command SET_PWM, PB3
-	 */
-	UBICOM32HID_BL_TYPE_PWM,
-};
-
-/*
- * IR code mapping to event code.
- *	If there are no button mappings and no ir mappings
- *	then no input driver will be registered.
- */
-struct ubicom32hid_ir {
-	/*
-	 * Input event code (KEY_*, SW_*, etc)
-	 */
-	int		code;
-
-	/*
-	 * Input event type (EV_KEY, EV_SW, etc)
-	 */
-	int		type;
-
-	/*
-	 * The IR code of this button.
-	 */
-	uint32_t	ir_code;
-};
-
-/*
- * Button mapping to event code.
- *	If there are no button mappings and no ir mappings
- *	then no input driver will be registered.
- */
-struct ubicom32hid_button {
-	/*
-	 * Input event code (KEY_*, SW_*, etc)
-	 */
-	int		code;
-
-	/*
-	 * Input event type (EV_KEY, EV_SW, etc)
-	 */
-	int		type;
-
-	/*
-	 * Bit number of this button.
-	 */
-	uint8_t		bit;
-};
-
-struct ubicom32hid_platform_data {
-	/*
-	 * Default intensity of the backlight 0-255
-	 */
-	u8_t				default_intensity;
-
-	/*
-	 * GPIO number of the reset line and its polarity.
-	 */
-	unsigned			gpio_reset;
-	int				gpio_reset_polarity;
-
-	/*
-	 * TRUE if the backlight sense is active low. (inverted)
-	 * FALSE if the backlight sense is active high.
-	 */
-	bool				invert;
-
-	/*
-	 * Type of the backlight we are controlling
-	 */
-	enum ubicom32hid_bl_types	type;
-
-	/*
-	 * Optional polling rate for input, in ms, defaults to 100ms
-	 */
-	int				poll_interval;
-
-	/*
-	 * Optional name to register as input device
-	 */
-	const char			*input_name;
-
-	/*
-	 * Button mapping array
-	 */
-	const struct ubicom32hid_button	*buttons;
-	int				nbuttons;
-
-	/*
-	 * IR mapping array
-	 */
-	const struct ubicom32hid_ir	*ircodes;
-	int				nircodes;
-};
-
-#endif /* _ASM_UBICOM32_UBICOM32_HID_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32input.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32input.h
deleted file mode 100644
index dea5c7928..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32input.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * arch/ubicom32/include/asm/ubicom32input.h
- *   Ubicom32 Input driver, based on gpio-keys
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- *
- * TODO: add groups for inputs which can be sampled together
- */
-
-#ifndef _ASM_UBICOM32_UBICOM32_INPUT_H
-#define _ASM_UBICOM32_UBICOM32_INPUT_H
-
-struct ubicom32input_button {
-	/*
-	 * Input event code (KEY_*, SW_*, etc)
-	 */
-	int		code;
-
-	/*
-	 * Input event type (EV_KEY, EV_SW, etc)
-	 */
-	int		type;
-
-	/*
-	 * GPIO to poll
-	 */
-	int		gpio;
-
-	/*
-	 * 1 for active low, 0 for active high
-	 */
-	int		active_low;
-
-	/*
-	 * Description, used for reserving GPIOs
-	 */
-	const char	*desc;
-};
-
-struct ubicom32input_platform_data {
-	struct ubicom32input_button	*buttons;
-	int				nbuttons;
-
-	/*
-	 * Optional poll interval, in ms, defaults to 50ms
-	 */
-	int				poll_interval;
-
-	/*
-	 * Option Name of this driver
-	 */
-	const char			*name;
-};
-
-#endif /* _ASM_UBICOM32_UBICOM32_INPUT_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32input_i2c.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32input_i2c.h
deleted file mode 100644
index eb1672375..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32input_i2c.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * arch/ubicom32/include/asm/ubicom32input_i2c.h
- *   Ubicom32 architecture Input driver over I2C platform data definitions.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- *
- * TODO: add groups for inputs which can be sampled together
- */
-
-#ifndef _ASM_UBICOM32_UBICOM32_INPUT_I2C_H
-#define _ASM_UBICOM32_UBICOM32_INPUT_I2C_H
-
-struct ubicom32input_i2c_button {
-	/*
-	 * Input event code (KEY_*, SW_*, etc)
-	 */
-	int		code;
-
-	/*
-	 * Input event type (EV_KEY, EV_SW, etc)
-	 */
-	int		type;
-
-	/*
-	 * Bit number of this button. (0 - ngpio)
-	 */
-	int		bit;
-
-	/*
-	 * 1 for active low, 0 for active high
-	 */
-	int		active_low;
-};
-
-struct ubicom32input_i2c_platform_data {
-	struct ubicom32input_i2c_button	*buttons;
-	int				nbuttons;
-
-	/*
-	 * Optional poll interval, in ms, defaults to 100ms
-	 */
-	int				poll_interval;
-
-	/*
-	 * Option Name of this driver
-	 */
-	const char			*name;
-};
-
-#endif /* _ASM_UBICOM32_UBICOM32_INPUT_I2C_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32lcd.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32lcd.h
deleted file mode 100644
index eea5340fd..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32lcd.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * arch/ubicom32/include/asm/ubicom32lcd.h
- *   Ubicom32 architecture LCD driver platform data definitions.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- */
-#ifndef _ASM_UBICOM32_UBICOM32_LCD_H
-#define _ASM_UBICOM32_UBICOM32_LCD_H
-
-#include <asm/ip5000.h>
-
-struct ubicom32lcd_platform_data {
-	int			pin_cs;
-	int			pin_rs;
-	int			pin_rd;
-	int			pin_wr;
-	int			pin_reset;
-	int			data_shift;
-	struct ubicom32_io_port	*port_data;
-};
-
-#endif /* _ASM_UBICOM32_UBICOM32_LCD_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32lcdpower.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32lcdpower.h
deleted file mode 100644
index 03b8a7eaa..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32lcdpower.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * arch/ubicom32/include/asm/ubicom32lcdpower.h
- *   Ubicom32 architecture LCD driver platform data definitions.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_UBICOM32_LCDPOWER_H
-#define _ASM_UBICOM32_UBICOM32_LCDPOWER_H
-
-struct ubicom32lcdpower_platform_data {
-	/*
-	 * GPIO and polarity for VGH signal.  A FALSE polarity is active low, TRUE is active high.
-	 */
-	int		vgh_gpio;
-	bool		vgh_polarity;
-};
-
-#endif /* _ASM_UBICOM32_UBICOM32_LCDPOWER_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32ring.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32ring.h
deleted file mode 100644
index dd9c8f76c..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32ring.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * arch/ubicom32/include/asm/ubicom32ring.h
- * Userspace I/O platform driver for Ubicom32 ring buffers
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef _ASM_UBICOM32_UBICOM32RING_H
-#define _ASM_UBICOM32_UBICOM32RING_H
-
-#define UIO_UBICOM32RING_REG_VERSION	2
-
-struct uio_ubicom32ring_desc {
-	volatile unsigned int		head;
-	volatile unsigned int		tail;
-	unsigned int			entries;
-	volatile unsigned int		ring[0];
-};
-
-struct uio_ubicom32ring_regs {
-	unsigned int			version;
-
-	/*
-	 * Magic type used to identify the ring set.  Each driver will
-	 * have a different magic value.
-	 */
-	unsigned int			magic;
-
-	/*
-	 * Registers defined by the driver
-	 */
-	unsigned int			regs_size;
-	void				*regs;
-
-	/*
-	 * The locations of the rings
-	 *
-	 * DO NOT ADD ANYTHING BELOW THIS LINE
-	 */
-	unsigned int			num_rings;
-	struct uio_ubicom32ring_desc	*rings[0];
-};
-
-/*
- * ringtio_ring_flush
- */
-static inline void ringtio_ring_flush(struct uio_ubicom32ring_desc *rd)
-{
-	rd->head = rd->tail = 0;
-}
-
-/*
- * ringtio_ring_get
- */
-static inline int ringtio_ring_get(struct uio_ubicom32ring_desc *rd, void **val)
-{
-	if (rd->head == rd->tail) {
-		return 0;
-	}
-
-	*val = (void *)rd->ring[rd->head++];
-	if (rd->head == rd->entries) {
-		rd->head = 0;
-	}
-	return 1;
-}
-
-/*
- * ringtio_ring_put
- */
-static inline int ringtio_ring_put(struct uio_ubicom32ring_desc *rd, void *val)
-{
-	unsigned int newtail = rd->tail + 1;
-	if (newtail == rd->entries) {
-		newtail = 0;
-	}
-
-	if (newtail == rd->head) {
-		return 0;
-	}
-
-	rd->ring[rd->tail] = (unsigned int)val;
-	rd->tail = newtail;
-	return 1;
-}
-
-#endif /* _ASM_UBICOM32_UBICOM32RING_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32sd.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32sd.h
deleted file mode 100644
index b5cebfa2e..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32sd.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * arch/ubicom32/include/asm/ubicom32sd.h
- *   Ubicom32SD public include file
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- */
-#ifndef _ASM_UBICOM32_UBICOM32_SD_H
-#define _ASM_UBICOM32_UBICOM32_SD_H
-
-struct ubicom32sd_card {
-	/*
-	 * GPIOs of PWR, WP and CD lines.
-	 * Polarity is 1 for active high and 0 for active low
-	 */
-	int				pin_pwr;
-	bool				pwr_polarity;
-	int				pin_wp;
-	bool				wp_polarity;
-	int				pin_cd;
-	bool				cd_polarity;
-};
-
-struct ubicom32sd_platform_data {
-	int			ncards;
-
-	struct ubicom32sd_card	*cards;
-};
-
-#endif /* _ASM_UBICOM32_UBICOM32_SD_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32suart.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32suart.h
deleted file mode 100644
index 824d0de2e..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ubicom32suart.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * arch/ubicom32/include/asm/ubicom32suart.h
- *   <TODO: Replace with short file description>
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_UBICOM32_SUART_H
-#define _ASM_UBICOM32_UBICOM32_SUART_H
-
-/*
- * Platform resource id for serdes uart clock parameter
- */
-#define UBICOM32_SUART_IORESOURCE_CLOCK		(1)
-
-#endif /* _ASM_UBICOM32_UBICOM32_SUART_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ucontext.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/ucontext.h
deleted file mode 100644
index 71c112902..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/ucontext.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * arch/ubicom32/include/asm/ucontext.h
- *   Definition of ucontext structure for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_UCONTEXT_H
-#define _ASM_UBICOM32_UCONTEXT_H
-
-struct ucontext {
-	unsigned long	  uc_flags;
-	struct ucontext  *uc_link;
-	stack_t		  uc_stack;
-	struct sigcontext	  uc_mcontext;
-	sigset_t	  uc_sigmask;	/* mask last for extensibility */
-};
-
-#endif /* _ASM_UBICOM32_UCONTEXT_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/unaligned.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/unaligned.h
deleted file mode 100644
index 41b264660..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/unaligned.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * arch/ubicom32/include/asm/unaligned.h
- *   Ubicom32 architecture unaligned memory access definitions.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- *
- * TODO: This is a copy of arm unaligned handling that probably needs
- * to be optimized for UBICOM32, but it works for now.
- */
-
-#ifndef _ASM_UBICOM32_UNALIGNED_H
-#define _ASM_UBICOM32_UNALIGNED_H
-
-#include <asm/types.h>
-
-#include <linux/unaligned/le_byteshift.h>
-#include <linux/unaligned/be_byteshift.h>
-#include <linux/unaligned/generic.h>
-
-#define get_unaligned	__get_unaligned_be
-#define put_unaligned	__put_unaligned_be
-
-#endif /* _ASM_UBICOM32_UNALIGNED_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/unistd.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/unistd.h
deleted file mode 100644
index 2c7ba5600..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/unistd.h
+++ /dev/null
@@ -1,400 +0,0 @@
-/*
- * arch/ubicom32/include/asm/unistd.h
- *   Ubicom32 architecture syscall definitions.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_UNISTD_H
-#define _ASM_UBICOM32_UNISTD_H
-
-/*
- * This file contains the system call numbers.
- */
-
-#define __NR_restart_syscall      0
-#define __NR_exit		  1
-#define __NR_fork		  2
-#define __NR_read		  3
-#define __NR_write		  4
-#define __NR_open		  5
-#define __NR_close		  6
-#define __NR_waitpid		  7
-#define __NR_creat		  8
-#define __NR_link		  9
-#define __NR_unlink		 10
-#define __NR_execve		 11
-#define __NR_chdir		 12
-#define __NR_time		 13
-#define __NR_mknod		 14
-#define __NR_chmod		 15
-#define __NR_chown		 16
-#define __NR_break		 17
-#define __NR_oldstat		 18
-#define __NR_lseek		 19
-#define __NR_getpid		 20
-#define __NR_mount		 21
-#define __NR_umount		 22
-#define __NR_setuid		 23
-#define __NR_getuid		 24
-#define __NR_stime		 25
-#define __NR_ptrace		 26
-#define __NR_alarm		 27
-#define __NR_oldfstat		 28
-#define __NR_pause		 29
-#define __NR_utime		 30
-#define __NR_stty		 31
-#define __NR_gtty		 32
-#define __NR_access		 33
-#define __NR_nice		 34
-#define __NR_ftime		 35
-#define __NR_sync		 36
-#define __NR_kill		 37
-#define __NR_rename		 38
-#define __NR_mkdir		 39
-#define __NR_rmdir		 40
-#define __NR_dup		 41
-#define __NR_pipe		 42
-#define __NR_times		 43
-#define __NR_prof		 44
-#define __NR_brk		 45
-#define __NR_setgid		 46
-#define __NR_getgid		 47
-#define __NR_signal		 48
-#define __NR_geteuid		 49
-#define __NR_getegid		 50
-#define __NR_acct		 51
-#define __NR_umount2		 52
-#define __NR_lock		 53
-#define __NR_ioctl		 54
-#define __NR_fcntl		 55
-#define __NR_mpx		 56
-#define __NR_setpgid		 57
-#define __NR_ulimit		 58
-#define __NR_oldolduname	 59
-#define __NR_umask		 60
-#define __NR_chroot		 61
-#define __NR_ustat		 62
-#define __NR_dup2		 63
-#define __NR_getppid		 64
-#define __NR_getpgrp		 65
-#define __NR_setsid		 66
-#define __NR_sigaction		 67
-#define __NR_sgetmask		 68
-#define __NR_ssetmask		 69
-#define __NR_setreuid		 70
-#define __NR_setregid		 71
-#define __NR_sigsuspend		 72
-#define __NR_sigpending		 73
-#define __NR_sethostname	 74
-#define __NR_setrlimit		 75
-#define __NR_getrlimit		 76
-#define __NR_getrusage		 77
-#define __NR_gettimeofday	 78
-#define __NR_settimeofday	 79
-#define __NR_getgroups		 80
-#define __NR_setgroups		 81
-#define __NR_select		 82
-#define __NR_symlink		 83
-#define __NR_oldlstat		 84
-#define __NR_readlink		 85
-#define __NR_uselib		 86
-#define __NR_swapon		 87
-#define __NR_reboot		 88
-#define __NR_readdir		 89
-#define __NR_mmap		 90
-#define __NR_munmap		 91
-#define __NR_truncate		 92
-#define __NR_ftruncate		 93
-#define __NR_fchmod		 94
-#define __NR_fchown		 95
-#define __NR_getpriority	 96
-#define __NR_setpriority	 97
-#define __NR_profil		 98
-#define __NR_statfs		 99
-#define __NR_fstatfs		100
-#define __NR_ioperm		101
-#define __NR_socketcall		102
-#define __NR_syslog		103
-#define __NR_setitimer		104
-#define __NR_getitimer		105
-#define __NR_stat		106
-#define __NR_lstat		107
-#define __NR_fstat		108
-#define __NR_olduname		109
-#define __NR_iopl		/* 110 */ not supported
-#define __NR_vhangup		111
-#define __NR_idle		/* 112 */ Obsolete
-#define __NR_vm86		/* 113 */ not supported
-#define __NR_wait4		114
-#define __NR_swapoff		115
-#define __NR_sysinfo		116
-#define __NR_ipc		117
-#define __NR_fsync		118
-#define __NR_sigreturn		119
-#define __NR_clone		120
-#define __NR_setdomainname	121
-#define __NR_uname		122
-#define __NR_cacheflush		123
-#define __NR_adjtimex		124
-#define __NR_mprotect		125
-#define __NR_sigprocmask	126
-#define __NR_create_module	127
-#define __NR_init_module	128
-#define __NR_delete_module	129
-#define __NR_get_kernel_syms	130
-#define __NR_quotactl		131
-#define __NR_getpgid		132
-#define __NR_fchdir		133
-#define __NR_bdflush		134
-#define __NR_sysfs		135
-#define __NR_personality	136
-#define __NR_afs_syscall	137 /* Syscall for Andrew File System */
-#define __NR_setfsuid		138
-#define __NR_setfsgid		139
-#define __NR__llseek		140
-#define __NR_getdents		141
-#define __NR__newselect		142
-#define __NR_flock		143
-#define __NR_msync		144
-#define __NR_readv		145
-#define __NR_writev		146
-#define __NR_getsid		147
-#define __NR_fdatasync		148
-#define __NR__sysctl		149
-#define __NR_mlock		150
-#define __NR_munlock		151
-#define __NR_mlockall		152
-#define __NR_munlockall		153
-#define __NR_sched_setparam		154
-#define __NR_sched_getparam		155
-#define __NR_sched_setscheduler		156
-#define __NR_sched_getscheduler		157
-#define __NR_sched_yield		158
-#define __NR_sched_get_priority_max	159
-#define __NR_sched_get_priority_min	160
-#define __NR_sched_rr_get_interval	161
-#define __NR_nanosleep		162
-#define __NR_mremap		163
-#define __NR_setresuid		164
-#define __NR_getresuid		165
-#define __NR_getpagesize	166
-#define __NR_query_module	167
-#define __NR_poll		168
-#define __NR_nfsservctl		169
-#define __NR_setresgid		170
-#define __NR_getresgid		171
-#define __NR_prctl		172
-#define __NR_rt_sigreturn	173
-#define __NR_rt_sigaction	174
-#define __NR_rt_sigprocmask	175
-#define __NR_rt_sigpending	176
-#define __NR_rt_sigtimedwait	177
-#define __NR_rt_sigqueueinfo	178
-#define __NR_rt_sigsuspend	179
-#define __NR_pread64		180
-#define __NR_pwrite64		181
-#define __NR_lchown		182
-#define __NR_getcwd		183
-#define __NR_capget		184
-#define __NR_capset		185
-#define __NR_sigaltstack	186
-#define __NR_sendfile		187
-#define __NR_getpmsg		188	/* some people actually want streams */
-#define __NR_putpmsg		189	/* some people actually want streams */
-#define __NR_vfork		190
-#define __NR_ugetrlimit		191
-#define __NR_mmap2		192
-#define __NR_truncate64		193
-#define __NR_ftruncate64	194
-#define __NR_stat64		195
-#define __NR_lstat64		196
-#define __NR_fstat64		197
-#define __NR_chown32		198
-#define __NR_getuid32		199
-#define __NR_getgid32		200
-#define __NR_geteuid32		201
-#define __NR_getegid32		202
-#define __NR_setreuid32		203
-#define __NR_setregid32		204
-#define __NR_getgroups32	205
-#define __NR_setgroups32	206
-#define __NR_fchown32		207
-#define __NR_setresuid32	208
-#define __NR_getresuid32	209
-#define __NR_setresgid32	210
-#define __NR_getresgid32	211
-#define __NR_lchown32		212
-#define __NR_setuid32		213
-#define __NR_setgid32		214
-#define __NR_setfsuid32		215
-#define __NR_setfsgid32		216
-#define __NR_pivot_root		217
-#define __NR_getdents64		220
-#define __NR_gettid		221
-#define __NR_tkill		222
-#define __NR_setxattr		223
-#define __NR_lsetxattr		224
-#define __NR_fsetxattr		225
-#define __NR_getxattr		226
-#define __NR_lgetxattr		227
-#define __NR_fgetxattr		228
-#define __NR_listxattr		229
-#define __NR_llistxattr		230
-#define __NR_flistxattr		231
-#define __NR_removexattr	232
-#define __NR_lremovexattr	233
-#define __NR_fremovexattr	234
-#define __NR_futex		235
-#define __NR_sendfile64		236
-#define __NR_mincore		237
-#define __NR_madvise		238
-#define __NR_fcntl64		239
-#define __NR_readahead		240
-#define __NR_io_setup		241
-#define __NR_io_destroy		242
-#define __NR_io_getevents	243
-#define __NR_io_submit		244
-#define __NR_io_cancel		245
-#define __NR_fadvise64		246
-#define __NR_exit_group		247
-#define __NR_lookup_dcookie	248
-#define __NR_epoll_create	249
-#define __NR_epoll_ctl		250
-#define __NR_epoll_wait		251
-#define __NR_remap_file_pages	252
-#define __NR_set_tid_address	253
-#define __NR_timer_create	254
-#define __NR_timer_settime	255
-#define __NR_timer_gettime	256
-#define __NR_timer_getoverrun	257
-#define __NR_timer_delete	258
-#define __NR_clock_settime	259
-#define __NR_clock_gettime	260
-#define __NR_clock_getres	261
-#define __NR_clock_nanosleep	262
-#define __NR_statfs64		263
-#define __NR_fstatfs64		264
-#define __NR_tgkill		265
-#define __NR_utimes		266
-#define __NR_fadvise64_64	267
-#define __NR_mbind		268
-#define __NR_get_mempolicy	269
-#define __NR_set_mempolicy	270
-#define __NR_mq_open		271
-#define __NR_mq_unlink		272
-#define __NR_mq_timedsend	273
-#define __NR_mq_timedreceive	274
-#define __NR_mq_notify		275
-#define __NR_mq_getsetattr	276
-#define __NR_waitid		277
-#define __NR_vserver		278
-#define __NR_add_key		279
-#define __NR_request_key	280
-#define __NR_keyctl		281
-#define __NR_ioprio_set		282
-#define __NR_ioprio_get		283
-#define __NR_inotify_init	284
-#define __NR_inotify_add_watch	285
-#define __NR_inotify_rm_watch	286
-#define __NR_migrate_pages	287
-#define __NR_openat		288
-#define __NR_mkdirat		289
-#define __NR_mknodat		290
-#define __NR_fchownat		291
-#define __NR_futimesat		292
-#define __NR_fstatat64		293
-#define __NR_unlinkat		294
-#define __NR_renameat		295
-#define __NR_linkat		296
-#define __NR_symlinkat		297
-#define __NR_readlinkat		298
-#define __NR_fchmodat		299
-#define __NR_faccessat		300
-#define __NR_pselect6		301
-#define __NR_ppoll		302
-#define __NR_unshare		303
-#define __NR_set_robust_list	304
-#define __NR_get_robust_list	305
-#define __NR_splice		306
-#define __NR_sync_file_range	307
-#define __NR_tee		308
-#define __NR_vmsplice		309
-#define __NR_move_pages		310
-#define __NR_sched_setaffinity	311
-#define __NR_sched_getaffinity	312
-#define __NR_kexec_load		313
-#define __NR_getcpu		314
-#define __NR_epoll_pwait	315
-#define __NR_utimensat		316
-#define __NR_signalfd		317
-#define __NR_timerfd_create	318
-#define __NR_eventfd		319
-#define __NR_fallocate		320
-#define __NR_timerfd_settime	321
-#define __NR_timerfd_gettime	322
-#define __NR_signalfd4		323
-#define __NR_eventfd2		324
-#define __NR_epoll_create1	325
-#define __NR_dup3		326
-#define __NR_pipe2		327
-#define __NR_inotify_init1	328
-
-#ifdef __KERNEL__
-
-#define NR_syscalls		329
-
-#define __ARCH_WANT_IPC_PARSE_VERSION
-#define __ARCH_WANT_OLD_READDIR
-#define __ARCH_WANT_OLD_STAT
-#define __ARCH_WANT_STAT64
-#define __ARCH_WANT_SYS_ALARM
-#define __ARCH_WANT_SYS_GETHOSTNAME
-#define __ARCH_WANT_SYS_PAUSE
-#define __ARCH_WANT_SYS_SGETMASK
-#define __ARCH_WANT_SYS_SIGNAL
-#define __ARCH_WANT_SYS_TIME
-#define __ARCH_WANT_SYS_UTIME
-#define __ARCH_WANT_SYS_WAITPID
-#define __ARCH_WANT_SYS_SOCKETCALL
-#define __ARCH_WANT_SYS_FADVISE64
-#define __ARCH_WANT_SYS_GETPGRP
-#define __ARCH_WANT_SYS_LLSEEK
-#define __ARCH_WANT_SYS_NICE
-#define __ARCH_WANT_SYS_OLD_GETRLIMIT
-#define __ARCH_WANT_SYS_OLDUMOUNT
-#define __ARCH_WANT_SYS_SIGPENDING
-#define __ARCH_WANT_SYS_SIGPROCMASK
-#define __ARCH_WANT_SYS_RT_SIGACTION
-
-/*
- * "Conditional" syscalls
- *
- * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
- * but it doesn't work on all toolchains, so we just do it by hand
- */
-//#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
-#define cond_syscall(x) long x(void)  __attribute__((weak,alias("sys_ni_syscall")))
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_UBICOM32_UNISTD_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/user.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/user.h
deleted file mode 100644
index 2e79786ca..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/user.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * arch/ubicom32/include/asm/user.h
- *   Ubicom32 architecture core file definitions.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_USER_H
-#define _ASM_UBICOM32_USER_H
-
-#include <asm/ptrace.h>
-#include <asm/page.h>
-/*
- * Adapted from <asm-powerpc/user.h>
- *
- * Core file format: The core file is written in such a way that gdb
- * can understand it and provide useful information to the user (under
- * linux we use the `trad-core' bfd, NOT the osf-core).  The file contents
- * are as follows:
- *
- *  upage: 1 page consisting of a user struct that tells gdb
- *	what is present in the file.  Directly after this is a
- *	copy of the task_struct, which is currently not used by gdb,
- *	but it may come in handy at some point.  All of the registers
- *	are stored as part of the upage.  The upage should always be
- *	only one page long.
- *  data: The data segment follows next.  We use current->end_text to
- *	current->brk to pick up all of the user variables, plus any memory
- *	that may have been sbrk'ed.  No attempt is made to determine if a
- *	page is demand-zero or if a page is totally unused, we just cover
- *	the entire range.  All of the addresses are rounded in such a way
- *	that an integral number of pages is written.
- *  stack: We need the stack information in order to get a meaningful
- *	backtrace.  We need to write the data from usp to
- *	current->start_stack, so we round each of these in order to be able
- *	to write an integer number of pages.
- */
-
-struct user_ubicom32fp_struct {
-};
-
-struct user {
-	struct pt_regs	regs;			/* entire machine state */
-	size_t		u_tsize;		/* text size (pages) */
-	size_t		u_dsize;		/* data size (pages) */
-	size_t		u_ssize;		/* stack size (pages) */
-	unsigned long	start_code;		/* text starting address */
-	unsigned long	start_data;		/* data starting address */
-	unsigned long	start_stack;		/* stack starting address */
-	long int	signal;			/* signal causing core dump */
-	unsigned long	u_ar0;			/* help gdb find registers */
-	unsigned long	magic;			/* identifies a core file */
-	char		u_comm[32];		/* user command name */
-};
-
-#define NBPG			PAGE_SIZE
-#define UPAGES			1
-#define HOST_TEXT_START_ADDR	(u.start_code)
-#define HOST_DATA_START_ADDR	(u.start_data)
-#define HOST_STACK_END_ADDR	(u.start_stack + u.u_ssize * NBPG)
-
-#endif	/* _ASM_UBICOM32_USER_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/vdc_tio.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/vdc_tio.h
deleted file mode 100644
index cc45fc552..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/vdc_tio.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * arch/ubicom32/include/asm/vdc_tio.h
- *   Ubicom32 architecture VDC TIO definitions.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_VDC_TIO_H
-#define _ASM_UBICOM32_VDC_TIO_H
-
-#include <asm/devtree.h>
-
-#define VDCTIO_VP_VERSION			5
-
-#define VDCTIO_SCALE_FLAG_VSUB			(1 << 9)
-#define VDCTIO_SCALE_FLAG_YUV_SCAN_ORDER	(1 << 8)
-#define VDCTIO_SCALE_FLAG_YUV_BLOCK_ORDER	(1 << 7)
-#define VDCTIO_SCALE_FLAG_YUV			(1 << 6)
-#define VDCTIO_SCALE_FLAG_VRANGE_16_255		(1 << 5)
-#define VDCTIO_SCALE_FLAG_VRANGE_0_255		(1 << 4)
-#define VDCTIO_SCALE_FLAG_HSUB_2_1		(1 << 3)
-#define VDCTIO_SCALE_FLAG_HSUB_1_1		(1 << 2)
-#define VDCTIO_SCALE_FLAG_SET_FRAME_BUFFER	(1 << 1)
-#define VDCTIO_SCALE_FLAG_ENABLE		(1 << 0)
-
-#define VDCTIO_NEXT_FRAME_FLAG_YUV_BIT		0
-#define VDCTIO_NEXT_FRAME_FLAG_YUV		(1 << (VDCTIO_NEXT_FRAME_FLAG_YUV_BIT))
-
-#define VDCTIO_CAPS_SUPPORTS_SCALING		(1 << 0)
-
-#define VDCTIO_COMMAND_START			(1 << 3)
-#define VDCTIO_COMMAND_SET_COEFF		(1 << 2)
-#define VDCTIO_COMMAND_SET_LUT			(1 << 1)
-#define VDCTIO_COMMAND_SET_SCALE_MODE		(1 << 0)
-
-/*
- * Command / Data registers to access the VDC
- */
-struct vdc_tio_vp_regs {
-	/*
-	 * Version of this TIO register map
-	 */
-	u32_t		version;
-
-	volatile u32_t	command;
-
-	/*
-	 * Next frame pointer, when the command VDCTIO_COMMAND_SET_FRAME_BUFFER is set,
-	 * the vdc will take the pointer here and display it.
-	 */
-	void		*next_frame;
-	u32_t		next_frame_flags;
-
-	/*
-	 * These map directly into the PIXP registers 0x20-0x80.
-	 * DO NOT change the order of these three variables.
-	 */
-	u32_t		red_lut[6];
-	u32_t		blue_lut[6];
-	u32_t		green_lut[13];
-
-	/*
-	 * These map directly into the PIXP registers 0x04, 0x08
-	 */
-	u32_t		coeff0;
-	u32_t		coeff1;
-
-	/*
-	 * There are used to set the scaling parameters
-	 */
-	u32_t		x_in;
-	u32_t		x_out;
-	u32_t		y_in;
-	u32_t		y_out;
-	u32_t		scale_flags;
-
-	/*
-	 * Current frame number, monotonically increasing number
-	 */
-	u32_t		frame_number;
-
-	/*
-	 * These variables tell the guest OS what the underlying hardware looks like
-	 */
-	u32_t		caps;
-	u32_t		xres;
-	u32_t		yres;
-	u32_t		fb_align;
-	u8_t		bpp;
-	u8_t		rbits;
-	u8_t		gbits;
-	u8_t		bbits;
-	u8_t		rshift;
-	u8_t		gshift;
-	u8_t		bshift;
-};
-
-/*
- * Devtree node for VDC
- */
-struct vdc_tio_node {
-	struct devtree_node	dn;
-
-	struct vdc_tio_vp_regs	*regs;
-};
-
-extern void vdc_tio_init(void);
-
-#endif /* _ASM_UBICOM32_VDC_TIO_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/vga.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/vga.h
deleted file mode 100644
index 793435f8b..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/vga.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * arch/ubicom32/include/asm/vga.h
- *   Ubicom32 low level  VGA/frame buffer definitions.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- * (c) 1998 Martin Mares <mj@ucw.cz>
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#ifndef _ASM_UBICOM32_VGA_H
-#define _ASM_UBICOM32_VGA_H
-
-#include <asm/byteorder.h>
-
-/*
- *	On the PC, we can just recalculate addresses and then
- *	access the videoram directly without any black magic.
- */
-
-#define VGA_MAP_MEM(x, s)	(0xb0000000L + (unsigned long)(x))
-
-#define vga_readb(x)	(*(x))
-#define vga_writeb(x, y)	(*(y) = (x))
-
-#define VT_BUF_HAVE_RW
-/*
- *  These are only needed for supporting VGA or MDA text mode, which use little
- *  endian byte ordering.
- *  In other cases, we can optimize by using native byte ordering and
- *  <linux/vt_buffer.h> has already done the right job for us.
- */
-
-#undef scr_writew
-#undef scr_readw
-
-static inline void scr_writew(u16 val, volatile u16 *addr)
-{
-	*addr = cpu_to_le16(val);
-}
-
-static inline u16 scr_readw(volatile const u16 *addr)
-{
-	return le16_to_cpu(*addr);
-}
-
-#define scr_memcpyw(d, s, c) memcpy(d, s, c)
-#define scr_memmovew(d, s, c) memmove(d, s, c)
-#define VT_BUF_HAVE_MEMCPYW
-#define VT_BUF_HAVE_MEMMOVEW
-
-#endif /* _ASM_UBICOM32_VGA_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/include/asm/xor.h b/target/linux/ubicom32/files/arch/ubicom32/include/asm/xor.h
deleted file mode 100644
index 31edcceb6..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/include/asm/xor.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * arch/ubicom32/include/asm/xor.h
- *   Generic xor.h definitions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _ASM_UBICOM32_XOR_H
-#define _ASM_UBICOM32_XOR_H
-
-#include <asm-generic/xor.h>
-
-#endif /* _ASM_UBICOM32_XOR_H */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/kernel/Makefile b/target/linux/ubicom32/files/arch/ubicom32/kernel/Makefile
deleted file mode 100644
index 6294fa2ea..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/kernel/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# arch/ubicom32/kernel/Makefile
-#	Main Makefile for the Ubicom32 arch directory.
-#
-# (C) Copyright 2009, Ubicom, Inc.
-#
-# This file is part of the Ubicom32 Linux Kernel Port.
-#
-# The Ubicom32 Linux Kernel Port 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.
-#
-# The Ubicom32 Linux Kernel Port is distributed in the hope that it
-# will be useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
-# the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with the Ubicom32 Linux Kernel Port.  If not,
-# see <http://www.gnu.org/licenses/>.
-#
-# Ubicom32 implementation derived from (with many thanks):
-#   arch/m68knommu
-#   arch/blackfin
-#   arch/parisc
-#
-
-extra-y := head.o vmlinux.lds
-
-obj-y += \
-	devtree.o \
-	dma.o \
-	flat.o \
-	init_task.o \
-	irq.o \
-	ldsr.o \
-	os_node.o \
-	process.o \
-	processor.o \
-	ptrace.o \
-	setup.o \
-	signal.o \
-	stacktrace.o \
-	sys_ubicom32.o \
-	syscalltable.o \
-	thread.o \
-	time.o \
-	traps.o \
-	ubicom32_context_switch.o \
-	ubicom32_ksyms.o \
-	ubicom32_syscall.o \
-	unaligned_trap.o
-
-obj-$(CONFIG_MODULES)				+= module.o
-obj-$(CONFIG_COMEMPCI)				+= comempci.o
-obj-$(CONFIG_SMP)				+= smp.o topology.o
-obj-$(CONFIG_ACCESS_OK_CHECKS_ENABLED)		+= uaccess.o
-obj-$(CONFIG_GENERIC_CLOCKEVENTS)		+= timer_device.o
-obj-$(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST)	+= timer_broadcast.o
-
-ifndef CONFIG_GENERIC_CLOCKEVENTS
-obj-y			+= timer_tick.o
-endif
diff --git a/target/linux/ubicom32/files/arch/ubicom32/kernel/asm-offsets.c b/target/linux/ubicom32/files/arch/ubicom32/kernel/asm-offsets.c
deleted file mode 100644
index 639a536a1..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/kernel/asm-offsets.c
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * arch/ubicom32/kernel/asm-offsets.c
- *   Ubicom32 architecture definitions needed by assembly language modules.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-/*
- * This program is used to generate definitions needed by
- * assembly language modules.
- *
- * We use the technique used in the OSF Mach kernel code:
- * generate asm statements containing #defines,
- * compile this file to assembler, and then extract the
- * #defines from the assembly-language output.
- */
-
-#include <linux/module.h>
-#include <linux/stddef.h>
-#include <linux/sched.h>
-#include <linux/kernel_stat.h>
-#include <linux/ptrace.h>
-#include <linux/hardirq.h>
-#include <asm/bootinfo.h>
-#include <asm/irq.h>
-#include <asm/thread_info.h>
-
-#define DEFINE(sym, val) \
-        asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-
-#define BLANK() asm volatile("\n->" : : )
-
-int main(void)
-{
-	/* offsets into the task struct */
-	DEFINE(TASK_STATE, offsetof(struct task_struct, state));
-	DEFINE(TASK_FLAGS, offsetof(struct task_struct, flags));
-	DEFINE(TASK_PTRACE, offsetof(struct task_struct, ptrace));
-	DEFINE(TASK_BLOCKED, offsetof(struct task_struct, blocked));
-	DEFINE(TASK_THREAD, offsetof(struct task_struct, thread));
-	DEFINE(TASK_THREAD_INFO, offsetof(struct task_struct, stack));
-	DEFINE(TASK_MM, offsetof(struct task_struct, mm));
-	DEFINE(TASK_ACTIVE_MM, offsetof(struct task_struct, active_mm));
-
-	/* offsets into the kernel_stat struct */
-//	DEFINE(STAT_IRQ, offsetof(struct kernel_stat, irqs));
-
-	/* offsets into the irq_cpustat_t struct */
-	DEFINE(CPUSTAT_SOFTIRQ_PENDING, offsetof(irq_cpustat_t, __softirq_pending));
-
-	/* offsets into the thread struct */
-	DEFINE(THREAD_D10, offsetof(struct thread_struct, d10));
-	DEFINE(THREAD_D11, offsetof(struct thread_struct, d11));
-	DEFINE(THREAD_D12, offsetof(struct thread_struct, d12));
-	DEFINE(THREAD_D13, offsetof(struct thread_struct, d13));
-	DEFINE(THREAD_A1, offsetof(struct thread_struct, a1));
-	DEFINE(THREAD_A2, offsetof(struct thread_struct, a2));
-	DEFINE(THREAD_A5, offsetof(struct thread_struct, a5));
-	DEFINE(THREAD_A6, offsetof(struct thread_struct, a6));
-	DEFINE(THREAD_SP, offsetof(struct thread_struct, sp));
-
-	/* offsets into the pt_regs */
-	DEFINE(PT_D0, offsetof(struct pt_regs, dn[0]));
-	DEFINE(PT_D1, offsetof(struct pt_regs, dn[1]));
-	DEFINE(PT_D2, offsetof(struct pt_regs, dn[2]));
-	DEFINE(PT_D3, offsetof(struct pt_regs, dn[3]));
-	DEFINE(PT_D4, offsetof(struct pt_regs, dn[4]));
-	DEFINE(PT_D5, offsetof(struct pt_regs, dn[5]));
-	DEFINE(PT_D6, offsetof(struct pt_regs, dn[6]));
-	DEFINE(PT_D7, offsetof(struct pt_regs, dn[7]));
-	DEFINE(PT_D8, offsetof(struct pt_regs, dn[8]));
-	DEFINE(PT_D9, offsetof(struct pt_regs, dn[9]));
-	DEFINE(PT_D10, offsetof(struct pt_regs, dn[10]));
-	DEFINE(PT_D11, offsetof(struct pt_regs, dn[11]));
-	DEFINE(PT_D12, offsetof(struct pt_regs, dn[12]));
-	DEFINE(PT_D13, offsetof(struct pt_regs, dn[13]));
-	DEFINE(PT_D14, offsetof(struct pt_regs, dn[14]));
-	DEFINE(PT_D15, offsetof(struct pt_regs, dn[15]));
-	DEFINE(PT_A0, offsetof(struct pt_regs, an[0]));
-	DEFINE(PT_A1, offsetof(struct pt_regs, an[1]));
-	DEFINE(PT_A2, offsetof(struct pt_regs, an[2]));
-	DEFINE(PT_A3, offsetof(struct pt_regs, an[3]));
-	DEFINE(PT_A4, offsetof(struct pt_regs, an[4]));
-	DEFINE(PT_A5, offsetof(struct pt_regs, an[5]));
-	DEFINE(PT_A6, offsetof(struct pt_regs, an[6]));
-	DEFINE(PT_A7, offsetof(struct pt_regs, an[7]));
-	DEFINE(PT_SP, offsetof(struct pt_regs, an[7]));
-
-	DEFINE(PT_ACC0HI, offsetof(struct pt_regs, acc0[0]));
-	DEFINE(PT_ACC0LO, offsetof(struct pt_regs, acc0[1]));
-	DEFINE(PT_MAC_RC16, offsetof(struct pt_regs, mac_rc16));
-
-	DEFINE(PT_ACC1HI, offsetof(struct pt_regs, acc1[0]));
-	DEFINE(PT_ACC1LO, offsetof(struct pt_regs, acc1[1]));
-
-	DEFINE(PT_SOURCE3, offsetof(struct pt_regs, source3));
-	DEFINE(PT_INST_CNT, offsetof(struct pt_regs, inst_cnt));
-	DEFINE(PT_CSR, offsetof(struct pt_regs, csr));
-	DEFINE(PT_DUMMY_UNUSED, offsetof(struct pt_regs, dummy_unused));
-
-	DEFINE(PT_INT_MASK0, offsetof(struct pt_regs, int_mask0));
-	DEFINE(PT_INT_MASK1, offsetof(struct pt_regs, int_mask1));
-
-	DEFINE(PT_PC, offsetof(struct pt_regs, pc));
-
-	DEFINE(PT_TRAP_CAUSE, offsetof(struct pt_regs, trap_cause));
-
-	DEFINE(PT_SIZE, sizeof(struct pt_regs));
-
-	DEFINE(PT_FRAME_TYPE, offsetof(struct pt_regs, frame_type));
-
-	DEFINE(PT_ORIGINAL_D0, offsetof(struct pt_regs, original_dn_0));
-	DEFINE(PT_PREVIOUS_PC, offsetof(struct pt_regs, previous_pc));
-
-	/* offsets into the kernel_stat struct */
-//	DEFINE(STAT_IRQ, offsetof(struct kernel_stat, irqs));
-
-	/* signal defines */
-	DEFINE(SIGSEGV, SIGSEGV);
-	//DEFINE(SEGV_MAPERR, SEGV_MAPERR);
-	DEFINE(SIGTRAP, SIGTRAP);
-	//DEFINE(TRAP_TRACE, TRAP_TRACE);
-
-	DEFINE(PT_PTRACED, PT_PTRACED);
-	DEFINE(PT_DTRACE, PT_DTRACE);
-
-	DEFINE(ASM_THREAD_SIZE, THREAD_SIZE);
-
-	/* Offsets in thread_info structure */
-	DEFINE(TI_TASK, offsetof(struct thread_info, task));
-	DEFINE(TI_EXECDOMAIN, offsetof(struct thread_info, exec_domain));
-	DEFINE(TI_FLAGS, offsetof(struct thread_info, flags));
-	DEFINE(TI_PREEMPTCOUNT, offsetof(struct thread_info, preempt_count));
-	DEFINE(TI_CPU, offsetof(struct thread_info, cpu));
-	DEFINE(TI_INTR_NESTING, offsetof(struct thread_info, interrupt_nesting));
-	DEFINE(ASM_TIF_NEED_RESCHED, TIF_NEED_RESCHED);
-	DEFINE(ASM_TIF_SYSCALL_TRACE, TIF_SYSCALL_TRACE);
-	DEFINE(ASM_TIF_SIGPENDING, TIF_SIGPENDING);
-
-	return 0;
-}
diff --git a/target/linux/ubicom32/files/arch/ubicom32/kernel/devtree.c b/target/linux/ubicom32/files/arch/ubicom32/kernel/devtree.c
deleted file mode 100644
index 1f824d2f1..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/kernel/devtree.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * arch/ubicom32/kernel/devtree.c
- *   Ubicom32 architecture device tree implementation.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/errno.h>
-#include <asm/devtree.h>
-
-/*
- * The device tree.
- */
-struct devtree_node *devtree;
-
-/*
- * devtree_print()
- *	Print the device tree.
- */
-void devtree_print(void)
-{
-	struct devtree_node *p = devtree;
-	printk(KERN_INFO "Device Tree:\n");
-	while (p) {
-		if (p->magic != DEVTREE_NODE_MAGIC) {
-			printk(KERN_EMERG
-			       "device tree has improper node: %p\n", p);
-			return;
-		}
-		printk(KERN_INFO "\t%p: sendirq=%03d, recvirq=%03d, "
-		       " name=%s\n", p, p->sendirq, p->recvirq, p->name);
-		p = p->next;
-	}
-}
-EXPORT_SYMBOL(devtree_print);
-
-/*
- * devtree_irq()
- *	Return the IRQ(s) associated with devtree node.
- */
-int devtree_irq(struct devtree_node *dn,
-		unsigned char *sendirq,
-		unsigned char *recvirq)
-{
-	if (dn->magic != DEVTREE_NODE_MAGIC) {
-		printk(KERN_EMERG "improper node: %p\n", dn);
-		if (sendirq) {
-			*sendirq = DEVTREE_IRQ_NONE;
-		}
-		if (recvirq) {
-			*recvirq = DEVTREE_IRQ_NONE;
-		}
-		return -EFAULT;
-	}
-
-	/*
-	 * Copy the devtree irq(s) to the output parameters.
-	 */
-	if (sendirq) {
-		*sendirq = dn->sendirq;
-	}
-	if (recvirq) {
-		*recvirq = dn->recvirq;
-	}
-	return 0;
-}
-EXPORT_SYMBOL(devtree_irq);
-
-/*
- * devtree_find_next()
- *	Provide an iterator for walking the device tree.
- */
-struct devtree_node *devtree_find_next(struct devtree_node **cur)
-{
-	struct devtree_node *p = *cur;
-	if (!p) {
-		*cur = devtree;
-		return devtree;
-	}
-	p = p->next;
-	*cur = p;
-	return p;
-}
-
-/*
- * devtree_find_by_irq()
- *	Return the node associated with a given irq.
- */
-struct devtree_node *devtree_find_by_irq(uint8_t sendirq, uint8_t recvirq)
-{
-	struct devtree_node *p = devtree;
-
-	if (sendirq == recvirq) {
-		printk(KERN_EMERG "identical request makes no sense sendirq = "
-		       "%d, recvirq= %d\n", sendirq, recvirq);
-		return NULL;
-	}
-
-	while (p) {
-		if (p->magic != DEVTREE_NODE_MAGIC) {
-			printk(KERN_EMERG
-			       "device tree has improper node: %p\n", p);
-			return NULL;
-		}
-
-		/*
-		 * See if we can find a match on the IRQ(s) specified.
-		 */
-		if ((sendirq == p->sendirq) && (recvirq == p->recvirq)) {
-			return p;
-		}
-
-		if ((sendirq == DEVTREE_IRQ_DONTCARE) &&
-		    (p->recvirq == recvirq)) {
-			return p;
-		}
-
-		if ((recvirq == DEVTREE_IRQ_DONTCARE) &&
-		    (p->sendirq == sendirq)) {
-			return p;
-		}
-
-		p = p->next;
-	}
-	return NULL;
-}
-EXPORT_SYMBOL(devtree_find_by_irq);
-
-/*
- * devtree_find_node()
- *	Find a node in the device tree by name.
- */
-struct devtree_node *devtree_find_node(const char *str)
-{
-	struct devtree_node *p = devtree;
-	while (p) {
-		if (p->magic != DEVTREE_NODE_MAGIC) {
-			printk(KERN_EMERG
-			       "device tree has improper node: %p\n", p);
-			return NULL;
-		}
-		if (strcmp(p->name, str) == 0) {
-			return p;
-		}
-		p = p->next;
-	}
-	return NULL;
-}
-EXPORT_SYMBOL(devtree_find_node);
diff --git a/target/linux/ubicom32/files/arch/ubicom32/kernel/dma.c b/target/linux/ubicom32/files/arch/ubicom32/kernel/dma.c
deleted file mode 100644
index f61810532..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/kernel/dma.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * arch/ubicom32/kernel/dma.c
- *   Ubicom32 architecture dynamic DMA mapping support.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- *
- * We never have any address translations to worry about, so this
- * is just alloc/free.
- */
-
-#include <linux/types.h>
-#include <linux/mm.h>
-#include <linux/string.h>
-#include <linux/device.h>
-#include <linux/io.h>
-
-void *dma_alloc_coherent(struct device *dev, size_t size,
-			   dma_addr_t *dma_handle, int gfp)
-{
-	void *ret;
-	/* ignore region specifiers */
-	gfp &= ~(__GFP_DMA | __GFP_HIGHMEM);
-
-	if (dev == NULL || (*dev->dma_mask < 0xffffffff))
-		gfp |= GFP_DMA;
-	ret = (void *)__get_free_pages(gfp, get_order(size));
-
-	if (ret != NULL) {
-		memset(ret, 0, size);
-		*dma_handle = virt_to_phys(ret);
-	}
-	return ret;
-}
-
-void dma_free_coherent(struct device *dev, size_t size,
-			 void *vaddr, dma_addr_t dma_handle)
-{
-	free_pages((unsigned long)vaddr, get_order(size));
-}
diff --git a/target/linux/ubicom32/files/arch/ubicom32/kernel/flat.c b/target/linux/ubicom32/files/arch/ubicom32/kernel/flat.c
deleted file mode 100644
index e8eb4595f..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/kernel/flat.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * arch/ubicom32/kernel/flat.c
- *   Ubicom32 architecture flat executable format support.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/flat.h>
-
-unsigned long ubicom32_flat_get_addr_from_rp(unsigned long *rp,
-					     u32_t relval,
-					     u32_t flags,
-					     unsigned long *persistent)
-{
-	u32_t relval_reloc_type = relval >> 27;
-	u32_t insn = *rp;
-
-	if (*persistent) {
-		/*
-		 * relval holds the relocation that has to be adjusted.
-		 */
-		if (relval == 0) {
-			*persistent = 0;
-		}
-
-		return relval;
-	}
-
-	if (relval_reloc_type == R_UBICOM32_32) {
-		/*
-		 * insn holds the relocation
-		 */
-		return insn;
-	}
-
-	/*
-	 * We don't know this one.
-	 */
-	return 0;
-}
-
-void ubicom32_flat_put_addr_at_rp(unsigned long *rp,
-				  u32_t val,
-				  u32_t relval,
-				  unsigned long *persistent)
-{
-	u32_t reloc_type = (relval >> 27) & 0x1f;
-	u32_t insn = *rp;
-
-	/*
-	 * If persistent is set then it contains the relocation type.
-	 */
-	if (*persistent) {
-		/*
-		 * If persistent is set then it contains the relocation type.
-		 */
-		reloc_type = (*persistent >> 27) & 0x1f;
-	}
-
-	switch (reloc_type) {
-	case R_UBICOM32_32:
-		/*
-		 * Store the 32 bits as is.
-		 */
-		*rp = val;
-		break;
-	case R_UBICOM32_HI24:
-		{
-			/*
-			 * 24 bit relocation that is part of the MOVEAI
-			 * instruction. The 24 bits come from bits 7 - 30 of the
-			 * relocation. The 24 bits eventually get split into 2
-			 * fields in the instruction encoding.
-			 *
-			 * - Bits 7 - 27 of the relocation are encoded into bits
-			 * 0 - 20 of the instruction.
-			 *
-			 * - Bits 28 - 30 of the relocation are encoded into bit
-			 * 24 - 26 of the instruction.
-			 */
-			u32_t mask = 0x1fffff | (0x7 << 24);
-			u32_t valid24bits = (val >> 7) & 0xffffff;
-			u32_t bot_21 = valid24bits & 0x1fffff;
-			u32_t upper_3_bits = ((valid24bits & 0xe00000) << 3);
-			insn &= ~mask;
-
-			insn |= bot_21;
-			insn |= upper_3_bits;
-			*rp = insn;
-		}
-		break;
-	case R_UBICOM32_LO7_S:
-	case R_UBICOM32_LO7_2_S:
-	case R_UBICOM32_LO7_4_S:
-		{
-			/*
-			 * Bits 0 - 6 of the relocation are encoded into the
-			 * 7bit unsigned immediate fields of the SOURCE-1 field
-			 * of the instruction.  The immediate value is left
-			 * shifted by (0, 1, 2) based on the operand size.
-			 */
-			u32_t mask = 0x1f | (0x3 << 8);
-			u32_t bottom, top;
-			val &= 0x7f;
-			if (reloc_type == R_UBICOM32_LO7_2_S) {
-				val >>= 1;
-			} else if (reloc_type == R_UBICOM32_LO7_4_S) {
-				val >>= 2;
-			}
-
-			bottom  = val & 0x1f;
-			top = val >> 5;
-			insn &= ~mask;
-			insn |= bottom;
-			insn |= (top << 8);
-			BUG_ON(*rp != insn);
-			*rp = insn;
-			break;
-		}
-	case R_UBICOM32_LO7_D:
-	case R_UBICOM32_LO7_2_D:
-	case R_UBICOM32_LO7_4_D:
-		{
-			/*
-			 * Bits 0 - 6 of the relocation are encoded into the
-			 * 7bit unsigned immediate fields of the DESTINATION
-			 * field of the instruction.  The immediate value is
-			 * left shifted by (0, 1, 2) based on the operand size.
-			 */
-			u32_t mask = (0x1f | (0x3 << 8)) << 16;
-			u32_t bottom, top;
-			val &= 0x7f;
-			if (reloc_type == R_UBICOM32_LO7_2_D) {
-				val >>= 1;
-			} else if (reloc_type == R_UBICOM32_LO7_4_D) {
-				val >>= 2;
-			}
-			bottom  = (val & 0x1f) << 16;
-			top = (val >> 5) << 16;
-			insn &= ~mask;
-			insn |= bottom;
-			insn |= (top << 8);
-			BUG_ON(*rp != insn);
-			*rp = insn;
-			break;
-		}
-	case R_UBICOM32_LO7_CALLI:
-	case R_UBICOM32_LO16_CALLI:
-		{
-			/*
-			 * Extract the offset for a CALLI instruction. The
-			 * offsets can be either 7 bits or 18 bits. Since all
-			 * instructions in ubicom32 architecture are at work
-			 * aligned addresses the truncated offset is right
-			 * shifted by 2 before being encoded in the instruction.
-			 */
-			if (reloc_type == R_UBICOM32_LO7_CALLI) {
-				val &= 0x7f;
-			} else {
-				val &= 0x3ffff;
-			}
-
-			val >>= 2;
-
-			insn &= ~0x071f071f;
-			insn |= (val & 0x1f) << 0;
-			val >>= 5;
-			insn |= (val & 0x07) << 8;
-			val >>= 3;
-			insn |= (val & 0x1f) << 16;
-			val >>= 5;
-			insn |= (val & 0x07) << 24;
-			if (reloc_type == R_UBICOM32_LO7_CALLI) {
-				BUG_ON(*rp != insn);
-			}
-			*rp = insn;
-		}
-		break;
-	}
-
-	if (*persistent) {
-		*persistent = 0;
-	}
-}
diff --git a/target/linux/ubicom32/files/arch/ubicom32/kernel/head.S b/target/linux/ubicom32/files/arch/ubicom32/kernel/head.S
deleted file mode 100644
index 0c60504af..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/kernel/head.S
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * arch/ubicom32/kernel/head.S
- *	<TODO: Replace with short file description>
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <linux/sys.h>
-#include <linux/linkage.h>
-#include <asm/asm-offsets.h>
-#include <asm/page_offset.h>
-#define __ASM__
-#include <asm/ip5000.h>
-
-
-#define SRC_AN A3
-#define DST_AN A4
-
-#define PARAM_DN D0
-#define TMP_DN D15
-#define TMP2_DN D14
-
-/*
- * The following code is placed at the start of the Linux section of memory.
- * This is the primary entry point for Linux.
- *
- * However, we also want the syscall entry/exit code to be at a fixed address.
- * So we take the primary entry point and reserve 16 bytes.  That address is
- * where the system_call entry point exists.  This 16 bytes basically allows
- * us to jump around the system_call entry point code to the actual startup
- * code.
- *
- * Linux Memory Map (see vlinux.lds.S):
- * 0x40400000 - Primary Entry Point for Linux (jump around code below).
- * 0x40400010 - Old syscall Entry Point.
- */
-
-	.sect	.skip_syscall, "ax", @progbits
-	.global	__skip_syscall_section
-__skip_syscall_section:
-	moveai		A3, #%hi(_start)
-	lea.1		A3, %lo(_start)(A3)
-	ret		A3
-/*
- * __os_node_offset contains the offset from KERNELBASE to the os_node, it is
- * not intended to be used by anything except the boot code.
- */
-__os_node_offset:
-.long	(_os_node - KERNELSTART)
-
-.text
-.global	_start
-
-/*
- * start()
- *	This is the start of the Linux kernel.
- */
-_start:
-	move.4		SCRATCHPAD1, #0
-
-
-/*
- * Setup the range registers... the loader has setup a few, but we will go ahead
- * and correct them for our own limits. Note that once set these are never
- * changed again.  The ranges are as follows
- *
- *  D_RANGE0 - io block (set up by loaded)
- *
- *  I_RANGE0 and D_RANGE1 - kernel/ultra loader address space bottom of ocm-> top
- *	of ram typically 0x3ffc0000 - 0x440000000
- *  I_RANGE1 - kernel / userspace transition area (aka syscalls, context switches)
- *	typically 0x3FFC0030 - ~0x3FFC0200
- *  I_RANGE2 / D_RANGE2 - slab area
- *	typically 0x40A00000 - ~0x44000000
- *  I_RANGE3
- *	old system call interface if enabled.
- *
- *   D_RANGE3, D_RANGE4 - unused.
- */
-	moveai		SRC_AN, #%hi(PAGE_OFFSET_RAW)
-	lea.4		SRC_AN, %lo(PAGE_OFFSET_RAW)(SRC_AN)
-	move.4		D_RANGE1_LO, SRC_AN
-	move.4		I_RANGE0_LO, SRC_AN
-
-; don't try to calculate I_RANGE_HI, see below
-;	moveai		SRC_AN, #%hi(___init_end-4)
-;	lea.4		SRC_AN, %lo(___init_end-4)(SRC_AN)
-;	move.4		I_RANGE0_HI, SRC_AN
-
-	moveai		SRC_AN, #%hi(SDRAMSTART + CONFIG_MIN_RAMSIZE-4)
-	lea.4		SRC_AN, %lo(SDRAMSTART + CONFIG_MIN_RAMSIZE-4)(SRC_AN)
-	move.4		D_RANGE1_HI, SRC_AN
-
-; for now allow the whole ram to be executable as well so we don't run into problems
-; once we load user more code.
-	move.4		I_RANGE0_HI, SRC_AN
-
-#ifdef CONFIG_PROTECT_KERNEL
-; when kernel protection is enabled, we only open up syscall and non kernel text
-; for userspace apps, for now only irange registers registers 1 and 2 are used for userspace.
-
-	;; syscall range
-	moveai		SRC_AN, #%hi(__syscall_text_run_begin)
-	lea.4		SRC_AN, %lo(__syscall_text_run_begin)(SRC_AN)
-	move.4		I_RANGE1_LO, SRC_AN
-	moveai		SRC_AN, #%hi(__syscall_text_run_end)
-	lea.4		SRC_AN, %lo(__syscall_text_run_end)(SRC_AN)
-	move.4		I_RANGE1_HI, SRC_AN
-
-	;; slab instructions
-	moveai		SRC_AN, #%hi(_edata)
-	lea.4		SRC_AN, %lo(_edata)(SRC_AN)
-	move.4		I_RANGE2_LO, SRC_AN
-	;; End of DDR is already in range0 hi so just copy it.
-	move.4		I_RANGE2_HI, I_RANGE0_HI
-
-#ifdef CONFIG_OLD_40400010_SYSTEM_CALL
-	;; create a small hole for old syscall location
-	moveai		SRC_AN, #%hi(0x40400000)
-	lea.4		I_RANGE3_LO, 0x10(SRC_AN)
-	lea.4		I_RANGE3_HI, 0x14(SRC_AN)
-#endif
-	;; slab data (same as slab instructions but starting a little earlier).
-	moveai		SRC_AN, #%hi(_data_protection_end)
-	lea.4		SRC_AN, %lo(_data_protection_end)(SRC_AN)
-	move.4		D_RANGE2_LO, SRC_AN
-	move.4		D_RANGE2_HI, I_RANGE0_HI
-
-;; enable ranges
-	;; skip I_RANGE0_EN
-	move.4		I_RANGE1_EN, #-1
-	move.4		I_RANGE2_EN, #-1
-#ifdef CONFIG_OLD_40400010_SYSTEM_CALL
-	move.4		I_RANGE3_EN, #-1
-#else
-	move.4		I_RANGE3_EN, #0
-#endif
-	;; skip D_RANGE0_EN or D_RANGE1_EN
-	move.4		D_RANGE2_EN, #-1
-	move.4		D_RANGE3_EN, #0
-	move.4		D_RANGE4_EN, #0
-#endif
-
-;
-; If __ocm_free_begin is smaller than __ocm_free_end the
-; setup OCM text and data ram banks properly
-;
-	moveai		DST_AN, #%hi(__ocm_free_begin)
-	lea.4		TMP_DN, %lo(__ocm_free_begin)(DST_AN)
-	moveai		DST_AN, #%hi(__ocm_free_end)
-	lea.4		TMP2_DN, %lo(__ocm_free_end)(DST_AN)
-	sub.4		#0, TMP2_DN, TMP_DN
-	jmple.f		2f
-	moveai		DST_AN, #%hi(__data_begin)
-	lea.4		TMP_DN, %lo(__data_begin)(DST_AN)
-	moveai		DST_AN, #%hi(OCMSTART)
-	lea.4		TMP2_DN, %lo(OCMSTART)(DST_AN)
-	sub.4		TMP_DN, TMP_DN, TMP2_DN
-	lsr.4		TMP_DN, TMP_DN, #15
-	lsl.4		TMP_DN, #1, TMP_DN
-	moveai		DST_AN, #%hi(OCMC_BASE)
-	add.4		OCMC_BANK_MASK(DST_AN), #-1, TMP_DN
-	pipe_flush	0
-2:
-;
-; Load .ocm_text
-;
-	moveai          DST_AN, #%hi(__ocm_text_run_end)
-	lea.4           TMP_DN, %lo(__ocm_text_run_end)(DST_AN)
-	moveai          DST_AN, #%hi(__ocm_text_run_begin)
-	lea.4           DST_AN, %lo(__ocm_text_run_begin)(DST_AN)
-	moveai          SRC_AN, #%hi(__ocm_text_load_begin)
-	lea.4           SRC_AN, %lo(__ocm_text_load_begin)(SRC_AN)
-	jmpt.t          2f
-
-1:      move.4          (DST_AN)4++, (SRC_AN)4++
-
-2:      sub.4           #0, DST_AN, TMP_DN
-	jmpne.t         1b
-;
-; Load .syscall_text
-;
-	moveai          DST_AN, #%hi(__syscall_text_run_end)
-	lea.4           TMP_DN, %lo(__syscall_text_run_end)(DST_AN)
-	moveai          DST_AN, #%hi(__syscall_text_run_begin)
-	lea.4           DST_AN, %lo(__syscall_text_run_begin)(DST_AN)
-	moveai          SRC_AN, #%hi(__syscall_text_load_begin)
-	lea.4           SRC_AN, %lo(__syscall_text_load_begin)(SRC_AN)
-	jmpt.t          2f
-
-1:	move.4          (DST_AN)4++, (SRC_AN)4++
-
-2:	sub.4           #0, DST_AN, TMP_DN
-	jmpne.t         1b
-
-;
-; Load .ocm_data
-;
-	moveai          DST_AN, #%hi(__ocm_data_run_end)
-	lea.4           TMP_DN, %lo(__ocm_data_run_end)(DST_AN)
-	moveai          DST_AN, #%hi(__ocm_data_run_begin)
-	lea.4           DST_AN, %lo(__ocm_data_run_begin)(DST_AN)
-	moveai          SRC_AN, #%hi(__ocm_data_load_begin)
-	lea.4           SRC_AN, %lo(__ocm_data_load_begin)(SRC_AN)
-	jmpt.t          2f
-
-1:      move.4          (DST_AN)4++, (SRC_AN)4++
-
-2:      sub.4           #0, DST_AN, TMP_DN
-	jmpne.t         1b
-
-; Clear .bss
-;
-	moveai		SRC_AN, #%hi(_ebss)
-	lea.4		TMP_DN, %lo(_ebss)(SRC_AN)
-	moveai		DST_AN, #%hi(_sbss)
-	lea.4		DST_AN, %lo(_sbss)(DST_AN)
-	jmpt.t		2f
-
-1:	move.4		(DST_AN)4++, #0
-
-2:	sub.4		#0, DST_AN, TMP_DN
-	jmpne.t		1b
-
-; save our parameter to devtree (after clearing .bss)
-	moveai		DST_AN, #%hi(devtree)
-	lea.4		DST_AN, %lo(devtree)(DST_AN)
-	move.4		(DST_AN), PARAM_DN
-
-	moveai		sp, #%hi(init_thread_union)
-	lea.4		sp, %lo(init_thread_union)(sp)
-	movei		TMP_DN, #ASM_THREAD_SIZE
-	add.4		sp, sp, TMP_DN
-	move.4		-4(sp)++, #0 ; nesting level = 0
-	move.4		-4(sp)++, #1 ; KERNEL_THREAD
-
-;; ip3k-elf-gdb backend now sets scratchpad3 to 1 when either continue
-;; or single step commands are issued. scratchpad3 is set to 0 when the
-;; debugger detaches from the board.
-	move.4		TMP_DN, scratchpad3
-	lsl.4		TMP_DN, TMP_DN, #0x0
-	jmpeq.f		_jump_to_start_kernel
-_ok_to_set_break_points_in_linux:
-;; THREAD_STALL
-	move.4		mt_dbg_active_clr,#-1
-;; stalling the threads isn't instantaneous.. need to flush the pipe.
-	pipe_flush	0
-	pipe_flush	0
-
-_jump_to_start_kernel:
-	moveai		SRC_AN, #%hi(start_kernel)
-	lea.4		SRC_AN, %lo(start_kernel)(SRC_AN)
-	ret		SRC_AN
diff --git a/target/linux/ubicom32/files/arch/ubicom32/kernel/init_task.c b/target/linux/ubicom32/files/arch/ubicom32/kernel/init_task.c
deleted file mode 100644
index 58baf5270..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/kernel/init_task.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * arch/ubicom32/kernel/init_task.c
- *   Ubicom32 architecture task initialization implementation.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <linux/mm.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/init.h>
-#include <linux/init_task.h>
-#include <linux/fs.h>
-#include <linux/mqueue.h>
-#include <linux/uaccess.h>
-#include <asm/pgtable.h>
-#include <linux/version.h>
-
-///static struct fs_struct init_fs = INIT_FS;
-static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
-static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32)
-struct mm_struct init_mm = INIT_MM(init_mm);
-EXPORT_SYMBOL(init_mm);
-#endif
-
-/*
- * Initial task structure.
- *
- * All other task structs will be allocated on slabs in fork.c
- */
-struct task_struct init_task = INIT_TASK(init_task);
-
-EXPORT_SYMBOL(init_task);
-
-/*
- * Initial thread structure.
- *
- * We need to make sure that this is 8192-byte aligned due to the
- * way process stacks are handled. This is done by having a special
- * "init_task" linker map entry..
- */
-union thread_union init_thread_union
-	__attribute__((__section__(".data.init_task"))) =
-		{ INIT_THREAD_INFO(init_task) };
diff --git a/target/linux/ubicom32/files/arch/ubicom32/kernel/irq.c b/target/linux/ubicom32/files/arch/ubicom32/kernel/irq.c
deleted file mode 100644
index c041f23e2..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/kernel/irq.c
+++ /dev/null
@@ -1,597 +0,0 @@
-/*
- * arch/ubicom32/kernel/irq.c
- *   Ubicom32 architecture IRQ support.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- * (C) Copyright 2007, Greg Ungerer <gerg@snapgear.com>
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#include <linux/types.h>
-#include <linux/irq.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/kernel_stat.h>
-#include <linux/module.h>
-#include <linux/seq_file.h>
-#include <linux/proc_fs.h>
-#include <asm/system.h>
-#include <asm/traps.h>
-#include <asm/ldsr.h>
-#include <asm/ip5000.h>
-#include <asm/machdep.h>
-#include <asm/asm-offsets.h>
-#include <asm/thread.h>
-#include <asm/devtree.h>
-
-unsigned int irq_soft_avail;
-static struct irqaction ubicom32_reserve_action[NR_IRQS];
-
-#if !defined(CONFIG_DEBUG_IRQMEASURE)
-#define IRQ_DECLARE_MEASUREMENT
-#define IRQ_MEASUREMENT_START()
-#define IRQ_MEASUREMENT_END(irq)
-#else
-#define IRQ_DECLARE_MEASUREMENT \
-	int __diff;		\
-	unsigned int __tstart;
-
-#define IRQ_MEASUREMENT_START() \
-	__tstart = UBICOM32_IO_TIMER->sysval;
-
-#define IRQ_MEASUREMENT_END(irq) \
-	__diff = (int)UBICOM32_IO_TIMER->sysval - (int)__tstart; \
-	irq_measurement_update((irq), __diff);
-
-/*
- * We keep track of the time spent in both irq_enter()
- * and irq_exit().
- */
-#define IRQ_WEIGHT 32
-
-struct irq_measurement {
-	volatile unsigned int min;
-	volatile unsigned int avg;
-	volatile unsigned int max;
-};
-
-static DEFINE_SPINLOCK(irq_measurement_lock);
-
-/*
- *  Add 1 in for softirq (irq_exit());
- */
-static struct irq_measurement irq_measurements[NR_IRQS + 1];
-
-/*
- * irq_measurement_update()
- *	Update an entry in the measurement array for this irq.
- */
-static void irq_measurement_update(int irq, int sample)
-{
-	struct irq_measurement *im = &irq_measurements[irq];
-	spin_lock(&irq_measurement_lock);
-	if ((im->min == 0) || (im->min > sample)) {
-		im->min = sample;
-	}
-	if (im->max < sample) {
-		im->max = sample;
-	}
-	im->avg = ((im->avg * (IRQ_WEIGHT - 1)) + sample) / IRQ_WEIGHT;
-	spin_unlock(&irq_measurement_lock);
-}
-#endif
-
-/*
- * irq_kernel_stack_check()
- *	See if the kernel stack is within STACK_WARN of the end.
- */
-static void irq_kernel_stack_check(int irq, struct pt_regs *regs)
-{
-#ifdef CONFIG_DEBUG_STACKOVERFLOW
-	unsigned long sp;
-
-	/*
-	 * Make sure that we are not close to the top of the stack and thus
-	 * can not really service this interrupt.
-	 */
-	asm volatile (
-		"and.4		%0, SP, %1 \n\t"
-		: "=d" (sp)
-		: "d" (THREAD_SIZE - 1)
-		: "cc"
-	);
-
-	if (sp < (sizeof(struct thread_info) + STACK_WARN)) {
-		printk(KERN_WARNING
-			"cpu[%d]: possible overflow detected sp remain: %p, "
-		       "irq: %d, regs: %p\n",
-			thread_get_self(), (void *)sp, irq, regs);
-		dump_stack();
-	}
-
-	if (sp < (sizeof(struct thread_info) + 16)) {
-		THREAD_STALL;
-	}
-#endif
-}
-
-/*
- * irq_get_lsb()
- *	Get the LSB set in value
- */
-static int irq_get_lsb(unsigned int value)
-{
-	static unsigned char irq_bits[8] = {
-		3, 0, 1, 0, 2, 0, 1, 0
-	};
-	u32_t nextbit = 0;
-
-	value = (value >> nextbit) | (value << ((sizeof(value) * 8) - nextbit));
-
-	/*
-	 * It's unlikely that we find that we execute the body of this while
-	 * loop.  50% of the time we won't take this at all and then of the
-	 * cases where we do about 50% of those we only execute once.
-	 */
-	if (!(value & 0xffff)) {
-		nextbit += 0x10;
-		value >>= 16;
-	}
-
-	if (!(value & 0xff)) {
-		nextbit += 0x08;
-		value >>= 8;
-	}
-
-	if (!(value & 0xf)) {
-		nextbit += 0x04;
-		value >>= 4;
-	}
-
-	nextbit += irq_bits[value & 0x7];
-	if (nextbit > 63) {
-		panic("nextbit out of range: %d\n", nextbit);
-	}
-	return nextbit;
-}
-
-/*
- * ubicom32_reserve_handler()
- *	Bogus handler associated with pre-reserved IRQ(s).
- */
-static irqreturn_t ubicom32_reserve_handler(int irq, void *dev_id)
-{
-	BUG();
-	return IRQ_HANDLED;
-}
-
-/*
- * __irq_disable_vector()
- *	Disable the interrupt by clearing the appropriate bit in the
- *	LDSR Mask Register.
- */
-static void __irq_disable_vector(unsigned int irq)
-{
-	ldsr_disable_vector(irq);
-}
-
-/*
- * __irq_ack_vector()
- *	Acknowledge the specific interrupt by clearing the associate bit in
- *	hardware
- */
-static void __irq_ack_vector(unsigned int irq)
-{
-	if (irq < 32) {
-		asm volatile ("move.4 INT_CLR0, %0" : : "d" (1 << irq));
-	} else {
-		asm volatile ("move.4 INT_CLR1, %0" : : "d" (1 << (irq - 32)));
-	}
-}
-
-/*
- * __irq_enable_vector()
- *	Clean and then enable the interrupt by setting the appropriate bit in
- *	the LDSR Mask Register.
- */
-static void __irq_enable_vector(unsigned int irq)
-{
-	/*
-	 * Acknowledge, really clear the vector.
-	 */
-	__irq_ack_vector(irq);
-	ldsr_enable_vector(irq);
-}
-
-/*
- * __irq_mask_vector()
- */
-static void __irq_mask_vector(unsigned int irq)
-{
-	ldsr_mask_vector(irq);
-}
-
-/*
- * __irq_unmask_vector()
- */
-static void __irq_unmask_vector(unsigned int irq)
-{
-	ldsr_unmask_vector(irq);
-}
-
-/*
- * __irq_end_vector()
- *	Called once an interrupt is completed (reset the LDSR mask).
- */
-static void __irq_end_vector(unsigned int irq)
-{
-	ldsr_unmask_vector(irq);
-}
-
-#if defined(CONFIG_SMP)
-/*
- * __irq_set_affinity()
- *	Set the cpu affinity for this interrupt.
- *	affinity container allocated at boot
- */
-static void __irq_set_affinity(unsigned int irq, const struct cpumask *dest)
-{
-	smp_set_affinity(irq, dest);
-	cpumask_copy(irq_desc[irq].affinity, dest);
-}
-#endif
-
-/*
- * On-Chip Generic Interrupt function handling.
- */
-static struct irq_chip ubicom32_irq_chip = {
-	.name		= "Ubicom32",
-	.startup	= NULL,
-	.shutdown	= NULL,
-	.enable		= __irq_enable_vector,
-	.disable	= __irq_disable_vector,
-	.ack		= __irq_ack_vector,
-	.mask		= __irq_mask_vector,
-	.unmask		= __irq_unmask_vector,
-	.end		= __irq_end_vector,
-#if defined(CONFIG_SMP)
-	.set_affinity	= __irq_set_affinity,
-#endif
-};
-
-/*
- * do_IRQ()
- *	Primary interface for handling IRQ() requests.
- */
-asmlinkage void do_IRQ(int irq, struct pt_regs *regs)
-{
-	struct pt_regs *oldregs;
-	struct thread_info *ti = current_thread_info();
-
-	IRQ_DECLARE_MEASUREMENT;
-
-	/*
-	 * Mark that we are inside of an interrupt and
-	 * that interrupts are disabled.
-	 */
-	oldregs = set_irq_regs(regs);
-	ti->interrupt_nesting++;
-	trace_hardirqs_off();
-	irq_kernel_stack_check(irq, regs);
-
-	/*
-	 * Start the interrupt sequence
-	 */
-	irq_enter();
-
-	/*
-	 * Execute the IRQ handler and any pending SoftIRQ requests.
-	 */
-	BUG_ON(!irqs_disabled());
-	IRQ_MEASUREMENT_START();
-	__do_IRQ(irq);
-	IRQ_MEASUREMENT_END(irq);
-	BUG_ON(!irqs_disabled());
-
-	/*
-	 * TODO: Since IRQ's are disabled when calling irq_exit()
-	 * modify Kconfig to set __ARCH_IRQ_EXIT_IRQS_DISABLED flag.
-	 * This will slightly improve performance by enabling
-	 * softirq handling to avoid disabling/disabled interrupts.
-	 */
-	IRQ_MEASUREMENT_START();
-	irq_exit();
-	IRQ_MEASUREMENT_END(NR_IRQS);
-	BUG_ON(!irqs_disabled());
-
-	/*
-	 * Outside of an interrupt (or nested exit).
-	 */
-	set_irq_regs(oldregs);
-	trace_hardirqs_on();
-	ti->interrupt_nesting--;
-}
-
-/*
- * irq_soft_alloc()
- *	Allocate a soft IRQ.
- */
-int irq_soft_alloc(unsigned int *soft)
-{
-	if (irq_soft_avail == 0) {
-		printk(KERN_NOTICE "no soft irqs to allocate\n");
-		return -EFAULT;
-	}
-
-	*soft = irq_get_lsb(irq_soft_avail);
-	irq_soft_avail &= ~(1 << *soft);
-	return 0;
-}
-
-/*
- * ack_bad_irq()
- *	Called to handle an bad irq request.
- */
-void ack_bad_irq(unsigned int irq)
-{
-	printk(KERN_ERR "IRQ: unexpected irq=%d\n", irq);
-	__irq_end_vector(irq);
-}
-
-/*
- * show_interrupts()
- *	Return a string that displays the state of each of the interrupts.
- */
-int show_interrupts(struct seq_file *p, void *v)
-{
-	struct irqaction *ap;
-	int irq = *((loff_t *) v);
-	int j;
-
-	if (irq >= NR_IRQS) {
-		return 0;
-	}
-
-	if (irq == 0) {
-		seq_puts(p, "           ");
-		for_each_online_cpu(j) {
-			seq_printf(p, "CPU%d       ", j);
-		}
-		seq_putc(p, '\n');
-	}
-
-	ap = irq_desc[irq].action;
-	if (ap) {
-		seq_printf(p, "%3d: ", irq);
-		for_each_online_cpu(j) {
-			seq_printf(p, "%10u ", kstat_irqs_cpu(irq, j));
-		}
-		seq_printf(p, "%14s  ", irq_desc[irq].chip->name);
-		seq_printf(p, "%s", ap->name);
-		for (ap = ap->next; ap; ap = ap->next) {
-			seq_printf(p, ", %s", ap->name);
-		}
-		seq_putc(p, '\n');
-	}
-	return 0;
-}
-
-#if defined(CONFIG_DEBUG_IRQMEASURE)
-static unsigned int irq_cycles_to_micro(unsigned int cycles, unsigned int frequency)
-{
-	unsigned int micro = (cycles / (frequency / 1000000));
-	return micro;
-}
-
-/*
- * irq_measurement_show()
- *	Print out the min, avg, max values for each IRQ
- *
- * By request, the max value is reset after each dump.
- */
-static int irq_measurement_show(struct seq_file *p, void *v)
-{
-	struct irqaction *ap;
-	unsigned int freq = processor_frequency();
-	int irq = *((loff_t *) v);
-
-
-	if (irq == 0) {
-		seq_puts(p, "\tmin\tavg\tmax\t(micro-seconds)\n");
-	}
-
-	if (irq > NR_IRQS) {
-		return 0;
-	}
-
-	if (irq == NR_IRQS) {
-		unsigned int min, avg, max;
-		spin_lock(&irq_measurement_lock);
-		min = irq_cycles_to_micro(irq_measurements[irq].min, freq);
-		avg = irq_cycles_to_micro(irq_measurements[irq].avg, freq);
-		max = irq_cycles_to_micro(irq_measurements[irq].max, freq);
-		irq_measurements[irq].max = 0;
-		spin_unlock(&irq_measurement_lock);
-		seq_printf(p, "   \t%u\t%u\t%u\tsoftirq\n", min, avg, max);
-		return 0;
-	}
-
-	ap = irq_desc[irq].action;
-	if (ap) {
-		unsigned int min, avg, max;
-		spin_lock(&irq_measurement_lock);
-		min = irq_cycles_to_micro(irq_measurements[irq].min, freq);
-		avg = irq_cycles_to_micro(irq_measurements[irq].avg, freq);
-		max = irq_cycles_to_micro(irq_measurements[irq].max, freq);
-		irq_measurements[irq].max = 0;
-		spin_unlock(&irq_measurement_lock);
-		seq_printf(p, "%2u:\t%u\t%u\t%u\t%s\n", irq, min, avg, max, ap->name);
-	}
-	return 0;
-}
-
-static void *irq_measurement_start(struct seq_file *f, loff_t *pos)
-{
-	return (*pos <= NR_IRQS) ? pos : NULL;
-}
-
-static void *irq_measurement_next(struct seq_file *f, void *v, loff_t *pos)
-{
-	(*pos)++;
-	if (*pos > NR_IRQS)
-		return NULL;
-	return pos;
-}
-
-static void irq_measurement_stop(struct seq_file *f, void *v)
-{
-	/* Nothing to do */
-}
-
-static const struct seq_operations irq_measurement_seq_ops = {
-	.start = irq_measurement_start,
-	.next  = irq_measurement_next,
-	.stop  = irq_measurement_stop,
-	.show  = irq_measurement_show,
-};
-
-static int irq_measurement_open(struct inode *inode, struct file *filp)
-{
-	return seq_open(filp, &irq_measurement_seq_ops);
-}
-
-static const struct file_operations irq_measurement_fops = {
-	.open		= irq_measurement_open,
-	.read		= seq_read,
-	.llseek		= seq_lseek,
-	.release	= seq_release,
-};
-
-static int __init irq_measurement_init(void)
-{
-	proc_create("irq_measurements", 0, NULL, &irq_measurement_fops);
-	return 0;
-}
-module_init(irq_measurement_init);
-#endif
-
-/*
- * init_IRQ(void)
- *	Initialize the on-chip IRQ subsystem.
- */
-void __init init_IRQ(void)
-{
-	int irq;
-	struct devtree_node *p = NULL;
-	struct devtree_node *iter = NULL;
-	unsigned int mask = 0;
-	unsigned int reserved = 0;
-
-	/*
-	 * Pull out the list of software interrupts that are avialable to
-	 * Linux and provide an allocation function for them.  The first
-	 * 24 interrupts of INT0 are software interrupts.
-	 */
-	irq_soft_avail = 0;
-	if (processor_interrupts(&irq_soft_avail, NULL) < 0) {
-		printk(KERN_WARNING "No Soft IRQ(s) available\n");
-	}
-	irq_soft_avail &= ((1 << 24) - 1);
-
-	/*
-	 * Initialize all of the on-chip interrupt handling
-	 * to use a common set of interrupt functions.
-	 */
-	for (irq = 0; irq < NR_IRQS; irq++) {
-		irq_desc[irq].status = IRQ_DISABLED;
-		irq_desc[irq].action = NULL;
-		irq_desc[irq].depth = 1;
-		set_irq_chip(irq, &ubicom32_irq_chip);
-	}
-
-	/*
-	 * The sendirq of a devnode is not registered within Linux but instead
-	 * is used by the software I/O thread.  These interrupts are reserved.
-	 * The recvirq is used by Linux and registered by a device driver, these
-	 * are not reserved.
-	 *
-	 * recvirq(s) that are in the software interrupt range are not supposed
-	 * to be marked as reserved.  We track this while we scan the device
-	 * nodes.
-	 */
-	p = devtree_find_next(&iter);
-	while (p) {
-		unsigned char sendirq, recvirq;
-		devtree_irq(p, &sendirq, &recvirq);
-
-		/*
-		 * If the sendirq is valid, mark that irq as taken by the
-		 * devtree node.
-		 */
-		if (sendirq < NR_IRQS) {
-			ubicom32_reserve_action[sendirq].handler =
-				ubicom32_reserve_handler;
-			ubicom32_reserve_action[sendirq].name = p->name;
-			irq_desc[sendirq].action =
-				&ubicom32_reserve_action[sendirq];
-			mask |= (1 << sendirq);
-		}
-
-		/*
-		 * Track the relevant recieve IRQ(s)
-		 */
-		if (recvirq < 24) {
-			mask |= (1 << recvirq);
-		}
-
-		/*
-		 * Move to the next node.
-		 */
-		p = devtree_find_next(&iter);
-	}
-
-	/*
-	 * Remove these bits from the irq_soft_avail list and then use the
-	 * result as the list of pre-reserved IRQ(s).
-	 */
-	reserved = ~irq_soft_avail & ~mask;
-	for (irq = 0; irq < 24; irq++) {
-		if ((reserved & (1 << irq))) {
-			ubicom32_reserve_action[irq].handler =
-				ubicom32_reserve_handler;
-			ubicom32_reserve_action[irq].name = "reserved";
-			irq_desc[irq].action = &ubicom32_reserve_action[irq];
-		}
-	}
-
-	/*
-	 * Initialize the LDSR which is the Ubicom32 programmable
-	 * interrupt controller.
-	 */
-	ldsr_init();
-
-	/*
-	 * The Ubicom trap code needs a 2nd init after IRQ(s) are setup.
-	 */
-	trap_init_interrupt();
-}
diff --git a/target/linux/ubicom32/files/arch/ubicom32/kernel/ldsr.c b/target/linux/ubicom32/files/arch/ubicom32/kernel/ldsr.c
deleted file mode 100644
index a608d74cf..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/kernel/ldsr.c
+++ /dev/null
@@ -1,1185 +0,0 @@
-/*
- * arch/ubicom32/kernel/ldsr.c
- *   Ubicom32 architecture Linux Device Services Driver Interface
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- *
- * NOTES:
- *
- * The LDSR is a programmable interrupt controller that is written in software.
- * It emulates the behavior of an pic by fielding the interrupts, choosing a
- * victim thread to take the interrupt and forcing that thread to take a context
- * switch to the appropriate interrupt handler.
- *
- * Because traps are treated as just a special class of interrupts, the LDSR
- * also handles the processing of traps.
- *
- * Because we compile Linux both UP and SMP, we need the LDSR to use
- * architectural locking that is not "compiled out" when compiling UP.  For now,
- * we use the single atomic bit lock.
- */
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/sched.h>
-#include <linux/interrupt.h>
-#include <linux/irq.h>
-#include <linux/profile.h>
-#include <linux/clocksource.h>
-#include <linux/types.h>
-#include <linux/module.h>
-#include <linux/cpumask.h>
-#include <linux/bug.h>
-#include <linux/delay.h>
-#include <asm/ip5000.h>
-#include <asm/atomic.h>
-#include <asm/machdep.h>
-#include <asm/asm-offsets.h>
-#include <asm/traps.h>
-#include <asm/thread.h>
-#include <asm/range-protect.h>
-
-/*
- * One can not print from the LDSR so the best we can do is
- * check a condition and stall all of the threads.
- */
-
-// #define DEBUG_LDSR 1
-#if defined(DEBUG_LDSR)
-#define DEBUG_ASSERT(cond) \
-	if (!(cond)) { \
-		THREAD_STALL; \
-	}
-#else
-#define DEBUG_ASSERT(cond)
-#endif
-
-/*
- * Make global so that we can use it in the RFI code in assembly.
- */
-unsigned int ldsr_soft_irq_mask;
-EXPORT_SYMBOL(ldsr_soft_irq_mask);
-
-static unsigned int ldsr_suspend_mask;
-static unsigned int ldsr_soft_irq;
-static unsigned int ldsr_stack_space[1024];
-
-static struct ldsr_register_bank {
-	volatile unsigned int enabled0;
-	volatile unsigned int enabled1;
-	volatile unsigned int mask0;
-	volatile unsigned int mask1;
-	unsigned int total;
-	unsigned int retry;
-	unsigned int backout;
-} ldsr_interrupt;
-
-/*
- * Which thread/cpu are we?
- */
-static int ldsr_tid = -1;
-
-#if defined(CONFIG_IRQSTACKS)
-/*
- * per-CPU IRQ stacks (thread information and stack)
- *
- * NOTE: Do not use DEFINE_PER_CPU() as it makes it harder
- * to find the location of ctx from assembly language.
- */
-union irq_ctx {
-	struct thread_info      tinfo;
-	u32                     stack[THREAD_SIZE/sizeof(u32)];
-};
-static union irq_ctx *percpu_irq_ctxs[NR_CPUS];
-
-/*
- *  Storage for the interrupt stack.
- */
-#if !defined(CONFIG_IRQSTACKS_USEOCM)
-static char percpu_irq_stacks[(NR_CPUS * THREAD_SIZE) + (THREAD_SIZE - 1)];
-#else
-/*
- *  For OCM, the linker will ensure that space is allocated for the stack
- *  see (vmlinux.lds.S)
- */
-static char percpu_irq_stacks[];
-#endif
-
-#endif
-
-/*
- * Save trap IRQ because we need to un-suspend if it gets set.
- */
-static unsigned int ldsr_trap_irq_mask;
-static unsigned int ldsr_trap_irq;
-
-/*
- * ret_from_interrupt_to_kernel
- *	Just restore the context and do nothing else.
- */
-asmlinkage void ret_from_interrupt_to_kernel(void)__attribute__((naked));
-
-/*
- * ret_from_interrupt_to_user
- *	Call scheduler if needed. Just restore the context.
- */
-asmlinkage void ret_from_interrupt_to_user(void)__attribute__((naked));
-
-#ifdef DEBUG_LDSR
-u32_t old_sp, old_pc, old_a0, old_a5, old_a3;
-struct pt_regs copy_regs, *copy_save_area;
-#endif
-
-int __user_mode(unsigned long sp)
-{
-
-	u32_t saved_stack_base = sp & ~(ASM_THREAD_SIZE - 1);
-#if defined(CONFIG_IRQSTACKS_USEOCM)
-	if ((union irq_ctx *)saved_stack_base == percpu_irq_ctxs[smp_processor_id()]) {
-		/*
-		 *  On the interrupt stack.
-		 */
-		return 0;
-	}
-#endif
-
-	if (!(u32_t)current) {
-		return 0;
-	}
-	return saved_stack_base != ((u32_t)current->stack);
-}
-
-/*
- * ldsr_lock_release()
- *	Release the LDSR lock.
- */
-static void ldsr_lock_release(void)
-{
-	UBICOM32_UNLOCK(LDSR_LOCK_BIT);
-}
-
-/*
- * ldsr_lock_acquire()
- *	Acquire the LDSR lock, spin if not available.
- */
-static void ldsr_lock_acquire(void)
-{
-	UBICOM32_LOCK(LDSR_LOCK_BIT);
-}
-
-/*
- * ldsr_thread_irq_disable()
- *	Disable interrupts for the specified thread.
- */
-static void ldsr_thread_irq_disable(unsigned int tid)
-{
-	unsigned int mask = (1 << tid);
-
-	asm volatile (
-	"	or.4	scratchpad1, scratchpad1, %0	\n\t"
-		:
-		: "d"(mask)
-		: "cc"
-	);
-}
-
-/*
- * ldsr_thread_get_interrupts()
- *	Get the interrupt state for all threads.
- */
-static unsigned long ldsr_thread_get_interrupts(void)
-{
-	unsigned long ret = 0;
-	asm volatile (
-	"	move.4	%0, scratchpad1	\n\t"
-		: "=r" (ret)
-		:
-	);
-	return ret;
-}
-
-/*
- * ldsr_emulate_and_run()
- *	Emulate the instruction and then set the thread to run.
- */
-static void ldsr_emulate_and_run(unsigned int tid)
-{
-	unsigned int thread_mask = (1 << tid);
-	u32_t write_csr = (tid << 15) | (1 << 14);
-
-	/*
-	 * Emulate the unaligned access.
-	 */
-	unaligned_emulate(tid);
-
-	/*
-	 * Get the thread back in a running state.
-	 */
-	asm volatile (
-	"	setcsr	%0			\n\t"
-	"	setcsr_flush 0			\n\t"
-	"	move.4	trap_cause, #0		\n\t" /* Clear the trap cause
-						       * register */
-	"	setcsr	#0			\n\t"
-	"	setcsr_flush 0			\n\t"
-	"	move.4	mt_dbg_active_set, %1	\n\t" /* Activate thread even if
-						       * in dbg/fault state */
-	"	move.4	mt_active_set, %1	\n\t" /* Restart target
-						       * thread. */
-		:
-		: "r" (write_csr), "d" (thread_mask)
-		: "cc"
-	);
-	thread_enable_mask(thread_mask);
-}
-
-/*
- * ldsr_preemptive_context_save()
- *	save thread context from another hardware thread.  The other thread must
- *	be stalled.
- */
-static inline void ldsr_preemptive_context_save(u32_t thread,
-						struct pt_regs *regs)
-{
-	/*
-	 * Save the current state of the specified thread
-	 */
-	asm volatile (
-	"       move.4  a3, %0					\n\t"
-
-		/* set src1 from the target thread */
-	"       move.4  csr, %1					\n\t"
-	"	setcsr_flush 0					\n\t"
-	"	setcsr_flush 0					\n\t"
-
-		/* copy state from the other thread */
-	"       move.4  "D(PT_D0)"(a3), d0			\n\t"
-	"       move.4  "D(PT_D1)"(a3), d1			\n\t"
-	"       move.4  "D(PT_D2)"(a3), d2			\n\t"
-	"       move.4  "D(PT_D3)"(a3), d3			\n\t"
-	"       move.4  "D(PT_D4)"(a3), d4			\n\t"
-	"       move.4  "D(PT_D5)"(a3), d5			\n\t"
-	"       move.4  "D(PT_D6)"(a3), d6			\n\t"
-	"       move.4  "D(PT_D7)"(a3), d7			\n\t"
-	"       move.4  "D(PT_D8)"(a3), d8			\n\t"
-	"       move.4  "D(PT_D9)"(a3), d9			\n\t"
-	"       move.4  "D(PT_D10)"(a3), d10			\n\t"
-	"       move.4  "D(PT_D11)"(a3), d11			\n\t"
-	"       move.4  "D(PT_D12)"(a3), d12			\n\t"
-	"       move.4  "D(PT_D13)"(a3), d13			\n\t"
-	"       move.4  "D(PT_D14)"(a3), d14			\n\t"
-	"       move.4  "D(PT_D15)"(a3), d15			\n\t"
-	"       move.4  "D(PT_A0)"(a3), a0			\n\t"
-	"       move.4  "D(PT_A1)"(a3), a1			\n\t"
-	"       move.4  "D(PT_A2)"(a3), a2			\n\t"
-	"       move.4  "D(PT_A3)"(a3), a3			\n\t"
-	"       move.4  "D(PT_A4)"(a3), a4			\n\t"
-	"       move.4  "D(PT_A5)"(a3), a5			\n\t"
-	"       move.4  "D(PT_A6)"(a3), a6			\n\t"
-	"       move.4  "D(PT_SP)"(a3), a7			\n\t"
-	"       move.4  "D(PT_ACC0HI)"(a3), acc0_hi		\n\t"
-	"       move.4  "D(PT_ACC0LO)"(a3), acc0_lo		\n\t"
-	"       move.4  "D(PT_MAC_RC16)"(a3), mac_rc16		\n\t"
-	"       move.4  "D(PT_ACC1HI)"(a3), acc1_hi		\n\t"
-	"       move.4  "D(PT_ACC1LO)"(a3), acc1_lo		\n\t"
-	"       move.4  "D(PT_SOURCE3)"(a3), source3		\n\t"
-	"       move.4  "D(PT_INST_CNT)"(a3), inst_cnt		\n\t"
-	"       move.4  "D(PT_CSR)"(a3), csr			\n\t"
-	"       move.4  "D(PT_DUMMY_UNUSED)"(a3), #0		\n\t"
-	"       move.4  "D(PT_INT_MASK0)"(a3), int_mask0	\n\t"
-	"       move.4  "D(PT_INT_MASK1)"(a3), int_mask1	\n\t"
-	"       move.4  "D(PT_TRAP_CAUSE)"(a3), trap_cause	\n\t"
-	"       move.4  "D(PT_PC)"(a3), pc			\n\t"
-	"	move.4	"D(PT_PREVIOUS_PC)"(a3), previous_pc	\n\t"
-		/* disable csr thread select */
-	"       movei   csr, #0					\n\t"
-	"       setcsr_flush 0					\n\t"
-	:
-	: "r" (regs->dn), "d" ((thread << 9) | (1 << 8))
-	: "a3"
-	);
-}
-
-/*
- * ldsr_rotate_threads()
- *	Simple round robin algorithm for choosing the next cpu
- */
-static int ldsr_rotate_threads(unsigned long cpus)
-{
-	static unsigned char ldsr_bits[8] = {
-		3, 0, 1, 0, 2, 0, 1, 0
-	};
-
-	static int nextbit;
-	int thisbit;
-
-	/*
-	 * Move the interrupts down so that we consider interrupts from where
-	 * we left off, then take the interrupts we would lose and move them
-	 * to the top half of the interrupts value.
-	 */
-	cpus = (cpus >> nextbit) | (cpus << ((sizeof(cpus) * 8) - nextbit));
-
-	/*
-	 * 50% of the time we won't take this at all and then of the cases where
-	 * we do about 50% of those we only execute once.
-	 */
-	if (!(cpus & 0xffff)) {
-		nextbit += 16;
-		cpus >>= 16;
-	}
-
-	if (!(cpus & 0xff)) {
-		nextbit += 8;
-		cpus >>= 8;
-	}
-
-	if (!(cpus & 0xf)) {
-		nextbit += 4;
-		cpus >>= 4;
-	}
-
-	nextbit += ldsr_bits[cpus & 0x7];
-	thisbit = (nextbit & ((sizeof(cpus) * 8) - 1));
-	nextbit = (thisbit + 1) & ((sizeof(cpus) * 8) - 1);
-	DEBUG_ASSERT(thisbit < THREAD_ARCHITECTURAL_MAX);
-	return thisbit;
-}
-
-/*
- * ldsr_rotate_interrupts()
- *	Get rotating next set bit value.
- */
-static int ldsr_rotate_interrupts(unsigned long long interrupts)
-{
-	static unsigned char ldsr_bits[8] = {
-		3, 0, 1, 0, 2, 0, 1, 0
-	};
-
-	static int nextbit;
-	int thisbit;
-
-	/*
-	 * Move the interrupts down so that we consider interrupts from where
-	 * we left off, then take the interrupts we would lose and move them
-	 * to the top half of the interrupts value.
-	 */
-	interrupts = (interrupts >> nextbit) |
-		(interrupts << ((sizeof(interrupts) * 8) - nextbit));
-
-	/*
-	 * 50% of the time we won't take this at all and then of the cases where
-	 * we do about 50% of those we only execute once.
-	 */
-	if (!(interrupts & 0xffffffff)) {
-		nextbit += 32;
-		interrupts >>= 32;
-	}
-
-	if (!(interrupts & 0xffff)) {
-		nextbit += 16;
-		interrupts >>= 16;
-	}
-
-	if (!(interrupts & 0xff)) {
-		nextbit += 8;
-		interrupts >>= 8;
-	}
-
-	if (!(interrupts & 0xf)) {
-		nextbit += 4;
-		interrupts >>= 4;
-	}
-
-	nextbit += ldsr_bits[interrupts & 0x7];
-	thisbit = (nextbit & ((sizeof(interrupts) * 8) - 1));
-	nextbit = (thisbit + 1) & ((sizeof(interrupts) * 8) - 1);
-
-	DEBUG_ASSERT(thisbit < (sizeof(interrupts) * 8));
-	return thisbit;
-}
-
-/*
- * ldsr_backout_or_irq()
- *
- * One way or the other this interrupt is not being
- * processed, make sure that it is reset.  We are
- * not going to call irq_end_vector() so unmask the
- * interrupt.
- */
-static void ldsr_backout_of_irq(int vector, unsigned long tid_mask)
-{
-#if defined(CONFIG_SMP)
-	if (unlikely(vector == smp_ipi_irq)) {
-		smp_reset_ipi(tid_mask);
-	}
-#endif
-	ldsr_unmask_vector(vector);
-	ldsr_interrupt.backout++;
-}
-
-#if defined(CONFIG_IRQSTACKS)
-/*
- * ldsr_choose_savearea_and_returnvec()
- *	Test our current state (user, kernel, interrupt) and set things up.
- *
- * This version of the function uses 3 stacks and nests interrupts
- * on the interrupt stack.
- */
-static struct pt_regs *ldsr_choose_savearea_and_returnvec(thread_t tid, u32_t linux_sp, u32_t *pvec)
-{
-	struct pt_regs *save_area;
-	u32_t masked_linux_sp = linux_sp & ~(THREAD_SIZE - 1);
-	struct thread_info * ti= (struct thread_info *)sw_ksp[tid];
-
-#if defined(CONFIG_SMP)
-	union irq_ctx *icp = percpu_irq_ctxs[tid];
-#else
-	union irq_ctx *icp = percpu_irq_ctxs[0];
-#endif
-
-	if (masked_linux_sp == (u32_t)icp) {
-		/*
-		 * Fault/Interrupt occurred while on the interrupt stack.
-		 */
-		save_area = (struct pt_regs *)((char *)linux_sp - sizeof(struct pt_regs) - 8);
-		*pvec = (u32_t)(&ret_from_interrupt_to_kernel);
-	} else {
-		/*
-		 *  Fault/Interrupt occurred while on user/kernel stack.  This is a new
-		 *  first use of the interrupt stack.
-		 */
-		save_area = (struct pt_regs *) ((char *)icp + sizeof(icp->stack) - sizeof(struct pt_regs) - 8);
-		if (masked_linux_sp == (u32_t)ti) {
-			*pvec  = (u32_t)(&ret_from_interrupt_to_kernel);
-		} else {
-			*pvec  = (u32_t)(&ret_from_interrupt_to_user);
-		}
-
-		/*
-		 * Because the softirq code will execute on the "interrupt" stack, we
-		 * need to maintain the knowledge of what "task" was executing on the
-		 * cpu.  This is done by copying the thread_info->task from the cpu
-		 * we are about to context switch into the interrupt contexts thread_info
-		 * structure.
-		 */
-		icp->tinfo.task = ti->task;
-		icp->tinfo.preempt_count =
-				(icp->tinfo.preempt_count & ~SOFTIRQ_MASK) |
-				(ti->preempt_count & SOFTIRQ_MASK);
-		icp->tinfo.interrupt_nesting = 0;
-	}
-	save_area->nesting_level = icp->tinfo.interrupt_nesting;
-	return save_area;
-}
-
-#else
-/*
- * ldsr_choose_savearea_and_returnvec()
- *	Test our current state (user, kernel, interrupt) and set things up.
- *
- * The version of the function uses just the user & kernel stack and
- * nests interrupts on the existing kernel stack.
- */
-static struct pt_regs *ldsr_choose_savearea_and_returnvec(thread_t tid, u32_t linux_sp, u32_t *pvec)
-{
-	struct pt_regs *save_area;
-	u32_t masked_linux_sp = linux_sp & ~(THREAD_SIZE - 1);
-	struct thread_info *ti = (struct thread_info *)sw_ksp[tid];
-
-	if (masked_linux_sp == (u32_t)ti) {
-		/*
-		 * Fault/Interrupt occurred while on the kernel stack.
-		 */
-		save_area = (struct pt_regs *)((char *)linux_sp - sizeof(struct pt_regs) - 8);
-		*pvec = (u32_t) (&ret_from_interrupt_to_kernel);
-	} else {
-		/*
-		 *  Fault/Interrupt occurred while on user stack.
-		 */
-		ti->interrupt_nesting = 0;
-		save_area = (struct pt_regs *)((u32_t)ti + THREAD_SIZE - sizeof(struct pt_regs) - 8);
-		*pvec  = (u32_t) (&ret_from_interrupt_to_user);
-	}
-	save_area->nesting_level = ti->interrupt_nesting;
-	return save_area;
-}
-#endif
-
-/*
- * ldsr_ctxsw_thread()
- *	Context switch a mainline thread to execute do_IRQ() for the specified
- *	vector.
- */
-static void ldsr_ctxsw_thread(int vector, thread_t tid)
-{
-	u32_t linux_sp;
-	u32_t return_vector;
-	struct pt_regs *save_area, *regs;
-	u32_t thread_mask = (1 << tid);
-	u32_t read_csr = ((tid << 9) | (1 << 8));
-	u32_t write_csr = (tid << 15) | (1 << 14);
-	u32_t interrupt_vector = (u32_t)(&do_IRQ);
-
-	unsigned int frame_type = UBICOM32_FRAME_TYPE_INTERRUPT;
-
-
-	DEBUG_ASSERT(!thread_is_enabled(tid));
-
-	/*
-	 * Acquire the necessary global and per thread locks for tid.
-	 * As a side effect, we ensure that the thread has not trapped
-	 * and return true if it has.
-	 */
-	if (unlikely(thread_is_trapped(tid))) {
-		/*
-		 * Read the trap cause, the sp and clear the MT_TRAP bits.
-		 */
-		unsigned int cause;
-		asm volatile (
-		"	setcsr	%3		\n\t"
-		"	setcsr_flush 0		\n\t"
-		"	setcsr_flush 0		\n\t"
-		"	move.4	%0, TRAP_CAUSE	\n\t"
-		"	move.4	%1, SP		\n\t"
-		"	setcsr	#0		\n\t"
-		"	setcsr_flush 0		\n\t"
-		"	move.4	MT_BREAK_CLR, %2\n\t"
-		"	move.4	MT_TRAP_CLR, %2	\n\t"
-			: "=&r" (cause), "=&r" (linux_sp)
-			: "r" (thread_mask), "m" (read_csr)
-		);
-
-		ldsr_backout_of_irq(vector, (1 << tid));
-
-#if !defined(CONFIG_UNALIGNED_ACCESS_DISABLED)
-		/*
-		 * See if the unaligned trap handler can deal with this.
-		 * If so, emulate the instruction and then just restart
-		 * the thread.
-		 */
-		if (unaligned_only(cause)) {
-#if defined(CONFIG_UNALIGNED_ACCESS_USERSPACE_ONLY)
-			/*
-			 * Check if this is a kernel stack if so we will not
-			 * handle the trap
-			 */
-			u32_t masked_linux_sp = linux_sp & ~(THREAD_SIZE - 1);
-			if ((masked_linux_sp != (u32_t)sw_ksp[tid]) &&
-			    unaligned_only(cause)) {
-				ldsr_emulate_and_run(tid);
-				return;
-			}
-#else
-			ldsr_emulate_and_run(tid);
-			return;
-#endif
-
-		}
-#endif
-
-		interrupt_vector = (u32_t)(&trap_handler);
-		frame_type = UBICOM32_FRAME_TYPE_TRAP;
-	} else {
-		/*
-		 * Read the target thread's SP
-		 */
-		asm volatile (
-		"	setcsr	%1		\n\t"
-		"	setcsr_flush 0		\n\t"
-		"	setcsr_flush 0		\n\t"
-		"	move.4	%0, SP		\n\t"
-		"	setcsr	#0		\n\t"
-		"	setcsr_flush 0		\n\t"
-			: "=m" (linux_sp)
-			: "m" (read_csr)
-		);
-	}
-
-	/*
-	 * We are delivering an interrupt, count it.
-	 */
-	ldsr_interrupt.total++;
-
-	/*
-	 * At this point, we will definitely force this thread to
-	 * a new context, show its interrupts as disabled.
-	 */
-	ldsr_thread_irq_disable(tid);
-
-	/*
-	 * Test our current state (user, kernel, interrupt).  Save the
-	 * appropriate data and setup for the return.
-	 */
-	save_area = ldsr_choose_savearea_and_returnvec(tid, linux_sp, &return_vector);
-
-	/*
-	 *  The pt_regs (save_area) contains the type of thread that we are dealing
-	 *  with (KERNEL/NORMAL) and is copied into each pt_regs area.  We get this
-	 *  from the current tasks kernel pt_regs area that always exists at the
-	 *  top of the kernel stack.
-	 */
-	regs = (struct pt_regs *)((u32_t)sw_ksp[tid] + THREAD_SIZE - sizeof(struct pt_regs) - 8);
-	save_area->thread_type = regs->thread_type;
-
-	/*
-	 * Preserve the context of the Linux thread.
-	 */
-	ldsr_preemptive_context_save(tid, save_area);
-
-	/*
-	 * Load the fram_type into the save_area.
-	 */
-	save_area->frame_type = frame_type;
-
-#ifdef CONFIG_STOP_ON_TRAP
-	/*
-	 * Before we get backtrace and showing stacks working well, it sometimes
-	 * helps to enter the debugger when a trap occurs before we change the
-	 * thread to handle the fault.  This optional code causes all threads to
-	 * stop on every trap frame.  One assumes that GDB connected via the
-	 * mailbox interface will be used to recover from this state.
-	 */
-	if (frame_type == UBICOM32_FRAME_TYPE_TRAP) {
-		THREAD_STALL;
-	}
-#endif
-
-#ifdef DEBUG_LDSR
-	copy_regs = *save_area;
-	copy_save_area = save_area;
-
-	old_a0 = save_area->an[0];
-	old_a3 = save_area->an[3];
-	old_sp = save_area->an[7];
-	old_a5 = save_area->an[5];
-	old_pc = save_area->pc;
-#endif
-
-	/*
-	 * Now we have to switch the kernel thread to run do_IRQ function.
-	 *	Set pc to do_IRQ
-	 *	Set d0 to vector
-	 *	Set d1 to save_area.
-	 *	Set a5 to the proper return vector.
-	 */
-	asm volatile (
-	"	setcsr	%0			\n\t"
-	"	setcsr_flush 0			\n\t"
-	"	move.4	d0, %5			\n\t" /* d0 = 0 vector # */
-	"	move.4	d1, %1			\n\t" /* d1 = save_area */
-	"	move.4	sp, %1			\n\t" /* sp = save_area */
-	"	move.4	a5, %2			\n\t" /* a5 = return_vector */
-	"	move.4	pc, %3			\n\t" /* pc = do_IRQ routine. */
-	"	move.4	trap_cause, #0		\n\t" /* Clear the trap cause
-						       * register */
-	"	setcsr	#0			\n\t"
-	"	setcsr_flush 0			\n\t"
-	"	enable_kernel_ranges %4		\n\t"
-	"	move.4	mt_dbg_active_set, %4	\n\t" /* Activate thread even if
-						       * in dbg/fault state */
-	"	move.4	mt_active_set, %4	\n\t" /* Restart target
-						       * thread. */
-		:
-		: "r" (write_csr), "r" (save_area),
-		  "r" (return_vector), "r" (interrupt_vector),
-		  "d" (thread_mask), "r" (vector)
-		: "cc"
-	);
-	thread_enable_mask(thread_mask);
-}
-
-/*
- * ldsr_deliver_interrupt()
- *	Deliver the interrupt to one of the threads or all of the threads.
- */
-static void ldsr_deliver_interrupt(int vector,
-				   unsigned long deliver_to,
-				   int all)
-{
-	unsigned long disabled_threads;
-	unsigned long possible_threads;
-	unsigned long trapped_threads;
-	unsigned long global_locks;
-
-	/*
-	 * Disable all of the threads that we might want to send
-	 * this interrupt to.
-	 */
-retry:
-	DEBUG_ASSERT(deliver_to);
-	thread_disable_mask(deliver_to);
-
-	/*
-	 * If any threads are in the trap state, we have to service the
-	 * trap for those threads first.
-	 */
-	asm volatile (
-		"move.4	%0, MT_TRAP		\n\t"
-		: "=r" (trapped_threads)
-		:
-	);
-
-	trapped_threads &= deliver_to;
-	if (unlikely(trapped_threads)) {
-		/*
-		 * all traps will be handled, so clear the trap bit before restarting any threads
-		 */
-	        ubicom32_clear_interrupt(ldsr_trap_irq);
-
-		/*
-		 * Let the remaining untrapped threads, continue.
-		 */
-		deliver_to &= ~trapped_threads;
-		if (deliver_to) {
-			thread_enable_mask(deliver_to);
-		}
-
-		/*
-		 * For the trapped threads force them to handle
-		 * a trap.
-		 */
-		while (trapped_threads) {
-			unsigned long which = ffz(~trapped_threads);
-			trapped_threads &= ~(1 << which);
-			ldsr_ctxsw_thread(vector, which);
-		}
-		return;
-	}
-
-	/*
-	 * Can we deliver an interrupt to any of the threads?
-	 */
-	disabled_threads = ldsr_thread_get_interrupts();
-	possible_threads = deliver_to & ~disabled_threads;
-	if (unlikely(!possible_threads)) {
-#if defined(CONFIG_SMP)
-		/*
-		 * In the SMP case, we can not wait because 1 cpu might be
-		 * sending an IPI to another cpu which is currently blocked.
-		 * The only way to ensure IPI delivery is to backout and
-		 * keep trying.  For SMP, we don't sleep until the interrupts
-		 * are delivered.
-		 */
-		thread_enable_mask(deliver_to);
-		ldsr_backout_of_irq(vector, deliver_to);
-		return;
-#else
-		/*
-		 * In the UP case, we have nothing to do so we should wait.
-		 *
-		 * Since the INT_MASK0 and INT_MASK1 are "re-loaded" before we
-		 * suspend in the outer loop, we do not need to save them here.
-		 *
-		 * We test that we were awakened for our specific interrupts
-		 * because the ldsr mask/unmask operations will force the ldsr
-		 * awake even if the interrupt on the mainline thread is not
-		 * completed.
-		 */
-		unsigned int scratch = 0;
-		thread_enable_mask(deliver_to);
-		asm volatile (
-		"	move.4	INT_MASK0, %1		\n\t"
-		"	move.4	INT_MASK1, #0		\n\t"
-
-		"1:	suspend				\n\t"
-		"	move.4	%0, INT_STAT0		\n\t"
-		"	and.4	%0, %0, %1		\n\t"
-		"	jmpeq.f	1b			\n\t"
-
-		"	move.4	INT_CLR0, %2		\n\t"
-			: "+r" (scratch)
-			: "d" (ldsr_suspend_mask), "r" (ldsr_soft_irq_mask)
-			: "cc"
-		);
-
-		/*
-		 * This delay is sized to coincide with the time it takes a
-		 * thread to complete the exit (see return_from_interrupt).
-		 */
-		ldsr_interrupt.retry++;
-		__delay(10);
-		goto retry;
-#endif
-	}
-
-	/*
-	 * If any of the global locks are held, we can not deliver any
-	 * interrupts, we spin delay(10) and then try again.  If our
-	 * spinning becomes a bottle neck, we will need to suspend but for
-	 * now lets just spin.
-	 */
-	asm volatile (
-		"move.4	%0, scratchpad1		\n\t"
-		: "=r" (global_locks)
-		:
-	);
-	if (unlikely(global_locks & 0xffff0000)) {
-		thread_enable_mask(deliver_to);
-
-		/*
-		 * This delay is sized to coincide with the average time it
-		 * takes a thread to release a global lock.
-		 */
-		ldsr_interrupt.retry++;
-		__delay(10);
-		goto retry;
-	}
-
-	/*
-	 * Deliver to one cpu.
-	 */
-	if (!all) {
-		/*
-		 * Find our victim and then enable everyone else.
-		 */
-		unsigned long victim = ldsr_rotate_threads(possible_threads);
-		DEBUG_ASSERT((deliver_to & (1 << victim)));
-		DEBUG_ASSERT((possible_threads & (1 << victim)));
-
-		deliver_to &= ~(1 << victim);
-		if (deliver_to) {
-			thread_enable_mask(deliver_to);
-		}
-		ldsr_ctxsw_thread(vector, victim);
-		return;
-	}
-
-	/*
-	 * If we can't deliver to some threads, wake them
-	 * back up and reset things to deliver to them.
-	 */
-	deliver_to &= ~possible_threads;
-	if (unlikely(deliver_to)) {
-		thread_enable_mask(deliver_to);
-		ldsr_backout_of_irq(vector, deliver_to);
-	}
-
-	/*
-	 * Deliver to all possible threads(s).
-	 */
-	while (possible_threads) {
-		unsigned long victim = ffz(~possible_threads);
-		possible_threads &= ~(1 << victim);
-		ldsr_ctxsw_thread(vector, victim);
-	}
-}
-
-/*
- * ldsr_thread()
- *	This thread acts as the interrupt controller for Linux.
- */
-static void ldsr_thread(void *arg)
-{
-	int stat0;
-	int stat1;
-	int interrupt0;
-	int interrupt1;
-	long long interrupts;
-	unsigned long cpus;
-
-#if !defined(CONFIG_SMP)
-	/*
-	 * In a non-smp configuration, we can not use the cpu(s) arrays because
-	 * there is not a 1-1 correspondence between cpus(s) and our threads.
-	 * Thus we must get a local idea of the mainline threads and use the
-	 * one and only 1 set as the victim.  We do this once before the ldsr
-	 * loop.
-	 *
-	 * In the SMP case, we will use the cpu(s) map to determine which cpu(s)
-	 * are valid to send interrupts to.
-	 */
-	int victim = 0;
-	unsigned int mainline = thread_get_mainline();
-	if (mainline == 0) {
-		panic("no mainline Linux threads to interrupt");
-		return;
-	}
-	victim = ffz(~mainline);
-	cpus = (1 << victim);
-#endif
-
-	while (1) {
-		/*
-		 * If one changes this code not to reload the INT_MASK(s), you
-		 * need to know that code in the lock waiting above does not
-		 * reset the MASK registers back; so that code will need to be
-		 * changed.
-		 */
-		ldsr_lock_acquire();
-		asm volatile (
-		"	move.4 INT_MASK0, %0	\n\t"
-		"	move.4 INT_MASK1, %1	\n\t"
-			:
-			: "U4" (ldsr_interrupt.mask0), "U4" (ldsr_interrupt.mask1)
-		);
-		ldsr_lock_release();
-		thread_suspend();
-
-		/*
-		 * Read the interrupt status registers
-		 */
-		asm volatile (
-			"move.4 %0, INT_STAT0	\n\t"
-			"move.4 %1, INT_STAT1	\n\t"
-			: "=r" (stat0), "=r" (stat1)
-			:
-		);
-
-		/*
-		 * We only care about interrupts that we have been told to care
-		 * about.  The interrupt must be enabled, unmasked, and have
-		 * occurred in the hardware.
-		 */
-		ldsr_lock_acquire();
-		interrupt0 = ldsr_interrupt.enabled0 &
-			ldsr_interrupt.mask0 & stat0;
-		interrupt1 = ldsr_interrupt.enabled1 &
-			ldsr_interrupt.mask1 & stat1;
-		ldsr_lock_release();
-
-		/*
-		 * For each interrupt in the "snapshot" we will mask the
-		 * interrupt handle the interrupt (typically calling do_IRQ()).
-		 *
-		 * The interrupt is unmasked by desc->chip->end() function in
-		 * the per chip generic interrupt handling code
-		 * (arch/ubicom32/kernel/irq.c).8
-		 */
-		interrupts = ((unsigned long long)interrupt1 << 32) |
-			interrupt0;
-		while (interrupts) {
-			int all = 0;
-			int vector = ldsr_rotate_interrupts(interrupts);
-			interrupts &= ~((unsigned long long)1 << vector);
-
-			/*
-			 * Now mask off this vector so that the LDSR ignores
-			 * it until it is acknowledged.
-			 */
-			ldsr_mask_vector(vector);
-#if !defined(CONFIG_SMP)
-			ldsr_deliver_interrupt(vector, cpus, all);
-#else
-			cpus = smp_get_affinity(vector, &all);
-			if (!cpus) {
-				/*
-				 * No CPU to deliver to so just leave
-				 * the interrupt unmasked and increase
-				 * the backout count.  We will eventually
-				 * return and deliver it again.
-				 */
-				ldsr_unmask_vector(vector);
-				ldsr_interrupt.backout++;
-				continue;
-			}
-			ldsr_deliver_interrupt(vector, cpus, all);
-#endif
-		}
-	}
-
-	/* NOTREACHED */
-}
-
-/*
- * ldsr_mask_vector()
- *	Temporarily mask the interrupt vector, turn off the bit in the mask
- *	register.
- */
-void ldsr_mask_vector(unsigned int vector)
-{
-	unsigned int mask;
-	if (vector < 32) {
-		mask = ~(1 << vector);
-		ldsr_lock_acquire();
-		ldsr_interrupt.mask0 &= mask;
-		ldsr_lock_release();
-		thread_resume(ldsr_tid);
-		return;
-	}
-
-	mask = ~(1 << (vector - 32));
-	ldsr_lock_acquire();
-	ldsr_interrupt.mask1 &= mask;
-	ldsr_lock_release();
-	thread_resume(ldsr_tid);
-}
-
-/*
- * ldsr_unmask_vector()
- *	Unmask the interrupt vector so that it can be used, turn on the bit in
- *	the mask register.
- *
- * Because it is legal for the interrupt path to disable an interrupt,
- * the unmasking code must ensure that disabled interrupts are not
- * unmasked.
- */
-void ldsr_unmask_vector(unsigned int vector)
-{
-	unsigned int mask;
-	if (vector < 32) {
-		mask = (1 << vector);
-		ldsr_lock_acquire();
-		ldsr_interrupt.mask0 |= (mask & ldsr_interrupt.enabled0);
-		ldsr_lock_release();
-		thread_resume(ldsr_tid);
-		return;
-	}
-
-	mask = (1 << (vector - 32));
-	ldsr_lock_acquire();
-	ldsr_interrupt.mask1 |= (mask & ldsr_interrupt.enabled1);
-	ldsr_lock_release();
-	thread_resume(ldsr_tid);
-}
-
-/*
- * ldsr_enable_vector()
- *	The LDSR implements an interrupt controller and has a local (to the
- *	LDSR) copy of its interrupt mask.
- */
-void ldsr_enable_vector(unsigned int vector)
-{
-	unsigned int mask;
-	if (vector < 32) {
-		mask = (1 << vector);
-		ldsr_lock_acquire();
-		ldsr_interrupt.enabled0 |= mask;
-		ldsr_interrupt.mask0 |= mask;
-		ldsr_lock_release();
-		thread_resume(ldsr_tid);
-		return;
-	}
-
-	mask = (1 << (vector - 32));
-	ldsr_lock_acquire();
-	ldsr_interrupt.enabled1 |= mask;
-	ldsr_interrupt.mask1 |= mask;
-	ldsr_lock_release();
-	thread_resume(ldsr_tid);
-}
-
-/*
- * ldsr_disable_vector()
- *	The LDSR implements an interrupt controller and has a local (to the
- *	LDSR) copy of its interrupt mask.
- */
-void ldsr_disable_vector(unsigned int vector)
-{
-	unsigned int mask;
-
-	if (vector < 32) {
-		mask = ~(1 << vector);
-		ldsr_lock_acquire();
-		ldsr_interrupt.enabled0 &= mask;
-		ldsr_interrupt.mask0 &= mask;
-		ldsr_lock_release();
-		thread_resume(ldsr_tid);
-		return;
-	}
-
-	mask = ~(1 << (vector - 32));
-	ldsr_lock_acquire();
-	ldsr_interrupt.enabled1 &= mask;
-	ldsr_interrupt.mask1 &= mask;
-	ldsr_lock_release();
-	thread_resume(ldsr_tid);
-}
-
-/*
- * ldsr_get_threadid()
- *	Return the threadid of the LDSR thread.
- */
-thread_t ldsr_get_threadid(void)
-{
-	return ldsr_tid;
-}
-
-/*
- * ldsr_set_trap_irq()
- *	Save away the trap Soft IRQ
- *
- * See the per thread lock suspend code above for an explination.
- */
-void ldsr_set_trap_irq(unsigned int irq)
-{
-	ldsr_trap_irq = irq;
-	ldsr_trap_irq_mask = (1 << irq);
-	ldsr_suspend_mask |= ldsr_trap_irq_mask;
-}
-
-/*
- * ldsr_init()
- *	Initialize the LDSR (Interrupt Controller)
- */
-void ldsr_init(void)
-{
-#if defined(CONFIG_IRQSTACKS)
-	int i;
-	union irq_ctx *icp;
-#endif
-
-	void *stack_high = (void *)ldsr_stack_space;
-	stack_high += sizeof(ldsr_stack_space);
-	stack_high -= 8;
-
-
-	/*
-	 * Obtain a soft IRQ to use
-	 */
-	if (irq_soft_alloc(&ldsr_soft_irq) < 0) {
-		panic("no software IRQ is available\n");
-		return;
-	}
-	ldsr_soft_irq_mask |= (1 << ldsr_soft_irq);
-	ldsr_suspend_mask |= ldsr_soft_irq_mask;
-
-	/*
-	 * Now allocate and start the LDSR thread.
-	 */
-	ldsr_tid = thread_alloc();
-	if (ldsr_tid < 0) {
-		panic("no thread available to run LDSR");
-		return;
-	}
-
-#if defined(CONFIG_IRQSTACKS)
-	/*
-	 * Initialize the per-cpu irq thread_info structure that
-	 * is at the top of each per-cpu irq stack.
-	 */
-	icp = (union irq_ctx *)
-		(((unsigned long)percpu_irq_stacks + (THREAD_SIZE - 1)) & ~(THREAD_SIZE - 1));
-	for (i = 0; i < NR_CPUS; i++) {
-		struct thread_info *ti = &(icp->tinfo);
-		ti->task = NULL;
-		ti->exec_domain = NULL;
-		ti->cpu = i;
-		ti->preempt_count = 0;
-		ti->interrupt_nesting = 0;
-		percpu_irq_ctxs[i] = icp++;
-	}
-#endif
-	thread_start(ldsr_tid, ldsr_thread, NULL,
-		     stack_high, THREAD_TYPE_NORMAL);
-}
diff --git a/target/linux/ubicom32/files/arch/ubicom32/kernel/module.c b/target/linux/ubicom32/files/arch/ubicom32/kernel/module.c
deleted file mode 100644
index 3d29dc2b8..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/kernel/module.c
+++ /dev/null
@@ -1,463 +0,0 @@
-/*
- * arch/ubicom32/kernel/module.c
- *   Ubicom32 architecture loadable module support.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <linux/moduleloader.h>
-#include <linux/bug.h>
-#include <linux/elf.h>
-#include <linux/vmalloc.h>
-#include <linux/fs.h>
-#include <linux/string.h>
-#include <linux/kernel.h>
-#include <asm/ocm-alloc.h>
-
-#if 0
-#define DEBUGP printk
-#else
-#define DEBUGP(fmt...)
-#endif
-
-static void _module_free_ocm(struct module *mod)
-{
-	printk(KERN_INFO "module arch cleanup %s: OCM instruction memory free "
-	       " of %d @%p\n", mod->name, mod->arch.ocm_inst_size,
-	       mod->arch.ocm_inst);
-
-	if (mod->arch.ocm_inst) {
-		ocm_inst_free(mod->arch.ocm_inst);
-		mod->arch.ocm_inst = 0;
-		mod->arch.ocm_inst_size = 0;
-	}
-}
-
-void *module_alloc(unsigned long size)
-{
-	if (size == 0)
-		return NULL;
-	return vmalloc(size);
-}
-
-
-/* Free memory returned from module_alloc */
-void module_free(struct module *mod, void *module_region)
-{
-	vfree(module_region);
-	/* FIXME: If module_region == mod->init_region, trim exception
-	   table entries. */
-
-	/*
-	 * This is expected to be final module free, use this to prune the
-	 * ocm
-	 */
-	if (module_region && module_region == mod->module_core)
-		_module_free_ocm(mod);
-
-}
-
-/*
- * module_frob_arch_sections()
- *	Called from kernel/module.c allowing arch specific handling of
- *	sections/headers.
- */
-int module_frob_arch_sections(Elf_Ehdr *hdr,
-			      Elf_Shdr *sechdrs,
-			      char *secstrings,
-			      struct module *mod)
-{
-	Elf_Shdr *s, *sechdrs_end;
-	void *ocm_inst = NULL;
-	int ocm_inst_size = 0;
-
-	/*
-	 * Ubicom32 v3 and v4 are almost binary compatible but not completely.
-	 * To be safe check that the module was compiled with the correct -march
-	 * which is flags.
-	 */
-#ifdef CONFIG_UBICOM32_V4
-	if ((hdr->e_flags & 0xFFFF) != EF_UBICOM32_V4) {
-		printk(KERN_WARNING "Module %s was not compiled for "
-		       "ubicom32v4, elf_flags:%x,\n",
-		       mod->name, hdr->e_flags);
-		return -ENOEXEC;
-	}
-#elif defined CONFIG_UBICOM32_V3
-	if ((hdr->e_flags & 0xFFFF) != EF_UBICOM32_V3) {
-		printk(KERN_WARNING "Module %s was not compiled for "
-		       "ubicom32v3, elf_flags:%x\n",
-		       mod->name, hdr->e_flags);
-		return -ENOEXEC;
-	}
-#else
-#error Unknown/Unsupported ubicom32 architecture.
-#endif
-
-	/*
-	 * XXX: sechdrs are vmalloced in kernel/module.c
-	 * and would be vfreed just after module is loaded,
-	 * so we hack to keep the only information we needed
-	 * in mod->arch to correctly free L1 I/D sram later.
-	 * NOTE: this breaks the semantic of mod->arch structure.
-	 */
-	sechdrs_end = sechdrs + hdr->e_shnum;
-	for (s = sechdrs; s < sechdrs_end; ++s) {
-		if (strncmp(".ocm_text", secstrings + s->sh_name, 9) == 0)
-			ocm_inst_size += s->sh_size;
-	}
-
-	if (!ocm_inst_size)
-		return 0;
-
-	ocm_inst = ocm_inst_alloc(ocm_inst_size, 0 /* internal */);
-	if (ocm_inst == NULL) {
-#ifdef CONFIG_OCM_MODULES_FALLBACK_TO_DDR
-		printk(KERN_WARNING
-		       "module %s: OCM instruction memory allocation of %d"
-		       "failed, fallback to DDR\n", mod->name, ocm_inst_size);
-		return 0;
-#else
-		printk(KERN_ERR
-		       "module %s: OCM instruction memory allocation of %d"
-		       "failed.\n", mod->name, ocm_inst_size);
-		return -ENOMEM;
-#endif
-	}
-
-	mod->arch.ocm_inst = ocm_inst;
-	mod->arch.ocm_inst_size = ocm_inst_size;
-
-	printk(KERN_INFO
-	       "module %s: OCM instruction memory allocation of %d @%p\n",
-	       mod->name, mod->arch.ocm_inst_size, mod->arch.ocm_inst);
-
-	for (s = sechdrs; s < sechdrs_end; ++s) {
-		if (strncmp(".ocm_text", secstrings + s->sh_name, 9) == 0) {
-			memcpy(ocm_inst, (void *)s->sh_addr, s->sh_size);
-			s->sh_flags &= ~SHF_ALLOC;
-			s->sh_addr = (unsigned long)ocm_inst;
-			ocm_inst += s->sh_size;
-		}
-	}
-
-	return 0;
-}
-
-int apply_relocate(Elf32_Shdr *sechdrs,
-		   const char *strtab,
-		   unsigned int symindex,
-		   unsigned int relsec,
-		   struct module *me)
-{
-	DEBUGP("Invalid Applying relocate section %u to %u\n", relsec,
-	       sechdrs[relsec].sh_info);
-	return -EINVAL;
-}
-
-int apply_relocate_add(Elf32_Shdr *sechdrs,
-		       const char *strtab,
-		       unsigned int symindex,
-		       unsigned int relsec,
-		       struct module *me)
-{
-	unsigned int i;
-	Elf32_Rela *rel = (void *)sechdrs[relsec].sh_addr;
-	Elf32_Sym *sym;
-	uint32_t *location;
-	uint32_t insn;
-
-	DEBUGP("Applying relocate_add section %u to %u\n", relsec,
-	       sechdrs[relsec].sh_info);
-	for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
-		uint32_t v;
-		const int elf32_rtype = ELF32_R_TYPE(rel[i].r_info);
-
-		/* This is where to make the change */
-		location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
-			+ rel[i].r_offset;
-		/* This is the symbol it is referring to.  Note that all
-		   undefined symbols have been resolved.  */
-		sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
-			+ ELF32_R_SYM(rel[i].r_info);
-
-		v = rel[i].r_addend + sym->st_value;
-
-
-		switch (elf32_rtype) {
-		case R_UBICOM32_32:
-		{
-			/*
-			 * Store the 32 bit relocation as is.
-			 */
-			*location = v;
-			break;
-		}
-		case R_UBICOM32_HI24:
-		{
-			/*
-			 * 24 bit relocation that is part of the MOVEAI
-			 * instruction. The 24 bits come from bits 7 - 30 of the
-			 * relocation. Theses bits eventually get split into 2
-			 * fields in the instruction encoding.
-			 *
-			 * - Bits 7 - 27 of the relocation are encoded into bits
-			 * 0 - 20 of the instruction.
-			 *
-			 *  - Bits 28 - 30 of the relocation are encoded into
-			 *  bit 24 - 26 of the instruction.
-			 */
-			uint32_t valid24 = (v >> 7) & 0xffffff;
-			insn = *location;
-
-			insn &= ~(0x1fffff | (0x7 << 24));
-			insn |= (valid24 & 0x1fffff);
-			insn |= ((valid24 & 0xe00000) << 3);
-			*location = insn;
-		}
-		break;
-		case R_UBICOM32_LO7_S:
-		case R_UBICOM32_LO7_2_S:
-		case R_UBICOM32_LO7_4_S:
-		{
-			/*
-			 * Bits 0 - 6 of the relocation are encoded into the
-			 * 7bit unsigned immediate fields of the SOURCE-1 field
-			 * of the instruction.  The immediate value is left
-			 * shifted by (0, 1, 2) based on the operand size.
-			 */
-			uint32_t valid7 = v & 0x7f;
-			insn = *location;
-
-			if (elf32_rtype == R_UBICOM32_LO7_2_S) {
-				valid7 >>= 1;
-			} else if (elf32_rtype == R_UBICOM32_LO7_4_S) {
-				valid7 >>= 2;
-			}
-
-			insn &= ~(0x1f | (0x3 << 8));
-			insn |= (valid7 & 0x1f);
-			insn |= ((valid7 & 0x60) << 3);
-			*location = insn;
-		}
-		break;
-		case R_UBICOM32_LO7_D:
-		case R_UBICOM32_LO7_2_D:
-		case R_UBICOM32_LO7_4_D:
-		{
-			/*
-			 * Bits 0 - 6 of the relocation are encoded into the
-			 * 7bit unsigned immediate fields of the DESTINATION
-			 * field of the instruction.  The immediate value is
-			 * left shifted by (0, 1, 2) based on the operand size.
-			 */
-			uint32_t valid7 = v & 0x7f;
-			insn = *location;
-
-			if (elf32_rtype == R_UBICOM32_LO7_2_D) {
-				valid7 >>= 1;
-			} else if (elf32_rtype == R_UBICOM32_LO7_4_D) {
-				valid7 >>= 2;
-			}
-
-			insn &= ~((0x1f | (0x3 << 8)) << 16);
-			insn |= ((valid7 & 0x1f) << 16);
-			insn |= ((valid7 & 0x60) << 19);
-			*location = insn;
-		}
-		break;
-		case R_UBICOM32_LO7_CALLI:
-		case R_UBICOM32_LO16_CALLI:
-		{
-			/*
-			 * Extract the offset for a CALLI instruction. The
-			 * offsets can be either 7 bits or 18 bits. Since all
-			 * instructions in ubicom32 architecture are at work
-			 * aligned addresses the truncated offset is right
-			 * shifted by 2 before being encoded in the instruction.
-			 */
-			uint32_t val;
-			if (elf32_rtype == R_UBICOM32_LO7_CALLI) {
-				val  = v & 0x7f;
-			} else {
-				val  = v & 0x3ffff;
-			}
-
-			val >>= 2;
-
-			insn = *location;
-
-			insn &= ~0x071f071f;
-			insn |= (val & 0x1f) << 0;
-			val >>= 5;
-			insn |= (val & 0x07) << 8;
-			val >>= 3;
-			insn |= (val & 0x1f) << 16;
-			val >>= 5;
-			insn |= (val & 0x07) << 24;
-			*location = insn;
-		}
-		break;
-		case R_UBICOM32_24_PCREL:
-		{
-			/*
-			 * Extract 26 bit signed PC relative offset for CALL
-			 * instructions. Since instruction addresses are word
-			 * aligned the offset is right shited by 2 before
-			 * encoding into instruction.
-			 */
-			int32_t val = v - (int32_t)location;
-
-			/*
-			 * Check that the top 7 bits are all equal to the sign
-			 * bit (26), i.e all 0's or all 1's.  If they are not then
-			 * the absolute difference is greater than 25 bits.
-			 */
-			if (((uint32_t)val & 0xFE000000) != 0xFE000000 &&
-				((uint32_t)val & 0xFE000000) != 0x0) {
-				/*
-				 * The relocation is beyond our addressable
-				 * range with a 26 bit call.
-				 */
-				printk(KERN_ERR "module %s: PC Relative "
-					"relocation out of range: "
-					"%u (%x->%x, %x)\n",
-					me->name, elf32_rtype,
-					v, (uint32_t) location, val);
-				return -ENOEXEC;
-			}
-
-			val = (val & 0x3ffffff) >> 2;
-			insn = *location;
-			insn = insn & 0xf8e00000;
-
-			insn |= (val >> 21) << 24;
-			insn |= (val & 0x1fffff);
-			*location = insn;
-		}
-		break;
-		case R_UBICOM32_LO16:
-		case R_UBICOM32_HI16:
-		{
-			/*
-			 * 16 bit immediate value that is encoded into bit 0 -
-			 * 15 of the instruction.
-			 */
-			uint32_t val;
-
-			if (elf32_rtype == R_UBICOM32_LO16) {
-				val  = v & 0xffff;
-			} else {
-				val  = (v >> 16) & 0xffff;
-			}
-
-			insn = *location;
-			insn &= 0xffff0000;
-
-			insn |= val;
-			*location = insn;
-		}
-		break;
-		case R_UBICOM32_21_PCREL:
-		{
-			/*
-			 * Extract 23 bit signed PC relative offset for JMP<cc>
-			 * instructions. Since instruction addresses are word
-			 * aligned the offset is right shited by 2 before
-			 * encoding into instruction.
-			 */
-			int32_t val = v - (int32_t)location;
-
-			val = (val & 0x7fffff) >> 2;
-			insn = *location;
-			insn = insn & 0xffe00000;
-
-			insn |= (val >> 21) << 24;
-			insn |= val;
-			*location = insn;
-		}
-		break;
-		default:
-			BUG();
-			printk(KERN_ERR "module %s: Unknown relocation: %u\n",
-			       me->name, elf32_rtype);
-			return -ENOEXEC;
-		}
-	}
-	return 0;
-}
-
-int module_finalize(const Elf_Ehdr *hdr,
-		    const Elf_Shdr *sechdrs,
-		    struct module *mod)
-{
-	unsigned int i, strindex = 0, symindex = 0;
-	char *secstrings;
-	int err;
-
-	err = module_bug_finalize(hdr, sechdrs, mod);
-	if (err)
-		return err;
-
-	if (!mod->arch.ocm_inst) {
-		/*
-		 * No OCM code, so nothing more to do.
-		 */
-		return 0;
-	}
-
-	secstrings = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset;
-
-	for (i = 1; i < hdr->e_shnum; i++) {
-		/* Internal symbols and strings. */
-		if (sechdrs[i].sh_type == SHT_SYMTAB) {
-			symindex = i;
-			strindex = sechdrs[i].sh_link;
-		}
-	}
-
-	for (i = 1; i < hdr->e_shnum; i++) {
-		const char *strtab = (char *)sechdrs[strindex].sh_addr;
-		unsigned int info = sechdrs[i].sh_info;
-
-		/* Not a valid relocation section? */
-		if (info >= hdr->e_shnum)
-			continue;
-
-		if ((sechdrs[i].sh_type == SHT_RELA) &&
-		    (strncmp(".rela.ocm_text",
-			     secstrings + sechdrs[i].sh_name, 5 + 9) == 0)) {
-			err = apply_relocate_add((Elf_Shdr *) sechdrs, strtab,
-						 symindex, i, mod);
-			if (err)
-				return err;
-		}
-	}
-
-	return 0;
-}
-
-void module_arch_cleanup(struct module *mod)
-{
-	module_bug_cleanup(mod);
-}
diff --git a/target/linux/ubicom32/files/arch/ubicom32/kernel/os_node.c b/target/linux/ubicom32/files/arch/ubicom32/kernel/os_node.c
deleted file mode 100644
index 9e014d5cb..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/kernel/os_node.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * arch/ubicom32/kernel/os_node.c
- *   <TODO: Replace with short file description>
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- */
-#include "linux/types.h"
-#include "linux/linkage.h"
-#include "linux/uts.h"
-#include "linux/utsrelease.h"
-#include "linux/version.h"
-#include <asm/ocm_size.h>
-#include <asm/devtree.h>
-#include <asm/ip5000.h>
-
-extern asmlinkage void *_start;
-
-/*
- * This file provides static information to the boot code allowing it to decide
- * if the os is compatible. Thus hopefully enabling the boot code to prevent
- * accidentally booting a kernel that has no hope of running.
- */
-struct os_node {
-	struct devtree_node node;
-	unsigned long version; /* Always 1 */
-	unsigned long entry_point;
-	const char    os_name[32]; /* For diagnostic purposes only */
-	const char    os_version_str[32];
-	unsigned long os_version_num;
-	unsigned long expected_ocm_code_start;/* OS Code */
-	unsigned long expected_ocm_data_end;  /* OS Data */
-	unsigned long expected_ram_start;
-	unsigned long expected_ram_end;
-	unsigned long arch_version;
-	unsigned long expected_os_syscall_begin;
-	unsigned long expected_os_syscall_end;
-};
-
-
-extern void __os_syscall_begin;
-extern void __os_syscall_end;
-/*
- * The os_node is only referenced by head.S and should never be modified at
- * run-time.
- */
-asmlinkage const struct os_node _os_node = {
-	.node = {
-		.next = NULL,
-		.name = { "OS" },
-		.magic = 0x10203040,
-	},
-	.version = 0x10002,
-	.entry_point = (unsigned long)&_start,
-#if APP_OCM_CODE_SIZE || APP_OCM_DATA_SIZE
-	.expected_ocm_code_start = OCMSTART + APP_OCM_CODE_SIZE,
-	.expected_ocm_data_end   = OCMEND   - APP_OCM_DATA_SIZE,
-#else
-	.expected_ocm_code_start = OCMEND,
-	.expected_ocm_data_end   = OCMEND,
-#endif
-	.os_name = { UTS_SYSNAME },
-	.os_version_str = { UTS_RELEASE },
-	.os_version_num = LINUX_VERSION_CODE,
-	.expected_ram_start = KERNELSTART,
-	.expected_ram_end = SDRAMSTART + CONFIG_MIN_RAMSIZE,
-	.arch_version = UBICOM32_ARCH_VERSION,
-	.expected_os_syscall_begin = (unsigned long)&__os_syscall_begin,
-	.expected_os_syscall_end = (unsigned long)&__os_syscall_end,
-
-
-};
diff --git a/target/linux/ubicom32/files/arch/ubicom32/kernel/process.c b/target/linux/ubicom32/files/arch/ubicom32/kernel/process.c
deleted file mode 100644
index 23872fed0..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/kernel/process.c
+++ /dev/null
@@ -1,634 +0,0 @@
-/*
- * arch/ubicom32/kernel/process.c
- *   Ubicom32 architecture-dependent process handling.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- * Copyright (C) 1995  Hamish Macdonald
- *
- * 68060 fixes by Jesper Skov
- *
- * uClinux changes
- * Copyright (C) 2000-2002, David McCullough <davidm@snapgear.com>
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-/*
- * This file handles the architecture-dependent parts of process handling..
- */
-
-#include <linux/module.h>
-#include <linux/errno.h>
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/smp.h>
-#include <linux/smp_lock.h>
-#include <linux/stddef.h>
-#include <linux/unistd.h>
-#include <linux/ptrace.h>
-#include <linux/slab.h>
-#include <linux/user.h>
-#include <linux/a.out.h>
-#include <linux/interrupt.h>
-#include <linux/reboot.h>
-#include <linux/fs.h>
-#include <linux/pm.h>
-
-#include <linux/uaccess.h>
-#include <asm/system.h>
-#include <asm/traps.h>
-#include <asm/machdep.h>
-#include <asm/setup.h>
-#include <asm/pgtable.h>
-#include <asm/ip5000.h>
-#include <asm/range-protect.h>
-
-#define DUMP_RANGE_REGISTER(REG, IDX) asm volatile ( \
-        "       move.4          %0, "REG"_RANGE"IDX"_EN \n\t" \
-        "       move.4          %1, "REG"_RANGE"IDX"_LO \n\t" \
-        "       move.4          %2, "REG"_RANGE"IDX"_HI \n\t" \
-                : "=d"(en), "=d"(lo), "=d"(hi) \
-        ); \
-        printk(KERN_NOTICE REG"Range"IDX": en:%08x, range: %08x-%08x\n", \
-                (unsigned int)en, \
-                (unsigned int)lo, \
-                (unsigned int)hi)
-
-asmlinkage void ret_from_fork(void);
-
-void (*pm_power_off)(void) = machine_power_off;
-EXPORT_SYMBOL(pm_power_off);
-
-/* machine-dependent / hardware-specific power functions */
-void (*mach_reset)(void);
-void (*mach_halt)(void);
-void (*mach_power_off)(void);
-
-/*
- * cpu_idle()
- *	The idle thread.
- *
- * Our idle loop suspends and is woken up by a timer interrupt.
- */
-void cpu_idle(void)
-{
-	while (1) {
-		local_irq_disable();
-		while (!need_resched()) {
-			local_irq_enable();
-			thread_suspend();
-			local_irq_disable();
-		}
-		local_irq_enable();
-		preempt_enable_no_resched();
-		schedule();
-		preempt_disable();
-	}
-}
-
-/*
- * dump_fpu()
- *
- *	Fill in the fpu structure for a core dump. (just a stub as we don't have
- *	an fpu)
- */
-int dump_fpu(struct pt_regs *regs, elf_fpregset_t * fpregs)
-{
-	return 1;
-}
-
-/*
- * machine_restart()
- *	Resets the system.
- */
-void machine_restart(char *__unused)
-{
-	/*
-	 * Disable all threads except myself. We can do this
-	 * directly without needing to call smp_send_stop
-	 * because we have a unique architecture where
-	 * one thread can disable one or more other threads.
-	 */
-	thread_disable_others();
-
-	/*
-	 * Call the hardware-specific machine reset function.
-	 */
-	if (mach_reset) {
-		mach_reset();
-	}
-
-	printk(KERN_EMERG "System Restarting\n");
-
-	/*
-	 * Set watchdog to trigger (after 1ms delay) (12 Mhz is the fixed OSC)
-	 */
-	UBICOM32_IO_TIMER->tkey = TIMER_TKEYVAL;
-	UBICOM32_IO_TIMER->wdcom = UBICOM32_IO_TIMER->mptval +
-		(12000000 / 1000);
-	UBICOM32_IO_TIMER->wdcfg = 0;
-	UBICOM32_IO_TIMER->tkey = 0;
-
-	/*
-	 * Wait for watchdog
-	 */
-	asm volatile (
-		"	move.4		MT_EN, #0		\n\t"
-		"	pipe_flush	0			\n\t"
-	);
-
-	local_irq_disable();
-	for (;;) {
-		thread_suspend();
-	}
-}
-
-/*
- * machine_halt()
- *	Halt the machine.
- *
- * Similar to machine_power_off, but don't shut off power.  Add code
- * here to freeze the system for e.g. post-mortem debug purpose when
- * possible.  This halt has nothing to do with the idle halt.
- */
-void machine_halt(void)
-{
-	/*
-	 * Disable all threads except myself. We can do this
-	 * directly without needing to call smp_send_stop
-	 * because we have a unique architecture where
-	 * one thread can disable one or more other threads.
-	 */
-	thread_disable_others();
-
-	/*
-	 * Call the hardware-specific machine halt function.
-	 */
-	if (mach_halt) {
-		mach_halt();
-	}
-
-	printk(KERN_EMERG "System Halted, OK to turn off power\n");
-	local_irq_disable();
-	for (;;) {
-		thread_suspend();
-	}
-}
-
-/*
- * machine_power_off()
- *	Turn the power off, if a power off handler is defined, otherwise, spin
- *	endlessly.
- */
-void machine_power_off(void)
-{
-	/*
-	 * Disable all threads except myself. We can do this
-	 * directly without needing to call smp_send_stop
-	 * because we have a unique architecture where
-	 * one thread can disable one or more other threads.
-	 */
-	thread_disable_others();
-
-	/*
-	 * Call the hardware-specific machine power off function.
-	 */
-	if (mach_power_off) {
-		mach_power_off();
-	}
-
-	printk(KERN_EMERG "System Halted, OK to turn off power\n");
-	local_irq_disable();
-	for (;;) {
-		thread_suspend();
-	}
-}
-
-/*
- * address_is_valid()
- * 	check if an address is valid -- (for read access)
- */
-static bool address_is_valid(const void *address)
-{
-	int addr = (int)address;
-	unsigned long socm, eocm, sdram, edram;
-
-	if (addr & 3)
-		return false;
-
-	processor_ocm(&socm, &eocm);
-	processor_dram(&sdram, &edram);
-	if (addr >= socm && addr < eocm)
-		return true;
-
-	if (addr >= sdram && addr < edram)
-		return true;
-
-	return false;
-}
-
-/*
- * vma_path_name_is_valid()
- * 	check if path_name of a vma is a valid string
- */
-static bool vma_path_name_is_valid(const char *str)
-{
-#define MAX_NAME_LEN 256
-	int i = 0;
-	if (!address_is_valid(str))
-		return false;
-
-	for (; i < MAX_NAME_LEN; i++, str++) {
-		if (*str == '\0')
-			return true;
-	}
-
-	return false;
-}
-
-/*
- * show_vmas()
- * 	show vma info of a process
- */
-void show_vmas(struct task_struct *task)
-{
-#ifdef CONFIG_DEBUG_VERBOSE
-#define UBICOM32_MAX_VMA_COUNT 1024
-
-	struct vm_area_struct *vma;
-	struct file *file;
-	char *name = "";
-	int flags, loop = 0;
-
-	printk(KERN_NOTICE "Start of vma list\n");
-
-	if (!address_is_valid(task) || !address_is_valid(task->mm))
-		goto error;
-
-	vma = task->mm->mmap;
-	while (vma) {
-		if (!address_is_valid(vma))
-			goto error;
-
-		flags = vma->vm_flags;
-		file = vma->vm_file;
-
-		if (file) {
-			/* seems better to use dentry op here, but sanity check is easier this way */
-			if (!address_is_valid(file) || !address_is_valid(file->f_path.dentry) || !vma_path_name_is_valid(file->f_path.dentry->d_name.name))
-				goto error;
-
-			name = (char *)file->f_path.dentry->d_name.name;
-		}
-
-		/* Similar to /proc/pid/maps format */
-		printk(KERN_NOTICE "%08lx-%08lx %c%c%c%c %08lx %s\n",
-			vma->vm_start,
-			vma->vm_end,
-			flags & VM_READ ? 'r' : '-',
-			flags & VM_WRITE ? 'w' : '-',
-			flags & VM_EXEC ? 'x' : '-',
-			flags & VM_MAYSHARE ? flags & VM_SHARED ? 'S' : 's' : 'p',
-			vma->vm_pgoff << PAGE_SHIFT,
-			name);
-
-		vma = vma->vm_next;
-
-		if (loop++ > UBICOM32_MAX_VMA_COUNT)
-			goto error;
-	}
-
-	printk(KERN_NOTICE "End of vma list\n");
-	return;
-
-error:
-	printk(KERN_NOTICE "\nCorrupted vma list, abort!\n");
-#endif
-}
-
-/*
- * show_regs()
- *	Print out all of the registers.
- */
-void show_regs(struct pt_regs *regs)
-{
-	unsigned int i;
-	unsigned int en, lo, hi;
-
-	printk(KERN_NOTICE "regs: %p, tid: %d\n",
-		(void *)regs,
-		thread_get_self());
-
-	printk(KERN_NOTICE "pc: %08x, previous_pc: %08x\n\n",
-		(unsigned int)regs->pc,
-		(unsigned int)regs->previous_pc);
-
-	printk(KERN_NOTICE "Data registers\n");
-	for (i = 0; i < 16; i++) {
-		printk("D%02d: %08x, ", i, (unsigned int)regs->dn[i]);
-		if ((i % 4) == 3) {
-			printk("\n");
-		}
-	}
-	printk("\n");
-
-	printk(KERN_NOTICE "Address registers\n");
-	for (i = 0; i < 8; i++) {
-		printk("A%02d: %08x, ", i, (unsigned int)regs->an[i]);
-		if ((i % 4) == 3) {
-			printk("\n");
-		}
-	}
-	printk("\n");
-
-	printk(KERN_NOTICE "acc0: %08x-%08x, acc1: %08x-%08x\n",
-		(unsigned int)regs->acc0[1],
-		(unsigned int)regs->acc0[0],
-		(unsigned int)regs->acc1[1],
-		(unsigned int)regs->acc1[0]);
-
-	printk(KERN_NOTICE "mac_rc16: %08x, source3: %08x\n",
-		(unsigned int)regs->mac_rc16,
-		(unsigned int)regs->source3);
-
-	printk(KERN_NOTICE "inst_cnt: %08x, csr: %08x\n",
-		(unsigned int)regs->inst_cnt,
-		(unsigned int)regs->csr);
-
-	printk(KERN_NOTICE "int_mask0: %08x, int_mask1: %08x\n",
-		(unsigned int)regs->int_mask0,
-		(unsigned int)regs->int_mask1);
-
-	/*
-	 * Dump range registers
-	 */
-	DUMP_RANGE_REGISTER("I", "0");
-	DUMP_RANGE_REGISTER("I", "1");
-	DUMP_RANGE_REGISTER("I", "2");
-	DUMP_RANGE_REGISTER("I", "3");
-	DUMP_RANGE_REGISTER("D", "0");
-	DUMP_RANGE_REGISTER("D", "1");
-	DUMP_RANGE_REGISTER("D", "2");
-	DUMP_RANGE_REGISTER("D", "3");
-	DUMP_RANGE_REGISTER("D", "4");
-
-	printk(KERN_NOTICE "frame_type: %d, nesting_level: %d, thread_type %d\n\n",
-		(int)regs->frame_type,
-		(int)regs->nesting_level,
-		(int)regs->thread_type);
-}
-
-/*
- * kernel_thread_helper()
- *	On execution d0 will be 0, d1 will be the argument to be passed to the
- *	kernel function.  d2 contains the kernel function that needs to get
- *	called. d3 will contain address to do_exit which need to get moved
- *	into a5. On return from fork the child thread d0 will be 0. We call
- *	this dummy function which in turn loads the argument
- */
-asmlinkage void kernel_thread_helper(void);
-
-/*
- * kernel_thread()
- *	Create a kernel thread
- */
-int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags)
-{
-	struct pt_regs regs;
-
-	memset(&regs, 0, sizeof(regs));
-
-	regs.dn[1] = (unsigned long)arg;
-	regs.dn[2] = (unsigned long)fn;
-	regs.dn[3] = (unsigned long)do_exit;
-	regs.an[5] = (unsigned long)kernel_thread_helper;
-	regs.pc = (unsigned long)kernel_thread_helper;
-	regs.nesting_level = 0;
-	regs.thread_type = KERNEL_THREAD;
-
-	return do_fork(flags | CLONE_VM | CLONE_UNTRACED,
-		       0, &regs, 0, NULL, NULL);
-}
-EXPORT_SYMBOL(kernel_thread);
-
-/*
- * flush_thread()
- *	XXX todo
- */
-void flush_thread(void)
-{
-	/* XXX todo */
-}
-
-/*
- * sys_fork()
- *	Not implemented on no-mmu.
- */
-asmlinkage int sys_fork(struct pt_regs *regs)
-{
-	/* fork almost works, enough to trick you into looking elsewhere :-( */
-	return -EINVAL;
-}
-
-/*
- * sys_vfork()
- *	By the time we get here, the non-volatile registers have also been saved
- *	on the stack. We do some ugly pointer stuff here.. (see also copy_thread
- *	which does context copy).
- */
-asmlinkage int sys_vfork(struct pt_regs *regs)
-{
-	unsigned long old_sp = regs->an[7];
-	unsigned long old_a5 = regs->an[5];
-	unsigned long old_return_address;
-	long do_fork_return;
-
-	/*
-	 * Read the old retrun address from the stack.
-	 */
-	if (copy_from_user(&old_return_address,
-			   (void *)old_sp, sizeof(unsigned long))) {
-		force_sig(SIGSEGV, current);
-		return 0;
-	}
-
-	/*
-	 * Pop the vfork call frame by setting a5 and pc to the old_return
-	 * address and incrementing the stack pointer by 4.
-	 */
-	regs->an[5] = old_return_address;
-	regs->pc = old_return_address;
-	regs->an[7] += 4;
-
-	do_fork_return = do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD,
-				 regs->an[7], regs, 0, NULL, NULL);
-
-	/*
-	 * Now we have to test if the return code is an error. If it is an error
-	 * then restore the frame and we will execute error processing in user
-	 * space. Other wise the child and the parent will return to the correct
-	 * places.
-	 */
-	if ((unsigned long)(do_fork_return) >= (unsigned long)(-125)) {
-		/*
-		 * Error case. We need to restore the frame.
-		 */
-		regs->an[5] = old_a5;
-		regs->pc = old_a5;
-		regs->an[7] = old_sp;
-	}
-
-	return do_fork_return;
-}
-
-/*
- * sys_clone()
- *	creates a child thread.
- */
-asmlinkage int sys_clone(unsigned long clone_flags,
-			 unsigned long newsp,
-			 struct pt_regs *regs)
-{
-	if (!newsp)
-		newsp = regs->an[7];
-	return do_fork(clone_flags, newsp, regs, 0,
-		       NULL, NULL);
-}
-
-/*
- * copy_thread()
- *	low level thread copy, only used by do_fork in kernel/fork.c
- */
-int copy_thread(unsigned long clone_flags,
-		unsigned long usp, unsigned long topstk,
-		struct task_struct *p, struct pt_regs *regs)
-
-{
-	struct pt_regs *childregs;
-
-	childregs = (struct pt_regs *)
-		(task_stack_page(p) + THREAD_SIZE - 8) - 1;
-
-	*childregs = *regs;
-
-	/*
-	 * Set return value for child to be 0.
-	 */
-	childregs->dn[0] = 0;
-
-	if (usp)
-		childregs->an[7] = usp;
-	else
-		childregs->an[7] = (unsigned long)task_stack_page(p) +
-			THREAD_SIZE - 8;
-
-	/*
-	 * Set up the switch_to frame to return to "ret_from_fork"
-	 */
-	p->thread.a5 = (unsigned long)ret_from_fork;
-	p->thread.sp = (unsigned long)childregs;
-
-	return 0;
-}
-
-/*
- * sys_execve()
- *	executes a new program.
- */
-asmlinkage int sys_execve(char *name, char **argv,
-			  char **envp, struct pt_regs *regs)
-{
-	int error;
-	char *filename;
-
-	lock_kernel();
-	filename = getname(name);
-	error = PTR_ERR(filename);
-	if (IS_ERR(filename))
-		goto out;
-	error = do_execve(filename, argv, envp, regs);
-	putname(filename);
-	asm ("       .global sys_execve_complete\n"
-	     "       sys_execve_complete:");
-out:
-	unlock_kernel();
-	return error;
-}
-
-/*
- * Return saved PC of a blocked thread.
- */
-unsigned long thread_saved_pc(struct task_struct *tsk)
-{
-	return tsk->thread.a5;
-}
-
-
-unsigned long get_wchan(struct task_struct *p)
-{
-	unsigned long pc;
-
-	/*
-	 * If we don't have a process, or it is not the current
-	 * one or not RUNNING, it makes no sense to ask for a
-	 * wchan.
-	 */
-	if (!p || p == current || p->state == TASK_RUNNING)
-		return 0;
-
-	/*
-	 * TODO: If the process is in the middle of schedule, we
-	 * are supposed to do something different but for now we
-	 * will return the same thing in both situations.
-	 */
-	pc = thread_saved_pc(p);
-	if (in_sched_functions(pc))
-		return pc;
-	return pc;
-}
-
-
-/*
- * Infrequently used interface to dump task registers to core files.
- */
-int dump_task_regs(struct task_struct *task, elf_gregset_t *elfregs)
-{
-	struct pt_regs *regs = task_pt_regs(task);
-	*(struct pt_regs *)elfregs = *regs;
-
-	return 1;
-}
-
-/*
- * __switch_to is the function that implements the contex save and
- * switch within the kernel. Since this is a function call very few
- * registers have to be saved to pull this off. d0 holds prev and we
- * want to preserve it. prev_switch is a pointer to task->thread
- * structure. This is where we will save the register state. next_switch
- * is pointer to the next task's thread structure that holds the
- * registers.
- */
-asmlinkage void *__switch_to(struct task_struct *prev,
-			     struct thread_struct *prev_switch,
-			     struct thread_struct *next_switch)
-	__attribute__((naked));
diff --git a/target/linux/ubicom32/files/arch/ubicom32/kernel/processor.c b/target/linux/ubicom32/files/arch/ubicom32/kernel/processor.c
deleted file mode 100644
index 55d1bdf62..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/kernel/processor.c
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
- * arch/ubicom32/kernel/processor.c
- *   Ubicom32 architecture processor info implementation.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/sched.h>
-#include <linux/interrupt.h>
-#include <linux/irq.h>
-#include <linux/profile.h>
-#include <linux/clocksource.h>
-#include <linux/types.h>
-#include <linux/seq_file.h>
-#include <linux/delay.h>
-#include <linux/cpu.h>
-#include <asm/devtree.h>
-#include <asm/processor.h>
-#include <asm/cpu.h>
-#include <asm/ocm_size.h>
-
-struct procnode {
-	struct devtree_node dn;
-	unsigned int threads;
-	unsigned int timers;
-	unsigned int frequency;
-	unsigned int ddr_frequency;
-	unsigned int interrupt0;
-	unsigned int interrupt1;
-	void *socm;
-	void *eocm;
-	void *sdram;
-	void *edram;
-	unsigned int arch_version;
-	void *os_syscall_begin;
-	void *os_syscall_end;
-};
-
-struct procnode *pn;
-
-/*
- * show_processorinfo()
- *	Print the actual processor information.
- */
-static void show_processorinfo(struct seq_file *m)
-{
-	char *cpu, *mmu, *fpu;
-	unsigned int clockfreq;
-	unsigned int chipid;
-
-	cpu = CPU;
-	mmu = "none";
-	fpu = "none";
-
-	asm volatile (
-	"move.4		%0, CHIP_ID	\n\t"
-	: "=r" (chipid)
-	);
-
-	/*
-	 * General Processor Information.
-	 */
-	seq_printf(m, "Vendor:\t\t%s\n", "Ubicom");
-	seq_printf(m, "CPU:\t\t%s\n", cpu);
-	seq_printf(m, "MMU:\t\t%s\n", mmu);
-	seq_printf(m, "FPU:\t\t%s\n", fpu);
-	seq_printf(m, "Arch:\t\t%hx\n", chipid >> 16);
-	seq_printf(m, "Rev:\t\t%hx\n", (chipid & 0xffff));
-
-	/*
-	 * Now compute the clock frequency in Mhz.
-	 */
-	clockfreq = processor_frequency();
-	seq_printf(m, "Clock Freq:\t%u.0 MHz\n",
-		   clockfreq / 1000000);
-	seq_printf(m, "DDR Freq:\t%u.0 MHz\n",
-		   pn ? pn->ddr_frequency / 1000000 : 0);
-	seq_printf(m, "BogoMips:\t%lu.%02lu\n",
-		   (loops_per_jiffy * HZ) / 500000,
-		   ((loops_per_jiffy * HZ) / 5000) % 100);
-	seq_printf(m, "Calibration:\t%lu loops\n", (loops_per_jiffy * HZ));
-}
-
-/*
- * show_cpuinfo()
- *	Get CPU information for use by the procfs.
- */
-static int show_cpuinfo(struct seq_file *m, void *v)
-{
-	unsigned long n = (unsigned long)v - 1;
-
-#if defined(CONFIG_SMP)
-	struct cpuinfo_ubicom32 *p = &per_cpu(cpu_data, n);
-#endif
-
-	/*
-	 * Print the general processor information on the first
-	 * call.
-	 */
-	if (n == 0) {
-		show_processorinfo(m);
-	}
-
-#if defined(CONFIG_SMP)
-	/*
-	 * For each hwthread, print if this hwthread is running Linux
-	 * or is an I/O thread.
-	 */
-	if (cpu_isset(n, cpu_online_map)) {
-		seq_printf(m, "cpu[%02lu]:\tthread id - %lu\n", n, p->tid);
-	} else {
-		seq_printf(m, "cpu[%02lu]:\toff-line\n", n);
-	}
-#endif
-	return 0;
-
-}
-
-static void *c_start(struct seq_file *m, loff_t *pos)
-{
-	unsigned long i = *pos;
-
-	return i < NR_CPUS ? (void *)(i + 1) : NULL;
-}
-
-static void *c_next(struct seq_file *m, void *v, loff_t *pos)
-{
-	++*pos;
-	return c_start(m, pos);
-}
-
-static void c_stop(struct seq_file *m, void *v)
-{
-}
-
-const struct seq_operations cpuinfo_op = {
-	.start	= c_start,
-	.next	= c_next,
-	.stop	= c_stop,
-	.show	= show_cpuinfo,
-};
-
-/*
- * processor_timers()
- *	Returns the timers available to Linux.
- */
-unsigned int processor_timers(void)
-{
-	if (!pn) {
-		return 0;
-	}
-	return pn->timers;
-}
-
-/*
- * processor_threads()
- *	Returns the threads available to Linux.
- */
-unsigned int processor_threads(void)
-{
-	if (!pn) {
-		return 0;
-	}
-	return pn->threads;
-}
-
-/*
- * processor_frequency()
- *	Returns the frequency of the system clock.
- */
-unsigned int processor_frequency(void)
-{
-	if (!pn) {
-		return 0;
-	}
-	return pn->frequency;
-}
-EXPORT_SYMBOL(processor_frequency);
-
-/*
- * processor_interrupts()
- *	Return the interrupts that are setup at boot time.
- */
-int processor_interrupts(unsigned int *int0, unsigned int *int1)
-{
-	if (!pn) {
-		return -EFAULT;
-	}
-
-	if (int0) {
-		*int0 = pn->interrupt0;
-	}
-
-	if (int1) {
-		*int1 = pn->interrupt1;
-	}
-	return 0;
-}
-
-/*
- * processor_ocm()
- *	Returns the start and end of OCM available to Linux.
- */
-void processor_ocm(unsigned long *socm, unsigned long *eocm)
-{
-	*socm = (unsigned long)pn->socm;
-	*eocm = (unsigned long)pn->eocm;
-}
-
-/*
- * processor_dram()
- *	Returns the start and end of dram available to Linux.
- */
-void processor_dram(unsigned long *sdram, unsigned long *edram)
-{
-	*sdram = (unsigned long)pn->sdram;
-	*edram = (unsigned long)pn->edram;
-}
-
-/*
- * processor_validate_failed()
- *	Returns the dram available to Linux.
- */
-static noinline void processor_validate_failed(void)
-{
-	while (1)
-		THREAD_STALL;
-}
-
-/*
- * processor_validate()
- *	Validates the procnode against limitations of this link/built.
- */
-static void processor_validate(void)
-{
-	void *dram_start = (void *)(KERNELSTART);
-	void *dram_end   = (void *)(SDRAMSTART + CONFIG_MIN_RAMSIZE);
-#if APP_OCM_CODE_SIZE || APP_OCM_DATA_SIZE
-	void *ocm_code_start = (void *)(OCMSTART + APP_OCM_CODE_SIZE);
-	void *ocm_data_end   = (void *)(OCMEND   - APP_OCM_DATA_SIZE);
-#endif
-	extern void __os_syscall_begin;
-	extern void __os_syscall_end;
-	int proc_node_valid = 1;
-
-	if (!pn) {
-		printk(KERN_ERR "ERROR: processor node not found\n");
-		goto error;
-	}
-
-
-	if (dram_start < pn->sdram || dram_end > pn->edram) {
-		printk(KERN_ERR "ERROR: processor dram mismatch %p-%p "
-		       "available but we are expecting %p-%p\n",
-		       pn->sdram, pn->edram, dram_start, dram_end);
-		proc_node_valid = 0;
-	} else {
-		printk(KERN_ERR "processor dram %p-%p, expecting %p-%p\n",
-		       pn->sdram, pn->edram, dram_start, dram_end);
-	}
-	if (&__os_syscall_begin < pn->os_syscall_begin ||
-	    &__os_syscall_end > pn->os_syscall_end) {
-		printk(KERN_ERR "ERROR: processor syscall area mismatch "
-		       "%p-%p available but we are expecting %p-%p\n",
-		       pn->os_syscall_begin, pn->os_syscall_end,
-		       &__os_syscall_begin, &__os_syscall_end);
-		proc_node_valid = 0;
-	} else {
-		printk(KERN_ERR "processor dram %p-%p, expecting %p-%p\n",
-		       pn->sdram, pn->edram, dram_start, dram_end);
-	}
-#if APP_OCM_CODE_SIZE || APP_OCM_DATA_SIZE
-	if (ocm_code_start < pn->socm ||  ocm_data_end > pn->eocm) {
-		printk(KERN_ERR "ERROR: processor ocm mismatch %p-%p "
-		       "available but we are expecting %p-%p\n",
-		       pn->socm, pn->eocm, ocm_code_start, ocm_data_end);
-		proc_node_valid = 0;
-	} else {
-		printk(KERN_INFO "processor ocm %p-%p, expecting %p-%p\n",
-		       pn->socm, pn->eocm, ocm_code_start, ocm_data_end);
-
-	}
-#endif
-
-	if (UBICOM32_ARCH_VERSION != pn->arch_version) {
-		printk(KERN_ERR "ERROR: processor arch mismatch, kernel"
-		       "compiled for %d found %d\n",
-		       UBICOM32_ARCH_VERSION, pn->arch_version);
-		proc_node_valid = 0;
-	}
-
-	if (proc_node_valid)
-		return;
-error:
-	processor_validate_failed();
-}
-
-void __init processor_init(void)
-{
-	/*
-	 * If we do not have a trap node in the device tree, we leave the fault
-	 * handling to the underlying hardware.
-	 */
-	pn = (struct procnode *)devtree_find_node("processor");
-
-	processor_validate();
-
-	/*
-	 * If necessary correct the initial range registers to cover the
-	 * complete physical space
-	 */
-	if (pn->edram > (void *)(SDRAMSTART + CONFIG_MIN_RAMSIZE)) {
-		printk(KERN_INFO "updating range registers for expanded dram\n");
-		asm volatile (
-			"	move.4 D_RANGE1_HI, %0		\t\n"
-			"	move.4 I_RANGE0_HI, %0		\t\n"
-#ifdef CONFIG_PROTECT_KERNEL
-			"	move.4 D_RANGE2_HI, %0		\t\n"
-			"	move.4 I_RANGE2_HI, %0		\t\n"
-#endif
-		: : "a"((unsigned long)pn->edram - 4)
-			);
-	}
-
-}
diff --git a/target/linux/ubicom32/files/arch/ubicom32/kernel/ptrace.c b/target/linux/ubicom32/files/arch/ubicom32/kernel/ptrace.c
deleted file mode 100644
index 18bb39e9d..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/kernel/ptrace.c
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * arch/ubicom32/kernel/ptrace.c
- *   Ubicom32 architecture ptrace implementation.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- * (C) 1994 by Hamish Macdonald
- * Taken from linux/kernel/ptrace.c and modified for M680x0.
- * linux/kernel/ptrace.c is by Ross Biro 1/23/92, edited by Linus Torvalds
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/smp.h>
-#include <linux/errno.h>
-#include <linux/ptrace.h>
-#include <linux/user.h>
-#include <linux/signal.h>
-#include <linux/uaccess.h>
-
-#include <asm/page.h>
-#include <asm/pgtable.h>
-#include <asm/system.h>
-#include <asm/cacheflush.h>
-#include <asm/processor.h>
-
-/*
- * ptrace_getregs()
- *
- *	Get all user integer registers.
- */
-static inline int ptrace_getregs(struct task_struct *task, void __user *uregs)
-{
-	struct pt_regs *regs = task_pt_regs(task);
-	return copy_to_user(uregs, regs, sizeof(struct pt_regs)) ? -EFAULT : 0;
-}
-
-/*
- * ptrace_get_reg()
- *
- *	Get contents of register REGNO in task TASK.
- */
-static unsigned long ptrace_get_reg(struct task_struct *task, int regno)
-{
-	if (regno < sizeof(struct pt_regs)) {
-		struct pt_regs *pt_regs = task_pt_regs(task);
-		return *(unsigned long *)((long) pt_regs + regno);
-	}
-
-	return -EIO;
-}
-
-/*
- * ptrace_put_reg()
- *	Write contents of register REGNO in task TASK.
- */
-static int ptrace_put_reg(struct task_struct *task, int regno,
-			  unsigned long data)
-{
-	if (regno <= sizeof(struct pt_regs) && regno != PT_FRAME_TYPE) {
-		struct pt_regs *pt_regs = task_pt_regs(task);
-		*(unsigned long *)((long) pt_regs + regno) = data;
-		return 0;
-	}
-	return -EIO;
-}
-
-/*
- * ptrace_disable_single_step()
- *	Disable Single Step
- */
-static int ptrace_disable_single_step(struct task_struct *task)
-{
-	/*
-	 * Single Step not yet implemented, so must always be disabled
-	 */
-	return 0;
-}
-
-/*
- * ptrace_disable()
- *	Make sure the single step bit is not set.
- * Called by kernel/ptrace.c when detaching..
- */
-void ptrace_disable(struct task_struct *child)
-{
-	ptrace_disable_single_step(child);
-}
-
-/*
- * arch_ptrace()
- *	architecture specific ptrace routine.
- */
-long arch_ptrace(struct task_struct *child, long request, long addr, long data)
-{
-	int ret;
-	switch (request) {
-	/* when I and D space are separate, these will need to be fixed. */
-	case PTRACE_PEEKTEXT: /* read word at location addr. */
-	case PTRACE_PEEKDATA:
-		ret = generic_ptrace_peekdata(child, addr, data);
-		break;
-
-	/* read the word at location addr in the USER area. */
-	case PTRACE_PEEKUSR: {
-		unsigned long tmp;
-
-		ret = -EIO;
-		if (((unsigned long) addr > PT_INTERP_FDPIC_LOADMAP)
-		    || (addr & 3))
-			break;
-
-		tmp = 0;  /* Default return condition */
-
-		ret = -EIO;
-		if (addr < sizeof(struct pt_regs)) {
-			tmp = ptrace_get_reg(child, addr);
-		} else if (addr == PT_TEXT_ADDR) {
-			tmp = child->mm->start_code;
-		} else if (addr == PT_TEXT_END_ADDR) {
-			tmp = child->mm->end_code;
-		} else if (addr == PT_DATA_ADDR) {
-			tmp = child->mm->start_data;
-		} else if (addr == PT_EXEC_FDPIC_LOADMAP) {
-#ifdef CONFIG_BINFMT_ELF_FDPIC
-			tmp = child->mm->context.exec_fdpic_loadmap;
-#endif
-		} else if (addr == PT_INTERP_FDPIC_LOADMAP) {
-#ifdef CONFIG_BINFMT_ELF_FDPIC
-			tmp = child->mm->context.interp_fdpic_loadmap;
-#endif
-		} else {
-			break;
-		}
-
-		ret = put_user(tmp, (unsigned long *)data);
-		break;
-	}
-
-	case PTRACE_POKETEXT: /* write the word at location addr. */
-	case PTRACE_POKEDATA:
-		ret = generic_ptrace_pokedata(child, addr, data);
-
-		/*
-		 * If we just changed some code so we need to
-		 * correct the caches
-		 */
-		if (request == PTRACE_POKETEXT && ret == 0) {
-			flush_icache_range(addr, addr + 4);
-		}
-		break;
-
-	case PTRACE_POKEUSR: /* write the word at location addr
-			      * in the USER area */
-		ret = -EIO;
-
-		if (((unsigned long) addr > PT_DATA_ADDR) || (addr & 3))
-			break;
-
-		if (addr < sizeof(struct pt_regs)) {
-			ret = ptrace_put_reg(child, addr, data);
-		}
-		break;
-
-	case PTRACE_SYSCALL: /* continue and stop at next (return from)
-			      * syscall */
-	case PTRACE_CONT: { /* restart after signal. */
-
-		ret = -EIO;
-		if (!valid_signal(data))
-			break;
-		if (request == PTRACE_SYSCALL)
-			set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
-		else
-			clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
-		child->exit_code = data;
-		/* make sure the single step bit is not set. */
-		ptrace_disable_single_step(child);
-		wake_up_process(child);
-		ret = 0;
-		break;
-	}
-
-	/*
-	 * make the child exit.  Best I can do is send it a sigkill.
-	 * perhaps it should be put in the status that it wants to exit.
-	 */
-	case PTRACE_KILL: {
-		ret = 0;
-		if (child->exit_state == EXIT_ZOMBIE) /* already dead */
-			break;
-		child->exit_code = SIGKILL;
-		/* make sure the single step bit is not set. */
-		ptrace_disable_single_step(child);
-		wake_up_process(child);
-		break;
-	}
-
-	case PTRACE_DETACH:	/* detach a process that was attached. */
-		ret = ptrace_detach(child, data);
-		break;
-
-	case PTRACE_GETREGS:    /* Get all gp regs from the child. */
-		ptrace_getregs(child, (unsigned long *)data);
-		ret = 0;
-		break;
-
-	case PTRACE_SETREGS: { /* Set all gp regs in the child. */
-		int i;
-		unsigned long tmp;
-		int count = sizeof(struct pt_regs) / sizeof(unsigned long);
-		for (i = 0; i < count; i++) {
-			if (get_user(tmp, (unsigned long *) data)) {
-				ret = -EFAULT;
-				break;
-			}
-			ptrace_put_reg(child, sizeof(unsigned long) * i, tmp);
-			data += sizeof(long);
-		}
-		ret = 0;
-		break;
-	}
-
-	default:
-		return ptrace_request(child, request, addr, data);
-		break;
-	}
-	return ret;
-}
-/*
- * syscall_trace
- *
- * called by syscall enter/exit when the TIF_SYSCALL_TRACE bit is set.
- */
-asmlinkage void syscall_trace(void)
-{
-	struct task_struct *cur = current;
-	if (!test_thread_flag(TIF_SYSCALL_TRACE))
-		return;
-	if (!(cur->ptrace & PT_PTRACED))
-		return;
-	ptrace_notify(SIGTRAP | ((cur->ptrace & PT_TRACESYSGOOD)
-				 ? 0x80 : 0));
-	/*
-	 * this isn't the same as continuing with a signal, but it will do
-	 * for normal use.  strace only continues with a signal if the
-	 * stopping signal is not SIGTRAP.  -brl
-	 */
-	if (cur->exit_code) {
-		send_sig(cur->exit_code, current, 1);
-		current->exit_code = 0;
-	}
-}
diff --git a/target/linux/ubicom32/files/arch/ubicom32/kernel/semaphore.c b/target/linux/ubicom32/files/arch/ubicom32/kernel/semaphore.c
deleted file mode 100644
index d996ac2b3..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/kernel/semaphore.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * arch/ubicom32/kernel/semaphore.c
- *   Ubicom32 architecture semaphore implementation.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-/*
- *  Generic semaphore code. Buyer beware. Do your own
- * specific changes in <asm/semaphore-helper.h>
- */
-
-#include <linux/sched.h>
-#include <linux/err.h>
-#include <linux/init.h>
-#include <asm/semaphore-helper.h>
-
-#ifndef CONFIG_RMW_INSNS
-spinlock_t semaphore_wake_lock;
-#endif
-
-/*
- * Semaphores are implemented using a two-way counter:
- * The "count" variable is decremented for each process
- * that tries to sleep, while the "waking" variable is
- * incremented when the "up()" code goes to wake up waiting
- * processes.
- *
- * Notably, the inline "up()" and "down()" functions can
- * efficiently test if they need to do any extra work (up
- * needs to do something only if count was negative before
- * the increment operation.
- *
- * waking_non_zero() (from asm/semaphore.h) must execute
- * atomically.
- *
- * When __up() is called, the count was negative before
- * incrementing it, and we need to wake up somebody.
- *
- * This routine adds one to the count of processes that need to
- * wake up and exit.  ALL waiting processes actually wake up but
- * only the one that gets to the "waking" field first will gate
- * through and acquire the semaphore.  The others will go back
- * to sleep.
- *
- * Note that these functions are only called when there is
- * contention on the lock, and as such all this is the
- * "non-critical" part of the whole semaphore business. The
- * critical part is the inline stuff in <asm/semaphore.h>
- * where we want to avoid any extra jumps and calls.
- */
-void __up(struct semaphore *sem)
-{
-	wake_one_more(sem);
-	wake_up(&sem->wait);
-}
-
-/*
- * Perform the "down" function.  Return zero for semaphore acquired,
- * return negative for signalled out of the function.
- *
- * If called from __down, the return is ignored and the wait loop is
- * not interruptible.  This means that a task waiting on a semaphore
- * using "down()" cannot be killed until someone does an "up()" on
- * the semaphore.
- *
- * If called from __down_interruptible, the return value gets checked
- * upon return.  If the return value is negative then the task continues
- * with the negative value in the return register (it can be tested by
- * the caller).
- *
- * Either form may be used in conjunction with "up()".
- *
- */
-
-
-#define DOWN_HEAD(task_state)						\
-									\
-									\
-	current->state = (task_state);					\
-	add_wait_queue(&sem->wait, &wait);				\
-									\
-	/*								\
-	 * Ok, we're set up.  sem->count is known to be less than zero	\
-	 * so we must wait.						\
-	 *								\
-	 * We can let go the lock for purposes of waiting.		\
-	 * We re-acquire it after awaking so as to protect		\
-	 * all semaphore operations.					\
-	 *								\
-	 * If "up()" is called before we call waking_non_zero() then	\
-	 * we will catch it right away.  If it is called later then	\
-	 * we will have to go through a wakeup cycle to catch it.	\
-	 *								\
-	 * Multiple waiters contend for the semaphore lock to see	\
-	 * who gets to gate through and who has to wait some more.	\
-	 */								\
-	for (;;) {
-
-#define DOWN_TAIL(task_state)			\
-		current->state = (task_state);	\
-	}					\
-	current->state = TASK_RUNNING;		\
-	remove_wait_queue(&sem->wait, &wait);
-
-void __sched __down(struct semaphore *sem)
-{
-	DECLARE_WAITQUEUE(wait, current);
-
-	DOWN_HEAD(TASK_UNINTERRUPTIBLE)
-	if (waking_non_zero(sem))
-		break;
-	schedule();
-	DOWN_TAIL(TASK_UNINTERRUPTIBLE)
-}
-
-int __sched __down_interruptible(struct semaphore *sem)
-{
-	DECLARE_WAITQUEUE(wait, current);
-	int ret = 0;
-
-	DOWN_HEAD(TASK_INTERRUPTIBLE)
-
-	ret = waking_non_zero_interruptible(sem, current);
-	if (ret) {
-		if (ret == 1)
-			/* ret != 0 only if we get interrupted -arca */
-			ret = 0;
-		break;
-	}
-	schedule();
-	DOWN_TAIL(TASK_INTERRUPTIBLE)
-	return ret;
-}
-
-int __down_trylock(struct semaphore *sem)
-{
-	return waking_non_zero_trylock(sem);
-}
diff --git a/target/linux/ubicom32/files/arch/ubicom32/kernel/setup.c b/target/linux/ubicom32/files/arch/ubicom32/kernel/setup.c
deleted file mode 100644
index 7357f4ee3..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/kernel/setup.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * arch/ubicom32/kernel/setup.c
- *   Ubicom32 architecture-dependent parts of system setup.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- * Copyright (C) 1999-2007  Greg Ungerer (gerg@snapgear.com)
- * Copyright (C) 1998,1999  D. Jeff Dionne <jeff@uClinux.org>
- * Copyleft  ()) 2000       James D. Schettine {james@telos-systems.com}
- * Copyright (C) 1998       Kenneth Albanowski <kjahds@kjahds.com>
- * Copyright (C) 1995       Hamish Macdonald
- * Copyright (C) 2000       Lineo Inc. (www.lineo.com)
- * Copyright (C) 2001	    Lineo, Inc. <www.lineo.com>
- * 68VZ328 Fixes/support    Evan Stawnyczy <e@lineo.ca>
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/fb.h>
-#include <linux/module.h>
-#include <linux/console.h>
-#include <linux/errno.h>
-#include <linux/string.h>
-#include <linux/bootmem.h>
-#include <linux/seq_file.h>
-#include <linux/init.h>
-
-#include <asm/devtree.h>
-#include <asm/setup.h>
-#include <asm/irq.h>
-#include <asm/machdep.h>
-#include <asm/pgtable.h>
-#include <asm/pgalloc.h>
-#include <asm/ubicom32-common.h>
-#include <asm/processor.h>
-#include <asm/bootargs.h>
-#include <asm/thread.h>
-
-unsigned long memory_start;
-EXPORT_SYMBOL(memory_start);
-
-unsigned long memory_end;
-EXPORT_SYMBOL(memory_end);
-
-static char __initdata command_line[COMMAND_LINE_SIZE];
-#ifdef CONFIG_CMDLINE_BOOL
-static char __initdata builtin_cmdline[COMMAND_LINE_SIZE] = CONFIG_CMDLINE;
-#endif
-
-extern int _stext, _etext, _sdata, _edata, _sbss, _ebss, _end;
-
-/*
- * setup_arch()
- *	Setup the architecture dependent portions of the system.
- */
-void __init setup_arch(char **cmdline_p)
-{
-	int bootmap_size;
-	unsigned long ram_start;
-
-	processor_init();
-	bootargs_init();
-
-	/*
-	 * Use the link for memory_start from the link and the processor
-	 * node for memory_end.
-	 */
-	memory_start = PAGE_ALIGN(((unsigned long)&_end));
-	processor_dram(&ram_start, &memory_end);
-
-	init_mm.start_code = (unsigned long) &_stext;
-	init_mm.end_code = (unsigned long) &_etext;
-	init_mm.end_data = (unsigned long) &_edata;
-	init_mm.brk = (unsigned long) 0;
-
-	/*
-	 * bootexec copies the original default command line to end of memory.
-	 * u-boot can modify it there (i.e. to enable network boot) and the
-	 * kernel picks up the modified version.
-	 *
-	 * mainexec creates a `new default' command_line which is in the
-	 * bootargs devnode. It is updated on every firmware update but
-	 * not used at the moment.
-	 */
-	strlcpy(boot_command_line, (char *)(memory_end - COMMAND_LINE_SIZE), COMMAND_LINE_SIZE);
-
-#ifdef CONFIG_CMDLINE_BOOL
-#ifdef CONFIG_CMDLINE_OVERRIDE
-	strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);
-#else
-	if (builtin_cmdline[0]) {
-		/* append boot loader cmdline to builtin */
-		strlcat(builtin_cmdline, " ", COMMAND_LINE_SIZE);
-		strlcat(builtin_cmdline, boot_command_line, COMMAND_LINE_SIZE);
-		strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);
-	}
-#endif
-#endif
-
-	strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
-	*cmdline_p = command_line;
-
-	parse_early_param();
-
-	printk(KERN_INFO "%s Processor, Ubicom, Inc. <www.ubicom.com>\n", CPU);
-
-#if defined(DEBUG)
-	printk(KERN_DEBUG "KERNEL -> TEXT=0x%06x-0x%06x DATA=0x%06x-0x%06x "
-		"BSS=0x%06x-0x%06x\n", (int) &_stext, (int) &_etext,
-		(int) &_sdata, (int) &_edata,
-		(int) &_sbss, (int) &_ebss);
-	printk(KERN_DEBUG "MEMORY -> ROMFS=0x%06x-0x%06x MEM=0x%06x-0x%06x\n ",
-		(int) &_ebss, (int) memory_start,
-		(int) memory_start, (int) memory_end);
-#endif
-
-#ifdef DEBUG
-	if (strlen(*cmdline_p))
-		printk(KERN_DEBUG "Command line: '%s'\n", *cmdline_p);
-#endif
-
-#if defined(CONFIG_FRAMEBUFFER_CONSOLE) && defined(CONFIG_DUMMY_CONSOLE)
-	conswitchp = &dummy_con;
-#endif
-
-	/*
-	 * If we have a device tree, see if we have the nodes we need.
-	 */
-	if (devtree) {
-		devtree_print();
-	}
-
-	/*
-	 * From the arm initialization comment:
-	 *
-	 * This doesn't seem to be used by the Linux memory manager any
-	 * more, but is used by ll_rw_block.  If we can get rid of it, we
-	 * also get rid of some of the stuff above as well.
-	 *
-	 * Note: max_low_pfn and max_pfn reflect the number of _pages_ in
-	 * the system, not the maximum PFN.
-	 */
-	max_pfn = max_low_pfn = (memory_end - PAGE_OFFSET) >> PAGE_SHIFT;
-
-	/*
-	 * Give all the memory to the bootmap allocator, tell it to put the
-	 * boot mem_map at the start of memory.
-	 */
-	bootmap_size = init_bootmem_node(
-			NODE_DATA(0),
-			memory_start >> PAGE_SHIFT,	/* map goes here */
-			PAGE_OFFSET >> PAGE_SHIFT,	/* 0 on coldfire */
-			memory_end >> PAGE_SHIFT);
-	/*
-	 * Free the usable memory, we have to make sure we do not free
-	 * the bootmem bitmap so we then reserve it after freeing it :-)
-	 */
-	free_bootmem(memory_start, memory_end - memory_start);
-	reserve_bootmem(memory_start, bootmap_size, BOOTMEM_DEFAULT);
-
-	/*
-	 * Get kmalloc into gear.
-	 */
-	paging_init();
-
-	/*
-	 * Fix up the thread_info structure, indicate this is a mainline Linux
-	 * thread and setup the sw_ksp().
-	 */
-	sw_ksp[thread_get_self()] = (unsigned int) current_thread_info();
-	thread_set_mainline(thread_get_self());
-}
diff --git a/target/linux/ubicom32/files/arch/ubicom32/kernel/signal.c b/target/linux/ubicom32/files/arch/ubicom32/kernel/signal.c
deleted file mode 100644
index f6ccbe3a7..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/kernel/signal.c
+++ /dev/null
@@ -1,458 +0,0 @@
-/*
- * arch/ubicom32/kernel/signal.c
- *   Ubicom32 architecture signal handling implementation.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- * Copyright (C) 1991, 1992  Linus Torvalds
- * Linux/m68k support by Hamish Macdonald
- * 68060 fixes by Jesper Skov
- * 1997-12-01  Modified for POSIX.1b signals by Andreas Schwab
- * mathemu support by Roman Zippel
- * ++roman (07/09/96): implemented signal stacks
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- *
- * mathemu support by Roman Zippel
- *  (Note: fpstate in the signal context is completely ignored for the emulator
- *         and the internal floating point format is put on stack)
- *
- * ++roman (07/09/96): implemented signal stacks (specially for tosemu on
- * Atari :-) Current limitation: Only one sigstack can be active at one time.
- * If a second signal with SA_ONSTACK set arrives while working on a sigstack,
- * SA_ONSTACK is ignored. This behaviour avoids lots of trouble with nested
- * signal handlers!
- */
-
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/kernel.h>
-#include <linux/signal.h>
-#include <linux/syscalls.h>
-#include <linux/errno.h>
-#include <linux/wait.h>
-#include <linux/ptrace.h>
-#include <linux/unistd.h>
-#include <linux/stddef.h>
-#include <linux/highuid.h>
-#include <linux/tty.h>
-#include <linux/personality.h>
-#include <linux/binfmts.h>
-
-#include <asm/setup.h>
-#include <asm/uaccess.h>
-#include <asm/pgtable.h>
-#include <asm/traps.h>
-#include <asm/ucontext.h>
-
-#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
-
-/*
- * asm signal return handlers.
- */
-void ret_from_user_signal(void);
-void ret_from_user_rt_signal(void);
-asmlinkage int do_signal(sigset_t *oldset, struct pt_regs *regs);
-
-/*
- * Common signal suspend implementation
- */
-static int signal_suspend(sigset_t *saveset, struct pt_regs *regs)
-{
-	regs->dn[0] = -EINTR;
-	while (1) {
-		current->state = TASK_INTERRUPTIBLE;
-		schedule();
-		if (!do_signal(saveset, regs)) {
-			continue;
-		}
-		/*
-		 * If the current frame type is a signal trampoline we are
-		 * actually going to call the signal handler so we return the
-		 * desired d0 as the return value.
-		 */
-		if (regs->frame_type == UBICOM32_FRAME_TYPE_SIGTRAMP) {
-			return regs->dn[0];
-		}
-		return -EINTR;
-	}
-	/*
-	 * Should never get here
-	 */
-	BUG();
-	return 0;
-}
-
-/*
- * Atomically swap in the new signal mask, and wait for a signal.
- */
-asmlinkage int do_sigsuspend(struct pt_regs *regs)
-{
-	old_sigset_t mask = regs->dn[0];
-	sigset_t saveset;
-
-	mask &= _BLOCKABLE;
-	spin_lock_irq(&current->sighand->siglock);
-	saveset = current->blocked;
-	siginitset(&current->blocked, mask);
-	recalc_sigpending();
-	spin_unlock_irq(&current->sighand->siglock);
-
-	/*
-	 * Call common handler
-	 */
-	return signal_suspend(&saveset, regs);
-}
-
-asmlinkage int
-do_rt_sigsuspend(struct pt_regs *regs)
-{
-	sigset_t *unewset = (sigset_t *)regs->dn[0];
-	size_t sigsetsize = (size_t)regs->dn[1];
-	sigset_t saveset, newset;
-
-	/* XXX: Don't preclude handling different sized sigset_t's.  */
-	if (sigsetsize != sizeof(sigset_t))
-		return -EINVAL;
-
-	if (copy_from_user(&newset, unewset, sizeof(newset)))
-		return -EFAULT;
-	sigdelsetmask(&newset, ~_BLOCKABLE);
-
-	spin_lock_irq(&current->sighand->siglock);
-	saveset = current->blocked;
-	current->blocked = newset;
-	recalc_sigpending();
-	spin_unlock_irq(&current->sighand->siglock);
-
-	/*
-	 * Call common handler
-	 */
-	return signal_suspend(&saveset, regs);
-}
-
-asmlinkage int
-sys_sigaction(int sig, const struct old_sigaction *act,
-	      struct old_sigaction *oact)
-{
-	struct k_sigaction new_ka, old_ka;
-	int ret;
-
-	if (act) {
-		old_sigset_t mask;
-		if (!access_ok(VERIFY_READ, act, sizeof(*act)) ||
-		    __get_user(new_ka.sa.sa_handler, &act->sa_handler) ||
-		    __get_user(new_ka.sa.sa_restorer, &act->sa_restorer))
-			return -EFAULT;
-		__get_user(new_ka.sa.sa_flags, &act->sa_flags);
-		__get_user(mask, &act->sa_mask);
-		siginitset(&new_ka.sa.sa_mask, mask);
-	}
-
-	ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL);
-
-	if (!ret && oact) {
-		if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact)) ||
-		    __put_user(old_ka.sa.sa_handler, &oact->sa_handler) ||
-		    __put_user(old_ka.sa.sa_restorer, &oact->sa_restorer))
-			return -EFAULT;
-		__put_user(old_ka.sa.sa_flags, &oact->sa_flags);
-		__put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask);
-	}
-
-	return ret;
-}
-
-asmlinkage int
-do_sys_sigaltstack(struct pt_regs *regs)
-{
-	const stack_t *uss = (stack_t *) regs->dn[0];
-	stack_t *uoss = (stack_t *)regs->dn[1];
-	return do_sigaltstack(uss, uoss, regs->an[7]);
-}
-
-/*
- * fdpic_func_descriptor describes sa_handler when the application is FDPIC
- */
-struct fdpic_func_descriptor {
-	unsigned long	text;
-	unsigned long	GOT;
-};
-
-/*
- * rt_sigframe is stored on the user stack immediately before (above)
- * the signal handlers stack.
- */
-struct rt_sigframe
-{
-	unsigned long syscall_number;	/* This holds __NR_rt_sigreturn. */
-	unsigned long restore_all_regs; /* This field gets set to 1 if the frame
-					 * type is TRAP or INTERRUPT. */
-	siginfo_t *info;
-	struct ucontext uc;
-	int sig;
-	void *pretcode;
-};
-
-/*
- * Do a signal return; undo the signal stack.
- */
-asmlinkage int do_sigreturn(unsigned long __unused)
-{
-	BUG();
-	return 0;
-}
-
-asmlinkage int do_rt_sigreturn(struct pt_regs *regs)
-{
-	unsigned long usp = regs->an[7];
-	struct rt_sigframe *frame = (struct rt_sigframe *)(usp);
-	sigset_t set;
-
-	if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))
-		goto badframe;
-	if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set)))
-		goto badframe;
-
-	sigdelsetmask(&set, ~_BLOCKABLE);
-	spin_lock_irq(&current->sighand->siglock);
-	current->blocked = set;
-	recalc_sigpending();
-	spin_unlock_irq(&current->sighand->siglock);
-
-	if (copy_from_user(regs, &frame->uc.uc_mcontext, sizeof(struct pt_regs)))
-		goto badframe;
-	return regs->dn[0];
-
-badframe:
-	force_sig(SIGSEGV, current);
-	return 0;
-}
-
-static inline void *
-get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size)
-{
-	unsigned long usp;
-
-	/* Default to using normal stack.  */
-	usp = regs->an[7];
-
-	/* This is the X/Open sanctioned signal stack switching.  */
-	if (ka->sa.sa_flags & SA_ONSTACK) {
-		if (!sas_ss_flags(usp))
-			usp = current->sas_ss_sp + current->sas_ss_size;
-	}
-	return (void *)((usp - frame_size) & ~0x3);
-}
-
-/*
- * signal_trampoline:  Defined in ubicom32_syscall.S
- */
-asmlinkage void signal_trampoline(void)__attribute__((naked));
-
-static void setup_rt_frame (int sig, struct k_sigaction *ka, siginfo_t *info,
-			    sigset_t *set, struct pt_regs *regs)
-{
-	struct rt_sigframe *frame;
-	int err = 0;
-
-	frame = (struct rt_sigframe *) get_sigframe(ka, regs, sizeof(*frame));
-
-	/*
-	 * The 'err |=' have been may criticized as bad code style, but I
-	 * strongly suspect that we want this code to be fast.  So for
-	 * now it stays as is.
-	 */
-	err |= __put_user( (  (current_thread_info()->exec_domain)
-			   && (current_thread_info()->exec_domain->signal_invmap)
-			   && (sig < 32) )
-			   ? current_thread_info()->exec_domain->signal_invmap[sig]
-			   : sig, &frame->sig);
-	err |= __put_user(info, &frame->info);
-
-	/* Create the ucontext.  */
-	err |= __put_user(0, &frame->uc.uc_flags);
-	err |= __put_user(0, &frame->uc.uc_link);
-	err |= __put_user((void *)current->sas_ss_sp,
-			  &frame->uc.uc_stack.ss_sp);
-	err |= __put_user(sas_ss_flags(regs->an[7]),
-			  &frame->uc.uc_stack.ss_flags);
-	err |= __put_user(current->sas_ss_size, &frame->uc.uc_stack.ss_size);
-	err |= __put_user(__NR_rt_sigreturn, &frame->syscall_number);
-	if ((regs->frame_type == UBICOM32_FRAME_TYPE_TRAP) ||
-	    (regs->frame_type == UBICOM32_FRAME_TYPE_INTERRUPT)) {
-		err |= __put_user(1, &frame->restore_all_regs);
-	} else {
-		err |= __put_user(0, &frame->restore_all_regs);
-	}
-	err |= copy_to_user (&frame->uc.uc_mcontext.sc_regs, regs, sizeof(struct pt_regs));
-	err |= copy_to_user (&frame->uc.uc_sigmask, set, sizeof(*set));
-
-	if (err)
-		goto give_sigsegv;
-
-	/*
-	 * Set up registers for signal handler NOTE: Do not modify dn[14], it
-	 * contains the userspace tls pointer, so it important that it carries
-	 * over to the signal handler.
-	 */
-	regs->an[7] = (unsigned long)frame;
-	regs->pc = (unsigned long) signal_trampoline;
-	regs->an[5] = (unsigned long) signal_trampoline;
-	regs->dn[0] = sig;
-	regs->dn[1] = (unsigned long) frame->info;
-	regs->dn[2] = (unsigned int) &frame->uc;
-
-	/*
-	 * If this is FDPIC then the signal handler is actually a function
-	 * descriptor.
-	 */
-	if (current->personality & FDPIC_FUNCPTRS) {
-		struct fdpic_func_descriptor __user *funcptr =
-			(struct fdpic_func_descriptor *) ka->sa.sa_handler;
-		err |= __get_user(regs->dn[3], &funcptr->text);
-		err |= __get_user(regs->an[0], &funcptr->GOT);
-		if (err)
-			goto give_sigsegv;
-
-		/*
-		 * The funcdesc must be in a3 as this is required for the lazy
-		 * resolver in ld.so, if the application is not FDPIC a3 is not
-		 * used.
-		 */
-		regs->an[3] = (unsigned long) funcptr;
-
-	} else {
-		regs->dn[3] = (unsigned long)ka->sa.sa_handler;
-		regs->an[0] = 0;
-	}
-
-	regs->frame_type =  UBICOM32_FRAME_TYPE_SIGTRAMP;
-
-	return;
-
-give_sigsegv:
-	/* user space exception */
-	force_sigsegv(sig, current);
-}
-
-static inline void
-handle_restart(struct pt_regs *regs, struct k_sigaction *ka, int has_handler)
-{
-	switch (regs->dn[0]) {
-	case -ERESTARTNOHAND:
-		if (!has_handler)
-			goto do_restart;
-		regs->dn[0] = -EINTR;
-		break;
-
-	case -ERESTARTSYS:
-		if (has_handler && !(ka->sa.sa_flags & SA_RESTART)) {
-			regs->dn[0] = -EINTR;
-			break;
-		}
-	/* fallthrough */
-	case -ERESTARTNOINTR:
-	do_restart:
-		regs->dn[0] = regs->original_dn_0;
-		regs->pc -= 8;
-		regs->an[5] -= 8;
-		break;
-	}
-}
-
-/*
- * OK, we're invoking a handler
- */
-static void
-handle_signal(int sig, struct k_sigaction *ka, siginfo_t *info,
-	      sigset_t *oldset, struct pt_regs *regs)
-{
-	/* are we from a system call? */
-	if (regs->frame_type == -1)
-		/* If so, check system call restarting.. */
-		handle_restart(regs, ka, 1);
-
-	/* set up the stack frame */
-	setup_rt_frame(sig, ka, info, oldset, regs);
-
-	if (ka->sa.sa_flags & SA_ONESHOT)
-		ka->sa.sa_handler = SIG_DFL;
-
-	spin_lock_irq(&current->sighand->siglock);
-	sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
-	if (!(ka->sa.sa_flags & SA_NODEFER))
-		sigaddset(&current->blocked,sig);
-	recalc_sigpending();
-	spin_unlock_irq(&current->sighand->siglock);
-}
-
-/*
- * Note that 'init' is a special process: it doesn't get signals it doesn't
- * want to handle. Thus you cannot kill init even with a SIGKILL even by
- * mistake.
- */
-asmlinkage int do_signal(sigset_t *oldset, struct pt_regs *regs)
-{
-	struct k_sigaction ka;
-	siginfo_t info;
-	int signr;
-
-	/*
-	 * We want the common case to go fast, which
-	 * is why we may in certain cases get here from
-	 * kernel mode. Just return without doing anything
-	 * if so.
-	 */
-	if (!user_mode(regs))
-		return 1;
-
-	if (!oldset)
-		oldset = &current->blocked;
-
-	signr = get_signal_to_deliver(&info, &ka, regs, NULL);
-	if (signr > 0) {
-		/* Whee!  Actually deliver the signal.  */
-		handle_signal(signr, &ka, &info, oldset, regs);
-		return 1;
-	}
-
-	/* Did we come from a system call? */
-	if (regs->frame_type == -1) {
-		/* Restart the system call - no handlers present */
-		handle_restart(regs, NULL, 0);
-	}
-
-	return 0;
-}
-
-/*
- * sys_sigreturn()
- *	Return handler for signal clean-up.
- *
- * NOTE: Ubicom32 does not use this syscall.  Instead we rely
- * on do_rt_sigreturn().
- */
-asmlinkage long sys_sigreturn(void)
-{
-	return -ENOSYS;
-}
diff --git a/target/linux/ubicom32/files/arch/ubicom32/kernel/smp.c b/target/linux/ubicom32/files/arch/ubicom32/kernel/smp.c
deleted file mode 100644
index 4aa27eb44..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/kernel/smp.c
+++ /dev/null
@@ -1,806 +0,0 @@
-/*
- * arch/ubicom32/kernel/smp.c
- *   SMP implementation for Ubicom32 processors.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- * Copyright (C) 1999 Walt Drummond <drummond@valinux.com>
- * Copyright (C) 1999 David Mosberger-Tang <davidm@hpl.hp.com>
- * Copyright (C) 2001,2004 Grant Grundler <grundler@parisc-linux.org>
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#include <linux/types.h>
-#include <linux/spinlock.h>
-#include <linux/slab.h>
-
-#include <linux/kernel.h>
-#include <linux/bootmem.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/smp.h>
-#include <linux/kernel_stat.h>
-#include <linux/mm.h>
-#include <linux/err.h>
-#include <linux/delay.h>
-#include <linux/bitops.h>
-#include <linux/cpu.h>
-#include <linux/profile.h>
-#include <linux/delay.h>
-#include <linux/io.h>
-#include <linux/ptrace.h>
-#include <linux/unistd.h>
-#include <linux/irq.h>
-
-#include <asm/system.h>
-#include <asm/atomic.h>
-#include <asm/current.h>
-#include <asm/tlbflush.h>
-#include <asm/timex.h>
-#include <asm/cpu.h>
-#include <asm/irq.h>
-#include <asm/processor.h>
-#include <asm/thread.h>
-#include <asm/sections.h>
-#include <asm/ip5000.h>
-
-/*
- * Mask the debug printout for IPI because they are too verbose
- * for regular debugging.
- */
-
-// #define DEBUG_SMP 1
-#if !defined(DEBUG_SMP)
-#define smp_debug(lvl, ...)
-#else
-static unsigned int smp_debug_lvl = 50;
-#define smp_debug(lvl, printargs...)		\
-	if (lvl >= smp_debug_lvl) {		\
-			printk(printargs);	\
-	}
-#endif
-
-#if !defined(DEBUG_SMP)
-#define DEBUG_ASSERT(cond)
-#else
-#define DEBUG_ASSERT(cond) \
-	if (!(cond)) { \
-		THREAD_STALL; \
-	}
-#endif
-
-/*
- * List of IPI Commands (more than one can be set at a time).
- */
-enum ipi_message_type {
-	IPI_NOP,
-	IPI_RESCHEDULE,
-	IPI_CALL_FUNC,
-	IPI_CALL_FUNC_SINGLE,
-	IPI_CPU_STOP,
-	IPI_CPU_TIMER,
-};
-
-/*
- * We maintain a hardware thread oriented view of online threads
- * and those involved or needing IPI.
- */
-static volatile unsigned long smp_online_threads = 0;
-static volatile unsigned long smp_needs_ipi = 0;
-static volatile unsigned long smp_inside_ipi = 0;
-static unsigned long smp_irq_affinity[NR_IRQS];
-
-/*
- * What do we need to track on a per cpu/thread basis?
- */
-DEFINE_PER_CPU(struct cpuinfo_ubicom32, cpu_data);
-
-/*
- * Each thread cpuinfo IPI information is guarded by a lock
- * that is kept local to this file.
- */
-DEFINE_PER_CPU(spinlock_t, ipi_lock) = SPIN_LOCK_UNLOCKED;
-
-/*
- * The IPI(s) are based on a software IRQ through the LDSR.
- */
-unsigned int smp_ipi_irq;
-
-/*
- * Define a spinlock so that only one cpu is able to modify the
- * smp_needs_ipi and to set/clear the IRQ at a time.
- */
-DEFINE_SPINLOCK(smp_ipi_lock);
-
-/*
- * smp_halt_processor()
- *	Halt this hardware thread.
- */
-static void smp_halt_processor(void)
-{
-	int cpuid = thread_get_self();
-	cpu_clear(smp_processor_id(), cpu_online_map);
-	local_irq_disable();
-	printk(KERN_EMERG "cpu[%d] has halted. It is not OK to turn off power \
-		until all cpu's are off.\n", cpuid);
-	for (;;) {
-		thread_suspend();
-	}
-}
-
-/*
- * ipi_interrupt()
- *	Handle an Interprocessor Interrupt.
- */
-static irqreturn_t ipi_interrupt(int irq, void *dev_id)
-{
-	int cpuid = smp_processor_id();
-	struct cpuinfo_ubicom32 *p = &per_cpu(cpu_data, cpuid);
-	unsigned long ops;
-
-	/*
-	 * Count this now; we may make a call that never returns.
-	 */
-	p->ipi_count++;
-
-	/*
-	 * We are about to process all ops.  If another cpu has stated
-	 * that we need an IPI, we will have already processed it.  By
-	 * clearing our smp_needs_ipi, and processing all ops,
-	 * we reduce the number of IPI interrupts.  However, this introduces
-	 * the possibility that smp_needs_ipi will be clear and the soft irq
-	 * will have gone off; so we need to make the get_affinity() path
-	 * tolerant of spurious interrupts.
-	 */
-	spin_lock(&smp_ipi_lock);
-	smp_needs_ipi &= ~(1 << p->tid);
-	spin_unlock(&smp_ipi_lock);
-
-	for (;;) {
-		/*
-		 * Read the set of IPI commands we should handle.
-		 */
-		spinlock_t *lock = &per_cpu(ipi_lock, cpuid);
-		spin_lock(lock);
-		ops = p->ipi_pending;
-		p->ipi_pending = 0;
-		spin_unlock(lock);
-
-		/*
-		 * If we have no IPI commands to execute, break out.
-		 */
-		if (!ops) {
-			break;
-		}
-
-		/*
-		 * Execute the set of commands in the ops word, one command
-		 * at a time in no particular order.  Strip of each command
-		 * as we execute it.
-		 */
-		while (ops) {
-			unsigned long which = ffz(~ops);
-			ops &= ~(1 << which);
-
-			BUG_ON(!irqs_disabled());
-			switch (which) {
-			case IPI_NOP:
-				smp_debug(100, KERN_INFO "cpu[%d]: "
-					  "IPI_NOP\n", cpuid);
-				break;
-
-			case IPI_RESCHEDULE:
-				/*
-				 * Reschedule callback.  Everything to be
-				 * done is done by the interrupt return path.
-				 */
-				smp_debug(200, KERN_INFO "cpu[%d]: "
-					  "IPI_RESCHEDULE\n", cpuid);
-				break;
-
-			case IPI_CALL_FUNC:
-				smp_debug(100, KERN_INFO "cpu[%d]: "
-					  "IPI_CALL_FUNC\n", cpuid);
-				generic_smp_call_function_interrupt();
-				break;
-
-			case IPI_CALL_FUNC_SINGLE:
-				smp_debug(100, KERN_INFO "cpu[%d]: "
-					  "IPI_CALL_FUNC_SINGLE\n", cpuid);
-				generic_smp_call_function_single_interrupt();
-				break;
-
-			case IPI_CPU_STOP:
-				smp_debug(100, KERN_INFO "cpu[%d]: "
-					  "IPI_CPU_STOP\n", cpuid);
-				smp_halt_processor();
-				break;
-
-#if !defined(CONFIG_LOCAL_TIMERS)
-			case IPI_CPU_TIMER:
-				smp_debug(100, KERN_INFO "cpu[%d]: "
-					  "IPI_CPU_TIMER\n", cpuid);
-#if defined(CONFIG_GENERIC_CLOCKEVENTS)
-				local_timer_interrupt();
-#else
-				update_process_times(user_mode(get_irq_regs()));
-				profile_tick(CPU_PROFILING);
-#endif
-#endif
-				break;
-
-			default:
-				printk(KERN_CRIT "cpu[%d]: "
-					  "Unknown IPI: %lu\n", cpuid, which);
-
-				return IRQ_NONE;
-			}
-
-			/*
-			 * Let in any pending interrupts
-			 */
-			BUG_ON(!irqs_disabled());
-			local_irq_enable();
-			local_irq_disable();
-		}
-	}
-	return IRQ_HANDLED;
-}
-
-/*
- * ipi_send()
- *	Send an Interprocessor Interrupt.
- */
-static void ipi_send(int cpu, enum ipi_message_type op)
-{
-	struct cpuinfo_ubicom32 *p = &per_cpu(cpu_data, cpu);
-	spinlock_t *lock = &per_cpu(ipi_lock, cpu);
-	unsigned long flags;
-
-	/*
-	 * We protect the setting of the ipi_pending field and ensure
-	 * that the ipi delivery mechanism and interrupt are atomically
-	 * handled.
-	 */
-	spin_lock_irqsave(lock, flags);
-	p->ipi_pending |= 1 << op;
-	spin_unlock_irqrestore(lock, flags);
-
-	spin_lock_irqsave(&smp_ipi_lock, flags);
-	smp_needs_ipi |= (1 << p->tid);
-	ubicom32_set_interrupt(smp_ipi_irq);
-	spin_unlock_irqrestore(&smp_ipi_lock, flags);
-	smp_debug(100, KERN_INFO "cpu[%d]: send: %d\n", cpu, op);
-}
-
-/*
- * ipi_send_mask
- *	Send an IPI to each cpu in mask.
- */
-static inline void ipi_send_mask(unsigned int op, const struct cpumask mask)
-{
-	int cpu;
-	for_each_cpu_mask(cpu, mask) {
-		ipi_send(cpu, op);
-	}
-}
-
-/*
- * ipi_send_allbutself()
- *	Send an IPI to all threads but ourselves.
- */
-static inline void ipi_send_allbutself(unsigned int op)
-{
-	int self = smp_processor_id();
-	struct cpumask result;
-	cpumask_copy(&result, &cpu_online_map);
-	cpu_clear(self, result);
-	ipi_send_mask(op, result);
-}
-
-/*
- * smp_enable_vector()
- */
-static void smp_enable_vector(unsigned int irq)
-{
-	ubicom32_clear_interrupt(smp_ipi_irq);
-	ldsr_enable_vector(irq);
-}
-
-/*
- * smp_disable_vector()
- *	Disable the interrupt by clearing the appropriate bit in the
- *	LDSR Mask Register.
- */
-static void smp_disable_vector(unsigned int irq)
-{
-	ldsr_disable_vector(irq);
-}
-
-/*
- * smp_mask_vector()
- */
-static void smp_mask_vector(unsigned int irq)
-{
-	ldsr_mask_vector(irq);
-}
-
-/*
- * smp_unmask_vector()
- */
-static void smp_unmask_vector(unsigned int irq)
-{
-	ldsr_unmask_vector(irq);
-}
-
-/*
- * smp_end_vector()
- *	Called once an interrupt is completed (reset the LDSR mask).
- */
-static void smp_end_vector(unsigned int irq)
-{
-	struct cpuinfo_ubicom32 *p = &per_cpu(cpu_data, smp_processor_id());
-	spin_lock(&smp_ipi_lock);
-	smp_inside_ipi &= ~(1 << p->tid);
-	if (smp_inside_ipi) {
-		spin_unlock(&smp_ipi_lock);
-		return;
-	}
-	spin_unlock(&smp_ipi_lock);
-	ldsr_unmask_vector(irq);
-	smp_debug(100, KERN_INFO "cpu[%d]: unamesk vector\n", smp_processor_id());
-}
-
-/*
- * Special hanlder functions for SMP.
- */
-static struct irq_chip ubicom32_smp_chip = {
-	.name		= "UbicoIPI",
-	.startup	= NULL,
-	.shutdown	= NULL,
-	.enable		= smp_enable_vector,
-	.disable	= smp_disable_vector,
-	.ack		= NULL,
-	.mask		= smp_mask_vector,
-	.unmask		= smp_unmask_vector,
-	.end		= smp_end_vector,
-};
-
-/*
- * smp_reset_ipi()
- *	None of these cpu(s) got their IPI, turn it back on.
- *
- * Note: This is called by the LDSR which is not a full
- * Linux cpu.  Thus you must use the raw form of locks
- * because lock debugging will not work on the partial
- * cpu nature of the LDSR.
- */
-void smp_reset_ipi(unsigned long mask)
-{
-	__raw_spin_lock(&smp_ipi_lock.raw_lock);
-	smp_needs_ipi |= mask;
-	smp_inside_ipi &= ~mask;
-	ubicom32_set_interrupt(smp_ipi_irq);
-	__raw_spin_unlock(&smp_ipi_lock.raw_lock);
-	smp_debug(100, KERN_INFO "smp: reset IPIs for: 0x%x\n", mask);
-}
-
-/*
- * smp_get_affinity()
- *	Choose the thread affinity for this interrupt.
- *
- * Note: This is called by the LDSR which is not a full
- * Linux cpu.  Thus you must use the raw form of locks
- * because lock debugging will not work on the partial
- * cpu nature of the LDSR.
- */
-unsigned long smp_get_affinity(unsigned int irq, int *all)
-{
-	unsigned long mask = 0;
-
-	/*
-	 * Most IRQ(s) are delivered in a round robin fashion.
-	 */
-	if (irq != smp_ipi_irq) {
-		unsigned long result = smp_irq_affinity[irq] & smp_online_threads;
-		DEBUG_ASSERT(result);
-		*all = 0;
-		return result;
-	}
-
-	/*
-	 * This is an IPI request.  Return all cpu(s) scheduled for an IPI.
-	 * We also track those cpu(s) that are going to be "receiving" IPI this
-	 * round.  When all CPU(s) have called smp_end_vector(),
-	 * we will unmask the IPI interrupt.
-	 */
-	__raw_spin_lock(&smp_ipi_lock.raw_lock);
-	ubicom32_clear_interrupt(smp_ipi_irq);
-	if (smp_needs_ipi) {
-		mask = smp_needs_ipi;
-		smp_inside_ipi |= smp_needs_ipi;
-		smp_needs_ipi = 0;
-	}
-	__raw_spin_unlock(&smp_ipi_lock.raw_lock);
-	*all = 1;
-	return mask;
-}
-
-/*
- *  smp_set_affinity()
- *	Set the affinity for this irq but store the value in tid(s).
- */
-void smp_set_affinity(unsigned int irq, const struct cpumask *dest)
-{
-	int cpuid;
-	unsigned long *paffinity = &smp_irq_affinity[irq];
-
-	/*
-	 *  If none specified, all cpus are allowed.
-	 */
-	if (cpus_empty(*dest)) {
-		*paffinity = 0xffffffff;
-		return;
-	}
-
-	/*
-	 * Make sure to clear the old value before setting up the
-	 * list.
-	 */
-	*paffinity = 0;
-	for_each_cpu_mask(cpuid, *dest) {
-		struct cpuinfo_ubicom32 *p = &per_cpu(cpu_data, cpuid);
-		*paffinity |= (1 << p->tid);
-	}
-}
-
-/*
- * smp_send_stop()
- *	Send a stop request to all CPU but this one.
- */
-void smp_send_stop(void)
-{
-	ipi_send_allbutself(IPI_CPU_STOP);
-}
-
-/*
- * smp_send_timer_all()
- *	Send all cpu(s) but this one, a request to update times.
- */
-void smp_send_timer_all(void)
-{
-	ipi_send_allbutself(IPI_CPU_TIMER);
-}
-
-/*
- * smp_timer_broadcast()
- *	Use an IPI to broadcast a timer message
- */
-void smp_timer_broadcast(const struct cpumask *mask)
-{
-	ipi_send_mask(IPI_CPU_TIMER, *mask);
-}
-
-/*
- * smp_send_reschedule()
- *	Send a reschedule request to the specified cpu.
- */
-void smp_send_reschedule(int cpu)
-{
-	ipi_send(cpu, IPI_RESCHEDULE);
-}
-
-/*
- * arch_send_call_function_ipi()
- *	Cause each cpu in the mask to call the generic function handler.
- */
-void arch_send_call_function_ipi_mask(const struct cpumask *mask)
-{
-	int cpu;
-	for_each_cpu_mask(cpu, *mask) {
-		ipi_send(cpu, IPI_CALL_FUNC);
-	}
-}
-
-/*
- * arch_send_call_function_single_ipi()
- *	Cause the specified cpu to call the generic function handler.
- */
-void arch_send_call_function_single_ipi(int cpu)
-{
-	ipi_send(cpu, IPI_CALL_FUNC_SINGLE);
-}
-
-/*
- * setup_profiling_timer()
- *	Dummy function created to keep Oprofile happy in the SMP case.
- */
-int setup_profiling_timer(unsigned int multiplier)
-{
-	return 0;
-}
-
-/*
- * smp_mainline_start()
- *	Start a slave thread executing a mainline Linux context.
- */
-static void __init smp_mainline_start(void *arg)
-{
-	int cpuid = smp_processor_id();
-	struct cpuinfo_ubicom32 *p = &per_cpu(cpu_data, cpuid);
-
-	BUG_ON(p->tid != thread_get_self());
-
-	/*
-	 * Well, support 2.4 linux scheme as well.
-	 */
-	if (cpu_test_and_set(cpuid, cpu_online_map)) {
-		printk(KERN_CRIT "cpu[%d]: already initialized!\n", cpuid);
-		smp_halt_processor();
-		return;
-	}
-
-	/*
-	 * Initialise the idle task for this CPU
-	 */
-	atomic_inc(&init_mm.mm_count);
-	current->active_mm = &init_mm;
-	if (current->mm) {
-		printk(KERN_CRIT "cpu[%d]: idle task already has memory "
-		       "management\n", cpuid);
-		smp_halt_processor();
-		return;
-	}
-
-	/*
-	 * TODO: X86 does this prior to calling notify, try to understand why?
-	 */
-	preempt_disable();
-
-#if defined(CONFIG_GENERIC_CLOCKEVENTS)
-	/*
-	 * Setup a local timer event so that this cpu will get timer interrupts
-	 */
-	if (local_timer_setup(cpuid) == -1) {
-		printk(KERN_CRIT "cpu[%d]: timer alloc failed\n", cpuid);
-		smp_halt_processor();
-		return;
-	}
-#endif
-
-	/*
-	 * Notify those interested that we are up and alive.  This must
-	 * be done before interrupts are enabled.  It must also be completed
-	 * before the bootstrap cpu returns from __cpu_up() (see comment
-	 * above cpu_set() of the cpu_online_map).
-	 */
-	notify_cpu_starting(cpuid);
-
-	/*
-	 * Indicate that this thread is now online and present.   Setting
-	 * cpu_online_map has the side effect of allowing the bootstrap
-	 * cpu to continue along; so anything that MUST be done prior to the
-	 * bootstrap cpu returning from __cpu_up() needs to go above here.
-	 */
-	cpu_set(cpuid, cpu_online_map);
-	cpu_set(cpuid, cpu_present_map);
-
-	/*
-	 * Maintain a thread mapping in addition to the cpu mapping.
-	 */
-	smp_online_threads |= (1 << p->tid);
-
-	/*
-	 * Enable interrupts for this thread.
-	 */
-	local_irq_enable();
-
-	/*
-	 * Enter the idle loop and wait for a timer to schedule some work.
-	 */
-	printk(KERN_INFO "cpu[%d]: entering cpu_idle()\n", cpuid);
-	cpu_idle();
-
-	/* Not Reached */
-}
-
-/*
- * smp_cpus_done()
- *	Called once the kernel_init() has brought up all cpu(s).
- */
-void smp_cpus_done(unsigned int cpu_max)
-{
-	/* Do Nothing */
-}
-
-/*
- * __cpu_up()
- *	Called to startup a sepcific cpu.
- */
-int __cpuinit __cpu_up(unsigned int cpu)
-{
-	struct task_struct *idle;
-	unsigned int *stack;
-	long timeout;
-	struct cpuinfo_ubicom32 *p = &per_cpu(cpu_data, cpu);
-
-	/*
-	 * Create an idle task for this CPU.
-	 */
-	idle = fork_idle(cpu);
-	if (IS_ERR(idle)) {
-		panic("cpu[%d]: fork failed\n", cpu);
-		return -ENOSYS;
-	}
-	task_thread_info(idle)->cpu = cpu;
-
-	/*
-	 * Setup the sw_ksp[] to point to this new task.
-	 */
-	sw_ksp[p->tid] = (unsigned int)idle->stack;
-	stack = (unsigned int *)(sw_ksp[p->tid] + PAGE_SIZE - 8);
-
-	/*
-	 * Cause the specified thread to execute our smp_mainline_start
-	 * function as a TYPE_NORMAL thread.
-	 */
-	printk(KERN_INFO "cpu[%d]: launching mainline Linux thread\n", cpu);
-	if (thread_start(p->tid, smp_mainline_start, (void *)NULL, stack,
-			 THREAD_TYPE_NORMAL) == -1) {
-		printk(KERN_WARNING "cpu[%d]: failed thread_start\n", cpu);
-		return -ENOSYS;
-	}
-
-	/*
-	 * Wait for the thread to start up.  The thread will set
-	 * the online bit when it is running.  Our caller execpts the
-	 * cpu to be online if we return 0.
-	 */
-	for (timeout = 0; timeout < 10000; timeout++) {
-		if (cpu_online(cpu)) {
-			break;
-		}
-
-		udelay(100);
-		barrier();
-		continue;
-	}
-
-	if (!cpu_online(cpu)) {
-		printk(KERN_CRIT "cpu[%d]: failed to live after %ld us\n",
-		       cpu, timeout * 100);
-		return -ENOSYS;
-	}
-
-	printk(KERN_INFO "cpu[%d]: came alive after %ld us\n",
-	       cpu, timeout * 100);
-	return 0;
-}
-
-/*
- * Data used by setup_irq for the IPI.
- */
-static struct irqaction ipi_irq = {
-	.name	 = "ipi",
-	.flags	 = IRQF_DISABLED | IRQF_PERCPU,
-	.handler = ipi_interrupt,
-};
-
-/*
- * smp_prepare_cpus()
- *	Mark threads that are available to Linux as possible cpus(s).
- */
-void __init smp_prepare_cpus(unsigned int max_cpus)
-{
-	int i;
-
-	/*
-	 * We will need a software IRQ to send IPI(s).  We will use
-	 * a single software IRQ for all IPI(s).
-	 */
-	if (irq_soft_alloc(&smp_ipi_irq) < 0) {
-		panic("no software IRQ is available\n");
-		return;
-	}
-
-	/*
-	 * For the IPI interrupt, we want to use our own chip definition.
-	 * This allows us to define what happens in SMP IPI without affecting
-	 * the performance of the other interrupts.
-	 *
-	 * Next, Register the IPI interrupt function against the soft IRQ.
-	 */
-	set_irq_chip(smp_ipi_irq, &ubicom32_smp_chip);
-	setup_irq(smp_ipi_irq, &ipi_irq);
-
-	/*
-	 * We use the device tree node to determine how many
-	 * free cpus we will have (up to NR_CPUS) and we indicate
-	 * that those cpus are present.
-	 *
-	 * We need to do this very early in the SMP case
-	 * because the Linux init code uses the cpu_present_map.
-	 */
-	for_each_possible_cpu(i) {
-		thread_t tid;
-		struct cpuinfo_ubicom32 *p = &per_cpu(cpu_data, i);
-
-		/*
-		 *  Skip the bootstrap cpu
-		 */
-		if (i == 0) {
-			continue;
-		}
-
-		/*
-		 * If we have a free thread left in the mask,
-		 * indicate that the cpu is present.
-		 */
-		tid = thread_alloc();
-		if (tid == (thread_t)-1) {
-			break;
-		}
-
-		/*
-		 * Save the hardware thread id for this cpu.
-		 */
-		p->tid = tid;
-		cpu_set(i, cpu_present_map);
-		printk(KERN_INFO "cpu[%d]: added to cpu_present_map - tid: %d\n", i, tid);
-	}
-}
-
-/*
- * smp_prepare_boot_cpu()
- *	Copy the per_cpu data into the appropriate spot for the bootstrap cpu.
- *
- * The code in boot_cpu_init() has already set the boot cpu's
- * state in the possible, present, and online maps.
- */
-void __devinit smp_prepare_boot_cpu(void)
-{
-	struct cpuinfo_ubicom32 *p = &per_cpu(cpu_data, 0);
-
-	smp_online_threads |= (1 << p->tid);
-	printk(KERN_INFO "cpu[%d]: bootstrap CPU online - tid: %ld\n",
-			current_thread_info()->cpu, p->tid);
-}
-
-/*
- * smp_setup_processor_id()
- *	Set the current_thread_info() structure cpu value.
- *
- * We set the value to the true hardware thread value that we are running on.
- * NOTE: this function overrides the weak alias function in main.c
- */
-void __init smp_setup_processor_id(void)
-{
-	struct cpuinfo_ubicom32 *p = &per_cpu(cpu_data, 0);
-	int i;
-	for_each_cpu_mask(i, CPU_MASK_ALL)
-		set_cpu_possible(i, true);
-
-	current_thread_info()->cpu = 0;
-	p->tid = thread_get_self();
-}
diff --git a/target/linux/ubicom32/files/arch/ubicom32/kernel/stacktrace.c b/target/linux/ubicom32/files/arch/ubicom32/kernel/stacktrace.c
deleted file mode 100644
index 2a10e3f4f..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/kernel/stacktrace.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * arch/ubicom32/kernel/stacktrace.c
- *   Ubicom32 architecture stack back trace implementation.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <linux/sched.h>
-#include <linux/stacktrace.h>
-#include <linux/module.h>
-#include <asm/stacktrace.h>
-#include <asm/thread.h>
-#include <asm/ip5000.h>
-
-/*
- * These symbols are filled in by the linker.
- */
-extern unsigned long _stext;
-extern unsigned long _etext;
-
-extern unsigned long __ocm_text_run_begin;
-extern unsigned long __data_begin;
-
-/*
- * stacktrace_iterate()
- *	Walk the stack looking for call and calli instructions on an aligned
- *	boundary.
- *
- * Trace must point to the top of the current stack frame.
- */
-unsigned long stacktrace_iterate(unsigned long **trace,
-				 unsigned long stext,
-				 unsigned long etext,
-				 unsigned long ocm_stext,
-				 unsigned long ocm_etext,
-				 unsigned long sstack,
-				 unsigned long estack)
-{
-	unsigned int thread_trap_en, instruction;
-	unsigned long address;
-	unsigned int limit = 0;
-	unsigned long result = 0;
-	unsigned long *sp = *trace;
-
-	/*
-	 * Exclude the current thread from being monitored for traps.
-	 */
-	asm volatile(
-		"	thread_get_self_mask d15		\n\t"
-			/* save current trap status */
-		"	and.4	%0, MT_TRAP_EN, d15		\n\t"
-		"	not.4	d15, d15			\n\t"
-			/* disable trap */
-		"	and.4	MT_TRAP_EN, MT_TRAP_EN, d15	\n\t"
-		"	pipe_flush 0				\n\t"
-		: "=r" (thread_trap_en)
-		:
-		: "d15", "cc"
-	);
-
-	while (limit++ < 256) {
-		/*
-		 * See if we have a valid stack.
-		 */
-		if (!between((unsigned long)sp, sstack, estack)) {
-#ifdef TRAP_DEBUG_STACK_TRACE
-			printk(KERN_EMERG "stack address is out of range - "
-			       "sp: %x, sstack: %x, estack: %x\n",
-			       (unsigned int)sp, (unsigned int)sstack,
-			       (unsigned int)estack);
-#endif
-			result = 0;
-			*trace = 0;
-			break;
-		}
-
-		/*
-		 * Get the value off the stack and back up 4 bytes to what
-		 * should be the address of a call or calli.
-		 */
-		address = (*sp++) - 4;
-
-		/*
-		 * If the address is not within the text segment, skip this
-		 * value.
-		 */
-		if (!between(address, stext, etext) &&
-		    !between(address, ocm_stext, ocm_etext)) {
-#ifdef TRAP_DEBUG_STACK_TRACE
-			printk(KERN_EMERG "not a text address - "
-			       "address: %08x, stext: %08x, etext: %08x\n"
-			       "ocm_stext: %08x, ocm_etext: %08x\n",
-			       (unsigned int)address,
-			       (unsigned int)stext,
-			       (unsigned int)etext,
-			       (unsigned int)ocm_stext,
-			       (unsigned int)ocm_etext);
-#endif
-			continue;
-
-		}
-
-		/*
-		 * If the address is not on an aligned boundary it can not be a
-		 * return address.
-		 */
-		if (address & 0x3) {
-			continue;
-		}
-
-		/*
-		 * Read the probable instruction.
-		 */
-		instruction = *(unsigned int *)address;
-
-		/*
-		 * Is this a call instruction?
-		 */
-		if ((instruction & 0xF8000000) == (u32_t)(0x1B << 27)) {
-#ifdef TRAP_DEBUG_STACK_TRACE
-			printk(KERN_EMERG "call inst. result: %x, "
-			       "test: %x\n", (unsigned int)address,
-			       (unsigned int)instruction);
-#endif
-			*trace = sp;
-			result = address;
-			break;
-		}
-
-		/*
-		 * Is this a calli instruction?
-		 */
-		if ((instruction & 0xF8000000) == (u32_t)(0x1E << 27)) {
-#ifdef TRAP_DEBUG_STACK_TRACE
-			printk(KERN_EMERG "calli inst. result: %x, "
-			       "test: %x\n", (unsigned int)address,
-			       (unsigned int)instruction);
-#endif
-			*trace = sp;
-			result = address;
-			break;
-		}
-	}
-
-	/*
-	 * Restore the current thread to be monitored for traps.
-	 */
-	if (thread_trap_en) {
-		asm volatile(
-		"	thread_get_self_mask d15		\n\t"
-		"	or.4	MT_TRAP_EN, MT_TRAP_EN, d15	\n\t"
-			:
-			:
-			: "d15", "cc"
-		);
-	}
-	return result;
-}
-
-#ifdef CONFIG_STACKTRACE
-/*
- * stacktrace_save_entries()
- *	Save stack back trace information into the provided trace structure.
- */
-void stacktrace_save_entries(struct task_struct *tsk,
-			     struct stack_trace *trace,
-			     unsigned long sp)
-{
-	unsigned long code_start = (unsigned long)&_stext;
-	unsigned long code_end = (unsigned long)&_etext;
-	unsigned long ocm_code_start = (unsigned long)&__ocm_text_run_begin;
-	unsigned long ocm_code_end = (unsigned long)&__data_begin;
-	unsigned long stack_end = (unsigned long)(tsk->stack + THREAD_SIZE - 8);
-	unsigned long stack = (unsigned long)sp;
-	unsigned int idx = 0;
-	unsigned long *handle;
-	int skip = trace->skip;
-
-	handle = (unsigned long *)stack;
-	while (idx < trace->max_entries) {
-		if (skip) {
-			skip--;
-			continue;
-		}
-		trace->entries[idx] = stacktrace_iterate(&handle,
-					code_start, code_end,
-					ocm_code_start, ocm_code_end,
-					(unsigned long)stack, stack_end);
-		if (trace->entries[idx] == 0) {
-			break;
-		}
-		idx++;
-	}
-}
-
-/*
- * save_stack_trace()
- *	Save the specified amount of the kernel stack trace information
- *	for the current task.
- */
-void save_stack_trace(struct stack_trace *trace)
-{
-	unsigned long sp = 0;
-	asm volatile (
-	"	move.4	%0, SP		\n\t"
-		: "=r" (sp)
-	);
-	stacktrace_save_entries(current, trace, sp);
-}
-EXPORT_SYMBOL_GPL(save_stack_trace);
-
-/*
- * save_stack_trace_tsk()
- *	Save the specified amount of the kernel stack trace information
- *	for the specified task.
- *
- * Note: We assume the specified task is not currently running.
- */
-void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace)
-{
-	stacktrace_save_entries(tsk, trace, tsk->thread.sp);
-}
-EXPORT_SYMBOL_GPL(save_stack_trace_tsk);
-#endif /* CONFIG_STACKTRACE */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/kernel/sys_ubicom32.c b/target/linux/ubicom32/files/arch/ubicom32/kernel/sys_ubicom32.c
deleted file mode 100644
index b06f3f396..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/kernel/sys_ubicom32.c
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * arch/ubicom32/kernel/sys_ubicom32.c
- *   Ubicom32 architecture system call support implementation.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- *
- * This file contains various random system calls that
- * have a non-standard calling sequence on the Linux/ubicom32
- * platform.
- */
-
-#include <linux/module.h>
-#include <linux/errno.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/smp.h>
-#include <linux/sem.h>
-#include <linux/msg.h>
-#include <linux/shm.h>
-#include <linux/stat.h>
-#include <linux/syscalls.h>
-#include <linux/mman.h>
-#include <linux/file.h>
-#include <linux/utsname.h>
-#include <linux/ipc.h>
-#include <linux/fs.h>
-#include <linux/uaccess.h>
-#include <linux/unistd.h>
-
-#include <asm/setup.h>
-#include <asm/traps.h>
-#include <asm/cacheflush.h>
-
-/* common code for old and new mmaps */
-static inline long do_mmap2(
-	unsigned long addr, unsigned long len,
-	unsigned long prot, unsigned long flags,
-	unsigned long fd, unsigned long pgoff)
-{
-	int error = -EBADF;
-	struct file *file = NULL;
-
-	flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-	if (!(flags & MAP_ANONYMOUS)) {
-		file = fget(fd);
-		if (!file)
-			goto out;
-	}
-
-	down_write(&current->mm->mmap_sem);
-	error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
-	up_write(&current->mm->mmap_sem);
-
-	if (file)
-		fput(file);
-out:
-	return error;
-}
-
-asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
-	unsigned long prot, unsigned long flags,
-	unsigned long fd, unsigned long pgoff)
-{
-	return do_mmap2(addr, len, prot, flags, fd, pgoff);
-}
-
-/*
- * Perform the select(nd, in, out, ex, tv) and mmap() system
- * calls. Linux/m68k cloned Linux/i386, which didn't use to be able to
- * handle more than 4 system call parameters, so these system calls
- * used a memory block for parameter passing..
- */
-
-struct mmap_arg_struct {
-	unsigned long addr;
-	unsigned long len;
-	unsigned long prot;
-	unsigned long flags;
-	unsigned long fd;
-	unsigned long offset;
-};
-
-asmlinkage int old_mmap(struct mmap_arg_struct *arg)
-{
-	struct mmap_arg_struct a;
-	int error = -EFAULT;
-
-	if (copy_from_user(&a, arg, sizeof(a)))
-		goto out;
-
-	error = -EINVAL;
-	if (a.offset & ~PAGE_MASK)
-		goto out;
-
-	a.flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-
-	error = do_mmap2(a.addr, a.len, a.prot, a.flags, a.fd,
-			 a.offset >> PAGE_SHIFT);
-out:
-	return error;
-}
-
-struct sel_arg_struct {
-	unsigned long n;
-	fd_set *inp, *outp, *exp;
-	struct timeval *tvp;
-};
-
-asmlinkage int old_select(struct sel_arg_struct *arg)
-{
-	struct sel_arg_struct a;
-
-	if (copy_from_user(&a, arg, sizeof(a)))
-		return -EFAULT;
-	/* sys_select() does the appropriate kernel locking */
-	return sys_select(a.n, a.inp, a.outp, a.exp, a.tvp);
-}
-
-/*
- * sys_ipc() is the de-multiplexer for the SysV IPC calls..
- *
- * This is really horribly ugly.
- */
-asmlinkage int sys_ipc(uint call, int first, int second,
-			int third, void *ptr, long fifth)
-{
-	int version, ret;
-
-	version = call >> 16; /* hack for backward compatibility */
-	call &= 0xffff;
-
-	if (call <= SEMCTL)
-		switch (call) {
-		case SEMOP:
-			return sys_semop(first, (struct sembuf *)ptr, second);
-		case SEMGET:
-			return sys_semget(first, second, third);
-		case SEMCTL: {
-			union semun fourth;
-			if (!ptr)
-				return -EINVAL;
-			if (get_user(fourth.__pad, (void **) ptr))
-				return -EFAULT;
-			return sys_semctl(first, second, third, fourth);
-			}
-		default:
-			return -EINVAL;
-		}
-	if (call <= MSGCTL)
-		switch (call) {
-		case MSGSND:
-			return sys_msgsnd(first, (struct msgbuf *) ptr,
-					  second, third);
-		case MSGRCV:
-			switch (version) {
-			case 0: {
-				struct ipc_kludge tmp;
-				if (!ptr)
-					return -EINVAL;
-				if (copy_from_user(&tmp,
-						   (struct ipc_kludge *)ptr,
-						   sizeof(tmp)))
-					return -EFAULT;
-				return sys_msgrcv(first, tmp.msgp, second,
-						   tmp.msgtyp, third);
-				}
-			default:
-				return sys_msgrcv(first,
-						  (struct msgbuf *) ptr,
-						  second, fifth, third);
-			}
-		case MSGGET:
-			return sys_msgget((key_t) first, second);
-		case MSGCTL:
-			return sys_msgctl(first, second,
-					   (struct msqid_ds *) ptr);
-		default:
-			return -EINVAL;
-		}
-	if (call <= SHMCTL)
-		switch (call) {
-		case SHMAT:
-			switch (version) {
-			default: {
-				ulong raddr;
-				ret = do_shmat(first, ptr, second, &raddr);
-				if (ret)
-					return ret;
-				return put_user(raddr, (ulong __user *) third);
-			}
-			}
-		case SHMDT:
-			return sys_shmdt(ptr);
-		case SHMGET:
-			return sys_shmget(first, second, third);
-		case SHMCTL:
-			return sys_shmctl(first, second, ptr);
-		default:
-			return -ENOSYS;
-		}
-
-	return -EINVAL;
-}
-
-/* sys_cacheflush -- flush (part of) the processor cache.  */
-asmlinkage int
-sys_cacheflush(unsigned long addr, int scope, int cache, unsigned long len)
-{
-	flush_cache_all();
-	return 0;
-}
-
-asmlinkage int sys_getpagesize(void)
-{
-	return PAGE_SIZE;
-}
diff --git a/target/linux/ubicom32/files/arch/ubicom32/kernel/syscalltable.S b/target/linux/ubicom32/files/arch/ubicom32/kernel/syscalltable.S
deleted file mode 100644
index 8921fb83d..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/kernel/syscalltable.S
+++ /dev/null
@@ -1,376 +0,0 @@
-/*
- * arch/ubicom32/kernel/syscalltable.S
- *	<TODO: Replace with short file description>
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-/*
- *
- *  Copyright (C) 2002, Greg Ungerer (gerg@snapgear.com)
- *  Copyright (C) 1998  D. Jeff Dionne <jeff@lineo.ca>, Kenneth Albanowski <kjahds@kjahds.com>,
- *  Copyright (C) 2000  Lineo Inc. (www.lineo.com)
- *  Copyright (C) 1991, 1992  Linus Torvalds
- */
-
-#include <linux/sys.h>
-#include <linux/linkage.h>
-#include <asm/unistd.h>
-
-.text
-ALIGN
-	.global sys_call_table
-sys_call_table:
-	.long sys_ni_syscall	/* 0  -  old "setup()" system call*/
-	.long sys_exit
-	.long sys_fork
-	.long sys_read
-	.long sys_write
-	.long sys_open		/* 5 */
-	.long sys_close
-	.long sys_waitpid
-	.long sys_creat
-	.long sys_link
-	.long sys_unlink	/* 10 */
-	.long execve_intercept
-	.long sys_chdir
-	.long sys_time
-	.long sys_mknod
-	.long sys_chmod		/* 15 */
-	.long sys_chown16
-	.long sys_ni_syscall	/* old break syscall holder */
-	.long sys_stat
-	.long sys_lseek
-	.long sys_getpid	/* 20 */
-	.long sys_mount
-	.long sys_oldumount
-	.long sys_setuid16
-	.long sys_getuid16
-	.long sys_stime		/* 25 */
-	.long sys_ptrace
-	.long sys_alarm
-	.long sys_fstat
-	.long sys_pause
-	.long sys_utime		/* 30 */
-	.long sys_ni_syscall	/* old stty syscall holder */
-	.long sys_ni_syscall	/* old gtty syscall holder */
-	.long sys_access
-	.long sys_nice
-	.long sys_ni_syscall	/* 35 */ /* old ftime syscall holder */
-	.long sys_sync
-	.long sys_kill
-	.long sys_rename
-	.long sys_mkdir
-	.long sys_rmdir		/* 40 */
-	.long sys_dup
-	.long sys_pipe
-	.long sys_times
-	.long sys_ni_syscall	/* old prof syscall holder */
-	.long sys_brk		/* 45 */
-	.long sys_setgid16
-	.long sys_getgid16
-	.long sys_signal
-	.long sys_geteuid16
-	.long sys_getegid16	/* 50 */
-	.long sys_acct
-	.long sys_umount	/* recycled never used phys() */
-	.long sys_ni_syscall	/* old lock syscall holder */
-	.long sys_ioctl
-	.long sys_fcntl		/* 55 */
-	.long sys_ni_syscall	/* old mpx syscall holder */
-	.long sys_setpgid
-	.long sys_ni_syscall	/* old ulimit syscall holder */
-	.long sys_ni_syscall
-	.long sys_umask		/* 60 */
-	.long sys_chroot
-	.long sys_ustat
-	.long sys_dup2
-	.long sys_getppid
-	.long sys_getpgrp	/* 65 */
-	.long sys_setsid
-	.long sys_sigaction
-	.long sys_sgetmask
-	.long sys_ssetmask
-	.long sys_setreuid16	/* 70 */
-	.long sys_setregid16
-	.long sys_sigsuspend
-	.long sys_sigpending
-	.long sys_sethostname
-	.long sys_setrlimit	/* 75 */
-	.long sys_old_getrlimit
-	.long sys_getrusage
-	.long sys_gettimeofday
-	.long sys_settimeofday
-	.long sys_getgroups16	/* 80 */
-	.long sys_setgroups16
-	.long old_select
-	.long sys_symlink
-	.long sys_lstat
-	.long sys_readlink	/* 85 */
-	.long sys_uselib
-	.long sys_ni_syscall	/* _sys_swapon */
-	.long sys_reboot
-	.long sys_old_readdir
-	.long old_mmap		/* 90 */
-	.long sys_munmap
-	.long sys_truncate
-	.long sys_ftruncate
-	.long sys_fchmod
-	.long sys_fchown16	/* 95 */
-	.long sys_getpriority
-	.long sys_setpriority
-	.long sys_ni_syscall	/* old profil syscall holder */
-	.long sys_statfs
-	.long sys_fstatfs	/* 100 */
-	.long sys_ni_syscall	/* ioperm for i386 */
-	.long sys_socketcall
-	.long sys_syslog
-	.long sys_setitimer
-	.long sys_getitimer	/* 105 */
-	.long sys_newstat
-	.long sys_newlstat
-	.long sys_newfstat
-	.long sys_ni_syscall
-	.long sys_ni_syscall	/* iopl for i386 */ /* 110 */
-	.long sys_vhangup
-	.long sys_ni_syscall	/* obsolete idle() syscall */
-	.long sys_ni_syscall	/* vm86old for i386 */
-	.long sys_wait4
-	.long sys_ni_syscall	/* 115 */ /* _sys_swapoff */
-	.long sys_sysinfo
-	.long sys_ipc
-	.long sys_fsync
-	.long sys_sigreturn
-	.long clone_intercept	/* 120 */
-	.long sys_setdomainname
-	.long sys_newuname
-	.long sys_cacheflush	/* modify_ldt for i386 */
-	.long sys_adjtimex
-	.long sys_ni_syscall	/* 125 */ /* _sys_mprotect */
-	.long sys_sigprocmask
-	.long sys_ni_syscall	/* old "creat_module" */
-	.long sys_init_module
-	.long sys_delete_module
-	.long sys_ni_syscall	/* 130: old "get_kernel_syms" */
-	.long sys_quotactl
-	.long sys_getpgid
-	.long sys_fchdir
-	.long sys_bdflush
-	.long sys_sysfs		/* 135 */
-	.long sys_personality
-	.long sys_ni_syscall	/* for afs_syscall */
-	.long sys_setfsuid16
-	.long sys_setfsgid16
-	.long sys_llseek	/* 140 */
-	.long sys_getdents
-	.long sys_select
-	.long sys_flock
-	.long sys_ni_syscall	/* _sys_msync */
-	.long sys_readv		/* 145 */
-	.long sys_writev
-	.long sys_getsid
-	.long sys_fdatasync
-	.long sys_sysctl
-	.long sys_ni_syscall	/* 150 */ /* _sys_mlock */
-	.long sys_ni_syscall	/* _sys_munlock */
-	.long sys_ni_syscall	/* _sys_mlockall */
-	.long sys_ni_syscall	/* _sys_munlockall */
-	.long sys_sched_setparam
-	.long sys_sched_getparam /* 155 */
-	.long sys_sched_setscheduler
-	.long sys_sched_getscheduler
-	.long sys_sched_yield
-	.long sys_sched_get_priority_max
-	.long sys_sched_get_priority_min  /* 160 */
-	.long sys_sched_rr_get_interval
-	.long sys_nanosleep
-	.long sys_ni_syscall	/* _sys_mremap */
-	.long sys_setresuid16
-	.long sys_getresuid16	/* 165 */
-	.long sys_getpagesize	/* _sys_getpagesize */
-	.long sys_ni_syscall	/* old "query_module" */
-	.long sys_poll
-	.long sys_ni_syscall	/* _sys_nfsservctl */
-	.long sys_setresgid16	/* 170 */
-	.long sys_getresgid16
-	.long sys_prctl
-	.long sys_rt_sigreturn
-	.long sys_rt_sigaction
-	.long sys_rt_sigprocmask /* 175 */
-	.long sys_rt_sigpending
-	.long sys_rt_sigtimedwait
-	.long sys_rt_sigqueueinfo
-	.long sys_rt_sigsuspend
-	.long sys_pread64	/* 180 */
-	.long sys_pwrite64
-	.long sys_lchown16
-	.long sys_getcwd
-	.long sys_capget
-	.long sys_capset	/* 185 */
-	.long sys_sigaltstack
-	.long sys_sendfile
-	.long sys_ni_syscall	/* streams1 */
-	.long sys_ni_syscall	/* streams2 */
-	.long vfork_intercept		/* 190 */
-	.long sys_getrlimit
-	.long sys_mmap2
-	.long sys_truncate64
-	.long sys_ftruncate64
-	.long sys_stat64	/* 195 */
-	.long sys_lstat64
-	.long sys_fstat64
-	.long sys_chown
-	.long sys_getuid
-	.long sys_getgid	/* 200 */
-	.long sys_geteuid
-	.long sys_getegid
-	.long sys_setreuid
-	.long sys_setregid
-	.long sys_getgroups	/* 205 */
-	.long sys_setgroups
-	.long sys_fchown
-	.long sys_setresuid
-	.long sys_getresuid
-	.long sys_setresgid	/* 210 */
-	.long sys_getresgid
-	.long sys_lchown
-	.long sys_setuid
-	.long sys_setgid
-	.long sys_setfsuid	/* 215 */
-	.long sys_setfsgid
-	.long sys_pivot_root
-	.long sys_ni_syscall
-	.long sys_ni_syscall
-	.long sys_getdents64	/* 220 */
-	.long sys_gettid
-	.long sys_tkill
-	.long sys_setxattr
-	.long sys_lsetxattr
-	.long sys_fsetxattr	/* 225 */
-	.long sys_getxattr
-	.long sys_lgetxattr
-	.long sys_fgetxattr
-	.long sys_listxattr
-	.long sys_llistxattr	/* 230 */
-	.long sys_flistxattr
-	.long sys_removexattr
-	.long sys_lremovexattr
-	.long sys_fremovexattr
-	.long sys_futex		/* 235 */
-	.long sys_sendfile64
-	.long sys_ni_syscall	/* _sys_mincore */
-	.long sys_ni_syscall	/* _sys_madvise */
-	.long sys_fcntl64
-	.long sys_readahead	/* 240 */
-	.long sys_io_setup
-	.long sys_io_destroy
-	.long sys_io_getevents
-	.long sys_io_submit
-	.long sys_io_cancel	/* 245 */
-	.long sys_fadvise64
-	.long sys_exit_group
-	.long sys_lookup_dcookie
-	.long sys_epoll_create
-	.long sys_epoll_ctl	/* 250 */
-	.long sys_epoll_wait
-	.long sys_ni_syscall	/* _sys_remap_file_pages */
-	.long sys_set_tid_address
-	.long sys_timer_create
-	.long sys_timer_settime	/* 255 */
-	.long sys_timer_gettime
-	.long sys_timer_getoverrun
-	.long sys_timer_delete
-	.long sys_clock_settime
-	.long sys_clock_gettime	/* 260 */
-	.long sys_clock_getres
-	.long sys_clock_nanosleep
-	.long sys_statfs64
-	.long sys_fstatfs64
-	.long sys_tgkill	/* 265 */
-	.long sys_utimes
-	.long sys_fadvise64_64
-	.long sys_mbind
-	.long sys_get_mempolicy
-	.long sys_set_mempolicy	/* 270 */
-	.long sys_mq_open
-	.long sys_mq_unlink
-	.long sys_mq_timedsend
-	.long sys_mq_timedreceive
-	.long sys_mq_notify	/* 275 */
-	.long sys_mq_getsetattr
-	.long sys_waitid
-	.long sys_ni_syscall	/* for _sys_vserver */
-	.long sys_add_key
-	.long sys_request_key	/* 280 */
-	.long sys_keyctl
-	.long sys_ioprio_set
-	.long sys_ioprio_get
-	.long sys_inotify_init
-	.long sys_inotify_add_watch	/* 285 */
-	.long sys_inotify_rm_watch
-	.long sys_migrate_pages
-	.long sys_openat
-	.long sys_mkdirat
-	.long sys_mknodat		/* 290 */
-	.long sys_fchownat
-	.long sys_futimesat
-	.long sys_fstatat64
-	.long sys_unlinkat
-	.long sys_renameat		/* 295 */
-	.long sys_linkat
-	.long sys_symlinkat
-	.long sys_readlinkat
-	.long sys_fchmodat
-	.long sys_faccessat		/* 300 */
-	.long sys_ni_syscall		/* Reserved for pselect6 */
-	.long sys_ni_syscall		/* Reserved for ppoll */
-	.long sys_unshare
-	.long sys_set_robust_list
-	.long sys_get_robust_list	/* 305 */
-	.long sys_splice
-	.long sys_sync_file_range
-	.long sys_tee
-	.long sys_vmsplice
-	.long sys_move_pages		/* 310 */
-	.long sys_sched_setaffinity
-	.long sys_sched_getaffinity
-	.long sys_kexec_load
-	.long sys_getcpu
-	.long sys_epoll_pwait		/* 315 */
-	.long sys_utimensat
-	.long sys_signalfd
-	.long sys_timerfd_create
-	.long sys_eventfd
-	.long sys_fallocate		/* 320 */
-	.long sys_timerfd_settime
-	.long sys_timerfd_gettime
-	.long sys_ni_syscall		/* sys_signalfd4 */
-	.long sys_ni_syscall		/* sys_eventfd2 */
-	.long sys_ni_syscall		/* sys_epoll_create1 */
-					/* 325 */
-	.long sys_ni_syscall		/* sys_dup3 */
-	.long sys_ni_syscall		/* sys_pipe2 */
-	.long sys_ni_syscall		/* sys_inotify_init1 */
-	.rept NR_syscalls-(.-sys_call_table)/4
-		.long sys_ni_syscall
-	.endr
diff --git a/target/linux/ubicom32/files/arch/ubicom32/kernel/thread.c b/target/linux/ubicom32/files/arch/ubicom32/kernel/thread.c
deleted file mode 100644
index aaa5fbea4..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/kernel/thread.c
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * arch/ubicom32/kernel/thread.c
- *   Ubicom32 architecture hardware thread support.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/sched.h>
-#include <linux/interrupt.h>
-#include <linux/irq.h>
-#include <linux/profile.h>
-#include <linux/clocksource.h>
-#include <linux/types.h>
-#include <asm/ip5000.h>
-#include <asm/machdep.h>
-#include <asm/asm-offsets.h>
-#include <asm/thread.h>
-
-/*
- * TODO: At some point change the name here to be thread_ksp
- */
-unsigned int sw_ksp[THREAD_ARCHITECTURAL_MAX];
-
-static unsigned int thread_mask = -1;
-static unsigned int thread_mainline_mask;
-
-/*
- * thread_entry()
- *	Returning from the called function will disable the thread.
- *
- * This could be a naked call to allow for hwthreads that do not have stacks.
- * However, with -O0, the code still writes to thex stack, and this was
- * corrupting memory just after the callers stack.
- */
-static void thread_entry(void *arg, thread_exec_fn_t exec)
-{
-	/*
-	 * Call thread function
-	 */
-	exec(arg);
-
-	/*
-	 * Complete => Disable self
-	 */
-	thread_disable(thread_get_self());
-}
-
-/*
- * thread_start()
- *	Start the specified function on the specified hardware thread.
- */
-thread_t thread_start(thread_t thread,
-		      thread_exec_fn_t exec,
-		      void *arg,
-		      unsigned int *sp_high,
-		      thread_type_t type)
-{
-	/*
-	 * Sanity check
-	 */
-	unsigned int enabled, mask, csr;
-	asm volatile (
-		"move.4		%0, MT_EN\n\t"
-		: "=m" (enabled)
-	);
-
-	mask = 1 << thread;
-	if (enabled & mask) {
-		printk(KERN_WARNING "request to enable a previously enabled thread\n");
-		return (thread_t)-1;
-	}
-
-	/*
-	 * Update thread state
-	 */
-	csr = (thread << 15) | (1 << 14);
-	asm volatile (
-		"setcsr		%0		\n\t"
-		"setcsr_flush	0		\n\t"
-
-		"move.4		A0, #0		\n\t"
-		"move.4		A1, #0		\n\t"
-		"move.4		A2, #0		\n\t"
-		"move.4		A3, #0		\n\t"
-		"move.4		A4, #0		\n\t"
-		"move.4		A5, #0		\n\t"
-		"move.4		A6, #0		\n\t"
-		"move.4		SP, %4		\n\t"	/* A7 is SP */
-
-		"move.4		D0, %3		\n\t"
-		"move.4		D1, %2		\n\t"
-		"move.4		D2, #0		\n\t"
-		"move.4		D3, #0		\n\t"
-		"move.4		D4, #0		\n\t"
-		"move.4		D5, #0		\n\t"
-		"move.4		D6, #0		\n\t"
-		"move.4		D7, #0		\n\t"
-		"move.4		D8, #0		\n\t"
-		"move.4		D9, #0		\n\t"
-		"move.4		D10, #0		\n\t"
-		"move.4		D11, #0		\n\t"
-		"move.4		D12, #0		\n\t"
-		"move.4		D13, #0		\n\t"
-		"move.4		D14, #0		\n\t"
-		"move.4		D15, #0		\n\t"
-
-		"move.4		INT_MASK0, #0	\n\t"
-		"move.4		INT_MASK1, #0	\n\t"
-		"move.4		PC, %1		\n\t"
-		"setcsr		#0		\n\t"
-		"setcsr_flush	0		\n\t"
-		:
-		: "r" (csr), "r" (thread_entry), "r" (exec),
-		  "r" (arg), "r" (sp_high)
-	);
-
-	/*
-	 * Apply HRT state
-	 */
-	if (type & THREAD_TYPE_HRT) {
-		asm volatile (
-			"or.4		MT_HRT, MT_HRT, %0\n\t"
-			:
-			: "d" (mask)
-			: "cc"
-		);
-	} else {
-		asm volatile (
-			"and.4		MT_HRT, MT_HRT, %0\n\t"
-			:
-			: "d" (~mask)
-			: "cc"
-		);
-	}
-
-	/*
-	 * Set priority
-	 */
-	asm volatile (
-		"or.4		MT_HPRI, MT_HPRI, %0\n\t"
-		:
-		: "d" (mask)
-		: "cc"
-	);
-
-	/*
-	 * Enable thread
-	 */
-	asm volatile (
-		"move.4		MT_ACTIVE_SET, %0	\n\t"
-		:
-		: "d" (mask)
-	);
-	thread_enable_mask(mask);
-	return thread;
-}
-
-/*
- * thread_get_mainline()
- *	Return a mask of those threads that are Linux mainline threads.
- */
-unsigned int thread_get_mainline(void)
-{
-	return thread_mainline_mask;
-}
-
-/*
- * thread_set_mainline()
- *	Indicate that the specified thread is a Linux mainline thread.
- */
-void thread_set_mainline(thread_t tid)
-{
-	thread_mainline_mask |= (1 << tid);
-}
-
-/*
- * thread_alloc()
- *	Allocate an unused hardware thread.
- */
-thread_t thread_alloc(void)
-{
-	thread_t tid;
-
-	/*
-	 * If this is the first time we are here get the list of unused
-	 * threads from the processor device tree node.
-	 */
-	if (thread_mask == -1) {
-		thread_mask = processor_threads();
-	}
-
-	if (!thread_mask) {
-		return (thread_t)-1;
-	}
-
-	tid = ffs(thread_mask);
-	if (tid != 0) {
-		tid--;
-		thread_mask &= ~(1 << tid);
-		return tid;
-	}
-
-	return (thread_t)-1;
-}
diff --git a/target/linux/ubicom32/files/arch/ubicom32/kernel/time.c b/target/linux/ubicom32/files/arch/ubicom32/kernel/time.c
deleted file mode 100644
index 4a99284bd..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/kernel/time.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * arch/ubicom32/kernel/time.c
- *	Initialize the timer list and start the appropriate timers.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- * Copyright (C) 1991, 1992, 1995  Linus Torvalds
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#include <linux/profile.h>
-#include <linux/smp.h>
-#include <asm/ip5000.h>
-#include <asm/machdep.h>
-
-/*
- * A bitmap of the timers on the processor indicates
- * that the timer is free or in-use.
- */
-static unsigned int timers;
-
-/*
- * timer_set()
- *	Init the specified compare register to go off <n> cycles from now.
- */
-void timer_set(int timervector, unsigned int cycles)
-{
-	int idx = UBICOM32_VECTOR_TO_TIMER_INDEX(timervector);
-	UBICOM32_IO_TIMER->syscom[idx] =
-			UBICOM32_IO_TIMER->sysval + cycles;
-	ldsr_enable_vector(timervector);
-}
-
-/*
- * timer_reset()
- *	Set/reset the timer to go off again.
- *
- * Because sysval is a continuous timer, this function is able
- * to ensure that we do not have clock sku by using the previous
- * value in syscom to set the next value for syscom.
- *
- * Returns the number of ticks that transpired since the last event.
- */
-int timer_reset(int timervector, unsigned int cycles)
-{
-	/*
-	 * Reset the timer in the LDSR thread to go off appropriately.
-	 *
-	 * Use the previous value of the timer to calculate the new stop
-	 * time.  This allows us to account for it taking an
-	 * indeterminate amount of time to get here.
-	 */
-	const int timer_index = UBICOM32_VECTOR_TO_TIMER_INDEX(timervector);
-	unsigned int prev = UBICOM32_IO_TIMER->syscom[timer_index];
-	unsigned int next = prev + cycles;
-	int scratchpad3;
-	int diff;
-	int ticks = 1;
-
-	/*
-	 * If the difference is negative, we have missed at least one
-	 * timer tick.
-	 *
-	 * TODO: Decide if we want to "ignore" time (as done below) or
-	 * if we want to process time (unevenly) by calling timer_tick()
-	 * lost_ticks times.
-	 */
-	while (1) {
-		/*
-		 * Set our future time first.
-		 */
-		UBICOM32_IO_TIMER->syscom[timer_index] = next;
-
-		/*
-		 * Then check if we are really set time in the futrue.
-		 */
-		diff = (int)next - (int)UBICOM32_IO_TIMER->sysval;
-		if (diff >= 0) {
-			break;
-		}
-
-		/*
-		 * Oops, we are too slow. Playing catch up.
-		 *
-		 * If the debugger is connected the there is a good
-		 * chance that we lost time because we were in a
-		 * break-point, so in this case we do not print out
-		 * diagnostics.
-		 */
-		asm volatile ("move.4 %0, scratchpad3"
-			      : "=r" (scratchpad3));
-		if ((scratchpad3 & 0x1) == 0) {
-			/*
-			 * No debugger attached, print to the console
-			 */
-			printk(KERN_EMERG "diff: %d, timer has lost %u "
-			       "ticks [rounded up]\n",
-			       -diff,
-			       (unsigned int)((-diff + cycles - 1) / cycles));
-		}
-
-		do {
-			next += cycles;
-			diff = (int)next - (int)UBICOM32_IO_TIMER->sysval;
-			ticks++;
-		} while (diff < 0);
-	}
-	return ticks;
-}
-
-/*
- * sched_clock()
- *	Returns current time in nano-second units.
- *
- * Notes:
- * 1) This is an override for the weak alias in
- * kernel/sched_clock.c.
- * 2) Do not use xtime_lock as this function is
- * sometimes called with xtime_lock held.
- * 3) We use a retry algorithm to ensure that
- * we get a consistent value.
- * 4) sched_clock must be overwritten if IRQ tracing
- * is enabled because the default implementation uses
- * the xtime_lock sequence while holding xtime_lock.
- */
-unsigned long long sched_clock(void)
-{
-	unsigned long long my_jiffies;
-	unsigned long jiffies_top;
-	unsigned long jiffies_bottom;
-
-	do {
-		jiffies_top = jiffies_64 >> 32;
-		jiffies_bottom = jiffies_64 & 0xffffffff;
-	} while (unlikely(jiffies_top != (unsigned long)(jiffies_64 >> 32)));
-
-	my_jiffies = ((unsigned long long)jiffies_top << 32) | (jiffies_bottom);
-	return (my_jiffies - INITIAL_JIFFIES) * (NSEC_PER_SEC / HZ);
-}
-
-/*
- * timer_free()
- *	Free a hardware timer.
- */
-void timer_free(int interrupt)
-{
-	unsigned int bit = interrupt - TIMER_INT(0);
-
-	/*
-	 * The timer had not been allocated.
-	 */
-	BUG_ON(timers & (1 << bit));
-	timers |= (1 << bit);
-}
-
-/*
- * timer_alloc()
- *	Allocate a hardware timer.
- */
-int timer_alloc(void)
-{
-	unsigned int bit = find_first_bit((unsigned long *)&timers, 32);
-	if (!bit) {
-		printk(KERN_WARNING "no more free timers\n");
-		return -1;
-	}
-
-	timers &= ~(1 << bit);
-	return bit + TIMER_INT(0);
-}
-
-/*
- * time_init()
- *	Time init function.
- */
-void time_init(void)
-{
-	/*
-	 * Find the processor node and determine what timers are
-	 * available for us.
-	 */
-	timers = processor_timers();
-	if (timers == 0) {
-		printk(KERN_WARNING "no timers are available for Linux\n");
-		return;
-	}
-
-#ifdef CONFIG_GENERIC_CLOCKEVENTS
-	timer_device_init();
-#else
-	timer_tick_init();
-#endif
-}
diff --git a/target/linux/ubicom32/files/arch/ubicom32/kernel/timer_broadcast.c b/target/linux/ubicom32/files/arch/ubicom32/kernel/timer_broadcast.c
deleted file mode 100644
index 8f0cdc4d5..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/kernel/timer_broadcast.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * arch/ubicom32/kernel/timer_broadcast.c
- *   Implements a dummy clock event for each cpu.
- *
- * Copyright (C) 2008  Paul Mundt
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- *   arch/arm
- *   arch/sh
- */
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/delay.h>
-#include <linux/device.h>
-#include <linux/smp.h>
-#include <linux/jiffies.h>
-#include <linux/percpu.h>
-#include <linux/clockchips.h>
-#include <linux/irq.h>
-
-static DEFINE_PER_CPU(struct clock_event_device, local_clockevent);
-
-/*
- *  The broadcast trick only works when the timer will be used in a periodic mode.
- *  If the user has configured either NO_HZ or HIGH_RES_TIMERS they must have
- *  a per cpu timer.
- */
-#if defined(CONFIG_NO_HZ) || defined(CONFIG_HIGH_RES_TIMERS)
-#error "Tickless and High Resolution Timers require per-CPU local timers: CONFIG_LOCAL_TIMERS"
-#endif
-
-/*
- * local_timer_interrupt()
- *	Used on SMP for local timer interrupt sent via an IPI.
- */
-void local_timer_interrupt(void)
-{
-	struct clock_event_device *dev = &__get_cpu_var(local_clockevent);
-
-	dev->event_handler(dev);
-}
-
-/*
- * dummy_timer_set_next_event()
- *	Cause the timer to go off "cycles" from now.
- */
-static int dummy_timer_set_next_event(unsigned long cycles, struct clock_event_device *dev)
-{
-	return 0;
-}
-
-/*
- * dummy_timer_set_mode()
- *	Do Nothing.
- */
-static void dummy_timer_set_mode(enum clock_event_mode mode,
-				 struct clock_event_device *clk)
-{
-}
-
-/*
- * local_timer_setup()
- *	Adds a clock event for the specified cpu.
- */
-int __cpuinit local_timer_setup(unsigned int cpu)
-{
-	struct clock_event_device *dev = &per_cpu(local_clockevent, cpu);
-
-	dev->name		= "timer-dummy";
-	dev->features		= CLOCK_EVT_FEAT_DUMMY;
-	dev->rating		= 200;
-	dev->mult		= 1;
-	dev->set_mode		= dummy_timer_set_mode;
-	dev->set_next_event	= dummy_timer_set_next_event;
-	dev->broadcast		= smp_timer_broadcast;
-	dev->cpumask		= cpumask_of_cpu(cpu);
-	dev->irq		= -1;
-	printk(KERN_NOTICE "timer[%d]: %s - created\n", dev->irq, dev->name);
-
-	clockevents_register_device(dev);
-	return 0;
-}
diff --git a/target/linux/ubicom32/files/arch/ubicom32/kernel/timer_device.c b/target/linux/ubicom32/files/arch/ubicom32/kernel/timer_device.c
deleted file mode 100644
index 1943cbb9e..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/kernel/timer_device.c
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * arch/ubicom32/kernel/timer_device.c
- *   Implements a Ubicom32 clock device and event devices.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <linux/types.h>
-#include <linux/clockchips.h>
-#include <linux/clocksource.h>
-#include <linux/spinlock.h>
-#include <asm/ip5000.h>
-#include <asm/machdep.h>
-
-#if defined(CONFIG_SMP)
-#include <asm/smp.h>
-#endif
-
-#if defined(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST)
-#define MAX_TIMERS (2 + CONFIG_TIMER_EXTRA_ALLOC)
-#else
-#define MAX_TIMERS (NR_CPUS + CONFIG_TIMER_EXTRA_ALLOC)
-#endif
-
-#if (MAX_TIMERS > 10)
-#error "Ubicom32 only has 10 timers"
-#endif
-
-static unsigned int frequency;
-static struct clock_event_device timer_device_devs[MAX_TIMERS];
-static struct irqaction timer_device_irqs[MAX_TIMERS];
-static int timer_device_next_timer = 0;
-
-DEFINE_SPINLOCK(timer_device_lock);
-
-/*
- * timer_device_set_next_event()
- *	Cause the timer to go off "cycles" from now.
- */
-static int timer_device_set_next_event(unsigned long cycles, struct clock_event_device *dev)
-{
-	timer_set(dev->irq, cycles);
-	return 0;
-}
-
-/*
- * timer_device_set_mode()
- *	Handle the mode switch for a clock event device.
- */
-static void timer_device_set_mode(enum clock_event_mode mode, struct clock_event_device *dev)
-{
-	switch (mode) {
-	case CLOCK_EVT_MODE_SHUTDOWN:
-		/*
-		 * Make sure the vector is disabled
-		 * until the next event is set.
-		 */
-		printk(KERN_NOTICE "timer[%d]: shutdown\n", dev->irq);
-		ldsr_disable_vector(dev->irq);
-		break;
-
-	case CLOCK_EVT_MODE_ONESHOT:
-		/*
-		 * Make sure the vector is disabled
-		 * until the next event is set.
-		 */
-		printk(KERN_NOTICE "timer[%d]: oneshot\n", dev->irq);
-		ldsr_disable_vector(dev->irq);
-		break;
-
-	case CLOCK_EVT_MODE_PERIODIC:
-		/*
-		 * The periodic request is 1 per jiffies
-		 */
-		printk(KERN_NOTICE "timer[%d]: periodic: %d cycles\n",
-			dev->irq, frequency / CONFIG_HZ);
-		timer_set(dev->irq, frequency / CONFIG_HZ);
-		break;
-
-	case CLOCK_EVT_MODE_UNUSED:
-	case CLOCK_EVT_MODE_RESUME:
-		printk(KERN_WARNING "timer[%d]: unimplemented mode: %d\n",
-			dev->irq, mode);
-		break;
-	};
-}
-
-/*
- * timer_device_event()
- *	Call the device's event handler.
- *
- * The pointer is initialized by the generic Linux code
- * to the function to be called.
- */
-static irqreturn_t timer_device_event(int irq, void *dev_id)
-{
-	struct clock_event_device *dev = (struct clock_event_device *)dev_id;
-
-	if (dev->mode == CLOCK_EVT_MODE_PERIODIC) {
-		/*
-		 * The periodic request is 1 per jiffies
-		 */
-		timer_reset(dev->irq, frequency / CONFIG_HZ);
-	} else {
-		/*
-		 * The timer will go off again at the rollover
-		 * point.  We must disable the IRQ to prevent
-		 * getting a spurious interrupt.
-		 */
-		ldsr_disable_vector(dev->irq);
-	}
-
-	if (!dev->event_handler) {
-		printk(KERN_CRIT "no registered event handler\n");
-		return IRQ_HANDLED;
-	}
-
-	dev->event_handler(dev);
-	return IRQ_HANDLED;
-}
-
-/*
- * timer_device_clockbase_read()
- *	Provide a primary clocksource around the sysval timer.
- */
-static cycle_t timer_device_clockbase_read(void)
-{
-	return (cycle_t)UBICOM32_IO_TIMER->sysval;
-}
-
-/*
- * Primary Clock Source Description
- *
- * We use 24 for the shift factor because we want
- * to ensure there are less than 2^24 clocks
- * in a jiffie of 10 ms.
- */
-static struct clocksource timer_device_clockbase = {
-	.name	= "sysval",
-	.rating	= 400,
-	.flags	= CLOCK_SOURCE_IS_CONTINUOUS,
-	.mask	= CLOCKSOURCE_MASK(32),
-	.shift	= 24,
-	.mult	= 0,
-	.read	= timer_device_clockbase_read,
-};
-
-/*
- * timer_device_alloc_event()
- * 	Allocate a timer device event.
- */
-static int timer_device_alloc_event(const char *name, int cpuid, const struct cpumask *cpumask)
-{
-	struct clock_event_device *dev;
-	struct irqaction *action;
-
-	/*
-	 * Are we out of configured timers?
-	 */
-	spin_lock(&timer_device_lock);
-	if (timer_device_next_timer >= MAX_TIMERS) {
-		spin_unlock(&timer_device_lock);
-		printk(KERN_WARNING "out of timer event entries\n");
-		return -1;
-	}
-	dev = &timer_device_devs[timer_device_next_timer];
-	action = &timer_device_irqs[timer_device_next_timer];
-	timer_device_next_timer++;
-	spin_unlock(&timer_device_lock);
-
-	/*
-	 * Now allocate a timer to ourselves.
-	 */
-	dev->irq = timer_alloc();
-	if (dev->irq == -1) {
-		spin_lock(&timer_device_lock);
-		timer_device_next_timer--;
-		spin_unlock(&timer_device_lock);
-		printk(KERN_WARNING "out of hardware timers\n");
-		return -1;
-	}
-
-	/*
-	 * Init the IRQ action structure.  Make sure
-	 * this in place before you register the clock
-	 * event device.
-	 */
-	action->name = name;
-	action->flags = IRQF_DISABLED | IRQF_TIMER;
-	action->handler = timer_device_event;
-	//cpumask_copy(&action->mask, mask);
-	action->dev_id = dev;
-	setup_irq(dev->irq, action);
-	irq_set_affinity(dev->irq, cpumask);
-	ldsr_disable_vector(dev->irq);
-
-	/*
-	 * init clock dev structure.
-	 *
-	 * The min_delta_ns is chosen to ensure that setting next
-	 * event will never be requested with too small of value.
-	 */
-	dev->name = name;
-	dev->rating = timer_device_clockbase.rating;
-	dev->shift = timer_device_clockbase.shift;
-	dev->features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT;
-	dev->set_mode = timer_device_set_mode;
-	dev->set_next_event = timer_device_set_next_event;
-	dev->mult = div_sc(frequency, NSEC_PER_SEC, dev->shift);
-	dev->max_delta_ns = clockevent_delta2ns(0xffffffff, dev);
-	dev->min_delta_ns = clockevent_delta2ns(100, dev);
-	//dev->cpumask = mask;
-	printk(KERN_NOTICE "timer[%d]: %s - created\n", dev->irq, dev->name);
-
-	/*
-	 * Now register the device.
-	 */
-	clockevents_register_device(dev);
-	return dev->irq;
-}
-
-#if defined(CONFIG_LOCAL_TIMERS)
-/*
- * local_timer_setup()
- * 	Allocation function for creating a per cpu local timer.
- */
-int __cpuinit local_timer_setup(unsigned int cpu)
-{
-	return timer_device_alloc_event("timer-cpu", cpu);
-}
-#endif
-
-/*
- * timer_device_init()
- * 	Create and init a generic clock driver for Ubicom32.
- */
-void timer_device_init(void)
-{
-	int i;
-
-	/*
-	 * Get the frequency from the processor device tree node or use
-	 * the default if not available. We will store this as the frequency
-	 * of the timer to avoid future calculations.
-	 */
-	frequency = processor_frequency();
-	if (frequency == 0) {
-		frequency = CLOCK_TICK_RATE;
-	}
-
-	/*
-	 * Setup the primary clock source around sysval.  Linux does not
-	 * supply a Mhz multiplier so convert down to khz.
-	 */
-	timer_device_clockbase.mult =
-		clocksource_khz2mult(frequency / 1000,
-			timer_device_clockbase.shift);
-	if (clocksource_register(&timer_device_clockbase)) {
-		printk(KERN_ERR "timer: clocksource failed to register\n");
-		return;
-	}
-
-	/*
-	 * Always allocate a primary timer.
-	 */
-	timer_device_alloc_event("timer-primary", -1, cpu_all_mask);
-
-#if defined(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST)
-	/*
-	 * If BROADCAST is selected we need to add a broadcast timer.
-	 */
-	timer_device_alloc_event("timer-broadcast", -1, cpu_all_mask);
-#endif
-
-	/*
-	 * Allocate extra timers that are requested.
-	 */
-	for (i = 0; i < CONFIG_TIMER_EXTRA_ALLOC; i++) {
-		timer_device_alloc_event("timer-extra", -1, cpu_all_mask);
-	}
-}
diff --git a/target/linux/ubicom32/files/arch/ubicom32/kernel/timer_tick.c b/target/linux/ubicom32/files/arch/ubicom32/kernel/timer_tick.c
deleted file mode 100644
index 7a2ad4949..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/kernel/timer_tick.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * arch/ubicom32/kernel/timer_tick.c
- *	Impelemets a perodic timer.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- * Copyright (C) 1991, 1992, 1995  Linus Torvalds
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#include <linux/profile.h>
-
-#include <asm/ip5000.h>
-#include <asm/machdep.h>
-#if defined(CONFIG_SMP)
-#include <asm/smp.h>
-#endif
-
-static unsigned int timervector;
-static unsigned int frequency;
-
-/*
- * timer_tick()
- *	Kernel system timer support. Needs to keep up the real-time clock,
- * 	as well as call the "do_timer()" routine every clocktick.
- */
-static irqreturn_t timer_tick(int irq, void *dummy)
-{
-	int ticks;
-
-	BUG_ON(!irqs_disabled());
-	ticks = timer_reset(timervector, frequency);
-
-	write_seqlock(&xtime_lock);
-	do_timer(ticks);
-	write_sequnlock(&xtime_lock);
-
-	update_process_times(user_mode(get_irq_regs()));
-	profile_tick(CPU_PROFILING);
-
-#if defined(CONFIG_SMP)
-	smp_send_timer_all();
-#endif
-	return(IRQ_HANDLED);
-}
-
-/*
- * Data used by setup_irq for the timer.
- */
-static struct irqaction timer_irq = {
-	.name	 = "timer",
-	.flags	 = IRQF_DISABLED | IRQF_TIMER,
-	.handler = timer_tick,
-};
-
-/*
- * timer_tick_init()
- * 	Implements a periodic timer
- *
- * This implementation directly calls the timer_tick() and move
- * the Linux kernel forward.  This is used when the user has not
- * selected GENERIC_CLOCKEVENTS.
- */
-void timer_tick_init(void)
-{
-	/*
-	 * Now allocate a timer to ourselves.
-	 */
-	timervector = timer_alloc();
-	if (timervector == -1) {
-		printk(KERN_WARNING "where did the timer go?\n");
-		return;
-	}
-
-	setup_irq(timervector, &timer_irq);
-
-	/*
-	 * Get the frequency from the processor device tree node or use
-	 * the default if not available. We will store this as the frequency
-	 * of the timer to avoid future calculations.
-	 */
-	frequency = processor_frequency();
-	if (frequency == 0) {
-		frequency = CLOCK_TICK_RATE;
-	}
-	frequency /= CONFIG_HZ;
-
-	printk(KERN_NOTICE "timer will interrupt every: %d cycles\n", frequency);
-	timer_set(timervector, frequency);
-}
diff --git a/target/linux/ubicom32/files/arch/ubicom32/kernel/topology.c b/target/linux/ubicom32/files/arch/ubicom32/kernel/topology.c
deleted file mode 100644
index 0676a1658..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/kernel/topology.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * arch/ubicom32/kernel/topology.c
- *   Ubicom32 architecture sysfs topology information.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#include <linux/init.h>
-#include <linux/smp.h>
-#include <linux/cpu.h>
-#include <linux/cache.h>
-
-static struct cpu cpu_devices[NR_CPUS] __read_mostly;
-
-static int __init topology_init(void)
-{
-	int num;
-
-	for_each_present_cpu(num) {
-		cpu_devices[num].hotpluggable = 0;
-		register_cpu(&cpu_devices[num], num);
-	}
-	return 0;
-}
-
-subsys_initcall(topology_init);
diff --git a/target/linux/ubicom32/files/arch/ubicom32/kernel/traps.c b/target/linux/ubicom32/files/arch/ubicom32/kernel/traps.c
deleted file mode 100644
index 8cb22e25e..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/kernel/traps.c
+++ /dev/null
@@ -1,514 +0,0 @@
-/*
- * arch/ubicom32/kernel/traps.c
- *   Ubicom32 architecture trap handling support.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-/*
- * Sets up all exception vectors
- */
-#include <linux/sched.h>
-#include <linux/signal.h>
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/a.out.h>
-#include <linux/user.h>
-#include <linux/string.h>
-#include <linux/linkage.h>
-#include <linux/init.h>
-#include <linux/ptrace.h>
-#include <linux/kallsyms.h>
-#include <linux/compiler.h>
-#include <linux/stacktrace.h>
-#include <linux/personality.h>
-
-#include <asm/uaccess.h>
-#include <asm/stacktrace.h>
-#include <asm/devtree.h>
-#include <asm/setup.h>
-#include <asm/fpu.h>
-#include <asm/system.h>
-#include <asm/traps.h>
-#include <asm/pgtable.h>
-#include <asm/processor.h>
-#include <asm/machdep.h>
-#include <asm/siginfo.h>
-#include <asm/ip5000.h>
-#include <asm/thread.h>
-
-#define TRAP_MAX_STACK_DEPTH 20
-
-/*
- * These symbols are filled in by the linker.
- */
-extern unsigned long _stext;
-extern unsigned long _etext;
-
-extern unsigned long __ocm_text_run_begin;
-extern unsigned long __data_begin;
-
-extern void show_vmas(struct task_struct *task);
-
-const char *trap_cause_strings[] = {
-	/*0*/	"inst address decode error",
-	/*1*/	"inst sync error",
-	/*2*/	"inst illegal",
-	/*3*/	"src1 address decode error",
-	/*4*/	"dst address decode error",
-	/*5*/	"src1 alignment error",
-	/*6*/	"dst alignment error",
-	/*7*/	"src1 sync error",
-	/*8*/	"dst sync error",
-	/*9*/	"DCAPT error",
-	/*10*/	"inst range error",
-	/*11*/	"src1 range error",
-	/*12*/	"dst range error",
-};
-
-/*
- * The device tree trap node definition.
- */
-struct trapnode {
-	struct devtree_node dn;
-	unsigned int intthread;
-};
-
-static struct trapnode *tn;;
-
-/*
- * trap_interrupt_handler()
- *	Software Interrupt to ensure that a trap is serviced.
- */
-static irqreturn_t trap_interrupt_handler(int irq, void *dummy)
-{
-	/* Do Nothing */
-	return IRQ_HANDLED;
-}
-
-/*
- * Data used by setup_irq for the timer.
- */
-static struct irqaction trap_irq = {
-	.name	 = "trap",
-	.flags	 = IRQF_DISABLED,
-	.handler = trap_interrupt_handler,
-};
-
-/*
- * trap_cause_to_str()
- *	Convert a trap_cause into a series of printk
- */
-static void trap_cause_to_str(long status)
-{
-	int bit;
-
-	if ((status & ((1 << TRAP_CAUSE_TOTAL) - 1)) == 0) {
-		printk(KERN_NOTICE "decode: UNKNOWN CAUSES\n");
-		return;
-	}
-
-	for (bit = 0; bit < TRAP_CAUSE_TOTAL; bit++) {
-		if (status & (1 << bit)) {
-			printk(KERN_NOTICE "\tdecode: %08x %s\n",
-			       1 << bit, trap_cause_strings[bit]);
-		}
-	}
-}
-
-/*
- * trap_print_information()
- *	Print the cause of the trap and additional info.
- */
-static void trap_print_information(const char *str, struct pt_regs *regs)
-{
-	printk(KERN_WARNING "\n");
-
-	if (current) {
-		printk(KERN_WARNING "Process %s (pid: %d)\n",
-			current->comm, current->pid);
-	}
-
-	if (current && current->mm) {
-		printk(KERN_NOTICE "text = 0x%p-0x%p  data = 0x%p-0x%p\n"
-			KERN_NOTICE "bss = 0x%p-0x%p   user-stack = 0x%p\n"
-			KERN_NOTICE "\n",
-			(void *)current->mm->start_code,
-			(void *)current->mm->end_code,
-			(void *)current->mm->start_data,
-			(void *)current->mm->end_data,
-			(void *)current->mm->end_data,
-			(void *)current->mm->brk,
-			(void *)current->mm->start_stack);
-	}
-
-	printk(KERN_WARNING "%s: Causes: 0x%08x\n", str,
-			(unsigned int)regs->trap_cause);
-	trap_cause_to_str(regs->trap_cause);
-	show_regs(regs);
-	show_stack(NULL, (unsigned long *)regs->an[7]);
-	printk(KERN_NOTICE "--- End Trap --- \n");
-}
-
-/*
- * dump_stack()
- *	Dump the stack of the current task.
- */
-void dump_stack(void)
-{
-	show_stack(NULL, NULL);
-}
-EXPORT_SYMBOL(dump_stack);
-
-/*
- * show_stack()
- *	Print out information from the current stack.
- */
-void show_stack(struct task_struct *task, unsigned long *sp)
-{
-	/*
-	 *  Allocate just enough entries on the stack.
-	 */
-	unsigned int calls[TRAP_MAX_STACK_DEPTH];
-	unsigned long code_start;
-	unsigned long code_end;
-	unsigned long ocm_code_start = (unsigned long)&__ocm_text_run_begin;
-	unsigned long ocm_code_end = (unsigned long)&__data_begin;
-	unsigned long stack_end = (unsigned long)(current->stack + THREAD_SIZE - 8);
-	unsigned long stack = (unsigned long)sp;
-	int kernel_stack = 1;
-
-	processor_dram(&code_start, &code_end);
-
-	/*
-	 * Which task are we talking about.
-	 */
-	if (!task) {
-		task = current;
-	}
-
-	/*
-	 * Find the stack for the task if one was not specified.  Otherwise
-	 * use the specified stack.
-	 */
-	if (!stack) {
-		if (task != current) {
-			stack = task->thread.sp;
-			stack_end = (unsigned long)task->stack + THREAD_SIZE - 8;
-		} else {
-			asm volatile (
-				"move.4		%0, SP		\n\t"
-				: "=r" (stack)
-			);
-		}
-	}
-
-	printk(KERN_NOTICE "Starting backtrace: PID %d '%s'\n",
-			task->pid, task->comm);
-
-	/*
-	 * We do 2 passes the first pass is Kernel stack is the second
-	 * User stack.
-	 */
-	while (kernel_stack) {
-		unsigned long *handle;
-		unsigned int i, idx = 0;
-		struct pt_regs *pt = task_pt_regs(task);
-
-		/*
-		 * If the task is in user mode, reset the start
-		 * and end values for text.
-		 */
-		if (__user_mode(stack)) {
-			if (!(task->personality & FDPIC_FUNCPTRS)) {
-				printk(KERN_NOTICE "  User Stack:\n");
-				code_start = task->mm->start_code;
-				code_end = task->mm->end_code;
-			} else {
-				printk(KERN_NOTICE "  User Stack (fdpic):\n");
-				show_vmas(task);
-			}
-			stack_end = task->mm->start_stack;
-			ocm_code_end = ocm_code_start = 0;
-			kernel_stack = 0;
-		} else {
-			printk(KERN_NOTICE "  Kernel Stack:\n");
-		}
-
-		/*
-		 * Collect the stack back trace information.
-		 */
-		printk("    code[0x%lx-0x%lx]", code_start, code_end);
-		if (ocm_code_start) {
-			printk(" ocm_code[0x%lx-0x%lx]",
-			       ocm_code_start, ocm_code_end);
-		}
-		printk("\n    stack[0x%lx-0x%lx]\n", stack, stack_end);
-
-		handle = (unsigned long*)stack;
-		while (idx < TRAP_MAX_STACK_DEPTH) {
-			calls[idx] = stacktrace_iterate(&handle,
-					code_start, code_end,
-					ocm_code_start, ocm_code_end,
-					(unsigned long)stack, stack_end);
-			if (calls[idx] == 0) {
-				break;
-			}
-			idx++;
-		}
-
-		/*
-		 * Now print out the data.
-		 */
-		printk(KERN_NOTICE "  CALL && CALLI on stack:");
-		for (i = 0; i < idx; i++) {
-			printk("%s0x%x, ", (i & 0x3) == 0 ?  "\n    " : "",
-					calls[i]);
-		}
-		printk(idx == TRAP_MAX_STACK_DEPTH ? "...\n" : "\n");
-
-		/*
-		 * If we are doing user stack we are done
-		 */
-		if (!kernel_stack) {
-			break;
-		}
-
-		/*
-		 * Does this kernel stack have a mm (i.e. is it user)
-		 */
-		if (!task->mm) {
-			printk("No mm for userspace stack.\n");
-			break;
-		}
-		/*
-		 * Get the user-mode stack (if any)
-		 */
-		stack = pt->an[7];
-		printk(KERN_NOTICE "Userspace stack at 0x%lx frame type %d\n",
-				stack, (int)pt->frame_type);
-		if (!__user_mode(stack)) {
-			break;
-		}
-	}
-}
-
-/*
- * die_if_kernel()
- *	Determine if we are in kernel mode and if so print stuff out and die.
- */
-void die_if_kernel(char *str, struct pt_regs *regs, long trap_cause)
-{
-	unsigned int s3value;
-
-	if (user_mode(regs)) {
-		return;
-	}
-
-	console_verbose();
-	trap_print_information(str, regs);
-
-	/*
-	 * If the debugger is attached via the hardware mailbox protocol,
-	 * go into an infinite loop and the debugger will figure things out.
-	 */
-	asm volatile (
-	      "move.4 %0, scratchpad3"
-	      : "=r" (s3value)
-	);
-	if (s3value) {
-		asm volatile("1:	jmpt.t 1b");
-	}
-
-	/*
-	 * Set the debug taint value.
-	 */
-	add_taint(TAINT_DIE);
-	do_exit(SIGSEGV);
-}
-
-/*
- * trap_handler()
- *	Handle traps.
- *
- * Traps are treated as interrupts and registered with the LDSR.  When
- * the LDSR takes the interrupt, it will determine if a trap has occurred
- * and service the trap prior to servicing the interrupt.
- *
- * This function is directly called by the LDSR.
- */
-void trap_handler(int irq, struct pt_regs *regs)
-{
-	int sig = SIGSEGV;
-	siginfo_t info;
-	unsigned int trap_cause = regs->trap_cause;
-
-	BUG_ON(!irqs_disabled());
-
-	/*
-	 * test if in kernel and die.
-	 */
-	die_if_kernel("Kernel Trap", regs, trap_cause);
-
-	/*
-	 * User process problem, setup a signal for this process
-	 */
-	if ((trap_cause & (1 << TRAP_CAUSE_DST_RANGE_ERR)) ||
-	    (trap_cause & (1 << TRAP_CAUSE_SRC1_RANGE_ERR)) ||
-	    (trap_cause & (1 << TRAP_CAUSE_I_RANGE_ERR))) {
-		sig = SIGSEGV;
-		info.si_code = SEGV_MAPERR;
-	} else if ((trap_cause & (1 << TRAP_CAUSE_DST_MISALIGNED)) ||
-		   (trap_cause & (1 << TRAP_CAUSE_SRC1_MISALIGNED))) {
-		sig = SIGBUS;
-		info.si_code = BUS_ADRALN;
-	} else if ((trap_cause & (1 << TRAP_CAUSE_DST_DECODE_ERR)) ||
-		   (trap_cause & (1 << TRAP_CAUSE_SRC1_DECODE_ERR))) {
-		sig = SIGILL;
-		info.si_code = ILL_ILLOPN;
-	} else if ((trap_cause & (1 << TRAP_CAUSE_ILLEGAL_INST))) {
-		/*
-		 * Check for software break point and if found signal trap
-		 * not illegal instruction.
-		 */
-		unsigned long instruction;
-		if (between(regs->pc, KERNELSTART, memory_end) &&
-			(regs->pc & 3) == 0 &&
-			get_user(instruction, (unsigned long *)regs->pc) == 0) {
-
-			/*
-			 * This used to be 0xaabbccdd but it turns out
-			 * that is now valid in ubicom32v4 isa so we
-			 * have switched to 0xfabbccdd
-			 */
-			if ((instruction == 0xfabbccdd) ||
-			    (instruction == 0xaabbccdd)) {
-				sig = SIGTRAP;
-				info.si_code = TRAP_BRKPT;
-				goto send_signal;
-			}
-		}
-		sig = SIGILL;
-		info.si_code = ILL_ILLOPC;
-	} else if ((trap_cause & (1 << TRAP_CAUSE_I_DECODE_ERR))) {
-		sig = SIGILL;
-		info.si_code = ILL_ILLOPC;
-	} else if ((trap_cause & (1 << TRAP_CAUSE_DCAPT))) {
-		sig = SIGTRAP;
-		info.si_code = TRAP_TRACE;
-	}
-
-	/*
-	 * Print a trap information block to the console, do not
-	 * print this above the case because we don't want it
-	 * printed for software break points.
-	 */
-	trap_print_information("User Trap", regs);
-
-send_signal:
-
-	force_sig_info(sig, &info, current);
-
-	/*
-	 * Interrupts are disabled, re-enable them now.
-	 */
-	if (!irqs_disabled()) {
-		printk(KERN_EMERG "interrupts enabled on exit, irq=%d, regs=%p",
-				irq, regs);
-		BUG();
-	}
-}
-
-/*
- * trap_init_interrupt()
- *	We need a 2nd trap handling init that will occur after init_IRQ().
- */
-void __init trap_init_interrupt(void)
-{
-	int err;
-	unsigned char tirq;
-	struct devtree_node *dn = (struct devtree_node *)tn;
-
-	/*
-	 * Now setup the Software IRQ so that if a trap occurs the LDSR
-	 * is started.  The irq is there just to "force" the LDSR to run.
-	 */
-	if (!tn) {
-		printk(KERN_WARNING "trap_init_interrupt skipped.\n");
-		return;
-	}
-
-	err = devtree_irq(dn, NULL, &tirq);
-	if (err) {
-		printk(KERN_WARNING "error obtaining trap irq value: %d\n",
-			err);
-		return;
-	}
-
-	if (tirq == DEVTREE_IRQ_NONE) {
-		printk(KERN_WARNING "trap irq not available: %d\n", tirq);
-		return;
-	}
-
-	err = setup_irq(tirq, &trap_irq);
-	if (err) {
-		printk(KERN_WARNING "trap irq setup failed: %d\n", err);
-		return;
-	}
-
-	/*
-	 * Let ultra know which thread is handling the traps and
-	 * what the interrupt to use is.
-	 */
-	tn->intthread = ldsr_get_threadid();
-
-	/*
-	 * Tell the LDSR about our IRQ so that it will unsuspend
-	 * if one occurs while waiting for the per thread lock.
-	 */
-	ldsr_set_trap_irq(tirq);
-}
-
-/*
- * trap_init()
- *	init trap handling
- *
- * Trap handling is done through the ldsr.  Every time an interrupt
- * occurs, the LDSR looks for threads that are listed in the TRAP
- * register and forces a call to the trap handler.
- */
-void __init trap_init(void)
-{
-	/*
-	 * If we do not have a trap node in the device tree, we leave the fault
-	 * handling to the underlying hardware.
-	 */
-	tn = (struct trapnode *)devtree_find_node("traps");
-	if (!tn) {
-		printk(KERN_WARNING "traps are not handled by linux\n");
-		return;
-	}
-}
diff --git a/target/linux/ubicom32/files/arch/ubicom32/kernel/uaccess.c b/target/linux/ubicom32/files/arch/ubicom32/kernel/uaccess.c
deleted file mode 100644
index 2fe5f5f87..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/kernel/uaccess.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * arch/ubicom32/include/asm/uaccess.c
- *   User space memory access functions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/string.h>
-#include <linux/module.h>
-
-#include <asm/segment.h>
-#include <asm/uaccess.h>
-
-extern int _stext, _etext, _sdata, _edata, _sbss, _ebss, _end;
-
-/*
- * __access_ok()
- *	Check that the address is in the current processes.
- *
- * NOTE: The kernel uses "pretend" user addresses that wind
- * up calling access_ok() so this approach has only marginal
- * value because you wind up with lots of false positives.
- */
-int __access_ok(unsigned long addr, unsigned long size)
-{
-	// struct vm_area_struct *vma;
-
-	/*
-	 * Don't do anything if we are not a running system yet.
-	 */
-	if (system_state != SYSTEM_RUNNING) {
-		return 1;
-	}
-
-	/*
-	 * It appears that Linux will call this function even when we are not
-	 * in the context of a user space application that has a VM address
-	 * space.  So we must check that current and mm are valid before
-	 * performing the check.
-	 */
-	if ((!current) || (!current->mm)) {
-		return 1;
-	}
-
-	/*
-	 * We perform some basic checks on the address to ensure that it
-	 * is at least within the range of DRAM.
-	 */
-	if ((addr < (int)&_etext) || (addr > memory_end)) {
-		printk(KERN_WARNING "pid=%d[%s]: range [%lx - %lx] not in memory area: [%lx - %lx]\n",
-			current->pid, current->comm,
-			addr, addr + size,
-			memory_start, memory_end);
-		return 0;
-	}
-
-	/*
-	 * For nommu Linux we can check this by looking at the allowed
-	 * memory map for the process.
-	 *
-	 * TODO: Since the kernel passes addresses in it's own space as though
-	 * they were user address, we can not validate the addresses this way.
-	 */
-#if 0
-	if (!down_read_trylock(&current->mm->mmap_sem)) {
-		return 1;
-	}
-	vma = find_vma(current->mm, addr);
-	if (!vma) {
-		up_read(&current->mm->mmap_sem);
-		printk(KERN_WARNING "pid=%d[%s]: possible invalid acesss on range: [%lx - %lx]\n",
-				current->pid, current->comm, addr, addr + size);
-		return 1;
-	}
-	if ((addr + size) > vma->vm_end) {
-		up_read(&current->mm->mmap_sem);
-		printk(KERN_WARNING "pid=%d[%s]: possible invalid length on range: [%lx - %lx]\n",
-				current->pid, current->comm, addr, addr + size);
-		return 1;
-	}
-	up_read(&current->mm->mmap_sem);
-#endif
-	return 1;
-}
-
-EXPORT_SYMBOL(__access_ok);
diff --git a/target/linux/ubicom32/files/arch/ubicom32/kernel/ubicom32_context_switch.S b/target/linux/ubicom32/files/arch/ubicom32/kernel/ubicom32_context_switch.S
deleted file mode 100644
index 08db4c057..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/kernel/ubicom32_context_switch.S
+++ /dev/null
@@ -1,359 +0,0 @@
-/*
- * arch/ubicom32/kernel/ubicom32_context_switch.S
- *	Implements context switch and return functions.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <linux/sys.h>
-#include <linux/linkage.h>
-#include <asm/asm-offsets.h>
-#include <asm/ubicom32-common.h>
-#include <asm/ip5000.h>
-#include <asm/range-protect.h>
-
-/*
- * begin_restore_context()
- *	Restore most of the context from sp (struct pt_reg *)
- *
- * This *can* be called without the global atomic lock. (because sp is
- * not restored!)  Only d15 and a3 are allowed to be used after this
- * before calling complete_restore_context
- */
-.macro begin_restore_context
-	move.4	d0, PT_D0(sp)
-	move.4	d1, PT_D1(sp)
-	move.4	d2, PT_D2(sp)
-	move.4	d3, PT_D3(sp)
-	move.4	d4, PT_D4(sp)
-	move.4	d5, PT_D5(sp)
-	move.4	d6, PT_D6(sp)
-	move.4	d7, PT_D7(sp)
-	move.4	d8, PT_D8(sp)
-	move.4	d9, PT_D9(sp)
-	move.4	d10, PT_D10(sp)
-	move.4	d11, PT_D11(sp)
-	move.4	d12, PT_D12(sp)
-	move.4	d13, PT_D13(sp)
-	move.4	d14, PT_D14(sp)
-;;	move.4	d15, PT_D15(sp)
-	move.4	a0, PT_A0(sp)
-	move.4	a1, PT_A1(sp)
-	move.4	a2, PT_A2(sp)
-;;	move.4	a3, PT_A3(sp)
-	move.4	a4, PT_A4(sp)
-	move.4	a5, PT_A5(sp)
-	move.4	a6, PT_A6(sp)
-	move.4	acc0_hi, PT_ACC0HI(sp)
-	move.4	acc0_lo, PT_ACC0LO(sp)
-	move.4	mac_rc16, PT_MAC_RC16(sp)
-	move.4	acc1_hi, PT_ACC1HI(sp)
-	move.4	acc1_lo, PT_ACC1LO(sp)
-	move.4	source3, PT_SOURCE3(sp)
-	move.4	int_mask0, PT_INT_MASK0(sp)
-	move.4	int_mask1, PT_INT_MASK1(sp)
-.endm
-
-/*
- * complete_restore_context()
- *	Completely restore the context from sp (struct pt_reg *)
- *
- * Note: Recovered PC and CSR are saved on the stack and are to be
- * popped off before returning.
- */
-.macro complete_restore_context
-	move.4	a3, sp
-	move.4	d15, PT_D15(sp)
-	move.4	sp, PT_SP(a3)		; Recover Stack pointer from save area
-	move.4	-4(sp)++, PT_PC(a3)	; Recover saved PC and save to stack
-	move.4	-4(sp)++, PT_CSR(a3)	; Recover saved csr and save to stack
-	move.4	a3, PT_A3(a3)
-.endm
-
-/*
- * old restore_context macro
- */
-.macro restore_context
-	begin_restore_context
-	complete_restore_context
-.endm
-
-/*
- * ldsr_thread_enable_interrupts()
- *	An assembly version of the enable interrupts function.
- *
- * The stack is fair game but all registers MUST be preserved.
- *
- */
-.macro ldsr_thread_enable_interrupts
-	move.4	-4(sp)++, d3	; Push d3
-	move.4	-4(sp)++, a3	; Push a3
-
-	/*
-	 * Read the ROSR and obtain ~(1 << tid)
-	 */
-	lsr.4	d3, rosr, #0x2	; Move the thread portion of ROSR into d3
-	lsl.4	d3, #1, d3	; perform a (1 << tid)
-	not.4	d3, d3		; Negate the value of d3 == ~(1 << threadid)
-
-	/*
-	 * Get the value of the ldsr_soft_irq_mask
-	 */
-	moveai	a3, #%hi(ldsr_soft_irq_mask)
-	move.4	a3, %lo(ldsr_soft_irq_mask)(a3)
-
-	/*
-	 * Now re-enable interrupts for this thread and then
-	 * wakeup the LDSR.
-	 */
-	and.4	scratchpad1, scratchpad1, d3
-	move.4	int_set0, a3
-
-	/*
-	 * Restore the registers.
-	 */
-	move.4	a3, (sp)4++
-	move.4	d3, (sp)4++
-.endm
-
-/*
- * ret_from_interrupt_to_kernel()
- *	RFI function that is where do_IRQ() returns to if the thread was
- *	in kernel space.
- */
-	.section .text.ret_from_interrupt_to_kernel, "ax", @progbits
-	.global ret_from_interrupt_to_kernel
-ret_from_interrupt_to_kernel:
-	begin_restore_context		; Restore the thread context
-	atomic_lock_acquire		; Enter critical section
-	complete_restore_context	; Restore the thread context
-	atomic_lock_release		; Leave critical section
-	ldsr_thread_enable_interrupts	; enable the threads interrupts
-	move.4	csr, (sp)4++		; Restore csr from the stack
-	ret	(sp)4++
-
-/*
- * ret_from_interrupt_to_user()
- *	RFI function that is where do_IRQ() returns to if the thread was
- *	in user space.
- *
- * TODO: Do we really need the critical section handling in this code?
- *
- */
-	.section .text.ret_from_interrupt_to_user, "ax", @progbits
-	.global ret_from_interrupt_to_user
-ret_from_interrupt_to_user:
-	ldsr_thread_enable_interrupts			; enable the threads interrupts
-	/*
-	 * Set a1 to the thread info pointer, no need to save it as we are
-	 * restoring userspace and will never return
-	 */
-	movei	d0, #(~(ASM_THREAD_SIZE-1))
-	and.4	a1, sp, d0
-
-	/*
-	 * Test if the scheduler needs to be called.
-	 */
-	btst	TI_FLAGS(a1), #ASM_TIF_NEED_RESCHED
-	jmpeq.t	2f
-	call	a5, schedule			; Call the scheduler. I will come back here.
-
-	/*
-	 * See if we have pending signals and call do_signal
-	 * if needed.
-	 */
-2:
-	btst	TI_FLAGS(a1), #ASM_TIF_SIGPENDING	; Any signals needed?
-	jmpeq.t	1f
-
-	/*
-	 * Now call do_signal()
-	 */
-	move.4	d0, #0					; oldset pointer is NULL
-	move.4	d1, sp					; d1 is the regs pointer
-	call	a5, do_signal				; Call do_signal()
-
-	/*
-	 * Back from do_signal(), re-enter critical section.
-	 */
-1:
-	begin_restore_context				; Restore the thread context
-	atomic_lock_acquire				; Enter critical section
-	call a3, __complete_and_return_to_userspace	; jump to unprotected section
-
-/*
- * restore_all_registers()
- *
- * restore_all_registers will be the alternate exit route for
- * preempted processes that have called a signal handler
- * and are returning back to user space.
- */
-	.section .text.restore_all_registers, "ax", @progbits
-	.global restore_all_registers
-restore_all_registers:
-	begin_restore_context			; Restore the thread context
-	atomic_lock_acquire			; Enter critical section
-	call a3, __complete_and_return_to_userspace
-
-/*
- * __complete_and_return_to_userspace
- *
- * restores the second half of the context and returns
- * You must have the atomic lock when you call this function
- */
-	.section .kernel_unprotected, "ax", @progbits
-__complete_and_return_to_userspace:
-	disable_kernel_ranges_for_current d15	; disable kernel ranges
-	complete_restore_context		; restore previous context
-	atomic_lock_release			; Leave critical section
-	move.4	csr, (sp)4++			; Restore csr from the stack
-	ret	(sp)4++
-
-/*
- * ret_from_fork()
- *	Called on the child's return from fork system call.
- */
-	.section .text.ret_from_fork, "ax", @progbits
-	.global ret_from_fork
-ret_from_fork:
-	;;;  d0 contains the arg for schedule_tail
-	;;;  the others we don't care about as they are in PT_REGS (sp)
-	call   a5, schedule_tail
-
-	atomic_lock_acquire		; Enter critical section
-
-	move.4	a3, sp
-	move.4	d0, PT_D0(a3)		; Restore D0
-	move.4	d1, PT_D1(a3)		; Restore D1
-	move.4	d2, PT_D2(a3)		; Restore D2
-	move.4	d3, PT_D3(a3)		; Restore D3
-	move.4	d10, PT_D10(a3)		; Restore D10
-	move.4	d11, PT_D11(a3)		; Restore D11
-	move.4	d12, PT_D12(a3)		; Restore D12
-	move.4	d13, PT_D13(a3)		; Restore D13
-	move.4	a1, PT_A1(a3)		; Restore A1
-	move.4	a2, PT_A2(a3)		; Restore A2
-	move.4	a5, PT_A5(a3)		; Restore A5
-	move.4	a6, PT_A6(a3)		; Restore A6
-	;;  I think atomic_lock_acquire could be moved here..
-	move.4	sp, PT_SP(a3)		; Restore sp
-	move.4	a4, PT_PC(a3)		; Restore pc in register a4
-	move.4	PT_FRAME_TYPE(a3), #0	; Clear frame_type to indicate it is invalid.
-
-#ifdef CONFIG_PROTECT_KERNEL
-	call a3, __ret_from_fork_bottom_half
-	.section .kernel_unprotected, "ax", @progbits
-__ret_from_fork_bottom_half:
-	disable_kernel_ranges_for_current d15
-#endif
-	atomic_lock_release		; Leave critical section
-	calli	a4, 0(a4)		; Return.
-
-/*
- * __switch_to()
- *
- * Call with:
- *	void *__switch_to(struct task_struct *prev, struct thread_struct *prev_switch,
- *				struct thread_struct *next_switch)
- */
-	.section .text.__switch_to, "ax", @progbits
-	.global __switch_to
-__switch_to:
-
-	/*
-	 * Set up register a3 to point to save area.
-	 */
-	movea	a3, d1			; a3 now holds prev_switch
-	move.4	(a3)4++, d10
-	move.4	(a3)4++, d11
-	move.4	(a3)4++, d12
-	move.4	(a3)4++, d13
-	move.4	(a3)4++, a1
-	move.4	(a3)4++, a2
-	move.4	(a3)4++, a5
-	move.4	(a3)4++, a6
-	move.4	(a3)4++, a7
-
-	/*
-	 * Set up register a3 to point to restore area.
-	 */
-	movea	a3, d2			; a3 now holds next_switch
-	move.4	d10 , (a3)4++
-	move.4	d11 , (a3)4++
-	move.4	d12 , (a3)4++
-	move.4	d13 , (a3)4++
-	move.4	a1 , (a3)4++
-	move.4	a2 , (a3)4++
-	move.4	a5 , (a3)4++
-	move.4	a6 , (a3)4++
-	move.4	a7 , (a3)4++
-
-	/*
-	 * Load the sw_ksp with the proper thread_info pointer.
-	 */
-	movei	d15, #(~(ASM_THREAD_SIZE-1))
-	and.4	a3, sp, d15		; a3 now has the thread info pointer
-	moveai	a4, #%hi(sw_ksp)
-	lea.1	a4, %lo(sw_ksp)(a4)	; a4 now has the base address of sw_ksp array
-	lsr.4	d15, ROSR, #2		; Thread number - bit's 6 through 31 are zeroes anyway.
-	move.4	(a4, d15), a3		; Load the thread info pointer into the hw_ksp array..
-
-	/*
-	 * We are done with context switch. Time to return..
-	 */
-	calli	a5, 0(a5)
-	.size __switch_to, . - __switch_to
-
-/*
- * ubicom32_emulate_insn()
- *	Emulates the instruction.
- *
- * Call with:
- *	unsigned int ubicom32_emulate_insn(int source1, int source2, int source3, int *save_acc, int *save_csr);
- */
-	.section .text.ubicom32_emulate_insn, "ax", @progbits
-	.global ubicom32_emulate_insn
-	.global trap_emulate
-ubicom32_emulate_insn:
-	movea	a3, d3		; a3 holds save_acc pointer
-	movea	a4, d4		; a4 hods save_csr pointer
-	move.4	source3, d2
-	move.4	acc0_lo, (a3)
-	move.4	acc0_hi, 4(a3)
-	move.4	acc1_lo, 8(a3)
-	move.4	acc1_hi, 12(a3)
-	move.4	mac_rc16, 16(a3)
-	move.4	CSR, (a4)
-	setcsr_flush 0
-
-trap_emulate:
-	move.4	d0, d1
-	setcsr_flush 0
-	move.4	(a4), CSR	; Save csr
-	move.4	(a3), acc0_lo
-	move.4	4(a3), acc0_hi
-	move.4	8(a3), acc1_lo
-	move.4	12(a3), acc1_hi
-	move.4	16(a3), mac_rc16
-	ret	a5
-	.size ubicom32_emulate_insn, . - ubicom32_emulate_insn
diff --git a/target/linux/ubicom32/files/arch/ubicom32/kernel/ubicom32_ksyms.c b/target/linux/ubicom32/files/arch/ubicom32/kernel/ubicom32_ksyms.c
deleted file mode 100644
index ea7eb1575..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/kernel/ubicom32_ksyms.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * arch/ubicom32/kernel/ubicom32_ksyms.c
- *   Ubicom32 architecture compiler support and misc symbols.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <linux/module.h>
-#include <linux/linkage.h>
-#include <linux/sched.h>
-#include <linux/string.h>
-#include <linux/mm.h>
-#include <linux/user.h>
-#include <linux/elfcore.h>
-#include <linux/in6.h>
-#include <linux/interrupt.h>
-#include <linux/io.h>
-#include <linux/semaphore.h>
-
-#include <asm/setup.h>
-#include <asm/machdep.h>
-#include <asm/pgalloc.h>
-#include <asm/irq.h>
-#include <asm/checksum.h>
-#include <asm/current.h>
-
-/* platform dependent support */
-
-EXPORT_SYMBOL(__ioremap);
-EXPORT_SYMBOL(iounmap);
-
-EXPORT_SYMBOL(ip_fast_csum);
-
-
-/* Networking helper routines. */
-EXPORT_SYMBOL(csum_partial_copy_nocheck);
-
-/* The following are special because they're not called
-   explicitly (the C compiler generates them).  Fortunately,
-   their interface isn't gonna change any time soon now, so
-   it's OK to leave it out of version control.  */
-EXPORT_SYMBOL(memcpy);
-EXPORT_SYMBOL(memset);
-EXPORT_SYMBOL(memmove);
-
-#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) || __GNUC__ > 4
-/*
- * libgcc functions - functions that are used internally by the
- * compiler...  (prototypes are not correct though, but that
- * doesn't really matter since they're not versioned).
- */
-extern void __ashldi3(void);
-extern void __ashrdi3(void);
-extern void __divsi3(void);
-extern void __divdi3(void);
-extern void __lshrdi3(void);
-extern void __modsi3(void);
-extern void __muldi3(void);
-extern void __udivsi3(void);
-extern void __umodsi3(void);
-
-/* gcc lib functions */
-EXPORT_SYMBOL(__ashldi3);
-EXPORT_SYMBOL(__ashrdi3);
-EXPORT_SYMBOL(__divsi3);
-EXPORT_SYMBOL(__divdi3);
-EXPORT_SYMBOL(__lshrdi3);
-EXPORT_SYMBOL(__modsi3);
-EXPORT_SYMBOL(__muldi3);
-EXPORT_SYMBOL(__udivsi3);
-EXPORT_SYMBOL(__umodsi3);
-#else
-extern void __libgcc_udivmodsi(void);
-extern void __libgcc_divmodsi(void);
-
-EXPORT_SYMBOL(__libgcc_udivmodsi);
-EXPORT_SYMBOL(__libgcc_divmodsi);
-#endif
diff --git a/target/linux/ubicom32/files/arch/ubicom32/kernel/ubicom32_syscall.S b/target/linux/ubicom32/files/arch/ubicom32/kernel/ubicom32_syscall.S
deleted file mode 100644
index 870f66c8f..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/kernel/ubicom32_syscall.S
+++ /dev/null
@@ -1,694 +0,0 @@
-/*
- * arch/ubicom32/kernel/ubicom32_syscall.S
- *	<TODO: Replace with short file description>
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <linux/sys.h>
-#include <linux/linkage.h>
-#include <linux/unistd.h>
-
-#include <asm/ubicom32-common.h>
-#include <asm/thread_info.h>
-#include <asm/asm-offsets.h>
-#include <asm/range-protect.h>
-
-/*
- * __old_system_call()
- */
-	.section .old_syscall_entry.text, "ax", @progbits
-#ifdef CONFIG_OLD_40400010_SYSTEM_CALL
-__old_system_call:
-	call a3, system_call
-	.size __old_system_call, . - __old_system_call ;
-#else
-	/*
-	 * something that will crash the userspace application, but
-	 * should not take down the kernel, if protection is enabled
-	 * this will never even get executed.
-	 */
-	.long	0xFABBCCDE			; illegal instruction
-	bkpt #-1				; we will never get here
-#endif
-
-/*
- * system_call()
- */
-	.section .syscall_entry.text, "ax", @progbits
-	.global system_call
-system_call:
-	/*
-	 * Regular ABI rules for function calls apply for syscall.  d8 holds
-	 * the syscall number. We will use that to index into the syscall table.
-	 * d0 - d5 hold the parameters.
-	 *
-	 * First we get the current thread_info and swap to the kernel stack.
-	 * This is done by reading the current thread and looking up the ksp
-	 * from the sw_ksp array and storing it in a3.
-	 *
-	 * Then we reserve space for the syscall context a struct pt_regs and
-	 * save it using a4 initially and later as sp.
-	 * Once sp is set to the kernel sp we can leave the critical section.
-	 *
-	 * For the user case the kernel stack will have the following layout.
-	 *
-	 *  a3		 ksp[0] +-----------------------+
-	 *			| Thread info area	|
-	 *			| struct thread_info	|
-	 *			+-----------------------+
-	 *			:			:
-	 *			|   Kernel Stack Area	|
-	 *			|			|
-	 *  a4 / sp >>>		+-----------------------+
-	 *			| Context save area	|
-	 *			| struct pt_reg		|
-	 *  ksp[THREAD_SIZE-8]  +-----------------------+
-	 *			| 8 Byte Buffer Zone	|
-	 *  ksp[THREAD_SIZE]    +-----------------------+
-
-	 *
-	 * For kernel syscalls the layout is as follows.
-	 *
-	 *  a3		 ksp[0] +-----------------------+
-	 *			| Thread info area	|
-	 *			| struct thread_info	|
-	 *			+-----------------------+
-	 *			:			:
-	 *			|   Kernel Stack Area	|
-	 *			|			|
-	 *  a4 / sp >>>		+-----------------------+
-	 *			| Context save area	|
-	 *			| struct pt_reg		|
-	 * sp at syscall entry  +-----------------------+
-	 *			| Callers Kernel Stack	|
-	 *			:			:
-	 *
-	 * Once the context is saved we optionally call syscall_trace and setup
-	 * the exit routine and jump to the syscall.
-	 */
-
-	/*
-	 * load the base address for sw_ksp into a3
-	 * Note.. we cannot access it just yet as protection is still on.
-	 */
-	moveai	a3, #%hi(sw_ksp)
-	lea.1	a3, %lo(sw_ksp)(a3)
-
-	/*
-	 * Enter critical section .
-	 *
-	 * The 'critical' aspects here are the switching the to the ksp and
-	 * changing the protection registers, these both use per thread
-	 * information so we need to protect from a context switch. For now this
-	 * is done using the global atomic lock.
-	 */
-	atomic_lock_acquire
-
-	thread_get_self d15			; Load current thread number
-#ifdef CONFIG_PROTECT_KERNEL
-	lsl.4	d9, #1, d15			; Convert to thread bit
-	enable_kernel_ranges d9
-#endif
-	/*
-	 * in order to reduce the size of code in the syscall section we get
-	 * out of it right now
-	 */
-	call a4, __system_call_bottom_half
-	.size system_call, . - system_call
-
-	.section .text.__system_call_bottom_half, "ax", @progbits
-__system_call_bottom_half:
-
-	/*
-	 * We need to Determine if this is a kernel syscall or user syscall.
-	 * Start by loading the pointer for the thread_info structure for the
-	 * current process in to a3.
-	 */
-	move.4	a3, (a3, d15)			; a3 = sw_ksp[d15]
-
-	/*
-	 * Now if this is a kernel thread the same value can be a acheived by
-	 * masking off the lower bits on the current stack pointer.
-	 */
-	movei	d9, #(~(ASM_THREAD_SIZE-1))	; load mask
-	and.4	d9, sp, d9			; apply mask
-
-	/*
-	 * d9 now has the masked version of the sp. If this is identical to
-	 * what is in a3 then don't switch to ksp as we are already in the
-	 * kernel.
-	 */
-	sub.4	#0, a3, d9
-
-	/*
-	 * if d9 and a3 are not equal. We are usespace and have to shift to
-	 * ksp.
-	 */
-	jmpne.t	1f
-
-	/*
-	 * Kernel Syscall.
-	 *
-	 * The kernel has called this routine. We have to pdec space for pt_regs
-	 * from sp.
-	 */
-	pdec	a4, PT_SIZE(sp)			; a4 = ksp - PT_SIZE
-	jmpt.t	2f
-
-	/*
-	 * Userspace Syscall.
-	 *
-	 * Add THREAD_SIZE and subtract PT_SIZE to create the proper ksp
-	 */
-1:	movei	d15, #(ASM_THREAD_SIZE - 8 - PT_SIZE)
-	lea.1	a4, (a3, d15)			; a4 = ksp + d15
-
-	/*
-	 * Replace user stack pointer with kernel stack pointer (a4)
-	 * Load -1 into frame_type in save area to indicate this is system call
-	 * frame.
-	 */
-2:	move.4	PT_A7(a4), a7			; Save old sp/A7 on kernel stack
-	move.4	PT_FRAME_TYPE(a4), #-1		; Set the frame type.
-	move.4	sp, a4				; Change to ksp.
-	/*
-	 * We are now officially back in the kernel!
-	 */
-
-	/*
-	 * Now that we are on the ksp we can leave the critical section
-	 */
-	atomic_lock_release
-
-	/*
-	 * We need to save a0 because we need to be able to restore it in
-	 * the event that we need to handle a signal.  It's not generally
-	 * a callee-saved register but is the GOT pointer.
-	 */
-	move.4	PT_A0(sp), a0			; Save A0 on kernel stack
-
-	/*
-	 * We still need to save d10-d13, a1, a2, a5, a6 in the kernel frame
-	 * for this process, we also save the system call params in the case of
-	 * syscall restart. (note a7 was saved above)
-	 */
-	move.4	PT_A1(sp), a1			; Save A1 on kernel stack
-	move.4	PT_A2(sp), a2			; Save A2 on kernel stack
-	move.4	PT_A5(sp), a5			; Save A5 on kernel stack
-	move.4	PT_A6(sp), a6			; Save A6 on kernel stack
-	move.4	PT_PC(sp), a5			; Save A5 at the PC location
-	move.4	PT_D10(sp), d10			; Save D10 on kernel stack
-	move.4	PT_D11(sp), d11			; Save D11 on kernel stack
-	move.4	PT_D12(sp), d12			; Save D12 on kernel stack
-	move.4	PT_D13(sp), d13			; Save D13 on kernel stack
-
-	/*
-	 * Now save the syscall parameters
-	 */
-	move.4	PT_D0(sp), d0			; Save d0 on kernel stack
-	move.4	PT_ORIGINAL_D0(sp), d0		; Save d0 on kernel stack
-	move.4	PT_D1(sp), d1			; Save d1 on kernel stack
-	move.4	PT_D2(sp), d2			; Save d2 on kernel stack
-	move.4	PT_D3(sp), d3			; Save d3 on kernel stack
-	move.4	PT_D4(sp), d4			; Save d4 on kernel stack
-	move.4	PT_D5(sp), d5			; Save d5 on kernel stack
-	move.4	PT_D8(sp), d8			; Save d8 on kernel stack
-
-	/*
-	 * Test if syscalls are being traced and if they are jump to syscall
-	 * trace (it will comeback here)
-	 */
-	btst	TI_FLAGS(a3), #ASM_TIF_SYSCALL_TRACE
-	jmpne.f .Lsystem_call__trace
-.Lsystem_call__trace_complete:
-	/*
-	 * Check for a valid call number [ 0 <= syscall_number < NR_syscalls ]
-	 */
-	cmpi	d8, #0
-	jmplt.f 3f
-	cmpi	d8, #NR_syscalls
-	jmplt.t	4f
-
-	/*
-	 * They have passed an invalid number. Call sys_ni_syscall staring by
-	 * load a4 with the base address of sys_ni_syscall
-	 */
-3:	moveai	a4, #%hi(sys_ni_syscall)
-	lea.1	a4, %lo(sys_ni_syscall)(a4)
-	jmpt.t	5f				; Jump to regular processing
-
-	/*
-	 * Validated syscall, load the syscall table base address into a3 and
-	 * read the syscall ptr out.
-	 */
-4:	moveai	a3, #%hi(sys_call_table)
-	lea.1	a3, %lo(sys_call_table)(a3)	; a3 = sys_call_table
-	move.4	a4, (a3, d8)			; a4 = sys_call_table[d8]
-
-	/*
-	 * Before calling the syscall, setup a5 so that syscall_exit is called
-	 * on return from syscall
-	 */
-5:	moveai	a5, #%hi(syscall_exit)		; Setup return address
-	lea.1	a5, %lo(syscall_exit)(a5)	; from system call
-
-	/*
-	 * If the syscall is __NR_rt_rigreturn then we have to test d1 to
-	 * figure out if we have to change change the return routine to restore
-	 * all registers.
-	 */
-	cmpi	d8, #__NR_rt_sigreturn
-	jmpeq.f	6f
-
-	/*
-	 * Launch system call (it will return through a5 - syscall_exit)
-	 */
-	calli	a3, 0(a4)
-
-	/*
-	 * System call is rt_sigreturn. Test d1. If it is 1 we have to
-	 * change the return address to restore_all_registers
-	 */
-6:	cmpi	d1, #1
-	jmpne.t	7f
-
-	moveai	a5, #%hi(restore_all_registers)	 ; Setup return address
-	lea.1	a5, %lo(restore_all_registers)(a5) ; to restore_all_registers.
-
-	/*
-	 * Launch system call  (it will return through a5)
-	 */
-7:	calli	a3, 0(a4)			 ; Launch system call
-
-.Lsystem_call__trace:
-	/*
-	 * Syscalls are being traced.
-	 * Call syscall_trace, (return here)
-	 */
-	call	a5, syscall_trace
-
-	/*
-	 * Restore syscall state (it would have been discarded during the
-	 * syscall trace)
-	 */
-	move.4	d0, PT_D0(sp)			; Restore d0 from kernel stack
-	move.4	d1, PT_D1(sp)			; Restore d1 from kernel stack
-	move.4	d2, PT_D2(sp)			; Restore d2 from kernel stack
-	move.4	d3, PT_D3(sp)			; Restore d3 from kernel stack
-	move.4	d4, PT_D4(sp)			; Restore d4 from kernel stack
-	move.4	d5, PT_D5(sp)			; Restore d5 from kernel stack
-	/* add this back if we ever have a syscall with 7 args */
-	move.4	d8, PT_D8(sp)			; Restore d8 from kernel stack
-
-	/*
-	 * return to syscall
-	 */
-	jmpt.t .Lsystem_call__trace_complete
-	.size __system_call_bottom_half, . - __system_call_bottom_half
-
-/*
- * syscall_exit()
- */
-	.section .text.syscall_exit
-	.global syscall_exit
-syscall_exit:
-	/*
-	 * d0 contains the return value. We should move that into the kernel
-	 * stack d0 location.  We will be transitioning from kernel to user
-	 * mode. Test the flags and see if we have to call schedule. If we are
-	 * going to truly exit then all that has to be done is that from the
-	 * kernel stack we have to restore d0, a0, a1, a2, a5, a6 and sp (a7)bb
-	 * and then return via a5.
-	 */
-
-	/*
-	 * Save d0 to pt_regs
-	 */
-	move.4	PT_D0(sp), d0			; Save d0 into the kernel stack
-
-	/*
-	 * load the thread_info structure by masking off the THREAD_SIZE
-	 * bits.
-	 *
-	 * Note: we used to push a1, but now we don't as we are going
-	 * to eventually restore it to the userspace a1.
-	 */
-	movei	d9, #(~(ASM_THREAD_SIZE-1))
-	and.4	a1, sp, d9
-
-	/*
-	 * Are any interesting bits set on TI flags, if there are jump
-	 * aside to post_processing.
-	 */
-	move.4	d9, #(_TIF_SYSCALL_TRACE | _TIF_NEED_RESCHED | _TIF_SIGPENDING)
-	and.4	#0, TI_FLAGS(a1), d9
-	jmpne.f	.Lsyscall_exit__post_processing ; jump to handler
-.Lsyscall_exit__post_processing_complete:
-
-	move.4	d0, PT_D0(sp)			; Restore D0 from kernel stack
-	move.4	d1, PT_D1(sp)			; Restore d1 from kernel stack
-	move.4	d2, PT_D2(sp)			; Restore d2 from kernel stack
-	move.4	d3, PT_D3(sp)			; Restore d3 from kernel stack
-	move.4	d4, PT_D4(sp)			; Restore d4 from kernel stack
-	move.4	d5, PT_D5(sp)			; Restore d5 from kernel stack
-	move.4	d8, PT_D8(sp)			; Restore d8 from kernel stack
-	move.4	d10, PT_D10(sp)			; Restore d10 from kernel stack
-	move.4	d11, PT_D11(sp)			; Restore d11 from kernel stack
-	move.4	d12, PT_D12(sp)			; Restore d12 from kernel stack
-	move.4	d13, PT_D13(sp)			; Restore d13 from kernel stack
-	move.4	a1, PT_A1(sp)			; Restore A1 from kernel stack
-	move.4	a2, PT_A2(sp)			; Restore A2 from kernel stack
-	move.4	a5, PT_A5(sp)			; Restore A5 from kernel stack
-	move.4	a6, PT_A6(sp)			; Restore A6 from kernel stack
-	move.4	a0, PT_A0(sp)			; Restore A6 from kernel stack
-
-	/*
-	 * this is only for debug, and could be removed for production builds
-	 */
-	move.4	PT_FRAME_TYPE(sp), #0		; invalidate frame_type
-
-#ifdef CONFIG_PROTECT_KERNEL
-
-	call a4, __syscall_exit_bottom_half
-
-	.section .kernel_unprotected, "ax", @progbits
-__syscall_exit_bottom_half:
-	/*
-	 * Enter critical section
-	 */
-	atomic_lock_acquire
-	disable_kernel_ranges_for_current d15
-#endif
-	/*
-	 * Lastly restore userspace stack ptr
-	 *
-	 * Note: that when protection is on we need to hold the lock around the
-	 * stack swap as well because otherwise the protection could get
-	 * inadvertently disabled again at the end of a context switch.
-	 */
-	move.4	a7, PT_A7(sp)			; Restore A7 from kernel stack
-
-	/*
-	 * We are now officially back in userspace!
-	 */
-
-#ifdef CONFIG_PROTECT_KERNEL
-	/*
-	 * Leave critical section and return to user space.
-	 */
-	atomic_lock_release
-#endif
-	calli	a5, 0(a5)			; Back to userspace code.
-
-	bkpt #-1				; we will never get here
-
-	/*
-	 * Post syscall processing. (unlikely part of syscall_exit)
-	 *
-	 * Are we tracing syscalls. If TIF_SYSCALL_TRACE is set, call
-	 * syscall_trace routine and return here.
-	 */
-	.section .text.syscall_exit, "ax", @progbits
-.Lsyscall_exit__post_processing:
-	btst	TI_FLAGS(a1), #ASM_TIF_SYSCALL_TRACE
-	jmpeq.t	1f
-	call	a5, syscall_trace
-
-	/*
-	 * Do we need to resched ie call schedule. If TIF_NEED_RESCHED is set,
-	 * call the scheduler, it will come back here.
-	 */
-1:	btst	TI_FLAGS(a1), #ASM_TIF_NEED_RESCHED
-	jmpeq.t	2f
-	call	a5, schedule
-
-	/*
-	 * Do we need to post a signal, if TIF_SIGPENDING is set call the
-	 * do_signal.
-	 */
-2:	btst	TI_FLAGS(a1), #ASM_TIF_SIGPENDING
-	jmpeq.t	.Lsyscall_exit__post_processing_complete
-
-	/*
-	 * setup the do signal call
-	 */
-	move.4	d0, #0				; oldset pointer is NULL
-	lea.1	d1, (sp)			; d1 is the regs pointer.
-	call	a5, do_signal
-
-	jmpt.t  .Lsyscall_exit__post_processing_complete
-
-/*	.size syscall_exit, . - syscall_exit */
-
-/*
- * kernel_execve()
- *	kernel_execv is called when we the kernel is starting a
- *	userspace application.
- */
-	.section .kernel_unprotected, "ax", @progbits
-	.global kernel_execve
-kernel_execve:
-	move.4	-4(sp)++, a5			; Save return address
-	/*
-	 * Call execve
-	 */
-	movei	d8, #__NR_execve		; call execve
-	call	a5, system_call
-	move.4	a5, (sp)4++
-
-	/*
-	 * protection was enabled again at syscall exit, but we want
-	 * to return to kernel so we enable it again.
-	 */
-#ifdef CONFIG_PROTECT_KERNEL
-	/*
-	 * We are entering the kernel so we need to disable the protection.
-	 * Enter critical section, disable ranges and leave critical section.
-	 */
-	call a3, __enable_kernel_ranges ;  and jump back to kernel
-#else
-	ret a5					; jump back to the kernel
-#endif
-
-	.size kernel_execve, . - kernel_execve
-
-/*
- * signal_trampoline()
- *
- *	Deals with transitioning from to userspace signal handlers and returning
- *	to userspace, only called from the kernel.
- *
- */
-	.section .kernel_unprotected, "ax", @progbits
-	.global signal_trampoline
-signal_trampoline:
-	/*
-	 * signal_trampoline is called when we are jumping from the kernel to
-	 * the userspace signal handler.
-	 *
-	 * The following registers are relevant. (set setup_rt_frame)
-	 *   sp is the user space stack not the kernel stack
-	 *  d0 = signal number
-	 *  d1 = siginfo_t *
-	 *  d2 = ucontext *
-	 *  d3 = the user space signal handler
-	 *  a0 is set to the GOT if userspace application is FDPIC, otherwise 0
-	 *  a3 is set to the FD for the signal if userspace application is FDPIC
-	 */
-#ifdef CONFIG_PROTECT_KERNEL
-	/*
-	 * We are leaving the kernel so we need to enable the protection.
-	 * Enter critical section, disable ranges and leave critical section.
-	 */
-	atomic_lock_acquire			; Enter critical section
-	disable_kernel_ranges_for_current d15	; disable kernel ranges
-	atomic_lock_release			; Leave critical section
-#endif
-	/*
-	 * The signal handler pointer is in register d3 so tranfer it to a4 and
-	 * call it
-	 */
-	movea	a4, d3				; signal handler
-	calli	a5, 0(a4)
-
-	/*
-	 * Return to userspace through rt_syscall which is stored on top of the
-	 * stack d1 contains ret_via_interrupt status.
-	 */
-	move.4	d8, (sp)			; d8 (syscall #) = rt_syscall
-	move.4	d1, 4(sp)			; d1 = ret_via_interrupt
-	call	a5, system_call		; as we are 'in' the kernel
-						; we can call kernel_syscall
-
-	bkpt #-1				; will never get here.
-	.size signal_trampoline, . - signal_trampoline
-
-/*
- * kernel_thread_helper()
- *
- *	Entry point for kernel threads (only referenced by kernel_thread()).
- *
- *	On execution d0 will be 0, d1 will be the argument to be passed to the
- *	kernel function.
- *	d2 contains the kernel function that needs to get called.
- *	d3 will contain address to do_exit which needs to get moved into a5.
- *
- *	On return from fork the child thread d0 will be 0. We call this dummy
- *	function which in turn loads the argument
- */
-	.section .kernel_unprotected, "ax", @progbits
-	.global kernel_thread_helper
-kernel_thread_helper:
-	/*
-	 * Create a kernel thread. This is called from ret_from_vfork (a
-	 * userspace return routine) so we need to put it in an unprotected
-	 * section and re-enable protection before calling the vector in d2.
-	 */
-
-#ifdef CONFIG_PROTECT_KERNEL
-	/*
-	 * We are entering the kernel so we need to disable the protection.
-	 * Enter critical section, disable ranges and leave critical section.
-	 */
-	call a5, __enable_kernel_ranges
-#endif
-	/*
-	 * Move argument for kernel function into d0, and set a5 return address
-	 * (a5) to do_exit and return through a2
-	 */
-	move.4  d0, d1				; d0 = arg
-	move.4  a5, d3				; a5 = do_exit
-	ret	d2				; call function ptr in d2
-	.size kernel_thread_helper, . - kernel_thread_helper
-
-#ifdef CONFIG_PROTECT_KERNEL
-	.section .kernel_unprotected, "ax", @progbits
-__enable_kernel_ranges:
-	atomic_lock_acquire			; Enter critical section
-	enable_kernel_ranges_for_current d15
-	atomic_lock_release			; Leave critical section
-	calli a5, 0(a5)
-	.size __enable_kernel_ranges, . - __enable_kernel_ranges
-
-#endif
-
-/*
- * The following system call intercept functions where we setup the
- * input to the real system call.  In all cases these are just taking
- * the current sp which is pointing to pt_regs and pushing it into the
- * last arg of the system call.
- *
- * i.e. the public definition of sys_execv is
- *	sys_execve(	char *name,
- *			char **argv,
- *			char **envp )
- * but process.c defines it as
- *	sys_execve(	char *name,
- *			char **argv,
- *			char **envp,
- *			struct pt_regs *regs )
- *
- * so execve_intercept needs to populate the 4th arg with pt_regs*,
- * which is the stack pointer as we know we must be coming out of
- * system_call
- *
- * The intercept vectors are referenced by syscalltable.S
- */
-
-/*
- * execve_intercept()
- */
-	.section .text.execve_intercept, "ax", @progbits
-	.global execve_intercept
-execve_intercept:
-	move.4	d3, sp	; Save pt_regs address
-	call	a3, sys_execve
-
-	.size execve_intercept, . - execve_intercept
-
-/*
- * vfork_intercept()
- */
-	.section .text.vfork_intercept, "ax", @progbits
-	.global vfork_intercept
-vfork_intercept:
-	move.4	d0, sp	; Save pt_regs address
-	call	a3, sys_vfork
-
-	.size vfork_intercept, . - vfork_intercept
-
-/*
- * clone_intercept()
- */
-	.section .text.clone_intercept, "ax", @progbits
-	.global clone_intercept
-clone_intercept:
-	move.4	d2, sp	; Save pt_regs address
-	call	a3, sys_clone
-
-	.size clone_intercept, . - clone_intercept
-
-/*
- * sys_sigsuspend()
- */
-	.section .text.sigclone_intercept, "ax", @progbits
-	.global sys_sigsuspend
-sys_sigsuspend:
-	move.4	d0, sp	; Pass pointer to pt_regs in d0
-	call	a3, do_sigsuspend
-
-	.size sys_sigsuspend, . - sys_sigsuspend
-
-/*
- * sys_rt_sigsuspend()
- */
-	.section .text.sys_rt_sigsuspend, "ax", @progbits
-	.global sys_rt_sigsuspend
-sys_rt_sigsuspend:
-	move.4	d0, sp	; Pass pointer to pt_regs in d0
-	call	a3, do_rt_sigsuspend
-
-	.size sys_rt_sigsuspend, . - sys_rt_sigsuspend
-
-/*
- * sys_rt_sigreturn()
- */
-	.section .text.sys_rt_sigreturn, "ax", @progbits
-	.global sys_rt_sigreturn
-sys_rt_sigreturn:
-	move.4	d0, sp	; Pass pointer to pt_regs in d0
-	call	a3, do_rt_sigreturn
-
-	.size sys_rt_sigreturn, . - sys_rt_sigreturn
-
-/*
- * sys_sigaltstack()
- */
-	.section .text.sys_sigaltstack, "ax", @progbits
-	.global sys_sigaltstack
-sys_sigaltstack:
-	move.4	d0, sp	; Pass pointer to pt_regs in d0
-	call	a3, do_sys_sigaltstack
-
-	.size sys_sigaltstack, . - sys_sigaltstack
diff --git a/target/linux/ubicom32/files/arch/ubicom32/kernel/unaligned_trap.c b/target/linux/ubicom32/files/arch/ubicom32/kernel/unaligned_trap.c
deleted file mode 100644
index d856d061d..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/kernel/unaligned_trap.c
+++ /dev/null
@@ -1,698 +0,0 @@
-/*
- * arch/ubicom32/kernel/unaligned_trap.c
- *   Handle unaligned traps in both user or kernel space.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <asm/cacheflush.h>
-#include <asm/traps.h>
-
-#define FALSE 0
-#define TRUE 1
-
-/* no possible trap */
-#define UNUSED 0
-/* possible source operand trap */
-#define SRC 1
-#define SRC_2 2
-/* possible destination operand trap */
-#define DEST 3
-#define DEST_2 4
-/* can be either source or destination or both */
-#define TWO_OP 5
-#define TWO_OP_2 6
-
-/* TODO: What is the real value here, put something in to make it compile for
- * now */
-#define MOVE_2	0x0d
-#define LSL_2	0x11
-#define LSR_2	0x13
-#define MOVEI	0x19
-#define CMPI	0x18
-
-static int op_format[32] =
-{
-	TWO_OP,		/* 0x00 */
-	UNUSED,
-	SRC,
-	UNUSED,
-	TWO_OP,		/* 0x04 */
-	TWO_OP,
-	SRC,
-	UNUSED,
-	TWO_OP_2,	/* 0x08 */
-	TWO_OP,
-	TWO_OP_2,
-	TWO_OP,
-	TWO_OP_2,	/* 0x0C */
-	TWO_OP,
-	TWO_OP_2,
-	TWO_OP,
-	TWO_OP,		/* 0x10 */
-	TWO_OP_2,
-	TWO_OP,
-	TWO_OP,
-	UNUSED,		/* 0x14 */
-	UNUSED,
-	UNUSED,
-	UNUSED,
-	SRC_2,		/* 0x18 */
-	DEST_2,
-	UNUSED,
-	UNUSED,
-	UNUSED,		/* 0x1C */
-	UNUSED,
-	UNUSED,		/* unaligned CALLI will not be fixed. */
-	UNUSED
-};
-
-static int op_0_format[32] =
-{
-	UNUSED,		/* 0x00 */
-	UNUSED,
-	UNUSED,
-	UNUSED,
-	UNUSED,		/* 0x04 - ret don't fix - bad ret is always wrong */
-	UNUSED,
-	UNUSED,
-	UNUSED,
-	UNUSED,		/* 0x08 */
-	UNUSED,
-	TWO_OP,
-	TWO_OP_2,
-	TWO_OP,		/* 0x0c */
-	TWO_OP_2,
-	TWO_OP,
-	UNUSED,		/* .1 can't trap */
-	UNUSED,		/* 0x10 */
-	UNUSED,
-	SRC,
-	UNUSED,
-	UNUSED,		/* 0x14 */
-	TWO_OP_2,
-	UNUSED,
-	UNUSED,
-	UNUSED,		/* 0x18 */
-	UNUSED,
-	UNUSED,
-	UNUSED,
-	DEST,		/* 0x1c */
-	DEST,
-	DEST,
-	DEST,		/* all lea have 32-bit destination */
-};
-
-static int op_2_format[32] =
-{
-	UNUSED,		/* 0x00 */
-	UNUSED,
-	UNUSED,
-	UNUSED,
-	UNUSED,		/* 0x04 */
-	UNUSED,
-	SRC,
-	UNUSED,
-	UNUSED,		/* 0x08 crcgen is .1 */
-	UNUSED,
-	UNUSED,
-	UNUSED,
-	UNUSED,		/* 0x0c */
-	UNUSED,
-	UNUSED,
-	UNUSED,
-	SRC,		/* 0x10 */
-	SRC_2,
-	SRC,
-	SRC_2,
-	SRC,		/* 0x14 */
-	SRC_2,
-	SRC,
-	UNUSED,
-	UNUSED,		/* 0x18 */
-	UNUSED,
-	SRC,
-	UNUSED,
-	SRC,		/* 0x1c */
-	UNUSED,
-	SRC_2,
-	UNUSED,
-};
-
-static int op_6_format[32] =
-{
-	SRC_2,		/* 0x00 */
-	SRC_2,
-	SRC_2,
-	SRC_2,
-	SRC_2,		/* 0x04 */
-	SRC_2,
-	UNUSED,
-	SRC_2,
-	SRC,		/* 0x08 MULS.4 */
-	SRC_2,
-	SRC,
-	UNUSED,
-	UNUSED,		/* 0x0c */
-	UNUSED,
-	UNUSED,
-	UNUSED,
-	SRC,		/* 0x10 */
-	SRC_2,
-	SRC,
-	SRC_2,
-	UNUSED,		/* 0x14 */
-	UNUSED,
-	UNUSED,
-	UNUSED,
-	UNUSED,		/* 0x18 */
-	UNUSED,
-	UNUSED,
-	UNUSED,
-	UNUSED,		/* 0x1c */
-	UNUSED,
-	UNUSED,
-	UNUSED,
-};
-
-/*
- * unaligned_get_address()
- *	get an address using save_an and save_dn registers, and updates save_an
- *	with side effects
- */
-unsigned char *unaligned_get_address(int thread, int specifier, int four_byte,
-				     unsigned int save_an[],
-				     unsigned int save_dn[], int *write_back_an)
-{
-	unsigned char *address;
-
-	int areg = (specifier >> 5) & 7;
-	if ((specifier >> 8) == 2) {
-		int offset = specifier & 0xf;
-		offset = ((offset << 28) >> 28);
-		if (likely(four_byte)) {
-			offset <<= 2;
-		} else {
-			offset <<= 1;
-		}
-		if (specifier & 0x10) {
-			address = (unsigned char *)(save_an[areg] + offset);
-		} else {
-			address = (unsigned char *)save_an[areg];
-		}
-		save_an[areg] = save_an[areg] + offset;
-
-		/*
-		 * Let caller know An registers have been modified.
-		 */
-		*write_back_an = 1;
-	} else if ((specifier >> 8) == 3) {
-		int dreg = specifier & 0xf;
-		if (likely(four_byte)) {
-			address = (unsigned char *)(save_an[areg] +
-						    (save_dn[dreg] << 2));
-		} else {
-			address = (unsigned char *)(save_an[areg] +
-						    (save_dn[dreg] << 1));
-		}
-	} else {
-		int offset = ((specifier >> 3) & 0x60) | (specifier & 0x1f);
-		if (likely(four_byte)) {
-			address = (unsigned char *)(save_an[areg] +
-						    (offset << 2));
-		} else {
-			address = (unsigned char *)(save_an[areg] +
-						    (offset << 1));
-		}
-	}
-
-	return address;
-}
-
-static	int save_dn[16];
-static	int save_an[8];
-static	int save_acc[5];
-
-/*
- * unaligned_emulate()
- *	emulate the instruction at thread's pc that has taken an unaligned data
- *	trap.
- *
- * source or destination or both might be unaligned
- * the instruction must have a memory source or destination or both
- * the emulated instruction is copied and executed in this thread
- *
- *	TODO: Protection is handled outside of this function
- *	TODO: handling simultaneous unaligned and memory protection traps
- *
- *	Get thread state
- *		the PC and instruction (and local copy, emulate_inst), and An
- *		and Dn registers
- *		All implicit soruce state (source3, CSR, accumulators)
-
- *	if the instruction has a memory source
- *		Use the instruction, An and Dn registers to form src_address
- *		get unaligned source data from src_address (usually sign
- *		extended)
- *			(2 bytes, with or without sign extension, or 4 bytes)
- *		modify emulate_inst to use d0 as source
- *	else
- *		get the soure operand from one of thread's registers
- *	if instruction has a memory destination
- *		Use the instruction, An and Dn registers to form dest_address
- *		modify emulate_inst to use d0 as destination
- *	if there was a memory source
- *		put the source data in thread's d0
- *	get the source-2 Dn operand and source 3 operand from thread
- *	execute modified inst
- *		(save it, flush caches, set up local values for implicit
- *		sources, execute, save explicit and implicit results)
- *	if inst has destination address
- *		copy result to dest_address, possibly unaligned, 1, 2, or 4
- *		bytes
- *	restore thread's implicit results (modified address registers, CSR,
- *	accumulators) add 4 to thread's pc
- */
-void unaligned_emulate(unsigned int thread)
-{
-	unsigned int pc;
-	unsigned int inst;
-	unsigned int op;
-	unsigned int subop;
-	int format;
-	unsigned int emulate_inst;
-	int four_byte;
-	int src_operand, dest_operand;
-	int save_csr;
-	int source3;
-	unsigned int source1;
-	unsigned int source_data;
-	unsigned char *dest_address = NULL;
-	int source2 = 0;
-	unsigned int result;
-	unsigned int write_back_an = 0;
-	unsigned int chip_id_copy;
-
-	extern unsigned int trap_emulate;
-	extern unsigned int ubicom32_emulate_insn(int source1, int source2,
-						  int source3, int *save_acc,
-						  int *save_csr);
-
-	/*
-	 * get the chip_id
-	 */
-	asm volatile (
-	"	move.4		%0, chip_id		\n\t" /* get chip_id. */
-		: "=r"(chip_id_copy)
-		:
-	);
-
-	/*
-	 * get the pc
-	 */
-	asm volatile (
-	"	move.4		CSR, %1		\n\t" /* set source thread in
-						       * CSR */
-	"	setcsr_flush	0		\n\t"
-	"	move.4		%0, pc		\n\t"
-	"	move.4		CSR, #0		\n\t" /* restore CSR */
-	"	setcsr_flush	0		\n\t"
-		: "=a"(pc)
-		: "d" ((1 << 8) | (thread << 9))
-		: "cc"
-	);
-
-	inst = *((unsigned int *)pc);
-	op = inst >> 27;
-	if (unlikely(op == 2 || op == 6)) {
-		subop = (inst >> 21) & 0x1f;
-	} else {
-		subop = (inst >> 11) & 0x1f;
-	}
-	format = op_format[op];
-	emulate_inst = inst;
-
-	if (op == 0) {
-		format = op_0_format[subop];
-	} else if (op == 2) {
-		format = op_2_format[subop];
-	} else if (op == 6) {
-		format = op_6_format[subop];
-	}
-
-	if (unlikely(format == UNUSED)) {
-		/*
-		 * We are not going to emulate this. Bump PC by 4 and move on.
-		 */
-		asm volatile (
-		"	move.4		CSR, %0			\n\t"
-		"	setcsr_flush	0			\n\t"
-		"	move.4		pc, %1			\n\t"
-		"	setcsr		#0			\n\t"
-		"	setcsr_flush	0			\n\t"
-			:
-			: "d"((1 << 14) | (thread << 15)), "d"(pc + 4)
-			: "cc"
-		);
-		return;
-	}
-
-	four_byte = (format == TWO_OP || format == DEST || format == SRC);
-
-	/*
-	 * source or destination memory operand needs emulation
-	 */
-	src_operand = (format == SRC ||
-		       format == SRC_2 ||
-		       format == TWO_OP ||
-		       format == TWO_OP_2) &&
-		((inst >> 8) & 7) > 1;
-
-	dest_operand = (format == DEST ||
-			format == DEST_2 ||
-			format == TWO_OP ||
-			format == TWO_OP_2) &&
-		((inst >> 24) & 7) > 1;
-
-	/*
-	 * get thread's implicit sources (not covered by source context select).
-	 * data and address registers and CSR (for flag bits) and src3 and
-	 * accumulators
-	 */
-	asm volatile (
-	"	move.4		CSR, %2		\n\t"	/* set source thread in
-							 * CSR */
-	"	setcsr_flush	0		\n\t"
-	"	move.4		(%3), d0	\n\t"	/* get dn registers */
-	"	move.4		4(%3), d1	\n\t"
-	"	move.4		8(%3), d2	\n\t"
-	"	move.4		12(%3), d3	\n\t"
-	"	move.4		16(%3), d4	\n\t"
-	"	move.4		20(%3), d5	\n\t"
-	"	move.4		24(%3), d6	\n\t"
-	"	move.4		28(%3), d7	\n\t"
-	"	move.4		32(%3), d8	\n\t"
-	"	move.4		36(%3), d9	\n\t"
-	"	move.4		40(%3), d10	\n\t"
-	"	move.4		44(%3), d11	\n\t"
-	"	move.4		48(%3), d12	\n\t"
-	"	move.4		52(%3), d13	\n\t"
-	"	move.4		56(%3), d14	\n\t"
-	"	move.4		60(%3), d15	\n\t"
-	"	move.4		(%4), a0	\n\t"	/* get an registers */
-	"	move.4		4(%4), a1	\n\t"
-	"	move.4		8(%4), a2	\n\t"
-	"	move.4		12(%4), a3	\n\t"
-	"	move.4		16(%4), a4	\n\t"
-	"	move.4		20(%4), a5	\n\t"
-	"	move.4		24(%4), a6	\n\t"
-	"	move.4		28(%4), a7	\n\t"
-	"	move.4		%0, CSR		\n\t"	/* get csr and source3
-							 * implicit operands */
-	"	move.4		%1, source3	\n\t"
-	"	move.4		(%5), acc0_lo	\n\t"	/* get accumulators */
-	"	move.4		4(%5), acc0_hi	\n\t"
-	"	move.4		8(%5), acc1_lo	\n\t"
-	"	move.4		12(%5), acc1_hi	\n\t"
-	"	move.4		16(%5), mac_rc16	\n\t"
-	"	move.4		CSR, #0		\n\t"	/* restore CSR */
-	"	setcsr_flush	0		\n\t"
-		: "=m"(save_csr), "=m"(source3)
-		: "d"((1 << 8) | (thread << 9)),
-		  "a"(save_dn), "a"(save_an), "a"(save_acc)
-		: "cc"
-	);
-
-	/*
-	 * turn off thread select bits if they were on
-	 */
-	BUG_ON((save_csr & 0x04100) != 0);
-	if (unlikely(save_csr & 0x04100)) {
-		/*
-		 * Things are in funny state as thread select bits are on in
-		 * csr. PANIC.
-		 */
-		panic("In unaligned trap handler. Trap thread CSR has thread "
-		      "select bits on.\n");
-	}
-
-	save_csr = save_csr & 0x1000ff;
-
-	/*
-	 * get the source1 operand
-	 */
-	source1 = 0;
-	if (src_operand) {
-		unsigned char *src_address;
-
-		/*
-		 * source1 comes from memory
-		 */
-		BUG_ON(!(format == TWO_OP || format == TWO_OP_2 ||
-			 format == SRC || format == SRC_2));
-		src_address = unaligned_get_address(thread, inst & 0x7ff,
-						    four_byte, save_an,
-						    save_dn, &write_back_an);
-
-		/*
-		 * get data (possibly unaligned)
-		 */
-		if (likely(four_byte)) {
-			source_data = (*src_address << 24) |
-				(*(src_address + 1) << 16) |
-				(*(src_address + 2) << 8) |
-				*(src_address + 3);
-			source1 = source_data;
-		} else {
-			source1 = *src_address << 8 |
-				*(src_address + 1);
-
-			/*
-			 * Source is not extended if the instrution is MOVE.2 or
-			 * if the cpu CHIP_ID >= 0x30000 and the instruction is
-			 * either LSL.2 or LSR.2.  All other cases have to be
-			 * sign extended.
-			 */
-			if ((!(op == 2 && subop == MOVE_2)) &&
-			    (!((chip_id_copy >= 0x30000) &&
-			       (subop == LSL_2 || subop == LSR_2)))) {
-				/*
-				 * Have to sign extend the .2 entry.
-				 */
-				source1 = ((unsigned int)
-					   ((signed int)
-					    ((signed short) source1)));
-			}
-		}
-	} else if (likely(op != MOVEI)) {
-		/*
-		 * source1 comes from a register, using move.4 d0, src1
-		 * unaligned_emulate_get_source is pointer to code to insert remulated instruction
-		 */
-		extern unsigned int unaligned_emulate_get_src;
-		*((int *)&unaligned_emulate_get_src) &= ~(0x7ff);
-		*((int *)&unaligned_emulate_get_src) |= (inst & 0x7ff);
-		flush_dcache_range((unsigned long)(&unaligned_emulate_get_src),
-				   (unsigned long)(&unaligned_emulate_get_src) + 4);
-
-		asm volatile (
-			/* source1 uses thread's registers */
-		"	move.4		CSR, %1			\n\t"
-		"	setcsr_flush 0				\n\t"
-		"unaligned_emulate_get_src:			\n\t"
-		"	move.4	%0, #0				\n\t"
-		"	setcsr		#0			\n\t"
-		"	setcsr_flush	0			\n\t"
-			: "=d" (source1)
-			: "d" ((1 << 8) | (thread << 9))
-			: "cc"
-		);
-	}
-
-	/*
-	 * get the destination address
-	 */
-	if (dest_operand) {
-		BUG_ON(!(format == TWO_OP || format == TWO_OP_2 ||
-			 format == DEST || format == DEST_2));
-		dest_address = unaligned_get_address(thread,
-						     ((inst >> 16) & 0x7ff),
-						     four_byte, save_an,
-						     save_dn, &write_back_an);
-	}
-
-	if (write_back_an) {
-		/*
-		 * restore any modified An registers
-		 */
-		asm volatile (
-		"	move.4		CSR, %0			\n\t"
-		"	setcsr_flush	0			\n\t"
-		"	move.4		a0, (%1)		\n\t"
-		"	move.4		a1, 4(%1)		\n\t"
-		"	move.4		a2, 8(%1)		\n\t"
-		"	move.4		a3, 12(%1)		\n\t"
-		"	move.4		a4, 16(%1)		\n\t"
-		"	move.4		a5, 20(%1)		\n\t"
-		"	move.4		a6, 24(%1)		\n\t"
-		"	move.4		a7, 28(%1)		\n\t"
-		"	setcsr		#0			\n\t"
-		"	setcsr_flush	0			\n\t"
-			:
-			: "d" ((1 << 14) | (thread << 15)), "a" (save_an)
-			: "cc"
-		);
-	}
-
-	/*
-	 * get source 2 register if needed, and modify inst to use d1 for
-	 * source-2 source-2 will come from this thread, not the trapping thread
-	 */
-	source2 = 0;
-	if ((op >= 8 && op <= 0x17) ||
-	    ((op == 2 || op == 6) && (inst & 0x4000000))) {
-		int src_dn = (inst >> 11) & 0xf;
-		source2 = save_dn[src_dn];
-		/*
-		 * force the emulated instruction to use d1 for source2 operand
-		 */
-		emulate_inst = (emulate_inst & 0xffff07ff) | 0x800;
-	}
-
-	if (likely(op != MOVEI)) {
-		/*
-		 * change emulated instruction source1 to d0
-		 */
-		emulate_inst &= ~0x7ff;
-		emulate_inst |= 1 << 8;
-	}
-
-	if (unlikely(op == 6 || op == 2)) {
-		/*
-		 * Set destination to d0
-		 */
-		emulate_inst &= ~(0xf << 16);
-	} else if (likely(op != CMPI)) {
-		/*
-		 * Set general destination field to d0.
-		 */
-		emulate_inst &= ~(0x7ff << 16);
-		emulate_inst |= 1 << 24;
-	}
-
-	/*
-	 * execute emulated instruction d0, to d0, no memory access
-	 * source2 if needed will be in d1
-	 * source3, CSR, and accumulators are set up before execution
-	 */
-	*((unsigned int *)&trap_emulate) = emulate_inst;
-	flush_dcache_range((unsigned long)(&trap_emulate),
-			   (unsigned long)(&trap_emulate) + 4);
-
-	result = ubicom32_emulate_insn(source1, source2, source3,
-				       save_acc, &save_csr);
-
-	/*
-	 * set the result value
-	 */
-	if (dest_operand) {
-		/*
-		 * copy result to memory
-		 */
-		if (four_byte) {
-			*dest_address++ =
-				(unsigned char)((result >> 24) & 0xff);
-			*dest_address++ =
-				(unsigned char)((result >> 16) & 0xff);
-		}
-		*dest_address++ = (unsigned char)((result >> 8) & 0xff);
-		*dest_address = (unsigned char)(result & 0xff);
-	} else if (likely(op != CMPI)) {
-		/*
-		 * copy result to a register, using move.4 dest, result
-		 */
-		extern unsigned int unaligned_trap_set_result;
-		*((unsigned int *)&unaligned_trap_set_result) &= ~0x7ff0000;
-
-		if (op == 2 || op == 6) {
-			*((unsigned int *)&unaligned_trap_set_result) |=
-				((inst & 0x000f0000) | 0x01000000);
-		} else {
-			*((unsigned int *)&unaligned_trap_set_result) |=
-				(inst & 0x7ff0000);
-		}
-		flush_dcache_range((unsigned long)&unaligned_trap_set_result,
-				   ((unsigned long)(&unaligned_trap_set_result) + 4));
-
-		asm volatile (
-			/* result uses thread's registers */
-		"	move.4		CSR, %1			\n\t"
-		"	setcsr_flush 0				\n\t"
-		"unaligned_trap_set_result:			\n\t"
-		"	move.4 #0, %0				\n\t"
-		"	setcsr		#0			\n\t"
-		"	setcsr_flush	0			\n\t"
-			:
-			: "d"(result), "d" ((1 << 14) | (thread << 15))
-			: "cc"
-		);
-	}
-
-	/*
-	 * bump PC in thread and restore implicit register changes
-	 */
-	asm volatile (
-	"	move.4		CSR, %0			\n\t"
-	"	setcsr_flush	0			\n\t"
-	"	move.4		pc, %1			\n\t"
-	"	move.4		acc0_lo, (%3)		\n\t"
-	"	move.4		acc0_hi, 4(%3)		\n\t"
-	"	move.4		acc1_lo, 8(%3)		\n\t"
-	"	move.4		acc1_hi, 12(%3)		\n\t"
-	"	move.4		mac_rc16, 16(%3)	\n\t"
-	"	move.4		CSR, %2			\n\t"
-	"	setcsr		#0			\n\t"
-	"	setcsr_flush	0			\n\t"
-		:
-		: "d"((1 << 14) | (thread << 15)),
-		  "d"(pc + 4), "d"(save_csr), "a"(save_acc)
-		: "cc"
-	);
-}
-
-/*
- * unaligned_only()
- *	Return true if either of the unaligned causes are set (and no others).
- */
-int unaligned_only(unsigned int cause)
-{
-	unsigned int unaligned_cause_mask =
-		(1 << TRAP_CAUSE_DST_MISALIGNED) |
-		(1 << TRAP_CAUSE_SRC1_MISALIGNED);
-
-	BUG_ON(cause == 0);
-	return (cause & unaligned_cause_mask) == cause;
-}
diff --git a/target/linux/ubicom32/files/arch/ubicom32/kernel/vmlinux.lds.S b/target/linux/ubicom32/files/arch/ubicom32/kernel/vmlinux.lds.S
deleted file mode 100644
index cd646772c..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/kernel/vmlinux.lds.S
+++ /dev/null
@@ -1,370 +0,0 @@
-/*
- * arch/ubicom32/kernel/vmlinux.lds.S
- *	vmlinux primary linker script
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <asm-generic/vmlinux.lds.h>
-#include <asm/ocm_size.h>
-#include <asm/memory_map.h>
-#include <asm/thread_info.h>
-#include <linux/threads.h>
-
-/*
- * Sanity checks to prevent errors later on that are much harder to understand
- */
-#if !defined APP_OCM_CODE_SIZE
-#error APP_OCM_CODE_SIZE has not been defined in ocm_size.h
-#endif
-
-#if !defined APP_OCM_DATA_SIZE
-#error APP_OCM_DATA_SIZE has not been defined in ocm_size.h
-#endif
-
-/*
- * The `free' ocm area that ultra does not use.
- */
-#if APP_OCM_CODE_SIZE || APP_OCM_DATA_SIZE
-#define OCM_FREE_START	(OCMSTART + APP_OCM_CODE_SIZE)
-#define OCM_FREE_LENGTH	(OCMSIZE - APP_OCM_CODE_SIZE - APP_OCM_DATA_SIZE)
-#else
-#define OCM_FREE_START OCMEND
-#define OCM_FREE_LENGTH 0
-#endif
-
-/*
- * If you want to limit OCM use for text/data or completely disable it
- * you can change these values.
- */
-#define OCM_TEXT_LENGTH	OCM_FREE_LENGTH
-#define OCM_DATA_LENGTH	OCM_FREE_LENGTH
-
-#define	RAM_START	KERNELSTART
-#define	RAM_LENGTH	((SDRAMSTART + CONFIG_MIN_RAMSIZE) - RAM_START)
-#define	TEXT		ram
-#define	DATA		ram
-#define	INIT		ram
-#define	BSS		ram
-
-#ifndef DATA_ADDR
-#define	DATA_ADDR
-#endif
-
-#include <asm-generic/vmlinux.lds.h>
-
-OUTPUT_ARCH(ubicom32)
-ENTRY(_start)
-
-MEMORY {
-	ram		: ORIGIN = RAM_START, LENGTH = RAM_LENGTH
-	syscall		: ORIGIN = OS_SYSCALL_BEGIN, LENGTH = (OS_SYSCALL_END - OS_SYSCALL_BEGIN)
-	ocm		: ORIGIN = OCM_FREE_START, LENGTH = OCM_FREE_LENGTH
-}
-
-jiffies = jiffies_64 + 4;
-
-/*
- * Fixed locations required by gdb coredumps.
- *
- * Note that the names are what gdb is expecting so renaming will break
- * the toolchain.
- */
-__ocm_begin		= OCMSTART;
-__ocm_limit		= __ocm_begin + OCMSIZE;
-__sdram_begin		= SDRAMSTART;
-__sdram_limit		= __sdram_begin + CONFIG_MIN_RAMSIZE;
-__filemedia_begin_addr	= FLASHSTART;
-__filemedia_end_addr	= __filemedia_begin_addr + 0x00800000;
-
-/*
- * For internal diagnostics
- */
-__os_syscall_begin	= OS_SYSCALL_BEGIN;
-__os_syscall_end	= OS_SYSCALL_END;
-
-SECTIONS {
-
-	.fixed_text : {
-		_begin = .;
-		*(.skip_syscall)
-		*(.old_syscall_entry.text)
-		__fixed_text_end = .;
-	} > TEXT
-	. = _begin + SIZEOF(.fixed_text) ;
-
-	/*
-	 * System call text in lower ocm (fixed location, can never change)
-	 */
-	__syscall_text_load_begin = .;
-	__syscall_text_run_begin = OS_SYSCALL_BEGIN;
-
-	.syscall_text __syscall_text_run_begin : AT(__syscall_text_load_begin) {
-		*(.syscall_entry.text) /* Must be at OS_SYSCALL_BEGIN 0x3ffc0040 */
-		*(.kernel_unprotected)
-		. = ALIGN(4);
-		__syscall_text_run_end = .;
-	} > syscall /* .syscall_text */
-	. = __syscall_text_load_begin + __syscall_text_run_end - __syscall_text_run_begin ;
-	__ocm_text_load_begin = .;
-	__ocm_text_run_begin = OCM_FREE_START ;
-	.ocm_text __ocm_text_run_begin : AT(__ocm_text_load_begin) {
-#if OCM_TEXT_LENGTH
-		*(.ocm_text)
-		*(.sched.text)
-		*(.spinlock.text)
-#include <asm/ocm_text.lds.inc>
-		. = ALIGN(4);
-#endif
-		__ocm_text_run_end = .;
-		__data_begin = ALIGN(OCM_SECTOR_SIZE);
-	} > ocm /* .ocm_text */
-
-	.ocm_module_text __ocm_text_run_end (NOLOAD) : AT(__ocm_text_run_end) {
-		__ocm_inst_heap_begin = .;
-		/* Reserve the min requested */
-		. += (CONFIG_OCM_MODULES_RESERVATION) * 1024;
-#ifdef CONFIG_OCM_MODULES_MAY_CONSUME_REMAINING_CODESPACE
-		/* Round up to OCM sector size (we cannot use it for data) */
-		. = ALIGN(OCM_SECTOR_SIZE);
-#endif
-		__ocm_inst_heap_end = .;
-		/* update __data_begin */
-		__data_begin = ALIGN(OCM_SECTOR_SIZE);
-	} > ocm  /* .ocm_module_text */
-
-	. = __ocm_text_load_begin + __ocm_text_run_end - __ocm_text_run_begin ;
-	__ocm_text_load_end = .;
-
-	__ocm_data_load_begin = .;
-	__ocm_data_run_begin = __data_begin ;
-#if OCM_DATA_LENGTH
-	.ocm_data __ocm_data_run_begin : AT(__ocm_data_load_begin) {
-#if defined(CONFIG_IRQSTACKS_USEOCM)
-		percpu_irq_stacks = .;
-		. += NR_CPUS * THREAD_SIZE;
-#endif
-		*(.ocm_data)
-		. = ALIGN(4) ;
-		__ocm_data_run_end = .;
-	} > ocm
-	. = __ocm_data_load_begin + __ocm_data_run_end - __ocm_data_run_begin ;
-#else
-	__ocm_data_run_end = __ocm_data_run_begin;
-#endif
-	__ocm_data_load_end = .;
-
-	__ocm_free_begin = __ocm_data_run_end;
-	__ocm_free_end = OCM_FREE_START + OCM_FREE_LENGTH;
-
-	.text __ocm_data_load_end : AT(__ocm_data_load_end) {
-		. = ALIGN(4);
-		_stext = .;
-		_text = .;
-		TEXT_TEXT
-		SCHED_TEXT
-		LOCK_TEXT
-		*(.text.lock)
-		*(.text.__libgcc_udivmodsi)
-		*(.text.__libgcc_divmodsi)
-		*(.text.__libgcc_muldi3)
-		*(.text.__libgcc_udivmoddi)
-		*(.text.__libgcc_divmoddi)
-		*(.text.*)
-#if OCM_TEXT_LENGTH == 0
-		*(.ocm_text)
-		*(.sched.text)
-		*(.spinlock.text)
-#endif
-		. = ALIGN(16);          /* Exception table              */
-		__start___ex_table = .;
-		*(__ex_table)
-		__stop___ex_table = .;
-
-		*(.rodata) *(.rodata.*)
-		*(__vermagic)		/* Kernel version magic */
-		*(__markers_strings)
-		*(.rodata1)
-		*(.rodata.str1.1)
-		*(__tracepoints_strings)
-
-		 /* PCI quirks */
-		__start_pci_fixups_early = . ;
-			*(.pci_fixup_early)
-		__end_pci_fixups_early = . ;
-		__start_pci_fixups_header = . ;
-			*(.pci_fixup_header)
-		__end_pci_fixups_header = . ;
-		__start_pci_fixups_final = . ;
-			*(.pci_fixup_final)
-		__end_pci_fixups_final = . ;
-		__start_pci_fixups_enable = . ;
-			*(.pci_fixup_enable)
-		__end_pci_fixups_enable = . ;
-		__start_pci_fixups_resume = . ;
-		       *(.pci_fixup_resume)
-		__end_pci_fixups_resume = . ;
-		__start_pci_fixups_resume_early = . ;
-		       *(.pci_fixup_resume_early)
-		__end_pci_fixups_resume_early = . ;
-		__start_pci_fixups_suspend  = . ;
-		       *(.pci_fixup_suspend)
-		__end_pci_fixups_suspend = . ;
-
-		__start_builtin_fw = . ;
-			*(.builtin_fw)
-		__end_builtin_fw = . ;
-
-
-		/* Kernel symbol table: Normal symbols */
-		. = ALIGN(4);
-		__start___ksymtab = .;
-		*(__ksymtab)
-		__stop___ksymtab = .;
-
-		/* Kernel symbol table: GPL-only symbols */
-		__start___ksymtab_gpl = .;
-		*(__ksymtab_gpl)
-		__stop___ksymtab_gpl = .;
-
-		/* Kernel symbol table: Normal unused symbols */
-		__start___ksymtab_unused = .;
-		*(__ksymtab_unused)
-		__stop___ksymtab_unused = .;
-
-		/* Kernel symbol table: GPL-only unused symbols */
-		__start___ksymtab_unused_gpl = .;
-		*(__ksymtab_unused_gpl)
-		__stop___ksymtab_unused_gpl = .;
-
-		/* Kernel symbol table: GPL-future symbols */
-		__start___ksymtab_gpl_future = .;
-		*(__ksymtab_gpl_future)
-		__stop___ksymtab_gpl_future = .;
-
-		/* Kernel symbol table: Normal symbols */
-		__start___kcrctab = .;
-		*(__kcrctab)
-		__stop___kcrctab = .;
-
-		/* Kernel symbol table: GPL-only symbols */
-		__start___kcrctab_gpl = .;
-		*(__kcrctab_gpl)
-		__stop___kcrctab_gpl = .;
-
-		/* Kernel symbol table: GPL-future symbols */
-		__start___kcrctab_gpl_future = .;
-		*(__kcrctab_gpl_future)
-		__stop___kcrctab_gpl_future = .;
-
-		/* Kernel symbol table: strings */
-		*(__ksymtab_strings)
-
-		/* Built-in module parameters */
-		. = ALIGN(4) ;
-		__start___param = .;
-		*(__param)
-		__stop___param = .;
-
-		. = ALIGN(4) ;
-		_etext = . ;
-	} > TEXT
-
-	.data DATA_ADDR : {
-		. = ALIGN(4);
-		_sdata = . ;
-		DATA_DATA
-#if OCM_DATA_LENGTH == 0
-		*(.ocm_data)
-#endif
-		. = ALIGN(8192) ;
-		_data_protection_end = .;
-		*(.data.init_task)
-		. = ALIGN(4);
-		_edata = . ;
-	} > DATA
-
-	.init : {
-		. = ALIGN(4096);
-		__init_begin = .;
-		_sinittext = .;
-		INIT_TEXT
-		_einittext = .;
-		*(.init.rodata)
-		INIT_DATA
-		. = ALIGN(16);
-		__setup_start = .;
-		*(.init.setup)
-		__setup_end = .;
-		__initcall_start = .;
-		INITCALLS
-		__initcall_end = .;
-		__con_initcall_start = .;
-		*(.con_initcall.init)
-		__con_initcall_end = .;
-		___security_initcall_start = .;
-		*(.security_initcall.init)
-		___security_initcall_end = .;
-#ifdef CONFIG_BLK_DEV_INITRD
-		. = ALIGN(4);
-		__initramfs_start = .;
-		*(.init.ramfs)
-		__initramfs_end = .;
-#endif
-		. = ALIGN(4096);
-		__per_cpu_start = .;
-			*(.data.percpu)
-			*(.data.percpu.shared_aligned)
-		__per_cpu_end = .;
-
-		. = ALIGN(4096);
-		__init_end = .;
-	} > INIT
-
-	  .eh_frame   :
-	  {
-	    PROVIDE (___eh_frame_begin = .);
-	    *(.eh_frame)
-	    LONG (0);
-	    PROVIDE (___eh_frame_end = .);
-	  } > INIT
-
-	/DISCARD/ : {
-		EXIT_TEXT
-		EXIT_DATA
-		*(.exitcall.exit)
-	}
-
-	.bss : {
-		. = ALIGN(4);
-		_sbss = . ;
-		*(.bss)
-		*(COMMON)
-		. = ALIGN(4) ;
-		_ebss = . ;
-		_end = . ;
-	} > BSS
-
-	NOTES > BSS
-
-}
diff --git a/target/linux/ubicom32/files/arch/ubicom32/lib/Makefile b/target/linux/ubicom32/files/arch/ubicom32/lib/Makefile
deleted file mode 100644
index e7f41ccf3..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/lib/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# arch/ubicom32/lib/Makefile
-#	<TODO: Replace with short file description>
-#
-# (C) Copyright 2009, Ubicom, Inc.
-#
-# This file is part of the Ubicom32 Linux Kernel Port.
-#
-# The Ubicom32 Linux Kernel Port 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.
-#
-# The Ubicom32 Linux Kernel Port is distributed in the hope that it
-# will be useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
-# the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with the Ubicom32 Linux Kernel Port.  If not,
-# see <http://www.gnu.org/licenses/>.
-#
-# Ubicom32 implementation derived from (with many thanks):
-#   arch/m68knommu
-#   arch/blackfin
-#   arch/parisc
-#
-#
-# Makefile for m68knommu specific library files..
-#
-
-lib-y	:= checksum.o delay.o mem_ubicom32.o
diff --git a/target/linux/ubicom32/files/arch/ubicom32/lib/checksum.c b/target/linux/ubicom32/files/arch/ubicom32/lib/checksum.c
deleted file mode 100644
index c93920f7c..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/lib/checksum.c
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * arch/ubicom32/lib/checksum.c
- *   Optimized checksum utilities for IP.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-/*
- * INET		An implementation of the TCP/IP protocol suite for the LINUX
- *		operating system.  INET is implemented using the  BSD Socket
- *		interface as the means of communication with the user level.
- *
- *		IP/TCP/UDP checksumming routines
- *
- * Authors:	Jorge Cwik, <jorge@laser.satlink.net>
- *		Arnt Gulbrandsen, <agulbra@nvg.unit.no>
- *		Tom May, <ftom@netcom.com>
- *		Andreas Schwab, <schwab@issan.informatik.uni-dortmund.de>
- *		Lots of code moved from tcp.c and ip.c; see those files
- *		for more names.
- *
- * 03/02/96	Jes Sorensen, Andreas Schwab, Roman Hodek:
- *		Fixed some nasty bugs, causing some horrible crashes.
- *		A: At some points, the sum (%0) was used as
- *		length-counter instead of the length counter
- *		(%1). Thanks to Roman Hodek for pointing this out.
- *		B: GCC seems to mess up if one uses too many
- *		data-registers to hold input values and one tries to
- *		specify d0 and d1 as scratch registers. Letting gcc choose these
- *		registers itself solves the problem.
- *
- *		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.
- */
-
-/* Revised by Kenneth Albanowski for m68knommu. Basic problem: unaligned access kills, so most
-   of the assembly has to go. */
-
-#include <linux/module.h>
-#include <net/checksum.h>
-
-static unsigned long do_csum(const unsigned char * buff, int len)
-{
-	int count;
-	unsigned long result = 0;
-
-	/*
-	 * The following optimized assembly code cannot handle data length less than 7 bytes!
-	 */
-	if (likely(len >= 7)) {
-		len -= (4 - (int)buff) & 3;
-		count = len >> 2;
-		asm (
-		"	sub.4		d15, #0, %2		\n\t"	// set up for jump table
-		"	and.4		d15, #(32-1), d15	\n\t"	// d15 = (-m) & (32 - 1)
-
-		"	bfextu		d14, %0, #2		\n\t"	// test 2 LSB of buff
-		"	jmpne.w.f	100f			\n\t"
-		"	add.4		%1, #0, %1		\n\t"	// clear C
-		"	moveai		a3, #%%hi(1f)		\n\t"	// table jump
-		"	lea.1		a3, %%lo(1f)(a3)	\n\t"
-		"	lea.4		a3, (a3,d15)		\n\t"
-		"	calli		a3, 0(a3)		\n\t"
-
-		"100:	sub.4		%0, %0, d14		\n\t"
-		"	sub.4		d14, #4, d14		\n\t"
-		"	lsl.4		d14, d14, #3		\n\t"
-		"	add.4		%1, #0, %1		\n\t"	// clear C
-		"	moveai		a3, #%%hi(1f)		\n\t"	// table jump
-		"	lea.1		a3, %%lo(1f)(a3)	\n\t"
-		"	lea.4		a3, (a3,d15)		\n\t"
-		"	bfextu		%1, (%0)4++, d14	\n\t"	// read first partial word
-		"	calli		a3, 0(a3)		\n\t"
-#if 1
-		"200:	lsl.4		%3, %3, #3		\n\t"
-		"	bfrvrs		d15, (%0), #0		\n\t"	// read last word (partial)
-		"	bfextu		d15, d15, %3		\n\t"
-		"	bfrvrs		d15, d15, #0		\n\t"
-		"	add.4		%1, d15, %1		\n\t"
-		"	addc		%1, #0, %1		\n\t"	// sample C again
-		"	jmpt.w.t	2f			\n\t"
-#else
-		"200:	move.1		d15, 0(%0)		\n\t"
-		"	lsl.4		d15, d15, #8		\n\t"
-		"	add.4		%1, d15, %1		\n\t"
-		"	addc		%1, #0, %1		\n\t"	// sample C again
-		"	add.4		%3, #-1, %3		\n\t"
-		"	jmpeq.w.t	2f			\n\t"
-
-		"	move.1		d15, 1(%0)		\n\t"
-		"	add.4		%1, d15, %1		\n\t"
-		"	addc		%1, #0, %1		\n\t"	// sample C again
-		"	add.4		%3, #-1, %3		\n\t"
-		"	jmpeq.w.t	2f			\n\t"
-
-		"	move.1		d15, 2(%0)		\n\t"
-		"	lsl.4		d15, d15, #8		\n\t"
-		"	add.4		%1, d15, %1		\n\t"
-		"	addc		%1, #0, %1		\n\t"	// sample C again
-		"	jmpt.w.t	2f			\n\t"
-#endif
-#if defined(IP7000) || defined(IP7000_REV2)
-		"300:	swapb.2		%1, %1			\n\t"
-#else
-		"300:	shmrg.2		%1, %1, %1		\n\t"
-		"	lsr.4		%1, %1, #8		\n\t"
-		"	bfextu		%1, %1, #16		\n\t"
-#endif
-		"	jmpt.w.t	3f			\n\t"
-
-		"1:	add.4		%1, (%0)4++, %1		\n\t"	// first add without C
-		"	.rept		31			\n\t"
-		"	addc		%1, (%0)4++, %1		\n\t"
-		"	.endr					\n\t"
-		"	addc		%1, #0, %1		\n\t"	// sample C again
-		"	add.4		%2, #-32, %2		\n\t"
-		"	jmpgt.w.t	1b			\n\t"
-
-		"	and.4		%3, #3, %3		\n\t"	// check n
-		"	jmpne.w.f	200b			\n\t"
-
-		"2:	.rept		2			\n\t"
-		"	lsr.4		d15, %1, #16		\n\t"
-		"	bfextu		%1, %1, #16		\n\t"
-		"	add.4		%1, d15, %1		\n\t"
-		"	.endr					\n\t"
-		"	btst		d14, #3			\n\t"	// start from odd address (<< 3)?
-		"	jmpne.w.f	300b			\n\t"
-		"3:						\n\t"
-
-			: "+a"(buff), "+d"(result), "+d"(count), "+d"(len)
-			:
-			: "d15", "d14", "a3", "cc"
-		);
-
-		return result;
-	}
-
-	/*
-	 * handle a few bytes and fold result into 16-bit
-	 */
-	while (len-- > 0) {
-		result += (*buff++ << 8);
-		if (len) {
-			result += *buff++;
-			len--;
-		}
-	}
-	asm (
-	"	.rept		2			\n\t"
-	"	lsr.4		d15, %0, #16		\n\t"
-	"	bfextu		%0, %0, #16		\n\t"
-	"	add.4		%0, d15, %0		\n\t"
-	"	.endr					\n\t"
-		: "+d" (result)
-		:
-		: "d15", "cc"
-	);
-
-	return result;
-}
-
-/*
- *	This is a version of ip_compute_csum() optimized for IP headers,
- *	which always checksum on 4 octet boundaries.
- */
-__sum16 ip_fast_csum(const void *iph, unsigned int ihl)
-{
-	return (__force __sum16)~do_csum(iph,ihl*4);
-}
-
-/*
- * computes the checksum of a memory block at buff, length len,
- * and adds in "sum" (32-bit)
- *
- * returns a 32-bit number suitable for feeding into itself
- * or csum_tcpudp_magic
- *
- * this function must be called with even lengths, except
- * for the last fragment, which may be odd
- *
- * it's best to have buff aligned on a 32-bit boundary
- */
-__wsum csum_partial(const void *buff, int len, __wsum sum)
-{
-	unsigned int result = do_csum(buff, len);
-
-	/* add in old sum, and carry.. */
-	result += (__force u32)sum;
-	if ((__force u32)sum > result)
-		result += 1;
-	return (__force __wsum)result;
-}
-
-EXPORT_SYMBOL(csum_partial);
-
-/*
- * this routine is used for miscellaneous IP-like checksums, mainly
- * in icmp.c
- */
-__sum16 ip_compute_csum(const void *buff, int len)
-{
-	return (__force __sum16)~do_csum(buff,len);
-}
-
-/*
- * copy from fs while checksumming, otherwise like csum_partial
- */
-
-__wsum
-csum_partial_copy_from_user(const void __user *src, void *dst,
-			    int len, __wsum sum, int *csum_err)
-{
-	if (csum_err) *csum_err = 0;
-	memcpy(dst, (__force const void *)src, len);
-	return csum_partial(dst, len, sum);
-}
-
-/*
- * copy from ds while checksumming, otherwise like csum_partial
- */
-
-__wsum
-csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)
-{
-	memcpy(dst, src, len);
-	return csum_partial(dst, len, sum);
-}
diff --git a/target/linux/ubicom32/files/arch/ubicom32/lib/delay.c b/target/linux/ubicom32/files/arch/ubicom32/lib/delay.c
deleted file mode 100644
index d19f97f09..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/lib/delay.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * arch/ubicom32/lib/delay.c
- *   Ubicom32 implementation of udelay()
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#include <linux/module.h>
-#include <asm/param.h>
-#include <asm/delay.h>
-#include <asm/ip5000.h>
-
-/*
- * read_current_timer()
- *	Return the current value of sysval.
- */
-int __devinit read_current_timer(unsigned long *timer_val)
-{
-	*timer_val = (long)(UBICOM32_IO_TIMER->sysval);
-	return 0;
-}
-
-
-void udelay(unsigned long usecs)
-{
-	_udelay(usecs);
-}
-EXPORT_SYMBOL(udelay);
diff --git a/target/linux/ubicom32/files/arch/ubicom32/lib/mem_ubicom32.c b/target/linux/ubicom32/files/arch/ubicom32/lib/mem_ubicom32.c
deleted file mode 100644
index d9c302ec6..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/lib/mem_ubicom32.c
+++ /dev/null
@@ -1,343 +0,0 @@
-/*
- * arch/ubicom32/lib/mem_ubicom32.c
- *   String functions.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/compiler.h>
-
-#define LIKELY likely
-#define UNLIKELY unlikely
-
-typedef u32_t addr_t;
-
-/*
- * memcpy()
- */
-void *memcpy(void *dest, const void *src, size_t n)
-{
-	void *dest_ret = dest;
-
-	if (LIKELY((((addr_t)dest ^ (addr_t)src) & 3) == 0) && LIKELY(n > 6)) {
-		size_t m;
-		n -= (4 - (addr_t)dest) & 0x03;
-		m = n >> 2;
-		asm volatile (
-		"	sub.4		d15, #0, %2		\n\t"	// set up for jump table
-		"	and.4		d15, #(32-1), d15	\n\t"	// d15 = (-m) & (32 - 1)
-		"	moveai		a3, #%%hi(1f)		\n\t"
-		"	lea.1		a3, %%lo(1f)(a3)	\n\t"
-		"	lea.4		a3, (a3,d15)		\n\t"
-
-		"	bfextu		d15, %0, #2		\n\t"	// d15 = (dest & 3)
-		"	jmpne.w.f	100f			\n\t"
-		"	calli		a3, 0(a3)		\n\t"	// 4-byte alignment
-
-		"100:	cmpi		d15, #2			\n\t"
-		"	jmpne.s.f	101f			\n\t"
-		"	move.2		(%0)2++, (%1)2++	\n\t"
-		"	calli		a3, 0(a3)		\n\t"	// 2-byte alignment
-
-		"101:	move.1		(%0)1++, (%1)1++	\n\t"
-		"	jmpgt.s.f	102f			\n\t"	// 3-byte alignment
-		"	move.2		(%0)2++, (%1)2++	\n\t"	// 1-byte alignment
-		"102:	calli		a3, 0(a3)		\n\t"
-
-		"200:	cmpi		%3, #2			\n\t"
-		"	jmplt.s.f	201f			\n\t"
-		"	move.2		(%0)2++, (%1)2++	\n\t"
-		"	jmpeq.s.t	2f			\n\t"
-		"201:	move.1		(%0)1++, (%1)1++	\n\t"
-		"	jmpt.w.t	2f			\n\t"
-
-		"1:	.rept		25			\n\t"
-		"	movea		(%0)4++, (%1)4++	\n\t"
-		"	.endr					\n\t"
-		"	.rept		7			\n\t"
-		"	move.4		(%0)4++, (%1)4++	\n\t"
-		"	.endr					\n\t"
-		"	add.4		%2, #-32, %2		\n\t"
-		"	jmpgt.w.f	1b			\n\t"
-
-		"	and.4		%3, #3, %3		\n\t"	// check n
-		"	jmpne.w.f	200b			\n\t"
-		"2:						\n\t"
-			: "+a" (dest), "+a" (src), "+d" (m), "+d" (n)
-			:
-			: "d15", "a3", "memory", "cc"
-		);
-
-		return dest_ret;
-	}
-
-	if (LIKELY((((addr_t)dest ^ (addr_t)src) & 1) == 0) && LIKELY(n > 2)) {
-		size_t m;
-		n -= (addr_t)dest & 0x01;
-		m = n >> 1;
-		asm volatile (
-		"	sub.4		d15, #0, %2		\n\t"	// set up for jump table
-		"	and.4		d15, #(32-1), d15	\n\t"	// d15 = (-m) & (32 - 1)
-		"	moveai		a3, #%%hi(1f)		\n\t"
-		"	lea.1		a3, %%lo(1f)(a3)	\n\t"
-		"	lea.4		a3, (a3,d15)		\n\t"
-
-		"	btst		%0, #0			\n\t"	// check bit 0
-		"	jmpne.w.f	100f			\n\t"
-		"	calli		a3, 0(a3)		\n\t"	// 4-byte alignment
-
-		"100:	move.1		(%0)1++, (%1)1++	\n\t"
-		"	calli		a3, 0(a3)		\n\t"
-
-		"200:	move.1		(%0)1++, (%1)1++	\n\t"
-		"	jmpt.w.t	2f			\n\t"
-
-		"1:	.rept		32			\n\t"
-		"	move.2		(%0)2++, (%1)2++	\n\t"
-		"	.endr					\n\t"
-		"	add.4		%2, #-32, %2		\n\t"
-		"	jmpgt.w.f	1b			\n\t"
-
-		"	and.4		%3, #1, %3		\n\t"	// check n
-		"	jmpne.w.f	200b			\n\t"
-		"2:						\n\t"
-
-			: "+a" (dest), "+a" (src), "+d" (m), "+d" (n)
-			:
-			: "d15", "a3", "memory", "cc"
-		);
-
-		return dest_ret;
-	}
-
-	asm volatile (
-	"	sub.4		d15, #0, %2		\n\t"
-	"	jmpeq.w.f	2f			\n\t"
-	"	and.4		d15, #(16-1), d15	\n\t"	// d15 = (-n) & (16 - 1)
-	"	moveai		a3, #%%hi(1f)		\n\t"
-	"	lea.1		a3, %%lo(1f)(a3)	\n\t"
-	"	lea.4		a3, (a3,d15)		\n\t"
-	"	calli		a3, 0(a3)		\n\t"
-
-	"1:	.rept		16			\n\t"
-	"	move.1		(%0)1++, (%1)1++	\n\t"
-	"	.endr					\n\t"
-	"	add.4		%2, #-16, %2		\n\t"
-	"	jmpgt.w.f	1b			\n\t"
-	"2:						\n\t"
-
-		: "+a" (dest), "+a" (src), "+d" (n)
-		:
-		: "d15", "a3", "memory", "cc"
-	);
-
-	return dest_ret;
-}
-
-/*
- * memset()
- */
-void *memset(void *s, int c, size_t n)
-{
-	void *s_ret = s;
-
-	if (LIKELY(n > 6)) {
-		size_t m;
-		n -= (4 - (addr_t)s) & 0x03;
-		m = n >> 2;
-		asm volatile (
-		"	sub.4		d15, #0, %2		\n\t"	// set up for jump table
-		"	and.4		d15, #(32-1), d15	\n\t"	// d15 = (-m) & (32 - 1)
-		"	shmrg.1		%1, %1, %1		\n\t"
-		"	shmrg.2		%1, %1, %1		\n\t"	// %1 = (c<<24)|(c<<16)|(c<<8)|c
-		"	moveai		a3, #%%hi(1f)		\n\t"
-		"	lea.1		a3, %%lo(1f)(a3)	\n\t"
-		"	lea.4		a3, (a3,d15)		\n\t"
-
-		"	bfextu		d15, %0, #2		\n\t"	// d15 = (s & 3)
-		"	jmpne.w.f	100f			\n\t"
-		"	calli		a3, 0(a3)		\n\t"	// 4-byte alignment
-
-		"100:	cmpi		d15, #2			\n\t"
-		"	jmpne.s.f	101f			\n\t"
-		"	move.2		(%0)2++, %1		\n\t"
-		"	calli		a3, 0(a3)		\n\t"	// 2-byte alignment
-
-		"101:	move.1		(%0)1++, %1		\n\t"
-		"	jmpgt.s.f	102f			\n\t"	// 3-byte alignment
-		"	move.2		(%0)2++, %1		\n\t"	// 1-byte alignment
-		"102:	calli		a3, 0(a3)		\n\t"
-
-		"200:	cmpi		%3, #2			\n\t"
-		"	jmplt.s.f	201f			\n\t"
-		"	move.2		(%0)2++, %1		\n\t"
-		"	jmpeq.s.t	2f			\n\t"
-		"201:	move.1		(%0)1++, %1		\n\t"
-		"	jmpt.w.t	2f			\n\t"
-
-		"1:	.rept		25			\n\t"
-		"	movea		(%0)4++, %1		\n\t"
-		"	.endr					\n\t"
-		"	.rept		7			\n\t"
-		"	move.4		(%0)4++, %1		\n\t"
-		"	.endr					\n\t"
-		"	add.4		%2, #-32, %2		\n\t"
-		"	jmpgt.w.f	1b			\n\t"
-
-		"	and.4		%3, #3, %3		\n\t"	// test bit 1 of n
-		"	jmpne.w.f	200b			\n\t"
-		"2:						\n\t"
-
-			: "+a" (s), "+d" (c), "+d" (m), "+d" (n)
-			:
-			: "d15", "a3", "memory", "cc"
-		);
-
-		return s_ret;
-	}
-
-	asm volatile (
-	"	sub.4		d15, #0, %2		\n\t"
-	"	jmpeq.w.f	2f			\n\t"
-	"	and.4		d15, #(8-1), d15	\n\t"	// d15 = (-%2) & (16 - 1)
-	"	moveai		a3, #%%hi(1f)		\n\t"
-	"	lea.1		a3, %%lo(1f)(a3)	\n\t"
-	"	lea.4		a3, (a3,d15)		\n\t"
-	"	calli		a3, 0(a3)		\n\t"
-
-	"1:	.rept		8			\n\t"
-	"	move.1		(%0)1++, %1		\n\t"
-	"	.endr					\n\t"
-	"2:						\n\t"
-
-		: "+a" (s), "+d" (c), "+d" (n)
-		:
-		: "d15", "a3", "memory", "cc"
-	);
-
-	return s_ret;
-}
-
-void *memmove(void *dest, const void *src, size_t n)
-{
-	char *tmp;
-	const char *s;
-
-	if (n == 0)
-		return dest;
-
-	tmp = dest;
-	s = src;
-
-	/*
-	 * Will perform 16-bit move if possible
-	 */
-	if (likely((((u32)dest | (u32)src | n) & 1) == 0)) {
-		if (dest <= src) {
-			asm volatile (
-			"	sub.4		d15, #0, %2		\n\t"	// set up for jump table
-			"	and.4		d15, #(32-2), d15	\n\t"	// d15 = (- count) & (32 - 2)
-			"	moveai		a3, #%%hi(1f)		\n\t"
-			"	lea.1		a3, %%lo(1f)(a3)	\n\t"
-			"	lea.2		a3, (a3,d15)		\n\t"
-			"	calli		a3, 0(a3)		\n\t"
-
-			"1:	.rept		16			\n\t"
-			"	move.2		(%0)2++, (%1)2++	\n\t"
-			"	.endr					\n\t"
-			"	add.4		%2, #-32, %2		\n\t"
-			"	jmpgt.w.f	1b			\n\t"
-
-			: "+a" (tmp), "+a" (s), "+d" (n)
-			:
-			: "d15", "a3", "memory", "cc"
-			);
-		} else {
-			tmp += n;
-			s += n;
-			asm volatile (
-			"	sub.4		d15, #0, %2		\n\t"	// set up for jump table
-			"	and.4		d15, #(32-2), d15	\n\t"	// d15 = (- count) & (32 - 2)
-			"	moveai		a3, #%%hi(1f)		\n\t"
-			"	lea.1		a3, %%lo(1f)(a3)	\n\t"
-			"	lea.2		a3, (a3,d15)		\n\t"
-			"	calli		a3, 0(a3)		\n\t"
-
-			"1:	.rept		16			\n\t"
-			"	move.2		-2(%0)++, -2(%1)++	\n\t"
-			"	.endr					\n\t"
-			"	add.4		%2, #-32, %2		\n\t"
-			"	jmpgt.w.f	1b			\n\t"
-
-			: "+a" (tmp), "+a" (s), "+d" (n)
-			:
-			: "d15", "a3", "memory", "cc"
-			);
-		}
-		return dest;
-	}
-
-	if (dest <= src) {
-		asm volatile (
-		"	sub.4		d15, #0, %2		\n\t"	// set up for jump table
-		"	and.4		d15, #(16-1), d15	\n\t"	// d15 = (- count) & (16 - 1)
-		"	moveai		a3, #%%hi(1f)		\n\t"
-		"	lea.1		a3, %%lo(1f)(a3)	\n\t"
-		"	lea.4		a3, (a3,d15)		\n\t"
-		"	calli		a3, 0(a3)		\n\t"
-
-		"1:	.rept		16			\n\t"
-		"	move.1		(%0)1++, (%1)1++	\n\t"
-		"	.endr					\n\t"
-		"	add.4		%2, #-16, %2		\n\t"
-		"	jmpgt.w.f	1b			\n\t"
-		: "+a" (tmp), "+a" (s), "+d" (n)
-		:
-		: "d15", "a3", "memory", "cc"
-		);
-	} else {
-		tmp += n;
-		s += n;
-		asm volatile (
-		"	sub.4		d15, #0, %2		\n\t"	// set up for jump table
-		"	and.4		d15, #(16-1), d15	\n\t"	// d15 = (- count) & (16 - 1)
-		"	moveai		a3, #%%hi(1f)		\n\t"
-		"	lea.1		a3, %%lo(1f)(a3)	\n\t"
-		"	lea.4		a3, (a3,d15)		\n\t"
-		"	calli		a3, 0(a3)		\n\t"
-
-		"1:	.rept		16			\n\t"
-		"	move.1		-1(%0)++, -1(%1)++	\n\t"
-		"	.endr					\n\t"
-		"	add.4		%2, #-16, %2		\n\t"
-		"	jmpgt.w.f	1b			\n\t"
-		: "+a" (tmp), "+a" (s), "+d" (n)
-		:
-		: "d15", "a3", "memory", "cc"
-		);
-	}
-	return dest;
-}
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-common/Kconfig.switch b/target/linux/ubicom32/files/arch/ubicom32/mach-common/Kconfig.switch
deleted file mode 100644
index 0303e1600..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-common/Kconfig.switch
+++ /dev/null
@@ -1,12 +0,0 @@
-menuconfig UBICOM_SWITCH
-	tristate "Switch devices"
-	help
-		This option provides Ethernet switch management options via proc fs
-
-if UBICOM_SWITCH
-config UBICOM_SWITCH_BCM539X
-	tristate "Broadcom BCM539X series (SPI)"
-	depends on SPI_MASTER
-	help
-		Supports Broadcom BCM539X Gigabit Ethernet Switches over SPI
-endif
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-common/Makefile b/target/linux/ubicom32/files/arch/ubicom32/mach-common/Makefile
deleted file mode 100644
index 8c645aff6..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-common/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# arch/ubicom32/mach-common/Makefile
-#	Makefile for Ubicom32 generic drivers/code.
-#
-# (C) Copyright 2009, Ubicom, Inc.
-#
-# This file is part of the Ubicom32 Linux Kernel Port.
-#
-# The Ubicom32 Linux Kernel Port 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.
-#
-# The Ubicom32 Linux Kernel Port is distributed in the hope that it
-# will be useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
-# the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with the Ubicom32 Linux Kernel Port.  If not,
-# see <http://www.gnu.org/licenses/>.
-#
-# Ubicom32 implementation derived from (with many thanks):
-#   arch/m68knommu
-#   arch/blackfin
-#   arch/parisc
-#
-
-obj-y += cachectl.o common.o usb_tio.o usb.o ubi32-gpio.o board.o bootargs.o profile.o
-obj-$(CONFIG_PCI) += pci.o io.o
-
-obj-$(CONFIG_FB_UBICOM32) += vdc_tio.o
-obj-$(CONFIG_UBICOM_HID) += ubicom32hid.o
-obj-$(CONFIG_UBICOM_INPUT) += ubicom32input.o
-obj-$(CONFIG_UBICOM_INPUT_I2C) += ubicom32input_i2c.o
-obj-$(CONFIG_UBICOM_SWITCH) += switch-core.o
-obj-$(CONFIG_UBICOM_SWITCH_BCM539X) += switch-bcm539x.o
-obj-$(CONFIG_UIO_UBICOM32RING) += ring_tio.o
-obj-$(CONFIG_SND_UBI32) += audio.o
-obj-$(CONFIG_UBICOM32_PLIO) += plio.o
-
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-common/audio.c b/target/linux/ubicom32/files/arch/ubicom32/mach-common/audio.c
deleted file mode 100644
index 37db89093..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-common/audio.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * arch/ubicom32/mach-common/audio.c
- *   Generic initialization for Ubicom32 Audio
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- */
-
-#include <linux/platform_device.h>
-#include <linux/types.h>
-
-#include <asm/devtree.h>
-#include <asm/audio.h>
-#include <asm/ubi32-pcm.h>
-
-/*
- * The number of audio devices currently allocated, used for .id
- */
-static int __initdata audio_device_count;
-
-/*
- * The maximum number of resources (cards) that the audio will have.
- * Currently 3, a register space, and up to 2 interrupts.
- */
-#define AUDIO_MAX_RESOURCES	3
-
-/*
- * audio_device_alloc
- *	Checks the device tree and allocates a platform_device if found
- */
-struct platform_device * __init audio_device_alloc(const char *driver_name,
-		const char *node_name, const char *inst_name, int priv_bytes)
-{
-	struct platform_device *pdev;
-	struct resource *res;
-	struct audio_node *audio_node;
-	struct ubi32pcm_platform_data *pdata;
-	struct audio_dev_regs *adr;
-	int idx;
-
-	/*
-	 * Check the device tree for the audio node
-	 */
-	audio_node = (struct audio_node *)devtree_find_node(node_name);
-	if (!audio_node) {
-		printk(KERN_WARNING "audio device '%s' not found\n", node_name);
-		return NULL;
-	}
-
-	if (audio_node->version != AUDIONODE_VERSION) {
-		printk(KERN_WARNING "audio node not compatible\n");
-		return NULL;
-	}
-
-	/*
-	 * Find the instance in this node
-	 */
-	adr = audio_node->regs->adr;
-	for (idx = 0; idx < audio_node->regs->max_devs; idx++) {
-		if ((adr->version == AUDIO_DEV_REGS_VERSION) &&
-		   (strcmp(adr->name, inst_name) == 0)) {
-			break;
-		}
-		adr++;
-	}
-	if (idx == audio_node->regs->max_devs) {
-		printk(KERN_WARNING "audio inst '%s' not found in device '%s'\n", inst_name, node_name);
-		return NULL;
-	}
-
-	/*
-	 * Dynamically create the platform_device structure and resources
-	 */
-	pdev = kzalloc(sizeof(struct platform_device) +
-		       sizeof(struct ubi32pcm_platform_data) +
-		       priv_bytes , GFP_KERNEL);
-	if (!pdev) {
-		printk(KERN_WARNING "audio could not alloc pdev\n");
-		return NULL;
-	}
-
-	res = kzalloc(sizeof(struct resource) * AUDIO_MAX_RESOURCES,
-			GFP_KERNEL);
-	if (!res) {
-		kfree(pdev);
-		printk(KERN_WARNING "audio could not alloc res\n");
-		return NULL;
-	}
-
-	pdev->name = driver_name;
-	pdev->id = audio_device_count++;
-	pdev->resource = res;
-
-	/*
-	 * Fill in the resources and platform data from devtree information
-	 */
-	res[0].start = (u32_t)(audio_node->regs);
-	res[0].end = (u32_t)(audio_node->regs);
-	res[0].flags = IORESOURCE_MEM;
-	res[1 + AUDIO_TX_IRQ_RESOURCE].start = audio_node->dn.sendirq;
-	res[1 + AUDIO_TX_IRQ_RESOURCE].flags = IORESOURCE_IRQ;
-	res[1 + AUDIO_RX_IRQ_RESOURCE].start = audio_node->dn.recvirq;
-	res[1 + AUDIO_RX_IRQ_RESOURCE].flags = IORESOURCE_IRQ;
-	pdev->num_resources = 3;
-
-	printk(KERN_INFO "Audio.%d '%s':'%s' found irq=%d/%d.%d regs=%p pdev=%p/%p\n",
-		pdev->id, node_name, inst_name, audio_node->dn.sendirq,
-		audio_node->dn.recvirq, idx, audio_node->regs, pdev, res);
-	pdata = (struct ubi32pcm_platform_data *)(pdev + 1);
-	pdev->dev.platform_data = pdata;
-	pdata->node_name = node_name;
-	pdata->inst_name = inst_name;
-	pdata->inst_num = idx;
-	if (priv_bytes) {
-		pdata->priv_data = pdata + 1;
-	}
-
-	return pdev;
-}
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-common/board.c b/target/linux/ubicom32/files/arch/ubicom32/mach-common/board.c
deleted file mode 100644
index 9634e3413..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-common/board.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * arch/ubicom32/mach-common/board.c
- *   Board init and support code.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/cpu.h>
-#include <asm/devtree.h>
-
-struct boardnode {
-	struct devtree_node dn;
-	const char *revision;
-};
-
-static const struct boardnode *bn;
-
-/*
- * board_get_revision()
- *	Returns revision string of the board.
- */
-const char *board_get_revision(void)
-{
-	if (!bn) {
-		return "NULL";
-	}
-
-	return bn->revision;
-}
-
-/*
- * board_init
- */
-void __init board_init(void)
-{
-	bn = (struct boardnode *)devtree_find_node("board");
-	if (!bn) {
-		printk(KERN_WARNING "board node not found\n");
-		return;
-	}
-}
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-common/bootargs.c b/target/linux/ubicom32/files/arch/ubicom32/mach-common/bootargs.c
deleted file mode 100644
index 296715098..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-common/bootargs.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * arch/ubicom32/mach-common/bootargs.c
- *   Board init and support code.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/cpu.h>
-#include <asm/devtree.h>
-
-struct bootargsnode {
-	struct devtree_node dn;
-	const char cmdline[512];
-};
-
-static const struct bootargsnode *ban;
-
-/*
- * bootargs_get_cmdline()
- *	Returns kernel boot arguments set by the bootloader.
- */
-const char *bootargs_get_cmdline(void)
-{
-	if (!ban) {
-		return "";
-	}
-
-	return ban->cmdline;
-}
-
-/*
- * bootargs_init
- */
-void __init bootargs_init(void)
-{
-	ban = (struct bootargsnode *)devtree_find_node("bootargs");
-	if (!ban) {
-		printk(KERN_WARNING "bootargs node not found\n");
-		return;
-	}
-}
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-common/cachectl.c b/target/linux/ubicom32/files/arch/ubicom32/mach-common/cachectl.c
deleted file mode 100644
index afb9dc4d4..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-common/cachectl.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * arch/ubicom32/mach-common/cachectl.c
- *   Architecture cache control support
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#include <linux/types.h>
-#include <linux/module.h>
-#include <asm/cachectl.h>
-
-/*
- * The write queue flush procedure in mem_cache_control needs to make
- * DCACHE_WRITE_QUEUE_LENGTH writes to DDR (not OCM). Here we reserve some
- * memory for this operation.
- * Allocate array of cache lines of least DCACHE_WRITE_QUEUE_LENGTH + 1 words in
- * length rounded up to the nearest cache line.
- */
-#define CACHE_WRITE_QUEUE_FLUSH_AREA_SIZE \
-	ALIGN(sizeof(int) * (DCACHE_WRITE_QUEUE_LENGTH + 1), CACHE_LINE_SIZE)
-
-static char cache_write_queue_flush_area[CACHE_WRITE_QUEUE_FLUSH_AREA_SIZE]
-	__attribute__((aligned(CACHE_LINE_SIZE)));
-
-/*
- * ONE_CCR_ADDR_OP is a helper macro that executes a single CCR operation.
- */
-#define ONE_CCR_ADDR_OP(cc, op_addr, op)				\
-	do {								\
-		asm volatile (						\
-		"	btst	"D(CCR_CTRL)"(%0), #"D(CCR_CTRL_VALID)"				\n\t" \
-		"	jmpne.f	.-4								\n\t" \
-		"	move.4	"D(CCR_ADDR)"(%0), %1						\n\t" \
-		"	move.1	"D(CCR_CTRL+3)"(%0), %2						\n\t" \
-		"	bset	"D(CCR_CTRL)"(%0), "D(CCR_CTRL)"(%0), #"D(CCR_CTRL_VALID)"	\n\t" \
-		"	cycles	2								\n\t" \
-		"	btst	"D(CCR_CTRL)"(%0), #"D(CCR_CTRL_DONE)"				\n\t" \
-		"	jmpeq.f	.-4								\n\t" \
-			:						\
-			: "a"(cc), "r"(op_addr), "r"(op & 0xff)		\
-			: "cc"						\
-		);							\
-	} while (0)
-
-/*
- * mem_cache_control()
- *	Special cache control operation
- */
-void mem_cache_control(unsigned long cc, unsigned long begin_addr,
-		       unsigned long end_addr, unsigned long op)
-{
-	unsigned long op_addr;
-	int dccr = cc == DCCR_BASE;
-	if (dccr && op == CCR_CTRL_FLUSH_ADDR) {
-		/*
-		 * We ensure all previous writes have left the data cache write
-		 * queue by sending DCACHE_WRITE_QUEUE_LENGTH writes (to
-		 * different words) down the queue.  If this is not done it's
-		 * possible that the data we are trying to flush hasn't even
-		 * entered the data cache.
-		 * The +1 ensure that the final 'flush' is actually a flush.
-		 */
-		int *flush_area = (int *)cache_write_queue_flush_area;
-		asm volatile(
-			"	.rept "D(DCACHE_WRITE_QUEUE_LENGTH + 1)"	\n\t"
-			"	move.4 (%0)4++, d0				\n\t"
-			"	.endr						\n\t"
-			: "+a"(flush_area)
-			);
-	}
-
-	if (dccr)
-		UBICOM32_LOCK(DCCR_LOCK_BIT);
-	else
-		UBICOM32_LOCK(ICCR_LOCK_BIT);
-
-	/*
-	 * Calculate the cache lines we need to operate on that include
-	 * begin_addr though end_addr.
-	 */
-	begin_addr = begin_addr & ~(CACHE_LINE_SIZE - 1);
-	end_addr = (end_addr + CACHE_LINE_SIZE - 1) & ~(CACHE_LINE_SIZE - 1);
-	op_addr = begin_addr;
-
-	do {
-		ONE_CCR_ADDR_OP(cc, op_addr, op);
-		op_addr += CACHE_LINE_SIZE;
-	} while (likely(op_addr < end_addr));
-
-	if (dccr && op == CCR_CTRL_FLUSH_ADDR) {
-		/*
-		 * It turns out that when flushing the data cache the last flush
-		 * isn't actually complete at this point. This is because there
-		 * is another write buffer on the DDR side of the cache that is
-		 * arbitrated with the I-Cache.
-		 *
-		 * The only foolproof method that ensures that the last data
-		 * cache flush *actually* completed is to do another flush on a
-		 * dirty cache line. This flush will block until the DDR write
-		 * buffer is empty.
-		 *
-		 * Rather than creating a another dirty cache line, we use the
-		 * flush_area above as we know that it is dirty from previous
-		 * writes.
-		 */
-		ONE_CCR_ADDR_OP(cc, cache_write_queue_flush_area, op);
-	}
-
-	if (dccr)
-		UBICOM32_UNLOCK(DCCR_LOCK_BIT);
-	else
-		UBICOM32_UNLOCK(ICCR_LOCK_BIT);
-
-}
-EXPORT_SYMBOL(mem_cache_control);
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-common/common.c b/target/linux/ubicom32/files/arch/ubicom32/mach-common/common.c
deleted file mode 100644
index 2f183bd10..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-common/common.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * arch/ubicom32/mach-common/common.c
- *   Common platform support.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <linux/version.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/list.h>
-#include <linux/errno.h>
-#include <linux/err.h>
-#include <linux/string.h>
-#include <linux/clk.h>
-#include <linux/mutex.h>
-#include <linux/platform_device.h>
-
-
-/* Minimum CLK support */
-
-struct clk *clk_get(struct device *dev, const char *id)
-{
-	return ERR_PTR(-ENOENT);
-}
-EXPORT_SYMBOL(clk_get);
-
-void clk_put(struct clk *clk)
-{
-}
-EXPORT_SYMBOL(clk_put);
-
-int clk_enable(struct clk *clk)
-{
-	return 0;
-}
-EXPORT_SYMBOL(clk_enable);
-
-
-void clk_disable(struct clk *clk)
-{
-}
-EXPORT_SYMBOL(clk_disable);
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-common/io.c b/target/linux/ubicom32/files/arch/ubicom32/mach-common/io.c
deleted file mode 100644
index 3c55ba771..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-common/io.c
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * arch/ubicom32/mach-common/io.c
- *   PCI I/O memory read/write support functions.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/io.h>
-
-#ifdef CONFIG_PCI
-unsigned char  ioread8(void __iomem *addr)
-{
-	if (IS_PCI_ADDRESS(addr))
-		return ubi32_pci_read_u8(addr);
-	else
-		return (unsigned char)(*(volatile unsigned char *)addr);
-}
-EXPORT_SYMBOL(ioread8);
-
-unsigned short  ioread16(void __iomem *addr)
-{
-	if (IS_PCI_ADDRESS(addr))
-		return ubi32_pci_read_u16(addr);
-	else
-		return (unsigned short)(*(volatile unsigned short *)addr);
-}
-EXPORT_SYMBOL(ioread16);
-
-unsigned int  ioread32(void __iomem *addr)
-{
-	if (IS_PCI_ADDRESS(addr))
-		return ubi32_pci_read_u32(addr);
-	else
-		return (unsigned int)(*(volatile unsigned int *)addr);
-}
-EXPORT_SYMBOL(ioread32);
-
-void iowrite32(unsigned int val, void __iomem *addr)
-{
-	if (IS_PCI_ADDRESS(addr))
-		ubi32_pci_write_u32(val, addr);
-	else
-		*(volatile unsigned int *)addr = val;
-}
-EXPORT_SYMBOL(iowrite32);
-
-void iowrite16(unsigned short val, void __iomem *addr)
-{
-	if (IS_PCI_ADDRESS(addr))
-		ubi32_pci_write_u16(val, addr);
-	else
-		*(volatile unsigned short *)addr = val;
-}
-EXPORT_SYMBOL(iowrite16);
-
-void iowrite8(unsigned char val, void __iomem *addr)
-{
-	if (IS_PCI_ADDRESS(addr))
-		ubi32_pci_write_u8(val, addr);
-	else
-		*(volatile unsigned char *)addr = val;
-}
-EXPORT_SYMBOL(iowrite8);
-
-void memcpy_fromio(void *to, const volatile void __iomem *from, unsigned len)
-{
-	if (IS_PCI_ADDRESS(from)) {
-		if ((((u32_t)from & 0x3) == 0) && (((u32_t)to & 0x3) == 0)) {
-			while ((int)len >= 4) {
-				*(u32_t *)to = ubi32_pci_read_u32(from);
-				to += 4;
-				from += 4;
-				len -= 4;
-			}
-		} else if ((((u32_t)from & 0x1) == 0) &&
-			   (((u32_t)to & 0x1) == 0)) {
-			while ((int)len >= 2) {
-				 *(u16_t *)to = ubi32_pci_read_u16(from);
-				 to += 2;
-				 from += 2;
-				 len -= 2;
-			}
-		}
-
-		while (len) {
-			*(u8_t *)to = ubi32_pci_read_u8(from);
-			to++;
-			from++;
-			len--;
-		}
-	} else
-		memcpy(to, (void *)from, len);
-}
-EXPORT_SYMBOL(memcpy_fromio);
-
-void memcpy_toio(volatile void __iomem *to, const void *from, unsigned len)
-{
-	if (IS_PCI_ADDRESS(to)) {
-		if ((((u32_t)from & 0x3) == 0) && (((u32_t)to & 0x3) == 0)) {
-			while ((int)len >= 4) {
-				ubi32_pci_write_u32(*(u32_t *)from, to);
-				to += 4;
-				from += 4;
-				len -= 4;
-			}
-		} else if ((((u32_t)from & 0x1) == 0) &&
-			   (((u32_t)to & 0x1) == 0)) {
-			while ((int)len >= 2) {
-				ubi32_pci_write_u16(*(u16_t *)from, to);
-				to += 2;
-				from += 2;
-				len -= 2;
-			}
-		}
-
-		while (len) {
-			ubi32_pci_write_u8(*(u8_t *)from, to);
-			from++;
-			to++;
-			len--;
-		}
-	} else
-		memcpy((void *)to, from, len);
-
-}
-EXPORT_SYMBOL(memcpy_toio);
-
-void memset_io(volatile void __iomem *addr, int val, size_t len)
-{
-	if (IS_PCI_ADDRESS(addr)) {
-		while (len) {
-			ubi32_pci_write_u8((unsigned char)val, addr);
-			addr++;
-			len--;
-		}
-	} else
-		memset((void *)addr, val, len);
-
-}
-EXPORT_SYMBOL(memset_io);
-
-void ioread8_rep(void __iomem *port, void *buf, unsigned long count)
-{
-	if (IS_PCI_ADDRESS(port)) {
-		while (count) {
-			*(u8_t *)buf = ioread8(port);
-			buf++;
-			count--;
-		}
-	} else {
-		insb((unsigned int)port, buf, count);
-	}
-
-}
-EXPORT_SYMBOL(ioread8_rep);
-
-void ioread16_rep(void __iomem *port, void *buf, unsigned long count)
-{
-	if (IS_PCI_ADDRESS(port)) {
-		while (count) {
-			*(u16_t *)buf = ioread16(port);
-			buf += 2;
-			count--;
-		}
-	} else {
-		insw((unsigned int)port, buf, count);
-	}
-}
-EXPORT_SYMBOL(ioread16_rep);
-
-void ioread32_rep(void __iomem *port, void *buf, unsigned long count)
-{
-	 if (IS_PCI_ADDRESS(port)) {
-		while (count) {
-			*(u32_t *)buf = ioread32(port);
-			buf += 4;
-			count--;
-		}
-	} else {
-		insl((unsigned int)port, buf, count);
-	}
-}
-EXPORT_SYMBOL(ioread32_rep);
-
-void  iowrite8_rep(void __iomem *port, const void *buf, unsigned long count)
-{
-	  if (IS_PCI_ADDRESS(port)) {
-		while (count) {
-			iowrite8(*(u8_t *)buf, port);
-			buf++;
-			count--;
-		}
-	} else {
-		outsb((unsigned int)port, buf, count);
-	}
-
-}
-EXPORT_SYMBOL(iowrite8_rep);
-
-void  iowrite16_rep(void __iomem *port, const void *buf, unsigned long count)
-{
-	if (IS_PCI_ADDRESS(port)) {
-		while (count) {
-			iowrite16(*(u16_t *)buf, port);
-			buf += 2;
-			count--;
-		}
-	} else {
-		outsw((unsigned int)port, buf, count);
-	}
-}
-EXPORT_SYMBOL(iowrite16_rep);
-
-void  iowrite32_rep(void __iomem *port, const void *buf, unsigned long count)
-{
-	if (IS_PCI_ADDRESS(port)) {
-		while (count) {
-			iowrite32(*(u32_t *)buf, port);
-			buf += 4;
-			count--;
-		}
-	} else {
-		outsl((unsigned int)port, buf, count);
-	}
-}
-EXPORT_SYMBOL(iowrite32_rep);
-
-#endif /* CONFIG_PCI */
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-common/pci.c b/target/linux/ubicom32/files/arch/ubicom32/mach-common/pci.c
deleted file mode 100644
index a3a07121d..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-common/pci.c
+++ /dev/null
@@ -1,1157 +0,0 @@
-/*
- * arch/ubicom32/mach-common/pci.c
- *	PCI interface management.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/pci.h>
-#include <linux/slab.h>
-#include <linux/init.h>
-#include <linux/io.h>
-#include <linux/seq_file.h>
-#include <linux/proc_fs.h>
-
-#include <asm/devtree.h>
-#include <asm/ip5000.h>
-#include <asm/ubicom32-common.h>
-
-static int debug_pci = 1 ;
-
-/* #define PCI_USE_INTERNAL_LOCK 1 */
-
-#ifdef PCI_USE_INTERNAL_LOCK
-#define PCI_LOCK(lock, irqflag)	pci_lock_acquire(irqflag)
-#define PCI_UNLOCK(lock, irqflag) pci_lock_release(irqflag)
-#elif defined(CONFIG_SMP)
-static DEFINE_SPINLOCK(pci_master_lock);
-#define PCI_LOCK(lock, irqflag)	spin_lock_irqsave(lock, irqflag)
-#define PCI_UNLOCK(lock, irqflag) spin_unlock_irqrestore(lock, irqflag)
-#else
-#define PCI_LOCK(lock, irqflag)		local_irq_save(irqflag)
-#define PCI_UNLOCK(lock, irqflag)	local_irq_restore(irqflag)
-#endif
-
-#define PCI_DEV0_IDSEL CONFIG_PCI_DEV0_IDSEL
-#define PCI_DEV1_IDSEL CONFIG_PCI_DEV1_IDSEL
-
-/*
- * PCI commands
- */
-#define PCI_CMD_INT_ACK		0x00	/* not supported */
-#define PCI_CMD_SPECIAL		0x01	/* not supported */
-#define PCI_CMD_IO_READ		0x02
-#define PCI_CMD_IO_WRITE	0x03
-#define PCI_CMD_MEM_READ	0x06
-#define PCI_CMD_MEM_WRITE	0x07
-#define PCI_CMD_CFG_READ	0x0a
-#define PCI_CMD_CFG_WRITE	0x0b
-#define PCI_CMD_MEM_READ_MULT	0x0c	/* not supported */
-#define PCI_CMD_DUAL_ADDR	0x0d	/* not supported */
-#define PCI_CMD_MEM_READ_LINE	0x0e	/* not supported */
-#define PCI_CMD_MEM_WRITE_INVAL	0x0f	/* not supported */
-/*
- * Status codes, returned by pci_read_u32() and pci_write_u32()
- */
-#define PCI_RESP_IN_PROGRESS	0xff  /* request still in queue */
-#define PCI_RESP_OK		0
-/*
- * The following codes indicate that the request has completed
- */
-#define PCI_RESP_NO_DEVSEL		1  /* timeout before target asserted
-					    * DEVSEL! */
-#define PCI_RESP_LOST_DEVSEL		2  /* had DEVSEL, but went away before
-					    * transfer completed! */
-#define PCI_RESP_BAD_TRDY		3  /* target asserted TRDY without
-					    * DEVSEL! */
-#define PCI_RESP_NO_TRDY		4  /* timeout before target asserted
-					    * TRDY! */
-#define PCI_RESP_BAD_STOP		5  /* target asserted STOP and TRDY
-					    * without DEVSEL! */
-#define PCI_RESP_TARGET_ABORT		6
-#define PCI_RESP_TARGET_RETRY		7
-#define	PCI_RESP_TARGET_DISCONNECT	8
-#define PCI_RESP_MISMATCH		9  /* data read back doesn't match data
-					    * written - debug only, the core PCI
-					    * routines never return this */
-#define PCI_RESP_DET_SERR		10
-#define PCI_RESP_DET_PERR		11
-#define PCI_RESP_MALFORMED_REQ		12 /* Could be due to misaligned
-					    * requests or invalid address */
-#define PCI_RESP_NO_RESOURCE		13 /* Could be memory or other resourse
-					    * like queue space */
-#define PCI_RESP_ERROR			14 /* All emcompassing error */
-
-/* registers in PCI config space */
-#define PCI_DEVICE_VENDOR_ID_REG	0x00
-#define PCI_STATUS_COMMAND_REG		0x04
-#define PCI_CLASS_REVISION_REG		0x08
-#define PCI_BHLC_REG			0x0c  /* BIST, Header type, Latency
-					       * timer, Cache line size */
-#define PCI_BASE_ADDR_REG		0x10
-#define PCI_BASE_REG_COUNT		6
-#define CARDBUS_CIS_PTR_REG		0x28
-#define PCI_SUB_SYSTEM_ID_REG		0x2c
-#define PCI_EXP_ROM_ADDR_REG		0x30
-#define PCI_CAP_PTR_REG			0x34
-#define PCI_LGPL_REG			0x3C  /* max Latency, min Gnt, interrupt
-					       * Pin, interrupt Line */
-
-struct pci_master_request {
-	volatile u32_t pci_address;	/* must be 4-byte aligned */
-	volatile u32_t data;		/* must be 4-byte aligned */
-	volatile u8_t cmd;
-	volatile u8_t byte_valid;
-	volatile u8_t status;
-};
-
-struct pci_devnode {
-	struct devtree_node dn;
-	u32_t pci_idsel_0;
-	u32_t pci_idsel_1;
-	u32_t pci_cpu_address;
-	struct pci_master_request volatile *volatile req;
-};
-
-static struct pci_master_request req;	/* globally used for faster master write
-					 * (discarding result when possible) */
-static struct pci_devnode *pci_node;
-
-#if !defined(CONFIG_DEBUG_PCIMEASURE)
-#define PCI_DECLARE_MEASUREMENT
-#define PCI_MEASUREMENT_START()
-#define PCI_MEASUREMENT_END(idx)
-#else
-#define PCI_DECLARE_MEASUREMENT \
-	int __diff;		\
-	unsigned int __tstart;
-
-#define PCI_MEASUREMENT_START() \
-	__tstart = UBICOM32_IO_TIMER->sysval;
-
-#define PCI_MEASUREMENT_END(idx) \
-	__diff = (int)UBICOM32_IO_TIMER->sysval - (int)__tstart; \
-	pci_measurement_update((idx), __diff);
-
-#define PCI_WEIGHT 32
-
-struct pci_measurement {
-	volatile unsigned int min;
-	volatile unsigned int avg;
-	volatile unsigned int max;
-};
-
-enum pci_measurement_list {
-	PCI_MEASUREMENT_READ32,
-	PCI_MEASUREMENT_WRITE32,
-	PCI_MEASUREMENT_READ16,
-	PCI_MEASUREMENT_WRITE16,
-	PCI_MEASUREMENT_READ8,
-	PCI_MEASUREMENT_WRITE8,
-	PCI_MEASUREMENT_LAST,
-};
-
-static const char *pci_measurement_name_list[PCI_MEASUREMENT_LAST] = {
-	"READ32",
-	"WRITE32",
-	"READ16",
-	"WRITE16",
-	"READ8",
-	"WRITE8"
-};
-static struct pci_measurement pci_measurements[PCI_MEASUREMENT_LAST];
-
-/*
- * pci_measurement_update()
- *	Update an entry in the measurement array for this idx.
- */
-static void pci_measurement_update(int idx, int sample)
-{
-	struct pci_measurement *pm = &pci_measurements[idx];
-	if ((pm->min == 0) || (pm->min > sample)) {
-		pm->min = sample;
-	}
-	if (pm->max < sample) {
-		pm->max = sample;
-	}
-	pm->avg = ((pm->avg * (PCI_WEIGHT - 1)) + sample) / PCI_WEIGHT;
-}
-#endif
-
-#if defined(PCI_USE_INTERNAL_LOCK)
-/*
- * pci_lock_release()
- *	Release the PCI lock.
- */
-static void pci_lock_release(unsigned long irqflag)
-{
-	UBICOM32_UNLOCK(PCI_LOCK_BIT);
-}
-
-/*
- * pci_lock_acquire()
- *	Acquire the PCI lock, spin if not available.
- */
-static void pci_lock_acquire(unsigned long irqflag)
-{
-	UBICOM32_LOCK(PCI_LOCK_BIT);
-}
-#endif
-
-/*
- * pci_set_hrt_interrupt()
- */
-static inline void pci_set_hrt_interrupt(struct pci_devnode *pci_node)
-{
-	ubicom32_set_interrupt(pci_node->dn.sendirq);
-}
-
-/*
- * pci_read_u32()
- *	Synchronously read 32 bits from PCI space.
- */
-u8 pci_read_u32(u8 pci_cmd, u32 address, u32 *data)
-{
-	u8 status;
-	unsigned long irqflag;
-
-
-	/*
-	 * Fill in the request.
-	 */
-	volatile struct pci_master_request lreq;
-	PCI_DECLARE_MEASUREMENT;
-
-	lreq.pci_address = address;
-	lreq.cmd = pci_cmd;
-	lreq.byte_valid = 0xf;		/* enable all bytes */
-
-	/*
-	 * Wait for any previous request to complete and then make this request.
-	 */
-	PCI_MEASUREMENT_START();
-	PCI_LOCK(&pci_master_lock, irqflag);
-	while (unlikely(pci_node->req == &req))
-		;
-	pci_node->req = &lreq;
-	pci_set_hrt_interrupt(pci_node);
-	PCI_UNLOCK(&pci_master_lock, irqflag);
-
-	/*
-	 * Wait for the result to show up.
-	 */
-	while (unlikely(pci_node->req == &lreq))
-		;
-	status = lreq.status;
-	if (likely(status == PCI_RESP_OK))
-		*data = le32_to_cpu(lreq.data);
-	else
-		*data = 0;
-	PCI_MEASUREMENT_END(PCI_MEASUREMENT_READ32);
-	return status;
-}
-
-/*
- * pci_write_u32()
- *	Asyncrhnously or synchronously write 32 bits to PCI master space.
- */
-u8 pci_write_u32(u8 pci_cmd, u32 address, u32 data)
-{
-	unsigned long irqflag;
-	PCI_DECLARE_MEASUREMENT;
-
-	/*
-	 * Wait for any previous write or pending read to complete.
-	 *
-	 * We use a global data block because once we write the request
-	 * we do not wait for it to complete before exiting.
-	 */
-	PCI_MEASUREMENT_START();
-	PCI_LOCK(&pci_master_lock, irqflag);
-	while (unlikely(pci_node->req == &req))
-		;
-	req.pci_address = address;
-	req.data = cpu_to_le32(data);
-	req.cmd = pci_cmd;
-	req.byte_valid = 0xf;		/* enable all bytes */
-	pci_node->req = &req;
-	pci_set_hrt_interrupt(pci_node);
-	PCI_UNLOCK(&pci_master_lock, irqflag);
-	PCI_MEASUREMENT_END(PCI_MEASUREMENT_WRITE32);
-	return PCI_RESP_OK;
-}
-
-/*
- * pci_read_u16()
- *	Synchronously read 16 bits from PCI space.
- */
-u8 pci_read_u16(u8 pci_cmd, u32 address, u16 *data)
-{
-	u8 status;
-	unsigned long irqflag;
-
-	/*
-	 * Fill in the request.
-	 */
-	volatile struct pci_master_request lreq;
-	PCI_DECLARE_MEASUREMENT;
-
-	lreq.pci_address = address & ~2;
-	lreq.cmd = pci_cmd;
-	lreq.byte_valid = (address & 2) ? 0xc : 0x3;
-
-	/*
-	 * Wait for any previous request to complete and then make this request.
-	 */
-	PCI_MEASUREMENT_START();
-	PCI_LOCK(&pci_master_lock, irqflag);
-	while (unlikely(pci_node->req == &req))
-		;
-	pci_node->req = &lreq;
-	pci_set_hrt_interrupt(pci_node);
-	PCI_UNLOCK(&pci_master_lock, irqflag);
-
-	/*
-	 * Wait for the result to show up.
-	 */
-	while (unlikely(pci_node->req == &lreq))
-		;
-	status = lreq.status;
-	if (likely(status == PCI_RESP_OK)) {
-		lreq.data = le32_to_cpu(lreq.data);
-		*data = (u16)((address & 2) ? (lreq.data >> 16) : lreq.data);
-	} else
-		*data = 0;
-	PCI_MEASUREMENT_END(PCI_MEASUREMENT_READ16);
-	return status;
-}
-
-/*
- * pci_write_u16()
- *	Asyncrhnously or synchronously write 16 bits to PCI master space.
- */
-u8 pci_write_u16(u8 pci_cmd, u32 address, u16 data)
-{
-	unsigned long irqflag;
-	PCI_DECLARE_MEASUREMENT;
-
-	/*
-	 * Wait for any previous write or pending read to complete.
-	 *
-	 * We use a global data block because once we write the request
-	 * we do not wait for it to complete before exiting.
-	 */
-	PCI_MEASUREMENT_START();
-	PCI_LOCK(&pci_master_lock, irqflag);
-	while (unlikely(pci_node->req == &req))
-		;
-	req.pci_address = address & ~2;
-	req.data = (u32)data;
-	req.data = cpu_to_le32((address & 2) ? (req.data << 16) : req.data);
-	req.cmd = pci_cmd;
-	req.byte_valid = (address & 2) ? 0xc : 0x3;
-	pci_node->req = &req;
-	pci_set_hrt_interrupt(pci_node);
-	PCI_UNLOCK(&pci_master_lock, irqflag);
-	PCI_MEASUREMENT_END(PCI_MEASUREMENT_WRITE16);
-	return PCI_RESP_OK;
-}
-
-/*
- * pci_read_u8()
- *	Synchronously read 8 bits from PCI space.
- */
-u8 pci_read_u8(u8 pci_cmd, u32 address, u8 *data)
-{
-	u8 status;
-	unsigned long irqflag;
-
-	/*
-	 * Fill in the request.
-	 */
-	volatile struct pci_master_request lreq;
-	PCI_DECLARE_MEASUREMENT;
-
-	lreq.pci_address = address & ~3;
-	lreq.cmd = pci_cmd;
-	lreq.byte_valid = 1 << (address & 0x3);
-
-	/*
-	 * Wait for any previous request to complete and then make this request.
-	 */
-	PCI_MEASUREMENT_START();
-	PCI_LOCK(&pci_master_lock, irqflag);
-	while (unlikely(pci_node->req == &req))
-		;
-	pci_node->req = &lreq;
-	pci_set_hrt_interrupt(pci_node);
-	PCI_UNLOCK(&pci_master_lock, irqflag);
-
-	/*
-	 * Wait for the result to show up.
-	 */
-	while (unlikely(pci_node->req == &lreq))
-		;
-	status = lreq.status;
-	if (likely(status == PCI_RESP_OK)) {
-		*data = (u8)(lreq.data >> (24 - ((address & 0x3) << 3)));
-	} else
-		*data = 0;
-	PCI_MEASUREMENT_END(PCI_MEASUREMENT_READ8);
-	return status;
-}
-
-/*
- * pci_write_u8()
- *	Asyncrhnously or synchronously write 8 bits to PCI master space.
- */
-u8 pci_write_u8(u8 pci_cmd, u32 address, u8 data)
-{
-	unsigned long irqflag;
-	PCI_DECLARE_MEASUREMENT;
-
-	/*
-	 * Wait for any previous write or pending read to complete.
-	 *
-	 * We use a global data block because once we write the request
-	 * we do not wait for it to complete before exiting.
-	 */
-	PCI_MEASUREMENT_START();
-	PCI_LOCK(&pci_master_lock, irqflag);
-	while (unlikely(pci_node->req == &req))
-		;
-	req.pci_address = address & ~3;
-	req.data = ((u32)data << (24 - ((address & 0x3) << 3)));
-	req.cmd = pci_cmd;
-	req.byte_valid = 1 << (address & 0x3);
-	pci_node->req = &req;
-	pci_set_hrt_interrupt(pci_node);
-	PCI_UNLOCK(&pci_master_lock, irqflag);
-	PCI_MEASUREMENT_END(PCI_MEASUREMENT_WRITE8);
-	return PCI_RESP_OK;
-}
-
-unsigned int ubi32_pci_read_u32(const volatile void __iomem *addr)
-{
-	unsigned int data;
-	pci_read_u32(PCI_CMD_MEM_READ, (u32)addr, &data);
-	return data;
-}
-EXPORT_SYMBOL(ubi32_pci_read_u32);
-
-unsigned short ubi32_pci_read_u16(const volatile void __iomem *addr)
-{
-	unsigned short data;
-	pci_read_u16(PCI_CMD_MEM_READ, (u32)addr, &data);
-	return data;
-}
-EXPORT_SYMBOL(ubi32_pci_read_u16);
-
-unsigned char  ubi32_pci_read_u8(const volatile void __iomem *addr)
-{
-	unsigned char  data;
-	pci_read_u8(PCI_CMD_MEM_READ, (u32)addr, &data);
-	return data;
-}
-EXPORT_SYMBOL(ubi32_pci_read_u8);
-
-void ubi32_pci_write_u32(unsigned int val, const volatile void __iomem *addr)
-{
-	pci_write_u32(PCI_CMD_MEM_WRITE, (u32)addr, val);
-}
-EXPORT_SYMBOL(ubi32_pci_write_u32);
-
-void ubi32_pci_write_u16(unsigned short val, const volatile void __iomem *addr)
-{
-	pci_write_u16(PCI_CMD_MEM_WRITE, (u32)addr, val);
-}
-EXPORT_SYMBOL(ubi32_pci_write_u16);
-
-void ubi32_pci_write_u8(unsigned char val, const void volatile __iomem *addr)
-{
-	pci_write_u8(PCI_CMD_MEM_WRITE, (u32)addr, val);
-}
-EXPORT_SYMBOL(ubi32_pci_write_u8);
-
-#if defined(CONFIG_DEBUG_PCIMEASURE)
-static unsigned int pci_cycles_to_nano(unsigned int cycles, unsigned int frequency)
-{
-	unsigned int nano = ((cycles * 1000) / (frequency / 1000000));
-	return nano;
-}
-
-/*
- * pci_measurement_show()
- *	Print out the min, avg, max values for each PCI transaction type.
- *
- * By request, the max value is reset after each dump.
- */
-static int pci_measurement_show(struct seq_file *p, void *v)
-{
-	unsigned int min, avg, max;
-	unsigned int freq = processor_frequency();
-	int trans = *((loff_t *) v);
-
-	if (trans == 0) {
-		seq_puts(p, "min\tavg\tmax\t(nano-seconds)\n");
-	}
-
-	if (trans >= PCI_MEASUREMENT_LAST) {
-		return 0;
-	}
-
-	min = pci_cycles_to_nano(pci_measurements[trans].min, freq);
-	avg = pci_cycles_to_nano(pci_measurements[trans].avg, freq);
-	max = pci_cycles_to_nano(pci_measurements[trans].max, freq);
-	pci_measurements[trans].max = 0;
-	seq_printf(p, "%u\t%u\t%u\t%s\n", min, avg, max, pci_measurement_name_list[trans]);
-	return 0;
-}
-
-static void *pci_measurement_start(struct seq_file *f, loff_t *pos)
-{
-	return (*pos < PCI_MEASUREMENT_LAST) ? pos : NULL;
-}
-
-static void *pci_measurement_next(struct seq_file *f, void *v, loff_t *pos)
-{
-	(*pos)++;
-	if (*pos >= PCI_MEASUREMENT_LAST)
-		return NULL;
-	return pos;
-}
-
-static void pci_measurement_stop(struct seq_file *f, void *v)
-{
-	/* Nothing to do */
-}
-
-static const struct seq_operations pci_measurement_seq_ops = {
-	.start = pci_measurement_start,
-	.next  = pci_measurement_next,
-	.stop  = pci_measurement_stop,
-	.show  = pci_measurement_show,
-};
-
-static int pci_measurement_open(struct inode *inode, struct file *filp)
-{
-	return seq_open(filp, &pci_measurement_seq_ops);
-}
-
-static const struct file_operations pci_measurement_fops = {
-	.open		= pci_measurement_open,
-	.read		= seq_read,
-	.llseek		= seq_lseek,
-	.release	= seq_release,
-};
-
-static int __init pci_measurement_init(void)
-{
-	proc_create("pci_measurements", 0, NULL, &pci_measurement_fops);
-	return 0;
-}
-module_init(pci_measurement_init);
-#endif
-
-static int ubi32_pci_read_config(struct pci_bus *bus, unsigned int devfn,
-				 int where, int size, u32 *value)
-{
-	u8 cmd;
-	u32 addr;
-	u8  data8;
-	u16 data16;
-
-	u8 slot = PCI_SLOT(devfn);
-	u8 fn = PCI_FUNC(devfn);
-
-	if (slot > 1) {
-		return PCIBIOS_DEVICE_NOT_FOUND;
-	} else if (slot == 0) {
-		addr = PCI_DEV0_IDSEL + where;
-	} else {
-		addr = PCI_DEV1_IDSEL + where;
-	}
-
-	addr += (fn << 8);
-
-	cmd = PCI_CMD_CFG_READ;
-	if (size == 1) {
-		pci_read_u8(cmd, addr, &data8);
-		*value = (u32)data8;
-	} else if (size == 2) {
-		pci_read_u16(cmd, addr, &data16);
-		*value = (u32)data16;
-	} else {
-		pci_read_u32(cmd, addr, value);
-	}
-
-	return PCIBIOS_SUCCESSFUL;
-}
-
-static int ubi32_pci_write_config(struct pci_bus *bus, unsigned int devfn,
-				  int where, int size, u32 value)
-{
-	u8 cmd;
-	u32 addr;
-	u8 slot = PCI_SLOT(devfn);
-	u8 fn = PCI_FUNC(devfn);
-
-	if (slot > 1) {
-		return PCIBIOS_DEVICE_NOT_FOUND;
-	} else if (slot == 0) {
-		addr = PCI_DEV0_IDSEL + where;
-	} else {
-		addr = PCI_DEV1_IDSEL + where;
-	}
-
-	addr += (fn << 8);
-
-	cmd = PCI_CMD_CFG_WRITE;
-	if (size == 1) {
-		pci_write_u8(cmd, addr, (u8)value);
-	} else if (size == 2) {
-		pci_write_u16(cmd, addr, (u16)value);
-	} else {
-		pci_write_u32(cmd, addr, value);
-	}
-
-	return PCIBIOS_SUCCESSFUL;
-}
-
-int pci_set_dma_max_seg_size(struct pci_dev *dev, unsigned int size)
-{
-	return -EIO;
-}
-EXPORT_SYMBOL(pci_set_dma_max_seg_size);
-
-int pci_set_dma_seg_boundary(struct pci_dev *dev, unsigned long mask)
-{
-	return -EIO;
-}
-EXPORT_SYMBOL(pci_set_dma_seg_boundary);
-
-void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
-{
-	resource_size_t start = pci_resource_start(dev, bar);
-	resource_size_t len   = pci_resource_len(dev, bar);
-	unsigned long flags = pci_resource_flags(dev, bar);
-
-	if (!len || !start) {
-		return NULL;
-	}
-
-	if (maxlen && len > maxlen) {
-		len = maxlen;
-	}
-
-	if (flags & IORESOURCE_IO) {
-		return ioport_map(start, len);
-	}
-
-	if (flags & IORESOURCE_MEM) {
-		if (flags & IORESOURCE_CACHEABLE) {
-			return ioremap(start, len);
-		}
-		return ioremap_nocache(start, len);
-	}
-	return NULL;
-}
-EXPORT_SYMBOL(pci_iomap);
-
-void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
-{
-	if ((unsigned long)addr >= VMALLOC_START &&
-	    (unsigned long)addr < VMALLOC_END) {
-		iounmap(addr);
-	}
-}
-EXPORT_SYMBOL(pci_iounmap);
-
-/*
- *  From arch/arm/kernel/bios32.c
- *
- *  PCI bios-type initialisation for PCI machines
- *
- *  Bits taken from various places.
- */
-static void __init pcibios_init_hw(struct hw_pci *hw)
-{
-	struct pci_sys_data *sys = NULL;
-	int ret;
-	int nr, busnr;
-
-	for (nr = busnr = 0; nr < hw->nr_controllers; nr++) {
-		sys = kzalloc(sizeof(struct pci_sys_data), GFP_KERNEL);
-		if (!sys)
-			panic("PCI: unable to allocate sys data!");
-
-		sys->hw      = hw;
-		sys->busnr   = busnr;
-		sys->map_irq = hw->map_irq;
-		sys->resource[0] = &ioport_resource;
-		sys->resource[1] = &iomem_resource;
-
-		ret = hw->setup(nr, sys);
-
-		if (ret > 0) {
-			sys->bus = hw->scan(nr, sys);
-
-			if (!sys->bus)
-				panic("PCI: unable to scan bus!");
-
-			busnr = sys->bus->subordinate + 1;
-
-			list_add(&sys->node, &hw->buses);
-		} else {
-			kfree(sys);
-			if (ret < 0)
-				break;
-		}
-	}
-}
-
-/*
- * Swizzle the device pin each time we cross a bridge.
- * This might update pin and returns the slot number.
- */
-static u8 __devinit pcibios_swizzle(struct pci_dev *dev, u8 *pin)
-{
-	struct pci_sys_data *sys = dev->sysdata;
-	int slot = 0, oldpin = *pin;
-
-	if (sys->swizzle)
-		slot = sys->swizzle(dev, pin);
-
-	if (debug_pci)
-		printk("PCI: %s swizzling pin %d => pin %d slot %d\n",
-			pci_name(dev), oldpin, *pin, slot);
-	return slot;
-}
-
-/*
- * Map a slot/pin to an IRQ.
- */
-static int pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
-{
-	struct pci_sys_data *sys = dev->sysdata;
-	int irq = -1;
-
-	if (sys->map_irq)
-		irq = sys->map_irq(dev, slot, pin);
-
-	if (debug_pci)
-		printk("PCI: %s mapping slot %d pin %d => irq %d\n",
-			pci_name(dev), slot, pin, irq);
-
-	return irq;
-}
-
-void __init pci_common_init(struct hw_pci *hw)
-{
-	struct pci_sys_data *sys;
-
-	INIT_LIST_HEAD(&hw->buses);
-
-	if (hw->preinit)
-		hw->preinit();
-	pcibios_init_hw(hw);
-	if (hw->postinit)
-		hw->postinit();
-
-	pci_fixup_irqs(pcibios_swizzle, pcibios_map_irq);
-	list_for_each_entry(sys, &hw->buses, node) {
-		struct pci_bus *bus = sys->bus;
-		/*
-		 * Size the bridge windows.
-		 */
-		pci_bus_size_bridges(bus);
-		/*
-		 * Assign resources.
-		 */
-		pci_bus_assign_resources(bus);
-
-		/*
-		 * Tell drivers about devices found.
-		 */
-		pci_bus_add_devices(bus);
-	}
-}
-
-char * __init pcibios_setup(char *str)
-{
-	if (!strcmp(str, "debug")) {
-		debug_pci = 1;
-		return NULL;
-	}
-	return str;
-}
-
-/*
- * From arch/i386/kernel/pci-i386.c:
- *
- * We need to avoid collisions with `mirrored' VGA ports
- * and other strange ISA hardware, so we always want the
- * addresses to be allocated in the 0x000-0x0ff region
- * modulo 0x400.
- *
- * Why? Because some silly external IO cards only decode
- * the low 10 bits of the IO address. The 0x00-0xff region
- * is reserved for motherboard devices that decode all 16
- * bits, so it's ok to allocate at, say, 0x2800-0x28ff,
- * but we want to try to avoid allocating at 0x2900-0x2bff
- * which might be mirrored at 0x0100-0x03ff..
- */
-void pcibios_align_resource(void *data, struct resource *res,
-			    resource_size_t size, resource_size_t align)
-{
-	resource_size_t start = res->start;
-
-	if (res->flags & IORESOURCE_IO && start & 0x300)
-		start = (start + 0x3ff) & ~0x3ff;
-
-	res->start = (start + align - 1) & ~(align - 1);
-}
-
-
-void __devinit pcibios_update_irq(struct pci_dev *dev, int irq)
-{
-	if (debug_pci)
-		printk("PCI: Assigning IRQ %02d to %s\n", irq, pci_name(dev));
-	pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
-}
-
-/*
- * If the bus contains any of these devices, then we must not turn on
- * parity checking of any kind.  Currently this is CyberPro 20x0 only.
- */
-static inline int pdev_bad_for_parity(struct pci_dev *dev)
-{
-	return (dev->vendor == PCI_VENDOR_ID_INTERG &&
-		(dev->device == PCI_DEVICE_ID_INTERG_2000 ||
-		 dev->device == PCI_DEVICE_ID_INTERG_2010)) ||
-		(dev->vendor == PCI_VENDOR_ID_ITE &&
-		 dev->device == PCI_DEVICE_ID_ITE_8152);
-
-}
-
-/*
- * Adjust the device resources from bus-centric to Linux-centric.
- */
-static void __devinit
-pdev_fixup_device_resources(struct pci_sys_data *root, struct pci_dev *dev)
-{
-	resource_size_t offset;
-	int i;
-
-	for (i = 0; i < PCI_NUM_RESOURCES; i++) {
-		if (dev->resource[i].start == 0)
-			continue;
-		if (dev->resource[i].flags & IORESOURCE_MEM)
-			offset = root->mem_offset;
-		else
-			offset = root->io_offset;
-
-		dev->resource[i].start += offset;
-		dev->resource[i].end   += offset;
-	}
-}
-
-static void __devinit
-pbus_assign_bus_resources(struct pci_bus *bus, struct pci_sys_data *root)
-{
-	struct pci_dev *dev = bus->self;
-	int i;
-
-	if (!dev) {
-		/*
-		 * Assign root bus resources.
-		 */
-		for (i = 0; i < 3; i++)
-			bus->resource[i] = root->resource[i];
-	}
-}
-
-/*
- * pcibios_fixup_bus - Called after each bus is probed,
- * but before its children are examined.
- */
-void pcibios_fixup_bus(struct pci_bus *bus)
-{
-	struct pci_sys_data *root = bus->sysdata;
-	struct pci_dev *dev;
-	u16 features = PCI_COMMAND_SERR | PCI_COMMAND_PARITY |
-		PCI_COMMAND_FAST_BACK;
-
-	pbus_assign_bus_resources(bus, root);
-
-	/*
-	 * Walk the devices on this bus, working out what we can
-	 * and can't support.
-	 */
-	list_for_each_entry(dev, &bus->devices, bus_list) {
-		u16 status;
-
-		pdev_fixup_device_resources(root, dev);
-
-		pci_read_config_word(dev, PCI_STATUS, &status);
-
-		/*
-		 * If any device on this bus does not support fast back
-		 * to back transfers, then the bus as a whole is not able
-		 * to support them.  Having fast back to back transfers
-		 * on saves us one PCI cycle per transaction.
-		 */
-		if (!(status & PCI_STATUS_FAST_BACK))
-			features &= ~PCI_COMMAND_FAST_BACK;
-
-		if (pdev_bad_for_parity(dev))
-			features &= ~(PCI_COMMAND_SERR | PCI_COMMAND_PARITY);
-
-		switch (dev->class >> 8) {
-		case PCI_CLASS_BRIDGE_PCI:
-			pci_read_config_word(dev, PCI_BRIDGE_CONTROL, &status);
-			status |= PCI_BRIDGE_CTL_PARITY |
-				PCI_BRIDGE_CTL_MASTER_ABORT;
-			status &= ~(PCI_BRIDGE_CTL_BUS_RESET |
-				    PCI_BRIDGE_CTL_FAST_BACK);
-			pci_write_config_word(dev, PCI_BRIDGE_CONTROL, status);
-			break;
-
-		case PCI_CLASS_BRIDGE_CARDBUS:
-			pci_read_config_word(dev, PCI_CB_BRIDGE_CONTROL,
-					     &status);
-			status |= PCI_CB_BRIDGE_CTL_PARITY |
-				PCI_CB_BRIDGE_CTL_MASTER_ABORT;
-			pci_write_config_word(dev, PCI_CB_BRIDGE_CONTROL,
-					      status);
-			break;
-		}
-	}
-
-	/*
-	 * Now walk the devices again, this time setting them up.
-	 */
-	list_for_each_entry(dev, &bus->devices, bus_list) {
-		u16 cmd;
-
-		pci_read_config_word(dev, PCI_COMMAND, &cmd);
-		cmd |= features;
-		pci_write_config_word(dev, PCI_COMMAND, cmd);
-
-		pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE,
-				      L1_CACHE_BYTES >> 2);
-	}
-
-	/*
-	 * Propagate the flags to the PCI bridge.
-	 */
-	if (bus->self && bus->self->hdr_type == PCI_HEADER_TYPE_BRIDGE) {
-		if (features & PCI_COMMAND_FAST_BACK)
-			bus->bridge_ctl |= PCI_BRIDGE_CTL_FAST_BACK;
-		if (features & PCI_COMMAND_PARITY)
-			bus->bridge_ctl |= PCI_BRIDGE_CTL_PARITY;
-	}
-
-	/*
-	 * Report what we did for this bus
-	 */
-	printk(KERN_INFO "PCI: bus%d: Fast back to back transfers %sabled\n",
-		bus->number, (features & PCI_COMMAND_FAST_BACK) ? "en" : "dis");
-}
-/*
- * Convert from Linux-centric to bus-centric addresses for bridge devices.
- */
-void
-pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
-			 struct resource *res)
-{
-	struct pci_sys_data *root = dev->sysdata;
-	unsigned long offset = 0;
-
-	if (res->flags & IORESOURCE_IO)
-		offset = root->io_offset;
-	if (res->flags & IORESOURCE_MEM)
-		offset = root->mem_offset;
-
-	region->start = res->start - offset;
-	region->end   = res->end - offset;
-}
-
-void __devinit
-pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
-			struct pci_bus_region *region)
-{
-	struct pci_sys_data *root = dev->sysdata;
-	unsigned long offset = 0;
-
-	if (res->flags & IORESOURCE_IO)
-		offset = root->io_offset;
-	if (res->flags & IORESOURCE_MEM)
-		offset = root->mem_offset;
-
-	res->start = region->start + offset;
-	res->end   = region->end + offset;
-}
-
-#ifdef CONFIG_HOTPLUG
-EXPORT_SYMBOL(pcibios_fixup_bus);
-EXPORT_SYMBOL(pcibios_resource_to_bus);
-EXPORT_SYMBOL(pcibios_bus_to_resource);
-#endif
-
-/**
- * pcibios_enable_device - Enable I/O and memory.
- * @dev: PCI device to be enabled
- */
-int pcibios_enable_device(struct pci_dev *dev, int mask)
-{
-	u16 cmd, old_cmd;
-	int idx;
-	struct resource *r;
-
-	pci_read_config_word(dev, PCI_COMMAND, &cmd);
-	old_cmd = cmd;
-	for (idx = 0; idx < 6; idx++) {
-		/* Only set up the requested stuff */
-		if (!(mask & (1 << idx)))
-			continue;
-
-		r = dev->resource + idx;
-		if (!r->start && r->end) {
-			printk(KERN_ERR "PCI: Device %s not available because"
-			       " of resource collisions\n", pci_name(dev));
-			return -EINVAL;
-		}
-		if (r->flags & IORESOURCE_IO)
-			cmd |= PCI_COMMAND_IO;
-		if (r->flags & IORESOURCE_MEM)
-			cmd |= PCI_COMMAND_MEMORY;
-	}
-
-	/*
-	 * Bridges (eg, cardbus bridges) need to be fully enabled
-	 */
-	if ((dev->class >> 16) == PCI_BASE_CLASS_BRIDGE)
-		cmd |= PCI_COMMAND_IO | PCI_COMMAND_MEMORY;
-
-	if (cmd != old_cmd) {
-		printk("PCI: enabling device %s (%04x -> %04x)\n",
-		       pci_name(dev), old_cmd, cmd);
-		pci_write_config_word(dev, PCI_COMMAND, cmd);
-	}
-	return 0;
-}
-
-
-struct pci_ops ubi32_pci_ops = {
-	.read   = ubi32_pci_read_config,
-	.write  = ubi32_pci_write_config,
-};
-
-static struct pci_bus *ubi32_pci_scan_bus(int nr, struct pci_sys_data *sys)
-{
-	return pci_scan_bus(sys->busnr, &ubi32_pci_ops, sys);
-}
-
-#define UBI32_PCI_MEM_BASE PCI_DEV_REG_BASE
-#define UBI32_PCI_MEM_LEN  0x80000000
-
-#define UBI32_PCI_IO_BASE 0x0
-#define UBI32_PCI_IO_END  0x0
-
-static struct resource ubi32_pci_mem = {
-	.name	= "PCI memory space",
-	.start	= UBI32_PCI_MEM_BASE,
-	.end	= UBI32_PCI_MEM_BASE + UBI32_PCI_MEM_LEN - 1,
-	.flags	= IORESOURCE_MEM,
-};
-
-static struct resource ubi32_pci_io = {
-	.name	= "PCI IO space",
-	.start	= UBI32_PCI_IO_BASE,
-	.end	= UBI32_PCI_IO_END,
-	.flags	= IORESOURCE_IO,
-};
-
-static int __init ubi32_pci_setup(int nr, struct pci_sys_data *sys)
-{
-	if (nr > 0)
-		return 0;
-
-	request_resource(&iomem_resource, &ubi32_pci_mem);
-	request_resource(&ioport_resource, &ubi32_pci_io);
-
-	sys->resource[0] = &ubi32_pci_io;
-	sys->resource[1] = &ubi32_pci_mem;
-	sys->resource[2] = NULL;
-
-	return 1;
-}
-
-static void __init ubi32_pci_preinit(void)
-{
-}
-
-static int __init ubi32_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
-{
-	return pci_node->dn.recvirq;
-}
-
-struct hw_pci ubi32_pci __initdata = {
-	.nr_controllers	= 1,
-	.preinit	= ubi32_pci_preinit,
-	.setup		= ubi32_pci_setup,
-	.scan		= ubi32_pci_scan_bus,
-	.map_irq	= ubi32_pci_map_irq,
-};
-
-static int __init ubi32_pci_init(void)
-{
-	pci_node = (struct pci_devnode *)devtree_find_node("pci");
-	if (pci_node == NULL) {
-		printk(KERN_WARNING "PCI init failed\n");
-		return -ENOSYS;
-	}
-	pci_common_init(&ubi32_pci);
-	return 0;
-}
-
-subsys_initcall(ubi32_pci_init);
-
-/*
- * workaround for dual PCI card interrupt
- */
-#define PCI_COMMON_INT_BIT (1 << 19)
-void ubi32_pci_int_wr(void)
-{
-	volatile unsigned int pci_int_line;
-	pci_int_line = UBICOM32_IO_PORT(RB)->gpio_in;
-	if (!(pci_int_line & PCI_COMMON_INT_BIT))
-	{
-		ubicom32_set_interrupt(pci_node->dn.recvirq);
-	}
-}
-EXPORT_SYMBOL(ubi32_pci_int_wr);
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-common/plio.c b/target/linux/ubicom32/files/arch/ubicom32/mach-common/plio.c
deleted file mode 100644
index ac26a1e8d..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-common/plio.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * plio.c
- *	PLIO state machine support functions
- *
- * Copyright © 2009 Ubicom Inc. <www.ubicom.com>.  All rights reserved.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- */
-
-#include <linux/types.h>
-#include <linux/string.h>
-#include <linux/delay.h>
-#include <asm/plio.h>
-
-/*
- * plio_reset
- * 	Select and reset PLIO function
- */
-static void plio_reset(const plio_fctl_t *plio_fctl) {
-	plio_io_function_t plio_function = {
-		.fn_sel		= PLIO_FN,
-		.fn_reset	= 1,
-	};
-
-	/*
-	 * enable extension port
-	 */
-	PEXT_NBR->function = plio_function;
-
-	/*
-	 * program clock dividers
-	 */
-	PLIO_NBR->fctl2 = plio_fctl->fctl2;
-
-	/*
-	 * select plio function and assert function reset
-	 */
-	plio_function.br_thread = thread_get_self();
-	plio_function.fn_reset = 1;
-	PLIO_NBR->function = plio_function;
-
-	/*
-	 * program plio controls
-	 */
-	PLIO_NBR->fctl0 = plio_fctl->fctl0;
-	PLIO_NBR->fctl1 = plio_fctl->fctl1;
-
-	/*
-	 * deassert function reset
-	 */
-	plio_function.fn_reset = 0;
-	PLIO_NBR->function = plio_function;
-}
-
-/*
- * plio_init
- *	configure and initialize PLIO.
- */
-void plio_init(const plio_fctl_t *plio_fctl, const plio_config_t *plio_config, const plio_sram_t plio_sram_cfg[], int sram_cfg_size){
-	/*
-	 * first reset to start plio clock
-	 */
-	plio_reset(plio_fctl);
-
-	udelay(1);
-
-	/*
-	 * configure pfsm
-	 */
-	PLIO_NBR->fctl0.pfsm_prog = 1;
-	memcpy(PLIO_BR->pfsm_sram, plio_sram_cfg, sram_cfg_size);
-	PLIO_NBR->fctl0.pfsm_prog = 0;
-
-	/*
-	 * program rest of plio
-	 */
-	memcpy(&PLIO_BR->config, plio_config, sizeof(plio_config_t));
-}
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-common/profile.c b/target/linux/ubicom32/files/arch/ubicom32/mach-common/profile.c
deleted file mode 100644
index c95de6b17..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-common/profile.c
+++ /dev/null
@@ -1,549 +0,0 @@
-/*
- * arch/ubicom32/mach-common/profile.c
- *   Implementation for Ubicom32 Profiler
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- */
-
-#include <linux/platform_device.h>
-#include "profile.h"
-#include <linux/seq_file.h>
-#include <linux/proc_fs.h>
-#include <linux/mm.h>
-#include <linux/mmzone.h>
-#include <linux/fs.h>
-#include <linux/page-flags.h>
-#include <asm/uaccess.h>
-#include <asm/devtree.h>
-#include <asm/profilesample.h>
-#include <asm/memory_map.h>
-#include <asm/page.h>
-#include <asm/ip5000.h>
-
-/*
- * spacs for all memory blocks so we can hold locks for short time when walking tables
- */
-#define PROFILE_NUM_MAPS 5000
-static struct profile_map profile_pm[PROFILE_NUM_MAPS];
-
-static struct profilenode *node = NULL;
-static int profile_first_packet = 1;
-
-static int profile_open(struct inode *inode, struct file *filp)
-{
-	if (!node) {
-		return -ENOENT;
-	}
-	node->busy = 1;
-	if (!node->enabled) {
-		node->enabled = 1;
-		node->busy = 0;
-		profile_first_packet = 1;
-		return 0;
-	}
-	node->busy = 0;
-	return -EBUSY;
-}
-
-static int profile_sequence_num;
-
-/*
- * make a packet full of sample data
- */
-static int profile_make_data_packet(char *buf, int count)
-{
-	int samples;		/* number of samples requested */
-	int i;
-	struct profile_header ph;
-	char *ptr;
-
-	if (count < sizeof(struct profile_header) + sizeof(struct profile_sample)) {
-		return -EINVAL;
-	}
-
-	/*
-	 * fill in the packet header
-	 */
-	memset(&ph, 0, sizeof(struct profile_header));
-	ph.magic = PROF_MAGIC + PROFILE_VERSION;
-	ph.header_size = sizeof(struct profile_header);
-	ph.clocks = node->clocks;
-	for (i = 0; i < PROFILE_MAX_THREADS; ++i) {
-		ph.instruction_count[i] = node->inst_count[i];
-	}
-	ph.profile_instructions = 0;
-	ph.enabled = node->enabled_threads;
-	ph.hrt = node->hrt;
-	ph.high = 0;
-	ph.profiler_thread = node->profiler_thread;
-	ph.clock_freq = node->clock_freq;
-	ph.seq_num = profile_sequence_num++;
-	ph.cpu_id = node->cpu_id;
-	ph.perf_counters[0] = node->stats[0];
-	ph.perf_counters[1] = node->stats[1];
-	ph.perf_counters[2] = node->stats[2];
-	ph.perf_counters[3] = node->stats[3];
-	ph.ddr_freq = node->ddr_freq;
-
-	ptr = buf + sizeof(struct profile_header);
-
-	samples = (count - sizeof(struct profile_header)) / sizeof(struct profile_sample);
-	for (i = 0; i < samples && node->count; ++i) {
-		if (copy_to_user(ptr, &node->samples[node->tail], sizeof(struct profile_sample)) != 0) {
-			return -EFAULT;
-		}
-		node->count--;
-		node->tail++;
-		if (node->tail >= node->max_samples) {
-			node->tail = 0;
-		}
-		ptr += sizeof(struct profile_sample);
-	}
-	ph.sample_count = i;
-	if (copy_to_user(buf, &ph, sizeof(struct profile_header)) != 0) {
-		return -EFAULT;
-	}
-	if (ph.sample_count == 0)
-		return 0;
-	else
-		return sizeof(struct profile_header) + ph.sample_count * sizeof(struct profile_sample);
-}
-
-static void profile_get_memory_stats(unsigned int *total_free, unsigned int *max_free)
-{
-	struct list_head *p;
-	struct zone *zone;
-	unsigned int size;
-
-	*total_free = 0;
-	*max_free = 0;
-
-	/*
-	 * get all the free regions.  In each zone, the array of free_area lists contains the first page of each frame of size 1 << order
-	 */
-	for_each_zone(zone) {
-		unsigned long order, flags, i;
-
-		if (!populated_zone(zone))
-			continue;
-
-		if (!is_normal(zone))
-			continue;
-
-		spin_lock_irqsave(&zone->lock, flags);
-		for_each_migratetype_order(order, i) {
-			size = ((1 << order) << PAGE_SHIFT) >> 10;
-			list_for_each(p, &(zone->free_area[order].free_list[i])) {
-				if (size > *max_free) {
-					*max_free = size;
-				}
-				*total_free += size;
-			}
-		}
-		spin_unlock_irqrestore(&zone->lock, flags);
-	}
-}
-
-struct profile_counter_pkt profile_builtin_stats[] =
-{
-	{
-	"Free memory(KB)", 0
-	},
-	{
-	"Max free Block(KB)", 0
-	}
-};
-
-/*
- * make a packet full of performance counters
- */
-static char prof_pkt[PROFILE_MAX_PACKET_SIZE];
-static int profile_make_stats_packet(char *buf, int count)
-{
-	char *ptr = prof_pkt;
-	struct profile_header_counters hdr;
-	int stat_count = 0;
-	int i;
-	unsigned int total_free, max_free;
-	int builtin_count = sizeof(profile_builtin_stats) / sizeof(struct profile_counter_pkt);
-
-	if (count > PROFILE_MAX_PACKET_SIZE) {
-		count = PROFILE_MAX_PACKET_SIZE;
-	}
-	stat_count = (count - sizeof(struct profile_header_counters)) / sizeof (struct profile_counter_pkt);
-	stat_count -= builtin_count;
-
-	if (stat_count <= 0) {
-		return 0;
-	}
-
-	if (stat_count > node->num_counters) {
-		stat_count = node->num_counters;
-	}
-
-	hdr.magic = PROF_MAGIC_COUNTERS;
-	hdr.ultra_sample_time = node->clocks;
-	hdr.ultra_count = stat_count;
-	hdr.linux_sample_time = UBICOM32_IO_TIMER->sysval;
-	hdr.linux_count = builtin_count;
-	memcpy(ptr, (void *)&hdr, sizeof(struct profile_header_counters));
-	ptr += sizeof(struct profile_header_counters);
-
-
-	for (i = 0; i < stat_count; ++i) {
-		memcpy(ptr, (void *)(&(node->counters[i])), sizeof(struct profile_counter));
-		ptr += sizeof(struct profile_counter);
-	}
-
-	/*
-	 * built in statistics
-	 */
-	profile_get_memory_stats(&total_free, &max_free);
-	profile_builtin_stats[0].value = total_free;
-	profile_builtin_stats[1].value = max_free;
-	memcpy(ptr, (void *)profile_builtin_stats, sizeof(profile_builtin_stats));
-	ptr += sizeof(profile_builtin_stats);
-
-	if (copy_to_user(buf, prof_pkt, ptr - prof_pkt) != 0) {
-		return -EFAULT;
-	}
-	return ptr - prof_pkt;
-}
-
-/*
- * return a udp packet ready to send to the profiler tool
- * when there are no packets left to make, return 0
- */
-static int profile_read(struct file *filp, char *buf, size_t count, loff_t *f_pos)
-{
-	int result = 0;
-	if (!node) {
-		return -ENOENT;
-	}
-	node->busy = 1;
-	if (!node->enabled) {
-		node->busy = 0;
-		return -EPERM;
-	}
-	if (!node->samples) {
-		node->busy = 0;
-		return -ENOMEM;
-	}
-
-	if (profile_first_packet) {
-		result = profile_make_stats_packet(buf, count);
-		profile_first_packet = 0;
-	}
-	if (result == 0) {
-		result = profile_make_data_packet(buf, count);
-		if (result == 0) {
-			profile_first_packet = 1;
-		}
-	}
-	node->busy = 0;
-	return result;
-
-}
-
-static int profile_release(struct inode *inode, struct file *filp)
-{
-	if (!node) {
-		return -ENOENT;
-	}
-	node->busy = 1;
-	if (node->enabled) {
-		node->enabled = 0;
-		node->count = 0;
-		node->tail = node->head;
-		node->busy = 0;
-		return 0;
-	}
-	node->busy = 0;
-	profile_first_packet = 1;
-	return -EBADF;
-}
-
-static const struct file_operations profile_fops = {
-	.open		= profile_open,
-	.read		= profile_read,
-	.release	= profile_release,
-};
-
-static int page_aligned(void *x)
-{
-	return !((unsigned int)x & ((1 << PAGE_SHIFT) - 1));
-}
-
-static int profile_maps_open(struct inode *inode, struct file *filp)
-{
-	struct rb_node *rb;
-	int num = 0;
-	int slab_start;
-	struct vm_area_struct *vma;
-	int type = PROFILE_MAP_TYPE_UNKNOWN;
-	int flags, i;
-	struct list_head *p;
-	struct zone *zone;
-
-	/*
-	 * get the slab data (first so dups will show up as vmas)
-	 */
-	slab_start = num;
-	num += kmem_cache_block_info("size-512", (struct kmem_cache_size_info *)&profile_pm[num], PROFILE_NUM_MAPS - num);
-	num += kmem_cache_block_info("size-1024", (struct kmem_cache_size_info *)&profile_pm[num], PROFILE_NUM_MAPS - num);
-	num += kmem_cache_block_info("size-2048", (struct kmem_cache_size_info *)&profile_pm[num], PROFILE_NUM_MAPS - num);
-	num += kmem_cache_block_info("size-4096", (struct kmem_cache_size_info *)&profile_pm[num], PROFILE_NUM_MAPS - num);
-	num += kmem_cache_block_info("size-8192", (struct kmem_cache_size_info *)&profile_pm[num], PROFILE_NUM_MAPS - num);
-
-	for (i = slab_start; i < num; ++i) {
-		profile_pm[i].type_size |= PROFILE_MAP_TYPE_SMALL << PROFILE_MAP_TYPE_SHIFT;
-	}
-
-	slab_start = num;
-	num += kmem_cache_block_info("dentry", (struct kmem_cache_size_info *)&profile_pm[num], PROFILE_NUM_MAPS - num);
-	num += kmem_cache_block_info("inode_cache", (struct kmem_cache_size_info *)&profile_pm[num], PROFILE_NUM_MAPS - num);
-	num += kmem_cache_block_info("sysfs_dir_cache", (struct kmem_cache_size_info *)&profile_pm[num], PROFILE_NUM_MAPS - num);
-	num += kmem_cache_block_info("proc_inode_cache", (struct kmem_cache_size_info *)&profile_pm[num], PROFILE_NUM_MAPS - num);
-
-	for (i = slab_start; i < num; ++i) {
-		profile_pm[i].type_size |= PROFILE_MAP_TYPE_FS << PROFILE_MAP_TYPE_SHIFT;
-	}
-
-	/*
-	 * get all the vma regions (allocated by mmap, most likely
-	 */
-#if 0
-	down_read(&nommu_vma_sem);
-	for (rb = rb_first(&nommu_vma_tree); rb && num < PROFILE_NUM_MAPS; rb = rb_next(rb)) {
-		vma = rb_entry(rb, struct vm_area_struct, vm_rb);
-		profile_pm[num].start = (vma->vm_start - SDRAMSTART) >> PAGE_SHIFT;
-		profile_pm[num].type_size = (vma->vm_end - vma->vm_start + (1 << PAGE_SHIFT) - 1) >> PAGE_SHIFT;
-		flags = vma->vm_flags & 0xf;
-		if (flags == (VM_READ | VM_EXEC)) {
-			type = PROFILE_MAP_TYPE_TEXT;
-		} else if (flags == (VM_READ | VM_WRITE | VM_EXEC)) {
-			type = PROFILE_MAP_TYPE_STACK;
-		} else if (flags == (VM_READ | VM_WRITE)) {
-			type = PROFILE_MAP_TYPE_APP_DATA;
-		}
-		profile_pm[num].type_size |= type << PROFILE_MAP_TYPE_SHIFT;
-		num++;
-	}
-	up_read(&nommu_vma_sem);
-	if (rb) {
-		return -ENOMEM;
-	}
-#endif
-
-	/*
-	 * get all the free regions.  In each zone, the array of free_area lists contains the first page of each frame of size 1 << order
-	 */
-	for_each_zone(zone) {
-		unsigned long order, flags, i;
-		struct page *page;
-
-		if (!populated_zone(zone))
-			continue;
-
-		if (!is_normal(zone))
-			continue;
-
-		spin_lock_irqsave(&zone->lock, flags);
-		for_each_migratetype_order(order, i) {
-			list_for_each(p, &(zone->free_area[order].free_list[i])) {
-				page = list_entry(p, struct page, lru);
-				profile_pm[num].start = ((page_to_phys(page) - SDRAMSTART) >> PAGE_SHIFT) - 0x40;
-				profile_pm[num].type_size = (PROFILE_MAP_TYPE_FREE << PROFILE_MAP_TYPE_SHIFT) | order;
-				num++;
-				if (num >= PROFILE_NUM_MAPS) {
-					spin_unlock_irqrestore(&zone->lock, flags);
-					return -ENOMEM;
-				}
-			}
-		}
-		spin_unlock_irqrestore(&zone->lock, flags);
-	}
-
-	/*
-	 * get the filesystem inodes
-	 */
-	list_for_each(p, &(super_blocks)) {
-		struct super_block *sb;
-		struct list_head *q;
-		if (num >= PROFILE_NUM_MAPS)
-			break;
-		sb = list_entry(p, struct super_block, s_list);
-		if (page_aligned(sb)) {
-			profile_pm[num].start = ((unsigned int)sb - SDRAMSTART) >> PAGE_SHIFT;
-			profile_pm[num].type_size = (PROFILE_MAP_TYPE_FS << PROFILE_MAP_TYPE_SHIFT);
-			num++;
-		}
-		list_for_each(q, &(sb->s_inodes)) {
-			struct inode *in;
-			if (num >= PROFILE_NUM_MAPS)
-				break;
-			in = list_entry(q, struct inode, i_sb_list);
-			if (page_aligned(in)) {
-				profile_pm[num].start = ((unsigned int)in - SDRAMSTART) >> PAGE_SHIFT;
-				profile_pm[num].type_size = (PROFILE_MAP_TYPE_FS << PROFILE_MAP_TYPE_SHIFT);
-				num++;
-			}
-		}
-	}
-
-	/*
-	 * get the buffer cache pages
-	 */
-	for (i = 0; i < num_physpages && num < PROFILE_NUM_MAPS; ++i) {
-		if ((mem_map + i)->flags & (1 << PG_lru)) {
-			int start = i;
-			while ((mem_map + i)->flags & (1 << PG_lru) && i < num_physpages)
-				i++;
-			profile_pm[num].start = start;
-			profile_pm[num].type_size = (i - start) | (PROFILE_MAP_TYPE_CACHE << PROFILE_MAP_TYPE_SHIFT);
-			num++;
-		}
-	}
-
-	filp->private_data = (void *)num;
-	return 0;
-}
-
-/*
- * return one packet of map data, or 0 if all maps have been returned already
- */
-static int profile_maps_read(struct file *filp, char *buf, size_t count, loff_t *f_pos)
-{
-	struct profile_header_maps header;
-	char *p = buf + sizeof(header);
-	int total = (int)filp->private_data;
-
-	header.count = (count - sizeof(header)) / sizeof(struct profile_map);
-	if (header.count > PROFILE_MAX_MAPS) {
-		header.count = PROFILE_MAX_MAPS;;
-	}
-	if (header.count > total - *f_pos) {
-		header.count = total - *f_pos;
-	}
-
-	if (header.count == 0) {
-		return 0;
-	}
-
-	header.magic = PROF_MAGIC_MAPS;
-	header.page_shift = PAGE_SHIFT;
-
-	if (copy_to_user(buf, &header, sizeof(header)) != 0) {
-		return -EFAULT;
-	}
-	if (copy_to_user(p, (void *)&profile_pm[*f_pos], sizeof(struct profile_map) * header.count) != 0) {
-		return -EFAULT;
-	}
-	*f_pos += header.count;
-
-	return sizeof(header) + sizeof(struct profile_map) * header.count;
-}
-
-static int profile_maps_release(struct inode *inode, struct file *filp)
-{
-	return 0;
-}
-
-static const struct file_operations profile_maps_fops = {
-	.open		= profile_maps_open,
-	.read		= profile_maps_read,
-	.release	= profile_maps_release,
-};
-
-static int profile_rate_show(struct seq_file *m, void *v)
-{
-	if (node) {
-		seq_printf(m, "%d samples per second.  %d virtual counters.\n", node->rate, node->num_counters);
-	} else {
-		seq_printf(m, "Profiler is not initialized.\n");
-	}
-	return 0;
-}
-
-static int profile_rate_open(struct inode *inode, struct file *filp)
-{
-	return single_open(filp, profile_rate_show, NULL);
-}
-
-static int profile_rate_write(struct file *filp, const char *buf, size_t len, loff_t *off)
-{
-	*off = 0;
-	return 0;
-}
-
-static const struct file_operations profile_rate_fops = {
-	.open		= profile_rate_open,
-	.read		= seq_read,
-	.llseek		= seq_lseek,
-	.release	= single_release,
-	.write		= profile_rate_write,
-};
-
-int ubi32_profile_init_module(void)
-{
-	struct proc_dir_entry *pdir;
-
-	/*
-	 * find the device
-	 */
-	node = (struct profilenode *)devtree_find_node("profiler");
-	if (!node) {
-		printk(KERN_INFO "Profiler does not exist.\n");
-		return -ENODEV;
-	}
-
-	/*
-	 * allocate the sample buffer
-	 */
-	node->max_samples = PROFILE_MAX_SAMPLES;
-	node->samples = kmalloc(node->max_samples * sizeof(struct profile_sample), GFP_KERNEL);
-	if (!node->samples) {
-		printk(KERN_INFO "Profiler sample buffer kmalloc failed.\n");
-		return -ENOMEM;
-	}
-
-	/*
-	 * connect to the file system
-	 */
-	pdir = proc_mkdir("profile", NULL);
-	if (!pdir) {
-		return -ENOMEM;
-	}
-	if (!proc_create("data", 0, pdir, &profile_fops)) {
-		return -ENOMEM;
-	}
-	if (!proc_create("rate", 0, pdir, &profile_rate_fops)) {
-		return -ENOMEM;
-	}
-	if (!proc_create("maps", 0, pdir, &profile_maps_fops)) {
-		return -ENOMEM;
-	}
-	return 0;
-}
-
-
-module_init(ubi32_profile_init_module);
-
-MODULE_AUTHOR("David Fotland");
-MODULE_LICENSE("GPL");
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-common/profile.h b/target/linux/ubicom32/files/arch/ubicom32/mach-common/profile.h
deleted file mode 100644
index e6ff7d9fe..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-common/profile.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * arch/ubicom32/mach-common/profile.h
- *   Private data for the profile module
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#include <linux/types.h>
-#include <asm/devtree.h>
-#include "profpkt.h"
-
-#ifndef _PROFILE_H_
-#define _PROFILE_H_
-
-#define PROFILE_MAX_THREADS 16
-#define PROFILE_MAX_SAMPLES 1024
-
-struct profile_sample;
-struct oprofile_sample;
-
-/*
- * values chosen so all counter values fit in a single UDP packet
- */
-#define PROFILE_NODE_MAX_COUNTERS 32
-
-struct profile_counter {
-	char name[PROFILE_COUNTER_NAME_LENGTH];
-	unsigned int value;
-};
-
-struct profilenode {
-	struct devtree_node dn;
-	volatile u32_t enabled;			/* Is the profiler enabled to take samples? */
-	volatile u32_t busy;			/* set when the samples are being read by the driver */
-	volatile u32_t rate;			/* What is the sampling rate? */
-	volatile u32_t enabled_threads;		/* which threads were enabled at the last sample time */
-	volatile u32_t hrt;			/* HRT threads */
-	volatile u32_t profiler_thread;		/* thread running the profile sampler */
-	volatile u32_t clocks;			/* system clock timer at last sample */
-	volatile u32_t clock_freq;		/* clock frequency in Hz */
-	volatile u32_t ddr_freq;		/* memory frequency */
-	volatile u32_t cpu_id;			/* chip_id register */
-	volatile u32_t inst_count[PROFILE_MAX_THREADS];		/* sampled instruction counts at most recent sample */
-	volatile u32_t stats[4];				/* contents of the cache statistics counters */
-	volatile u16_t head;			/* sample taker puts samples here */
-	volatile u16_t tail;			/* packet filler takes samples here */
-	volatile u16_t count;			/* number of valid samples */
-	volatile u16_t max_samples;		/* how many samples can be in the samples array */
-	struct profile_sample *samples;		/* samples array allocated by the linux driver */
-	volatile u32_t num_counters;		/* how many registered performance counters */
-	volatile struct profile_counter counters[PROFILE_NODE_MAX_COUNTERS];
-
-	/* unimplemented interface for future oprofile work */
-	volatile u16_t oprofile_head;		/* sample taker puts samples here */
-	volatile u16_t oprofile_tail;		/* packet filler takes samples here */
-	volatile u16_t oprofile_count;		/* how many oprofile sampels are are in use */
-	volatile u16_t oprofile_max_samples;	/* samples array size for oprofile samples */
-	struct oprofile_sample *oprofile_samples;	/* oprofile sample buffer */
-};
-
-#endif
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-common/profpkt.h b/target/linux/ubicom32/files/arch/ubicom32/mach-common/profpkt.h
deleted file mode 100644
index 37d9219a6..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-common/profpkt.h
+++ /dev/null
@@ -1,158 +0,0 @@
-
-/*
- * arch/ubicom32/mach-common/profpkt.c
- *   Ubicom32 Profiler packet formats for communication between the linux proc driver and the profiler display tool
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- */
-
-#define PROFILE_PORT 51080
-#define PROFILE_POSIX_NAME_LENGTH 32
-
-/*
- * profile UDP packet format for communicating between ip3k and host
- *
- * every packet starts with a header, followed by samples.
- * samples are only taken for non-hrt threads that are
- * active
- */
-#define PROF_MAGIC 0x3ea0
-#define PROF_MAGIC_COUNTERS 0x9ea0
-#define PROF_MAGIC_MAPS 0xaea0
-
-/*
- * Versions (31 max):
- * 1 to 4 were before 6.0 release,  development versions
- * 5 was forward compatible version, shipped with 6.0 and 6.1
- * 6 adds heap packets, and clock_freq to header, shipped with 6.2
- * 7 adds a sequence numbers to check for dropped packets, shipped with 6.3.5
- * 8 adds mqueue timing information, shipped with 6.3.5
- * 9 adds sdram heap size information, shipped with 6.4
- * 10 adds heapmem heap callers and long latency stack traces.  shipped with 6.4
- * 11 adds support for Mars (IP5K).  shipped with 6.10
- * 12 adds more support for Mars.  Shipped with 7.0
- * 13 adds per sample latency measurement.  Shipped with 7.2
- * 14 changes the heap format and adds a string packet.  Shipped with 7.4
- * 15 adds dsr stats and posix.  shipped with 7.6
- * 16 corrects maximum packet count for Ares.  ships with 7.9
- * 17 adds a5 register value to sample
- */
-
-#define PROFILE_VERSION 17
-#define PROFILE_MAX_PACKET_SIZE 1440
-
-#define PROFILE_MAX_THREADS 16
-
-/*
- * each packet starts with a profile_header, then sample_count samples
- * samples are gprof samples of pc, the return address, condition codes, and
- * active threads
- */
-struct profile_header {
-	u16_t magic;			/* magic number and version */
-	u8_t header_size;		/* number of bytes in profile header */
-	u8_t sample_count;		/* number of samples in the packet */
-	u32_t clocks;			/* clock counter value */
-	u32_t instruction_count[PROFILE_MAX_THREADS];
-					/* instructions executed per thread */
-	u32_t profile_instructions;	/* instructions executed by profiler mainline */
-	u16_t enabled;			/* which threads are enabled */
-	u16_t hrt;			/* which threads are hrt */
-	u16_t high;			/* which threads are high priority */
-	u16_t profiler_thread;		/* which thread runs the profiler */
-	u32_t heap_free;		/* current free on-cihp heap space in bytes */
-	u32_t heap_low_water;		/* on-chip heap low water mark */
-	u32_t netpage_free;		/* number of free on-chip net pages */
-	u32_t netpage_low_water;	/* low water mark on free on-chip netpages */
-	u32_t min_sp[PROFILE_MAX_THREADS];
-					/* stack pointer values per thread */
-	u32_t clock_freq;		/* clock frequency (Hz) of system being analyzed */
-	u32_t seq_num;			/* to detect dropped profiler packets */
-	u32_t timing_sequence;		/* sample number since boot */
-	u32_t timing_interval;		/* second per sample timing interval */
-	u32_t timing_worst_time;	/* duration of longest finction called, in core clocks */
-	u32_t timing_function;		/* address of longest function */
-	u32_t timing_average;		/* average time of all functions in last interval */
-	u32_t timing_count;		/* number of functions called in last interval */
-	u32_t extheap_free;		/* current free extmem heap space in bytes */
-	u32_t extheap_low_water;	/* extmem heap low water mark */
-	u32_t cpu_id;			/* CHIP_ID register contents */
-	u32_t perf_counters[4];		/* contents of the CPU performance counters */
-	u8_t perf_config[4];		/* what is being counted */
-	u32_t ddr_freq;			/* DDR clock frequency */
-	u32_t extnetpage_free;		/* number of free off chip net pages */
-	u32_t extnetpage_low_water;	/* low water mark on off-chip free netpages */
-	u32_t dsr_max_latency;		/* max time to process a dsr interrupt, in clocks, since last packet */
-	u32_t dsr_ave_latency;		/* average dsr latency over last DSR_STATS_RECENT_COUNT interrupts */
-	u32_t dsr_count;		/* number of dsr interrupts since last packet */
-};
-
-struct profile_header_counters {
-	u16_t magic;
-	u16_t ultra_count;		/* how many ultra counters follow this */
-	u32_t ultra_sample_time;	/* in chip clocks */
-	u32_t linux_count;		/* how many linux counters follow this */
-	u32_t linux_sample_time;
-};
-
-/*
- * values chosen so all counter values fit in a single 1400 byte UDP packet
- */
-#define PROFILE_COUNTER_NAME_LENGTH 20
-#define PROFILE_MAX_COUNTERS ((PROFILE_MAX_PACKET_SIZE - sizeof(struct profile_header_counters)) / (PROFILE_COUNTER_NAME_LENGTH + 4))
-
-struct profile_counter_pkt {
-	char name[PROFILE_COUNTER_NAME_LENGTH];
-	unsigned int value;
-};
-
-/*
- * send memory maps from linux to profiler tool
- */
-
-struct profile_header_maps {
-	u16_t magic;
-	u16_t count;
-	u32_t page_shift;
-};
-
-#define PROFILE_MAP_NUM_TYPES 32
-
-/* types 0-15: size field is order.  True size is 2^order */
-#define PROFILE_MAP_TYPE_UNKNOWN 0
-#define PROFILE_MAP_TYPE_FREE 1
-#define PROFILE_MAP_TYPE_SMALL 2
-#define PROFILE_MAP_TYPE_FS 3
-/* types 16-31: size field is pages.  True size is (1 << PAGE_SHIFT) * size */
-#define PROFILE_MAP_SIZE_TYPE 16
-#define PROFILE_MAP_TYPE_TEXT 16
-#define PROFILE_MAP_TYPE_STACK 17
-#define PROFILE_MAP_TYPE_APP_DATA 18
-#define PROFILE_MAP_TYPE_CACHE 19
-#define PROFILE_MAP_RESERVED 24
-
-#define PROFILE_MAP_TYPE_SHIFT 11
-#define PROFILE_MAP_SIZE_MASK 0x7ff
-
-struct profile_map {
-	u16_t start;		/* start page number of segment, relative to start of DRAM */
-	u16_t type_size;	/* type (4 bits) of the segment and size in pages (12 bits) */
-};
-
-#define PROFILE_MAX_MAPS (PROFILE_MAX_PACKET_SIZE - sizeof(struct profile_header_maps)) / sizeof(struct profile_map)
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-common/ring_tio.c b/target/linux/ubicom32/files/arch/ubicom32/mach-common/ring_tio.c
deleted file mode 100644
index 9d0f8cd2a..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-common/ring_tio.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * arch/ubicom32/mach-common/ring_tio.c
- *   Generic initialization for UIO Ubicom32 Ring
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- */
-
-#include <linux/platform_device.h>
-#include <linux/types.h>
-
-#include <asm/devtree.h>
-#include <asm/ring_tio.h>
-
-static const char *ring_tio_driver_name = "uio_ubicom32ring";
-
-/*
- * The number of ring_tio's currently allocated, used for .id
- */
-static int __initdata ring_tio_count;
-
-/*
- * The maximum number of resources that the ring_tio will have.
- * Currently 3, a register space, and up to 2 interrupts.
- */
-#define RING_TIO_MAX_RESOURCES	3
-
-/*
- * ring_tio_init
- *	Checks the device tree and instantiates the driver if found
- */
-void __init ring_tio_init(const char *node_name)
-{
-	struct platform_device *pdev;
-	struct resource *res;
-	int resource_idx = 0;
-	struct ring_tio_node *ring_node;
-
-	/*
-	 * Check the device tree for the ring_tio
-	 */
-	ring_node = (struct ring_tio_node *)devtree_find_node(node_name);
-	if (!ring_node) {
-		printk(KERN_WARNING "Ring TIO '%s' not found\n", node_name);
-		return;
-	}
-
-	if (ring_node->version != RING_TIO_NODE_VERSION) {
-		printk(KERN_WARNING "ring_tio not compatible\n");
-		return;
-	}
-
-	/*
-	 * Dynamically create the platform_device structure and resources
-	 */
-	pdev = kzalloc(sizeof(struct platform_device), GFP_KERNEL);
-	if (!pdev) {
-		printk(KERN_WARNING "ring_tio could not alloc pdev\n");
-		return;
-	}
-
-	res = kzalloc(sizeof(struct resource) * RING_TIO_MAX_RESOURCES,
-			GFP_KERNEL);
-	if (!res) {
-		kfree(pdev);
-		printk(KERN_WARNING "ring_tio could not alloc res\n");
-		return;
-	}
-
-	pdev->name = ring_tio_driver_name;
-	pdev->id = ring_tio_count++;
-	pdev->resource = res;
-
-	/*
-	 * Fill in the resources and platform data from devtree information
-	 */
-	res[resource_idx].start = (u32_t)(ring_node->regs);
-	res[resource_idx].end = (u32_t)(ring_node->regs);
-	res[resource_idx].flags = IORESOURCE_MEM;
-	resource_idx++;
-
-	if (ring_node->dn.sendirq != 0xFF) {
-		res[resource_idx].start = ring_node->dn.sendirq;
-		res[resource_idx].flags = IORESOURCE_IRQ;
-		resource_idx++;
-	}
-
-	if (ring_node->dn.recvirq != 0xFF) {
-		res[resource_idx].start = ring_node->dn.recvirq;
-		res[resource_idx].flags = IORESOURCE_IRQ;
-		resource_idx++;
-	}
-	pdev->num_resources = resource_idx;
-
-	printk(KERN_INFO "RingTIO.%d '%s' found irq=%d/%d regs=%p pdev=%p/%p\n",
-		ring_tio_count - 1, node_name, ring_node->dn.sendirq,
-		ring_node->dn.recvirq, ring_node->regs, pdev, res);
-
-	/*
-	 * Try to get the device registered
-	 */
-	pdev->dev.platform_data = (void *)node_name;
-	if (platform_device_register(pdev) < 0) {
-		printk(KERN_WARNING "Ring failed to register\n");
-		kfree(pdev);
-		kfree(res);
-	}
-}
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-common/switch-bcm539x-reg.h b/target/linux/ubicom32/files/arch/ubicom32/mach-common/switch-bcm539x-reg.h
deleted file mode 100644
index ca64eb146..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-common/switch-bcm539x-reg.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * arch/ubicom32/mach-common/switch-bcm539x-reg.h
- *   Broadcom switch definitions for Ubicom32 architecture.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-/*
- * Broadcom 53xx RoboSwitch device driver.
- *
- * Copyright 2007, Broadcom Corporation
- * All Rights Reserved.
- *
- * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY
- * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM
- * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
- *
- * $Id$
- */
-
-#ifndef _SWITCH_BCM539X_REG_H_
-#define _SWITCH_BCM539X_REG_H_
-
-#define	BCM539X_CMD_READ		0x60
-#define	BCM539X_CMD_WRITE		0x61
-
-#define	BCM539X_GLOBAL_SPI_DATA0	0xf0
-
-#define	BCM539X_GLOBAL_SPI_STATUS	0xfe
-#define	BCM539X_GLOBAL_SPI_ST_SPIF	(1<<7)
-#define	BCM539X_GLOBAL_SPI_ST_RACK	(1<<5)
-
-#define	BCM539X_GLOBAL_PAGE		0xff
-
-#define PAGE_PORT_TC			0x00		// Port Traffic Control Register
-
-#define PAGE_QOS_CTL			0x30		// QoS Global Control Register
-#define PAGE_QOS_TAG			0x34		// Default IEEE 802.1Q TAG Register
-
-#define PAGE_MII_CTL_PORT0		0x10		// Internal PHY MII Register
-#define PAGE_MII_CTL_PORT1		0x11
-#define PAGE_MII_CTL_PORT2		0x12
-#define PAGE_MII_CTL_PORT3		0x13
-#define PAGE_MII_CTL_PORT4		0x14
-
-#define PAGE_STATUS			0x01		// Status Register Page
-#define PAGE_RATE_CONTROL		0x41		// Broadcast Storm Suppression Register
-
-#define REG_GRATE_CONTROL		0x00
-
-#define REG_LED_POWER			0x12
-
-// Ingress Rate Control
-#define REG_IRATE_CONTROLP0		0x10
-#define REG_IRATE_CONTROLP1		0x14
-#define REG_IRATE_CONTROLP2		0x18
-#define REG_IRATE_CONTROLP3		0x1C
-#define REG_IRATE_CONTROLP4		0x20
-#define REG_IRATE_CONTROLP7		0x2C
-#define REG_IRATE_CONTROLPI		0x30
-
-// Egress Rate Control
-#define REG_ERATE_CONTROLP0		0x80
-#define REG_ERATE_CONTROLP1		0x82
-#define REG_ERATE_CONTROLP2		0x84
-#define REG_ERATE_CONTROLP3		0x86
-#define REG_ERATE_CONTROLP4		0x88
-#define REG_ERATE_CONTROLP5		0x8A
-#define REG_ERATE_CONTROLP6		0x8C
-#define REG_ERATE_CONTROLP7		0x8E
-#define REG_ERATE_CONTROLPI		0x90
-
-#define REG_LINK_STATUS			0x00
-
-#define REG_TC_PORT0			0x00
-#define REG_TC_PORT1			0x01
-#define REG_TC_PORT2			0x02
-#define REG_TC_PORT3			0x03
-#define REG_TC_PORT4			0x04
-#define REG_TC_PORT5			0x05
-
-#define REG_SPEED_CTL			0x00
-#define REG_SPEED_ADV100		0x08
-#define REG_SPEED_ADV1000		0x12
-
-#define REG_QOS_EN			0x00
-#define REG_QOS_TAG_PORT1		0x12		// Default IEEE 802.1Q TAG, PORT 1
-#define REG_QOS_TAG_PORT2		0x14		// Default IEEE 802.1Q TAG, PORT 2
-#define REG_QOS_TAG_PORT3		0x16		// Default IEEE 802.1Q TAG, PORT 3
-#define REG_QOS_TAG_PORT4		0x18		// Default IEEE 802.1Q TAG, PORT 4
-#define REG_QOS_PID_PORT1		0x52		// Ingress Port Priority ID MAP, PORT 1
-#define REG_QOS_PID_PORT2		0x54		// Ingress Port Priority ID MAP, PORT 2
-#define REG_QOS_PID_PORT3		0x56		// Ingress Port Priority ID MAP, PORT 3
-#define REG_QOS_PID_PORT4		0x58		// Ingress Port Priority ID MAP, PORT 4
-#define REG_QOS_TXQ_CTL			0x80		// Tx Queue Control Register
-#define REG_QOS_TXQ_WHTQ0		0x81		// Tx Queue Weight Register Queue 0
-#define REG_QOS_TXQ_WHTQ1		0x82		// Tx Queue Weight Register Queue 1
-#define REG_QOS_TXQ_WHTQ2		0x83		// Tx Queue Weight Register Queue 2
-#define REG_QOS_TXQ_WHTQ3		0x84		// Tx Queue Weight Register Queue 3
-
-#define REG_CTRL_PPSEL  		0x24		/* 5397: Protected port select register */
-
-#define RATE_CONTROL_ENABLED		(1 << 22)
-#define RATE_CONTROL_BSIZE		((1 << 10) | (1 << 9) | (1 << 8))
-
-#define RATE_CONTROL_HIGH		((1 << 7) | (1 << 6) | (1 << 5) | (1 << 4))
-#define RATE_CONTROL_HIGH_N		~((1 << 3) | (1 << 2) | (1 << 1) | (1 << 0))
-
-#define RATE_CONTROL_MEDIUM		((1 << 6) | (1 << 5) | (1 << 4) | (1 << 3) | (1 << 2) | (1 << 1) | (1 << 0))
-#define RATE_CONTROL_MEDIUM_N		~((1 << 7))
-
-#define RATE_CONTROL_NORMAL		((1 << 5) | (1 << 2) | (1 << 0))
-#define RATE_CONTROL_NORMAL_N		~((1 << 7) | (1 << 6) | (1 << 4) | (1 << 3) | (1 << 1))
-
-#define RATE_CONTROL_LOW		((1 << 4) | (1 << 3) | (1 << 0))
-#define RATE_CONTROL_LOW_N		~((1 << 7) | (1 << 6) | (1 << 5) | (1 << 2) | (1 << 1))
-
-// --- Gemtek, Configure the switch to support Ethernet Port QoS
-
-/* MII access registers */
-#define PSEUDO_PHYAD			0x1E	/* MII Pseudo PHY address */
-#define REG_MII_PAGE			0x10	/* MII Page register */
-#define REG_MII_ADDR			0x11	/* MII Address register */
-#define REG_MII_DATA0			0x18	/* MII Data register 0 */
-#define REG_MII_DATA1			0x19	/* MII Data register 1 */
-#define REG_MII_DATA2			0x1a	/* MII Data register 2 */
-#define REG_MII_DATA3			0x1b	/* MII Data register 3 */
-
-/* Page numbers */
-#define PAGE_CTRL			0x00	/* Control page */
-#define PAGE_MMR			0x02	/* 5397 Management/Mirroring page */
-#define PAGE_VTBL			0x05	/* ARL/VLAN Table access page */
-#define PAGE_VLAN			0x34	/* VLAN page */
-
-/* Control page registers */
-#define REG_CTRL_PORT0			0x00	/* Port 0 traffic control register */
-#define REG_CTRL_PORT1			0x01	/* Port 1 traffic control register */
-#define REG_CTRL_PORT2			0x02	/* Port 2 traffic control register */
-#define REG_CTRL_PORT3			0x03	/* Port 3 traffic control register */
-#define REG_CTRL_PORT4			0x04	/* Port 4 traffic control register */
-#define REG_CTRL_PORT5			0x05	/* Port 5 traffic control register */
-#define REG_CTRL_PORT6			0x06	/* Port 6 traffic control register */
-#define REG_CTRL_PORT7			0x07	/* Port 7 traffic control register */
-#define REG_CTRL_MODE			0x0B	/* Switch Mode register */
-#define REG_CTRL_MIIPO			0x0E	/* 5325: MII Port Override register */
-#define REG_CTRL_SRST			0x79	/* Software reset control register */
-
-#define REG_DEVICE_ID			0x30	/* 539x Device id: */
-#define	DEVID5395			0x95	/*  5395 */
-#define	DEVID5397			0x97	/*  5397 */
-#define	DEVID5398			0x98	/*  5398 */
-#define REG_REVISION_ID			0x40	/* 539x Revision id: */
-
-/* VLAN page registers */
-#define REG_VLAN_CTRL0			0x00	/* VLAN Control 0 register */
-#define REG_VLAN_CTRL1			0x01	/* VLAN Control 1 register */
-#define REG_VLAN_CTRL2			0x02	/* VLAN Control 2 register */
-#define REG_VLAN_CTRL3			0x03	/* VLAN Control 3 register */
-#define REG_VLAN_CTRL4			0x04	/* VLAN Control 4 register */
-#define REG_VLAN_CTRL5			0x05	/* VLAN Control 5 register */
-#define REG_VLAN_ACCESS			0x06	/* VLAN Table Access register */
-#define REG_VLAN_WRITE			0x08	/* VLAN Write register */
-#define REG_VLAN_READ			0x0C	/* VLAN Read register */
-#define REG_VLAN_PTAG0			0x10	/* VLAN Default Port Tag register - port 0 */
-#define REG_VLAN_PTAG1			0x12	/* VLAN Default Port Tag register - port 1 */
-#define REG_VLAN_PTAG2			0x14	/* VLAN Default Port Tag register - port 2 */
-#define REG_VLAN_PTAG3			0x16	/* VLAN Default Port Tag register - port 3 */
-#define REG_VLAN_PTAG4			0x18	/* VLAN Default Port Tag register - port 4 */
-#define REG_VLAN_PTAG5			0x1a	/* VLAN Default Port Tag register - port 5 */
-#define REG_VLAN_PTAG6			0x1c	/* VLAN Default Port Tag register - port 6 */
-#define REG_VLAN_PTAG7			0x1e	/* VLAN Default Port Tag register - port 7 */
-#define REG_VLAN_PTAG8			0x20	/* 539x: VLAN Default Port Tag register - IMP port */
-#define REG_VLAN_PMAP			0x20	/* 5325: VLAN Priority Re-map register */
-
-/* ARL/VLAN Table Access page registers */
-#define REG_VTBL_CTRL			0x00	/* ARL Read/Write Control */
-#define REG_VTBL_MINDX			0x02	/* MAC Address Index */
-#define REG_VTBL_VINDX			0x08	/* VID Table Index */
-#define REG_VTBL_ARL_E0			0x10	/* ARL Entry 0 */
-#define REG_VTBL_ARL_E1			0x18	/* ARL Entry 1 */
-#define REG_VTBL_DAT_E0			0x18	/* ARL Table Data Entry 0 */
-#define REG_VTBL_SCTRL			0x20	/* ARL Search Control */
-#define REG_VTBL_SADDR			0x22	/* ARL Search Address */
-#define REG_VTBL_SRES			0x24	/* ARL Search Result */
-#define REG_VTBL_SREXT			0x2c	/* ARL Search Result */
-#define REG_VTBL_VID_E0			0x30	/* VID Entry 0 */
-#define REG_VTBL_VID_E1			0x32	/* VID Entry 1 */
-#define REG_VTBL_PREG			0xFF	/* Page Register */
-#define REG_VTBL_ACCESS			0x60	/* VLAN table access register */
-#define REG_VTBL_INDX			0x61	/* VLAN table address index register */
-#define REG_VTBL_ENTRY			0x63	/* VLAN table entry register */
-#define REG_VTBL_ACCESS_5395		0x80	/* VLAN table access register */
-#define REG_VTBL_INDX_5395		0x81	/* VLAN table address index register */
-#define REG_VTBL_ENTRY_5395		0x83	/* VLAN table entry register */
-
-/* SPI registers */
-#define REG_SPI_PAGE			0xff	/* SPI Page register */
-
-#endif
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-common/switch-bcm539x.c b/target/linux/ubicom32/files/arch/ubicom32/mach-common/switch-bcm539x.c
deleted file mode 100644
index d9eca381a..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-common/switch-bcm539x.c
+++ /dev/null
@@ -1,1195 +0,0 @@
-/*
- * arch/ubicom32/mach-common/switch-bcm539x.c
- *   BCM539X switch driver, SPI mode
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#include <linux/platform_device.h>
-#include <linux/spi/spi.h>
-#include <linux/gpio.h>
-#include <linux/delay.h>
-#include <linux/mii.h>
-
-#include <asm/switch-dev.h>
-#include <asm/ubicom32-spi-gpio.h>
-#include "switch-core.h"
-#include "switch-bcm539x-reg.h"
-
-#define DRIVER_NAME "bcm539x-spi"
-#define DRIVER_VERSION "1.0"
-
-#undef BCM539X_DEBUG
-#define BCM539X_SPI_RETRIES	100
-
-struct bcm539x_data {
-	struct switch_device			*switch_dev;
-
-	/*
-	 * Our private data
-	 */
-	struct spi_device			*spi;
-	struct switch_core_platform_data	*pdata;
-
-	/*
-	 * Last page we accessed
-	 */
-	u8_t					last_page;
-
-	/*
-	 * 539x Device ID
-	 */
-	u8_t					device_id;
-};
-
-/*
- * bcm539x_wait_status
- *	Waits for the specified bit in the status register to be set/cleared.
- */
-static int bcm539x_wait_status(struct bcm539x_data *bd, u8_t mask, int set)
-{
-	u8_t txbuf[2];
-	u8_t rxbuf;
-	int i;
-	int ret;
-
-	txbuf[0] = BCM539X_CMD_READ;
-	txbuf[1] = BCM539X_GLOBAL_SPI_STATUS;
-	for (i = 0; i < BCM539X_SPI_RETRIES; i++) {
-		ret = spi_write_then_read(bd->spi, txbuf, 2, &rxbuf, 1);
-		rxbuf &= mask;
-		if ((set && rxbuf) || (!set && !rxbuf)) {
-			return 0;
-		}
-		udelay(1);
-	}
-
-	return -EIO;
-}
-
-/*
- * bcm539x_set_page
- *	Sets the register page for access (only if necessary)
- */
-static int bcm539x_set_page(struct bcm539x_data *bd, u8_t page)
-{
-	u8_t txbuf[3];
-
-	if (page == bd->last_page) {
-		return 0;
-	}
-
-	bd->last_page = page;
-
-	txbuf[0] = BCM539X_CMD_WRITE;
-	txbuf[1] = BCM539X_GLOBAL_PAGE;
-	txbuf[2] = page;
-
-	return spi_write(bd->spi, txbuf, 3);
-}
-
-/*
- * bcm539x_write_bytes
- *	Writes a number of bytes to a given page and register
- */
-static int bcm539x_write_bytes(struct bcm539x_data *bd, u8_t page,
-			       u8_t reg, void *buf, u8_t len)
-{
-	int ret;
-	u8_t *txbuf;
-
-	txbuf = kmalloc(2 + len, GFP_KERNEL);
-	if (!txbuf) {
-		return -ENOMEM;
-	}
-
-	/*
-	 * Make sure the chip has finished processing our previous request
-	 */
-	ret = bcm539x_wait_status(bd, BCM539X_GLOBAL_SPI_ST_SPIF, 0);
-	if (ret) {
-		goto done;
-	}
-
-	/*
-	 * Set the page
-	 */
-	ret = bcm539x_set_page(bd, page);
-	if (ret) {
-		goto done;
-	}
-
-	/*
-	 * Read the data
-	 */
-	txbuf[0] = BCM539X_CMD_WRITE;
-	txbuf[1] = reg;
-	memcpy(&txbuf[2], buf, len);
-
-#ifdef BCM539X_DEBUG
-	{
-		int i;
-		printk("write page %02x reg %02x len=%d buf=", page, reg, len);
-		for (i = 0; i < len + 2; i++) {
-			printk("%02x ", txbuf[i]);
-		}
-		printk("\n");
-	}
-#endif
-
-	ret = spi_write(bd->spi, txbuf, 2 + len);
-
-done:
-	kfree(txbuf);
-	return ret;
-}
-
-/*
- * bcm539x_write_32
- *	Writes 32 bits of data to the given page and register
- */
-static inline int bcm539x_write_32(struct bcm539x_data *bd, u8_t page,
-				   u8_t reg, u32_t data)
-{
-	data = cpu_to_le32(data);
-	return bcm539x_write_bytes(bd, page, reg, &data, 4);
-}
-
-/*
- * bcm539x_write_16
- *	Writes 16 bits of data to the given page and register
- */
-static inline int bcm539x_write_16(struct bcm539x_data *bd, u8_t page,
-				   u8_t reg, u16_t data)
-{
-	data = cpu_to_le16(data);
-	return bcm539x_write_bytes(bd, page, reg, &data, 2);
-}
-
-/*
- * bcm539x_write_8
- *	Writes 8 bits of data to the given page and register
- */
-static inline int bcm539x_write_8(struct bcm539x_data *bd, u8_t page,
-				  u8_t reg, u8_t data)
-{
-	return bcm539x_write_bytes(bd, page, reg, &data, 1);
-}
-
-/*
- * bcm539x_read_bytes
- *	Reads a number of bytes from a given page and register
- */
-static int bcm539x_read_bytes(struct bcm539x_data *bd, u8_t page,
-			      u8_t reg, void *buf, u8_t len)
-{
-	u8_t txbuf[2];
-	int ret;
-
-	/*
-	 * (1) Make sure the chip has finished processing our previous request
-	 */
-	ret = bcm539x_wait_status(bd, BCM539X_GLOBAL_SPI_ST_SPIF, 0);
-	if (ret) {
-		return ret;
-	}
-
-	/*
-	 * (2) Set the page
-	 */
-	ret = bcm539x_set_page(bd, page);
-	if (ret) {
-		return ret;
-	}
-
-	/*
-	 * (3) Kick off the register read
-	 */
-	txbuf[0] = BCM539X_CMD_READ;
-	txbuf[1] = reg;
-	ret = spi_write_then_read(bd->spi, txbuf, 2, txbuf, 1);
-	if (ret) {
-		return ret;
-	}
-
-	/*
-	 * (4) Wait for RACK
-	 */
-	ret = bcm539x_wait_status(bd, BCM539X_GLOBAL_SPI_ST_RACK, 1);
-	if (ret) {
-		return ret;
-	}
-
-	/*
-	 * (5) Read the data
-	 */
-	txbuf[0] = BCM539X_CMD_READ;
-	txbuf[1] = BCM539X_GLOBAL_SPI_DATA0;
-
-	ret = spi_write_then_read(bd->spi, txbuf, 2, buf, len);
-
-#ifdef BCM539X_DEBUG
-	{
-		int i;
-		printk("read page %02x reg %02x len=%d rxbuf=",
-		       page, reg, len);
-		for (i = 0; i < len; i++) {
-			printk("%02x ", ((u8_t *)buf)[i]);
-		}
-		printk("\n");
-	}
-#endif
-
-	return ret;
-}
-
-/*
- * bcm539x_read_32
- *	Reads an 32 bit number from a given page and register
- */
-static int bcm539x_read_32(struct bcm539x_data *bd, u8_t page,
-			   u8_t reg, u32_t *buf)
-{
-	int ret = bcm539x_read_bytes(bd, page, reg, buf, 4);
-	*buf = le32_to_cpu(*buf);
-	return ret;
-}
-
-/*
- * bcm539x_read_16
- *	Reads an 16 bit number from a given page and register
- */
-static int bcm539x_read_16(struct bcm539x_data *bd, u8_t page,
-			   u8_t reg, u16_t *buf)
-{
-	int ret = bcm539x_read_bytes(bd, page, reg, buf, 2);
-	*buf = le16_to_cpu(*buf);
-	return ret;
-}
-
-/*
- * bcm539x_read_8
- *	Reads an 8 bit number from a given page and register
- */
-static int bcm539x_read_8(struct bcm539x_data *bd, u8_t page,
-			  u8_t reg, u8_t *buf)
-{
-	return bcm539x_read_bytes(bd, page, reg, buf, 1);
-}
-
-/*
- * bcm539x_set_mode
- */
-static int bcm539x_set_mode(struct bcm539x_data *bd, int state)
-{
-	u8_t buf;
-	int ret;
-
-	ret = bcm539x_read_8(bd, PAGE_PORT_TC, REG_CTRL_MODE, &buf);
-	if (ret) {
-		return ret;
-	}
-
-	buf &= ~(1 << 1);
-	buf |= state ? (1 << 1) : 0;
-
-	ret = bcm539x_write_8(bd, PAGE_PORT_TC, REG_CTRL_MODE, buf);
-	return ret;
-}
-
-/*
- * bcm539x_handle_reset
- */
-static int bcm539x_handle_reset(struct switch_device *dev, char *buf, int inst)
-{
-	struct bcm539x_data *bd =
-		(struct bcm539x_data *)switch_get_drvdata(dev);
-	int ret;
-
-	ret = bcm539x_write_8(bd, PAGE_PORT_TC, REG_CTRL_SRST,
-			      (1 << 7) | (1 << 4));
-	if (ret) {
-		return ret;
-	}
-
-	udelay(20);
-
-	ret = bcm539x_write_8(bd, PAGE_PORT_TC, REG_CTRL_SRST, 0);
-	return ret;
-}
-
-/*
- * bcm539x_handle_vlan_ports_read
- */
-static int bcm539x_handle_vlan_ports_read(struct switch_device *dev,
-					  char *buf, int inst)
-{
-	struct bcm539x_data *bd =
-		(struct bcm539x_data *)switch_get_drvdata(dev);
-	int j;
-	int len = 0;
-	u8_t rxbuf8;
-	u32_t rxbuf32;
-	int ret;
-
-	ret = bcm539x_write_16(bd, PAGE_VTBL, REG_VTBL_INDX_5395, inst);
-	if (ret) {
-		return ret;
-	}
-
-	ret = bcm539x_write_8(bd, PAGE_VTBL, REG_VTBL_ACCESS_5395,
-			      (1 << 7) | 1);
-	if (ret) {
-		return ret;
-	}
-
-	/*
-	 * Wait for completion
-	 */
-	for (j = 0; j < BCM539X_SPI_RETRIES; j++) {
-		ret = bcm539x_read_8(bd, PAGE_VTBL, REG_VTBL_ACCESS_5395,
-				     &rxbuf8);
-		if (ret) {
-			return ret;
-		}
-		if (!(rxbuf8 & (1 << 7))) {
-			break;
-		}
-	}
-
-	if (j == BCM539X_SPI_RETRIES) {
-		return -EIO;
-	}
-
-	/*
-	 * Read the table entry
-	 */
-	ret = bcm539x_read_32(bd, PAGE_VTBL, REG_VTBL_ENTRY_5395, &rxbuf32);
-	if (ret) {
-		return ret;
-	}
-
-	for (j = 0; j < 9; j++) {
-		if (rxbuf32 & (1 << j)) {
-			u16_t rxbuf16;
-			len += sprintf(buf + len, "%d", j);
-			if (rxbuf32 & (1 << (j + 9))) {
-				buf[len++] = 'u';
-			} else {
-				buf[len++] = 't';
-			}
-			ret = bcm539x_read_16(bd, PAGE_VLAN,
-					      REG_VLAN_PTAG0 + (j << 1),
-					      &rxbuf16);
-			if (ret) {
-				return ret;
-			}
-			if (rxbuf16 == inst) {
-				buf[len++] = '*';
-			}
-			buf[len++] = '\t';
-		}
-	}
-
-	len += sprintf(buf + len, "\n");
-	buf[len] = '\0';
-
-	return len;
-}
-
-/*
- * bcm539x_handle_vlan_ports_write
- */
-static int bcm539x_handle_vlan_ports_write(struct switch_device *dev,
-					   char *buf, int inst)
-{
-	struct bcm539x_data *bd =
-		(struct bcm539x_data *)switch_get_drvdata(dev);
-	int j;
-	u32_t untag;
-	u32_t ports;
-	u32_t def;
-
-	u8_t rxbuf8;
-	u16_t rxbuf16;
-	int ret;
-
-	switch_parse_vlan_ports(dev, buf, &untag, &ports, &def);
-
-#ifdef BCM539X_DEBUG
-	printk(KERN_DEBUG "'%s' inst=%d untag=%08x ports=%08x def=%08x\n",
-		buf, inst, untag, ports, def);
-#endif
-
-	if (!ports) {
-		return 0;
-	}
-
-	/*
-	 * Change default vlan tag
-	 */
-	for (j = 0; j < 9; j++) {
-		if ((untag | def) & (1 << j)) {
-			ret = bcm539x_write_16(bd, PAGE_VLAN,
-					       REG_VLAN_PTAG0 + (j << 1),
-					       inst);
-			if (ret) {
-				return ret;
-			}
-			continue;
-		}
-
-		if (!(dev->port_mask[0] & (1 << j))) {
-			continue;
-		}
-
-		/*
-		 * Remove any ports which are not listed anymore as members of
-		 * this vlan
-		 */
-		ret = bcm539x_read_16(bd, PAGE_VLAN,
-				      REG_VLAN_PTAG0 + (j << 1), &rxbuf16);
-		if (ret) {
-			return ret;
-		}
-		if (rxbuf16 == inst) {
-			ret = bcm539x_write_16(bd, PAGE_VLAN,
-					       REG_VLAN_PTAG0 + (j << 1), 0);
-			if (ret) {
-				return ret;
-			}
-		}
-	}
-
-	/*
-	 * Write the VLAN table
-	 */
-	ret = bcm539x_write_16(bd, PAGE_VTBL, REG_VTBL_INDX_5395, inst);
-	if (ret) {
-		return ret;
-	}
-
-	ret = bcm539x_write_32(bd, PAGE_VTBL, REG_VTBL_ENTRY_5395,
-			       (untag << 9) | ports);
-	if (ret) {
-		return ret;
-	}
-
-	ret = bcm539x_write_8(bd, PAGE_VTBL, REG_VTBL_ACCESS_5395,
-			      (1 << 7) | 0);
-	if (ret) {
-		return ret;
-	}
-
-	/*
-	 * Wait for completion
-	 */
-	for (j = 0; j < BCM539X_SPI_RETRIES; j++) {
-		ret = bcm539x_read_bytes(bd, PAGE_VTBL, REG_VTBL_ACCESS_5395,
-					 &rxbuf8, 1);
-		if (ret) {
-			return ret;
-		}
-		if (!(rxbuf8 & (1 << 7))) {
-			break;
-		}
-	}
-
-	return (j < BCM539X_SPI_RETRIES) ? 0 : -EIO;
-}
-
-/*
- * Handlers for <this_driver>/vlan/<vlan_id>
- */
-static const struct switch_handler bcm539x_switch_handlers_vlan_dir[] = {
-	{
-		.name	= "ports",
-		.read	= bcm539x_handle_vlan_ports_read,
-		.write	= bcm539x_handle_vlan_ports_write,
-	},
-	{
-	},
-};
-
-/*
- * bcm539x_handle_vlan_delete_write
- */
-static int bcm539x_handle_vlan_delete_write(struct switch_device *dev,
-					    char *buf, int inst)
-{
-	struct bcm539x_data *bd =
-		(struct bcm539x_data *)switch_get_drvdata(dev);
-	int vid;
-	u8_t rxbuf8;
-	u32_t txbuf;
-	int j;
-	int ret;
-
-	vid = simple_strtoul(buf, NULL, 0);
-	if (!vid) {
-		return -EINVAL;
-	}
-
-	/*
-	 * Disable this VLAN
-	 *
-	 * Go through the port-based vlan registers and clear the appropriate
-	 * ones out
-	 */
-	for (j = 0; j < 9; j++) {
-		u16_t rxbuf16;
-		ret = bcm539x_read_16(bd, PAGE_VLAN, REG_VLAN_PTAG0 + (j << 1),
-				      &rxbuf16);
-		if (ret) {
-			return ret;
-		}
-		if (rxbuf16 == vid) {
-			txbuf = 0;
-			ret = bcm539x_write_16(bd, PAGE_VLAN,
-					       REG_VLAN_PTAG0 + (j << 1),
-					       txbuf);
-			if (ret) {
-				return ret;
-			}
-		}
-	}
-
-	/*
-	 * Write the VLAN table
-	 */
-	txbuf = vid;
-	ret = bcm539x_write_16(bd, PAGE_VTBL, REG_VTBL_INDX_5395, txbuf);
-	if (ret) {
-		return ret;
-	}
-
-	txbuf = 0;
-	ret = bcm539x_write_32(bd, PAGE_VTBL, REG_VTBL_ENTRY_5395, txbuf);
-	if (ret) {
-		return ret;
-	}
-
-	txbuf = (1 << 7) | (0);
-	ret = bcm539x_write_8(bd, PAGE_VTBL, REG_VTBL_ACCESS_5395, txbuf);
-	if (ret) {
-		return ret;
-	}
-
-	/*
-	 * Wait for completion
-	 */
-	for (j = 0; j < BCM539X_SPI_RETRIES; j++) {
-		ret = bcm539x_read_bytes(bd, PAGE_VTBL, REG_VTBL_ACCESS_5395,
-					 &rxbuf8, 1);
-		if (ret) {
-			return ret;
-		}
-		if (!(rxbuf8 & (1 << 7))) {
-			break;
-		}
-	}
-
-	if (j == BCM539X_SPI_RETRIES) {
-		return -EIO;
-	}
-
-	return switch_remove_vlan_dir(dev, vid);
-}
-
-/*
- * bcm539x_handle_vlan_create_write
- */
-static int bcm539x_handle_vlan_create_write(struct switch_device *dev,
-					    char *buf, int inst)
-{
-	int vid;
-
-	vid = simple_strtoul(buf, NULL, 0);
-	if (!vid) {
-		return -EINVAL;
-	}
-
-	return switch_create_vlan_dir(dev, vid,
-				      bcm539x_switch_handlers_vlan_dir);
-}
-
-/*
- * bcm539x_handle_enable_read
- */
-static int bcm539x_handle_enable_read(struct switch_device *dev,
-				      char *buf, int inst)
-{
-	struct bcm539x_data *bd =
-		(struct bcm539x_data *)switch_get_drvdata(dev);
-	u8_t rxbuf;
-	int ret;
-
-	ret = bcm539x_read_8(bd, PAGE_PORT_TC, REG_CTRL_MODE, &rxbuf);
-	if (ret) {
-		return ret;
-	}
-	rxbuf = (rxbuf & (1 << 1)) ? 1 : 0;
-
-	return sprintf(buf, "%d\n", rxbuf);
-}
-
-/*
- * bcm539x_handle_enable_write
- */
-static int bcm539x_handle_enable_write(struct switch_device *dev,
-				       char *buf, int inst)
-{
-	struct bcm539x_data *bd =
-		(struct bcm539x_data *)switch_get_drvdata(dev);
-
-	return bcm539x_set_mode(bd, buf[0] == '1');
-}
-
-/*
- * bcm539x_handle_enable_vlan_read
- */
-static int bcm539x_handle_enable_vlan_read(struct switch_device *dev,
-					   char *buf, int inst)
-{
-	struct bcm539x_data *bd =
-		(struct bcm539x_data *)switch_get_drvdata(dev);
-	u8_t rxbuf;
-	int ret;
-
-	ret = bcm539x_read_8(bd, PAGE_VLAN, REG_VLAN_CTRL0, &rxbuf);
-	if (ret) {
-		return ret;
-	}
-	rxbuf = (rxbuf & (1 << 7)) ? 1 : 0;
-
-	return sprintf(buf, "%d\n", rxbuf);
-}
-
-/*
- * bcm539x_handle_enable_vlan_write
- */
-static int bcm539x_handle_enable_vlan_write(struct switch_device *dev,
-					    char *buf, int inst)
-{
-	struct bcm539x_data *bd =
-		(struct bcm539x_data *)switch_get_drvdata(dev);
-	int ret;
-
-	/*
-	 * disable 802.1Q VLANs
-	 */
-	if (buf[0] != '1') {
-		ret = bcm539x_write_8(bd, PAGE_VLAN, REG_VLAN_CTRL0, 0);
-		return ret;
-	}
-
-	/*
-	 * enable 802.1Q VLANs
-	 *
-	 * Enable 802.1Q | IVL learning
-	 */
-	ret = bcm539x_write_8(bd, PAGE_VLAN, REG_VLAN_CTRL0,
-			      (1 << 7) | (3 << 5));
-	if (ret) {
-		return ret;
-	}
-
-	/*
-	 * RSV multicast fwd | RSV multicast chk
-	 */
-	ret = bcm539x_write_8(bd, PAGE_VLAN, REG_VLAN_CTRL1,
-			      (1 << 2) | (1 << 3));
-	if (ret) {
-		return ret;
-	}
-#if 0
-	/*
-	 * Drop invalid VID
-	 */
-	ret = bcm539x_write_16(bd, PAGE_VLAN, REG_VLAN_CTRL3, 0x00FF);
-	if (ret) {
-		return ret;
-	}
-#endif
-	return 0;
-}
-
-/*
- * bcm539x_handle_port_enable_read
- */
-static int bcm539x_handle_port_enable_read(struct switch_device *dev,
-					   char *buf, int inst)
-{
-	return sprintf(buf, "%d\n", 1);
-}
-
-/*
- * bcm539x_handle_port_enable_write
- */
-static int bcm539x_handle_port_enable_write(struct switch_device *dev,
-					    char *buf, int inst)
-{
-	/*
-	 * validate port
-	 */
-	if (!(dev->port_mask[0] & (1 << inst))) {
-		return -EIO;
-	}
-
-	if (buf[0] != '1') {
-		printk(KERN_WARNING "switch port[%d] disabling is not supported\n", inst);
-	}
-	return 0;
-}
-
-/*
- * bcm539x_handle_port_state_read
- */
-static int bcm539x_handle_port_state_read(struct switch_device *dev,
-					   char *buf, int inst)
-{
-	struct bcm539x_data *bd =
-		(struct bcm539x_data *)switch_get_drvdata(dev);
-	int ret;
-	u16_t link;
-
-	/*
-	 * validate port
-	 */
-	if (!(dev->port_mask[0] & (1 << inst))) {
-		return -EIO;
-	}
-
-	/*
-	 * check PHY link state - CPU port (port 8) is always up
-	 */
-	ret = bcm539x_read_16(bd, PAGE_STATUS, REG_LINK_STATUS, &link);
-	if (ret) {
-		return ret;
-	}
-	link |= (1 << 8);
-
-	return sprintf(buf, "%d\n", (link & (1 << inst)) ? 1 : 0);
-}
-
-/*
- * bcm539x_handle_port_media_read
- */
-static int bcm539x_handle_port_media_read(struct switch_device *dev,
-					   char *buf, int inst)
-{
-	struct bcm539x_data *bd =
-		(struct bcm539x_data *)switch_get_drvdata(dev);
-	int ret;
-	u16_t link, duplex;
-	u32_t speed;
-
-	/*
-	 * validate port
-	 */
-	if (!(dev->port_mask[0] & (1 << inst))) {
-		return -EIO;
-	}
-
-	/*
-	 * check PHY link state first - CPU port (port 8) is always up
-	 */
-	ret = bcm539x_read_16(bd, PAGE_STATUS, REG_LINK_STATUS, &link);
-	if (ret) {
-		return ret;
-	}
-	link |= (1 << 8);
-
-	if (!(link & (1 << inst))) {
-		return sprintf(buf, "UNKNOWN\n");
-	}
-
-	/*
-	 * get link speeda dn duplex - CPU port (port 8) is 1000/full
-	 */
-	ret = bcm539x_read_32(bd, PAGE_STATUS, 4, &speed);
-	if (ret) {
-		return ret;
-	}
-	speed |= (2 << 16);
-	speed = (speed >> (2 * inst)) & 3;
-
-	ret = bcm539x_read_16(bd, PAGE_STATUS, 8, &duplex);
-	if (ret) {
-		return ret;
-	}
-	duplex |= (1 << 8);
-	duplex = (duplex >> inst) & 1;
-
-	return sprintf(buf, "%d%cD\n",
-		(speed == 0) ? 10 : ((speed == 1) ? 100 : 1000),
-		duplex ? 'F' : 'H');
-}
-
-/*
- * bcm539x_handle_port_meida_write
- */
-static int bcm539x_handle_port_meida_write(struct switch_device *dev,
-					    char *buf, int inst)
-{
-	struct bcm539x_data *bd =
-		(struct bcm539x_data *)switch_get_drvdata(dev);
-	int ret;
-	u16_t ctrl_word, local_cap, local_giga_cap;
-
-	/*
-	 * validate port (not for CPU port)
-	 */
-	if (!(dev->port_mask[0] & (1 << inst) & ~(1 << 8))) {
-		return -EIO;
-	}
-
-	/*
-	 * Get the maximum capability from status
-	 *	SPI reg[0x00] = PHY[0x0] --- MII control
-	 *	SPI reg[0x08] = PHY[0x4] --- MII local capability
-	 *	SPI reg[0x12] = PHY[0x9] --- GMII control
-	 */
-	ret = bcm539x_read_16(bd, REG_MII_PAGE + inst, (MII_ADVERTISE << 1), &local_cap);
-	if (ret) {
-		return ret;
-	}
-	ret = bcm539x_read_16(bd, REG_MII_PAGE + inst, (MII_CTRL1000 << 1), &local_giga_cap);
-	if (ret) {
-		return ret;
-	}
-
-	/* Configure to the requested speed */
-	if (strncmp(buf, "1000FD", 6) == 0) {
-		/* speed */
-		local_cap &= ~(ADVERTISE_10HALF | ADVERTISE_10FULL);
-		local_cap &= ~(ADVERTISE_100HALF | ADVERTISE_100FULL);
-		local_giga_cap |= (ADVERTISE_1000HALF | ADVERTISE_1000FULL);
-		/* duplex */
-	} else if (strncmp(buf, "100FD", 5) == 0) {
-		/* speed */
-		local_cap &= ~(ADVERTISE_10HALF | ADVERTISE_10FULL);
-		local_cap |= (ADVERTISE_100HALF | ADVERTISE_100FULL);
-		local_giga_cap &= ~(ADVERTISE_1000HALF | ADVERTISE_1000FULL);
-		/* duplex */
-		local_cap &= ~(ADVERTISE_100HALF);
-	} else if (strncmp(buf, "100HD", 5) == 0) {
-		/* speed */
-		local_cap &= ~(ADVERTISE_10HALF | ADVERTISE_10FULL);
-		local_cap |= (ADVERTISE_100HALF | ADVERTISE_100FULL);
-		local_giga_cap &= ~(ADVERTISE_1000HALF | ADVERTISE_1000FULL);
-		/* duplex */
-		local_cap &= ~(ADVERTISE_100FULL);
-	} else if (strncmp(buf, "10FD", 4) == 0) {
-		/* speed */
-		local_cap |= (ADVERTISE_10HALF | ADVERTISE_10FULL);
-		local_cap &= ~(ADVERTISE_100HALF | ADVERTISE_100FULL);
-		local_giga_cap &= ~(ADVERTISE_1000HALF | ADVERTISE_1000FULL);
-		/* duplex */
-		local_cap &= ~(ADVERTISE_10HALF);
-	} else if (strncmp(buf, "10HD", 4) == 0) {
-		/* speed */
-		local_cap |= (ADVERTISE_10HALF | ADVERTISE_10FULL);
-		local_cap &= ~(ADVERTISE_100HALF | ADVERTISE_100FULL);
-		local_giga_cap &= ~(ADVERTISE_1000HALF | ADVERTISE_1000FULL);
-		/* duplex */
-		local_cap &= ~(ADVERTISE_10FULL);
-	} else if (strncmp(buf, "AUTO", 4) == 0) {
-		/* speed */
-		local_cap |= (ADVERTISE_10HALF | ADVERTISE_10FULL);
-		local_cap |= (ADVERTISE_100HALF | ADVERTISE_100FULL);
-		local_giga_cap |= (ADVERTISE_1000HALF | ADVERTISE_1000FULL);
-	} else {
-		return -EINVAL;
-	}
-
-	/* Active PHY with the requested speed for auto-negotiation */
-	ret = bcm539x_write_16(bd, REG_MII_PAGE + inst, (MII_ADVERTISE << 1), local_cap);
-	if (ret) {
-		return ret;
-	}
-	ret = bcm539x_write_16(bd, REG_MII_PAGE + inst, (MII_CTRL1000 << 1), local_giga_cap);
-	if (ret) {
-		return ret;
-	}
-
-	ret = bcm539x_read_16(bd, REG_MII_PAGE + inst, (MII_BMCR << 1), &ctrl_word);
-	if (ret) {
-		return ret;
-	}
-	ctrl_word |= (BMCR_ANENABLE | BMCR_ANRESTART);
-	ret = bcm539x_write_16(bd, REG_MII_PAGE + inst, (MII_BMCR << 1), ctrl_word);
-	if (ret) {
-		return ret;
-	}
-
-	return 0;
-}
-
-/*
- * proc_fs entries for this switch
- */
-static const struct switch_handler bcm539x_switch_handlers[] = {
-	{
-		.name	= "enable",
-		.read	= bcm539x_handle_enable_read,
-		.write	= bcm539x_handle_enable_write,
-	},
-	{
-		.name	= "enable_vlan",
-		.read	= bcm539x_handle_enable_vlan_read,
-		.write	= bcm539x_handle_enable_vlan_write,
-	},
-	{
-		.name	= "reset",
-		.write	= bcm539x_handle_reset,
-	},
-	{
-	},
-};
-
-/*
- * Handlers for <this_driver>/vlan
- */
-static const struct switch_handler bcm539x_switch_handlers_vlan[] = {
-	{
-		.name	= "delete",
-		.write	= bcm539x_handle_vlan_delete_write,
-	},
-	{
-		.name	= "create",
-		.write	= bcm539x_handle_vlan_create_write,
-	},
-	{
-	},
-};
-
-/*
- * Handlers for <this_driver>/port/<port number>
- */
-static const struct switch_handler bcm539x_switch_handlers_port[] = {
-	{
-		.name	= "enable",
-		.read	= bcm539x_handle_port_enable_read,
-		.write	= bcm539x_handle_port_enable_write,
-	},
-	{
-		.name	= "state",
-		.read	= bcm539x_handle_port_state_read,
-	},
-	{
-		.name	= "media",
-		.read	= bcm539x_handle_port_media_read,
-		.write	= bcm539x_handle_port_meida_write,
-	},
-	{
-	},
-};
-
-/*
- * bcm539x_probe
- */
-static int __devinit bcm539x_probe(struct spi_device *spi)
-{
-	struct bcm539x_data *bd;
-	struct switch_core_platform_data *pdata;
-	struct switch_device *switch_dev = NULL;
-	int i, ret;
-	u8_t txbuf[2];
-
-	pdata = spi->dev.platform_data;
-	if (!pdata) {
-		return -EINVAL;
-	}
-
-	ret = spi_setup(spi);
-	if (ret < 0) {
-		return ret;
-	}
-
-	/*
-	 * Reset the chip if requested
-	 */
-	if (pdata->flags & SWITCH_DEV_FLAG_HW_RESET) {
-		ret = gpio_request(pdata->pin_reset, "switch-bcm539x-reset");
-		if (ret) {
-			printk(KERN_WARNING "Could not request reset\n");
-			return -EINVAL;
-		}
-
-		gpio_direction_output(pdata->pin_reset, 0);
-		udelay(10);
-		gpio_set_value(pdata->pin_reset, 1);
-		udelay(20);
-	}
-
-	/*
-	 * Allocate our private data structure
-	 */
-	bd = kzalloc(sizeof(struct bcm539x_data), GFP_KERNEL);
-	if (!bd) {
-		return -ENOMEM;
-	}
-
-	dev_set_drvdata(&spi->dev, bd);
-	bd->pdata = pdata;
-	bd->spi = spi;
-	bd->last_page = 0xFF;
-
-	/*
-	 * First perform SW reset if needed
-	 */
-	if (pdata->flags & SWITCH_DEV_FLAG_SW_RESET) {
-		txbuf[0] = (1 << 7) | (1 << 4);
-		ret = bcm539x_write_bytes(bd, PAGE_PORT_TC,
-					  REG_CTRL_SRST, txbuf, 1);
-		if (ret) {
-			goto fail;
-		}
-
-		udelay(20);
-
-		txbuf[0] = 0;
-		ret = bcm539x_write_bytes(bd, PAGE_PORT_TC,
-					  REG_CTRL_SRST, txbuf, 1);
-		if (ret) {
-			goto fail;
-		}
-	}
-
-	/*
-	 * See if we can see the chip
-	 */
-	for (i = 0; i < 10; i++) {
-		ret = bcm539x_read_bytes(bd, PAGE_MMR, REG_DEVICE_ID,
-					 &bd->device_id, 1);
-		if (!ret) {
-			break;
-		}
-	}
-	if (ret) {
-		goto fail;
-	}
-
-	/*
-	 * We only support 5395, 5397, 5398
-	 */
-	if ((bd->device_id != 0x95) && (bd->device_id != 0x97) &&
-	    (bd->device_id != 0x98)) {
-		ret = -ENODEV;
-		goto fail;
-	}
-
-	/*
-	 *  Override CPU port config: fixed link @1000 with flow control
-	 */
-	ret = bcm539x_read_8(bd, PAGE_PORT_TC, REG_CTRL_MIIPO, txbuf);
-	bcm539x_write_8(bd, PAGE_PORT_TC, REG_CTRL_MIIPO, 0xbb);	// Override IMP port config
-	printk("Broadcom SW CPU port setting: 0x%x -> 0xbb\n", txbuf[0]);
-
-	/*
-	 * Setup the switch driver structure
-	 */
-	switch_dev = switch_alloc();
-	if (!switch_dev) {
-		ret = -ENOMEM;
-		goto fail;
-	}
-	switch_dev->name = pdata->name;
-
-	switch_dev->ports = (bd->device_id == 0x98) ? 9 : 6;
-	switch_dev->port_mask[0] = (bd->device_id == 0x98) ? 0x1FF : 0x11F;
-	switch_dev->driver_handlers = bcm539x_switch_handlers;
-	switch_dev->reg_handlers = NULL;
-	switch_dev->vlan_handlers = bcm539x_switch_handlers_vlan;
-	switch_dev->port_handlers = bcm539x_switch_handlers_port;
-
-	bd->switch_dev = switch_dev;
-	switch_set_drvdata(switch_dev, (void *)bd);
-
-	ret = switch_register(bd->switch_dev);
-	if (ret < 0) {
-		goto fail;
-	}
-
-	printk(KERN_INFO "bcm53%02x switch chip initialized\n", bd->device_id);
-
-	return ret;
-
-fail:
-	if (switch_dev) {
-		switch_release(switch_dev);
-	}
-	dev_set_drvdata(&spi->dev, NULL);
-	kfree(bd);
-	return ret;
-}
-
-static int __attribute__((unused)) bcm539x_remove(struct spi_device *spi)
-{
-	struct bcm539x_data *bd;
-
-	bd = dev_get_drvdata(&spi->dev);
-
-	if (bd->pdata->flags & SWITCH_DEV_FLAG_HW_RESET) {
-		gpio_free(bd->pdata->pin_reset);
-	}
-
-	if (bd->switch_dev) {
-		switch_unregister(bd->switch_dev);
-		switch_release(bd->switch_dev);
-	}
-
-	dev_set_drvdata(&spi->dev, NULL);
-
-	kfree(bd);
-
-	return 0;
-}
-
-static struct spi_driver bcm539x_driver = {
-	.driver = {
-		.name		= DRIVER_NAME,
-		.owner		= THIS_MODULE,
-	},
-	.probe		= bcm539x_probe,
-	.remove		= __devexit_p(bcm539x_remove),
-};
-
-static int __init bcm539x_init(void)
-{
-	return spi_register_driver(&bcm539x_driver);
-}
-
-module_init(bcm539x_init);
-
-static void __exit bcm539x_exit(void)
-{
-	spi_unregister_driver(&bcm539x_driver);
-}
-module_exit(bcm539x_exit);
-
-MODULE_AUTHOR("Pat Tjin");
-MODULE_LICENSE("GPL v2");
-MODULE_DESCRIPTION("bcm539x SPI switch chip driver");
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-common/switch-core.c b/target/linux/ubicom32/files/arch/ubicom32/mach-common/switch-core.c
deleted file mode 100644
index 855aa068d..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-common/switch-core.c
+++ /dev/null
@@ -1,737 +0,0 @@
-/*
- * arch/ubicom32/mach-common/switch-core.c
- *   Ubicom32 architecture switch and /proc/switch/... implementation.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- * Copyright (C) 2005 Felix Fietkau <openwrt@nbd.name>
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- *
- * Basic doc of driver's /proc interface:
- * /proc/switch/<interface>/
- *   registers:              read-only
- *   counters:               read-only
- *   reset:                  write causes hardware reset
- *   enable:                 "0", "1"
- *   enable_vlan:            "0", "1"
- *   port/<port-number>/
- *     enabled:              "0", "1"
- *     link state:           read-only
- *     media:                "AUTO", "1000FD", "100FD", "100HD", "10FD", "10HD"
- *   vlan/<port-number>/
- *     ports: same syntax as for nvram's vlan*ports (eg. "1 2 3 4 5*")
- */
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/uaccess.h>
-#include <linux/ctype.h>
-#include <linux/proc_fs.h>
-#include <linux/list.h>
-#include <linux/rwsem.h>
-#include <linux/device.h>
-
-#include "switch-core.h"
-
-/*
- * Pointer to the root of our filesystem
- */
-static struct proc_dir_entry *switch_root;
-
-/*
- * Lock used to manage access to the switch list
- */
-DECLARE_RWSEM(switch_list_lock);
-EXPORT_SYMBOL_GPL(switch_list_lock);
-
-/*
- * List of switches we are managing
- */
-LIST_HEAD(switch_list);
-EXPORT_SYMBOL_GPL(switch_list);
-
-/*
- * List of handlers we have
- */
-LIST_HEAD(switch_handler_list);
-EXPORT_SYMBOL_GPL(switch_handler_list);
-
-/*
- * Keep track of all the handlers we added
- */
-struct switch_handler_entry {
-	struct list_head		node;
-	struct proc_dir_entry		*parent;
-	struct switch_device		*dev;
-	const struct switch_handler	*handler;
-	int				inst;
-};
-
-/*
- * Keep track of all VLAN dirs we created
- */
-struct switch_vlan_entry {
-	struct list_head		node;
-	struct proc_dir_entry		*pde;
-	int				vlan_id;
-	const struct switch_handler	*handlers;
-};
-
-/*
- * switch_parse_vlan_ports
- *	Parse the vlan properties written to <driver>/vlan/<vlan_id>/ports
- */
-void switch_parse_vlan_ports(struct switch_device *switch_dev,
-			     char *buf, u32_t *untag,
-			     u32_t *ports, u32_t *def)
-{
-	u32_t tag = 0;
-	*untag = 0;
-	*ports = 0;
-	*def = 0;
-
-
-	/*
-	 * Skip any leading spaces
-	 */
-	while (isspace(*buf)) {
-		buf++;
-	}
-
-	/*
-	 * Parse out the string
-	 */
-	while (*buf) {
-		u32_t port = simple_strtoul(buf, &buf, 10);
-		u32_t mask = (1 << port);
-
-		/*
-		 * Parse out any flags
-		 */
-		while (*buf && !isspace(*buf)) {
-			switch (*buf++) {
-			case 't':
-				tag |= mask;
-				break;
-			case '*':
-				*def |= mask;
-				break;
-			}
-		}
-		*ports |= mask;
-
-		/*
-		 * Skip any spaces
-		 */
-		while (isspace(*buf)) {
-			buf++;
-		}
-	}
-
-	*untag = ~tag & *ports;
-}
-
-/*
- * switch_proc_read
- *	Handle reads from the procfs, dispatches the driver specific handler
- */
-static ssize_t switch_proc_read(struct file *file, char *buf, size_t count,
-				loff_t *ppos)
-{
-	struct proc_dir_entry *pde = PDE(file->f_dentry->d_inode);
-	char *page;
-	int len = 0;
-
-	page = kmalloc(SWITCH_MAX_BUFSZ, GFP_KERNEL);
-	if (!page) {
-		return -ENOBUFS;
-	}
-
-	if (pde->data != NULL) {
-		struct switch_handler_entry *she =
-			(struct switch_handler_entry *)pde->data;
-		if (she->handler->read) {
-			len += she->handler->read(she->dev, page + len,
-						  she->inst);
-		}
-	}
-	len += 1;
-
-	if (*ppos < len) {
-		len = min_t(int, len - *ppos, count);
-		if (copy_to_user(buf, (page + *ppos), len)) {
-			kfree(page);
-			return -EFAULT;
-		}
-		*ppos += len;
-	} else {
-		len = 0;
-	}
-
-	kfree(page);
-
-	return len;
-}
-
-/*
- * switch_proc_write
- *	Handle writes from the procfs, dispatches the driver specific handler
- */
-static ssize_t switch_proc_write(struct file *file, const char *buf,
-				 size_t count, loff_t *data)
-{
-	struct proc_dir_entry *pde = PDE(file->f_dentry->d_inode);
-	char *page;
-	int ret = -EINVAL;
-
-	page = kmalloc(count + 1, GFP_KERNEL);
-	if (page == NULL)
-		return -ENOBUFS;
-
-	if (copy_from_user(page, buf, count)) {
-		kfree(page);
-		return -EINVAL;
-	}
-	page[count] = 0;
-
-	if (pde->data != NULL) {
-		struct switch_handler_entry *she =
-			(struct switch_handler_entry *)pde->data;
-		if (she->handler->write) {
-			ret = she->handler->write(she->dev, page, she->inst);
-			if (ret >= 0) {
-				ret = count;
-			}
-		}
-	}
-
-	kfree(page);
-	return ret;
-}
-
-/*
- * File operations for the proc_fs, we must cast here since proc_fs' definitions
- * differ from file_operations definitions.
- */
-static struct file_operations switch_proc_fops = {
-	.read = (ssize_t (*) (struct file *, char __user *,
-			      size_t, loff_t *))switch_proc_read,
-	.write = (ssize_t (*) (struct file *, const char __user *,
-			       size_t, loff_t *))switch_proc_write,
-};
-
-/*
- * switch_add_handler
- */
-static int switch_add_handler(struct switch_device *switch_dev,
-			      struct proc_dir_entry *parent,
-			      const struct switch_handler *handler,
-			      int inst)
-{
-	struct switch_handler_entry *she;
-	struct proc_dir_entry *pde;
-	int mode;
-
-	she = (struct switch_handler_entry *)
-		kzalloc(sizeof(struct switch_handler_entry), GFP_KERNEL);
-	if (!she) {
-		return -ENOMEM;
-	}
-
-	INIT_LIST_HEAD(&she->node);
-	she->parent = parent;
-	she->dev = switch_dev;
-	she->inst = inst;
-	she->handler = handler;
-	list_add(&she->node, &switch_dev->handlers);
-
-	mode = 0;
-	if (handler->read != NULL) {
-		mode |= S_IRUSR;
-	}
-	if (handler->write != NULL) {
-		mode |= S_IWUSR;
-	}
-
-	pde = create_proc_entry(handler->name, mode, parent);
-	if (!pde) {
-		kfree(she);
-		printk("Failed to create node '%s' in parent %p\n",
-		       handler->name, parent);
-		return -ENOMEM;
-	}
-	pde->data = (void *)she;
-	pde->proc_fops = &switch_proc_fops;
-
-	return 0;
-}
-
-/*
- * switch_add_handlers
- */
-static int switch_add_handlers(struct switch_device *switch_dev,
-			       struct proc_dir_entry *parent,
-			       const struct switch_handler *handlers,
-			       int inst)
-{
-	while (handlers->name) {
-		int ret = switch_add_handler(switch_dev,
-					     parent, handlers, inst);
-		if (ret) {
-			return ret;
-		}
-		handlers++;
-	}
-
-	return 0;
-}
-
-/*
- * switch_remove_vlan_dirs
- *	Removes all vlan directories
- *
- * Assumes all vlan directories are empty, should be called after
- * switch_remove_handlers
- */
-static void switch_remove_vlan_dirs(struct switch_device *switch_dev)
-{
-	struct list_head *pos;
-	struct list_head *tmp;
-	struct switch_vlan_entry *sve;
-
-	list_for_each_safe(pos, tmp, &switch_dev->vlan_dirs) {
-		sve = list_entry(pos, struct switch_vlan_entry, node);
-		list_del(pos);
-		remove_proc_entry(sve->pde->name, switch_dev->vlan_dir);
-		kfree(sve);
-	}
-}
-
-/*
- * switch_remove_handlers
- *	Removes all handlers registered to the given switch_device
- */
-static void switch_remove_handlers(struct switch_device *switch_dev)
-{
-	struct list_head *pos;
-	struct list_head *tmp;
-	struct switch_handler_entry *she;
-
-	list_for_each_safe(pos, tmp, &switch_dev->handlers) {
-		she = list_entry(pos, struct switch_handler_entry, node);
-		list_del(pos);
-		remove_proc_entry(she->handler->name, she->parent);
-		kfree(she);
-	}
-}
-
-/*
- * switch_unregister_proc_nodes
- *	Unregisters all proc nodes related to switch_dev
- */
-void switch_unregister_proc_nodes(struct switch_device *switch_dev)
-{
-	switch_remove_handlers(switch_dev);
-
-	if (switch_dev->port_dirs) {
-		int i;
-
-		for (i = 0; i < switch_dev->ports; i++) {
-			if (switch_dev->port_dirs[i]) {
-				remove_proc_entry(
-					switch_dev->port_dirs[i]->name,
-					switch_dev->port_dir);
-			}
-		}
-	}
-
-	if (switch_dev->port_dir) {
-		remove_proc_entry("port", switch_dev->driver_dir);
-		switch_dev->port_dir = NULL;
-	}
-
-	if (switch_dev->reg_dir) {
-		remove_proc_entry("reg", switch_dev->reg_dir);
-		switch_dev->reg_dir = NULL;
-	}
-
-	if (switch_dev->vlan_dir) {
-		switch_remove_vlan_dirs(switch_dev);
-		remove_proc_entry("vlan", switch_dev->driver_dir);
-		switch_dev->vlan_dir = NULL;
-	}
-
-	if (switch_dev->driver_dir) {
-		remove_proc_entry(switch_dev->name, switch_root);
-		switch_dev->driver_dir = NULL;
-	}
-}
-
-/*
- * switch_remove_vlan_dir
- *	Removes vlan dir in switch/<switch_driver>/vlan/<vlan_id>
- */
-int switch_remove_vlan_dir(struct switch_device *switch_dev, int vlan_id)
-{
-	struct list_head *pos;
-	struct switch_vlan_entry *sve = NULL;
-
-	list_for_each(pos, &switch_dev->vlan_dirs) {
-		struct switch_vlan_entry *tmp =
-			list_entry(pos, struct switch_vlan_entry, node);
-		if (tmp->vlan_id == vlan_id) {
-			sve = tmp;
-			break;
-		}
-	}
-
-	if (!sve) {
-		return -ENOENT;
-	}
-
-	/*
-	 * Remove it from the list
-	 */
-	list_del(pos);
-
-	/*
-	 * Remove the handlers
-	 */
-	while (sve->handlers->name) {
-		remove_proc_entry(sve->handlers->name, sve->pde);
-		sve->handlers++;
-	}
-
-	/*
-	 * Remove the proc entry for the <vlan_id> dir
-	 */
-	remove_proc_entry(sve->pde->name, switch_dev->vlan_dir);
-
-	kfree(sve);
-
-	return 0;
-}
-
-/*
- * switch_create_vlan_dir
- *	Creates vlan dir in switch/<switch_driver>/vlan/<vlan_id>
- */
-int switch_create_vlan_dir(struct switch_device *switch_dev,
-			   int vlan_id, const struct switch_handler *handlers)
-{
-	char s[14];
-	struct proc_dir_entry *pde = NULL;
-	struct switch_vlan_entry *sve = NULL;
-	int ret;
-	struct list_head *pos;
-
-	/*
-	 * Check to see if it exists already
-	 */
-	list_for_each(pos, &switch_dev->vlan_dirs) {
-		sve = list_entry(pos, struct switch_vlan_entry, node);
-		if (sve->vlan_id == vlan_id) {
-			return -EEXIST;
-		}
-	}
-	sve = NULL;
-
-	/*
-	 * Create the vlan directory if we didn't have it before
-	 */
-	if (!switch_dev->vlan_dir) {
-		switch_dev->vlan_dir = proc_mkdir("vlan",
-						  switch_dev->driver_dir);
-		if (!switch_dev->vlan_dir) {
-			goto fail;
-		}
-		if (switch_dev->vlan_handlers) {
-			ret = switch_add_handlers(switch_dev,
-						  switch_dev->vlan_dir,
-						  switch_dev->vlan_handlers, 0);
-			if (ret) {
-				goto fail;
-			}
-		}
-	}
-
-	/*
-	 * Create the vlan_id directory
-	 */
-	snprintf(s, 14, "%d", vlan_id);
-	pde = proc_mkdir(s, switch_dev->vlan_dir);
-	if (!pde) {
-		goto fail;
-	}
-
-	/*
-	 * Create the handlers for this vlan
-	 */
-	if (handlers) {
-		ret = switch_add_handlers(switch_dev, pde, handlers, vlan_id);
-		if (ret) {
-			goto fail;
-		}
-	}
-
-	/*
-	 * Keep track of all the switch vlan entries created
-	 */
-	sve = (struct switch_vlan_entry *)
-		kzalloc(sizeof(struct switch_vlan_entry), GFP_KERNEL);
-	if (!sve) {
-		goto fail;
-	}
-	INIT_LIST_HEAD(&sve->node);
-	sve->handlers = handlers;
-	sve->vlan_id = vlan_id;
-	sve->pde = pde;
-	list_add(&sve->node, &switch_dev->vlan_dirs);
-
-	return 0;
-
-fail:
-	if (sve) {
-		kfree(sve);
-	}
-
-	if (pde) {
-		/*
-		 * Remove any proc entries we might have created
-		 */
-		while (handlers->name) {
-			remove_proc_entry(handlers->name, pde);
-			handlers++;
-		}
-
-		remove_proc_entry(s, switch_dev->driver_dir);
-	}
-
-	return -ENOMEM;
-}
-
-/*
- * switch_register_proc_nodes
- */
-int switch_register_proc_nodes(struct switch_device *switch_dev)
-{
-	int i;
-	int n;
-
-	switch_dev->port_dirs = kzalloc(switch_dev->ports *
-					sizeof(struct proc_dir_entry *),
-					GFP_KERNEL);
-	if (!switch_dev->port_dirs) {
-		return -ENOMEM;
-	}
-
-	/*
-	 * Create a new proc entry for this switch
-	 */
-	switch_dev->driver_dir = proc_mkdir(switch_dev->name, switch_root);
-	if (!switch_dev->driver_dir) {
-		goto fail;
-	}
-	if (switch_dev->driver_handlers) {
-		switch_add_handlers(switch_dev,
-				    switch_dev->driver_dir,
-				    switch_dev->driver_handlers,
-				    0);
-	}
-
-	/*
-	 * Create the ports
-	 */
-	switch_dev->port_dir = proc_mkdir("port", switch_dev->driver_dir);
-	if (!switch_dev->port_dir) {
-		goto fail;
-	}
-	for (n = 0, i = 0; i < (SWITCH_PORT_MASK_SIZE * 32); i++) {
-		if (switch_dev->port_mask[i / 32] & (1 << i % 32)) {
-			char s[14];
-
-			snprintf(s, 14, "%d", i);
-			switch_dev->port_dirs[n] =
-				proc_mkdir(s, switch_dev->port_dir);
-			if (!switch_dev->port_dirs[n]) {
-				goto fail;
-			}
-			if (switch_dev->port_handlers) {
-				switch_add_handlers(switch_dev,
-						    switch_dev->port_dirs[n],
-						    switch_dev->port_handlers,
-						    i);
-			}
-			n++;
-		}
-	}
-
-	/*
-	 * Create the register directory for switch register access.
-	 */
-	if (switch_dev->reg_handlers) {
-		switch_dev->reg_dir = proc_mkdir("reg", switch_dev->driver_dir);
-		if (!switch_dev->reg_dir) {
-			goto fail;
-		}
-
-		switch_add_handlers(switch_dev,
-				    switch_dev->reg_dir,
-				    switch_dev->reg_handlers,
-				    0);
-	}
-
-	/*
-	 * Create the vlan directory
-	 */
-	if (switch_dev->vlan_handlers) {
-		switch_dev->vlan_dir = proc_mkdir("vlan",
-						  switch_dev->driver_dir);
-		if (!switch_dev->vlan_dir) {
-			goto fail;
-		}
-		if (switch_dev->vlan_handlers) {
-			switch_add_handlers(switch_dev,
-					    switch_dev->vlan_dir,
-					    switch_dev->vlan_handlers,
-					    0);
-		}
-	}
-
-	return 0;
-
-fail:
-	switch_unregister_proc_nodes(switch_dev);
-	return -ENOMEM;
-}
-
-/*
- * switch_release
- */
-void switch_release(struct switch_device *switch_dev)
-{
-	kfree(switch_dev);
-}
-
-/*
- * switch_alloc
- */
-struct switch_device *switch_alloc(void)
-{
-	struct switch_device *switch_dev =
-		kzalloc(sizeof(struct switch_device),
-						GFP_KERNEL);
-	INIT_LIST_HEAD(&switch_dev->node);
-	INIT_LIST_HEAD(&switch_dev->vlan_dirs);
-	INIT_LIST_HEAD(&switch_dev->handlers);
-	return switch_dev;
-}
-
-/*
- * switch_register
- */
-int switch_register(struct switch_device *switch_dev)
-{
-	int ret;
-	int i;
-
-	/*
-	 * Make sure that the number of ports and the port mask make sense
-	 */
-	for (ret = 0, i = 0; i < (SWITCH_PORT_MASK_SIZE * 32); i++) {
-		if (switch_dev->port_mask[i / 32] & (1 << i % 32)) {
-			ret++;
-		}
-	}
-	if (ret > switch_dev->ports) {
-		return -EINVAL;
-	}
-
-	/*
-	 * Create the /proc entries
-	 */
-	ret = switch_register_proc_nodes(switch_dev);
-	if (ret) {
-		return ret;
-	}
-
-	/*
-	 * Add it to the list of switches
-	 */
-	down_write(&switch_list_lock);
-	list_add_tail(&switch_dev->node, &switch_list);
-	up_write(&switch_list_lock);
-
-	printk(KERN_INFO "Registered switch device: %s\n", switch_dev->name);
-
-	return 0;
-}
-EXPORT_SYMBOL_GPL(switch_register);
-
-/*
- * switch_unregister
- *	Unregisters a previously registered switch_device object
- */
-void switch_unregister(struct switch_device *switch_dev)
-{
-	/*
-	 * remove the proc entries
-	 */
-	switch_unregister_proc_nodes(switch_dev);
-
-	/*
-	 * Remove it from the list of switches
-	 */
-	down_write(&switch_list_lock);
-	list_del(&switch_dev->node);
-	up_write(&switch_list_lock);
-
-	printk(KERN_INFO "Unregistered switch device: %s\n", switch_dev->name);
-}
-EXPORT_SYMBOL_GPL(switch_unregister);
-
-/*
- * switch_init
- */
-static int __init switch_init(void)
-{
-	switch_root = proc_mkdir("switch", NULL);
-	if (!switch_root) {
-		printk(KERN_WARNING "Failed to make root switch node\n");
-		return -ENODEV;
-	}
-	return 0;
-}
-module_init(switch_init);
-
-/*
- * switch_exit
- */
-static void __exit switch_exit(void)
-{
-	remove_proc_entry("switch", NULL);
-}
-module_exit(switch_exit);
-
-MODULE_AUTHOR("Patrick Tjin");
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Ethernet Switch Class Interface");
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-common/switch-core.h b/target/linux/ubicom32/files/arch/ubicom32/mach-common/switch-core.h
deleted file mode 100644
index 1e18b1cba..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-common/switch-core.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * arch/ubicom32/mach-common/switch-core.h
- *   Private data for the switch module
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _SWITCH_CORE_H_
-#define _SWITCH_CORE_H_
-
-struct switch_handler_entry;
-struct switch_vlan_entry;
-
-#define SWITCH_PORT_MASK_SIZE	2
-
-struct switch_device {
-	struct list_head		node;
-
-	const char			*name;
-	void				*drvdata;
-
-	u8_t				ports;
-
-	struct proc_dir_entry		*driver_dir;
-	const struct switch_handler	*driver_handlers;
-
-	struct proc_dir_entry		*port_dir;
-	struct proc_dir_entry		**port_dirs;
-	const struct switch_handler	*port_handlers;
-
-	struct proc_dir_entry		*reg_dir;
-	const struct switch_handler	*reg_handlers;
-
-	struct proc_dir_entry		*vlan_dir;
-	const struct switch_handler	*vlan_handlers;
-	struct list_head		vlan_dirs;
-
-	struct list_head		handlers;
-
-	u32_t				port_mask[SWITCH_PORT_MASK_SIZE];
-};
-
-typedef int (*switch_handler_fn)(struct switch_device *, char *buf, int nr);
-struct switch_handler {
-	const char		*name;
-
-	switch_handler_fn	read;
-	switch_handler_fn	write;
-};
-
-#define SWITCH_MAX_BUFSZ	4096
-
-static inline void switch_set_drvdata(struct switch_device *switch_dev, void *drvdata)
-{
-	switch_dev->drvdata = drvdata;
-}
-
-static inline void *switch_get_drvdata(struct switch_device *switch_dev)
-{
-	return switch_dev->drvdata;
-}
-
-extern int switch_create_vlan_dir(struct switch_device *switch_dev, int vlan_id, const struct switch_handler *handlers);
-extern int switch_remove_vlan_dir(struct switch_device *switch_dev, int vlan_id);
-extern void switch_parse_vlan_ports(struct switch_device *switch_dev, char *buf, u32_t *untag, u32_t *ports, u32_t *def);
-
-extern void switch_release(struct switch_device *switch_dev);
-extern struct switch_device *switch_alloc(void);
-extern int switch_register(struct switch_device *switch_dev);
-extern void switch_unregister(struct switch_device *switch_dev);
-
-#endif
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-common/ubi32-gpio.c b/target/linux/ubicom32/files/arch/ubicom32/mach-common/ubi32-gpio.c
deleted file mode 100644
index 5fa22f52b..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-common/ubi32-gpio.c
+++ /dev/null
@@ -1,411 +0,0 @@
-/*
- * arch/ubicom32/mach-common/ubi32-gpio.c
- *   Ubicom gpio driver
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/errno.h>
-#include <linux/kernel.h>
-#include <linux/io.h>
-#include <linux/gpio.h>
-#include <linux/irq.h>
-#include <linux/version.h>
-
-#if defined(CONFIG_PROC_FS)
-#include <linux/proc_fs.h>
-#endif
-
-#include <linux/io.h>
-#include <asm/ip5000.h>
-#include <linux/gpio.h>
-
-#define UBI_GPIO_CHECK_RANGE     0  /* !0 enables range checking */
-
-
-/*
- * Each I/O port can be configured to operate in one of several
- * functional modes. One of these modes is GPIO, which causes the
- * entire port to function as a GPIO port.  Since the various port
- * registers serve the system with other important functions, such as
- * ethernet, serial, USB, etc., it isn't advantageous to set any of
- * the ports to be entirely dedicated for GPIO use.  The processor
- * alternatively allows individual bits of a port to be assigned to be
- * used as GPIO independently from the overall port function.  This
- * bit-by-bit assignment is selected by setting the corresponding bit
- * in the port's gpio_mask register.  When set, the selected bit is
- * then enabled as a GPIO.  If the corresponding bit is set in the
- * gpio_ctl register of the port, the bit is configured as a GPIO
- * output.  Otherwise, it is an input.
- *
- * NOTE: This driver uses the bit-by-bit GPIO function assignment
- * exclusively and *never* sets the port function registers to the
- * GPIO function.
- *
- * GPIO is not the main function of any of the I/O ports.  The port
- * bit widths are variable from one port to the next, determined by
- * the more common I/O functions of the ports.  For simplicity, this
- * driver assumes all the ports are 32 bits wide regardless of the
- * real bit width of the port.  GPIO bits are numbered from zero to
- * MAX_UBICOM_GPIOS.  Within a port, the least significant bit is
- * numbered bit zero, the most significant is bit 31.  Since the ports
- * are considered logically contiguous, GPIO #32 is the zeroth bit in
- * port #1, and so on.  Due to the hardware definition, there are
- * large gaps in the GPIO numbers representing real pins.
- *
- * NOTE: It is up to the programmer to refer to the processor data
- * sheet to determine which bits in which ports can be accessed and
- * used for GPIO.
- *
- */
-
-
-/* There are 9 ports, A through I. Not all 32 bits in each
- * port can be a GPIO, but we pretend they are.  Its up to the
- * programmer to refer to the processor data sheet.
- */
-#define MAX_UBICOM_GPIOS   (9 * 32) /* ARCH_NR_GPIOS */
-#define NUM_GPIO_PORTS     (gpio_bank(MAX_UBICOM_GPIOS))
-
-
-/* GPIO reservation bit map array */
-static int reserved_gpio_map[NUM_GPIO_PORTS];
-
-
-/* Array of hardware io_port addresses */
-static struct ubicom32_io_port *gpio_bank_addr[NUM_GPIO_PORTS] =
-{
-	UBICOM32_IO_PORT(RA),
-	UBICOM32_IO_PORT(RB),
-	UBICOM32_IO_PORT(RC),
-	UBICOM32_IO_PORT(RD),
-	UBICOM32_IO_PORT(RE),
-	UBICOM32_IO_PORT(RF),
-	UBICOM32_IO_PORT(RG),
-	UBICOM32_IO_PORT(RH),
-	UBICOM32_IO_PORT(RI)
-};
-
-
-struct ubi_gpio_chip {
-	/*
-	 * Right now, nothing else lives here.
-	 */
-	struct gpio_chip gpio_chip;
-};
-
-
-#if UBI_GPIO_CHECK_RANGE
-inline int check_gpio(unsigned gpio)
-{
-	if (gpio >= MAX_UBICOM_GPIOS)
-		return -EINVAL;
-	return 0;
-}
-#else
-#define check_gpio(n)   (0)
-#endif
-
-/*
- * ubi_gpio_get_port
- *	Get the IO port associated with a certain gpio
- */
-struct ubicom32_io_port *ubi_gpio_get_port(unsigned gpio)
-{
-	if (gpio_bank(gpio) > NUM_GPIO_PORTS) {
-		return NULL;
-	}
-	return gpio_bank_addr[gpio_bank(gpio)];
-}
-
-/*
- * ubi_gpio_error()
- */
-static void ubi_gpio_error(unsigned gpio)
-{
-	printk(KERN_ERR "ubicom-gpio: GPIO %d wasn't requested!\n", gpio);
-}
-
-/*
- * ubi_port_setup()
- */
-static void ubi_port_setup(unsigned gpio, unsigned short usage)
-{
-	if (!check_gpio(gpio)) {
-		if (usage) {
-			UBICOM32_GPIO_ENABLE(gpio);
-		} else {
-			UBICOM32_GPIO_DISABLE(gpio);
-		}
-	}
-}
-
-/*
- * ubi_gpio_request()
- */
-static int ubi_gpio_request(struct gpio_chip *chip, unsigned gpio)
-{
-	unsigned long flags;
-
-	if (check_gpio(gpio) < 0)
-		return -EINVAL;
-
-	local_irq_save(flags);
-
-	if (unlikely(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio))) {
-		printk(KERN_ERR "ubi-gpio: GPIO %d is already reserved!\n",
-		       gpio);
-		local_irq_restore(flags);
-		return -EBUSY;
-	}
-
-	reserved_gpio_map[gpio_bank(gpio)] |= gpio_bit(gpio);
-
-	ubi_port_setup(gpio, 1);
-
-	local_irq_restore(flags);
-
-	return 0;
-}
-
-/*
- * ubi_gpio_free()
- */
-static void ubi_gpio_free(struct gpio_chip *chip, unsigned gpio)
-{
-	unsigned long flags;
-
-	if (check_gpio(gpio) < 0)
-		return;
-
-	local_irq_save(flags);
-
-	if (unlikely(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio)))) {
-		ubi_gpio_error(gpio);
-		local_irq_restore(flags);
-		return;
-	}
-
-	/* Assert the pin is no longer claimed */
-	reserved_gpio_map[gpio_bank(gpio)] &= ~gpio_bit(gpio);
-
-	/* Revert port bit to use specified by port->function */
-	ubi_port_setup(gpio, 0);
-
-	local_irq_restore(flags);
-}
-
-/*
- * ubi_gpio_direction_input()
- */
-static int ubi_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)
-{
-	unsigned long flags;
-
-	if (!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio))) {
-		ubi_gpio_error(gpio);
-		return -EINVAL;
-	}
-
-	local_irq_save(flags);
-
-	/* Configure pin as gpio */
-	ubi_port_setup(gpio, 1);
-
-	/* Assert pin is an input */
-	UBICOM32_GPIO_SET_PIN_INPUT(gpio);
-
-	local_irq_restore(flags);
-
-	return 0;
-}
-
-
-/*
- * ubi_gpio_direction_output()
- */
-static int ubi_gpio_direction_output(struct gpio_chip *chip,
-				     unsigned gpio, int value)
-{
-	unsigned long flags;
-
-	if (!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio))) {
-		ubi_gpio_error(gpio);
-		return -EINVAL;
-	}
-
-	local_irq_save(flags);
-
-	/* Configure pin as gpio and set initial value in gpio_out register
-	 * so that when we enable it as an output, it will have the correct
-	 * initial value.
-	 */
-	ubi_port_setup(gpio, 1);
-	if (value) {
-		UBICOM32_GPIO_SET_PIN_HIGH(gpio);
-	} else {
-		UBICOM32_GPIO_SET_PIN_LOW(gpio);
-	}
-
-	/* Enable the pin as an output */
-	UBICOM32_GPIO_SET_PIN_OUTPUT(gpio);
-
-	local_irq_restore(flags);
-
-	return 0;
-}
-
-
-/*
- * ubi_gpio_get_value()
- */
-static int ubi_gpio_get_value(struct gpio_chip *chip, unsigned gpio)
-{
-	return 0 != (gpio_bank_addr[gpio_bank(gpio)]->gpio_in & gpio_bit(gpio));
-}
-
-
-/*
- * ubi_gpio_set_value()
- */
-static void ubi_gpio_set_value(struct gpio_chip *chip, unsigned gpio,
-			       int arg)
-{
-	unsigned long flags;
-	local_irq_save(flags);
-
-	if (arg) {
-		UBICOM32_GPIO_SET_PIN_HIGH(gpio);
-	} else {
-		UBICOM32_GPIO_SET_PIN_LOW(gpio);
-	}
-
-	local_irq_restore(flags);
-}
-
-
-/*
- * ubi_gpio_to_irq()
- */
-static int ubi_gpio_to_irq(struct gpio_chip *chip, unsigned gpio)
-{
-	return gpio_to_irq(gpio);
-}
-
-
-/*
- * ubi_gpio_init()
- */
-int __init ubi_gpio_init(void)
-{
-	int k;
-	int status;
-	struct ubi_gpio_chip *chip;
-	struct gpio_chip *gc;
-
-	printk(KERN_INFO "Ubicom GPIO Controller\n");
-
-	chip = kzalloc(sizeof(struct ubi_gpio_chip), GFP_KERNEL);
-	if (chip == NULL)
-		return -ENOMEM;
-
-	gc = &chip->gpio_chip;
-	gc->request          = ubi_gpio_request;
-	gc->free             = ubi_gpio_free;
-	gc->to_irq           = ubi_gpio_to_irq;
-	gc->direction_input  = ubi_gpio_direction_input;
-	gc->direction_output = ubi_gpio_direction_output;
-	gc->get              = ubi_gpio_get_value;
-	gc->set              = ubi_gpio_set_value;
-	gc->can_sleep        = 0;
-	gc->base             = 0;
-	gc->ngpio            = MAX_UBICOM_GPIOS; /* ARCH_NR_GPIOS - 1 */
-	gc->label            = "ubi_gpio";
-
-	status = gpiochip_add(gc);
-	if (status != 0) {
-		kfree(chip);
-		return status;
-	}
-
-	/* Assert all pins are free */
-	for (k = 0; k < NUM_GPIO_PORTS; k++) {
-		reserved_gpio_map[k] = 0;
-	}
-
-	return 0;
-}
-
-#if defined(CONFIG_PROC_FS)
-/*
- * ubi_get_gpio_dir()
- */
-static int ubi_get_gpio_dir(unsigned gpio)
-{
-	if (gpio_bank_addr[gpio_bank(gpio)]->gpio_ctl & gpio_bit(gpio))
-		return 1;
-	else
-		return 0;
-}
-
-/*
- * gpio_proc_read()
- */
-static int ubi_gpio_proc_read(char *buf, char **start, off_t offset,
-			  int len, int *unused_i, void *unused_v)
-{
-	int c, outlen = 0;
-
-	for (c = 0; c < MAX_UBICOM_GPIOS; c++) {
-		if (!check_gpio(c) &&
-		    (reserved_gpio_map[gpio_bank(c)] & gpio_bit(c))) {
-			len = sprintf(buf, "GPIO_%d:\t\tGPIO %s\n", c,
-				      ubi_get_gpio_dir(c) ? "OUTPUT" : "INPUT");
-		} else {
-			continue;
-		}
-
-		buf += len;
-		outlen += len;
-	}
-	return outlen;
-}
-
-/*
- * ubi_gpio_register_proc()
- */
-static __init int ubi_gpio_register_proc(void)
-{
-	struct proc_dir_entry *proc_gpio;
-
-	proc_gpio = create_proc_entry("gpio", S_IRUGO, NULL);
-	if (proc_gpio)
-		proc_gpio->read_proc = ubi_gpio_proc_read;
-
-	return proc_gpio != NULL;
-}
-device_initcall(ubi_gpio_register_proc);
-#endif
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-common/ubicom32hid.c b/target/linux/ubicom32/files/arch/ubicom32/mach-common/ubicom32hid.c
deleted file mode 100644
index 3318eff88..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-common/ubicom32hid.c
+++ /dev/null
@@ -1,557 +0,0 @@
-/*
- * arch/ubicom32/mach-common/ubicom32hid.c
- *   I2C driver for HID coprocessor found on some DPF implementations.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/gpio.h>
-#include <linux/delay.h>
-#include <linux/platform_device.h>
-#include <linux/i2c.h>
-#include <linux/backlight.h>
-#include <linux/fb.h>
-#include <linux/input.h>
-#include <linux/input-polldev.h>
-
-#include <asm/ubicom32hid.h>
-
-#define DRIVER_NAME "ubicom32hid"
-
-#ifdef DEBUG
-static int ubicom32hid_debug;
-#endif
-
-static const struct i2c_device_id ubicom32hid_id[] = {
-	{ DRIVER_NAME, },
-	{ }
-};
-MODULE_DEVICE_TABLE(i2c, ubicom32hid_id);
-
-/*
- * Define this to make IR checking strict, in general, it's not needed
- */
-#undef UBICOM32HID_STRICT_IR_CHECK
-
-#define UBICOM32HID_CMD_SET_PWM		0x01
-#define UBICOM32HID_CMD_SET_BL_EN	0x02
-#define UBICOM32HID_BL_EN_LOW		0x00
-#define UBICOM32HID_BL_EN_HIZ		0x01
-#define UBICOM32HID_BL_EN_HI		0x02
-#define UBICOM32HID_CMD_FLUSH		0x99
-#define UBICOM32HID_CMD_RESET		0x99
-#define UBICOM32HID_CMD_GET_IR_SWITCH	0xC0
-#define UBICOM32HID_CMD_GET_REVISION	0xfd
-#define UBICOM32HID_CMD_GET_DEVICE_ID	0xfe
-#define UBICOM32HID_CMD_GET_VERSION	0xff
-#define UBICOM32HID_DEVICE_ID		0x49
-
-#define UBICOM32HID_MAX_BRIGHTNESS_PWM	255
-
-/*
- * Data structure returned by the HID device
- */
-struct ubicom32hid_input_data {
-	uint32_t	ircmd;
-	uint8_t		sw_state;
-	uint8_t		sw_changed;
-};
-
-/*
- * Our private data
- */
-struct ubicom32hid_data {
-	/*
-	 * Pointer to the platform data structure, we need the settings.
-	 */
-	const struct ubicom32hid_platform_data	*pdata;
-
-	/*
-	 * Backlight device
-	 */
-	struct backlight_device			*bldev;
-
-	/*
-	 * I2C client, for sending messages to the HID device
-	 */
-	struct i2c_client			*client;
-
-	/*
-	 * Current intensity, used for get_intensity.
-	 */
-	int					cur_intensity;
-
-	/*
-	 * Input subsystem
-	 *	We won't register an input subsystem if there are no mappings.
-	 */
-	struct input_polled_dev			*poll_dev;
-};
-
-
-/*
- * ubicom32hid_set_intensity
- */
-static int ubicom32hid_set_intensity(struct backlight_device *bd)
-{
-	struct ubicom32hid_data *ud =
-		(struct ubicom32hid_data *)bl_get_data(bd);
-	int intensity = bd->props.brightness;
-	int reg;
-	u8_t val;
-	int ret;
-
-	/*
-	 * If we're blanked the the intensity doesn't matter.
-	 */
-	if ((bd->props.power != FB_BLANK_UNBLANK) ||
-	    (bd->props.fb_blank != FB_BLANK_UNBLANK)) {
-		intensity = 0;
-	}
-
-	/*
-	 * Set the brightness based on the type of backlight
-	 */
-	if (ud->pdata->type == UBICOM32HID_BL_TYPE_BINARY) {
-		reg = UBICOM32HID_CMD_SET_BL_EN;
-		if (intensity) {
-			val = ud->pdata->invert
-				? UBICOM32HID_BL_EN_LOW : UBICOM32HID_BL_EN_HI;
-		} else {
-			val = ud->pdata->invert
-				? UBICOM32HID_BL_EN_HI : UBICOM32HID_BL_EN_LOW;
-		}
-	} else {
-		reg = UBICOM32HID_CMD_SET_PWM;
-		val = ud->pdata->invert
-			? (UBICOM32HID_MAX_BRIGHTNESS_PWM - intensity) :
-			intensity;
-	}
-
-	/*
-	 * Send the command
-	 */
-	ret = i2c_smbus_write_byte_data(ud->client, reg, val);
-	if (ret < 0) {
-		dev_warn(&ud->client->dev, "Unable to write backlight err=%d\n",
-			 ret);
-		return ret;
-	}
-
-	ud->cur_intensity = intensity;
-
-	return 0;
-}
-
-/*
- * ubicom32hid_get_intensity
- *	Return the current intensity of the backlight.
- */
-static int ubicom32hid_get_intensity(struct backlight_device *bd)
-{
-	struct ubicom32hid_data *ud =
-		(struct ubicom32hid_data *)bl_get_data(bd);
-
-	return ud->cur_intensity;
-}
-
-/*
- * ubicom32hid_verify_data
- *	Verify the data to see if there is any action to be taken
- *
- * Returns 0 if no action is to be taken, non-zero otherwise
- */
-static int ubicom32hid_verify_data(struct ubicom32hid_data *ud,
-				   struct ubicom32hid_input_data *data)
-{
-	uint8_t *ircmd = (uint8_t *)&(data->ircmd);
-
-	/*
-	 * ircmd == DEADBEEF means ir queue is empty.  Since this is a
-	 * meaningful code, that means the rest of the message is most likely
-	 * correct, so only process the data if the switch state has changed.
-	 */
-	if (data->ircmd == 0xDEADBEEF) {
-		return data->sw_changed != 0;
-	}
-
-	/*
-	 * We have an ircmd which is not empty:
-	 *      Data[1] should be the complement of Data[0]
-	 */
-	if (ircmd[0] != (u8_t)~ircmd[1]) {
-		return 0;
-	}
-
-#ifdef UBICOM32HID_STRICT_IR_CHECK
-	/*
-	 * It seems that some remote controls don't follow the NEC protocol
-	 * properly, so only do this check if the remote does indeed follow the
-	 * spec.  Data[3] should be the complement of Data[2]
-	 */
-	if (ircmd[2] == (u8_t)~ircmd[3]) {
-		return 1;
-	}
-
-	/*
-	 * For non-compliant remotes, check the system code according to what
-	 * they send.
-	 */
-	if ((ircmd[2] != UBICOM32HID_IR_SYSTEM_CODE_CHECK) ||
-	    (ircmd[3] != UBICOM32HID_IR_SYSTEM_CODE)) {
-		return 0;
-	}
-#endif
-
-	/*
-	 * Data checks out, process
-	 */
-	return 1;
-}
-
-/*
- * ubicom32hid_poll_input
- *	Poll the input from the HID device.
- */
-static void ubicom32hid_poll_input(struct input_polled_dev *dev)
-{
-	struct ubicom32hid_data *ud = (struct ubicom32hid_data *)dev->private;
-	const struct ubicom32hid_platform_data *pdata = ud->pdata;
-	struct ubicom32hid_input_data data;
-	struct input_dev *id = dev->input;
-	int i;
-	int sync_needed = 0;
-	uint8_t cmd;
-	int ret;
-
-	/*
-	 * Flush the queue
-	 */
-	cmd = UBICOM32HID_CMD_FLUSH;
-	ret = i2c_master_send(ud->client, &cmd, 1);
-	if (ret < 0) {
-		return;
-	}
-
-	ret = i2c_smbus_read_i2c_block_data(
-		ud->client, UBICOM32HID_CMD_GET_IR_SWITCH, 6, (void *)&data);
-	if (ret < 0) {
-		return;
-	}
-
-	/*
-	 * Verify the data to see if there is any action to be taken
-	 */
-	if (!ubicom32hid_verify_data(ud, &data)) {
-		return;
-	}
-
-#ifdef DEBUG
-	if (ubicom32hid_debug) {
-		printk("Polled ircmd=%8x swstate=%2x swchanged=%2x\n",
-		       data.ircmd, data.sw_state, data.sw_changed);
-	}
-#endif
-
-	/*
-	 * Process changed switches
-	 */
-	if (data.sw_changed) {
-		const struct ubicom32hid_button *ub = pdata->buttons;
-		for (i = 0; i < pdata->nbuttons; i++, ub++) {
-			uint8_t mask = (1 << ub->bit);
-			if (!(data.sw_changed & mask)) {
-				continue;
-			}
-
-			sync_needed = 1;
-			input_event(id, ub->type, ub->code,
-				    (data.sw_state & mask) ? 1 : 0);
-		}
-	}
-	if (sync_needed) {
-		input_sync(id);
-	}
-
-	/*
-	 * Process ir codes
-	 */
-	if (data.ircmd != 0xDEADBEEF) {
-		const struct ubicom32hid_ir *ui = pdata->ircodes;
-		for (i = 0; i < pdata->nircodes; i++, ui++) {
-			if (ui->ir_code == data.ircmd) {
-				/*
-				 * Simulate a up/down event
-				 */
-				input_event(id, ui->type, ui->code, 1);
-				input_sync(id);
-				input_event(id, ui->type, ui->code, 0);
-				input_sync(id);
-			}
-		}
-	}
-}
-
-
-/*
- * Backlight ops
- */
-static struct backlight_ops ubicom32hid_blops = {
-	.get_brightness = ubicom32hid_get_intensity,
-	.update_status  = ubicom32hid_set_intensity,
-};
-
-/*
- * ubicom32hid_probe
- */
-static int ubicom32hid_probe(struct i2c_client *client,
-			     const struct i2c_device_id *id)
-{
-	struct ubicom32hid_platform_data *pdata;
-	struct ubicom32hid_data *ud;
-	int ret;
-	int i;
-	u8 version[2];
-	char buf[1];
-
-	pdata = client->dev.platform_data;
-	if (pdata == NULL) {
-		return -ENODEV;
-	}
-
-	/*
-	 * See if we even have a device available before allocating memory.
-	 *
-	 * Hard reset the device
-	 */
-	ret = gpio_request(pdata->gpio_reset, "ubicom32hid-reset");
-	if (ret < 0) {
-		return ret;
-	}
-	gpio_direction_output(pdata->gpio_reset, pdata->gpio_reset_polarity);
-	udelay(100);
-	gpio_set_value(pdata->gpio_reset, !pdata->gpio_reset_polarity);
-	udelay(100);
-
-	/*
-	 * soft reset the device.  It sometimes takes a while to do this.
-	 */
-	for (i = 0; i < 50; i++) {
-		buf[0] = UBICOM32HID_CMD_RESET;
-		ret = i2c_master_send(client, buf, 1);
-		if (ret > 0) {
-			break;
-		}
-		udelay(10000);
-	}
-	if (i == 50) {
-		dev_warn(&client->dev, "Unable to reset device\n");
-		goto fail;
-	}
-
-	ret = i2c_smbus_read_byte_data(client, UBICOM32HID_CMD_GET_DEVICE_ID);
-	if (ret != UBICOM32HID_DEVICE_ID) {
-		dev_warn(&client->dev, "Incorrect device id %02x\n", buf[0]);
-		ret = -ENODEV;
-		goto fail;
-	}
-
-	ret = i2c_smbus_read_byte_data(client, UBICOM32HID_CMD_GET_VERSION);
-	if (ret < 0) {
-		dev_warn(&client->dev, "Unable to get version\n");
-		goto fail;
-	}
-	version[0] = ret;
-
-	ret = i2c_smbus_read_byte_data(client, UBICOM32HID_CMD_GET_REVISION);
-	if (ret < 0) {
-		dev_warn(&client->dev, "Unable to get revision\n");
-		goto fail;
-	}
-	version[1] = ret;
-
-	/*
-	 * Allocate our private data
-	 */
-	ud = kzalloc(sizeof(struct ubicom32hid_data), GFP_KERNEL);
-	if (!ud) {
-		ret = -ENOMEM;
-		goto fail;
-	}
-	ud->pdata = pdata;
-	ud->client = client;
-
-	/*
-	 * Register our backlight device
-	 */
-	ud->bldev = backlight_device_register(DRIVER_NAME, &client->dev,
-					      ud, &ubicom32hid_blops);
-	if (IS_ERR(ud->bldev)) {
-		ret = PTR_ERR(ud->bldev);
-		goto fail2;
-	}
-	platform_set_drvdata(client, ud);
-
-	/*
-	 * Start up the backlight with the requested intensity
-	 */
-	ud->bldev->props.power = FB_BLANK_UNBLANK;
-	ud->bldev->props.max_brightness =
-		(pdata->type == UBICOM32HID_BL_TYPE_PWM) ?
-		UBICOM32HID_MAX_BRIGHTNESS_PWM : 1;
-	if (pdata->default_intensity < ud->bldev->props.max_brightness) {
-		ud->bldev->props.brightness = pdata->default_intensity;
-	} else {
-		dev_warn(&client->dev, "Default brightness out of range, "
-			 "setting to max\n");
-		ud->bldev->props.brightness = ud->bldev->props.max_brightness;
-	}
-
-	ubicom32hid_set_intensity(ud->bldev);
-
-	/*
-	 * Check to see if we have any inputs
-	 */
-	if (!pdata->nbuttons && !pdata->nircodes) {
-		goto done;
-	}
-
-	/*
-	 * We have buttons or codes, we must register an input device
-	 */
-	ud->poll_dev = input_allocate_polled_device();
-	if (!ud->poll_dev) {
-		ret = -ENOMEM;
-		goto fail3;
-	}
-
-	/*
-	 * Setup the polling to default to 100ms
-	 */
-	ud->poll_dev->poll = ubicom32hid_poll_input;
-	ud->poll_dev->poll_interval =
-		pdata->poll_interval ? pdata->poll_interval : 100;
-	ud->poll_dev->private = ud;
-
-	ud->poll_dev->input->name =
-		pdata->input_name ? pdata->input_name : "Ubicom32HID";
-	ud->poll_dev->input->phys = "ubicom32hid/input0";
-	ud->poll_dev->input->dev.parent = &client->dev;
-	ud->poll_dev->input->id.bustype = BUS_I2C;
-
-	/*
-	 * Set the capabilities by running through the buttons and ir codes
-	 */
-	for (i = 0; i < pdata->nbuttons; i++) {
-		const struct ubicom32hid_button *ub = &pdata->buttons[i];
-
-		input_set_capability(ud->poll_dev->input,
-				     ub->type ? ub->type : EV_KEY, ub->code);
-	}
-
-	for (i = 0; i < pdata->nircodes; i++) {
-		const struct ubicom32hid_ir *ui = &pdata->ircodes[i];
-
-		input_set_capability(ud->poll_dev->input,
-				     ui->type ? ui->type : EV_KEY, ui->code);
-	}
-
-	ret = input_register_polled_device(ud->poll_dev);
-	if (ret) {
-		goto fail3;
-	}
-
-done:
-	printk(KERN_INFO DRIVER_NAME ": enabled, version=%02x.%02x\n",
-	       version[0], version[1]);
-
-	return 0;
-
-fail3:
-	gpio_free(ud->pdata->gpio_reset);
-	backlight_device_unregister(ud->bldev);
-fail2:
-	kfree(ud);
-fail:
-	gpio_free(pdata->gpio_reset);
-	return ret;
-}
-
-/*
- * ubicom32hid_remove
- */
-static int ubicom32hid_remove(struct i2c_client *client)
-{
-	struct ubicom32hid_data *ud =
-		(struct ubicom32hid_data *)platform_get_drvdata(client);
-
-	gpio_free(ud->pdata->gpio_reset);
-
-	backlight_device_unregister(ud->bldev);
-
-	if (ud->poll_dev) {
-		input_unregister_polled_device(ud->poll_dev);
-		input_free_polled_device(ud->poll_dev);
-	}
-
-	platform_set_drvdata(client, NULL);
-
-	kfree(ud);
-
-	return 0;
-}
-
-static struct i2c_driver ubicom32hid_driver = {
-	.driver = {
-		.name	= DRIVER_NAME,
-		.owner	= THIS_MODULE,
-	},
-	.probe		= ubicom32hid_probe,
-	.remove		= __exit_p(ubicom32hid_remove),
-	.id_table	= ubicom32hid_id,
-};
-
-/*
- * ubicom32hid_init
- */
-static int __init ubicom32hid_init(void)
-{
-	return i2c_add_driver(&ubicom32hid_driver);
-}
-module_init(ubicom32hid_init);
-
-/*
- * ubicom32hid_exit
- */
-static void __exit ubicom32hid_exit(void)
-{
-	i2c_del_driver(&ubicom32hid_driver);
-}
-module_exit(ubicom32hid_exit);
-
-MODULE_AUTHOR("Pat Tjin <@ubicom.com>")
-MODULE_DESCRIPTION("Ubicom HID driver");
-MODULE_LICENSE("GPL");
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-common/ubicom32input.c b/target/linux/ubicom32/files/arch/ubicom32/mach-common/ubicom32input.c
deleted file mode 100644
index e2e0c24d6..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-common/ubicom32input.c
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * arch/ubicom32/mach-common/ubicom32input.c
- *   Ubicom32 Input driver
- *
- *   based on gpio-keys
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- *
- *
- * TODO: add groups for inputs which can be sampled together (i.e. I2C)
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/input.h>
-#include <linux/input-polldev.h>
-#include <linux/delay.h>
-#include <linux/gpio.h>
-
-#include <asm/ubicom32input.h>
-
-struct ubicom32input_data {
-	struct ubicom32input_platform_data	*pdata;
-
-	struct input_polled_dev			*poll_dev;
-
-	/*
-	 * collection of previous states for buttons
-	 */
-	u8					prev_state[0];
-};
-
-/*
- * ubicom32input_poll
- */
-static void ubicom32input_poll(struct input_polled_dev *dev)
-{
-	struct ubicom32input_data *ud =
-		(struct ubicom32input_data *)dev->private;
-	struct ubicom32input_platform_data *pdata = ud->pdata;
-	struct input_dev *id = dev->input;
-	int i;
-	int sync_needed = 0;
-
-	for (i = 0; i < pdata->nbuttons; i++) {
-		const struct ubicom32input_button *ub = &pdata->buttons[i];
-		int state = 0;
-
-		int val = gpio_get_value(ub->gpio);
-
-		/*
-		 * Check to see if the state changed from the last time we
-		 * looked
-		 */
-		if (val == ud->prev_state[i]) {
-			continue;
-		}
-
-		/*
-		 * The state has changed, determine if we are "up" or "down"
-		 */
-		ud->prev_state[i] = val;
-
-		if ((!val && ub->active_low) || (val && !ub->active_low)) {
-			state = 1;
-		}
-
-		input_event(id, ub->type, ub->code, state);
-		sync_needed = 1;
-	}
-
-	if (sync_needed) {
-		input_sync(id);
-	}
-}
-
-/*
- * ubicom32input_probe
- */
-static int __devinit ubicom32input_probe(struct platform_device *pdev)
-{
-	int i;
-	struct ubicom32input_data *ud;
-	struct input_polled_dev *poll_dev;
-	struct input_dev *input_dev;
-	struct ubicom32input_platform_data *pdata;
-	int ret;
-
-	pdata = pdev->dev.platform_data;
-	if (!pdata) {
-		return -EINVAL;
-	}
-
-	ud = kzalloc(sizeof(struct ubicom32input_data) +
-		     pdata->nbuttons, GFP_KERNEL);
-	if (!ud) {
-		return -ENOMEM;
-	}
-	ud->pdata = pdata;
-
-	poll_dev = input_allocate_polled_device();
-	if (!poll_dev) {
-		ret = -ENOMEM;
-		goto fail;
-	}
-
-	platform_set_drvdata(pdev, ud);
-
-	ud->poll_dev = poll_dev;
-	poll_dev->private = ud;
-	poll_dev->poll = ubicom32input_poll;
-
-	/*
-	 * Set the poll interval requested, default to 50 msec
-	 */
-	if (pdata->poll_interval) {
-		poll_dev->poll_interval = pdata->poll_interval;
-	} else {
-		poll_dev->poll_interval = 50;
-	}
-
-	/*
-	 * Setup the input device
-	 */
-	input_dev = poll_dev->input;
-	input_dev->name = pdata->name ? pdata->name : "Ubicom32 Input";
-	input_dev->phys = "ubicom32input/input0";
-	input_dev->dev.parent = &pdev->dev;
-	input_dev->id.bustype = BUS_HOST;
-
-	/*
-	 * Reserve the GPIOs
-	 */
-	for (i = 0; i < pdata->nbuttons; i++) {
-		const struct ubicom32input_button *ub = &pdata->buttons[i];
-
-		ret = gpio_request(ub->gpio,
-				   ub->desc ? ub->desc : "ubicom32input");
-		if (ret < 0) {
-			pr_err("ubicom32input: failed to request "
-			       "GPIO %d ret=%d\n", ub->gpio, ret);
-			goto fail2;
-		}
-
-		ret = gpio_direction_input(ub->gpio);
-		if (ret < 0) {
-			pr_err("ubicom32input: failed to set "
-			       "GPIO %d to input ret=%d\n", ub->gpio, ret);
-			goto fail2;
-		}
-
-		/*
-		 * Set the previous state to the non-active stae
-		 */
-		ud->prev_state[i] = ub->active_low;
-
-		input_set_capability(input_dev,
-				     ub->type ? ub->type : EV_KEY, ub->code);
-	}
-
-	/*
-	 * Register
-	 */
-	ret = input_register_polled_device(ud->poll_dev);
-	if (ret) {
-		goto fail2;
-	}
-
-	return 0;
-
-fail2:
-	/*
-	 * release the GPIOs we have already requested.
-	 */
-	while (--i >= 0) {
-		gpio_free(pdata->buttons[i].gpio);
-	}
-
-fail:
-	printk(KERN_ERR "Ubicom32Input: Failed to register driver %d", ret);
-	platform_set_drvdata(pdev, NULL);
-	input_free_polled_device(poll_dev);
-	kfree(ud);
-	return ret;
-}
-
-/*
- * ubicom32input_remove
- */
-static int __devexit ubicom32input_remove(struct platform_device *dev)
-{
-	struct ubicom32input_data *ud =
-		(struct ubicom32input_data *)platform_get_drvdata(dev);
-	int i;
-
-	/*
-	 * Free the GPIOs
-	 */
-	for (i = 0; i < ud->pdata->nbuttons; i++) {
-		gpio_free(ud->pdata->buttons[i].gpio);
-	}
-
-	platform_set_drvdata(dev, NULL);
-	input_unregister_polled_device(ud->poll_dev);
-	input_free_polled_device(ud->poll_dev);
-
-	kfree(ud);
-
-	return 0;
-}
-
-static struct platform_driver ubicom32input_driver = {
-	.driver         = {
-		.name   = "ubicom32input",
-		.owner  = THIS_MODULE,
-	},
-	.probe          = ubicom32input_probe,
-	.remove         = __devexit_p(ubicom32input_remove),
-};
-
-/*
- * ubicom32input_init
- */
-static int __devinit ubicom32input_init(void)
-{
-	return platform_driver_register(&ubicom32input_driver);
-}
-
-/*
- * ubicom32input_exit
- */
-static void __exit ubicom32input_exit(void)
-{
-	platform_driver_unregister(&ubicom32input_driver);
-}
-
-module_init(ubicom32input_init);
-module_exit(ubicom32input_exit);
-
-MODULE_AUTHOR("Pat Tjin <pattjin@ubicom.com>");
-MODULE_DESCRIPTION("Ubicom32 Input Driver");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:ubicom32-input");
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-common/ubicom32input_i2c.c b/target/linux/ubicom32/files/arch/ubicom32/mach-common/ubicom32input_i2c.c
deleted file mode 100644
index b81f1919c..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-common/ubicom32input_i2c.c
+++ /dev/null
@@ -1,325 +0,0 @@
-/*
- * arch/ubicom32/mach-common/ubicom32input_i2c.c
- *   Ubicom32 Input driver for I2C
- *	  Supports PCA953x and family
- *
- *   We hog the I2C device, turning it all to input.
- *
- *   Based on gpio-keys, pca953x
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/input.h>
-#include <linux/input-polldev.h>
-#include <linux/i2c.h>
-
-#include <asm/ubicom32input_i2c.h>
-
-#define UBICOM32INPUT_I2C_REG_INPUT	0
-#define UBICOM32INPUT_I2C_REG_OUTPUT	1
-#define UBICOM32INPUT_I2C_REG_INVERT	2
-#define UBICOM32INPUT_I2C_REG_DIRECTION	3
-
-static const struct i2c_device_id ubicom32input_i2c_id[] = {
-	{ "ubicom32in_pca9534", 8, },
-	{ "ubicom32in_pca9535", 16, },
-	{ "ubicom32in_pca9536", 4, },
-	{ "ubicom32in_pca9537", 4, },
-	{ "ubicom32in_pca9538", 8, },
-	{ "ubicom32in_pca9539", 16, },
-	{ "ubicom32in_pca9554", 8, },
-	{ "ubicom32in_pca9555", 16, },
-	{ "ubicom32in_pca9557", 8, },
-	{ "ubicom32in_max7310", 8, },
-	{ }
-};
-MODULE_DEVICE_TABLE(i2c, ubicom32input_i2c_id);
-
-struct ubicom32input_i2c_data {
-	struct ubicom32input_i2c_platform_data	*pdata;
-
-	struct i2c_client			*client;
-
-	struct input_polled_dev			*poll_dev;
-
-	/*
-	 * collection of previous states for buttons
-	 */
-	uint16_t				prev_state;
-
-	uint8_t					ngpios;
-};
-
-/*
- * ubicom32input_i2c_write_reg
- *	writes a register to the I2C device.
- */
-static int ubicom32input_i2c_write_reg(struct ubicom32input_i2c_data *ud,
-				       int reg, uint16_t val)
-{
-	int ret;
-
-	if (ud->ngpios <= 8) {
-		ret = i2c_smbus_write_byte_data(ud->client, reg, val);
-	} else {
-		ret = i2c_smbus_write_word_data(ud->client, reg << 1, val);
-	}
-
-	if (ret < 0) {
-		return ret;
-	}
-
-	return 0;
-}
-
-/*
- * ubicom32input_i2c_read_reg
- *	reads a register from the I2C device.
- */
-static int ubicom32input_i2c_read_reg(struct ubicom32input_i2c_data *ud,
-				      int reg, uint16_t *val)
-{
-	int ret;
-
-	if (ud->ngpios <= 8) {
-		ret = i2c_smbus_read_byte_data(ud->client, reg);
-	} else {
-		ret = i2c_smbus_read_word_data(ud->client, reg);
-	}
-
-	if (ret < 0) {
-		return ret;
-	}
-
-	*val = (uint16_t)ret;
-
-	return 0;
-}
-
-/*
- * ubicom32input_i2c_poll
- */
-static void ubicom32input_i2c_poll(struct input_polled_dev *dev)
-{
-	struct ubicom32input_i2c_data *ud =
-		(struct ubicom32input_i2c_data *)dev->private;
-	struct ubicom32input_i2c_platform_data *pdata = ud->pdata;
-	struct input_dev *id = dev->input;
-	int i;
-	int sync_needed = 0;
-	uint16_t val;
-	uint16_t change_mask;
-
-	/*
-	 * Try to get the input status, if we fail, bail out, maybe we can do it
-	 * next time.
-	 */
-	if (ubicom32input_i2c_read_reg(ud, UBICOM32INPUT_I2C_REG_INPUT, &val)) {
-		return;
-	}
-
-	/*
-	 * see if anything changed by using XOR
-	 */
-	change_mask = ud->prev_state ^ val;
-	ud->prev_state = val;
-
-	for (i = 0; i < pdata->nbuttons; i++) {
-		const struct ubicom32input_i2c_button *ub = &pdata->buttons[i];
-		uint16_t mask = 1 << ub->bit;
-		int state = val & mask;
-
-		/*
-		 * Check to see if the state changed from the last time we
-		 * looked
-		 */
-		if (!(change_mask & mask)) {
-			continue;
-		}
-		input_event(id, ub->type, ub->code, state);
-		sync_needed = 1;
-	}
-
-	if (sync_needed) {
-		input_sync(id);
-	}
-}
-
-/*
- * ubicom32input_i2c_probe
- */
-static int __devinit ubicom32input_i2c_probe(struct i2c_client *client,
-					     const struct i2c_device_id *id)
-{
-	int i;
-	struct ubicom32input_i2c_data *ud;
-	struct input_polled_dev *poll_dev;
-	struct input_dev *input_dev;
-	struct ubicom32input_i2c_platform_data *pdata;
-	int ret;
-	uint16_t invert_mask = 0;
-
-	pdata = client->dev.platform_data;
-	if (!pdata) {
-		return -EINVAL;
-	}
-
-	ud = kzalloc(sizeof(struct ubicom32input_i2c_data), GFP_KERNEL);
-	if (!ud) {
-		return -ENOMEM;
-	}
-	ud->pdata = pdata;
-	ud->client = client;
-	ud->ngpios = id->driver_data;
-
-	poll_dev = input_allocate_polled_device();
-	if (!poll_dev) {
-		ret = -ENOMEM;
-		goto fail;
-	}
-
-	ud->poll_dev = poll_dev;
-	poll_dev->private = ud;
-	poll_dev->poll = ubicom32input_i2c_poll;
-
-	/*
-	 * Set the poll interval requested, default to 100 msec
-	 */
-	if (pdata->poll_interval) {
-		poll_dev->poll_interval = pdata->poll_interval;
-	} else {
-		poll_dev->poll_interval = 100;
-	}
-
-	/*
-	 * Setup the input device
-	 */
-	input_dev = poll_dev->input;
-	input_dev->name = pdata->name ? pdata->name : "Ubicom32 Input I2C";
-	input_dev->phys = "ubicom32input_i2c/input0";
-	input_dev->dev.parent = &client->dev;
-	input_dev->id.bustype = BUS_I2C;
-
-	/*
-	 * Set the capabilities
-	 */
-	for (i = 0; i < pdata->nbuttons; i++) {
-		const struct ubicom32input_i2c_button *ub = &pdata->buttons[i];
-
-		if (ub->active_low) {
-			invert_mask |= (1 << ub->bit);
-		}
-
-		input_set_capability(input_dev,
-				     ub->type ? ub->type : EV_KEY, ub->code);
-	}
-
-	/*
-	 * Setup the device (all inputs)
-	 */
-	ret = ubicom32input_i2c_write_reg(ud, UBICOM32INPUT_I2C_REG_DIRECTION,
-					  0xFFFF);
-	if (ret < 0) {
-		goto fail;
-	}
-
-	ret = ubicom32input_i2c_write_reg(ud, UBICOM32INPUT_I2C_REG_INVERT,
-					  invert_mask);
-	if (ret < 0) {
-		goto fail;
-	}
-
-	/*
-	 * Register
-	 */
-	ret = input_register_polled_device(ud->poll_dev);
-	if (ret) {
-		goto fail;
-	}
-
-	i2c_set_clientdata(client, ud);
-
-	return 0;
-
-fail:
-	printk(KERN_ERR "ubicom32input_i2c: Failed to register driver %d\n",
-	       ret);
-	input_free_polled_device(poll_dev);
-	kfree(ud);
-	return ret;
-}
-
-/*
- * ubicom32input_i2c_remove
- */
-static int __devexit ubicom32input_i2c_remove(struct i2c_client *client)
-{
-	struct ubicom32input_i2c_data *ud =
-		(struct ubicom32input_i2c_data *)i2c_get_clientdata(client);
-
-	i2c_set_clientdata(client, NULL);
-	input_unregister_polled_device(ud->poll_dev);
-	input_free_polled_device(ud->poll_dev);
-
-	kfree(ud);
-
-	return 0;
-}
-
-static struct i2c_driver ubicom32input_i2c_driver = {
-	.driver         = {
-		.name   = "ubicom32input_i2c",
-		.owner  = THIS_MODULE,
-	},
-	.remove         = __devexit_p(ubicom32input_i2c_remove),
-	.id_table	= ubicom32input_i2c_id,
-	.probe          = ubicom32input_i2c_probe,
-};
-
-/*
- * ubicom32input_i2c_init
- */
-static int __devinit ubicom32input_i2c_init(void)
-{
-	return i2c_add_driver(&ubicom32input_i2c_driver);
-}
-
-/*
- * ubicom32input_i2c_exit
- */
-static void __exit ubicom32input_i2c_exit(void)
-{
-	i2c_del_driver(&ubicom32input_i2c_driver);
-}
-
-module_init(ubicom32input_i2c_init);
-module_exit(ubicom32input_i2c_exit);
-
-MODULE_AUTHOR("Pat Tjin <pattjin@ubicom.com>");
-MODULE_DESCRIPTION("Ubicom32 Input Driver I2C");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:ubicom32-input");
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-common/usb.c b/target/linux/ubicom32/files/arch/ubicom32/mach-common/usb.c
deleted file mode 100644
index e13f64054..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-common/usb.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * arch/ubicom32/mach-common/ip5k_usb.c
- *   Ubicom32 architecture usb support.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- * Copyright (C) 2007 MontaVista Software, Inc. <source@mvista.com>
- * Author: Kevin Hilman
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <linux/delay.h>
-#include <linux/platform_device.h>
-#include <linux/dma-mapping.h>
-#include <linux/usb/musb.h>
-#include <asm/devtree.h>
-#include <asm/ip5000.h>
-#include "usb_tio.h"
-
-struct usbtionode *unode = NULL;
-
-static struct resource usb_resources[] = {
-	[0] = {
-		.start	= RJ + 0x800,
-		.end	= RJ + 0x1000,
-		.flags	= IORESOURCE_MEM,
-	},
-	[1] = {	/* general IRQ */
-		.start	= 1, /* this is a dummy value, the real irq number is passed from kernel_setup_param */
-		.flags	= IORESOURCE_IRQ,
-	},
-};
-
-
-static struct musb_hdrc_eps_bits musb_eps[] = {
-	{ "ep1_tx", 4, },
-	{ "ep1_rx", 4, },
-	{ "ep2_tx", 10, },
-	{ "ep2_rx", 10, },
-	{ "ep3_tx", 9, },
-	{ "ep3_rx", 9, },
-	{ "ep4_tx", 9, },
-	{ "ep4_rx", 9, },
-	{ "ep5_tx", 6, },
-	{ "ep5_rx", 6, },
-};
-
-static struct musb_hdrc_config musb_config = {
-	.multipoint     = true,
-	.dyn_fifo       = false,
-	.soft_con       = true,
-	.dma            = false,
-
-	.num_eps        = 6,
-	.dma_channels   = 0,
-	.ram_bits       = 0,
-	.eps_bits       = musb_eps,
-};
-
-static struct musb_hdrc_platform_data usb_data = {
-#ifdef CONFIG_USB_MUSB_OTG
-	.mode		= MUSB_OTG,
-#else
-#ifdef CONFIG_USB_MUSB_HDRC_HCD
-	.mode		= MUSB_HOST,
-#else
-#ifdef CONFIG_USB_GADGET_MUSB_HDRC
-	.mode		= MUSB_PERIPHERAL,
-#endif
-#endif
-#endif
-	.clock		= NULL,
-	.set_clock	= NULL,
-	.config		= &musb_config,
-};
-
-static struct platform_device musb_device = {
-	.name		= "musb_hdrc",
-	.id		= 0,
-	.dev = {
-		.platform_data		= &usb_data,
-		.dma_mask		= NULL,
-		.coherent_dma_mask	= 0,
-	},
-	.resource	= usb_resources,
-	.num_resources	= ARRAY_SIZE(usb_resources),
-};
-
-struct usbtio_node *usb_node = NULL;
-void ubi32_usb_init(void)
-{
-	/*
-	 * See if the usbtio is in the device tree.
-	 */
-	usb_node = (struct usbtio_node *)devtree_find_node("usbtio");
-	if (!usb_node) {
-		printk(KERN_WARNING "usb init failed\n");
-		return;
-	}
-
-	usb_resources[1].start = usb_node->dn.recvirq;
-	if (platform_device_register(&musb_device) < 0) {
-		printk(KERN_ERR "Unable to register HS-USB (MUSB) device\n");
-		return;
-	}
-}
-
-void ubi32_usb_int_clr(void)
-{
-        UBICOM32_IO_PORT(RJ)->int_clr = (1 << 3);
-}
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-common/usb_tio.c b/target/linux/ubicom32/files/arch/ubicom32/mach-common/usb_tio.c
deleted file mode 100644
index 95ace6db7..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-common/usb_tio.c
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
- * arch/ubicom32/mach-common/usb_tio.c
- *  Linux side Ubicom USB TIO driver
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <linux/module.h>
-#include <linux/spinlock.h>
-#include <linux/slab.h>
-#include <asm/devtree.h>
-#include "usb_tio.h"
-
-#ifdef CONFIG_SMP
-static DEFINE_SPINLOCK(tio_lock);
-#define USB_TIO_LOCK(lock, flag) spin_lock_irqsave(lock, flag)
-#define USB_TIO_UNLOCK(lock, flag) spin_unlock_irqrestore(lock, flag)
-#define USB_TIO_LOCK_ISLOCKED(lock) spin_try_lock(lock)
-#else
-#define USB_TIO_LOCK(lock, flag) local_irq_save(flag)
-#define USB_TIO_UNLOCK(lock, flag) local_irq_restore(flag)
-#endif
-
-spinlock_t usb_tio_lock;
-
-/*
- * usb_tio_set_hrt_interrupt()
- */
-static inline void usb_tio_set_hrt_interrupt(void)
-{
-	ubicom32_set_interrupt(usb_node->dn.sendirq);
-}
-
-static inline void usb_tio_wait_hrt(void)
-{
-	while (unlikely(usb_node->pdesc));
-}
-
-#if defined(USB_TIO_DEBUG)
-static void usb_tio_request_verify_magic(volatile struct usb_tio_request *req)
-{
-	BUG_ON(req->magic != USB_TIO_REQUEST_MAGIC2);
-}
-
-static void usb_tio_request_clear_magic(volatile struct usb_tio_request *req)
-{
-	req->magic = 0;
-}
-#endif
-
-static void usb_tio_request_set_magic(volatile struct usb_tio_request *req)
-{
-	req->magic = USB_TIO_REQUEST_MAGIC1;
-}
-
-/*
- * usb_tio_commit_request()
- */
-static inline void usb_tio_commit_request(volatile struct usb_tio_request *request)
-{
-	wmb();
-	usb_node->pdesc = request;
-
-	/*
-	 * next thing to do is alway checking if (usb_node->pdesc == NULL)
-	 * to see if the request is done, so add a mb() here
-	 */
-	mb();
-	usb_tio_set_hrt_interrupt();
-}
-
-/*
- * usb_tio_read_u16()
- *	Synchronously read 16 bits.
- */
-u8_t usb_tio_read_u16(u32_t address, u16_t *data)
-{
-	volatile struct usb_tio_request *tio_req = &usb_node->request;
-	unsigned long flag;
-
-	/*
-	 * Wait for any previous request to complete and then make this request.
-	 */
-	USB_TIO_LOCK(&tio_lock, flag);
-	usb_tio_wait_hrt();
-
-	/*
-	 * Fill in the request.
-	 */
-	tio_req->address = address;
-	tio_req->cmd = USB_TIO_READ16_SYNC;
-	USB_TIO_REQUEST_SET_MAGIC(tio_req);
-	usb_tio_commit_request(tio_req);
-
-	/*
-	 * Wait for the result to show up.
-	 */
-	usb_tio_wait_hrt();
-	USB_TIO_REQUEST_VERIFY_MAGIC(tio_req);
-	*data = (u16_t)tio_req->data;
-	USB_TIO_REQUEST_CLEAR_MAGIC(tio_req);
-	USB_TIO_UNLOCK(&tio_lock, flag);
-	return USB_TIO_OK;
-}
-
-/*
- * usb_tio_read_u8()
- *	Synchronously read 16 bits.
- */
-u8_t usb_tio_read_u8(u32_t address, u8_t *data)
-{
-	volatile struct usb_tio_request *tio_req = &usb_node->request;
-	unsigned long flag;
-
-	/*
-	 * Wait for any previous request to complete and then make this request.
-	 */
-	USB_TIO_LOCK(&tio_lock, flag);
-	usb_tio_wait_hrt();
-
-	/*
-	 * Fill in the request.
-	 */
-	tio_req->address = address;
-	tio_req->cmd = USB_TIO_READ8_SYNC;
-	USB_TIO_REQUEST_SET_MAGIC(tio_req);
-
-	/*
-	 * commit the request
-	 */
-	usb_tio_commit_request(tio_req);
-
-	/*
-	 * Wait for the result to show up.
-	 */
-	usb_tio_wait_hrt();
-	USB_TIO_REQUEST_VERIFY_MAGIC(tio_req);
-	*data = (u8_t)tio_req->data;
-	USB_TIO_REQUEST_CLEAR_MAGIC(tio_req);
-	USB_TIO_UNLOCK(&tio_lock, flag);
-	return USB_TIO_OK;
-}
-
-/*
- * usb_tio_write_u16()
- *	Asynchronously  write 16 bits.
- */
-u8_t usb_tio_write_u16(u32_t address, u16_t data)
-{
-	volatile struct usb_tio_request *tio_req = &usb_node->request;
-	unsigned long flag;
-
-	/*
-	 * Wait for any previous write or pending read to complete.
-	 */
-	USB_TIO_LOCK(&tio_lock, flag);
-	usb_tio_wait_hrt();
-
-	tio_req->address = address;
-	tio_req->data = data;
-	tio_req->cmd = USB_TIO_WRITE16_ASYNC;
-	USB_TIO_REQUEST_SET_MAGIC(tio_req);
-
-	/*
-	 * commit the request
-	 */
-	usb_tio_commit_request(tio_req);
-	USB_TIO_UNLOCK(&tio_lock, flag);
-	return USB_TIO_OK;
-}
-
-/*
- * usb_tio_write_u8()
- *	Asynchronously  write 8 bits.
- */
-u8_t usb_tio_write_u8(u32_t address, u8_t data)
-{
-	volatile struct usb_tio_request *tio_req = &usb_node->request;
-	unsigned long flag;
-
-	/*
-	 * Wait for any previous write or pending read to complete.
-	 */
-	USB_TIO_LOCK(&tio_lock, flag);
-	usb_tio_wait_hrt();
-
-	tio_req->address = address;
-	tio_req->data = data;
-	tio_req->cmd = USB_TIO_WRITE8_ASYNC;
-	USB_TIO_REQUEST_SET_MAGIC(tio_req);
-
-	/*
-	 * commit the request
-	 */
-	usb_tio_commit_request(tio_req);
-	USB_TIO_UNLOCK(&tio_lock, flag);
-	return USB_TIO_OK;
-}
-
-/*
- * usb_tio_read_fifo()
- *	Synchronously read FIFO.
- */
-u8_t usb_tio_read_fifo(u32_t address, u32_t buffer, u32_t bytes)
-{
-	volatile struct usb_tio_request *tio_req = &usb_node->request;
-	unsigned long flag;
-
-	/*
-	 * Wait for any previous request to complete and then make this request.
-	 */
-	USB_TIO_LOCK(&tio_lock, flag);
-	usb_tio_wait_hrt();
-
-	/*
-	 * Fill in the request.
-	 */
-	tio_req->address = address;
-	tio_req->cmd = USB_TIO_READ_FIFO_SYNC;
-	tio_req->buffer = buffer;
-	tio_req->transfer_length = bytes;
-	USB_TIO_REQUEST_SET_MAGIC(tio_req);
-
-	/*
-	 * commit the request
-	 */
-	usb_tio_commit_request(tio_req);
-
-	 /*
-	 * Wait for the result to show up.
-	 */
-	usb_tio_wait_hrt();
-	USB_TIO_REQUEST_VERIFY_MAGIC(tio_req);
-	USB_TIO_REQUEST_CLEAR_MAGIC(tio_req);
-	USB_TIO_UNLOCK(&tio_lock, flag);
-	return USB_TIO_OK;
-}
-
-/*
- * usb_tio_write_fifo()
- *	Synchronously  write 32 bits.
- */
-u8_t usb_tio_write_fifo(u32_t address, u32_t buffer, u32_t bytes)
-{
-	volatile struct	usb_tio_request *tio_req = &usb_node->request;
-	unsigned long flag;
-
-	USB_TIO_LOCK(&tio_lock, flag);
-	usb_tio_wait_hrt();
-
-	tio_req->address = address;
-	tio_req->buffer = buffer;
-	tio_req->cmd = USB_TIO_WRITE_FIFO_SYNC;
-	tio_req->transfer_length = bytes;
-	USB_TIO_REQUEST_SET_MAGIC(tio_req);
-	/*
-	 * commit the request
-	 */
-	usb_tio_commit_request(tio_req);
-
-	/*
-	 * Wait for the result to show up.
-	 */
-	usb_tio_wait_hrt();
-	USB_TIO_REQUEST_VERIFY_MAGIC(tio_req);
-	USB_TIO_REQUEST_CLEAR_MAGIC(tio_req);
-	USB_TIO_UNLOCK(&tio_lock, flag);
-	return USB_TIO_OK;
-}
-
-/*
- * usb_tio_write_fifo_async()
- *	Asynchronously write 32 bits.
- */
-u8_t usb_tio_write_fifo_async(u32_t address, u32_t buffer, u32_t bytes)
-{
-	volatile struct	usb_tio_request *tio_req = &usb_node->request;
-	unsigned long flag;
-
-	USB_TIO_LOCK(&tio_lock, flag);
-	usb_tio_wait_hrt();
-
-	tio_req->address = address;
-
-	/*
-	 * Is it necessary to make a local copy of the buffer? Any chance the URB is aborted before TIO finished the FIFO write?
-	 */
-	tio_req->buffer = buffer;
-	tio_req->cmd = USB_TIO_WRITE_FIFO_SYNC;
-	tio_req->transfer_length = bytes;
-	USB_TIO_REQUEST_SET_MAGIC(tio_req);
-	/*
-	 * commit the request
-	 */
-	usb_tio_commit_request(tio_req);
-	USB_TIO_UNLOCK(&tio_lock, flag);
-	return USB_TIO_OK;
-}
-
-/*
- * usb_tio_read_int_status()
- * 	read and clear the interrupt status registers
- */
-void usb_tio_read_int_status(u8_t *int_usb, u16_t *int_tx, u16_t *int_rx)
-{
-
-	/*
-	 * clear the interrupt must be syncronized with the TIO thread to prevent the racing condiiton
-	 * that TIO thread try to set it at same time
-	 */
-	asm volatile (
-	"1:	bset (%0), (%0), #0	\n\t" \
-	"	jmpne.f 1b		\n\t" \
-		:
-		: "a" (&usb_node->usb_vp_control)
-		: "memory", "cc"
-	);
-
-	*int_usb = usb_node->usb_vp_hw_int_usb;
-	*int_tx  = cpu_to_le16(usb_node->usb_vp_hw_int_tx);
-	*int_rx  = cpu_to_le16(usb_node->usb_vp_hw_int_rx);
-
-	//printk(KERN_INFO "int read %x, %x, %x\n", *int_usb, *int_tx, *int_rx);
-
-	/*
-	 * The interrupt status register is read-clean, so clear it now
-	 */
-	usb_node->usb_vp_hw_int_usb = 0;
-	usb_node->usb_vp_hw_int_tx = 0;
-	usb_node->usb_vp_hw_int_rx = 0;
-
-	/*
-	 * release the lock bit
-	 */
-	usb_node->usb_vp_control &= 0xfffe;
-}
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-common/usb_tio.h b/target/linux/ubicom32/files/arch/ubicom32/mach-common/usb_tio.h
deleted file mode 100644
index a88ea18d5..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-common/usb_tio.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * arch/ubicom32/mach-common/usb_tio.h
- *   Definitions for usb_tio.c
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#include <linux/version.h>
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <linux/err.h>
-#include <asm/devtree.h>
-#include <asm/ip5000.h>
-
-#ifndef _USB_TIO_H
-#define _USB_TIO_H
-
-#undef  USB_TIO_DEBUG
-
-#define USB_TIO_REQUEST_MAGIC1	0x2307
-#define USB_TIO_REQUEST_MAGIC2	0x0789
-#if defined(USB_TIO_DEBUG)
-#define USB_TIO_REQUEST_VERIFY_MAGIC(req)	usb_tio_request_verify_magic(req)
-#define USB_TIO_REQUEST_SET_MAGIC(req)          usb_tio_request_set_magic(req)
-#define USB_TIO_REQUEST_CLEAR_MAGIC(req)	usb_tio_request_clear_magic(req)
-#else
-#define USB_TIO_REQUEST_VERIFY_MAGIC(req)
-#define USB_TIO_REQUEST_SET_MAGIC(req)          usb_tio_request_set_magic(req)
-#define USB_TIO_REQUEST_CLEAR_MAGIC(req)
-#endif
-
-enum USB_TIO_status {
-	USB_TIO_OK,
-	USB_TIO_ERROR,
-	USB_TIO_ERROR_COMMIT,
-};
-
-enum USB_TIO_cmds {
-	USB_TIO_READ16_SYNC,
-	USB_TIO_READ8_SYNC,
-	USB_TIO_READ_FIFO_SYNC,
-
-	USB_TIO_WRITE16_ASYNC,
-	USB_TIO_WRITE8_ASYNC,
-	USB_TIO_WRITE_FIFO_ASYNC,
-
-	USB_TIO_WRITE16_SYNC,
-	USB_TIO_WRITE8_SYNC,
-	USB_TIO_WRITE_FIFO_SYNC,
-
-};
-
-enum USB_TIO_state {
-	USB_TIO_NORMAL,
-	USB_TIO_DMA_SETUP,
-};
-
-struct usb_tio_request {
-	volatile u32_t address;
-	union {
-		volatile u32_t data;
-		volatile u32_t buffer;
-	};
-	volatile u16_t cmd;
-	const volatile u16_t status;
-	volatile u32_t transfer_length;
-	volatile u32_t thread_mask;
-	volatile u16_t magic;
-};
-
-struct usbtio_node {
-	struct devtree_node dn;
-	volatile struct usb_tio_request * volatile pdesc;
-	struct usb_tio_request	request;
-	volatile u32_t usb_vp_config;
-	volatile u32_t usb_vp_control;
-	const volatile u32_t usb_vp_status;
-	volatile u16_t usb_vp_hw_int_tx;
-	volatile u16_t usb_vp_hw_int_rx;
-	volatile u8_t  usb_vp_hw_int_usb;
-	volatile u8_t usb_vp_hw_int_mask_usb;
-        volatile u16_t usb_vp_hw_int_mask_tx;
-        volatile u16_t usb_vp_hw_int_mask_rx;
-
-};
-
-extern struct usbtio_node *usb_node;
-extern void ubi32_usb_init(void);
-#endif
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-common/vdc_tio.c b/target/linux/ubicom32/files/arch/ubicom32/mach-common/vdc_tio.c
deleted file mode 100644
index cde0cb20f..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-common/vdc_tio.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * arch/ubicom32/mach-common/vdc_tio.c
- *   Generic initialization for VDC
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#include <linux/platform_device.h>
-#include <linux/types.h>
-
-#include <asm/devtree.h>
-#include <asm/vdc_tio.h>
-
-/*
- * Resources that this driver uses
- */
-static struct resource vdc_tio_resources[] = {
-	/*
-	 * Send IRQ
-	 */
-	[0] = {
-		/*
-		 * The init routine will query the devtree and fill this in
-		 */
-		.flags	= IORESOURCE_IRQ,
-	},
-
-	/*
-	 * Receive IRQ (optional)
-	 */
-	[1] = {
-		/*
-		 * The init routine will query the devtree and fill this in
-		 */
-		.flags	= IORESOURCE_IRQ,
-	},
-
-	/*
-	 * Memory Mapped Registers
-	 */
-	[2] = {
-		/*
-		 * The init routine will query the devtree and fill this in
-		 */
-		.flags	= IORESOURCE_MEM,
-	},
-};
-
-/*
- * The platform_device structure which is passed to the driver
- */
-static struct platform_device vdc_tio_platform_device = {
-	.name		= "ubicom32fb",
-	.id		= -1,
-	.resource	= vdc_tio_resources,
-	.num_resources	= ARRAY_SIZE(vdc_tio_resources),
-};
-
-/*
- * vdc_tio_init
- *	Checks the device tree and instantiates the driver if found
- */
-void __init vdc_tio_init(void)
-{
-	/*
-	 * Check the device tree for the vdc_tio
-	 */
-	struct vdc_tio_node *vdc_node =
-		(struct vdc_tio_node *)devtree_find_node("vdctio");
-	if (!vdc_node) {
-		printk(KERN_WARNING "No vdc_tio found\n");
-		return;
-	}
-
-	/*
-	 * Fill in the resources and platform data from devtree information
-	 */
-	vdc_tio_resources[0].start = vdc_node->dn.sendirq;
-	vdc_tio_resources[1].start = vdc_node->dn.recvirq;
-	vdc_tio_resources[2].start = (u32_t)vdc_node->regs;
-	vdc_tio_resources[2].end = (u32_t)vdc_node->regs +
-		sizeof(struct vdc_tio_vp_regs);
-
-	/*
-	 * Try to get the device registered
-	 */
-	if (platform_device_register(&vdc_tio_platform_device) < 0) {
-		printk(KERN_WARNING "VDC failed to register\n");
-	}
-}
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-ip5k/Kconfig b/target/linux/ubicom32/files/arch/ubicom32/mach-ip5k/Kconfig
deleted file mode 100644
index b53d23965..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-ip5k/Kconfig
+++ /dev/null
@@ -1,28 +0,0 @@
-
-config IP5170DPF
-	bool "IP5170DPF"
-	select UBICOM32_V3
-	select I2C
-	select I2C_GPIO
-	select FB
-	select FB_UBICOM32
-	select BACKLIGHT_LCD_SUPPORT
-	select BACKLIGHT_CLASS_DEVICE
-	select UBICOM_HID
-	select NEW_LEDS
-	select LEDS_CLASS
-	select LEDS_GPIO
-	help
-		IP5170 Digital Picture Frame board, 8005-1113, IP5K-BEV-0011-13 v1.3
-
-config IP5160DEV
-	bool "IP5160Dev_Ver1Dot1"
-	select UBICOM32_V3
-	help
-		Ubicom StreamEngine 5000 Development Board, IP5K-BDV-0004-11 v1.1
-
-config IP5160EVAL
-	bool "IP5160RGWEval_Ver2Rev2"
-	select UBICOM32_V3
-	help
-		Ubicom StreamEngine 5000 RGW Evaluation Board, IP5K-RGW-0004-11 v2.2
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-ip5k/Makefile b/target/linux/ubicom32/files/arch/ubicom32/mach-ip5k/Makefile
deleted file mode 100644
index d02f339bd..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-ip5k/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# arch/ubicom32/mach-ip5k/Makefile
-#	Makefile for boards which have an ip5k on them.
-#
-# (C) Copyright 2009, Ubicom, Inc.
-#
-# This file is part of the Ubicom32 Linux Kernel Port.
-#
-# The Ubicom32 Linux Kernel Port 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.
-#
-# The Ubicom32 Linux Kernel Port is distributed in the hope that it
-# will be useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
-# the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with the Ubicom32 Linux Kernel Port.  If not,
-# see <http://www.gnu.org/licenses/>.
-#
-# Ubicom32 implementation derived from (with many thanks):
-#   arch/m68knommu
-#   arch/blackfin
-#   arch/parisc
-#
-
-obj-$(CONFIG_IP5170DPF)		+= board-ip5170dpf.o
-obj-$(CONFIG_IP5160DEV)		+= board-ip5160dev.o
-obj-$(CONFIG_IP5160EVAL)	+= board-ip5160rgw.o
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-ip5k/board-ip5160dev.c b/target/linux/ubicom32/files/arch/ubicom32/mach-ip5k/board-ip5160dev.c
deleted file mode 100644
index 4fb130d51..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-ip5k/board-ip5160dev.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * arch/ubicom32/mach-ip5k/board-ip5160dev.c
- *   Platform initialization for ip5160dev board.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <linux/device.h>
-#include <linux/platform_device.h>
-#include <linux/gpio.h>
-
-#include <asm/board.h>
-#include <asm/machdep.h>
-#ifdef CONFIG_SERIAL_UBI32_SERDES
-#include <asm/ubicom32suart.h>
-#endif
-
-/*
- * Factory Default Button on the board at PXn
- * TODO: This is just a placeholder and it needs to include proper header files
- */
-struct ubicom32fdb_platform_data {
-	int		fdb_gpio;
-	bool		fdb_polarity;
-};
-
-static struct ubicom32fdb_platform_data ip5160dev_fdb_data = {
-	.fdb_gpio		= 0,
-	.fdb_polarity		= true,
-};
-
-static struct platform_device ip5160dev_fdb_device = {
-	.name	= "ubicom32fdb",
-	.id	= -1,
-	.dev	= {
-		.platform_data = &ip5160dev_fdb_data,
-	},
-};
-
-#ifdef CONFIG_SERIAL_UBI32_SERDES
-static struct resource ip5160dev_ubicom32_suart_resources[] = {
-        {
-		.start	= RD,
-		.end	= RD,
-		.flags	= IORESOURCE_MEM,
-        },
-        {
-		.start	= PORT_OTHER_INT(RD),
-		.end	= PORT_OTHER_INT(RD),
-		.flags	= IORESOURCE_IRQ,
-        },
-        {
-		.start	= 240000000,
-		.end	= 240000000,
-		.flags	= UBICOM32_SUART_IORESOURCE_CLOCK,
-        },
-};
-
-static struct platform_device ip5160dev_ubicom32_suart_device = {
-	.name		= "ubicom32suart",
-	.id		= -1,
-        .num_resources  = ARRAY_SIZE(ip5160dev_ubicom32_suart_resources),
-        .resource       = ip5160dev_ubicom32_suart_resources,
-};
-#endif
-
-/*
- * List of all devices in our system
- */
-static struct platform_device *ip5160dev_devices[] __initdata = {
-#ifdef CONFIG_SERIAL_UBI32_SERDES
-	&ip5160dev_ubicom32_suart_device,
-#endif
-	&ip5160dev_fdb_device,
-};
-
-/*
- * ip5160dev_init
- *	Called to add the devices which we have on this board
- */
-static int __init ip5160dev_init(void)
-{
-	ubi_gpio_init();
-	printk(KERN_INFO "%s: registering device resources\n", __FUNCTION__);
-	platform_add_devices(ip5160dev_devices, ARRAY_SIZE(ip5160dev_devices));
-	return 0;
-}
-
-arch_initcall(ip5160dev_init);
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-ip5k/board-ip5160rgw.c b/target/linux/ubicom32/files/arch/ubicom32/mach-ip5k/board-ip5160rgw.c
deleted file mode 100644
index fb928f79d..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-ip5k/board-ip5160rgw.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * arch/ubicom32/mach-ip5k/board-ip5160rgw.c
- *   Platform initialization for ip5160rgw board.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <linux/device.h>
-#include <linux/platform_device.h>
-#include <linux/gpio.h>
-#include <asm/board.h>
-#include <asm/machdep.h>
-
-/*
- * Factory Default Button on the board at PXn
- * TODO: This is just a placeholder and it needs to include proper header files
- */
-struct ubicom32fdb_platform_data {
-	int		fdb_gpio;
-	bool		fdb_polarity;
-};
-
-static struct ubicom32fdb_platform_data ip5160rgw_fdb_data = {
-	.fdb_gpio		= 0,
-	.fdb_polarity		= true,
-};
-
-static struct platform_device ip5160rgw_fdb_device = {
-	.name	= "ubicom32fdb",
-	.id	= -1,
-	.dev	= {
-		.platform_data = &ip5160rgw_fdb_data,
-	},
-};
-
-/*
- * List of all devices in our system
- */
-static struct platform_device *ip5160rgw_devices[] __initdata = {
-	&ip5160rgw_fdb_device,
-};
-
-/*
- * ip5160rgw_init
- *	Called to add the devices which we have on this board
- */
-static int __init ip5160rgw_init(void)
-{
-	ubi_gpio_init();
-	printk(KERN_INFO "%s: registering device resources\n", __FUNCTION__);
-	platform_add_devices(ip5160rgw_devices, ARRAY_SIZE(ip5160rgw_devices));
-	return 0;
-}
-
-arch_initcall(ip5160rgw_init);
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-ip5k/board-ip5170dpf.c b/target/linux/ubicom32/files/arch/ubicom32/mach-ip5k/board-ip5170dpf.c
deleted file mode 100644
index ef04dcaa8..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-ip5k/board-ip5170dpf.c
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * arch/ubicom32/mach-ip5k/board-ip5170dpf.c
- *   Platform initialization for ip5160dpf board.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <linux/device.h>
-#include <linux/platform_device.h>
-#include <linux/gpio.h>
-#include <linux/leds.h>
-
-#include <linux/i2c.h>
-#include <linux/i2c-gpio.h>
-
-#include <linux/input.h>
-#include <asm/board.h>
-#include <asm/machdep.h>
-#include <asm/ubicom32hid.h>
-#include <asm/vdc_tio.h>
-
-/*
- * LEDs
- *
- * WLAN			PD9	(Note this is shared with MISO, but we don't use it)
- * WPS			PD8
- *
- * TODO: check triggers, are they generic?
- */
-static struct gpio_led ip5170dpf_gpio_leds[] = {
-	{
-		.name			= "d31:green:WLAN1",
-		.default_trigger	= "WLAN1",
-		.gpio			= GPIO_RD_9,
-		.active_low		= 1,
-	},
-	{
-		.name			= "d30:green:WPS",
-		.default_trigger	= "WPS",
-		.gpio			= GPIO_RD_8,
-		.active_low		= 1,
-	},
-};
-
-static struct gpio_led_platform_data ip5170dpf_gpio_led_platform_data = {
-	.num_leds	= 2,
-	.leds		= ip5170dpf_gpio_leds,
-};
-
-static struct platform_device ip5170dpf_gpio_leds_device = {
-	.name		= "leds-gpio",
-	.id		= -1,
-	.dev = {
-		.platform_data = &ip5170dpf_gpio_led_platform_data,
-	},
-};
-
-/*
- * Backlight on the board PD0, hardware PWM
- */
-static const struct ubicom32hid_button ip5170dpf_ubicom32hid_buttons[] = {
-	{
-		.type	= EV_KEY,
-		.code	= KEY_UP,
-		.bit	= 0,
-	},
-	{
-		.type	= EV_KEY,
-		.code	= KEY_LEFT,
-		.bit	= 1,
-	},
-	{
-		.type	= EV_KEY,
-		.code	= KEY_RIGHT,
-		.bit	= 2,
-	},
-	{
-		.type	= EV_KEY,
-		.code	= KEY_DOWN,
-		.bit	= 3,
-	},
-	{
-		.type	= EV_KEY,
-		.code	= KEY_ENTER,
-		.bit	= 4,
-	},
-	{
-		.type	= EV_KEY,
-		.code	= KEY_MENU,
-		.bit	= 5,
-	},
-	{
-		.type	= EV_KEY,
-		.code	= KEY_ESC,
-		.bit	= 7,
-	},
-};
-
-static const struct ubicom32hid_ir ip5170dpf_ubicom32hid_ircodes[] = {
-	{
-		.type		= EV_KEY,
-		.code		= KEY_UP,
-		.ir_code	= 0xF807916E
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_DOWN,
-		.ir_code	= 0xF20D916E
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_LEFT,
-		.ir_code	= 0xF609916E
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_RIGHT,
-		.ir_code	= 0xF40B916E
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_ENTER,
-		.ir_code	= 0xF50A916E
-	},
-	{	/* rotate */
-		.type		= EV_KEY,
-		.code		= KEY_FN_F1,
-		.ir_code	= 0xF906916E
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_MENU,
-		.ir_code	= 0xF708916E
-	},
-	{	/* font size */
-		.type		= EV_KEY,
-		.code		= KEY_FN_F2,
-		.ir_code	= 0xF30C916E
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_ESC,
-		.ir_code	= 0xF10E916E
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_VOLUMEUP,
-		.ir_code	= 0xF00F916E
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_VOLUMEDOWN,
-		.ir_code	= 0xED12916E
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_MUTE,
-		.ir_code	= 0xEA15916E
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_INFO,
-		.ir_code	= 0xEF10916E
-	},
-	{	/* Like */
-		.type		= EV_KEY,
-		.code		= KEY_FN_F3,
-		.ir_code	= 0xEE11916E
-	},
-	{	/* Dislike */
-		.type		= EV_KEY,
-		.code		= KEY_FN_F4,
-		.ir_code	= 0xEB14916E
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_POWER,
-		.ir_code	= 0xFD02916E
-	},
-};
-
-static struct ubicom32hid_platform_data ip5170dpf_ubicom32hid_platform_data = {
-	.gpio_reset		= GPIO_RA_4,
-	.gpio_reset_polarity	= 0,
-	.type			= UBICOM32HID_BL_TYPE_BINARY,
-	.invert			= 0,
-	.default_intensity	= 1,
-	.buttons		= ip5170dpf_ubicom32hid_buttons,
-	.nbuttons		= ARRAY_SIZE(ip5170dpf_ubicom32hid_buttons),
-	.ircodes		= ip5170dpf_ubicom32hid_ircodes,
-	.nircodes		= ARRAY_SIZE(ip5170dpf_ubicom32hid_ircodes),
-};
-
-/*
- * Devices on the I2C bus
- */
-static struct i2c_board_info __initdata ip5170dpf_i2c_board_info[] = {
-	/*
-	 * U24, ubicom32hid
-	 */
-	{
-		.type		= "ubicom32hid",
-		.addr		= 0x08,
-		.platform_data	= &ip5170dpf_ubicom32hid_platform_data,
-	},
-
-	/*
-	 * U14, CS4350 DAC, address 0x4B
-	 */
-};
-
-/*
- * I2C bus on the board, SDA PF13, SCL PF14
- */
-static struct i2c_gpio_platform_data ip5170dpf_i2c_data = {
-	.sda_pin		= GPIO_RF_13,
-	.scl_pin		= GPIO_RF_14,
-	.sda_is_open_drain	= 0,
-	.scl_is_open_drain	= 0,
-	.scl_is_output_only	= 1,
-	.udelay			= 5,
-};
-
-static struct platform_device ip5170dpf_i2c_device = {
-	.name	= "i2c-gpio",
-	.id	= 0,
-	.dev	= {
-		.platform_data = &ip5170dpf_i2c_data,
-	},
-};
-
-/*
- * List of all devices in our system
- */
-static struct platform_device *ip5170dpf_devices[] __initdata = {
-	&ip5170dpf_i2c_device,
-	&ip5170dpf_gpio_leds_device,
-};
-
-/*
- * ip5170dpf_init
- *	Called to add the devices which we have on this board
- */
-static int __init ip5170dpf_init(void)
-{
-	ubi_gpio_init();
-
-	vdc_tio_init();
-
-	printk(KERN_INFO "%s: registering device resources\n", __FUNCTION__);
-	platform_add_devices(ip5170dpf_devices, ARRAY_SIZE(ip5170dpf_devices));
-
-	printk(KERN_INFO "%s: registering i2c resources\n", __FUNCTION__);
-	i2c_register_board_info(0, ip5170dpf_i2c_board_info, ARRAY_SIZE(ip5170dpf_i2c_board_info));
-
-	return 0;
-}
-
-arch_initcall(ip5170dpf_init);
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-ip7k/Kconfig b/target/linux/ubicom32/files/arch/ubicom32/mach-ip7k/Kconfig
deleted file mode 100644
index 8a7f2f1cf..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-ip7k/Kconfig
+++ /dev/null
@@ -1,205 +0,0 @@
-config IP7145DPF
-	bool "IP7145DPF"
-	select UBICOM32_V4
-	select UBICOM_INPUT
-	select UBICOM_INPUT_I2C
-	select RTC_CLASS
-	select RTC_DRV_S35390A
-	select I2C
-	select I2C_GPIO
-	select GPIO_PCA953X
-	select FB
-	select FB_UBICOM32
-	select LCD_CLASS_DEVICE
-	select LCD_UBICOM32POWER
-	select BACKLIGHT_LCD_SUPPORT
-	select BACKLIGHT_CLASS_DEVICE
-	select BACKLIGHT_UBICOM32
-	select SND_UBI32
-	select MMC_UBICOM32
-	select MMC
-	select MMC_BLOCK
-	help
-		IP7145 Digital Picture Frame reference design, supports:
-			8007-0410 v1.0
-
-config IP7160RGW
-	bool "IP7160RGW"
-	select UBICOM32_V4
-	select UBICOM_INPUT
-	select NEW_LEDS
-	select LEDS_CLASS
-	select LEDS_GPIO
-	select SPI
-	select SPI_UBICOM32_GPIO
-	select VLAN_8021Q
-	select UBICOM_SWITCH
-	select UBICOM_SWITCH_BCM539X
-	help
-		Ubicom IP7160 RGW Eval, supports:
-			8007-0110 v1.0
-			8007-0111 v1.1
-			8007-0112 v1.2
-
-config IP7160RGWLCD
-	bool "IP7160RGWLCD"
-	select UBICOM32_V4
-	select UBICOM_INPUT
-	select NEW_LEDS
-	select LEDS_CLASS
-	select LEDS_GPIO
-	select SPI
-	select SPI_UBICOM32_GPIO
-	select VLAN_8021Q
-	select UBICOM_SWITCH
-	select UBICOM_SWITCH_BCM539X
-	select INPUT_TOUCHSCREEN
-	select TOUCHSCREEN_TSC2007
-	select FB
-	select FB_UBICOM32_VIRTUAL
-	select I2C
-	select I2C_GPIO
-	help
-		Ubicom IP7160 RGW Eval, supports:
-			8007-0112 v1.2 + 8007-1410 v1.0
-
-		With Ubicom LCD Adapter
-			8007-0920 v2.0
-			8007-0921 v2.1
-
-
-config IP7160BRINGUP
-	bool "IP7160BRINGUP"
-	select UBICOM32_V4
-	select NEW_LEDS
-	select LEDS_CLASS
-	select LEDS_GPIO
-	help
-		Ubicom IP7160 Bringup, supports:
-			8007-0010 v1.0
-
-config IP7160DPF
-	bool "IP7160DPF"
-	select UBICOM32_V4
-	select I2C
-	select I2C_GPIO
-	select FB
-	select FB_UBICOM32
-	select BACKLIGHT_LCD_SUPPORT
-	select BACKLIGHT_CLASS_DEVICE
-	select SND_UBI32
-	select SND_UBI32_AUDIO_CS4350
-	select UBICOM_HID
-	help
-		IP7160 Digital Picture Frame board, supports:
-			8007-0211 Rev 1.1
-
-config IP7500MODULE
-	bool "IP7500MODULE"
-	select UBICOM32_V4
-	help
-		Ubicom IP7500 CPU Module board, supports:
-			8007-0510  v1.0
-			8007-0510A v1.0
-
-		Please see ip7500module.c for more details.
-
-config IP7500AV
-	bool "IP7500AV"
-	select UBICOM32_V4
-	select I2C
-	select I2C_GPIO
-	select SND_UBI32
-	select SND_UBI32_AUDIO_CS4384
-	select FB
-	select FB_UBICOM32
-	help
-		Ubicom IP7500 Audio Video board, supports:
-			8007-0810  v1.0
-
-		With Ubicom IP7500 CPU Module board:
-			8007-0510  v1.0 -or-
-			8007-0510A v1.0
-
-		Please see ip7500av.c for more details.
-
-config IP7500MEDIA
-	bool "IP7500MEDIA"
-	select UBICOM32_V4
-	select UBICOM_INPUT_I2C
-	select RTC_CLASS
-	select RTC_DRV_S35390A
-	select I2C
-	select I2C_GPIO
-	select GPIO_PCA953X
-	select FB
-	select FB_UBICOM32
-	select FB_UBICOM32_VIRTUAL
-	select FB_UBICOM32_VIRTUAL_NOAUTO
-	select LCD_CLASS_DEVICE
-	select LCD_UBICOM32POWER
-	select BACKLIGHT_LCD_SUPPORT
-	select BACKLIGHT_CLASS_DEVICE
-	select BACKLIGHT_UBICOM32
-	select INPUT_TOUCHSCREEN
-	select TOUCHSCREEN_TSC2007
-	select SOUND
-	select SND
-	select SND_UBI32
-	select SND_UBI32_AUDIO_CS4350
-	select MMC_UBICOM32
-	select MMC
-	select MMC_BLOCK
-	help
-		IP7500 Media Board w/ IP7500 CPU Module board, supports:
-			8007-0610 v1.0 w/ 8007-0510 v1.0
-			8007-0610 v1.0 w/ 8007-0510 v1.0 NOPHY
-			8007-0610 v1.0 w/ 8007-0511 v1.1 NOPHY
-
-		Also supports optional LCD Adapter board:
-			8006-0920 v2.0
-			8006-0921 v2.1
-
-		Please see ip7500media.c for more details.
-
-config IP7500WSPKR
-	bool "IP7500WSPKR"
-	select UBICOM32_V4
-	select I2C
-	select I2C_GPIO
-	select SOUND
-	select SND
-	select SND_UBI32
-	select SND_UBI32_AUDIO_CS4350
-	help
-		IP7500 Wireless Speaker Board, supports:
-			8007-1210 v1.0
-
-		Please see ip7500wspkr.c for more details.
-
-config IP7500IAP
-	bool "IP7500IAP"
-	select UBICOM32_V4
-	select I2C
-	select I2C_GPIO
-	select FB
-	select FB_UBICOM32_VIRTUAL
-	select SOUND
-	select SND
-	select SND_UBI32
-	select SND_UBI32_AUDIO_CS4350
-	select RTC_CLASS
-	select RTC_DRV_S35390A
-	select INPUT_TOUCHSCREEN
-	select TOUCHSCREEN_TSC2007
-	select BACKLIGHT_LCD_SUPPORT
-	select BACKLIGHT_CLASS_DEVICE
-	select BACKLIGHT_UBICOM32
-	help
-		IP7500 Internet Audio Player, supports:
-			8007-1110 v1.0
-
-		Please see ip7500iap.c for more details.
-
-
-		Please see ip7500media.c for more details.
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-ip7k/Makefile b/target/linux/ubicom32/files/arch/ubicom32/mach-ip7k/Makefile
deleted file mode 100644
index f9df397ee..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-ip7k/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# arch/ubicom32/mach-ip7k/Makefile
-#	Makefile for ip7k based boards.
-#
-# (C) Copyright 2009, Ubicom, Inc.
-#
-# This file is part of the Ubicom32 Linux Kernel Port.
-#
-# The Ubicom32 Linux Kernel Port 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.
-#
-# The Ubicom32 Linux Kernel Port is distributed in the hope that it
-# will be useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
-# the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with the Ubicom32 Linux Kernel Port.  If not,
-# see <http://www.gnu.org/licenses/>.
-#
-# Ubicom32 implementation derived from (with many thanks):
-#   arch/m68knommu
-#   arch/blackfin
-#   arch/parisc
-#
-
-obj-$(CONFIG_IP7145DPF)		+= board-ip7145dpf.o
-obj-$(CONFIG_IP7160RGW)		+= board-ip7160rgw.o
-obj-$(CONFIG_IP7160RGWLCD)	+= board-ip7160rgw.o
-obj-$(CONFIG_IP7160BRINGUP)	+= board-ip7160bringup.o
-obj-$(CONFIG_IP7160DPF)		+= board-ip7160dpf.o
-obj-$(CONFIG_IP7500MODULE)	+= board-ip7500module.o
-obj-$(CONFIG_IP7500MEDIA)	+= board-ip7500media.o
-obj-$(CONFIG_IP7500AV)		+= board-ip7500av.o
-obj-$(CONFIG_IP7500WSPKR)	+= board-ip7500wspkr.o
-obj-$(CONFIG_IP7500IAP)		+= board-ip7500iap.o
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-ip7k/board-ip7145dpf.c b/target/linux/ubicom32/files/arch/ubicom32/mach-ip7k/board-ip7145dpf.c
deleted file mode 100644
index d3348d30f..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-ip7k/board-ip7145dpf.c
+++ /dev/null
@@ -1,715 +0,0 @@
-/*
- * arch/ubicom32/mach-ip7k/board-ip7145dpf.c
- *   Board file for IP7145DPF, rev 1.0, P/N 8007-0410
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <linux/device.h>
-#include <linux/platform_device.h>
-#include <linux/gpio.h>
-
-#include <linux/input.h>
-
-#include <linux/i2c.h>
-#include <linux/i2c-gpio.h>
-#include <linux/i2c/pca953x.h>
-
-#include <asm/board.h>
-#include <asm/machdep.h>
-#include <asm/ubicom32input.h>
-#include <asm/ubicom32input_i2c.h>
-#include <asm/ubicom32bl.h>
-#include <asm/ubicom32lcdpower.h>
-#include <asm/vdc_tio.h>
-
-#include <asm/ubicom32sd.h>
-#include <asm/sd_tio.h>
-#include <asm/devtree.h>
-#include <asm/audio.h>
-
-#include <asm/ring_tio.h>
-
-/******************************************************************************
- * SD/IO Port F (Slot 1) platform data
- */
-static struct resource ip7145dpf_portf_sd_resources[] = {
-	/*
-	 * Send IRQ
-	 */
-	[0] = {
-		/*
-		 * The init routine will query the devtree and fill this in
-		 */
-		.flags	= IORESOURCE_IRQ,
-	},
-
-	/*
-	 * Receive IRQ
-	 */
-	[1] = {
-		/*
-		 * The init routine will query the devtree and fill this in
-		 */
-		.flags	= IORESOURCE_IRQ,
-	},
-
-	/*
-	 * Memory Mapped Registers
-	 */
-	[2] = {
-		/*
-		 * The init routine will query the devtree and fill this in
-		 */
-		.flags	= IORESOURCE_MEM,
-	},
-};
-
-static struct ubicom32sd_card ip7145dpf_portf_sd_cards[] = {
-	[0] = {
-		.pin_wp		= IP7145DPF_IOB0,
-		.wp_polarity	= 1,
-		.pin_pwr	= IP7145DPF_IOB4,
-		.pin_cd		= GPIO_RA_4,
-	},
-	[1] = {
-		.pin_wp		= IP7145DPF_IOB1,
-		.wp_polarity	= 1,
-		.pin_pwr	= IP7145DPF_IOB5,
-		.pin_cd		= GPIO_RA_6,
-	},
-};
-
-static struct ubicom32sd_platform_data ip7145dpf_portf_sd_platform_data = {
-	.ncards		= 2,
-	.cards		= ip7145dpf_portf_sd_cards,
-};
-
-static struct platform_device ip7145dpf_portf_sd_device = {
-	.name		= "ubicom32sd",
-	.id		= 0,
-	.resource	= ip7145dpf_portf_sd_resources,
-	.num_resources	= ARRAY_SIZE(ip7145dpf_portf_sd_resources),
-	.dev		= {
-			.platform_data = &ip7145dpf_portf_sd_platform_data,
-	},
-
-};
-
-/*
- * ip7145dpf_portf_sd_init
- */
-static void ip7145dpf_portf_sd_init(void)
-{
-	/*
-	 * Check the device tree for the sd_tio
-	 */
-	struct sd_tio_node *sd_node = (struct sd_tio_node *)devtree_find_node("portf_sd");
-	if (!sd_node) {
-		printk(KERN_INFO "PortF SDTIO not found\n");
-		return;
-	}
-
-	/*
-	 * Fill in the resources and platform data from devtree information
-	 */
-	ip7145dpf_portf_sd_resources[0].start = sd_node->dn.sendirq;
-	ip7145dpf_portf_sd_resources[1].start = sd_node->dn.recvirq;
-	ip7145dpf_portf_sd_resources[2].start = (u32_t)&(sd_node->regs);
-	ip7145dpf_portf_sd_resources[2].end = (u32_t)&(sd_node->regs) + sizeof(sd_node->regs);
-
-	platform_device_register(&ip7145dpf_portf_sd_device);
-}
-
-/******************************************************************************
- * SD/IO Port B (Slot 2) platform data
- */
-static struct resource ip7145dpf_portb_sd_resources[] = {
-	/*
-	 * Send IRQ
-	 */
-	[0] = {
-		/*
-		 * The init routine will query the devtree and fill this in
-		 */
-		.flags	= IORESOURCE_IRQ,
-	},
-
-	/*
-	 * Receive IRQ
-	 */
-	[1] = {
-		/*
-		 * The init routine will query the devtree and fill this in
-		 */
-		.flags	= IORESOURCE_IRQ,
-	},
-
-	/*
-	 * Memory Mapped Registers
-	 */
-	[2] = {
-		/*
-		 * The init routine will query the devtree and fill this in
-		 */
-		.flags	= IORESOURCE_MEM,
-	},
-};
-
-static struct ubicom32sd_card ip7145dpf_portb_sd_cards[] = {
-	[0] = {
-		.pin_wp		= IP7145DPF_IOB2,
-		.wp_polarity	= 1,
-		.pin_pwr	= IP7145DPF_IOB6,
-		.pin_cd		= IP7145DPF_IOB3,
-	},
-};
-
-static struct ubicom32sd_platform_data ip7145dpf_portb_sd_platform_data = {
-	.ncards		= 1,
-	.cards		= ip7145dpf_portb_sd_cards,
-};
-
-static struct platform_device ip7145dpf_portb_sd_device = {
-	.name		= "ubicom32sd",
-	.id		= 1,
-	.resource	= ip7145dpf_portb_sd_resources,
-	.num_resources	= ARRAY_SIZE(ip7145dpf_portb_sd_resources),
-	.dev		= {
-			.platform_data = &ip7145dpf_portb_sd_platform_data,
-	},
-
-};
-
-/*
- * ip7145dpf_portb_sd_init
- */
-static void ip7145dpf_portb_sd_init(void)
-{
-	/*
-	 * Check the device tree for the sd_tio
-	 */
-	struct sd_tio_node *sd_node = (struct sd_tio_node *)devtree_find_node("portb_sd");
-	if (!sd_node) {
-		printk(KERN_INFO "PortB SDTIO not found\n");
-		return;
-	}
-
-	/*
-	 * Fill in the resources and platform data from devtree information
-	 */
-	ip7145dpf_portb_sd_resources[0].start = sd_node->dn.sendirq;
-	ip7145dpf_portb_sd_resources[1].start = sd_node->dn.recvirq;
-	ip7145dpf_portb_sd_resources[2].start = (u32_t)&(sd_node->regs);
-	ip7145dpf_portb_sd_resources[2].end = (u32_t)&(sd_node->regs) + sizeof(sd_node->regs);
-
-	platform_device_register(&ip7145dpf_portb_sd_device);
-}
-
-
-#ifdef IP7145DPF_USE_MMC_SPI
-/******************************************************************************
- * SPI over GPIO (MMC_SPI)
- */
-#include <linux/spi/spi.h>
-#include <linux/spi/mmc_spi.h>
-#include <linux/mmc/host.h>
-#include <asm/ubicom32-spi-gpio.h>
-
-#define MMC_CS	GPIO_RF_5	// PF5 D3
-#define MMC_CD	GPIO_RA_4	// PA4 CD
-#define MMC_WP	IP7145DPF_IOB0	// IOB0 WP
-#define MMC_PWR	IP7145DPF_IOB4	// IOB4 PWR
-
-/*
- * SPI bus over GPIO (for SD card)
- */
-static struct ubicom32_spi_gpio_platform_data ip7145dpf_spi_gpio_data = {
-	.pin_mosi	= GPIO_RF_0,	// PF0 CMD
-	.pin_miso	= GPIO_RF_2,	// PF2 D0
-	.pin_clk	= GPIO_RF_1,	// PF1 CLK
-	.bus_num	= 0,		// We'll call this SPI bus 0
-	.num_chipselect	= 1,		// only one device on this SPI bus
-};
-
-static struct platform_device ip7145dpf_spi_gpio_device = {
-	.name	= "ubicom32-spi-gpio",
-	.id	= 0,
-	.dev	= {
-		.platform_data = &ip7145dpf_spi_gpio_data,
-	},
-};
-
-/*
- * ip7145dpf_mmc_spi_setpower_slot_a
- *	Set the power state for slot A
- */
-static void ip7145dpf_mmc_spi_setpower_slot_a(struct device *dev, unsigned int vdd)
-{
-	struct mmc_spi_platform_data *pd = dev->platform_data;
-
-	/*
-	 * Power is inverted, we could tell the IOB to do it, but it's cleaner this way.
-	 */
-	if ((1 << vdd) & pd->ocr_mask) {
-		gpio_set_value(MMC_PWR, 0);
-		return;
-	}
-	gpio_set_value(MMC_PWR, 1);
-}
-
-/*
- * ip7145dpf_mmc_spi_get_cd_slot_a
- *	Get the CD bit for slot A
- */
-static int ip7145dpf_mmc_spi_get_cd_slot_a(struct device *dev)
-{
-	/*
-	 * Note that the sense of the GPIO is inverted
-	 */
-	return !gpio_get_value(MMC_CD);
-}
-
-/*
- * ip7145dpf_mmc_spi_get_ro_slot_a
- *	Get the WP bit for slot A
- */
-static int ip7145dpf_mmc_spi_get_ro_slot_a(struct device *dev)
-{
-	/*
-	 * Note that the sense of the GPIO is inverted, we could tell the IOB to do it, but
-	 * it's clearer this way.
-	 */
-	return !gpio_get_value(MMC_WP);
-}
-
-/*
- * ip7145dpf_mmc_spi_exit_slot_a
- *	Free the appropriate GPIOs for slot A SD slot.
- */
-static void ip7145dpf_mmc_spi_exit_slot_a(struct device *dev, void *appdata)
-{
-	gpio_free(MMC_CD);
-	gpio_free(MMC_CS);
-	gpio_free(MMC_WP);
-	gpio_free(MMC_PWR);
-	platform_device_unregister(&ip7145dpf_spi_gpio_device);
-}
-
-/*
- * ip7145dpf_mmc_spi_init_slot_a
- *	Allocate the appropriate GPIOs for slot A SD slot.
- *	WP is on IOB0, CD is PA4, CS is on PF5
- *	TODO: make CD an interrupt
- */
-static int ip7145dpf_mmc_spi_init_slot_a(void)
-{
-	int ret = gpio_request(MMC_CD, "mmc-a-cd");
-	if (ret) {
-		printk(KERN_ERR "%s: could not request mmc-a-cd pin\n", __FUNCTION__);
-		return -ENOSYS;
-	}
-	gpio_direction_input(MMC_CD);
-
-	ret = gpio_request(MMC_CS, "mmc-a-cs");
-	if (ret) {
-		printk(KERN_ERR "%s: could not request mmc-a-cs pin\n", __FUNCTION__);
-		goto no_cs;
-	}
-	gpio_direction_output(MMC_CS, 0);
-
-	ret = gpio_request(MMC_WP, "mmc-a-wp");
-	if (ret) {
-		printk(KERN_ERR "%s: could not request mmc-a-wp pin\n", __FUNCTION__);
-		goto no_wp;
-	}
-	gpio_direction_input(MMC_WP);
-
-	/*
-	 * Start off with power off
-	 */
-	ret = gpio_request(MMC_PWR, "mmc-a-pwr");
-	if (ret) {
-		printk(KERN_ERR "%s: could not request mmc-a-pwr pin\n", __FUNCTION__);
-		goto no_pwr;
-	}
-	ret = gpio_direction_output(MMC_PWR, 1);
-
-	return 0;
-
-no_pwr:
-	gpio_free(MMC_WP);
-
-no_wp:
-	gpio_free(MMC_CS);
-
-no_cs:
-	gpio_free(MMC_CD);
-	return -ENOSYS;
-}
-
-/*
- * MMC_SPI driver (currently bitbang)
- */
-static struct mmc_spi_platform_data ip7145dpf_mmc_platform_data = {
-	.ocr_mask	= MMC_VDD_33_34,
-	.exit		= ip7145dpf_mmc_spi_exit_slot_a,
-	.get_ro		= ip7145dpf_mmc_spi_get_ro_slot_a,
-	.get_cd		= ip7145dpf_mmc_spi_get_cd_slot_a,
-
-	.setpower	= ip7145dpf_mmc_spi_setpower_slot_a,
-	.powerup_msecs	= 500,
-
-	.detect_delay	= 100,
-
-	.caps		= MMC_CAP_NEEDS_POLL,
-};
-
-static struct ubicom32_spi_gpio_controller_data ip7145dpf_mmc_controller_data = {
-	.pin_cs =  MMC_CS,
-};
-
-static struct spi_board_info ip7145dpf_spi_board_info[] = {
-	{
-		.modalias = "mmc_spi",
-		.bus_num = 0,
-		.chip_select = 0,
-		.max_speed_hz = 2000000,
-		.platform_data = &ip7145dpf_mmc_platform_data,
-		.controller_data = &ip7145dpf_mmc_controller_data,
-	}
-};
-#endif /* IP7145DPF_USE_MMC_SPI */
-
-/*
- * ip7145dpf_u72_setup
- *	Called by I2C to tell us that u72 is setup.
- *
- * This function is called by I2C to tell us that u72 has been setup.  All
- * devices which rely on this chip being initialized (or even present) need to
- * be initialized in this function otherwise they may get initialized too early.
- *
- * Currently the only device depending on u72 is the SPI
- */
-static int __init ip7145dpf_u72_setup(struct i2c_client *client, unsigned gpio, unsigned ngpio, void *context)
-{
-#ifdef IP7145DPF_USE_MMC_SPI
-	if (ip7145dpf_mmc_spi_init_slot_a()) {
-		printk(KERN_ERR "%s: could not request mmc resources\n", __FUNCTION__);
-	} else {
-		printk(KERN_INFO "%s: registering SPI resources\n", __FUNCTION__);
-		spi_register_board_info(ip7145dpf_spi_board_info, ARRAY_SIZE(ip7145dpf_spi_board_info));
-		platform_device_register(&ip7145dpf_spi_gpio_device);
-	}
-#else
-	/*
-	 * Initialize the Port F/Port B SD slots
-	 */
-	ip7145dpf_portf_sd_init();
-	ip7145dpf_portb_sd_init();
-#endif
-	return 0;
-}
-
-/******************************************************************************
- * LCD VGH on the board at PE6
- */
-static struct ubicom32lcdpower_platform_data ip7145dpf_lcdpower_data = {
-	.vgh_gpio		= GPIO_RE_6,
-	.vgh_polarity		= true,
-};
-
-static struct platform_device ip7145dpf_lcdpower_device = {
-	.name	= "ubicom32lcdpower",
-	.id	= -1,
-	.dev	= {
-		.platform_data = &ip7145dpf_lcdpower_data,
-	},
-};
-
-/******************************************************************************
- * Backlight on the board PD0, hardware PWM
- */
-static struct ubicom32bl_platform_data ip7145dpf_backlight_data = {
-	.type			= UBICOM32BL_TYPE_PWM,
-	.pwm_channel		= 2,
-	.pwm_prescale		= 15,
-	.pwm_period		= 60,
-	.default_intensity	= 0x80,
-};
-
-static struct platform_device ip7145dpf_backlight_device = {
-	.name	= "ubicom32bl",
-	.id	= -1,
-	.dev	= {
-		.platform_data = &ip7145dpf_backlight_data,
-	},
-};
-
-/******************************************************************************
- * Ubicom32Input on I2C, U48 MAX7310, address 0x18, 8 bits
- */
-static struct ubicom32input_i2c_button ip7145dpf_ubicom32input_i2c_u48_buttons[] = {
-	{
-		.type		= EV_KEY,
-		.code		= KEY_UP,
-		.bit		= 0,
-		.active_low	= 1,
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_LEFT,
-		.bit		= 1,
-		.active_low	= 1,
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_RIGHT,
-		.bit		= 2,
-		.active_low	= 1,
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_DOWN,
-		.bit		= 3,
-		.active_low	= 1,
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_ENTER,
-		.bit		= 4,
-		.active_low	= 1,
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_MENU,
-		.bit		= 5,
-		.active_low	= 1,
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_ESC,
-		.bit		= 6,
-		.active_low	= 1,
-	},
-};
-
-static struct ubicom32input_i2c_platform_data ip7145dpf_ubicom32input_i2c_u48_platform_data = {
-	.buttons	= ip7145dpf_ubicom32input_i2c_u48_buttons,
-	.nbuttons	= ARRAY_SIZE(ip7145dpf_ubicom32input_i2c_u48_buttons),
-	.name		= "Ubicom32 Input I2C U48",
-};
-
-/******************************************************************************
- * Additional GPIO chips
- */
-static struct pca953x_platform_data ip7145dpf_gpio_u72_platform_data = {
-	.gpio_base = IP7145DPF_U72_BASE,
-	.setup = ip7145dpf_u72_setup,
-};
-
-/******************************************************************************
- * Devices on the I2C bus
- */
-static struct i2c_board_info __initdata ip7145dpf_i2c_board_info[] = {
-	/*
-	 * U51, S35390A RTC, address 0x30
-	 */
-	{
-		.type		= "s35390a",
-		.addr		= 0x30,
-	},
-
-	/*
-	 * U48, MAX7310 IO expander, 8 bits, address 0x18
-	 */
-	{
-		.type		= "ubicom32in_max7310",
-		.addr		= 0x18,
-		.platform_data	= &ip7145dpf_ubicom32input_i2c_u48_platform_data,
-	},
-
-	/*
-	 * U72, MAX7310 IOB expander, 8 bits, address 0x19
-	 */
-	{
-		.type		= "max7310",
-		.addr		= 0x19,
-		.platform_data	= &ip7145dpf_gpio_u72_platform_data,
-	},
-};
-
-/*
- * I2C bus on the board, SDA PE1, SCL PE2
- */
-static struct i2c_gpio_platform_data ip7145dpf_i2c_data = {
-	.sda_pin		= GPIO_RE_1,
-	.scl_pin		= GPIO_RE_2,
-	.sda_is_open_drain	= 0,
-	.scl_is_open_drain	= 0,
-};
-
-static struct platform_device ip7145dpf_i2c_device = {
-	.name	= "i2c-gpio",
-	.id	= 0,
-	.dev	= {
-		.platform_data = &ip7145dpf_i2c_data,
-	},
-};
-
-/******************************************************************************
- * Use ubicom32input driver to monitor the various pushbuttons on this board.
- *
- * WPS			PF12
- * FACT_DEFAULT		PF13
- * POWER		PE4
- *
- * Not sutable for the keypad buttons since those run on I2C GPIO.  The polling
- * of ubicom32input would seem to be excessive for this.
- *
- * TODO: pick some ubicom understood EV_xxx define for WPS and Fact Default
- */
-static struct ubicom32input_button ip7145dpf_ubicom32input_buttons[] = {
-	{
-		.type		= EV_KEY,
-		.code		= KEY_FN_F1,
-		.gpio		= GPIO_RF_12,
-		.desc		= "WPS",
-		.active_low	= 1,
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_FN_F2,
-		.gpio		= GPIO_RF_13,
-		.desc		= "Factory Default",
-		.active_low	= 1,
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_POWER,
-		.gpio		= GPIO_RE_4,
-		.desc		= "Power",
-		.active_low	= 1,
-	},
-};
-
-static struct ubicom32input_platform_data ip7145dpf_ubicom32input_data = {
-	.buttons	= ip7145dpf_ubicom32input_buttons,
-	.nbuttons	= ARRAY_SIZE(ip7145dpf_ubicom32input_buttons),
-};
-
-static struct platform_device ip7145dpf_ubicom32input_device = {
-	.name	= "ubicom32input",
-	.id	= -1,
-	.dev	= {
-		.platform_data = &ip7145dpf_ubicom32input_data,
-	},
-};
-
-/*
- * List of all devices in our system
- */
-static struct platform_device *ip7145dpf_devices[] __initdata = {
-	&ip7145dpf_i2c_device,
-	&ip7145dpf_lcdpower_device,
-	&ip7145dpf_backlight_device,
-	&ip7145dpf_ubicom32input_device,
-};
-
-/*
- * ip7145dpf_power_off
- *	Called to turn the power off for this board
- */
-static void ip7145dpf_power_off(void)
-{
-	gpio_set_value(GPIO_RE_5, 0);
-}
-
-/*
- * ip7145dpf_init
- *	Called to add the devices which we have on this board
- */
-static int __init ip7145dpf_init(void)
-{
-	int ret;
-	struct platform_device *audio_dev;
-
-	ubi_gpio_init();
-
-#ifdef CONFIG_UIO_UBICOM32RING
-	ring_tio_init("decoder_ring");
-#endif
-
-	/*
-	 * Start up the video driver first
-	 */
-	vdc_tio_init();
-
-	/*
-	 * Take over holding of the power from the system
-	 */
-	ret = gpio_request(GPIO_RE_5, "power_hold");
-	if (ret) {
-		printk(KERN_ERR "%s: could not request power hold GPIO\n", __FUNCTION__);
-	}
-	gpio_direction_output(GPIO_RE_5, 1);
-	mach_power_off = ip7145dpf_power_off;
-
-	/*
-	 * USB SEL_HOST_USB line
-	 */
-	ret = gpio_request(GPIO_RF_11, "SEL_HOST_USB");
-	if (ret) {
-		printk(KERN_ERR "%s: could not request SEL_HOST_USB GPIO\n", __FUNCTION__);
-	}
-	gpio_direction_output(GPIO_RF_11, 0);
-
-	/*
-	 * Setup audio
-	 */
-	audio_dev = audio_device_alloc("snd-ubi32-generic", "audio", "audio-i2sout", 0);
-	if (audio_dev) {
-		platform_device_register(audio_dev);
-	}
-
-	/*
-	 * Register all of the devices we have on this board
-	 */
-	printk(KERN_INFO "%s: registering device resources\n", __FUNCTION__);
-	platform_add_devices(ip7145dpf_devices, ARRAY_SIZE(ip7145dpf_devices));
-
-	/*
-	 * Register all of the devices which sit on the I2C bus
-	 */
-	printk(KERN_INFO "%s: registering i2c resources\n", __FUNCTION__);
-	i2c_register_board_info(0, ip7145dpf_i2c_board_info, ARRAY_SIZE(ip7145dpf_i2c_board_info));
-
-	/*
-	 * We have to initialize the SPI after the I2C IOB gets setup. SPI is initialized in
-	 * ip7145dpf_u72_setup
-	 */
-
-	return 0;
-}
-
-arch_initcall(ip7145dpf_init);
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-ip7k/board-ip7160bringup.c b/target/linux/ubicom32/files/arch/ubicom32/mach-ip7k/board-ip7160bringup.c
deleted file mode 100644
index 2527d8d7d..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-ip7k/board-ip7160bringup.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * arch/ubicom32/mach-ip7k/board-ip7160bringup.c
- *   Support for the IP7160 bringup board.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <linux/device.h>
-#include <linux/platform_device.h>
-#include <linux/gpio.h>
-#include <linux/leds.h>
-#include <linux/delay.h>
-#include <linux/input.h>
-
-#include <asm/board.h>
-#include <asm/machdep.h>
-#include <asm/ubicom32input.h>
-
-#ifdef CONFIG_SERIAL_UBI32_SERDES
-#include <asm/ubicom32suart.h>
-#endif
-
-/*
- * Use ubicom32input driver to monitor the various pushbuttons on this board.
- *
- * WPS			PD5
- * FACT_DEFAULT		PD6
- *
- * TODO: pick some ubicom understood EV_xxx define for WPS and Fact Default
- */
-static struct ubicom32input_button ip7160bringup_ubicom32input_buttons[] = {
-	{
-		.type		= EV_KEY,
-		.code		= KEY_FN_F1,
-		.gpio		= GPIO_RD_5,
-		.desc		= "WPS",
-		.active_low	= 1,
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_FN_F2,
-		.gpio		= GPIO_RD_6,
-		.desc		= "Factory Default",
-		.active_low	= 1,
-	},
-};
-
-static struct ubicom32input_platform_data ip7160bringup_ubicom32input_data = {
-	.buttons	= ip7160bringup_ubicom32input_buttons,
-	.nbuttons	= ARRAY_SIZE(ip7160bringup_ubicom32input_buttons),
-};
-
-static struct platform_device ip7160bringup_ubicom32input_device = {
-	.name	= "ubicom32input",
-	.id	= -1,
-	.dev	= {
-		.platform_data = &ip7160bringup_ubicom32input_data,
-	},
-};
-
-#ifdef CONFIG_SERIAL_UBI32_SERDES
-static struct resource ip7160bringup_ubicom32_suart_resources[] = {
-	{
-		.start	= RE,
-		.end	= RE,
-		.flags	= IORESOURCE_MEM,
-	},
-	{
-		.start	= PORT_OTHER_INT(RE),
-		.end	= PORT_OTHER_INT(RE),
-		.flags	= IORESOURCE_IRQ,
-	},
-	{
-		.start	= 250000000,
-		.end	= 250000000,
-		.flags	= UBICOM32_SUART_IORESOURCE_CLOCK,
-	},
-};
-
-static struct platform_device ip7160bringup_ubicom32_suart_device = {
-	.name		= "ubicom32suart",
-	.id		= -1,
-	.num_resources  = ARRAY_SIZE(ip7160bringup_ubicom32_suart_resources),
-	.resource	= ip7160bringup_ubicom32_suart_resources,
-};
-#endif
-
-/*
- * List of all devices in our system
- */
-static struct platform_device *ip7160bringup_devices[] __initdata = {
-#ifdef CONFIG_SERIAL_UBI32_SERDES
-	&ip7160bringup_ubicom32_suart_device,
-#endif
-	&ip7160bringup_ubicom32input_device,
-};
-
-/*
- * ip7160bringup_init
- *	Called to add the devices which we have on this board
- */
-static int __init ip7160bringup_init(void)
-{
-	board_init();
-
-	ubi_gpio_init();
-
-	printk(KERN_INFO "%s: registering device resources\n", __FUNCTION__);
-	platform_add_devices(ip7160bringup_devices, ARRAY_SIZE(ip7160bringup_devices));
-
-	return 0;
-}
-
-arch_initcall(ip7160bringup_init);
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-ip7k/board-ip7160dpf.c b/target/linux/ubicom32/files/arch/ubicom32/mach-ip7k/board-ip7160dpf.c
deleted file mode 100644
index 7f4e4f3e4..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-ip7k/board-ip7160dpf.c
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
- * arch/ubicom32/mach-ip7k/board-ip7160dpf.c
- *   Platform initialization for ip7160dpf board.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <linux/device.h>
-#include <linux/platform_device.h>
-#include <linux/delay.h>
-#include <linux/gpio.h>
-
-#include <linux/i2c.h>
-#include <linux/i2c-gpio.h>
-
-#include <linux/input.h>
-
-#include <asm/board.h>
-#include <asm/machdep.h>
-#include <asm/ubicom32hid.h>
-#include <asm/vdc_tio.h>
-#include <asm/audio.h>
-
-/*
- * Backlight on the board PD0, hardware PWM
- */
-static const struct ubicom32hid_button ip7160dpf_ubicom32hid_buttons[] = {
-	{
-		.type	= EV_KEY,
-		.code	= KEY_UP,
-		.bit	= 0,
-	},
-	{
-		.type	= EV_KEY,
-		.code	= KEY_LEFT,
-		.bit	= 1,
-	},
-	{
-		.type	= EV_KEY,
-		.code	= KEY_RIGHT,
-		.bit	= 2,
-	},
-	{
-		.type	= EV_KEY,
-		.code	= KEY_DOWN,
-		.bit	= 3,
-	},
-	{
-		.type	= EV_KEY,
-		.code	= KEY_ENTER,
-		.bit	= 4,
-	},
-	{
-		.type	= EV_KEY,
-		.code	= KEY_MENU,
-		.bit	= 5,
-	},
-	{
-		.type	= EV_KEY,
-		.code	= KEY_ESC,
-		.bit	= 7,
-	},
-};
-
-static const struct ubicom32hid_ir ip7160dpf_ubicom32hid_ircodes[] = {
-	{
-		.type		= EV_KEY,
-		.code		= KEY_UP,
-		.ir_code	= 0xF807916E
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_DOWN,
-		.ir_code	= 0xF20D916E
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_LEFT,
-		.ir_code	= 0xF609916E
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_RIGHT,
-		.ir_code	= 0xF40B916E
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_ENTER,
-		.ir_code	= 0xF50A916E
-	},
-	{	/* rotate */
-		.type		= EV_KEY,
-		.code		= KEY_FN_F1,
-		.ir_code	= 0xF906916E
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_MENU,
-		.ir_code	= 0xF708916E
-	},
-	{	/* font size */
-		.type		= EV_KEY,
-		.code		= KEY_FN_F2,
-		.ir_code	= 0xF30C916E
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_ESC,
-		.ir_code	= 0xF10E916E
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_VOLUMEUP,
-		.ir_code	= 0xF00F916E
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_VOLUMEDOWN,
-		.ir_code	= 0xED12916E
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_MUTE,
-		.ir_code	= 0xEA15916E
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_INFO,
-		.ir_code	= 0xEF10916E
-	},
-	{	/* Like */
-		.type		= EV_KEY,
-		.code		= KEY_FN_F3,
-		.ir_code	= 0xEE11916E
-	},
-	{	/* Dislike */
-		.type		= EV_KEY,
-		.code		= KEY_FN_F4,
-		.ir_code	= 0xEB14916E
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_POWER,
-		.ir_code	= 0xFD02916E
-	},
-};
-
-static struct ubicom32hid_platform_data ip7160dpf_ubicom32hid_platform_data = {
-	.gpio_reset		= GPIO_RI_5,
-	.gpio_reset_polarity	= 0,
-	.type			= UBICOM32HID_BL_TYPE_PWM,
-	.invert			= 0,
-	.default_intensity	= 128,
-	.buttons		= ip7160dpf_ubicom32hid_buttons,
-	.nbuttons		= ARRAY_SIZE(ip7160dpf_ubicom32hid_buttons),
-	.ircodes		= ip7160dpf_ubicom32hid_ircodes,
-	.nircodes		= ARRAY_SIZE(ip7160dpf_ubicom32hid_ircodes),
-};
-
-/*
- * Devices on the I2C bus
- *	This board has a "bus 2" which is isolated from the main bus by U47
- *	and pin RI0.  It should be safe to always enable bus 2 by setting
- *	RI0 to low, however, it should be noted that on all existing configurations
- *	of this board, U49 and U51 are not populated.
- */
-static struct i2c_board_info __initdata ip7160dpf_i2c_board_info[] = {
-	/*
-	 * U37, CS4350 DAC, address 0x4B, bus 2
-	 *	THIS ENTRY MUST BE FIRST
-	 */
-	{
-		.type		= "cs4350",
-		.addr		= 0x4B,
-	}
-
-	/*
-	 * U24, ubicom32hid
-	 */
-	{
-		.type		= "ubicom32hid",
-		.addr		= 0x08,
-		.platform_data	= &ip7160dpf_ubicom32hid_platform_data,
-	},
-
-	/*
-	 * U49, ISL29001 Ambient Light Sensor, address 0x44, bus 2 (may not be stuffed)
-	 */
-
-	/*
-	 * U51, S35390A RTC, address 0x30, bus 2 (may not be stuffed)
-	 */
-#ifdef CONFIG_RTC_DRV_S35390A
-	{
-		.type           = "s35390a",
-		.addr           = 0x30,
-	},
-#endif
-};
-
-/*
- * I2C bus on the board, SDA PI1, SCL PI2
- */
-static struct i2c_gpio_platform_data ip7160dpf_i2c_data = {
-	.sda_pin		= GPIO_RI_1,
-	.scl_pin		= GPIO_RI_2,
-	.sda_is_open_drain	= 0,
-	.scl_is_open_drain	= 0,
-	.scl_is_output_only	= 1,
-	.udelay			= 6,
-};
-
-static struct platform_device ip7160dpf_i2c_device = {
-	.name	= "i2c-gpio",
-	.id	= 0,
-	.dev	= {
-		.platform_data = &ip7160dpf_i2c_data,
-	},
-};
-
-/*
- * List of all devices in our system
- */
-static struct platform_device *ip7160dpf_devices[] __initdata = {
-	&ip7160dpf_i2c_device,
-};
-
-/*
- * ip7160dpf_power_off
- *	Called to turn the power off for this board
- */
-static void ip7160dpf_power_off(void)
-{
-	gpio_set_value(GPIO_RF_14, 0);
-}
-
-/*
- * ip7160dpf_init
- *	Called to add the devices which we have on this board
- */
-static int __init ip7160dpf_init(void)
-{
-	int ret;
-	struct platform_device *audio_dev;
-
-	ubi_gpio_init();
-
-	/*
-	 * Hold the POWER_HOLD line
-	 */
-	ret = gpio_request(GPIO_RF_14, "POWER_HOLD");
-	if (ret) {
-		printk(KERN_ERR "%s: could not request POWER_HOLD GPIO\n", __FUNCTION__);
-	}
-	gpio_direction_output(GPIO_RF_14, 1);
-	mach_power_off = ip7160dpf_power_off;
-
-	/*
-	 * USB SEL_HOST_USB line
-	 */
-	ret = gpio_request(GPIO_RI_13, "SEL_HOST_USB");
-	if (ret) {
-		printk(KERN_ERR "%s: could not request SEL_HOST_USB GPIO\n", __FUNCTION__);
-	}
-	gpio_direction_output(GPIO_RI_13, 0);
-
-	/*
-	 * USB/DAC nRESET line
-	 */
-	ret = gpio_request(GPIO_RI_3, "USB_DAC_nRESET");
-	if (ret) {
-		printk(KERN_ERR "%s: could not request USB_DAC_nRESET GPIO\n", __FUNCTION__);
-	}
-	gpio_direction_output(GPIO_RI_3, 0);
-	udelay(1);
-	gpio_direction_output(GPIO_RI_3, 1);
-
-	/*
-	 * I2C BUS2 Disable line
-	 */
-	ret = gpio_request(GPIO_RI_0, "DISABLE_BUS2");
-	if (ret) {
-		printk(KERN_ERR "%s: could not request DISABLE_BUS2 GPIO\n", __FUNCTION__);
-	}
-	gpio_direction_output(GPIO_RI_0, 0);
-
-	vdc_tio_init();
-
-	printk(KERN_INFO "%s: registering device resources\n", __FUNCTION__);
-	platform_add_devices(ip7160dpf_devices, ARRAY_SIZE(ip7160dpf_devices));
-
-	/*
-	 * Allocate the audio driver if we can
-	 */
-	audio_dev = audio_device_alloc("snd-ubi32-cs4350", "audio-i2sout", 0);
-	if (audio_dev) {
-		ip7160dpf_i2c_board_info[0].platform_data = audio_dev;
-	}
-
-	printk(KERN_INFO "%s: registering i2c resources\n", __FUNCTION__);
-	i2c_register_board_info(0, ip7160dpf_i2c_board_info, ARRAY_SIZE(ip7160dpf_i2c_board_info));
-
-	return 0;
-}
-
-arch_initcall(ip7160dpf_init);
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-ip7k/board-ip7160rgw.c b/target/linux/ubicom32/files/arch/ubicom32/mach-ip7k/board-ip7160rgw.c
deleted file mode 100644
index 4d50375a7..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-ip7k/board-ip7160rgw.c
+++ /dev/null
@@ -1,355 +0,0 @@
-/*
- * arch/ubicom32/mach-ip7k/board-ip7160rgw.c
- *   Platform initialization for ip7160rgw board.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <linux/device.h>
-#include <linux/platform_device.h>
-#include <linux/gpio.h>
-#include <linux/leds.h>
-#include <linux/delay.h>
-#include <linux/input.h>
-#include <linux/spi/spi.h>
-
-#include <asm/board.h>
-#include <asm/machdep.h>
-#include <asm/ubicom32input.h>
-
-#ifdef CONFIG_SERIAL_UBI32_SERDES
-#include <asm/ubicom32suart.h>
-#endif
-
-#include <asm/ubicom32-spi-gpio.h>
-#include <asm/switch-dev.h>
-
-#ifdef CONFIG_IP7160RGWLCD
-#include <linux/i2c.h>
-#include <linux/i2c-gpio.h>
-/*
- * LCD Adapter board 8007-092x support
- *
- * Touch controller
- *
- * Connected via I2C bus, interrupt on PA6
- */
-#include <linux/i2c/tsc2007.h>
-
-/*
- * ip7160rgwlcd_tsc2007_exit_platform_hw
- */
-static void ip7160rgwlcd_tsc2007_exit_platform_hw(void)
-{
-	UBICOM32_IO_PORT(RA)->ctl0 &= ~(0x03 << 17);
-	gpio_free(GPIO_RA_5);
-}
-
-/*
- * ip7160rgwlcd_tsc2007_init_platform_hw
- */
-static int ip7160rgwlcd_tsc2007_init_platform_hw(void)
-{
-	int res = gpio_request(GPIO_RA_5, "TSC2007_IRQ");
-	if (res) {
-		return res;
-	}
-
-	UBICOM32_IO_PORT(RA)->ctl0 &= ~(0x03 << 17);
-	UBICOM32_IO_PORT(RA)->ctl0 |= (0x02 << 17);
-	return 0;
-}
-
-/*
- * ip7160rgwlcd_tsc2007_get_pendown_state
- */
-static int ip7160rgwlcd_tsc2007_get_pendown_state(void)
-{
-	return !gpio_get_value(GPIO_RA_5);
-}
-
-static struct tsc2007_platform_data ip7160rgwlcd_tsc2007_data = {
-	.model			= 2007,
-	.x_plate_ohms		= 350,
-	.get_pendown_state	= ip7160rgwlcd_tsc2007_get_pendown_state,
-	.init_platform_hw	= ip7160rgwlcd_tsc2007_init_platform_hw,
-	.exit_platform_hw	= ip7160rgwlcd_tsc2007_exit_platform_hw,
-};
-
-/******************************************************************************
- * I2C bus on the board, SDA PI14, SCL PI13
- */
-static struct i2c_gpio_platform_data ip7160rgwlcd_i2c_data = {
-	.sda_pin		= GPIO_RI_14,
-	.scl_pin		= GPIO_RI_13,
-	.sda_is_open_drain	= 0,
-	.scl_is_open_drain	= 0,
-	.udelay			= 50,
-};
-
-static struct platform_device ip7160rgwlcd_i2c_device = {
-	.name	= "i2c-gpio",
-	.id	= 0,
-	.dev	= {
-		.platform_data = &ip7160rgwlcd_i2c_data,
-	},
-};
-
-static struct i2c_board_info __initdata ip7160rgwlcd_i2c_board_info[] = {
-	{
-		.type = "tsc2007",
-		.addr = 0x48,
-		.irq = 45, // RA5
-		.platform_data = &ip7160rgwlcd_tsc2007_data,
-	},
-};
-
-#endif
-
-/*
- * SPI bus over GPIO for Gigabit Ethernet Switch
- *	U58:
- *		MOSI	PE0
- *		MISO	PE1
- *		CLK	PE3
- *		CS	PE2
- */
-static struct ubicom32_spi_gpio_platform_data ip7160rgw_spi_gpio_data = {
-	.pin_mosi	= GPIO_RE_0,
-	.pin_miso	= GPIO_RE_1,
-	.pin_clk	= GPIO_RE_3,
-	.bus_num	= 0,		// We'll call this SPI bus 0
-	.num_chipselect	= 1,		// only one device on this SPI bus
-	.clk_default	= 1,
-};
-
-static struct platform_device ip7160rgw_spi_gpio_device = {
-	.name	= "ubicom32-spi-gpio",
-	.id	= 0,
-	.dev	= {
-		.platform_data = &ip7160rgw_spi_gpio_data,
-	},
-};
-
-static struct ubicom32_spi_gpio_controller_data ip7160rgw_bcm539x_controller_data = {
-	.pin_cs = GPIO_RE_2,
-};
-
-static struct switch_core_platform_data ip7160rgw_bcm539x_platform_data = {
-	.flags		= SWITCH_DEV_FLAG_HW_RESET,
-	.pin_reset	= GPIO_RE_4,
-	.name		= "bcm539x",
-};
-
-static struct spi_board_info ip7160rgw_spi_board_info[] = {
-	{
-		.modalias		= "bcm539x-spi",
-		.bus_num		= 0,
-		.chip_select		= 0,
-		.max_speed_hz		= 2000000,
-		.platform_data		= &ip7160rgw_bcm539x_platform_data,
-		.controller_data	= &ip7160rgw_bcm539x_controller_data,
-		.mode			= SPI_MODE_3,
-	}
-};
-
-/*
- * LEDs
- *
- * WLAN1		PD0	(PWM capable)
- * WLAN2		PD1
- * USB2.0		PD2
- * Status		PD3
- * WPS			PD4
- *
- * TODO: check triggers, are they generic?
- */
-static struct gpio_led ip7160rgw_gpio_leds[] = {
-	{
-		.name			= "d53:green:WLAN1",
-		.default_trigger	= "WLAN1",
-		.gpio			= GPIO_RD_0,
-		.active_low		= 1,
-	},
-	{
-		.name			= "d54:green:WLAN2",
-		.default_trigger	= "WLAN2",
-		.gpio			= GPIO_RD_1,
-		.active_low		= 1,
-	},
-	{
-		.name			= "d55:green:USB",
-		.default_trigger	= "USB",
-		.gpio			= GPIO_RD_2,
-		.active_low		= 1,
-	},
-	{
-		.name			= "d56:green:Status",
-		.default_trigger	= "Status",
-		.gpio			= GPIO_RD_3,
-		.active_low		= 1,
-	},
-	{
-		.name			= "d57:green:WPS",
-		.default_trigger	= "WPS",
-		.gpio			= GPIO_RD_4,
-		.active_low		= 1,
-	},
-};
-
-static struct gpio_led_platform_data ip7160rgw_gpio_led_platform_data = {
-	.num_leds	= 5,
-	.leds		= ip7160rgw_gpio_leds,
-};
-
-static struct platform_device ip7160rgw_gpio_leds_device = {
-	.name		= "leds-gpio",
-	.id		= -1,
-	.dev = {
-		.platform_data = &ip7160rgw_gpio_led_platform_data,
-	},
-};
-
-/*
- * Use ubicom32input driver to monitor the various pushbuttons on this board.
- *
- * WPS			PD5
- * FACT_DEFAULT		PD6
- *
- * TODO: pick some ubicom understood EV_xxx define for WPS and Fact Default
- */
-static struct ubicom32input_button ip7160rgw_ubicom32input_buttons[] = {
-	{
-		.type		= EV_KEY,
-		.code		= KEY_FN_F1,
-		.gpio		= GPIO_RD_5,
-		.desc		= "WPS",
-		.active_low	= 1,
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_FN_F2,
-		.gpio		= GPIO_RD_6,
-		.desc		= "Factory Default",
-		.active_low	= 1,
-	},
-};
-
-static struct ubicom32input_platform_data ip7160rgw_ubicom32input_data = {
-	.buttons	= ip7160rgw_ubicom32input_buttons,
-	.nbuttons	= ARRAY_SIZE(ip7160rgw_ubicom32input_buttons),
-};
-
-static struct platform_device ip7160rgw_ubicom32input_device = {
-	.name	= "ubicom32input",
-	.id	= -1,
-	.dev	= {
-		.platform_data = &ip7160rgw_ubicom32input_data,
-	},
-};
-
-#ifdef CONFIG_SERIAL_UBI32_SERDES
-static struct resource ip7160rgw_ubicom32_suart_resources[] = {
-	{
-		.start	= RE,
-		.end	= RE,
-		.flags	= IORESOURCE_MEM,
-	},
-	{
-		.start	= PORT_OTHER_INT(RE),
-		.end	= PORT_OTHER_INT(RE),
-		.flags	= IORESOURCE_IRQ,
-	},
-	{
-		.start	= 250000000,
-		.end	= 250000000,
-		.flags	= UBICOM32_SUART_IORESOURCE_CLOCK,
-	},
-};
-
-static struct platform_device ip7160rgw_ubicom32_suart_device = {
-	.name		= "ubicom32suart",
-	.id		= -1,
-	.num_resources	= ARRAY_SIZE(ip7160rgw_ubicom32_suart_resources),
-	.resource	= ip7160rgw_ubicom32_suart_resources,
-};
-#endif
-
-/*
- * List of all devices in our system
- */
-static struct platform_device *ip7160rgw_devices[] __initdata = {
-#ifdef CONFIG_SERIAL_UBI32_SERDES
-	&ip7160rgw_ubicom32_suart_device,
-#endif
-	&ip7160rgw_ubicom32input_device,
-	&ip7160rgw_gpio_leds_device,
-	&ip7160rgw_spi_gpio_device,
-#ifdef CONFIG_IP7160RGWLCD
-	&ip7160rgwlcd_i2c_device,
-#endif
-};
-
-/*
- * ip7160rgw_init
- *	Called to add the devices which we have on this board
- */
-static int __init ip7160rgw_init(void)
-{
-	board_init();
-
-	/*
-	 * Rev 1.2 boards have spi in a different place than 1.1/1.0
-	 */
-	if (strcmp(board_get_revision(), "1.2") == 0) {
-		ip7160rgw_spi_gpio_data.pin_mosi = GPIO_RD_7;
-	}
-
-	ubi_gpio_init();
-
-	/*
-	 * Reserve switch SPI CS on behalf on switch driver
-	 */
-	if (gpio_request(ip7160rgw_bcm539x_controller_data.pin_cs, "switch-bcm539x-cs")) {
-		printk(KERN_WARNING "Could not request cs of switch SPI I/F\n");
-		return -EIO;
-	}
-	gpio_direction_output(ip7160rgw_bcm539x_controller_data.pin_cs, 1);
-
-	printk(KERN_INFO "%s: registering device resources\n", __FUNCTION__);
-	platform_add_devices(ip7160rgw_devices, ARRAY_SIZE(ip7160rgw_devices));
-
-	printk(KERN_INFO "%s: registering SPI resources\n", __FUNCTION__);
-	spi_register_board_info(ip7160rgw_spi_board_info, ARRAY_SIZE(ip7160rgw_spi_board_info));
-
-#ifdef CONFIG_IP7160RGWLCD
-	printk(KERN_INFO "%s: registering i2c resources\n", __FUNCTION__);
-	i2c_register_board_info(0, ip7160rgwlcd_i2c_board_info, ARRAY_SIZE(ip7160rgwlcd_i2c_board_info));
-	printk(KERN_INFO "IP7160 RGW + LCD\n");
-#else
-	printk(KERN_INFO "IP7160 RGW\n");
-#endif
-	return 0;
-}
-
-arch_initcall(ip7160rgw_init);
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-ip7k/board-ip7500av.c b/target/linux/ubicom32/files/arch/ubicom32/mach-ip7k/board-ip7500av.c
deleted file mode 100644
index 7cd25fcd3..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-ip7k/board-ip7500av.c
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * arch/ubicom32/mach-ip7k/board-ip7500av.c
- *   Support for IP7500 Audio Video Board + CPU module board.
- *
- * This file supports the IP7500 Audio Video Board:
- *	8007-0810  Rev 1.0
- * with one of the following CPU module boards:
- *	8007-0510  Rev 1.0
- *	8007-0510A Rev 1.0 (with ethernet)
- *
- * DIP Switch SW2 configuration: (*) default
- *	POS 1: on(*) = PCI enabled, off = PCI disabled
- *	POS 2: on(*) = TTYX => PA6, off = TTYX => PF12
- *	POS 3: on(*) = TTYY => PA7, off = TTYY => PF15
- *	POS 4: unused
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- */
-
-#include <linux/platform_device.h>
-#include <linux/device.h>
-#include <linux/gpio.h>
-#include <linux/i2c.h>
-#include <linux/i2c-gpio.h>
-#include <linux/delay.h>
-#include <asm/board.h>
-#include <asm/machdep.h>
-#include <asm/ring_tio.h>
-#include <asm/vdc_tio.h>
-#include <asm/audio.h>
-#include <asm/ubi32-pcm.h>
-#include <asm/ubi32-cs4384.h>
-
-/******************************************************************************
- * Devices on the I2C bus
- *
- * BEWARE of changing the order of things in this array as we depend on
- * certain things to be in certain places.
- */
-static struct i2c_board_info __initdata ip7500av_i2c_board_info[] = {
-	/*
-	 * U6, CS4384 DAC, address 0x19
-	 */
-	{
-		.type		= "cs4384",
-		.addr		= 0x19,
-	},
-};
-
-/*
- * I2C bus on the board, SDA PD1, SCL PD2
- */
-static struct i2c_gpio_platform_data ip7500av_i2c_data = {
-	.sda_pin		= GPIO_RD_6,
-	.scl_pin		= GPIO_RD_3,
-	.sda_is_open_drain	= 0,
-	.scl_is_open_drain	= 0,
-	.udelay			= 50,
-};
-
-static struct platform_device ip7500av_i2c_device = {
-	.name	= "i2c-gpio",
-	.id	= 0,
-	.dev	= {
-		.platform_data = &ip7500av_i2c_data,
-	},
-};
-
-/*
- * List of possible mclks we can generate.  This depends on the CPU frequency.
- */
-static struct ubi32_cs4384_mclk_entry ip7500av_cs4384_mclk_entries[] = {
-	{
-		.rate	=	12288000,
-		.div	=	44,
-	},
-	{
-		.rate	=	11289600,
-		.div	=	48,
-	},
-};
-
-/*
- * List of all devices in our system
- */
-static struct platform_device *ip7500av_devices[] __initdata = {
-	&ip7500av_i2c_device,
-};
-
-/*
- * ip7500av_vdac_write
- */
-static int __init ip7500av_vdac_write(int reg, int val)
-{
-	struct i2c_adapter *adap;
-	struct i2c_msg msg[1];
-	unsigned char data[2];
-	int err;
-
-	adap = i2c_get_adapter(0);
-	if (!adap) {
-		printk(KERN_WARNING "%s: failed to get i2c adapter\n", __FUNCTION__);
-		return -ENODEV;
-	}
-	msg->addr = 0x2B;
-	msg->flags = 0;
-	msg->len = 2;
-	msg->buf = data;
-	data[0] = reg;
-	data[1] = val;
-	err = i2c_transfer(adap, msg, 1);
-	i2c_put_adapter(adap);
-	if (err >= 0) {
-		return 0;
-	}
-	return err;
-}
-
-/*
- * ip7500av_vdac_init
- *	Initializes the video DAC via I2C
- *
- * Equivalent mode line: 720x480p = 27 Mhz, 720 736 800 858 480 484 492 525
- */
-static int __init ip7500av_vdac_init(void)
-{
-	int err;
-
-	printk(KERN_INFO "Initializing ADV7393 DAC\n");
-
-	/*
-	 * Reset the VDAC
-	 */
-	if (gpio_request(GPIO_RF_6, "VDAC Reset")) {
-		printk(KERN_WARNING "%s: failed to allocate VDAC Reset\n", __FUNCTION__);
-		return -EBUSY;
-	}
-	gpio_direction_output(GPIO_RF_6, 0);
-	udelay(1);
-	gpio_set_value(GPIO_RF_6, 1);
-
-	/*
-	 * See table 100 of ADV7393 data sheet: 16-bit 525p YCrCb In, YPbPr Out
-	 */
-	err = ip7500av_vdac_write(0x17, 0x02);
-	if (err) {
-		printk(KERN_WARNING "%s: failed to write VDAC\n", __FUNCTION__);
-		return err;
-	}
-	err = ip7500av_vdac_write(0x00, 0x1c);
-	if (err) {
-		printk(KERN_WARNING "%s: failed to write VDAC\n", __FUNCTION__);
-		return err;
-	}
-	err = ip7500av_vdac_write(0x01, 0x10);
-	if (err) {
-		printk(KERN_WARNING "%s: failed to write VDAC\n", __FUNCTION__);
-		return err;
-	}
-	err = ip7500av_vdac_write(0x31, 0x01);
-	if (err) {
-		printk(KERN_WARNING "%s: failed to write VDAC\n", __FUNCTION__);
-		return err;
-	}
-#ifdef IP7500AV_VDAC_SWAP_PBPR
-	err = ip7500av_vdac_write(0x35, 0x08);
-	if (err) {
-		printk(KERN_WARNING "%s: failed to write VDAC\n", __FUNCTION__);
-		return err;
-	}
-#endif
-#ifdef IP7500AV_VDAC_FULL_RANGE
-	err = ip7500av_vdac_write(0x30, 0x02);
-	if (err) {
-		printk(KERN_WARNING "%s: failed to write VDAC\n", __FUNCTION__);
-		return err;
-	}
-#endif
-	return 0;
-}
-late_initcall(ip7500av_vdac_init);
-
-/*
- * ip7500av_init
- *	Called to add the devices which we have on this board
- */
-static int __init ip7500av_init(void)
-{
-	struct platform_device *audio_dev;
-	struct platform_device *audio_dev2;
-	struct ubi32_cs4384_platform_data *cs4384_pd;
-
-	board_init();
-
-	ubi_gpio_init();
-
-	vdc_tio_init();
-
-	printk(KERN_INFO "%s: registering device resources\n", __FUNCTION__);
-	platform_add_devices(ip7500av_devices, ARRAY_SIZE(ip7500av_devices));
-
-	/*
-	 * CS4384 DAC
-	 */
-	audio_dev = audio_device_alloc("snd-ubi32-cs4384", "audio", "audio-i2sout",
-			sizeof(struct ubi32_cs4384_platform_data));
-	if (audio_dev) {
-		/*
-		 * Attempt to figure out a good divisor.  This will only work
-		 * assuming the core frequency is compatible.
-		 */
-		int i;
-		unsigned int freq = processor_frequency();
-		for (i = 0; i < ARRAY_SIZE(ip7500av_cs4384_mclk_entries); i++) {
-			unsigned int div;
-			unsigned int rate = ip7500av_cs4384_mclk_entries[i].rate / 1000;
-			div = ((freq / rate) + 500) / 1000;
-			ip7500av_cs4384_mclk_entries[i].div = div;
-			printk("CS4384 mclk %d rate %u000Hz div %u act %u\n", i, rate, div, freq / div);
-		}
-
-		cs4384_pd = audio_device_priv(audio_dev);
-		cs4384_pd->mclk_src = UBI32_CS4384_MCLK_PWM_0;
-		cs4384_pd->n_mclk = ARRAY_SIZE(ip7500av_cs4384_mclk_entries);
-		cs4384_pd->mclk_entries = ip7500av_cs4384_mclk_entries;
-		ip7500av_i2c_board_info[0].platform_data = audio_dev;
-
-		/*
-		 * Reset the DAC
-		 */
-		if (gpio_request(GPIO_RF_4, "DAC Reset") == 0) {
-			gpio_direction_output(GPIO_RF_4, 0);
-			udelay(1);
-			gpio_direction_output(GPIO_RF_4, 1);
-		} else {
-			printk("Unable to request DAC reset GPIO\n");
-		}
-	}
-
-	/*
-	 * SPDIF port
-	 */
-	audio_dev2 = audio_device_alloc("snd-ubi32-generic", "audio", "audio-spdifout", 0);
-	if (audio_dev2) {
-		platform_device_register(audio_dev2);
-	}
-
-	/*
-	 * Register all of the devices which sit on the I2C bus
-	 */
-	printk(KERN_INFO "%s: registering i2c resources\n", __FUNCTION__);
-	i2c_register_board_info(0, ip7500av_i2c_board_info, ARRAY_SIZE(ip7500av_i2c_board_info));
-
-	printk(KERN_INFO "IP7500 Audio/Video Board\n");
-	return 0;
-}
-arch_initcall(ip7500av_init);
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-ip7k/board-ip7500iap.c b/target/linux/ubicom32/files/arch/ubicom32/mach-ip7k/board-ip7500iap.c
deleted file mode 100644
index f565cdda1..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-ip7k/board-ip7500iap.c
+++ /dev/null
@@ -1,414 +0,0 @@
-/*
- * arch/ubicom32/mach-ip7k/board-ip7500iap.c
- *   Support for IP7500 Internet Audio Player
- *
- * This file supports the IP7500 Internet Audio Player:
- *	8007-1110  Rev 1.0
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- */
-#include <linux/device.h>
-#include <linux/gpio.h>
-#include <asm/board.h>
-
-#include <linux/delay.h>
-
-#include <linux/platform_device.h>
-#include <asm/audio.h>
-#include <linux/i2c.h>
-#include <linux/i2c-gpio.h>
-
-#include <asm/ubicom32sd.h>
-#include <asm/sd_tio.h>
-
-#include <asm/ubicom32bl.h>
-
-#include <asm/machdep.h>
-
-/******************************************************************************
- * SD/IO Port F (Slot 1) platform data
- */
-static struct resource ip7500iap_portf_sd_resources[] = {
-	/*
-	 * Send IRQ
-	 */
-	[0] = {
-		/*
-		 * The init routine will query the devtree and fill this in
-		 */
-		.flags	= IORESOURCE_IRQ,
-	},
-
-	/*
-	 * Receive IRQ
-	 */
-	[1] = {
-		/*
-		 * The init routine will query the devtree and fill this in
-		 */
-		.flags	= IORESOURCE_IRQ,
-	},
-
-	/*
-	 * Memory Mapped Registers
-	 */
-	[2] = {
-		/*
-		 * The init routine will query the devtree and fill this in
-		 */
-		.flags	= IORESOURCE_MEM,
-	},
-};
-
-static struct ubicom32sd_card ip7500iap_portf_sd_cards[] = {
-	[0] = {
-		.pin_wp		= GPIO_RF_7,
-		.wp_polarity	= 1,
-		.pin_pwr	= GPIO_RF_8,
-		.pin_cd		= GPIO_RF_6,
-	},
-};
-
-static struct ubicom32sd_platform_data ip7500iap_portf_sd_platform_data = {
-	.ncards		= 1,
-	.cards		= ip7500iap_portf_sd_cards,
-};
-
-static struct platform_device ip7500iap_portf_sd_device = {
-	.name		= "ubicom32sd",
-	.id		= 0,
-	.resource	= ip7500iap_portf_sd_resources,
-	.num_resources	= ARRAY_SIZE(ip7500iap_portf_sd_resources),
-	.dev		= {
-			.platform_data = &ip7500iap_portf_sd_platform_data,
-	},
-
-};
-
-/*
- * ip7500iap_portf_sd_init
- */
-static void ip7500iap_portf_sd_init(void)
-{
-	/*
-	 * Check the device tree for the sd_tio
-	 */
-	struct sd_tio_node *sd_node = (struct sd_tio_node *)devtree_find_node("portf_sd");
-	if (!sd_node) {
-		printk(KERN_INFO "PortF SDTIO not found\n");
-		return;
-	}
-
-	/*
-	 * Fill in the resources and platform data from devtree information
-	 */
-	ip7500iap_portf_sd_resources[0].start = sd_node->dn.sendirq;
-	ip7500iap_portf_sd_resources[1].start = sd_node->dn.recvirq;
-	ip7500iap_portf_sd_resources[2].start = (u32_t)&(sd_node->regs);
-	ip7500iap_portf_sd_resources[2].end = (u32_t)&(sd_node->regs) + sizeof(sd_node->regs);
-
-	platform_device_register(&ip7500iap_portf_sd_device);
-}
-
-/******************************************************************************
- * SD/IO Port B (Slot 2) platform data
- */
-static struct resource ip7500iap_portb_sd_resources[] = {
-	/*
-	 * Send IRQ
-	 */
-	[0] = {
-		/*
-		 * The init routine will query the devtree and fill this in
-		 */
-		.flags	= IORESOURCE_IRQ,
-	},
-
-	/*
-	 * Receive IRQ
-	 */
-	[1] = {
-		/*
-		 * The init routine will query the devtree and fill this in
-		 */
-		.flags	= IORESOURCE_IRQ,
-	},
-
-	/*
-	 * Memory Mapped Registers
-	 */
-	[2] = {
-		/*
-		 * The init routine will query the devtree and fill this in
-		 */
-		.flags	= IORESOURCE_MEM,
-	},
-};
-
-static struct ubicom32sd_card ip7500iap_portb_sd_cards[] = {
-	[0] = {
-		.pin_wp		= GPIO_RB_13,
-		.wp_polarity	= 1,
-		.pin_pwr	= GPIO_RB_11,
-		.pin_cd		= GPIO_RB_12,
-	},
-};
-
-static struct ubicom32sd_platform_data ip7500iap_portb_sd_platform_data = {
-	.ncards		= 1,
-	.cards		= ip7500iap_portb_sd_cards,
-};
-
-static struct platform_device ip7500iap_portb_sd_device = {
-	.name		= "ubicom32sd",
-	.id		= 1,
-	.resource	= ip7500iap_portb_sd_resources,
-	.num_resources	= ARRAY_SIZE(ip7500iap_portb_sd_resources),
-	.dev		= {
-			.platform_data = &ip7500iap_portb_sd_platform_data,
-	},
-
-};
-
-/*
- * ip7500iap_portb_sd_init
- */
-static void ip7500iap_portb_sd_init(void)
-{
-	/*
-	 * Check the device tree for the sd_tio
-	 */
-	struct sd_tio_node *sd_node = (struct sd_tio_node *)devtree_find_node("portb_sd");
-	if (!sd_node) {
-		printk(KERN_INFO "PortB SDTIO not found\n");
-		return;
-	}
-
-	/*
-	 * Fill in the resources and platform data from devtree information
-	 */
-	ip7500iap_portb_sd_resources[0].start = sd_node->dn.sendirq;
-	ip7500iap_portb_sd_resources[1].start = sd_node->dn.recvirq;
-	ip7500iap_portb_sd_resources[2].start = (u32_t)&(sd_node->regs);
-	ip7500iap_portb_sd_resources[2].end = (u32_t)&(sd_node->regs) + sizeof(sd_node->regs);
-
-	platform_device_register(&ip7500iap_portb_sd_device);
-}
-
-/******************************************************************************
- * Touch controller
- *
- * Connected via I2C bus, interrupt on PA6
- */
-#include <linux/i2c/tsc2007.h>
-
-/*
- * ip7500iap_tsc2007_exit_platform_hw
- */
-static void ip7500iap_tsc2007_exit_platform_hw(void)
-{
-	UBICOM32_IO_PORT(RA)->ctl0 &= ~(0x03 << 19);
-	gpio_free(GPIO_RA_6);
-}
-
-/*
- * ip7500iap_tsc2007_init_platform_hw
- */
-static int ip7500iap_tsc2007_init_platform_hw(void)
-{
-	int res = gpio_request(GPIO_RA_6, "TSC2007_IRQ");
-	if (res) {
-		return res;
-	}
-
-	UBICOM32_IO_PORT(RA)->ctl0 &= ~(0x03 << 19);
-	UBICOM32_IO_PORT(RA)->ctl0 |= (0x02 << 19);
-	return 0;
-}
-
-/*
- * ip7500iap_tsc2007_get_pendown_state
- */
-static int ip7500iap_tsc2007_get_pendown_state(void)
-{
-	return !gpio_get_value(GPIO_RA_6);
-}
-
-static struct tsc2007_platform_data ip7500iap_tsc2007_data = {
-	.model			= 2007,
-	.x_plate_ohms		= 350,
-	.get_pendown_state	= ip7500iap_tsc2007_get_pendown_state,
-	.init_platform_hw	= ip7500iap_tsc2007_init_platform_hw,
-	.exit_platform_hw	= ip7500iap_tsc2007_exit_platform_hw,
-};
-
-/******************************************************************************
- * i2c devices
- *
- * DO NOT CHANGE THE ORDER HERE unless you know how this works.  There
- * are hardcoded indicies which refer to the order of drivers listed here.
- */
-static struct i2c_board_info __initdata ip7500iap_i2c_board_info[] = {
-	/*
-	 * U6, CS4350 DAC, address 0x4B
-	 */
-	{
-		.type		= "cs4350",
-		.addr		= 0x4B,
-	},
-
-	/*
-	 * U20, S35390A RTC, address 0x30
-	 */
-	{
-		.type           = "s35390a",
-		.addr           = 0x30,
-	},
-
-	/*
-	 * U9, TSC2007 Touch screen controller, address 0x49, irq RA6
-	 */
-	{
-		.type		= "tsc2007",
-		.addr		= 0x49,
-		.irq		= 46,
-		.platform_data	= &ip7500iap_tsc2007_data,
-	},
-};
-
-/*
- * I2C bus on the board, SDA PE4, SCL PE5
- */
-static struct i2c_gpio_platform_data ip7500iap_i2c_data = {
-	.sda_pin		= GPIO_RF_14,
-	.scl_pin		= GPIO_RF_13,
-	.sda_is_open_drain	= 0,
-	.scl_is_open_drain	= 0,
-	.udelay			= 50,
-};
-
-static struct platform_device ip7500iap_i2c_device = {
-	.name	= "i2c-gpio",
-	.id	= 0,
-	.dev	= {
-		.platform_data = &ip7500iap_i2c_data,
-	},
-};
-
-/******************************************************************************
- * Backlight on the board PD0, hardware PWM
- */
-static struct ubicom32bl_platform_data ip7500iap_backlight_data = {
-	.type			= UBICOM32BL_TYPE_PWM,
-	.pwm_channel		= 2,
-	.pwm_prescale		= 15,
-	.pwm_period		= 60,
-	.default_intensity	= 0x80,
-};
-
-static struct platform_device ip7500iap_backlight_device = {
-	.name	= "ubicom32bl",
-	.id	= -1,
-	.dev	= {
-		.platform_data = &ip7500iap_backlight_data,
-	},
-};
-
-/******************************************************************************
- * Devices on this board
- */
-static struct platform_device *ip7500iap_devices[] __initdata = {
-	&ip7500iap_i2c_device,
-	&ip7500iap_backlight_device,
-};
-
-/*
- * ip7500iap_power_off
- *	Called to turn the power off for this board
- */
-static void ip7500iap_power_off(void)
-{
-	gpio_set_value(GPIO_RF_11, 0);
-}
-
-/*
- * ip7500iap_init
- *	Called to add the devices which we have on this board
- */
-static int __init ip7500iap_init(void)
-{
-	struct platform_device *audio_dev;
-	struct platform_device *audio_dev2;
-	int ret;
-
-	board_init();
-
-	ubi_gpio_init();
-
-	/*
-	 * Hold the POWER_HOLD line
-	 */
-	ret = gpio_request(GPIO_RF_11, "POWER_HOLD");
-	if (ret) {
-		printk(KERN_ERR "%s: could not request POWER_HOLD GPIO\n", __FUNCTION__);
-	}
-	gpio_direction_output(GPIO_RF_11, 1);
-	mach_power_off = ip7500iap_power_off;
-
-	/*
-	 * DAC nRESET line
-	 */
-	ret = gpio_request(GPIO_RE_7, "DAC_nRESET");
-	if (ret) {
-		printk(KERN_ERR "%s: could not request DAC_nRESET GPIO\n", __FUNCTION__);
-	}
-	gpio_direction_output(GPIO_RE_7, 0);
-	udelay(1);
-	gpio_set_value(GPIO_RE_7, 1);
-
-	/*
-	 * Bring up any SDIO slots
-	 */
-	ip7500iap_portb_sd_init();
-	ip7500iap_portf_sd_init();
-
-	/*
-	 * Bring up audio devices
-	 */
-	platform_add_devices(ip7500iap_devices, ARRAY_SIZE(ip7500iap_devices));
-
-	audio_dev = audio_device_alloc("snd-ubi32-cs4350", "audio", "audio-i2sout", 0);
-	if (audio_dev) {
-		ip7500iap_i2c_board_info[0].platform_data = audio_dev;
-	}
-
-	audio_dev2 = audio_device_alloc("snd-ubi32-generic", "audio", "audio-spdifout", 0);
-	if (audio_dev2) {
-		platform_device_register(audio_dev2);
-	}
-
-	printk(KERN_INFO "%s: registering i2c resources\n", __FUNCTION__);
-	i2c_register_board_info(0, ip7500iap_i2c_board_info, ARRAY_SIZE(ip7500iap_i2c_board_info));
-
-	printk(KERN_INFO "IP7500 Internet Audio Player\n");
-
-	return 0;
-}
-
-arch_initcall(ip7500iap_init);
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-ip7k/board-ip7500media.c b/target/linux/ubicom32/files/arch/ubicom32/mach-ip7k/board-ip7500media.c
deleted file mode 100644
index 3a51aec2a..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-ip7k/board-ip7500media.c
+++ /dev/null
@@ -1,732 +0,0 @@
-/*
- * arch/ubicom32/mach-ip7k/board-ip7500media.c
- *   Board file for IP7500 media board.
- *
- * Supports the following configuration
- *	CPU Module:
- *		P/N 8007-0510 rev 1.0 NOPHY
- *		P/N 8007-0511 rev 1.1 NOPHY
- *			DIP Switch SW2 configuration:
- *				POS 1: on  = PCI enabled
- *				POS 2: off = TTYX => PF12
- *				POS 3: off = TTYY => PF15
- *				POS 4: unused
- *	Media Board:
- *		P/N 8007-0610 rev 1.0
- *
- *	LCD Adapter Board: (optional)
- *		P/N 8007-0920 rev 2.0
- *		P/N 8007-0921 rev 2.1
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <linux/device.h>
-#include <linux/platform_device.h>
-#include <linux/gpio.h>
-
-#include <linux/input.h>
-
-#include <linux/i2c.h>
-#include <linux/i2c-gpio.h>
-#include <linux/i2c/pca953x.h>
-
-#include <asm/board.h>
-#include <asm/machdep.h>
-#include <asm/ubicom32input_i2c.h>
-#include <asm/ubicom32bl.h>
-#include <asm/ubicom32lcdpower.h>
-#include <asm/vdc_tio.h>
-
-#include <asm/ubicom32sd.h>
-#include <asm/sd_tio.h>
-#include <asm/devtree.h>
-#include <asm/audio.h>
-
-#include <asm/ring_tio.h>
-
-/******************************************************************************
- * SD/IO Port F (Slot 1) platform data
- */
-static struct resource ip7500media_portf_sd_resources[] = {
-	/*
-	 * Send IRQ
-	 */
-	[0] = {
-		/*
-		 * The init routine will query the devtree and fill this in
-		 */
-		.flags	= IORESOURCE_IRQ,
-	},
-
-	/*
-	 * Receive IRQ
-	 */
-	[1] = {
-		/*
-		 * The init routine will query the devtree and fill this in
-		 */
-		.flags	= IORESOURCE_IRQ,
-	},
-
-	/*
-	 * Memory Mapped Registers
-	 */
-	[2] = {
-		/*
-		 * The init routine will query the devtree and fill this in
-		 */
-		.flags	= IORESOURCE_MEM,
-	},
-};
-
-static struct ubicom32sd_card ip7500media_portf_sd_cards[] = {
-	[0] = {
-		.pin_wp		= IP7500MEDIA_IO16,
-		.wp_polarity	= 1,
-		.pin_pwr	= IP7500MEDIA_IO20,
-		.pin_cd		= IP7500MEDIA_IO23,
-	},
-	[1] = {
-		.pin_wp		= IP7500MEDIA_IO17,
-		.wp_polarity	= 1,
-		.pin_pwr	= IP7500MEDIA_IO21,
-		.pin_cd		= IP7500MEDIA_IO24,
-	},
-};
-
-static struct ubicom32sd_platform_data ip7500media_portf_sd_platform_data = {
-	.ncards		= 2,
-	.cards		= ip7500media_portf_sd_cards,
-};
-
-static struct platform_device ip7500media_portf_sd_device = {
-	.name		= "ubicom32sd",
-	.id		= 0,
-	.resource	= ip7500media_portf_sd_resources,
-	.num_resources	= ARRAY_SIZE(ip7500media_portf_sd_resources),
-	.dev		= {
-			.platform_data = &ip7500media_portf_sd_platform_data,
-	},
-
-};
-
-/*
- * ip7500media_portf_sd_init
- */
-static void ip7500media_portf_sd_init(void)
-{
-	/*
-	 * Check the device tree for the sd_tio
-	 */
-	struct sd_tio_node *sd_node = (struct sd_tio_node *)devtree_find_node("portf_sd");
-	if (!sd_node) {
-		printk(KERN_INFO "PortF SDTIO not found\n");
-		return;
-	}
-
-	/*
-	 * Fill in the resources and platform data from devtree information
-	 */
-	ip7500media_portf_sd_resources[0].start = sd_node->dn.sendirq;
-	ip7500media_portf_sd_resources[1].start = sd_node->dn.recvirq;
-	ip7500media_portf_sd_resources[2].start = (u32_t)&(sd_node->regs);
-	ip7500media_portf_sd_resources[2].end = (u32_t)&(sd_node->regs) + sizeof(sd_node->regs);
-
-	platform_device_register(&ip7500media_portf_sd_device);
-}
-
-/******************************************************************************
- * SD/IO Port B (Slot 2) platform data
- */
-static struct resource ip7500media_portb_sd_resources[] = {
-	/*
-	 * Send IRQ
-	 */
-	[0] = {
-		/*
-		 * The init routine will query the devtree and fill this in
-		 */
-		.flags	= IORESOURCE_IRQ,
-	},
-
-	/*
-	 * Receive IRQ
-	 */
-	[1] = {
-		/*
-		 * The init routine will query the devtree and fill this in
-		 */
-		.flags	= IORESOURCE_IRQ,
-	},
-
-	/*
-	 * Memory Mapped Registers
-	 */
-	[2] = {
-		/*
-		 * The init routine will query the devtree and fill this in
-		 */
-		.flags	= IORESOURCE_MEM,
-	},
-};
-
-static struct ubicom32sd_card ip7500media_portb_sd_cards[] = {
-	[0] = {
-		.pin_wp		= IP7500MEDIA_IO19,
-		.wp_polarity	= 1,
-		.pin_pwr	= IP7500MEDIA_IO22,
-		.pin_cd		= IP7500MEDIA_IO18,
-	},
-};
-
-static struct ubicom32sd_platform_data ip7500media_portb_sd_platform_data = {
-	.ncards		= 1,
-	.cards		= ip7500media_portb_sd_cards,
-};
-
-static struct platform_device ip7500media_portb_sd_device = {
-	.name		= "ubicom32sd",
-	.id		= 1,
-	.resource	= ip7500media_portb_sd_resources,
-	.num_resources	= ARRAY_SIZE(ip7500media_portb_sd_resources),
-	.dev		= {
-			.platform_data = &ip7500media_portb_sd_platform_data,
-	},
-
-};
-
-/*
- * ip7500media_portb_sd_init
- */
-static void ip7500media_portb_sd_init(void)
-{
-	/*
-	 * Check the device tree for the sd_tio
-	 */
-	struct sd_tio_node *sd_node = (struct sd_tio_node *)devtree_find_node("portb_sd");
-	if (!sd_node) {
-		printk(KERN_INFO "PortB SDTIO not found\n");
-		return;
-	}
-
-	/*
-	 * Fill in the resources and platform data from devtree information
-	 */
-	ip7500media_portb_sd_resources[0].start = sd_node->dn.sendirq;
-	ip7500media_portb_sd_resources[1].start = sd_node->dn.recvirq;
-	ip7500media_portb_sd_resources[2].start = (u32_t)&(sd_node->regs);
-	ip7500media_portb_sd_resources[2].end = (u32_t)&(sd_node->regs) + sizeof(sd_node->regs);
-
-	platform_device_register(&ip7500media_portb_sd_device);
-}
-
-/*
- * ip7500media_u17_setup
- *	Called by I2C to tell us that u17 is setup.
- *
- * This function is called by I2C to tell us that u17 has been setup.  All
- * devices which rely on this chip being initialized (or even present) need to
- * be initialized in this function otherwise they may get initialized too early.
- *
- * Currently the only device depending on u17 is the SDIO
- */
-static int __init ip7500media_u17_setup(struct i2c_client *client, unsigned gpio, unsigned ngpio, void *context)
-{
-	/*
-	 * Initialize the Port F/Port B SD slots (only the enabled ports will init)
-	 */
-	ip7500media_portf_sd_init();
-	ip7500media_portb_sd_init();
-
-	return 0;
-}
-
-/******************************************************************************
- * LCD VGH on the board at PE6
- */
-static struct ubicom32lcdpower_platform_data ip7500media_lcdpower_data = {
-	.vgh_gpio		= GPIO_RE_7,
-	.vgh_polarity		= true,
-};
-
-static struct platform_device ip7500media_lcdpower_device = {
-	.name	= "ubicom32lcdpower",
-	.id	= -1,
-	.dev	= {
-		.platform_data = &ip7500media_lcdpower_data,
-	},
-};
-
-/******************************************************************************
- * Backlight on the board PD0, hardware PWM
- */
-static struct ubicom32bl_platform_data ip7500media_backlight_data = {
-	.type			= UBICOM32BL_TYPE_PWM,
-	.pwm_channel		= 2,
-	.pwm_prescale		= 15,
-	.pwm_period		= 60,
-	.default_intensity	= 0x80,
-};
-
-static struct platform_device ip7500media_backlight_device = {
-	.name	= "ubicom32bl",
-	.id	= -1,
-	.dev	= {
-		.platform_data = &ip7500media_backlight_data,
-	},
-};
-
-/******************************************************************************
- * Ubicom32Input on I2C, U15 MAX7310, address 0x18, 8 bits
- */
-static struct ubicom32input_i2c_button ip7500media_ubicom32input_i2c_u15_buttons[] = {
-	{
-		.type		= EV_KEY,
-		.code		= KEY_LEFT,
-		.bit		= 0,
-		.active_low	= 1,
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_RIGHT,
-		.bit		= 1,
-		.active_low	= 1,
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_UP,
-		.bit		= 2,
-		.active_low	= 1,
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_DOWN,
-		.bit		= 3,
-		.active_low	= 1,
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_ENTER,
-		.bit		= 4,
-		.active_low	= 1,
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_MENU,
-		.bit		= 5,
-		.active_low	= 1,
-	},
-	{
-		.type		= EV_KEY,
-		.code		= KEY_ESC,
-		.bit		= 6,
-		.active_low	= 1,
-	},
-};
-
-static struct ubicom32input_i2c_platform_data ip7500media_ubicom32input_i2c_u15_platform_data = {
-	.buttons	= ip7500media_ubicom32input_i2c_u15_buttons,
-	.nbuttons	= ARRAY_SIZE(ip7500media_ubicom32input_i2c_u15_buttons),
-	.name		= "Ubicom32 Input I2C U15",
-};
-
-/******************************************************************************
- * Additional GPIO chips
- */
-static struct pca953x_platform_data ip7500media_gpio_u16_platform_data = {
-	.gpio_base = IP7500MEDIA_U16_BASE,
-};
-
-static struct pca953x_platform_data ip7500media_gpio_u17_platform_data = {
-	.gpio_base = IP7500MEDIA_U17_BASE,
-	.setup = ip7500media_u17_setup,
-};
-
-static struct pca953x_platform_data ip7500media_gpio_u18_platform_data = {
-	.gpio_base = IP7500MEDIA_U18_BASE,
-};
-
-
-/******************************************************************************
- * Touch controller present on LCD Adapter board
- *
- * Connected via I2C bus, interrupt on PD1
- */
-#include <linux/i2c/tsc2007.h>
-
-/*
- * ip7500media_tsc2007_exit_platform_hw
- */
-static void ip7500media_tsc2007_exit_platform_hw(void)
-{
-	UBICOM32_IO_PORT(RD)->int_mask &= ~(1 << 11);
-	UBICOM32_IO_PORT(RD)->ctl2 &= ~(0x03 << 16);
-	gpio_free(GPIO_RD_1);
-}
-
-/*
- * ip7500media_tsc2007_init_platform_hw
- */
-static int ip7500media_tsc2007_init_platform_hw(void)
-{
-	int res = gpio_request(GPIO_RD_1, "TSC2007_IRQ");
-	if (res) {
-		return res;
-	}
-	UBICOM32_IO_PORT(RD)->function = 0;
-	UBICOM32_IO_PORT(RD)->int_mask = (1 << 11);
-	UBICOM32_IO_PORT(RD)->ctl2 &= ~(0x03 << 16);
-	UBICOM32_IO_PORT(RD)->ctl2 |= (0x02 << 16);
-
-	return 0;
-}
-
-/*
- * ip7500media_tsc2007_clear_penirq
- */
-static void ip7500media_tsc2007_clear_penirq(void)
-{
-	UBICOM32_IO_PORT(RD)->int_clr = (1 << 11);
-}
-
-/*
- * ip7500media_tsc2007_get_pendown_state
- */
-static int ip7500media_tsc2007_get_pendown_state(void)
-{
-	return !gpio_get_value(GPIO_RD_1);
-}
-
-static struct tsc2007_platform_data ip7500media_tsc2007_data = {
-	.model			= 2007,
-	.x_plate_ohms		= 350,
-	.get_pendown_state	= ip7500media_tsc2007_get_pendown_state,
-	.init_platform_hw	= ip7500media_tsc2007_init_platform_hw,
-	.exit_platform_hw	= ip7500media_tsc2007_exit_platform_hw,
-	.clear_penirq		= ip7500media_tsc2007_clear_penirq,
-};
-
-/******************************************************************************
- * Devices on the I2C bus
- *
- * BEWARE of changing the order of things in this array as we depend on
- * certain things to be in certain places.
- */
-static struct i2c_board_info __initdata ip7500media_i2c_board_info[] = {
-	/*
-	 * U6, CS4350 DAC, address 0x4B
-	 */
-	{
-		.type		= "cs4350",
-		.addr		= 0x4B,
-	},
-
-	/*
-	 * U14, S35390A RTC, address 0x30
-	 */
-	{
-		.type		= "s35390a",
-		.addr		= 0x30,
-	},
-
-	/*
-	 * U15, MAX7310 IO expander, 8 bits, address 0x18
-	 *	IO0: User I/O (J16-1) (Left)	IO4: User I/O (J16-5) (Enter)
-	 *	IO1: User I/O (J16-2) (Right)	IO5: User I/O (J16-6) (Menu)
-	 *	IO2: User I/O (J16-3) (Up)	IO6: User I/O (J16-7) (Back)
-	 *	IO3: User I/O (J16-4) (Down)	IO7: User I/O (J16-8)
-	 */
-	{
-		.type		= "ubicom32in_max7310",
-		.addr		= 0x18,
-		.platform_data	= &ip7500media_ubicom32input_i2c_u15_platform_data,
-	},
-
-	/*
-	 * U16, MAX7310 IO expander, 8 bits, address 0x1C
-	 *	IO8 : User I/O (J16-9)		IO12: User I/O (J16-17)
-	 *	IO9 : User I/O (J16-10)		IO13: User I/O (J16-18)
-	 *	IO10: User I/O (J16-15)		IO14: User I/O (J16-19)
-	 *	IO11: User I/O (J16-16)		IO15: User I/O (J16-20)
-	 */
-	{
-		.type		= "max7310",
-		.addr		= 0x1C,
-		.platform_data	= &ip7500media_gpio_u16_platform_data,
-	},
-
-	/*
-	 * U17, MAX7310 IO expander, 8 bits, address 0x1A
-	 *	IO16: SDIO1A_WP			IO20: SD1A_PWREN
-	 *	IO17: SDIO1B_WP			IO21: SD1B_PWREN
-	 *	IO18: SDIO2_CD			IO22: SD2_PWREN
-	 *	IO19: SDIO2_WP			IO23: SDIO1A_CD
-	 *
-	 */
-	{
-		.type		= "max7310",
-		.addr		= 0x1A,
-		.platform_data	= &ip7500media_gpio_u17_platform_data,
-	},
-
-	/*
-	 * U18, MAX7310 IOB expander, 8 bits, address 0x1E
-	 *	IO24: SDIO1B_CD			IO28: User I/O TP6
-	 *	IO25: User I/O TP9		IO29: User I/O TP5
-	 *	IO26: User I/O TP8		IO30: User I/O TP4
-	 *	IO27: User I/O TP7		IO31: User I/O TP3
-	 */
-	{
-		.type		= "max7310",
-		.addr		= 0x1E,
-		.platform_data	= &ip7500media_gpio_u18_platform_data,
-	},
-};
-
-/*
- * Additional I2C devices to add when a LCD adapter board is present
- */
-static struct i2c_board_info __initdata ip7500media_lcd_adapter_i2c_board_info[] = {
-	{
-		I2C_BOARD_INFO("tsc2007", 0x48),
-		.irq = PORT_OTHER_INT(RD),
-		.platform_data = &ip7500media_tsc2007_data,
-	},
-};
-
-/*
- * I2C bus on the board, SDA PE4, SCL PE5
- */
-static struct i2c_gpio_platform_data ip7500media_i2c_data = {
-	.sda_pin		= GPIO_RE_4,
-	.scl_pin		= GPIO_RE_5,
-	.sda_is_open_drain	= 0,
-	.scl_is_open_drain	= 0,
-	.udelay			= 50,
-};
-
-static struct platform_device ip7500media_i2c_device = {
-	.name	= "i2c-gpio",
-	.id	= 0,
-	.dev	= {
-		.platform_data = &ip7500media_i2c_data,
-	},
-};
-
-/*
- * Virtual Frame Buffer device for use with LCD Adapter
- */
-static struct platform_device ip7500media_vfb_device = {
-	.name	= "ubicom32vfb",
-	.id	= -1,
-};
-
-/*
- * vdc_override:
- *	0: no override (auto-detect)
- *	1: force vdc usage
- *	2: force lcd adapter usage
- */
-static int __initdata vdc_override = 0;
-
-/*
- * ip7500media_set_forcevdc
- *	Called when forcevdc is present on the kernel boot line
- */
-static int __init ip7500media_set_forcevdc(char *str)
-{
-	if (str[0] == '1') {
-		vdc_override = 1;
-	} else {
-		vdc_override = 2;
-	}
-	return 1;
-}
-
-/*
- * ip7500media_video_init
- *	Called late to determine what kind of video we have on this board
- */
-static int __init ip7500media_video_init(void)
-{
-	struct i2c_adapter *adap;
-	struct i2c_msg msg[1];
-	unsigned char *data;
-	unsigned char checksum;
-	int err;
-	int i;
-
-	if (vdc_override == 1) {
-		printk(KERN_INFO "Force VDCTIO mode\n");
-		goto no_adapter;
-	}
-	if (vdc_override == 2) {
-		printk(KERN_INFO "Force LCD Adapter Board mode\n");
-		return 0;
-	}
-
-	/*
-	 * Check to see if there is an EEPROM out there.  If we see an
-	 * EEPROM then we will assume a LCD Adapter Board (8007-092x)
-	 * exists.
-	 */
-	data = kmalloc(256, GFP_KERNEL);
-	if (!data) {
-		printk(KERN_WARNING "%s: Failed to allocate memory\n", __FUNCTION__);
-		return -ENOMEM;
-	}
-
-	adap = i2c_get_adapter(0);
-	if (!adap) {
-		printk(KERN_WARNING "%s: Failed to get i2c adapter\n", __FUNCTION__);
-		kfree(data);
-		return -ENODEV;
-	}
-	data[0] = 0;
-	msg->addr = 0x50;
-	msg->flags = 0;
-	msg->len = 1;
-	msg->buf = data;
-	err = i2c_transfer(adap, msg, 1);
-	if (err < 0) {
-		goto no_adapter;
-	}
-
-	msg->addr = 0x50;
-	msg->flags = I2C_M_RD;
-	msg->len = 256;
-	msg->buf = data;
-	err = i2c_transfer(adap, msg, 1);
-	if (err < 0) {
-		goto no_adapter;
-	}
-
-	i2c_put_adapter(adap);
-
-	/*
-	 * Verify the checksum
-	 */
-	checksum = 0xff;
-	for (i = 0; i < 255; i++) {
-		checksum ^= data[i];
-	}
-	if (checksum != data[255]) {
-		printk(KERN_WARNING "%s: Checksum mismatch\n", __FUNCTION__);
-	}
-
-	kfree(data);
-
-	/*
-	 * Bring up VFB
-	 */
-	platform_device_register(&ip7500media_vfb_device);
-
-	/*
-	 * Add the i2c devices on the LCD Adapter board.  (We have to use i2c_new_device
-	 * since it's late in the boot process.)
-	 */
-	printk(KERN_INFO "%s: registering LCD Adapter board i2c resources\n", __FUNCTION__);
-	for (i = 0; i < ARRAY_SIZE(ip7500media_lcd_adapter_i2c_board_info); i++) {
-		i2c_new_device(adap, &ip7500media_lcd_adapter_i2c_board_info[i]);
-	}
-
-	i2c_put_adapter(adap);
-
-	return 0;
-
-	/*
-	 * No LCD Adapter board, bring up VDC
-	 */
-no_adapter:
-	vdc_tio_init();
-	return 0;
-}
-late_initcall(ip7500media_video_init);
-__setup("forcevdc=", ip7500media_set_forcevdc);
-
-/*
- * ip7500media_init
- *	Called to add the devices which we have on this board
- */
-static int __init ip7500media_init(void)
-{
-	struct platform_device *audio_dev;
-	int have_ethernet = (devtree_find_node("eth_lan") != 0);
-
-	board_init();
-
-	ubi_gpio_init();
-
-#ifdef CONFIG_UIO_UBICOM32RING
-	ring_tio_init("decoder_ring");
-#endif
-
-	/*
-	 * Register all of the devices we have on this board
-	 */
-	printk(KERN_INFO "%s: registering device resources\n", __FUNCTION__);
-	platform_device_register(&ip7500media_i2c_device);
-	platform_device_register(&ip7500media_backlight_device);
-
-	/*
-	 * If ethernet doesn't exist then we can init the lcdpower
-	 */
-	if (!have_ethernet) {
-		platform_device_register(&ip7500media_lcdpower_device);
-	}
-
-	/*
-	 * Allocate the audio drivers.  SPDIF not supported on boards with ethernet.
-	 */
-	audio_dev = audio_device_alloc("snd-ubi32-cs4350", "audio", "audio-i2sout", 0);
-	if (audio_dev) {
-		ip7500media_i2c_board_info[0].platform_data = audio_dev;
-	}
-
-	if (!have_ethernet) {
-		struct platform_device *audio_dev2;
-
-		audio_dev2 = audio_device_alloc("snd-ubi32-generic", "audio", "audio-spdifout", 0);
-		if (audio_dev2) {
-			platform_device_register(audio_dev2);
-		}
-	}
-
-	/*
-	 * Register all of the devices which sit on the I2C bus
-	 */
-	printk(KERN_INFO "%s: registering i2c resources\n", __FUNCTION__);
-	i2c_register_board_info(0, ip7500media_i2c_board_info, ARRAY_SIZE(ip7500media_i2c_board_info));
-
-	/*
-	 * We have to initialize the SDIO after the I2C IOB gets setup.  SDIO is initialized in
-	 * ip7500media_u17_setup
-	 */
-
-	printk("IP7500 Media Board\n");
-
-	return 0;
-}
-
-arch_initcall(ip7500media_init);
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-ip7k/board-ip7500module.c b/target/linux/ubicom32/files/arch/ubicom32/mach-ip7k/board-ip7500module.c
deleted file mode 100644
index c8c223a9f..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-ip7k/board-ip7500module.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * arch/ubicom32/mach-ip7k/board-ip7500module.c
- *   Support for IP7500 CPU module board.
- *
- * This file supports the IP7500 CPU module board:
- *	8007-0510  Rev 1.0
- *	8007-0510A Rev 1.0 (with ethernet)
- *
- * DIP Switch SW2 configuration: (*) default
- *	POS 1: on(*) = PCI enabled, off = PCI disabled
- *	POS 2: on(*) = TTYX => PA6, off = TTYX => PF12
- *	POS 3: on(*) = TTYY => PA7, off = TTYY => PF15
- *	POS 4: unused
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <linux/device.h>
-#include <linux/gpio.h>
-#include <asm/board.h>
-
-/*
- * ip7500module_init
- *	Called to add the devices which we have on this board
- */
-static int __init ip7500module_init(void)
-{
-	board_init();
-
-	ubi_gpio_init();
-
-	return 0;
-}
-
-arch_initcall(ip7500module_init);
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mach-ip7k/board-ip7500wspkr.c b/target/linux/ubicom32/files/arch/ubicom32/mach-ip7k/board-ip7500wspkr.c
deleted file mode 100644
index 7f27933fa..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mach-ip7k/board-ip7500wspkr.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * arch/ubicom32/mach-ip7k/board-ip7500wspkr.c
- *   Support for IP7500 Wireless Speaker board.
- *
- * This file supports the IP7500 Wireless Speaker board:
- *	8007-1210  Rev 1.0
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- */
-#include <linux/device.h>
-#include <linux/gpio.h>
-#include <asm/board.h>
-
-#include <linux/platform_device.h>
-#include <asm/audio.h>
-#include <linux/i2c.h>
-#include <linux/i2c-gpio.h>
-
-static struct i2c_board_info __initdata ip7500wspkr_i2c_board_info[] = {
-	/*
-	 * U6, CS4350 DAC, address 0x4B
-	 */
-	{
-		.type		= "cs4350",
-		.addr		= 0x4B,
-	},
-};
-
-/*
- * I2C bus on the board, SDA PE4, SCL PE5
- */
-static struct i2c_gpio_platform_data ip7500wspkr_i2c_data = {
-	.sda_pin		= GPIO_RD_5,
-	.scl_pin		= GPIO_RD_6,
-	.sda_is_open_drain	= 0,
-	.scl_is_open_drain	= 0,
-	.udelay			= 50,
-};
-
-static struct platform_device ip7500wspkr_i2c_device = {
-	.name	= "i2c-gpio",
-	.id	= 0,
-	.dev	= {
-		.platform_data = &ip7500wspkr_i2c_data,
-	},
-};
-
-static struct platform_device *ip7500wspkr_devices[] __initdata = {
-	&ip7500wspkr_i2c_device,
-};
-
-/*
- * ip7500wspkr_init
- *	Called to add the devices which we have on this board
- */
-static int __init ip7500wspkr_init(void)
-{
-	struct platform_device *audio_dev;
-	struct platform_device *audio_dev2;
-
-	board_init();
-
-	ubi_gpio_init();
-
-	platform_add_devices(ip7500wspkr_devices, ARRAY_SIZE(ip7500wspkr_devices));
-
-	audio_dev = audio_device_alloc("snd-ubi32-cs4350", "audio", "audio-i2sout", 0);
-	if (audio_dev) {
-		ip7500wspkr_i2c_board_info[0].platform_data = audio_dev;
-	}
-
-	audio_dev2 = audio_device_alloc("snd-ubi32-generic", "audio", "audio-spdifout", 0);
-	if (audio_dev2) {
-		platform_device_register(audio_dev2);
-	}
-
-	printk(KERN_INFO "%s: registering i2c resources\n", __FUNCTION__);
-	i2c_register_board_info(0, ip7500wspkr_i2c_board_info, ARRAY_SIZE(ip7500wspkr_i2c_board_info));
-
-	printk(KERN_INFO "IP7500 Wireless Speaker Board\n");
-
-	return 0;
-}
-
-arch_initcall(ip7500wspkr_init);
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mm/Makefile b/target/linux/ubicom32/files/arch/ubicom32/mm/Makefile
deleted file mode 100644
index 222128d2b..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mm/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# arch/ubicom32/mm/Makefile
-#	<TODO: Replace with short file description>
-#
-# (C) Copyright 2009, Ubicom, Inc.
-#
-# This file is part of the Ubicom32 Linux Kernel Port.
-#
-# The Ubicom32 Linux Kernel Port 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.
-#
-# The Ubicom32 Linux Kernel Port is distributed in the hope that it
-# will be useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
-# the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with the Ubicom32 Linux Kernel Port.  If not,
-# see <http://www.gnu.org/licenses/>.
-#
-# Ubicom32 implementation derived from (with many thanks):
-#   arch/m68knommu
-#   arch/blackfin
-#   arch/parisc
-#
-#
-# Makefile for the linux m68knommu specific parts of the memory manager.
-#
-
-obj-y += init.o fault.o memory.o kmap.o ocm-alloc.o
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mm/fault.c b/target/linux/ubicom32/files/arch/ubicom32/mm/fault.c
deleted file mode 100644
index ce6b1c760..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mm/fault.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * arch/ubicom32/mm/fault.c
- *   Ubicom32 architecture page fault implementation.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *  Copyright (C) 1998  D. Jeff Dionne <jeff@lineo.ca>,
- *  Copyright (C) 2000  Lineo, Inc.  (www.lineo.com)
- *
- *  Based on:
- *
- *  linux/arch/m68k/mm/fault.c
- *
- *  Copyright (C) 1995  Hamish Macdonald
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#include <linux/module.h>
-#include <linux/mman.h>
-#include <linux/mm.h>
-#include <linux/kernel.h>
-#include <linux/ptrace.h>
-
-#include <asm/system.h>
-#include <asm/pgtable.h>
-
-extern void die_if_kernel(char *, struct pt_regs *, long);
-
-/*
- * This routine handles page faults.  It determines the problem, and
- * then passes it off to one of the appropriate routines.
- *
- * error_code:
- *	bit 0 == 0 means no page found, 1 means protection fault
- *	bit 1 == 0 means read, 1 means write
- *
- * If this routine detects a bad access, it returns 1, otherwise it
- * returns 0.
- */
-asmlinkage int do_page_fault(struct pt_regs *regs, unsigned long address,
-			      unsigned long error_code)
-{
-#ifdef DEBUG
-	printk (KERN_DEBUG "regs->sr=%#x, regs->pc=%#lx, address=%#lx, %ld\n",
-		regs->sr, regs->pc, address, error_code);
-#endif
-
-	/*
-	 * Oops. The kernel tried to access some bad page. We'll have to
-	 * terminate things with extreme prejudice.
-	 */
-	if ((unsigned long) address < PAGE_SIZE) {
-		printk(KERN_ALERT "Unable to handle kernel NULL pointer dereference");
-	} else
-		printk(KERN_ALERT "Unable to handle kernel access");
-	printk(KERN_ALERT " at virtual address %08lx\n",address);
-	die_if_kernel("Oops", regs, error_code);
-	do_exit(SIGKILL);
-
-	return 1;
-}
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mm/init.c b/target/linux/ubicom32/files/arch/ubicom32/mm/init.c
deleted file mode 100644
index c48683541..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mm/init.c
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * arch/ubicom32/mm/init.c
- *   Ubicom32 architecture virtual memory initialization.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *  Copyright (C) 1998  D. Jeff Dionne <jeff@lineo.ca>,
- *                      Kenneth Albanowski <kjahds@kjahds.com>,
- *  Copyright (C) 2000  Lineo, Inc.  (www.lineo.com)
- *
- *  Based on:
- *
- *  linux/arch/m68k/mm/init.c
- *
- *  Copyright (C) 1995  Hamish Macdonald
- *
- *  JAN/1999 -- hacked to support ColdFire (gerg@snapgear.com)
- *  DEC/2000 -- linux 2.4 support <davidm@snapgear.com>
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#include <linux/signal.h>
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/string.h>
-#include <linux/types.h>
-#include <linux/ptrace.h>
-#include <linux/mman.h>
-#include <linux/mm.h>
-#include <linux/swap.h>
-#include <linux/init.h>
-#include <linux/highmem.h>
-#include <linux/pagemap.h>
-#include <linux/bootmem.h>
-#include <linux/slab.h>
-
-#include <asm/setup.h>
-#include <asm/segment.h>
-#include <asm/page.h>
-#include <asm/pgtable.h>
-#include <asm/system.h>
-#include <asm/machdep.h>
-#include <asm/ocm-alloc.h>
-#include <asm/processor.h>
-
-#undef DEBUG
-
-extern void die_if_kernel(char *,struct pt_regs *,long);
-extern void free_initmem(void);
-
-/*
- * BAD_PAGE is the page that is used for page faults when linux
- * is out-of-memory. Older versions of linux just did a
- * do_exit(), but using this instead means there is less risk
- * for a process dying in kernel mode, possibly leaving a inode
- * unused etc..
- *
- * BAD_PAGETABLE is the accompanying page-table: it is initialized
- * to point to BAD_PAGE entries.
- *
- * ZERO_PAGE is a special page that is used for zero-initialized
- * data and COW.
- */
-static unsigned long empty_bad_page_table;
-
-static unsigned long empty_bad_page;
-
-unsigned long empty_zero_page;
-
-void show_mem(void)
-{
-    unsigned long i;
-    int free = 0, total = 0, reserved = 0, shared = 0;
-    int cached = 0;
-
-    printk(KERN_INFO "\nMem-info:\n");
-    show_free_areas();
-    i = max_mapnr;
-    while (i-- > 0) {
-	total++;
-	if (PageReserved(mem_map+i))
-	    reserved++;
-	else if (PageSwapCache(mem_map+i))
-	    cached++;
-	else if (!page_count(mem_map+i))
-	    free++;
-	else
-	    shared += page_count(mem_map+i) - 1;
-    }
-    printk(KERN_INFO "%d pages of RAM\n",total);
-    printk(KERN_INFO "%d free pages\n",free);
-    printk(KERN_INFO "%d reserved pages\n",reserved);
-    printk(KERN_INFO "%d pages shared\n",shared);
-    printk(KERN_INFO "%d pages swap cached\n",cached);
-}
-
-extern unsigned long memory_start;
-extern unsigned long memory_end;
-extern char __ocm_free_begin;
-extern char __ocm_free_end;
-
-/*
- * paging_init() continues the virtual memory environment setup which
- * was begun by the code in arch/head.S.
- * The parameters are pointers to where to stick the starting and ending
- * addresses of available kernel virtual memory.
- */
-void __init paging_init(void)
-{
-	/*
-	 * Make sure start_mem is page aligned, otherwise bootmem and
-	 * page_alloc get different views of the world.
-	 */
-#ifdef DEBUG
-	unsigned long start_mem = PAGE_ALIGN(memory_start);
-#endif
-	unsigned long end_mem   = memory_end & PAGE_MASK;
-
-#ifdef DEBUG
-	printk (KERN_DEBUG "start_mem is %#lx\nvirtual_end is %#lx\n",
-		start_mem, end_mem);
-#endif
-
-	/*
-	 * Initialize the bad page table and bad page to point
-	 * to a couple of allocated pages.
-	 */
-	empty_bad_page_table = (unsigned long)alloc_bootmem_pages(PAGE_SIZE);
-	empty_bad_page = (unsigned long)alloc_bootmem_pages(PAGE_SIZE);
-	empty_zero_page = (unsigned long)alloc_bootmem_pages(PAGE_SIZE);
-	memset((void *)empty_zero_page, 0, PAGE_SIZE);
-
-	/*
-	 * TODO: enable setting up for user memory management interface.
-	 */
-
-#ifdef DEBUG
-	printk (KERN_DEBUG "before free_area_init\n");
-
-	printk (KERN_DEBUG "free_area_init -> start_mem is %#lx\nvirtual_end is %#lx\n",
-		start_mem, end_mem);
-#endif
-
-	{
-		unsigned long zones_size[MAX_NR_ZONES] = {0, };
-#ifdef CONFIG_ZONE_DMA
-		zones_size[ZONE_DMA] = OCMSIZE >> PAGE_SHIFT;
-#endif
-		zones_size[ZONE_NORMAL] = (end_mem - PAGE_OFFSET) >> PAGE_SHIFT;
-#ifdef CONFIG_HIGHMEM
-		zones_size[ZONE_HIGHMEM] = 0;
-#endif
-		free_area_init(zones_size);
-	}
-}
-
-void __init mem_init(void)
-{
-	int codek = 0, datak = 0, initk = 0;
-	unsigned long tmp, ram_start, ram_end, len;
-	extern char _etext, _stext, _sdata, _ebss, __init_begin, __init_end;
-
-	unsigned long start_mem = memory_start; /* DAVIDM - these must start at end of kernel */
-	unsigned long end_mem   = memory_end; /* DAVIDM - this must not include kernel stack at top */
-	processor_dram(&ram_start, &ram_end);
-	len = (ram_end - ram_start) + OCMSIZE;
-#ifdef DEBUG
-	printk(KERN_DEBUG "Mem_init: start=%lx, end=%lx\n", start_mem, end_mem);
-#endif
-
-	end_mem &= PAGE_MASK;
-	high_memory = (void *) end_mem;
-
-	start_mem = PAGE_ALIGN(start_mem);
-	max_mapnr = num_physpages = (((unsigned long) high_memory) - PAGE_OFFSET) >> PAGE_SHIFT;
-
-	/* this will put all memory onto the freelists */
-#ifdef CONFIG_ZONE_DMA
-	{
-		unsigned long ocm_free_begin = (unsigned long)&__ocm_free_begin;
-		unsigned long ocm_free_end = (unsigned long)&__ocm_free_end;
-		unsigned long zone_dma_begin = (ocm_free_begin + PAGE_SIZE - 1) & PAGE_MASK;
-		unsigned long zone_dma_end = ocm_free_end & PAGE_MASK;
-		if (zone_dma_end > zone_dma_begin)
-			free_bootmem(zone_dma_begin, zone_dma_end-zone_dma_begin);
-	}
-#endif
-	totalram_pages = free_all_bootmem();
-
-	codek = (&_etext - &_stext) >> 10;
-	datak = (&_ebss - &_sdata) >> 10;
-	initk = (&__init_begin - &__init_end) >> 10;
-
-	tmp = nr_free_pages() << PAGE_SHIFT;
-	printk(KERN_INFO "Memory available: %luk/%luk RAM, (%dk kernel code, %dk data)\n",
-	       tmp >> 10,
-	       len >> 10,
-	       codek,
-	       datak
-	       );
-
-}
-
-#ifdef CONFIG_BLK_DEV_INITRD
-void free_initrd_mem(unsigned long start, unsigned long end)
-{
-	int pages = 0;
-	for (; start < end; start += PAGE_SIZE) {
-		ClearPageReserved(virt_to_page(start));
-		init_page_count(virt_to_page(start));
-		free_page(start);
-		totalram_pages++;
-		pages++;
-	}
-	printk (KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages);
-}
-#endif
-
-void
-free_initmem()
-{
-#ifdef CONFIG_RAMKERNEL
-	unsigned long addr;
-	extern char __init_begin, __init_end;
-	/*
-	 * The following code should be cool even if these sections
-	 * are not page aligned.
-	 */
-	addr = PAGE_ALIGN((unsigned long)(&__init_begin));
-	/* next to check that the page we free is not a partial page */
-	for (; addr + PAGE_SIZE < (unsigned long)(&__init_end); addr +=PAGE_SIZE) {
-		ClearPageReserved(virt_to_page(addr));
-		init_page_count(virt_to_page(addr));
-		free_page(addr);
-		totalram_pages++;
-	}
-	printk(KERN_NOTICE "Freeing unused kernel memory: %ldk freed (0x%x - 0x%x)\n",
-			(addr - PAGE_ALIGN((long) &__init_begin)) >> 10,
-			(int)(PAGE_ALIGN((unsigned long)(&__init_begin))),
-			(int)(addr - PAGE_SIZE));
-#endif
-}
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mm/kmap.c b/target/linux/ubicom32/files/arch/ubicom32/mm/kmap.c
deleted file mode 100644
index 48b489ff1..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mm/kmap.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * arch/ubicom32/mm/kmap.c
- *   Ubicom32 architecture non-mmu ioremap and friends implementation.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- * Copyright (C) 2000 Lineo, <davidm@snapgear.com>
- * Copyright (C) 2000-2002 David McCullough <davidm@snapgear.com>
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#include <linux/module.h>
-#include <linux/mm.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/types.h>
-#include <linux/slab.h>
-#include <linux/vmalloc.h>
-
-#include <asm/setup.h>
-#include <asm/segment.h>
-#include <asm/page.h>
-#include <asm/pgalloc.h>
-#include <asm/io.h>
-#include <asm/system.h>
-
-#undef DEBUG
-
-/*
- * Map some physical address range into the kernel address space.
- */
-void *__ioremap(unsigned long physaddr, unsigned long size, int cacheflag)
-{
-	return (void *)physaddr;
-}
-
-/*
- * Unmap a ioremap()ed region again.
- */
-void iounmap(void *addr)
-{
-}
-
-/*
- * __iounmap unmaps nearly everything, so be careful
- * it doesn't free currently pointer/page tables anymore but it
- * wans't used anyway and might be added later.
- */
-void __iounmap(void *addr, unsigned long size)
-{
-}
-
-/*
- * Set new cache mode for some kernel address space.
- * The caller must push data for that range itself, if such data may already
- * be in the cache.
- */
-void kernel_set_cachemode(void *addr, unsigned long size, int cmode)
-{
-}
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mm/memory.c b/target/linux/ubicom32/files/arch/ubicom32/mm/memory.c
deleted file mode 100644
index 17075ff53..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mm/memory.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * arch/ubicom32/mm/memory.c
- *   Ubicom32 architecture kernel_map() implementation.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *  Copyright (C) 1998  Kenneth Albanowski <kjahds@kjahds.com>,
- *  Copyright (C) 1999-2002, Greg Ungerer (gerg@snapgear.com)
- *
- *  Based on:
- *
- *  linux/arch/m68k/mm/memory.c
- *
- *  Copyright (C) 1995  Hamish Macdonald
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#include <linux/module.h>
-#include <linux/mm.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/types.h>
-#include <linux/slab.h>
-
-#include <asm/segment.h>
-#include <asm/page.h>
-#include <asm/pgtable.h>
-#include <asm/system.h>
-
-/*
- * Map some physical address range into the kernel address space.
- * The code is copied and adapted from map_chunk().
- */
-
-unsigned long kernel_map(unsigned long paddr, unsigned long size,
-			 int nocacheflag, unsigned long *memavailp )
-{
-	return paddr;
-}
diff --git a/target/linux/ubicom32/files/arch/ubicom32/mm/ocm-alloc.c b/target/linux/ubicom32/files/arch/ubicom32/mm/ocm-alloc.c
deleted file mode 100644
index 5a10c2938..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/mm/ocm-alloc.c
+++ /dev/null
@@ -1,487 +0,0 @@
-/*
- * arch/ubicom32/mm/ocm-alloc.c
- *	OCM allocator for Uibcom32 On-Chip memory
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *  Copyright 2004-2008 Analog Devices Inc.
- *
- *  Based on:
- *
- *  arch/blackfin/mm/sram-alloc.c
- *
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/miscdevice.h>
-#include <linux/ioport.h>
-#include <linux/fcntl.h>
-#include <linux/init.h>
-#include <linux/poll.h>
-#include <linux/proc_fs.h>
-#include <linux/mutex.h>
-#include <linux/rtc.h>
-#include <asm/ocm-alloc.h>
-
-#if 0
-#define DEBUGP printk
-#else
-#define DEBUGP(fmt, a...)
-#endif
-/*
- * the data structure for OCM heap pieces
- */
-struct ocm_piece {
-	void *paddr;
-	int size;
-	pid_t pid;
-	struct ocm_piece *next;
-};
-
-/*
- * struct ocm_heap
- */
-struct ocm_heap {
-	struct ocm_piece free_head;
-	struct ocm_piece used_head;
-	struct mutex lock;
-};
-
-static struct ocm_heap ocm_inst_heap;
-int ubi32_ocm_skbuf_max = 21, ubi32_ocm_skbuf, ubi32_ddr_skbuf;
-
-/*
- * OCM area for storing code
- */
-extern asmlinkage void *__ocm_free_begin;
-extern asmlinkage void *__ocm_free_end;
-extern asmlinkage void *__ocm_inst_heap_begin;
-extern asmlinkage void *__ocm_inst_heap_end;
-#define OCM_INST_HEAP_BEGIN ((unsigned int)&__ocm_inst_heap_begin)
-#define OCM_INST_HEAP_END ((unsigned int)&__ocm_inst_heap_end)
-#define OCM_INST_HEAP_LENGTH (OCM_INST_HEAP_END - OCM_INST_HEAP_BEGIN)
-
-static struct kmem_cache *ocm_piece_cache;
-
-/*
- * _ocm_heap_init()
- */
-static int __init _ocm_heap_init(struct ocm_heap *ocmh,
-				  unsigned int start,
-				  unsigned int size)
-{
-	ocmh->free_head.next = kmem_cache_alloc(ocm_piece_cache, GFP_KERNEL);
-
-	if (!ocmh->free_head.next)
-		return -1;
-
-	ocmh->free_head.next->paddr = (void *)start;
-	ocmh->free_head.next->size = size;
-	ocmh->free_head.next->pid = 0;
-	ocmh->free_head.next->next = 0;
-
-	ocmh->used_head.next = NULL;
-
-	/* mutex initialize */
-	mutex_init(&ocmh->lock);
-
-	return 0;
-}
-
-/*
- * _ocm_alloc_init()
- *
- * starts the ocm heap(s)
- */
-static int __init _ocm_alloc_init(void)
-{
-	if (OCM_INST_HEAP_LENGTH) {
-		ocm_piece_cache = kmem_cache_create("ocm_piece_cache",
-						    sizeof(struct ocm_piece),
-						    0, SLAB_PANIC, NULL);
-
-		if (_ocm_heap_init(&ocm_inst_heap,
-				   OCM_INST_HEAP_BEGIN,
-				   OCM_INST_HEAP_LENGTH) == 0)
-			printk(KERN_INFO "OCM Instruction Heap %d KB\n",
-			       OCM_INST_HEAP_LENGTH >> 10);
-		else
-			printk(KERN_INFO "Failed to initialize OCM "
-			       "Instruction Heap\n");
-
-	} else
-		printk(KERN_INFO "No space available for OCM "
-		       "Instruction Heap\n");
-
-	return 0;
-}
-pure_initcall(_ocm_alloc_init);
-
-/*
- * _ocm_alloc()
- *	generic alloc a block in the ocm heap, if successful
- *	returns the pointer.
- */
-static void *_ocm_alloc(size_t size, pid_t pid, struct ocm_heap *ocmheap)
-{
-	struct ocm_piece *pslot, *plast, *pavail;
-	struct ocm_piece *pfree_head = &ocmheap->free_head;
-	struct ocm_piece *pused_head = &ocmheap->used_head;
-
-	if (size <= 0 || !pfree_head || !pused_head)
-		return NULL;
-
-	/* Align the size */
-	size = (size + 3) & ~3;
-
-	pslot = pfree_head->next;
-	plast = pfree_head;
-
-	/*
-	 * search an available piece slot
-	 */
-	while (pslot != NULL && size > pslot->size) {
-		plast = pslot;
-		pslot = pslot->next;
-	}
-
-	if (!pslot)
-		return NULL;
-
-	if (pslot->size == size) {
-		/*
-		 * Unlink this block from the list
-		 */
-		plast->next = pslot->next;
-		pavail = pslot;
-	} else {
-		/*
-		 * Split this block in two.
-		 */
-		pavail = kmem_cache_alloc(ocm_piece_cache, GFP_KERNEL);
-
-		if (!pavail)
-			return NULL;
-
-		pavail->paddr = pslot->paddr;
-		pavail->size = size;
-		pslot->paddr += size;
-		pslot->size -= size;
-	}
-
-	pavail->pid = pid;
-
-	pslot = pused_head->next;
-	plast = pused_head;
-
-	/*
-	 * insert new piece into used piece list !!!
-	 */
-	while (pslot != NULL && pavail->paddr < pslot->paddr) {
-		plast = pslot;
-		pslot = pslot->next;
-	}
-
-	pavail->next = pslot;
-	plast->next = pavail;
-
-	DEBUGP("_ocm_alloc %d bytes at %p from in %p",
-	       size, pavail->paddr, ocmheap);
-
-	return pavail->paddr;
-}
-
-#if 0
-/* Allocate the largest available block.  */
-static void *_ocm_alloc_max(struct ocm_heap *ocmheap,
-			     unsigned long *psize)
-{
-	struct ocm_piece *pfree_head = &ocmheap->free_head;
-	struct ocm_piece *pslot, *pmax;
-
-	pmax = pslot = pfree_head->next;
-
-	/* search an available piece slot */
-	while (pslot != NULL) {
-		if (pslot->size > pmax->size)
-			pmax = pslot;
-		pslot = pslot->next;
-	}
-
-	if (!pmax)
-		return NULL;
-
-	*psize = pmax->size;
-
-	return _ocm_alloc(*psize, ocmheap);
-}
-#endif
-
-/*
- * _ocm_free()
- *	generic free a block in the ocm heap, if successful
- */
-static int _ocm_free(const void *addr,
-		     struct ocm_heap *ocmheap)
-{
-	struct ocm_piece *pslot, *plast, *pavail;
-	struct ocm_piece *pfree_head = &ocmheap->free_head;
-	struct ocm_piece *pused_head = &ocmheap->used_head;
-
-	/* search the relevant memory slot */
-	pslot = pused_head->next;
-	plast = pused_head;
-
-	/* search an available piece slot */
-	while (pslot != NULL && pslot->paddr != addr) {
-		plast = pslot;
-		pslot = pslot->next;
-	}
-
-	if (!pslot) {
-		DEBUGP("_ocm_free %p  not found in %p", addr, ocmheap);
-		return -1;
-	}
-	DEBUGP("_ocm_free %p from in %p", addr, ocmheap);
-
-	plast->next = pslot->next;
-	pavail = pslot;
-	pavail->pid = 0;
-
-	/* insert free pieces back to the free list */
-	pslot = pfree_head->next;
-	plast = pfree_head;
-
-	while (pslot != NULL && addr > pslot->paddr) {
-		plast = pslot;
-		pslot = pslot->next;
-	}
-
-	if (plast != pfree_head &&
-	    plast->paddr + plast->size == pavail->paddr) {
-		plast->size += pavail->size;
-		kmem_cache_free(ocm_piece_cache, pavail);
-	} else {
-		pavail->next = plast->next;
-		plast->next = pavail;
-		plast = pavail;
-	}
-
-	if (pslot && plast->paddr + plast->size == pslot->paddr) {
-		plast->size += pslot->size;
-		plast->next = pslot->next;
-		kmem_cache_free(ocm_piece_cache, pslot);
-	}
-
-	return 0;
-}
-
-/*
- * ocm_inst_alloc()
- *
- *	allocates a block of size in the ocm instrction heap, if
- *	successful returns address allocated.
- */
-void *ocm_inst_alloc(size_t size, pid_t pid)
-{
-	void *addr;
-
-	if (!OCM_INST_HEAP_LENGTH)
-		return NULL;
-
-
-	mutex_lock(&ocm_inst_heap.lock);
-
-	addr = _ocm_alloc(size, pid, &ocm_inst_heap);
-
-	mutex_unlock(&ocm_inst_heap.lock);
-
-	return addr;
-}
-EXPORT_SYMBOL(ocm_inst_alloc);
-
-/*
- * ocm_inst_free()
- *	free a block in the ocm instrction heap, returns 0 if successful.
- */
-int ocm_inst_free(const void *addr)
-{
-	int ret;
-
-	if (!OCM_INST_HEAP_LENGTH)
-		return -1;
-
-	mutex_lock(&ocm_inst_heap.lock);
-
-	ret = _ocm_free(addr, &ocm_inst_heap);
-
-	mutex_unlock(&ocm_inst_heap.lock);
-
-	return ret;
-}
-EXPORT_SYMBOL(ocm_inst_free);
-
-/*
- * ocm_free()
- *	free a block in one of the ocm heaps, returns 0 if successful.
- */
-int ocm_free(const void *addr)
-{
-	if (addr >= (void *)OCM_INST_HEAP_BEGIN
-		 && addr < (void *)(OCM_INST_HEAP_END))
-		return ocm_inst_free(addr);
-	else
-		return -1;
-}
-EXPORT_SYMBOL(ocm_free);
-
-
-#ifdef CONFIG_PROC_FS
-/* Need to keep line of output the same.  Currently, that is 46 bytes
- * (including newline).
- */
-static int _ocm_proc_read(char *buf, int *len, int count, const char *desc,
-			   struct ocm_heap *ocmheap)
-{
-	struct ocm_piece *pslot;
-	struct ocm_piece *pfree_head = &ocmheap->free_head;
-	struct ocm_piece *pused_head = &ocmheap->used_head;
-
-	/* The format is the following
-	 * --- OCM 123456789012345 Size   PID State     \n
-	 * 12345678-12345678 1234567890 12345 1234567890\n
-	 */
-	int l;
-	l = sprintf(&buf[*len], "--- OCM %-15s Size   PID State     \n",
-		    desc);
-
-	*len += l;
-	count -= l;
-
-	mutex_lock(&ocm_inst_heap.lock);
-
-	/*
-	 * search the relevant memory slot
-	 */
-	pslot = pused_head->next;
-
-	while (pslot != NULL && count > 46) {
-		l = sprintf(&buf[*len], "%p-%p %10i %5i %-10s\n",
-			     pslot->paddr, pslot->paddr + pslot->size,
-			     pslot->size, pslot->pid, "ALLOCATED");
-
-		*len += l;
-		count -= l;
-		pslot = pslot->next;
-	}
-
-	pslot = pfree_head->next;
-
-	while (pslot != NULL && count > 46) {
-		l = sprintf(&buf[*len], "%p-%p %10i %5i %-10s\n",
-			    pslot->paddr, pslot->paddr + pslot->size,
-			    pslot->size, pslot->pid, "FREE");
-
-		*len += l;
-		count -= l;
-		pslot = pslot->next;
-	}
-
-	mutex_unlock(&ocm_inst_heap.lock);
-
-	return 0;
-}
-
-static int ocm_proc_read(char *buf, char **start, off_t offset, int count,
-		int *eof, void *data)
-{
-	int len = 0;
-
-	len = sprintf(&buf[len], "--- OCM SKB usage (max RX buf %d)\n"
-			"(SKB in OCM) %d - (SKB in DDR) %d\n",
-			ubi32_ocm_skbuf_max,
-			ubi32_ocm_skbuf,
-			ubi32_ddr_skbuf);
-
-	len += sprintf(&buf[len], "--- OCM Data Heap       Size\n"
-			"%p-%p %10i\n",
-			((void *)&__ocm_free_begin),
-			((void *)&__ocm_free_end),
-			((unsigned int)&__ocm_free_end) -
-			((unsigned int)&__ocm_free_begin));
-
-	if (_ocm_proc_read(buf, &len, count - len, "Inst Heap",
-			    &ocm_inst_heap))
-		goto not_done;
-	*eof = 1;
- not_done:
-	return len;
-}
-
-static int ocm_proc_write(struct file *file, const char __user *buffer,
-                           unsigned long count, void *data)
-{
-	int n, v;
-	char in[8];
-
-	if (count > sizeof(in))
-		return -EINVAL;
-
-	if (copy_from_user(in, buffer, count))
-		return -EFAULT;
-	in[count-1] = 0;
-
-	printk(KERN_INFO "OCM skb alloc max = %s\n", in);
-
-	n = 0;
-	v = 0;
-	while ((in[n] >= '0') && (in[n] <= '9')) {
-		v = v * 10 + (int)(in[n] - '0');
-		n++;
-	}
-
-	if (v == 0)
-		return -EINVAL;
-
-	ubi32_ocm_skbuf_max = v;
-	ubi32_ocm_skbuf = ubi32_ddr_skbuf = 0;
-
-	return count;
-}
-
-static int __init sram_proc_init(void)
-{
-	struct proc_dir_entry *ptr;
-	ptr = create_proc_entry("ocm", S_IFREG | S_IRUGO, NULL);
-	if (!ptr) {
-		printk(KERN_WARNING "unable to create /proc/ocm\n");
-		return -1;
-	}
-	ptr->read_proc = ocm_proc_read;
-	ptr->write_proc = ocm_proc_write;
-	return 0;
-}
-late_initcall(sram_proc_init);
-#endif
diff --git a/target/linux/ubicom32/files/arch/ubicom32/oprofile/Makefile b/target/linux/ubicom32/files/arch/ubicom32/oprofile/Makefile
deleted file mode 100644
index 969d2f702..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/oprofile/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# arch/ubicom32/Makefile
-#       Makefile for Oprofile support on Ubicom32
-#
-# (C) Copyright 2009, Ubicom, Inc.
-#
-# This file is part of the Ubicom32 Linux Kernel Port.
-#
-# The Ubicom32 Linux Kernel Port 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.
-#
-# The Ubicom32 Linux Kernel Port is distributed in the hope that it
-# will be useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
-# the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with the Ubicom32 Linux Kernel Port.  If not,
-# see <http://www.gnu.org/licenses/>.
-#
-# Ubicom32 implementation derived from (with many thanks):
-#   arch/m68knommu
-#   arch/blackfin
-#   arch/parisc
-#
-
-obj-$(CONFIG_OPROFILE) += oprofile.o
-
-DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
-		oprof.o cpu_buffer.o buffer_sync.o \
-		event_buffer.o oprofile_files.o \
-		oprofilefs.o oprofile_stats.o \
-		timer_int.o )
-
-oprofile-y	:= $(DRIVER_OBJS) profile.o
diff --git a/target/linux/ubicom32/files/arch/ubicom32/oprofile/ipProf.h b/target/linux/ubicom32/files/arch/ubicom32/oprofile/ipProf.h
deleted file mode 100644
index 2a785f08d..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/oprofile/ipProf.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef __IP_PROF_H__
-#define __IP_PROF_H__
-
-/* This number MUST match what is used in the ultra configuration! */
-#define IPPROFILETIO_MAX_SAMPLES	600
-
-/* Move to .h file used in both; avoid special types  */
-struct profile_sample {
-	unsigned int	pc;		/* PC value */
-	unsigned int	parent;		/* a5 contents, to find the caller */
-	unsigned char	cond_codes;	/* for branch prediction */
-	unsigned char	thread;		/* I-blocked, D-blocked,
-					   4-bit thread number */
-	unsigned short	active;		/* which threads are active -
-					   for accurate counting */
-	unsigned short	blocked;	/* which threads are blocked due to
-					   I or D cache misses */
-	unsigned int	latency;	/* CPU clocks since the last message
-					   dispatch in this thread
-					   (thread 0 only for now) */
-};
-
-
-struct profilenode {
-	struct devtree_node dn;
-	volatile unsigned char enabled;	/* Is the tio enabled to
-					   take samples? */
-	volatile unsigned char busy;	/* set when the samples
-					   are being read */
-	volatile unsigned int mask;	/* Threads that change the MT_EN flag */
-	volatile unsigned short rate;	/* What is the sampling rate? */
-	volatile unsigned short head;	/* sample taker puts samples here */
-	volatile unsigned short tail;	/* packet filler takes samples here */
-	volatile unsigned short count;	/* number of valid samples */
-	volatile unsigned short total;	/* Total samples */
-	struct profile_sample samples[IPPROFILETIO_MAX_SAMPLES];
-};
-
-#endif
diff --git a/target/linux/ubicom32/files/arch/ubicom32/oprofile/profile.c b/target/linux/ubicom32/files/arch/ubicom32/oprofile/profile.c
deleted file mode 100644
index aeac3c666..000000000
--- a/target/linux/ubicom32/files/arch/ubicom32/oprofile/profile.c
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * arch/ubicom32/oprofile/profile.c
- *	Oprofile support for arch Ubicom32
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it will
- * be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not, see
- * <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-/**
- * @file profile.c
- *
- * @remark Copyright 2002 OProfile authors
- * @remark Read the file COPYING
- *
- * @author Hunyue Yau <hy@hy-research.com>
- */
-
-#include <linux/oprofile.h>
-#include <linux/init.h>
-#include <linux/errno.h>
-#include <linux/interrupt.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-
-#include <asm/devtree.h>
-#include <asm/thread.h>
-
-/* For identifying userland vs kernel address */
-#include <asm/stacktrace.h>
-#include "ipProf.h"
-
-/* For communications with the backend */
-static struct profilenode *profile_node;
-
-/* Bitmask containing all Linux threads - as seen by the ROSR reg */
-static unsigned long th_all_mask;
-
-/* Lookup table to translate a hardware thread into a CPU identifier
- * Table is indexed by the ROSR value which is assumed to be
- * relatively small (0...15).
- */
-unsigned int cpu_map[THREAD_ARCHITECTURAL_MAX];
-
-static struct pt_regs regs;
-
-/*
- * For each sample returned, checked to see if they are relevant to
- * us. This is necessary as the ubicom32 architecture has other software
- * running outside of Linux. Only then, put the sample into the relevant
- * cpu bins.
- *
- * To minimize overhead, a global mask with all possible threads of in
- * interest to us is used as a first check. Then a second mask identifying
- * the thread is used to obtain an identifier for that "CPU".
- */
-
-/*
- * ubicom32_build_cpu_th_mask()
- *
- * Build a lookup table for translation between hardware thread
- * "ROSR" values and Linux CPU ids
- *
- * *** This gets executed on all CPUs at once! ***
- */
-static void ubicom32_build_cpu_th_mask(void *mask)
-{
-	thread_t self = thread_get_self();
-	unsigned long *th_m = mask;
-
-	BUG_ON(self <= 0 || self >= THREAD_ARCHITECTURAL_MAX);
-	cpu_map[self] = smp_processor_id();
-
-	set_bit(self, th_m);
-}
-
-/*
- * profile_interrupt()
- *
- * Process samples returned from the profiler backend. The backend
- * may return samples that are irrelevant to us or may even return
- * multiple samples for the same CPU. Note that the sames may be
- * for ANY cpu. At this time, this is unique and to support this requires
- * Oprofile to expose an interface to accept the CPU that the same came
- * frome.
- */
-static irqreturn_t profile_interrupt(int irq, void *arg)
-{
-	int i, buf_entry;
-	int is_kernel;
-	unsigned int bit_th;
-	unsigned int th;
-
-	if (!(profile_node->enabled) || profile_node->count < 0) {
-		printk(KERN_WARNING
-			"Unexpected interrupt, no samples or not enabled!\n");
-		return IRQ_HANDLED;
-	}
-
-	profile_node->busy = 1;		/* Keep backend out */
-
-	for (i = 0; i < profile_node->count; i++) {
-		buf_entry = profile_node->tail;
-		profile_node->tail++;
-		profile_node->tail %= IPPROFILETIO_MAX_SAMPLES;
-
-		/* Note - the "thread" ID is only the lower 4 bits */
-		th = (0x0f & profile_node->samples[buf_entry].thread);
-		bit_th = (1 << th);
-
-		if ((bit_th & th_all_mask) == 0)
-			continue;
-
-		regs.pc = profile_node->samples[buf_entry].pc;
-
-		is_kernel = ubicom32_is_kernel(regs.pc);
-
-		oprofile_add_ext_sample_cpu(regs.pc, &regs, 0, is_kernel,
-					    cpu_map[th]);
-	}
-	profile_node->count = 0;
-	profile_node->busy = 0;
-
-	return IRQ_HANDLED;
-}
-
-/*
- * profile_start()
- *
- * Notification from oprofile to start the profiler
- */
-static int profile_start(void)
-{
-	if (!profile_node)
-		return -1;
-
-	profile_node->enabled = 1;
-
-	return 0;
-}
-
-/*
- * profile_stop()
- *
- * Notification from oprofile to stop the profiler
- */
-static void profile_stop(void)
-{
-	if (profile_node)
-		profile_node->enabled = 0;
-}
-
-/*
- * oprofile_arch_init()
- *
- * Attach to Oprofile after qualify the availability of the backend
- * profiler support.
- */
-int __init oprofile_arch_init(struct oprofile_operations *ops)
-{
-	int r = -ENODEV;
-
-	profile_node = (struct profilenode *)devtree_find_node("profiler");
-
-	if (profile_node == NULL) {
-		printk(KERN_WARNING "Cannot find profiler node\n");
-		return r;
-	}
-
-	r = request_irq(profile_node->dn.recvirq, profile_interrupt,
-			IRQF_DISABLED, "profiler", NULL);
-
-	if (r < 0) {
-		profile_node = NULL;
-		printk(KERN_WARNING "Cannot get profiler IRQ\n");
-		return r;
-	}
-
-	ops->start = profile_start;
-	ops->stop = profile_stop;
-	ops->cpu_type = "timer";
-
-	memset(cpu_map, 0, sizeof(cpu_map));
-
-	on_each_cpu(ubicom32_build_cpu_th_mask, &th_all_mask, 1);
-
-	memset(&regs, 0, sizeof(regs));
-
-	return r;
-}
-
-/*
- * oprofile_arch_exit()
- *
- * External call to take outselves out.
- * Make sure backend is not running.
- */
-void oprofile_arch_exit(void)
-{
-	BUG_ON(profile_node->enabled);
-}
diff --git a/target/linux/ubicom32/files/drivers/char/hw_random/ubicom32-rng.c b/target/linux/ubicom32/files/drivers/char/hw_random/ubicom32-rng.c
deleted file mode 100644
index e42958989..000000000
--- a/target/linux/ubicom32/files/drivers/char/hw_random/ubicom32-rng.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * drivers/net/ubi32-eth.c
- *   Ubicom32 hardware random number generator driver.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/hw_random.h>
-#include <linux/delay.h>
-#include <asm/io.h>
-#include <asm/ip5000.h>
-
-#define MODULE_NAME "ubicom32_rng"
-
-static int ubicom32_rng_data_present(struct hwrng *rng, int wait)
-{
-	int data, i;
-
-	for (i = 0; i < 20; i++) {
-		data = *(int *)(TIMER_BASE + TIMER_TRN);
-		if (data || !wait)
-			break;
-		udelay(10);
-	}
-	return data;
-}
-
-static int ubicom32_rng_data_read(struct hwrng *rng, u32 *data)
-{
-	*data = *(int *)(TIMER_BASE + TIMER_TRN);
-	return 4;
-}
-
-static int ubicom32_rng_init(struct hwrng *rng)
-{
-	printk(KERN_INFO "ubicom32 rng init\n");
-	*(int *)(TIMER_BASE + TIMER_TRN_CFG) = TIMER_TRN_CFG_ENABLE_OSC;
-	return 0;
-}
-
-static void ubicom32_rng_cleanup(struct hwrng *rng)
-{
-	printk(KERN_INFO "ubicom32 rng cleanup\n");
-	*(int *)(TIMER_BASE + TIMER_TRN_CFG) = 0;
-}
-
-static struct hwrng ubicom32_rng = {
-	.name		= MODULE_NAME,
-	.init		= ubicom32_rng_init,
-	.cleanup	= ubicom32_rng_cleanup,
-	.data_present	= ubicom32_rng_data_present,
-	.data_read	= ubicom32_rng_data_read,
-	.priv		= 0,
-};
-
-static int __init mod_init(void)
-{
-	int err;
-
-	printk(KERN_INFO "ubicom32 rng started\n");
-	err = hwrng_register(&ubicom32_rng);
-	if (err) {
-		printk(KERN_ERR "ubicom32 rng register failed (%d)\n",
-			err);
-	}
-
-	return err;
-}
-
-static void __exit mod_exit(void)
-{
-	printk(KERN_INFO "ubicom32 rng stopped\n");
-	hwrng_unregister(&ubicom32_rng);
-}
-
-module_init(mod_init);
-module_exit(mod_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Ubicom, Inc.");
-MODULE_DESCRIPTION("H/W rng driver for ubicom32 processor");
-MODULE_VERSION("1:1.0.a");
diff --git a/target/linux/ubicom32/files/drivers/mmc/host/ubicom32sd.c b/target/linux/ubicom32/files/drivers/mmc/host/ubicom32sd.c
deleted file mode 100644
index 107c92a74..000000000
--- a/target/linux/ubicom32/files/drivers/mmc/host/ubicom32sd.c
+++ /dev/null
@@ -1,773 +0,0 @@
-/*
- * drivers/mmc/host/ubicom32sd.c
- *	Ubicom32 Secure Digital Host Controller Interface driver
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- */
-
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/delay.h>
-#include <linux/scatterlist.h>
-#include <linux/leds.h>
-#include <linux/gpio.h>
-#include <linux/mmc/host.h>
-
-#include <asm/ubicom32sd.h>
-
-#define DRIVER_NAME "ubicom32sd"
-
-#define sd_printk(...)
-//#define sd_printk printk
-
-#define SDTIO_VP_VERSION	3
-
-#define SDTIO_MAX_SG_BLOCKS	16
-
-enum sdtio_commands {
-	SDTIO_COMMAND_NOP,
-	SDTIO_COMMAND_SETUP,
-	SDTIO_COMMAND_SETUP_SDIO,
-	SDTIO_COMMAND_EXECUTE,
-	SDTIO_COMMAND_RESET,
-};
-
-#define SDTIO_COMMAND_SHIFT			24
-#define SDTIO_COMMAND_FLAG_STOP_RSP_CRC		(1 << 10)
-#define SDTIO_COMMAND_FLAG_STOP_RSP_136		(1 << 9)
-#define SDTIO_COMMAND_FLAG_STOP_RSP		(1 << 8)
-#define SDTIO_COMMAND_FLAG_STOP_CMD		(1 << 7)
-#define SDTIO_COMMAND_FLAG_DATA_STREAM		(1 << 6)
-#define SDTIO_COMMAND_FLAG_DATA_RD		(1 << 5)
-#define SDTIO_COMMAND_FLAG_DATA_WR		(1 << 4)
-#define SDTIO_COMMAND_FLAG_CMD_RSP_CRC		(1 << 3)
-#define SDTIO_COMMAND_FLAG_CMD_RSP_136		(1 << 2)
-#define SDTIO_COMMAND_FLAG_CMD_RSP		(1 << 1)
-#define SDTIO_COMMAND_FLAG_CMD			(1 << 0)
-
-/*
- * SDTIO_COMMAND_SETUP_SDIO
- */
-#define SDTIO_COMMAND_FLAG_SDIO_INT_EN		(1 << 0)
-
-/*
- * SDTIO_COMMAND_SETUP
- *      clock speed in arg
- */
-#define SDTIO_COMMAND_FLAG_4BIT                 (1 << 3)
-#define SDTIO_COMMAND_FLAG_1BIT                 (1 << 2)
-#define SDTIO_COMMAND_FLAG_SET_CLOCK            (1 << 1)
-#define SDTIO_COMMAND_FLAG_SET_WIDTH            (1 << 0)
-
-#define SDTIO_COMMAND_FLAG_CMD_RSP_MASK		(SDTIO_COMMAND_FLAG_CMD_RSP | SDTIO_COMMAND_FLAG_CMD_RSP_136)
-#define SDTIO_COMMAND_FLAG_STOP_RSP_MASK	(SDTIO_COMMAND_FLAG_STOP_RSP | SDTIO_COMMAND_FLAG_STOP_RSP_136)
-#define SDTIO_COMMAND_FLAG_RSP_MASK		(SDTIO_COMMAND_FLAG_CMD_RSP_MASK | SDTIO_COMMAND_FLAG_STOP_RSP_MASK)
-
-struct sdtio_vp_sg {
-	volatile void		*addr;
-	volatile u32_t		len;
-};
-
-#define SDTIO_VP_INT_STATUS_DONE		(1 << 31)
-#define SDTIO_VP_INT_STATUS_SDIO_INT		(1 << 10)
-#define SDTIO_VP_INT_STATUS_DATA_CRC_ERR	(1 << 9)
-#define SDTIO_VP_INT_STATUS_DATA_PROG_ERR	(1 << 8)
-#define SDTIO_VP_INT_STATUS_DATA_TIMEOUT	(1 << 7)
-#define SDTIO_VP_INT_STATUS_STOP_RSP_CRC	(1 << 6)
-#define SDTIO_VP_INT_STATUS_STOP_RSP_TIMEOUT	(1 << 5)
-#define SDTIO_VP_INT_STATUS_CMD_RSP_CRC		(1 << 4)
-#define SDTIO_VP_INT_STATUS_CMD_RSP_TIMEOUT	(1 << 3)
-#define SDTIO_VP_INT_STATUS_CMD_TIMEOUT		(1 << 2)
-#define SDTIO_VP_INT_STATUS_CARD1_INSERT	(1 << 1)
-#define SDTIO_VP_INT_STATUS_CARD0_INSERT	(1 << 0)
-
-struct sdtio_vp_regs {
-	u32_t				version;
-	u32_t				f_max;
-	u32_t				f_min;
-
-	volatile u32_t			int_status;
-
-	volatile u32_t			command;
-	volatile u32_t			arg;
-
-	volatile u32_t			cmd_opcode;
-	volatile u32_t			cmd_arg;
-	volatile u32_t			cmd_rsp0;
-	volatile u32_t			cmd_rsp1;
-	volatile u32_t			cmd_rsp2;
-	volatile u32_t			cmd_rsp3;
-
-	volatile u32_t			stop_opcode;
-	volatile u32_t			stop_arg;
-	volatile u32_t			stop_rsp0;
-	volatile u32_t			stop_rsp1;
-	volatile u32_t			stop_rsp2;
-	volatile u32_t			stop_rsp3;
-
-	volatile u32_t			data_timeout_ns;
-	volatile u16_t			data_blksz;
-	volatile u16_t			data_blkct;
-	volatile u32_t			data_bytes_transferred;
-	volatile u32_t			sg_len;
-	struct sdtio_vp_sg		sg[SDTIO_MAX_SG_BLOCKS];
-};
-
-struct ubicom32sd_data {
-	const struct ubicom32sd_platform_data	*pdata;
-
-	struct mmc_host				*mmc;
-
-	/*
-	 * Lock used to protect the data structure
-	spinlock_t				lock;
-	 */
-	int	int_en;
-	int	int_pend;
-
-	/*
-	 * Receive and transmit interrupts used for communicating
-	 * with hardware
-	 */
-	int					irq_tx;
-	int					irq_rx;
-
-	/*
-	 * Current outstanding mmc request
-	 */
-	struct mmc_request			*mrq;
-
-	/*
-	 * Hardware registers
-	 */
-	struct sdtio_vp_regs			*regs;
-};
-
-/*****************************************************************************\
- *                                                                           *
- * Suspend/resume                                                            *
- *                                                                           *
-\*****************************************************************************/
-
-#if 0//def CONFIG_PM
-
-int ubicom32sd_suspend_host(struct ubicom32sd_host *host, pm_message_t state)
-{
-	int ret;
-
-	ret = mmc_suspend_host(host->mmc, state);
-	if (ret)
-		return ret;
-
-	free_irq(host->irq, host);
-
-	return 0;
-}
-
-EXPORT_SYMBOL_GPL(ubicom32sd_suspend_host);
-
-int ubicom32sd_resume_host(struct ubicom32sd_host *host)
-{
-	int ret;
-
-	if (host->flags & UBICOM32SD_USE_DMA) {
-		if (host->ops->enable_dma)
-			host->ops->enable_dma(host);
-	}
-
-	ret = request_irq(host->irq, ubicom32sd_irq, IRQF_SHARED,
-			  mmc_hostname(host->mmc), host);
-	if (ret)
-		return ret;
-
-	ubicom32sd_init(host);
-	mmiowb();
-
-	ret = mmc_resume_host(host->mmc);
-	if (ret)
-		return ret;
-
-	return 0;
-}
-
-EXPORT_SYMBOL_GPL(ubicom32sd_resume_host);
-
-#endif /* CONFIG_PM */
-
-/*
- * ubicom32sd_send_command_sync
- */
-static void ubicom32sd_send_command_sync(struct ubicom32sd_data *ud, u32_t command, u32_t arg)
-{
-	ud->regs->command = command;
-	ud->regs->arg = arg;
-	ubicom32_set_interrupt(ud->irq_tx);
-	while (ud->regs->command) {
-		ndelay(100);
-	}
-}
-
-/*
- * ubicom32sd_send_command
- */
-static void ubicom32sd_send_command(struct ubicom32sd_data *ud, u32_t command, u32_t arg)
-{
-	ud->regs->command = command;
-	ud->regs->arg = arg;
-	ubicom32_set_interrupt(ud->irq_tx);
-}
-
-/*
- * ubicom32sd_reset
- */
-static void ubicom32sd_reset(struct ubicom32sd_data *ud)
-{
-	ubicom32sd_send_command_sync(ud, SDTIO_COMMAND_RESET << SDTIO_COMMAND_SHIFT, 0);
-	ud->regs->int_status = 0;
-}
-
-/*
- * ubicom32sd_mmc_request
- */
-static void ubicom32sd_mmc_request(struct mmc_host *mmc, struct mmc_request *mrq)
-{
-	struct ubicom32sd_data *ud = (struct ubicom32sd_data *)mmc_priv(mmc);
-	u32_t command = SDTIO_COMMAND_EXECUTE << SDTIO_COMMAND_SHIFT;
-	int ret = 0;
-
-	WARN(ud->mrq != NULL, "ud->mrq still set to %p\n", ud->mrq);
-	//pr_debug("send cmd %08x arg %08x flags %08x\n", cmd->opcode, cmd->arg, cmd->flags);
-
-	if (mrq->cmd) {
-		struct mmc_command *cmd = mrq->cmd;
-
-		sd_printk("%s:\t\t\tsetup cmd %02d arg %08x flags %08x\n", mmc_hostname(mmc), cmd->opcode, cmd->arg, cmd->flags);
-
-		ud->regs->cmd_opcode = cmd->opcode;
-		ud->regs->cmd_arg = cmd->arg;
-
-		command |= SDTIO_COMMAND_FLAG_CMD;
-
-		if (cmd->flags & MMC_RSP_PRESENT) {
-			command |= SDTIO_COMMAND_FLAG_CMD_RSP;
-		}
-
-		if (cmd->flags & MMC_RSP_136) {
-			command |= SDTIO_COMMAND_FLAG_CMD_RSP_136;
-		}
-
-		if (cmd->flags & MMC_RSP_CRC) {
-			command |= SDTIO_COMMAND_FLAG_CMD_RSP_CRC;
-		}
-	}
-
-	if (mrq->data) {
-		struct mmc_data *data = mrq->data;
-		struct scatterlist *sg = data->sg;
-		int i;
-
-printk("%s:\t\t\tsetup data blksz %d num %d sglen=%d fl=%08x Tns=%u\n", mmc_hostname(mmc), data->blksz, data->blocks, data->sg_len, data->flags, data->timeout_ns);
-
-		sd_printk("%s:\t\t\tsetup data blksz %d num %d sglen=%d fl=%08x Tns=%u\n",
-			  mmc_hostname(mmc), data->blksz, data->blocks, data->sg_len,
-			  data->flags, data->timeout_ns);
-
-		if (data->sg_len > SDTIO_MAX_SG_BLOCKS) {
-			ret = -EINVAL;
-			data->error = -EINVAL;
-			goto fail;
-		}
-
-		ud->regs->data_timeout_ns = data->timeout_ns;
-		ud->regs->data_blksz = data->blksz;
-		ud->regs->data_blkct = data->blocks;
-		ud->regs->sg_len = data->sg_len;
-
-		/*
-		 * Load all of our sg list into the driver sg buffer
-		 */
-		for (i = 0; i < data->sg_len; i++) {
-			sd_printk("%s: sg %d = %p %d\n", mmc_hostname(mmc), i, sg_virt(sg), sg->length);
-			ud->regs->sg[i].addr = sg_virt(sg);
-			ud->regs->sg[i].len = sg->length;
-			if (((u32_t)ud->regs->sg[i].addr & 0x03) || (sg->length & 0x03)) {
-				sd_printk("%s: Need aligned buffers\n", mmc_hostname(mmc));
-				ret = -EINVAL;
-				data->error = -EINVAL;
-				goto fail;
-			}
-			sg++;
-		}
-		if (data->flags & MMC_DATA_READ) {
-			command |= SDTIO_COMMAND_FLAG_DATA_RD;
-		} else if (data->flags & MMC_DATA_WRITE) {
-			command |= SDTIO_COMMAND_FLAG_DATA_WR;
-		} else if (data->flags & MMC_DATA_STREAM) {
-			command |= SDTIO_COMMAND_FLAG_DATA_STREAM;
-		}
-	}
-
-	if (mrq->stop) {
-		struct mmc_command *stop = mrq->stop;
-		sd_printk("%s: \t\t\tsetup stop %02d arg %08x flags %08x\n", mmc_hostname(mmc), stop->opcode, stop->arg, stop->flags);
-
-		ud->regs->stop_opcode = stop->opcode;
-		ud->regs->stop_arg = stop->arg;
-
-		command |= SDTIO_COMMAND_FLAG_STOP_CMD;
-
-		if (stop->flags & MMC_RSP_PRESENT) {
-			command |= SDTIO_COMMAND_FLAG_STOP_RSP;
-		}
-
-		if (stop->flags & MMC_RSP_136) {
-			command |= SDTIO_COMMAND_FLAG_STOP_RSP_136;
-		}
-
-		if (stop->flags & MMC_RSP_CRC) {
-			command |= SDTIO_COMMAND_FLAG_STOP_RSP_CRC;
-		}
-	}
-
-	ud->mrq = mrq;
-
-	sd_printk("%s: Sending command %08x\n", mmc_hostname(mmc), command);
-
-	ubicom32sd_send_command(ud, command, 0);
-
-	return;
-fail:
-	sd_printk("%s: mmcreq ret = %d\n", mmc_hostname(mmc), ret);
-	mrq->cmd->error = ret;
-	mmc_request_done(mmc, mrq);
-}
-
-/*
- * ubicom32sd_mmc_set_ios
- */
-static void ubicom32sd_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
-{
-	struct ubicom32sd_data *ud = (struct ubicom32sd_data *)mmc_priv(mmc);
-	u32_t command = SDTIO_COMMAND_SETUP << SDTIO_COMMAND_SHIFT;
-	u32_t arg = 0;
-	sd_printk("%s: ios call bw:%u pm:%u clk:%u\n", mmc_hostname(mmc), 1 << ios->bus_width, ios->power_mode, ios->clock);
-
-	switch (ios->bus_width) {
-	case MMC_BUS_WIDTH_1:
-		command |= SDTIO_COMMAND_FLAG_SET_WIDTH | SDTIO_COMMAND_FLAG_1BIT;
-		break;
-
-	case MMC_BUS_WIDTH_4:
-		command |= SDTIO_COMMAND_FLAG_SET_WIDTH | SDTIO_COMMAND_FLAG_4BIT;
-		break;
-	}
-
-	if (ios->clock) {
-		arg = ios->clock;
-		command |= SDTIO_COMMAND_FLAG_SET_CLOCK;
-	}
-
-	switch (ios->power_mode) {
-
-	/*
-	 * Turn off the SD bus (power + clock)
-	 */
-	case MMC_POWER_OFF:
-		gpio_set_value(ud->pdata->cards[0].pin_pwr, !ud->pdata->cards[0].pwr_polarity);
-		command |= SDTIO_COMMAND_FLAG_SET_CLOCK;
-		break;
-
-	/*
-	 * Turn on the power to the SD bus
-	 */
-	case MMC_POWER_ON:
-		gpio_set_value(ud->pdata->cards[0].pin_pwr, ud->pdata->cards[0].pwr_polarity);
-		break;
-
-	/*
-	 * Turn on the clock to the SD bus
-	 */
-	case MMC_POWER_UP:
-		/*
-		 * Done above
-		 */
-		break;
-	}
-
-	ubicom32sd_send_command_sync(ud, command, arg);
-
-	/*
-	 * Let the power settle down
-	 */
-	udelay(500);
-}
-
-/*
- * ubicom32sd_mmc_get_cd
- */
-static int ubicom32sd_mmc_get_cd(struct mmc_host *mmc)
-{
-	struct ubicom32sd_data *ud = (struct ubicom32sd_data *)mmc_priv(mmc);
-	sd_printk("%s: get cd %u %u\n", mmc_hostname(mmc), ud->pdata->cards[0].pin_cd, gpio_get_value(ud->pdata->cards[0].pin_cd));
-
-	return gpio_get_value(ud->pdata->cards[0].pin_cd) ?
-				ud->pdata->cards[0].cd_polarity :
-				!ud->pdata->cards[0].cd_polarity;
-}
-
-/*
- * ubicom32sd_mmc_get_ro
- */
-static int ubicom32sd_mmc_get_ro(struct mmc_host *mmc)
-{
-	struct ubicom32sd_data *ud = (struct ubicom32sd_data *)mmc_priv(mmc);
-	sd_printk("%s: get ro %u %u\n", mmc_hostname(mmc), ud->pdata->cards[0].pin_wp, gpio_get_value(ud->pdata->cards[0].pin_wp));
-
-	return gpio_get_value(ud->pdata->cards[0].pin_wp) ?
-				ud->pdata->cards[0].wp_polarity :
-				!ud->pdata->cards[0].wp_polarity;
-}
-
-/*
- * ubicom32sd_mmc_enable_sdio_irq
- */
-static void ubicom32sd_mmc_enable_sdio_irq(struct mmc_host *mmc, int enable)
-{
-	struct ubicom32sd_data *ud = (struct ubicom32sd_data *)mmc_priv(mmc);
-
-	ud->int_en = enable;
-	if (enable && ud->int_pend) {
-		ud->int_pend = 0;
-		mmc_signal_sdio_irq(mmc);
-	}
-}
-
-/*
- * ubicom32sd_interrupt
- */
-static irqreturn_t ubicom32sd_interrupt(int irq, void *dev)
-{
-	struct mmc_host *mmc = (struct mmc_host *)dev;
-	struct mmc_request *mrq;
-	struct ubicom32sd_data *ud;
-	u32_t int_status;
-
-	if (!mmc) {
-		return IRQ_HANDLED;
-	}
-
-	ud = (struct ubicom32sd_data *)mmc_priv(mmc);
-	if (!ud) {
-		return IRQ_HANDLED;
-	}
-
-	int_status = ud->regs->int_status;
-	ud->regs->int_status &= ~int_status;
-
-	if (int_status & SDTIO_VP_INT_STATUS_SDIO_INT) {
-		if (ud->int_en) {
-			ud->int_pend = 0;
-			mmc_signal_sdio_irq(mmc);
-		} else {
-			ud->int_pend++;
-		}
-	}
-
-	if (!(int_status & SDTIO_VP_INT_STATUS_DONE)) {
-		return IRQ_HANDLED;
-	}
-
-	mrq = ud->mrq;
-	if (!mrq) {
-		sd_printk("%s: Spurious interrupt", mmc_hostname(mmc));
-		return IRQ_HANDLED;
-	}
-	ud->mrq = NULL;
-
-	/*
-	 * SDTIO_VP_INT_DONE
-	 */
-	if (mrq->cmd->flags & MMC_RSP_PRESENT) {
-		struct mmc_command *cmd = mrq->cmd;
-		cmd->error = 0;
-
-		if ((cmd->flags & MMC_RSP_CRC) && (int_status & SDTIO_VP_INT_STATUS_CMD_RSP_CRC)) {
-			cmd->error = -EILSEQ;
-		} else if (int_status & SDTIO_VP_INT_STATUS_CMD_RSP_TIMEOUT) {
-			cmd->error = -ETIMEDOUT;
-			goto done;
-		} else if (cmd->flags & MMC_RSP_136) {
-			cmd->resp[0] = ud->regs->cmd_rsp0;
-			cmd->resp[1] = ud->regs->cmd_rsp1;
-			cmd->resp[2] = ud->regs->cmd_rsp2;
-			cmd->resp[3] = ud->regs->cmd_rsp3;
-		} else {
-			cmd->resp[0] = ud->regs->cmd_rsp0;
-		}
-		sd_printk("%s:\t\t\tResponse %08x %08x %08x %08x err=%d\n", mmc_hostname(mmc), cmd->resp[0], cmd->resp[1], cmd->resp[2], cmd->resp[3], cmd->error);
-	}
-
-	if (mrq->data) {
-		struct mmc_data *data = mrq->data;
-
-		if (int_status & SDTIO_VP_INT_STATUS_DATA_TIMEOUT) {
-			data->error = -ETIMEDOUT;
-			sd_printk("%s:\t\t\tData Timeout\n", mmc_hostname(mmc));
-			goto done;
-		} else if (int_status & SDTIO_VP_INT_STATUS_DATA_CRC_ERR) {
-			data->error = -EILSEQ;
-			sd_printk("%s:\t\t\tData CRC\n", mmc_hostname(mmc));
-			goto done;
-		} else if (int_status & SDTIO_VP_INT_STATUS_DATA_PROG_ERR) {
-			data->error = -EILSEQ;
-			sd_printk("%s:\t\t\tData Program Error\n", mmc_hostname(mmc));
-			goto done;
-		} else {
-			data->error = 0;
-			data->bytes_xfered = ud->regs->data_bytes_transferred;
-		}
-	}
-
-	if (mrq->stop && (mrq->stop->flags & MMC_RSP_PRESENT)) {
-		struct mmc_command *stop = mrq->stop;
-		stop->error = 0;
-
-		if ((stop->flags & MMC_RSP_CRC) && (int_status & SDTIO_VP_INT_STATUS_STOP_RSP_CRC)) {
-			stop->error = -EILSEQ;
-		} else if (int_status & SDTIO_VP_INT_STATUS_STOP_RSP_TIMEOUT) {
-			stop->error = -ETIMEDOUT;
-			goto done;
-		} else if (stop->flags & MMC_RSP_136) {
-			stop->resp[0] = ud->regs->stop_rsp0;
-			stop->resp[1] = ud->regs->stop_rsp1;
-			stop->resp[2] = ud->regs->stop_rsp2;
-			stop->resp[3] = ud->regs->stop_rsp3;
-		} else {
-			stop->resp[0] = ud->regs->stop_rsp0;
-		}
-		sd_printk("%s:\t\t\tStop Response %08x %08x %08x %08x err=%d\n", mmc_hostname(mmc), stop->resp[0], stop->resp[1], stop->resp[2], stop->resp[3], stop->error);
-	}
-
-done:
-	mmc_request_done(mmc, mrq);
-
-	return IRQ_HANDLED;
-}
-
-static struct mmc_host_ops ubicom32sd_ops = {
-	.request		= ubicom32sd_mmc_request,
-	.set_ios		= ubicom32sd_mmc_set_ios,
-	.get_ro			= ubicom32sd_mmc_get_ro,
-	.get_cd			= ubicom32sd_mmc_get_cd,
-	.enable_sdio_irq	= ubicom32sd_mmc_enable_sdio_irq,
-};
-
-/*
- * ubicom32sd_probe
- */
-static int __devinit ubicom32sd_probe(struct platform_device *pdev)
-{
-	struct ubicom32sd_platform_data *pdata = (struct ubicom32sd_platform_data *)pdev->dev.platform_data;
-	struct mmc_host *mmc;
-	struct ubicom32sd_data *ud;
-	struct resource *res_regs;
-	struct resource *res_irq_tx;
-	struct resource *res_irq_rx;
-	int ret;
-
-	/*
-	 * Get our resources, regs is the hardware driver base address
-	 * and the tx and rx irqs are used to communicate with the
-	 * hardware driver.
-	 */
-	res_regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	res_irq_tx = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-	res_irq_rx = platform_get_resource(pdev, IORESOURCE_IRQ, 1);
-	if (!res_regs || !res_irq_tx || !res_irq_rx) {
-		ret = -EINVAL;
-		goto fail;
-	}
-
-	/*
-	 * Reserve any gpios we need
-	 */
-	ret = gpio_request(pdata->cards[0].pin_wp, "sd-wp");
-	if (ret) {
-		goto fail;
-	}
-	gpio_direction_input(pdata->cards[0].pin_wp);
-
-	ret = gpio_request(pdata->cards[0].pin_cd, "sd-cd");
-	if (ret) {
-		goto fail_cd;
-	}
-	gpio_direction_input(pdata->cards[0].pin_cd);
-
-	/*
-	 * HACK: for the dual port controller on port F, we don't support the second port right now
-	 */
-	if (pdata->ncards > 1) {
-		ret = gpio_request(pdata->cards[1].pin_pwr, "sd-pwr");
-		gpio_direction_output(pdata->cards[1].pin_pwr, !pdata->cards[1].pwr_polarity);
-		gpio_direction_output(pdata->cards[1].pin_pwr, pdata->cards[1].pwr_polarity);
-	}
-
-	ret = gpio_request(pdata->cards[0].pin_pwr, "sd-pwr");
-	if (ret) {
-		goto fail_pwr;
-	}
-	gpio_direction_output(pdata->cards[0].pin_pwr, !pdata->cards[0].pwr_polarity);
-
-	/*
-	 * Allocate the MMC driver, it includes memory for our data.
-	 */
-	mmc = mmc_alloc_host(sizeof(struct ubicom32sd_data), &pdev->dev);
-	if (!mmc) {
-		ret = -ENOMEM;
-		goto fail_mmc;
-	}
-	ud = (struct ubicom32sd_data *)mmc_priv(mmc);
-	ud->mmc = mmc;
-	ud->pdata = pdata;
-	ud->regs = (struct sdtio_vp_regs *)res_regs->start;
-	ud->irq_tx = res_irq_tx->start;
-	ud->irq_rx = res_irq_rx->start;
-	platform_set_drvdata(pdev, mmc);
-
-	ret = request_irq(ud->irq_rx, ubicom32sd_interrupt, IRQF_DISABLED, mmc_hostname(mmc), mmc);
-	if (ret) {
-		goto fail_mmc;
-	}
-
-	/*
-	 * Fill in the mmc structure
-	 */
-	mmc->ops = &ubicom32sd_ops;
-	mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_NEEDS_POLL | MMC_CAP_SDIO_IRQ |
-		    MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED;
-
-	mmc->f_min = ud->regs->f_min;
-	mmc->f_max = ud->regs->f_max;
-	mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
-
-	/*
-	 * Setup some restrictions on transfers
-	 *
-	 * We allow up to SDTIO_MAX_SG_BLOCKS of data to DMA into, there are
-	 * not really any "max_seg_size", "max_req_size", or "max_blk_count"
-	 * restrictions (must be less than U32_MAX though), pick
-	 * something large?!...
-	 *
-	 * The hardware can do up to 4095 bytes per block, since the spec
-	 * only requires 2048, we'll set it to that and not worry about
-	 * potential weird blk lengths.
-	 */
-	mmc->max_hw_segs = SDTIO_MAX_SG_BLOCKS;
-	mmc->max_phys_segs = SDTIO_MAX_SG_BLOCKS;
-	mmc->max_seg_size = 1024 * 1024;
-	mmc->max_req_size = 1024 * 1024;
-	mmc->max_blk_count = 1024;
-
-	mmc->max_blk_size = 2048;
-
-	ubicom32sd_reset(ud);
-
-	/*
-	 * enable interrupts
-	 */
-	ud->int_en = 0;
-	ubicom32sd_send_command_sync(ud, SDTIO_COMMAND_SETUP_SDIO << SDTIO_COMMAND_SHIFT | SDTIO_COMMAND_FLAG_SDIO_INT_EN, 0);
-
-	mmc_add_host(mmc);
-
-	printk(KERN_INFO "%s at %p, irq %d/%d\n", mmc_hostname(mmc),
-			ud->regs, ud->irq_tx, ud->irq_rx);
-	return 0;
-
-fail_mmc:
-	gpio_free(pdata->cards[0].pin_pwr);
-fail_pwr:
-	gpio_free(pdata->cards[0].pin_cd);
-fail_cd:
-	gpio_free(pdata->cards[0].pin_wp);
-fail:
-	return ret;
-}
-
-/*
- * ubicom32sd_remove
- */
-static int __devexit ubicom32sd_remove(struct platform_device *pdev)
-{
-	struct mmc_host *mmc = platform_get_drvdata(pdev);
-
-	platform_set_drvdata(pdev, NULL);
-
-	if (mmc) {
-		struct ubicom32sd_data *ud = (struct ubicom32sd_data *)mmc_priv(mmc);
-
-		gpio_free(ud->pdata->cards[0].pin_pwr);
-		gpio_free(ud->pdata->cards[0].pin_cd);
-		gpio_free(ud->pdata->cards[0].pin_wp);
-
-		mmc_remove_host(mmc);
-		mmc_free_host(mmc);
-	}
-
-	/*
-	 * Note that our data is allocated as part of the mmc structure
-	 * so we don't need to free it.
-	 */
-	return 0;
-}
-
-static struct platform_driver ubicom32sd_driver = {
-	.driver = {
-		.name = DRIVER_NAME,
-		.owner = THIS_MODULE,
-	},
-	.probe = ubicom32sd_probe,
-	.remove = __devexit_p(ubicom32sd_remove),
-#if 0
-	.suspend = ubicom32sd_suspend,
-	.resume = ubicom32sd_resume,
-#endif
-};
-
-/*
- * ubicom32sd_init
- */
-static int __init ubicom32sd_init(void)
-{
-	return platform_driver_register(&ubicom32sd_driver);
-}
-module_init(ubicom32sd_init);
-
-/*
- * ubicom32sd_exit
- */
-static void __exit ubicom32sd_exit(void)
-{
-    platform_driver_unregister(&ubicom32sd_driver);
-}
-module_exit(ubicom32sd_exit);
-
-MODULE_AUTHOR("Patrick Tjin");
-MODULE_DESCRIPTION("Ubicom32 Secure Digital Host Controller Interface driver");
-MODULE_LICENSE("GPL");
diff --git a/target/linux/ubicom32/files/drivers/mtd/devices/nand-spi-er.c b/target/linux/ubicom32/files/drivers/mtd/devices/nand-spi-er.c
deleted file mode 100644
index 73938c882..000000000
--- a/target/linux/ubicom32/files/drivers/mtd/devices/nand-spi-er.c
+++ /dev/null
@@ -1,1017 +0,0 @@
-/*
- * Micron SPI-ER NAND Flash Memory
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
-*/
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/delay.h>
-#include <linux/device.h>
-#include <linux/mutex.h>
-#include <linux/err.h>
-
-#include <linux/spi/spi.h>
-#include <linux/spi/flash.h>
-
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-
-#define NAND_SPI_ER_BLOCK_FROM_ROW(row)		(row >> 6)
-
-#define NAND_SPI_ER_STATUS_P_FAIL		(1 << 3)
-#define NAND_SPI_ER_STATUS_E_FAIL		(1 << 2)
-#define NAND_SPI_ER_STATUS_OIP			(1 << 0)
-
-#define NAND_SPI_ER_LAST_ROW_INVALID		0xFFFFFFFF
-#define	NAND_SPI_ER_BAD_BLOCK_MARK_OFFSET	0x08
-
-struct nand_spi_er_device {
-	const char		*name;
-
-	uint8_t			id0;
-	uint8_t			id1;
-
-	unsigned int		blocks;
-	unsigned int		pages_per_block;
-	unsigned int		page_size;
-	unsigned int		write_size;
-	unsigned int		erase_size;
-};
-
-struct nand_spi_er {
-	char				name[24];
-
-	const struct nand_spi_er_device	*device;
-
-	struct mutex			lock;
-	struct spi_device		*spi;
-
-	struct mtd_info			mtd;
-
-	unsigned int			last_row;	/* the last row we fetched */
-
-	/*
-	 * Bad block table (MUST be last in strcuture)
-	 */
-	unsigned long			nbb;
-	unsigned long			bbt[0];
-};
-
-const struct nand_spi_er_device nand_spi_er_devices[] = {
-	{
-		name:			"MT29F1G01ZDC",
-		id0:			0x2C,
-		id1:			0x12,
-		blocks:			1024,
-		pages_per_block:	64,
-		page_size:		2048,
-		write_size:		512,
-		erase_size:		64 * 2048,
-	},
-	{
-		name:			"MT29F1G01ZDC",
-		id0:			0x2C,
-		id1:			0x13,
-		blocks:			1024,
-		pages_per_block:	64,
-		page_size:		2048,
-		write_size:		512,
-		erase_size:		64 * 2048,
-	},
-};
-
-static int read_only = 0;
-module_param(read_only, int, 0);
-MODULE_PARM_DESC(read_only, "Leave device locked");
-
-/*
- * nand_spi_er_get_feature
- *	Get Feature register
- */
-static int nand_spi_er_get_feature(struct nand_spi_er *chip, int reg, uint8_t *data)
-{
-	uint8_t txbuf[2];
-	uint8_t rxbuf[1];
-	int res;
-
-	txbuf[0] = 0x0F;
-	txbuf[1] = reg;
-	res = spi_write_then_read(chip->spi, txbuf, 2, rxbuf, 1);
-	if (res) {
-		DEBUG(MTD_DEBUG_LEVEL1, "%s: failed get feature res=%d\n", chip->name, res);
-		return res;
-	}
-	*data = rxbuf[0];
-	return 0;
-}
-
-/*
- * nand_spi_er_busywait
- *	Wait until the chip is not busy
- */
-static int nand_spi_er_busywait(struct nand_spi_er *chip, uint8_t *data)
-{
-	int i;
-
-	for (i = 0; i < 100; i++) {
-		int res = nand_spi_er_get_feature(chip, 0xC0, data);
-		if (res) {
-			return res;
-		}
-		if (!(*data & NAND_SPI_ER_STATUS_OIP)) {
-			break;
-		}
-	}
-
-	return 0;
-}
-
-/*
- * nand_spi_er_erase
- *	Erase a block, parameters must be block aligned
- */
-static int nand_spi_er_erase(struct mtd_info *mtd, struct erase_info *instr)
-{
-	struct nand_spi_er *chip = mtd->priv;
-	struct spi_device *spi = chip->spi;
-	uint8_t txbuf[4];
-	int res;
-
-	DEBUG(MTD_DEBUG_LEVEL3, "%s: erase addr:%x len:%x\n", chip->name, instr->addr, instr->len);
-
-	if ((instr->addr + instr->len) > mtd->size) {
-		return -EINVAL;
-	}
-
-	if (instr->addr & (chip->device->erase_size - 1)) {
-		DEBUG(MTD_DEBUG_LEVEL1, "%s: erase address is not aligned %x\n", chip->name, instr->addr);
-		return -EINVAL;
-	}
-
-	if (instr->len & (chip->device->erase_size - 1)) {
-		DEBUG(MTD_DEBUG_LEVEL1, "%s: erase len is not aligned %x\n", chip->name, instr->len);
-		return -EINVAL;
-	}
-
-	mutex_lock(&chip->lock);
-	chip->last_row = NAND_SPI_ER_LAST_ROW_INVALID;
-
-	while (instr->len) {
-		uint32_t block = instr->addr >> 17;
-		uint32_t row = block << 6;
-		uint8_t stat;
-		DEBUG(MTD_DEBUG_LEVEL3, "%s: block erase row:%x block:%x addr:%x rem:%x\n", chip->name, row, block, instr->addr, instr->len);
-
-		/*
-		 * Write enable
-		 */
-		txbuf[0] = 0x06;
-		res = spi_write(spi, txbuf, 1);
-		if (res) {
-			DEBUG(MTD_DEBUG_LEVEL1, "%s: failed write enable res=%d\n", chip->name, res);
-			mutex_unlock(&chip->lock);
-			return res;
-		}
-
-		/*
-		 * Test for bad block
-		 */
-		if (test_bit(block, chip->bbt)) {
-			instr->fail_addr = block << 17;
-			instr->state = MTD_ERASE_FAILED;
-			res = -EBADMSG;
-			goto done;
-		}
-
-		/*
-		 * Block erase
-		 */
-		txbuf[0] = 0xD8;
-		txbuf[1] = 0x00;
-		txbuf[2] = row >> 8;
-		txbuf[3] = row & 0xFF;
-		res = spi_write(spi, txbuf, 4);
-		if (res) {
-			DEBUG(MTD_DEBUG_LEVEL1, "%s: failed block erase res=%d\n", chip->name, res);
-			instr->fail_addr = block << 17;
-			instr->state = MTD_ERASE_FAILED;
-			goto done;
-		}
-
-		/*
-		 * Wait
-		 */
-		res = nand_spi_er_busywait(chip, &stat);
-		if (res || (stat & NAND_SPI_ER_STATUS_OIP)) {
-			instr->fail_addr = block << 17;
-			instr->state = MTD_ERASE_FAILED;
-			DEBUG(MTD_DEBUG_LEVEL1, "%s: chip is busy or nonresponsive res=%d stat=%02x\n", chip->name, res, stat);
-			if (res) {
-				goto done;
-			}
-
-			/*
-			 * Chip is stuck?
-			 */
-			res = -EIO;
-			goto done;
-		}
-
-		/*
-		 * Check the status register
-		 */
-		if (stat & NAND_SPI_ER_STATUS_E_FAIL) {
-			DEBUG(MTD_DEBUG_LEVEL1, "%s: E_FAIL signalled (%02x)\n", chip->name, stat);
-			instr->fail_addr = block << 17;
-			instr->state = MTD_ERASE_FAILED;
-			goto done;
-		}
-
-		/*
-		 * Next
-		 */
-		block++;
-		instr->len -= chip->device->erase_size;
-		instr->addr += chip->device->erase_size;
-	}
-
-	instr->state = MTD_ERASE_DONE;
-
-	mutex_unlock(&chip->lock);
-	return 0;
-
-done:
-	/*
-	 * Write disable
-	 */
-	txbuf[0] = 0x04;
-	res = spi_write(spi, txbuf, 1);
-	if (res) {
-		DEBUG(MTD_DEBUG_LEVEL1, "%s: failed write disable res=%d\n", chip->name, res);
-	}
-
-	mutex_unlock(&chip->lock);
-
-	mtd_erase_callback(instr);
-	return 0;
-}
-
-/*
- * nand_spi_er_read
- *
- * return -EUCLEAN: ecc error recovered
- * return -EBADMSG: ecc error not recovered
-*/
-static int nand_spi_er_read(struct mtd_info *mtd, loff_t from, size_t len,
-			       size_t *retlen, u_char *buf)
-{
-	struct nand_spi_er *chip = mtd->priv;
-	struct spi_device *spi = chip->spi;
-
-	uint32_t row;
-	uint32_t column;
-	int retval = 0;
-
-	*retlen = 0;
-	DEBUG(MTD_DEBUG_LEVEL2, "%s: read block from %llx len %d into %p\n", chip->name, from, len, buf);
-
-	/*
-	 * Zero length reads, nothing to do
-	 */
-	if (len == 0) {
-		return 0;
-	}
-
-	/*
-	 * Reject reads which go over the end of the flash
-	 */
-	if ((from + len) > mtd->size) {
-		return -EINVAL;
-	}
-
-	/*
-	 * Get the row and column address to start at
-	 */
-	row = from >> 11;
-	column = from & 0x7FF;
-	DEBUG(MTD_DEBUG_LEVEL3, "%s: row=%x %d column=%x %d last_row=%x %d\n", chip->name, row, row, column, column, chip->last_row, chip->last_row);
-
-	/*
-	 * Read the data from the chip
-	 */
-	mutex_lock(&chip->lock);
-	while (len) {
-		uint8_t stat;
-		uint8_t txbuf[4];
-		struct spi_message message;
-		struct spi_transfer x[2];
-		int res;
-		size_t toread;
-
-		/*
-		 * Figure out how much to read
-		 *
-		 * If we are reading from the middle of a page then the most we
-		 * can read is to the end of the page
-		 */
-		toread = len;
-		if (toread > (chip->device->page_size - column)) {
-			toread = chip->device->page_size - column;
-		}
-
-		DEBUG(MTD_DEBUG_LEVEL3, "%s: buf=%p toread=%x row=%x column=%x last_row=%x\n", chip->name, buf, toread, row, column, chip->last_row);
-
-		if (chip->last_row != row) {
-			/*
-			 * Check if the block is bad
-			 */
-			if (test_bit(NAND_SPI_ER_BLOCK_FROM_ROW(row), chip->bbt)) {
-				mutex_unlock(&chip->lock);
-				return -EBADMSG;
-			}
-
-			/*
-			 * Load the appropriate page
-			 */
-			txbuf[0] = 0x13;
-			txbuf[1] = 0x00;
-			txbuf[2] = row >> 8;
-			txbuf[3] = row & 0xFF;
-			res = spi_write(spi, txbuf, 4);
-			if (res) {
-				DEBUG(MTD_DEBUG_LEVEL1, "%s: failed page load res=%d\n", chip->name, res);
-				mutex_unlock(&chip->lock);
-				return res;
-			}
-
-			/*
-			 * Wait
-			 */
-			res = nand_spi_er_busywait(chip, &stat);
-			if (res || (stat & NAND_SPI_ER_STATUS_OIP)) {
-				DEBUG(MTD_DEBUG_LEVEL1, "%s: chip is busy or nonresponsive res=%d stat=%02x\n", chip->name, res, stat);
-				if (res) {
-					mutex_unlock(&chip->lock);
-					return res;
-				}
-
-				/*
-				 * Chip is stuck?
-				 */
-				mutex_unlock(&chip->lock);
-				return -EIO;
-			}
-
-			/*
-			 * Check the ECC bits
-			 */
-			stat >>= 4;
-			if (stat == 1) {
-				DEBUG(MTD_DEBUG_LEVEL1, "%s: ECC recovered, row=%x\n", chip->name, row);
-				retval = -EUCLEAN;
-			}
-			if (stat == 2) {
-				DEBUG(MTD_DEBUG_LEVEL0, "%s: failed ECC, row=%x\n", chip->name, row);
-				chip->last_row = NAND_SPI_ER_LAST_ROW_INVALID;
-				mutex_unlock(&chip->lock);
-				return -EBADMSG;
-			}
-
-		}
-
-		chip->last_row = row;
-
-		/*
-		 * Read out the data
-		 */
-		spi_message_init(&message);
-		memset(x, 0, sizeof(x));
-
-		txbuf[0] = 0x03;
-		txbuf[1] = column >> 8;
-		txbuf[2] = column & 0xFF;
-		txbuf[3] = 0;
-		x[0].tx_buf = txbuf;
-		x[0].len = 4;
-		spi_message_add_tail(&x[0], &message);
-
-		x[1].rx_buf = buf;
-		x[1].len = toread;
-		spi_message_add_tail(&x[1], &message);
-
-		res = spi_sync(spi, &message);
-		if (res) {
-			DEBUG(MTD_DEBUG_LEVEL1, "%s: failed data read res=%d\n", chip->name, res);
-			mutex_unlock(&chip->lock);
-			return res;
-		}
-		buf += toread;
-		len -= toread;
-		*retlen += toread;
-
-		/*
-		 * For the next page, increment the row and always start at column 0
-		 */
-		column = 0;
-		row++;
-	}
-
-	mutex_unlock(&chip->lock);
-	return retval;
-}
-
-/*
- * nand_spi_er_write
- */
-#define NOT_ALIGNED(x) ((x & (device->write_size - 1)) != 0)
-static int nand_spi_er_write(struct mtd_info *mtd, loff_t to, size_t len,
-				size_t *retlen, const u_char *buf)
-{
-	struct nand_spi_er *chip = mtd->priv;
-	struct spi_device *spi = chip->spi;
-	const struct nand_spi_er_device *device = chip->device;
-	uint32_t row;
-	uint32_t col;
-	uint8_t txbuf[4];
-	int res;
-	size_t towrite;
-
-	DEBUG(MTD_DEBUG_LEVEL2, "%s: write block to %llx len %d from %p\n", chip->name, to, len, buf);
-
-	*retlen = 0;
-
-	/*
-	 * nothing to write
-	 */
-	if (!len) {
-		return 0;
-	}
-
-	/*
-	 * Reject writes which go over the end of the flash
-	 */
-	if ((to + len) > mtd->size) {
-		return -EINVAL;
-	}
-
-	/*
-	 * Check to see if everything is page aligned
-	 */
-	if (NOT_ALIGNED(to) || NOT_ALIGNED(len)) {
-		printk(KERN_NOTICE "nand_spi_er_write: Attempt to write non page aligned data\n");
-		return -EINVAL;
-	}
-
-	mutex_lock(&chip->lock);
-	chip->last_row = NAND_SPI_ER_LAST_ROW_INVALID;
-
-	/*
-	 * If the first write is a partial write then write at most the number of
-	 * bytes to get us page aligned and then the remainder will be
-	 * page aligned.  The last bit may be a partial page as well.
-	 */
-	col = to & (device->page_size - 1);
-	towrite = device->page_size - col;
-	if (towrite > len) {
-		towrite = len;
-	}
-
-	/*
-	 * Write the data
-	 */
-	row = to >> 11;
-	while (len) {
-		struct spi_message message;
-		struct spi_transfer x[2];
-		uint8_t stat;
-
-		DEBUG(MTD_DEBUG_LEVEL3, "%s: write %p to row:%x col:%x len:%x rem:%x\n", chip->name, buf, row, col, towrite, len);
-
-		/*
-		 * Write enable
-		 */
-		txbuf[0] = 0x06;
-		res = spi_write(spi, txbuf, 1);
-		if (res) {
-			DEBUG(MTD_DEBUG_LEVEL1, "%s: failed write enable res=%d\n", chip->name, res);
-			mutex_unlock(&chip->lock);
-			return res;
-		}
-
-		/*
-		 * Write the data into the cache
-		 */
-		spi_message_init(&message);
-		memset(x, 0, sizeof(x));
-		txbuf[0] = 0x02;
-		txbuf[1] = col >> 8;
-		txbuf[2] = col & 0xFF;
-		x[0].tx_buf = txbuf;
-		x[0].len = 3;
-		spi_message_add_tail(&x[0], &message);
-		x[1].tx_buf = buf;
-		x[1].len = towrite;
-		spi_message_add_tail(&x[1], &message);
-		res = spi_sync(spi, &message);
-		if (res) {
-			DEBUG(MTD_DEBUG_LEVEL1, "%s: failed cache write res=%d\n", chip->name, res);
-			goto done;
-		}
-
-		/*
-		 * Program execute
-		 */
-		txbuf[0] = 0x10;
-		txbuf[1] = 0x00;
-		txbuf[2] = row >> 8;
-		txbuf[3] = row & 0xFF;
-		res = spi_write(spi, txbuf, 4);
-		if (res) {
-			DEBUG(MTD_DEBUG_LEVEL1, "%s: failed prog execute res=%d\n", chip->name, res);
-			goto done;
-		}
-
-		/*
-		 * Wait
-		 */
-		res = nand_spi_er_busywait(chip, &stat);
-		if (res || (stat & NAND_SPI_ER_STATUS_OIP)) {
-			DEBUG(MTD_DEBUG_LEVEL1, "%s: chip is busy or nonresponsive res=%d stat=%02x\n", chip->name, res, stat);
-			if (res) {
-				goto done;
-			}
-
-			/*
-			 * Chip is stuck?
-			 */
-			res = -EIO;
-			goto done;
-		}
-
-		if (stat & (1 << 3)) {
-			res = -EBADMSG;
-			goto done;
-		}
-
-		row++;
-		buf += towrite;
-		len -= towrite;
-		*retlen += towrite;
-
-		/*
-		 * At this point, we are always page aligned so start at column 0.
-		 * Note we may not have a full page to write at the end, hence the
-		 * check if towrite > len.
-		 */
-		col = 0;
-		towrite = device->page_size;
-		if (towrite > len) {
-			towrite = len;
-		}
-	}
-
-	mutex_unlock(&chip->lock);
-	return res;
-
-done:
-	/*
-	 * Write disable
-	 */
-	txbuf[0] = 0x04;
-	res = spi_write(spi, txbuf, 1);
-	if (res) {
-		DEBUG(MTD_DEBUG_LEVEL1, "%s: failed write disable res=%d\n", chip->name, res);
-	}
-
-	mutex_unlock(&chip->lock);
-
-	return res;
-}
-
-/*
- * nand_spi_er_isbad
- */
-static int nand_spi_er_isbad(struct mtd_info *mtd, loff_t ofs)
-{
-	struct nand_spi_er *chip = mtd->priv;
-	uint32_t block;
-
-	if (ofs & (chip->device->erase_size - 1)) {
-		DEBUG(MTD_DEBUG_LEVEL1, "%s: address not aligned %llx\n", chip->name, ofs);
-		return -EINVAL;
-	}
-
-	block = ofs >> 17;
-
-	return test_bit(block, chip->bbt);
-}
-
-/*
- * nand_spi_er_markbad
- */
-static int nand_spi_er_markbad(struct mtd_info *mtd, loff_t ofs)
-{
-	struct nand_spi_er *chip = mtd->priv;
-	struct spi_device *spi = chip->spi;
-	uint32_t block;
-	uint32_t row;
-	uint8_t txbuf[7];
-	int res;
-	uint8_t stat;
-
-	if (ofs & (chip->device->erase_size - 1)) {
-		DEBUG(MTD_DEBUG_LEVEL1, "%s: address not aligned %llx\n", chip->name, ofs);
-		return -EINVAL;
-	}
-
-	block = ofs >> 17;
-
-	/*
-	 * If it's already marked bad, no need to mark it
-	 */
-	if (test_bit(block, chip->bbt)) {
-		return 0;
-	}
-
-	/*
-	 * Mark it in our cache
-	 */
-	__set_bit(block, chip->bbt);
-
-	/*
-	 * Write the user bad block mark.  If it fails, then we really
-	 * can't do anything about it.
-	 */
-	mutex_lock(&chip->lock);
-	chip->last_row = NAND_SPI_ER_LAST_ROW_INVALID;
-
-	/*
-	 * Write enable
-	 */
-	txbuf[0] = 0x06;
-	res = spi_write(spi, txbuf, 1);
-	if (res) {
-		DEBUG(MTD_DEBUG_LEVEL1, "%s: failed write enable res=%d\n", chip->name, res);
-		mutex_unlock(&chip->lock);
-		return res;
-	}
-
-	/*
-	 * Write the mark
-	 */
-	txbuf[0] = 0x84;
-	txbuf[1] = 0x08;
-	txbuf[2] = NAND_SPI_ER_BAD_BLOCK_MARK_OFFSET;
-	txbuf[3] = 0xde;
-	txbuf[4] = 0xad;
-	txbuf[5] = 0xbe;
-	txbuf[6] = 0xef;
-	res = spi_write(spi, txbuf, 7);
-	if (res) {
-		DEBUG(MTD_DEBUG_LEVEL1, "%s: failed write mark res=%d\n", chip->name, res);
-		goto done;
-	}
-
-	/*
-	 * Program execute
-	 */
-	row = ofs >> 11;
-	txbuf[0] = 0x10;
-	txbuf[1] = 0x00;
-	txbuf[2] = row >> 8;
-	txbuf[3] = row & 0xFF;
-	res = spi_write(spi, txbuf, 4);
-	if (res) {
-		DEBUG(MTD_DEBUG_LEVEL1, "%s: failed program execute res=%d\n", chip->name, res);
-		goto done;
-	}
-
-	/*
-	 * Wait
-	 */
-	res = nand_spi_er_busywait(chip, &stat);
-	if (res || (stat & NAND_SPI_ER_STATUS_OIP)) {
-		DEBUG(MTD_DEBUG_LEVEL1, "%s: chip is busy or nonresponsive res=%d stat=%02x\n", chip->name, res, stat);
-		if (res) {
-			goto done;
-		}
-
-		/*
-		 * Chip is stuck?
-		 */
-		res = -EIO;
-		goto done;
-	}
-
-	if (stat & (1 << 3)) {
-		res = -EBADMSG;
-	}
-
-done:
-	/*
-	 * Write disable
-	 */
-	txbuf[0] = 0x04;
-	res = spi_write(spi, txbuf, 1);
-	if (res) {
-		DEBUG(MTD_DEBUG_LEVEL1, "%s: failed write disable res=%d\n", chip->name, res);
-	}
-
-	mutex_unlock(&chip->lock);
-
-	return res;
-}
-
-/*
- * nand_spi_er_read_bbt
- */
-static int nand_spi_er_read_bbt(struct nand_spi_er *chip)
-{
-	int j;
-	for (j = 0; j < chip->device->blocks; j++) {
-		uint8_t txbuf[4];
-		uint8_t rxbuf[16];
-		uint32_t bbmark;
-		int res;
-		unsigned short row = j << 6;
-		uint8_t stat;
-
-		/*
-		 * Read Page
-		 */
-		txbuf[0] = 0x13;
-		txbuf[1] = 0x00;
-		txbuf[2] = row >> 8;
-		txbuf[3] = row & 0xFF;
-		res = spi_write(chip->spi, txbuf, 4);
-		if (res) {
-			return res;
-		}
-
-		/*
-		 * Wait
-		 */
-		res = nand_spi_er_busywait(chip, &stat);
-		if (res || (stat & NAND_SPI_ER_STATUS_OIP)) {
-			DEBUG(MTD_DEBUG_LEVEL1, "%s: chip is busy or nonresponsive res=%d stat=%02x\n", chip->name, res, stat);
-			if (res) {
-				return res;
-			}
-
-			/*
-			 * Chip is stuck?
-			 */
-			return -EIO;
-		}
-
-		/*
-		 * Check factory bad block mark
-		 */
-		txbuf[0] = 0x03;
-		txbuf[1] = 0x08;
-		txbuf[2] = 0x00;
-		txbuf[3] = 0x00;
-		res = spi_write_then_read(chip->spi, txbuf, 4, rxbuf, 16);
-		if (res) {
-			return res;
-		}
-		if (rxbuf[0] != 0xFF) {
-			chip->nbb++;
-			__set_bit(j, chip->bbt);
-			continue;
-		}
-
-		memcpy(&bbmark, &rxbuf[8], 4);
-		if (bbmark == 0xdeadbeef) {
-			chip->nbb++;
-			__set_bit(j, chip->bbt);
-		}
-	}
-
-#if defined(CONFIG_MTD_DEBUG) && (MTD_DEBUG_LEVEL3 <= CONFIG_MTD_DEBUG_VERBOSE)
-	printk("%s: Bad Block Table:", chip->name);
-	for (j = 0; j < chip->device->blocks; j++) {
-		if ((j % 64) == 0) {
-			printk("\n%s: block %03x: ", chip->name, j);
-		}
-		printk("%c", test_bit(j, chip->bbt) ? 'X' : '.');
-	}
-	printk("\n%s: Bad Block Numbers: ", chip->name);
-	for (j = 0; j < chip->device->blocks; j++) {
-		if (test_bit(j, chip->bbt)) {
-			printk("%x ", j);
-		}
-	}
-	printk("\n");
-#endif
-
-	return 0;
-}
-
-#ifndef MODULE
-/*
- * Called at boot time:
- *
- * nand_spi_er=read_only
- *	if read_only specified then do not unlock device
- */
-static int __init nand_spi_er_setup(char *str)
-{
-	if (str && (strncasecmp(str, "read_only", 9) == 0)) {
-		read_only = 1;
-	}
-	return 0;
-}
-
-__setup("nand_spi_er=", nand_spi_er_setup);
-#endif
-
-/*
- * nand_spi_er_probe
- *	Detect and initialize nand_spi_er device.
- */
-static int __devinit nand_spi_er_probe(struct spi_device *spi)
-{
-	uint8_t txbuf[3];
-	uint8_t rxbuf[2];
-	int i;
-	int res;
-	size_t bbt_bytes;
-	struct nand_spi_er *chip;
-	const struct nand_spi_er_device *device;
-
-	res = spi_setup(spi);
-	if (res) {
-		return res;
-	}
-
-	/*
-	 * Reset
-	 */
-	for (i = 0; i < 2; i++) {
-		txbuf[0] = 0xFF;
-		res = spi_write(spi, txbuf, 1);
-		if (res) {
-			return res;
-		}
-		udelay(250);
-	}
-	udelay(1000);
-
-	/*
-	 * Read ID
-	 */
-	txbuf[0] = 0x9F;
-	txbuf[1] = 0x00;
-	res = spi_write_then_read(spi, txbuf, 2, rxbuf, 2);
-	if (res) {
-		return res;
-	}
-
-	device = nand_spi_er_devices;
-	for (i = 0; i < ARRAY_SIZE(nand_spi_er_devices); i++) {
-		if ((device->id0 == rxbuf[0]) && (device->id1 == rxbuf[1])) {
-			break;
-		}
-		device++;
-	}
-	if (i == ARRAY_SIZE(nand_spi_er_devices)) {
-		return -ENODEV;
-	}
-
-	/*
-	 * Initialize our chip structure
-	 */
-	bbt_bytes = DIV_ROUND_UP(device->blocks, BITS_PER_BYTE);
-	chip = kzalloc(sizeof(struct nand_spi_er) + bbt_bytes, GFP_KERNEL);
-	if (!chip) {
-		return -ENOMEM;
-	}
-	snprintf(chip->name, sizeof(chip->name), "%s.%d.%d", device->name, spi->master->bus_num, spi->chip_select);
-
-	chip->spi = spi;
-	chip->device = device;
-	chip->last_row = NAND_SPI_ER_LAST_ROW_INVALID;
-
-	mutex_init(&chip->lock);
-
-	chip->mtd.type = MTD_NANDFLASH;
-	chip->mtd.flags = MTD_WRITEABLE;
-
-	/*
-	 * #blocks * block size * n blocks
-	 */
-	chip->mtd.size = device->blocks * device->pages_per_block * device->page_size;
-	chip->mtd.erasesize = device->erase_size;
-
-	/*
-	 * 1 page, optionally we can support partial write (512)
-	 */
-	chip->mtd.writesize = device->write_size;
-	chip->mtd.name = device->name;
-	chip->mtd.erase = nand_spi_er_erase;
-	chip->mtd.read = nand_spi_er_read;
-	chip->mtd.write = nand_spi_er_write;
-	chip->mtd.block_isbad = nand_spi_er_isbad;
-	chip->mtd.block_markbad = nand_spi_er_markbad;
-	chip->mtd.priv = chip;
-
-	/*
-	 * Cache the bad block table
-	 */
-	res = nand_spi_er_read_bbt(chip);
-	if (res) {
-		kfree(chip);
-		return res;
-	}
-
-	/*
-	 * Un/lock the chip
-	 */
-	txbuf[0] = 0x1F;
-	txbuf[1] = 0xA0;
-	if (read_only) {
-		txbuf[2] = 0x38;
-	} else {
-		txbuf[2] = 0x00;
-	}
-	res = spi_write(spi, txbuf, 3);
-	if (res) {
-		DEBUG(MTD_DEBUG_LEVEL1, "%s: failed lock operation res=%d\n", chip->name, res);
-		mutex_unlock(&chip->lock);
-		return res;
-	}
-
-	spi_set_drvdata(spi, chip);
-
-	printk(KERN_INFO "%s: added device %s size: %u KBytes %u bad blocks %s\n", spi->dev.bus_id, chip->mtd.name, DIV_ROUND_UP(chip->mtd.size, 1024), chip->nbb, read_only ? "[read only]" : "");
-	return add_mtd_device(&chip->mtd);
-}
-
-/*
- * nand_spi_er_remove
- */
-static int __devexit nand_spi_er_remove(struct spi_device *spi)
-{
-	struct nand_spi_er *chip = spi_get_drvdata(spi);
-	int status = 0;
-
-	DEBUG(MTD_DEBUG_LEVEL1, "%s: remove\n", spi->dev.bus_id);
-	status = del_mtd_device(&chip->mtd);
-	if (status == 0)
-		kfree(chip);
-	return status;
-}
-
-static struct spi_driver nand_spi_er_driver = {
-	.driver = {
-		.name		= "nand-spi-er",
-		.bus		= &spi_bus_type,
-		.owner		= THIS_MODULE,
-	},
-
-	.probe		= nand_spi_er_probe,
-	.remove		= __devexit_p(nand_spi_er_remove),
-
-	/* FIXME:  investigate suspend and resume... */
-};
-
-/*
- * nand_spi_er_init
- */
-static int __init nand_spi_er_init(void)
-{
-	return spi_register_driver(&nand_spi_er_driver);
-}
-module_init(nand_spi_er_init);
-
-/*
- * nand_spi_er_exit
- */
-static void __exit nand_spi_er_exit(void)
-{
-	spi_unregister_driver(&nand_spi_er_driver);
-}
-module_exit(nand_spi_er_exit);
-
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Patrick Tjin");
-MODULE_DESCRIPTION("MTD nand_spi_er driver");
diff --git a/target/linux/ubicom32/files/drivers/mtd/devices/ubi32-m25p80.c b/target/linux/ubicom32/files/drivers/mtd/devices/ubi32-m25p80.c
deleted file mode 100644
index 405491cc4..000000000
--- a/target/linux/ubicom32/files/drivers/mtd/devices/ubi32-m25p80.c
+++ /dev/null
@@ -1,1066 +0,0 @@
-/*
- * drivers/mtd/devices/ubi32-m25p80.c
- *   NOR flash driver, Ubicom processor internal SPI flash interface.
- *
- *   This code instantiates the serial flash that contains the
- *   original bootcode.  The serial flash start at address 0x60000000
- *   in both Ubicom32V3 and Ubicom32V4 ISAs.
- *
- *   This piece of flash is made to appear as a Memory Technology
- *   Device (MTD) with this driver to allow Read/Write/Erase operations.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <linux/types.h>
-#include <linux/device.h>
-#include <linux/platform_device.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/physmap.h>
-#include <linux/spi/spi.h>
-#include <linux/spi/flash.h>
-
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/interrupt.h>
-#include <linux/mutex.h>
-
-#include <asm/ip5000.h>
-#include <asm/devtree.h>
-
-#define UBICOM32_FLASH_BASE	0x60000000
-#define UBICOM32_FLASH_MAX_SIZE 0x01000000
-#define UBICOM32_FLASH_START	0x00000000
-#define UBICOM32_KERNEL_OFFSET	0x00010000 /* The kernel starts after Ubicom
-					    * .protect section. */
-
-static struct mtd_partition ubicom32_flash_partitions[] = {
-	{
-		.name	= "Bootloader",		/* Protected Section
-						 * Partition */
-		.size	= 0x10000,
-		.offset	= UBICOM32_FLASH_START,
-//		.mask_flags = MTD_WRITEABLE	/* Mark Read-only */
-	},
-	{
-		.name	= "Kernel",		/* Kernel Partition. */
-		.size	= 0,			/* this will be set up during
-						 * probe stage. At that time we
-						 * will know end of linux image
-						 * in flash. */
-		.offset	= MTDPART_OFS_APPEND,	/* Starts right after Protected
-						 * section. */
-//		.mask_flags = MTD_WRITEABLE	/* Mark Read-only */
-	},
-	{
-		.name	= "Rest",		/* Rest of the flash. */
-		.size	= 0x200000,		/* Use up what remains in the
-						 * flash. */
-		.offset	= MTDPART_OFS_NXTBLK,	/* Starts right after Protected
-						 * section. */
-	}
-};
-
-static struct flash_platform_data ubicom32_flash_data = {
-	.name = "ubicom32_boot_flash",
-	.parts = ubicom32_flash_partitions,
-	.nr_parts = ARRAY_SIZE(ubicom32_flash_partitions),
-};
-
-static struct resource ubicom32_flash_resource[] = {
-	{
-		.start	= UBICOM32_FLASH_BASE,
-		.end	= UBICOM32_FLASH_BASE +
-		UBICOM32_FLASH_MAX_SIZE - 1,
-		.flags	= IORESOURCE_MEM,
-	},
-};
-
-static struct platform_device ubicom32_flash_device = {
-	.name = "ubicom32flashdriver",
-	.id = 0, /* Bus number */
-	.num_resources = ARRAY_SIZE(ubicom32_flash_resource),
-	.resource = ubicom32_flash_resource,
-	.dev = {
-		.platform_data = &ubicom32_flash_data,
-	},
-};
-
-static struct platform_device *ubicom32_flash_devices[] = {
-	&ubicom32_flash_device,
-};
-
-static int __init ubicom32_flash_init(void)
-{
-	printk(KERN_INFO "%s(): registering device resources\n",
-	       __FUNCTION__);
-	platform_add_devices(ubicom32_flash_devices,
-			     ARRAY_SIZE(ubicom32_flash_devices));
-	return 0;
-}
-
-arch_initcall(ubicom32_flash_init);
-
-/*
- * MTD SPI driver for ST M25Pxx (and similar) serial flash chips through
- * Ubicom32 SPI controller.
- *
- * Author: Mike Lavender, mike@steroidmicros.com
- *
- * Copyright (c) 2005, Intec Automation Inc.
- *
- * Some parts are based on lart.c by Abraham Van Der Merwe
- *
- * Cleaned up and generalized based on mtd_dataflash.c
- *
- * This code 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.
- *
- */
-
-#define FLASH_PAGESIZE		256
-
-/* Flash opcodes. */
-#define	OPCODE_WREN		0x06	/* Write enable */
-#define	OPCODE_RDSR		0x05	/* Read status register */
-#define	OPCODE_READ		0x03	/* Read data bytes (low frequency) */
-#define	OPCODE_FAST_READ	0x0b	/* Read data bytes (high frequency) */
-#define	OPCODE_PP		0x02	/* Page program (up to 256 bytes) */
-#define	OPCODE_BE_4K		0x20	/* Erase 4KiB block */
-#define	OPCODE_BE_32K		0x52	/* Erase 32KiB block */
-#define	OPCODE_SE		0xd8	/* Sector erase (usually 64KiB) */
-#define	OPCODE_RDID		0x9f	/* Read JEDEC ID */
-
-/* Status Register bits. */
-#define	SR_WIP			1	/* Write in progress */
-#define	SR_WEL			2	/* Write enable latch */
-/* meaning of other SR_* bits may differ between vendors */
-#define	SR_BP0			4	/* Block protect 0 */
-#define	SR_BP1			8	/* Block protect 1 */
-#define	SR_BP2			0x10	/* Block protect 2 */
-#define	SR_SRWD			0x80	/* SR write protect */
-
-/* Define max times to check status register before we give up. */
-#define	MAX_READY_WAIT_COUNT	100000
-
-
-#ifdef CONFIG_MTD_PARTITIONS
-#define	mtd_has_partitions()	(1)
-#else
-#define	mtd_has_partitions()	(0)
-#endif
-
-/*
- * Ubicom32 FLASH Command Set
- */
-#define FLASH_FC_INST_CMD	0x00	/* for SPI command only transaction */
-#define FLASH_FC_INST_WR	0x01	/* for SPI write transaction */
-#define FLASH_FC_INST_RD	0x02	/* for SPI read transaction */
-
-#define ALIGN_DOWN(v, a) ((v) & ~((a) - 1))
-#define ALIGN_UP(v, a) (((v) + ((a) - 1)) & ~((a) - 1))
-
-#define	FLASH_COMMAND_KICK_OFF(io)							\
-	asm volatile(									\
-	"	bset	"D(IO_INT_CLR)"(%0), #0, #%%bit("D(IO_XFL_INT_DONE)")	\n\t"	\
-	"	jmpt.t	.+4							\n\t"	\
-	"	bset	"D(IO_INT_SET)"(%0), #0, #%%bit("D(IO_XFL_INT_START)")	\n\t"	\
-		:									\
-		: "a" (io)								\
-		: "memory", "cc"							\
-	);
-
-#define	FLASH_COMMAND_WAIT_FOR_COMPLETION(io)						\
-	asm volatile(									\
-	"	btst	"D(IO_INT_STATUS)"(%0), #%%bit("D(IO_XFL_INT_DONE)")	\n\t"	\
-	"	jmpeq.f	.-4							\n\t"	\
-		:									\
-		: "a" (io)								\
-		: "memory", "cc"									\
-	);
-
-#define	FLASH_COMMAND_EXEC(io)								\
-	FLASH_COMMAND_KICK_OFF(io)							\
-	FLASH_COMMAND_WAIT_FOR_COMPLETION(io)
-
-
-#define OSC1_FREQ 12000000
-#define TEN_MICRO_SECONDS (OSC1_FREQ * 10 / 1000000)
-
-/*
- * We will have to eventually replace this null definition with the real thing.
- */
-#define WATCHDOG_RESET()
-
-#define EXTFLASH_WRITE_FIFO_SIZE 32
-#define EXTFLASH_WRITE_BLOCK_SIZE EXTFLASH_WRITE_FIFO_SIZE /* limit the size to
-							    * FIFO capacity, so
-							    * the thread can be
-							    * suspended. */
-
-#define JFFS2_FILESYSTEM_SIZE 0x100000
-
-/****************************************************************************/
-
-struct m25p {
-	struct platform_device	*plt_dev;
-	struct mutex		lock;
-	struct mtd_info		mtd;
-	unsigned		partitioned:1;
-	u8			erase_opcode;
-	u8			command[4];
-};
-
-static inline struct m25p *mtd_to_m25p(struct mtd_info *mtd)
-{
-	return container_of(mtd, struct m25p, mtd);
-}
-
-/****************************************************************************/
-
-/*
- * Internal helper functions
- */
-
-/*
- * Read the status register, returning its value in the location
- * Return the status register value.
- * Returns negative if error occurred.
- */
-static int read_sr(struct m25p *flash)
-{
-	struct ubicom32_io_port *io = (struct ubicom32_io_port *)RA;
-
-	io->ctl1 &= ~IO_XFL_CTL1_MASK;
-	io->ctl1 |= IO_XFL_CTL1_FC_INST(FLASH_FC_INST_RD) |
-		IO_XFL_CTL1_FC_DATA(1);
-	io->ctl2 = IO_XFL_CTL2_FC_CMD(OPCODE_RDSR);
-	FLASH_COMMAND_EXEC(io);
-
-	return io->status1 & 0xff;
-}
-
-/*
- * mem_flash_io_read_u32()
- */
-static u32 mem_flash_io_read_u32(u32 addr)
-{
-	struct ubicom32_io_port *io = (struct ubicom32_io_port *)RA;
-	io->ctl1 &= ~IO_XFL_CTL1_MASK;
-	io->ctl1 |= IO_XFL_CTL1_FC_INST(FLASH_FC_INST_RD) |
-		IO_XFL_CTL1_FC_DATA(4) | IO_XFL_CTL1_FC_DUMMY(1) |
-		IO_XFL_CTL1_FC_ADDR;
-	io->ctl2 = IO_XFL_CTL2_FC_CMD(OPCODE_FAST_READ) |
-		IO_XFL_CTL2_FC_ADDR(addr);
-	FLASH_COMMAND_EXEC(io);
-	return io->status1;
-}
-
-/*
- * mem_flash_read_u8()
- */
-static u8 mem_flash_read_u8(u32 addr)
-{
-	u32 tmp_addr = ALIGN_DOWN(addr, 4);
-	u32 tmp_data = mem_flash_io_read_u32(tmp_addr);
-	u8 *ptr = (u8 *)&tmp_data;
-	return ptr[addr & 0x3];
-}
-
-/*
- * mem_flash_read()
- *	No need to lock as read is implemented with ireads (same as normal flash
- *	execution).
- */
-static void mem_flash_read(u32 addr, void *dst, size_t length)
-{
-	/*
-	 * Range check
-	 */
-	/*
-	 * Fix source alignment.
-	 */
-	while (addr & 0x03) {
-		if (length == 0) {
-			return;
-		}
-		*((u8 *)dst) = mem_flash_read_u8(addr++);
-		dst++;
-		length--;
-	}
-
-	while (length >= 4) {
-		u32 tmp_data = mem_flash_io_read_u32(addr);
-		addr += 4;
-		length -= 4;
-
-		/*
-		 * Send the data to the destination.
-		 */
-		memcpy((void *)dst, (void *)&tmp_data, 4);
-		dst += 4;
-	}
-
-	while (length--) {
-		*((u8 *)dst) = mem_flash_read_u8(addr++);
-		dst++;
-	}
-}
-
-/*
- * mem_flash_wait_until_complete()
- */
-static void mem_flash_wait_until_complete(void)
-{
-	struct ubicom32_io_port *io = (struct ubicom32_io_port *)RA;
-
-	do {
-		/*
-		 * Put a delay here to deal with flash programming problem.
-		 */
-		u32 mptval = UBICOM32_IO_TIMER->mptval + TEN_MICRO_SECONDS;
-		while (UBICOM32_IO_TIMER->mptval < mptval)
-			;
-
-		io->ctl1 &= ~IO_XFL_CTL1_MASK;
-		io->ctl1 |= IO_XFL_CTL1_FC_INST(FLASH_FC_INST_RD) |
-			IO_XFL_CTL1_FC_DATA(1);
-		io->ctl2 = IO_XFL_CTL2_FC_CMD(OPCODE_RDSR);
-		FLASH_COMMAND_EXEC(io);
-	} while (io->status1 & SR_WIP);
-}
-
-/*
- * mem_flash_write_next()
- */
-static size_t mem_flash_write_next(u32 addr, u8 *buf, size_t length)
-{
-	struct ubicom32_io_port *io = (struct ubicom32_io_port *)RA;
-	u32 data_start = addr;
-	u32 data_end = addr + length;
-	size_t count;
-	u32 i, j;
-
-	/*
-	 * Top limit address.
-	 */
-	u32 block_start = ALIGN_DOWN(data_start, 4);
-	u32 block_end = block_start + EXTFLASH_WRITE_BLOCK_SIZE;
-
-	union {
-		u8 byte[EXTFLASH_WRITE_BLOCK_SIZE];
-		u32 word[EXTFLASH_WRITE_BLOCK_SIZE / 4];
-	} write_buf;
-
-	u32 *flash_addr = (u32 *)block_start;
-
-	/*
-	 * The write block must be limited by FLASH internal buffer.
-	 */
-	u32 block_end_align = ALIGN_DOWN(block_end, 256);
-	bool write_needed;
-
-	block_end = (block_end_align > block_start)
-		? block_end_align : block_end;
-	data_end = (data_end <= block_end) ? data_end : block_end;
-	block_end = ALIGN_UP(data_end, 4);
-	count = data_end - data_start;
-
-	/*
-	 * Transfer data to a buffer.
-	 */
-	for (i = 0; i < (block_end - block_start) / 4; i++) {
-		/*
-		 * The FLASH read can hold D-cache for a long time.
-		 * Use I/O operation to read FLASH to avoid starving other
-		 * threads, especially HRT.  (Do this for application only)
-		 */
-		write_buf.word[i] = mem_flash_io_read_u32(
-			(u32)(&flash_addr[i]));
-	}
-
-	write_needed = false;
-	for (i = 0, j = (data_start - block_start);
-	     i < (data_end - data_start); i++, j++) {
-		write_needed = write_needed || (write_buf.byte[j] != buf[i]);
-		write_buf.byte[j] &= buf[i];
-	}
-
-
-	/*
-	 * If the data in FLASH is identical to what to be written. Then skip
-	 * it.
-	 */
-	if (write_needed) {
-		/*
-		 * Write to flash.
-		 */
-		void *tmp __attribute__((unused));
-		s32 extra_words;
-
-		asm volatile(
-		"	move.4	%0, %2									\n\t"
-		"	bset	"D(IO_INT_SET)"(%1), #0, #%%bit("D(IO_PORTX_INT_FIFO_TX_RESET)")	\n\t"
-		"	pipe_flush 0									\n\t"
-		"	.rept	"D(EXTFLASH_WRITE_FIFO_SIZE / 4)"					\n\t"
-		"	move.4	"D(IO_TX_FIFO)"(%1), (%0)4++						\n\t"
-		"	.endr										\n\t"
-			: "=&a" (tmp)
-			: "a" (io), "r" (&write_buf.word[0])
-			: "memory", "cc"
-		);
-
-		/* Lock FLASH for write access. */
-		io->ctl0 |= IO_XFL_CTL0_MCB_LOCK;
-
-		/* Command: WREN */
-		io->ctl1 &= ~IO_XFL_CTL1_MASK;
-		io->ctl1 |= IO_XFL_CTL1_FC_INST(FLASH_FC_INST_CMD);
-		io->ctl2 = IO_XFL_CTL2_FC_CMD(OPCODE_WREN);
-		FLASH_COMMAND_EXEC(io);
-
-		/* Command: BYTE PROGRAM */
-		io->ctl1 &= ~IO_XFL_CTL1_MASK;
-		io->ctl1 |= IO_XFL_CTL1_FC_INST(FLASH_FC_INST_WR) |
-			IO_XFL_CTL1_FC_DATA(block_end - block_start) |
-			IO_XFL_CTL1_FC_ADDR;
-		io->ctl2 = IO_XFL_CTL2_FC_CMD(OPCODE_PP) |
-			IO_XFL_CTL2_FC_ADDR(block_start);
-		FLASH_COMMAND_KICK_OFF(io);
-
-		extra_words = (s32)(block_end - block_start -
-				    EXTFLASH_WRITE_FIFO_SIZE) / 4;
-		if (extra_words > 0) {
-			asm volatile(
-			"	move.4		%0, %3				\n\t"
-			"1:	cmpi		"D(IO_FIFO_LEVEL)"(%1), #4	\n\t"
-			"	jmpgt.s.t	1b				\n\t"
-			"	move.4		"D(IO_TX_FIFO)"(%1), (%0)4++	\n\t"
-			"	add.4		%2, #-1, %2			\n\t"
-			"	jmpgt.t		1b				\n\t"
-				: "=&a" (tmp)
-				: "a" (io), "d" (extra_words),
-				  "r" (&write_buf.word[EXTFLASH_WRITE_FIFO_SIZE / 4])
-				: "memory", "cc"
-			);
-		}
-		FLASH_COMMAND_WAIT_FOR_COMPLETION(io);
-
-		mem_flash_wait_until_complete();
-
-
-		/* Unlock FLASH for cache access. */
-		io->ctl0 &= ~IO_XFL_CTL0_MCB_LOCK;
-	}
-
-	/*
-	 * Complete.
-	 */
-	return count;
-}
-
-/*
- * mem_flash_write()
- */
-static void mem_flash_write(u32 addr, const void *src, size_t length)
-{
-	/*
-	 * Write data
-	 */
-	u8_t *ptr = (u8_t *)src;
-	while (length) {
-		size_t count = mem_flash_write_next(addr, ptr, length);
-		addr += count;
-		ptr += count;
-		length -= count;
-	}
-}
-
-/*
- * Service routine to read status register until ready, or timeout occurs.
- * Returns non-zero if error.
- */
-static int wait_till_ready(struct m25p *flash)
-{
-	int count;
-	int sr;
-
-	/* one chip guarantees max 5 msec wait here after page writes,
-	 * but potentially three seconds (!) after page erase.
-	 */
-	for (count = 0; count < MAX_READY_WAIT_COUNT; count++) {
-		u32 mptval;
-		sr = read_sr(flash);
-		if (sr < 0)
-			break;
-		else if (!(sr & SR_WIP))
-			return 0;
-
-		/*
-		 * Put a 10us delay here to deal with flash programming problem.
-		 */
-		mptval = UBICOM32_IO_TIMER->mptval + TEN_MICRO_SECONDS;
-		while ((s32)(mptval - UBICOM32_IO_TIMER->mptval) > 0) {
-			WATCHDOG_RESET();
-		}
-		/* REVISIT sometimes sleeping would be best */
-	}
-
-	return 1;
-}
-
-/*
- * mem_flash_erase_page()
- */
-static void mem_flash_erase_page(u32 addr)
-{
-	struct ubicom32_io_port *io = (struct ubicom32_io_port *)RA;
-
-	/* Lock FLASH for write access. */
-	io->ctl0 |= IO_XFL_CTL0_MCB_LOCK;
-
-	/* Command: WREN */
-	io->ctl1 &= ~IO_XFL_CTL1_MASK;
-	io->ctl1 |= IO_XFL_CTL1_FC_INST(FLASH_FC_INST_CMD);
-	io->ctl2 = IO_XFL_CTL2_FC_CMD(OPCODE_WREN);
-	FLASH_COMMAND_EXEC(io);
-
-	/* Command: ERASE */
-	io->ctl1 &= ~IO_XFL_CTL1_MASK;
-	io->ctl1 |= IO_XFL_CTL1_FC_INST(FLASH_FC_INST_CMD) |
-		IO_XFL_CTL1_FC_ADDR;
-	io->ctl2 = IO_XFL_CTL2_FC_CMD(OPCODE_SE) |
-		IO_XFL_CTL2_FC_ADDR(addr);
-	FLASH_COMMAND_EXEC(io);
-
-	mem_flash_wait_until_complete();
-
-	/* Unlock FLASH for cache access. */
-	io->ctl0 &= ~IO_XFL_CTL0_MCB_LOCK;
-}
-
-/*
- * mem_flash_erase()
- */
-static u32 mem_flash_erase(u32 addr, u32 length)
-{
-	/*
-	 * Calculate the endaddress to be the first address of the page
-	 * just beyond this erase section of pages.
-	 */
-	u32 endaddr = addr + length;
-
-	/*
-	 * Erase.
-	 */
-	while (addr < endaddr) {
-		u32 test_addr = addr;
-		mem_flash_erase_page(addr);
-
-		/*
-		 * Test how much was erased as actual flash page at this address
-		 * may be smaller than the expected page size.
-		 */
-		while (test_addr < endaddr) {
-			/*
-			 * The FLASH read can hold D-cache for a long time.  Use
-			 * I/O operation to read FLASH to avoid starving other
-			 * threads, especially HRT.  (Do this for application
-			 * only)
-			 */
-			if (mem_flash_io_read_u32(test_addr) != 0xFFFFFFFF) {
-				break;
-			}
-			test_addr += 4;
-		}
-		if (test_addr == addr) {
-			printk("erase failed at address 0x%x, skipping",
-			       test_addr);
-			test_addr += 4;
-			return 1;
-		}
-		addr = test_addr;
-	}
-	return 0;
-}
-
-
-/****************************************************************************/
-
-/*
- * MTD implementation
- */
-
-/*
- * Erase an address range on the flash chip.  The address range may extend
- * one or more erase sectors.  Return an error is there is a problem erasing.
- */
-static int ubicom32_flash_driver_erase(struct mtd_info *mtd,
-				       struct erase_info *instr)
-{
-	struct m25p *flash = mtd_to_m25p(mtd);
-	u32 addr, len;
-
-	DEBUG(MTD_DEBUG_LEVEL2, "%s: %s %s 0x%08x, len %lld\n",
-	      dev_name(&flash->plt_dev->dev), __FUNCTION__, "at",
-	      (u32)instr->addr, instr->len);
-
-	/* sanity checks */
-	if (instr->addr + instr->len > flash->mtd.size)
-		return -EINVAL;
-	if ((instr->addr % mtd->erasesize) != 0
-			|| (instr->len % mtd->erasesize) != 0) {
-		return -EINVAL;
-	}
-
-	addr = instr->addr + UBICOM32_FLASH_BASE;
-	len = instr->len;
-
-	mutex_lock(&flash->lock);
-
-	/* REVISIT in some cases we could speed up erasing large regions
-	 * by using OPCODE_SE instead of OPCODE_BE_4K
-	 */
-
-	/* now erase those sectors */
-	if (mem_flash_erase(addr, len)) {
-		instr->state = MTD_ERASE_FAILED;
-		mutex_unlock(&flash->lock);
-		return -EIO;
-	}
-
-	mutex_unlock(&flash->lock);
-	instr->state = MTD_ERASE_DONE;
-	mtd_erase_callback(instr);
-	return 0;
-}
-
-/*
- * Read an address range from the flash chip.  The address range
- * may be any size provided it is within the physical boundaries.
- */
-static int ubicom32_flash_driver_read(struct mtd_info *mtd, loff_t from,
-				      size_t len, size_t *retlen, u_char *buf)
-{
-	struct m25p *flash = mtd_to_m25p(mtd);
-	u32 base_addr = UBICOM32_FLASH_BASE + from;
-
-	DEBUG(MTD_DEBUG_LEVEL2, "%s: %s %s 0x%08x, len %d\n",
-	      dev_name(&flash->plt_dev->dev), __FUNCTION__, "from",
-	      (u32)from, len);
-
-	/* sanity checks */
-	if (!len)
-		return 0;
-
-	if (from + len > flash->mtd.size)
-		return -EINVAL;
-
-	/* Byte count starts at zero. */
-	if (retlen)
-		*retlen = 0;
-
-	mutex_lock(&flash->lock);
-
-	/* Wait till previous write/erase is done. */
-	if (wait_till_ready(flash)) {
-		/* REVISIT status return?? */
-		mutex_unlock(&flash->lock);
-		return 1;
-	}
-
-	mem_flash_read(base_addr, (void *)buf, len);
-
-	if (retlen)
-		*retlen = len;
-
-	mutex_unlock(&flash->lock);
-
-	return 0;
-}
-
-/*
- * Write an address range to the flash chip.  Data must be written in
- * FLASH_PAGESIZE chunks.  The address range may be any size provided
- * it is within the physical boundaries.
- */
-static int ubicom32_flash_driver_write(struct mtd_info *mtd, loff_t to,
-				       size_t len, size_t *retlen,
-				       const u_char *buf)
-{
-	struct m25p *flash = mtd_to_m25p(mtd);
-	u32 base_addr = UBICOM32_FLASH_BASE + to;
-	DEBUG(MTD_DEBUG_LEVEL2, "%s: %s %s 0x%08x, len %d\n",
-	      dev_name(&flash->plt_dev->dev), __FUNCTION__, "to",
-	      (u32)to, len);
-
-	if (retlen)
-		*retlen = 0;
-
-	/* sanity checks */
-	if (!len)
-		return 0;
-
-	if (to + len > flash->mtd.size)
-		return -EINVAL;
-
-	mutex_lock(&flash->lock);
-
-	mem_flash_write(base_addr, (void *) buf, len);
-
-	/* Wait until finished previous write command. */
-	if (wait_till_ready(flash)) {
-		mutex_unlock(&flash->lock);
-		return 1;
-	}
-
-	if (retlen)
-		*retlen = len;
-
-	mutex_unlock(&flash->lock);
-	return 0;
-}
-
-
-/****************************************************************************/
-
-/*
- * SPI device driver setup and teardown
- */
-
-struct flash_info {
-	char		*name;
-
-	/* JEDEC id zero means "no ID" (most older chips); otherwise it has
-	 * a high byte of zero plus three data bytes: the manufacturer id,
-	 * then a two byte device id.
-	 */
-	u32		jedec_id;
-
-	/* The size listed here is what works with OPCODE_SE, which isn't
-	 * necessarily called a "sector" by the vendor.
-	 */
-	unsigned	sector_size;
-	u16		n_sectors;
-
-	u16		flags;
-#define	SECT_4K		0x01		/* OPCODE_BE_4K works uniformly */
-};
-
-
-/* NOTE: double check command sets and memory organization when you add
- * more flash chips.  This current list focusses on newer chips, which
- * have been converging on command sets which including JEDEC ID.
- */
-static struct flash_info __devinitdata m25p_data[] = {
-
-	/* Atmel -- some are (confusingly) marketed as "DataFlash" */
-	{ "at25fs010",  0x1f6601, 32 * 1024, 4, SECT_4K, },
-	{ "at25fs040",  0x1f6604, 64 * 1024, 8, SECT_4K, },
-
-	{ "at25df041a", 0x1f4401, 64 * 1024, 8, SECT_4K, },
-
-	{ "at26f004",   0x1f0400, 64 * 1024, 8, SECT_4K, },
-	{ "at26df081a", 0x1f4501, 64 * 1024, 16, SECT_4K, },
-	{ "at26df161a", 0x1f4601, 64 * 1024, 32, SECT_4K, },
-	{ "at26df321",  0x1f4701, 64 * 1024, 64, SECT_4K, },
-
-	/* Spansion -- single (large) sector size only, at least
-	 * for the chips listed here (without boot sectors).
-	 */
-	{ "s25sl004a", 0x010212, 64 * 1024, 8, },
-	{ "s25sl008a", 0x010213, 64 * 1024, 16, },
-	{ "s25sl016a", 0x010214, 64 * 1024, 32, },
-	{ "s25sl032a", 0x010215, 64 * 1024, 64, },
-	{ "s25sl064a", 0x010216, 64 * 1024, 128, },
-
-	/* SST -- large erase sizes are "overlays", "sectors" are 4K */
-	{ "sst25vf040b", 0xbf258d, 64 * 1024, 8, SECT_4K, },
-	{ "sst25vf080b", 0xbf258e, 64 * 1024, 16, SECT_4K, },
-	{ "sst25vf016b", 0xbf2541, 64 * 1024, 32, SECT_4K, },
-	{ "sst25vf032b", 0xbf254a, 64 * 1024, 64, SECT_4K, },
-
-	/* ST Microelectronics -- newer production may have feature updates */
-	{ "m25p05",  0x202010,  32 * 1024, 2, },
-	{ "m25p10",  0x202011,  32 * 1024, 4, },
-	{ "m25p20",  0x202012,  64 * 1024, 4, },
-	{ "m25p40",  0x202013,  64 * 1024, 8, },
-	{ "m25p80",         0,  64 * 1024, 16, },
-	{ "m25p16",  0x202015,  64 * 1024, 32, },
-	{ "m25p32",  0x202016,  64 * 1024, 64, },
-	{ "m25p64",  0x202017,  64 * 1024, 128, },
-	{ "m25p128", 0x202018, 256 * 1024, 64, },
-
-	{ "m45pe80", 0x204014,  64 * 1024, 16, },
-	{ "m45pe16", 0x204015,  64 * 1024, 32, },
-
-	{ "m25pe80", 0x208014,  64 * 1024, 16, },
-	{ "m25pe16", 0x208015,  64 * 1024, 32, SECT_4K, },
-
-	/* Winbond -- w25x "blocks" are 64K, "sectors" are 4KiB */
-	{ "w25x10", 0xef3011, 64 * 1024, 2, SECT_4K, },
-	{ "w25x20", 0xef3012, 64 * 1024, 4, SECT_4K, },
-	{ "w25x40", 0xef3013, 64 * 1024, 8, SECT_4K, },
-	{ "w25x80", 0xef3014, 64 * 1024, 16, SECT_4K, },
-	{ "w25x16", 0xef3015, 64 * 1024, 32, SECT_4K, },
-	{ "w25x32", 0xef3016, 64 * 1024, 64, SECT_4K, },
-	{ "w25x64", 0xef3017, 64 * 1024, 128, SECT_4K, },
-
-	/* Macronix -- mx25lxxx */
-	{ "mx25l32",  0xc22016, 64 * 1024,  64, },
-	{ "mx25l64",  0xc22017, 64 * 1024, 128, },
-	{ "mx25l128", 0xc22018, 64 * 1024, 256, },
-
-};
-
-struct flash_info *__devinit jedec_probe(struct platform_device *spi)
-{
-	int			tmp;
-	u32			jedec;
-	struct flash_info	*info;
-	struct ubicom32_io_port *io = (struct ubicom32_io_port *)RA;
-
-	/*
-	 * Setup and run RDID command on the flash.
-	 */
-	io->ctl1 &= ~IO_XFL_CTL1_MASK;
-	io->ctl1 |= IO_XFL_CTL1_FC_INST(FLASH_FC_INST_RD) |
-		IO_XFL_CTL1_FC_DATA(3);
-	io->ctl2 = IO_XFL_CTL2_FC_CMD(OPCODE_RDID);
-	FLASH_COMMAND_EXEC(io);
-
-	jedec = io->status1 & 0x00ffffff;
-
-	for (tmp = 0, info = m25p_data;
-			tmp < ARRAY_SIZE(m25p_data);
-			tmp++, info++) {
-		if (info->jedec_id == jedec)
-			return info;
-	}
-	dev_err(&spi->dev, "unrecognized JEDEC id %06x\n", jedec);
-	return NULL;
-}
-
-
-/*
- * board specific setup should have ensured the SPI clock used here
- * matches what the READ command supports, at least until this driver
- * understands FAST_READ (for clocks over 25 MHz).
- */
-static int __devinit ubicom32_flash_probe(struct platform_device *spi)
-{
-	struct flash_platform_data	*data;
-	struct m25p			*flash;
-	struct flash_info		*info;
-	unsigned			i;
-
-	/* Platform data helps sort out which chip type we have, as
-	 * well as how this board partitions it.  If we don't have
-	 * a chip ID, try the JEDEC id commands; they'll work for most
-	 * newer chips, even if we don't recognize the particular chip.
-	 */
-	data = spi->dev.platform_data;
-	if (data && data->type) {
-		for (i = 0, info = m25p_data;
-				i < ARRAY_SIZE(m25p_data);
-				i++, info++) {
-			if (strcmp(data->type, info->name) == 0)
-				break;
-		}
-
-		/* unrecognized chip? */
-		if (i == ARRAY_SIZE(m25p_data)) {
-			DEBUG(MTD_DEBUG_LEVEL0, "%s: unrecognized id %s\n",
-			      dev_name(&spi->dev), data->type);
-			info = NULL;
-
-		/* recognized; is that chip really what's there? */
-		} else if (info->jedec_id) {
-			struct flash_info	*chip = jedec_probe(spi);
-
-			if (!chip || chip != info) {
-				dev_warn(&spi->dev, "found %s, expected %s\n",
-						chip ? chip->name : "UNKNOWN",
-						info->name);
-				info = NULL;
-			}
-		}
-	} else
-		info = jedec_probe(spi);
-
-	if (!info)
-		return -ENODEV;
-
-	flash = kzalloc(sizeof *flash, GFP_KERNEL);
-	if (!flash)
-		return -ENOMEM;
-
-	flash->plt_dev = spi;
-	mutex_init(&flash->lock);
-	dev_set_drvdata(&spi->dev, flash);
-
-	if (data && data->name)
-		flash->mtd.name = data->name;
-	else
-		flash->mtd.name = dev_name(&spi->dev);
-
-	flash->mtd.type = MTD_NORFLASH;
-	flash->mtd.writesize = 1;
-	flash->mtd.flags = MTD_CAP_NORFLASH;
-	flash->mtd.size = info->sector_size * info->n_sectors;
-	flash->mtd.erase = ubicom32_flash_driver_erase;
-	flash->mtd.read = ubicom32_flash_driver_read;
-	flash->mtd.write = ubicom32_flash_driver_write;
-
-	/* prefer "small sector" erase if possible */
-	/*
-	 * The Ubicom erase code does not use the opcode for smaller sectors,
-	 * so disable that functionality and keep erasesize == sector_size
-	 * so that the test in ubicom32_flash_driver_erase works properly.
-	 *
-	 * This was: `if (info->flags & SECT_4K) {' instead of `if (0) {'
-	 */
-	if (0) {
-		flash->erase_opcode = OPCODE_BE_4K;
-		flash->mtd.erasesize = 4096;
-	} else {
-		flash->erase_opcode = OPCODE_SE;
-		flash->mtd.erasesize = info->sector_size;
-	}
-
-	dev_info(&spi->dev, "%s (%lld Kbytes)\n", info->name,
-		 flash->mtd.size / 1024);
-
-	DEBUG(MTD_DEBUG_LEVEL2,
-		"mtd .name = %s, .size = 0x%.8llx (%lluMiB) "
-			".erasesize = 0x%.8x (%uKiB) .numeraseregions = %d\n",
-		flash->mtd.name,
-		flash->mtd.size, flash->mtd.size / (1024*1024),
-		flash->mtd.erasesize, flash->mtd.erasesize / 1024,
-		flash->mtd.numeraseregions);
-
-	if (flash->mtd.numeraseregions)
-		for (i = 0; i < flash->mtd.numeraseregions; i++)
-			DEBUG(MTD_DEBUG_LEVEL2,
-				"mtd.eraseregions[%d] = { .offset = 0x%.8llx, "
-				".erasesize = 0x%.8x (%uKiB), "
-				".numblocks = %d }\n",
-				i, flash->mtd.eraseregions[i].offset,
-				flash->mtd.eraseregions[i].erasesize,
-				flash->mtd.eraseregions[i].erasesize / 1024,
-				flash->mtd.eraseregions[i].numblocks);
-
-
-	/* partitions should match sector boundaries; and it may be good to
-	 * use readonly partitions for writeprotected sectors (BP2..BP0).
-	 */
-	if (mtd_has_partitions()) {
-		struct mtd_partition	*parts = NULL;
-		int			nr_parts = 0;
-
-#ifdef CONFIG_MTD_CMDLINE_PARTS
-		static const char *part_probes[] = { "cmdlinepart", NULL, };
-
-		nr_parts = parse_mtd_partitions(&flash->mtd,
-				part_probes, &parts, 0);
-#endif
-
-		if (nr_parts <= 0 && data && data->parts) {
-			parts = data->parts;
-			nr_parts = data->nr_parts;
-			if (nr_parts >= 2) {
-				/*
-				 * Set last partition size to be 1M.
-				 */
-				parts[1].size = flash->mtd.size -
-					parts[0].size - JFFS2_FILESYSTEM_SIZE;
-				parts[2].size = JFFS2_FILESYSTEM_SIZE;
-			}
-		}
-
-		if (nr_parts > 0) {
-			for (i = 0; i < nr_parts; i++) {
-				DEBUG(MTD_DEBUG_LEVEL2, "partitions[%d] = "
-					"{.name = %s, .offset = 0x%.8llx, "
-						".size = 0x%.8llx (%lluKiB) }\n",
-					i, parts[i].name,
-					parts[i].offset,
-					parts[i].size,
-					parts[i].size / 1024);
-			}
-			flash->partitioned = 1;
-			return add_mtd_partitions(&flash->mtd, parts, nr_parts);
-		}
-	} else if (data->nr_parts)
-		dev_warn(&spi->dev, "ignoring %d default partitions on %s\n",
-				data->nr_parts, data->name);
-
-	return add_mtd_device(&flash->mtd) == 1 ? -ENODEV : 0;
-}
-
-
-static int __devexit ubicom32_flash_remove(struct spi_device *spi)
-{
-	struct m25p	*flash = dev_get_drvdata(&spi->dev);
-	int		status;
-
-	/* Clean up MTD stuff. */
-	if (mtd_has_partitions() && flash->partitioned)
-		status = del_mtd_partitions(&flash->mtd);
-	else
-		status = del_mtd_device(&flash->mtd);
-	if (status == 0)
-		kfree(flash);
-	return 0;
-}
-
-static struct platform_driver ubicom32_flash_driver = {
-	.driver = {
-		.name	= "ubicom32flashdriver",
-		.bus	= &platform_bus_type,
-		.owner	= THIS_MODULE,
-	},
-	.probe	= ubicom32_flash_probe,
-	.remove	= NULL,
-};
-
-static int ubicom32_flash_driver_init(void)
-{
-	return platform_driver_register(&ubicom32_flash_driver);
-}
-
-
-static void ubicom32_flash_driver_exit(void)
-{
-	platform_driver_unregister(&ubicom32_flash_driver);
-}
-
-
-module_init(ubicom32_flash_driver_init);
-module_exit(ubicom32_flash_driver_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Mike Lavender");
-MODULE_DESCRIPTION("Ubicom32 MTD SPI driver for ST M25Pxx flash chips");
diff --git a/target/linux/ubicom32/files/drivers/mtd/devices/ubi32-nand-spi-er.c b/target/linux/ubicom32/files/drivers/mtd/devices/ubi32-nand-spi-er.c
deleted file mode 100644
index 897bed787..000000000
--- a/target/linux/ubicom32/files/drivers/mtd/devices/ubi32-nand-spi-er.c
+++ /dev/null
@@ -1,1188 +0,0 @@
-/*
- * Micron SPI-ER NAND Flash Memory
- *	This code uses the built in Ubicom flash controller
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
-*/
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/delay.h>
-#include <linux/device.h>
-#include <linux/platform_device.h>
-#include <linux/mutex.h>
-#include <linux/err.h>
-
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-
-#define DRIVER_NAME				"ubi32-nand-spi-er"
-#define UBI32_NAND_SPI_ER_BLOCK_FROM_ROW(row)	(row >> 6)
-
-#define UBI32_NAND_SPI_ER_STATUS_P_FAIL		(1 << 3)
-#define UBI32_NAND_SPI_ER_STATUS_E_FAIL		(1 << 2)
-#define UBI32_NAND_SPI_ER_STATUS_OIP		(1 << 0)
-
-#define UBI32_NAND_SPI_ER_LAST_ROW_INVALID	0xFFFFFFFF
-#define	UBI32_NAND_SPI_ER_BAD_BLOCK_MARK_OFFSET	0x08
-
-struct ubi32_nand_spi_er_device {
-	const char		*name;
-
-	uint16_t		id;
-
-	unsigned int		blocks;
-	unsigned int		pages_per_block;
-	unsigned int		page_size;
-	unsigned int		write_size;
-	unsigned int		erase_size;
-};
-
-struct ubi32_nand_spi_er {
-	char				name[24];
-
-	const struct ubi32_nand_spi_er_device	*device;
-
-	struct mutex			lock;
-	struct platform_device		*pdev;
-
-	struct mtd_info			mtd;
-
-	unsigned int			last_row;	/* the last row we fetched */
-
-	/*
-	 * Bad block table (MUST be last in strcuture)
-	 */
-	unsigned long			nbb;
-	unsigned long			bbt[0];
-};
-
-/*
- * Chip supports a write_size of 512, but we cannot do partial
- * page with command 0x84.
- *
- * We need to use command 0x84 because we cannot fill the FIFO fast
- * enough to transfer the whole 512 bytes at a time. (maybe through
- * OCM?)
- */
-const struct ubi32_nand_spi_er_device ubi32_nand_spi_er_devices[] = {
-	{
-		name:			"MT29F1G01ZDC",
-		id:			0x2C12,
-		blocks:			1024,
-		pages_per_block:	64,
-		page_size:		2048,
-		write_size:		2048,
-		erase_size:		64 * 2048,
-	},
-	{
-		name:			"MT29F1G01ZDC",
-		id:			0x2C13,
-		blocks:			1024,
-		pages_per_block:	64,
-		page_size:		2048,
-		write_size:		2048,
-		erase_size:		64 * 2048,
-	},
-};
-
-static int read_only = 0;
-module_param(read_only, int, 0);
-MODULE_PARM_DESC(read_only, "Leave device locked");
-
-/*
- * Ubicom32 FLASH Command Set
- */
-#define FLASH_PORT		RA
-
-#define FLASH_FC_INST_CMD	0x00	/* for SPI command only transaction */
-#define FLASH_FC_INST_WR	0x01	/* for SPI write transaction */
-#define FLASH_FC_INST_RD	0x02	/* for SPI read transaction */
-
-#define FLASH_COMMAND_KICK_OFF(io)								\
-	asm volatile(										\
-		"	bset	"D(IO_INT_CLR)"(%0), #0, #%%bit("D(IO_XFL_INT_DONE)")	\n\t"	\
-		"	jmpt.t	.+4							\n\t"	\
-		"	bset	"D(IO_INT_SET)"(%0), #0, #%%bit("D(IO_XFL_INT_START)")	\n\t"	\
-		:										\
-		: "a" (io)									\
-		: "cc"										\
-		);
-
-#define FLASH_COMMAND_WAIT_FOR_COMPLETION(io)							\
-	asm volatile(										\
-		"	btst	"D(IO_INT_STATUS)"(%0), #%%bit("D(IO_XFL_INT_DONE)")	\n\t"	\
-		"	jmpeq.f	.-4							\n\t"	\
-		:										\
-		: "a" (io)									\
-		: "cc"										\
-	);
-
-#define FLASH_COMMAND_EXEC(io)				\
-		FLASH_COMMAND_KICK_OFF(io)		\
-		FLASH_COMMAND_WAIT_FOR_COMPLETION(io)
-
-/*
- * ubi32_nand_spi_er_get_feature
- *	Get Feature register
- */
-static uint8_t ubi32_nand_spi_er_get_feature(uint32_t reg)
-{
-	struct ubicom32_io_port *io = (struct ubicom32_io_port *)FLASH_PORT;
-
-	/*
-	 * Note that this will produce the sequence:
-	 * 	SI [0F][REG][00][00]
-	 * 	SO ---------[SR][SR][SR]
-	 * Since the flash controller can only output 24 bits of address, this is
-	 * ok for this command since the data will just repeat as long as the CS
-	 * is asserted and the clock is running.
-	 */
-	io->ctl1 &= ~IO_XFL_CTL1_MASK;
-	io->ctl1 |= IO_XFL_CTL1_FC_INST(FLASH_FC_INST_RD) | IO_XFL_CTL1_FC_DATA(1) |
-		    IO_XFL_CTL1_FC_ADDR;
-	io->ctl2 = IO_XFL_CTL2_FC_CMD(0x0F) | IO_XFL_CTL2_FC_ADDR(reg << 16);
-	FLASH_COMMAND_EXEC(io);
-
-	return io->status1 & 0xFF;
-}
-
-/*
- * ubi32_nand_spi_er_write_buf
- *	writes a buffer to the bus
- *
- * Writes 511 + 1 bytes to the bus, we have to stuff one data byte into the address.
- */
-static void ubi32_nand_spi_er_write_buf(const uint8_t *buf, uint32_t col)
-{
-	struct ubicom32_io_port *io = (struct ubicom32_io_port *)FLASH_PORT;
-	uint32_t tmp;
-
-	asm volatile (
-		"	bset		"D(IO_INT_SET)"(%[port]), #0, #%%bit("D(IO_PORTX_INT_FIFO_TX_RESET)")	\n\t"
-		"	pipe_flush	0									\n\t"
-		:
-		: [port] "a" (FLASH_PORT)
-		: "cc"
-	);
-
-	/*
-	 * Write the data into the cache
-	 */
-	io->ctl1 &= ~IO_XFL_CTL1_MASK;
-#ifdef SUPPORT_512_FIFO
-	io->ctl1 |= IO_XFL_CTL1_FC_INST(FLASH_FC_INST_WR) | IO_XFL_CTL1_FC_DATA(511) |
-#endif
-	io->ctl1 |= IO_XFL_CTL1_FC_INST(FLASH_FC_INST_WR) | IO_XFL_CTL1_FC_DATA(31) |
-		    IO_XFL_CTL1_FC_ADDR;
-
-	/*
-	 * Construct the address with the first byte of data
-	 */
-	tmp = (col << 8) | *buf++;
-	io->ctl2 = IO_XFL_CTL2_FC_CMD(0x84) | IO_XFL_CTL2_FC_ADDR(tmp);
-
-	asm volatile (
-
-		/*
-		 * Move 32 bytes
-		 *
-		 * The first word needs to be [11][22][33][33] to work around a flash
-		 * controller bug.
-		 */
-		"	move.2		%[tmp], (%[data])2++							\n\t"
-		"	shmrg.1		%[tmp], (%[data]), %[tmp]						\n\t"
-		"	shmrg.1		%[tmp], (%[data])1++, %[tmp]						\n\t"
-		"	move.4		"D(IO_TX_FIFO)"(%[port]), %[tmp]					\n\t"
-
-		/*
-		 * We're aligned again!
-		 */
-		"	.rept 7											\n\t"
-		"	move.4		"D(IO_TX_FIFO)"(%[port]), (%[data])4++					\n\t"
-		"	.endr											\n\t"
-
-		/*
-		 * Kick off the flash command
-		 */
-		"	bset	"D(IO_INT_CLR)"(%[port]), #0, #%%bit("D(IO_XFL_INT_DONE)")			\n\t"
-		"	jmpt.t	.+4										\n\t"
-		"	bset	"D(IO_INT_SET)"(%[port]), #0, #%%bit("D(IO_XFL_INT_START)")			\n\t"
-
-#ifdef SUPPORT_512_FIFO
-		/*
-		 * Fill the remaining 120 words as space becomes available
-		 */
-		"1:												\n\t"
-		"	cmpi		"D(IO_FIFO_LEVEL)"(%[port]), #4						\n\t"
-		"	jmpgt.s.t	1b									\n\t"
-		"	move.4		"D(IO_TX_FIFO)"(%[port]), (%[data])4++					\n\t"
-		"	move.4		"D(IO_TX_FIFO)"(%[port]), (%[data])4++					\n\t"
-		"	move.4		"D(IO_TX_FIFO)"(%[port]), (%[data])4++					\n\t"
-		"	move.4		"D(IO_TX_FIFO)"(%[port]), (%[data])4++					\n\t"
-		"	add.4		%[cnt], #-4, %[cnt]							\n\t"
-		"	jmpgt.t		1b									\n\t"
-#endif
-		/*
-		 * Wait for the transaction to finish
-		 */
-		"	btst	"D(IO_INT_STATUS)"(%[port]), #%%bit("D(IO_XFL_INT_DONE)")			\n\t"
-		"	jmpeq.f	.-4										\n\t"
-
-		: [tmp] "=&d" (tmp),
-		  [data] "+&a" (buf)
-		: [column] "d" (col),
-		  [port] "a" (FLASH_PORT),
-		  [cnt] "d" (120)		// see above comment
-		: "cc"
-	);
-}
-
-/*
- * ubi32_nand_spi_er_send_rd_addr
- *	perform FC_RD: CMD + address
- */
-static void ubi32_nand_spi_er_send_rd_addr(uint8_t command, uint32_t address)
-{
-	struct ubicom32_io_port *io = (struct ubicom32_io_port *)FLASH_PORT;
-
-	io->ctl1 &= ~IO_XFL_CTL1_MASK;
-	io->ctl1 |= IO_XFL_CTL1_FC_INST(FLASH_FC_INST_RD) | IO_XFL_CTL1_FC_DATA(4) |
-		    IO_XFL_CTL1_FC_ADDR;
-	io->ctl2 = IO_XFL_CTL2_FC_CMD(command) | IO_XFL_CTL2_FC_ADDR(address);
-	FLASH_COMMAND_EXEC(io);
-}
-
-/*
- * ubi32_nand_spi_er_send_cmd_addr
- *	perform FC_(xxx): CMD + address
- */
-static void ubi32_nand_spi_er_send_cmd_addr(uint8_t command, uint32_t address)
-{
-	struct ubicom32_io_port *io = (struct ubicom32_io_port *)FLASH_PORT;
-
-	io->ctl1 &= ~IO_XFL_CTL1_MASK;
-	io->ctl1 |= IO_XFL_CTL1_FC_INST(FLASH_FC_INST_CMD) | IO_XFL_CTL1_FC_ADDR;
-	io->ctl2 = IO_XFL_CTL2_FC_CMD(command) | IO_XFL_CTL2_FC_ADDR(address);
-	FLASH_COMMAND_EXEC(io);
-}
-
-/*
- * ubi32_nand_spi_er_write_disable
- *	clear the write enable bit
- */
-static void ubi32_nand_spi_er_write_disable(void)
-{
-	struct ubicom32_io_port *io = (struct ubicom32_io_port *)FLASH_PORT;
-
-	io->ctl1 &= ~IO_XFL_CTL1_MASK;
-	io->ctl1 |= IO_XFL_CTL1_FC_INST(FLASH_FC_INST_CMD);
-	io->ctl2 = IO_XFL_CTL2_FC_CMD(0x04);
-	FLASH_COMMAND_EXEC(io);
-}
-
-/*
- * ubi32_nand_spi_er_write_enable
- *	set the write enable bit
- */
-static void ubi32_nand_spi_er_write_enable(void)
-{
-	struct ubicom32_io_port *io = (struct ubicom32_io_port *)FLASH_PORT;
-
-	io->ctl1 &= ~IO_XFL_CTL1_MASK;
-	io->ctl1 |= IO_XFL_CTL1_FC_INST(FLASH_FC_INST_CMD);
-	io->ctl2 = IO_XFL_CTL2_FC_CMD(0x06);
-	FLASH_COMMAND_EXEC(io);
-}
-
-/*
- * ubi32_nand_spi_er_busywait
- *	Wait until the chip is not busy
- */
-static uint8_t ubi32_nand_spi_er_busywait(void)
-{
-	int i;
-	uint8_t data;
-
-	/*
-	 * tRD is 100us, so don't delay too long, however, tERS is
-	 * 10ms so you'd better loop enough.
-	 */
-	for (i = 0; i < 200; i++) {
-		data = ubi32_nand_spi_er_get_feature(0xC0);
-		if (!(data & UBI32_NAND_SPI_ER_STATUS_OIP)) {
-			break;
-		}
-
-		udelay(50);
-	}
-
-	return data;
-}
-
-/*
- * ubi32_nand_spi_er_erase
- *	Erase a block, parameters must be block aligned
- */
-static int ubi32_nand_spi_er_erase(struct mtd_info *mtd, struct erase_info *instr)
-{
-	struct ubi32_nand_spi_er *chip = mtd->priv;
-	int res;
-
-	DEBUG(MTD_DEBUG_LEVEL3, "%s: erase addr:%x len:%x\n", chip->name, instr->addr, instr->len);
-
-	if ((instr->addr + instr->len) > mtd->size) {
-		return -EINVAL;
-	}
-
-	if (instr->addr & (chip->device->erase_size - 1)) {
-		DEBUG(MTD_DEBUG_LEVEL1, "%s: erase address is not aligned %x\n", chip->name, instr->addr);
-		return -EINVAL;
-	}
-
-	if (instr->len & (chip->device->erase_size - 1)) {
-		DEBUG(MTD_DEBUG_LEVEL1, "%s: erase len is not aligned %x\n", chip->name, instr->len);
-		return -EINVAL;
-	}
-
-	mutex_lock(&chip->lock);
-	chip->last_row = UBI32_NAND_SPI_ER_LAST_ROW_INVALID;
-
-	while (instr->len) {
-		uint32_t block = instr->addr >> 17;
-		uint32_t row = block << 6;
-		uint8_t stat;
-		DEBUG(MTD_DEBUG_LEVEL3, "%s: block erase row:%x block:%x addr:%x rem:%x\n", chip->name, row, block, instr->addr, instr->len);
-
-		/*
-		 * Test for bad block
-		 */
-		if (test_bit(block, chip->bbt)) {
-			instr->fail_addr = block << 17;
-			instr->state = MTD_ERASE_FAILED;
-			res = -EBADMSG;
-			goto done;
-		}
-
-		ubi32_nand_spi_er_write_enable();
-
-		/*
-		 * Block erase
-		 */
-		ubi32_nand_spi_er_send_cmd_addr(0xD8, row);
-
-		/*
-		 * Wait
-		 */
-		stat = ubi32_nand_spi_er_busywait();
-		if (stat & UBI32_NAND_SPI_ER_STATUS_OIP) {
-			instr->fail_addr = block << 17;
-			instr->state = MTD_ERASE_FAILED;
-			DEBUG(MTD_DEBUG_LEVEL1, "%s: chip is busy or nonresponsive stat=%02x\n", chip->name, stat);
-
-			/*
-			 * Chip is stuck?
-			 */
-			res = -EIO;
-			goto done;
-		}
-
-		/*
-		 * Check the status register
-		 */
-		if (stat & UBI32_NAND_SPI_ER_STATUS_E_FAIL) {
-			DEBUG(MTD_DEBUG_LEVEL1, "%s: E_FAIL signalled (%02x)\n", chip->name, stat);
-			instr->fail_addr = block << 17;
-			instr->state = MTD_ERASE_FAILED;
-			goto done;
-		}
-
-		/*
-		 * Next
-		 */
-		block++;
-		instr->len -= chip->device->erase_size;
-		instr->addr += chip->device->erase_size;
-	}
-
-	instr->state = MTD_ERASE_DONE;
-
-	mutex_unlock(&chip->lock);
-	return 0;
-
-done:
-	ubi32_nand_spi_er_write_disable();
-
-	mutex_unlock(&chip->lock);
-
-	mtd_erase_callback(instr);
-	return 0;
-}
-
-/*
- * ubi32_nand_spi_er_read
- *
- * return -EUCLEAN: ecc error recovered
- * return -EBADMSG: ecc error not recovered
-*/
-static int ubi32_nand_spi_er_read(struct mtd_info *mtd, loff_t from, size_t len,
-				  size_t *retlen, u_char *buf)
-{
-	struct ubi32_nand_spi_er *chip = mtd->priv;
-	struct ubicom32_io_port *io = (struct ubicom32_io_port *)FLASH_PORT;
-
-	uint32_t row;
-	uint32_t column;
-	int retval = 0;
-	uint32_t *pbuf = (uint32_t *)buf;
-
-	*retlen = 0;
-	DEBUG(MTD_DEBUG_LEVEL2, "%s: read block from %llx len %d into %p\n", chip->name, from, len, buf);
-
-	/*
-	 * buf should be aligned
-	 */
-	if ((uint32_t)buf & 0x03) {
-		return -EINVAL;
-	}
-
-	/*
-	 * Zero length reads, nothing to do
-	 */
-	if (len == 0) {
-		return 0;
-	}
-
-	/*
-	 * Reject reads which go over the end of the flash
-	 */
-	if ((from + len) > mtd->size) {
-		return -EINVAL;
-	}
-
-	/*
-	 * Get the row and column address to start at
-	 */
-	row = from >> 11;
-	column = from & 0x7FF;
-	DEBUG(MTD_DEBUG_LEVEL3, "%s: row=%x %d column=%x %d last_row=%x %d\n", chip->name, row, row, column, column, chip->last_row, chip->last_row);
-
-	/*
-	 * Read the data from the chip
-	 */
-	mutex_lock(&chip->lock);
-	while (len) {
-		uint8_t stat;
-		size_t toread;
-		int i;
-		int tmp;
-
-		/*
-		 * Figure out how much to read
-		 *
-		 * If we are reading from the middle of a page then the most we
-		 * can read is to the end of the page
-		 */
-		toread = len;
-		if (toread > (chip->device->page_size - column)) {
-			toread = chip->device->page_size - column;
-		}
-
-		DEBUG(MTD_DEBUG_LEVEL3, "%s: buf=%p toread=%x row=%x column=%x last_row=%x\n", chip->name, pbuf, toread, row, column, chip->last_row);
-
-		if (chip->last_row != row) {
-			/*
-			 * Check if the block is bad
-			 */
-			if (test_bit(UBI32_NAND_SPI_ER_BLOCK_FROM_ROW(row), chip->bbt)) {
-				mutex_unlock(&chip->lock);
-				return -EBADMSG;
-			}
-
-			/*
-			 * Load the appropriate page
-			 */
-			ubi32_nand_spi_er_send_cmd_addr(0x13, row);
-
-			/*
-			 * Wait
-			 */
-			stat = ubi32_nand_spi_er_busywait();
-			if (stat & UBI32_NAND_SPI_ER_STATUS_OIP) {
-				DEBUG(MTD_DEBUG_LEVEL1, "%s: chip is busy or nonresponsive stat=%02x\n", chip->name, stat);
-
-				/*
-				 * Chip is stuck?
-				 */
-				mutex_unlock(&chip->lock);
-				return -EIO;
-			}
-
-			/*
-			 * Check the ECC bits
-			 */
-			stat >>= 4;
-			if (stat == 1) {
-				DEBUG(MTD_DEBUG_LEVEL1, "%s: ECC recovered, row=%x\n", chip->name, row);
-				retval = -EUCLEAN;
-			}
-			if (stat == 2) {
-				DEBUG(MTD_DEBUG_LEVEL0, "%s: failed ECC, row=%x\n", chip->name, row);
-				chip->last_row = UBI32_NAND_SPI_ER_LAST_ROW_INVALID;
-				mutex_unlock(&chip->lock);
-				return -EBADMSG;
-			}
-
-		}
-
-		chip->last_row = row;
-
-		/*
-		 * Read out the data:
-		 *	We can always read a little too much since there is the
-		 *	OOB after byte addr 2047.  The most we'll overread is 3 bytes.
-		 */
-		if (((uint32_t)pbuf & 0x03) == 0) {
-			/*
-			 * Aligned read
-			 */
-			tmp = toread & (~0x03);
-			for (i = 0; i < tmp; i += 4) {
-				ubi32_nand_spi_er_send_rd_addr(0x03, column << 8);
-				*pbuf++ = io->status1;
-				column += 4;
-			}
-		} else {
-			/*
-			 * Unaligned read
-			 */
-			tmp = toread & (~0x03);
-			for (i = 0; i < tmp; i += 4) {
-				ubi32_nand_spi_er_send_rd_addr(0x03, column << 8);
-				memcpy(pbuf, &io->status1, 4);
-				column += 4;
-			}
-		}
-
-		/*
-		 * Fill in any single bytes
-		 */
-		tmp = toread & 0x03;
-		if (tmp) {
-			uint8_t *bbuf = pbuf;
-			uint32_t val;
-			ubi32_nand_spi_er_send_rd_addr(0x03, column << 8);
-			val = io->status1;
-			for (i = 0; i < tmp; i++) {
-				*bbuf++ = val >> 24;
-				val <<= 8;
-			}
-		}
-
-		len -= toread;
-		*retlen += toread;
-
-		/*
-		 * For the next page, increment the row and always start at column 0
-		 */
-		column = 0;
-		row++;
-	}
-
-	mutex_unlock(&chip->lock);
-	return retval;
-}
-
-/*
- * ubi32_nand_spi_er_write
- */
-#define WRITE_NOT_ALIGNED(x) ((x & (device->write_size - 1)) != 0)
-static int ubi32_nand_spi_er_write(struct mtd_info *mtd, loff_t to, size_t len,
-				   size_t *retlen, const u_char *buf)
-{
-	struct ubi32_nand_spi_er *chip = mtd->priv;
-	const struct ubi32_nand_spi_er_device *device = chip->device;
-	struct ubicom32_io_port *io = (struct ubicom32_io_port *)FLASH_PORT;
-	uint32_t row;
-	uint32_t col;
-	int res = 0;
-	size_t towrite;
-
-	DEBUG(MTD_DEBUG_LEVEL2, "%s: write block to %llx len %d from %p\n", chip->name, to, len, buf);
-
-	*retlen = 0;
-
-	/*
-	 * nothing to write
-	 */
-	if (!len) {
-		return 0;
-	}
-
-	/*
-	 * Reject writes which go over the end of the flash
-	 */
-	if ((to + len) > mtd->size) {
-		return -EINVAL;
-	}
-
-	/*
-	 * buf should be aligned to 16 bits
-	 */
-	if ((uint32_t)buf & 0x01) {
-		return -EINVAL;
-	}
-
-	/*
-	 * Check to see if everything is page aligned
-	 */
-	if (WRITE_NOT_ALIGNED(to) || WRITE_NOT_ALIGNED(len)) {
-		printk(KERN_NOTICE "ubi32_nand_spi_er_write: Attempt to write non page aligned data\n");
-		return -EINVAL;
-	}
-
-	mutex_lock(&chip->lock);
-
-	io->ctl0 |= IO_XFL_CTL0_MCB_LOCK;
-
-	chip->last_row = UBI32_NAND_SPI_ER_LAST_ROW_INVALID;
-
-	/*
-	 * If the first write is a partial write then write at most the number of
-	 * bytes to get us page aligned and then the remainder will be
-	 * page aligned.  The last bit may be a partial page as well.
-	 */
-	col = to & (device->page_size - 1);
-	towrite = device->page_size - col;
-	if (towrite > len) {
-		towrite = len;
-	}
-
-	/*
-	 * Write the data
-	 */
-	row = to >> 11;
-	while (len) {
-		uint8_t stat;
-		uint32_t my_towrite;
-
-		DEBUG(MTD_DEBUG_LEVEL3, "%s: write %p to row:%x col:%x len:%x rem:%x\n", chip->name, buf, row, col, towrite, len);
-
-		ubi32_nand_spi_er_write_enable();
-
-		/*
-		 * Move the data into the cache
-		 */
-		my_towrite = towrite;
-		while (my_towrite) {
-			uint32_t len = my_towrite;
-			if (len > 32) {
-				len = 32;
-			}
-
-			ubi32_nand_spi_er_write_buf(buf, col);
-			buf += len;
-			col += len;
-			my_towrite -= len;
-		}
-
-		/*
-		 * Program execute
-		 */
-		ubi32_nand_spi_er_send_cmd_addr(0x10, row);
-
-		/*
-		 * Wait
-		 */
-		stat = ubi32_nand_spi_er_busywait();
-		if (stat & UBI32_NAND_SPI_ER_STATUS_OIP) {
-			DEBUG(MTD_DEBUG_LEVEL1, "%s: chip is busy or nonresponsive stat=%02x\n", chip->name, stat);
-
-			/*
-			 * Chip is stuck?
-			 */
-			res = -EIO;
-			goto done;
-		}
-
-		if (stat & (1 << 3)) {
-			res = -EBADMSG;
-			goto done;
-		}
-
-		row++;
-		len -= towrite;
-		*retlen += towrite;
-
-		/*
-		 * At this point, we are always page aligned so start at column 0.
-		 * Note we may not have a full page to write at the end, hence the
-		 * check if towrite > len.
-		 */
-		col = 0;
-		towrite = device->page_size;
-		if (towrite > len) {
-			towrite = len;
-		}
-	}
-
-	io->ctl0 &= ~IO_XFL_CTL0_MCB_LOCK;
-
-	mutex_unlock(&chip->lock);
-	return res;
-
-done:
-	ubi32_nand_spi_er_write_disable();
-
-	io->ctl0 &= ~IO_XFL_CTL0_MCB_LOCK;
-
-	mutex_unlock(&chip->lock);
-
-	return res;
-}
-
-/*
- * ubi32_nand_spi_er_isbad
- */
-static int ubi32_nand_spi_er_isbad(struct mtd_info *mtd, loff_t ofs)
-{
-	struct ubi32_nand_spi_er *chip = mtd->priv;
-	uint32_t block;
-
-	if (ofs & (chip->device->erase_size - 1)) {
-		DEBUG(MTD_DEBUG_LEVEL1, "%s: address not aligned %llx\n", chip->name, ofs);
-		return -EINVAL;
-	}
-
-	block = ofs >> 17;
-
-	return test_bit(block, chip->bbt);
-}
-
-/*
- * ubi32_nand_spi_er_markbad
- */
-static int ubi32_nand_spi_er_markbad(struct mtd_info *mtd, loff_t ofs)
-{
-	struct ubi32_nand_spi_er *chip = mtd->priv;
-	struct ubicom32_io_port *io = (struct ubicom32_io_port *)FLASH_PORT;
-	uint32_t block;
-	uint32_t row;
-	int res = 0;
-	uint8_t stat;
-
-	if (ofs & (chip->device->erase_size - 1)) {
-		DEBUG(MTD_DEBUG_LEVEL1, "%s: address not aligned %llx\n", chip->name, ofs);
-		return -EINVAL;
-	}
-
-	block = ofs >> 17;
-
-	/*
-	 * If it's already marked bad, no need to mark it
-	 */
-	if (test_bit(block, chip->bbt)) {
-		return 0;
-	}
-
-	/*
-	 * Mark it in our cache
-	 */
-	__set_bit(block, chip->bbt);
-
-	/*
-	 * Write the user bad block mark.  If it fails, then we really
-	 * can't do anything about it.
-	 */
-	mutex_lock(&chip->lock);
-	chip->last_row = UBI32_NAND_SPI_ER_LAST_ROW_INVALID;
-
-	ubi32_nand_spi_er_write_enable();
-
-	/*
-	 * Write the mark
-	 */
-	io->ctl0 |= IO_XFL_CTL0_MCB_LOCK;
-	io->ctl1 &= ~IO_XFL_CTL1_MASK;
-	io->ctl1 |= IO_XFL_CTL1_FC_INST(FLASH_FC_INST_WR) | IO_XFL_CTL1_FC_DATA(6);
-	io->ctl2 = IO_XFL_CTL2_FC_CMD(0x84);
-
-	asm volatile (
-		"	bset		"D(IO_INT_SET)"(%[port]), #0, #%%bit("D(IO_PORTX_INT_FIFO_TX_RESET)")	\n\t"
-		"	pipe_flush	0									\n\t"
-
-		/*
-		 * Move the data into the FIFO
-		 */
-		"	move.4		"D(IO_TX_FIFO)"(%[port]), %[word1]					\n\t"
-		"	move.4		"D(IO_TX_FIFO)"(%[port]), %[word2]					\n\t"
-
-		/*
-		 * Kick off the flash command
-		 */
-		"	bset	"D(IO_INT_CLR)"(%[port]), #0, #%%bit("D(IO_XFL_INT_DONE)")			\n\t"
-		"	jmpt.t	.+4										\n\t"
-		"	bset	"D(IO_INT_SET)"(%[port]), #0, #%%bit("D(IO_XFL_INT_START)")			\n\t"
-
-		/*
-		 * Wait for the transaction to finish
-		 */
-		"	btst	"D(IO_INT_STATUS)"(%[port]), #%%bit("D(IO_XFL_INT_DONE)")			\n\t"
-		"	jmpeq.f	.-4										\n\t"
-
-		:
-		: [word1] "d" (0x0800dead | (UBI32_NAND_SPI_ER_BAD_BLOCK_MARK_OFFSET << 16)),
-		  [word2] "d" (0xbeef0000),
-		  [port] "a" (FLASH_PORT)
-		: "cc"
-	);
-
-	io->ctl0 &= ~IO_XFL_CTL0_MCB_LOCK;
-
-	/*
-	 * Program execute
-	 */
-	row = block << 6;
-	ubi32_nand_spi_er_send_cmd_addr(0x10, row);
-
-	/*
-	 * Wait
-	 */
-	stat = ubi32_nand_spi_er_busywait();
-	if (stat & UBI32_NAND_SPI_ER_STATUS_OIP) {
-		DEBUG(MTD_DEBUG_LEVEL1, "%s: chip is busy or nonresponsive stat=%02x\n", chip->name, stat);
-
-		/*
-		 * Chip is stuck?
-		 */
-		res = -EIO;
-		goto done;
-	}
-
-	if (stat & (1 << 3)) {
-		res = -EBADMSG;
-	}
-
-done:
-	ubi32_nand_spi_er_write_disable();
-
-	mutex_unlock(&chip->lock);
-
-	return res;
-}
-
-/*
- * ubi32_nand_spi_er_read_bbt
- */
-static int ubi32_nand_spi_er_read_bbt(struct ubi32_nand_spi_er *chip)
-{
-	int j;
-	struct ubicom32_io_port *io = (struct ubicom32_io_port *)FLASH_PORT;
-
-	for (j = 0; j < chip->device->blocks; j++) {
-		unsigned short row = j << 6;
-		uint8_t stat;
-
-		/*
-		 * Read Page
-		 */
-		ubi32_nand_spi_er_send_cmd_addr(0x13, row);
-
-		/*
-		 * Wait
-		 */
-		stat = ubi32_nand_spi_er_busywait();
-		if (stat & UBI32_NAND_SPI_ER_STATUS_OIP) {
-			DEBUG(MTD_DEBUG_LEVEL1, "%s: chip is busy or nonresponsive stat=%02x\n", chip->name, stat);
-
-			/*
-			 * Chip is stuck?
-			 */
-			return -EIO;
-		}
-
-		/*
-		 * Check factory bad block mark
-		 */
-		ubi32_nand_spi_er_send_rd_addr(0x03, 0x080000);
-
-		if ((io->status1 >> 24) != 0xFF) {
-			chip->nbb++;
-			__set_bit(j, chip->bbt);
-			continue;
-		}
-
-		ubi32_nand_spi_er_send_rd_addr(0x03, 0x080000 | (UBI32_NAND_SPI_ER_BAD_BLOCK_MARK_OFFSET << 8));
-		if (io->status1 == 0xdeadbeef) {
-			chip->nbb++;
-			__set_bit(j, chip->bbt);
-		}
-	}
-
-#if defined(CONFIG_MTD_DEBUG) && (MTD_DEBUG_LEVEL3 <= CONFIG_MTD_DEBUG_VERBOSE)
-	printk("%s: Bad Block Table:", chip->name);
-	for (j = 0; j < chip->device->blocks; j++) {
-		if ((j % 64) == 0) {
-			printk("\n%s: block %03x: ", chip->name, j);
-		}
-		printk("%c", test_bit(j, chip->bbt) ? 'X' : '.');
-	}
-	printk("\n%s: Bad Block Numbers: ", chip->name);
-	for (j = 0; j < chip->device->blocks; j++) {
-		if (test_bit(j, chip->bbt)) {
-			printk("%x ", j);
-		}
-	}
-	printk("\n");
-#endif
-
-	return 0;
-}
-
-#ifndef MODULE
-/*
- * Called at boot time:
- *
- * ubi32_nand_spi_er=read_only
- *	if read_only specified then do not unlock device
- */
-static int __init ubi32_nand_spi_er_setup(char *str)
-{
-	if (str && (strncasecmp(str, "read_only", 9) == 0)) {
-		read_only = 1;
-	}
-	return 0;
-}
-
-__setup("ubi32_nand_spi_er=", ubi32_nand_spi_er_setup);
-#endif
-
-/*
- * ubi32_nand_spi_er_probe
- *	Detect and initialize ubi32_nand_spi_er device.
- */
-static int __devinit ubi32_nand_spi_er_probe(struct platform_device *pdev)
-{
-	uint32_t i;
-	uint32_t id;
-	int res;
-	size_t bbt_bytes;
-	struct ubi32_nand_spi_er *chip;
-	const struct ubi32_nand_spi_er_device *device;
-	struct ubicom32_io_port *io = (struct ubicom32_io_port *)FLASH_PORT;
-
-	/*
-	 * Reset
-	 */
-	for (i = 0; i < 2; i++) {
-		io->ctl1 &= ~IO_XFL_CTL1_MASK;
-		io->ctl1 |= IO_XFL_CTL1_FC_INST(FLASH_FC_INST_CMD);
-		io->ctl2 = IO_XFL_CTL2_FC_CMD(0xFF);
-		FLASH_COMMAND_EXEC(io);
-		udelay(250);
-	}
-	udelay(1000);
-
-	/*
-	 * Read out ID
-	 */
-	io->ctl1 &= ~IO_XFL_CTL1_MASK;
-	io->ctl1 |= IO_XFL_CTL1_FC_INST(FLASH_FC_INST_RD) | IO_XFL_CTL1_FC_DATA(2) |
-		    IO_XFL_CTL1_FC_ADDR;
-	io->ctl2 = IO_XFL_CTL2_FC_CMD(0x9F);
-	FLASH_COMMAND_EXEC(io);
-
-	id = io->status1 >> 16;
-	device = ubi32_nand_spi_er_devices;
-	for (i = 0; i < ARRAY_SIZE(ubi32_nand_spi_er_devices); i++) {
-		if (device->id == id) {
-			break;
-		}
-		device++;
-	}
-	if (i == ARRAY_SIZE(ubi32_nand_spi_er_devices)) {
-		return -ENODEV;
-	}
-
-	/*
-	 * Initialize our chip structure
-	 */
-	bbt_bytes = DIV_ROUND_UP(device->blocks, BITS_PER_BYTE);
-	chip = kzalloc(sizeof(struct ubi32_nand_spi_er) + bbt_bytes, GFP_KERNEL);
-	if (!chip) {
-		return -ENOMEM;
-	}
-	snprintf(chip->name, sizeof(chip->name), "%s", device->name);
-
-	chip->device = device;
-	chip->last_row = UBI32_NAND_SPI_ER_LAST_ROW_INVALID;
-
-	mutex_init(&chip->lock);
-
-	chip->mtd.type = MTD_NANDFLASH;
-	chip->mtd.flags = MTD_WRITEABLE;
-
-	/*
-	 * #blocks * block size * n blocks
-	 */
-	chip->mtd.size = device->blocks * device->pages_per_block * device->page_size;
-	chip->mtd.erasesize = device->erase_size;
-
-	/*
-	 * 1 page, optionally we can support partial write (512)
-	 */
-	chip->mtd.writesize = device->write_size;
-	chip->mtd.name = device->name;
-	chip->mtd.erase = ubi32_nand_spi_er_erase;
-	chip->mtd.read = ubi32_nand_spi_er_read;
-	chip->mtd.write = ubi32_nand_spi_er_write;
-	chip->mtd.block_isbad = ubi32_nand_spi_er_isbad;
-	chip->mtd.block_markbad = ubi32_nand_spi_er_markbad;
-	chip->mtd.priv = chip;
-
-	/*
-	 * Cache the bad block table
-	 */
-	res = ubi32_nand_spi_er_read_bbt(chip);
-	if (res) {
-		kfree(chip);
-		return res;
-	}
-
-	/*
-	 * Un/lock the chip
-	 */
-	io->ctl0 |= IO_XFL_CTL0_MCB_LOCK;
-	io->ctl1 &= ~IO_XFL_CTL1_MASK;
-	io->ctl1 |= IO_XFL_CTL1_FC_INST(FLASH_FC_INST_WR) | IO_XFL_CTL1_FC_DATA(2);
-	io->ctl2 = IO_XFL_CTL2_FC_CMD(0x1F);
-
-	if (read_only) {
-		i = 0xa0380000;
-	} else {
-		i = 0xa0000000;
-	}
-	asm volatile (
-		"	bset		"D(IO_INT_SET)"(%[port]), #0, #%%bit("D(IO_PORTX_INT_FIFO_TX_RESET)")	\n\t"
-		"	pipe_flush	0									\n\t"
-
-		/*
-		 * Move the data into the FIFO
-		 */
-		"	move.4		"D(IO_TX_FIFO)"(%[port]), %[word1]					\n\t"
-
-		/*
-		 * Kick off the flash command
-		 */
-		"	bset	"D(IO_INT_CLR)"(%[port]), #0, #%%bit("D(IO_XFL_INT_DONE)")			\n\t"
-		"	jmpt.t	.+4										\n\t"
-		"	bset	"D(IO_INT_SET)"(%[port]), #0, #%%bit("D(IO_XFL_INT_START)")			\n\t"
-
-		/*
-		 * Wait for the transaction to finish
-		 */
-		"	btst	"D(IO_INT_STATUS)"(%[port]), #%%bit("D(IO_XFL_INT_DONE)")			\n\t"
-		"	jmpeq.f	.-4										\n\t"
-
-		:
-		: [word1] "d" (i),
-		  [port] "a" (FLASH_PORT)
-		: "cc"
-	);
-	io->ctl0 &= ~IO_XFL_CTL0_MCB_LOCK;
-
-	dev_set_drvdata(&pdev->dev, chip);
-
-	printk(KERN_INFO "%s: added device size: %u KBytes %lu bad blocks %s\n", chip->mtd.name, DIV_ROUND_UP(chip->mtd.size, 1024), chip->nbb, read_only ? "[read only]" : "");
-	return add_mtd_device(&chip->mtd);
-}
-
-/*
- * ubi32_nand_spi_er_remove
- */
-static int __devexit ubi32_nand_spi_er_remove(struct platform_device *pdev)
-{
-	struct ubi32_nand_spi_er *chip = dev_get_drvdata(&pdev->dev);
-	int status;
-
-	DEBUG(MTD_DEBUG_LEVEL1, "%s: remove\n", chip->name);
-
-	status = del_mtd_device(&chip->mtd);
-	if (status == 0) {
-		kfree(chip);
-	}
-
-	dev_set_drvdata(&pdev->dev, NULL);
-	return status;
-}
-
-static struct platform_device *ubi32_nand_spi_er_device;
-
-static struct platform_driver ubi32_nand_spi_er_driver = {
-	.driver = {
-		.name		= DRIVER_NAME,
-		.owner		= THIS_MODULE,
-	},
-
-	.probe		= ubi32_nand_spi_er_probe,
-	.remove		= ubi32_nand_spi_er_remove,
-};
-
-/*
- * ubi32_nand_spi_er_init
- */
-static int __init ubi32_nand_spi_er_init(void)
-{
-	int ret;
-
-	ret = platform_driver_register(&ubi32_nand_spi_er_driver);
-
-	if (ret) {
-		return ret;
-	}
-
-	ubi32_nand_spi_er_device = platform_device_alloc(DRIVER_NAME, 0);
-	if (!ubi32_nand_spi_er_device) {
-		return -ENOMEM;
-	}
-
-	ret = platform_device_add(ubi32_nand_spi_er_device);
-	if (ret) {
-		platform_device_put(ubi32_nand_spi_er_device);
-		platform_driver_unregister(&ubi32_nand_spi_er_driver);
-	}
-
-	return ret;
-}
-module_init(ubi32_nand_spi_er_init);
-
-/*
- * ubi32_nand_spi_er_exit
- */
-static void __exit ubi32_nand_spi_er_exit(void)
-{
-	platform_device_unregister(ubi32_nand_spi_er_device);
-	platform_driver_unregister(&ubi32_nand_spi_er_driver);
-}
-module_exit(ubi32_nand_spi_er_exit);
-
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Patrick Tjin");
-MODULE_DESCRIPTION("MTD ubi32_nand_spi_er driver for ubicom32 SPI flash controller.");
diff --git a/target/linux/ubicom32/files/drivers/net/ubi32-eth.c b/target/linux/ubicom32/files/drivers/net/ubi32-eth.c
deleted file mode 100644
index e9c62f462..000000000
--- a/target/linux/ubicom32/files/drivers/net/ubi32-eth.c
+++ /dev/null
@@ -1,766 +0,0 @@
-/*
- * drivers/net/ubi32-eth.c
- *   Ubicom32 ethernet TIO interface driver.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-/*
- * ubi32_eth.c
- * Ethernet driver for Ip5k/Ip7K
- */
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/moduleparam.h>
-
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/types.h>
-#include <linux/interrupt.h>
-
-#include <linux/in.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/mii.h>
-#include <linux/if_vlan.h>
-#include <linux/ip.h>
-#include <linux/tcp.h>
-#include <linux/skbuff.h>
-#include <asm/checksum.h>
-#include <asm/ip5000.h>
-#include <asm/devtree.h>
-#include <asm/system.h>
-
-#define UBICOM32_USE_NAPI	/* define this to use NAPI instead of tasklet */
-//#define UBICOM32_USE_POLLING	/* define this to use polling instead of interrupt */
-#include "ubi32-eth.h"
-
-/*
- * TODO:
- * mac address from flash
- * multicast filter
- * ethtool support
- * sysfs support
- * skb->nrfrag support
- * ioctl
- * monitor phy status
- */
-
-extern int ubi32_ocm_skbuf_max, ubi32_ocm_skbuf, ubi32_ddr_skbuf;
-static const char *eth_if_name[UBI32_ETH_NUM_OF_DEVICES] =
-	{"eth_lan", "eth_wan"};
-static struct net_device *ubi32_eth_devices[UBI32_ETH_NUM_OF_DEVICES] =
-	{NULL, NULL};
-static u8_t mac_addr[UBI32_ETH_NUM_OF_DEVICES][ETH_ALEN] = {
-	{0x00, 0x03, 0x64, 'l', 'a', 'n'},
-	{0x00, 0x03, 0x64, 'w', 'a', 'n'}};
-
-#if (defined(CONFIG_ZONE_DMA) && defined(CONFIG_UBICOM32_OCM_FOR_SKB))
-static inline struct sk_buff *ubi32_alloc_skb_ocm(struct net_device *dev, unsigned int length)
-{
-	return __dev_alloc_skb(length, GFP_ATOMIC | __GFP_NOWARN | __GFP_NORETRY | GFP_DMA);
-}
-#endif
-
-static inline struct sk_buff *ubi32_alloc_skb(struct net_device *dev, unsigned int length)
-{
-	return __dev_alloc_skb(length, GFP_ATOMIC | __GFP_NOWARN);
-}
-
-static void ubi32_eth_vp_rxtx_enable(struct net_device *dev)
-{
-	struct ubi32_eth_private *priv = netdev_priv(dev);
-	priv->regs->command = UBI32_ETH_VP_CMD_RX_ENABLE | UBI32_ETH_VP_CMD_TX_ENABLE;
-	priv->regs->int_mask = (UBI32_ETH_VP_INT_RX | UBI32_ETH_VP_INT_TX);
-	ubicom32_set_interrupt(priv->vp_int_bit);
-}
-
-static void ubi32_eth_vp_rxtx_stop(struct net_device *dev)
-{
-	struct ubi32_eth_private *priv = netdev_priv(dev);
-	priv->regs->command = 0;
-	priv->regs->int_mask = 0;
-	ubicom32_set_interrupt(priv->vp_int_bit);
-
-	/* Wait for graceful shutdown */
-	while (priv->regs->status & (UBI32_ETH_VP_STATUS_RX_STATE | UBI32_ETH_VP_STATUS_TX_STATE));
-}
-
-/*
- * ubi32_eth_tx_done()
- */
-static int ubi32_eth_tx_done(struct net_device *dev)
-{
-	struct ubi32_eth_private *priv;
-	struct sk_buff *skb;
-	volatile void *pdata;
-	struct ubi32_eth_dma_desc *desc;
-	u32_t 	count = 0;
-
-	priv = netdev_priv(dev);
-
-	priv->regs->int_status &= ~UBI32_ETH_VP_INT_TX;
-	while (priv->tx_tail != priv->regs->tx_out) {
-		pdata = priv->regs->tx_dma_ring[priv->tx_tail];
-		BUG_ON(pdata == NULL);
-
-		skb = container_of((void *)pdata, struct sk_buff, cb);
-		desc = (struct ubi32_eth_dma_desc *)pdata;
-		if (unlikely(!(desc->status & UBI32_ETH_VP_TX_OK))) {
-			dev->stats.tx_errors++;
-		} else {
-			dev->stats.tx_packets++;
-			dev->stats.tx_bytes += skb->len;
-		}
-		dev_kfree_skb_any(skb);
-		priv->regs->tx_dma_ring[priv->tx_tail] = NULL;
-		priv->tx_tail = (priv->tx_tail + 1) & TX_DMA_RING_MASK;
-		count++;
-	}
-
-	if (unlikely(priv->regs->status & UBI32_ETH_VP_STATUS_TX_Q_FULL)) {
-		spin_lock(&priv->lock);
-		if (priv->regs->status & UBI32_ETH_VP_STATUS_TX_Q_FULL) {
-			priv->regs->status &= ~UBI32_ETH_VP_STATUS_TX_Q_FULL;
-			netif_wake_queue(dev);
-		}
-		spin_unlock(&priv->lock);
-	}
-	return count;
-}
-
-/*
- * ubi32_eth_receive()
- *	To avoid locking overhead, this is called only
- *	by tasklet when not using NAPI, or
- *	by NAPI poll when using NAPI.
- *	return number of frames processed
- */
-static int ubi32_eth_receive(struct net_device *dev, int quota)
-{
-	struct ubi32_eth_private *priv = netdev_priv(dev);
-	unsigned short rx_in = priv->regs->rx_in;
-	struct sk_buff *skb;
-	struct ubi32_eth_dma_desc *desc = NULL;
-	volatile void *pdata;
-
-	int extra_reserve_adj;
-	int extra_alloc = UBI32_ETH_RESERVE_SPACE + UBI32_ETH_TRASHED_MEMORY;
-	int replenish_cnt, count = 0;
-	int replenish_max = RX_DMA_MAX_QUEUE_SIZE;
-#if (defined(CONFIG_ZONE_DMA) && defined(CONFIG_UBICOM32_OCM_FOR_SKB))
-	if (likely(dev == ubi32_eth_devices[0]))
-		replenish_max = min(ubi32_ocm_skbuf_max, RX_DMA_MAX_QUEUE_SIZE);;
-#endif
-
-	if (unlikely(rx_in == priv->regs->rx_out))
-		priv->vp_stats.rx_q_full_cnt++;
-
-	priv->regs->int_status &= ~UBI32_ETH_VP_INT_RX;
-	while (priv->rx_tail != priv->regs->rx_out) {
-		if (unlikely(count == quota)) {
-			/* There is still frame pending to be processed */
-			priv->vp_stats.rx_throttle++;
-			break;
-		}
-
-		pdata = priv->regs->rx_dma_ring[priv->rx_tail];
-		BUG_ON(pdata == NULL);
-
-		desc = (struct ubi32_eth_dma_desc *)pdata;
-		skb = container_of((void *)pdata, struct sk_buff, cb);
-		count++;
-		priv->regs->rx_dma_ring[priv->rx_tail] = NULL;
-		priv->rx_tail = ((priv->rx_tail + 1) & RX_DMA_RING_MASK);
-
-		/*
-		 * Check only RX_OK bit here.
-		 * The rest of status word is used as timestamp
-		 */
-		if (unlikely(!(desc->status & UBI32_ETH_VP_RX_OK))) {
-			dev->stats.rx_errors++;
-			dev_kfree_skb_any(skb);
-			continue;
-		}
-
-		skb_put(skb, desc->data_len);
-		skb->dev = dev;
-		skb->protocol = eth_type_trans(skb, dev);
-		skb->ip_summed = CHECKSUM_NONE;
-		dev->stats.rx_bytes += skb->len;
-		dev->stats.rx_packets++;
-#ifndef UBICOM32_USE_NAPI
-		netif_rx(skb);
-#else
-		netif_receive_skb(skb);
-#endif
-	}
-
-	/* fill in more descripor for VP*/
-	replenish_cnt =  replenish_max -
-		((RX_DMA_RING_SIZE + rx_in - priv->rx_tail) & RX_DMA_RING_MASK);
-	if (replenish_cnt > 0) {
-#if (defined(CONFIG_ZONE_DMA) && defined(CONFIG_UBICOM32_OCM_FOR_SKB))
-		/*
-		 * black magic for perforamnce:
-		 *   Try to allocate skb from OCM only for first Ethernet I/F.
-		 *   Also limit number of RX buffers to 21 due to limited OCM.
-		 */
-		if (likely(dev == ubi32_eth_devices[0])) {
-			do {
-				skb = ubi32_alloc_skb_ocm(dev, RX_BUF_SIZE + extra_alloc);
-				if (!skb) {
-					break;
-				}
-				/* set up dma descriptor */
-				ubi32_ocm_skbuf++;
-				desc = (struct ubi32_eth_dma_desc *)skb->cb;
-				extra_reserve_adj =
-					((u32)skb->data + UBI32_ETH_RESERVE_SPACE + ETH_HLEN) &
-					(CACHE_LINE_SIZE - 1);
-				skb_reserve(skb, UBI32_ETH_RESERVE_SPACE - extra_reserve_adj);
-				desc->data_pointer = skb->data;
-				desc->buffer_len = RX_BUF_SIZE + UBI32_ETH_TRASHED_MEMORY;
-				desc->data_len = 0;
-				desc->status = 0;
-				priv->regs->rx_dma_ring[rx_in] = desc;
-				rx_in = (rx_in + 1) & RX_DMA_RING_MASK;
-			} while (--replenish_cnt > 0);
-		}
-#endif
-
-		while (replenish_cnt-- > 0) {
-			skb = ubi32_alloc_skb(dev, RX_BUF_SIZE + extra_alloc);
-			if (!skb) {
-				priv->vp_stats.rx_alloc_err++;
-				break;
-			}
-			/* set up dma descriptor */
-			ubi32_ddr_skbuf++;
-			desc = (struct ubi32_eth_dma_desc *)skb->cb;
-			extra_reserve_adj =
-				((u32)skb->data + UBI32_ETH_RESERVE_SPACE + ETH_HLEN) &
-				(CACHE_LINE_SIZE - 1);
-			skb_reserve(skb, UBI32_ETH_RESERVE_SPACE - extra_reserve_adj);
-			desc->data_pointer = skb->data;
-			desc->buffer_len = RX_BUF_SIZE + UBI32_ETH_TRASHED_MEMORY;
-			desc->data_len = 0;
-			desc->status = 0;
-			priv->regs->rx_dma_ring[rx_in] = desc;
-			rx_in = (rx_in + 1) & RX_DMA_RING_MASK;
-		}
-
-		wmb();
-		priv->regs->rx_in = rx_in;
-		ubicom32_set_interrupt(priv->vp_int_bit);
-	}
-
-	if (likely(count > 0)) {
-		dev->last_rx = jiffies;
-	}
-	return count;
-}
-
-#ifdef UBICOM32_USE_NAPI
-static int ubi32_eth_napi_poll(struct napi_struct *napi, int budget)
-{
-	struct ubi32_eth_private *priv = container_of(napi, struct ubi32_eth_private, napi);
-	struct net_device *dev = priv->dev;
-	u32_t count;
-
-	if (priv->tx_tail != priv->regs->tx_out) {
-                ubi32_eth_tx_done(dev);
-        }
-
-	count = ubi32_eth_receive(dev, budget);
-
-	if (count < budget) {
-		napi_complete(napi);
-		priv->regs->int_mask |= (UBI32_ETH_VP_INT_RX | UBI32_ETH_VP_INT_TX);
-		if ((priv->rx_tail != priv->regs->rx_out) || (priv->tx_tail != priv->regs->tx_out)) {
-			if (napi_reschedule(napi)) {
-				priv->regs->int_mask = 0;
-			}
-		}
-	}
-	return count;
-}
-
-#else
-static void ubi32_eth_do_tasklet(unsigned long arg)
-{
-	struct net_device *dev = (struct net_device *)arg;
-	struct ubi32_eth_private *priv = netdev_priv(dev);
-
-	if (priv->tx_tail != priv->regs->tx_out) {
-		ubi32_eth_tx_done(dev);
-	}
-
-	/* always call receive to process new RX frame as well as replenish RX buffers */
-	ubi32_eth_receive(dev, UBI32_RX_BOUND);
-
-	priv->regs->int_mask |= (UBI32_ETH_VP_INT_RX | UBI32_ETH_VP_INT_TX);
-	if ((priv->rx_tail != priv->regs->rx_out) || (priv->tx_tail != priv->regs->tx_out)) {
-		priv->regs->int_mask = 0;
-		tasklet_schedule(&priv->tsk);
-	}
-}
-#endif
-
-#if defined(UBICOM32_USE_POLLING)
-static struct timer_list eth_poll_timer;
-
-static void ubi32_eth_poll(unsigned long arg)
-{
-	struct net_device *dev;
-	struct ubi32_eth_private *priv;
-	int i;
-
-	for (i = 0; i < UBI32_ETH_NUM_OF_DEVICES; i++) {
-		dev = ubi32_eth_devices[i];
-		if (dev && (dev->flags & IFF_UP)) {
-			priv = netdev_priv(dev);
-#ifdef UBICOM32_USE_NAPI
-			napi_schedule(&priv->napi);
-#else
-			tasklet_schedule(&priv->tsk);
-#endif
-		}
-	}
-
-	eth_poll_timer.expires = jiffies + 2;
-	add_timer(&eth_poll_timer);
-}
-
-#else
-static irqreturn_t ubi32_eth_interrupt(int irq, void *dev_id)
-{
-	struct ubi32_eth_private *priv;
-
-	struct net_device *dev = (struct net_device *)dev_id;
-	BUG_ON(irq != dev->irq);
-
-	priv = netdev_priv(dev);
-	if (unlikely(!(priv->regs->int_status & priv->regs->int_mask))) {
-		return IRQ_NONE;
-	}
-
-	/*
-	 * Disable port interrupt
-	 */
-#ifdef UBICOM32_USE_NAPI
-	if (napi_schedule_prep(&priv->napi)) {
-		priv->regs->int_mask = 0;
-		__napi_schedule(&priv->napi);
-	}
-#else
-	priv->regs->int_mask = 0;
-	tasklet_schedule(&priv->tsk);
-#endif
-	return IRQ_HANDLED;
-}
-#endif
-
-/*
- * ubi32_eth_open
- */
-static int ubi32_eth_open(struct net_device *dev)
-{
-	struct ubi32_eth_private *priv = netdev_priv(dev);
-	int err;
-
-	printk(KERN_INFO "eth open %s\n",dev->name);
-#ifndef UBICOM32_USE_POLLING
-	/* request_region() */
-	err = request_irq(dev->irq, ubi32_eth_interrupt, IRQF_DISABLED, dev->name, dev);
-	if (err) {
-		printk(KERN_WARNING "fail to request_irq %d\n",err);
-		 return -ENODEV;
-	}
-#endif
-#ifdef  UBICOM32_USE_NAPI
-	napi_enable(&priv->napi);
-#else
-	tasklet_init(&priv->tsk, ubi32_eth_do_tasklet, (unsigned long)dev);
-#endif
-
-	/* call receive to supply RX buffers */
-	ubi32_eth_receive(dev, RX_DMA_MAX_QUEUE_SIZE);
-
-	/* check phy status and call netif_carrier_on */
-	ubi32_eth_vp_rxtx_enable(dev);
-	netif_start_queue(dev);
-	return 0;
-}
-
-static int ubi32_eth_close(struct net_device *dev)
-{
-	struct ubi32_eth_private *priv = netdev_priv(dev);
-	volatile void *pdata;
-	struct sk_buff *skb;
-
-#ifndef UBICOM32_USE_POLLING
-	free_irq(dev->irq, dev);
-#endif
-	netif_stop_queue(dev); /* can't transmit any more */
-#ifdef UBICOM32_USE_NAPI
-	napi_disable(&priv->napi);
-#else
-	tasklet_kill(&priv->tsk);
-#endif
-	ubi32_eth_vp_rxtx_stop(dev);
-
-	/*
-	 * RX clean up
-	 */
-	while (priv->rx_tail != priv->regs->rx_in) {
-		pdata = priv->regs->rx_dma_ring[priv->rx_tail];
-		skb = container_of((void *)pdata, struct sk_buff, cb);
-		priv->regs->rx_dma_ring[priv->rx_tail] = NULL;
-		dev_kfree_skb_any(skb);
-		priv->rx_tail = ((priv->rx_tail + 1) & RX_DMA_RING_MASK);
-	}
-	priv->regs->rx_in = 0;
-	priv->regs->rx_out = priv->regs->rx_in;
-	priv->rx_tail = priv->regs->rx_in;
-
-	/*
-	 * TX clean up
-	 */
-	BUG_ON(priv->regs->tx_out != priv->regs->tx_in);
-	ubi32_eth_tx_done(dev);
-	BUG_ON(priv->tx_tail != priv->regs->tx_in);
-	priv->regs->tx_in = 0;
-	priv->regs->tx_out = priv->regs->tx_in;
-	priv->tx_tail = priv->regs->tx_in;
-
-	return 0;
-}
-
-/*
- * ubi32_eth_set_config
- */
-static int ubi32_eth_set_config(struct net_device *dev, struct ifmap *map)
-{
-	/* if must to down to config it */
-	printk(KERN_INFO "set_config %x\n", dev->flags);
-	if (dev->flags & IFF_UP)
-		return -EBUSY;
-
-	/* I/O and IRQ can not be changed */
-	if (map->base_addr != dev->base_addr) {
-		printk(KERN_WARNING "%s: Can't change I/O address\n", dev->name);
-		return -EOPNOTSUPP;
-	}
-
-#ifndef UBICOM32_USE_POLLING
-	if (map->irq != dev->irq) {
-		printk(KERN_WARNING "%s: Can't change IRQ\n", dev->name);
-		return -EOPNOTSUPP;
-	}
-#endif
-
-	/* ignore other fields */
-	return 0;
-}
-
-static int ubi32_eth_start_xmit(struct sk_buff *skb, struct net_device *dev)
-{
-	struct ubi32_eth_private *priv = netdev_priv(dev);
-	struct ubi32_eth_dma_desc *desc = NULL;
-	unsigned short space, tx_in;
-
-	tx_in = priv->regs->tx_in;
-
-	dev->trans_start = jiffies; /* save the timestamp */
-	space = TX_DMA_RING_MASK - ((TX_DMA_RING_SIZE + tx_in - priv->tx_tail) & TX_DMA_RING_MASK);
-
-	if (unlikely(space == 0)) {
-		if (!(priv->regs->status & UBI32_ETH_VP_STATUS_TX_Q_FULL)) {
-			spin_lock(&priv->lock);
-			if (!(priv->regs->status & UBI32_ETH_VP_STATUS_TX_Q_FULL)) {
-				priv->regs->status |= UBI32_ETH_VP_STATUS_TX_Q_FULL;
-				priv->vp_stats.tx_q_full_cnt++;
-				netif_stop_queue(dev);
-			}
-			spin_unlock(&priv->lock);
-		}
-
-		/* give both HW and this driver an extra trigger */
-		priv->regs->int_mask |= UBI32_ETH_VP_INT_TX;
-#ifndef UBICOM32_USE_POLLING
-		ubicom32_set_interrupt(dev->irq);
-#endif
-		ubicom32_set_interrupt(priv->vp_int_bit);
-
-		return NETDEV_TX_BUSY;
-	}
-
-	/*still have room */
-	desc = (struct ubi32_eth_dma_desc *)skb->cb;
-	desc->data_pointer = skb->data;
-	desc->data_len = skb->len;
-	priv->regs->tx_dma_ring[tx_in] = desc;
-	tx_in = ((tx_in + 1) & TX_DMA_RING_MASK);
-	wmb();
-	priv->regs->tx_in = tx_in;
-	/* kick the HRT */
-	ubicom32_set_interrupt(priv->vp_int_bit);
-
-	return NETDEV_TX_OK;
-}
-
-/*
- * Deal with a transmit timeout.
- */
-static void ubi32_eth_tx_timeout (struct net_device *dev)
-{
-	struct ubi32_eth_private *priv = netdev_priv(dev);
-	dev->stats.tx_errors++;
-	priv->regs->int_mask |= UBI32_ETH_VP_INT_TX;
-#ifndef UBICOM32_USE_POLLING
-	ubicom32_set_interrupt(dev->irq);
-#endif
-	ubicom32_set_interrupt(priv->vp_int_bit);
-}
-
-static int ubi32_eth_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
-{
-	struct ubi32_eth_private *priv = netdev_priv(dev);
-	struct mii_ioctl_data *data = if_mii(rq);
-
-	printk(KERN_INFO "ioctl %s, %d\n", dev->name, cmd);
-	switch (cmd) {
-	case SIOCGMIIPHY:
-		data->phy_id = 0;
-		break;
-
-	case SIOCGMIIREG:
-		if ((data->reg_num & 0x1F) == MII_BMCR) {
-			/* Make up MII control register value from what we know */
-			data->val_out = 0x0000
-			| ((priv->regs->status & UBI32_ETH_VP_STATUS_DUPLEX)
-					? BMCR_FULLDPLX : 0)
-			| ((priv->regs->status & UBI32_ETH_VP_STATUS_SPEED100)
-					? BMCR_SPEED100 : 0)
-			| ((priv->regs->status & UBI32_ETH_VP_STATUS_SPEED1000)
-					? BMCR_SPEED1000 : 0);
-		} else if ((data->reg_num & 0x1F) == MII_BMSR) {
-			/* Make up MII status register value from what we know */
-			data->val_out =
-			(BMSR_100FULL|BMSR_100HALF|BMSR_10FULL|BMSR_10HALF)
-			| ((priv->regs->status & UBI32_ETH_VP_STATUS_LINK)
-					? BMSR_LSTATUS : 0);
-		} else {
-			return -EIO;
-		}
-		break;
-
-	case SIOCSMIIREG:
-		return -EOPNOTSUPP;
-		break;
-
-	default:
-		return -EOPNOTSUPP;
-	}
-
-	return 0;
-}
-
-/*
- * Return statistics to the caller
- */
-static struct net_device_stats *ubi32_eth_get_stats(struct net_device *dev)
-{
-	return &dev->stats;
-}
-
-
-static int ubi32_eth_change_mtu(struct net_device *dev, int new_mtu)
-{
-	struct ubi32_eth_private *priv = netdev_priv(dev);
-	unsigned long flags;
-
-	if ((new_mtu < 68) || (new_mtu > 1500))
-		return -EINVAL;
-
-	spin_lock_irqsave(&priv->lock, flags);
-	dev->mtu = new_mtu;
-	spin_unlock_irqrestore(&priv->lock, flags);
-	printk(KERN_INFO "set mtu to %d", new_mtu);
-	return 0;
-}
-
-/*
- * ubi32_eth_cleanup: unload the module
- */
-void ubi32_eth_cleanup(void)
-{
-	struct ubi32_eth_private *priv;
-	struct net_device *dev;
-	int i;
-
-	for (i = 0; i < UBI32_ETH_NUM_OF_DEVICES; i++) {
-		dev = ubi32_eth_devices[i];
-		if (dev) {
-			priv = netdev_priv(dev);
-			kfree(priv->regs->tx_dma_ring);
-			unregister_netdev(dev);
-			free_netdev(dev);
-			ubi32_eth_devices[i] = NULL;
-		}
-	}
-}
-
-	static const struct net_device_ops ubi32_netdev_ops = {
-		.ndo_open		= ubi32_eth_open,
-		.ndo_stop		= ubi32_eth_close,
-		.ndo_start_xmit		= ubi32_eth_start_xmit,
-		.ndo_tx_timeout		= ubi32_eth_tx_timeout,
-		.ndo_do_ioctl		= ubi32_eth_ioctl,
-		.ndo_change_mtu		= ubi32_eth_change_mtu,
-		.ndo_set_config		= ubi32_eth_set_config,
-		.ndo_get_stats		= ubi32_eth_get_stats,
-		.ndo_validate_addr	= eth_validate_addr,
-		.ndo_set_mac_address	= eth_mac_addr,
-	};
-
-int ubi32_eth_init_module(void)
-{
-	struct ethtionode *eth_node;
-	struct net_device *dev;
-	struct ubi32_eth_private *priv;
-	int i, err;
-
-	/*
-	 * Device allocation.
-	 */
-	err = 0;
-	for (i = 0; i < UBI32_ETH_NUM_OF_DEVICES; i++) {
-		/*
-		 * See if the eth_vp is in the device tree.
-		 */
-		eth_node = (struct ethtionode *)devtree_find_node(eth_if_name[i]);
-		if (!eth_node) {
-			printk(KERN_INFO "%s does not exist\n", eth_if_name[i]);
-			continue;
-		}
-
-		eth_node->tx_dma_ring = (struct ubi32_eth_dma_desc **)kmalloc(
-				sizeof(struct ubi32_eth_dma_desc *) *
-				(TX_DMA_RING_SIZE + RX_DMA_RING_SIZE),
-				GFP_ATOMIC | __GFP_NOWARN | __GFP_NORETRY | GFP_DMA);
-
-		if (eth_node->tx_dma_ring == NULL) {
-			eth_node->tx_dma_ring = (struct ubi32_eth_dma_desc **)kmalloc(
-				sizeof(struct ubi32_eth_dma_desc *) *
-				(TX_DMA_RING_SIZE + RX_DMA_RING_SIZE), GFP_KERNEL);
-			printk(KERN_INFO "fail to allocate from OCM\n");
-		}
-
-		if (!eth_node->tx_dma_ring) {
-			err = -ENOMEM;
-			break;
-		}
-		eth_node->rx_dma_ring = eth_node->tx_dma_ring + TX_DMA_RING_SIZE;
-		eth_node->tx_sz = TX_DMA_RING_SIZE - 1;
-		eth_node->rx_sz = RX_DMA_RING_SIZE - 1;
-
-		dev = alloc_etherdev(sizeof(struct ubi32_eth_private));
-		if (!dev) {
-			kfree(eth_node->tx_dma_ring);
-			err = -ENOMEM;
-			break;
-		}
-		priv = netdev_priv(dev);
-		priv->dev = dev;
-
-		/*
-		 * This just fill in some default Ubicom MAC address
-		 */
-		memcpy(dev->dev_addr, mac_addr[i], ETH_ALEN);
-		memset(dev->broadcast, 0xff, ETH_ALEN);
-
-		priv->regs = eth_node;
-		priv->regs->command = 0;
-		priv->regs->int_mask = 0;
-		priv->regs->int_status = 0;
-		priv->regs->tx_out = 0;
-		priv->regs->rx_out = 0;
-		priv->regs->tx_in = 0;
-		priv->regs->rx_in = 0;
-		priv->rx_tail = 0;
-		priv->tx_tail = 0;
-
-		priv->vp_int_bit = eth_node->dn.sendirq;
-		dev->irq = eth_node->dn.recvirq;
-
-		spin_lock_init(&priv->lock);
-
-		dev->netdev_ops = &ubi32_netdev_ops;
-
-		dev->watchdog_timeo	= UBI32_ETH_VP_TX_TIMEOUT;
-#ifdef UBICOM32_USE_NAPI
-		netif_napi_add(dev, &priv->napi, ubi32_eth_napi_poll, UBI32_ETH_NAPI_WEIGHT);
-#endif
-		err = register_netdev(dev);
-		if (err) {
-			printk(KERN_WARNING "Failed to register netdev %s\n", eth_if_name[i]);
-			//release_region();
-			free_netdev(dev);
-			kfree(eth_node->tx_dma_ring);
-			break;
-		}
-
-		ubi32_eth_devices[i] = dev;
-		printk(KERN_INFO "%s vp_base:0x%p, tio_int:%d irq:%d feature:0x%lx\n",
-			dev->name, priv->regs, eth_node->dn.sendirq, dev->irq, dev->features);
-	}
-
-	if (err) {
-		ubi32_eth_cleanup();
-		return err;
-	}
-
-	if (!ubi32_eth_devices[0] && !ubi32_eth_devices[1]) {
-		return -ENODEV;
-	}
-
-#if defined(UBICOM32_USE_POLLING)
-	init_timer(&eth_poll_timer);
-	eth_poll_timer.function = ubi32_eth_poll;
-	eth_poll_timer.data = (unsigned long)0;
-	eth_poll_timer.expires = jiffies + 2;
-	add_timer(&eth_poll_timer);
-#endif
-
-	return 0;
-}
-
-module_init(ubi32_eth_init_module);
-module_exit(ubi32_eth_cleanup);
-
-MODULE_AUTHOR("Kan Yan, Greg Ren");
-MODULE_LICENSE("GPL");
diff --git a/target/linux/ubicom32/files/drivers/net/ubi32-eth.h b/target/linux/ubicom32/files/drivers/net/ubi32-eth.h
deleted file mode 100644
index c25500143..000000000
--- a/target/linux/ubicom32/files/drivers/net/ubi32-eth.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * drivers/net/ubi32-eth.h
- *   Ubicom32 ethernet TIO interface driver definitions.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#ifndef _UBI32_ETH_H
-#define _UBI32_ETH_H
-
-#include <asm/devtree.h>
-
-#define UBI32_ETH_NUM_OF_DEVICES 2
-
-/*
- * Number of bytes trashed beyond the packet data.
- */
-#define UBI32_ETH_TRASHED_MEMORY	(CACHE_LINE_SIZE + ETH_HLEN - 1)
-
-/*
- * Linux already reserves NET_SKB_PAD bytes of headroom in each sk_buff.
- * We want to be able to reserve at least one cache line to align Ethernet
- * and IP header to cache line.
- * Note that the TIO expects a CACHE_LINE_SIZE - ETH_HLEN aligned Ethernet
- * header, while satisfies NET_IP_ALIGN (= 2) automatically.
- * (NET_SKB_PAD is 16, NET_IP_ALIGN is 2, CACHE_LINE_SIZE is 32).
- * You can add more space by making UBI32_ETH_RESERVE_EXTRA != 0.
- */
-#define UBI32_ETH_RESERVE_EXTRA (1 * CACHE_LINE_SIZE)
-#define UBI32_ETH_RESERVE_SPACE	(UBI32_ETH_RESERVE_EXTRA + CACHE_LINE_SIZE)
-
-struct ubi32_eth_dma_desc {
-	volatile void 	*data_pointer;	/* pointer to the buffer */
-	volatile u16 	buffer_len;	/* the buffer size */
-	volatile u16	data_len;	/* actual frame length */
-	volatile u32	status;		/* bit0: status to be update by VP; bit[31:1] time stamp */
-};
-
-#define TX_DMA_RING_SIZE (1<<8)
-#define TX_DMA_RING_MASK (TX_DMA_RING_SIZE - 1)
-#define RX_DMA_RING_SIZE (1<<8)
-#define RX_DMA_RING_MASK (RX_DMA_RING_SIZE - 1)
-
-#define RX_DMA_MAX_QUEUE_SIZE (RX_DMA_RING_SIZE - 1)	/* no more than (RX_DMA_RING_SIZE - 1) */
-#define RX_MAX_PKT_SIZE (ETH_DATA_LEN + ETH_HLEN + VLAN_HLEN)
-#define RX_MIN_PKT_SIZE	ETH_ZLEN
-#define RX_BUF_SIZE (RX_MAX_PKT_SIZE + VLAN_HLEN)	/* allow double VLAN tag */
-
-#define UBI32_ETH_VP_TX_TIMEOUT (10*HZ)
-
-struct ubi32_eth_vp_stats {
-	u32	rx_alloc_err;
-	u32	tx_q_full_cnt;
-	u32	rx_q_full_cnt;
-	u32	rx_throttle;
-};
-
-struct ubi32_eth_private {
-	struct net_device *dev;
-	struct ubi32_eth_vp_stats vp_stats;
-	spinlock_t lock;
-#ifdef UBICOM32_USE_NAPI
-	struct napi_struct napi;
-#else
-	struct tasklet_struct tsk;
-#endif
-	struct ethtionode *regs;
-	u16	rx_tail;
-	u16	tx_tail;
-	u32	vp_int_bit;
-};
-
-struct ethtionode {
-	struct devtree_node dn;
-	volatile u16	command;
-	volatile u16	status;
-	volatile u16	int_mask;	/* interrupt mask */
-	volatile u16	int_status;	/* interrupt mask */
-	volatile u16	tx_in;		/* owned by driver */
-	volatile u16	tx_out;		/* owned by vp */
-	volatile u16	rx_in;		/* owned by driver */
-	volatile u16	rx_out;		/* owned by vp */
-	u16		tx_sz;		/* owned by driver */
-	u16		rx_sz;		/* owned by driver */
-	struct ubi32_eth_dma_desc **tx_dma_ring;
-	struct ubi32_eth_dma_desc **rx_dma_ring;
-};
-
-#define UBI32_ETH_VP_STATUS_LINK	(1<<0)
-#define UBI32_ETH_VP_STATUS_SPEED100	(0x1<<1)
-#define UBI32_ETH_VP_STATUS_SPEED1000	(0x1<<2)
-#define UBI32_ETH_VP_STATUS_DUPLEX	(0x1<<3)
-#define UBI32_ETH_VP_STATUS_FLOW_CTRL	(0x1<<4)
-
-#define UBI32_ETH_VP_STATUS_RX_STATE	(0x1<<5)
-#define UBI32_ETH_VP_STATUS_TX_STATE	(0x1<<6)
-
-#define UBI32_ETH_VP_STATUS_TX_Q_FULL	(1<<8)
-
-#define UBI32_ETH_VP_INT_RX	(1<<0)
-#define UBI32_ETH_VP_INT_TX	(1<<1)
-
-#define UBI32_ETH_VP_CMD_RX_ENABLE	(1<<0)
-#define UBI32_ETH_VP_CMD_TX_ENABLE	(1<<1)
-
-#define UBI32_ETH_VP_RX_OK		(1<<0)
-#define UBI32_ETH_VP_TX_OK		(1<<1)
-
-#define UBI32_TX_BOUND		TX_DMA_RING_SIZE
-#define UBI32_RX_BOUND		64
-#define UBI32_ETH_NAPI_WEIGHT	64		/* for GigE */
-#endif
diff --git a/target/linux/ubicom32/files/drivers/serial/ubi32_mailbox.c b/target/linux/ubicom32/files/drivers/serial/ubi32_mailbox.c
deleted file mode 100644
index f14fcdfd9..000000000
--- a/target/linux/ubicom32/files/drivers/serial/ubi32_mailbox.c
+++ /dev/null
@@ -1,938 +0,0 @@
-/*
- * drivers/serial/ubi32_mailbox.c
- *   Ubicom32 On-Chip Mailbox Driver
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <linux/module.h>
-#include <linux/ioport.h>
-#include <linux/init.h>
-#include <linux/console.h>
-#include <linux/sysrq.h>
-#include <linux/platform_device.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <linux/serial_core.h>
-#include <linux/version.h>
-
-#include <asm/ip5000.h>
-
-#define SERIAL_UBICOM_BAUDRATE	115200
-#define SERIAL_UBICOM_DATA_BIT	8	/* Fixed parameter - do not change */
-#define SERIAL_UBICOM_PAR_BIT	0	/* Fixed parameter - do not change */
-#define SERIAL_UBICOM_STOP_BIT	1	/* Fixed parameter - do not change */
-
-/* UART name and device definitions */
-#define UBI32_MAILBOX_NAME	"ttyUM" // XXX
-#define UBI32_MAILBOX_MAJOR	207 // XXX
-#define UBI32_MAILBOX_MINOR	64
-
-#define PORT_UBI32_MAILBOX	1235
-#define NR_PORTS 1
-
-#define get_sclk() 0
-
-struct ubi32_mailbox_port {
-	struct uart_port port;
-	/*
-	 * NOTE (rkeller):
-	 * the uart port is wrapped in another structure in case we need to hold more state than
-	 * what we can hold in the uart_port.
-	 * Not sure if we need this, I took over the concept from the blackfin driver.
-	 */
-} ubi32_mailbox_ports[NR_PORTS];
-
-struct ubi32_mailbox_resource {
-	int uart_base_addr;
-	int uart_irq;
-} ubi32_mailbox_resource[NR_PORTS] = {
-	/*
-	 * uart_base_addr has to be non-NULL because it is put in the uart_port membase.
-	 * If membase if null the kernel skips the configuration and our port_type never gets set.
-	 */
-	{ISD_MAILBOX_BASE, ISD_MAILBOX_INT}
-};
-
-static volatile struct ubicom32_isd_mailbox {
-	volatile u32_t in;
-	volatile u32_t out;
-	volatile u32_t status;
-} *ubi32_mailbox = (struct ubicom32_isd_mailbox *)ISD_MAILBOX_BASE;
-
-static void ubi32_mailbox_tx_chars(struct ubi32_mailbox_port *uart);
-
-static void ubi32_mailbox_mctrl_check(struct ubi32_mailbox_port *uart);
-
-#define TRUE 1
-#define FALSE 0
-
-static int mailbox_console_flg = TRUE;
-static int num_timeouts = 0;
-
-/*
- * dummy functions and defined to be able to compile the Blackfin code
- */
-#define UART_GET_LSR(port) (1)
-#define UART_PUT_LSR(port, bits)
-#define UART_CLEAR_LSR(port) (1)
-#define TEMT 1
-#define TFI 1
-#define BI 1
-#define PE 1
-#define OE 1
-#define FE 1
-#define THRE 1
-#define DR 1
-#define UART_GET_LCR(port) (1)
-#define UART_PUT_LCR(port, bits)
-#define SB 1
-#define STB 1
-#define PEN 1
-#define EPS 1
-#define STP 1
-#define WLS(n) 0
-#define UART_GET_IER(port) (1)
-#define UART_SET_IER(port, bits)
-#define UART_CLEAR_IER(port, bits)
-#define ETBEI 0
-#define ERBFI 0
-#define UART_GET_CHAR(port) ubi32_mailbox_get_char()
-#define UART_PUT_CHAR(port, ch) ubi32_mailbox_put_char(ch)
-#define SSYNC()
-#define UART_GET_DLL(port) 0
-#define UART_PUT_DLL(port, ch)
-#define UART_GET_DLH(port) 0
-#define UART_PUT_DLH(port, ch)
-#define UART_GET_GCTL(port) (0)
-#define UART_PUT_GCTL(port, ch)
-#define UCEN 1
-
-/*
- * ubi32_mailbox_get_char_avail()
- */
-static int ubi32_mailbox_get_char_avail(void)
-{
-	return !(ubi32_mailbox->status & ISD_MAILBOX_STATUS_IN_EMPTY);
-}
-
-/*
- * ubi32_mailbox_get_char()
- */
-static u32_t ubi32_mailbox_get_char(void)
-{
-	if (mailbox_console_flg == TRUE) {
-		/*
-		 * Mailbox console is connected.
-		 */
-		while (ubi32_mailbox->status & ISD_MAILBOX_STATUS_IN_EMPTY);
-		return ubi32_mailbox->in & 0xff;
-	}
-
-	/*
-	 * Mailbox console was not connected.
-	 */
-	if (ubi32_mailbox->status & ISD_MAILBOX_STATUS_IN_EMPTY) {
-		return 0xff;
-	}
-
-	/*
-	 * Mailbox console is connecting.
-	 */
-	mailbox_console_flg = TRUE;
-	num_timeouts = 0;
-	return ubi32_mailbox->in & 0xff;
-}
-
-#define MAILBOX_MAX_ATTEMPTS 1000000
-#define MAILBOX_MAX_TIMEOUTS 5
-/*
- * ubi32_mailbox_put_char()
- */
-static void ubi32_mailbox_put_char(u32_t v)
-{
-	/*
-	 * Wait to be able to output.
-	 */
-	u32_t num_attempts = 0;
-
-	if(mailbox_console_flg == TRUE) {
-		while(num_attempts++ < MAILBOX_MAX_ATTEMPTS) {
-			if(ubi32_mailbox->status & ISD_MAILBOX_STATUS_OUT_EMPTY) {
-				break;
-			}
-		}
-
-		/*
-		 * If timed out more than 5 times on send, mailbox console is disconnected now.
-		 */
-		if (num_attempts > MAILBOX_MAX_ATTEMPTS) {
-			if (num_timeouts++ > MAILBOX_MAX_TIMEOUTS) {
-				mailbox_console_flg = FALSE;
-			}
-		}
-	}
-
-	asm volatile(
-		"pipe_flush 0	\n\t"
-		"pipe_flush 0	\n\t"
-		"pipe_flush 0	\n\t"
-		"pipe_flush 0	\n\t"
-		"pipe_flush 0	\n\t"
-		"pipe_flush 0	\n\t"
-		"pipe_flush 0	\n\t"
-	);
-
-	ubi32_mailbox->out = v & 0xff;
-}
-
-static void ubi32_mailbox_hw_init(struct ubi32_mailbox_port *uart)
-{
-// NOTE: It does not do any good to do these here because we are running on the linux hardware thread,
-//	and these have to be called on the ldsr thread.
-//	ubicom32_clear_interrupt(ISD_MAILBOX_INT);
-//	ubicom32_enable_interrupt(ISD_MAILBOX_INT);
-}
-
-/*
- * interrupts are disabled on entry
- */
-static void ubi32_mailbox_stop_tx(struct uart_port *port)
-{
-//	struct ubi32_mailbox_port *uart = (struct ubi32_mailbox_port *)port;
-//	struct circ_buf *xmit = &uart->port.info->xmit;
-
-	while (!(UART_GET_LSR(uart) & TEMT))
-		cpu_relax();
-
-	/* Clear TFI bit */
-	UART_PUT_LSR(uart, TFI);
-	UART_CLEAR_IER(uart, ETBEI);
-}
-
-/*
- * port is locked and interrupts are disabled
- */
-static void ubi32_mailbox_start_tx(struct uart_port *port)
-{
-	struct ubi32_mailbox_port *uart = (struct ubi32_mailbox_port *)port;
-
-	UART_SET_IER(uart, ETBEI);
-
-	ubi32_mailbox_tx_chars(uart);
-}
-
-/*
- * Interrupts are enabled
- */
-static void ubi32_mailbox_stop_rx(struct uart_port *port)
-{
-//	struct ubi32_mailbox_port *uart = (struct ubi32_mailbox_port *)port;
-	UART_CLEAR_IER(uart, ERBFI);
-}
-
-/*
- * Set the modem control timer to fire immediately.
- */
-static void ubi32_mailbox_enable_ms(struct uart_port *port)
-{
-}
-
-static void ubi32_mailbox_rx_chars(struct ubi32_mailbox_port *uart)
-{
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)
-	struct uart_state *state = uart->port.state;
-	struct tty_struct *tty = state->port.tty;
-#else
-	struct uart_info *info = uart->port.info;
-	struct tty_struct *tty = info->port.tty;
-#endif
-	unsigned int status, ch, flg;
-
-	status = 0; // XXX? UART_GET_LSR(uart);
-	UART_CLEAR_LSR(uart);
-
-	ch = UART_GET_CHAR(uart);
-
-	if(ch == 0xff)
-		return;
-
-	uart->port.icount.rx++;
-
-	if (status & BI) {
-		uart->port.icount.brk++;
-		if (uart_handle_break(&uart->port))
-			goto ignore_char;
-		status &= ~(PE | FE);
-	}
-	if (status & PE)
-		uart->port.icount.parity++;
-	if (status & OE)
-		uart->port.icount.overrun++;
-	if (status & FE)
-		uart->port.icount.frame++;
-
-	status &= uart->port.read_status_mask;
-
-	if (status & BI)
-		flg = TTY_BREAK;
-	else if (status & PE)
-		flg = TTY_PARITY;
-	else if (status & FE)
-		flg = TTY_FRAME;
-	else
-		flg = TTY_NORMAL;
-
-	if (uart_handle_sysrq_char(&uart->port, ch))
-		goto ignore_char;
-
-	uart_insert_char(&uart->port, status, OE, ch, flg);
-
- ignore_char:
-	tty_flip_buffer_push(tty);
-}
-
-static void ubi32_mailbox_tx_chars(struct ubi32_mailbox_port *uart)
-{
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)
-	struct circ_buf *xmit = &uart->port.state->xmit;
-#else
-	struct circ_buf *xmit = &uart->port.info->xmit;
-#endif
-
-	if (uart->port.x_char) {
-		UART_PUT_CHAR(uart, uart->port.x_char);
-		uart->port.icount.tx++;
-		uart->port.x_char = 0;
-	}
-	/*
-	 * Check the modem control lines before
-	 * transmitting anything.
-	 */
-	ubi32_mailbox_mctrl_check(uart);
-
-	if (uart_circ_empty(xmit) || uart_tx_stopped(&uart->port)) {
-		ubi32_mailbox_stop_tx(&uart->port);
-		return;
-	}
-
-	while ((UART_GET_LSR(uart) & THRE) && xmit->tail != xmit->head) {
-		UART_PUT_CHAR(uart, xmit->buf[xmit->tail]);
-		xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
-		uart->port.icount.tx++;
-		SSYNC();
-	}
-
-	if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
-		uart_write_wakeup(&uart->port);
-
-	if (uart_circ_empty(xmit))
-		ubi32_mailbox_stop_tx(&uart->port);
-}
-
-static irqreturn_t ubi32_mailbox_isr(int irq, void *dev_id)
-{
-	struct ubi32_mailbox_port *uart = dev_id;
-
-	spin_lock(&uart->port.lock);
-
-	//XXX?while (UART_GET_LSR(uart) & DR)
-
-	/*
-	 * RX process
-	 */
-	while (ubi32_mailbox_get_char_avail()) {
-		ubi32_mailbox_rx_chars(uart);
-	}
-
-#if 0
-	/*
-	 * TX process
-	 */
-	if (this_uart.tx_in == this_uart.tx_out) {
-		UBICOM32_IO_PORT(SERIAL_UBICOM_PORT)->int_mask &= ~IO_PORTX_INT_SERDES_TXBE;
-	} else if (UBICOM32_IO_PORT(SERIAL_UBICOM_PORT)->int_status & IO_PORTX_INT_SERDES_TXBE) {
-		uart_ubicom32_send(this_uart.tx_buf[this_uart.tx_out & (SERIAL_UBICOM_BUF_SIZE - 1)]);
-		this_uart.tx_out++;
-		UBICOM32_IO_PORT(SERIAL_UBICOM_PORT)->int_mask |= IO_PORTX_INT_SERDES_TXBE;
-	}
-#endif
-
-	spin_unlock(&uart->port.lock);
-
-	return IRQ_HANDLED;
-}
-#if 0
-static irqreturn_t ubi32_mailbox_tx_int(int irq, void *dev_id)
-{
-	struct ubi32_mailbox_port *uart = dev_id;
-
-	spin_lock(&uart->port.lock);
-	if (UART_GET_LSR(uart) & THRE)
-		ubi32_mailbox_tx_chars(uart);
-	spin_unlock(&uart->port.lock);
-
-	return IRQ_HANDLED;
-}
-#endif
-
-/*
- * Return TIOCSER_TEMT when transmitter is not busy.
- */
-static unsigned int ubi32_mailbox_tx_empty(struct uart_port *port)
-{
-//	struct ubi32_mailbox_port *uart = (struct ubi32_mailbox_port *)port;
-	unsigned short lsr;
-
-	lsr = UART_GET_LSR(uart);
-	if (lsr & TEMT)
-		return TIOCSER_TEMT;
-	else
-		return 0;
-}
-
-static unsigned int ubi32_mailbox_get_mctrl(struct uart_port *port)
-{
-		return TIOCM_CTS | TIOCM_DSR | TIOCM_CAR;
-}
-
-static void ubi32_mailbox_set_mctrl(struct uart_port *port, unsigned int mctrl)
-{
-}
-
-/*
- * Handle any change of modem status signal since we were last called.
- */
-static void ubi32_mailbox_mctrl_check(struct ubi32_mailbox_port *uart)
-{
-}
-
-/*
- * Interrupts are always disabled.
- */
-static void ubi32_mailbox_break_ctl(struct uart_port *port, int break_state)
-{
-//	struct ubi32_mailbox_port *uart = (struct ubi32_mailbox_port *)port;
-	u16 lcr = UART_GET_LCR(uart);
-	if (break_state)
-		lcr |= SB;
-	else
-		lcr &= ~SB;
-	UART_PUT_LCR(uart, lcr);
-	SSYNC();
-}
-
-static int ubi32_mailbox_startup(struct uart_port *port)
-{
-	struct ubi32_mailbox_port *uart = (struct ubi32_mailbox_port *)port;
-
-	if (request_irq(uart->port.irq, ubi32_mailbox_isr, IRQF_DISABLED,
-	     "UBI32_MAILBOX", uart)) {
-		printk(KERN_NOTICE "Unable to attach Ubicom32 SERDES interrupt\n");
-		return -EBUSY;
-	}
-
-	UART_SET_IER(uart, ERBFI);
-	return 0;
-}
-
-static void ubi32_mailbox_shutdown(struct uart_port *port)
-{
-	struct ubi32_mailbox_port *uart = (struct ubi32_mailbox_port *)port;
-
-	free_irq(uart->port.irq, uart);
-}
-
-static void
-ubi32_mailbox_set_termios(struct uart_port *port, struct ktermios *termios,
-		   struct ktermios *old)
-{
-	struct ubi32_mailbox_port *uart = (struct ubi32_mailbox_port *)port;
-	unsigned long flags;
-	unsigned int baud, quot;
-	unsigned short val, ier, lsr, lcr = 0;
-
-	switch (termios->c_cflag & CSIZE) {
-	case CS8:
-		lcr = WLS(8);
-		break;
-	case CS7:
-		lcr = WLS(7);
-		break;
-	case CS6:
-		lcr = WLS(6);
-		break;
-	case CS5:
-		lcr = WLS(5);
-		break;
-	default:
-		printk(KERN_ERR "%s: word lengh not supported\n",
-			__FUNCTION__);
-	}
-
-	if (termios->c_cflag & CSTOPB)
-		lcr |= STB;
-	if (termios->c_cflag & PARENB)
-		lcr |= PEN;
-	if (!(termios->c_cflag & PARODD))
-		lcr |= EPS;
-	if (termios->c_cflag & CMSPAR)
-		lcr |= STP;
-
-	port->read_status_mask = OE;
-	if (termios->c_iflag & INPCK)
-		port->read_status_mask |= (FE | PE);
-	if (termios->c_iflag & (BRKINT | PARMRK))
-		port->read_status_mask |= BI;
-
-	/*
-	 * Characters to ignore
-	 */
-	port->ignore_status_mask = 0;
-	if (termios->c_iflag & IGNPAR)
-		port->ignore_status_mask |= FE | PE;
-	if (termios->c_iflag & IGNBRK) {
-		port->ignore_status_mask |= BI;
-		/*
-		 * If we're ignoring parity and break indicators,
-		 * ignore overruns too (for real raw support).
-		 */
-		if (termios->c_iflag & IGNPAR)
-			port->ignore_status_mask |= OE;
-	}
-
-	baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16);
-	quot = uart_get_divisor(port, baud);
-	spin_lock_irqsave(&uart->port.lock, flags);
-
-	do {
-		lsr = UART_GET_LSR(uart);
-	} while (!(lsr & TEMT));
-
-	/* Disable UART */
-	ier = UART_GET_IER(uart);
-	UART_CLEAR_IER(uart, 0xF);
-
-	UART_PUT_DLL(uart, quot & 0xFF);
-	SSYNC();
-	UART_PUT_DLH(uart, (quot >> 8) & 0xFF);
-	SSYNC();
-
-	UART_PUT_LCR(uart, lcr);
-
-	/* Enable UART */
-	UART_SET_IER(uart, ier);
-
-	val = UART_GET_GCTL(uart);
-	val |= UCEN;
-	UART_PUT_GCTL(uart, val);
-
-	spin_unlock_irqrestore(&uart->port.lock, flags);
-}
-
-static const char *ubi32_mailbox_type(struct uart_port *port)
-{
-	struct ubi32_mailbox_port *uart = (struct ubi32_mailbox_port *)port;
-
-	return uart->port.type == PORT_UBI32_MAILBOX ? "UBI32_MAILBOX" : NULL;
-}
-
-/*
- * Release the memory region(s) being used by 'port'.
- */
-static void ubi32_mailbox_release_port(struct uart_port *port)
-{
-}
-
-/*
- * Request the memory region(s) being used by 'port'.
- */
-static int ubi32_mailbox_request_port(struct uart_port *port)
-{
-	return 0;
-}
-
-/*
- * Configure/autoconfigure the port.
- */
-static void ubi32_mailbox_config_port(struct uart_port *port, int flags)
-{
-	struct ubi32_mailbox_port *uart = (struct ubi32_mailbox_port *)port;
-
-	if (flags & UART_CONFIG_TYPE && ubi32_mailbox_request_port(&uart->port) == 0)
-		uart->port.type = PORT_UBI32_MAILBOX;
-}
-
-/*
- * Verify the new serial_struct (for TIOCSSERIAL).
- * The only change we allow are to the flags and type, and
- * even then only between PORT_UBI32_MAILBOX and PORT_UNKNOWN
- */
-static int
-ubi32_mailbox_verify_port(struct uart_port *port, struct serial_struct *ser)
-{
-	return 0;
-}
-
-static struct uart_ops ubi32_mailbox_pops = {
-	.tx_empty	= ubi32_mailbox_tx_empty,
-	.set_mctrl	= ubi32_mailbox_set_mctrl,
-	.get_mctrl	= ubi32_mailbox_get_mctrl,
-	.stop_tx	= ubi32_mailbox_stop_tx,
-	.start_tx	= ubi32_mailbox_start_tx,
-	.stop_rx	= ubi32_mailbox_stop_rx,
-	.enable_ms	= ubi32_mailbox_enable_ms,
-	.break_ctl	= ubi32_mailbox_break_ctl,
-	.startup	= ubi32_mailbox_startup,
-	.shutdown	= ubi32_mailbox_shutdown,
-	.set_termios	= ubi32_mailbox_set_termios,
-	.type		= ubi32_mailbox_type,
-	.release_port	= ubi32_mailbox_release_port,
-	.request_port	= ubi32_mailbox_request_port,
-	.config_port	= ubi32_mailbox_config_port,
-	.verify_port	= ubi32_mailbox_verify_port,
-};
-
-static void __init ubi32_mailbox_init_ports(void)
-{
-	static int first = 1;
-	int i;
-
-	if (!first)
-		return;
-	first = 0;
-
-	for (i = 0; i < NR_PORTS; i++) {
-		ubi32_mailbox_ports[i].port.uartclk   = get_sclk();
-		ubi32_mailbox_ports[i].port.ops       = &ubi32_mailbox_pops;
-		ubi32_mailbox_ports[i].port.line      = i;
-		ubi32_mailbox_ports[i].port.iotype    = UPIO_MEM;
-		ubi32_mailbox_ports[i].port.membase   =
-			(void __iomem *)ubi32_mailbox_resource[i].uart_base_addr;
-		ubi32_mailbox_ports[i].port.mapbase   =
-			ubi32_mailbox_resource[i].uart_base_addr;
-		ubi32_mailbox_ports[i].port.irq       =
-			ubi32_mailbox_resource[i].uart_irq;
-		ubi32_mailbox_ports[i].port.flags     = UPF_BOOT_AUTOCONF;
-		spin_lock_init(&ubi32_mailbox_ports[i].port.lock);
-
-		ubi32_mailbox_hw_init(&ubi32_mailbox_ports[i]);
-	}
-
-}
-
-#ifdef CONFIG_SERIAL_UBI32_MAILBOX_CONSOLE
-/*
- * If the port was already initialised (eg, by a boot loader),
- * try to determine the current setup.
- */
-static void __init
-ubi32_mailbox_console_get_options(struct ubi32_mailbox_port *uart, int *baud,
-			   int *parity, int *bits)
-{
-	unsigned short status;
-
-	status = UART_GET_IER(uart) & (ERBFI | ETBEI);
-	if (status == (ERBFI | ETBEI)) {
-		/* ok, the port was enabled */
-		unsigned short lcr;
-		unsigned short dlh, dll;
-
-		lcr = UART_GET_LCR(uart);
-
-		*parity = 'n';
-		if (lcr & PEN) {
-			if (lcr & EPS)
-				*parity = 'e';
-			else
-				*parity = 'o';
-		}
-		switch (lcr & 0x03) {
-			case 0:	*bits = 5; break;
-			case 1:	*bits = 6; break;
-			case 2:	*bits = 7; break;
-			case 3:	*bits = 8; break;
-		}
-
-		dll = UART_GET_DLL(uart);
-		dlh = UART_GET_DLH(uart);
-
-		*baud = get_sclk() / (16*(dll | dlh << 8));
-	}
-	pr_debug("%s:baud = %d, parity = %c, bits= %d\n", __FUNCTION__, *baud, *parity, *bits);
-}
-#endif
-
-#if defined(CONFIG_SERIAL_UBI32_MAILBOX_CONSOLE) || defined(CONFIG_EARLY_PRINTK)
-static struct uart_driver ubi32_mailbox_reg;
-
-static int __init
-ubi32_mailbox_console_setup(struct console *co, char *options)
-{
-	struct ubi32_mailbox_port *uart;
-# ifdef CONFIG_SERIAL_UBI32_MAILBOX_CONSOLE
-	int baud = SERIAL_UBICOM_BAUDRATE;
-	int bits = 8;
-	int parity = 'n';
-	int flow = 'n';
-# endif
-
-	/*
-	 * Check whether an invalid uart number has been specified, and
-	 * if so, search for the first available port that does have
-	 * console support.
-	 */
-	if (co->index == -1 || co->index >= NR_PORTS)
-		co->index = 0;
-	uart = &ubi32_mailbox_ports[co->index];
-
-# ifdef CONFIG_SERIAL_UBI32_MAILBOX_CONSOLE
-	if (options)
-		uart_parse_options(options, &baud, &parity, &bits, &flow);
-	else
-		ubi32_mailbox_console_get_options(uart, &baud, &parity, &bits);
-
-	//JB return uart_set_options(&uart->port, co, baud, parity, bits, flow);
-	return 0;
-# else
-	return 0;
-# endif
-}
-#endif /* defined (CONFIG_SERIAL_UBI32_MAILBOX_CONSOLE) ||
-				 defined (CONFIG_EARLY_PRINTK) */
-
-#ifdef CONFIG_SERIAL_UBI32_MAILBOX_CONSOLE
-static void ubi32_mailbox_console_putchar(struct uart_port *port, int ch)
-{
-//	struct ubi32_mailbox_port *uart = (struct ubi32_mailbox_port *)port;
-	while (!(UART_GET_LSR(uart) & THRE))
-		barrier();
-	UART_PUT_CHAR(uart, ch);
-	SSYNC();
-}
-
-/*
- * Interrupts are disabled on entering
- */
-static void
-ubi32_mailbox_console_write(struct console *co, const char *s, unsigned int count)
-{
-	struct ubi32_mailbox_port *uart = &ubi32_mailbox_ports[co->index];
-	unsigned long flags = 0;
-
-	spin_lock_irqsave(&uart->port.lock, flags);
-	uart_console_write(&uart->port, s, count, ubi32_mailbox_console_putchar);
-	spin_unlock_irqrestore(&uart->port.lock, flags);
-
-}
-
-static struct console ubi32_mailbox_console = {
-	.name		= UBI32_MAILBOX_NAME,
-	.write		= ubi32_mailbox_console_write,
-	.device		= uart_console_device,
-	.setup		= ubi32_mailbox_console_setup,
-	.flags		= CON_PRINTBUFFER,
-	.index		= -1,
-	.data		= &ubi32_mailbox_reg,
-};
-
-static int __init ubi32_mailbox_console_init(void)
-{
-	ubi32_mailbox_init_ports();
-	register_console(&ubi32_mailbox_console);
-	return 0;
-}
-console_initcall(ubi32_mailbox_console_init);
-
-#define UBI32_MAILBOX_CONSOLE	&ubi32_mailbox_console
-#else
-#define UBI32_MAILBOX_CONSOLE	NULL
-#endif /* CONFIG_SERIAL_UBI32_MAILBOX_CONSOLE */
-
-
-#ifdef CONFIG_EARLY_PRINTK
-static __init void ubi32_mailbox_early_putc(struct uart_port *port, int ch)
-{
-	UART_PUT_CHAR(uart, ch);
-}
-
-static __init void ubi32_mailbox_early_write(struct console *con, const char *s,
-					unsigned int n)
-{
-	struct ubi32_mailbox_port *uart = &ubi32_mailbox_ports[con->index];
-	unsigned int i;
-
-	for (i = 0; i < n; i++, s++) {
-		if (*s == '\n')
-			ubi32_mailbox_early_putc(&uart->port, '\r');
-		ubi32_mailbox_early_putc(&uart->port, *s);
-	}
-}
-
-static struct __init console ubi32_mailbox_early_console = {
-	.name = "early_UM",
-	.write = ubi32_mailbox_early_write,
-	.device = uart_console_device,
-	.flags = CON_PRINTBUFFER,
-	.setup = ubi32_mailbox_console_setup,
-	.index = -1,
-	.data  = &ubi32_mailbox_reg,
-};
-
-/*
- * XXX Unused in our driver. Need to find out what the termios initialization is good/needed for.
- */
-struct console __init *ubi32_mailbox_early_init(unsigned int port,
-						unsigned int cflag)
-{
-	struct ubi32_mailbox_port *uart;
-	struct ktermios t;
-
-	if (port == -1 || port >= NR_PORTS)
-		port = 0;
-	ubi32_mailbox_init_ports();
-	ubi32_mailbox_early_console.index = port;
-	uart = &ubi32_mailbox_ports[port];
-	t.c_cflag = cflag;
-	t.c_iflag = 0;
-	t.c_oflag = 0;
-	t.c_lflag = ICANON;
-	t.c_line = port;
-	ubi32_mailbox_set_termios(&uart->port, &t, &t);
-	return &ubi32_mailbox_early_console;
-}
-
-#endif /* CONFIG_SERIAL_UBI32_MAILBOX_CONSOLE */
-
-static struct uart_driver ubi32_mailbox_reg = {
-	.owner			= THIS_MODULE,
-	.driver_name		= "ubi32_mailbox",
-	.dev_name		= UBI32_MAILBOX_NAME,
-	.major			= UBI32_MAILBOX_MAJOR,
-	.minor			= UBI32_MAILBOX_MINOR,
-	.nr			= NR_PORTS,
-	.cons			= UBI32_MAILBOX_CONSOLE,
-};
-
-static int ubi32_mailbox_suspend(struct platform_device *dev, pm_message_t state)
-{
-	struct ubi32_mailbox_port *uart = platform_get_drvdata(dev);
-
-	if (uart)
-		uart_suspend_port(&ubi32_mailbox_reg, &uart->port);
-
-	return 0;
-}
-
-static int ubi32_mailbox_resume(struct platform_device *dev)
-{
-	struct ubi32_mailbox_port *uart = platform_get_drvdata(dev);
-
-	if (uart)
-		uart_resume_port(&ubi32_mailbox_reg, &uart->port);
-
-	return 0;
-}
-
-static int ubi32_mailbox_probe(struct platform_device *dev)
-{
-	struct resource *res = dev->resource;
-	int i;
-
-	for (i = 0; i < dev->num_resources; i++, res++)
-		if (res->flags & IORESOURCE_MEM)
-			break;
-
-	if (i < dev->num_resources) {
-		for (i = 0; i < NR_PORTS; i++, res++) {
-			if (ubi32_mailbox_ports[i].port.mapbase != res->start)
-				continue;
-			ubi32_mailbox_ports[i].port.dev = &dev->dev;
-			uart_add_one_port(&ubi32_mailbox_reg, &ubi32_mailbox_ports[i].port);
-			platform_set_drvdata(dev, &ubi32_mailbox_ports[i]);
-		}
-	}
-
-	return 0;
-}
-
-static int ubi32_mailbox_remove(struct platform_device *pdev)
-{
-	struct ubi32_mailbox_port *uart = platform_get_drvdata(pdev);
-
-	platform_set_drvdata(pdev, NULL);
-
-	if (uart)
-		uart_remove_one_port(&ubi32_mailbox_reg, &uart->port);
-
-	return 0;
-}
-
-static struct platform_driver ubi32_mailbox_driver = {
-	.probe		= ubi32_mailbox_probe,
-	.remove		= ubi32_mailbox_remove,
-	.suspend	= ubi32_mailbox_suspend,
-	.resume		= ubi32_mailbox_resume,
-	.driver		= {
-		.name	= "ubi32-mbox",
-		.owner	= THIS_MODULE,
-	},
-};
-
-static int __init ubi32_mailbox_init(void)
-{
-	int ret;
-
-	pr_info("Serial: Ubicom32 mailbox serial driver.\n");
-
-	mailbox_console_flg = TRUE;
-	num_timeouts = 0;
-	ubi32_mailbox_init_ports();
-
-	ret = uart_register_driver(&ubi32_mailbox_reg);
-	if (ret == 0) {
-		ret = platform_driver_register(&ubi32_mailbox_driver);
-		if (ret) {
-			pr_debug("uart register failed\n");
-			uart_unregister_driver(&ubi32_mailbox_reg);
-		}
-	}
-
-	/*
-	 * XXX HACK: currently probe does not get called, but the port needs to be added to work.
-	 */
-	uart_add_one_port(&ubi32_mailbox_reg, &ubi32_mailbox_ports[0].port);
-	return ret;
-}
-
-static void __exit ubi32_mailbox_exit(void)
-{
-	platform_driver_unregister(&ubi32_mailbox_driver);
-	uart_unregister_driver(&ubi32_mailbox_reg);
-}
-
-module_init(ubi32_mailbox_init);
-module_exit(ubi32_mailbox_exit);
-
-MODULE_ALIAS_CHARDEV_MAJOR(UBI32_MAILBOX_MAJOR);
-MODULE_ALIAS("platform:ubi32_mailbox");
diff --git a/target/linux/ubicom32/files/drivers/serial/ubi32_serdes.c b/target/linux/ubicom32/files/drivers/serial/ubi32_serdes.c
deleted file mode 100644
index 79037da49..000000000
--- a/target/linux/ubicom32/files/drivers/serial/ubi32_serdes.c
+++ /dev/null
@@ -1,817 +0,0 @@
-/*
- * drivers/serial/ubi32_serdes.c
- *   Ubicom32 On-Chip Serial Driver
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <linux/module.h>
-#include <linux/ioport.h>
-#include <linux/init.h>
-#include <linux/console.h>
-#include <linux/sysrq.h>
-#include <linux/platform_device.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <linux/serial_core.h>
-
-#include <asm/ip5000.h>
-#include <asm/ubicom32suart.h>
-
-
-#define SERIAL_UBICOM_PIN_RXD	(1 << 0)
-#define SERIAL_UBICOM_PIN_TXD	(1 << 6)
-#define SERIAL_UBICOM_CTL0	0x8b300000
-#define SERIAL_UBICOM_CTL1	0x00000009
-
-#define SERIAL_UBICOM_DATA_BIT	8	/* Fixed parameter - do not change */
-#define SERIAL_UBICOM_PAR_BIT	0	/* Fixed parameter - do not change */
-#define SERIAL_UBICOM_STOP_BIT	1	/* Fixed parameter - do not change */
-
-/* UART name and device definitions */
-#define UBI32_SERDES_NAME	"ttyUS" // XXX
-#define UBI32_SERDES_MAJOR	206 // XXX
-#define UBI32_SERDES_MINOR	64 // XXX
-
-#define PORT_UBI32_SERDES	1234
-#define NR_PORTS 1
-
-struct uart_port ubi32_serdes_ports[NR_PORTS];
-
-struct ubi32_serdes_resource {
-	void *uart_base_addr;
-	int uart_irq;
-	int uart_clock;
-} ubi32_serdes_resource[NR_PORTS] = {
-	/*
-	 * Get params from kernel command line (required for early printk)
-	 * or from platform resources.
-	 */
-	{0, 0, 0}
-};
-
-/*
- * Can get overridden by 'serdes=' kernel command line.
- */
-static int ubi32_serdes_default_baud_rate = 115200;
-
-
-#define IO_PORT(port) ((struct ubicom32_io_port *)port->membase)
-#define IO_PORT_INT_STATUS(port) (IO_PORT(port)->int_status)
-#define IO_PORT_INT_MASK(port) (IO_PORT(port)->int_mask)
-#define IO_PORT_INT_CLR(port) (IO_PORT(port)->int_clr)
-
-
-/*
- * ubi32_serdes_get_char()
- */
-static u8_t ubi32_serdes_get_char(struct ubicom32_io_port *io_port)
-{
-	/*
-	 * Read from hardware (forced 32-bit atomic read).
-	 */
-	u32_t data = 0;
-
-	if ( io_port ) {
-		io_port->int_clr = IO_PORTX_INT_SERDES_RXBF;
-		asm volatile (
-			"move.4		%0, %1		\n\t"
-			: "=r" (data)
-			: "m" (*(u32_t *)&(io_port->rx_fifo))
-			);
-	}
-
-	return (u8_t)(data & 0x000000ff);
-}
-
-/*
- * ubi32_serdes_put_char()
- */
-static void ubi32_serdes_put_char(struct ubicom32_io_port *io_port, u8_t c)
-{
-	u32_t data = 0x0000fe00 | (c << 1);
-
-	if ( io_port ) {
-		/*
-		 * Fixed data format:
-		 * [LSB]1 start bit - 8 data bits - no parity - 1 stop bit[MSB]
-		 */
-		io_port->int_clr = IO_PORTX_INT_SERDES_TXBE;
-		io_port->ctl2 = data;
-		io_port->int_set = IO_PORTX_INT_SERDES_TXBUF_VALID;
-	}
-}
-
-static void ubi32_serdes_hw_init(struct uart_port *port, int baud)
-{
-	struct ubicom32_io_port *io_port = IO_PORT(port);
-
-	if ( io_port ) {
-		/*
-		 * Put port functions 1-4 into reset state.
-		 * Function 0 (GPIO) does not need or have a reset bit.
-		 *
-		 * Select SERDES function for restart below.
-		 */
-		io_port->function =
-			IO_FUNC_FUNCTION_RESET(1) | IO_FUNC_FUNCTION_RESET(2) |
-			IO_FUNC_FUNCTION_RESET(3) | IO_FUNC_FUNCTION_RESET(4) |
-			IO_PORTX_FUNC_SERDES;
-
-		/*
-		 * Configure SERDES baudrate
-		 */
-		if ( baud == 0 ) {
-			baud = ubi32_serdes_default_baud_rate;
-		}
-
-		io_port->ctl0 =
-			SERIAL_UBICOM_CTL0 |
-			((port->uartclk / (16 * baud)) - 1);
-
-		io_port->ctl1 =
-			SERIAL_UBICOM_CTL1;
-
-		/*
-		 * don't interrupt until startup and start_tx
-		 */
-		io_port->int_mask = 0;
-
-		/*
-		 * Set TXD pin output, RXD input and prevent GPIO
-		 * override on the TXD & RXD pins
-		 */
-		io_port->gpio_ctl &= ~SERIAL_UBICOM_PIN_RXD;
-		io_port->gpio_ctl |= SERIAL_UBICOM_PIN_TXD;
-		io_port->gpio_mask &= ~(SERIAL_UBICOM_PIN_RXD | SERIAL_UBICOM_PIN_TXD);
-
-		/*
-		 * Restart (un-reset) the port's SERDES function.
-		 */
-		io_port->function &= ~(IO_FUNC_FUNCTION_RESET(IO_PORTX_FUNC_SERDES));
-	}
-}
-
-#define ULITE_STATUS_RXVALID IO_PORTX_INT_SERDES_RXBF
-#define ULITE_STATUS_OVERRUN 0
-#define ULITE_STATUS_FRAME 0
-#define ULITE_STATUS_PARITY 0
-#define ULITE_STATUS_TXEMPTY IO_PORTX_INT_SERDES_TXBE
-#define ULITE_STATUS_TXFULL 0
-
-static int ubi32_serdes_receive(struct uart_port *port, int stat)
-{
-	struct tty_struct *tty = port->info->port.tty;
-	unsigned char ch = 0;
-	char flag = TTY_NORMAL;
-
-	if ((stat & (ULITE_STATUS_RXVALID | ULITE_STATUS_OVERRUN
-		     | ULITE_STATUS_FRAME)) == 0)
-		return 0;
-
-	/* stats */
-	if (stat & ULITE_STATUS_RXVALID) {
-		port->icount.rx++;
-		ch = ubi32_serdes_get_char((struct ubicom32_io_port *)port->membase);
-
-		if (stat & ULITE_STATUS_PARITY)
-			port->icount.parity++;
-	}
-
-	if (stat & ULITE_STATUS_OVERRUN)
-		port->icount.overrun++;
-
-	if (stat & ULITE_STATUS_FRAME)
-		port->icount.frame++;
-
-
-	/* drop byte with parity error if IGNPAR specificed */
-	if (stat & port->ignore_status_mask & ULITE_STATUS_PARITY)
-		stat &= ~ULITE_STATUS_RXVALID;
-
-	stat &= port->read_status_mask;
-
-	if (stat & ULITE_STATUS_PARITY)
-		flag = TTY_PARITY;
-
-	stat &= ~port->ignore_status_mask;
-
-	if (stat & ULITE_STATUS_RXVALID)
-		tty_insert_flip_char(tty, ch, flag);
-
-	if (stat & ULITE_STATUS_FRAME)
-		tty_insert_flip_char(tty, 0, TTY_FRAME);
-
-	if (stat & ULITE_STATUS_OVERRUN)
-		tty_insert_flip_char(tty, 0, TTY_OVERRUN);
-
-	return 1;
-}
-
-/*
- * interrupts are disabled on entry
- */
-static void ubi32_serdes_stop_tx(struct uart_port *port)
-{
-	IO_PORT_INT_MASK(port) = IO_PORT_INT_MASK(port) & ~IO_PORTX_INT_SERDES_TXBE;
-}
-
-static int ubi32_serdes_transmit(struct uart_port *port, int stat)
-{
-	struct circ_buf *xmit  = &port->info->xmit;
-
-	if (!(stat & IO_PORTX_INT_SERDES_TXBE))
-		return 0;
-
-	if (port->x_char) {
-		ubi32_serdes_put_char(IO_PORT(port), port->x_char);
-		port->x_char = 0;
-		port->icount.tx++;
-		return 1;
-	}
-
-	if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
-		ubi32_serdes_stop_tx(port);
-		return 0;
-	}
-
-	ubi32_serdes_put_char(IO_PORT(port), xmit->buf[xmit->tail]);
-	xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE-1);
-	port->icount.tx++;
-
-	/* wake up */
-	if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
-		uart_write_wakeup(port);
-
-	if (uart_circ_empty(xmit))
-		ubi32_serdes_stop_tx(port);
-
-	return 1;
-}
-
-/*
- * port is locked and interrupts are disabled
- */
-static void ubi32_serdes_start_tx(struct uart_port *port)
-{
-	IO_PORT_INT_MASK(port) = IO_PORT_INT_MASK(port) | IO_PORTX_INT_SERDES_TXBE;
-	ubi32_serdes_transmit(port, IO_PORT_INT_STATUS(port));
-}
-
-/*
- * Interrupts are enabled
- */
-static void ubi32_serdes_stop_rx(struct uart_port *port)
-{
-	/* don't forward any more data (like !CREAD) */
-	port->ignore_status_mask = IO_PORTX_INT_SERDES_RXBF;
-}
-
-/*
- * Set the modem control timer to fire immediately.
- */
-static void ubi32_serdes_enable_ms(struct uart_port *port)
-{
-	/* N/A */
-}
-
-static irqreturn_t ubi32_serdes_isr(int irq, void *dev_id)
-{
-	struct uart_port *port = dev_id;
-	int busy;
-
-	spin_lock(&port->lock);
-
-	do {
-		int stat = IO_PORT_INT_STATUS(port);
-		busy  = ubi32_serdes_receive(port, stat);
-		busy |= ubi32_serdes_transmit(port, stat);
-	} while (busy);
-
-	tty_flip_buffer_push(port->info->port.tty);
-
-	spin_unlock(&port->lock);
-
-	return IRQ_HANDLED;
-}
-
-/*
- * Return TIOCSER_TEMT when transmitter is not busy.
- */
-static unsigned int ubi32_serdes_tx_empty(struct uart_port *port)
-{
-	unsigned long flags;
-	unsigned int ret;
-
-	spin_lock_irqsave(&port->lock, flags);
-	ret = IO_PORT_INT_STATUS(port);
-	spin_unlock_irqrestore(&port->lock, flags);
-
-	return ret & ULITE_STATUS_TXEMPTY ? TIOCSER_TEMT : 0;
-}
-
-static unsigned int ubi32_serdes_get_mctrl(struct uart_port *port)
-{
-	return TIOCM_CTS | TIOCM_DSR | TIOCM_CAR;
-}
-
-static void ubi32_serdes_set_mctrl(struct uart_port *port, unsigned int mctrl)
-{
-	/* N/A */
-}
-
-/*
- * Interrupts are always disabled.
- */
-static void ubi32_serdes_break_ctl(struct uart_port *port, int break_state)
-{
-	/* N/A */
-}
-
-static int ubi32_serdes_startup(struct uart_port *port)
-{
-	if (request_irq(port->irq, ubi32_serdes_isr, IRQF_DISABLED,
-	     "UBI32_SERDES", port)) {
-		printk(KERN_NOTICE "Unable to attach port interrupt\n");
-		return -EBUSY;
-	}
-
-	IO_PORT_INT_CLR(port) = IO_PORTX_INT_SERDES_RXBF;
-	IO_PORT_INT_MASK(port) = IO_PORTX_INT_SERDES_RXBF;
-	return 0;
-}
-
-static void ubi32_serdes_shutdown(struct uart_port *port)
-{
-	struct ubi32_serdes_port *uart = (struct ubi32_serdes_port *)port;
-
-	IO_PORT_INT_MASK(port) = 0;
-	free_irq(port->irq, uart);
-}
-
-static void
-ubi32_serdes_set_termios(struct uart_port *port, struct ktermios *termios,
-		   struct ktermios *old)
-{
-	unsigned long flags;
-	unsigned int baud;
-
-	spin_lock_irqsave(&port->lock, flags);
-
-	port->read_status_mask = ULITE_STATUS_RXVALID | ULITE_STATUS_OVERRUN
-		| ULITE_STATUS_TXFULL;
-
-	if (termios->c_iflag & INPCK)
-		port->read_status_mask |=
-			ULITE_STATUS_PARITY | ULITE_STATUS_FRAME;
-
-	port->ignore_status_mask = 0;
-	if (termios->c_iflag & IGNPAR)
-		port->ignore_status_mask |= ULITE_STATUS_PARITY
-			| ULITE_STATUS_FRAME | ULITE_STATUS_OVERRUN;
-
-	/* ignore all characters if CREAD is not set */
-	if ((termios->c_cflag & CREAD) == 0)
-		port->ignore_status_mask |=
-			ULITE_STATUS_RXVALID | ULITE_STATUS_PARITY
-			| ULITE_STATUS_FRAME | ULITE_STATUS_OVERRUN;
-
-	/* update timeout */
-	baud = uart_get_baud_rate(port, termios, old, 0, 460800);
-	uart_update_timeout(port, termios->c_cflag, baud);
-
-	IO_PORT(port)->ctl0 = SERIAL_UBICOM_CTL0 |
-			((port->uartclk / (16 * baud)) - 1);
-
-	spin_unlock_irqrestore(&port->lock, flags);
-}
-
-static const char *ubi32_serdes_type(struct uart_port *port)
-{
-	return port->type == PORT_UBI32_SERDES ? "UBI32_SERDES" : NULL;
-}
-
-/*
- * Release the memory region(s) being used by 'port'.
- */
-static void ubi32_serdes_release_port(struct uart_port *port)
-{
-}
-
-/*
- * Request the memory region(s) being used by 'port'.
- */
-static int ubi32_serdes_request_port(struct uart_port *port)
-{
-	return 0;
-}
-
-/*
- * Configure/autoconfigure the port.
- */
-static void ubi32_serdes_config_port(struct uart_port *port, int flags)
-{
-	if (flags & UART_CONFIG_TYPE &&
-	    ubi32_serdes_request_port(port) == 0)
-		port->type = PORT_UBI32_SERDES;
-}
-
-/*
- * Verify the new serial_struct (for TIOCSSERIAL).
- * The only change we allow are to the flags and type, and
- * even then only between PORT_UBI32_SERDES and PORT_UNKNOWN
- */
-static int
-ubi32_serdes_verify_port(struct uart_port *port, struct serial_struct *ser)
-{
-	return 0;
-}
-
-static struct uart_ops ubi32_serdes_pops = {
-	.tx_empty	= ubi32_serdes_tx_empty,
-	.set_mctrl	= ubi32_serdes_set_mctrl,
-	.get_mctrl	= ubi32_serdes_get_mctrl,
-	.stop_tx	= ubi32_serdes_stop_tx,
-	.start_tx	= ubi32_serdes_start_tx,
-	.stop_rx	= ubi32_serdes_stop_rx,
-	.enable_ms	= ubi32_serdes_enable_ms,
-	.break_ctl	= ubi32_serdes_break_ctl,
-	.startup	= ubi32_serdes_startup,
-	.shutdown	= ubi32_serdes_shutdown,
-	.set_termios	= ubi32_serdes_set_termios,
-	.type		= ubi32_serdes_type,
-	.release_port	= ubi32_serdes_release_port,
-	.request_port	= ubi32_serdes_request_port,
-	.config_port	= ubi32_serdes_config_port,
-	.verify_port	= ubi32_serdes_verify_port,
-};
-
-static void __init ubi32_serdes_init_ports(void)
-{
-	int i;
-
-	for (i = 0; i < NR_PORTS; i++) {
-		ubi32_serdes_ports[i].uartclk   = ubi32_serdes_resource[i].uart_clock;
-		ubi32_serdes_ports[i].ops       = &ubi32_serdes_pops;
-		ubi32_serdes_ports[i].line      = i;
-		ubi32_serdes_ports[i].iotype    = UPIO_MEM;
-		ubi32_serdes_ports[i].membase   =
-			(void __iomem *)ubi32_serdes_resource[i].uart_base_addr;
-		ubi32_serdes_ports[i].mapbase   =
-			(resource_size_t)ubi32_serdes_resource[i].uart_base_addr;
-		ubi32_serdes_ports[i].irq       =
-			ubi32_serdes_resource[i].uart_irq;
-		ubi32_serdes_ports[i].flags     = UPF_BOOT_AUTOCONF;
-
-		ubi32_serdes_hw_init(&ubi32_serdes_ports[i], 0);
-	}
-
-}
-
-#ifdef CONFIG_SERIAL_UBI32_SERDES_CONSOLE
-/*
- * If the port was already initialised (eg, by a boot loader),
- * try to determine the current setup.
- */
-static void __init
-ubi32_serdes_console_get_options(struct uart_port *port, int *baud)
-{
-	u32 round_to = 1200;
-	u32 real_baud;
-
-	/*
-	 * We might get called before platform init and with no
-	 * kernel command line options, so port might be NULL.
-	 */
-	*baud = ubi32_serdes_default_baud_rate;;
-	if ( IO_PORT(port) == 0 )
-		return;
-
-	real_baud = port->uartclk
-		/ (16 * ((IO_PORT(port)->ctl0 & ~SERIAL_UBICOM_CTL0) + 1));
-
-	*baud = ((real_baud + round_to - 1) / round_to) * round_to;
-
-	pr_debug("%s:baud = %d, real_baud = %d\n", __FUNCTION__, *baud, real_baud);
-}
-#endif
-
-#if defined(CONFIG_SERIAL_UBI32_SERDES_CONSOLE) || defined(CONFIG_EARLY_PRINTK)
-static struct uart_driver ubi32_serdes_reg;
-
-static int __init
-ubi32_serdes_console_setup(struct console *co, char *options)
-{
-	struct uart_port *port;
-#ifdef CONFIG_SERIAL_UBI32_SERDES_CONSOLE
-	int baud = ubi32_serdes_default_baud_rate;
-	int bits = 8;
-	int parity = 'n';
-	int flow = 'n';
-#endif
-
-	/*
-	 * Check whether an invalid uart number has been specified, and
-	 * if so, search for the first available port that does have
-	 * console support.
-	 */
-	if (co->index == -1 || co->index >= NR_PORTS)
-		co->index = 0;
-	port = &ubi32_serdes_ports[co->index];
-
-#ifdef CONFIG_SERIAL_UBI32_SERDES_CONSOLE
-	if (options) {
-		uart_parse_options(options, &baud, &parity, &bits, &flow);
-		ubi32_serdes_hw_init(port, baud);
-	}
-	else
-		ubi32_serdes_console_get_options(port, &baud);
-
-	return uart_set_options(port, co, baud, parity, bits, flow);
-#else
-	return 0;
-#endif
-}
-#endif /* defined (CONFIG_SERIAL_UBI32_SERDES_CONSOLE) ||
-				 defined (CONFIG_EARLY_PRINTK) */
-
-#ifdef CONFIG_SERIAL_UBI32_SERDES_CONSOLE
-static void
-ubi32_serdes_console_putchar(struct uart_port *port, int ch)
-{
-	if ( IO_PORT(port) ) {
-		while (!(IO_PORT_INT_STATUS(port) & IO_PORTX_INT_SERDES_TXBE))
-			barrier();
-		ubi32_serdes_put_char(IO_PORT(port), ch);
-	}
-}
-
-/*
- * Interrupts are disabled on entering
- */
-static void
-ubi32_serdes_console_write(struct console *co, const char *s, unsigned int count)
-{
-	struct uart_port *port = &ubi32_serdes_ports[co->index];
-	unsigned long flags = 0;
-
-	spin_lock_irqsave(&port->lock, flags);
-	uart_console_write(port, s, count, ubi32_serdes_console_putchar);
-	spin_unlock_irqrestore(&port->lock, flags);
-
-}
-
-static struct console ubi32_serdes_console = {
-	.name		= UBI32_SERDES_NAME,
-	.write		= ubi32_serdes_console_write,
-	.device		= uart_console_device,
-	.setup		= ubi32_serdes_console_setup,
-	.flags		= CON_PRINTBUFFER,
-	.index		= -1,
-	.data		= &ubi32_serdes_reg,
-};
-
-static int __init ubi32_serdes_console_init(void)
-{
-	ubi32_serdes_init_ports();
-	register_console(&ubi32_serdes_console);
-	return 0;
-}
-console_initcall(ubi32_serdes_console_init);
-
-#define UBI32_SERDES_CONSOLE	&ubi32_serdes_console
-#else
-#define UBI32_SERDES_CONSOLE	NULL
-#endif /* CONFIG_SERIAL_UBI32_SERDES_CONSOLE */
-
-
-#ifdef CONFIG_EARLY_PRINTK
-static __init void ubi32_serdes_early_putc(struct uart_port *port, int ch)
-{
-	unsigned timeout = 0xffff;
-
-	while ((!(IO_PORT_INT_STATUS(port) & IO_PORTX_INT_SERDES_TXBE)) && --timeout)
-		cpu_relax();
-	ubi32_serdes_put_char(IO_PORT(port), ch);
-}
-
-static __init void ubi32_serdes_early_write(struct console *con, const char *s,
-					unsigned int n)
-{
-	struct uart_port *port = &ubi32_serdes_ports[con->index];
-	unsigned int i;
-
-	for (i = 0; i < n; i++, s++) {
-		if (*s == '\n')
-			ubi32_serdes_early_putc(port, '\r');
-		ubi32_serdes_early_putc(port, *s);
-	}
-}
-
-static struct __init console ubi32_serdes_early_console = {
-	.name = "early_US",
-	.write = ubi32_serdes_early_write,
-	.device = uart_console_device,
-	.flags = CON_PRINTBUFFER,
-	.setup = ubi32_serdes_console_setup,
-	.index = -1,
-	.data  = &ubi32_serdes_reg,
-};
-
-/*
- * XXX Unused in our driver. Need to find out what the termios initialization is good/needed for.
- */
-struct console __init *ubi32_serdes_early_init(unsigned int port_index,
-						unsigned int cflag)
-{
-	struct uart_port *uart;
-	struct ktermios t;
-
-	if (port_index == -1 || port_index >= NR_PORTS)
-		port_index = 0;
-	ubi32_serdes_init_ports();
-	ubi32_serdes_early_console.index = port_index;
-	uart = &ubi32_serdes_ports[port_index];
-	t.c_cflag = cflag;
-	t.c_iflag = 0;
-	t.c_oflag = 0;
-	t.c_lflag = ICANON;
-	t.c_line = port_index;
-	ubi32_serdes_set_termios(uart, &t, &t);
-	return &ubi32_serdes_early_console;
-}
-
-#endif /* CONFIG_SERIAL_UBI32_SERDES_CONSOLE */
-
-static struct uart_driver ubi32_serdes_reg = {
-	.owner			= THIS_MODULE,
-	.driver_name		= "ubi32_serdes",
-	.dev_name		= UBI32_SERDES_NAME,
-	.major			= UBI32_SERDES_MAJOR,
-	.minor			= UBI32_SERDES_MINOR,
-	.nr			= NR_PORTS,
-	.cons			= UBI32_SERDES_CONSOLE,
-};
-
-static int ubi32_serdes_suspend(struct platform_device *dev, pm_message_t state)
-{
-	struct uart_port *port = platform_get_drvdata(dev);
-
-	if (port)
-		uart_suspend_port(&ubi32_serdes_reg, port);
-
-	return 0;
-}
-
-static int ubi32_serdes_resume(struct platform_device *dev)
-{
-	struct uart_port *port = platform_get_drvdata(dev);
-
-	if (port)
-		uart_resume_port(&ubi32_serdes_reg, port);
-
-	return 0;
-}
-
-static int ubi32_serdes_probe(struct platform_device *dev)
-{
-	struct resource *res = dev->resource;
-	int i;
-
-	for (i = 0; i < dev->num_resources; i++, res++) {
-		if (res->flags & IORESOURCE_MEM) {
-			ubi32_serdes_resource[0].uart_base_addr = (void *) res->start;
-		}
-		else if (res->flags & IORESOURCE_IRQ) {
-			ubi32_serdes_resource[0].uart_irq = res->start;
-		}
-		else if (res->flags & UBICOM32_SUART_IORESOURCE_CLOCK) {
-			ubi32_serdes_resource[0].uart_clock = res->start;
-		}
-	}
-
-	ubi32_serdes_init_ports();
-
-	return 0;
-}
-
-static int ubi32_serdes_remove(struct platform_device *pdev)
-{
-	struct uart_port *port = platform_get_drvdata(pdev);
-
-	platform_set_drvdata(pdev, NULL);
-
-	if (port)
-		uart_remove_one_port(&ubi32_serdes_reg, port);
-
-	return 0;
-}
-
-static struct platform_driver ubi32_serdes_driver = {
-	.remove		= ubi32_serdes_remove,
-	.suspend	= ubi32_serdes_suspend,
-	.resume		= ubi32_serdes_resume,
-	.driver		= {
-		.name	= "ubicom32suart",
-		.owner	= THIS_MODULE,
-	},
-};
-
-
-#ifndef MODULE
-/*
- * Called at boot time.
- *
- * You can specify IO base, IRQ, and clock for the serdes serial port
- * using kernel command line "serdes=0xiobase,irq,clock".  Values
- * specified will be overwritten by platform device data, if present.
- */
-static int __init ubi32_serdes_setup(char *str)
-{
-#define N_PARMS   (4+1)
-	int ints[N_PARMS];
-	int i;
-
-	str = get_options(str, ARRAY_SIZE(ints), ints);
-
-	for (i = 0; i < N_PARMS; i++) {
-		if (i < ints[0]) {
-			if (i == 0) {
-				ubi32_serdes_resource[0].uart_base_addr = (void *) ints[i+1];
-			}
-			else if (i == 1) {
-				ubi32_serdes_resource[0].uart_irq = ints[i+1];
-			}
-			else if (i == 2) {
-				ubi32_serdes_resource[0].uart_clock = ints[i+1];
-			}
-			else if (i == 3) {
-				ubi32_serdes_default_baud_rate = ints[i+1];
-			}
-		}
-	}
-	return 1;
-}
-
-__setup("serdes=", ubi32_serdes_setup);
-#endif
-
-static int __init ubi32_serdes_init(void)
-{
-	int ret;
-
-	pr_info("Serial: Ubicom32 serdes uart serial driver\n");
-
-	ret = platform_driver_probe(&ubi32_serdes_driver, ubi32_serdes_probe);
-	if (ret != 0) {
-		printk(KERN_INFO "serdes platform_driver_probe() failed: %d\n", ret);
-		return ret;
-	}
-
-	ubi32_serdes_init_ports();
-
-	ret = uart_register_driver(&ubi32_serdes_reg);
-	if ( ret == 0 ) {
-		ret = uart_add_one_port(&ubi32_serdes_reg, &ubi32_serdes_ports[0]);
-		if ( ret != 0 ) {
-			uart_unregister_driver(&ubi32_serdes_reg);
-		}
-	}
-
-	return ret;
-}
-
-static void __exit ubi32_serdes_exit(void)
-{
-	platform_driver_unregister(&ubi32_serdes_driver);
-	uart_unregister_driver(&ubi32_serdes_reg);
-}
-
-module_init(ubi32_serdes_init);
-module_exit(ubi32_serdes_exit);
-
-MODULE_AUTHOR("Rainer Keller <rkeller@ubicom.com>");
-MODULE_DESCRIPTION("Ubicom generic serial port driver");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS_CHARDEV_MAJOR(UBI32_SERDES_MAJOR);
-MODULE_ALIAS("platform:ubi32_serdes");
diff --git a/target/linux/ubicom32/files/drivers/serial/ubi32_uarttio.c b/target/linux/ubicom32/files/drivers/serial/ubi32_uarttio.c
deleted file mode 100644
index 7aa374200..000000000
--- a/target/linux/ubicom32/files/drivers/serial/ubi32_uarttio.c
+++ /dev/null
@@ -1,1172 +0,0 @@
-/*
- * drivers/serial/ubi32_uarttio.c
- *   Ubicom32 Serial Virtual Peripherial Driver
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- */
-
-#include <linux/module.h>
-#include <linux/ioport.h>
-#include <linux/init.h>
-#include <linux/console.h>
-#include <linux/sysrq.h>
-#include <linux/platform_device.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <linux/serial_core.h>
-
-#include <asm/ip5000.h>
-#include <asm/gpio.h>
-#include <asm/thread.h>
-#include <asm/uart_tio.h>
-
-#define DRIVER_NAME	"ubi32_uarttio"
-
-/*
- * For storing the module parameters.
- */
-#define UBI32_UARTTIO_MAX_PARAM_LEN	80
-static char utio_ports_param[UBI32_UARTTIO_MAX_PARAM_LEN];
-
-/*
- * UART name and device definitions
- */
-#define UBI32_UARTTIO_NAME	"ttyUV" // XXX
-#define UBI32_UARTTIO_MAJOR	206 // XXX
-#define UBI32_UARTTIO_MINOR	64 // XXX
-
-/*
- * The following structures are allocated statically because the
- * memory allocation subsystem is not initialized this early on
- */
-
-/*
- * Per port structure
- */
-struct ubi32_uarttio_port {
-	struct uarttio_uart		*uart;
-	unsigned int			tx_pin;
-	unsigned int			rx_pin;
-
-	struct uart_port		port;
-
-	u8_t				added;
-
-	/*
-	 * If this value is set, the port has had its direction set already
-	 */
-	u8_t				port_init;
-};
-static struct ubi32_uarttio_port uarttio_ports[CONFIG_SERIAL_UBI32_UARTTIO_NR_UARTS];
-
-/*
- * Number of ports currently initialized
- */
-static int uarttio_nports;
-
-/*
- * Per device structure
- */
-struct ubi32_uarttio_instance {
-	struct uarttio_regs		*regs;
-	struct ubi32_uarttio_port	*ports;
-
-	u8_t				irq_requested;
-	u8_t				driver_registered;
-	u8_t				irq;
-};
-static struct ubi32_uarttio_instance uarttio_inst;
-
-#ifdef CONFIG_SERIAL_UBI32_UARTTIO_CONSOLE
-static struct console ubi32_uarttio_console;
-#define UBI32_UARTTIO_CONSOLE	&ubi32_uarttio_console
-#else
-#define UBI32_UARTTIO_CONSOLE	NULL
-#endif
-
-static struct uart_driver ubi32_uarttio_uart_driver = {
-	.owner			= THIS_MODULE,
-	.driver_name		= DRIVER_NAME,
-	.dev_name		= UBI32_UARTTIO_NAME,
-	.major			= UBI32_UARTTIO_MAJOR,
-	.minor			= UBI32_UARTTIO_MINOR,
-	.cons			= UBI32_UARTTIO_CONSOLE,
-};
-
-#ifdef UBI32_UARTTIO_UNUSED
-/*
- * ubi32_uarttio_get_send_space
- */
-static int ubi32_uarttio_get_send_space(struct uarttio_uart *uart)
-{
-	int count = uart->tx_fifo_head - uart->tx_fifo_tail;
-	if (count < 0) {
-		count += uart->tx_fifo_size;
-	}
-	return uart->tx_fifo_size - count;
-}
-#endif
-
-/*
- * ubi32_uarttio_get_recv_ready
- */
-static int ubi32_uarttio_get_recv_ready(struct uarttio_uart *uart)
-{
-	int count = uart->rx_fifo_head - uart->rx_fifo_tail;
-	if (count < 0) {
-		count += uart->rx_fifo_size;
-	}
-	return count;
-}
-
-/*
- * ubi32_uarttio_get_char()
- */
-static u8_t ubi32_uarttio_get_char(struct uarttio_uart *uart)
-{
-	/*
-	 * Retrieve byte
-	 */
-	u32_t tail = uart->rx_fifo_tail;
-	u8_t data = uart->rx_fifo[tail];
-
-	if (++tail == uart->rx_fifo_size) {
-		tail = 0;
-	}
-	uart->rx_fifo_tail = tail;
-
-	return data;
-}
-
-/*
- * ubi32_uarttio_put_char()
- */
-static int ubi32_uarttio_put_char(struct uarttio_uart *uart, u8_t c)
-{
-	u32_t head = uart->tx_fifo_head;
-	u32_t prev = head;
-
-	/*
-	 * Wrap
-	 */
-	if (++head == uart->tx_fifo_size) {
-		head = 0;
-	}
-
-	/*
-	 * If there isn't any space, return EBUSY
-	 */
-	if (head == uart->tx_fifo_tail) {
-		return -EBUSY;
-	}
-
-	/*
-	 * Put the character in the queue
-	 */
-	uart->tx_fifo[prev] = c;
-	uart->tx_fifo_head = head;
-
-	return 0;
-}
-
-/*
- * ubi32_uarttio_set_baud
- */
-static int ubi32_uarttio_set_baud(struct ubi32_uarttio_port *uup, unsigned int baud)
-{
-	if (uup->uart->current_baud_rate == baud) {
-		return 0;
-	}
-
-	uup->uart->baud_rate = baud;
-	uup->uart->flags |= UARTTIO_UART_FLAG_SET_RATE;
-	while (uup->uart->flags & UARTTIO_UART_FLAG_SET_RATE) {
-		cpu_relax();
-	}
-
-	if (uup->uart->current_baud_rate != baud) {
-		/*
-		 * Failed to set baud rate
-		 */
-		printk(KERN_WARNING "Invalid baud rate %u, running at %u\n", baud, uup->uart->current_baud_rate);
-		return -EINVAL;
-	}
-
-	return 0;
-}
-
-/*
- * ubi32_uarttio_handle_receive
- */
-static void ubi32_uarttio_handle_receive(struct ubi32_uarttio_port *uup, int stat)
-{
-	struct uarttio_uart *uart = uup->uart;
-	struct uart_port *port = &uup->port;
-	struct tty_struct *tty = port->info->port.tty;
-	unsigned char ch = 0;
-	char flag = TTY_NORMAL;
-	int count;
-
-	if ((stat & (UARTTIO_UART_INT_RX | UARTTIO_UART_INT_RXFRAME | UARTTIO_UART_INT_RXOVF)) == 0) {
-		return;
-	}
-
-	if (stat & UARTTIO_UART_INT_RX) {
-		count = ubi32_uarttio_get_recv_ready(uart);
-		port->icount.rx += count;
-	}
-
-	if (stat & UARTTIO_UART_INT_RXOVF) {
-		port->icount.overrun++;
-	}
-
-	if (stat & UARTTIO_UART_INT_RXFRAME) {
-		port->icount.frame++;
-	}
-
-	stat &= ~port->ignore_status_mask;
-
-	if (stat & UARTTIO_UART_INT_RX) {
-		int i;
-		for (i = 0; i < count; i++) {
-			ch = ubi32_uarttio_get_char(uart);
-			tty_insert_flip_char(tty, ch, flag);
-		}
-	}
-
-	if (stat & UARTTIO_UART_INT_RXFRAME) {
-		tty_insert_flip_char(tty, 0, TTY_FRAME);
-	}
-
-	if (stat & UARTTIO_UART_INT_RXOVF) {
-		tty_insert_flip_char(tty, 0, TTY_OVERRUN);
-	}
-}
-
-/*
- * ubi32_uarttio_stop_tx
- *	interrupts are disabled on entry
- */
-static void ubi32_uarttio_stop_tx(struct uart_port *port)
-{
-	struct ubi32_uarttio_port *uup = port->private_data;
-
-	uup->uart->int_mask &= ~UARTTIO_UART_INT_TXBE;
-}
-
-/*
- * ubi32_uarttio_handle_transmit
- */
-static void ubi32_uarttio_handle_transmit(struct ubi32_uarttio_port *uup, int stat)
-{
-	struct uarttio_uart *uart = uup->uart;
-	struct uart_port *port = &uup->port;
-	struct circ_buf *xmit  = &port->info->xmit;
-
-	if (!(stat & UARTTIO_UART_INT_TXBE)) {
-		return;
-	}
-
-	if (port->x_char) {
-		if (ubi32_uarttio_put_char(uart, port->x_char)) {
-			return;
-		}
-		port->x_char = 0;
-		port->icount.tx++;
-		return;
-	}
-
-	if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
-		ubi32_uarttio_stop_tx(port);
-		return;
-	}
-
-	/*
-	 * Send as many characters as we can
-	 */
-	while (ubi32_uarttio_put_char(uart, xmit->buf[xmit->tail]) == 0) {
-		xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
-		port->icount.tx++;
-		if (uart_circ_empty(xmit)) {
-			break;
-		}
-	}
-
-	/* wake up */
-	if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) {
-		uart_write_wakeup(port);
-	}
-
-	if (uart_circ_empty(xmit)) {
-		ubi32_uarttio_stop_tx(port);
-	}
-}
-
-/*
- * ubi32_uarttio_start_tx
- *	port is locked and interrupts are disabled
- */
-static void ubi32_uarttio_start_tx(struct uart_port *port)
-{
-	struct ubi32_uarttio_port *uup = port->private_data;
-	struct uarttio_uart *uart = uup->uart;
-
-	uart->int_mask |= UARTTIO_UART_INT_TXBE;
-}
-
-/*
- * ubi32_uarttio_stop_rx
- *	Interrupts are enabled
- */
-static void ubi32_uarttio_stop_rx(struct uart_port *port)
-{
-	struct ubi32_uarttio_port *uup = port->private_data;
-	struct uarttio_uart *uart = uup->uart;
-
-	/*
-	 * don't forward any more data (like !CREAD)
-	 */
-	uart->int_mask &= ~UARTTIO_UART_INT_RX;
-	port->ignore_status_mask = UARTTIO_UART_INT_RX;
-}
-
-/*
- * ubi32_uarttio_enable_ms
- *	Set the modem control timer to fire immediately.
- */
-static void ubi32_uarttio_enable_ms(struct uart_port *port)
-{
-	/* N/A */
-}
-
-/*
- * ubi32_uarttio_isr
- */
-static irqreturn_t ubi32_uarttio_isr(int irq, void *appdata)
-{
-	struct ubi32_uarttio_port *uup = uarttio_ports;
-	int i;
-
-	/*
-	 * Service all of the ports
-	 */
-	for (i = 0; i < uarttio_nports; i++) {
-		unsigned int flags;
-
-		if (!(uup->uart->flags & UARTTIO_UART_FLAG_ENABLED)) {
-			uup++;
-			continue;
-		}
-
-		spin_lock(&uup->port.lock);
-
-		flags = uup->uart->int_flags;
-
-		uup->uart->int_flags = 0;
-
-		ubi32_uarttio_handle_receive(uup, flags);
-		ubi32_uarttio_handle_transmit(uup, flags);
-
-		tty_flip_buffer_push(uup->port.info->port.tty);
-
-		spin_unlock(&uup->port.lock);
-
-		uup++;
-	}
-
-	return IRQ_HANDLED;
-}
-
-/*
- * ubi32_uarttio_tx_empty
- *	Return TIOCSER_TEMT when transmitter is not busy.
- */
-static unsigned int ubi32_uarttio_tx_empty(struct uart_port *port)
-{
-	struct ubi32_uarttio_port *uup = port->private_data;
-
-	if (uup->uart->tx_fifo_head == uup->uart->tx_fifo_tail) {
-		return TIOCSER_TEMT;
-	}
-
-	return 0;
-}
-
-/*
- * ubi32_uarttio_get_mctrl
- */
-static unsigned int ubi32_uarttio_get_mctrl(struct uart_port *port)
-{
-	return TIOCM_CTS | TIOCM_DSR | TIOCM_CAR;
-}
-
-/*
- * ubi32_uarttio_set_mctrl
- */
-static void ubi32_uarttio_set_mctrl(struct uart_port *port, unsigned int mctrl)
-{
-	/* N/A */
-}
-
-/*
- * ubi32_uarttio_break_ctl
- */
-static void ubi32_uarttio_break_ctl(struct uart_port *port, int break_state)
-{
-	/* N/A */
-}
-
-/*
- * ubi32_uarttio_startup
- */
-static int ubi32_uarttio_startup(struct uart_port *port)
-{
-	struct ubi32_uarttio_port *uup = port->private_data;
-	struct uarttio_uart *uart = uup->uart;
-
-	uart->flags |= UARTTIO_UART_FLAG_ENABLED;
-
-	uart->int_mask |= UARTTIO_UART_INT_TXBE | UARTTIO_UART_INT_RX;
-
-	return 0;
-}
-
-/*
- * ubi32_uarttio_shutdown
- */
-static void ubi32_uarttio_shutdown(struct uart_port *port)
-{
-	struct ubi32_uarttio_port *uup = port->private_data;
-	struct uarttio_uart *uart = uup->uart;
-
-	uart->int_mask = 0;
-	uart->flags &= ~UARTTIO_UART_FLAG_ENABLED;
-}
-
-/*
- * ubi32_uarttio_set_termios
- */
-static void ubi32_uarttio_set_termios(struct uart_port *port, struct ktermios *termios, struct ktermios *old)
-{
-	struct ubi32_uarttio_port *uup = port->private_data;
-	unsigned long flags;
-	unsigned int baud;
-
-	spin_lock_irqsave(&port->lock, flags);
-
-#if 0
-	port->read_status_mask = UBI32_UARTTIO_RX | UBI32_UARTTIO_RXOVF | UBI32_UARTTIO_TXOVF;
-
-	if (termios->c_iflag & INPCK) {
-		port->read_status_mask |= UBI32_UARTTIO_RXFRAME;
-	}
-#endif
-
-	port->ignore_status_mask = 0;
-	if (termios->c_iflag & IGNPAR) {
-		port->ignore_status_mask |= UARTTIO_UART_INT_RXFRAME |
-					    UARTTIO_UART_INT_RXOVF;
-	}
-
-	/*
-	 * ignore all characters if CREAD is not set
-	 */
-	if ((termios->c_cflag & CREAD) == 0) {
-		port->ignore_status_mask |= UARTTIO_UART_INT_RX |
-					    UARTTIO_UART_INT_RXFRAME |
-					    UARTTIO_UART_INT_RXOVF;
-	}
-
-	/* update timeout */
-	baud = uart_get_baud_rate(port, termios, old, 0, 460800);
-	uart_update_timeout(port, termios->c_cflag, baud);
-
-	ubi32_uarttio_set_baud(uup, baud);
-	spin_unlock_irqrestore(&port->lock, flags);
-}
-
-/*
- * ubi32_uarttio_type
- */
-static const char *ubi32_uarttio_type(struct uart_port *port)
-{
-	return (port->type == PORT_UBI32_UARTTIO) ? "UBI32_UARTTIO" : NULL;
-}
-
-/*
- * ubi32_uarttio_release_port
- *	Release the memory region(s) being used by 'port'.
- */
-static void ubi32_uarttio_release_port(struct uart_port *port)
-{
-}
-
-/*
- * ubi32_uarttio_request_port
- *	Request the memory region(s) being used by 'port'.
- */
-static int ubi32_uarttio_request_port(struct uart_port *port)
-{
-	return 0;
-}
-
-/*
- * ubi32_uarttio_config_port
- *	Configure/autoconfigure the port.
- */
-static void ubi32_uarttio_config_port(struct uart_port *port, int flags)
-{
-	if ((flags & UART_CONFIG_TYPE) && (ubi32_uarttio_request_port(port) == 0)) {
-		port->type = PORT_UBI32_UARTTIO;
-	}
-}
-
-/*
- * ubi32_uarttio_verify_port
- *	Verify the new serial_struct (for TIOCSSERIAL).
- *
- * The only change we allow are to the flags and type, and
- * even then only between PORT_UBI32_UARTTIO and PORT_UNKNOWN
- */
-static int ubi32_uarttio_verify_port(struct uart_port *port, struct serial_struct *ser)
-{
-	return 0;
-}
-
-static struct uart_ops ubi32_uarttio_pops = {
-	.tx_empty	= ubi32_uarttio_tx_empty,
-	.set_mctrl	= ubi32_uarttio_set_mctrl,
-	.get_mctrl	= ubi32_uarttio_get_mctrl,
-	.stop_tx	= ubi32_uarttio_stop_tx,
-	.start_tx	= ubi32_uarttio_start_tx,
-	.stop_rx	= ubi32_uarttio_stop_rx,
-	.enable_ms	= ubi32_uarttio_enable_ms,
-	.break_ctl	= ubi32_uarttio_break_ctl,
-	.startup	= ubi32_uarttio_startup,
-	.shutdown	= ubi32_uarttio_shutdown,
-	.set_termios	= ubi32_uarttio_set_termios,
-	.type		= ubi32_uarttio_type,
-	.release_port	= ubi32_uarttio_release_port,
-	.request_port	= ubi32_uarttio_request_port,
-	.config_port	= ubi32_uarttio_config_port,
-	.verify_port	= ubi32_uarttio_verify_port,
-};
-
-/*
- * ubi32_uarttio_add_ports
- */
-static int __init ubi32_uarttio_add_ports(void)
-{
-	int res = 0;
-	struct ubi32_uarttio_port *uup = uarttio_ports;
-	int i = 0;
-
-	for (i = 0; i < uarttio_nports; i++) {
-		/*
-		 * Setup the GPIOs
-		 */
-		res = gpio_request(uup->tx_pin, "ubi32_uarttio_tx");
-		if (res) {
-			printk(KERN_WARNING "Failed to request GPIO %d\n", uup->tx_pin);
-			res = -EBUSY;
-			goto next;
-		}
-
-		res = gpio_request(uup->rx_pin, "ubi32_uarttio_rx");
-		if (res) {
-			gpio_free(uup->tx_pin);
-			printk(KERN_WARNING "Failed to request GPIO %d\n", uup->rx_pin);
-			res = -EBUSY;
-			goto next;
-		}
-
-		res = uart_add_one_port(&ubi32_uarttio_uart_driver, &uup->port);
-		if (res) {
-			gpio_free(uup->rx_pin);
-			gpio_free(uup->tx_pin);
-			res = -ENODEV;
-			printk(KERN_WARNING "Failed to add port %d,%d\n", uup->tx_pin, uup->rx_pin);
-			goto next;
-		}
-		uup->added = 1;
-
-		/*
-		 * Set the direction of the ports now, after we're sure that everything is ok
-		 */
-		if (!uup->port_init) {
-			gpio_direction_output(uup->tx_pin, 1);
-			gpio_direction_input(uup->rx_pin);
-		}
-
-next:
-		uup++;
-	}
-	return res;
-}
-
-/*
- * ubi32_uarttio_cleanup
- */
-static void ubi32_uarttio_cleanup(void)
-{
-	struct ubi32_uarttio_port *uup;
-	int i;
-
-	/*
-	 * Stop the hardware thread
-	 */
-	if (uarttio_inst.regs) {
-		thread_disable(uarttio_inst.regs->thread);
-	}
-	if (uarttio_inst.irq_requested) {
-		free_irq(uarttio_inst.irq, NULL);
-	}
-
-	/*
-	 * Get rid of the ports
-	 */
-	uup = uarttio_inst.ports;
-	for (i = 0; i < uarttio_nports; i++) {
-		gpio_free(uup->tx_pin);
-		gpio_free(uup->rx_pin);
-		if (uup->added) {
-			uart_remove_one_port(&ubi32_uarttio_uart_driver, &uup->port);
-		}
-		uup++;
-	}
-
-	if (uarttio_inst.driver_registered) {
-		uart_unregister_driver(&ubi32_uarttio_uart_driver);
-	}
-}
-
-/*
- * ubi32_uarttio_setup_port
- *	Setup a port in the TIO registers
- */
-static int ubi32_uarttio_setup_port(int index,
-				    struct uarttio_uart *uart,
-				    unsigned int baud, unsigned int tx_pin,
-				    unsigned int rx_pin)
-{
-	struct ubi32_uarttio_port *uup = &uarttio_ports[index];
-	void *tx_port = ubi_gpio_get_port(tx_pin);
-	void *rx_port = ubi_gpio_get_port(rx_pin);
-
-	/*
-	 * Verify the ports are on chip
-	 */
-	if (!tx_port || !rx_port) {
-		printk(KERN_WARNING "Invalid port(s) specified: %u or %u\n", tx_pin, rx_pin);
-		return -EINVAL;
-	}
-
-	uup->tx_pin = tx_pin;
-	uup->rx_pin = rx_pin;
-	uup->uart = uart;
-
-	/*
-	 * Setup the port structure
-	 */
-	uup->port.ops		= &ubi32_uarttio_pops;
-	uup->port.line		= index;
-	uup->port.iotype	= UPIO_MEM;
-	uup->port.flags		= UPF_BOOT_AUTOCONF;
-	uup->port.fifosize	= uup->uart->tx_fifo_size;
-	uup->port.private_data	= uup;
-
-	/*
-	 * We share this IRQ across all ports
-	 */
-	uup->port.irq		= uarttio_inst.irq;
-
-	/*
-	 * We really don't have a mem/map base but without these variables
-	 * set, the serial_core won't startup.
-	 */
-	uup->port.membase	= (void __iomem *)uup;
-	uup->port.mapbase	= (resource_size_t)uup;
-	spin_lock_init(&uup->port.lock);
-
-	/*
-	 * Set up the hardware
-	 */
-	uart->flags = UARTTIO_UART_FLAG_SET_RATE | UARTTIO_UART_FLAG_RESET;
-
-	uart->tx_port = (unsigned int)tx_port;
-	uart->tx_pin = gpio_pin_index(tx_pin);
-	uart->tx_bits = 8;
-	uart->tx_stop_bits = 1;
-
-	uart->rx_port = (unsigned int)rx_port;
-	uart->rx_pin = gpio_pin_index(rx_pin);
-	uart->rx_bits = 8;
-	uart->rx_stop_bits = 1;
-
-	uart->baud_rate = baud;
-
-	return 0;
-}
-
-enum ubi32_uarttio_parse_states {
-	UBI32_UARTTIO_PARSE_STATE_BAUD,
-	UBI32_UARTTIO_PARSE_STATE_TX_PIN,
-	UBI32_UARTTIO_PARSE_STATE_RX_PIN,
-	UBI32_UARTTIO_PARSE_STATE_HS,
-	UBI32_UARTTIO_PARSE_STATE_CTS_PIN,
-	UBI32_UARTTIO_PARSE_STATE_RTS_PIN,
-};
-
-/*
- * ubi32_uarttio_parse_param
- */
-static int ubi32_uarttio_parse_param(char *str)
-{
-	int res;
-	int i;
-	int baud = 0;
-	int tx_pin = 0;
-	int rx_pin = 0;
-	int hs = 0;
-	int cts_pin = 0;
-	int rts_pin = 0;
-	int nfound = 0;
-	enum ubi32_uarttio_parse_states state = UBI32_UARTTIO_PARSE_STATE_BAUD;
-	struct uarttio_uart *uart = uarttio_inst.regs->uarts;
-
-	/*
-	 * Run though the options and generate the proper structures
-	 */
-	res = get_option(&str, &i);
-	while ((res == 2) || (res == 1)) {
-		switch (state) {
-		case UBI32_UARTTIO_PARSE_STATE_BAUD:
-			/*
-			 * If we are here and nfound > 0 then create the port
-			 * based on the previous input
-			 */
-			if (nfound) {
-				/*
-				 * Create the port
-				 */
-				if (ubi32_uarttio_setup_port(nfound - 1, uart, baud, tx_pin, rx_pin)) {
-					/*
-					 * Port was invalid
-					 */
-					goto fail;
-				} else {
-					printk(KERN_INFO "Serial port %d: tx=%d:rx=%d @ %d\n", nfound, tx_pin, rx_pin, baud);
-					uart++;
-				}
-			}
-
-			/*
-			 * Reset the variables and go to the next state
-			 */
-			hs = 0;
-			baud = i;
-			state = UBI32_UARTTIO_PARSE_STATE_TX_PIN;
-			break;
-
-		case UBI32_UARTTIO_PARSE_STATE_TX_PIN:
-			tx_pin = i;
-			state = UBI32_UARTTIO_PARSE_STATE_RX_PIN;
-			break;
-
-		case UBI32_UARTTIO_PARSE_STATE_RX_PIN:
-			rx_pin = i;
-			state = UBI32_UARTTIO_PARSE_STATE_HS;
-			break;
-
-		case UBI32_UARTTIO_PARSE_STATE_HS:
-			hs = i;
-			if (hs) {
-				state = UBI32_UARTTIO_PARSE_STATE_CTS_PIN;
-				break;
-			}
-
-			if (nfound == uarttio_inst.regs->max_uarts) {
-				printk(KERN_WARNING "Maximum number of serial ports reached\n");
-				goto done;
-			}
-			nfound++;
-			state = UBI32_UARTTIO_PARSE_STATE_BAUD;
-			break;
-
-		case UBI32_UARTTIO_PARSE_STATE_CTS_PIN:
-			cts_pin = i;
-			state = UBI32_UARTTIO_PARSE_STATE_RTS_PIN;
-			break;
-
-		case UBI32_UARTTIO_PARSE_STATE_RTS_PIN:
-			rts_pin = i;
-
-			if (nfound == uarttio_inst.regs->max_uarts) {
-				printk(KERN_WARNING "Maximum number of serial ports reached\n");
-				goto done;
-			}
-			nfound++;
-			state = UBI32_UARTTIO_PARSE_STATE_BAUD;
-			break;
-		}
-		res = get_option(&str, &i);
-	}
-
-	if ((res > 2) || state != UBI32_UARTTIO_PARSE_STATE_BAUD) {
-		printk(KERN_WARNING "Parameter syntax error.\n");
-		res = -EINVAL;
-		goto fail;
-	}
-
-	/*
-	 * Create the final port
-	 */
-	if (ubi32_uarttio_setup_port(nfound - 1, uart, baud, tx_pin, rx_pin)) {
-		goto fail;
-	}
-	printk(KERN_INFO "Serial port %d: tx=%d:rx=%d @ %d\n", nfound, tx_pin, rx_pin, baud);
-
-done:
-	uarttio_nports = nfound;
-
-	return nfound ? 0 : -ENODEV;
-
-fail:
-	/*
-	 * Reset the ports
-	 */
-	uart = uarttio_inst.regs->uarts;
-	for (i = 0; i < uarttio_inst.regs->max_uarts; i++) {
-		uart->flags = 0;
-		uart++;
-	}
-
-	return res;
-}
-
-/*
- * ubi32_uarttio_probe
- */
-static int ubi32_uarttio_probe(void)
-{
-	int ret;
-	struct uarttio_node *uart_node;
-	char *str = utio_ports_param;
-	static int probed;
-	static int probe_result;
-
-	/*
-	 * We only want to be probed once, we could be probed twice
-	 * for example if we are used as a console
-	 */
-	if (probed) {
-		return probe_result;
-	}
-	probed = 1;
-
-	/*
-	 * Extract the TIO name from the setup string
-	 */
-	while (*str) {
-		if (*str == ',') {
-			*str++ = 0;
-			break;
-		}
-		str++;
-	}
-
-	if (!*str) {
-		probe_result = -EINVAL;
-		return -EINVAL;
-	}
-
-	uart_node = (struct uarttio_node *)devtree_find_node(utio_ports_param);
-	if (!uart_node) {
-		probe_result = -ENODEV;
-		return -ENODEV;
-	}
-
-	uarttio_inst.irq = uart_node->dn.recvirq;
-	uarttio_inst.regs = uart_node->regs;
-
-	/*
-	 * Parse module parameters.
-	 */
-	ret = ubi32_uarttio_parse_param(str);
-	if (ret != 0) {
-		ubi32_uarttio_cleanup();
-		probe_result = ret;
-		return ret;
-	}
-
-	ubi32_uarttio_uart_driver.nr = uarttio_nports;
-
-	return 0;
-}
-
-#if defined(CONFIG_SERIAL_UBI32_UARTTIO_CONSOLE)
-/*
- * ubi32_uarttio_console_setup
- */
-static int __init ubi32_uarttio_console_setup(struct console *co, char *options)
-{
-	int baud;
-	int bits = 8;
-	int parity = 'n';
-	int flow = 'n';
-	struct ubi32_uarttio_port *uup;
-
-	/*
-	 * Check whether an invalid uart number has been specified, and
-	 * if so, search for the first available port that does have
-	 * console support.
-	 */
-	if (co->index == -1 || co->index >= uarttio_nports) {
-		co->index = 0;
-	}
-	uup = &uarttio_ports[co->index];
-	baud = uup->uart->baud_rate;
-	uup->uart->flags |= UARTTIO_UART_FLAG_ENABLED;
-
-	/*
-	 * Setup the GPIOs
-	 *	We have to use the direct interface because the gpio
-	 *	subsystem is not available at this point.
-	 */
-	uup->port_init = 1;
-	UBICOM32_GPIO_SET_PIN_HIGH(uup->tx_pin);
-	UBICOM32_GPIO_SET_PIN_OUTPUT(uup->tx_pin);
-	UBICOM32_GPIO_SET_PIN_INPUT(uup->rx_pin);
-
-	/*
-	 * Start the thread
-	 */
-	thread_enable(uarttio_inst.regs->thread);
-
-	/*
-	 * Process options
-	 */
-	if (options) {
-		uart_parse_options(options, &baud, &parity, &bits, &flow);
-		if (ubi32_uarttio_set_baud(uup, baud)) {
-			baud = uup->uart->current_baud_rate;
-		}
-	}
-
-	return uart_set_options(&uup->port, co, baud, 'n', 8, 'n');
-}
-
-/*
- * ubi32_uarttio_console_putchar
- */
-static void ubi32_uarttio_console_putchar(struct uart_port *port, int ch)
-{
-	struct ubi32_uarttio_port *uup = port->private_data;
-
-	while (ubi32_uarttio_put_char(uup->uart, ch)) {
-		cpu_relax();
-	}
-}
-
-/*
- * ubi32_uarttio_console_write
- *	Interrupts are disabled on entering
- */
-static void ubi32_uarttio_console_write(struct console *co, const char *s, unsigned int count)
-{
-	struct uart_port *port = &(uarttio_ports[co->index].port);
-	unsigned long flags = 0;
-
-	spin_lock_irqsave(&port->lock, flags);
-	uart_console_write(port, s, count, ubi32_uarttio_console_putchar);
-	spin_unlock_irqrestore(&port->lock, flags);
-}
-
-static struct console ubi32_uarttio_console = {
-	.name		= UBI32_UARTTIO_NAME,
-	.write		= ubi32_uarttio_console_write,
-	.device		= uart_console_device,
-	.setup		= ubi32_uarttio_console_setup,
-	.flags		= CON_PRINTBUFFER,
-	.index		= -1,
-	.data		= &ubi32_uarttio_uart_driver,
-};
-
-static int __init ubi32_uarttio_console_init(void)
-{
-	int res;
-
-	res = ubi32_uarttio_probe();
-	if (res) {
-		return res;
-	}
-
-	register_console(&ubi32_uarttio_console);
-	return 0;
-}
-console_initcall(ubi32_uarttio_console_init);
-#endif /* CONFIG_SERIAL_UBI32_UARTTIO_CONSOLE */
-
-/*
- * ubi32_serial_suspend
- */
-static int ubi32_uarttio_suspend(struct platform_device *pdev, pm_message_t state)
-{
-	int i;
-	for (i = 0; i < uarttio_nports; i++) {
-		uart_suspend_port(&ubi32_uarttio_uart_driver, &uarttio_ports[i].port);
-	}
-
-	return 0;
-}
-
-/*
- * ubi32_serial_resume
- */
-static int ubi32_uarttio_resume(struct platform_device *pdev)
-{
-	int i;
-	for (i = 0; i < uarttio_nports; i++) {
-		uart_resume_port(&ubi32_uarttio_uart_driver, &uarttio_ports[i].port);
-	}
-
-	return 0;
-}
-
-/*
- * ubi32_uarttio_remove
- */
-static int __devexit ubi32_uarttio_remove(struct platform_device *pdev)
-{
-	ubi32_uarttio_cleanup();
-
-	uart_unregister_driver(&ubi32_uarttio_uart_driver);
-
-	return 0;
-}
-
-static struct platform_driver ubi32_uarttio_platform_driver = {
-	.remove		= __devexit_p(ubi32_uarttio_remove),
-	.suspend	= ubi32_uarttio_suspend,
-	.resume		= ubi32_uarttio_resume,
-	.driver		= {
-		.name	= DRIVER_NAME,
-		.owner	= THIS_MODULE,
-	},
-};
-
-#ifndef MODULE
-/*
- * Called at boot time.
- *
- * uarttio=TIONAME,(baud,tx_pin,rx_pin,handshake[,cts_pin,rts_pin],...)
- *	TIONAME is the name of the devtree node which describes the UARTTIO
- *	pin is the index of the pin, i.e. PA4 is 5 [(port * 32) + pin]
- *	handshake = 1 to enable handshaking, provide cts_pin, rts_pin (UNSUPPORTED)
- *	handshake = 0 to disable handshaking, do not provide cts_pin, rts_pin
- *	Ex: uarttio=UARTTIO,57600,7,6,0,9600,8,9,0
- */
-static int __init ubi32_uarttio_setup(char *str)
-{
-	strncpy(utio_ports_param, str, UBI32_UARTTIO_MAX_PARAM_LEN);
-	utio_ports_param[UBI32_UARTTIO_MAX_PARAM_LEN - 1] = 0;
-	return 1;
-}
-__setup("uarttio=", ubi32_uarttio_setup);
-#endif
-
-/*
- * ubi32_uarttio_init
- */
-static int __init ubi32_uarttio_init(void)
-{
-	int ret;
-	int i;
-
-	ret = ubi32_uarttio_probe();
-	if (ret) {
-		return ret;
-	}
-
-	/*
-	 * Request the IRQ (do it here since many ports share the same IRQ)
-	 */
-	ret = request_irq(uarttio_inst.irq, ubi32_uarttio_isr, IRQF_DISABLED, DRIVER_NAME, NULL);
-	if (ret != 0) {
-		printk(KERN_WARNING "Could not request IRQ %d\n", uarttio_inst.irq);
-		goto fail;
-	}
-	uarttio_inst.irq_requested = 1;
-
-	/*
-	 * Register the UART driver and add the ports
-	 */
-	ret = uart_register_driver(&ubi32_uarttio_uart_driver);
-	if (ret != 0) {
-		goto fail;
-	}
-	uarttio_inst.driver_registered = 1;
-
-	ret = ubi32_uarttio_add_ports();
-	if (ret != 0) {
-		ubi32_uarttio_cleanup();
-		return ret;
-	}
-
-	/*
-	 * Start the thread
-	 */
-	thread_enable(uarttio_inst.regs->thread);
-
-	for (i = 0; i < uarttio_nports; i++) {
-		pr_info("Serial: Ubicom32 uarttio #%d: tx:%d rx:%d baud:%d\n",
-			i, uarttio_ports[i].tx_pin, uarttio_ports[i].rx_pin,
-			uarttio_ports[i].uart->current_baud_rate);
-	}
-	pr_info("Serial: Ubicom32 uarttio started on thread:%d irq:%d\n", uarttio_inst.regs->thread, uarttio_inst.irq);
-
-	return ret;
-
-fail:
-	ubi32_uarttio_cleanup();
-	return ret;
-}
-module_init(ubi32_uarttio_init);
-
-/*
- * ubi32_uarttio_exit
- */
-static void __exit ubi32_uarttio_exit(void)
-{
-	platform_driver_unregister(&ubi32_uarttio_platform_driver);
-}
-module_exit(ubi32_uarttio_exit);
-
-module_param_string(ports, utio_ports_param, sizeof(utio_ports_param), 0444);
-MODULE_PARM_DESC(ports, "Sets the ports to allocate: ports=TIONAME,(baud,txpin,rxpin,handshake[,ctspin,rtspin],...)\n"
-			"     TIONAME is the name of the devtree node which describes the UARTTIO\n"
-			"     pin is the index of the pin, i.e. PA4 is 5 [(port * 32) + pin]\n"
-			"     handshake = 1 to enable handshaking, provide ctspin, rtspin (UNSUPPORTED)\n"
-			"     handshake = 0 to disable handshaking, do not provide ctspin, rtspin\n"
-			"     Ex: ports=UARTTIO,57600,7,6,0,9600,8,9,0\n");
-MODULE_AUTHOR("Patrick Tjin <pat.tjin@ubicom.com>");
-MODULE_DESCRIPTION("Ubicom serial virtual peripherial driver");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS_CHARDEV_MAJOR(UBI32_UARTTIO_MAJOR);
-MODULE_ALIAS("platform:" DRIVER_NAME);
diff --git a/target/linux/ubicom32/files/drivers/spi/spi_ubicom32_gpio.c b/target/linux/ubicom32/files/drivers/spi/spi_ubicom32_gpio.c
deleted file mode 100644
index c41018a26..000000000
--- a/target/linux/ubicom32/files/drivers/spi/spi_ubicom32_gpio.c
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
- * drivers/spi_spi_ubicom32_gpio.c
- *	Ubicom32 GPIO based SPI driver
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/spinlock.h>
-#include <linux/workqueue.h>
-#include <linux/platform_device.h>
-
-#include <linux/spi/spi.h>
-#include <linux/spi/spi_bitbang.h>
-
-#include <linux/gpio.h>
-
-#include <asm/ubicom32-spi-gpio.h>
-
-#define DRIVER_NAME "ubicom32-spi-gpio"
-
-struct ubicom32_spi_gpio {
-	struct spi_bitbang			 bitbang;
-
-	struct ubicom32_spi_gpio_platform_data	*pdata;
-
-	struct platform_device			*dev;
-};
-
-/*
- * The following 4 functions are used by EXPAND_BITBANG_TXRX to bitbang the data out.
- */
-static inline void setsck(struct spi_device *dev, int on)
-{
-	struct ubicom32_spi_gpio *usg = (struct ubicom32_spi_gpio *)spi_master_get_devdata(dev->master);
-	gpio_set_value(usg->pdata->pin_clk, on ? 1 : 0);
-}
-
-static inline void setmosi(struct spi_device *dev, int on)
-{
-	struct ubicom32_spi_gpio *usg = (struct ubicom32_spi_gpio *)spi_master_get_devdata(dev->master);
-	gpio_set_value(usg->pdata->pin_mosi, on ? 1 : 0);
-}
-
-static inline u32 getmiso(struct spi_device *dev)
-{
-	struct ubicom32_spi_gpio *usg = (struct ubicom32_spi_gpio *)spi_master_get_devdata(dev->master);
-	return gpio_get_value(usg->pdata->pin_miso) ? 1 : 0;
-}
-
-#define spidelay(x) ndelay(x)
-
-#define	EXPAND_BITBANG_TXRX
-#include <linux/spi/spi_bitbang.h>
-
-/*
- * ubicom32_spi_gpio_txrx_mode0
- */
-static u32 ubicom32_spi_gpio_txrx_mode0(struct spi_device *spi, unsigned nsecs, u32 word, u8 bits)
-{
-	return bitbang_txrx_be_cpha0(spi, nsecs, 0, word, bits);
-}
-
-/*
- * ubicom32_spi_gpio_txrx_mode1
- */
-static u32 ubicom32_spi_gpio_txrx_mode1(struct spi_device *spi, unsigned nsecs, u32 word, u8 bits)
-{
-	return bitbang_txrx_be_cpha1(spi, nsecs, 0, word, bits);
-}
-
-/*
- * ubicom32_spi_gpio_txrx_mode2
- */
-static u32 ubicom32_spi_gpio_txrx_mode2(struct spi_device *spi, unsigned nsecs, u32 word, u8 bits)
-{
-	return bitbang_txrx_be_cpha0(spi, nsecs, 1, word, bits);
-}
-
-/*
- * ubicom32_spi_gpio_txrx_mode3
- */
-static u32 ubicom32_spi_gpio_txrx_mode3(struct spi_device *spi, unsigned nsecs, u32 word, u8 bits)
-{
-	return bitbang_txrx_be_cpha1(spi, nsecs, 1, word, bits);
-}
-
-/*
- * ubicom32_spi_gpio_chipselect
- */
-static void ubicom32_spi_gpio_chipselect(struct spi_device *dev, int value)
-{
-	struct ubicom32_spi_gpio_controller_data *cd = (struct ubicom32_spi_gpio_controller_data *)dev->controller_data;
-	unsigned int cs_polarity = dev->mode & SPI_CS_HIGH ? 1 : 0;
-
-	if (value == BITBANG_CS_ACTIVE) {
-		gpio_set_value(cd->pin_cs, cs_polarity);
-		return;
-	}
-	gpio_set_value(cd->pin_cs, !cs_polarity);
-}
-
-/*
- * ubicom32_spi_gpio_probe
- */
-static int ubicom32_spi_gpio_probe(struct platform_device *dev)
-{
-	struct ubicom32_spi_gpio_platform_data *pdata;
-	struct spi_master *master;
-	struct ubicom32_spi_gpio *usg;
-	int ret;
-
-	master = spi_alloc_master(&dev->dev, sizeof(struct ubicom32_spi_gpio));
-	if (master == NULL) {
-		dev_err(&dev->dev, "failed to allocate spi master\n");
-		ret = -ENOMEM;
-		goto err;
-	}
-
-	usg = (struct ubicom32_spi_gpio *)spi_master_get_devdata(master);
-
-	platform_set_drvdata(dev, usg);
-
-	/*
-	 * Copy in the platform data
-	 */
-	pdata = dev->dev.platform_data;
-	usg->pdata = dev->dev.platform_data;
-
-	/*
-	 * Request the GPIO lines
-	 */
-	ret = gpio_request(pdata->pin_mosi, "spi-mosi");
-	if (ret) {
-		dev_err(&dev->dev, "Failed to allocate spi-mosi GPIO\n");
-		goto err;
-	}
-
-	ret = gpio_request(pdata->pin_miso, "spi-miso");
-	if (ret) {
-		dev_err(&dev->dev, "Failed to allocate spi-miso GPIO\n");
-		goto err_nomiso;
-	}
-
-	ret = gpio_request(pdata->pin_clk, "spi-clk");
-	if (ret) {
-		dev_err(&dev->dev, "Failed to allocate spi-clk GPIO\n");
-		goto err_noclk;
-	}
-
-	/*
-	 * Setup spi-bitbang adaptor
-	 */
-	usg->bitbang.flags |= SPI_CS_HIGH;
-	usg->bitbang.master = spi_master_get(master);
-	usg->bitbang.master->bus_num = pdata->bus_num;
-	usg->bitbang.master->num_chipselect = pdata->num_chipselect;
-	usg->bitbang.chipselect = ubicom32_spi_gpio_chipselect;
-
-	usg->bitbang.txrx_word[SPI_MODE_0] = ubicom32_spi_gpio_txrx_mode0;
-	usg->bitbang.txrx_word[SPI_MODE_1] = ubicom32_spi_gpio_txrx_mode1;
-	usg->bitbang.txrx_word[SPI_MODE_2] = ubicom32_spi_gpio_txrx_mode2;
-	usg->bitbang.txrx_word[SPI_MODE_3] = ubicom32_spi_gpio_txrx_mode3;
-
-	/*
-	 * Setup the GPIO pins
-	 */
-	gpio_direction_output(pdata->pin_clk, pdata->clk_default);
-	gpio_direction_output(pdata->pin_mosi, 0);
-	gpio_direction_input(pdata->pin_miso);
-
-	/*
-	 * Ready to go
-	 */
-	ret = spi_bitbang_start(&usg->bitbang);
-	if (ret) {
-		goto err_no_bitbang;
-	}
-
-	return 0;
-
-err_no_bitbang:
-	spi_master_put(usg->bitbang.master);
-
-	gpio_free(pdata->pin_clk);
-
-err_noclk:
-	gpio_free(pdata->pin_miso);
-
-err_nomiso:
-	gpio_free(pdata->pin_mosi);
-
-err:
-	return ret;
-}
-
-/*
- * ubicom32_spi_gpio_remove
- */
-static int ubicom32_spi_gpio_remove(struct platform_device *dev)
-{
-	struct ubicom32_spi_gpio *sp = platform_get_drvdata(dev);
-
-	spi_bitbang_stop(&sp->bitbang);
-	spi_master_put(sp->bitbang.master);
-
-	return 0;
-}
-
-/*
- * Work with hotplug and coldplug
- */
-MODULE_ALIAS("platform:ubicom32_spi_gpio");
-
-static struct platform_driver ubicom32_spi_gpio_drv = {
-	.probe		= ubicom32_spi_gpio_probe,
-        .remove		= ubicom32_spi_gpio_remove,
-        .driver		= {
-		.name	= DRIVER_NAME,
-		.owner	= THIS_MODULE,
-        },
-};
-
-/*
- * ubicom32_spi_gpio_init
- */
-static int __init ubicom32_spi_gpio_init(void)
-{
-        return platform_driver_register(&ubicom32_spi_gpio_drv);
-}
-
-/*
- * ubicom32_spi_gpio_exit
- */
-static void __exit ubicom32_spi_gpio_exit(void)
-{
-        platform_driver_unregister(&ubicom32_spi_gpio_drv);
-}
-
-module_init(ubicom32_spi_gpio_init);
-module_exit(ubicom32_spi_gpio_exit);
-
-MODULE_DESCRIPTION("Ubicom32 SPI-GPIO Driver");
-MODULE_AUTHOR("Pat Tjin, <@ubicom.com>");
-MODULE_LICENSE("GPL");
diff --git a/target/linux/ubicom32/files/drivers/uio/uio_ubicom32ring.c b/target/linux/ubicom32/files/drivers/uio/uio_ubicom32ring.c
deleted file mode 100644
index 654ac4ced..000000000
--- a/target/linux/ubicom32/files/drivers/uio/uio_ubicom32ring.c
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
- * drivers/uio/uio_ubicom32ring.c
- *
- * Userspace I/O platform driver for Ubicom32 ring buffers
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * Based on uio_ubicom32ring.c by Magnus Damm
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- */
-
-#include <linux/platform_device.h>
-#include <linux/uio_driver.h>
-#include <linux/spinlock.h>
-#include <linux/bitops.h>
-#include <linux/interrupt.h>
-#include <linux/stringify.h>
-
-#include <asm/ip5000.h>
-#include <asm/ubicom32ring.h>
-
-#define DRIVER_NAME "uio_ubicom32ring"
-
-struct uio_ubicom32ring_data {
-	struct uio_info			*uioinfo;
-
-	struct uio_ubicom32ring_regs	*regs;
-
-	/*
-	 * IRQ used to kick the ring buffer
-	 */
-	int				irq_tx;
-	int				irq_rx;
-
-	spinlock_t			lock;
-
-	unsigned long			flags;
-
-	char				name[0];
-};
-
-static irqreturn_t uio_ubicom32ring_handler(int irq, struct uio_info *dev_info)
-{
-	struct uio_ubicom32ring_data *priv = dev_info->priv;
-
-	/* Just disable the interrupt in the interrupt controller, and
-	 * remember the state so we can allow user space to enable it later.
-	 */
-
-	if (!test_and_set_bit(0, &priv->flags))
-		disable_irq_nosync(irq);
-
-	return IRQ_HANDLED;
-}
-
-static int uio_ubicom32ring_irqcontrol(struct uio_info *dev_info, s32 irq_on)
-{
-	struct uio_ubicom32ring_data *priv = dev_info->priv;
-	unsigned long flags;
-
-	/* Allow user space to enable and disable the interrupt
-	 * in the interrupt controller, but keep track of the
-	 * state to prevent per-irq depth damage.
-	 *
-	 * Serialize this operation to support multiple tasks.
-	 */
-
-	spin_lock_irqsave(&priv->lock, flags);
-
-	if (irq_on & 2) {
-		/*
-		 * Kick the ring buffer (if we can)
-		 */
-		if (priv->irq_tx != 0xFF) {
-			ubicom32_set_interrupt(priv->irq_tx);
-		}
-	}
-
-	if (priv->irq_rx != 0xFF) {
-		if (irq_on & 1) {
-			if (test_and_clear_bit(0, &priv->flags))
-				enable_irq(dev_info->irq);
-		} else {
-			if (!test_and_set_bit(0, &priv->flags))
-				disable_irq(dev_info->irq);
-		}
-	}
-
-	spin_unlock_irqrestore(&priv->lock, flags);
-
-	return 0;
-}
-
-static int uio_ubicom32ring_probe(struct platform_device *pdev)
-{
-	struct uio_info *uioinfo;
-	struct uio_mem *uiomem;
-	struct uio_ubicom32ring_data *priv;
-	struct uio_ubicom32ring_regs *regs;
-	struct resource *mem_resource;
-	struct resource *irqtx_resource;
-	struct resource *irqrx_resource;
-	int ret = -EINVAL;
-	int i;
-
-	uioinfo = kzalloc(sizeof(struct uio_info), GFP_KERNEL);
-	if (!uioinfo) {
-		dev_err(&pdev->dev, "unable to kmalloc\n");
-		return -ENOMEM;
-	}
-
-	/*
-	 * Allocate private data with some string space after
-	 */
-	i = sizeof(DRIVER_NAME) + 1;
-	i += pdev->dev.platform_data ? strlen(pdev->dev.platform_data) : 0;
-	priv = kzalloc(sizeof(struct uio_ubicom32ring_data) + i, GFP_KERNEL);
-	if (!priv) {
-		dev_err(&pdev->dev, "unable to kmalloc\n");
-		kfree(uioinfo);
-		return -ENOMEM;
-	}
-
-	strcpy(priv->name, DRIVER_NAME ":");
-	if (pdev->dev.platform_data) {
-		strcat(priv->name, pdev->dev.platform_data);
-	}
-	uioinfo->priv = priv;
-	uioinfo->name = priv->name;
-	uioinfo->version = "0.1";
-
-	priv->uioinfo = uioinfo;
-	spin_lock_init(&priv->lock);
-	priv->flags = 0; /* interrupt is enabled to begin with */
-
-	/*
-	 * Get our resources, the IRQ_TX and IRQ_RX are optional.
-	 */
-	priv->irq_tx = 0xFF;
-	irqtx_resource = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-	if (irqtx_resource) {
-		priv->irq_tx = irqtx_resource->start;
-	}
-
-	uioinfo->irq = -1;
-	priv->irq_rx = 0xFF;
-	irqrx_resource = platform_get_resource(pdev, IORESOURCE_IRQ, 1);
-	if (irqrx_resource) {
-		priv->irq_rx = irqrx_resource->start;
-		uioinfo->irq = priv->irq_rx;
-		uioinfo->handler = uio_ubicom32ring_handler;
-	}
-
-	mem_resource = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	if (!mem_resource || !mem_resource->start) {
-		dev_err(&pdev->dev, "No valid memory resource found\n");
-		ret = -ENODEV;
-		goto fail;
-	}
-	regs = (struct uio_ubicom32ring_regs *)mem_resource->start;
-	priv->regs = regs;
-
-	if (regs->version != UIO_UBICOM32RING_REG_VERSION) {
-		dev_err(&pdev->dev, "version %d not supported\n", regs->version);
-		ret = -ENODEV;
-		goto fail;
-	}
-
-	/*
-	 * First range is the shared register space, if we have any
-	 */
-	uiomem = &uioinfo->mem[0];
-	if (regs->regs_size) {
-		uiomem->memtype = UIO_MEM_PHYS;
-		uiomem->addr = (u32_t)regs->regs;
-		uiomem->size = regs->regs_size;
-		++uiomem;
-		dev_info(&pdev->dev, "regs:%p (%u) / rings: %d found\n", regs->regs, regs->regs_size, regs->num_rings);
-	} else {
-		dev_info(&pdev->dev, "rings: %d found\n", regs->num_rings);
-	}
-
-	/*
-	 * The rest of the range correspond to the rings
-	 */
-	for (i = 0; i < regs->num_rings; i++) {
-		dev_info(&pdev->dev, "\t%d: entries:%d ring:%p\n",
-			 i, regs->rings[i]->entries, &(regs->rings[i]->ring));
-		if (uiomem >= &uioinfo->mem[MAX_UIO_MAPS]) {
-			dev_warn(&pdev->dev, "device has more than "
-					__stringify(MAX_UIO_MAPS)
-					" I/O memory resources.\n");
-			break;
-		}
-
-		uiomem->memtype = UIO_MEM_PHYS;
-		uiomem->addr = (u32_t)&(regs->rings[i]->head);
-		uiomem->size = (regs->rings[i]->entries * sizeof(u32_t)) +
-				sizeof(struct uio_ubicom32ring_desc);
-		++uiomem;
-	}
-
-	while (uiomem < &uioinfo->mem[MAX_UIO_MAPS]) {
-		uiomem->size = 0;
-		++uiomem;
-	}
-
-	/* This driver requires no hardware specific kernel code to handle
-	 * interrupts. Instead, the interrupt handler simply disables the
-	 * interrupt in the interrupt controller. User space is responsible
-	 * for performing hardware specific acknowledge and re-enabling of
-	 * the interrupt in the interrupt controller.
-	 *
-	 * Interrupt sharing is not supported.
-	 */
-	uioinfo->irq_flags = IRQF_DISABLED;
-	uioinfo->irqcontrol = uio_ubicom32ring_irqcontrol;
-
-	ret = uio_register_device(&pdev->dev, priv->uioinfo);
-	if (ret) {
-		dev_err(&pdev->dev, "unable to register uio device\n");
-		goto fail;
-	}
-
-	platform_set_drvdata(pdev, priv);
-
-	dev_info(&pdev->dev, "'%s' using irq: rx %d tx %d, regs %p\n",
-		 priv->name, priv->irq_rx, priv->irq_tx, priv->regs);
-
-	return 0;
-
-fail:
-	kfree(uioinfo);
-	kfree(priv);
-	return ret;
-}
-
-static int uio_ubicom32ring_remove(struct platform_device *pdev)
-{
-	struct uio_ubicom32ring_data *priv = platform_get_drvdata(pdev);
-
-	uio_unregister_device(priv->uioinfo);
-	kfree(priv->uioinfo);
-	kfree(priv);
-	return 0;
-}
-
-static struct platform_driver uio_ubicom32ring = {
-	.probe = uio_ubicom32ring_probe,
-	.remove = uio_ubicom32ring_remove,
-	.driver = {
-		.name = DRIVER_NAME,
-		.owner = THIS_MODULE,
-	},
-};
-
-static int __init uio_ubicom32ring_init(void)
-{
-	return platform_driver_register(&uio_ubicom32ring);
-}
-
-static void __exit uio_ubicom32ring_exit(void)
-{
-	platform_driver_unregister(&uio_ubicom32ring);
-}
-
-module_init(uio_ubicom32ring_init);
-module_exit(uio_ubicom32ring_exit);
-
-MODULE_AUTHOR("Patrick Tjin");
-MODULE_DESCRIPTION("Userspace I/O driver for Ubicom32 ring buffers");
-MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:" DRIVER_NAME);
diff --git a/target/linux/ubicom32/files/drivers/usb/musb/ubi32_usb.c b/target/linux/ubicom32/files/drivers/usb/musb/ubi32_usb.c
deleted file mode 100644
index d89e00416..000000000
--- a/target/linux/ubicom32/files/drivers/usb/musb/ubi32_usb.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * drivers/usb/musb/ubi32_usb.c
- *   Ubicom32 usb controller driver.
- *
- * (C) Copyright 2009, Ubicom, Inc.
- * Copyright (C) 2005-2006 by Texas Instruments
- *
- * Derived from the Texas Instruments Inventra Controller Driver for Linux.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/slab.h>
-#include <linux/init.h>
-#include <linux/list.h>
-#include <linux/clk.h>
-#include <linux/io.h>
-
-#include <asm/io.h>
-#include <asm/ip5000.h>
-#include "musb_core.h"
-
-void musb_platform_enable(struct musb *musb)
-{
-}
-void musb_platform_disable(struct musb *musb)
-{
-}
-
-int musb_platform_set_mode(struct musb *musb, u8 musb_mode) {
-	return 0;
-}
-
-static void ip5k_usb_hcd_vbus_power(struct musb *musb, int is_on, int sleeping)
-{
-}
-
-static void ip5k_usb_hcd_set_vbus(struct musb *musb, int is_on)
-{
-	u8		devctl;
-	/* HDRC controls CPEN, but beware current surges during device
-	 * connect.  They can trigger transient overcurrent conditions
-	 * that must be ignored.
-	 */
-
-	devctl = musb_readb(musb->mregs, MUSB_DEVCTL);
-
-	if (is_on) {
-		musb->is_active = 1;
-		musb->xceiv.default_a = 1;
-		musb->xceiv.state = OTG_STATE_A_WAIT_VRISE;
-		devctl |= MUSB_DEVCTL_SESSION;
-
-		MUSB_HST_MODE(musb);
-	} else {
-		musb->is_active = 0;
-
-		/* NOTE:  we're skipping A_WAIT_VFALL -> A_IDLE and
-		 * jumping right to B_IDLE...
-		 */
-
-		musb->xceiv.default_a = 0;
-		musb->xceiv.state = OTG_STATE_B_IDLE;
-		devctl &= ~MUSB_DEVCTL_SESSION;
-
-		MUSB_DEV_MODE(musb);
-	}
-	musb_writeb(musb->mregs, MUSB_DEVCTL, devctl);
-
-	DBG(1, "VBUS %s, devctl %02x "
-		/* otg %3x conf %08x prcm %08x */ "\n",
-		otg_state_string(musb),
-		musb_readb(musb->mregs, MUSB_DEVCTL));
-}
-static int ip5k_usb_hcd_set_power(struct otg_transceiver *x, unsigned mA)
-{
-	return 0;
-}
-
-static int musb_platform_resume(struct musb *musb);
-
-int __init musb_platform_init(struct musb *musb)
-{
-
-#ifdef CONFIG_UBICOM32_V4
-	u32_t chip_id;
-	asm volatile (
-		      "move.4	%0, CHIP_ID	\n\t"
-		      : "=r" (chip_id)
-	);
-	if (chip_id == 0x30001) {
-		*((u32_t *)(GENERAL_CFG_BASE + GEN_USB_PHY_TEST)) &= ~(1 << 30);
-		udelay(1);
-		*((u32_t *)(GENERAL_CFG_BASE + GEN_USB_PHY_TEST)) &= ~(1 << 31);
-	} else {
-		*((u32_t *)(GENERAL_CFG_BASE + GEN_USB_PHY_TEST)) &= ~(1 << 17);
-		udelay(1);
-		*((u32_t *)(GENERAL_CFG_BASE + GEN_USB_PHY_TEST)) &= ~(1 << 14);
-	}
-#endif
-
-	 *((u32_t *)(GENERAL_CFG_BASE + GEN_USB_PHY_CFG)) |= ((1 << 14) | (1 <<15));
-
-	/* The i-clk is AUTO gated. Hence there is no need
-	 * to disable it until the driver is shutdown */
-
-	clk_enable(musb->clock);
-	musb_platform_resume(musb);
-
-	ip5k_usb_hcd_vbus_power(musb, musb->board_mode == MUSB_HOST, 1);
-
-	if (is_host_enabled(musb))
-		musb->board_set_vbus = ip5k_usb_hcd_set_vbus;
-	if (is_peripheral_enabled(musb))
-		musb->xceiv.set_power = ip5k_usb_hcd_set_power;
-
-	return 0;
-}
-
-
-int musb_platform_suspend(struct musb *musb)
-{
-	return 0;
-}
-int musb_platform_resume(struct musb *musb)
-{
-	return 0;
-}
-
-int musb_platform_exit(struct musb *musb)
-{
-	ip5k_usb_hcd_vbus_power(musb, 0 /*off*/, 1);
-	musb_platform_suspend(musb);
-	return 0;
-}
diff --git a/target/linux/ubicom32/files/drivers/video/backlight/ubicom32bl.c b/target/linux/ubicom32/files/drivers/video/backlight/ubicom32bl.c
deleted file mode 100644
index 99538c341..000000000
--- a/target/linux/ubicom32/files/drivers/video/backlight/ubicom32bl.c
+++ /dev/null
@@ -1,399 +0,0 @@
-/*
- * drivers/video/backlight/ubicom32bl.c
- *	Backlight driver for the Ubicom32 platform
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/backlight.h>
-#include <linux/fb.h>
-
-#include <asm/ubicom32bl.h>
-#include <asm/ip5000.h>
-
-#define DRIVER_NAME			"ubicom32bl"
-#define UBICOM32BL_MAX_BRIGHTNESS	255
-
-struct ubicom32bl_data {
-	/*
-	 * Pointer to the platform data structure.  Keep this around since we need values
-	 * from it to set the backlight intensity.
-	 */
-	const struct ubicom32bl_platform_data	*pdata;
-
-	/*
-	 * Backlight device, we have to save this for use when we remove ourselves.
-	 */
-	struct backlight_device			*bldev;
-
-	/*
-	 * Current intensity, used for get_intensity.
-	 */
-	int					cur_intensity;
-
-	/*
-	 * Init function for PWM
-	 */
-	int (*init_fn)(struct ubicom32bl_data *);
-
-	/*
-	 * Set intensity function depending on the backlight type
-	 */
-	int (*set_intensity_fn)(struct ubicom32bl_data *, int);
-};
-
-/*
- * ubicom32bl_set_intensity_gpio
- */
-static int ubicom32bl_set_intensity_gpio(struct ubicom32bl_data *ud, int intensity)
-{
-	ud->cur_intensity = intensity ? 255 : 0;
-
-	if (intensity) {
-		// set gpio
-		return 0;
-	}
-
-	// clear gpio
-	return 0;
-}
-
-/*
- * ubicom32bl_set_intensity_hw
- */
-static int ubicom32bl_set_intensity_hw(struct ubicom32bl_data *ud, int intensity)
-{
-	u16_t period = ud->pdata->pwm_period;
-	u16_t duty;
-
-	/*
-	 * Calculate the new duty cycle
-	 */
-	duty = (period * intensity) / (UBICOM32BL_MAX_BRIGHTNESS + 1);
-
-	/*
-	 * Set the new duty cycle
-	 */
-	switch (ud->pdata->pwm_channel) {
-	case 0:
-		/*
-		 * Channel 0 is in the lower half of PORT C ctl0 and ctl1
-		 */
-		UBICOM32_IO_PORT(RC)->ctl1 = (ud->pdata->pwm_period << 16) | duty;
-		break;
-
-	case 1:
-		/*
-		 * Channel 1 is in the upper half of PORT C ctl0 and ctl2
-		 */
-		UBICOM32_IO_PORT(RC)->ctl2 = (ud->pdata->pwm_period << 16) | duty;
-		break;
-
-	case 2:
-		/*
-		 * Channel 2 is in PORT H ctl0 and ctl1
-		 */
-		UBICOM32_IO_PORT(RH)->ctl1 = (ud->pdata->pwm_period << 16) | duty;
-		break;
-	}
-
-	ud->cur_intensity = intensity;
-
-	return 0;
-}
-
-/*
- * ubicom32bl_set_intensity
- */
-static int ubicom32bl_set_intensity(struct backlight_device *bd)
-{
-	struct ubicom32bl_data *ud = (struct ubicom32bl_data *)bl_get_data(bd);
-	int intensity = bd->props.brightness;
-
-	/*
-	 * If we're blanked the the intensity doesn't matter.
-	 */
-	if ((bd->props.power != FB_BLANK_UNBLANK) || (bd->props.fb_blank != FB_BLANK_UNBLANK)) {
-		intensity = 0;
-	}
-
-	/*
-	 * Check for inverted backlight.
-	 */
-	if (ud->pdata->invert) {
-		intensity = UBICOM32BL_MAX_BRIGHTNESS - intensity;
-	}
-
-	if (ud->set_intensity_fn) {
-		return ud->set_intensity_fn(ud, intensity);
-	}
-
-	return -ENXIO;
-}
-
-/*
- * ubicom32bl_get_intensity
- *	Return the current intensity of the backlight.
- */
-static int ubicom32bl_get_intensity(struct backlight_device *bd)
-{
-	struct ubicom32bl_data *ud = (struct ubicom32bl_data *)bl_get_data(bd);
-
-	return ud->cur_intensity;
-}
-
-/*
- * ubicom32bl_init_hw_pwm
- *	Set the appropriate PWM registers
- */
-static int ubicom32bl_init_hw_pwm(struct ubicom32bl_data *ud)
-{
-	/*
-	 * bit 13: enable
-	 */
-	u16_t pwm_cfg = (1 << 13) | (ud->pdata->pwm_prescale << 8) ;
-
-	switch (ud->pdata->pwm_channel) {
-	case 0:
-		/*
-		 * Channel 0 is in the lower half of PORT C ctl0 and ctl1 (PA5)
-		 */
-		UBICOM32_IO_PORT(RC)->ctl0 &= ~0xFFFF;
-		UBICOM32_IO_PORT(RC)->ctl0 |= pwm_cfg;
-		UBICOM32_IO_PORT(RC)->ctl1 = ud->pdata->pwm_period << 16;
-
-		/*
-		 * If the port function is not set, set it to GPIO/PWM
-		 */
-		if (!UBICOM32_IO_PORT(RA)->function) {
-			UBICOM32_IO_PORT(RA)->function = 3;
-		}
-		break;
-
-	case 1:
-		/*
-		 * Channel 1 is in the upper half of PORT C ctl0 and ctl2 (PE4)
-		 */
-		UBICOM32_IO_PORT(RC)->ctl0 &= ~0xFFFF0000;
-		UBICOM32_IO_PORT(RC)->ctl0 |= (pwm_cfg << 16);
-		UBICOM32_IO_PORT(RC)->ctl2 = ud->pdata->pwm_period << 16;
-
-		/*
-		 * If the port function is not set, set it to GPIO/ExtIOInt
-		 */
-		if (!UBICOM32_IO_PORT(RE)->function) {
-			UBICOM32_IO_PORT(RE)->function = 3;
-		}
-		break;
-
-	case 2:
-		/*
-		 * Channel 2 is in PORT H ctl0 and ctl1 (PD0)
-		 */
-		UBICOM32_IO_PORT(RH)->ctl0 &= ~0xFFFF0000;
-		UBICOM32_IO_PORT(RH)->ctl0 = pwm_cfg;
-		UBICOM32_IO_PORT(RH)->ctl1 = ud->pdata->pwm_period << 16;
-
-		/*
-		 * If the port function is not set, set it to GPIO
-		 */
-		if (!UBICOM32_IO_PORT(RD)->function) {
-			UBICOM32_IO_PORT(RD)->function = 3;
-		}
-		break;
-	}
-
-	return 0;
-}
-
-/*
- * ubicom32bl_init_gpio
- *	Allocate the appropriate GPIO
- */
-static int ubicom32bl_init_gpio(struct ubicom32bl_data *ud)
-{
-	return 0;
-}
-
-static struct backlight_ops ubicom32bl_ops = {
-	.get_brightness = ubicom32bl_get_intensity,
-	.update_status  = ubicom32bl_set_intensity,
-};
-
-/*
- * ubicom32bl_probe
- */
-static int ubicom32bl_probe(struct platform_device *pdev)
-{
-	const struct ubicom32bl_platform_data *pdata = pdev->dev.platform_data;
-	struct ubicom32bl_data *ud;
-	struct backlight_device *bldev;
-	int retval;
-
-	/*
-	 * Check to see if we have any platform data, if we don't then the backlight is not
-	 * configured on this device.
-	 */
-	if (!pdata) {
-		return -ENODEV;
-	}
-
-	/*
-	 * Allocate our private data
-	 */
-	ud = kzalloc(sizeof(struct ubicom32bl_data), GFP_KERNEL);
-	if (!ud) {
-		return -ENOMEM;
-	}
-
-	ud->pdata = pdata;
-
-	/*
-	 * Check to see that the platform data is valid for this driver
-	 */
-	switch (pdata->type) {
-	case UBICOM32BL_TYPE_PWM:
-		{
-			/*
-			 * Make sure we have a PWM peripheral
-			 */
-			u32_t chipid;
-			asm volatile (
-				"move.4         %0, CHIP_ID     \n\t"
-				: "=r" (chipid)
-			);
-			if (chipid != 0x00030001) {
-				retval = -ENODEV;
-				goto fail;
-			}
-
-			if (pdata->pwm_channel > 3) {
-				retval = -ENODEV;
-				goto fail;
-			}
-			if (pdata->pwm_prescale > 16) {
-				retval = -EINVAL;
-				goto fail;
-			}
-
-			ud->init_fn = ubicom32bl_init_hw_pwm;
-			ud->set_intensity_fn = ubicom32bl_set_intensity_hw;
-			break;
-		}
-
-	case UBICOM32BL_TYPE_PWM_HRT:
-		// For now, PWM HRT devices are treated as binary lights.
-
-	case UBICOM32BL_TYPE_BINARY:
-		ud->init_fn = ubicom32bl_init_gpio;
-		ud->set_intensity_fn = ubicom32bl_set_intensity_gpio;
-		break;
-	}
-
-	/*
-	 * Register our backlight device
-	 */
-	bldev = backlight_device_register(DRIVER_NAME, &pdev->dev, ud, &ubicom32bl_ops);
-	if (IS_ERR(bldev)) {
-		retval = PTR_ERR(bldev);
-		goto fail;
-	}
-
-	ud->bldev = bldev;
-	ud->cur_intensity = pdata->default_intensity;
-	platform_set_drvdata(pdev, ud);
-
-	/*
-	 * Start up the backlight at the prescribed default intensity
-	 */
-	bldev->props.power = FB_BLANK_UNBLANK;
-	bldev->props.max_brightness = UBICOM32BL_MAX_BRIGHTNESS;
-	bldev->props.brightness = pdata->default_intensity;
-
-	if (ud->init_fn) {
-		if (ud->init_fn(ud) != 0) {
-			retval = -ENODEV;
-			backlight_device_unregister(ud->bldev);
-			goto fail;
-		}
-	}
-	ubicom32bl_set_intensity(bldev);
-
-	printk(KERN_INFO DRIVER_NAME ": Backlight driver started\n");
-
-	return 0;
-
-fail:
-	platform_set_drvdata(pdev, NULL);
-	kfree(ud);
-	return retval;
-}
-
-/*
- * ubicom32bl_remove
- */
-static int __exit ubicom32bl_remove(struct platform_device *pdev)
-{
-	struct ubicom32bl_data *ud = platform_get_drvdata(pdev);
-
-	backlight_device_unregister(ud->bldev);
-	platform_set_drvdata(pdev, NULL);
-	kfree(ud);
-
-	return 0;
-}
-
-static struct platform_driver ubicom32bl_driver = {
-	.driver = {
-		.name = DRIVER_NAME,
-		.owner = THIS_MODULE,
-	},
-
-	.remove = __exit_p(ubicom32bl_remove),
-};
-
-/*
- * ubicom32bl_init
- */
-static int __init ubicom32bl_init(void)
-{
-	return platform_driver_probe(&ubicom32bl_driver, ubicom32bl_probe);
-}
-module_init(ubicom32bl_init);
-
-/*
- * ubicom32bl_exit
- */
-static void __exit ubicom32bl_exit(void)
-{
-	platform_driver_unregister(&ubicom32bl_driver);
-}
-module_exit(ubicom32bl_exit);
-
-MODULE_AUTHOR("Patrick Tjin <@ubicom.com>");
-MODULE_DESCRIPTION("Ubicom32 backlight driver");
-MODULE_LICENSE("GPL");
diff --git a/target/linux/ubicom32/files/drivers/video/backlight/ubicom32lcd.c b/target/linux/ubicom32/files/drivers/video/backlight/ubicom32lcd.c
deleted file mode 100644
index e4f8c713e..000000000
--- a/target/linux/ubicom32/files/drivers/video/backlight/ubicom32lcd.c
+++ /dev/null
@@ -1,372 +0,0 @@
-/*
- * drivers/video/ubicom32lcd.c
- *	LCD initilization code
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- */
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/delay.h>
-
-#include <asm/ip5000.h>
-#include <asm/gpio.h>
-#include <asm/ubicom32lcd.h>
-
-#include "ubicom32lcd.h"
-
-#define DRIVER_NAME			"ubicom32lcd"
-
-struct ubicom32lcd_data {
-	const struct ubicom32lcd_panel	*panel;
-
-	int				pin_cs;
-	int				pin_rd;
-	int				pin_rs;
-	int				pin_wr;
-	int				pin_reset;
-	struct ubicom32_io_port		*port_data;
-	int				data_shift;
-};
-
-/*
- * ubicom32lcd_write
- *	Performs a write cycle on the bus (assumes CS asserted, RD & WR set)
- */
-static void ubicom32lcd_write(struct ubicom32lcd_data *ud, int command, u16 data)
-{
-	if (command) {
-		UBICOM32_GPIO_SET_PIN_LOW(ud->pin_rs);
-	} else {
-		UBICOM32_GPIO_SET_PIN_HIGH(ud->pin_rs);
-	}
-
-	asm volatile (
-		"or.4	4(%[port]), 4(%[port]), %[mask]	\n\t"
-		"not.4	%[mask], %[mask]		\n\t"
-		"and.4	8(%[port]), 8(%[port]), %[mask]	\n\t"
-		"or.4	8(%[port]), 8(%[port]), %[cmd]	\n\t"
-		:
-		: [port] "a" (ud->port_data),
-		  [mask] "d" (0xFFFF << ud->data_shift),
-		  [cmd] "d" (data << ud->data_shift)
-		: "cc"
-	);
-
-	UBICOM32_GPIO_SET_PIN_LOW(ud->pin_wr);
-
-	//ndelay(50);
-	udelay(1);
-
-	UBICOM32_GPIO_SET_PIN_HIGH(ud->pin_wr);
-
-	udelay(1);
-	//ndelay(50);
-}
-
-/*
- * ubicom32lcd_read_data
- *	Performs a read cycle on the bus (assumes CS asserted, RD & WR set)
- */
-static u16 ubicom32lcd_read_data(struct ubicom32lcd_data *ud)
-{
-	u32_t data;
-
-	UBICOM32_GPIO_SET_PIN_HIGH(ud->pin_rs);
-
-	asm volatile (
-		"and.4	4(%[port]), 4(%[port]), %[mask]\n\t"
-		:
-		: [port] "a" (ud->port_data),
-		  [mask] "d" (~(0xFFFF << ud->data_shift))
-		: "cc"
-	);
-
-	UBICOM32_GPIO_SET_PIN_LOW(ud->pin_rd);
-
-	ndelay(300);
-
-	asm volatile (
-		"lsr.4	%[data], 12(%[port]), %[shamt]	\n\t"
-		"and.4	%[data], %[data], %[mask]	\n\t"
-		: [data] "=d" (data)
-		: [port] "a" (ud->port_data),
-		  [mask] "d" (0xFFFF),
-		  [shamt] "d" (ud->data_shift)
-		: "cc"
-	);
-
-	ndelay(200);
-
-	UBICOM32_GPIO_SET_PIN_HIGH(ud->pin_rd);
-
-	ndelay(500);
-
-	return data;
-}
-
-/*
- * ubicom32lcd_execute
- *	Executes a script for performing operations on the LCD (assumes CS set)
- */
-static void ubicom32lcd_execute(struct ubicom32lcd_data *ud, const struct ubicom32lcd_step *script)
-{
-	while (1) {
-		switch (script->op) {
-		case LCD_STEP_CMD:
-			ubicom32lcd_write(ud, 1, script->cmd);
-			break;
-
-		case LCD_STEP_DATA:
-			ubicom32lcd_write(ud, 0, script->data);
-			break;
-
-		case LCD_STEP_CMD_DATA:
-			ubicom32lcd_write(ud, 1, script->cmd);
-			ubicom32lcd_write(ud, 0, script->data);
-			break;
-
-		case LCD_STEP_SLEEP:
-			udelay(script->data);
-			break;
-
-		case LCD_STEP_DONE:
-			return;
-		}
-		script++;
-	}
-}
-
-/*
- * ubicom32lcd_goto
- *	Places the gram pointer at a specific X, Y address
- */
-static void ubicom32lcd_goto(struct ubicom32lcd_data *ud, int x, int y)
-{
-	ubicom32lcd_write(ud, 1, ud->panel->horz_reg);
-	ubicom32lcd_write(ud, 0, x);
-	ubicom32lcd_write(ud, 1, ud->panel->vert_reg);
-	ubicom32lcd_write(ud, 0, y);
-	ubicom32lcd_write(ud, 1, ud->panel->gram_reg);
-}
-
-/*
- * ubicom32lcd_panel_init
- *	Initializes the lcd panel.
- */
-static int ubicom32lcd_panel_init(struct ubicom32lcd_data *ud)
-{
-	u16 id;
-
-	UBICOM32_GPIO_SET_PIN_LOW(ud->pin_reset);
-	UBICOM32_GPIO_SET_PIN_OUTPUT(ud->pin_reset);
-	UBICOM32_GPIO_ENABLE(ud->pin_reset);
-
-	asm volatile (
-		"or.4	0x50(%[port]), 0x50(%[port]), %[mask]	\n\t"
-		"not.4	%[mask], %[mask]			\n\t"
-		"and.4	0x04(%[port]), 0x04(%[port]), %[mask]	\n\t"
-		:
-		: [port] "a" (ud->port_data),
-		  [mask] "d" (0xFFFF << ud->data_shift)
-		: "cc"
-	);
-
-	UBICOM32_GPIO_SET_PIN_HIGH(ud->pin_rs);
-	UBICOM32_GPIO_SET_PIN_HIGH(ud->pin_rd);
-	UBICOM32_GPIO_SET_PIN_HIGH(ud->pin_wr);
-	UBICOM32_GPIO_SET_PIN_HIGH(ud->pin_cs);
-
-	UBICOM32_GPIO_SET_PIN_OUTPUT(ud->pin_rs);
-	UBICOM32_GPIO_SET_PIN_OUTPUT(ud->pin_rd);
-	UBICOM32_GPIO_SET_PIN_OUTPUT(ud->pin_wr);
-	UBICOM32_GPIO_SET_PIN_OUTPUT(ud->pin_cs);
-
-	UBICOM32_GPIO_ENABLE(ud->pin_rs);
-	UBICOM32_GPIO_ENABLE(ud->pin_rd);
-	UBICOM32_GPIO_ENABLE(ud->pin_wr);
-	UBICOM32_GPIO_ENABLE(ud->pin_cs);
-
-	udelay(20);
-
-	UBICOM32_GPIO_SET_PIN_HIGH(ud->pin_reset);
-
-	udelay(20);
-
-	UBICOM32_GPIO_SET_PIN_LOW(ud->pin_cs);
-
-	id = ubicom32lcd_read_data(ud);
-
-	/*
-	 * We will try to figure out what kind of panel we have if we were not told.
-	 */
-	if (!ud->panel) {
-		const struct ubicom32lcd_panel **p = ubicom32lcd_panels;
-		while (*p) {
-			if ((*p)->id && ((*p)->id == id)) {
-				break;
-			}
-			p++;
-		}
-		if (!*p) {
-			printk(KERN_WARNING DRIVER_NAME ":Could not find compatible panel, id=%x\n", id);
-			return -ENODEV;
-		}
-		ud->panel = *p;
-	}
-
-	/*
-	 * Make sure panel ID matches if we were supplied a panel type
-	 */
-	if (ud->panel->id && (ud->panel->id != id)) {
-		UBICOM32_GPIO_SET_PIN_HIGH(ud->pin_cs);
-
-		return -ENODEV;
-	}
-
-	ubicom32lcd_execute(ud, ud->panel->init_seq);
-
-	ubicom32lcd_goto(ud, 0, 0);
-
-	UBICOM32_GPIO_SET_PIN_HIGH(ud->pin_cs);
-	UBICOM32_GPIO_SET_PIN_HIGH(ud->pin_rd);
-	UBICOM32_GPIO_SET_PIN_HIGH(ud->pin_wr);
-	UBICOM32_GPIO_SET_PIN_HIGH(ud->pin_rs);
-
-	printk(KERN_INFO DRIVER_NAME ": Initialized panel %s\n", ud->panel->desc);
-
-	return 0;
-}
-
-/*
- * ubicom32lcd_probe
- */
-static int ubicom32lcd_probe(struct platform_device *pdev)
-{
-	const struct ubicom32lcd_platform_data *pdata = pdev->dev.platform_data;
-	struct ubicom32lcd_data *ud;
-	int retval;
-
-	/*
-	 * Allocate our private data
-	 */
-	ud = kzalloc(sizeof(struct ubicom32lcd_data), GFP_KERNEL);
-	if (!ud) {
-		return -ENOMEM;
-	}
-
-	if (pdata) {
-		ud->pin_cs = pdata->pin_cs;
-		ud->pin_rd = pdata->pin_rd;
-		ud->pin_wr = pdata->pin_wr;
-		ud->pin_rs = pdata->pin_rs;
-		ud->pin_reset = pdata->pin_reset;
-		ud->port_data = pdata->port_data;
-		ud->data_shift = pdata->data_shift;
-	} else {
-		/*
-		 * Defaults
-		 */
-		ud->pin_cs = GPIO_RD_4;
-		ud->pin_rd = GPIO_RD_5;
-		ud->pin_rs = GPIO_RD_3;
-		ud->pin_wr = GPIO_RD_2;
-		ud->pin_reset = GPIO_RD_7;
-		ud->port_data = (struct ubicom32_io_port *)RI;
-		ud->data_shift = 0;
-	}
-
-	/*
-	 * Initialize the display
-	 */
-	retval = ubicom32lcd_panel_init(ud);
-	if (retval) {
-		kfree(ud);
-		return retval;
-	}
-
-	printk(KERN_INFO DRIVER_NAME ": LCD initialized\n");
-
-	return 0;
-}
-
-/*
- * ubicom32lcd_remove
- */
-static int __exit ubicom32lcd_remove(struct platform_device *pdev)
-{
-	struct ubicom32lcd_data *ud = platform_get_drvdata(pdev);
-
-	kfree(ud);
-
-	return 0;
-}
-
-static struct platform_driver ubicom32lcd_driver = {
-	.probe          = ubicom32lcd_probe,
-	.remove         = ubicom32lcd_remove,
-
-	.driver = {
-		.name = DRIVER_NAME,
-		.owner = THIS_MODULE,
-	},
-
-	.remove = __exit_p(ubicom32lcd_remove),
-};
-
-static struct platform_device *ubicom32lcd_device;
-
-/*
- * ubicom32lcd_init
- */
-static int __init ubicom32lcd_init(void)
-{
-	int res;
-
-	res = platform_driver_register(&ubicom32lcd_driver);
-	if (res == 0) {
-		ubicom32lcd_device = platform_device_alloc(DRIVER_NAME, 0);
-		if (ubicom32lcd_device) {
-			res = platform_device_add(ubicom32lcd_device);
-		} else {
-			res = -ENOMEM;
-		}
-		if (res) {
-			platform_device_put(ubicom32lcd_device);
-			platform_driver_unregister(&ubicom32lcd_driver);
-		}
-	}
-	return res;
-}
-module_init(ubicom32lcd_init);
-
-/*
- * ubicom32lcd_exit
- */
-static void __exit ubicom32lcd_exit(void)
-{
-	platform_device_unregister(ubicom32lcd_device);
-	platform_driver_unregister(&ubicom32lcd_driver);
-}
-module_exit(ubicom32lcd_exit);
-
-MODULE_AUTHOR("Patrick Tjin <@ubicom.com>");
-MODULE_DESCRIPTION("Ubicom32 LCD driver");
-MODULE_LICENSE("GPL");
diff --git a/target/linux/ubicom32/files/drivers/video/backlight/ubicom32lcd.h b/target/linux/ubicom32/files/drivers/video/backlight/ubicom32lcd.h
deleted file mode 100644
index 07650ba9e..000000000
--- a/target/linux/ubicom32/files/drivers/video/backlight/ubicom32lcd.h
+++ /dev/null
@@ -1,546 +0,0 @@
-/*
- * ubicom32lcd.h
- *	Ubicom32 lcd panel drivers
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * This Ubicom32 library 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.
- *
- * This Ubicom32 library is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef _UBICOM32LCD_H_
-#define _UBICOM32LCD_H_
-
-enum ubicom32lcd_op {
-	/*
-	 * Sleep for (data) ms
-	 */
-	LCD_STEP_SLEEP,
-
-	/*
-	 * Execute write of command
-	 */
-	LCD_STEP_CMD,
-
-	/*
-	 * Execute write of data
-	 */
-	LCD_STEP_DATA,
-
-	/*
-	 * Execute write of command/data
-	 */
-	LCD_STEP_CMD_DATA,
-
-	/*
-	 * Script done
-	 */
-	LCD_STEP_DONE,
-};
-
-struct ubicom32lcd_step {
-	enum ubicom32lcd_op		op;
-	u16				cmd;
-	u16				data;
-};
-
-struct ubicom32lcd_panel {
-	const struct ubicom32lcd_step	*init_seq;
-	const char			*desc;
-
-	u32				xres;
-	u32				yres;
-	u32				stride;
-	u32				flags;
-
-	u16				id;
-	u16				horz_reg;
-	u16				vert_reg;
-	u16				gram_reg;
-};
-
-#ifdef CONFIG_LCD_UBICOM32_CFAF240320KTTS
-static const struct ubicom32lcd_step cfaf240320ktts_init_0[] = {
-	{LCD_STEP_CMD_DATA, 0x0001, 0x0000,}, // Driver Output Control Register (R01h)		Page 14, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0002, 0x0700,}, // LCD Driving Waveform Control (R02h)		Page 15, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0003, 0x50A0,}, // Entry Mode (R03h)				0 degrees
-	{LCD_STEP_CMD_DATA, 0x0004, 0x0000,}, // Scaling Control register (R04h)		Page 16, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0008, 0x0207,}, // Display Control 2 (R08h)			Page 17, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0009, 0x0000,}, // Display Control 3 (R09h)			Page 18, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x000A, 0x0000,}, // Frame Cycle Control (R0Ah)			Page 19, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x000C, 0x0000,}, // External Display Interface Control 1 (R0Ch)	Page 20, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x000D, 0x0000,}, // Frame Maker Position (R0Dh)			Page 21, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x000F, 0x0000,}, // External Display Interface Control 2 (R0Fh)	Page 21, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0010, 0x0000,}, // Power Control 1 (R10h)				Page 22, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0011, 0x0007,}, // Power Control 2 (R11h)				Page 23, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0012, 0x0000,}, // Power Control 3 (R12h)				Page 24, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0013, 0x0000,}, // Power Control 4 (R13h)				Page 25, SPFD5408B Datasheet
-	{LCD_STEP_SLEEP, 0, 200},
-	{LCD_STEP_CMD_DATA, 0x0007, 0x0101,}, // Display Control (R07h)				Page 16, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0010, 0x12B0,}, // Power Control 1 (R10h)				Page 22, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0011, 0x0007,}, // Power Control 2 (R11h)				Page 23, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0012, 0x01BB,}, // Power Control 3 (R12h)				Page 24, SPFD5408B Datasheet
-	{LCD_STEP_SLEEP, 0, 50},
-	{LCD_STEP_CMD_DATA, 0x0013, 0x1300,}, // Power Control 4 (R13h)				Page 25, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0029, 0x0010,}, // NVM read data 2 (R29h)				Page 30, SPFD5408B Datasheet
-	{LCD_STEP_SLEEP, 0, 50},
-	{LCD_STEP_CMD_DATA, 0x0030, 0x000A,}, // Gamma Control 1       			 	Page 32, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0031, 0x1326,}, // Gamma Control 2       			 	Page 32, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0032, 0x0A29,}, // Gamma Control 3       			 	Page 32, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0033, 0x290A,}, // Gamma Control 4       			 	Page 32, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0034, 0x2613,}, // Gamma Control 5       			 	Page 32, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0035, 0x0A0A,}, // Gamma Control 6       			 	Page 32, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0036, 0x1E03,}, // Gamma Control 7       			 	Page 32, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0037, 0x031E,}, // Gamma Control 8       			 	Page 32, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0038, 0x0706,}, // Gamma Control 9       			 	Page 32, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0039, 0x0303,}, // Gamma Control 10      			 	Page 32, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x003A, 0x0E04,}, // Gamma Control 11      			 	Page 32, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x003B, 0x0E01,}, // Gamma Control 12      			 	Page 32, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x003C, 0x010E,}, // Gamma Control 13      			 	Page 32, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x003D, 0x040E,}, // Gamma Control 14      			 	Page 32, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x003E, 0x0303,}, // Gamma Control 15      			 	Page 32, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x003F, 0x0607,}, // Gamma Control 16      			 	Page 32, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0050, 0x0000,}, // Window Horizontal RAM Address Start (R50h)	Page 32, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0051, 0x00EF,}, // Window Horizontal RAM Address End (R51h)	Page 32, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0052, 0x0000,}, // Window Vertical RAM Address Start (R52h)	Page 33, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0053, 0x013F,}, // Window Vertical RAM Address End (R53h)		Page 33, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0060, 0x2700,}, // Driver Output Control (R60h)			Page 33, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0061, 0x0001,}, // Driver Output Control (R61h)			Page 35, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x006A, 0x0000,}, // Vertical Scroll Control (R6Ah)			Page 35, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0080, 0x0000,}, // Display Position - Partial Display 1 (R80h)	Page 35, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0081, 0x0000,}, // RAM Address Start - Partial Display 1 (R81h)	Page 35, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0082, 0x0000,}, // RAM Address End - Partial Display 1 (R82h)	Page 36, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0083, 0x0000,}, // Display Position - Partial Display 2 (R83h)	Page 36, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0084, 0x0000,}, // RAM Address Start - Partial Display 2 (R84h)	Page 36, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0085, 0x0000,}, // RAM Address End - Partial Display 2 (R85h)	Page 36, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0090, 0x0010,}, // Panel Interface Control 1 (R90h)		Page 36, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0092, 0x0000,}, // Panel Interface Control 2 (R92h)		Page 37, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0093, 0x0103,}, // Panel Interface control 3 (R93h)		Page 38, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0095, 0x0210,}, // Panel Interface control 4 (R95h)		Page 38, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0097, 0x0000,}, // Panel Interface Control 5 (R97h)		Page 40, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0098, 0x0000,}, // Panel Interface Control 6 (R98h)		Page 41, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0007, 0x0173,}, // Display Control (R07h)				Page 16, SPFD5408B Datasheet
-	{LCD_STEP_DONE, 0, 0},
-};
-
-const struct ubicom32lcd_panel cfaf240320ktts_0 = {
-	.desc		= "CFAF240320KTTS",
-	.init_seq	= cfaf240320ktts_init_0,
-	.horz_reg	= 0x20,
-	.vert_reg	= 0x21,
-	.gram_reg	= 0x22,
-	.xres		= 240,
-	.yres		= 320,
-	.stride		= 240,
-	.id		= 0x5408,
-};
-#endif
-
-#ifdef CONFIG_LCD_UBICOM32_CFAF240320KTTS_180
-static const struct ubicom32lcd_step cfaf240320ktts_init_180[] = {
-	{LCD_STEP_CMD_DATA, 0x0001, 0x0000,}, // Driver Output Control Register (R01h)		Page 14, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0002, 0x0700,}, // LCD Driving Waveform Control (R02h)		Page 15, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0003, 0x5000,}, // Entry Mode (R03h)				180 degrees
-	{LCD_STEP_CMD_DATA, 0x0004, 0x0000,}, // Scaling Control register (R04h)		Page 16, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0008, 0x0207,}, // Display Control 2 (R08h)			Page 17, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0009, 0x0000,}, // Display Control 3 (R09h)			Page 18, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x000A, 0x0000,}, // Frame Cycle Control (R0Ah)			Page 19, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x000C, 0x0000,}, // External Display Interface Control 1 (R0Ch)	Page 20, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x000D, 0x0000,}, // Frame Maker Position (R0Dh)			Page 21, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x000F, 0x0000,}, // External Display Interface Control 2 (R0Fh)	Page 21, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0010, 0x0000,}, // Power Control 1 (R10h)				Page 22, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0011, 0x0007,}, // Power Control 2 (R11h)				Page 23, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0012, 0x0000,}, // Power Control 3 (R12h)				Page 24, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0013, 0x0000,}, // Power Control 4 (R13h)				Page 25, SPFD5408B Datasheet
-	{LCD_STEP_SLEEP, 0, 200},
-	{LCD_STEP_CMD_DATA, 0x0007, 0x0101,}, // Display Control (R07h)				Page 16, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0010, 0x12B0,}, // Power Control 1 (R10h)				Page 22, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0011, 0x0007,}, // Power Control 2 (R11h)				Page 23, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0012, 0x01BB,}, // Power Control 3 (R12h)				Page 24, SPFD5408B Datasheet
-	{LCD_STEP_SLEEP, 0, 50},
-	{LCD_STEP_CMD_DATA, 0x0013, 0x1300,}, // Power Control 4 (R13h)				Page 25, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0029, 0x0010,}, // NVM read data 2 (R29h)				Page 30, SPFD5408B Datasheet
-	{LCD_STEP_SLEEP, 0, 50},
-	{LCD_STEP_CMD_DATA, 0x0030, 0x000A,}, // Gamma Control 1       			 	Page 32, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0031, 0x1326,}, // Gamma Control 2       			 	Page 32, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0032, 0x0A29,}, // Gamma Control 3       			 	Page 32, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0033, 0x290A,}, // Gamma Control 4       			 	Page 32, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0034, 0x2613,}, // Gamma Control 5       			 	Page 32, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0035, 0x0A0A,}, // Gamma Control 6       			 	Page 32, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0036, 0x1E03,}, // Gamma Control 7       			 	Page 32, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0037, 0x031E,}, // Gamma Control 8       			 	Page 32, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0038, 0x0706,}, // Gamma Control 9       			 	Page 32, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0039, 0x0303,}, // Gamma Control 10      			 	Page 32, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x003A, 0x0E04,}, // Gamma Control 11      			 	Page 32, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x003B, 0x0E01,}, // Gamma Control 12      			 	Page 32, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x003C, 0x010E,}, // Gamma Control 13      			 	Page 32, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x003D, 0x040E,}, // Gamma Control 14      			 	Page 32, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x003E, 0x0303,}, // Gamma Control 15      			 	Page 32, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x003F, 0x0607,}, // Gamma Control 16      			 	Page 32, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0050, 0x0000,}, // Window Horizontal RAM Address Start (R50h)	Page 32, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0051, 0x00EF,}, // Window Horizontal RAM Address End (R51h)	Page 32, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0052, 0x0000,}, // Window Vertical RAM Address Start (R52h)	Page 33, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0053, 0x013F,}, // Window Vertical RAM Address End (R53h)		Page 33, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0060, 0x2700,}, // Driver Output Control (R60h)			Page 33, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0061, 0x0001,}, // Driver Output Control (R61h)			Page 35, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x006A, 0x0000,}, // Vertical Scroll Control (R6Ah)			Page 35, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0080, 0x0000,}, // Display Position - Partial Display 1 (R80h)	Page 35, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0081, 0x0000,}, // RAM Address Start - Partial Display 1 (R81h)	Page 35, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0082, 0x0000,}, // RAM Address End - Partial Display 1 (R82h)	Page 36, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0083, 0x0000,}, // Display Position - Partial Display 2 (R83h)	Page 36, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0084, 0x0000,}, // RAM Address Start - Partial Display 2 (R84h)	Page 36, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0085, 0x0000,}, // RAM Address End - Partial Display 2 (R85h)	Page 36, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0090, 0x0010,}, // Panel Interface Control 1 (R90h)		Page 36, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0092, 0x0000,}, // Panel Interface Control 2 (R92h)		Page 37, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0093, 0x0103,}, // Panel Interface control 3 (R93h)		Page 38, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0095, 0x0210,}, // Panel Interface control 4 (R95h)		Page 38, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0097, 0x0000,}, // Panel Interface Control 5 (R97h)		Page 40, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0098, 0x0000,}, // Panel Interface Control 6 (R98h)		Page 41, SPFD5408B Datasheet
-	{LCD_STEP_CMD_DATA, 0x0007, 0x0173,}, // Display Control (R07h)				Page 16, SPFD5408B Datasheet
-	{LCD_STEP_DONE, 0, 0},
-};
-
-const struct ubicom32lcd_panel cfaf240320ktts_180 = {
-	.desc		= "CFAF240320KTTS 180",
-	.init_seq	= cfaf240320ktts_init_180,
-	.horz_reg	= 0x20,
-	.vert_reg	= 0x21,
-	.gram_reg	= 0x22,
-	.xres		= 240,
-	.yres		= 320,
-	.stride		= 240,
-	.id		= 0x5408,
-};
-#endif
-
-#ifdef CONFIG_LCD_UBICOM32_TFT2N0369E_P
-static const struct ubicom32lcd_step tft2n0369ep_init[] = {
-	{LCD_STEP_CMD_DATA, 0x0028, 0x0006},
-	{LCD_STEP_CMD_DATA, 0x0000, 0x0001},
-	{LCD_STEP_SLEEP, 0, 15},
-	{LCD_STEP_CMD_DATA, 0x002B, 0x9532},
-	{LCD_STEP_CMD_DATA, 0x0003, 0xAAAC},
-	{LCD_STEP_CMD_DATA, 0x000C, 0x0002},
-	{LCD_STEP_CMD_DATA, 0x000D, 0x000A},
-	{LCD_STEP_CMD_DATA, 0x000E, 0x2C00},
-	{LCD_STEP_CMD_DATA, 0x001E, 0x00AA},
-	{LCD_STEP_CMD_DATA, 0x0025, 0x8000},
-	{LCD_STEP_SLEEP, 0, 15},
-	{LCD_STEP_CMD_DATA, 0x0001, 0x2B3F},
-	{LCD_STEP_CMD_DATA, 0x0002, 0x0600},
-	{LCD_STEP_CMD_DATA, 0x0010, 0x0000},
-	{LCD_STEP_CMD_DATA, 0x0011, 0x6030},
-	{LCD_STEP_SLEEP, 0, 20},
-	{LCD_STEP_CMD_DATA, 0x0005, 0x0000},
-	{LCD_STEP_CMD_DATA, 0x0006, 0x0000},
-	{LCD_STEP_CMD_DATA, 0x0016, 0xEF1C},
-	{LCD_STEP_CMD_DATA, 0x0017, 0x0003},
-	{LCD_STEP_CMD_DATA, 0x0007, 0x0233},
-	{LCD_STEP_CMD_DATA, 0x000B, 0x5312},
-	{LCD_STEP_CMD_DATA, 0x000F, 0x0000},
-	{LCD_STEP_SLEEP, 0, 20},
-	{LCD_STEP_CMD_DATA, 0x0041, 0x0000},
-	{LCD_STEP_CMD_DATA, 0x0042, 0x0000},
-	{LCD_STEP_CMD_DATA, 0x0048, 0x0000},
-	{LCD_STEP_CMD_DATA, 0x0049, 0x013F},
-	{LCD_STEP_CMD_DATA, 0x0044, 0xEF00},
-	{LCD_STEP_CMD_DATA, 0x0045, 0x0000},
-	{LCD_STEP_CMD_DATA, 0x0046, 0x013F},
-	{LCD_STEP_CMD_DATA, 0x004A, 0x0000},
-	{LCD_STEP_CMD_DATA, 0x004B, 0x0000},
-	{LCD_STEP_SLEEP, 0, 20},
-	{LCD_STEP_CMD_DATA, 0x0030, 0x0707},
-	{LCD_STEP_CMD_DATA, 0x0031, 0x0704},
-	{LCD_STEP_CMD_DATA, 0x0032, 0x0204},
-	{LCD_STEP_CMD_DATA, 0x0033, 0x0201},
-	{LCD_STEP_CMD_DATA, 0x0034, 0x0203},
-	{LCD_STEP_CMD_DATA, 0x0035, 0x0204},
-	{LCD_STEP_CMD_DATA, 0x0036, 0x0204},
-	{LCD_STEP_CMD_DATA, 0x0037, 0x0502},
-	{LCD_STEP_CMD_DATA, 0x003A, 0x0302},
-	{LCD_STEP_CMD_DATA, 0x003B, 0x0500},
-	{LCD_STEP_SLEEP, 0, 20},
-	{LCD_STEP_CMD_DATA, 0x0044, 239 << 8 | 0},
-	{LCD_STEP_CMD_DATA, 0x0045, 0x0000},
-	{LCD_STEP_CMD_DATA, 0x0046, 319},
-	{LCD_STEP_DONE, 0, 0},
-};
-
-const struct ubicom32lcd_panel tft2n0369ep = {
-	.desc		= "TFT2N0369E-Portrait",
-	.init_seq	= tft2n0369ep_init,
-	.horz_reg	= 0x4e,
-	.vert_reg	= 0x4f,
-	.gram_reg	= 0x22,
-	.xres		= 240,
-	.yres		= 320,
-	.stride		= 240,
-	.id		= 0x8989,
-};
-#endif
-
-#ifdef CONFIG_LCD_UBICOM32_TFT2N0369E_L
-static const struct ubicom32lcd_step tft2n0369e_init[] = {
-	{LCD_STEP_CMD_DATA, 0x0028, 0x0006},
-	{LCD_STEP_CMD_DATA, 0x0000, 0x0001},
-	{LCD_STEP_SLEEP, 0, 15},
-	{LCD_STEP_CMD_DATA, 0x002B, 0x9532},
-	{LCD_STEP_CMD_DATA, 0x0003, 0xAAAC},
-	{LCD_STEP_CMD_DATA, 0x000C, 0x0002},
-	{LCD_STEP_CMD_DATA, 0x000D, 0x000A},
-	{LCD_STEP_CMD_DATA, 0x000E, 0x2C00},
-	{LCD_STEP_CMD_DATA, 0x001E, 0x00AA},
-	{LCD_STEP_CMD_DATA, 0x0025, 0x8000},
-	{LCD_STEP_SLEEP, 0, 15},
-	{LCD_STEP_CMD_DATA, 0x0001, 0x2B3F},
-	{LCD_STEP_CMD_DATA, 0x0002, 0x0600},
-	{LCD_STEP_CMD_DATA, 0x0010, 0x0000},
-	{LCD_STEP_CMD_DATA, 0x0011, 0x60A8},
-	{LCD_STEP_SLEEP, 0, 20},
-	{LCD_STEP_CMD_DATA, 0x0005, 0x0000},
-	{LCD_STEP_CMD_DATA, 0x0006, 0x0000},
-	{LCD_STEP_CMD_DATA, 0x0016, 0xEF1C},
-	{LCD_STEP_CMD_DATA, 0x0017, 0x0003},
-	{LCD_STEP_CMD_DATA, 0x0007, 0x0233},
-	{LCD_STEP_CMD_DATA, 0x000B, 0x5312},
-	{LCD_STEP_CMD_DATA, 0x000F, 0x0000},
-	{LCD_STEP_SLEEP, 0, 20},
-	{LCD_STEP_CMD_DATA, 0x0041, 0x0000},
-	{LCD_STEP_CMD_DATA, 0x0042, 0x0000},
-	{LCD_STEP_CMD_DATA, 0x0048, 0x0000},
-	{LCD_STEP_CMD_DATA, 0x0049, 0x013F},
-	{LCD_STEP_CMD_DATA, 0x0044, 0xEF00},
-	{LCD_STEP_CMD_DATA, 0x0045, 0x0000},
-	{LCD_STEP_CMD_DATA, 0x0046, 0x013F},
-	{LCD_STEP_CMD_DATA, 0x004A, 0x0000},
-	{LCD_STEP_CMD_DATA, 0x004B, 0x0000},
-	{LCD_STEP_SLEEP, 0, 20},
-	{LCD_STEP_CMD_DATA, 0x0030, 0x0707},
-	{LCD_STEP_CMD_DATA, 0x0031, 0x0704},
-	{LCD_STEP_CMD_DATA, 0x0032, 0x0204},
-	{LCD_STEP_CMD_DATA, 0x0033, 0x0201},
-	{LCD_STEP_CMD_DATA, 0x0034, 0x0203},
-	{LCD_STEP_CMD_DATA, 0x0035, 0x0204},
-	{LCD_STEP_CMD_DATA, 0x0036, 0x0204},
-	{LCD_STEP_CMD_DATA, 0x0037, 0x0502},
-	{LCD_STEP_CMD_DATA, 0x003A, 0x0302},
-	{LCD_STEP_CMD_DATA, 0x003B, 0x0500},
-	{LCD_STEP_SLEEP, 0, 20},
-	{LCD_STEP_CMD_DATA, 0x0044, 239 << 8 | 0},
-	{LCD_STEP_CMD_DATA, 0x0045, 0x0000},
-	{LCD_STEP_CMD_DATA, 0x0046, 319},
-	{LCD_STEP_DONE, 0, 0},
-};
-
-const struct ubicom32lcd_panel tft2n0369e = {
-	.desc		= "TFT2N0369E-Landscape",
-	.init_seq	= tft2n0369e_init,
-	.horz_reg	= 0x4e,
-	.vert_reg	= 0x4f,
-	.gram_reg	= 0x22,
-	.xres		= 320,
-	.yres		= 240,
-	.stride		= 320,
-	.id		= 0x8989,
-};
-#endif
-
-#ifdef CONFIG_LCD_UBICOM32_CFAF240400D
-static const struct ubicom32lcd_step cfaf240400d_init[] = {
-	{LCD_STEP_CMD_DATA, 0x0606, 0x0000},	// Pin Control (R606h)		// Page 41 of SPFD5420A Datasheet
-	{LCD_STEP_SLEEP, 0, 50},
-	{LCD_STEP_CMD_DATA, 0x0007, 0x0001},	// Display Control 1 (R007h)	// Page 16 of SPFD5420A Datasheet
-	{LCD_STEP_SLEEP, 0, 50},
-	{LCD_STEP_CMD_DATA, 0x0110, 0x0001},	// Power Control 6(R110h)	// Page 30 of SPFD5420A Datasheet
-	{LCD_STEP_SLEEP, 0, 50},
-	{LCD_STEP_CMD_DATA, 0x0100, 0x17B0},	// Power Control 1 (R100h)	// Page 26 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0101, 0x0147},	// Power Control 2 (R101h)	// Page 27 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0102, 0x019D},	// Power Control 3 (R102h)	// Page 28 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0103, 0x3600},	// Power Control 4 (R103h)	// Page 29 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0281, 0x0010},	// NVM read data 2 (R281h)  	// Page 34 of SPFD5420A Datasheet
-	{LCD_STEP_SLEEP, 0, 50},
-	{LCD_STEP_CMD_DATA, 0x0102, 0x01BD},	// Power Control 3 (R102h)	// Page 28 of SPFD5420A Datasheet
-	{LCD_STEP_SLEEP, 0, 50},
-
-	//--------------- Power control 1~6 ---------------//
-	{LCD_STEP_CMD_DATA, 0x0100, 0x16B0},	// Power Control 1 (R100h)	// Page 26 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0101, 0x0147},	// Power Control 2 (R101h)	// Page 27 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0102, 0x01BD},	// Power Control 3 (R102h)	// Page 28 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0103, 0x2d00},	// Power Control 4 (R103h)	// Page 29 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0107, 0x0000},	// Power Control 5 (R107h)	// Page 30 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0110, 0x0001},	// Power Control 6(R110h)	// Page 30 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0280, 0x0000},	// NVM read data 1 (R280h)	// Page 33 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0281, 0x0006},	// NVM read data 2 (R281h)	// Page 34 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0282, 0x0000},	// NVM read data 3 (R282h)	// Page 34 of SPFD5420A Datasheet
-
-	//------- Gamma 2.2 control (R300h to R30Fh) ------//
-	{LCD_STEP_CMD_DATA, 0x0300, 0x0101},
-	{LCD_STEP_CMD_DATA, 0x0301, 0x0b27},
-	{LCD_STEP_CMD_DATA, 0x0302, 0x132a},
-	{LCD_STEP_CMD_DATA, 0x0303, 0x2a13},
-	{LCD_STEP_CMD_DATA, 0x0304, 0x270b},
-	{LCD_STEP_CMD_DATA, 0x0305, 0x0101},
-	{LCD_STEP_CMD_DATA, 0x0306, 0x1205},
-	{LCD_STEP_CMD_DATA, 0x0307, 0x0512},
-	{LCD_STEP_CMD_DATA, 0x0308, 0x0005},
-	{LCD_STEP_CMD_DATA, 0x0309, 0x0003},
-	{LCD_STEP_CMD_DATA, 0x030A, 0x0f04},
-	{LCD_STEP_CMD_DATA, 0x030B, 0x0f00},
-	{LCD_STEP_CMD_DATA, 0x030C, 0x000f},
-	{LCD_STEP_CMD_DATA, 0x030D, 0x040f},
-	{LCD_STEP_CMD_DATA, 0x030E, 0x0300},
-	{LCD_STEP_CMD_DATA, 0x030F, 0x0500},
-
-	{LCD_STEP_CMD_DATA, 0x0400, 0x3500},	// Base Image Number of Line (R400h)		// Page 36 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0401, 0x0001},	// Base Image Display Control (R401h)		// Page 39 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0404, 0x0000},	// Based Image Vertical Scroll Control (R404h)	// Page 40 of SPFD5420A Datasheet
-
-	//--------------- Normal set ---------------//
-	{LCD_STEP_CMD_DATA, 0x0000, 0x0000},	// ID Read Register (R000h)			// Page 13 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0001, 0x0100},	// Driver Output Control Register (R001h)	// Page 14 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0002, 0x0100},	// LCD Driving Waveform Control (R002h)		// Page 14 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0003, 0x1030},	// Entry Mode (R003h)				// Page 15 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0006, 0x0000},	// Display Control 1 (R007h)			// Page 16 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0008, 0x0808},	// Display Control 2 (R008h)			// Page 17 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0009, 0x0001},	// Display Control 3 (R009h)			// Page 18 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x000B, 0x0010},	// Low Power Control (R00Bh)			// Page 19 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x000C, 0x0000},	// External Display Interface Control 1 (R00Ch)	// Page 19 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x000F, 0x0000},	// External Display Interface Control 2 (R00Fh)	// Page 20 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0007, 0x0001},	// Display Control 1 (R007h)			// Page 16 of SPFD5420A Datasheet
-
-	//--------------- Panel interface control 1~6 ---------------//
-	{LCD_STEP_CMD_DATA, 0x0010, 0x0012},	// Panel Interface Control 1 (R010h)		// Page 20 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0011, 0x0202},	// Panel Interface Control 2 (R011h)		// Page 21 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0012, 0x0300},	// Panel Interface control 3 (R012h)		// Page 22 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0020, 0x021E},	// Panel Interface control 4 (R020h)		// Page 22 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0021, 0x0202},	// Panel Interface Control 5 (021Rh)		// Page 24 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0022, 0x0100},	// Panel Interface Control 6 (R022h)		// Page 25 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0090, 0x8000},	// Frame Marker Control (R090h)			// Page 25 of SPFD5420A Datasheet
-
-	//--------------- Partial display ---------------//
-	{LCD_STEP_CMD_DATA, 0x0210, 0x0000},	// Window Horizontal RAM Address Start (R210h)	// Page 35 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0211, 0x00EF},	// Window Horziontal RAM Address End (R211h)	// Page 35 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0212, 0x0000},	// Window Vertical RAM Address Start (R212h)	// Page 35 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0213, 0x018F},	// Window Vertical RAM Address End (R213h)	// Page 35 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0500, 0x0000},	// Display Position - Partial Display 1 (R500h)	// Page 40 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0501, 0x0000},	// RAM Address Start - Partial Display 1 (R501h)// Page 40 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0502, 0x0000},	// RAM Address End - Partail Display 1 (R502h)	// Page 40 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0503, 0x0000},	// Display Position - Partial Display 2 (R503h)	// Page 40 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0504, 0x0000},	// RAM Address Start . Partial Display 2 (R504h)// Page 41 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0505, 0x0000},	// RAM Address End . Partial Display 2 (R505h)	// Page 41 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0606, 0x0000},	// Pin Control (R606h)				// Page 41 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x06F0, 0x0000},	// NVM Access Control (R6F0h)			// Page 41 of SPFD5420A Datasheet
-	{LCD_STEP_CMD_DATA, 0x0007, 0x0173},	// Display Control 1 (R007h)			// Page 16 of SPFD5420A Datasheet
-	{LCD_STEP_SLEEP, 0, 50},
-	{LCD_STEP_CMD_DATA, 0x0007, 0x0171},	// Display Control 1 (R007h)			// Page 16 of SPFD5420A Datasheet
-	{LCD_STEP_SLEEP, 0, 10},
-	{LCD_STEP_CMD_DATA, 0x0007, 0x0173},	// Display Control 1 (R007h)			// Page 16 of SPFD5420A Datasheet
-	{LCD_STEP_DONE, 0, 0},
-};
-
-const struct ubicom32lcd_panel cfaf240400d = {
-	.desc		= "CFAF240400D",
-	.init_seq	= cfaf240400d_init,
-	.horz_reg	= 0x0200,
-	.vert_reg	= 0x0201,
-	.gram_reg	= 0x0202,
-	.xres		= 240,
-	.yres		= 400,
-	.stride		= 240,
-	.id		= 0x5420,
-};
-#endif
-
-#ifdef CONFIG_LCD_UBICOM32_CFAF240400F
-static const struct ubicom32lcd_step cfaf320240f_init[] = {
-	{LCD_STEP_CMD_DATA, 0x0028, 0x0006},	// VCOM OTP			 	Page 55-56 of SSD2119 datasheet
-	{LCD_STEP_CMD_DATA, 0x0000, 0x0001},	// start Oscillator		 	Page 36 of SSD2119 datasheet
-	{LCD_STEP_CMD_DATA, 0x0010, 0x0000},	// Sleep mode			 	Page 49 of SSD2119 datasheet
-	{LCD_STEP_CMD_DATA, 0x0001, 0x32EF},	// Driver Output Control	 	Page 36-39 of SSD2119 datasheet
-	{LCD_STEP_CMD_DATA, 0x0002, 0x0600},	// LCD Driving Waveform Control	 	Page 40-42 of SSD2119 datasheet
-	{LCD_STEP_CMD_DATA, 0x0003, 0x6A38},	// Power Control 1		 	Page 43-44 of SSD2119 datasheet
-	{LCD_STEP_CMD_DATA, 0x0011, 0x6870},	// Entry Mode			 	Page 50-52 of SSD2119 datasheet
-	{LCD_STEP_CMD_DATA, 0X000F, 0x0000},	// Gate Scan Position		 	Page 49 of SSD2119 datasheet
-	{LCD_STEP_CMD_DATA, 0X000B, 0x5308},	// Frame Cycle Control		 	Page 45 of SSD2119 datasheet
-	{LCD_STEP_CMD_DATA, 0x000C, 0x0003},	// Power Control 2		 	Page 47 of SSD2119 datasheet
-	{LCD_STEP_CMD_DATA, 0x000D, 0x000A},	// Power Control 3		 	Page 48 of SSD2119 datasheet
-	{LCD_STEP_CMD_DATA, 0x000E, 0x2E00},	// Power Control 4		 	Page 48 of SSD2119 datasheet
-	{LCD_STEP_CMD_DATA, 0x001E, 0x00BE},	// Power Control 5		 	Page 53 of SSD2119 datasheet
-	{LCD_STEP_CMD_DATA, 0x0025, 0x8000},	// Frame Frequency Control	 	Page 53 of SSD2119 datasheet
-	{LCD_STEP_CMD_DATA, 0x0026, 0x7800},	// Analog setting		 	Page 54 of SSD2119 datasheet
-	{LCD_STEP_CMD_DATA, 0x004E, 0x0000},	// Ram Address Set		 	Page 58 of SSD2119 datasheet
-	{LCD_STEP_CMD_DATA, 0x004F, 0x0000},	// Ram Address Set		 	Page 58 of SSD2119 datasheet
-	{LCD_STEP_CMD_DATA, 0x0012, 0x08D9},	// Sleep mode			 	Page 49 of SSD2119 datasheet
-
-	// Gamma Control (R30h to R3Bh) -- Page 56 of SSD2119 datasheet
-	{LCD_STEP_CMD_DATA, 0x0030, 0x0000},
-	{LCD_STEP_CMD_DATA, 0x0031, 0x0104},
-	{LCD_STEP_CMD_DATA, 0x0032, 0x0100},
-	{LCD_STEP_CMD_DATA, 0x0033, 0x0305},
-	{LCD_STEP_CMD_DATA, 0x0034, 0x0505},
-	{LCD_STEP_CMD_DATA, 0x0035, 0x0305},
-	{LCD_STEP_CMD_DATA, 0x0036, 0x0707},
-	{LCD_STEP_CMD_DATA, 0x0037, 0x0300},
-	{LCD_STEP_CMD_DATA, 0x003A, 0x1200},
-	{LCD_STEP_CMD_DATA, 0x003B, 0x0800},
-
-	{LCD_STEP_CMD_DATA, 0x0007, 0x0033},	// Display Control 			 Page 45 of SSD2119 datasheet
-
-	{LCD_STEP_CMD_DATA, 0x0044, 0xEF00},	// Vertical RAM address position	 Page 57 of SSD2119 datasheet
-	{LCD_STEP_CMD_DATA, 0x0045, 0x0000},	// Horizontal RAM address position 	 Page 57 of SSD2119 datasheet
-	{LCD_STEP_CMD_DATA, 0x0046, 0x013F},	// Horizontal RAM address position	 Page 57 of SSD2119 datasheet
-
-	{LCD_STEP_SLEEP, 0, 150},
-
-	{LCD_STEP_DONE, 0, 0},
-};
-
-const struct ubicom32lcd_panel cfaf320240f = {
-	.desc		= "CFAF320240F",
-	.init_seq	= cfaf320240f_init,
-	.horz_reg	= 0x4e,
-	.vert_reg	= 0x4f,
-	.gram_reg	= 0x22,
-	.xres		= 320,
-	.yres		= 240,
-	.stride		= 320,
-	.id		= 0x9919,
-};
-#endif
-
-const struct ubicom32lcd_panel *ubicom32lcd_panels[] = {
-#ifdef CONFIG_LCD_UBICOM32_CFAF240400KTTS_180
-	&cfaf240320ktts_180,
-#endif
-#ifdef CONFIG_LCD_UBICOM32_CFAF240400KTTS
-	&cfaf240320ktts_0,
-#endif
-#ifdef CONFIG_LCD_UBICOM32_CFAF240400D
-	&cfaf240400d,
-#endif
-#ifdef CONFIG_LCD_UBICOM32_TFT2N0369E_P
-	&tft2n0369ep,
-#endif
-#ifdef CONFIG_LCD_UBICOM32_TFT2N0369E_L
-	&tft2n0369e,
-#endif
-#ifdef CONFIG_LCD_UBICOM32_CFAF240400F
-	&cfaf320240f,
-#endif
-	NULL,
-};
-
-#endif
diff --git a/target/linux/ubicom32/files/drivers/video/backlight/ubicom32lcdpower.c b/target/linux/ubicom32/files/drivers/video/backlight/ubicom32lcdpower.c
deleted file mode 100644
index 6aeed43bc..000000000
--- a/target/linux/ubicom32/files/drivers/video/backlight/ubicom32lcdpower.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * drivers/video/backlight/ubicom32lcdpowerpower.c
- *	LCD power driver for the Ubicom32 platform
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/lcd.h>
-#include <linux/fb.h>
-#include <linux/gpio.h>
-
-#include <asm/ubicom32lcdpower.h>
-#include <asm/ip5000.h>
-
-#define DRIVER_NAME			"ubicom32lcdpower"
-
-struct ubicom32lcdpower_data {
-	/*
-	 * Pointer to the platform data structure.  Keep this around since we need values
-	 * from it to set the backlight intensity.
-	 */
-	const struct ubicom32lcdpower_platform_data	*pdata;
-
-	/*
-	 * LCD device, we have to save this for use when we remove ourselves.
-	 */
-	struct lcd_device			*lcddev;
-};
-
-/*
- * ubicom32lcdpower_set_power
- */
-static int ubicom32lcdpower_set_power(struct lcd_device *ld, int power)
-{
-	struct ubicom32lcdpower_data *ud = (struct ubicom32lcdpower_data *)lcd_get_data(ld);
-	if (power == FB_BLANK_UNBLANK) {
-		gpio_direction_output(ud->pdata->vgh_gpio, ud->pdata->vgh_polarity);
-		return 0;
-	}
-
-	gpio_direction_output(ud->pdata->vgh_gpio, !ud->pdata->vgh_polarity);
-	return 0;
-}
-
-/*
- * ubicom32lcdpower_get_power
- */
-static int ubicom32lcdpower_get_power(struct lcd_device *ld)
-{
-	struct ubicom32lcdpower_data *ud = (struct ubicom32lcdpower_data *)lcd_get_data(ld);
-	int vgh = gpio_get_value(ud->pdata->vgh_gpio);
-	if ((vgh && ud->pdata->vgh_polarity) || (!vgh && !ud->pdata->vgh_polarity)) {
-		return 1;
-	}
-
-	return 0;
-}
-
-static struct lcd_ops ubicom32lcdpower_ops = {
-	.get_power = ubicom32lcdpower_get_power,
-	.set_power = ubicom32lcdpower_set_power,
-};
-
-/*
- * ubicom32lcdpower_probe
- */
-static int ubicom32lcdpower_probe(struct platform_device *pdev)
-{
-	const struct ubicom32lcdpower_platform_data *pdata = pdev->dev.platform_data;
-	struct ubicom32lcdpower_data *ud;
-	struct lcd_device *lcddev;
-	int retval;
-
-	/*
-	 * Check to see if we have any platform data, if we don't have a LCD to control
-	 */
-	if (!pdata) {
-		return -ENODEV;
-	}
-
-	/*
-	 * Allocate our private data
-	 */
-	ud = kzalloc(sizeof(struct ubicom32lcdpower_data), GFP_KERNEL);
-	if (!ud) {
-		return -ENOMEM;
-	}
-
-	ud->pdata = pdata;
-
-	/*
-	 * Request our GPIOs
-	 */
-	retval = gpio_request(pdata->vgh_gpio, "vgh");
-	if (retval) {
-		dev_err(&pdev->dev, "Failed to allocate vgh GPIO\n");
-		goto fail_gpio;
-	}
-
-	/*
-	 * Register our lcd device
-	 */
-	lcddev = lcd_device_register(DRIVER_NAME, &pdev->dev, ud, &ubicom32lcdpower_ops);
-	if (IS_ERR(lcddev)) {
-		retval = PTR_ERR(lcddev);
-		goto fail;
-	}
-
-	ud->lcddev = lcddev;
-	platform_set_drvdata(pdev, ud);
-
-	ubicom32lcdpower_set_power(lcddev, FB_BLANK_UNBLANK);
-
-	printk(KERN_INFO DRIVER_NAME ": LCD driver started\n");
-
-	return 0;
-
-fail:
-	gpio_free(pdata->vgh_gpio);
-
-fail_gpio:
-	platform_set_drvdata(pdev, NULL);
-	kfree(ud);
-	return retval;
-}
-
-/*
- * ubicom32lcdpower_remove
- */
-static int __exit ubicom32lcdpower_remove(struct platform_device *pdev)
-{
-	struct ubicom32lcdpower_data *ud = platform_get_drvdata(pdev);
-
-	lcd_device_unregister(ud->lcddev);
-	platform_set_drvdata(pdev, NULL);
-	kfree(ud);
-
-	return 0;
-}
-
-static struct platform_driver ubicom32lcdpower_driver = {
-	.driver = {
-		.name = DRIVER_NAME,
-		.owner = THIS_MODULE,
-	},
-
-	.remove = __exit_p(ubicom32lcdpower_remove),
-};
-
-/*
- * ubicom32lcdpower_init
- */
-static int __init ubicom32lcdpower_init(void)
-{
-	return platform_driver_probe(&ubicom32lcdpower_driver, ubicom32lcdpower_probe);
-}
-module_init(ubicom32lcdpower_init);
-
-/*
- * ubicom32lcdpower_exit
- */
-static void __exit ubicom32lcdpower_exit(void)
-{
-	platform_driver_unregister(&ubicom32lcdpower_driver);
-}
-module_exit(ubicom32lcdpower_exit);
-
-MODULE_AUTHOR("Patrick Tjin <@ubicom.com>");
-MODULE_DESCRIPTION("Ubicom32 lcd power driver");
-MODULE_LICENSE("GPL");
diff --git a/target/linux/ubicom32/files/drivers/video/ubicom32fb.c b/target/linux/ubicom32/files/drivers/video/ubicom32fb.c
deleted file mode 100644
index 4193560f7..000000000
--- a/target/linux/ubicom32/files/drivers/video/ubicom32fb.c
+++ /dev/null
@@ -1,779 +0,0 @@
-/*
- * drivers/video/ubicom32fb.c
- *	Ubicom32 frame buffer driver
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-/*
- * This driver was based on skeletonfb.c, Skeleton for a frame buffer device by
- * Geert Uytterhoeven.
- */
-
-#include <linux/device.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/version.h>
-#include <linux/errno.h>
-#include <linux/string.h>
-#include <linux/mm.h>
-#include <linux/fb.h>
-#include <linux/init.h>
-#include <linux/dma-mapping.h>
-#include <linux/platform_device.h>
-#include <linux/device.h>
-#include <linux/uaccess.h>
-#include <linux/interrupt.h>
-
-#include <asm/io.h>
-#include <asm/ip5000.h>
-#include <asm/vdc_tio.h>
-#include <asm/ubicom32fb.h>
-
-#define DRIVER_NAME		"ubicom32fb"
-#define DRIVER_DESCRIPTION	"Ubicom32 frame buffer driver"
-
-#define PALETTE_ENTRIES_NO	16
-
-/*
- * Option variables
- *
- * vram_size:	VRAM size in kilobytes, subject to alignment
- */
-static int vram_size = 0;
-module_param(vram_size, int, 0);
-MODULE_PARM_DESC(vram, "VRAM size, in kilobytes to allocate, should be at least the size of one screen, subject to alignment");
-static int init_value = 0;
-module_param(init_value, int, 0);
-MODULE_PARM_DESC(init, "Initial value of the framebuffer (16-bit number).");
-
-/*
- * fb_fix_screeninfo defines the non-changeable properties of the VDC, depending on what mode it is in.
- */
-static struct fb_fix_screeninfo ubicom32fb_fix = {
-	.id =		"Ubicom32",
-	.type =		FB_TYPE_PACKED_PIXELS,
-	.visual =	FB_VISUAL_TRUECOLOR,
-	.accel =	FB_ACCEL_UBICOM32,
-};
-
-/*
- * Filled in at probe time when we find out what the hardware supports
- */
-static struct fb_var_screeninfo ubicom32fb_var;
-
-/*
- * Private data structure
- */
-struct ubicom32fb_drvdata {
-	struct fb_info			*fbinfo;
-	bool				cmap_alloc;
-
-	/*
-	 * The address of the framebuffer in memory
-	 */
-	void				*fb;
-	void				*fb_aligned;
-
-	/*
-	 * Total size of vram including alignment allowance
-	 */
-	u32				total_vram_size;
-
-	/*
-	 * Interrupt to set when changing registers
-	 */
-	u32				vp_int;
-
-	/*
-	 * Optional: Interrupt used by TIO to signal us
-	 */
-	u32				rx_int;
-
-	/*
-	 * Base address of the regs for VDC_TIO
-	 */
-	volatile struct vdc_tio_vp_regs	*regs;
-
-	/*
-	 * non-zero if we are in yuv mode
-	 */
-	u8_t				is_yuv;
-
-	/*
-	 * Fake palette of 16 colors
-	 */
-	u32				pseudo_palette[PALETTE_ENTRIES_NO];
-
-	/*
-	 * Wait queue and lock used to block when we need to wait
-	 * for something to happen.
-	 */
-	wait_queue_head_t		waitq;
-	struct mutex			lock;
-
-};
-
-/*
- * ubicom32fb_set_next_frame
- *	Sets the next frame buffer to display
- *
- * if sync is TRUE then this function will block until the hardware
- * acknowledges the change
- */
-static inline void ubicom32fb_set_next_frame(struct ubicom32fb_drvdata *ud, void *fb, u8_t sync)
-{
-	ud->regs->next_frame_flags = ud->is_yuv ? VDCTIO_NEXT_FRAME_FLAG_YUV : 0;
-	ud->regs->next_frame = (void *)((u32_t)fb | 1);
-
-	/*
-	 * If we have interrupts, then we can wait on it
-	 */
-	if (ud->rx_int != -1) {
-		DEFINE_WAIT(wait);
-		unsigned long flags;
-
-		spin_lock_irqsave(&ud->lock, flags);
-		prepare_to_wait(&ud->waitq, &wait, TASK_INTERRUPTIBLE);
-		spin_unlock_irqrestore(&ud->lock, flags);
-		schedule();
-		finish_wait(&ud->waitq, &wait);
-		return;
-	}
-
-	/*
-	 * No interrupt, we will just spin here
-	 */
-	while (sync && ((u32_t)ud->regs->next_frame & 1));
-}
-
-/*
- * ubicom32fb_send_command
- *	Sends a command/data pair to the VDC
- */
-static inline void ubicom32fb_send_command(struct ubicom32fb_drvdata *ud, u16 command, u8_t block)
-{
-	ud->regs->command = command;
-	ubicom32_set_interrupt(ud->vp_int);
-	while (block && ud->regs->command);
-}
-
-/*
- * ubicom32fb_ioctl
- *	Handles any ioctls sent to us
- */
-static int ubicom32fb_ioctl(struct fb_info *fbi, unsigned int cmd,
-		       unsigned long arg)
-{
-	struct ubicom32fb_drvdata *ud = (struct ubicom32fb_drvdata *)fbi->par;
-	void __user *argp = (void __user *)arg;
-	int retval = -EFAULT;
-
-	switch (cmd) {
-	case UBICOM32FB_IOCTL_SET_NEXT_FRAME_SYNC:
-		// check alignment, return -EINVAL if necessary
-		ubicom32fb_set_next_frame(ud, argp, 1);
-		retval = 0;
-		break;
-
-	case UBICOM32FB_IOCTL_SET_NEXT_FRAME:
-		// check alignment, return -EINVAL if necessary
-		ubicom32fb_set_next_frame(ud, argp, 0);
-		retval = 0;
-		break;
-
-	case UBICOM32FB_IOCTL_SET_MODE:
-		if (!(ud->regs->caps & VDCTIO_CAPS_SUPPORTS_SCALING)) {
-			break;
-		} else {
-			struct ubicom32fb_mode mode;
-			volatile struct vdc_tio_vp_regs *regs = ud->regs;
-			u32_t flags = 0;
-
-			if (copy_from_user(&mode, argp, sizeof(mode))) {
-				break;
-			}
-
-			regs->x_in = mode.width;
-			regs->y_in = mode.height;
-			regs->x_out = regs->xres;
-			regs->y_out = regs->yres;
-			if (mode.flags & UBICOM32FB_IOCTL_SET_MODE_FLAG_YUV_SCAN_ORDER) {
-				flags |= VDCTIO_SCALE_FLAG_YUV_SCAN_ORDER;
-			}
-			if (mode.flags & UBICOM32FB_IOCTL_SET_MODE_FLAG_YUV_BLOCK_ORDER) {
-				flags |= VDCTIO_SCALE_FLAG_YUV_BLOCK_ORDER;
-			}
-			ud->is_yuv = mode.flags & UBICOM32FB_IOCTL_SET_MODE_FLAG_YUV;
-			if (ud->is_yuv) {
-				flags |= VDCTIO_SCALE_FLAG_YUV;
-			}
-			if (mode.flags & UBICOM32FB_IOCTL_SET_MODE_FLAG_VRANGE_16_255) {
-				flags |= VDCTIO_SCALE_FLAG_VRANGE_16_255;
-			}
-			if (mode.flags & UBICOM32FB_IOCTL_SET_MODE_FLAG_VRANGE_0_255) {
-				flags |= VDCTIO_SCALE_FLAG_VRANGE_0_255;
-			}
-			if (mode.flags & UBICOM32FB_IOCTL_SET_MODE_FLAG_VSUB) {
-				flags |= VDCTIO_SCALE_FLAG_VSUB;
-			}
-			if (mode.flags & UBICOM32FB_IOCTL_SET_MODE_FLAG_HSUB_2_1) {
-				flags |= VDCTIO_SCALE_FLAG_HSUB_2_1;
-			}
-			if (mode.flags & UBICOM32FB_IOCTL_SET_MODE_FLAG_HSUB_1_1) {
-				flags |= VDCTIO_SCALE_FLAG_HSUB_1_1;
-			}
-			if (mode.flags & UBICOM32FB_IOCTL_SET_MODE_FLAG_SCALE_ENABLE) {
-				flags |= VDCTIO_SCALE_FLAG_ENABLE;
-			}
-			if (mode.next_frame) {
-				flags |= VDCTIO_SCALE_FLAG_SET_FRAME_BUFFER;
-				regs->next_frame = mode.next_frame;
-			}
-
-			regs->scale_flags = flags;
-			ubicom32fb_send_command(ud, VDCTIO_COMMAND_SET_SCALE_MODE, 1);
-			retval = 0;
-			break;
-		}
-
-	default:
-		retval = -ENOIOCTLCMD;
-		break;
-	}
-
-	return retval;
-}
-
-/*
- * ubicom32fb_interrupt
- *	Called by the OS when the TIO has set the rx_int
- */
-static irqreturn_t ubicom32fb_interrupt(int vec, void *appdata)
-{
-	struct ubicom32fb_drvdata *ud = (struct ubicom32fb_drvdata *)appdata;
-
-	spin_lock(&ud->lock);
-	if (waitqueue_active(&ud->waitq)) {
-		wake_up(&ud->waitq);
-	}
-	spin_unlock(&ud->lock);
-
-	return IRQ_HANDLED;
-}
-
-/*
- * ubicom32fb_pan_display
- *	Pans the display to a given location.  Supports only y direction panning.
- */
-static int ubicom32fb_pan_display(struct fb_var_screeninfo *var, struct fb_info *fbi)
-{
-	struct ubicom32fb_drvdata *ud = (struct ubicom32fb_drvdata *)fbi->par;
-	void *new_addr;
-
-	/*
-	 * Get the last y line that would be displayed.  Since we don't support YWRAP,
-	 * it must be less than our virtual y size.
-	 */
-	u32 lasty = var->yoffset + var->yres;
-	if (lasty > fbi->var.yres_virtual) {
-		/*
-		 * We would fall off the end of our frame buffer if we panned here.
-		 */
-		return -EINVAL;
-	}
-
-	if (var->xoffset) {
-		/*
-		 * We don't support panning in the x direction
-		 */
-		return -EINVAL;
-	}
-
-	/*
-	 * Everything looks sane, go ahead and pan
-	 *
-	 * We have to calculate a new address for the VDC to look at
-	 */
-	new_addr = ud->fb_aligned + (var->yoffset * fbi->fix.line_length);
-
-	/*
-	 * Send down the command.  The buffer will switch at the next vertical blank
-	 */
-	ubicom32fb_set_next_frame(ud, (void *)new_addr, 0);
-
-	return 0;
-}
-
-/*
- * ubicom32fb_setcolreg
- *	Sets a color in our virtual palette
- */
-static int ubicom32fb_setcolreg(unsigned regno, unsigned red, unsigned green, unsigned blue, unsigned transp, struct fb_info *fbi)
-{
-	u32 *palette = fbi->pseudo_palette;
-
-	if (regno >= PALETTE_ENTRIES_NO) {
-		return -EINVAL;
-	}
-
-	/*
-	 * We only use 8 bits from each color
-	 */
-	red >>= 8;
-	green >>= 8;
-	blue >>= 8;
-
-	/*
-	 * Convert any grayscale values
-	 */
-	if (fbi->var.grayscale) {
-		u16 gray = red + green + blue;
-		gray += (gray >> 2) + (gray >> 3) - (gray >> 7);
-		gray >>= 2;
-		if (gray > 255) {
-			gray = 255;
-		}
-		red = gray;
-		blue = gray;
-		green = gray;
-	}
-
-	palette[regno] = (red << fbi->var.red.offset) | (green << fbi->var.green.offset) |
-			 (blue << fbi->var.blue.offset);
-
-	return 0;
-}
-
-/*
- * ubicom32fb_mmap
- */
-static int ubicom32fb_mmap(struct fb_info *info, struct vm_area_struct *vma)
-{
-	struct ubicom32fb_drvdata *drvdata = (struct ubicom32fb_drvdata *)info->par;
-
-	vma->vm_start = (unsigned long)(drvdata->fb_aligned);
-
-	vma->vm_end = vma->vm_start + info->fix.smem_len;
-
-	/* For those who don't understand how mmap works, go read
-	 *   Documentation/nommu-mmap.txt.
-	 * For those that do, you will know that the VM_MAYSHARE flag
-	 * must be set in the vma->vm_flags structure on noMMU
-	 *   Other flags can be set, and are documented in
-	 *   include/linux/mm.h
-	 */
-
-	vma->vm_flags |=  VM_MAYSHARE | VM_SHARED;
-
-	return 0;
-}
-
-/*
- * ubicom32fb_blank
- */
-static int ubicom32fb_blank(int blank_mode, struct fb_info *fbi)
-{
-	return 0;
-#if 0
-	struct ubicom32fb_drvdata *drvdata = to_ubicom32fb_drvdata(fbi);
-
-	switch (blank_mode) {
-	case FB_BLANK_UNBLANK:
-		/* turn on panel */
-		ubicom32fb_out_be32(drvdata, REG_CTRL, drvdata->reg_ctrl_default);
-		break;
-
-	case FB_BLANK_NORMAL:
-	case FB_BLANK_VSYNC_SUSPEND:
-	case FB_BLANK_HSYNC_SUSPEND:
-	case FB_BLANK_POWERDOWN:
-		/* turn off panel */
-		ubicom32fb_out_be32(drvdata, REG_CTRL, 0);
-	default:
-		break;
-
-	}
-	return 0; /* success */
-#endif
-}
-
-static struct fb_ops ubicom32fb_ops =
-{
-	.owner			= THIS_MODULE,
-	.fb_pan_display		= ubicom32fb_pan_display,
-	.fb_setcolreg		= ubicom32fb_setcolreg,
-	.fb_blank		= ubicom32fb_blank,
-	.fb_mmap		= ubicom32fb_mmap,
-	.fb_ioctl		= ubicom32fb_ioctl,
-	.fb_fillrect		= cfb_fillrect,
-	.fb_copyarea		= cfb_copyarea,
-	.fb_imageblit		= cfb_imageblit,
-};
-
-/*
- * ubicom32fb_release
- */
-static int ubicom32fb_release(struct device *dev)
-{
-	struct ubicom32fb_drvdata *ud = dev_get_drvdata(dev);
-
-#if !defined(CONFIG_FRAMEBUFFER_CONSOLE) && defined(CONFIG_LOGO)
-	//ubicom32fb_blank(VESA_POWERDOWN, &drvdata->info);
-#endif
-
-	unregister_framebuffer(ud->fbinfo);
-
-	if (ud->cmap_alloc) {
-		fb_dealloc_cmap(&ud->fbinfo->cmap);
-	}
-
-	if (ud->fb) {
-		kfree(ud->fb);
-	}
-
-	if (ud->rx_int != -1) {
-		free_irq(ud->rx_int, ud);
-	}
-
-	/*
-	 * Turn off the display
-	 */
-	//ubicom32fb_out_be32(drvdata, REG_CTRL, 0);
-	//iounmap(drvdata->regs);
-
-	framebuffer_release(ud->fbinfo);
-	dev_set_drvdata(dev, NULL);
-
-	return 0;
-}
-
-/*
- * ubicom32fb_platform_probe
- */
-static int __init ubicom32fb_platform_probe(struct platform_device *pdev)
-{
-	struct ubicom32fb_drvdata *ud;
-	struct resource *irq_resource_rx;
-	struct resource *irq_resource_tx;
-	struct resource *mem_resource;
-	struct fb_info *fbinfo;
-	int rc;
-	size_t fbsize;
-	struct device *dev = &pdev->dev;
-	int offset;
-	struct vdc_tio_vp_regs *regs;
-
-	/*
-	 * Get our resources
-	 */
-	irq_resource_tx = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-	if (!irq_resource_tx) {
-		dev_err(dev, "No tx IRQ resource assigned\n");
-		return -ENODEV;
-	}
-
-	irq_resource_rx = platform_get_resource(pdev, IORESOURCE_IRQ, 1);
-	if (!irq_resource_rx) {
-		dev_err(dev, "No rx IRQ resource assigned\n");
-		return -ENODEV;
-	}
-
-	mem_resource = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	if (!mem_resource || !mem_resource->start) {
-		dev_err(dev, "No mem resource assigned\n");
-		return -ENODEV;
-	}
-	regs = (struct vdc_tio_vp_regs *)mem_resource->start;
-	if (regs->version != VDCTIO_VP_VERSION) {
-		dev_err(dev, "VDCTIO is not compatible with this driver tio:%x drv:%x\n",
-			regs->version, VDCTIO_VP_VERSION);
-		return -ENODEV;
-	}
-
-	/*
-	 * This is the minimum VRAM size
-	 */
-	fbsize = regs->xres * regs->yres * (regs->bpp / 8);
-	if (!vram_size) {
-		vram_size = (fbsize + 1023) / 1024;
-	} else {
-		if (fbsize > (vram_size * 1024)) {
-			dev_err(dev, "Not enough VRAM for display, need >= %u bytes\n", fbsize);
-			return -ENOMEM; // should be ebadparam?
-		}
-	}
-
-	/*
-	 * Allocate the framebuffer instance + our private data
-	 */
-	fbinfo = framebuffer_alloc(sizeof(struct ubicom32fb_drvdata), &pdev->dev);
-	if (!fbinfo) {
-		dev_err(dev, "Not enough memory to allocate instance.\n");
-		return -ENOMEM;
-	}
-
-	/*
-	 * Fill in our private data.
-	 */
-	ud = (struct ubicom32fb_drvdata *)fbinfo->par;
-	ud->fbinfo = fbinfo;
-	ud->regs = (struct vdc_tio_vp_regs *)(mem_resource->start);
-	dev_set_drvdata(dev, ud);
-
-	ud->vp_int = irq_resource_tx->start;
-
-	/*
-	 * If we were provided an rx_irq then we need to init the appropriate
-	 * queues, locks, and functions.
-	 */
-	ud->rx_int = -1;
-	if (irq_resource_rx->start != DEVTREE_IRQ_NONE) {
-		init_waitqueue_head(&ud->waitq);
-		mutex_init(&ud->lock);
-		if (request_irq(ud->rx_int, ubicom32fb_interrupt, IRQF_SHARED, "ubicom32fb_rx", ud)) {
-			dev_err(dev, "Couldn't request rx IRQ\n");
-			rc = -ENOMEM;
-			goto fail;
-		}
-		ud->rx_int = irq_resource_rx->start;
-	}
-
-	/*
-	 * Allocate and align the requested amount of VRAM
-	 */
-	ud->total_vram_size = (vram_size * 1024) + regs->fb_align;
-	ud->fb = kmalloc(ud->total_vram_size, GFP_KERNEL);
-	if (ud->fb == NULL) {
-		dev_err(dev, "Couldn't allocate VRAM\n");
-		rc = -ENOMEM;
-		goto fail;
-	}
-
-	offset = (u32_t)ud->fb & (regs->fb_align - 1);
-	if (!offset) {
-		ud->fb_aligned = ud->fb;
-	} else {
-		offset = regs->fb_align - offset;
-		ud->fb_aligned = ud->fb + offset;
-	}
-
-	/*
-	 * Clear the entire frame buffer
-	 */
-	if (!init_value) {
-		memset(ud->fb_aligned, 0, vram_size * 1024);
-	} else {
-		unsigned short *p = ud->fb_aligned;
-		int i;
-		for (i = 0; i < ((vram_size * 1024) / sizeof(u16_t)); i++) {
-			*p++ = init_value;
-		}
-	}
-
-	/*
-	 * Fill in the fb_var_screeninfo structure
-	 */
-	memset(&ubicom32fb_var, 0, sizeof(ubicom32fb_var));
-	ubicom32fb_var.bits_per_pixel = regs->bpp;
-	ubicom32fb_var.red.offset = regs->rshift;
-	ubicom32fb_var.green.offset = regs->gshift;
-	ubicom32fb_var.blue.offset = regs->bshift;
-	ubicom32fb_var.red.length = regs->rbits;
-	ubicom32fb_var.green.length = regs->gbits;
-	ubicom32fb_var.blue.length = regs->bbits;
-	ubicom32fb_var.activate = FB_ACTIVATE_NOW;
-
-#if 0
-	/*
-	 * Turn on the display
-	 */
-	ud->reg_ctrl_default = REG_CTRL_ENABLE;
-	if (regs->rotate_screen)
-		ud->reg_ctrl_default |= REG_CTRL_ROTATE;
-	ubicom32fb_out_be32(ud, REG_CTRL, ud->reg_ctrl_default);
-#endif
-
-	/*
-	 * Fill in the fb_info structure
-	 */
-	ud->fbinfo->device = dev;
-	ud->fbinfo->screen_base = (void *)ud->fb_aligned;
-	ud->fbinfo->fbops = &ubicom32fb_ops;
-	ud->fbinfo->fix = ubicom32fb_fix;
-	ud->fbinfo->fix.smem_start = (u32)ud->fb_aligned;
-	ud->fbinfo->fix.smem_len = vram_size * 1024;
-	ud->fbinfo->fix.line_length = regs->xres * (regs->bpp / 8);
-	ud->fbinfo->fix.mmio_start = (u32)regs;
-	ud->fbinfo->fix.mmio_len = sizeof(struct vdc_tio_vp_regs);
-
-	/*
-	 * We support panning in the y direction only
-	 */
-	ud->fbinfo->fix.xpanstep = 0;
-	ud->fbinfo->fix.ypanstep = 1;
-
-	ud->fbinfo->pseudo_palette = ud->pseudo_palette;
-	ud->fbinfo->flags = FBINFO_DEFAULT;
-	ud->fbinfo->var = ubicom32fb_var;
-	ud->fbinfo->var.xres = regs->xres;
-	ud->fbinfo->var.yres = regs->yres;
-
-	/*
-	 * We cannot pan in the X direction, so xres_virtual is regs->xres
-	 * We can pan in the Y direction, so yres_virtual is vram_size / ud->fbinfo->fix.line_length
-	 */
-	ud->fbinfo->var.xres_virtual = regs->xres;
-	ud->fbinfo->var.yres_virtual = (vram_size * 1024) / ud->fbinfo->fix.line_length;
-
-	//ud->fbinfo->var.height = regs->height_mm;
-	//ud->fbinfo->var.width = regs->width_mm;
-
-	/*
-	 * Allocate a color map
-	 */
-	rc = fb_alloc_cmap(&ud->fbinfo->cmap, PALETTE_ENTRIES_NO, 0);
-	if (rc) {
-		dev_err(dev, "Fail to allocate colormap (%d entries)\n",
-			PALETTE_ENTRIES_NO);
-		goto fail;
-	}
-	ud->cmap_alloc = true;
-
-	/*
-	 * Register new frame buffer
-	 */
-	rc = register_framebuffer(ud->fbinfo);
-	if (rc) {
-		dev_err(dev, "Could not register frame buffer\n");
-		goto fail;
-	}
-
-	/*
-	 * Start up the VDC
-	 */
-	ud->regs->next_frame = ud->fb;
-	ubicom32fb_send_command(ud, VDCTIO_COMMAND_START, 0);
-
-	/*
-	 * Tell the log we are here
-	 */
-	dev_info(dev, "fbaddr=%p align=%p, size=%uKB screen(%ux%u) virt(%ux%u), regs=%p irqtx=%u irqrx=%u\n",
-		ud->fb, ud->fb_aligned, vram_size, ud->fbinfo->var.xres, ud->fbinfo->var.yres,
-		ud->fbinfo->var.xres_virtual, ud->fbinfo->var.yres_virtual, ud->regs,
-		irq_resource_tx->start, irq_resource_rx->start);
-
-	/*
-	 * Success
-	 */
-	return 0;
-
-fail:
-	ubicom32fb_release(dev);
-	return rc;
-}
-
-/*
- * ubicom32fb_platform_remove
- */
-static int ubicom32fb_platform_remove(struct platform_device *pdev)
-{
-	dev_info(&(pdev->dev), "Ubicom32 FB Driver Remove\n");
-	return ubicom32fb_release(&pdev->dev);
-}
-
-static struct platform_driver ubicom32fb_platform_driver = {
-	.probe		= ubicom32fb_platform_probe,
-	.remove		= ubicom32fb_platform_remove,
-	.driver = {
-		.name = DRIVER_NAME,
-		.owner = THIS_MODULE,
-	},
-};
-
-#ifndef MODULE
-/*
- * ubicom32fb_setup
- *	Process kernel boot options
- */
-static int __init ubicom32fb_setup(char *options)
-{
-	char *this_opt;
-
-	if (!options || !*options) {
-		return 0;
-	}
-
-	while ((this_opt = strsep(&options, ",")) != NULL) {
-		if (!*this_opt) {
-			continue;
-		}
-
-		if (!strncmp(this_opt, "init_value=", 10)) {
-			init_value = simple_strtoul(this_opt + 11, NULL, 0);
-			continue;
-		}
-
-		if (!strncmp(this_opt, "vram_size=", 10)) {
-			vram_size = simple_strtoul(this_opt + 10, NULL, 0);
-			continue;
-		}
-	}
-	return 0;
-}
-#endif /* MODULE */
-
-/*
- * ubicom32fb_init
- */
-static int __devinit ubicom32fb_init(void)
-{
-#ifndef MODULE
-	/*
-	 * Get kernel boot options (in 'video=ubicom32fb:<options>')
-	 */
-	char *option = NULL;
-
-	if (fb_get_options(DRIVER_NAME, &option)) {
-		return -ENODEV;
-	}
-	ubicom32fb_setup(option);
-#endif /* MODULE */
-
-	return platform_driver_register(&ubicom32fb_platform_driver);
-}
-module_init(ubicom32fb_init);
-
-/*
- * ubicom32fb_exit
- */
-static void __exit ubicom32fb_exit(void)
-{
-	platform_driver_unregister(&ubicom32fb_platform_driver);
-}
-module_exit(ubicom32fb_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Patrick Tjin <@ubicom.com>");
-MODULE_DESCRIPTION(DRIVER_DESCRIPTION);
diff --git a/target/linux/ubicom32/files/drivers/video/ubicom32plio80.c b/target/linux/ubicom32/files/drivers/video/ubicom32plio80.c
deleted file mode 100644
index 2e13fd707..000000000
--- a/target/linux/ubicom32/files/drivers/video/ubicom32plio80.c
+++ /dev/null
@@ -1,780 +0,0 @@
-/*
- * drivers/video/ubicom32plio80.c
- *	Ubicom32 80 bus PLIO buffer driver
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * This driver was based on skeletonfb.c, Skeleton for a frame buffer device by
- * Geert Uytterhoeven.
- */
-
-#include <linux/device.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/version.h>
-#include <linux/errno.h>
-#include <linux/string.h>
-#include <linux/mm.h>
-#include <linux/fb.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/dma-mapping.h>
-#include <linux/platform_device.h>
-#include <linux/device.h>
-#include <linux/uaccess.h>
-#include <asm/plio.h>
-
-#define DRIVER_NAME		"ubicom32plio80"
-#define DRIVER_DESCRIPTION	"Ubicom32 80 bus PLIO frame buffer driver"
-
-#define PALETTE_ENTRIES_NO	16
-
-/*
- * Option variables
- *
- * vram_size:	VRAM size in kilobytes, subject to alignment
- */
-static int vram_size = 0;
-module_param(vram_size, int, 0);
-MODULE_PARM_DESC(vram_size, "VRAM size, in kilobytes to allocate, should be at least the size of one screen, subject to alignment");
-
-static int xres = 240;
-module_param(xres, int, 0);
-MODULE_PARM_DESC(xres, "x (horizontal) resolution");
-
-static int yres = 320;
-module_param(yres, int, 0);
-MODULE_PARM_DESC(yres, "y (vertical) resolution");
-
-static int bgr = 0;
-module_param(bgr, int, 0);
-MODULE_PARM_DESC(bgr, "display is BGR (Blue is MSB)");
-
-#define BITS_PER_PIXEL	16
-
-/*
- * Buffer alignment, must not be 0
- */
-#define UBICOM32PLIO80_ALIGNMENT 4
-
-/*
- * PLIO FSM
- *	16-bit data bus on port I
- *	CS on EXTCTL[6]
- *	WR on EXTCTL[4]
- */
-static const plio_fctl_t plio_fctl = {
-	.fctl0 = {
-		.ptif_port_mode = PLIO_PORT_MODE_DI,
-		.ptif_portd_cfg = 0,
-		.ptif_porti_cfg = 3,
-		.edif_ds = 6,
-		.edif_cmp_mode = 1,
-		.ecif_extclk_ena = 0, // enable clock output on PD7 table 2.65/p111 says extctl[0]?
-		.icif_clk_src_sel = PLIO_CLK_IO,
-	},
-	.fctl2 = {
-		.icif_eclk_div = 10,
-		.icif_iclk_div = 10,
-	},
-
-	};
-
-	static const plio_config_t plio_config = {
-	.pfsm = {
-		/*
-		 * Table 12.63
-		 */
-		.grpsel[0] = {1,1,1,1,1,1,1,1,1,1},
-
-		/*
-		* Table 12.66 Counter load value
-		*/
-		.cs_lut[0] = {0,0,0,0,0,0,0,0},
-
-		/*
-		 * Table 2.75 PLIO PFSM Configuration Registers
-		 */
-		//                      3     2     1     0
-		.extctl_o_lut[0] = {0x3f, 0x2f, 0x3f, 0x3f},
-		//                      7     6     5     4
-		.extctl_o_lut[1] = {0x3f, 0x3f, 0x3f, 0x2f},
-	},
-	.edif = {
-		.odr_oe = 0xffff,
-	},
-	.ecif = {
-		.output_ena = (1 << 6) | (1 << 4),
-	},
-};
-
-static const u32_t ubicom32plio80_plio_fsm[] = {
-	// 0-F
-	0x00070007, 0x00070007,
-	0x00070007, 0x00070007,
-	0x00070007, 0x00070007,
-	0x00070007, 0x00070007,
-
-	0x16260806, 0x16260806,
-	0x16260806, 0x16260806,
-	0x16260806, 0x16260806,
-	0x16260806, 0x16260806,
-
-	// 10 - 1f
-	0x22061806, 0x22061806,
-	0x22061806, 0x22061806,
-	0x22061806, 0x22061806,
-	0x22061806, 0x22061806,
-
-	0x22061806, 0x22061806,
-	0x22061806, 0x22061806,
-	0x22061806, 0x22061806,
-	0x22061806, 0x22061806,
-
-	// 20 - 2f
-	0x00070806, 0x00070806,
-	0x00070806, 0x00070806,
-	0x00070806, 0x00070806,
-	0x00070806, 0x00070806,
-
-	0x00070806, 0x00070806,
-	0x00070806, 0x00070806,
-	0x00070806, 0x00070806,
-	0x00070806, 0x00070806,
-};
-
-/*
- * fb_fix_screeninfo defines the non-changeable properties of the VDC, depending on what mode it is in.
- */
-static struct fb_fix_screeninfo ubicom32plio80_fix = {
-	.id =		"Ubicom32",
-	.type =		FB_TYPE_PACKED_PIXELS,
-	.visual =	FB_VISUAL_TRUECOLOR,
-	.accel =	FB_ACCEL_UBICOM32_PLIO80,
-};
-
-/*
- * Filled in at probe time when we find out what the hardware supports
- */
-static struct fb_var_screeninfo ubicom32plio80_var;
-
-/*
- * Private data structure
- */
-struct ubicom32plio80_drvdata {
-	struct fb_info			*fbinfo;
-	bool				cmap_alloc;
-
-	/*
-	 * The address of the framebuffer in memory
-	 */
-	void				*fb;
-	void				*fb_aligned;
-
-	/*
-	 * Total size of vram including alignment allowance
-	 */
-	u32				total_vram_size;
-
-	/*
-	 * Fake palette of 16 colors
-	 */
-	u32				pseudo_palette[PALETTE_ENTRIES_NO];
-
-	int				irq_req;
-
-	/*
-	 * Current pointer and bytes left to transfer with the PLIO
-	 */
-	void				*xfer_ptr;
-	u32				bytes_to_xfer;
-	u32				busy;
-};
-
-static struct platform_device *ubicom32plio80_platform_device;
-
-/*
- * ubicom32plio80_isr
- */
-static int ubicom32plio80_isr(int irq, void *appdata)
-{
-	struct ubicom32plio80_drvdata *ud = (struct ubicom32plio80_drvdata *)appdata;
-
-	if (!ud->bytes_to_xfer) {
-		ubicom32_disable_interrupt(TX_FIFO_INT(PLIO_PORT));
-		PLIO_NBR->intmask.txfifo_wm = 0;
-		ud->busy = 0;
-		return IRQ_HANDLED;
-	}
-
-	asm volatile (
-		".rept 8				\n\t"
-		"move.4	(%[fifo]), (%[data])4++		\n\t"
-		".endr					\n\t"
-		: [data] "+a" (ud->xfer_ptr)
-		: [fifo] "a" (&PLIO_NBR->tx_lo)
-	);
-
-	ud->bytes_to_xfer -= 32;
-
-	return IRQ_HANDLED;
-}
-
-/*
- * ubicom32plio80_update
- */
-static void ubicom32plio80_update(struct ubicom32plio80_drvdata *ud, u32 *fb)
-{
-	struct ubicom32_io_port *ri = (struct ubicom32_io_port *)RI;
-	struct ubicom32_io_port *rd = (struct ubicom32_io_port *)RD;
-
-	ud->xfer_ptr = fb;
-	ud->bytes_to_xfer = (xres * yres * 2) - 64;
-	ud->busy = 1;
-
-	ri->gpio_mask = 0;
-	rd->gpio_mask &= ~((1 << 4) | (1 << 2));
-
-	*(u32 *)(&PLIO_NBR->intclr) = ~0;
-	PLIO_NBR->intmask.txfifo_wm = 1;
-	PLIO_NBR->fifo_wm.tx = 8;
-	ubicom32_enable_interrupt(TX_FIFO_INT(PLIO_PORT));
-
-	asm volatile (
-		".rept 16				\n\t"
-		"move.4	(%[fifo]), (%[data])4++		\n\t"
-		".endr					\n\t"
-		: [data] "+a" (ud->xfer_ptr)
-		: [fifo] "a" (&PLIO_NBR->tx_lo)
-	);
-}
-
-/*
- * ubicom32plio80_pan_display
- *	Pans the display to a given location.  Supports only y direction panning.
- */
-static int ubicom32plio80_pan_display(struct fb_var_screeninfo *var, struct fb_info *fbi)
-{
-	struct ubicom32plio80_drvdata *ud = (struct ubicom32plio80_drvdata *)fbi->par;
-	void *new_addr;
-
-	/*
-	 * Get the last y line that would be displayed.  Since we don't support YWRAP,
-	 * it must be less than our virtual y size.
-	 */
-	u32 lasty = var->yoffset + var->yres;
-	if (lasty > fbi->var.yres_virtual) {
-		/*
-		 * We would fall off the end of our frame buffer if we panned here.
-		 */
-		return -EINVAL;
-	}
-
-	if (var->xoffset) {
-		/*
-		 * We don't support panning in the x direction
-		 */
-		return -EINVAL;
-	}
-
-	/*
-	 * Everything looks sane, go ahead and pan
-	 *
-	 * We have to calculate a new address for the VDC to look at
-	 */
-	new_addr = ud->fb_aligned + (var->yoffset * fbi->fix.line_length);
-
-	return 0;
-}
-
-/*
- * ubicom32plio80_setcolreg
- *	Sets a color in our virtual palette
- */
-static int ubicom32plio80_setcolreg(unsigned regno, unsigned red, unsigned green, unsigned blue, unsigned transp, struct fb_info *fbi)
-{
-	u32 *palette = fbi->pseudo_palette;
-
-	if (regno >= PALETTE_ENTRIES_NO) {
-		return -EINVAL;
-	}
-
-	/*
-	 * We only use 8 bits from each color
-	 */
-	red >>= 8;
-	green >>= 8;
-	blue >>= 8;
-
-	/*
-	 * Convert any grayscale values
-	 */
-	if (fbi->var.grayscale) {
-		u16 gray = red + green + blue;
-		gray += (gray >> 2) + (gray >> 3) - (gray >> 7);
-		gray >>= 2;
-		if (gray > 255) {
-			gray = 255;
-		}
-		red = gray;
-		blue = gray;
-		green = gray;
-	}
-
-	palette[regno] = (red << fbi->var.red.offset) | (green << fbi->var.green.offset) |
-			 (blue << fbi->var.blue.offset);
-
-	return 0;
-}
-
-/*
- * ubicom32plio80_mmap
- */
-static int ubicom32plio80_mmap(struct fb_info *info, struct vm_area_struct *vma)
-{
-	struct ubicom32plio80_drvdata *ud = (struct ubicom32plio80_drvdata *)info->par;
-
-	vma->vm_start = (unsigned long)(ud->fb_aligned);
-
-	vma->vm_end = vma->vm_start + info->fix.smem_len;
-
-	/* For those who don't understand how mmap works, go read
-	 *   Documentation/nommu-mmap.txt.
-	 * For those that do, you will know that the VM_MAYSHARE flag
-	 * must be set in the vma->vm_flags structure on noMMU
-	 *   Other flags can be set, and are documented in
-	 *   include/linux/mm.h
-	 */
-
-	vma->vm_flags |=  VM_MAYSHARE | VM_SHARED;
-
-	return 0;
-}
-
-/*
- * ubicom32plio80_check_var
- *	Check the var, tweak it but don't change operational parameters.
- */
-static int ubicom32plio80_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
-{
-	struct ubicom32plio80_drvdata *ud = (struct ubicom32plio80_drvdata *)info->par;
-	u32 line_size = var->xres * (BITS_PER_PIXEL / 8);
-
-	/*
-	 * See if we can handle this bpp
-	 */
-	if (var->bits_per_pixel > BITS_PER_PIXEL) {
-		return -EINVAL;
-	}
-	var->bits_per_pixel = BITS_PER_PIXEL;
-
-	/*
-	 * See if we have enough memory to handle this resolution
-	 */
-	if ((line_size * var->yres * BITS_PER_PIXEL / 8) > ud->total_vram_size) {
-		return -EINVAL;
-	}
-
-	var->xres_virtual = var->xres;
-	var->yres_virtual = ud->total_vram_size / line_size;
-
-	var->red.length = 5;
-	var->green.length = 6;
-	var->green.offset = 5;
-	var->blue.length = 5;
-	var->transp.offset = var->transp.length = 0;
-
-	if (bgr) {
-		var->red.offset = 0;
-		var->blue.offset = 11;
-	} else {
-		var->red.offset = 11;
-		var->blue.offset = 0;
-	}
-
-	var->nonstd = 0;
-	var->height = -1;
-	var->width = -1;
-	var->vmode = FB_VMODE_NONINTERLACED;
-	var->sync = 0;
-
-	return 0;
-}
-
-/*
- * ubicom32plio80_set_par
- *	Set the video mode according to info->var
- */
-static int ubicom32plio80_set_par(struct fb_info *info)
-{
-	/*
-	 * Anything changed?
-	 */
-	if ((xres == info->var.xres) && (yres == info->var.yres)) {
-		return 0;
-	}
-
-	/*
-	 * Implement changes
-	 */
-	xres = info->var.xres;
-	yres = info->var.yres;
-	info->fix.visual = FB_VISUAL_TRUECOLOR;
-	info->fix.xpanstep = 0;
-	info->fix.ypanstep = 1;
-	info->fix.line_length = xres * (BITS_PER_PIXEL / 8);
-
-	return 0;
-}
-
-/*
- * ubicom32plio80_ops
- *	List of supported operations
- */
-static struct fb_ops ubicom32plio80_ops =
-{
-	.owner			= THIS_MODULE,
-	.fb_pan_display		= ubicom32plio80_pan_display,
-	.fb_setcolreg		= ubicom32plio80_setcolreg,
-	.fb_mmap		= ubicom32plio80_mmap,
-	.fb_check_var		= ubicom32plio80_check_var,
-	.fb_set_par		= ubicom32plio80_set_par,
-	.fb_fillrect		= cfb_fillrect,
-	.fb_copyarea		= cfb_copyarea,
-	.fb_imageblit		= cfb_imageblit,
-};
-
-/*
- * ubicom32plio80_release
- */
-static int ubicom32plio80_release(struct device *dev)
-{
-	struct ubicom32plio80_drvdata *ud = dev_get_drvdata(dev);
-
-	unregister_framebuffer(ud->fbinfo);
-
-	if (ud->irq_req) {
-		free_irq(TX_FIFO_INT(PLIO_PORT), ud);
-	}
-	if (ud->cmap_alloc) {
-		fb_dealloc_cmap(&ud->fbinfo->cmap);
-	}
-
-	if (ud->fb) {
-		kfree(ud->fb);
-	}
-
-	framebuffer_release(ud->fbinfo);
-	dev_set_drvdata(dev, NULL);
-
-	return 0;
-}
-
-/*
- * ubicom32plio80_platform_probe
- */
-static int __init ubicom32plio80_platform_probe(struct platform_device *pdev)
-{
-	struct ubicom32plio80_drvdata *ud;
-	struct fb_info *fbinfo;
-	int rc;
-	size_t fbsize;
-	struct device *dev = &pdev->dev;
-	int offset;
-
-	/*
-	 * This is the minimum VRAM size
-	 */
-	fbsize = xres * yres * 2;
-	if (!vram_size) {
-		vram_size = (fbsize + 1023) / 1024;
-	} else {
-		if (fbsize > (vram_size * 1024)) {
-			dev_err(dev, "Not enough VRAM for display, need >= %u bytes\n", fbsize);
-			return -ENOMEM; // should be ebadparam?
-		}
-	}
-
-	/*
-	 * Allocate the framebuffer instance + our private data
-	 */
-	fbinfo = framebuffer_alloc(sizeof(struct ubicom32plio80_drvdata), &pdev->dev);
-	if (!fbinfo) {
-		dev_err(dev, "Not enough memory to allocate instance.\n");
-		return -ENOMEM;
-	}
-
-	/*
-	 * Fill in our private data.
-	 */
-	ud = (struct ubicom32plio80_drvdata *)fbinfo->par;
-	ud->fbinfo = fbinfo;
-	dev_set_drvdata(dev, ud);
-
-	/*
-	 * Allocate and align the requested amount of VRAM
-	 */
-	ud->total_vram_size = (vram_size * 1024) + UBICOM32PLIO80_ALIGNMENT;
-	ud->fb = kmalloc(ud->total_vram_size, GFP_KERNEL);
-	if (ud->fb == NULL) {
-		dev_err(dev, "Couldn't allocate VRAM\n");
-		rc = -ENOMEM;
-		goto fail;
-	}
-
-	offset = (u32_t)ud->fb & (UBICOM32PLIO80_ALIGNMENT - 1);
-	if (!offset) {
-		ud->fb_aligned = ud->fb;
-	} else {
-		offset =  UBICOM32PLIO80_ALIGNMENT - offset;
-		ud->fb_aligned = ud->fb + offset;
-	}
-
-	/*
-	 * Clear the entire frame buffer
-	 */
-	memset(ud->fb_aligned, 0, vram_size * 1024);
-
-	/*
-	 * Fill in the fb_var_screeninfo structure
-	 */
-	memset(&ubicom32plio80_var, 0, sizeof(ubicom32plio80_var));
-	ubicom32plio80_var.bits_per_pixel = BITS_PER_PIXEL;
-	ubicom32plio80_var.red.length = 5;
-	ubicom32plio80_var.green.length = 6;
-	ubicom32plio80_var.green.offset = 5;
-	ubicom32plio80_var.blue.length = 5;
-	ubicom32plio80_var.activate = FB_ACTIVATE_NOW;
-
-	if (bgr) {
-		ubicom32plio80_var.red.offset = 0;
-		ubicom32plio80_var.blue.offset = 11;
-	} else {
-		ubicom32plio80_var.red.offset = 11;
-		ubicom32plio80_var.blue.offset = 0;
-	}
-
-	/*
-	 * Fill in the fb_info structure
-	 */
-	ud->fbinfo->device = dev;
-	ud->fbinfo->screen_base = (void *)ud->fb_aligned;
-	ud->fbinfo->fbops = &ubicom32plio80_ops;
-	ud->fbinfo->fix = ubicom32plio80_fix;
-	ud->fbinfo->fix.smem_start = (u32)ud->fb_aligned;
-	ud->fbinfo->fix.smem_len = vram_size * 1024;
-	ud->fbinfo->fix.line_length = xres * 2;
-	ud->fbinfo->fix.mmio_start = (u32)ud;
-	ud->fbinfo->fix.mmio_len = sizeof(struct ubicom32plio80_drvdata);
-
-	/*
-	 * We support panning in the y direction only
-	 */
-	ud->fbinfo->fix.xpanstep = 0;
-	ud->fbinfo->fix.ypanstep = 1;
-
-	ud->fbinfo->pseudo_palette = ud->pseudo_palette;
-	ud->fbinfo->flags = FBINFO_DEFAULT;
-	ud->fbinfo->var = ubicom32plio80_var;
-	ud->fbinfo->var.xres = xres;
-	ud->fbinfo->var.yres = yres;
-
-	/*
-	 * We cannot pan in the X direction, so xres_virtual is xres
-	 * We can pan in the Y direction, so yres_virtual is vram_size / ud->fbinfo->fix.line_length
-	 */
-	ud->fbinfo->var.xres_virtual = xres;
-	ud->fbinfo->var.yres_virtual = (vram_size * 1024) / ud->fbinfo->fix.line_length;
-
-	/*
-	 * Allocate a color map
-	 */
-	rc = fb_alloc_cmap(&ud->fbinfo->cmap, PALETTE_ENTRIES_NO, 0);
-	if (rc) {
-		dev_err(dev, "Fail to allocate colormap (%d entries)\n",
-			PALETTE_ENTRIES_NO);
-		goto fail;
-	}
-	ud->cmap_alloc = true;
-
-	/*
-	 * Register new frame buffer
-	 */
-	rc = register_framebuffer(ud->fbinfo);
-	if (rc) {
-		dev_err(dev, "Could not register frame buffer\n");
-		goto fail;
-	}
-
-	/*
-	 * request the PLIO IRQ
-	 */
-	rc = request_irq(TX_FIFO_INT(PLIO_PORT), ubicom32plio80_isr, IRQF_DISABLED, "ubicom32plio80", ud);
-	if (rc) {
-		dev_err(dev, "Could not request IRQ\n");
-		goto fail;
-	}
-	ud->irq_req = 1;
-
-	/*
-	 * Clear any garbage out of the TX FIFOs (idif_txfifo_flush)
-	 *
-	 * cast through ubicom32_io_port to make sure the compiler does a word write
-	 */
-	((struct ubicom32_io_port *)PLIO_NBR)->int_set = (1 << 18);
-
-	/*
-	 * Start up the state machine
-	 */
-	plio_init(&plio_fctl, &plio_config, (plio_sram_t *)ubicom32plio80_plio_fsm, sizeof(ubicom32plio80_plio_fsm));
-	PLIO_NBR->fctl0.pfsm_cmd = 0;
-
-	ubicom32plio80_update(ud, ud->fb_aligned);
-
-	/*
-	 * Tell the log we are here
-	 */
-	dev_info(dev, "fbaddr=%p align=%p, size=%uKB screen(%ux%u) virt(%ux%u)\n",
-		ud->fb, ud->fb_aligned, vram_size, ud->fbinfo->var.xres, ud->fbinfo->var.yres,
-		ud->fbinfo->var.xres_virtual, ud->fbinfo->var.yres_virtual);
-
-	/*
-	 * Success
-	 */
-	return 0;
-
-fail:
-	ubicom32plio80_release(dev);
-	return rc;
-}
-
-/*
- * ubicom32plio80_platform_remove
- */
-static int ubicom32plio80_platform_remove(struct platform_device *pdev)
-{
-	dev_info(&(pdev->dev), "Ubicom32 FB Driver Remove\n");
-	return ubicom32plio80_release(&pdev->dev);
-}
-
-static struct platform_driver ubicom32plio80_platform_driver = {
-	.probe		= ubicom32plio80_platform_probe,
-	.remove		= ubicom32plio80_platform_remove,
-	.driver = {
-		.name = DRIVER_NAME,
-		.owner = THIS_MODULE,
-	},
-};
-
-#ifndef MODULE
-/*
- * ubicom32plio80_setup
- *	Process kernel boot options
- */
-static int __init ubicom32plio80_setup(char *options)
-{
-	char *this_opt;
-
-	if (!options || !*options) {
-		return 0;
-	}
-
-	while ((this_opt = strsep(&options, ",")) != NULL) {
-		if (!*this_opt) {
-			continue;
-		}
-
-		if (!strncmp(this_opt, "vram_size=", 10)) {
-			vram_size = simple_strtoul(this_opt + 10, NULL, 0);
-			continue;
-		}
-
-		if (!strncmp(this_opt, "bgr=", 4)) {
-			bgr = simple_strtoul(this_opt + 4, NULL, 0);
-			continue;
-		}
-
-		if (!strncmp(this_opt, "xres=", 5)) {
-			xres = simple_strtoul(this_opt + 5, NULL, 0);
-			continue;
-		}
-
-		if (!strncmp(this_opt, "yres=", 5)) {
-			yres = simple_strtoul(this_opt + 5, NULL, 0);
-			continue;
-		}
-	}
-	return 0;
-}
-#endif /* MODULE */
-
-/*
- * ubicom32plio80_init
- */
-static int __devinit ubicom32plio80_init(void)
-{
-	int ret;
-
-#ifndef MODULE
-	/*
-	 * Get kernel boot options (in 'video=ubicom32plio80:<options>')
-	 */
-	char *option = NULL;
-
-	if (fb_get_options(DRIVER_NAME, &option)) {
-		return -ENODEV;
-	}
-	ubicom32plio80_setup(option);
-#endif /* MODULE */
-
-	ret = platform_driver_register(&ubicom32plio80_platform_driver);
-
-	if (!ret) {
-		ubicom32plio80_platform_device = platform_device_alloc(DRIVER_NAME, 0);
-
-		if (ubicom32plio80_platform_device)
-			ret = platform_device_add(ubicom32plio80_platform_device);
-		else
-			ret = -ENOMEM;
-
-		if (ret) {
-			platform_device_put(ubicom32plio80_platform_device);
-			platform_driver_unregister(&ubicom32plio80_platform_driver);
-		}
-	}
-
-	return ret;
-}
-module_init(ubicom32plio80_init);
-
-/*
- * ubicom32plio80_exit
- */
-static void __exit ubicom32plio80_exit(void)
-{
-	platform_device_unregister(ubicom32plio80_platform_device);
-	platform_driver_unregister(&ubicom32plio80_platform_driver);
-}
-module_exit(ubicom32plio80_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Patrick Tjin <@ubicom.com>");
-MODULE_DESCRIPTION(DRIVER_DESCRIPTION);
diff --git a/target/linux/ubicom32/files/drivers/video/ubicom32vfb.c b/target/linux/ubicom32/files/drivers/video/ubicom32vfb.c
deleted file mode 100644
index 8478273d4..000000000
--- a/target/linux/ubicom32/files/drivers/video/ubicom32vfb.c
+++ /dev/null
@@ -1,603 +0,0 @@
-/*
- * drivers/video/ubicom32vfb.c
- *	Ubicom32 virtual frame buffer driver
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * This driver was based on skeletonfb.c, Skeleton for a frame buffer device by
- * Geert Uytterhoeven.
- */
-
-#include <linux/device.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/version.h>
-#include <linux/errno.h>
-#include <linux/string.h>
-#include <linux/mm.h>
-#include <linux/fb.h>
-#include <linux/init.h>
-#include <linux/dma-mapping.h>
-#include <linux/platform_device.h>
-#include <linux/device.h>
-#include <linux/uaccess.h>
-
-#define DRIVER_NAME		"ubicom32vfb"
-#define DRIVER_DESCRIPTION	"Ubicom32 virtual frame buffer driver"
-
-#define PALETTE_ENTRIES_NO	16
-
-/*
- * Option variables
- *
- * vram_size:	VRAM size in kilobytes, subject to alignment
- */
-static int vram_size = 0;
-module_param(vram_size, int, 0);
-MODULE_PARM_DESC(vram_size, "VRAM size, in kilobytes to allocate, should be at least the size of one screen, subject to alignment");
-
-static int xres = 320;
-module_param(xres, int, 0);
-MODULE_PARM_DESC(xres, "x (horizontal) resolution");
-
-static int yres = 240;
-module_param(yres, int, 0);
-MODULE_PARM_DESC(yres, "y (vertical) resolution");
-
-static int bgr = 0;
-module_param(bgr, int, 0);
-MODULE_PARM_DESC(bgr, "display is BGR (Blue is MSB)");
-
-#define BITS_PER_PIXEL	16
-
-/*
- * Buffer alignment, must not be 0
- */
-#define UBICOM32VFB_ALIGNMENT 4
-
-/*
- * fb_fix_screeninfo defines the non-changeable properties of the VDC, depending on what mode it is in.
- */
-static struct fb_fix_screeninfo ubicom32vfb_fix = {
-	.id =		"Ubicom32",
-	.type =		FB_TYPE_PACKED_PIXELS,
-	.visual =	FB_VISUAL_TRUECOLOR,
-	.accel =	FB_ACCEL_UBICOM32_VFB,
-};
-
-/*
- * Filled in at probe time when we find out what the hardware supports
- */
-static struct fb_var_screeninfo ubicom32vfb_var;
-
-/*
- * Private data structure
- */
-struct ubicom32vfb_drvdata {
-	struct fb_info			*fbinfo;
-	bool				cmap_alloc;
-
-	/*
-	 * The address of the framebuffer in memory
-	 */
-	void				*fb;
-	void				*fb_aligned;
-
-	/*
-	 * Total size of vram including alignment allowance
-	 */
-	u32				total_vram_size;
-
-	/*
-	 * Fake palette of 16 colors
-	 */
-	u32				pseudo_palette[PALETTE_ENTRIES_NO];
-};
-
-static struct platform_device *ubicom32vfb_platform_device;
-
-/*
- * ubicom32vfb_pan_display
- *	Pans the display to a given location.  Supports only y direction panning.
- */
-static int ubicom32vfb_pan_display(struct fb_var_screeninfo *var, struct fb_info *fbi)
-{
-	struct ubicom32vfb_drvdata *ud = (struct ubicom32vfb_drvdata *)fbi->par;
-	void *new_addr;
-
-	/*
-	 * Get the last y line that would be displayed.  Since we don't support YWRAP,
-	 * it must be less than our virtual y size.
-	 */
-	u32 lasty = var->yoffset + var->yres;
-	if (lasty > fbi->var.yres_virtual) {
-		/*
-		 * We would fall off the end of our frame buffer if we panned here.
-		 */
-		return -EINVAL;
-	}
-
-	if (var->xoffset) {
-		/*
-		 * We don't support panning in the x direction
-		 */
-		return -EINVAL;
-	}
-
-	/*
-	 * Everything looks sane, go ahead and pan
-	 *
-	 * We have to calculate a new address for the VDC to look at
-	 */
-	new_addr = ud->fb_aligned + (var->yoffset * fbi->fix.line_length);
-
-	return 0;
-}
-
-/*
- * ubicom32vfb_setcolreg
- *	Sets a color in our virtual palette
- */
-static int ubicom32vfb_setcolreg(unsigned regno, unsigned red, unsigned green, unsigned blue, unsigned transp, struct fb_info *fbi)
-{
-	u32 *palette = fbi->pseudo_palette;
-
-	if (regno >= PALETTE_ENTRIES_NO) {
-		return -EINVAL;
-	}
-
-	/*
-	 * We only use 8 bits from each color
-	 */
-	red >>= 8;
-	green >>= 8;
-	blue >>= 8;
-
-	/*
-	 * Convert any grayscale values
-	 */
-	if (fbi->var.grayscale) {
-		u16 gray = red + green + blue;
-		gray += (gray >> 2) + (gray >> 3) - (gray >> 7);
-		gray >>= 2;
-		if (gray > 255) {
-			gray = 255;
-		}
-		red = gray;
-		blue = gray;
-		green = gray;
-	}
-
-	palette[regno] = (red << fbi->var.red.offset) | (green << fbi->var.green.offset) |
-			 (blue << fbi->var.blue.offset);
-
-	return 0;
-}
-
-/*
- * ubicom32vfb_mmap
- */
-static int ubicom32vfb_mmap(struct fb_info *info, struct vm_area_struct *vma)
-{
-	struct ubicom32vfb_drvdata *ud = (struct ubicom32vfb_drvdata *)info->par;
-
-	vma->vm_start = (unsigned long)(ud->fb_aligned);
-
-	vma->vm_end = vma->vm_start + info->fix.smem_len;
-
-	/* For those who don't understand how mmap works, go read
-	 *   Documentation/nommu-mmap.txt.
-	 * For those that do, you will know that the VM_MAYSHARE flag
-	 * must be set in the vma->vm_flags structure on noMMU
-	 *   Other flags can be set, and are documented in
-	 *   include/linux/mm.h
-	 */
-
-	vma->vm_flags |=  VM_MAYSHARE | VM_SHARED;
-
-	return 0;
-}
-
-/*
- * ubicom32vfb_check_var
- *	Check the var, tweak it but don't change operational parameters.
- */
-static int ubicom32vfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
-{
-	struct ubicom32vfb_drvdata *ud = (struct ubicom32vfb_drvdata *)info->par;
-	u32 line_size = var->xres * (BITS_PER_PIXEL / 8);
-
-	/*
-	 * See if we can handle this bpp
-	 */
-	if (var->bits_per_pixel > BITS_PER_PIXEL) {
-		return -EINVAL;
-	}
-	var->bits_per_pixel = BITS_PER_PIXEL;
-
-	/*
-	 * See if we have enough memory to handle this resolution
-	 */
-	if ((line_size * var->yres * BITS_PER_PIXEL / 8) > ud->total_vram_size) {
-		return -EINVAL;
-	}
-
-	var->xres_virtual = var->xres;
-	var->yres_virtual = ud->total_vram_size / line_size;
-
-	var->red.length = 5;
-	var->green.length = 6;
-	var->green.offset = 5;
-	var->blue.length = 5;
-	var->transp.offset = var->transp.length = 0;
-
-	if (bgr) {
-		var->red.offset = 0;
-		var->blue.offset = 11;
-	} else {
-		var->red.offset = 11;
-		var->blue.offset = 0;
-	}
-
-	var->nonstd = 0;
-	var->height = -1;
-	var->width = -1;
-	var->vmode = FB_VMODE_NONINTERLACED;
-	var->sync = 0;
-
-	return 0;
-}
-
-/*
- * ubicom32vfb_set_par
- *	Set the video mode according to info->var
- */
-static int ubicom32vfb_set_par(struct fb_info *info)
-{
-	/*
-	 * Anything changed?
-	 */
-	if ((xres == info->var.xres) && (yres == info->var.yres)) {
-		return 0;
-	}
-
-	/*
-	 * Implement changes
-	 */
-	xres = info->var.xres;
-	yres = info->var.yres;
-	info->fix.visual = FB_VISUAL_TRUECOLOR;
-	info->fix.xpanstep = 0;
-	info->fix.ypanstep = 1;
-	info->fix.line_length = xres * (BITS_PER_PIXEL / 8);
-
-	return 0;
-}
-
-/*
- * ubicom32vfb_ops
- *	List of supported operations
- */
-static struct fb_ops ubicom32vfb_ops =
-{
-	.owner			= THIS_MODULE,
-	.fb_pan_display		= ubicom32vfb_pan_display,
-	.fb_setcolreg		= ubicom32vfb_setcolreg,
-	.fb_mmap		= ubicom32vfb_mmap,
-	.fb_check_var		= ubicom32vfb_check_var,
-	.fb_set_par		= ubicom32vfb_set_par,
-	.fb_fillrect		= cfb_fillrect,
-	.fb_copyarea		= cfb_copyarea,
-	.fb_imageblit		= cfb_imageblit,
-};
-
-/*
- * ubicom32vfb_release
- */
-static int ubicom32vfb_release(struct device *dev)
-{
-	struct ubicom32vfb_drvdata *ud = dev_get_drvdata(dev);
-
-	unregister_framebuffer(ud->fbinfo);
-
-	if (ud->cmap_alloc) {
-		fb_dealloc_cmap(&ud->fbinfo->cmap);
-	}
-
-	if (ud->fb) {
-		kfree(ud->fb);
-	}
-
-	framebuffer_release(ud->fbinfo);
-	dev_set_drvdata(dev, NULL);
-
-	return 0;
-}
-
-/*
- * ubicom32vfb_platform_probe
- */
-static int __init ubicom32vfb_platform_probe(struct platform_device *pdev)
-{
-	struct ubicom32vfb_drvdata *ud;
-	struct fb_info *fbinfo;
-	int rc;
-	size_t fbsize;
-	struct device *dev = &pdev->dev;
-	int offset;
-
-	/*
-	 * This is the minimum VRAM size
-	 */
-	fbsize = xres * yres * 2;
-	if (!vram_size) {
-		vram_size = (fbsize + 1023) / 1024;
-	} else {
-		if (fbsize > (vram_size * 1024)) {
-			dev_err(dev, "Not enough VRAM for display, need >= %u bytes\n", fbsize);
-			return -ENOMEM; // should be ebadparam?
-		}
-	}
-
-	/*
-	 * Allocate the framebuffer instance + our private data
-	 */
-	fbinfo = framebuffer_alloc(sizeof(struct ubicom32vfb_drvdata), &pdev->dev);
-	if (!fbinfo) {
-		dev_err(dev, "Not enough memory to allocate instance.\n");
-		return -ENOMEM;
-	}
-
-	/*
-	 * Fill in our private data.
-	 */
-	ud = (struct ubicom32vfb_drvdata *)fbinfo->par;
-	ud->fbinfo = fbinfo;
-	dev_set_drvdata(dev, ud);
-
-	/*
-	 * Allocate and align the requested amount of VRAM
-	 */
-	ud->total_vram_size = (vram_size * 1024) + UBICOM32VFB_ALIGNMENT;
-	ud->fb = kmalloc(ud->total_vram_size, GFP_KERNEL);
-	if (ud->fb == NULL) {
-		dev_err(dev, "Couldn't allocate VRAM\n");
-		rc = -ENOMEM;
-		goto fail;
-	}
-
-	offset = (u32_t)ud->fb & (UBICOM32VFB_ALIGNMENT - 1);
-	if (!offset) {
-		ud->fb_aligned = ud->fb;
-	} else {
-		offset =  UBICOM32VFB_ALIGNMENT - offset;
-		ud->fb_aligned = ud->fb + offset;
-	}
-
-	/*
-	 * Clear the entire frame buffer
-	 */
-	memset(ud->fb_aligned, 0, vram_size * 1024);
-
-	/*
-	 * Fill in the fb_var_screeninfo structure
-	 */
-	memset(&ubicom32vfb_var, 0, sizeof(ubicom32vfb_var));
-	ubicom32vfb_var.bits_per_pixel = BITS_PER_PIXEL;
-	ubicom32vfb_var.red.length = 5;
-	ubicom32vfb_var.green.length = 6;
-	ubicom32vfb_var.green.offset = 5;
-	ubicom32vfb_var.blue.length = 5;
-	ubicom32vfb_var.activate = FB_ACTIVATE_NOW;
-
-	if (bgr) {
-		ubicom32vfb_var.red.offset = 0;
-		ubicom32vfb_var.blue.offset = 11;
-	} else {
-		ubicom32vfb_var.red.offset = 11;
-		ubicom32vfb_var.blue.offset = 0;
-	}
-
-	/*
-	 * Fill in the fb_info structure
-	 */
-	ud->fbinfo->device = dev;
-	ud->fbinfo->screen_base = (void *)ud->fb_aligned;
-	ud->fbinfo->fbops = &ubicom32vfb_ops;
-	ud->fbinfo->fix = ubicom32vfb_fix;
-	ud->fbinfo->fix.smem_start = (u32)ud->fb_aligned;
-	ud->fbinfo->fix.smem_len = vram_size * 1024;
-	ud->fbinfo->fix.line_length = xres * 2;
-	ud->fbinfo->fix.mmio_start = (u32)ud;
-	ud->fbinfo->fix.mmio_len = sizeof(struct ubicom32vfb_drvdata);
-
-	/*
-	 * We support panning in the y direction only
-	 */
-	ud->fbinfo->fix.xpanstep = 0;
-	ud->fbinfo->fix.ypanstep = 1;
-
-	ud->fbinfo->pseudo_palette = ud->pseudo_palette;
-	ud->fbinfo->flags = FBINFO_DEFAULT;
-	ud->fbinfo->var = ubicom32vfb_var;
-	ud->fbinfo->var.xres = xres;
-	ud->fbinfo->var.yres = yres;
-
-	/*
-	 * We cannot pan in the X direction, so xres_virtual is xres
-	 * We can pan in the Y direction, so yres_virtual is vram_size / ud->fbinfo->fix.line_length
-	 */
-	ud->fbinfo->var.xres_virtual = xres;
-	ud->fbinfo->var.yres_virtual = (vram_size * 1024) / ud->fbinfo->fix.line_length;
-
-	/*
-	 * Allocate a color map
-	 */
-	rc = fb_alloc_cmap(&ud->fbinfo->cmap, PALETTE_ENTRIES_NO, 0);
-	if (rc) {
-		dev_err(dev, "Fail to allocate colormap (%d entries)\n",
-			PALETTE_ENTRIES_NO);
-		goto fail;
-	}
-	ud->cmap_alloc = true;
-
-	/*
-	 * Register new frame buffer
-	 */
-	rc = register_framebuffer(ud->fbinfo);
-	if (rc) {
-		dev_err(dev, "Could not register frame buffer\n");
-		goto fail;
-	}
-
-	/*
-	 * Tell the log we are here
-	 */
-	dev_info(dev, "fbaddr=%p align=%p, size=%uKB screen(%ux%u) virt(%ux%u)\n",
-		ud->fb, ud->fb_aligned, vram_size, ud->fbinfo->var.xres, ud->fbinfo->var.yres,
-		ud->fbinfo->var.xres_virtual, ud->fbinfo->var.yres_virtual);
-
-	/*
-	 * Success
-	 */
-	return 0;
-
-fail:
-	ubicom32vfb_release(dev);
-	return rc;
-}
-
-/*
- * ubicom32vfb_platform_remove
- */
-static int ubicom32vfb_platform_remove(struct platform_device *pdev)
-{
-	dev_info(&(pdev->dev), "Ubicom32 FB Driver Remove\n");
-	return ubicom32vfb_release(&pdev->dev);
-}
-
-static struct platform_driver ubicom32vfb_platform_driver = {
-	.probe		= ubicom32vfb_platform_probe,
-	.remove		= ubicom32vfb_platform_remove,
-	.driver = {
-		.name = DRIVER_NAME,
-		.owner = THIS_MODULE,
-	},
-};
-
-#ifndef MODULE
-/*
- * ubicom32vfb_setup
- *	Process kernel boot options
- */
-static int __init ubicom32vfb_setup(char *options)
-{
-	char *this_opt;
-
-	if (!options || !*options) {
-		return 0;
-	}
-
-	while ((this_opt = strsep(&options, ",")) != NULL) {
-		if (!*this_opt) {
-			continue;
-		}
-
-		if (!strncmp(this_opt, "vram_size=", 10)) {
-			vram_size = simple_strtoul(this_opt + 10, NULL, 0);
-			continue;
-		}
-
-		if (!strncmp(this_opt, "bgr=", 4)) {
-			bgr = simple_strtoul(this_opt + 4, NULL, 0);
-			continue;
-		}
-
-		if (!strncmp(this_opt, "xres=", 5)) {
-			xres = simple_strtoul(this_opt + 5, NULL, 0);
-			continue;
-		}
-
-		if (!strncmp(this_opt, "yres=", 5)) {
-			yres = simple_strtoul(this_opt + 5, NULL, 0);
-			continue;
-		}
-	}
-	return 0;
-}
-#endif /* MODULE */
-
-/*
- * ubicom32vfb_init
- */
-static int __devinit ubicom32vfb_init(void)
-{
-	int ret;
-
-#ifndef MODULE
-	/*
-	 * Get kernel boot options (in 'video=ubicom32vfb:<options>')
-	 */
-	char *option = NULL;
-
-	if (fb_get_options(DRIVER_NAME, &option)) {
-		return -ENODEV;
-	}
-	ubicom32vfb_setup(option);
-#endif /* MODULE */
-
-	ret = platform_driver_register(&ubicom32vfb_platform_driver);
-
-#ifdef CONFIG_FB_UBICOM32_VIRTUAL_NOAUTO
-	return ret;
-#else
-	if (!ret) {
-		ubicom32vfb_platform_device = platform_device_alloc(DRIVER_NAME, 0);
-
-		if (ubicom32vfb_platform_device)
-			ret = platform_device_add(ubicom32vfb_platform_device);
-		else
-			ret = -ENOMEM;
-
-		if (ret) {
-			platform_device_put(ubicom32vfb_platform_device);
-			platform_driver_unregister(&ubicom32vfb_platform_driver);
-		}
-	}
-
-	return ret;
-#endif
-}
-module_init(ubicom32vfb_init);
-
-/*
- * ubicom32vfb_exit
- */
-static void __exit ubicom32vfb_exit(void)
-{
-	platform_device_unregister(ubicom32vfb_platform_device);
-	platform_driver_unregister(&ubicom32vfb_platform_driver);
-}
-module_exit(ubicom32vfb_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Patrick Tjin <@ubicom.com>");
-MODULE_DESCRIPTION(DRIVER_DESCRIPTION);
diff --git a/target/linux/ubicom32/files/drivers/watchdog/ubi32_wdt.c b/target/linux/ubicom32/files/drivers/watchdog/ubi32_wdt.c
deleted file mode 100644
index 2c5b92187..000000000
--- a/target/linux/ubicom32/files/drivers/watchdog/ubi32_wdt.c
+++ /dev/null
@@ -1,630 +0,0 @@
-/*
- * drivers/watchdog/ubi32_wdt.c
- *   Ubicom32 Watchdog Driver
- *
- * Originally based on softdog.c
- * Copyright 2006-2007 Analog Devices Inc.
- * Copyright 2006-2007 Michele d'Amico
- * Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-#include <linux/platform_device.h>
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/types.h>
-#include <linux/timer.h>
-#include <linux/miscdevice.h>
-#include <linux/watchdog.h>
-#include <linux/fs.h>
-#include <linux/notifier.h>
-#include <linux/reboot.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/uaccess.h>
-#include <asm/ip5000.h>
-
-#define WATCHDOG_NAME "ubi32-wdt"
-#define PFX WATCHDOG_NAME ": "
-
-#define OSC1_FREQ 12000000
-#define WATCHDOG_SEC_TO_CYC(x) (OSC1_FREQ * (x))
-#define WATCHDOG_MAX_SEC (0xffffffff / OSC1_FREQ)
-
-#define MIN_PROCESSOR_ADDRESS 0x03000000
-
-static DEFINE_SPINLOCK(ubi32_wdt_spinlock);
-
-#define WATCHDOG_TIMEOUT 20
-
-#if defined(CONFIG_WATCHDOG_NOWAYOUT)
-#define WATCHDOG_NOWAYOUT 1
-#else
-#define WATCHDOG_NOWAYOUT 0
-#endif
-
-static unsigned int timeout = WATCHDOG_TIMEOUT;
-static int nowayout = WATCHDOG_NOWAYOUT;
-static struct watchdog_info ubi32_wdt_info;
-static unsigned long open_check;
-static char expect_close;
-
-#if !defined(CONFIG_SMP)
-#define UBI32_WDT_LOCK(lock, flags) local_irq_save(flags)
-#define UBI32_WDT_UNLOCK(lock, flags) local_irq_restore(flags)
-#define UBI32_WDT_LOCK_CHECK()
-#else
-#define UBI32_WDT_LOCK(lock, flags) spin_lock_irqsave((lock), (flags));
-#define UBI32_WDT_UNLOCK(lock, flags) spin_unlock_irqrestore((lock), (flags));
-#define UBI32_WDT_LOCK_CHECK() BUG_ON(!spin_is_locked(&ubi32_wdt_spinlock));
-#endif
-
-/*
- * ubi32_wdt_remaining()
- * 	Return the approximate number of seconds remaining
- */
-static int ubi32_wdt_remaining(void)
-{
-	int compare;
-	int curr;
-
-	UBI32_WDT_LOCK_CHECK();
-
-	ubicom32_write_reg(&UBICOM32_IO_TIMER->tkey, TIMER_TKEYVAL);
-	compare = ubicom32_read_reg(&UBICOM32_IO_TIMER->wdcom);
-	curr = ubicom32_read_reg(&UBICOM32_IO_TIMER->mptval);
-	ubicom32_write_reg(&UBICOM32_IO_TIMER->tkey, 0);
-	return (compare - curr) / OSC1_FREQ;
-
-}
-
-/*
- * ubi32_wdt_keepalive()
- *	Keep the Userspace Watchdog Alive
- *
- * The Userspace watchdog got a KeepAlive: schedule the next timeout.
- */
-static int ubi32_wdt_keepalive(void)
-{
-	UBI32_WDT_LOCK_CHECK();
-	ubicom32_write_reg(&UBICOM32_IO_TIMER->tkey, TIMER_TKEYVAL);
-	ubicom32_write_reg(&UBICOM32_IO_TIMER->wdcom,
-			ubicom32_read_reg(&UBICOM32_IO_TIMER->mptval)
-			+ WATCHDOG_SEC_TO_CYC(timeout));
-	ubicom32_write_reg(&UBICOM32_IO_TIMER->tkey, 0);
-	return 0;
-}
-
-/*
- * ubi32_wdt_stop()
- *	Stop the on-chip Watchdog
- */
-static int ubi32_wdt_stop(void)
-{
-	UBI32_WDT_LOCK_CHECK();
-	ubicom32_write_reg(&UBICOM32_IO_TIMER->tkey, TIMER_TKEYVAL);
-	ubicom32_write_reg(&UBICOM32_IO_TIMER->wdcfg, TIMER_WATCHDOG_DISABLE);
-	ubicom32_write_reg(&UBICOM32_IO_TIMER->tkey, 0);
-	return 0;
-}
-
-/*
- * ubi32_wdt_start()
- *	Start the on-chip Watchdog
- */
-static int ubi32_wdt_start(void)
-{
-	UBI32_WDT_LOCK_CHECK();
-	ubicom32_write_reg(&UBICOM32_IO_TIMER->tkey, TIMER_TKEYVAL);
-	ubicom32_write_reg(&UBICOM32_IO_TIMER->wdcom,
-			ubicom32_read_reg(&UBICOM32_IO_TIMER->mptval)
-			+ WATCHDOG_SEC_TO_CYC(timeout));
-	ubicom32_write_reg(&UBICOM32_IO_TIMER->wdcfg, ~TIMER_WATCHDOG_DISABLE);
-	ubicom32_write_reg(&UBICOM32_IO_TIMER->tkey, 0);
-	return 0;
-}
-
-/*
- * ubi32_wdt_running()
- * 	Return true if the watchdog is configured
- */
-static int ubi32_wdt_running(void)
-{
-	int enabled;
-
-	UBI32_WDT_LOCK_CHECK();
-	ubicom32_write_reg(&UBICOM32_IO_TIMER->tkey, TIMER_TKEYVAL);
-	enabled = ubicom32_read_reg(&UBICOM32_IO_TIMER->wdcfg) == ~TIMER_WATCHDOG_DISABLE;
-	ubicom32_write_reg(&UBICOM32_IO_TIMER->tkey, 0);
-	return enabled;
-}
-
-/*
- * ubi32_wdt_set_timeout()
- *	Set the Userspace Watchdog timeout
- *
- * - @t: new timeout value (in seconds)
- */
-static int ubi32_wdt_set_timeout(unsigned long t)
-{
-	UBI32_WDT_LOCK_CHECK();
-
-	if (t > WATCHDOG_MAX_SEC) {
-		printk(KERN_WARNING PFX "request to large: %ld [1-%d] sec)\n", t, WATCHDOG_MAX_SEC);
-		return -EINVAL;
-	}
-
-	/*
-	 * If we are running, then reset the time value so
-	 * that the new value has an immediate effect.
-	 */
-	timeout = t;
-	if (ubi32_wdt_running()) {
-		ubi32_wdt_keepalive();
-	}
-	return 0;
-}
-
-/*
- * ubi32_wdt_open()
- *	Open the Device
- */
-static int ubi32_wdt_open(struct inode *inode, struct file *file)
-{
-	unsigned long flags;
-
-	if (test_and_set_bit(0, &open_check))
-		return -EBUSY;
-
-	if (nowayout)
-		__module_get(THIS_MODULE);
-
-	spin_lock_irqsave(&ubi32_wdt_spinlock, flags);
-	ubi32_wdt_start();
-	spin_unlock_irqrestore(&ubi32_wdt_spinlock, flags);
-
-	return nonseekable_open(inode, file);
-}
-
-/*
- * ubi32_wdt_close()
- *	Close the Device
- */
-static int ubi32_wdt_release(struct inode *inode, struct file *file)
-{
-	unsigned long flags;
-
-	/*
-	 * If we don't expect a close, then the watchdog continues
-	 * even though the device is closed.  The caller will have
-	 * a full timeout value to reopen the device and continue
-	 * stroking it.
-	 */
-	if (expect_close != 42) {
-		printk(KERN_CRIT PFX
-			"Unexpected close, not stopping watchdog!\n");
-		spin_lock_irqsave(&ubi32_wdt_spinlock, flags);
-		ubi32_wdt_keepalive();
-		spin_unlock_irqrestore(&ubi32_wdt_spinlock, flags);
-	} else {
-		spin_lock_irqsave(&ubi32_wdt_spinlock, flags);
-		ubi32_wdt_stop();
-		spin_unlock_irqrestore(&ubi32_wdt_spinlock, flags);
-	}
-
-	expect_close = 0;
-	clear_bit(0, &open_check);
-	return 0;
-}
-
-/*
- * ubi32_wdt_write()
- *	Write to Device
- *
- * If the user writes nothing, nothing happens.
- * If the user writes a V, then we expect a close and allow a release.
- * If the user writes anything else, it is ignored.
- */
-static ssize_t ubi32_wdt_write(struct file *file, const char __user *data,
-						size_t len, loff_t *ppos)
-{
-	size_t i;
-	unsigned long flags;
-
-	/*
-	 * Every write resets the expect_close.  The last write
-	 * must be a V to allow shutdown on close.
-	 */
-	expect_close = 0;
-
-	/*
-	 * Empty writes still ping.
-	 */
-	if (!len) {
-		goto ping;
-	}
-
-	/*
-	 * If nowayout is set, it does not matter if the caller
-	 * is trying to send the magic 'V' we will not allow a
-	 * close to stop us.
-	 */
-	if (nowayout) {
-		goto ping;
-	}
-
-	/*
-	 * See if the program wrote a 'V' and if so disable
-	 * the watchdog on release.
-	 */
-	for (i = 0; i < len; i++) {
-		char c;
-		if (get_user(c, data + i)) {
-			return -EFAULT;
-		}
-
-		if (c == 'V') {
-			expect_close = 42;
-		}
-	}
-
-ping:
-	spin_lock_irqsave(&ubi32_wdt_spinlock, flags);
-	ubi32_wdt_keepalive();
-	spin_unlock_irqrestore(&ubi32_wdt_spinlock, flags);
-	return len;
-}
-
-/*
- * ubi32_wdt_ioctl()
- *	Query the watchdog device.
- *
- * Query basic information from the device or ping it, as outlined by the
- * watchdog API.
- */
-static long ubi32_wdt_ioctl(struct file *file,
-				unsigned int cmd, unsigned long arg)
-{
-	void __user *argp = (void __user *)arg;
-	int __user *p = argp;
-
-	switch (cmd) {
-	case WDIOC_GETSUPPORT:
-		if (copy_to_user(argp, &ubi32_wdt_info, sizeof(ubi32_wdt_info))) {
-			return -EFAULT;
-		}
-		return 0;
-
-	case WDIOC_GETSTATUS: {
-		unsigned long flags;
-		int running;
-
-		spin_lock_irqsave(&ubi32_wdt_spinlock, flags);
-		running = ubi32_wdt_running();
-		spin_unlock_irqrestore(&ubi32_wdt_spinlock, flags);
-		return running;
-	}
-
-	case WDIOC_GETBOOTSTATUS:
-		return ubicom32_get_reset_reason();
-
-	case WDIOC_SETOPTIONS: {
-		unsigned long flags;
-		int options, ret = -EINVAL;
-
-		/*
-		 * The sample application does not pass a pointer
-		 * but directly passes a value of 1 or 2; however
-		 * all of the implementations (and thus probably
-		 * the real applications) pass a pointer to a value.
-		 *
-		 * It should be noted that  WDIOC_SETOPTIONS is defined as
-		 * _IOR(WATCHDOG_IOCTL_BASE, 4, int), which means
-		 * that it should be an int and NOT a pointer.
-		 *
-		 * TODO: Examine this code for future chips.
-		 * TODO: Report the sample code defect.
-		 */
-		if ((int)p < MIN_PROCESSOR_ADDRESS) {
-			options = (int)p;
-		} else {
-			if (get_user(options, p))
-			return -EFAULT;
-		}
-
-		spin_lock_irqsave(&ubi32_wdt_spinlock, flags);
-		if (options & WDIOS_DISABLECARD) {
-			ubi32_wdt_stop();
-			ret = 0;
-		}
-		if (options & WDIOS_ENABLECARD) {
-			ubi32_wdt_start();
-			ret = 0;
-		}
-		spin_unlock_irqrestore(&ubi32_wdt_spinlock, flags);
-		return ret;
-	}
-
-	case WDIOC_KEEPALIVE: {
-		unsigned long flags;
-
-		spin_lock_irqsave(&ubi32_wdt_spinlock, flags);
-		ubi32_wdt_keepalive();
-		spin_unlock_irqrestore(&ubi32_wdt_spinlock, flags);
-		return 0;
-	}
-
-	case WDIOC_SETTIMEOUT: {
-		int new_timeout;
-		unsigned long flags;
-		int ret  = 0;
-
-		if (get_user(new_timeout, p))
-			return -EFAULT;
-
-		spin_lock_irqsave(&ubi32_wdt_spinlock, flags);
-		ret = ubi32_wdt_set_timeout(new_timeout);
-		spin_unlock_irqrestore(&ubi32_wdt_spinlock, flags);
-		return ret;
-
-	}
-
-	case WDIOC_GETTIMEOUT:
-		return put_user(timeout, p);
-
-	case WDIOC_GETTIMELEFT: {
-		unsigned long flags;
-		int remaining = 0;
-
-		spin_lock_irqsave(&ubi32_wdt_spinlock, flags);
-		remaining = ubi32_wdt_remaining();
-		spin_unlock_irqrestore(&ubi32_wdt_spinlock, flags);
-		return put_user(remaining, p);
-	}
-
-	default:
-		return -ENOTTY;
-	}
-}
-
-/*
- * ubi32_wdt_notify_sys()
- *	Notification callback function for system events.
- *
- * Turn off the watchdog during a SYS_DOWN or SYS_HALT.
- */
-static int ubi32_wdt_notify_sys(struct notifier_block *this,
-					unsigned long code, void *unused)
-{
-	if (code == SYS_DOWN || code == SYS_HALT) {
-		unsigned long flags;
-
-		spin_lock_irqsave(&ubi32_wdt_spinlock, flags);
-		ubi32_wdt_stop();
-		spin_unlock_irqrestore(&ubi32_wdt_spinlock, flags);
-	}
-
-	return NOTIFY_DONE;
-}
-
-#ifdef CONFIG_PM
-static int state_before_suspend;
-
-/*
- * ubi32_wdt_suspend()
- * 	suspend the watchdog
- *
- * Remember if the watchdog was running and stop it.
- */
-static int ubi32_wdt_suspend(struct platform_device *pdev, pm_message_t state)
-{
-	unsigned long flags;
-	spin_lock_irqsave(&ubi32_wdt_spinlock, flags);
-	state_before_suspend = ubi32_wdt_running();
-	ubi32_wdt_stop();
-	spin_unlock_irqrestore(&ubi32_wdt_spinlock, flags);
-
-	return 0;
-}
-
-/*
- * ubi32_wdt_resume()
- * 	Resume the watchdog
- *
- * If the watchdog was running, turn it back on.
- */
-static int ubi32_wdt_resume(struct platform_device *pdev)
-{
-	if (state_before_suspend) {
-		unsigned long flags;
-		spin_lock_irqsave(&ubi32_wdt_spinlock, flags);
-		ubi32_wdt_set_timeout(timeout);
-		ubi32_wdt_start();
-		spin_unlock_irqrestore(&ubi32_wdt_spinlock, flags);
-	}
-
-	return 0;
-}
-#else
-# define ubi32_wdt_suspend NULL
-# define ubi32_wdt_resume NULL
-#endif
-
-static const struct file_operations ubi32_wdt_fops = {
-	.owner		= THIS_MODULE,
-	.llseek		= no_llseek,
-	.write    	= ubi32_wdt_write,
-	.unlocked_ioctl	= ubi32_wdt_ioctl,
-	.open		= ubi32_wdt_open,
-	.release	= ubi32_wdt_release,
-};
-
-static struct miscdevice ubi32_wdt_miscdev = {
-	.minor    = WATCHDOG_MINOR,
-	.name     = "watchdog",
-	.fops     = &ubi32_wdt_fops,
-};
-
-static struct watchdog_info ubi32_wdt_info = {
-	.identity = "Ubicom32 Watchdog",
-	.options  = WDIOF_SETTIMEOUT |
-		    WDIOF_KEEPALIVEPING |
-		    WDIOF_MAGICCLOSE,
-};
-
-static struct notifier_block ubi32_wdt_notifier = {
-	.notifier_call = ubi32_wdt_notify_sys,
-};
-
-/*
- * ubi32_wdt_probe()
- * 	Probe/register the watchdog module
- *
- * Registers the misc device and notifier handler.  Actual device
- * initialization is handled by ubi32_wdt_open().
- */
-static int __devinit ubi32_wdt_probe(struct platform_device *pdev)
-{
-	int ret;
-
-	ret = register_reboot_notifier(&ubi32_wdt_notifier);
-	if (ret) {
-		printk(KERN_ERR PFX
-			"cannot register reboot notifier (err=%d)\n", ret);
-		return ret;
-	}
-
-	ret = misc_register(&ubi32_wdt_miscdev);
-	if (ret) {
-		printk(KERN_ERR PFX
-			"cannot register miscdev on minor=%d (err=%d)\n",
-				WATCHDOG_MINOR, ret);
-		unregister_reboot_notifier(&ubi32_wdt_notifier);
-		return ret;
-	}
-
-	printk(KERN_INFO PFX "initialized: timeout=%d sec (nowayout=%d)\n",
-	       timeout, nowayout);
-
-	return 0;
-}
-
-/*
- * ubi32_wdt_remove()
- * 	Uninstall the module
- *
- * Unregisters the misc device and notifier handler.  Actual device
- * deinitialization is handled by ubi32_wdt_close().
- */
-static int __devexit ubi32_wdt_remove(struct platform_device *pdev)
-{
-	misc_deregister(&ubi32_wdt_miscdev);
-	unregister_reboot_notifier(&ubi32_wdt_notifier);
-	return 0;
-}
-
-static struct platform_device *ubi32_wdt_device;
-
-static struct platform_driver ubi32_wdt_driver = {
-	.probe     = ubi32_wdt_probe,
-	.remove    = __devexit_p(ubi32_wdt_remove),
-	.suspend   = ubi32_wdt_suspend,
-	.resume    = ubi32_wdt_resume,
-	.driver    = {
-		.name  = WATCHDOG_NAME,
-		.owner = THIS_MODULE,
-	},
-};
-
-/*
- * ubi32_wdt_init()
- * 	Initialize the watchdog.
- *
- * Checks the module params and registers the platform device & driver.
- * Real work is in the platform probe function.
- */
-static int __init ubi32_wdt_init(void)
-{
-	unsigned long flags;
-	int ret;
-
-	/*
-	 * Check that the timeout value is within range
-	 */
-	spin_lock_irqsave(&ubi32_wdt_spinlock, flags);
-	ret = ubi32_wdt_set_timeout(timeout);
-	spin_unlock_irqrestore(&ubi32_wdt_spinlock, flags);
-	if (ret) {
-		return ret;
-	}
-
-	/*
-	 * Since this is an on-chip device and needs no board-specific
-	 * resources, we'll handle all the platform device stuff here.
-	 */
-	ret = platform_driver_register(&ubi32_wdt_driver);
-	if (ret) {
-		printk(KERN_ERR PFX "unable to register driver\n");
-		return ret;
-	}
-
-	ubi32_wdt_device = platform_device_register_simple(WATCHDOG_NAME, -1, NULL, 0);
-	if (IS_ERR(ubi32_wdt_device)) {
-		printk(KERN_ERR PFX "unable to register device\n");
-		platform_driver_unregister(&ubi32_wdt_driver);
-		return PTR_ERR(ubi32_wdt_device);
-	}
-
-	return 0;
-}
-
-/*
- * ubi32_wdt_exit()
- * 	Deinitialize module
- *
- * Back out the platform device & driver steps.  Real work is in the
- * platform remove function.
- */
-static void __exit ubi32_wdt_exit(void)
-{
-	platform_device_unregister(ubi32_wdt_device);
-	platform_driver_unregister(&ubi32_wdt_driver);
-}
-
-module_init(ubi32_wdt_init);
-module_exit(ubi32_wdt_exit);
-
-MODULE_AUTHOR("Sol Kavy<sol@ubicom.com>");
-MODULE_DESCRIPTION("Ubicom32 Watchdog Device Driver");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
-
-module_param(timeout, uint, 0);
-MODULE_PARM_DESC(timeout,
-	"Watchdog timeout in seconds. (1<=timeout<=((2^32)/SCLK), default="
-		__MODULE_STRING(WATCHDOG_TIMEOUT) ")");
-
-module_param(nowayout, int, 0);
-MODULE_PARM_DESC(nowayout,
-	"Watchdog cannot be stopped once started (default="
-		__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/target/linux/ubicom32/files/sound/ubicom32/Kconfig b/target/linux/ubicom32/files/sound/ubicom32/Kconfig
deleted file mode 100644
index c57bd34d9..000000000
--- a/target/linux/ubicom32/files/sound/ubicom32/Kconfig
+++ /dev/null
@@ -1,42 +0,0 @@
-# ALSA Ubicom32 drivers
-
-menuconfig SND_UBI32
-	tristate "Ubicom32 sound devices"
-	select SND_PCM
-	default n
-	help
-	  Say Y here to include support for audio on the Ubicom32 platform.
-	  To compile this driver as a module, say M here: the module will be
-	  called snd_ubi32.
-
-if SND_UBI32
-
-config SND_UBI32_AUDIO_GENERIC_CAPTURE
-	bool "Generic Capture Support"
-	default n
-	help
-	  Use this option to support ADCs which don't require special drivers.
-
-config SND_UBI32_AUDIO_GENERIC
-	bool "Generic Playback Support"
-	default n
-	help
-	  Use this option to support DACs which don't require special drivers.
-
-comment "I2C Based Codecs"
-
-config SND_UBI32_AUDIO_CS4350
-	bool "Cirrus Logic CS4350 DAC"
-	depends on I2C
-	default n
-	help
-	  Support for the Cirrus Logic CS4350 DAC.
-
-config SND_UBI32_AUDIO_CS4384
-	bool "Cirrus Logic CS4384 DAC"
-	depends on I2C
-	default n
-	help
-	  Support for the Cirrus Logic CS4384 DAC.
-
-endif #SND_UBI32
diff --git a/target/linux/ubicom32/files/sound/ubicom32/Makefile b/target/linux/ubicom32/files/sound/ubicom32/Makefile
deleted file mode 100644
index ffdcc298a..000000000
--- a/target/linux/ubicom32/files/sound/ubicom32/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# sound/ubicom32/Makefile
-#	Makefile for ALSA
-#
-# (C) Copyright 2009, Ubicom, Inc.
-#
-# This file is part of the Ubicom32 Linux Kernel Port.
-#
-# The Ubicom32 Linux Kernel Port 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.
-#
-# The Ubicom32 Linux Kernel Port is distributed in the hope that it
-# will be useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
-# the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with the Ubicom32 Linux Kernel Port.  If not,
-# see <http://www.gnu.org/licenses/>.
-#
-# Ubicom32 implementation derived from (with many thanks):
-#   arch/m68knommu
-#   arch/blackfin
-#   arch/parisc
-#
-
-CFLAGS_ubi32.o += -O2
-snd-ubi32-pcm-objs := ubi32-pcm.o
-snd-ubi32-generic-objs := ubi32-generic.o
-snd-ubi32-generic-capture-objs := ubi32-generic-capture.o
-snd-ubi32-cs4350-objs := ubi32-cs4350.o
-snd-ubi32-cs4384-objs := ubi32-cs4384.o
-
-# Toplevel Module Dependency
-obj-$(CONFIG_SND_UBI32) += snd-ubi32-pcm.o
-obj-$(CONFIG_SND_UBI32_AUDIO_GENERIC) += snd-ubi32-generic.o
-obj-$(CONFIG_SND_UBI32_AUDIO_GENERIC_CAPTURE) += snd-ubi32-generic-capture.o
-obj-$(CONFIG_SND_UBI32_AUDIO_CS4350) += snd-ubi32-cs4350.o
-obj-$(CONFIG_SND_UBI32_AUDIO_CS4384) += snd-ubi32-cs4384.o
diff --git a/target/linux/ubicom32/files/sound/ubicom32/ubi32-cs4350.c b/target/linux/ubicom32/files/sound/ubicom32/ubi32-cs4350.c
deleted file mode 100644
index 7e6f9acbb..000000000
--- a/target/linux/ubicom32/files/sound/ubicom32/ubi32-cs4350.c
+++ /dev/null
@@ -1,583 +0,0 @@
-/*
- * sound/ubicom32/ubi32-cs4350.c
- *	Interface to ubicom32 virtual audio peripheral - using CS4350 DAC
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- */
-
-#include <linux/i2c.h>
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <sound/core.h>
-#include <sound/tlv.h>
-#include <sound/control.h>
-#include <sound/pcm.h>
-#include <sound/initval.h>
-#include "ubi32.h"
-
-#define DRIVER_NAME "snd-ubi32-cs4350"
-
-/*
- * Module properties
- */
-static const struct i2c_device_id snd_ubi32_cs4350_id[] = {
-	{"cs4350", 0 },
-	{ }
-};
-MODULE_DEVICE_TABLE(i2c, ubicom32audio_id);
-
-static int index = SNDRV_DEFAULT_IDX1; /* Index 0-MAX */
-
-/*
- * The dB scale for the Cirrus Logic cs4350.  The output range is from
- * -127.5 dB to 0 dB.
- */
-static const DECLARE_TLV_DB_SCALE(snd_ubi32_cs4350_db, -12750, 50, 0);
-
-#define ubi32_cs4350_mute_info	snd_ctl_boolean_stereo_info
-
-/*
- * Private data for cs4350 chip
- */
-struct ubi32_cs4350_priv {
-	/*
-	 * The current volume settings
-	 */
-	uint8_t volume[2];
-
-	/*
-	 * Bitmask of mutes MSB (unused, ..., unused, right_ch, left_ch) LSB
-	 */
-	uint8_t mute;
-
-	/*
-	 * Lock to protect this struct because callbacks are not atomic.
-	 */
-	spinlock_t lock;
-};
-
-/*
- * The info for the cs4350.  The volume currently has one channel,
- * and 255 possible settings.
- */
-static int ubi32_cs4350_volume_info(struct snd_kcontrol *kcontrol,
-				    struct snd_ctl_elem_info *uinfo)
-{
-	uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-	uinfo->count = 2;
-	uinfo->value.integer.min = 0;
-	uinfo->value.integer.max = 255; // 8 bits in cirrus logic cs4350 volume register
-	return 0;
-}
-
-static int ubi32_cs4350_volume_get(struct snd_kcontrol *kcontrol,
-				   struct snd_ctl_elem_value *ucontrol)
-{
-	struct ubi32_snd_priv *ubi32_priv = snd_kcontrol_chip(kcontrol);
-	struct ubi32_cs4350_priv *cs4350_priv;
-	unsigned long flags;
-
-	cs4350_priv = snd_ubi32_priv_get_drv(ubi32_priv);
-
-	spin_lock_irqsave(&cs4350_priv->lock, flags);
-
-	ucontrol->value.integer.value[0] = cs4350_priv->volume[0];
-	ucontrol->value.integer.value[1] = cs4350_priv->volume[1];
-
-	spin_unlock_irqrestore(&cs4350_priv->lock, flags);
-
-	return 0;
-}
-
-static int ubi32_cs4350_volume_put(struct snd_kcontrol *kcontrol,
-				   struct snd_ctl_elem_value *ucontrol)
-{
-	struct ubi32_snd_priv *ubi32_priv = snd_kcontrol_chip(kcontrol);
-	struct i2c_client *client = (struct i2c_client *)ubi32_priv->client;
-	struct ubi32_cs4350_priv *cs4350_priv;
-	unsigned long flags;
-	int ret, changed;
-	char send[2];
-	uint8_t volume_reg_value_left, volume_reg_value_right;
-
-	changed = 0;
-
-	cs4350_priv = snd_ubi32_priv_get_drv(ubi32_priv);
-	volume_reg_value_left = 255 - (ucontrol->value.integer.value[0] & 0xFF);
-	volume_reg_value_right = 255 - (ucontrol->value.integer.value[1] & 0xFF);
-
-#if SND_UBI32_DEBUG
-	snd_printk(KERN_INFO "Setting volume: writing %d,%d to CS4350 volume registers\n", volume_reg_value_left, volume_reg_value_right);
-#endif
-	spin_lock_irqsave(&cs4350_priv->lock, flags);
-
-	if (cs4350_priv->volume[0] != ucontrol->value.integer.value[0]) {
-		send[0] = 0x05; // left channel
-		send[1] = volume_reg_value_left;
-		ret = i2c_master_send(client, send, 2);
-		if (ret != 2) {
-			snd_printk(KERN_ERR "Failed to set channel A volume on CS4350\n");
-			return changed;
-		}
-		cs4350_priv->volume[0] = ucontrol->value.integer.value[0];
-		changed = 1;
-	}
-
-	if (cs4350_priv->volume[1] != ucontrol->value.integer.value[1]) {
-		send[0] = 0x06; // right channel
-		send[1] = volume_reg_value_right;
-		ret = i2c_master_send(client, send, 2);
-		if (ret != 2) {
-			snd_printk(KERN_ERR "Failed to set channel B volume on CS4350\n");
-			return changed;
-		}
-		cs4350_priv->volume[1] = ucontrol->value.integer.value[1];
-		changed = 1;
-	}
-
-	spin_unlock_irqrestore(&cs4350_priv->lock, flags);
-
-	return changed;
-}
-
-static struct snd_kcontrol_new ubi32_cs4350_volume __devinitdata = {
-	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
-		  SNDRV_CTL_ELEM_ACCESS_TLV_READ,
-	.name = "PCM Playback Volume",
-	.info = ubi32_cs4350_volume_info,
-	.get = ubi32_cs4350_volume_get,
-	.put = ubi32_cs4350_volume_put,
-	.tlv.p = snd_ubi32_cs4350_db,
-};
-
-static int ubi32_cs4350_mute_get(struct snd_kcontrol *kcontrol,
-				 struct snd_ctl_elem_value *ucontrol)
-{
-	struct ubi32_snd_priv *ubi32_priv = snd_kcontrol_chip(kcontrol);
-	struct ubi32_cs4350_priv *cs4350_priv;
-	unsigned long flags;
-
-	cs4350_priv = snd_ubi32_priv_get_drv(ubi32_priv);
-
-	spin_lock_irqsave(&cs4350_priv->lock, flags);
-
-	ucontrol->value.integer.value[0] = cs4350_priv->mute & 1;
-	ucontrol->value.integer.value[1] = (cs4350_priv->mute & (1 << 1)) ? 1 : 0;
-
-	spin_unlock_irqrestore(&cs4350_priv->lock, flags);
-
-	return 0;
-}
-
-static int ubi32_cs4350_mute_put(struct snd_kcontrol *kcontrol,
-				 struct snd_ctl_elem_value *ucontrol)
-{
-	struct ubi32_snd_priv *ubi32_priv = snd_kcontrol_chip(kcontrol);
-	struct i2c_client *client = (struct i2c_client *)ubi32_priv->client;
-	struct ubi32_cs4350_priv *cs4350_priv;
-	unsigned long flags;
-	int ret, changed;
-	char send[2];
-	char recv[1];
-	uint8_t mute;
-
-        changed = 0;
-
-	cs4350_priv = snd_ubi32_priv_get_drv(ubi32_priv);
-
-	spin_lock_irqsave(&cs4350_priv->lock, flags);
-
-	if ((cs4350_priv->mute & 1) != ucontrol->value.integer.value[0]) {
-		send[0] = 0x04;
-		ret = i2c_master_send(client, send, 1);
-		if (ret != 1) {
-			snd_printk(KERN_ERR "Failed to write to mute register: channel 0\n");
-			return changed;
-		}
-
-		ret = i2c_master_recv(client, recv, 1);
-		if (ret != 1) {
-			snd_printk(KERN_ERR "Failed to read mute register: channel 0\n");
-			return changed;
-		}
-
-		mute = recv[0];
-
-		if (ucontrol->value.integer.value[0]) {
-			cs4350_priv->mute |= 1;
-			mute &= ~(1 << 4);
-#if SND_UBI32_DEBUG
-			snd_printk(KERN_INFO "Unmuted channel A\n");
-#endif
-		} else {
-			cs4350_priv->mute &= ~1;
-			mute |= (1 << 4);
-#if SND_UBI32_DEBUG
-			snd_printk(KERN_INFO "Muted channel A\n");
-#endif
-		}
-
-		send[0] = 0x04;
-		send[1] = mute;
-		ret = i2c_master_send(client, send, 2);
-		if (ret != 2) {
-			snd_printk(KERN_ERR "Failed to set channel A mute on CS4350\n");
-			return changed;
-		}
-		changed = 1;
-	}
-
-	if (((cs4350_priv->mute & 2) >> 1) != ucontrol->value.integer.value[1]) {
-		send[0] = 0x04;
-		ret = i2c_master_send(client, send, 1);
-		if (ret != 1) {
-			snd_printk(KERN_ERR "Failed to write to mute register: channel 1\n");
-			return changed;
-		}
-
-		ret = i2c_master_recv(client, recv, 1);
-		if (ret != 1) {
-			snd_printk(KERN_ERR "Failed to read mute register: channel 1\n");
-			return changed;
-		}
-
-		mute = recv[0];
-
-		if (ucontrol->value.integer.value[1]) {
-			cs4350_priv->mute |= (1 << 1);
-			mute &= ~(1 << 3);
-#if SND_UBI32_DEBUG
-			snd_printk(KERN_INFO "Unmuted channel B\n");
-#endif
-		} else {
-			cs4350_priv->mute &= ~(1 << 1);
-			mute |= (1 << 3);
-#if SND_UBI32_DEBUG
-			snd_printk(KERN_INFO "Muted channel B\n");
-#endif
-		}
-
-		send[0] = 0x04;
-		send[1] = mute;
-		ret = i2c_master_send(client, send, 2);
-		if (ret != 2) {
-			snd_printk(KERN_ERR "Failed to set channel A mute on CS4350\n");
-			return changed;
-		}
-		changed = 1;
-	}
-
-	spin_unlock_irqrestore(&cs4350_priv->lock, flags);
-
-	return changed;
-}
-
-static struct snd_kcontrol_new ubi32_cs4350_mute __devinitdata = {
-	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
-	.name = "PCM Playback Switch",
-	.info = ubi32_cs4350_mute_info,
-	.get = ubi32_cs4350_mute_get,
-	.put = ubi32_cs4350_mute_put,
-};
-
-/*
- * snd_ubi32_cs4350_free
- *	Card private data free function
- */
-void snd_ubi32_cs4350_free(struct snd_card *card)
-{
-	struct ubi32_snd_priv *ubi32_priv;
-	struct ubi32_cs4350_priv *cs4350_priv;
-
-	ubi32_priv = card->private_data;
-	cs4350_priv = snd_ubi32_priv_get_drv(ubi32_priv);
-	if (cs4350_priv) {
-		kfree(cs4350_priv);
-	}
-}
-
-/*
- * snd_ubi32_cs4350_dac_init
- */
-static int snd_ubi32_cs4350_dac_init(struct i2c_client *client, const struct i2c_device_id *id)
-{
-	int ret;
-	char send[2];
-	char recv[8];
-
-	/*
-	 * Initialize the CS4350 DAC over the I2C interface
-	 */
-	snd_printk(KERN_INFO "Initializing CS4350 DAC\n");
-
-	/*
-	 * Register 0x01: device/revid
-	 */
-	send[0] = 0x01;
-	ret = i2c_master_send(client, send, 1);
-	if (ret != 1) {
-		snd_printk(KERN_ERR "Failed 1st attempt to write to CS4350 register 0x01\n");
-		goto fail;
-	}
-	ret = i2c_master_recv(client, recv, 1);
-	if (ret != 1) {
-		snd_printk(KERN_ERR "Failed initial read of CS4350 registers\n");
-		goto fail;
-	}
-	snd_printk(KERN_INFO "CS4350 DAC Device/Rev: %08x\n", recv[0]);
-
-	/*
-	 * Register 0x02: Mode control
-	 *	I2S DIF[2:0] = 001, no De-Emphasis, Auto speed mode
-	 */
-	send[0] = 0x02;
-	send[1] = 0x10;
-	ret = i2c_master_send(client, send, 2);
-	if (ret != 2) {
-		snd_printk(KERN_ERR "Failed to set CS4350 to I2S mode\n");
-		goto fail;
-	}
-
-	/*
-	 * Register 0x05/0x06: Volume control
-	 *	Channel A volume set to 0 dB
-	 *	Channel B volume set to 0 dB
-	 */
-	send[0] = 0x05;
-	send[1] = 0x00;
-	ret = i2c_master_send(client, send, 2);
-	if (ret != 2) {
-		snd_printk(KERN_ERR "Failed to set channel A volume on CS4350\n");
-		goto fail;
-	}
-
-	send[0] = 0x06;
-	send[1] = 0x00;
-	ret = i2c_master_send(client, send, 2);
-	if (ret != 2) {
-		snd_printk(KERN_ERR "Failed to set channel A volume on CS4350\n");
-		goto fail;
-	}
-
-	/*
-	 * Make sure the changes took place, this helps verify we are talking to
-	 * the correct chip.
-	 */
-	send[0] = 0x81;
-	ret = i2c_master_send(client, send, 1);
-	if (ret != 1) {
-		snd_printk(KERN_ERR "Failed to initiate readback\n");
-		goto fail;
-	}
-
-	ret = i2c_master_recv(client, recv, 8);
-	if (ret != 8) {
-		snd_printk(KERN_ERR "Failed second read of CS4350 registers\n");
-		goto fail;
-	}
-
-	if ((recv[1] != 0x10) || (recv[4] != 0x00) || (recv[5] != 0x00)) {
-		snd_printk(KERN_ERR "Failed to initialize CS4350 DAC\n");
-		goto fail;
-	}
-
-	snd_printk(KERN_INFO "CS4350 DAC Initialized\n");
-	return 0;
-
-fail:
-	return -ENODEV;
-}
-
-/*
- * snd_ubi32_cs4350_i2c_probe
- */
-static int snd_ubi32_cs4350_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id)
-{
-	struct snd_card *card;
-	struct ubi32_snd_priv *ubi32_priv;
-	struct ubi32_cs4350_priv *cs4350_priv;
-	int err, ret;
-	struct platform_device *pdev;
-
-	pdev = client->dev.platform_data;
-	if (!pdev) {
-		return -ENODEV;
-	}
-
-	/*
-	 * Initialize the CS4350 DAC
-	 */
-	ret = snd_ubi32_cs4350_dac_init(client, id);
-	if (ret < 0) {
-		/*
-		 * Initialization failed.  Propagate the error.
-		 */
-		return ret;
-	}
-
-	/*
-	 * Create a snd_card structure
-	 */
-	card = snd_card_new(index, "Ubi32-CS4350", THIS_MODULE, sizeof(struct ubi32_snd_priv));
-	if (card == NULL) {
-		return -ENOMEM;
-	}
-
-	card->private_free = snd_ubi32_cs4350_free; /* Not sure if correct */
-	ubi32_priv = card->private_data;
-
-	/*
-	 * CS4350 DAC has a minimum sample rate of 30khz and an
-	 * upper limit of 216khz for it's auto-detect.
-	 */
-	ubi32_priv->min_sample_rate = 30000;
-	ubi32_priv->max_sample_rate = 216000;
-
-	/*
-	 * Initialize the snd_card's private data structure
-	 */
-	ubi32_priv->card = card;
-	ubi32_priv->client = client;
-
-	/*
-	 * Create our private data structure
-	 */
-	cs4350_priv = kzalloc(sizeof(struct ubi32_cs4350_priv), GFP_KERNEL);
-	if (!cs4350_priv) {
-		snd_card_free(card);
-		return -ENOMEM;
-	}
-	snd_ubi32_priv_set_drv(ubi32_priv, cs4350_priv);
-	spin_lock_init(&cs4350_priv->lock);
-
-	/*
-	 * Initial volume is set to max by probe function
-	 */
-	cs4350_priv->volume[0] = 0xFF;
-	cs4350_priv->volume[1] = 0xFF;
-
-	/*
-	 * The CS4350 starts off unmuted (bit set = not muted)
-	 */
-	cs4350_priv->mute = 3;
-
-	/*
-	 * Create the new PCM instance
-	 */
-	err = snd_ubi32_pcm_probe(ubi32_priv, pdev);
-	if (err < 0) {
-		snd_card_free(card);
-		return err; /* What is err?  Need to include correct file */
-	}
-
-	strcpy(card->driver, "Ubi32-CS4350");
-	strcpy(card->shortname, "Ubi32-CS4350");
-	snprintf(card->longname, sizeof(card->longname),
-		"%s at sendirq=%d.%d recvirq=%d.%d regs=%p",
-		card->shortname, ubi32_priv->tx_irq, ubi32_priv->irq_idx,
-		ubi32_priv->rx_irq, ubi32_priv->irq_idx, ubi32_priv->adr);
-
-	snd_card_set_dev(card, &client->dev);
-
-	/*
-	 * Set up the mixer components
-	 */
-	err = snd_ctl_add(card, snd_ctl_new1(&ubi32_cs4350_volume, ubi32_priv));
-	if (err) {
-		snd_printk(KERN_WARNING "Failed to add volume mixer control\n");
-	}
-	err = snd_ctl_add(card, snd_ctl_new1(&ubi32_cs4350_mute, ubi32_priv));
-	if (err) {
-		snd_printk(KERN_WARNING "Failed to add mute mixer control\n");
-	}
-
-	/*
-	 * Register the sound card
-	 */
-	if ((err = snd_card_register(card)) != 0) {
-		snd_printk(KERN_WARNING "snd_card_register error\n");
-	}
-
-	/*
-	 * Store card for access from other methods
-	 */
-	i2c_set_clientdata(client, card);
-
-	return 0;
-}
-
-/*
- * snd_ubi32_cs4350_i2c_remove
- */
-static int __devexit snd_ubi32_cs4350_i2c_remove(struct i2c_client *client)
-{
-	struct snd_card *card;
-	struct ubi32_snd_priv *ubi32_priv;
-
-	card = i2c_get_clientdata(client);
-
-	ubi32_priv = card->private_data;
-	snd_ubi32_pcm_remove(ubi32_priv);
-
-	snd_card_free(i2c_get_clientdata(client));
-	i2c_set_clientdata(client, NULL);
-
-	return 0;
-}
-
-/*
- * I2C driver description
- */
-static struct i2c_driver snd_ubi32_cs4350_driver = {
-	.driver = {
-		.name = DRIVER_NAME,
-		.owner = THIS_MODULE,
-	},
-	.id_table	= snd_ubi32_cs4350_id,
-	.probe		= snd_ubi32_cs4350_i2c_probe,
-	.remove		= __devexit_p(snd_ubi32_cs4350_i2c_remove),
-};
-
-/*
- * Driver init
- */
-static int __init snd_ubi32_cs4350_init(void)
-{
-	return i2c_add_driver(&snd_ubi32_cs4350_driver);
-}
-module_init(snd_ubi32_cs4350_init);
-
-/*
- * snd_ubi32_cs4350_exit
- */
-static void __exit snd_ubi32_cs4350_exit(void)
-{
-	i2c_del_driver(&snd_ubi32_cs4350_driver);
-}
-module_exit(snd_ubi32_cs4350_exit);
-
-/*
- * Module properties
- */
-MODULE_ALIAS("i2c:" DRIVER_NAME);
-MODULE_AUTHOR("Patrick Tjin");
-MODULE_DESCRIPTION("Driver for Ubicom32 audio devices CS4350");
-MODULE_LICENSE("GPL");
diff --git a/target/linux/ubicom32/files/sound/ubicom32/ubi32-cs4384.c b/target/linux/ubicom32/files/sound/ubicom32/ubi32-cs4384.c
deleted file mode 100644
index 267926773..000000000
--- a/target/linux/ubicom32/files/sound/ubicom32/ubi32-cs4384.c
+++ /dev/null
@@ -1,996 +0,0 @@
-/*
- * sound/ubicom32/ubi32-cs4384.c
- *	Interface to ubicom32 virtual audio peripheral - using CS4384 DAC
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- */
-
-#include <linux/i2c.h>
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/delay.h>
-#include <sound/core.h>
-#include <sound/tlv.h>
-#include <sound/control.h>
-#include <sound/pcm.h>
-#include <sound/initval.h>
-#include <asm/ip5000.h>
-#include <asm/gpio.h>
-#include <asm/audio.h>
-#include <asm/ubi32-cs4384.h>
-#include "ubi32.h"
-
-#define DRIVER_NAME "snd-ubi32-cs4384"
-
-/*
- * Module properties
- */
-static const struct i2c_device_id snd_ubi32_cs4384_id[] = {
-	{"cs4384", 0 },
-	{ }
-};
-MODULE_DEVICE_TABLE(i2c, ubicom32audio_id);
-
-static int index = SNDRV_DEFAULT_IDX1; /* Index 0-MAX */
-
-/*
- * Mixer properties
- */
-enum {
-	/*
-	 * Be careful of changing the order of these IDs, they
-	 * are used to index the volume array.
-	 */
-	SND_UBI32_CS4384_FRONT_ID,
-	SND_UBI32_CS4384_SURROUND_ID,
-	SND_UBI32_CS4384_CENTER_ID,
-	SND_UBI32_CS4384_LFE_ID,
-	SND_UBI32_CS4384_REAR_ID,
-
-	/*
-	 * This should be the last ID
-	 */
-	SND_UBI32_CS4384_LAST_ID,
-};
-static const u8_t snd_ubi32_cs4384_ch_ofs[] = {0, 2, 4, 5, 6};
-
-static const DECLARE_TLV_DB_SCALE(snd_ubi32_cs4384_db, -12750, 50, 0);
-
-#define snd_ubi32_cs4384_info_mute 	snd_ctl_boolean_stereo_info
-#define snd_ubi32_cs4384_info_mute_mono	snd_ctl_boolean_mono_info
-
-/*
- * Mixer controls
- */
-static int snd_ubi32_cs4384_info_volume(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo);
-static int snd_ubi32_cs4384_get_volume(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);
-static int snd_ubi32_cs4384_put_volume(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);
-static int snd_ubi32_cs4384_get_mute(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);
-static int snd_ubi32_cs4384_put_mute(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);
-
-/*
- * Make sure to update these if the structure below is changed
- */
-#define SND_UBI32_MUTE_CTL_START	5
-#define SND_UBI32_MUTE_CTL_END		9
-static struct snd_kcontrol_new snd_ubi32_cs4384_controls[] __devinitdata = {
-	{
-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-		.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
-			  SNDRV_CTL_ELEM_ACCESS_TLV_READ,
-		.name = "Front Playback Volume",
-		.info = snd_ubi32_cs4384_info_volume,
-		.get = snd_ubi32_cs4384_get_volume,
-		.put = snd_ubi32_cs4384_put_volume,
-		.private_value = SND_UBI32_CS4384_FRONT_ID,
-		.tlv = {
-			.p = snd_ubi32_cs4384_db,
-		},
-	},
-	{
-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-		.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
-			  SNDRV_CTL_ELEM_ACCESS_TLV_READ,
-		.name = "Surround Playback Volume",
-		.info = snd_ubi32_cs4384_info_volume,
-		.get = snd_ubi32_cs4384_get_volume,
-		.put = snd_ubi32_cs4384_put_volume,
-		.private_value = SND_UBI32_CS4384_SURROUND_ID,
-		.tlv = {
-			.p = snd_ubi32_cs4384_db,
-		},
-	},
-	{
-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-		.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
-			  SNDRV_CTL_ELEM_ACCESS_TLV_READ,
-		.name = "Center Playback Volume",
-		.info = snd_ubi32_cs4384_info_volume,
-		.get = snd_ubi32_cs4384_get_volume,
-		.put = snd_ubi32_cs4384_put_volume,
-		.private_value = SND_UBI32_CS4384_CENTER_ID,
-		.tlv = {
-			.p = snd_ubi32_cs4384_db,
-		},
-	},
-	{
-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-		.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
-			  SNDRV_CTL_ELEM_ACCESS_TLV_READ,
-		.name = "LFE Playback Volume",
-		.info = snd_ubi32_cs4384_info_volume,
-		.get = snd_ubi32_cs4384_get_volume,
-		.put = snd_ubi32_cs4384_put_volume,
-		.private_value = SND_UBI32_CS4384_LFE_ID,
-		.tlv = {
-			.p = snd_ubi32_cs4384_db,
-		},
-	},
-	{
-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-		.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
-			  SNDRV_CTL_ELEM_ACCESS_TLV_READ,
-		.name = "Rear Playback Volume",
-		.info = snd_ubi32_cs4384_info_volume,
-		.get = snd_ubi32_cs4384_get_volume,
-		.put = snd_ubi32_cs4384_put_volume,
-		.private_value = SND_UBI32_CS4384_REAR_ID,
-		.tlv = {
-			.p = snd_ubi32_cs4384_db,
-		},
-	},
-	{
-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-		.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
-			  SNDRV_CTL_ELEM_ACCESS_TLV_READ,
-		.name = "Front Playback Switch",
-		.info = snd_ubi32_cs4384_info_mute,
-		.get = snd_ubi32_cs4384_get_mute,
-		.put = snd_ubi32_cs4384_put_mute,
-		.private_value = SND_UBI32_CS4384_FRONT_ID,
-	},
-	{
-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-		.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
-			  SNDRV_CTL_ELEM_ACCESS_TLV_READ,
-		.name = "Surround Playback Switch",
-		.info = snd_ubi32_cs4384_info_mute,
-		.get = snd_ubi32_cs4384_get_mute,
-		.put = snd_ubi32_cs4384_put_mute,
-		.private_value = SND_UBI32_CS4384_SURROUND_ID,
-	},
-	{
-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-		.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
-			  SNDRV_CTL_ELEM_ACCESS_TLV_READ,
-		.name = "Center Playback Switch",
-		.info = snd_ubi32_cs4384_info_mute_mono,
-		.get = snd_ubi32_cs4384_get_mute,
-		.put = snd_ubi32_cs4384_put_mute,
-		.private_value = SND_UBI32_CS4384_CENTER_ID,
-	},
-	{
-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-		.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
-			  SNDRV_CTL_ELEM_ACCESS_TLV_READ,
-		.name = "LFE Playback Switch",
-		.info = snd_ubi32_cs4384_info_mute_mono,
-		.get = snd_ubi32_cs4384_get_mute,
-		.put = snd_ubi32_cs4384_put_mute,
-		.private_value = SND_UBI32_CS4384_LFE_ID,
-	},
-	{
-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-		.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
-			  SNDRV_CTL_ELEM_ACCESS_TLV_READ,
-		.name = "Rear Playback Switch",
-		.info = snd_ubi32_cs4384_info_mute,
-		.get = snd_ubi32_cs4384_get_mute,
-		.put = snd_ubi32_cs4384_put_mute,
-		.private_value = SND_UBI32_CS4384_REAR_ID,
-	},
-};
-
-/*
- * Our private data
- */
-struct snd_ubi32_cs4384_priv {
-	/*
-	 * Array of current volumes
-	 *	(L, R, SL, SR, C, LFE, RL, RR)
-	 */
-	uint8_t	volume[8];
-
-	/*
-	 * Bitmask of mutes
-	 *	MSB (RR, RL, LFE, C, SR, SL, R, L) LSB
-	 */
-	uint8_t mute;
-
-	/*
-	 * Array of controls
-	 */
-	struct snd_kcontrol *kctls[ARRAY_SIZE(snd_ubi32_cs4384_controls)];
-
-	/*
-	 * Lock to protect our card
-	 */
-	spinlock_t lock;
-};
-
-/*
- * snd_ubi32_cs4384_info_volume
- */
-static int snd_ubi32_cs4384_info_volume(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-	unsigned int id = (unsigned int)kcontrol->private_value;
-
-	uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-	uinfo->count = 1;
-	if ((id != SND_UBI32_CS4384_LFE_ID) &&
-	    (id != SND_UBI32_CS4384_CENTER_ID)) {
-		uinfo->count = 2;
-	}
-	uinfo->value.integer.min = 0;
-	uinfo->value.integer.max = 255;
-	return 0;
-}
-
-/*
- * snd_ubi32_cs4384_get_volume
- */
-static int snd_ubi32_cs4384_get_volume(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
-{
-	struct ubi32_snd_priv *priv = snd_kcontrol_chip(kcontrol);
-	struct snd_ubi32_cs4384_priv *cs4384_priv;
-	unsigned int id = (unsigned int)kcontrol->private_value;
-	int ch = snd_ubi32_cs4384_ch_ofs[id];
-	unsigned long flags;
-
-	if (id >= SND_UBI32_CS4384_LAST_ID) {
-		return -EINVAL;
-	}
-
-	cs4384_priv = snd_ubi32_priv_get_drv(priv);
-
-	spin_lock_irqsave(&cs4384_priv->lock, flags);
-
-	ucontrol->value.integer.value[0] = cs4384_priv->volume[ch];
-	if ((id != SND_UBI32_CS4384_LFE_ID) &&
-	    (id != SND_UBI32_CS4384_CENTER_ID)) {
-		ch++;
-		ucontrol->value.integer.value[1] = cs4384_priv->volume[ch];
-	}
-
-	spin_unlock_irqrestore(&cs4384_priv->lock, flags);
-
-	return 0;
-}
-
-/*
- * snd_ubi32_cs4384_put_volume
- */
-static int snd_ubi32_cs4384_put_volume(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
-{
-	struct ubi32_snd_priv *priv = snd_kcontrol_chip(kcontrol);
-	struct i2c_client *client = (struct i2c_client *)priv->client;
-	struct snd_ubi32_cs4384_priv *cs4384_priv;
-	unsigned int id = (unsigned int)kcontrol->private_value;
-	int ch = snd_ubi32_cs4384_ch_ofs[id];
-	unsigned long flags;
-	unsigned char send[3];
-	int nch;
-	int ret = -EINVAL;
-
-	if (id >= SND_UBI32_CS4384_LAST_ID) {
-		return -EINVAL;
-	}
-
-	cs4384_priv = snd_ubi32_priv_get_drv(priv);
-
-	spin_lock_irqsave(&cs4384_priv->lock, flags);
-
-	send[0] = 0;
-	switch (id) {
-	case SND_UBI32_CS4384_REAR_ID:
-		send[0] = 0x06;
-
-		/*
-		 * Fall through
-		 */
-
-	case SND_UBI32_CS4384_SURROUND_ID:
-		send[0] += 0x03;
-
-		/*
-		 * Fall through
-		 */
-
-	case SND_UBI32_CS4384_FRONT_ID:
-		send[0] += 0x8B;
-		nch = 2;
-		send[1] = 255 - (ucontrol->value.integer.value[0] & 0xFF);
-		send[2] = 255 - (ucontrol->value.integer.value[1] & 0xFF);
-		cs4384_priv->volume[ch++] = send[1];
-		cs4384_priv->volume[ch] = send[2];
-		break;
-
-	case SND_UBI32_CS4384_LFE_ID:
-		send[0] = 0x81;
-
-		/*
-		 * Fall through
-		 */
-
-	case SND_UBI32_CS4384_CENTER_ID:
-		send[0] += 0x11;
-		nch = 1;
-		send[1] = 255 - (ucontrol->value.integer.value[0] & 0xFF);
-		cs4384_priv->volume[ch] = send[1];
-		break;
-
-	default:
-		spin_unlock_irqrestore(&cs4384_priv->lock, flags);
-		goto done;
-
-	}
-
-	/*
-	 * Send the volume to the chip
-	 */
-	nch++;
-	ret = i2c_master_send(client, send, nch);
-	if (ret != nch) {
-		snd_printk(KERN_ERR "Failed to set volume on CS4384\n");
-	}
-
-done:
-	spin_unlock_irqrestore(&cs4384_priv->lock, flags);
-
-	return ret;
-}
-
-/*
- * snd_ubi32_cs4384_get_mute
- */
-static int snd_ubi32_cs4384_get_mute(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
-{
-	struct ubi32_snd_priv *priv = snd_kcontrol_chip(kcontrol);
-	struct snd_ubi32_cs4384_priv *cs4384_priv;
-	unsigned int id = (unsigned int)kcontrol->private_value;
-	int ch = snd_ubi32_cs4384_ch_ofs[id];
-	unsigned long flags;
-
-	if (id >= SND_UBI32_CS4384_LAST_ID) {
-		return -EINVAL;
-	}
-
-	cs4384_priv = snd_ubi32_priv_get_drv(priv);
-
-	spin_lock_irqsave(&cs4384_priv->lock, flags);
-
-	ucontrol->value.integer.value[0] = !(cs4384_priv->mute & (1 << ch));
-
-	if ((id != SND_UBI32_CS4384_LFE_ID) &&
-	    (id != SND_UBI32_CS4384_CENTER_ID)) {
-		ch++;
-		ucontrol->value.integer.value[1] = !(cs4384_priv->mute & (1 << ch));
-	}
-
-	spin_unlock_irqrestore(&cs4384_priv->lock, flags);
-
-	return 0;
-}
-
-/*
- * snd_ubi32_cs4384_put_mute
- */
-static int snd_ubi32_cs4384_put_mute(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
-{
-	struct ubi32_snd_priv *priv = snd_kcontrol_chip(kcontrol);
-	struct i2c_client *client = (struct i2c_client *)priv->client;
-	struct snd_ubi32_cs4384_priv *cs4384_priv;
-	unsigned int id = (unsigned int)kcontrol->private_value;
-	int ch = snd_ubi32_cs4384_ch_ofs[id];
-	unsigned long flags;
-	unsigned char send[2];
-	int ret = -EINVAL;
-
-	if (id >= SND_UBI32_CS4384_LAST_ID) {
-		return -EINVAL;
-	}
-
-	cs4384_priv = snd_ubi32_priv_get_drv(priv);
-
-	spin_lock_irqsave(&cs4384_priv->lock, flags);
-
-	if (ucontrol->value.integer.value[0]) {
-		cs4384_priv->mute &= ~(1 << ch);
-	} else {
-		cs4384_priv->mute |= (1 << ch);
-	}
-
-	if ((id != SND_UBI32_CS4384_LFE_ID) && (id != SND_UBI32_CS4384_CENTER_ID)) {
-		ch++;
-		if (ucontrol->value.integer.value[1]) {
-			cs4384_priv->mute &= ~(1 << ch);
-		} else {
-			cs4384_priv->mute |= (1 << ch);
-		}
-	}
-
-	/*
-	 * Update the chip's mute reigster
-	 */
-	send[0] = 0x09;
-	send[1] = cs4384_priv->mute;
-	ret = i2c_master_send(client, send, 2);
-	if (ret != 2) {
-		snd_printk(KERN_ERR "Failed to set mute on CS4384\n");
-	}
-
-	spin_unlock_irqrestore(&cs4384_priv->lock, flags);
-
-	return ret;
-}
-
-/*
- * snd_ubi32_cs4384_mixer
- *	Setup the mixer controls
- */
-static int __devinit snd_ubi32_cs4384_mixer(struct ubi32_snd_priv *priv)
-{
-	struct snd_card *card = priv->card;
-	struct snd_ubi32_cs4384_priv *cs4384_priv;
-	int i;
-
-	cs4384_priv = snd_ubi32_priv_get_drv(priv);
-	for (i = 0; i < ARRAY_SIZE(snd_ubi32_cs4384_controls); i++) {
-		int err;
-
-		cs4384_priv->kctls[i] = snd_ctl_new1(&snd_ubi32_cs4384_controls[i], priv);
-		err = snd_ctl_add(card, cs4384_priv->kctls[i]);
-		if (err) {
-			snd_printk(KERN_WARNING "Failed to add control %d\n", i);
-			return err;
-		}
-	}
-	return 0;
-}
-
-/*
- * snd_ubi32_cs4384_free
- *	Card private data free function
- */
-void snd_ubi32_cs4384_free(struct snd_card *card)
-{
-	struct snd_ubi32_cs4384_priv *cs4384_priv;
-	struct ubi32_snd_priv *ubi32_priv;
-
-	ubi32_priv = card->private_data;
-	cs4384_priv = snd_ubi32_priv_get_drv(ubi32_priv);
-	if (cs4384_priv) {
-		kfree(cs4384_priv);
-	}
-}
-
-/*
- * snd_ubi32_cs4384_setup_mclk
- */
-static int snd_ubi32_cs4384_setup_mclk(struct ubi32_cs4384_platform_data *pdata)
-{
-	struct ubicom32_io_port *ioa = (struct ubicom32_io_port *)RA;
-	struct ubicom32_io_port *ioc = (struct ubicom32_io_port *)RC;
-	struct ubicom32_io_port *iod = (struct ubicom32_io_port *)RD;
-	struct ubicom32_io_port *ioe = (struct ubicom32_io_port *)RE;
-	struct ubicom32_io_port *ioh = (struct ubicom32_io_port *)RH;
-	unsigned int ctl0;
-	unsigned int ctlx;
-	unsigned int div;
-
-	div = pdata->mclk_entries[0].div;
-
-	ctl0 = (1 << 13);
-	ctlx = ((div - 1) << 16) | (div / 2);
-
-	switch (pdata->mclk_src) {
-	case UBI32_CS4384_MCLK_PWM_0:
-		ioc->function |= 2;
-		ioc->ctl0 |= ctl0;
-		ioc->ctl1 = ctlx;
-		if (!ioa->function) {
-			ioa->function = 3;
-		}
-		return 0;
-
-	case UBI32_CS4384_MCLK_PWM_1:
-		ioc->function |= 2;
-		ioc->ctl0 |= ctl0 << 16;
-		ioc->ctl2 = ctlx;
-		if (!ioe->function) {
-			ioe->function = 3;
-		}
-		return 0;
-
-	case UBI32_CS4384_MCLK_PWM_2:
-		ioh->ctl0 |= ctl0;
-		ioh->ctl1 = ctlx;
-		if (!iod->function) {
-			iod->function = 3;
-		}
-		return 0;
-
-	case UBI32_CS4384_MCLK_CLKDIV_1:
-		ioa->gpio_mask &= (1 << 7);
-		ioa->ctl1 &= ~(0x7F << 14);
-		ioa->ctl1 |= ((div - 1) << 14);
-		return 0;
-
-	case UBI32_CS4384_MCLK_OTHER:
-		return 0;
-	}
-
-	return 1;
-}
-
-/*
- * snd_ubi32_cs4384_set_rate
- */
-static int snd_ubi32_cs4384_set_rate(struct ubi32_snd_priv *priv, int rate)
-{
-	struct ubi32_cs4384_platform_data *cpd = priv->pdata->priv_data;
-	struct ubicom32_io_port *ioa = (struct ubicom32_io_port *)RA;
-	struct ubicom32_io_port *ioc = (struct ubicom32_io_port *)RC;
-	struct ubicom32_io_port *ioh = (struct ubicom32_io_port *)RH;
-	unsigned int ctl;
-	unsigned int div = 0;
-	const u16_t mult[] = {64, 96, 128, 192, 256, 384, 512, 768, 1024};
-	int i;
-	int j;
-
-
-	for (i = 0; i < sizeof(mult) / sizeof(u16_t); i++) {
-		for (j = 0; j < cpd->n_mclk; j++) {
-			if (((unsigned int)rate * (unsigned int)mult[i]) ==
-			     cpd->mclk_entries[j].rate) {
-				div = cpd->mclk_entries[j].div;
-				break;
-			}
-		}
-	}
-
-	ctl = ((div - 1) << 16) | (div / 2);
-
-	switch (cpd->mclk_src) {
-	case UBI32_CS4384_MCLK_PWM_0:
-		ioc->ctl1 = ctl;
-		return 0;
-
-	case UBI32_CS4384_MCLK_PWM_1:
-		ioc->ctl2 = ctl;
-		return 0;
-
-	case UBI32_CS4384_MCLK_PWM_2:
-		ioh->ctl1 = ctl;
-		return 0;
-
-	case UBI32_CS4384_MCLK_CLKDIV_1:
-		ioa->ctl1 &= ~(0x7F << 14);
-		ioa->ctl1 |= ((div - 1) << 14);
-		return 0;
-
-	case UBI32_CS4384_MCLK_OTHER:
-		return 0;
-	}
-
-	return 1;
-}
-
-/*
- * snd_ubi32_cs4384_set_channels
- *	Mute unused channels
- */
-static int snd_ubi32_cs4384_set_channels(struct ubi32_snd_priv *priv, int channels)
-{
-	struct i2c_client *client = (struct i2c_client *)priv->client;
-	struct snd_ubi32_cs4384_priv *cs4384_priv;
-	unsigned char send[2];
-	int ret;
-	int i;
-	unsigned long flags;
-
-	/*
-	 * Only support 0, 2, 4, 6, 8 channels
-	 */
-	if ((channels > 8) || (channels & 1)) {
-		return -EINVAL;
-	}
-
-	cs4384_priv = snd_ubi32_priv_get_drv(priv);
-	spin_lock_irqsave(&cs4384_priv->lock, flags);
-
-	/*
-	 * Address 09h, Mute control
-	 */
-	send[0] = 0x09;
-	send[1] = (unsigned char)(0xFF << channels);
-
-	ret = i2c_master_send(client, send, 2);
-
-	spin_unlock_irqrestore(&cs4384_priv->lock, flags);
-
-	/*
-	 * Notify the system that we changed the mutes
-	 */
-	cs4384_priv->mute = (unsigned char)(0xFF << channels);
-
-	for (i = SND_UBI32_MUTE_CTL_START; i < SND_UBI32_MUTE_CTL_END; i++) {
-		snd_ctl_notify(priv->card, SNDRV_CTL_EVENT_MASK_VALUE,
-			       &cs4384_priv->kctls[i]->id);
-	}
-
-	if (ret != 2) {
-		return -ENXIO;
-	}
-
-	return 0;
-}
-
-/*
- * snd_ubi32_cs4384_dac_init
- */
-static int snd_ubi32_cs4384_dac_init(struct i2c_client *client, const struct i2c_device_id *id)
-{
-	int ret;
-	unsigned char send[2];
-	unsigned char recv[2];
-
-	/*
-	 * Initialize the CS4384 DAC over the I2C interface
-	 */
-	snd_printk(KERN_INFO "Initializing CS4384 DAC\n");
-
-	/*
-	 * Register 0x01: device/revid
-	 */
-	send[0] = 0x01;
-	ret = i2c_master_send(client, send, 1);
-	if (ret != 1) {
-		snd_printk(KERN_ERR "Failed 1st attempt to write to CS4384 register 0x01\n");
-		goto fail;
-	}
-	ret = i2c_master_recv(client, recv, 1);
-	if (ret != 1) {
-		snd_printk(KERN_ERR "Failed initial read of CS4384 registers\n");
-		goto fail;
-	}
-	snd_printk(KERN_INFO "CS4384 DAC Device/Rev: %08x\n", recv[0]);
-
-	/*
-	 * Register 0x02: Mode Control 1
-	 *	Control Port Enable, PCM, All DACs enabled, Power Down
-	 */
-	send[0] = 0x02;
-	send[1] = 0x81;
-	ret = i2c_master_send(client, send, 2);
-	if (ret != 2) {
-		snd_printk(KERN_ERR "Failed to set CPEN CS4384\n");
-		goto fail;
-	}
-
-	/*
-	 * Register 0x08: Ramp and Mute
-	 *	RMP_UP, RMP_DN, PAMUTE, DAMUTE
-	 */
-	send[0] = 0x08;
-	send[1] = 0xBC;
-	ret = i2c_master_send(client, send, 2);
-	if (ret != 2) {
-		snd_printk(KERN_ERR "Failed to set CPEN CS4384\n");
-		goto fail;
-	}
-
-	/*
-	 * Register 0x03: PCM Control
-	 *	I2S DIF[3:0] = 0001, no De-Emphasis, Auto speed mode
-	 */
-	send[0] = 0x03;
-	send[1] = 0x13;
-	ret = i2c_master_send(client, send, 2);
-	if (ret != 2) {
-		snd_printk(KERN_ERR "Failed to set CS4384 to I2S mode\n");
-		goto fail;
-	}
-
-	/*
-	 * Register 0x0B/0x0C: Volume control A1/B1
-	 * Register 0x0E/0x0F: Volume control A2/B2
-	 * Register 0x11/0x12: Volume control A3/B3
-	 * Register 0x14/0x15: Volume control A4/B4
-	 */
-	send[0] = 0x80 | 0x0B;
-	send[1] = 0x00;
-	send[2] = 0x00;
-	ret = i2c_master_send(client, send, 3);
-	if (ret != 3) {
-		snd_printk(KERN_ERR "Failed to set ch1 volume on CS4384\n");
-		goto fail;
-	}
-
-	send[0] = 0x80 | 0x0E;
-	send[1] = 0x00;
-	send[2] = 0x00;
-	ret = i2c_master_send(client, send, 3);
-	if (ret != 3) {
-		snd_printk(KERN_ERR "Failed to set ch2 volume on CS4384\n");
-		goto fail;
-	}
-
-	send[0] = 0x80 | 0x11;
-	send[1] = 0x00;
-	send[2] = 0x00;
-	ret = i2c_master_send(client, send, 3);
-	if (ret != 3) {
-		snd_printk(KERN_ERR "Failed to set ch3 volume on CS4384\n");
-		goto fail;
-	}
-
-	send[0] = 0x80 | 0x14;
-	send[1] = 0x00;
-	send[2] = 0x00;
-	ret = i2c_master_send(client, send, 3);
-	if (ret != 3) {
-		snd_printk(KERN_ERR "Failed to set ch4 volume on CS4384\n");
-		goto fail;
-	}
-
-	/*
-	 * Register 09h: Mute control
-	 *	Mute all (we will unmute channels as needed)
-	 */
-	send[0] = 0x09;
-	send[1] = 0xFF;
-	ret = i2c_master_send(client, send, 2);
-	if (ret != 2) {
-		snd_printk(KERN_ERR "Failed to power up CS4384\n");
-		goto fail;
-	}
-
-	/*
-	 * Register 0x02: Mode Control 1
-	 *	Control Port Enable, PCM, All DACs enabled, Power Up
-	 */
-	send[0] = 0x02;
-	send[1] = 0x80;
-	ret = i2c_master_send(client, send, 2);
-	if (ret != 2) {
-		snd_printk(KERN_ERR "Failed to power up CS4384\n");
-		goto fail;
-	}
-
-	/*
-	 * Make sure the changes took place, this helps verify we are talking to
-	 * the correct chip.
-	 */
-	send[0] = 0x80 | 0x03;
-	ret = i2c_master_send(client, send, 1);
-	if (ret != 1) {
-		snd_printk(KERN_ERR "Failed to initiate readback\n");
-		goto fail;
-	}
-
-	ret = i2c_master_recv(client, recv, 1);
-	if (ret != 1) {
-		snd_printk(KERN_ERR "Failed second read of CS4384 registers\n");
-		goto fail;
-	}
-
-	if (recv[0] != 0x13) {
-		snd_printk(KERN_ERR "Failed to initialize CS4384 DAC\n");
-		goto fail;
-	}
-
-	snd_printk(KERN_INFO "CS4384 DAC Initialized\n");
-	return 0;
-
-fail:
-	return -ENODEV;
-}
-
-/*
- * snd_ubi32_cs4384_i2c_probe
- */
-static int snd_ubi32_cs4384_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id)
-{
-	struct snd_card *card;
-	struct ubi32_snd_priv *ubi32_priv;
-	int err, ret;
-	struct platform_device *pdev;
-	struct ubi32_cs4384_platform_data *pdata;
-	struct snd_ubi32_cs4384_priv *cs4384_priv;
-
-	/*
-	 * pdev is audio device
-	 */
-	pdev = client->dev.platform_data;
-	if (!pdev) {
-		return -ENODEV;
-	}
-
-	/*
-	 * pdev->dev.platform_data is ubi32-pcm platform_data
-	 */
-	pdata = audio_device_priv(pdev);
-	if (!pdata) {
-		return -ENODEV;
-	}
-
-	/*
-	 * Initialize the CS4384 DAC
-	 */
-	ret = snd_ubi32_cs4384_dac_init(client, id);
-	if (ret < 0) {
-		/*
-		 * Initialization failed.  Propagate the error.
-		 */
-		return ret;
-	}
-
-	if (snd_ubi32_cs4384_setup_mclk(pdata)) {
-		return -EINVAL;
-	}
-
-	/*
-	 * Create a snd_card structure
-	 */
-	card = snd_card_new(index, "Ubi32-CS4384", THIS_MODULE, sizeof(struct ubi32_snd_priv));
-	if (card == NULL) {
-		return -ENOMEM;
-	}
-
-	card->private_free = snd_ubi32_cs4384_free;
-	ubi32_priv = card->private_data;
-
-	/*
-	 * Initialize the snd_card's private data structure
-	 */
-	ubi32_priv->card = card;
-	ubi32_priv->client = client;
-	ubi32_priv->set_channels = snd_ubi32_cs4384_set_channels;
-	ubi32_priv->set_rate = snd_ubi32_cs4384_set_rate;
-
-	/*
-	 * CS4384 DAC has a minimum sample rate of 4khz and an
-	 * upper limit of 216khz for it's auto-detect.
-	 */
-	ubi32_priv->min_sample_rate = 4000;
-	ubi32_priv->max_sample_rate = 216000;
-
-	/*
-	 * Create our private data (to manage volume, etc)
-	 */
-	cs4384_priv = kzalloc(sizeof(struct snd_ubi32_cs4384_priv), GFP_KERNEL);
-	if (!cs4384_priv) {
-		snd_card_free(card);
-		return -ENOMEM;
-	}
-	snd_ubi32_priv_set_drv(ubi32_priv, cs4384_priv);
-	spin_lock_init(&cs4384_priv->lock);
-
-	/*
-	 * We start off all muted and max volume
-	 */
-	cs4384_priv->mute = 0xFF;
-	memset(cs4384_priv->volume, 0xFF, 8);
-
-	/*
-	 * Create the new PCM instance
-	 */
-	err = snd_ubi32_pcm_probe(ubi32_priv, pdev);
-	if (err < 0) {
-		snd_card_free(card);
-		return err; /* What is err?  Need to include correct file */
-	}
-
-	strcpy(card->driver, "Ubi32-CS4384");
-	strcpy(card->shortname, "Ubi32-CS4384");
-	snprintf(card->longname, sizeof(card->longname),
-		"%s at sendirq=%d.%d recvirq=%d.%d regs=%p",
-		card->shortname, ubi32_priv->tx_irq, ubi32_priv->irq_idx,
-		ubi32_priv->rx_irq, ubi32_priv->irq_idx, ubi32_priv->adr);
-
-	snd_card_set_dev(card, &client->dev);
-
-	/*
-	 * Set up the mixer
-	 */
-	snd_ubi32_cs4384_mixer(ubi32_priv);
-
-	/*
-	 * Register the sound card
-	 */
-	if ((err = snd_card_register(card)) != 0) {
-		snd_printk(KERN_INFO "snd_card_register error\n");
-	}
-
-	/*
-	 * Store card for access from other methods
-	 */
-	i2c_set_clientdata(client, card);
-
-	return 0;
-}
-
-/*
- * snd_ubi32_cs4384_i2c_remove
- */
-static int __devexit snd_ubi32_cs4384_i2c_remove(struct i2c_client *client)
-{
-	struct snd_card *card;
-	struct ubi32_snd_priv *ubi32_priv;
-
-	card = i2c_get_clientdata(client);
-
-	ubi32_priv = card->private_data;
-	snd_ubi32_pcm_remove(ubi32_priv);
-
-	snd_card_free(i2c_get_clientdata(client));
-	i2c_set_clientdata(client, NULL);
-
-	return 0;
-}
-
-/*
- * I2C driver description
- */
-static struct i2c_driver snd_ubi32_cs4384_driver = {
-	.driver = {
-		.name = DRIVER_NAME,
-		.owner = THIS_MODULE,
-	},
-	.id_table	= snd_ubi32_cs4384_id,
-	.probe		= snd_ubi32_cs4384_i2c_probe,
-	.remove		= __devexit_p(snd_ubi32_cs4384_i2c_remove),
-};
-
-/*
- * Driver init
- */
-static int __init snd_ubi32_cs4384_init(void)
-{
-	return i2c_add_driver(&snd_ubi32_cs4384_driver);
-}
-module_init(snd_ubi32_cs4384_init);
-
-/*
- * snd_ubi32_cs4384_exit
- */
-static void __exit snd_ubi32_cs4384_exit(void)
-{
-	i2c_del_driver(&snd_ubi32_cs4384_driver);
-}
-module_exit(snd_ubi32_cs4384_exit);
-
-/*
- * Module properties
- */
-MODULE_ALIAS("i2c:" DRIVER_NAME);
-MODULE_AUTHOR("Patrick Tjin");
-MODULE_DESCRIPTION("Driver for Ubicom32 audio devices CS4384");
-MODULE_LICENSE("GPL");
diff --git a/target/linux/ubicom32/files/sound/ubicom32/ubi32-generic-capture.c b/target/linux/ubicom32/files/sound/ubicom32/ubi32-generic-capture.c
deleted file mode 100644
index a911cc6a1..000000000
--- a/target/linux/ubicom32/files/sound/ubicom32/ubi32-generic-capture.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * sound/ubicom32/ubi32-generic-capture.c
- *	Interface to ubicom32 virtual audio peripheral
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#include <linux/platform_device.h>
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <sound/core.h>
-#include <sound/pcm.h>
-#include <sound/initval.h>
-#include "ubi32.h"
-
-#define DRIVER_NAME "snd-ubi32-generic-capture"
-
-/*
- * Module properties
- */
-static int index = SNDRV_DEFAULT_IDX1; /* Index 0-MAX */
-
-/*
- * Card private data free function
- */
-void snd_ubi32_generic_capture_free(struct snd_card *card)
-{
-	/*
-	 * Free all the fields in the snd_ubi32_priv struct
-	 */
-	// Nothing to free at this time because ubi32_priv just maintains pointers
-}
-
-/*
- * Ubicom audio driver probe() method.  Args change depending on whether we use
- * platform_device or i2c_device.
- */
-static int snd_ubi32_generic_capture_probe(struct platform_device *dev)
-{
-	struct snd_card *card;
-	struct ubi32_snd_priv *ubi32_priv;
-	int err;
-
-	/*
-	 * Create a snd_card structure
-	 */
-	card = snd_card_new(index, "Ubi32-Generic-C", THIS_MODULE, sizeof(struct ubi32_snd_priv));
-
-	if (card == NULL) {
-		return -ENOMEM;
-	}
-
-	card->private_free = snd_ubi32_generic_capture_free; /* Not sure if correct */
-	ubi32_priv = card->private_data;
-
-	/*
-	 * Initialize the snd_card's private data structure
-	 */
-	ubi32_priv->card = card;
-	ubi32_priv->is_capture = 1;
-
-	/*
-	 * Create the new PCM instance
-	 */
-	err = snd_ubi32_pcm_probe(ubi32_priv, dev);
-	if (err < 0) {
-		snd_card_free(card);
-		return err;
-	}
-
-	strcpy(card->driver, "Ubi32-Generic-C");
-	strcpy(card->shortname, "Ubi32-Generic-C");
-	snprintf(card->longname, sizeof(card->longname),
-		"%s at sendirq=%d.%d recvirq=%d.%d regs=%p",
-		card->shortname, ubi32_priv->tx_irq, ubi32_priv->irq_idx,
-		ubi32_priv->rx_irq, ubi32_priv->irq_idx, ubi32_priv->adr);
-
-	snd_card_set_dev(card, &dev->dev);
-
-	/* Register the sound card */
-	if ((err = snd_card_register(card)) != 0) {
-		snd_printk(KERN_INFO "snd_card_register error\n");
-	}
-
-	/* Store card for access from other methods */
-	platform_set_drvdata(dev, card);
-
-	return 0;
-}
-
-/*
- * Ubicom audio driver remove() method
- */
-static int __devexit snd_ubi32_generic_capture_remove(struct platform_device *dev)
-{
-	struct snd_card *card;
-	struct ubi32_snd_priv *ubi32_priv;
-
-	card = platform_get_drvdata(dev);
-	ubi32_priv = card->private_data;
-	snd_ubi32_pcm_remove(ubi32_priv);
-
-	snd_card_free(platform_get_drvdata(dev));
-	platform_set_drvdata(dev, NULL);
-	return 0;
-}
-
-/*
- * Platform driver definition
- */
-static struct platform_driver snd_ubi32_generic_capture_driver = {
-	.driver = {
-		.name = DRIVER_NAME,
-		.owner = THIS_MODULE,
-	},
-	.probe = snd_ubi32_generic_capture_probe,
-	.remove = __devexit_p(snd_ubi32_generic_capture_remove),
-};
-
-/*
- * snd_ubi32_generic_capture_init
- */
-static int __init snd_ubi32_generic_capture_init(void)
-{
-	return platform_driver_register(&snd_ubi32_generic_capture_driver);
-}
-module_init(snd_ubi32_generic_capture_init);
-
-/*
- * snd_ubi32_generic_capture_exit
- */
-static void __exit snd_ubi32_generic_capture_exit(void)
-{
-	platform_driver_unregister(&snd_ubi32_generic_capture_driver);
-}
-module_exit(snd_ubi32_generic_capture_exit);
-
-/*
- * Module properties
- */
-//#if defined(CONFIG_SND_UBI32_AUDIO_I2C)
-//MODULE_ALIAS("i2c:snd-ubi32");
-//#endif
-MODULE_AUTHOR("Patrick Tjin");
-MODULE_DESCRIPTION("Driver for Ubicom32 audio devices");
-MODULE_LICENSE("GPL");
diff --git a/target/linux/ubicom32/files/sound/ubicom32/ubi32-generic.c b/target/linux/ubicom32/files/sound/ubicom32/ubi32-generic.c
deleted file mode 100644
index eee6066ce..000000000
--- a/target/linux/ubicom32/files/sound/ubicom32/ubi32-generic.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * sound/ubicom32/ubi32-generic.c
- *	Interface to ubicom32 virtual audio peripheral
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#include <linux/platform_device.h>
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <sound/core.h>
-#include <sound/pcm.h>
-#include <sound/initval.h>
-#include "ubi32.h"
-
-#define DRIVER_NAME "snd-ubi32-generic"
-
-/*
- * Module properties
- */
-static int index = SNDRV_DEFAULT_IDX1; /* Index 0-MAX */
-
-/*
- * Card private data free function
- */
-void snd_ubi32_generic_free(struct snd_card *card)
-{
-	/*
-	 * Free all the fields in the snd_ubi32_priv struct
-	 */
-	// Nothing to free at this time because ubi32_priv just maintains pointers
-}
-
-/*
- * Ubicom audio driver probe() method.  Args change depending on whether we use
- * platform_device or i2c_device.
- */
-static int snd_ubi32_generic_probe(struct platform_device *dev)
-{
-	struct snd_card *card;
-	struct ubi32_snd_priv *ubi32_priv;
-	int err;
-
-	/*
-	 * Create a snd_card structure
-	 */
-	card = snd_card_new(index, "Ubi32-Generic", THIS_MODULE, sizeof(struct ubi32_snd_priv));
-
-	if (card == NULL) {
-		return -ENOMEM;
-	}
-
-	card->private_free = snd_ubi32_generic_free; /* Not sure if correct */
-	ubi32_priv = card->private_data;
-
-	/*
-	 * Initialize the snd_card's private data structure
-	 */
-	ubi32_priv->card = card;
-
-	/*
-	 * Create the new PCM instance
-	 */
-	err = snd_ubi32_pcm_probe(ubi32_priv, dev);
-	if (err < 0) {
-		snd_card_free(card);
-		return err;
-	}
-
-	strcpy(card->driver, "Ubi32-Generic");
-	strcpy(card->shortname, "Ubi32-Generic");
-	snprintf(card->longname, sizeof(card->longname),
-		"%s at sendirq=%d.%d recvirq=%d.%d regs=%p",
-		card->shortname, ubi32_priv->tx_irq, ubi32_priv->irq_idx,
-		ubi32_priv->rx_irq, ubi32_priv->irq_idx, ubi32_priv->adr);
-
-	snd_card_set_dev(card, &dev->dev);
-
-	/* Register the sound card */
-	if ((err = snd_card_register(card)) != 0) {
-		snd_printk(KERN_INFO "snd_card_register error\n");
-	}
-
-	/* Store card for access from other methods */
-	platform_set_drvdata(dev, card);
-
-	return 0;
-}
-
-/*
- * Ubicom audio driver remove() method
- */
-static int __devexit snd_ubi32_generic_remove(struct platform_device *dev)
-{
-	struct snd_card *card;
-	struct ubi32_snd_priv *ubi32_priv;
-
-	card = platform_get_drvdata(dev);
-	ubi32_priv = card->private_data;
-	snd_ubi32_pcm_remove(ubi32_priv);
-
-	snd_card_free(platform_get_drvdata(dev));
-	platform_set_drvdata(dev, NULL);
-	return 0;
-}
-
-/*
- * Platform driver definition
- */
-static struct platform_driver snd_ubi32_generic_driver = {
-	.driver = {
-		.name = DRIVER_NAME,
-		.owner = THIS_MODULE,
-	},
-	.probe = snd_ubi32_generic_probe,
-	.remove = __devexit_p(snd_ubi32_generic_remove),
-};
-
-/*
- * snd_ubi32_generic_init
- */
-static int __init snd_ubi32_generic_init(void)
-{
-	return platform_driver_register(&snd_ubi32_generic_driver);
-}
-module_init(snd_ubi32_generic_init);
-
-/*
- * snd_ubi32_generic_exit
- */
-static void __exit snd_ubi32_generic_exit(void)
-{
-	platform_driver_unregister(&snd_ubi32_generic_driver);
-}
-module_exit(snd_ubi32_generic_exit);
-
-/*
- * Module properties
- */
-//#if defined(CONFIG_SND_UBI32_AUDIO_I2C)
-//MODULE_ALIAS("i2c:snd-ubi32");
-//#endif
-MODULE_AUTHOR("Aaron Jow, Patrick Tjin");
-MODULE_DESCRIPTION("Driver for Ubicom32 audio devices");
-MODULE_LICENSE("GPL");
diff --git a/target/linux/ubicom32/files/sound/ubicom32/ubi32-pcm.c b/target/linux/ubicom32/files/sound/ubicom32/ubi32-pcm.c
deleted file mode 100644
index 2bc300b85..000000000
--- a/target/linux/ubicom32/files/sound/ubicom32/ubi32-pcm.c
+++ /dev/null
@@ -1,711 +0,0 @@
-/*
- * sound/ubicom32/ubi32-pcm.c
- *	Interface to ubicom32 virtual audio peripheral
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- *
- * Ubicom32 implementation derived from (with many thanks):
- *   arch/m68knommu
- *   arch/blackfin
- *   arch/parisc
- */
-
-#include <linux/interrupt.h>
-#include <sound/core.h>
-#include <sound/pcm.h>
-#include <sound/pcm_params.h>
-#include <asm/ip5000.h>
-#include <asm/ubi32-pcm.h>
-#include <linux/dma-mapping.h>
-#include <linux/delay.h>
-#include "ubi32.h"
-
-struct ubi32_snd_runtime_data {
-	dma_addr_t dma_buffer;		/* Physical address of DMA buffer */
-	dma_addr_t dma_buffer_end;	/* First address beyond end of DMA buffer */
-	size_t period_size;
-	dma_addr_t period_ptr;		/* Physical address of next period */
-	unsigned int flags;
-};
-
-static void snd_ubi32_vp_int_set(struct snd_pcm *pcm)
-{
-	struct ubi32_snd_priv *ubi32_priv = pcm->private_data;
-	ubi32_priv->ar->int_req |= (1 << ubi32_priv->irq_idx);
-	ubicom32_set_interrupt(ubi32_priv->tx_irq);
-}
-
-static snd_pcm_uframes_t snd_ubi32_pcm_pointer(struct snd_pcm_substream *substream)
-{
-
-	struct ubi32_snd_priv *ubi32_priv = snd_pcm_substream_chip(substream);
-	struct audio_dev_regs *adr = ubi32_priv->adr;
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	struct ubi32_snd_runtime_data *ubi32_rd = substream->runtime->private_data;
-
-	dma_addr_t read_pos;
-
-	snd_pcm_uframes_t frames;
-	if (!adr->primary_os_buffer_ptr) {
-		/*
-		 * If primary_os_buffer_ptr is NULL (e.g. right after the HW is started or
-		 * when the HW is stopped), then handle this case separately.
-		 */
-		return 0;
-	}
-
-	read_pos = (dma_addr_t)adr->primary_os_buffer_ptr;
-	frames = bytes_to_frames(runtime, read_pos - ubi32_rd->dma_buffer);
-	if (frames == runtime->buffer_size) {
-		frames = 0;
-	}
-	return frames;
-}
-
-/*
- * Audio trigger
- */
-static int snd_ubi32_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
-{
-	struct ubi32_snd_priv *ubi32_priv = substream->pcm->private_data;
-	struct audio_dev_regs *adr = ubi32_priv->adr;
-	struct ubi32_snd_runtime_data *ubi32_rd = substream->runtime->private_data;
-	int ret = 0;
-
-#ifdef CONFIG_SND_DEBUG
-	snd_printk(KERN_INFO "snd_ubi32_pcm_trigger cmd=%d=", cmd);
-#endif
-
-	if (adr->command != AUDIO_CMD_NONE) {
-		snd_printk(KERN_WARNING "Can't send command to audio device at this time\n");
-		// Set a timer to call this function back later.  How to do this?
-		return 0;
-	}
-
-	/*
-	 * Set interrupt flag to indicate that we interrupted audio device
-	 * to send a command
-	 */
-
-	switch (cmd) {
-	case SNDRV_PCM_TRIGGER_START:
-
-#ifdef CONFIG_SND_DEBUG
-		snd_printk(KERN_INFO "START\n");
-#endif
-		/*
-		 * Ready the DMA transfer
-		 */
-		ubi32_rd->period_ptr = ubi32_rd->dma_buffer;
-
-#ifdef CONFIG_SND_DEBUG
-		snd_printk(KERN_INFO "trigger period_ptr=%lx\n", (unsigned long)ubi32_rd->period_ptr);
-#endif
-		adr->dma_xfer_requests[0].ptr = (void *)ubi32_rd->period_ptr;
-		adr->dma_xfer_requests[0].ctr = ubi32_rd->period_size;
-		adr->dma_xfer_requests[0].active = 1;
-
-#ifdef CONFIG_SND_DEBUG
-		snd_printk(KERN_INFO "xfer_request 0 ptr=0x%x ctr=%u\n", ubi32_rd->period_ptr, ubi32_rd->period_size);
-#endif
-
-		ubi32_rd->period_ptr += ubi32_rd->period_size;
-		adr->dma_xfer_requests[1].ptr = (void *)ubi32_rd->period_ptr;
-		adr->dma_xfer_requests[1].ctr = ubi32_rd->period_size;
-		adr->dma_xfer_requests[1].active = 1;
-
-#ifdef CONFIG_SND_DEBUG
-		snd_printk(KERN_INFO "xfer_request 1 ptr=0x%x ctr=%u\n", ubi32_rd->period_ptr, ubi32_rd->period_size);
-#endif
-
-		/*
-		 * Tell the VP that we want to begin playback by filling in the
-		 * command field and then interrupting the audio VP
-		 */
-		adr->int_flags |= AUDIO_INT_FLAG_COMMAND;
-		adr->command = AUDIO_CMD_START;
-		snd_ubi32_vp_int_set(substream->pcm);
-		break;
-
-	case SNDRV_PCM_TRIGGER_STOP:
-
-#ifdef CONFIG_SND_DEBUG
-		snd_printk(KERN_INFO "STOP\n");
-#endif
-
-		/*
-		 * Tell the VP that we want to stop playback by filling in the
-		 * command field and then interrupting the audio VP
-		 */
-		adr->int_flags |= AUDIO_INT_FLAG_COMMAND;
-		adr->command = AUDIO_CMD_STOP;
-		snd_ubi32_vp_int_set(substream->pcm);
-		break;
-
-	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-
-#ifdef CONFIG_SND_DEBUG
-		snd_printk(KERN_INFO "PAUSE_PUSH\n");
-#endif
-
-		/*
-		 * Tell the VP that we want to pause playback by filling in the
-		 * command field and then interrupting the audio VP
-		 */
-		adr->int_flags |= AUDIO_INT_FLAG_COMMAND;
-		adr->command = AUDIO_CMD_PAUSE;
-		snd_ubi32_vp_int_set(substream->pcm);
-		break;
-
-	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-
-#ifdef CONFIG_SND_DEBUG
-		snd_printk(KERN_INFO "PAUSE_RELEASE\n");
-#endif
-		/*
-		 * Tell the VP that we want to resume paused playback by filling
-		 * in the command field and then interrupting the audio VP
-		 */
-		adr->int_flags |= AUDIO_INT_FLAG_COMMAND;
-		adr->command = AUDIO_CMD_RESUME;
-		snd_ubi32_vp_int_set(substream->pcm);
-		break;
-
-	default:
-		snd_printk(KERN_WARNING "Unhandled trigger\n");
-		ret = -EINVAL;
-		break;
-	}
-
-	return ret;
-}
-
-/*
- * Prepare to transfer an audio stream to the codec
- */
-static int snd_ubi32_pcm_prepare(struct snd_pcm_substream *substream)
-{
-	/*
-	 * Configure registers and setup the runtime instance for DMA transfers
-	 */
-	struct ubi32_snd_priv *ubi32_priv = substream->pcm->private_data;
-	struct audio_dev_regs *adr = ubi32_priv->adr;
-
-#ifdef CONFIG_SND_DEBUG
-	snd_printk(KERN_INFO "snd_ubi32_pcm_prepare: sending STOP command to audio device\n");
-#endif
-
-	/*
-	 * Make sure the audio device is stopped
-	 */
-
-	/*
-	 * Set interrupt flag to indicate that we interrupted audio device
-	 * to send a command
-	 */
-	adr->int_flags |= AUDIO_INT_FLAG_COMMAND;
-	adr->command = AUDIO_CMD_STOP;
-	snd_ubi32_vp_int_set(substream->pcm);
-
-	return 0;
-}
-
-/*
- * Allocate DMA buffers from preallocated memory.
- * Preallocation was done in snd_ubi32_pcm_new()
- */
-static int snd_ubi32_pcm_hw_params(struct snd_pcm_substream *substream,
-					struct snd_pcm_hw_params *hw_params)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	struct ubi32_snd_priv *ubi32_priv = substream->pcm->private_data;
-	struct audio_dev_regs *adr = ubi32_priv->adr;
-	struct ubi32_snd_runtime_data *ubi32_rd = substream->runtime->private_data;
-
-	/*
-	 * Use pre-allocated memory from ubi32_snd_pcm_new() to satisfy
-	 * this memory request.
-	 */
-	int ret = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
-	if (ret < 0) {
-		return ret;
-	}
-
-#ifdef CONFIG_SND_DEBUG
-	snd_printk(KERN_INFO "snd_ubi32_pcm_hw_params\n");
-#endif
-
-	if (!(adr->channel_mask & (1 << params_channels(hw_params)))) {
-		snd_printk(KERN_INFO "snd_ubi32_pcm_hw_params unsupported number of channels %d mask %08x\n", params_channels(hw_params), adr->channel_mask);
-		return -EINVAL;
-	}
-
-	if (ubi32_priv->set_channels) {
-		int ret = ubi32_priv->set_channels(ubi32_priv, params_channels(hw_params));
-		if (ret) {
-			snd_printk(KERN_WARNING "Unable to set channels to %d, ret=%d\n", params_channels(hw_params), ret);
-			return ret;
-		}
-	}
-
-	if (ubi32_priv->set_rate) {
-		int ret = ubi32_priv->set_rate(ubi32_priv, params_rate(hw_params));
-		if (ret) {
-			snd_printk(KERN_WARNING "Unable to set rate to %d, ret=%d\n", params_rate(hw_params), ret);
-			return ret;
-		}
-	}
-
-	if (ubi32_priv->pdata->set_rate) {
-		int ret = ubi32_priv->pdata->set_rate(ubi32_priv->pdata->appdata, params_rate(hw_params));
-		if (ret) {
-			snd_printk(KERN_WARNING "Unable to set rate to %d, ret=%d\n", params_rate(hw_params), ret);
-			return ret;
-		}
-	}
-
-	if (adr->command != AUDIO_CMD_NONE) {
-		snd_printk(KERN_WARNING "snd_ubi32_pcm_hw_params: tio busy\n");
-		return -EAGAIN;
-	}
-
-	if (params_format(hw_params) == SNDRV_PCM_FORMAT_S16_LE) {
-		adr->flags |= CMD_START_FLAG_LE;
-	} else {
-		adr->flags &= ~CMD_START_FLAG_LE;
-	}
-	adr->channels = params_channels(hw_params);
-	adr->sample_rate = params_rate(hw_params);
-	adr->command = AUDIO_CMD_SETUP;
-	adr->int_flags |= AUDIO_INT_FLAG_COMMAND;
-	snd_ubi32_vp_int_set(substream->pcm);
-
-	/*
-	 * Wait for the command to complete
-	 */
-	while (adr->command != AUDIO_CMD_NONE) {
-		udelay(1);
-	}
-
-	/*
-	 * Put the DMA info into the DMA descriptor that we will
-	 * use to do transfers to our audio VP "hardware"
-	 */
-
-	/*
-	 * Mark both DMA transfers as not ready/inactive
-	 */
-	adr->dma_xfer_requests[0].active = 0;
-	adr->dma_xfer_requests[1].active = 0;
-
-	/*
-	 * Put the location of the buffer into the runtime data instance
-	 */
-	ubi32_rd->dma_buffer = (dma_addr_t)runtime->dma_area;
-	ubi32_rd->dma_buffer_end = (dma_addr_t)(runtime->dma_area + runtime->dma_bytes);
-
-	/*
-	 * Get the period size
-	 */
-	ubi32_rd->period_size = params_period_bytes(hw_params);
-
-#ifdef CONFIG_SND_DEBUG
-	snd_printk(KERN_INFO "DMA for ubi32 audio initialized dma_area=0x%x dma_bytes=%d, period_size=%d\n", (unsigned int)runtime->dma_area, (unsigned int)runtime->dma_bytes, ubi32_rd->period_size);
-	snd_printk(KERN_INFO "Private buffer ubi32_rd: dma_buffer=0x%x dma_buffer_end=0x%x ret=%d\n", ubi32_rd->dma_buffer, ubi32_rd->dma_buffer_end, ret);
-#endif
-
-	return ret;
-}
-
-/*
- * This is the reverse of snd_ubi32_pcm_hw_params
- */
-static int snd_ubi32_pcm_hw_free(struct snd_pcm_substream *substream)
-{
-#ifdef CONFIG_SND_DEBUG
-	snd_printk(KERN_INFO "snd_ubi32_pcm_hw_free\n");
-#endif
-	return snd_pcm_lib_free_pages(substream);
-}
-
-/*
- * Audio virtual peripheral capabilities (capture and playback are identical)
- */
-static struct snd_pcm_hardware snd_ubi32_pcm_hw =
-{
-	.info = (SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER |
-		 SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME),
-	.buffer_bytes_max = (64*1024),
-	.period_bytes_min	= 64,
-	.period_bytes_max	= 8184,//8184,//8176,
-	.periods_min = 2,
-	.periods_max = 255,
-	.fifo_size = 0, // THIS IS IGNORED BY ALSA
-};
-
-/*
- * We fill this in later
- */
-static struct snd_pcm_hw_constraint_list ubi32_pcm_rates;
-
-/*
- * snd_ubi32_pcm_close
- */
-static int snd_ubi32_pcm_close(struct snd_pcm_substream *substream)
-{
-	/* Disable codec, stop DMA, free private data structures */
-	//struct ubi32_snd_priv *ubi32_priv = snd_pcm_substream_chip(substream);
-	struct ubi32_snd_runtime_data *ubi32_rd = substream->runtime->private_data;
-
-#ifdef CONFIG_SND_DEBUG
-	snd_printk(KERN_INFO "snd_ubi32_pcm_close\n");
-#endif
-
-	substream->runtime->private_data = NULL;
-
-	kfree(ubi32_rd);
-
-	return 0;
-}
-
-/*
- * snd_ubi32_pcm_open
- */
-static int snd_ubi32_pcm_open(struct snd_pcm_substream *substream)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	struct ubi32_snd_runtime_data *ubi32_rd;
-	int ret = 0;
-
-#ifdef CONFIG_SND_DEBUG
-	snd_printk(KERN_INFO "ubi32 pcm open\n");
-#endif
-
-	/* Associate capabilities with component */
-	runtime->hw = snd_ubi32_pcm_hw;
-
-	/*
-	 * Inform ALSA about constraints of the audio device
-	 */
-	ret = snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE, &ubi32_pcm_rates);
-	if (ret < 0) {
-		snd_printk(KERN_INFO "invalid rate\n");
-		goto out;
-	}
-
-	/* Force the buffer size to be an integer multiple of period size */
-	ret = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);
-	if (ret < 0) {
-		snd_printk(KERN_INFO "invalid period\n");
-		goto out;
-	}
-	/* Initialize structures/registers */
-	ubi32_rd = kzalloc(sizeof(struct ubi32_snd_runtime_data), GFP_KERNEL);
-	if (ubi32_rd == NULL) {
-		ret = -ENOMEM;
-		goto out;
-	}
-
-	runtime->private_data = ubi32_rd;
-
-#ifdef CONFIG_SND_DEBUG
-	snd_printk(KERN_INFO "snd_ubi32_pcm_open returned 0\n");
-#endif
-
-	return 0;
-out:
-#ifdef CONFIG_SND_DEBUG
-	snd_printk(KERN_INFO "snd_ubi32_pcm_open returned %d\n", ret);
-#endif
-
-	return ret;
-}
-
-static struct snd_pcm_ops snd_ubi32_pcm_ops = {
-	.open = 	snd_ubi32_pcm_open, /* Open */
-	.close = 	snd_ubi32_pcm_close, /* Close */
-	.ioctl = 	snd_pcm_lib_ioctl, /* Generic IOCTL handler */
-	.hw_params = 	snd_ubi32_pcm_hw_params, /* Hardware parameters/capabilities */
-	.hw_free = 	snd_ubi32_pcm_hw_free, /* Free function for hw_params */
-	.prepare = 	snd_ubi32_pcm_prepare,
-	.trigger = 	snd_ubi32_pcm_trigger,
-	.pointer = 	snd_ubi32_pcm_pointer,
-};
-
-/*
- * Interrupt handler that gets called when the audio device
- * interrupts Linux
- */
-static irqreturn_t snd_ubi32_pcm_interrupt(int irq, void *appdata)
-{
-	struct snd_pcm *pcm = (struct snd_pcm *)appdata;
-	struct ubi32_snd_priv *ubi32_priv = pcm->private_data;
-	struct audio_dev_regs *adr = ubi32_priv->adr;
-	struct snd_pcm_substream *substream;
-	struct ubi32_snd_runtime_data *ubi32_rd;
-	int dma_to_fill = 0;
-
-	/*
-	 * Check to see if the interrupt is for us
-	 */
-	if (!(ubi32_priv->ar->int_status & (1 << ubi32_priv->irq_idx))) {
-		return IRQ_NONE;
-	}
-
-	/*
-	 * Clear the interrupt
-	 */
-	ubi32_priv->ar->int_status &= ~(1 << ubi32_priv->irq_idx);
-
-	/*
-	 * We only have one stream since we don't mix.  Therefore
-	 * we don't need to search through substreams.
-	 */
-	if (ubi32_priv->is_capture) {
-		substream = pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream;
-	} else {
-		substream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream;
-	}
-
-	if (!substream->runtime) {
-		snd_printk(KERN_WARNING "No runtime data\n");
-		return IRQ_NONE;
-	}
-
-	ubi32_rd = substream->runtime->private_data;
-
-#ifdef CONFIG_SND_DEBUG
-	snd_printk(KERN_INFO "Ubi32 ALSA interrupt\n");
-#endif
-
-	if (ubi32_rd == NULL) {
-		snd_printk(KERN_WARNING "No private data\n");
-		return IRQ_NONE;
-	}
-
-	// Check interrupt cause
-	if (0) {
-		// Handle the underflow case
-	} else if ((adr->status & AUDIO_STATUS_PLAY_DMA0_REQUEST) ||
-		   (adr->status & AUDIO_STATUS_PLAY_DMA1_REQUEST)) {
-		if (adr->status & AUDIO_STATUS_PLAY_DMA0_REQUEST) {
-			dma_to_fill = 0;
-			adr->status &= ~AUDIO_STATUS_PLAY_DMA0_REQUEST;
-		} else if (adr->status & AUDIO_STATUS_PLAY_DMA1_REQUEST) {
-			dma_to_fill = 1;
-			adr->status &= ~AUDIO_STATUS_PLAY_DMA1_REQUEST;
-		}
-		ubi32_rd->period_ptr += ubi32_rd->period_size;
-		if (ubi32_rd->period_ptr >= ubi32_rd->dma_buffer_end) {
-			ubi32_rd->period_ptr = ubi32_rd->dma_buffer;
-		}
-		adr->dma_xfer_requests[dma_to_fill].ptr = (void *)ubi32_rd->period_ptr;
-		adr->dma_xfer_requests[dma_to_fill].ctr = ubi32_rd->period_size;
-		adr->dma_xfer_requests[dma_to_fill].active = 1;
-#ifdef CONFIG_SND_DEBUG
-		snd_printk(KERN_INFO "xfer_request %d ptr=0x%x ctr=%u\n", dma_to_fill, ubi32_rd->period_ptr, ubi32_rd->period_size);
-#endif
-		adr->int_flags |= AUDIO_INT_FLAG_MORE_SAMPLES;
-		snd_ubi32_vp_int_set(substream->pcm);
-	}
-	// If we are interrupted by the VP, that means we completed
-	// processing one period of audio.  We need to inform the upper
-	// layers of ALSA of this.
-	snd_pcm_period_elapsed(substream);
-
-	return IRQ_HANDLED;
-}
-
-void __devexit snd_ubi32_pcm_remove(struct ubi32_snd_priv *ubi32_priv)
-{
-	struct snd_pcm *pcm = ubi32_priv->pcm;
-	free_irq(ubi32_priv->rx_irq, pcm);
-}
-
-#if SNDRV_PCM_RATE_5512 != 1 << 0 || SNDRV_PCM_RATE_192000 != 1 << 12
-#error "Change this table to match pcm.h"
-#endif
-static unsigned int rates[] __initdata = {5512, 8000, 11025, 16000, 22050,
-					  32000, 44100, 48000, 64000, 88200,
-					  96000, 176400, 192000};
-
-/*
- * snd_ubi32_pcm_probe
- */
-int __devinit snd_ubi32_pcm_probe(struct ubi32_snd_priv *ubi32_priv, struct platform_device *pdev)
-{
-	struct snd_pcm *pcm;
-	int ret, err;
-	int i;
-	int j;
-	int nrates;
-	unsigned int rate_max = 0;
-	unsigned int rate_min = 0xFFFFFFFF;
-	unsigned int rate_mask = 0;
-	struct audio_dev_regs *adr;
-	struct resource *res_adr;
-	struct resource *res_irq_tx;
-	struct resource *res_irq_rx;
-	struct ubi32pcm_platform_data *pdata;
-
-	pdata = pdev->dev.platform_data;
-	if (!pdata) {
-		return -ENODEV;
-	}
-
-	/*
-	 * Get our resources, adr is the hardware driver base address
-	 * and the tx and rx irqs are used to communicate with the
-	 * hardware driver.
-	 */
-	res_adr = platform_get_resource(pdev, IORESOURCE_MEM, AUDIO_MEM_RESOURCE);
-	res_irq_tx = platform_get_resource(pdev, IORESOURCE_IRQ, AUDIO_TX_IRQ_RESOURCE);
-	res_irq_rx = platform_get_resource(pdev, IORESOURCE_IRQ, AUDIO_RX_IRQ_RESOURCE);
-	if (!res_adr || !res_irq_tx || !res_irq_rx) {
-		snd_printk(KERN_WARNING "Could not get resources");
-		return -ENODEV;
-	}
-
-	ubi32_priv->ar = (struct audio_regs *)res_adr->start;
-	ubi32_priv->tx_irq = res_irq_tx->start;
-	ubi32_priv->rx_irq = res_irq_rx->start;
-	ubi32_priv->irq_idx = pdata->inst_num;
-	ubi32_priv->adr = &(ubi32_priv->ar->adr[pdata->inst_num]);
-
-	/*
-	 * Check the version
-	 */
-	adr = ubi32_priv->adr;
-	if (adr->version != AUDIO_DEV_REGS_VERSION) {
-		snd_printk(KERN_WARNING "This audio_dev_reg is not compatible with this driver\n");
-		return -ENODEV;
-	}
-
-	/*
-	 * Find out the standard rates, also find max and min rates
-	 */
-	for (i = 0; i < ARRAY_SIZE(rates); i++) {
-		int found = 0;
-		for (j = 0; j < adr->n_sample_rates; j++) {
-			if (rates[i] == adr->sample_rates[j]) {
-				/*
-				 * Check to see if it is supported by the dac
-				 */
-				if ((rates[i] >= ubi32_priv->min_sample_rate) &&
-				    (!ubi32_priv->max_sample_rate ||
-				     (ubi32_priv->max_sample_rate && (rates[i] <= ubi32_priv->max_sample_rate)))) {
-					found = 1;
-					rate_mask |= (1 << i);
-					nrates++;
-					if (rates[i] < rate_min) {
-						rate_min = rates[i];
-					}
-					if (rates[i] > rate_max) {
-						rate_max = rates[i];
-					}
-					break;
-				}
-			}
-		}
-		if (!found) {
-			rate_mask |= SNDRV_PCM_RATE_KNOT;
-		}
-	}
-
-	snd_ubi32_pcm_hw.rates = rate_mask;
-	snd_ubi32_pcm_hw.rate_min = rate_min;
-	snd_ubi32_pcm_hw.rate_max = rate_max;
-	ubi32_pcm_rates.count = adr->n_sample_rates;
-	ubi32_pcm_rates.list = (unsigned int *)adr->sample_rates;
-	ubi32_pcm_rates.mask = 0;
-
-	for (i = 0; i < 32; i++) {
-		if (adr->channel_mask & (1 << i)) {
-			if (!snd_ubi32_pcm_hw.channels_min) {
-				snd_ubi32_pcm_hw.channels_min = i;
-			}
-			snd_ubi32_pcm_hw.channels_max = i;
-		}
-	}
-	snd_printk(KERN_INFO "Ubi32PCM: channels_min:%u channels_max:%u\n",
-		   snd_ubi32_pcm_hw.channels_min,
-		   snd_ubi32_pcm_hw.channels_max);
-
-	if (adr->caps & AUDIONODE_CAP_BE) {
-		snd_ubi32_pcm_hw.formats |= SNDRV_PCM_FMTBIT_S16_BE;
-	}
-	if (adr->caps & AUDIONODE_CAP_LE) {
-		snd_ubi32_pcm_hw.formats |= SNDRV_PCM_FMTBIT_S16_LE;
-	}
-
-	snd_printk(KERN_INFO "Ubi32PCM: rates:%08x min:%u max:%u count:%d fmts:%016llx (%s)\n",
-		   snd_ubi32_pcm_hw.rates,
-		   snd_ubi32_pcm_hw.rate_min,
-		   snd_ubi32_pcm_hw.rate_max,
-		   ubi32_pcm_rates.count,
-		   snd_ubi32_pcm_hw.formats,
-		   ubi32_priv->is_capture ? "capture" : "playback");
-
-	if (ubi32_priv->is_capture) {
-		ret = snd_pcm_new(ubi32_priv->card, "Ubi32 PCM", 0, 0, 1, &pcm);
-	} else {
-		ret = snd_pcm_new(ubi32_priv->card, "Ubi32 PCM", 0, 1, 0, &pcm);
-	}
-
-	if (ret < 0) {
-		return ret;
-	}
-
-	pcm->private_data = ubi32_priv;
-	ubi32_priv->pcm = pcm;
-	ubi32_priv->pdata = pdata;
-
-	pcm->info_flags = 0;
-
-	strcpy(pcm->name, "Ubi32-PCM");
-
-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS,
-					      snd_dma_continuous_data(GFP_KERNEL),
-					      45*1024, 64*1024);
-
-	if (ubi32_priv->is_capture) {
-		snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_ubi32_pcm_ops);
-	} else {
-		snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_ubi32_pcm_ops);
-	}
-
-	/*
-	 * Start up the audio device
-	 */
-	adr->int_flags |= AUDIO_INT_FLAG_COMMAND;
-	adr->command = AUDIO_CMD_ENABLE;
-	snd_ubi32_vp_int_set(pcm);
-
-	/*
-	 * Request IRQ
-	 */
-	err = request_irq(ubi32_priv->rx_irq, snd_ubi32_pcm_interrupt, IRQF_SHARED | IRQF_DISABLED, pcm->name, pcm);
-	if (err) {
-		snd_printk(KERN_WARNING "request_irq failed: irq=%d err=%d\n", ubi32_priv->rx_irq, err);
-		return -ENODEV;
-	}
-
-	return ret;
-
-}
diff --git a/target/linux/ubicom32/files/sound/ubicom32/ubi32.h b/target/linux/ubicom32/files/sound/ubicom32/ubi32.h
deleted file mode 100644
index f43a2150b..000000000
--- a/target/linux/ubicom32/files/sound/ubicom32/ubi32.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * sound/ubicom32/ubi32.h
- *	Common header file for all ubi32- sound drivers
- *
- * (C) Copyright 2009, Ubicom, Inc.
- *
- * This file is part of the Ubicom32 Linux Kernel Port.
- *
- * The Ubicom32 Linux Kernel Port 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.
- *
- * The Ubicom32 Linux Kernel Port is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Ubicom32 Linux Kernel Port.  If not,
- * see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef _UBI32_H
-#define _UBI32_H
-
-#define SND_UBI32_DEBUG 0 // Debug flag
-
-#include <linux/platform_device.h>
-#include <asm/devtree.h>
-#include <asm/audio.h>
-#include <asm/ubi32-pcm.h>
-
-struct ubi32_snd_priv;
-
-typedef int (*set_channels_t)(struct ubi32_snd_priv *priv, int channels);
-typedef int (*set_rate_t)(struct ubi32_snd_priv *priv, int rate);
-
-struct ubi32_snd_priv {
-	/*
-	 * Any variables that are needed locally here but NOT in
-	 * the VP itself should go in here.
-	 */
-	struct snd_card *card;
-	struct snd_pcm *pcm;
-
-	/*
-	 * capture (1) or playback (0)
-	 */
-	int is_capture;
-	/*
-	 * DAC parameters.  These are the parameters for the specific
-	 * DAC we are driving.  The I2S component can run at a range
-	 * of frequencies, but the DAC may be limited.  We may want
-	 * to make this an array of some sort in the future?
-	 *
-	 * min/max_sample_rate if set to 0 are ignored.
-	 */
-	int max_sample_rate;
-	int min_sample_rate;
-
-	/*
-	 * The size a period (group) of audio samples.  The VP does
-	 * not need to know this; each DMA transfer is made to be
-	 * one period.
-	 */
-	u32_t period_size;
-
-	spinlock_t ubi32_lock;
-
-	struct audio_regs *ar;
-	struct audio_dev_regs *adr;
-	u32 irq_idx;
-	u8 tx_irq;
-	u8 rx_irq;
-
-	void *client;
-
-	/*
-	 * Operations which the base DAC driver can implement
-	 */
-	set_channels_t set_channels;
-	set_rate_t set_rate;
-
-	/*
-	 * platform data
-	 */
-	struct ubi32pcm_platform_data *pdata;
-
-	/*
-	 * Private driver data (used for DAC driver control, etc)
-	 */
-	void *drvdata;
-};
-
-#define snd_ubi32_priv_get_drv(priv) ((priv)->drvdata)
-#define snd_ubi32_priv_set_drv(priv, data) (((priv)->drvdata) = (void *)(data))
-
-extern int snd_ubi32_pcm_probe(struct ubi32_snd_priv *ubi32_priv, struct platform_device *pdev);
-extern void snd_ubi32_pcm_remove(struct ubi32_snd_priv *ubi32_priv);
-
-#endif
diff --git a/target/linux/ubicom32/image/Makefile b/target/linux/ubicom32/image/Makefile
deleted file mode 100644
index e733e0a37..000000000
--- a/target/linux/ubicom32/image/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# 
-# Copyright (C) 2006-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/image.mk
-
-# use default targets for everything
-
-$(eval $(call BuildImage))
diff --git a/target/linux/ubicom32/patches-2.6.30/100-ubicom32_support.patch b/target/linux/ubicom32/patches-2.6.30/100-ubicom32_support.patch
deleted file mode 100644
index eca2740a8..000000000
--- a/target/linux/ubicom32/patches-2.6.30/100-ubicom32_support.patch
+++ /dev/null
@@ -1,1741 +0,0 @@
---- a/drivers/char/hw_random/Kconfig
-+++ b/drivers/char/hw_random/Kconfig
-@@ -148,3 +148,16 @@ config HW_RANDOM_VIRTIO
- 
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called virtio-rng.  If unsure, say N.
-+
-+config HW_RANDOM_UBICOM32
-+	tristate "Ubicom32 HW Random Number Generator support"
-+	depends on HW_RANDOM && UBICOM32
-+	default HW_RANDOM
-+	---help---
-+	  This driver provides kernel-side support for the Random Number
-+	  Generator hardware found on Ubicom32 processors.
-+
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called pasemi-rng.
-+
-+	  If unsure, say Y.
---- a/drivers/char/hw_random/Makefile
-+++ b/drivers/char/hw_random/Makefile
-@@ -15,3 +15,4 @@ obj-$(CONFIG_HW_RANDOM_IXP4XX) += ixp4xx
- obj-$(CONFIG_HW_RANDOM_OMAP) += omap-rng.o
- obj-$(CONFIG_HW_RANDOM_PASEMI) += pasemi-rng.o
- obj-$(CONFIG_HW_RANDOM_VIRTIO) += virtio-rng.o
-+obj-$(CONFIG_HW_RANDOM_UBICOM32) += ubicom32-rng.o
---- a/drivers/crypto/Kconfig
-+++ b/drivers/crypto/Kconfig
-@@ -61,6 +61,40 @@ config CRYPTO_DEV_GEODE
- 	  To compile this driver as a module, choose M here: the module
- 	  will be called geode-aes.
- 
-+config CRYPTO_UBICOM32
-+        bool "Ubicom32 Security Module"
-+        depends on UBICOM32
-+        help
-+          This is the ubicom32 hardware acceleration common code.
-+
-+config CRYPTO_AES_UBICOM32
-+        tristate "Ubicom32 AES implementation"
-+        depends on CRYPTO_UBICOM32
-+        select CRYPTO_ALGAPI
-+        help
-+          This is the ubicom32 hardware AES implementation.
-+
-+config CRYPTO_DES_UBICOM32
-+        tristate "Ubicom32 DES implementation"
-+        depends on CRYPTO_UBICOM32
-+        select CRYPTO_ALGAPI
-+        help
-+          This is the ubicom32 hardware DES and 3DES implementation.
-+
-+config CRYPTO_SHA1_UBICOM32
-+        tristate "Ubicom32 SHA1 implementation"
-+        depends on CRYPTO_UBICOM32
-+        select CRYPTO_ALGAPI
-+        help
-+          This is the ubicom32 hardware SHA1 implementation.
-+
-+config CRYPTO_MD5_UBICOM32
-+        tristate "Ubicom32 MD5 implementation"
-+        depends on CRYPTO_UBICOM32
-+        select CRYPTO_ALGAPI
-+        help
-+          This is the ubicom32 hardware MD5 implementation.
-+
- config ZCRYPT
- 	tristate "Support for PCI-attached cryptographic adapters"
- 	depends on S390
---- a/drivers/mmc/host/Kconfig
-+++ b/drivers/mmc/host/Kconfig
-@@ -266,3 +266,10 @@ config GPIOMMC_CONFIGFS
- 	help
- 	  This option automatically enables configfs support for gpiommc
- 	  if configfs is available.
-+
-+config MMC_UBICOM32
-+	tristate "Ubicom32 MMC/SD host controller"
-+	depends on UBICOM32
-+	help
-+	  This provides support for the SD/MMC hardware found on Ubicom32
-+	  IP7K processors
---- a/drivers/mmc/host/Makefile
-+++ b/drivers/mmc/host/Makefile
-@@ -30,4 +30,5 @@ obj-$(CONFIG_MMC_S3C)   	+= s3cmci.o
- obj-$(CONFIG_MMC_SDRICOH_CS)	+= sdricoh_cs.o
- obj-$(CONFIG_MMC_TMIO)		+= tmio_mmc.o
- obj-$(CONFIG_GPIOMMC)		+= gpiommc.o
-+obj-$(CONFIG_MMC_UBICOM32)	+= ubicom32sd.o
- 
---- a/drivers/mtd/devices/Kconfig
-+++ b/drivers/mtd/devices/Kconfig
-@@ -104,6 +104,31 @@ config M25PXX_USE_FAST_READ
- 	help
- 	  This option enables FAST_READ access supported by ST M25Pxx.
- 
-+config MTD_UBI32_NAND_SPI_ER
-+	tristate "UBI32_NAND SPI-ER support"
-+	help
-+	  This driver supports the Micron MT29F1G01 SPI-ER NAND flash chip
-+	  using the built in flash controller on the Ubicom32 architecture.
-+	  Partial page writes are not supported by this driver.
-+
-+config MTD_NAND_SPI_ER
-+	tristate "NAND SPI-ER support"
-+	help
-+	  This driver supports the Micron MT29F1G01 SPI-ER NAND flash chip
-+	  using a generic SPI bus.  Partial page writes are supported
-+	  by this driver.
-+
-+config MTD_UBI32_M25P80
-+	tristate "Ubicom processor support for most SPI Flash chips (AT26DF, M25P, W25X, ...)"
-+	depends on UBICOM32
-+	default y
-+	help
-+	  This enables access to most modern SPI flash chips, used for
-+	  program and data storage.   Series supported include Atmel AT26DF,
-+	  Spansion S25SL, SST 25VF, ST M25P, and Winbond W25X.  Other chips
-+	  are supported as well.  See the driver source for the current list,
-+	  or to add other chips.
-+
- config MTD_SLRAM
- 	tristate "Uncached system RAM"
- 	help
---- a/drivers/mtd/devices/Makefile
-+++ b/drivers/mtd/devices/Makefile
-@@ -16,3 +16,6 @@ obj-$(CONFIG_MTD_LART)		+= lart.o
- obj-$(CONFIG_MTD_BLOCK2MTD)	+= block2mtd.o
- obj-$(CONFIG_MTD_DATAFLASH)	+= mtd_dataflash.o
- obj-$(CONFIG_MTD_M25P80)	+= m25p80.o
-+obj-$(CONFIG_MTD_UBI32_M25P80)	+= ubi32-m25p80.o
-+obj-$(CONFIG_MTD_NAND_SPI_ER)	+= nand-spi-er.o
-+obj-$(CONFIG_MTD_UBI32_NAND_SPI_ER)	+= ubi32-nand-spi-er.o
---- a/drivers/net/Kconfig
-+++ b/drivers/net/Kconfig
-@@ -2540,6 +2540,19 @@ config JME
- 	  To compile this driver as a module, choose M here. The module
- 	  will be called jme.
- 
-+config UBICOM32_GMAC
-+	tristate "Ubicom Gigabit Ethernet support"
-+	depends on UBICOM32
-+	help
-+	  Gigabit Ethernet support for ubicom32 processors
-+
-+config UBICOM32_OCM_FOR_SKB
-+        bool  "USE OCM for SKB (EXPERIMENTAL)"
-+        depends on UBICOM32_GMAC
-+	default n
-+        help
-+          Allocate skb from OCM for Ethernet Receive when possible
-+
- endif # NETDEV_1000
- 
- #
---- a/drivers/net/Makefile
-+++ b/drivers/net/Makefile
-@@ -272,3 +272,5 @@ obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
- obj-$(CONFIG_SFC) += sfc/
- 
- obj-$(CONFIG_WIMAX) += wimax/
-+
-+obj-$(CONFIG_UBICOM32_GMAC) += ubi32-eth.o
---- a/drivers/net/usb/asix.c
-+++ b/drivers/net/usb/asix.c
-@@ -319,14 +319,33 @@ static int asix_rx_fixup(struct usbnet *
- 		/* get the packet length */
- 		size = (u16) (header & 0x0000ffff);
- 
--		if ((skb->len) - ((size + 1) & 0xfffe) == 0)
-+		if ((skb->len) - ((size + 1) & 0xfffe) == 0) {
-+#ifndef HAVE_EFFICIENT_UNALIGNED_ACCESS
-+			if (((u32)packet & 0x02) == 0) {
-+				memmove(packet - 2, packet, size);
-+				skb->data -= 2;
-+				skb->tail -= 2;
-+			}
-+#endif
- 			return 2;
-+		}
-+
- 		if (size > ETH_FRAME_LEN) {
- 			deverr(dev,"asix_rx_fixup() Bad RX Length %d", size);
- 			return 0;
- 		}
- 		ax_skb = skb_clone(skb, GFP_ATOMIC);
- 		if (ax_skb) {
-+#ifndef HAVE_EFFICIENT_UNALIGNED_ACCESS
-+			if (((u32)packet & 0x02) == 0) {
-+				memmove(packet - 2, packet, size);
-+				ax_skb->data = packet - 2;
-+			} else {
-+				ax_skb->data = packet;
-+			}
-+#else
-+			ax_skb->data = packet;
-+#endif
- 			ax_skb->len = size;
- 			ax_skb->data = packet;
- 			skb_set_tail_pointer(ax_skb, size);
-@@ -1125,13 +1144,19 @@ static int ax88178_link_reset(struct usb
- 	mode = AX88178_MEDIUM_DEFAULT;
- 
- 	if (ecmd.speed == SPEED_1000)
-+#ifdef HAVE_EFFICIENT_UNALIGNED_ACCESS
- 		mode |= AX_MEDIUM_GM;
-+#else
-+		mode |= AX_MEDIUM_GM | AX_MEDIUM_ENCK;
-+#endif
- 	else if (ecmd.speed == SPEED_100)
- 		mode |= AX_MEDIUM_PS;
- 	else
- 		mode &= ~(AX_MEDIUM_PS | AX_MEDIUM_GM);
- 
-+#ifdef HAVE_EFFICIENT_UNALIGNED_ACCESS
- 	mode |= AX_MEDIUM_ENCK;
-+#endif
- 
- 	if (ecmd.duplex == DUPLEX_FULL)
- 		mode |= AX_MEDIUM_FD;
---- a/drivers/oprofile/cpu_buffer.c
-+++ b/drivers/oprofile/cpu_buffer.c
-@@ -328,10 +328,10 @@ static inline void oprofile_end_trace(st
- }
- 
- static inline void
--__oprofile_add_ext_sample(unsigned long pc, struct pt_regs * const regs,
--			  unsigned long event, int is_kernel)
-+__oprofile_add_ext_sample_cpu(unsigned long pc, struct pt_regs * const regs,
-+			      unsigned long event, int is_kernel, int cpu)
- {
--	struct oprofile_cpu_buffer *cpu_buf = &__get_cpu_var(cpu_buffer);
-+	struct oprofile_cpu_buffer *cpu_buf = &per_cpu(cpu_buffer, cpu);
- 	unsigned long backtrace = oprofile_backtrace_depth;
- 
- 	/*
-@@ -353,7 +353,8 @@ __oprofile_add_ext_sample(unsigned long 
- void oprofile_add_ext_sample(unsigned long pc, struct pt_regs * const regs,
- 			     unsigned long event, int is_kernel)
- {
--	__oprofile_add_ext_sample(pc, regs, event, is_kernel);
-+	__oprofile_add_ext_sample_cpu(pc, regs, event,
-+				      is_kernel, smp_processor_id());
- }
- 
- void oprofile_add_sample(struct pt_regs * const regs, unsigned long event)
-@@ -361,7 +362,8 @@ void oprofile_add_sample(struct pt_regs 
- 	int is_kernel = !user_mode(regs);
- 	unsigned long pc = profile_pc(regs);
- 
--	__oprofile_add_ext_sample(pc, regs, event, is_kernel);
-+	__oprofile_add_ext_sample_cpu(pc, regs, event,
-+				      is_kernel, smp_processor_id());
- }
- 
- /*
---- a/drivers/pci/Makefile
-+++ b/drivers/pci/Makefile
-@@ -44,8 +44,8 @@ obj-$(CONFIG_PPC) += setup-bus.o
- obj-$(CONFIG_MIPS) += setup-bus.o setup-irq.o
- obj-$(CONFIG_X86_VISWS) += setup-irq.o
- obj-$(CONFIG_MN10300) += setup-bus.o
-+obj-$(CONFIG_UBICOM32) += setup-bus.o setup-irq.o
- 
--#
- # ACPI Related PCI FW Functions
- #
- obj-$(CONFIG_ACPI)    += pci-acpi.o
---- a/drivers/serial/Kconfig
-+++ b/drivers/serial/Kconfig
-@@ -871,6 +871,57 @@ config SERIAL_UARTLITE_CONSOLE
- 	  console (the system console is the device which receives all kernel
- 	  messages and warnings and which allows logins in single user mode).
- 
-+config SERIAL_UBI32_UARTTIO
-+        tristate "Ubicom UARTTIO support"
-+        depends on UBICOM32=y
-+        select SERIAL_CORE
-+	default y
-+        help
-+          Add support for the Ubicom virtual peripherial serial interface.
-+
-+config SERIAL_UBI32_UARTTIO_NR_UARTS
-+	int "Maximum number of UARTTIO virtual serial ports"
-+	depends on SERIAL_UBI32_UARTTIO
-+	default "4"
-+	help
-+	  Set this to the maximum number of serial ports you want the driver to support.
-+
-+config SERIAL_UBI32_UARTTIO_CONSOLE
-+        tristate "Ubicom UARTTIO console support"
-+        depends on SERIAL_UBI32_UARTTIO=y
-+        select SERIAL_CORE_CONSOLE
-+	default y
-+        help
-+          Add support for console on the Ubicom virtual peripherial serial interface.
-+
-+config SERIAL_UBI32_SERDES
-+        bool "Ubicom serial port support"
-+        depends on UBICOM32=y
-+        select SERIAL_CORE
-+	default y
-+        help
-+          Add support for the Ubicom serial interface.
-+
-+config SERIAL_UBI32_SERDES_CONSOLE
-+        bool "Ubicom serial console support"
-+        depends on SERIAL_UBI32_SERDES=y
-+        select SERIAL_CORE_CONSOLE
-+	default y
-+
-+config SERIAL_UBI32_MAILBOX
-+        bool "Ubicom mailbox support"
-+        depends on UBICOM32=y
-+        select SERIAL_CORE
-+	default n
-+        help
-+          Add support for the Ubicom mailbox interface.
-+
-+config SERIAL_UBI32_MAILBOX_CONSOLE
-+        bool "Ubicom mailbox console support"
-+        depends on SERIAL_UBI32_MAILBOX=y
-+        select SERIAL_CORE_CONSOLE
-+	default y
-+
- config SERIAL_SUNCORE
- 	bool
- 	depends on SPARC
---- a/drivers/serial/Makefile
-+++ b/drivers/serial/Makefile
-@@ -77,3 +77,6 @@ obj-$(CONFIG_SERIAL_OF_PLATFORM_NWPSERIA
- obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o
- obj-$(CONFIG_KGDB_SERIAL_CONSOLE) += kgdboc.o
- obj-$(CONFIG_SERIAL_QE) += ucc_uart.o
-+obj-$(CONFIG_SERIAL_UBI32_SERDES) += ubi32_serdes.o
-+obj-$(CONFIG_SERIAL_UBI32_UARTTIO) += ubi32_uarttio.o
-+obj-$(CONFIG_SERIAL_UBI32_MAILBOX) += ubi32_mailbox.o
---- a/drivers/spi/Kconfig
-+++ b/drivers/spi/Kconfig
-@@ -196,6 +196,15 @@ config SPI_S3C24XX
- 	help
- 	  SPI driver for Samsung S3C24XX series ARM SoCs
- 
-+config SPI_UBICOM32_GPIO
-+	tristate "Ubicom32 SPI over GPIO"
-+	depends on SPI_MASTER && UBICOM32 && EXPERIMENTAL
-+	select SPI_BITBANG
-+	select HAS_DMA
-+	help
-+	  SPI driver for the Ubicom32 architecture using
-+	  GPIO lines to provide the SPI bus.
-+
- config SPI_S3C24XX_GPIO
- 	tristate "Samsung S3C24XX series SPI by GPIO"
- 	depends on ARCH_S3C2410 && EXPERIMENTAL
---- a/drivers/spi/Makefile
-+++ b/drivers/spi/Makefile
-@@ -27,6 +27,7 @@ obj-$(CONFIG_SPI_ORION)			+= orion_spi.o
- obj-$(CONFIG_SPI_MPC52xx_PSC)		+= mpc52xx_psc_spi.o
- obj-$(CONFIG_SPI_MPC83xx)		+= spi_mpc83xx.o
- obj-$(CONFIG_SPI_S3C24XX_GPIO)		+= spi_s3c24xx_gpio.o
-+obj-$(CONFIG_SPI_UBICOM32_GPIO)		+= spi_ubicom32_gpio.o
- obj-$(CONFIG_SPI_S3C24XX)		+= spi_s3c24xx.o
- obj-$(CONFIG_SPI_TXX9)			+= spi_txx9.o
- obj-$(CONFIG_SPI_XILINX)		+= xilinx_spi.o
---- a/drivers/uio/Kconfig
-+++ b/drivers/uio/Kconfig
-@@ -89,4 +89,12 @@ config UIO_SERCOS3
- 
- 	  If you compile this as a module, it will be called uio_sercos3.
- 
-+config UIO_UBICOM32RING
-+	tristate "Ubicom32 Ring Buffer driver"
-+	default n
-+	help
-+	  Userspace I/O interface for a Ubicom32 Ring Buffer.
-+
-+	  If you compile this as a module, it will be called uio_ubicom32ring
-+
- endif
---- a/drivers/uio/Makefile
-+++ b/drivers/uio/Makefile
-@@ -5,3 +5,4 @@ obj-$(CONFIG_UIO_PDRV_GENIRQ)	+= uio_pdr
- obj-$(CONFIG_UIO_SMX)	+= uio_smx.o
- obj-$(CONFIG_UIO_AEC)	+= uio_aec.o
- obj-$(CONFIG_UIO_SERCOS3)	+= uio_sercos3.o
-+obj-$(CONFIG_UIO_UBICOM32RING)	+= uio_ubicom32ring.o
---- a/drivers/usb/gadget/epautoconf.c
-+++ b/drivers/usb/gadget/epautoconf.c
-@@ -154,6 +154,10 @@ ep_matches (
- 			/* configure your hardware with enough buffering!! */
- 		}
- 		break;
-+
-+	case USB_ENDPOINT_XFER_BULK:
-+		if ((gadget->is_dualspeed) && (ep->maxpacket < 512))
-+			return 0;
- 	}
- 
- 	/* MATCH!! */
---- a/drivers/usb/Kconfig
-+++ b/drivers/usb/Kconfig
-@@ -22,6 +22,7 @@ config USB_ARCH_HAS_HCD
- 	default y if PCMCIA && !M32R			# sl811_cs
- 	default y if ARM				# SL-811
- 	default y if SUPERH				# r8a66597-hcd
-+	default y if UBICOM32				# Ubicom's onchip USB Duial role controller
- 	default PCI
- 
- # many non-PCI SOC chips embed OHCI
---- a/drivers/usb/musb/Kconfig
-+++ b/drivers/usb/musb/Kconfig
-@@ -12,7 +12,7 @@ config USB_MUSB_HDRC
- 	depends on !SUPERH
- 	select TWL4030_USB if MACH_OMAP_3430SDP
- 	select USB_OTG_UTILS
--	tristate 'Inventra Highspeed Dual Role Controller (TI, ADI, ...)'
-+	tristate 'Inventra Highspeed Dual Role Controller (TI, ADI, Ubicom, ...)'
- 	help
- 	  Say Y here if your system has a dual role high speed USB
- 	  controller based on the Mentor Graphics silicon IP.  Then
---- a/drivers/usb/musb/Makefile
-+++ b/drivers/usb/musb/Makefile
-@@ -30,6 +30,10 @@ ifeq ($(CONFIG_BF52x),y)
- 	musb_hdrc-objs	+= blackfin.o
- endif
- 
-+ifeq ($(CONFIG_UBICOM32), y)
-+        musb_hdrc-objs  += ubi32_usb.o
-+endif
-+
- ifeq ($(CONFIG_USB_GADGET_MUSB_HDRC),y)
- 	musb_hdrc-objs		+= musb_gadget_ep0.o musb_gadget.o
- endif
---- a/drivers/usb/musb/musb_core.c
-+++ b/drivers/usb/musb/musb_core.c
-@@ -105,6 +105,13 @@
- #include <asm/mach-types.h>
- #endif
- 
-+#ifdef CONFIG_UBICOM32
-+#include <asm/ip5000.h>
-+#include <asm/ubicom32-tio.h>
-+extern void ubi32_usb_init(void);
-+extern void ubi32_usb_int_clr(void);
-+#endif
-+
- #include "musb_core.h"
- 
- 
-@@ -147,8 +154,37 @@ static inline struct musb *dev_to_musb(s
- }
- 
- /*-------------------------------------------------------------------------*/
-+#if defined(CONFIG_UBICOM32)
-+
-+/*
-+ * Load an endpoint's FIFO
-+ */
-+void musb_write_fifo(struct musb_hw_ep *hw_ep, u16 wCount, const u8 *pSource)
-+{
-+	void __iomem *fifo = hw_ep->fifo;
-+
-+	prefetch((u8 *)pSource);
-+
-+	DBG(4, "%cX ep%d fifo %p count %d buf %p\n",
-+			'T', hw_ep->epnum, fifo, wCount, pSource);
-+
-+	usb_tio_write_fifo((u32)fifo, (u32)pSource, wCount);
-+
-+}
-+
-+/*
-+ * Unload an endpoint's FIFO
-+ */
-+void musb_read_fifo(struct musb_hw_ep *hw_ep, u16 wCount, u8 *pDest)
-+{
-+
-+	void __iomem *fifo = hw_ep->fifo;
-+	DBG(4, "%cX ep%d fifo %p count %d buf %p\n",
-+			'R', hw_ep->epnum, fifo, wCount, pDest);
-+	usb_tio_read_fifo((u32)fifo, (u32)pDest, wCount);
-+}
- 
--#if !defined(CONFIG_USB_TUSB6010) && !defined(CONFIG_BLACKFIN)
-+#elif !defined(CONFIG_USB_TUSB6010) && !defined(CONFIG_BLACKFIN)
- 
- /*
-  * Load an endpoint's FIFO
-@@ -227,8 +263,7 @@ void musb_read_fifo(struct musb_hw_ep *h
- 		readsb(fifo, dst, len);
- 	}
- }
--
--#endif	/* normal PIO */
-+#endif /* !T6010 && !BLACKFIN */
- 
- 
- /*-------------------------------------------------------------------------*/
-@@ -874,12 +909,19 @@ void musb_start(struct musb *musb)
- 	musb_writeb(regs, MUSB_TESTMODE, 0);
- 
- 	/* put into basic highspeed mode and start session */
-+#ifndef CONFIG_UBICOM32
- 	musb_writeb(regs, MUSB_POWER, MUSB_POWER_ISOUPDATE
- 						| MUSB_POWER_SOFTCONN
- 						| MUSB_POWER_HSENAB
- 						/* ENSUSPEND wedges tusb */
- 						/* | MUSB_POWER_ENSUSPEND */
- 						);
-+#else
-+	musb_writeb(regs, MUSB_POWER,  MUSB_POWER_HSENAB
-+						/* ENSUSPEND wedges tusb */
-+						/* | MUSB_POWER_ENSUSPEND */
-+						);
-+#endif
- 
- 	musb->is_active = 0;
- 	devctl = musb_readb(regs, MUSB_DEVCTL);
-@@ -1081,6 +1123,7 @@ static struct fifo_cfg __initdata mode_4
- };
- 
- 
-+#ifndef CONFIG_UBICOM32
- /*
-  * configure a fifo; for non-shared endpoints, this may be called
-  * once for a tx fifo and once for an rx fifo.
-@@ -1240,7 +1283,7 @@ static int __init ep_config_from_table(s
- 
- 	return 0;
- }
--
-+#endif /* CONFIG_UBICOM32 */
- 
- /*
-  * ep_config_from_hw - when MUSB_C_DYNFIFO_DEF is false
-@@ -1256,6 +1299,11 @@ static int __init ep_config_from_hw(stru
- 	DBG(2, "<== static silicon ep config\n");
- 
- 	/* FIXME pick up ep0 maxpacket size */
-+#ifdef CONFIG_UBICOM32
-+	/* set ep0 to shared_fifo, otherwise urb will be put to out_qh but ep0_irq try to get the urb from in_qh*/
-+	hw_ep = musb->endpoints;
-+	hw_ep->is_shared_fifo = true;
-+#endif
- 
- 	for (epnum = 1; epnum < musb->config->num_eps; epnum++) {
- 		musb_ep_select(mbase, epnum);
-@@ -1276,14 +1324,27 @@ static int __init ep_config_from_hw(stru
- 		/* REVISIT:  this algorithm is lazy, we should at least
- 		 * try to pick a double buffered endpoint.
- 		 */
-+#ifndef CONFIG_UBICOM32
- 		if (musb->bulk_ep)
- 			continue;
- 		musb->bulk_ep = hw_ep;
-+#else
-+		if ((musb->bulk_ep_in) && (musb->bulk_ep_out))
-+			continue;
-+		/* Save theEP with 1024 Bytes FIFO for ISO */
-+		if(hw_ep->max_packet_sz_tx == 512) {
-+			if (!musb->bulk_ep_in) {
-+				musb->bulk_ep_in = hw_ep;
-+			} else if (!musb->bulk_ep_out) {
-+				musb->bulk_ep_out = hw_ep;
-+			}
-+		}
-+#endif /* CONFIG_UBICOM32 */
- #endif
- 	}
- 
- #ifdef CONFIG_USB_MUSB_HDRC_HCD
--	if (!musb->bulk_ep) {
-+	if ((!musb->bulk_ep_in) || (!musb->bulk_ep_out)) {
- 		pr_debug("%s: missing bulk\n", musb_driver_name);
- 		return -EINVAL;
- 	}
-@@ -1393,12 +1454,16 @@ static int __init musb_core_init(u16 mus
- 	musb->epmask = 1;
- 
- 	if (reg & MUSB_CONFIGDATA_DYNFIFO) {
-+#ifndef CONFIG_UBICOM32
- 		if (musb->config->dyn_fifo)
- 			status = ep_config_from_table(musb);
--		else {
-+		else
-+#endif
-+		{
- 			ERR("reconfigure software for Dynamic FIFOs\n");
- 			status = -ENODEV;
- 		}
-+
- 	} else {
- 		if (!musb->config->dyn_fifo)
- 			status = ep_config_from_hw(musb);
-@@ -1462,8 +1527,8 @@ static int __init musb_core_init(u16 mus
- 
- /*-------------------------------------------------------------------------*/
- 
--#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3430)
--
-+#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3430) || defined(CONFIG_UBICOM32)
-+static u32_t musb_int_count = 0;
- static irqreturn_t generic_interrupt(int irq, void *__hci)
- {
- 	unsigned long	flags;
-@@ -1472,10 +1537,17 @@ static irqreturn_t generic_interrupt(int
- 
- 	spin_lock_irqsave(&musb->lock, flags);
- 
-+#ifndef CONFIG_UBICOM32
- 	musb->int_usb = musb_readb(musb->mregs, MUSB_INTRUSB);
- 	musb->int_tx = musb_readw(musb->mregs, MUSB_INTRTX);
- 	musb->int_rx = musb_readw(musb->mregs, MUSB_INTRRX);
-+#else
-+	musb_read_int_status(&musb->int_usb, &musb->int_tx, &musb->int_rx);
-+	//ubi32_usb_int_clr();
-+	musb_int_count++;
-+#endif
- 
-+	DBG(4, "usb %x, tx %x, rx %x", musb->int_usb, musb->int_tx, musb->int_rx);
- 	if (musb->int_usb || musb->int_tx || musb->int_rx)
- 		retval = musb_interrupt(musb);
- 
-@@ -2210,6 +2282,10 @@ static struct platform_driver musb_drive
- 
- static int __init musb_init(void)
- {
-+#ifdef CONFIG_UBICOM32
-+	ubi32_usb_init();
-+#endif
-+
- #ifdef CONFIG_USB_MUSB_HDRC_HCD
- 	if (usb_disabled())
- 		return 0;
---- a/drivers/usb/musb/musb_core.h
-+++ b/drivers/usb/musb/musb_core.h
-@@ -326,7 +326,12 @@ struct musb {
- 	 * queue until it completes or NAKs too much; then we try the next
- 	 * endpoint.
- 	 */
-+#ifdef CONFIG_UBICOM32
-+	struct musb_hw_ep	*bulk_ep_in;
-+	struct musb_hw_ep	*bulk_ep_out;
-+#else
- 	struct musb_hw_ep	*bulk_ep;
-+#endif
- 
- 	struct list_head	control;	/* of musb_qh */
- 	struct list_head	in_bulk;	/* of musb_qh */
---- a/drivers/usb/musb/musb_gadget.c
-+++ b/drivers/usb/musb/musb_gadget.c
-@@ -432,7 +432,7 @@ void musb_g_tx(struct musb *musb, u8 epn
- 		 * probably rates reporting as a host error
- 		 */
- 		if (csr & MUSB_TXCSR_P_SENTSTALL) {
--			csr |= MUSB_TXCSR_P_WZC_BITS;
-+			csr &= ~(MUSB_TXCSR_P_WZC_BITS);
- 			csr &= ~MUSB_TXCSR_P_SENTSTALL;
- 			musb_writew(epio, MUSB_TXCSR, csr);
- 			if (dma_channel_status(dma) == MUSB_DMA_STATUS_BUSY) {
-@@ -448,7 +448,7 @@ void musb_g_tx(struct musb *musb, u8 epn
- 
- 		if (csr & MUSB_TXCSR_P_UNDERRUN) {
- 			/* we NAKed, no big deal ... little reason to care */
--			csr |= MUSB_TXCSR_P_WZC_BITS;
-+			csr &= ~(MUSB_TXCSR_P_WZC_BITS);
- 			csr &= ~(MUSB_TXCSR_P_UNDERRUN
- 					| MUSB_TXCSR_TXPKTRDY);
- 			musb_writew(epio, MUSB_TXCSR, csr);
-@@ -584,10 +584,16 @@ static void rxstate(struct musb *musb, s
- 	u16			csr = 0;
- 	const u8		epnum = req->epnum;
- 	struct usb_request	*request = &req->request;
--	struct musb_ep		*musb_ep = &musb->endpoints[epnum].ep_out;
-+	struct musb_ep		*musb_ep = NULL;
- 	void __iomem		*epio = musb->endpoints[epnum].regs;
--	unsigned		fifo_count = 0;
--	u16			len = musb_ep->packet_sz;
-+	u16			fifo_count = 0;
-+	u16			len = 0;
-+
-+	if (musb->endpoints[epnum].is_shared_fifo)
-+		musb_ep = &musb->endpoints[epnum].ep_in;
-+	else
-+		musb_ep = &musb->endpoints[epnum].ep_out;
-+	len =  musb_ep->packet_sz;
- 
- 	csr = musb_readw(epio, MUSB_RXCSR);
- 
-@@ -726,7 +732,7 @@ static void rxstate(struct musb *musb, s
- 			 */
- 
- 			/* ack the read! */
--			csr |= MUSB_RXCSR_P_WZC_BITS;
-+			csr &= ~MUSB_RXCSR_P_WZC_BITS;
- 			csr &= ~MUSB_RXCSR_RXPKTRDY;
- 			musb_writew(epio, MUSB_RXCSR, csr);
- 		}
-@@ -745,10 +751,15 @@ void musb_g_rx(struct musb *musb, u8 epn
- 	u16			csr;
- 	struct usb_request	*request;
- 	void __iomem		*mbase = musb->mregs;
--	struct musb_ep		*musb_ep = &musb->endpoints[epnum].ep_out;
-+	struct musb_ep		*musb_ep = NULL;
- 	void __iomem		*epio = musb->endpoints[epnum].regs;
- 	struct dma_channel	*dma;
- 
-+	if (musb->endpoints[epnum].is_shared_fifo)
-+		musb_ep = &musb->endpoints[epnum].ep_in;
-+	else
-+		musb_ep = &musb->endpoints[epnum].ep_out;
-+
- 	musb_ep_select(mbase, epnum);
- 
- 	request = next_request(musb_ep);
-@@ -1769,7 +1780,9 @@ int usb_gadget_register_driver(struct us
- 			}
- 		}
- 	}
--
-+#ifndef CONFIG_USB_MUSB_OTG
-+	musb_pullup(musb, 1);
-+#endif
- 	return retval;
- }
- EXPORT_SYMBOL(usb_gadget_register_driver);
---- a/drivers/usb/musb/musb_gadget_ep0.c
-+++ b/drivers/usb/musb/musb_gadget_ep0.c
-@@ -240,14 +240,14 @@ __acquires(musb->lock)
- 		case USB_REQ_SET_ADDRESS:
- 			/* change it after the status stage */
- 			musb->set_address = true;
--			musb->address = (u8) (ctrlrequest->wValue & 0x7f);
-+			musb->address = (u8) (le16_to_cpu(ctrlrequest->wValue) & 0x7f);
- 			handled = 1;
- 			break;
- 
- 		case USB_REQ_CLEAR_FEATURE:
- 			switch (recip) {
- 			case USB_RECIP_DEVICE:
--				if (ctrlrequest->wValue
-+				if (le16_to_cpu(ctrlrequest->wValue)
- 						!= USB_DEVICE_REMOTE_WAKEUP)
- 					break;
- 				musb->may_wakeup = 0;
-@@ -261,8 +261,8 @@ __acquires(musb->lock)
- 
- 				if (num == 0
- 						|| num >= MUSB_C_NUM_EPS
--						|| ctrlrequest->wValue
--							!= USB_ENDPOINT_HALT)
-+						|| le16_to_cpu(ctrlrequest->wValue
-+							!= USB_ENDPOINT_HALT))
- 					break;
- 
- 				if (ctrlrequest->wIndex & USB_DIR_IN)
-@@ -292,7 +292,7 @@ __acquires(musb->lock)
- 			switch (recip) {
- 			case USB_RECIP_DEVICE:
- 				handled = 1;
--				switch (ctrlrequest->wValue) {
-+				switch (le16_to_cpu(ctrlrequest->wValue)) {
- 				case USB_DEVICE_REMOTE_WAKEUP:
- 					musb->may_wakeup = 1;
- 					break;
-@@ -374,8 +374,8 @@ stall:
- 
- 				if (epnum == 0
- 						|| epnum >= MUSB_C_NUM_EPS
--						|| ctrlrequest->wValue
--							!= USB_ENDPOINT_HALT)
-+						|| le16_to_cpu(ctrlrequest->wValue
-+							!= USB_ENDPOINT_HALT))
- 					break;
- 
- 				ep = musb->endpoints + epnum;
---- a/drivers/usb/musb/musb_host.c
-+++ b/drivers/usb/musb/musb_host.c
-@@ -160,7 +160,11 @@ static inline void musb_h_tx_start(struc
- 	/* NOTE: no locks here; caller should lock and select EP */
- 	if (ep->epnum) {
- 		txcsr = musb_readw(ep->regs, MUSB_TXCSR);
-+#ifndef CONFIG_UBICOM32
- 		txcsr |= MUSB_TXCSR_TXPKTRDY | MUSB_TXCSR_H_WZC_BITS;
-+#else
-+		txcsr |= (MUSB_TXCSR_TXPKTRDY & (~MUSB_TXCSR_H_WZC_BITS));
-+#endif
- 		musb_writew(ep->regs, MUSB_TXCSR, txcsr);
- 	} else {
- 		txcsr = MUSB_CSR0_H_SETUPPKT | MUSB_CSR0_TXPKTRDY;
-@@ -223,6 +227,8 @@ musb_start_urb(struct musb *musb, int is
- 		break;
- 	default:		/* bulk, interrupt */
- 		/* actual_length may be nonzero on retry paths */
-+		if (urb->actual_length)
-+			DBG(3 ,"musb_start_urb: URB %p retried, len: %d\n", urb, urb->actual_length);
- 		buf = urb->transfer_buffer + urb->actual_length;
- 		len = urb->transfer_buffer_length - urb->actual_length;
- 	}
-@@ -342,13 +348,13 @@ musb_save_toggle(struct musb_hw_ep *ep, 
- 	if (!is_in) {
- 		csr = musb_readw(epio, MUSB_TXCSR);
- 		usb_settoggle(udev, qh->epnum, 1,
--			(csr & MUSB_TXCSR_H_DATATOGGLE)
--				? 1 : 0);
-+			((csr & MUSB_TXCSR_H_DATATOGGLE)
-+				? 1 : 0));
- 	} else {
- 		csr = musb_readw(epio, MUSB_RXCSR);
- 		usb_settoggle(udev, qh->epnum, 0,
--			(csr & MUSB_RXCSR_H_DATATOGGLE)
--				? 1 : 0);
-+			((csr & MUSB_RXCSR_H_DATATOGGLE)
-+				? 1 : 0));
- 	}
- }
- 
-@@ -556,7 +562,11 @@ musb_host_packet_rx(struct musb *musb, s
- 	musb_read_fifo(hw_ep, length, buf);
- 
- 	csr = musb_readw(epio, MUSB_RXCSR);
-+#ifndef CONFIG_UBICOM32
- 	csr |= MUSB_RXCSR_H_WZC_BITS;
-+#else
-+	csr &= ~MUSB_RXCSR_H_WZC_BITS;
-+#endif
- 	if (unlikely(do_flush))
- 		musb_h_flush_rxfifo(hw_ep, csr);
- 	else {
-@@ -590,6 +600,7 @@ musb_rx_reinit(struct musb *musb, struct
- 
- 	/* if programmed for Tx, put it in RX mode */
- 	if (ep->is_shared_fifo) {
-+#ifndef  CONFIG_UBICOM32
- 		csr = musb_readw(ep->regs, MUSB_TXCSR);
- 		if (csr & MUSB_TXCSR_MODE) {
- 			musb_h_tx_flush_fifo(ep);
-@@ -604,7 +615,18 @@ musb_rx_reinit(struct musb *musb, struct
- 		 */
- 		if (csr & MUSB_TXCSR_DMAMODE)
- 			musb_writew(ep->regs, MUSB_TXCSR, MUSB_TXCSR_DMAMODE);
-+
-+#else
-+		/* clear mode (and everything else) to enable Rx */
- 		musb_writew(ep->regs, MUSB_TXCSR, 0);
-+		/* scrub all previous state, clearing toggle */
-+		csr = musb_readw(ep->regs, MUSB_RXCSR);
-+		if (csr & MUSB_RXCSR_RXPKTRDY)
-+			WARNING("rx%d, packet/%d ready?\n", ep->epnum,
-+				musb_readw(ep->regs, MUSB_RXCOUNT));
-+
-+		musb_h_flush_rxfifo(ep, MUSB_RXCSR_CLRDATATOG);
-+#endif
- 
- 	/* scrub all previous state, clearing toggle */
- 	} else {
-@@ -1138,8 +1160,18 @@ void musb_host_tx(struct musb *musb, u8 
- 	void __iomem		*mbase = musb->mregs;
- 	struct dma_channel	*dma;
- 
-+#ifdef CONFIG_UBICOM32
-+	if (hw_ep->is_shared_fifo) {
-+		qh = hw_ep->in_qh;
-+	}
-+#ifdef CONFIG_USB_SERIAL_SIERRAWIRELESS
-+	printk(KERN_DEBUG "OUT/TX%d end, csr %04x%s\n", epnum, tx_csr,
-+			dma ? ", dma" : "");
-+#endif
-+#endif
- 	urb = next_urb(qh);
- 
-+
- 	musb_ep_select(mbase, epnum);
- 	tx_csr = musb_readw(epio, MUSB_TXCSR);
- 
-@@ -1180,9 +1212,14 @@ void musb_host_tx(struct musb *musb, u8 
- 		 * we have a candidate... NAKing is *NOT* an error
- 		 */
- 		musb_ep_select(mbase, epnum);
-+#ifndef CONFIG_UBICOM32
- 		musb_writew(epio, MUSB_TXCSR,
- 				MUSB_TXCSR_H_WZC_BITS
- 				| MUSB_TXCSR_TXPKTRDY);
-+#else
-+		musb_writew(epio, MUSB_TXCSR,
-+				 MUSB_TXCSR_TXPKTRDY);
-+#endif
- 		return;
- 	}
- 
-@@ -1353,8 +1390,14 @@ void musb_host_tx(struct musb *musb, u8 
- 	qh->segsize = length;
- 
- 	musb_ep_select(mbase, epnum);
-+#ifndef CONFIG_UBICOM32
-+	musb_writew(epio, MUSB_TXCSR,
-+		    MUSB_TXCSR_H_WZC_BITS | MUSB_TXCSR_TXPKTRDY);
-+#else
- 	musb_writew(epio, MUSB_TXCSR,
--			MUSB_TXCSR_H_WZC_BITS | MUSB_TXCSR_TXPKTRDY);
-+		    MUSB_TXCSR_MODE | MUSB_TXCSR_TXPKTRDY);
-+#endif
-+
- }
- 
- 
-@@ -1414,7 +1457,11 @@ static void musb_bulk_rx_nak_timeout(str
- 
- 	/* clear nak timeout bit */
- 	rx_csr = musb_readw(epio, MUSB_RXCSR);
-+#ifndef CONFIG_UBICOM32
- 	rx_csr |= MUSB_RXCSR_H_WZC_BITS;
-+#else
-+	rx_csr &= ~MUSB_RXCSR_H_WZC_BITS;
-+#endif
- 	rx_csr &= ~MUSB_RXCSR_DATAERROR;
- 	musb_writew(epio, MUSB_RXCSR, rx_csr);
- 
-@@ -1483,6 +1530,13 @@ void musb_host_rx(struct musb *musb, u8 
- 
- 	pipe = urb->pipe;
- 
-+#ifdef CONFIG_UBICOM32
-+#ifdef CONFIG_USB_SERIAL_SIERRAWIRELESS
-+		printk(KERN_DEBUG  "RXCSR%d %04x, reqpkt, len %zu%s\n", epnum, rx_csr,
-+				xfer_len, dma ? ", dma" : "");
-+#endif
-+#endif
-+
- 	DBG(5, "<== hw %d rxcsr %04x, urb actual %d (+dma %zu)\n",
- 		epnum, rx_csr, urb->actual_length,
- 		dma ? dma->actual_len : 0);
-@@ -1521,8 +1575,15 @@ void musb_host_rx(struct musb *musb, u8 
- 				return;
- 			}
- 			musb_ep_select(mbase, epnum);
-+#ifndef CONFIG_UBICOM32
- 			rx_csr |= MUSB_RXCSR_H_WZC_BITS;
- 			rx_csr &= ~MUSB_RXCSR_DATAERROR;
-+#else
-+			/* NEED TO EVALUATE CHANGE */
-+			rx_csr &= ~MUSB_RXCSR_H_WZC_BITS;
-+			rx_csr &= ~MUSB_RXCSR_DATAERROR;
-+//			musb_writew(epio, MUSB_RXCSR, (~(MUSB_RXCSR_H_WZC_BITS))| MUSB_RXCSR_H_REQPKT);
-+#endif
- 			musb_writew(epio, MUSB_RXCSR, rx_csr);
- 
- 			goto finish;
-@@ -1579,8 +1640,13 @@ void musb_host_rx(struct musb *musb, u8 
- 		rx_csr &= ~MUSB_RXCSR_H_REQPKT;
- 
- 		musb_ep_select(mbase, epnum);
-+#ifndef CONFIG_UBICOM32
- 		musb_writew(epio, MUSB_RXCSR,
- 				MUSB_RXCSR_H_WZC_BITS | rx_csr);
-+#else
-+		musb_writew(epio, MUSB_RXCSR,
-+				(~MUSB_RXCSR_H_WZC_BITS) & rx_csr);
-+#endif
- 	}
- #endif
- 	if (dma && (rx_csr & MUSB_RXCSR_DMAENAB)) {
-@@ -1610,7 +1676,7 @@ void musb_host_rx(struct musb *musb, u8 
- 			else
- 				done = false;
- 
--		} else  {
-+		} else {
- 		/* done if urb buffer is full or short packet is recd */
- 		done = (urb->actual_length + xfer_len >=
- 				urb->transfer_buffer_length
-@@ -1823,7 +1889,11 @@ static int musb_schedule(
- 		} else	if (hw_ep->out_qh != NULL)
- 			continue;
- 
-+#ifndef CONFIG_UBICOM32
- 		if (hw_ep == musb->bulk_ep)
-+#else
-+		if ((hw_ep == musb->bulk_ep_in) || (hw_ep == musb->bulk_ep_out)) /* Ubicom */
-+#endif
- 			continue;
- 
- 		if (is_in)
-@@ -1836,7 +1906,14 @@ static int musb_schedule(
- 			best_end = epnum;
- 		}
- 	}
-+
-+#ifdef CONFIG_UBICOM32
-+	if (((best_diff >= qh->maxpacket)) && ((qh->type == USB_ENDPOINT_XFER_BULK) && (!is_in)))
-+		best_end = -1;
-+#endif
-+
- 	/* use bulk reserved ep1 if no other ep is free */
-+#ifndef CONFIG_UBICOM32
- 	if (best_end < 0 && qh->type == USB_ENDPOINT_XFER_BULK) {
- 		hw_ep = musb->bulk_ep;
- 		if (is_in)
-@@ -1858,6 +1935,22 @@ static int musb_schedule(
- 	} else if (best_end < 0) {
- 		return -ENOSPC;
- 	}
-+#else
-+	if (best_end < 0 && qh->type == USB_ENDPOINT_XFER_BULK) {
-+		/* hw_ep = musb->bulk_ep; */
-+		if (is_in) {
-+			head = &musb->in_bulk;
-+			hw_ep = musb->bulk_ep_in; /* UBICOM */
-+		}
-+		else {
-+			head = &musb->out_bulk;
-+			hw_ep = musb->bulk_ep_out; /* UBICOM */
-+		}
-+		goto success;
-+	} else if (best_end < 0) {
-+		return -ENOSPC;
-+	}
-+#endif
- 
- 	idle = 1;
- 	qh->mux = 0;
-@@ -1869,6 +1962,13 @@ success:
- 		list_add_tail(&qh->ring, head);
- 		qh->mux = 1;
- 	}
-+	/*
-+	 * It's not make sense to set NAK timeout when qh->mux = 0,
-+	 * There is nothing else to schedule
-+	 */
-+	if ((qh->type == USB_ENDPOINT_XFER_BULK) && (qh->mux == 0))
-+		qh->intv_reg = 0;
-+
- 	qh->hw_ep = hw_ep;
- 	qh->hep->hcpriv = qh;
- 	if (idle)
-@@ -1975,6 +2075,15 @@ static int musb_urb_enqueue(
- 		/* ISO always uses logarithmic encoding */
- 		interval = min_t(u8, epd->bInterval, 16);
- 		break;
-+#ifdef COMFIG_UBICOM32
-+	case USB_ENDPOINT_XFER_BULK:
-+		 if (epd->bEndpointAddress & USB_ENDPOINT_DIR_MASK)
-+			interval = (USB_SPEED_HIGH == urb->dev->speed) ? 16: 2;
-+		 else
-+			interval = 0;
-+		 break;
-+#endif
-+
- 	default:
- 		/* REVISIT we actually want to use NAK limits, hinting to the
- 		 * transfer scheduling logic to try some other qh, e.g. try
---- a/drivers/usb/musb/musb_io.h
-+++ b/drivers/usb/musb/musb_io.h
-@@ -58,6 +58,7 @@ static inline void writesb(const void __
- 
- #ifndef CONFIG_BLACKFIN
- 
-+#ifndef CONFIG_UBICOM32
- /* NOTE:  these offsets are all in bytes */
- 
- static inline u16 musb_readw(const void __iomem *addr, unsigned offset)
-@@ -72,7 +73,37 @@ static inline void musb_writew(void __io
- 
- static inline void musb_writel(void __iomem *addr, unsigned offset, u32 data)
- 	{ __raw_writel(data, addr + offset); }
-+#else
-+#include <asm/ubicom32-tio.h>
-+static inline u16 musb_readw(const void __iomem *addr, unsigned offset)
-+{
-+        u16 data;
-+        usb_tio_read_u16((u32)(addr + offset), &data);
-+        return data;
-+}
- 
-+static inline u8 musb_readb(const void __iomem *addr, unsigned offset)
-+{
-+        u8 data;
-+        usb_tio_read_u8((u32)(addr + offset), &data);
-+        return data;
-+}
-+
-+static inline void musb_writew(void __iomem *addr, unsigned offset, u16 data)
-+{
-+        usb_tio_write_u16((u32)(addr + offset), data);
-+}
-+
-+static inline void musb_writeb(void __iomem *addr, unsigned offset, u8 data)
-+{
-+        usb_tio_write_u8((u32)(addr + offset), data);
-+}
-+
-+static inline void  musb_read_int_status(u8_t *int_usb, u16_t *int_tx, u16_t *int_rx)
-+{
-+	return usb_tio_read_int_status(int_usb, int_tx, int_rx);
-+}
-+#endif /* CONFIG_UBICOM32 */
- 
- #ifdef CONFIG_USB_TUSB6010
- 
-@@ -106,7 +137,7 @@ static inline void musb_writeb(void __io
- 	__raw_writew(tmp, addr + (offset & ~1));
- }
- 
--#else
-+#elif !defined(CONFIG_UBICOM32)
- 
- static inline u8 musb_readb(const void __iomem *addr, unsigned offset)
- 	{ return __raw_readb(addr + offset); }
---- a/drivers/usb/musb/musb_regs.h
-+++ b/drivers/usb/musb/musb_regs.h
-@@ -167,6 +167,7 @@
- 	(MUSB_TXCSR_H_NAKTIMEOUT | MUSB_TXCSR_H_RXSTALL \
- 	| MUSB_TXCSR_H_ERROR | MUSB_TXCSR_FIFONOTEMPTY)
- 
-+
- /* RXCSR in Peripheral and Host mode */
- #define MUSB_RXCSR_AUTOCLEAR		0x8000
- #define MUSB_RXCSR_DMAENAB		0x2000
---- a/drivers/video/backlight/Kconfig
-+++ b/drivers/video/backlight/Kconfig
-@@ -93,6 +93,63 @@ config LCD_HP700
- 	  If you have an HP Jornada 700 series handheld (710/720/728)
- 	  say Y to enable LCD control driver.
- 
-+config LCD_UBICOM32POWER
-+	tristate "Ubicom LCD power Driver"
-+	depends on LCD_CLASS_DEVICE && UBICOM32
-+	default n
-+	help
-+	  If you have a Ubicom32 based system with an LCD panel that requires
-+	  power control, say Y to enable the power control driver for it.
-+
-+config LCD_UBICOM32
-+	tristate "Ubicom Backlight Driver"
-+	depends on LCD_CLASS_DEVICE && UBICOM32
-+	default n
-+	help
-+	  This driver takes care of initialization of LCD panels with
-+	  built in controllers.
-+
-+menu "Ubicom32 LCD Panel Support"
-+	depends on UBICOM32 && LCD_UBICOM32
-+
-+config LCD_UBICOM32_TFT2N0369E_P
-+	bool "TFT2N0369E (Portrait)"
-+	default n
-+	help
-+	  Support for TFT2N0369 in portrait mode
-+
-+config LCD_UBICOM32_TFT2N0369E_L
-+	bool "TFT2N0369E (Landscape)"
-+	default n
-+	help
-+	  Support for TFT2N0369 in landscape mode
-+
-+config LCD_UBICOM32_CFAF240320KTTS
-+	bool "CFAF240320KTTS"
-+	default n
-+	help
-+	  Support for CFAF240320KTTS
-+
-+config LCD_UBICOM32_CFAF240320KTTS_180
-+	bool "CFAF240320KTTS (180 rotation)"
-+	default n
-+	help
-+	  Support for CFAF240320KTTS rotated 180 degrees
-+
-+config LCD_UBICOM32_CFAF240320D
-+	bool "CFAF240320D"
-+	default n
-+	help
-+	  Support for CFAF240320D
-+
-+config LCD_UBICOM32_CFAF320240F
-+	bool "CFAF320240F"
-+	default n
-+	help
-+	  Support for CFAF320240F
-+
-+endmenu
-+
- #
- # Backlight
- #
-@@ -229,3 +286,11 @@ config BACKLIGHT_SAHARA
- 	help
- 	  If you have a Tabletkiosk Sahara Touch-iT, say y to enable the
- 	  backlight driver.
-+
-+config BACKLIGHT_UBICOM32
-+	tristate "Ubicom Backlight Driver"
-+	depends on BACKLIGHT_CLASS_DEVICE && UBICOM32
-+	default n
-+	help
-+	  If you have a Ubicom32 based system with a backlight say Y to enable the
-+	  backlight driver.
---- a/drivers/video/backlight/Makefile
-+++ b/drivers/video/backlight/Makefile
-@@ -9,6 +9,9 @@ obj-$(CONFIG_LCD_PLATFORM)	   += platfor
- obj-$(CONFIG_LCD_VGG2432A4)	   += vgg2432a4.o
- obj-$(CONFIG_LCD_TDO24M)	   += tdo24m.o
- obj-$(CONFIG_LCD_TOSA)		   += tosa_lcd.o
-+obj-$(CONFIG_LCD_LTV350QV)	   += ltv350qv.o
-+obj-$(CONFIG_LCD_UBICOM32POWER)	   += ubicom32lcdpower.o
-+obj-$(CONFIG_LCD_UBICOM32)	   += ubicom32lcd.o
- 
- obj-$(CONFIG_BACKLIGHT_CLASS_DEVICE) += backlight.o
- obj-$(CONFIG_BACKLIGHT_ATMEL_PWM)    += atmel-pwm-bl.o
-@@ -24,4 +27,4 @@ obj-$(CONFIG_BACKLIGHT_DA903X)	+= da903x
- obj-$(CONFIG_BACKLIGHT_MBP_NVIDIA) += mbp_nvidia_bl.o
- obj-$(CONFIG_BACKLIGHT_TOSA)	+= tosa_bl.o
- obj-$(CONFIG_BACKLIGHT_SAHARA)	+= kb3886_bl.o
--
-+obj-$(CONFIG_BACKLIGHT_UBICOM32) += ubicom32bl.o
---- a/drivers/video/Kconfig
-+++ b/drivers/video/Kconfig
-@@ -609,6 +609,50 @@ config FB_BFIN_T350MCQB
- 	 This display is a QVGA 320x240 24-bit RGB display interfaced by an 8-bit wide PPI
- 	 It uses PPI[0..7] PPI_FS1, PPI_FS2 and PPI_CLK.
- 
-+config FB_UBICOM32
-+	tristate "Ubicom32 Frame Buffer driver"
-+	depends on FB && UBICOM32
-+	select FB_CFB_FILLRECT
-+	select FB_CFB_COPYAREA
-+	select FB_CFB_IMAGEBLIT
-+	select FONT_6x11 if FRAMEBUFFER_CONSOLE
-+	help
-+	 This is the framebuffer device driver for the Ubicom32 architecture.
-+	 You can configure video memory by using kernel command line parameters, for example:
-+		video=ubicomfb:vram_size=512,init_value=0xffff
-+
-+config FB_UBICOM32_PLIO80
-+	tristate "Ubicom32 80 Bus PLIO Frame Buffer driver"
-+	depends on FB && UBICOM32
-+	select FB_CFB_FILLRECT
-+	select FB_CFB_COPYAREA
-+	select FB_CFB_IMAGEBLIT
-+	select FONT_6x11 if FRAMEBUFFER_CONSOLE
-+	select UBICOM32_PLIO
-+	help
-+	 This is a framebuffer device driver for the Ubicom32 architecture.
-+	 You can configure the xres, yres and vram size (in kilobytes) by using
-+	 kernel command line parameters, for example:
-+		video=ubicom32vfb:xres=320,yres=240,vram_size=512
-+
-+config FB_UBICOM32_VIRTUAL
-+	tristate "Ubicom32 Virtual Frame Buffer driver"
-+	depends on FB && UBICOM32
-+	select FB_CFB_FILLRECT
-+	select FB_CFB_COPYAREA
-+	select FB_CFB_IMAGEBLIT
-+	select FONT_6x11 if FRAMEBUFFER_CONSOLE
-+	help
-+	 This is a virtual framebuffer device driver for the Ubicom32 architecture.
-+	 You can configure the xres, yres and vram size (in kilobytes) by using
-+	 kernel command line parameters, for example:
-+		video=ubicom32vfb:xres=320,yres=240,vram_size=512
-+
-+config FB_UBICOM32_VIRTUAL_NOAUTO
-+	bool "Do not automatically load"
-+	depends on FB_UBICOM32_VIRTUAL
-+	help
-+	 Select this option to prevent the VFB from automatically loading at boot.
- 
- config FB_STI
- 	tristate "HP STI frame buffer device support"
---- a/drivers/video/Makefile
-+++ b/drivers/video/Makefile
-@@ -136,6 +136,10 @@ obj-$(CONFIG_FB_BF54X_LQ043)	  += bf54x-
- obj-$(CONFIG_FB_BFIN_T350MCQB)	  += bfin-t350mcqb-fb.o
- obj-$(CONFIG_FB_MX3)		  += mx3fb.o
- 
-+obj-$(CONFIG_FB_UBICOM32)         += ubicom32fb.o
-+obj-$(CONFIG_FB_UBICOM32_PLIO80)  += ubicom32plio80.o
-+obj-$(CONFIG_FB_UBICOM32_VIRTUAL) += ubicom32vfb.o
-+
- # the test framebuffer is last
- obj-$(CONFIG_FB_VIRTUAL)          += vfb.o
- 
---- a/drivers/watchdog/Kconfig
-+++ b/drivers/watchdog/Kconfig
-@@ -887,6 +887,19 @@ config WATCHDOG_RIO
- 	  machines.  The watchdog timeout period is normally one minute but
- 	  can be changed with a boot-time parameter.
- 
-+# Ubicom32
-+
-+config UBI32_WDT
-+	tristate "Ubicom32 Hardware Watchdog support"
-+	depends on UBICOM32
-+	---help---
-+	  If you say yes here you will get support for the Ubicom32 On-Chip
-+	  Watchdog Timer. If you have one of these processors and wish to
-+	  have watchdog support enabled, say Y, otherwise say N.
-+
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called ubi32_wdt.
-+
- # XTENSA Architecture
- 
- #
---- a/drivers/watchdog/Makefile
-+++ b/drivers/watchdog/Makefile
-@@ -131,6 +131,9 @@ obj-$(CONFIG_SH_WDT) += shwdt.o
- obj-$(CONFIG_WATCHDOG_RIO)		+= riowd.o
- obj-$(CONFIG_WATCHDOG_CP1XXX)		+= cpwd.o
- 
-+# Ubicom32 Architecture
-+obj-$(CONFIG_UBI32_WDT)			+= ubi32_wdt.o
-+
- # XTENSA Architecture
- 
- # Architecture Independant
---- a/fs/binfmt_flat.c
-+++ b/fs/binfmt_flat.c
-@@ -67,6 +67,11 @@
- #define FLAT_DATA_ALIGN	(sizeof(void *))
- #endif
- 
-+#ifndef ARCH_FLAT_ALIGN
-+#undef FLAT_DATA_ALIGN
-+#define FLAT_DATA_ALIGN	ARCH_FLAT_ALIGN
-+#endif
-+
- #define RELOC_FAILED 0xff00ff01		/* Relocation incorrect somewhere */
- #define UNLOADED_LIB 0x7ff000ff		/* Placeholder for unused library */
- 
-@@ -436,6 +441,7 @@ static int load_flat_file(struct linux_b
- 	loff_t fpos;
- 	unsigned long start_code, end_code;
- 	int ret;
-+	int flush_happened = 0;
- 
- 	hdr = ((struct flat_hdr *) bprm->buf);		/* exec-header */
- 	inode = bprm->file->f_path.dentry->d_inode;
-@@ -521,6 +527,7 @@ static int load_flat_file(struct linux_b
- 
- 		/* OK, This is the point of no return */
- 		set_personality(PER_LINUX_32BIT);
-+		flush_happened = 1;
- 	}
- 
- 	/*
-@@ -535,6 +542,12 @@ static int load_flat_file(struct linux_b
- 	 * it all together.
- 	 */
- 	if ((flags & (FLAT_FLAG_RAM|FLAT_FLAG_GZIP)) == 0) {
-+
-+#ifdef ARCH_FLAT_ALIGN_TEXT
-+		printk("Unable to mmap rom with ARCH alignment requirements\n");
-+		ret = -ENOEXEC;
-+		goto err;
-+#endif
- 		/*
- 		 * this should give us a ROM ptr,  but if it doesn't we don't
- 		 * really care
-@@ -553,7 +566,7 @@ static int load_flat_file(struct linux_b
- 			goto err;
- 		}
- 
--		len = data_len + extra + MAX_SHARED_LIBS * sizeof(unsigned long);
-+		len = data_len + extra + ALIGN(MAX_SHARED_LIBS * sizeof(unsigned long), FLAT_DATA_ALIGN);
- 		len = PAGE_ALIGN(len);
- 		down_write(&current->mm->mmap_sem);
- 		realdatastart = do_mmap(0, 0, len,
-@@ -572,6 +585,7 @@ static int load_flat_file(struct linux_b
- 		datapos = ALIGN(realdatastart +
- 				MAX_SHARED_LIBS * sizeof(unsigned long),
- 				FLAT_DATA_ALIGN);
-+		//datapos = realdatastart + ALIGN(MAX_SHARED_LIBS * sizeof(unsigned long), ARCH_FLAT_ALIGN);
- 
- 		DBG_FLT("BINFMT_FLAT: Allocated data+bss+stack (%d bytes): %x\n",
- 				(int)(data_len + bss_len + stack_len), (int)datapos);
-@@ -600,7 +614,11 @@ static int load_flat_file(struct linux_b
- 		memp_size = len;
- 	} else {
- 
--		len = text_len + data_len + extra + MAX_SHARED_LIBS * sizeof(unsigned long);
-+		len = text_len + data_len + extra + ALIGN(MAX_SHARED_LIBS * sizeof(unsigned long), FLAT_DATA_ALIGN);
-+#ifdef ARCH_FLAT_ALIGN_TEXT
-+		/* Reserve space for the text alignment. */
-+		len += FLAT_DATA_ALIGN;
-+#endif
- 		len = PAGE_ALIGN(len);
- 		down_write(&current->mm->mmap_sem);
- 		textpos = do_mmap(0, 0, len,
-@@ -616,10 +634,17 @@ static int load_flat_file(struct linux_b
- 			goto err;
- 		}
- 
-+		memp = textpos;
-+#ifdef ARCH_FLAT_ALIGN_TEXT
-+		textpos = ALIGN(textpos + sizeof(struct flat_hdr), FLAT_DATA_ALIGN) - sizeof(struct flat_hdr);
-+#endif
- 		realdatastart = textpos + ntohl(hdr->data_start);
- 		datapos = ALIGN(realdatastart +
- 				MAX_SHARED_LIBS * sizeof(unsigned long),
- 				FLAT_DATA_ALIGN);
-+//		datapos = realdatastart + ALIGN(MAX_SHARED_LIBS * sizeof(unsigned long), ARCH_FLAT_ALIGN);
-+//		reloc = (unsigned long *) (textpos + ntohl(hdr->reloc_start) +
-+//					   ALIGN(MAX_SHARED_LIBS * sizeof(unsigned long), ARCH_FLAT_ALIGN));
- 
- 		reloc = (unsigned long *)
- 			(datapos + (ntohl(hdr->reloc_start) - text_len));
-@@ -659,7 +684,7 @@ static int load_flat_file(struct linux_b
- 		}
- 		if (result >= (unsigned long)-4096) {
- 			printk("Unable to read code+data+bss, errno %d\n",(int)-result);
--			do_munmap(current->mm, textpos, text_len + data_len + extra +
-+			do_munmap(current->mm, memp, text_len + data_len + extra +
- 				MAX_SHARED_LIBS * sizeof(unsigned long));
- 			ret = result;
- 			goto err;
-@@ -672,6 +697,9 @@ static int load_flat_file(struct linux_b
- 
- 	/* The main program needs a little extra setup in the task structure */
- 	start_code = textpos + sizeof (struct flat_hdr);
-+#ifdef ARCH_FLAT_ALIGN_TEXT
-+	BUG_ON(ALIGN(start_code, FLAT_DATA_ALIGN) != start_code);
-+#endif
- 	end_code = textpos + text_len;
- 	if (id == 0) {
- 		current->mm->start_code = start_code;
-@@ -800,6 +828,13 @@ static int load_flat_file(struct linux_b
- 
- 	return 0;
- err:
-+	if (flush_happened) {
-+		/*
-+		 * The parent process has already started running. We cannot allow the child to return back to user space
-+		 * as this child is still uning the parent stack and 2 will clobber each other. We are going to kill this child.
-+		 */
-+		do_exit(SIGTERM);
-+	}
- 	return ret;
- }
- 
---- a/fs/Kconfig.binfmt
-+++ b/fs/Kconfig.binfmt
-@@ -30,7 +30,7 @@ config COMPAT_BINFMT_ELF
- config BINFMT_ELF_FDPIC
- 	bool "Kernel support for FDPIC ELF binaries"
- 	default y
--	depends on (FRV || BLACKFIN || (SUPERH32 && !MMU))
-+	depends on (FRV || BLACKFIN || (SUPERH32 && !MMU) || UBICOM32)
- 	help
- 	  ELF FDPIC binaries are based on ELF, but allow the individual load
- 	  segments of a binary to be located in memory independently of each
---- a/include/asm-generic/resource.h
-+++ b/include/asm-generic/resource.h
-@@ -69,13 +69,16 @@
- /*
-  * boot-time rlimit defaults for the init task:
-  */
-+#ifndef	CONFIG_ELF_CORE
-+#define	CONFIG_USER_ELF_CORE_SIZE	0
-+#endif
- #define INIT_RLIMITS							\
- {									\
- 	[RLIMIT_CPU]		= {  RLIM_INFINITY,  RLIM_INFINITY },	\
- 	[RLIMIT_FSIZE]		= {  RLIM_INFINITY,  RLIM_INFINITY },	\
- 	[RLIMIT_DATA]		= {  RLIM_INFINITY,  RLIM_INFINITY },	\
- 	[RLIMIT_STACK]		= {       _STK_LIM,   _STK_LIM_MAX },	\
--	[RLIMIT_CORE]		= {              0,  RLIM_INFINITY },	\
-+	[RLIMIT_CORE]		= { CONFIG_USER_ELF_CORE_SIZE,  RLIM_INFINITY },	\
- 	[RLIMIT_RSS]		= {  RLIM_INFINITY,  RLIM_INFINITY },	\
- 	[RLIMIT_NPROC]		= {              0,              0 },	\
- 	[RLIMIT_NOFILE]		= {       INR_OPEN,       INR_OPEN },	\
---- a/include/linux/elf-em.h
-+++ b/include/linux/elf-em.h
-@@ -41,6 +41,7 @@
-  * up with a final number.
-  */
- #define EM_ALPHA	0x9026
-+#define EM_UBICOM32 	        0xde3d	/* Ubicom32; no ABI */
- 
- /* Bogus old v850 magic number, used by old tools. */
- #define EM_CYGNUS_V850	0x9080
---- a/include/linux/fb.h
-+++ b/include/linux/fb.h
-@@ -151,6 +151,10 @@ struct dentry;
- #define FB_ACCEL_PROSAVAGE_DDR  0x8d	/* S3 ProSavage DDR             */
- #define FB_ACCEL_PROSAVAGE_DDRK 0x8e	/* S3 ProSavage DDR-K           */
- 
-+#define FB_ACCEL_UBICOM32		0x0100	/* Ubicom32			*/
-+#define FB_ACCEL_UBICOM32_VFB		0x0101	/* Ubicom32 VFB			*/
-+#define FB_ACCEL_UBICOM32_PLIO80	0x0102	/* Ubicom32 PLIO80		*/
-+
- struct fb_fix_screeninfo {
- 	char id[16];			/* identification string eg "TT Builtin" */
- 	unsigned long smem_start;	/* Start of frame buffer mem */
---- a/include/linux/if_ppp.h
-+++ b/include/linux/if_ppp.h
-@@ -114,14 +114,14 @@ struct pppol2tp_ioc_stats {
- 	__u16		tunnel_id;	/* redundant */
- 	__u16		session_id;	/* if zero, get tunnel stats */
- 	__u32		using_ipsec:1;	/* valid only for session_id == 0 */
--	aligned_u64	tx_packets;
--	aligned_u64	tx_bytes;
--	aligned_u64	tx_errors;
--	aligned_u64	rx_packets;
--	aligned_u64	rx_bytes;
--	aligned_u64	rx_seq_discards;
--	aligned_u64	rx_oos_packets;
--	aligned_u64	rx_errors;
-+	__u64	tx_packets;
-+	__u64	tx_bytes;
-+	__u64	tx_errors;
-+	__u64	rx_packets;
-+	__u64	rx_bytes;
-+	__u64	rx_seq_discards;
-+	__u64	rx_oos_packets;
-+	__u64	rx_errors;
- };
- 
- #define ifr__name       b.ifr_ifrn.ifrn_name
---- a/include/linux/oprofile.h
-+++ b/include/linux/oprofile.h
-@@ -99,6 +99,8 @@ void oprofile_add_sample(struct pt_regs 
-  */
- void oprofile_add_ext_sample(unsigned long pc, struct pt_regs * const regs,
- 				unsigned long event, int is_kernel);
-+void oprofile_add_ext_sample_cpu(unsigned long pc, struct pt_regs * const regs,
-+				unsigned long event, int is_kernel, int cpu);
- 
- /* Use this instead when the PC value is not from the regs. Doesn't
-  * backtrace. */
---- a/include/linux/serial_core.h
-+++ b/include/linux/serial_core.h
-@@ -167,6 +167,9 @@
- /* MAX3100 */
- #define PORT_MAX3100    86
- 
-+/* Ubicom32 */
-+#define PORT_UBI32_UARTTIO	87
-+
- #ifdef __KERNEL__
- 
- #include <linux/compiler.h>
---- a/include/linux/slab.h
-+++ b/include/linux/slab.h
-@@ -317,4 +317,14 @@ static inline void *kzalloc_node(size_t 
- 	return kmalloc_node(size, flags | __GFP_ZERO, node);
- }
- 
-+struct kmem_cache_size_info {
-+	unsigned short page;
-+	unsigned short order;
-+};
-+
-+/*
-+ * get info on all the memory allocated by slab for this named cache
-+ */
-+extern int kmem_cache_block_info(char *name, struct kmem_cache_size_info *data, int max_data);
-+
- #endif	/* _LINUX_SLAB_H */
---- a/init/Kconfig
-+++ b/init/Kconfig
-@@ -865,6 +865,12 @@ config ELF_CORE
- 	help
- 	  Enable support for generating core dumps. Disabling saves about 4k.
- 
-+config USER_ELF_CORE_SIZE
-+	int "user core dump size (10MB to 32MB)"
-+	range 10485760 33554432
-+	default 16777216
-+	depends on ELF_CORE
-+
- config PCSPKR_PLATFORM
- 	bool "Enable PC-Speaker support" if EMBEDDED
- 	depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
---- a/kernel/module.c
-+++ b/kernel/module.c
-@@ -2688,6 +2688,9 @@ static int m_show(struct seq_file *m, vo
- 	/* Used by oprofile and other similar tools. */
- 	seq_printf(m, " 0x%p", mod->module_core);
- 
-+#ifdef ARCH_PROC_MODULES_EXTRA
-+	ARCH_PROC_MODULES_EXTRA(m, mod);
-+#endif
- 	/* Taints info */
- 	if (mod->taints)
- 		seq_printf(m, " %s", module_flags(mod, buf));
-@@ -2840,8 +2843,12 @@ void print_modules(void)
- 	printk("Modules linked in:");
- 	/* Most callers should already have preempt disabled, but make sure */
- 	preempt_disable();
--	list_for_each_entry_rcu(mod, &modules, list)
-+	list_for_each_entry_rcu(mod, &modules, list) {
- 		printk(" %s%s", mod->name, module_flags(mod, buf));
-+#ifdef ARCH_OOPS_MODULE_EXTRA
-+		ARCH_OOPS_MODULE_EXTRA(mod);
-+#endif
-+	}
- 	preempt_enable();
- 	if (last_unloaded_module[0])
- 		printk(" [last unloaded: %s]", last_unloaded_module);
---- a/kernel/sched_clock.c
-+++ b/kernel/sched_clock.c
-@@ -38,8 +38,7 @@
-  */
- unsigned long long __attribute__((weak)) sched_clock(void)
- {
--	return (unsigned long long)(jiffies - INITIAL_JIFFIES)
--					* (NSEC_PER_SEC / HZ);
-+	return (get_jiffies_64() - INITIAL_JIFFIES) * (NSEC_PER_SEC / HZ);
- }
- 
- static __read_mostly int sched_clock_running;
---- a/lib/Kconfig.debug
-+++ b/lib/Kconfig.debug
-@@ -621,7 +621,7 @@ config FRAME_POINTER
- 	bool "Compile the kernel with frame pointers"
- 	depends on DEBUG_KERNEL && \
- 		(CRIS || M68K || M68KNOMMU || FRV || UML || \
--		 AVR32 || SUPERH || BLACKFIN || MN10300) || \
-+		 AVR32 || SUPERH || BLACKFIN || MN10300 || UBICOM32) || \
- 		ARCH_WANT_FRAME_POINTERS
- 	default y if (DEBUG_INFO && UML) || ARCH_WANT_FRAME_POINTERS
- 	help
---- a/mm/Makefile
-+++ b/mm/Makefile
-@@ -38,3 +38,5 @@ obj-$(CONFIG_SMP) += allocpercpu.o
- endif
- obj-$(CONFIG_QUICKLIST) += quicklist.o
- obj-$(CONFIG_CGROUP_MEM_RES_CTLR) += memcontrol.o page_cgroup.o
-+
-+CFLAGS_slab.o := $(PROFILING) -O2
---- a/mm/slab.c
-+++ b/mm/slab.c
-@@ -4100,6 +4100,68 @@ out:
- 
- #ifdef CONFIG_SLABINFO
- 
-+
-+/*
-+ * get info on all the memory allocated by slab for this named cache
-+ */
-+int kmem_cache_block_info(char *name, struct kmem_cache_size_info *data, int max_data)
-+{
-+	int res = 0;
-+	int found = 0;
-+	int node;
-+	struct kmem_cache *cachep;
-+	struct kmem_list3 *l3;
-+	struct slab *slabp;
-+
-+	/* Find the cache in the chain of caches. */
-+	mutex_lock(&cache_chain_mutex);
-+	list_for_each_entry(cachep, &cache_chain, next) {
-+		if (strcmp(cachep->name, name) == 0) {
-+			found = 1;
-+			break;
-+		}
-+	}
-+	mutex_unlock(&cache_chain_mutex);
-+	if (!found) {
-+		return 0;
-+	}
-+	for_each_online_node(node) {
-+		l3 = cachep->nodelists[node];
-+		if (!l3)
-+			continue;
-+		if (res >= max_data)
-+			break;
-+		check_irq_on();
-+		spin_lock_irq(&l3->list_lock);
-+
-+		list_for_each_entry(slabp, &l3->slabs_full, list) {
-+			if (res >= max_data)
-+				break;
-+			data[res].page = ((unsigned int)slabp->s_mem >> PAGE_SHIFT) & 0xffff;
-+			data[res].order = cachep->gfporder;
-+			res++;
-+		}
-+		list_for_each_entry(slabp, &l3->slabs_partial, list) {
-+			if (res >= max_data)
-+				break;
-+			data[res].page = ((unsigned int)slabp->s_mem >> PAGE_SHIFT) & 0xffff;
-+			data[res].order = cachep->gfporder;
-+			res++;
-+		}
-+		list_for_each_entry(slabp, &l3->slabs_free, list) {
-+			if (res >= max_data)
-+				break;
-+			data[res].page = ((unsigned int)slabp->s_mem >> PAGE_SHIFT) & 0xffff;
-+			data[res].order = cachep->gfporder;
-+			res++;
-+		}
-+
-+		spin_unlock_irq(&l3->list_lock);
-+	}
-+
-+	return res;
-+}
-+
- static void print_slabinfo_header(struct seq_file *m)
- {
- 	/*
---- a/scripts/mod/file2alias.c
-+++ b/scripts/mod/file2alias.c
-@@ -774,6 +774,15 @@ void handle_moddevtable(struct module *m
- 			+ sym->st_value;
- 	}
- 
-+	/*
-+	 * somehow our gcc is not generating st_size correctly and set 0 for some symbols.
-+	 * and 0 size will break do_table since it adjust size to (size - id_size)
-+	 * this is to make sure st_size fall in range.
-+	 */
-+	if (sym->st_size == 0 || sym->st_size > info->sechdrs[sym->st_shndx].sh_size) {
-+		sym->st_size = info->sechdrs[sym->st_shndx].sh_size;
-+	}
-+
- 	if (sym_is(symname, "__mod_pci_device_table"))
- 		do_table(symval, sym->st_size,
- 			 sizeof(struct pci_device_id), "pci",
---- a/sound/Kconfig
-+++ b/sound/Kconfig
-@@ -82,6 +82,8 @@ source "sound/parisc/Kconfig"
- 
- source "sound/soc/Kconfig"
- 
-+source "sound/ubicom32/Kconfig"
-+
- endif # SND
- 
- menuconfig SOUND_PRIME
---- a/sound/Makefile
-+++ b/sound/Makefile
-@@ -6,7 +6,7 @@ obj-$(CONFIG_SOUND_PRIME) += sound_firmw
- obj-$(CONFIG_SOUND_PRIME) += oss/
- obj-$(CONFIG_DMASOUND) += oss/
- obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ sh/ synth/ usb/ \
--	sparc/ spi/ parisc/ pcmcia/ mips/ soc/ atmel/
-+	sparc/ spi/ parisc/ pcmcia/ mips/ soc/ atmel/ ubicom32/
- obj-$(CONFIG_SND_AOA) += aoa/
- 
- # This one must be compilable even if sound is configured out
diff --git a/target/linux/ubicom32/patches-2.6.30/110-vmlinux_lds_fix.patch b/target/linux/ubicom32/patches-2.6.30/110-vmlinux_lds_fix.patch
deleted file mode 100644
index 1a1430887..000000000
--- a/target/linux/ubicom32/patches-2.6.30/110-vmlinux_lds_fix.patch
+++ /dev/null
@@ -1,150 +0,0 @@
---- a/arch/ubicom32/kernel/vmlinux.lds.S
-+++ b/arch/ubicom32/kernel/vmlinux.lds.S
-@@ -25,7 +25,6 @@
-  *   arch/blackfin
-  *   arch/parisc
-  */
--#include <asm-generic/vmlinux.lds.h>
- #include <asm/ocm_size.h>
- #include <asm/memory_map.h>
- #include <asm/thread_info.h>
-@@ -201,94 +200,28 @@ SECTIONS {
- 		*(__ex_table)
- 		__stop___ex_table = .;
- 
--		*(.rodata) *(.rodata.*)
--		*(__vermagic)		/* Kernel version magic */
--		*(__markers_strings)
--		*(.rodata1)
--		*(.rodata.str1.1)
--		*(__tracepoints_strings)
--
--		 /* PCI quirks */
--		__start_pci_fixups_early = . ;
--			*(.pci_fixup_early)
--		__end_pci_fixups_early = . ;
--		__start_pci_fixups_header = . ;
--			*(.pci_fixup_header)
--		__end_pci_fixups_header = . ;
--		__start_pci_fixups_final = . ;
--			*(.pci_fixup_final)
--		__end_pci_fixups_final = . ;
--		__start_pci_fixups_enable = . ;
--			*(.pci_fixup_enable)
--		__end_pci_fixups_enable = . ;
--		__start_pci_fixups_resume = . ;
--		       *(.pci_fixup_resume)
--		__end_pci_fixups_resume = . ;
--		__start_pci_fixups_resume_early = . ;
--		       *(.pci_fixup_resume_early)
--		__end_pci_fixups_resume_early = . ;
--		__start_pci_fixups_suspend  = . ;
--		       *(.pci_fixup_suspend)
--		__end_pci_fixups_suspend = . ;
--
--		__start_builtin_fw = . ;
--			*(.builtin_fw)
--		__end_builtin_fw = . ;
--
--
--		/* Kernel symbol table: Normal symbols */
--		. = ALIGN(4);
--		__start___ksymtab = .;
--		*(__ksymtab)
--		__stop___ksymtab = .;
--
--		/* Kernel symbol table: GPL-only symbols */
--		__start___ksymtab_gpl = .;
--		*(__ksymtab_gpl)
--		__stop___ksymtab_gpl = .;
--
--		/* Kernel symbol table: Normal unused symbols */
--		__start___ksymtab_unused = .;
--		*(__ksymtab_unused)
--		__stop___ksymtab_unused = .;
--
--		/* Kernel symbol table: GPL-only unused symbols */
--		__start___ksymtab_unused_gpl = .;
--		*(__ksymtab_unused_gpl)
--		__stop___ksymtab_unused_gpl = .;
--
--		/* Kernel symbol table: GPL-future symbols */
--		__start___ksymtab_gpl_future = .;
--		*(__ksymtab_gpl_future)
--		__stop___ksymtab_gpl_future = .;
--
--		/* Kernel symbol table: Normal symbols */
--		__start___kcrctab = .;
--		*(__kcrctab)
--		__stop___kcrctab = .;
--
--		/* Kernel symbol table: GPL-only symbols */
--		__start___kcrctab_gpl = .;
--		*(__kcrctab_gpl)
--		__stop___kcrctab_gpl = .;
--
--		/* Kernel symbol table: GPL-future symbols */
--		__start___kcrctab_gpl_future = .;
--		*(__kcrctab_gpl_future)
--		__stop___kcrctab_gpl_future = .;
-+	} > TEXT
- 
--		/* Kernel symbol table: strings */
--		*(__ksymtab_strings)
-+	RO_DATA(16)
- 
--		/* Built-in module parameters */
--		. = ALIGN(4) ;
--		__start___param = .;
--		*(__param)
--		__stop___param = .;
-+	.rodata : {} > TEXT
-+	.rodata1 : {} > TEXT
-+	.pci_fixup : {} > TEXT
-+	.builtin_fw : {} > TEXT
-+	.rio_route : {} > TEXT
-+	.tracedata : {} > TEXT
-+	__ksymtab : {} > TEXT
-+	__ksymtab_gpl : {} > TEXT
-+	__ksymtab_gpl_future : {} > TEXT
-+	__kcrctab_gpl : {} > TEXT
-+	__kcrctab_unused : {} > TEXT
-+	__kcrctab_unused_gpl : {} > TEXT
-+	__kcrctab_gpl_future : {} > TEXT
-+	__ksymtab_strings : {} > TEXT
-+	__init_rodata : {} > TEXT
-+	__param : {} > TEXT
- 
--		. = ALIGN(4) ;
--		_etext = . ;
--	} > TEXT
-+	_etext = .;
- 
- 	.data DATA_ADDR : {
- 		. = ALIGN(4);
-@@ -349,12 +282,6 @@ SECTIONS {
- 	    PROVIDE (___eh_frame_end = .);
- 	  } > INIT
- 
--	/DISCARD/ : {
--		EXIT_TEXT
--		EXIT_DATA
--		*(.exitcall.exit)
--	}
--
- 	.bss : {
- 		. = ALIGN(4);
- 		_sbss = . ;
-@@ -365,6 +292,12 @@ SECTIONS {
- 		_end = . ;
- 	} > BSS
- 
-+	/DISCARD/ : {
-+		EXIT_TEXT
-+		EXIT_DATA
-+		*(.exitcall.exit)
-+	}
-+
- 	NOTES > BSS
- 
- }
diff --git a/target/linux/ubicom32/patches-2.6.30/120-libgcc_func.patch b/target/linux/ubicom32/patches-2.6.30/120-libgcc_func.patch
deleted file mode 100644
index fee4ece00..000000000
--- a/target/linux/ubicom32/patches-2.6.30/120-libgcc_func.patch
+++ /dev/null
@@ -1,419 +0,0 @@
---- a/arch/ubicom32/Makefile
-+++ b/arch/ubicom32/Makefile
-@@ -60,9 +60,6 @@ cflags-$(CONFIG_UBICOM32_V4)		:= -march=
- ldflags-$(CONFIG_LINKER_RELAXATION)	:= --relax
- LDFLAGS_vmlinux := $(ldflags-y)
- 
--GCCLIBDIR := $(dir $(shell $(CC) $(cflags-y) -print-libgcc-file-name))
--GCC_LIBS := $(GCCLIBDIR)/libgcc.a
--
- KBUILD_CFLAGS += $(cflags-y) -ffunction-sections
- KBUILD_AFLAGS += $(cflags-y)
- 
-@@ -84,7 +81,6 @@ core-y	+= arch/$(ARCH)/kernel/ \
- drivers-$(CONFIG_OPROFILE)	+= arch/ubicom32/oprofile/
- 
- libs-y	+= arch/$(ARCH)/lib/
--libs-y	+= $(GCC_LIBS)
- 
- archclean:
- 
---- a/arch/ubicom32/lib/Makefile
-+++ b/arch/ubicom32/lib/Makefile
-@@ -30,3 +30,4 @@
- #
- 
- lib-y	:= checksum.o delay.o mem_ubicom32.o
-+lib-y	+= ashldi3.o ashrdi3.o divmod.o lshrdi3.o muldi3.o
---- /dev/null
-+++ b/arch/ubicom32/lib/ashldi3.c
-@@ -0,0 +1,62 @@
-+/* ashrdi3.c extracted from gcc-2.95.2/libgcc2.c which is: */
-+/* Copyright (C) 1989, 92-98, 1999 Free Software Foundation, Inc.
-+
-+This file is part of GNU CC.
-+
-+GNU CC 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, or (at your option)
-+any later version.
-+
-+GNU CC is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with GNU CC; see the file COPYING.  If not, write to
-+the Free Software Foundation, 59 Temple Place - Suite 330,
-+Boston, MA 02111-1307, USA.  */
-+
-+#define BITS_PER_UNIT 8
-+
-+typedef		 int SItype	__attribute__ ((mode (SI)));
-+typedef unsigned int USItype	__attribute__ ((mode (SI)));
-+typedef		 int DItype	__attribute__ ((mode (DI)));
-+typedef int word_type __attribute__ ((mode (__word__)));
-+
-+struct DIstruct {SItype high, low;};
-+
-+typedef union
-+{
-+  struct DIstruct s;
-+  DItype ll;
-+} DIunion;
-+
-+DItype
-+__ashldi3 (DItype u, word_type b)
-+{
-+  DIunion w;
-+  word_type bm;
-+  DIunion uu;
-+
-+  if (b == 0)
-+    return u;
-+
-+  uu.ll = u;
-+
-+  bm = (sizeof (SItype) * BITS_PER_UNIT) - b;
-+  if (bm <= 0)
-+    {
-+      w.s.low = 0;
-+      w.s.high = (USItype)uu.s.low << -bm;
-+    }
-+  else
-+    {
-+      USItype carries = (USItype)uu.s.low >> bm;
-+      w.s.low = (USItype)uu.s.low << b;
-+      w.s.high = ((USItype)uu.s.high << b) | carries;
-+    }
-+
-+  return w.ll;
-+}
---- /dev/null
-+++ b/arch/ubicom32/lib/ashrdi3.c
-@@ -0,0 +1,63 @@
-+/* ashrdi3.c extracted from gcc-2.7.2/libgcc2.c which is: */
-+/* Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
-+
-+This file is part of GNU CC.
-+
-+GNU CC 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, or (at your option)
-+any later version.
-+
-+GNU CC is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with GNU CC; see the file COPYING.  If not, write to
-+the Free Software Foundation, 59 Temple Place - Suite 330,
-+Boston, MA 02111-1307, USA.  */
-+
-+#define BITS_PER_UNIT 8
-+
-+typedef		 int SItype	__attribute__ ((mode (SI)));
-+typedef unsigned int USItype	__attribute__ ((mode (SI)));
-+typedef		 int DItype	__attribute__ ((mode (DI)));
-+typedef int word_type __attribute__ ((mode (__word__)));
-+
-+struct DIstruct {SItype high, low;};
-+
-+typedef union
-+{
-+  struct DIstruct s;
-+  DItype ll;
-+} DIunion;
-+
-+DItype
-+__ashrdi3 (DItype u, word_type b)
-+{
-+  DIunion w;
-+  word_type bm;
-+  DIunion uu;
-+
-+  if (b == 0)
-+    return u;
-+
-+  uu.ll = u;
-+
-+  bm = (sizeof (SItype) * BITS_PER_UNIT) - b;
-+  if (bm <= 0)
-+    {
-+      /* w.s.high = 1..1 or 0..0 */
-+      w.s.high = uu.s.high >> (sizeof (SItype) * BITS_PER_UNIT - 1);
-+      w.s.low = uu.s.high >> -bm;
-+    }
-+  else
-+    {
-+      USItype carries = (USItype)uu.s.high << bm;
-+      w.s.high = uu.s.high >> b;
-+      w.s.low = ((USItype)uu.s.low >> b) | carries;
-+    }
-+
-+  return w.ll;
-+}
---- /dev/null
-+++ b/arch/ubicom32/lib/divmod.c
-@@ -0,0 +1,85 @@
-+unsigned long
-+udivmodsi4(unsigned long num, unsigned long den, int modwanted)
-+{
-+  unsigned long bit = 1;
-+  unsigned long res = 0;
-+
-+  while (den < num && bit && !(den & (1L<<31)))
-+    {
-+      den <<=1;
-+      bit <<=1;
-+    }
-+  while (bit)
-+    {
-+      if (num >= den)
-+	{
-+	  num -= den;
-+	  res |= bit;
-+	}
-+      bit >>=1;
-+      den >>=1;
-+    }
-+  if (modwanted) return num;
-+  return res;
-+}
-+
-+long
-+__udivsi3 (long a, long b)
-+{
-+  return udivmodsi4 (a, b, 0);
-+}
-+
-+long
-+__umodsi3 (long a, long b)
-+{
-+  return udivmodsi4 (a, b, 1);
-+}
-+
-+long
-+__divsi3 (long a, long b)
-+{
-+  int neg = 0;
-+  long res;
-+
-+  if (a < 0)
-+    {
-+      a = -a;
-+      neg = !neg;
-+    }
-+
-+  if (b < 0)
-+    {
-+      b = -b;
-+      neg = !neg;
-+    }
-+
-+  res = udivmodsi4 (a, b, 0);
-+
-+  if (neg)
-+    res = -res;
-+
-+  return res;
-+}
-+
-+long
-+__modsi3 (long a, long b)
-+{
-+  int neg = 0;
-+  long res;
-+
-+  if (a < 0)
-+    {
-+      a = -a;
-+      neg = 1;
-+    }
-+
-+  if (b < 0)
-+    b = -b;
-+
-+  res = udivmodsi4 (a, b, 1);
-+
-+  if (neg)
-+    res = -res;
-+
-+  return res;
-+}
---- /dev/null
-+++ b/arch/ubicom32/lib/lshrdi3.c
-@@ -0,0 +1,62 @@
-+/* lshrdi3.c extracted from gcc-2.7.2/libgcc2.c which is: */
-+/* Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
-+
-+This file is part of GNU CC.
-+
-+GNU CC 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, or (at your option)
-+any later version.
-+
-+GNU CC is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with GNU CC; see the file COPYING.  If not, write to
-+the Free Software Foundation, 59 Temple Place - Suite 330,
-+Boston, MA 02111-1307, USA.  */
-+
-+#define BITS_PER_UNIT 8
-+
-+typedef		 int SItype	__attribute__ ((mode (SI)));
-+typedef unsigned int USItype	__attribute__ ((mode (SI)));
-+typedef		 int DItype	__attribute__ ((mode (DI)));
-+typedef int word_type __attribute__ ((mode (__word__)));
-+
-+struct DIstruct {SItype high, low;};
-+
-+typedef union
-+{
-+  struct DIstruct s;
-+  DItype ll;
-+} DIunion;
-+
-+DItype
-+__lshrdi3 (DItype u, word_type b)
-+{
-+  DIunion w;
-+  word_type bm;
-+  DIunion uu;
-+
-+  if (b == 0)
-+    return u;
-+
-+  uu.ll = u;
-+
-+  bm = (sizeof (SItype) * BITS_PER_UNIT) - b;
-+  if (bm <= 0)
-+    {
-+      w.s.high = 0;
-+      w.s.low = (USItype)uu.s.high >> -bm;
-+    }
-+  else
-+    {
-+      USItype carries = (USItype)uu.s.high << bm;
-+      w.s.high = (USItype)uu.s.high >> b;
-+      w.s.low = ((USItype)uu.s.low >> b) | carries;
-+    }
-+
-+  return w.ll;
-+}
---- /dev/null
-+++ b/arch/ubicom32/lib/muldi3.c
-@@ -0,0 +1,87 @@
-+/* muldi3.c extracted from gcc-2.7.2.3/libgcc2.c and
-+			   gcc-2.7.2.3/longlong.h which is: */
-+/* Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
-+
-+This file is part of GNU CC.
-+
-+GNU CC 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, or (at your option)
-+any later version.
-+
-+GNU CC is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with GNU CC; see the file COPYING.  If not, write to
-+the Free Software Foundation, 59 Temple Place - Suite 330,
-+Boston, MA 02111-1307, USA.  */
-+
-+#define UWtype          USItype
-+#define UHWtype         USItype
-+#define W_TYPE_SIZE     32
-+#define __BITS4 (W_TYPE_SIZE / 4)
-+#define __ll_B ((UWtype) 1 << (W_TYPE_SIZE / 2))
-+#define __ll_lowpart(t) ((UWtype) (t) & (__ll_B - 1))
-+#define __ll_highpart(t) ((UWtype) (t) >> (W_TYPE_SIZE / 2))
-+
-+#define umul_ppmm(w1, w0, u, v)                                         \
-+  do {                                                                  \
-+    UWtype __x0, __x1, __x2, __x3;                                      \
-+    UHWtype __ul, __vl, __uh, __vh;                                     \
-+                                                                        \
-+    __ul = __ll_lowpart (u);                                            \
-+    __uh = __ll_highpart (u);                                           \
-+    __vl = __ll_lowpart (v);                                            \
-+    __vh = __ll_highpart (v);                                           \
-+                                                                        \
-+    __x0 = (UWtype) __ul * __vl;                                        \
-+    __x1 = (UWtype) __ul * __vh;                                        \
-+    __x2 = (UWtype) __uh * __vl;                                        \
-+    __x3 = (UWtype) __uh * __vh;                                        \
-+                                                                        \
-+    __x1 += __ll_highpart (__x0);/* this can't give carry */            \
-+    __x1 += __x2;               /* but this indeed can */               \
-+    if (__x1 < __x2)            /* did we get it? */                    \
-+      __x3 += __ll_B;           /* yes, add it in the proper pos.  */   \
-+                                                                        \
-+    (w1) = __x3 + __ll_highpart (__x1);                                 \
-+    (w0) = __ll_lowpart (__x1) * __ll_B + __ll_lowpart (__x0);          \
-+  } while (0)
-+
-+
-+#define __umulsidi3(u, v) \
-+  ({DIunion __w;							\
-+    umul_ppmm (__w.s.high, __w.s.low, u, v);				\
-+    __w.ll; })
-+
-+typedef		 int SItype	__attribute__ ((mode (SI)));
-+typedef unsigned int USItype	__attribute__ ((mode (SI)));
-+typedef		 int DItype	__attribute__ ((mode (DI)));
-+typedef int word_type __attribute__ ((mode (__word__)));
-+
-+struct DIstruct {SItype high, low;};
-+
-+typedef union
-+{
-+  struct DIstruct s;
-+  DItype ll;
-+} DIunion;
-+
-+DItype
-+__muldi3 (DItype u, DItype v)
-+{
-+  DIunion w;
-+  DIunion uu, vv;
-+
-+  uu.ll = u,
-+  vv.ll = v;
-+
-+  w.ll = __umulsidi3 (uu.s.low, vv.s.low);
-+  w.s.high += ((USItype) uu.s.low * (USItype) vv.s.high
-+	       + (USItype) uu.s.high * (USItype) vv.s.low);
-+
-+  return w.ll;
-+}
---- a/arch/ubicom32/kernel/ubicom32_ksyms.c
-+++ b/arch/ubicom32/kernel/ubicom32_ksyms.c
-@@ -72,7 +72,6 @@ EXPORT_SYMBOL(memmove);
- extern void __ashldi3(void);
- extern void __ashrdi3(void);
- extern void __divsi3(void);
--extern void __divdi3(void);
- extern void __lshrdi3(void);
- extern void __modsi3(void);
- extern void __muldi3(void);
-@@ -83,7 +82,6 @@ extern void __umodsi3(void);
- EXPORT_SYMBOL(__ashldi3);
- EXPORT_SYMBOL(__ashrdi3);
- EXPORT_SYMBOL(__divsi3);
--EXPORT_SYMBOL(__divdi3);
- EXPORT_SYMBOL(__lshrdi3);
- EXPORT_SYMBOL(__modsi3);
- EXPORT_SYMBOL(__muldi3);
diff --git a/target/linux/ubicom32/patches-2.6.30/130-flash_driver_fix.patch b/target/linux/ubicom32/patches-2.6.30/130-flash_driver_fix.patch
deleted file mode 100644
index 95fa50807..000000000
--- a/target/linux/ubicom32/patches-2.6.30/130-flash_driver_fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/drivers/mtd/devices/ubi32-m25p80.c
-+++ b/drivers/mtd/devices/ubi32-m25p80.c
-@@ -630,8 +630,8 @@ static int ubicom32_flash_driver_erase(s
- 	/* sanity checks */
- 	if (instr->addr + instr->len > flash->mtd.size)
- 		return -EINVAL;
--	if ((instr->addr % mtd->erasesize) != 0
--			|| (instr->len % mtd->erasesize) != 0) {
-+	if (((u32) instr->addr % mtd->erasesize) != 0
-+			|| ((u32) instr->len % mtd->erasesize) != 0) {
- 		return -EINVAL;
- 	}
- 
diff --git a/target/linux/ubicom32/patches-2.6.30/140-arch_cflags.patch b/target/linux/ubicom32/patches-2.6.30/140-arch_cflags.patch
deleted file mode 100644
index aa1396e41..000000000
--- a/target/linux/ubicom32/patches-2.6.30/140-arch_cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/arch/ubicom32/Makefile
-+++ b/arch/ubicom32/Makefile
-@@ -54,8 +54,8 @@ CFLAGS_MODULE    += -mno-fastcall
- #
- # Some CFLAG additions based on specific CPU type.
- #
--cflags-$(CONFIG_UBICOM32_V3)		:= -march=ubicom32v3 -DIP5000
--cflags-$(CONFIG_UBICOM32_V4)		:= -march=ubicom32v4 -DIP7000
-+cflags-$(CONFIG_UBICOM32_V3)		:= -march=ubicom32v3 -mno-fdpic -DIP5000
-+cflags-$(CONFIG_UBICOM32_V4)		:= -march=ubicom32v4 -mno-fdpic -DIP7000
- 
- ldflags-$(CONFIG_LINKER_RELAXATION)	:= --relax
- LDFLAGS_vmlinux := $(ldflags-y)
diff --git a/target/linux/ubicom32/patches-2.6.32/100-ubicom32_support.patch b/target/linux/ubicom32/patches-2.6.32/100-ubicom32_support.patch
deleted file mode 100644
index e16ec7dda..000000000
--- a/target/linux/ubicom32/patches-2.6.32/100-ubicom32_support.patch
+++ /dev/null
@@ -1,1725 +0,0 @@
---- a/drivers/char/hw_random/Kconfig
-+++ b/drivers/char/hw_random/Kconfig
-@@ -186,3 +186,16 @@ config HW_RANDOM_MXC_RNGA
- 	  module will be called mxc-rnga.
- 
- 	  If unsure, say Y.
-+
-+config HW_RANDOM_UBICOM32
-+	tristate "Ubicom32 HW Random Number Generator support"
-+	depends on HW_RANDOM && UBICOM32
-+	default HW_RANDOM
-+	---help---
-+	  This driver provides kernel-side support for the Random Number
-+	  Generator hardware found on Ubicom32 processors.
-+
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called pasemi-rng.
-+
-+	  If unsure, say Y.
---- a/drivers/char/hw_random/Makefile
-+++ b/drivers/char/hw_random/Makefile
-@@ -18,3 +18,4 @@ obj-$(CONFIG_HW_RANDOM_VIRTIO) += virtio
- obj-$(CONFIG_HW_RANDOM_TX4939) += tx4939-rng.o
- obj-$(CONFIG_HW_RANDOM_MXC_RNGA) += mxc-rnga.o
- obj-$(CONFIG_HW_RANDOM_OCTEON) += octeon-rng.o
-+obj-$(CONFIG_HW_RANDOM_UBICOM32) += ubicom32-rng.o
---- a/drivers/crypto/Kconfig
-+++ b/drivers/crypto/Kconfig
-@@ -61,6 +61,40 @@ config CRYPTO_DEV_GEODE
- 	  To compile this driver as a module, choose M here: the module
- 	  will be called geode-aes.
- 
-+config CRYPTO_UBICOM32
-+        bool "Ubicom32 Security Module"
-+        depends on UBICOM32
-+        help
-+          This is the ubicom32 hardware acceleration common code.
-+
-+config CRYPTO_AES_UBICOM32
-+        tristate "Ubicom32 AES implementation"
-+        depends on CRYPTO_UBICOM32
-+        select CRYPTO_ALGAPI
-+        help
-+          This is the ubicom32 hardware AES implementation.
-+
-+config CRYPTO_DES_UBICOM32
-+        tristate "Ubicom32 DES implementation"
-+        depends on CRYPTO_UBICOM32
-+        select CRYPTO_ALGAPI
-+        help
-+          This is the ubicom32 hardware DES and 3DES implementation.
-+
-+config CRYPTO_SHA1_UBICOM32
-+        tristate "Ubicom32 SHA1 implementation"
-+        depends on CRYPTO_UBICOM32
-+        select CRYPTO_ALGAPI
-+        help
-+          This is the ubicom32 hardware SHA1 implementation.
-+
-+config CRYPTO_MD5_UBICOM32
-+        tristate "Ubicom32 MD5 implementation"
-+        depends on CRYPTO_UBICOM32
-+        select CRYPTO_ALGAPI
-+        help
-+          This is the ubicom32 hardware MD5 implementation.
-+
- config ZCRYPT
- 	tristate "Support for PCI-attached cryptographic adapters"
- 	depends on S390
---- a/drivers/mmc/host/Kconfig
-+++ b/drivers/mmc/host/Kconfig
-@@ -382,3 +382,10 @@ config MMC_VIA_SDMMC
- 	  If you have a controller with this interface, say Y or M here.
- 
- 	  If unsure, say N.
-+
-+config MMC_UBICOM32
-+	tristate "Ubicom32 MMC/SD host controller"
-+	depends on UBICOM32
-+	help
-+	  This provides support for the SD/MMC hardware found on Ubicom32
-+	  IP7K processors
---- a/drivers/mmc/host/Makefile
-+++ b/drivers/mmc/host/Makefile
-@@ -35,6 +35,7 @@ obj-$(CONFIG_MMC_TMIO)		+= tmio_mmc.o
- obj-$(CONFIG_MMC_CB710)	+= cb710-mmc.o
- obj-$(CONFIG_MMC_VIA_SDMMC)	+= via-sdmmc.o
- obj-$(CONFIG_GPIOMMC)		+= gpiommc.o
-+obj-$(CONFIG_MMC_UBICOM32)	+= ubicom32sd.o
- 
- ifeq ($(CONFIG_CB710_DEBUG),y)
- 	CFLAGS-cb710-mmc	+= -DDEBUG
---- a/drivers/mtd/devices/Kconfig
-+++ b/drivers/mtd/devices/Kconfig
-@@ -114,6 +114,31 @@ config MTD_SST25L
- 	  Set up your spi devices with the right board-specific platform data,
- 	  if you want to specify device partitioning.
- 
-+config MTD_UBI32_NAND_SPI_ER
-+	tristate "UBI32_NAND SPI-ER support"
-+	help
-+	  This driver supports the Micron MT29F1G01 SPI-ER NAND flash chip
-+	  using the built in flash controller on the Ubicom32 architecture.
-+	  Partial page writes are not supported by this driver.
-+
-+config MTD_NAND_SPI_ER
-+	tristate "NAND SPI-ER support"
-+	help
-+	  This driver supports the Micron MT29F1G01 SPI-ER NAND flash chip
-+	  using a generic SPI bus.  Partial page writes are supported
-+	  by this driver.
-+
-+config MTD_UBI32_M25P80
-+	tristate "Ubicom processor support for most SPI Flash chips (AT26DF, M25P, W25X, ...)"
-+	depends on UBICOM32
-+	default y
-+	help
-+	  This enables access to most modern SPI flash chips, used for
-+	  program and data storage.   Series supported include Atmel AT26DF,
-+	  Spansion S25SL, SST 25VF, ST M25P, and Winbond W25X.  Other chips
-+	  are supported as well.  See the driver source for the current list,
-+	  or to add other chips.
-+
- config MTD_SLRAM
- 	tristate "Uncached system RAM"
- 	help
---- a/drivers/mtd/devices/Makefile
-+++ b/drivers/mtd/devices/Makefile
-@@ -17,3 +17,6 @@ obj-$(CONFIG_MTD_BLOCK2MTD)	+= block2mtd
- obj-$(CONFIG_MTD_DATAFLASH)	+= mtd_dataflash.o
- obj-$(CONFIG_MTD_M25P80)	+= m25p80.o
- obj-$(CONFIG_MTD_SST25L)	+= sst25l.o
-+obj-$(CONFIG_MTD_UBI32_M25P80)	+= ubi32-m25p80.o
-+obj-$(CONFIG_MTD_NAND_SPI_ER)	+= nand-spi-er.o
-+obj-$(CONFIG_MTD_UBI32_NAND_SPI_ER)	+= ubi32-nand-spi-er.o
---- a/drivers/net/Kconfig
-+++ b/drivers/net/Kconfig
-@@ -2608,6 +2608,19 @@ config S6GMAC
- 
- source "drivers/net/stmmac/Kconfig"
- 
-+config UBICOM32_GMAC
-+	tristate "Ubicom Gigabit Ethernet support"
-+	depends on UBICOM32
-+	help
-+	  Gigabit Ethernet support for ubicom32 processors
-+
-+config UBICOM32_OCM_FOR_SKB
-+        bool  "USE OCM for SKB (EXPERIMENTAL)"
-+        depends on UBICOM32_GMAC
-+	default n
-+        help
-+          Allocate skb from OCM for Ethernet Receive when possible
-+
- endif # NETDEV_1000
- 
- #
---- a/drivers/net/Makefile
-+++ b/drivers/net/Makefile
-@@ -286,3 +286,5 @@ obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
- obj-$(CONFIG_SFC) += sfc/
- 
- obj-$(CONFIG_WIMAX) += wimax/
-+
-+obj-$(CONFIG_UBICOM32_GMAC) += ubi32-eth.o
---- a/drivers/net/usb/asix.c
-+++ b/drivers/net/usb/asix.c
-@@ -319,14 +319,33 @@ static int asix_rx_fixup(struct usbnet *
- 		/* get the packet length */
- 		size = (u16) (header & 0x0000ffff);
- 
--		if ((skb->len) - ((size + 1) & 0xfffe) == 0)
-+		if ((skb->len) - ((size + 1) & 0xfffe) == 0) {
-+#ifndef HAVE_EFFICIENT_UNALIGNED_ACCESS
-+			if (((u32)packet & 0x02) == 0) {
-+				memmove(packet - 2, packet, size);
-+				skb->data -= 2;
-+				skb->tail -= 2;
-+			}
-+#endif
- 			return 2;
-+		}
-+
- 		if (size > ETH_FRAME_LEN) {
- 			deverr(dev,"asix_rx_fixup() Bad RX Length %d", size);
- 			return 0;
- 		}
- 		ax_skb = skb_clone(skb, GFP_ATOMIC);
- 		if (ax_skb) {
-+#ifndef HAVE_EFFICIENT_UNALIGNED_ACCESS
-+			if (((u32)packet & 0x02) == 0) {
-+				memmove(packet - 2, packet, size);
-+				ax_skb->data = packet - 2;
-+			} else {
-+				ax_skb->data = packet;
-+			}
-+#else
-+			ax_skb->data = packet;
-+#endif
- 			ax_skb->len = size;
- 			ax_skb->data = packet;
- 			skb_set_tail_pointer(ax_skb, size);
-@@ -1125,13 +1144,19 @@ static int ax88178_link_reset(struct usb
- 	mode = AX88178_MEDIUM_DEFAULT;
- 
- 	if (ecmd.speed == SPEED_1000)
-+#ifdef HAVE_EFFICIENT_UNALIGNED_ACCESS
- 		mode |= AX_MEDIUM_GM;
-+#else
-+		mode |= AX_MEDIUM_GM | AX_MEDIUM_ENCK;
-+#endif
- 	else if (ecmd.speed == SPEED_100)
- 		mode |= AX_MEDIUM_PS;
- 	else
- 		mode &= ~(AX_MEDIUM_PS | AX_MEDIUM_GM);
- 
-+#ifdef HAVE_EFFICIENT_UNALIGNED_ACCESS
- 	mode |= AX_MEDIUM_ENCK;
-+#endif
- 
- 	if (ecmd.duplex == DUPLEX_FULL)
- 		mode |= AX_MEDIUM_FD;
---- a/drivers/oprofile/cpu_buffer.c
-+++ b/drivers/oprofile/cpu_buffer.c
-@@ -327,10 +327,10 @@ static inline void oprofile_end_trace(st
- }
- 
- static inline void
--__oprofile_add_ext_sample(unsigned long pc, struct pt_regs * const regs,
--			  unsigned long event, int is_kernel)
-+__oprofile_add_ext_sample_cpu(unsigned long pc, struct pt_regs * const regs,
-+			      unsigned long event, int is_kernel, int cpu)
- {
--	struct oprofile_cpu_buffer *cpu_buf = &__get_cpu_var(cpu_buffer);
-+	struct oprofile_cpu_buffer *cpu_buf = &per_cpu(cpu_buffer, cpu);
- 	unsigned long backtrace = oprofile_backtrace_depth;
- 
- 	/*
-@@ -352,7 +352,8 @@ __oprofile_add_ext_sample(unsigned long 
- void oprofile_add_ext_sample(unsigned long pc, struct pt_regs * const regs,
- 			     unsigned long event, int is_kernel)
- {
--	__oprofile_add_ext_sample(pc, regs, event, is_kernel);
-+	__oprofile_add_ext_sample_cpu(pc, regs, event,
-+				      is_kernel, smp_processor_id());
- }
- 
- void oprofile_add_sample(struct pt_regs * const regs, unsigned long event)
-@@ -360,7 +361,8 @@ void oprofile_add_sample(struct pt_regs 
- 	int is_kernel = !user_mode(regs);
- 	unsigned long pc = profile_pc(regs);
- 
--	__oprofile_add_ext_sample(pc, regs, event, is_kernel);
-+	__oprofile_add_ext_sample_cpu(pc, regs, event,
-+				      is_kernel, smp_processor_id());
- }
- 
- /*
---- a/drivers/pci/Makefile
-+++ b/drivers/pci/Makefile
-@@ -47,8 +47,8 @@ obj-$(CONFIG_PPC) += setup-bus.o
- obj-$(CONFIG_MIPS) += setup-bus.o setup-irq.o
- obj-$(CONFIG_X86_VISWS) += setup-irq.o
- obj-$(CONFIG_MN10300) += setup-bus.o
-+obj-$(CONFIG_UBICOM32) += setup-bus.o setup-irq.o
- 
--#
- # ACPI Related PCI FW Functions
- #
- obj-$(CONFIG_ACPI)    += pci-acpi.o
---- a/drivers/serial/Kconfig
-+++ b/drivers/serial/Kconfig
-@@ -879,6 +879,57 @@ config SERIAL_UARTLITE_CONSOLE
- 	  console (the system console is the device which receives all kernel
- 	  messages and warnings and which allows logins in single user mode).
- 
-+config SERIAL_UBI32_UARTTIO
-+        tristate "Ubicom UARTTIO support"
-+        depends on UBICOM32=y
-+        select SERIAL_CORE
-+	default y
-+        help
-+          Add support for the Ubicom virtual peripherial serial interface.
-+
-+config SERIAL_UBI32_UARTTIO_NR_UARTS
-+	int "Maximum number of UARTTIO virtual serial ports"
-+	depends on SERIAL_UBI32_UARTTIO
-+	default "4"
-+	help
-+	  Set this to the maximum number of serial ports you want the driver to support.
-+
-+config SERIAL_UBI32_UARTTIO_CONSOLE
-+        tristate "Ubicom UARTTIO console support"
-+        depends on SERIAL_UBI32_UARTTIO=y
-+        select SERIAL_CORE_CONSOLE
-+	default y
-+        help
-+          Add support for console on the Ubicom virtual peripherial serial interface.
-+
-+config SERIAL_UBI32_SERDES
-+        bool "Ubicom serial port support"
-+        depends on UBICOM32=y
-+        select SERIAL_CORE
-+	default y
-+        help
-+          Add support for the Ubicom serial interface.
-+
-+config SERIAL_UBI32_SERDES_CONSOLE
-+        bool "Ubicom serial console support"
-+        depends on SERIAL_UBI32_SERDES=y
-+        select SERIAL_CORE_CONSOLE
-+	default y
-+
-+config SERIAL_UBI32_MAILBOX
-+        bool "Ubicom mailbox support"
-+        depends on UBICOM32=y
-+        select SERIAL_CORE
-+	default n
-+        help
-+          Add support for the Ubicom mailbox interface.
-+
-+config SERIAL_UBI32_MAILBOX_CONSOLE
-+        bool "Ubicom mailbox console support"
-+        depends on SERIAL_UBI32_MAILBOX=y
-+        select SERIAL_CORE_CONSOLE
-+	default y
-+
- config SERIAL_SUNCORE
- 	bool
- 	depends on SPARC
---- a/drivers/serial/Makefile
-+++ b/drivers/serial/Makefile
-@@ -81,3 +81,6 @@ obj-$(CONFIG_SERIAL_KS8695) += serial_ks
- obj-$(CONFIG_KGDB_SERIAL_CONSOLE) += kgdboc.o
- obj-$(CONFIG_SERIAL_QE) += ucc_uart.o
- obj-$(CONFIG_SERIAL_TIMBERDALE)	+= timbuart.o
-+obj-$(CONFIG_SERIAL_UBI32_SERDES) += ubi32_serdes.o
-+obj-$(CONFIG_SERIAL_UBI32_UARTTIO) += ubi32_uarttio.o
-+obj-$(CONFIG_SERIAL_UBI32_MAILBOX) += ubi32_mailbox.o
---- a/drivers/spi/Kconfig
-+++ b/drivers/spi/Kconfig
-@@ -214,6 +214,15 @@ config SPI_S3C24XX
- 	help
- 	  SPI driver for Samsung S3C24XX series ARM SoCs
- 
-+config SPI_UBICOM32_GPIO
-+	tristate "Ubicom32 SPI over GPIO"
-+	depends on SPI_MASTER && UBICOM32 && EXPERIMENTAL
-+	select SPI_BITBANG
-+	select HAS_DMA
-+	help
-+	  SPI driver for the Ubicom32 architecture using
-+	  GPIO lines to provide the SPI bus.
-+
- config SPI_S3C24XX_GPIO
- 	tristate "Samsung S3C24XX series SPI by GPIO"
- 	depends on ARCH_S3C2410 && EXPERIMENTAL
---- a/drivers/spi/Makefile
-+++ b/drivers/spi/Makefile
-@@ -29,6 +29,7 @@ obj-$(CONFIG_SPI_MPC52xx_PSC)		+= mpc52x
- obj-$(CONFIG_SPI_MPC8xxx)		+= spi_mpc8xxx.o
- obj-$(CONFIG_SPI_PPC4xx)		+= spi_ppc4xx.o
- obj-$(CONFIG_SPI_S3C24XX_GPIO)		+= spi_s3c24xx_gpio.o
-+obj-$(CONFIG_SPI_UBICOM32_GPIO)		+= spi_ubicom32_gpio.o
- obj-$(CONFIG_SPI_S3C24XX)		+= spi_s3c24xx.o
- obj-$(CONFIG_SPI_TXX9)			+= spi_txx9.o
- obj-$(CONFIG_SPI_XILINX)		+= xilinx_spi.o
---- a/drivers/uio/Kconfig
-+++ b/drivers/uio/Kconfig
-@@ -94,4 +94,12 @@ config UIO_PCI_GENERIC
- 	  primarily, for virtualization scenarios.
- 	  If you compile this as a module, it will be called uio_pci_generic.
- 
-+config UIO_UBICOM32RING
-+	tristate "Ubicom32 Ring Buffer driver"
-+	default n
-+	help
-+	  Userspace I/O interface for a Ubicom32 Ring Buffer.
-+
-+	  If you compile this as a module, it will be called uio_ubicom32ring
-+
- endif
---- a/drivers/uio/Makefile
-+++ b/drivers/uio/Makefile
-@@ -6,3 +6,4 @@ obj-$(CONFIG_UIO_SMX)	+= uio_smx.o
- obj-$(CONFIG_UIO_AEC)	+= uio_aec.o
- obj-$(CONFIG_UIO_SERCOS3)	+= uio_sercos3.o
- obj-$(CONFIG_UIO_PCI_GENERIC)	+= uio_pci_generic.o
-+obj-$(CONFIG_UIO_UBICOM32RING)	+= uio_ubicom32ring.o
---- a/drivers/usb/gadget/epautoconf.c
-+++ b/drivers/usb/gadget/epautoconf.c
-@@ -154,6 +154,10 @@ ep_matches (
- 			/* configure your hardware with enough buffering!! */
- 		}
- 		break;
-+
-+	case USB_ENDPOINT_XFER_BULK:
-+		if ((gadget->is_dualspeed) && (ep->maxpacket < 512))
-+			return 0;
- 	}
- 
- 	/* MATCH!! */
---- a/drivers/usb/Kconfig
-+++ b/drivers/usb/Kconfig
-@@ -22,6 +22,7 @@ config USB_ARCH_HAS_HCD
- 	default y if PCMCIA && !M32R			# sl811_cs
- 	default y if ARM				# SL-811
- 	default y if SUPERH				# r8a66597-hcd
-+	default y if UBICOM32				# Ubicom's onchip USB Duial role controller
- 	default PCI
- 
- # many non-PCI SOC chips embed OHCI
---- a/drivers/usb/musb/Kconfig
-+++ b/drivers/usb/musb/Kconfig
-@@ -14,7 +14,7 @@ config USB_MUSB_HDRC
- 	select TWL4030_USB if MACH_OMAP_3430SDP
- 	select NOP_USB_XCEIV if MACH_OMAP3EVM
- 	select USB_OTG_UTILS
--	tristate 'Inventra Highspeed Dual Role Controller (TI, ADI, ...)'
-+	tristate 'Inventra Highspeed Dual Role Controller (TI, ADI, Ubicom, ...)'
- 	help
- 	  Say Y here if your system has a dual role high speed USB
- 	  controller based on the Mentor Graphics silicon IP.  Then
---- a/drivers/usb/musb/Makefile
-+++ b/drivers/usb/musb/Makefile
-@@ -30,6 +30,10 @@ ifeq ($(CONFIG_BF52x),y)
- 	musb_hdrc-objs	+= blackfin.o
- endif
- 
-+ifeq ($(CONFIG_UBICOM32), y)
-+        musb_hdrc-objs  += ubi32_usb.o
-+endif
-+
- ifeq ($(CONFIG_USB_GADGET_MUSB_HDRC),y)
- 	musb_hdrc-objs		+= musb_gadget_ep0.o musb_gadget.o
- endif
---- a/drivers/usb/musb/musb_core.c
-+++ b/drivers/usb/musb/musb_core.c
-@@ -105,6 +105,13 @@
- #include <asm/mach-types.h>
- #endif
- 
-+#ifdef CONFIG_UBICOM32
-+#include <asm/ip5000.h>
-+#include <asm/ubicom32-tio.h>
-+extern void ubi32_usb_init(void);
-+extern void ubi32_usb_int_clr(void);
-+#endif
-+
- #include "musb_core.h"
- 
- 
-@@ -148,8 +155,37 @@ static inline struct musb *dev_to_musb(s
- }
- 
- /*-------------------------------------------------------------------------*/
-+#if defined(CONFIG_UBICOM32)
-+
-+/*
-+ * Load an endpoint's FIFO
-+ */
-+void musb_write_fifo(struct musb_hw_ep *hw_ep, u16 wCount, const u8 *pSource)
-+{
-+	void __iomem *fifo = hw_ep->fifo;
-+
-+	prefetch((u8 *)pSource);
-+
-+	DBG(4, "%cX ep%d fifo %p count %d buf %p\n",
-+			'T', hw_ep->epnum, fifo, wCount, pSource);
-+
-+	usb_tio_write_fifo((u32)fifo, (u32)pSource, wCount);
-+
-+}
-+
-+/*
-+ * Unload an endpoint's FIFO
-+ */
-+void musb_read_fifo(struct musb_hw_ep *hw_ep, u16 wCount, u8 *pDest)
-+{
-+
-+	void __iomem *fifo = hw_ep->fifo;
-+	DBG(4, "%cX ep%d fifo %p count %d buf %p\n",
-+			'R', hw_ep->epnum, fifo, wCount, pDest);
-+	usb_tio_read_fifo((u32)fifo, (u32)pDest, wCount);
-+}
- 
--#if !defined(CONFIG_USB_TUSB6010) && !defined(CONFIG_BLACKFIN)
-+#elif !defined(CONFIG_USB_TUSB6010) && !defined(CONFIG_BLACKFIN)
- 
- /*
-  * Load an endpoint's FIFO
-@@ -228,8 +264,7 @@ void musb_read_fifo(struct musb_hw_ep *h
- 		readsb(fifo, dst, len);
- 	}
- }
--
--#endif	/* normal PIO */
-+#endif /* !T6010 && !BLACKFIN */
- 
- 
- /*-------------------------------------------------------------------------*/
-@@ -890,12 +925,19 @@ void musb_start(struct musb *musb)
- 	musb_writeb(regs, MUSB_TESTMODE, 0);
- 
- 	/* put into basic highspeed mode and start session */
-+#ifndef CONFIG_UBICOM32
- 	musb_writeb(regs, MUSB_POWER, MUSB_POWER_ISOUPDATE
- 						| MUSB_POWER_SOFTCONN
- 						| MUSB_POWER_HSENAB
- 						/* ENSUSPEND wedges tusb */
- 						/* | MUSB_POWER_ENSUSPEND */
- 						);
-+#else
-+	musb_writeb(regs, MUSB_POWER,  MUSB_POWER_HSENAB
-+						/* ENSUSPEND wedges tusb */
-+						/* | MUSB_POWER_ENSUSPEND */
-+						);
-+#endif
- 
- 	musb->is_active = 0;
- 	devctl = musb_readb(regs, MUSB_DEVCTL);
-@@ -1096,6 +1138,7 @@ static struct fifo_cfg __initdata mode_4
- };
- 
- 
-+#ifndef CONFIG_UBICOM32
- /*
-  * configure a fifo; for non-shared endpoints, this may be called
-  * once for a tx fifo and once for an rx fifo.
-@@ -1255,7 +1298,7 @@ static int __init ep_config_from_table(s
- 
- 	return 0;
- }
--
-+#endif /* CONFIG_UBICOM32 */
- 
- /*
-  * ep_config_from_hw - when MUSB_C_DYNFIFO_DEF is false
-@@ -1271,6 +1314,11 @@ static int __init ep_config_from_hw(stru
- 	DBG(2, "<== static silicon ep config\n");
- 
- 	/* FIXME pick up ep0 maxpacket size */
-+#ifdef CONFIG_UBICOM32
-+	/* set ep0 to shared_fifo, otherwise urb will be put to out_qh but ep0_irq try to get the urb from in_qh*/
-+	hw_ep = musb->endpoints;
-+	hw_ep->is_shared_fifo = true;
-+#endif
- 
- 	for (epnum = 1; epnum < musb->config->num_eps; epnum++) {
- 		musb_ep_select(mbase, epnum);
-@@ -1291,14 +1339,27 @@ static int __init ep_config_from_hw(stru
- 		/* REVISIT:  this algorithm is lazy, we should at least
- 		 * try to pick a double buffered endpoint.
- 		 */
-+#ifndef CONFIG_UBICOM32
- 		if (musb->bulk_ep)
- 			continue;
- 		musb->bulk_ep = hw_ep;
-+#else
-+		if ((musb->bulk_ep_in) && (musb->bulk_ep_out))
-+			continue;
-+		/* Save theEP with 1024 Bytes FIFO for ISO */
-+		if(hw_ep->max_packet_sz_tx == 512) {
-+			if (!musb->bulk_ep_in) {
-+				musb->bulk_ep_in = hw_ep;
-+			} else if (!musb->bulk_ep_out) {
-+				musb->bulk_ep_out = hw_ep;
-+			}
-+		}
-+#endif /* CONFIG_UBICOM32 */
- #endif
- 	}
- 
- #ifdef CONFIG_USB_MUSB_HDRC_HCD
--	if (!musb->bulk_ep) {
-+	if ((!musb->bulk_ep_in) || (!musb->bulk_ep_out)) {
- 		pr_debug("%s: missing bulk\n", musb_driver_name);
- 		return -EINVAL;
- 	}
-@@ -1407,12 +1468,16 @@ static int __init musb_core_init(u16 mus
- 	musb->epmask = 1;
- 
- 	if (reg & MUSB_CONFIGDATA_DYNFIFO) {
-+#ifndef CONFIG_UBICOM32
- 		if (musb->config->dyn_fifo)
- 			status = ep_config_from_table(musb);
--		else {
-+		else
-+#endif
-+		{
- 			ERR("reconfigure software for Dynamic FIFOs\n");
- 			status = -ENODEV;
- 		}
-+
- 	} else {
- 		if (!musb->config->dyn_fifo)
- 			status = ep_config_from_hw(musb);
-@@ -1476,8 +1541,8 @@ static int __init musb_core_init(u16 mus
- 
- /*-------------------------------------------------------------------------*/
- 
--#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3430)
--
-+#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3430) || defined(CONFIG_UBICOM32)
-+static u32_t musb_int_count = 0;
- static irqreturn_t generic_interrupt(int irq, void *__hci)
- {
- 	unsigned long	flags;
-@@ -1486,10 +1551,17 @@ static irqreturn_t generic_interrupt(int
- 
- 	spin_lock_irqsave(&musb->lock, flags);
- 
-+#ifndef CONFIG_UBICOM32
- 	musb->int_usb = musb_readb(musb->mregs, MUSB_INTRUSB);
- 	musb->int_tx = musb_readw(musb->mregs, MUSB_INTRTX);
- 	musb->int_rx = musb_readw(musb->mregs, MUSB_INTRRX);
-+#else
-+	musb_read_int_status(&musb->int_usb, &musb->int_tx, &musb->int_rx);
-+	//ubi32_usb_int_clr();
-+	musb_int_count++;
-+#endif
- 
-+	DBG(4, "usb %x, tx %x, rx %x", musb->int_usb, musb->int_tx, musb->int_rx);
- 	if (musb->int_usb || musb->int_tx || musb->int_rx)
- 		retval = musb_interrupt(musb);
- 
-@@ -2241,6 +2313,10 @@ static struct platform_driver musb_drive
- 
- static int __init musb_init(void)
- {
-+#ifdef CONFIG_UBICOM32
-+	ubi32_usb_init();
-+#endif
-+
- #ifdef CONFIG_USB_MUSB_HDRC_HCD
- 	if (usb_disabled())
- 		return 0;
---- a/drivers/usb/musb/musb_core.h
-+++ b/drivers/usb/musb/musb_core.h
-@@ -339,7 +339,12 @@ struct musb {
- 	 * queue until it completes or NAKs too much; then we try the next
- 	 * endpoint.
- 	 */
-+#ifdef CONFIG_UBICOM32
-+	struct musb_hw_ep	*bulk_ep_in;
-+	struct musb_hw_ep	*bulk_ep_out;
-+#else
- 	struct musb_hw_ep	*bulk_ep;
-+#endif
- 
- 	struct list_head	control;	/* of musb_qh */
- 	struct list_head	in_bulk;	/* of musb_qh */
---- a/drivers/usb/musb/musb_gadget.c
-+++ b/drivers/usb/musb/musb_gadget.c
-@@ -434,7 +434,7 @@ void musb_g_tx(struct musb *musb, u8 epn
- 		 * probably rates reporting as a host error
- 		 */
- 		if (csr & MUSB_TXCSR_P_SENTSTALL) {
--			csr |= MUSB_TXCSR_P_WZC_BITS;
-+			csr &= ~(MUSB_TXCSR_P_WZC_BITS);
- 			csr &= ~MUSB_TXCSR_P_SENTSTALL;
- 			musb_writew(epio, MUSB_TXCSR, csr);
- 			break;
-@@ -442,7 +442,7 @@ void musb_g_tx(struct musb *musb, u8 epn
- 
- 		if (csr & MUSB_TXCSR_P_UNDERRUN) {
- 			/* we NAKed, no big deal ... little reason to care */
--			csr |= MUSB_TXCSR_P_WZC_BITS;
-+			csr &= ~(MUSB_TXCSR_P_WZC_BITS);
- 			csr &= ~(MUSB_TXCSR_P_UNDERRUN
- 					| MUSB_TXCSR_TXPKTRDY);
- 			musb_writew(epio, MUSB_TXCSR, csr);
-@@ -577,12 +577,18 @@ static void rxstate(struct musb *musb, s
- {
- 	const u8		epnum = req->epnum;
- 	struct usb_request	*request = &req->request;
--	struct musb_ep		*musb_ep = &musb->endpoints[epnum].ep_out;
-+	struct musb_ep		*musb_ep = NULL;
- 	void __iomem		*epio = musb->endpoints[epnum].regs;
--	unsigned		fifo_count = 0;
--	u16			len = musb_ep->packet_sz;
-+	u16			fifo_count = 0;
-+	u16			len = 0;
- 	u16			csr = musb_readw(epio, MUSB_RXCSR);
- 
-+	if (musb->endpoints[epnum].is_shared_fifo)
-+		musb_ep = &musb->endpoints[epnum].ep_in;
-+	else
-+		musb_ep = &musb->endpoints[epnum].ep_out;
-+	len =  musb_ep->packet_sz;
-+
- 	/* We shouldn't get here while DMA is active, but we do... */
- 	if (dma_channel_status(musb_ep->dma) == MUSB_DMA_STATUS_BUSY) {
- 		DBG(4, "DMA pending...\n");
-@@ -730,7 +736,7 @@ static void rxstate(struct musb *musb, s
- 			 */
- 
- 			/* ack the read! */
--			csr |= MUSB_RXCSR_P_WZC_BITS;
-+			csr &= ~MUSB_RXCSR_P_WZC_BITS;
- 			csr &= ~MUSB_RXCSR_RXPKTRDY;
- 			musb_writew(epio, MUSB_RXCSR, csr);
- 		}
-@@ -749,10 +755,15 @@ void musb_g_rx(struct musb *musb, u8 epn
- 	u16			csr;
- 	struct usb_request	*request;
- 	void __iomem		*mbase = musb->mregs;
--	struct musb_ep		*musb_ep = &musb->endpoints[epnum].ep_out;
-+	struct musb_ep		*musb_ep = NULL;
- 	void __iomem		*epio = musb->endpoints[epnum].regs;
- 	struct dma_channel	*dma;
- 
-+	if (musb->endpoints[epnum].is_shared_fifo)
-+		musb_ep = &musb->endpoints[epnum].ep_in;
-+	else
-+		musb_ep = &musb->endpoints[epnum].ep_out;
-+
- 	musb_ep_select(mbase, epnum);
- 
- 	request = next_request(musb_ep);
-@@ -1756,7 +1767,9 @@ int usb_gadget_register_driver(struct us
- 			}
- 		}
- 	}
--
-+#ifndef CONFIG_USB_MUSB_OTG
-+	musb_pullup(musb, 1);
-+#endif
- 	return retval;
- }
- EXPORT_SYMBOL(usb_gadget_register_driver);
---- a/drivers/usb/musb/musb_gadget_ep0.c
-+++ b/drivers/usb/musb/musb_gadget_ep0.c
-@@ -241,14 +241,14 @@ __acquires(musb->lock)
- 		case USB_REQ_SET_ADDRESS:
- 			/* change it after the status stage */
- 			musb->set_address = true;
--			musb->address = (u8) (ctrlrequest->wValue & 0x7f);
-+			musb->address = (u8) (le16_to_cpu(ctrlrequest->wValue) & 0x7f);
- 			handled = 1;
- 			break;
- 
- 		case USB_REQ_CLEAR_FEATURE:
- 			switch (recip) {
- 			case USB_RECIP_DEVICE:
--				if (ctrlrequest->wValue
-+				if (le16_to_cpu(ctrlrequest->wValue)
- 						!= USB_DEVICE_REMOTE_WAKEUP)
- 					break;
- 				musb->may_wakeup = 0;
-@@ -262,8 +262,8 @@ __acquires(musb->lock)
- 
- 				if (num == 0
- 						|| num >= MUSB_C_NUM_EPS
--						|| ctrlrequest->wValue
--							!= USB_ENDPOINT_HALT)
-+						|| le16_to_cpu(ctrlrequest->wValue
-+							!= USB_ENDPOINT_HALT))
- 					break;
- 
- 				if (ctrlrequest->wIndex & USB_DIR_IN)
-@@ -293,7 +293,7 @@ __acquires(musb->lock)
- 			switch (recip) {
- 			case USB_RECIP_DEVICE:
- 				handled = 1;
--				switch (ctrlrequest->wValue) {
-+				switch (le16_to_cpu(ctrlrequest->wValue)) {
- 				case USB_DEVICE_REMOTE_WAKEUP:
- 					musb->may_wakeup = 1;
- 					break;
-@@ -375,8 +375,8 @@ stall:
- 
- 				if (epnum == 0
- 						|| epnum >= MUSB_C_NUM_EPS
--						|| ctrlrequest->wValue
--							!= USB_ENDPOINT_HALT)
-+						|| le16_to_cpu(ctrlrequest->wValue
-+							!= USB_ENDPOINT_HALT))
- 					break;
- 
- 				ep = musb->endpoints + epnum;
---- a/drivers/usb/musb/musb_host.c
-+++ b/drivers/usb/musb/musb_host.c
-@@ -160,7 +160,11 @@ static inline void musb_h_tx_start(struc
- 	/* NOTE: no locks here; caller should lock and select EP */
- 	if (ep->epnum) {
- 		txcsr = musb_readw(ep->regs, MUSB_TXCSR);
-+#ifndef CONFIG_UBICOM32
- 		txcsr |= MUSB_TXCSR_TXPKTRDY | MUSB_TXCSR_H_WZC_BITS;
-+#else
-+		txcsr |= (MUSB_TXCSR_TXPKTRDY & (~MUSB_TXCSR_H_WZC_BITS));
-+#endif
- 		musb_writew(ep->regs, MUSB_TXCSR, txcsr);
- 	} else {
- 		txcsr = MUSB_CSR0_H_SETUPPKT | MUSB_CSR0_TXPKTRDY;
-@@ -235,6 +239,8 @@ musb_start_urb(struct musb *musb, int is
- 		break;
- 	default:		/* bulk, interrupt */
- 		/* actual_length may be nonzero on retry paths */
-+		if (urb->actual_length)
-+			DBG(3 ,"musb_start_urb: URB %p retried, len: %d\n", urb, urb->actual_length);
- 		buf = urb->transfer_buffer + urb->actual_length;
- 		len = urb->transfer_buffer_length - urb->actual_length;
- 	}
-@@ -532,7 +538,11 @@ musb_host_packet_rx(struct musb *musb, s
- 	musb_read_fifo(hw_ep, length, buf);
- 
- 	csr = musb_readw(epio, MUSB_RXCSR);
-+#ifndef CONFIG_UBICOM32
- 	csr |= MUSB_RXCSR_H_WZC_BITS;
-+#else
-+	csr &= ~MUSB_RXCSR_H_WZC_BITS;
-+#endif
- 	if (unlikely(do_flush))
- 		musb_h_flush_rxfifo(hw_ep, csr);
- 	else {
-@@ -566,6 +576,7 @@ musb_rx_reinit(struct musb *musb, struct
- 
- 	/* if programmed for Tx, put it in RX mode */
- 	if (ep->is_shared_fifo) {
-+#ifndef  CONFIG_UBICOM32
- 		csr = musb_readw(ep->regs, MUSB_TXCSR);
- 		if (csr & MUSB_TXCSR_MODE) {
- 			musb_h_tx_flush_fifo(ep);
-@@ -580,7 +591,18 @@ musb_rx_reinit(struct musb *musb, struct
- 		 */
- 		if (csr & MUSB_TXCSR_DMAMODE)
- 			musb_writew(ep->regs, MUSB_TXCSR, MUSB_TXCSR_DMAMODE);
-+
-+#else
-+		/* clear mode (and everything else) to enable Rx */
- 		musb_writew(ep->regs, MUSB_TXCSR, 0);
-+		/* scrub all previous state, clearing toggle */
-+		csr = musb_readw(ep->regs, MUSB_RXCSR);
-+		if (csr & MUSB_RXCSR_RXPKTRDY)
-+			WARNING("rx%d, packet/%d ready?\n", ep->epnum,
-+				musb_readw(ep->regs, MUSB_RXCOUNT));
-+
-+		musb_h_flush_rxfifo(ep, MUSB_RXCSR_CLRDATATOG);
-+#endif
- 
- 	/* scrub all previous state, clearing toggle */
- 	} else {
-@@ -1108,6 +1130,16 @@ void musb_host_tx(struct musb *musb, u8 
- 	void __iomem		*mbase = musb->mregs;
- 	struct dma_channel	*dma;
- 
-+#ifdef CONFIG_UBICOM32
-+	if (hw_ep->is_shared_fifo) {
-+		qh = hw_ep->in_qh;
-+	}
-+#ifdef CONFIG_USB_SERIAL_SIERRAWIRELESS
-+	printk(KERN_DEBUG "OUT/TX%d end, csr %04x%s\n", epnum, tx_csr,
-+			dma ? ", dma" : "");
-+#endif
-+#endif
-+
- 	musb_ep_select(mbase, epnum);
- 	tx_csr = musb_readw(epio, MUSB_TXCSR);
- 
-@@ -1148,9 +1180,14 @@ void musb_host_tx(struct musb *musb, u8 
- 		 * we have a candidate... NAKing is *NOT* an error
- 		 */
- 		musb_ep_select(mbase, epnum);
-+#ifndef CONFIG_UBICOM32
- 		musb_writew(epio, MUSB_TXCSR,
- 				MUSB_TXCSR_H_WZC_BITS
- 				| MUSB_TXCSR_TXPKTRDY);
-+#else
-+		musb_writew(epio, MUSB_TXCSR,
-+				 MUSB_TXCSR_TXPKTRDY);
-+#endif
- 		return;
- 	}
- 
-@@ -1324,8 +1361,14 @@ void musb_host_tx(struct musb *musb, u8 
- 	qh->segsize = length;
- 
- 	musb_ep_select(mbase, epnum);
-+#ifndef CONFIG_UBICOM32
-+	musb_writew(epio, MUSB_TXCSR,
-+		    MUSB_TXCSR_H_WZC_BITS | MUSB_TXCSR_TXPKTRDY);
-+#else
- 	musb_writew(epio, MUSB_TXCSR,
--			MUSB_TXCSR_H_WZC_BITS | MUSB_TXCSR_TXPKTRDY);
-+		    MUSB_TXCSR_MODE | MUSB_TXCSR_TXPKTRDY);
-+#endif
-+
- }
- 
- 
-@@ -1385,7 +1428,11 @@ static void musb_bulk_rx_nak_timeout(str
- 
- 	/* clear nak timeout bit */
- 	rx_csr = musb_readw(epio, MUSB_RXCSR);
-+#ifndef CONFIG_UBICOM32
- 	rx_csr |= MUSB_RXCSR_H_WZC_BITS;
-+#else
-+	rx_csr &= ~MUSB_RXCSR_H_WZC_BITS;
-+#endif
- 	rx_csr &= ~MUSB_RXCSR_DATAERROR;
- 	musb_writew(epio, MUSB_RXCSR, rx_csr);
- 
-@@ -1454,6 +1501,13 @@ void musb_host_rx(struct musb *musb, u8 
- 
- 	pipe = urb->pipe;
- 
-+#ifdef CONFIG_UBICOM32
-+#ifdef CONFIG_USB_SERIAL_SIERRAWIRELESS
-+		printk(KERN_DEBUG  "RXCSR%d %04x, reqpkt, len %zu%s\n", epnum, rx_csr,
-+				xfer_len, dma ? ", dma" : "");
-+#endif
-+#endif
-+
- 	DBG(5, "<== hw %d rxcsr %04x, urb actual %d (+dma %zu)\n",
- 		epnum, rx_csr, urb->actual_length,
- 		dma ? dma->actual_len : 0);
-@@ -1492,8 +1546,15 @@ void musb_host_rx(struct musb *musb, u8 
- 				return;
- 			}
- 			musb_ep_select(mbase, epnum);
-+#ifndef CONFIG_UBICOM32
- 			rx_csr |= MUSB_RXCSR_H_WZC_BITS;
- 			rx_csr &= ~MUSB_RXCSR_DATAERROR;
-+#else
-+			/* NEED TO EVALUATE CHANGE */
-+			rx_csr &= ~MUSB_RXCSR_H_WZC_BITS;
-+			rx_csr &= ~MUSB_RXCSR_DATAERROR;
-+//			musb_writew(epio, MUSB_RXCSR, (~(MUSB_RXCSR_H_WZC_BITS))| MUSB_RXCSR_H_REQPKT);
-+#endif
- 			musb_writew(epio, MUSB_RXCSR, rx_csr);
- 
- 			goto finish;
-@@ -1554,8 +1615,13 @@ void musb_host_rx(struct musb *musb, u8 
- 		rx_csr &= ~MUSB_RXCSR_H_REQPKT;
- 
- 		musb_ep_select(mbase, epnum);
-+#ifndef CONFIG_UBICOM32
- 		musb_writew(epio, MUSB_RXCSR,
- 				MUSB_RXCSR_H_WZC_BITS | rx_csr);
-+#else
-+		musb_writew(epio, MUSB_RXCSR,
-+				(~MUSB_RXCSR_H_WZC_BITS) & rx_csr);
-+#endif
- 	}
- #endif
- 	if (dma && (rx_csr & MUSB_RXCSR_DMAENAB)) {
-@@ -1585,7 +1651,7 @@ void musb_host_rx(struct musb *musb, u8 
- 			else
- 				done = false;
- 
--		} else  {
-+		} else {
- 		/* done if urb buffer is full or short packet is recd */
- 		done = (urb->actual_length + xfer_len >=
- 				urb->transfer_buffer_length
-@@ -1799,7 +1865,11 @@ static int musb_schedule(
- 		if (musb_ep_get_qh(hw_ep, is_in) != NULL)
- 			continue;
- 
-+#ifndef CONFIG_UBICOM32
- 		if (hw_ep == musb->bulk_ep)
-+#else
-+		if ((hw_ep == musb->bulk_ep_in) || (hw_ep == musb->bulk_ep_out)) /* Ubicom */
-+#endif
- 			continue;
- 
- 		if (is_in)
-@@ -1813,7 +1883,14 @@ static int musb_schedule(
- 			best_end = epnum;
- 		}
- 	}
-+
-+#ifdef CONFIG_UBICOM32
-+	if (((best_diff >= qh->maxpacket)) && ((qh->type == USB_ENDPOINT_XFER_BULK) && (!is_in)))
-+		best_end = -1;
-+#endif
-+
- 	/* use bulk reserved ep1 if no other ep is free */
-+#ifndef CONFIG_UBICOM32
- 	if (best_end < 0 && qh->type == USB_ENDPOINT_XFER_BULK) {
- 		hw_ep = musb->bulk_ep;
- 		if (is_in)
-@@ -1835,6 +1912,22 @@ static int musb_schedule(
- 	} else if (best_end < 0) {
- 		return -ENOSPC;
- 	}
-+#else
-+	if (best_end < 0 && qh->type == USB_ENDPOINT_XFER_BULK) {
-+		/* hw_ep = musb->bulk_ep; */
-+		if (is_in) {
-+			head = &musb->in_bulk;
-+			hw_ep = musb->bulk_ep_in; /* UBICOM */
-+		}
-+		else {
-+			head = &musb->out_bulk;
-+			hw_ep = musb->bulk_ep_out; /* UBICOM */
-+		}
-+		goto success;
-+	} else if (best_end < 0) {
-+		return -ENOSPC;
-+	}
-+#endif
- 
- 	idle = 1;
- 	qh->mux = 0;
-@@ -1846,6 +1939,13 @@ success:
- 		list_add_tail(&qh->ring, head);
- 		qh->mux = 1;
- 	}
-+	/*
-+	 * It's not make sense to set NAK timeout when qh->mux = 0,
-+	 * There is nothing else to schedule
-+	 */
-+	if ((qh->type == USB_ENDPOINT_XFER_BULK) && (qh->mux == 0))
-+		qh->intv_reg = 0;
-+
- 	qh->hw_ep = hw_ep;
- 	qh->hep->hcpriv = qh;
- 	if (idle)
-@@ -1964,6 +2064,15 @@ static int musb_urb_enqueue(
- 		/* ISO always uses logarithmic encoding */
- 		interval = min_t(u8, epd->bInterval, 16);
- 		break;
-+#ifdef COMFIG_UBICOM32
-+	case USB_ENDPOINT_XFER_BULK:
-+		 if (epd->bEndpointAddress & USB_ENDPOINT_DIR_MASK)
-+			interval = (USB_SPEED_HIGH == urb->dev->speed) ? 16: 2;
-+		 else
-+			interval = 0;
-+		 break;
-+#endif
-+
- 	default:
- 		/* REVISIT we actually want to use NAK limits, hinting to the
- 		 * transfer scheduling logic to try some other qh, e.g. try
---- a/drivers/usb/musb/musb_io.h
-+++ b/drivers/usb/musb/musb_io.h
-@@ -58,6 +58,7 @@ static inline void writesb(const void __
- 
- #ifndef CONFIG_BLACKFIN
- 
-+#ifndef CONFIG_UBICOM32
- /* NOTE:  these offsets are all in bytes */
- 
- static inline u16 musb_readw(const void __iomem *addr, unsigned offset)
-@@ -72,7 +73,37 @@ static inline void musb_writew(void __io
- 
- static inline void musb_writel(void __iomem *addr, unsigned offset, u32 data)
- 	{ __raw_writel(data, addr + offset); }
-+#else
-+#include <asm/ubicom32-tio.h>
-+static inline u16 musb_readw(const void __iomem *addr, unsigned offset)
-+{
-+        u16 data;
-+        usb_tio_read_u16((u32)(addr + offset), &data);
-+        return data;
-+}
- 
-+static inline u8 musb_readb(const void __iomem *addr, unsigned offset)
-+{
-+        u8 data;
-+        usb_tio_read_u8((u32)(addr + offset), &data);
-+        return data;
-+}
-+
-+static inline void musb_writew(void __iomem *addr, unsigned offset, u16 data)
-+{
-+        usb_tio_write_u16((u32)(addr + offset), data);
-+}
-+
-+static inline void musb_writeb(void __iomem *addr, unsigned offset, u8 data)
-+{
-+        usb_tio_write_u8((u32)(addr + offset), data);
-+}
-+
-+static inline void  musb_read_int_status(u8_t *int_usb, u16_t *int_tx, u16_t *int_rx)
-+{
-+	return usb_tio_read_int_status(int_usb, int_tx, int_rx);
-+}
-+#endif /* CONFIG_UBICOM32 */
- 
- #ifdef CONFIG_USB_TUSB6010
- 
-@@ -106,7 +137,7 @@ static inline void musb_writeb(void __io
- 	__raw_writew(tmp, addr + (offset & ~1));
- }
- 
--#else
-+#elif !defined(CONFIG_UBICOM32)
- 
- static inline u8 musb_readb(const void __iomem *addr, unsigned offset)
- 	{ return __raw_readb(addr + offset); }
---- a/drivers/usb/musb/musb_regs.h
-+++ b/drivers/usb/musb/musb_regs.h
-@@ -167,6 +167,7 @@
- 	(MUSB_TXCSR_H_NAKTIMEOUT | MUSB_TXCSR_H_RXSTALL \
- 	| MUSB_TXCSR_H_ERROR | MUSB_TXCSR_FIFONOTEMPTY)
- 
-+
- /* RXCSR in Peripheral and Host mode */
- #define MUSB_RXCSR_AUTOCLEAR		0x8000
- #define MUSB_RXCSR_DMAENAB		0x2000
---- a/drivers/video/backlight/Kconfig
-+++ b/drivers/video/backlight/Kconfig
-@@ -100,6 +100,63 @@ config LCD_HP700
- 	  If you have an HP Jornada 700 series handheld (710/720/728)
- 	  say Y to enable LCD control driver.
- 
-+config LCD_UBICOM32POWER
-+	tristate "Ubicom LCD power Driver"
-+	depends on LCD_CLASS_DEVICE && UBICOM32
-+	default n
-+	help
-+	  If you have a Ubicom32 based system with an LCD panel that requires
-+	  power control, say Y to enable the power control driver for it.
-+
-+config LCD_UBICOM32
-+	tristate "Ubicom Backlight Driver"
-+	depends on LCD_CLASS_DEVICE && UBICOM32
-+	default n
-+	help
-+	  This driver takes care of initialization of LCD panels with
-+	  built in controllers.
-+
-+menu "Ubicom32 LCD Panel Support"
-+	depends on UBICOM32 && LCD_UBICOM32
-+
-+config LCD_UBICOM32_TFT2N0369E_P
-+	bool "TFT2N0369E (Portrait)"
-+	default n
-+	help
-+	  Support for TFT2N0369 in portrait mode
-+
-+config LCD_UBICOM32_TFT2N0369E_L
-+	bool "TFT2N0369E (Landscape)"
-+	default n
-+	help
-+	  Support for TFT2N0369 in landscape mode
-+
-+config LCD_UBICOM32_CFAF240320KTTS
-+	bool "CFAF240320KTTS"
-+	default n
-+	help
-+	  Support for CFAF240320KTTS
-+
-+config LCD_UBICOM32_CFAF240320KTTS_180
-+	bool "CFAF240320KTTS (180 rotation)"
-+	default n
-+	help
-+	  Support for CFAF240320KTTS rotated 180 degrees
-+
-+config LCD_UBICOM32_CFAF240320D
-+	bool "CFAF240320D"
-+	default n
-+	help
-+	  Support for CFAF240320D
-+
-+config LCD_UBICOM32_CFAF320240F
-+	bool "CFAF320240F"
-+	default n
-+	help
-+	  Support for CFAF320240F
-+
-+endmenu
-+
- #
- # Backlight
- #
-@@ -262,3 +319,11 @@ config BACKLIGHT_ADP5520
- 	  To compile this driver as a module, choose M here: the module will
- 	  be called adp5520_bl.
- 
-+config BACKLIGHT_UBICOM32
-+	tristate "Ubicom Backlight Driver"
-+	depends on BACKLIGHT_CLASS_DEVICE && UBICOM32
-+	default n
-+	help
-+	  If you have a Ubicom32 based system with a backlight say Y to enable the
-+	  backlight driver.
-+
---- a/drivers/video/backlight/Makefile
-+++ b/drivers/video/backlight/Makefile
-@@ -10,6 +10,9 @@ obj-$(CONFIG_LCD_PLATFORM)	   += platfor
- obj-$(CONFIG_LCD_VGG2432A4)	   += vgg2432a4.o
- obj-$(CONFIG_LCD_TDO24M)	   += tdo24m.o
- obj-$(CONFIG_LCD_TOSA)		   += tosa_lcd.o
-+obj-$(CONFIG_LCD_LTV350QV)	   += ltv350qv.o
-+obj-$(CONFIG_LCD_UBICOM32POWER)	   += ubicom32lcdpower.o
-+obj-$(CONFIG_LCD_UBICOM32)	   += ubicom32lcd.o
- 
- obj-$(CONFIG_BACKLIGHT_CLASS_DEVICE) += backlight.o
- obj-$(CONFIG_BACKLIGHT_ATMEL_PWM)    += atmel-pwm-bl.o
-@@ -28,4 +31,4 @@ obj-$(CONFIG_BACKLIGHT_SAHARA)	+= kb3886
- obj-$(CONFIG_BACKLIGHT_WM831X)	+= wm831x_bl.o
- obj-$(CONFIG_BACKLIGHT_ADX)    += adx_bl.o
- obj-$(CONFIG_BACKLIGHT_ADP5520)	+= adp5520_bl.o
--
-+obj-$(CONFIG_BACKLIGHT_UBICOM32) += ubicom32bl.o
---- a/drivers/video/Kconfig
-+++ b/drivers/video/Kconfig
-@@ -611,6 +611,50 @@ config FB_BFIN_T350MCQB
- 	 This display is a QVGA 320x240 24-bit RGB display interfaced by an 8-bit wide PPI
- 	 It uses PPI[0..7] PPI_FS1, PPI_FS2 and PPI_CLK.
- 
-+config FB_UBICOM32
-+	tristate "Ubicom32 Frame Buffer driver"
-+	depends on FB && UBICOM32
-+	select FB_CFB_FILLRECT
-+	select FB_CFB_COPYAREA
-+	select FB_CFB_IMAGEBLIT
-+	select FONT_6x11 if FRAMEBUFFER_CONSOLE
-+	help
-+	 This is the framebuffer device driver for the Ubicom32 architecture.
-+	 You can configure video memory by using kernel command line parameters, for example:
-+		video=ubicomfb:vram_size=512,init_value=0xffff
-+
-+config FB_UBICOM32_PLIO80
-+	tristate "Ubicom32 80 Bus PLIO Frame Buffer driver"
-+	depends on FB && UBICOM32
-+	select FB_CFB_FILLRECT
-+	select FB_CFB_COPYAREA
-+	select FB_CFB_IMAGEBLIT
-+	select FONT_6x11 if FRAMEBUFFER_CONSOLE
-+	select UBICOM32_PLIO
-+	help
-+	 This is a framebuffer device driver for the Ubicom32 architecture.
-+	 You can configure the xres, yres and vram size (in kilobytes) by using
-+	 kernel command line parameters, for example:
-+		video=ubicom32vfb:xres=320,yres=240,vram_size=512
-+
-+config FB_UBICOM32_VIRTUAL
-+	tristate "Ubicom32 Virtual Frame Buffer driver"
-+	depends on FB && UBICOM32
-+	select FB_CFB_FILLRECT
-+	select FB_CFB_COPYAREA
-+	select FB_CFB_IMAGEBLIT
-+	select FONT_6x11 if FRAMEBUFFER_CONSOLE
-+	help
-+	 This is a virtual framebuffer device driver for the Ubicom32 architecture.
-+	 You can configure the xres, yres and vram size (in kilobytes) by using
-+	 kernel command line parameters, for example:
-+		video=ubicom32vfb:xres=320,yres=240,vram_size=512
-+
-+config FB_UBICOM32_VIRTUAL_NOAUTO
-+	bool "Do not automatically load"
-+	depends on FB_UBICOM32_VIRTUAL
-+	help
-+	 Select this option to prevent the VFB from automatically loading at boot.
- 
- config FB_STI
- 	tristate "HP STI frame buffer device support"
---- a/drivers/video/Makefile
-+++ b/drivers/video/Makefile
-@@ -140,6 +140,10 @@ obj-$(CONFIG_FB_BFIN_T350MCQB)	  += bfin
- obj-$(CONFIG_FB_MX3)		  += mx3fb.o
- obj-$(CONFIG_FB_DA8XX)		  += da8xx-fb.o
- 
-+obj-$(CONFIG_FB_UBICOM32)         += ubicom32fb.o
-+obj-$(CONFIG_FB_UBICOM32_PLIO80)  += ubicom32plio80.o
-+obj-$(CONFIG_FB_UBICOM32_VIRTUAL) += ubicom32vfb.o
-+
- # the test framebuffer is last
- obj-$(CONFIG_FB_VIRTUAL)          += vfb.o
- 
---- a/drivers/watchdog/Kconfig
-+++ b/drivers/watchdog/Kconfig
-@@ -973,6 +973,19 @@ config WATCHDOG_RIO
- 	  machines.  The watchdog timeout period is normally one minute but
- 	  can be changed with a boot-time parameter.
- 
-+# Ubicom32
-+
-+config UBI32_WDT
-+	tristate "Ubicom32 Hardware Watchdog support"
-+	depends on UBICOM32
-+	---help---
-+	  If you say yes here you will get support for the Ubicom32 On-Chip
-+	  Watchdog Timer. If you have one of these processors and wish to
-+	  have watchdog support enabled, say Y, otherwise say N.
-+
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called ubi32_wdt.
-+
- # XTENSA Architecture
- 
- #
---- a/drivers/watchdog/Makefile
-+++ b/drivers/watchdog/Makefile
-@@ -139,6 +139,9 @@ obj-$(CONFIG_SH_WDT) += shwdt.o
- obj-$(CONFIG_WATCHDOG_RIO)		+= riowd.o
- obj-$(CONFIG_WATCHDOG_CP1XXX)		+= cpwd.o
- 
-+# Ubicom32 Architecture
-+obj-$(CONFIG_UBI32_WDT)			+= ubi32_wdt.o
-+
- # XTENSA Architecture
- 
- # Architecture Independant
---- a/fs/binfmt_flat.c
-+++ b/fs/binfmt_flat.c
-@@ -67,6 +67,11 @@
- #define FLAT_DATA_ALIGN	(sizeof(void *))
- #endif
- 
-+#ifndef ARCH_FLAT_ALIGN
-+#undef FLAT_DATA_ALIGN
-+#define FLAT_DATA_ALIGN	ARCH_FLAT_ALIGN
-+#endif
-+
- #define RELOC_FAILED 0xff00ff01		/* Relocation incorrect somewhere */
- #define UNLOADED_LIB 0x7ff000ff		/* Placeholder for unused library */
- 
-@@ -434,6 +439,7 @@ static int load_flat_file(struct linux_b
- 	loff_t fpos;
- 	unsigned long start_code, end_code;
- 	int ret;
-+	int flush_happened = 0;
- 
- 	hdr = ((struct flat_hdr *) bprm->buf);		/* exec-header */
- 	inode = bprm->file->f_path.dentry->d_inode;
-@@ -520,6 +526,7 @@ static int load_flat_file(struct linux_b
- 		/* OK, This is the point of no return */
- 		set_personality(PER_LINUX_32BIT);
- 		setup_new_exec(bprm);
-+		flush_happened = 1;
- 	}
- 
- 	/*
-@@ -534,6 +541,12 @@ static int load_flat_file(struct linux_b
- 	 * it all together.
- 	 */
- 	if ((flags & (FLAT_FLAG_RAM|FLAT_FLAG_GZIP)) == 0) {
-+
-+#ifdef ARCH_FLAT_ALIGN_TEXT
-+		printk("Unable to mmap rom with ARCH alignment requirements\n");
-+		ret = -ENOEXEC;
-+		goto err;
-+#endif
- 		/*
- 		 * this should give us a ROM ptr,  but if it doesn't we don't
- 		 * really care
-@@ -552,7 +565,7 @@ static int load_flat_file(struct linux_b
- 			goto err;
- 		}
- 
--		len = data_len + extra + MAX_SHARED_LIBS * sizeof(unsigned long);
-+		len = data_len + extra + ALIGN(MAX_SHARED_LIBS * sizeof(unsigned long), FLAT_DATA_ALIGN);
- 		len = PAGE_ALIGN(len);
- 		down_write(&current->mm->mmap_sem);
- 		realdatastart = do_mmap(0, 0, len,
-@@ -571,6 +584,7 @@ static int load_flat_file(struct linux_b
- 		datapos = ALIGN(realdatastart +
- 				MAX_SHARED_LIBS * sizeof(unsigned long),
- 				FLAT_DATA_ALIGN);
-+		//datapos = realdatastart + ALIGN(MAX_SHARED_LIBS * sizeof(unsigned long), ARCH_FLAT_ALIGN);
- 
- 		DBG_FLT("BINFMT_FLAT: Allocated data+bss+stack (%d bytes): %x\n",
- 				(int)(data_len + bss_len + stack_len), (int)datapos);
-@@ -599,7 +613,11 @@ static int load_flat_file(struct linux_b
- 		memp_size = len;
- 	} else {
- 
--		len = text_len + data_len + extra + MAX_SHARED_LIBS * sizeof(unsigned long);
-+		len = text_len + data_len + extra + ALIGN(MAX_SHARED_LIBS * sizeof(unsigned long), FLAT_DATA_ALIGN);
-+#ifdef ARCH_FLAT_ALIGN_TEXT
-+		/* Reserve space for the text alignment. */
-+		len += FLAT_DATA_ALIGN;
-+#endif
- 		len = PAGE_ALIGN(len);
- 		down_write(&current->mm->mmap_sem);
- 		textpos = do_mmap(0, 0, len,
-@@ -615,10 +633,17 @@ static int load_flat_file(struct linux_b
- 			goto err;
- 		}
- 
-+		memp = textpos;
-+#ifdef ARCH_FLAT_ALIGN_TEXT
-+		textpos = ALIGN(textpos + sizeof(struct flat_hdr), FLAT_DATA_ALIGN) - sizeof(struct flat_hdr);
-+#endif
- 		realdatastart = textpos + ntohl(hdr->data_start);
- 		datapos = ALIGN(realdatastart +
- 				MAX_SHARED_LIBS * sizeof(unsigned long),
- 				FLAT_DATA_ALIGN);
-+//		datapos = realdatastart + ALIGN(MAX_SHARED_LIBS * sizeof(unsigned long), ARCH_FLAT_ALIGN);
-+//		reloc = (unsigned long *) (textpos + ntohl(hdr->reloc_start) +
-+//					   ALIGN(MAX_SHARED_LIBS * sizeof(unsigned long), ARCH_FLAT_ALIGN));
- 
- 		reloc = (unsigned long *)
- 			(datapos + (ntohl(hdr->reloc_start) - text_len));
-@@ -658,7 +683,7 @@ static int load_flat_file(struct linux_b
- 		}
- 		if (IS_ERR_VALUE(result)) {
- 			printk("Unable to read code+data+bss, errno %d\n",(int)-result);
--			do_munmap(current->mm, textpos, text_len + data_len + extra +
-+			do_munmap(current->mm, memp, text_len + data_len + extra +
- 				MAX_SHARED_LIBS * sizeof(unsigned long));
- 			ret = result;
- 			goto err;
-@@ -671,6 +696,9 @@ static int load_flat_file(struct linux_b
- 
- 	/* The main program needs a little extra setup in the task structure */
- 	start_code = textpos + sizeof (struct flat_hdr);
-+#ifdef ARCH_FLAT_ALIGN_TEXT
-+	BUG_ON(ALIGN(start_code, FLAT_DATA_ALIGN) != start_code);
-+#endif
- 	end_code = textpos + text_len;
- 	if (id == 0) {
- 		current->mm->start_code = start_code;
-@@ -799,6 +827,13 @@ static int load_flat_file(struct linux_b
- 
- 	return 0;
- err:
-+	if (flush_happened) {
-+		/*
-+		 * The parent process has already started running. We cannot allow the child to return back to user space
-+		 * as this child is still uning the parent stack and 2 will clobber each other. We are going to kill this child.
-+		 */
-+		do_exit(SIGTERM);
-+	}
- 	return ret;
- }
- 
---- a/fs/Kconfig.binfmt
-+++ b/fs/Kconfig.binfmt
-@@ -30,7 +30,7 @@ config COMPAT_BINFMT_ELF
- config BINFMT_ELF_FDPIC
- 	bool "Kernel support for FDPIC ELF binaries"
- 	default y
--	depends on (FRV || BLACKFIN || (SUPERH32 && !MMU))
-+	depends on (FRV || BLACKFIN || (SUPERH32 && !MMU) || UBICOM32)
- 	help
- 	  ELF FDPIC binaries are based on ELF, but allow the individual load
- 	  segments of a binary to be located in memory independently of each
---- a/include/asm-generic/resource.h
-+++ b/include/asm-generic/resource.h
-@@ -69,13 +69,16 @@
- /*
-  * boot-time rlimit defaults for the init task:
-  */
-+#ifndef	CONFIG_ELF_CORE
-+#define	CONFIG_USER_ELF_CORE_SIZE	0
-+#endif
- #define INIT_RLIMITS							\
- {									\
- 	[RLIMIT_CPU]		= {  RLIM_INFINITY,  RLIM_INFINITY },	\
- 	[RLIMIT_FSIZE]		= {  RLIM_INFINITY,  RLIM_INFINITY },	\
- 	[RLIMIT_DATA]		= {  RLIM_INFINITY,  RLIM_INFINITY },	\
- 	[RLIMIT_STACK]		= {       _STK_LIM,   _STK_LIM_MAX },	\
--	[RLIMIT_CORE]		= {              0,  RLIM_INFINITY },	\
-+	[RLIMIT_CORE]		= { CONFIG_USER_ELF_CORE_SIZE,  RLIM_INFINITY },	\
- 	[RLIMIT_RSS]		= {  RLIM_INFINITY,  RLIM_INFINITY },	\
- 	[RLIMIT_NPROC]		= {              0,              0 },	\
- 	[RLIMIT_NOFILE]		= {       INR_OPEN,       INR_OPEN },	\
---- a/include/linux/elf-em.h
-+++ b/include/linux/elf-em.h
-@@ -41,6 +41,7 @@
-  * up with a final number.
-  */
- #define EM_ALPHA	0x9026
-+#define EM_UBICOM32 	        0xde3d	/* Ubicom32; no ABI */
- 
- /* Bogus old v850 magic number, used by old tools. */
- #define EM_CYGNUS_V850	0x9080
---- a/include/linux/fb.h
-+++ b/include/linux/fb.h
-@@ -152,6 +152,10 @@ struct dentry;
- #define FB_ACCEL_PROSAVAGE_DDR  0x8d	/* S3 ProSavage DDR             */
- #define FB_ACCEL_PROSAVAGE_DDRK 0x8e	/* S3 ProSavage DDR-K           */
- 
-+#define FB_ACCEL_UBICOM32		0x0100	/* Ubicom32			*/
-+#define FB_ACCEL_UBICOM32_VFB		0x0101	/* Ubicom32 VFB			*/
-+#define FB_ACCEL_UBICOM32_PLIO80	0x0102	/* Ubicom32 PLIO80		*/
-+
- struct fb_fix_screeninfo {
- 	char id[16];			/* identification string eg "TT Builtin" */
- 	unsigned long smem_start;	/* Start of frame buffer mem */
---- a/include/linux/if_ppp.h
-+++ b/include/linux/if_ppp.h
-@@ -114,14 +114,14 @@ struct pppol2tp_ioc_stats {
- 	__u16		tunnel_id;	/* redundant */
- 	__u16		session_id;	/* if zero, get tunnel stats */
- 	__u32		using_ipsec:1;	/* valid only for session_id == 0 */
--	aligned_u64	tx_packets;
--	aligned_u64	tx_bytes;
--	aligned_u64	tx_errors;
--	aligned_u64	rx_packets;
--	aligned_u64	rx_bytes;
--	aligned_u64	rx_seq_discards;
--	aligned_u64	rx_oos_packets;
--	aligned_u64	rx_errors;
-+	__u64	tx_packets;
-+	__u64	tx_bytes;
-+	__u64	tx_errors;
-+	__u64	rx_packets;
-+	__u64	rx_bytes;
-+	__u64	rx_seq_discards;
-+	__u64	rx_oos_packets;
-+	__u64	rx_errors;
- };
- 
- #define ifr__name       b.ifr_ifrn.ifrn_name
---- a/include/linux/oprofile.h
-+++ b/include/linux/oprofile.h
-@@ -102,6 +102,8 @@ void oprofile_add_sample(struct pt_regs 
-  */
- void oprofile_add_ext_sample(unsigned long pc, struct pt_regs * const regs,
- 				unsigned long event, int is_kernel);
-+void oprofile_add_ext_sample_cpu(unsigned long pc, struct pt_regs * const regs,
-+				unsigned long event, int is_kernel, int cpu);
- 
- /* Use this instead when the PC value is not from the regs. Doesn't
-  * backtrace. */
---- a/include/linux/serial_core.h
-+++ b/include/linux/serial_core.h
-@@ -179,6 +179,9 @@
- /* BCM63xx family SoCs */
- #define PORT_BCM63XX	89
- 
-+/* Ubicom32 */
-+#define PORT_UBI32_UARTTIO	87
-+
- #ifdef __KERNEL__
- 
- #include <linux/compiler.h>
---- a/include/linux/slab.h
-+++ b/include/linux/slab.h
-@@ -328,4 +328,14 @@ static inline void *kzalloc_node(size_t 
- 
- void __init kmem_cache_init_late(void);
- 
-+struct kmem_cache_size_info {
-+	unsigned short page;
-+	unsigned short order;
-+};
-+
-+/*
-+ * get info on all the memory allocated by slab for this named cache
-+ */
-+extern int kmem_cache_block_info(char *name, struct kmem_cache_size_info *data, int max_data);
-+
- #endif	/* _LINUX_SLAB_H */
---- a/init/Kconfig
-+++ b/init/Kconfig
-@@ -844,6 +844,12 @@ config ELF_CORE
- 	help
- 	  Enable support for generating core dumps. Disabling saves about 4k.
- 
-+config USER_ELF_CORE_SIZE
-+	int "user core dump size (10MB to 32MB)"
-+	range 10485760 33554432
-+	default 16777216
-+	depends on ELF_CORE
-+
- config PCSPKR_PLATFORM
- 	bool "Enable PC-Speaker support" if EMBEDDED
- 	depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
---- a/kernel/module.c
-+++ b/kernel/module.c
-@@ -2945,6 +2945,9 @@ static int m_show(struct seq_file *m, vo
- 	/* Used by oprofile and other similar tools. */
- 	seq_printf(m, " 0x%p", mod->module_core);
- 
-+#ifdef ARCH_PROC_MODULES_EXTRA
-+	ARCH_PROC_MODULES_EXTRA(m, mod);
-+#endif
- 	/* Taints info */
- 	if (mod->taints)
- 		seq_printf(m, " %s", module_flags(mod, buf));
-@@ -3097,8 +3100,12 @@ void print_modules(void)
- 	printk(KERN_DEFAULT "Modules linked in:");
- 	/* Most callers should already have preempt disabled, but make sure */
- 	preempt_disable();
--	list_for_each_entry_rcu(mod, &modules, list)
-+	list_for_each_entry_rcu(mod, &modules, list) {
- 		printk(" %s%s", mod->name, module_flags(mod, buf));
-+#ifdef ARCH_OOPS_MODULE_EXTRA
-+		ARCH_OOPS_MODULE_EXTRA(mod);
-+#endif
-+	}
- 	preempt_enable();
- 	if (last_unloaded_module[0])
- 		printk(" [last unloaded: %s]", last_unloaded_module);
---- a/kernel/sched_clock.c
-+++ b/kernel/sched_clock.c
-@@ -38,8 +38,7 @@
-  */
- unsigned long long __attribute__((weak)) sched_clock(void)
- {
--	return (unsigned long long)(jiffies - INITIAL_JIFFIES)
--					* (NSEC_PER_SEC / HZ);
-+	return (get_jiffies_64() - INITIAL_JIFFIES) * (NSEC_PER_SEC / HZ);
- }
- 
- static __read_mostly int sched_clock_running;
---- a/lib/Kconfig.debug
-+++ b/lib/Kconfig.debug
-@@ -690,7 +690,7 @@ config FRAME_POINTER
- 	bool "Compile the kernel with frame pointers"
- 	depends on DEBUG_KERNEL && \
- 		(CRIS || M68K || M68KNOMMU || FRV || UML || \
--		 AVR32 || SUPERH || BLACKFIN || MN10300) || \
-+		 AVR32 || SUPERH || BLACKFIN || MN10300 || UBICOM32) || \
- 		ARCH_WANT_FRAME_POINTERS
- 	default y if (DEBUG_INFO && UML) || ARCH_WANT_FRAME_POINTERS
- 	help
---- a/mm/Makefile
-+++ b/mm/Makefile
-@@ -45,3 +45,5 @@ obj-$(CONFIG_MEMORY_FAILURE) += memory-f
- obj-$(CONFIG_HWPOISON_INJECT) += hwpoison-inject.o
- obj-$(CONFIG_DEBUG_KMEMLEAK) += kmemleak.o
- obj-$(CONFIG_DEBUG_KMEMLEAK_TEST) += kmemleak-test.o
-+
-+CFLAGS_slab.o := $(PROFILING) -O2
---- a/mm/slab.c
-+++ b/mm/slab.c
-@@ -4086,6 +4086,68 @@ out:
- 
- #ifdef CONFIG_SLABINFO
- 
-+
-+/*
-+ * get info on all the memory allocated by slab for this named cache
-+ */
-+int kmem_cache_block_info(char *name, struct kmem_cache_size_info *data, int max_data)
-+{
-+	int res = 0;
-+	int found = 0;
-+	int node;
-+	struct kmem_cache *cachep;
-+	struct kmem_list3 *l3;
-+	struct slab *slabp;
-+
-+	/* Find the cache in the chain of caches. */
-+	mutex_lock(&cache_chain_mutex);
-+	list_for_each_entry(cachep, &cache_chain, next) {
-+		if (strcmp(cachep->name, name) == 0) {
-+			found = 1;
-+			break;
-+		}
-+	}
-+	mutex_unlock(&cache_chain_mutex);
-+	if (!found) {
-+		return 0;
-+	}
-+	for_each_online_node(node) {
-+		l3 = cachep->nodelists[node];
-+		if (!l3)
-+			continue;
-+		if (res >= max_data)
-+			break;
-+		check_irq_on();
-+		spin_lock_irq(&l3->list_lock);
-+
-+		list_for_each_entry(slabp, &l3->slabs_full, list) {
-+			if (res >= max_data)
-+				break;
-+			data[res].page = ((unsigned int)slabp->s_mem >> PAGE_SHIFT) & 0xffff;
-+			data[res].order = cachep->gfporder;
-+			res++;
-+		}
-+		list_for_each_entry(slabp, &l3->slabs_partial, list) {
-+			if (res >= max_data)
-+				break;
-+			data[res].page = ((unsigned int)slabp->s_mem >> PAGE_SHIFT) & 0xffff;
-+			data[res].order = cachep->gfporder;
-+			res++;
-+		}
-+		list_for_each_entry(slabp, &l3->slabs_free, list) {
-+			if (res >= max_data)
-+				break;
-+			data[res].page = ((unsigned int)slabp->s_mem >> PAGE_SHIFT) & 0xffff;
-+			data[res].order = cachep->gfporder;
-+			res++;
-+		}
-+
-+		spin_unlock_irq(&l3->list_lock);
-+	}
-+
-+	return res;
-+}
-+
- static void print_slabinfo_header(struct seq_file *m)
- {
- 	/*
---- a/scripts/mod/file2alias.c
-+++ b/scripts/mod/file2alias.c
-@@ -783,6 +783,15 @@ void handle_moddevtable(struct module *m
- 			+ sym->st_value;
- 	}
- 
-+	/*
-+	 * somehow our gcc is not generating st_size correctly and set 0 for some symbols.
-+	 * and 0 size will break do_table since it adjust size to (size - id_size)
-+	 * this is to make sure st_size fall in range.
-+	 */
-+	if (sym->st_size == 0 || sym->st_size > info->sechdrs[sym->st_shndx].sh_size) {
-+		sym->st_size = info->sechdrs[sym->st_shndx].sh_size;
-+	}
-+
- 	if (sym_is(symname, "__mod_pci_device_table"))
- 		do_table(symval, sym->st_size,
- 			 sizeof(struct pci_device_id), "pci",
---- a/sound/Kconfig
-+++ b/sound/Kconfig
-@@ -110,6 +110,8 @@ source "sound/parisc/Kconfig"
- 
- source "sound/soc/Kconfig"
- 
-+source "sound/ubicom32/Kconfig"
-+
- endif # SND
- 
- menuconfig SOUND_PRIME
---- a/sound/Makefile
-+++ b/sound/Makefile
-@@ -6,7 +6,7 @@ obj-$(CONFIG_SOUND_PRIME) += sound_firmw
- obj-$(CONFIG_SOUND_PRIME) += oss/
- obj-$(CONFIG_DMASOUND) += oss/
- obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ sh/ synth/ usb/ \
--	sparc/ spi/ parisc/ pcmcia/ mips/ soc/ atmel/
-+	sparc/ spi/ parisc/ pcmcia/ mips/ soc/ atmel/ ubicom32/
- obj-$(CONFIG_SND_AOA) += aoa/
- 
- # This one must be compilable even if sound is configured out
diff --git a/target/linux/ubicom32/patches-2.6.32/110-vmlinux_lds_fix.patch b/target/linux/ubicom32/patches-2.6.32/110-vmlinux_lds_fix.patch
deleted file mode 100644
index 1a1430887..000000000
--- a/target/linux/ubicom32/patches-2.6.32/110-vmlinux_lds_fix.patch
+++ /dev/null
@@ -1,150 +0,0 @@
---- a/arch/ubicom32/kernel/vmlinux.lds.S
-+++ b/arch/ubicom32/kernel/vmlinux.lds.S
-@@ -25,7 +25,6 @@
-  *   arch/blackfin
-  *   arch/parisc
-  */
--#include <asm-generic/vmlinux.lds.h>
- #include <asm/ocm_size.h>
- #include <asm/memory_map.h>
- #include <asm/thread_info.h>
-@@ -201,94 +200,28 @@ SECTIONS {
- 		*(__ex_table)
- 		__stop___ex_table = .;
- 
--		*(.rodata) *(.rodata.*)
--		*(__vermagic)		/* Kernel version magic */
--		*(__markers_strings)
--		*(.rodata1)
--		*(.rodata.str1.1)
--		*(__tracepoints_strings)
--
--		 /* PCI quirks */
--		__start_pci_fixups_early = . ;
--			*(.pci_fixup_early)
--		__end_pci_fixups_early = . ;
--		__start_pci_fixups_header = . ;
--			*(.pci_fixup_header)
--		__end_pci_fixups_header = . ;
--		__start_pci_fixups_final = . ;
--			*(.pci_fixup_final)
--		__end_pci_fixups_final = . ;
--		__start_pci_fixups_enable = . ;
--			*(.pci_fixup_enable)
--		__end_pci_fixups_enable = . ;
--		__start_pci_fixups_resume = . ;
--		       *(.pci_fixup_resume)
--		__end_pci_fixups_resume = . ;
--		__start_pci_fixups_resume_early = . ;
--		       *(.pci_fixup_resume_early)
--		__end_pci_fixups_resume_early = . ;
--		__start_pci_fixups_suspend  = . ;
--		       *(.pci_fixup_suspend)
--		__end_pci_fixups_suspend = . ;
--
--		__start_builtin_fw = . ;
--			*(.builtin_fw)
--		__end_builtin_fw = . ;
--
--
--		/* Kernel symbol table: Normal symbols */
--		. = ALIGN(4);
--		__start___ksymtab = .;
--		*(__ksymtab)
--		__stop___ksymtab = .;
--
--		/* Kernel symbol table: GPL-only symbols */
--		__start___ksymtab_gpl = .;
--		*(__ksymtab_gpl)
--		__stop___ksymtab_gpl = .;
--
--		/* Kernel symbol table: Normal unused symbols */
--		__start___ksymtab_unused = .;
--		*(__ksymtab_unused)
--		__stop___ksymtab_unused = .;
--
--		/* Kernel symbol table: GPL-only unused symbols */
--		__start___ksymtab_unused_gpl = .;
--		*(__ksymtab_unused_gpl)
--		__stop___ksymtab_unused_gpl = .;
--
--		/* Kernel symbol table: GPL-future symbols */
--		__start___ksymtab_gpl_future = .;
--		*(__ksymtab_gpl_future)
--		__stop___ksymtab_gpl_future = .;
--
--		/* Kernel symbol table: Normal symbols */
--		__start___kcrctab = .;
--		*(__kcrctab)
--		__stop___kcrctab = .;
--
--		/* Kernel symbol table: GPL-only symbols */
--		__start___kcrctab_gpl = .;
--		*(__kcrctab_gpl)
--		__stop___kcrctab_gpl = .;
--
--		/* Kernel symbol table: GPL-future symbols */
--		__start___kcrctab_gpl_future = .;
--		*(__kcrctab_gpl_future)
--		__stop___kcrctab_gpl_future = .;
-+	} > TEXT
- 
--		/* Kernel symbol table: strings */
--		*(__ksymtab_strings)
-+	RO_DATA(16)
- 
--		/* Built-in module parameters */
--		. = ALIGN(4) ;
--		__start___param = .;
--		*(__param)
--		__stop___param = .;
-+	.rodata : {} > TEXT
-+	.rodata1 : {} > TEXT
-+	.pci_fixup : {} > TEXT
-+	.builtin_fw : {} > TEXT
-+	.rio_route : {} > TEXT
-+	.tracedata : {} > TEXT
-+	__ksymtab : {} > TEXT
-+	__ksymtab_gpl : {} > TEXT
-+	__ksymtab_gpl_future : {} > TEXT
-+	__kcrctab_gpl : {} > TEXT
-+	__kcrctab_unused : {} > TEXT
-+	__kcrctab_unused_gpl : {} > TEXT
-+	__kcrctab_gpl_future : {} > TEXT
-+	__ksymtab_strings : {} > TEXT
-+	__init_rodata : {} > TEXT
-+	__param : {} > TEXT
- 
--		. = ALIGN(4) ;
--		_etext = . ;
--	} > TEXT
-+	_etext = .;
- 
- 	.data DATA_ADDR : {
- 		. = ALIGN(4);
-@@ -349,12 +282,6 @@ SECTIONS {
- 	    PROVIDE (___eh_frame_end = .);
- 	  } > INIT
- 
--	/DISCARD/ : {
--		EXIT_TEXT
--		EXIT_DATA
--		*(.exitcall.exit)
--	}
--
- 	.bss : {
- 		. = ALIGN(4);
- 		_sbss = . ;
-@@ -365,6 +292,12 @@ SECTIONS {
- 		_end = . ;
- 	} > BSS
- 
-+	/DISCARD/ : {
-+		EXIT_TEXT
-+		EXIT_DATA
-+		*(.exitcall.exit)
-+	}
-+
- 	NOTES > BSS
- 
- }
diff --git a/target/linux/ubicom32/patches-2.6.32/120-libgcc_func.patch b/target/linux/ubicom32/patches-2.6.32/120-libgcc_func.patch
deleted file mode 100644
index fee4ece00..000000000
--- a/target/linux/ubicom32/patches-2.6.32/120-libgcc_func.patch
+++ /dev/null
@@ -1,419 +0,0 @@
---- a/arch/ubicom32/Makefile
-+++ b/arch/ubicom32/Makefile
-@@ -60,9 +60,6 @@ cflags-$(CONFIG_UBICOM32_V4)		:= -march=
- ldflags-$(CONFIG_LINKER_RELAXATION)	:= --relax
- LDFLAGS_vmlinux := $(ldflags-y)
- 
--GCCLIBDIR := $(dir $(shell $(CC) $(cflags-y) -print-libgcc-file-name))
--GCC_LIBS := $(GCCLIBDIR)/libgcc.a
--
- KBUILD_CFLAGS += $(cflags-y) -ffunction-sections
- KBUILD_AFLAGS += $(cflags-y)
- 
-@@ -84,7 +81,6 @@ core-y	+= arch/$(ARCH)/kernel/ \
- drivers-$(CONFIG_OPROFILE)	+= arch/ubicom32/oprofile/
- 
- libs-y	+= arch/$(ARCH)/lib/
--libs-y	+= $(GCC_LIBS)
- 
- archclean:
- 
---- a/arch/ubicom32/lib/Makefile
-+++ b/arch/ubicom32/lib/Makefile
-@@ -30,3 +30,4 @@
- #
- 
- lib-y	:= checksum.o delay.o mem_ubicom32.o
-+lib-y	+= ashldi3.o ashrdi3.o divmod.o lshrdi3.o muldi3.o
---- /dev/null
-+++ b/arch/ubicom32/lib/ashldi3.c
-@@ -0,0 +1,62 @@
-+/* ashrdi3.c extracted from gcc-2.95.2/libgcc2.c which is: */
-+/* Copyright (C) 1989, 92-98, 1999 Free Software Foundation, Inc.
-+
-+This file is part of GNU CC.
-+
-+GNU CC 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, or (at your option)
-+any later version.
-+
-+GNU CC is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with GNU CC; see the file COPYING.  If not, write to
-+the Free Software Foundation, 59 Temple Place - Suite 330,
-+Boston, MA 02111-1307, USA.  */
-+
-+#define BITS_PER_UNIT 8
-+
-+typedef		 int SItype	__attribute__ ((mode (SI)));
-+typedef unsigned int USItype	__attribute__ ((mode (SI)));
-+typedef		 int DItype	__attribute__ ((mode (DI)));
-+typedef int word_type __attribute__ ((mode (__word__)));
-+
-+struct DIstruct {SItype high, low;};
-+
-+typedef union
-+{
-+  struct DIstruct s;
-+  DItype ll;
-+} DIunion;
-+
-+DItype
-+__ashldi3 (DItype u, word_type b)
-+{
-+  DIunion w;
-+  word_type bm;
-+  DIunion uu;
-+
-+  if (b == 0)
-+    return u;
-+
-+  uu.ll = u;
-+
-+  bm = (sizeof (SItype) * BITS_PER_UNIT) - b;
-+  if (bm <= 0)
-+    {
-+      w.s.low = 0;
-+      w.s.high = (USItype)uu.s.low << -bm;
-+    }
-+  else
-+    {
-+      USItype carries = (USItype)uu.s.low >> bm;
-+      w.s.low = (USItype)uu.s.low << b;
-+      w.s.high = ((USItype)uu.s.high << b) | carries;
-+    }
-+
-+  return w.ll;
-+}
---- /dev/null
-+++ b/arch/ubicom32/lib/ashrdi3.c
-@@ -0,0 +1,63 @@
-+/* ashrdi3.c extracted from gcc-2.7.2/libgcc2.c which is: */
-+/* Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
-+
-+This file is part of GNU CC.
-+
-+GNU CC 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, or (at your option)
-+any later version.
-+
-+GNU CC is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with GNU CC; see the file COPYING.  If not, write to
-+the Free Software Foundation, 59 Temple Place - Suite 330,
-+Boston, MA 02111-1307, USA.  */
-+
-+#define BITS_PER_UNIT 8
-+
-+typedef		 int SItype	__attribute__ ((mode (SI)));
-+typedef unsigned int USItype	__attribute__ ((mode (SI)));
-+typedef		 int DItype	__attribute__ ((mode (DI)));
-+typedef int word_type __attribute__ ((mode (__word__)));
-+
-+struct DIstruct {SItype high, low;};
-+
-+typedef union
-+{
-+  struct DIstruct s;
-+  DItype ll;
-+} DIunion;
-+
-+DItype
-+__ashrdi3 (DItype u, word_type b)
-+{
-+  DIunion w;
-+  word_type bm;
-+  DIunion uu;
-+
-+  if (b == 0)
-+    return u;
-+
-+  uu.ll = u;
-+
-+  bm = (sizeof (SItype) * BITS_PER_UNIT) - b;
-+  if (bm <= 0)
-+    {
-+      /* w.s.high = 1..1 or 0..0 */
-+      w.s.high = uu.s.high >> (sizeof (SItype) * BITS_PER_UNIT - 1);
-+      w.s.low = uu.s.high >> -bm;
-+    }
-+  else
-+    {
-+      USItype carries = (USItype)uu.s.high << bm;
-+      w.s.high = uu.s.high >> b;
-+      w.s.low = ((USItype)uu.s.low >> b) | carries;
-+    }
-+
-+  return w.ll;
-+}
---- /dev/null
-+++ b/arch/ubicom32/lib/divmod.c
-@@ -0,0 +1,85 @@
-+unsigned long
-+udivmodsi4(unsigned long num, unsigned long den, int modwanted)
-+{
-+  unsigned long bit = 1;
-+  unsigned long res = 0;
-+
-+  while (den < num && bit && !(den & (1L<<31)))
-+    {
-+      den <<=1;
-+      bit <<=1;
-+    }
-+  while (bit)
-+    {
-+      if (num >= den)
-+	{
-+	  num -= den;
-+	  res |= bit;
-+	}
-+      bit >>=1;
-+      den >>=1;
-+    }
-+  if (modwanted) return num;
-+  return res;
-+}
-+
-+long
-+__udivsi3 (long a, long b)
-+{
-+  return udivmodsi4 (a, b, 0);
-+}
-+
-+long
-+__umodsi3 (long a, long b)
-+{
-+  return udivmodsi4 (a, b, 1);
-+}
-+
-+long
-+__divsi3 (long a, long b)
-+{
-+  int neg = 0;
-+  long res;
-+
-+  if (a < 0)
-+    {
-+      a = -a;
-+      neg = !neg;
-+    }
-+
-+  if (b < 0)
-+    {
-+      b = -b;
-+      neg = !neg;
-+    }
-+
-+  res = udivmodsi4 (a, b, 0);
-+
-+  if (neg)
-+    res = -res;
-+
-+  return res;
-+}
-+
-+long
-+__modsi3 (long a, long b)
-+{
-+  int neg = 0;
-+  long res;
-+
-+  if (a < 0)
-+    {
-+      a = -a;
-+      neg = 1;
-+    }
-+
-+  if (b < 0)
-+    b = -b;
-+
-+  res = udivmodsi4 (a, b, 1);
-+
-+  if (neg)
-+    res = -res;
-+
-+  return res;
-+}
---- /dev/null
-+++ b/arch/ubicom32/lib/lshrdi3.c
-@@ -0,0 +1,62 @@
-+/* lshrdi3.c extracted from gcc-2.7.2/libgcc2.c which is: */
-+/* Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
-+
-+This file is part of GNU CC.
-+
-+GNU CC 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, or (at your option)
-+any later version.
-+
-+GNU CC is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with GNU CC; see the file COPYING.  If not, write to
-+the Free Software Foundation, 59 Temple Place - Suite 330,
-+Boston, MA 02111-1307, USA.  */
-+
-+#define BITS_PER_UNIT 8
-+
-+typedef		 int SItype	__attribute__ ((mode (SI)));
-+typedef unsigned int USItype	__attribute__ ((mode (SI)));
-+typedef		 int DItype	__attribute__ ((mode (DI)));
-+typedef int word_type __attribute__ ((mode (__word__)));
-+
-+struct DIstruct {SItype high, low;};
-+
-+typedef union
-+{
-+  struct DIstruct s;
-+  DItype ll;
-+} DIunion;
-+
-+DItype
-+__lshrdi3 (DItype u, word_type b)
-+{
-+  DIunion w;
-+  word_type bm;
-+  DIunion uu;
-+
-+  if (b == 0)
-+    return u;
-+
-+  uu.ll = u;
-+
-+  bm = (sizeof (SItype) * BITS_PER_UNIT) - b;
-+  if (bm <= 0)
-+    {
-+      w.s.high = 0;
-+      w.s.low = (USItype)uu.s.high >> -bm;
-+    }
-+  else
-+    {
-+      USItype carries = (USItype)uu.s.high << bm;
-+      w.s.high = (USItype)uu.s.high >> b;
-+      w.s.low = ((USItype)uu.s.low >> b) | carries;
-+    }
-+
-+  return w.ll;
-+}
---- /dev/null
-+++ b/arch/ubicom32/lib/muldi3.c
-@@ -0,0 +1,87 @@
-+/* muldi3.c extracted from gcc-2.7.2.3/libgcc2.c and
-+			   gcc-2.7.2.3/longlong.h which is: */
-+/* Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
-+
-+This file is part of GNU CC.
-+
-+GNU CC 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, or (at your option)
-+any later version.
-+
-+GNU CC is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with GNU CC; see the file COPYING.  If not, write to
-+the Free Software Foundation, 59 Temple Place - Suite 330,
-+Boston, MA 02111-1307, USA.  */
-+
-+#define UWtype          USItype
-+#define UHWtype         USItype
-+#define W_TYPE_SIZE     32
-+#define __BITS4 (W_TYPE_SIZE / 4)
-+#define __ll_B ((UWtype) 1 << (W_TYPE_SIZE / 2))
-+#define __ll_lowpart(t) ((UWtype) (t) & (__ll_B - 1))
-+#define __ll_highpart(t) ((UWtype) (t) >> (W_TYPE_SIZE / 2))
-+
-+#define umul_ppmm(w1, w0, u, v)                                         \
-+  do {                                                                  \
-+    UWtype __x0, __x1, __x2, __x3;                                      \
-+    UHWtype __ul, __vl, __uh, __vh;                                     \
-+                                                                        \
-+    __ul = __ll_lowpart (u);                                            \
-+    __uh = __ll_highpart (u);                                           \
-+    __vl = __ll_lowpart (v);                                            \
-+    __vh = __ll_highpart (v);                                           \
-+                                                                        \
-+    __x0 = (UWtype) __ul * __vl;                                        \
-+    __x1 = (UWtype) __ul * __vh;                                        \
-+    __x2 = (UWtype) __uh * __vl;                                        \
-+    __x3 = (UWtype) __uh * __vh;                                        \
-+                                                                        \
-+    __x1 += __ll_highpart (__x0);/* this can't give carry */            \
-+    __x1 += __x2;               /* but this indeed can */               \
-+    if (__x1 < __x2)            /* did we get it? */                    \
-+      __x3 += __ll_B;           /* yes, add it in the proper pos.  */   \
-+                                                                        \
-+    (w1) = __x3 + __ll_highpart (__x1);                                 \
-+    (w0) = __ll_lowpart (__x1) * __ll_B + __ll_lowpart (__x0);          \
-+  } while (0)
-+
-+
-+#define __umulsidi3(u, v) \
-+  ({DIunion __w;							\
-+    umul_ppmm (__w.s.high, __w.s.low, u, v);				\
-+    __w.ll; })
-+
-+typedef		 int SItype	__attribute__ ((mode (SI)));
-+typedef unsigned int USItype	__attribute__ ((mode (SI)));
-+typedef		 int DItype	__attribute__ ((mode (DI)));
-+typedef int word_type __attribute__ ((mode (__word__)));
-+
-+struct DIstruct {SItype high, low;};
-+
-+typedef union
-+{
-+  struct DIstruct s;
-+  DItype ll;
-+} DIunion;
-+
-+DItype
-+__muldi3 (DItype u, DItype v)
-+{
-+  DIunion w;
-+  DIunion uu, vv;
-+
-+  uu.ll = u,
-+  vv.ll = v;
-+
-+  w.ll = __umulsidi3 (uu.s.low, vv.s.low);
-+  w.s.high += ((USItype) uu.s.low * (USItype) vv.s.high
-+	       + (USItype) uu.s.high * (USItype) vv.s.low);
-+
-+  return w.ll;
-+}
---- a/arch/ubicom32/kernel/ubicom32_ksyms.c
-+++ b/arch/ubicom32/kernel/ubicom32_ksyms.c
-@@ -72,7 +72,6 @@ EXPORT_SYMBOL(memmove);
- extern void __ashldi3(void);
- extern void __ashrdi3(void);
- extern void __divsi3(void);
--extern void __divdi3(void);
- extern void __lshrdi3(void);
- extern void __modsi3(void);
- extern void __muldi3(void);
-@@ -83,7 +82,6 @@ extern void __umodsi3(void);
- EXPORT_SYMBOL(__ashldi3);
- EXPORT_SYMBOL(__ashrdi3);
- EXPORT_SYMBOL(__divsi3);
--EXPORT_SYMBOL(__divdi3);
- EXPORT_SYMBOL(__lshrdi3);
- EXPORT_SYMBOL(__modsi3);
- EXPORT_SYMBOL(__muldi3);
diff --git a/target/linux/ubicom32/patches-2.6.32/130-flash_driver_fix.patch b/target/linux/ubicom32/patches-2.6.32/130-flash_driver_fix.patch
deleted file mode 100644
index 95fa50807..000000000
--- a/target/linux/ubicom32/patches-2.6.32/130-flash_driver_fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/drivers/mtd/devices/ubi32-m25p80.c
-+++ b/drivers/mtd/devices/ubi32-m25p80.c
-@@ -630,8 +630,8 @@ static int ubicom32_flash_driver_erase(s
- 	/* sanity checks */
- 	if (instr->addr + instr->len > flash->mtd.size)
- 		return -EINVAL;
--	if ((instr->addr % mtd->erasesize) != 0
--			|| (instr->len % mtd->erasesize) != 0) {
-+	if (((u32) instr->addr % mtd->erasesize) != 0
-+			|| ((u32) instr->len % mtd->erasesize) != 0) {
- 		return -EINVAL;
- 	}
- 
diff --git a/target/linux/ubicom32/patches-2.6.32/140-arch_cflags.patch b/target/linux/ubicom32/patches-2.6.32/140-arch_cflags.patch
deleted file mode 100644
index aa1396e41..000000000
--- a/target/linux/ubicom32/patches-2.6.32/140-arch_cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/arch/ubicom32/Makefile
-+++ b/arch/ubicom32/Makefile
-@@ -54,8 +54,8 @@ CFLAGS_MODULE    += -mno-fastcall
- #
- # Some CFLAG additions based on specific CPU type.
- #
--cflags-$(CONFIG_UBICOM32_V3)		:= -march=ubicom32v3 -DIP5000
--cflags-$(CONFIG_UBICOM32_V4)		:= -march=ubicom32v4 -DIP7000
-+cflags-$(CONFIG_UBICOM32_V3)		:= -march=ubicom32v3 -mno-fdpic -DIP5000
-+cflags-$(CONFIG_UBICOM32_V4)		:= -march=ubicom32v4 -mno-fdpic -DIP7000
- 
- ldflags-$(CONFIG_LINKER_RELAXATION)	:= --relax
- LDFLAGS_vmlinux := $(ldflags-y)
diff --git a/target/linux/uml/patches-2.6.33/001-gcc4_unit_at_a_time_i386_fix.patch b/target/linux/uml/patches-2.6.33/001-gcc4_unit_at_a_time_i386_fix.patch
deleted file mode 100644
index 442c0ec76..000000000
--- a/target/linux/uml/patches-2.6.33/001-gcc4_unit_at_a_time_i386_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/um/Makefile-i386
-+++ b/arch/um/Makefile-i386
-@@ -35,7 +35,7 @@ cflags-y += -ffreestanding
- # Disable unit-at-a-time mode on pre-gcc-4.0 compilers, it makes gcc use
- # a lot more stack due to the lack of sharing of stacklots.  Also, gcc
- # 4.3.0 needs -funit-at-a-time for extern inline functions.
--KBUILD_CFLAGS += $(shell if [ $(call cc-version) -lt 0400 ] ; then \
-+KBUILD_CFLAGS += $(shell if [ $(call cc-version) -lt 0403 ] ; then \
- 			echo $(call cc-option,-fno-unit-at-a-time); \
- 			else echo $(call cc-option,-funit-at-a-time); fi ;)
- 
diff --git a/target/linux/uml/patches-2.6.33/002-gcc4_unfortify_source.patch b/target/linux/uml/patches-2.6.33/002-gcc4_unfortify_source.patch
deleted file mode 100644
index 2be33d02a..000000000
--- a/target/linux/uml/patches-2.6.33/002-gcc4_unfortify_source.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/arch/um/Makefile-i386
-+++ b/arch/um/Makefile-i386
-@@ -39,4 +39,8 @@ KBUILD_CFLAGS += $(shell if [ $(call cc-
- 			echo $(call cc-option,-fno-unit-at-a-time); \
- 			else echo $(call cc-option,-funit-at-a-time); fi ;)
- 
-+# disable compile-time buffer checks, enabled by default on Ubuntu 8.10 
-+# and later
-+KBUILD_CFLAGS += $(call cc-option,-U_FORTIFY_SOURCE)
-+
- KBUILD_CFLAGS += $(cflags-y)
---- a/arch/um/Makefile-x86_64
-+++ b/arch/um/Makefile-x86_64
-@@ -24,3 +24,7 @@ LINK-y += -m64
- 
- # Do unit-at-a-time unconditionally on x86_64, following the host
- KBUILD_CFLAGS += $(call cc-option,-funit-at-a-time)
-+
-+# disable compile-time buffer checks, enabled by default on Ubuntu 8.10 
-+# and later
-+KBUILD_CFLAGS += $(call cc-option,-U_FORTIFY_SOURCE)
diff --git a/target/linux/uml/patches-2.6.33/003-fix_text_section.patch b/target/linux/uml/patches-2.6.33/003-fix_text_section.patch
deleted file mode 100644
index f973cfd60..000000000
--- a/target/linux/uml/patches-2.6.33/003-fix_text_section.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-um: remove PAGE_SIZE alignment in linker script causing kernel segfault.
-
-The linker script cleanup that I did in commit 
-5d150a97f9391f5bcd7ba0d59d7a11c3de3cea80 accidentally introduced an 
-ALIGN(PAGE_SIZE) when converting to use INIT_TEXT_SECTION; Richard 
-Weinberger reported that this causes the kernel to segfault with 
-CONFIG_STATIC_LINK=y.
-
-I'm not certain why this extra alignment is a problem, but it seems likely 
-it is because previously
-
-__init_begin = _stext = _text = _sinittext 
-
-and with the extra ALIGN(PAGE_SIZE), _sinittext becomes different from the 
-rest.  So there is likely a bug here where something is assuming that 
-_sinittext is the same as one of those other symbols.  But reverting the 
-accidental change fixes the regression, so it seems worth committing that 
-now.
-
-Signed-off-by: Tim Abbott <tabbott@ksplice.com>
-Reported-by: richard -rw- weinberger <richard.weinberger@gmail.com>
-Cc: Jeff Dike <jdike@addtoit.com>
-Cc: user-mode-linux-devel@lists.sourceforge.net
----
- arch/um/kernel/uml.lds.S |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/arch/um/kernel/uml.lds.S b/arch/um/kernel/uml.lds.S
-index e7a6cca..664f942 100644
---- a/arch/um/kernel/uml.lds.S
-+++ b/arch/um/kernel/uml.lds.S
-@@ -22,7 +22,7 @@ SECTIONS
-   _text = .;
-   _stext = .;
-   __init_begin = .;
--  INIT_TEXT_SECTION(PAGE_SIZE)
-+  INIT_TEXT_SECTION(0)
-   . = ALIGN(PAGE_SIZE);
- 
-   .text      :
diff --git a/target/linux/uml/patches-2.6.33/901-lib_zlib_deflate_visible.patch b/target/linux/uml/patches-2.6.33/901-lib_zlib_deflate_visible.patch
deleted file mode 100644
index b71a67331..000000000
--- a/target/linux/uml/patches-2.6.33/901-lib_zlib_deflate_visible.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-make ZLIB_DEFLATE visible, so that we can choose whether we want it built-in
-or as a module
-
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -92,7 +92,7 @@ config ZLIB_INFLATE
- 	tristate
- 
- config ZLIB_DEFLATE
--	tristate
-+	tristate "Zlib compression"
- 
- config LZO_COMPRESS
- 	tristate
diff --git a/target/linux/uml/patches-2.6.34/001-gcc4_unit_at_a_time_i386_fix.patch b/target/linux/uml/patches-2.6.34/001-gcc4_unit_at_a_time_i386_fix.patch
deleted file mode 100644
index 442c0ec76..000000000
--- a/target/linux/uml/patches-2.6.34/001-gcc4_unit_at_a_time_i386_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/um/Makefile-i386
-+++ b/arch/um/Makefile-i386
-@@ -35,7 +35,7 @@ cflags-y += -ffreestanding
- # Disable unit-at-a-time mode on pre-gcc-4.0 compilers, it makes gcc use
- # a lot more stack due to the lack of sharing of stacklots.  Also, gcc
- # 4.3.0 needs -funit-at-a-time for extern inline functions.
--KBUILD_CFLAGS += $(shell if [ $(call cc-version) -lt 0400 ] ; then \
-+KBUILD_CFLAGS += $(shell if [ $(call cc-version) -lt 0403 ] ; then \
- 			echo $(call cc-option,-fno-unit-at-a-time); \
- 			else echo $(call cc-option,-funit-at-a-time); fi ;)
- 
diff --git a/target/linux/uml/patches-2.6.34/002-gcc4_unfortify_source.patch b/target/linux/uml/patches-2.6.34/002-gcc4_unfortify_source.patch
deleted file mode 100644
index 2be33d02a..000000000
--- a/target/linux/uml/patches-2.6.34/002-gcc4_unfortify_source.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/arch/um/Makefile-i386
-+++ b/arch/um/Makefile-i386
-@@ -39,4 +39,8 @@ KBUILD_CFLAGS += $(shell if [ $(call cc-
- 			echo $(call cc-option,-fno-unit-at-a-time); \
- 			else echo $(call cc-option,-funit-at-a-time); fi ;)
- 
-+# disable compile-time buffer checks, enabled by default on Ubuntu 8.10 
-+# and later
-+KBUILD_CFLAGS += $(call cc-option,-U_FORTIFY_SOURCE)
-+
- KBUILD_CFLAGS += $(cflags-y)
---- a/arch/um/Makefile-x86_64
-+++ b/arch/um/Makefile-x86_64
-@@ -24,3 +24,7 @@ LINK-y += -m64
- 
- # Do unit-at-a-time unconditionally on x86_64, following the host
- KBUILD_CFLAGS += $(call cc-option,-funit-at-a-time)
-+
-+# disable compile-time buffer checks, enabled by default on Ubuntu 8.10 
-+# and later
-+KBUILD_CFLAGS += $(call cc-option,-U_FORTIFY_SOURCE)
diff --git a/target/linux/uml/patches-2.6.34/003-fix_text_section.patch b/target/linux/uml/patches-2.6.34/003-fix_text_section.patch
deleted file mode 100644
index f973cfd60..000000000
--- a/target/linux/uml/patches-2.6.34/003-fix_text_section.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-um: remove PAGE_SIZE alignment in linker script causing kernel segfault.
-
-The linker script cleanup that I did in commit 
-5d150a97f9391f5bcd7ba0d59d7a11c3de3cea80 accidentally introduced an 
-ALIGN(PAGE_SIZE) when converting to use INIT_TEXT_SECTION; Richard 
-Weinberger reported that this causes the kernel to segfault with 
-CONFIG_STATIC_LINK=y.
-
-I'm not certain why this extra alignment is a problem, but it seems likely 
-it is because previously
-
-__init_begin = _stext = _text = _sinittext 
-
-and with the extra ALIGN(PAGE_SIZE), _sinittext becomes different from the 
-rest.  So there is likely a bug here where something is assuming that 
-_sinittext is the same as one of those other symbols.  But reverting the 
-accidental change fixes the regression, so it seems worth committing that 
-now.
-
-Signed-off-by: Tim Abbott <tabbott@ksplice.com>
-Reported-by: richard -rw- weinberger <richard.weinberger@gmail.com>
-Cc: Jeff Dike <jdike@addtoit.com>
-Cc: user-mode-linux-devel@lists.sourceforge.net
----
- arch/um/kernel/uml.lds.S |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/arch/um/kernel/uml.lds.S b/arch/um/kernel/uml.lds.S
-index e7a6cca..664f942 100644
---- a/arch/um/kernel/uml.lds.S
-+++ b/arch/um/kernel/uml.lds.S
-@@ -22,7 +22,7 @@ SECTIONS
-   _text = .;
-   _stext = .;
-   __init_begin = .;
--  INIT_TEXT_SECTION(PAGE_SIZE)
-+  INIT_TEXT_SECTION(0)
-   . = ALIGN(PAGE_SIZE);
- 
-   .text      :
diff --git a/target/linux/uml/patches-2.6.34/901-lib_zlib_deflate_visible.patch b/target/linux/uml/patches-2.6.34/901-lib_zlib_deflate_visible.patch
deleted file mode 100644
index b71a67331..000000000
--- a/target/linux/uml/patches-2.6.34/901-lib_zlib_deflate_visible.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-make ZLIB_DEFLATE visible, so that we can choose whether we want it built-in
-or as a module
-
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -92,7 +92,7 @@ config ZLIB_INFLATE
- 	tristate
- 
- config ZLIB_DEFLATE
--	tristate
-+	tristate "Zlib compression"
- 
- config LZO_COMPRESS
- 	tristate
diff --git a/target/linux/x86/generic/config-default b/target/linux/x86/generic/config-default
index 9d8fcd3a0..9bfdf46ed 100644
--- a/target/linux/x86/generic/config-default
+++ b/target/linux/x86/generic/config-default
@@ -1,56 +1,2 @@
-CONFIG_CPU_SUP_AMD=y
-CONFIG_CPU_SUP_CENTAUR=y
-CONFIG_CPU_SUP_CYRIX_32=y
-CONFIG_CPU_SUP_INTEL=y
-CONFIG_CPU_SUP_TRANSMETA_32=y
-CONFIG_CPU_SUP_UMC_32=y
-CONFIG_INPUT=y
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_INPUT_MOUSE=y
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-# CONFIG_MOUSE_BCM5974 is not set
-CONFIG_MOUSE_PS2=y
-CONFIG_MOUSE_PS2_ALPS=y
-# CONFIG_MOUSE_PS2_ELANTECH is not set
-CONFIG_MOUSE_PS2_LIFEBOOK=y
-CONFIG_MOUSE_PS2_LOGIPS2PP=y
-CONFIG_MOUSE_PS2_SYNAPTICS=y
-# CONFIG_MOUSE_PS2_TOUCHKIT is not set
-CONFIG_MOUSE_PS2_TRACKPOINT=y
-# CONFIG_MOUSE_SERIAL is not set
-# CONFIG_MOUSE_VSXXXAA is not set
-CONFIG_DMI=y
-# CONFIG_DMIID is not set
-CONFIG_ISA=y
-CONFIG_ISAPNP=y
-CONFIG_ISA_DMA_API=y
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-# CONFIG_VT_HW_CONSOLE_BINDING is not set
-CONFIG_ACPI=y
-# CONFIG_ACPI_AC is not set
-# CONFIG_ACPI_ASUS is not set
-# CONFIG_ACPI_BATTERY is not set
-CONFIG_ACPI_BLACKLIST_YEAR=0
-# CONFIG_ACPI_BUTTON is not set
-# CONFIG_ACPI_CONTAINER is not set
-# CONFIG_ACPI_CUSTOM_DSDT is not set
-# CONFIG_ACPI_DEBUG is not set
-# CONFIG_ACPI_DOCK is not set
-# CONFIG_ACPI_FAN is not set
-# CONFIG_ACPI_PCI_SLOT is not set
-CONFIG_ACPI_PROCESSOR=y
-# CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set
-# CONFIG_ACPI_PROCFS is not set
-# CONFIG_ACPI_PROCFS_POWER is not set
-# CONFIG_ACPI_PROC_EVENT is not set
-# CONFIG_ACPI_SBS is not set
-CONFIG_ACPI_SYSFS_POWER=y
-CONFIG_ACPI_THERMAL=y
-# CONFIG_ACPI_TOSHIBA is not set
-# CONFIG_ACPI_WMI is not set
 CONFIG_PATA_LEGACY=y
 CONFIG_PATA_PLATFORM=y
diff --git a/target/linux/x86/xen_domu/config-default b/target/linux/x86/xen_domu/config-default
index c5f8ce1d2..7e00fbe2f 100644
--- a/target/linux/x86/xen_domu/config-default
+++ b/target/linux/x86/xen_domu/config-default
@@ -1,26 +1,47 @@
+# CONFIG_APM is not set
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_CPU_SUP_CYRIX_32=y
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_TRANSMETA_32=y
+CONFIG_CPU_SUP_UMC_32=y
 CONFIG_FREEZER=y
 CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_HOTPLUG_CPU=y
 CONFIG_HVC_DRIVER=y
 CONFIG_HVC_IRQ=y
 CONFIG_HVC_XEN=y
+CONFIG_ISA_DMA_API=y
+# CONFIG_KVM_CLOCK is not set
+# CONFIG_KVM_GUEST is not set
+# CONFIG_LGUEST_GUEST is not set
 CONFIG_LOCK_KERNEL=y
+# CONFIG_M486 is not set
 CONFIG_MPENTIUM4=y
 CONFIG_NR_CPUS=4
+CONFIG_PARAVIRT=y
 CONFIG_PARAVIRT_CLOCK=y
 CONFIG_PARAVIRT_GUEST=y
-CONFIG_PARAVIRT=y
+CONFIG_PARAVIRT_SPINLOCKS=y
 CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
 CONFIG_SCHED_MC=y
+# CONFIG_SCHED_SMT is not set
 CONFIG_SMP=y
 CONFIG_SPARSE_IRQ=y
 CONFIG_STOP_MACHINE=y
 CONFIG_SYS_HYPERVISOR=y
 CONFIG_USE_GENERIC_SMP_HELPERS=y
+# CONFIG_VMI is not set
 CONFIG_X86_32_SMP=y
+# CONFIG_X86_BIGSMP is not set
 CONFIG_X86_CMOV=y
 CONFIG_X86_CMPXCHG64=y
 CONFIG_X86_DEBUGCTLMSR=y
+# CONFIG_X86_DS is not set
 CONFIG_X86_HT=y
 CONFIG_X86_L1_CACHE_SHIFT=7
 CONFIG_X86_MINIMUM_CPU_FAMILY=5
@@ -28,10 +49,14 @@ CONFIG_X86_PAE=y
 CONFIG_X86_TRAMPOLINE=y
 CONFIG_X86_TSC=y
 CONFIG_X86_USE_PPRO_CHECKSUM=y
+CONFIG_XEN=y
+# CONFIG_XENFS is not set
 CONFIG_XEN_BALLOON=y
 CONFIG_XEN_BLKDEV_FRONTEND=y
+CONFIG_XEN_DEBUG_FS=y
+# CONFIG_XEN_DEV_EVTCHN is not set
 CONFIG_XEN_MAX_DOMAIN_MEMORY=8
+# CONFIG_XEN_NETDEV_FRONTEND is not set
 CONFIG_XEN_SAVE_RESTORE=y
 CONFIG_XEN_SCRUB_PAGES=y
 CONFIG_XEN_SYS_HYPERVISOR=y
-CONFIG_XEN=y
diff --git a/target/toolchain/Makefile b/target/toolchain/Makefile
index fa9405f6c..1e0dec2dd 100644
--- a/target/toolchain/Makefile
+++ b/target/toolchain/Makefile
@@ -16,7 +16,7 @@ override MAKEFLAGS=
 PKG_OS:=$(shell uname -s)
 PKG_CPU:=$(shell uname -m)
 
-TOOLCHAIN_NAME:=OpenWrt-Toolchain-$(BOARD)-for-$(ARCH)-gcc-$(GCCV)_$(LIBC)-$(LIBCV)
+TOOLCHAIN_NAME:=OpenWrt-Toolchain-$(BOARD)-for-$(ARCH)$(ARCH_SUFFIX)-gcc-$(GCCV)$(DIR_SUFFIX)
 TOOLCHAIN_BUILD_DIR:=$(BUILD_DIR)/$(TOOLCHAIN_NAME)
 EXCLUDE_DIRS:=*/ccache \
 	*/stamp \
@@ -26,13 +26,13 @@ EXCLUDE_DIRS:=*/ccache \
 
 all: compile
 
-TOOLCHAIN_PREFIX:=$(TOOLCHAIN_BUILD_DIR)/toolchain-$(ARCH)_gcc-$(GCCV)_$(LIBC)-$(LIBCV)
+TOOLCHAIN_PREFIX:=$(TOOLCHAIN_BUILD_DIR)/toolchain-$(ARCH)$(ARCH_SUFFIX)_gcc-$(GCCV)$(DIR_SUFFIX)
 
 $(BIN_DIR)/$(TOOLCHAIN_NAME).tar.bz2: clean
 	mkdir -p $(TOOLCHAIN_BUILD_DIR)
 	$(TAR) -cf - -C $(TOPDIR)/staging_dir/  \
 	       $(foreach exclude,$(EXCLUDE_DIRS),--exclude="$(exclude)") \
-	       toolchain-$(ARCH)_gcc-$(GCCV)_$(LIBC)-$(LIBCV) | \
+	       toolchain-$(ARCH)$(ARCH_SUFFIX)_gcc-$(GCCV)$(DIR_SUFFIX) | \
 	       $(TAR) -xf - -C $(TOOLCHAIN_BUILD_DIR)
 
 	$(CP)  $(TOPDIR)/LICENSE ./files/README.TOOLCHAIN \
diff --git a/toolchain/gcc/patches/3.4.6/701-pr16276-fix.patch b/toolchain/gcc/patches/3.4.6/701-pr16276-fix.patch
new file mode 100644
index 000000000..69d7373f6
--- /dev/null
+++ b/toolchain/gcc/patches/3.4.6/701-pr16276-fix.patch
@@ -0,0 +1,61 @@
+http://gcc.gnu.org/PR16276
+
+2004-07-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR c++/16276
+	* final.c (PUT_JUMP_TABLES_IN_TEXT_SECTION): New.
+	(shorten_branches): Replace JUMP_TABLES_IN_TEXT_SECTION with
+	PUT_JUMP_TABLES_IN_TEXT_SECTION.
+	(final_scan_insn): Likewise.
+
+--- a/gcc/final.c	2003-12-03 09:42:25.000000000 -0800
++++ b/gcc/final.c	2004-07-08 14:45:07.900366938 -0700
+@@ -100,6 +100,9 @@ Software Foundation, 59 Temple Place - S
+ #define JUMP_TABLES_IN_TEXT_SECTION 0
+ #endif
+ 
++#define PUT_JUMP_TABLES_IN_TEXT_SECTION \
++  (JUMP_TABLES_IN_TEXT_SECTION || DECL_ONE_ONLY (current_function_decl))
++
+ #if defined(READONLY_DATA_SECTION) || defined(READONLY_DATA_SECTION_ASM_OP)
+ #define HAVE_READONLY_DATA_SECTION 1
+ #else
+@@ -1119,7 +1122,8 @@ shorten_branches (first)
+ 	  next = NEXT_INSN (insn);
+ 	  /* ADDR_VECs only take room if read-only data goes into the text
+ 	     section.  */
+-	  if (JUMP_TABLES_IN_TEXT_SECTION || !HAVE_READONLY_DATA_SECTION)
++	  if (PUT_JUMP_TABLES_IN_TEXT_SECTION
++	      || !HAVE_READONLY_DATA_SECTION)
+ 	    if (next && GET_CODE (next) == JUMP_INSN)
+ 	      {
+ 		rtx nextbody = PATTERN (next);
+@@ -1282,7 +1286,8 @@ shorten_branches (first)
+ 	{
+ 	  /* This only takes room if read-only data goes into the text
+ 	     section.  */
+-	  if (JUMP_TABLES_IN_TEXT_SECTION || !HAVE_READONLY_DATA_SECTION)
++	  if (PUT_JUMP_TABLES_IN_TEXT_SECTION
++	      || !HAVE_READONLY_DATA_SECTION)
+ 	    insn_lengths[uid] = (XVECLEN (body,
+ 					  GET_CODE (body) == ADDR_DIFF_VEC)
+ 				 * GET_MODE_SIZE (GET_MODE (body)));
+@@ -1483,7 +1488,8 @@ shorten_branches (first)
+ 	      PUT_MODE (body, CASE_VECTOR_SHORTEN_MODE (min_addr - rel_addr,
+ 							max_addr - rel_addr,
+ 							body));
+-	      if (JUMP_TABLES_IN_TEXT_SECTION || !HAVE_READONLY_DATA_SECTION)
++	      if (PUT_JUMP_TABLES_IN_TEXT_SECTION
++		  || !HAVE_READONLY_DATA_SECTION)
+ 		{
+ 		  insn_lengths[uid]
+ 		    = (XVECLEN (body, 1) * GET_MODE_SIZE (GET_MODE (body)));
+@@ -2254,7 +2260,7 @@ final_scan_insn (insn, file, optimize, p
+ 		 target, so don't output the label at all.  Leave that
+ 		 to the back end macros.  */
+ #else
+-	      if (! JUMP_TABLES_IN_TEXT_SECTION)
++	      if (! PUT_JUMP_TABLES_IN_TEXT_SECTION)
+ 		{
+ 		  int log_align;
+ 
diff --git a/tools/Makefile b/tools/Makefile
index 8fc2da3d9..808ea8412 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -42,6 +42,7 @@ $(curdir)/autoconf/compile := $(curdir)/m4/install
 $(curdir)/automake/compile := $(curdir)/m4/install $(curdir)/autoconf/install
 $(curdir)/mpfr/compile := $(curdir)/gmp/install
 $(curdir)/mtd-utils/compile := $(curdir)/libuuid/install
+$(curdir)/mkimage/compile := $(curdir)/sed/install
 
 $(curdir)/builddirs := $(tools-y) $(tools-dep) $(tools-)
 $(curdir)/builddirs-default := $(tools-y)
diff --git a/tools/firmware-utils/src/mkplanexfw.c b/tools/firmware-utils/src/mkplanexfw.c
index 4b32c7369..1bdccb7c0 100644
--- a/tools/firmware-utils/src/mkplanexfw.c
+++ b/tools/firmware-utils/src/mkplanexfw.c
@@ -40,6 +40,7 @@ struct board_info {
 	char		*id;
 	uint32_t	seed;
 	uint8_t		unk[2];
+	uint32_t	datalen;
 };
 
 /*
@@ -58,10 +59,12 @@ static struct board_info boards[] = {
 		.id		= "MZK-W04NU",
 		.seed		= 2,
 		.unk		= {0x04, 0x08},
+		.datalen	= 0x770000,
 	}, {
 		.id		= "MZK-W300NH",
 		.seed		= 4,
 		.unk		= {0x00, 0x00},
+		.datalen	= 0x770000,
 	}, {
 		/* terminating entry */
 	}
@@ -189,9 +192,13 @@ int main(int argc, char *argv[])
 		goto err;
 	}
 
-	buflen = (st.st_size + 3) & ~3;
-	buflen += sizeof(*hdr);
+	if (st.st_size > board->datalen) {
+		ERR("file '%s' is too big - max size: 0x%08X (exceeds %lu bytes)\n",
+		    ifname, board->datalen, st.st_size - board->datalen);
+		goto err;
+	}
 
+	buflen = board->datalen + 0x10000;
 	buf = malloc(buflen);
 	if (!buf) {
 		ERR("no memory for buffer\n");
@@ -201,7 +208,7 @@ int main(int argc, char *argv[])
 	memset(buf, 0xff, buflen);
 	hdr = (struct planex_hdr *)buf;
 
-	hdr->datalen = HOST_TO_BE32(buflen - sizeof(*hdr));
+	hdr->datalen = HOST_TO_BE32(board->datalen);
 	hdr->unk1[0] = board->unk[0];
 	hdr->unk1[1] = board->unk[1];
 
@@ -223,7 +230,7 @@ int main(int argc, char *argv[])
 	seed = HOST_TO_BE32(board->seed);
 	sha1_starts(&ctx);
 	sha1_update(&ctx, (uchar *) &seed, sizeof(seed));
-	sha1_update(&ctx, buf + sizeof(*hdr), buflen - sizeof(*hdr));
+	sha1_update(&ctx, buf + sizeof(*hdr), board->datalen);
 	sha1_finish(&ctx, hdr->sha1sum);
 
 	outfile = fopen(ofname, "w");